diff --git a/.editorconfig b/.editorconfig index a4f216d71a22..3ff05f9a7fa0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -55,10 +55,13 @@ trim_trailing_whitespace = unset [*.lock] indent_size = unset -# trailing whitespace is an actual syntax element of classic Markdown/ -# CommonMark to enforce a line break +# Although Markdown/CommonMark allows using two trailing spaces to denote +# a hard line break, we do not use that feature in nixpkgs since +# it forces the surrounding paragraph to become a which +# does not wrap reasonably. +# Instead of a hard line break, start a new paragraph by inserting a blank line. [*.md] -trim_trailing_whitespace = unset +trim_trailing_whitespace = true # binaries [*.nib] diff --git a/.gitattributes b/.gitattributes index 4862e0eab93c..36ea9338880b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,5 @@ **/deps.nix linguist-generated +**/deps.json linguist-generated **/node-packages.nix linguist-generated pkgs/applications/editors/emacs-modes/*-generated.nix linguist-generated diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 696a451e4d0f..fedcd5d75f63 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -28,6 +28,7 @@ /lib/cli.nix @edolstra @nbp @Profpatsch /lib/debug.nix @edolstra @nbp @Profpatsch /lib/asserts.nix @edolstra @nbp @Profpatsch +/lib/path.* @infinisil @fricklerhandwerk # Nixpkgs Internals /default.nix @nbp @@ -48,6 +49,10 @@ # Nixpkgs build-support /pkgs/build-support/writers @lassulus @Profpatsch +# Nixpkgs make-disk-image +/doc/builders/images/makediskimage.section.md @raitobezarius +/nixos/lib/make-disk-image.nix @raitobezarius + # Nixpkgs documentation /maintainers/scripts/db-to-md.sh @jtojnar @ryantm /maintainers/scripts/doc @jtojnar @ryantm @@ -78,6 +83,8 @@ /nixos/doc/manual/man-nixos-option.xml @nbp /nixos/modules/installer/tools/nixos-option.sh @nbp /nixos/modules/system @dasJ +/nixos/modules/system/activation/bootspec.nix @grahamc @cole-h @raitobezarius +/nixos/modules/system/activation/bootspec.cue @grahamc @cole-h @raitobezarius # NixOS integration test driver /nixos/lib/test-driver @tfc @@ -100,7 +107,7 @@ /pkgs/top-level/python-packages.nix @FRidh @jonringer /pkgs/development/interpreters/python @FRidh /pkgs/development/python-modules @FRidh @jonringer -/doc/languages-frameworks/python.section.md @FRidh +/doc/languages-frameworks/python.section.md @FRidh @mweinelt /pkgs/development/tools/poetry2nix @adisbladis /pkgs/development/interpreters/python/hooks @FRidh @jonringer @@ -127,7 +134,9 @@ /pkgs/development/ruby-modules @marsam # Rust -/pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq +/pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq @winterqt @figsoda +/pkgs/build-support/rust @zowoq @winterqt @figsoda +/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda # C compilers /pkgs/development/compilers/gcc @matthewbauer @@ -146,6 +155,11 @@ # Browsers /pkgs/applications/networking/browsers/firefox @mweinelt +# Certificate Authorities +pkgs/data/misc/cacert/ @ajs124 @lukegb @mweinelt +pkgs/development/libraries/nss/ @ajs124 @lukegb @mweinelt +pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt + # Jetbrains /pkgs/applications/editors/jetbrains @edwtjo @@ -219,10 +233,10 @@ /pkgs/top-level/emacs-packages.nix @adisbladis # Neovim -/pkgs/applications/editors/neovim @jonringer @teto +/pkgs/applications/editors/neovim @figsoda @jonringer @teto # VimPlugins -/pkgs/applications/editors/vim/plugins @jonringer +/pkgs/applications/editors/vim/plugins @figsoda @jonringer # VsCode Extensions /pkgs/applications/editors/vscode/extensions @jonringer @@ -263,6 +277,7 @@ # GNOME /pkgs/desktops/gnome @jtojnar /pkgs/desktops/gnome/extensions @piegamesde @jtojnar +/pkgs/build-support/make-hardcode-gsettings-patch @jtojnar # Cinnamon /pkgs/desktops/cinnamon @mkg20001 @@ -284,11 +299,8 @@ # Matrix /pkgs/servers/heisenbridge @piegamesde /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 -/nixos/tests/matrix-appservice-irc.nix @piegamesde /nixos/tests/matrix-conduit.nix @piegamesde # Dotnet diff --git a/.github/ISSUE_TEMPLATE/unreproducible_package.md b/.github/ISSUE_TEMPLATE/unreproducible_package.md index 749976dfbecd..a868c26ca54b 100644 --- a/.github/ISSUE_TEMPLATE/unreproducible_package.md +++ b/.github/ISSUE_TEMPLATE/unreproducible_package.md @@ -2,7 +2,7 @@ name: Unreproducible package about: A package that does not produce a bit-by-bit reproducible result each time it is built title: '' -labels: '0.kind: enhancement', '6.topic: reproducible builds' +labels: [ '0.kind: enhancement', '6.topic: reproducible builds' ] assignees: '' --- diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 47857a8ca4c3..3d4bb049991f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -22,7 +22,7 @@ For new packages please briefly describe the package or provide a link to its ho - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage) - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`) -- [22.11 Release Notes (or backporting 22.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2211-release-notes) +- [23.05 Release Notes (or backporting 22.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2305-release-notes) - [ ] (Package updates) Added a release notes entry if the change is major or breaking - [ ] (Module updates) Added a release notes entry if the change is significant - [ ] (Module addition) Added a release notes entry if adding a new NixOS module diff --git a/.github/labeler.yml b/.github/labeler.yml index 412dff9c06f8..44e5dcbf657d 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -19,6 +19,11 @@ - pkgs/build-support/emacs/**/* - pkgs/top-level/emacs-packages.nix +"6.topic: Enlightenment DE": + - nixos/modules/services/x11/desktop-managers/enlightenment.nix + - pkgs/desktops/enlightenment/**/* + - pkgs/development/python-modules/python-efl/* + "6.topic: erlang": - doc/languages-frameworks/beam.section.md - pkgs/development/beam-modules/**/* @@ -65,6 +70,19 @@ - pkgs/development/lua-modules/**/* - pkgs/top-level/lua-packages.nix +"6.topic: Lumina DE": + - nixos/modules/services/x11/desktop-managers/lumina.nix + - pkgs/desktops/lumina/**/* + +"6.topic: LXQt": + - nixos/modules/services/x11/desktop-managers/lxqt.nix + - pkgs/desktops/lxqt/**/* + +"6.topic: mate": + - nixos/modules/services/x11/desktop-managers/mate.nix + - nixos/tests/mate.nix + - pkgs/desktops/mate/**/* + "6.topic: nixos": - nixos/**/* - pkgs/os-specific/linux/nixos-rebuild/**/* diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 8abab8090232..f402376ebfb0 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -14,23 +14,19 @@ permissions: jobs: backport: permissions: - contents: write # for zeebe-io/backport-action to create branch - pull-requests: write # for zeebe-io/backport-action to create PR to backport + contents: write # for korthout/backport-action to create branch + pull-requests: write # for korthout/backport-action to create PR to 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@v3 with: - # required to find all branches - fetch-depth: 0 ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs - uses: zeebe-io/backport-action@v0.0.8 + uses: korthout/backport-action@v1.1.0 with: - # Config README: https://github.com/zeebe-io/backport-action#backport-action - github_token: ${{ secrets.GITHUB_TOKEN }} - github_workspace: ${{ github.workspace }} + # Config README: https://github.com/korthout/backport-action#backport-action pull_description: |- Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}. diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 081bd6146af1..ae411fefbe47 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -11,7 +11,7 @@ on: jobs: tests: runs-on: ubuntu-latest - if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip editorconfig]')" + if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" steps: - name: Get list of changed files from PR env: diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 5f949ddc56b1..35f5f24ce309 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -16,7 +16,7 @@ permissions: jobs: labels: runs-on: ubuntu-latest - if: github.repository_owner == 'NixOS' + if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" steps: - uses: actions/labeler@v4 with: diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 44892f926eb7..6d6bbb7e1499 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -38,10 +38,6 @@ jobs: into: staging-next-22.11 - from: staging-next-22.11 into: staging-22.11 - - from: release-22.05 - into: staging-next-22.05 - - from: staging-next-22.05 - into: staging-22.05 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index 3a6e0ad63e52..079147f7d724 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -11,8 +11,8 @@ permissions: jobs: tf-providers: permissions: - contents: write # for peter-evans/create-pull-request to create branch - pull-requests: write # for peter-evans/create-pull-request to create a PR, for peter-evans/create-or-update-comment to create or update comment + contents: write # for peter-evans/create-pull-request to create branch + pull-requests: write # for peter-evans/create-pull-request to create a PR, for peter-evans/create-or-update-comment to create or update comment if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master runs-on: ubuntu-latest steps: @@ -25,6 +25,8 @@ jobs: run: | echo "title=terraform-providers: update $(date -u +"%Y-%m-%d")" >> $GITHUB_OUTPUT - name: update terraform-providers + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git config user.name "github-actions[bot]" diff --git a/.gitignore b/.gitignore index e2df971a5289..b1018d44b833 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ ,* .*.swp .*.swo +.\#* +\#*\# .idea/ .vscode/ outputs/ diff --git a/.mailmap b/.mailmap index d3858d78dde7..d2bf6d0e4769 100644 --- a/.mailmap +++ b/.mailmap @@ -1,3 +1,14 @@ +ajs124 +Anderson Torres Daniel Løvbrøtte Olsen +Fabian Affolter +Janne Heß +Jörg Thalheim +Martin Weinelt R. RyanTM -Sandro +Robert Hensing +Sandro Jäckel +Sandro Jäckel +superherointj <5861043+superherointj@users.noreply.github.com> +Vladimír Čunát +Vladimír Čunát diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d8540782b91b..19108bb5a8fb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -38,11 +38,14 @@ Below is a short excerpt of some points in there: The old config generation system used impure shell scripts and could break in specific circumstances (see #1234). * `meta.description` should: + * Be short, just one sentence. * Be capitalized. * Not start with the package name. - * Not have a period at the end. + * More generally, it should not refer to the package name. + * Not end with a period (or any punctuation for that matter). * `meta.license` must be set and fit the upstream license. * If there is no upstream license, `meta.license` should default to `lib.licenses.unfree`. + * If in doubt, try to contact the upstream developers for clarification. * `meta.maintainers` must be set. See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes). @@ -53,6 +56,10 @@ In addition to writing properly formatted commit messages, it's important to inc Package version upgrades usually allow for simpler commit messages, including attribute name, old and new version, as well as a reference to the relevant release notes/changelog. Every once in a while a package upgrade requires more extensive changes, and that subsequently warrants a more verbose message. +Pull requests should not be squash merged in order to keep complete commit messages and GPG signatures intact and must not be when the change doesn't make sense as a single commit. +This means that, when addressing review comments in order to keep the pull request in an always mergeable status, you will sometimes need to rewrite your branch's history and then force-push it with `git push --force-with-lease`. +Useful git commands that can help a lot with this are `git commit --patch --amend` and `git rebase --interactive`. For more details consult the git man pages or online resources like [git-rebase.io](https://git-rebase.io/) or [The Pro Git Book](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History). + ## Rebasing between branches (i.e. from master to staging) From time to time, changes between branches must be rebased, for example, if the @@ -98,17 +105,17 @@ git push origin feature --force-with-lease Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches). -You can add a label such as `backport release-22.05` to a PR, so that merging it will +You can add a label such as `backport release-22.11` to a PR, so that merging it will automatically create a backport (via [a GitHub Action](.github/workflows/backport.yml)). This also works for PR's that have already been merged, and might take a couple of minutes to trigger. You can also create the backport manually: 1. Take note of the commits in which the change was introduced into `master` branch. -2. Check out the target _release branch_, e.g. `release-22.05`. Do not use a _channel branch_ like `nixos-22.05` or `nixpkgs-22.05-darwin`. +2. Check out the target _release branch_, e.g. `release-22.11`. Do not use a _channel branch_ like `nixos-22.11` or `nixpkgs-22.11-darwin`. 3. Create a branch for your change, e.g. `git checkout -b backport`. 4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe ` and add a reason. Otherwise use `git cherry-pick -x `. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request. -5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-22.05`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[22.05]`. +5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-22.11`) as the target branch of the pull request, and link to the pull request in which the original change was committed to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[22.11]`. 6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier. ## Criteria for Backporting changes @@ -120,15 +127,15 @@ Anything that does not cause user or downstream dependency regressions can be ba - Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`) - Security critical applications (E.g. `firefox`) -## Generating 22.11 Release Notes +## Generating 23.05 Release Notes Documentation in nixpkgs is transitioning to a markdown-centric workflow. Release notes now require a translation step to convert from markdown to a compatible docbook document. -Steps for updating 22.11 Release notes: +Steps for updating 23.05 Release notes: -1. Edit `nixos/doc/manual/release-notes/rl-2211.section.md` with the desired changes -2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2211.section.xml` -3. Include changes to `rl-2211.section.md` and `rl-2211.section.xml` in the same commit. +1. Edit `nixos/doc/manual/release-notes/rl-2305.section.md` with the desired changes +2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2305.section.xml` +3. Include changes to `rl-2305.section.md` and `rl-2305.section.xml` in the same commit. ## Reviewing contributions diff --git a/COPYING b/COPYING index 65ac1feaf010..93cbc590f450 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2003-2022 Eelco Dolstra and the Nixpkgs/NixOS contributors +Copyright (c) 2003-2023 Eelco Dolstra and the Nixpkgs/NixOS contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/README.md b/README.md index c7e14f693495..4c6ad635164b 100644 --- a/README.md +++ b/README.md @@ -51,9 +51,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration system, [Hydra](https://hydra.nixos.org/). * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for the NixOS 22.05 release](https://hydra.nixos.org/jobset/nixos/release-22.05) +* [Continuous package builds for the NixOS 22.11 release](https://hydra.nixos.org/jobset/nixos/release-22.11) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for the NixOS 22.05 release](https://hydra.nixos.org/job/nixos/release-22.05/tested#tabs-constituents) +* [Tests for the NixOS 22.11 release](https://hydra.nixos.org/job/nixos/release-22.11/tested#tabs-constituents) Artifacts successfully built with Hydra are published to cache at https://cache.nixos.org/. When successful build and test criteria are diff --git a/doc/Makefile b/doc/Makefile index f8d2d7248fab..1e54aef9bd12 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -11,7 +11,7 @@ pandoc_commonmark_enabled_extensions = +attributes+fenced_divs+footnotes+bracket pandoc_flags = --extract-media=$(pandoc_media_dir) \ --lua-filter=$(PANDOC_LUA_FILTERS_DIR)/diagram-generator.lua \ --lua-filter=build-aux/pandoc-filters/myst-reader/roles.lua \ - --lua-filter=build-aux/pandoc-filters/link-unix-man-references.lua \ + --lua-filter=$(PANDOC_LINK_MANPAGES_FILTER) \ --lua-filter=build-aux/pandoc-filters/docbook-writer/rst-roles.lua \ --lua-filter=build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua \ -f commonmark$(pandoc_commonmark_enabled_extensions)+smart diff --git a/doc/build-aux/pandoc-filters/link-manpages.nix b/doc/build-aux/pandoc-filters/link-manpages.nix new file mode 100644 index 000000000000..ee27c5d60812 --- /dev/null +++ b/doc/build-aux/pandoc-filters/link-manpages.nix @@ -0,0 +1,28 @@ +{ pkgs ? import ../../.. {} }: +let + inherit (pkgs) lib; + manpageURLs = builtins.fromJSON (builtins.readFile (pkgs.path + "/doc/manpage-urls.json")); +in pkgs.writeText "link-manpages.lua" '' + --[[ + Adds links to known man pages that aren't already in a link. + ]] + + local manpage_urls = { + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (man: url: + " [${builtins.toJSON man}] = ${builtins.toJSON url},") manpageURLs)} + } + + traverse = 'topdown' + + -- Returning false as the second value aborts processing of child elements. + function Link(elem) + return elem, false + end + + function Code(elem) + local is_man_role = elem.classes:includes('interpreted-text') and elem.attributes['role'] == 'manpage' + if is_man_role and manpage_urls[elem.text] ~= nil then + return pandoc.Link(elem, manpage_urls[elem.text]), false + end + end +'' diff --git a/doc/build-aux/pandoc-filters/link-unix-man-references.lua b/doc/build-aux/pandoc-filters/link-unix-man-references.lua deleted file mode 100644 index e437ac73a1cb..000000000000 --- a/doc/build-aux/pandoc-filters/link-unix-man-references.lua +++ /dev/null @@ -1,17 +0,0 @@ ---[[ -Turns a manpage reference into a link, when a mapping is defined below. -]] - -local man_urls = { - ["tmpfiles.d(5)"] = "https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html", - ["nix.conf(5)"] = "https://nixos.org/manual/nix/stable/#sec-conf-file", - ["systemd.time(7)"] = "https://www.freedesktop.org/software/systemd/man/systemd.time.html", - ["systemd.timer(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.timer.html", -} - -function Code(elem) - local is_man_role = elem.classes:includes('interpreted-text') and elem.attributes['role'] == 'manpage' - if is_man_role and man_urls[elem.text] ~= nil then - return pandoc.Link(elem, man_urls[elem.text]) - end -end diff --git a/doc/build-aux/pandoc-filters/myst-reader/roles.lua b/doc/build-aux/pandoc-filters/myst-reader/roles.lua index c33a688eeba7..f4ef6d390b40 100644 --- a/doc/build-aux/pandoc-filters/myst-reader/roles.lua +++ b/doc/build-aux/pandoc-filters/myst-reader/roles.lua @@ -17,9 +17,16 @@ function Inlines(inlines) if correct_tags then -- docutils supports alphanumeric strings separated by [-._:] -- We are slightly more liberal for simplicity. - local role = first.text:match('^{([-._+:%w]+)}$') - if role ~= nil then - inlines:remove(i) + -- Allow preceding punctuation (eg '('), otherwise '({file}`...`)' + -- does not match. Also allow anything followed by a non-breaking space + -- since pandoc emits those after certain abbreviations (e.g. e.g.). + local prefix, role = first.text:match('^(.*){([-._+:%w]+)}$') + if role ~= nil and (prefix == '' or prefix:match("^.*[%p ]$") ~= nil) then + if prefix == '' then + inlines:remove(i) + else + first.text = prefix + end second.attributes['role'] = role second.classes:insert('interpreted-text') end diff --git a/doc/builders/fetchers.chapter.md b/doc/builders/fetchers.chapter.md index 43aead0ad5e4..773eb3028ddb 100644 --- a/doc/builders/fetchers.chapter.md +++ b/doc/builders/fetchers.chapter.md @@ -14,7 +14,7 @@ For example, consider the following fetcher: ```nix fetchurl { url = "http://www.example.org/hello-1.0.tar.gz"; - sha256 = "0v6r3wwnsk5pdjr188nip3pjgn1jrn5pc5ajpcfy6had6b3v4dwm"; + hash = "sha256-lTeyxzJNQeMdu1IVdovNMtgn77jRIhSybLdMbTkf2Ww="; }; ``` @@ -23,17 +23,17 @@ A common mistake is to update a fetcher’s URL, or a version parameter, without ```nix fetchurl { url = "http://www.example.org/hello-1.1.tar.gz"; - sha256 = "0v6r3wwnsk5pdjr188nip3pjgn1jrn5pc5ajpcfy6had6b3v4dwm"; + hash = "sha256-lTeyxzJNQeMdu1IVdovNMtgn77jRIhSybLdMbTkf2Ww="; }; ``` **This will reuse the old contents**. -Remember to invalidate the hash argument, in this case by setting the `sha256` attribute to an empty string. +Remember to invalidate the hash argument, in this case by setting the `hash` attribute to an empty string. ```nix fetchurl { url = "http://www.example.org/hello-1.1.tar.gz"; - sha256 = ""; + hash = ""; }; ``` @@ -42,14 +42,14 @@ Use the resulting error message to determine the correct hash. ``` error: hash mismatch in fixed-output derivation '/path/to/my.drv': specified: sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - got: sha256-RApQUm78dswhBLC/rfU9y0u6pSAzHceIJqgmetRD24E= + got: sha256-lTeyxzJNQeMdu1IVdovNMtgn77jRIhSybLdMbTkf2Ww= ``` A similar problem arises while testing changes to a fetcher's implementation. If the output of the derivation already exists in the Nix store, test failures can go undetected. The [`invalidateFetcherByDrvHash`](#tester-invalidateFetcherByDrvHash) function helps prevent reusing cached derivations. ## `fetchurl` and `fetchzip` {#fetchurl} -Two basic fetchers are `fetchurl` and `fetchzip`. Both of these have two required arguments, a URL and a hash. The hash is typically `sha256`, although many more hash algorithms are supported. Nixpkgs contributors are currently recommended to use `sha256`. This hash will be used by Nix to identify your source. A typical usage of `fetchurl` is provided below. +Two basic fetchers are `fetchurl` and `fetchzip`. Both of these have two required arguments, a URL and a hash. The hash is typically `hash`, although many more hash algorithms are supported. Nixpkgs contributors are currently recommended to use `hash`. This hash will be used by Nix to identify your source. A typical usage of `fetchurl` is provided below. ```nix { stdenv, fetchurl }: @@ -58,7 +58,7 @@ stdenv.mkDerivation { name = "hello"; src = fetchurl { url = "http://www.example.org/hello.tar.gz"; - sha256 = "1111111111111111111111111111111111111111111111111111"; + hash = "sha256-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB="; }; } ``` @@ -76,18 +76,18 @@ The main difference between `fetchurl` and `fetchzip` is in how they store the c - `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. +Note that because the checksum is computed after applying these effects, using or modifying these arguments will have no effect unless the `hash` argument is changed as well. Most other fetchers return a directory rather than a single file. ## `fetchsvn` {#fetchsvn} -Used with Subversion. Expects `url` to a Subversion directory, `rev`, and `sha256`. +Used with Subversion. Expects `url` to a Subversion directory, `rev`, and `hash`. ## `fetchgit` {#fetchgit} -Used with Git. Expects `url` to a Git repo, `rev`, and `sha256`. `rev` in this case can be full the git commit id (SHA1 hash) or a tag name like `refs/tags/v1.0`. +Used with Git. Expects `url` to a Git repo, `rev`, and `hash`. `rev` in this case can be full the git commit id (SHA1 hash) or a tag name like `refs/tags/v1.0`. Additionally, the following optional arguments can be given: `fetchSubmodules = true` makes `fetchgit` also fetch the submodules of a repository. If `deepClone` is set to true, the entire repository is cloned as opposing to just creating a shallow clone. `deepClone = true` also implies `leaveDotGit = true` which means that the `.git` directory of the clone won't be removed after checkout. @@ -104,32 +104,32 @@ stdenv.mkDerivation { "directory/to/be/included" "another/directory" ]; - sha256 = "0000000000000000000000000000000000000000000000000000"; + hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; }; } ``` ## `fetchfossil` {#fetchfossil} -Used with Fossil. Expects `url` to a Fossil archive, `rev`, and `sha256`. +Used with Fossil. Expects `url` to a Fossil archive, `rev`, and `hash`. ## `fetchcvs` {#fetchcvs} -Used with CVS. Expects `cvsRoot`, `tag`, and `sha256`. +Used with CVS. Expects `cvsRoot`, `tag`, and `hash`. ## `fetchhg` {#fetchhg} -Used with Mercurial. Expects `url`, `rev`, and `sha256`. +Used with Mercurial. Expects `url`, `rev`, and `hash`. 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. +`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, `hash` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but `hash` 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. +`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, `hash` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available, but `hash` is currently preferred. `fetchFromGitHub` uses `fetchzip` to download the source archive generated by GitHub for the specified revision. If `leaveDotGit`, `deepClone` or `fetchSubmodules` are set to `true`, `fetchFromGitHub` will use `fetchgit` instead. Refer to its section for documentation of these options. @@ -156,7 +156,7 @@ This is used with repo.or.cz repositories. The arguments expected are very simil ## `fetchFromSourcehut` {#fetchfromsourcehut} This is used with sourcehut repositories. Similar to `fetchFromGitHub` above, -it expects `owner`, `repo`, `rev` and `sha256`, but don't forget the tilde (~) +it expects `owner`, `repo`, `rev` and `hash`, but don't forget the tilde (~) in front of the username! Expected arguments also include `vc` ("git" (default) or "hg"), `domain` and `fetchSubmodules`. diff --git a/doc/builders/images.xml b/doc/builders/images.xml index f86ebd86bee4..7d06130e3eca 100644 --- a/doc/builders/images.xml +++ b/doc/builders/images.xml @@ -10,4 +10,5 @@ + diff --git a/doc/builders/images/appimagetools.section.md b/doc/builders/images/appimagetools.section.md index 67e63dc5f61a..0c72315a26e8 100644 --- a/doc/builders/images/appimagetools.section.md +++ b/doc/builders/images/appimagetools.section.md @@ -35,7 +35,7 @@ appimageTools.wrapType2 { # or wrapType1 name = "patchwork"; src = fetchurl { url = "https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage"; - sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s"; + hash = "sha256-OqTitCeZ6xmWbqYTXp8sDrmVgTNjPZNW0hzUPW++mq4="; }; extraPkgs = pkgs: with pkgs; [ ]; } diff --git a/doc/builders/images/dockertools.section.md b/doc/builders/images/dockertools.section.md index db1a2a214d1e..2467739a1a5e 100644 --- a/doc/builders/images/dockertools.section.md +++ b/doc/builders/images/dockertools.section.md @@ -62,6 +62,8 @@ The above example will build a Docker image `redis/latest` from the given base i - `config` is used to specify the configuration of the containers that will be started off the built image in Docker. The available options are listed in the [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions). +- `architecture` is _optional_ and used to specify the image architecture, this is useful for multi-architecture builds that don't need cross compiling. If not specified it will default to `hostPlatform`. + - `diskSize` is used to specify the disk size of the VM used to build the image in megabytes. By default it's 1024 MiB. - `buildVMMemorySize` is used to specify the memory size of the VM to build the image in megabytes. By default it's 512 MiB. @@ -141,7 +143,9 @@ Create a Docker image with many of the store paths being on their own layer to i `config` _optional_ -: Run-time configuration of the container. A full list of the options are available at in the [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions). +`architecture` is _optional_ and used to specify the image architecture, this is useful for multi-architecture builds that don't need cross compiling. If not specified it will default to `hostPlatform`. + +: Run-time configuration of the container. A full list of the options available is in the [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions). *Default:* `{}` @@ -245,10 +249,10 @@ Its parameters are described in the example below: pullImage { imageName = "nixos/nix"; imageDigest = - "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b"; + "sha256:473a2b527958665554806aea24d0131bacec46d23af09fef4598eeab331850fa"; finalImageName = "nix"; - finalImageTag = "1.11"; - sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8"; + finalImageTag = "2.11.1"; + sha256 = "sha256-qvhj+Hlmviz+KEBVmsyPIzTB3QlVAFzwAY1zDPIBGxc="; os = "linux"; arch = "x86_64"; } @@ -394,3 +398,142 @@ buildImage { }; } ``` + +## buildNixShellImage {#ssec-pkgs-dockerTools-buildNixShellImage} + +Create a Docker image that sets up an environment similar to that of running `nix-shell` on a derivation. +When run in Docker, this environment somewhat resembles the Nix sandbox typically used by `nix-build`, with a major difference being that access to the internet is allowed. +It additionally also behaves like an interactive `nix-shell`, running things like `shellHook` and setting an interactive prompt. +If the derivation is fully buildable (i.e. `nix-build` can be used on it), running `buildDerivation` inside such a Docker image will build the derivation, with all its outputs being available in the correct `/nix/store` paths, pointed to by the respective environment variables like `$out`, etc. + +::: {.warning} +The behavior doesn't match `nix-shell` or `nix-build` exactly and this function is known not to work correctly for e.g. fixed-output derivations, content-addressed derivations, impure derivations and other special types of derivations. +::: + +### Arguments + +`drv` + +: The derivation on which to base the Docker image. + + Adding packages to the Docker image is possible by e.g. extending the list of `nativeBuildInputs` of this derivation like + + ```nix + buildNixShellImage { + drv = someDrv.overrideAttrs (old: { + nativeBuildInputs = old.nativeBuildInputs or [] ++ [ + somethingExtra + ]; + }); + # ... + } + ``` + + Similarly, you can extend the image initialization script by extending `shellHook` + +`name` _optional_ + +: The name of the resulting image. + + *Default:* `drv.name + "-env"` + +`tag` _optional_ + +: Tag of the generated image. + + *Default:* the resulting image derivation output path's hash + +`uid`/`gid` _optional_ + +: The user/group ID to run the container as. This is like a `nixbld` build user. + + *Default:* 1000/1000 + +`homeDirectory` _optional_ + +: The home directory of the user the container is running as + + *Default:* `/build` + +`shell` _optional_ + +: The path to the `bash` binary to use as the shell. This shell is started when running the image. + + *Default:* `pkgs.bashInteractive + "/bin/bash"` + +`command` _optional_ + +: Run this command in the environment of the derivation, in an interactive shell. See the `--command` option in the [`nix-shell` documentation](https://nixos.org/manual/nix/stable/command-ref/nix-shell.html?highlight=nix-shell#options). + + *Default:* (none) + +`run` _optional_ + +: Same as `command`, but runs the command in a non-interactive shell instead. See the `--run` option in the [`nix-shell` documentation](https://nixos.org/manual/nix/stable/command-ref/nix-shell.html?highlight=nix-shell#options). + + *Default:* (none) + +### Example + +The following shows how to build the `pkgs.hello` package inside a Docker container built with `buildNixShellImage`. + +```nix +with import {}; +dockerTools.buildNixShellImage { + drv = hello; +} +``` + +Build the derivation: + +```console +nix-build hello.nix +``` + + these 8 derivations will be built: + /nix/store/xmw3a5ln29rdalavcxk1w3m4zb2n7kk6-nix-shell-rc.drv + ... + Creating layer 56 from paths: ['/nix/store/crpnj8ssz0va2q0p5ibv9i6k6n52gcya-stdenv-linux'] + Creating layer 57 with customisation... + Adding manifests... + Done. + /nix/store/cpyn1lc897ghx0rhr2xy49jvyn52bazv-hello-2.12-env.tar.gz + +Load the image: + +```console +docker load -i result +``` + + 0d9f4c4cd109: Loading layer [==================================================>] 2.56MB/2.56MB + ... + ab1d897c0697: Loading layer [==================================================>] 10.24kB/10.24kB + Loaded image: hello-2.12-env:pgj9h98nal555415faa43vsydg161bdz + +Run the container: + +```console +docker run -it hello-2.12-env:pgj9h98nal555415faa43vsydg161bdz +``` + + [nix-shell:/build]$ + +In the running container, run the build: + +```console +buildDerivation +``` + + unpacking sources + unpacking source archive /nix/store/8nqv6kshb3vs5q5bs2k600xpj5bkavkc-hello-2.12.tar.gz + ... + patching script interpreter paths in /nix/store/z5wwy5nagzy15gag42vv61c2agdpz2f2-hello-2.12 + checking for references to /build/ in /nix/store/z5wwy5nagzy15gag42vv61c2agdpz2f2-hello-2.12... + +Check the build result: + +```console +$out/bin/hello +``` + + Hello, world! diff --git a/doc/builders/images/makediskimage.section.md b/doc/builders/images/makediskimage.section.md new file mode 100644 index 000000000000..833a6461e57b --- /dev/null +++ b/doc/builders/images/makediskimage.section.md @@ -0,0 +1,107 @@ +# `` {#sec-make-disk-image} + +`` is a function to create _disk images_ in multiple formats: raw, QCOW2 (QEMU), QCOW2-Compressed (compressed version), VDI (VirtualBox), VPC (VirtualPC). + +This function can create images in two ways: + +- using `cptofs` without any virtual machine to create a Nix store disk image, +- using a virtual machine to create a full NixOS installation. + +When testing early-boot or lifecycle parts of NixOS such as a bootloader or multiple generations, it is necessary to opt for a full NixOS system installation. +Whereas for many web servers, applications, it is possible to work with a Nix store only disk image and is faster to build. + +NixOS tests also use this function when preparing the VM. The `cptofs` method is used when `virtualisation.useBootLoader` is false (the default). Otherwise the second method is used. + +## Features + +For reference, read the function signature source code for documentation on arguments: . +Features are separated in various sections depending on if you opt for a Nix-store only image or a full NixOS image. + +### Common + +- arbitrary NixOS configuration +- automatic or bound disk size: `diskSize` parameter, `additionalSpace` can be set when `diskSize` is `auto` to add a constant of disk space +- multiple partition table layouts: EFI, legacy, legacy + GPT, hybrid, none through `partitionTableType` parameter +- OVMF or EFI firmwares and variables templates can be customized +- root filesystem `fsType` can be customized to whatever `mkfs.${fsType}` exist during operations +- root filesystem label can be customized, defaults to `nix-store` if it's a Nix store image, otherwise `nixpkgs/nixos` +- arbitrary code can be executed after disk image was produced with `postVM` +- the current nixpkgs can be realized as a channel in the disk image, which will change the hash of the image when the sources are updated +- additional store paths can be provided through `additionalPaths` + +### Full NixOS image + +- arbitrary contents with permissions can be placed in the target filesystem using `contents` +- a `/etc/nixpkgs/nixos/configuration.nix` can be provided through `configFile` +- bootloaders are supported +- EFI variables can be mutated during image production and the result is exposed in `$out` +- boot partition size when partition table is `efi` or `hybrid` + +### On bit-to-bit reproducibility + +Images are **NOT** deterministic, please do not hesitate to try to fix this, source of determinisms are (not exhaustive) : + +- bootloader installation have timestamps +- SQLite Nix store database contain registration times +- `/etc/shadow` is in a non-deterministic order + +A `deterministic` flag is available for best efforts determinism. + +## Usage + +To produce a Nix-store only image: +```nix +let + pkgs = import {}; + lib = pkgs.lib; + make-disk-image = import ; +in + make-disk-image { + inherit pkgs lib; + config = {}; + additionalPaths = [ ]; + format = "qcow2"; + onlyNixStore = true; + partitionTableType = "none"; + installBootLoader = false; + touchEFIVars = false; + diskSize = "auto"; + additionalSpace = "0M"; # Defaults to 512M. + copyChannel = false; + } +``` + +Some arguments can be left out, they are shown explicitly for the sake of the example. + +Building this derivation will provide a QCOW2 disk image containing only the Nix store and its registration information. + +To produce a NixOS installation image disk with UEFI and bootloader installed: +```nix +let + pkgs = import {}; + lib = pkgs.lib; + make-disk-image = import ; + evalConfig = import ; +in + make-disk-image { + inherit pkgs lib; + config = evalConfig { + modules = [ + { + fileSystems."/" = { device = "/dev/vda"; fsType = "ext4"; autoFormat = true; }; + boot.grub.device = "/dev/vda"; + } + ]; + }; + format = "qcow2"; + onlyNixStore = false; + partitionTableType = "legacy+gpt"; + installBootLoader = true; + touchEFIVars = true; + diskSize = "auto"; + additionalSpace = "0M"; # Defaults to 512M. + copyChannel = false; + } +``` + + diff --git a/doc/builders/images/ocitools.section.md b/doc/builders/images/ocitools.section.md index d3ab8776786b..c35f65bce007 100644 --- a/doc/builders/images/ocitools.section.md +++ b/doc/builders/images/ocitools.section.md @@ -34,4 +34,4 @@ buildContainer { - `mounts` specifies additional mount points chosen by the user. By default only a minimal set of necessary filesystems are mounted into the container (e.g procfs, cgroupfs) -- `readonly` makes the container\'s rootfs read-only if it is set to true. The default value is false `false`. +- `readonly` makes the container's rootfs read-only if it is set to true. The default value is false `false`. diff --git a/doc/builders/packages/cataclysm-dda.section.md b/doc/builders/packages/cataclysm-dda.section.md index bfeacb47feff..f401e9b9efa5 100644 --- a/doc/builders/packages/cataclysm-dda.section.md +++ b/doc/builders/packages/cataclysm-dda.section.md @@ -103,7 +103,7 @@ let owner = "Someone"; repo = "AwesomeMod"; rev = "..."; - sha256 = "..."; + hash = "..."; }; # Path to be installed in the unpacked source (default: ".") modRoot = "contents/under/this/path/will/be/installed"; diff --git a/doc/builders/packages/citrix.section.md b/doc/builders/packages/citrix.section.md index 4721f7e90f7a..bcf0924249bc 100644 --- a/doc/builders/packages/citrix.section.md +++ b/doc/builders/packages/citrix.section.md @@ -4,7 +4,7 @@ The [Citrix Workspace App](https://www.citrix.com/products/workspace-app/) is a ## Basic usage {#sec-citrix-base} -The tarball archive needs to be downloaded manually, as the license agreements of the vendor for [Citrix Workspace](https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html) needs to be accepted first. Then run `nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz`. With the archive available in the store, the package can be built and installed with Nix. +The tarball archive needs to be downloaded manually, as the license agreements of the vendor for [Citrix Workspace](https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html) needs to be accepted first. Then run `nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz`. With the archive available in the store, the package can be built and installed with Nix. ## Citrix Self-service {#sec-citrix-selfservice} @@ -19,7 +19,7 @@ $ selfservice ## Custom certificates {#sec-citrix-custom-certs} -The `Citrix Workspace App` in `nixpkgs` trusts several certificates [from the Mozilla database](https://curl.haxx.se/docs/caextract.html) by default. However, several companies using Citrix might require their own corporate certificate. On distros with imperative packaging, these certs can be stored easily in [`$ICAROOT`](https://developer-docs.citrix.com/projects/receiver-for-linux-command-reference/en/13.7/), however this directory is a store path in `nixpkgs`. In order to work around this issue, the package provides a simple mechanism to add custom certificates without rebuilding the entire package using `symlinkJoin`: +The `Citrix Workspace App` in `nixpkgs` trusts several certificates [from the Mozilla database](https://curl.haxx.se/docs/caextract.html) by default. However, several companies using Citrix might require their own corporate certificate. On distros with imperative packaging, these certs can be stored easily in [`$ICAROOT`](https://citrix.github.io/receiver-for-linux-command-reference/), however this directory is a store path in `nixpkgs`. In order to work around this issue, the package provides a simple mechanism to add custom certificates without rebuilding the entire package using `symlinkJoin`: ```nix with import { config.allowUnfree = true; }; diff --git a/doc/builders/packages/dlib.section.md b/doc/builders/packages/dlib.section.md index 8f0aa8610180..022195310a71 100644 --- a/doc/builders/packages/dlib.section.md +++ b/doc/builders/packages/dlib.section.md @@ -4,7 +4,7 @@ ## Compiling without AVX support {#compiling-without-avx-support} -Especially older CPUs don\'t support [AVX](https://en.wikipedia.org/wiki/Advanced_Vector_Extensions) (Advanced Vector Extensions) instructions that are used by DLib to optimize their algorithms. +Especially older CPUs don't support [AVX](https://en.wikipedia.org/wiki/Advanced_Vector_Extensions) (Advanced Vector Extensions) instructions that are used by DLib to optimize their algorithms. On the affected hardware errors like `Illegal instruction` will occur. In those cases AVX support needs to be disabled: diff --git a/doc/builders/packages/eclipse.section.md b/doc/builders/packages/eclipse.section.md index 8cf7426833b8..e19510e131a0 100644 --- a/doc/builders/packages/eclipse.section.md +++ b/doc/builders/packages/eclipse.section.md @@ -43,11 +43,11 @@ packageOverrides = pkgs: { name = "myplugin1-1.0"; srcFeature = fetchurl { url = "http://…/features/myplugin1.jar"; - sha256 = "123…"; + hash = "sha256-123…"; }; srcPlugin = fetchurl { url = "http://…/plugins/myplugin1.jar"; - sha256 = "123…"; + hash = "sha256-123…"; }; }); (plugins.buildEclipseUpdateSite { @@ -55,7 +55,7 @@ packageOverrides = pkgs: { src = fetchurl { stripRoot = false; url = "http://…/myplugin2.zip"; - sha256 = "123…"; + hash = "sha256-123…"; }; }); ]; diff --git a/doc/builders/packages/firefox.section.md b/doc/builders/packages/firefox.section.md index 0dd786a599d0..46bc0457a3dc 100644 --- a/doc/builders/packages/firefox.section.md +++ b/doc/builders/packages/firefox.section.md @@ -12,7 +12,7 @@ The `wrapFirefox` function allows to pass policies, preferences and extensions t (fetchFirefoxAddon { name = "ublock"; # Has to be unique! url = "https://addons.mozilla.org/firefox/downloads/file/3679754/ublock_origin-1.31.0-an+fx.xpi"; - sha256 = "1h768ljlh3pi23l27qp961v1hd0nbj2vasgy11bmcrlqp40zgvnr"; + hash = "sha256-2e73AbmYZlZXCP5ptYVcFjQYdjDp4iPoEPEOSCVF5sA="; }) ]; diff --git a/doc/builders/packages/ibus.section.md b/doc/builders/packages/ibus.section.md index 1b09d3fbbab9..ec78cd0c9a96 100644 --- a/doc/builders/packages/ibus.section.md +++ b/doc/builders/packages/ibus.section.md @@ -4,7 +4,7 @@ This package is an ibus-based completion method to speed up typing. ## Activating the engine {#sec-ibus-typing-booster-activate} -IBus needs to be configured accordingly to activate `typing-booster`. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the [upstream docs](https://mike-fabian.github.io/ibus-typing-booster/documentation.html). +IBus needs to be configured accordingly to activate `typing-booster`. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the [upstream docs](https://mike-fabian.github.io/ibus-typing-booster/). On NixOS, you need to explicitly enable `ibus` with given engines before customizing your desktop to use `typing-booster`. This can be achieved using the `ibus` module: diff --git a/doc/builders/packages/weechat.section.md b/doc/builders/packages/weechat.section.md index 767cc604ab45..755b6e6ad1ea 100644 --- a/doc/builders/packages/weechat.section.md +++ b/doc/builders/packages/weechat.section.md @@ -73,7 +73,7 @@ stdenv.mkDerivation { name = "exemplary-weechat-script"; src = fetchurl { url = "https://scripts.tld/your-scripts.tar.gz"; - sha256 = "..."; + hash = "..."; }; passthru.scripts = [ "foo.py" "bar.lua" ]; installPhase = '' diff --git a/doc/builders/special.xml b/doc/builders/special.xml index 8902ce5c8132..525eb71abfe7 100644 --- a/doc/builders/special.xml +++ b/doc/builders/special.xml @@ -7,4 +7,5 @@ + diff --git a/doc/builders/special/darwin-builder.section.md b/doc/builders/special/darwin-builder.section.md new file mode 100644 index 000000000000..3913b692498d --- /dev/null +++ b/doc/builders/special/darwin-builder.section.md @@ -0,0 +1,63 @@ +# darwin.builder {#sec-darwin-builder} + +`darwin.builder` provides a way to bootstrap a Linux builder on a macOS machine. + +This requires macOS version 12.4 or later. + +This also requires that port 22 on your machine is free (since Nix does not +permit specifying a non-default SSH port for builders). + +You will also need to be a trusted user for your Nix installation. In other +words, your `/etc/nix/nix.conf` should have something like: + +``` +extra-trusted-users = +``` + +To launch the builder, run the following flake: + +```ShellSession +$ nix run nixpkgs#darwin.builder +``` + +That will prompt you to enter your `sudo` password: + +``` ++ sudo --reset-timestamp /nix/store/…-install-credentials.sh ./keys +Password: +``` + +… so that it can install a private key used to `ssh` into the build server. +After that the script will launch the virtual machine and automatically log you +in as the `builder` user: + +``` +<<< Welcome to NixOS 22.11.20220901.1bd8d11 (aarch64) - ttyAMA0 >>> + +Run 'nixos-help' for the NixOS manual. + +nixos login: builder (automatic login) + + +[builder@nixos:~]$ +``` + +> Note: When you need to stop the VM, run `shutdown now` as the `builder` user. + +To delegate builds to the remote builder, add the following options to your +`nix.conf` file: + +``` +# - Replace ${ARCH} with either aarch64 or x86_64 to match your host machine +# - Replace ${MAX_JOBS} with the maximum number of builds (pick 4 if you're not sure) +builders = ssh-ng://builder@localhost ${ARCH}-linux /etc/nix/builder_ed25519 ${MAX_JOBS} - - - c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUpCV2N4Yi9CbGFxdDFhdU90RStGOFFVV3JVb3RpQzVxQkorVXVFV2RWQ2Igcm9vdEBuaXhvcwo= + +# Not strictly necessary, but this will reduce your disk utilization +builders-use-substitutes = true +``` + +… and then restart your Nix daemon to apply the change: + +```ShellSession +$ sudo launchctl kickstart -k system/org.nixos.nix-daemon +``` diff --git a/doc/builders/testers.chapter.md b/doc/builders/testers.chapter.md index 58bb06f23137..a0f0f97f9d53 100644 --- a/doc/builders/testers.chapter.md +++ b/doc/builders/testers.chapter.md @@ -1,6 +1,19 @@ # Testers {#chap-testers} This chapter describes several testing builders which are available in the testers namespace. +## `hasPkgConfigModule` {#tester-hasPkgConfigModule} + +Checks whether a package exposes a certain `pkg-config` module. + +Example: + +```nix +passthru.tests.pkg-config = testers.hasPkgConfigModule { + package = finalAttrs.finalPackage; + moduleName = "libfoo"; +} +``` + ## `testVersion` {#tester-testVersion} Checks the command output contains the specified version @@ -62,7 +75,7 @@ runCommand "example" { ''; ``` -While `testBuildFailure` is designed to keep changes to the original builder's +While `testBuildFailure` is designed to keep changes to the original builder's environment to a minimum, some small changes are inevitable. - The file `$TMPDIR/testBuildFailure.log` is present. It should not be deleted. @@ -147,7 +160,7 @@ tests.fetchgit = testers.invalidateFetcherByDrvHash fetchgit { name = "nix-source"; url = "https://github.com/NixOS/nix"; rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; - sha256 = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY="; + hash = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY="; }; ``` diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index a5f2ae2822f8..f6a0970165f5 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -260,6 +260,10 @@ When in doubt, consider refactoring the `pkgs/` tree, e.g. creating new categori - `development/tools/build-managers` (e.g. `gnumake`) + - **If it’s a _language server_:** + + - `development/tools/language-servers` (e.g. `ccls` or `rnix-lsp`) + - **Else:** - `development/tools/misc` (e.g. `binutils`) @@ -426,9 +430,10 @@ In the file `pkgs/top-level/all-packages.nix` you can find fetch helpers, these ```nix src = fetchgit { + url = "git@github.com:NixOS/nix.git" url = "git://github.com/NixOS/nix.git"; rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; - sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg"; + hash = "sha256-7D4m+saJjbSFP5hOwpQq2FGR2rr+psQMTcyb1ZvtXsQ="; } ``` @@ -438,7 +443,7 @@ In the file `pkgs/top-level/all-packages.nix` you can find fetch helpers, these src = fetchgit { url = "https://github.com/NixOS/nix.git"; rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; - sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg"; + hash = "sha256-7D4m+saJjbSFP5hOwpQq2FGR2rr+psQMTcyb1ZvtXsQ="; } ``` @@ -449,14 +454,14 @@ In the file `pkgs/top-level/all-packages.nix` you can find fetch helpers, these owner = "NixOS"; repo = "nix"; rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; - sha256 = "1i2yxndxb6yc9l6c99pypbd92lfq5aac4klq7y2v93c9qvx2cgpc"; + hash = "ha256-7D4m+saJjbSFP5hOwpQq2FGR2rr+psQMTcyb1ZvtXsQ=; } ``` When fetching from GitHub, commits must always be referenced by their full commit hash. This is because GitHub shares commit hashes among all forks and returns `404 Not Found` when a short commit hash is ambiguous. It already happens for some short, 6-character commit hashes in `nixpkgs`. It is a practical vector for a denial-of-service attack by pushing large amounts of auto generated commits into forks and was already [demonstrated against GitHub Actions Beta](https://blog.teddykatz.com/2019/11/12/github-actions-dos.html). -Find the value to put as `sha256` by running `nix-shell -p nix-prefetch-github --run "nix-prefetch-github --rev 1f795f9f44607cc5bec70d1300150bfefcef2aae NixOS nix"`. +Find the value to put as `hash` by running `nix-shell -p nix-prefetch-github --run "nix-prefetch-github --rev 1f795f9f44607cc5bec70d1300150bfefcef2aae NixOS nix"`. ## Obtaining source hash {#sec-source-hashes} @@ -486,12 +491,12 @@ Preferred source hash type is sha256. There are several ways to get it. - `lib.fakeHash` - `lib.fakeSha256` - `lib.fakeSha512` - + in the package expression, attempt build and extract correct hash from error messages. ::: {.warning} You must use one of these four fake hashes and not some arbitrarily-chosen hash. - + See [](#sec-source-hashes-security). ::: @@ -519,7 +524,7 @@ patches = [ (fetchpatch { name = "fix-check-for-using-shared-freetype-lib.patch"; url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=8f5d285"; - sha256 = "1f0k043rng7f0rfl9hhb89qzvvksqmkrikmm38p61yfx51l325xr"; + hash = "sha256-uRcxaCjd+WAuGrXOmGfFeu79cUILwkRdBu48mwcBE7g="; }) ]; ``` @@ -669,3 +674,18 @@ stdenv.mkDerivation { ... } ``` + +### Import From Derivation {#ssec-import-from-derivation} + +Import From Derivation (IFD) is disallowed in Nixpkgs for performance reasons: +[Hydra] evaluates the entire package set, and sequential builds during evaluation would increase evaluation times to become impractical. + +[Hydra]: https://github.com/NixOS/hydra + +Import From Derivation can be worked around in some cases by committing generated intermediate files to version control and reading those instead. + + + +See also [NixOS Wiki: Import From Derivation]. + +[NixOS Wiki: Import From Derivation]: https://nixos.wiki/wiki/Import_From_Derivation diff --git a/doc/contributing/contributing-to-documentation.chapter.md b/doc/contributing/contributing-to-documentation.chapter.md index 81482523cd0e..a732eee4b962 100644 --- a/doc/contributing/contributing-to-documentation.chapter.md +++ b/doc/contributing/contributing-to-documentation.chapter.md @@ -27,7 +27,7 @@ If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual. As per [RFC 0072](https://github.com/NixOS/rfcs/pull/72), all new documentation content should be written in [CommonMark](https://commonmark.org/) Markdown dialect. -Additional syntax extensions are available, though not all extensions can be used in NixOS option documentation. The following extensions are currently used: +Additional syntax extensions are available, all of which can be used in NixOS option documentation. The following extensions are currently used: - []{#ssec-contributing-markup-anchors} Explicitly defined **anchors** on headings, to allow linking to sections. These should be always used, to ensure the anchors can be linked even when the heading text changes, and to prevent conflicts between [automatically assigned identifiers](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/auto_identifiers.md). @@ -38,6 +38,10 @@ Additional syntax extensions are available, though not all extensions can be use ## Syntax {#sec-contributing-markup} ``` + ::: {.note} + NixOS option documentation does not support headings in general. + ::: + - []{#ssec-contributing-markup-anchors-inline} **Inline anchors**, which allow linking arbitrary place in the text (e.g. individual list items, sentences…). @@ -53,7 +57,7 @@ Additional syntax extensions are available, though not all extensions can be use This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/using/syntax.html#targets-and-cross-referencing). - []{#ssec-contributing-markup-inline-roles} - If you want to link to a man page, you can use `` {manpage}`nix.conf(5)` ``, which will turn into {manpage}`nix.conf(5)`. The references will turn into links when a mapping exists in {file}`doc/build-aux/pandoc-filters/link-unix-man-references.lua`. + If you want to link to a man page, you can use `` {manpage}`nix.conf(5)` ``, which will turn into {manpage}`nix.conf(5)`. The references will turn into links when a mapping exists in {file}`doc/manpage-urls.json`. A few markups for other kinds of literals are also available: @@ -67,10 +71,6 @@ Additional syntax extensions are available, though not all extensions can be use This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/syntax/syntax.html#roles-an-in-line-extension-point). Though, the feature originates from [reStructuredText](https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-manpage) with slightly different syntax. - ::: {.note} - Inline roles are available for option documentation. - ::: - - []{#ssec-contributing-markup-admonitions} **Admonitions**, set off from the text to bring attention to something. @@ -96,10 +96,6 @@ Additional syntax extensions are available, though not all extensions can be use - [`tip`](https://tdg.docbook.org/tdg/5.0/tip.html) - [`warning`](https://tdg.docbook.org/tdg/5.0/warning.html) - ::: {.note} - Admonitions are available for option documentation. - ::: - - []{#ssec-contributing-markup-definition-lists} [**Definition lists**](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/definition_lists.md), for defining a group of terms: diff --git a/doc/contributing/quick-start.chapter.md b/doc/contributing/quick-start.chapter.md index 96b30d3822c1..e6bb5f2b0b60 100644 --- a/doc/contributing/quick-start.chapter.md +++ b/doc/contributing/quick-start.chapter.md @@ -34,7 +34,7 @@ To add a package to Nixpkgs: - Apache HTTPD: [`pkgs/servers/http/apache-httpd/2.4.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/2.4.nix). A bunch of optional features, variable substitutions in the configure flags, a post-install hook, and miscellaneous hackery. - - Thunderbird: [`pkgs/applications/networking/mailreaders/thunderbird/default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/default.nix). Lots of dependencies. + - buildMozillaMach: [`pkgs/applications/networking/browser/firefox/common.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/browsers/firefox/common.nix). A reusable build function for Firefox, Thunderbird and Librewolf. - JDiskReport, a Java utility: [`pkgs/tools/misc/jdiskreport/default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix). Nixpkgs doesn’t have a decent `stdenv` for Java yet so this is pretty ad-hoc. diff --git a/doc/contributing/reviewing-contributions.chapter.md b/doc/contributing/reviewing-contributions.chapter.md index 0e6a0dd5b530..6685c5b60a2c 100644 --- a/doc/contributing/reviewing-contributions.chapter.md +++ b/doc/contributing/reviewing-contributions.chapter.md @@ -185,7 +185,7 @@ Sample template for a new module review is provided below. ##### Comments ``` -## Individual maintainer list {#reviewing-contributions-indvidual-maintainer-list} +## Individual maintainer list {#reviewing-contributions-individual-maintainer-list} When adding users to `maintainers/maintainer-list.nix`, the following checks should be performed: diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index e80a264dea68..96e2ecf970cb 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -76,7 +76,7 @@ Security fixes are submitted in the same way as other changes and thus the same (fetchpatch { name = "CVE-2019-11068.patch"; url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch"; - sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8"; + hash = "sha256-SEKe/8HcW0UBHCfPTTOnpRlzmV2nQPPeL6HOMxBZd14="; }) ``` @@ -199,7 +199,7 @@ It’s important to test any executables generated by a build when you change or ### Meets Nixpkgs contribution standards {#submitting-changes-contribution-standards} -The last checkbox is fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). The contributing document has detailed information on standards the Nix community has for commit messages, reviews, licensing of contributions you make to the project, etc\... Everyone should read and understand the standards the community has for contributing before submitting a pull request. +The last checkbox is fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). The contributing document has detailed information on standards the Nix community has for commit messages, reviews, licensing of contributions you make to the project, etc... Everyone should read and understand the standards the community has for contributing before submitting a pull request. ## Hotfixing pull requests {#submitting-changes-hotfixing-pull-requests} diff --git a/doc/default.nix b/doc/default.nix index ac382ec8519c..1d5fa4811a36 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -36,4 +36,5 @@ in pkgs.stdenv.mkDerivation { # Environment variables PANDOC_LUA_FILTERS_DIR = "${pkgs.pandoc-lua-filters}/share/pandoc/filters"; + PANDOC_LINK_MANPAGES_FILTER = import build-aux/pandoc-filters/link-manpages.nix { inherit pkgs; }; } diff --git a/doc/doc-support/default.nix b/doc/doc-support/default.nix index 429c7a5fbe80..e9cb96e37fdd 100644 --- a/doc/doc-support/default.nix +++ b/doc/doc-support/default.nix @@ -3,8 +3,23 @@ let inherit (pkgs) lib; inherit (lib) hasPrefix removePrefix; - locationsXml = import ./lib-function-locations.nix { inherit pkgs nixpkgs; }; - functionDocs = import ./lib-function-docs.nix { inherit locationsXml pkgs; }; + libsets = [ + { name = "asserts"; description = "assertion functions"; } + { name = "attrsets"; description = "attribute set functions"; } + { name = "strings"; description = "string manipulation functions"; } + { name = "versions"; description = "version string functions"; } + { name = "trivial"; description = "miscellaneous functions"; } + { name = "lists"; description = "list manipulation functions"; } + { name = "debug"; description = "debugging functions"; } + { name = "options"; description = "NixOS / nixpkgs option handling"; } + { name = "path"; description = "path functions"; } + { name = "filesystem"; description = "filesystem functions"; } + { name = "sources"; description = "source filtering functions"; } + { name = "cli"; description = "command-line serialization functions"; } + ]; + + locationsXml = import ./lib-function-locations.nix { inherit pkgs nixpkgs libsets; }; + functionDocs = import ./lib-function-docs.nix { inherit locationsXml pkgs libsets; }; version = pkgs.lib.version; epub-xsl = pkgs.writeText "epub.xsl" '' diff --git a/doc/doc-support/lib-function-docs.nix b/doc/doc-support/lib-function-docs.nix index cbcbed4310af..cf218fa70401 100644 --- a/doc/doc-support/lib-function-docs.nix +++ b/doc/doc-support/lib-function-docs.nix @@ -1,28 +1,36 @@ -# Generates the documentation for library functons via nixdoc. To add -# another library function file to this list, the include list in the -# file `doc/functions/library.xml` must also be updated. +# Generates the documentation for library functions via nixdoc. -{ pkgs ? import ./.. {}, locationsXml }: +{ pkgs, locationsXml, libsets }: with pkgs; stdenv.mkDerivation { name = "nixpkgs-lib-docs"; - src = ./../../lib; + src = ../../lib; buildInputs = [ nixdoc ]; installPhase = '' function docgen { - nixdoc -c "$1" -d "$2" -f "../lib/$1.nix" > "$out/$1.xml" + # TODO: wrap lib.$1 in , make nixdoc not escape it + if [[ -e "../lib/$1.nix" ]]; then + nixdoc -c "$1" -d "lib.$1: $2" -f "$1.nix" > "$out/$1.xml" + else + nixdoc -c "$1" -d "lib.$1: $2" -f "$1/default.nix" > "$out/$1.xml" + fi + echo "" >> "$out/index.xml" } - mkdir -p $out - ln -s ${locationsXml} $out/locations.xml + mkdir -p "$out" - docgen strings 'String manipulation functions' - docgen trivial 'Miscellaneous functions' - docgen lists 'List manipulation functions' - docgen debug 'Debugging functions' - docgen options 'NixOS / nixpkgs option handling' - docgen filesystem 'Filesystem functions' - docgen sources 'Source filtering functions' + cat > "$out/index.xml" << 'EOF' + + + EOF + + ${lib.concatMapStrings ({ name, description }: '' + docgen ${name} ${lib.escapeShellArg description} + '') libsets} + + echo "" >> "$out/index.xml" + + ln -s ${locationsXml} $out/locations.xml ''; } diff --git a/doc/doc-support/lib-function-locations.nix b/doc/doc-support/lib-function-locations.nix index 68edd2709854..3ede09ba50f5 100644 --- a/doc/doc-support/lib-function-locations.nix +++ b/doc/doc-support/lib-function-locations.nix @@ -1,24 +1,24 @@ -{ pkgs ? (import ./.. { }), nixpkgs ? { }}: +{ pkgs, nixpkgs ? { }, libsets }: let revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.revision or "master"); - libDefPos = set: - builtins.map - (name: { - name = name; + libDefPos = prefix: set: + builtins.concatMap + (name: [{ + name = builtins.concatStringsSep "." (prefix ++ [name]); location = builtins.unsafeGetAttrPos name set; - }) - (builtins.attrNames set); + }] ++ nixpkgsLib.optionals + (builtins.length prefix == 0 && builtins.isAttrs set.${name}) + (libDefPos (prefix ++ [name]) set.${name}) + ) (builtins.attrNames set); libset = toplib: builtins.map (subsetname: { subsetname = subsetname; - functions = libDefPos toplib.${subsetname}; + functions = libDefPos [] toplib.${subsetname}; }) - (builtins.filter - (name: builtins.isAttrs toplib.${name}) - (builtins.attrNames toplib)); + (builtins.map (x: x.name) libsets); nixpkgsLib = pkgs.lib; diff --git a/doc/doc-support/parameters.xml b/doc/doc-support/parameters.xml index 8b413dcd337a..5b39d2f7f1a5 100644 --- a/doc/doc-support/parameters.xml +++ b/doc/doc-support/parameters.xml @@ -2,12 +2,16 @@ - - + + + + + - + + diff --git a/doc/functions/library.xml b/doc/functions/library.xml index b291356c14b8..788ea0b94f1f 100644 --- a/doc/functions/library.xml +++ b/doc/functions/library.xml @@ -8,25 +8,7 @@ Nixpkgs provides a standard library at pkgs.lib, or through import <nixpkgs/lib>. - - - - - - - - - - - - - - - - - - - + + diff --git a/doc/functions/library/.gitkeep b/doc/functions/library/.gitkeep new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/doc/functions/library/asserts.xml b/doc/functions/library/asserts.xml deleted file mode 100644 index 7c94222ef139..000000000000 --- a/doc/functions/library/asserts.xml +++ /dev/null @@ -1,112 +0,0 @@ -
- Assert functions - -
- <function>lib.asserts.assertMsg</function> - - assertMsg :: Bool -> String -> Bool - - - - - - Print a trace message if pred is false. - - - - Intended to be used to augment asserts with helpful error messages. - - - - - - pred - - - - Condition under which the msg should not be printed. - - - - - - msg - - - - Message to print. - - - - - - - Printing when the predicate is false - trace: foo is not bar, silly -stderr> assert failed -]]> - -
- -
- <function>lib.asserts.assertOneOf</function> - - assertOneOf :: String -> String -> - StringList -> Bool - - - - - - Specialized asserts.assertMsg for checking if val is one of the elements of xs. Useful for checking enums. - - - - - - name - - - - The name of the variable the user entered val into, for inclusion in the error message. - - - - - - val - - - - The value of what the user provided, to be compared against the values in xs. - - - - - - xs - - - - The list of valid values. - - - - - - - Ensuring a user provided a possible value - false -stderr> trace: sslLibrary must be one of "openssl", "libressl", but is: "bearssl" - ]]> - -
-
diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml deleted file mode 100644 index 052bfa1f6ae3..000000000000 --- a/doc/functions/library/attrsets.xml +++ /dev/null @@ -1,1751 +0,0 @@ -
- Attribute-Set Functions - -
- <function>lib.attrset.attrByPath</function> - - attrByPath :: [String] -> Any -> AttrSet -> Any - - - - - - Return an attribute from within nested attribute sets. - - - - - - attrPath - - - - A list of strings representing the path through the nested attribute set set. - - - - - - default - - - - Default value if attrPath does not resolve to an existing value. - - - - - - set - - - - The nested attributeset to select values from. - - - - - - - Extracting a value from a nested attribute set - 3 -]]> - - - - No value at the path, instead using the default - 0 -]]> - -
- -
- <function>lib.attrsets.hasAttrByPath</function> - - hasAttrByPath :: [String] -> AttrSet -> Bool - - - - - - Determine if an attribute exists within a nested attribute set. - - - - - - attrPath - - - - A list of strings representing the path through the nested attribute set set. - - - - - - set - - - - The nested attributeset to check. - - - - - - - A nested value does exist inside a set - true -]]> - -
- -
- <function>lib.attrsets.setAttrByPath</function> - - setAttrByPath :: [String] -> Any -> AttrSet - - - - - - Create a new attribute set with value set at the nested attribute location specified in attrPath. - - - - - - attrPath - - - - A list of strings representing the path through the nested attribute set. - - - - - - value - - - - The value to set at the location described by attrPath. - - - - - - - Creating a new nested attribute set - { a = { b = 3; }; } -]]> - -
- -
- <function>lib.attrsets.getAttrFromPath</function> - - getAttrFromPath :: [String] -> AttrSet -> Value - - - - - - Like except without a default, and it will throw if the value doesn't exist. - - - - - - attrPath - - - - A list of strings representing the path through the nested attribute set set. - - - - - - set - - - - The nested attribute set to find the value in. - - - - - - - Succesfully getting a value from an attribute set - 3 -]]> - - - - Throwing after failing to get a value from an attribute set - error: cannot find attribute `x.y' -]]> - -
- -
- <function>lib.attrsets.attrVals</function> - - attrVals :: [String] -> AttrSet -> [Any] - - - - - - Return the specified attributes from a set. All values must exist. - - - - - - nameList - - - - The list of attributes to fetch from set. Each attribute name must exist on the attrbitue set. - - - - - - set - - - - The set to get attribute values from. - - - - - - - Getting several values from an attribute set - [ 1 2 3 ] -]]> - - - - Getting missing values from an attribute set - - -
- -
- <function>lib.attrsets.attrValues</function> - - attrValues :: AttrSet -> [Any] - - - - - - Get all the attribute values from an attribute set. - - - - Provides a backwards-compatible interface of builtins.attrValues for Nix version older than 1.8. - - - - - - attrs - - - - The attribute set. - - - - - - - - [ 1 2 3 ] -]]> - -
- -
- <function>lib.attrsets.catAttrs</function> - - catAttrs :: String -> [AttrSet] -> [Any] - - - - - - Collect each attribute named `attr' from the list of attribute sets, sets. Sets that don't contain the named attribute are ignored. - - - - Provides a backwards-compatible interface of builtins.catAttrs for Nix version older than 1.9. - - - - - - attr - - - - Attribute name to select from each attribute set in sets. - - - - - - sets - - - - The list of attribute sets to select attr from. - - - - - - - Collect an attribute from a list of attribute sets. - - Attribute sets which don't have the attribute are ignored. - - [ 1 2 ] - ]]> - -
- -
- <function>lib.attrsets.filterAttrs</function> - - filterAttrs :: (String -> Any -> Bool) -> AttrSet -> AttrSet - - - - - - Filter an attribute set by removing all attributes for which the given predicate return false. - - - - - - pred - - - - String -> Any -> Bool - - - Predicate which returns true to include an attribute, or returns false to exclude it. - - - - - name - - - - The attribute's name - - - - - - value - - - - The attribute's value - - - - - - Returns true to include the attribute, false to exclude the attribute. - - - - - - set - - - - The attribute set to filter - - - - - - - Filtering an attributeset - { foo = 1; } -]]> - -
- -
- <function>lib.attrsets.filterAttrsRecursive</function> - - filterAttrsRecursive :: (String -> Any -> Bool) -> AttrSet -> AttrSet - - - - - - Filter an attribute set recursively by removing all attributes for which the given predicate return false. - - - - - - pred - - - - String -> Any -> Bool - - - Predicate which returns true to include an attribute, or returns false to exclude it. - - - - - name - - - - The attribute's name - - - - - - value - - - - The attribute's value - - - - - - Returns true to include the attribute, false to exclude the attribute. - - - - - - set - - - - The attribute set to filter - - - - - - - Recursively filtering an attribute set - { - levelA = { - example = "hi"; - levelB = { - hello = "there"; - this-one-is-present = { }; - }; - }; - } - ]]> - -
- -
- <function>lib.attrsets.foldAttrs</function> - - foldAttrs :: (Any -> Any -> Any) -> Any -> [AttrSets] -> Any - - - - - - Apply fold function to values grouped by key. - - - - - - op - - - - Any -> Any -> Any - - - Given a value val and a collector col, combine the two. - - - - - val - - - - An attribute's value - - - - - - col - - - - - The result of previous op calls with other values and nul. - - - - - - - - - nul - - - - The null-value, the starting value. - - - - - - list_of_attrs - - - - A list of attribute sets to fold together by key. - - - - - - - Combining an attribute of lists in to one attribute set - { a = [ 2 3 ]; b = [ 7 6 ]; } -]]> - -
- -
- <function>lib.attrsets.collect</function> - - collect :: (Any -> Bool) -> AttrSet -> [Any] - - - - - - Recursively collect sets that verify a given predicate named pred from the set attrs. The recursion stops when pred returns true. - - - - - - pred - - - - Any -> Bool - - - Given an attribute's value, determine if recursion should stop. - - - - - value - - - - The attribute set value. - - - - - - - - - attrs - - - - The attribute set to recursively collect. - - - - - - - Collecting all lists from an attribute set - [["b"] [1]] -]]> - - - - Collecting all attribute-sets which contain the <literal>outPath</literal> attribute name. - [{ outPath = "a/"; } { outPath = "b/"; }] -]]> - -
- -
- <function>lib.attrsets.nameValuePair</function> - - nameValuePair :: String -> Any -> AttrSet - - - - - - Utility function that creates a {name, value} pair as expected by builtins.listToAttrs. - - - - - - name - - - - The attribute name. - - - - - - value - - - - The attribute value. - - - - - - - Creating a name value pair - { name = "some"; value = 6; } -]]> - -
- -
- <function>lib.attrsets.mapAttrs</function> - - - - - - - - Apply a function to each element in an attribute set, creating a new attribute set. - - - - Provides a backwards-compatible interface of builtins.mapAttrs for Nix version older than 2.1. - - - - - - fn - - - - String -> Any -> Any - - - Given an attribute's name and value, return a new value. - - - - - name - - - - The name of the attribute. - - - - - - value - - - - The attribute's value. - - - - - - - - - - Modifying each value of an attribute set - { x = "x-foo"; y = "y-bar"; } -]]> - -
- -
- <function>lib.attrsets.mapAttrs'</function> - - mapAttrs' :: (String -> Any -> { name = String; value = Any }) -> AttrSet -> AttrSet - - - - - - Like mapAttrs, but allows the name of each attribute to be changed in addition to the value. The applied function should return both the new name and value as a nameValuePair. - - - - - - fn - - - - String -> Any -> { name = String; value = Any } - - - Given an attribute's name and value, return a new name value pair. - - - - - name - - - - The name of the attribute. - - - - - - value - - - - The attribute's value. - - - - - - - - - set - - - - The attribute set to map over. - - - - - - - Change the name and value of each attribute of an attribute set - { foo_x = "bar-a"; foo_y = "bar-b"; } - - ]]> - -
- -
- <function>lib.attrsets.mapAttrsToList</function> - - mapAttrsToList :: (String -> Any -> Any) -> - AttrSet -> [Any] - - - - - - Call fn for each attribute in the given set and return the result in a list. - - - - - - fn - - - - String -> Any -> Any - - - Given an attribute's name and value, return a new value. - - - - - name - - - - The name of the attribute. - - - - - - value - - - - The attribute's value. - - - - - - - - - set - - - - The attribute set to map over. - - - - - - - Combine attribute values and names in to a list - [ "x=a" "y=b" ] -]]> - -
- -
- <function>lib.attrsets.mapAttrsRecursive</function> - - mapAttrsRecursive :: ([String] > Any -> Any) -> AttrSet -> AttrSet - - - - - - Like mapAttrs, except that it recursively applies itself to attribute sets. Also, the first argument of the argument function is a list of the names of the containing attributes. - - - - - - f - - - - [ String ] -> Any -> Any - - - Given a list of attribute names and value, return a new value. - - - - - name_path - - - - The list of attribute names to this value. - - - For example, the name_path for the example string in the attribute set { foo = { bar = "example"; }; } is [ "foo" "bar" ]. - - - - - - value - - - - The attribute's value. - - - - - - - - - set - - - - The attribute set to recursively map over. - - - - - - - A contrived example of using <function>lib.attrsets.mapAttrsRecursive</function> - { - n = { - a = "n-a-A"; - m = { - b = "n-m-b-B"; - c = "n-m-c-C"; - }; - }; - d = "d-D"; - } - ]]> - -
- -
- <function>lib.attrsets.mapAttrsRecursiveCond</function> - - mapAttrsRecursiveCond :: (AttrSet -> Bool) -> ([ String ] -> Any -> Any) -> AttrSet -> AttrSet - - - - - - Like mapAttrsRecursive, but it takes an additional predicate function that tells it whether to recursive into an attribute set. If it returns false, mapAttrsRecursiveCond does not recurse, but does apply the map function. It is returns true, it does recurse, and does not apply the map function. - - - - - - cond - - - - (AttrSet -> Bool) - - - Determine if mapAttrsRecursive should recurse deeper in to the attribute set. - - - - - attributeset - - - - An attribute set. - - - - - - - - - f - - - - [ String ] -> Any -> Any - - - Given a list of attribute names and value, return a new value. - - - - - name_path - - - - The list of attribute names to this value. - - - For example, the name_path for the example string in the attribute set { foo = { bar = "example"; }; } is [ "foo" "bar" ]. - - - - - - value - - - - The attribute's value. - - - - - - - - - set - - - - The attribute set to recursively map over. - - - - - - - Only convert attribute values to JSON if the containing attribute set is marked for recursion - { - dorecur = { - hello = "\"there\""; - recurse = "true"; - }; - dontrecur = "{\"converted-to\":\"json\"}"; - } - ]]> - -
- -
- <function>lib.attrsets.genAttrs</function> - - genAttrs :: [ String ] -> (String -> Any) -> AttrSet - - - - - - Generate an attribute set by mapping a function over a list of attribute names. - - - - - - names - - - - Names of values in the resulting attribute set. - - - - - - f - - - - String -> Any - - - Takes the name of the attribute and return the attribute's value. - - - - - name - - - - The name of the attribute to generate a value for. - - - - - - - - - - Generate an attrset based on names only - { foo = "x_foo"; bar = "x_bar"; } - ]]> - -
- -
- <function>lib.attrsets.isDerivation</function> - - isDerivation :: Any -> Bool - - - - - - Check whether the argument is a derivation. Any set with { type = "derivation"; } counts as a derivation. - - - - - - value - - - - The value which is possibly a derivation. - - - - - - - A package is a derivation - {}).ruby -=> true - ]]> - - - - Anything else is not a derivation - false - ]]> - -
- -
- <function>lib.attrsets.toDerivation</function> - - toDerivation :: Path -> Derivation - - - - - - Converts a store path to a fake derivation. - - - - - - path - - - - A store path to convert to a derivation. - - - - -
- -
- <function>lib.attrsets.optionalAttrs</function> - - optionalAttrs :: Bool -> AttrSet - - - - - - Conditionally return an attribute set or an empty attribute set. - - - - - - cond - - - - Condition under which the as attribute set is returned. - - - - - - as - - - - The attribute set to return if cond is true. - - - - - - - Return the provided attribute set when <varname>cond</varname> is true - { my = "set"; } - ]]> - - - - Return an empty attribute set when <varname>cond</varname> is false - { } - ]]> - -
- -
- <function>lib.attrsets.zipAttrsWithNames</function> - - zipAttrsWithNames :: [ String ] -> (String -> [ Any ] -> Any) -> [ AttrSet ] -> AttrSet - - - - - - Merge sets of attributes and use the function f to merge attribute values where the attribute name is in names. - - - - - - names - - - - A list of attribute names to zip. - - - - - - f - - - - (String -> [ Any ] -> Any - - - Accepts an attribute name, all the values, and returns a combined value. - - - - - name - - - - The name of the attribute each value came from. - - - - - - vs - - - - A list of values collected from the list of attribute sets. - - - - - - - - - sets - - - - A list of attribute sets to zip together. - - - - - - - Summing a list of attribute sets of numbers - { a = "a 11"; b = "b 101"; } - ]]> - -
- -
- <function>lib.attrsets.zipAttrsWith</function> - - zipAttrsWith :: (String -> [ Any ] -> Any) -> [ AttrSet ] -> AttrSet - - - - - - Merge sets of attributes and use the function f to merge attribute values. Similar to where all key names are passed for names. - - - - - - f - - - - (String -> [ Any ] -> Any - - - Accepts an attribute name, all the values, and returns a combined value. - - - - - name - - - - The name of the attribute each value came from. - - - - - - vs - - - - A list of values collected from the list of attribute sets. - - - - - - - - - sets - - - - A list of attribute sets to zip together. - - - - - - - Summing a list of attribute sets of numbers - { a = "a 11"; b = "b 101"; c = "c 1001"; } - ]]> - -
- -
- <function>lib.attrsets.zipAttrs</function> - - zipAttrs :: [ AttrSet ] -> AttrSet - - - - - - Merge sets of attributes and combine each attribute value in to a list. Similar to where the merge function returns a list of all values. - - - - - - sets - - - - A list of attribute sets to zip together. - - - - - - - Combining a list of attribute sets - { a = [ 1 10 ]; b = [ 1 100 ]; c = [ 1 1000 ]; } - ]]> - -
- -
- <function>lib.attrsets.recursiveUpdateUntil</function> - - recursiveUpdateUntil :: ( [ String ] -> AttrSet -> AttrSet -> Bool ) -> AttrSet -> AttrSet -> AttrSet - - - - - - Does the same as the update operator // except that attributes are merged until the given predicate is verified. The predicate should accept 3 arguments which are the path to reach the attribute, a part of the first attribute set and a part of the second attribute set. When the predicate is verified, the value of the first attribute set is replaced by the value of the second attribute set. - - - - - - pred - - - - [ String ] -> AttrSet -> AttrSet -> Bool - - - - - path - - - - The path to the values in the left and right hand sides. - - - - - - l - - - - The left hand side value. - - - - - - r - - - - The right hand side value. - - - - - - - - - lhs - - - - The left hand attribute set of the merge. - - - - - - rhs - - - - The right hand attribute set of the merge. - - - - - - - Recursively merging two attribute sets - { - foo.bar = 1; # 'foo.*' from the second set - foo.quz = 2; # - bar = 3; # 'bar' from the first set - baz = 4; # 'baz' from the second set -} - ]]> - -
- -
- <function>lib.attrsets.recursiveUpdate</function> - - recursiveUpdate :: AttrSet -> AttrSet -> AttrSet - - - - - - A recursive variant of the update operator //. The recursion stops when one of the attribute values is not an attribute set, in which case the right hand side value takes precedence over the left hand side value. - - - - - - lhs - - - - The left hand attribute set of the merge. - - - - - - rhs - - - - The right hand attribute set of the merge. - - - - - - - Recursively merging two attribute sets - { - boot.loader.grub.enable = true; - boot.loader.grub.device = ""; -} -]]> - -
- -
- <function>lib.attrsets.recurseIntoAttrs</function> - - recurseIntoAttrs :: AttrSet -> AttrSet - - - - - - Make various Nix tools consider the contents of the resulting attribute set when looking for what to build, find, etc. - - - - This function only affects a single attribute set; it does not apply itself recursively for nested attribute sets. - - - - - - attrs - - - - An attribute set to scan for derivations. - - - - - - - Making Nix look inside an attribute set - {} }: -{ - myTools = pkgs.lib.recurseIntoAttrs { - inherit (pkgs) hello figlet; - }; -} -]]> - -
- -
- <function>lib.attrsets.cartesianProductOfSets</function> - - cartesianProductOfSets :: AttrSet -> [ AttrSet ] - - - - - - Return the cartesian product of attribute set value combinations. - - - - - - set - - - - An attribute set with attributes that carry lists of values. - - - - - - - Creating the cartesian product of a list of attribute values - [ - { a = 1; b = 10; } - { a = 1; b = 20; } - { a = 2; b = 10; } - { a = 2; b = 20; } - ] -]]> - -
-
diff --git a/doc/functions/nix-gitignore.section.md b/doc/functions/nix-gitignore.section.md index 2fb833b23000..8eb4081d2878 100644 --- a/doc/functions/nix-gitignore.section.md +++ b/doc/functions/nix-gitignore.section.md @@ -4,7 +4,7 @@ ## Usage {#sec-pkgs-nix-gitignore-usage} -`pkgs.nix-gitignore` exports a number of functions, but you\'ll most likely need either `gitignoreSource` or `gitignoreSourcePure`. As their first argument, they both accept either 1. a file with gitignore lines or 2. a string with gitignore lines, or 3. a list of either of the two. They will be concatenated into a single big string. +`pkgs.nix-gitignore` exports a number of functions, but you'll most likely need either `gitignoreSource` or `gitignoreSourcePure`. As their first argument, they both accept either 1. a file with gitignore lines or 2. a string with gitignore lines, or 3. a list of either of the two. They will be concatenated into a single big string. ```nix { pkgs ? import {} }: @@ -30,7 +30,7 @@ gitignoreSourcePure = gitignoreFilterSourcePure (_: _: true); gitignoreSource = gitignoreFilterSource (_: _: true); ``` -Those filter functions accept the same arguments the `builtins.filterSource` function would pass to its filters, thus `fn: gitignoreFilterSourcePure fn ""` should be extensionally equivalent to `filterSource`. The file is blacklisted if it\'s blacklisted by either your filter or the gitignoreFilter. +Those filter functions accept the same arguments the `builtins.filterSource` function would pass to its filters, thus `fn: gitignoreFilterSourcePure fn ""` should be extensionally equivalent to `filterSource`. The file is blacklisted if it's blacklisted by either your filter or the gitignoreFilter. If you want to make your own filter from scratch, you may use diff --git a/doc/hooks/postgresql-test-hook.section.md b/doc/hooks/postgresql-test-hook.section.md index 64f7fd415b18..8b37ca1e4b3e 100644 --- a/doc/hooks/postgresql-test-hook.section.md +++ b/doc/hooks/postgresql-test-hook.section.md @@ -9,7 +9,7 @@ stdenv.mkDerivation { # ... - checkInputs = [ + nativeCheckInputs = [ postgresql postgresqlTestHook ]; @@ -46,6 +46,12 @@ Bash-only variables: - `postgresqlEnableTCP`: set to `1` to enable TCP listening. Flaky; not recommended. - `postgresqlStartCommands`: defaults to `pg_ctl start`. +## Hooks {#sec-postgresqlTestHook-hooks} + +A number of additional hooks are ran in postgresqlTestHook + + - `postgresqlTestSetupPost`: ran after postgresql has been set up. + ## TCP and the Nix sandbox {#sec-postgresqlTestHook-tcp} `postgresqlEnableTCP` relies on network sandboxing, which is not available on macOS and some custom Nix installations, resulting in flaky tests. diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md index 775a7a1a6429..d9ed56fb83fc 100644 --- a/doc/languages-frameworks/agda.section.md +++ b/doc/languages-frameworks/agda.section.md @@ -52,7 +52,7 @@ agda.withPackages (p: [ repo = "agda-stdlib"; owner = "agda"; rev = "v1.5"; - sha256 = "16fcb7ssj6kj687a042afaa2gq48rc8abihpm14k684ncihb2k4w"; + hash = "sha256-nEyxYGSWIDNJqBfGpRDLiOAnlHJKEKAOMnIaqfVZzJk="; }; })) ]) @@ -83,7 +83,7 @@ agda.withPackages (p: [ owner = "owner"; version = "..."; rev = "..."; - sha256 = "..."; + hash = "..."; }; }) ]) diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md index 28128ead6631..6f9717ca09cc 100644 --- a/doc/languages-frameworks/android.section.md +++ b/doc/languages-frameworks/android.section.md @@ -13,6 +13,7 @@ with import {}; let androidComposition = androidenv.composeAndroidPackages { + cmdLineToolsVersion = "8.0"; toolsVersion = "26.1.1"; platformToolsVersion = "30.0.5"; buildToolsVersions = [ "30.0.3" ]; @@ -42,7 +43,10 @@ exceptions are the tools, platform-tools and build-tools sub packages. The following parameters are supported: -* `toolsVersion`, specifies the version of the tools package to use +* `cmdLineToolsVersion `, specifies the version of the `cmdline-tools` package to use +* `toolsVersion`, specifies the version of the `tools` package. Notice `tools` is + obsolete, and currently only `26.1.1` is available, so there's not a lot of + options here, however, you can set it as `null` if you don't want it. * `platformsToolsVersion` specifies the version of the `platform-tools` plugin * `buildToolsVersions` specifies the versions of the `build-tools` plugins to use. @@ -232,7 +236,6 @@ androidenv.emulateApp { platformVersion = "24"; abiVersion = "armeabi-v7a"; # mips, x86, x86_64 systemImageType = "default"; - useGoogleAPIs = false; app = ./MyApp.apk; package = "MyApp"; activity = "MainActivity"; diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index f6c74cb01e40..6b3a369c291f 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -93,7 +93,7 @@ Practical steps: - run `mix2nix > mix_deps.nix` in the upstream repo. - pass `mixNixDeps = with pkgs; import ./mix_deps.nix { inherit lib beamPackages; };` as an argument to mixRelease. -If there are git depencencies. +If there are git dependencies. - You'll need to fix the version artificially in mix.exs and regenerate the mix.lock with fixed version (on upstream). This will enable you to run `mix2nix > mix_deps.nix`. - From the mix_deps.nix file, remove the dependencies that had git versions and pass them as an override to the import function. @@ -115,7 +115,7 @@ If there are git depencencies. owner = "elixir-libraries"; repo = "prometheus.ex"; rev = "a4e9beb3c1c479d14b352fd9d6dd7b1f6d7deee5"; - sha256 = "1v0q4bi7sb253i8q016l7gwlv5562wk5zy3l2sa446csvsacnpjk"; + hash = "sha256-U17LlN6aGUKUFnT4XyYXppRN+TvUBIBRHEUsfeIiGOw="; }; # you can re-use the same beamDeps argument as generated beamDeps = with final; [ prometheus ]; @@ -124,11 +124,11 @@ If there are git depencencies. }; ``` -You will need to run the build process once to fix the sha256 to correspond to your new git src. +You will need to run the build process once to fix the hash to correspond to your new git src. ###### FOD {#fixed-output-derivation} -A fixed output derivation will download mix dependencies from the internet. To ensure reproducibility, a hash will be supplied. Note that mix is relatively reproducible. An FOD generating a different hash on each run hasn't been observed (as opposed to npm where the chances are relatively high). See [elixir_ls](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/beam-modules/elixir_ls.nix) for a usage example of FOD. +A fixed output derivation will download mix dependencies from the internet. To ensure reproducibility, a hash will be supplied. Note that mix is relatively reproducible. An FOD generating a different hash on each run hasn't been observed (as opposed to npm where the chances are relatively high). See [elixir_ls](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/beam-modules/elixir-ls/default.nix) for a usage example of FOD. Practical steps @@ -138,13 +138,13 @@ Practical steps mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version; - sha256 = lib.fakeSha256; + hash = lib.fakeHash; }; ``` -The first build will complain about the sha256 value, you can replace with the suggested value after that. +The first build will complain about the hash value, you can replace with the suggested value after that. -Note that if after you've replaced the value, nix suggests another sha256, then mix is not fetching the dependencies reproducibly. An FOD will not work in that case and you will have to use mix2nix. +Note that if after you've replaced the value, nix suggests another hash, then mix is not fetching the dependencies reproducibly. An FOD will not work in that case and you will have to use mix2nix. ##### mixRelease - example {#mix-release-example} @@ -170,7 +170,7 @@ let pname = "mix-deps-${pname}"; inherit src version; # nix will complain and tell you the right value to replace this with - sha256 = lib.fakeSha256; + hash = lib.fakeHash; # if you have build time environment variables add them here MY_ENV_VAR="my_value"; }; @@ -282,7 +282,7 @@ mkShell { ### Using an overlay -If you need to use an overlay to change some attributes of a derivation, e.g. if you need a bugfix from a version that is not yet available in nixpkgs, you can override attributes such as `version` (and the corresponding `sha256`) and then use this overlay in your development environment: +If you need to use an overlay to change some attributes of a derivation, e.g. if you need a bugfix from a version that is not yet available in nixpkgs, you can override attributes such as `version` (and the corresponding `hash`) and then use this overlay in your development environment: #### `shell.nix` @@ -291,7 +291,7 @@ let elixir_1_13_1_overlay = (self: super: { elixir_1_13 = super.elixir_1_13.override { version = "1.13.1"; - sha256 = "0z0b1w2vvw4vsnb99779c2jgn9bgslg7b1pmd9vlbv02nza9qj5p"; + sha256 = "sha256-t0ic1LcC7EV3avWGdR7VbyX7pGDpnJSW1ZvwvQUPC3w="; }; }); pkgs = import { overlays = [ elixir_1_13_1_overlay ]; }; diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md index 6a5c72cb0a94..e359acb3a809 100644 --- a/doc/languages-frameworks/coq.section.md +++ b/doc/languages-frameworks/coq.section.md @@ -8,7 +8,7 @@ The Coq derivation is overridable through the `coq.override overrides`, where ov * `customOCamlPackages` (optional, defaults to `null`, which lets Coq choose a version automatically), which can be set to any of the ocaml packages attribute of `ocaml-ng` (such as `ocaml-ng.ocamlPackages_4_10` which is the default for Coq 8.11 for example). * `coq-version` (optional, defaults to the short version e.g. "8.10"), is a version number of the form "x.y" that indicates which Coq's version build behavior to mimic when using a source which is not a release. E.g. `coq.override { version = "d370a9d1328a4e1cdb9d02ee032f605a9d94ec7a"; coq-version = "8.10"; }`. -The associated package set can be optained using `mkCoqPackages coq`, where `coq` is the derivation to use. +The associated package set can be obtained using `mkCoqPackages coq`, where `coq` is the derivation to use. ## Coq packages attribute sets: `coqPackages` {#coq-packages-attribute-sets-coqpackages} @@ -24,7 +24,7 @@ The recommended way of defining a derivation for a Coq library, is to use the `c * if it is a string of the form `"#N"`, and the domain is github, then it tries to download the current head of the pull request `#N` from github, * `defaultVersion` (optional). Coq libraries may be compatible with some specific versions of Coq only. The `defaultVersion` attribute is used when no `version` is provided (or if `version = null`) to select the version of the library to use by default, depending on the context. This selection will mainly depend on a `coq` version number but also possibly on other packages versions (e.g. `mathcomp`). If its value ends up to be `null`, the package is marked for removal in end-user `coqPackages` attribute set. * `release` (optional, defaults to `{}`), lists all the known releases of the library and for each of them provides an attribute set with at least a `sha256` attribute (you may put the empty string `""` in order to automatically insert a fake sha256, this will trigger an error which will allow you to find the correct sha256), each attribute set of the list of releases also takes optional overloading arguments for the fetcher as below (i.e.`domain`, `owner`, `repo`, `rev` assuming the default fetcher is used) and optional overrides for the result of the fetcher (i.e. `version` and `src`). -* `fetcher` (optional, defaults to a generic fetching mechanism supporting github or gitlab based infrastructures), is a function that takes at least an `owner`, a `repo`, a `rev`, and a `sha256` and returns an attribute set with a `version` and `src`. +* `fetcher` (optional, defaults to a generic fetching mechanism supporting github or gitlab based infrastructures), is a function that takes at least an `owner`, a `repo`, a `rev`, and a `hash` and returns an attribute set with a `version` and `src`. * `repo` (optional, defaults to the value of `pname`), * `owner` (optional, defaults to `"coq-community"`). * `domain` (optional, defaults to `"github.com"`), domains including the strings `"github"` or `"gitlab"` in their names are automatically supported, otherwise, one must change the `fetcher` argument to support them (cf `pkgs/development/coq-modules/heq/default.nix` for an example), diff --git a/doc/languages-frameworks/crystal.section.md b/doc/languages-frameworks/crystal.section.md index cbabba24f0c1..b97e75a58da1 100644 --- a/doc/languages-frameworks/crystal.section.md +++ b/doc/languages-frameworks/crystal.section.md @@ -27,7 +27,7 @@ crystal.buildCrystalPackage rec { owner = "mint-lang"; repo = "mint"; rev = version; - sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl"; + hash = "sha256-dFN9l5fgrM/TtOPqlQvUYgixE4KPr629aBmkwdDoq28="; }; # Insert the path to your shards.nix file here @@ -62,7 +62,7 @@ crystal.buildCrystalPackage rec { owner = "mint-lang"; repo = "mint"; rev = version; - sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl"; + hash = "sha256-dFN9l5fgrM/TtOPqlQvUYgixE4KPr629aBmkwdDoq28="; }; shardsFile = ./shards.nix; diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md index fccf66bf79d2..6300904c61c8 100644 --- a/doc/languages-frameworks/cuda.section.md +++ b/doc/languages-frameworks/cuda.section.md @@ -32,3 +32,22 @@ mypkg = let }}); in callPackage { inherit cudaPackages; }; ``` + +The CUDA NVCC compiler requires flags to determine which hardware you +want to target for in terms of SASS (real hardware) or PTX (JIT kernels). + +Nixpkgs tries to target support real architecture defaults based on the +CUDA toolkit version with PTX support for future hardware. Experienced +users may optimize this configuration for a variety of reasons such as +reducing binary size and compile time, supporting legacy hardware, or +optimizing for specific hardware. + +You may provide capabilities to add support or reduce binary size through +`config` using `cudaCapabilities = [ "6.0" "7.0" ];` and +`cudaForwardCompat = true;` if you want PTX support for future hardware. + +Please consult [GPUs supported](https://en.wikipedia.org/wiki/CUDA#GPUs_supported) +for your specific card(s). + +Library maintainers should consult [NVCC Docs](https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/) +and release notes for their software package. diff --git a/doc/languages-frameworks/cuelang.section.md b/doc/languages-frameworks/cuelang.section.md new file mode 100644 index 000000000000..ef408c7bb19b --- /dev/null +++ b/doc/languages-frameworks/cuelang.section.md @@ -0,0 +1,93 @@ +# Cue (Cuelang) {#cuelang} + +[Cuelang](https://cuelang.org/) is a language to: + +- describe schemas and validate backward-compatibility +- generate code and schemas in various formats (e.g. JSON Schema, OpenAPI) +- do configuration akin to [Dhall Lang](https://dhall-lang.org/) +- perform data validation + +## Cuelang schema quick start + +Cuelang schemas are similar to JSON, here is a quick cheatsheet: + +- Default types includes: `null`, `string`, `bool`, `bytes`, `number`, `int`, `float`, lists as `[...T]` where `T` is a type. +- All structures, defined by: `myStructName: { }` are **open** -- they accept fields which are not specified. +- Closed structures can be built by doing `myStructName: close({ })` -- they are strict in what they accept. +- `#X` are **definitions**, referenced definitions are **recursively closed**, i.e. all its children structures are **closed**. +- `&` operator is the [unification operator](https://cuelang.org/docs/references/spec/#unification) (similar to a type-level merging operator), `|` is the [disjunction operator](https://cuelang.org/docs/references/spec/#disjunction) (similar to a type-level union operator). +- Values **are** types, i.e. `myStruct: { a: 3 }` is a valid type definition that only allows `3` as value. + +- Read to learn more about the semantics. +- Read to learn about the language specification. + +## `writeCueValidator` + +Nixpkgs provides a `pkgs.writeCueValidator` helper, which will write a validation script based on the provided Cuelang schema. + +Here is an example: +``` +pkgs.writeCueValidator + (pkgs.writeText "schema.cue" '' + #Def1: { + field1: string + } + '') + { document = "#Def1"; } +``` + +- The first parameter is the Cue schema file. +- The second parameter is an options parameter, currently, only: `document` can be passed. + +`document` : match your input data against this fragment of structure or definition, e.g. you may use the same schema file but different documents based on the data you are validating. + +Another example, given the following `validator.nix` : +``` +{ pkgs ? import {} }: +let + genericValidator = version: + pkgs.writeCueValidator + (pkgs.writeText "schema.cue" '' + #Version1: { + field1: string + } + #Version2: #Version1 & { + field1: "unused" + }'' + ) + { document = "#Version${toString version}"; }; +in +{ + validateV1 = genericValidator 1; + validateV2 = genericValidator 2; +} +``` + +The result is a script that will validate the file you pass as the first argument against the schema you provided `writeCueValidator`. + +It can be any format that `cue vet` supports, i.e. YAML or JSON for example. + +Here is an example, named `example.json`, given the following JSON: +``` +{ "field1": "abc" } +``` + +You can run the result script (named `validate`) as the following: + +```console +$ nix-build validator.nix +$ ./result example.json +$ ./result-2 example.json +field1: conflicting values "unused" and "abc": + ./example.json:1:13 + ../../../../../../nix/store/v64dzx3vr3glpk0cq4hzmh450lrwh6sg-schema.cue:5:11 +$ sed -i 's/"abc"/3/' example.json +$ ./result example.json +field1: conflicting values 3 and string (mismatched types int and string): + ./example.json:1:13 + ../../../../../../nix/store/v64dzx3vr3glpk0cq4hzmh450lrwh6sg-schema.cue:5:11 +``` + +**Known limitations** + +* The script will enforce **concrete** values and will not accept lossy transformations (strictness). You can add these options if you need them. diff --git a/doc/languages-frameworks/dhall.section.md b/doc/languages-frameworks/dhall.section.md index 4b49908b0b0c..83fe2e9ae0c4 100644 --- a/doc/languages-frameworks/dhall.section.md +++ b/doc/languages-frameworks/dhall.section.md @@ -91,7 +91,7 @@ buildDhallPackage { let nixpkgs = builtins.fetchTarball { url = "https://github.com/NixOS/nixpkgs/archive/94b2848559b12a8ed1fe433084686b2a81123c99.tar.gz"; - sha256 = "1pbl4c2dsaz2lximgd31m96jwbps6apn3anx8cvvhk1gl9rkg107"; + sha256 = "sha256-B4Q3c6IvTLg3Q92qYa8y+i4uTaphtFdjp+Ir3QQjdN0="; }; dhallOverlay = self: super: { @@ -295,7 +295,7 @@ terms of `buildDhallPackage` that accepts the following arguments: * `document`: Set to `true` to generate documentation for the package Additionally, `buildDhallGitHubPackage` accepts the same arguments as -`fetchFromGitHub`, such as `sha256` or `fetchSubmodules`. +`fetchFromGitHub`, such as `hash` or `fetchSubmodules`. ## `dhall-to-nixpkgs` {#ssec-dhall-dhall-to-nixpkgs} @@ -316,7 +316,7 @@ $ dhall-to-nixpkgs github https://github.com/Gabriel439/dhall-semver.git repo = "dhall-semver"; rev = "2d44ae605302ce5dc6c657a1216887fbb96392a4"; fetchSubmodules = false; - sha256 = "0y8shvp8srzbjjpmnsvz9c12ciihnx1szs0yzyi9ashmrjvd0jcz"; + hash = "sha256-n0nQtswVapWi/x7or0O3MEYmAkt/a1uvlOtnje6GGnk="; directory = ""; file = "package.dhall"; source = false; diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index 1baa135ae586..30a12d4e8ffa 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -28,13 +28,13 @@ mkShell { packages = [ (with dotnetCorePackages; combinePackages [ sdk_3_1 - sdk_5_0 + sdk_6_0 ]) ]; } ``` -This will produce a dotnet installation that has the dotnet 3.1, 3.0, and 2.1 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output: +This will produce a dotnet installation that has the dotnet 3.1 6.0 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output: ```ShellSession $ dotnet --info @@ -120,8 +120,7 @@ in buildDotnetModule rec { projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure. dotnet-sdk = dotnetCorePackages.sdk_3_1; - dotnet-runtime = dotnetCorePackages.net_5_0; - dotnetFlags = [ "--runtime linux-x64" ]; + dotnet-runtime = dotnetCorePackages.net_6_0; executables = [ "foo" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`. executables = []; # Don't install any executables. diff --git a/doc/languages-frameworks/emscripten.section.md b/doc/languages-frameworks/emscripten.section.md index c96f689c4c00..ff622cfb0b50 100644 --- a/doc/languages-frameworks/emscripten.section.md +++ b/doc/languages-frameworks/emscripten.section.md @@ -121,7 +121,7 @@ This `xmlmirror` example features a emscriptenPackage which is defined completel src = pkgs.fetchgit { url = "https://gitlab.com/odfplugfest/xmlmirror.git"; rev = "4fd7e86f7c9526b8f4c1733e5c8b45175860a8fd"; - sha256 = "1jasdqnbdnb83wbcnyrp32f36w3xwhwp0wq8lwwmhqagxrij1r4b"; + hash = "sha256-i+QgY+5PYVg5pwhzcDnkfXAznBg3e8sWH2jZtixuWsk="; }; configurePhase = '' diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index d5996cce13cf..0d4865b7af1c 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -34,7 +34,7 @@ To allow software to use various virtual file systems, `gvfs` package can be als ### GdkPixbuf loaders {#ssec-gnome-gdk-pixbuf-loaders} -GTK applications typically use [GdkPixbuf](https://developer.gnome.org/gdk-pixbuf/stable/) to load images. But `gdk-pixbuf` package only supports basic bitmap formats like JPEG, PNG or TIFF, requiring to use third-party loader modules for other formats. This is especially painful since GTK itself includes SVG icons, which cannot be rendered without a loader provided by `librsvg`. +GTK applications typically use [GdkPixbuf](https://gitlab.gnome.org/GNOME/gdk-pixbuf/) to load images. But `gdk-pixbuf` package only supports basic bitmap formats like JPEG, PNG or TIFF, requiring to use third-party loader modules for other formats. This is especially painful since GTK itself includes SVG icons, which cannot be rendered without a loader provided by `librsvg`. Unlike other libraries mentioned in this section, GdkPixbuf only supports a single value in its controlling environment variable `GDK_PIXBUF_MODULE_FILE`. It is supposed to point to a cache file containing information about the available loaders. Each loader package will contain a `lib/gdk-pixbuf-2.0/2.10.0/loaders.cache` file describing the default loaders in `gdk-pixbuf` package plus the loader contained in the package itself. If you want to use multiple third-party loaders, you will need to create your own cache file manually. Fortunately, this is pretty rare as [not many loaders exist](https://gitlab.gnome.org/federico/gdk-pixbuf-survey/blob/master/src/modules.md). @@ -70,7 +70,7 @@ Also make sure that `icon-theme.cache` is installed for each theme provided by t ### GTK Themes {#ssec-gnome-themes} -Previously, a GTK theme needed to be in `XDG_DATA_DIRS`. This is no longer necessary for most programs since GTK incorporated Adwaita theme. Some programs (for example, those designed for [elementary HIG](https://elementary.io/docs/human-interface-guidelines#human-interface-guidelines)) might require a special theme like `pantheon.elementary-gtk-theme`. +Previously, a GTK theme needed to be in `XDG_DATA_DIRS`. This is no longer necessary for most programs since GTK incorporated Adwaita theme. Some programs (for example, those designed for [elementary HIG](https://docs.elementary.io/hig)) might require a special theme like `pantheon.elementary-gtk-theme`. ### GObject introspection typelibs {#ssec-gnome-typelibs} diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index 8616d64e7c4e..cefdd68c3520 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -11,7 +11,14 @@ The function `buildGoModule` builds Go programs managed with Go modules. It buil In the following is an example expression using `buildGoModule`, the following arguments are of special significance to the function: -- `vendorHash`: is the hash of the output of the intermediate fetcher derivation. `vendorHash` can also take `null` as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set `vendorHash = null;` +- `vendorHash`: is the hash of the output of the intermediate fetcher derivation. + + `vendorHash` can also be set to `null`. + In that case, rather than fetching the dependencies and vendoring them, the dependencies vendored in the source repo will be used. + + To avoid updating this field when dependencies change, run `go mod vendor` in your source repo and set `vendorHash = null;` + + To obtain the actual hash, set `vendorHash = lib.fakeSha256;` and run the build ([more details here](#sec-source-hashes)). - `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform dependant `vendorHash` checksums. ```nix @@ -23,7 +30,7 @@ pet = buildGoModule rec { owner = "knqyf263"; repo = "pet"; rev = "v${version}"; - sha256 = "0m2fzpqxk7hrbxsgqplkg7h2p7gv6s1miymv3gvw0cz039skag0s"; + hash = "sha256-Gjw1dRrgM8D3G7v6WIM2+50r4HmTXvx0Xxme2fH9TlQ="; }; vendorHash = "sha256-ciBIR+a1oaYH+H1PcC8cD8ncfJczk1IiJ8iYNM+R6aA="; @@ -59,7 +66,7 @@ deis = buildGoPackage rec { owner = "deis"; repo = "deis"; rev = "v${version}"; - sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; + hash = "sha256-XCPD4LNWtAd8uz7zyCLRfT8rzxycIUmTACjU03GnaeM="; }; goDeps = ./deps.nix; @@ -76,11 +83,11 @@ The `goDeps` attribute can be imported from a separate `nix` file that defines w goPackagePath = "gopkg.in/yaml.v2"; fetch = { # `fetch type` that needs to be used to get package source. - # If `git` is used there should be `url`, `rev` and `sha256` defined next to it. + # If `git` is used there should be `url`, `rev` and `hash` defined next to it. type = "git"; url = "https://gopkg.in/yaml.v2"; rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + hash = "sha256-EMrdy0M0tNuOcITaTAmT5/dPSKPXwHDKCXFpkGbVjdQ="; }; } { @@ -89,7 +96,7 @@ The `goDeps` attribute can be imported from a separate `nix` file that defines w type = "git"; url = "https://github.com/docopt/docopt-go"; rev = "784ddc588536785e7299f7272f39101f7faccc3f"; - sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; + hash = "sha256-Uo89zjE+v3R7zzOq/gbQOHj3SMYt2W1nDHS7RCUin3M="; }; } ] diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 1fda505a2255..f0b302bbc356 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -1,7 +1,1079 @@ # Haskell {#haskell} -The documentation for the Haskell infrastructure is published at -. The source code for that -site lives in the `doc/` sub-directory of the -[`cabal2nix` Git repository](https://github.com/NixOS/cabal2nix) -and changes can be submitted there. +The Haskell infrastructure in Nixpkgs has two main purposes: The primary purpose +is to provide a Haskell compiler and build tools as well as infrastructure for +packaging Haskell-based packages. + +The secondary purpose is to provide support for Haskell development environments +including prebuilt Haskell libraries. However, in this area sacrifices have been +made due to self-imposed restrictions in Nixpkgs, to lessen the maintenance +effort and to improve performance. (More details in the subsection +[Limitations.](#haskell-limitations)) + +## Available packages {#haskell-available-packages} + +The compiler and most build tools are exposed at the top level: + +* `ghc` is the default version of GHC +* Language specific tools: `cabal-install`, `stack`, `hpack`, … + +Many “normal” user facing packages written in Haskell, like `niv` or `cachix`, +are also exposed at the top level, and there is nothing Haskell specific to +installing and using them. + +All of these packages are originally defined in the `haskellPackages` package +set and are re-exposed with a reduced dependency closure for convenience. +(see `justStaticExecutables` below) + +The `haskellPackages` set includes at least one version of every package from +Hackage as well as some manually injected packages. This amounts to a lot of +packages, so it is hidden from `nix-env -qa` by default for performance reasons. +You can still list all packages in the set like this: + +```console +$ nix-env -f '' -qaP -A haskellPackages +haskellPackages.a50 a50-0.5 +haskellPackages.AAI AAI-0.2.0.1 +haskellPackages.aasam aasam-0.2.0.0 +haskellPackages.abacate abacate-0.0.0.0 +haskellPackages.abc-puzzle abc-puzzle-0.2.1 +… +``` +Also, the `haskellPackages` set is included on [search.nixos.org]. + +The attribute names in `haskellPackages` always correspond with their name on +Hackage. Since Hackage allows names that are not valid Nix without escaping, +you need to take care when handling attribute names like `3dmodels`. + +For packages that are part of [Stackage], we use the version prescribed by a +Stackage solver (usually the current LTS one) as the default version. For all +other packages we use the latest version from Hackage. See +[below](#haskell-available-versions) to learn which versions are provided +exactly. + +Roughly half of the 16K packages contained in `haskellPackages` don't actually +build and are marked as broken semi-automatically. Most of those packages are +deprecated or unmaintained, but sometimes packages that should build, do not +build. Very often fixing them is not a lot of work. + + + +`haskellPackages` is built with our default compiler, but we also provide other +releases of GHC and package sets built with them. You can list all available +compilers like this: + +```console +$ nix-env -f '' -qaP -A haskell.compiler +haskell.compiler.ghc810 ghc-8.10.7 +haskell.compiler.ghc88 ghc-8.8.4 +haskell.compiler.ghc90 ghc-9.0.2 +haskell.compiler.ghc92 ghc-9.2.4 +haskell.compiler.ghc925 ghc-9.2.5 +haskell.compiler.ghc942 ghc-9.4.2 +haskell.compiler.ghc943 ghc-9.4.3 +haskell.compiler.ghc94 ghc-9.4.4 +haskell.compiler.ghcHEAD ghc-9.7.20221224 +haskell.compiler.ghc8102Binary ghc-binary-8.10.2 +haskell.compiler.ghc8102BinaryMinimal ghc-binary-8.10.2 +haskell.compiler.ghc8107BinaryMinimal ghc-binary-8.10.7 +haskell.compiler.ghc8107Binary ghc-binary-8.10.7 +haskell.compiler.ghc865Binary ghc-binary-8.6.5 +haskell.compiler.ghc924Binary ghc-binary-9.2.4 +haskell.compiler.ghc924BinaryMinimal ghc-binary-9.2.4 +haskell.compiler.integer-simple.ghc810 ghc-integer-simple-8.10.7 +haskell.compiler.integer-simple.ghc8107 ghc-integer-simple-8.10.7 +haskell.compiler.integer-simple.ghc884 ghc-integer-simple-8.8.4 +haskell.compiler.integer-simple.ghc88 ghc-integer-simple-8.8.4 +haskell.compiler.native-bignum.ghc90 ghc-native-bignum-9.0.2 +haskell.compiler.native-bignum.ghc902 ghc-native-bignum-9.0.2 +haskell.compiler.native-bignum.ghc92 ghc-native-bignum-9.2.4 +haskell.compiler.native-bignum.ghc924 ghc-native-bignum-9.2.4 +haskell.compiler.native-bignum.ghc925 ghc-native-bignum-9.2.5 +haskell.compiler.native-bignum.ghc942 ghc-native-bignum-9.4.2 +haskell.compiler.native-bignum.ghc943 ghc-native-bignum-9.4.3 +haskell.compiler.native-bignum.ghc94 ghc-native-bignum-9.4.4 +haskell.compiler.native-bignum.ghc944 ghc-native-bignum-9.4.4 +haskell.compiler.native-bignum.ghcHEAD ghc-native-bignum-9.7.20221224 +haskell.compiler.ghcjs ghcjs-8.10.7 +``` + +Each of those compiler versions has a corresponding attribute set built using +it. However, the non-standard package sets are not tested regularly and, as a +result, contain fewer working packages. The corresponding package set for GHC +9.4.4 is `haskell.packages.ghc944`. In fact `haskellPackages` is just an alias +for `haskell.packages.ghc924`: + +```console +$ nix-env -f '' -qaP -A haskell.packages.ghc924 +haskell.packages.ghc924.a50 a50-0.5 +haskell.packages.ghc924.AAI AAI-0.2.0.1 +haskell.packages.ghc924.aasam aasam-0.2.0.0 +haskell.packages.ghc924.abacate abacate-0.0.0.0 +haskell.packages.ghc924.abc-puzzle abc-puzzle-0.2.1 +… +``` + +Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`. + +### Available package versions {#haskell-available-versions} + +We aim for a “blessed” package set which only contains one version of each +package, like Stackage (and based on it) but with more packages. Normally in +nixpkgs the number of building Haskell packages is roughly two to three times +the size of Stackage. For choosing the version to use for a certain package we +use the following rules: + +1. By default, for every package `haskellPackages.foo` is the newest version +found on Hackage (at the time of the last update of our package set). +2. If the Stackage snapshot that we use (usually the newest LTS snapshot) +contains a package, we use the Stackage version as default version for that +package. +3. For some packages, which are not on Stackage, we have manual overrides to +set the default version to a version older than the newest on Hackage. We do +this to get them or their reverse dependencies to compile in our package set. +4. For all packages, for which the newest Hackage version is not the default +version, there will also be a `haskellPackages.foo_x_y_z` package with the +newest version. +5. For some packages, we also manually add other `haskellPackages.foo_x_y_z` +versions, if they are required for a certain build. + +Relying on `haskellPackages.foo_x_y_z` attributes in derivations outside +nixpkgs is discouraged because they may change or disappear with every package +set update. + + +All `haskell.packages.*` package sets use the same package descriptions and the same sets +of versions by default. There are however GHC version specific override `.nix` +files to loosen this a bit. + +### Dependency resolution + +Normally when you build Haskell packages with `cabal-install`, `cabal-install` +does dependency resolution. It will look at all Haskell package versions known +on Hackage and tries to pick for every (transitive) dependency of your build +exactly one version. Those versions need to satisfy all the version constraints +given in the `.cabal` file of your package and all its dependencies. + +The [Haskell builder in nixpkgs](#haskell-mkderivation) does no such thing. +It will simply take as input packages with names off the desired dependencies +and just check whether they fulfill the version bounds and (by default, see +`jailbreak`) fail if they don’t. + +The package resolution is done by the `haskellPackages.callPackage` function +which will, e.g., use `haskellPackages.aeson` for a package input of name +`aeson`. +While this is the default behavior, it is possible to override the dependencies +for a specific package, see +[`override` and `overrideScope`](#haskell-overriding-haskell-packages). + +### Limitations {#haskell-limitations} + +Our main objective with `haskellPackages` is to package Haskell software in +nixpkgs. This entails some limitations, partially due to self-imposed +restrictions of nixpkgs, partially in the name of maintainability: + +* Only the packages built with the default compiler see extensive testing of the + whole package set. For other GHC versions only a few essential packages are + tested and cached. +* As described above we only build one version of most packages. + +The experience using an older or newer packaged compiler or using different +versions may be worse, because builds will not be cached on `cache.nixos.org` +or may fail. + +Thus, to get the best experience, make sure that your project can be compiled +using the default compiler of nixpkgs and recent versions of its dependencies. + +A result of this setup is, that getting a valid build plan for a given +package can sometimes be quite painful, and in fact this is where most of the +maintenance work for `haskellPackages` is required. Besides that, it is not +possible to get the dependencies of a legacy project from nixpkgs or to use a +specific stack solver for compiling a project. + +Even though we couldn‘t use them directly in nixpkgs, it would be desirable +to have tooling to generate working Nix package sets from build plans generated +by `cabal-install` or a specific Stackage snapshot via import-from-derivation. +Sadly we currently don’t have tooling for this. For this you might be +interested in the alternative [haskell.nix] framework, which, be warned, is +completely incompatible with packages from `haskellPackages`. + + + +## `haskellPackages.mkDerivation` {#haskell-mkderivation} + +Every haskell package set has its own haskell-aware `mkDerivation` which is used +to build its packages. Generally you won't have to interact with this builder +since [cabal2nix][cabal2nix] can generate packages +using it for an arbitrary cabal package definition. Still it is useful to know +the parameters it takes when you need to +[override](#haskell-overriding-haskell-packages) a generated Nix expression. + +`haskellPackages.mkDerivation` is a wrapper around `stdenv.mkDerivation` which +re-defines the default phases to be haskell aware and handles dependency +specification, test suites, benchmarks etc. by compiling and invoking the +package's `Setup.hs`. It does *not* use or invoke the `cabal-install` binary, +but uses the underlying `Cabal` library instead. + +### General arguments + +`pname` +: Package name, assumed to be the same as on Hackage (if applicable) + +`version` +: Packaged version, assumed to be the same as on Hackage (if applicable) + +`src` +: Source of the package. If omitted, fetch package corresponding to `pname` +and `version` from Hackage. + +`sha256` +: Hash to use for the default case of `src`. + +`revision` +: Revision number of the updated cabal file to fetch from Hackage. +If `null` (which is the default value), the one included in `src` is used. + +`editedCabalFile` +: `sha256` hash of the cabal file identified by `revision` or `null`. + +`configureFlags` +: Extra flags passed when executing the `configure` command of `Setup.hs`. + +`buildFlags` +: Extra flags passed when executing the `build` command of `Setup.hs`. + +`haddockFlags` +: Extra flags passed to `Setup.hs haddock` when building the documentation. + +`doCheck` +: Whether to execute the package's test suite if it has one. Defaults to `true` unless cross-compiling. + +`doBenchmark` +: Whether to execute the package's benchmark if it has one. Defaults to `false`. + +`doHoogle` +: Whether to generate an index file for [hoogle][hoogle] as part of +`haddockPhase` by passing the [`--hoogle` option][haddock-hoogle-option]. +Defaults to `true`. + +`doHaddockQuickjump` +: Whether to generate an index for interactive navigation of the HTML documentation. +Defaults to `true` if supported. + +`enableLibraryProfiling` +: Whether to enable [profiling][profiling] for libraries contained in the +package. Enabled by default if supported. + +`enableExecutableProfiling` +: Whether to enable [profiling][profiling] for executables contained in the +package. Disabled by default. + +`profilingDetail` +: [Profiling detail level][profiling-detail] to set. Defaults to `exported-functions`. + +`enableSharedExecutables` +: Whether to link executables dynamically. By default, executables are linked statically. + +`enableSharedLibraries` +: Whether to build shared Haskell libraries. This is enabled by default unless we are using +`pkgsStatic` or shared libraries have been disabled in GHC. + +`enableStaticLibraries` +: Whether to build static libraries. Enabled by default if supported. + +`enableDeadCodeElimination` +: Whether to enable linker based dead code elimination in GHC. +Enabled by default if supported. + +`enableHsc2hsViaAsm` +: Whether to pass `--via-asm` to `hsc2hs`. Enabled by default only on Windows. + +`hyperlinkSource` +: Whether to render the source as well as part of the haddock documentation +by passing the [`--hyperlinked-source` flag][haddock-hyperlinked-source-option]. +Defaults to `true`. + +`isExecutable` +: Whether the package contains an executable. + +`isLibrary` +: Whether the package contains a library. + +`jailbreak` +: Whether to execute [jailbreak-cabal][jailbreak-cabal] before `configurePhase` +to lift any version constraints in the cabal file. Note that this can't +lift version bounds if they are conditional, i.e. if a dependency is hidden +behind a flag. + +`enableParallelBuilding` +: Whether to use the `-j` flag to make GHC/Cabal start multiple jobs in parallel. + +`maxBuildCores` +: Upper limit of jobs to use in parallel for compilation regardless of +`$NIX_BUILD_CORES`. Defaults to 16 as Haskell compilation with GHC currently +sees a [performance regression](https://gitlab.haskell.org/ghc/ghc/-/issues/9221) +if too many parallel jobs are used. + +`doCoverage` +: Whether to generate and install files needed for [HPC][haskell-program-coverage]. +Defaults to `false`. + +`doHaddock` +: Whether to build (HTML) documentation using [haddock][haddock]. +Defaults to `true` if supported. + +`testTarget` +: Name of the test suite to build and run. If unset, all test suites will be executed. + +`preCompileBuildDriver` +: Shell code to run before compiling `Setup.hs`. + +`postCompileBuildDriver` +: Shell code to run after compiling `Setup.hs`. + +`preHaddock` +: Shell code to run before building documentation using haddock. + +`postHaddock` +: Shell code to run after building documentation using haddock. + +`coreSetup` +: Whether to only allow core libraries to be used while building `Setup.hs`. +Defaults to `false`. + +`useCpphs` +: Whether to enable the [cpphs][cpphs] preprocessor. Defaults to `false`. + +`enableSeparateBinOutput` +: Whether to install executables to a separate `bin` output. Defaults to `false`. + +`enableSeparateDataOutput` +: Whether to install data files shipped with the package to a separate `data` output. +Defaults to `false`. + +`enableSeparateDocOutput` +: Whether to install documentation to a separate `doc` output. +Is automatically enabled if `doHaddock` is `true`. + +`allowInconsistentDependencies` +: If enabled, allow multiple versions of the same Haskell package in the +dependency tree at configure time. Often in such a situation compilation would +later fail because of type mismatches. Defaults to `false`. + +`enableLibraryForGhci` +: Build and install a special object file for GHCi. This improves performance +when loading the library in the REPL, but requires extra build time and +disk space. Defaults to `false`. + +`buildTarget` +: Name of the executable or library to build and install. +If unset, all available targets are built and installed. + +### Specifying dependencies {#haskell-derivation-deps} + +Since `haskellPackages.mkDerivation` is intended to be generated from cabal +files, it reflects cabal's way of specifying dependencies. For one, dependencies +are grouped by what part of the package they belong to. This helps to reduce the +dependency closure of a derivation, for example benchmark dependencies are not +included if `doBenchmark == false`. + +`setup*Depends` +: dependencies necessary to compile `Setup.hs` + +`library*Depends` +: dependencies of a library contained in the package + +`executable*Depends` +: dependencies of an executable contained in the package + +`test*Depends` +: dependencies of a test suite contained in the package + +`benchmark*Depends` +: dependencies of a benchmark contained in the package + +The other categorization relates to the way the package depends on the dependency: + +`*ToolDepends` +: Tools we need to run as part of the build process. +They are added to the derivation's `nativeBuildInputs`. + +`*HaskellDepends` +: Haskell libraries the package depends on. +They are added to `propagatedBuildInputs`. + +`*SystemDepends` +: Non-Haskell libraries the package depends on. +They are added to `buildInputs` + +`*PkgconfigDepends` +: `*SystemDepends` which are discovered using `pkg-config`. +They are added to `buildInputs` and it is additionally +ensured that `pkg-config` is available at build time. + +`*FrameworkDepends` +: Apple SDK Framework which the package depends on when compiling it on Darwin. + +Using these two distinctions, you should be able to categorize most of the dependency +specifications that are available: +`benchmarkFrameworkDepends`, +`benchmarkHaskellDepends`, +`benchmarkPkgconfigDepends`, +`benchmarkSystemDepends`, +`benchmarkToolDepends`, +`executableFrameworkDepends`, +`executableHaskellDepends`, +`executablePkgconfigDepends`, +`executableSystemDepends`, +`executableToolDepends`, +`libraryFrameworkDepends`, +`libraryHaskellDepends`, +`libraryPkgconfigDepends`, +`librarySystemDepends`, +`libraryToolDepends`, +`setupHaskellDepends`, +`testFrameworkDepends`, +`testHaskellDepends`, +`testPkgconfigDepends`, +`testSystemDepends` and +`testToolDepends`. + +That only leaves the following extra ways for specifying dependencies: + +`buildDepends` +: Allows specifying Haskell dependencies which are added to `propagatedBuildInputs` unconditionally. + +`buildTools` +: Like `*ToolDepends`, but are added to `nativeBuildInputs` unconditionally. + +`extraLibraries` +: Like `*SystemDepends`, but are added to `buildInputs` unconditionally. + +`pkg-configDepends` +: Like `*PkgconfigDepends`, but are added to `buildInputs` unconditionally. + +`testDepends` +: Deprecated, use either `testHaskellDepends` or `testSystemDepends`. + +`benchmarkDepends` +: Deprecated, use either `benchmarkHaskellDepends` or `benchmarkSystemDepends`. + +The dependency specification methods in this list which are unconditional +are especially useful when writing [overrides](#haskell-overriding-haskell-packages) +when you want to make sure that they are definitely included. However, it is +recommended to use the more accurate ones listed above when possible. + +### Meta attributes + +`haskellPackages.mkDerivation` accepts the following attributes as direct +arguments which are transparently set in `meta` of the resulting derivation. See +the [Meta-attributes section](#chap-meta) for their documentation. + +* These attributes are populated with a default value if omitted: + * `homepage`: defaults to the Hackage page for `pname`. + * `platforms`: defaults to `lib.platforms.all` (since GHC can cross-compile) +* These attributes are only set if given: + * `description` + * `license` + * `changelog` + * `maintainers` + * `broken` + * `hydraPlatforms` + +## Development environments {#haskell-development-environments} + +In addition to building and installing Haskell software, nixpkgs can also +provide development environments for Haskell projects. This has the obvious +advantage that you benefit from `cache.nixos.org` and no longer need to compile +all project dependencies yourself. While it is often very useful, this is not +the primary use case of our package set. Have a look at the section +[available package versions](#haskell-available-versions) to learn which +versions of packages we provide and the section +[limitations](#haskell-limitations), to judge whether a `haskellPackages` +based development environment for your project is feasible. + +By default, every derivation built using +[`haskellPackages.mkDerivation`](#haskell-mkderivation) exposes an environment +suitable for building it interactively as the `env` attribute. For example, if +you have a local checkout of `random`, you can enter a development environment +for it like this (if the dependencies in the development and packaged version +match): + +```console +$ cd ~/src/random +$ nix-shell -A haskellPackages.random.env '' +[nix-shell:~/src/random]$ ghc-pkg list +/nix/store/a8hhl54xlzfizrhcf03c1l3f6l9l8qwv-ghc-9.2.4-with-packages/lib/ghc-9.2.4/package.conf.d + Cabal-3.6.3.0 + array-0.5.4.0 + base-4.16.3.0 + binary-0.8.9.0 + … + ghc-9.2.4 + … +``` + +As you can see, the environment contains a GHC which is set up so it finds all +dependencies of `random`. Note that this environment does not mirror +the environment used to build the package, but is intended as a convenient +tool for development and simple debugging. `env` relies on the `ghcWithPackages` +wrapper which automatically injects a pre-populated package-db into every +GHC invocation. In contrast, using `nix-shell -A haskellPackages.random` will +not result in an environment in which the dependencies are in GHCs package +database. Instead, the Haskell builder will pass in all dependencies explicitly +via configure flags. + +`env` mirrors the normal derivation environment in one aspect: It does not include +familiar development tools like `cabal-install`, since we rely on plain `Setup.hs` +to build all packages. However, `cabal-install` will work as expected if in +`PATH` (e.g. when installed globally and using a `nix-shell` without `--pure`). +A declarative and pure way of adding arbitrary development tools is provided +via [`shellFor`](#haskell-shellFor). + +When using `cabal-install` for dependency resolution you need to be a bit +careful to achieve build purity. `cabal-install` will find and use all +dependencies installed from the packages `env` via Nix, but it will also +consult Hackage to potentially download and compile dependencies if it can‘t +find a valid build plan locally. To prevent this you can either never run +`cabal update`, remove the cabal database from your `~/.cabal` folder or run +`cabal` with `--offline`. Note though, that for some usecases `cabal2nix` needs +the local Hackage db. + +Often you won't work on a package that is already part of `haskellPackages` or +Hackage, so we first need to write a Nix expression to obtain the development +environment from. Luckily, we can generate one very easily from an already +existing cabal file using `cabal2nix`: + +```console +$ ls +my-project.cabal src … +$ cabal2nix ./. > my-project.nix +``` + +The generated Nix expression evaluates to a function ready to be +`callPackage`-ed. For now, we can add a minimal `default.nix` which does just +that: + +```nix +# Retrieve nixpkgs impurely from NIX_PATH for now, you can pin it instead, of course. +{ pkgs ? import {} }: + +# use the nixpkgs default haskell package set +pkgs.haskellPackages.callPackage ./my-project.nix { } +``` + +Using `nix-build default.nix` we can now build our project, but we can also +enter a shell with all the package's dependencies available using `nix-shell +-A env default.nix`. If you have `cabal-install` installed globally, it'll work +inside the shell as expected. + +### shellFor {#haskell-shellFor} + +Having to install tools globally is obviously not great, especially if you want +to provide a batteries-included `shell.nix` with your project. Luckily there's a +proper tool for making development environments out of packages' build +environments: `shellFor`, a function exposed by every haskell package set. It +takes the following arguments and returns a derivation which is suitable as a +development environment inside `nix-shell`: + +`packages` +: This argument is used to select the packages for which to build the +development environment. This should be a function which takes a haskell package +set and returns a list of packages. `shellFor` will pass the used package set to +this function and include all dependencies of the returned package in the build +environment. This means you can reuse Nix expressions of packages included in +nixpkgs, but also use local Nix expressions like this: `hpkgs: [ +(hpkgs.callPackage ./my-project.nix { }) ]`. + +`nativeBuildInputs` +: Expects a list of derivations to add as build tools to the build environment. +This is the place to add packages like `cabal-install`, `doctest` or `hlint`. +Defaults to `[]`. + +`buildInputs` +: Expects a list of derivations to add as library dependencies, like `openssl`. +This is rarely necessary as the haskell package expressions usually track system +dependencies as well. Defaults to `[]`. (see also +[derivation dependencies](#haskell-derivation-deps)) + +`withHoogle` +: If this is true, `hoogle` will be added to `nativeBuildInputs`. +Additionally, its database will be populated with all included dependencies, +so you'll be able search through the documentation of your dependencies. +Defaults to `false`. + +`genericBuilderArgsModifier` +: This argument accepts a function allowing you to modify the arguments passed +to `mkDerivation` in order to create the development environment. For example, +`args: { doCheck = false; }` would cause the environment to not include any test +dependencies. Defaults to `lib.id`. + +`doBenchmark` +: This is a shortcut for enabling `doBenchmark` via `genericBuilderArgsModifier`. +Setting it to `true` will cause the development environment to include all +benchmark dependencies which would be excluded by default. Defaults to `false`. + +One neat property of `shellFor` is that it allows you to work on multiple +packages using the same environment in conjunction with +[cabal.project files][cabal-project-files]. +Say our example above depends on `distribution-nixpkgs` and we have a project +file set up for both, we can add the following `shell.nix` expression: + +```nix +{ pkgs ? import {} }: + +pkgs.haskellPackages.shellFor { + packages = hpkgs: [ + # reuse the nixpkgs for this package + hpkgs.distribution-nixpkgs + # call our generated Nix expression manually + (hpkgs.callPackage ./my-project/my-project.nix { }) + ]; + + # development tools we use + nativeBuildInputs = [ + pkgs.cabal-install + pkgs.haskellPackages.doctest + pkgs.cabal2nix + ]; + + # Extra arguments are added to mkDerivation's arguments as-is. + # Since it adds all passed arguments to the shell environment, + # we can use this to set the environment variable the `Paths_` + # module of distribution-nixpkgs uses to search for bundled + # files. + # See also: https://cabal.readthedocs.io/en/latest/cabal-package.html#accessing-data-files-from-package-code + distribution_nixpkgs_datadir = toString ./distribution-nixpkgs; +} +``` + + + +### haskell-language-server {#haskell-language-server} + +To use HLS in short: Install `pkgs.haskell-language-server` e.g. in +`nativeBuildInputs` in `shellFor` and use the `haskell-language-server-wrapper` +command to run it. See the [HLS user guide] on how to configure your text +editor to use HLS and how to test your setup. + +HLS needs to be compiled with the GHC version of the project you use it +on. + +``pkgs.haskell-language-server`` provides +``haskell-language-server-wrapper``, ``haskell-language-server`` +and ``haskell-language-server-x.x.x`` +binaries, where ``x.x.x`` is the GHC version for which it is compiled. By +default, it only includes binaries for the current GHC version, to reduce +closure size. The closure size is large, because HLS needs to be dynamically +linked to work reliably. You can override the list of supported GHC versions +with e.g. + +```nix +pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "94" ]; } +``` +Where all strings `version` are allowed such that +`haskell.packages.ghc${version}` is an existing package set. + +When you run `haskell-language-server-wrapper` it will detect the GHC +version used by the project you are working on (by asking e.g. cabal or +stack) and pick the appropriate versioned binary from your path. + +Be careful when installing HLS globally and using a pinned nixpkgs for a +Haskell project in a `nix-shell`. If the nixpkgs versions deviate to much +(e.g., use different `glibc` versions) the `haskell-language-server-?.?.?` +executable will try to detect these situations and refuse to start. It is +recommended to obtain HLS via `nix-shell` from the nixpkgs version pinned in +there instead. + +The top level `pkgs.haskell-language-server` attribute is just a convenience +wrapper to make it possible to install HLS for multiple GHC versions at the +same time. If you know, that you only use one GHC version, e.g., in a project +specific `nix-shell` you can simply use +`pkgs.haskellPackages.haskell-language-server` or +`pkgs.haskell.packages.*.haskell-language-server` from the package set you use. + +If you use `nix-shell` for your development environments remember to start your +editor in that environment. You may want to use something like `direnv` and/or an +editor plugin to achieve this. + +## Overriding Haskell packages {#haskell-overriding-haskell-packages} + +### Overriding a single package + + + +Like many language specific subsystems in nixpkgs, the Haskell infrastructure +also has its own quirks when it comes to overriding. Overriding of the *inputs* +to a package at least follows the standard procedure. For example, imagine you +need to build `nix-tree` with a more recent version of `brick` than the default +one provided by `haskellPackages`: + +```nix +haskellPackages.nix-tree.override { + brick = haskellPackages.brick_0_67; +} +``` + + + +The custom interface comes into play when you want to override the arguments +passed to `haskellPackages.mkDerivation`. For this, the function `overrideCabal` +from `haskell.lib.compose` is used. E.g., if you want to install a man page +that is distributed with the package, you can do something like this: + +```nix +haskell.lib.compose.overrideCabal (drv: { + postInstall = '' + ${drv.postInstall or ""} + install -Dm644 man/pnbackup.1 -t $out/share/man/man1 + ''; +}) haskellPackages.pnbackup +``` + +`overrideCabal` takes two arguments: + +1. A function which receives all arguments passed to `haskellPackages.mkDerivation` + before and returns a set of arguments to replace (or add) with a new value. +2. The Haskell derivation to override. + +The arguments are ordered so that you can easily create helper functions by making +use of currying: + +```nix +let + installManPage = haskell.lib.compose.overrideCabal (drv: { + postInstall = '' + ${drv.postInstall or ""} + install -Dm644 man/${drv.pname}.1 -t "$out/share/man/man1" + ''; + }); +in + +installManPage haskellPackages.pnbackup +``` + +In fact, `haskell.lib.compose` already provides lots of useful helpers for common +tasks, detailed in the next section. They are also structured in such a way that +they can be combined using `lib.pipe`: + +```nix +lib.pipe my-haskell-package [ + # lift version bounds on dependencies + haskell.lib.compose.doJailbreak + # disable building the haddock documentation + haskell.lib.compose.dontHaddock + # pass extra package flag to Cabal's configure step + (haskell.lib.compose.enableCabalFlag "myflag") +] +``` + +#### `haskell.lib.compose` + +The base interface for all overriding is the following function: + +`overrideCabal f drv` +: Takes the arguments passed to obtain `drv` to `f` and uses the resulting +attribute set to update the argument set. Then a recomputed version of `drv` +using the new argument set is returned. + + + +All other helper functions are implemented in terms of `overrideCabal` and make +common overrides shorter and more complicate ones trivial. The simple overrides +which only change a single argument are only described very briefly in the +following overview. Refer to the +[documentation of `haskellPackages.mkDerivation`](#haskell-mkderivation) +for a more detailed description of the effects of the respective arguments. + +##### Packaging Helpers + +`overrideSrc { src, version } drv` +: Replace the source used for building `drv` with the path or derivation given +as `src`. The `version` attribute is optional. Prefer this function over +overriding `src` via `overrideCabal`, since it also automatically takes care of +removing any Hackage revisions. + + + +`justStaticExecutables drv` +: Only build and install the executables produced by `drv`, removing everything +that may refer to other Haskell packages' store paths (like libraries and +documentation). This dramatically reduces the closure size of the resulting +derivation. Note that the executables are only statically linked against their +Haskell dependencies, but will still link dynamically against libc, GMP and +other system library dependencies. If dependencies use their Cabal-generated +`Paths_*` module, this may not work as well if GHC's dead code elimination +is unable to remove the references to the dependency's store path that module +contains. + +`enableSeparateBinOutput drv` +: Install executables produced by `drv` to a separate `bin` output. This +has a similar effect as `justStaticExecutables`, but preserves the libraries +and documentation in the `out` output alongside the `bin` output with a +much smaller closure size. + +`markBroken drv` +: Sets the `broken` flag to `true` for `drv`. + +`markUnbroken drv`, `unmarkBroken drv` +: Set the `broken` flag to `false` for `drv`. + +`doDistribute drv` +: Updates `hydraPlatforms` so that Hydra will build `drv`. This is +sometimes necessary when working with versioned packages in +`haskellPackages` which are not built by default. + +`dontDistribute drv` +: Sets `hydraPlatforms` to `[]`, causing Hydra to skip this package +altogether. Useful if it fails to evaluate cleanly and is causing +noise in the evaluation errors tab on Hydra. + +##### Development Helpers + +`sdistTarball drv` +: Create a source distribution tarball like those found on Hackage +instead of building the package `drv`. + +`documentationTarball drv` +: Create a documentation tarball suitable for uploading to Hackage +instead of building the package `drv`. + +`buildFromSdist drv` +: Uses `sdistTarball drv` as the source to compile `drv`. This helps to catch +packaging bugs when building from a local directory, e.g. when required files +are missing from `extra-source-files`. + +`failOnAllWarnings drv` +: Enables all warnings GHC supports and makes it fail the build if any of them +are emitted. + + + +`enableDWARFDebugging drv` +: Compiles the package with additional debug symbols enabled, useful +for debugging with e.g. `gdb`. + +`doStrip drv` +: Sets `doStrip` to `true` for `drv`. + +`dontStrip drv` +: Sets `doStrip` to `false` for `drv`. + + + +##### Trivial Helpers + +`doJailbreak drv` +: Sets the `jailbreak` argument to `true` for `drv`. + +`dontJailbreak drv` +: Sets the `jailbreak` argument to `false` for `drv`. + +`doHaddock drv` +: Sets `doHaddock` to `true` for `drv`. + +`dontHaddock drv` +: Sets `doHaddock` to `false` for `drv`. Useful if the build of a package is +failing because of e.g. a syntax error in the Haddock documentation. + +`doHyperlinkSource drv` +: Sets `hyperlinkSource` to `true` for `drv`. + +`dontHyperlinkSource drv` +: Sets `hyperlinkSource` to `false` for `drv`. + +`doCheck drv` +: Sets `doCheck` to `true` for `drv`. + +`dontCheck drv` +: Sets `doCheck` to `false` for `drv`. Useful if a package has a broken, +flaky or otherwise problematic test suite breaking the build. + + + +`appendConfigureFlags list drv` +: Adds the strings in `list` to the `configureFlags` argument for `drv`. + +`enableCabalFlag flag drv` +: Makes sure that the Cabal flag `flag` is enabled in Cabal's configure step. + +`disableCabalFlag flag drv` +: Makes sure that the Cabal flag `flag` is disabled in Cabal's configure step. + +`appendBuildflags list drv` +: Adds the strings in `list` to the `buildFlags` argument for `drv`. + + + +`appendPatches list drv` +: Adds the `list` of derivations or paths to the `patches` argument for `drv`. + + + +`addBuildTools list drv` +: Adds the `list` of derivations to the `buildTools` argument for `drv`. + +`addExtraLibraries list drv` +: Adds the `list` of derivations to the `extraLibraries` argument for `drv`. + +`addBuildDepends list drv` +: Adds the `list` of derivations to the `buildDepends` argument for `drv`. + +`addTestToolDepends list drv` +: Adds the `list` of derivations to the `testToolDepends` argument for `drv`. + +`addPkgconfigDepends list drv` +: Adds the `list` of derivations to the `pkg-configDepends` argument for `drv`. + +`addSetupDepends list drv` +: Adds the `list` of derivations to the `setupHaskellDepends` argument for `drv`. + +`doBenchmark drv` +: Set `doBenchmark` to `true` for `drv`. Useful if your development +environment is missing the dependencies necessary for compiling the +benchmark component. + +`dontBenchmark drv` +: Set `doBenchmark` to `false` for `drv`. + +`setBuildTargets list drv` +: Sets the `buildTarget` argument for `drv` so that the targets specified in `list` are built. + +`doCoverage drv` +: Sets the `doCoverage` argument to `true` for `drv`. + +`dontCoverage drv` +: Sets the `doCoverage` argument to `false` for `drv`. + +#### Library functions in the Haskell package sets + +Some library functions depend on packages from the Haskell package sets. Thus they are +exposed from those instead of from `haskell.lib.compose` which can only access what is +passed directly to it. When using the functions below, make sure that you are obtaining them +from the same package set (`haskellPackages`, `haskell.packages.ghc944` etc.) as the packages +you are working with or – even better – from the `self`/`final` fix point of your overlay to +`haskellPackages`. + +Note: Some functions like `shellFor` that are not intended for overriding per se, are omitted +in this section. + +`cabalSdist { src, name ? ... }` +: Generates the Cabal sdist tarball for `src`, suitable for uploading to Hackage. +Contrary to `haskell.lib.compose.sdistTarball`, it uses `cabal-install` over `Setup.hs`, +so it is usually faster: No build dependencies need to be downloaded, and we can +skip compiling `Setup.hs`. + +`buildFromCabalSdist drv` +: Build `drv`, but run its `src` attribute through `cabalSdist` first. Useful for catching +files necessary for compilation that are missing from the sdist. + +`generateOptparseApplicativeCompletions list drv` +: Generate and install shell completion files for the installed executables whose +names are given via `list`. The executables need to be using `optparse-applicative` +for [this to work][optparse-applicative-completions]. +Note that this feature is automatically disabled when cross-compiling, since it +requires executing the binaries in question. + + + +## F.A.Q. {#haskell-faq} + +### Why is topic X not covered in this section? Why is section Y missing? + +We have been working on [moving the nixpkgs Haskell documentation back into the +nixpkgs manual](https://github.com/NixOS/nixpkgs/issues/121403). Since this +process has not been completed yet, you may find some topics missing here +covered in the old [haskell4nix docs](https://haskell4nix.readthedocs.io/). + +If you feel any important topic is not documented at all, feel free to comment +on the issue linked above. + +[Stackage]: https://www.stackage.org +[cabal-project-files]: https://cabal.readthedocs.io/en/latest/cabal-project.html +[cabal2nix]: https://github.com/nixos/cabal2nix +[cpphs]: https://Hackage.haskell.org/package/cpphs +[haddock-hoogle-option]: https://haskell-haddock.readthedocs.io/en/latest/invoking.html#cmdoption-hoogle +[haddock-hyperlinked-source-option]: https://haskell-haddock.readthedocs.io/en/latest/invoking.html#cmdoption-hyperlinked-source +[haddock]: https://www.haskell.org/haddock/ +[haskell-program-coverage]: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/profiling.html#observing-code-coverage +[haskell.nix]: https://input-output-hk.github.io/haskell.nix/index.html +[HLS user guide]: https://haskell-language-server.readthedocs.io/en/latest/configuration.html#configuring-your-editor +[hoogle]: https://wiki.haskell.org/Hoogle +[jailbreak-cabal]: https://github.com/NixOS/jailbreak-cabal/ +[optparse-applicative-completions]: https://github.com/pcapriotti/optparse-applicative/blob/7726b63796aa5d0df82e926d467f039b78ca09e2/README.md#bash-zsh-and-fish-completions +[profiling-detail]: https://cabal.readthedocs.io/en/latest/cabal-project.html#cfg-field-profiling-detail +[profiling]: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/profiling.html +[search.nixos.org]: https://search.nixos.org diff --git a/doc/languages-frameworks/hy.section.md b/doc/languages-frameworks/hy.section.md index a851ff24dfc2..49309e4819f5 100644 --- a/doc/languages-frameworks/hy.section.md +++ b/doc/languages-frameworks/hy.section.md @@ -4,10 +4,10 @@ ### Installation without packages {#installation-without-packages} -You can install `hy` via nix-env or by adding it to `configuration.nix` by reffering to it as a `hy` attribute. This kind of installation adds `hy` to your environment and it succesfully works with `python3`. +You can install `hy` via nix-env or by adding it to `configuration.nix` by referring to it as a `hy` attribute. This kind of installation adds `hy` to your environment and it successfully works with `python3`. ::: {.caution} -Packages that are installed with your python derivation, are not accesible by `hy` this way. +Packages that are installed with your python derivation, are not accessible by `hy` this way. ::: ### Installation with packages {#installation-with-packages} diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md index 19146844cff5..447a3e7bb8a3 100644 --- a/doc/languages-frameworks/idris.section.md +++ b/doc/languages-frameworks/idris.section.md @@ -90,7 +90,7 @@ build-idris-package { owner = "Heather"; repo = "Idris.Yaml"; rev = "5afa51ffc839844862b8316faba3bafa15656db4"; - sha256 = "1g4pi0swmg214kndj85hj50ccmckni7piprsxfdzdfhg87s0avw7"; + hash = "sha256-h28F9EEPuvab6zrfeE+0k1XGQJGwINnsJEG8yjWIl7w="; }; meta = with lib; { diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 3d5b2f738976..3774924c0be4 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -3,7 +3,7 @@ xml:id="chap-language-support"> Languages and frameworks - The standard build environment makes it easy to build typical Autotools-based packages with very little code. Any other kind of package can be accomodated by overriding the appropriate phases of stdenv. However, there are specialised functions in Nixpkgs to easily build packages for other programming languages, such as Perl or Haskell. These are described in this chapter. + The standard build environment makes it easy to build typical Autotools-based packages with very little code. Any other kind of package can be accommodated by overriding the appropriate phases of stdenv. However, there are specialised functions in Nixpkgs to easily build packages for other programming languages, such as Perl or Haskell. These are described in this chapter. @@ -13,6 +13,7 @@ + @@ -31,6 +32,7 @@ + diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index fa10747dacc4..76cf6e03c257 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -175,9 +175,10 @@ buildNpmPackage rec { hash = "sha256-BR+ZGkBBfd0dSQqAvujsbgsEPFYw/ThrylxUbOksYxM="; }; - patches = [ ./remove-prepack-script.patch ]; + npmDepsHash = "sha256-tuEfyePwlOy2/mOPdXbqJskO6IowvAP4DWg8xSZwbJw="; - npmDepsHash = "sha256-s8SpZY/1tKZVd3vt7sA9vsqHvEaNORQBMrSyhWpj048="; + # The prepack script runs the build script, which we'd rather do in the build phase. + npmPackFlags = [ "--ignore-scripts" ]; NODE_OPTIONS = "--openssl-legacy-provider"; @@ -242,7 +243,7 @@ If the downloaded files contain the `package.json` and `yarn.lock` files they ca ```nix offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - sha256 = "...."; + hash = "...."; }; ``` @@ -330,13 +331,16 @@ mkYarnPackage rec { - The `echo 9` steps comes from this answer: - Exporting the headers in `npm_config_nodedir` comes from this issue: -## Outside of nixpkgs {#javascript-outside-nixpkgs} +## Outside Nixpkgs {#javascript-outside-nixpkgs} -There are some other options available that can't be used inside nixpkgs. Those other options are written in Nix. Importing them in nixpkgs will require moving the source code into nixpkgs. Using [Import From Derivation](https://nixos.wiki/wiki/Import_From_Derivation) is not allowed in Hydra at present. If you are packaging something outside nixpkgs, those can be considered +There are some other tools available, which are written in the Nix language. +These that can't be used inside Nixpkgs because they require [Import From Derivation](#ssec-import-from-derivation), which is not allowed in Nixpkgs. + +If you are packaging something outside Nixpkgs, consider the following: ### npmlock2nix {#javascript-npmlock2nix} -[npmlock2nix](https://github.com/nix-community/npmlock2nix) aims at building node_modules without code generation. It hasn't reached v1 yet, the API might be subject to change. +[npmlock2nix](https://github.com/nix-community/npmlock2nix) aims at building `node_modules` without code generation. It hasn't reached v1 yet, the API might be subject to change. #### Pitfalls {#javascript-npmlock2nix-pitfalls} @@ -344,7 +348,7 @@ There are some [problems with npm v7](https://github.com/tweag/npmlock2nix/issue ### nix-npm-buildpackage {#javascript-nix-npm-buildpackage} -[nix-npm-buildpackage](https://github.com/serokell/nix-npm-buildpackage) aims at building node_modules without code generation. It hasn't reached v1 yet, the API might change. It supports both package-lock.json and yarn.lock. +[nix-npm-buildpackage](https://github.com/serokell/nix-npm-buildpackage) aims at building `node_modules` without code generation. It hasn't reached v1 yet, the API might change. It supports both `package-lock.json` and yarn.lock. #### Pitfalls {#javascript-nix-npm-buildpackage-pitfalls} diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md index c070aa59d287..92ce8af1331b 100644 --- a/doc/languages-frameworks/lua.section.md +++ b/doc/languages-frameworks/lua.section.md @@ -183,7 +183,7 @@ luaposix = buildLuarocksPackage { src = fetchurl { url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaposix-34.0.4-1.src.rock"; - sha256 = "0yrm5cn2iyd0zjd4liyj27srphvy0gjrjx572swar6zqr4dwjqp2"; + hash = "sha256-4mLJG8n4m6y4Fqd0meUDfsOb9RHSR0qa/KD5KCwrNXs="; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ bit32 lua std_normalize ]; diff --git a/doc/languages-frameworks/nim.section.md b/doc/languages-frameworks/nim.section.md index 16dce61d71c9..4f97c7585f33 100644 --- a/doc/languages-frameworks/nim.section.md +++ b/doc/languages-frameworks/nim.section.md @@ -25,7 +25,7 @@ nimPackages.buildNimPackage rec { src = fetchurl { url = "https://git.sr.ht/~ehmry/hottext/archive/v${version}.tar.gz"; - sha256 = "sha256-hIUofi81zowSMbt1lUsxCnVzfJGN3FEiTtN8CEFpwzY="; + hash = "sha256-hIUofi81zowSMbt1lUsxCnVzfJGN3FEiTtN8CEFpwzY="; }; buildInputs = with nimPackages; [ @@ -65,7 +65,7 @@ buildNimPackage rec { version = "2.0.4"; src = fetchNimble { inherit pname version; - hash = "sha256-Vtcj8goI4zZPQs2TbFoBFlcR5UqDtOldaXSH/+/xULk="; + hash = "sha256-qDtVSnf+7rTq36WAxgsUZ8XoUk4sKwHyt8EJcY5WP+o="; }; propagatedBuildInputs = [ SDL2 ]; } diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index c6e40eaa20d0..1e5a5cb4536f 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -79,7 +79,7 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh"; + hash = "sha256-MK8o+iPGANEhrrTc1Kz9LBilx2bDPQt7Pp5P2libucI="; }; checkInputs = [ alcotest ppx_let ]; @@ -110,7 +110,7 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "09ygcxxd5warkdzz17rgpidrd0pg14cy2svvnvy1hna080lzg7vp"; + hash = "sha256-d5/3KUBAWRj8tntr4RkJ74KWW7wvn/B/m1nx0npnzyc="; }; meta = with lib; { @@ -129,3 +129,8 @@ 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. + +The build will automatically fail if two distinct versions of the same library +are added to `buildInputs` (which usually happens transitively because of +`propagatedBuildInputs`). Set `dontDetectOcamlConflicts` to true to disable this +behavior. diff --git a/doc/languages-frameworks/perl.section.md b/doc/languages-frameworks/perl.section.md index 28a78cc23441..91d3a091c0ae 100644 --- a/doc/languages-frameworks/perl.section.md +++ b/doc/languages-frameworks/perl.section.md @@ -39,7 +39,7 @@ ClassC3 = buildPerlPackage rec { version = "0.21"; src = fetchurl { url = "mirror://cpan/authors/id/F/FL/FLORA/${pname}-${version}.tar.gz"; - sha256 = "1bl8z095y4js66pwxnm7s853pi9czala4sqc743fdlnk27kq94gz"; + hash = "sha256-/5GE5xHT0uYGOQxroqj6LMU7CtKn2s6vMVoSXxL4iK4="; }; }; ``` @@ -78,7 +78,7 @@ buildPerlPackage rec { src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${pname}-${version}.tar.gz"; - sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1"; + hash = "sha256-4Y+HGgGQqcOfdiKcFIyMrWBEccVNVAMDBWZlFTMorh8="; }; preConfigure = '' @@ -96,7 +96,7 @@ ClassC3Componentised = buildPerlPackage rec { version = "1.0004"; src = fetchurl { url = "mirror://cpan/authors/id/A/AS/ASH/${pname}-${version}.tar.gz"; - sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1"; + hash = "sha256-ASO9rV/FzJYZ0BH572Fxm2ZrFLMZLFATJng1NuU4FHc="; }; propagatedBuildInputs = [ ClassC3 ClassInspector TestException MROCompat @@ -111,11 +111,11 @@ On Darwin, if a script has too many `-Idir` flags in its first line (its “sheb ImageExifTool = buildPerlPackage { pname = "Image-ExifTool"; - version = "11.50"; + version = "12.50"; src = fetchurl { - url = "https://www.sno.phy.queensu.ca/~phil/exiftool/${pname}-${version}.tar.gz"; - sha256 = "0d8v48y94z8maxkmw1rv7v9m0jg2dc8xbp581njb6yhr7abwqdv3"; + url = "https://exiftool.org/${pname}-${version}.tar.gz"; + hash = "sha256-vOhB/FwQMC8PPvdnjDvxRpU6jAZcC6GMQfc0AH4uwKg="; }; buildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; @@ -146,7 +146,7 @@ $ nix-generate-from-cpan XML::Simple version = "2.22"; src = fetchurl { url = "mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.22.tar.gz"; - sha256 = "b9450ef22ea9644ae5d6ada086dc4300fa105be050a2030ebd4efd28c198eb49"; + hash = "sha256-uUUO8i6pZErl1q2ghtxDAPoQW+BQogMOvU79KMGY60k="; }; propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ]; meta = { diff --git a/doc/languages-frameworks/pkg-config.section.md b/doc/languages-frameworks/pkg-config.section.md new file mode 100644 index 000000000000..ee0a471be3e5 --- /dev/null +++ b/doc/languages-frameworks/pkg-config.section.md @@ -0,0 +1,9 @@ +# pkg-config {#sec-pkg-config} + +*pkg-config* is a unified interface for declaring and querying built C/C++ libraries. + +Nixpkgs provides a couple of facilities for working with this tool. + + - A [setup hook](#setup-hook-pkg-config) bundled with in the `pkg-config` package, to bring a derivation's declared build inputs into the environment. + - The [`validatePkgConfig` setup hook](https://nixos.org/manual/nixpkgs/stable/#validatepkgconfig), for packages that provide pkg-config modules. + - The `defaultPkgConfigPackages` package set: a set of aliases, named after the modules they provide. This is meant to be used by language-to-nix integrations. Hand-written packages should use the normal Nixpkgs attribute name instead. diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 58be03c8de0b..c1945adb1cd3 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -58,7 +58,7 @@ with a nix-shell that has `numpy` and `toolz` in Python 3.9; then we will create a re-usable environment in a single-file Python script; then we will create a full Python environment for development with this same environment. -Philosphically, this should be familiar to users who are used to a `venv` style +Philosophically, this should be familiar to users who are used to a `venv` style of development: individual projects create their own Python environments without impacting the global environment or each other. @@ -356,7 +356,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560"; + hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; }; doCheck = false; @@ -401,7 +401,7 @@ with import {}; src = python39.pkgs.fetchPypi { inherit pname version; - sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560"; + hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; }; doCheck = false; @@ -436,7 +436,7 @@ arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is exclusively a build-time dependency, then the dependency should be included in `buildInputs`, but if it is (also) a runtime dependency, then it should be added to `propagatedBuildInputs`. Test dependencies are considered -build-time dependencies and passed to `checkInputs`. +build-time dependencies and passed to `nativeCheckInputs`. The following example shows which arguments are given to `buildPythonPackage` in order to build [`datashape`](https://github.com/blaze/datashape). @@ -450,10 +450,10 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278"; + hash = "sha256-FLLvdm1MllKrgTGC6Gb0k0deZeVYvtCCLji/B7uhong="; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ numpy multipledispatch python-dateutil ]; meta = with lib; { @@ -466,7 +466,7 @@ buildPythonPackage rec { ``` We can see several runtime dependencies, `numpy`, `multipledispatch`, and -`python-dateutil`. Furthermore, we have one `checkInputs`, i.e. `pytest`. `pytest` is a +`python-dateutil`. Furthermore, we have one `nativeCheckInputs`, i.e. `pytest`. `pytest` is a test runner and is only used during the `checkPhase` and is therefore not added to `propagatedBuildInputs`. @@ -484,7 +484,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk"; + hash = "sha256-s9NiusRxFydHzaNRMjjxFcvWxfi45jGb9ql6eJJyQJk="; }; buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; @@ -517,7 +517,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074"; + hash = "sha256-9ru2r6kwhUCaskiFoaPNuJCfCVoUL01J40byvRt4kHQ="; }; buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble]; @@ -569,8 +569,14 @@ Pytest is the most common test runner for python repositories. A trivial test run would be: ``` - checkInputs = [ pytest ]; - checkPhase = "pytest"; + nativeCheckInputs = [ pytest ]; + checkPhase = '' + runHook preCheck + + pytest + + runHook postCheck + ''; ``` However, many repositories' test suites do not translate well to nix's build @@ -579,10 +585,14 @@ sandbox, and will generally need many tests to be disabled. To filter tests using pytest, one can do the following: ``` - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # avoid tests which need additional data or touch network checkPhase = '' + runHook preCheck + pytest tests/ --ignore=tests/integration -k 'not download and not update' + + runHook postCheck ''; ``` @@ -605,10 +615,10 @@ been removed, in this case, it's recommended to use `pytestCheckHook`. `test` command for a `checkPhase` which runs `pytest`. This is also beneficial when a package may need many items disabled to run the test suite. -Using the example above, the analagous `pytestCheckHook` usage would be: +Using the example above, the analogous `pytestCheckHook` usage would be: ``` - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # requires additional data pytestFlagsArray = [ "tests/" "--ignore=tests/integration" ]; @@ -624,7 +634,7 @@ Using the example above, the analagous `pytestCheckHook` usage would be: ]; ``` -This is expecially useful when tests need to be conditionally disabled, +This is especially useful when tests need to be conditionally disabled, for example: ``` @@ -734,17 +744,17 @@ work in any of the formats supported by `buildPythonPackage` currently, with the exception of `other` (see `format` in [`buildPythonPackage` parameters](#buildpythonpackage-parameters) for more details). -### Using unittestCheckHook {#using-unittestcheckhook} +#### Using unittestCheckHook {#using-unittestcheckhook} `unittestCheckHook` is a hook which will substitute the setuptools `test` command for a `checkPhase` which runs `python -m unittest discover`: ``` - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; - unittestFlags = [ "-s" "tests" "-v" ]; + unittestFlagsArray = [ "-s" "tests" "-v" ]; ``` -##### Using sphinxHook {#using-sphinxhook} +#### Using sphinxHook {#using-sphinxhook} The `sphinxHook` is a helpful tool to build documentation and manpages using the popular Sphinx documentation generator. @@ -855,7 +865,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560"; + hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; }; meta = with lib; { @@ -988,7 +998,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "cf8436dc59d8695346fcd3ab296de46425ecab00d64096cebe79fb51ecb2eb93"; + hash = "sha256-z4Q23FnYaVNG/NOrKW3kZCXsqwDWQJbOvnn7Ueyy65M="; }; postPatch = '' @@ -996,7 +1006,7 @@ buildPythonPackage rec { rm testing/test_argcomplete.py ''; - checkInputs = [ hypothesis ]; + nativeCheckInputs = [ hypothesis ]; nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy ]; @@ -1018,7 +1028,7 @@ The `buildPythonPackage` mainly does four things: * In the `installCheck` phase, `${python.interpreter} setup.py test` is run. By default tests are run because `doCheck = true`. Test dependencies, like -e.g. the test runner, should be added to `checkInputs`. +e.g. the test runner, should be added to `nativeCheckInputs`. By default `meta.platforms` is set to the same value as the interpreter unless overridden otherwise. @@ -1072,7 +1082,7 @@ because their behaviour is different: * `buildInputs ? []`: Build and/or run-time dependencies that need to be compiled for the host machine. Typically non-Python libraries which are being linked. -* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These +* `nativeCheckInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `nativeBuildInputs` when `doCheck = true`. Items listed in `tests_require` go here. * `propagatedBuildInputs ? []`: Aside from propagating dependencies, @@ -1098,7 +1108,7 @@ with import {}; src = super.fetchPypi { pname = "pandas"; inherit version; - sha256 = "08blshqj9zj1wyjhhw3kl2vas75vhhicvv72flvf1z3jvapgw295"; + hash = "sha256-JQn+rtpy/OA2deLszSKEuxyttqBzcAil50H+JDHUdCE="; }; }); }; @@ -1158,7 +1168,7 @@ python3.pkgs.buildPythonApplication rec { src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x"; + hash = "sha256-Pe229rT0aHwA98s+nTHQMEFKZPo/yw6sot8MivFDvAw="; }; propagatedBuildInputs = with python3.pkgs; [ tornado python-daemon ]; @@ -1406,9 +1416,13 @@ example of such a situation is when `py.test` is used. buildPythonPackage { # ... # assumes the tests are located in tests - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' + runHook preCheck + py.test -k 'not function_name and not other_function' tests + + runHook postCheck ''; } ``` @@ -1674,9 +1688,9 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul packageOverrides = python-self: python-super: { twisted = python-super.twisted.overridePythonAttrs (oldAttrs: { src = super.fetchPypi { - pname = "twisted"; + pname = "Twisted"; version = "19.10.0"; - sha256 = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d"; + hash = "sha256-c5S6fycq5yKnTz2Wnc9Zm8TvCTvDkgOHSKSQ8XJKUV0="; extension = "tar.bz2"; }; }); @@ -1712,9 +1726,9 @@ self: super: { packageOverrides = python-self: python-super: { twisted = python-super.twisted.overrideAttrs (oldAttrs: { src = super.fetchPypi { - pname = "twisted"; + pname = "Twisted"; version = "19.10.0"; - sha256 = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d"; + hash = "sha256-c5S6fycq5yKnTz2Wnc9Zm8TvCTvDkgOHSKSQ8XJKUV0="; extension = "tar.bz2"; }; }); @@ -1754,7 +1768,7 @@ In a `setup.py` or `setup.cfg` it is common to declare dependencies: * `setup_requires` corresponds to `nativeBuildInputs` * `install_requires` corresponds to `propagatedBuildInputs` -* `tests_require` corresponds to `checkInputs` +* `tests_require` corresponds to `nativeCheckInputs` ## Contributing {#contributing} diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md index 986deeb0d4b2..e09194e391e1 100644 --- a/doc/languages-frameworks/qt.section.md +++ b/doc/languages-frameworks/qt.section.md @@ -2,14 +2,11 @@ Writing Nix expressions for Qt libraries and applications is largely similar as for other C++ software. This section assumes some knowledge of the latter. -There are two problems that the Nixpkgs Qt infrastructure addresses, -which are not shared by other C++ software: -1. There are usually multiple supported versions of Qt in Nixpkgs. - All of a package's dependencies must be built with the same version of Qt. - This is similar to the version constraints imposed on interpreted languages like Python. -2. Qt makes extensive use of runtime dependency detection. - Runtime dependencies are made into build dependencies through wrappers. +The major caveat with Qt applications is that Qt uses a plugin system to load additional modules at runtime, +from a list of well-known locations. In Nixpkgs, we patch QtCore to instead use an environment variable, +and wrap Qt applications to set it to the right paths. This effectively makes the runtime dependencies +pure and explicit at build-time, at the cost of introducing an extra indirection. ## Nix expression for a Qt package (default.nix) {#qt-default-nix} @@ -95,66 +92,3 @@ stdenv.mkDerivation { This means that scripts won't be automatically wrapped so you'll need to manually wrap them as previously mentioned. An example of when you'd always need to do this is with Python applications that use PyQt. ::: - -## Adding a library to Nixpkgs {#adding-a-library-to-nixpkgs} - -Add Qt libraries to `qt5-packages.nix` to make them available for every -supported Qt version. - -### Example adding a Qt library {#qt-library-all-packages-nix} - -The following represents the contents of `qt5-packages.nix`. - -```nix -{ - # ... - - mylib = callPackage ../path/to/mylib {}; - - # ... -} -``` - -Libraries are built with every available version of Qt. -Use the `meta.broken` attribute to disable the package for unsupported Qt versions: - -```nix -{ stdenv, lib, qtbase }: - -stdenv.mkDerivation { - # ... - # Disable this library with Qt < 5.9.0 - meta.broken = lib.versionOlder qtbase.version "5.9.0"; -} -``` - -## Adding an application to Nixpkgs {#adding-an-application-to-nixpkgs} - -Add Qt applications to `qt5-packages.nix`. Add an alias to `all-packages.nix` -to select the Qt 5 version used for the application. - -### Example adding a Qt application {#qt-application-all-packages-nix} - -The following represents the contents of `qt5-packages.nix`. - -```nix -{ - # ... - - myapp = callPackage ../path/to/myapp {}; - - # ... -} -``` - -The following represents the contents of `all-packages.nix`. - -```nix -{ - # ... - - myapp = libsForQt5.myapp; - - # ... -} -``` diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 48890cf53efa..ec703105e15a 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -30,10 +30,10 @@ rustPlatform.buildRustPackage rec { owner = "BurntSushi"; repo = pname; rev = version; - sha256 = "1hqps7l5qrjh9f914r5i6kmcz6f1yb951nv4lby0cjnp5l253kps"; + hash = "sha256-+s5RBC3XSgb8omTbUNLywZnP6jSxZBKSS1BmXOjRF8M="; }; - cargoSha256 = "03wf9r2csi6jpa7v5sw5lpxkrk4wfzwmzx7k3991q3bdjzcwnnwp"; + cargoHash = "sha256-jtBw4ahSl88L0iuCXxQgZVm1EcboWRJMNtjxLVTtzts="; meta = with lib; { description = "A fast line-oriented regex search tool, similar to ag and ack"; @@ -97,10 +97,10 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "1mqaynrqaas82f5957lx31x80v74zwmwmjxxlbywajb61vh00d38"; + sha256 = "sha256-aDQA4A5mScX9or3Lyiv/5GyAehidnpKKE0grhbP1Ctc="; }; - cargoHash = "sha256-JmBZcDVYJaK1cK05cxx5BrnGWp4t8ca6FLUbvIot67s="; + cargoHash = "sha256-tbrTbutUs5aPSV+yE0IBUZAAytgmZV7Eqxia7g+9zRs="; cargoDepsName = pname; # ... @@ -186,6 +186,23 @@ added. To find the correct hash, you can first use `lib.fakeSha256` or `lib.fakeHash` as a stub hash. Building the package (and thus the vendored dependencies) will then inform you of the correct hash. +For usage outside nixpkgs, `allowBuiltinFetchGit` could be used to +avoid having to specify `outputHashes`. For example: + +```nix +rustPlatform.buildRustPackage rec { + pname = "myproject"; + version = "1.0.0"; + + cargoLock = { + lockFile = ./Cargo.lock; + allowBuiltinFetchGit = true; + }; + + # ... +} +``` + ### Cargo features {#cargo-features} You can disable default features using `buildNoDefaultFeatures`, and @@ -319,7 +336,7 @@ The above are just guidelines, and exceptions may be granted on a case-by-case b However, please check if it's possible to disable a problematic subset of the test suite and leave a comment explaining your reasoning. -This can be achived with `--skip` in `checkFlags`: +This can be achieved with `--skip` in `checkFlags`: ```nix rustPlatform.buildRustPackage { @@ -331,6 +348,20 @@ rustPlatform.buildRustPackage { } ``` +#### Using `cargo-nextest` {#using-cargo-nextest} + +Tests can be run with [cargo-nextest](https://github.com/nextest-rs/nextest) +by setting `useNextest = true`. The same options still apply, but nextest +accepts a different set of arguments and the settings might need to be +adapted to be compatible with cargo-nextest. + +```nix +rustPlatform.buildRustPackage { + /* ... */ + useNextest = true; +} +``` + #### Setting `test-threads` {#setting-test-threads} `buildRustPackage` will use parallel test threads by default, @@ -403,8 +434,8 @@ cargoDeps = rustPlatform.fetchCargoTarball { ``` The `src` attribute is required, as well as a hash specified through -one of the `sha256` or `hash` attributes. The following optional -attributes can also be used: +one of the `hash` attribute. The following optional attributes can +also be used: * `name`: the name that is used for the dependencies tarball. If `name` is not specified, then the name `cargo-deps` will be used. @@ -474,6 +505,9 @@ you of the correct hash. flags can be passed to the tests using `checkFlags` and `checkFlagsArray`. By default, tests are run in parallel. This can be disabled by setting `dontUseCargoParallelTests`. +* `cargoNextestHook`: run tests using + [cargo-nextest](https://github.com/nextest-rs/nextest). The same + options for `cargoCheckHook` also applies to `cargoNextestHook`. * `cargoInstallHook`: install binaries and static/shared libraries that were built using `cargoBuildHook`. * `bindgenHook`: for crates which use `bindgen` as a build dependency, lets @@ -514,7 +548,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src sourceRoot; name = "${pname}-${version}"; - hash = "sha256-BoHIN/519Top1NUBjpB/oEMqi86Omt3zTQcXFWqrek0="; + hash = "sha256-miW//pnOmww2i6SOGbkrAIdc/JMDT4FJLqdMFojZeoY="; }; sourceRoot = "source/bindings/python"; @@ -551,7 +585,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1i1mx5y9hkyfi9jrrkcw804hmkcglxi6rmf7vin7jfnbr2bf4q64"; + hash = "sha256-xGDilsjLOnls3MfVbGKnj80KCUCczZxlis5PmHzpNcQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -591,7 +625,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "retworkx"; rev = version; - sha256 = "11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20"; + hash = "sha256-11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -608,227 +642,6 @@ buildPythonPackage rec { } ``` -## `buildRustCrate`: Compiling Rust crates using Nix instead of Cargo {#compiling-rust-crates-using-nix-instead-of-cargo} - -### Simple operation {#simple-operation} - -When run, `cargo build` produces a file called `Cargo.lock`, -containing pinned versions of all dependencies. Nixpkgs contains a -tool called `carnix` (`nix-env -iA nixos.carnix`), which can be used -to turn a `Cargo.lock` into a Nix expression. - -That Nix expression calls `rustc` directly (hence bypassing Cargo), -and can be used to compile a crate and all its dependencies. Here is -an example for a minimal `hello` crate: - -```ShellSession -$ cargo new hello -$ cd hello -$ cargo build - Compiling hello v0.1.0 (file:///tmp/hello) - Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs -$ carnix -o hello.nix --src ./. Cargo.lock --standalone -$ nix-build hello.nix -A hello_0_1_0 -``` - -Now, the file produced by the call to `carnix`, called `hello.nix`, looks like: - -```nix -# Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone -{ stdenv, buildRustCrate, fetchgit }: -let kernel = stdenv.buildPlatform.parsed.kernel.name; - # ... (content skipped) -in -rec { - hello = f: hello_0_1_0 { features = hello_0_1_0_features { hello_0_1_0 = f; }; }; - hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "hello"; - version = "0.1.0"; - authors = [ "pe@pijul.org " ]; - src = ./.; - inherit dependencies buildDependencies features; - }; - hello_0_1_0 = { features?(hello_0_1_0_features {}) }: hello_0_1_0_ {}; - hello_0_1_0_features = f: updateFeatures f (rec { - hello_0_1_0.default = (f.hello_0_1_0.default or true); - }) [ ]; -} -``` - -In particular, note that the argument given as `--src` is copied -verbatim to the source. If we look at a more complicated -dependencies, for instance by adding a single line `libc="*"` to our -`Cargo.toml`, we first need to run `cargo build` to update the -`Cargo.lock`. Then, `carnix` needs to be run again, and produces the -following nix file: - -```nix -# Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone -{ stdenv, buildRustCrate, fetchgit }: -let kernel = stdenv.buildPlatform.parsed.kernel.name; - # ... (content skipped) -in -rec { - hello = f: hello_0_1_0 { features = hello_0_1_0_features { hello_0_1_0 = f; }; }; - hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "hello"; - version = "0.1.0"; - authors = [ "pe@pijul.org " ]; - src = ./.; - inherit dependencies buildDependencies features; - }; - libc_0_2_36_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libc"; - version = "0.2.36"; - authors = [ "The Rust Project Developers" ]; - sha256 = "01633h4yfqm0s302fm0dlba469bx8y6cs4nqc8bqrmjqxfxn515l"; - inherit dependencies buildDependencies features; - }; - hello_0_1_0 = { features?(hello_0_1_0_features {}) }: hello_0_1_0_ { - dependencies = mapFeatures features ([ libc_0_2_36 ]); - }; - hello_0_1_0_features = f: updateFeatures f (rec { - hello_0_1_0.default = (f.hello_0_1_0.default or true); - libc_0_2_36.default = true; - }) [ libc_0_2_36_features ]; - libc_0_2_36 = { features?(libc_0_2_36_features {}) }: libc_0_2_36_ { - features = mkFeatures (features.libc_0_2_36 or {}); - }; - libc_0_2_36_features = f: updateFeatures f (rec { - libc_0_2_36.default = (f.libc_0_2_36.default or true); - libc_0_2_36.use_std = - (f.libc_0_2_36.use_std or false) || - (f.libc_0_2_36.default or false) || - (libc_0_2_36.default or false); - }) []; -} -``` - -Here, the `libc` crate has no `src` attribute, so `buildRustCrate` -will fetch it from [crates.io](https://crates.io). A `sha256` -attribute is still needed for Nix purity. - -### Handling external dependencies {#handling-external-dependencies} - -Some crates require external libraries. For crates from -[crates.io](https://crates.io), such libraries can be specified in -`defaultCrateOverrides` package in nixpkgs itself. - -Starting from that file, one can add more overrides, to add features -or build inputs by overriding the hello crate in a separate file. - -```nix -with import {}; -((import ./hello.nix).hello {}).override { - crateOverrides = defaultCrateOverrides // { - hello = attrs: { buildInputs = [ openssl ]; }; - }; -} -``` - -Here, `crateOverrides` is expected to be a attribute set, where the -key is the crate name without version number and the value a function. -The function gets all attributes passed to `buildRustCrate` as first -argument and returns a set that contains all attribute that should be -overwritten. - -For more complicated cases, such as when parts of the crate's -derivation depend on the crate's version, the `attrs` argument of -the override above can be read, as in the following example, which -patches the derivation: - -```nix -with import {}; -((import ./hello.nix).hello {}).override { - crateOverrides = defaultCrateOverrides // { - hello = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") { - postPatch = '' - substituteInPlace lib/zoneinfo.rs \ - --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" - ''; - }; - }; -} -``` - -Another situation is when we want to override a nested -dependency. This actually works in the exact same way, since the -`crateOverrides` parameter is forwarded to the crate's -dependencies. For instance, to override the build inputs for crate -`libc` in the example above, where `libc` is a dependency of the main -crate, we could do: - -```nix -with import {}; -((import hello.nix).hello {}).override { - crateOverrides = defaultCrateOverrides // { - libc = attrs: { buildInputs = []; }; - }; -} -``` - -### Options and phases configuration {#options-and-phases-configuration} - -Actually, the overrides introduced in the previous section are more -general. A number of other parameters can be overridden: - -- The version of `rustc` used to compile the crate: - - ```nix - (hello {}).override { rust = pkgs.rust; }; - ``` - -- Whether to build in release mode or debug mode (release mode by - default): - - ```nix - (hello {}).override { release = false; }; - ``` - -- Whether to print the commands sent to `rustc` when building - (equivalent to `--verbose` in cargo: - - ```nix - (hello {}).override { verbose = false; }; - ``` - -- Extra arguments to be passed to `rustc`: - - ```nix - (hello {}).override { extraRustcOpts = "-Z debuginfo=2"; }; - ``` - -- Phases, just like in any other derivation, can be specified using - the following attributes: `preUnpack`, `postUnpack`, `prePatch`, - `patches`, `postPatch`, `preConfigure` (in the case of a Rust crate, - this is run before calling the "build" script), `postConfigure` - (after the "build" script),`preBuild`, `postBuild`, `preInstall` and - `postInstall`. As an example, here is how to create a new module - before running the build script: - - ```nix - (hello {}).override { - preConfigure = '' - echo "pub const PATH=\"${hi.out}\";" >> src/path.rs" - ''; - }; - ``` - -### Features {#features} - -One can also supply features switches. For example, if we want to -compile `diesel_cli` only with the `postgres` feature, and no default -features, we would write: - -```nix -(callPackage ./diesel.nix {}).diesel { - default = false; - postgres = true; -} -``` - -Where `diesel.nix` is the file generated by Carnix, as explained above. - ## Setting Up `nix-shell` {#setting-up-nix-shell} Oftentimes you want to develop code from within `nix-shell`. Unfortunately @@ -886,7 +699,7 @@ let src = fetchFromGitHub { repo = "nixpkgs-mozilla"; # commit from: 2019-05-15 rev = "9f35c4b09fd44a77227e79ff0c1b4b6a69dff533"; - sha256 = "18h0nvh55b5an4gmlgfbvwbyqj91bklf1zymis6lbdh75571qaz0"; + hash = "sha256-18h0nvh55b5an4gmlgfbvwbyqj91bklf1zymis6lbdh75571qaz0="; }; in with import "${src.out}/rust-overlay.nix" pkgs pkgs; @@ -977,7 +790,7 @@ rustPlatform.buildRustPackage rec { owner = "BurntSushi"; repo = "ripgrep"; rev = version; - sha256 = "1hqps7l5qrjh9f914r5i6kmcz6f1yb951nv4lby0cjnp5l253kps"; + hash = "sha256-1hqps7l5qrjh9f914r5i6kmcz6f1yb951nv4lby0cjnp5l253kps="; }; cargoSha256 = "03wf9r2csi6jpa7v5sw5lpxkrk4wfzwmzx7k3991q3bdjzcwnnwp"; diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md index 060f5c647c29..e790e217cac0 100644 --- a/doc/languages-frameworks/texlive.section.md +++ b/doc/languages-frameworks/texlive.section.md @@ -55,11 +55,11 @@ let srcs = [ (fetchurl { url = "http://mirrors.ctan.org/macros/latex/contrib/foiltex/foiltex.dtx"; - sha256 = "07frz0krpz7kkcwlayrwrj2a2pixmv0icbngyw92srp9fp23cqpz"; + hash = "sha256-/2I2xHXpZi0S988uFsGuPV6hhMw8e0U5m/P8myf42R0="; }) (fetchurl { url = "http://mirrors.ctan.org/macros/latex/contrib/foiltex/foiltex.ins"; - sha256 = "09wkyidxk3n3zvqxfs61wlypmbhi1pxmjdi1kns9n2ky8ykbff99"; + hash = "sha256-KTm3pkd+Cpu0nSE2WfsNEa56PeXBaNfx/sOO2Vv0kyc="; }) ]; diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 82ec2592560d..3490b2576121 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -10,12 +10,21 @@ At the moment we support two different methods for managing plugins: - Vim packages (*recommended*) - vim-plug (vim only) +Right now two Vim packages are available: `vim` which has most features that require extra +dependencies disabled and `vim-full` which has them configurable and enabled by default. + +::: {.note} +`vim_configurable` is a deprecated alias for `vim-full` and refers to the fact that its +build-time features are configurable. It has nothing to do with user configuration, +and both the `vim` and `vim-full` packages can be customized as explained in the next section. +::: + ## Custom configuration {#custom-configuration} Adding custom .vimrc lines can be done using the following code: ```nix -vim_configurable.customize { +vim-full.customize { # `name` optionally specifies the name of the executable and package name = "vim-with-plugins"; @@ -62,7 +71,7 @@ neovim-qt.override { To store your plugins in Vim packages (the native Vim plugin manager, see `:help packages`) the following example can be used: ```nix -vim_configurable.customize { +vim-full.customize { vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; { # loaded on launch start = [ youcompleteme fugitive ]; @@ -101,7 +110,7 @@ The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.n ```nix { packageOverrides = pkgs: with pkgs; { - myVim = vim_configurable.customize { + myVim = vim-full.customize { # `name` specifies the name of the executable and package name = "vim-with-plugins"; # add here code from the example section @@ -131,7 +140,7 @@ let owner = "dkprice"; repo = "vim-easygrep"; rev = "d0c36a77cc63c22648e792796b1815b44164653a"; - sha256 = "0y2p5mz0d5fhg6n68lhfhl8p4mlwkb82q337c22djs4w5zyzggbc"; + hash = "sha256-bL33/S+caNmEYGcMLNCanFZyEYUOUmSsedCVBn4tV3g="; }; }; in @@ -190,7 +199,7 @@ To use [vim-plug](https://github.com/junegunn/vim-plug) to manage your Vim plugins the following example can be used: ```nix -vim_configurable.customize { +vim-full.customize { vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; { # loaded on launch plug.plugins = [ youcompleteme fugitive phpCompletion elm-vim ]; diff --git a/doc/manpage-urls.json b/doc/manpage-urls.json new file mode 100644 index 000000000000..e83708dd64d6 --- /dev/null +++ b/doc/manpage-urls.json @@ -0,0 +1,32 @@ +{ + "gnunet.conf(5)": "https://docs.gnunet.org/users/configuration.html", + "mpd(1)": "https://mpd.readthedocs.io/en/latest/mpd.1.html", + "mpd.conf(5)": "https://mpd.readthedocs.io/en/latest/mpd.conf.5.html", + "nix.conf(5)": "https://nixos.org/manual/nix/stable/command-ref/conf-file.html", + + "journald.conf(5)": "https://www.freedesktop.org/software/systemd/man/journald.conf.html", + "logind.conf(5)": "https://www.freedesktop.org/software/systemd/man/logind.conf.html", + "networkd.conf(5)": "https://www.freedesktop.org/software/systemd/man/networkd.conf.html", + "systemd.automount(5)": "https://www.freedesktop.org/software/systemd/man/systemd.automount.html", + "systemd.exec(5)": "https://www.freedesktop.org/software/systemd/man/systemd.exec.html", + "systemd.link(5)": "https://www.freedesktop.org/software/systemd/man/systemd.link.html", + "systemd.mount(5)": "https://www.freedesktop.org/software/systemd/man/systemd.mount.html", + "systemd.netdev(5)": "https://www.freedesktop.org/software/systemd/man/systemd.netdev.html", + "systemd.network(5)": "https://www.freedesktop.org/software/systemd/man/systemd.network.html", + "systemd.nspawn(5)": "https://www.freedesktop.org/software/systemd/man/systemd.nspawn.html", + "systemd.path(5)": "https://www.freedesktop.org/software/systemd/man/systemd.path.html", + "systemd.resource-control(5)": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html", + "systemd.scope(5)": "https://www.freedesktop.org/software/systemd/man/systemd.scope.html", + "systemd.service(5)": "https://www.freedesktop.org/software/systemd/man/systemd.service.html", + "systemd.slice(5)": "https://www.freedesktop.org/software/systemd/man/systemd.slice.html", + "systemd.socket(5)": "https://www.freedesktop.org/software/systemd/man/systemd.socket.html", + "systemd.timer(5)": "https://www.freedesktop.org/software/systemd/man/systemd.timer.html", + "systemd.unit(5)": "https://www.freedesktop.org/software/systemd/man/systemd.unit.html", + "systemd-system.conf(5)": "https://www.freedesktop.org/software/systemd/man/systemd-system.conf.html", + "systemd-user.conf(5)": "https://www.freedesktop.org/software/systemd/man/systemd-user.conf.html", + "timesyncd.conf(5)": "https://www.freedesktop.org/software/systemd/man/timesyncd.conf.html", + "tmpfiles.d(5)": "https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html", + "systemd.time(7)": "https://www.freedesktop.org/software/systemd/man/systemd.time.html", + "systemd-fstab-generator(8)": "https://www.freedesktop.org/software/systemd/man/systemd-fstab-generator.html", + "systemd-networkd-wait-online.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-networkd-wait-online.service.html" +} diff --git a/doc/old/cross.txt b/doc/old/cross.txt index 064ca8d37b01..0f958e772b78 100644 --- a/doc/old/cross.txt +++ b/doc/old/cross.txt @@ -61,7 +61,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { url = "http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2"; - sha256 = "1ian3kwh2vg6hr3ymrv48s04gijs539vzrq62xr76bxbhbwnz2np"; + hash = "sha256-14pv+YKrL3NyFwbnv9MoWsZHgEZk5+pHhuZtAfkcVsU="; }; inherit noSysDirs; configureFlags = [ "--target=arm-linux" ]; @@ -85,7 +85,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { url = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.1.tar.bz2"; - sha256 = "12qxmc827fjhaz53kjy7vyrzsaqcg78amiqsb3qm20z26w705lma"; + hash = "sha256-qtICDjfiA1HxWBrHqtB5DCv9s9/HyznKV1C6IxCrHYs="; }; } --- @@ -151,8 +151,8 @@ stdenv.mkDerivation { name = "gcc-4.0.2-arm"; builder = ./builder.sh; src = fetchurl { - url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-4.0.2/gcc-core-4.0.2.tar.bz2; - sha256 = "02fxh0asflm8825w23l2jq1wvs7hbnam0jayrivg7zdv2ifnc0rc"; + url = "ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-4.0.2/gcc-core-4.0.2.tar.bz2"; + hash = "sha256-LANmXRS7/fN2zF5JUJVd8OjNA5aCDsGLQKhSpxWA3Qk="; }; # !!! apply only if noSysDirs is set patches = [./no-sys-dirs.patch ./gcc-inhibit.patch]; @@ -303,7 +303,7 @@ One of the compiler flags that GCC uses for this compiler is called X_CFLAGS. This is used by the Nix build process to set the dynamic linker, glibc in the case of i686-linux using the default Nix packages collection. -Obiously, since we need to compile libstc++ for arm-linux with uClibc linking +Obviously, since we need to compile libstc++ for arm-linux with uClibc linking will not be done correctly: you can't link object files built for arm-linux with a glibc built for i686-linux. diff --git a/doc/preface.chapter.md b/doc/preface.chapter.md index 16f228272b3d..7aae7fa90591 100644 --- a/doc/preface.chapter.md +++ b/doc/preface.chapter.md @@ -24,8 +24,8 @@ Packages, including the Nix packages collection, are distributed through [channels](https://nixos.org/nix/manual/#sec-channels). The collection is distributed for users of Nix on non-NixOS distributions through the channel `nixpkgs`. Users of NixOS generally use one of the `nixos-*` channels, e.g. -`nixos-19.09`, which includes all packages and modules for the stable NixOS -19.09. Stable NixOS releases are generally only given +`nixos-22.11`, which includes all packages and modules for the stable NixOS +22.11. Stable NixOS releases are generally only given security updates. More up to date packages and modules are available via the `nixos-unstable` channel. @@ -43,4 +43,4 @@ The binaries are made available via a [binary cache](https://cache.nixos.org). The current Nix expressions of the channels are available in the [`nixpkgs`](https://github.com/NixOS/nixpkgs) repository in branches -that correspond to the channel names (e.g. `nixos-19.09-small`). +that correspond to the channel names (e.g. `nixos-22.11-small`). diff --git a/doc/stdenv/cross-compilation.chapter.md b/doc/stdenv/cross-compilation.chapter.md index 5f7ff513959a..e659e1803807 100644 --- a/doc/stdenv/cross-compilation.chapter.md +++ b/doc/stdenv/cross-compilation.chapter.md @@ -150,7 +150,7 @@ depsBuildBuild = [ buildPackages.stdenv.cc ]; Add the following to your `mkDerivation` invocation. ```nix -doCheck = stdenv.hostPlatform == stdenv.buildPlatform; +doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; ``` #### Package using Meson needs to run binaries for the host platform during build. {#cross-meson-runs-host-code} diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index f4d8ed2919dd..1fca829aa597 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -11,58 +11,12 @@ meta = with lib; { ''; homepage = "https://www.gnu.org/software/hello/manual/"; license = licenses.gpl3Plus; - maintainers = [ maintainers.eelco ]; + maintainers = with maintainers; [ eelco ]; platforms = platforms.all; }; ``` -Meta-attributes are not passed to the builder of the package. Thus, a change to a meta-attribute doesn’t trigger a recompilation of the package. The value of a meta-attribute must be a string. - -The meta-attributes of a package can be queried from the command-line using `nix-env`: - -```ShellSession -$ nix-env -qa hello --json -{ - "hello": { - "meta": { - "description": "A program that produces a familiar, friendly greeting", - "homepage": "https://www.gnu.org/software/hello/manual/", - "license": { - "fullName": "GNU General Public License version 3 or later", - "shortName": "GPLv3+", - "url": "http://www.fsf.org/licensing/licenses/gpl.html" - }, - "longDescription": "GNU Hello is a program that prints \"Hello, world!\" when you run it.\nIt is fully customizable.\n", - "maintainers": [ - "Ludovic Court\u00e8s " - ], - "platforms": [ - "i686-linux", - "x86_64-linux", - "armv5tel-linux", - "armv7l-linux", - "mips32-linux", - "x86_64-darwin", - "i686-cygwin", - "i686-freebsd13", - "x86_64-freebsd13", - "i686-openbsd", - "x86_64-openbsd" - ], - "position": "/home/user/dev/nixpkgs/pkgs/applications/misc/hello/default.nix:14" - }, - "name": "hello-2.9", - "system": "x86_64-linux" - } -} -``` - -`nix-env` knows about the `description` field specifically: - -```ShellSession -$ nix-env -qa hello --description -hello-2.3 A program that produces a familiar, friendly greeting -``` +Meta-attributes are not passed to the builder of the package. Thus, a change to a meta-attribute doesn’t trigger a recompilation of the package. ## Standard meta-attributes {#sec-standard-meta-attributes} @@ -112,7 +66,7 @@ For details, see [Licenses](#sec-meta-license). ### `maintainers` {#var-meta-maintainers} -A list of the maintainers of this Nix expression. Maintainers are defined in [`nixpkgs/maintainers/maintainer-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix). There is no restriction to becoming a maintainer, just add yourself to that list in a separate commit titled “maintainers: add alice”, and reference maintainers with `maintainers = with lib.maintainers; [ alice bob ]`. +A list of the maintainers of this Nix expression. Maintainers are defined in [`nixpkgs/maintainers/maintainer-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix). There is no restriction to becoming a maintainer, just add yourself to that list in a separate commit titled “maintainers: add alice” in the same pull request, and reference maintainers with `maintainers = with lib.maintainers; [ alice bob ]`. ### `mainProgram` {#var-meta-mainProgram} diff --git a/doc/stdenv/multiple-output.chapter.md b/doc/stdenv/multiple-output.chapter.md index 65156816b991..c19d497ab61e 100644 --- a/doc/stdenv/multiple-output.chapter.md +++ b/doc/stdenv/multiple-output.chapter.md @@ -29,7 +29,7 @@ NixOS provides two ways to select the outputs to install for packages listed in `nix-env` lacks an easy way to select the outputs to install. When installing a package, `nix-env` always installs the outputs listed in `meta.outputsToInstall`, even when the user explicitly selects an output. ::: {.warning} -`nix-env` silenty disregards the outputs selected by the user, and instead installs the outputs from `meta.outputsToInstall`. For example, +`nix-env` silently disregards the outputs selected by the user, and instead installs the outputs from `meta.outputsToInstall`. For example, ```ShellSession $ nix-env -iA nixpkgs.coreutils.info diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 7cfd047d342b..a12d68c0934f 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -11,7 +11,7 @@ stdenv.mkDerivation { name = "libfoo-1.2.3"; src = fetchurl { url = "http://example.org/libfoo-1.2.3.tar.bz2"; - sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m"; + hash = "sha256-tWxU/LANbQE32my+9AXyt3nCT7NBVfJ45CX757EMT3Q="; }; } ``` @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "1.2.3"; src = fetchurl { url = "http://example.org/libfoo-source-${version}.tar.bz2"; - sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m"; + hash = "sha256-tWxU/LANbQE32my+9AXyt3nCT7NBVfJ45CX757EMT3Q="; }; } ``` @@ -253,7 +253,7 @@ The propagated equivalent of `depsTargetTarget`. This is prefixed for the same r #### `NIX_DEBUG` {#var-stdenv-NIX_DEBUG} -A natural number indicating how much information to log. If set to 1 or higher, `stdenv` will print moderate debugging information during the build. In particular, the `gcc` and `ld` wrapper scripts will print out the complete command line passed to the wrapped tools. If set to 6 or higher, the `stdenv` setup script will be run with `set -x` tracing. If set to 7 or higher, the `gcc` and `ld` wrapper scripts will also be run with `set -x` tracing. +A number between 0 and 7 indicating how much information to log. If set to 1 or higher, `stdenv` will print moderate debugging information during the build. In particular, the `gcc` and `ld` wrapper scripts will print out the complete command line passed to the wrapped tools. If set to 6 or higher, the `stdenv` setup script will be run with `set -x` tracing. If set to 7 or higher, the `gcc` and `ld` wrapper scripts will also be run with `set -x` tracing. ### Attributes affecting build properties {#attributes-affecting-build-properties} @@ -626,7 +626,7 @@ Before and after running `make`, the hooks `preBuild` and `postBuild` are called ### The check phase {#ssec-check-phase} -The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make check`, but only if the `doCheck` variable is enabled. +The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make $checkTarget`, but only if the `doCheck` variable is enabled (see below). #### Variables controlling the check phase {#variables-controlling-the-check-phase} @@ -646,7 +646,7 @@ See the [build phase](#var-stdenv-makeFlags) for details. ##### `checkTarget` {#var-stdenv-checkTarget} -The make target that runs the tests. Defaults to `check`. +The make target that runs the tests. Defaults to `check` if it exists, otherwise `test`; if neither is found, do nothing. ##### `checkFlags` / `checkFlagsArray` {#var-stdenv-checkFlags} @@ -654,7 +654,11 @@ A list of strings passed as additional flags to `make`. Like `makeFlags` and `ma ##### `checkInputs` {#var-stdenv-checkInputs} -A list of dependencies used by the phase. This gets included in `nativeBuildInputs` when `doCheck` is set. +A list of host dependencies used by the phase, usually libraries linked into executables built during tests. This gets included in `buildInputs` when `doCheck` is set. + +##### `nativeCheckInputs` {#var-stdenv-nativeCheckInputs} + +A list of native dependencies used by the phase, notably tools needed on `$PATH`. This gets included in `nativeBuildInputs` when `doCheck` is set. ##### `preCheck` {#var-stdenv-preCheck} @@ -719,11 +723,11 @@ If set, libraries and executables are not stripped. By default, they are. ##### `dontStripHost` {#var-stdenv-dontStripHost} -Like `dontStrip`, but only affects the `strip` command targetting the package’s host platform. Useful when supporting cross compilation, but otherwise feel free to ignore. +Like `dontStrip`, but only affects the `strip` command targeting the package’s host platform. Useful when supporting cross compilation, but otherwise feel free to ignore. ##### `dontStripTarget` {#var-stdenv-dontStripTarget} -Like `dontStrip`, but only affects the `strip` command targetting the packages’ target platform. Useful when supporting cross compilation, but otherwise feel free to ignore. +Like `dontStrip`, but only affects the `strip` command targeting the packages’ target platform. Useful when supporting cross compilation, but otherwise feel free to ignore. ##### `dontMoveSbin` {#var-stdenv-dontMoveSbin} @@ -821,7 +825,11 @@ A list of strings passed as additional flags to `make`. Like `makeFlags` and `ma ##### `installCheckInputs` {#var-stdenv-installCheckInputs} -A list of dependencies used by the phase. This gets included in `nativeBuildInputs` when `doInstallCheck` is set. +A list of host dependencies used by the phase, usually libraries linked into executables built during tests. This gets included in `buildInputs` when `doInstallCheck` is set. + +##### `nativeInstallCheckInputs` {#var-stdenv-nativeInstallCheckInputs} + +A list of native dependencies used by the phase, notably tools needed on `$PATH`. This gets included in `nativeBuildInputs` when `doInstallCheck` is set. ##### `preInstallCheck` {#var-stdenv-preInstallCheck} @@ -837,6 +845,10 @@ The distribution phase is intended to produce a source distribution of the packa #### Variables controlling the distribution phase {#variables-controlling-the-distribution-phase} +##### `doDist` {#var-stdenv-doDist} + +If set, the distribution phase is executed. + ##### `distTarget` {#var-stdenv-distTarget} The make target that produces the distribution. Defaults to `dist`. @@ -990,6 +1002,32 @@ Convenience function for `makeWrapper` that replaces `<\executable\>` with a wra If you will apply it multiple times, it will overwrite the wrapper file and you will end up with double wrapping, which should be avoided. +### `prependToVar` \ \ {#fun-prependToVar} + +Prepend elements to a variable. + +Example: + +```shellSession +$ configureFlags="--disable-static" +$ prependToVar configureFlags --disable-dependency-tracking --enable-foo +$ echo $configureFlags +--disable-dependency-tracking --enable-foo --disable-static +``` + +### `appendToVar` \ \ {#fun-appendToVar} + +Append elements to a variable. + +Example: + +```shellSession +$ configureFlags="--disable-static" +$ appendToVar configureFlags --disable-dependency-tracking --enable-foo +$ echo $configureFlags +--disable-static --disable-dependency-tracking --enable-foo +``` + ## Package setup hooks {#ssec-setup-hooks} Nix itself considers a build-time dependency as merely something that should previously be built and accessible at build time—packages themselves are on their own to perform any additional setup. In most cases, that is fine, and the downstream derivation can deal with its own dependencies. But for a few common tasks, that would result in almost every package doing the same sort of setup work—depending not on the package itself, but entirely on which dependencies were used. diff --git a/doc/using/configuration.chapter.md b/doc/using/configuration.chapter.md index 3c46dc3227a6..e657cb21c295 100644 --- a/doc/using/configuration.chapter.md +++ b/doc/using/configuration.chapter.md @@ -73,7 +73,7 @@ There are also two ways to try compiling a package which has been marked as unsu } ``` -The difference between a package being unsupported on some system and being broken is admittedly a bit fuzzy. If a program *ought* to work on a certain platform, but doesn't, the platform should be included in `meta.platforms`, but marked as broken with e.g. `meta.broken = !hostPlatform.isWindows`. Of course, this begs the question of what \"ought\" means exactly. That is left to the package maintainer. +The difference between a package being unsupported on some system and being broken is admittedly a bit fuzzy. If a program *ought* to work on a certain platform, but doesn't, the platform should be included in `meta.platforms`, but marked as broken with e.g. `meta.broken = !hostPlatform.isWindows`. Of course, this begs the question of what "ought" means exactly. That is left to the package maintainer. ## Installing unfree packages {#sec-allow-unfree} @@ -310,16 +310,16 @@ For this to work fully, you must also have this script sourced when you are logg ```ShellSession #!/bin/sh -if [ -d $HOME/.nix-profile/etc/profile.d ]; then - for i in $HOME/.nix-profile/etc/profile.d/*.sh; do - if [ -r $i ]; then - . $i +if [ -d "${HOME}/.nix-profile/etc/profile.d" ]; then + for i in "${HOME}/.nix-profile/etc/profile.d/"*.sh; do + if [ -r "$i" ]; then + . "$i" fi done fi ``` -Now just run `source $HOME/.profile` and you can starting loading man pages from your environment. +Now just run `. "${HOME}/.profile"` and you can start loading man pages from your environment. ### GNU info setup {#sec-gnu-info-setup} diff --git a/doc/using/overrides.chapter.md b/doc/using/overrides.chapter.md index a97a39354a9d..198b4504197d 100644 --- a/doc/using/overrides.chapter.md +++ b/doc/using/overrides.chapter.md @@ -63,7 +63,7 @@ You should prefer `overrideAttrs` in almost all cases, see its documentation for ::: ::: {.warning} -Do not use this function in Nixpkgs as it evaluates a Derivation before modifying it, which breaks package abstraction and removes error-checking of function arguments. In addition, this evaluation-per-function application incurs a performance penalty, which can become a problem if many overrides are used. It is only intended for ad-hoc customisation, such as in `~/.config/nixpkgs/config.nix`. +Do not use this function in Nixpkgs as it evaluates a derivation before modifying it, which breaks package abstraction. In addition, this evaluation-per-function application incurs a performance penalty, which can become a problem if many overrides are used. It is only intended for ad-hoc customisation, such as in `~/.config/nixpkgs/config.nix`. ::: The function `overrideDerivation` creates a new derivation based on an existing one by overriding the original's attributes with the attribute set produced by the specified function. This function is available on all derivations defined using the `makeOverridable` function. Most standard derivation-producing functions, such as `stdenv.mkDerivation`, are defined using this function, which means most packages in the nixpkgs expression, `pkgs`, have this function. @@ -74,8 +74,8 @@ Example usage: mySed = pkgs.gnused.overrideDerivation (oldAttrs: { name = "sed-4.2.2-pre"; src = fetchurl { - url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2; - sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k"; + url = "ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2"; + hash = "sha256-MxBJRcM2rYzQYwJ5XKxhXTQByvSg5jZc5cSHEZoB2IY="; }; patches = []; }); diff --git a/lib/asserts.nix b/lib/asserts.nix index 9ae357cbc935..98e0b490acf2 100644 --- a/lib/asserts.nix +++ b/lib/asserts.nix @@ -16,11 +16,15 @@ rec { assertMsg :: Bool -> String -> Bool */ # TODO(Profpatsch): add tests that check stderr - assertMsg = pred: msg: + assertMsg = + # Predicate that needs to succeed, otherwise `msg` is thrown + pred: + # Message to throw in case `pred` fails + msg: pred || builtins.throw msg; - /* Specialized `assertMsg` for checking if val is one of the elements - of a list. Useful for checking enums. + /* Specialized `assertMsg` for checking if `val` is one of the elements + of the list `xs`. Useful for checking enums. Example: let sslLibrary = "libressl"; @@ -33,7 +37,14 @@ rec { Type: assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool */ - assertOneOf = name: val: xs: assertMsg + assertOneOf = + # The name of the variable the user entered `val` into, for inclusion in the error message + name: + # The value of what the user provided, to be compared against the values in `xs` + val: + # The list of valid values + xs: + assertMsg (lib.elem val xs) "${name} must be one of ${ lib.generators.toPretty {} xs}, but is: ${ diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 8b5c0ef4cea6..30952651adf4 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -16,17 +16,29 @@ rec { Example: x = { a = { b = 3; }; } + # ["a" "b"] is equivalent to x.a.b + # 6 is a default value to return if the path does not exist in attrset attrByPath ["a" "b"] 6 x => 3 attrByPath ["z" "z"] 6 x => 6 + + Type: + attrByPath :: [String] -> Any -> AttrSet -> Any + */ - attrByPath = attrPath: default: e: + attrByPath = + # A list of strings representing the attribute path to return from `set` + attrPath: + # Default value if `attrPath` does not resolve to an existing value + default: + # The nested attribute set to select values from + set: let attr = head attrPath; in - if attrPath == [] then e - else if e ? ${attr} - then attrByPath (tail attrPath) default e.${attr} + if attrPath == [] then set + else if set ? ${attr} + then attrByPath (tail attrPath) default set.${attr} else default; /* Return if an attribute from nested attribute set exists. @@ -38,8 +50,14 @@ rec { hasAttrByPath ["z" "z"] x => false + Type: + hasAttrByPath :: [String] -> AttrSet -> Bool */ - hasAttrByPath = attrPath: e: + hasAttrByPath = + # A list of strings representing the attribute path to check from `set` + attrPath: + # The nested attribute set to check + e: let attr = head attrPath; in if attrPath == [] then true @@ -48,13 +66,20 @@ rec { else false; - /* Return nested attribute set in which an attribute is set. + /* Create a new attribute set with `value` set at the nested attribute location specified in `attrPath`. Example: setAttrByPath ["a" "b"] 3 => { a = { b = 3; }; } + + Type: + setAttrByPath :: [String] -> Any -> AttrSet */ - setAttrByPath = attrPath: value: + setAttrByPath = + # A list of strings representing the attribute path to set + attrPath: + # The value to set at the location described by `attrPath` + value: let len = length attrPath; atDepth = n: @@ -63,8 +88,8 @@ rec { else { ${elemAt attrPath n} = atDepth (n + 1); }; in atDepth 0; - /* Like `attrByPath' without a default value. If it doesn't find the - path it will throw. + /* Like `attrByPath`, but without a default value. If it doesn't find the + path it will throw an error. Example: x = { a = { b = 3; }; } @@ -72,18 +97,22 @@ rec { => 3 getAttrFromPath ["z" "z"] x => error: cannot find attribute `z.z' + + Type: + getAttrFromPath :: [String] -> AttrSet -> Any */ - getAttrFromPath = attrPath: + getAttrFromPath = + # A list of strings representing the attribute path to get from `set` + attrPath: + # The nested attribute set to find the value in. + set: let errorMsg = "cannot find attribute `" + concatStringsSep "." attrPath + "'"; - in attrByPath attrPath (abort errorMsg); + in attrByPath attrPath (abort errorMsg) set; /* Map each attribute in the given set and merge them into a new attribute set. Type: - concatMapAttrs :: - (String -> a -> AttrSet) - -> AttrSet - -> AttrSet + concatMapAttrs :: (String -> a -> AttrSet) -> AttrSet -> AttrSet Example: concatMapAttrs @@ -101,19 +130,23 @@ rec { 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 + 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 @@ -134,6 +167,8 @@ rec { } ] { a.b.c = 0; } => { a = { b = { d = 1; }; }; x = { y = "xy"; }; } + + Type: updateManyAttrsByPath :: [{ path :: [String]; update :: (Any -> Any); }] -> AttrSet -> AttrSet */ updateManyAttrsByPath = let # When recursing into attributes, instead of updating the `path` of each @@ -199,8 +234,15 @@ rec { Example: attrVals ["a" "b" "c"] as => [as.a as.b as.c] + + Type: + attrVals :: [String] -> AttrSet -> [Any] */ - attrVals = nameList: set: map (x: set.${x}) nameList; + attrVals = + # The list of attributes to fetch from `set`. Each attribute name must exist on the attrbitue set + nameList: + # The set to get attribute values from + set: map (x: set.${x}) nameList; /* Return the values of all attributes in the given set, sorted by @@ -209,6 +251,9 @@ rec { Example: attrValues {c = 3; a = 1; b = 2;} => [1 2 3] + + Type: + attrValues :: AttrSet -> [Any] */ attrValues = builtins.attrValues or (attrs: attrVals (attrNames attrs) attrs); @@ -219,15 +264,25 @@ rec { Example: getAttrs [ "a" "b" ] { a = 1; b = 2; c = 3; } => { a = 1; b = 2; } - */ - getAttrs = names: attrs: genAttrs names (name: attrs.${name}); - /* Collect each attribute named `attr' from a list of attribute + Type: + getAttrs :: [String] -> AttrSet -> AttrSet + */ + getAttrs = + # A list of attribute names to get out of `set` + names: + # The set to get the named attributes from + attrs: genAttrs names (name: attrs.${name}); + + /* Collect each attribute named `attr` from a list of attribute sets. Sets that don't contain the named attribute are ignored. Example: catAttrs "a" [{a = 1;} {b = 0;} {a = 2;}] => [1 2] + + Type: + catAttrs :: String -> [AttrSet] -> [Any] */ catAttrs = builtins.catAttrs or (attr: l: concatLists (map (s: if s ? ${attr} then [s.${attr}] else []) l)); @@ -239,8 +294,15 @@ rec { Example: filterAttrs (n: v: n == "foo") { foo = 1; bar = 2; } => { foo = 1; } + + Type: + filterAttrs :: (String -> Any -> Bool) -> AttrSet -> AttrSet */ - filterAttrs = pred: set: + filterAttrs = + # Predicate taking an attribute name and an attribute value, which returns `true` to include the attribute, or `false` to exclude the attribute. + pred: + # The attribute set to filter + set: listToAttrs (concatMap (name: let v = set.${name}; in if pred name v then [(nameValuePair name v)] else []) (attrNames set)); @@ -250,8 +312,15 @@ rec { Example: filterAttrsRecursive (n: v: v != null) { foo = { bar = null; }; } => { foo = {}; } + + Type: + filterAttrsRecursive :: (String -> Any -> Bool) -> AttrSet -> AttrSet */ - filterAttrsRecursive = pred: set: + filterAttrsRecursive = + # Predicate taking an attribute name and an attribute value, which returns `true` to include the attribute, or `false` to exclude the attribute. + pred: + # The attribute set to filter + set: listToAttrs ( concatMap (name: let v = set.${name}; in @@ -269,23 +338,29 @@ rec { Example: foldAttrs (item: acc: [item] ++ acc) [] [{ a = 2; } { a = 3; }] => { a = [ 2 3 ]; } + + Type: + foldAttrs :: (Any -> Any -> Any) -> Any -> [AttrSets] -> Any + */ - foldAttrs = op: nul: + foldAttrs = + # A function, given a value and a collector combines the two. + op: + # The starting value. + nul: + # A list of attribute sets to fold together by key. + list_of_attrs: foldr (n: a: foldr (name: o: o // { ${name} = op n.${name} (a.${name} or nul); } ) a (attrNames n) - ) {}; + ) {} list_of_attrs; - /* Recursively collect sets that verify a given predicate named `pred' - from the set `attrs'. The recursion is stopped when the predicate is + /* Recursively collect sets that verify a given predicate named `pred` + from the set `attrs`. The recursion is stopped when the predicate is verified. - Type: - collect :: - (AttrSet -> Bool) -> AttrSet -> [x] - Example: collect isList { a = { b = ["b"]; }; c = [1]; } => [["b"] [1]] @@ -293,8 +368,15 @@ rec { collect (x: x ? outPath) { a = { outPath = "a/"; }; b = { outPath = "b/"; }; } => [{ outPath = "a/"; } { outPath = "b/"; }] + + Type: + collect :: (AttrSet -> Bool) -> AttrSet -> [x] */ - collect = pred: attrs: + collect = + # Given an attribute's value, determine if recursion should stop. + pred: + # The attribute set to recursively collect. + attrs: if pred attrs then [ attrs ] else if isAttrs attrs then @@ -312,8 +394,12 @@ rec { { a = 2; b = 10; } { a = 2; b = 20; } ] + Type: + cartesianProductOfSets :: AttrSet -> [AttrSet] */ - cartesianProductOfSets = attrsOfLists: + cartesianProductOfSets = + # Attribute set with attributes that are lists of values + attrsOfLists: foldl' (listOfAttrs: attrName: concatMap (attrs: map (listValue: attrs // { ${attrName} = listValue; }) attrsOfLists.${attrName} @@ -321,85 +407,108 @@ rec { ) [{}] (attrNames attrsOfLists); - /* Utility function that creates a {name, value} pair as expected by - builtins.listToAttrs. + /* Utility function that creates a `{name, value}` pair as expected by `builtins.listToAttrs`. Example: nameValuePair "some" 6 => { name = "some"; value = 6; } + + Type: + nameValuePair :: String -> Any -> { name :: String; value :: Any; } */ - nameValuePair = name: value: { inherit name value; }; + nameValuePair = + # Attribute name + name: + # Attribute value + value: + { inherit name value; }; - /* Apply a function to each element in an attribute set. The - function takes two arguments --- the attribute name and its value - --- and returns the new value for the attribute. The result is a - new attribute set. + /* Apply a function to each element in an attribute set, creating a new attribute set. Example: mapAttrs (name: value: name + "-" + value) { x = "foo"; y = "bar"; } => { x = "x-foo"; y = "y-bar"; } + + Type: + mapAttrs :: (String -> Any -> Any) -> AttrSet -> AttrSet */ mapAttrs = builtins.mapAttrs or (f: set: listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))); - /* Like `mapAttrs', but allows the name of each attribute to be + /* Like `mapAttrs`, but allows the name of each attribute to be changed in addition to the value. The applied function should - return both the new name and value as a `nameValuePair'. + return both the new name and value as a `nameValuePair`. Example: mapAttrs' (name: value: nameValuePair ("foo_" + name) ("bar-" + value)) { x = "a"; y = "b"; } => { foo_x = "bar-a"; foo_y = "bar-b"; } + + Type: + mapAttrs' :: (String -> Any -> { name :: String; value :: Any; }) -> AttrSet -> AttrSet */ - mapAttrs' = f: set: + mapAttrs' = + # A function, given an attribute's name and value, returns a new `nameValuePair`. + f: + # Attribute set to map over. + set: listToAttrs (map (attr: f attr set.${attr}) (attrNames set)); /* Call a function for each attribute in the given set and return the result in a list. - Type: - mapAttrsToList :: - (String -> a -> b) -> AttrSet -> [b] - Example: mapAttrsToList (name: value: name + value) { x = "a"; y = "b"; } => [ "xa" "yb" ] + + Type: + mapAttrsToList :: (String -> a -> b) -> AttrSet -> [b] + */ - mapAttrsToList = f: attrs: + mapAttrsToList = + # A function, given an attribute's name and value, returns a new value. + f: + # Attribute set to map over. + attrs: map (name: f name attrs.${name}) (attrNames attrs); - /* Like `mapAttrs', except that it recursively applies itself to - attribute sets. Also, the first argument of the argument - function is a *list* of the names of the containing attributes. + /* Like `mapAttrs`, except that it recursively applies itself to + the *leaf* attributes of a potentially-nested attribute set: + the second argument of the function will never be an attrset. + Also, the first argument of the argument function is a *list* + of the attribute names that form the path to the leaf attribute. - Type: - mapAttrsRecursive :: - ([String] -> a -> b) -> AttrSet -> AttrSet + For a function that gives you control over what counts as a leaf, + see `mapAttrsRecursiveCond`. Example: mapAttrsRecursive (path: value: concatStringsSep "-" (path ++ [value])) { n = { a = "A"; m = { b = "B"; c = "C"; }; }; d = "D"; } => { n = { a = "n-a-A"; m = { b = "n-m-b-B"; c = "n-m-c-C"; }; }; d = "d-D"; } - */ - mapAttrsRecursive = mapAttrsRecursiveCond (as: true); - - - /* Like `mapAttrsRecursive', but it takes an additional predicate - 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. Type: - mapAttrsRecursiveCond :: - (AttrSet -> Bool) -> ([String] -> a -> b) -> AttrSet -> AttrSet + mapAttrsRecursive :: ([String] -> a -> b) -> AttrSet -> AttrSet + */ + mapAttrsRecursive = + # A function, given a list of attribute names and a value, returns a new value. + f: + # Set to recursively map over. + set: + mapAttrsRecursiveCond (as: true) f set; + + + /* Like `mapAttrsRecursive`, but it takes an additional predicate + 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. Example: # To prevent recursing into derivations (which are attribute @@ -408,8 +517,17 @@ rec { (as: !(as ? "type" && as.type == "derivation")) (x: ... do something ...) attrs + + Type: + mapAttrsRecursiveCond :: (AttrSet -> Bool) -> ([String] -> a -> b) -> AttrSet -> AttrSet */ - mapAttrsRecursiveCond = cond: f: set: + mapAttrsRecursiveCond = + # A function, given the attribute set the recursion is currently at, determine if to recurse deeper into that attribute set. + cond: + # A function, given a list of attribute names and a value, returns a new value. + f: + # Attribute set to recursively map over. + set: let recurse = path: let @@ -428,13 +546,20 @@ rec { Example: genAttrs [ "foo" "bar" ] (name: "x_" + name) => { foo = "x_foo"; bar = "x_bar"; } + + Type: + genAttrs :: [ String ] -> (String -> Any) -> AttrSet */ - genAttrs = names: f: + genAttrs = + # Names of values in the resulting attribute set. + names: + # A function, given the name of the attribute, returns the attribute's value. + f: listToAttrs (map (n: nameValuePair n (f n)) names); /* Check whether the argument is a derivation. Any set with - { type = "derivation"; } counts as a derivation. + `{ type = "derivation"; }` counts as a derivation. Example: nixpkgs = import {} @@ -442,25 +567,36 @@ rec { => true isDerivation "foobar" => false - */ - isDerivation = x: x.type or null == "derivation"; - /* Converts a store path to a fake derivation. */ - toDerivation = path: - let - path' = builtins.storePath path; - res = - { type = "derivation"; - name = sanitizeDerivationName (builtins.substring 33 (-1) (baseNameOf path')); - outPath = path'; - outputs = [ "out" ]; - out = res; - outputName = "out"; - }; + Type: + isDerivation :: Any -> Bool + */ + isDerivation = + # Value to check. + value: value.type or null == "derivation"; + + /* Converts a store path to a fake derivation. + + Type: + toDerivation :: Path -> Derivation + */ + toDerivation = + # A store path to convert to a derivation. + path: + let + path' = builtins.storePath path; + res = + { type = "derivation"; + name = sanitizeDerivationName (builtins.substring 33 (-1) (baseNameOf path')); + outPath = path'; + outputs = [ "out" ]; + out = res; + outputName = "out"; + }; in res; - /* If `cond' is true, return the attribute set `as', + /* If `cond` is true, return the attribute set `as`, otherwise an empty attribute set. Example: @@ -468,47 +604,82 @@ rec { => { my = "set"; } optionalAttrs (false) { my = "set"; } => { } + + Type: + optionalAttrs :: Bool -> AttrSet -> AttrSet */ - optionalAttrs = cond: as: if cond then as else {}; + optionalAttrs = + # Condition under which the `as` attribute set is returned. + cond: + # The attribute set to return if `cond` is `true`. + as: + if cond then as else {}; - /* Merge sets of attributes and use the function f to merge attributes + /* Merge sets of attributes and use the function `f` to merge attributes values. Example: zipAttrsWithNames ["a"] (name: vs: vs) [{a = "x";} {a = "y"; b = "z";}] => { a = ["x" "y"]; } + + Type: + zipAttrsWithNames :: [ String ] -> (String -> [ Any ] -> Any) -> [ AttrSet ] -> AttrSet */ - zipAttrsWithNames = names: f: sets: + zipAttrsWithNames = + # List of attribute names to zip. + names: + # A function, accepts an attribute name, all the values, and returns a combined value. + f: + # List of values from the list of attribute sets. + sets: listToAttrs (map (name: { inherit name; value = f name (catAttrs name sets); }) names); - /* Implementation note: Common names appear multiple times in the list of + + /* Merge sets of attributes and use the function f to merge attribute values. + Like `lib.attrsets.zipAttrsWithNames` with all key names are passed for `names`. + + Implementation note: Common names appear multiple times in the list of names, hopefully this does not affect the system because the maximal - laziness avoid computing twice the same expression and listToAttrs does + laziness avoid computing twice the same expression and `listToAttrs` does not care about duplicated attribute names. Example: zipAttrsWith (name: values: values) [{a = "x";} {a = "y"; b = "z";}] - => { a = ["x" "y"]; b = ["z"] } + => { a = ["x" "y"]; b = ["z"]; } + + Type: + zipAttrsWith :: (String -> [ Any ] -> Any) -> [ AttrSet ] -> AttrSet */ zipAttrsWith = builtins.zipAttrsWith or (f: sets: zipAttrsWithNames (concatMap attrNames sets) f sets); - /* Like `zipAttrsWith' with `(name: values: values)' as the function. - Example: - zipAttrs [{a = "x";} {a = "y"; b = "z";}] - => { a = ["x" "y"]; b = ["z"] } + + /* Merge sets of attributes and combine each attribute value in to a list. + + Like `lib.attrsets.zipAttrsWith` with `(name: values: values)` as the function. + + Example: + zipAttrs [{a = "x";} {a = "y"; b = "z";}] + => { a = ["x" "y"]; b = ["z"]; } + + Type: + zipAttrs :: [ AttrSet ] -> AttrSet */ - zipAttrs = zipAttrsWith (name: values: values); + zipAttrs = + # List of attribute sets to zip together. + sets: + zipAttrsWith (name: values: values) sets; + /* Does the same as the update operator '//' except that attributes are merged until the given predicate is verified. The predicate should accept 3 arguments which are the path to reach the attribute, a part of the first attribute set and a part of the second attribute set. When - the predicate is verified, the value of the first attribute set is + the predicate is satisfied, the value of the first attribute set is replaced by the value of the second attribute set. Example: @@ -524,15 +695,23 @@ rec { baz = 4; } - returns: { + => { foo.bar = 1; # 'foo.*' from the second set foo.quz = 2; # bar = 3; # 'bar' from the first set baz = 4; # 'baz' from the second set } - */ - recursiveUpdateUntil = pred: lhs: rhs: + Type: + recursiveUpdateUntil :: ( [ String ] -> AttrSet -> AttrSet -> Bool ) -> AttrSet -> AttrSet -> AttrSet + */ + recursiveUpdateUntil = + # Predicate, taking the path to the current attribute as a list of strings for attribute names, and the two values at that path from the original arguments. + pred: + # Left attribute set of the merge. + lhs: + # Right attribute set of the merge. + rhs: let f = attrPath: zipAttrsWith (n: values: let here = attrPath ++ [n]; in @@ -544,6 +723,7 @@ rec { ); in f [] [rhs lhs]; + /* A recursive variant of the update operator ‘//’. The recursion stops when one of the attribute values is not an attribute set, in which case the right hand side value takes precedence over the @@ -562,16 +742,32 @@ rec { boot.loader.grub.device = ""; } - */ - recursiveUpdate = recursiveUpdateUntil (path: lhs: rhs: !(isAttrs lhs && isAttrs rhs)); + Type: + recursiveUpdate :: AttrSet -> AttrSet -> AttrSet + */ + recursiveUpdate = + # Left attribute set of the merge. + lhs: + # Right attribute set of the merge. + rhs: + recursiveUpdateUntil (path: lhs: rhs: !(isAttrs lhs && isAttrs rhs)) lhs rhs; + /* Returns true if the pattern is contained in the set. False otherwise. Example: matchAttrs { cpu = {}; } { cpu = { bits = 64; }; } => true - */ - matchAttrs = pattern: attrs: assert isAttrs pattern; + + Type: + matchAttrs :: AttrSet -> AttrSet -> Bool + */ + matchAttrs = + # Attribute set structure to match + pattern: + # Attribute set to find patterns in + attrs: + assert isAttrs pattern; all id (attrValues (zipAttrsWithNames (attrNames pattern) (n: values: let pat = head values; val = elemAt values 1; in if length values == 1 then false @@ -579,6 +775,7 @@ rec { else pat == val ) [pattern attrs])); + /* Override only the attributes that are already present in the old set useful for deep-overriding. @@ -589,62 +786,155 @@ rec { => { b = 2; } overrideExisting { a = 3; b = 2; } { a = 1; } => { a = 1; b = 2; } + + Type: + overrideExisting :: AttrSet -> AttrSet -> AttrSet */ - overrideExisting = old: new: + overrideExisting = + # Original attribute set + old: + # Attribute set with attributes to override in `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. + Create a new attribute set with `value` set at the nested attribute location specified in `attrPath`. Example: showAttrPath [ "foo" "10" "bar" ] => "foo.\"10\".bar" showAttrPath [] => "" + + Type: + showAttrPath :: [String] -> String */ - showAttrPath = path: + showAttrPath = + # Attribute path to render to a string + 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. Example: getOutput "dev" pkgs.openssl => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev" + + Type: + getOutput :: String -> Derivation -> String */ getOutput = output: pkg: if ! pkg ? outputSpecified || ! pkg.outputSpecified then pkg.${output} or pkg.out or pkg else pkg; + /* Get a package's `bin` output. + If the output does not exist, fallback to `.out` and then to the default. + + Example: + getBin pkgs.openssl + => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r" + + Type: + getBin :: Derivation -> String + */ getBin = getOutput "bin"; + + + /* Get a package's `lib` output. + If the output does not exist, fallback to `.out` and then to the default. + + Example: + getLib pkgs.openssl + => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-lib" + + Type: + getLib :: Derivation -> String + */ getLib = getOutput "lib"; + + + /* Get a package's `dev` output. + If the output does not exist, fallback to `.out` and then to the default. + + Example: + getDev pkgs.openssl + => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev" + + Type: + getDev :: Derivation -> String + */ getDev = getOutput "dev"; + + + /* Get a package's `man` output. + If the output does not exist, fallback to `.out` and then to the default. + + Example: + getMan pkgs.openssl + => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-man" + + Type: + getMan :: Derivation -> String + */ getMan = getOutput "man"; - /* Pick the outputs of packages to place in buildInputs */ - chooseDevOutputs = builtins.map getDev; + /* Pick the outputs of packages to place in `buildInputs` + + Type: chooseDevOutputs :: [Derivation] -> [String] + + */ + chooseDevOutputs = + # List of packages to pick `dev` outputs from + drvs: + builtins.map getDev drvs; /* Make various Nix tools consider the contents of the resulting attribute set when looking for what to build, find, etc. This function only affects a single attribute set; it does not apply itself recursively for nested attribute sets. + + Example: + { pkgs ? import {} }: + { + myTools = pkgs.lib.recurseIntoAttrs { + inherit (pkgs) hello figlet; + }; + } + + Type: + recurseIntoAttrs :: AttrSet -> AttrSet + */ recurseIntoAttrs = - attrs: attrs // { recurseForDerivations = true; }; + # An attribute set to scan for derivations. + attrs: + attrs // { recurseForDerivations = true; }; /* Undo the effect of recurseIntoAttrs. + + Type: + dontRecurseIntoAttrs :: AttrSet -> AttrSet */ dontRecurseIntoAttrs = - attrs: attrs // { recurseForDerivations = false; }; + # An attribute set to not scan for derivations. + attrs: + attrs // { recurseForDerivations = false; }; /* `unionOfDisjoint x y` is equal to `x // y // z` where the attrnames in `z` are the intersection of the attrnames in `x` and `y`, and all values `assert` with an error message. This - operator is commutative, unlike (//). */ + operator is commutative, unlike (//). + + Type: unionOfDisjoint :: AttrSet -> AttrSet -> AttrSet + */ unionOfDisjoint = x: y: let intersection = builtins.intersectAttrs x y; @@ -655,9 +945,10 @@ rec { in (x // y) // mask; - /*** deprecated stuff ***/ - + # DEPRECATED zipWithNames = zipAttrsWithNames; + + # DEPRECATED zip = builtins.trace "lib.zip is deprecated, use lib.zipAttrsWith instead" zipAttrsWith; } diff --git a/lib/customisation.nix b/lib/customisation.nix index bd7ee3c83b8c..42d711cf5fb9 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -3,13 +3,13 @@ rec { - /* `overrideDerivation drv f' takes a derivation (i.e., the result - of a call to the builtin function `derivation') and returns a new + /* `overrideDerivation drv f` takes a derivation (i.e., the result + of a call to the builtin function `derivation`) and returns a new derivation in which the attributes of the original are overridden - according to the function `f'. The function `f' is called with + according to the function `f`. The function `f` is called with the original derivation attributes. - `overrideDerivation' allows certain "ad-hoc" customisation + `overrideDerivation` allows certain "ad-hoc" customisation scenarios (e.g. in ~/.config/nixpkgs/config.nix). For instance, if you want to "patch" the derivation returned by a package function in Nixpkgs to build another version than what the @@ -27,11 +27,19 @@ rec { For another application, see build-support/vm, where this function is used to build arbitrary derivations inside a QEMU virtual machine. + + Note that in order to preserve evaluation errors, the new derivation's + outPath depends on the old one's, which means that this function cannot + be used in circular situations when the old derivation also depends on the + new one. + + You should in general prefer `drv.overrideAttrs` over this function; + see the nixpkgs manual for more information on overriding. */ overrideDerivation = drv: f: let newDrv = derivation (drv.drvAttrs // (f drv)); - in lib.flip (extendDerivation true) newDrv ( + in lib.flip (extendDerivation (builtins.seq drv.drvPath true)) newDrv ( { meta = drv.meta or {}; passthru = if drv ? passthru then drv.passthru else {}; } @@ -96,10 +104,10 @@ rec { else result; - /* Call the package function in the file `fn' with the required + /* Call the package function in the file `fn` with the required arguments automatically. The function is called with the - arguments `args', but any missing arguments are obtained from - `autoArgs'. This function is intended to be partially + arguments `args`, but any missing arguments are obtained from + `autoArgs`. This function is intended to be partially parameterised, e.g., callPackage = callPackageWith pkgs; @@ -108,9 +116,9 @@ rec { libbar = callPackage ./bar.nix { }; }; - If the `libbar' function expects an argument named `libfoo', it is + If the `libbar` function expects an argument named `libfoo`, it is automatically passed as an argument. Overrides or missing - arguments can be supplied in `args', e.g. + arguments can be supplied in `args`, e.g. libbar = callPackage ./bar.nix { libfoo = null; @@ -244,16 +252,17 @@ rec { outputsList = map makeOutput outputs; drv' = (lib.head outputsList).value; - in lib.deepSeq drv' drv'; + in if drv == null then null else + lib.deepSeq drv' drv'; /* Make a set of packages with a common scope. All packages called - with the provided `callPackage' will be evaluated with the same + with the provided `callPackage` will be evaluated with the same arguments. Any package in the set may depend on any other. The `overrideScope'` function allows subsequent modification of the package set in a consistent way, i.e. all packages in the set will be called with the overridden packages. The package sets may be hierarchical: the packages in the set are called with the scope - provided by `newScope' and the set provides a `newScope' attribute + provided by `newScope` and the set provides a `newScope` attribute which can form the parent scope for later package sets. */ makeScope = newScope: f: let self = f self // { diff --git a/lib/default.nix b/lib/default.nix index cc4bedc5869b..b1441c728104 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,7 +1,7 @@ /* Library of low-level helper functions for nix expressions. * * Please implement (mostly) exhaustive unit tests - * for new functions in `./tests.nix'. + * for new functions in `./tests.nix`. */ let @@ -27,7 +27,6 @@ let maintainers = import ../maintainers/maintainer-list.nix; teams = callLibs ../maintainers/team-list.nix; meta = callLibs ./meta.nix; - sources = callLibs ./sources.nix; versions = callLibs ./versions.nix; # module system @@ -53,7 +52,9 @@ let fetchers = callLibs ./fetchers.nix; # Eval-time filesystem handling + path = callLibs ./path; filesystem = callLibs ./filesystem.nix; + sources = callLibs ./sources.nix; # back-compat aliases platforms = self.systems.doubles; @@ -63,7 +64,7 @@ let inherit (builtins) add addErrorContext attrNames concatLists deepSeq elem elemAt filter genericClosure genList getAttr - hasAttr head isAttrs isBool isInt isList isString length + hasAttr head isAttrs isBool isInt isList isPath isString length lessThan listToAttrs pathExists readFile replaceStrings seq stringLength sub substring tail trace; inherit (self.trivial) id const pipe concat or and bitAnd bitOr bitXor @@ -93,16 +94,19 @@ let subtractLists mutuallyExclusive groupBy groupBy'; inherit (self.strings) concatStrings concatMapStrings concatImapStrings intersperse concatStringsSep concatMapStringsSep - concatImapStringsSep makeSearchPath makeSearchPathOutput + concatImapStringsSep concatLines makeSearchPath makeSearchPathOutput makeLibraryPath makeBinPath optionalString hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape - escapeShellArg escapeShellArgs isValidPosixName toShellVar toShellVars + escapeShellArg escapeShellArgs + isStorePath isStringLike + isValidPosixName toShellVar toShellVars escapeRegex escapeXML replaceChars lowerChars upperChars toLower toUpper addContextFrom splitString removePrefix removeSuffix versionOlder versionAtLeast getName getVersion + mesonOption mesonBool mesonEnable nameFromURL enableFeature enableFeatureAs withFeature - withFeatureAs fixedWidthString fixedWidthNumber isStorePath + withFeatureAs fixedWidthString fixedWidthNumber toInt toIntBase10 readPathsFromFile fileContents; inherit (self.stringsWithDeps) textClosureList textClosureMap noDepEntry fullDepEntry packEntry stringAfter; @@ -127,14 +131,15 @@ let mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule mkRenamedOptionModule mkRenamedOptionModuleWith mkMergedOptionModule mkChangedOptionModule - mkAliasOptionModule mkDerivedConfig doRename; + mkAliasOptionModule mkDerivedConfig doRename + mkAliasOptionModuleMD; inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions mergeDefaultOption mergeOneOption mergeEqualOption mergeUniqueOption getValues getFiles optionAttrSetToDocList optionAttrSetToDocList' scrubOptionValue literalExpression literalExample literalDocBook showOption showOptionWithDefLocs showFiles - unknownModule mkOption mkPackageOption + unknownModule mkOption mkPackageOption mkPackageOptionMD mdDoc literalMD; inherit (self.types) isType setType defaultTypeMerge defaultFunctor isOptionType mkOptionType; diff --git a/lib/derivations.nix b/lib/derivations.nix index 9a88087f2e34..dce98b46ddb9 100644 --- a/lib/derivations.nix +++ b/lib/derivations.nix @@ -17,7 +17,7 @@ in situations below. For illustration and/or testing, we define derivation such that its - evaluation is very noticable. + evaluation is very noticeable. let derivation = throw "This won't be evaluated."; diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index bf1567a22a66..926428293c1c 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -107,7 +107,7 @@ rec { # Same as `makeExtensible` but the name of the extending attribute is # customized. makeExtensibleWithCustomName = extenderName: rattrs: - fix' rattrs // { + fix' (self: (rattrs self) // { ${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs); - }; + }); } diff --git a/lib/generators.nix b/lib/generators.nix index b77cca75010f..968331a0ebde 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -278,15 +278,20 @@ rec { mapAny 0; /* Pretty print a value, akin to `builtins.trace`. - * Should probably be a builtin as well. - */ + * Should probably be a builtin as well. + * The pretty-printed string should be suitable for rendering default values + * in the NixOS manual. In particular, it should be as close to a valid Nix expression + * as possible. + */ toPretty = { /* If this option is true, attrsets like { __pretty = fn; val = …; } will use fn to convert val to a pretty printed representation. (This means fn is type Val -> String.) */ allowPrettyValues ? false, /* If this option is true, the output is indented with newlines for attribute sets and lists */ - multiline ? true + multiline ? true, + /* Initial indentation level */ + indent ? "" }: let go = indent: v: with builtins; @@ -294,20 +299,25 @@ rec { introSpace = if multiline then "\n${indent} " else " "; outroSpace = if multiline then "\n${indent}" else " "; in if isInt v then toString v - else if isFloat v then "~${toString v}" + # toString loses precision on floats, so we use toJSON instead. This isn't perfect + # as the resulting string may not parse back as a float (e.g. 42, 1e-06), but for + # pretty-printing purposes this is acceptable. + else if isFloat v then builtins.toJSON v else if isString v then let - # Separate a string into its lines - newlineSplits = filter (v: ! isList v) (builtins.split "\n" v); - # For a '' string terminated by a \n, which happens when the closing '' is on a new line - multilineResult = "''" + introSpace + concatStringsSep introSpace (lib.init newlineSplits) + outroSpace + "''"; - # For a '' string not terminated by a \n, which happens when the closing '' is not on a new line - multilineResult' = "''" + introSpace + concatStringsSep introSpace newlineSplits + "''"; - # For single lines, replace all newlines with their escaped representation - singlelineResult = "\"" + libStr.escape [ "\"" ] (concatStringsSep "\\n" newlineSplits) + "\""; - in if multiline && length newlineSplits > 1 then - if lib.last newlineSplits == "" then multilineResult else multilineResult' - else singlelineResult + lines = filter (v: ! isList v) (builtins.split "\n" v); + escapeSingleline = libStr.escape [ "\\" "\"" "\${" ]; + escapeMultiline = libStr.replaceStrings [ "\${" "''" ] [ "''\${" "'''" ]; + singlelineResult = "\"" + concatStringsSep "\\n" (map escapeSingleline lines) + "\""; + multilineResult = let + escapedLines = map escapeMultiline lines; + # The last line gets a special treatment: if it's empty, '' is on its own line at the "outer" + # indentation level. Otherwise, '' is appended to the last line. + lastLine = lib.last escapedLines; + in "''" + introSpace + concatStringsSep introSpace (lib.init escapedLines) + + (if lastLine == "" then outroSpace else introSpace + lastLine) + "''"; + in + if multiline && length lines > 1 then multilineResult else singlelineResult else if true == v then "true" else if false == v then "false" else if null == v then "null" @@ -326,18 +336,21 @@ rec { else "" else if isAttrs v then # apply pretty values if allowed - if attrNames v == [ "__pretty" "val" ] && allowPrettyValues + if allowPrettyValues && v ? __pretty && v ? val then v.__pretty v.val else if v == {} then "{ }" else if v ? type && v.type == "derivation" then - "" + "" else "{" + introSpace + libStr.concatStringsSep introSpace (libAttr.mapAttrsToList (name: value: - "${libStr.escapeNixIdentifier name} = ${go (indent + " ") value};") v) + "${libStr.escapeNixIdentifier name} = ${ + builtins.addErrorContext "while evaluating an attribute `${name}`" + (go (indent + " ") value) + };") v) + outroSpace + "}" else abort "generators.toPretty: should never happen (v = ${v})"; - in go ""; + in go indent; # PLIST handling toPlist = {}: v: let diff --git a/lib/licenses.nix b/lib/licenses.nix index 612cfba6c730..f22d1401410b 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -558,6 +558,12 @@ in mkLicense lset) ({ redistributable = false; }; + fair = { + fullName = "Fair License"; + spdxId = "Fair"; + free = true; + }; + issl = { fullName = "Intel Simplified Software License"; url = "https://software.intel.com/en-us/license/intel-simplified-software-license"; @@ -709,7 +715,12 @@ in mkLicense lset) ({ ncsa = { spdxId = "NCSA"; - fullName = "University of Illinois/NCSA Open Source License"; + fullName = "University of Illinois/NCSA Open Source License"; + }; + + nlpl = { + spdxId = "NLPL"; + fullName = "No Limit Public License"; }; nposl3 = { @@ -842,6 +853,12 @@ in mkLicense lset) ({ fullName = "SGI Free Software License B v2.0"; }; + # Gentoo seems to treat it as a license: + # https://gitweb.gentoo.org/repo/gentoo.git/tree/licenses/SGMLUG?id=7d999af4a47bf55e53e54713d98d145f935935c1 + sgmlug = { + fullName = "SGML UG SGML Parser Materials license"; + }; + sleepycat = { spdxId = "Sleepycat"; fullName = "Sleepycat License"; @@ -969,6 +986,11 @@ in mkLicense lset) ({ fullName = "wxWindows Library Licence, Version 3.1"; }; + x11 = { + spdxId = "X11"; + fullName = "X11 License"; + }; + xfig = { fullName = "xfig"; url = "http://mcj.sourceforge.net/authors.html#xfig"; # https is broken diff --git a/lib/lists.nix b/lib/lists.nix index 602b13cf69cf..9f69485b4086 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -242,7 +242,7 @@ rec { /* Return a singleton list or an empty list, depending on a boolean value. Useful when building lists with optional elements - (e.g. `++ optional (system == "i686-linux") firefox'). + (e.g. `++ optional (system == "i686-linux") firefox`). Type: optional :: bool -> a -> [a] @@ -283,7 +283,7 @@ rec { */ toList = x: if isList x then x else [x]; - /* Return a list of integers from `first' up to and including `last'. + /* Return a list of integers from `first` up to and including `last`. Type: range :: int -> int -> [int] @@ -306,7 +306,7 @@ rec { /* Splits the elements of a list in two lists, `right` and `wrong`, depending on the evaluation of a predicate. - Type: (a -> bool) -> [a] -> { right :: [a], wrong :: [a] } + Type: (a -> bool) -> [a] -> { right :: [a]; wrong :: [a]; } Example: partition (x: x > 2) [ 5 1 2 3 4 ] @@ -320,7 +320,7 @@ rec { ) { right = []; wrong = []; }); /* Splits the elements of a list into many lists, using the return value of a predicate. - Predicate should return a string which becomes keys of attrset `groupBy' returns. + Predicate should return a string which becomes keys of attrset `groupBy` returns. `groupBy'` allows to customise the combining function and initial value @@ -374,7 +374,7 @@ rec { /* Merges two lists of the same size together. If the sizes aren't the same the merging stops at the shortest. - Type: zipLists :: [a] -> [b] -> [{ fst :: a, snd :: b}] + Type: zipLists :: [a] -> [b] -> [{ fst :: a; snd :: b; }] Example: zipLists [ 1 2 ] [ "a" "b" ] diff --git a/lib/meta.nix b/lib/meta.nix index 74b94211552b..5fd55c4e90d6 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -27,7 +27,7 @@ rec { setName = name: drv: drv // {inherit name;}; - /* Like `setName', but takes the previous name as an argument. + /* Like `setName`, but takes the previous name as an argument. Example: updateName (oldName: oldName + "-experimental") somePkg @@ -76,7 +76,9 @@ rec { 1. (legacy) a system string. - 2. (modern) a pattern for the platform `parsed` field. + 2. (modern) a pattern for the entire platform structure (see `lib.systems.inspect.platformPatterns`). + + 3. (modern) a pattern for the platform `parsed` field (see `lib.systems.inspect.patterns`). We can inject these into a pattern for the whole of a structured platform, and then match that. @@ -85,6 +87,8 @@ rec { pattern = if builtins.isString elem then { system = elem; } + else if elem?parsed + then elem else { parsed = elem; }; in lib.matchAttrs pattern platform; @@ -92,12 +96,13 @@ rec { A package is available on a platform if both - 1. One of `meta.platforms` pattern matches the given platform. + 1. One of `meta.platforms` pattern matches the given + platform, or `meta.platforms` is not present. 2. None of `meta.badPlatforms` pattern matches the given platform. */ availableOn = platform: pkg: - lib.any (platformMatch platform) pkg.meta.platforms && + ((!pkg?meta.platforms) || lib.any (platformMatch platform) pkg.meta.platforms) && lib.all (elem: !platformMatch platform elem) (pkg.meta.badPlatforms or []); /* Get the corresponding attribute in lib.licenses diff --git a/lib/modules.nix b/lib/modules.nix index 204a2cc1ac12..5e6bee6aabe3 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -157,6 +157,11 @@ rec { ${if prefix == [] then null # unset => visible else "internal"} = true; + # TODO: hidden during the markdown transition to not expose downstream + # users of the docs infra to markdown if they're not ready for it. + # we don't make this visible conditionally because it can impact + # performance (https://github.com/NixOS/nixpkgs/pull/208407#issuecomment-1368246192) + visible = false; # TODO: Change the type of this option to a submodule with a # freeformType, so that individual arguments can be documented # separately @@ -284,7 +289,18 @@ rec { if config._module.check && config._module.freeformType == null && merged.unmatchedDefns != [] then let firstDef = head merged.unmatchedDefns; - baseMsg = "The option `${showOption (prefix ++ firstDef.prefix)}' does not exist. Definition values:${showDefs [ firstDef ]}"; + baseMsg = + let + optText = showOption (prefix ++ firstDef.prefix); + defText = + builtins.addErrorContext + "while evaluating the error message for definitions for `${optText}', which is an option that does not exist" + (builtins.addErrorContext + "while evaluating a definition from `${firstDef.file}'" + ( showDefs [ firstDef ]) + ); + in + "The option `${optText}' does not exist. Definition values:${defText}"; in if attrNames options == [ "_module" ] then @@ -468,7 +484,7 @@ rec { ) (lib.functionArgs f); # Note: we append in the opposite order such that we can add an error - # context on the explicited arguments of "args" too. This update + # context on the explicit arguments of "args" too. This update # operator is used to make the "args@{ ... }: with args.lib;" notation # works. in f (args // extraArgs) @@ -833,7 +849,7 @@ rec { filterOverrides' = defs: let - getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultPriority; + getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultOverridePriority; highestPrio = foldl' (prio: def: min (getPrio def) prio) 9999 defs; strip = def: if def.value._type or "" == "override" then def // { value = def.value.content; } else def; in { @@ -842,7 +858,7 @@ rec { }; /* Sort a list of properties. The sort priority of a property is - 1000 by default, but can be overridden by wrapping the property + defaultOrderPriority by default, but can be overridden by wrapping the property using mkOrder. */ sortProperties = defs: let @@ -851,7 +867,7 @@ rec { then def // { value = def.value.content; inherit (def.value) priority; } else def; defs' = map strip defs; - compare = a: b: (a.priority or 1000) < (b.priority or 1000); + compare = a: b: (a.priority or defaultOrderPriority) < (b.priority or defaultOrderPriority); in sort compare defs'; # This calls substSubModules, whose entire purpose is only to ensure that @@ -887,10 +903,13 @@ rec { mkOptionDefault = mkOverride 1500; # priority of option defaults mkDefault = mkOverride 1000; # used in config sections of non-user modules to set a default + defaultOverridePriority = 100; mkImageMediaOverride = mkOverride 60; # image media profiles can be derived by inclusion into host config, hence needing to override host config, but do allow user to mkForce mkForce = mkOverride 50; mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’ + defaultPriority = lib.warnIf (lib.isInOldestRelease 2305) "lib.modules.defaultPriority is deprecated, please use lib.modules.defaultOverridePriority instead." defaultOverridePriority; + mkFixStrictness = lib.warn "lib.mkFixStrictness has no effect and will be removed. It returns its argument unmodified, so you can just remove any calls." id; mkOrder = priority: content: @@ -899,11 +918,9 @@ rec { }; mkBefore = mkOrder 500; + defaultOrderPriority = 1000; mkAfter = mkOrder 1500; - # The default priority for things that don't have a priority specified. - defaultPriority = 100; - # Convenient property used to transfer all definitions and their # properties from one option to another. This property is useful for # renaming options, and also for including properties from another module @@ -930,10 +947,10 @@ rec { # Similar to mkAliasAndWrapDefinitions but copies over the priority from the # option as well. # - # If a priority is not set, it assumes a priority of defaultPriority. + # If a priority is not set, it assumes a priority of defaultOverridePriority. mkAliasAndWrapDefsWithPriority = wrap: option: let - prio = option.highestPrio or defaultPriority; + prio = option.highestPrio or defaultOverridePriority; defsWithPrio = map (mkOverride prio) option.definitions; in mkAliasIfDef option (wrap (mkMerge defsWithPrio)); @@ -1098,6 +1115,15 @@ rec { use = id; }; + /* Transitional version of mkAliasOptionModule that uses MD docs. */ + mkAliasOptionModuleMD = from: to: doRename { + inherit from to; + visible = true; + warn = false; + use = id; + markdown = true; + }; + /* mkDerivedConfig : Option a -> (a -> Definition b) -> Definition b Create config definitions with the same priority as the definition of another option. @@ -1115,10 +1141,10 @@ rec { # to definitions. mkDerivedConfig = opt: f: mkOverride - (opt.highestPrio or defaultPriority) + (opt.highestPrio or defaultOverridePriority) (f opt.value); - doRename = { from, to, visible, warn, use, withPriority ? true }: + doRename = { from, to, visible, warn, use, withPriority ? true, markdown ? false }: { config, options, ... }: let fromOpt = getAttrFromPath from options; @@ -1129,7 +1155,9 @@ rec { { options = setAttrByPath from (mkOption { inherit visible; - description = lib.mdDoc "Alias of {option}`${showOption to}`."; + description = if markdown + then lib.mdDoc "Alias of {option}`${showOption to}`." + else "Alias of ."; apply = x: use (toOf config); } // optionalAttrs (toType != null) { type = toType; diff --git a/lib/options.nix b/lib/options.nix index c80256c0e653..d14d209a8347 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -104,8 +104,6 @@ rec { /* Creates an Option attribute set for an option that specifies the package a module should use for some purpose. - Type: mkPackageOption :: pkgs -> string -> { default :: [string], example :: null | string | [string] } -> option - The package is specified as a list of strings representing its attribute path in nixpkgs. Because of this, you need to pass nixpkgs itself as the first argument. @@ -116,6 +114,8 @@ rec { You can omit the default path if the name of the option is also attribute path in nixpkgs. + Type: mkPackageOption :: pkgs -> string -> { default :: [string]; example :: null | string | [string]; } -> option + Example: mkPackageOption pkgs "hello" { } => { _type = "option"; default = «derivation /nix/store/3r2vg51hlxj3cx5vscp0vkv60bqxkaq0-hello-2.10.drv»; defaultText = { ... }; description = "The hello package to use."; type = { ... }; } @@ -136,7 +136,7 @@ rec { let default' = if !isList default then [ default ] else default; in mkOption { type = lib.types.package; - description = lib.mdDoc "The ${name} package to use."; + description = "The ${name} package to use."; default = attrByPath default' (throw "${concatStringsSep "." default'} cannot be found in pkgs") pkgs; defaultText = literalExpression ("pkgs." + concatStringsSep "." default'); @@ -144,6 +144,11 @@ rec { (if isList example then "pkgs." + concatStringsSep "." example else example); }; + /* Like mkPackageOption, but emit an mdDoc description instead of DocBook. */ + mkPackageOptionMD = args: name: extra: + let option = mkPackageOption args name extra; + in option // { description = lib.mdDoc option.description; }; + /* This option accepts anything, but it does not produce any result. This is useful for sharing a module across different module sets @@ -196,7 +201,7 @@ rec { /* Extracts values of all "value" keys of the given list. - Type: getValues :: [ { value :: a } ] -> [a] + Type: getValues :: [ { value :: a; } ] -> [a] Example: getValues [ { value = 1; } { value = 2; } ] // => [ 1 2 ] @@ -206,7 +211,7 @@ rec { /* Extracts values of all "file" keys of the given list - Type: getFiles :: [ { file :: a } ] -> [a] + Type: getFiles :: [ { file :: a; } ] -> [a] Example: getFiles [ { file = "file1"; } { file = "file2"; } ] // => [ "file1" "file2" ] @@ -218,12 +223,13 @@ rec { # the set generated with filterOptionSets. optionAttrSetToDocList = optionAttrSetToDocList' []; - optionAttrSetToDocList' = prefix: options: + optionAttrSetToDocList' = _: options: concatMap (opt: let + name = showOption opt.loc; docOption = rec { loc = opt.loc; - name = showOption opt.loc; + inherit name; description = opt.description or null; declarations = filter (x: x != unknownModule) opt.declarations; internal = opt.internal or false; @@ -234,9 +240,18 @@ rec { readOnly = opt.readOnly or false; type = opt.type.description or "unspecified"; } - // optionalAttrs (opt ? example) { example = scrubOptionValue opt.example; } - // optionalAttrs (opt ? default) { default = scrubOptionValue opt.default; } - // optionalAttrs (opt ? defaultText) { default = opt.defaultText; } + // optionalAttrs (opt ? example) { + example = + builtins.addErrorContext "while evaluating the example of option `${name}`" ( + renderOptionValue opt.example + ); + } + // optionalAttrs (opt ? default) { + default = + builtins.addErrorContext "while evaluating the default value of option `${name}`" ( + renderOptionValue (opt.defaultText or opt.default) + ); + } // optionalAttrs (opt ? relatedPackages && opt.relatedPackages != null) { inherit (opt) relatedPackages; }; subOptions = @@ -256,6 +271,9 @@ rec { efficient: the XML representation of derivations is very large (on the order of megabytes) and is not actually used by the manual generator. + + This function was made obsolete by renderOptionValue and is kept for + compatibility with out-of-tree code. */ scrubOptionValue = x: if isDerivation x then @@ -265,6 +283,17 @@ rec { else x; + /* Ensures that the given option value (default or example) is a `_type`d string + by rendering Nix values to `literalExpression`s. + */ + renderOptionValue = v: + if v ? _type && v ? text then v + else literalExpression (lib.generators.toPretty { + multiline = true; + allowPrettyValues = true; + } v); + + /* For use in the `defaultText` and `example` option attributes. Causes the given string to be rendered verbatim in the documentation as Nix code. This is necessary for complex values, e.g. functions, or values that depend on diff --git a/lib/path/README.md b/lib/path/README.md new file mode 100644 index 000000000000..87e552d120d7 --- /dev/null +++ b/lib/path/README.md @@ -0,0 +1,196 @@ +# Path library + +This document explains why the `lib.path` library is designed the way it is. + +The purpose of this library is to process [filesystem paths]. It does not read files from the filesystem. +It exists to support the native Nix [path value type] with extra functionality. + +[filesystem paths]: https://en.m.wikipedia.org/wiki/Path_(computing) +[path value type]: https://nixos.org/manual/nix/stable/language/values.html#type-path + +As an extension of the path value type, it inherits the same intended use cases and limitations: +- Only use paths to access files at evaluation time, such as the local project source. +- Paths cannot point to derivations, so they are unfit to represent dependencies. +- A path implicitly imports the referenced files into the Nix store when interpolated to a string. Therefore paths are not suitable to access files at build- or run-time, as you risk importing the path from the evaluation system instead. + +Overall, this library works with two types of paths: +- Absolute paths are represented with the Nix [path value type]. Nix automatically normalises these paths. +- Subpaths are represented with the [string value type] since path value types don't support relative paths. This library normalises these paths as safely as possible. Absolute paths in strings are not supported. + + A subpath refers to a specific file or directory within an absolute base directory. + It is a stricter form of a relative path, notably [without support for `..` components][parents] since those could escape the base directory. + +[string value type]: https://nixos.org/manual/nix/stable/language/values.html#type-string + +This library is designed to be as safe and intuitive as possible, throwing errors when operations are attempted that would produce surprising results, and giving the expected result otherwise. + +This library is designed to work well as a dependency for the `lib.filesystem` and `lib.sources` library components. Contrary to these library components, `lib.path` does not read any paths from the filesystem. + +This library makes only these assumptions about paths and no others: +- `dirOf path` returns the path to the parent directory of `path`, unless `path` is the filesystem root, in which case `path` is returned. + - There can be multiple filesystem roots: `p == dirOf p` and `q == dirOf q` does not imply `p == q`. + - While there's only a single filesystem root in stable Nix, the [lazy trees feature](https://github.com/NixOS/nix/pull/6530) introduces [additional filesystem roots](https://github.com/NixOS/nix/pull/6530#discussion_r1041442173). +- `path + ("/" + string)` returns the path to the `string` subdirectory in `path`. + - If `string` contains no `/` characters, then `dirOf (path + ("/" + string)) == path`. + - If `string` contains no `/` characters, then `baseNameOf (path + ("/" + string)) == string`. +- `path1 == path2` returns `true` only if `path1` points to the same filesystem path as `path2`. + +Notably we do not make the assumption that we can turn paths into strings using `toString path`. + +## Design decisions + +Each subsection here contains a decision along with arguments and counter-arguments for (+) and against (-) that decision. + +### Leading dots for relative paths +[leading-dots]: #leading-dots-for-relative-paths + +Observing: Since subpaths are a form of relative paths, they can have a leading `./` to indicate it being a relative path, this is generally not necessary for tools though. + +Considering: Paths should be as explicit, consistent and unambiguous as possible. + +Decision: Returned subpaths should always have a leading `./`. + +
+Arguments + +- (+) In shells, just running `foo` as a command wouldn't execute the file `foo`, whereas `./foo` would execute the file. In contrast, `foo/bar` does execute that file without the need for `./`. This can lead to confusion about when a `./` needs to be prefixed. If a `./` is always included, this becomes a non-issue. This effectively then means that paths don't overlap with command names. +- (+) Prepending with `./` makes the subpaths always valid as relative Nix path expressions. +- (+) Using paths in command line arguments could give problems if not escaped properly, e.g. if a path was `--version`. This is not a problem with `./--version`. This effectively then means that paths don't overlap with GNU-style command line options. +- (-) `./` is not required to resolve relative paths, resolution always has an implicit `./` as prefix. +- (-) It's less noisy without the `./`, e.g. in error messages. + - (+) But similarly, it could be confusing whether something was even a path. + e.g. `foo` could be anything, but `./foo` is more clearly a path. +- (+) Makes it more uniform with absolute paths (those always start with `/`). + - (-) That is not relevant for practical purposes. +- (+) `find` also outputs results with `./`. + - (-) But only if you give it an argument of `.`. If you give it the argument `some-directory`, it won't prefix that. +- (-) `realpath --relative-to` doesn't prefix relative paths with `./`. + - (+) There is no need to return the same result as `realpath`. + +
+ +### Representation of the current directory +[curdir]: #representation-of-the-current-directory + +Observing: The subpath that produces the base directory can be represented with `.` or `./` or `./.`. + +Considering: Paths should be as consistent and unambiguous as possible. + +Decision: It should be `./.`. + +
+Arguments + +- (+) `./` would be inconsistent with [the decision to not persist trailing slashes][trailing-slashes]. +- (-) `.` is how `realpath` normalises paths. +- (+) `.` can be interpreted as a shell command (it's a builtin for sourcing files in `bash` and `zsh`). +- (+) `.` would be the only path without a `/`. It could not be used as a Nix path expression, since those require at least one `/` to be parsed as such. +- (-) `./.` is rather long. + - (-) We don't require users to type this though, as it's only output by the library. + As inputs all three variants are supported for subpaths (and we can't do anything about absolute paths) +- (-) `builtins.dirOf "foo" == "."`, so `.` would be consistent with that. +- (+) `./.` is consistent with the [decision to have leading `./`][leading-dots]. +- (+) `./.` is a valid Nix path expression, although this property does not hold for every relative path or subpath. + +
+ +### Subpath representation +[relrepr]: #subpath-representation + +Observing: Subpaths such as `foo/bar` can be represented in various ways: +- string: `"foo/bar"` +- list with all the components: `[ "foo" "bar" ]` +- attribute set: `{ type = "relative-path"; components = [ "foo" "bar" ]; }` + +Considering: Paths should be as safe to use as possible. We should generate string outputs in the library and not encourage users to do that themselves. + +Decision: Paths are represented as strings. + +
+Arguments + +- (+) It's simpler for the users of the library. One doesn't have to convert a path a string before it can be used. + - (+) Naively converting the list representation to a string with `concatStringsSep "/"` would break for `[]`, requiring library users to be more careful. +- (+) It doesn't encourage people to do their own path processing and instead use the library. + With a list representation it would seem easy to just use `lib.lists.init` to get the parent directory, but then it breaks for `.`, which would be represented as `[ ]`. +- (+) `+` is convenient and doesn't work on lists and attribute sets. + - (-) Shouldn't use `+` anyways, we export safer functions for path manipulation. + +
+ +### Parent directory +[parents]: #parent-directory + +Observing: Relative paths can have `..` components, which refer to the parent directory. + +Considering: Paths should be as safe and unambiguous as possible. + +Decision: `..` path components in string paths are not supported, neither as inputs nor as outputs. Hence, string paths are called subpaths, rather than relative paths. + +
+Arguments + +- (+) If we wanted relative paths to behave according to the "physical" interpretation (as a directory tree with relations between nodes), it would require resolving symlinks, since e.g. `foo/..` would not be the same as `.` if `foo` is a symlink. + - (-) The "logical" interpretation is also valid (treating paths as a sequence of names), and is used by some software. It is simpler, and not using symlinks at all is safer. + - (+) Mixing both models can lead to surprises. + - (+) We can't resolve symlinks without filesystem access. + - (+) Nix also doesn't support reading symlinks at evaluation time. + - (-) We could just not handle such cases, e.g. `equals "foo" "foo/bar/.. == false`. The paths are different, we don't need to check whether the paths point to the same thing. + - (+) Assume we said `relativeTo /foo /bar == "../bar"`. If this is used like `/bar/../foo` in the end, and `bar` turns out to be a symlink to somewhere else, this won't be accurate. + - (-) We could decide to not support such ambiguous operations, or mark them as such, e.g. the normal `relativeTo` will error on such a case, but there could be `extendedRelativeTo` supporting that. +- (-) `..` are a part of paths, a path library should therefore support it. + - (+) If we can convincingly argue that all such use cases are better done e.g. with runtime tools, the library not supporting it can nudge people towards using those. +- (-) We could allow "..", but only in the prefix. + - (+) Then we'd have to throw an error for doing `append /some/path "../foo"`, making it non-composable. + - (+) The same is for returning paths with `..`: `relativeTo /foo /bar => "../bar"` would produce a non-composable path. +- (+) We argue that `..` is not needed at the Nix evaluation level, since we'd always start evaluation from the project root and don't go up from there. + - (+) `..` is supported in Nix paths, turning them into absolute paths. + - (-) This is ambiguous in the presence of symlinks. +- (+) If you need `..` for building or runtime, you can use build-/run-time tooling to create those (e.g. `realpath` with `--relative-to`), or use absolute paths instead. + This also gives you the ability to correctly handle symlinks. + +
+ +### Trailing slashes +[trailing-slashes]: #trailing-slashes + +Observing: Subpaths can contain trailing slashes, like `foo/`, indicating that the path points to a directory and not a file. + +Considering: Paths should be as consistent as possible, there should only be a single normalisation for the same path. + +Decision: All functions remove trailing slashes in their results. + +
+Arguments + +- (+) It allows normalisations to be unique, in that there's only a single normalisation for the same path. If trailing slashes were preserved, both `foo/bar` and `foo/bar/` would be valid but different normalisations for the same path. +- Comparison to other frameworks to figure out the least surprising behavior: + - (+) Nix itself doesn't support trailing slashes when parsing and doesn't preserve them when appending paths. + - (-) [Rust's std::path](https://doc.rust-lang.org/std/path/index.html) does preserve them during [construction](https://doc.rust-lang.org/std/path/struct.Path.html#method.new). + - (+) Doesn't preserve them when returning individual [components](https://doc.rust-lang.org/std/path/struct.Path.html#method.components). + - (+) Doesn't preserve them when [canonicalizing](https://doc.rust-lang.org/std/path/struct.Path.html#method.canonicalize). + - (+) [Python 3's pathlib](https://docs.python.org/3/library/pathlib.html#module-pathlib) doesn't preserve them during [construction](https://docs.python.org/3/library/pathlib.html#pathlib.PurePath). + - Notably it represents the individual components as a list internally. + - (-) [Haskell's filepath](https://hackage.haskell.org/package/filepath-1.4.100.0) has [explicit support](https://hackage.haskell.org/package/filepath-1.4.100.0/docs/System-FilePath.html#g:6) for handling trailing slashes. + - (-) Does preserve them for [normalisation](https://hackage.haskell.org/package/filepath-1.4.100.0/docs/System-FilePath.html#v:normalise). + - (-) [NodeJS's Path library](https://nodejs.org/api/path.html) preserves trailing slashes for [normalisation](https://nodejs.org/api/path.html#pathnormalizepath). + - (+) For [parsing a path](https://nodejs.org/api/path.html#pathparsepath) into its significant elements, trailing slashes are not preserved. +- (+) Nix's builtin function `dirOf` gives an unexpected result for paths with trailing slashes: `dirOf "foo/bar/" == "foo/bar"`. + Inconsistently, `baseNameOf` works correctly though: `baseNameOf "foo/bar/" == "bar"`. + - (-) We are writing a path library to improve handling of paths though, so we shouldn't use these functions and discourage their use. +- (-) Unexpected result when normalising intermediate paths, like `relative.normalise ("foo" + "/") + "bar" == "foobar"`. + - (+) This is not a practical use case though. + - (+) Don't use `+` to append paths, this library has a `join` function for that. + - (-) Users might use `+` out of habit though. +- (+) The `realpath` command also removes trailing slashes. +- (+) Even with a trailing slash, the path is the same, it's only an indication that it's a directory. + +
+ +## Other implementations and references + +- [Rust](https://doc.rust-lang.org/std/path/struct.Path.html) +- [Python](https://docs.python.org/3/library/pathlib.html) +- [Haskell](https://hackage.haskell.org/package/filepath-1.4.100.0/docs/System-FilePath.html) +- [Nodejs](https://nodejs.org/api/path.html) +- [POSIX.1-2017](https://pubs.opengroup.org/onlinepubs/9699919799/nframe.html) diff --git a/lib/path/default.nix b/lib/path/default.nix new file mode 100644 index 000000000000..96a9244407bf --- /dev/null +++ b/lib/path/default.nix @@ -0,0 +1,218 @@ +# Functions for working with paths, see ./path.md +{ lib }: +let + + inherit (builtins) + isString + split + match + ; + + inherit (lib.lists) + length + head + last + genList + elemAt + ; + + inherit (lib.strings) + concatStringsSep + substring + ; + + inherit (lib.asserts) + assertMsg + ; + + # Return the reason why a subpath is invalid, or `null` if it's valid + subpathInvalidReason = value: + if ! isString value then + "The given value is of type ${builtins.typeOf value}, but a string was expected" + else if value == "" then + "The given string is empty" + else if substring 0 1 value == "/" then + "The given string \"${value}\" starts with a `/`, representing an absolute path" + # We don't support ".." components, see ./path.md#parent-directory + else if match "(.*/)?\\.\\.(/.*)?" value != null then + "The given string \"${value}\" contains a `..` component, which is not allowed in subpaths" + else null; + + # Split and normalise a relative path string into its components. + # Error for ".." components and doesn't include "." components + splitRelPath = path: + let + # Split the string into its parts using regex for efficiency. This regex + # matches patterns like "/", "/./", "/././", with arbitrarily many "/"s + # together. These are the main special cases: + # - Leading "./" gets split into a leading "." part + # - Trailing "/." or "/" get split into a trailing "." or "" + # part respectively + # + # These are the only cases where "." and "" parts can occur + parts = split "/+(\\./+)*" path; + + # `split` creates a list of 2 * k + 1 elements, containing the k + + # 1 parts, interleaved with k matches where k is the number of + # (non-overlapping) matches. This calculation here gets the number of parts + # back from the list length + # floor( (2 * k + 1) / 2 ) + 1 == floor( k + 1/2 ) + 1 == k + 1 + partCount = length parts / 2 + 1; + + # To assemble the final list of components we want to: + # - Skip a potential leading ".", normalising "./foo" to "foo" + # - Skip a potential trailing "." or "", normalising "foo/" and "foo/." to + # "foo". See ./path.md#trailing-slashes + skipStart = if head parts == "." then 1 else 0; + skipEnd = if last parts == "." || last parts == "" then 1 else 0; + + # We can now know the length of the result by removing the number of + # skipped parts from the total number + componentCount = partCount - skipEnd - skipStart; + + in + # Special case of a single "." path component. Such a case leaves a + # componentCount of -1 due to the skipStart/skipEnd not verifying that + # they don't refer to the same character + if path == "." then [] + + # Generate the result list directly. This is more efficient than a + # combination of `filter`, `init` and `tail`, because here we don't + # allocate any intermediate lists + else genList (index: + # To get to the element we need to add the number of parts we skip and + # multiply by two due to the interleaved layout of `parts` + elemAt parts ((skipStart + index) * 2) + ) componentCount; + + # Join relative path components together + joinRelPath = components: + # Always return relative paths with `./` as a prefix (./path.md#leading-dots-for-relative-paths) + "./" + + # An empty string is not a valid relative path, so we need to return a `.` when we have no components + (if components == [] then "." else concatStringsSep "/" components); + +in /* No rec! Add dependencies on this file at the top. */ { + + + /* Whether a value is a valid subpath string. + + - The value is a string + + - The string is not empty + + - The string doesn't start with a `/` + + - The string doesn't contain any `..` path components + + Type: + subpath.isValid :: String -> Bool + + Example: + # Not a string + subpath.isValid null + => false + + # Empty string + subpath.isValid "" + => false + + # Absolute path + subpath.isValid "/foo" + => false + + # Contains a `..` path component + subpath.isValid "../foo" + => false + + # Valid subpath + subpath.isValid "foo/bar" + => true + + # Doesn't need to be normalised + subpath.isValid "./foo//bar/" + => true + */ + subpath.isValid = value: + subpathInvalidReason value == null; + + + /* Normalise a subpath. Throw an error if the subpath isn't valid, see + `lib.path.subpath.isValid` + + - Limit repeating `/` to a single one + + - Remove redundant `.` components + + - Remove trailing `/` and `/.` + + - Add leading `./` + + Laws: + + - (Idempotency) Normalising multiple times gives the same result: + + subpath.normalise (subpath.normalise p) == subpath.normalise p + + - (Uniqueness) There's only a single normalisation for the paths that lead to the same file system node: + + subpath.normalise p != subpath.normalise q -> $(realpath ${p}) != $(realpath ${q}) + + - Don't change the result when appended to a Nix path value: + + base + ("/" + p) == base + ("/" + subpath.normalise p) + + - Don't change the path according to `realpath`: + + $(realpath ${p}) == $(realpath ${subpath.normalise p}) + + - Only error on invalid subpaths: + + builtins.tryEval (subpath.normalise p)).success == subpath.isValid p + + Type: + subpath.normalise :: String -> String + + Example: + # limit repeating `/` to a single one + subpath.normalise "foo//bar" + => "./foo/bar" + + # remove redundant `.` components + subpath.normalise "foo/./bar" + => "./foo/bar" + + # add leading `./` + subpath.normalise "foo/bar" + => "./foo/bar" + + # remove trailing `/` + subpath.normalise "foo/bar/" + => "./foo/bar" + + # remove trailing `/.` + subpath.normalise "foo/bar/." + => "./foo/bar" + + # Return the current directory as `./.` + subpath.normalise "." + => "./." + + # error on `..` path components + subpath.normalise "foo/../bar" + => + + # error on empty string + subpath.normalise "" + => + + # error on absolute path + subpath.normalise "/foo" + => + */ + subpath.normalise = path: + assert assertMsg (subpathInvalidReason path == null) + "lib.path.subpath.normalise: Argument is not a valid subpath string: ${subpathInvalidReason path}"; + joinRelPath (splitRelPath path); + +} diff --git a/lib/path/tests/default.nix b/lib/path/tests/default.nix new file mode 100644 index 000000000000..9a31e42828f4 --- /dev/null +++ b/lib/path/tests/default.nix @@ -0,0 +1,34 @@ +{ + nixpkgs ? ../../.., + system ? builtins.currentSystem, + pkgs ? import nixpkgs { + config = {}; + overlays = []; + inherit system; + }, + libpath ? ../.., + # Random seed + seed ? null, +}: +pkgs.runCommand "lib-path-tests" { + nativeBuildInputs = with pkgs; [ + nix + jq + bc + ]; +} '' + # Needed to make Nix evaluation work + export NIX_STATE_DIR=$(mktemp -d) + + cp -r ${libpath} lib + export TEST_LIB=$PWD/lib + + echo "Running unit tests lib/path/tests/unit.nix" + nix-instantiate --eval lib/path/tests/unit.nix \ + --argstr libpath "$TEST_LIB" + + echo "Running property tests lib/path/tests/prop.sh" + bash lib/path/tests/prop.sh ${toString seed} + + touch $out +'' diff --git a/lib/path/tests/generate.awk b/lib/path/tests/generate.awk new file mode 100644 index 000000000000..811dd0c46d33 --- /dev/null +++ b/lib/path/tests/generate.awk @@ -0,0 +1,64 @@ +# Generate random path-like strings, separated by null characters. +# +# Invocation: +# +# awk -f ./generate.awk -v = | tr '\0' '\n' +# +# Customizable variables (all default to 0): +# - seed: Deterministic random seed to use for generation +# - count: Number of paths to generate +# - extradotweight: Give extra weight to dots being generated +# - extraslashweight: Give extra weight to slashes being generated +# - extranullweight: Give extra weight to null being generated, making paths shorter +BEGIN { + # Random seed, passed explicitly for reproducibility + srand(seed) + + # Don't include special characters below 32 + minascii = 32 + # Don't include DEL at 128 + maxascii = 127 + upperascii = maxascii - minascii + + # add extra weight for ., in addition to the one weight from the ascii range + upperdot = upperascii + extradotweight + + # add extra weight for /, in addition to the one weight from the ascii range + upperslash = upperdot + extraslashweight + + # add extra weight for null, indicating the end of the string + # Must be at least 1 to have strings end at all + total = upperslash + 1 + extranullweight + + # new=1 indicates that it's a new string + new=1 + while (count > 0) { + + # Random integer between [0, total) + value = int(rand() * total) + + if (value < upperascii) { + # Ascii range + printf("%c", value + minascii) + new=0 + + } else if (value < upperdot) { + # Dot range + printf "." + new=0 + + } else if (value < upperslash) { + # If it's the start of a new path, only generate a / in 10% of cases + # This is always an invalid subpath, which is not a very interesting case + if (new && rand() > 0.1) continue + printf "/" + + } else { + # Do not generate empty strings + if (new) continue + printf "\x00" + count-- + new=1 + } + } +} diff --git a/lib/path/tests/prop.nix b/lib/path/tests/prop.nix new file mode 100644 index 000000000000..67e5c1e9d61c --- /dev/null +++ b/lib/path/tests/prop.nix @@ -0,0 +1,60 @@ +# Given a list of path-like strings, check some properties of the path library +# using those paths and return a list of attribute sets of the following form: +# +# { = ; } +# +# If `normalise` fails to evaluate, the attribute value is set to `""`. +# If not, the resulting value is normalised again and an appropriate attribute set added to the output list. +{ + # The path to the nixpkgs lib to use + libpath, + # A flat directory containing files with randomly-generated + # path-like values + dir, +}: +let + lib = import libpath; + + # read each file into a string + strings = map (name: + builtins.readFile (dir + "/${name}") + ) (builtins.attrNames (builtins.readDir dir)); + + inherit (lib.path.subpath) normalise isValid; + inherit (lib.asserts) assertMsg; + + normaliseAndCheck = str: + let + originalValid = isValid str; + + tryOnce = builtins.tryEval (normalise str); + tryTwice = builtins.tryEval (normalise tryOnce.value); + + absConcatOrig = /. + ("/" + str); + absConcatNormalised = /. + ("/" + tryOnce.value); + in + # Check the lib.path.subpath.normalise property to only error on invalid subpaths + assert assertMsg + (originalValid -> tryOnce.success) + "Even though string \"${str}\" is valid as a subpath, the normalisation for it failed"; + assert assertMsg + (! originalValid -> ! tryOnce.success) + "Even though string \"${str}\" is invalid as a subpath, the normalisation for it succeeded"; + + # Check normalisation idempotency + assert assertMsg + (originalValid -> tryTwice.success) + "For valid subpath \"${str}\", the normalisation \"${tryOnce.value}\" was not a valid subpath"; + assert assertMsg + (originalValid -> tryOnce.value == tryTwice.value) + "For valid subpath \"${str}\", normalising it once gives \"${tryOnce.value}\" but normalising it twice gives a different result: \"${tryTwice.value}\""; + + # Check that normalisation doesn't change a string when appended to an absolute Nix path value + assert assertMsg + (originalValid -> absConcatOrig == absConcatNormalised) + "For valid subpath \"${str}\", appending to an absolute Nix path value gives \"${absConcatOrig}\", but appending the normalised result \"${tryOnce.value}\" gives a different value \"${absConcatNormalised}\""; + + # Return an empty string when failed + if tryOnce.success then tryOnce.value else ""; + +in lib.genAttrs strings normaliseAndCheck diff --git a/lib/path/tests/prop.sh b/lib/path/tests/prop.sh new file mode 100755 index 000000000000..e48c6667fa08 --- /dev/null +++ b/lib/path/tests/prop.sh @@ -0,0 +1,179 @@ +#!/usr/bin/env bash + +# Property tests for the `lib.path` library +# +# It generates random path-like strings and runs the functions on +# them, checking that the expected laws of the functions hold + +set -euo pipefail +shopt -s inherit_errexit + +# https://stackoverflow.com/a/246128 +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +if test -z "${TEST_LIB:-}"; then + TEST_LIB=$SCRIPT_DIR/../.. +fi + +tmp="$(mktemp -d)" +clean_up() { + rm -rf "$tmp" +} +trap clean_up EXIT +mkdir -p "$tmp/work" +cd "$tmp/work" + +# Defaulting to a random seed but the first argument can override this +seed=${1:-$RANDOM} +echo >&2 "Using seed $seed, use \`lib/path/tests/prop.sh $seed\` to reproduce this result" + +# The number of random paths to generate. This specific number was chosen to +# be fast enough while still generating enough variety to detect bugs. +count=500 + +debug=0 +# debug=1 # print some extra info +# debug=2 # print generated values + +# Fine tuning parameters to balance the number of generated invalid paths +# to the variance in generated paths. +extradotweight=64 # Larger value: more dots +extraslashweight=64 # Larger value: more slashes +extranullweight=16 # Larger value: shorter strings + +die() { + echo >&2 "test case failed: " "$@" + exit 1 +} + +if [[ "$debug" -ge 1 ]]; then + echo >&2 "Generating $count random path-like strings" +fi + +# Read stream of null-terminated strings entry-by-entry into bash, +# write it to a file and the `strings` array. +declare -a strings=() +mkdir -p "$tmp/strings" +while IFS= read -r -d $'\0' str; do + printf "%s" "$str" > "$tmp/strings/${#strings[@]}" + strings+=("$str") +done < <(awk \ + -f "$SCRIPT_DIR"/generate.awk \ + -v seed="$seed" \ + -v count="$count" \ + -v extradotweight="$extradotweight" \ + -v extraslashweight="$extraslashweight" \ + -v extranullweight="$extranullweight") + +if [[ "$debug" -ge 1 ]]; then + echo >&2 "Trying to normalise the generated path-like strings with Nix" +fi + +# Precalculate all normalisations with a single Nix call. Calling Nix for each +# string individually would take way too long +nix-instantiate --eval --strict --json \ + --argstr libpath "$TEST_LIB" \ + --argstr dir "$tmp/strings" \ + "$SCRIPT_DIR"/prop.nix \ + >"$tmp/result.json" + +# Uses some jq magic to turn the resulting attribute set into an associative +# bash array assignment +declare -A normalised_result="($(jq ' + to_entries + | map("[\(.key | @sh)]=\(.value | @sh)") + | join(" \n")' -r < "$tmp/result.json"))" + +# Looks up a normalisation result for a string +# Checks that the normalisation is only failing iff it's an invalid subpath +# For valid subpaths, returns 0 and prints the normalisation result +# For invalid subpaths, returns 1 +normalise() { + local str=$1 + # Uses the same check for validity as in the library implementation + if [[ "$str" == "" || "$str" == /* || "$str" =~ ^(.*/)?\.\.(/.*)?$ ]]; then + valid= + else + valid=1 + fi + + normalised=${normalised_result[$str]} + # An empty string indicates failure, this is encoded in ./prop.nix + if [[ -n "$normalised" ]]; then + if [[ -n "$valid" ]]; then + echo "$normalised" + else + die "For invalid subpath \"$str\", lib.path.subpath.normalise returned this result: \"$normalised\"" + fi + else + if [[ -n "$valid" ]]; then + die "For valid subpath \"$str\", lib.path.subpath.normalise failed" + else + if [[ "$debug" -ge 2 ]]; then + echo >&2 "String \"$str\" is not a valid subpath" + fi + # Invalid and it correctly failed, we let the caller continue if they catch the exit code + return 1 + fi + fi +} + +# Intermediate result populated by test_idempotency_realpath +# and used in test_normalise_uniqueness +# +# Contains a mapping from a normalised subpath to the realpath result it represents +declare -A norm_to_real + +test_idempotency_realpath() { + if [[ "$debug" -ge 1 ]]; then + echo >&2 "Checking idempotency of each result and making sure the realpath result isn't changed" + fi + + # Count invalid subpaths to display stats + invalid=0 + for str in "${strings[@]}"; do + if ! result=$(normalise "$str"); then + ((invalid++)) || true + continue + fi + + # Check the law that it doesn't change the result of a realpath + mkdir -p -- "$str" "$result" + real_orig=$(realpath -- "$str") + real_norm=$(realpath -- "$result") + + if [[ "$real_orig" != "$real_norm" ]]; then + die "realpath of the original string \"$str\" (\"$real_orig\") is not the same as realpath of the normalisation \"$result\" (\"$real_norm\")" + fi + + if [[ "$debug" -ge 2 ]]; then + echo >&2 "String \"$str\" gets normalised to \"$result\" and file path \"$real_orig\"" + fi + norm_to_real["$result"]="$real_orig" + done + if [[ "$debug" -ge 1 ]]; then + echo >&2 "$(bc <<< "scale=1; 100 / $count * $invalid")% of the total $count generated strings were invalid subpath strings, and were therefore ignored" + fi +} + +test_normalise_uniqueness() { + if [[ "$debug" -ge 1 ]]; then + echo >&2 "Checking for the uniqueness law" + fi + + for norm_p in "${!norm_to_real[@]}"; do + real_p=${norm_to_real["$norm_p"]} + for norm_q in "${!norm_to_real[@]}"; do + real_q=${norm_to_real["$norm_q"]} + # Checks normalisation uniqueness law for each pair of values + if [[ "$norm_p" != "$norm_q" && "$real_p" == "$real_q" ]]; then + die "Normalisations \"$norm_p\" and \"$norm_q\" are different, but the realpath of them is the same: \"$real_p\"" + fi + done + done +} + +test_idempotency_realpath +test_normalise_uniqueness + +echo >&2 tests ok diff --git a/lib/path/tests/unit.nix b/lib/path/tests/unit.nix new file mode 100644 index 000000000000..eccf3b7b1c33 --- /dev/null +++ b/lib/path/tests/unit.nix @@ -0,0 +1,125 @@ +# Unit tests for lib.path functions. Use `nix-build` in this directory to +# run these +{ libpath }: +let + lib = import libpath; + inherit (lib.path) subpath; + + cases = lib.runTests { + testSubpathIsValidExample1 = { + expr = subpath.isValid null; + expected = false; + }; + testSubpathIsValidExample2 = { + expr = subpath.isValid ""; + expected = false; + }; + testSubpathIsValidExample3 = { + expr = subpath.isValid "/foo"; + expected = false; + }; + testSubpathIsValidExample4 = { + expr = subpath.isValid "../foo"; + expected = false; + }; + testSubpathIsValidExample5 = { + expr = subpath.isValid "foo/bar"; + expected = true; + }; + testSubpathIsValidExample6 = { + expr = subpath.isValid "./foo//bar/"; + expected = true; + }; + testSubpathIsValidTwoDotsEnd = { + expr = subpath.isValid "foo/.."; + expected = false; + }; + testSubpathIsValidTwoDotsMiddle = { + expr = subpath.isValid "foo/../bar"; + expected = false; + }; + testSubpathIsValidTwoDotsPrefix = { + expr = subpath.isValid "..foo"; + expected = true; + }; + testSubpathIsValidTwoDotsSuffix = { + expr = subpath.isValid "foo.."; + expected = true; + }; + testSubpathIsValidTwoDotsPrefixComponent = { + expr = subpath.isValid "foo/..bar/baz"; + expected = true; + }; + testSubpathIsValidTwoDotsSuffixComponent = { + expr = subpath.isValid "foo/bar../baz"; + expected = true; + }; + testSubpathIsValidThreeDots = { + expr = subpath.isValid "..."; + expected = true; + }; + testSubpathIsValidFourDots = { + expr = subpath.isValid "...."; + expected = true; + }; + testSubpathIsValidThreeDotsComponent = { + expr = subpath.isValid "foo/.../bar"; + expected = true; + }; + testSubpathIsValidFourDotsComponent = { + expr = subpath.isValid "foo/..../bar"; + expected = true; + }; + + testSubpathNormaliseExample1 = { + expr = subpath.normalise "foo//bar"; + expected = "./foo/bar"; + }; + testSubpathNormaliseExample2 = { + expr = subpath.normalise "foo/./bar"; + expected = "./foo/bar"; + }; + testSubpathNormaliseExample3 = { + expr = subpath.normalise "foo/bar"; + expected = "./foo/bar"; + }; + testSubpathNormaliseExample4 = { + expr = subpath.normalise "foo/bar/"; + expected = "./foo/bar"; + }; + testSubpathNormaliseExample5 = { + expr = subpath.normalise "foo/bar/."; + expected = "./foo/bar"; + }; + testSubpathNormaliseExample6 = { + expr = subpath.normalise "."; + expected = "./."; + }; + testSubpathNormaliseExample7 = { + expr = (builtins.tryEval (subpath.normalise "foo/../bar")).success; + expected = false; + }; + testSubpathNormaliseExample8 = { + expr = (builtins.tryEval (subpath.normalise "")).success; + expected = false; + }; + testSubpathNormaliseExample9 = { + expr = (builtins.tryEval (subpath.normalise "/foo")).success; + expected = false; + }; + testSubpathNormaliseIsValidDots = { + expr = subpath.normalise "./foo/.bar/.../baz...qux"; + expected = "./foo/.bar/.../baz...qux"; + }; + testSubpathNormaliseWrongType = { + expr = (builtins.tryEval (subpath.normalise null)).success; + expected = false; + }; + testSubpathNormaliseTwoDots = { + expr = (builtins.tryEval (subpath.normalise "..")).success; + expected = false; + }; + }; +in + if cases == [] then "Unit tests successful" + else throw "Path unit tests failed: ${lib.generators.toPretty {} cases}" diff --git a/lib/strings.nix b/lib/strings.nix index b5f5a4d9060b..68d930950662 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -18,6 +18,7 @@ rec { isInt isList isAttrs + isPath isString match parseDrvName @@ -127,6 +128,17 @@ rec { # List of input strings list: concatStringsSep sep (lib.imap1 f list); + /* Concatenate a list of strings, adding a newline at the end of each one. + Defined as `concatMapStrings (s: s + "\n")`. + + Type: concatLines :: [string] -> string + + Example: + concatLines [ "foo" "bar" ] + => "foo\nbar\n" + */ + concatLines = concatMapStrings (s: s + "\n"); + /* Construct a Unix-style, colon-separated search path consisting of the given `subDir` appended to each of the given paths. @@ -185,7 +197,7 @@ rec { */ makeBinPath = makeSearchPathOutput "bin" "bin"; - /* Normalize path, removing extranous /s + /* Normalize path, removing extraneous /s Type: normalizePath :: string -> string @@ -281,7 +293,7 @@ rec { => [ ] stringToCharacters "abc" => [ "a" "b" "c" ] - stringToCharacters "💩" + stringToCharacters "🦄" => [ "�" "�" "�" "�" ] */ stringToCharacters = s: @@ -328,9 +340,9 @@ rec { escape ["(" ")"] "(foo)" => "\\(foo\\)" */ - escape = list: replaceChars list (map (c: "\\${c}") list); + escape = list: replaceStrings list (map (c: "\\${c}") list); - /* Escape occurence of the element of `list` in `string` by + /* Escape occurrence of the element of `list` in `string` by converting to its ASCII value and prefixing it with \\x. Only works for printable ascii characters. @@ -341,7 +353,7 @@ rec { => "foo\\x20bar" */ - escapeC = list: replaceChars list (map (c: "\\x${ toLower (lib.toHexString (charToInt c))}") list); + escapeC = list: replaceStrings list (map (c: "\\x${ toLower (lib.toHexString (charToInt c))}") list); /* Quote string to be used safely within the Bourne shell. @@ -395,7 +407,7 @@ rec { */ toShellVar = name: value: lib.throwIfNot (isValidPosixName name) "toShellVar: ${name} is not a valid shell variable name" ( - if isAttrs value && ! isCoercibleToString value then + if isAttrs value && ! isStringLike value then "declare -A ${name}=(${ concatStringsSep " " (lib.mapAttrsToList (n: v: "[${escapeShellArg n}]=${escapeShellArg v}" @@ -471,19 +483,8 @@ rec { ["\"" "'" "<" ">" "&"] [""" "'" "<" ">" "&"]; - # Obsolete - use replaceStrings instead. - replaceChars = builtins.replaceStrings or ( - del: new: s: - let - substList = lib.zipLists del new; - subst = c: - let found = lib.findFirst (sub: sub.fst == c) null substList; in - if found == null then - c - else - found.snd; - in - stringAsChars subst s); + # warning added 12-12-2022 + replaceChars = lib.warn "replaceChars is a deprecated alias of replaceStrings, replace usages of it with replaceStrings." builtins.replaceStrings; # Case conversion utilities. lowerChars = stringToCharacters "abcdefghijklmnopqrstuvwxyz"; @@ -497,7 +498,7 @@ rec { toLower "HOME" => "home" */ - toLower = replaceChars upperChars lowerChars; + toLower = replaceStrings upperChars lowerChars; /* Converts an ASCII string to upper-case. @@ -507,10 +508,10 @@ rec { toUpper "home" => "HOME" */ - toUpper = replaceChars lowerChars upperChars; + toUpper = replaceStrings lowerChars upperChars; /* Appends string context from another string. This is an implementation - detail of Nix. + detail of Nix and should be used carefully. Strings in Nix carry an invisible `context` which is a list of strings representing store paths. If the string is later used in a derivation @@ -533,13 +534,11 @@ rec { splitString "/" "/usr/local/bin" => [ "" "usr" "local" "bin" ] */ - splitString = _sep: _s: + splitString = sep: s: let - sep = builtins.unsafeDiscardStringContext _sep; - s = builtins.unsafeDiscardStringContext _s; - splits = builtins.filter builtins.isString (builtins.split (escapeRegex sep) s); + splits = builtins.filter builtins.isString (builtins.split (escapeRegex (toString sep)) (toString s)); in - map (v: addContextFrom _sep (addContextFrom _s v)) splits; + map (addContextFrom s) splits; /* Return a string without the specified prefix, if the prefix matches. @@ -661,6 +660,61 @@ rec { name = head (splitString sep filename); in assert name != filename; name; + /* Create a -D= string that can be passed to typical Meson + invocations. + + Type: mesonOption :: string -> string -> string + + @param feature The feature to be set + @param value The desired value + + Example: + mesonOption "engine" "opengl" + => "-Dengine=opengl" + */ + mesonOption = feature: value: + assert (lib.isString feature); + assert (lib.isString value); + "-D${feature}=${value}"; + + /* Create a -D={true,false} string that can be passed to typical + Meson invocations. + + Type: mesonBool :: string -> bool -> string + + @param condition The condition to be made true or false + @param flag The controlling flag of the condition + + Example: + mesonBool "hardened" true + => "-Dhardened=true" + mesonBool "static" false + => "-Dstatic=false" + */ + mesonBool = condition: flag: + assert (lib.isString condition); + assert (lib.isBool flag); + mesonOption condition (lib.boolToString flag); + + /* Create a -D={enabled,disabled} string that can be passed to + typical Meson invocations. + + Type: mesonEnable :: string -> bool -> string + + @param feature The feature to be enabled or disabled + @param flag The controlling flag + + Example: + mesonEnable "docs" true + => "-Ddocs=enabled" + mesonEnable "savage" false + => "-Dsavage=disabled" + */ + mesonEnable = feature: flag: + assert (lib.isString feature); + assert (lib.isBool flag); + mesonOption feature (if flag then "enabled" else "disabled"); + /* Create an --{enable,disable}- string that can be passed to standard GNU Autoconf scripts. @@ -756,10 +810,31 @@ rec { in lib.warnIf (!precise) "Imprecise conversion from float to string ${result}" result; - /* Check whether a value can be coerced to a string */ - isCoercibleToString = x: - elem (typeOf x) [ "path" "string" "null" "int" "float" "bool" ] || - (isList x && lib.all isCoercibleToString x) || + /* Soft-deprecated function. While the original implementation is available as + isConvertibleWithToString, consider using isStringLike instead, if suitable. */ + isCoercibleToString = lib.warnIf (lib.isInOldestRelease 2305) + "lib.strings.isCoercibleToString is deprecated in favor of either isStringLike or isConvertibleWithToString. Only use the latter if it needs to return true for null, numbers, booleans and list of similarly coercibles." + isConvertibleWithToString; + + /* Check whether a list or other value can be passed to toString. + + Many types of value are coercible to string this way, including int, float, + null, bool, list of similarly coercible values. + */ + isConvertibleWithToString = x: + isStringLike x || + elem (typeOf x) [ "null" "int" "float" "bool" ] || + (isList x && lib.all isConvertibleWithToString x); + + /* Check whether a value can be coerced to a string. + The value must be a string, path, or attribute set. + + String-like values can be used without explicit conversion in + string interpolations and in most functions that expect a string. + */ + isStringLike = x: + isString x || + isPath x || x ? outPath || x ? __toString; @@ -776,7 +851,7 @@ rec { => false */ isStorePath = x: - if !(isList x) && isCoercibleToString x then + if isStringLike x then let str = toString x; in substring 0 1 str == "/" && dirOf str == storeDir @@ -807,9 +882,9 @@ rec { */ toInt = str: let - # RegEx: Match any leading whitespace, then any digits, and finally match any trailing - # whitespace. - strippedInput = match "[[:space:]]*([[:digit:]]+)[[:space:]]*" str; + # RegEx: Match any leading whitespace, possibly a '-', one or more digits, + # and finally match any trailing whitespace. + strippedInput = match "[[:space:]]*(-?[[:digit:]]+)[[:space:]]*" str; # RegEx: Match a leading '0' then one or more digits. isLeadingZero = match "0[[:digit:]]+" (head strippedInput) == []; @@ -858,9 +933,10 @@ rec { */ toIntBase10 = str: let - # RegEx: Match any leading whitespace, then match any zero padding, capture any remaining - # digits after that, and finally match any trailing whitespace. - strippedInput = match "[[:space:]]*0*([[:digit:]]+)[[:space:]]*" str; + # RegEx: Match any leading whitespace, then match any zero padding, + # capture possibly a '-' followed by one or more digits, + # and finally match any trailing whitespace. + strippedInput = match "[[:space:]]*0*(-?[[:digit:]]+)[[:space:]]*" str; # RegEx: Match at least one '0'. isZero = match "0+" (head strippedInput) == []; diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix index ddc320d24e0a..94127fa90b35 100644 --- a/lib/systems/architectures.nix +++ b/lib/systems/architectures.nix @@ -67,7 +67,7 @@ rec { # # Note: # - # - The succesors of `skylake` (`cannonlake`, `icelake`, etc) use `avx512` + # - The successors of `skylake` (`cannonlake`, `icelake`, etc) use `avx512` # which no current AMD Zen michroarch support. # - `znver1` uses `ABM`, `CLZERO`, `CX16`, `MWAITX`, and `SSE4A` which no # current Intel microarch support. diff --git a/lib/systems/default.nix b/lib/systems/default.nix index ca5186ca4768..4a5e66caec7c 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -20,7 +20,7 @@ rec { # necessary. # # `parsed` is inferred from args, both because there are two options with one - # clearly prefered, and to prevent cycles. A simpler fixed point where the RHS + # clearly preferred, and to prevent cycles. A simpler fixed point where the RHS # always just used `final.*` would fail on both counts. elaborate = args': let args = if lib.isString args' then { system = args'; } @@ -62,7 +62,7 @@ rec { linker = /**/ if final.useLLVM or false then "lld" else if final.isDarwin then "cctools" - # "bfd" and "gold" both come from GNU binutils. The existance of Gold + # "bfd" and "gold" both come from GNU binutils. The existence of Gold # is why we use the more obscure "bfd" and not "binutils" for this # choice. else "bfd"; @@ -101,7 +101,14 @@ rec { }.${final.parsed.kernel.name} or null; # uname -m - processor = final.parsed.cpu.name; + processor = + if final.isPower64 + then "ppc64${lib.optionalString final.isLittleEndian "le"}" + else if final.isPower + then "ppc${lib.optionalString final.isLittleEndian "le"}" + else if final.isMips64 + then "mips64" # endianness is *not* included on mips64 + else final.parsed.cpu.name; # uname -r release = null; @@ -135,12 +142,7 @@ rec { if final.isAarch32 then "arm" else if final.isx86_64 then "x86_64" else if final.isx86 then "i386" - else { - powerpc = "ppc"; - powerpcle = "ppc"; - powerpc64 = "ppc64"; - powerpc64le = "ppc64le"; - }.${final.parsed.cpu.name} or final.parsed.cpu.name; + else final.uname.processor; # Name used by UEFI for architectures. efiArch = diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 23a44d02e85e..383dd30bfdb2 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -68,6 +68,7 @@ in { none = []; arm = filterDoubles predicates.isAarch32; + armv7 = filterDoubles predicates.isArmv7; aarch64 = filterDoubles predicates.isAarch64; x86 = filterDoubles predicates.isx86; i686 = filterDoubles predicates.isi686; @@ -75,6 +76,7 @@ in { microblaze = filterDoubles predicates.isMicroBlaze; mips = filterDoubles predicates.isMips; mmix = filterDoubles predicates.isMmix; + power = filterDoubles predicates.isPower; riscv = filterDoubles predicates.isRiscV; riscv32 = filterDoubles predicates.isRiscV32; riscv64 = filterDoubles predicates.isRiscV64; @@ -83,6 +85,7 @@ in { or1k = filterDoubles predicates.isOr1k; m68k = filterDoubles predicates.isM68k; s390 = filterDoubles predicates.isS390; + s390x = filterDoubles predicates.isS390x; js = filterDoubles predicates.isJavaScript; bigEndian = filterDoubles predicates.isBigEndian; diff --git a/lib/systems/flake-systems.nix b/lib/systems/flake-systems.nix index 74124c32e836..b1988c6a4fbb 100644 --- a/lib/systems/flake-systems.nix +++ b/lib/systems/flake-systems.nix @@ -1,6 +1,6 @@ # See [RFC 46] for mandated platform support and ../../pkgs/stdenv for # implemented platform support. This list is mainly descriptive, i.e. all -# system doubles for platforms where nixpkgs can do native compiliation +# system doubles for platforms where nixpkgs can do native compilation # reasonably well are included. # # [RFC 46]: https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 4e0bb8e672e9..30615c9fde32 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -7,6 +7,7 @@ let abis_ = abis; in let abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) abis_; in rec { + # these patterns are to be matched against {host,build,target}Platform.parsed patterns = rec { isi686 = { cpu = cpuTypes.i686; }; isx86_32 = { cpu = { family = "x86"; bits = 32; }; }; @@ -22,6 +23,9 @@ rec { ]; isx86 = { cpu = { family = "x86"; }; }; isAarch32 = { cpu = { family = "arm"; bits = 32; }; }; + isArmv7 = map ({ arch, ... }: { cpu = { inherit arch; }; }) + (lib.filter (cpu: lib.hasPrefix "armv7" cpu.arch or "") + (lib.attrValues cpuTypes)); isAarch64 = { cpu = { family = "arm"; bits = 64; }; }; isAarch = { cpu = { family = "arm"; }; }; isMicroBlaze = { cpu = { family = "microblaze"; }; }; @@ -44,10 +48,12 @@ rec { isOr1k = { cpu = { family = "or1k"; }; }; isM68k = { cpu = { family = "m68k"; }; }; isS390 = { cpu = { family = "s390"; }; }; + isS390x = { cpu = { family = "s390"; bits = 64; }; }; isJavaScript = { cpu = cpuTypes.js; }; is32bit = { cpu = { bits = 32; }; }; is64bit = { cpu = { bits = 64; }; }; + isILP32 = map (a: { abi = { abi = a; }; }) [ "n32" "ilp32" "x32" ]; isBigEndian = { cpu = { significantByte = significantBytes.bigEndian; }; }; isLittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; }; @@ -76,8 +82,13 @@ rec { 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; }) - [ "x86" "arm" "aarch64" ]; + isEfi = [ + { cpu = { family = "arm"; version = "6"; }; } + { cpu = { family = "arm"; version = "7"; }; } + { cpu = { family = "arm"; version = "8"; }; } + { cpu = { family = "riscv"; }; } + { cpu = { family = "x86"; }; } + ]; }; matchAnyAttrs = patterns: @@ -85,4 +96,13 @@ rec { else matchAttrs patterns; predicates = mapAttrs (_: matchAnyAttrs) patterns; + + # these patterns are to be matched against the entire + # {host,build,target}Platform structure; they include a `parsed={}` marker so + # that `lib.meta.availableOn` can distinguish them from the patterns which + # apply only to the `parsed` field. + + platformPatterns = mapAttrs (_: p: { parsed = {}; } // p) { + isStatic = { isStatic = true; }; + }; } diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index d8ba251503a6..8fb13af1f530 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -91,10 +91,14 @@ rec { microblaze = { bits = 32; significantByte = bigEndian; family = "microblaze"; }; microblazeel = { bits = 32; significantByte = littleEndian; family = "microblaze"; }; - mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; - mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; }; - mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; }; - mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; }; + mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; + mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; }; + mipsisa32r6 = { bits = 32; significantByte = bigEndian; family = "mips"; }; + mipsisa32r6el = { bits = 32; significantByte = littleEndian; family = "mips"; }; + mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; }; + mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; }; + mipsisa64r6 = { bits = 64; significantByte = bigEndian; family = "mips"; }; + mipsisa64r6el = { bits = 64; significantByte = littleEndian; family = "mips"; }; mmix = { bits = 64; significantByte = bigEndian; family = "mmix"; }; @@ -422,29 +426,29 @@ rec { else if (elemAt l 1) == "elf" then { cpu = elemAt l 0; vendor = "unknown"; kernel = "none"; abi = elemAt l 1; } else { cpu = elemAt l 0; kernel = elemAt l 1; }; - "3" = # Awkward hacks, beware! - if elemAt l 1 == "apple" - then { cpu = elemAt l 0; vendor = "apple"; kernel = elemAt l 2; } - else if (elemAt l 1 == "linux") || (elemAt l 2 == "gnu") - then { cpu = elemAt l 0; kernel = elemAt l 1; abi = elemAt l 2; } - else if (elemAt l 2 == "mingw32") # autotools breaks on -gnu for window - then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; } - else if (elemAt l 2 == "wasi") - then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "wasi"; } - else if (elemAt l 2 == "redox") - then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "redox"; } - else if (elemAt l 2 == "mmixware") - then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "mmixware"; } - else if hasPrefix "freebsd" (elemAt l 2) - then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; } - else if hasPrefix "netbsd" (elemAt l 2) - then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; } - else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"]) - then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 1; abi = elemAt l 2; } - else if (elemAt l 2 == "ghcjs") - then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 2; } - else if hasPrefix "genode" (elemAt l 2) - then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; } + "3" = + # cpu-kernel-environment + if elemAt l 1 == "linux" || + elem (elemAt l 2) ["eabi" "eabihf" "elf" "gnu"] + then { + cpu = elemAt l 0; + kernel = elemAt l 1; + abi = elemAt l 2; + vendor = "unknown"; + } + # cpu-vendor-os + else if elemAt l 1 == "apple" || + elem (elemAt l 2) [ "wasi" "redox" "mmixware" "ghcjs" "mingw32" ] || + hasPrefix "freebsd" (elemAt l 2) || + hasPrefix "netbsd" (elemAt l 2) || + hasPrefix "genode" (elemAt l 2) + then { + cpu = elemAt l 0; + vendor = elemAt l 1; + kernel = if elemAt l 2 == "mingw32" + then "windows" # autotools breaks on -gnu for window + else elemAt l 2; + } else throw "Target specification with 3 components is ambiguous"; "4" = { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; }; }.${toString (length l)} diff --git a/lib/tests/maintainer-module.nix b/lib/tests/maintainer-module.nix index 8cf8411b476a..afa12587a98d 100644 --- a/lib/tests/maintainer-module.nix +++ b/lib/tests/maintainer-module.nix @@ -7,7 +7,8 @@ in { type = types.str; }; email = lib.mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; }; matrix = lib.mkOption { type = types.nullOr types.str; diff --git a/lib/tests/maintainers.nix b/lib/tests/maintainers.nix index 8a9a2b26efaf..be1c8aaa85c5 100644 --- a/lib/tests/maintainers.nix +++ b/lib/tests/maintainers.nix @@ -1,5 +1,6 @@ # to run these tests (and the others) # nix-build nixpkgs/lib/tests/release.nix +# These tests should stay in sync with the comment in maintainers/maintainers-list.nix { # The pkgs used for dependencies for the testing itself pkgs ? import ../.. {} , lib ? pkgs.lib @@ -20,7 +21,7 @@ let ]; }).config; - checkGithubId = lib.optional (checkedAttrs.github != null && checkedAttrs.githubId == null) '' + checks = lib.optional (checkedAttrs.github != null && checkedAttrs.githubId == null) '' echo ${lib.escapeShellArg (lib.showOption prefix)}': If `github` is specified, `githubId` must be too.' # Calling this too often would hit non-authenticated API limits, but this # shouldn't happen since such errors will get fixed rather quickly @@ -28,8 +29,12 @@ let id=$(jq -r '.id' <<< "$info") echo "The GitHub ID for GitHub user ${checkedAttrs.github} is $id:" echo -e " githubId = $id;\n" + '' ++ lib.optional (checkedAttrs.email == null && checkedAttrs.github == null && checkedAttrs.matrix == null) '' + echo ${lib.escapeShellArg (lib.showOption prefix)}': At least one of `email`, `github` or `matrix` must be specified, so that users know how to reach you.' + '' ++ lib.optional (checkedAttrs.email != null && lib.hasSuffix "noreply.github.com" checkedAttrs.email) '' + echo ${lib.escapeShellArg (lib.showOption prefix)}': If an email address is given, it should allow people to reach you. If you do not want that, you can just provide `github` or `matrix` instead.' ''; - in lib.deepSeq checkedAttrs checkGithubId; + in lib.deepSeq checkedAttrs checks; missingGithubIds = lib.concatLists (lib.mapAttrsToList checkMaintainer lib.maintainers); diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index b73da4f1010d..c14bddb11a13 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -153,6 +153,11 @@ runTests { expected = "a,b,c"; }; + testConcatLines = { + expr = concatLines ["a" "b" "c"]; + expected = "a\nb\nc\n"; + }; + testSplitStringsSimple = { expr = strings.splitString "." "a.b.c.d"; expected = [ "a" "b" "c" "d" ]; @@ -212,6 +217,21 @@ runTests { expected = [ "1" "2" "3" ]; }; + testPadVersionLess = { + expr = versions.pad 3 "1.2"; + expected = "1.2.0"; + }; + + testPadVersionLessExtra = { + expr = versions.pad 3 "1.3-rc1"; + expected = "1.3.0-rc1"; + }; + + testPadVersionMore = { + expr = versions.pad 3 "1.2.3.4"; + expected = "1.2.3"; + }; + testIsStorePath = { expr = let goodPath = @@ -339,6 +359,8 @@ runTests { (0 == toInt " 0") (0 == toInt "0 ") (0 == toInt " 0 ") + (-1 == toInt "-1") + (-1 == toInt " -1 ") ]; testToIntFails = testAllTrue [ @@ -383,6 +405,8 @@ runTests { (0 == toIntBase10 " 000000") (0 == toIntBase10 "000000 ") (0 == toIntBase10 " 000000 ") + (-1 == toIntBase10 "-1") + (-1 == toIntBase10 " -1 ") ]; testToIntBase10Fails = testAllTrue [ @@ -727,7 +751,7 @@ runTests { float = 0.1337; bool = true; emptystring = ""; - string = ''fno"rd''; + string = "fn\${o}\"r\\d"; newlinestring = "\n"; path = /. + "/foo"; null_ = null; @@ -735,16 +759,16 @@ runTests { functionArgs = { arg ? 4, foo }: arg; list = [ 3 4 function [ false ] ]; emptylist = []; - attrs = { foo = null; "foo bar" = "baz"; }; + attrs = { foo = null; "foo b/ar" = "baz"; }; emptyattrs = {}; drv = deriv; }; expected = rec { int = "42"; - float = "~0.133700"; + float = "0.1337"; bool = "true"; emptystring = ''""''; - string = ''"fno\"rd"''; + string = ''"fn\''${o}\"r\\d"''; newlinestring = "\"\\n\""; path = "/foo"; null_ = "null"; @@ -752,9 +776,9 @@ runTests { functionArgs = ""; list = "[ 3 4 ${function} [ false ] ]"; emptylist = "[ ]"; - attrs = "{ foo = null; \"foo bar\" = \"baz\"; }"; + attrs = "{ foo = null; \"foo b/ar\" = \"baz\"; }"; emptyattrs = "{ }"; - drv = ""; + drv = ""; }; }; @@ -799,8 +823,8 @@ runTests { newlinestring = "\n"; multilinestring = '' hello - there - test + ''${there} + te'''st ''; multilinestring' = '' hello @@ -827,8 +851,8 @@ runTests { multilinestring = '' ''' hello - there - test + '''''${there} + te''''st '''''; multilinestring' = '' ''' diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 6d2eb24db55c..cde4da643937 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -64,6 +64,9 @@ checkConfigOutput '^"one two"$' config.result ./shorthand-meta.nix # Check boolean option. checkConfigOutput '^false$' config.enable ./declare-enable.nix checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./define-enable.nix +checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*' config.enable ./define-enable-throw.nix +checkConfigError 'while evaluating a definition from `.*/define-enable-abort.nix' config.enable ./define-enable-abort.nix +checkConfigError 'while evaluating the error message for definitions for .enable., which is an option that does not exist' config.enable ./define-enable-abort.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 @@ -243,7 +246,7 @@ checkConfigError 'A definition for option .* is not of type .*' \ ## Freeform modules # Assigning without a declared option should work checkConfigOutput '^"24"$' config.value ./freeform-attrsOf.nix ./define-value-string.nix -# No freeform assigments shouldn't make it error +# No freeform assignments shouldn't make it error checkConfigOutput '^{ }$' config ./freeform-attrsOf.nix # but only if the type matches checkConfigError 'A definition for option .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix diff --git a/lib/tests/modules/define-enable-abort.nix b/lib/tests/modules/define-enable-abort.nix new file mode 100644 index 000000000000..85b58a567cad --- /dev/null +++ b/lib/tests/modules/define-enable-abort.nix @@ -0,0 +1,3 @@ +{ + config.enable = abort "oops"; +} diff --git a/lib/tests/modules/define-enable-throw.nix b/lib/tests/modules/define-enable-throw.nix new file mode 100644 index 000000000000..16a59b781dc5 --- /dev/null +++ b/lib/tests/modules/define-enable-throw.nix @@ -0,0 +1,3 @@ +{ + config.enable = throw "oops"; +} diff --git a/lib/tests/release.nix b/lib/tests/release.nix index b93a4236f91e..dbf6683d49a8 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -1,11 +1,11 @@ { # The pkgs used for dependencies for the testing itself # Don't test properties of pkgs.lib, but rather the lib in the parent directory - pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; } + pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; }, + nix ? pkgs.nix, }: pkgs.runCommand "nixpkgs-lib-tests" { buildInputs = [ - pkgs.nix (import ./check-eval.nix) (import ./maintainers.nix { inherit pkgs; @@ -15,9 +15,16 @@ pkgs.runCommand "nixpkgs-lib-tests" { inherit pkgs; lib = import ../.; }) + (import ../path/tests { + inherit pkgs; + }) ]; + nativeBuildInputs = [ + nix + ]; + strictDeps = true; } '' - datadir="${pkgs.nix}/share" + datadir="${nix}/share" export TEST_ROOT=$(pwd)/test-tmp export NIX_BUILD_HOOK= export NIX_CONF_DIR=$TEST_ROOT/etc diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 27c5ff565ca0..88e2e4206d56 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -16,12 +16,15 @@ with lib.systems.doubles; lib.runTests { testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ mmix ++ js ++ genode ++ redox); testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-netbsd" "armv6l-none" "armv7a-linux" "armv7a-netbsd" "armv7l-linux" "armv7l-netbsd" "arm-none" "armv7a-darwin" ]; + testarmv7 = mseteq armv7 [ "armv7a-darwin" "armv7a-linux" "armv7l-linux" "armv7a-netbsd" "armv7l-netbsd" ]; testi686 = mseteq i686 [ "i686-linux" "i686-freebsd13" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ]; testmips = mseteq mips [ "mips64el-linux" "mipsel-linux" "mipsel-netbsd" ]; testmmix = mseteq mmix [ "mmix-mmixware" ]; + testpower = mseteq power [ "powerpc-netbsd" "powerpc-none" "powerpc64-linux" "powerpc64le-linux" "powerpcle-none" ]; testriscv = mseteq riscv [ "riscv32-linux" "riscv64-linux" "riscv32-netbsd" "riscv64-netbsd" "riscv32-none" "riscv64-none" ]; testriscv32 = mseteq riscv32 [ "riscv32-linux" "riscv32-netbsd" "riscv32-none" ]; testriscv64 = mseteq riscv64 [ "riscv64-linux" "riscv64-netbsd" "riscv64-none" ]; + tests390x = mseteq s390x [ "s390x-linux" "s390x-none" ]; testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd13" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ]; testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]; diff --git a/lib/trivial.nix b/lib/trivial.nix index 70bc53016456..17e83d58b7d7 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -179,7 +179,7 @@ rec { they take effect as soon as the oldest release reaches end of life. */ oldestSupportedRelease = # Update on master only. Do not backport. - 2205; + 2211; /* Whether a feature is supported in all supported releases (at the time of release branch-off, if applicable). See `oldestSupportedRelease`. */ @@ -213,8 +213,8 @@ rec { # Default value to return if revision can not be determined default: let - revisionFile = ./.. + "/.git-revision"; - gitRepo = ./.. + "/.git"; + revisionFile = "${toString ./..}/.git-revision"; + gitRepo = "${toString ./..}/.git"; in if lib.pathIsGitRepo gitRepo then lib.commitIdFromGitRepo gitRepo else if lib.pathExists revisionFile then lib.fileContents revisionFile diff --git a/lib/types.nix b/lib/types.nix index 270ac1748c79..666e6502d161 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -54,7 +54,7 @@ let concatStringsSep escapeNixString hasInfix - isCoercibleToString + isStringLike ; inherit (lib.trivial) boolToString @@ -227,7 +227,7 @@ rec { merge = loc: defs: let getType = value: - if isAttrs value && isCoercibleToString value + if isAttrs value && isStringLike value then "stringCoercibleSet" else builtins.typeOf value; @@ -479,7 +479,7 @@ rec { path = mkOptionType { name = "path"; descriptionClass = "noun"; - check = x: isCoercibleToString x && builtins.substring 0 1 (toString x) == "/"; + check = x: isStringLike x && builtins.substring 0 1 (toString x) == "/"; merge = mergeEqualOption; }; @@ -558,7 +558,7 @@ rec { nestedTypes.elemType = elemType; }; - # TODO: drop this in the future: + # TODO: deprecate this in the future: loaOf = elemType: types.attrsOf elemType // { name = "loaOf"; deprecationMessage = "Mixing lists with attribute values is no longer" diff --git a/lib/versions.nix b/lib/versions.nix index 0e9d81ac78b1..986e7e5f9b37 100644 --- a/lib/versions.nix +++ b/lib/versions.nix @@ -46,4 +46,19 @@ rec { builtins.concatStringsSep "." (lib.take 2 (splitVersion v)); + /* Pad a version string with zeros to match the given number of components. + + Example: + pad 3 "1.2" + => "1.2.0" + pad 3 "1.3-rc1" + => "1.3.0-rc1" + pad 3 "1.2.3.4" + => "1.2.3" + */ + pad = n: version: let + numericVersion = lib.head (lib.splitString "-" version); + versionSuffix = lib.removePrefix numericVersion version; + in lib.concatStringsSep "." (lib.take n (lib.splitVersion numericVersion ++ lib.genList (_: "0") n)) + versionSuffix; + } diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 10642ff7bc50..8821e60af4b2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3,12 +3,13 @@ handle = { # Required name = "Your name"; - email = "address@example.org"; - # Optional + # Optional, but at least one of email, matrix or githubId must be given + email = "address@example.org"; matrix = "@user:example.org"; github = "GithubUsername"; githubId = your-github-id; + keys = [{ fingerprint = "AAAA BBBB CCCC DDDD EEEE FFFF 0000 1111 2222 3333"; }]; @@ -25,6 +26,9 @@ - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/`, - `keys` is a list of your PGP/GPG key fingerprints. + Specifying a GitHub account ensures that you automatically get a review request on + pull requests that modify a package for which you are a maintainer. + `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient. If `github` begins with a numeral, `handle` should be prefixed with an underscore. @@ -105,13 +109,11 @@ }; _1000teslas = { name = "Kevin Tran"; - email = "47207223+1000teslas@users.noreply.github.com"; github = "1000teslas"; githubId = 47207223; }; _2gn = { name = "Hiram Tanner"; - email = "101851090+2gn@users.noreply.github.com"; github = "2gn"; githubId = 101851090; }; @@ -121,6 +123,12 @@ githubId = 7414843; name = "Nicholas von Klitzing"; }; + _3JlOy-PYCCKUi = { + name = "3JlOy-PYCCKUi"; + email = "3jl0y_pycckui@riseup.net"; + github = "3JlOy-PYCCKUi"; + githubId = 46464602; + }; _360ied = { name = "Brian Zhu"; email = "therealbarryplayer@gmail.com"; @@ -186,6 +194,12 @@ githubId = 7755101; name = "Aaron Andersen"; }; + aaqaishtyaq = { + email = "aaqaishtyaq@gmail.com"; + github = "aaqaishtyaq"; + githubId = 22131756; + name = "Aaqa Ishtyaq"; + }; aaronjanse = { email = "aaron@ajanse.me"; matrix = "@aaronjanse:matrix.org"; @@ -552,6 +566,12 @@ githubId = 43479487; name = "Titouan Biteau"; }; + alekseysidorov = { + email = "sauron1987@gmail.com"; + github = "alekseysidorov"; + githubId = 83360; + name = "Aleksey Sidorov"; + }; alerque = { email = "caleb@alerque.com"; github = "alerque"; @@ -701,10 +721,10 @@ }]; }; alyaeanyx = { - email = "alexandra.hollmeier@mailbox.org"; + email = "alyaeanyx@mailbox.org"; github = "alyaeanyx"; githubId = 74795488; - name = "Alexandra Hollmeier"; + name = "alyaeanyx"; keys = [{ fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE"; }]; @@ -739,6 +759,12 @@ githubId = 2626481; name = "Ambroz Bizjak"; }; + ameer = { + name = "Ameer Taweel"; + email = "ameertaweel2002@gmail.com"; + github = "AmeerTaweel"; + githubId = 20538273; + }; amesgen = { email = "amesgen@amesgen.de"; github = "amesgen"; @@ -898,7 +924,6 @@ name = "Anders Sildnes"; }; andys8 = { - email = "andys8@users.noreply.github.com"; github = "andys8"; githubId = 13085980; name = "Andy"; @@ -1071,6 +1096,12 @@ githubId = 56009; name = "Arcadio Rubio García"; }; + archer-65 = { + email = "mario.liguori.056@gmail.com"; + github = "archer-65"; + githubId = 76066109; + name = "Mario Liguori"; + }; archseer = { email = "blaz@mxxn.io"; github = "archseer"; @@ -1078,7 +1109,6 @@ name = "Blaž Hrastnik"; }; arcnmx = { - email = "arcnmx@users.noreply.github.com"; github = "arcnmx"; githubId = 13426784; name = "arcnmx"; @@ -1306,6 +1336,12 @@ githubId = 55833; name = "Troels Henriksen"; }; + athre0z = { + email = "joel@zyantific.com"; + github = "athre0z"; + githubId = 6553158; + name = "Joel Höner"; + }; atila = { name = "Átila Saraiva"; email = "atilasaraiva@gmail.com"; @@ -1468,12 +1504,12 @@ }]; }; babariviere = { - email = "babathriviere@gmail.com"; + email = "me@babariviere.com"; github = "babariviere"; githubId = 12128029; name = "Bastien Rivière"; keys = [{ - fingerprint = "2F85 B362 B274 0012 37E2 81EE F202 AD3B 6EDF 4BD1"; + fingerprint = "74AA 9AB4 E6FF 872B 3C5A CB3E 3903 5CC0 B75D 1142"; }]; }; babbaj = { @@ -1591,6 +1627,16 @@ githubId = 45811; name = "Svein Ove Aas"; }; + Bauke = { + name = "Bauke"; + email = "me@bauke.xyz"; + matrix = "@baukexyz:matrix.org"; + github = "Bauke"; + githubId = 19501722; + keys = [{ + fingerprint = "C593 27B5 9D0F 2622 23F6 1D03 C1C0 F299 52BC F558"; + }]; + }; bb010g = { email = "me@bb010g.com"; matrix = "@bb010g:matrix.org"; @@ -1598,12 +1644,28 @@ githubId = 340132; name = "Brayden Banks"; }; + bb2020 = { + github = "bb2020"; + githubId = 19290397; + name = "Tunc Uzlu"; + }; bbarker = { email = "brandon.barker@gmail.com"; github = "bbarker"; githubId = 916366; name = "Brandon Elam Barker"; }; + bbenne10 = { + email = "Bryan.Bennett@protonmail.com"; + matrix = "@bryan.bennett:matrix.org"; + github = "bbenne10"; + githubId = 687376; + name = "Bryan Bennett"; + keys = [{ + # compare with https://keybase.io/bbenne10 + fingerprint = "41EA 00B4 00F9 6970 1CB2 D3AF EF90 E3E9 8B8F 5C0B"; + }]; + }; bbenno = { email = "nix@bbenno.com"; github = "bbenno"; @@ -1671,6 +1733,15 @@ githubId = 214787; name = "Herwig Hochleitner"; }; + benediktbroich = { + name = "Benedikt Broich"; + email = "b.broich@posteo.de"; + github = "BenediktBroich"; + githubId = 32903896; + keys = [{ + fingerprint = "CB5C 7B3C 3E6F 2A59 A583 A90A 8A60 0376 7BE9 5976"; + }]; + }; benesim = { name = "Benjamin Isbarn"; email = "benjamin.isbarn@gmail.com"; @@ -1680,6 +1751,15 @@ fingerprint = "D35E C9CE E631 638F F1D8 B401 6F0E 410D C3EE D02"; }]; }; + benjaminedwardwebb = { + name = "Ben Webb"; + email = "benjaminedwardwebb@gmail.com"; + github = "benjaminedwardwebb"; + githubId = 7118777; + keys = [{ + fingerprint = "E9A3 7864 2165 28CE 507C CA82 72EA BF75 C331 CD25"; + }]; + }; benley = { email = "benley@gmail.com"; github = "benley"; @@ -1713,12 +1793,6 @@ githubId = 442623; name = "Ben Pye"; }; - benwbooth = { - email = "benwbooth@gmail.com"; - github = "benwbooth"; - githubId = 75972; - name = "Ben Booth"; - }; berberman = { email = "berberman@yandex.com"; matrix = "@berberman:mozilla.org"; @@ -1726,6 +1800,15 @@ githubId = 26041945; name = "Potato Hatsue"; }; + berbiche = { + name = "Nicolas Berbiche"; + email = "nicolas@normie.dev"; + github = "berbiche"; + githubId = 20448408; + keys = [{ + fingerprint = "D446 E58D 87A0 31C7 EC15 88D7 B461 2924 45C6 E696"; + }]; + }; berce = { email = "bert.moens@gmail.com"; github = "berce"; @@ -1768,6 +1851,12 @@ githubId = 9730330; name = "Benoit de Chezelles"; }; + bezmuth = { + email = "benkel97@protonmail.com"; + name = "Ben Kelly"; + github = "bezmuth"; + githubId = 31394095; + }; bfortz = { email = "bernard.fortz@gmail.com"; github = "bfortz"; @@ -1945,6 +2034,12 @@ githubId = 1743184; name = "Boris Babić"; }; + borlaag = { + email = "borlaag@proton.me"; + github = "Borlaag"; + githubId = 114830266; + name = "Børlaag"; + }; bosu = { email = "boriss@gmail.com"; github = "bosu"; @@ -1957,6 +2052,12 @@ github = "bouk"; githubId = 97820; }; + bpaulin = { + email = "brunopaulin@bpaulin.net"; + github = "bpaulin"; + githubId = 115711; + name = "bpaulin"; + }; bradediger = { email = "brad@bradediger.com"; github = "bradediger"; @@ -2066,6 +2167,12 @@ githubId = 53131727; name = "Bryan Albuquerque"; }; + bryanhonof = { + name = "Bryan Honof"; + email = "bryanhonof@gmail.com"; + github = "bryanhonof"; + githubId = 5932804; + }; btlvr = { email = "btlvr@protonmail.com"; github = "btlvr"; @@ -2160,6 +2267,21 @@ } ]; }; + cafkafk = { + email = "christina@cafkafk.com"; + matrix = "@cafkafk:matrix.cafkafk.com"; + name = "Christina Sørensen"; + github = "cafkafk"; + githubId = 89321978; + keys = [ + { + fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; + } + { + fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED"; + } + ]; + }; calbrecht = { email = "christian.albrecht@mayflower.de"; github = "calbrecht"; @@ -2203,6 +2325,12 @@ githubId = 3212452; name = "Cameron Nemo"; }; + camillemndn = { + email = "camillemondon@free.fr"; + github = "camillemndn"; + githubId = 26444818; + name = "Camille M."; + }; campadrenalin = { email = "campadrenalin@gmail.com"; github = "campadrenalin"; @@ -2233,6 +2361,12 @@ github = "scaredmushroom"; githubId = 45340040; }; + CaptainJawZ = { + email = "CaptainJawZ@outlook.com"; + name = "Danilo Reyes"; + github = "CaptainJawZ"; + githubId = 43111068; + }; carlosdagos = { email = "m@cdagostino.io"; github = "carlosdagos"; @@ -2402,6 +2536,12 @@ githubId = 89596; name = "Florian Friesdorf"; }; + ChaosAttractor = { + email = "lostattractor@gmail.com"; + github = "LostAttractor"; + githubId = 46527539; + name = "ChaosAttractor"; + }; chekoopa = { email = "chekoopa@mail.ru"; github = "chekoopa"; @@ -2517,7 +2657,6 @@ }]; }; christophcharles = { - email = "23055925+christophcharles@users.noreply.github.com"; github = "christophcharles"; githubId = 23055925; name = "Christoph Charles"; @@ -2871,6 +3010,11 @@ githubId = 1573344; name = "Andrey Pavlov"; }; + cpcloud = { + name = "Phillip Cloud"; + github = "cpcloud"; + githubId = 417981; + }; cpages = { email = "page@ruiec.cat"; github = "cpages"; @@ -2989,6 +3133,15 @@ githubId = 16950437; name = "cwyc"; }; + cynerd = { + name = "Karel Kočí"; + email = "cynerd@email.cz"; + github = "Cynerd"; + githubId = 3811900; + keys = [{ + fingerprint = "2B1F 70F9 5F1B 48DA 2265 A7FA A6BC 8B8C EB31 659B"; + }]; + }; cyounkins = { name = "Craig Younkins"; email = "cyounkins@gmail.com"; @@ -3177,11 +3330,16 @@ name = "Daniel Șerbănescu"; }; datafoo = { - email = "34766150+datafoo@users.noreply.github.com"; github = "datafoo"; githubId = 34766150; name = "datafoo"; }; + davegallant = { + name = "Dave Gallant"; + email = "davegallant@gmail.com"; + github = "davegallant"; + githubId = 4519234; + }; davhau = { email = "d.hauer.it@gmail.com"; name = "David Hauer"; @@ -3234,6 +3392,12 @@ githubId = 798427; name = "Davor Babic"; }; + davsanchez = { + email = "davidslt+nixpkgs@pm.me"; + github = "davsanchez"; + githubId = 11422515; + name = "David Sánchez"; + }; dawidsowa = { email = "dawid_sowa@posteo.net"; github = "dawidsowa"; @@ -3288,6 +3452,15 @@ fingerprint = "4E35 F2E5 2132 D654 E815 A672 DB2C BC24 2868 6000"; }]; }; + deejayem = { + email = "nixpkgs.bu5hq@simplelogin.com"; + github = "deejayem"; + githubId = 2564003; + name = "David Morgan"; + keys = [{ + fingerprint = "9B43 6B14 77A8 79C2 6CDB 6604 C171 2510 02C2 00F2"; + }]; + }; deepfire = { email = "_deepfire@feelingofgreen.ru"; github = "deepfire"; @@ -3300,6 +3473,17 @@ githubId = 156239; name = "D Anzorge"; }; + deifactor = { + name = "Ash Zahlen"; + email = "ext0l@riseup.net"; + github = "deifactor"; + githubId = 30192992; + }; + deinferno = { + name = "deinferno"; + github = "deinferno"; + githubId = 14363193; + }; delan = { name = "Delan Azabani"; email = "delan@azabani.com"; @@ -3313,7 +3497,6 @@ githubId = 1153808; }; deliciouslytyped = { - email = "47436522+deliciouslytyped@users.noreply.github.com"; github = "deliciouslytyped"; githubId = 47436522; name = "deliciouslytyped"; @@ -3409,6 +3592,19 @@ githubId = 10042482; name = "Louis Pearson"; }; + detegr = { + name = "Antti Keränen"; + email = "detegr@rbx.email"; + github = "Detegr"; + githubId = 724433; + }; + Dettorer = { + name = "Paul Hervot"; + email = "paul.hervot@dettorer.net"; + matrix = "@dettorer:matrix.org"; + github = "Dettorer"; + githubId = 2761682; + }; devhell = { email = ''"^"@regexmail.net''; github = "devhell"; @@ -3433,6 +3629,12 @@ githubId = 579369; name = "Tuomas Tynkkynen"; }; + dfithian = { + email = "daniel.m.fithian@gmail.com"; + name = "Daniel Fithian"; + github = "dfithian"; + githubId = 8409320; + }; dfordivam = { email = "dfordivam+nixpkgs@gmail.com"; github = "dfordivam"; @@ -3470,7 +3672,6 @@ name = "David Leung"; }; DianaOlympos = { - email = "DianaOlympos@noreply.github.com"; github = "DianaOlympos"; githubId = 15774340; name = "Thomas Depierre"; @@ -3495,7 +3696,6 @@ }; diogox = { name = "Diogo Xavier"; - email = "13244408+diogox@users.noreply.github.com"; github = "diogox"; githubId = 13244408; }; @@ -3625,6 +3825,15 @@ githubId = 126339; name = "Domen Kozar"; }; + DomesticMoth = { + name = "Andrew"; + email = "silkmoth@protonmail.com"; + github = "DomesticMoth"; + githubId = 91414737; + keys = [{ + fingerprint = "7D6B AE0A A98A FDE9 3396 E721 F87E 15B8 3AA7 3087"; + }]; + }; dominikh = { email = "dominik@honnef.co"; github = "dominikh"; @@ -3653,12 +3862,6 @@ fingerprint = "A8DF 1326 9E5D 9A38 E57C FAC2 9D20 F650 3E33 8888"; }]; }; - doublec = { - email = "chris.double@double.co.nz"; - github = "doublec"; - githubId = 16599; - name = "Chris Double"; - }; dpaetzel = { email = "david.paetzel@posteo.de"; github = "dpaetzel"; @@ -3674,6 +3877,12 @@ fingerprint = "4749 0887 CF3B 85A1 6355 C671 78C7 DD40 DF23 FB16"; }]; }; + DPDmancul = { + name = "Davide Peressoni"; + email = "davide.peressoni@tuta.io"; + matrix = "@dpd-:matrix.org"; + githubId = 3186857; + }; dpercy = { email = "dpercy@dpercy.dev"; github = "dpercy"; @@ -3711,7 +3920,6 @@ name = "Dominik Ritter"; }; drperceptron = { - email = "92106371+drperceptron@users.noreply.github.com"; github = "drperceptron"; githubId = 92106371; name = "Dr Perceptron"; @@ -3811,11 +4019,15 @@ githubId = 15128988; name = "Maksim Dzabraev"; }; - e-user = { - email = "nixos@sodosopa.io"; - github = "outergod"; - githubId = 93086; - name = "Alexander Kahl"; + e1mo = { + email = "nixpkgs@e1mo.de"; + matrix = "@e1mo:chaos.jetzt"; + github = "e1mo"; + githubId = 61651268; + name = "Moritz Fromm"; + keys = [{ + fingerprint = "67BE E563 43B6 420D 550E DF2A 6D61 7FD0 A85B AADA"; + }]; }; eadwu = { email = "edmund.wu@protonmail.com"; @@ -3893,6 +4105,16 @@ github = "edlimerkaj"; githubId = 71988351; }; + edrex = { + email = "ericdrex@gmail.com"; + github = "edrex"; + githubId = 14615; + keys = [{ + fingerprint = "AC47 2CCC 9867 4644 A9CF EB28 1C5C 1ED0 9F66 6824"; + }]; + matrix = "@edrex:matrix.org"; + name = "Eric Drechsel"; + }; ehllie = { email = "me@ehllie.xyz"; github = "ehllie"; @@ -4026,6 +4248,12 @@ githubId = 103082; name = "Ed Brindley"; }; + eliandoran = { + email = "contact@eliandoran.me"; + name = "Elian Doran"; + github = "eliandoran"; + githubId = 21236836; + }; elizagamedev = { email = "eliza@eliza.sh"; github = "elizagamedev"; @@ -4081,6 +4309,12 @@ githubId = 5300871; name = "Leon Kowarschick"; }; + elnudev = { + email = "elnu@elnu.com"; + github = "elnudev"; + githubId = 9874955; + name = "Elnu"; + }; elohmeier = { email = "elo-nixos@nerdworks.de"; github = "elohmeier"; @@ -4093,6 +4327,12 @@ githubId = 1365692; name = "Will Fancher"; }; + emattiza = { + email = "nix@mattiza.dev"; + github = "emattiza"; + githubId = 11719476; + name = "Evan Mattiza"; + }; emmabastas = { email = "emma.bastas@protonmail.com"; matrix = "@emmabastas:matrix.org"; @@ -4132,7 +4372,6 @@ name = "Ente"; }; Enzime = { - email = "enzime@users.noreply.github.com"; github = "Enzime"; githubId = 10492681; name = "Michael Hoang"; @@ -4263,7 +4502,6 @@ name = "Ertugrul Söylemez"; }; esclear = { - email = "esclear@users.noreply.github.com"; github = "esclear"; githubId = 7432848; name = "Daniel Albert"; @@ -4467,6 +4705,12 @@ githubId = 225893; name = "James Cook"; }; + farcaller = { + name = "Vladimir Pouzanov"; + email = "farcaller@gmail.com"; + github = "farcaller"; + githubId = 693; + }; fare = { email = "fahree@gmail.com"; github = "fare"; @@ -4509,6 +4753,16 @@ githubId = 541748; name = "Felipe Espinoza"; }; + federicoschonborn = { + name = "Federico Damián Schonborn"; + email = "fdschonborn@gmail.com"; + github = "FedericoSchonborn"; + githubId = 62166915; + matrix = "@FedericoDSchonborn:matrix.org"; + keys = [ + { fingerprint = "517A 8A6A 09CA A11C 9667 CEE3 193F 70F1 5C9A B0A0"; } + ]; + }; fedx-sudo = { email = "fedx-sudo@pm.me"; github = "FedX-sudo"; @@ -4530,10 +4784,11 @@ }; felipeqq2 = { name = "Felipe Silva"; - email = "felipeqq2@outlook.com"; + email = "nixpkgs@felipeqq2.rocks"; github = "felipeqq2"; githubId = 71830138; keys = [{ fingerprint = "F5F0 2BCE 3580 BF2B 707A AA8C 2FD3 4A9E 2671 91B8"; }]; + matrix = "@felipeqq2:pub.solar"; }; felixscheinost = { name = "Felix Scheinost"; @@ -4654,7 +4909,6 @@ name = "Florian Klink"; }; florentc = { - email = "florentc@users.noreply.github.com"; github = "florentc"; githubId = 1149048; name = "Florent Ch."; @@ -4756,13 +5010,18 @@ githubId = 84968; name = "Florian Paul Schmidt"; }; - fragamus = { email = "innovative.engineer@gmail.com"; github = "fragamus"; githubId = 119691; name = "Michael Gough"; }; + franzmondlichtmann = { + name = "Franz Schroepf"; + email = "franz-schroepf@t-online.de"; + github = "franzmondlichtmann"; + githubId = 105480088; + }; freax13 = { email = "erbse.13@gmx.de"; github = "Freax13"; @@ -4776,7 +5035,6 @@ name = "Frede Emil"; }; freezeboy = { - email = "freezeboy@users.noreply.github.com"; github = "freezeboy"; githubId = 13279982; name = "freezeboy"; @@ -4853,6 +5111,12 @@ githubId = 36706276; name = "Fufezan Mihai"; }; + fugi = { + email = "me@fugi.dev"; + github = "FugiMuffi"; + githubId = 21362942; + name = "Fugi"; + }; fusion809 = { email = "brentonhorne77@gmail.com"; github = "fusion809"; @@ -4877,6 +5141,13 @@ githubId = 3036816; name = "Edgar Aroutiounian"; }; + fzakaria = { + name = "Farid Zakaria"; + email = "farid.m.zakaria@gmail.com"; + matrix = "@fzakaria:matrix.org"; + github = "fzakaria"; + githubId = 605070; + }; gabesoft = { email = "gabesoft@gmail.com"; github = "gabesoft"; @@ -5035,6 +5306,15 @@ githubId = 3217744; name = "Peter Ferenczy"; }; + ggwpaiushtha = { + name = "Ivan"; + email = "ggwpaiushtha@gmail.com"; + github = "GGwpAiushtha"; + githubId = 6987136; + keys = [{ + fingerprint = "2C6D 37D4 6AA1 DCDA BE8D F346 43E2 CF4C 01B9 4940"; + }]; + }; ghostbuster91 = { name = "Kasper Kondzielski"; email = "kghost0@gmail.com"; @@ -5053,6 +5333,12 @@ githubId = 15957973; name = "Jeffry Molanus"; }; + gilice = { + email = "gilice@proton.me"; + github = "gilice"; + githubId = 104317939; + name = "gilice"; + }; gilligan = { email = "tobias.pflug@gmail.com"; github = "gilligan"; @@ -5077,6 +5363,12 @@ githubId = 60962839; name = "Mazen Zahr"; }; + gkleen = { + name = "Gregor Kleen"; + email = "xpnfr@bouncy.email"; + github = "gkleen"; + githubId = 20089782; + }; gleber = { email = "gleber.p@gmail.com"; github = "gleber"; @@ -5128,6 +5420,15 @@ githubId = 643494; name = "Cillian de Róiste"; }; + GoldsteinE = { + email = "root@goldstein.rs"; + github = "GoldsteinE"; + githubId = 12019211; + name = "Maximilian Siling"; + keys = [{ + fingerprint = "0BAF 2D87 CB43 746F 6237 2D78 DE60 31AB A0BB 269A"; + }]; + }; Gonzih = { email = "gonzih@gmail.com"; github = "Gonzih"; @@ -5149,6 +5450,12 @@ fingerprint = "C006 B8A0 0618 F3B6 E0E4 2ECD 5D47 2848 30FA A4FA"; }]; }; + gotcha = { + email = "gotcha@bubblenet.be"; + github = "gotcha"; + githubId = 105204; + name = "Godefroid Chapelle"; + }; govanify = { name = "Gauvain 'GovanifY' Roussel-Tarbouriech"; email = "gauvain@govanify.com"; @@ -5306,7 +5613,6 @@ name = "Guillaume Koenig"; }; guserav = { - email = "guserav@users.noreply.github.com"; github = "guserav"; githubId = 28863828; name = "guserav"; @@ -5413,6 +5719,12 @@ fingerprint = "3F35 E4CA CBF4 2DE1 2E90 53E5 03A6 E6F7 8693 6619"; }]; }; + harrisonthorne = { + email = "harrisonthorne@proton.me"; + github = "harrisonthorne"; + githubId = 33523827; + name = "Harrison Thorne"; + }; harvidsen = { email = "harvidsen@gmail.com"; github = "harvidsen"; @@ -5502,6 +5814,12 @@ matrix = "@chris:netsoj.nl"; name = "Chris Josten"; }; + henkery = { + email = "jim@reupload.nl"; + github = "henkery"; + githubId = 1923309; + name = "Jim van Abkoude"; + }; henrikolsson = { email = "henrik@fixme.se"; github = "henrikolsson"; @@ -5611,12 +5929,28 @@ github = "thbkrshw"; githubId = 33122; }; + hloeffler = { + name = "Hauke Löffler"; + email = "nix@hauke-loeffler.de"; + github = "hloeffler"; + githubId = 6627191; + }; hlolli = { email = "hlolli@gmail.com"; github = "hlolli"; githubId = 6074754; name = "Hlodver Sigurdsson"; }; + hmenke = { + name = "Henri Menke"; + email = "henri@henrimenke.de"; + matrix = "@hmenke:matrix.org"; + github = "hmenke"; + githubId = 1903556; + keys = [{ + fingerprint = "F1C5 760E 45B9 9A44 72E9 6BFB D65C 9AFB 4C22 4DA3"; + }]; + }; huantian = { name = "David Li"; email = "davidtianli@gmail.com"; @@ -5734,6 +6068,15 @@ githubId = 15371828; name = "Hugo Lageneste"; }; + huyngo = { + email = "huyngo@disroot.org"; + github = "Huy-Ngo"; + name = "Ngô Ngọc Đức Huy"; + githubId = 19296926; + keys = [{ + fingerprint = "DF12 23B1 A9FD C5BE 3DA5 B6F7 904A F1C7 CDF6 95C3"; + }]; + }; hypersw = { email = "baltic@hypersw.net"; github = "hypersw"; @@ -5774,7 +6117,6 @@ name = "Imran Hossain"; }; iagoq = { - email = "18238046+iagocq@users.noreply.github.com"; github = "iagocq"; githubId = 18238046; name = "Iago Manoel Brito"; @@ -5842,7 +6184,6 @@ name = "Dominic Steinitz"; }; ifurther = { - email = "55025025+ifurther@users.noreply.github.com"; github = "ifurther"; githubId = 55025025; name = "Feather Lin"; @@ -5884,6 +6225,13 @@ githubId = 40234257; name = "ilkecan bozdogan"; }; + imincik = { + email = "ivan.mincik@gmail.com"; + matrix = "@imincik:matrix.org"; + github = "imincik"; + githubId = 476346; + name = "Ivan Mincik"; + }; not-my-segfault = { email = "michal@tar.black"; matrix = "@michal:tar.black"; @@ -5980,12 +6328,24 @@ githubId = 4085046; name = "Imuli"; }; + inclyc = { + email = "i@lyc.dev"; + github = "inclyc"; + githubId = 36667224; + name = "Yingchi Long"; + }; ineol = { email = "leo.stefanesco@gmail.com"; github = "ineol"; githubId = 37965; name = "Léo Stefanesco"; }; + indeednotjames = { + email = "nix@indeednotjames.com"; + github = "IndeedNotJames"; + githubId = 55066419; + name = "Emily Lange"; + }; infinidoge = { name = "Infinidoge"; email = "infinidoge@inx.moe"; @@ -6080,7 +6440,6 @@ }]; }; ivankovnatsky = { - email = "75213+ivankovnatsky@users.noreply.github.com"; github = "ivankovnatsky"; githubId = 75213; name = "Ivan Kovnatsky"; @@ -6158,6 +6517,12 @@ fingerprint = "B982 0250 1720 D540 6A18 2DA8 188E 4945 E85B 2D21"; }]; }; + jali-clarke = { + email = "jinnah.ali-clarke@outlook.com"; + name = "Jinnah Ali-Clarke"; + github = "jali-clarke"; + githubId = 17733984; + }; jasoncarr = { email = "jcarr250@gmail.com"; github = "jasoncarr0"; @@ -6242,6 +6607,13 @@ githubId = 20176306; name = "jammerful"; }; + janik = { + name = "Janik"; + email = "janik@aq0.de"; + matrix = "@janik0:matrix.org"; + github = "Janik-Haag"; + githubId = 80165193; + }; jansol = { email = "jan.solanti@paivola.fi"; github = "jansol"; @@ -6291,6 +6663,13 @@ githubId = 221929; name = "Jean-Baptiste Giraudeau"; }; + jboy = { + email = "jboy+nixos@bius.moe"; + githubId = 2187261; + github = "jboynyc"; + matrix = "@jboy:utwente.io"; + name = "John Boy"; + }; jc = { name = "Josh Cooper"; email = "josh@cooper.is"; @@ -6508,6 +6887,12 @@ githubId = 6445082; name = "Joseph Lukasik"; }; + jhh = { + email = "jeff@j3ff.io"; + github = "jhh"; + githubId = 14412; + name = "Jeff Hutchison"; + }; jhhuh = { email = "jhhuh.note@gmail.com"; github = "jhhuh"; @@ -6666,6 +7051,11 @@ githubId = 3967312; name = "Jocelyn Thode"; }; + joedevivo = { + github = "joedevivo"; + githubId = 55951; + name = "Joe DeVivo"; + }; joelancaster = { email = "joe.a.lancas@gmail.com"; github = "JoeLancaster"; @@ -6678,6 +7068,12 @@ githubId = 310981; name = "Joel Burget"; }; + joelkoen = { + email = "mail@joelkoen.com"; + github = "joelkoen"; + githubId = 122502655; + name = "Joel Koen"; + }; joelmo = { email = "joel.moberg@gmail.com"; github = "joelmo"; @@ -6812,6 +7208,12 @@ githubId = 7673602; name = "Jonathan Ringer"; }; + jordanisaacs = { + name = "Jordan Isaacs"; + email = "nix@jdisaacs.com"; + github = "jordanisaacs"; + githubId = 19742638; + }; jorise = { email = "info@jorisengbers.nl"; github = "JorisE"; @@ -6836,6 +7238,12 @@ githubId = 15893072; name = "Josh van Leeuwen"; }; + jpagex = { + name = "Jérémy Pagé"; + email = "contact@jeremypage.me"; + github = "jpagex"; + githubId = 635768; + }; jpas = { name = "Jarrod Pas"; email = "jarrod@jarrodpas.com"; @@ -7062,12 +7470,6 @@ githubId = 20658981; name = "Jarosław Wygoda"; }; - jyooru = { - email = "joel@joel.tokyo"; - github = "jyooru"; - githubId = 63786778; - name = "Joel"; - }; jyp = { email = "jeanphilippe.bernardy@gmail.com"; github = "jyp"; @@ -7313,6 +7715,11 @@ githubId = 44045911; name = "Kid"; }; + kidsan = { + github = "kidsan"; + githubId = 8798449; + name = "kidsan"; + }; kierdavis = { email = "kierdavis@gmail.com"; github = "kierdavis"; @@ -7404,6 +7811,12 @@ github = "kjeremy"; githubId = 4325700; }; + kkharji = { + name = "kkharji"; + email = "kkharji@protonmail.com"; + github = "kkharji"; + githubId = 65782666; + }; klden = { name = "Kenzyme Le"; email = "kl@kenzymele.com"; @@ -7577,6 +7990,12 @@ githubId = 17659803; name = "Matthias Axel Kröll"; }; + krostar = { + email = "alexis.destrez@pm.me"; + github = "krostar"; + githubId = 5759930; + name = "Alexis Destrez"; + }; kristian-brucaj = { email = "kbrucaj@gmail.com"; github = "Kristian-Brucaj"; @@ -7619,6 +8038,12 @@ githubId = 2943605; name = "Evgeny Kurnevsky"; }; + kuwii = { + name = "kuwii"; + email = "kuwii.someone@gmail.com"; + github = "kuwii"; + githubId = 10705175; + }; kuznero = { email = "roman@kuznero.com"; github = "kuznero"; @@ -7683,6 +8108,15 @@ }]; name = "Yaroslav Bolyukin"; }; + lafrenierejm = { + email = "joseph@lafreniere.xyz"; + github = "lafrenierejm"; + githubId = 11155300; + keys = [{ + fingerprint = "0375 DD9A EDD1 68A3 ADA3 9EBA EE23 6AA0 141E FCA3"; + }]; + name = "Joseph LaFreniere"; + }; laikq = { email = "gwen@quasebarth.de"; github = "laikq"; @@ -7828,6 +8262,15 @@ fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451"; }]; }; + leifhelm = { + email = "jakob.leifhelm@gmail.com"; + github = "leifhelm"; + githubId = 31693262; + name = "Jakob Leifhelm"; + keys =[{ + fingerprint = "4A82 F68D AC07 9FFD 8BF0 89C4 6817 AA02 3810 0822"; + }]; + }; leixb = { email = "abone9999+nixpkgs@gmail.com"; matrix = "@leix_b:matrix.org"; @@ -8045,6 +8488,12 @@ fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A"; }]; }; + lorenz = { + name = "Lorenz Brun"; + email = "lorenz@brun.one"; + github = "lorenz"; + githubId = 5228892; + }; lorenzleutgeb = { email = "lorenz@leutgeb.xyz"; github = "lorenzleutgeb"; @@ -8161,6 +8610,13 @@ githubId = 4969294; name = "Louis Tim Larsen"; }; + loveisgrief = { + name = "LoveIsGrief"; + email = "loveisgrief@tuta.io"; + keys = [{ + fingerprint = "9847 4F48 18C6 4E0A F0C5 3529 E96D 1EDF A053 45EB"; + }]; + }; lovek323 = { email = "jason@oconal.id.au"; github = "lovek323"; @@ -8368,6 +8824,15 @@ githubId = 42545625; name = "Maas Lalani"; }; + macalinao = { + email = "me@ianm.com"; + name = "Ian Macalinao"; + github = "macalinao"; + githubId = 401263; + keys = [{ + fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; + }]; + }; maddiethecafebabe = { email = "maddie@cafebabe.date"; github = "maddiethecafebabe"; @@ -8540,7 +9005,6 @@ githubId = 22586596; }; marsam = { - email = "marsam@users.noreply.github.com"; github = "marsam"; githubId = 65531; name = "Mario Rodas"; @@ -8584,6 +9048,12 @@ fingerprint = "B573 5118 0375 A872 FBBF 7770 B629 036B E399 EEE9"; }]; }; + masaeedu = { + email = "masaeedu@gmail.com"; + github = "masaeedu"; + githubId = 3674056; + name = "Asad Saeeduddin"; + }; masipcat = { email = "jordi@masip.cat"; github = "masipcat"; @@ -8614,6 +9084,12 @@ githubId = 322214; name = "Mathnerd314"; }; + math-42 = { + email = "matheus.4200@gmail.com"; + github = "Math-42"; + githubId = 43853194; + name = "Matheus Vieira"; + }; matklad = { email = "aleksey.kladov@gmail.com"; github = "matklad"; @@ -8638,6 +9114,12 @@ githubId = 952712; name = "Matt Christ"; }; + matthewcroughan = { + email = "matt@croughan.sh"; + github = "MatthewCroughan"; + githubId = 26458780; + name = "Matthew Croughan"; + }; matthewbauer = { email = "mjbauer95@gmail.com"; github = "matthewbauer"; @@ -8759,6 +9241,12 @@ githubId = 4141584; name = "Maxime Daniel"; }; + maxwell-lt = { + email = "maxwell.lt@live.com"; + github = "maxwell-lt"; + githubId = 17859747; + name = "Maxwell L-T"; + }; maxxk = { email = "maxim.krivchikov@gmail.com"; github = "maxxk"; @@ -8778,7 +9266,6 @@ name = "Mateusz Mazur"; }; mbaeten = { - email = "mbaeten@users.noreply.github.com"; github = "mbaeten"; githubId = 2649304; name = "M. Baeten"; @@ -8885,6 +9372,12 @@ fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; }]; }; + mdr = { + email = "MattRussellUK@gmail.com"; + github = "mdr"; + githubId = 241257; + name = "Matt Russell"; + }; meain = { email = "mail@meain.io"; matrix = "@meain:matrix.org"; @@ -8922,11 +9415,11 @@ githubId = 365721; name = "Francois Truphemus"; }; - melsigl = { - email = "melanie.bianca.sigl@gmail.com"; - github = "melsigl"; - githubId = 15093162; - name = "Melanie B. Sigl"; + melias122 = { + name = "Martin Elias"; + email = "martin+nixpkgs@elias.sx"; + github = "melias122"; + githubId = 1027766; }; melkor333 = { email = "samuel@ton-kunst.ch"; @@ -8934,6 +9427,18 @@ githubId = 6412377; name = "Samuel Ruprecht"; }; + melling = { + email = "mattmelling@fastmail.com"; + github = "mattmelling"; + githubId = 1215331; + name = "Matt Melling"; + }; + melsigl = { + email = "melanie.bianca.sigl@gmail.com"; + github = "melsigl"; + githubId = 15093162; + name = "Melanie B. Sigl"; + }; kira-bruneau = { email = "kira.bruneau@pm.me"; name = "Kira Bruneau"; @@ -8990,7 +9495,6 @@ name = "Maximilian Güntner"; }; mh = { - email = "68288772+markus-heinrich@users.noreply.github.com"; github = "markus-heinrich"; githubId = 68288772; name = "Markus Heinrich"; @@ -9008,7 +9512,6 @@ name = "Max Hofer"; }; miangraham = { - email = "miangraham@users.noreply.github.com"; github = "miangraham"; githubId = 704580; name = "M. Ian Graham"; @@ -9033,6 +9536,12 @@ githubId = 1575834; name = "Michael Adler"; }; + michaelBelsanti = { + email = "mbels03@protonmail.com"; + name = "Mike Belsanti"; + github = "michaelBelsanti"; + githubId = 62124625; + }; michaelpj = { email = "michaelpj@gmail.com"; github = "michaelpj"; @@ -9197,6 +9706,12 @@ githubId = 1776903; name = "Andrew Abbott"; }; + mislavzanic = { + email = "mislavzanic3@gmail.com"; + github = "mislavzanic"; + githubId = 48838244; + name = "Mislav Zanic"; + }; misterio77 = { email = "eu@misterio.me"; github = "Misterio77"; @@ -9207,6 +9722,12 @@ fingerprint = "7088 C742 1873 E0DB 97FF 17C2 245C AB70 B4C2 25E9"; }]; }; + misuzu = { + email = "bakalolka@gmail.com"; + github = "misuzu"; + githubId = 248143; + name = "misuzu"; + }; mitchmindtree = { email = "mail@mitchellnordine.com"; github = "mitchmindtree"; @@ -9271,6 +9792,12 @@ fingerprint = "64BE BF11 96C3 DD7A 443E 8314 1DC0 82FA DE5B A863"; }]; }; + mlatus = { + email = "wqseleven@gmail.com"; + github = "Ninlives"; + githubId = 17873203; + name = "mlatus"; + }; mlieberman85 = { email = "mlieberman85@gmail.com"; github = "mlieberman85"; @@ -9279,7 +9806,6 @@ }; mlvzk = { name = "mlvzk"; - email = "mlvzk@users.noreply.github.com"; github = "mlvzk"; githubId = 44906333; }; @@ -9296,7 +9822,6 @@ name = "Henri Bourcereau"; }; mmesch = { - email = "mmesch@noreply.github.com"; github = "MMesch"; githubId = 2597803; name = "Matthias Meschede"; @@ -9372,6 +9897,15 @@ githubId = 249317; name = "montag451"; }; + montchr = { + name = "Chris Montgomery"; + email = "chris@cdom.io"; + github = "montchr"; + githubId = 1757914; + keys = [{ + fingerprint = "6460 4147 C434 F65E C306 A21F 135E EDD0 F719 34F3"; + }]; + }; moosingin3space = { email = "moosingin3space@gmail.com"; github = "moosingin3space"; @@ -9588,6 +10122,16 @@ githubId = 5047140; name = "Victor Collod"; }; + munksgaard = { + name = "Philip Munksgaard"; + email = "philip@munksgaard.me"; + github = "munksgaard"; + githubId = 230613; + matrix = "@philip:matrix.munksgaard.me"; + keys = [{ + fingerprint = "5658 4D09 71AF E45F CC29 6BD7 4CE6 2A90 EFC0 B9B2"; + }]; + }; muscaln = { email = "muscaln@protonmail.com"; github = "muscaln"; @@ -9635,6 +10179,12 @@ githubId = 43796009; name = "Max Wilson"; }; + myaats = { + email = "mats@mats.sh"; + github = "Myaats"; + githubId = 6295090; + name = "Mats"; + }; myrl = { email = "myrl.0xf@gmail.com"; github = "Myrl"; @@ -9653,6 +10203,21 @@ githubId = 6783654; name = "Nadrieril Feneanar"; }; + nagisa = { + name = "Simonas Kazlauskas"; + email = "nixpkgs@kazlauskas.me"; + github = "nagisa"; + githubId = 679122; + }; + nagy = { + email = "danielnagy@posteo.de"; + github = "nagy"; + githubId = 692274; + name = "Daniel Nagy"; + keys = [{ + fingerprint = "F6AE 2C60 9196 A1BC ECD8 7108 1B8E 8DCB 576F B671"; + }]; + }; nalbyuites = { email = "ashijit007@gmail.com"; github = "nalbyuites"; @@ -9666,7 +10231,6 @@ name = "Roman Naumann"; }; naphta = { - email = "naphta@noreply.github.com"; github = "naphta"; githubId = 6709831; name = "Jake Hill"; @@ -9680,6 +10244,11 @@ fingerprint = "7A10 AB8E 0BEC 566B 090C 9BE3 D812 6E55 9CE7 C35D"; }]; }; + nat-418 = { + github = "nat-418"; + githubId = 93013864; + name = "nat-418"; + }; nathanruiz = { email = "nathanruiz@protonmail.com"; github = "nathanruiz"; @@ -9693,7 +10262,6 @@ name = "Nathan Bijnens"; }; nathyong = { - email = "nathyong@noreply.github.com"; github = "nathyong"; githubId = 818502; name = "Nathan Yong"; @@ -9715,7 +10283,6 @@ }; nazarewk = { name = "Krzysztof Nazarewski"; - email = "3494992+nazarewk@users.noreply.github.com"; matrix = "@nazarewk:matrix.org"; github = "nazarewk"; githubId = 3494992; @@ -9724,7 +10291,6 @@ }]; }; nbr = { - email = "nbr@users.noreply.github.com"; github = "nbr"; githubId = 3819225; name = "Nick Braga"; @@ -9757,6 +10323,12 @@ githubId = 137805; name = "Alexander Tsvyashchenko"; }; + nebulka = { + email = "arapun@proton.me"; + github = "nebulka1"; + githubId = 121920704; + name = "Nebulka"; + }; Necior = { email = "adrian@sadlocha.eu"; github = "Necior"; @@ -9882,6 +10454,18 @@ githubId = 6391776; name = "Nikita Voloboev"; }; + nikstur = { + email = "nikstur@outlook.com"; + name = "nikstur"; + github = "nikstur"; + githubId = 61635709; + }; + ngerstle = { + name = "Nicholas Gerstle"; + email = "ngerstle@gmail.com"; + github = "ngerstle"; + githubId = 1023752; + }; ngiger = { email = "niklaus.giger@member.fsf.org"; github = "ngiger"; @@ -9955,6 +10539,12 @@ fingerprint = "E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564"; }]; }; + nigelgbanks = { + name = "Nigel Banks"; + email = "nigel.g.banks@gmail.com"; + github = "nigelgbanks"; + githubId = 487373; + }; NikolaMandic = { email = "nikola@mandic.email"; github = "NikolaMandic"; @@ -9986,15 +10576,6 @@ githubId = 1219785; name = "Félix Baylac-Jacqué"; }; - ninjin = { - email = "pontus@stenetorp.se"; - github = "ninjin"; - githubId = 354934; - name = "Pontus Stenetorp"; - keys = [{ - fingerprint = "0966 2F9F 3FDA C22B C22E 4CE1 D430 2875 00E6 483C"; - }]; - }; nioncode = { email = "nioncode+github@gmail.com"; github = "nioncode"; @@ -10012,7 +10593,6 @@ }; nitsky = { name = "nitsky"; - email = "492793+nitsky@users.noreply.github.com"; github = "nitsky"; githubId = 492793; }; @@ -10129,12 +10709,24 @@ githubId = 6052922; name = "Kirill Struokov"; }; + novenary = { + email = "streetwalkermc@gmail.com"; + github = "9ary"; + githubId = 1155030; + name = "novenary"; + }; np = { email = "np.nix@nicolaspouillard.fr"; github = "np"; githubId = 5548; name = "Nicolas Pouillard"; }; + npatsakula = { + email = "nikita.patsakula@gmail.com"; + name = "Patsakula Nikita"; + github = "npatsakula"; + githubId = 23001619; + }; nphilou = { email = "nphilou@gmail.com"; github = "nphilou"; @@ -10148,6 +10740,12 @@ githubId = 34083928; name = "Tim DeHerrera"; }; + nrhelmi = { + email = "helmiinour@gmail.com"; + github = "nrhelmi"; + githubId = 15707703; + name = "Helmi Nour"; + }; nshalman = { email = "nahamu@gmail.com"; github = "nshalman"; @@ -10317,7 +10915,6 @@ name = "Ole Jørgen Brønner"; }; ollieB = { - email = "1237862+oliverbunting@users.noreply.github.com"; github = "oliverbunting"; githubId = 1237862; name = "Ollie Bunting"; @@ -10335,7 +10932,6 @@ name = "Owen Lynch"; }; omasanori = { - email = "167209+omasanori@users.noreply.github.com"; github = "omasanori"; githubId = 167209; name = "Masanori Ogino"; @@ -10490,6 +11086,12 @@ githubId = 15930073; name = "Moritz Scheuren"; }; + ovlach = { + email = "ondrej@vlach.xyz"; + name = "Ondrej Vlach"; + github = "ovlach"; + githubId = 4405107; + }; ozkutuk = { email = "ozkutuk@protonmail.com"; github = "ozkutuk"; @@ -10658,6 +11260,12 @@ githubId = 84886; name = "Paul Baecher"; }; + pbar = { + email = "piercebartine@gmail.com"; + github = "pbar1"; + githubId = 26949935; + name = "Pierce Bartine"; + }; pbogdan = { email = "ppbogdan@gmail.com"; github = "pbogdan"; @@ -10787,6 +11395,16 @@ fingerprint = "5D69 CF04 B7BC 2BC1 A567 9267 00BC F29B 3208 0700"; }]; }; + phdcybersec = { + name = "Léo Lavaur"; + email = "phdcybersec@pm.me"; + + github = "phdcybersec"; + githubId = 82591009; + keys = [{ + fingerprint = "7756 E88F 3C6A 47A5 C5F0 CDFB AB54 6777 F93E 20BF"; + }]; + }; phfroidmont = { name = "Paul-Henri Froidmont"; email = "nix.contact-j9dw4d@froidmont.org"; @@ -10894,6 +11512,12 @@ fingerprint = "D03B 218C AE77 1F77 D7F9 20D9 823A 6154 4264 08D3"; }]; }; + piperswe = { + email = "contact@piperswe.me"; + github = "piperswe"; + githubId = 1830959; + name = "Piper McCorkle"; + }; pjbarnoy = { email = "pjbarnoy@gmail.com"; github = "pjbarnoy"; @@ -10912,6 +11536,12 @@ githubId = 3737; name = "Peter Jones"; }; + phip1611 = { + email = "phip1611@gmail.com"; + github = "phip1611"; + githubId = 5737016; + name = "Philipp Schuster"; + }; pkharvey = { email = "kayharvey@protonmail.com"; github = "pkharvey"; @@ -11079,7 +11709,6 @@ githubId = 51489; }; polykernel = { - email = "81340136+polykernel@users.noreply.github.com"; github = "polykernel"; githubId = 81340136; name = "polykernel"; @@ -11102,6 +11731,18 @@ githubId = 138074; name = "Pedro Pombeiro"; }; + pongo1231 = { + email = "pongo1999712@gmail.com"; + github = "pongo1231"; + githubId = 4201956; + name = "pongo1231"; + }; + portothree = { + name = "Gustavo Porto"; + email = "gus@p8s.co"; + github = "portothree"; + githubId = 3718120; + }; poscat = { email = "poscat@mail.poscat.moe"; github = "poscat0x04"; @@ -11156,6 +11797,16 @@ githubId = 228931; name = "Philipp Riegger"; }; + princemachiavelli = { + name = "Josh Hoffer"; + email = "jhoffer@sansorgan.es"; + matrix = "@princemachiavelli:matrix.org"; + github = "Princemachiavelli"; + githubId = 2730968; + keys = [{ + fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18"; + }]; + }; prikhi = { email = "pavan.rikhi@gmail.com"; github = "prikhi"; @@ -11297,6 +11948,11 @@ githubId = 37715; name = "Brian McKenna"; }; + pulsation = { + name = "Philippe Sam-Long"; + github = "pulsation"; + githubId = 1838397; + }; purcell = { email = "steve@sanityinc.com"; github = "purcell"; @@ -11316,6 +11972,12 @@ githubId = 23097564; name = "Nora Widdecke"; }; + pwoelfel = { + name = "Philipp Woelfel"; + email = "philipp.woelfel@gmail.com"; + github = "PhilippWoelfel"; + githubId = 19400064; + }; pyrolagus = { email = "pyrolagus@gmail.com"; github = "PyroLagus"; @@ -11334,6 +11996,16 @@ githubId = 315234; name = "Serge Bazanski"; }; + qbit = { + name = "Aaron Bieber"; + email = "aaron@bolddaemon.com"; + github = "qbit"; + githubId = 68368; + matrix = "@qbit:tapenet.org"; + keys = [{ + fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE"; + }]; + }; qknight = { email = "js@lastlog.de"; github = "qknight"; @@ -11399,6 +12071,21 @@ githubId = 131856; name = "Arnout Engelen"; }; + raehik = { + email = "thefirstmuffinman@gmail.com"; + github = "raehik"; + githubId = 3764592; + name = "Ben Orchard"; + }; + rafael = { + name = "Rafael"; + email = "pr9@tuta.io"; + github = "rafa-dot-el"; + githubId = 104688305; + keys = [{ + fingerprint = "5F0B 3EAC F1F9 8155 0946 CDF5 469E 3255 A40D 2AD6"; + }]; + }; RaghavSood = { email = "r@raghavsood.com"; github = "RaghavSood"; @@ -11437,6 +12124,12 @@ githubId = 882; name = "Ragnar Dahlen"; }; + rakesh4g = { + email = "rakeshgupta4u@gmail.com"; + github = "Rakesh4G"; + githubId = 50867187; + name = "Rakesh Gupta"; + }; ralith = { email = "ben.e.saunders@gmail.com"; matrix = "@ralith:ralith.com"; @@ -11492,6 +12185,12 @@ githubId = 1758708; name = "Răzvan Flavius Panda"; }; + rb = { + email = "maintainers@cloudposse.com"; + github = "nitrocode"; + githubId = 7775707; + name = "RB"; + }; rb2k = { email = "nix@marc-seeger.com"; github = "rb2k"; @@ -11506,7 +12205,6 @@ }; rbreslow = { name = "Rocky Breslow"; - email = "1774125+rbreslow@users.noreply.github.com"; github = "rbreslow"; githubId = 1774125; keys = [{ @@ -11525,6 +12223,12 @@ githubId = 1973389; name = "Reuben D'Netto"; }; + realsnick = { + name = "Ido Samuelson"; + email = "ido.samuelson@gmail.com"; + github = "realsnick"; + githubId = 1440852; + }; redbaron = { email = "ivanov.maxim@gmail.com"; github = "redbaron"; @@ -11593,7 +12297,6 @@ name = "Ricky Elrod"; }; rembo10 = { - email = "rembo10@users.noreply.github.com"; github = "rembo10"; githubId = 801525; name = "rembo10"; @@ -11605,7 +12308,6 @@ name = "Renato Garcia"; }; rencire = { - email = "546296+rencire@users.noreply.github.com"; github = "rencire"; githubId = 546296; name = "Eric Ren"; @@ -11894,12 +12596,24 @@ githubId = 852967; name = "Russell O'Connor"; }; + rodrgz = { + email = "erik@rodgz.com"; + github = "rodrgz"; + githubId = 53882428; + name = "Erik Rodriguez"; + }; roelvandijk = { email = "roel@lambdacube.nl"; github = "roelvandijk"; githubId = 710906; name = "Roel van Dijk"; }; + roman = { + email = "open-source@roman-gonzalez.info"; + github = "roman"; + githubId = 7335; + name = "Roman Gonzalez"; + }; romildo = { email = "malaquias@gmail.com"; github = "romildo"; @@ -11930,13 +12644,18 @@ }; rople380 = { name = "rople380"; - email = "55679162+rople380@users.noreply.github.com"; github = "rople380"; githubId = 55679162; keys = [{ fingerprint = "1401 1B63 393D 16C1 AA9C C521 8526 B757 4A53 6236"; }]; }; + RossComputerGuy = { + name = "Tristan Ross"; + email = "tristan.ross@midstall.com"; + github = "RossComputerGuy"; + githubId = 19699320; + }; rowanG077 = { email = "goemansrowan@gmail.com"; github = "rowanG077"; @@ -12018,6 +12737,12 @@ githubId = 61306; name = "Rene Treffer"; }; + rumpelsepp = { + name = "Stefan Tatschner"; + email = "stefan@rumpelsepp.org"; + github = "rumpelsepp"; + githubId = 1961699; + }; rushmorem = { email = "rushmore@webenchanter.com"; github = "rushmorem"; @@ -12067,7 +12792,6 @@ name = "Ryan Artecona"; }; ryanorendorff = { - email = "12442942+ryanorendorff@users.noreply.github.com"; github = "ryanorendorff"; githubId = 12442942; name = "Ryan Orendorff"; @@ -12168,6 +12892,12 @@ githubId = 6022042; name = "Sam Parkinson"; }; + samhug = { + email = "s@m-h.ug"; + github = "samhug"; + githubId = 171470; + name = "Sam Hug"; + }; samlich = { email = "nixos@samli.ch"; github = "samlich"; @@ -12247,6 +12977,12 @@ githubId = 695473; name = "Sascha Grunert"; }; + saulecabrera = { + name = "Saúl Cabrera"; + email = "saulecabrera@gmail.com"; + github = "saulecabrera"; + githubId = 1423601; + }; sauyon = { email = "s@uyon.co"; github = "sauyon"; @@ -12279,7 +13015,6 @@ }; sbond75 = { name = "sbond75"; - email = "43617712+sbond75@users.noreply.github.com"; github = "sbond75"; githubId = 43617712; }; @@ -12303,7 +13038,6 @@ }; sioodmy = { name = "Antoni Sokołowski"; - email = "81568712+sioodmy@users.noreply.github.com"; github = "sioodmy"; githubId = 81568712; }; @@ -12332,7 +13066,6 @@ name = "schneefux"; }; schnusch = { - email = "schnusch@users.noreply.github.com"; github = "schnusch"; githubId = 5104601; name = "schnusch"; @@ -12354,7 +13087,6 @@ }; scoder12 = { name = "Spencer Pogorzelski"; - email = "34356756+Scoder12@users.noreply.github.com"; github = "Scoder12"; githubId = 34356756; }; @@ -12384,7 +13116,7 @@ github = "Scrumplex"; githubId = 11587657; keys = [{ - fingerprint = "AF1F B107 E188 CB97 9A94 FD7F C104 1129 4912 A422"; + fingerprint = "E173 237A C782 296D 98F5 ADAC E13D FD4B 4712 7951"; }]; }; scubed2 = { @@ -12445,6 +13177,12 @@ githubId = 17243347; name = "Sebastian Sellmeier"; }; + sei40kr = { + name = "Seong Yong-ju"; + email = "sei40kr@gmail.com"; + github = "sei40kr"; + githubId = 11665236; + }; sellout = { email = "greg@technomadic.org"; github = "sellout"; @@ -12463,6 +13201,15 @@ githubId = 893474; name = "Stefan Wiehler"; }; + sephi = { + name = "Sylvain Fankhauser"; + email = "sephi@fhtagn.top"; + github = "sephii"; + githubId = 754333; + keys = [{ + fingerprint = "2A9D 8E76 5EE2 237D 7B6B A2A5 4228 AB9E C061 2ADA"; + }]; + }; sepi = { email = "raffael@mancini.lu"; github = "sepi"; @@ -12530,7 +13277,6 @@ name = "Sebastian Graf"; }; shadaj = { - email = "shadaj@users.noreply.github.com"; github = "shadaj"; githubId = 543055; name = "Shadaj Laddad"; @@ -12556,7 +13302,6 @@ }; ShamrockLee = { name = "Shamrock Lee"; - email = "44064051+ShamrockLee@users.noreply.github.com"; github = "ShamrockLee"; githubId = 44064051; }; @@ -12575,6 +13320,12 @@ }]; name = "Shane Sveller"; }; + shardy = { + email = "shardul@baral.ca"; + github = "shardulbee"; + githubId = 16765155; + name = "Shardul Baral"; + }; shawndellysse = { email = "sdellysse@gmail.com"; github = "sdellysse"; @@ -12683,6 +13434,13 @@ githubId = 4294323; name = "Langston Barrett"; }; + sielicki = { + name = "Nicholas Sielicki"; + email = "nix@opensource.nslick.com"; + github = "sielicki"; + githubId = 4522995; + matrix = "@sielicki:matrix.org"; + }; siers = { email = "veinbahs+nixpkgs@gmail.com"; github = "siers"; @@ -12741,7 +13499,6 @@ name = "Simon Vandel Sillesen"; }; sir4ur0n = { - email = "sir4ur0n@users.noreply.github.com"; github = "sir4ur0n"; githubId = 1204125; name = "sir4ur0n"; @@ -12805,7 +13562,6 @@ name = "Sven Keidel"; }; skykanin = { - email = "skykanin@users.noreply.github.com"; github = "skykanin"; githubId = 3789764; name = "skykanin"; @@ -12884,12 +13640,23 @@ github = "snapdgn"; githubId = 85608760; }; + snglth = { + email = "illia@ishestakov.com"; + github = "snglth"; + githubId = 8686360; + name = "Illia Shestakov"; + }; snicket2100 = { - email = "57048005+snicket2100@users.noreply.github.com"; github = "snicket2100"; githubId = 57048005; name = "snicket2100"; }; + snpschaaf = { + email = "philipe.schaaf@secunet.com"; + name = "Philippe Schaaf"; + github = "snpschaaf"; + githubId = 105843013; + }; snyh = { email = "snyh@snyh.org"; github = "snyh"; @@ -12908,6 +13675,15 @@ githubId = 2157287; name = "sohalt"; }; + SohamG = { + email = "sohamg2@gmail.com"; + name = "Soham S Gumaste"; + github = "SohamG"; + githubId = 7116239; + keys = [{ + fingerprint = "E067 520F 5EF2 C175 3F60 50C0 BA46 725F 6A26 7442"; + }]; + }; solson = { email = "scott@solson.me"; matrix = "@solson:matrix.org"; @@ -13014,7 +13790,6 @@ name = "Sergei Khoma"; }; srgom = { - email = "srgom@users.noreply.github.com"; github = "SRGOM"; githubId = 8103619; name = "SRGOM"; @@ -13026,6 +13801,12 @@ githubId = 219362; name = "Sarah Brofeldt"; }; + srounce = { + name = "Samuel Rounce"; + email = "me@samuelrounce.co.uk"; + github = "srounce"; + githubId = 60792; + }; SShrike = { email = "severen@shrike.me"; github = "severen"; @@ -13050,12 +13831,27 @@ githubId = 7512804; name = "Martin Langlotz"; }; + starcraft66 = { + name = "Tristan Gosselin-Hane"; + email = "starcraft66@gmail.com"; + github = "starcraft66"; + githubId = 1858154; + keys = [{ + fingerprint = "8597 4506 EC69 5392 0443 0805 9D98 CDAC FF04 FD78"; + }]; + }; stargate01 = { email = "christoph.honal@web.de"; github = "StarGate01"; githubId = 6362238; name = "Christoph Honal"; }; + stasjok = { + name = "Stanislav Asunkin"; + email = "nixpkgs@stasjok.ru"; + github = "stasjok"; + githubId = 1353637; + }; steamwalker = { email = "steamwalker@xs4all.nl"; github = "steamwalker"; @@ -13068,6 +13864,12 @@ githubId = 1699155; name = "Steve Elliott"; }; + stefanfehrenbach = { + email = "stefan.fehrenbach@gmail.com"; + github = "fehrenbach"; + githubId = 203168; + name = "Stefan Fehrenbach"; + }; stehessel = { email = "stephan@stehessel.de"; github = "stehessel"; @@ -13105,7 +13907,6 @@ }; stephenwithph = { name = "StephenWithPH"; - email = "StephenWithPH@users.noreply.github.com"; github = "StephenWithPH"; githubId = 2990492; }; @@ -13238,12 +14039,25 @@ githubId = 16734772; name = "Sumner Evans"; }; + suominen = { + email = "kimmo@suominen.com"; + github = "suominen"; + githubId = 1939855; + name = "Kimmo Suominen"; + }; superbo = { email = "supernbo@gmail.com"; github = "SuperBo"; githubId = 2666479; name = "Y Nguyen"; }; + superherointj = { + name = "Sérgio Marcelo"; + email = "sergiomarcelo+nixpkgs@ya.ru"; + matrix = "@superherointj:matrix.org"; + github = "superherointj"; + githubId = 5861043; + }; SuperSandro2000 = { email = "sandro.jaeckel@gmail.com"; matrix = "@sandro:supersandro.de"; @@ -13378,6 +14192,15 @@ githubId = 5991987; name = "Alexander Sosedkin"; }; + t4ccer = { + email = "t4ccer@gmail.com"; + github = "t4ccer"; + githubId = 64430288; + name = "Tomasz Maciosowski"; + keys = [{ + fingerprint = "6866 981C 4992 4D64 D154 E1AC 19E5 A2D8 B1E4 3F19"; + }]; + }; tadeokondrak = { email = "me@tadeo.ca"; github = "tadeokondrak"; @@ -13513,6 +14336,12 @@ githubId = 66133083; name = "Tomas Bravo"; }; + tchab = { + email = "dev@chabs.name"; + github = "t-chab"; + githubId = 2120966; + name = "t-chab"; + }; tchekda = { email = "contact@tchekda.fr"; github = "Tchekda"; @@ -13535,7 +14364,6 @@ name = "techknowlogick"; }; Technical27 = { - email = "38222826+Technical27@users.noreply.github.com"; github = "Technical27"; githubId = 38222826; name = "Aamaruvi Yogamani"; @@ -13552,6 +14380,14 @@ github = "tejasag"; githubId = 67542663; }; + tejing = { + name = "Jeff Huffman"; + email = "tejing@tejing.com"; + matrix = "@tejing:matrix.org"; + github = "tejing1"; + githubId = 5663576; + keys = [{ fingerprint = "6F0F D43B 80E5 583E 60FC 51DC 4936 D067 EB12 AB32"; }]; + }; telotortium = { email = "rirelan@gmail.com"; github = "telotortium"; @@ -13623,6 +14459,11 @@ githubId = 29044; name = "Jacek Galowicz"; }; + tfmoraes = { + name = "Thiago Franco de Moraes"; + github = "tfmoraes"; + githubId = 351108; + }; tg-x = { email = "*@tg-x.net"; github = "tg-x"; @@ -13669,6 +14510,13 @@ fingerprint = "D2A2 F0A1 E7A8 5E6F B711 DEE5 63A4 4817 A52E AB7B"; }]; }; + the-argus = { + email = "i.mcfarlane2002@gmail.com"; + github = "the-argus"; + name = "Ian McFarlane"; + githubId = 70479099; + matrix = "@eyes1238:matrix.org"; + }; TheBrainScrambler = { email = "esthromeris@riseup.net"; github = "TheBrainScrambler"; @@ -13768,6 +14616,12 @@ githubId = 3268082; name = "Thibaut Marty"; }; + thled = { + name = "Thomas Le Duc"; + email = "dev@tleduc.de"; + github = "thled"; + githubId = 28220902; + }; thyol = { name = "thyol"; email = "thyol@pm.me"; @@ -13898,6 +14752,16 @@ githubId = 13026; name = "Jonathan Rudenberg"; }; + tjni = { + email = "43ngvg@masqt.com"; + matrix = "@tni:matrix.org"; + name = "Theodore Ni"; + github = "tjni"; + githubId = 3806110; + keys = [{ + fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4"; + }]; + }; tkerber = { email = "tk@drwx.org"; github = "tkerber"; @@ -13919,6 +14783,12 @@ githubId = 1280118; name = "Tomislav Markovski"; }; + tmarkus = { + email = "tobias@markus-regensburg.de"; + github = "hesiod"; + githubId = 3159881; + name = "Tobias Markus"; + }; tmountain = { email = "tinymountain@gmail.com"; github = "tmountain"; @@ -13991,6 +14861,13 @@ githubId = 13155277; name = "Tom Houle"; }; + tomodachi94 = { + email = "tomodachi94+nixpkgs@protonmail.com"; + matrix = "@tomodachi94:matrix.org"; + github = "tomodachi94"; + githubId = 68489118; + name = "Tomodachi94"; + }; tomsmeets = { email = "tom.tsmeets@gmail.com"; github = "TomSmeets"; @@ -14004,6 +14881,12 @@ githubId = 8794235; name = "Tom Siewert"; }; + tonyshkurenko = { + email = "support@twingate.com"; + github = "tonyshkurenko"; + githubId = 8597964; + name = "Anton Shkurenko"; + }; toonn = { email = "nixpkgs@toonn.io"; matrix = "@toonn:matrix.org"; @@ -14048,6 +14931,12 @@ githubId = 52011418; name = "Travis Davis"; }; + traxys = { + email = "quentin+dev@familleboyer.net"; + github = "traxys"; + githubId = 5623227; + name = "Quentin Boyer"; + }; TredwellGit = { email = "tredwell@tutanota.com"; github = "TredwellGit"; @@ -14126,6 +15015,12 @@ githubId = 563054; name = "Thomas Tuegel"; }; + turbomack = { + email = "marek.faj@gmail.com"; + github = "turboMaCk"; + githubId = 2130305; + name = "Marek Fajkus"; + }; turion = { email = "programming@manuelbaerenz.de"; github = "turion"; @@ -14198,6 +15093,13 @@ github = "twitchyliquid64"; githubId = 6328589; }; + tylerjl = { + email = "tyler+nixpkgs@langlois.to"; + github = "tylerjl"; + githubId = 1733846; + matrix = "@ty:tjll.net"; + name = "Tyler Langlois"; + }; typetetris = { email = "ericwolf42@mail.com"; github = "typetetris"; @@ -14268,6 +15170,7 @@ }; urandom = { email = "colin@urandom.co.uk"; + matrix = "@urandom0:matrix.org"; github = "urandom2"; githubId = 2526260; keys = [{ @@ -14412,6 +15315,12 @@ githubId = 797581; name = "Vincent Bernardoff"; }; + vbrandl = { + name = "Valentin Brandl"; + email = "mail+nixpkgs@vbrandl.net"; + github = "vbrandl"; + githubId = 20639051; + }; vcanadi = { email = "vito.canadi@gmail.com"; github = "vcanadi"; @@ -14435,6 +15344,12 @@ githubId = 6508; name = "Vincent Demeester"; }; + vdot0x23 = { + name = "Victor Büttner"; + email = "nix.victor@0x23.dk"; + github = "vdot0x23"; + githubId = 40716069; + }; veehaitch = { name = "Vincent Haupert"; email = "mail@vincent-haupert.de"; @@ -14655,6 +15570,18 @@ fingerprint = "E595 7FE4 FEF6 714B 1AD3 1483 937F 2AE5 CCEF BF59"; }]; }; + waelwindows = { + email = "waelwindows9922@gmail.com"; + github = "Waelwindows"; + githubId = 5228243; + name = "waelwindows"; + }; + waiting-for-dev = { + email = "marc@lamarciana.com"; + github = "waiting-for-dev"; + githubId = 52650; + name = "Marc Busqué"; + }; wakira = { name = "Sheng Wang"; email = "sheng@a64.work"; @@ -14688,6 +15615,12 @@ githubId = 34962284; name = "wchresta"; }; + wd15 = { + email = "daniel.wheeler2@gmail.com"; + github = "wd15"; + githubId = 1986844; + name = "Daniel Wheeler"; + }; wdavidw = { name = "David Worms"; email = "david@adaltas.com"; @@ -14725,6 +15658,12 @@ fingerprint = "2145 955E 3F5E 0C95 3458 41B5 11F7 BAEA 8567 43FF"; }]; }; + wenngle = { + name = "Zeke Stephens"; + email = "zekestephens@gmail.com"; + github = "wenngle"; + githubId = 63376671; + }; wentam = { name = "Matt Egeler"; email = "wentam42@gmail.com"; @@ -14737,6 +15676,12 @@ github = "wentasah"; githubId = 140542; }; + wesleyjrz = { + email = "dev@wesleyjrz.com"; + name = "Wesley V. Santos Jr."; + github = "wesleyjrz"; + githubId = 60184588; + }; wesnel = { name = "Wesley Nelson"; email = "wgn@wesnel.dev"; @@ -14752,6 +15697,24 @@ githubId = 13031455; name = "Jakob Schmutz"; }; + witchof0x20 = { + name = "Jade"; + email = "jade@witchof.space"; + github = "witchof0x20"; + githubId = 36118348; + keys = [{ + fingerprint = "69C9 876B 5797 1B2E 11C5 7C39 80A1 F76F C9F9 54AE"; + }]; + }; + WhiteBlackGoose = { + email = "wbg@angouri.org"; + github = "WhiteBlackGoose"; + githubId = 31178401; + name = "WhiteBlackGoose"; + keys = [{ + fingerprint = "640B EDDE 9734 310A BFA3 B257 52ED AE6A 3995 AFAB"; + }]; + }; WhittlesJr = { email = "alex.joseph.whitt@gmail.com"; github = "WhittlesJr"; @@ -14780,11 +15743,16 @@ name = "Willi Butz"; }; willcohen = { - email = "willcohen@users.noreply.github.com"; github = "willcohen"; githubId = 5185341; name = "Will Cohen"; }; + wilsonehusin = { + name = "Wilson E. Husin"; + email = "wilsonehusin@gmail.com"; + github = "wilsonehusin"; + githubId = 14004487; + }; winpat = { email = "patrickwinter@posteo.ch"; github = "winpat"; @@ -14810,7 +15778,6 @@ name = "Alexander Krimm"; }; wishfort36 = { - email = "42300264+wishfort36@users.noreply.github.com"; github = "wishfort36"; githubId = 42300264; name = "wishfort36"; @@ -14932,8 +15899,13 @@ github = "wunderbrick"; githubId = 52174714; }; + wuyoli = { + name = "wuyoli"; + email = "wuyoli@tilde.team"; + github = "wuyoli"; + githubId = 104238274; + }; wyndon = { - email = "72203260+wyndon@users.noreply.github.com"; matrix = "@wyndon:envs.net"; github = "wyndon"; githubId = 72203260; @@ -14963,6 +15935,12 @@ githubId = 11050617; name = "Dominik Xaver Hörl"; }; + xavierzwirtz = { + email = "me@xavierzwirtz.com"; + github = "xavierzwirtz"; + githubId = 474343; + name = "Xavier Zwirtz"; + }; xbreak = { email = "xbreak@alphaware.se"; github = "xbreak"; @@ -14971,7 +15949,6 @@ }; xdhampus = { name = "Hampus"; - email = "16954508+xdHampus@users.noreply.github.com"; github = "xdHampus"; githubId = 16954508; }; @@ -15013,6 +15990,12 @@ githubId = 17534323; name = "Quentin Vaucher"; }; + xlambein = { + email = "xlambein@gmail.com"; + github = "xlambein"; + githubId = 5629059; + name = "Xavier Lambein"; + }; xnaveira = { email = "xnaveira@gmail.com"; github = "xnaveira"; @@ -15026,7 +16009,6 @@ name = "Guillermo NWDD"; }; xrelkd = { - email = "46590321+xrelkd@users.noreply.github.com"; github = "xrelkd"; githubId = 46590321; name = "xrelkd"; @@ -15044,7 +16026,6 @@ name = "Marti Serra"; }; xworld21 = { - email = "1962985+xworld21@users.noreply.github.com"; github = "xworld21"; githubId = 1962985; name = "Vincenzo Mantova"; @@ -15073,8 +16054,13 @@ githubId = 1643293; name = "Yana Timoshenko"; }; + yanganto = { + name = "Antonio Yang"; + email = "yanganto@gmail.com"; + github = "yanganto"; + githubId = 10803111; + }; yarny = { - email = "41838844+Yarny0@users.noreply.github.com"; github = "Yarny0"; githubId = 41838844; name = "Yarny"; @@ -15092,6 +16078,15 @@ githubId = 73759599; name = "Lara A."; }; + ydlr = { + name = "ydlr"; + email = "ydlr@ydlr.io"; + github = "ydlr"; + githubId = 58453832; + keys = [{ + fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; + }]; + }; yesbox = { email = "jesper.geertsen.jonsson@gmail.com"; github = "yesbox"; @@ -15104,6 +16099,12 @@ githubId = 11229748; name = "Lin Yinfeng"; }; + yisuidenghua = { + email = "bileiner@gmail.com"; + name = "Milena Yisui"; + github = "YisuiDenghua"; + githubId = 102890144; + }; ylecornec = { email = "yves.stan.lecornec@tweag.io"; github = "ylecornec"; @@ -15128,6 +16129,25 @@ githubId = 1311192; name = "Alexander Kiselyov"; }; + ymarkus = { + name = "Yannick Markus"; + email = "nixpkgs@ymarkus.dev"; + github = "ymarkus"; + githubId = 62380378; + }; + ymatsiuk = { + name = "Yurii Matsiuk"; + github = "ymatsiuk"; + githubId = 24990891; + keys = [{ + fingerprint = "7BB8 84B5 74DA FDB1 E194 ED21 6130 2290 2986 01AA"; + }]; + }; + ymeister = { + name = "Yuri Meister"; + github = "ymeister"; + githubId = 47071325; + }; yochai = { email = "yochai@titat.info"; github = "yochai"; @@ -15159,6 +16179,12 @@ github = "yrd"; githubId = 1820447; }; + yshym = { + name = "Yevhen Shymotiuk"; + email = "yshym@pm.me"; + github = "yshym"; + githubId = 44244245; + }; ysndr = { email = "me@ysndr.de"; github = "ysndr"; @@ -15266,6 +16292,21 @@ githubId = 1319905; name = "Uma Zalakain"; }; + zanculmarktum = { + name = "Azure Zanculmarktum"; + email = "zanculmarktum@gmail.com"; + github = "zanculmarktum"; + githubId = 16958511; + }; + zane = { + name = "Zane van Iperen"; + email = "zane@zanevaniperen.com"; + github = "vs49688"; + githubId = 4423262; + keys = [{ + fingerprint = "61AE D40F 368B 6F26 9DAE 3892 6861 6B2D 8AC4 DCC5"; + }]; + }; zaninime = { email = "francesco@zanini.me"; github = "zaninime"; @@ -15290,6 +16331,12 @@ githubId = 6191421; name = "Edward d'Albon"; }; + zbioe = { + name = "Iury Fukuda"; + email = "zbioe@protonmail.com"; + github = "zbioe"; + githubId = 7332055; + }; zebreus = { matrix = "@lennart:cicen.net"; email = "lennarteichhorn+nixpkgs@gmail.com"; @@ -15297,6 +16344,27 @@ githubId = 1557253; name = "Lennart Eichhorn"; }; + zeri = { + name = "zeri"; + matrix = "@zeri:matrix.org"; + github = "zeri42"; + githubId = 68825133; + }; + zendo = { + name = "zendo"; + email = "linzway@qq.com"; + github = "zendo"; + githubId = 348013; + }; + zenithal = { + name = "zenithal"; + email = "i@zenithal.me"; + github = "ZenithalHourlyRate"; + githubId = 19512674; + keys = [{ + fingerprint = "1127 F188 280A E312 3619 3329 87E1 7EEF 9B18 B6C9"; + }]; + }; zeratax = { email = "mail@zera.tax"; github = "zeratax"; @@ -15325,6 +16393,12 @@ githubId = 2189609; name = "Zhaofeng Li"; }; + ziguana = { + name = "Zig Uana"; + email = "git@ziguana.dev"; + github = "ziguana"; + githubId = 45833444; + }; zimbatm = { email = "zimbatm@zimbatm.com"; github = "zimbatm"; @@ -15337,12 +16411,33 @@ githubId = 1108325; name = "Théo Zimmermann"; }; + zoedsoupe = { + github = "zoedsoupe"; + githubId = 44469426; + name = "Zoey de Souza Pessanha"; + email = "zoey.spessanha@outlook.com"; + keys = [{ + fingerprint = "EAA1 51DB 472B 0122 109A CB17 1E1E 889C DBD6 A315"; + }]; + }; zohl = { email = "zohl@fmap.me"; github = "zohl"; githubId = 6067895; name = "Al Zohali"; }; + zokrezyl = { + email = "zokrezyl@gmail.com"; + github = "zokrezyl"; + githubId = 51886259; + name = "Zokre Zyl"; + }; + zombiezen = { + name = "Ross Light"; + email = "ross@zombiezen.com"; + github = "zombiezen"; + githubId = 181535; + }; zookatron = { email = "tim@zookatron.com"; github = "zookatron"; @@ -15356,7 +16451,6 @@ name = "Alexandre Macabies"; }; zowoq = { - email = "59103226+zowoq@users.noreply.github.com"; github = "zowoq"; githubId = 59103226; name = "zowoq"; @@ -15367,12 +16461,33 @@ githubId = 8100652; name = "David Mell"; }; + zseri = { + name = "zseri"; + email = "zseri.devel@ytrizja.de"; + github = "zseri"; + githubId = 1618343; + keys = [{ + fingerprint = "7AFB C595 0D3A 77BD B00F 947B 229E 63AE 5644 A96D"; + }]; + }; ztzg = { email = "dd@crosstwine.com"; github = "ztzg"; githubId = 393108; name = "Damien Diederen"; }; + zupo = { + name = "Nejc Zupan"; + email = "nejczupan+nix@gmail.com"; + github = "zupo"; + githubId = 311580; + }; + zuzuleinen = { + email = "andrey.boar@gmail.com"; + name = "Andrei Boar"; + github = "zuzuleinen"; + githubId = 944919; + }; zx2c4 = { email = "Jason@zx2c4.com"; github = "zx2c4"; @@ -15391,540 +16506,5 @@ githubId = 32876; name = "Diego Zamboni"; }; - turbomack = { - email = "marek.faj@gmail.com"; - github = "turboMaCk"; - githubId = 2130305; - name = "Marek Fajkus"; - }; - melling = { - email = "mattmelling@fastmail.com"; - github = "mattmelling"; - githubId = 1215331; - name = "Matt Melling"; - }; - wd15 = { - email = "daniel.wheeler2@gmail.com"; - github = "wd15"; - githubId = 1986844; - name = "Daniel Wheeler"; - }; - misuzu = { - email = "bakalolka@gmail.com"; - github = "misuzu"; - githubId = 248143; - name = "misuzu"; - }; - zokrezyl = { - email = "zokrezyl@gmail.com"; - github = "zokrezyl"; - githubId = 51886259; - name = "Zokre Zyl"; - }; - rakesh4g = { - email = "rakeshgupta4u@gmail.com"; - github = "Rakesh4G"; - githubId = 50867187; - name = "Rakesh Gupta"; - }; - mlatus = { - email = "wqseleven@gmail.com"; - github = "Ninlives"; - githubId = 17873203; - name = "mlatus"; - }; - waiting-for-dev = { - email = "marc@lamarciana.com"; - github = "waiting-for-dev"; - githubId = 52650; - name = "Marc Busqué"; - }; - snglth = { - email = "illia@ishestakov.com"; - github = "snglth"; - githubId = 8686360; - name = "Illia Shestakov"; - }; - masaeedu = { - email = "masaeedu@gmail.com"; - github = "masaeedu"; - githubId = 3674056; - name = "Asad Saeeduddin"; - }; - matthewcroughan = { - email = "matt@croughan.sh"; - github = "MatthewCroughan"; - githubId = 26458780; - name = "Matthew Croughan"; - }; - ngerstle = { - name = "Nicholas Gerstle"; - email = "ngerstle@gmail.com"; - github = "ngerstle"; - githubId = 1023752; - }; - shardy = { - email = "shardul@baral.ca"; - github = "shardulbee"; - githubId = 16765155; - name = "Shardul Baral"; - }; - xavierzwirtz = { - email = "me@xavierzwirtz.com"; - github = "xavierzwirtz"; - githubId = 474343; - name = "Xavier Zwirtz"; - }; - ymarkus = { - name = "Yannick Markus"; - email = "nixpkgs@ymarkus.dev"; - github = "ymarkus"; - githubId = 62380378; - }; - ymatsiuk = { - name = "Yurii Matsiuk"; - email = "ymatsiuk@users.noreply.github.com"; - github = "ymatsiuk"; - githubId = 24990891; - keys = [{ - fingerprint = "7BB8 84B5 74DA FDB1 E194 ED21 6130 2290 2986 01AA"; - }]; - }; - ymeister = { - name = "Yuri Meister"; - email = "47071325+ymeister@users.noreply.github.com"; - github = "ymeister"; - githubId = 47071325; - }; - cpcloud = { - name = "Phillip Cloud"; - email = "417981+cpcloud@users.noreply.github.com"; - github = "cpcloud"; - githubId = 417981; - }; - davegallant = { - name = "Dave Gallant"; - email = "davegallant@gmail.com"; - github = "davegallant"; - githubId = 4519234; - }; - saulecabrera = { - name = "Saúl Cabrera"; - email = "saulecabrera@gmail.com"; - github = "saulecabrera"; - githubId = 1423601; - }; - tfmoraes = { - name = "Thiago Franco de Moraes"; - email = "351108+tfmoraes@users.noreply.github.com"; - github = "tfmoraes"; - githubId = 351108; - }; - deifactor = { - name = "Ash Zahlen"; - email = "ext0l@riseup.net"; - github = "deifactor"; - githubId = 30192992; - }; - deinferno = { - name = "deinferno"; - email = "14363193+deinferno@users.noreply.github.com"; - github = "deinferno"; - githubId = 14363193; - }; - fzakaria = { - name = "Farid Zakaria"; - email = "farid.m.zakaria@gmail.com"; - matrix = "@fzakaria:matrix.org"; - github = "fzakaria"; - githubId = 605070; - }; - nagisa = { - name = "Simonas Kazlauskas"; - email = "nixpkgs@kazlauskas.me"; - github = "nagisa"; - githubId = 679122; - }; - yshym = { - name = "Yevhen Shymotiuk"; - email = "yshym@pm.me"; - github = "yshym"; - githubId = 44244245; - }; - hmenke = { - name = "Henri Menke"; - email = "henri@henrimenke.de"; - matrix = "@hmenke:matrix.org"; - github = "hmenke"; - githubId = 1903556; - keys = [{ - fingerprint = "F1C5 760E 45B9 9A44 72E9 6BFB D65C 9AFB 4C22 4DA3"; - }]; - }; - berbiche = { - name = "Nicolas Berbiche"; - email = "nicolas@normie.dev"; - github = "berbiche"; - githubId = 20448408; - keys = [{ - fingerprint = "D446 E58D 87A0 31C7 EC15 88D7 B461 2924 45C6 E696"; - }]; - }; - wenngle = { - name = "Zeke Stephens"; - email = "zekestephens@gmail.com"; - github = "wenngle"; - githubId = 63376671; - }; - yanganto = { - name = "Antonio Yang"; - email = "yanganto@gmail.com"; - github = "yanganto"; - githubId = 10803111; - }; - starcraft66 = { - name = "Tristan Gosselin-Hane"; - email = "starcraft66@gmail.com"; - github = "starcraft66"; - githubId = 1858154; - keys = [{ - fingerprint = "8597 4506 EC69 5392 0443 0805 9D98 CDAC FF04 FD78"; - }]; - }; - hloeffler = { - name = "Hauke Löffler"; - email = "nix@hauke-loeffler.de"; - github = "hloeffler"; - githubId = 6627191; - }; - wilsonehusin = { - name = "Wilson E. Husin"; - email = "wilsonehusin@gmail.com"; - github = "wilsonehusin"; - githubId = 14004487; - }; - bb2020 = { - email = "bb2020@users.noreply.github.com"; - github = "bb2020"; - githubId = 19290397; - name = "Tunc Uzlu"; - }; - pulsation = { - name = "Philippe Sam-Long"; - email = "1838397+pulsation@users.noreply.github.com"; - github = "pulsation"; - githubId = 1838397; - }; - princemachiavelli = { - name = "Josh Hoffer"; - email = "jhoffer@sansorgan.es"; - matrix = "@princemachiavelli:matrix.org"; - github = "Princemachiavelli"; - githubId = 2730968; - keys = [{ - fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18"; - }]; - }; - ydlr = { - name = "ydlr"; - email = "ydlr@ydlr.io"; - github = "ydlr"; - githubId = 58453832; - keys = [{ - fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; - }]; - }; - zane = { - name = "Zane van Iperen"; - email = "zane@zanevaniperen.com"; - github = "vs49688"; - githubId = 4423262; - keys = [{ - fingerprint = "61AE D40F 368B 6F26 9DAE 3892 6861 6B2D 8AC4 DCC5"; - }]; - }; - zbioe = { - name = "Iury Fukuda"; - email = "zbioe@protonmail.com"; - github = "zbioe"; - githubId = 7332055; - }; - zendo = { - name = "zendo"; - email = "linzway@qq.com"; - github = "zendo"; - githubId = 348013; - }; - zenithal = { - name = "zenithal"; - email = "i@zenithal.me"; - github = "ZenithalHourlyRate"; - githubId = 19512674; - keys = [{ - fingerprint = "1127 F188 280A E312 3619 3329 87E1 7EEF 9B18 B6C9"; - }]; - }; - zeri = { - name = "zeri"; - email = "68825133+zeri42@users.noreply.github.com"; - matrix = "@zeri:matrix.org"; - github = "zeri42"; - githubId = 68825133; - }; - zoedsoupe = { - github = "zoedsoupe"; - githubId = 44469426; - name = "Zoey de Souza Pessanha"; - email = "zoey.spessanha@outlook.com"; - keys = [{ - fingerprint = "EAA1 51DB 472B 0122 109A CB17 1E1E 889C DBD6 A315"; - }]; - }; - zombiezen = { - name = "Ross Light"; - email = "ross@zombiezen.com"; - github = "zombiezen"; - githubId = 181535; - }; - zseri = { - name = "zseri"; - email = "zseri.devel@ytrizja.de"; - github = "zseri"; - githubId = 1618343; - keys = [{ - fingerprint = "7AFB C595 0D3A 77BD B00F 947B 229E 63AE 5644 A96D"; - }]; - }; - zupo = { - name = "Nejc Zupan"; - email = "nejczupan+nix@gmail.com"; - github = "zupo"; - githubId = 311580; - }; - sei40kr = { - name = "Seong Yong-ju"; - email = "sei40kr@gmail.com"; - github = "sei40kr"; - githubId = 11665236; - }; - vdot0x23 = { - name = "Victor Büttner"; - email = "nix.victor@0x23.dk"; - github = "vdot0x23"; - githubId = 40716069; - }; - jpagex = { - name = "Jérémy Pagé"; - email = "contact@jeremypage.me"; - 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"; - github = "portothree"; - githubId = 3718120; - }; - pwoelfel = { - name = "Philipp Woelfel"; - email = "philipp.woelfel@gmail.com"; - github = "PhilippWoelfel"; - githubId = 19400064; - }; - qbit = { - name = "Aaron Bieber"; - email = "aaron@bolddaemon.com"; - github = "qbit"; - githubId = 68368; - matrix = "@qbit:tapenet.org"; - keys = [{ - 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; - }; - zanculmarktum = { - name = "Azure Zanculmarktum"; - email = "zanculmarktum@gmail.com"; - github = "zanculmarktum"; - githubId = 16958511; - }; - kuwii = { - name = "kuwii"; - email = "kuwii.someone@gmail.com"; - github = "kuwii"; - githubId = 10705175; - }; - melias122 = { - name = "Martin Elias"; - email = "martin+nixpkgs@elias.sx"; - github = "melias122"; - githubId = 1027766; - }; - bryanhonof = { - name = "Bryan Honof"; - email = "bryanhonof@gmail.com"; - github = "bryanhonof"; - githubId = 5932804; - }; - bbenne10 = { - email = "Bryan.Bennett@protonmail.com"; - matrix = "@bryan.bennett:matrix.org"; - github = "bbenne10"; - githubId = 687376; - name = "Bryan Bennett"; - keys = [{ - # compare with https://keybase.io/bbenne10 - fingerprint = "41EA 00B4 00F9 6970 1CB2 D3AF EF90 E3E9 8B8F 5C0B"; - }]; - }; - snpschaaf = { - email = "philipe.schaaf@secunet.com"; - name = "Philippe Schaaf"; - github = "snpschaaf"; - githubId = 105843013; - }; - SohamG = { - email = "sohamg2@gmail.com"; - name = "Soham S Gumaste"; - github = "SohamG"; - githubId = 7116239; - keys = [{ - fingerprint = "E067 520F 5EF2 C175 3F60 50C0 BA46 725F 6A26 7442"; - }]; - }; - jali-clarke = { - email = "jinnah.ali-clarke@outlook.com"; - name = "Jinnah Ali-Clarke"; - github = "jali-clarke"; - githubId = 17733984; - }; - wesleyjrz = { - email = "wesleyjr2002@gmail.com"; - name = "Wesley V. Santos Jr."; - github = "wesleyjrz"; - githubId = 60184588; - }; - npatsakula = { - email = "nikita.patsakula@gmail.com"; - name = "Patsakula Nikita"; - github = "npatsakula"; - githubId = 23001619; - }; - dfithian = { - email = "daniel.m.fithian@gmail.com"; - name = "Daniel Fithian"; - github = "dfithian"; - githubId = 8409320; - }; - nikstur = { - email = "nikstur@outlook.com"; - name = "nikstur"; - github = "nikstur"; - githubId = 61635709; - }; - yisuidenghua = { - email = "bileiner@gmail.com"; - name = "Milena Yisui"; - github = "YisuiDenghua"; - githubId = 102890144; - }; - macalinao = { - email = "me@ianm.com"; - name = "Ian Macalinao"; - github = "macalinao"; - githubId = 401263; - keys = [{ - fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; - }]; - }; - tjni = { - email = "43ngvg@masqt.com"; - matrix = "@tni:matrix.org"; - name = "Theodore Ni"; - github = "tjni"; - githubId = 3806110; - keys = [{ - fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4"; - }]; - }; - bezmuth = { - email = "benkel97@protonmail.com"; - name = "Ben Kelly"; - github = "bezmuth"; - githubId = 31394095; - }; - cafkafk = { - email = "christina@cafkafk.com"; - matrix = "@cafkafk:matrix.cafkafk.com"; - name = "Christina Sørensen"; - github = "cafkafk"; - githubId = 89321978; - keys = [ - { - fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; - } - { - fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED"; - } - ]; - }; - rb = { - email = "maintainers@cloudposse.com"; - github = "nitrocode"; - githubId = 7775707; - name = "RB"; - }; - bpaulin = { - email = "brunopaulin@bpaulin.net"; - github = "bpaulin"; - githubId = 115711; - name = "bpaulin"; - }; - zuzuleinen = { - email = "andrey.boar@gmail.com"; - name = "Andrei Boar"; - github = "zuzuleinen"; - githubId = 944919; - }; - quasigod-io = { - email = "quasigod-io@protonmail.com"; - name = "Michael Belsanti"; - github = "quasigod-io"; - githubId = 62124625; - }; - waelwindows = { - email = "waelwindows9922@gmail.com"; - github = "Waelwindows"; - githubId = 5228243; - name = "waelwindows"; - }; - wuyoli = { - name = "wuyoli"; - email = "wuyoli@tilde.team"; - github = "wuyoli"; - githubId = 104238274; - }; - jordanisaacs = { - name = "Jordan Isaacs"; - email = "nix@jdisaacs.com"; - github = "jordanisaacs"; - githubId = 19742638; - }; } +/* Keep the list alphabetically sorted. */ diff --git a/maintainers/scripts/db-to-md.sh b/maintainers/scripts/db-to-md.sh index 01357d1e2412..aa2a2775b6de 100755 --- a/maintainers/scripts/db-to-md.sh +++ b/maintainers/scripts/db-to-md.sh @@ -41,7 +41,7 @@ pandoc_flags=( # - diagram-generator.lua (we do not support that in NixOS manual to limit dependencies) # - media extraction (was only required for diagram generator) # - myst-reader/roles.lua (only relevant for MyST → DocBook) - # - link-unix-man-references.lua (links should only be added to display output) + # - link-manpages.lua (links should only be added to display output) # - docbook-writer/rst-roles.lua (only relevant for → DocBook) # - docbook-writer/labelless-link-is-xref.lua (only relevant for → DocBook) "--lua-filter=$DIR/../../doc/build-aux/pandoc-filters/docbook-reader/citerefentry-to-rst-role.lua" diff --git a/maintainers/scripts/debian-patches.sh b/maintainers/scripts/debian-patches.sh index de6be136ca77..1f021c224c3a 100755 --- a/maintainers/scripts/debian-patches.sh +++ b/maintainers/scripts/debian-patches.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Download patches from debian project # Usage $0 debian-patches.txt debian-patches.nix diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix index bb9572cbc795..4f0ca2465025 100644 --- a/maintainers/scripts/eval-release.nix +++ b/maintainers/scripts/eval-release.nix @@ -17,6 +17,7 @@ let if (builtins.tryEval attrs.drvPath).success then { inherit (attrs) name drvPath; } else { failed = true; } + else if attrs == null then {} else { recurseForDerivations = true; } // mapAttrs (n: v: let path' = path ++ [n]; in trace path' (recurse path' v)) attrs else { }; diff --git a/maintainers/scripts/eval-release.sh b/maintainers/scripts/eval-release.sh index e0dfaf1de74c..b588c767b6ae 100755 --- a/maintainers/scripts/eval-release.sh +++ b/maintainers/scripts/eval-release.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash if [[ -z "$VERBOSE" ]]; then echo "You may set VERBOSE=1 to see debug output or to any other non-empty string to make this script completely silent" diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index f7e5f573982d..f86f0fbc6a2d 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -112,7 +112,8 @@ main = do ["get-report"] -> getBuildReports ["ping-maintainers"] -> printMaintainerPing ["mark-broken-list"] -> printMarkBrokenList - _ -> putStrLn "Usage: get-report | ping-maintainers | mark-broken-list" + ["eval-info"] -> printEvalInfo + _ -> putStrLn "Usage: get-report | ping-maintainers | mark-broken-list | eval-info" reportFileName :: IO FilePath reportFileName = getXdgDirectory XdgCache "haskell-updates-build-report.json" @@ -396,12 +397,22 @@ jobTotals (summaryBuilds -> Table mapping) = getSum <$> Table (Map.foldMapWithKe details :: Text -> [Text] -> [Text] details summary content = ["
" <> summary <> " ", ""] <> content <> ["
", ""] +evalLine :: Eval -> UTCTime -> Text +evalLine Eval{id, jobsetevalinputs = JobsetEvalInputs{nixpkgs = Nixpkgs{revision}}} fetchTime = + "*evaluation [" + <> showT id + <> "](https://hydra.nixos.org/eval/" + <> showT id + <> ") of nixpkgs commit [" + <> Text.take 7 revision + <> "](https://github.com/NixOS/nixpkgs/commits/" + <> revision + <> ") as of " + <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime) + <> "*" + printBuildSummary :: Eval -> UTCTime -> StatusSummary -> [(Text, Int)] -> Text -printBuildSummary - Eval{id, jobsetevalinputs = JobsetEvalInputs{nixpkgs = Nixpkgs{revision}}} - fetchTime - summary - topBrokenRdeps = +printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = Text.unlines $ headline <> [""] <> tldr <> ((" * "<>) <$> (errors <> warnings)) <> [""] <> totals @@ -415,26 +426,15 @@ printBuildSummary <> ["","*:arrow_heading_up:: The number of packages that depend (directly or indirectly) on this package (if any). If two numbers are shown the first (lower) number considers only packages which currently have enabled hydra jobs, i.e. are not marked broken. The second (higher) number considers all packages.*",""] <> footer where - footer = ["*Report generated with [maintainers/scripts/haskell/hydra-report.hs](https://github.com/NixOS/nixpkgs/blob/haskell-updates/maintainers/scripts/haskell/hydra-report.sh)*"] + footer = ["*Report generated with [maintainers/scripts/haskell/hydra-report.hs](https://github.com/NixOS/nixpkgs/blob/haskell-updates/maintainers/scripts/haskell/hydra-report.hs)*"] + headline = + [ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)" + , evalLine eval fetchTime ] totals = [ "#### Build summary" , "" ] <> printTable "Platform" (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) (\x -> showT x <> " " <> icon x) showT numSummary - headline = - [ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)" - , "*evaluation [" - <> showT id - <> "](https://hydra.nixos.org/eval/" - <> showT id - <> ") of nixpkgs commit [" - <> Text.take 7 revision - <> "](https://github.com/NixOS/nixpkgs/commits/" - <> revision - <> ") as of " - <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime) - <> "*" - ] brokenLine (name, rdeps) = "[" <> name <> "](https://packdeps.haskellers.com/reverse/" <> name <> ") :arrow_heading_up: " <> Text.pack (show rdeps) <> " " numSummary = statusToNumSummary summary jobsByState predicate = Map.filter (predicate . worstState) summary @@ -469,6 +469,11 @@ printBuildSummary maintainedJob = Map.lookup "maintained" summary mergeableJob = Map.lookup "mergeable" summary +printEvalInfo :: IO () +printEvalInfo = do + (eval, fetchTime, _) <- readBuildReports + putStrLn (Text.unpack $ evalLine eval fetchTime) + printMaintainerPing :: IO () printMaintainerPing = do (maintainerMap, (reverseDependencyMap, topBrokenRdeps)) <- concurrently getMaintainerMap do diff --git a/maintainers/scripts/haskell/mark-broken.sh b/maintainers/scripts/haskell/mark-broken.sh index 97dd5be8aaa6..2111ef52bc05 100755 --- a/maintainers/scripts/haskell/mark-broken.sh +++ b/maintainers/scripts/haskell/mark-broken.sh @@ -34,6 +34,7 @@ clear="env -u HOME -u NIXPKGS_CONFIG" $clear maintainers/scripts/haskell/regenerate-hackage-packages.sh $clear maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh $clear maintainers/scripts/haskell/regenerate-hackage-packages.sh +evalline=$(maintainers/scripts/haskell/hydra-report.hs eval-info) if [[ "${1:-}" == "--do-commit" ]]; then git add $broken_config @@ -42,6 +43,8 @@ git add pkgs/development/haskell-modules/hackage-packages.nix git commit -F - << EOF haskellPackages: mark builds failing on hydra as broken -This commit has been generated by maintainers/scripts/haskell/mark-broken.sh +This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on +$evalline +from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates EOF fi diff --git a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh index 94104e00edb8..69455bfb6879 100755 --- a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +++ b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils nix gnused -I nixpkgs=. +#! nix-shell -i bash -p coreutils jq nix -I nixpkgs=. config_file=pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -12,4 +12,4 @@ dont-distribute-packages: EOF echo "Regenerating list of transitive broken packages ..." -echo -e $(nix-instantiate --eval --strict maintainers/scripts/haskell/transitive-broken-packages.nix) | sed 's/\"//' | LC_ALL=C.UTF-8 sort -i >> $config_file +nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix | jq -r . | LC_ALL=C.UTF-8 sort -i >> $config_file diff --git a/maintainers/scripts/haskell/transitive-broken-packages.nix b/maintainers/scripts/haskell/transitive-broken-packages.nix index d4ddaa957658..50ccb14577bc 100644 --- a/maintainers/scripts/haskell/transitive-broken-packages.nix +++ b/maintainers/scripts/haskell/transitive-broken-packages.nix @@ -12,5 +12,5 @@ let (getEvaluating (nixpkgs { config.allowBroken = true; }).haskellPackages); in '' - ${lib.concatMapStringsSep "\n" (x: " - ${x}") brokenDeps} + ${lib.concatMapStringsSep "\n" (x: " - ${x}") brokenDeps} '' diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index f1f04cdf4504..426c371d1d35 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -62,10 +62,12 @@ sed -r \ -e '/ lsp-types /d' \ -e '/ lsp-test /d' \ -e '/ hie-bios /d' \ + -e '/ ShellCheck /d' \ < "${tmpfile_new}" >> $stackage_config # Explanations: # cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing. # lsp, lsp-types, lsp-test, hie-bios: These are tightly coupled to hls which is not in stackage. They have no rdeps in stackage. +# ShellCheck: latest version of command-line dev tool. if [[ "${1:-}" == "--do-commit" ]]; then git add $stackage_config diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 49bc50ae6131..b8f8bf6ef488 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -11,6 +11,7 @@ compat53,,,,0.7-1,,vcunat cosmo,,,,,,marsam coxpcall,,,,1.17.0-1,, cqueues,,,,,,vcunat +cyan,,,,,, cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,, digestif,https://github.com/astoff/digestif.git,,,0.2-1,5.3, dkjson,,,,,, @@ -64,6 +65,7 @@ luaevent,,,,,, luaexpat,,,,1.4.1-1,,arobyn flosse luaffi,,,http://luarocks.org/dev,,, luafilesystem,,,,1.8.0-1,,flosse +lualdap,,,,,,aanderse lualogging,,,,,, luaossl,,,,,5.1, luaposix,,,,34.1.1-1,,vyp lblasc @@ -99,6 +101,7 @@ sqlite,,,,,, std._debug,https://github.com/lua-stdlib/_debug.git,,,,, std.normalize,https://github.com/lua-stdlib/normalize.git,,,,, stdlib,,,,41.2.2,,vyp +teal-language-server,,,http://luarocks.org/dev,,, tl,,,,,,mephistophiles vstruct,https://github.com/ToxicFrog/vstruct.git,,,,, vusted,,,,,,figsoda diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/maintainers/scripts/nix-generate-from-cpan.nix index 9f9833d40607..bf48a5318611 100644 --- a/maintainers/scripts/nix-generate-from-cpan.nix +++ b/maintainers/scripts/nix-generate-from-cpan.nix @@ -9,15 +9,14 @@ stdenv.mkDerivation { perl GetoptLongDescriptive CPANPLUS Readonly LogLog4perl ]; - phases = [ "installPhase" ]; + dontUnpack = true; - installPhase = - '' - mkdir -p $out/bin - cp ${./nix-generate-from-cpan.pl} $out/bin/nix-generate-from-cpan - patchShebangs $out/bin/nix-generate-from-cpan - wrapProgram $out/bin/nix-generate-from-cpan --set PERL5LIB $PERL5LIB - ''; + installPhase = '' + mkdir -p $out/bin + cp ${./nix-generate-from-cpan.pl} $out/bin/nix-generate-from-cpan + patchShebangs $out/bin/nix-generate-from-cpan + wrapProgram $out/bin/nix-generate-from-cpan --set PERL5LIB $PERL5LIB + ''; meta = { maintainers = with lib.maintainers; [ eelco ]; diff --git a/maintainers/scripts/update-channel-branches.sh b/maintainers/scripts/update-channel-branches.sh index d65cf3ec5f63..eaa731adccce 100755 --- a/maintainers/scripts/update-channel-branches.sh +++ b/maintainers/scripts/update-channel-branches.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash set -e : ${NIXOS_CHANNELS:=https://nixos.org/channels/} diff --git a/maintainers/scripts/update-luarocks-shell.nix b/maintainers/scripts/update-luarocks-shell.nix index a58674fca8d3..346b0319b08c 100644 --- a/maintainers/scripts/update-luarocks-shell.nix +++ b/maintainers/scripts/update-luarocks-shell.nix @@ -2,7 +2,7 @@ }: with nixpkgs; let - pyEnv = python3.withPackages(ps: [ ps.GitPython ]); + pyEnv = python3.withPackages(ps: [ ps.gitpython ]); in mkShell { packages = [ diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index da3e202b76e4..49ddf1f10be8 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -168,6 +168,15 @@ with lib.maintainers; { shortName = "Cosmopolitan"; }; + deepin = { + members = [ + rewine + ]; + scope = "Maintain deepin desktop environment and related packages."; + shortName = "DDE"; + enableFeatureFreezePing = true; + }; + deshaw = { # Verify additions to this team with at least one already existing member of the team. members = [ @@ -265,12 +274,22 @@ with lib.maintainers; { shortName = "GCC"; }; + geospatial = { + members = [ + imincik + sikmir + ]; + scope = "Maintain geospatial packages."; + shortName = "Geospatial"; + }; + golang = { members = [ c00w kalbasit mic92 zowoq + qbit ]; scope = "Maintain Golang compilers."; shortName = "Go"; @@ -388,6 +407,19 @@ with lib.maintainers; { shortName = "Linux Kernel"; }; + llvm = { + members = [ + ericson2314 + sternenseemann + lovek323 + dtzWill + primeos + ]; + scope = "Maintain LLVM package sets and related packages"; + shortName = "LLVM"; + enableFeatureFreezePing = true; + }; + lumiguide = { # Verify additions by approval of an already existing member of the team. members = [ @@ -497,6 +529,18 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + node = { + members = [ + lilyinstarlight + marsam + winter + yuka + ]; + scope = "Maintain Node.js runtimes and build tooling."; + shortName = "Node.js"; + enableFeatureFreezePing = true; + }; + numtide = { members = [ mic92 @@ -654,9 +698,11 @@ with lib.maintainers; { rust = { members = [ - andir + figsoda lnl7 mic92 + tjni + winter zowoq ]; scope = "Maintain the Rust compiler toolchain and nixpkgs integration."; @@ -722,6 +768,7 @@ with lib.maintainers; { vim = { members = [ + figsoda jonringer softinio teto @@ -733,6 +780,7 @@ with lib.maintainers; { xfce = { members = [ romildo + muscaln ]; scope = "Maintain Xfce desktop environment and related packages."; shortName = "Xfce"; diff --git a/nixos/doc/manual/administration/service-mgmt.chapter.md b/nixos/doc/manual/administration/service-mgmt.chapter.md index bb0f9b62e913..674c73741680 100644 --- a/nixos/doc/manual/administration/service-mgmt.chapter.md +++ b/nixos/doc/manual/administration/service-mgmt.chapter.md @@ -75,7 +75,7 @@ necessary). Packages in Nixpkgs sometimes provide systemd units with them, usually in e.g `#pkg-out#/lib/systemd/`. Putting such a package in -`environment.systemPackages` doesn\'t make the service available to +`environment.systemPackages` doesn't make the service available to users or the system. In order to enable a systemd *system* service with provided upstream @@ -87,9 +87,9 @@ systemd.packages = [ pkgs.packagekit ]; Usually NixOS modules written by the community do the above, plus take care of other details. If a module was written for a service you are -interested in, you\'d probably need only to use +interested in, you'd probably need only to use `services.#name#.enable = true;`. These services are defined in -Nixpkgs\' [ `nixos/modules/` directory +Nixpkgs' [ `nixos/modules/` directory ](https://github.com/NixOS/nixpkgs/tree/master/nixos/modules). In case the service is simple enough, the above method should work, and start the service on boot. @@ -98,8 +98,8 @@ the service on boot. differently. Given a package that has a systemd unit file at `#pkg-out#/lib/systemd/user/`, using [](#opt-systemd.packages) will make you able to start the service via `systemctl --user start`, but it -won\'t start automatically on login. However, You can imperatively -enable it by adding the package\'s attribute to +won't start automatically on login. However, You can imperatively +enable it by adding the package's attribute to [](#opt-systemd.packages) and then do this (e.g): ```ShellSession @@ -113,7 +113,7 @@ If you are interested in a timer file, use `timers.target.wants` instead of `default.target.wants` in the 1st and 2nd command. Using `systemctl --user enable syncthing.service` instead of the above, -will work, but it\'ll use the absolute path of `syncthing.service` for +will work, but it'll use the absolute path of `syncthing.service` for the symlink, and this path is in `/nix/store/.../lib/systemd/user/`. Hence [garbage collection](#sec-nix-gc) will remove that file and you will wind up with a broken symlink in your systemd configuration, which diff --git a/nixos/doc/manual/configuration/config-file.section.md b/nixos/doc/manual/configuration/config-file.section.md index efd231fd1f4e..b010026c5828 100644 --- a/nixos/doc/manual/configuration/config-file.section.md +++ b/nixos/doc/manual/configuration/config-file.section.md @@ -170,6 +170,6 @@ Packages ``` The latter option definition changes the default PostgreSQL package - used by NixOS's PostgreSQL service to 10.x. For more information on + used by NixOS's PostgreSQL service to 14.x. For more information on packages, including how to add new ones, see [](#sec-custom-packages). diff --git a/nixos/doc/manual/configuration/gpu-accel.chapter.md b/nixos/doc/manual/configuration/gpu-accel.chapter.md index 835cbad55485..aa41e25e56f3 100644 --- a/nixos/doc/manual/configuration/gpu-accel.chapter.md +++ b/nixos/doc/manual/configuration/gpu-accel.chapter.md @@ -159,6 +159,40 @@ environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; ``` +## VA-API {#sec-gpu-accel-va-api} + +[VA-API (Video Acceleration API)](https://www.intel.com/content/www/us/en/developer/articles/technical/linuxmedia-vaapi.html) +is an open-source library and API specification, which provides access to +graphics hardware acceleration capabilities for video processing. + +VA-API drivers are loaded by `libva`. The version in nixpkgs is built to search +the opengl driver path, so drivers can be installed in +[](#opt-hardware.opengl.extraPackages). + +VA-API can be tested using: + +```ShellSession +$ nix-shell -p libva-utils --run vainfo +``` + +### Intel {#sec-gpu-accel-va-api-intel} + +Modern Intel GPUs use the iHD driver, which can be installed with: + +```nix +hardware.opengl.extraPackages = [ + intel-media-driver +]; +``` + +Older Intel GPUs use the i965 driver, which can be installed with: + +```nix +hardware.opengl.extraPackages = [ + vaapiIntel +]; +``` + ## Common issues {#sec-gpu-accel-common-issues} ### User permissions {#sec-gpu-accel-common-issues-permissions} diff --git a/nixos/doc/manual/configuration/kubernetes.chapter.md b/nixos/doc/manual/configuration/kubernetes.chapter.md index 5d7b083289d9..f39726090e43 100644 --- a/nixos/doc/manual/configuration/kubernetes.chapter.md +++ b/nixos/doc/manual/configuration/kubernetes.chapter.md @@ -17,7 +17,7 @@ services.kubernetes = { }; ``` -Another way is to assign cluster roles (\"master\" and/or \"node\") to +Another way is to assign cluster roles ("master" and/or "node") to the host. This enables apiserver, controllerManager, scheduler, addonManager, kube-proxy and etcd: diff --git a/nixos/doc/manual/configuration/linux-kernel.chapter.md b/nixos/doc/manual/configuration/linux-kernel.chapter.md index 1d06543d4f1e..f5bce99dd1bb 100644 --- a/nixos/doc/manual/configuration/linux-kernel.chapter.md +++ b/nixos/doc/manual/configuration/linux-kernel.chapter.md @@ -17,6 +17,16 @@ you may want to use one of the unversioned `pkgs.linuxPackages_*` aliases such as `pkgs.linuxPackages_latest`, that are kept up to date with new versions. +Please note that the current convention in NixOS is to only keep actively +maintained kernel versions on both unstable and the currently supported stable +release(s) of NixOS. This means that a non-longterm kernel will be removed after it's +abandoned by the kernel developers, even on stable NixOS versions. If you +pin your kernel onto a non-longterm version, expect your evaluation to fail as +soon as the version is out of maintenance. + +Longterm versions of kernels will be removed before the next stable NixOS that will +exceed the maintenance period of the kernel version. + The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command: @@ -72,61 +82,68 @@ boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; sets the kernel's TCP keepalive time to 120 seconds. To see the available parameters, run `sysctl -a`. -## Customize your kernel {#sec-linux-config-customizing} +## Building a custom kernel {#sec-linux-config-customizing} -The first step before compiling the kernel is to generate an appropriate -`.config` configuration. Either you pass your own config via the -`configfile` setting of `linuxKernel.manualConfig`: +You can customize the default kernel configuration by overriding the arguments for your kernel package: ```nix -custom-kernel = let base_kernel = linuxKernel.kernels.linux_4_9; - in super.linuxKernel.manualConfig { - inherit (super) stdenv hostPlatform; - inherit (base_kernel) src; - version = "${base_kernel.version}-custom"; - - configfile = /home/me/my_kernel_config; - allowImportFromDerivation = true; -}; -``` - -You can edit the config with this snippet (by default `make - menuconfig` won\'t work out of the box on nixos): - -```ShellSession -nix-shell -E 'with import {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkg-config ncurses ];})' -``` - -or you can let nixpkgs generate the configuration. Nixpkgs generates it -via answering the interactive kernel utility `make config`. The answers -depend on parameters passed to -`pkgs/os-specific/linux/kernel/generic.nix` (which you can influence by -overriding `extraConfig, autoModules, - modDirVersion, preferBuiltin, extraConfig`). - -```nix -mptcp93.override ({ - name="mptcp-local"; - +pkgs.linux_latest.override { ignoreConfigErrors = true; autoModules = false; kernelPreferBuiltin = true; + extraStructuredConfig = with lib.kernel; { + DEBUG_KERNEL = yes; + FRAME_POINTER = yes; + KGDB = yes; + KGDB_SERIAL_CONSOLE = yes; + DEBUG_INFO = yes; + }; +} +``` - enableParallelBuilding = true; +See `pkgs/os-specific/linux/kernel/generic.nix` for details on how these arguments +affect the generated configuration. You can also build a custom version of Linux by calling +`pkgs.buildLinux` directly, which requires the `src` and `version` arguments to be specified. - extraConfig = '' - DEBUG_KERNEL y - FRAME_POINTER y - KGDB y - KGDB_SERIAL_CONSOLE y - DEBUG_INFO y - ''; -}); +To use your custom kernel package in your NixOS configuration, set + +```nix +boot.kernelPackages = pkgs.linuxPackagesFor yourCustomKernel; +``` + +Note that this method will use the common configuration defined in `pkgs/os-specific/linux/kernel/common-config.nix`, +which is suitable for a NixOS system. + +If you already have a generated configuration file, you can build a kernel that uses it with `pkgs.linuxManualConfig`: + +```nix +let + baseKernel = pkgs.linux_latest; +in pkgs.linuxManualConfig { + inherit (baseKernel) src modDirVersion; + version = "${baseKernel.version}-custom"; + configfile = ./my_kernel_config; + allowImportFromDerivation = true; +} +``` + +::: {.note} +The build will fail if `modDirVersion` does not match the source's `kernel.release` file, +so `modDirVersion` should remain tied to `src`. +::: + +To edit the `.config` file for Linux X.Y, proceed as follows: + +```ShellSession +$ nix-shell '' -A linuxKernel.kernels.linux_X_Y.configEnv +$ unpackPhase +$ cd linux-* +$ make nconfig ``` ## Developing kernel modules {#sec-linux-config-developing-modules} -When developing kernel modules it\'s often convenient to run +When developing kernel modules it's often convenient to run edit-compile-run loop as quickly as possible. See below snippet as an example of developing `mellanox` drivers. @@ -138,3 +155,26 @@ $ cd linux-* $ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules # insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko ``` + +## ZFS {#sec-linux-zfs} + +It's a common issue that the latest stable version of ZFS doesn't support the latest +available Linux kernel. It is recommended to use the latest available LTS that's compatible +with ZFS. Usually this is the default kernel provided by nixpkgs (i.e. `pkgs.linuxPackages`). + +Alternatively, it's possible to pin the system to the latest available kernel +version *that is supported by ZFS* like this: + +```nix +{ + boot.kernelPackages = pkgs.zfs.latestCompatibleLinuxPackages; +} +``` + +Please note that the version this attribute points to isn't monotonic because the latest kernel +version only refers to kernel versions supported by the Linux developers. In other words, +the latest kernel version that ZFS is compatible with may decrease over time. + +An example: the latest version ZFS is compatible with is 5.19 which is a non-longterm version. When 5.19 +is out of maintenance, the latest supported kernel version is 5.15 because it's longterm and the versions +5.16, 5.17 and 5.18 are already out of maintenance because they're non-longterm. diff --git a/nixos/doc/manual/configuration/profiles.chapter.md b/nixos/doc/manual/configuration/profiles.chapter.md index b4ae1b7d3faa..2c3dea27c181 100644 --- a/nixos/doc/manual/configuration/profiles.chapter.md +++ b/nixos/doc/manual/configuration/profiles.chapter.md @@ -2,7 +2,7 @@ In some cases, it may be desirable to take advantage of commonly-used, predefined configurations provided by nixpkgs, but different from those -that come as default. This is a role fulfilled by NixOS\'s Profiles, +that come as default. This is a role fulfilled by NixOS's Profiles, which come as files living in ``. That is to say, expected usage is to add them to the imports list of your `/etc/configuration.nix` as such: diff --git a/nixos/doc/manual/configuration/profiles/hardened.section.md b/nixos/doc/manual/configuration/profiles/hardened.section.md index 9fb5e18c384a..2e9bb196c054 100644 --- a/nixos/doc/manual/configuration/profiles/hardened.section.md +++ b/nixos/doc/manual/configuration/profiles/hardened.section.md @@ -7,7 +7,7 @@ This includes a hardened kernel, and limiting the system information available to processes through the `/sys` and `/proc` filesystems. It also disables the User Namespaces feature of the kernel, which stops Nix from being able to build anything -(this particular setting can be overriden via +(this particular setting can be overridden via [](#opt-security.allowUserNamespaces)). See the [profile source](https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix) for further detail on which settings are altered. diff --git a/nixos/doc/manual/configuration/ssh.section.md b/nixos/doc/manual/configuration/ssh.section.md index cba81eb43f49..9e239a848178 100644 --- a/nixos/doc/manual/configuration/ssh.section.md +++ b/nixos/doc/manual/configuration/ssh.section.md @@ -8,7 +8,7 @@ services.openssh.enable = true; By default, root logins using a password are disallowed. They can be disabled entirely by setting -[](#opt-services.openssh.permitRootLogin) to `"no"`. +[](#opt-services.openssh.settings.PermitRootLogin) to `"no"`. You can declaratively specify authorised RSA/DSA public keys for a user as follows: diff --git a/nixos/doc/manual/configuration/user-mgmt.chapter.md b/nixos/doc/manual/configuration/user-mgmt.chapter.md index 5c3aca3ef9e9..b35b38f6e964 100644 --- a/nixos/doc/manual/configuration/user-mgmt.chapter.md +++ b/nixos/doc/manual/configuration/user-mgmt.chapter.md @@ -30,7 +30,7 @@ to your NixOS configuration. For instance, if you remove a user from [](#opt-users.users) and run nixos-rebuild, the user account will cease to exist. Also, imperative commands for managing users and groups, such as useradd, are no longer available. Passwords may still be -assigned by setting the user\'s +assigned by setting the user's [hashedPassword](#opt-users.users._name_.hashedPassword) option. A hashed password can be generated using `mkpasswd`. diff --git a/nixos/doc/manual/configuration/wayland.chapter.md b/nixos/doc/manual/configuration/wayland.chapter.md index a3a46aa3da6f..0f195bd66567 100644 --- a/nixos/doc/manual/configuration/wayland.chapter.md +++ b/nixos/doc/manual/configuration/wayland.chapter.md @@ -4,7 +4,7 @@ While X11 (see [](#sec-x11)) is still the primary display technology on NixOS, Wayland support is steadily improving. Where X11 separates the X Server and the window manager, on Wayland those are combined: a Wayland Compositor is like an X11 window manager, but also embeds the -Wayland \'Server\' functionality. This means it is sufficient to install +Wayland 'Server' functionality. This means it is sufficient to install a Wayland Compositor such as sway without separately enabling a Wayland server: diff --git a/nixos/doc/manual/configuration/wireless.section.md b/nixos/doc/manual/configuration/wireless.section.md index 6b223d843ac5..3299d2d7ecb8 100644 --- a/nixos/doc/manual/configuration/wireless.section.md +++ b/nixos/doc/manual/configuration/wireless.section.md @@ -50,7 +50,7 @@ networking.wireless.networks = { echelon = { pskRaw = "dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435"; }; -} +}; ``` or you can use it to directly generate the `wpa_supplicant.conf`: diff --git a/nixos/doc/manual/configuration/x-windows.chapter.md b/nixos/doc/manual/configuration/x-windows.chapter.md index 27d117238807..be185cf4c314 100644 --- a/nixos/doc/manual/configuration/x-windows.chapter.md +++ b/nixos/doc/manual/configuration/x-windows.chapter.md @@ -81,7 +81,7 @@ second password to login can be redundant. To enable auto-login, you need to define your default window manager and desktop environment. If you wanted no desktop environment and i3 as your -your window manager, you\'d define: +your window manager, you'd define: ```nix services.xserver.displayManager.defaultSession = "none+i3"; @@ -110,7 +110,7 @@ maintained but may perform worse in some cases (like in old chipsets). The second driver, `intel`, is specific to Intel GPUs, but not recommended by most distributions: it lacks several modern features (for -example, it doesn\'t support Glamor) and the package hasn\'t been +example, it doesn't support Glamor) and the package hasn't been officially updated since 2015. The results vary depending on the hardware, so you may have to try both @@ -162,7 +162,7 @@ with other kernel modules. AMD provides a proprietary driver for its graphics cards that is not enabled by default because it's not Free Software, is often broken in -nixpkgs and as of this writing doesn\'t offer more features or +nixpkgs and as of this writing doesn't offer more features or performance. If you still want to use it anyway, you need to explicitly set: @@ -199,9 +199,9 @@ GTK themes can be installed either to user profile or system-wide (via GTK ones, you can use the following configuration: ```nix -qt5.enable = true; -qt5.platformTheme = "gtk2"; -qt5.style = "gtk2"; +qt.enable = true; +qt.platformTheme = "gtk2"; +qt.style = "gtk2"; ``` ## Custom XKB layouts {#custom-xkb-layouts .unnumbered} @@ -215,7 +215,7 @@ US layout, with an additional layer to type some greek symbols by pressing the right-alt key. Create a file called `us-greek` with the following content (under a -directory called `symbols`; it\'s an XKB peculiarity that will help with +directory called `symbols`; it's an XKB peculiarity that will help with testing): ```nix @@ -249,7 +249,7 @@ The name (after `extraLayouts.`) should match the one given to the Applying this customization requires rebuilding several packages, and a broken XKB file can lead to the X session crashing at login. Therefore, -you\'re strongly advised to **test your layout before applying it**: +you're strongly advised to **test your layout before applying it**: ```ShellSession $ nix-shell -p xorg.xkbcomp @@ -313,8 +313,8 @@ prefer to keep the layout definitions inside the NixOS configuration. Unfortunately, the Xorg server does not (currently) support setting a keymap directly but relies instead on XKB rules to select the matching -components (keycodes, types, \...) of a layout. This means that -components other than symbols won\'t be loaded by default. As a +components (keycodes, types, ...) of a layout. This means that +components other than symbols won't be loaded by default. As a workaround, you can set the keymap using `setxkbmap` at the start of the session with: @@ -323,7 +323,7 @@ services.xserver.displayManager.sessionCommands = "setxkbmap -keycodes media"; ``` If you are manually starting the X server, you should set the argument -`-xkbdir /etc/X11/xkb`, otherwise X won\'t find your layout files. For +`-xkbdir /etc/X11/xkb`, otherwise X won't find your layout files. For example with `xinit` run ```ShellSession diff --git a/nixos/doc/manual/configuration/xfce.chapter.md b/nixos/doc/manual/configuration/xfce.chapter.md index ee60d465e3b3..c331e63cfe54 100644 --- a/nixos/doc/manual/configuration/xfce.chapter.md +++ b/nixos/doc/manual/configuration/xfce.chapter.md @@ -31,8 +31,8 @@ enabled. To enable Thunar without enabling Xfce, use the configuration option [](#opt-programs.thunar.enable) instead of simply adding `pkgs.xfce.thunar` to [](#opt-environment.systemPackages). -If you\'d like to add extra plugins to Thunar, add them to -[](#opt-programs.thunar.plugins). You shouldn\'t just add them to +If you'd like to add extra plugins to Thunar, add them to +[](#opt-programs.thunar.plugins). You shouldn't just add them to [](#opt-environment.systemPackages). ## Troubleshooting {#sec-xfce-troubleshooting .unnumbered} @@ -46,7 +46,7 @@ Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with db ``` This is caused by some needed GNOME services not running. This is all -fixed by enabling \"Launch GNOME services on startup\" in the Advanced +fixed by enabling "Launch GNOME services on startup" in the Advanced tab of the Session and Startup settings panel. Alternatively, you can run this command to do the same thing. diff --git a/nixos/doc/manual/contributing-to-this-manual.chapter.md b/nixos/doc/manual/contributing-to-this-manual.chapter.md index 26813d1042d6..557599809222 100644 --- a/nixos/doc/manual/contributing-to-this-manual.chapter.md +++ b/nixos/doc/manual/contributing-to-this-manual.chapter.md @@ -1,6 +1,6 @@ # Contributing to this manual {#chap-contributing} -The DocBook and CommonMark sources of NixOS' manual are in the [nixos/doc/manual](https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual) subdirectory of the [Nixpkgs](https://github.com/NixOS/nixpkgs) repository. +The [DocBook] and CommonMark sources of the NixOS manual are in the [nixos/doc/manual](https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual) subdirectory of the [Nixpkgs](https://github.com/NixOS/nixpkgs) repository. You can quickly check your edits with the following: @@ -11,3 +11,25 @@ $ nix-build nixos/release.nix -A manual.x86_64-linux ``` If the build succeeds, the manual will be in `./result/share/doc/nixos/index.html`. + +**Contributing to the man pages** + +The man pages are written in [DocBook] which is XML. + +To see what your edits look like: + +```ShellSession +$ cd /path/to/nixpkgs +$ nix-build nixos/release.nix -A manpages.x86_64-linux +``` + +You can then read the man page you edited by running + +```ShellSession +$ man --manpath=result/share/man nixos-rebuild # Replace nixos-rebuild with the command whose manual you edited +``` + +If you're on a different architecture that's supported by NixOS (check nixos/release.nix) then replace `x86_64-linux` with the architecture. +`nix-build` will complain otherwise, but should also tell you which architecture you have + the supported ones. + +[DocBook]: https://en.wikipedia.org/wiki/DocBook diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 6db20cdd6418..264a8bcef27c 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -68,12 +68,15 @@ let sources = lib.sourceFilesBySuffices ./. [".xml"]; - modulesDoc = builtins.toFile "modules.xml" '' -
- ${(lib.concatMapStrings (path: '' - - '') (lib.catAttrs "value" config.meta.doc))} -
+ modulesDoc = runCommand "modules.xml" { + nativeBuildInputs = [ pkgs.nixos-render-docs ]; + } '' + nixos-render-docs manual docbook \ + --manpage-urls ${pkgs.path + "/doc/manpage-urls.json"} \ + "$out" \ + --section \ + --section-id modules \ + --chapters ${lib.concatMapStrings (p: "${p.value} ") config.meta.doc} ''; generatedSources = runCommand "generated-docbook" {} '' @@ -102,11 +105,14 @@ let ''; manualXsltprocOptions = toString [ - "--param section.autolabel 1" - "--param section.label.includes.component.label 1" + "--param chapter.autolabel 0" + "--param part.autolabel 0" + "--param preface.autolabel 0" + "--param reference.autolabel 0" + "--param section.autolabel 0" "--stringparam html.stylesheet 'style.css overrides.css highlightjs/mono-blue.css'" "--stringparam html.script './highlightjs/highlight.pack.js ./highlightjs/loader.js'" - "--param xref.with.number.and.title 1" + "--param xref.with.number.and.title 0" "--param toc.section.depth 0" "--param generate.consistent.ids 1" "--stringparam admon.style ''" @@ -173,40 +179,10 @@ let lintrng $out/man-pages-combined.xml ''; - olinkDB = runCommand "manual-olinkdb" - { inherit sources; - nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; - } - '' - xsltproc \ - ${manualXsltprocOptions} \ - --stringparam collect.xref.targets only \ - --stringparam targets.filename "$out/manual.db" \ - --nonet \ - ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \ - ${manual-combined}/manual-combined.xml - - cat > "$out/olinkdb.xml" < - - ]> - - - Allows for cross-referencing olinks between the manpages - and manual. - - - &manualtargets; - - EOF - ''; - in rec { inherit generatedSources; - inherit (optionsDoc) optionsJSON optionsNix optionsDocBook; + inherit (optionsDoc) optionsJSON optionsNix optionsDocBook optionsUsedDocbook; # Generate the NixOS manual. manualHTML = runCommand "nixos-manual-html" @@ -221,7 +197,6 @@ in rec { mkdir -p $dst xsltproc \ ${manualXsltprocOptions} \ - --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ --stringparam id.warnings "1" \ --nonet --output $dst/ \ ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \ @@ -258,7 +233,6 @@ in rec { xsltproc \ ${manualXsltprocOptions} \ - --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ --nonet --xinclude --output $dst/epub/ \ ${docbook_xsl_ns}/xml/xsl/docbook/epub/docbook.xsl \ ${manual-combined}/manual-combined.xml @@ -280,19 +254,23 @@ in rec { # Generate the NixOS manpages. manpages = runCommand "nixos-manpages" { inherit sources; - nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; + nativeBuildInputs = [ + buildPackages.libxml2.bin + buildPackages.libxslt.bin + buildPackages.installShellFiles + ]; allowedReferences = ["out"]; } '' # Generate manpages. - mkdir -p $out/share/man + mkdir -p $out/share/man/man8 + installManPage ${./manpages}/* xsltproc --nonet \ --maxdepth 6000 \ --param man.output.in.separate.dir 1 \ --param man.output.base.dir "'$out/share/man/'" \ --param man.endnotes.are.numbered 0 \ --param man.break.after.slash 1 \ - --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl \ ${manual-combined}/man-pages-combined.xml ''; diff --git a/nixos/doc/manual/development/activation-script.section.md b/nixos/doc/manual/development/activation-script.section.md index 1aee252fddea..c339258c6dc4 100644 --- a/nixos/doc/manual/development/activation-script.section.md +++ b/nixos/doc/manual/development/activation-script.section.md @@ -34,7 +34,7 @@ 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 +requests into account and will incorporate 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 @@ -49,7 +49,7 @@ 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. +possibility into account that they have to create them first. ## NixOS snippets {#sec-activation-script-nixos-snippets} diff --git a/nixos/doc/manual/development/bootspec.chapter.md b/nixos/doc/manual/development/bootspec.chapter.md new file mode 100644 index 000000000000..96c12f24e7f1 --- /dev/null +++ b/nixos/doc/manual/development/bootspec.chapter.md @@ -0,0 +1,36 @@ +# Experimental feature: Bootspec {#sec-experimental-bootspec} + +Bootspec is a experimental feature, introduced in the [RFC-0125 proposal](https://github.com/NixOS/rfcs/pull/125), the reference implementation can be found [there](https://github.com/NixOS/nixpkgs/pull/172237) in order to standardize bootloader support +and advanced boot workflows such as SecureBoot and potentially more. + +You can enable the creation of bootspec documents through [`boot.bootspec.enable = true`](options.html#opt-boot.bootspec.enable), which will prompt a warning until [RFC-0125](https://github.com/NixOS/rfcs/pull/125) is officially merged. + +## Schema {#sec-experimental-bootspec-schema} + +The bootspec schema is versioned and validated against [a CUE schema file](https://cuelang.org/) which should considered as the source of truth for your applications. + +You will find the current version [here](../../../modules/system/activation/bootspec.cue). + +## Extensions mechanism {#sec-experimental-bootspec-extensions} + +Bootspec cannot account for all usecases. + +For this purpose, Bootspec offers a generic extension facility [`boot.bootspec.extensions`](options.html#opt-boot.bootspec.extensions) which can be used to inject any data needed for your usecases. + +An example for SecureBoot is to get the Nix store path to `/etc/os-release` in order to bake it into a unified kernel image: + +```nix +{ config, lib, ... }: { + boot.bootspec.extensions = { + "org.secureboot.osRelease" = config.environment.etc."os-release".source; + }; +} +``` + +To reduce incompatibility and prevent names from clashing between applications, it is **highly recommended** to use a unique namespace for your extensions. + +## External bootloaders {#sec-experimental-bootspec-external-bootloaders} + +It is possible to enable your own bootloader through [`boot.loader.external.installHook`](options.html#opt-boot.loader.external.installHook) which can wrap an existing bootloader. + +Currently, there is no good story to compose existing bootloaders to enrich their features, e.g. SecureBoot, etc. It will be necessary to reimplement or reuse existing parts. diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml index 624ee3931659..949468c9021d 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/meta-attributes.section.md b/nixos/doc/manual/development/meta-attributes.section.md index 946c08efd0a3..33b41fe74d29 100644 --- a/nixos/doc/manual/development/meta-attributes.section.md +++ b/nixos/doc/manual/development/meta-attributes.section.md @@ -23,7 +23,7 @@ file. meta = { maintainers = with lib.maintainers; [ ericsagnes ]; - doc = ./default.xml; + doc = ./default.md; buildDocsInSandbox = true; }; } @@ -31,7 +31,9 @@ file. - `maintainers` contains a list of the module maintainers. -- `doc` points to a valid DocBook file containing the module +- `doc` points to a valid [Nixpkgs-flavored CommonMark]( + https://nixos.org/manual/nixpkgs/unstable/#sec-contributing-markup + ) file containing the module documentation. Its contents is automatically added to [](#ch-configuration). Changes to a module documentation have to be checked to not break building the NixOS manual: diff --git a/nixos/doc/manual/development/option-declarations.section.md b/nixos/doc/manual/development/option-declarations.section.md index 88617ab1920a..18ec7ba903a9 100644 --- a/nixos/doc/manual/development/option-declarations.section.md +++ b/nixos/doc/manual/development/option-declarations.section.md @@ -78,7 +78,7 @@ For example: ::: {#ex-options-declarations-util-mkEnableOption-magic .example} ```nix -lib.mkEnableOption "magic" +lib.mkEnableOption (lib.mdDoc "magic") # is like lib.mkOption { type = lib.types.bool; @@ -88,7 +88,7 @@ lib.mkOption { } ``` -### `mkPackageOption` {#sec-option-declarations-util-mkPackageOption} +### `mkPackageOption`, `mkPackageOptionMD` {#sec-option-declarations-util-mkPackageOption} Usage: @@ -106,12 +106,14 @@ The second argument is the name of the option, used in the description "The \ for nixos). This example will replace the existing postgresql module with the version defined in the nixos-unstable channel while keeping the rest of the modules and packages from the original nixos channel. This only -overrides the module definition, this won\'t use postgresql from +overrides the module definition, this won't use postgresql from nixos-unstable unless explicitly configured to do so. ```nix @@ -35,7 +35,7 @@ nixos-unstable unless explicitly configured to do so. This example shows how to define a custom module as a replacement for an existing module. Importing this module will disable the original module -without having to know it\'s implementation details. +without having to know its implementation details. ```nix { config, lib, pkgs, ... }: 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 1130672cb376..54002941d634 100644 --- a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md +++ b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md @@ -24,6 +24,39 @@ back into the test driver command line upon its completion. This allows you to inspect the state of the VMs after the test (e.g. to debug the test script). +## Shell access in interactive mode {#sec-nixos-test-shell-access} + +The function `.shell_interact()` grants access to a shell running +inside a virtual machine. To use it, replace `` with the name of a +virtual machine defined in the test, for example: `machine.shell_interact()`. +Keep in mind that this shell may not display everything correctly as it is +running within an interactive Python REPL, and logging output from the virtual +machine may overwrite input and output from the guest shell: + +```py +>>> machine.shell_interact() +machine: Terminal is ready (there is no initial prompt): +$ hostname +machine +``` + +As an alternative, you can proxy the guest shell to a local TCP server by first +starting a TCP server in a terminal using the command: + +```ShellSession +$ socat 'READLINE,PROMPT=$ ' tcp-listen:4444,reuseaddr` +``` + +In the terminal where the test driver is running, connect to this server by +using: + +```py +>>> machine.shell_interact("tcp:127.0.0.1:4444") +``` + +Once the connection is established, you can enter commands in the socat terminal +where socat is running. + ## Reuse VM state {#sec-nixos-test-reuse-vm-state} You can re-use the VM states coming from a previous run by setting the diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index d569e23adbdc..334149d021cb 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -9,10 +9,10 @@ can be declared. File formats can be separated into two categories: `{ foo = { bar = 10; }; }`. Other examples are INI, YAML and TOML. The following section explains the convention for these settings. -- Non-nix-representable ones: These can\'t be trivially mapped to a +- Non-nix-representable ones: These can't be trivially mapped to a subset of Nix syntax. Most generic programming languages are in this group, e.g. bash, since the statement `if true; then echo hi; fi` - doesn\'t have a trivial representation in Nix. + doesn't have a trivial representation in Nix. Currently there are no fixed conventions for these, but it is common to have a `configFile` option for setting the configuration file @@ -24,7 +24,7 @@ can be declared. File formats can be separated into two categories: an `extraConfig` option of type `lines` to allow arbitrary text after the autogenerated part of the file. -## Nix-representable Formats (JSON, YAML, TOML, INI, \...) {#sec-settings-nix-representable} +## Nix-representable Formats (JSON, YAML, TOML, INI, ...) {#sec-settings-nix-representable} By convention, formats like this are handled with a generic `settings` option, representing the full program configuration as a Nix value. The diff --git a/nixos/doc/manual/development/writing-documentation.chapter.md b/nixos/doc/manual/development/writing-documentation.chapter.md index 7c29f600d701..4986c9f0a81b 100644 --- a/nixos/doc/manual/development/writing-documentation.chapter.md +++ b/nixos/doc/manual/development/writing-documentation.chapter.md @@ -19,7 +19,7 @@ $ nix-shell nix-shell$ make ``` -Once you are done making modifications to the manual, it\'s important to +Once you are done making modifications to the manual, it's important to build it before committing. You can do that as follows: ```ShellSession diff --git a/nixos/doc/manual/development/writing-modules.chapter.md b/nixos/doc/manual/development/writing-modules.chapter.md index 0c41cbd3cb75..fa24679b7fc8 100644 --- a/nixos/doc/manual/development/writing-modules.chapter.md +++ b/nixos/doc/manual/development/writing-modules.chapter.md @@ -71,7 +71,7 @@ The meaning of each part is as follows. - This `imports` list enumerates the paths to other NixOS modules that should be included in the evaluation of the system configuration. A default set of modules is defined in the file `modules/module-list.nix`. - These don\'t need to be added in the import list. + These don't need to be added in the import list. - The attribute `options` is a nested set of *option declarations* (described below). diff --git a/nixos/doc/manual/development/writing-nixos-tests.section.md b/nixos/doc/manual/development/writing-nixos-tests.section.md index 2efe52b9883c..5bcdf6e58eb1 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.section.md +++ b/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -165,7 +165,7 @@ The following methods are available on machine objects: `get_screen_text_variants` : Return a list of different interpretations of what is currently - visible on the machine\'s screen using optical character + visible on the machine's screen using optical character recognition. The number and order of the interpretations is not specified and is subject to change, but if no exception is raised at least one will be returned. @@ -177,7 +177,7 @@ The following methods are available on machine objects: `get_screen_text` : Return a textual representation of what is currently visible on the - machine\'s screen using optical character recognition. + machine's screen using optical character recognition. ::: {.note} This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`. @@ -273,12 +273,13 @@ The following methods are available on machine objects: `wait_for_open_port` -: Wait until a process is listening on the given TCP port (on - `localhost`, at least). +: Wait until a process is listening on the given TCP port and IP address + (default `localhost`). `wait_for_closed_port` -: Wait until nobody is listening on the given TCP port. +: Wait until nobody is listening on the given TCP port and IP address + (default `localhost`). `wait_for_x` @@ -298,7 +299,7 @@ The following methods are available on machine objects: : Wait until the supplied regular expressions match a line of the serial console output. This method is useful when OCR is not - possibile or accurate enough. + possible or accurate enough. `wait_for_window` @@ -350,8 +351,8 @@ machine.wait_for_unit("xautolock.service", "x-session-user") This applies to `systemctl`, `get_unit_info`, `wait_for_unit`, `start_job` and `stop_job`. -For faster dev cycles it\'s also possible to disable the code-linters -(this shouldn\'t be commited though): +For faster dev cycles it's also possible to disable the code-linters +(this shouldn't be committed though): ```nix { @@ -370,7 +371,7 @@ For faster dev cycles it\'s also possible to disable the code-linters This will produce a Nix warning at evaluation time. To fully disable the linter, wrap the test script in comment directives to disable the Black -linter directly (again, don\'t commit this within the Nixpkgs +linter directly (again, don't commit this within the Nixpkgs repository): ```nix diff --git a/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml b/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml index 4243d2bf53f9..35dfaf30f457 100644 --- a/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml +++ b/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml @@ -23,7 +23,7 @@ $ nix-collect-garbage this unit automatically at certain points in time, for instance, every night at 03:15: - + nix.gc.automatic = true; nix.gc.dates = "03:15"; diff --git a/nixos/doc/manual/from_md/administration/container-networking.section.xml b/nixos/doc/manual/from_md/administration/container-networking.section.xml index 788a2b7b0acb..a64053cdfa5e 100644 --- a/nixos/doc/manual/from_md/administration/container-networking.section.xml +++ b/nixos/doc/manual/from_md/administration/container-networking.section.xml @@ -31,7 +31,7 @@ $ ping -c1 10.233.4.2 address. This can be accomplished using the following configuration on the host: - + networking.nat.enable = true; networking.nat.internalInterfaces = ["ve-+"]; networking.nat.externalInterface = "eth0"; @@ -45,7 +45,7 @@ networking.nat.externalInterface = "eth0"; If you are using Network Manager, you need to explicitly prevent it from managing container interfaces: - + networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; diff --git a/nixos/doc/manual/from_md/administration/control-groups.chapter.xml b/nixos/doc/manual/from_md/administration/control-groups.chapter.xml index 8dab2c9d44b4..f78c05878031 100644 --- a/nixos/doc/manual/from_md/administration/control-groups.chapter.xml +++ b/nixos/doc/manual/from_md/administration/control-groups.chapter.xml @@ -42,7 +42,7 @@ $ systemd-cgls process would get 1/1001 of the cgroup’s CPU time.) You can limit a service’s CPU share in configuration.nix: - + systemd.services.httpd.serviceConfig.CPUShares = 512; @@ -57,7 +57,7 @@ systemd.services.httpd.serviceConfig.CPUShares = 512; configuration.nix; for instance, to limit httpd.service to 512 MiB of RAM (excluding swap): - + systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; diff --git a/nixos/doc/manual/from_md/administration/declarative-containers.section.xml b/nixos/doc/manual/from_md/administration/declarative-containers.section.xml index 4831c9c74e84..efc3432ba1a1 100644 --- a/nixos/doc/manual/from_md/administration/declarative-containers.section.xml +++ b/nixos/doc/manual/from_md/administration/declarative-containers.section.xml @@ -6,7 +6,7 @@ following specifies that there shall be a container named database running PostgreSQL: - + containers.database = { config = { config, pkgs, ... }: @@ -29,7 +29,7 @@ containers.database = However, they cannot change the network configuration. You can give a container its own network as follows: - + containers.database = { privateNetwork = true; hostAddress = "192.168.100.10"; diff --git a/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml b/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml index 8b01b8f896a4..3b7bd6cd30cf 100644 --- a/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml +++ b/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml @@ -85,21 +85,21 @@ Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. Packages in Nixpkgs sometimes provide systemd units with them, usually in e.g #pkg-out#/lib/systemd/. Putting such a package in environment.systemPackages - doesn't make the service available to users or the system. + doesn’t make the service available to users or the system. In order to enable a systemd system service with provided upstream package, use (e.g): - + systemd.packages = [ pkgs.packagekit ]; Usually NixOS modules written by the community do the above, plus take care of other details. If a module was written for a service - you are interested in, you'd probably need only to use + you are interested in, you’d probably need only to use services.#name#.enable = true;. These services - are defined in Nixpkgs' + are defined in Nixpkgs’ nixos/modules/ directory . In case the service is simple enough, the above method should work, and start @@ -111,8 +111,8 @@ systemd.packages = [ pkgs.packagekit ]; unit file at #pkg-out#/lib/systemd/user/, using will make you able to start the service via systemctl --user start, - but it won't start automatically on login. However, You can - imperatively enable it by adding the package's attribute to + but it won’t start automatically on login. However, You can + imperatively enable it by adding the package’s attribute to and then do this (e.g): @@ -129,7 +129,7 @@ $ systemctl --user enable syncthing.service Using systemctl --user enable syncthing.service - instead of the above, will work, but it'll use the absolute path + instead of the above, will work, but it’ll use the absolute path of syncthing.service for the symlink, and this path is in /nix/store/.../lib/systemd/user/. Hence garbage collection will diff --git a/nixos/doc/manual/from_md/configuration/abstractions.section.xml b/nixos/doc/manual/from_md/configuration/abstractions.section.xml index c71e23e34adf..469e85979e0f 100644 --- a/nixos/doc/manual/from_md/configuration/abstractions.section.xml +++ b/nixos/doc/manual/from_md/configuration/abstractions.section.xml @@ -4,7 +4,7 @@ If you find yourself repeating yourself over and over, it’s time to abstract. Take, for instance, this Apache HTTP Server configuration: - + { services.httpd.virtualHosts = { "blog.example.org" = { @@ -29,7 +29,7 @@ the only difference is the document root directories. To prevent this duplication, we can use a let: - + let commonConfig = { adminAddr = "alice@example.org"; @@ -55,7 +55,7 @@ in You can write a let wherever an expression is allowed. Thus, you also could have written: - + { services.httpd.virtualHosts = let commonConfig = ...; in @@ -74,7 +74,7 @@ in of different virtual hosts, all with identical configuration except for the document root. This can be done as follows: - + { services.httpd.virtualHosts = let diff --git a/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml b/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml index 035ee3122e15..516022dc16d2 100644 --- a/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml +++ b/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml @@ -7,7 +7,7 @@ network configuration not covered by the existing NixOS modules. For instance, to statically configure an IPv6 address: - + networking.localCommands = '' ip -6 addr add 2001:610:685:1::1/64 dev eth0 diff --git a/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml b/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml index 07f541666cbe..b1a1a8df3247 100644 --- a/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml +++ b/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml @@ -28,7 +28,7 @@ $ cd nixpkgs manual. Finally, you add it to , e.g. - + environment.systemPackages = [ pkgs.my-package ]; @@ -45,7 +45,7 @@ environment.systemPackages = [ pkgs.my-package ]; Hello package directly in configuration.nix: - + environment.systemPackages = let my-hello = with pkgs; stdenv.mkDerivation rec { @@ -62,13 +62,13 @@ environment.systemPackages = Of course, you can also move the definition of my-hello into a separate Nix expression, e.g. - + environment.systemPackages = [ (import ./my-hello.nix) ]; where my-hello.nix contains: - + with import <nixpkgs> {}; # bring all of Nixpkgs into scope stdenv.mkDerivation rec { @@ -98,7 +98,7 @@ Hello, world! need to install appimage-run: add to /etc/nixos/configuration.nix - + environment.systemPackages = [ pkgs.appimage-run ]; diff --git a/nixos/doc/manual/from_md/configuration/config-file.section.xml b/nixos/doc/manual/from_md/configuration/config-file.section.xml index 9792116eb08d..da5419cde4d3 100644 --- a/nixos/doc/manual/from_md/configuration/config-file.section.xml +++ b/nixos/doc/manual/from_md/configuration/config-file.section.xml @@ -3,7 +3,7 @@ The NixOS configuration file generally looks like this: - + { config, pkgs, ... }: { option definitions @@ -21,7 +21,7 @@ the name of an option and value is its value. For example, - + { config, pkgs, ... }: { services.httpd.enable = true; @@ -44,7 +44,7 @@ true. This means that the example above can also be written as: - + { config, pkgs, ... }: { services = { @@ -96,7 +96,7 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no Strings are enclosed in double quotes, e.g. - + networking.hostName = "dexter"; @@ -107,7 +107,7 @@ networking.hostName = "dexter"; Multi-line strings can be enclosed in double single quotes, e.g. - + networking.extraHosts = '' 127.0.0.2 other-localhost @@ -135,7 +135,7 @@ networking.extraHosts = These can be true or false, e.g. - + networking.firewall.enable = true; networking.firewall.allowPing = false; @@ -149,7 +149,7 @@ networking.firewall.allowPing = false; For example, - + boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60; @@ -171,7 +171,7 @@ boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60; Sets were introduced above. They are name/value pairs enclosed in braces, as in the option definition - + fileSystems."/boot" = { device = "/dev/sda1"; fsType = "ext4"; @@ -189,13 +189,13 @@ fileSystems."/boot" = The important thing to note about lists is that list elements are separated by whitespace, like this: - + boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; List elements can be any other type, e.g. sets: - + swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; @@ -211,7 +211,7 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; through the function argument pkgs. Typical uses: - + environment.systemPackages = [ pkgs.thunderbird pkgs.emacs @@ -221,7 +221,7 @@ services.postgresql.package = pkgs.postgresql_14; The latter option definition changes the default PostgreSQL - package used by NixOS’s PostgreSQL service to 10.x. For more + package used by NixOS’s PostgreSQL service to 14.x. For more information on packages, including how to add new ones, see . diff --git a/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml b/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml index f78b5dc5460c..8026c4102b48 100644 --- a/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml +++ b/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml @@ -22,7 +22,7 @@ a dependency on GTK 2. If you want to build it against GTK 3, you can specify that as follows: - + environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; @@ -46,7 +46,7 @@ environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; the package, such as the source code. For instance, if you want to override the source code of Emacs, you can say: - + environment.systemPackages = [ (pkgs.emacs.overrideAttrs (oldAttrs: { name = "emacs-25.0-pre"; @@ -72,7 +72,7 @@ environment.systemPackages = [ everything depend on your customised instance, you can apply a global override as follows: - + nixpkgs.config.packageOverrides = pkgs: { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; }; }; diff --git a/nixos/doc/manual/from_md/configuration/declarative-packages.section.xml b/nixos/doc/manual/from_md/configuration/declarative-packages.section.xml index da31f18d9233..bee310c2e34b 100644 --- a/nixos/doc/manual/from_md/configuration/declarative-packages.section.xml +++ b/nixos/doc/manual/from_md/configuration/declarative-packages.section.xml @@ -7,7 +7,7 @@ adding the following line to configuration.nix enables the Mozilla Thunderbird email application: - + environment.systemPackages = [ pkgs.thunderbird ]; diff --git a/nixos/doc/manual/from_md/configuration/file-systems.chapter.xml b/nixos/doc/manual/from_md/configuration/file-systems.chapter.xml index 71441d8b4a5b..e5285c797555 100644 --- a/nixos/doc/manual/from_md/configuration/file-systems.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/file-systems.chapter.xml @@ -7,7 +7,7 @@ /dev/disk/by-label/data onto the mount point /data: - + fileSystems."/data" = { device = "/dev/disk/by-label/data"; fsType = "ext4"; diff --git a/nixos/doc/manual/from_md/configuration/firewall.section.xml b/nixos/doc/manual/from_md/configuration/firewall.section.xml index 24c19bb1c66d..6e1ffab72c54 100644 --- a/nixos/doc/manual/from_md/configuration/firewall.section.xml +++ b/nixos/doc/manual/from_md/configuration/firewall.section.xml @@ -6,14 +6,14 @@ both IPv4 and IPv6 traffic. It is enabled by default. It can be disabled as follows: - + networking.firewall.enable = false; If the firewall is enabled, you can open specific TCP ports to the outside world: - + networking.firewall.allowedTCPPorts = [ 80 443 ]; @@ -26,7 +26,7 @@ networking.firewall.allowedTCPPorts = [ 80 443 ]; To open ranges of TCP ports: - + networking.firewall.allowedTCPPortRanges = [ { from = 4000; to = 4007; } { from = 8000; to = 8010; } diff --git a/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml b/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml index cc559a1933d9..c95d3dc86525 100644 --- a/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml @@ -62,7 +62,7 @@ Platform Vendor Advanced Micro Devices, Inc. enables OpenCL support: - + hardware.opengl.extraPackages = [ rocm-opencl-icd ]; @@ -85,7 +85,7 @@ hardware.opengl.extraPackages = [ enable OpenCL support. For example, for Gen8 and later GPUs, the following configuration can be used: - + hardware.opengl.extraPackages = [ intel-compute-runtime ]; @@ -162,7 +162,7 @@ GPU1: makes amdvlk the default driver and hides radv and lavapipe from the device list. A specific driver can be forced as follows: - + hardware.opengl.extraPackages = [ pkgs.amdvlk ]; @@ -177,6 +177,48 @@ environment.variables.AMD_VULKAN_ICD = "RADV"; # Or environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; + + + +
+ VA-API + + VA-API + (Video Acceleration API) is an open-source library and API + specification, which provides access to graphics hardware + acceleration capabilities for video processing. + + + VA-API drivers are loaded by libva. The version + in nixpkgs is built to search the opengl driver path, so drivers + can be installed in + . + + + VA-API can be tested using: + + +$ nix-shell -p libva-utils --run vainfo + +
+ Intel + + Modern Intel GPUs use the iHD driver, which can be installed + with: + + +hardware.opengl.extraPackages = [ + intel-media-driver +]; + + + Older Intel GPUs use the i965 driver, which can be installed + with: + + +hardware.opengl.extraPackages = [ + vaapiIntel +];
diff --git a/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml b/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml index 047ba2165f07..49ec6f5952ec 100644 --- a/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml +++ b/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml @@ -6,7 +6,7 @@ interfaces. However, you can configure an interface manually as follows: - + networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; @@ -16,7 +16,7 @@ networking.interfaces.eth0.ipv4.addresses = [ { Typically you’ll also want to set a default gateway and set of name servers: - + networking.defaultGateway = "192.168.1.1"; networking.nameservers = [ "8.8.8.8" ]; @@ -32,7 +32,7 @@ networking.nameservers = [ "8.8.8.8" ]; The host name is set using : - + networking.hostName = "cartman"; diff --git a/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml b/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml index 137c3d772a86..2adb10622624 100644 --- a/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml +++ b/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml @@ -10,21 +10,21 @@ . You can disable IPv6 support globally by setting: - + networking.enableIPv6 = false; You can disable IPv6 on a single interface using a normal sysctl (in this example, we use interface eth0): - + boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; As with IPv4 networking interfaces are automatically configured via DHCPv6. You can configure an interface manually: - + networking.interfaces.eth0.ipv6.addresses = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; @@ -34,7 +34,7 @@ networking.interfaces.eth0.ipv6.addresses = [ { For configuring a gateway, optionally with explicitly specified interface: - + networking.defaultGateway6 = { address = "fe00::1"; interface = "enp0s3"; diff --git a/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml b/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml index 1de19f64bdad..da9ba323f18c 100644 --- a/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml @@ -10,7 +10,7 @@ way is to enable and configure cluster components appropriately by hand: - + services.kubernetes = { apiserver.enable = true; controllerManager.enable = true; @@ -21,24 +21,24 @@ services.kubernetes = { }; - Another way is to assign cluster roles ("master" and/or - "node") to the host. This enables apiserver, + Another way is to assign cluster roles (master and/or + node) to the host. This enables apiserver, controllerManager, scheduler, addonManager, kube-proxy and etcd: - + services.kubernetes.roles = [ "master" ]; While this will enable the kubelet and kube-proxy only: - + services.kubernetes.roles = [ "node" ]; Assigning both the master and node roles is usable if you want a single node Kubernetes cluster for dev or testing purposes: - + services.kubernetes.roles = [ "master" "node" ]; diff --git a/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml b/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml index a1d6815af29c..f889306d51c0 100644 --- a/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml @@ -5,7 +5,7 @@ option boot.kernelPackages. For instance, this selects the Linux 3.10 kernel: - + boot.kernelPackages = pkgs.linuxKernel.packages.linux_3_10; @@ -21,6 +21,19 @@ boot.kernelPackages = pkgs.linuxKernel.packages.linux_3_10; pkgs.linuxPackages_latest, that are kept up to date with new versions. + + Please note that the current convention in NixOS is to only keep + actively maintained kernel versions on both unstable and the + currently supported stable release(s) of NixOS. This means that a + non-longterm kernel will be removed after it’s abandoned by the + kernel developers, even on stable NixOS versions. If you pin your + kernel onto a non-longterm version, expect your evaluation to fail + as soon as the version is out of maintenance. + + + Longterm versions of kernels will be removed before the next stable + NixOS that will exceed the maintenance period of the kernel version. + The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the @@ -35,7 +48,7 @@ zcat /proc/config.gz ). For instance, to enable support for the kernel debugger KGDB: - + nixpkgs.config.packageOverrides = pkgs: pkgs.lib.recursiveUpdate pkgs { linuxKernel.kernels.linux_5_10 = pkgs.linuxKernel.kernels.linux_5_10.override { extraConfig = '' @@ -56,7 +69,7 @@ nixpkgs.config.packageOverrides = pkgs: pkgs.lib.recursiveUpdate pkgs { automatically by udev. You can force a module to be loaded via , e.g. - + boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; @@ -64,7 +77,7 @@ boot.kernelModules = [ "fuse" "kvm-intel" "coretemp&quo root file system), you can use : - + boot.initrd.kernelModules = [ "cifs" ]; @@ -75,7 +88,7 @@ boot.initrd.kernelModules = [ "cifs" ]; Kernel runtime parameters can be set through , e.g. - + boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; @@ -83,65 +96,82 @@ boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; available parameters, run sysctl -a.
- Customize your kernel + Building a custom kernel - The first step before compiling the kernel is to generate an - appropriate .config configuration. Either you - pass your own config via the configfile setting - of linuxKernel.manualConfig: + You can customize the default kernel configuration by overriding + the arguments for your kernel package: - -custom-kernel = let base_kernel = linuxKernel.kernels.linux_4_9; - in super.linuxKernel.manualConfig { - inherit (super) stdenv hostPlatform; - inherit (base_kernel) src; - version = "${base_kernel.version}-custom"; - - configfile = /home/me/my_kernel_config; - allowImportFromDerivation = true; -}; - - - You can edit the config with this snippet (by default - make menuconfig won't work out of the box on - nixos): - - -nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkg-config ncurses ];})' - - - or you can let nixpkgs generate the configuration. Nixpkgs - generates it via answering the interactive kernel utility - make config. The answers depend on parameters - passed to - pkgs/os-specific/linux/kernel/generic.nix - (which you can influence by overriding - extraConfig, autoModules, modDirVersion, preferBuiltin, extraConfig). - - -mptcp93.override ({ - name="mptcp-local"; - + +pkgs.linux_latest.override { ignoreConfigErrors = true; autoModules = false; kernelPreferBuiltin = true; - - enableParallelBuilding = true; - - extraConfig = '' - DEBUG_KERNEL y - FRAME_POINTER y - KGDB y - KGDB_SERIAL_CONSOLE y - DEBUG_INFO y - ''; -}); + extraStructuredConfig = with lib.kernel; { + DEBUG_KERNEL = yes; + FRAME_POINTER = yes; + KGDB = yes; + KGDB_SERIAL_CONSOLE = yes; + DEBUG_INFO = yes; + }; +} + + + See pkgs/os-specific/linux/kernel/generic.nix + for details on how these arguments affect the generated + configuration. You can also build a custom version of Linux by + calling pkgs.buildLinux directly, which + requires the src and version + arguments to be specified. + + + To use your custom kernel package in your NixOS configuration, set + + +boot.kernelPackages = pkgs.linuxPackagesFor yourCustomKernel; + + + Note that this method will use the common configuration defined in + pkgs/os-specific/linux/kernel/common-config.nix, + which is suitable for a NixOS system. + + + If you already have a generated configuration file, you can build + a kernel that uses it with + pkgs.linuxManualConfig: + + +let + baseKernel = pkgs.linux_latest; +in pkgs.linuxManualConfig { + inherit (baseKernel) src modDirVersion; + version = "${baseKernel.version}-custom"; + configfile = ./my_kernel_config; + allowImportFromDerivation = true; +} + + + + The build will fail if modDirVersion does not + match the source’s kernel.release file, so + modDirVersion should remain tied to + src. + + + + To edit the .config file for Linux X.Y, proceed + as follows: + + +$ nix-shell '<nixpkgs>' -A linuxKernel.kernels.linux_X_Y.configEnv +$ unpackPhase +$ cd linux-* +$ make nconfig
Developing kernel modules - When developing kernel modules it's often convenient to run + When developing kernel modules it’s often convenient to run edit-compile-run loop as quickly as possible. See below snippet as an example of developing mellanox drivers. @@ -154,4 +184,38 @@ $ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox module # insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko
+
+ ZFS + + It’s a common issue that the latest stable version of ZFS doesn’t + support the latest available Linux kernel. It is recommended to + use the latest available LTS that’s compatible with ZFS. Usually + this is the default kernel provided by nixpkgs (i.e. + pkgs.linuxPackages). + + + Alternatively, it’s possible to pin the system to the latest + available kernel version that is supported by + ZFS like this: + + +{ + boot.kernelPackages = pkgs.zfs.latestCompatibleLinuxPackages; +} + + + Please note that the version this attribute points to isn’t + monotonic because the latest kernel version only refers to kernel + versions supported by the Linux developers. In other words, the + latest kernel version that ZFS is compatible with may decrease + over time. + + + An example: the latest version ZFS is compatible with is 5.19 + which is a non-longterm version. When 5.19 is out of maintenance, + the latest supported kernel version is 5.15 because it’s longterm + and the versions 5.16, 5.17 and 5.18 are already out of + maintenance because they’re non-longterm. + +
diff --git a/nixos/doc/manual/from_md/configuration/luks-file-systems.section.xml b/nixos/doc/manual/from_md/configuration/luks-file-systems.section.xml index 42b766eba98b..144a5acecae3 100644 --- a/nixos/doc/manual/from_md/configuration/luks-file-systems.section.xml +++ b/nixos/doc/manual/from_md/configuration/luks-file-systems.section.xml @@ -30,7 +30,7 @@ Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** at boot time as /, add the following to configuration.nix: - + boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; fileSystems."/".device = "/dev/mapper/crypted"; @@ -39,7 +39,7 @@ fileSystems."/".device = "/dev/mapper/crypted"; located on an encrypted partition, it is necessary to add the following grub option: - + boot.loader.grub.enableCryptodisk = true;
@@ -67,7 +67,7 @@ Added to key to device /dev/sda2, slot: 2 compatible key, add the following to configuration.nix: - + boot.initrd.luks.fido2Support = true; boot.initrd.luks.devices."/dev/sda2".fido2.credential = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7"; @@ -77,7 +77,7 @@ boot.initrd.luks.devices."/dev/sda2".fido2.credential = "f1d00200 protected, such as Trezor. - + boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess = true;
diff --git a/nixos/doc/manual/from_md/configuration/modularity.section.xml b/nixos/doc/manual/from_md/configuration/modularity.section.xml index a7688090fcc5..987b2fc43c01 100644 --- a/nixos/doc/manual/from_md/configuration/modularity.section.xml +++ b/nixos/doc/manual/from_md/configuration/modularity.section.xml @@ -14,7 +14,7 @@ other modules by including them from configuration.nix, e.g.: - + { config, pkgs, ... }: { imports = [ ./vpn.nix ./kde.nix ]; @@ -28,7 +28,7 @@ vpn.nix and kde.nix. The latter might look like this: - + { config, pkgs, ... }: { services.xserver.enable = true; @@ -50,7 +50,7 @@ you want it to appear first, you can use mkBefore: - + boot.kernelModules = mkBefore [ "kvm-intel" ]; @@ -70,7 +70,7 @@ The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc When that happens, it’s possible to force one definition take precedence over the others: - + services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org"; @@ -93,7 +93,7 @@ services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org"; is set to true somewhere else: - + { config, pkgs, ... }: { environment.systemPackages = @@ -137,7 +137,7 @@ nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts below would have the same effect as importing a file which sets those options. - + { config, pkgs, ... }: let netConfig = hostName: { diff --git a/nixos/doc/manual/from_md/configuration/network-manager.section.xml b/nixos/doc/manual/from_md/configuration/network-manager.section.xml index 8f0d6d680ae0..c49618b4b942 100644 --- a/nixos/doc/manual/from_md/configuration/network-manager.section.xml +++ b/nixos/doc/manual/from_md/configuration/network-manager.section.xml @@ -4,7 +4,7 @@ To facilitate network configuration, some desktop environments use NetworkManager. You can enable NetworkManager by setting: - + networking.networkmanager.enable = true; @@ -15,7 +15,7 @@ networking.networkmanager.enable = true; All users that should have permission to change network settings must belong to the networkmanager group: - + users.users.alice.extraGroups = [ "networkmanager" ]; @@ -36,7 +36,7 @@ users.users.alice.extraGroups = [ "networkmanager" ]; used together if desired. To do this you need to instruct NetworkManager to ignore those interfaces like: - + networking.networkmanager.unmanaged = [ "*" "except:type:wwan" "except:type:gsm" ]; diff --git a/nixos/doc/manual/from_md/configuration/profiles.chapter.xml b/nixos/doc/manual/from_md/configuration/profiles.chapter.xml index 6f5fc130c6a0..f3aacfc0a245 100644 --- a/nixos/doc/manual/from_md/configuration/profiles.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/profiles.chapter.xml @@ -4,12 +4,12 @@ In some cases, it may be desirable to take advantage of commonly-used, predefined configurations provided by nixpkgs, but different from those that come as default. This is a role fulfilled - by NixOS's Profiles, which come as files living in + by NixOS’s Profiles, which come as files living in <nixpkgs/nixos/modules/profiles>. That is to say, expected usage is to add them to the imports list of your /etc/configuration.nix as such: - + imports = [ <nixpkgs/nixos/modules/profiles/profile-name.nix> ]; diff --git a/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml b/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml index 44c11786d940..1fd5a9179887 100644 --- a/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml +++ b/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml @@ -9,7 +9,7 @@ available to processes through the /sys and /proc filesystems. It also disables the User Namespaces feature of the kernel, which stops Nix from being able to - build anything (this particular setting can be overriden via + build anything (this particular setting can be overridden via ). See the profile source for further detail on which settings are altered. diff --git a/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml b/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml index 88c9e624c82f..fca99edcbaea 100644 --- a/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml +++ b/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml @@ -30,7 +30,7 @@ the interface with MAC address 52:54:00:12:01:01 using a netword link unit: - + systemd.network.links."10-wan" = { matchConfig.PermanentMACAddress = "52:54:00:12:01:01"; linkConfig.Name = "wan"; @@ -43,7 +43,7 @@ systemd.network.links."10-wan" = { Alternatively, we can use a plain old udev rule: - + services.udev.initrdRules = '' SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", \ ATTR{address}=="52:54:00:12:01:01", KERNEL=="eth*", NAME="wan" diff --git a/nixos/doc/manual/from_md/configuration/ssh.section.xml b/nixos/doc/manual/from_md/configuration/ssh.section.xml index 037418d8ea4d..e0d4031443ef 100644 --- a/nixos/doc/manual/from_md/configuration/ssh.section.xml +++ b/nixos/doc/manual/from_md/configuration/ssh.section.xml @@ -3,20 +3,20 @@ Secure shell (SSH) access to your machine can be enabled by setting: - + services.openssh.enable = true; By default, root logins using a password are disallowed. They can be disabled entirely by setting - to + to "no". You can declaratively specify authorised RSA/DSA public keys for a user as follows: - + users.users.alice.openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; diff --git a/nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xml b/nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xml index 5d74712f35dc..26984dd411a1 100644 --- a/nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xml +++ b/nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xml @@ -54,7 +54,7 @@ SHA256:yjxl3UbTn31fLWeyLYTAKYJPRmzknjQZoyG8gSNEoIE my-user@workstation fileSystems option. Here’s a typical setup: - + { system.fsPackages = [ pkgs.sshfs ]; @@ -80,7 +80,7 @@ SHA256:yjxl3UbTn31fLWeyLYTAKYJPRmzknjQZoyG8gSNEoIE my-user@workstation well, for example you can change the default SSH port or specify a jump proxy: - + { options = [ "ProxyJump=bastion@example.com" @@ -92,7 +92,7 @@ SHA256:yjxl3UbTn31fLWeyLYTAKYJPRmzknjQZoyG8gSNEoIE my-user@workstation It’s also possible to change the ssh command used by SSHFS to connect to the server. For example: - + { options = [ (builtins.replaceStrings [" "] ["\\040"] diff --git a/nixos/doc/manual/from_md/configuration/subversion.chapter.xml b/nixos/doc/manual/from_md/configuration/subversion.chapter.xml index 794c2c34e399..4390fc54ab53 100644 --- a/nixos/doc/manual/from_md/configuration/subversion.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/subversion.chapter.xml @@ -25,7 +25,7 @@ Apache HTTP, setting appropriately: - + services.httpd.enable = true; services.httpd.adminAddr = ...; networking.firewall.allowedTCPPorts = [ 80 443 ]; @@ -40,7 +40,7 @@ networking.firewall.allowedTCPPorts = [ 80 443 ]; .authz file describing access permission, and AuthUserFile to the password file. - + services.httpd.extraModules = [ # note that order is *super* important here { name = "dav_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_dav_svn.so"; } @@ -106,7 +106,7 @@ $ htpasswd -s PASSWORD_FILE USER_NAME ACCESS_FILE will look something like the following: - + [/] * = r diff --git a/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml b/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml index a2d7d2a9f115..d61b248d5eef 100644 --- a/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml @@ -7,7 +7,7 @@ states that a user account named alice shall exist: - + users.users.alice = { isNormalUser = true; home = "/home/alice"; @@ -36,7 +36,7 @@ users.users.alice = { and run nixos-rebuild, the user account will cease to exist. Also, imperative commands for managing users and groups, such as useradd, are no longer available. - Passwords may still be assigned by setting the user's + Passwords may still be assigned by setting the user’s hashedPassword option. A hashed password can be generated using mkpasswd. @@ -45,7 +45,7 @@ users.users.alice = { A user ID (uid) is assigned automatically. You can also specify a uid manually by adding - + uid = 1000; @@ -55,7 +55,7 @@ uid = 1000; Groups can be specified similarly. The following states that a group named students shall exist: - + users.groups.students.gid = 1000; diff --git a/nixos/doc/manual/from_md/configuration/wayland.chapter.xml b/nixos/doc/manual/from_md/configuration/wayland.chapter.xml index 1e90d4f31177..07892c875bb2 100644 --- a/nixos/doc/manual/from_md/configuration/wayland.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/wayland.chapter.xml @@ -5,11 +5,12 @@ display technology on NixOS, Wayland support is steadily improving. Where X11 separates the X Server and the window manager, on Wayland those are combined: a Wayland Compositor is like an X11 window - manager, but also embeds the Wayland 'Server' functionality. This - means it is sufficient to install a Wayland Compositor such as sway - without separately enabling a Wayland server: + manager, but also embeds the Wayland Server + functionality. This means it is sufficient to install a Wayland + Compositor such as sway without separately enabling a Wayland + server: - + programs.sway.enable = true; @@ -21,7 +22,7 @@ programs.sway.enable = true; be able to share your screen, you might want to activate this option: - + xdg.portal.wlr.enable = true; diff --git a/nixos/doc/manual/from_md/configuration/wireless.section.xml b/nixos/doc/manual/from_md/configuration/wireless.section.xml index 82bc20135157..79feab47203a 100644 --- a/nixos/doc/manual/from_md/configuration/wireless.section.xml +++ b/nixos/doc/manual/from_md/configuration/wireless.section.xml @@ -9,13 +9,13 @@ NixOS will start wpa_supplicant for you if you enable this setting: - + networking.wireless.enable = true; NixOS lets you specify networks for wpa_supplicant declaratively: - + networking.wireless.networks = { echelon = { # SSID with no spaces or special characters psk = "abcdefgh"; @@ -49,12 +49,12 @@ network={ psk=dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435 } - + networking.wireless.networks = { echelon = { pskRaw = "dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435"; }; -} +}; or you can use it to directly generate the diff --git a/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml b/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml index c17e98983b27..319d3e980188 100644 --- a/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml @@ -4,7 +4,7 @@ The X Window System (X11) provides the basis of NixOS’ graphical user interface. It can be enabled as follows: - + services.xserver.enable = true; @@ -13,7 +13,7 @@ services.xserver.enable = true; and intel). You can also specify a driver manually, e.g. - + services.xserver.videoDrivers = [ "r128" ]; @@ -25,7 +25,7 @@ services.xserver.videoDrivers = [ "r128" ]; xterm window. Thus you should pick one or more of the following lines: - + services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.xfce.enable = true; services.xserver.desktopManager.gnome.enable = true; @@ -42,14 +42,14 @@ services.xserver.windowManager.herbstluftwm.enable = true; LightDM. You can select an alternative one by picking one of the following lines: - + services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.gdm.enable = true; You can set the keyboard layout (and optionally the layout variant): - + services.xserver.layout = "de"; services.xserver.xkbVariant = "neo"; @@ -57,7 +57,7 @@ services.xserver.xkbVariant = "neo"; The X server is started automatically at boot time. If you don’t want this to happen, you can set: - + services.xserver.autorun = false; @@ -70,7 +70,7 @@ services.xserver.autorun = false; On 64-bit systems, if you want OpenGL for 32-bit programs such as in Wine, you should also set the following: - + hardware.opengl.driSupport32Bit = true;
@@ -88,16 +88,16 @@ hardware.opengl.driSupport32Bit = true; To enable auto-login, you need to define your default window manager and desktop environment. If you wanted no desktop - environment and i3 as your your window manager, you'd define: + environment and i3 as your your window manager, you’d define: - + services.xserver.displayManager.defaultSession = "none+i3"; Every display manager in NixOS supports auto-login, here is an example using lightdm for a user alice: - + services.xserver.displayManager.lightdm.enable = true; services.xserver.displayManager.autoLogin.enable = true; services.xserver.displayManager.autoLogin.user = "alice"; @@ -122,8 +122,8 @@ services.xserver.displayManager.autoLogin.user = "alice"; The second driver, intel, is specific to Intel GPUs, but not recommended by most distributions: it lacks several - modern features (for example, it doesn't support Glamor) and the - package hasn't been officially updated since 2015. + modern features (for example, it doesn’t support Glamor) and the + package hasn’t been officially updated since 2015. The results vary depending on the hardware, so you may have to try @@ -131,14 +131,14 @@ services.xserver.displayManager.autoLogin.user = "alice"; to set one. The recommended configuration for modern systems is: - + services.xserver.videoDrivers = [ "modesetting" ]; If you experience screen tearing no matter what, this configuration was reported to resolve the issue: - + services.xserver.videoDrivers = [ "intel" ]; services.xserver.deviceSection = '' Option "DRI" "2" @@ -159,14 +159,14 @@ services.xserver.deviceSection = '' enabled by default because it’s not free software. You can enable it as follows: - + services.xserver.videoDrivers = [ "nvidia" ]; Or if you have an older card, you may have to use one of the legacy drivers: - + services.xserver.videoDrivers = [ "nvidiaLegacy390" ]; services.xserver.videoDrivers = [ "nvidiaLegacy340" ]; services.xserver.videoDrivers = [ "nvidiaLegacy304" ]; @@ -181,11 +181,11 @@ services.xserver.videoDrivers = [ "nvidiaLegacy304" ]; AMD provides a proprietary driver for its graphics cards that is not enabled by default because it’s not Free Software, is often - broken in nixpkgs and as of this writing doesn't offer more + broken in nixpkgs and as of this writing doesn’t offer more features or performance. If you still want to use it anyway, you need to explicitly set: - + services.xserver.videoDrivers = [ "amdgpu-pro" ]; @@ -199,14 +199,14 @@ services.xserver.videoDrivers = [ "amdgpu-pro" ]; Support for Synaptics touchpads (found in many laptops such as the Dell Latitude series) can be enabled as follows: - + services.xserver.libinput.enable = true; The driver has many options (see ). For instance, the following disables tap-to-click behavior: - + services.xserver.libinput.touchpad.tapping = false; @@ -222,10 +222,10 @@ services.xserver.libinput.touchpad.tapping = false; applications look similar to GTK ones, you can use the following configuration: - -qt5.enable = true; -qt5.platformTheme = "gtk2"; -qt5.style = "gtk2"; + +qt.enable = true; +qt.platformTheme = "gtk2"; +qt.style = "gtk2";
@@ -244,10 +244,10 @@ qt5.style = "gtk2"; Create a file called us-greek with the following content (under a directory called - symbols; it's an XKB peculiarity that will help + symbols; it’s an XKB peculiarity that will help with testing): - + xkb_symbols "us-greek" { include "us(basic)" // includes the base US keys @@ -263,7 +263,7 @@ xkb_symbols "us-greek" A minimal layout specification must include the following: - + services.xserver.extraLayouts.us-greek = { description = "US layout with alt-gr greek"; languages = [ "eng" ]; @@ -279,7 +279,7 @@ services.xserver.extraLayouts.us-greek = { Applying this customization requires rebuilding several packages, and a broken XKB file can lead to the X session crashing at login. - Therefore, you're strongly advised to test + Therefore, you’re strongly advised to test your layout before applying it: @@ -312,7 +312,7 @@ $ echo "$(nix-build --no-out-link '<nixpkgs>' -A xorg.xkeyboardconfig interest, then create a media-key file to hold the keycodes definitions - + xkb_keycodes "media" { <volUp> = 123; @@ -322,7 +322,7 @@ xkb_keycodes "media" Now use the newly define keycodes in media-sym: - + xkb_symbols "media" { key.type = "ONE_LEVEL"; @@ -333,7 +333,7 @@ xkb_symbols "media" As before, to install the layout do - + services.xserver.extraLayouts.media = { description = "Multimedia keys remapping"; languages = [ "eng" ]; @@ -352,18 +352,18 @@ services.xserver.extraLayouts.media = { Unfortunately, the Xorg server does not (currently) support setting a keymap directly but relies instead on XKB rules to - select the matching components (keycodes, types, ...) of a layout. - This means that components other than symbols won't be loaded by + select the matching components (keycodes, types, …) of a layout. + This means that components other than symbols won’t be loaded by default. As a workaround, you can set the keymap using setxkbmap at the start of the session with: - + services.xserver.displayManager.sessionCommands = "setxkbmap -keycodes media"; If you are manually starting the X server, you should set the argument -xkbdir /etc/X11/xkb, otherwise X - won't find your layout files. For example with + won’t find your layout files. For example with xinit run diff --git a/nixos/doc/manual/from_md/configuration/xfce.chapter.xml b/nixos/doc/manual/from_md/configuration/xfce.chapter.xml index 42e70d1d81d3..7ec69b5e9b8f 100644 --- a/nixos/doc/manual/from_md/configuration/xfce.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/xfce.chapter.xml @@ -3,7 +3,7 @@ To enable the Xfce Desktop Environment, set - + services.xserver.desktopManager.xfce.enable = true; services.xserver.displayManager.defaultSession = "xfce"; @@ -11,7 +11,7 @@ services.xserver.displayManager.defaultSession = "xfce"; Optionally, picom can be enabled for nice graphical effects, some example settings: - + services.picom = { enable = true; fade = true; @@ -36,8 +36,8 @@ services.picom = { . - If you'd like to add extra plugins to Thunar, add them to - . You shouldn't just + If you’d like to add extra plugins to Thunar, add them to + . You shouldn’t just add them to .
@@ -54,9 +54,10 @@ Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with db
This is caused by some needed GNOME services not running. This is - all fixed by enabling "Launch GNOME services on startup" - in the Advanced tab of the Session and Startup settings panel. - Alternatively, you can run this command to do the same thing. + all fixed by enabling Launch GNOME services on + startup in the Advanced tab of the Session and Startup + settings panel. Alternatively, you can run this command to do the + same thing. $ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true diff --git a/nixos/doc/manual/from_md/contributing-to-this-manual.chapter.xml b/nixos/doc/manual/from_md/contributing-to-this-manual.chapter.xml index a9b0c6a5eefa..99dc5ce30b4b 100644 --- a/nixos/doc/manual/from_md/contributing-to-this-manual.chapter.xml +++ b/nixos/doc/manual/from_md/contributing-to-this-manual.chapter.xml @@ -1,7 +1,9 @@ Contributing to this manual - The DocBook and CommonMark sources of NixOS’ manual are in the + The + DocBook + and CommonMark sources of the NixOS manual are in the nixos/doc/manual subdirectory of the Nixpkgs @@ -19,4 +21,32 @@ $ nix-build nixos/release.nix -A manual.x86_64-linux If the build succeeds, the manual will be in ./result/share/doc/nixos/index.html. + + Contributing to the man pages + + + The man pages are written in + DocBook + which is XML. + + + To see what your edits look like: + + +$ cd /path/to/nixpkgs +$ nix-build nixos/release.nix -A manpages.x86_64-linux + + + You can then read the man page you edited by running + + +$ man --manpath=result/share/man nixos-rebuild # Replace nixos-rebuild with the command whose manual you edited + + + If you’re on a different architecture that’s supported by NixOS + (check nixos/release.nix) then replace + x86_64-linux with the architecture. + nix-build will complain otherwise, but should + also tell you which architecture you have + the supported ones. + diff --git a/nixos/doc/manual/from_md/development/activation-script.section.xml b/nixos/doc/manual/from_md/development/activation-script.section.xml index 981ebf37e60f..429b45c93def 100644 --- a/nixos/doc/manual/from_md/development/activation-script.section.xml +++ b/nixos/doc/manual/from_md/development/activation-script.section.xml @@ -22,7 +22,7 @@ these dependencies into account and order the snippets accordingly. As a simple example: - + system.activationScripts.my-activation-script = { deps = [ "etc" ]; # supportsDryActivation = true; @@ -45,7 +45,7 @@ system.activationScripts.my-activation-script = { 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 + incorporate 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 @@ -66,7 +66,7 @@ system.activationScripts.my-activation-script = { /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 + automatically and activation scripts must take the possibility into account that they have to create them first.
diff --git a/nixos/doc/manual/from_md/development/assertions.section.xml b/nixos/doc/manual/from_md/development/assertions.section.xml index 0844d484d60f..13f04d5d1883 100644 --- a/nixos/doc/manual/from_md/development/assertions.section.xml +++ b/nixos/doc/manual/from_md/development/assertions.section.xml @@ -18,7 +18,7 @@ This is an example of using warnings. - + { config, lib, ... }: { config = lib.mkIf config.services.foo.enable { @@ -42,7 +42,7 @@ assertion is useful to prevent such a broken system from being built. - + { config, lib, ... }: { config = lib.mkIf config.services.syslogd.enable { diff --git a/nixos/doc/manual/from_md/development/bootspec.chapter.xml b/nixos/doc/manual/from_md/development/bootspec.chapter.xml new file mode 100644 index 000000000000..9ecbe1d1beed --- /dev/null +++ b/nixos/doc/manual/from_md/development/bootspec.chapter.xml @@ -0,0 +1,73 @@ + + Experimental feature: Bootspec + + Bootspec is a experimental feature, introduced in the + RFC-0125 + proposal, the reference implementation can be found + there + in order to standardize bootloader support and advanced boot + workflows such as SecureBoot and potentially more. + + + You can enable the creation of bootspec documents through + boot.bootspec.enable = true, + which will prompt a warning until + RFC-0125 + is officially merged. + +
+ Schema + + The bootspec schema is versioned and validated against + a CUE schema file + which should considered as the source of truth for your + applications. + + + You will find the current version + here. + +
+
+ Extensions mechanism + + Bootspec cannot account for all usecases. + + + For this purpose, Bootspec offers a generic extension facility + boot.bootspec.extensions + which can be used to inject any data needed for your usecases. + + + An example for SecureBoot is to get the Nix store path to + /etc/os-release in order to bake it into a + unified kernel image: + + +{ config, lib, ... }: { + boot.bootspec.extensions = { + "org.secureboot.osRelease" = config.environment.etc."os-release".source; + }; +} + + + To reduce incompatibility and prevent names from clashing between + applications, it is highly + recommended to use a unique namespace for your + extensions. + +
+
+ External bootloaders + + It is possible to enable your own bootloader through + boot.loader.external.installHook + which can wrap an existing bootloader. + + + Currently, there is no good story to compose existing bootloaders + to enrich their features, e.g. SecureBoot, etc. It will be + necessary to reimplement or reuse existing parts. + +
+
diff --git a/nixos/doc/manual/from_md/development/freeform-modules.section.xml b/nixos/doc/manual/from_md/development/freeform-modules.section.xml index 86a9cf3140d8..c51bc76ff966 100644 --- a/nixos/doc/manual/from_md/development/freeform-modules.section.xml +++ b/nixos/doc/manual/from_md/development/freeform-modules.section.xml @@ -30,7 +30,7 @@ type-checked settings attribute for a more complete example. - + { lib, config, ... }: { options.settings = lib.mkOption { @@ -52,7 +52,7 @@ And the following shows what such a module then allows - + { # Not a declared option, but the freeform type allows this settings.logLevel = "debug"; @@ -72,7 +72,7 @@ Freeform attributes cannot depend on other attributes of the same set without infinite recursion: - + { # This throws infinite recursion encountered settings.logLevel = lib.mkIf (config.settings.port == 80) "debug"; diff --git a/nixos/doc/manual/from_md/development/importing-modules.section.xml b/nixos/doc/manual/from_md/development/importing-modules.section.xml index cb04dde67c83..96e5e1bb16b8 100644 --- a/nixos/doc/manual/from_md/development/importing-modules.section.xml +++ b/nixos/doc/manual/from_md/development/importing-modules.section.xml @@ -4,7 +4,7 @@ Sometimes NixOS modules need to be used in configuration but exist outside of Nixpkgs. These modules can be imported: - + { config, lib, pkgs, ... }: { @@ -23,18 +23,18 @@ Nixpkgs NixOS modules. Like any NixOS module, this module can import additional modules: - + # ./module-list/default.nix [ ./example-module1 ./example-module2 ] - + # ./extra-module/default.nix { imports = import ./module-list.nix; } - + # NIXOS_EXTRA_MODULE_PATH=/absolute/path/to/extra-module { config, lib, pkgs, ... }: diff --git a/nixos/doc/manual/from_md/development/meta-attributes.section.xml b/nixos/doc/manual/from_md/development/meta-attributes.section.xml index 1eb6e0f30368..64234f1cc0d7 100644 --- a/nixos/doc/manual/from_md/development/meta-attributes.section.xml +++ b/nixos/doc/manual/from_md/development/meta-attributes.section.xml @@ -15,7 +15,7 @@ Each of the meta-attributes must be defined at most once per module file. - + { config, lib, pkgs, ... }: { options = { @@ -28,7 +28,7 @@ meta = { maintainers = with lib.maintainers; [ ericsagnes ]; - doc = ./default.xml; + doc = ./default.md; buildDocsInSandbox = true; }; } @@ -42,8 +42,10 @@ - doc points to a valid DocBook file containing - the module documentation. Its contents is automatically added to + doc points to a valid + Nixpkgs-flavored + CommonMark file containing the module documentation. Its + contents is automatically added to . Changes to a module documentation have to be checked to not break building the NixOS manual: 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 0932a51a18cd..af05e61363e4 100644 --- a/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ b/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -6,7 +6,7 @@ hasn’t been declared in any module. An option declaration generally looks like this: - + options = { name = mkOption { type = type specification; @@ -127,8 +127,8 @@ options = { For example: - -lib.mkEnableOption "magic" + +lib.mkEnableOption (lib.mdDoc "magic") # is like lib.mkOption { type = lib.types.bool; @@ -138,11 +138,12 @@ lib.mkOption { }
- <literal>mkPackageOption</literal> + <literal>mkPackageOption</literal>, + <literal>mkPackageOptionMD</literal> Usage: - + mkPackageOption pkgs "name" { default = [ "path" "in" "pkgs" ]; example = "literal example"; } @@ -172,13 +173,22 @@ mkPackageOption pkgs "name" { default = [ "path" "in&qu You can omit the default path if the name of the option is also attribute path in nixpkgs. + + During the transition to CommonMark documentation + mkPackageOption creates an option with a + DocBook description attribute, once the transition is + completed it will create a CommonMark description instead. + mkPackageOptionMD always creates an option + with a CommonMark description attribute and will be removed + some time after the transition is completed. + Examples: - -lib.mkPackageOption pkgs "hello" { } + +lib.mkPackageOptionMD pkgs "hello" { } # is like lib.mkOption { type = lib.types.package; @@ -188,8 +198,8 @@ lib.mkOption { } - -lib.mkPackageOption pkgs "GHC" { + +lib.mkPackageOptionMD pkgs "GHC" { default = [ "ghc" ]; example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; } @@ -222,7 +232,7 @@ lib.mkOption { 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 ...). + manager backend (sddm, gdm …). There are two approaches we could take with this module @@ -287,7 +297,7 @@ lib.mkOption { Example: Extensible type placeholder in the service module - + services.xserver.displayManager.enable = mkOption { description = "Display manager to use"; type = with types; nullOr (enum [ ]); @@ -299,7 +309,7 @@ services.xserver.displayManager.enable = mkOption { services.xserver.displayManager.enable in the gdm module - + services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "gdm" ]); }; @@ -310,7 +320,7 @@ services.xserver.displayManager.enable = mkOption { services.xserver.displayManager.enable in the sddm module - + services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "sddm" ]); }; diff --git a/nixos/doc/manual/from_md/development/option-def.section.xml b/nixos/doc/manual/from_md/development/option-def.section.xml index 8c9ef181affd..87b290ec39c6 100644 --- a/nixos/doc/manual/from_md/development/option-def.section.xml +++ b/nixos/doc/manual/from_md/development/option-def.section.xml @@ -4,7 +4,7 @@ Option definitions are generally straight-forward bindings of values to option names, like - + config = { services.httpd.enable = true; }; @@ -21,7 +21,7 @@ config = { another option, you may need to use mkIf. Consider, for instance: - + config = if config.services.httpd.enable then { environment.systemPackages = [ ... ]; ... @@ -34,7 +34,7 @@ config = if config.services.httpd.enable then { value being constructed here. After all, you could also write the clearly circular and contradictory: - + config = if config.services.httpd.enable then { services.httpd.enable = false; } else { @@ -44,7 +44,7 @@ config = if config.services.httpd.enable then { The solution is to write: - + config = mkIf config.services.httpd.enable { environment.systemPackages = [ ... ]; ... @@ -55,7 +55,7 @@ config = mkIf config.services.httpd.enable { of the conditional to be pushed down into the individual definitions, as if you had written: - + config = { environment.systemPackages = if config.services.httpd.enable then [ ... ] else []; ... @@ -66,19 +66,47 @@ config = { Setting Priorities A module can override the definitions of an option in other - modules by setting a priority. All option - definitions that do not have the lowest priority value are - discarded. By default, option definitions have priority 1000. You - can specify an explicit priority by using - mkOverride, e.g. + modules by setting an override priority. All + option definitions that do not have the lowest priority value are + discarded. By default, option definitions have priority 100 and + option defaults have priority 1500. You can specify an explicit + priority by using mkOverride, e.g. - + services.openssh.enable = mkOverride 10 false; This definition causes all other definitions with priorities above 10 to be discarded. The function mkForce is - equal to mkOverride 50. + equal to mkOverride 50, and + mkDefault is equal to + mkOverride 1000. + +
+
+ Ordering Definitions + + It is also possible to influence the order in which the + definitions for an option are merged by setting an order + priority with mkOrder. The default + order priority is 1000. The functions mkBefore + and mkAfter are equal to + mkOrder 500 and + mkOrder 1500, respectively. As an example, + + +hardware.firmware = mkBefore [ myFirmware ]; + + + This definition ensures that myFirmware comes + before other unordered definitions in the final list value of + hardware.firmware. + + + Note that this is different from + override + priorities: setting an order does not affect whether the + definition is included or not.
@@ -89,7 +117,7 @@ services.openssh.enable = mkOverride 10 false; to be merged together as if they were declared in separate modules. This can be done using mkMerge: - + config = mkMerge [ # Unconditional stuff. { environment.systemPackages = [ ... ]; 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 4036bc0ba743..363399b08661 100644 --- a/nixos/doc/manual/from_md/development/option-types.section.xml +++ b/nixos/doc/manual/from_md/development/option-types.section.xml @@ -81,14 +81,14 @@ Two definitions of this type like - + { str = lib.mkDefault "foo"; pkg.hello = pkgs.hello; fun.fun = x: x + 1; } - + { str = lib.mkIf true "bar"; pkg.gcc = pkgs.gcc; @@ -98,7 +98,7 @@ will get merged to - + { str = "bar"; pkg.gcc = pkgs.gcc; @@ -152,13 +152,13 @@ This type will be deprecated in the future because it - doesn't recurse into attribute sets, silently drops - earlier attribute definitions, and doesn't discharge + doesn’t recurse into attribute sets, silently drops + earlier attribute definitions, and doesn’t discharge lib.mkDefault, lib.mkIf and co. For allowing arbitrary attribute sets, prefer types.attrsOf types.anything instead - which doesn't have these problems. + which doesn’t have these problems. @@ -453,7 +453,7 @@ _module.args should be used instead for most arguments since it allows overriding. specialArgs - should only be used for arguments that can't go through + should only be used for arguments that can’t go through the module fixed-point, because of infinite recursion or other problems. An example is overriding the lib argument, because @@ -477,7 +477,7 @@ instead of requiring the-submodule.config.config = "value". This is because only when modules - don't set the + don’t set the config or options keys, all keys are interpreted as option definitions in the config section. Enabling this @@ -668,7 +668,7 @@ types.oneOf [ - t1 t2 ... ] + t1 t2 … ] @@ -712,7 +712,7 @@ options key defining the sub-options. Submodule option definitions are type-checked accordingly to the options declarations. Of course, you can nest - submodule option definitons for even higher modularity. + submodule option definitions for even higher modularity. The option set can be defined directly @@ -732,7 +732,7 @@ Example: Directly defined submodule - + options.mod = mkOption { description = "submodule example"; type = with types; submodule { @@ -752,7 +752,7 @@ options.mod = mkOption { Example: Submodule defined as a reference - + let modOptions = { options = { @@ -787,7 +787,7 @@ options.mod = mkOption { Example: Declaration of a list of submodules - + options.mod = mkOption { description = "submodule example"; type = with types; listOf (submodule { @@ -807,7 +807,7 @@ options.mod = mkOption { Example: Definition of a list of submodules - + config.mod = [ { foo = 1; bar = "one"; } { foo = 2; bar = "two"; } @@ -827,7 +827,7 @@ config.mod = [ Example: Declaration of attribute sets of submodules - + options.mod = mkOption { description = "submodule example"; type = with types; attrsOf (submodule { @@ -847,7 +847,7 @@ options.mod = mkOption { Example: Definition of attribute sets of submodules - + config.mod.one = { foo = 1; bar = "one"; }; config.mod.two = { foo = 2; bar = "two"; }; @@ -878,7 +878,7 @@ config.mod.two = { foo = 2; bar = "two"; }; Example: Adding a type check - + byte = mkOption { description = "An integer between 0 and 255."; type = types.addCheck types.int (x: x >= 0 && x <= 255); @@ -889,7 +889,7 @@ byte = mkOption { Example: Overriding a type check - + nixThings = mkOption { description = "words that start with 'nix'"; type = types.str // { diff --git a/nixos/doc/manual/from_md/development/replace-modules.section.xml b/nixos/doc/manual/from_md/development/replace-modules.section.xml index cf8a39ba844f..d8aaf59df366 100644 --- a/nixos/doc/manual/from_md/development/replace-modules.section.xml +++ b/nixos/doc/manual/from_md/development/replace-modules.section.xml @@ -3,8 +3,8 @@ Modules that are imported can also be disabled. The option declarations, config implementation and the imports of a disabled - module will be ignored, allowing another to take it's place. This - can be used to import a set of modules from another channel while + module will be ignored, allowing another to take its place. This can + be used to import a set of modules from another channel while keeping the rest of the system on a stable release. @@ -19,10 +19,10 @@ This example will replace the existing postgresql module with the version defined in the nixos-unstable channel while keeping the rest of the modules and packages from the original nixos channel. This - only overrides the module definition, this won't use postgresql from + only overrides the module definition, this won’t use postgresql from nixos-unstable unless explicitly configured to do so. - + { config, lib, pkgs, ... }: { @@ -40,9 +40,9 @@ This example shows how to define a custom module as a replacement for an existing module. Importing this module will disable the - original module without having to know it's implementation details. + original module without having to know its implementation details. - + { config, lib, pkgs, ... }: with lib; 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 16db709f8b91..30aa24f26e63 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 @@ -25,6 +25,46 @@ $ ./result/bin/nixos-test-driver completion. This allows you to inspect the state of the VMs after the test (e.g. to debug the test script). +
+ Shell access in interactive mode + + The function + <yourmachine>.shell_interact() grants + access to a shell running inside a virtual machine. To use it, + replace <yourmachine> with the name of a + virtual machine defined in the test, for example: + machine.shell_interact(). Keep in mind that + this shell may not display everything correctly as it is running + within an interactive Python REPL, and logging output from the + virtual machine may overwrite input and output from the guest + shell: + + +>>> machine.shell_interact() +machine: Terminal is ready (there is no initial prompt): +$ hostname +machine + + + As an alternative, you can proxy the guest shell to a local TCP + server by first starting a TCP server in a terminal using the + command: + + +$ socat 'READLINE,PROMPT=$ ' tcp-listen:4444,reuseaddr` + + + In the terminal where the test driver is running, connect to this + server by using: + + +>>> machine.shell_interact("tcp:127.0.0.1:4444") + + + Once the connection is established, you can enter commands in the + socat terminal where socat is running. + +
Reuse VM state 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 d26dd96243db..898cd3b2b6e9 100644 --- a/nixos/doc/manual/from_md/development/settings-options.section.xml +++ b/nixos/doc/manual/from_md/development/settings-options.section.xml @@ -19,10 +19,10 @@ - Non-nix-representable ones: These can't be trivially mapped to a + Non-nix-representable ones: These can’t be trivially mapped to a subset of Nix syntax. Most generic programming languages are in this group, e.g. bash, since the statement - if true; then echo hi; fi doesn't have a + if true; then echo hi; fi doesn’t have a trivial representation in Nix. @@ -42,8 +42,7 @@
- Nix-representable Formats (JSON, YAML, TOML, INI, - ...) + Nix-representable Formats (JSON, YAML, TOML, INI, …) By convention, formats like this are handled with a generic settings option, representing the full program @@ -318,7 +317,7 @@ used, along with some other related best practices. See the comments for explanations. - + { options, config, lib, pkgs, ... }: let cfg = config.services.foo; @@ -391,7 +390,7 @@ in { Example: Declaring a type-checked settings attribute - + settings = lib.mkOption { type = lib.types.submodule { diff --git a/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml b/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml index 079c80060576..0d8a33df2069 100644 --- a/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml +++ b/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml @@ -23,7 +23,7 @@ $ nix-shell nix-shell$ make - Once you are done making modifications to the manual, it's + Once you are done making modifications to the manual, it’s important to build it before committing. You can do that as follows: 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 367731eda090..35e94845c97e 100644 --- a/nixos/doc/manual/from_md/development/writing-modules.chapter.xml +++ b/nixos/doc/manual/from_md/development/writing-modules.chapter.xml @@ -32,7 +32,7 @@ In , we saw the following structure of NixOS modules: - + { config, pkgs, ... }: { option definitions @@ -50,7 +50,7 @@ Example: Structure of NixOS Modules - + { config, pkgs, ... }: { @@ -90,7 +90,7 @@ This imports list enumerates the paths to other NixOS modules that should be included in the evaluation of the system configuration. A default set of modules is defined in - the file modules/module-list.nix. These don't + the file modules/module-list.nix. These don’t need to be added in the import list. @@ -146,7 +146,7 @@ Example: NixOS Module for the locate Service - + { config, lib, pkgs, ... }: with lib; @@ -208,7 +208,7 @@ in { Example: Escaping in Exec directives - + { config, lib, pkgs, utils, ... }: with lib; 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 4db196273dad..308f7c6fb0f6 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 @@ -3,7 +3,7 @@ A NixOS test is a module that has the following structure: - + { # One or more machines: @@ -58,14 +58,14 @@ Tests that are part of NixOS are added to nixos/tests/all-tests.nix. - + hostname = runTest ./hostname.nix; Overrides can be added by defining an anonymous module in all-tests.nix. - + hostname = runTest { imports = [ ./hostname.nix ]; defaults.networking.firewall.enable = false; @@ -87,7 +87,7 @@ nix-build -A nixosTests.hostname Outside the nixpkgs repository, you can instantiate the test by first importing the NixOS library, - + let nixos-lib = import (nixpkgs + "/nixos/lib") { }; in @@ -255,7 +255,7 @@ start_all() Return a list of different interpretations of what is - currently visible on the machine's screen using optical + currently visible on the machine’s screen using optical character recognition. The number and order of the interpretations is not specified and is subject to change, but if no exception is raised at least one will be returned. @@ -276,7 +276,7 @@ start_all() Return a textual representation of what is currently visible - on the machine's screen using optical character recognition. + on the machine’s screen using optical character recognition. @@ -483,8 +483,8 @@ start_all() - Wait until a process is listening on the given TCP port (on - localhost, at least). + Wait until a process is listening on the given TCP port and + IP address (default localhost). @@ -494,7 +494,8 @@ start_all() - Wait until nobody is listening on the given TCP port. + Wait until nobody is listening on the given TCP port and IP + address (default localhost). @@ -536,7 +537,7 @@ start_all() Wait until the supplied regular expressions match a line of the serial console output. This method is useful when OCR is - not possibile or accurate enough. + not possible or accurate enough. @@ -630,10 +631,10 @@ machine.wait_for_unit("xautolock.service", "x-session-user") stop_job. - For faster dev cycles it's also possible to disable the - code-linters (this shouldn't be commited though): + For faster dev cycles it’s also possible to disable the + code-linters (this shouldn’t be committed though): - + { skipLint = true; nodes.machine = @@ -650,10 +651,10 @@ machine.wait_for_unit("xautolock.service", "x-session-user") This will produce a Nix warning at evaluation time. To fully disable the linter, wrap the test script in comment directives to - disable the Black linter directly (again, don't commit this within + disable the Black linter directly (again, don’t commit this within the Nixpkgs repository): - + testScript = '' # fmt: off @@ -665,7 +666,7 @@ machine.wait_for_unit("xautolock.service", "x-session-user") Similarly, the type checking of test scripts can be disabled in the following way: - + { skipTypeCheck = true; nodes.machine = @@ -700,25 +701,37 @@ with foo_running: polling_condition takes the following (optional) arguments: - - seconds_interval - - - : specifies how often the condition should be polled: - + + + + seconds_interval + + + + specifies how often the condition should be polled: + + + + @polling_condition(seconds_interval=10) def foo_running(): machine.succeed("pgrep -x foo") - - description - - - : is used in the log when the condition is checked. If this is not - provided, the description is pulled from the docstring of the - function. These two are therefore equivalent: - + + + + description + + + + is used in the log when the condition is checked. If this is + not provided, the description is pulled from the docstring + of the function. These two are therefore equivalent: + + + + @polling_condition def foo_running(): @@ -739,7 +752,7 @@ def foo_running(): extraPythonPackages. For example, you could add numpy like this: - + { extraPythonPackages = p: [ p.numpy ]; diff --git a/nixos/doc/manual/from_md/installation/building-nixos.chapter.xml b/nixos/doc/manual/from_md/installation/building-nixos.chapter.xml index ea2d01bebcc2..0e46c1d48ca6 100644 --- a/nixos/doc/manual/from_md/installation/building-nixos.chapter.xml +++ b/nixos/doc/manual/from_md/installation/building-nixos.chapter.xml @@ -24,7 +24,7 @@ System images, such as the live installer ones, know how to enforce - configuration settings on wich they immediately depend in order to + configuration settings on which they immediately depend in order to work correctly. @@ -62,7 +62,7 @@ $ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd can create the following file at modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix: - + { config, ... }: { @@ -102,7 +102,7 @@ $ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd it needs at a minimum for correct functioning, while the installer base image overrides the entire file system layout because there can’t be any other guarantees on a live medium than those given by - the live medium itself. The latter is especially true befor + the live medium itself. The latter is especially true before formatting the target block device(s). On the other hand, the netboot iso only overrides its minimum dependencies since netboot images are always made-to-target. diff --git a/nixos/doc/manual/from_md/installation/changing-config.chapter.xml b/nixos/doc/manual/from_md/installation/changing-config.chapter.xml index 86f0b15b41c5..727c61c45d27 100644 --- a/nixos/doc/manual/from_md/installation/changing-config.chapter.xml +++ b/nixos/doc/manual/from_md/installation/changing-config.chapter.xml @@ -16,7 +16,7 @@ - This command doesn't start/stop + This command doesn’t start/stop user services automatically. nixos-rebuild only runs a daemon-reload for each user with running user @@ -64,8 +64,8 @@ which causes the new configuration (and previous ones created using -p test) to show up in the GRUB submenu - NixOS - Profile 'test'. This can be useful to - separate test configurations from stable + NixOS - Profile test. This can be + useful to separate test configurations from stable configurations. @@ -94,7 +94,7 @@ $ ./result/bin/run-*-vm unless you have set mutableUsers = false. Another way is to temporarily add the following to your configuration: - + users.users.your-user.initialHashedPassword = "test"; diff --git a/nixos/doc/manual/from_md/installation/installing-behind-a-proxy.section.xml b/nixos/doc/manual/from_md/installation/installing-behind-a-proxy.section.xml index a551807cd47c..00b4e8766718 100644 --- a/nixos/doc/manual/from_md/installation/installing-behind-a-proxy.section.xml +++ b/nixos/doc/manual/from_md/installation/installing-behind-a-proxy.section.xml @@ -11,7 +11,7 @@ /mnt/etc/nixos/configuration.nix to keep the internet accessible after reboot. - + networking.proxy.default = "http://user:password@proxy:port/"; networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; diff --git a/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml b/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml index 024a24379dd6..5f18d528d32d 100644 --- a/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml +++ b/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml @@ -53,7 +53,7 @@ $ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell Switch to the NixOS channel: - If you've just installed Nix on a non-NixOS distribution, you + If you’ve just installed Nix on a non-NixOS distribution, you will be on the nixpkgs channel by default. @@ -78,11 +78,11 @@ $ nix-channel --add https://nixos.org/channels/nixos-version nixpkgs Install the NixOS installation tools: - You'll need nixos-generate-config and + You’ll need nixos-generate-config and nixos-install, but this also makes some man pages and nixos-enter available, just in case you want to chroot into your NixOS partition. NixOS installs - these by default, but you don't have NixOS yet.. + these by default, but you don’t have NixOS yet.. $ nix-env -f '<nixpkgs>' -iA nixos-install-tools @@ -105,7 +105,7 @@ $ nix-env -f '<nixpkgs>' -iA nixos-install-tools mounting steps of - If you're about to install NixOS in place using + If you’re about to install NixOS in place using NIXOS_LUSTRATE there is nothing to do for this step. @@ -118,18 +118,18 @@ $ nix-env -f '<nixpkgs>' -iA nixos-install-tools $ sudo `which nixos-generate-config` --root /mnt - You'll probably want to edit the configuration files. Refer to + You’ll probably want to edit the configuration files. Refer to the nixos-generate-config step in for more information. Consider setting up the NixOS bootloader to give you the ability to boot on your existing Linux partition. For instance, if - you're using GRUB and your existing distribution is running + you’re using GRUB and your existing distribution is running Ubuntu, you may want to add something like this to your configuration.nix: - + boot.loader.grub.extraEntries = '' menuentry "Ubuntu" { search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e @@ -211,25 +211,25 @@ $ sudo groupdel nixbld Generate your NixOS configuration: -$ sudo `which nixos-generate-config` --root / +$ sudo `which nixos-generate-config` Note that this will place the generated configuration files in - /etc/nixos. You'll probably want to edit the + /etc/nixos. You’ll probably want to edit the configuration files. Refer to the nixos-generate-config step in for more information. - You'll likely want to set a root password for your first boot - using the configuration files because you won't have a chance to - enter a password until after you reboot. You can initalize the + You’ll likely want to set a root password for your first boot + using the configuration files because you won’t have a chance to + enter a password until after you reboot. You can initialize the root password to an empty one with this line: (and of course - don't forget to set one once you've rebooted or to lock the + don’t forget to set one once you’ve rebooted or to lock the account with sudo passwd -l root if you use sudo) - + users.users.root.initialHashedPassword = ""; @@ -262,7 +262,7 @@ $ sudo chown -R 0:0 /nix /etc/NIXOS_LUSTRATE tells the NixOS bootup - scripts to move everything that's in the + scripts to move everything that’s in the root partition to /old-root. This will move your existing distribution out of the way in the very early stages of the NixOS bootup. There are exceptions (we do need to @@ -290,12 +290,12 @@ $ sudo chown -R 0:0 /nix Support for NIXOS_LUSTRATE was added in - NixOS 16.09. The act of "lustrating" refers to the - wiping of the existing distribution. Creating + NixOS 16.09. The act of lustrating refers to + the wiping of the existing distribution. Creating /etc/NIXOS_LUSTRATE can also be used on NixOS to remove all mutable files from your root partition - (anything that's not in /nix or - /boot gets "lustrated" on the + (anything that’s not in /nix or + /boot gets lustrated on the next boot. @@ -307,14 +307,14 @@ $ sudo chown -R 0:0 /nix - Let's create the files: + Let’s create the files: $ sudo touch /etc/NIXOS $ sudo touch /etc/NIXOS_LUSTRATE - Let's also make sure the NixOS configuration files are kept once + Let’s also make sure the NixOS configuration files are kept once we reboot on NixOS: @@ -331,7 +331,7 @@ $ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE Once you complete this step, your current distribution will no - longer be bootable! If you didn't get all the NixOS + longer be bootable! If you didn’t get all the NixOS configuration right, especially those settings pertaining to boot loading and root partition, NixOS may not be bootable either. Have a USB rescue device ready in case this happens. @@ -349,7 +349,7 @@ sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot If for some reason you want to revert to the old distribution, - you'll need to boot on a USB rescue disk and do something along + you’ll need to boot on a USB rescue disk and do something along these lines: @@ -367,7 +367,7 @@ sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot loader. - And of course, if you're happy with NixOS and no longer need the + And of course, if you’re happy with NixOS and no longer need the old distribution: @@ -376,7 +376,7 @@ sudo rm -rf /old-root - It's also worth noting that this whole process can be automated. + It’s also worth noting that this whole process can be automated. This is especially useful for Cloud VMs, where provider do not provide NixOS. For instance, nixos-infect diff --git a/nixos/doc/manual/from_md/installation/installing-kexec.section.xml b/nixos/doc/manual/from_md/installation/installing-kexec.section.xml index 46ea0d59b6c3..40a697c74096 100644 --- a/nixos/doc/manual/from_md/installation/installing-kexec.section.xml +++ b/nixos/doc/manual/from_md/installation/installing-kexec.section.xml @@ -54,7 +54,7 @@ nix-build -A kexec.x86_64-linux '<nixpkgs/nixos/release.nix>' running Linux Distribution. - Note it’s symlinks pointing elsewhere, so cd in, + Note its symlinks pointing elsewhere, so cd in, and use scp * root@$destination to copy it over, rather than rsync. @@ -69,7 +69,7 @@ nix-build -A kexec.x86_64-linux '<nixpkgs/nixos/release.nix>' instead of the default installer image, you can build your own configuration.nix: - + { modulesPath, ... }: { imports = [ (modulesPath + "/installer/netboot/netboot-minimal.nix") diff --git a/nixos/doc/manual/from_md/installation/installing-usb.section.xml b/nixos/doc/manual/from_md/installation/installing-usb.section.xml index 9d12ac45aac2..cb0fd95bc7c5 100644 --- a/nixos/doc/manual/from_md/installation/installing-usb.section.xml +++ b/nixos/doc/manual/from_md/installation/installing-usb.section.xml @@ -110,15 +110,15 @@ diskutil unmountDisk diskX sudo dd if=<path-to-image> of=/dev/rdiskX bs=4m - After dd completes, a GUI dialog "The disk - you inserted was not readable by this computer" will pop up, - which can be ignored. + After dd completes, a GUI dialog The + disk you inserted was not readable by this computer will + pop up, which can be ignored. - Using the 'raw' rdiskX device instead of - diskX with dd completes in minutes instead of - hours. + Using the raw rdiskX device + instead of diskX with dd completes in minutes + instead of hours. diff --git a/nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xml b/nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xml index c8bb286c8f33..e43508185299 100644 --- a/nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xml +++ b/nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xml @@ -1,4 +1,4 @@ -
+
Installing in a VirtualBox guest Installing NixOS into a VirtualBox guest is convenient for users who @@ -11,8 +11,8 @@ - Add a New Machine in VirtualBox with OS Type "Linux / Other - Linux" + Add a New Machine in VirtualBox with OS Type Linux / + Other Linux @@ -38,7 +38,7 @@ Click on Settings / System / Acceleration and enable - "VT-x/AMD-V" acceleration + VT-x/AMD-V acceleration @@ -58,25 +58,25 @@ There are a few modifications you should make in configuration.nix. Enable booting: - + boot.loader.grub.device = "/dev/sda"; Also remove the fsck that runs at startup. It will always fail to run, stopping your boot until you press *. - + boot.initrd.checkJournalingFS = false; Shared folders can be given a name and a path in the host system in the VirtualBox settings (Machine / Settings / Shared Folders, then - click on the "Add" icon). Add the following to the + click on the Add icon). Add the following to the /etc/nixos/configuration.nix to auto-mount them. If you do not add "nofail", the system will not boot properly. - + { config, pkgs, ...} : { fileSystems."/virtualboxshare" = { diff --git a/nixos/doc/manual/from_md/installation/installing.chapter.xml b/nixos/doc/manual/from_md/installation/installing.chapter.xml index f2ed58c0c1fe..5654eb424fc3 100644 --- a/nixos/doc/manual/from_md/installation/installing.chapter.xml +++ b/nixos/doc/manual/from_md/installation/installing.chapter.xml @@ -256,7 +256,7 @@ $ sudo -i On the minimal installer, NetworkManager is not available, so - configuration must be perfomed manually. To configure the wifi, + configuration must be performed manually. To configure the wifi, first start wpa_supplicant with sudo systemctl start wpa_supplicant, then run wpa_cli. For most home networks, you need to @@ -345,12 +345,12 @@ OK - Here's an example partition scheme for UEFI, using + Here’s an example partition scheme for UEFI, using /dev/sda as the device. - You can safely ignore parted's + You can safely ignore parted’s informational message about needing to update /etc/fstab. @@ -415,12 +415,12 @@ OK - Here's an example partition scheme for Legacy Boot, using + Here’s an example partition scheme for Legacy Boot, using /dev/sda as the device. - You can safely ignore parted's + You can safely ignore parted’s informational message about needing to update /etc/fstab. diff --git a/nixos/doc/manual/from_md/installation/upgrading.chapter.xml b/nixos/doc/manual/from_md/installation/upgrading.chapter.xml index 11fe1d317ccd..99882784b46f 100644 --- a/nixos/doc/manual/from_md/installation/upgrading.chapter.xml +++ b/nixos/doc/manual/from_md/installation/upgrading.chapter.xml @@ -12,7 +12,7 @@ Stable channels, such as - nixos-22.05. + nixos-22.11. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), @@ -33,7 +33,7 @@ Small channels, such as - nixos-22.05-small + nixos-22.11-small or nixos-unstable-small. These are identical to the stable and unstable channels @@ -60,8 +60,8 @@ When you first install NixOS, you’re automatically subscribed to the NixOS channel that corresponds to your installation source. For - instance, if you installed from a 22.05 ISO, you will be subscribed - to the nixos-22.05 channel. To see which NixOS + instance, if you installed from a 22.11 ISO, you will be subscribed + to the nixos-22.11 channel. To see which NixOS channel you’re subscribed to, run the following as root: @@ -76,17 +76,17 @@ nixos https://nixos.org/channels/nixos-unstable (Be sure to include the nixos parameter at the - end.) For instance, to use the NixOS 22.05 stable channel: + end.) For instance, to use the NixOS 22.11 stable channel: -# nix-channel --add https://nixos.org/channels/nixos-22.05 nixos +# nix-channel --add https://nixos.org/channels/nixos-22.11 nixos If you have a server, you may want to use the small channel instead: -# nix-channel --add https://nixos.org/channels/nixos-22.05-small nixos +# nix-channel --add https://nixos.org/channels/nixos-22.11-small nixos And if you want to live on the bleeding edge: @@ -128,7 +128,7 @@ nixos https://nixos.org/channels/nixos-unstable You can keep a NixOS system up-to-date automatically by adding the following to configuration.nix: - + system.autoUpgrade.enable = true; system.autoUpgrade.allowReboot = true; @@ -145,8 +145,8 @@ system.autoUpgrade.allowReboot = true; contains a different kernel, initrd or kernel modules. You can also specify a channel explicitly, e.g. - -system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.05; + +system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.11;
diff --git a/nixos/doc/manual/from_md/release-notes/rl-1404.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1404.section.xml index 8771623b468a..5686545c1afb 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1404.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1404.section.xml @@ -79,7 +79,7 @@ the NixOS configuration. For instance, if a package foo provides systemd units, you can say: - + { systemd.packages = [ pkgs.foo ]; } @@ -88,7 +88,7 @@ to enable those units. You can then set or override unit options in the usual way, e.g. - + { systemd.services.foo.wantedBy = [ "multi-user.target" ]; systemd.services.foo.serviceConfig.MemoryLimit = "512M"; @@ -105,7 +105,7 @@ NixOS configuration requires unfree packages from Nixpkgs, you need to enable support for them explicitly by setting: - + { nixpkgs.config.allowUnfree = true; } @@ -123,7 +123,7 @@ The Adobe Flash player is no longer enabled by default in the Firefox and Chromium wrappers. To enable it, you must set: - + { nixpkgs.config.allowUnfree = true; nixpkgs.config.firefox.enableAdobeFlash = true; # for Firefox @@ -136,7 +136,7 @@ The firewall is now enabled by default. If you don’t want this, you need to disable it explicitly: - + { networking.firewall.enable = false; } diff --git a/nixos/doc/manual/from_md/release-notes/rl-1412.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1412.section.xml index 3b6af73359d6..ccaa4f6bd081 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1412.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1412.section.xml @@ -370,7 +370,7 @@ documentation for details. If you wish to continue to use httpd 2.2, add the following line to your NixOS configuration: - + { services.httpd.package = pkgs.apacheHttpd_2_2; } diff --git a/nixos/doc/manual/from_md/release-notes/rl-1509.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1509.section.xml index 68d2ab389e8f..96b51a051066 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1509.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1509.section.xml @@ -9,12 +9,12 @@ The Haskell packages infrastructure has been re-designed from the ground up - ("Haskell NG"). NixOS now distributes the latest + (Haskell NG). NixOS now distributes the latest version of every single package registered on Hackage -- well in excess of 8,000 Haskell packages. Detailed instructions on how to use that infrastructure can be found in the - User's + User’s Guide to the Haskell Infrastructure. Users migrating from an earlier release may find helpful information below, in the list of backwards-incompatible changes. Furthermore, we @@ -23,8 +23,8 @@ Haskell release since version 0.0 as well as the most recent Stackage Nightly snapshot. The announcement - "Full - Stackage Support in Nixpkgs" gives additional + Full + Stackage Support in Nixpkgs gives additional details. @@ -42,7 +42,7 @@ - + { system.autoUpgrade.enable = true; } @@ -432,7 +432,7 @@ - + { system.stateVersion = "14.12"; } @@ -464,7 +464,7 @@ - Steam now doesn't need root rights to work. Instead of using + Steam now doesn’t need root rights to work. Instead of using *-steam-chrootenv, you should now just run steam. steamChrootEnv package was renamed to steam, and old @@ -523,7 +523,7 @@ - + { fileSystems."/shiny" = { device = "myshinysharedfolder"; @@ -534,15 +534,15 @@ - "nix-env -qa" no longer discovers - Haskell packages by name. The only packages visible in the - global scope are ghc, + nix-env -qa no longer + discovers Haskell packages by name. The only packages visible in + the global scope are ghc, cabal-install, and stack, but all other packages are hidden. The reason for this inconvenience is the sheer size of the Haskell package set. Name-based lookups are expensive, and most nix-env -qa operations would become much - slower if we'd add the entire Hackage database into the top + slower if we’d add the entire Hackage database into the top level attribute set. Instead, the list of Haskell packages can be displayed by running: @@ -566,13 +566,13 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc Previous versions of NixOS came with a feature called ghc-wrapper, a small script that allowed GHC - to transparently pick up on libraries installed in the user's + to transparently pick up on libraries installed in the user’s profile. This feature has been deprecated; ghc-wrapper was removed from the distribution. The proper way to register Haskell libraries with the compiler now is the haskellPackages.ghcWithPackages function. The - User's + User’s Guide to the Haskell Infrastructure provides more information about this subject. @@ -593,7 +593,7 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc have a function attribute called extension that users could override in their ~/.nixpkgs/config.nix files to configure - additional attributes, etc. That function still exists, but it's + additional attributes, etc. That function still exists, but it’s now called overrides. @@ -662,7 +662,7 @@ infinite recursion encountered lib, after adding it as argument of the module. The following module - + { config, pkgs, ... }: with pkgs.lib; @@ -677,7 +677,7 @@ with pkgs.lib; should be modified to look like: - + { config, pkgs, lib, ... }: with lib; @@ -695,7 +695,7 @@ with lib; replaced by (import <nixpkgs> {}). The following module - + { config, pkgs, ... }: let @@ -712,7 +712,7 @@ in should be modified to look like: - + { config, pkgs, ... }: let @@ -748,7 +748,7 @@ in /etc/ssh/moduli file with respect to the vulnerabilities discovered in the Diffie-Hellman key exchange can now - replace OpenSSH's default version with one they generated + replace OpenSSH’s default version with one they generated themselves using the new services.openssh.moduliFile option. diff --git a/nixos/doc/manual/from_md/release-notes/rl-1603.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1603.section.xml index 172b800b5992..25b356e0aa6a 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1603.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1603.section.xml @@ -378,7 +378,7 @@ You will need to add an import statement to your NixOS configuration in order to use it, e.g. - + { imports = [ <nixpkgs/nixos/modules/services/misc/gitit.nix> ]; } @@ -395,7 +395,7 @@ to be built in. All modules now reside in nginxModules set. Example configuration: - + nginx.override { modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; } @@ -403,7 +403,7 @@ nginx.override { - s3sync is removed, as it hasn't been + s3sync is removed, as it hasn’t been developed by upstream for 4 years and only runs with ruby 1.8. For an actively-developer alternative look at tarsnap and others. @@ -411,7 +411,7 @@ nginx.override { - ruby_1_8 has been removed as it's not + ruby_1_8 has been removed as it’s not supported from upstream anymore and probably contains security issues. @@ -439,7 +439,7 @@ nginx.override { The Ctrl+Alt+Backspace key combination no - longer kills the X server by default. There's a new option + longer kills the X server by default. There’s a new option services.xserver.enableCtrlAltBackspace allowing to enable the combination again. @@ -457,7 +457,7 @@ nginx.override { /var/lib/postfix. Old configurations are migrated automatically. service.postfix module has also received many improvements, such as correct - directories' access rights, new aliasFiles + directories’ access rights, new aliasFiles and mapFiles options and more. @@ -468,7 +468,7 @@ nginx.override { continue to work, but print a warning, until the 16.09 release. An example of the new style: - + { fileSystems."/example" = { device = "/dev/sdc"; @@ -497,7 +497,7 @@ nginx.override { There are also Gutenprint improvements; in particular, a new option services.printing.gutenprint is added - to enable automatic updating of Gutenprint PPMs; it's greatly + to enable automatic updating of Gutenprint PPMs; it’s greatly recommended to enable it instead of adding gutenprint to the drivers list. @@ -524,7 +524,7 @@ nginx.override { used input method name, "ibus" for ibus. An example of the new style: - + { i18n.inputMethod.enabled = "ibus"; i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [ anthy mozc ]; @@ -533,7 +533,7 @@ nginx.override { That is equivalent to the old version: - + { programs.ibus.enable = true; programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ]; @@ -545,7 +545,7 @@ nginx.override { services.udev.extraRules option now writes rules to 99-local.rules instead of 10-local.rules. This makes all the user rules - apply after others, so their results wouldn't be overriden by + apply after others, so their results wouldn’t be overridden by anything else. @@ -587,7 +587,7 @@ $TTL 1800 point to exact folder where syncthing is writing to. Example configuration should look something like: - + { services.syncthing = { enable = true; @@ -632,8 +632,8 @@ error: path ‘/nix/store/*-broadcom-sta-*’ does not exist and cannot be creat The services.xserver.startGnuPGAgent option has been removed. GnuPG 2.1.x changed the way the gpg-agent works, and that new approach no longer requires (or even - supports) the "start everything as a child of the - agent" scheme we've implemented in NixOS for older + supports) the start everything as a child of the + agent scheme we’ve implemented in NixOS for older versions. To configure the gpg-agent for your X session, add the following code to ~/.bashrc or some file that’s sourced when your shell is started: @@ -670,7 +670,7 @@ export GPG_TTY The gpg-agent(1) man page has more details - about this subject, i.e. in the "EXAMPLES" section. + about this subject, i.e. in the EXAMPLES section. diff --git a/nixos/doc/manual/from_md/release-notes/rl-1609.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1609.section.xml index 0fba40a0e78d..c2adbc88f5ca 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1609.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1609.section.xml @@ -78,7 +78,7 @@ LTS Haskell package set. That support has been dropped. The previously provided haskell.packages.lts-x_y package sets still exist in name to aviod breaking user code, - but these package sets don't actually contain the versions + but these package sets don’t actually contain the versions mandated by the corresponding LTS release. Instead, our package set it loosely based on the latest available LTS release, i.e. LTS 7.x at the time of this writing. New releases of NixOS and @@ -119,7 +119,7 @@ - Gitlab's maintainance script gitlab-runner + Gitlab’s maintainance script gitlab-runner was removed and split up into the more clearer gitlab-run and gitlab-rake scripts, because gitlab-runner is a component @@ -164,7 +164,7 @@ goPackages was replaced with separated Go applications in appropriate nixpkgs - categories. Each Go package uses its own dependency set. There's + categories. Each Go package uses its own dependency set. There’s also a new go2nix tool introduced to generate a Go package definition from its Go source automatically. @@ -192,7 +192,7 @@ interface has been streamlined. Desktop users should be able to simply set - + { security.grsecurity.enable = true; } diff --git a/nixos/doc/manual/from_md/release-notes/rl-1703.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1703.section.xml index 1119ec53dfc9..8667063f37e0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1703.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1703.section.xml @@ -22,7 +22,7 @@ - The default desktop environment now is KDE's Plasma 5. KDE 4 + The default desktop environment now is KDE’s Plasma 5. KDE 4 has been removed @@ -560,7 +560,7 @@ Parsoid service now uses YAML configuration format. service.parsoid.interwikis is now called service.parsoid.wikis and is a list of - either API URLs or attribute sets as specified in parsoid's + either API URLs or attribute sets as specified in parsoid’s documentation. @@ -581,7 +581,7 @@ service.nylon is now declared using named instances. As an example: - + { services.nylon = { enable = true; @@ -594,7 +594,7 @@ should be replaced with: - + { services.nylon.myvpn = { enable = true; @@ -615,7 +615,7 @@ overlays. For example, the following code: - + let pkgs = import <nixpkgs> {}; in @@ -624,7 +624,7 @@ in should be replaced by: - + let pkgs = import <nixpkgs> {}; in @@ -647,7 +647,7 @@ in local_recipient_maps is not set to empty - value by Postfix service. It's an insecure default as stated + value by Postfix service. It’s an insecure default as stated by Postfix documentation. Those who want to retain this setting need to set it via services.postfix.extraConfig. @@ -669,7 +669,7 @@ in The socket handling of the services.rmilter - module has been fixed and refactored. As rmilter doesn't + module has been fixed and refactored. As rmilter doesn’t support binding to more than one socket, the options bindUnixSockets and bindInetSockets have been replaced by @@ -729,7 +729,7 @@ in improves visual consistency and makes Java follow system font style, improving the situation on HighDPI displays. This has a cost of increased closure size; for server and other headless - workloads it's recommended to use + workloads it’s recommended to use jre_headless. diff --git a/nixos/doc/manual/from_md/release-notes/rl-1709.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1709.section.xml index 8f0efe816e51..849ec868c783 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1709.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1709.section.xml @@ -26,10 +26,10 @@ The module option services.xserver.xrandrHeads now causes the first head specified in this list to be set as the primary - head. Apart from that, it's now possible to also set + head. Apart from that, it’s now possible to also set additional options by using an attribute set, for example: - + { services.xserver.xrandrHeads = [ "HDMI-0" { @@ -543,7 +543,7 @@ - Radicale's default package has changed from 1.x to 2.x. + Radicale’s default package has changed from 1.x to 2.x. Instructions to migrate can be found here . It is also possible to use the newer version by @@ -582,7 +582,7 @@ - flexget's state database cannot be upgraded + flexget’s state database cannot be upgraded to its new internal format, requiring removal of any existing db-config.sqlite which will be automatically recreated. @@ -590,9 +590,9 @@ - The ipfs service now doesn't ignore the - dataDir option anymore. If you've ever set - this option to anything other than the default you'll have to + The ipfs service now doesn’t ignore the + dataDir option anymore. If you’ve ever set + this option to anything other than the default you’ll have to either unset it (so the default gets used) or migrate the old data manually with @@ -651,22 +651,22 @@ rmdir /var/lib/ipfs/.ipfs - cc-wrapper's setup-hook now exports a + cc-wrappers setup-hook now exports a number of environment variables corresponding to binutils binaries, (e.g. LD, STRIP, RANLIB, etc). - This is done to prevent packages' build systems guessing, - which is harder to predict, especially when cross-compiling. - However, some packages have broken due to this—their build - systems either not supporting, or claiming to support without - adequate testing, taking such environment variables as - parameters. + This is done to prevent packages build systems + guessing, which is harder to predict, especially when + cross-compiling. However, some packages have broken due to + this—their build systems either not supporting, or claiming to + support without adequate testing, taking such environment + variables as parameters. services.firefox.syncserver now runs by - default as a non-root user. To accomodate this change, the + default as a non-root user. To accommodate this change, the default sqlite database location has also been changed. Migration should work automatically. Refer to the description of the options for more details. @@ -688,10 +688,10 @@ rmdir /var/lib/ipfs/.ipfs - grsecurity/PaX support has been dropped, following upstream's + grsecurity/PaX support has been dropped, following upstream’s decision to cease free support. See - upstream's announcement for more information. No + upstream’s announcement for more information. No complete replacement for grsecurity/PaX is available presently. @@ -794,7 +794,7 @@ FLUSH PRIVILEGES; Modules can now be disabled by using - disabledModules, allowing another to take it's place. + disabledModules, allowing another to take it’s place. This can be used to import a set of modules from another channel while keeping the rest of the system on a stable release. @@ -808,7 +808,7 @@ FLUSH PRIVILEGES; provided by fontconfig-penultimate, replacing fontconfig-ultimate; the new defaults are less invasive and provide rendering that is more consistent with other systems - and hopefully with each font designer's intent. Some + and hopefully with each font designer’s intent. Some system-wide configuration has been removed from the Fontconfig NixOS module where user Fontconfig settings are available. diff --git a/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml index 910cad467e9d..f197c52906b0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml @@ -16,9 +16,9 @@ Platform support: x86_64-linux and x86_64-darwin since release - time (the latter isn't NixOS, really). Binaries for + time (the latter isn’t NixOS, really). Binaries for aarch64-linux are available, but no channel exists yet, as - it's waiting for some test fixes, etc. + it’s waiting for some test fixes, etc. @@ -495,11 +495,11 @@ The propagation logic has been changed. The new logic, along with new types of dependencies that go with, is thoroughly - documented in the "Specifying dependencies" section - of the "Standard Environment" chapter of the nixpkgs - manual. The old logic isn't but is easy to describe: - dependencies were propagated as the same type of dependency no - matter what. In practice, that means that many + documented in the Specifying dependencies + section of the Standard Environment chapter of + the nixpkgs manual. The old logic isn’t but is easy to + describe: dependencies were propagated as the same type of + dependency no matter what. In practice, that means that many propagatedNativeBuildInputs should instead be propagatedBuildInputs. Thankfully, that was and is the least used type of dependency. Also, it means @@ -541,7 +541,7 @@ Previously, if other options in the Postfix module like services.postfix.useSrs were set and the user set config options that were also set by such options, - the resulting config wouldn't include all options that were + the resulting config wouldn’t include all options that were needed. They are now merged correctly. If config options need to be overridden, lib.mkForce or lib.mkOverride can be used. @@ -626,7 +626,7 @@ if config.networking.domain is set, matomo.${config.networking.hostName} if it is not set. If you change your - serverName, remember you'll need to + serverName, remember you’ll need to update the trustedHosts[] array in /var/lib/matomo/config/config.ini.php as well. @@ -793,7 +793,7 @@ services.btrfs.autoScrub has been added, to periodically check btrfs filesystems for data corruption. If - there's a correct copy available, it will automatically repair + there’s a correct copy available, it will automatically repair corrupted blocks. @@ -830,7 +830,7 @@ In order to have the previous default configuration add - + { services.xserver.displayManager.lightdm.greeters.gtk.indicators = [ "~host" "~spacer" diff --git a/nixos/doc/manual/from_md/release-notes/rl-1809.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1809.section.xml index aa4637a99b60..4bbfa7be398e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1809.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1809.section.xml @@ -54,7 +54,7 @@ For example - + { programs.firejail = { enable = true; @@ -523,8 +523,8 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' The netcat package is now taken directly - from OpenBSD's libressl, instead of relying - on Debian's fork. The new version should be very close to the + from OpenBSD’s libressl, instead of relying + on Debian’s fork. The new version should be very close to the old version, but there are some minor differences. Importantly, flags like -b, -q, -C, and -Z are no longer accepted by the nc command. @@ -533,7 +533,7 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' The services.docker-registry.extraConfig - object doesn't contain environment variables anymore. Instead + object doesn’t contain environment variables anymore. Instead it needs to provide an object structure that can be mapped onto the YAML configuration defined in the @@ -543,7 +543,7 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' gnucash has changed from version 2.4 to - 3.x. If you've been using gnucash (version + 3.x. If you’ve been using gnucash (version 2.4) instead of gnucash26 (version 2.6) you must open your Gnucash data file(s) with gnucash26 and then save them to upgrade the @@ -695,7 +695,7 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' A NixOS system can now be constructed more easily based on a preexisting invocation of Nixpkgs. For example: - + { inherit (pkgs.nixos { boot.loader.grub.enable = false; @@ -791,7 +791,7 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' An example usage of this would be: - + { config, ... }: { @@ -874,7 +874,7 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' The programs.screen module provides allows to configure /etc/screenrc, however the module behaved fairly counterintuitive as the config exists, - but the package wasn't available. Since 18.09 + but the package wasn’t available. Since 18.09 pkgs.screen will be added to environment.systemPackages. @@ -920,7 +920,7 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' NixOS option descriptions are now automatically broken up into individual paragraphs if the text contains two consecutive - newlines, so it's no longer necessary to use + newlines, so it’s no longer necessary to use </para><para> to start a new paragraph. diff --git a/nixos/doc/manual/from_md/release-notes/rl-1903.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1903.section.xml index f26e68e13200..ed26f2ba45d0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1903.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1903.section.xml @@ -29,9 +29,9 @@ By default, services.xserver.desktopManager.pantheon - enables LightDM as a display manager, as pantheon's screen + enables LightDM as a display manager, as pantheon’s screen locking implementation relies on it. Because of that it is - recommended to leave LightDM enabled. If you'd like to + recommended to leave LightDM enabled. If you’d like to disable it anyway, set services.xserver.displayManager.lightdm.enable to false and enable your preferred @@ -39,8 +39,8 @@ - Also note that Pantheon's LightDM greeter is not enabled by - default, because it has numerous issues in NixOS and isn't + Also note that Pantheon’s LightDM greeter is not enabled by + default, because it has numerous issues in NixOS and isn’t optimal for use here yet. @@ -200,7 +200,7 @@ The ntp module now has sane default - restrictions. If you're relying on the previous defaults, + restrictions. If you’re relying on the previous defaults, which permitted all queries and commands from all firewall-permitted sources, you can set services.ntp.restrictDefault and @@ -271,7 +271,7 @@ The versioned postgresql have been renamed - to use underscore number seperators. For example, + to use underscore number separators. For example, postgresql96 has been renamed to postgresql_9_6. @@ -342,7 +342,7 @@ preserved when also setting interface specific rules such as networking.firewall.interfaces.en0.allow*. These rules continue to use the pseudo device - "default" + default (networking.firewall.interfaces.default.*), and assigning to this pseudo device will override the (networking.firewall.allow*) options. @@ -360,9 +360,9 @@ presence of services.sssd.enable = true because nscd caching would interfere with sssd in unpredictable ways as well. Because - we're using nscd not for caching, but for convincing glibc to + we’re using nscd not for caching, but for convincing glibc to find NSS modules in the nix store instead of an absolute path, - we have decided to disable caching globally now, as it's + we have decided to disable caching globally now, as it’s usually not the behaviour the user wants and can lead to surprising behaviour. Furthermore, negative caching of host lookups is also disabled now by default. This should fix the @@ -374,7 +374,7 @@ setting the services.nscd.config option with the desired caching parameters. - + { services.nscd.config = '' @@ -453,7 +453,7 @@ with its control field set to sufficient instead of required, so that password managed only by later PAM password modules are being executed. - Previously, for example, changing an LDAP account's password + Previously, for example, changing an LDAP account’s password through PAM was not possible: the whole password module verification was exited prematurely by pam_unix, preventing @@ -497,11 +497,11 @@ the last version to accept self-signed certificates. As such, it is now recommended to use a proper certificate - verified by a root CA (for example Let's Encrypt). The new + verified by a root CA (for example Let’s Encrypt). The new manual chapter on Matrix contains a working example of using nginx as a reverse proxy in front of matrix-synapse, - using Let's Encrypt certificates. + using Let’s Encrypt certificates. @@ -682,7 +682,7 @@ all config options provided by the current upstream version as service options. Additionally the ndppd - package doesn't contain the systemd unit configuration from + package doesn’t contain the systemd unit configuration from upstream anymore, the unit is completely configured by the NixOS module now. diff --git a/nixos/doc/manual/from_md/release-notes/rl-1909.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1909.section.xml index 83cd649f4ea0..3bf83e1eccbd 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1909.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1909.section.xml @@ -82,13 +82,13 @@ - We've updated to Xfce 4.14, which brings a new module + We’ve updated to Xfce 4.14, which brings a new module services.xserver.desktopManager.xfce4-14. - If you'd like to upgrade, please switch from the + If you’d like to upgrade, please switch from the services.xserver.desktopManager.xfce module - as it will be deprecated in a future release. They're - incompatibilities with the current Xfce module; it doesn't - support thunarPlugins and it isn't + as it will be deprecated in a future release. They’re + incompatibilities with the current Xfce module; it doesn’t + support thunarPlugins and it isn’t recommended to use services.xserver.desktopManager.xfce and services.xserver.desktopManager.xfce4-14 @@ -125,7 +125,7 @@ With these options we hope to give users finer grained control - over their systems. Prior to this change you'd either have to + over their systems. Prior to this change you’d either have to manually disable options or use environment.gnome3.excludePackages which only excluded the optional applications. @@ -138,7 +138,7 @@ Orthogonal to the previous changes to the GNOME 3 desktop - manager module, we've updated all default services and + manager module, we’ve updated all default services and applications to match as close as possible to a default reference GNOME 3 experience. @@ -295,7 +295,7 @@ services.xserver.desktopManager.mate Note Mate uses programs.system-config-printer as it - doesn't use it as a service, but its graphical interface + doesn’t use it as a service, but its graphical interface directly. @@ -347,7 +347,7 @@ services.prometheus.alertmanager.user and services.prometheus.alertmanager.group have been removed because the alertmanager service is now using - systemd's + systemd’s DynamicUser mechanism which obviates these options. @@ -366,7 +366,7 @@ The services.nzbget.configFile and services.nzbget.openFirewall options were removed as they are managed internally by the nzbget. The - services.nzbget.dataDir option hadn't + services.nzbget.dataDir option hadn’t actually been used by the module for some time and so was removed as cleanup. @@ -475,7 +475,7 @@ Make sure you set the _netdev option for each of the file systems referring to block devices provided by the autoLuks module. Not doing this might render the system - in a state where it doesn't boot anymore. + in a state where it doesn’t boot anymore. If you are actively using the autoLuks @@ -498,7 +498,7 @@ The prometheus-nginx-exporter package now - uses the offical exporter provided by NGINX Inc. Its metrics + uses the official exporter provided by NGINX Inc. Its metrics are differently structured and are incompatible to the old ones. For information about the metrics, have a look at the official @@ -524,7 +524,7 @@ By default, prometheus exporters are now run with DynamicUser enabled. Exporters that need a - real user, now run under a seperate user and group which + real user, now run under a separate user and group which follow the pattern <exporter-name>-exporter, instead of the previous default nobody and @@ -667,7 +667,7 @@ instead of depending on the catch-all acme-certificates.target. This target unit was also removed from the codebase. This will mean nginx will - no longer depend on certificates it isn't explicitly managing + no longer depend on certificates it isn’t explicitly managing and fixes a bug with certificate renewal ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at @@ -687,8 +687,8 @@ services.xserver.desktopManager.xterm is now disabled by default if stateVersion is 19.09 or higher. Previously the xterm desktopManager was - enabled when xserver was enabled, but it isn't useful for all - people so it didn't make sense to have any desktopManager + enabled when xserver was enabled, but it isn’t useful for all + people so it didn’t make sense to have any desktopManager enabled default. @@ -696,7 +696,7 @@ The WeeChat plugin pkgs.weechatScripts.weechat-xmpp has been - removed as it doesn't receive any updates from upstream and + removed as it doesn’t receive any updates from upstream and depends on outdated Python2-based modules. @@ -744,11 +744,11 @@ services.gitlab.secrets.dbFile, services.gitlab.secrets.otpFile and services.gitlab.secrets.jwsFile). This was - done so that secrets aren't stored in the world-readable nix - store, but means that for each option you'll have to create a - file with the same exact string, add "File" to the - end of the option name, and change the definition to a string - pointing to the corresponding file; e.g. + done so that secrets aren’t stored in the world-readable nix + store, but means that for each option you’ll have to create a + file with the same exact string, add File to + the end of the option name, and change the definition to a + string pointing to the corresponding file; e.g. services.gitlab.databasePassword = "supersecurepassword" becomes services.gitlab.databasePasswordFile = "/path/to/secret_file" @@ -791,7 +791,7 @@ The nodejs-11_x package has been removed as - it's EOLed by upstream. + it’s EOLed by upstream. @@ -961,7 +961,7 @@ from the upstream default speex-float-1 to speex-float-5. Be aware that low-powered ARM-based and MIPS-based boards will struggle with this so - you'll need to set + you’ll need to set hardware.pulseaudio.daemon.config.resample-method back to speex-float-1. @@ -1004,7 +1004,7 @@ - It's now possible to change configuration in + It’s now possible to change configuration in services.nextcloud after the initial deploy since all config parameters are persisted in an additional config file generated by the @@ -1178,7 +1178,7 @@ release notes for details. The mgr dashboard as well as osds backed by loop-devices is no longer explicitly supported by - the package and module. Note: There's been some issues with + the package and module. Note: There’s been some issues with python-cherrypy, which is used by the dashboard and prometheus mgr modules (and possibly others), hence 0000-dont-check-cherrypy-version.patch. diff --git a/nixos/doc/manual/from_md/release-notes/rl-2003.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2003.section.xml index 53e6e1329a94..35fbb7447c70 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2003.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2003.section.xml @@ -73,7 +73,7 @@ The graphical installer image starts the graphical session - automatically. Before you'd be greeted by a tty and asked to + automatically. Before you’d be greeted by a tty and asked to enter systemctl start display-manager. It is now possible to disable the display-manager from running by selecting the Disable display-manager quirk @@ -93,7 +93,7 @@ services.xserver.desktopManager.pantheon.enable, we now default to also use - Pantheon's newly designed greeter . Contrary to NixOS's + Pantheon’s newly designed greeter . Contrary to NixOS’s usual update policy, Pantheon will receive updates during the cycle of NixOS 20.03 when backwards compatible. @@ -133,7 +133,7 @@ option to improve support for upstream session files. If you used something like: - + { services.xserver.desktopManager.default = "xfce"; services.xserver.windowManager.default = "icewm"; @@ -142,7 +142,7 @@ you should change it to: - + { services.xserver.displayManager.defaultSession = "xfce+icewm"; } @@ -196,7 +196,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. - UPower's configuration is now managed by NixOS and can be + UPower’s configuration is now managed by NixOS and can be customized via services.upower. @@ -505,7 +505,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. #71106. - We already don't support the global + We already don’t support the global networking.useDHCP, networking.defaultGateway and @@ -522,7 +522,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. The stdenv now runs all bash with set -u, to catch the use of undefined variables. Before, it itself used set -u but was careful to unset it so - other packages' code ran as before. Now, all bash code is held + other packages’ code ran as before. Now, all bash code is held to the same high standard, and the rather complex stateful manipulation of the options can be discarded. @@ -558,7 +558,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. xfceUnstable all now point to the latest Xfce 4.14 packages. And in the future NixOS releases will be the latest released version of Xfce available at the time of - the release's development (if viable). + the release’s development (if viable). @@ -662,7 +662,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. The dump1090 derivation has been changed to - use FlightAware's dump1090 as its upstream. However, this + use FlightAware’s dump1090 as its upstream. However, this version does not have an internal webserver anymore. The assets in the share/dump1090 directory of the derivation can be used in conjunction with an external @@ -821,7 +821,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. is a loaOf option that is commonly used as follows: - + { users.users = [ { name = "me"; @@ -836,7 +836,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. value of name as the name of the attribute set: - + { users.users.me = { description = "My personal user."; @@ -890,7 +890,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. Theservices.buildkite-agent.openssh.publicKeyPath - option has been removed, as it's not necessary to deploy + option has been removed, as it’s not necessary to deploy public keys to clone private repositories. @@ -932,7 +932,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. The services.xserver.displayManager.auto module has been removed. It was only intended for use in internal NixOS tests, and gave the false impression of it - being a special display manager when it's actually LightDM. + being a special display manager when it’s actually LightDM. Please use the services.xserver.displayManager.lightdm.autoLogin options instead, or any other display manager in NixOS as they @@ -940,7 +940,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. because it permitted root auto-login you can override the lightdm-autologin pam module like: - + { security.pam.services.lightdm-autologin.text = lib.mkForce '' auth requisite pam_nologin.so @@ -962,13 +962,13 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. auth required pam_succeed_if.so quiet - line, where default it's: + line, where default it’s: auth required pam_succeed_if.so uid >= 1000 quiet - not permitting users with uid's below 1000 (like root). All + not permitting users with uid’s below 1000 (like root). All other display managers in NixOS are configured like this. @@ -1004,7 +1004,7 @@ auth required pam_succeed_if.so quiet Additionally, some Postfix configuration must now be set manually instead of automatically by the Mailman module: - + { services.postfix.relayDomains = [ "hash:/var/lib/mailman/data/postfix_domains" ]; services.postfix.config.transport_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ]; @@ -1051,14 +1051,14 @@ auth required pam_succeed_if.so quiet The *psu versions of oraclejdk8 have been - removed as they aren't provided by upstream anymore. + removed as they aren’t provided by upstream anymore. The services.dnscrypt-proxy module has been removed as it used the deprecated version of dnscrypt-proxy. - We've added + We’ve added services.dnscrypt-proxy2.enable to use the supported version. This module supports configuration via the Nix attribute set @@ -1066,7 +1066,7 @@ auth required pam_succeed_if.so quiet or by passing a TOML configuration file via services.dnscrypt-proxy2.configFile. - + { # Example configuration: services.dnscrypt-proxy2.enable = true; @@ -1093,7 +1093,7 @@ auth required pam_succeed_if.so quiet - sqldeveloper_18 has been removed as it's not maintained + sqldeveloper_18 has been removed as it’s not maintained anymore, sqldeveloper has been updated to version 19.4. Please note that this means that this means that the oraclejdk is now required. For further @@ -1110,7 +1110,7 @@ auth required pam_succeed_if.so quiet the different lists of dependencies mashed together as one big list, and then partitioning into Haskell and non-Hakell dependencies, they work from the original many different - dependency parameters and don't need to algorithmically + dependency parameters and don’t need to algorithmically partition anything. @@ -1123,7 +1123,7 @@ auth required pam_succeed_if.so quiet - The gcc-snapshot-package has been removed. It's marked as + The gcc-snapshot-package has been removed. It’s marked as broken for >2 years and used to point to a fairly old snapshot from the gcc7-branch. @@ -1158,7 +1158,7 @@ auth required pam_succeed_if.so quiet nextcloud has been updated to v18.0.2. This - means that users from NixOS 19.09 can't upgrade directly since + means that users from NixOS 19.09 can’t upgrade directly since you can only move one version forward and 19.09 uses v16.0.8. @@ -1181,7 +1181,7 @@ auth required pam_succeed_if.so quiet Existing setups will be detected using system.stateVersion: by default, nextcloud17 will be used, but will raise a - warning which notes that after that deploy it's + warning which notes that after that deploy it’s recommended to update to the latest stable version (nextcloud18) by declaring the newly introduced setting services.nextcloud.package. @@ -1194,7 +1194,7 @@ auth required pam_succeed_if.so quiet get an evaluation error by default. This is done to ensure that our package-option - doesn't select an older version by accident. It's + doesn’t select an older version by accident. It’s recommended to use pkgs.nextcloud18 or to set package to pkgs.nextcloud explicitly. @@ -1203,7 +1203,7 @@ auth required pam_succeed_if.so quiet - Please note that if you're coming from + Please note that if you’re coming from 19.03 or older, you have to manually upgrade to 19.09 first to upgrade your server to Nextcloud v16. @@ -1215,7 +1215,7 @@ auth required pam_succeed_if.so quiet Hydra has gained a massive performance improvement due to some database schema changes by adding several IDs and - better indexing. However, it's necessary to upgrade Hydra in + better indexing. However, it’s necessary to upgrade Hydra in multiple steps: @@ -1229,7 +1229,7 @@ auth required pam_succeed_if.so quiet when upgrading. Otherwise, the package can be deployed using the following config: - + { pkgs, ... }: { services.hydra.package = pkgs.hydra-migration; } @@ -1266,12 +1266,12 @@ $ hydra-backfill-ids stateVersion is set to 20.03 or greater, hydra-unstable will be used automatically! This will break - your setup if you didn't run the migration. + your setup if you didn’t run the migration. Please note that Hydra is currently not available with - nixStable as this doesn't compile anymore. + nixStable as this doesn’t compile anymore. @@ -1281,7 +1281,7 @@ $ hydra-backfill-ids assertion error will be thrown. To circumvent this, you need to set services.hydra.package - to pkgs.hydra explicitly and make sure you know what you're + to pkgs.hydra explicitly and make sure you know what you’re doing! @@ -1319,7 +1319,7 @@ $ hydra-backfill-ids To continue to use the old approach, you can configure: - + { services.nginx.appendConfig = let cfg = config.services.nginx; in ''user ${cfg.user} ${cfg.group};''; systemd.services.nginx.serviceConfig.User = lib.mkForce "root"; @@ -1413,14 +1413,14 @@ $ hydra-backfill-ids - If you use sqlite3 you don't need to do + If you use sqlite3 you don’t need to do anything. If you use postgresql on a different - server, you don't need to change anything as well since + server, you don’t need to change anything as well since this module was never designed to configure remote databases. @@ -1432,7 +1432,7 @@ $ hydra-backfill-ids older, you simply need to enable postgresql-support explicitly: - + { ... }: { services.matrix-synapse = { enable = true; @@ -1460,7 +1460,7 @@ $ hydra-backfill-ids nixos-unstable after the 19.09-release, your database is misconfigured due to a regression in NixOS. For now, - matrix-synapse will startup with a warning, but it's + matrix-synapse will startup with a warning, but it’s recommended to reconfigure the database to set the values LC_COLLATE and LC_CTYPE to @@ -1473,7 +1473,7 @@ $ hydra-backfill-ids systemd.network.links option is now respected even when systemd-networkd - is disabled. This mirrors the behaviour of systemd - It's udev + is disabled. This mirrors the behaviour of systemd - It’s udev that parses .link files, not systemd-networkd. @@ -1486,8 +1486,8 @@ $ hydra-backfill-ids Please note that mongodb has been relicensed under their own sspl-license. - Since it's not entirely free and not OSI-approved, it's - listed as non-free. This means that Hydra doesn't provide + Since it’s not entirely free and not OSI-approved, it’s + listed as non-free. This means that Hydra doesn’t provide prebuilt mongodb-packages and needs to be built locally. diff --git a/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml index edebd92b327a..a1b007e711d7 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml @@ -722,7 +722,7 @@ See Authentication from MariaDB 10.4. unix_socket auth plugin does not use - a password, and uses the connecting user's UID instead. When a + a password, and uses the connecting user’s UID instead. When a new MariaDB data directory is initialized, two MariaDB users are created and can be used with new unix_socket auth plugin, as well as traditional mysql_native_password plugin: @@ -730,7 +730,7 @@ traditional mysql_native_password plugin method, one must run the following: - + { services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' ALTER USER root@localhost IDENTIFIED VIA mysql_native_password USING PASSWORD("verysecret"); @@ -755,7 +755,7 @@ services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' allow MySQL to read from /home and /tmp directories when using LOAD DATA INFILE - + { systemd.services.mysql.serviceConfig.ProtectHome = lib.mkForce "read-only"; } @@ -766,7 +766,7 @@ services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' SELECT * INTO OUTFILE, assuming the mysql user has write access to /var/data - + { systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ]; } @@ -864,7 +864,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ buildGoModule now internally creates a vendor directory in the source tree for downloaded modules - instead of using go's + instead of using go’s module proxy protocol. This storage format is simpler and therefore less likely to break with future versions of go. As @@ -885,7 +885,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ phantomJsSupport = true to the package instantiation: - + { services.grafana.package = pkgs.grafana.overrideAttrs (oldAttrs: rec { phantomJsSupport = true; @@ -941,24 +941,24 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ If you used the boot.initrd.network.ssh.host*Key options, - you'll get an error explaining how to convert your host keys + you’ll get an error explaining how to convert your host keys and migrate to the new boot.initrd.network.ssh.hostKeys option. - Otherwise, if you don't have any host keys set, you'll need to + Otherwise, if you don’t have any host keys set, you’ll need to generate some; see the hostKeys option documentation for instructions. - Since this release there's an easy way to customize your PHP + Since this release there’s an easy way to customize your PHP install to get a much smaller base PHP with only wanted extensions enabled. See the following snippet installing a smaller PHP with the extensions imagick, opcache, pdo and pdo_mysql loaded: - + { environment.systemPackages = [ (pkgs.php.withExtensions @@ -973,7 +973,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ } - The default php attribute hasn't lost any + The default php attribute hasn’t lost any extensions. The opcache extension has been added. All upstream PHP extensions are available under php.extensions.<name?>. @@ -997,7 +997,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ The remaining configuration flags can now be set directly on the php attribute. For example, instead of - + { php.override { config.php.embed = true; @@ -1008,7 +1008,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ you should now write - + { php.override { embedSupport = true; @@ -1062,7 +1062,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ writing to other folders, use systemd.services.nginx.serviceConfig.ReadWritePaths - + { systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; } @@ -1076,7 +1076,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ docs for details). If you require serving files from home directories, you may choose to set e.g. - + { systemd.services.nginx.serviceConfig.ProtectHome = "read-only"; } @@ -1093,7 +1093,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ Replace a nesting.clone entry with: - + { specialisation.example-sub-configuration = { configuration = { @@ -1104,7 +1104,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ Replace a nesting.children entry with: - + { specialisation.example-sub-configuration = { inheritParentConfig = false; @@ -1162,7 +1162,7 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test The systemd-networkd option systemd.network.networks.<name>.dhcp.CriticalConnection - has been removed following upstream systemd's deprecation of + has been removed following upstream systemd’s deprecation of the same. It is recommended to use systemd.network.networks.<name>.networkConfig.KeepConfiguration instead. See systemd.network 5 for details. @@ -1174,7 +1174,7 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test systemd.network.networks._name_.dhcpConfig has been renamed to systemd.network.networks.name.dhcpV4Config - following upstream systemd's documentation change. See + following upstream systemd’s documentation change. See systemd.network 5 for details. @@ -1283,7 +1283,7 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test The DNSChain package and NixOS module have been removed from Nixpkgs as the - software is unmaintained and can't be built. For more + software is unmaintained and can’t be built. For more information see issue #89205. @@ -1350,7 +1350,7 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test - Radicale's default package has changed from 2.x to 3.x. An + Radicale’s default package has changed from 2.x to 3.x. An upgrade checklist can be found here. You can use the newer version in the NixOS service by setting @@ -1385,7 +1385,7 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test multi-instance config with an existing bitcoind data directory and user, you have to adjust the original config, e.g.: - + { services.bitcoind = { enable = true; @@ -1397,7 +1397,7 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test To something similar: - + { services.bitcoind.mainnet = { enable = true; @@ -1447,7 +1447,7 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test the original SSL settings, you have to adjust the original config, e.g.: - + { services.dokuwiki = { enable = true; @@ -1458,7 +1458,7 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test To something similar: - + { services.dokuwiki."mywiki" = { enable = true; @@ -1472,8 +1472,8 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test The base package has also been upgraded to the 2020-07-29 - "Hogfather" release. Plugins might be incompatible - or require upgrading. + Hogfather release. Plugins might be + incompatible or require upgrading. @@ -1492,7 +1492,7 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test option is (/var/db/postgresql) and then explicitly set this value to maintain compatibility: - + { services.postgresql.dataDir = "/var/db/postgresql"; } @@ -1587,7 +1587,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; The security.rngd service is now disabled - by default. This choice was made because there's krngd in the + by default. This choice was made because there’s krngd in the linux kernel space making it (for most usecases) functionally redundent. @@ -1609,13 +1609,13 @@ CREATE ROLE postgres LOGIN SUPERUSER; will be EOL (end of life) within the lifetime of 20.09. - It's necessary to upgrade to nextcloud19: + It’s necessary to upgrade to nextcloud19: From nextcloud17, you have to upgrade to nextcloud18 first - as Nextcloud doesn't allow going multiple major revisions + as Nextcloud doesn’t allow going multiple major revisions forward in a single upgrade. This is possible by setting services.nextcloud.package to nextcloud18. @@ -1623,7 +1623,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; - From nextcloud18, it's possible to directly upgrade to + From nextcloud18, it’s possible to directly upgrade to nextcloud19 by setting services.nextcloud.package to nextcloud19. @@ -1685,7 +1685,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; The notmuch package moves its emacs-related binaries and emacs - lisp files to a separate output. They're not part of the + lisp files to a separate output. They’re not part of the default out output anymore - if you relied on the notmuch-emacs-mua binary or the emacs lisp files, access them via the @@ -1736,11 +1736,11 @@ CREATE ROLE postgres LOGIN SUPERUSER; - The cc- and binutils-wrapper's "infix salt" and + The cc- and binutils-wrapper’s infix salt and _BUILD_ and _TARGET_ - user infixes have been replaced with with a "suffix - salt" and suffixes and _FOR_BUILD and - _FOR_TARGET. This matches the autotools + user infixes have been replaced with with a suffix + salt and suffixes and _FOR_BUILD + and _FOR_TARGET. This matches the autotools convention for env vars which standard for these things, making interfacing with other tools easier. @@ -1774,8 +1774,8 @@ CREATE ROLE postgres LOGIN SUPERUSER; network-link-* units, which have been removed. Bringing the interface up has been moved to the beginning of the network-addresses-* unit. - Note this doesn't require systemd-networkd - - it's udev that parses .link files. Extra + Note this doesn’t require systemd-networkd + - it’s udev that parses .link files. Extra care needs to be taken in the presence of legacy udev rules to rename interfaces, as MAC Address and MTU @@ -1825,7 +1825,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; you must include those directories into the BindPaths of the service: - + { systemd.services.transmission.serviceConfig.BindPaths = [ "/path/to/alternative/download-dir" ]; } @@ -1835,7 +1835,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; transmission-daemon is now only available on the local network interface by default. Use: - + { services.transmission.settings.rpc-bind-address = "0.0.0.0"; } @@ -1850,7 +1850,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; With this release systemd-networkd (when enabled through networking.useNetworkd) - has it's netlink socket created through a + has it’s netlink socket created through a systemd.socket unit. This gives us control over socket buffer sizes and other parameters. For larger setups where networkd has to create a lot of (virtual) devices @@ -1873,7 +1873,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; Since the actual memory requirements depend on hardware, - timing, exact configurations etc. it isn't currently possible + timing, exact configurations etc. it isn’t currently possible to infer a good default from within the NixOS module system. Administrators are advised to monitor the logs of systemd-networkd for @@ -1882,7 +1882,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; Note: Increasing the ReceiveBufferSize= - doesn't allocate any memory. It just increases the upper bound + doesn’t allocate any memory. It just increases the upper bound on the kernel side. The memory allocation depends on the amount of messages that are queued on the kernel side of the netlink socket. @@ -1900,7 +1900,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; This means that a configuration like this - + { services.dovecot2.mailboxes = [ { name = "Junk"; @@ -1912,7 +1912,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; should now look like this: - + { services.dovecot2.mailboxes = { Junk.auto = "create"; @@ -1934,8 +1934,8 @@ CREATE ROLE postgres LOGIN SUPERUSER; If you have an existing installation, please make sure that - you're on nextcloud18 before upgrading to nextcloud19 since - Nextcloud doesn't support upgrades across multiple major + you’re on nextcloud18 before upgrading to nextcloud19 since + Nextcloud doesn’t support upgrades across multiple major versions. diff --git a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml index fb11b19229e2..868c1709879d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml @@ -235,9 +235,9 @@ The networking.wireless.iwd module now installs the upstream-provided 80-iwd.link file, which sets - the NamePolicy= for all wlan devices to "keep - kernel", to avoid race conditions between iwd and - networkd. If you don't want this, you can set + the NamePolicy= for all wlan devices to keep + kernel, to avoid race conditions between iwd and + networkd. If you don’t want this, you can set systemd.network.links."80-iwd" = lib.mkForce {}. @@ -245,7 +245,7 @@ rubyMinimal was removed due to being unused and unusable. The default ruby interpreter includes JIT - support, which makes it reference it's compiler. Since JIT + support, which makes it reference it’s compiler. Since JIT support is probably needed by some Gems, it was decided to enable this feature with all cc references by default, and allow to build a Ruby derivation without references to cc, by @@ -330,7 +330,7 @@ mediatomb package. If you want to keep the old behavior, you must declare it with: - + { services.mediatomb.package = pkgs.mediatomb; } @@ -341,7 +341,7 @@ service declaration to add the firewall rules itself before, you should now declare it with: - + { services.mediatomb.openFirewall = true; } @@ -368,7 +368,7 @@ services.uwsgi.capabilities. The previous behaviour can be restored by setting: - + { services.uwsgi.user = "root"; services.uwsgi.group = "root"; @@ -427,7 +427,7 @@ networking.wireguard.interfaces.<name>.generatePrivateKeyFile, which is off by default, had a chmod race - condition fixed. As an aside, the parent directory's + condition fixed. As an aside, the parent directory’s permissions were widened, and the key files were made owner-writable. This only affects newly created keys. However, if the exact permissions are important for your setup, read @@ -527,7 +527,7 @@ $ slapcat -F $TMPDIR -n0 -H 'ldap:///???(!(objectClass=olcSchemaConfig))' this directory are guarded to only run if the files they want to manipulate do not already exist, and so will not re-apply their changes if the IMDS response changes. - Examples: root's SSH key is only added if + Examples: root’s SSH key is only added if /root/.ssh/authorized_keys does not exist, and SSH host keys are only set from user data if they do not exist in /etc/ssh. @@ -550,9 +550,9 @@ $ slapcat -F $TMPDIR -n0 -H 'ldap:///???(!(objectClass=olcSchemaConfig))' configures Privoxy, and the services.tor.client.privoxy.enable option has been removed. To enable Privoxy, and to configure it to - use Tor's faster port, use the following configuration: + use Tor’s faster port, use the following configuration: - + { opt-services.privoxy.enable = true; opt-services.privoxy.enableTor = true; @@ -628,7 +628,7 @@ $ slapcat -F $TMPDIR -n0 -H 'ldap:///???(!(objectClass=olcSchemaConfig))' exporter no longer accepts a fixed command-line parameter to specify the URL of the endpoint serving JSON. It now expects this URL to be passed as an URL parameter, when scraping the - exporter's /probe endpoint. In the + exporter’s /probe endpoint. In the prometheus scrape configuration the scrape target might look like this: @@ -689,7 +689,7 @@ http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/e mpich instead of the default openmpi can now be achived like this: - + self: super: { mpi = super.mpich; @@ -790,7 +790,7 @@ self: super: for any device that the kernel recognises as an hardware RNG, as it will automatically run the krngd task to periodically collect random data from the device and mix it into the - kernel's RNG. + kernel’s RNG. The default SMTP port for GitLab has been changed to @@ -850,7 +850,7 @@ self: super: kodiPackages.inputstream-adaptive and kodiPackages.vfs-sftp addons: - + { environment.systemPackages = [ pkgs.kodi @@ -867,7 +867,7 @@ self: super: and as a result the above configuration should now be written as: - + { environment.systemPackages = [ (pkgs.kodi.withPackages (p: with p; [ @@ -893,7 +893,7 @@ self: super: services.minio.dataDir changed type to a list of paths, required for specifiyng multiple data directories for using with erasure coding. Currently, the - service doesn't enforce nor checks the correct number of paths + service doesn’t enforce nor checks the correct number of paths to correspond to minio requirements. @@ -910,7 +910,7 @@ self: super: dvorak-programmer in console.keyMap now instead of dvp. In - services.xserver.xkbVariant it's still + services.xserver.xkbVariant it’s still dvp. @@ -954,7 +954,7 @@ self: super: supported. - Furthermore, Radicale's systemd unit was hardened which might + Furthermore, Radicale’s systemd unit was hardened which might break some deployments. In particular, a non-default filesystem_folder has to be added to systemd.services.radicale.serviceConfig.ReadWritePaths @@ -991,7 +991,7 @@ self: super: GNURadio - has a pkgs attribute set, and there's a + has a pkgs attribute set, and there’s a gnuradio.callPackage function that extends pkgs with a mkDerivation, and a @@ -1027,7 +1027,7 @@ self: super: Kodi has been - updated to version 19.1 "Matrix". See the + updated to version 19.1 Matrix. See the announcement for further details. @@ -1098,9 +1098,9 @@ self: super: The default-version of nextcloud is - nextcloud21. Please note that it's not + nextcloud21. Please note that it’s not possible to upgrade nextcloud across - multiple major versions! This means that it's e.g. not + multiple major versions! This means that it’s e.g. not possible to upgrade from nextcloud18 to nextcloud20 in a single deploy and most 20.09 users will have to upgrade to nextcloud20 first. @@ -1122,7 +1122,7 @@ self: super: - NixOS now emits a deprecation warning if systemd's + NixOS now emits a deprecation warning if systemd’s StartLimitInterval setting is used in a serviceConfig section instead of in a unitConfig; that setting is deprecated and @@ -1158,7 +1158,7 @@ self: super: users to declare autoscan media directories from their nixos configuration: - + { services.mediatomb.mediaDirectories = [ { path = "/var/lib/mediatomb/pictures"; recursive = false; hidden-files = false; } @@ -1255,8 +1255,8 @@ self: super: The services.dnscrypt-proxy2 module now - takes the upstream's example configuration and updates it with - the user's settings. An option has been added to restore the + takes the upstream’s example configuration and updates it with + the user’s settings. An option has been added to restore the old behaviour if you prefer to declare the configuration from scratch. @@ -1298,13 +1298,14 @@ self: super: The zookeeper package does not provide zooInspector.sh anymore, as that - "contrib" has been dropped from upstream releases. + contrib has been dropped from upstream + releases. In the ACME module, the data used to build the hash for the - account directory has changed to accomodate new features to + account directory has changed to accommodate new features to reduce account rate limit issues. This will trigger new account creation on the first rebuild following this update. No issues are expected to arise from this, thanks to the new @@ -1317,7 +1318,7 @@ self: super: now always ensures home directory permissions to be 0700. Permissions had previously been ignored for already existing home directories, possibly - leaving them readable by others. The option's description was + leaving them readable by others. The option’s description was incorrect regarding ownership management and has been simplified greatly. @@ -1518,7 +1519,7 @@ self: super: been dropped. Users that still want it should add the following to their system configuration: - + { services.gvfs.package = pkgs.gvfs.override { samba = null; }; } 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 b7790c99a91e..48a717916535 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 @@ -561,6 +561,14 @@ services.prometheus.exporters.smartctl. + + + twingate, + a high performance, easy to use zero trust solution that + enables access to private resources from any device with + better security than a VPN. + +
@@ -634,7 +642,7 @@ - + { services.paperless-ng.extraConfig = { # Provide languages as ISO 639-2 codes @@ -715,7 +723,7 @@ Superuser created successfully. - The erigon ethereum node has moved it’s + The erigon ethereum node has moved its database location in 2021-08-03, users upgrading must manually move their chaindata (see release @@ -729,7 +737,7 @@ Superuser created successfully. insecure. Out-of-tree modules are likely to require adaptation: instead of - + { users.users.foo = { isSystemUser = true; @@ -739,7 +747,7 @@ Superuser created successfully. also create a group for your user: - + { users.users.foo = { isSystemUser = true; @@ -1435,7 +1443,7 @@ Superuser created successfully. The default GNAT version has been changed: The gnat attribute now points to - gnat11 instead of gnat9. + gnat12 instead of gnat9. 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 97e993e83ff0..64217c53c3b8 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 @@ -16,8 +16,20 @@ -Nix has been updated from 2.3 to 2.8. This mainly brings experimental support for Flakes, but also marks the nix command as experimental which now has to be enabled via the configuration explicitly. For more information and instructions for upgrades, see the relase notes for nix-2.4, -nix-2.5, nix-2.6, nix-2.7 and nix-2.8 + + Nix has been updated from 2.3 to 2.8. This mainly brings + experimental support for Flakes, but also marks the + nix command as experimental which now has + to be enabled via the configuration explicitly. For more + information and instructions for upgrades, see the relase + notes for + nix-2.4, + nix-2.5, + nix-2.6, + nix-2.7 + and + nix-2.8 + @@ -328,7 +340,7 @@ Maddy, a free - an open source mail server. Availabe as + an open source mail server. Available as services.maddy. @@ -714,7 +726,7 @@ programs.msmtp.* can be used instead for an equivalent setup. For example: - + { # Original ssmtp configuration: services.ssmtp = { @@ -847,7 +859,7 @@ config.nixpkgs.config.allowUnfree are enabled. If you still want these fonts, use: - + { fonts.fonts = [ pkgs.xorg.fontbhlucidatypewriter100dpi @@ -942,7 +954,7 @@ Before: - + { services.matrix-synapse = { enable = true; @@ -977,7 +989,7 @@ After: - + { services.matrix-synapse = { enable = true; @@ -1143,7 +1155,7 @@ Before: - + services.keycloak = { enable = true; httpPort = "8080"; @@ -1157,7 +1169,7 @@ After: - + services.keycloak = { enable = true; settings = { @@ -1422,7 +1434,7 @@ derivation if name is "vim" (the default). This makes the wrapManual argument obsolete, - but this behavior can be overriden by setting the + but this behavior can be overridden by setting the standalone argument. diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 763010ae82a3..2d7226caa5b5 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1,48 +1,207 @@
- Release 22.11 (“Raccoon”, 2022.11/??) + Release 22.11 (“Raccoon”, 2022.11/30) - Support is planned until the end of June 2023, handing over to - 23.05. + The NixOS release team is happy to announce a new version of NixOS + 22.11. NixOS is a Linux distribution, whose set of packages can also + be used on other Linux systems and macOS. + + + This release is supported until the end of June 2023, handing over + to NixOS 23.05. + + + To upgrade to the latest release follow the + upgrade chapter.
Highlights In addition to numerous new and upgraded packages, this release - has the following highlights: + includes the following highlights: - GNOME has been upgraded to 43. Please take a look at their - Release - Notes for details. + Software that uses the crypt password + hashing API is now using the implementation provided by + libxcrypt + instead of glibc’s, which enables support for more secure + algorithms. + + + + + Support for algorithms that libxcrypt + does + not consider strong are + deprecated as of this + release, and will be removed in NixOS 23.05. + + + + + This includes system login passwords. Given this, we + strongly encourage all + users to update their system passwords, as you will be + unable to login if password hashes are not migrated by the + time their support is removed. + + + + + When using + users.users.<name>.hashedPassword + to configure user passwords, run + mkpasswd, and use the yescrypt hash + that is provided as the new value. + + + + + On the other hand, for interactively configured user + passwords, simply re-set the passwords for all users + with passwd. + + + + + This release introduces warnings for the use of + deprecated hash algorithms for both methods of + configuring passwords. To make sure you migrated + correctly, run + nixos-rebuild switch. + + + + + + + + + The NixOS documentation is now generated from markdown. While + docbook is still part of the documentation build process, it’s + a big step towards the full migration. - During cross-compilation, tests are now executed if the test - suite can be executed by the build platform. This is the case - when doing “native” cross-compilation where the build and host - platforms are largely the same, but the nixpkgs’ cross - compilation infrastructure is used, e.g. - pkgsStatic and pkgsLLVM. - Another possibility is that the build platform is a superset - of the host platform, e.g. when cross-compiling from - x86_64-unknown-linux to - i686-unknown-linux. The predicate gating - test suite execution is the newly added - canExecute predicate: You can e.g. check if - stdenv.buildPlatform can execute binaries - built for stdenv.hostPlatform (i.e. - produced by stdenv.cc) by evaluating - stdenv.buildPlatform.canExecute stdenv.hostPlatform. + aarch64-linux is now included in the + nixos-22.11 and + nixos-22.11-small channels. This means that + when those channel update, both + x86_64-linux and + aarch64-linux will be available in the + binary cache. - The nixpkgs.hostPlatform and - nixpkgs.buildPlatform options have been - added. These cover and override the + aarch64-linux ISOs are now available on the + downloads + page. + + + + + nsncd is now available as a replacement of + nscd. + + + nscd is responsible for resolving + hostnames, users and more in NixOS and has been a long + standing source of bugs, such as sporadic network freezes. + + + More context in this + issue. + + + Help us test the new implementation by setting + services.nscd.enableNsncd to + true. + + + We plan to use nsncd by default in NixOS + 23.05. + + + + + Linode cloud images are now supported by importing + ${modulesPath}/virtualisation/linode-image.nix + and accessing system.build.linodeImage on + the output. + + + + + hardware.nvidia has a new option, + hardware.nvidia.open, that can be used to + enable the usage of NVIDIA’s open-source kernel driver. Note + that the driver’s support for GeForce and Workstation GPUs is + still alpha quality, see + the + release announcement for more information. + + + + + The emacs package now makes use of native + compilation which means: + + + + + Emacs packages from Nixpkgs, builtin or not, will do + native compilation ahead of time so you can enjoy the + benefit of native compilation without compiling them on + you machine; + + + + + Emacs packages from somewhere else, e.g. + package-install, will perform + asynchronously deferred native compilation. If you do not + want this, maybe to avoid CPU consumption for compilation, + you can use + (setq native-comp-deferred-compilation nil) + to disable it while still benefiting from native + compilation for packages from Nixpkgs. + + + + + +
+
+ Internal changes + + + + Haskell ghcWithPackages is now up to 15 + times faster to evaluate, thanks to changing + lib.closePropagation from a quadratic to + linear complexity. Please see backward incompatibilities notes + below. + https://github.com/NixOS/nixpkgs/pull/194391 + + + + + For cross-compilation targets that can also run on the + building machine, we now run tests. This, for example, is the + case for the pkgsStatic and + pkgsLLVM package sets or i686 packages on + x86_64 machines. + + + + + To simplify cross-compilation in NixOS, this release + introduces the nixpkgs.hostPlatform and + nixpkgs.buildPlatform options. These cover + and override the nixpkgs.{system,localSystem,crossSystem} options. @@ -77,52 +236,48 @@ with any supported NixOS release. + +
+
+ Notable version updates + - emacs enables native compilation which - means: + Nix has been upgraded from v2.8.1 to v2.11.0. For more + information, please see the release notes for + 2.9, + 2.10 + and + 2.11. - - - - emacs packages from nixpkgs, builtin or not, will do - native compilation ahead of time so you can enjoy the - benefit of native compilation without compiling them on - you machine; - - - - - emacs packages from somewhere else, e.g. - package-install, will do asynchronously - deferred native compilation. If you do not want this, - maybe to avoid CPU consumption for compilation, you can - use - (setq native-comp-deferred-compilation nil) - to disable it while still enjoy the benefit of native - compilation for packages from nixpkgs. - - - - nixos-generate-config now generates - configurations that can be built in pure mode. This is - achieved by setting the new - nixpkgs.hostPlatform option. + OpenSSL now defaults to OpenSSL 3, updated from 1.1.1. + + - You may have to unset the system parameter - in lib.nixosSystem, or similarly remove - definitions of the - nixpkgs.{system,localSystem,crossSystem} - options. + GNOME has been upgraded to version 43. Please see the + release + notes for details. + + - Alternatively, you can remove the - hostPlatform line and use NixOS like you - would in NixOS 22.05 and earlier. + KDE Plasma has been upgraded from v5.24 to v5.26. Please see + the release notes for + v5.25 + and + v5.26 + for more details on the included changes. + + + + + Cinnamon has been updated to 5.4, and the Cinnamon module now + defaults to Blueman as the Bluetooth manager and slick-greeter + as the LightDM greeter, to match upstream. @@ -130,27 +285,6 @@ PHP now defaults to PHP 8.1, updated from 8.0. - - - PHP is now built NTS (Non-Thread Safe) - style by default, for Apache and mod_php - usage we still enable ZTS (Zend Thread - Safe). This has been a common practice for a long time in - other distributions. - - - - - PHP 8.2.0 RC 6 is available. - - - - - protonup has been aliased to and replaced - by protonup-ng due to upstream not - maintaining it. - - Perl has been updated to 5.36, and its core module @@ -160,348 +294,7 @@ - Improved performances of - lib.closePropagation which was previously - quadratic. This is used in e.g. - ghcWithPackages. Please see backward - incompatibilities notes below. - - - - - Cinnamon has been updated to 5.4. While at it, the cinnamon - module now defaults to blueman as bluetooth manager and - slick-greeter as lightdm greeter to match upstream. - - - - - OpenSSL now defaults to OpenSSL 3, updated from 1.1.1. - - - - - An image configuration and generator has been added for Linode - images, largely based on the present GCE configuration and - image. - - - - - hardware.nvidia has a new option - open that can be used to opt in the - opensource version of NVIDIA kernel driver. Note that the - driver’s support for GeForce and Workstation GPUs is still - alpha quality, see - NVIDIA - Releases Open-Source GPU Kernel Modules for the - official announcement. - - - -
-
- New Services - - - - appvm, - Nix based app VMs. Available as - virtualisation.appvm. - - - - - automatic-timezoned. - a Linux daemon to automatically update the system timezone - based on location. Available as - services.automatic-timezoned. - - - - - [xray] (https://github.com/XTLS/Xray-core), a fully compatible - v2ray-core replacement. Features XTLS, which when enabled on - server and client, brings UDP FullCone NAT to proxy setups. - Available as - services.xray. - - - - - syncstorage-rs, - a self-hostable sync server for Firefox. Available as - services.firefox-syncserver. - - - - - dragonflydb, - a modern replacement for Redis and Memcached. Available as - services.dragonflydb. - - - - - Komga, a free and - open source comics/mangas media server. Available as - services.komga. - - - - - Tandoor Recipes, - a self-hosted multi-tenant recipe collection. Available as - services.tandoor-recipes. - - - - - HBase - cluster, a distributed, scalable, big data store. - Available as - services.hadoop.hbase. - - - - - Please, - a Sudo clone written in Rust. Available as - security.please - - - - - Sachet, - an SMS alerting tool for the Prometheus Alertmanager. - Available as - services.prometheus.sachet. - - - - - EVCC is an EV charge - controller with PV integration. It supports a multitude of - chargers, meters, vehicle APIs and more and ties that together - with a well-tested backend and a lightweight web frontend. - Available as - services.evcc. - - - - - infnoise, - a hardware True Random Number Generator dongle. Available as - services.infnoise. - - - - - kthxbye, - an alert acknowledgement management daemon for Prometheus - Alertmanager. Available as - services.kthxbye - - - - - kanata, - a tool to improve keyboard comfort and usability with advanced - customization. Available as - services.kanata. - - - - - karma, - an alert dashboard for Prometheus Alertmanager. Available as - services.karma - - - - - languagetool, - a multilingual grammar, style, and spell checker. Available as - services.languagetool. - - - - - OpenRGB, - a FOSS tool for controlling RGB lighting. Available as - services.hardware.openrgb.enable. - - - - - Outline, - a wiki and knowledge base similar to Notion. Available as - services.outline. - - - - - ntfy.sh, a push - notification service. Available as - services.ntfy-sh - - - - - alps, - a simple and extensible webmail. Available as - services.alps. - - - - - endlessh, - an SSH tarpit. Available as - services.endlessh. - - - - - endlessh-go, - an SSH tarpit that exposes Prometheus metrics. Available as - services.endlessh-go. - - - - - Garage, - a simple object storage server for geodistributed deployments, - alternative to MinIO. Available as - services.garage. - - - - - netbird, a zero - configuration VPN. Available as - services.netbird. - - - - - persistent-evdev, - a daemon to add virtual proxy devices that mirror a physical - input device but persist even if the underlying hardware is - hot-plugged. Available as - services.persistent-evdev. - - - - - schleuder, a - mailing list manager with PGP support. Enable using - services.schleuder. - - - - - Dolibarr, - an enterprise resource planning and customer relationship - manager. Enable using - services.dolibarr. - - - - - FreshRSS, a - free, self-hostable RSS feed aggregator. Available as - services.freshrss. - - - - - expressvpn, - the CLI client for ExpressVPN. Available as - services.expressvpn. - - - - - merecat, - a small and easy HTTP server based on thttpd. Available as - services.merecat - - - - - go-autoconfig, - IMAP/SMTP autodiscover server. Available as - services.go-autoconfig. - - - - - tmate-ssh-server, - server side part of - tmate. Available - as - services.tmate-ssh-server. - - - - - Grafana - Tempo, a distributed tracing store. Available as - services.tempo. - - - - - AusweisApp2, - the authentication software for the German ID card. Available - as - programs.ausweisapp. - - - - - Patroni, - a template for PostgreSQL HA with ZooKeeper, etcd or Consul. - Available as - services.patroni. - - - - - Prometheus - IPMI exporter, an IPMI exporter for Prometheus. - Available as - services.prometheus.exporters.ipmi. - - - - - WriteFreely, - a simple blogging platform with ActivityPub support. Available - as - services.writefreely. - - - - - Listmonk, a - self-hosted newsletter manager. Enable using - services.listmonk. - - - - - Uptime - Kuma, a fancy self-hosted monitoring tool. Available as - services.uptime-kuma. - - - - - Mepo, a - fast, simple, hackable OSM map viewer for mobile and desktop - Linux. Available as - programs.mepo.enable. + Python now defaults to 3.10, updated from 3.9. @@ -521,10 +314,7 @@ generated using lib.systems.elaborate. In most cases you will want to use the new canExecute predicate instead which also - considers the kernel / syscall interface. It is briefly - described in the release’s - highlights - section. + takes the kernel / syscall interface into account. lib.systems.parse.isCompatible still exists, but has changed semantically: Architectures with differing endianness modes are no longer considered @@ -539,20 +329,28 @@ upgrade guide and changelog. Notably, breaking changes are that the config file format has - changed and support for single hypen arguments was dropped. + changed and support for single hyphen arguments was dropped. - i18n.supportedLocales is now by default - only generated with the locales set in - i18n.defaultLocale and - i18n.extraLocaleSettings. This got - partially copied over from the minimal profile and reduces the - final system size by up to 200MB. If you require all locales - installed set the option to - [ "all" ]. + i18n.supportedLocales is now only generated + with the locales set in i18n.defaultLocale + and i18n.extraLocaleSettings. + + + + This reduces the final system closure size by up to 200MB. + + + + + If you require all locales installed, set the option to + [ "all" ]. + + + @@ -606,7 +404,7 @@ ssh-keygen -A as they are insecure. Also, SetEnv directives in ssh_config and - sshd_config are now first-match-wins + sshd_config are now first-match-wins. @@ -650,17 +448,17 @@ - The openssl-extension for the PHP - interpreter used by Nextcloud is built against OpenSSL 1.1 if + The OpenSSL extension for the PHP interpreter used by + Nextcloud is built against OpenSSL 1.1 if is below 22.11. This is to make sure that people using server-side - encryption don’t loose access to their files. + encryption don’t lose access to their files. - In any other case it’s safe to use OpenSSL 3 for PHP’s openssl - extension. This can be done by setting + In any other case, it’s safe to use OpenSSL 3 for PHP’s + OpenSSL extension. This can be done by setting to false. @@ -709,6 +507,14 @@ emacs-gtk. + + + kanidm has been updated to 1.1.0-alpha.10 + and now requires a TLS certificate and key. It will always + start https and-–-if enabled-–-an LDAPS + server and no HTTP and LDAP server anymore. + + riak package removed along with @@ -963,7 +769,7 @@ - k3s no longer supports docker as runtime + k3s no longer supports Docker as runtime due to upstream dropping support. @@ -1036,7 +842,7 @@ signald -d /var/lib/signald/db \ stylua no longer accepts lua52Support and - luauSupport overrides, use + luauSupport overrides. Use features instead, which defaults to [ "lua54" "luau" ]. @@ -1090,11 +896,27 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [
Other Notable Changes + + + PHP is now built in NTS (Non-Thread Safe) + mode by default. + + + + + For Apache and mod_php usage, we enable + ZTS (Zend Thread Safe) mode. This has + been a common practice for a long time in other + distributions. + + + + firefox, thunderbird and - librewolf come with enabled Wayland support - by default. The firefox-wayland, + librewolf now come with Wayland support by + default. The firefox-wayland, firefox-esr-wayland, thunderbird-wayland and librewolf-wayland attributes are obsolete @@ -1113,7 +935,8 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ Configuring multiple GitHub runners is now possible through services.github-runners.<name>. The - option services.github-runner remains. + options under services.github-runner + remain, to configure a single runner. @@ -1128,29 +951,39 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - A new module was added for the Saleae Logic device family, - providing the options + A new module was added to provide hardware support for the + Saleae Logic device family, providing the options hardware.saleae-logic.enable and hardware.saleae-logic.package. - ZFS module will not allow hibernation by default, this is a - safety measure to prevent data loss cases like the ones - described at - OpenZFS/260 - and - OpenZFS/12842. - Use the boot.zfs.allowHibernation option to - configure this behaviour. + ZFS module will no longer allow hibernation by default. + + + + This is a safety measure to prevent data loss cases like + the ones described at + OpenZFS/260 + and + OpenZFS/12842. + + + + + Use the boot.zfs.allowHibernation + option to configure this behaviour. + + + - mastodon now automatically removes remote - media attachments older than 30 days. This is configurable - through services.mastodon.mediaAutoRemove. + Mastodon now automatically removes remote media attachments + older than 30 days. This is configurable through + services.mastodon.mediaAutoRemove. @@ -1162,9 +995,9 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - Neo4j was updated from version 3 to version 4. See this + Neo4j was updated from version 3 to version 4. See upstream’s migration - guide on how to migrate your Neo4j instance. + guide for information on how to migrate your instance. @@ -1197,8 +1030,8 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ prismlauncher, a fork by the rest of the maintainers. For more details, see the - pull request that made this change and - this + PR that made this change and + the issue detailing the vulnerability. Users with existing installations should rename ~/.local/share/polymc to @@ -1219,8 +1052,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - The services.matrix-synapse systemd unit - has been hardened. + Synapse’s systemd unit has been hardened. @@ -1250,7 +1082,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ removed. This option was an association of environment variables for Grafana. If you had an expression like - + { services.grafana.extraOptions.SECURITY_ADMIN_USER = "foobar"; } @@ -1264,7 +1096,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ For the migration, it is recommended to turn it into the INI format, i.e. to declare - + { services.grafana.settings.security.admin_user = "foobar"; } @@ -1292,9 +1124,9 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ Previously, the options - + services.grafana.provision.datasources and - + services.grafana.provision.dashboards expected lists of datasources or dashboards for the declarative provisioning. @@ -1307,14 +1139,14 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ datasources, please rename your declarations to - . + services.grafana.provision.datasources.settings.datasources. dashboards, please rename your declarations to - . + services.grafana.provision.dashboards.settings.providers. @@ -1327,9 +1159,9 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ It’s possible to declare the apiVersion of your dashboards and datasources by - + services.grafana.provision.datasources.settings.apiVersion (or - ). + services.grafana.provision.dashboards.settings.apiVersion). @@ -1337,9 +1169,9 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ Instead of declaring datasources and dashboards in pure Nix, it’s also possible to specify configuration files (or directories) with YAML instead using - + services.grafana.provision.datasources.path (or - . + services.grafana.provision.dashboards.path. This is useful when having provisioning files from non-NixOS Grafana instances that you also want to deploy to NixOS. @@ -1354,9 +1186,9 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - + services.grafana.provision.notifiers is not affected by this change because this feature is - deprecated by Grafana and will probably removed in + deprecated by Grafana and will probably be removed in Grafana 10. It’s recommended to use services.grafana.provision.alerting.contactPoints instead. @@ -1377,7 +1209,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - Matrix Synapse now requires entries in the + Synapse now requires entries in the state_group_edges table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was @@ -1404,9 +1236,17 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - dockerTools.buildImage deprecates the - misunderstood contents parameter, in favor - of copyToRoot. Use + The netlify-cli package has been updated + from 6.13.2 to 12.2.4, see the + changelog + for more details. + + + + + dockerTools.buildImage’s + contents parameter has been deprecated in + favor of copyToRoot. Use copyToRoot = buildEnv { ... }; or similar if you intend to add packages to /bin. @@ -1440,9 +1280,9 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - Option descriptions, examples, and defaults writting in - DocBook are now deprecated. Using CommonMark is preferred and - will become the default in a future release. + Option descriptions, examples, and defaults writing in DocBook + are now deprecated. Using CommonMark is preferred and will + become the default in a future release. @@ -1459,9 +1299,16 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - The redis module now persists each instance’s configuration + The Redis module now persists each instance’s configuration file in the state directory, in order to support some more - advanced use cases like sentinel. + advanced use cases like Sentinel. + + + + + protonup has been aliased to and replaced + by protonup-ng due to upstream not + maintaining it. @@ -1499,7 +1346,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - For system.stateVersion being + If system.stateVersion is >=22.11, Nextcloud 25 will be installed by default. For older versions, Nextcloud 24 will be installed. @@ -1507,7 +1354,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - Please ensure that you only upgrade on major release at a + Please ensure that you only upgrade one major release at a time! Nextcloud doesn’t support upgrades across multiple versions, i.e. an upgrade from 23 to @@ -1518,24 +1365,6 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - - - Add udev rules for the Teensy family of microcontrollers. - - - - - The Qt QML disk cache is now disabled by default. This fixes a - long-standing issue where updating Qt/KDE apps would sometimes - cause them to crash or behave strangely without explanation. - Those concerned about the small (~10%) performance hit to - application startup can re-enable the cache (and expose - themselves to gremlins) by setting the envrionment variable - QML_FORCE_DISK_CACHE to - 1 using e.g. the - environment.sessionVariables NixOS option. - - systemd-oomd is enabled by default. Depending on which systemd @@ -1569,14 +1398,8 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - There is a new module for AMD SEV CPU functionality, which - grants access to the hardware. - - - - - The Wordpress module got support for installing language packs - through + The Wordpress module now has support for installing language + packs through a new option, services.wordpress.sites.<site>.languages. @@ -1594,12 +1417,12 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - PowerDNS has been updated from 4.6.x to - 4.7.x. Please be sure to review the + PowerDNS has been updated from v4.6.2 to v4.7.2. Please be + sure to review the Upgrade Notes provided by upstream before upgrading. Worth specifically noting is that the new Catalog Zones feature - comes with a mandatory schema change for the gsql database + comes with a mandatory schema change for the GSQL database backends, which has to be manually applied. @@ -1611,21 +1434,19 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ service and a systemd unit. The option services.xserver.desktopManager.xfce.thunarPlugins has been renamed to - programs.thunar.plugins, and in a future - release it may be removed. + programs.thunar.plugins, and may be removed + in a future release. - There is a new module for the xfconf - program (the Xfce configuration storage system), which has a - dbus service. + There is a new module for xfconf (the Xfce + configuration storage system), which has a dbus service. - The Mastodon package got upgraded from the major version 3 to - 4. See the + The Mastodon package has been upgraded to v4.0.0. See the v4.0.0 release notes for a list of changes. On standard setups, no manual migration steps are required. Nevertheless, @@ -1634,8 +1455,8 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - The nomad package now defaults to 1.3, - which no longer has a downgrade path to releases 1.2 or older. + The nomad package now defaults to v1.3, + which no longer has a downgrade path to v1.2 or older. @@ -1654,7 +1475,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ boot.kernel.sysctl is defined as a freeformType and adds a custom merge option for - net.core.rmem_max (taking the highest value + net.core.rmem_max (taking the highest value defined to avoid conflicts between 2 services trying to set that value). @@ -1686,6 +1507,335 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ picom to quit instead. + + + haskellPackages.callHackage is not always + invalidated if all-cabal-hashes changes, + leading to less rebuilds of haskell dependencies. + + + + + haskellPackages.callHackage and + haskellPackages.callCabal2nix (and related + functions) no longer keep a reference to the + cabal2nix call used to generate them. As a + result, they will be garbage collected more often. + + + +
+
+ New Services + + + + alps, + a simple and extensible webmail. Available as + services.alps. + + + + + appvm, + Nix based app VMs. Available as + virtualisation.appvm. + + + + + AusweisApp2, + the authentication software for the German ID card. Available + as + programs.ausweisapp. + + + + + automatic-timezoned. + a Linux daemon to automatically update the system timezone + based on location. Available as + services.automatic-timezoned. + + + + + Dolibarr, + an enterprise resource planning and customer relationship + manager. Enable using + services.dolibarr. + + + + + dragonflydb, + a modern replacement for Redis and Memcached. Available as + services.dragonflydb. + + + + + endlessh-go, + an SSH tarpit that exposes Prometheus metrics. Available as + services.endlessh-go. + + + + + endlessh, + an SSH tarpit. Available as + services.endlessh. + + + + + EVCC is an EV charge + controller with PV integration. It supports a multitude of + chargers, meters, vehicle APIs and more and ties that together + with a well-tested backend and a lightweight web frontend. + Available as + services.evcc. + + + + + expressvpn, + the CLI client for ExpressVPN. Available as + services.expressvpn. + + + + + FreshRSS, a + free, self-hostable RSS feed aggregator. Available as + services.freshrss. + + + + + Garage, + a simple object storage server for geodistributed deployments, + alternative to MinIO. Available as + services.garage. + + + + + go-autoconfig, + IMAP/SMTP autodiscover server. Available as + services.go-autoconfig. + + + + + Grafana + Tempo, a distributed tracing store. Available as + services.tempo. + + + + + HBase + cluster, a distributed, scalable, big data store. + Available as + services.hadoop.hbase. + + + + + infnoise, + a hardware True Random Number Generator dongle. Available as + services.infnoise. + + + + + kanata, + a tool to improve keyboard comfort and usability with advanced + customization. Available as + services.kanata. + + + + + karma, + an alert dashboard for Prometheus Alertmanager. Available as + services.karma + + + + + Komga, a free and + open source comics/mangas media server. Available as + services.komga. + + + + + kthxbye, + an alert acknowledgement management daemon for Prometheus + Alertmanager. Available as + services.kthxbye + + + + + languagetool, + a multilingual grammar, style, and spell checker. Available as + services.languagetool. + + + + + Listmonk, a + self-hosted newsletter manager. Enable using + services.listmonk. + + + + + Mepo, a + fast, simple, hackable OSM map viewer for mobile and desktop + Linux. Available as + programs.mepo.enable. + + + + + merecat, + a small and easy HTTP server based on thttpd. Available as + services.merecat + + + + + netbird, a zero + configuration VPN. Available as + services.netbird. + + + + + ntfy.sh, a push + notification service. Available as + services.ntfy-sh + + + + + OpenRGB, + a FOSS tool for controlling RGB lighting. Available as + services.hardware.openrgb.enable. + + + + + Outline, + a wiki and knowledge base similar to Notion. Available as + services.outline. + + + + + Patroni, + a template for PostgreSQL HA with ZooKeeper, etcd or Consul. + Available as + services.patroni. + + + + + persistent-evdev, + a daemon to add virtual proxy devices that mirror a physical + input device but persist even if the underlying hardware is + hot-plugged. Available as + services.persistent-evdev. + + + + + Please, + a Sudo clone written in Rust. Available as + security.please. + + + + + Prometheus + IPMI exporter, an IPMI exporter for Prometheus. + Available as + services.prometheus.exporters.ipmi. + + + + + Sachet, + an SMS alerting tool for the Prometheus Alertmanager. + Available as + services.prometheus.sachet. + + + + + schleuder, a + mailing list manager with PGP support. Enable using + services.schleuder. + + + + + syncstorage-rs, + a self-hostable sync server for Firefox. Available as + services.firefox-syncserver. + + + + + Tandoor Recipes, + a self-hosted multi-tenant recipe collection. Available as + services.tandoor-recipes. + + + + + TAYGA, + an out-of-kernel stateless NAT64 implementation. Available as + services.tayga. + + + + + tmate-ssh-server, + server side part of + tmate. Available + as + services.tmate-ssh-server. + + + + + Uptime + Kuma, a fancy self-hosted monitoring tool. Available as + services.uptime-kuma. + + + + + WriteFreely, + a simple blogging platform with ActivityPub support. Available + as + services.writefreely. + + + + + xray, + a fully compatible v2ray-core replacement. Features XTLS, + which when enabled on server and client, brings UDP FullCone + NAT to proxy setups. Available as + services.xray. + +
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 51dafd38c1ac..1ae5fede272b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -10,40 +10,866 @@ In addition to numerous new and upgraded packages, this release has the following highlights: - + - Create the first release note entry in this section! + Cinnamon has been updated to 5.6, see + the + pull request for what is changed. + + + + + nixos-rebuild now supports an extra + --specialisation option that can be used to + change specialisation for switch and + test commands.
New Services - + - Create the first release note entry in this section! + Akkoma, an + ActivityPub microblogging server. Available as + services.akkoma. + + + + + blesh, + a line editor written in pure bash. Available as + programs.bash.blesh. + + + + + webhook, + a lightweight webhook server. Available as + services.webhook. + + + + + cups-pdf-to-pdf, + a pdf-generating cups backend based on + cups-pdf. + Available as + services.printing.cups-pdf. + + + + + Cloudlog, + a web-based Amateur Radio logging application. Available as + services.cloudlog. + + + + + fzf, + a command line fuzzyfinder. Available as + programs.fzf. + + + + + gmediarender, + a simple, headless UPnP/DLNA renderer. Available as + services.gmediarender. + + + + + stevenblack-blocklist, + A unified hosts file with base extensions for blocking + unwanted websites. Available as + networking.stevenblack. + + + + + goeland, + an alternative to rss2email written in golang with many + filters. Available as + services.goeland. + + + + + atuin, + a sync server for shell history. Available as + services.atuin. + + + + + mmsd, + a lower level daemon that transmits and recieves MMSes. + Available as + services.mmsd. + + + + + QDMR, a + gui application and command line tool for programming cheap + DMR radios + programs.qdmr + + + + + v2rayA, a Linux + web GUI client of Project V which supports V2Ray, Xray, SS, + SSR, Trojan and Pingtunnel. Available as + services.v2raya. + + + + + ulogd, + a userspace logging daemon for netfilter/iptables related + logging. Available as + services.ulogd. + + + + + photoprism, + a AI-Powered Photos App for the Decentralized Web. Available + as + services.photoprism. + + + + + autosuspend, + a python daemon that suspends a system if certain conditions + are met, or not met.
Backward Incompatibilities - + - Create the first release note entry in this section! + carnix and cratesIO has + been removed due to being unmaintained, use alternatives such + as + naersk + and + crate2nix + instead. + + + + + checkInputs have been renamed to + nativeCheckInputs, because they behave the + same as nativeBuildInputs when + doCheck is set. + checkInputs now denote a new type of + dependencies, added to buildInputs when + doCheck is set. As a rule of thumb, + nativeCheckInputs are tools on + $PATH used during the tests, and + checkInputs are libraries which are linked + to executables built as part of the tests. Similarly, + installCheckInputs are renamed to + nativeInstallCheckInputs, corresponding to + nativeBuildInputs, and + installCheckInputs are a new type of + dependencies added to buildInputs when + doInstallCheck is set. (Note that this + change will not cause breakage to derivations with + strictDeps unset, which are most packages + except python, rust, ocaml and go packages). + + + + + buildDunePackage now defaults to + strictDeps = true which means that any + library should go into buildInputs or + checkInputs. Any executable that is run on + the building machine should go into + nativeBuildInputs or + nativeCheckInputs respectively. Example of + executables are ocaml, + findlib and menhir. PPXs + are libraries which are built by dune and should therefore not + go into nativeBuildInputs. + + + + + borgbackup module now has an option for + inhibiting system sleep while backups are running, defaulting + to off (not inhibiting sleep), available as + services.borgbackup.jobs.<name>.inhibitsSleep. + + + + + podman now uses the + netavark network stack. Users will need to + delete all of their local containers, images, volumes, etc, by + running podman system reset --force once + before upgrading their systems. + + + + + git-bug has been updated to at least + version 0.8.0, which includes backwards incompatible changes. + The git-bug-migration package can be used + to upgrade existing repositories. + + + + + The services.kubo.settings option is now no + longer stateful. If you changed any of the options in + services.kubo.settings in the past and then + removed them from your NixOS configuration again, those + changes are still in your Kubo configuration file but will now + be reset to the default. If you’re unsure, you may want to + make a backup of your configuration file (probably + /var/lib/ipfs/config) and compare after the update. + + + + + The EC2 image module no longer fetches instance metadata in + stage-1. This results in a significantly smaller initramfs, + since network drivers no longer need to be included, and + faster boots, since metadata fetching can happen in parallel + with startup of other services. This breaks services which + rely on metadata being present by the time stage-2 is entered. + Anything which reads EC2 metadata from + /etc/ec2-metadata should now have an + after dependency on + fetch-ec2-metadata.service + + + + + minio removed support for its legacy + filesystem backend in + RELEASE.2022-10-29T06-21-33Z. + This means if your storage was created with the old format, + minio will no longer start. Unfortunately minio doesn’t + provide a an automatic migration, they only provide + instructions + how to manually convert the node. To facilitate this + migration we keep around the last version that still supports + the old filesystem backend as + minio_legacy_fs. Use it via + services.minio.package = minio_legacy_fs; + to export your data before switching to the new version. See + the corresponding + issue + for more details. + + + + + services.sourcehut.dispatch and the + corresponding package + (sourcehut.dispatchsrht) have been removed + due to + upstream + deprecation. + + + + + The + services.snapserver.openFirewall + module option default value has been changed from + true to false. You will + need to explicitly set this option to true, + or configure your firewall. + + + + + The + services.tmate-ssh-server.openFirewall + module option default value has been changed from + true to false. You will + need to explicitly set this option to true, + or configure your firewall. + + + + + The + services.unifi-video.openFirewall + module option default value has been changed from + true to false. You will + need to explicitly set this option to true, + or configure your firewall. + + + + + Kime has been updated from 2.5.6 to 3.0.2 and the + i18n.inputMethod.kime.config option has + been removed. Users should use + daemonModules, + iconColor, and + extraConfig options under + i18n.inputMethod.kime instead. + + + + + tut has been updated from 1.0.34 to 2.0.0, + and now uses the TOML format for the configuration file + instead of INI. Additional information can be found + here. + + + + + The wordpress derivation no longer contains + any builtin plugins or themes. If you need them you have to + add them back to prevent your site from breaking. You can find + them in wordpressPackages.{plugins,themes}. + + + + + llvmPackages_rocm.llvm will not contain + clang or compiler-rt. + llvmPackages_rocm.clang will not contain + llvm. + llvmPackages_rocm.clangNoCompilerRt has + been removed in favor of using + llvmPackages_rocm.clang-unwrapped. + + + + + The EC2 image module previously detected and automatically + mounted ext3-formatted instance store devices and partitions + in stage-1 (initramfs), storing /tmp on the + first discovered device. This behaviour, which only catered to + very specific use cases and could not be disabled, has been + removed. Users relying on this should provide their own + implementation, and probably use ext4 and perform the mount in + stage-2. + + + + + teleport has been upgraded to major version + 11. Please see upstream + upgrade + instructions and + release + notes. + + + + + The EC2 image module previously detected and activated + swap-formatted instance store devices and partitions in + stage-1 (initramfs). This behaviour has been removed. Users + relying on this should provide their own implementation. + + + + + Calling makeSetupHook without passing a + name argument is deprecated. + + + + + Qt 5.12 and 5.14 have been removed, as the corresponding + branches have been EOL upstream for a long time. This affected + under 10 packages in nixpkgs, largely unmaintained upstream as + well, however, out-of-tree package expressions may need to be + updated manually. + + + + + The + services.wordpress.sites.<name>.plugins + and + services.wordpress.sites.<name>.themes + options have been converted from sets to attribute sets to + allow for consumers to specify explicit install paths via + attribute name. + + + + + In mastodon it is now necessary to specify + location of file with PostgreSQL database + password. In + services.mastodon.database.passwordFile + parameter default value + /var/lib/mastodon/secrets/db-password has + been changed to null. + + + + + The --target-host and + --build-host options of + nixos-rebuild no longer treat the + localhost value specially – to build + on/deploy to local machine, omit the relevant flag. + + + + + The nix.readOnlyStore option has been + renamed to boot.readOnlyNixStore to clarify + that it configures the NixOS boot process, not the Nix daemon. + + + + + Deprecated xlibsWrapper transitional + package has been removed in favour of direct use of its + constitutents: xorg.libX11, + freetype and others. + + + + + .NET 5.0 was removed due to being end-of-life, use a newer, + supported .NET version - + https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core + + + + + The iputils package, which is installed by default, no longer + provides the ninfod, + rarpd and rdisc tools. + See + upstream’s + release notes for more details and available + replacements.
Other Notable Changes - + - Create the first release note entry in this section! + vim_configurable has been renamed to + vim-full to avoid confusion: + vim-full’s build-time features are + configurable, but both vim and + vim-full are + customizable (in the sense of user + configuration, like vimrc). + + + + + The module for the application firewall + opensnitch got the ability to configure + rules. Available as + services.opensnitch.rules + + + + + The module usbmuxd now has the ability to + change the package used by the daemon. In case you’re + experiencing issues with usbmuxd you can + try an alternative program like usbmuxd2. + Available as + services.usbmuxd.package + + + + + A few openssh options have been moved from extraConfig to the + new freeform option settings and renamed as + follow: + services.openssh.kbdInteractiveAuthentication + to + services.openssh.settings.KbdInteractiveAuthentication, + services.openssh.passwordAuthentication to + services.openssh.settings.PasswordAuthentication, + services.openssh.useDns to + services.openssh.settings.UseDns, + services.openssh.permitRootLogin to + services.openssh.settings.PermitRootLogin, + services.openssh.logLevel to + services.openssh.settings.LogLevel. + + + + + services.mastodon gained a tootctl wrapped + named mastodon-tootctl similar to + nextcloud-occ which can be executed from + any user and switches to the configured mastodon user with + sudo and sources the environment variables. + + + + + DocBook option documentation, which has been deprecated since + 22.11, will now cause a warning when documentation is built. + Out-of-tree modules should migrate to using CommonMark + documentation as outlined in + to silence this + warning. + + + DocBook option documentation support will be removed in the + next release and CommonMark will become the default. DocBook + option documentation that has not been migrated until then + will no longer render properly or cause errors. + + + + + NixOS now defaults to using nsncd (a non-caching + reimplementation in Rust) as NSS lookup dispatcher, instead of + the buggy and deprecated glibc-provided nscd. If you need to + switch back, set + services.nscd.enableNsncd = false, but + please open an issue in nixpkgs so your issue can be fixed. + + + + + The dnsmasq service now takes configuration + via the services.dnsmasq.settings attribute + set. The option + services.dnsmasq.extraConfig will be + deprecated when NixOS 22.11 reaches end of life. + + + + + The dokuwiki service now takes + configuration via the + services.dokuwiki.sites.<name>.settings + attribute set, extraConfig is deprecated + and will be removed. The + {aclUse,superUser,disableActions} + attributes have been renamed, pluginsConfig + now also accepts an attribute set of booleans, passing plain + PHP is deprecated. Same applies to acl + which now also accepts structured settings. + + + + + The wordpress service now takes + configuration via the + services.wordpress.sites.<name>.settings + attribute set, extraConfig is still + available to append additional text to + wp-config.php. + + + + + To reduce closure size in + nixos/modules/profiles/minimal.nix profile + disabled installation documentations and manuals. Also + disabled logrotate and + udisks2 services. + + + + + The minimal ISO image now uses the + nixos/modules/profiles/minimal.nix profile. + + + + + The ghcWithPackages and + ghcWithHoogle wrappers will now also + symlink GHC’s and all included libraries’ documentation to + $out/share/doc for convenience. If + undesired, the old behavior can be restored by overriding the + builders with + { installDocumentation = false; }. + + + + + mastodon now supports connection to a + remote PostgreSQL database. + + + + + services.peertube now requires you to + specify the secret file + secrets.secretsFile. It can be generated by + running openssl rand -hex 32. Before + upgrading, read the release notes for PeerTube: + + + + + Release + v5.0.0 + + + + + And backup your data. + + + + + services.chronyd is now started with + additional systemd sandbox/hardening options for better + security. + + + + + services.dhcpcd service now don’t solicit + or accept IPv6 Router Advertisements on interfaces that use + static IPv6 addresses. + + + + + The module services.headscale was + refactored to be compliant with + RFC + 0042. To be precise, this means that the following + things have changed: + + + + + Most settings has been migrated under + services.headscale.settings + which is an attribute-set that will be converted into + headscale’s YAML config format. This means that the + configuration from + headscale’s + example configuration can be directly written as + attribute-set in Nix within this option. + + + + + + + nixos/lib/make-disk-image.nix can now + mutate EFI variables, run user-provided EFI firmware or + variable templates. This is now extensively documented in the + NixOS manual. + + + + + services.grafana listens only on localhost + by default again. This was changed to upstreams default of + 0.0.0.0 by accident in the freeform setting + conversion. + + + + + Grafana Tempo has been updated to version 2.0. See the + upstream + upgrade guide for migration instructions. + + + + + A new virtualisation.rosetta module was + added to allow running x86_64 binaries + through + Rosetta + inside virtualised NixOS guests on Apple silicon. This feature + works by default with the + UTM + virtualisation + package. + + + + + The new option users.motdFile allows + configuring a Message Of The Day that can be updated + dynamically. + + + + + The root package is now built with the + "-Dgnuinstall=ON" CMake flag, + making the output conform the bin + lib share layout. In + this layout, tutorials is under + share/doc/ROOT/; cmake, + font, icons, + js and macro under + share/root; + Makefile.comp and + Makefile.config under + etc/root. + + + + + Enabling global redirect in + services.nginx.virtualHosts now allows one + to add exceptions with the locations + option. + + + + + A new option recommendedBrotliSettings has + been added to services.nginx. Learn more + about compression in Brotli format + here. + + + + + Updated recommended settings in + services.nginx.recommendedGzipSettings: + + + + + Enables gzip compression for only certain proxied + requests. + + + + + Allow checking and loading of precompressed files. + + + + + Updated gzip mime-types. + + + + + Increased the minimum length of a response that will be + gzipped. + + + + + + + Garage + version is based on + system.stateVersion, + existing installations will keep using version 0.7. New + installations will use version 0.8. In order to upgrade a + Garage cluster, please follow + upstream + instructions and force + services.garage.package + or upgrade accordingly + system.stateVersion. + + + + + hip has been separated into + hip, hip-common and + hipcc. + + + + + services.nginx.recommendedProxySettings now + removes the Connection header preventing + clients from closing backend connections. + + + + + Resilio sync secret keys can now be provided using a secrets + file at runtime, preventing these secrets from ending up in + the Nix store. + + + + + The firewall and nat + module now has a nftables based implementation. Enable + networking.nftables to use it. + + + + + The services.fwupd module now allows + arbitrary daemon settings to be configured in a structured + manner + (services.fwupd.daemonSettings). + + + + + The unifi-poller package and corresponding + NixOS module have been renamed to unpoller + to match upstream. + + + + + The new option + services.tailscale.useRoutingFeatures + controls various settings for using Tailscale features like + exit nodes and subnet routers. If you wish to use your machine + as an exit node, you can set this setting to + server, otherwise if you wish to use an + exit node you can set this setting to + client. The strict RPF warning has been + removed as the RPF will be loosened automatically based on the + value of this setting. + + + + + Xastir + can now access AX.25 interfaces via the + libax25 package. + + + + + nixos-version now accepts + --configuration-revision to display more + information about the current generation revision + + + + + The option + services.nomad.extraSettingsPlugins has + been fixed to allow more than one plugin in the path. diff --git a/nixos/doc/manual/installation/building-nixos.chapter.md b/nixos/doc/manual/installation/building-nixos.chapter.md index 17da261fbdaa..7b0b5ea1c447 100644 --- a/nixos/doc/manual/installation/building-nixos.chapter.md +++ b/nixos/doc/manual/installation/building-nixos.chapter.md @@ -9,7 +9,7 @@ You have two options: - Combine them with (any of) your host config(s) System images, such as the live installer ones, know how to enforce configuration settings -on wich they immediately depend in order to work correctly. +on which they immediately depend in order to work correctly. However, if you are confident, you can opt to override those enforced values with `mkForce`. @@ -75,6 +75,6 @@ configuration values upon which the correct functioning of the image depends. For example, the iso base image overrides those file systems which it needs at a minimum for correct functioning, while the installer base image overrides the entire file system layout because there can't be any other guarantees on a live medium than those given -by the live medium itself. The latter is especially true befor formatting the target +by the live medium itself. The latter is especially true before formatting the target block device(s). On the other hand, the netboot iso only overrides its minimum dependencies since netboot images are always made-to-target. diff --git a/nixos/doc/manual/installation/changing-config.chapter.md b/nixos/doc/manual/installation/changing-config.chapter.md index 8a404f085d7c..11b49ccb1f67 100644 --- a/nixos/doc/manual/installation/changing-config.chapter.md +++ b/nixos/doc/manual/installation/changing-config.chapter.md @@ -13,7 +13,7 @@ booting, and try to realise the configuration in the running system (e.g., by restarting system services). ::: {.warning} -This command doesn\'t start/stop [user services](#opt-systemd.user.services) +This command doesn't start/stop [user services](#opt-systemd.user.services) automatically. `nixos-rebuild` only runs a `daemon-reload` for each user with running user services. ::: @@ -51,7 +51,7 @@ GRUB 2 boot screen by giving it a different *profile name*, e.g. ``` which causes the new configuration (and previous ones created using -`-p test`) to show up in the GRUB submenu "NixOS - Profile \'test\'". +`-p test`) to show up in the GRUB submenu "NixOS - Profile 'test'". This can be useful to separate test configurations from "stable" configurations. diff --git a/nixos/doc/manual/installation/installing-from-other-distro.section.md b/nixos/doc/manual/installation/installing-from-other-distro.section.md index fa8806f791d5..921592fe5357 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.section.md +++ b/nixos/doc/manual/installation/installing-from-other-distro.section.md @@ -30,7 +30,7 @@ The first steps to all these are the same: 1. Switch to the NixOS channel: - If you\'ve just installed Nix on a non-NixOS distribution, you will + If you've just installed Nix on a non-NixOS distribution, you will be on the `nixpkgs` channel by default. ```ShellSession @@ -49,10 +49,10 @@ The first steps to all these are the same: 1. Install the NixOS installation tools: - You\'ll need `nixos-generate-config` and `nixos-install`, but this + You'll need `nixos-generate-config` and `nixos-install`, but this also makes some man pages and `nixos-enter` available, just in case you want to chroot into your NixOS partition. NixOS installs these - by default, but you don\'t have NixOS yet.. + by default, but you don't have NixOS yet.. ```ShellSession $ nix-env -f '' -iA nixos-install-tools @@ -70,7 +70,7 @@ The first steps to all these are the same: refer to the partitioning, file-system creation, and mounting steps of [](#sec-installation) - If you\'re about to install NixOS in place using `NIXOS_LUSTRATE` + If you're about to install NixOS in place using `NIXOS_LUSTRATE` there is nothing to do for this step. 1. Generate your NixOS configuration: @@ -79,12 +79,12 @@ The first steps to all these are the same: $ sudo `which nixos-generate-config` --root /mnt ``` - You\'ll probably want to edit the configuration files. Refer to the + You'll probably want to edit the configuration files. Refer to the `nixos-generate-config` step in [](#sec-installation) for more information. Consider setting up the NixOS bootloader to give you the ability to - boot on your existing Linux partition. For instance, if you\'re + boot on your existing Linux partition. For instance, if you're using GRUB and your existing distribution is running Ubuntu, you may want to add something like this to your `configuration.nix`: @@ -148,19 +148,19 @@ The first steps to all these are the same: Generate your NixOS configuration: ```ShellSession - $ sudo `which nixos-generate-config` --root / + $ sudo `which nixos-generate-config` ``` Note that this will place the generated configuration files in - `/etc/nixos`. You\'ll probably want to edit the configuration files. + `/etc/nixos`. You'll probably want to edit the configuration files. Refer to the `nixos-generate-config` step in [](#sec-installation) for more information. - You\'ll likely want to set a root password for your first boot using - the configuration files because you won\'t have a chance to enter a - password until after you reboot. You can initalize the root password - to an empty one with this line: (and of course don\'t forget to set - one once you\'ve rebooted or to lock the account with + You'll likely want to set a root password for your first boot using + the configuration files because you won't have a chance to enter a + password until after you reboot. You can initialize the root password + to an empty one with this line: (and of course don't forget to set + one once you've rebooted or to lock the account with `sudo passwd -l root` if you use `sudo`) ```nix @@ -186,7 +186,7 @@ The first steps to all these are the same: bootup scripts require its presence). `/etc/NIXOS_LUSTRATE` tells the NixOS bootup scripts to move - *everything* that\'s in the root partition to `/old-root`. This will + *everything* that's in the root partition to `/old-root`. This will move your existing distribution out of the way in the very early stages of the NixOS bootup. There are exceptions (we do need to keep NixOS there after all), so the NixOS lustrate process will not @@ -201,10 +201,10 @@ The first steps to all these are the same: ::: {.note} Support for `NIXOS_LUSTRATE` was added in NixOS 16.09. The act of - \"lustrating\" refers to the wiping of the existing distribution. + "lustrating" refers to the wiping of the existing distribution. Creating `/etc/NIXOS_LUSTRATE` can also be used on NixOS to remove - all mutable files from your root partition (anything that\'s not in - `/nix` or `/boot` gets \"lustrated\" on the next boot. + all mutable files from your root partition (anything that's not in + `/nix` or `/boot` gets "lustrated" on the next boot. lustrate /ˈlʌstreɪt/ verb. @@ -212,14 +212,14 @@ The first steps to all these are the same: ritual action. ::: - Let\'s create the files: + Let's create the files: ```ShellSession $ sudo touch /etc/NIXOS $ sudo touch /etc/NIXOS_LUSTRATE ``` - Let\'s also make sure the NixOS configuration files are kept once we + Let's also make sure the NixOS configuration files are kept once we reboot on NixOS: ```ShellSession @@ -233,7 +233,7 @@ The first steps to all these are the same: ::: {.warning} Once you complete this step, your current distribution will no - longer be bootable! If you didn\'t get all the NixOS configuration + longer be bootable! If you didn't get all the NixOS configuration right, especially those settings pertaining to boot loading and root partition, NixOS may not be bootable either. Have a USB rescue device ready in case this happens. @@ -247,7 +247,7 @@ The first steps to all these are the same: Cross your fingers, reboot, hopefully you should get a NixOS prompt! 1. If for some reason you want to revert to the old distribution, - you\'ll need to boot on a USB rescue disk and do something along + you'll need to boot on a USB rescue disk and do something along these lines: ```ShellSession @@ -264,14 +264,14 @@ The first steps to all these are the same: This may work as is or you might also need to reinstall the boot loader. - And of course, if you\'re happy with NixOS and no longer need the + And of course, if you're happy with NixOS and no longer need the old distribution: ```ShellSession sudo rm -rf /old-root ``` -1. It\'s also worth noting that this whole process can be automated. +1. It's also worth noting that this whole process can be automated. This is especially useful for Cloud VMs, where provider do not provide NixOS. For instance, [nixos-infect](https://github.com/elitak/nixos-infect) uses the diff --git a/nixos/doc/manual/installation/installing-kexec.section.md b/nixos/doc/manual/installation/installing-kexec.section.md index 286cbbda6a69..61d8e8e5999b 100644 --- a/nixos/doc/manual/installation/installing-kexec.section.md +++ b/nixos/doc/manual/installation/installing-kexec.section.md @@ -30,7 +30,7 @@ This will create a `result` directory containing the following: These three files are meant to be copied over to the other already running Linux Distribution. -Note it's symlinks pointing elsewhere, so `cd` in, and use +Note its symlinks pointing elsewhere, so `cd` in, and use `scp * root@$destination` to copy it over, rather than rsync. Once you finished copying, execute `kexec-boot` *on the destination*, and after diff --git a/nixos/doc/manual/installation/installing-usb.section.md b/nixos/doc/manual/installation/installing-usb.section.md index da32935a7a10..adfe22ea2f00 100644 --- a/nixos/doc/manual/installation/installing-usb.section.md +++ b/nixos/doc/manual/installation/installing-usb.section.md @@ -56,12 +56,12 @@ select the image, select the USB flash drive and click "Write". sudo dd if= of=/dev/rdiskX bs=4m ``` - After `dd` completes, a GUI dialog \"The disk - you inserted was not readable by this computer\" will pop up, which can + After `dd` completes, a GUI dialog "The disk + you inserted was not readable by this computer" will pop up, which can be ignored. ::: {.note} - Using the \'raw\' `rdiskX` device instead of `diskX` with dd completes in + Using the 'raw' `rdiskX` device instead of `diskX` with dd completes in minutes instead of hours. ::: diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.section.md b/nixos/doc/manual/installation/installing-virtualbox-guest.section.md index e9c2a621c1bb..004838e586be 100644 --- a/nixos/doc/manual/installation/installing-virtualbox-guest.section.md +++ b/nixos/doc/manual/installation/installing-virtualbox-guest.section.md @@ -1,4 +1,4 @@ -# Installing in a VirtualBox guest {#sec-instaling-virtualbox-guest} +# Installing in a VirtualBox guest {#sec-installing-virtualbox-guest} Installing NixOS into a VirtualBox guest is convenient for users who want to try NixOS without installing it on bare metal. If you want to @@ -6,7 +6,7 @@ use a pre-made VirtualBox appliance, it is available at [the downloads page](https://nixos.org/nixos/download.html). If you want to set up a VirtualBox guest manually, follow these instructions: -1. Add a New Machine in VirtualBox with OS Type \"Linux / Other Linux\" +1. Add a New Machine in VirtualBox with OS Type "Linux / Other Linux" 1. Base Memory Size: 768 MB or higher. @@ -16,7 +16,7 @@ VirtualBox guest manually, follow these instructions: 1. Click on Settings / System / Processor and enable PAE/NX -1. Click on Settings / System / Acceleration and enable \"VT-x/AMD-V\" +1. Click on Settings / System / Acceleration and enable "VT-x/AMD-V" acceleration 1. Click on Settings / Display / Screen and select VMSVGA as Graphics @@ -41,7 +41,7 @@ boot.initrd.checkJournalingFS = false; Shared folders can be given a name and a path in the host system in the VirtualBox settings (Machine / Settings / Shared Folders, then click on -the \"Add\" icon). Add the following to the +the "Add" icon). Add the following to the `/etc/nixos/configuration.nix` to auto-mount them. If you do not add `"nofail"`, the system will not boot properly. diff --git a/nixos/doc/manual/installation/installing.chapter.md b/nixos/doc/manual/installation/installing.chapter.md index 2c86cb923a5c..ac7cf5a7bfc5 100644 --- a/nixos/doc/manual/installation/installing.chapter.md +++ b/nixos/doc/manual/installation/installing.chapter.md @@ -162,7 +162,7 @@ network manually, disable NetworkManager with `systemctl stop NetworkManager`. On the minimal installer, NetworkManager is not available, so -configuration must be perfomed manually. To configure the wifi, first +configuration must be performed manually. To configure the wifi, first start wpa_supplicant with `sudo systemctl start wpa_supplicant`, then run `wpa_cli`. For most home networks, you need to type in the following commands: @@ -230,11 +230,11 @@ The recommended partition scheme differs depending if the computer uses #### UEFI (GPT) {#sec-installation-manual-partitioning-UEFI} []{#sec-installation-partitioning-UEFI} -Here\'s an example partition scheme for UEFI, using `/dev/sda` as the +Here's an example partition scheme for UEFI, using `/dev/sda` as the device. ::: {.note} -You can safely ignore `parted`\'s informational message about needing to +You can safely ignore `parted`'s informational message about needing to update /etc/fstab. ::: @@ -279,11 +279,11 @@ Once complete, you can follow with #### Legacy Boot (MBR) {#sec-installation-manual-partitioning-MBR} []{#sec-installation-partitioning-MBR} -Here\'s an example partition scheme for Legacy Boot, using `/dev/sda` as +Here's an example partition scheme for Legacy Boot, using `/dev/sda` as the device. ::: {.note} -You can safely ignore `parted`\'s informational message about needing to +You can safely ignore `parted`'s informational message about needing to update /etc/fstab. ::: diff --git a/nixos/doc/manual/installation/upgrading.chapter.md b/nixos/doc/manual/installation/upgrading.chapter.md index 2644979bc9db..26b6b8cc23ef 100644 --- a/nixos/doc/manual/installation/upgrading.chapter.md +++ b/nixos/doc/manual/installation/upgrading.chapter.md @@ -6,7 +6,7 @@ expressions and associated binaries. The NixOS channels are updated automatically from NixOS's Git repository after certain tests have passed and all packages have been built. These channels are: -- *Stable channels*, such as [`nixos-22.05`](https://nixos.org/channels/nixos-22.05). +- *Stable channels*, such as [`nixos-22.11`](https://nixos.org/channels/nixos-22.11). These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not @@ -19,7 +19,7 @@ passed and all packages have been built. These channels are: radical changes between channel updates. It's not recommended for production systems. -- *Small channels*, such as [`nixos-22.05-small`](https://nixos.org/channels/nixos-22.05-small) +- *Small channels*, such as [`nixos-22.11-small`](https://nixos.org/channels/nixos-22.11-small) or [`nixos-unstable-small`](https://nixos.org/channels/nixos-unstable-small). These are identical to the stable and unstable channels described above, except that they contain fewer binary packages. This means they get updated @@ -38,8 +38,8 @@ newest supported stable release. When you first install NixOS, you're automatically subscribed to the NixOS channel that corresponds to your installation source. For -instance, if you installed from a 22.05 ISO, you will be subscribed to -the `nixos-22.05` channel. To see which NixOS channel you're subscribed +instance, if you installed from a 22.11 ISO, you will be subscribed to +the `nixos-22.11` channel. To see which NixOS channel you're subscribed to, run the following as root: ```ShellSession @@ -54,16 +54,16 @@ To switch to a different NixOS channel, do ``` (Be sure to include the `nixos` parameter at the end.) For instance, to -use the NixOS 22.05 stable channel: +use the NixOS 22.11 stable channel: ```ShellSession -# nix-channel --add https://nixos.org/channels/nixos-22.05 nixos +# nix-channel --add https://nixos.org/channels/nixos-22.11 nixos ``` If you have a server, you may want to use the "small" channel instead: ```ShellSession -# nix-channel --add https://nixos.org/channels/nixos-22.05-small nixos +# nix-channel --add https://nixos.org/channels/nixos-22.11-small nixos ``` And if you want to live on the bleeding edge: @@ -114,5 +114,5 @@ the new generation contains a different kernel, initrd or kernel modules. You can also specify a channel explicitly, e.g. ```nix -system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.05; +system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.11; ``` diff --git a/nixos/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml deleted file mode 100644 index fa7c8c0c6d79..000000000000 --- a/nixos/doc/manual/man-nixos-build-vms.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - nixos-build-vms - 8 - NixOS - - - - nixos-build-vms - build a network of virtual machines from a network of NixOS configurations - - - - nixos-build-vms - - - - - - - - - - - - - - - name - value - - - - network.nix - - - - - Description - - This command builds a network of QEMU-KVM virtual machines of a Nix - expression specifying a network of NixOS machines. The virtual network can - be started by executing the bin/run-vms shell script - that is generated by this command. By default, a result - symlink is produced that points to the generated virtual network. - - - A network Nix expression has the following structure: - -{ - test1 = {pkgs, config, ...}: - { - services.openssh.enable = true; - nixpkgs.localSystem.system = "i686-linux"; - deployment.targetHost = "test1.example.net"; - - # Other NixOS options - }; - - test2 = {pkgs, config, ...}: - { - services.openssh.enable = true; - services.httpd.enable = true; - environment.systemPackages = [ pkgs.lynx ]; - nixpkgs.localSystem.system = "x86_64-linux"; - deployment.targetHost = "test2.example.net"; - - # Other NixOS options - }; -} - - Each attribute in the expression represents a machine in the network (e.g. - test1 and test2) referring to a - function defining a NixOS configuration. In each NixOS configuration, two - attributes have a special meaning. The - deployment.targetHost specifies the address (domain name - or IP address) of the system which is used by ssh to - perform remote deployment operations. The - nixpkgs.localSystem.system attribute can be used to - specify an architecture for the target machine, such as - i686-linux which builds a 32-bit NixOS configuration. - Omitting this property will build the configuration for the same - architecture as the host system. - - - - Options - - This command accepts the following options: - - - - - - - - - Shows a trace of the output. - - - - - - - - - - Do not create a 'result' symlink. - - - - - - , - - - - Shows the usage of this command to the user. - - - - - - name value - - - Set the Nix configuration option - name to value. - This overrides settings in the Nix configuration file (see - nix.conf5). - - - - - - diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml deleted file mode 100644 index 41f0e6b97515..000000000000 --- a/nixos/doc/manual/man-nixos-enter.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - nixos-enter - 8 - NixOS - - - - nixos-enter - run a command in a NixOS chroot environment - - - - nixos-enter - - - - - root - - - - - - - system - - - - - - - shell-command - - - - - - - - - - - - - - - - - - - arguments - - - - - Description - - This command runs a command in a NixOS chroot environment, that is, in a - filesystem hierarchy previously prepared using - nixos-install. - - - - Options - - This command accepts the following options: - - - - - - - - - The path to the NixOS system you want to enter. It defaults to - /mnt. - - - - - - - - - - The NixOS system configuration to use. It defaults to - /nix/var/nix/profiles/system. You can enter a - previous NixOS configuration by specifying a path such as - /nix/var/nix/profiles/system-106-link. - - - - - - - - - - - - - The bash command to execute. - - - - - - - - - - Suppresses all output from the activation script of the target system. - - - - - - - - - - Interpret the remaining arguments as the program name and arguments to be - invoked. The program is not executed in a shell. - - - - - - - Examples - - Start an interactive shell in the NixOS installation in - /mnt: - - -# nixos-enter --root /mnt - - - Run a shell command: - - -# nixos-enter -c 'ls -l /; cat /proc/mounts' - - - Run a non-shell command: - - -# nixos-enter -- cat /proc/mounts - - - diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml deleted file mode 100644 index 9ac3b918ff69..000000000000 --- a/nixos/doc/manual/man-nixos-generate-config.xml +++ /dev/null @@ -1,214 +0,0 @@ - - - nixos-generate-config - 8 - NixOS - - - - nixos-generate-config - generate NixOS configuration modules - - - - nixos-generate-config - - - - - - - - - root - - - - - - - dir - - - - - Description - - This command writes two NixOS configuration modules: - - - - - - - - This module sets NixOS configuration options based on your current - hardware configuration. In particular, it sets the - option to reflect all currently mounted file - systems, the option to reflect active swap - devices, and the options to ensure that - the initial ramdisk contains any kernel modules necessary for mounting - the root file system. - - - If this file already exists, it is overwritten. Thus, you should not - modify it manually. Rather, you should include it from your - /etc/nixos/configuration.nix, and re-run - nixos-generate-config to update it whenever your - hardware configuration changes. - - - - - - - - - - This is the main NixOS system configuration module. If it already - exists, it’s left unchanged. Otherwise, - nixos-generate-config will write a template for you - to customise. - - - - - - - - Options - - This command accepts the following options: - - - - - - - - - If this option is given, treat the directory - root as the root of the file system. This - means that configuration files will be written to - root/etc/nixos, and that - any file systems outside of root are ignored - for the purpose of generating the option. - - - - - - - - - - If this option is given, write the configuration files to the directory - dir instead of - /etc/nixos. - - - - - - - - - - Overwrite /etc/nixos/configuration.nix if it already - exists. - - - - - - - - - - Omit everything concerning file systems and swap devices from the - hardware configuration. - - - - - - - - - - Don't generate configuration.nix or - hardware-configuration.nix and print the hardware - configuration to stdout only. - - - - - - - Examples - - This command is typically used during NixOS installation to write initial - configuration modules. For example, if you created and mounted the target - file systems on /mnt and - /mnt/boot, you would run: - -$ nixos-generate-config --root /mnt - - The resulting file - /mnt/etc/nixos/hardware-configuration.nix might look - like this: - -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, pkgs, ... }: - -{ - imports = - [ <nixos/modules/installer/scan/not-detected.nix> - ]; - - boot.initrd.availableKernelModules = [ "ehci_hcd" "ahci" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-label/nixos"; - fsType = "ext3"; - options = [ "rw" "data=ordered" "relatime" ]; - }; - - fileSystems."/boot" = - { device = "/dev/sda1"; - fsType = "ext3"; - options = [ "rw" "errors=continue" "user_xattr" "acl" "barrier=1" "data=writeback" "relatime" ]; - }; - - swapDevices = - [ { device = "/dev/sda2"; } - ]; - - nix.maxJobs = 8; -} - - It will also create a basic - /mnt/etc/nixos/configuration.nix, which you should edit - to customise the logical configuration of your system. This file includes - the result of the hardware scan as follows: - - imports = [ ./hardware-configuration.nix ]; - - - - After installation, if your hardware configuration changes, you can run: - -$ nixos-generate-config - - to update /etc/nixos/hardware-configuration.nix. Your - /etc/nixos/configuration.nix will - not be overwritten. - - - diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml deleted file mode 100644 index eb6680b65677..000000000000 --- a/nixos/doc/manual/man-nixos-install.xml +++ /dev/null @@ -1,357 +0,0 @@ - - - nixos-install - 8 - NixOS - - - - nixos-install - install bootloader and NixOS - - - - nixos-install - - - - - - - - - - - - - - - path - - - - - - - root - - - - - - - path - - - - flake-uri - - - - - - - - - - - - - channel - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - number - - - - number - - - - name value - - - - - - - - - - - - - - - - - - - - - - - Description - - This command installs NixOS in the file system mounted on - /mnt, based on the NixOS configuration specified in - /mnt/etc/nixos/configuration.nix. It performs the - following steps: - - - - It copies Nix and its dependencies to - /mnt/nix/store. - - - - - It runs Nix in /mnt to build the NixOS configuration - specified in /mnt/etc/nixos/configuration.nix. - - - - - It installs the current channel nixos in the target channel - profile (unless is specified). - - - - - It installs the GRUB boot loader on the device specified in the option - (unless - is specified), and generates a GRUB - configuration file that boots into the NixOS configuration just - installed. - - - - - It prompts you for a password for the root account (unless - is specified). - - - - - - This command is idempotent: if it is interrupted or fails due to a temporary - problem (e.g. a network issue), you can safely re-run it. - - - - Options - - This command accepts the following options: - - - - / - - Increases the level of verbosity of diagnostic messages - printed on standard error. For each Nix operation, the information - printed on standard output is well-defined; any diagnostic - information is printed on standard error, never on standard - output. - Please note that this option may be specified repeatedly. - - - - - - - - - Defaults to /mnt. If this option is given, treat the - directory root as the root of the NixOS - installation. - - - - - - - - - - If this option is provided, nixos-install will install - the specified closure rather than attempt to build one from - /mnt/etc/nixos/configuration.nix. - - - The closure must be an appropriately configured NixOS system, with boot - loader and partition configuration that fits the target host. Such a - closure is typically obtained with a command such as nix-build - -I nixos-config=./configuration.nix '<nixpkgs/nixos>' -A system - --no-out-link - - - - - - flake-uri#name - - - - Build the NixOS system from the specified flake. - The flake must contain an output named - nixosConfigurations.name. - - - - - - - - - - If this option is provided, do not copy the current - nixos channel to the target host. Instead, use the - specified derivation. - - - - - - - - - - Add a path to the Nix expression search path. This option may be given - multiple times. See the NIX_PATH environment variable for information on - the semantics of the Nix search path. Paths added through - -I take precedence over NIX_PATH. - - - - - - - - - - - - - Sets the maximum number of build jobs that Nix will perform in parallel - to the specified number. The default is 1. A higher - value is useful on SMP systems or to exploit I/O latency. - - - - - - - - - - Sets the value of the NIX_BUILD_CORES environment variable - in the invocation of builders. Builders can use this variable at their - discretion to control the maximum amount of parallelism. For instance, in - Nixpkgs, if the derivation attribute - enableParallelBuilding is set to - true, the builder passes the - flag to GNU Make. The - value 0 means that the builder should use all - available CPU cores in the system. - - - - - - name value - - - - Set the Nix configuration option name to - value. - - - - - - - - - - Causes Nix to print out a stack trace in case of Nix expression - evaluation errors. - - - - - - - - - - Causes Nix to continue building derivations as far as possible - in the face of failed builds. - - - - - - - - - - Synonym for man nixos-install. - - - - - - - Examples - - A typical NixOS installation is done by creating and mounting a file system - on /mnt, generating a NixOS configuration in - /mnt/etc/nixos/configuration.nix, and running - nixos-install. For instance, if we want to install NixOS - on an ext4 file system created in - /dev/sda1: - -$ mkfs.ext4 /dev/sda1 -$ mount /dev/sda1 /mnt -$ nixos-generate-config --root /mnt -$ # edit /mnt/etc/nixos/configuration.nix -$ nixos-install -$ reboot - - - - diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml deleted file mode 100644 index b921386d0df0..000000000000 --- a/nixos/doc/manual/man-nixos-option.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - nixos-option - 8 - NixOS - - - - nixos-option - inspect a NixOS configuration - - - - nixos-option - - - - - - - - - - path - - - - option.name - - - - - Description - - This command evaluates the configuration specified in - /etc/nixos/configuration.nix and returns the properties - of the option name given as argument. - - - When the option name is not an option, the command prints the list of - attributes contained in the attribute set. - - - - Options - - This command accepts the following options: - - - - - - - - Print all the values at or below the specified path recursively. - - - - - - path - - - - This option is passed to the underlying - nix-instantiate invocation. - - - - - - - Environment - - - - NIXOS_CONFIG - - - - Path to the main NixOS configuration module. Defaults to - /etc/nixos/configuration.nix. - - - - - - - Examples - - Investigate option values: -$ nixos-option boot.loader -This attribute set contains: -generationsDir -grub -initScript - -$ nixos-option boot.loader.grub.enable -Value: -true - -Default: -true - -Description: -Whether to enable the GNU GRUB boot loader. - -Declared by: - "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix" - -Defined by: - "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix" - - - - - Bugs - - The author listed in the following section is wrong. If there is any other - bug, please report to Nicolas Pierron. - - - - See also - - - configuration.nix - 5 - - - - diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml deleted file mode 100644 index ea96f49fa977..000000000000 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ /dev/null @@ -1,716 +0,0 @@ - - - nixos-rebuild - 8 - NixOS - - - - - nixos-rebuild - reconfigure a NixOS machine - - - - - nixos-rebuild - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - builder-spec - - - - - - flake-uri - - - - - - - - input-name flake-uri - - - - - - - - - - - - - - name - - - - - - host - - - - host - - - - - - - - - - - - - - path - - - - - - - - - - - - - - - - - - number - - - - - - - - - - - - - - - - - - Description - - - This command updates the system so that it corresponds to the - configuration specified in - /etc/nixos/configuration.nix or - /etc/nixos/flake.nix. Thus, every time you - modify the configuration or any other NixOS module, you must run - nixos-rebuild to make the changes take - effect. It builds the new system in - /nix/store, runs its activation script, and - stop and (re)starts any system services if needed. Please note that - user services need to be started manually as they aren't detected - by the activation script at the moment. - - - - This command has one required argument, which specifies the desired - operation. It must be one of the following: - - - - - - - - - Build and activate the new configuration, and make it the boot default. - That is, the configuration is added to the GRUB boot menu as the default - menu entry, so that subsequent reboots will boot the system into the new - configuration. Previous configurations activated with - nixos-rebuild switch or nixos-rebuild - boot remain available in the GRUB menu. - - - - - - - - - - - Build the new configuration and make it the boot default (as with - nixos-rebuild switch), but do not activate it. That - is, the system continues to run the previous configuration until the - next reboot. - - - - - - - - - - - Build and activate the new configuration, but do not add it to the GRUB - boot menu. Thus, if you reboot the system (or if it crashes), you will - automatically revert to the default configuration (i.e. the - configuration resulting from the last call to nixos-rebuild - switch or nixos-rebuild boot). - - - - - - - - - - - Build the new configuration, but neither activate it nor add it to the - GRUB boot menu. It leaves a symlink named result in - the current directory, which points to the output of the top-level - “system” derivation. This is essentially the same as doing - -$ nix-build /path/to/nixpkgs/nixos -A system - - Note that you do not need to be root to run - nixos-rebuild build. - - - - - - - - - - - Show what store paths would be built or downloaded by any of the - operations above, but otherwise do nothing. - - - - - - - - - - - Build the new configuration, but instead of activating it, show what - changes would be performed by the activation (i.e. by - nixos-rebuild test). For instance, this command will - print which systemd units would be restarted. The list of changes is not - guaranteed to be complete. - - - - - - - - - - - Opens configuration.nix in the default editor. - - - - - - - - - - - Build a script that starts a NixOS virtual machine with the desired - configuration. It leaves a symlink result in the - current directory that points (under - result/bin/run-hostname-vm) - at the script that starts the VM. Thus, to test a NixOS configuration in - a virtual machine, you should do the following: - -$ nixos-rebuild build-vm -$ ./result/bin/run-*-vm - - - - - The VM is implemented using the qemu package. For - best performance, you should load the kvm-intel or - kvm-amd kernel modules to get hardware - virtualisation. - - - - The VM mounts the Nix store of the host through the 9P file system. The - host Nix store is read-only, so Nix commands that modify the Nix store - will not work in the VM. This includes commands such as - nixos-rebuild; to change the VM’s configuration, - you must halt the VM and re-run the commands above. - - - - The VM has its own ext3 root file system, which is - automatically created when the VM is first started, and is persistent - across reboots of the VM. It is stored in - ./hostname.qcow2. - - - - - - - - - - - - Like , but boots using the regular boot loader - of your configuration (e.g., GRUB 1 or 2), rather than booting directly - into the kernel and initial ramdisk of the system. This allows you to - test whether the boot loader works correctly. However, it does not - guarantee that your NixOS configuration will boot successfully on the - host hardware (i.e., after running nixos-rebuild - switch), because the hardware and boot loader configuration in - the VM are different. The boot loader is installed on an automatically - generated virtual disk containing a /boot - partition. - - - - - - - - - Options - - This command accepts the following options: - - - - - - - - - - - - - Update the root user's channel named nixos - before rebuilding the system. - - - In addition to the nixos channel, the root - user's channels which have a file named - .update-on-nixos-rebuild in their base - directory will also be updated. - - - Passing updates all of the root - user's channels. - - - - - - - - - - - Causes the boot loader to be (re)installed on the device specified by the - relevant configuration options. - - - - - - - - - - - Normally, nixos-rebuild first builds the - nixUnstable attribute in Nixpkgs, and uses the - resulting instance of the Nix package manager to build the new system - configuration. This is necessary if the NixOS modules use features not - provided by the currently installed version of Nix. This option disables - building a new Nix. - - - - - - - - - - - Equivalent to . This option is - useful if you call nixos-rebuild frequently - (e.g. if you’re hacking on a NixOS module). - - - - - - - - - - - Instead of building a new configuration as specified by - /etc/nixos/configuration.nix, roll back to the - previous configuration. (The previous configuration is defined as the one - before the “current” generation of the Nix profile - /nix/var/nix/profiles/system.) - - - - - - - builder-spec - - - - 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.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 - existing builders specified in /etc/nix/machines can - be ignored: --builders "" for example when they are - not reachable due to network connectivity. - - - - - - - - - - - - - - Instead of using the Nix profile - /nix/var/nix/profiles/system to keep track of the - current and previous system configurations, use - /nix/var/nix/profiles/system-profiles/name. - When you use GRUB 2, for every system profile created with this flag, - NixOS will create a submenu named “NixOS - Profile - 'name'” in GRUB’s boot menu, containing - the current and previous configurations of this profile. - - - For instance, if you want to test a configuration file named - test.nix without affecting the default system - profile, you would do: - -$ nixos-rebuild switch -p test -I nixos-config=./test.nix - - The new configuration will appear in the GRUB 2 submenu “NixOS - - Profile 'test'”. - - - - - - - - - - - Instead of building the new configuration locally, use the specified host - to perform the build. The host needs to be accessible with ssh, and must - be able to perform Nix builds. If the option - is not set, the build will be copied back - to the local machine when done. - - - Note that, if is not specified, Nix will - be built both locally and remotely. This is because the configuration - will always be evaluated locally even though the building might be - performed remotely. - - - You can include a remote user name in the host name - (user@host). You can also set ssh options by - defining the NIX_SSHOPTS environment variable. - - - - - - - - - - - Specifies the NixOS target host. By setting this to something other than - localhost, the system activation will happen - on the remote host instead of the local machine. The remote host needs to - be accessible over ssh, and for the commands , - and you need root access. - - - - If is not explicitly specified, building - will take place locally. - - - - You can include a remote user name in the host name - (user@host). You can also set ssh options by - defining the NIX_SSHOPTS environment variable. - - - - Note that nixos-rebuild honors the - nixpkgs.crossSystem setting of the given configuration - but disregards the true architecture of the target host. Hence the - nixpkgs.crossSystem setting has to match the target - platform or else activation will fail. - - - - - - - - - - - When set, nixos-rebuild will add - to each invocation of nix-copy-closure. This will only affect the - behavior of nixos-rebuild if or - is also set. This is useful when - the target-host connection to cache.nixos.org is faster than the - connection between hosts. - - - - - - - - - - - When set, nixos-rebuild prefixes remote commands that run on - the and - systems with sudo. Setting this option allows - deploying as a non-root user. - - - - - - - flake-uri#name - - - - Build the NixOS system from the specified flake. It defaults to - the directory containing the target of the symlink - /etc/nixos/flake.nix, if it exists. The - flake must contain an output named - nixosConfigurations.name. If - name is omitted, it default to the - current host name. - - - - - - - - - - - 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. - - - - - - - - In addition, nixos-rebuild accepts various Nix-related - flags, including / , - , , - , , and / - . See the Nix manual for details. - - - - - Environment - - - - - NIXOS_CONFIG - - - - Path to the main NixOS configuration module. Defaults to - /etc/nixos/configuration.nix. - - - - - - - NIX_SSHOPTS - - - - Additional options to be passed to ssh on the command - line. - - - - - - - - Files - - - - - - /etc/nixos/flake.nix - - - - If this file exists, then nixos-rebuild will - use it as if the option was given. This - file may be a symlink to a flake.nix in an - actual flake; thus /etc/nixos need not be a - flake. - - - - - - - /run/current-system - - - - A symlink to the currently active system configuration in the Nix store. - - - - - - - /nix/var/nix/profiles/system - - - - The Nix profile that contains the current and previous system - configurations. Used to generate the GRUB boot menu. - - - - - - - - - Bugs - - This command should be renamed to something more descriptive. - - - diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml deleted file mode 100644 index fae25721e394..000000000000 --- a/nixos/doc/manual/man-nixos-version.xml +++ /dev/null @@ -1,137 +0,0 @@ - - - nixos-version - 8 - NixOS - - - nixos-version - show the NixOS version - - - - nixos-version - - - - - - - - - - - - - - - - - Description - - This command shows the version of the currently active NixOS configuration. - For example: -$ nixos-version -16.03.1011.6317da4 (Emu) - - The version consists of the following elements: - - - - 16.03 - - - - The NixOS release, indicating the year and month in which it was - released (e.g. March 2016). - - - - - - 1011 - - - - The number of commits in the Nixpkgs Git repository between the start of - the release branch and the commit from which this version was built. - This ensures that NixOS versions are monotonically increasing. It is - git when the current NixOS configuration was built - from a checkout of the Nixpkgs Git repository rather than from a NixOS - channel. - - - - - - 6317da4 - - - - The first 7 characters of the commit in the Nixpkgs Git repository from - which this version was built. - - - - - - Emu - - - - The code name of the NixOS release. The first letter of the code name - indicates that this is the N'th stable NixOS release; for example, Emu - is the fifth release. - - - - - - - - - Options - - - This command accepts the following options: - - - - - - - - - - - - - - Show the full SHA1 hash of the Git commit from which this configuration - was built, e.g. -$ nixos-version --hash -6317da40006f6bc2480c6781999c52d88dde2acf - - - - - - - - - - - - Print a JSON representation of the versions of NixOS and the - top-level configuration flake. - - - - - - - - - diff --git a/nixos/doc/manual/man-pages.xml b/nixos/doc/manual/man-pages.xml index 58f73521e94f..0186221bddce 100644 --- a/nixos/doc/manual/man-pages.xml +++ b/nixos/doc/manual/man-pages.xml @@ -15,11 +15,4 @@ - - - - - - - diff --git a/nixos/doc/manual/manpages/README.md b/nixos/doc/manual/manpages/README.md new file mode 100644 index 000000000000..ed2682e5332d --- /dev/null +++ b/nixos/doc/manual/manpages/README.md @@ -0,0 +1,55 @@ +# NixOS manpages + +This is the collection of NixOS manpages, excluding `configuration.nix(5)`. + +Man pages are written in [`mdoc(7)` format](https://mandoc.bsd.lv/man/mdoc.7.html) and should be portable between mandoc and groff for rendering (though minor differences may occur, mandoc and groff seem to have slightly different spacing rules.) + +Being written in `mdoc` these manpages use semantic markup. This file provides a guideline on where to apply which of the semantic elements of `mdoc`. + +### Command lines and arguments + +In any manpage, commands, flags and arguments to the *current* executable should be marked according to their semantics. Commands, flags and arguments passed to *other* executables should not be marked like this and should instead be considered as code examples and marked with `Ql`. + + - Use `Fl` to mark flag arguments, `Ar` for their arguments. + - Repeating arguments should be marked by adding ellipses (`...`). + - Use `Cm` to mark literal string arguments, e.g. the `boot` command argument passed to `nixos-rebuild`. + - Optional flags or arguments should be marked with `Op`. This includes optional repeating arguments. + - Required flags or arguments should not be marked. + - Mutually exclusive groups of arguments should be enclosed in curly brackets, preferrably created with `Bro`/`Brc` blocks. + +When an argument is used in an example it should be marked up with `Ar` again to differentiate it from a constant. For example, a command with a `--host name` flag that calls ssh to retrieve the host's local time would signify this thusly: +``` +This will run +.Ic ssh Ar name Ic time +to retrieve the remote time. +``` + +### Paths, NixOS options, environment variables + +Constant paths should be marked with `Pa`, NixOS options with `Va`, and environment variables with `Ev`. + +Generated paths, e.g. `result/bin/run-hostname-vm` (where `hostname` is a variable or arguments) should be marked as `Ql` inline literals with their variable components marked appropriately. + + - Taking `hostname` from an argument become `.Ql result/bin/run- Ns Ar hostname Ns -vm` + - Taking `hostname` from a variable otherwise defined becomes `.Ql result/bin/run- Ns Va hostname Ns -vm` + +### Code examples and other commands + +In free text names and complete invocations of other commands (e.g. `ssh` or `tar -xvf src.tar`) should be marked with `Ic`, fragments of command lines should be marked with `Ql`. + +Larger code blocks or those that cannot be shown inline should use indented literal display block markup for their contents, i.e. +``` +.Bd -literal -offset indent +... +.Ed +``` +Contents of code blocks may be marked up further, e.g. if they refer to arguments that will be subsituted into them: +``` +.Bd -literal -offset indent +{ + options.hostname = "\c +.Ar hostname Ns \c +"; +} +.Ed +``` diff --git a/nixos/doc/manual/manpages/nixos-build-vms.8 b/nixos/doc/manual/manpages/nixos-build-vms.8 new file mode 100644 index 000000000000..abf06b5dd596 --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-build-vms.8 @@ -0,0 +1,109 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-build-vms \&8 "NixOS System Manager's Manual" +.el .Dt nixos-build-vms 8 +.Os NixOS +.Sh NAME +.Nm nixos-build-vms +.Nd build a network of virtual machines from a network of NixOS configurations +. +. +. +.Sh SYNOPSIS +.Nm nixos-build-vms +.Op Fl -show-trace +.Op Fl -no-out-link +.Op Fl -help +.Op Fl -option Ar name value +.Pa network.nix +. +. +. +.Sh DESCRIPTION +. +This command builds a network of QEMU\-KVM virtual machines of a Nix expression +specifying a network of NixOS machines. The virtual network can be started by +executing the +.Pa bin/run-vms +shell script that is generated by this command. By default, a +.Pa result +symlink is produced that points to the generated virtual network. +. +.Pp +A network Nix expression has the following structure: +.Bd -literal -offset indent +{ + test1 = {pkgs, config, ...}: + { + services.openssh.enable = true; + nixpkgs.localSystem.system = "i686-linux"; + deployment.targetHost = "test1.example.net"; + + # Other NixOS options + }; + + test2 = {pkgs, config, ...}: + { + services.openssh.enable = true; + services.httpd.enable = true; + environment.systemPackages = [ pkgs.lynx ]; + nixpkgs.localSystem.system = "x86_64-linux"; + deployment.targetHost = "test2.example.net"; + + # Other NixOS options + }; +} +.Ed +. +.Pp +Each attribute in the expression represents a machine in the network +.Ns (e.g. +.Va test1 +and +.Va test2 Ns +) referring to a function defining a NixOS configuration. In each NixOS +configuration, two attributes have a special meaning. The +.Va deployment.targetHost +specifies the address (domain name or IP address) of the system which is used by +.Ic ssh +to perform remote deployment operations. The +.Va nixpkgs.localSystem.system +attribute can be used to specify an architecture for the target machine, such as +.Ql i686-linux +which builds a 32-bit NixOS configuration. Omitting this property will build the +configuration for the same architecture as the host system. +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl -show-trace +Shows a trace of the output. +. +.It Fl -no-out-link +Do not create a +.Pa result +symlink. +. +.It Fl h , -help +Shows the usage of this command to the user. +. +.It Fl -option Ar name Va value +Set the Nix configuration option +.Va name +to +.Va value Ns +\&. This overrides settings in the Nix configuration file (see +.Xr nix.conf 5 Ns +). +.El +. +. +. +.Sh AUTHORS +.An -nosplit +.An Eelco Dolstra +and +.An the Nixpkgs/NixOS contributors diff --git a/nixos/doc/manual/manpages/nixos-enter.8 b/nixos/doc/manual/manpages/nixos-enter.8 new file mode 100644 index 000000000000..bc8df31e5f2d --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-enter.8 @@ -0,0 +1,76 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-enter \&8 "NixOS System Manager's Manual" +.el .Dt nixos-enter 8 +.Os NixOS +.Sh NAME +.Nm nixos-enter +.Nd run a command in a NixOS chroot environment +. +. +. +.Sh SYNOPSIS +.Nm nixos-enter +.Op Fl -root Ar root +.Op Fl -system Ar system +.Op Fl -command | c Ar shell-command +.Op Fl -silent +.Op Fl -help +.Op Fl - Ar arguments ... +. +. +. +.Sh DESCRIPTION +This command runs a command in a NixOS chroot environment, that is, in a filesystem hierarchy previously prepared using +.Xr nixos-install 8 . +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl -root Ar root +The path to the NixOS system you want to enter. It defaults to +.Pa /mnt Ns +\&. +.It Fl -system Ar system +The NixOS system configuration to use. It defaults to +.Pa /nix/var/nix/profiles/system Ns +\&. You can enter a previous NixOS configuration by specifying a path such as +.Pa /nix/var/nix/profiles/system-106-link Ns +\&. +. +.It Fl -command Ar shell-command , Fl c Ar shell-command +The bash command to execute. +. +.It Fl -silent +Suppresses all output from the activation script of the target system. +. +.It Fl - +Interpret the remaining arguments as the program name and arguments to be invoked. +The program is not executed in a shell. +.El +. +. +. +.Sh EXAMPLES +.Bl -tag -width indent +.It Ic nixos-enter --root /mnt +Start an interactive shell in the NixOS installation in +.Pa /mnt Ns . +. +.It Ic nixos-enter -c 'ls -l /; cat /proc/mounts' +Run a shell command. +. +.It Ic nixos-enter -- cat /proc/mounts +Run a non-shell command. +.El +. +. +. +.Sh AUTHORS +.An -nosplit +.An Eelco Dolstra +and +.An the Nixpkgs/NixOS contributors diff --git a/nixos/doc/manual/manpages/nixos-generate-config.8 b/nixos/doc/manual/manpages/nixos-generate-config.8 new file mode 100644 index 000000000000..8b9bb4d42483 --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-generate-config.8 @@ -0,0 +1,169 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-generate-config \&8 "NixOS System Manager's Manual" +.el .Dt nixos-generate-config 8 +.Os NixOS +.Sh NAME +.Nm nixos-generate-config +.Nd generate NixOS configuration modules +. +. +. +.Sh SYNOPSIS +.Nm nixos-generate-config +.Op Fl -force +.Op Fl -root Ar root +.Op Fl -dir Ar dir +. +. +. +.Sh DESCRIPTION +This command writes two NixOS configuration modules: +.Bl -tag -width indent +.It Pa /etc/nixos/hardware-configuration.nix +This module sets NixOS configuration options based on your current hardware +configuration. In particular, it sets the +.Va fileSystem +option to reflect all currently mounted file systems, the +.Va swapDevices +option to reflect active swap devices, and the +.Va boot.initrd.* +options to ensure that the initial ramdisk contains any kernel modules necessary +for mounting the root file system. +.Pp +If this file already exists, it is overwritten. Thus, you should not modify it +manually. Rather, you should include it from your +.Pa /etc/nixos/configuration.nix Ns +, and re-run +.Nm +to update it whenever your hardware configuration changes. +. +.It Pa /etc/nixos/configuration.nix +This is the main NixOS system configuration module. If it already exists, it’s +left unchanged. Otherwise, +.Nm +will write a template for you to customise. +.El +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl -root Ar root +If this option is given, treat the directory +.Ar root +as the root of the file system. This means that configuration files will be written to +.Ql Ar root Ns /etc/nixos Ns +, and that any file systems outside of +.Ar root +are ignored for the purpose of generating the +.Va fileSystems +option. +. +.It Fl -dir Ar dir +If this option is given, write the configuration files to the directory +.Ar dir +instead of +.Pa /etc/nixos Ns +\&. +. +.It Fl -force +Overwrite +.Pa /etc/nixos/configuration.nix +if it already exists. +. +.It Fl -no-filesystems +Omit everything concerning file systems and swap devices from the hardware configuration. +. +.It Fl -show-hardware-config +Don't generate +.Pa configuration.nix +or +.Pa hardware-configuration.nix +and print the hardware configuration to stdout only. +.El +. +. +. +.Sh EXAMPLES +This command is typically used during NixOS installation to write initial +configuration modules. For example, if you created and mounted the target file +systems on +.Pa /mnt +and +.Pa /mnt/boot Ns +, you would run: +.Bd -literal -offset indent +$ nixos-generate-config --root /mnt +.Ed +. +.Pp +The resulting file +.Pa /mnt/etc/nixos/hardware-configuration.nix +might look like this: +.Bd -literal -offset indent +# Do not modify this file! It was generated by 'nixos-generate-config' +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, pkgs, ... }: + +{ + imports = + [ + ]; + + boot.initrd.availableKernelModules = [ "ehci_hcd" "ahci" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-label/nixos"; + fsType = "ext3"; + options = [ "rw" "data=ordered" "relatime" ]; + }; + + fileSystems."/boot" = + { device = "/dev/sda1"; + fsType = "ext3"; + options = [ "rw" "errors=continue" "user_xattr" "acl" "barrier=1" "data=writeback" "relatime" ]; + }; + + swapDevices = + [ { device = "/dev/sda2"; } + ]; + + nix.maxJobs = 8; +} +.Ed +. +.Pp +It will also create a basic +.Pa /mnt/etc/nixos/configuration.nix Ns +, which you should edit to customise the logical configuration of your system. \ +This file includes the result of the hardware scan as follows: +.Bd -literal -offset indent +imports = [ ./hardware-configuration.nix ]; +.Ed +. +.Pp +After installation, if your hardware configuration changes, you can run: +.Bd -literal -offset indent +$ nixos-generate-config +.Ed +. +.Pp +to update +.Pa /etc/nixos/hardware-configuration.nix Ns +\&. Your +.Pa /etc/nixos/configuration.nix +will +.Em not +be overwritten. +. +.Sh AUTHORS +.An -nosplit +.An Eelco Dolstra +and +.An the Nixpkgs/NixOS contributors diff --git a/nixos/doc/manual/manpages/nixos-install.8 b/nixos/doc/manual/manpages/nixos-install.8 new file mode 100644 index 000000000000..dc0a5da275d8 --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-install.8 @@ -0,0 +1,195 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-install \&8 "NixOS System Manager's Manual" +.el .Dt nixos-install 8 +.Os NixOS +.Sh NAME +.Nm nixos-install +.Nd install bootloader and NixOS +. +. +. +.Sh SYNOPSIS +.Nm nixos-install +.Op Fl -verbose | v +.Op Fl I Ar path +.Op Fl -root Ar root +.Op Fl -system Ar path +.Op Fl -flake Ar flake-uri +.Op Fl -impure +.Op Fl -channel Ar channel +.Op Fl -no-channel-copy +.Op Fl -no-root-password | -no-root-passwd +.Op Fl -no-bootloader +.Op Fl -max-jobs | j Ar number +.Op Fl -cores Ar number +.Op Fl -option Ar name value +.Op Fl -show-trace +.Op Fl -keep-going +.Op Fl -help +. +. +. +.Sh DESCRIPTION +This command installs NixOS in the file system mounted on +.Pa /mnt Ns +, based on the NixOS configuration specified in +.Pa /mnt/etc/nixos/configuration.nix Ns +\&. It performs the following steps: +. +.Bl -enum +.It +It copies Nix and its dependencies to +.Pa /mnt/nix/store Ns +\&. +. +.It +It runs Nix in +.Pa /mnt +to build the NixOS configuration specified in +.Pa /mnt/etc/nixos/configuration.nix Ns +\&. +. +.It +It installs the current channel +.Dq nixos +in the target channel profile (unless +.Fl -no-channel-copy +is specified). +. +.It +It installs the GRUB boot loader on the device specified in the option +.Va boot.loader.grub.device +(unless +.Fl -no-bootloader +is specified), and generates a GRUB configuration file that boots into the NixOS +configuration just installed. +. +.It +It prompts you for a password for the root account (unless +.Fl -no-root-password +is specified). +.El +. +.Pp +This command is idempotent: if it is interrupted or fails due to a temporary +problem (e.g. a network issue), you can safely re-run it. +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl -verbose , v +Increases the level of verbosity of diagnostic messages printed on standard +error. For each Nix operation, the information printed on standard output is +well-defined; any diagnostic information is printed on standard error, never on +standard output. +.Pp +Please note that this option may be specified repeatedly. +. +.It Fl -root Ar root +Defaults to +.Pa /mnt Ns +\&. If this option is given, treat the directory +.Ar root +as the root of the NixOS installation. +. +.It Fl -system Ar path +If this option is provided, +.Nm +will install the specified closure rather than attempt to build one from +.Pa /mnt/etc/nixos/configuration.nix Ns +\&. +.Pp +The closure must be an appropriately configured NixOS system, with boot loader +and partition configuration that fits the target host. Such a closure is +typically obtained with a command such as +.Ic nix-build -I nixos-config=./configuration.nix '' -A system --no-out-link Ns +\&. +. +.It Fl -flake Ar flake-uri Ns # Ns Ar name +Build the NixOS system from the specified flake. The flake must contain an +output named +.Ql nixosConfigurations. Ns Ar name Ns +\&. +. +.It Fl -channel Ar channel +If this option is provided, do not copy the current +.Dq nixos +channel to the target host. Instead, use the specified derivation. +. +.It Fl I Ar Path +Add a path to the Nix expression search path. This option may be given multiple +times. See the +.Ev NIX_PATH +environment variable for information on the semantics of the Nix search path. Paths added through +.Fl I +take precedence over +.Ev NIX_PATH Ns +\&. +. +.It Fl -max-jobs , j Ar number +Sets the maximum number of build jobs that Nix will perform in parallel to the +specified number. The default is 1. A higher value is useful on SMP systems or +to exploit I/O latency. +. +.It Fl -cores Ar N +Sets the value of the +.Ev NIX_BUILD_CORES +environment variable in the invocation of builders. Builders can use this +variable at their discretion to control the maximum amount of parallelism. For +instance, in Nixpkgs, if the derivation attribute +.Va enableParallelBuilding +is set to true, the builder passes the +.Fl j Ns Va N +flag to GNU Make. The value 0 means that the builder should use all available CPU cores in the system. +. +.It Fl -option Ar name value +Set the Nix configuration option +.Ar name +to +.Ar value Ns +\&. +. +.It Fl -show-trace +Causes Nix to print out a stack trace in case of Nix expression evaluation errors. +. +.It Fl -keep-going +Causes Nix to continue building derivations as far as possible in the face of failed builds. +. +.It Fl -help +Synonym for +.Ic man nixos-install Ns +\&. +.El +. +. +. +.Sh EXAMPLES +A typical NixOS installation is done by creating and mounting a file system on +.Pa /mnt Ns +, generating a NixOS configuration in +.Pa /mnt/etc/nixos/configuration.nix Ns +, and running +.Nm Ns +\&. For instance, if we want to install NixOS on an ext4 file system created in +.Pa /dev/sda1 Ns +: +.Bd -literal -offset indent +$ mkfs.ext4 /dev/sda1 +$ mount /dev/sda1 /mnt +$ nixos-generate-config --root /mnt +$ # edit /mnt/etc/nixos/configuration.nix +$ nixos-install +$ reboot +.Ed +. +. +. +.Sh AUTHORS +.An -nosplit +.An Eelco Dolstra +and +.An the Nixpkgs/NixOS contributors diff --git a/nixos/doc/manual/manpages/nixos-option.8 b/nixos/doc/manual/manpages/nixos-option.8 new file mode 100644 index 000000000000..79cc113cfaf2 --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-option.8 @@ -0,0 +1,93 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-option \&8 "NixOS System Manager's Manual" +.el .Dt nixos-option 8 +.Os NixOS +.Sh NAME +.Nm nixos-option +.Nd inspect a NixOS configuration +. +. +. +.Sh SYNOPSIS +.Nm +.Op Fl r | -recursive +.Op Fl I Ar path +.Ar option.name +. +. +. +.Sh DESCRIPTION +This command evaluates the configuration specified in +.Pa /etc/nixos/configuration.nix +and returns the properties of the option name given as argument. +. +.Pp +When the option name is not an option, the command prints the list of attributes +contained in the attribute set. +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl r , -recursive +Print all the values at or below the specified path recursively. +. +.It Fl I Ar path +This option is passed to the underlying +.Xr nix-instantiate 1 +invocation. +.El +. +. +. +.Sh ENVIRONMENT +.Bl -tag -width indent +.It Ev NIXOS_CONFIG +Path to the main NixOS configuration module. Defaults to +.Pa /etc/nixos/configuration.nix Ns +\&. +.El +. +. +. +.Sh EXAMPLES +Investigate option values: +.Bd -literal -offset indent +$ nixos-option boot.loader +This attribute set contains: +generationsDir +grub +initScript + +$ nixos-option boot.loader.grub.enable +Value: +true + +Default: +true + +Description: +Whether to enable the GNU GRUB boot loader. + +Declared by: + "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix" + +Defined by: + "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix" +.Ed +. +. +. +.Sh SEE ALSO +.Xr configuration.nix 5 +. +. +. +.Sh AUTHORS +.An -nosplit +.An Nicolas Pierron +and +.An the Nixpkgs/NixOS contributors diff --git a/nixos/doc/manual/manpages/nixos-rebuild.8 b/nixos/doc/manual/manpages/nixos-rebuild.8 new file mode 100644 index 000000000000..8ff59d6da9cf --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-rebuild.8 @@ -0,0 +1,456 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-rebuild \&8 "NixOS System Manager's Manual" +.el .Dt nixos-rebuild 8 +.Os NixOS +.Sh NAME +.Nm nixos-rebuild +.Nd reconfigure a NixOS machine +. +. +. +.Sh SYNOPSIS +.Nm +.Bro +.Cm switch | boot | test | build | dry-build | dry-activate | edit | build-vm | build-vm-with-bootloader +.Brc +.br +.Op Fl -upgrade | -upgrade-all +.Op Fl -install-bootloader +.Op Fl -no-build-nix +.Op Fl -fast +.Op Fl -rollback +.Op Fl -builders Ar builder-spec +.br +.Op Fl -flake Ar flake-uri +.Op Fl -no-flake +.Op Fl -override-input Ar input-name flake-uri +.br +.Op Fl -profile-name | p Ar name +.Op Fl -specialisation | c Ar name +.br +.Op Fl -build-host Va host +.Op Fl -target-host Va host +.Op Fl -use-remote-sudo +.br +.Op Fl -show-trace +.Op Fl I Va NIX_PATH +.Op Fl -verbose | v +.Op Fl -impure +.Op Fl -max-jobs | j Va number +.Op Fl -keep-failed | K +.Op Fl -keep-going | k +. +. +. +.Sh DESCRIPTION +This command updates the system so that it corresponds to the +configuration specified in +.Pa /etc/nixos/configuration.nix +or +.Pa /etc/nixos/flake.nix Ns +\&. Thus, every time you modify the configuration or any other NixOS module, you +must run +.Nm +to make the changes take effect. It builds the new system in +.Pa /nix/store Ns +, runs its activation script, and stop and (re)starts any system services if +needed. Please note that user services need to be started manually as they +aren't detected by the activation script at the moment. +. +.Pp +This command has one required argument, which specifies the desired +operation. It must be one of the following: +.Bl -tag -width indent +.It Cm switch +Build and activate the new configuration, and make it the boot default. That +is, the configuration is added to the GRUB boot menu as the default +menu entry, so that subsequent reboots will boot the system into the new +configuration. Previous configurations activated with +.Ic nixos-rebuild switch +or +.Ic nixos-rebuild boot +remain available in the GRUB menu. +.Pp +Note that if you are using specializations, running just +.Ic nixos-rebuild switch +will switch you back to the unspecialized, base system \(em in that case, you +might want to use this instead: +.Bd -literal -offset indent +$ nixos-rebuild switch --specialisation your-specialisation-name +.Ed +.Pp +This command will build all specialisations and make them bootable just +like regular +.Ic nixos-rebuild switch +does \(em the only thing different is that it will switch to given +specialisation instead of the base system; it can be also used to switch from +the base system into a specialised one, or to switch between specialisations. +. +.It Cm boot +Build the new configuration and make it the boot default (as with +.Ic nixos-rebuild switch Ns +), but do not activate it. That is, the system continues to run the previous +configuration until the next reboot. +. +.It Cm test +Build and activate the new configuration, but do not add it to the GRUB +boot menu. Thus, if you reboot the system (or if it crashes), you will +automatically revert to the default configuration (i.e. the +configuration resulting from the last call to +.Ic nixos-rebuild switch +or +.Ic nixos-rebuild boot Ns +). +.Pp +Note that if you are using specialisations, running just +.Ic nixos-rebuild test +will activate the unspecialised, base system \(em in that case, you might want +to use this instead: +.Bd -literal -offset indent +$ nixos-rebuild test --specialisation your-specialisation-name +.Ed +.Pp +This command can be also used to switch from the base system into a +specialised one, or to switch between specialisations. +. +.It Cm build +Build the new configuration, but neither activate it nor add it to the +GRUB boot menu. It leaves a symlink named +.Pa result +in the current directory, which points to the output of the top-level +.Dq system +derivation. This is essentially the same as doing +.Bd -literal -offset indent +$ nix-build /path/to/nixpkgs/nixos -A system +.Ed +.Pp +Note that you do not need to be root to run +.Ic nixos-rebuild build Ns +\&. +. +.It Cm dry-build +Show what store paths would be built or downloaded by any of the +operations above, but otherwise do nothing. +. +.It Cm dry-activate +Build the new configuration, but instead of activating it, show what +changes would be performed by the activation (i.e. by +.Ic nixos-rebuild test Ns +). For instance, this command will print which systemd units would be restarted. +The list of changes is not guaranteed to be complete. +. +.It Cm edit +Opens +.Pa configuration.nix +in the default editor. +. +.It Cm build-vm +Build a script that starts a NixOS virtual machine with the desired +configuration. It leaves a symlink +.Pa result +in the current directory that points (under +.Ql result/bin/run\- Ns Va hostname Ns \-vm Ns +) +at the script that starts the VM. Thus, to test a NixOS configuration in +a virtual machine, you should do the following: +.Bd -literal -offset indent +$ nixos-rebuild build-vm +$ ./result/bin/run-*-vm +.Ed +.Pp +The VM is implemented using the +.Ql qemu +package. For best performance, you should load the +.Ql kvm-intel +or +.Ql kvm-amd +kernel modules to get hardware virtualisation. +.Pp +The VM mounts the Nix store of the host through the 9P file system. The +host Nix store is read-only, so Nix commands that modify the Nix store +will not work in the VM. This includes commands such as +.Nm Ns +; to change the VM’s configuration, you must halt the VM and re-run the commands +above. +.Pp +The VM has its own ext3 root file system, which is automatically created when +the VM is first started, and is persistent across reboots of the VM. It is +stored in +.Ql ./ Ns Va hostname Ns .qcow2 Ns +\&. +.\" The entire file system hierarchy of the host is available in +.\" the VM under +.\" .Pa /hostfs Ns +.\" . +. +.It Cm build-vm-with-bootloader +Like +.Cm build-vm Ns +, but boots using the regular boot loader of your configuration (e.g. GRUB 1 or +2), rather than booting directly into the kernel and initial ramdisk of the +system. This allows you to test whether the boot loader works correctly. \ +However, it does not guarantee that your NixOS configuration will boot +successfully on the host hardware (i.e., after running +.Ic nixos-rebuild switch Ns +), because the hardware and boot loader configuration in the VM are different. +The boot loader is installed on an automatically generated virtual disk +containing a +.Pa /boot +partition. +.El +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl -upgrade , -upgrade-all +Update the root user's channel named +.Ql nixos +before rebuilding the system. +.Pp +In addition to the +.Ql nixos +channel, the root user's channels which have a file named +.Ql .update-on-nixos-rebuild +in their base directory will also be updated. +.Pp +Passing +.Fl -upgrade-all +updates all of the root user's channels. +. +.It Fl -install-bootloader +Causes the boot loader to be (re)installed on the device specified by the +relevant configuration options. +. +.It Fl -no-build-nix +Normally, +.Nm +first builds the +.Ql nixUnstable +attribute in Nixpkgs, and uses the resulting instance of the Nix package manager +to build the new system configuration. This is necessary if the NixOS modules +use features not provided by the currently installed version of Nix. This option +disables building a new Nix. +. +.It Fl -fast +Equivalent to +.Fl -no-build-nix Ns +\&. This option is useful if you call +.Nm +frequently (e.g. if you’re hacking on a NixOS module). +. +.It Fl -rollback +Instead of building a new configuration as specified by +.Pa /etc/nixos/configuration.nix Ns +, roll back to the previous configuration. (The previous configuration is +defined as the one before the “current” generation of the Nix profile +.Pa /nix/var/nix/profiles/system Ns +\&.) +. +.It Fl -builders Ar builder-spec +Allow ad-hoc remote builders for building the new system. This requires +the user executing +.Nm +(usually root) to be configured as a trusted user in the Nix daemon. This can be +achieved by using the +.Va nix.settings.trusted-users +NixOS option. Examples values for that option are described in the +.Dq Remote builds +chapter in the Nix manual, (i.e. +.Ql --builders \(dqssh://bigbrother x86_64-linux\(dq Ns +). By specifying an empty string existing builders specified in +.Pa /etc/nix/machines +can be ignored: +.Ql --builders \(dq\(dq +for example when they are not reachable due to network connectivity. +. +.It Fl -profile-name Ar name , Fl p Ar name +Instead of using the Nix profile +.Pa /nix/var/nix/profiles/system +to keep track of the current and previous system configurations, use +.Pa /nix/var/nix/profiles/system-profiles/ Ns Va name Ns +\&. When you use GRUB 2, for every system profile created with this flag, NixOS +will create a submenu named +.Dq NixOS - Profile Va name +in GRUB’s boot menu, containing the current and previous configurations of this profile. +.Pp +For instance, if you want to test a configuration file named +.Pa test.nix +without affecting the default system profile, you would do: +.Bd -literal -offset indent +$ nixos-rebuild switch -p test -I nixos-config=./test.nix +.Ed +.Pp +The new configuration will appear in the GRUB 2 submenu +.Dq NixOS - Profile 'test' Ns +\&. +. +.It Fl -specialisation Ar name , Fl c Ar name +Activates given specialisation; when not specified, switching and testing +will activate the base, unspecialised system. +. +.It Fl -build-host Ar host +Instead of building the new configuration locally, use the specified host +to perform the build. The host needs to be accessible with +.Ic ssh Ns , +and must be able to perform Nix builds. If the option +.Fl -target-host +is not set, the build will be copied back to the local machine when done. +.Pp +Note that, if +.Fl -no-build-nix +is not specified, Nix will be built both locally and remotely. This is because +the configuration will always be evaluated locally even though the building +might be performed remotely. +.Pp +You can include a remote user name in the host name +.Ns ( Va user@host Ns +). You can also set ssh options by defining the +.Ev NIX_SSHOPTS +environment variable. +. +.It Fl -target-host Ar host +Specifies the NixOS target host. By setting this to something other than an +empty string, the system activation will happen on the remote host instead of +the local machine. The remote host needs to be accessible over +.Ic ssh Ns , +and for the commands +.Cm switch Ns +, +.Cm boot +and +.Cm test +you need root access. +.Pp +If +.Fl -build-host +is not explicitly specified or empty, building will take place locally. +.Pp +You can include a remote user name in the host name +.Ns ( Va user@host Ns +). You can also set ssh options by defining the +.Ev NIX_SSHOPTS +environment variable. +.Pp +Note that +.Nm +honors the +.Va nixpkgs.crossSystem +setting of the given configuration but disregards the true architecture of the +target host. Hence the +.Va nixpkgs.crossSystem +setting has to match the target platform or else activation will fail. +. +.It Fl -use-substitutes +When set, nixos-rebuild will add +.Fl -use-substitutes +to each invocation of nix-copy-closure. This will only affect the behavior of +nixos-rebuild if +.Fl -target-host +or +.Fl -build-host +is also set. This is useful when the target-host connection to cache.nixos.org +is faster than the connection between hosts. +. +.It Fl -use-remote-sudo +When set, nixos-rebuild prefixes remote commands that run on the +.Fl -build-host +and +.Fl -target-host +systems with +.Ic sudo Ns +\&. Setting this option allows deploying as a non-root user. +. +.It Fl -flake Va flake-uri Ns Op Va #name +Build the NixOS system from the specified flake. It defaults to the directory +containing the target of the symlink +.Pa /etc/nixos/flake.nix Ns +, if it exists. The flake must contain an output named +.Ql nixosConfigurations. Ns Va name Ns +\&. If +.Va name +is omitted, it default to the current host name. +. +.It Fl -no-flake +Do not imply +.Fl -flake +if +.Pa /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. +.El +.Pp +In addition, +.Nm +accepts various Nix-related flags, including +.Fl -max-jobs Ns , +.Fl j Ns , +.Fl I Ns , +.Fl -show-trace Ns , +.Fl -keep-failed Ns , +.Fl -keep-going Ns , +.Fl -impure Ns , +.Fl -verbose Ns , and +.Fl v Ns +\&. See the Nix manual for details. +. +. +. +.Sh ENVIRONMENT +.Bl -tag -width indent +.It Ev NIXOS_CONFIG +Path to the main NixOS configuration module. Defaults to +.Pa /etc/nixos/configuration.nix Ns +\&. +. +.It Ev NIX_PATH +A colon-separated list of directories used to look up Nix expressions enclosed +in angle brackets (e.g. ). Example: +.Bd -literal -offset indent +nixpkgs=./my-nixpkgs +.Ed +. +.It Ev NIX_SSHOPTS +Additional options to be passed to +.Ic ssh +on the command line. +.El +. +. +. +.Sh FILES +.Bl -tag -width indent +.It Pa /etc/nixos/flake.nix +If this file exists, then +.Nm +will use it as if the +.Fl -flake +option was given. This file may be a symlink to a +.Pa flake.nix +in an actual flake; thus +.Pa /etc/nixos +need not be a flake. +. +.It Pa /run/current-system +A symlink to the currently active system configuration in the Nix store. +. +.It Pa /nix/var/nix/profiles/system +The Nix profile that contains the current and previous system +configurations. Used to generate the GRUB boot menu. +.El +. +. +. +.Sh BUGS +This command should be renamed to something more descriptive. +. +. +. +.Sh AUTHORS +.An -nosplit +.An Eelco Dolstra +and +.An the Nixpkgs/NixOS contributors diff --git a/nixos/doc/manual/manpages/nixos-version.8 b/nixos/doc/manual/manpages/nixos-version.8 new file mode 100644 index 000000000000..980ee8b1f49e --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-version.8 @@ -0,0 +1,90 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-version \&8 "NixOS System Manager's Manual" +.el .Dt nixos-version 8 +.Os NixOS +.Sh NAME +.Nm nixos-version +.Nd show the NixOS version +. +. +. +.Sh SYNOPSIS +.Nm nixos-version +.Op Fl -hash +.Op Fl -revision +.Op Fl -configuration-revision +.Op Fl -json +. +. +. +.Sh DESCRIPTION +This command shows the version of the currently active NixOS configuration. For example: +.Bd -literal -offset indent +$ nixos-version +16.03.1011.6317da4 (Emu) +.Ed +. +.Pp +The version consists of the following elements: +.Bl -tag -width indent +.It Ql 16.03 +The NixOS release, indicating the year and month in which it was released +(e.g. March 2016). +.It Ql 1011 +The number of commits in the Nixpkgs Git repository between the start of the +release branch and the commit from which this version was built. This ensures +that NixOS versions are monotonically increasing. It is +.Ql git +when the current NixOS configuration was built from a checkout of the Nixpkgs +Git repository rather than from a NixOS channel. +.It Ql 6317da4 +The first 7 characters of the commit in the Nixpkgs Git repository from which +this version was built. +.It Ql Emu +The code name of the NixOS release. The first letter of the code name indicates +that this is the N'th stable NixOS release; for example, Emu is the fifth +release. +.El +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl -hash , -revision +Show the full SHA1 hash of the Git commit from which this configuration was +built, e.g. +.Bd -literal -offset indent +$ nixos-version --hash +6317da40006f6bc2480c6781999c52d88dde2acf +.Ed +. +.It Fl -configuration-revision +Show the configuration revision if available. This could be the full SHA1 hash +of the Git commit of the system flake, if you add +.Bd -literal -offset indent +{ system.configurationRevision = self.rev or "dirty"; } +.Ed +.Pp +to the +.Ql modules +array of your flake.nix system configuration e.g. +.Bd -literal -offset indent +$ nixos-version --configuration-revision +aa314ebd1592f6cdd53cb5bba8bcae97d9323de8 +.Ed +. +.It Fl -json +Print a JSON representation of the versions of NixOS and the top-level +configuration flake. +.El +. +. +. +.Sh AUTHORS +.An -nosplit +.An Eelco Dolstra +and +.An the Nixpkgs/NixOS contributors diff --git a/nixos/doc/manual/md-to-db.sh b/nixos/doc/manual/md-to-db.sh index beb0ff9f7082..4698e94f508b 100755 --- a/nixos/doc/manual/md-to-db.sh +++ b/nixos/doc/manual/md-to-db.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/tarball/21.11 -i bash -p pandoc +#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/tarball/22.11 -i bash -p pandoc # This script is temporarily needed while we transition the manual to # CommonMark. It converts the .md files in the regular manual folder @@ -8,6 +8,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" pushd "$DIR" +link_manpages_filter=$(nix-build --no-out-link "$DIR/../../../doc/build-aux/pandoc-filters/link-manpages.nix") + # NOTE: Keep in sync with Nixpkgs manual (/doc/Makefile). # TODO: Remove raw-attribute when we can get rid of DocBook altogether. pandoc_commonmark_enabled_extensions=+attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute @@ -17,7 +19,7 @@ pandoc_flags=( # - media extraction (was only required for diagram generator) # - docbook-reader/citerefentry-to-rst-role.lua (only relevant for DocBook → MarkDown/rST/MyST) "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/myst-reader/roles.lua" - "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/link-unix-man-references.lua" + "--lua-filter=$link_manpages_filter" "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua" "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/docbook-writer/html-elements.lua" "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua" diff --git a/nixos/doc/manual/release-notes/rl-1509.section.md b/nixos/doc/manual/release-notes/rl-1509.section.md index 55804ddb988a..1422ae4c299c 100644 --- a/nixos/doc/manual/release-notes/rl-1509.section.md +++ b/nixos/doc/manual/release-notes/rl-1509.section.md @@ -2,7 +2,7 @@ In addition to numerous new and upgraded packages, this release has the following highlights: -- The [Haskell](http://haskell.org/) packages infrastructure has been re-designed from the ground up (\"Haskell NG\"). NixOS now distributes the latest version of every single package registered on [Hackage](http://hackage.haskell.org/) \-- well in excess of 8,000 Haskell packages. Detailed instructions on how to use that infrastructure can be found in the [User\'s Guide to the Haskell Infrastructure](https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure). Users migrating from an earlier release may find helpful information below, in the list of backwards-incompatible changes. Furthermore, we distribute 51(!) additional Haskell package sets that provide every single [LTS Haskell](http://www.stackage.org/) release since version 0.0 as well as the most recent [Stackage Nightly](http://www.stackage.org/) snapshot. The announcement [\"Full Stackage Support in Nixpkgs\"](https://nixos.org/nix-dev/2015-September/018138.html) gives additional details. +- The [Haskell](http://haskell.org/) packages infrastructure has been re-designed from the ground up ("Haskell NG"). NixOS now distributes the latest version of every single package registered on [Hackage](http://hackage.haskell.org/) \-- well in excess of 8,000 Haskell packages. Detailed instructions on how to use that infrastructure can be found in the [User's Guide to the Haskell Infrastructure](https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure). Users migrating from an earlier release may find helpful information below, in the list of backwards-incompatible changes. Furthermore, we distribute 51(!) additional Haskell package sets that provide every single [LTS Haskell](http://www.stackage.org/) release since version 0.0 as well as the most recent [Stackage Nightly](http://www.stackage.org/) snapshot. The announcement ["Full Stackage Support in Nixpkgs"](https://nixos.org/nix-dev/2015-September/018138.html) gives additional details. - Nix has been updated to version 1.10, which among other improvements enables cryptographic signatures on binary caches for improved security. @@ -178,7 +178,7 @@ The new option `system.stateVersion` ensures that certain configuration changes - Nix now requires binary caches to be cryptographically signed. If you have unsigned binary caches that you want to continue to use, you should set `nix.requireSignedBinaryCaches = false`. -- Steam now doesn\'t need root rights to work. Instead of using `*-steam-chrootenv`, you should now just run `steam`. `steamChrootEnv` package was renamed to `steam`, and old `steam` package \-- to `steamOriginal`. +- Steam now doesn't need root rights to work. Instead of using `*-steam-chrootenv`, you should now just run `steam`. `steamChrootEnv` package was renamed to `steam`, and old `steam` package \-- to `steamOriginal`. - CMPlayer has been renamed to bomi upstream. Package `cmplayer` was accordingly renamed to `bomi` @@ -203,7 +203,7 @@ The new option `system.stateVersion` ensures that certain configuration changes } ``` -- \"`nix-env -qa`\" no longer discovers Haskell packages by name. The only packages visible in the global scope are `ghc`, `cabal-install`, and `stack`, but all other packages are hidden. The reason for this inconvenience is the sheer size of the Haskell package set. Name-based lookups are expensive, and most `nix-env -qa` operations would become much slower if we\'d add the entire Hackage database into the top level attribute set. Instead, the list of Haskell packages can be displayed by running: +- "`nix-env -qa`" no longer discovers Haskell packages by name. The only packages visible in the global scope are `ghc`, `cabal-install`, and `stack`, but all other packages are hidden. The reason for this inconvenience is the sheer size of the Haskell package set. Name-based lookups are expensive, and most `nix-env -qa` operations would become much slower if we'd add the entire Hackage database into the top level attribute set. Instead, the list of Haskell packages can be displayed by running: ```ShellSession nix-env -f "" -qaP -A haskellPackages @@ -217,11 +217,11 @@ nix-env -f "" -iA haskellPackages.pandoc Installing Haskell _libraries_ this way, however, is no longer supported. See the next item for more details. -- Previous versions of NixOS came with a feature called `ghc-wrapper`, a small script that allowed GHC to transparently pick up on libraries installed in the user\'s profile. This feature has been deprecated; `ghc-wrapper` was removed from the distribution. The proper way to register Haskell libraries with the compiler now is the `haskellPackages.ghcWithPackages` function. The [User\'s Guide to the Haskell Infrastructure](https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure) provides more information about this subject. +- Previous versions of NixOS came with a feature called `ghc-wrapper`, a small script that allowed GHC to transparently pick up on libraries installed in the user's profile. This feature has been deprecated; `ghc-wrapper` was removed from the distribution. The proper way to register Haskell libraries with the compiler now is the `haskellPackages.ghcWithPackages` function. The [User's Guide to the Haskell Infrastructure](https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure) provides more information about this subject. - All Haskell builds that have been generated with version 1.x of the `cabal2nix` utility are now invalid and need to be re-generated with a current version of `cabal2nix` to function. The most recent version of this tool can be installed by running `nix-env -i cabal2nix`. -- The `haskellPackages` set in Nixpkgs used to have a function attribute called `extension` that users could override in their `~/.nixpkgs/config.nix` files to configure additional attributes, etc. That function still exists, but it\'s now called `overrides`. +- The `haskellPackages` set in Nixpkgs used to have a function attribute called `extension` that users could override in their `~/.nixpkgs/config.nix` files to configure additional attributes, etc. That function still exists, but it's now called `overrides`. - The OpenBLAS library has been updated to version `0.2.14`. Support for the `x86_64-darwin` platform was added. Dynamic architecture detection was enabled; OpenBLAS now selects microarchitecture-optimized routines at runtime, so optimal performance is achieved without the need to rebuild OpenBLAS locally. OpenBLAS has replaced ATLAS in most packages which use an optimized BLAS or LAPACK implementation. @@ -312,7 +312,7 @@ Other notable improvements: - The nixos and nixpkgs channels were unified, so one _can_ use `nix-env -iA nixos.bash` instead of `nix-env -iA nixos.pkgs.bash`. See [the commit](https://github.com/NixOS/nixpkgs/commit/2cd7c1f198) for details. -- Users running an SSH server who worry about the quality of their `/etc/ssh/moduli` file with respect to the [vulnerabilities discovered in the Diffie-Hellman key exchange](https://stribika.github.io/2015/01/04/secure-secure-shell.html) can now replace OpenSSH\'s default version with one they generated themselves using the new `services.openssh.moduliFile` option. +- Users running an SSH server who worry about the quality of their `/etc/ssh/moduli` file with respect to the [vulnerabilities discovered in the Diffie-Hellman key exchange](https://stribika.github.io/2015/01/04/secure-secure-shell.html) can now replace OpenSSH's default version with one they generated themselves using the new `services.openssh.moduliFile` option. - A newly packaged TeX Live 2015 is provided in `pkgs.texlive`, split into 6500 nix packages. For basic user documentation see [the source](https://github.com/NixOS/nixpkgs/blob/release-15.09/pkgs/tools/typesetting/tex/texlive/default.nix#L1). Beware of [an issue](https://github.com/NixOS/nixpkgs/issues/9757) when installing a too large package set. The plan is to deprecate and maybe delete the original TeX packages until the next release. diff --git a/nixos/doc/manual/release-notes/rl-1603.section.md b/nixos/doc/manual/release-notes/rl-1603.section.md index dce879ec16d0..532a16f937b0 100644 --- a/nixos/doc/manual/release-notes/rl-1603.section.md +++ b/nixos/doc/manual/release-notes/rl-1603.section.md @@ -152,19 +152,19 @@ When upgrading from a previous release, please be aware of the following incompa } ``` -- `s3sync` is removed, as it hasn\'t been developed by upstream for 4 years and only runs with ruby 1.8. For an actively-developer alternative look at `tarsnap` and others. +- `s3sync` is removed, as it hasn't been developed by upstream for 4 years and only runs with ruby 1.8. For an actively-developer alternative look at `tarsnap` and others. -- `ruby_1_8` has been removed as it\'s not supported from upstream anymore and probably contains security issues. +- `ruby_1_8` has been removed as it's not supported from upstream anymore and probably contains security issues. - `tidy-html5` package is removed. Upstream only provided `(lib)tidy5` during development, and now they went back to `(lib)tidy` to work as a drop-in replacement of the original package that has been unmaintained for years. You can (still) use the `html-tidy` package, which got updated to a stable release from this new upstream. - `extraDeviceOptions` argument is removed from `bumblebee` package. Instead there are now two separate arguments: `extraNvidiaDeviceOptions` and `extraNouveauDeviceOptions` for setting extra X11 options for nvidia and nouveau drivers, respectively. -- The `Ctrl+Alt+Backspace` key combination no longer kills the X server by default. There\'s a new option `services.xserver.enableCtrlAltBackspace` allowing to enable the combination again. +- The `Ctrl+Alt+Backspace` key combination no longer kills the X server by default. There's a new option `services.xserver.enableCtrlAltBackspace` allowing to enable the combination again. - `emacsPackagesNg` now contains all packages from the ELPA, MELPA, and MELPA Stable repositories. -- Data directory for Postfix MTA server is moved from `/var/postfix` to `/var/lib/postfix`. Old configurations are migrated automatically. `service.postfix` module has also received many improvements, such as correct directories\' access rights, new `aliasFiles` and `mapFiles` options and more. +- Data directory for Postfix MTA server is moved from `/var/postfix` to `/var/lib/postfix`. Old configurations are migrated automatically. `service.postfix` module has also received many improvements, such as correct directories' access rights, new `aliasFiles` and `mapFiles` options and more. - Filesystem options should now be configured as a list of strings, not a comma-separated string. The old style will continue to work, but print a warning, until the 16.09 release. An example of the new style: @@ -180,7 +180,7 @@ When upgrading from a previous release, please be aware of the following incompa - CUPS, installed by `services.printing` module, now has its data directory in `/var/lib/cups`. Old configurations from `/etc/cups` are moved there automatically, but there might be problems. Also configuration options `services.printing.cupsdConf` and `services.printing.cupsdFilesConf` were removed because they had been allowing one to override configuration variables required for CUPS to work at all on NixOS. For most use cases, `services.printing.extraConf` and new option `services.printing.extraFilesConf` should be enough; if you encounter a situation when they are not, please file a bug. - There are also Gutenprint improvements; in particular, a new option `services.printing.gutenprint` is added to enable automatic updating of Gutenprint PPMs; it\'s greatly recommended to enable it instead of adding `gutenprint` to the `drivers` list. + There are also Gutenprint improvements; in particular, a new option `services.printing.gutenprint` is added to enable automatic updating of Gutenprint PPMs; it's greatly recommended to enable it instead of adding `gutenprint` to the `drivers` list. - `services.xserver.vaapiDrivers` has been removed. Use `hardware.opengl.extraPackages{,32}` instead. You can also specify VDPAU drivers there. @@ -202,7 +202,7 @@ When upgrading from a previous release, please be aware of the following incompa } ``` -- `services.udev.extraRules` option now writes rules to `99-local.rules` instead of `10-local.rules`. This makes all the user rules apply after others, so their results wouldn\'t be overriden by anything else. +- `services.udev.extraRules` option now writes rules to `99-local.rules` instead of `10-local.rules`. This makes all the user rules apply after others, so their results wouldn't be overridden by anything else. - Large parts of the `services.gitlab` module has been been rewritten. There are new configuration options available. The `stateDir` option was renamned to `statePath` and the `satellitesDir` option was removed. Please review the currently available options. @@ -246,7 +246,7 @@ When upgrading from a previous release, please be aware of the following incompa you should either re-run `nixos-generate-config` or manually replace `"${config.boot.kernelPackages.broadcom_sta}"` by `config.boot.kernelPackages.broadcom_sta` in your `/etc/nixos/hardware-configuration.nix`. More discussion is on [ the github issue](https://github.com/NixOS/nixpkgs/pull/12595). -- The `services.xserver.startGnuPGAgent` option has been removed. GnuPG 2.1.x changed the way the gpg-agent works, and that new approach no longer requires (or even supports) the \"start everything as a child of the agent\" scheme we\'ve implemented in NixOS for older versions. To configure the gpg-agent for your X session, add the following code to `~/.bashrc` or some file that's sourced when your shell is started: +- The `services.xserver.startGnuPGAgent` option has been removed. GnuPG 2.1.x changed the way the gpg-agent works, and that new approach no longer requires (or even supports) the "start everything as a child of the agent" scheme we've implemented in NixOS for older versions. To configure the gpg-agent for your X session, add the following code to `~/.bashrc` or some file that's sourced when your shell is started: ```shell GPG_TTY=$(tty) @@ -273,7 +273,7 @@ When upgrading from a previous release, please be aware of the following incompa gpg --import ~/.gnupg/secring.gpg ``` - The `gpg-agent(1)` man page has more details about this subject, i.e. in the \"EXAMPLES\" section. + The `gpg-agent(1)` man page has more details about this subject, i.e. in the "EXAMPLES" section. Other notable improvements: diff --git a/nixos/doc/manual/release-notes/rl-1609.section.md b/nixos/doc/manual/release-notes/rl-1609.section.md index 075f0cf52cd1..e9c650cf4072 100644 --- a/nixos/doc/manual/release-notes/rl-1609.section.md +++ b/nixos/doc/manual/release-notes/rl-1609.section.md @@ -20,7 +20,7 @@ When upgrading from a previous release, please be aware of the following incompa - A large number of packages have been converted to use the multiple outputs feature of Nix to greatly reduce the amount of required disk space, as mentioned above. This may require changes to any custom packages to make them build again; see the relevant chapter in the Nixpkgs manual for more information. (Additional caveat to packagers: some packaging conventions related to multiple-output packages [were changed](https://github.com/NixOS/nixpkgs/pull/14766) late (August 2016) in the release cycle and differ from the initial introduction of multiple outputs.) -- Previous versions of Nixpkgs had support for all versions of the LTS Haskell package set. That support has been dropped. The previously provided `haskell.packages.lts-x_y` package sets still exist in name to aviod breaking user code, but these package sets don\'t actually contain the versions mandated by the corresponding LTS release. Instead, our package set it loosely based on the latest available LTS release, i.e. LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will drop those old names entirely. [The motivation for this change](https://nixos.org/nix-dev/2016-June/020585.html) has been discussed at length on the `nix-dev` mailing list and in [Github issue \#14897](https://github.com/NixOS/nixpkgs/issues/14897). Development strategies for Haskell hackers who want to rely on Nix and NixOS have been described in [another nix-dev article](https://nixos.org/nix-dev/2016-June/020642.html). +- Previous versions of Nixpkgs had support for all versions of the LTS Haskell package set. That support has been dropped. The previously provided `haskell.packages.lts-x_y` package sets still exist in name to aviod breaking user code, but these package sets don't actually contain the versions mandated by the corresponding LTS release. Instead, our package set it loosely based on the latest available LTS release, i.e. LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will drop those old names entirely. [The motivation for this change](https://nixos.org/nix-dev/2016-June/020585.html) has been discussed at length on the `nix-dev` mailing list and in [Github issue \#14897](https://github.com/NixOS/nixpkgs/issues/14897). Development strategies for Haskell hackers who want to rely on Nix and NixOS have been described in [another nix-dev article](https://nixos.org/nix-dev/2016-June/020642.html). - Shell aliases for systemd sub-commands [were dropped](https://github.com/NixOS/nixpkgs/pull/15598): `start`, `stop`, `restart`, `status`. @@ -28,7 +28,7 @@ When upgrading from a previous release, please be aware of the following incompa - `/var/empty` is now immutable. Activation script runs `chattr +i` to forbid any modifications inside the folder. See [ the pull request](https://github.com/NixOS/nixpkgs/pull/18365) for what bugs this caused. -- Gitlab\'s maintainance script `gitlab-runner` was removed and split up into the more clearer `gitlab-run` and `gitlab-rake` scripts, because `gitlab-runner` is a component of Gitlab CI. +- Gitlab's maintainance script `gitlab-runner` was removed and split up into the more clearer `gitlab-run` and `gitlab-rake` scripts, because `gitlab-runner` is a component of Gitlab CI. - `services.xserver.libinput.accelProfile` default changed from `flat` to `adaptive`, as per [ official documentation](https://wayland.freedesktop.org/libinput/doc/latest/group__config.html#gad63796972347f318b180e322e35cee79). @@ -38,7 +38,7 @@ When upgrading from a previous release, please be aware of the following incompa - `pkgs.linuxPackages.virtualbox` now contains only the kernel modules instead of the VirtualBox user space binaries. If you want to reference the user space binaries, you have to use the new `pkgs.virtualbox` instead. -- `goPackages` was replaced with separated Go applications in appropriate `nixpkgs` categories. Each Go package uses its own dependency set. There\'s also a new `go2nix` tool introduced to generate a Go package definition from its Go source automatically. +- `goPackages` was replaced with separated Go applications in appropriate `nixpkgs` categories. Each Go package uses its own dependency set. There's also a new `go2nix` tool introduced to generate a Go package definition from its Go source automatically. - `services.mongodb.extraConfig` configuration format was changed to YAML. diff --git a/nixos/doc/manual/release-notes/rl-1703.section.md b/nixos/doc/manual/release-notes/rl-1703.section.md index 7f424f2a6ce3..b82c41e28ca3 100644 --- a/nixos/doc/manual/release-notes/rl-1703.section.md +++ b/nixos/doc/manual/release-notes/rl-1703.section.md @@ -8,7 +8,7 @@ In addition to numerous new and upgraded packages, this release has the followin - This release is based on Glibc 2.25, GCC 5.4.0 and systemd 232. The default Linux kernel is 4.9 and Nix is at 1.11.8. -- The default desktop environment now is KDE\'s Plasma 5. KDE 4 has been removed +- The default desktop environment now is KDE's Plasma 5. KDE 4 has been removed - The setuid wrapper functionality now supports setting capabilities. @@ -208,7 +208,7 @@ When upgrading from a previous release, please be aware of the following incompa - Two lone top-level dict dbs moved into `dictdDBs`. This affects: `dictdWordnet` which is now at `dictdDBs.wordnet` and `dictdWiktionary` which is now at `dictdDBs.wiktionary` -- Parsoid service now uses YAML configuration format. `service.parsoid.interwikis` is now called `service.parsoid.wikis` and is a list of either API URLs or attribute sets as specified in parsoid\'s documentation. +- Parsoid service now uses YAML configuration format. `service.parsoid.interwikis` is now called `service.parsoid.wikis` and is a list of either API URLs or attribute sets as specified in parsoid's documentation. - `Ntpd` was replaced by `systemd-timesyncd` as the default service to synchronize system time with a remote NTP server. The old behavior can be restored by setting `services.ntp.enable` to `true`. Upstream time servers for all NTP implementations are now configured using `networking.timeServers`. @@ -260,11 +260,11 @@ When upgrading from a previous release, please be aware of the following incompa - Autoloading connection tracking helpers is now disabled by default. This default was also changed in the Linux kernel and is considered insecure if not configured properly in your firewall. If you need connection tracking helpers (i.e. for active FTP) please enable `networking.firewall.autoLoadConntrackHelpers` and tune `networking.firewall.connectionTrackingModules` to suit your needs. -- `local_recipient_maps` is not set to empty value by Postfix service. It\'s an insecure default as stated by Postfix documentation. Those who want to retain this setting need to set it via `services.postfix.extraConfig`. +- `local_recipient_maps` is not set to empty value by Postfix service. It's an insecure default as stated by Postfix documentation. Those who want to retain this setting need to set it via `services.postfix.extraConfig`. - Iputils no longer provide ping6 and traceroute6. The functionality of these tools has been integrated into ping and traceroute respectively. To enforce an address family the new flags `-4` and `-6` have been added. One notable incompatibility is that specifying an interface (for link-local IPv6 for instance) is no longer done with the `-I` flag, but by encoding the interface into the address (`ping fe80::1%eth0`). -- The socket handling of the `services.rmilter` module has been fixed and refactored. As rmilter doesn\'t support binding to more than one socket, the options `bindUnixSockets` and `bindInetSockets` have been replaced by `services.rmilter.bindSocket.*`. The default is still a unix socket in `/run/rmilter/rmilter.sock`. Refer to the options documentation for more information. +- The socket handling of the `services.rmilter` module has been fixed and refactored. As rmilter doesn't support binding to more than one socket, the options `bindUnixSockets` and `bindInetSockets` have been replaced by `services.rmilter.bindSocket.*`. The default is still a unix socket in `/run/rmilter/rmilter.sock`. Refer to the options documentation for more information. - The `fetch*` functions no longer support md5, please use sha256 instead. @@ -278,7 +278,7 @@ When upgrading from a previous release, please be aware of the following incompa - Module type system have a new extensible option types feature that allow to extend certain types, such as enum, through multiple option declarations of the same option across multiple modules. -- `jre` now defaults to GTK UI by default. This improves visual consistency and makes Java follow system font style, improving the situation on HighDPI displays. This has a cost of increased closure size; for server and other headless workloads it\'s recommended to use `jre_headless`. +- `jre` now defaults to GTK UI by default. This improves visual consistency and makes Java follow system font style, improving the situation on HighDPI displays. This has a cost of increased closure size; for server and other headless workloads it's recommended to use `jre_headless`. - Python 2.6 interpreter and package set have been removed. diff --git a/nixos/doc/manual/release-notes/rl-1709.section.md b/nixos/doc/manual/release-notes/rl-1709.section.md index e5af22721b0c..9f49549901be 100644 --- a/nixos/doc/manual/release-notes/rl-1709.section.md +++ b/nixos/doc/manual/release-notes/rl-1709.section.md @@ -8,7 +8,7 @@ In addition to numerous new and upgraded packages, this release has the followin - The user handling now keeps track of deallocated UIDs/GIDs. When a user or group is revived, this allows it to be allocated the UID/GID it had before. A consequence is that UIDs and GIDs are no longer reused. -- The module option `services.xserver.xrandrHeads` now causes the first head specified in this list to be set as the primary head. Apart from that, it\'s now possible to also set additional options by using an attribute set, for example: +- The module option `services.xserver.xrandrHeads` now causes the first head specified in this list to be set as the primary head. Apart from that, it's now possible to also set additional options by using an attribute set, for example: ```nix { services.xserver.xrandrHeads = [ @@ -208,7 +208,7 @@ When upgrading from a previous release, please be aware of the following incompa - The `mysql` default `dataDir` has changed from `/var/mysql` to `/var/lib/mysql`. - - Radicale\'s default package has changed from 1.x to 2.x. Instructions to migrate can be found [ here ](http://radicale.org/1to2/). It is also possible to use the newer version by setting the `package` to `radicale2`, which is done automatically when `stateVersion` is 17.09 or higher. The `extraArgs` option has been added to allow passing the data migration arguments specified in the instructions; see the `radicale.nix` NixOS test for an example migration. + - Radicale's default package has changed from 1.x to 2.x. Instructions to migrate can be found [ here ](http://radicale.org/1to2/). It is also possible to use the newer version by setting the `package` to `radicale2`, which is done automatically when `stateVersion` is 17.09 or higher. The `extraArgs` option has been added to allow passing the data migration arguments specified in the instructions; see the `radicale.nix` NixOS test for an example migration. - The `aiccu` package was removed. This is due to SixXS [ sunsetting](https://www.sixxs.net/main/) its IPv6 tunnel. @@ -216,9 +216,9 @@ When upgrading from a previous release, please be aware of the following incompa - Top-level `idea` package collection was renamed. All JetBrains IDEs are now at `jetbrains`. -- `flexget`\'s state database cannot be upgraded to its new internal format, requiring removal of any existing `db-config.sqlite` which will be automatically recreated. +- `flexget`'s state database cannot be upgraded to its new internal format, requiring removal of any existing `db-config.sqlite` which will be automatically recreated. -- The `ipfs` service now doesn\'t ignore the `dataDir` option anymore. If you\'ve ever set this option to anything other than the default you\'ll have to either unset it (so the default gets used) or migrate the old data manually with +- The `ipfs` service now doesn't ignore the `dataDir` option anymore. If you've ever set this option to anything other than the default you'll have to either unset it (so the default gets used) or migrate the old data manually with ```ShellSession dataDir= @@ -236,15 +236,15 @@ When upgrading from a previous release, please be aware of the following incompa - `wvdial` package and module were removed. This is due to the project being dead and not building with openssl 1.1. -- `cc-wrapper`\'s setup-hook now exports a number of environment variables corresponding to binutils binaries, (e.g. `LD`, `STRIP`, `RANLIB`, etc). This is done to prevent packages\' build systems guessing, which is harder to predict, especially when cross-compiling. However, some packages have broken due to this---their build systems either not supporting, or claiming to support without adequate testing, taking such environment variables as parameters. +- `cc-wrapper`'s setup-hook now exports a number of environment variables corresponding to binutils binaries, (e.g. `LD`, `STRIP`, `RANLIB`, etc). This is done to prevent packages' build systems guessing, which is harder to predict, especially when cross-compiling. However, some packages have broken due to this---their build systems either not supporting, or claiming to support without adequate testing, taking such environment variables as parameters. -- `services.firefox.syncserver` now runs by default as a non-root user. To accomodate this change, the default sqlite database location has also been changed. Migration should work automatically. Refer to the description of the options for more details. +- `services.firefox.syncserver` now runs by default as a non-root user. To accommodate this change, the default sqlite database location has also been changed. Migration should work automatically. Refer to the description of the options for more details. - The `compiz` window manager and package was removed. The system support had been broken for several years. - Touchpad support should now be enabled through `libinput` as `synaptics` is now deprecated. See the option `services.xserver.libinput.enable`. -- grsecurity/PaX support has been dropped, following upstream\'s decision to cease free support. See [ upstream\'s announcement](https://grsecurity.net/passing_the_baton.php) for more information. No complete replacement for grsecurity/PaX is available presently. +- grsecurity/PaX support has been dropped, following upstream's decision to cease free support. See [ upstream's announcement](https://grsecurity.net/passing_the_baton.php) for more information. No complete replacement for grsecurity/PaX is available presently. - `services.mysql` now has declarative configuration of databases and users with the `ensureDatabases` and `ensureUsers` options. @@ -283,9 +283,9 @@ When upgrading from a previous release, please be aware of the following incompa ## Other Notable Changes {#sec-release-17.09-notable-changes} -- Modules can now be disabled by using [ disabledModules](https://nixos.org/nixpkgs/manual/#sec-replace-modules), allowing another to take it\'s place. This can be used to import a set of modules from another channel while keeping the rest of the system on a stable release. +- Modules can now be disabled by using [ disabledModules](https://nixos.org/nixpkgs/manual/#sec-replace-modules), allowing another to take it's place. This can be used to import a set of modules from another channel while keeping the rest of the system on a stable release. -- Updated to FreeType 2.7.1, including a new TrueType engine. The new engine replaces the Infinality engine which was the default in NixOS. The default font rendering settings are now provided by fontconfig-penultimate, replacing fontconfig-ultimate; the new defaults are less invasive and provide rendering that is more consistent with other systems and hopefully with each font designer\'s intent. Some system-wide configuration has been removed from the Fontconfig NixOS module where user Fontconfig settings are available. +- Updated to FreeType 2.7.1, including a new TrueType engine. The new engine replaces the Infinality engine which was the default in NixOS. The default font rendering settings are now provided by fontconfig-penultimate, replacing fontconfig-ultimate; the new defaults are less invasive and provide rendering that is more consistent with other systems and hopefully with each font designer's intent. Some system-wide configuration has been removed from the Fontconfig NixOS module where user Fontconfig settings are available. - ZFS/SPL have been updated to 0.7.0, `zfsUnstable, splUnstable` have therefore been removed. diff --git a/nixos/doc/manual/release-notes/rl-1803.section.md b/nixos/doc/manual/release-notes/rl-1803.section.md index c5146015d449..681894eb13ec 100644 --- a/nixos/doc/manual/release-notes/rl-1803.section.md +++ b/nixos/doc/manual/release-notes/rl-1803.section.md @@ -6,7 +6,7 @@ In addition to numerous new and upgraded packages, this release has the followin - End of support is planned for end of October 2018, handing over to 18.09. -- Platform support: x86_64-linux and x86_64-darwin since release time (the latter isn\'t NixOS, really). Binaries for aarch64-linux are available, but no channel exists yet, as it\'s waiting for some test fixes, etc. +- Platform support: x86_64-linux and x86_64-darwin since release time (the latter isn't NixOS, really). Binaries for aarch64-linux are available, but no channel exists yet, as it's waiting for some test fixes, etc. - Nix now defaults to 2.0; see its [release notes](https://nixos.org/nix/manual/#ssec-relnotes-2.0). @@ -176,7 +176,7 @@ When upgrading from a previous release, please be aware of the following incompa - `cc-wrapper` has been split in two; there is now also a `bintools-wrapper`. The most commonly used files in `nix-support` are now split between the two wrappers. Some commonly used ones, like `nix-support/dynamic-linker`, are duplicated for backwards compatability, even though they rightly belong only in `bintools-wrapper`. Other more obscure ones are just moved. -- The propagation logic has been changed. The new logic, along with new types of dependencies that go with, is thoroughly documented in the \"Specifying dependencies\" section of the \"Standard Environment\" chapter of the nixpkgs manual. The old logic isn\'t but is easy to describe: dependencies were propagated as the same type of dependency no matter what. In practice, that means that many `propagatedNativeBuildInputs` should instead be `propagatedBuildInputs`. Thankfully, that was and is the least used type of dependency. Also, it means that some `propagatedBuildInputs` should instead be `depsTargetTargetPropagated`. Other types dependencies should be unaffected. +- The propagation logic has been changed. The new logic, along with new types of dependencies that go with, is thoroughly documented in the "Specifying dependencies" section of the "Standard Environment" chapter of the nixpkgs manual. The old logic isn't but is easy to describe: dependencies were propagated as the same type of dependency no matter what. In practice, that means that many `propagatedNativeBuildInputs` should instead be `propagatedBuildInputs`. Thankfully, that was and is the least used type of dependency. Also, it means that some `propagatedBuildInputs` should instead be `depsTargetTargetPropagated`. Other types dependencies should be unaffected. - `lib.addPassthru drv passthru` is removed. Use `lib.extendDerivation true passthru drv` instead. @@ -184,7 +184,7 @@ When upgrading from a previous release, please be aware of the following incompa - The `hardware.amdHybridGraphics.disable` option was removed for lack of a maintainer. If you still need this module, you may wish to include a copy of it from an older version of nixos in your imports. -- The merging of config options for `services.postfix.config` was buggy. Previously, if other options in the Postfix module like `services.postfix.useSrs` were set and the user set config options that were also set by such options, the resulting config wouldn\'t include all options that were needed. They are now merged correctly. If config options need to be overridden, `lib.mkForce` or `lib.mkOverride` can be used. +- The merging of config options for `services.postfix.config` was buggy. Previously, if other options in the Postfix module like `services.postfix.useSrs` were set and the user set config options that were also set by such options, the resulting config wouldn't include all options that were needed. They are now merged correctly. If config options need to be overridden, `lib.mkForce` or `lib.mkOverride` can be used. - The following changes apply if the `stateVersion` is changed to 18.03 or higher. For `stateVersion = "17.09"` or lower the old behavior is preserved. @@ -204,7 +204,7 @@ When upgrading from a previous release, please be aware of the following incompa - The data directory `/var/lib/piwik` was renamed to `/var/lib/matomo`. All files will be moved automatically on first startup, but you might need to adjust your backup scripts. - - The default `serverName` for the nginx configuration changed from `piwik.${config.networking.hostName}` to `matomo.${config.networking.hostName}.${config.networking.domain}` if `config.networking.domain` is set, `matomo.${config.networking.hostName}` if it is not set. If you change your `serverName`, remember you\'ll need to update the `trustedHosts[]` array in `/var/lib/matomo/config/config.ini.php` as well. + - The default `serverName` for the nginx configuration changed from `piwik.${config.networking.hostName}` to `matomo.${config.networking.hostName}.${config.networking.domain}` if `config.networking.domain` is set, `matomo.${config.networking.hostName}` if it is not set. If you change your `serverName`, remember you'll need to update the `trustedHosts[]` array in `/var/lib/matomo/config/config.ini.php` as well. - The `piwik` user was renamed to `matomo`. The service will adjust ownership automatically for files in the data directory. If you use unix socket authentication, remember to give the new `matomo` user access to the database and to change the `username` to `matomo` in the `[database]` section of `/var/lib/matomo/config/config.ini.php`. @@ -250,7 +250,7 @@ When upgrading from a previous release, please be aware of the following incompa - The option `services.logstash.listenAddress` is now `127.0.0.1` by default. Previously the default behaviour was to listen on all interfaces. -- `services.btrfs.autoScrub` has been added, to periodically check btrfs filesystems for data corruption. If there\'s a correct copy available, it will automatically repair corrupted blocks. +- `services.btrfs.autoScrub` has been added, to periodically check btrfs filesystems for data corruption. If there's a correct copy available, it will automatically repair corrupted blocks. - `displayManager.lightdm.greeters.gtk.clock-format.` has been added, the clock format string (as expected by strftime, e.g. `%H:%M`) to use with the lightdm gtk greeter panel. diff --git a/nixos/doc/manual/release-notes/rl-1809.section.md b/nixos/doc/manual/release-notes/rl-1809.section.md index 3443db37c97e..71afc71d5a89 100644 --- a/nixos/doc/manual/release-notes/rl-1809.section.md +++ b/nixos/doc/manual/release-notes/rl-1809.section.md @@ -204,11 +204,11 @@ When upgrading from a previous release, please be aware of the following incompa - The `clementine` package points now to the free derivation. `clementineFree` is removed now and `clementineUnfree` points to the package which is bundled with the unfree `libspotify` package. -- The `netcat` package is now taken directly from OpenBSD\'s `libressl`, instead of relying on Debian\'s fork. The new version should be very close to the old version, but there are some minor differences. Importantly, flags like -b, -q, -C, and -Z are no longer accepted by the nc command. +- The `netcat` package is now taken directly from OpenBSD's `libressl`, instead of relying on Debian's fork. The new version should be very close to the old version, but there are some minor differences. Importantly, flags like -b, -q, -C, and -Z are no longer accepted by the nc command. -- The `services.docker-registry.extraConfig` object doesn\'t contain environment variables anymore. Instead it needs to provide an object structure that can be mapped onto the YAML configuration defined in [the `docker/distribution` docs](https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md). +- The `services.docker-registry.extraConfig` object doesn't contain environment variables anymore. Instead it needs to provide an object structure that can be mapped onto the YAML configuration defined in [the `docker/distribution` docs](https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md). -- `gnucash` has changed from version 2.4 to 3.x. If you\'ve been using `gnucash` (version 2.4) instead of `gnucash26` (version 2.6) you must open your Gnucash data file(s) with `gnucash26` and then save them to upgrade the file format. Then you may use your data file(s) with Gnucash 3.x. See the upgrade [documentation](https://wiki.gnucash.org/wiki/FAQ#Using_Different_Versions.2C_Up_And_Downgrade). Gnucash 2.4 is still available under the attribute `gnucash24`. +- `gnucash` has changed from version 2.4 to 3.x. If you've been using `gnucash` (version 2.4) instead of `gnucash26` (version 2.6) you must open your Gnucash data file(s) with `gnucash26` and then save them to upgrade the file format. Then you may use your data file(s) with Gnucash 3.x. See the upgrade [documentation](https://wiki.gnucash.org/wiki/FAQ#Using_Different_Versions.2C_Up_And_Downgrade). Gnucash 2.4 is still available under the attribute `gnucash24`. - `services.munge` now runs as user (and group) `munge` instead of root. Make sure the key file is accessible to the daemon. @@ -315,7 +315,7 @@ When upgrading from a previous release, please be aware of the following incompa - The Kubernetes Dashboard now has only minimal RBAC permissions by default. If dashboard cluster-admin rights are desired, set `services.kubernetes.addons.dashboard.rbac.clusterAdmin` to true. On existing clusters, in order for the revocation of privileges to take effect, the current ClusterRoleBinding for kubernetes-dashboard must be manually removed: `kubectl delete clusterrolebinding kubernetes-dashboard` -- The `programs.screen` module provides allows to configure `/etc/screenrc`, however the module behaved fairly counterintuitive as the config exists, but the package wasn\'t available. Since 18.09 `pkgs.screen` will be added to `environment.systemPackages`. +- The `programs.screen` module provides allows to configure `/etc/screenrc`, however the module behaved fairly counterintuitive as the config exists, but the package wasn't available. Since 18.09 `pkgs.screen` will be added to `environment.systemPackages`. - The module `services.networking.hostapd` now uses WPA2 by default. @@ -327,6 +327,6 @@ When upgrading from a previous release, please be aware of the following incompa - The default display manager is now LightDM. To use SLiM set `services.xserver.displayManager.slim.enable` to `true`. -- NixOS option descriptions are now automatically broken up into individual paragraphs if the text contains two consecutive newlines, so it\'s no longer necessary to use `` to start a new paragraph. +- NixOS option descriptions are now automatically broken up into individual paragraphs if the text contains two consecutive newlines, so it's no longer necessary to use `` to start a new paragraph. - Top-level `buildPlatform`, `hostPlatform`, and `targetPlatform` in Nixpkgs are deprecated. Please use their equivalents in `stdenv` instead: `stdenv.buildPlatform`, `stdenv.hostPlatform`, and `stdenv.targetPlatform`. diff --git a/nixos/doc/manual/release-notes/rl-1903.section.md b/nixos/doc/manual/release-notes/rl-1903.section.md index 7637a70c1bf8..b43518c471fd 100644 --- a/nixos/doc/manual/release-notes/rl-1903.section.md +++ b/nixos/doc/manual/release-notes/rl-1903.section.md @@ -11,11 +11,11 @@ In addition to numerous new and upgraded packages, this release has the followin - Added the Pantheon desktop environment. It can be enabled through `services.xserver.desktopManager.pantheon.enable`. ::: {.note} - By default, `services.xserver.desktopManager.pantheon` enables LightDM as a display manager, as pantheon\'s screen locking implementation relies on it. - Because of that it is recommended to leave LightDM enabled. If you\'d like to disable it anyway, set `services.xserver.displayManager.lightdm.enable` to `false` and enable your preferred display manager. + By default, `services.xserver.desktopManager.pantheon` enables LightDM as a display manager, as pantheon's screen locking implementation relies on it. + Because of that it is recommended to leave LightDM enabled. If you'd like to disable it anyway, set `services.xserver.displayManager.lightdm.enable` to `false` and enable your preferred display manager. ::: - Also note that Pantheon\'s LightDM greeter is not enabled by default, because it has numerous issues in NixOS and isn\'t optimal for use here yet. + Also note that Pantheon's LightDM greeter is not enabled by default, because it has numerous issues in NixOS and isn't optimal for use here yet. - A major refactoring of the Kubernetes module has been completed. Refactorings primarily focus on decoupling components and enhancing security. Two-way TLS and RBAC has been enabled by default for all components, which slightly changes the way the module is configured. See: [](#sec-kubernetes) for details. @@ -57,7 +57,7 @@ When upgrading from a previous release, please be aware of the following incompa - The Syncthing state and configuration data has been moved from `services.syncthing.dataDir` to the newly defined `services.syncthing.configDir`, which default to `/var/lib/syncthing/.config/syncthing`. This change makes possible to share synced directories using ACLs without Syncthing resetting the permission on every start. -- The `ntp` module now has sane default restrictions. If you\'re relying on the previous defaults, which permitted all queries and commands from all firewall-permitted sources, you can set `services.ntp.restrictDefault` and `services.ntp.restrictSource` to `[]`. +- The `ntp` module now has sane default restrictions. If you're relying on the previous defaults, which permitted all queries and commands from all firewall-permitted sources, you can set `services.ntp.restrictDefault` and `services.ntp.restrictSource` to `[]`. - Package `rabbitmq_server` is renamed to `rabbitmq-server`. @@ -73,7 +73,7 @@ When upgrading from a previous release, please be aware of the following incompa - OpenSMTPD has been upgraded to version 6.4.0p1. This release makes backwards-incompatible changes to the configuration file format. See `man smtpd.conf` for more information on the new file format. -- The versioned `postgresql` have been renamed to use underscore number seperators. For example, `postgresql96` has been renamed to `postgresql_9_6`. +- The versioned `postgresql` have been renamed to use underscore number separators. For example, `postgresql96` has been renamed to `postgresql_9_6`. - Package `consul-ui` and passthrough `consul.ui` have been removed. The package `consul` now uses upstream releases that vendor the UI into the binary. See [\#48714](https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834) for details. @@ -89,9 +89,9 @@ When upgrading from a previous release, please be aware of the following incompa - The option `services.xserver.displayManager.job.logToFile` which was previously set to `true` when using the display managers `lightdm`, `sddm` or `xpra` has been reset to the default value (`false`). -- Network interface indiscriminate NixOS firewall options (`networking.firewall.allow*`) are now preserved when also setting interface specific rules such as `networking.firewall.interfaces.en0.allow*`. These rules continue to use the pseudo device \"default\" (`networking.firewall.interfaces.default.*`), and assigning to this pseudo device will override the (`networking.firewall.allow*`) options. +- Network interface indiscriminate NixOS firewall options (`networking.firewall.allow*`) are now preserved when also setting interface specific rules such as `networking.firewall.interfaces.en0.allow*`. These rules continue to use the pseudo device "default" (`networking.firewall.interfaces.default.*`), and assigning to this pseudo device will override the (`networking.firewall.allow*`) options. -- The `nscd` service now disables all caching of `passwd` and `group` databases by default. This was interferring with the correct functioning of the `libnss_systemd.so` module which is used by `systemd` to manage uids and usernames in the presence of `DynamicUser=` in systemd services. This was already the default behaviour in presence of `services.sssd.enable = true` because nscd caching would interfere with `sssd` in unpredictable ways as well. Because we\'re using nscd not for caching, but for convincing glibc to find NSS modules in the nix store instead of an absolute path, we have decided to disable caching globally now, as it\'s usually not the behaviour the user wants and can lead to surprising behaviour. Furthermore, negative caching of host lookups is also disabled now by default. This should fix the issue of dns lookups failing in the presence of an unreliable network. +- The `nscd` service now disables all caching of `passwd` and `group` databases by default. This was interferring with the correct functioning of the `libnss_systemd.so` module which is used by `systemd` to manage uids and usernames in the presence of `DynamicUser=` in systemd services. This was already the default behaviour in presence of `services.sssd.enable = true` because nscd caching would interfere with `sssd` in unpredictable ways as well. Because we're using nscd not for caching, but for convincing glibc to find NSS modules in the nix store instead of an absolute path, we have decided to disable caching globally now, as it's usually not the behaviour the user wants and can lead to surprising behaviour. Furthermore, negative caching of host lookups is also disabled now by default. This should fix the issue of dns lookups failing in the presence of an unreliable network. If the old behaviour is desired, this can be restored by setting the `services.nscd.config` option with the desired caching parameters. @@ -137,7 +137,7 @@ When upgrading from a previous release, please be aware of the following incompa - The `pam_unix` account module is now loaded with its control field set to `required` instead of `sufficient`, so that later PAM account modules that might do more extensive checks are being executed. Previously, the whole account module verification was exited prematurely in case a nss module provided the account name to `pam_unix`. The LDAP and SSSD NixOS modules already add their NSS modules when enabled. In case your setup breaks due to some later PAM account module previosuly shadowed, or failing NSS lookups, please file a bug. You can get back the old behaviour by manually setting `security.pam.services..text`. -- The `pam_unix` password module is now loaded with its control field set to `sufficient` instead of `required`, so that password managed only by later PAM password modules are being executed. Previously, for example, changing an LDAP account\'s password through PAM was not possible: the whole password module verification was exited prematurely by `pam_unix`, preventing `pam_ldap` to manage the password as it should. +- The `pam_unix` password module is now loaded with its control field set to `sufficient` instead of `required`, so that password managed only by later PAM password modules are being executed. Previously, for example, changing an LDAP account's password through PAM was not possible: the whole password module verification was exited prematurely by `pam_unix`, preventing `pam_ldap` to manage the password as it should. - `fish` has been upgraded to 3.0. It comes with a number of improvements and backwards incompatible changes. See the `fish` [release notes](https://github.com/fish-shell/fish-shell/releases/tag/3.0.0) for more information. @@ -145,7 +145,7 @@ When upgrading from a previous release, please be aware of the following incompa - NixOS module system type `types.optionSet` and `lib.mkOption` argument `options` are deprecated. Use `types.submodule` instead. ([\#54637](https://github.com/NixOS/nixpkgs/pull/54637)) -- `matrix-synapse` has been updated to version 0.99. It will [no longer generate a self-signed certificate on first launch](https://github.com/matrix-org/synapse/pull/4509) and will be [the last version to accept self-signed certificates](https://matrix.org/blog/2019/02/05/synapse-0-99-0/). As such, it is now recommended to use a proper certificate verified by a root CA (for example Let\'s Encrypt). The new [manual chapter on Matrix](#module-services-matrix) contains a working example of using nginx as a reverse proxy in front of `matrix-synapse`, using Let\'s Encrypt certificates. +- `matrix-synapse` has been updated to version 0.99. It will [no longer generate a self-signed certificate on first launch](https://github.com/matrix-org/synapse/pull/4509) and will be [the last version to accept self-signed certificates](https://matrix.org/blog/2019/02/05/synapse-0-99-0/). As such, it is now recommended to use a proper certificate verified by a root CA (for example Let's Encrypt). The new [manual chapter on Matrix](#module-services-matrix) contains a working example of using nginx as a reverse proxy in front of `matrix-synapse`, using Let's Encrypt certificates. - `mailutils` now works by default when `sendmail` is not in a setuid wrapper. As a consequence, the `sendmailPath` argument, having lost its main use, has been removed. @@ -191,7 +191,7 @@ When upgrading from a previous release, please be aware of the following incompa With this change application specific volumes are relative to the master volume which can be adjusted independently, whereas before they were absolute; meaning that in effect, it scaled the device-volume with the volume of the loudest application. ::: -- The [`ndppd`](https://github.com/DanielAdolfsson/ndppd) module now supports [all config options](options.html#opt-services.ndppd.enable) provided by the current upstream version as service options. Additionally the `ndppd` package doesn\'t contain the systemd unit configuration from upstream anymore, the unit is completely configured by the NixOS module now. +- The [`ndppd`](https://github.com/DanielAdolfsson/ndppd) module now supports [all config options](options.html#opt-services.ndppd.enable) provided by the current upstream version as service options. Additionally the `ndppd` package doesn't contain the systemd unit configuration from upstream anymore, the unit is completely configured by the NixOS module now. - New installs of NixOS will default to the Redmine 4.x series unless otherwise specified in `services.redmine.package` while existing installs of NixOS will default to the Redmine 3.x series. diff --git a/nixos/doc/manual/release-notes/rl-1909.section.md b/nixos/doc/manual/release-notes/rl-1909.section.md index 572f1bf5a255..428352388193 100644 --- a/nixos/doc/manual/release-notes/rl-1909.section.md +++ b/nixos/doc/manual/release-notes/rl-1909.section.md @@ -34,7 +34,7 @@ In addition to numerous new and upgraded packages, this release has the followin - The installer now uses a less privileged `nixos` user whereas before we logged in as root. To gain root privileges use `sudo -i` without a password. -- We\'ve updated to Xfce 4.14, which brings a new module `services.xserver.desktopManager.xfce4-14`. If you\'d like to upgrade, please switch from the `services.xserver.desktopManager.xfce` module as it will be deprecated in a future release. They\'re incompatibilities with the current Xfce module; it doesn\'t support `thunarPlugins` and it isn\'t recommended to use `services.xserver.desktopManager.xfce` and `services.xserver.desktopManager.xfce4-14` simultaneously or to downgrade from Xfce 4.14 after upgrading. +- We've updated to Xfce 4.14, which brings a new module `services.xserver.desktopManager.xfce4-14`. If you'd like to upgrade, please switch from the `services.xserver.desktopManager.xfce` module as it will be deprecated in a future release. They're incompatibilities with the current Xfce module; it doesn't support `thunarPlugins` and it isn't recommended to use `services.xserver.desktopManager.xfce` and `services.xserver.desktopManager.xfce4-14` simultaneously or to downgrade from Xfce 4.14 after upgrading. - The GNOME 3 desktop manager module sports an interface to enable/disable core services, applications, and optional GNOME packages like games. @@ -46,9 +46,9 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.gnome3.games.enable` - With these options we hope to give users finer grained control over their systems. Prior to this change you\'d either have to manually disable options or use `environment.gnome3.excludePackages` which only excluded the optional applications. `environment.gnome3.excludePackages` is now unguarded, it can exclude any package installed with `environment.systemPackages` in the GNOME 3 module. + With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually disable options or use `environment.gnome3.excludePackages` which only excluded the optional applications. `environment.gnome3.excludePackages` is now unguarded, it can exclude any package installed with `environment.systemPackages` in the GNOME 3 module. -- Orthogonal to the previous changes to the GNOME 3 desktop manager module, we\'ve updated all default services and applications to match as close as possible to a default reference GNOME 3 experience. +- Orthogonal to the previous changes to the GNOME 3 desktop manager module, we've updated all default services and applications to match as close as possible to a default reference GNOME 3 experience. **The following changes were enacted in `services.gnome3.core-utilities.enable`** @@ -104,7 +104,7 @@ The following new services were added since the last release: - `services.xserver.desktopManager.pantheon` - - `services.xserver.desktopManager.mate` Note Mate uses `programs.system-config-printer` as it doesn\'t use it as a service, but its graphical interface directly. + - `services.xserver.desktopManager.mate` Note Mate uses `programs.system-config-printer` as it doesn't use it as a service, but its graphical interface directly. - [services.blueman.enable](options.html#opt-services.blueman.enable) has been added. If you previously had blueman installed via `environment.systemPackages` please migrate to using the NixOS module, as this would result in an insufficiently configured blueman. @@ -118,11 +118,11 @@ When upgrading from a previous release, please be aware of the following incompa - PostgreSQL 9.4 is scheduled EOL during the 19.09 life cycle and has been removed. -- The options `services.prometheus.alertmanager.user` and `services.prometheus.alertmanager.group` have been removed because the alertmanager service is now using systemd\'s [ DynamicUser mechanism](http://0pointer.net/blog/dynamic-users-with-systemd.html) which obviates these options. +- The options `services.prometheus.alertmanager.user` and `services.prometheus.alertmanager.group` have been removed because the alertmanager service is now using systemd's [ DynamicUser mechanism](http://0pointer.net/blog/dynamic-users-with-systemd.html) which obviates these options. - The NetworkManager systemd unit was renamed back from network-manager.service to NetworkManager.service for better compatibility with other applications expecting this name. The same applies to ModemManager where modem-manager.service is now called ModemManager.service again. -- The `services.nzbget.configFile` and `services.nzbget.openFirewall` options were removed as they are managed internally by the nzbget. The `services.nzbget.dataDir` option hadn\'t actually been used by the module for some time and so was removed as cleanup. +- The `services.nzbget.configFile` and `services.nzbget.openFirewall` options were removed as they are managed internally by the nzbget. The `services.nzbget.dataDir` option hadn't actually been used by the module for some time and so was removed as cleanup. - The `services.mysql.pidDir` option was removed, as it was only used by the wordpress apache-httpd service to wait for mysql to have started up. This can be accomplished by either describing a dependency on mysql.service (preferred) or waiting for the (hardcoded) `/run/mysqld/mysql.sock` file to appear. @@ -148,19 +148,19 @@ When upgrading from a previous release, please be aware of the following incompa A new knob named `nixops.enableDeprecatedAutoLuks` has been introduced to disable the eval failure and to acknowledge the notice was received and read. If you plan on using the feature please note that it might break with subsequent updates. - Make sure you set the `_netdev` option for each of the file systems referring to block devices provided by the autoLuks module. Not doing this might render the system in a state where it doesn\'t boot anymore. + Make sure you set the `_netdev` option for each of the file systems referring to block devices provided by the autoLuks module. Not doing this might render the system in a state where it doesn't boot anymore. If you are actively using the `autoLuks` module please let us know in [issue \#62211](https://github.com/NixOS/nixpkgs/issues/62211). - The setopt declarations will be evaluated at the end of `/etc/zshrc`, so any code in [programs.zsh.interactiveShellInit](options.html#opt-programs.zsh.interactiveShellInit), [programs.zsh.loginShellInit](options.html#opt-programs.zsh.loginShellInit) and [programs.zsh.promptInit](options.html#opt-programs.zsh.promptInit) may break if it relies on those options being set. -- The `prometheus-nginx-exporter` package now uses the offical exporter provided by NGINX Inc. Its metrics are differently structured and are incompatible to the old ones. For information about the metrics, have a look at the [official repo](https://github.com/nginxinc/nginx-prometheus-exporter). +- The `prometheus-nginx-exporter` package now uses the official exporter provided by NGINX Inc. Its metrics are differently structured and are incompatible to the old ones. For information about the metrics, have a look at the [official repo](https://github.com/nginxinc/nginx-prometheus-exporter). - The `shibboleth-sp` package has been updated to version 3. It is largely backward compatible, for further information refer to the [release notes](https://wiki.shibboleth.net/confluence/display/SP3/ReleaseNotes) and [upgrade guide](https://wiki.shibboleth.net/confluence/display/SP3/UpgradingFromV2). Nodejs 8 is scheduled EOL under the lifetime of 19.09 and has been dropped. -- By default, prometheus exporters are now run with `DynamicUser` enabled. Exporters that need a real user, now run under a seperate user and group which follow the pattern `-exporter`, instead of the previous default `nobody` and `nogroup`. Only some exporters are affected by the latter, namely the exporters `dovecot`, `node`, `postfix` and `varnish`. +- By default, prometheus exporters are now run with `DynamicUser` enabled. Exporters that need a real user, now run under a separate user and group which follow the pattern `-exporter`, instead of the previous default `nobody` and `nogroup`. Only some exporters are affected by the latter, namely the exporters `dovecot`, `node`, `postfix` and `varnish`. - The `ibus-qt` package is not installed by default anymore when [i18n.inputMethod.enabled](options.html#opt-i18n.inputMethod.enabled) is set to `ibus`. If IBus support in Qt 4.x applications is required, add the `ibus-qt` package to your [environment.systemPackages](options.html#opt-environment.systemPackages) manually. @@ -196,13 +196,13 @@ When upgrading from a previous release, please be aware of the following incompa Furthermore, the acme module will not automatically add a dependency on `lighttpd.service` anymore. If you are using certficates provided by letsencrypt for lighttpd, then you should depend on the certificate service `acme-${cert}.service>` manually. - For nginx, the dependencies are still automatically managed when `services.nginx.virtualhosts..enableACME` is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs, instead of depending on the catch-all `acme-certificates.target`. This target unit was also removed from the codebase. This will mean nginx will no longer depend on certificates it isn\'t explicitly managing and fixes a bug with certificate renewal ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at [NixOS/nixpkgs\#60180](https://github.com/NixOS/nixpkgs/issues/60180). + For nginx, the dependencies are still automatically managed when `services.nginx.virtualhosts..enableACME` is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs, instead of depending on the catch-all `acme-certificates.target`. This target unit was also removed from the codebase. This will mean nginx will no longer depend on certificates it isn't explicitly managing and fixes a bug with certificate renewal ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at [NixOS/nixpkgs\#60180](https://github.com/NixOS/nixpkgs/issues/60180). - The old deprecated `emacs` package sets have been dropped. What used to be called `emacsPackagesNg` is now simply called `emacsPackages`. -- `services.xserver.desktopManager.xterm` is now disabled by default if `stateVersion` is 19.09 or higher. Previously the xterm desktopManager was enabled when xserver was enabled, but it isn\'t useful for all people so it didn\'t make sense to have any desktopManager enabled default. +- `services.xserver.desktopManager.xterm` is now disabled by default if `stateVersion` is 19.09 or higher. Previously the xterm desktopManager was enabled when xserver was enabled, but it isn't useful for all people so it didn't make sense to have any desktopManager enabled default. -- The WeeChat plugin `pkgs.weechatScripts.weechat-xmpp` has been removed as it doesn\'t receive any updates from upstream and depends on outdated Python2-based modules. +- The WeeChat plugin `pkgs.weechatScripts.weechat-xmpp` has been removed as it doesn't receive any updates from upstream and depends on outdated Python2-based modules. - Old unsupported versions (`logstash5`, `kibana5`, `filebeat5`, `heartbeat5`, `metricbeat5`, `packetbeat5`) of the ELK-stack and Elastic beats have been removed. @@ -210,7 +210,7 @@ When upgrading from a previous release, please be aware of the following incompa - Citrix Receiver (`citrix_receiver`) has been dropped in favor of Citrix Workspace (`citrix_workspace`). -- The `services.gitlab` module has had its literal secret options (`services.gitlab.smtp.password`, `services.gitlab.databasePassword`, `services.gitlab.initialRootPassword`, `services.gitlab.secrets.secret`, `services.gitlab.secrets.db`, `services.gitlab.secrets.otp` and `services.gitlab.secrets.jws`) replaced by file-based versions (`services.gitlab.smtp.passwordFile`, `services.gitlab.databasePasswordFile`, `services.gitlab.initialRootPasswordFile`, `services.gitlab.secrets.secretFile`, `services.gitlab.secrets.dbFile`, `services.gitlab.secrets.otpFile` and `services.gitlab.secrets.jwsFile`). This was done so that secrets aren\'t stored in the world-readable nix store, but means that for each option you\'ll have to create a file with the same exact string, add \"File\" to the end of the option name, and change the definition to a string pointing to the corresponding file; e.g. `services.gitlab.databasePassword = "supersecurepassword"` becomes `services.gitlab.databasePasswordFile = "/path/to/secret_file"` where the file `secret_file` contains the string `supersecurepassword`. +- The `services.gitlab` module has had its literal secret options (`services.gitlab.smtp.password`, `services.gitlab.databasePassword`, `services.gitlab.initialRootPassword`, `services.gitlab.secrets.secret`, `services.gitlab.secrets.db`, `services.gitlab.secrets.otp` and `services.gitlab.secrets.jws`) replaced by file-based versions (`services.gitlab.smtp.passwordFile`, `services.gitlab.databasePasswordFile`, `services.gitlab.initialRootPasswordFile`, `services.gitlab.secrets.secretFile`, `services.gitlab.secrets.dbFile`, `services.gitlab.secrets.otpFile` and `services.gitlab.secrets.jwsFile`). This was done so that secrets aren't stored in the world-readable nix store, but means that for each option you'll have to create a file with the same exact string, add "File" to the end of the option name, and change the definition to a string pointing to the corresponding file; e.g. `services.gitlab.databasePassword = "supersecurepassword"` becomes `services.gitlab.databasePasswordFile = "/path/to/secret_file"` where the file `secret_file` contains the string `supersecurepassword`. The state path (`services.gitlab.statePath`) now has the following restriction: no parent directory can be owned by any other user than `root` or the user specified in `services.gitlab.user`; i.e. if `services.gitlab.statePath` is set to `/var/lib/gitlab/state`, `gitlab` and all parent directories must be owned by either `root` or the user specified in `services.gitlab.user`. @@ -218,7 +218,7 @@ When upgrading from a previous release, please be aware of the following incompa - The Twitter client `corebird` has been dropped as [it is discontinued and does not work against the new Twitter API](https://www.patreon.com/posts/corebirds-future-18921328). Please use the fork `cawbird` instead which has been adapted to the API changes and is still maintained. -- The `nodejs-11_x` package has been removed as it\'s EOLed by upstream. +- The `nodejs-11_x` package has been removed as it's EOLed by upstream. - Because of the systemd upgrade, systemd-timesyncd will no longer work if `system.stateVersion` is not set correctly. When upgrading from NixOS 19.03, please make sure that `system.stateVersion` is set to `"19.03"`, or lower if the installation dates back to an earlier version of NixOS. @@ -252,7 +252,7 @@ When upgrading from a previous release, please be aware of the following incompa - The `consul` package was upgraded past version `1.5`, so its deprecated legacy UI is no longer available. -- The default resample-method for PulseAudio has been changed from the upstream default `speex-float-1` to `speex-float-5`. Be aware that low-powered ARM-based and MIPS-based boards will struggle with this so you\'ll need to set `hardware.pulseaudio.daemon.config.resample-method` back to `speex-float-1`. +- The default resample-method for PulseAudio has been changed from the upstream default `speex-float-1` to `speex-float-5`. Be aware that low-powered ARM-based and MIPS-based boards will struggle with this so you'll need to set `hardware.pulseaudio.daemon.config.resample-method` back to `speex-float-1`. - The `phabricator` package and associated `httpd.extraSubservice`, as well as the `phd` service have been removed from nixpkgs due to lack of maintainer. @@ -264,7 +264,7 @@ When upgrading from a previous release, please be aware of the following incompa - The `tomcat-connector` `httpd.extraSubservice` has been removed from nixpkgs. -- It\'s now possible to change configuration in [services.nextcloud](options.html#opt-services.nextcloud.enable) after the initial deploy since all config parameters are persisted in an additional config file generated by the module. Previously core configuration like database parameters were set using their imperative installer after creating `/var/lib/nextcloud`. +- It's now possible to change configuration in [services.nextcloud](options.html#opt-services.nextcloud.enable) after the initial deploy since all config parameters are persisted in an additional config file generated by the module. Previously core configuration like database parameters were set using their imperative installer after creating `/var/lib/nextcloud`. - There exists now `lib.forEach`, which is like `map`, but with arguments flipped. When mapping function body spans many lines (or has nested `map`s), it is often hard to follow which list is modified. @@ -308,6 +308,6 @@ When upgrading from a previous release, please be aware of the following incompa - The `altcoins` categorization of packages has been removed. You now access these packages at the top level, ie. `nix-shell -p dogecoin` instead of `nix-shell -p altcoins.dogecoin`, etc. -- Ceph has been upgraded to v14.2.1. See the [release notes](https://ceph.com/releases/v14-2-0-nautilus-released/) for details. The mgr dashboard as well as osds backed by loop-devices is no longer explicitly supported by the package and module. Note: There\'s been some issues with python-cherrypy, which is used by the dashboard and prometheus mgr modules (and possibly others), hence 0000-dont-check-cherrypy-version.patch. +- Ceph has been upgraded to v14.2.1. See the [release notes](https://ceph.com/releases/v14-2-0-nautilus-released/) for details. The mgr dashboard as well as osds backed by loop-devices is no longer explicitly supported by the package and module. Note: There's been some issues with python-cherrypy, which is used by the dashboard and prometheus mgr modules (and possibly others), hence 0000-dont-check-cherrypy-version.patch. - `pkgs.weechat` is now compiled against `pkgs.python3`. Weechat also recommends [to use Python3 in their docs.](https://weechat.org/scripts/python3/) diff --git a/nixos/doc/manual/release-notes/rl-2003.section.md b/nixos/doc/manual/release-notes/rl-2003.section.md index b92c7f6634c7..76cee8858e80 100644 --- a/nixos/doc/manual/release-notes/rl-2003.section.md +++ b/nixos/doc/manual/release-notes/rl-2003.section.md @@ -34,11 +34,11 @@ In addition to numerous new and upgraded packages, this release has the followin - Postgresql for NixOS service now defaults to v11. -- The graphical installer image starts the graphical session automatically. Before you\'d be greeted by a tty and asked to enter `systemctl start display-manager`. It is now possible to disable the display-manager from running by selecting the `Disable display-manager` quirk in the boot menu. +- The graphical installer image starts the graphical session automatically. Before you'd be greeted by a tty and asked to enter `systemctl start display-manager`. It is now possible to disable the display-manager from running by selecting the `Disable display-manager` quirk in the boot menu. - GNOME 3 has been upgraded to 3.34. Please take a look at their [Release Notes](https://help.gnome.org/misc/release-notes/3.34) for details. -- If you enable the Pantheon Desktop Manager via [services.xserver.desktopManager.pantheon.enable](options.html#opt-services.xserver.desktopManager.pantheon.enable), we now default to also use [ Pantheon\'s newly designed greeter ](https://blog.elementary.io/say-hello-to-the-new-greeter/). Contrary to NixOS\'s usual update policy, Pantheon will receive updates during the cycle of NixOS 20.03 when backwards compatible. +- If you enable the Pantheon Desktop Manager via [services.xserver.desktopManager.pantheon.enable](options.html#opt-services.xserver.desktopManager.pantheon.enable), we now default to also use [ Pantheon's newly designed greeter ](https://blog.elementary.io/say-hello-to-the-new-greeter/). Contrary to NixOS's usual update policy, Pantheon will receive updates during the cycle of NixOS 20.03 when backwards compatible. - By default zfs pools will now be trimmed on a weekly basis. Trimming is only done on supported devices (i.e. NVME or SSDs) and should improve throughput and lifetime of these devices. It is controlled by the `services.zfs.trim.enable` varname. The zfs scrub service (`services.zfs.autoScrub.enable`) and the zfs autosnapshot service (`services.zfs.autoSnapshot.enable`) are now only enabled if zfs is set in `config.boot.initrd.supportedFilesystems` or `config.boot.supportedFilesystems`. These lists will automatically contain zfs as soon as any zfs mountpoint is configured in `fileSystems`. @@ -77,7 +77,7 @@ The following new services were added since the last release: - The kubernetes kube-proxy now supports a new hostname configuration `services.kubernetes.proxy.hostname` which has to be set if the hostname of the node should be non default. -- UPower\'s configuration is now managed by NixOS and can be customized via `services.upower`. +- UPower's configuration is now managed by NixOS and can be customized via `services.upower`. - To use Geary you should enable [programs.geary.enable](options.html#opt-programs.geary.enable) instead of just adding it to [environment.systemPackages](options.html#opt-environment.systemPackages). It was created so Geary could function properly outside of GNOME. @@ -187,9 +187,9 @@ When upgrading from a previous release, please be aware of the following incompa - The `99-main.network` file was removed. Matching all network interfaces caused many breakages, see [\#18962](https://github.com/NixOS/nixpkgs/pull/18962) and [\#71106](https://github.com/NixOS/nixpkgs/pull/71106). - We already don\'t support the global [networking.useDHCP](options.html#opt-networking.useDHCP), [networking.defaultGateway](options.html#opt-networking.defaultGateway) and [networking.defaultGateway6](options.html#opt-networking.defaultGateway6) options if [networking.useNetworkd](options.html#opt-networking.useNetworkd) is enabled, but direct users to configure the per-device [networking.interfaces.\....](options.html#opt-networking.interfaces) options. + We already don't support the global [networking.useDHCP](options.html#opt-networking.useDHCP), [networking.defaultGateway](options.html#opt-networking.defaultGateway) and [networking.defaultGateway6](options.html#opt-networking.defaultGateway6) options if [networking.useNetworkd](options.html#opt-networking.useNetworkd) is enabled, but direct users to configure the per-device [networking.interfaces.\....](options.html#opt-networking.interfaces) options. -- The stdenv now runs all bash with `set -u`, to catch the use of undefined variables. Before, it itself used `set -u` but was careful to unset it so other packages\' code ran as before. Now, all bash code is held to the same high standard, and the rather complex stateful manipulation of the options can be discarded. +- The stdenv now runs all bash with `set -u`, to catch the use of undefined variables. Before, it itself used `set -u` but was careful to unset it so other packages' code ran as before. Now, all bash code is held to the same high standard, and the rather complex stateful manipulation of the options can be discarded. - The SLIM Display Manager has been removed, as it has been unmaintained since 2013. Consider migrating to a different display manager such as LightDM (current default in NixOS), SDDM, GDM, or using the startx module which uses Xinitrc. @@ -197,7 +197,7 @@ When upgrading from a previous release, please be aware of the following incompa - The BEAM package set has been deleted. You will only find there the different interpreters. You should now use the different build tools coming with the languages with sandbox mode disabled. -- There is now only one Xfce package-set and module. This means that attributes `xfce4-14` and `xfceUnstable` all now point to the latest Xfce 4.14 packages. And in the future NixOS releases will be the latest released version of Xfce available at the time of the release\'s development (if viable). +- There is now only one Xfce package-set and module. This means that attributes `xfce4-14` and `xfceUnstable` all now point to the latest Xfce 4.14 packages. And in the future NixOS releases will be the latest released version of Xfce available at the time of the release's development (if viable). - The [phpfpm](options.html#opt-services.phpfpm.pools) module now sets `PrivateTmp=true` in its systemd units for better process isolation. If you rely on `/tmp` being shared with other services, explicitly override this by setting `serviceConfig.PrivateTmp` to `false` for each phpfpm unit. @@ -221,7 +221,7 @@ When upgrading from a previous release, please be aware of the following incompa - The packages `openobex` and `obexftp` are no longer installed when enabling Bluetooth via `hardware.bluetooth.enable`. -- The `dump1090` derivation has been changed to use FlightAware\'s dump1090 as its upstream. However, this version does not have an internal webserver anymore. The assets in the `share/dump1090` directory of the derivation can be used in conjunction with an external webserver to replace this functionality. +- The `dump1090` derivation has been changed to use FlightAware's dump1090 as its upstream. However, this version does not have an internal webserver anymore. The assets in the `share/dump1090` directory of the derivation can be used in conjunction with an external webserver to replace this functionality. - The fourStore and fourStoreEndpoint modules have been removed. @@ -291,7 +291,7 @@ When upgrading from a previous release, please be aware of the following incompa - `services.buildkite-agent.meta-data` has been renamed to [services.buildkite-agents.\.tags](options.html#opt-services.buildkite-agents), to match upstreams naming for 3.x. Its type has also changed - it now accepts an attrset of strings. - - The`services.buildkite-agent.openssh.publicKeyPath` option has been removed, as it\'s not necessary to deploy public keys to clone private repositories. + - The`services.buildkite-agent.openssh.publicKeyPath` option has been removed, as it's not necessary to deploy public keys to clone private repositories. - `services.buildkite-agent.openssh.privateKeyPath` has been renamed to [buildkite-agents.\.privateSshKeyPath](options.html#opt-services.buildkite-agents), as the whole `openssh` now only contained that single option. @@ -301,7 +301,7 @@ When upgrading from a previous release, please be aware of the following incompa - The `gcc5` and `gfortran5` packages have been removed. -- The `services.xserver.displayManager.auto` module has been removed. It was only intended for use in internal NixOS tests, and gave the false impression of it being a special display manager when it\'s actually LightDM. Please use the `services.xserver.displayManager.lightdm.autoLogin` options instead, or any other display manager in NixOS as they all support auto-login. If you used this module specifically because it permitted root auto-login you can override the lightdm-autologin pam module like: +- The `services.xserver.displayManager.auto` module has been removed. It was only intended for use in internal NixOS tests, and gave the false impression of it being a special display manager when it's actually LightDM. Please use the `services.xserver.displayManager.lightdm.autoLogin` options instead, or any other display manager in NixOS as they all support auto-login. If you used this module specifically because it permitted root auto-login you can override the lightdm-autologin pam module like: ```nix { @@ -325,13 +325,13 @@ When upgrading from a previous release, please be aware of the following incompa auth required pam_succeed_if.so quiet ``` - line, where default it\'s: + line, where default it's: ``` auth required pam_succeed_if.so uid >= 1000 quiet ``` - not permitting users with uid\'s below 1000 (like root). All other display managers in NixOS are configured like this. + not permitting users with uid's below 1000 (like root). All other display managers in NixOS are configured like this. - There have been lots of improvements to the Mailman module. As a result, @@ -357,9 +357,9 @@ When upgrading from a previous release, please be aware of the following incompa - Rspamd was updated to version 2.2. Read [ the upstream migration notes](https://rspamd.com/doc/migration.html#migration-to-rspamd-20) carefully. Please be especially aware that some modules were removed and the default Bayes backend is now Redis. -- The `*psu` versions of oraclejdk8 have been removed as they aren\'t provided by upstream anymore. +- The `*psu` versions of oraclejdk8 have been removed as they aren't provided by upstream anymore. -- The `services.dnscrypt-proxy` module has been removed as it used the deprecated version of dnscrypt-proxy. We\'ve added [services.dnscrypt-proxy2.enable](options.html#opt-services.dnscrypt-proxy2.enable) to use the supported version. This module supports configuration via the Nix attribute set [services.dnscrypt-proxy2.settings](options.html#opt-services.dnscrypt-proxy2.settings), or by passing a TOML configuration file via [services.dnscrypt-proxy2.configFile](options.html#opt-services.dnscrypt-proxy2.configFile). +- The `services.dnscrypt-proxy` module has been removed as it used the deprecated version of dnscrypt-proxy. We've added [services.dnscrypt-proxy2.enable](options.html#opt-services.dnscrypt-proxy2.enable) to use the supported version. This module supports configuration via the Nix attribute set [services.dnscrypt-proxy2.settings](options.html#opt-services.dnscrypt-proxy2.settings), or by passing a TOML configuration file via [services.dnscrypt-proxy2.configFile](options.html#opt-services.dnscrypt-proxy2.configFile). ```nix { @@ -382,13 +382,13 @@ When upgrading from a previous release, please be aware of the following incompa - `qesteidutil` has been deprecated in favor of `qdigidoc`. -- sqldeveloper_18 has been removed as it\'s not maintained anymore, sqldeveloper has been updated to version `19.4`. Please note that this means that this means that the oraclejdk is now required. For further information please read the [release notes](https://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/sqldev-relnotes-194-5908846.html). +- sqldeveloper_18 has been removed as it's not maintained anymore, sqldeveloper has been updated to version `19.4`. Please note that this means that this means that the oraclejdk is now required. For further information please read the [release notes](https://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/sqldev-relnotes-194-5908846.html). -- Haskell `env` and `shellFor` dev shell environments now organize dependencies the same way as regular builds. In particular, rather than receiving all the different lists of dependencies mashed together as one big list, and then partitioning into Haskell and non-Hakell dependencies, they work from the original many different dependency parameters and don\'t need to algorithmically partition anything. +- Haskell `env` and `shellFor` dev shell environments now organize dependencies the same way as regular builds. In particular, rather than receiving all the different lists of dependencies mashed together as one big list, and then partitioning into Haskell and non-Hakell dependencies, they work from the original many different dependency parameters and don't need to algorithmically partition anything. This means that if you incorrectly categorize a dependency, e.g. non-Haskell library dependency as a `buildDepends` or run-time Haskell dependency as a `setupDepends`, whereas things would have worked before they may not work now. -- The gcc-snapshot-package has been removed. It\'s marked as broken for \>2 years and used to point to a fairly old snapshot from the gcc7-branch. +- The gcc-snapshot-package has been removed. It's marked as broken for \>2 years and used to point to a fairly old snapshot from the gcc7-branch. - The nixos-build-vms8 -script now uses the python test-driver. @@ -398,21 +398,21 @@ When upgrading from a previous release, please be aware of the following incompa - Stand-alone usage of `Upower` now requires `services.upower.enable` instead of just installing into [environment.systemPackages](options.html#opt-environment.systemPackages). -- nextcloud has been updated to `v18.0.2`. This means that users from NixOS 19.09 can\'t upgrade directly since you can only move one version forward and 19.09 uses `v16.0.8`. +- nextcloud has been updated to `v18.0.2`. This means that users from NixOS 19.09 can't upgrade directly since you can only move one version forward and 19.09 uses `v16.0.8`. To provide a safe upgrade-path and to circumvent similar issues in the future, the following measures were taken: - The pkgs.nextcloud-attribute has been removed and replaced with versioned attributes (currently pkgs.nextcloud17 and pkgs.nextcloud18). With this change major-releases can be backported without breaking stuff and to make upgrade-paths easier. - - Existing setups will be detected using [system.stateVersion](options.html#opt-system.stateVersion): by default, nextcloud17 will be used, but will raise a warning which notes that after that deploy it\'s recommended to update to the latest stable version (nextcloud18) by declaring the newly introduced setting [services.nextcloud.package](options.html#opt-services.nextcloud.package). + - Existing setups will be detected using [system.stateVersion](options.html#opt-system.stateVersion): by default, nextcloud17 will be used, but will raise a warning which notes that after that deploy it's recommended to update to the latest stable version (nextcloud18) by declaring the newly introduced setting [services.nextcloud.package](options.html#opt-services.nextcloud.package). - - Users with an overlay (e.g. to use nextcloud at version `v18` on `19.09`) will get an evaluation error by default. This is done to ensure that our [package](options.html#opt-services.nextcloud.package)-option doesn\'t select an older version by accident. It\'s recommended to use pkgs.nextcloud18 or to set [package](options.html#opt-services.nextcloud.package) to pkgs.nextcloud explicitly. + - Users with an overlay (e.g. to use nextcloud at version `v18` on `19.09`) will get an evaluation error by default. This is done to ensure that our [package](options.html#opt-services.nextcloud.package)-option doesn't select an older version by accident. It's recommended to use pkgs.nextcloud18 or to set [package](options.html#opt-services.nextcloud.package) to pkgs.nextcloud explicitly. ::: {.warning} - Please note that if you\'re coming from `19.03` or older, you have to manually upgrade to `19.09` first to upgrade your server to Nextcloud v16. + Please note that if you're coming from `19.03` or older, you have to manually upgrade to `19.09` first to upgrade your server to Nextcloud v16. ::: -- Hydra has gained a massive performance improvement due to [some database schema changes](https://github.com/NixOS/hydra/pull/710) by adding several IDs and better indexing. However, it\'s necessary to upgrade Hydra in multiple steps: +- Hydra has gained a massive performance improvement due to [some database schema changes](https://github.com/NixOS/hydra/pull/710) by adding several IDs and better indexing. However, it's necessary to upgrade Hydra in multiple steps: - At first, an older version of Hydra needs to be deployed which adds those (nullable) columns. When having set [stateVersion ](options.html#opt-system.stateVersion) to a value older than `20.03`, this package will be selected by default from the module when upgrading. Otherwise, the package can be deployed using the following config: @@ -434,13 +434,13 @@ When upgrading from a previous release, please be aware of the following incompa - Deploy a newer version of Hydra to activate the DB optimizations. This can be done by using hydra-unstable. This package already includes [flake-support](https://github.com/nixos/rfcs/pull/49) and is therefore compiled against pkgs.nixFlakes. ::: {.warning} - If your [stateVersion](options.html#opt-system.stateVersion) is set to `20.03` or greater, hydra-unstable will be used automatically! This will break your setup if you didn\'t run the migration. + If your [stateVersion](options.html#opt-system.stateVersion) is set to `20.03` or greater, hydra-unstable will be used automatically! This will break your setup if you didn't run the migration. ::: - Please note that Hydra is currently not available with nixStable as this doesn\'t compile anymore. + Please note that Hydra is currently not available with nixStable as this doesn't compile anymore. ::: {.warning} - pkgs.hydra has been removed to ensure a graceful database-migration using the dedicated package-attributes. If you still have pkgs.hydra defined in e.g. an overlay, an assertion error will be thrown. To circumvent this, you need to set [services.hydra.package](options.html#opt-services.hydra.package) to pkgs.hydra explicitly and make sure you know what you\'re doing! + pkgs.hydra has been removed to ensure a graceful database-migration using the dedicated package-attributes. If you still have pkgs.hydra defined in e.g. an overlay, an assertion error will be thrown. To circumvent this, you need to set [services.hydra.package](options.html#opt-services.hydra.package) to pkgs.hydra explicitly and make sure you know what you're doing! ::: - The TokuDB storage engine will be disabled in mariadb 10.5. It is recommended to switch to RocksDB. See also [TokuDB](https://mariadb.com/kb/en/tokudb/). @@ -478,9 +478,9 @@ When upgrading from a previous release, please be aware of the following incompa Depending on your setup, you need to incorporate one of the following changes in your setup to upgrade to 20.03: - - If you use `sqlite3` you don\'t need to do anything. + - If you use `sqlite3` you don't need to do anything. - - If you use `postgresql` on a different server, you don\'t need to change anything as well since this module was never designed to configure remote databases. + - If you use `postgresql` on a different server, you don't need to change anything as well since this module was never designed to configure remote databases. - If you use `postgresql` and configured your synapse initially on `19.09` or older, you simply need to enable postgresql-support explicitly: @@ -496,12 +496,12 @@ When upgrading from a previous release, please be aware of the following incompa - If you deploy a fresh matrix-synapse, you need to configure the database yourself (e.g. by using the [services.postgresql.initialScript](options.html#opt-services.postgresql.initialScript) option). An example for this can be found in the [documentation of the Matrix module](#module-services-matrix). -- If you initially deployed your matrix-synapse on `nixos-unstable` _after_ the `19.09`-release, your database is misconfigured due to a regression in NixOS. For now, matrix-synapse will startup with a warning, but it\'s recommended to reconfigure the database to set the values `LC_COLLATE` and `LC_CTYPE` to [`'C'`](https://www.postgresql.org/docs/12/locale.html). +- If you initially deployed your matrix-synapse on `nixos-unstable` _after_ the `19.09`-release, your database is misconfigured due to a regression in NixOS. For now, matrix-synapse will startup with a warning, but it's recommended to reconfigure the database to set the values `LC_COLLATE` and `LC_CTYPE` to [`'C'`](https://www.postgresql.org/docs/12/locale.html). -- The [systemd.network.links](options.html#opt-systemd.network.links) option is now respected even when [systemd-networkd](options.html#opt-systemd.network.enable) is disabled. This mirrors the behaviour of systemd - It\'s udev that parses `.link` files, not `systemd-networkd`. +- The [systemd.network.links](options.html#opt-systemd.network.links) option is now respected even when [systemd-networkd](options.html#opt-systemd.network.enable) is disabled. This mirrors the behaviour of systemd - It's udev that parses `.link` files, not `systemd-networkd`. - mongodb has been updated to version `3.4.24`. ::: {.warning} - Please note that mongodb has been relicensed under their own [` sspl`](https://www.mongodb.com/licensing/server-side-public-license/faq)-license. Since it\'s not entirely free and not OSI-approved, it\'s listed as non-free. This means that Hydra doesn\'t provide prebuilt mongodb-packages and needs to be built locally. + Please note that mongodb has been relicensed under their own [` sspl`](https://www.mongodb.com/licensing/server-side-public-license/faq)-license. Since it's not entirely free and not OSI-approved, it's listed as non-free. This means that Hydra doesn't provide prebuilt mongodb-packages and needs to be built locally. ::: diff --git a/nixos/doc/manual/release-notes/rl-2009.section.md b/nixos/doc/manual/release-notes/rl-2009.section.md index 79be2a56a54e..6995ef1d406c 100644 --- a/nixos/doc/manual/release-notes/rl-2009.section.md +++ b/nixos/doc/manual/release-notes/rl-2009.section.md @@ -218,7 +218,7 @@ In addition to 1119 new, 118 updated, and 476 removed options; 61 new modules we When upgrading from a previous release, please be aware of the following incompatible changes: -- MariaDB has been updated to 10.4, MariaDB Galera to 26.4. Before you upgrade, it would be best to take a backup of your database. For MariaDB Galera Cluster, see [Upgrading from MariaDB 10.3 to MariaDB 10.4 with Galera Cluster](https://mariadb.com/kb/en/upgrading-from-mariadb-103-to-mariadb-104-with-galera-cluster/) instead. Before doing the upgrade read [Incompatible Changes Between 10.3 and 10.4](https://mariadb.com/kb/en/upgrading-from-mariadb-103-to-mariadb-104/#incompatible-changes-between-103-and-104). After the upgrade you will need to run `mysql_upgrade`. MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more intuitive. See [Authentication from MariaDB 10.4](https://mariadb.com/kb/en/authentication-from-mariadb-104/). unix_socket auth plugin does not use a password, and uses the connecting user\'s UID instead. When a new MariaDB data directory is initialized, two MariaDB users are created and can be used with new unix_socket auth plugin, as well as traditional mysql_native_password plugin: root\@localhost and mysql\@localhost. To actually use the traditional mysql_native_password plugin method, one must run the following: +- MariaDB has been updated to 10.4, MariaDB Galera to 26.4. Before you upgrade, it would be best to take a backup of your database. For MariaDB Galera Cluster, see [Upgrading from MariaDB 10.3 to MariaDB 10.4 with Galera Cluster](https://mariadb.com/kb/en/upgrading-from-mariadb-103-to-mariadb-104-with-galera-cluster/) instead. Before doing the upgrade read [Incompatible Changes Between 10.3 and 10.4](https://mariadb.com/kb/en/upgrading-from-mariadb-103-to-mariadb-104/#incompatible-changes-between-103-and-104). After the upgrade you will need to run `mysql_upgrade`. MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more intuitive. See [Authentication from MariaDB 10.4](https://mariadb.com/kb/en/authentication-from-mariadb-104/). unix_socket auth plugin does not use a password, and uses the connecting user's UID instead. When a new MariaDB data directory is initialized, two MariaDB users are created and can be used with new unix_socket auth plugin, as well as traditional mysql_native_password plugin: root\@localhost and mysql\@localhost. To actually use the traditional mysql_native_password plugin method, one must run the following: ```nix { @@ -284,7 +284,7 @@ When upgrading from a previous release, please be aware of the following incompa - The [matrix-synapse](options.html#opt-services.matrix-synapse.enable) module no longer includes optional dependencies by default, they have to be added through the [plugins](options.html#opt-services.matrix-synapse.plugins) option. -- `buildGoModule` now internally creates a vendor directory in the source tree for downloaded modules instead of using go\'s [module proxy protocol](https://golang.org/cmd/go/#hdr-Module_proxy_protocol). This storage format is simpler and therefore less likely to break with future versions of go. As a result `buildGoModule` switched from `modSha256` to the `vendorSha256` attribute to pin fetched version data. +- `buildGoModule` now internally creates a vendor directory in the source tree for downloaded modules instead of using go's [module proxy protocol](https://golang.org/cmd/go/#hdr-Module_proxy_protocol). This storage format is simpler and therefore less likely to break with future versions of go. As a result `buildGoModule` switched from `modSha256` to the `vendorSha256` attribute to pin fetched version data. - Grafana is now built without support for phantomjs by default. Phantomjs support has been [deprecated in Grafana](https://grafana.com/docs/grafana/latest/guides/whats-new-in-v6-4/) and the phantomjs project is [currently unmaintained](https://github.com/ariya/phantomjs/issues/15344#issue-302015362). It can still be enabled by providing `phantomJsSupport = true` to the package instantiation: @@ -306,9 +306,9 @@ When upgrading from a previous release, please be aware of the following incompa - The initrd SSH support now uses OpenSSH rather than Dropbear to allow the use of Ed25519 keys and other OpenSSH-specific functionality. Host keys must now be in the OpenSSH format, and at least one pre-generated key must be specified. - If you used the `boot.initrd.network.ssh.host*Key` options, you\'ll get an error explaining how to convert your host keys and migrate to the new `boot.initrd.network.ssh.hostKeys` option. Otherwise, if you don\'t have any host keys set, you\'ll need to generate some; see the `hostKeys` option documentation for instructions. + If you used the `boot.initrd.network.ssh.host*Key` options, you'll get an error explaining how to convert your host keys and migrate to the new `boot.initrd.network.ssh.hostKeys` option. Otherwise, if you don't have any host keys set, you'll need to generate some; see the `hostKeys` option documentation for instructions. -- Since this release there\'s an easy way to customize your PHP install to get a much smaller base PHP with only wanted extensions enabled. See the following snippet installing a smaller PHP with the extensions `imagick`, `opcache`, `pdo` and `pdo_mysql` loaded: +- Since this release there's an easy way to customize your PHP install to get a much smaller base PHP with only wanted extensions enabled. See the following snippet installing a smaller PHP with the extensions `imagick`, `opcache`, `pdo` and `pdo_mysql` loaded: ```nix { @@ -325,7 +325,7 @@ When upgrading from a previous release, please be aware of the following incompa } ``` - The default `php` attribute hasn\'t lost any extensions. The `opcache` extension has been added. All upstream PHP extensions are available under php.extensions.\. + The default `php` attribute hasn't lost any extensions. The `opcache` extension has been added. All upstream PHP extensions are available under php.extensions.\. All PHP `config` flags have been removed for the following reasons: @@ -418,9 +418,9 @@ When upgrading from a previous release, please be aware of the following incompa The default value for [services.httpd.mpm](options.html#opt-services.httpd.mpm) has been changed from `prefork` to `event`. Along with this change the default value for [services.httpd.virtualHosts.\.http2](options.html#opt-services.httpd.virtualHosts) has been set to `true`. -- The `systemd-networkd` option `systemd.network.networks..dhcp.CriticalConnection` has been removed following upstream systemd\'s deprecation of the same. It is recommended to use `systemd.network.networks..networkConfig.KeepConfiguration` instead. See systemd.network 5 for details. +- The `systemd-networkd` option `systemd.network.networks..dhcp.CriticalConnection` has been removed following upstream systemd's deprecation of the same. It is recommended to use `systemd.network.networks..networkConfig.KeepConfiguration` instead. See systemd.network 5 for details. -- The `systemd-networkd` option `systemd.network.networks._name_.dhcpConfig` has been renamed to [systemd.network.networks._name_.dhcpV4Config](options.html#opt-systemd.network.networks._name_.dhcpV4Config) following upstream systemd\'s documentation change. See systemd.network 5 for details. +- The `systemd-networkd` option `systemd.network.networks._name_.dhcpConfig` has been renamed to [systemd.network.networks._name_.dhcpV4Config](options.html#opt-systemd.network.networks._name_.dhcpV4Config) following upstream systemd's documentation change. See systemd.network 5 for details. - In the `picom` module, several options that accepted floating point numbers encoded as strings (for example [services.picom.activeOpacity](options.html#opt-services.picom.activeOpacity)) have been changed to the (relatively) new native `float` type. To migrate your configuration simply remove the quotes around the numbers. @@ -440,7 +440,7 @@ When upgrading from a previous release, please be aware of the following incompa - The GRUB specific option `boot.loader.grub.extraInitrd` has been replaced with the generic option `boot.initrd.secrets`. This option creates a secondary initrd from the specified files, rather than using a manually created initrd file. Due to an existing bug with `boot.loader.grub.extraInitrd`, it is not possible to directly boot an older generation that used that option. It is still possible to rollback to that generation if the required initrd file has not been deleted. -- The [DNSChain](https://github.com/okTurtles/dnschain) package and NixOS module have been removed from Nixpkgs as the software is unmaintained and can\'t be built. For more information see issue [\#89205](https://github.com/NixOS/nixpkgs/issues/89205). +- The [DNSChain](https://github.com/okTurtles/dnschain) package and NixOS module have been removed from Nixpkgs as the software is unmaintained and can't be built. For more information see issue [\#89205](https://github.com/NixOS/nixpkgs/issues/89205). - In the `resilio` module, [services.resilio.httpListenAddr](options.html#opt-services.resilio.httpListenAddr) has been changed to listen to `[::1]` instead of `0.0.0.0`. @@ -456,7 +456,7 @@ When upgrading from a previous release, please be aware of the following incompa - Update servers first, then clients. -- Radicale\'s default package has changed from 2.x to 3.x. An upgrade checklist can be found [here](https://github.com/Kozea/Radicale/blob/3.0.x/NEWS.md#upgrade-checklist). You can use the newer version in the NixOS service by setting the `package` to `radicale3`, which is done automatically if `stateVersion` is 20.09 or higher. +- Radicale's default package has changed from 2.x to 3.x. An upgrade checklist can be found [here](https://github.com/Kozea/Radicale/blob/3.0.x/NEWS.md#upgrade-checklist). You can use the newer version in the NixOS service by setting the `package` to `radicale3`, which is done automatically if `stateVersion` is 20.09 or higher. - `udpt` experienced a complete rewrite from C++ to rust. The configuration format changed from ini to toml. The new configuration documentation can be found at [the official website](https://naim94a.github.io/udpt/config.html) and example configuration is packaged in `${udpt}/share/udpt/udpt.toml`. @@ -522,7 +522,7 @@ When upgrading from a previous release, please be aware of the following incompa } ``` - The base package has also been upgraded to the 2020-07-29 \"Hogfather\" release. Plugins might be incompatible or require upgrading. + The base package has also been upgraded to the 2020-07-29 "Hogfather" release. Plugins might be incompatible or require upgrading. - The [services.postgresql.dataDir](options.html#opt-services.postgresql.dataDir) option is now set to `"/var/lib/postgresql/${cfg.package.psqlSchema}"` regardless of your [system.stateVersion](options.html#opt-system.stateVersion). Users with an existing postgresql install that have a [system.stateVersion](options.html#opt-system.stateVersion) of `17.03` or below should double check what the value of their [services.postgresql.dataDir](options.html#opt-services.postgresql.dataDir) option is (`/var/db/postgresql`) and then explicitly set this value to maintain compatibility: @@ -552,17 +552,17 @@ When upgrading from a previous release, please be aware of the following incompa - The [jellyfin](options.html#opt-services.jellyfin.enable) module will use and stay on the Jellyfin version `10.5.5` if `stateVersion` is lower than `20.09`. This is because significant changes were made to the database schema, and it is highly recommended to backup your instance before upgrading. After making your backup, you can upgrade to the latest version either by setting your `stateVersion` to `20.09` or higher, or set the `services.jellyfin.package` to `pkgs.jellyfin`. If you do not wish to upgrade Jellyfin, but want to change your `stateVersion`, you can set the value of `services.jellyfin.package` to `pkgs.jellyfin_10_5`. -- The `security.rngd` service is now disabled by default. This choice was made because there\'s krngd in the linux kernel space making it (for most usecases) functionally redundent. +- The `security.rngd` service is now disabled by default. This choice was made because there's krngd in the linux kernel space making it (for most usecases) functionally redundent. - The `hardware.nvidia.optimus_prime.enable` service has been renamed to `hardware.nvidia.prime.sync.enable` and has many new enhancements. Related nvidia prime settings may have also changed. - The package nextcloud17 has been removed and nextcloud18 was marked as insecure since both of them will [ will be EOL (end of life) within the lifetime of 20.09](https://docs.nextcloud.com/server/19/admin_manual/release_schedule.html). - It\'s necessary to upgrade to nextcloud19: + It's necessary to upgrade to nextcloud19: - - From nextcloud17, you have to upgrade to nextcloud18 first as Nextcloud doesn\'t allow going multiple major revisions forward in a single upgrade. This is possible by setting [services.nextcloud.package](options.html#opt-services.nextcloud.package) to nextcloud18. + - From nextcloud17, you have to upgrade to nextcloud18 first as Nextcloud doesn't allow going multiple major revisions forward in a single upgrade. This is possible by setting [services.nextcloud.package](options.html#opt-services.nextcloud.package) to nextcloud18. - - From nextcloud18, it\'s possible to directly upgrade to nextcloud19 by setting [services.nextcloud.package](options.html#opt-services.nextcloud.package) to nextcloud19. + - From nextcloud18, it's possible to directly upgrade to nextcloud19 by setting [services.nextcloud.package](options.html#opt-services.nextcloud.package) to nextcloud19. - The GNOME desktop manager no longer default installs gnome3.epiphany. It was chosen to do this as it has a usability breaking issue (see issue [\#98819](https://github.com/NixOS/nixpkgs/issues/98819)) that makes it unsuitable to be a default app. @@ -578,7 +578,7 @@ When upgrading from a previous release, please be aware of the following incompa - `services.journald.rateLimitBurst` was updated from `1000` to `10000` to follow the new upstream systemd default. -- The notmuch package moves its emacs-related binaries and emacs lisp files to a separate output. They\'re not part of the default `out` output anymore - if you relied on the `notmuch-emacs-mua` binary or the emacs lisp files, access them via the `notmuch.emacs` output. +- The notmuch package moves its emacs-related binaries and emacs lisp files to a separate output. They're not part of the default `out` output anymore - if you relied on the `notmuch-emacs-mua` binary or the emacs lisp files, access them via the `notmuch.emacs` output. - Device tree overlay support was improved in [\#79370](https://github.com/NixOS/nixpkgs/pull/79370) and now uses [hardware.deviceTree.kernelPackage](options.html#opt-hardware.deviceTree.kernelPackage) instead of `hardware.deviceTree.base`. [hardware.deviceTree.overlays](options.html#opt-hardware.deviceTree.overlays) configuration was extended to support `.dts` files with symbols. Device trees can now be filtered by setting [hardware.deviceTree.filter](options.html#opt-hardware.deviceTree.filter) option. @@ -590,7 +590,7 @@ When upgrading from a previous release, please be aware of the following incompa Please note that Rust packages utilizing a custom build/install procedure (e.g. by using a `Makefile`) or test suites that rely on the structure of the `target/` directory may break due to those assumptions. For further information, please read the Rust section in the Nixpkgs manual. -- The cc- and binutils-wrapper\'s \"infix salt\" and `_BUILD_` and `_TARGET_` user infixes have been replaced with with a \"suffix salt\" and suffixes and `_FOR_BUILD` and `_FOR_TARGET`. This matches the autotools convention for env vars which standard for these things, making interfacing with other tools easier. +- The cc- and binutils-wrapper's "infix salt" and `_BUILD_` and `_TARGET_` user infixes have been replaced with with a "suffix salt" and suffixes and `_FOR_BUILD` and `_FOR_TARGET`. This matches the autotools convention for env vars which standard for these things, making interfacing with other tools easier. - Additional Git documentation (HTML and text files) is now available via the `git-doc` package. @@ -598,7 +598,7 @@ When upgrading from a previous release, please be aware of the following incompa - The installer now enables sshd by default. This improves installation on headless machines especially ARM single-board-computer. To login through ssh, either a password or an ssh key must be set for the root user or the nixos user. -- The scripted networking system now uses `.link` files in `/etc/systemd/network` to configure mac address and link MTU, instead of the sometimes buggy `network-link-*` units, which have been removed. Bringing the interface up has been moved to the beginning of the `network-addresses-*` unit. Note this doesn\'t require `systemd-networkd` - it\'s udev that parses `.link` files. Extra care needs to be taken in the presence of [legacy udev rules](https://wiki.debian.org/NetworkInterfaceNames#THE_.22PERSISTENT_NAMES.22_SCHEME) to rename interfaces, as MAC Address and MTU defined in these options can only match on the original link name. In such cases, you most likely want to create a `10-*.link` file through [systemd.network.links](options.html#opt-systemd.network.links) and set both name and MAC Address / MTU there. +- The scripted networking system now uses `.link` files in `/etc/systemd/network` to configure mac address and link MTU, instead of the sometimes buggy `network-link-*` units, which have been removed. Bringing the interface up has been moved to the beginning of the `network-addresses-*` unit. Note this doesn't require `systemd-networkd` - it's udev that parses `.link` files. Extra care needs to be taken in the presence of [legacy udev rules](https://wiki.debian.org/NetworkInterfaceNames#THE_.22PERSISTENT_NAMES.22_SCHEME) to rename interfaces, as MAC Address and MTU defined in these options can only match on the original link name. In such cases, you most likely want to create a `10-*.link` file through [systemd.network.links](options.html#opt-systemd.network.links) and set both name and MAC Address / MTU there. - Grafana received a major update to version 7.x. A plugin is now needed for image rendering support, and plugins must now be signed by default. More information can be found [in the Grafana documentation](https://grafana.com/docs/grafana/latest/installation/upgrading/#upgrading-to-v7-0). @@ -624,15 +624,15 @@ When upgrading from a previous release, please be aware of the following incompa to get the previous behavior of listening on all network interfaces. -- With this release `systemd-networkd` (when enabled through [networking.useNetworkd](options.html#opt-networking.useNetworkd)) has it\'s netlink socket created through a `systemd.socket` unit. This gives us control over socket buffer sizes and other parameters. For larger setups where networkd has to create a lot of (virtual) devices the default buffer size (currently 128MB) is not enough. +- With this release `systemd-networkd` (when enabled through [networking.useNetworkd](options.html#opt-networking.useNetworkd)) has it's netlink socket created through a `systemd.socket` unit. This gives us control over socket buffer sizes and other parameters. For larger setups where networkd has to create a lot of (virtual) devices the default buffer size (currently 128MB) is not enough. On a machine with \>100 virtual interfaces (e.g., wireguard tunnels, VLANs, ...), that all have to be brought up during system startup, the receive buffer size will spike for a brief period. Eventually some of the message will be dropped since there is not enough (permitted) buffer space available. By having `systemd-networkd` start with a netlink socket created by `systemd` we can configure the `ReceiveBufferSize=` parameter in the socket options (i.e. `systemd.sockets.systemd-networkd.socketOptions.ReceiveBufferSize`) without recompiling `systemd-networkd`. - Since the actual memory requirements depend on hardware, timing, exact configurations etc. it isn\'t currently possible to infer a good default from within the NixOS module system. Administrators are advised to monitor the logs of `systemd-networkd` for `rtnl: kernel receive buffer overrun` spam and increase the memory limit as they see fit. + Since the actual memory requirements depend on hardware, timing, exact configurations etc. it isn't currently possible to infer a good default from within the NixOS module system. Administrators are advised to monitor the logs of `systemd-networkd` for `rtnl: kernel receive buffer overrun` spam and increase the memory limit as they see fit. - Note: Increasing the `ReceiveBufferSize=` doesn\'t allocate any memory. It just increases the upper bound on the kernel side. The memory allocation depends on the amount of messages that are queued on the kernel side of the netlink socket. + Note: Increasing the `ReceiveBufferSize=` doesn't allocate any memory. It just increases the upper bound on the kernel side. The memory allocation depends on the amount of messages that are queued on the kernel side of the netlink socket. - Specifying [mailboxes](options.html#opt-services.dovecot2.mailboxes) in the dovecot2 module as a list is deprecated and will break eval in 21.05. Instead, an attribute-set should be specified where the `name` should be the key of the attribute. @@ -662,7 +662,7 @@ When upgrading from a previous release, please be aware of the following incompa - nextcloud has been updated to [v19](https://nextcloud.com/blog/nextcloud-hub-brings-productivity-to-home-office/). - If you have an existing installation, please make sure that you\'re on nextcloud18 before upgrading to nextcloud19 since Nextcloud doesn\'t support upgrades across multiple major versions. + If you have an existing installation, please make sure that you're on nextcloud18 before upgrading to nextcloud19 since Nextcloud doesn't support upgrades across multiple major versions. - The `nixos-run-vms` script now deletes the previous run machines states on test startup. You can use the `--keep-vm-state` flag to match the previous behaviour and keep the same VM state between different test runs. diff --git a/nixos/doc/manual/release-notes/rl-2105.section.md b/nixos/doc/manual/release-notes/rl-2105.section.md index 359f2e5b2e58..6244d79e7e78 100644 --- a/nixos/doc/manual/release-notes/rl-2105.section.md +++ b/nixos/doc/manual/release-notes/rl-2105.section.md @@ -68,9 +68,9 @@ When upgrading from a previous release, please be aware of the following incompa - If the `services.dbus` module is enabled, then the user D-Bus session is now always socket activated. The associated options `services.dbus.socketActivated` and `services.xserver.startDbusSession` have therefore been removed and you will receive a warning if they are present in your configuration. This change makes the user D-Bus session available also for non-graphical logins. -- The `networking.wireless.iwd` module now installs the upstream-provided 80-iwd.link file, which sets the NamePolicy= for all wlan devices to \"keep kernel\", to avoid race conditions between iwd and networkd. If you don\'t want this, you can set `systemd.network.links."80-iwd" = lib.mkForce {}`. +- The `networking.wireless.iwd` module now installs the upstream-provided 80-iwd.link file, which sets the NamePolicy= for all wlan devices to "keep kernel", to avoid race conditions between iwd and networkd. If you don't want this, you can set `systemd.network.links."80-iwd" = lib.mkForce {}`. -- `rubyMinimal` was removed due to being unused and unusable. The default ruby interpreter includes JIT support, which makes it reference it\'s compiler. Since JIT support is probably needed by some Gems, it was decided to enable this feature with all cc references by default, and allow to build a Ruby derivation without references to cc, by setting `jitSupport = false;` in an overlay. See [\#90151](https://github.com/NixOS/nixpkgs/pull/90151) for more info. +- `rubyMinimal` was removed due to being unused and unusable. The default ruby interpreter includes JIT support, which makes it reference it's compiler. Since JIT support is probably needed by some Gems, it was decided to enable this feature with all cc references by default, and allow to build a Ruby derivation without references to cc, by setting `jitSupport = false;` in an overlay. See [\#90151](https://github.com/NixOS/nixpkgs/pull/90151) for more info. - Setting `services.openssh.authorizedKeysFiles` now also affects which keys `security.pam.enableSSHAgentAuth` will use. WARNING: If you are using these options in combination do make sure that any key paths you use are present in `services.openssh.authorizedKeysFiles`! @@ -130,7 +130,7 @@ When upgrading from a previous release, please be aware of the following incompa - `vim` and `neovim` switched to Python 3, dropping all Python 2 support. -- [networking.wireguard.interfaces.\.generatePrivateKeyFile](options.html#opt-networking.wireguard.interfaces), which is off by default, had a `chmod` race condition fixed. As an aside, the parent directory\'s permissions were widened, and the key files were made owner-writable. This only affects newly created keys. However, if the exact permissions are important for your setup, read [\#121294](https://github.com/NixOS/nixpkgs/pull/121294). +- [networking.wireguard.interfaces.\.generatePrivateKeyFile](options.html#opt-networking.wireguard.interfaces), which is off by default, had a `chmod` race condition fixed. As an aside, the parent directory's permissions were widened, and the key files were made owner-writable. This only affects newly created keys. However, if the exact permissions are important for your setup, read [\#121294](https://github.com/NixOS/nixpkgs/pull/121294). - [boot.zfs.forceImportAll](options.html#opt-boot.zfs.forceImportAll) previously did nothing, but has been fixed. However its default has been changed to `false` to preserve the existing default behaviour. If you have this explicitly set to `true`, please note that your non-root pools will now be forcibly imported. @@ -157,12 +157,12 @@ When upgrading from a previous release, please be aware of the following incompa - Amazon EC2 and OpenStack Compute (nova) images now re-fetch instance meta data and user data from the instance metadata service (IMDS) on each boot. For example: stopping an EC2 instance, changing its user data, and restarting the instance will now cause it to fetch and apply the new user data. ::: {.warning} - Specifically, `/etc/ec2-metadata` is re-populated on each boot. Some NixOS scripts that read from this directory are guarded to only run if the files they want to manipulate do not already exist, and so will not re-apply their changes if the IMDS response changes. Examples: `root`\'s SSH key is only added if `/root/.ssh/authorized_keys` does not exist, and SSH host keys are only set from user data if they do not exist in `/etc/ssh`. + Specifically, `/etc/ec2-metadata` is re-populated on each boot. Some NixOS scripts that read from this directory are guarded to only run if the files they want to manipulate do not already exist, and so will not re-apply their changes if the IMDS response changes. Examples: `root`'s SSH key is only added if `/root/.ssh/authorized_keys` does not exist, and SSH host keys are only set from user data if they do not exist in `/etc/ssh`. ::: - The `rspamd` services is now sandboxed. It is run as a dynamic user instead of root, so secrets and other files may have to be moved or their permissions may have to be fixed. The sockets are now located in `/run/rspamd` instead of `/run`. -- Enabling the Tor client no longer silently also enables and configures Privoxy, and the `services.tor.client.privoxy.enable` option has been removed. To enable Privoxy, and to configure it to use Tor\'s faster port, use the following configuration: +- Enabling the Tor client no longer silently also enables and configures Privoxy, and the `services.tor.client.privoxy.enable` option has been removed. To enable Privoxy, and to configure it to use Tor's faster port, use the following configuration: ```nix { @@ -181,7 +181,7 @@ When upgrading from a previous release, please be aware of the following incompa - The fish-foreign-env package has been replaced with fishPlugins.foreign-env, in which the fish functions have been relocated to the `vendor_functions.d` directory to be loaded automatically. -- The prometheus json exporter is now managed by the prometheus community. Together with additional features some backwards incompatibilities were introduced. Most importantly the exporter no longer accepts a fixed command-line parameter to specify the URL of the endpoint serving JSON. It now expects this URL to be passed as an URL parameter, when scraping the exporter\'s `/probe` endpoint. In the prometheus scrape configuration the scrape target might look like this: +- The prometheus json exporter is now managed by the prometheus community. Together with additional features some backwards incompatibilities were introduced. Most importantly the exporter no longer accepts a fixed command-line parameter to specify the URL of the endpoint serving JSON. It now expects this URL to be passed as an URL parameter, when scraping the exporter's `/probe` endpoint. In the prometheus scrape configuration the scrape target might look like this: ``` http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/endpoint @@ -230,7 +230,7 @@ When upgrading from a previous release, please be aware of the following incompa Additionally, packages flashplayer and hal-flash were removed along with the `services.flashpolicyd` module. -- The `security.rngd` module has been removed. It was disabled by default in 20.09 as it was functionally redundant with krngd in the linux kernel. It is not necessary for any device that the kernel recognises as an hardware RNG, as it will automatically run the krngd task to periodically collect random data from the device and mix it into the kernel\'s RNG. +- The `security.rngd` module has been removed. It was disabled by default in 20.09 as it was functionally redundant with krngd in the linux kernel. It is not necessary for any device that the kernel recognises as an hardware RNG, as it will automatically run the krngd task to periodically collect random data from the device and mix it into the kernel's RNG. The default SMTP port for GitLab has been changed to `25` from its previous default of `465`. If you depended on this default, you should now set the [services.gitlab.smtp.port](options.html#opt-services.gitlab.smtp.port) option. @@ -272,11 +272,11 @@ When upgrading from a previous release, please be aware of the following incompa - `environment.defaultPackages` now includes the nano package. If pkgs.nano is not added to the list, make sure another editor is installed and the `EDITOR` environment variable is set to it. Environment variables can be set using `environment.variables`. -- `services.minio.dataDir` changed type to a list of paths, required for specifiyng multiple data directories for using with erasure coding. Currently, the service doesn\'t enforce nor checks the correct number of paths to correspond to minio requirements. +- `services.minio.dataDir` changed type to a list of paths, required for specifiyng multiple data directories for using with erasure coding. Currently, the service doesn't enforce nor checks the correct number of paths to correspond to minio requirements. - All CUDA toolkit versions prior to CUDA 10 have been removed. -- The kbdKeymaps package was removed since dvp and neo are now included in kbd. If you want to use the Programmer Dvorak Keyboard Layout, you have to use `dvorak-programmer` in `console.keyMap` now instead of `dvp`. In `services.xserver.xkbVariant` it\'s still `dvp`. +- The kbdKeymaps package was removed since dvp and neo are now included in kbd. If you want to use the Programmer Dvorak Keyboard Layout, you have to use `dvorak-programmer` in `console.keyMap` now instead of `dvp`. In `services.xserver.xkbVariant` it's still `dvp`. - The babeld service is now being run as an unprivileged user. To achieve that the module configures `skip-kernel-setup true` and takes care of setting forwarding and rp_filter sysctls by itself as well as for each interface in `services.babeld.interfaces`. @@ -286,7 +286,7 @@ When upgrading from a previous release, please be aware of the following incompa - Instead of determining `services.radicale.package` automatically based on `system.stateVersion`, the latest version is always used because old versions are not officially supported. - Furthermore, Radicale\'s systemd unit was hardened which might break some deployments. In particular, a non-default `filesystem_folder` has to be added to `systemd.services.radicale.serviceConfig.ReadWritePaths` if the deprecated `services.radicale.config` is used. + Furthermore, Radicale's systemd unit was hardened which might break some deployments. In particular, a non-default `filesystem_folder` has to be added to `systemd.services.radicale.serviceConfig.ReadWritePaths` if the deprecated `services.radicale.config` is used. - In the `security.acme` module, use of `--reuse-key` parameter for Lego has been removed. It was introduced for HKPK, but this security feature is now deprecated. It is a better security practice to rotate key pairs instead of always keeping the same. If you need to keep this parameter, you can add it back using `extraLegoRenewFlags` as an option for the appropriate certificate. @@ -294,13 +294,13 @@ When upgrading from a previous release, please be aware of the following incompa - `stdenv.lib` has been deprecated and will break eval in 21.11. Please use `pkgs.lib` instead. See [\#108938](https://github.com/NixOS/nixpkgs/issues/108938) for details. -- [GNURadio](https://www.gnuradio.org/) has a `pkgs` attribute set, and there\'s a `gnuradio.callPackage` function that extends `pkgs` with a `mkDerivation`, and a `mkDerivationWith`, like Qt5. Now all `gnuradio.pkgs` are defined with `gnuradio.callPackage` and some packages that depend on gnuradio are defined with this as well. +- [GNURadio](https://www.gnuradio.org/) has a `pkgs` attribute set, and there's a `gnuradio.callPackage` function that extends `pkgs` with a `mkDerivation`, and a `mkDerivationWith`, like Qt5. Now all `gnuradio.pkgs` are defined with `gnuradio.callPackage` and some packages that depend on gnuradio are defined with this as well. - [Privoxy](https://www.privoxy.org/) has been updated to version 3.0.32 (See [announcement](https://lists.privoxy.org/pipermail/privoxy-announce/2021-February/000007.html)). Compared to the previous release, Privoxy has gained support for HTTPS inspection (still experimental), Brotli decompression, several new filters and lots of bug fixes, including security ones. In addition, the package is now built with compression and external filters support, which were previously disabled. Regarding the NixOS module, new options for HTTPS inspection have been added and `services.privoxy.extraConfig` has been replaced by the new [services.privoxy.settings](options.html#opt-services.privoxy.settings) (See [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) for the motivation). -- [Kodi](https://kodi.tv/) has been updated to version 19.1 \"Matrix\". See the [announcement](https://kodi.tv/article/kodi-19-0-matrix-release) for further details. +- [Kodi](https://kodi.tv/) has been updated to version 19.1 "Matrix". See the [announcement](https://kodi.tv/article/kodi-19-0-matrix-release) for further details. - The `services.packagekit.backend` option has been removed as it only supported a single setting which would always be the default. Instead new [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) compliant [services.packagekit.settings](options.html#opt-services.packagekit.settings) and [services.packagekit.vendorSettings](options.html#opt-services.packagekit.vendorSettings) options have been introduced. @@ -316,13 +316,13 @@ When upgrading from a previous release, please be aware of the following incompa If this option is disabled, default MTA config becomes not set and you should set the options in `services.mailman.settings.mta` according to the desired configuration as described in [Mailman documentation](https://mailman.readthedocs.io/en/latest/src/mailman/docs/mta.html). -- The default-version of `nextcloud` is nextcloud21. Please note that it\'s _not_ possible to upgrade `nextcloud` across multiple major versions! This means that it\'s e.g. not possible to upgrade from nextcloud18 to nextcloud20 in a single deploy and most `20.09` users will have to upgrade to nextcloud20 first. +- The default-version of `nextcloud` is nextcloud21. Please note that it's _not_ possible to upgrade `nextcloud` across multiple major versions! This means that it's e.g. not possible to upgrade from nextcloud18 to nextcloud20 in a single deploy and most `20.09` users will have to upgrade to nextcloud20 first. The package can be manually upgraded by setting [services.nextcloud.package](options.html#opt-services.nextcloud.package) to nextcloud21. - The setting [services.redis.bind](options.html#opt-services.redis.bind) defaults to `127.0.0.1` now, making Redis listen on the loopback interface only, and not all public network interfaces. -- NixOS now emits a deprecation warning if systemd\'s `StartLimitInterval` setting is used in a `serviceConfig` section instead of in a `unitConfig`; that setting is deprecated and now undocumented for the service section by systemd upstream, but still effective and somewhat buggy there, which can be confusing. See [\#45785](https://github.com/NixOS/nixpkgs/issues/45785) for details. +- NixOS now emits a deprecation warning if systemd's `StartLimitInterval` setting is used in a `serviceConfig` section instead of in a `unitConfig`; that setting is deprecated and now undocumented for the service section by systemd upstream, but still effective and somewhat buggy there, which can be confusing. See [\#45785](https://github.com/NixOS/nixpkgs/issues/45785) for details. All services should use [systemd.services._name_.startLimitIntervalSec](options.html#opt-systemd.services._name_.startLimitIntervalSec) or `StartLimitIntervalSec` in [systemd.services._name_.unitConfig](options.html#opt-systemd.services._name_.unitConfig) instead. @@ -357,7 +357,7 @@ When upgrading from a previous release, please be aware of the following incompa `services.unbound.forwardAddresses` and `services.unbound.allowedAccess` have also been changed to use the new settings interface. You can follow the instructions when executing `nixos-rebuild` to upgrade your configuration to use the new interface. -- The `services.dnscrypt-proxy2` module now takes the upstream\'s example configuration and updates it with the user\'s settings. An option has been added to restore the old behaviour if you prefer to declare the configuration from scratch. +- The `services.dnscrypt-proxy2` module now takes the upstream's example configuration and updates it with the user's settings. An option has been added to restore the old behaviour if you prefer to declare the configuration from scratch. - NixOS now defaults to the unified cgroup hierarchy (cgroupsv2). See the [Fedora Article for 31](https://www.redhat.com/sysadmin/fedora-31-control-group-v2) for details on why this is desirable, and how it impacts containers. @@ -367,11 +367,11 @@ When upgrading from a previous release, please be aware of the following incompa - GNOME users may wish to delete their `~/.config/pulse` due to the changes to stream routing logic. See [PulseAudio bug 832](https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/832) for more information. -- The zookeeper package does not provide `zooInspector.sh` anymore, as that \"contrib\" has been dropped from upstream releases. +- The zookeeper package does not provide `zooInspector.sh` anymore, as that "contrib" has been dropped from upstream releases. -- In the ACME module, the data used to build the hash for the account directory has changed to accomodate new features to reduce account rate limit issues. This will trigger new account creation on the first rebuild following this update. No issues are expected to arise from this, thanks to the new account creation handling. +- In the ACME module, the data used to build the hash for the account directory has changed to accommodate new features to reduce account rate limit issues. This will trigger new account creation on the first rebuild following this update. No issues are expected to arise from this, thanks to the new account creation handling. -- [users.users._name_.createHome](options.html#opt-users.users._name_.createHome) now always ensures home directory permissions to be `0700`. Permissions had previously been ignored for already existing home directories, possibly leaving them readable by others. The option\'s description was incorrect regarding ownership management and has been simplified greatly. +- [users.users._name_.createHome](options.html#opt-users.users._name_.createHome) now always ensures home directory permissions to be `0700`. Permissions had previously been ignored for already existing home directories, possibly leaving them readable by others. The option's description was incorrect regarding ownership management and has been simplified greatly. - When defining a new user, one of [users.users._name_.isNormalUser](options.html#opt-users.users._name_.isNormalUser) and [users.users._name_.isSystemUser](options.html#opt-users.users._name_.isSystemUser) is now required. This is to prevent accidentally giving a UID above 1000 to system users, which could have unexpected consequences, like running user activation scripts for system users. Note that users defined with an explicit UID below 500 are exempted from this check, as [users.users._name_.isSystemUser](options.html#opt-users.users._name_.isSystemUser) has no effect for those. diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 5cb3731071f3..7272e9231582 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -164,6 +164,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [smartctl_exporter](https://github.com/prometheus-community/smartctl_exporter), a Prometheus exporter for [S.M.A.R.T.](https://en.wikipedia.org/wiki/S.M.A.R.T.) data. Available as [services.prometheus.exporters.smartctl](options.html#opt-services.prometheus.exporters.smartctl.enable). +- [twingate](https://docs.twingate.com/docs/linux), a high performance, easy to use zero trust solution that enables access to private resources from any device with better security than a VPN. + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} - The NixOS VM test framework, `pkgs.nixosTest`/`make-test-python.nix` (`pkgs.testers.nixosTest` since 22.05), now requires detaching commands such as `succeed("foo &")` and `succeed("foo | xclip -i")` to close stdout. @@ -233,7 +235,7 @@ In addition to numerous new and upgraded packages, this release has the followin - The `erigon` ethereum node has moved to a new database format in `2021-05-04`, and requires a full resync -- The `erigon` ethereum node has moved it's database location in `2021-08-03`, users upgrading must manually move their chaindata (see [release notes](https://github.com/ledgerwatch/erigon/releases/tag/v2021.08.03)). +- The `erigon` ethereum node has moved its database location in `2021-08-03`, users upgrading must manually move their chaindata (see [release notes](https://github.com/ledgerwatch/erigon/releases/tag/v2021.08.03)). - [users.users.<name>.group](options.html#opt-users.users._name_.group) no longer defaults to `nogroup`, which was insecure. Out-of-tree modules are likely to require adaptation: instead of ```nix @@ -427,7 +429,7 @@ In addition to numerous new and upgraded packages, this release has the followin - The `services.ddclient.password` option was removed, and replaced with `services.ddclient.passwordFile`. -- The default GNAT version has been changed: The `gnat` attribute now points to `gnat11` +- The default GNAT version has been changed: The `gnat` attribute now points to `gnat12` instead of `gnat9`. - `retroArchCores` has been removed. This means that using `nixpkgs.config.retroarch` to customize RetroArch cores is not supported anymore. Instead, use package overrides, for example: `retroarch.override { cores = with libretro; [ citra snes9x ]; };`. Also, `retroarchFull` derivation is available for those who want to have all RetroArch cores available. diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 217aa6056cad..24f73dc3f00b 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -9,8 +9,8 @@ In addition to numerous new and upgraded packages, this release has the followin - Nix has been updated from 2.3 to 2.8. This mainly brings experimental support for Flakes, but also marks the `nix` command as experimental which now has to be enabled via the configuration explicitly. For more information and - instructions for upgrades, see the - relase notes for [nix-2.4](https://nixos.org/manual/nix/stable/release-notes/rl-2.4.html), + instructions for upgrades, see the + relase notes for [nix-2.4](https://nixos.org/manual/nix/stable/release-notes/rl-2.4.html), [nix-2.5](https://nixos.org/manual/nix/stable/release-notes/rl-2.5.html), [nix-2.6](https://nixos.org/manual/nix/stable/release-notes/rl-2.6.html), [nix-2.7](https://nixos.org/manual/nix/stable/release-notes/rl-2.7.html) and @@ -30,7 +30,7 @@ In addition to numerous new and upgraded packages, this release has the followin - Systemd has been upgraded to the version 250. -- Pulseaudio has been updated to version 15.0 and now optionally +- Pulseaudio has been updated to version 15.0 and now optionally [supports additional Bluetooth audio codecs](https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/#supportforldacandaptxbluetoothcodecsplussbcxqsbcwithhigher-qualityparameters) such as aptX or LDAC, with codec switching available in `pavucontrol`. This feature is disabled by default, but can be enabled with the option @@ -50,7 +50,7 @@ In addition to numerous new and upgraded packages, this release has the followin settings for many certificates at once. This also opens up the option to use DNS-01 validation when using `enableACME` web server virtual hosts (e.g. `services.nginx.virtualHosts.*.enableACME`). - + ## New Services {#sec-release-22.05-new-services} - [1password](https://1password.com/), command-lines and graphic interface for 1Password. Available as [programs._1password](#opt-programs._1password.enable) and [programs._1password-gui](#opt-programs._1password.enable). @@ -107,7 +107,7 @@ In addition to numerous new and upgraded packages, this release has the followin - [kanidm](https://kanidm.github.io/kanidm/stable/), an identity management server written in Rust. Available as [services.kanidm](#opt-services.kanidm.enableServer) -- [Maddy](https://maddy.email/), a free an open source mail server. Availabe as [services.maddy](#opt-services.maddy.enable). +- [Maddy](https://maddy.email/), a free an open source mail server. Available as [services.maddy](#opt-services.maddy.enable). - [matrix-conduit](https://conduit.rs/), a simple, fast and reliable chat server powered by matrix. Available as [services.matrix-conduit](option.html#opt-services.matrix-conduit.enable). @@ -562,7 +562,7 @@ In addition to numerous new and upgraded packages, this release has the followin - `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. + * 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 overridden 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. @@ -743,11 +743,11 @@ In addition to numerous new and upgraded packages, this release has the followin - 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. - + - [`kops`](https://kops.sigs.k8s.io) defaults to 1.23.2, 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. The default behaviour for `spec.kubeDNS.nodeLocalDNS.forwardToKubeDNS` has changed from `true` to `false`. Cilium now has `disable-cnp-status-updates: true` by default. Set this to false if you rely on the CiliumNetworkPolicy status fields. Support for Kubernetes 1.17, the Lyft CNI, Weave CNI on Kubernetes >= 1.23, CentOS 7 and 8, Debian 9, RHEL 7, and Ubuntu 16.05 (Xenial) has been removed. See the [1.22 release notes](https://kops.sigs.k8s.io/releases/1.22-notes/) and [1.23 release notes](https://kops.sigs.k8s.io/releases/1.23-notes/) for more details, including other significant changes. - Mattermost has been upgraded to extended support version 6.3 as the previously - packaged extended support version 5.37 is [reaching end of life](https://docs.mattermost.com/upgrade/extended-support-release.html). + packaged extended support version 5.37 is [reaching end of life](https://docs.mattermost.com/upgrade/extended-support-release.html). Migration may take some time, 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). @@ -762,14 +762,14 @@ In addition to numerous new and upgraded packages, this release has the followin By default auto-upgrade will now run immediately if it would have been triggered at least once during the time when the timer was inactive. -- Mastodon now uses `services.redis.servers` to start a new redis server, instead of using a global redis server. +- Mastodon now uses `services.redis.servers` to start a new redis server, instead of using a global redis server. This improves compatibility with other services that use redis. - - Note that this will recreate the redis database, although according to the [Mastodon docs](https://docs.joinmastodon.org/admin/backups/), + + Note that this will recreate the redis database, although according to the [Mastodon docs](https://docs.joinmastodon.org/admin/backups/), this is almost harmless: - > Losing the Redis database is almost harmless: The only irrecoverable data will be the contents of the Sidekiq queues and scheduled retries of previously failed jobs. + > Losing the Redis database is almost harmless: The only irrecoverable data will be the contents of the Sidekiq queues and scheduled retries of previously failed jobs. > The home and list feeds are stored in Redis, but can be regenerated with tootctl. - + If you do want to save the redis database, you can use the following commands: ```bash redis-cli save @@ -980,7 +980,7 @@ In addition to numerous new and upgraded packages, this release has the followin or `wl*` with priority 99 (which means that it doesn't have any effect if such an interface is matched by a `.network-`unit with a lower priority). In case of scripted networking, no behavior was changed. - + - The new [`postgresqlTestHook`](https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook) runs a PostgreSQL server for the duration of package checks. - `zfs` was updated from 2.1.4 to 2.1.5, enabling it to be used with Linux kernel 5.18. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index b8aa0cc09fa9..e92c776b33e3 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -1,27 +1,53 @@ -# Release 22.11 (“Raccoon”, 2022.11/??) {#sec-release-22.11} +# Release 22.11 (“Raccoon”, 2022.11/30) {#sec-release-22.11} -Support is planned until the end of June 2023, handing over to 23.05. +The NixOS release team is happy to announce a new version of NixOS 22.11. NixOS is a Linux distribution, whose set of packages can also be used on other Linux systems and macOS. + +This release is supported until the end of June 2023, handing over to NixOS 23.05. + +To upgrade to the latest release follow the [upgrade chapter](#sec-upgrading). ## Highlights {#sec-release-22.11-highlights} -In addition to numerous new and upgraded packages, this release has the following highlights: +In addition to numerous new and upgraded packages, this release includes the following highlights: -- GNOME has been upgraded to 43. Please take a look at their [Release - Notes](https://release.gnome.org/43/) for details. +- Software that uses the `crypt` password hashing API is now using the implementation provided by [`libxcrypt`](https://github.com/besser82/libxcrypt) instead of glibc's, which enables support for more secure algorithms. + - Support for algorithms that `libxcrypt` [does not consider strong](https://github.com/besser82/libxcrypt/blob/v4.4.28/lib/hashes.conf#L41) are **deprecated** as of this release, and will be removed in NixOS 23.05. + - This includes system login passwords. Given this, we **strongly encourage** all users to update their system passwords, as you will be unable to login if password hashes are not migrated by the time their support is removed. + - When using `users.users..hashedPassword` to configure user passwords, run `mkpasswd`, and use the yescrypt hash that is provided as the new value. + - On the other hand, for interactively configured user passwords, simply re-set the passwords for all users with `passwd`. + - This release introduces warnings for the use of deprecated hash algorithms for both methods of configuring passwords. To make sure you migrated correctly, run `nixos-rebuild switch`. -- During cross-compilation, tests are now executed if the test suite can be executed - by the build platform. This is the case when doing “native” cross-compilation - where the build and host platforms are largely the same, but the nixpkgs' cross - compilation infrastructure is used, e.g. `pkgsStatic` and `pkgsLLVM`. Another - possibility is that the build platform is a superset of the host platform, e.g. when - cross-compiling from `x86_64-unknown-linux` to `i686-unknown-linux`. - The predicate gating test suite execution is the newly added `canExecute` - predicate: You can e.g. check if `stdenv.buildPlatform` can execute binaries - built for `stdenv.hostPlatform` (i.e. produced by `stdenv.cc`) by evaluating - `stdenv.buildPlatform.canExecute stdenv.hostPlatform`. +- The NixOS documentation is now generated from markdown. While docbook is still part of the documentation build process, it's a big step towards the full migration. -- The `nixpkgs.hostPlatform` and `nixpkgs.buildPlatform` options have been added. - These cover and override the `nixpkgs.{system,localSystem,crossSystem}` options. +- `aarch64-linux` is now included in the `nixos-22.11` and `nixos-22.11-small` channels. This means that when those channel update, both `x86_64-linux` and `aarch64-linux` will be available in the binary cache. + +- `aarch64-linux` ISOs are now available on the [downloads page](https://nixos.org/download.html). + +- `nsncd` is now available as a replacement of `nscd`. + + `nscd` is responsible for resolving hostnames, users and more in NixOS and has been a long standing source of bugs, such as sporadic network freezes. + + More context in this [issue](https://github.com/NixOS/nixpkgs/issues/135888). + + Help us test the new implementation by setting `services.nscd.enableNsncd` to `true`. + + We plan to use `nsncd` by default in NixOS 23.05. + +- Linode cloud images are now supported by importing `${modulesPath}/virtualisation/linode-image.nix` and accessing `system.build.linodeImage` on the output. + +- `hardware.nvidia` has a new option, `hardware.nvidia.open`, that can be used to enable the usage of NVIDIA's open-source kernel driver. Note that the driver's support for GeForce and Workstation GPUs is still alpha quality, see [the release announcement](https://developer.nvidia.com/blog/nvidia-releases-open-source-gpu-kernel-modules/) for more information. + +- The `emacs` package now makes use of native compilation which means: + - Emacs packages from Nixpkgs, builtin or not, will do native compilation ahead of time so you can enjoy the benefit of native compilation without compiling them on you machine; + - Emacs packages from somewhere else, e.g. `package-install`, will perform asynchronously deferred native compilation. If you do not want this, maybe to avoid CPU consumption for compilation, you can use `(setq native-comp-deferred-compilation nil)` to disable it while still benefiting from native compilation for packages from Nixpkgs. + +## Internal changes {#sec-release-22.11-internal} + +- Haskell `ghcWithPackages` is now up to 15 times faster to evaluate, thanks to changing `lib.closePropagation` from a quadratic to linear complexity. Please see backward incompatibilities notes below. + +- For cross-compilation targets that can also run on the building machine, we now run tests. This, for example, is the case for the `pkgsStatic` and `pkgsLLVM` package sets or i686 packages on `x86_64` machines. + +- To simplify cross-compilation in NixOS, this release introduces the `nixpkgs.hostPlatform` and `nixpkgs.buildPlatform` options. These cover and override the `nixpkgs.{system,localSystem,crossSystem}` options. - `hostPlatform` is the platform or "`system`" string of the NixOS system described by the configuration. @@ -38,132 +64,24 @@ In addition to numerous new and upgraded packages, this release has the followin for a transition period so that in time the ecosystem can switch without breaking compatibility with any supported NixOS release. -- `emacs` enables native compilation which means: - - emacs packages from nixpkgs, builtin or not, will do native compilation ahead of time so you can enjoy the benefit of native compilation without compiling them on you machine; - - emacs packages from somewhere else, e.g. `package-install`, will do asynchronously deferred native compilation. If you do not want this, maybe to avoid CPU consumption for compilation, you can use `(setq native-comp-deferred-compilation nil)` to disable it while still enjoy the benefit of native compilation for packages from nixpkgs. +## Notable version updates {#sec-release-22.11-version-updates} -- `nixos-generate-config` now generates configurations that can be built in pure - mode. This is achieved by setting the new `nixpkgs.hostPlatform` option. - - You may have to unset the `system` parameter in `lib.nixosSystem`, or similarly - remove definitions of the `nixpkgs.{system,localSystem,crossSystem}` options. - - Alternatively, you can remove the `hostPlatform` line and use NixOS like you - would in NixOS 22.05 and earlier. - -- PHP now defaults to PHP 8.1, updated from 8.0. - -- PHP is now built `NTS` (Non-Thread Safe) style by default, for Apache and - `mod_php` usage we still enable `ZTS` (Zend Thread Safe). This has been a - common practice for a long time in other distributions. - -- PHP 8.2.0 RC 6 is available. - -- `protonup` has been aliased to and replaced by `protonup-ng` due to upstream not maintaining it. - -- Perl has been updated to 5.36, and its core module `HTTP::Tiny` was patched to verify SSL/TLS certificates by default. - -- Improved performances of `lib.closePropagation` which was previously quadratic. This is used in e.g. `ghcWithPackages`. Please see backward incompatibilities notes below. - -- Cinnamon has been updated to 5.4. While at it, the cinnamon module now defaults to - blueman as bluetooth manager and slick-greeter as lightdm greeter to match upstream. +- Nix has been upgraded from v2.8.1 to v2.11.0. For more information, please see the release notes for [2.9](https://nixos.org/manual/nix/stable/release-notes/rl-2.9.html), [2.10](https://nixos.org/manual/nix/stable/release-notes/rl-2.10.html) and [2.11](https://nixos.org/manual/nix/stable/release-notes/rl-2.11.html). - OpenSSL now defaults to OpenSSL 3, updated from 1.1.1. -- An image configuration and generator has been added for Linode images, largely based on the present GCE configuration and image. +- GNOME has been upgraded to version 43. Please see the [release notes](https://release.gnome.org/43/) for details. -- `hardware.nvidia` has a new option `open` that can be used to opt in the opensource version of NVIDIA kernel driver. Note that the driver's support for GeForce and Workstation GPUs is still alpha quality, see [NVIDIA Releases Open-Source GPU Kernel Modules](https://developer.nvidia.com/blog/nvidia-releases-open-source-gpu-kernel-modules/) for the official announcement. +- KDE Plasma has been upgraded from v5.24 to v5.26. Please see the release notes for [v5.25](https://kde.org/announcements/plasma/5/5.25.0/) and [v5.26](https://kde.org/announcements/plasma/5/5.26.0/) for more details on the included changes. - +- Cinnamon has been updated to 5.4, and the Cinnamon module now defaults to + Blueman as the Bluetooth manager and slick-greeter as the LightDM greeter, to match upstream. -## New Services {#sec-release-22.11-new-services} +- PHP now defaults to PHP 8.1, updated from 8.0. -- [appvm](https://github.com/jollheef/appvm), Nix based app VMs. Available as [virtualisation.appvm](options.html#opt-virtualisation.appvm.enable). +- Perl has been updated to 5.36, and its core module `HTTP::Tiny` was patched to verify SSL/TLS certificates by default. -- [automatic-timezoned](https://github.com/maxbrunet/automatic-timezoned). a Linux daemon to automatically update the system timezone based on location. Available as [services.automatic-timezoned](#opt-services.automatic-timezoned.enable). - -- [xray] (https://github.com/XTLS/Xray-core), a fully compatible v2ray-core replacement. Features XTLS, which when enabled on server and client, brings UDP FullCone NAT to proxy setups. Available as [services.xray](options.html#opt-services.xray.enable). - -- [syncstorage-rs](https://github.com/mozilla-services/syncstorage-rs), a self-hostable sync server for Firefox. Available as [services.firefox-syncserver](options.html#opt-services.firefox-syncserver.enable). - -- [dragonflydb](https://dragonflydb.io/), a modern replacement for Redis and Memcached. Available as [services.dragonflydb](#opt-services.dragonflydb.enable). - -- [Komga](https://komga.org/), a free and open source comics/mangas media server. Available as [services.komga](#opt-services.komga.enable). - -- [Tandoor Recipes](https://tandoor.dev), a self-hosted multi-tenant recipe collection. Available as [services.tandoor-recipes](options.html#opt-services.tandoor-recipes.enable). - -- [HBase cluster](https://hbase.apache.org/), a distributed, scalable, big data store. Available as [services.hadoop.hbase](options.html#opt-services.hadoop.hbase.enable). - -- [Please](https://github.com/edneville/please), a Sudo clone written in Rust. Available as [security.please](#opt-security.please.enable) - -- [Sachet](https://github.com/messagebird/sachet/), an SMS alerting tool for the Prometheus Alertmanager. Available as [services.prometheus.sachet](#opt-services.prometheus.sachet.enable). - -- [EVCC](https://evcc.io) is an EV charge controller with PV integration. It supports a multitude of chargers, meters, vehicle APIs and more and ties that together with a well-tested backend and a lightweight web frontend. Available as [services.evcc](#opt-services.evcc.enable). - -- [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle. - Available as [services.infnoise](options.html#opt-services.infnoise.enable). - -- [kthxbye](https://github.com/prymitive/kthxbye), an alert acknowledgement management daemon for Prometheus Alertmanager. Available as [services.kthxbye](options.html#opt-services.kthxbye.enable) - -- [kanata](https://github.com/jtroo/kanata), a tool to improve keyboard comfort and usability with advanced customization. - Available as [services.kanata](options.html#opt-services.kanata.enable). - -- [karma](https://github.com/prymitive/karma), an alert dashboard for Prometheus Alertmanager. Available as [services.karma](options.html#opt-services.karma.enable) - -- [languagetool](https://languagetool.org/), a multilingual grammar, style, and spell checker. - Available as [services.languagetool](options.html#opt-services.languagetool.enable). - -- [OpenRGB](https://gitlab.com/CalcProgrammer1/OpenRGB/-/tree/master), a FOSS tool for controlling RGB lighting. Available as [services.hardware.openrgb.enable](options.html#opt-services-hardware-openrgb-enable). - -- [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable). - -- [ntfy.sh](https://ntfy.sh), a push notification service. Available as [services.ntfy-sh](#opt-services.ntfy-sh.enable) - -- [alps](https://git.sr.ht/~migadu/alps), a simple and extensible webmail. Available as [services.alps](#opt-services.alps.enable). - -- [endlessh](https://github.com/skeeto/endlessh), an SSH tarpit. Available as [services.endlessh](#opt-services.endlessh.enable). - -- [endlessh-go](https://github.com/shizunge/endlessh-go), an SSH tarpit that exposes Prometheus metrics. Available as [services.endlessh-go](#opt-services.endlessh-go.enable). - -- [Garage](https://garagehq.deuxfleurs.fr/), a simple object storage server for geodistributed deployments, alternative to MinIO. Available as [services.garage](#opt-services.garage.enable). - -- [netbird](https://netbird.io), a zero configuration VPN. - Available as [services.netbird](options.html#opt-services.netbird.enable). - -- [persistent-evdev](https://github.com/aiberia/persistent-evdev), a daemon to add virtual proxy devices that mirror a physical input device but persist even if the underlying hardware is hot-plugged. Available as [services.persistent-evdev](#opt-services.persistent-evdev.enable). - -- [schleuder](https://schleuder.org/), a mailing list manager with PGP support. Enable using [services.schleuder](#opt-services.schleuder.enable). - -- [Dolibarr](https://www.dolibarr.org/), an enterprise resource planning and customer relationship manager. Enable using [services.dolibarr](#opt-services.dolibarr.enable). - -- [FreshRSS](https://freshrss.org/), a free, self-hostable RSS feed aggregator. Available as [services.freshrss](#opt-services.freshrss.enable). - -- [expressvpn](https://www.expressvpn.com), the CLI client for ExpressVPN. Available as [services.expressvpn](#opt-services.expressvpn.enable). - -- [merecat](https://troglobit.com/projects/merecat/), a small and easy HTTP server based on thttpd. Available as [services.merecat](#opt-services.merecat.enable) - -- [go-autoconfig](https://github.com/L11R/go-autoconfig), IMAP/SMTP autodiscover server. Available as [services.go-autoconfig](#opt-services.go-autoconfig.enable). - -- [tmate-ssh-server](https://github.com/tmate-io/tmate-ssh-server), server side part of [tmate](https://tmate.io/). Available as [services.tmate-ssh-server](#opt-services.tmate-ssh-server.enable). - -- [Grafana Tempo](https://www.grafana.com/oss/tempo/), a distributed tracing store. Available as [services.tempo](#opt-services.tempo.enable). - -- [AusweisApp2](https://www.ausweisapp.bund.de/), the authentication software for the German ID card. Available as [programs.ausweisapp](#opt-programs.ausweisapp.enable). - -- [Patroni](https://github.com/zalando/patroni), a template for PostgreSQL HA with ZooKeeper, etcd or Consul. -Available as [services.patroni](options.html#opt-services.patroni.enable). - -- [Prometheus IPMI exporter](https://github.com/prometheus-community/ipmi_exporter), an IPMI exporter for Prometheus. Available as [services.prometheus.exporters.ipmi](#opt-services.prometheus.exporters.ipmi.enable). - -- [WriteFreely](https://writefreely.org), a simple blogging platform with ActivityPub support. Available as [services.writefreely](options.html#opt-services.writefreely.enable). - -- [Listmonk](https://listmonk.app), a self-hosted newsletter manager. Enable using [services.listmonk](options.html#opt-services.listmonk.enable). - -- [Uptime Kuma](https://uptime.kuma.pet/), a fancy self-hosted monitoring tool. Available as [services.uptime-kuma](#opt-services.uptime-kuma.enable). - -- [Mepo](https://mepo.milesalan.com), a fast, simple, hackable OSM map viewer for mobile and desktop Linux. Available as [programs.mepo.enable](#opt-programs.mepo.enable). - - +- Python now defaults to 3.10, updated from 3.9. ## Backward Incompatibilities {#sec-release-22.11-incompatibilities} @@ -172,18 +90,17 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `isCompatible` predicate checking CPU compatibility is no longer exposed by the platform sets generated using `lib.systems.elaborate`. In most cases you will want to use the new `canExecute` predicate instead which also - considers the kernel / syscall interface. It is briefly described in the - release's [highlights section](#sec-release-22.11-highlights). + takes the kernel / syscall interface into account. `lib.systems.parse.isCompatible` still exists, but has changed semantically: Architectures with differing endianness modes are *no longer considered compatible*. - `ngrok` has been upgraded from 2.3.40 to 3.0.4. Please see [the upgrade guide](https://ngrok.com/docs/guides/upgrade-v2-v3) and [changelog](https://ngrok.com/docs/ngrok-agent/changelog). Notably, breaking changes are that the config file format has - changed and support for single hypen arguments was dropped. + changed and support for single hyphen arguments was dropped. -- `i18n.supportedLocales` is now by default only generated with the locales set in `i18n.defaultLocale` and `i18n.extraLocaleSettings`. - This got partially copied over from the minimal profile and reduces the final system size by up to 200MB. - If you require all locales installed set the option to ``[ "all" ]``. +- `i18n.supportedLocales` is now only generated with the locales set in `i18n.defaultLocale` and `i18n.extraLocaleSettings`. + - This reduces the final system closure size by up to 200MB. + - If you require all locales installed, set the option to ``[ "all" ]``. - Deprecated settings `logrotate.paths` and `logrotate.extraConfig` have been removed. Please convert any uses to @@ -195,7 +112,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `fetchgit` fetcher supports sparse checkouts via the `sparseCheckout` option. This used to accept a multi-line string with directories/patterns to check out, but now requires a list of strings. -- `openssh` was updated to version 9.1, disabling the generation of DSA keys when using `ssh-keygen -A` as they are insecure. Also, `SetEnv` directives in `ssh_config` and `sshd_config` are now first-match-wins +- `openssh` was updated to version 9.1, disabling the generation of DSA keys when using `ssh-keygen -A` as they are insecure. Also, `SetEnv` directives in `ssh_config` and `sshd_config` are now first-match-wins. - `bsp-layout` no longer uses the command `cycle` to switch to other window layouts, as it got replaced by the commands `previous` and `next`. @@ -208,11 +125,11 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `p4` package now only includes the open-source Perforce Helix Core command-line client and APIs. It no longer installs the unfree Helix Core Server binaries `p4d`, `p4broker`, and `p4p`. To install the Helix Core Server binaries, use the `p4d` package instead. -- The `openssl`-extension for the PHP interpreter used by Nextcloud is built against OpenSSL 1.1 if +- The OpenSSL extension for the PHP interpreter used by Nextcloud is built against OpenSSL 1.1 if [](#opt-system.stateVersion) is below `22.11`. This is to make sure that people using [server-side encryption](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/encryption_configuration.html) - don't loose access to their files. + don't lose access to their files. - In any other case it's safe to use OpenSSL 3 for PHP's openssl extension. This can be done by setting + In any other case, it's safe to use OpenSSL 3 for PHP's OpenSSL extension. This can be done by setting [](#opt-services.nextcloud.enableBrokenCiphersForSSE) to `false`. - The `coq` package and versioned variants starting at `coq_8_14` no @@ -231,6 +148,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - Emacs now uses the Lucid toolkit by default instead of GTK because of stability and compatibility issues. Users who still wish to remain using GTK can do so by using `emacs-gtk`. +- `kanidm` has been updated to 1.1.0-alpha.10 and now requires a TLS certificate and key. It will always start `https` and-–-if enabled-–-an LDAPS server and no HTTP and LDAP server anymore. + - riak package removed along with `services.riak` module, due to lack of maintainer to update the package. - ppd files in `pkgs.cups-drv-rastertosag-gdi` are now gzipped. If you refer to such a ppd file with its path (e.g. via [hardware.printers.ensurePrinters](options.html#opt-hardware.printers.ensurePrinters)) you will need to append `.gz` to the path. @@ -296,7 +215,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `zrepl` package has been updated from 0.5.0 to 0.6.0. See the [changelog](https://zrepl.github.io/changelog.html) for details. -- `k3s` no longer supports docker as runtime due to upstream dropping support. +- `k3s` no longer supports Docker as runtime due to upstream dropping support. - `cassandra_2_1` and `cassandra_2_2` have been removed. Please update to `cassandra_3_11` or `cassandra_3_0`. See the [changelog](https://github.com/apache/cassandra/blob/cassandra-3.11.14/NEWS.txt) for more information about the upgrade process. @@ -320,7 +239,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). For further information, please read the upstream changelogs. -- `stylua` no longer accepts `lua52Support` and `luauSupport` overrides, use `features` instead, which defaults to `[ "lua54" "luau" ]`. +- `stylua` no longer accepts `lua52Support` and `luauSupport` overrides. Use `features` instead, which defaults to `[ "lua54" "luau" ]`. - `ocamlPackages.ocaml_extlib` has been renamed to `ocamlPackages.extlib`. @@ -345,23 +264,29 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). ## Other Notable Changes {#sec-release-22.11-notable-changes} -- `firefox`, `thunderbird` and `librewolf` come with enabled Wayland support by default. The `firefox-wayland`, `firefox-esr-wayland`, `thunderbird-wayland` and `librewolf-wayland` attributes are obsolete and have been aliased to their generic attribute. +- PHP is now built in `NTS` (Non-Thread Safe) mode by default. + - For Apache and `mod_php` usage, we enable `ZTS` (Zend Thread Safe) mode. This has been a + common practice for a long time in other distributions. + +- `firefox`, `thunderbird` and `librewolf` now come with Wayland support by default. The `firefox-wayland`, `firefox-esr-wayland`, `thunderbird-wayland` and `librewolf-wayland` attributes are obsolete and have been aliased to their generic attribute. - The `xplr` package has been updated from 0.18.0 to 0.19.0, which brings some breaking changes. See the [upstream release notes](https://github.com/sayanarijit/xplr/releases/tag/v0.19.0) for more details. -- Configuring multiple GitHub runners is now possible through `services.github-runners.`. The option `services.github-runner` remains. +- Configuring multiple GitHub runners is now possible through `services.github-runners.`. The options under `services.github-runner` remain, to configure a single runner. - `github-runner` gained support for ephemeral runners and registrations using a personal access token (PAT) instead of a registration token. See `services.github-runner.ephemeral` and `services.github-runner.tokenFile` for details. -- A new module was added for the Saleae Logic device family, providing the options `hardware.saleae-logic.enable` and `hardware.saleae-logic.package`. +- A new module was added to provide hardware support for the Saleae Logic device family, providing the options `hardware.saleae-logic.enable` and `hardware.saleae-logic.package`. -- ZFS module will not allow hibernation by default, this is a safety measure to prevent data loss cases like the ones described at [OpenZFS/260](https://github.com/openzfs/zfs/issues/260) and [OpenZFS/12842](https://github.com/openzfs/zfs/issues/12842). Use the `boot.zfs.allowHibernation` option to configure this behaviour. +- ZFS module will no longer allow hibernation by default. + - This is a safety measure to prevent data loss cases like the ones described at [OpenZFS/260](https://github.com/openzfs/zfs/issues/260) and [OpenZFS/12842](https://github.com/openzfs/zfs/issues/12842). + - Use the `boot.zfs.allowHibernation` option to configure this behaviour. -- `mastodon` now automatically removes remote media attachments older than 30 days. This is configurable through `services.mastodon.mediaAutoRemove`. +- Mastodon now automatically removes remote media attachments older than 30 days. This is configurable through `services.mastodon.mediaAutoRemove`. - The Redis module now disables RDB persistence when `services.redis.servers..save = []` instead of using the Redis default. -- Neo4j was updated from version 3 to version 4. See this [migration guide](https://neo4j.com/docs/upgrade-migration-guide/current/) on how to migrate your Neo4j instance. +- Neo4j was updated from version 3 to version 4. See upstream's [migration guide](https://neo4j.com/docs/upgrade-migration-guide/current/) for information on how to migrate your instance. - The `networking.wireguard` module now can set the mtu on interfaces and tag its packets with an fwmark. @@ -371,9 +296,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `polymc` package has been removed due to a rogue maintainer. It has been replaced by `prismlauncher`, a fork by the rest of the maintainers. For more - details, see [the pull request that made this - change](https://github.com/NixOS/nixpkgs/pull/196624) and [this issue - detailing the vulnerability](https://github.com/NixOS/nixpkgs/issues/196460). + details, see [the PR that made this change](https://github.com/NixOS/nixpkgs/pull/196624) and + [the issue detailing the vulnerability](https://github.com/NixOS/nixpkgs/issues/196460). Users with existing installations should rename `~/.local/share/polymc` to `~/.local/share/PrismLauncher`. The main config file's path has also moved from `~/.local/share/polymc/polymc.cfg` to @@ -381,7 +305,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `bloat` package has been updated from unstable-2022-03-31 to unstable-2022-10-25, which brings a breaking change. See [this upstream commit message](https://git.freesoftwareextremist.com/bloat/commit/?id=887ed241d64ba5db3fd3d87194fb5595e5ad7d73) for details. -- The `services.matrix-synapse` systemd unit has been hardened. +- Synapse's systemd unit has been hardened. - The module `services.grafana` was refactored to be compliant with [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md). To be precise, this means that the following things have changed: - The newly introduced option [](#opt-services.grafana.settings) is an attribute-set that @@ -416,54 +340,58 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). Alternatively you can also set all your values from `extraOptions` to `systemd.services.grafana.environment`, make sure you don't forget to add the `GF_` prefix though! - - Previously, the options [](#opt-services.grafana.provision.datasources) and - [](#opt-services.grafana.provision.dashboards) expected lists of datasources + - Previously, the options [services.grafana.provision.datasources](#opt-services.grafana.provision.datasources) and + [services.grafana.provision.dashboards](#opt-services.grafana.provision.dashboards) expected lists of datasources or dashboards for the [declarative provisioning](https://grafana.com/docs/grafana/latest/administration/provisioning/). To declare lists of - - **datasources**, please rename your declarations to [](#opt-services.grafana.provision.datasources.settings.datasources). - - **dashboards**, please rename your declarations to [](#opt-services.grafana.provision.dashboards.settings.providers). + - **datasources**, please rename your declarations to [services.grafana.provision.datasources.settings.datasources](#opt-services.grafana.provision.datasources.settings.datasources). + - **dashboards**, please rename your declarations to [services.grafana.provision.dashboards.settings.providers](#opt-services.grafana.provision.dashboards.settings.providers). This change was made to support more features for that: - It's possible to declare the `apiVersion` of your dashboards and datasources - by [](#opt-services.grafana.provision.datasources.settings.apiVersion) (or - [](#opt-services.grafana.provision.dashboards.settings.apiVersion)). + by [services.grafana.provision.datasources.settings.apiVersion](#opt-services.grafana.provision.datasources.settings.apiVersion) (or + [services.grafana.provision.dashboards.settings.apiVersion](#opt-services.grafana.provision.dashboards.settings.apiVersion)). - Instead of declaring datasources and dashboards in pure Nix, it's also possible to specify configuration files (or directories) with YAML instead using - [](#opt-services.grafana.provision.datasources.path) (or - [](#opt-services.grafana.provision.dashboards.path). This is useful when having + [services.grafana.provision.datasources.path](#opt-services.grafana.provision.datasources.path) (or + [services.grafana.provision.dashboards.path](#opt-services.grafana.provision.dashboards.path). This is useful when having provisioning files from non-NixOS Grafana instances that you also want to deploy to NixOS. __Note:__ secrets from these files will be leaked into the store unless you use a [**file**-provider or env-var](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#file-provider) for secrets! - - [](#opt-services.grafana.provision.notifiers) is not affected by this change because - this feature is deprecated by Grafana and will probably removed in Grafana 10. + - [services.grafana.provision.notifiers](#opt-services.grafana.provision.notifiers) is not affected by this change because + this feature is deprecated by Grafana and will probably be removed in Grafana 10. It's recommended to use `services.grafana.provision.alerting.contactPoints` instead. - The `services.grafana.provision.alerting` option was added. It includes suboptions for every alerting-related objects (with the exception of `notifiers`), which means it's now possible to configure modern Grafana alerting declaratively. -- Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation. +- Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation. - The `diamond` package has been update from 0.8.36 to 2.0.15. See the [upstream release notes](https://github.com/bbuchfink/diamond/releases) for more details. - The `guake` package has been updated from 3.6.3 to 3.9.0, see the [changelog](https://github.com/Guake/guake/releases) for more details. -- `dockerTools.buildImage` deprecates the misunderstood `contents` parameter, in favor of `copyToRoot`. +- The `netlify-cli` package has been updated from 6.13.2 to 12.2.4, see the [changelog](https://github.com/netlify/cli/releases) for more details. + +- `dockerTools.buildImage`'s `contents` parameter has been deprecated in favor of `copyToRoot`. Use `copyToRoot = buildEnv { ... };` or similar if you intend to add packages to `/bin`. - The `proxmox.qemuConf.bios` option was added, it corresponds to `Hardware->BIOS` field in Proxmox web interface. Use `"ovmf"` value to build UEFI image, default value remains `"bios"`. New option `proxmox.partitionTableType` defaults to either `"legacy"` or `"efi"`, depending on the `bios` value. Setting `partitionTableType` to `"hybrid"` results in an image, which supports both methods (`"bios"` and `"ovmf"`), thereby remaining bootable after change to Proxmox `Hardware->BIOS` field. - memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available. -- Option descriptions, examples, and defaults writting in DocBook are now deprecated. Using CommonMark is preferred and will become the default in a future release. +- Option descriptions, examples, and defaults writing in DocBook are now deprecated. Using CommonMark is preferred and will become the default in a future release. - The `documentation.nixos.options.allowDocBook` option was added to ease the transition to CommonMark option documentation. Setting this option to `false` causes an error for every option included in the manual that uses DocBook documentation; it defaults to `true` to preserve the previous behavior and will be removed once the transition to CommonMark is complete. -- The redis module now persists each instance's configuration file in the state directory, in order to support some more advanced use cases like sentinel. +- The Redis module now persists each instance's configuration file in the state directory, in order to support some more advanced use cases like Sentinel. + +- `protonup` has been aliased to and replaced by `protonup-ng` due to upstream not maintaining it. - The udisks2 service, available at `services.udisks2.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed. This also means that polkit will now actually be disabled by default. The default for `security.polkit.enable` was already flipped in the previous release, but udisks2 being enabled by default re-enabled it. @@ -472,22 +400,12 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). for Nextcloud in NixOS: - For Nextcloud **>=24**, the default PHP version is 8.1. - Nextcloud **23** has been removed since it will reach its [end of life in December 2022](https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule/d76576a12a626d53305d480a6065b57cab705d3d). - - For `system.stateVersion` being **>=22.11**, Nextcloud 25 will be installed by default. For older versions, + - If `system.stateVersion` is **>=22.11**, Nextcloud 25 will be installed by default. For older versions, Nextcloud 24 will be installed. - - Please ensure that you only upgrade on major release at a time! Nextcloud doesn't support + - Please ensure that you only upgrade one major release at a time! Nextcloud doesn't support upgrades across multiple versions, i.e. an upgrade from **23** to **25** is only possible when upgrading to **24** first. -- Add udev rules for the Teensy family of microcontrollers. - -- The Qt QML disk cache is now disabled by default. This fixes a - long-standing issue where updating Qt/KDE apps would sometimes cause - them to crash or behave strangely without explanation. Those concerned - about the small (~10%) performance hit to application startup can - re-enable the cache (and expose themselves to gremlins) by setting the - envrionment variable `QML_FORCE_DISK_CACHE` to `1` using e.g. the - `environment.sessionVariables` NixOS option. - - systemd-oomd is enabled by default. Depending on which systemd units have `ManagedOOMSwap=kill` or `ManagedOOMMemoryPressure=kill`, systemd-oomd will SIGKILL all the processes under the appropriate descendant cgroups when the @@ -501,25 +419,23 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `pass-secret-service` package now includes systemd units from upstream, so adding it to the NixOS `services.dbus.packages` option will make it start automatically as a systemd user service when an application tries to talk to the libsecret D-Bus API. -- There is a new module for AMD SEV CPU functionality, which grants access to the hardware. - -- The Wordpress module got support for installing language packs through `services.wordpress.sites..languages`. +- The Wordpress module now has support for installing language packs through a new option, `services.wordpress.sites..languages`. - The default package for `services.mullvad-vpn.package` was changed to `pkgs.mullvad`, allowing cross-platform usage of Mullvad. `pkgs.mullvad` only contains the Mullvad CLI tool, so users who rely on the Mullvad GUI will want to change it back to `pkgs.mullvad-vpn`, or add `pkgs.mullvad-vpn` to their environment. -- PowerDNS has been updated from `4.6.x` to `4.7.x`. Please be sure to review the [Upgrade Notes](https://doc.powerdns.com/authoritative/upgrading.html#to-4-7-0-or-master) provided by upstream before upgrading. Worth specifically noting is that the new Catalog Zones feature comes with a mandatory schema change for the gsql database backends, which has to be manually applied. +- PowerDNS has been updated from v4.6.2 to v4.7.2. Please be sure to review the [Upgrade Notes](https://doc.powerdns.com/authoritative/upgrading.html#to-4-7-0-or-master) provided by upstream before upgrading. Worth specifically noting is that the new Catalog Zones feature comes with a mandatory schema change for the GSQL database backends, which has to be manually applied. -- There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and in a future release it may be removed. +- There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and may be removed in a future release. -- There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service. +- There is a new module for `xfconf` (the Xfce configuration storage system), which has a dbus service. -- The Mastodon package got upgraded from the major version 3 to 4. See the [v4.0.0 release notes](https://github.com/mastodon/mastodon/releases/tag/v4.0.0) for a list of changes. On standard setups, no manual migration steps are required. Nevertheless, a database backup is recommended. +- The Mastodon package has been upgraded to v4.0.0. See the [v4.0.0 release notes](https://github.com/mastodon/mastodon/releases/tag/v4.0.0) for a list of changes. On standard setups, no manual migration steps are required. Nevertheless, a database backup is recommended. -- The `nomad` package now defaults to 1.3, which no longer has a downgrade path to releases 1.2 or older. +- The `nomad` package now defaults to v1.3, which no longer has a downgrade path to v1.2 or older. - The `nodePackages` package set now defaults to the LTS release in the `nodejs` package again, instead of being pinned to `nodejs-14_x`. Several updates to node2nix have been made for compatibility with newer Node.js and npm versions and a new `postRebuild` hook has been added for packages to perform extra build steps before the npm install step prunes dev dependencies. -- `boot.kernel.sysctl` is defined as a freeformType and adds a custom merge option for "net.core.rmem_max" (taking the highest value defined to avoid conflicts between 2 services trying to set that value). +- `boot.kernel.sysctl` is defined as a freeformType and adds a custom merge option for `net.core.rmem_max` (taking the highest value defined to avoid conflicts between 2 services trying to set that value). - The `mame` package does not ship with its tools anymore in the default output. They were moved to a separate `tools` output instead. For convenience, `mame-tools` package was added for those who want to use it. @@ -527,4 +443,94 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The option `services.picom.experimentalBackends` was removed since it is now the default and the option will cause `picom` to quit instead. +- `haskellPackages.callHackage` is not always invalidated if `all-cabal-hashes` changes, leading to less rebuilds of haskell dependencies. + +- `haskellPackages.callHackage` and `haskellPackages.callCabal2nix` (and related functions) no longer keep a reference to the `cabal2nix` call used to generate them. As a result, they will be garbage collected more often. + + + +## New Services {#sec-release-22.11-new-services} + +- [alps](https://git.sr.ht/~migadu/alps), a simple and extensible webmail. Available as [services.alps](#opt-services.alps.enable). + +- [appvm](https://github.com/jollheef/appvm), Nix based app VMs. Available as [virtualisation.appvm](options.html#opt-virtualisation.appvm.enable). + +- [AusweisApp2](https://www.ausweisapp.bund.de/), the authentication software for the German ID card. Available as [programs.ausweisapp](#opt-programs.ausweisapp.enable). + +- [automatic-timezoned](https://github.com/maxbrunet/automatic-timezoned). a Linux daemon to automatically update the system timezone based on location. Available as [services.automatic-timezoned](#opt-services.automatic-timezoned.enable). + +- [Dolibarr](https://www.dolibarr.org/), an enterprise resource planning and customer relationship manager. Enable using [services.dolibarr](#opt-services.dolibarr.enable). + +- [dragonflydb](https://dragonflydb.io/), a modern replacement for Redis and Memcached. Available as [services.dragonflydb](#opt-services.dragonflydb.enable). + +- [endlessh-go](https://github.com/shizunge/endlessh-go), an SSH tarpit that exposes Prometheus metrics. Available as [services.endlessh-go](#opt-services.endlessh-go.enable). + +- [endlessh](https://github.com/skeeto/endlessh), an SSH tarpit. Available as [services.endlessh](#opt-services.endlessh.enable). + +- [EVCC](https://evcc.io) is an EV charge controller with PV integration. It supports a multitude of chargers, meters, vehicle APIs and more and ties that together with a well-tested backend and a lightweight web frontend. Available as [services.evcc](#opt-services.evcc.enable). + +- [expressvpn](https://www.expressvpn.com), the CLI client for ExpressVPN. Available as [services.expressvpn](#opt-services.expressvpn.enable). + +- [FreshRSS](https://freshrss.org/), a free, self-hostable RSS feed aggregator. Available as [services.freshrss](#opt-services.freshrss.enable). + +- [Garage](https://garagehq.deuxfleurs.fr/), a simple object storage server for geodistributed deployments, alternative to MinIO. Available as [services.garage](#opt-services.garage.enable). + +- [go-autoconfig](https://github.com/L11R/go-autoconfig), IMAP/SMTP autodiscover server. Available as [services.go-autoconfig](#opt-services.go-autoconfig.enable). + +- [Grafana Tempo](https://www.grafana.com/oss/tempo/), a distributed tracing store. Available as [services.tempo](#opt-services.tempo.enable). + +- [HBase cluster](https://hbase.apache.org/), a distributed, scalable, big data store. Available as [services.hadoop.hbase](options.html#opt-services.hadoop.hbase.enable). + +- [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle. Available as [services.infnoise](options.html#opt-services.infnoise.enable). + +- [kanata](https://github.com/jtroo/kanata), a tool to improve keyboard comfort and usability with advanced customization. Available as [services.kanata](options.html#opt-services.kanata.enable). + +- [karma](https://github.com/prymitive/karma), an alert dashboard for Prometheus Alertmanager. Available as [services.karma](options.html#opt-services.karma.enable) + +- [Komga](https://komga.org/), a free and open source comics/mangas media server. Available as [services.komga](#opt-services.komga.enable). + +- [kthxbye](https://github.com/prymitive/kthxbye), an alert acknowledgement management daemon for Prometheus Alertmanager. Available as [services.kthxbye](options.html#opt-services.kthxbye.enable) + +- [languagetool](https://languagetool.org/), a multilingual grammar, style, and spell checker. Available as [services.languagetool](options.html#opt-services.languagetool.enable). + +- [Listmonk](https://listmonk.app), a self-hosted newsletter manager. Enable using [services.listmonk](options.html#opt-services.listmonk.enable). + +- [Mepo](https://mepo.milesalan.com), a fast, simple, hackable OSM map viewer for mobile and desktop Linux. Available as [programs.mepo.enable](#opt-programs.mepo.enable). + +- [merecat](https://troglobit.com/projects/merecat/), a small and easy HTTP server based on thttpd. Available as [services.merecat](#opt-services.merecat.enable) + +- [netbird](https://netbird.io), a zero configuration VPN. Available as [services.netbird](options.html#opt-services.netbird.enable). + +- [ntfy.sh](https://ntfy.sh), a push notification service. Available as [services.ntfy-sh](#opt-services.ntfy-sh.enable) + +- [OpenRGB](https://gitlab.com/CalcProgrammer1/OpenRGB/-/tree/master), a FOSS tool for controlling RGB lighting. Available as [services.hardware.openrgb.enable](options.html#opt-services.hardware.openrgb.enable). + +- [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable). + +- [Patroni](https://github.com/zalando/patroni), a template for PostgreSQL HA with ZooKeeper, etcd or Consul. Available as [services.patroni](options.html#opt-services.patroni.enable). + +- [persistent-evdev](https://github.com/aiberia/persistent-evdev), a daemon to add virtual proxy devices that mirror a physical input device but persist even if the underlying hardware is hot-plugged. Available as [services.persistent-evdev](#opt-services.persistent-evdev.enable). + +- [Please](https://github.com/edneville/please), a Sudo clone written in Rust. Available as [security.please](#opt-security.please.enable). + +- [Prometheus IPMI exporter](https://github.com/prometheus-community/ipmi_exporter), an IPMI exporter for Prometheus. Available as [services.prometheus.exporters.ipmi](#opt-services.prometheus.exporters.ipmi.enable). + +- [Sachet](https://github.com/messagebird/sachet/), an SMS alerting tool for the Prometheus Alertmanager. Available as [services.prometheus.sachet](#opt-services.prometheus.sachet.enable). + +- [schleuder](https://schleuder.org/), a mailing list manager with PGP support. Enable using [services.schleuder](#opt-services.schleuder.enable). + +- [syncstorage-rs](https://github.com/mozilla-services/syncstorage-rs), a self-hostable sync server for Firefox. Available as [services.firefox-syncserver](options.html#opt-services.firefox-syncserver.enable). + +- [Tandoor Recipes](https://tandoor.dev), a self-hosted multi-tenant recipe collection. Available as [services.tandoor-recipes](options.html#opt-services.tandoor-recipes.enable). + +- [TAYGA](http://www.litech.org/tayga/), an out-of-kernel stateless NAT64 implementation. Available as [services.tayga](#opt-services.tayga.enable). + +- [tmate-ssh-server](https://github.com/tmate-io/tmate-ssh-server), server side part of [tmate](https://tmate.io/). Available as [services.tmate-ssh-server](#opt-services.tmate-ssh-server.enable). + +- [Uptime Kuma](https://uptime.kuma.pet/), a fancy self-hosted monitoring tool. Available as [services.uptime-kuma](#opt-services.uptime-kuma.enable). + +- [WriteFreely](https://writefreely.org), a simple blogging platform with ActivityPub support. Available as [services.writefreely](options.html#opt-services.writefreely.enable). + +- [xray](https://github.com/XTLS/Xray-core), a fully compatible v2ray-core replacement. Features XTLS, which when enabled on server and client, brings UDP FullCone NAT to proxy setups. Available as [services.xray](options.html#opt-services.xray.enable). + diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 5bc6c8614895..2977a9e6a1c7 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -8,22 +8,211 @@ In addition to numerous new and upgraded packages, this release has the followin -- Create the first release note entry in this section! +- Cinnamon has been updated to 5.6, see [the pull request](https://github.com/NixOS/nixpkgs/pull/201328#issue-1449910204) for what is changed. + +- `nixos-rebuild` now supports an extra `--specialisation` option that can be used to change specialisation for `switch` and `test` commands. ## New Services {#sec-release-23.05-new-services} -- Create the first release note entry in this section! +- [Akkoma](https://akkoma.social), an ActivityPub microblogging server. Available as [services.akkoma](options.html#opt-services.akkoma.enable). + +- [blesh](https://github.com/akinomyoga/ble.sh), a line editor written in pure bash. Available as [programs.bash.blesh](#opt-programs.bash.blesh.enable). + +- [webhook](https://github.com/adnanh/webhook), a lightweight webhook server. Available as [services.webhook](#opt-services.webhook.enable). + +- [cups-pdf-to-pdf](https://github.com/alexivkin/CUPS-PDF-to-PDF), a pdf-generating cups backend based on [cups-pdf](https://www.cups-pdf.de/). Available as [services.printing.cups-pdf](#opt-services.printing.cups-pdf.enable). + +- [Cloudlog](https://www.magicbug.co.uk/cloudlog/), a web-based Amateur Radio logging application. Available as [services.cloudlog](#opt-services.cloudlog.enable). + +- [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion). + +- [gmediarender](https://github.com/hzeller/gmrender-resurrect), a simple, headless UPnP/DLNA renderer. Available as [services.gmediarender](options.html#opt-services.gmediarender.enable). + +- [stevenblack-blocklist](https://github.com/StevenBlack/hosts), A unified hosts file with base extensions for blocking unwanted websites. Available as [networking.stevenblack](options.html#opt-networking.stevenblack.enable). + +- [goeland](https://github.com/slurdge/goeland), an alternative to rss2email written in golang with many filters. Available as [services.goeland](#opt-services.goeland.enable). + +- [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable). + +- [mmsd](https://gitlab.com/kop316/mmsd), a lower level daemon that transmits and recieves MMSes. Available as [services.mmsd](#opt-services.mmsd.enable). + +- [QDMR](https://dm3mat.darc.de/qdmr/), a gui application and command line tool for programming cheap DMR radios [programs.qdmr](#opt-programs.qdmr.enable) + +- [v2rayA](https://v2raya.org), a Linux web GUI client of Project V which supports V2Ray, Xray, SS, SSR, Trojan and Pingtunnel. Available as [services.v2raya](options.html#opt-services.v2raya.enable). + +- [ulogd](https://www.netfilter.org/projects/ulogd/index.html), a userspace logging daemon for netfilter/iptables related logging. Available as [services.ulogd](options.html#opt-services.ulogd.enable). + +- [photoprism](https://photoprism.app/), a AI-Powered Photos App for the Decentralized Web. Available as [services.photoprism](options.html#opt-services.photoprism.enable). + +- [autosuspend](https://github.com/languitar/autosuspend), a python daemon that suspends a system if certain conditions are met, or not met. ## Backward Incompatibilities {#sec-release-23.05-incompatibilities} -- Create the first release note entry in this section! +- `carnix` and `cratesIO` has been removed due to being unmaintained, use alternatives such as [naersk](https://github.com/nix-community/naersk) and [crate2nix](https://github.com/kolloch/crate2nix) instead. + +- `checkInputs` have been renamed to `nativeCheckInputs`, because they behave the same as `nativeBuildInputs` when `doCheck` is set. `checkInputs` now denote a new type of dependencies, added to `buildInputs` when `doCheck` is set. As a rule of thumb, `nativeCheckInputs` are tools on `$PATH` used during the tests, and `checkInputs` are libraries which are linked to executables built as part of the tests. Similarly, `installCheckInputs` are renamed to `nativeInstallCheckInputs`, corresponding to `nativeBuildInputs`, and `installCheckInputs` are a new type of dependencies added to `buildInputs` when `doInstallCheck` is set. (Note that this change will not cause breakage to derivations with `strictDeps` unset, which are most packages except python, rust, ocaml and go packages). + +- `buildDunePackage` now defaults to `strictDeps = true` which means that any library should go into `buildInputs` or `checkInputs`. Any executable that is run on the building machine should go into `nativeBuildInputs` or `nativeCheckInputs` respectively. Example of executables are `ocaml`, `findlib` and `menhir`. PPXs are libraries which are built by dune and should therefore not go into `nativeBuildInputs`. + +- `borgbackup` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.borgbackup.jobs..inhibitsSleep`](#opt-services.borgbackup.jobs._name_.inhibitsSleep). + +- `podman` now uses the `netavark` network stack. Users will need to delete all of their local containers, images, volumes, etc, by running `podman system reset --force` once before upgrading their systems. + +- `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories. + +- The `services.kubo.settings` option is now no longer stateful. If you changed any of the options in `services.kubo.settings` in the past and then removed them from your NixOS configuration again, those changes are still in your Kubo configuration file but will now be reset to the default. If you're unsure, you may want to make a backup of your configuration file (probably /var/lib/ipfs/config) and compare after the update. + +- The EC2 image module no longer fetches instance metadata in stage-1. This results in a significantly smaller initramfs, since network drivers no longer need to be included, and faster boots, since metadata fetching can happen in parallel with startup of other services. + This breaks services which rely on metadata being present by the time stage-2 is entered. Anything which reads EC2 metadata from `/etc/ec2-metadata` should now have an `after` dependency on `fetch-ec2-metadata.service` + +- `minio` removed support for its legacy filesystem backend in [RELEASE.2022-10-29T06-21-33Z](https://github.com/minio/minio/releases/tag/RELEASE.2022-10-29T06-21-33Z). This means if your storage was created with the old format, minio will no longer start. Unfortunately minio doesn't provide a an automatic migration, they only provide [instructions how to manually convert the node](https://min.io/docs/minio/windows/operations/install-deploy-manage/migrate-fs-gateway.html). To facilitate this migration we keep around the last version that still supports the old filesystem backend as `minio_legacy_fs`. Use it via `services.minio.package = minio_legacy_fs;` to export your data before switching to the new version. See the corresponding [issue](https://github.com/NixOS/nixpkgs/issues/199318) for more details. + +- `services.sourcehut.dispatch` and the corresponding package (`sourcehut.dispatchsrht`) have been removed due to [upstream deprecation](https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/). + +- The [services.snapserver.openFirewall](#opt-services.snapserver.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitly set this option to `true`, or configure your firewall. + +- The [services.tmate-ssh-server.openFirewall](#opt-services.tmate-ssh-server.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitly set this option to `true`, or configure your firewall. + +- The [services.unifi-video.openFirewall](#opt-services.unifi-video.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitly set this option to `true`, or configure your firewall. + +- Kime has been updated from 2.5.6 to 3.0.2 and the `i18n.inputMethod.kime.config` option has been removed. Users should use `daemonModules`, `iconColor`, and `extraConfig` options under `i18n.inputMethod.kime` instead. + +- `tut` has been updated from 1.0.34 to 2.0.0, and now uses the TOML format for the configuration file instead of INI. Additional information can be found [here](https://github.com/RasmusLindroth/tut/releases/tag/2.0.0). + +- The `wordpress` derivation no longer contains any builtin plugins or themes. If you need them you have to add them back to prevent your site from breaking. You can find them in `wordpressPackages.{plugins,themes}`. + +- `llvmPackages_rocm.llvm` will not contain `clang` or `compiler-rt`. `llvmPackages_rocm.clang` will not contain `llvm`. `llvmPackages_rocm.clangNoCompilerRt` has been removed in favor of using `llvmPackages_rocm.clang-unwrapped`. + +- The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2. + +- `teleport` has been upgraded to major version 11. Please see upstream [upgrade instructions](https://goteleport.com/docs/setup/operations/upgrading/) and [release notes](https://goteleport.com/docs/changelog/#1100). + +- The EC2 image module previously detected and activated swap-formatted instance store devices and partitions in stage-1 (initramfs). This behaviour has been removed. Users relying on this should provide their own implementation. + +- Calling `makeSetupHook` without passing a `name` argument is deprecated. + +- Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually. + +- The [services.wordpress.sites.<name>.plugins](#opt-services.wordpress.sites._name_.plugins) and [services.wordpress.sites.<name>.themes](#opt-services.wordpress.sites._name_.themes) options have been converted from sets to attribute sets to allow for consumers to specify explicit install paths via attribute name. + +- In `mastodon` it is now necessary to specify location of file with `PostgreSQL` database password. In `services.mastodon.database.passwordFile` parameter default value `/var/lib/mastodon/secrets/db-password` has been changed to `null`. + +- The `--target-host` and `--build-host` options of `nixos-rebuild` no longer treat the `localhost` value specially – to build on/deploy to local machine, omit the relevant flag. + +- The `nix.readOnlyStore` option has been renamed to `boot.readOnlyNixStore` to clarify that it configures the NixOS boot process, not the Nix daemon. + +- Deprecated `xlibsWrapper` transitional package has been removed in favour of direct use of its constitutents: `xorg.libX11`, `freetype` and others. + +- .NET 5.0 was removed due to being end-of-life, use a newer, supported .NET version - https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core + +- The iputils package, which is installed by default, no longer provides the + `ninfod`, `rarpd` and `rdisc` tools. See + [upstream's release notes](https://github.com/iputils/iputils/releases/tag/20221126) + for more details and available replacements. ## Other Notable Changes {#sec-release-23.05-notable-changes} -- Create the first release note entry in this section! +- `vim_configurable` has been renamed to `vim-full` to avoid confusion: `vim-full`'s build-time features are configurable, but both `vim` and `vim-full` are _customizable_ (in the sense of user configuration, like vimrc). + +- The module for the application firewall `opensnitch` got the ability to configure rules. Available as [services.opensnitch.rules](#opt-services.opensnitch.rules) + +- The module `usbmuxd` now has the ability to change the package used by the daemon. In case you're experiencing issues with `usbmuxd` you can try an alternative program like `usbmuxd2`. Available as [services.usbmuxd.package](#opt-services.usbmuxd.package) + +- A few openssh options have been moved from extraConfig to the new freeform option `settings` and renamed as follow: `services.openssh.kbdInteractiveAuthentication` to `services.openssh.settings.KbdInteractiveAuthentication`, `services.openssh.passwordAuthentication` to `services.openssh.settings.PasswordAuthentication`, `services.openssh.useDns` to `services.openssh.settings.UseDns`, `services.openssh.permitRootLogin` to `services.openssh.settings.PermitRootLogin`, `services.openssh.logLevel` to `services.openssh.settings.LogLevel`. + +- `services.mastodon` gained a tootctl wrapped named `mastodon-tootctl` similar to `nextcloud-occ` which can be executed from any user and switches to the configured mastodon user with sudo and sources the environment variables. + +- DocBook option documentation, which has been deprecated since 22.11, will now cause a warning when documentation is built. Out-of-tree modules should migrate to using CommonMark documentation as outlined in [](#sec-option-declarations) to silence this warning. + + DocBook option documentation support will be removed in the next release and CommonMark will become the default. DocBook option documentation that has not been migrated until then will no longer render properly or cause errors. + +- NixOS now defaults to using nsncd (a non-caching reimplementation in Rust) as NSS lookup dispatcher, instead of the buggy and deprecated glibc-provided nscd. If you need to switch back, set `services.nscd.enableNsncd = false`, but please open an issue in nixpkgs so your issue can be fixed. + +- The `dnsmasq` service now takes configuration via the + `services.dnsmasq.settings` attribute set. The option + `services.dnsmasq.extraConfig` will be deprecated when NixOS 22.11 reaches + end of life. + +- The `dokuwiki` service now takes configuration via the `services.dokuwiki.sites..settings` attribute set, `extraConfig` is deprecated and will be removed. + The `{aclUse,superUser,disableActions}` attributes have been renamed, `pluginsConfig` now also accepts an attribute set of booleans, passing plain PHP is deprecated. + Same applies to `acl` which now also accepts structured settings. + +- The `wordpress` service now takes configuration via the `services.wordpress.sites..settings` attribute set, `extraConfig` is still available to append additional text to `wp-config.php`. + +- To reduce closure size in `nixos/modules/profiles/minimal.nix` profile disabled installation documentations and manuals. Also disabled `logrotate` and `udisks2` services. + +- The minimal ISO image now uses the `nixos/modules/profiles/minimal.nix` profile. + +- The `ghcWithPackages` and `ghcWithHoogle` wrappers will now also symlink GHC's + and all included libraries' documentation to `$out/share/doc` for convenience. + If undesired, the old behavior can be restored by overriding the builders with + `{ installDocumentation = false; }`. + +- `mastodon` now supports connection to a remote `PostgreSQL` database. + +- `services.peertube` now requires you to specify the secret file `secrets.secretsFile`. It can be generated by running `openssl rand -hex 32`. + Before upgrading, read the release notes for PeerTube: + - [Release v5.0.0](https://github.com/Chocobozzz/PeerTube/releases/tag/v5.0.0) + + And backup your data. + +- `services.chronyd` is now started with additional systemd sandbox/hardening options for better security. + +- `services.dhcpcd` service now don't solicit or accept IPv6 Router Advertisements on interfaces that use static IPv6 addresses. + +- The module `services.headscale` was refactored to be compliant with [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md). To be precise, this means that the following things have changed: + + - Most settings has been migrated under [services.headscale.settings](#opt-services.headscale.settings) which is an attribute-set that + will be converted into headscale's YAML config format. This means that the configuration from + [headscale's example configuration](https://github.com/juanfont/headscale/blob/main/config-example.yaml) + can be directly written as attribute-set in Nix within this option. + +- `nixos/lib/make-disk-image.nix` can now mutate EFI variables, run user-provided EFI firmware or variable templates. This is now extensively documented in the NixOS manual. + +- `services.grafana` listens only on localhost by default again. This was changed to upstreams default of `0.0.0.0` by accident in the freeform setting conversion. + +- Grafana Tempo has been updated to version 2.0. See the [upstream upgrade guide](https://grafana.com/docs/tempo/latest/release-notes/v2-0/#upgrade-considerations) for migration instructions. + +- A new `virtualisation.rosetta` module was added to allow running `x86_64` binaries through [Rosetta](https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment) inside virtualised NixOS guests on Apple silicon. This feature works by default with the [UTM](https://docs.getutm.app/) virtualisation [package](https://search.nixos.org/packages?channel=unstable&show=utm&from=0&size=1&sort=relevance&type=packages&query=utm). + +- The new option `users.motdFile` allows configuring a Message Of The Day that can be updated dynamically. + +- The `root` package is now built with the `"-Dgnuinstall=ON"` CMake flag, making the output conform the `bin` `lib` `share` layout. In this layout, `tutorials` is under `share/doc/ROOT/`; `cmake`, `font`, `icons`, `js` and `macro` under `share/root`; `Makefile.comp` and `Makefile.config` under `etc/root`. + +- Enabling global redirect in `services.nginx.virtualHosts` now allows one to add exceptions with the `locations` option. + +- A new option `recommendedBrotliSettings` has been added to `services.nginx`. Learn more about compression in Brotli format [here](https://github.com/google/ngx_brotli/blob/master/README.md). + +- Updated recommended settings in `services.nginx.recommendedGzipSettings`: + - Enables gzip compression for only certain proxied requests. + - Allow checking and loading of precompressed files. + - Updated gzip mime-types. + - Increased the minimum length of a response that will be gzipped. + +- [Garage](https://garagehq.deuxfleurs.fr/) version is based on [system.stateVersion](options.html#opt-system.stateVersion), existing installations will keep using version 0.7. New installations will use version 0.8. In order to upgrade a Garage cluster, please follow [upstream instructions](https://garagehq.deuxfleurs.fr/documentation/cookbook/upgrading/) and force [services.garage.package](options.html#opt-services.garage.package) or upgrade accordingly [system.stateVersion](options.html#opt-system.stateVersion). + +- `hip` has been separated into `hip`, `hip-common` and `hipcc`. + +- `services.nginx.recommendedProxySettings` now removes the `Connection` header preventing clients from closing backend connections. + +- Resilio sync secret keys can now be provided using a secrets file at runtime, preventing these secrets from ending up in the Nix store. + +- The `firewall` and `nat` module now has a nftables based implementation. Enable `networking.nftables` to use it. + +- The `services.fwupd` module now allows arbitrary daemon settings to be configured in a structured manner ([`services.fwupd.daemonSettings`](#opt-services.fwupd.daemonSettings)). + +- The `unifi-poller` package and corresponding NixOS module have been renamed to `unpoller` to match upstream. + +- The new option `services.tailscale.useRoutingFeatures` controls various settings for using Tailscale features like exit nodes and subnet routers. If you wish to use your machine as an exit node, you can set this setting to `server`, otherwise if you wish to use an exit node you can set this setting to `client`. The strict RPF warning has been removed as the RPF will be loosened automatically based on the value of this setting. + +- [Xastir](https://xastir.org/index.php/Main_Page) can now access AX.25 interfaces via the `libax25` package. + +- `nixos-version` now accepts `--configuration-revision` to display more information about the current generation revision + +- The option `services.nomad.extraSettingsPlugins` has been fixed to allow more than one plugin in the path. diff --git a/nixos/lib/make-channel.nix b/nixos/lib/make-channel.nix index 9b920b989fcf..0a511468fb2d 100644 --- a/nixos/lib/make-channel.nix +++ b/nixos/lib/make-channel.nix @@ -23,7 +23,7 @@ pkgs.releaseTools.makeSourceTarball { cp -prd . ../$releaseName chmod -R u+w ../$releaseName ln -s . ../$releaseName/nixpkgs # hack to make ‘’ work - NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null + NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --show-trace --xml \* > /dev/null cd .. chmod -R u+w $releaseName tar cfJ $out/tarballs/$releaseName.tar.xz $releaseName diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index e784ec9e6778..365fc1f03a5b 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -1,3 +1,85 @@ +/* Technical details + +`make-disk-image` has a bit of magic to minimize the amount of work to do in a virtual machine. + +It relies on the [LKL (Linux Kernel Library) project](https://github.com/lkl/linux) which provides Linux kernel as userspace library. + +The Nix-store only image only need to run LKL tools to produce an image and will never spawn a virtual machine, whereas full images will always require a virtual machine, but also use LKL. + +### Image preparation phase + +Image preparation phase will produce the initial image layout in a folder: + +- devise a root folder based on `$PWD` +- prepare the contents by copying and restoring ACLs in this root folder +- load in the Nix store database all additional paths computed by `pkgs.closureInfo` in a temporary Nix store +- run `nixos-install` in a temporary folder +- transfer from the temporary store the additional paths registered to the installed NixOS +- compute the size of the disk image based on the apparent size of the root folder +- partition the disk image using the corresponding script according to the partition table type +- format the partitions if needed +- use `cptofs` (LKL tool) to copy the root folder inside the disk image + +At this step, the disk image already contains the Nix store, it now only needs to be converted to the desired format to be used. + +### Image conversion phase + +Using `qemu-img`, the disk image is converted from a raw format to the desired format: qcow2(-compressed), vdi, vpc. + +### Image Partitioning + +#### `none` + +No partition table layout is written. The image is a bare filesystem image. + +#### `legacy` + +The image is partitioned using MBR. There is one primary ext4 partition starting at 1 MiB that fills the rest of the disk image. + +This partition layout is unsuitable for UEFI. + +#### `legacy+gpt` + +This partition table type uses GPT and: + +- create a "no filesystem" partition from 1MiB to 2MiB ; +- set `bios_grub` flag on this "no filesystem" partition, which marks it as a [GRUB BIOS partition](https://www.gnu.org/software/parted/manual/html_node/set.html) ; +- create a primary ext4 partition starting at 2MiB and extending to the full disk image ; +- perform optimal alignments checks on each partition + +This partition layout is unsuitable for UEFI boot, because it has no ESP (EFI System Partition) partition. It can work with CSM (Compatibility Support Module) which emulates legacy (BIOS) boot for UEFI. + +#### `efi` + +This partition table type uses GPT and: + +- creates an FAT32 ESP partition from 8MiB to specified `bootSize` parameter (256MiB by default), set it bootable ; +- creates an primary ext4 partition starting after the boot partition and extending to the full disk image + +#### `hybrid` + +This partition table type uses GPT and: + +- creates a "no filesystem" partition from 0 to 1MiB, set `bios_grub` flag on it ; +- creates an FAT32 ESP partition from 8MiB to specified `bootSize` parameter (256MiB by default), set it bootable ; +- creates a primary ext4 partition starting after the boot one and extending to the full disk image + +This partition could be booted by a BIOS able to understand GPT layouts and recognizing the MBR at the start. + +### How to run determinism analysis on results? + +Build your derivation with `--check` to rebuild it and verify it is the same. + +If it fails, you will be left with two folders with one having `.check`. + +You can use `diffoscope` to see the differences between the folders. + +However, `diffoscope` is currently not able to diff two QCOW2 filesystems, thus, it is advised to use raw format. + +Even if you use raw disks, `diffoscope` cannot diff the partition table and partitions recursively. + +To solve this, you can run `fdisk -l $image` and generate `dd if=$image of=$image-p$i.raw skip=$start count=$sectors` for each `(start, sectors)` listed in the `fdisk` output. Now, you will have each partition as a separate file and you can compare them in pairs. +*/ { pkgs , lib @@ -47,6 +129,18 @@ , # Whether to invoke `switch-to-configuration boot` during image creation installBootLoader ? true +, # Whether to output have EFIVARS available in $out/efi-vars.fd and use it during disk creation + touchEFIVars ? false + +, # OVMF firmware derivation + OVMF ? pkgs.OVMF.fd + +, # EFI firmware + efiFirmware ? OVMF.firmware + +, # EFI variables + efiVariables ? OVMF.variables + , # The root file system type. fsType ? "ext4" @@ -70,6 +164,22 @@ , # Disk image format, one of qcow2, qcow2-compressed, vdi, vpc, raw. format ? "raw" + # Whether to fix: + # - GPT Disk Unique Identifier (diskGUID) + # - GPT Partition Unique Identifier: depends on the layout, root partition UUID can be controlled through `rootGPUID` option + # - GPT Partition Type Identifier: fixed according to the layout, e.g. ESP partition, etc. through `parted` invocation. + # - Filesystem Unique Identifier when fsType = ext4 for *root partition*. + # BIOS/MBR support is "best effort" at the moment. + # Boot partitions may not be deterministic. + # Also, to fix last time checked of the ext4 partition if fsType = ext4. +, deterministic ? true + + # GPT Partition Unique Identifier for root partition. +, rootGPUID ? "F222513B-DED1-49FA-B591-20CE86A2FE7F" + # When fsType = ext4, this is the root Filesystem Unique Identifier. + # TODO: support other filesystems someday. +, rootFSUID ? (if fsType == "ext4" then rootGPUID else null) + , # Whether a nix channel based on the current source tree should be # made available inside the image. Useful for interactive use of nix # utils, but changes the hash of the image when the sources are @@ -80,15 +190,18 @@ additionalPaths ? [] }: -assert partitionTableType == "legacy" || partitionTableType == "legacy+gpt" || partitionTableType == "efi" || partitionTableType == "hybrid" || partitionTableType == "none"; -# We use -E offset=X below, which is only supported by e2fsprogs -assert partitionTableType != "none" -> fsType == "ext4"; +assert (lib.assertOneOf "partitionTableType" partitionTableType [ "legacy" "legacy+gpt" "efi" "hybrid" "none" ]); +assert (lib.assertMsg (fsType == "ext4" && deterministic -> rootFSUID != null) "In deterministic mode with a ext4 partition, rootFSUID must be non-null, by default, it is equal to rootGPUID."); + # We use -E offset=X below, which is only supported by e2fsprogs +assert (lib.assertMsg (partitionTableType != "none" -> fsType == "ext4") "to produce a partition table, we need to use -E offset flag which is support only for fsType = ext4"); +assert (lib.assertMsg (touchEFIVars -> partitionTableType == "hybrid" || partitionTableType == "efi" || partitionTableType == "legacy+gpt") "EFI variables can be used only with a partition table of type: hybrid, efi or legacy+gpt."); + # If only Nix store image, then: contents must be empty, configFile must be unset, and we should no install bootloader. +assert (lib.assertMsg (onlyNixStore -> contents == [] && configFile == null && !installBootLoader) "In a only Nix store image, the contents must be empty, no configuration must be provided and no bootloader should be installed."); # Either both or none of {user,group} need to be set -assert lib.all +assert (lib.assertMsg (lib.all (attrs: ((attrs.user or null) == null) == ((attrs.group or null) == null)) - contents; -assert onlyNixStore -> contents == [] && configFile == null && !installBootLoader; + contents) "Contents of the disk image should set none of {user, group} or both at the same time."); with lib; @@ -127,6 +240,14 @@ let format' = format; in let mkpart primary ext4 2MB -1 \ align-check optimal 2 \ print + ${optionalString deterministic '' + sgdisk \ + --disk-guid=97FD5997-D90B-4AA3-8D16-C1723AEA73C \ + --partition-guid=1:1C06F03B-704E-4657-B9CD-681A087A2FDC \ + --partition-guid=2:970C694F-AFD0-4B99-B750-CDB7A329AB6F \ + --partition-guid=3:${rootGPUID} \ + $diskImage + ''} ''; efi = '' parted --script $diskImage -- \ @@ -134,6 +255,13 @@ let format' = format; in let mkpart ESP fat32 8MiB ${bootSize} \ set 1 boot on \ mkpart primary ext4 ${bootSize} -1 + ${optionalString deterministic '' + sgdisk \ + --disk-guid=97FD5997-D90B-4AA3-8D16-C1723AEA73C \ + --partition-guid=1:1C06F03B-704E-4657-B9CD-681A087A2FDC \ + --partition-guid=2:${rootGPUID} \ + $diskImage + ''} ''; hybrid = '' parted --script $diskImage -- \ @@ -143,10 +271,20 @@ let format' = format; in let mkpart no-fs 0 1024KiB \ set 2 bios_grub on \ mkpart primary ext4 ${bootSize} -1 + ${optionalString deterministic '' + sgdisk \ + --disk-guid=97FD5997-D90B-4AA3-8D16-C1723AEA73C \ + --partition-guid=1:1C06F03B-704E-4657-B9CD-681A087A2FDC \ + --partition-guid=2:970C694F-AFD0-4B99-B750-CDB7A329AB6F \ + --partition-guid=3:${rootGPUID} \ + $diskImage + ''} ''; none = ""; }.${partitionTableType}; + useEFIBoot = touchEFIVars; + nixpkgs = cleanSource pkgs.path; # FIXME: merge with channel.nix / make-channel.nix. @@ -171,7 +309,9 @@ let format' = format; in let config.system.build.nixos-enter nix systemdMinimal - ] ++ stdenv.initialPath); + ] + ++ lib.optional deterministic gptfdisk + ++ stdenv.initialPath); # I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate # image building logic. The comment right below this now appears in 4 different places in nixpkgs :) @@ -368,20 +508,35 @@ let format' = format; in let diskImage=$out/${filename} ''; + createEFIVars = '' + efiVars=$out/efi-vars.fd + cp ${efiVariables} $efiVars + chmod 0644 $efiVars + ''; + buildImage = pkgs.vmTools.runInLinuxVM ( pkgs.runCommand name { - preVM = prepareImage; + preVM = prepareImage + lib.optionalString touchEFIVars createEFIVars; buildInputs = with pkgs; [ util-linux e2fsprogs dosfstools ]; postVM = moveOrConvertImage + postVM; + QEMU_OPTS = + concatStringsSep " " (lib.optional useEFIBoot "-drive if=pflash,format=raw,unit=0,readonly=on,file=${efiFirmware}" + ++ lib.optionals touchEFIVars [ + "-drive if=pflash,format=raw,unit=1,file=$efiVars" + ] + ); memSize = 1024; } '' export PATH=${binPath}:$PATH rootDisk=${if partitionTableType != "none" then "/dev/vda${rootPartition}" else "/dev/vda"} - # Some tools assume these exist - ln -s vda /dev/xvda - ln -s vda /dev/sda + # It is necessary to set root filesystem unique identifier in advance, otherwise + # bootloader might get the wrong one and fail to boot. + # At the end, we reset again because we want deterministic timestamps. + ${optionalString (fsType == "ext4" && deterministic) '' + tune2fs -T now ${optionalString deterministic "-U ${rootFSUID}"} -c 0 -i 0 $rootDisk + ''} # make systemd-boot find ESP without udev mkdir /dev/block ln -s /dev/vda1 /dev/block/254:1 @@ -396,6 +551,8 @@ let format' = format; in let mkdir -p /mnt/boot mkfs.vfat -n ESP /dev/vda1 mount /dev/vda1 /mnt/boot + + ${optionalString touchEFIVars "mount -t efivarfs efivarfs /sys/firmware/efi/efivars"} ''} # Install a configuration.nix @@ -405,7 +562,13 @@ let format' = format; in let ''} ${lib.optionalString installBootLoader '' - # Set up core system link, GRUB, etc. + # In this throwaway resource, we only have /dev/vda, but the actual VM may refer to another disk for bootloader, e.g. /dev/vdb + # Use this option to create a symlink from vda to any arbitrary device you want. + ${optionalString (config.boot.loader.grub.device != "/dev/vda") '' + ln -s /dev/vda ${config.boot.loader.grub.device} + ''} + + # Set up core system link, bootloader (sd-boot, GRUB, uboot, etc.), etc. NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root $mountPoint -- /nix/var/nix/profiles/system/bin/switch-to-configuration boot # The above scripts will generate a random machine-id and we don't want to bake a single ID into all our images @@ -432,8 +595,12 @@ let format' = format; in let # Make sure resize2fs works. Note that resize2fs has stricter criteria for resizing than a normal # mount, so the `-c 0` and `-i 0` don't affect it. Setting it to `now` doesn't produce deterministic # output, of course, but we can fix that when/if we start making images deterministic. + # In deterministic mode, this is fixed to 1970-01-01 (UNIX timestamp 0). + # This two-step approach is necessary otherwise `tune2fs` will want a fresher filesystem to perform + # some changes. ${optionalString (fsType == "ext4") '' - tune2fs -T now -c 0 -i 0 $rootDisk + tune2fs -T now ${optionalString deterministic "-U ${rootFSUID}"} -c 0 -i 0 $rootDisk + ${optionalString deterministic "tune2fs -f -T 19700101 $rootDisk"} ''} '' ); diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index e097aa5eebd8..271af9ba1801 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -19,14 +19,14 @@ { pkgs , lib , options -, transformOptions ? lib.id # function for additional tranformations of the options +, transformOptions ? lib.id # function for additional transformations of the options , documentType ? "appendix" # TODO deprecate "appendix" in favor of "none" # and/or rename function to moduleOptionDoc for clean slate # If you include more than one option list into a document, you need to # provide different ids. , variablelistId ? "configuration-variable-list" - # Strig to prefix to the option XML/HTML id attributes. + # String to prefix to the option XML/HTML id attributes. , optionIdPrefix ? "opt-" , revision ? "" # Specify revision for the options # a set of options the docs we are generating will be merged into, as if by recursiveUpdate. @@ -41,32 +41,16 @@ # characteristics but (hopefully) indistinguishable output. , allowDocBook ? true # whether lib.mdDoc is required for descriptions to be read as markdown. +# !!! when this is eventually flipped to true, `lib.doRename` should also default to emitting Markdown , markdownByDefault ? false }: let - # Make a value safe for JSON. Functions are replaced by the string "", - # derivations are replaced with an attrset - # { _type = "derivation"; name = ; }. - # We need to handle derivations specially because consumers want to know about them, - # but we can't easily use the type,name subset of keys (since type is often used as - # a module option and might cause confusion). Use _type,name instead to the same - # effect, since _type is already used by the module system. - substSpecial = x: - if lib.isDerivation x then { _type = "derivation"; name = x.name; } - else if builtins.isAttrs x then lib.mapAttrs (name: substSpecial) x - else if builtins.isList x then map substSpecial x - else if lib.isFunction x then "" - else x; - rawOpts = lib.optionAttrSetToDocList options; transformedOpts = map transformOptions rawOpts; filteredOpts = lib.filter (opt: opt.visible && !opt.internal) transformedOpts; optionsList = lib.flip map filteredOpts (opt: opt - // lib.optionalAttrs (opt ? example) { example = substSpecial opt.example; } - // lib.optionalAttrs (opt ? default) { default = substSpecial opt.default; } - // lib.optionalAttrs (opt ? type) { type = substSpecial opt.type; } // lib.optionalAttrs (opt ? relatedPackages && opt.relatedPackages != []) { relatedPackages = genRelatedPackages opt.relatedPackages opt.name; } ); @@ -94,16 +78,13 @@ let title = args.title or null; name = args.name or (lib.concatStringsSep "." args.path); in '' - - - - ${lib.optionalString (title != null) "${title} aka "}pkgs.${name} - - - ${lib.optionalString (args ? comment) "${args.comment}"} - + - [`${lib.optionalString (title != null) "${title} aka "}pkgs.${name}`]( + https://search.nixos.org/packages?show=${name}&sort=relevance&query=${name} + )${ + lib.optionalString (args ? comment) "\n\n ${args.comment}" + } ''; - in "${lib.concatStringsSep "\n" (map (p: describe (unpack p)) packages)}"; + in lib.concatMapStrings (p: describe (unpack p)) packages; optionsNix = builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList); @@ -111,14 +92,16 @@ in rec { inherit optionsNix; optionsAsciiDoc = pkgs.runCommand "options.adoc" {} '' - ${pkgs.python3Minimal}/bin/python ${./generateAsciiDoc.py} \ - < ${optionsJSON}/share/doc/nixos/options.json \ + ${pkgs.python3Minimal}/bin/python ${./generateDoc.py} \ + --format asciidoc \ + ${optionsJSON}/share/doc/nixos/options.json \ > $out ''; optionsCommonMark = pkgs.runCommand "options.md" {} '' - ${pkgs.python3Minimal}/bin/python ${./generateCommonMark.py} \ - < ${optionsJSON}/share/doc/nixos/options.json \ + ${pkgs.python3Minimal}/bin/python ${./generateDoc.py} \ + --format commonmark \ + ${optionsJSON}/share/doc/nixos/options.json \ > $out ''; @@ -126,16 +109,7 @@ in rec { { meta.description = "List of NixOS options in JSON format"; nativeBuildInputs = [ pkgs.brotli - (let - # python3Minimal can't be overridden with packages on Darwin, due to a missing framework. - # Instead of modifying stdenv, we take the easy way out, since most people on Darwin will - # just be hacking on the Nixpkgs manual (which also uses make-options-doc). - python = if pkgs.stdenv.isDarwin then pkgs.python3 else pkgs.python3Minimal; - self = (python.override { - inherit self; - includeSiteCustomize = true; - }); - in self.withPackages (p: [ p.mistune ])) + pkgs.python3Minimal ]; options = builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix)); @@ -151,10 +125,10 @@ in rec { dst=$out/share/doc/nixos mkdir -p $dst + TOUCH_IF_DB=$dst/.used-docbook \ python ${./mergeJSON.py} \ ${lib.optionalString warningsAreErrors "--warnings-are-errors"} \ - ${lib.optionalString (! allowDocBook) "--error-on-docbook"} \ - ${lib.optionalString markdownByDefault "--markdown-by-default"} \ + ${if allowDocBook then "--warn-on-docbook" else "--error-on-docbook"} \ $baseJSON $options \ > $dst/options.json @@ -165,21 +139,30 @@ in rec { echo "file json-br $dst/options.json.br" >> $out/nix-support/hydra-build-products ''; - # Convert options.json into an XML file. - # The actual generation of the xml file is done in nix purely for the convenience - # of not having to generate the xml some other way - optionsXML = pkgs.runCommand "options.xml" {} '' - export NIX_STORE_DIR=$TMPDIR/store - export NIX_STATE_DIR=$TMPDIR/state - ${pkgs.nix}/bin/nix-instantiate \ - --eval --xml --strict ${./optionsJSONtoXML.nix} \ - --argstr file ${optionsJSON}/share/doc/nixos/options.json \ - > "$out" + optionsUsedDocbook = pkgs.runCommand "options-used-docbook" {} '' + if [ -e ${optionsJSON}/share/doc/nixos/.used-docbook ]; then + echo 1 + else + echo 0 + fi >"$out" ''; - optionsDocBook = pkgs.runCommand "options-docbook.xml" {} '' - optionsXML=${optionsXML} - if grep /nixpkgs/nixos/modules $optionsXML; then + optionsDocBook = pkgs.runCommand "options-docbook.xml" { + nativeBuildInputs = [ + pkgs.nixos-render-docs + ]; + } '' + nixos-render-docs options docbook \ + --manpage-urls ${pkgs.path + "/doc/manpage-urls.json"} \ + --revision ${lib.escapeShellArg revision} \ + --document-type ${lib.escapeShellArg documentType} \ + --varlist-id ${lib.escapeShellArg variablelistId} \ + --id-prefix ${lib.escapeShellArg optionIdPrefix} \ + ${lib.optionalString markdownByDefault "--markdown-by-default"} \ + ${optionsJSON}/share/doc/nixos/options.json \ + options.xml + + if grep /nixpkgs/nixos/modules options.xml; then echo "The manual appears to depend on the location of Nixpkgs, which is bad" echo "since this prevents sharing via the NixOS channel. This is typically" echo "caused by an option default that refers to a relative path (see above" @@ -187,14 +170,7 @@ in rec { exit 1 fi - ${pkgs.python3Minimal}/bin/python ${./sortXML.py} $optionsXML sorted.xml ${pkgs.libxslt.bin}/bin/xsltproc \ - --stringparam documentType '${documentType}' \ - --stringparam revision '${revision}' \ - --stringparam variablelistId '${variablelistId}' \ - --stringparam optionIdPrefix '${optionIdPrefix}' \ - -o intermediate.xml ${./options-to-docbook.xsl} sorted.xml - ${pkgs.libxslt.bin}/bin/xsltproc \ - -o "$out" ${./postprocess-option-descriptions.xsl} intermediate.xml + -o "$out" ${./postprocess-option-descriptions.xsl} options.xml ''; } diff --git a/nixos/lib/make-options-doc/generateAsciiDoc.py b/nixos/lib/make-options-doc/generateAsciiDoc.py deleted file mode 100644 index 48eadd248c5a..000000000000 --- a/nixos/lib/make-options-doc/generateAsciiDoc.py +++ /dev/null @@ -1,37 +0,0 @@ -import json -import sys - -options = json.load(sys.stdin) -# TODO: declarations: link to github -for (name, value) in options.items(): - print(f'== {name}') - print() - print(value['description']) - print() - print('[discrete]') - print('=== details') - print() - print(f'Type:: {value["type"]}') - if 'default' in value: - print('Default::') - print('+') - print('----') - print(json.dumps(value['default'], ensure_ascii=False, separators=(',', ':'))) - print('----') - print() - else: - print('No Default:: {blank}') - if value['readOnly']: - print('Read Only:: {blank}') - else: - print() - if 'example' in value: - print('Example::') - print('+') - print('----') - print(json.dumps(value['example'], ensure_ascii=False, separators=(',', ':'))) - print('----') - print() - else: - print('No Example:: {blank}') - print() diff --git a/nixos/lib/make-options-doc/generateCommonMark.py b/nixos/lib/make-options-doc/generateCommonMark.py deleted file mode 100644 index bf487bd89c3f..000000000000 --- a/nixos/lib/make-options-doc/generateCommonMark.py +++ /dev/null @@ -1,27 +0,0 @@ -import json -import sys - -options = json.load(sys.stdin) -for (name, value) in options.items(): - print('##', name.replace('<', '<').replace('>', '>')) - print(value['description']) - print() - if 'type' in value: - print('*_Type_*:') - print(value['type']) - print() - print() - if 'default' in value: - print('*_Default_*') - print('```') - print(json.dumps(value['default'], ensure_ascii=False, separators=(',', ':'))) - print('```') - print() - print() - if 'example' in value: - print('*_Example_*') - print('```') - print(json.dumps(value['example'], ensure_ascii=False, separators=(',', ':'))) - print('```') - print() - print() diff --git a/nixos/lib/make-options-doc/generateDoc.py b/nixos/lib/make-options-doc/generateDoc.py new file mode 100644 index 000000000000..07884ed657e4 --- /dev/null +++ b/nixos/lib/make-options-doc/generateDoc.py @@ -0,0 +1,112 @@ +import argparse +import json +import sys + +formats = ['commonmark', 'asciidoc'] + +parser = argparse.ArgumentParser( + description = 'Generate documentation for a set of JSON-formatted NixOS options' +) +parser.add_argument( + 'nix_options_path', + help = 'a path to a JSON file containing the NixOS options' +) +parser.add_argument( + '-f', + '--format', + choices = formats, + required = True, + help = f'the documentation format to generate' +) + +args = parser.parse_args() + +class OptionsEncoder(json.JSONEncoder): + def encode(self, obj): + # Unpack literal expressions and other Nix types. + # Don't escape the strings: they were escaped when initially serialized to JSON. + if isinstance(obj, dict): + _type = obj.get('_type') + if _type is not None: + if _type == 'literalExpression' or _type == 'literalDocBook': + return obj['text'] + + if _type == 'derivation': + return obj['name'] + + raise Exception(f'Unexpected type `{_type}` in {json.dumps(obj)}') + + return super().encode(obj) + +def generate_commonmark(options): + for (name, value) in options.items(): + print('##', name.replace('<', '<').replace('>', '>')) + print(value['description']) + print() + if 'type' in value: + print('*_Type_*') + print ('```') + print(value['type']) + print ('```') + print() + print() + if 'default' in value: + print('*_Default_*') + print('```') + print(json.dumps(value['default'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':'))) + print('```') + print() + print() + if 'example' in value: + print('*_Example_*') + print('```') + print(json.dumps(value['example'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':'))) + print('```') + print() + print() + +# TODO: declarations: link to github +def generate_asciidoc(options): + for (name, value) in options.items(): + print(f'== {name}') + print() + print(value['description']) + print() + print('[discrete]') + print('=== details') + print() + print(f'Type:: {value["type"]}') + if 'default' in value: + print('Default::') + print('+') + print('----') + print(json.dumps(value['default'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':'))) + print('----') + print() + else: + print('No Default:: {blank}') + if value['readOnly']: + print('Read Only:: {blank}') + else: + print() + if 'example' in value: + print('Example::') + print('+') + print('----') + print(json.dumps(value['example'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':'))) + print('----') + print() + else: + print('No Example:: {blank}') + print() + +with open(args.nix_options_path) as nix_options_json: + options = json.load(nix_options_json) + + if args.format == 'commonmark': + generate_commonmark(options) + elif args.format == 'asciidoc': + generate_asciidoc(options) + else: + raise Exception(f'Unsupported documentation format `--format {args.format}`') + diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index 750cd24fc653..b4f72b8a3fdc 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -1,13 +1,9 @@ import collections import json +import os import sys from typing import Any, Dict, List -# for MD conversion -import mistune -import re -from xml.sax.saxutils import escape, quoteattr - JSON = Dict[str, Any] class Key: @@ -46,193 +42,20 @@ def unpivot(options: Dict[Key, Option]) -> Dict[str, JSON]: result[opt.name] = opt.value return result -admonitions = { - '.warning': 'warning', - '.important': 'important', - '.note': 'note' -} -class Renderer(mistune.renderers.BaseRenderer): - def _get_method(self, name): - try: - return super(Renderer, self)._get_method(name) - except AttributeError: - def not_supported(*args, **kwargs): - raise NotImplementedError("md node not supported yet", name, args, **kwargs) - return not_supported - - def text(self, text): - return escape(text) - def paragraph(self, text): - return text + "\n\n" - def newline(self): - return "\n" - def codespan(self, text): - return f"{escape(text)}" - def block_code(self, text, info=None): - info = f" language={quoteattr(info)}" if info is not None else "" - return f"\n{escape(text)}" - def link(self, link, text=None, title=None): - tag = "link" - if link[0:1] == '#': - if text == "": - tag = "xref" - attr = "linkend" - link = quoteattr(link[1:]) - else: - # try to faithfully reproduce links that were of the form - # in docbook format - if text == link: - text = "" - attr = "xlink:href" - link = quoteattr(link) - return f"<{tag} {attr}={link}>{text}" - def list(self, text, ordered, level, start=None): - if ordered: - raise NotImplementedError("ordered lists not supported yet") - return f"\n{text}\n" - def list_item(self, text, level): - return f"{text}\n" - def block_text(self, text): - return text - def emphasis(self, text): - return f"{text}" - def strong(self, text): - return f"{text}" - def admonition(self, text, kind): - if kind not in admonitions: - raise NotImplementedError(f"admonition {kind} not supported yet") - tag = admonitions[kind] - # we don't keep whitespace here because usually we'll contain only - # a single paragraph and the original docbook string is no longer - # available to restore the trailer. - return f"<{tag}>{text.rstrip()}" - def block_quote(self, text): - return f"
{text}
" - def command(self, text): - return f"{escape(text)}" - def option(self, text): - return f"" - def file(self, text): - return f"{escape(text)}" - def var(self, text): - return f"{escape(text)}" - def env(self, text): - return f"{escape(text)}" - def manpage(self, page, section): - title = f"{escape(page)}" - vol = f"{escape(section)}" - return f"{title}{vol}" - - def finalize(self, data): - return "".join(data) - -def p_command(md): - COMMAND_PATTERN = r'\{command\}`(.*?)`' - def parse(self, m, state): - return ('command', m.group(1)) - md.inline.register_rule('command', COMMAND_PATTERN, parse) - md.inline.rules.append('command') - -def p_file(md): - FILE_PATTERN = r'\{file\}`(.*?)`' - def parse(self, m, state): - return ('file', m.group(1)) - md.inline.register_rule('file', FILE_PATTERN, parse) - md.inline.rules.append('file') - -def p_var(md): - VAR_PATTERN = r'\{var\}`(.*?)`' - def parse(self, m, state): - return ('var', m.group(1)) - md.inline.register_rule('var', VAR_PATTERN, parse) - md.inline.rules.append('var') - -def p_env(md): - ENV_PATTERN = r'\{env\}`(.*?)`' - def parse(self, m, state): - return ('env', m.group(1)) - md.inline.register_rule('env', ENV_PATTERN, parse) - md.inline.rules.append('env') - -def p_option(md): - OPTION_PATTERN = r'\{option\}`(.*?)`' - def parse(self, m, state): - return ('option', m.group(1)) - md.inline.register_rule('option', OPTION_PATTERN, parse) - md.inline.rules.append('option') - -def p_manpage(md): - MANPAGE_PATTERN = r'\{manpage\}`(.*?)\((.+?)\)`' - def parse(self, m, state): - return ('manpage', m.group(1), m.group(2)) - md.inline.register_rule('manpage', MANPAGE_PATTERN, parse) - md.inline.rules.append('manpage') - -def p_admonition(md): - ADMONITION_PATTERN = re.compile(r'^::: \{([^\n]*?)\}\n(.*?)^:::$\n*', flags=re.MULTILINE|re.DOTALL) - def parse(self, m, state): - return { - 'type': 'admonition', - 'children': self.parse(m.group(2), state), - 'params': [ m.group(1) ], - } - md.block.register_rule('admonition', ADMONITION_PATTERN, parse) - md.block.rules.append('admonition') - -md = mistune.create_markdown(renderer=Renderer(), plugins=[ - p_command, p_file, p_var, p_env, p_option, p_manpage, p_admonition -]) - -# converts in-place! -def convertMD(options: Dict[str, Any]) -> str: - def convertString(path: str, text: str) -> str: - try: - rendered = md(text) - # keep trailing spaces so we can diff the generated XML to check for conversion bugs. - return rendered.rstrip() + text[len(text.rstrip()):] - except: - print(f"error in {path}") - raise - - def optionIs(option: Dict[str, Any], key: str, typ: str) -> bool: - if key not in option: return False - if type(option[key]) != dict: return False - if '_type' not in option[key]: return False - return option[key]['_type'] == typ - - for (name, option) in options.items(): - try: - if optionIs(option, 'description', 'mdDoc'): - option['description'] = convertString(name, option['description']['text']) - elif markdownByDefault: - option['description'] = convertString(name, option['description']) - - if optionIs(option, 'example', 'literalMD'): - docbook = convertString(name, option['example']['text']) - option['example'] = { '_type': 'literalDocBook', 'text': docbook } - if optionIs(option, 'default', 'literalMD'): - docbook = convertString(name, option['default']['text']) - option['default'] = { '_type': 'literalDocBook', 'text': docbook } - except Exception as e: - raise Exception(f"Failed to render option {name}: {str(e)}") - - - return options - warningsAreErrors = False +warnOnDocbook = False errorOnDocbook = False -markdownByDefault = False optOffset = 0 for arg in sys.argv[1:]: if arg == "--warnings-are-errors": optOffset += 1 warningsAreErrors = True - if arg == "--error-on-docbook": + if arg == "--warn-on-docbook": + optOffset += 1 + warnOnDocbook = True + elif arg == "--error-on-docbook": optOffset += 1 errorOnDocbook = True - if arg == "--markdown-by-default": - optOffset += 1 - markdownByDefault = True options = pivot(json.load(open(sys.argv[1 + optOffset], 'r'))) overrides = pivot(json.load(open(sys.argv[2 + optOffset], 'r'))) @@ -270,26 +93,27 @@ def is_docbook(o, key): # check that every option has a description hasWarnings = False hasErrors = False -hasDocBookErrors = False +hasDocBook = False for (k, v) in options.items(): - if errorOnDocbook: + if warnOnDocbook or errorOnDocbook: + kind = "error" if errorOnDocbook else "warning" if isinstance(v.value.get('description', {}), str): - hasErrors = True - hasDocBookErrors = True + hasErrors |= errorOnDocbook + hasDocBook = True print( - f"\x1b[1;31merror: option {v.name} description uses DocBook\x1b[0m", + f"\x1b[1;31m{kind}: option {v.name} description uses DocBook\x1b[0m", file=sys.stderr) elif is_docbook(v.value, 'defaultText'): - hasErrors = True - hasDocBookErrors = True + hasErrors |= errorOnDocbook + hasDocBook = True print( - f"\x1b[1;31merror: option {v.name} default uses DocBook\x1b[0m", + f"\x1b[1;31m{kind}: option {v.name} default uses DocBook\x1b[0m", file=sys.stderr) elif is_docbook(v.value, 'example'): - hasErrors = True - hasDocBookErrors = True + hasErrors |= errorOnDocbook + hasDocBook = True print( - f"\x1b[1;31merror: option {v.name} example uses DocBook\x1b[0m", + f"\x1b[1;31m{kind}: option {v.name} example uses DocBook\x1b[0m", file=sys.stderr) if v.value.get('description', None) is None: @@ -302,19 +126,29 @@ for (k, v) in options.items(): 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 hasDocBookErrors: +if hasDocBook: + (why, what) = ( + ("disallowed for in-tree modules", "contribution") if errorOnDocbook + else ("deprecated for option documentation", "module") + ) print("Explanation: The documentation contains descriptions, examples, or defaults written in DocBook. " + "NixOS is in the process of migrating from DocBook to Markdown, and " + - "DocBook is disallowed for in-tree modules. To change your contribution to "+ - "use Markdown, apply mdDoc and literalMD. For example:\n" + + f"DocBook is {why}. To change your {what} to "+ + "use Markdown, apply mdDoc and literalMD and use the *MD variants of option creation " + + "functions where they are available. For example:\n" + "\n" + " example.foo = mkOption {\n" + " description = lib.mdDoc ''your description'';\n" + " defaultText = lib.literalMD ''your description of default'';\n" + - " }\n" + + " };\n" + "\n" + - " example.enable = mkEnableOption (lib.mdDoc ''your thing'');", + " example.enable = mkEnableOption (lib.mdDoc ''your thing'');\n" + + " example.package = mkPackageOptionMD pkgs \"your-package\" {};\n" + + " imports = [ (mkAliasOptionModuleMD [ \"example\" \"args\" ] [ \"example\" \"settings\" ]) ];", file = sys.stderr) + with open(os.getenv('TOUCH_IF_DB'), 'x'): + # just make sure it exists + pass if hasErrors: sys.exit(1) @@ -327,4 +161,4 @@ if hasWarnings and warningsAreErrors: file=sys.stderr) sys.exit(1) -json.dump(convertMD(unpivot(options)), fp=sys.stdout) +json.dump(unpivot(options), fp=sys.stdout) diff --git a/nixos/lib/make-options-doc/options-to-docbook.xsl b/nixos/lib/make-options-doc/options-to-docbook.xsl deleted file mode 100644 index 0fe14a6d2d16..000000000000 --- a/nixos/lib/make-options-doc/options-to-docbook.xsl +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - Configuration Options - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Type: - - - - - (read only) - - - - - - - Default: - - - - - - - - Example: - - - - - - - - Related packages: - - - - - - - - Declared by: - - - - - - - Defined by: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - '' - - '' - - - - - - - - - - - null - - - - - - - '''' - - - "" - - - - - - - - - - - - true - - - - - false - - - - - [ - - - - - ] - - - - - - - - - - { - - - = - ; - - } - - - - - (build of ) - - - - - - - - - - - - - - - - - - - - - - - https://github.com/NixOS/nixpkgs/blob/master/ - - - https://github.com/NixOS/nixpkgs/blob// - - - - - https://github.com/NixOS/nixops/blob//nix/ - - - file:// - - - - - - <nixpkgs/> - - - <nixops/> - - - - - - - - - - - - - λ - - - - diff --git a/nixos/lib/make-options-doc/optionsJSONtoXML.nix b/nixos/lib/make-options-doc/optionsJSONtoXML.nix deleted file mode 100644 index ba50c5f898b5..000000000000 --- a/nixos/lib/make-options-doc/optionsJSONtoXML.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ file }: - -builtins.attrValues - (builtins.mapAttrs - (name: def: def // { inherit name; }) - (builtins.fromJSON (builtins.readFile file))) diff --git a/nixos/lib/make-options-doc/sortXML.py b/nixos/lib/make-options-doc/sortXML.py deleted file mode 100644 index e63ff3538b3f..000000000000 --- a/nixos/lib/make-options-doc/sortXML.py +++ /dev/null @@ -1,27 +0,0 @@ -import xml.etree.ElementTree as ET -import sys - -tree = ET.parse(sys.argv[1]) -# the xml tree is of the form -# {all options, each an attrs} -options = list(tree.getroot().find('list')) - -def sortKey(opt): - def order(s): - if s.startswith("enable"): - return 0 - if s.startswith("package"): - return 1 - return 2 - - return [ - (order(p.attrib['value']), p.attrib['value']) - for p in opt.findall('attr[@name="loc"]/list/string') - ] - -options.sort(key=sortKey) - -doc = ET.Element("expr") -newOptions = ET.SubElement(doc, "list") -newOptions.extend(options) -ET.ElementTree(doc).write(sys.argv[2], encoding='utf-8') diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index 4c52643446ed..c6c8753d5325 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -8,9 +8,9 @@ let systemd = cfg.package; in rec { - shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s); + shellEscape = s: (replaceStrings [ "\\" ] [ "\\\\" ] s); - mkPathSafeName = lib.replaceChars ["@" ":" "\\" "[" "]"] ["-" "-" "-" "" ""]; + mkPathSafeName = lib.replaceStrings ["@" ":" "\\" "[" "]"] ["-" "-" "-" "" ""]; # 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)"; @@ -258,7 +258,7 @@ in rec { makeJobScript = name: text: let - scriptName = replaceChars [ "\\" "@" ] [ "-" "_" ] (shellEscape name); + scriptName = replaceStrings [ "\\" "@" ] [ "-" "_" ] (shellEscape name); out = (pkgs.writeShellScriptBin scriptName '' set -e ${text} diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix index 44f26572a23b..6c53c5e0533d 100644 --- a/nixos/lib/systemd-unit-options.nix +++ b/nixos/lib/systemd-unit-options.nix @@ -60,7 +60,7 @@ in rec { `asDropin` creates a drop-in file named `overrides.conf`. Mainly needed to define instances for systemd template units (e.g. `systemd-nspawn@mycontainer.service`). - See also systemd.unit(1). + See also {manpage}`systemd.unit(5)`. ''; }; @@ -86,7 +86,7 @@ in rec { This option creates a `.wants` symlink in the given target that exists statelessly without the need for running `systemctl enable`. - The in systemd.unit(5) manpage described `[Install]` section however is + The `[Install]` section described in {manpage}`systemd.unit(5)` however is not supported because it is a stateful process that does not fit well into the NixOS design. ''; @@ -324,7 +324,11 @@ in rec { scriptArgs = mkOption { type = types.str; default = ""; - description = lib.mdDoc "Arguments passed to the main process script."; + example = "%i"; + description = lib.mdDoc '' + Arguments passed to the main process script. + Can contain specifiers (`%` placeholders expanded by systemd, see {manpage}`systemd.unit(5)`). + ''; }; preStart = mkOption { diff --git a/nixos/lib/test-driver/default.nix b/nixos/lib/test-driver/default.nix index e3786622c3c5..33313059fff7 100644 --- a/nixos/lib/test-driver/default.nix +++ b/nixos/lib/test-driver/default.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { ++ extraPythonPackages python3Packages; doCheck = true; - checkInputs = with python3Packages; [ mypy pylint black ]; + nativeCheckInputs = with python3Packages; [ mypy pylint black ]; checkPhase = '' mypy --disallow-untyped-defs \ --no-implicit-optional \ diff --git a/nixos/lib/test-driver/test_driver/__init__.py b/nixos/lib/test-driver/test_driver/__init__.py index 61d91c9ed654..db7e0ed33a89 100755 --- a/nixos/lib/test-driver/test_driver/__init__.py +++ b/nixos/lib/test-driver/test_driver/__init__.py @@ -41,11 +41,9 @@ def writeable_dir(arg: str) -> Path: """ path = Path(arg) if not path.is_dir(): - raise argparse.ArgumentTypeError("{0} is not a directory".format(path)) + raise argparse.ArgumentTypeError(f"{path} is not a directory") if not os.access(path, os.W_OK): - raise argparse.ArgumentTypeError( - "{0} is not a writeable directory".format(path) - ) + raise argparse.ArgumentTypeError(f"{path} is not a writeable directory") return path diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py index e32f6810ca87..de6abbb4679e 100644 --- a/nixos/lib/test-driver/test_driver/driver.py +++ b/nixos/lib/test-driver/test_driver/driver.py @@ -19,15 +19,11 @@ def get_tmp_dir() -> Path: 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 - ) + f"The directory defined by TMPDIR, TEMP, TMP or CWD: {tmp_dir} is not a directory" ) 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 - ) + f"The directory defined by TMPDIR, TEMP, TMP, or CWD: {tmp_dir} is not writeable" ) return tmp_dir @@ -220,6 +216,20 @@ class Driver: res = driver.polling_conditions.pop() assert res is self.condition + def wait(self, timeout: int = 900) -> None: + def condition(last: bool) -> bool: + if last: + rootlog.info(f"Last chance for {self.condition.description}") + ret = self.condition.check(force=True) + if not ret and not last: + rootlog.info( + f"({self.condition.description} failure not fatal yet)" + ) + return ret + + with rootlog.nested(f"waiting for {self.condition.description}"): + retry(condition, timeout=timeout) + if fun_ is None: return Poll else: diff --git a/nixos/lib/test-driver/test_driver/logger.py b/nixos/lib/test-driver/test_driver/logger.py index 59ed29547231..e6182ff7c761 100644 --- a/nixos/lib/test-driver/test_driver/logger.py +++ b/nixos/lib/test-driver/test_driver/logger.py @@ -36,7 +36,7 @@ class Logger: def maybe_prefix(self, message: str, attributes: Dict[str, str]) -> str: if "machine" in attributes: - return "{}: {}".format(attributes["machine"], message) + return f"{attributes['machine']}: {message}" return message def log_line(self, message: str, attributes: Dict[str, str]) -> None: @@ -62,9 +62,7 @@ class Logger: def log_serial(self, message: str, machine: str) -> None: self.enqueue({"msg": message, "machine": machine, "type": "serial"}) if self._print_serial_logs: - self._eprint( - Style.DIM + "{} # {}".format(machine, message) + Style.RESET_ALL - ) + self._eprint(Style.DIM + f"{machine} # {message}" + Style.RESET_ALL) def enqueue(self, item: Dict[str, str]) -> None: self.queue.put(item) @@ -97,7 +95,7 @@ class Logger: yield self.drain_log_queue() toc = time.time() - self.log("(finished: {}, in {:.2f} seconds)".format(message, toc - tic)) + self.log(f"(finished: {message}, in {toc - tic:.2f} seconds)") self.xml.endElement("nest") diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index ffbc7c18e42b..8f01833bffb4 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -101,14 +101,14 @@ def _perform_ocr_on_screenshot( tess_args = f"-c debug_file=/dev/null --psm 11" - cmd = f"convert {magick_args} {screenshot_path} tiff:{screenshot_path}.tiff" + cmd = f"convert {magick_args} '{screenshot_path}' 'tiff:{screenshot_path}.tiff'" ret = subprocess.run(cmd, shell=True, capture_output=True) if ret.returncode != 0: raise Exception(f"TIFF conversion failed with exit code {ret.returncode}") model_results = [] for model_id in model_ids: - cmd = f"tesseract {screenshot_path}.tiff - {tess_args} --oem {model_id}" + cmd = f"tesseract '{screenshot_path}.tiff' - {tess_args} --oem '{model_id}'" ret = subprocess.run(cmd, shell=True, capture_output=True) if ret.returncode != 0: raise Exception(f"OCR failed with exit code {ret.returncode}") @@ -420,8 +420,8 @@ class Machine: def send_monitor_command(self, command: str) -> str: self.run_callbacks() - with self.nested("sending monitor command: {}".format(command)): - message = ("{}\n".format(command)).encode() + with self.nested(f"sending monitor command: {command}"): + message = f"{command}\n".encode() assert self.monitor is not None self.monitor.send(message) return self.wait_for_monitor_prompt() @@ -438,7 +438,7 @@ class Machine: info = self.get_unit_info(unit, user) state = info["ActiveState"] if state == "failed": - raise Exception('unit "{}" reached state "{}"'.format(unit, state)) + raise Exception(f'unit "{unit}" reached state "{state}"') if state == "inactive": status, jobs = self.systemctl("list-jobs --full 2>&1", user) @@ -446,27 +446,24 @@ class Machine: info = self.get_unit_info(unit, user) if info["ActiveState"] == state: raise Exception( - ( - 'unit "{}" is inactive and there ' "are no pending jobs" - ).format(unit) + f'unit "{unit}" is inactive and there are no pending jobs' ) return state == "active" with self.nested( - "waiting for unit {}{}".format( - unit, f" with user {user}" if user is not None else "" - ) + f"waiting for unit {unit}" + + (f" with user {user}" if user is not None else "") ): retry(check_active, timeout) def get_unit_info(self, unit: str, user: Optional[str] = None) -> Dict[str, str]: - status, lines = self.systemctl('--no-pager show "{}"'.format(unit), user) + status, lines = self.systemctl(f'--no-pager show "{unit}"', user) if status != 0: raise Exception( - 'retrieving systemctl info for unit "{}" {} failed with exit code {}'.format( - unit, "" if user is None else 'under user "{}"'.format(user), status - ) + f'retrieving systemctl info for unit "{unit}"' + + ("" if user is None else f' under user "{user}"') + + f" failed with exit code {status}" ) line_pattern = re.compile(r"^([^=]+)=(.*)$") @@ -486,24 +483,22 @@ class Machine: if user is not None: q = q.replace("'", "\\'") return self.execute( - ( - "su -l {} --shell /bin/sh -c " - "$'XDG_RUNTIME_DIR=/run/user/`id -u` " - "systemctl --user {}'" - ).format(user, q) + f"su -l {user} --shell /bin/sh -c " + "$'XDG_RUNTIME_DIR=/run/user/`id -u` " + f"systemctl --user {q}'" ) - return self.execute("systemctl {}".format(q)) + return self.execute(f"systemctl {q}") def require_unit_state(self, unit: str, require_state: str = "active") -> None: with self.nested( - "checking if unit ‘{}’ has reached state '{}'".format(unit, require_state) + f"checking if unit '{unit}' has reached state '{require_state}'" ): info = self.get_unit_info(unit) state = info["ActiveState"] if state != require_state: raise Exception( - "Expected unit ‘{}’ to to be in state ".format(unit) - + "'{}' but it is in state ‘{}’".format(require_state, state) + f"Expected unit '{unit}' to to be in state " + f"'{require_state}' but it is in state '{state}'" ) def _next_newline_closed_block_from_shell(self) -> str: @@ -554,18 +549,27 @@ class Machine: return (rc, output.decode()) - def shell_interact(self) -> None: - """Allows you to interact with the guest shell + def shell_interact(self, address: Optional[str] = None) -> None: + """Allows you to interact with the guest shell for debugging purposes. - Should only be used during test development, not in the production test.""" + @address string passed to socat that will be connected to the guest shell. + Check the `Running Tests interactivly` chapter of NixOS manual for an example. + """ self.connect() - self.log("Terminal is ready (there is no initial prompt):") + + if address is None: + address = "READLINE,prompt=$ " + self.log("Terminal is ready (there is no initial prompt):") assert self.shell - subprocess.run( - ["socat", "READLINE,prompt=$ ", f"FD:{self.shell.fileno()}"], - pass_fds=[self.shell.fileno()], - ) + try: + subprocess.run( + ["socat", address, f"FD:{self.shell.fileno()}"], + pass_fds=[self.shell.fileno()], + ) + # allow users to cancel this command without breaking the test + except KeyboardInterrupt: + pass def console_interact(self) -> None: """Allows you to interact with QEMU's stdin @@ -593,13 +597,11 @@ class Machine: """Execute each command and check that it succeeds.""" output = "" for command in commands: - with self.nested("must succeed: {}".format(command)): + with self.nested(f"must succeed: {command}"): (status, out) = self.execute(command, timeout=timeout) if status != 0: - self.log("output: {}".format(out)) - raise Exception( - "command `{}` failed (exit code {})".format(command, status) - ) + self.log(f"output: {out}") + raise Exception(f"command `{command}` failed (exit code {status})") output += out return output @@ -607,12 +609,10 @@ class Machine: """Execute each command and check that it fails.""" output = "" for command in commands: - with self.nested("must fail: {}".format(command)): + with self.nested(f"must fail: {command}"): (status, out) = self.execute(command, timeout=timeout) if status == 0: - raise Exception( - "command `{}` unexpectedly succeeded".format(command) - ) + raise Exception(f"command `{command}` unexpectedly succeeded") output += out return output @@ -627,7 +627,7 @@ class Machine: status, output = self.execute(command, timeout=timeout) return status == 0 - with self.nested("waiting for success: {}".format(command)): + with self.nested(f"waiting for success: {command}"): retry(check_success, timeout) return output @@ -642,7 +642,7 @@ class Machine: status, output = self.execute(command, timeout=timeout) return status != 0 - with self.nested("waiting for failure: {}".format(command)): + with self.nested(f"waiting for failure: {command}"): retry(check_failure) return output @@ -661,8 +661,8 @@ class Machine: def get_tty_text(self, tty: str) -> str: status, output = self.execute( - "fold -w$(stty -F /dev/tty{0} size | " - "awk '{{print $2}}') /dev/vcs{0}".format(tty) + f"fold -w$(stty -F /dev/tty{tty} size | " + f"awk '{{print $2}}') /dev/vcs{tty}" ) return output @@ -681,11 +681,11 @@ class Machine: ) return len(matcher.findall(text)) > 0 - with self.nested("waiting for {} to appear on tty {}".format(regexp, tty)): + with self.nested(f"waiting for {regexp} to appear on tty {tty}"): retry(tty_matches) def send_chars(self, chars: str, delay: Optional[float] = 0.01) -> None: - with self.nested("sending keys ‘{}‘".format(chars)): + with self.nested(f"sending keys '{chars}'"): for char in chars: self.send_key(char, delay) @@ -693,33 +693,33 @@ class Machine: """Waits until the file exists in machine's file system.""" def check_file(_: Any) -> bool: - status, _ = self.execute("test -e {}".format(filename)) + status, _ = self.execute(f"test -e {filename}") return status == 0 - with self.nested("waiting for file ‘{}‘".format(filename)): + with self.nested(f"waiting for file '{filename}'"): retry(check_file) - def wait_for_open_port(self, port: int) -> None: + def wait_for_open_port(self, port: int, addr: str = "localhost") -> None: def port_is_open(_: Any) -> bool: - status, _ = self.execute("nc -z localhost {}".format(port)) + status, _ = self.execute(f"nc -z {addr} {port}") return status == 0 - with self.nested("waiting for TCP port {}".format(port)): + with self.nested(f"waiting for TCP port {port} on {addr}"): retry(port_is_open) - def wait_for_closed_port(self, port: int) -> None: + def wait_for_closed_port(self, port: int, addr: str = "localhost") -> None: def port_is_closed(_: Any) -> bool: - status, _ = self.execute("nc -z localhost {}".format(port)) + status, _ = self.execute(f"nc -z {addr} {port}") return status != 0 - with self.nested("waiting for TCP port {} to be closed".format(port)): + with self.nested(f"waiting for TCP port {port} on {addr} to be closed"): retry(port_is_closed) def start_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]: - return self.systemctl("start {}".format(jobname), user) + return self.systemctl(f"start {jobname}", user) def stop_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]: - return self.systemctl("stop {}".format(jobname), user) + return self.systemctl(f"stop {jobname}", user) def wait_for_job(self, jobname: str) -> None: self.wait_for_unit(jobname) @@ -739,21 +739,21 @@ class Machine: toc = time.time() self.log("connected to guest root shell") - self.log("(connecting took {:.2f} seconds)".format(toc - tic)) + self.log(f"(connecting took {toc - tic:.2f} seconds)") self.connected = True def screenshot(self, filename: str) -> None: word_pattern = re.compile(r"^\w+$") if word_pattern.match(filename): - filename = os.path.join(self.out_dir, "{}.png".format(filename)) - tmp = "{}.ppm".format(filename) + filename = os.path.join(self.out_dir, f"{filename}.png") + tmp = f"{filename}.ppm" with self.nested( - "making screenshot {}".format(filename), + f"making screenshot {filename}", {"image": os.path.basename(filename)}, ): - self.send_monitor_command("screendump {}".format(tmp)) - ret = subprocess.run("pnmtopng {} > {}".format(tmp, filename), shell=True) + self.send_monitor_command(f"screendump {tmp}") + ret = subprocess.run(f"pnmtopng '{tmp}' > '{filename}'", shell=True) os.unlink(tmp) if ret.returncode != 0: raise Exception("Cannot convert screenshot") @@ -815,7 +815,7 @@ class Machine: def dump_tty_contents(self, tty: str) -> None: """Debugging: Dump the contents of the TTY""" - self.execute("fold -w 80 /dev/vcs{} | systemd-cat".format(tty)) + self.execute(f"fold -w 80 /dev/vcs{tty} | systemd-cat") def _get_screen_text_variants(self, model_ids: Iterable[int]) -> List[str]: with tempfile.TemporaryDirectory() as tmpdir: @@ -837,15 +837,15 @@ class Machine: return True if last: - self.log("Last OCR attempt failed. Text was: {}".format(variants)) + self.log(f"Last OCR attempt failed. Text was: {variants}") return False - with self.nested("waiting for {} to appear on screen".format(regex)): + with self.nested(f"waiting for {regex} to appear on screen"): retry(screen_matches) def wait_for_console_text(self, regex: str) -> None: - with self.nested("waiting for {} to appear on console".format(regex)): + with self.nested(f"waiting for {regex} to appear on console"): # Buffer the console output, this is needed # to match multiline regexes. console = io.StringIO() @@ -862,7 +862,7 @@ class Machine: def send_key(self, key: str, delay: Optional[float] = 0.01) -> None: key = CHAR_TO_KEY.get(key, key) - self.send_monitor_command("sendkey {}".format(key)) + self.send_monitor_command(f"sendkey {key}") if delay is not None: time.sleep(delay) @@ -921,7 +921,7 @@ class Machine: self.pid = self.process.pid self.booted = True - self.log("QEMU running (pid {})".format(self.pid)) + self.log(f"QEMU running (pid {self.pid})") def cleanup_statedir(self) -> None: shutil.rmtree(self.state_dir) @@ -975,7 +975,7 @@ class Machine: names = self.get_window_names() if last_try: self.log( - "Last chance to match {} on the window list,".format(regexp) + f"Last chance to match {regexp} on the window list," + " which currently contains: " + ", ".join(names) ) @@ -992,9 +992,7 @@ class Machine: """Forward a TCP port on the host to a TCP port on the guest. Useful during interactive testing. """ - self.send_monitor_command( - "hostfwd_add tcp::{}-:{}".format(host_port, guest_port) - ) + self.send_monitor_command(f"hostfwd_add tcp::{host_port}-:{guest_port}") def block(self) -> None: """Make the machine unreachable by shutting down eth1 (the multicast diff --git a/nixos/lib/test-driver/test_driver/polling_condition.py b/nixos/lib/test-driver/test_driver/polling_condition.py index 459845452fa1..02ca0a03ab3d 100644 --- a/nixos/lib/test-driver/test_driver/polling_condition.py +++ b/nixos/lib/test-driver/test_driver/polling_condition.py @@ -1,4 +1,5 @@ from typing import Callable, Optional +from math import isfinite import time from .logger import rootlog @@ -14,7 +15,7 @@ class PollingCondition: description: Optional[str] last_called: float - entered: bool + entry_count: int def __init__( self, @@ -34,14 +35,21 @@ class PollingCondition: self.description = str(description) self.last_called = float("-inf") - self.entered = False + self.entry_count = 0 - def check(self) -> bool: - if self.entered or not self.overdue: + def check(self, force: bool = False) -> bool: + if (self.entered or not self.overdue) and not force: return True with self, rootlog.nested(self.nested_message): - rootlog.info(f"Time since last: {time.monotonic() - self.last_called:.2f}s") + time_since_last = time.monotonic() - self.last_called + last_message = ( + f"Time since last: {time_since_last:.2f}s" + if isfinite(time_since_last) + else "(not called yet)" + ) + + rootlog.info(last_message) try: res = self.condition() # type: ignore except Exception: @@ -69,9 +77,16 @@ class PollingCondition: def overdue(self) -> bool: return self.last_called + self.seconds_interval < time.monotonic() + @property + def entered(self) -> bool: + # entry_count should never dip *below* zero + assert self.entry_count >= 0 + return self.entry_count > 0 + def __enter__(self) -> None: - self.entered = True + self.entry_count += 1 def __exit__(self, exc_type, exc_value, traceback) -> None: # type: ignore - self.entered = False + assert self.entered + self.entry_count -= 1 self.last_called = time.monotonic() diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 134d38f1b676..4904ad6e3591 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -1,3 +1,4 @@ +args@ { system , pkgs ? import ../.. { inherit system config; } # Use a minimal kernel? @@ -5,7 +6,7 @@ # Ignored , config ? { } # !!! See comment about args in lib/modules.nix -, specialArgs ? { } +, specialArgs ? throw "legacy - do not use, see error below" # Modules to add to each VM , extraConfigurations ? [ ] }: @@ -13,6 +14,13 @@ let nixos-lib = import ./default.nix { inherit (pkgs) lib; }; in +pkgs.lib.throwIf (args?specialArgs) '' + testing-python.nix: `specialArgs` is not supported anymore. If you're looking + for the public interface to the NixOS test framework, use `runTest`, and + `node.specialArgs`. + See https://nixos.org/manual/nixos/unstable/index.html#sec-calling-nixos-tests + and https://nixos.org/manual/nixos/unstable/index.html#test-opt-node.specialArgs +'' rec { inherit pkgs; diff --git a/nixos/lib/testing/legacy.nix b/nixos/lib/testing/legacy.nix index 868b8b65b17d..b31057556601 100644 --- a/nixos/lib/testing/legacy.nix +++ b/nixos/lib/testing/legacy.nix @@ -3,9 +3,10 @@ let inherit (lib) mkIf mkOption types; in { - # This needs options.warnings, which we don't have (yet?). + # This needs options.warnings and options.assertions, which we don't have (yet?). # imports = [ # (lib.mkRenamedOptionModule [ "machine" ] [ "nodes" "machine" ]) + # (lib.mkRemovedOptionModule [ "minimal" ] "The minimal kernel module was removed as it was broken and not used any more in nixpkgs.") # ]; options = { diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix index 8e620c96b3bb..c538ab468c52 100644 --- a/nixos/lib/testing/nodes.nix +++ b/nixos/lib/testing/nodes.nix @@ -23,7 +23,7 @@ let nixpkgs.config.allowAliases = false; }) testModuleArgs.config.extraBaseModules - ] ++ optional config.minimal ../../modules/testing/minimal-kernel.nix; + ]; }; @@ -78,14 +78,6 @@ in ''; }; - minimal = mkOption { - type = types.bool; - default = false; - description = mdDoc '' - Enable to configure all [{option}`nodes`](#test-opt-nodes) to run with a minimal kernel. - ''; - }; - nodesCompat = mkOption { internal = true; description = mdDoc '' diff --git a/nixos/lib/testing/testScript.nix b/nixos/lib/testing/testScript.nix index 5d4181c5f5dd..5c36d754d79d 100644 --- a/nixos/lib/testing/testScript.nix +++ b/nixos/lib/testing/testScript.nix @@ -7,7 +7,7 @@ in options = { testScript = mkOption { type = either str (functionTo str); - description = '' + description = mdDoc '' A series of python declarations and statements that you write to perform the test. ''; diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 9eefa80d1c8b..def3aa13f320 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -48,7 +48,7 @@ rec { trim = s: removeSuffix "/" (removePrefix "/" s); normalizedPath = strings.normalizePath s; in - replaceChars ["/"] ["-"] + replaceStrings ["/"] ["-"] (replacePrefix "." (strings.escapeC ["."] ".") (strings.escapeC (stringToCharacters " !\"#$%&'()*+,;<=>=@[\\]^`{|}~-") (if normalizedPath == "/" then normalizedPath else trim normalizedPath))); @@ -67,7 +67,7 @@ rec { 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); + replaceStrings [ "%" "$" ] [ "%%" "$$" ] (builtins.toJSON s); # Quotes a list of arguments into a single string for use in a Exec* # line. @@ -112,7 +112,7 @@ rec { else if isAttrs item then map (name: let - escapedName = ''"${replaceChars [''"'' "\\"] [''\"'' "\\\\"] name}"''; + escapedName = ''"${replaceStrings [''"'' "\\"] [''\"'' "\\\\"] name}"''; in recurse (prefix + "." + escapedName) item.${name}) (attrNames item) else if isList item then diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index e2a05a09d0c2..0db0f4d0dcca 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -43,7 +43,7 @@ in { sizeMB = mkOption { type = with types; either (enum [ "auto" ]) int; - default = if config.ec2.hvm then 2048 else 8192; + default = 2048; example = 8192; description = lib.mdDoc "The size in MB of the image"; }; @@ -60,9 +60,6 @@ in { '' { modulesPath, ... }: { imports = [ "''${modulesPath}/virtualisation/amazon-image.nix" ]; - ${optionalString config.ec2.hvm '' - ec2.hvm = true; - ''} ${optionalString config.ec2.efi '' ec2.efi = true; ''} @@ -129,9 +126,7 @@ in { pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package fsType = "ext4"; - partitionTableType = if config.ec2.efi then "efi" - else if config.ec2.hvm then "legacy+gpt" - else "none"; + partitionTableType = if config.ec2.efi then "efi" else "legacy+gpt"; diskSize = cfg.sizeMB; diff --git a/nixos/maintainers/scripts/lxd/lxd-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-image-inner.nix index ead3d4e99401..c8cf2a04fb10 100644 --- a/nixos/maintainers/scripts/lxd/lxd-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-image-inner.nix @@ -94,9 +94,4 @@ with lib; # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "21.05"; # Did you read the comment? - - # As this is intended as a stadalone image, undo some of the minimal profile stuff - documentation.enable = true; - documentation.nixos.enable = true; - environment.noXlibs = false; } diff --git a/nixos/maintainers/scripts/lxd/lxd-image.nix b/nixos/maintainers/scripts/lxd/lxd-image.nix index 6aa3f2f55847..cf30836dffe5 100644 --- a/nixos/maintainers/scripts/lxd/lxd-image.nix +++ b/nixos/maintainers/scripts/lxd/lxd-image.nix @@ -26,9 +26,4 @@ with lib; # Network networking.useDHCP = false; networking.interfaces.eth0.useDHCP = true; - - # As this is intended as a standalone image, undo some of the minimal profile stuff - documentation.enable = true; - documentation.nixos.enable = true; - environment.noXlibs = false; } diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix index f5db5dc5dfc1..854d7acf9232 100644 --- a/nixos/modules/config/console.nix +++ b/nixos/modules/config/console.nix @@ -168,6 +168,7 @@ in "${config.boot.initrd.systemd.package.kbd}/bin/setfont" "${config.boot.initrd.systemd.package.kbd}/bin/loadkeys" "${config.boot.initrd.systemd.package.kbd.gzip}/bin/gzip" # Fonts and keyboard layouts are compressed + "${config.boot.initrd.systemd.package.kbd.gzip}/bin/.gzip-wrapped" ] ++ optionals (hasPrefix builtins.storeDir cfg.font) [ "${cfg.font}" ] ++ optionals (hasPrefix builtins.storeDir cfg.keyMap) [ diff --git a/nixos/modules/config/krb5/default.nix b/nixos/modules/config/krb5/default.nix index e3e0fadf0963..df7a3f48236f 100644 --- a/nixos/modules/config/krb5/default.nix +++ b/nixos/modules/config/krb5/default.nix @@ -82,8 +82,8 @@ in { kerberos = mkOption { type = types.package; - default = pkgs.krb5Full; - defaultText = literalExpression "pkgs.krb5Full"; + default = pkgs.krb5; + defaultText = literalExpression "pkgs.krb5"; example = literalExpression "pkgs.heimdal"; description = lib.mdDoc '' The Kerberos implementation that will be present in diff --git a/nixos/modules/config/mysql.nix b/nixos/modules/config/mysql.nix index af20a5e95356..2f13c56f2ae5 100644 --- a/nixos/modules/config/mysql.nix +++ b/nixos/modules/config/mysql.nix @@ -181,7 +181,7 @@ in example = "pid"; description = lib.mdDoc '' The name of the column in the log table to which the pid of the - process utilising the `pam_mysql's` authentication + process utilising the `pam_mysql` authentication service is stored. ''; }; diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 946c9bf38c47..1d0bc73cac2a 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -30,10 +30,24 @@ with lib; beam = super.beam_nox; cairo = super.cairo.override { x11Support = false; }; dbus = super.dbus.override { x11Support = false; }; - ffmpeg_4 = super.ffmpeg_4.override { sdlSupport = false; vdpauSupport = false; }; - ffmpeg_5 = super.ffmpeg_5.override { sdlSupport = false; vdpauSupport = false; }; + ffmpeg_4 = super.ffmpeg_4-headless; + ffmpeg_5 = super.ffmpeg_5-headless; + # dep of graphviz, libXpm is optional for Xpm support + gd = super.gd.override { withXorg = false; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; + gpsd = super.gpsd.override { guiSupport = false; }; + graphviz = super.graphviz-nox; + gst_all_1 = super.gst_all_1 // { + gst-plugins-base = super.gst_all_1.gst-plugins-base.override { enableX11 = false; }; + }; + imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; }; + imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; }; + libdevil = super.libdevil-nox; + libextractor = super.libextractor.override { gtkSupport = false; }; libva = super.libva-minimal; + limesuite = super.limesuite.override { withGui = false; }; + mpv-unwrapped = super.mpv-unwrapped.override { sdl2Support = false; x11Support = false; }; + msmtp = super.msmtp.override { withKeyring = false; }; networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; }; @@ -41,7 +55,17 @@ with lib; networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; }; networkmanager-sstp = super.networkmanager-vpnc.override { withGnome = false; }; networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; + pango = super.pango.override { x11Support = false; }; + pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; }; qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; }; + qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; }); + qt5 = super.qt5.overrideScope' (self': super': { + qtbase = super'.qtbase.override { withGtk3 = false; }; + }); + stoken = super.stoken.override { withGTK3 = false; }; + # translateManpages -> perlPackages.po4a -> texlive-combined-basic -> texlive-core-big -> libX11 + util-linux = super.util-linux.override { translateManpages = false; }; + zbar = super.zbar.override { enableVideo = false; withXorg = false; }; })); }; } diff --git a/nixos/modules/config/qt5.nix b/nixos/modules/config/qt.nix similarity index 67% rename from nixos/modules/config/qt5.nix rename to nixos/modules/config/qt.nix index cb3180d7b96a..6405166920e0 100644 --- a/nixos/modules/config/qt5.nix +++ b/nixos/modules/config/qt.nix @@ -4,7 +4,7 @@ with lib; let - cfg = config.qt5; + cfg = config.qt; isQGnome = cfg.platformTheme == "gnome" && builtins.elem cfg.style ["adwaita" "adwaita-dark"]; isQtStyle = cfg.platformTheme == "gtk2" && !(builtins.elem cfg.style ["adwaita" "adwaita-dark"]); @@ -12,22 +12,34 @@ let isLxqt = cfg.platformTheme == "lxqt"; isKde = cfg.platformTheme == "kde"; - packages = if isQGnome then [ pkgs.qgnomeplatform pkgs.adwaita-qt ] + packages = + if isQGnome then [ + pkgs.qgnomeplatform + pkgs.adwaita-qt + pkgs.qgnomeplatform-qt6 + pkgs.adwaita-qt6 + ] else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ] else if isQt5ct then [ pkgs.libsForQt5.qt5ct ] else if isLxqt then [ pkgs.lxqt.lxqt-qtplugin pkgs.lxqt.lxqt-config ] else if isKde then [ pkgs.libsForQt5.plasma-integration pkgs.libsForQt5.systemsettings ] - else throw "`qt5.platformTheme` ${cfg.platformTheme} and `qt5.style` ${cfg.style} are not compatible."; + else throw "`qt.platformTheme` ${cfg.platformTheme} and `qt.style` ${cfg.style} are not compatible."; in { meta.maintainers = [ maintainers.romildo ]; - options = { - qt5 = { + imports = [ + (mkRenamedOptionModule ["qt5" "enable" ] ["qt" "enable" ]) + (mkRenamedOptionModule ["qt5" "platformTheme" ] ["qt" "platformTheme" ]) + (mkRenamedOptionModule ["qt5" "style" ] ["qt" "style" ]) + ]; - enable = mkEnableOption (lib.mdDoc "Qt5 theming configuration"); + options = { + qt = { + + enable = mkEnableOption (lib.mdDoc "Qt theming configuration"); platformTheme = mkOption { type = types.enum [ @@ -40,13 +52,14 @@ in example = "gnome"; relatedPackages = [ "qgnomeplatform" + "qgnomeplatform-qt6" ["libsForQt5" "qtstyleplugins"] ["libsForQt5" "qt5ct"] ["lxqt" "lxqt-qtplugin"] ["libsForQt5" "plasma-integration"] ]; description = lib.mdDoc '' - Selects the platform theme to use for Qt5 applications. + Selects the platform theme to use for Qt applications. The options are - `gtk`: Use GTK theme with [qtstyleplugins](https://github.com/qt/qtstyleplugins) @@ -71,10 +84,11 @@ in example = "adwaita"; relatedPackages = [ "adwaita-qt" + "adwaita-qt6" ["libsForQt5" "qtstyleplugins"] ]; description = lib.mdDoc '' - Selects the style to use for Qt5 applications. + Selects the style to use for Qt applications. The options are - `adwaita`, `adwaita-dark`: Use Adwaita Qt style with @@ -88,9 +102,17 @@ in config = mkIf cfg.enable { - environment.variables.QT_QPA_PLATFORMTHEME = cfg.platformTheme; + environment.variables = { + QT_QPA_PLATFORMTHEME = cfg.platformTheme; + QT_STYLE_OVERRIDE = mkIf (! (isQt5ct || isLxqt || isKde)) cfg.style; + }; - environment.variables.QT_STYLE_OVERRIDE = mkIf (! (isQt5ct || isLxqt || isKde)) cfg.style; + environment.profileRelativeSessionVariables = let + qtVersions = with pkgs; [ qt5 qt6 ]; + in { + QT_PLUGIN_PATH = map (qt: "/${qt.qtbase.qtPluginPrefix}") qtVersions; + QML2_IMPORT_PATH = map (qt: "/${qt.qtbase.qtQmlPrefix}") qtVersions; + }; environment.systemPackages = packages; diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 50bb9b17783b..bc6583442edf 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -42,8 +42,8 @@ in strings. The latter is concatenated, interspersed with colon characters. ''; - type = with types; attrsOf (either str (listOf str)); - apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); + type = with types; attrsOf (oneOf [ (listOf str) str path ]); + apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else "${v}"); }; environment.profiles = mkOption { diff --git a/nixos/modules/config/stevenblack.nix b/nixos/modules/config/stevenblack.nix new file mode 100644 index 000000000000..ec6868484942 --- /dev/null +++ b/nixos/modules/config/stevenblack.nix @@ -0,0 +1,34 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) optionals mkOption mkEnableOption types mkIf elem concatStringsSep maintainers mdDoc; + cfg = config.networking.stevenblack; + + # needs to be in a specific order + activatedHosts = with cfg; [ ] + ++ optionals (elem "fakenews" block) [ "fakenews" ] + ++ optionals (elem "gambling" block) [ "gambling" ] + ++ optionals (elem "porn" block) [ "porn" ] + ++ optionals (elem "social" block) [ "social" ]; + + hostsPath = "${pkgs.stevenblack-blocklist}/alternates/" + concatStringsSep "-" activatedHosts + "/hosts"; +in +{ + options.networking.stevenblack = { + enable = mkEnableOption (mdDoc "Enable the stevenblack hosts file blocklist."); + + block = mkOption { + type = types.listOf (types.enum [ "fakenews" "gambling" "porn" "social" ]); + default = [ ]; + description = mdDoc "Additional blocklist extensions."; + }; + }; + + config = mkIf cfg.enable { + networking.hostFiles = [ ] + ++ optionals (activatedHosts != [ ]) [ hostsPath ] + ++ optionals (activatedHosts == [ ]) [ "${pkgs.stevenblack-blocklist}/hosts" ]; + }; + + meta.maintainers = [ maintainers.fortuneteller2k maintainers.artturin ]; +} diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index 10d52ade288b..2c9c4c9c1a2d 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -66,7 +66,7 @@ let device = mkOption { example = "/dev/sda3"; - type = types.str; + type = types.nonEmptyStr; description = lib.mdDoc "Path of the device or swap file."; }; @@ -160,7 +160,7 @@ let config = rec { device = mkIf options.label.isDefined "/dev/disk/by-label/${config.label}"; - deviceName = lib.replaceChars ["\\"] [""] (escapeSystemdPath config.device); + deviceName = lib.replaceStrings ["\\"] [""] (escapeSystemdPath config.device); realDevice = if config.randomEncryption.enable then "/dev/mapper/${deviceName}" else config.device; }; @@ -197,6 +197,21 @@ in }; config = mkIf ((length config.swapDevices) != 0) { + assertions = map (sw: { + assertion = sw.randomEncryption.enable -> builtins.match "/dev/disk/by-(uuid|label)/.*" sw.device == null; + message = '' + You cannot use swap device "${sw.device}" with randomEncryption enabled. + The UUIDs and labels will get erased on every boot when the partition is encrypted. + Use /dev/disk/by-partuuid/… instead. + ''; + }) config.swapDevices; + + warnings = + concatMap (sw: + if sw.size != null && hasPrefix "/dev/" sw.device + then [ "Setting the swap size of block device ${sw.device} has no effect" ] + else [ ]) + config.swapDevices; system.requiredKernelConfig = with config.lib.kernelConfig; [ (isYes "SWAP") @@ -205,24 +220,27 @@ in # Create missing swapfiles. systemd.services = let - createSwapDevice = sw: - assert sw.device != ""; - assert !(sw.randomEncryption.enable && lib.hasPrefix "/dev/disk/by-uuid" sw.device); - assert !(sw.randomEncryption.enable && lib.hasPrefix "/dev/disk/by-label" sw.device); let realDevice' = escapeSystemdPath sw.realDevice; in nameValuePair "mkswap-${sw.deviceName}" { description = "Initialisation of swap device ${sw.device}"; wantedBy = [ "${realDevice'}.swap" ]; before = [ "${realDevice'}.swap" ]; - path = [ pkgs.util-linux ] ++ optional sw.randomEncryption.enable pkgs.cryptsetup; + path = [ pkgs.util-linux pkgs.e2fsprogs ] + ++ optional sw.randomEncryption.enable pkgs.cryptsetup; + + environment.DEVICE = sw.device; script = '' ${optionalString (sw.size != null) '' - currentSize=$(( $(stat -c "%s" "${sw.device}" 2>/dev/null || echo 0) / 1024 / 1024 )) - if [ "${toString sw.size}" != "$currentSize" ]; then - dd if=/dev/zero of="${sw.device}" bs=1M count=${toString sw.size} + currentSize=$(( $(stat -c "%s" "$DEVICE" 2>/dev/null || echo 0) / 1024 / 1024 )) + if [[ ! -b "$DEVICE" && "${toString sw.size}" != "$currentSize" ]]; then + # Disable CoW for CoW based filesystems like BTRFS. + truncate --size 0 "$DEVICE" + chattr +C "$DEVICE" 2>/dev/null || true + + dd if=/dev/zero of="$DEVICE" bs=1M count=${toString sw.size} chmod 0600 ${sw.device} ${optionalString (!sw.randomEncryption.enable) "mkswap ${sw.realDevice}"} fi diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix index 5b226d5079b0..399304185223 100644 --- a/nixos/modules/config/system-environment.nix +++ b/nixos/modules/config/system-environment.nix @@ -1,6 +1,6 @@ # This module defines a system-wide environment that will be # initialised by pam_env (that is, not only in shells). -{ config, lib, pkgs, ... }: +{ config, lib, options, pkgs, ... }: with lib; @@ -32,8 +32,7 @@ in therefore not possible to use PAM style variables such as `@{HOME}`. ''; - type = with types; attrsOf (either str (listOf str)); - apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); + inherit (options.environment.variables) type apply; }; environment.profileRelativeSessionVariables = mkOption { diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 2660b0e6c938..352d6e39435b 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -90,7 +90,7 @@ let only has an effect if {option}`uid` is {option}`null`, in which case it determines whether the user's UID is allocated in the range for system users - (below 500) or in the range for normal users (starting at + (below 1000) or in the range for normal users (starting at 1000). Exactly one of `isNormalUser` and `isSystemUser` must be true. @@ -101,16 +101,13 @@ let type = types.bool; default = false; description = lib.mdDoc '' - Indicates whether this is an account for a “real” user. This - automatically sets {option}`group` to - `users`, {option}`createHome` to - `true`, {option}`home` to - {file}`/home/«username»`, + Indicates whether this is an account for a “real” user. + This automatically sets {option}`group` to `users`, + {option}`createHome` to `true`, + {option}`home` to {file}`/home/«username»`, {option}`useDefaultShell` to `true`, - and {option}`isSystemUser` to - `false`. - Exactly one of `isNormalUser` and - `isSystemUser` must be true. + and {option}`isSystemUser` to `false`. + Exactly one of `isNormalUser` and `isSystemUser` must be true. ''; }; @@ -447,8 +444,8 @@ let in { imports = [ - (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ]) - (mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ]) + (mkAliasOptionModuleMD [ "users" "extraUsers" ] [ "users" "users" ]) + (mkAliasOptionModuleMD [ "users" "extraGroups" ] [ "users" "groups" ]) (mkRenamedOptionModule ["security" "initialRootPassword"] ["users" "users" "root" "initialHashedPassword"]) ]; @@ -618,7 +615,7 @@ in { # Install all the user shells environment.systemPackages = systemShells; - environment.etc = (mapAttrs' (_: { packages, name, ... }: { + environment.etc = mapAttrs' (_: { packages, name, ... }: { name = "profiles/per-user/${name}"; value.source = pkgs.buildEnv { name = "user-environment"; @@ -626,7 +623,7 @@ in { inherit (config.environment) pathsToLink extraOutputsToInstall; inherit (config.system.path) ignoreCollisions postBuild; }; - }) (filterAttrs (_: u: u.packages != []) cfg.users)); + }) (filterAttrs (_: u: u.packages != []) cfg.users); environment.profiles = [ "$HOME/.nix-profile" @@ -680,7 +677,7 @@ in { { assertion = let xor = a: b: a && !b || b && !a; - isEffectivelySystemUser = user.isSystemUser || (user.uid != null && user.uid < 500); + isEffectivelySystemUser = user.isSystemUser || (user.uid != null && user.uid < 1000); in xor isEffectivelySystemUser user.isNormalUser; message = '' Exactly one of users.users.${user.name}.isSystemUser and users.users.${user.name}.isNormalUser must be set. diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index e28ff74e5d80..ab6cffe499aa 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -61,6 +61,17 @@ in Defaults to `false` to respect its opt-in nature. ''; }; + + xdgOpenUsePortal = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Sets environment variable `NIXOS_XDG_OPEN_USE_PORTAL` to `1` + This will make `xdg-open` use the portal to open programs, which resolves bugs involving + programs opening inside FHS envs or with unexpected env vars set from wrappers. + See [#160923](https://github.com/NixOS/nixpkgs/issues/160923) for more info. + ''; + }; }; config = @@ -95,6 +106,7 @@ in sessionVariables = { GTK_USE_PORTAL = mkIf cfg.gtkUsePortal "1"; + NIXOS_XDG_OPEN_USE_PORTAL = mkIf cfg.xdgOpenUsePortal "1"; XDG_DESKTOP_PORTAL_DIR = "${joinedPortals}/share/xdg-desktop-portal/portals"; }; }; diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix index cc2ca6314433..87ac53a60b7e 100644 --- a/nixos/modules/config/zram.nix +++ b/nixos/modules/config/zram.nix @@ -132,6 +132,8 @@ in options zram num_devices=${toString cfg.numDevices} ''; + boot.kernelParams = ["zram.num_devices=${toString cfg.numDevices}"]; + services.udev.extraRules = '' KERNEL=="zram[0-9]*", ENV{SYSTEMD_WANTS}="zram-init-%k.service", TAG+="systemd" ''; @@ -178,9 +180,9 @@ in serviceConfig = { Type = "oneshot"; RemainAfterExit = true; - ExecStartPre = "${modprobe} -r zram"; - ExecStart = "${modprobe} zram"; - ExecStop = "${modprobe} -r zram"; + ExecStartPre = "-${modprobe} -r zram"; + ExecStart = "-${modprobe} zram"; + ExecStop = "-${modprobe} -r zram"; }; restartTriggers = [ cfg.numDevices diff --git a/nixos/modules/hardware/gpgsmartcards.nix b/nixos/modules/hardware/gpgsmartcards.nix index 43ade4d12e12..68e1e5f74e2e 100644 --- a/nixos/modules/hardware/gpgsmartcards.nix +++ b/nixos/modules/hardware/gpgsmartcards.nix @@ -8,7 +8,7 @@ let # https://salsa.debian.org/debian/gnupg2/-/blob/debian/main/debian/scdaemon.udev # the latest rev of the entire debian gnupg2 repo as of 2021-04-28 - # the scdaemon.udev file was last commited on 2021-01-05 (7817a03): + # the scdaemon.udev file was last committed on 2021-01-05 (7817a03): scdaemonUdevRev = "01898735a015541e3ffb43c7245ac1e612f40836"; scdaemonRules = pkgs.fetchurl { diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 5a5d88d9a4e0..9108bcbd1652 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -26,9 +26,7 @@ in imports = [ (mkRenamedOptionModule [ "services" "xserver" "vaapiDrivers" ] [ "hardware" "opengl" "extraPackages" ]) - (mkRemovedOptionModule [ "hardware" "opengl" "s3tcSupport" ] '' - S3TC support is now always enabled in Mesa. - '') + (mkRemovedOptionModule [ "hardware" "opengl" "s3tcSupport" ] "S3TC support is now always enabled in Mesa.") ]; options = { @@ -89,21 +87,28 @@ in extraPackages = mkOption { type = types.listOf types.package; default = []; - example = literalExpression "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau intel-ocl ]"; + example = literalExpression "with pkgs; [ intel-media-driver intel-ocl vaapiIntel ]"; description = lib.mdDoc '' - Additional packages to add to OpenGL drivers. This can be used - to add OpenCL drivers, VA-API/VDPAU drivers etc. + Additional packages to add to OpenGL drivers. + This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. + + ::: {.note} + intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained vaapiIntel driver. + ::: ''; }; extraPackages32 = mkOption { type = types.listOf types.package; default = []; - example = literalExpression "with pkgs.pkgsi686Linux; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]"; + example = literalExpression "with pkgs.pkgsi686Linux; [ intel-media-driver vaapiIntel ]"; description = lib.mdDoc '' - Additional packages to add to 32-bit OpenGL drivers on - 64-bit systems. Used when {option}`driSupport32Bit` is - set. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. + Additional packages to add to 32-bit OpenGL drivers on 64-bit systems. + Used when {option}`driSupport32Bit` is set. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. + + ::: {.note} + intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained vaapiIntel driver. + ::: ''; }; @@ -124,7 +129,6 @@ in }; config = mkIf cfg.enable { - assertions = [ { assertion = cfg.driSupport32Bit -> pkgs.stdenv.isx86_64; message = "Option driSupport32Bit only makes sense on a 64-bit system."; diff --git a/nixos/modules/hardware/openrazer.nix b/nixos/modules/hardware/openrazer.nix index 247913297c9e..aaa4000e758f 100644 --- a/nixos/modules/hardware/openrazer.nix +++ b/nixos/modules/hardware/openrazer.nix @@ -110,7 +110,7 @@ in boot.extraModulePackages = [ kernelPackages.openrazer ]; boot.kernelModules = drivers; - # Makes the man pages available so you can succesfully run + # Makes the man pages available so you can successfully run # > systemctl --user help openrazer-daemon environment.systemPackages = [ pkgs.python3Packages.openrazer-daemon.man ]; diff --git a/nixos/modules/hardware/opentabletdriver.nix b/nixos/modules/hardware/opentabletdriver.nix index 6c5ca3d949e8..e3f418abce4f 100644 --- a/nixos/modules/hardware/opentabletdriver.nix +++ b/nixos/modules/hardware/opentabletdriver.nix @@ -61,7 +61,7 @@ in serviceConfig = { Type = "simple"; - ExecStart = "${cfg.package}/bin/otd-daemon -c ${cfg.package}/lib/OpenTabletDriver/Configurations"; + ExecStart = "${cfg.package}/bin/otd-daemon"; Restart = "on-failure"; }; }; diff --git a/nixos/modules/hardware/printers.nix b/nixos/modules/hardware/printers.nix index 64c29bb0a5b3..846ff6f3fb4f 100644 --- a/nixos/modules/hardware/printers.nix +++ b/nixos/modules/hardware/printers.nix @@ -100,7 +100,7 @@ in { default = {}; description = lib.mdDoc '' Sets PPD options for the printer. - {command}`lpoptions [-p printername] -l` shows suported PPD options for the given printer. + {command}`lpoptions [-p printername] -l` shows supported PPD options for the given printer. ''; }; }; @@ -110,21 +110,26 @@ in { }; config = mkIf (cfg.ensurePrinters != [] && config.services.printing.enable) { - systemd.services.ensure-printers = let - cupsUnit = if config.services.printing.startWhenNeeded then "cups.socket" else "cups.service"; - in { + systemd.services.ensure-printers = { description = "Ensure NixOS-configured CUPS printers"; wantedBy = [ "multi-user.target" ]; - requires = [ cupsUnit ]; - after = [ cupsUnit ]; + wants = [ "cups.service" ]; + after = [ "cups.service" ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; }; - script = concatMapStringsSep "\n" ensurePrinter cfg.ensurePrinters - + optionalString (cfg.ensureDefaultPrinter != null) (ensureDefaultPrinter cfg.ensureDefaultPrinter); + script = concatStringsSep "\n" [ + (concatMapStrings ensurePrinter cfg.ensurePrinters) + (optionalString (cfg.ensureDefaultPrinter != null) + (ensureDefaultPrinter cfg.ensureDefaultPrinter)) + # Note: if cupsd is "stateless" the service can't be stopped, + # otherwise the configuration will be wiped on the next start. + (optionalString (with config.services.printing; startWhenNeeded && !stateless) + "systemctl stop cups.service") + ]; }; }; } diff --git a/nixos/modules/i18n/input-method/default.md b/nixos/modules/i18n/input-method/default.md new file mode 100644 index 000000000000..05ae12065c34 --- /dev/null +++ b/nixos/modules/i18n/input-method/default.md @@ -0,0 +1,158 @@ +# Input Methods {#module-services-input-methods} + +Input methods are an operating system component that allows any data, such as +keyboard strokes or mouse movements, to be received as input. In this way +users can enter characters and symbols not found on their input devices. +Using an input method is obligatory for any language that has more graphemes +than there are keys on the keyboard. + +The following input methods are available in NixOS: + + - IBus: The intelligent input bus. + - Fcitx: A customizable lightweight input method. + - Nabi: A Korean input method based on XIM. + - Uim: The universal input method, is a library with a XIM bridge. + - Hime: An extremely easy-to-use input method framework. + - Kime: Korean IME + +## IBus {#module-services-input-methods-ibus} + +IBus is an Intelligent Input Bus. It provides full featured and user +friendly input method user interface. + +The following snippet can be used to configure IBus: + +``` +i18n.inputMethod = { + enabled = "ibus"; + ibus.engines = with pkgs.ibus-engines; [ anthy hangul mozc ]; +}; +``` + +`i18n.inputMethod.ibus.engines` is optional and can be used +to add extra IBus engines. + +Available extra IBus engines are: + + - Anthy (`ibus-engines.anthy`): Anthy is a system for + Japanese input method. It converts Hiragana text to Kana Kanji mixed text. + - Hangul (`ibus-engines.hangul`): Korean input method. + - m17n (`ibus-engines.m17n`): m17n is an input method that + uses input methods and corresponding icons in the m17n database. + - mozc (`ibus-engines.mozc`): A Japanese input method from + Google. + - Table (`ibus-engines.table`): An input method that load + tables of input methods. + - table-others (`ibus-engines.table-others`): Various + table-based input methods. To use this, and any other table-based input + methods, it must appear in the list of engines along with + `table`. For example: + + ``` + ibus.engines = with pkgs.ibus-engines; [ table table-others ]; + ``` + +To use any input method, the package must be added in the configuration, as +shown above, and also (after running `nixos-rebuild`) the +input method must be added from IBus' preference dialog. + +### Troubleshooting {#module-services-input-methods-troubleshooting} + +If IBus works in some applications but not others, a likely cause of this +is that IBus is depending on a different version of `glib` +to what the applications are depending on. This can be checked by running +`nix-store -q --requisites | grep glib`, +where `` is the path of either IBus or an +application in the Nix store. The `glib` packages must +match exactly. If they do not, uninstalling and reinstalling the +application is a likely fix. + +## Fcitx {#module-services-input-methods-fcitx} + +Fcitx is an input method framework with extension support. It has three +built-in Input Method Engine, Pinyin, QuWei and Table-based input methods. + +The following snippet can be used to configure Fcitx: + +``` +i18n.inputMethod = { + enabled = "fcitx"; + fcitx.engines = with pkgs.fcitx-engines; [ mozc hangul m17n ]; +}; +``` + +`i18n.inputMethod.fcitx.engines` is optional and can be +used to add extra Fcitx engines. + +Available extra Fcitx engines are: + + - Anthy (`fcitx-engines.anthy`): Anthy is a system for + Japanese input method. It converts Hiragana text to Kana Kanji mixed text. + - Chewing (`fcitx-engines.chewing`): Chewing is an + intelligent Zhuyin input method. It is one of the most popular input + methods among Traditional Chinese Unix users. + - Hangul (`fcitx-engines.hangul`): Korean input method. + - Unikey (`fcitx-engines.unikey`): Vietnamese input method. + - m17n (`fcitx-engines.m17n`): m17n is an input method that + uses input methods and corresponding icons in the m17n database. + - mozc (`fcitx-engines.mozc`): A Japanese input method from + Google. + - table-others (`fcitx-engines.table-others`): Various + table-based input methods. + +## Nabi {#module-services-input-methods-nabi} + +Nabi is an easy to use Korean X input method. It allows you to enter +phonetic Korean characters (hangul) and pictographic Korean characters +(hanja). + +The following snippet can be used to configure Nabi: + +``` +i18n.inputMethod = { + enabled = "nabi"; +}; +``` + +## Uim {#module-services-input-methods-uim} + +Uim (short for "universal input method") is a multilingual input method +framework. Applications can use it through so-called bridges. + +The following snippet can be used to configure uim: + +``` +i18n.inputMethod = { + enabled = "uim"; +}; +``` + +Note: The [](#opt-i18n.inputMethod.uim.toolbar) option can be +used to choose uim toolbar. + +## Hime {#module-services-input-methods-hime} + +Hime is an extremely easy-to-use input method framework. It is lightweight, +stable, powerful and supports many commonly used input methods, including +Cangjie, Zhuyin, Dayi, Rank, Shrimp, Greek, Korean Pinyin, Latin Alphabet, +etc... + +The following snippet can be used to configure Hime: + +``` +i18n.inputMethod = { + enabled = "hime"; +}; +``` + +## Kime {#module-services-input-methods-kime} + +Kime is Korean IME. it's built with Rust language and let you get simple, safe, fast Korean typing + +The following snippet can be used to configure Kime: + +``` +i18n.inputMethod = { + enabled = "kime"; +}; +``` diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix index 07fb86bcc25e..5f803b4f2ee7 100644 --- a/nixos/modules/i18n/input-method/default.nix +++ b/nixos/modules/i18n/input-method/default.nix @@ -66,7 +66,7 @@ in meta = { maintainers = with lib.maintainers; [ ericsagnes ]; - doc = ./default.xml; + doc = ./default.md; }; } diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml deleted file mode 100644 index dd66316c7308..000000000000 --- a/nixos/modules/i18n/input-method/default.xml +++ /dev/null @@ -1,291 +0,0 @@ - - Input Methods - - Input methods are an operating system component that allows any data, such as - keyboard strokes or mouse movements, to be received as input. In this way - users can enter characters and symbols not found on their input devices. - Using an input method is obligatory for any language that has more graphemes - than there are keys on the keyboard. - - - The following input methods are available in NixOS: - - - - - IBus: The intelligent input bus. - - - - - Fcitx: A customizable lightweight input method. - - - - - Nabi: A Korean input method based on XIM. - - - - - Uim: The universal input method, is a library with a XIM bridge. - - - - - Hime: An extremely easy-to-use input method framework. - - - - - Kime: Korean IME - - - -
- IBus - - - IBus is an Intelligent Input Bus. It provides full featured and user - friendly input method user interface. - - - - The following snippet can be used to configure IBus: - - - -i18n.inputMethod = { - enabled = "ibus"; - ibus.engines = with pkgs.ibus-engines; [ anthy hangul mozc ]; -}; - - - - i18n.inputMethod.ibus.engines is optional and can be used - to add extra IBus engines. - - - - Available extra IBus engines are: - - - - - - Anthy (ibus-engines.anthy): Anthy is a system for - Japanese input method. It converts Hiragana text to Kana Kanji mixed text. - - - - - Hangul (ibus-engines.hangul): Korean input method. - - - - - m17n (ibus-engines.m17n): m17n is an input method that - uses input methods and corresponding icons in the m17n database. - - - - - mozc (ibus-engines.mozc): A Japanese input method from - Google. - - - - - Table (ibus-engines.table): An input method that load - tables of input methods. - - - - - table-others (ibus-engines.table-others): Various - table-based input methods. To use this, and any other table-based input - methods, it must appear in the list of engines along with - table. For example: - -ibus.engines = with pkgs.ibus-engines; [ table table-others ]; - - - - - - - To use any input method, the package must be added in the configuration, as - shown above, and also (after running nixos-rebuild) the - input method must be added from IBus' preference dialog. - - - - Troubleshooting - - If IBus works in some applications but not others, a likely cause of this - is that IBus is depending on a different version of glib - to what the applications are depending on. This can be checked by running - nix-store -q --requisites <path> | grep glib, - where <path> is the path of either IBus or an - application in the Nix store. The glib packages must - match exactly. If they do not, uninstalling and reinstalling the - application is a likely fix. - - -
-
- Fcitx - - - Fcitx is an input method framework with extension support. It has three - built-in Input Method Engine, Pinyin, QuWei and Table-based input methods. - - - - The following snippet can be used to configure Fcitx: - - - -i18n.inputMethod = { - enabled = "fcitx"; - fcitx.engines = with pkgs.fcitx-engines; [ mozc hangul m17n ]; -}; - - - - i18n.inputMethod.fcitx.engines is optional and can be - used to add extra Fcitx engines. - - - - Available extra Fcitx engines are: - - - - - - Anthy (fcitx-engines.anthy): Anthy is a system for - Japanese input method. It converts Hiragana text to Kana Kanji mixed text. - - - - - Chewing (fcitx-engines.chewing): Chewing is an - intelligent Zhuyin input method. It is one of the most popular input - methods among Traditional Chinese Unix users. - - - - - Hangul (fcitx-engines.hangul): Korean input method. - - - - - Unikey (fcitx-engines.unikey): Vietnamese input method. - - - - - m17n (fcitx-engines.m17n): m17n is an input method that - uses input methods and corresponding icons in the m17n database. - - - - - mozc (fcitx-engines.mozc): A Japanese input method from - Google. - - - - - table-others (fcitx-engines.table-others): Various - table-based input methods. - - - -
-
- Nabi - - - Nabi is an easy to use Korean X input method. It allows you to enter - phonetic Korean characters (hangul) and pictographic Korean characters - (hanja). - - - - The following snippet can be used to configure Nabi: - - - -i18n.inputMethod = { - enabled = "nabi"; -}; - -
-
- Uim - - - Uim (short for "universal input method") is a multilingual input method - framework. Applications can use it through so-called bridges. - - - - The following snippet can be used to configure uim: - - - -i18n.inputMethod = { - enabled = "uim"; -}; - - - - Note: The option can be - used to choose uim toolbar. - -
-
- Hime - - - Hime is an extremely easy-to-use input method framework. It is lightweight, - stable, powerful and supports many commonly used input methods, including - Cangjie, Zhuyin, Dayi, Rank, Shrimp, Greek, Korean Pinyin, Latin Alphabet, - etc... - - - - The following snippet can be used to configure Hime: - - - -i18n.inputMethod = { - enabled = "hime"; -}; - -
-
- Kime - - - Kime is Korean IME. it's built with Rust language and let you get simple, safe, fast Korean typing - - - - The following snippet can be used to configure Kime: - - - -i18n.inputMethod = { - enabled = "kime"; -}; - -
-
diff --git a/nixos/modules/i18n/input-method/kime.nix b/nixos/modules/i18n/input-method/kime.nix index 29224a6bf75f..e82996926b28 100644 --- a/nixos/modules/i18n/input-method/kime.nix +++ b/nixos/modules/i18n/input-method/kime.nix @@ -1,40 +1,37 @@ { config, pkgs, lib, generators, ... }: -with lib; -let - cfg = config.i18n.inputMethod.kime; - yamlFormat = pkgs.formats.yaml { }; -in -{ - options = { - i18n.inputMethod.kime = { - config = mkOption { - type = yamlFormat.type; - default = { }; - example = literalExpression '' - { - daemon = { - modules = ["Xim" "Indicator"]; - }; +let imcfg = config.i18n.inputMethod; +in { + imports = [ + (lib.mkRemovedOptionModule [ "i18n" "inputMethod" "kime" "config" ] "Use i18n.inputMethod.kime.* instead") + ]; - indicator = { - icon_color = "White"; - }; - - engine = { - hangul = { - layout = "dubeolsik"; - }; - }; - } - ''; - description = lib.mdDoc '' - kime configuration. Refer to for details on supported values. - ''; - }; + options.i18n.inputMethod.kime = { + daemonModules = lib.mkOption { + type = lib.types.listOf (lib.types.enum [ "Xim" "Wayland" "Indicator" ]); + default = [ "Xim" "Wayland" "Indicator" ]; + example = [ "Xim" "Indicator" ]; + description = lib.mdDoc '' + List of enabled daemon modules + ''; + }; + iconColor = lib.mkOption { + type = lib.types.enum [ "Black" "White" ]; + default = "Black"; + example = "White"; + description = lib.mdDoc '' + Color of the indicator icon + ''; + }; + extraConfig = lib.mkOption { + type = lib.types.lines; + default = ""; + description = lib.mdDoc '' + extra kime configuration. Refer to for details on supported values. + ''; }; }; - config = mkIf (config.i18n.inputMethod.enabled == "kime") { + config = lib.mkIf (imcfg.enabled == "kime") { i18n.inputMethod.package = pkgs.kime; environment.variables = { @@ -43,7 +40,12 @@ in XMODIFIERS = "@im=kime"; }; - environment.etc."xdg/kime/config.yaml".text = replaceStrings [ "\\\\" ] [ "\\" ] (builtins.toJSON cfg.config); + environment.etc."xdg/kime/config.yaml".text = '' + daemon: + modules: [${lib.concatStringsSep "," imcfg.kime.daemonModules}] + indicator: + icon_color: ${imcfg.kime.iconColor} + '' + imcfg.kime.extraConfig; }; # uses attributes of the linked package diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index 2a0feaeb2845..8426ba8fac00 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -6,6 +6,12 @@ with lib; let + # This is copied into the installer image, so it's important that it is filtered + # to avoid including a large .git directory. + # We also want the source name to be normalised to "source" to avoid depending on the + # location of nixpkgs. + # In the future we might want to expose the ISO image from the flake and use + # `self.outPath` directly instead. nixpkgs = lib.cleanSource pkgs.path; # We need a copy of the Nix expressions for Nixpkgs and NixOS on the @@ -31,7 +37,14 @@ let in { - nix.registry.nixpkgs.flake.outPath = builtins.path { name = "source"; path = pkgs.path; }; + # Pin the nixpkgs flake in the installer to our cleaned up nixpkgs source. + # FIXME: this might be surprising and is really only needed for offline installations, + # see discussion in https://github.com/NixOS/nixpkgs/pull/204178#issuecomment-1336289021 + nix.registry.nixpkgs.to = { + type = "path"; + path = "${channelSources}/nixos"; + }; + # Provide the NixOS/Nixpkgs sources in /etc/nixos. This is required # for nixos-install. boot.postBootCommands = mkAfter diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix index d015e10c11d8..12feb2d96ecc 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix @@ -31,7 +31,7 @@ }; # Theme calamares with GNOME theme - qt5 = { + qt = { enable = true; platformTheme = "gnome"; }; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix new file mode 100644 index 000000000000..9d09cdbe0206 --- /dev/null +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: + +{ + imports = [ ./installation-cd-minimal-new-kernel.nix ]; + + # Makes `availableOn` fail for zfs, see . + # This is a workaround since we cannot remove the `"zfs"` string from `supportedFilesystems`. + # The proper fix would be to make `supportedFilesystems` an attrset with true/false which we + # could then `lib.mkForce false` + nixpkgs.overlays = [(final: super: { + zfs = super.zfs.overrideAttrs(_: { + meta.platforms = []; + }); + })]; +} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix index 97506045e0e1..29afdd471091 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix @@ -1,14 +1,24 @@ # This module defines a small NixOS installation CD. It does not # contain any graphical stuff. -{ ... }: +{ lib, ... }: { - imports = - [ ./installation-cd-base.nix - ]; + imports = [ + ../../profiles/minimal.nix + ./installation-cd-base.nix + ]; - isoImage.edition = "minimal"; + # Causes a lot of uncached builds for a negligible decrease in size. + environment.noXlibs = lib.mkOverride 500 false; - fonts.fontconfig.enable = false; + documentation.man.enable = lib.mkOverride 500 true; + + # Although we don't really need HTML documentation in the minimal installer, + # not including it may cause annoying cache misses in the case of the NixOS manual. + documentation.doc.enable = lib.mkOverride 500 true; + + fonts.fontconfig.enable = lib.mkForce false; + + isoImage.edition = lib.mkForce "minimal"; } diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index e37142f05f41..86c2cd1a8c73 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -52,7 +52,7 @@ let buildMenuAdditionalParamsGrub2 = additional: let finalCfg = { - name = "NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel}"; + name = "${config.system.nixos.distroName} ${config.system.nixos.label}${config.isoImage.appendToMenuLabel}"; params = "init=${config.system.build.toplevel}/init ${additional} ${toString config.boot.kernelParams}"; image = "/boot/${config.system.boot.loader.kernelFile}"; initrd = "/boot/initrd"; @@ -70,18 +70,24 @@ let ; # Timeout in syslinux is in units of 1/10 of a second. - # 0 is used to disable timeouts. + # null means max timeout (35996, just under 1h in 1/10 seconds) + # 0 means disable timeout syslinuxTimeout = if config.boot.loader.timeout == null then - 0 + 35996 else - max (config.boot.loader.timeout * 10) 1; + config.boot.loader.timeout * 10; - - max = x: y: if x > y then x else y; + # Timeout in grub is in seconds. + # null means max timeout (infinity) + # 0 means disable timeout + grubEfiTimeout = if config.boot.loader.timeout == null then + -1 + else + config.boot.loader.timeout; # The configuration file for syslinux. - # Notes on syslinux configuration and UNetbootin compatiblity: + # Notes on syslinux configuration and UNetbootin compatibility: # * Do not use '/syslinux/syslinux.cfg' as the path for this # configuration. UNetbootin will not parse the file and use it as-is. # This results in a broken configuration if the partition label does @@ -103,35 +109,35 @@ let DEFAULT boot LABEL boot - MENU LABEL NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} + MENU LABEL ${config.system.nixos.distroName} ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} LINUX /boot/${config.system.boot.loader.kernelFile} APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} INITRD /boot/${config.system.boot.loader.initrdFile} # A variant to boot with 'nomodeset' LABEL boot-nomodeset - MENU LABEL NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (nomodeset) + MENU LABEL ${config.system.nixos.distroName} ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (nomodeset) LINUX /boot/${config.system.boot.loader.kernelFile} APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset INITRD /boot/${config.system.boot.loader.initrdFile} # A variant to boot with 'copytoram' LABEL boot-copytoram - MENU LABEL NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (copytoram) + MENU LABEL ${config.system.nixos.distroName} ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (copytoram) LINUX /boot/${config.system.boot.loader.kernelFile} APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram INITRD /boot/${config.system.boot.loader.initrdFile} # A variant to boot with verbose logging to the console LABEL boot-debug - MENU LABEL NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (debug) + MENU LABEL ${config.system.nixos.distroName} ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (debug) LINUX /boot/${config.system.boot.loader.kernelFile} APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} loglevel=7 INITRD /boot/${config.system.boot.loader.initrdFile} # A variant to boot with a serial console enabled LABEL boot-serial - MENU LABEL NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (serial console=ttyS0,115200n8) + MENU LABEL ${config.system.nixos.distroName} ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (serial console=ttyS0,115200n8) LINUX /boot/${config.system.boot.loader.kernelFile} APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} console=ttyS0,115200n8 INITRD /boot/${config.system.boot.loader.initrdFile} @@ -286,7 +292,7 @@ let if serial; then set with_serial=yes ;fi export with_serial clear - set timeout=10 + set timeout=${toString grubEfiTimeout} # This message will only be viewable when "gfxterm" is not used. echo "" @@ -452,7 +458,7 @@ in }; isoImage.isoBaseName = mkOption { - default = "nixos"; + default = config.system.nixos.distroId; description = lib.mdDoc '' Prefix of the name of the generated ISO image file. ''; @@ -573,7 +579,7 @@ in isoImage.syslinuxTheme = mkOption { default = '' - MENU TITLE NixOS + MENU TITLE ${config.system.nixos.distroName} MENU RESOLUTION 800 600 MENU CLEAR MENU ROWS 6 diff --git a/nixos/modules/installer/netboot/netboot-minimal.nix b/nixos/modules/installer/netboot/netboot-minimal.nix index 1563501a7e01..91065d52faf4 100644 --- a/nixos/modules/installer/netboot/netboot-minimal.nix +++ b/nixos/modules/installer/netboot/netboot-minimal.nix @@ -1,10 +1,12 @@ # This module defines a small netboot environment. -{ ... }: +{ lib, ... }: { - imports = - [ ./netboot-base.nix - ../../profiles/minimal.nix - ]; + imports = [ + ./netboot-base.nix + ../../profiles/minimal.nix + ]; + + documentation.man.enable = lib.mkOverride 500 true; } diff --git a/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix b/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix new file mode 100644 index 000000000000..0e5055960294 --- /dev/null +++ b/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: + +{ + imports = [ ./sd-image-aarch64-new-kernel-installer.nix ]; + + # Makes `availableOn` fail for zfs, see . + # This is a workaround since we cannot remove the `"zfs"` string from `supportedFilesystems`. + # The proper fix would be to make `supportedFilesystems` an attrset with true/false which we + # could then `lib.mkForce false` + nixpkgs.overlays = [(final: super: { + zfs = super.zfs.overrideAttrs(_: { + meta.platforms = []; + }); + })]; +} diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 4700895cec8e..c9cb65dbbe5a 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/nmq5zcd93qb1yskx42rs910ff0247nn2-nix-2.11.0"; - i686-linux = "/nix/store/ja6im1sw9a8lzczi10lc0iddffl9kzmn-nix-2.11.0"; - aarch64-linux = "/nix/store/myr6fcqa9y4y2fb83zz73dck52vcn81z-nix-2.11.0"; - x86_64-darwin = "/nix/store/2pfjz9b22k9997gh7cb0hjk1qa4lxrvy-nix-2.11.0"; - aarch64-darwin = "/nix/store/lr32i0bdarx1iqsch4sy24jj1jkfw9vf-nix-2.11.0"; + x86_64-linux = "/nix/store/lsr79q5xqd9dv97wn87x12kzax8s8i1s-nix-2.13.2"; + i686-linux = "/nix/store/wky9xjwiwzpifgk0s3f2nrg8nr67bi7x-nix-2.13.2"; + aarch64-linux = "/nix/store/v8drr3x1ia6bdr8y4vl79mlz61xynrpm-nix-2.13.2"; + x86_64-darwin = "/nix/store/1l14si31p4aw7c1gwgjy0nq55k38j9nj-nix-2.13.2"; + aarch64-darwin = "/nix/store/6x7nr1r780fgn254zhkwhih3f3i8cr45-nix-2.13.2"; } diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh old mode 100644 new mode 100755 index 89beeee7cf9e..60a86d89abb4 --- a/nixos/modules/installer/tools/nixos-enter.sh +++ b/nixos/modules/installer/tools/nixos-enter.sh @@ -100,8 +100,9 @@ chroot_add_resolv_conf "$mountPoint" || echo "$0: failed to set up resolv.conf" # Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings. LOCALE_ARCHIVE="$system/sw/lib/locale/locale-archive" IN_NIXOS_ENTER=1 chroot "$mountPoint" "$system/activate" 1>&2 || true - # Create /tmp - chroot "$mountPoint" systemd-tmpfiles --create --remove --exclude-prefix=/dev 1>&2 || true + # Create /tmp. This is needed for nix-build and the NixOS activation script to work. + # Hide the unhelpful "failed to replace specifiers" errors caused by missing /etc/machine-id. + chroot "$mountPoint" "$system/sw/bin/systemd-tmpfiles" --create --remove -E 2> /dev/null || true ) unset TMPDIR diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh old mode 100644 new mode 100755 index e7cf52f5e32b..20fec525e70b --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -195,7 +195,20 @@ if [[ -z $noBootLoader ]]; then echo "installing the boot loader..." # Grub needs an mtab. ln -sfn /proc/mounts "$mountPoint"/etc/mtab - NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -- /run/current-system/bin/switch-to-configuration boot + export mountPoint + NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -c "$(cat <<'EOF' + # Create a bind mount for each of the mount points inside the target file + # system. This preserves the validity of their absolute paths after changing + # the root with `nixos-enter`. + # Without this the bootloader installation may fail due to options that + # contain paths referenced during evaluation, like initrd.secrets. + # when not root, re-execute the script in an unshared namespace + mount --rbind --mkdir / "$mountPoint" + mount --make-rslave "$mountPoint" + /run/current-system/bin/switch-to-configuration boot + umount -R "$mountPoint" && rmdir "$mountPoint" +EOF +)" fi # Ask the user to set a root password, but only if the passwd command diff --git a/nixos/modules/installer/tools/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh index 59a9c572b418..39e34a3718cb 100644 --- a/nixos/modules/installer/tools/nixos-version.sh +++ b/nixos/modules/installer/tools/nixos-version.sh @@ -8,11 +8,18 @@ case "$1" in ;; --hash|--revision) if ! [[ @revision@ =~ ^[0-9a-f]+$ ]]; then - echo "$0: Nixpkgs commit hash is unknown" + echo "$0: Nixpkgs commit hash is unknown" >&2 exit 1 fi echo "@revision@" ;; + --configuration-revision) + if [[ "@configurationRevision@" =~ "@" ]]; then + echo "$0: configuration revision is unknown" >&2 + exit 1 + fi + echo "@configurationRevision@" + ;; --json) cat < man.conf - ${cfg.package}/bin/mandb -C man.conf -psc >/dev/null 2>&1 + mandb -C man.conf -psc >/dev/null 2>&1 ''; in '' diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix index e1d16f802cee..95f2765aff1e 100644 --- a/nixos/modules/misc/meta.nix +++ b/nixos/modules/misc/meta.nix @@ -47,7 +47,7 @@ in doc = mkOption { type = docFile; internal = true; - example = "./meta.chapter.xml"; + example = "./meta.chapter.md"; description = lib.mdDoc '' Documentation prologue for the set of options of each module. This option should be defined at most once per module. diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 7f7417226d17..7f44c3f6f3f0 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -23,12 +23,12 @@ let optionalAttrs (lhs ? packageOverrides) { packageOverrides = pkgs: optCall lhs.packageOverrides pkgs // - optCall (attrByPath ["packageOverrides"] ({}) rhs) pkgs; + optCall (attrByPath [ "packageOverrides" ] { } rhs) pkgs; } // optionalAttrs (lhs ? perlPackageOverrides) { perlPackageOverrides = pkgs: optCall lhs.perlPackageOverrides pkgs // - optCall (attrByPath ["perlPackageOverrides"] ({}) rhs) pkgs; + optCall (attrByPath [ "perlPackageOverrides" ] { } rhs) pkgs; }; configType = mkOptionType { @@ -67,11 +67,6 @@ let # Context for messages hostPlatformLine = optionalString hasHostPlatform "${showOptionWithDefLocs opt.hostPlatform}"; buildPlatformLine = optionalString hasBuildPlatform "${showOptionWithDefLocs opt.buildPlatform}"; - platformLines = optionalString hasPlatform '' - Your system configuration configures nixpkgs with platform parameters: - ${hostPlatformLine - }${buildPlatformLine - }''; legacyOptionsDefined = optional (opt.localSystem.highestPrio < (mkDefault {}).priority) opt.system diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index b3cdaf5568d4..30d11913c533 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -16,18 +16,20 @@ let ) + "\n"; osReleaseContents = { - NAME = "NixOS"; - ID = "nixos"; + NAME = "${cfg.distroName}"; + ID = "${cfg.distroId}"; 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})"; + PRETTY_NAME = "${cfg.distroName} ${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"; + HOME_URL = lib.optionalString (cfg.distroId == "nixos") "https://nixos.org/"; + DOCUMENTATION_URL = lib.optionalString (cfg.distroId == "nixos") "https://nixos.org/learn.html"; + SUPPORT_URL = lib.optionalString (cfg.distroId == "nixos") "https://nixos.org/community.html"; + BUG_REPORT_URL = lib.optionalString (cfg.distroId == "nixos") "https://github.com/NixOS/nixpkgs/issues"; + } // lib.optionalAttrs (cfg.variant_id != null) { + VARIANT_ID = cfg.variant_id; }; initrdReleaseContents = osReleaseContents // { @@ -87,8 +89,35 @@ in description = lib.mdDoc "The NixOS release code name (e.g. `Emu`)."; }; + nixos.distroId = mkOption { + internal = true; + type = types.str; + default = "nixos"; + description = lib.mdDoc "The id of the operating system"; + }; + + nixos.distroName = mkOption { + internal = true; + type = types.str; + default = "NixOS"; + description = lib.mdDoc "The name of the operating system"; + }; + + nixos.variant_id = mkOption { + type = types.nullOr (types.strMatching "^[a-z0-9._-]+$"); + default = null; + description = lib.mdDoc "A lower-case string identifying a specific variant or edition of the operating system"; + example = "installer"; + }; + stateVersion = mkOption { type = types.str; + # TODO Remove this and drop the default of the option so people are forced to set it. + # Doing this also means fixing the comment in nixos/modules/testing/test-instrumentation.nix + apply = v: + lib.warnIf (options.system.stateVersion.highestPrio == (lib.mkOptionDefault { }).priority) + "system.stateVersion is not set, defaulting to ${v}. Read why this matters on https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersion." + v; default = cfg.release; defaultText = literalExpression "config.${opt.release}"; description = lib.mdDoc '' @@ -140,23 +169,15 @@ in environment.etc = { "lsb-release".text = attrsToText { LSB_VERSION = "${cfg.release} (${cfg.codeName})"; - DISTRIB_ID = "nixos"; + DISTRIB_ID = "${cfg.distroId}"; DISTRIB_RELEASE = cfg.release; DISTRIB_CODENAME = toLower cfg.codeName; - DISTRIB_DESCRIPTION = "NixOS ${cfg.release} (${cfg.codeName})"; + DISTRIB_DESCRIPTION = "${cfg.distroName} ${cfg.release} (${cfg.codeName})"; }; "os-release".text = attrsToText osReleaseContents; }; - # We have to use `warnings` because when warning in the default of the option - # the warning would also be shown when building the manual since the manual - # has to evaluate the default. - # - # TODO Remove this and drop the default of the option so people are forced to set it. - # Doing this also means fixing the comment in nixos/modules/testing/test-instrumentation.nix - warnings = lib.optional (options.system.stateVersion.highestPrio == (lib.mkOptionDefault { }).priority) - "system.stateVersion is not set, defaulting to ${config.system.stateVersion}. Read why this matters on https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersion."; }; # uses version info nixpkgs, which requires a full nixpkgs path diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bc5f6f1d76cd..2757a196555e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1,21 +1,13 @@ [ + ./config/appstream.nix + ./config/console.nix ./config/debug-info.nix ./config/fonts/fontconfig.nix ./config/fonts/fontdir.nix ./config/fonts/fonts.nix ./config/fonts/ghostscript.nix - ./config/xdg/autostart.nix - ./config/xdg/icons.nix - ./config/xdg/menus.nix - ./config/xdg/mime.nix - ./config/xdg/portal.nix - ./config/xdg/portals/wlr.nix - ./config/xdg/portals/lxqt.nix - ./config/appstream.nix - ./config/console.nix - ./config/xdg/sounds.nix - ./config/gtk/gtk-icon-cache.nix ./config/gnu.nix + ./config/gtk/gtk-icon-cache.nix ./config/i18n.nix ./config/iproute2.nix ./config/krb5/default.nix @@ -28,9 +20,10 @@ ./config/nsswitch.nix ./config/power-management.nix ./config/pulseaudio.nix - ./config/qt5.nix + ./config/qt.nix ./config/resolvconf.nix ./config/shells-environment.nix + ./config/stevenblack.nix ./config/swap.nix ./config/sysctl.nix ./config/system-environment.nix @@ -39,25 +32,32 @@ ./config/unix-odbc-drivers.nix ./config/users-groups.nix ./config/vte.nix + ./config/xdg/autostart.nix + ./config/xdg/icons.nix + ./config/xdg/menus.nix + ./config/xdg/mime.nix + ./config/xdg/portal.nix + ./config/xdg/portals/lxqt.nix + ./config/xdg/portals/wlr.nix + ./config/xdg/sounds.nix ./config/zram.nix ./hardware/acpilight.nix ./hardware/all-firmware.nix ./hardware/bladeRF.nix ./hardware/brillo.nix ./hardware/ckb-next.nix + ./hardware/corectrl.nix ./hardware/cpu/amd-microcode.nix + ./hardware/cpu/amd-sev.nix ./hardware/cpu/intel-microcode.nix ./hardware/cpu/intel-sgx.nix - ./hardware/corectrl.nix - ./hardware/digitalbitbox.nix ./hardware/device-tree.nix - ./hardware/gkraken.nix + ./hardware/digitalbitbox.nix ./hardware/flirc.nix + ./hardware/gkraken.nix ./hardware/gpgsmartcards.nix - ./hardware/i2c.nix ./hardware/hackrf.nix - ./hardware/sensor/hddtemp.nix - ./hardware/sensor/iio.nix + ./hardware/i2c.nix ./hardware/keyboard/teck.nix ./hardware/keyboard/uhk.nix ./hardware/keyboard/zsa.nix @@ -70,33 +70,35 @@ ./hardware/network/intel-2200bg.nix ./hardware/new-lg4ff.nix ./hardware/nitrokey.nix + ./hardware/onlykey/default.nix ./hardware/opengl.nix ./hardware/openrazer.nix + ./hardware/opentabletdriver.nix ./hardware/pcmcia.nix ./hardware/printers.nix ./hardware/raid/hpsa.nix ./hardware/rtl-sdr.nix ./hardware/saleae-logic.nix + ./hardware/sata.nix + ./hardware/sensor/hddtemp.nix + ./hardware/sensor/iio.nix ./hardware/steam-hardware.nix ./hardware/system-76.nix ./hardware/tuxedo-keyboard.nix ./hardware/ubertooth.nix - ./hardware/usb-wwan.nix - ./hardware/usb-storage.nix - ./hardware/onlykey/default.nix - ./hardware/opentabletdriver.nix - ./hardware/sata.nix - ./hardware/wooting.nix ./hardware/uinput.nix + ./hardware/usb-storage.nix + ./hardware/usb-wwan.nix ./hardware/video/amdgpu-pro.nix - ./hardware/video/capture/mwprocapture.nix ./hardware/video/bumblebee.nix + ./hardware/video/capture/mwprocapture.nix ./hardware/video/displaylink.nix ./hardware/video/hidpi.nix ./hardware/video/nvidia.nix ./hardware/video/switcheroo-control.nix ./hardware/video/uvcvideo/default.nix ./hardware/video/webcam/facetimehd.nix + ./hardware/wooting.nix ./hardware/xone.nix ./hardware/xpadneo.nix ./i18n/input-method/default.nix @@ -104,39 +106,40 @@ ./i18n/input-method/fcitx5.nix ./i18n/input-method/hime.nix ./i18n/input-method/ibus.nix + ./i18n/input-method/kime.nix ./i18n/input-method/nabi.nix ./i18n/input-method/uim.nix - ./i18n/input-method/kime.nix ./installer/tools/tools.nix ./misc/assertions.nix ./misc/crashdump.nix ./misc/documentation.nix ./misc/extra-arguments.nix ./misc/ids.nix - ./misc/lib.nix ./misc/label.nix + ./misc/lib.nix ./misc/locate.nix ./misc/man-db.nix ./misc/mandoc.nix ./misc/meta.nix + ./misc/nixops-autoluks.nix ./misc/nixpkgs.nix ./misc/passthru.nix ./misc/version.nix ./misc/wordlist.nix - ./misc/nixops-autoluks.nix - ./programs/_1password.nix ./programs/_1password-gui.nix + ./programs/_1password.nix ./programs/adb.nix ./programs/appgate-sdp.nix ./programs/atop.nix ./programs/ausweisapp.nix ./programs/autojump.nix ./programs/bandwhich.nix - ./programs/bash/bash.nix + ./programs/bash-my-aws.nix ./programs/bash/bash-completion.nix + ./programs/bash/bash.nix + ./programs/bash/blesh.nix ./programs/bash/ls-colors.nix ./programs/bash/undistract-me.nix - ./programs/bash-my-aws.nix ./programs/bcc.nix ./programs/browserpass.nix ./programs/calls.nix @@ -164,67 +167,74 @@ ./programs/flexoptix-app.nix ./programs/freetds.nix ./programs/fuse.nix + ./programs/fzf.nix ./programs/gamemode.nix ./programs/geary.nix ./programs/git.nix ./programs/gnome-disks.nix - ./programs/gnome-documents.nix ./programs/gnome-terminal.nix - ./programs/gpaste.nix ./programs/gnupg.nix + ./programs/gpaste.nix ./programs/gphoto2.nix ./programs/haguichi.nix ./programs/hamster.nix ./programs/htop.nix + ./programs/iay.nix ./programs/iftop.nix + ./programs/i3lock.nix ./programs/iotop.nix ./programs/java.nix - ./programs/k40-whisperer.nix - ./programs/kclock.nix ./programs/k3b.nix - ./programs/kdeconnect.nix + ./programs/k40-whisperer.nix ./programs/kbdlight.nix + ./programs/kclock.nix + ./programs/kdeconnect.nix ./programs/less.nix ./programs/liboping.nix ./programs/light.nix ./programs/mdevctl.nix ./programs/mepo.nix - ./programs/mosh.nix ./programs/mininet.nix + ./programs/miriway.nix + ./programs/mosh.nix ./programs/msmtp.nix ./programs/mtr.nix ./programs/nano.nix ./programs/nbd.nix - ./programs/nix-ld.nix ./programs/neovim.nix ./programs/nethoscope.nix + ./programs/nix-index.nix + ./programs/nix-ld.nix ./programs/nm-applet.nix ./programs/nncp.nix - ./programs/npm.nix ./programs/noisetorch.nix + ./programs/npm.nix ./programs/oblogout.nix ./programs/openvpn3.nix ./programs/pantheon-tweaks.nix ./programs/partition-manager.nix ./programs/plotinus.nix ./programs/proxychains.nix + ./programs/qdmr.nix ./programs/qt5ct.nix + ./programs/rog-control-center.nix ./programs/rust-motd.nix ./programs/screen.nix - ./programs/sedutil.nix ./programs/seahorse.nix - ./programs/slock.nix + ./programs/sedutil.nix ./programs/shadow.nix - ./programs/spacefm.nix ./programs/singularity.nix + ./programs/skim.nix + ./programs/slock.nix + ./programs/spacefm.nix ./programs/ssh.nix - ./programs/sysdig.nix - ./programs/systemtap.nix ./programs/starship.nix ./programs/steam.nix ./programs/streamdeck-ui.nix ./programs/sway.nix + ./programs/sysdig.nix ./programs/system-config-printer.nix + ./programs/systemtap.nix ./programs/thefuck.nix ./programs/thunar.nix ./programs/tmux.nix @@ -238,6 +248,7 @@ ./programs/waybar.nix ./programs/weylus.nix ./programs/wireshark.nix + ./programs/xastir.nix ./programs/wshowkeys.nix ./programs/xfconf.nix ./programs/xfs_quota.nix @@ -247,10 +258,10 @@ ./programs/yabar.nix ./programs/zmap.nix ./programs/zsh/oh-my-zsh.nix - ./programs/zsh/zsh.nix ./programs/zsh/zsh-autoenv.nix ./programs/zsh/zsh-autosuggestions.nix ./programs/zsh/zsh-syntax-highlighting.nix + ./programs/zsh/zsh.nix ./rename.nix ./security/acme ./security/apparmor.nix @@ -259,23 +270,23 @@ ./security/ca.nix ./security/chromium-suid-sandbox.nix ./security/dhparams.nix + ./security/doas.nix ./security/duosec.nix ./security/google_oslogin.nix ./security/lock-kernel-modules.nix ./security/misc.nix ./security/oath.nix ./security/pam.nix - ./security/pam_usb.nix ./security/pam_mount.nix + ./security/pam_usb.nix ./security/please.nix ./security/polkit.nix ./security/rngd.nix ./security/rtkit.nix - ./security/wrappers/default.nix ./security/sudo.nix - ./security/doas.nix ./security/systemd-confinement.nix ./security/tpm2.nix + ./security/wrappers/default.nix ./services/admin/meshcentral.nix ./services/admin/oxidized.nix ./services/admin/pgadmin.nix @@ -285,22 +296,23 @@ ./services/amqp/rabbitmq.nix ./services/audio/alsa.nix ./services/audio/botamusique.nix + ./services/audio/gmediarender.nix ./services/audio/hqplayerd.nix ./services/audio/icecast.nix ./services/audio/jack.nix ./services/audio/jmusicbot.nix ./services/audio/liquidsoap.nix + ./services/audio/mopidy.nix ./services/audio/mpd.nix ./services/audio/mpdscribble.nix - ./services/audio/mopidy.nix + ./services/audio/navidrome.nix ./services/audio/networkaudiod.nix ./services/audio/roon-bridge.nix - ./services/audio/navidrome.nix ./services/audio/roon-server.nix ./services/audio/slimserver.nix ./services/audio/snapserver.nix - ./services/audio/squeezelite.nix ./services/audio/spotifyd.nix + ./services/audio/squeezelite.nix ./services/audio/ympd.nix ./services/backup/automysqlbackup.nix ./services/backup/bacula.nix @@ -312,8 +324,8 @@ ./services/backup/mysql-backup.nix ./services/backup/postgresql-backup.nix ./services/backup/postgresql-wal-receiver.nix - ./services/backup/restic.nix ./services/backup/restic-rest-server.nix + ./services/backup/restic.nix ./services/backup/rsnapshot.nix ./services/backup/sanoid.nix ./services/backup/syncoid.nix @@ -321,15 +333,15 @@ ./services/backup/tsm.nix ./services/backup/zfs-replication.nix ./services/backup/znapzend.nix - ./services/blockchain/ethereum/geth.nix - ./services/blockchain/ethereum/erigon.nix - ./services/blockchain/ethereum/lighthouse.nix ./services/backup/zrepl.nix + ./services/blockchain/ethereum/erigon.nix + ./services/blockchain/ethereum/geth.nix + ./services/blockchain/ethereum/lighthouse.nix ./services/cluster/corosync/default.nix ./services/cluster/hadoop/default.nix ./services/cluster/k3s/default.nix - ./services/cluster/kubernetes/addons/dns.nix ./services/cluster/kubernetes/addon-manager.nix + ./services/cluster/kubernetes/addons/dns.nix ./services/cluster/kubernetes/apiserver.nix ./services/cluster/kubernetes/controller-manager.nix ./services/cluster/kubernetes/default.nix @@ -349,14 +361,14 @@ ./services/continuous-integration/buildbot/master.nix ./services/continuous-integration/buildbot/worker.nix ./services/continuous-integration/buildkite-agents.nix - ./services/continuous-integration/hail.nix - ./services/continuous-integration/hercules-ci-agent/default.nix - ./services/continuous-integration/hydra/default.nix ./services/continuous-integration/github-runner.nix ./services/continuous-integration/github-runners.nix ./services/continuous-integration/gitlab-runner.nix ./services/continuous-integration/gocd-agent/default.nix ./services/continuous-integration/gocd-server/default.nix + ./services/continuous-integration/hail.nix + ./services/continuous-integration/hercules-ci-agent/default.nix + ./services/continuous-integration/hydra/default.nix ./services/continuous-integration/jenkins/default.nix ./services/continuous-integration/jenkins/job-builder.nix ./services/continuous-integration/jenkins/slave.nix @@ -365,8 +377,8 @@ ./services/databases/clickhouse.nix ./services/databases/cockroachdb.nix ./services/databases/couchdb.nix - ./services/databases/dragonflydb.nix ./services/databases/dgraph.nix + ./services/databases/dragonflydb.nix ./services/databases/firebird.nix ./services/databases/foundationdb.nix ./services/databases/hbase-standalone.nix @@ -393,12 +405,6 @@ ./services/desktops/espanso.nix ./services/desktops/flatpak.nix ./services/desktops/geoclue2.nix - ./services/desktops/gsignond.nix - ./services/desktops/gvfs.nix - ./services/desktops/malcontent.nix - ./services/desktops/pipewire/pipewire.nix - ./services/desktops/pipewire/pipewire-media-session.nix - ./services/desktops/pipewire/wireplumber.nix ./services/desktops/gnome/at-spi2-core.nix ./services/desktops/gnome/evolution-data-server.nix ./services/desktops/gnome/glib-networking.nix @@ -412,27 +418,33 @@ ./services/desktops/gnome/gnome-user-share.nix ./services/desktops/gnome/rygel.nix ./services/desktops/gnome/sushi.nix - ./services/desktops/gnome/tracker.nix ./services/desktops/gnome/tracker-miners.nix + ./services/desktops/gnome/tracker.nix + ./services/desktops/gsignond.nix + ./services/desktops/gvfs.nix + ./services/desktops/malcontent.nix ./services/desktops/neard.nix + ./services/desktops/pipewire/pipewire-media-session.nix + ./services/desktops/pipewire/pipewire.nix + ./services/desktops/pipewire/wireplumber.nix ./services/desktops/profile-sync-daemon.nix ./services/desktops/system-config-printer.nix ./services/desktops/telepathy.nix ./services/desktops/tumbler.nix ./services/desktops/zeitgeist.nix - ./services/development/bloop.nix ./services/development/blackfire.nix + ./services/development/bloop.nix ./services/development/distccd.nix ./services/development/hoogle.nix ./services/development/jupyter/default.nix ./services/development/jupyterhub/default.nix - ./services/development/rstudio-server/default.nix ./services/development/lorri.nix + ./services/development/rstudio-server/default.nix ./services/development/zammad.nix ./services/display-managers/greetd.nix ./services/editors/emacs.nix - ./services/editors/infinoted.nix ./services/editors/haste.nix + ./services/editors/infinoted.nix ./services/finance/odoo.nix ./services/games/asf.nix ./services/games/crossfire-server.nix @@ -448,6 +460,7 @@ ./services/hardware/acpid.nix ./services/hardware/actkbd.nix ./services/hardware/argonone.nix + ./services/hardware/asusd.nix ./services/hardware/auto-cpufreq.nix ./services/hardware/bluetooth.nix ./services/hardware/bolt.nix @@ -475,23 +488,24 @@ ./services/hardware/sane_extra_backends/brscan5.nix ./services/hardware/sane_extra_backends/dsseries.nix ./services/hardware/spacenavd.nix + ./services/hardware/supergfxd.nix ./services/hardware/tcsd.nix - ./services/hardware/tlp.nix + ./services/hardware/thermald.nix ./services/hardware/thinkfan.nix ./services/hardware/throttled.nix + ./services/hardware/tlp.nix ./services/hardware/trezord.nix ./services/hardware/triggerhappy.nix ./services/hardware/udev.nix ./services/hardware/udisks2.nix + ./services/hardware/undervolt.nix ./services/hardware/upower.nix ./services/hardware/usbmuxd.nix ./services/hardware/usbrelayd.nix - ./services/hardware/thermald.nix - ./services/hardware/undervolt.nix ./services/hardware/vdr.nix + ./services/home-automation/evcc.nix ./services/home-automation/home-assistant.nix ./services/home-automation/zigbee2mqtt.nix - ./services/home-automation/evcc.nix ./services/logging/SystemdJournal2Gelf.nix ./services/logging/awstats.nix ./services/logging/filebeat.nix @@ -510,12 +524,14 @@ ./services/logging/syslog-ng.nix ./services/logging/syslogd.nix ./services/logging/vector.nix + ./services/logging/ulogd.nix ./services/mail/clamsmtp.nix ./services/mail/davmail.nix ./services/mail/dkimproxy-out.nix ./services/mail/dovecot.nix ./services/mail/dspam.nix ./services/mail/exim.nix + ./services/mail/goeland.nix ./services/mail/listmonk.nix ./services/mail/maddy.nix ./services/mail/mail.nix @@ -523,22 +539,22 @@ ./services/mail/mailhog.nix ./services/mail/mailman.nix ./services/mail/mlmmj.nix + ./services/mail/nullmailer.nix ./services/mail/offlineimap.nix ./services/mail/opendkim.nix ./services/mail/opensmtpd.nix ./services/mail/pfix-srsd.nix ./services/mail/postfix.nix ./services/mail/postfixadmin.nix - ./services/mail/postsrsd.nix ./services/mail/postgrey.nix + ./services/mail/postsrsd.nix ./services/mail/public-inbox.nix - ./services/mail/spamassassin.nix + ./services/mail/roundcube.nix ./services/mail/rspamd.nix ./services/mail/rss2email.nix - ./services/mail/roundcube.nix ./services/mail/schleuder.nix + ./services/mail/spamassassin.nix ./services/mail/sympa.nix - ./services/mail/nullmailer.nix ./services/matrix/appservice-discord.nix ./services/matrix/appservice-irc.nix ./services/matrix/conduit.nix @@ -546,34 +562,37 @@ ./services/matrix/mautrix-facebook.nix ./services/matrix/mautrix-telegram.nix ./services/matrix/mjolnir.nix + ./services/matrix/mx-puppet-discord.nix ./services/matrix/pantalaimon.nix ./services/matrix/synapse.nix - ./services/misc/ananicy.nix ./services/misc/airsonic.nix + ./services/misc/ananicy.nix ./services/misc/ankisyncd.nix ./services/misc/apache-kafka.nix + ./services/misc/atuin.nix ./services/misc/autofs.nix ./services/misc/autorandr.nix + ./services/misc/autosuspend.nix ./services/misc/bazarr.nix ./services/misc/beanstalkd.nix ./services/misc/bees.nix ./services/misc/bepasty.nix - ./services/misc/canto-daemon.nix ./services/misc/calibre-server.nix + ./services/misc/canto-daemon.nix ./services/misc/cfdyndns.nix - ./services/misc/clipmenu.nix - ./services/misc/clipcat.nix - ./services/misc/cpuminer-cryptonight.nix ./services/misc/cgminer.nix + ./services/misc/clipcat.nix + ./services/misc/clipmenu.nix ./services/misc/confd.nix + ./services/misc/cpuminer-cryptonight.nix ./services/misc/devmon.nix ./services/misc/dictd.nix - ./services/misc/duckling.nix - ./services/misc/dwm-status.nix - ./services/misc/dysnomia.nix ./services/misc/disnix.nix ./services/misc/docker-registry.nix ./services/misc/domoticz.nix + ./services/misc/duckling.nix + ./services/misc/dwm-status.nix + ./services/misc/dysnomia.nix ./services/misc/errbot.nix ./services/misc/etcd.nix ./services/misc/etebase-server.nix @@ -585,16 +604,16 @@ ./services/misc/gammu-smsd.nix ./services/misc/geoipupdate.nix ./services/misc/gitea.nix - #./services/misc/gitit.nix + # ./services/misc/gitit.nix ./services/misc/gitlab.nix ./services/misc/gitolite.nix ./services/misc/gitweb.nix ./services/misc/gogs.nix ./services/misc/gollum.nix ./services/misc/gpsd.nix + ./services/misc/greenclip.nix ./services/misc/headphones.nix ./services/misc/heisenbridge.nix - ./services/misc/greenclip.nix ./services/misc/ihaskell.nix ./services/misc/input-remapper.nix ./services/misc/irkerd.nix @@ -602,17 +621,16 @@ ./services/misc/jellyfin.nix ./services/misc/klipper.nix ./services/misc/languagetool.nix - ./services/misc/logkeys.nix ./services/misc/leaps.nix - ./services/misc/lidarr.nix ./services/misc/libreddit.nix + ./services/misc/lidarr.nix ./services/misc/lifecycled.nix + ./services/misc/logkeys.nix ./services/misc/mame.nix ./services/misc/mbpfan.nix ./services/misc/mediatomb.nix ./services/misc/metabase.nix ./services/misc/moonraker.nix - ./services/misc/mx-puppet-discord.nix ./services/misc/n8n.nix ./services/misc/nitter.nix ./services/misc/nix-daemon.nix @@ -631,23 +649,22 @@ ./services/misc/paperless.nix ./services/misc/parsoid.nix ./services/misc/persistent-evdev.nix + ./services/misc/pinnwand.nix ./services/misc/plex.nix ./services/misc/plikd.nix ./services/misc/podgrab.nix ./services/misc/polaris.nix ./services/misc/portunus.nix ./services/misc/prowlarr.nix - ./services/misc/tautulli.nix - ./services/misc/pinnwand.nix ./services/misc/pykms.nix ./services/misc/radarr.nix ./services/misc/redmine.nix - ./services/misc/rippled.nix ./services/misc/ripple-data-api.nix + ./services/misc/rippled.nix ./services/misc/rmfakecloud.nix - ./services/misc/serviio.nix ./services/misc/safeeyes.nix ./services/misc/sdrplay.nix + ./services/misc/serviio.nix ./services/misc/sickbeard.nix ./services/misc/signald.nix ./services/misc/siproxd.nix @@ -665,6 +682,7 @@ ./services/misc/sysprof.nix ./services/misc/tandoor-recipes.nix ./services/misc/taskserver + ./services/misc/tautulli.nix ./services/misc/tiddlywiki.nix ./services/misc/tp-auto-kbbl.nix ./services/misc/tzupdate.nix @@ -684,10 +702,10 @@ ./services/monitoring/datadog-agent.nix ./services/monitoring/do-agent.nix ./services/monitoring/fusion-inventory.nix - ./services/monitoring/grafana.nix ./services/monitoring/grafana-agent.nix ./services/monitoring/grafana-image-renderer.nix ./services/monitoring/grafana-reporter.nix + ./services/monitoring/grafana.nix ./services/monitoring/graphite.nix ./services/monitoring/hdaps.nix ./services/monitoring/heapster.nix @@ -705,57 +723,58 @@ ./services/monitoring/nagios.nix ./services/monitoring/netdata.nix ./services/monitoring/parsedmarc.nix - ./services/monitoring/prometheus/default.nix ./services/monitoring/prometheus/alertmanager.nix + ./services/monitoring/prometheus/default.nix ./services/monitoring/prometheus/exporters.nix ./services/monitoring/prometheus/pushgateway.nix ./services/monitoring/prometheus/sachet.nix ./services/monitoring/prometheus/xmpp-alerts.nix - ./services/monitoring/riemann.nix ./services/monitoring/riemann-dash.nix ./services/monitoring/riemann-tools.nix + ./services/monitoring/riemann.nix ./services/monitoring/scollector.nix ./services/monitoring/smartd.nix + ./services/monitoring/statsd.nix ./services/monitoring/sysstat.nix ./services/monitoring/teamviewer.nix ./services/monitoring/telegraf.nix ./services/monitoring/thanos.nix ./services/monitoring/tremor-rs.nix ./services/monitoring/tuptime.nix - ./services/monitoring/unifi-poller.nix + ./services/monitoring/unpoller.nix ./services/monitoring/ups.nix + ./services/monitoring/uptime-kuma.nix ./services/monitoring/uptime.nix ./services/monitoring/vmagent.nix - ./services/monitoring/uptime-kuma.nix ./services/monitoring/vnstat.nix ./services/monitoring/zabbix-agent.nix ./services/monitoring/zabbix-proxy.nix ./services/monitoring/zabbix-server.nix ./services/network-filesystems/cachefilesd.nix + ./services/network-filesystems/ceph.nix ./services/network-filesystems/davfs2.nix + ./services/network-filesystems/diod.nix ./services/network-filesystems/drbd.nix ./services/network-filesystems/glusterfs.nix ./services/network-filesystems/kbfs.nix ./services/network-filesystems/kubo.nix ./services/network-filesystems/litestream/default.nix + ./services/network-filesystems/moosefs.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 ./services/network-filesystems/orangefs/client.nix + ./services/network-filesystems/orangefs/server.nix ./services/network-filesystems/rsyncd.nix - ./services/network-filesystems/samba.nix ./services/network-filesystems/samba-wsdd.nix + ./services/network-filesystems/samba.nix ./services/network-filesystems/tahoe.nix - ./services/network-filesystems/diod.nix ./services/network-filesystems/u9fs.nix - ./services/network-filesystems/webdav.nix ./services/network-filesystems/webdav-server-rs.nix - ./services/network-filesystems/yandex-disk.nix + ./services/network-filesystems/webdav.nix ./services/network-filesystems/xtreemfs.nix - ./services/network-filesystems/ceph.nix + ./services/network-filesystems/yandex-disk.nix ./services/networking/3proxy.nix ./services/networking/adguardhome.nix ./services/networking/amuled.nix @@ -763,16 +782,16 @@ ./services/networking/aria2.nix ./services/networking/asterisk.nix ./services/networking/atftpd.nix + ./services/networking/autossh.nix ./services/networking/avahi-daemon.nix ./services/networking/babeld.nix - ./services/networking/bee.nix ./services/networking/bee-clef.nix + ./services/networking/bee.nix ./services/networking/biboumi.nix ./services/networking/bind.nix - ./services/networking/bitcoind.nix - ./services/networking/autossh.nix - ./services/networking/bird.nix ./services/networking/bird-lg.nix + ./services/networking/bird.nix + ./services/networking/bitcoind.nix ./services/networking/bitlbee.nix ./services/networking/blockbook-frontend.nix ./services/networking/blocky.nix @@ -780,6 +799,7 @@ ./services/networking/chisel-server.nix ./services/networking/cjdns.nix ./services/networking/cloudflare-dyndns.nix + ./services/networking/cloudflared.nix ./services/networking/cntlm.nix ./services/networking/connman.nix ./services/networking/consul.nix @@ -798,8 +818,6 @@ ./services/networking/dnsdist.nix ./services/networking/dnsmasq.nix ./services/networking/doh-proxy-rust.nix - ./services/networking/ncdns.nix - ./services/networking/nomad.nix ./services/networking/ejabberd.nix ./services/networking/envoy.nix ./services/networking/epmd.nix @@ -812,6 +830,8 @@ ./services/networking/firefox-syncserver.nix ./services/networking/fireqos.nix ./services/networking/firewall.nix + ./services/networking/firewall-iptables.nix + ./services/networking/firewall-nftables.nix ./services/networking/flannel.nix ./services/networking/freenet.nix ./services/networking/freeradius.nix @@ -834,10 +854,10 @@ ./services/networking/htpdate.nix ./services/networking/https-dns-proxy.nix ./services/networking/hylafax/default.nix - ./services/networking/i2pd.nix ./services/networking/i2p.nix - ./services/networking/icecream/scheduler.nix + ./services/networking/i2pd.nix ./services/networking/icecream/daemon.nix + ./services/networking/icecream/scheduler.nix ./services/networking/inspircd.nix ./services/networking/iodine.nix ./services/networking/iperf3.nix @@ -862,14 +882,15 @@ ./services/networking/lxd-image-server.nix ./services/networking/magic-wormhole-mailbox-server.nix ./services/networking/matterbridge.nix - ./services/networking/mjpg-streamer.nix ./services/networking/minidlna.nix ./services/networking/miniupnpd.nix - ./services/networking/mosquitto.nix + ./services/networking/miredo.nix + ./services/networking/mjpg-streamer.nix + ./services/networking/mmsd.nix ./services/networking/monero.nix ./services/networking/morty.nix + ./services/networking/mosquitto.nix ./services/networking/mozillavpn.nix - ./services/networking/miredo.nix ./services/networking/mstpd.nix ./services/networking/mtprotoproxy.nix ./services/networking/mtr-exporter.nix @@ -880,20 +901,24 @@ ./services/networking/namecoind.nix ./services/networking/nar-serve.nix ./services/networking/nat.nix + ./services/networking/nat-iptables.nix + ./services/networking/nat-nftables.nix ./services/networking/nats.nix ./services/networking/nbd.nix + ./services/networking/ncdns.nix ./services/networking/ndppd.nix ./services/networking/nebula.nix ./services/networking/netbird.nix ./services/networking/networkmanager.nix ./services/networking/nextdns.nix ./services/networking/nftables.nix - ./services/networking/ngircd.nix ./services/networking/nghttpx/default.nix + ./services/networking/ngircd.nix ./services/networking/nix-serve.nix ./services/networking/nix-store-gcs-proxy.nix ./services/networking/nixops-dns.nix ./services/networking/nntp-proxy.nix + ./services/networking/nomad.nix ./services/networking/nsd.nix ./services/networking/ntopng.nix ./services/networking/ntp/chrony.nix @@ -909,20 +934,20 @@ ./services/networking/openvpn.nix ./services/networking/ostinato.nix ./services/networking/owamp.nix + ./services/networking/pdns-recursor.nix ./services/networking/pdnsd.nix ./services/networking/pixiecore.nix ./services/networking/pleroma.nix ./services/networking/polipo.nix ./services/networking/powerdns.nix - ./services/networking/pdns-recursor.nix ./services/networking/pppd.nix ./services/networking/pptpd.nix ./services/networking/prayer.nix ./services/networking/privoxy.nix ./services/networking/prosody.nix ./services/networking/quassel.nix - ./services/networking/quorum.nix ./services/networking/quicktun.nix + ./services/networking/quorum.nix ./services/networking/r53-ddns.nix ./services/networking/radicale.nix ./services/networking/radvd.nix @@ -936,70 +961,72 @@ ./services/networking/sabnzbd.nix ./services/networking/seafile.nix ./services/networking/searx.nix - ./services/networking/skydns.nix ./services/networking/shadowsocks.nix ./services/networking/shairport-sync.nix ./services/networking/shellhub-agent.nix ./services/networking/shorewall.nix ./services/networking/shorewall6.nix ./services/networking/shout.nix - ./services/networking/sniproxy.nix - ./services/networking/snowflake-proxy.nix + ./services/networking/skydns.nix ./services/networking/smartdns.nix ./services/networking/smokeping.nix + ./services/networking/sniproxy.nix + ./services/networking/snowflake-proxy.nix ./services/networking/softether.nix - ./services/networking/solanum.nix ./services/networking/soju.nix + ./services/networking/solanum.nix ./services/networking/spacecookie.nix ./services/networking/spiped.nix ./services/networking/squid.nix - ./services/networking/sslh.nix ./services/networking/ssh/lshd.nix ./services/networking/ssh/sshd.nix - ./services/networking/strongswan.nix + ./services/networking/sslh.nix ./services/networking/strongswan-swanctl/module.nix - ./services/networking/stunnel.nix + ./services/networking/strongswan.nix ./services/networking/stubby.nix + ./services/networking/stunnel.nix ./services/networking/supplicant.nix ./services/networking/supybot.nix - ./services/networking/syncthing.nix - ./services/networking/syncthing-relay.nix ./services/networking/syncplay.nix + ./services/networking/syncthing-relay.nix + ./services/networking/syncthing.nix ./services/networking/tailscale.nix + ./services/networking/tayga.nix ./services/networking/tcpcrypt.nix ./services/networking/teamspeak3.nix ./services/networking/tedicross.nix - ./services/networking/tetrd.nix ./services/networking/teleport.nix + ./services/networking/tetrd.nix + ./services/networking/tftpd.nix ./services/networking/thelounge.nix ./services/networking/tinc.nix ./services/networking/tinydns.nix - ./services/networking/tftpd.nix ./services/networking/tmate-ssh-server.nix - ./services/networking/trickster.nix ./services/networking/tox-bootstrapd.nix ./services/networking/tox-node.nix ./services/networking/toxvpn.nix + ./services/networking/trickster.nix ./services/networking/tvheadend.nix + ./services/networking/twingate.nix ./services/networking/ucarp.nix ./services/networking/unbound.nix ./services/networking/unifi.nix - ./services/video/unifi-video.nix - ./services/video/rtsp-simple-server.nix ./services/networking/uptermd.nix ./services/networking/v2ray.nix + ./services/networking/v2raya.nix ./services/networking/vdirsyncer.nix ./services/networking/vsftpd.nix ./services/networking/wasabibackend.nix ./services/networking/websockify.nix ./services/networking/wg-netmanager.nix + ./services/networking/webhook.nix ./services/networking/wg-quick.nix ./services/networking/wireguard.nix ./services/networking/wpa_supplicant.nix + ./services/networking/x2goserver.nix ./services/networking/xandikos.nix ./services/networking/xinetd.nix ./services/networking/xl2tpd.nix - ./services/networking/x2goserver.nix ./services/networking/xray.nix ./services/networking/xrdp.nix ./services/networking/yggdrasil.nix @@ -1008,11 +1035,13 @@ ./services/networking/zerotierone.nix ./services/networking/znc/default.nix ./services/printing/cupsd.nix + ./services/printing/ipp-usb.nix + ./services/printing/cups-pdf.nix ./services/scheduling/atd.nix ./services/scheduling/cron.nix ./services/scheduling/fcron.nix - ./services/search/elasticsearch.nix ./services/search/elasticsearch-curator.nix + ./services/search/elasticsearch.nix ./services/search/hound.nix ./services/search/kibana.nix ./services/search/meilisearch.nix @@ -1021,25 +1050,25 @@ ./services/security/certmgr.nix ./services/security/cfssl.nix ./services/security/clamav.nix - ./services/security/endlessh.nix ./services/security/endlessh-go.nix + ./services/security/endlessh.nix ./services/security/fail2ban.nix ./services/security/fprintd.nix ./services/security/haka.nix ./services/security/haveged.nix ./services/security/hockeypuck.nix - ./services/security/hologram-server.nix ./services/security/hologram-agent.nix - ./services/security/kanidm.nix + ./services/security/hologram-server.nix ./services/security/infnoise.nix + ./services/security/kanidm.nix ./services/security/munge.nix ./services/security/nginx-sso.nix ./services/security/oauth2_proxy.nix ./services/security/oauth2_proxy_nginx.nix ./services/security/opensnitch.nix ./services/security/pass-secret-service.nix - ./services/security/privacyidea.nix ./services/security/physlock.nix + ./services/security/privacyidea.nix ./services/security/shibboleth-sp.nix ./services/security/sks.nix ./services/security/sshguard.nix @@ -1058,8 +1087,8 @@ ./services/system/cloud-init.nix ./services/system/dbus.nix ./services/system/earlyoom.nix - ./services/system/localtimed.nix ./services/system/kerberos/default.nix + ./services/system/localtimed.nix ./services/system/nscd.nix ./services/system/saslauthd.nix ./services/system/self-deploy.nix @@ -1076,19 +1105,23 @@ ./services/ttys/getty.nix ./services/ttys/gpm.nix ./services/ttys/kmscon.nix - ./services/wayland/cage.nix ./services/video/epgstation/default.nix ./services/video/mirakurun.nix ./services/video/replay-sorcery.nix + ./services/video/rtsp-simple-server.nix + ./services/video/unifi-video.nix + ./services/wayland/cage.nix + ./services/web-apps/akkoma.nix ./services/web-apps/alps.nix ./services/web-apps/atlassian/confluence.nix ./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/jira.nix + ./services/web-apps/baget.nix ./services/web-apps/bookstack.nix ./services/web-apps/calibre-web.nix - ./services/web-apps/code-server.nix - ./services/web-apps/baget.nix ./services/web-apps/changedetection-io.nix + ./services/web-apps/cloudlog.nix + ./services/web-apps/code-server.nix ./services/web-apps/convos.nix ./services/web-apps/dex.nix ./services/web-apps/discourse.nix @@ -1109,16 +1142,18 @@ ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix ./services/web-apps/ihatemoney + ./services/web-apps/invidious.nix + ./services/web-apps/invoiceplane.nix ./services/web-apps/isso.nix ./services/web-apps/jirafeau.nix ./services/web-apps/jitsi-meet.nix + ./services/web-apps/kasmweb/default.nix ./services/web-apps/keycloak.nix ./services/web-apps/komga.nix ./services/web-apps/lemmy.nix - ./services/web-apps/invidious.nix - ./services/web-apps/invoiceplane.nix ./services/web-apps/limesurvey.nix ./services/web-apps/mastodon.nix + ./services/web-apps/matomo.nix ./services/web-apps/mattermost.nix ./services/web-apps/mediawiki.nix ./services/web-apps/miniflux.nix @@ -1128,29 +1163,30 @@ ./services/web-apps/nexus.nix ./services/web-apps/nifi.nix ./services/web-apps/node-red.nix - ./services/web-apps/phylactery.nix ./services/web-apps/onlyoffice.nix - ./services/web-apps/pict-rs.nix - ./services/web-apps/peertube.nix - ./services/web-apps/plantuml-server.nix - ./services/web-apps/plausible.nix - ./services/web-apps/pgpkeyserver-lite.nix - ./services/web-apps/powerdns-admin.nix - ./services/web-apps/prosody-filer.nix - ./services/web-apps/matomo.nix ./services/web-apps/openwebrx.nix ./services/web-apps/outline.nix + ./services/web-apps/peering-manager.nix + ./services/web-apps/peertube.nix + ./services/web-apps/pgpkeyserver-lite.nix + ./services/web-apps/phylactery.nix + ./services/web-apps/photoprism.nix + ./services/web-apps/pict-rs.nix + ./services/web-apps/plantuml-server.nix + ./services/web-apps/plausible.nix + ./services/web-apps/powerdns-admin.nix + ./services/web-apps/prosody-filer.nix ./services/web-apps/restya-board.nix - ./services/web-apps/sogo.nix ./services/web-apps/rss-bridge.nix - ./services/web-apps/tt-rss.nix - ./services/web-apps/trilium.nix ./services/web-apps/selfoss.nix ./services/web-apps/shiori.nix ./services/web-apps/snipe-it.nix + ./services/web-apps/sogo.nix + ./services/web-apps/trilium.nix + ./services/web-apps/tt-rss.nix ./services/web-apps/vikunja.nix - ./services/web-apps/wiki-js.nix ./services/web-apps/whitebophir.nix + ./services/web-apps/wiki-js.nix ./services/web-apps/wordpress.nix ./services/web-apps/writefreely.nix ./services/web-apps/youtrack.nix @@ -1164,6 +1200,7 @@ ./services/web-servers/hitch/default.nix ./services/web-servers/hydron.nix ./services/web-servers/jboss/default.nix + ./services/web-servers/keter ./services/web-servers/lighttpd/cgit.nix ./services/web-servers/lighttpd/collectd.nix ./services/web-servers/lighttpd/default.nix @@ -1176,21 +1213,16 @@ ./services/web-servers/nginx/gitweb.nix ./services/web-servers/phpfpm/default.nix ./services/web-servers/pomerium.nix - ./services/web-servers/unit/default.nix ./services/web-servers/tomcat.nix - ./services/web-servers/keter ./services/web-servers/traefik.nix ./services/web-servers/trafficserver/default.nix ./services/web-servers/ttyd.nix + ./services/web-servers/unit/default.nix ./services/web-servers/uwsgi.nix ./services/web-servers/varnish/default.nix ./services/web-servers/zope2.nix - ./services/x11/extra-layouts.nix ./services/x11/clight.nix ./services/x11/colord.nix - ./services/x11/picom.nix - ./services/x11/unclutter.nix - ./services/x11/unclutter-xfixes.nix ./services/x11/desktop-managers/default.nix ./services/x11/display-managers/default.nix ./services/x11/display-managers/gdm.nix @@ -1200,24 +1232,30 @@ ./services/x11/display-managers/startx.nix ./services/x11/display-managers/sx.nix ./services/x11/display-managers/xpra.nix + ./services/x11/extra-layouts.nix ./services/x11/fractalart.nix + ./services/x11/gdk-pixbuf.nix + ./services/x11/hardware/cmt.nix + ./services/x11/hardware/digimend.nix ./services/x11/hardware/libinput.nix ./services/x11/hardware/synaptics.nix ./services/x11/hardware/wacom.nix - ./services/x11/hardware/digimend.nix - ./services/x11/hardware/cmt.nix - ./services/x11/gdk-pixbuf.nix ./services/x11/imwheel.nix + ./services/x11/picom.nix ./services/x11/redshift.nix ./services/x11/touchegg.nix + ./services/x11/unclutter-xfixes.nix + ./services/x11/unclutter.nix ./services/x11/urserver.nix ./services/x11/urxvtd.nix ./services/x11/window-managers/awesome.nix - ./services/x11/window-managers/default.nix + ./services/x11/window-managers/bspwm.nix ./services/x11/window-managers/clfswm.nix + ./services/x11/window-managers/default.nix ./services/x11/window-managers/fluxbox.nix ./services/x11/window-managers/icewm.nix ./services/x11/window-managers/bspwm.nix + ./services/x11/window-managers/katriawm.nix ./services/x11/window-managers/metacity.nix ./services/x11/window-managers/none.nix ./services/x11/window-managers/twm.nix @@ -1230,13 +1268,14 @@ ./services/x11/xserver.nix ./system/activation/activation-script.nix ./system/activation/specialisation.nix + ./system/activation/bootspec.nix ./system/activation/top-level.nix ./system/boot/binfmt.nix ./system/boot/emergency-mode.nix ./system/boot/grow-partition.nix ./system/boot/initrd-network.nix - ./system/boot/initrd-ssh.nix ./system/boot/initrd-openvpn.nix + ./system/boot/initrd-ssh.nix ./system/boot/kernel.nix ./system/boot/kexec.nix ./system/boot/loader/efi.nix @@ -1245,6 +1284,7 @@ ./system/boot/loader/grub/grub.nix ./system/boot/loader/grub/ipxe.nix ./system/boot/loader/grub/memtest.nix + ./system/boot/loader/external/external.nix ./system/boot/loader/init-script/init-script.nix ./system/boot/loader/loader.nix ./system/boot/loader/raspberrypi/raspberrypi.nix @@ -1268,6 +1308,8 @@ ./system/boot/systemd/shutdown.nix ./system/boot/systemd/tmpfiles.nix ./system/boot/systemd/user.nix + ./system/boot/systemd/userdbd.nix + ./system/boot/systemd/homed.nix ./system/boot/timesyncd.nix ./system/boot/tmp.nix ./system/boot/uvesafb.nix @@ -1282,6 +1324,7 @@ ./tasks/filesystems/btrfs.nix ./tasks/filesystems/cifs.nix ./tasks/filesystems/ecryptfs.nix + ./tasks/filesystems/envfs.nix ./tasks/filesystems/exfat.nix ./tasks/filesystems/ext.nix ./tasks/filesystems/f2fs.nix @@ -1295,47 +1338,48 @@ ./tasks/filesystems/xfs.nix ./tasks/filesystems/zfs.nix ./tasks/lvm.nix - ./tasks/network-interfaces.nix - ./tasks/network-interfaces-systemd.nix ./tasks/network-interfaces-scripted.nix + ./tasks/network-interfaces-systemd.nix + ./tasks/network-interfaces.nix + ./tasks/powertop.nix ./tasks/scsi-link-power-management.nix ./tasks/snapraid.nix ./tasks/stratis.nix ./tasks/swraid.nix ./tasks/trackpoint.nix - ./tasks/powertop.nix ./testing/service-runner.nix + ./virtualisation/amazon-options.nix ./virtualisation/anbox.nix ./virtualisation/appvm.nix ./virtualisation/build-vm.nix ./virtualisation/container-config.nix ./virtualisation/containerd.nix ./virtualisation/containers.nix - ./virtualisation/nixos-containers.nix - ./virtualisation/oci-containers.nix ./virtualisation/cri-o.nix - ./virtualisation/docker.nix ./virtualisation/docker-rootless.nix + ./virtualisation/docker.nix ./virtualisation/ecs-agent.nix + ./virtualisation/hyperv-guest.nix + ./virtualisation/kvmgt.nix ./virtualisation/libvirtd.nix ./virtualisation/lxc.nix ./virtualisation/lxcfs.nix ./virtualisation/lxd.nix - ./virtualisation/amazon-options.nix - ./virtualisation/hyperv-guest.nix - ./virtualisation/kvmgt.nix + ./virtualisation/nixos-containers.nix + ./virtualisation/oci-containers.nix ./virtualisation/openstack-options.nix ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/podman/default.nix ./virtualisation/qemu-guest-agent.nix + ./virtualisation/rosetta.nix ./virtualisation/spice-usb-redirection.nix ./virtualisation/virtualbox-guest.nix ./virtualisation/virtualbox-host.nix ./virtualisation/vmware-guest.nix ./virtualisation/vmware-host.nix ./virtualisation/waydroid.nix - ./virtualisation/xen-dom0.nix ./virtualisation/xe-guest-utilities.nix + ./virtualisation/xen-dom0.nix { documentation.nixos.extraModules = [ ./virtualisation/qemu-vm.nix ]; } ] diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 5fa64a6c52e9..4857ea4dbeae 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -31,7 +31,7 @@ in "pata_winbond" # SCSI support (incomplete). - "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" + "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" "hpsa" # USB support, especially for booting from USB CD-ROM # drives. diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index c415ca857437..518a1f8d0b30 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -20,7 +20,13 @@ pkgs.mkpasswd # for generating password files # Some text editors. - pkgs.vim + (pkgs.vim.customize { + name = "vim"; + vimrcConfig.packages.default = { + start = [ pkgs.vimPlugins.vim-nix ]; + }; + vimrcConfig.customRC = "syntax on"; + }) # Some networking tools. pkgs.fuse @@ -29,6 +35,7 @@ pkgs.rsync pkgs.socat pkgs.screen + pkgs.tcpdump # Hardware-related tools. pkgs.sdparm @@ -36,6 +43,7 @@ pkgs.smartmontools # for diagnosing hard disks pkgs.pciutils pkgs.usbutils + pkgs.nvme-cli # Tools to create / manipulate filesystems. pkgs.ntfsprogs # for resizing NTFS partitions diff --git a/nixos/modules/profiles/docker-container.nix b/nixos/modules/profiles/docker-container.nix index 183645de36fb..5365e49711dc 100644 --- a/nixos/modules/profiles/docker-container.nix +++ b/nixos/modules/profiles/docker-container.nix @@ -1,13 +1,12 @@ { config, lib, pkgs, ... }: -with lib; - -let inherit (pkgs) writeScript; in - let - pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l; + inherit (pkgs) writeScript; -in { + pkgs2storeContents = map (x: { object = x; symlink = "none"; }); +in + +{ # Docker image config. imports = [ ../installer/cd-dvd/channel.nix diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index ae9be08c8d85..980720691a43 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -20,6 +20,7 @@ with lib; ]; config = { + system.nixos.variant_id = lib.mkDefault "installer"; # Enable in installer, even if the minimal profile disables it. documentation.enable = mkImageMediaOverride true; @@ -71,7 +72,7 @@ with lib; # mounting the storage in a different system. services.openssh = { enable = true; - permitRootLogin = "yes"; + settings.PermitRootLogin = "yes"; }; # Enable wpa_supplicant, but don't start it by default. diff --git a/nixos/modules/profiles/keys/ssh_host_ed25519_key b/nixos/modules/profiles/keys/ssh_host_ed25519_key new file mode 100644 index 000000000000..b18489795369 --- /dev/null +++ b/nixos/modules/profiles/keys/ssh_host_ed25519_key @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACCQVnMW/wZWqrdWrjrRPhfEFFq1KLYguagSflLhFnVQmwAAAJASuMMnErjD +JwAAAAtzc2gtZWQyNTUxOQAAACCQVnMW/wZWqrdWrjrRPhfEFFq1KLYguagSflLhFnVQmw +AAAEDIN2VWFyggtoSPXcAFy8dtG1uAig8sCuyE21eMDt2GgJBWcxb/Blaqt1auOtE+F8QU +WrUotiC5qBJ+UuEWdVCbAAAACnJvb3RAbml4b3MBAgM= +-----END OPENSSH PRIVATE KEY----- diff --git a/nixos/modules/profiles/keys/ssh_host_ed25519_key.pub b/nixos/modules/profiles/keys/ssh_host_ed25519_key.pub new file mode 100644 index 000000000000..2c45826715fc --- /dev/null +++ b/nixos/modules/profiles/keys/ssh_host_ed25519_key.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJBWcxb/Blaqt1auOtE+F8QUWrUotiC5qBJ+UuEWdVCb root@nixos diff --git a/nixos/modules/profiles/macos-builder.nix b/nixos/modules/profiles/macos-builder.nix new file mode 100644 index 000000000000..4a5359582bce --- /dev/null +++ b/nixos/modules/profiles/macos-builder.nix @@ -0,0 +1,179 @@ +{ config, lib, pkgs, ... }: + +let + keysDirectory = "/var/keys"; + + user = "builder"; + + keyType = "ed25519"; + +in + +{ + imports = [ + ../virtualisation/qemu-vm.nix + + # Avoid a dependency on stateVersion + { + disabledModules = [ + ../virtualisation/nixos-containers.nix + ../services/x11/desktop-managers/xterm.nix + ]; + config = { }; + options.boot.isContainer = lib.mkOption { default = false; internal = true; }; + } + ]; + + # The builder is not intended to be used interactively + documentation.enable = false; + + environment.etc = { + "ssh/ssh_host_ed25519_key" = { + mode = "0600"; + + source = ./keys/ssh_host_ed25519_key; + }; + + "ssh/ssh_host_ed25519_key.pub" = { + mode = "0644"; + + source = ./keys/ssh_host_ed25519_key.pub; + }; + }; + + # DNS fails for QEMU user networking (SLiRP) on macOS. See: + # + # https://github.com/utmapp/UTM/issues/2353 + # + # This works around that by using a public DNS server other than the DNS + # server that QEMU provides (normally 10.0.2.3) + networking.nameservers = [ "8.8.8.8" ]; + + nix.settings = { + auto-optimise-store = true; + + min-free = 1024 * 1024 * 1024; + + max-free = 3 * 1024 * 1024 * 1024; + + trusted-users = [ "root" user ]; + }; + + services = { + getty.autologinUser = user; + + openssh = { + enable = true; + + authorizedKeysFiles = [ "${keysDirectory}/%u_${keyType}.pub" ]; + }; + }; + + system.build.macos-builder-installer = + let + privateKey = "/etc/nix/${user}_${keyType}"; + + publicKey = "${privateKey}.pub"; + + # This installCredentials script is written so that it's as easy as + # possible for a user to audit before confirming the `sudo` + installCredentials = hostPkgs.writeShellScript "install-credentials" '' + KEYS="''${1}" + INSTALL=${hostPkgs.coreutils}/bin/install + "''${INSTALL}" -g nixbld -m 600 "''${KEYS}/${user}_${keyType}" ${privateKey} + "''${INSTALL}" -g nixbld -m 644 "''${KEYS}/${user}_${keyType}.pub" ${publicKey} + ''; + + hostPkgs = config.virtualisation.host.pkgs; + + script = hostPkgs.writeShellScriptBin "create-builder" '' + KEYS="''${KEYS:-./keys}" + ${hostPkgs.coreutils}/bin/mkdir --parent "''${KEYS}" + PRIVATE_KEY="''${KEYS}/${user}_${keyType}" + PUBLIC_KEY="''${PRIVATE_KEY}.pub" + if [ ! -e "''${PRIVATE_KEY}" ] || [ ! -e "''${PUBLIC_KEY}" ]; then + ${hostPkgs.coreutils}/bin/rm --force -- "''${PRIVATE_KEY}" "''${PUBLIC_KEY}" + ${hostPkgs.openssh}/bin/ssh-keygen -q -f "''${PRIVATE_KEY}" -t ${keyType} -N "" -C 'builder@localhost' + fi + if ! ${hostPkgs.diffutils}/bin/cmp "''${PUBLIC_KEY}" ${publicKey}; then + (set -x; sudo --reset-timestamp ${installCredentials} "''${KEYS}") + fi + KEYS="$(nix-store --add "$KEYS")" ${config.system.build.vm}/bin/run-nixos-vm + ''; + + in + script.overrideAttrs (old: { + meta = (old.meta or { }) // { + platforms = lib.platforms.darwin; + }; + }); + + system = { + # To prevent gratuitous rebuilds on each change to Nixpkgs + nixos.revision = null; + + stateVersion = lib.mkDefault (throw '' + The macOS linux builder should not need a stateVersion to be set, but a module + has accessed stateVersion nonetheless. + Please inspect the trace of the following command to figure out which module + has a dependency on stateVersion. + + nix-instantiate --attr darwin.builder --show-trace + ''); + }; + + users.users."${user}" = { + isNormalUser = true; + }; + + security.polkit.enable = true; + + security.polkit.extraConfig = '' + polkit.addRule(function(action, subject) { + if (action.id === "org.freedesktop.login1.power-off" && subject.user === "${user}") { + return "yes"; + } else { + return "no"; + } + }) + ''; + + virtualisation = { + diskSize = 20 * 1024; + + memorySize = 3 * 1024; + + forwardPorts = [ + { from = "host"; guest.port = 22; host.port = 22; } + ]; + + # Disable graphics for the builder since users will likely want to run it + # non-interactively in the background. + graphics = false; + + sharedDirectories.keys = { + source = "\"$KEYS\""; + target = keysDirectory; + }; + + # If we don't enable this option then the host will fail to delegate builds + # to the guest, because: + # + # - The host will lock the path to build + # - The host will delegate the build to the guest + # - The guest will attempt to lock the same path and fail because + # the lockfile on the host is visible on the guest + # + # Snapshotting the host's /nix/store as an image isolates the guest VM's + # /nix/store from the host's /nix/store, preventing this problem. + useNixStoreImage = true; + + # Obviously the /nix/store needs to be writable on the guest in order for it + # to perform builds. + writableStore = true; + + # This ensures that anything built on the guest isn't lost when the guest is + # restarted. + writableStoreUseTmpfs = false; + }; +} diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index 0125017dfee8..bd1b2b452189 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -10,10 +10,20 @@ with lib; documentation.enable = mkDefault false; + documentation.doc.enable = mkDefault false; + + documentation.info.enable = mkDefault false; + + documentation.man.enable = mkDefault false; + documentation.nixos.enable = mkDefault false; programs.command-not-found.enable = mkDefault false; + services.logrotate.enable = mkDefault false; + + services.udisks2.enable = mkDefault false; + xdg.autostart.enable = mkDefault false; xdg.icons.enable = mkDefault false; xdg.mime.enable = mkDefault false; diff --git a/nixos/modules/programs/_1password-gui.nix b/nixos/modules/programs/_1password-gui.nix index 83ef6037fb5a..27c0d34a2eed 100644 --- a/nixos/modules/programs/_1password-gui.nix +++ b/nixos/modules/programs/_1password-gui.nix @@ -27,7 +27,7 @@ in ''; }; - package = mkPackageOption pkgs "1Password GUI" { + package = mkPackageOptionMD pkgs "1Password GUI" { default = [ "_1password-gui" ]; }; }; diff --git a/nixos/modules/programs/_1password.nix b/nixos/modules/programs/_1password.nix index 91246150755d..8537484c7e67 100644 --- a/nixos/modules/programs/_1password.nix +++ b/nixos/modules/programs/_1password.nix @@ -18,7 +18,7 @@ in programs._1password = { enable = mkEnableOption (lib.mdDoc "the 1Password CLI tool"); - package = mkPackageOption pkgs "1Password CLI" { + package = mkPackageOptionMD pkgs "1Password CLI" { default = [ "_1password" ]; }; }; diff --git a/nixos/modules/programs/bash/blesh.nix b/nixos/modules/programs/bash/blesh.nix new file mode 100644 index 000000000000..8fa51bef7744 --- /dev/null +++ b/nixos/modules/programs/bash/blesh.nix @@ -0,0 +1,16 @@ +{ lib, config, pkgs, ... }: +with lib; +let + cfg = config.programs.bash.blesh; +in { + options = { + programs.bash.blesh.enable = mkEnableOption (mdDoc "blesh"); + }; + + config = mkIf cfg.enable { + programs.bash.interactiveShellInit = mkBefore '' + source ${pkgs.blesh}/share/blesh/ble.sh + ''; + }; + meta.maintainers = with maintainers; [ laalsaas ]; +} diff --git a/nixos/modules/programs/digitalbitbox/default.md b/nixos/modules/programs/digitalbitbox/default.md new file mode 100644 index 000000000000..9bca14e97ffe --- /dev/null +++ b/nixos/modules/programs/digitalbitbox/default.md @@ -0,0 +1,47 @@ +# Digital Bitbox {#module-programs-digitalbitbox} + +Digital Bitbox is a hardware wallet and second-factor authenticator. + +The `digitalbitbox` programs module may be installed by setting +`programs.digitalbitbox` to `true` in a manner similar to +``` +programs.digitalbitbox.enable = true; +``` +and bundles the `digitalbitbox` package (see [](#sec-digitalbitbox-package)), +which contains the `dbb-app` and `dbb-cli` binaries, along with the hardware +module (see [](#sec-digitalbitbox-hardware-module)) which sets up the necessary +udev rules to access the device. + +Enabling the digitalbitbox module is pretty much the easiest way to get a +Digital Bitbox device working on your system. + +For more information, see . + +## Package {#sec-digitalbitbox-package} + +The binaries, `dbb-app` (a GUI tool) and `dbb-cli` (a CLI tool), are available +through the `digitalbitbox` package which could be installed as follows: +``` +environment.systemPackages = [ + pkgs.digitalbitbox +]; +``` + +## Hardware {#sec-digitalbitbox-hardware-module} + +The digitalbitbox hardware package enables the udev rules for Digital Bitbox +devices and may be installed as follows: +``` +hardware.digitalbitbox.enable = true; +``` + +In order to alter the udev rules, one may provide different values for the +`udevRule51` and `udevRule52` attributes by means of overriding as follows: +``` +programs.digitalbitbox = { + enable = true; + package = pkgs.digitalbitbox.override { + udevRule51 = "something else"; + }; +}; +``` diff --git a/nixos/modules/programs/digitalbitbox/default.nix b/nixos/modules/programs/digitalbitbox/default.nix index 101ee8ddbafc..5ee6cdafe63a 100644 --- a/nixos/modules/programs/digitalbitbox/default.nix +++ b/nixos/modules/programs/digitalbitbox/default.nix @@ -33,7 +33,7 @@ in }; meta = { - doc = ./doc.xml; + doc = ./default.md; maintainers = with lib.maintainers; [ vidbina ]; }; } diff --git a/nixos/modules/programs/digitalbitbox/doc.xml b/nixos/modules/programs/digitalbitbox/doc.xml deleted file mode 100644 index c63201628dbd..000000000000 --- a/nixos/modules/programs/digitalbitbox/doc.xml +++ /dev/null @@ -1,74 +0,0 @@ - - Digital Bitbox - - Digital Bitbox is a hardware wallet and second-factor authenticator. - - - The digitalbitbox programs module may be installed by - setting programs.digitalbitbox to true - in a manner similar to - - = true; - - and bundles the digitalbitbox package (see - ), which contains the - dbb-app and dbb-cli binaries, along - with the hardware module (see - ) which sets up the - necessary udev rules to access the device. - - - Enabling the digitalbitbox module is pretty much the easiest way to get a - Digital Bitbox device working on your system. - - - For more information, see - . - -
- Package - - - The binaries, dbb-app (a GUI tool) and - dbb-cli (a CLI tool), are available through the - digitalbitbox package which could be installed as - follows: - - = [ - pkgs.digitalbitbox -]; - - -
-
- Hardware - - - The digitalbitbox hardware package enables the udev rules for Digital Bitbox - devices and may be installed as follows: - - = true; - - - - - In order to alter the udev rules, one may provide different values for the - udevRule51 and udevRule52 attributes - by means of overriding as follows: - -programs.digitalbitbox = { - enable = true; - package = pkgs.digitalbitbox.override { - udevRule51 = "something else"; - }; -}; - - -
-
diff --git a/nixos/modules/programs/firefox.nix b/nixos/modules/programs/firefox.nix index 76e6c1a553f3..3a5105c57d76 100644 --- a/nixos/modules/programs/firefox.nix +++ b/nixos/modules/programs/firefox.nix @@ -5,6 +5,8 @@ with lib; let cfg = config.programs.firefox; + nmh = cfg.nativeMessagingHosts; + policyFormat = pkgs.formats.json { }; organisationInfo = '' @@ -15,15 +17,15 @@ let given control of your browser, unless of course they also control your NixOS configuration. ''; - -in { +in +{ options.programs.firefox = { enable = mkEnableOption (mdDoc "the Firefox web browser"); package = mkOption { - description = mdDoc "Firefox package to use."; type = types.package; default = pkgs.firefox; + description = mdDoc "Firefox package to use."; defaultText = literalExpression "pkgs.firefox"; relatedPackages = [ "firefox" @@ -31,16 +33,16 @@ in { "firefox-bin" "firefox-devedition-bin" "firefox-esr" - "firefox-esr-wayland" - "firefox-wayland" ]; }; policies = mkOption { + type = policyFormat.type; + default = { }; description = mdDoc '' Group policies to install. - See [Mozilla's documentation](https://github.com/mozilla/policy-templates/blob/master/README.md") + See [Mozilla's documentation](https://github.com/mozilla/policy-templates/blob/master/README.md) for a list of available options. This can be used to install extensions declaratively! Check out the @@ -48,43 +50,214 @@ in { ${organisationInfo} ''; - type = policyFormat.type; - default = {}; }; preferences = mkOption { + type = with types; attrsOf (oneOf [ bool int string ]); + default = { }; description = mdDoc '' - Preferences to set from `about://config`. + Preferences to set from `about:config`. Some of these might be able to be configured more ergonomically using policies. ${organisationInfo} ''; - type = with types; attrsOf (oneOf [ bool int string ]); - default = {}; + }; + + preferencesStatus = mkOption { + type = types.enum [ "default" "locked" "user" "clear" ]; + default = "locked"; + description = mdDoc '' + The status of `firefox.preferences`. + + `status` can assume the following values: + - `"default"`: Preferences appear as default. + - `"locked"`: Preferences appear as default and can't be changed. + - `"user"`: Preferences appear as changed. + - `"clear"`: Value has no effect. Resets to factory defaults on each startup. + ''; + }; + + languagePacks = mkOption { + # Available languages can be found in https://releases.mozilla.org/pub/firefox/releases/${cfg.package.version}/linux-x86_64/xpi/ + type = types.listOf (types.enum ([ + "ach" + "af" + "an" + "ar" + "ast" + "az" + "be" + "bg" + "bn" + "br" + "bs" + "ca-valencia" + "ca" + "cak" + "cs" + "cy" + "da" + "de" + "dsb" + "el" + "en-CA" + "en-GB" + "en-US" + "eo" + "es-AR" + "es-CL" + "es-ES" + "es-MX" + "et" + "eu" + "fa" + "ff" + "fi" + "fr" + "fy-NL" + "ga-IE" + "gd" + "gl" + "gn" + "gu-IN" + "he" + "hi-IN" + "hr" + "hsb" + "hu" + "hy-AM" + "ia" + "id" + "is" + "it" + "ja" + "ka" + "kab" + "kk" + "km" + "kn" + "ko" + "lij" + "lt" + "lv" + "mk" + "mr" + "ms" + "my" + "nb-NO" + "ne-NP" + "nl" + "nn-NO" + "oc" + "pa-IN" + "pl" + "pt-BR" + "pt-PT" + "rm" + "ro" + "ru" + "sco" + "si" + "sk" + "sl" + "son" + "sq" + "sr" + "sv-SE" + "szl" + "ta" + "te" + "th" + "tl" + "tr" + "trs" + "uk" + "ur" + "uz" + "vi" + "xh" + "zh-CN" + "zh-TW" + ])); + default = [ ]; + description = mdDoc '' + The language packs to install. + ''; + }; + + autoConfig = mkOption { + type = types.lines; + default = ""; + description = mdDoc '' + AutoConfig files can be used to set and lock preferences that are not covered + by the policies.json for Mac and Linux. This method can be used to automatically + change user preferences or prevent the end user from modifiying specific + preferences by locking them. More info can be found in https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig. + ''; + }; + + nativeMessagingHosts = mapAttrs (_: v: mkEnableOption (mdDoc v)) { + browserpass = "Browserpass support"; + bukubrow = "Bukubrow support"; + ff2mpv = "ff2mpv support"; + fxCast = "fx_cast support"; + gsconnect = "GSConnect support"; + jabref = "JabRef support"; + passff = "PassFF support"; + tridactyl = "Tridactyl support"; + ugetIntegrator = "Uget Integrator support"; }; }; config = mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; + environment.systemPackages = [ + (cfg.package.override { + extraPrefs = cfg.autoConfig; + extraNativeMessagingHosts = with pkgs; optionals nmh.ff2mpv [ + ff2mpv + ] ++ optionals nmh.gsconnect [ + gnomeExtensions.gsconnect + ] ++ optionals nmh.jabref [ + jabref + ] ++ optionals nmh.passff [ + passff-host + ]; + }) + ]; - environment.etc."firefox/policies/policies.json".source = - let policiesJSON = - policyFormat.generate - "firefox-policies.json" - { inherit (cfg) policies; }; - in mkIf (cfg.policies != {}) "${policiesJSON}"; + nixpkgs.config.firefox = { + enableBrowserpass = nmh.browserpass; + enableBukubrow = nmh.bukubrow; + enableTridactylNative = nmh.tridactyl; + enableUgetIntegrator = nmh.ugetIntegrator; + enableFXCastBridge = nmh.fxCast; + }; + + environment.etc = + let + policiesJSON = policyFormat.generate "firefox-policies.json" { inherit (cfg) policies; }; + in + mkIf (cfg.policies != { }) { + "firefox/policies/policies.json".source = "${policiesJSON}"; + }; # Preferences are converted into a policy - programs.firefox.policies = - mkIf (cfg.preferences != {}) - { - Preferences = (mapAttrs (name: value: { - Value = value; - Status = "locked"; - }) cfg.preferences); - }; + programs.firefox.policies = { + Preferences = (mapAttrs + (_: value: { Value = value; Status = cfg.preferencesStatus; }) + cfg.preferences); + ExtensionSettings = listToAttrs (map + (lang: nameValuePair + "langpack-${lang}@firefox.mozilla.org" + { + installation_mode = "normal_installed"; + install_url = "https://releases.mozilla.org/pub/firefox/releases/${cfg.package.version}/linux-x86_64/xpi/${lang}.xpi"; + } + ) + cfg.languagePacks); + }; }; meta.maintainers = with maintainers; [ danth ]; diff --git a/nixos/modules/programs/firejail.nix b/nixos/modules/programs/firejail.nix index a98c15a04517..6f79c13d94b4 100644 --- a/nixos/modules/programs/firejail.nix +++ b/nixos/modules/programs/firejail.nix @@ -8,18 +8,21 @@ let wrappedBins = pkgs.runCommand "firejail-wrapped-binaries" { preferLocalBuild = true; allowSubstitutes = false; + # take precedence over non-firejailed versions + meta.priority = -1; } '' mkdir -p $out/bin + mkdir -p $out/share/applications ${lib.concatStringsSep "\n" (lib.mapAttrsToList (command: value: let opts = if builtins.isAttrs value then value - else { executable = value; profile = null; extraArgs = []; }; + else { executable = value; desktop = null; profile = null; extraArgs = []; }; args = lib.escapeShellArgs ( opts.extraArgs ++ (optional (opts.profile != null) "--profile=${toString opts.profile}") - ); + ); in '' cat <<_EOF >$out/bin/${command} @@ -27,6 +30,11 @@ let exec /run/wrappers/bin/firejail ${args} -- ${toString opts.executable} "\$@" _EOF chmod 0755 $out/bin/${command} + + ${lib.optionalString (opts.desktop != null) '' + substitute ${opts.desktop} $out/share/applications/$(basename ${opts.desktop}) \ + --replace ${opts.executable} $out/bin/${command} + ''} '') cfg.wrappedBinaries)} ''; @@ -42,6 +50,12 @@ in { description = lib.mdDoc "Executable to run sandboxed"; example = literalExpression ''"''${lib.getBin pkgs.firefox}/bin/firefox"''; }; + desktop = mkOption { + type = types.nullOr types.path; + default = null; + description = lib.mkDoc ".desktop file to modify. Only necessary if it uses the absolute path to the executable."; + example = literalExpression ''"''${pkgs.firefox}/share/applications/firefox.desktop"''; + }; profile = mkOption { type = types.nullOr types.path; default = null; @@ -71,12 +85,6 @@ in { ''; description = lib.mdDoc '' Wrap the binaries in firejail and place them in the global path. - - You will get file collisions if you put the actual application binary in - the global environment (such as by adding the application package to - `environment.systemPackages`), and applications started via - .desktop files are not wrapped if they specify the absolute path to the - binary. ''; }; }; diff --git a/nixos/modules/programs/flashrom.nix b/nixos/modules/programs/flashrom.nix index 5f0de5a40234..294b208a3720 100644 --- a/nixos/modules/programs/flashrom.nix +++ b/nixos/modules/programs/flashrom.nix @@ -16,11 +16,12 @@ in group. ''; }; + package = mkPackageOptionMD pkgs "flashrom" { }; }; config = mkIf cfg.enable { - services.udev.packages = [ pkgs.flashrom ]; - environment.systemPackages = [ pkgs.flashrom ]; + services.udev.packages = [ cfg.package ]; + environment.systemPackages = [ cfg.package ]; users.groups.flashrom = { }; }; } diff --git a/nixos/modules/programs/fzf.nix b/nixos/modules/programs/fzf.nix new file mode 100644 index 000000000000..eda4eacde4ac --- /dev/null +++ b/nixos/modules/programs/fzf.nix @@ -0,0 +1,27 @@ +{pkgs, config, lib, ...}: +with lib; +let + cfg = config.programs.fzf; +in { + options = { + programs.fzf = { + fuzzyCompletion = mkEnableOption (mdDoc "fuzzy completion with fzf"); + keybindings = mkEnableOption (mdDoc "fzf keybindings"); + }; + }; + config = { + environment.systemPackages = optional (cfg.keybindings || cfg.fuzzyCompletion) pkgs.fzf; + programs.bash.interactiveShellInit = optionalString cfg.fuzzyCompletion '' + source ${pkgs.fzf}/share/fzf/completion.bash + '' + optionalString cfg.keybindings '' + source ${pkgs.fzf}/share/fzf/key-bindings.bash + ''; + + programs.zsh.interactiveShellInit = optionalString cfg.fuzzyCompletion '' + source ${pkgs.fzf}/share/fzf/completion.zsh + '' + optionalString cfg.keybindings '' + source ${pkgs.fzf}/share/fzf/key-bindings.zsh + ''; + }; + meta.maintainers = with maintainers; [ laalsaas ]; +} diff --git a/nixos/modules/programs/git.nix b/nixos/modules/programs/git.nix index acff5dfdd888..4e271a8c134b 100644 --- a/nixos/modules/programs/git.nix +++ b/nixos/modules/programs/git.nix @@ -20,15 +20,41 @@ in }; config = mkOption { - type = with types; attrsOf (attrsOf anything); - default = { }; + type = + with types; + let + gitini = attrsOf (attrsOf anything); + in + either gitini (listOf gitini) // { + merge = loc: defs: + let + config = foldl' + (acc: { value, ... }@x: acc // (if isList value then { + ordered = acc.ordered ++ value; + } else { + unordered = acc.unordered ++ [ x ]; + })) + { + ordered = [ ]; + unordered = [ ]; + } + defs; + in + [ (gitini.merge loc config.unordered) ] ++ config.ordered; + }; + default = [ ]; example = { init.defaultBranch = "main"; url."https://github.com/".insteadOf = [ "gh:" "github:" ]; }; description = lib.mdDoc '' - Configuration to write to /etc/gitconfig. See the CONFIGURATION FILE - section of git-config(1) for more information. + Configuration to write to /etc/gitconfig. A list can also be + specified to keep the configuration in order. For example, setting + `config` to `[ { foo.x = 42; } { bar.y = 42; }]` will put the `foo` + section before the `bar` section unlike the default alphabetical + order, which can be helpful for sections such as `include` and + `includeIf`. See the CONFIGURATION FILE section of git-config(1) for + more information. ''; }; @@ -48,8 +74,8 @@ in config = mkMerge [ (mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - environment.etc.gitconfig = mkIf (cfg.config != {}) { - text = generators.toGitINI cfg.config; + environment.etc.gitconfig = mkIf (cfg.config != [ ]) { + text = concatMapStringsSep "\n" generators.toGitINI cfg.config; }; }) (mkIf (cfg.enable && cfg.lfs.enable) { diff --git a/nixos/modules/programs/gnome-documents.nix b/nixos/modules/programs/gnome-documents.nix deleted file mode 100644 index 2831ac9aff2e..000000000000 --- a/nixos/modules/programs/gnome-documents.nix +++ /dev/null @@ -1,54 +0,0 @@ -# GNOME Documents. - -{ config, pkgs, lib, ... }: - -with lib; - -{ - - meta = { - maintainers = teams.gnome.members; - }; - - # Added 2019-08-09 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome" "gnome-documents" "enable" ] - [ "programs" "gnome-documents" "enable" ]) - ]; - - ###### interface - - options = { - - programs.gnome-documents = { - - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to enable GNOME Documents, a document - manager application for GNOME. - ''; - }; - - }; - - }; - - - ###### implementation - - config = mkIf config.programs.gnome-documents.enable { - - environment.systemPackages = [ pkgs.gnome.gnome-documents ]; - - services.dbus.packages = [ pkgs.gnome.gnome-documents ]; - - services.gnome.gnome-online-accounts.enable = true; - - services.gnome.gnome-online-miners.enable = true; - - }; - -} diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index 828f24f99111..cb8d0ecff4cb 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -135,7 +135,7 @@ in # The SSH agent protocol doesn't have support for changing TTYs; however we # can simulate this with the `exec` feature of openssh (see ssh_config(5)) # that hooks a command to the shell currently running the ssh program. - Match host * exec "${cfg.package}/bin/gpg-connect-agent --quiet updatestartuptty /bye >/dev/null 2>&1" + Match host * exec "${pkgs.runtimeShell} -c '${cfg.package}/bin/gpg-connect-agent --quiet updatestartuptty /bye >/dev/null 2>&1'" ''; environment.extraInit = mkIf cfg.agent.enableSSHSupport '' diff --git a/nixos/modules/programs/htop.nix b/nixos/modules/programs/htop.nix index 521287f9352d..2682ced490ca 100644 --- a/nixos/modules/programs/htop.nix +++ b/nixos/modules/programs/htop.nix @@ -20,7 +20,7 @@ in package = mkOption { type = types.package; default = pkgs.htop; - defaultText = "pkgs.htop"; + defaultText = lib.literalExpression "pkgs.htop"; description = lib.mdDoc '' The htop package that should be used. ''; diff --git a/nixos/modules/programs/i3lock.nix b/nixos/modules/programs/i3lock.nix new file mode 100644 index 000000000000..466ae59c9277 --- /dev/null +++ b/nixos/modules/programs/i3lock.nix @@ -0,0 +1,58 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.programs.i3lock; + +in { + + ###### interface + + options = { + programs.i3lock = { + enable = mkEnableOption (mdDoc "i3lock"); + package = mkOption { + type = types.package; + default = pkgs.i3lock; + defaultText = literalExpression "pkgs.i3lock"; + example = literalExpression '' + pkgs.i3lock-color + ''; + description = mdDoc '' + Specify which package to use for the i3lock program, + The i3lock package must include a i3lock file or link in its out directory in order for the u2fSupport option to work correctly. + ''; + }; + u2fSupport = mkOption { + type = types.bool; + default = false; + example = true; + description = mdDoc '' + Whether to enable U2F support in the i3lock program. + U2F enables authentication using a hardware device, such as a security key. + When U2F support is enabled, the i3lock program will set the setuid bit on the i3lock binary and enable the pam u2fAuth service, + ''; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ cfg.package ]; + + security.wrappers.i3lock = mkIf cfg.u2fSupport { + setuid = true; + owner = "root"; + group = "root"; + source = "${cfg.package.out}/bin/i3lock"; + }; + + security.pam.services.i3lock.u2fAuth = cfg.u2fSupport; + + }; + +} diff --git a/nixos/modules/programs/iay.nix b/nixos/modules/programs/iay.nix new file mode 100644 index 000000000000..9164f5cb6486 --- /dev/null +++ b/nixos/modules/programs/iay.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.programs.iay; + inherit (lib) mkEnableOption mkIf mkOption mkPackageOptionMD optionalString types; +in { + options.programs.iay = { + enable = mkEnableOption (lib.mdDoc "iay"); + package = mkPackageOptionMD pkgs "iay" {}; + + minimalPrompt = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Use minimal one-liner prompt."; + }; + }; + + config = mkIf cfg.enable { + programs.bash.promptInit = '' + if [[ $TERM != "dumb" && (-z $INSIDE_EMACS || $INSIDE_EMACS == "vterm") ]]; then + PS1='$(iay ${optionalString cfg.minimalPrompt "-m"})' + fi + ''; + + programs.zsh.promptInit = '' + if [[ $TERM != "dumb" && (-z $INSIDE_EMACS || $INSIDE_EMACS == "vterm") ]]; then + autoload -Uz add-zsh-hook + _iay_prompt() { + PROMPT="$(iay -z ${optionalString cfg.minimalPrompt "-m"})" + } + add-zsh-hook precmd _iay_prompt + fi + ''; + }; + + meta.maintainers = pkgs.iay.meta.maintainers; +} diff --git a/nixos/modules/programs/miriway.nix b/nixos/modules/programs/miriway.nix new file mode 100644 index 000000000000..52b5f8476222 --- /dev/null +++ b/nixos/modules/programs/miriway.nix @@ -0,0 +1,60 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.programs.miriway; +in { + options.programs.miriway = { + enable = lib.mkEnableOption (lib.mdDoc '' + Miriway, a Mir based Wayland compositor. You can manually launch Miriway by + executing "exec miriway" on a TTY, or launch it from a display manager. Copy + /etc/xdg/xdg-miriway/miriway-shell.config to ~/.config/miriway-shell.config + to modify the default configuration. See , + and "miriway --help" for more information''); + + config = lib.mkOption { + type = lib.types.lines; + default = '' + x11-window-title=Miriway (Mir-on-X) + idle-timeout=600 + ctrl-alt=t:miriway-terminal # Default "terminal emulator finder" + + shell-component=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY + ''; + example = '' + idle-timeout=300 + ctrl-alt=t:weston-terminal + add-wayland-extensions=all + + shell-components=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY + + shell-component=waybar + shell-component=wbg Pictures/wallpaper + + shell-meta=a:synapse + ''; + description = lib.mdDoc '' + Miriway's config. This will be installed system-wide. + The default will install the miriway package's barebones example config. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + environment = { + systemPackages = [ pkgs.miriway ]; + etc = { + "xdg/xdg-miriway/miriway-shell.config".text = cfg.config; + }; + }; + + hardware.opengl.enable = lib.mkDefault true; + fonts.enableDefaultFonts = lib.mkDefault true; + programs.dconf.enable = lib.mkDefault true; + programs.xwayland.enable = lib.mkDefault true; + + # To make the Miriway session available if a display manager like SDDM is enabled: + services.xserver.displayManager.sessionPackages = [ pkgs.miriway ]; + }; + + meta.maintainers = with lib.maintainers; [ OPNA2608 ]; +} diff --git a/nixos/modules/programs/neovim.nix b/nixos/modules/programs/neovim.nix index 8de527fceb26..4562e5a2c29b 100644 --- a/nixos/modules/programs/neovim.nix +++ b/nixos/modules/programs/neovim.nix @@ -7,7 +7,7 @@ let runtime' = filter (f: f.enable) (attrValues cfg.runtime); - runtime = pkgs.linkFarm "neovim-runtime" (map (x: { name = x.target; path = x.source; }) runtime'); + runtime = pkgs.linkFarm "neovim-runtime" (map (x: { name = "etc/${x.target}"; path = x.source; }) runtime'); in { options.programs.neovim = { diff --git a/nixos/modules/programs/nix-index.nix b/nixos/modules/programs/nix-index.nix new file mode 100644 index 000000000000..a494b9d8c2c9 --- /dev/null +++ b/nixos/modules/programs/nix-index.nix @@ -0,0 +1,62 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.programs.nix-index; +in { + options.programs.nix-index = with lib; { + enable = mkEnableOption (lib.mdDoc "nix-index, a file database for nixpkgs"); + + package = mkOption { + type = types.package; + default = pkgs.nix-index; + defaultText = literalExpression "pkgs.nix-index"; + description = lib.mdDoc "Package providing the `nix-index` tool."; + }; + + enableBashIntegration = mkEnableOption (lib.mdDoc "Bash integration") // { + default = true; + }; + + enableZshIntegration = mkEnableOption (lib.mdDoc "Zsh integration") // { + default = true; + }; + + enableFishIntegration = mkEnableOption (lib.mdDoc "Fish integration") // { + default = true; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = let + checkOpt = name: { + assertion = cfg.${name} -> !config.programs.command-not-found.enable; + message = '' + The 'programs.command-not-found.enable' option is mutually exclusive + with the 'programs.nix-index.${name}' option. + ''; + }; + in [ (checkOpt "enableBashIntegration") (checkOpt "enableZshIntegration") ]; + + environment.systemPackages = [ cfg.package ]; + + programs.bash.interactiveShellInit = lib.mkIf cfg.enableBashIntegration '' + source ${cfg.package}/etc/profile.d/command-not-found.sh + ''; + + programs.zsh.interactiveShellInit = lib.mkIf cfg.enableZshIntegration '' + source ${cfg.package}/etc/profile.d/command-not-found.sh + ''; + + # See https://github.com/bennofs/nix-index/issues/126 + programs.fish.interactiveShellInit = let + wrapper = pkgs.writeScript "command-not-found" '' + #!${pkgs.bash}/bin/bash + source ${cfg.package}/etc/profile.d/command-not-found.sh + command_not_found_handle "$@" + ''; + in lib.mkIf cfg.enableFishIntegration '' + function __fish_command_not_found_handler --on-event fish_command_not_found + ${wrapper} $argv + end + ''; + }; +} diff --git a/nixos/modules/programs/nix-ld.nix b/nixos/modules/programs/nix-ld.nix index 602278d1ba9b..9a12b4ca5c74 100644 --- a/nixos/modules/programs/nix-ld.nix +++ b/nixos/modules/programs/nix-ld.nix @@ -1,10 +1,67 @@ { pkgs, lib, config, ... }: +let + cfg = config.programs.nix-ld; + + # TODO make glibc here configureable? + nix-ld-so = pkgs.runCommand "ld.so" {} '' + ln -s "$(cat '${pkgs.stdenv.cc}/nix-support/dynamic-linker')" $out + ''; + + nix-ld-libraries = pkgs.buildEnv { + name = "lb-library-path"; + pathsToLink = [ "/lib" ]; + paths = map lib.getLib cfg.libraries; + extraPrefix = "/share/nix-ld"; + ignoreCollisions = true; + }; + + # We currently take all libraries from systemd and nix as the default. + # Is there a better list? + baseLibraries = with pkgs; [ + zlib + zstd + stdenv.cc.cc + curl + openssl + attr + libssh + bzip2 + libxml2 + acl + libsodium + util-linux + xz + systemd + ]; +in { meta.maintainers = [ lib.maintainers.mic92 ]; - options = { - programs.nix-ld.enable = lib.mkEnableOption (lib.mdDoc ''nix-ld, Documentation: ''); + options.programs.nix-ld = { + enable = lib.mkEnableOption (lib.mdDoc ''nix-ld, Documentation: ''); + package = lib.mkOption { + type = lib.types.package; + description = lib.mdDoc "Which package to use for the nix-ld."; + default = pkgs.nix-ld; + defaultText = lib.literalExpression "pkgs.nix-ld"; + }; + libraries = lib.mkOption { + type = lib.types.listOf lib.types.package; + description = lib.mdDoc "Libraries that automatically become available to all programs. The default set includes common libraries."; + default = baseLibraries; + defaultText = lib.literalExpression "baseLibraries derived from systemd and nix dependencies."; + }; }; + config = lib.mkIf config.programs.nix-ld.enable { - systemd.tmpfiles.packages = [ pkgs.nix-ld ]; + systemd.tmpfiles.packages = [ cfg.package ]; + + environment.systemPackages = [ nix-ld-libraries ]; + + environment.pathsToLink = [ "/share/nix-ld" ]; + + environment.variables = { + NIX_LD = toString nix-ld-so; + NIX_LD_LIBRARY_PATH = "/run/current-system/sw/share/nix-ld/lib"; + }; }; } diff --git a/nixos/modules/programs/plotinus.md b/nixos/modules/programs/plotinus.md new file mode 100644 index 000000000000..fac3bbad1e08 --- /dev/null +++ b/nixos/modules/programs/plotinus.md @@ -0,0 +1,17 @@ +# Plotinus {#module-program-plotinus} + +*Source:* {file}`modules/programs/plotinus.nix` + +*Upstream documentation:* + +Plotinus is a searchable command palette in every modern GTK application. + +When in a GTK 3 application and Plotinus is enabled, you can press +`Ctrl+Shift+P` to open the command palette. The command +palette provides a searchable list of of all menu items in the application. + +To enable Plotinus, add the following to your +{file}`configuration.nix`: +``` +programs.plotinus.enable = true; +``` diff --git a/nixos/modules/programs/plotinus.nix b/nixos/modules/programs/plotinus.nix index a011bb862aea..c2b6884d6490 100644 --- a/nixos/modules/programs/plotinus.nix +++ b/nixos/modules/programs/plotinus.nix @@ -8,7 +8,7 @@ in { meta = { maintainers = pkgs.plotinus.meta.maintainers; - doc = ./plotinus.xml; + doc = ./plotinus.md; }; ###### interface diff --git a/nixos/modules/programs/plotinus.xml b/nixos/modules/programs/plotinus.xml deleted file mode 100644 index 8fc8c22c6d76..000000000000 --- a/nixos/modules/programs/plotinus.xml +++ /dev/null @@ -1,30 +0,0 @@ - - Plotinus - - Source: - modules/programs/plotinus.nix - - - Upstream documentation: - - - - Plotinus is a searchable command palette in every modern GTK application. - - - When in a GTK 3 application and Plotinus is enabled, you can press - Ctrl+Shift+P to open the command palette. The command - palette provides a searchable list of of all menu items in the application. - - - To enable Plotinus, add the following to your - configuration.nix: - - = true; - - - diff --git a/nixos/modules/programs/qdmr.nix b/nixos/modules/programs/qdmr.nix new file mode 100644 index 000000000000..c0b1984eff91 --- /dev/null +++ b/nixos/modules/programs/qdmr.nix @@ -0,0 +1,25 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.programs.qdmr; +in { + meta.maintainers = [ lib.maintainers.janik ]; + + options = { + programs.qdmr = { + enable = lib.mkEnableOption (lib.mdDoc "QDMR - a GUI application and command line tool for programming DMR radios"); + package = lib.mkPackageOptionMD pkgs "qdmr" { }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + users.groups.wireshark = {}; + }; +} diff --git a/nixos/modules/programs/rog-control-center.nix b/nixos/modules/programs/rog-control-center.nix new file mode 100644 index 000000000000..4aef5143ac7f --- /dev/null +++ b/nixos/modules/programs/rog-control-center.nix @@ -0,0 +1,29 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.programs.rog-control-center; +in +{ + options = { + programs.rog-control-center = { + enable = lib.mkEnableOption (lib.mdDoc "the rog-control-center application"); + + autoStart = lib.mkOption { + default = false; + type = lib.types.bool; + description = lib.mdDoc "Whether rog-control-center should be started automatically."; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ + pkgs.asusctl + (lib.mkIf cfg.autoStart (pkgs.makeAutostartItem { name = "rog-control-center"; package = pkgs.asusctl; })) + ]; + + services.asusd.enable = true; + }; + + meta.maintainers = pkgs.asusctl.meta.maintainers; +} diff --git a/nixos/modules/programs/skim.nix b/nixos/modules/programs/skim.nix new file mode 100644 index 000000000000..8dadf322606e --- /dev/null +++ b/nixos/modules/programs/skim.nix @@ -0,0 +1,34 @@ +{ pkgs, config, lib, ... }: +let + inherit (lib) mdDoc mkEnableOption mkPackageOptionMD optional optionalString; + cfg = config.programs.skim; +in +{ + options = { + programs.skim = { + fuzzyCompletion = mkEnableOption (mdDoc "fuzzy completion with skim"); + keybindings = mkEnableOption (mdDoc "skim keybindings"); + package = mkPackageOptionMD pkgs "skim" {}; + }; + }; + + config = { + environment.systemPackages = optional (cfg.keybindings || cfg.fuzzyCompletion) cfg.package; + + programs.bash.interactiveShellInit = optionalString cfg.fuzzyCompletion '' + source ${cfg.package}/share/skim/completion.bash + '' + optionalString cfg.keybindings '' + source ${cfg.package}/share/skim/key-bindings.bash + ''; + + programs.zsh.interactiveShellInit = optionalString cfg.fuzzyCompletion '' + source ${cfg.package}/share/skim/completion.zsh + '' + optionalString cfg.keybindings '' + source ${cfg.package}/share/skim/key-bindings.zsh + ''; + + programs.fish.interactiveShellInit = optionalString cfg.keybindings '' + source ${cfg.package}/share/skim/key-bindings.fish && skim_key_bindings + ''; + }; +} diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 1b69aac98863..98269f6250db 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -12,14 +12,14 @@ in { type = types.package; default = pkgs.steam.override { extraLibraries = pkgs: with config.hardware.opengl; - if pkgs.hostPlatform.is64bit + if pkgs.stdenv.hostPlatform.is64bit then [ package ] ++ extraPackages else [ package32 ] ++ extraPackages32; }; defaultText = literalExpression '' pkgs.steam.override { extraLibraries = pkgs: with config.hardware.opengl; - if pkgs.hostPlatform.is64bit + if pkgs.stdenv.hostPlatform.is64bit then [ package ] ++ extraPackages else [ package32 ] ++ extraPackages32; } diff --git a/nixos/modules/programs/streamdeck-ui.nix b/nixos/modules/programs/streamdeck-ui.nix index e933b899c55e..4c055029e39b 100644 --- a/nixos/modules/programs/streamdeck-ui.nix +++ b/nixos/modules/programs/streamdeck-ui.nix @@ -4,7 +4,8 @@ with lib; let cfg = config.programs.streamdeck-ui; -in { +in +{ options.programs.streamdeck-ui = { enable = mkEnableOption (lib.mdDoc "streamdeck-ui"); @@ -13,15 +14,20 @@ in { type = types.bool; description = lib.mdDoc "Whether streamdeck-ui should be started automatically."; }; + + package = mkPackageOptionMD pkgs "streamdeck-ui" { + default = [ "streamdeck-ui" ]; + }; + }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ - streamdeck-ui - (mkIf cfg.autoStart (makeAutostartItem { name = "streamdeck-ui"; package = streamdeck-ui; })) + cfg.package + (mkIf cfg.autoStart (makeAutostartItem { name = "streamdeck-ui"; package = cfg.package; })) ]; - services.udev.packages = with pkgs; [ streamdeck-ui ]; + services.udev.packages = [ cfg.package ]; }; meta.maintainers = with maintainers; [ majiir ]; diff --git a/nixos/modules/programs/vim.nix b/nixos/modules/programs/vim.nix index 15983e371f0e..b12a45166d56 100644 --- a/nixos/modules/programs/vim.nix +++ b/nixos/modules/programs/vim.nix @@ -19,7 +19,7 @@ in { type = types.package; default = pkgs.vim; defaultText = literalExpression "pkgs.vim"; - example = literalExpression "pkgs.vimHugeX"; + example = literalExpression "pkgs.vim-full"; description = lib.mdDoc '' vim package to use. ''; diff --git a/nixos/modules/programs/weylus.nix b/nixos/modules/programs/weylus.nix index eab8afdf2cc8..a5775f3b981c 100644 --- a/nixos/modules/programs/weylus.nix +++ b/nixos/modules/programs/weylus.nix @@ -29,7 +29,7 @@ in package = mkOption { type = package; default = pkgs.weylus; - defaultText = "pkgs.weylus"; + defaultText = lib.literalExpression "pkgs.weylus"; description = lib.mdDoc "Weylus package to install."; }; }; diff --git a/nixos/modules/programs/xastir.nix b/nixos/modules/programs/xastir.nix new file mode 100644 index 000000000000..6d5fc59aac50 --- /dev/null +++ b/nixos/modules/programs/xastir.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.xastir; +in { + meta.maintainers = with maintainers; [ melling ]; + + options.programs.xastir = { + enable = mkEnableOption (mdDoc "Xastir Graphical APRS client"); + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ xastir ]; + security.wrappers.xastir = { + source = "${pkgs.xastir}/bin/xastir"; + capabilities = "cap_net_raw+p"; + owner = "root"; + group = "root"; + }; + }; +} diff --git a/nixos/modules/programs/xfs_quota.nix b/nixos/modules/programs/xfs_quota.nix index a1e9ff941c6b..0fc2958b3f38 100644 --- a/nixos/modules/programs/xfs_quota.nix +++ b/nixos/modules/programs/xfs_quota.nix @@ -94,7 +94,7 @@ in ''; wantedBy = [ "multi-user.target" ]; - after = [ ((replaceChars [ "/" ] [ "-" ] opts.fileSystem) + ".mount") ]; + after = [ ((replaceStrings [ "/" ] [ "-" ] opts.fileSystem) + ".mount") ]; restartTriggers = [ config.environment.etc.projects.source ]; diff --git a/nixos/modules/programs/xonsh.nix b/nixos/modules/programs/xonsh.nix index 3223761f9340..7202ed06c6af 100644 --- a/nixos/modules/programs/xonsh.nix +++ b/nixos/modules/programs/xonsh.nix @@ -46,8 +46,8 @@ in config = mkIf cfg.enable { - environment.etc.xonshrc.text = '' - # /etc/xonshrc: DO NOT EDIT -- this file has been generated automatically. + environment.etc."xonsh/xonshrc".text = '' + # /etc/xonsh/xonshrc: DO NOT EDIT -- this file has been generated automatically. if not ''${...}.get('__NIXOS_SET_ENVIRONMENT_DONE'): diff --git a/nixos/modules/programs/zsh/oh-my-zsh.md b/nixos/modules/programs/zsh/oh-my-zsh.md new file mode 100644 index 000000000000..73d425244ce7 --- /dev/null +++ b/nixos/modules/programs/zsh/oh-my-zsh.md @@ -0,0 +1,109 @@ +# Oh my ZSH {#module-programs-zsh-ohmyzsh} + +[`oh-my-zsh`](https://ohmyz.sh/) is a framework to manage your [ZSH](https://www.zsh.org/) +configuration including completion scripts for several CLI tools or custom +prompt themes. + +## Basic usage {#module-programs-oh-my-zsh-usage} + +The module uses the `oh-my-zsh` package with all available +features. The initial setup using Nix expressions is fairly similar to the +configuration format of `oh-my-zsh`. +``` +{ + programs.zsh.ohMyZsh = { + enable = true; + plugins = [ "git" "python" "man" ]; + theme = "agnoster"; + }; +} +``` +For a detailed explanation of these arguments please refer to the +[`oh-my-zsh` docs](https://github.com/robbyrussell/oh-my-zsh/wiki). + +The expression generates the needed configuration and writes it into your +`/etc/zshrc`. + +## Custom additions {#module-programs-oh-my-zsh-additions} + +Sometimes third-party or custom scripts such as a modified theme may be +needed. `oh-my-zsh` provides the +[`ZSH_CUSTOM`](https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-internals) +environment variable for this which points to a directory with additional +scripts. + +The module can do this as well: +``` +{ + programs.zsh.ohMyZsh.custom = "~/path/to/custom/scripts"; +} +``` + +## Custom environments {#module-programs-oh-my-zsh-environments} + +There are several extensions for `oh-my-zsh` packaged in +`nixpkgs`. One of them is +[nix-zsh-completions](https://github.com/spwhitt/nix-zsh-completions) +which bundles completion scripts and a plugin for `oh-my-zsh`. + +Rather than using a single mutable path for `ZSH_CUSTOM`, +it's also possible to generate this path from a list of Nix packages: +``` +{ pkgs, ... }: +{ + programs.zsh.ohMyZsh.customPkgs = [ + pkgs.nix-zsh-completions + # and even more... + ]; +} +``` +Internally a single store path will be created using +`buildEnv`. Please refer to the docs of +[`buildEnv`](https://nixos.org/nixpkgs/manual/#sec-building-environment) +for further reference. + +*Please keep in mind that this is not compatible with +`programs.zsh.ohMyZsh.custom` as it requires an immutable +store path while `custom` shall remain mutable! An +evaluation failure will be thrown if both `custom` and +`customPkgs` are set.* + +## Package your own customizations {#module-programs-oh-my-zsh-packaging-customizations} + +If third-party customizations (e.g. new themes) are supposed to be added to +`oh-my-zsh` there are several pitfalls to keep in mind: + + - To comply with the default structure of `ZSH` the entire + output needs to be written to `$out/share/zsh.` + + - Completion scripts are supposed to be stored at + `$out/share/zsh/site-functions`. This directory is part of the + [`fpath`](http://zsh.sourceforge.net/Doc/Release/Functions.html) + and the package should be compatible with pure `ZSH` + setups. The module will automatically link the contents of + `site-functions` to completions directory in the proper + store path. + + - The `plugins` directory needs the structure + `pluginname/pluginname.plugin.zsh` as structured in the + [upstream repo.](https://github.com/robbyrussell/oh-my-zsh/tree/91b771914bc7c43dd7c7a43b586c5de2c225ceb7/plugins) + +A derivation for `oh-my-zsh` may look like this: +``` +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "exemplary-zsh-customization-${version}"; + version = "1.0.0"; + src = fetchFromGitHub { + # path to the upstream repository + }; + + dontBuild = true; + installPhase = '' + mkdir -p $out/share/zsh/site-functions + cp {themes,plugins} $out/share/zsh + cp completions $out/share/zsh/site-functions + ''; +} +``` diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix index 41ea31b0f122..83eee1c88b3c 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -142,5 +142,5 @@ in }; - meta.doc = ./oh-my-zsh.xml; + meta.doc = ./oh-my-zsh.md; } diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml deleted file mode 100644 index 14a7228ad9b0..000000000000 --- a/nixos/modules/programs/zsh/oh-my-zsh.xml +++ /dev/null @@ -1,155 +0,0 @@ - - Oh my ZSH - - oh-my-zsh is a - framework to manage your ZSH - configuration including completion scripts for several CLI tools or custom - prompt themes. - -
- Basic usage - - - The module uses the oh-my-zsh package with all available - features. The initial setup using Nix expressions is fairly similar to the - configuration format of oh-my-zsh. - -{ - programs.zsh.ohMyZsh = { - enable = true; - plugins = [ "git" "python" "man" ]; - theme = "agnoster"; - }; -} - - For a detailed explanation of these arguments please refer to the - oh-my-zsh - docs. - - - - The expression generates the needed configuration and writes it into your - /etc/zshrc. - -
-
- Custom additions - - - Sometimes third-party or custom scripts such as a modified theme may be - needed. oh-my-zsh provides the - ZSH_CUSTOM - environment variable for this which points to a directory with additional - scripts. - - - - The module can do this as well: - -{ - programs.zsh.ohMyZsh.custom = "~/path/to/custom/scripts"; -} - - -
-
- Custom environments - - - There are several extensions for oh-my-zsh packaged in - nixpkgs. One of them is - nix-zsh-completions - which bundles completion scripts and a plugin for - oh-my-zsh. - - - - Rather than using a single mutable path for ZSH_CUSTOM, - it's also possible to generate this path from a list of Nix packages: - -{ pkgs, ... }: -{ - programs.zsh.ohMyZsh.customPkgs = [ - pkgs.nix-zsh-completions - # and even more... - ]; -} - - Internally a single store path will be created using - buildEnv. Please refer to the docs of - buildEnv - for further reference. - - - - Please keep in mind that this is not compatible with - programs.zsh.ohMyZsh.custom as it requires an immutable - store path while custom shall remain mutable! An - evaluation failure will be thrown if both custom and - customPkgs are set. - -
-
- Package your own customizations - - - If third-party customizations (e.g. new themes) are supposed to be added to - oh-my-zsh there are several pitfalls to keep in mind: - - - - - - To comply with the default structure of ZSH the entire - output needs to be written to $out/share/zsh. - - - - - Completion scripts are supposed to be stored at - $out/share/zsh/site-functions. This directory is part - of the - fpath - and the package should be compatible with pure ZSH - setups. The module will automatically link the contents of - site-functions to completions directory in the proper - store path. - - - - - The plugins directory needs the structure - pluginname/pluginname.plugin.zsh as structured in the - upstream - repo. - - - - - - A derivation for oh-my-zsh may look like this: - -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "exemplary-zsh-customization-${version}"; - version = "1.0.0"; - src = fetchFromGitHub { - # path to the upstream repository - }; - - dontBuild = true; - installPhase = '' - mkdir -p $out/share/zsh/site-functions - cp {themes,plugins} $out/share/zsh - cp completions $out/share/zsh/site-functions - ''; -} - - -
-
diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix index bc1101349283..cec4be1cb01e 100644 --- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix +++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix @@ -26,6 +26,7 @@ in "brackets" "pattern" "cursor" + "regexp" "root" "line" ])); diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index aef42d0f4db1..d8a18cfcc6dc 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -14,7 +14,7 @@ with lib; # This alias module can't be where _module.check is defined because it would # be added to submodules as well there - (mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ]) + (mkAliasOptionModuleMD [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ]) # Completely removed modules (mkRemovedOptionModule [ "environment" "blcr" "enable" ] "The BLCR module has been removed") @@ -36,6 +36,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" "gnome-documents" ] "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")) @@ -49,7 +50,6 @@ with lib; (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.") - (mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.") (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead") (mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.") diff --git a/nixos/modules/security/acme/default.md b/nixos/modules/security/acme/default.md new file mode 100644 index 000000000000..8ff97b55f685 --- /dev/null +++ b/nixos/modules/security/acme/default.md @@ -0,0 +1,354 @@ +# SSL/TLS Certificates with ACME {#module-security-acme} + +NixOS supports automatic domain validation & certificate retrieval and +renewal using the ACME protocol. Any provider can be used, but by default +NixOS uses Let's Encrypt. The alternative ACME client +[lego](https://go-acme.github.io/lego/) is used under +the hood. + +Automatic cert validation and configuration for Apache and Nginx virtual +hosts is included in NixOS, however if you would like to generate a wildcard +cert or you are not using a web server you will have to configure DNS +based validation. + +## Prerequisites {#module-security-acme-prerequisites} + +To use the ACME module, you must accept the provider's terms of service +by setting [](#opt-security.acme.acceptTerms) +to `true`. The Let's Encrypt ToS can be found +[here](https://letsencrypt.org/repository/). + +You must also set an email address to be used when creating accounts with +Let's Encrypt. You can set this for all certs with +[](#opt-security.acme.defaults.email) +and/or on a per-cert basis with +[](#opt-security.acme.certs._name_.email). +This address is only used for registration and renewal reminders, +and cannot be used to administer the certificates in any way. + +Alternatively, you can use a different ACME server by changing the +[](#opt-security.acme.defaults.server) option +to a provider of your choosing, or just change the server for one cert with +[](#opt-security.acme.certs._name_.server). + +You will need an HTTP server or DNS server for verification. For HTTP, +the server must have a webroot defined that can serve +{file}`.well-known/acme-challenge`. This directory must be +writeable by the user that will run the ACME client. For DNS, you must +set up credentials with your provider/server for use with lego. + +## Using ACME certificates in Nginx {#module-security-acme-nginx} + +NixOS supports fetching ACME certificates for you by setting +`enableACME = true;` in a virtualHost config. We first create self-signed +placeholder certificates in place of the real ACME certs. The placeholder +certs are overwritten when the ACME certs arrive. For +`foo.example.com` the config would look like this: + +``` +security.acme.acceptTerms = true; +security.acme.defaults.email = "admin+acme@example.com"; +services.nginx = { + enable = true; + virtualHosts = { + "foo.example.com" = { + forceSSL = true; + enableACME = true; + # All serverAliases will be added as extra domain names on the certificate. + serverAliases = [ "bar.example.com" ]; + locations."/" = { + root = "/var/www"; + }; + }; + + # We can also add a different vhost and reuse the same certificate + # but we have to append extraDomainNames manually beforehand: + # security.acme.certs."foo.example.com".extraDomainNames = [ "baz.example.com" ]; + "baz.example.com" = { + forceSSL = true; + useACMEHost = "foo.example.com"; + locations."/" = { + root = "/var/www"; + }; + }; + }; +} +``` + +## Using ACME certificates in Apache/httpd {#module-security-acme-httpd} + +Using ACME certificates with Apache virtual hosts is identical +to using them with Nginx. The attribute names are all the same, just replace +"nginx" with "httpd" where appropriate. + +## Manual configuration of HTTP-01 validation {#module-security-acme-configuring} + +First off you will need to set up a virtual host to serve the challenges. +This example uses a vhost called `certs.example.com`, with +the intent that you will generate certs for all your vhosts and redirect +everyone to HTTPS. + +``` +security.acme.acceptTerms = true; +security.acme.defaults.email = "admin+acme@example.com"; + +# /var/lib/acme/.challenges must be writable by the ACME user +# and readable by the Nginx user. The easiest way to achieve +# this is to add the Nginx user to the ACME group. +users.users.nginx.extraGroups = [ "acme" ]; + +services.nginx = { + enable = true; + virtualHosts = { + "acmechallenge.example.com" = { + # Catchall vhost, will redirect users to HTTPS for all vhosts + serverAliases = [ "*.example.com" ]; + locations."/.well-known/acme-challenge" = { + root = "/var/lib/acme/.challenges"; + }; + locations."/" = { + return = "301 https://$host$request_uri"; + }; + }; + }; +} +# Alternative config for Apache +users.users.wwwrun.extraGroups = [ "acme" ]; +services.httpd = { + enable = true; + virtualHosts = { + "acmechallenge.example.com" = { + # Catchall vhost, will redirect users to HTTPS for all vhosts + serverAliases = [ "*.example.com" ]; + # /var/lib/acme/.challenges must be writable by the ACME user and readable by the Apache user. + # By default, this is the case. + documentRoot = "/var/lib/acme/.challenges"; + extraConfig = '' + RewriteEngine On + RewriteCond %{HTTPS} off + RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge [NC] + RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301] + ''; + }; + }; +} +``` + +Now you need to configure ACME to generate a certificate. + +``` +security.acme.certs."foo.example.com" = { + webroot = "/var/lib/acme/.challenges"; + email = "foo@example.com"; + # Ensure that the web server you use can read the generated certs + # Take a look at the group option for the web server you choose. + group = "nginx"; + # Since we have a wildcard vhost to handle port 80, + # we can generate certs for anything! + # Just make sure your DNS resolves them. + extraDomainNames = [ "mail.example.com" ]; +}; +``` + +The private key {file}`key.pem` and certificate +{file}`fullchain.pem` will be put into +{file}`/var/lib/acme/foo.example.com`. + +Refer to [](#ch-options) for all available configuration +options for the [security.acme](#opt-security.acme.certs) +module. + +## Configuring ACME for DNS validation {#module-security-acme-config-dns} + +This is useful if you want to generate a wildcard certificate, since +ACME servers will only hand out wildcard certs over DNS validation. +There are a number of supported DNS providers and servers you can utilise, +see the [lego docs](https://go-acme.github.io/lego/dns/) +for provider/server specific configuration values. For the sake of these +docs, we will provide a fully self-hosted example using bind. + +``` +services.bind = { + enable = true; + extraConfig = '' + include "/var/lib/secrets/dnskeys.conf"; + ''; + zones = [ + rec { + name = "example.com"; + file = "/var/db/bind/${name}"; + master = true; + extraConfig = "allow-update { key rfc2136key.example.com.; };"; + } + ]; +} + +# Now we can configure ACME +security.acme.acceptTerms = true; +security.acme.defaults.email = "admin+acme@example.com"; +security.acme.certs."example.com" = { + domain = "*.example.com"; + dnsProvider = "rfc2136"; + credentialsFile = "/var/lib/secrets/certs.secret"; + # We don't need to wait for propagation since this is a local DNS server + dnsPropagationCheck = false; +}; +``` + +The {file}`dnskeys.conf` and {file}`certs.secret` +must be kept secure and thus you should not keep their contents in your +Nix config. Instead, generate them one time with a systemd service: + +``` +systemd.services.dns-rfc2136-conf = { + requiredBy = ["acme-example.com.service" "bind.service"]; + before = ["acme-example.com.service" "bind.service"]; + unitConfig = { + ConditionPathExists = "!/var/lib/secrets/dnskeys.conf"; + }; + serviceConfig = { + Type = "oneshot"; + UMask = 0077; + }; + path = [ pkgs.bind ]; + script = '' + mkdir -p /var/lib/secrets + chmod 755 /var/lib/secrets + tsig-keygen rfc2136key.example.com > /var/lib/secrets/dnskeys.conf + chown named:root /var/lib/secrets/dnskeys.conf + chmod 400 /var/lib/secrets/dnskeys.conf + + # extract secret value from the dnskeys.conf + while read x y; do if [ "$x" = "secret" ]; then secret="''${y:1:''${#y}-3}"; fi; done < /var/lib/secrets/dnskeys.conf + + cat > /var/lib/secrets/certs.secret << EOF + RFC2136_NAMESERVER='127.0.0.1:53' + RFC2136_TSIG_ALGORITHM='hmac-sha256.' + RFC2136_TSIG_KEY='rfc2136key.example.com' + RFC2136_TSIG_SECRET='$secret' + EOF + chmod 400 /var/lib/secrets/certs.secret + ''; +}; +``` + +Now you're all set to generate certs! You should monitor the first invocation +by running `systemctl start acme-example.com.service & +journalctl -fu acme-example.com.service` and watching its log output. + +## Using DNS validation with web server virtual hosts {#module-security-acme-config-dns-with-vhosts} + +It is possible to use DNS-01 validation with all certificates, +including those automatically configured via the Nginx/Apache +[`enableACME`](#opt-services.nginx.virtualHosts._name_.enableACME) +option. This configuration pattern is fully +supported and part of the module's test suite for Nginx + Apache. + +You must follow the guide above on configuring DNS-01 validation +first, however instead of setting the options for one certificate +(e.g. [](#opt-security.acme.certs._name_.dnsProvider)) +you will set them as defaults +(e.g. [](#opt-security.acme.defaults.dnsProvider)). + +``` +# Configure ACME appropriately +security.acme.acceptTerms = true; +security.acme.defaults.email = "admin+acme@example.com"; +security.acme.defaults = { + dnsProvider = "rfc2136"; + credentialsFile = "/var/lib/secrets/certs.secret"; + # We don't need to wait for propagation since this is a local DNS server + dnsPropagationCheck = false; +}; + +# For each virtual host you would like to use DNS-01 validation with, +# set acmeRoot = null +services.nginx = { + enable = true; + virtualHosts = { + "foo.example.com" = { + enableACME = true; + acmeRoot = null; + }; + }; +} +``` + +And that's it! Next time your configuration is rebuilt, or when +you add a new virtualHost, it will be DNS-01 validated. + +## Using ACME with services demanding root owned certificates {#module-security-acme-root-owned} + +Some services refuse to start if the configured certificate files +are not owned by root. PostgreSQL and OpenSMTPD are examples of these. +There is no way to change the user the ACME module uses (it will always be +`acme`), however you can use systemd's +`LoadCredential` feature to resolve this elegantly. +Below is an example configuration for OpenSMTPD, but this pattern +can be applied to any service. + +``` +# Configure ACME however you like (DNS or HTTP validation), adding +# the following configuration for the relevant certificate. +# Note: You cannot use `systemctl reload` here as that would mean +# the LoadCredential configuration below would be skipped and +# the service would continue to use old certificates. +security.acme.certs."mail.example.com".postRun = '' + systemctl restart opensmtpd +''; + +# Now you must augment OpenSMTPD's systemd service to load +# the certificate files. +systemd.services.opensmtpd.requires = ["acme-finished-mail.example.com.target"]; +systemd.services.opensmtpd.serviceConfig.LoadCredential = let + certDir = config.security.acme.certs."mail.example.com".directory; +in [ + "cert.pem:${certDir}/cert.pem" + "key.pem:${certDir}/key.pem" +]; + +# Finally, configure OpenSMTPD to use these certs. +services.opensmtpd = let + credsDir = "/run/credentials/opensmtpd.service"; +in { + enable = true; + setSendmail = false; + serverConfiguration = '' + pki mail.example.com cert "${credsDir}/cert.pem" + pki mail.example.com key "${credsDir}/key.pem" + listen on localhost tls pki mail.example.com + action act1 relay host smtp://127.0.0.1:10027 + match for local action act1 + ''; +}; +``` + +## Regenerating certificates {#module-security-acme-regenerate} + +Should you need to regenerate a particular certificate in a hurry, such +as when a vulnerability is found in Let's Encrypt, there is now a convenient +mechanism for doing so. Running +`systemctl clean --what=state acme-example.com.service` +will remove all certificate files and the account data for the given domain, +allowing you to then `systemctl start acme-example.com.service` +to generate fresh ones. + +## Fixing JWS Verification error {#module-security-acme-fix-jws} + +It is possible that your account credentials file may become corrupt and need +to be regenerated. In this scenario lego will produce the error `JWS verification error`. +The solution is to simply delete the associated accounts file and +re-run the affected service(s). + +``` +# Find the accounts folder for the certificate +systemctl cat acme-example.com.service | grep -Po 'accounts/[^:]*' +export accountdir="$(!!)" +# Move this folder to some place else +mv /var/lib/acme/.lego/$accountdir{,.bak} +# Recreate the folder using systemd-tmpfiles +systemd-tmpfiles --create +# Get a new account and reissue certificates +# Note: Do this for all certs that share the same account email address +systemctl start acme-example.com.service +``` diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index 4e163901b088..ef0636258994 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -714,7 +714,7 @@ in { default = false; description = lib.mdDoc '' Whether to use the root user when generating certs. This is not recommended - for security + compatiblity reasons. If a service requires root owned certificates + for security + compatibility reasons. If a service requires root owned certificates consider following the guide on "Using ACME with services demanding root owned certificates" in the NixOS manual, and only using this as a fallback or for testing. @@ -727,7 +727,7 @@ in { Default values inheritable by all configured certs. You can use this to define options shared by all your certs. These defaults can also be ignored on a per-cert basis using the - `security.acme.certs.''${cert}.inheritDefaults' option. + {option}`security.acme.certs.''${cert}.inheritDefaults` option. ''; }; @@ -765,7 +765,7 @@ in { To use the let's encrypt staging server, use security.acme.server = "https://acme-staging-v02.api.letsencrypt.org/directory". '') - (mkRemovedOptionModule [ "security" "acme" "directory" ] "ACME Directory is now hardcoded to /var/lib/acme and its permisisons are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.") + (mkRemovedOptionModule [ "security" "acme" "directory" ] "ACME Directory is now hardcoded to /var/lib/acme and its permissions are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.") (mkRemovedOptionModule [ "security" "acme" "preDelay" ] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal") (mkRemovedOptionModule [ "security" "acme" "activationDelay" ] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal") (mkChangedOptionModule [ "security" "acme" "validMin" ] [ "security" "acme" "defaults" "validMinDays" ] (config: config.security.acme.validMin / (24 * 3600))) @@ -916,6 +916,6 @@ in { meta = { maintainers = lib.teams.acme.members; - doc = ./doc.xml; + doc = ./default.md; }; } diff --git a/nixos/modules/security/acme/doc.xml b/nixos/modules/security/acme/doc.xml deleted file mode 100644 index 1439594a5aca..000000000000 --- a/nixos/modules/security/acme/doc.xml +++ /dev/null @@ -1,414 +0,0 @@ - - SSL/TLS Certificates with ACME - - NixOS supports automatic domain validation & certificate retrieval and - renewal using the ACME protocol. Any provider can be used, but by default - NixOS uses Let's Encrypt. The alternative ACME client - lego is used under - the hood. - - - Automatic cert validation and configuration for Apache and Nginx virtual - hosts is included in NixOS, however if you would like to generate a wildcard - cert or you are not using a web server you will have to configure DNS - based validation. - -
- Prerequisites - - - To use the ACME module, you must accept the provider's terms of service - by setting - to true. The Let's Encrypt ToS can be found - here. - - - - You must also set an email address to be used when creating accounts with - Let's Encrypt. You can set this for all certs with - - and/or on a per-cert basis with - . - This address is only used for registration and renewal reminders, - and cannot be used to administer the certificates in any way. - - - - Alternatively, you can use a different ACME server by changing the - option - to a provider of your choosing, or just change the server for one cert with - . - - - - You will need an HTTP server or DNS server for verification. For HTTP, - the server must have a webroot defined that can serve - .well-known/acme-challenge. This directory must be - writeable by the user that will run the ACME client. For DNS, you must - set up credentials with your provider/server for use with lego. - -
-
- Using ACME certificates in Nginx - - - NixOS supports fetching ACME certificates for you by setting - enableACME - = true; in a virtualHost config. We first create self-signed - placeholder certificates in place of the real ACME certs. The placeholder - certs are overwritten when the ACME certs arrive. For - foo.example.com the config would look like this: - - - - = true; - = "admin+acme@example.com"; -services.nginx = { - enable = true; - virtualHosts = { - "foo.example.com" = { - forceSSL = true; - enableACME = true; - # All serverAliases will be added as extra domain names on the certificate. - serverAliases = [ "bar.example.com" ]; - locations."/" = { - root = "/var/www"; - }; - }; - - # We can also add a different vhost and reuse the same certificate - # but we have to append extraDomainNames manually beforehand: - # security.acme.certs."foo.example.com".extraDomainNames = [ "baz.example.com" ]; - "baz.example.com" = { - forceSSL = true; - useACMEHost = "foo.example.com"; - locations."/" = { - root = "/var/www"; - }; - }; - }; -} - -
-
- Using ACME certificates in Apache/httpd - - - Using ACME certificates with Apache virtual hosts is identical - to using them with Nginx. The attribute names are all the same, just replace - "nginx" with "httpd" where appropriate. - -
-
- Manual configuration of HTTP-01 validation - - - First off you will need to set up a virtual host to serve the challenges. - This example uses a vhost called certs.example.com, with - the intent that you will generate certs for all your vhosts and redirect - everyone to HTTPS. - - - - = true; - = "admin+acme@example.com"; - -# /var/lib/acme/.challenges must be writable by the ACME user -# and readable by the Nginx user. The easiest way to achieve -# this is to add the Nginx user to the ACME group. -users.users.nginx.extraGroups = [ "acme" ]; - -services.nginx = { - enable = true; - virtualHosts = { - "acmechallenge.example.com" = { - # Catchall vhost, will redirect users to HTTPS for all vhosts - serverAliases = [ "*.example.com" ]; - locations."/.well-known/acme-challenge" = { - root = "/var/lib/acme/.challenges"; - }; - locations."/" = { - return = "301 https://$host$request_uri"; - }; - }; - }; -} -# Alternative config for Apache -users.users.wwwrun.extraGroups = [ "acme" ]; -services.httpd = { - enable = true; - virtualHosts = { - "acmechallenge.example.com" = { - # Catchall vhost, will redirect users to HTTPS for all vhosts - serverAliases = [ "*.example.com" ]; - # /var/lib/acme/.challenges must be writable by the ACME user and readable by the Apache user. - # By default, this is the case. - documentRoot = "/var/lib/acme/.challenges"; - extraConfig = '' - RewriteEngine On - RewriteCond %{HTTPS} off - RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge [NC] - RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301] - ''; - }; - }; -} - - - - Now you need to configure ACME to generate a certificate. - - - -."foo.example.com" = { - webroot = "/var/lib/acme/.challenges"; - email = "foo@example.com"; - # Ensure that the web server you use can read the generated certs - # Take a look at the group option for the web server you choose. - group = "nginx"; - # Since we have a wildcard vhost to handle port 80, - # we can generate certs for anything! - # Just make sure your DNS resolves them. - extraDomainNames = [ "mail.example.com" ]; -}; - - - - The private key key.pem and certificate - fullchain.pem will be put into - /var/lib/acme/foo.example.com. - - - - Refer to for all available configuration - options for the security.acme - module. - -
-
- Configuring ACME for DNS validation - - - This is useful if you want to generate a wildcard certificate, since - ACME servers will only hand out wildcard certs over DNS validation. - There are a number of supported DNS providers and servers you can utilise, - see the lego docs - for provider/server specific configuration values. For the sake of these - docs, we will provide a fully self-hosted example using bind. - - - -services.bind = { - enable = true; - extraConfig = '' - include "/var/lib/secrets/dnskeys.conf"; - ''; - zones = [ - rec { - name = "example.com"; - file = "/var/db/bind/${name}"; - master = true; - extraConfig = "allow-update { key rfc2136key.example.com.; };"; - } - ]; -} - -# Now we can configure ACME - = true; - = "admin+acme@example.com"; -."example.com" = { - domain = "*.example.com"; - dnsProvider = "rfc2136"; - credentialsFile = "/var/lib/secrets/certs.secret"; - # We don't need to wait for propagation since this is a local DNS server - dnsPropagationCheck = false; -}; - - - - The dnskeys.conf and certs.secret - must be kept secure and thus you should not keep their contents in your - Nix config. Instead, generate them one time with a systemd service: - - - -systemd.services.dns-rfc2136-conf = { - requiredBy = ["acme-example.com.service" "bind.service"]; - before = ["acme-example.com.service" "bind.service"]; - unitConfig = { - ConditionPathExists = "!/var/lib/secrets/dnskeys.conf"; - }; - serviceConfig = { - Type = "oneshot"; - UMask = 0077; - }; - path = [ pkgs.bind ]; - script = '' - mkdir -p /var/lib/secrets - chmod 755 /var/lib/secrets - tsig-keygen rfc2136key.example.com > /var/lib/secrets/dnskeys.conf - chown named:root /var/lib/secrets/dnskeys.conf - chmod 400 /var/lib/secrets/dnskeys.conf - - # extract secret value from the dnskeys.conf - while read x y; do if [ "$x" = "secret" ]; then secret="''${y:1:''${#y}-3}"; fi; done < /var/lib/secrets/dnskeys.conf - - cat > /var/lib/secrets/certs.secret << EOF - RFC2136_NAMESERVER='127.0.0.1:53' - RFC2136_TSIG_ALGORITHM='hmac-sha256.' - RFC2136_TSIG_KEY='rfc2136key.example.com' - RFC2136_TSIG_SECRET='$secret' - EOF - chmod 400 /var/lib/secrets/certs.secret - ''; -}; - - - - Now you're all set to generate certs! You should monitor the first invocation - by running systemctl start acme-example.com.service & - journalctl -fu acme-example.com.service and watching its log output. - -
- -
- Using DNS validation with web server virtual hosts - - - It is possible to use DNS-01 validation with all certificates, - including those automatically configured via the Nginx/Apache - enableACME - option. This configuration pattern is fully - supported and part of the module's test suite for Nginx + Apache. - - - - You must follow the guide above on configuring DNS-01 validation - first, however instead of setting the options for one certificate - (e.g. ) - you will set them as defaults - (e.g. ). - - - -# Configure ACME appropriately - = true; - = "admin+acme@example.com"; - = { - dnsProvider = "rfc2136"; - credentialsFile = "/var/lib/secrets/certs.secret"; - # We don't need to wait for propagation since this is a local DNS server - dnsPropagationCheck = false; -}; - -# For each virtual host you would like to use DNS-01 validation with, -# set acmeRoot = null -services.nginx = { - enable = true; - virtualHosts = { - "foo.example.com" = { - enableACME = true; - acmeRoot = null; - }; - }; -} - - - - And that's it! Next time your configuration is rebuilt, or when - you add a new virtualHost, it will be DNS-01 validated. - -
- -
- Using ACME with services demanding root owned certificates - - - Some services refuse to start if the configured certificate files - are not owned by root. PostgreSQL and OpenSMTPD are examples of these. - There is no way to change the user the ACME module uses (it will always be - acme), however you can use systemd's - LoadCredential feature to resolve this elegantly. - Below is an example configuration for OpenSMTPD, but this pattern - can be applied to any service. - - - -# Configure ACME however you like (DNS or HTTP validation), adding -# the following configuration for the relevant certificate. -# Note: You cannot use `systemctl reload` here as that would mean -# the LoadCredential configuration below would be skipped and -# the service would continue to use old certificates. -security.acme.certs."mail.example.com".postRun = '' - systemctl restart opensmtpd -''; - -# Now you must augment OpenSMTPD's systemd service to load -# the certificate files. -systemd.services.opensmtpd.requires = ["acme-finished-mail.example.com.target"]; -systemd.services.opensmtpd.serviceConfig.LoadCredential = let - certDir = config.security.acme.certs."mail.example.com".directory; -in [ - "cert.pem:${certDir}/cert.pem" - "key.pem:${certDir}/key.pem" -]; - -# Finally, configure OpenSMTPD to use these certs. -services.opensmtpd = let - credsDir = "/run/credentials/opensmtpd.service"; -in { - enable = true; - setSendmail = false; - serverConfiguration = '' - pki mail.example.com cert "${credsDir}/cert.pem" - pki mail.example.com key "${credsDir}/key.pem" - listen on localhost tls pki mail.example.com - action act1 relay host smtp://127.0.0.1:10027 - match for local action act1 - ''; -}; - -
- -
- Regenerating certificates - - - Should you need to regenerate a particular certificate in a hurry, such - as when a vulnerability is found in Let's Encrypt, there is now a convenient - mechanism for doing so. Running - systemctl clean --what=state acme-example.com.service - will remove all certificate files and the account data for the given domain, - allowing you to then systemctl start acme-example.com.service - to generate fresh ones. - -
-
- Fixing JWS Verification error - - - It is possible that your account credentials file may become corrupt and need - to be regenerated. In this scenario lego will produce the error JWS verification error. - The solution is to simply delete the associated accounts file and - re-run the affected service(s). - - - -# Find the accounts folder for the certificate -systemctl cat acme-example.com.service | grep -Po 'accounts/[^:]*' -export accountdir="$(!!)" -# Move this folder to some place else -mv /var/lib/acme/.lego/$accountdir{,.bak} -# Recreate the folder using systemd-tmpfiles -systemd-tmpfiles --create -# Get a new account and reissue certificates -# Note: Do this for all certs that share the same account email address -systemctl start acme-example.com.service - - -
-
diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index 0d858a458564..24b48338ed77 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -202,7 +202,7 @@ in # (indirectly read from /etc/apparmor.d/*, without recursing into sub-directory). # Note that this does not remove profiles dynamically generated by libvirt. [ "${pkgs.apparmor-utils}/bin/aa-remove-unknown" ] ++ - # Optionaly kill the processes which are unconfined but now have a profile loaded + # Optionally kill the processes which are unconfined but now have a profile loaded # (because AppArmor can only start to confine new processes). optional cfg.killUnconfinedConfinables killUnconfinedConfinables; ExecStop = "${pkgs.apparmor-utils}/bin/aa-teardown"; diff --git a/nixos/modules/security/audit.nix b/nixos/modules/security/audit.nix index 06b4766c8f5a..afc7dd13039d 100644 --- a/nixos/modules/security/audit.nix +++ b/nixos/modules/security/audit.nix @@ -57,7 +57,7 @@ in { type = types.enum [ false true "lock" ]; default = false; description = lib.mdDoc '' - Whether to enable the Linux audit system. The special `lock' value can be used to + Whether to enable the Linux audit system. The special `lock` value can be used to enable auditing and prevent disabling it until a restart. Be careful about locking this, as it will prevent you from changing your audit configuration until you restart. If possible, test your configuration using build-vm beforehand. diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 21e1749d8503..4224722f8792 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -282,7 +282,7 @@ let defaultText = literalExpression "config.security.pam.mount.enable"; type = types.bool; description = lib.mdDoc '' - Enable PAM mount (pam_mount) system to mount fileystems on user login. + Enable PAM mount (pam_mount) system to mount filesystems on user login. ''; }; @@ -305,7 +305,7 @@ let default = false; type = types.bool; description = lib.mdDoc '' - Wheather the delay after typing a wrong password should be disabled. + Whether the delay after typing a wrong password should be disabled. ''; }; @@ -488,6 +488,9 @@ let account [success=ok ignore=ignore default=die] ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so account [success=ok default=ignore] ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_admin.so '' + + optionalString config.services.homed.enable '' + account sufficient ${config.systemd.package}/lib/security/pam_systemd_home.so + '' + # The required pam_unix.so module has to come after all the sufficient modules # because otherwise, the account lookup will fail if the user does not exist # locally, for example with MySQL- or LDAP-auth. @@ -541,8 +544,10 @@ let # after it succeeds. Certain modules need to run after pam_unix # prompts the user for password so we run it once with 'optional' at an # earlier point and it will run again with 'sufficient' further down. - # We use try_first_pass the second time to avoid prompting password twice - (optionalString (cfg.unixAuth && + # We use try_first_pass the second time to avoid prompting password twice. + # + # The same principle applies to systemd-homed + (optionalString ((cfg.unixAuth || config.services.homed.enable) && (config.security.pam.enableEcryptfs || config.security.pam.enableFscrypt || cfg.pamMount @@ -553,7 +558,10 @@ let || cfg.failDelay.enable || cfg.duoSecurity.enable)) ( - '' + optionalString config.services.homed.enable '' + auth optional ${config.systemd.package}/lib/security/pam_systemd_home.so + '' + + optionalString cfg.unixAuth '' auth optional pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth '' + optionalString config.security.pam.enableEcryptfs '' @@ -584,6 +592,9 @@ let auth required ${pkgs.duo-unix}/lib/security/pam_duo.so '' )) + + optionalString config.services.homed.enable '' + auth sufficient ${config.systemd.package}/lib/security/pam_systemd_home.so + '' + optionalString cfg.unixAuth '' auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth try_first_pass '' + @@ -605,6 +616,10 @@ let auth required pam_deny.so # Password management. + '' + + optionalString config.services.homed.enable '' + password sufficient ${config.systemd.package}/lib/security/pam_systemd_home.so + '' + '' password sufficient pam_unix.so nullok sha512 '' + optionalString config.security.pam.enableEcryptfs '' @@ -650,6 +665,9 @@ let ++ optional (cfg.ttyAudit.enablePattern != null) "enable=${cfg.ttyAudit.enablePattern}" ++ optional (cfg.ttyAudit.disablePattern != null) "disable=${cfg.ttyAudit.disablePattern}" )) + + optionalString config.services.homed.enable '' + session required ${config.systemd.package}/lib/security/pam_systemd_home.so + '' + optionalString cfg.makeHomeDir '' session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=0077 '' + @@ -694,7 +712,7 @@ let optionalString (cfg.limits != []) '' session required ${pkgs.pam}/lib/security/pam_limits.so conf=${makeLimitsConf cfg.limits} '' + - optionalString (cfg.showMotd && config.users.motd != null) '' + optionalString (cfg.showMotd && (config.users.motd != null || config.users.motdFile != null)) '' session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd} '' + optionalString (cfg.enableAppArmor && config.security.apparmor.enable) '' @@ -775,7 +793,9 @@ let }; })); - motd = pkgs.writeText "motd" config.users.motd; + motd = if isNull config.users.motdFile + then pkgs.writeText "motd" config.users.motd + else config.users.motdFile; makePAMService = name: service: { name = "pam.d/${name}"; @@ -1199,12 +1219,26 @@ in description = lib.mdDoc "Message of the day shown to users when they log in."; }; + users.motdFile = mkOption { + default = null; + example = "/etc/motd"; + type = types.nullOr types.path; + description = lib.mdDoc "A file containing the message of the day shown to users when they log in."; + }; }; ###### implementation config = { + assertions = [ + { + assertion = isNull config.users.motd || isNull config.users.motdFile; + message = '' + Only one of users.motd and users.motdFile can be set. + ''; + } + ]; environment.systemPackages = # Include the PAM modules in the system path mostly for the manpages. @@ -1345,6 +1379,9 @@ in '' + optionalString config.virtualisation.lxc.lxcfs.enable '' mr ${pkgs.lxc}/lib/security/pam_cgfs.so + '' + + optionalString config.services.homed.enable '' + mr ${config.systemd.package}/lib/security/pam_systemd_home.so ''; }; diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix index 11cc13a8cbeb..481f1f3d38eb 100644 --- a/nixos/modules/security/pam_mount.nix +++ b/nixos/modules/security/pam_mount.nix @@ -24,7 +24,7 @@ in type = types.bool; default = false; description = lib.mdDoc '' - Enable PAM mount system to mount fileystems on user login. + Enable PAM mount system to mount filesystems on user login. ''; }; diff --git a/nixos/modules/security/systemd-confinement.nix b/nixos/modules/security/systemd-confinement.nix index be04741f4d06..cdf6c22ef1b6 100644 --- a/nixos/modules/security/systemd-confinement.nix +++ b/nixos/modules/security/systemd-confinement.nix @@ -94,7 +94,6 @@ in { }; config = let - rootName = "${mkPathSafeName name}-chroot"; inherit (config.confinement) binSh fullUnit; wantsAPIVFS = lib.mkDefault (config.confinement.mode == "full-apivfs"); in lib.mkIf config.confinement.enable { diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index a58c792d8c5f..4b62abd658a4 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -202,7 +202,7 @@ in internal = true; description = lib.mdDoc '' This option defines the path to the wrapper programs. It - should not be overriden. + should not be overridden. ''; }; }; diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix index bd37fe3b5574..b1f9b7a3bb1f 100644 --- a/nixos/modules/services/amqp/activemq/default.nix +++ b/nixos/modules/services/amqp/activemq/default.nix @@ -7,20 +7,19 @@ let cfg = config.services.activemq; - activemqBroker = stdenv.mkDerivation { - name = "activemq-broker"; - phases = [ "installPhase" ]; - buildInputs = [ jdk ]; - installPhase = '' - mkdir -p $out/lib - source ${activemq}/lib/classpath.env - export CLASSPATH - ln -s "${./ActiveMQBroker.java}" ActiveMQBroker.java - javac -d $out/lib ActiveMQBroker.java - ''; - }; + activemqBroker = runCommand "activemq-broker" + { + nativeBuildInputs = [ jdk ]; + } '' + mkdir -p $out/lib + source ${activemq}/lib/classpath.env + export CLASSPATH + ln -s "${./ActiveMQBroker.java}" ActiveMQBroker.java + javac -d $out/lib ActiveMQBroker.java + ''; -in { +in +{ options = { services.activemq = { diff --git a/nixos/modules/services/audio/botamusique.nix b/nixos/modules/services/audio/botamusique.nix index 4cd900f945c8..5d3f7db12bc9 100644 --- a/nixos/modules/services/audio/botamusique.nix +++ b/nixos/modules/services/audio/botamusique.nix @@ -103,9 +103,8 @@ in StateDirectory = "botamusique"; SystemCallArchitectures = "native"; SystemCallFilter = [ - "@system-service" + "@system-service @resources" "~@privileged" - "~@resources" ]; UMask = "0077"; WorkingDirectory = "/var/lib/botamusique"; diff --git a/nixos/modules/services/audio/gmediarender.nix b/nixos/modules/services/audio/gmediarender.nix new file mode 100644 index 000000000000..2f23232d19cf --- /dev/null +++ b/nixos/modules/services/audio/gmediarender.nix @@ -0,0 +1,116 @@ +{ pkgs, lib, config, utils, ... }: + +with lib; + +let + cfg = config.services.gmediarender; +in +{ + options.services.gmediarender = { + enable = mkEnableOption (mdDoc "the gmediarender DLNA renderer"); + + audioDevice = mkOption { + type = types.nullOr types.str; + default = null; + description = mdDoc '' + The audio device to use. + ''; + }; + + audioSink = mkOption { + type = types.nullOr types.str; + default = null; + description = mdDoc '' + The audio sink to use. + ''; + }; + + friendlyName = mkOption { + type = types.nullOr types.str; + default = null; + description = mdDoc '' + A "friendly name" for identifying the endpoint. + ''; + }; + + initialVolume = mkOption { + type = types.nullOr types.int; + default = 0; + description = mdDoc '' + A default volume attenuation (in dB) for the endpoint. + ''; + }; + + package = mkPackageOptionMD pkgs "gmediarender" { + default = "gmrender-resurrect"; + }; + + port = mkOption { + type = types.nullOr types.port; + default = null; + description = mdDoc "Port that will be used to accept client connections."; + }; + + uuid = mkOption { + type = types.nullOr types.str; + default = null; + description = mdDoc '' + A UUID for uniquely identifying the endpoint. If you have + multiple renderers on your network, you MUST set this. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd = { + services.gmediarender = { + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + description = "gmediarender server daemon"; + environment = { + XDG_CACHE_HOME = "%t/gmediarender"; + }; + serviceConfig = { + DynamicUser = true; + User = "gmediarender"; + Group = "gmediarender"; + SupplementaryGroups = [ "audio" ]; + ExecStart = + "${cfg.package}/bin/gmediarender " + + optionalString (cfg.audioDevice != null) ("--gstout-audiodevice=${utils.escapeSystemdExecArg cfg.audioDevice} ") + + optionalString (cfg.audioSink != null) ("--gstout-audiosink=${utils.escapeSystemdExecArg cfg.audioSink} ") + + optionalString (cfg.friendlyName != null) ("--friendly-name=${utils.escapeSystemdExecArg cfg.friendlyName} ") + + optionalString (cfg.initialVolume != 0) ("--initial-volume=${toString cfg.initialVolume} ") + + optionalString (cfg.port != null) ("--port=${toString cfg.port} ") + + optionalString (cfg.uuid != null) ("--uuid=${utils.escapeSystemdExecArg cfg.uuid} "); + Restart = "always"; + RuntimeDirectory = "gmediarender"; + + # Security options: + CapabilityBoundingSet = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + # PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" ]; + UMask = 066; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/audio/hqplayerd.nix b/nixos/modules/services/audio/hqplayerd.nix index eff1549380c8..d54400b18e30 100644 --- a/nixos/modules/services/audio/hqplayerd.nix +++ b/nixos/modules/services/audio/hqplayerd.nix @@ -82,7 +82,6 @@ in etc = { "hqplayer/hqplayerd.xml" = mkIf (cfg.config != null) { source = pkgs.writeText "hqplayerd.xml" cfg.config; }; "hqplayer/hqplayerd4-key.xml" = mkIf (cfg.licenseFile != null) { source = cfg.licenseFile; }; - "modules-load.d/taudio2.conf".source = "${pkg}/etc/modules-load.d/taudio2.conf"; }; systemPackages = [ pkg ]; }; @@ -91,8 +90,6 @@ in allowedTCPPorts = [ 8088 4321 ]; }; - services.udev.packages = [ pkg ]; - systemd = { tmpfiles.rules = [ "d ${configDir} 0755 hqplayer hqplayer - -" diff --git a/nixos/modules/services/audio/icecast.nix b/nixos/modules/services/audio/icecast.nix index 759f1ab0db9b..63049bd93ab9 100644 --- a/nixos/modules/services/audio/icecast.nix +++ b/nixos/modules/services/audio/icecast.nix @@ -48,7 +48,7 @@ in { hostname = mkOption { type = types.nullOr types.str; - description = lib.mdDoc "DNS name or IP address that will be used for the stream directory lookups or possibily the playlist generation if a Host header is not provided."; + description = lib.mdDoc "DNS name or IP address that will be used for the stream directory lookups or possibly the playlist generation if a Host header is not provided."; default = config.networking.domain; defaultText = literalExpression "config.networking.domain"; }; @@ -74,7 +74,7 @@ in { listen = { port = mkOption { - type = types.int; + type = types.port; description = lib.mdDoc "TCP port that will be used to accept client connections."; default = 8000; }; diff --git a/nixos/modules/services/audio/liquidsoap.nix b/nixos/modules/services/audio/liquidsoap.nix index c313104c4609..5c10d13af5fd 100644 --- a/nixos/modules/services/audio/liquidsoap.nix +++ b/nixos/modules/services/audio/liquidsoap.nix @@ -38,11 +38,13 @@ in default = {}; - example = { - myStream1 = "/etc/liquidsoap/myStream1.liq"; - myStream2 = literalExpression "./myStream2.liq"; - myStream3 = "out(playlist(\"/srv/music/\"))"; - }; + example = literalExpression '' + { + myStream1 = "/etc/liquidsoap/myStream1.liq"; + myStream2 = ./myStream2.liq; + myStream3 = "out(playlist(\"/srv/music/\"))"; + } + ''; type = types.attrsOf (types.either types.path types.str); }; diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index bbfccec98c4a..3c853973c872 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -102,7 +102,7 @@ in { Extra directives added to to the end of MPD's configuration file, mpd.conf. Basic configuration like file location and uid/gid is added automatically to the beginning of the file. For available - options see `man 5 mpd.conf`'. + options see {manpage}`mpd.conf(5)`. ''; }; @@ -142,7 +142,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 6600; description = lib.mdDoc '' This setting is the TCP port that is desired for the daemon to get assigned diff --git a/nixos/modules/services/audio/roon-bridge.nix b/nixos/modules/services/audio/roon-bridge.nix index db84ba286221..70392b647cc6 100644 --- a/nixos/modules/services/audio/roon-bridge.nix +++ b/nixos/modules/services/audio/roon-bridge.nix @@ -42,7 +42,7 @@ in { environment.ROON_DATAROOT = "/var/lib/${name}"; serviceConfig = { - ExecStart = "${pkgs.roon-bridge}/start.sh"; + ExecStart = "${pkgs.roon-bridge}/bin/RoonBridge"; LimitNOFILE = 8192; User = cfg.user; Group = cfg.group; @@ -53,13 +53,18 @@ in { networking.firewall = mkIf cfg.openFirewall { allowedTCPPortRanges = [{ from = 9100; to = 9200; }]; allowedUDPPorts = [ 9003 ]; - extraCommands = '' + extraCommands = optionalString (!config.networking.nftables.enable) '' iptables -A INPUT -s 224.0.0.0/4 -j ACCEPT iptables -A INPUT -d 224.0.0.0/4 -j ACCEPT iptables -A INPUT -s 240.0.0.0/5 -j ACCEPT iptables -A INPUT -m pkttype --pkt-type multicast -j ACCEPT iptables -A INPUT -m pkttype --pkt-type broadcast -j ACCEPT ''; + extraInputRules = optionalString config.networking.nftables.enable '' + ip saddr { 224.0.0.0/4, 240.0.0.0/5 } accept + ip daddr 224.0.0.0/4 accept + pkttype { multicast, broadcast } accept + ''; }; diff --git a/nixos/modules/services/audio/roon-server.nix b/nixos/modules/services/audio/roon-server.nix index 4764ee3e598f..fbe74f63b9da 100644 --- a/nixos/modules/services/audio/roon-server.nix +++ b/nixos/modules/services/audio/roon-server.nix @@ -40,6 +40,7 @@ in { wantedBy = [ "multi-user.target" ]; environment.ROON_DATAROOT = "/var/lib/${name}"; + environment.ROON_ID_DIR = "/var/lib/${name}"; serviceConfig = { ExecStart = "${pkgs.roon-server}/bin/RoonServer"; @@ -57,7 +58,7 @@ in { { from = 30000; to = 30010; } ]; allowedUDPPorts = [ 9003 ]; - extraCommands = '' + extraCommands = optionalString (!config.networking.nftables.enable) '' ## IGMP / Broadcast ## iptables -A INPUT -s 224.0.0.0/4 -j ACCEPT iptables -A INPUT -d 224.0.0.0/4 -j ACCEPT @@ -65,6 +66,11 @@ in { iptables -A INPUT -m pkttype --pkt-type multicast -j ACCEPT iptables -A INPUT -m pkttype --pkt-type broadcast -j ACCEPT ''; + extraInputRules = optionalString config.networking.nftables.enable '' + ip saddr { 224.0.0.0/4, 240.0.0.0/5 } accept + ip daddr 224.0.0.0/4 accept + pkttype { multicast, broadcast } accept + ''; }; diff --git a/nixos/modules/services/audio/snapserver.nix b/nixos/modules/services/audio/snapserver.nix index fdc1f605bb32..2af42eeb3705 100644 --- a/nixos/modules/services/audio/snapserver.nix +++ b/nixos/modules/services/audio/snapserver.nix @@ -101,9 +101,7 @@ in { openFirewall = mkOption { type = types.bool; - # Make the behavior consistent with other services. Set the default to - # false and remove the accompanying warning after NixOS 22.05 is released. - default = true; + default = false; description = lib.mdDoc '' Whether to automatically open the specified ports in the firewall. ''; @@ -279,12 +277,7 @@ in { # https://github.com/badaix/snapcast/blob/98ac8b2fb7305084376607b59173ce4097c620d8/server/streamreader/stream_manager.cpp#L85 filter (w: w != "") (mapAttrsToList (k: v: if v.type == "spotify" then '' services.snapserver.streams.${k}.type = "spotify" is deprecated, use services.snapserver.streams.${k}.type = "librespot" instead. - '' else "") cfg.streams) - # Remove this warning after NixOS 22.05 is released. - ++ optional (options.services.snapserver.openFirewall.highestPrio >= (mkOptionDefault null).priority) '' - services.snapserver.openFirewall will no longer default to true starting with NixOS 22.11. - Enable it explicitly if you need to control Snapserver remotely. - ''; + '' else "") cfg.streams); systemd.services.snapserver = { after = [ "network.target" ]; diff --git a/nixos/modules/services/backup/borgbackup.md b/nixos/modules/services/backup/borgbackup.md new file mode 100644 index 000000000000..e86ae593bbd6 --- /dev/null +++ b/nixos/modules/services/backup/borgbackup.md @@ -0,0 +1,163 @@ +# BorgBackup {#module-borgbase} + +*Source:* {file}`modules/services/backup/borgbackup.nix` + +*Upstream documentation:* + +[BorgBackup](https://www.borgbackup.org/) (short: Borg) +is a deduplicating backup program. Optionally, it supports compression and +authenticated encryption. + +The main goal of Borg is to provide an efficient and secure way to backup +data. The data deduplication technique used makes Borg suitable for daily +backups since only changes are stored. The authenticated encryption technique +makes it suitable for backups to not fully trusted targets. + +## Configuring {#module-services-backup-borgbackup-configuring} + +A complete list of options for the Borgbase module may be found +[here](#opt-services.borgbackup.jobs). + +## Basic usage for a local backup {#opt-services-backup-borgbackup-local-directory} + +A very basic configuration for backing up to a locally accessible directory is: +``` +{ + opt.services.borgbackup.jobs = { + { rootBackup = { + paths = "/"; + exclude = [ "/nix" "/path/to/local/repo" ]; + repo = "/path/to/local/repo"; + doInit = true; + encryption = { + mode = "repokey"; + passphrase = "secret"; + }; + compression = "auto,lzma"; + startAt = "weekly"; + }; + } + }; +} +``` + +::: {.warning} +If you do not want the passphrase to be stored in the world-readable +Nix store, use passCommand. You find an example below. +::: + +## Create a borg backup server {#opt-services-backup-create-server} + +You should use a different SSH key for each repository you write to, +because the specified keys are restricted to running borg serve and can only +access this single repository. You need the output of the generate pub file. + +```ShellSession +# sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_my_borg_repo +# cat /run/keys/id_ed25519_my_borg_repo +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos +``` + +Add the following snippet to your NixOS configuration: +``` +{ + services.borgbackup.repos = { + my_borg_repo = { + authorizedKeys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos" + ] ; + path = "/var/lib/my_borg_repo" ; + }; + }; +} +``` + +## Backup to the borg repository server {#opt-services-backup-borgbackup-remote-server} + +The following NixOS snippet creates an hourly backup to the service +(on the host nixos) as created in the section above. We assume +that you have stored a secret passphrasse in the file +{file}`/run/keys/borgbackup_passphrase`, which should be only +accessible by root + +``` +{ + services.borgbackup.jobs = { + backupToLocalServer = { + paths = [ "/etc/nixos" ]; + doInit = true; + repo = "borg@nixos:." ; + encryption = { + mode = "repokey-blake2"; + passCommand = "cat /run/keys/borgbackup_passphrase"; + }; + environment = { BORG_RSH = "ssh -i /run/keys/id_ed25519_my_borg_repo"; }; + compression = "auto,lzma"; + startAt = "hourly"; + }; + }; +}; +``` + +The following few commands (run as root) let you test your backup. +``` +> nixos-rebuild switch +...restarting the following units: polkit.service +> systemctl restart borgbackup-job-backupToLocalServer +> sleep 10 +> systemctl restart borgbackup-job-backupToLocalServer +> export BORG_PASSPHRASE=topSecrect +> borg list --rsh='ssh -i /run/keys/id_ed25519_my_borg_repo' borg@nixos:. +nixos-backupToLocalServer-2020-03-30T21:46:17 Mon, 2020-03-30 21:46:19 [84feb97710954931ca384182f5f3cb90665f35cef214760abd7350fb064786ac] +nixos-backupToLocalServer-2020-03-30T21:46:30 Mon, 2020-03-30 21:46:32 [e77321694ecd160ca2228611747c6ad1be177d6e0d894538898de7a2621b6e68] +``` + +## Backup to a hosting service {#opt-services-backup-borgbackup-borgbase} + +Several companies offer [(paid) hosting services](https://www.borgbackup.org/support/commercial.html) +for Borg repositories. + +To backup your home directory to borgbase you have to: + + - Generate a SSH key without a password, to access the remote server. E.g. + + sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_borgbase + + - Create the repository on the server by following the instructions for your + hosting server. + - Initialize the repository on the server. Eg. + + sudo borg init --encryption=repokey-blake2 \ + -rsh "ssh -i /run/keys/id_ed25519_borgbase" \ + zzz2aaaaa@zzz2aaaaa.repo.borgbase.com:repo + + - Add it to your NixOS configuration, e.g. + + { + services.borgbackup.jobs = { + my_Remote_Backup = { + paths = [ "/" ]; + exclude = [ "/nix" "'**/.cache'" ]; + repo = "zzz2aaaaa@zzz2aaaaa.repo.borgbase.com:repo"; + encryption = { + mode = "repokey-blake2"; + passCommand = "cat /run/keys/borgbackup_passphrase"; + }; + environment = { BORG_RSH = "ssh -i /run/keys/id_ed25519_borgbase"; }; + compression = "auto,lzma"; + startAt = "daily"; + }; + }; + }} + +## Vorta backup client for the desktop {#opt-services-backup-borgbackup-vorta} + +Vorta is a backup client for macOS and Linux desktops. It integrates the +mighty BorgBackup with your desktop environment to protect your data from +disk failure, ransomware and theft. + +It can be installed in NixOS e.g. by adding `pkgs.vorta` +to [](#opt-environment.systemPackages). + +Details about using Vorta can be found under +[https://vorta.borgbase.com](https://vorta.borgbase.com/usage) . diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index 7b29eb41e72a..bc2d79ac10ac 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -11,7 +11,11 @@ let mkExcludeFile = cfg: # Write each exclude pattern to a new line - pkgs.writeText "excludefile" (concatStringsSep "\n" cfg.exclude); + pkgs.writeText "excludefile" (concatMapStrings (s: s + "\n") cfg.exclude); + + mkPatternsFile = cfg: + # Write each pattern to a new line + pkgs.writeText "patternsfile" (concatMapStrings (s: s + "\n") cfg.patterns); mkKeepArgs = cfg: # If cfg.prune.keep e.g. has a yearly attribute, @@ -19,7 +23,8 @@ let concatStringsSep " " (mapAttrsToList (x: y: "--keep-${x}=${toString y}") cfg.prune.keep); - mkBackupScript = cfg: '' + mkBackupScript = name: cfg: pkgs.writeShellScript "${name}-script" ('' + set -e on_exit() { exitStatus=$? @@ -46,6 +51,7 @@ let borg create $extraArgs \ --compression ${cfg.compression} \ --exclude-from ${mkExcludeFile cfg} \ + --patterns-from ${mkPatternsFile cfg} \ $extraCreateArgs \ "::$archiveName$archiveSuffix" \ ${if cfg.paths == null then "-" else escapeShellArgs cfg.paths} @@ -58,10 +64,10 @@ let '' + optionalString (cfg.prune.keep != { }) '' borg prune $extraArgs \ ${mkKeepArgs cfg} \ - ${optionalString (cfg.prune.prefix != null) "--prefix ${escapeShellArg cfg.prune.prefix} \\"} + ${optionalString (cfg.prune.prefix != null) "--glob-archives ${escapeShellArg "${cfg.prune.prefix}*"}"} \ $extraPruneArgs ${cfg.postPrune} - ''; + ''); mkPassEnv = cfg: with cfg.encryption; if passCommand != null then @@ -73,12 +79,19 @@ let mkBackupService = name: cfg: let userHome = config.users.users.${cfg.user}.home; - in nameValuePair "borgbackup-job-${name}" { + backupJobName = "borgbackup-job-${name}"; + backupScript = mkBackupScript backupJobName cfg; + in nameValuePair backupJobName { description = "BorgBackup job ${name}"; path = with pkgs; [ borgbackup openssh ]; - script = mkBackupScript cfg; + script = "exec " + optionalString cfg.inhibitsSleep ''\ + ${pkgs.systemd}/bin/systemd-inhibit \ + --who="borgbackup" \ + --what="sleep" \ + --why="Scheduled backup" \ + '' + backupScript; serviceConfig = { User = cfg.user; Group = cfg.group; @@ -137,8 +150,9 @@ let # Ensure that the home directory already exists # We can't assert createHome == true because that's not the case for root cd "${config.users.users.${cfg.user}.home}" - ${install} -d .config/borg - ${install} -d .cache/borg + # Create each directory separately to prevent root owned parent dirs + ${install} -d .config .config/borg + ${install} -d .cache .cache/borg '' + optionalString (isLocalPath cfg.repo && !cfg.removableDevice) '' ${install} -d ${escapeShellArg cfg.repo} '')); @@ -212,7 +226,7 @@ let in { meta.maintainers = with maintainers; [ dotlambda ]; - meta.doc = ./borgbackup.xml; + meta.doc = ./borgbackup.md; ###### interface @@ -341,6 +355,15 @@ in { ''; }; + inhibitsSleep = mkOption { + default = false; + type = types.bool; + example = true; + description = lib.mdDoc '' + Prevents the system from sleeping while backing up. + ''; + }; + user = mkOption { type = types.str; description = lib.mdDoc '' @@ -424,6 +447,21 @@ in { ]; }; + patterns = mkOption { + type = with types; listOf str; + description = lib.mdDoc '' + Include/exclude paths matching the given patterns. The first + matching patterns is used, so if an include pattern (prefix `+`) + matches before an exclude pattern (prefix `-`), the file is + backed up. See [{command}`borg help patterns`](https://borgbackup.readthedocs.io/en/stable/usage/help.html#borg-patterns) for pattern syntax. + ''; + default = [ ]; + example = [ + "+ /home/susan" + "- /home/*" + ]; + }; + readWritePaths = mkOption { type = with types; listOf path; description = lib.mdDoc '' diff --git a/nixos/modules/services/backup/borgbackup.xml b/nixos/modules/services/backup/borgbackup.xml deleted file mode 100644 index 8f623c936568..000000000000 --- a/nixos/modules/services/backup/borgbackup.xml +++ /dev/null @@ -1,209 +0,0 @@ - - BorgBackup - - Source: - modules/services/backup/borgbackup.nix - - - Upstream documentation: - - - - BorgBackup (short: Borg) - is a deduplicating backup program. Optionally, it supports compression and - authenticated encryption. - - - The main goal of Borg is to provide an efficient and secure way to backup - data. The data deduplication technique used makes Borg suitable for daily - backups since only changes are stored. The authenticated encryption technique - makes it suitable for backups to not fully trusted targets. - -
- Configuring - - A complete list of options for the Borgbase module may be found - here. - -
-
- Basic usage for a local backup - - - A very basic configuration for backing up to a locally accessible directory - is: - -{ - opt.services.borgbackup.jobs = { - { rootBackup = { - paths = "/"; - exclude = [ "/nix" "/path/to/local/repo" ]; - repo = "/path/to/local/repo"; - doInit = true; - encryption = { - mode = "repokey"; - passphrase = "secret"; - }; - compression = "auto,lzma"; - startAt = "weekly"; - }; - } - }; -} - - - - If you do not want the passphrase to be stored in the world-readable - Nix store, use passCommand. You find an example below. - - -
-
- Create a borg backup server - You should use a different SSH key for each repository you write to, - because the specified keys are restricted to running borg serve and can only - access this single repository. You need the output of the generate pub file. - - - -# sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_my_borg_repo -# cat /run/keys/id_ed25519_my_borg_repo -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos - - - Add the following snippet to your NixOS configuration: - -{ - services.borgbackup.repos = { - my_borg_repo = { - authorizedKeys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos" - ] ; - path = "/var/lib/my_borg_repo" ; - }; - }; -} - -
- -
- Backup to the borg repository server - The following NixOS snippet creates an hourly backup to the service - (on the host nixos) as created in the section above. We assume - that you have stored a secret passphrasse in the file - /run/keys/borgbackup_passphrase, which should be only - accessible by root - - - -{ - services.borgbackup.jobs = { - backupToLocalServer = { - paths = [ "/etc/nixos" ]; - doInit = true; - repo = "borg@nixos:." ; - encryption = { - mode = "repokey-blake2"; - passCommand = "cat /run/keys/borgbackup_passphrase"; - }; - environment = { BORG_RSH = "ssh -i /run/keys/id_ed25519_my_borg_repo"; }; - compression = "auto,lzma"; - startAt = "hourly"; - }; - }; -}; - - The following few commands (run as root) let you test your backup. - -> nixos-rebuild switch -...restarting the following units: polkit.service -> systemctl restart borgbackup-job-backupToLocalServer -> sleep 10 -> systemctl restart borgbackup-job-backupToLocalServer -> export BORG_PASSPHRASE=topSecrect -> borg list --rsh='ssh -i /run/keys/id_ed25519_my_borg_repo' borg@nixos:. -nixos-backupToLocalServer-2020-03-30T21:46:17 Mon, 2020-03-30 21:46:19 [84feb97710954931ca384182f5f3cb90665f35cef214760abd7350fb064786ac] -nixos-backupToLocalServer-2020-03-30T21:46:30 Mon, 2020-03-30 21:46:32 [e77321694ecd160ca2228611747c6ad1be177d6e0d894538898de7a2621b6e68] - -
- -
- Backup to a hosting service - - - Several companies offer (paid) - hosting services for Borg repositories. - - - To backup your home directory to borgbase you have to: - - - - - Generate a SSH key without a password, to access the remote server. E.g. - - - sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_borgbase - - - - - Create the repository on the server by following the instructions for your - hosting server. - - - - - Initialize the repository on the server. Eg. - -sudo borg init --encryption=repokey-blake2 \ - -rsh "ssh -i /run/keys/id_ed25519_borgbase" \ - zzz2aaaaa@zzz2aaaaa.repo.borgbase.com:repo - - - -Add it to your NixOS configuration, e.g. - -{ - services.borgbackup.jobs = { - my_Remote_Backup = { - paths = [ "/" ]; - exclude = [ "/nix" "'**/.cache'" ]; - repo = "zzz2aaaaa@zzz2aaaaa.repo.borgbase.com:repo"; - encryption = { - mode = "repokey-blake2"; - passCommand = "cat /run/keys/borgbackup_passphrase"; - }; - BORG_RSH = "ssh -i /run/keys/id_ed25519_borgbase"; - compression = "auto,lzma"; - startAt = "daily"; - }; - }; -}} - - - -
-
- Vorta backup client for the desktop - - Vorta is a backup client for macOS and Linux desktops. It integrates the - mighty BorgBackup with your desktop environment to protect your data from - disk failure, ransomware and theft. - - - It can be installed in NixOS e.g. by adding pkgs.vorta - to . - - - Details about using Vorta can be found under https://vorta.borgbase.com - . - -
-
diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 869ed5d9976c..bc24e13aa050 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -126,13 +126,28 @@ in ]; }; + exclude = mkOption { + type = types.listOf types.str; + default = [ ]; + description = lib.mdDoc '' + Patterns to exclude when backing up. See + https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files for + details on syntax. + ''; + example = [ + "/var/cache" + "/home/*/.cache" + ".git" + ]; + }; + timerConfig = mkOption { type = types.attrsOf unitOption; default = { OnCalendar = "daily"; }; description = lib.mdDoc '' - When to run the backup. See man systemd.timer for details. + When to run the backup. See {manpage}`systemd.timer(5)` for details. ''; example = { OnCalendar = "00:05"; @@ -249,6 +264,7 @@ in example = { localbackup = { paths = [ "/home" ]; + exclude = [ "/home/*/.cache" ]; repository = "/mnt/backup-hdd"; passwordFile = "/etc/nixos/secrets/restic-password"; initialize = true; @@ -270,12 +286,17 @@ in config = { warnings = mapAttrsToList (n: v: "services.restic.backups.${n}.s3CredentialsFile is deprecated, please use services.restic.backups.${n}.environmentFile instead.") (filterAttrs (n: v: v.s3CredentialsFile != null) config.services.restic.backups); + assertions = mapAttrsToList (n: v: { + assertion = (v.repository == null) != (v.repositoryFile == null); + message = "services.restic.backups.${n}: exactly one of repository or repositoryFile should be set"; + }) config.services.restic.backups; systemd.services = mapAttrs' (name: backup: let extraOptions = concatMapStrings (arg: " -o ${arg}") backup.extraOptions; resticCmd = "${backup.package}/bin/restic${extraOptions}"; + excludeFlags = if (backup.exclude != []) then ["--exclude-file=${pkgs.writeText "exclude-patterns" (concatStringsSep "\n" backup.exclude)}"] else []; filesFromTmpFile = "/run/restic-backups-${name}/includes"; backupPaths = if (backup.dynamicFilesFrom == null) @@ -311,7 +332,7 @@ in restartIfChanged = false; serviceConfig = { Type = "oneshot"; - ExecStart = (optionals (backupPaths != "") [ "${resticCmd} backup --cache-dir=%C/restic-backups-${name} ${concatStringsSep " " backup.extraBackupArgs} ${backupPaths}" ]) + ExecStart = (optionals (backupPaths != "") [ "${resticCmd} backup --cache-dir=%C/restic-backups-${name} ${concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)} ${backupPaths}" ]) ++ pruneCmd; User = backup.user; RuntimeDirectory = "restic-backups-${name}"; diff --git a/nixos/modules/services/backup/zfs-replication.nix b/nixos/modules/services/backup/zfs-replication.nix index f0267c47364d..ce914003c622 100644 --- a/nixos/modules/services/backup/zfs-replication.nix +++ b/nixos/modules/services/backup/zfs-replication.nix @@ -12,7 +12,7 @@ in { enable = mkEnableOption (lib.mdDoc "ZFS snapshot replication."); followDelete = mkOption { - description = lib.mdDoc "Remove remote snapshots that don't have a local correspondant."; + description = lib.mdDoc "Remove remote snapshots that don't have a local correspondent."; default = true; type = types.bool; }; @@ -30,7 +30,7 @@ in { }; localFilesystem = mkOption { - description = lib.mdDoc "Local ZFS fileystem from which snapshots should be sent. Defaults to the attribute name."; + description = lib.mdDoc "Local ZFS filesystem from which snapshots should be sent. Defaults to the attribute name."; example = "pool/file/path"; type = types.str; }; diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index f8d741e3ad9a..76f147c18aff 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -9,7 +9,7 @@ let The znapzend backup plan to use for the source. The plan specifies how often to backup and for how long to keep the - backups. It consists of a series of retention periodes to interval + backups. It consists of a series of retention periods to interval associations: ``` @@ -268,7 +268,7 @@ let mkSrcAttrs = srcCfg: with srcCfg; { enabled = onOff enable; - # mbuffer is not referenced by its full path to accomodate non-NixOS systems or differing mbuffer versions between source and target + # mbuffer is not referenced by its full path to accommodate non-NixOS systems or differing mbuffer versions between source and target mbuffer = with mbuffer; if enable then "mbuffer" + optionalString (port != null) ":${toString port}" else "off"; mbuffer_size = mbuffer.size; @@ -372,7 +372,7 @@ in compressed feature which adds the options `-Lce` to the {command}`zfs send` command. When this is enabled, make sure that both the sending and receiving pool have the same relevant - features enabled. Using `-c` will skip unneccessary + features enabled. Using `-c` will skip unnecessary decompress-compress stages, `-L` is for large block support and -e is for embedded data support. see {manpage}`znapzend(1)` diff --git a/nixos/modules/services/blockchain/ethereum/erigon.nix b/nixos/modules/services/blockchain/ethereum/erigon.nix index 9ff7df0b15e5..8ebe0fcaff54 100644 --- a/nixos/modules/services/blockchain/ethereum/erigon.nix +++ b/nixos/modules/services/blockchain/ethereum/erigon.nix @@ -13,6 +13,12 @@ in { services.erigon = { enable = mkEnableOption (lib.mdDoc "Ethereum implementation on the efficiency frontier"); + extraArgs = mkOption { + type = types.listOf types.str; + description = lib.mdDoc "Additional arguments passed to Erigon"; + default = [ ]; + }; + secretJwtPath = mkOption { type = types.path; description = lib.mdDoc '' @@ -86,7 +92,7 @@ in { serviceConfig = { LoadCredential = "ERIGON_JWT:${cfg.secretJwtPath}"; - ExecStart = "${pkgs.erigon}/bin/erigon --config ${configFile} --authrpc.jwtsecret=%d/ERIGON_JWT"; + ExecStart = "${pkgs.erigon}/bin/erigon --config ${configFile} --authrpc.jwtsecret=%d/ERIGON_JWT ${lib.escapeShellArgs cfg.extraArgs}"; DynamicUser = true; Restart = "on-failure"; StateDirectory = "erigon"; diff --git a/nixos/modules/services/blockchain/ethereum/lighthouse.nix b/nixos/modules/services/blockchain/ethereum/lighthouse.nix index db72c62d3304..863e737d908a 100644 --- a/nixos/modules/services/blockchain/ethereum/lighthouse.nix +++ b/nixos/modules/services/blockchain/ethereum/lighthouse.nix @@ -51,7 +51,7 @@ in { type = types.bool; default = false; description = lib.mdDoc '' - Explictly disables syncing of deposit logs from the execution node. + Explicitly disables syncing of deposit logs from the execution node. This overrides any previous option that depends on it. Useful if you intend to run a non-validating beacon node. ''; @@ -247,6 +247,7 @@ in { DynamicUser = true; Restart = "on-failure"; StateDirectory = "lighthouse-beacon"; + ReadWritePaths = [ cfg.beacon.dataDir ]; NoNewPrivileges = true; PrivateTmp = true; ProtectHome = true; @@ -279,7 +280,7 @@ in { ${pkgs.lighthouse}/bin/lighthouse validator_client \ --network ${cfg.network} \ --beacon-nodes ${lib.concatStringsSep "," cfg.validator.beaconNodes} \ - --datadir ${cfg.validator.dataDir}/${cfg.network} + --datadir ${cfg.validator.dataDir}/${cfg.network} \ ${optionalString cfg.validator.metrics.enable ''--metrics --metrics-address ${cfg.validator.metrics.address} --metrics-port ${toString cfg.validator.metrics.port}''} \ ${cfg.extraArgs} ${cfg.validator.extraArgs} ''; @@ -287,6 +288,7 @@ in { serviceConfig = { Restart = "on-failure"; StateDirectory = "lighthouse-validator"; + ReadWritePaths = [ cfg.validator.dataDir ]; CapabilityBoundingSet = ""; DynamicUser = true; NoNewPrivileges = true; diff --git a/nixos/modules/services/cluster/hadoop/hbase.nix b/nixos/modules/services/cluster/hadoop/hbase.nix index 237a1d428fe2..97951ebfe334 100644 --- a/nixos/modules/services/cluster/hadoop/hbase.nix +++ b/nixos/modules/services/cluster/hadoop/hbase.nix @@ -141,9 +141,9 @@ in services.hadoop.hbaseSiteInternal."hbase.rootdir" = cfg.hbase.rootdir; - networking.firewall.allowedTCPPorts = (mkIf cfg.hbase.master.openFirewall [ + networking.firewall.allowedTCPPorts = mkIf cfg.hbase.master.openFirewall [ 16000 16010 - ]); + ]; }) @@ -168,9 +168,9 @@ in services.hadoop.hbaseSiteInternal."hbase.rootdir" = cfg.hbase.rootdir; networking = { - firewall.allowedTCPPorts = (mkIf cfg.hbase.regionServer.openFirewall [ + firewall.allowedTCPPorts = mkIf cfg.hbase.regionServer.openFirewall [ 16020 16030 - ]); + ]; hosts = mkIf cfg.hbase.regionServer.overrideHosts { "127.0.0.2" = mkForce [ ]; "::1" = mkForce [ ]; diff --git a/nixos/modules/services/cluster/kubernetes/addon-manager.nix b/nixos/modules/services/cluster/kubernetes/addon-manager.nix index d6b3428908b2..7aa2a8323b1d 100644 --- a/nixos/modules/services/cluster/kubernetes/addon-manager.nix +++ b/nixos/modules/services/cluster/kubernetes/addon-manager.nix @@ -22,7 +22,7 @@ in bootstrapAddons = mkOption { description = lib.mdDoc '' - Bootstrap addons are like regular addons, but they are applied with cluster-admin rigths. + Bootstrap addons are like regular addons, but they are applied with cluster-admin rights. They are applied at addon-manager startup only. ''; default = { }; diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index 0898fee9bdb7..3ede1cb80e85 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -171,7 +171,7 @@ in port = mkOption { description = lib.mdDoc "Kubernetes kubelet healthz port."; default = 10248; - type = int; + type = port; }; }; @@ -204,7 +204,7 @@ in port = mkOption { description = lib.mdDoc "Kubernetes kubelet info server listening port."; default = 10250; - type = int; + type = port; }; seedDockerImages = mkOption { diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix index d68267883e45..26fe0f5e9e09 100644 --- a/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -323,7 +323,7 @@ in systemctl restart flannel ''} - echo "Node joined succesfully" + echo "Node joined successfully" '')]; # isolate etcd on loopback at the master node diff --git a/nixos/modules/services/cluster/kubernetes/scheduler.nix b/nixos/modules/services/cluster/kubernetes/scheduler.nix index 2eada43eb4ec..f31a92f36840 100644 --- a/nixos/modules/services/cluster/kubernetes/scheduler.nix +++ b/nixos/modules/services/cluster/kubernetes/scheduler.nix @@ -43,7 +43,7 @@ in port = mkOption { description = lib.mdDoc "Kubernetes scheduler listening port."; default = 10251; - type = int; + type = port; }; verbosity = mkOption { diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index d9055149b77f..5666199c4845 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -1,4 +1,4 @@ -# NixOS module for Buildbot continous integration server. +# NixOS module for Buildbot continuous integration server. { config, lib, options, pkgs, ... }: @@ -10,7 +10,7 @@ let python = cfg.package.pythonModule; - escapeStr = s: escape ["'"] s; + escapeStr = escape [ "'" ]; defaultMasterCfg = pkgs.writeText "master.cfg" '' from buildbot.plugins import * @@ -206,7 +206,7 @@ in { port = mkOption { default = 8010; - type = types.int; + type = types.port; description = lib.mdDoc "Specifies port number on which the buildbot HTTP interface listens."; }; @@ -245,9 +245,7 @@ in { description = "Buildbot User."; isNormalUser = true; createHome = true; - home = cfg.home; - group = cfg.group; - extraGroups = cfg.extraGroups; + inherit (cfg) home group extraGroups; useDefaultShell = true; }; }; diff --git a/nixos/modules/services/continuous-integration/github-runner.nix b/nixos/modules/services/continuous-integration/github-runner.nix index 24d02c931a4a..67e71659d6b7 100644 --- a/nixos/modules/services/continuous-integration/github-runner.nix +++ b/nixos/modules/services/continuous-integration/github-runner.nix @@ -20,4 +20,6 @@ in config = mkIf cfg.enable { services.github-runners.${cfg.name} = cfg; }; + + meta.maintainers = with maintainers; [ veehaitch newam ]; } diff --git a/nixos/modules/services/continuous-integration/github-runner/options.nix b/nixos/modules/services/continuous-integration/github-runner/options.nix index 796b5a7f1175..6ce08aaaece8 100644 --- a/nixos/modules/services/continuous-integration/github-runner/options.nix +++ b/nixos/modules/services/continuous-integration/github-runner/options.nix @@ -49,7 +49,7 @@ with lib; registration token on startup as needed. Make sure the PAT has a scope of `admin:org` for organization-wide registrations or a scope of `repo` for a single repository. Fine-grained PATs need read and write permission - to the "Adminstration" resources. + to the "Administration" resources. Changing this option or the file's content triggers a new runner registration. ''; @@ -127,10 +127,11 @@ with lib; serviceOverrides = mkOption { type = types.attrs; description = lib.mdDoc '' - Overrides for the systemd service. Can be used to adjust the sandboxing options. + Modify the systemd service. Can be used to, e.g., adjust the sandboxing options. ''; example = { ProtectHome = false; + RestrictAddressFamilies = [ "AF_PACKET" ]; }; default = {}; }; @@ -170,4 +171,16 @@ with lib; default = null; defaultText = literalExpression "username"; }; + + workDir = mkOption { + type = with types; nullOr str; + description = lib.mdDoc '' + Working directory, available as `$GITHUB_WORKSPACE` during workflow runs + and used as a default for [repository checkouts](https://github.com/actions/checkout). + The service cleans this directory on every service start. + + A value of `null` will default to the systemd `RuntimeDirectory`. + ''; + default = null; + }; } diff --git a/nixos/modules/services/continuous-integration/github-runner/service.nix b/nixos/modules/services/continuous-integration/github-runner/service.nix index cd81631582f9..db9a19815ec1 100644 --- a/nixos/modules/services/continuous-integration/github-runner/service.nix +++ b/nixos/modules/services/continuous-integration/github-runner/service.nix @@ -20,6 +20,9 @@ with lib; +let + workDir = if cfg.workDir == null then runtimeDir else cfg.workDir; +in { description = "GitHub Actions runner"; @@ -28,7 +31,7 @@ with lib; after = [ "network.target" "network-online.target" ]; environment = { - HOME = runtimeDir; + HOME = workDir; RUNNER_ROOT = stateDir; } // cfg.extraEnvironment; @@ -42,216 +45,224 @@ with lib; config.nix.package ] ++ cfg.extraPackages; - serviceConfig = rec { - ExecStart = "${cfg.package}/bin/Runner.Listener run --startuptype service"; + serviceConfig = mkMerge [ + { + ExecStart = "${cfg.package}/bin/Runner.Listener run --startuptype service"; - # Does the following, sequentially: - # - If the module configuration or the token has changed, purge the state directory, - # and create the current and the new token file with the contents of the configured - # token. While both files have the same content, only the later is accessible by - # the service user. - # - Configure the runner using the new token file. When finished, delete it. - # - Set up the directory structure by creating the necessary symlinks. - ExecStartPre = - let - # Wrapper script which expects the full path of the state, runtime and logs - # directory as arguments. Overrides the respective systemd variables to provide - # unambiguous directory names. This becomes relevant, for example, if the - # caller overrides any of the StateDirectory=, RuntimeDirectory= or LogDirectory= - # to contain more than one directory. This causes systemd to set the respective - # environment variables with the path of all of the given directories, separated - # by a colon. - writeScript = name: lines: pkgs.writeShellScript "${svcName}-${name}.sh" '' - set -euo pipefail + # Does the following, sequentially: + # - If the module configuration or the token has changed, purge the state directory, + # and create the current and the new token file with the contents of the configured + # token. While both files have the same content, only the later is accessible by + # the service user. + # - Configure the runner using the new token file. When finished, delete it. + # - Set up the directory structure by creating the necessary symlinks. + ExecStartPre = + let + # Wrapper script which expects the full path of the state, working and logs + # directory as arguments. Overrides the respective systemd variables to provide + # unambiguous directory names. This becomes relevant, for example, if the + # caller overrides any of the StateDirectory=, RuntimeDirectory= or LogDirectory= + # to contain more than one directory. This causes systemd to set the respective + # environment variables with the path of all of the given directories, separated + # by a colon. + writeScript = name: lines: pkgs.writeShellScript "${svcName}-${name}.sh" '' + set -euo pipefail - STATE_DIRECTORY="$1" - RUNTIME_DIRECTORY="$2" - LOGS_DIRECTORY="$3" + STATE_DIRECTORY="$1" + WORK_DIRECTORY="$2" + LOGS_DIRECTORY="$3" - ${lines} - ''; - runnerRegistrationConfig = getAttrs [ "name" "tokenFile" "url" "runnerGroup" "extraLabels" "ephemeral" ] cfg; - newConfigPath = builtins.toFile "${svcName}-config.json" (builtins.toJSON runnerRegistrationConfig); - currentConfigPath = "$STATE_DIRECTORY/.nixos-current-config.json"; - newConfigTokenPath= "$STATE_DIRECTORY/.new-token"; - currentConfigTokenPath = "$STATE_DIRECTORY/${currentConfigTokenFilename}"; + ${lines} + ''; + runnerRegistrationConfig = getAttrs [ "name" "tokenFile" "url" "runnerGroup" "extraLabels" "ephemeral" "workDir" ] cfg; + newConfigPath = builtins.toFile "${svcName}-config.json" (builtins.toJSON runnerRegistrationConfig); + currentConfigPath = "$STATE_DIRECTORY/.nixos-current-config.json"; + newConfigTokenPath = "$STATE_DIRECTORY/.new-token"; + currentConfigTokenPath = "$STATE_DIRECTORY/${currentConfigTokenFilename}"; - runnerCredFiles = [ - ".credentials" - ".credentials_rsaparams" - ".runner" - ]; - unconfigureRunner = writeScript "unconfigure" '' - copy_tokens() { - # Copy the configured token file to the state dir and allow the service user to read the file - install --mode=666 ${escapeShellArg cfg.tokenFile} "${newConfigTokenPath}" - # Also copy current file to allow for a diff on the next start - install --mode=600 ${escapeShellArg cfg.tokenFile} "${currentConfigTokenPath}" - } - clean_state() { - find "$STATE_DIRECTORY/" -mindepth 1 -delete - copy_tokens - } - diff_config() { - changed=0 - # Check for module config changes - [[ -f "${currentConfigPath}" ]] \ - && ${pkgs.diffutils}/bin/diff -q '${newConfigPath}' "${currentConfigPath}" >/dev/null 2>&1 \ - || changed=1 - # Also check the content of the token file - [[ -f "${currentConfigTokenPath}" ]] \ - && ${pkgs.diffutils}/bin/diff -q "${currentConfigTokenPath}" ${escapeShellArg cfg.tokenFile} >/dev/null 2>&1 \ - || changed=1 - # If the config has changed, remove old state and copy tokens - if [[ "$changed" -eq 1 ]]; then - echo "Config has changed, removing old runner state." - echo "The old runner will still appear in the GitHub Actions UI." \ - "You have to remove it manually." + runnerCredFiles = [ + ".credentials" + ".credentials_rsaparams" + ".runner" + ]; + unconfigureRunner = writeScript "unconfigure" '' + copy_tokens() { + # Copy the configured token file to the state dir and allow the service user to read the file + install --mode=666 ${escapeShellArg cfg.tokenFile} "${newConfigTokenPath}" + # Also copy current file to allow for a diff on the next start + install --mode=600 ${escapeShellArg cfg.tokenFile} "${currentConfigTokenPath}" + } + clean_state() { + find "$STATE_DIRECTORY/" -mindepth 1 -delete + copy_tokens + } + diff_config() { + changed=0 + # Check for module config changes + [[ -f "${currentConfigPath}" ]] \ + && ${pkgs.diffutils}/bin/diff -q '${newConfigPath}' "${currentConfigPath}" >/dev/null 2>&1 \ + || changed=1 + # Also check the content of the token file + [[ -f "${currentConfigTokenPath}" ]] \ + && ${pkgs.diffutils}/bin/diff -q "${currentConfigTokenPath}" ${escapeShellArg cfg.tokenFile} >/dev/null 2>&1 \ + || changed=1 + # If the config has changed, remove old state and copy tokens + if [[ "$changed" -eq 1 ]]; then + echo "Config has changed, removing old runner state." + echo "The old runner will still appear in the GitHub Actions UI." \ + "You have to remove it manually." + clean_state + fi + } + if [[ "${optionalString cfg.ephemeral "1"}" ]]; then + # In ephemeral mode, we always want to start with a clean state clean_state - fi - } - if [[ "${optionalString cfg.ephemeral "1"}" ]]; then - # In ephemeral mode, we always want to start with a clean state - clean_state - elif [[ "$(ls -A "$STATE_DIRECTORY")" ]]; then - # There are state files from a previous run; diff them to decide if we need a new registration - diff_config - else - # The state directory is entirely empty which indicates a first start - copy_tokens - fi ''; - configureRunner = writeScript "configure" '' - if [[ -e "${newConfigTokenPath}" ]]; then - echo "Configuring GitHub Actions Runner" - args=( - --unattended - --disableupdate - --work "$RUNTIME_DIRECTORY" - --url ${escapeShellArg cfg.url} - --labels ${escapeShellArg (concatStringsSep "," cfg.extraLabels)} - --name ${escapeShellArg cfg.name} - ${optionalString cfg.replace "--replace"} - ${optionalString (cfg.runnerGroup != null) "--runnergroup ${escapeShellArg cfg.runnerGroup}"} - ${optionalString cfg.ephemeral "--ephemeral"} - ) - # If the token file contains a PAT (i.e., it starts with "ghp_" or "github_pat_"), we have to use the --pat option, - # if it is not a PAT, we assume it contains a registration token and use the --token option - token=$(<"${newConfigTokenPath}") - if [[ "$token" =~ ^ghp_* ]] || [[ "$token" =~ ^github_pat_* ]]; then - args+=(--pat "$token") + elif [[ "$(ls -A "$STATE_DIRECTORY")" ]]; then + # There are state files from a previous run; diff them to decide if we need a new registration + diff_config else - args+=(--token "$token") + # The state directory is entirely empty which indicates a first start + copy_tokens fi - ${cfg.package}/bin/config.sh "''${args[@]}" - # Move the automatically created _diag dir to the logs dir - mkdir -p "$STATE_DIRECTORY/_diag" - cp -r "$STATE_DIRECTORY/_diag/." "$LOGS_DIRECTORY/" - rm -rf "$STATE_DIRECTORY/_diag/" - # Cleanup token from config - rm "${newConfigTokenPath}" - # Symlink to new config - ln -s '${newConfigPath}' "${currentConfigPath}" - fi - ''; - setupRuntimeDir = writeScript "setup-runtime-dirs" '' - # Link _diag dir - ln -s "$LOGS_DIRECTORY" "$RUNTIME_DIRECTORY/_diag" + ''; + configureRunner = writeScript "configure" '' + if [[ -e "${newConfigTokenPath}" ]]; then + echo "Configuring GitHub Actions Runner" + args=( + --unattended + --disableupdate + --work "$WORK_DIRECTORY" + --url ${escapeShellArg cfg.url} + --labels ${escapeShellArg (concatStringsSep "," cfg.extraLabels)} + --name ${escapeShellArg cfg.name} + ${optionalString cfg.replace "--replace"} + ${optionalString (cfg.runnerGroup != null) "--runnergroup ${escapeShellArg cfg.runnerGroup}"} + ${optionalString cfg.ephemeral "--ephemeral"} + ) + # If the token file contains a PAT (i.e., it starts with "ghp_" or "github_pat_"), we have to use the --pat option, + # if it is not a PAT, we assume it contains a registration token and use the --token option + token=$(<"${newConfigTokenPath}") + if [[ "$token" =~ ^ghp_* ]] || [[ "$token" =~ ^github_pat_* ]]; then + args+=(--pat "$token") + else + args+=(--token "$token") + fi + ${cfg.package}/bin/config.sh "''${args[@]}" + # Move the automatically created _diag dir to the logs dir + mkdir -p "$STATE_DIRECTORY/_diag" + cp -r "$STATE_DIRECTORY/_diag/." "$LOGS_DIRECTORY/" + rm -rf "$STATE_DIRECTORY/_diag/" + # Cleanup token from config + rm "${newConfigTokenPath}" + # Symlink to new config + ln -s '${newConfigPath}' "${currentConfigPath}" + fi + ''; + setupWorkDir = writeScript "setup-work-dirs" '' + # Cleanup previous service + ${pkgs.findutils}/bin/find -H "$WORK_DIRECTORY" -mindepth 1 -delete - # Link the runner credentials to the runtime dir - ln -s "$STATE_DIRECTORY"/{${lib.concatStringsSep "," runnerCredFiles}} "$RUNTIME_DIRECTORY/" - ''; - in - map (x: "${x} ${escapeShellArgs [ stateDir runtimeDir logsDir ]}") [ + # Link _diag dir + ln -s "$LOGS_DIRECTORY" "$WORK_DIRECTORY/_diag" + + # Link the runner credentials to the work dir + ln -s "$STATE_DIRECTORY"/{${lib.concatStringsSep "," runnerCredFiles}} "$WORK_DIRECTORY/" + ''; + in + map (x: "${x} ${escapeShellArgs [ stateDir workDir logsDir ]}") [ "+${unconfigureRunner}" # runs as root configureRunner - setupRuntimeDir + setupWorkDir ]; - # If running in ephemeral mode, restart the service on-exit (i.e., successful de-registration of the runner) - # to trigger a fresh registration. - Restart = if cfg.ephemeral then "on-success" else "no"; - # If the runner exits with `ReturnCode.RetryableError = 2`, always restart the service: - # https://github.com/actions/runner/blob/40ed7f8/src/Runner.Common/Constants.cs#L146 - RestartForceExitStatus = [ 2 ]; + # If running in ephemeral mode, restart the service on-exit (i.e., successful de-registration of the runner) + # to trigger a fresh registration. + Restart = if cfg.ephemeral then "on-success" else "no"; + # If the runner exits with `ReturnCode.RetryableError = 2`, always restart the service: + # https://github.com/actions/runner/blob/40ed7f8/src/Runner.Common/Constants.cs#L146 + RestartForceExitStatus = [ 2 ]; - # Contains _diag - LogsDirectory = [ systemdDir ]; - # Default RUNNER_ROOT which contains ephemeral Runner data - RuntimeDirectory = [ systemdDir ]; - # Home of persistent runner data, e.g., credentials - StateDirectory = [ systemdDir ]; - StateDirectoryMode = "0700"; - WorkingDirectory = runtimeDir; + # Contains _diag + LogsDirectory = [ systemdDir ]; + # Default RUNNER_ROOT which contains ephemeral Runner data + RuntimeDirectory = [ systemdDir ]; + # Home of persistent runner data, e.g., credentials + StateDirectory = [ systemdDir ]; + StateDirectoryMode = "0700"; + WorkingDirectory = workDir; - InaccessiblePaths = [ - # Token file path given in the configuration, if visible to the service - "-${cfg.tokenFile}" - # Token file in the state directory - "${stateDir}/${currentConfigTokenFilename}" - ]; + InaccessiblePaths = [ + # Token file path given in the configuration, if visible to the service + "-${cfg.tokenFile}" + # Token file in the state directory + "${stateDir}/${currentConfigTokenFilename}" + ]; - KillSignal = "SIGINT"; + KillSignal = "SIGINT"; - # Hardening (may overlap with DynamicUser=) - # The following options are only for optimizing: - # systemd-analyze security github-runner - AmbientCapabilities = ""; - CapabilityBoundingSet = ""; - # ProtectClock= adds DeviceAllow=char-rtc r - DeviceAllow = ""; - NoNewPrivileges = true; - PrivateDevices = true; - PrivateMounts = true; - PrivateTmp = true; - PrivateUsers = true; - ProtectClock = true; - ProtectControlGroups = true; - ProtectHome = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectSystem = "strict"; - RemoveIPC = true; - RestrictNamespaces = true; - RestrictRealtime = true; - RestrictSUIDSGID = true; - UMask = "0066"; - ProtectProc = "invisible"; - SystemCallFilter = [ - "~@clock" - "~@cpu-emulation" - "~@module" - "~@mount" - "~@obsolete" - "~@raw-io" - "~@reboot" - "~capset" - "~setdomainname" - "~sethostname" - ]; - RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" "AF_NETLINK" ]; + # Hardening (may overlap with DynamicUser=) + # The following options are only for optimizing: + # systemd-analyze security github-runner + AmbientCapabilities = mkBefore [ "" ]; + CapabilityBoundingSet = mkBefore [ "" ]; + # ProtectClock= adds DeviceAllow=char-rtc r + DeviceAllow = mkBefore [ "" ]; + NoNewPrivileges = mkDefault true; + PrivateDevices = mkDefault true; + PrivateMounts = mkDefault true; + PrivateTmp = mkDefault true; + PrivateUsers = mkDefault true; + ProtectClock = mkDefault true; + ProtectControlGroups = mkDefault true; + ProtectHome = mkDefault true; + ProtectHostname = mkDefault true; + ProtectKernelLogs = mkDefault true; + ProtectKernelModules = mkDefault true; + ProtectKernelTunables = mkDefault true; + ProtectSystem = mkDefault "strict"; + RemoveIPC = mkDefault true; + RestrictNamespaces = mkDefault true; + RestrictRealtime = mkDefault true; + RestrictSUIDSGID = mkDefault true; + UMask = mkDefault "0066"; + ProtectProc = mkDefault "invisible"; + SystemCallFilter = mkBefore [ + "~@clock" + "~@cpu-emulation" + "~@module" + "~@mount" + "~@obsolete" + "~@raw-io" + "~@reboot" + "~capset" + "~setdomainname" + "~sethostname" + ]; + RestrictAddressFamilies = mkBefore [ "AF_INET" "AF_INET6" "AF_UNIX" "AF_NETLINK" ]; - # Needs network access - PrivateNetwork = false; - # Cannot be true due to Node - MemoryDenyWriteExecute = false; + BindPaths = lib.optionals (cfg.workDir != null) [ cfg.workDir ]; - # The more restrictive "pid" option makes `nix` commands in CI emit - # "GC Warning: Couldn't read /proc/stat" - # You may want to set this to "pid" if not using `nix` commands - ProcSubset = "all"; - # Coverage programs for compiled code such as `cargo-tarpaulin` disable - # ASLR (address space layout randomization) which requires the - # `personality` syscall - # You may want to set this to `true` if not using coverage tooling on - # compiled code - LockPersonality = false; + # Needs network access + PrivateNetwork = mkDefault false; + # Cannot be true due to Node + MemoryDenyWriteExecute = mkDefault false; - # Note that this has some interactions with the User setting; so you may - # want to consult the systemd docs if using both. - DynamicUser = true; - } // ( - lib.optionalAttrs (cfg.user != null) { User = cfg.user; } - ) // cfg.serviceOverrides; + # The more restrictive "pid" option makes `nix` commands in CI emit + # "GC Warning: Couldn't read /proc/stat" + # You may want to set this to "pid" if not using `nix` commands + ProcSubset = mkDefault "all"; + # Coverage programs for compiled code such as `cargo-tarpaulin` disable + # ASLR (address space layout randomization) which requires the + # `personality` syscall + # You may want to set this to `true` if not using coverage tooling on + # compiled code + LockPersonality = mkDefault false; + + # Note that this has some interactions with the User setting; so you may + # want to consult the systemd docs if using both. + DynamicUser = mkDefault true; + } + (mkIf (cfg.user != null) { User = cfg.user; }) + cfg.serviceOverrides + ]; } diff --git a/nixos/modules/services/continuous-integration/github-runners.nix b/nixos/modules/services/continuous-integration/github-runners.nix index 78b57f9c7a25..66ace9580eca 100644 --- a/nixos/modules/services/continuous-integration/github-runners.nix +++ b/nixos/modules/services/continuous-integration/github-runners.nix @@ -53,4 +53,6 @@ in })) ); }; + + meta.maintainers = with maintainers; [ veehaitch newam ]; } diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 2050e04d55cd..3e6dba16e8ac 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -4,24 +4,41 @@ with lib; let cfg = config.services.gitlab-runner; hasDocker = config.virtualisation.docker.enable; + + /* The whole logic of this module is to diff the hashes of the desired vs existing runners + The hash is recorded in the runner's name because we can't do better yet + See https://gitlab.com/gitlab-org/gitlab-runner/-/issues/29350 for more details + */ + genRunnerName = name: service: let + hash = substring 0 12 (hashString "md5" (unsafeDiscardStringContext (toJSON service))); + in if service ? description && service.description != null + then "${hash} ${service.description}" + else "${name}_${config.networking.hostName}_${hash}"; + hashedServices = mapAttrs' - (name: service: nameValuePair - "${name}_${config.networking.hostName}_${ - substring 0 12 - (hashString "md5" (unsafeDiscardStringContext (toJSON service)))}" - service) - cfg.services; - configPath = "$HOME/.gitlab-runner/config.toml"; - configureScript = pkgs.writeShellScriptBin "gitlab-runner-configure" ( - if (cfg.configFile != null) then '' - mkdir -p $(dirname ${configPath}) + (name: service: nameValuePair (genRunnerName name service) service) cfg.services; + configPath = ''"$HOME"/.gitlab-runner/config.toml''; + configureScript = pkgs.writeShellApplication { + name = "gitlab-runner-configure"; + runtimeInputs = with pkgs; [ + bash + gawk + jq + moreutils + remarshal + util-linux + cfg.package + perl + python3 + ]; + text = if (cfg.configFile != null) then '' cp ${cfg.configFile} ${configPath} # make config file readable by service chown -R --reference=$HOME $(dirname ${configPath}) '' else '' export CONFIG_FILE=${configPath} - mkdir -p $(dirname ${configPath}) + mkdir -p "$(dirname ${configPath})" touch ${configPath} # update global options @@ -34,22 +51,43 @@ let # remove no longer existing services gitlab-runner verify --delete - # current and desired state - NEEDED_SERVICES=$(echo ${concatStringsSep " " (attrNames hashedServices)} | tr " " "\n") - REGISTERED_SERVICES=$(gitlab-runner list 2>&1 | grep 'Executor' | awk '{ print $1 }') + ${toShellVar "NEEDED_SERVICES" (lib.mapAttrs (name: value: 1) hashedServices)} + + declare -A REGISTERED_SERVICES + + while IFS="," read -r name token; + do + REGISTERED_SERVICES["$name"]="$token" + done < <(gitlab-runner --log-format json list 2>&1 | grep Token | jq -r '.msg +"," + .Token') + + echo "NEEDED_SERVICES: " "''${!NEEDED_SERVICES[@]}" + echo "REGISTERED_SERVICES:" "''${!REGISTERED_SERVICES[@]}" # difference between current and desired state - NEW_SERVICES=$(grep -vxF -f <(echo "$REGISTERED_SERVICES") <(echo "$NEEDED_SERVICES") || true) - OLD_SERVICES=$(grep -vxF -f <(echo "$NEEDED_SERVICES") <(echo "$REGISTERED_SERVICES") || true) + declare -A NEW_SERVICES + for name in "''${!NEEDED_SERVICES[@]}"; do + if [ ! -v 'REGISTERED_SERVICES[$name]' ]; then + NEW_SERVICES[$name]=1 + fi + done + + declare -A OLD_SERVICES + # shellcheck disable=SC2034 + for name in "''${!REGISTERED_SERVICES[@]}"; do + if [ ! -v 'NEEDED_SERVICES[$name]' ]; then + OLD_SERVICES[$name]=1 + fi + done # register new services ${concatStringsSep "\n" (mapAttrsToList (name: service: '' - if echo "$NEW_SERVICES" | grep -xq "${name}"; then + # TODO so here we should mention NEW_SERVICES + if [ -v 'NEW_SERVICES["${name}"]' ] ; then bash -c ${escapeShellArg (concatStringsSep " \\\n " ([ "set -a && source ${service.registrationConfigFile} &&" "gitlab-runner register" "--non-interactive" - (if service.description != null then "--description \"${service.description}\"" else "--name '${name}'") + "--name '${name}'" "--executor ${service.executor}" "--limit ${toString service.limit}" "--request-concurrency ${toString service.requestConcurrency}" @@ -92,22 +130,26 @@ let fi '') hashedServices)} + # check key is in array https://stackoverflow.com/questions/30353951/how-to-check-if-dictionary-contains-a-key-in-bash + + echo "NEW_SERVICES: ''${NEW_SERVICES[*]}" + echo "OLD_SERVICES: ''${OLD_SERVICES[*]}" # unregister old services - for NAME in $(echo "$OLD_SERVICES") + for NAME in "''${!OLD_SERVICES[@]}" do - [ ! -z "$NAME" ] && gitlab-runner unregister \ + [ -n "$NAME" ] && gitlab-runner unregister \ --name "$NAME" && sleep 1 done # make config file readable by service - chown -R --reference=$HOME $(dirname ${configPath}) - ''); + chown -R --reference="$HOME" "$(dirname ${configPath})" + ''; + }; startScript = pkgs.writeShellScriptBin "gitlab-runner-start" '' export CONFIG_FILE=${configPath} exec gitlab-runner run --working-directory $HOME ''; -in -{ +in { options.services.gitlab-runner = { enable = mkEnableOption (lib.mdDoc "Gitlab Runner"); configFile = mkOption { @@ -141,7 +183,7 @@ in default = false; description = lib.mdDoc '' Finish all remaining jobs before stopping. - If not set gitlab-runner will stop immediatly without waiting + If not set gitlab-runner will stop immediately without waiting for jobs to finish, which will lead to failed builds. ''; }; @@ -492,9 +534,9 @@ in }; }; config = mkIf cfg.enable { - warnings = (mapAttrsToList + warnings = mapAttrsToList (n: v: "services.gitlab-runner.services.${n}.`registrationConfigFile` points to a file in Nix Store. You should use quoted absolute path to prevent this.") - (filterAttrs (n: v: isStorePath v.registrationConfigFile) cfg.services)); + (filterAttrs (n: v: isStorePath v.registrationConfigFile) cfg.services); environment.systemPackages = [ cfg.package ]; systemd.services.gitlab-runner = { @@ -528,7 +570,7 @@ in ExecStartPre = "!${configureScript}/bin/gitlab-runner-configure"; ExecStart = "${startScript}/bin/gitlab-runner-start"; ExecReload = "!${configureScript}/bin/gitlab-runner-configure"; - } // optionalAttrs (cfg.gracefulTermination) { + } // optionalAttrs cfg.gracefulTermination { TimeoutStopSec = "${cfg.gracefulTimeout}"; KillSignal = "SIGQUIT"; KillMode = "process"; diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix index 25c16a5c721c..bf7fd529bfca 100644 --- a/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -46,7 +46,7 @@ in { port = mkOption { default = 8153; - type = types.int; + type = types.port; description = lib.mdDoc '' Specifies port number on which the Go.CD server HTTP interface listens. ''; diff --git a/nixos/modules/services/continuous-integration/hail.nix b/nixos/modules/services/continuous-integration/hail.nix index 76d7356e2472..62e8b8077c07 100644 --- a/nixos/modules/services/continuous-integration/hail.nix +++ b/nixos/modules/services/continuous-integration/hail.nix @@ -15,8 +15,8 @@ in { default = false; description = lib.mdDoc '' Enables the Hail Auto Update Service. Hail can automatically deploy artifacts - built by a Hydra Continous Integration server. A common use case is to provide - continous deployment for single services or a full NixOS configuration.''; + built by a Hydra Continuous Integration server. A common use case is to provide + continuous deployment for single services or a full NixOS configuration.''; }; profile = mkOption { type = types.str; diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 711479575042..564bcd37dec5 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -122,7 +122,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 3000; description = lib.mdDoc '' TCP port the web server should listen to. diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix index 7556dbfc7b84..e26acb88d8c8 100644 --- a/nixos/modules/services/databases/cassandra.nix +++ b/nixos/modules/services/databases/cassandra.nix @@ -19,6 +19,10 @@ let cfg = config.services.cassandra; + atLeast3 = versionAtLeast cfg.package.version "3"; + atLeast3_11 = versionAtLeast cfg.package.version "3.11"; + atLeast4 = versionAtLeast cfg.package.version "4"; + defaultUser = "cassandra"; cassandraConfig = flip recursiveUpdate cfg.extraConfig ( @@ -39,7 +43,7 @@ let parameters = [{ seeds = concatStringsSep "," cfg.seedAddresses; }]; } ]; - } // optionalAttrs (versionAtLeast cfg.package.version "3") { + } // optionalAttrs atLeast3 { hints_directory = "${cfg.homeDir}/hints"; } ); @@ -62,7 +66,7 @@ let cassandraLogbackConfig = pkgs.writeText "logback.xml" cfg.logbackConfig; passAsFile = [ "extraEnvSh" ]; - inherit (cfg) extraEnvSh; + inherit (cfg) extraEnvSh package; buildCommand = '' mkdir -p "$out" @@ -80,6 +84,10 @@ let # Delete default password file sed -i '/-Dcom.sun.management.jmxremote.password.file=\/etc\/cassandra\/jmxremote.password/d' "$out/cassandra-env.sh" + + ${lib.optionalString atLeast4 '' + cp $package/conf/jvm*.options $out/ + ''} ''; }; @@ -95,8 +103,20 @@ let "-Dcom.sun.management.jmxremote.password.file=${cfg.jmxRolesFile}" ] ++ optionals cfg.remoteJmx [ "-Djava.rmi.server.hostname=${cfg.rpcAddress}" + ] ++ optionals atLeast4 [ + # Historically, we don't use a log dir, whereas the upstream scripts do + # expect this. We override those by providing our own -Xlog:gc flag. + "-Xlog:gc=warning,heap*=warning,age*=warning,safepoint=warning,promotion*=warning" ]; + commonEnv = { + # Sufficient for cassandra 2.x, 3.x + CASSANDRA_CONF = "${cassandraEtc}"; + + # Required since cassandra 4 + CASSANDRA_LOGBACK_CONF = "${cassandraEtc}/logback.xml"; + }; + in { options.services.cassandra = { @@ -435,7 +455,7 @@ in jmxRolesFile = mkOption { type = types.nullOr types.path; default = - if versionAtLeast cfg.package.version "3.11" + if atLeast3_11 then pkgs.writeText "jmx-roles-file" defaultJmxRolesFile else null; defaultText = literalMD ''generated configuration file if version is at least 3.11, otherwise `null`''; @@ -486,8 +506,7 @@ in systemd.services.cassandra = { description = "Apache Cassandra service"; after = [ "network.target" ]; - environment = { - CASSANDRA_CONF = "${cassandraEtc}"; + environment = commonEnv // { JVM_OPTS = builtins.concatStringsSep " " fullJvmOptions; MAX_HEAP_SIZE = toString cfg.maxHeapSize; HEAP_NEWSIZE = toString cfg.heapNewSize; @@ -508,6 +527,7 @@ in description = "Perform a full repair on this Cassandra node"; after = [ "cassandra.service" ]; requires = [ "cassandra.service" ]; + environment = commonEnv; serviceConfig = { User = cfg.user; Group = cfg.group; @@ -536,6 +556,7 @@ in description = "Perform an incremental repair on this cassandra node."; after = [ "cassandra.service" ]; requires = [ "cassandra.service" ]; + environment = commonEnv; serviceConfig = { User = cfg.user; Group = cfg.group; diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix index 96607d9a783c..04dd20b5f14d 100644 --- a/nixos/modules/services/databases/clickhouse.nix +++ b/nixos/modules/services/databases/clickhouse.nix @@ -16,7 +16,7 @@ with lib; package = mkOption { type = types.package; default = pkgs.clickhouse; - defaultText = "pkgs.clickhouse"; + defaultText = lib.literalExpression "pkgs.clickhouse"; description = lib.mdDoc '' ClickHouse package to use. ''; diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 16b82b867a3d..cdf32654e663 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -122,7 +122,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 5984; description = lib.mdDoc '' Defined the port number to listen. diff --git a/nixos/modules/services/databases/dgraph.nix b/nixos/modules/services/databases/dgraph.nix index 5726851a43f9..887164fa5b94 100644 --- a/nixos/modules/services/databases/dgraph.nix +++ b/nixos/modules/services/databases/dgraph.nix @@ -55,7 +55,7 @@ in services.dgraph = { enable = mkEnableOption (lib.mdDoc "Dgraph native GraphQL database with a graph backend"); - package = lib.mkPackageOption pkgs "dgraph" { }; + package = lib.mkPackageOptionMD pkgs "dgraph" { }; settings = mkOption { type = settingsFormat.type; diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index b2c4a5dd8f62..4c2855345368 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -14,7 +14,7 @@ # # Be careful, virtuoso-opensource also provides a different isql command ! -# There are at least two ways to run firebird. superserver has been choosen +# There are at least two ways to run firebird. superserver has been chosen # however there are no strong reasons to prefer this or the other one AFAIK # Eg superserver is said to be most efficiently using resources according to # http://www.firebirdsql.org/manual/qsg25-classic-or-super.html diff --git a/nixos/modules/services/databases/foundationdb.md b/nixos/modules/services/databases/foundationdb.md new file mode 100644 index 000000000000..f852c6888d84 --- /dev/null +++ b/nixos/modules/services/databases/foundationdb.md @@ -0,0 +1,309 @@ +# FoundationDB {#module-services-foundationdb} + +*Source:* {file}`modules/services/databases/foundationdb.nix` + +*Upstream documentation:* + +*Maintainer:* Austin Seipp + +*Available version(s):* 5.1.x, 5.2.x, 6.0.x + +FoundationDB (or "FDB") is an open source, distributed, transactional +key-value store. + +## Configuring and basic setup {#module-services-foundationdb-configuring} + +To enable FoundationDB, add the following to your +{file}`configuration.nix`: +``` +services.foundationdb.enable = true; +services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x +``` + +The {option}`services.foundationdb.package` option is required, and +must always be specified. Due to the fact FoundationDB network protocols and +on-disk storage formats may change between (major) versions, and upgrades +must be explicitly handled by the user, you must always manually specify +this yourself so that the NixOS module will use the proper version. Note +that minor, bugfix releases are always compatible. + +After running {command}`nixos-rebuild`, you can verify whether +FoundationDB is running by executing {command}`fdbcli` (which is +added to {option}`environment.systemPackages`): +```ShellSession +$ sudo -u foundationdb fdbcli +Using cluster file `/etc/foundationdb/fdb.cluster'. + +The database is available. + +Welcome to the fdbcli. For help, type `help'. +fdb> status + +Using cluster file `/etc/foundationdb/fdb.cluster'. + +Configuration: + Redundancy mode - single + Storage engine - memory + Coordinators - 1 + +Cluster: + FoundationDB processes - 1 + Machines - 1 + Memory availability - 5.4 GB per process on machine with least available + Fault Tolerance - 0 machines + Server time - 04/20/18 15:21:14 + +... + +fdb> +``` + +You can also write programs using the available client libraries. For +example, the following Python program can be run in order to grab the +cluster status, as a quick example. (This example uses +{command}`nix-shell` shebang support to automatically supply the +necessary Python modules). +```ShellSession +a@link> cat fdb-status.py +#! /usr/bin/env nix-shell +#! nix-shell -i python -p python pythonPackages.foundationdb52 + +import fdb +import json + +def main(): + fdb.api_version(520) + db = fdb.open() + + @fdb.transactional + def get_status(tr): + return str(tr['\xff\xff/status/json']) + + obj = json.loads(get_status(db)) + print('FoundationDB available: %s' % obj['client']['database_status']['available']) + +if __name__ == "__main__": + main() +a@link> chmod +x fdb-status.py +a@link> ./fdb-status.py +FoundationDB available: True +a@link> +``` + +FoundationDB is run under the {command}`foundationdb` user and group +by default, but this may be changed in the NixOS configuration. The systemd +unit {command}`foundationdb.service` controls the +{command}`fdbmonitor` process. + +By default, the NixOS module for FoundationDB creates a single SSD-storage +based database for development and basic usage. This storage engine is +designed for SSDs and will perform poorly on HDDs; however it can handle far +more data than the alternative "memory" engine and is a better default +choice for most deployments. (Note that you can change the storage backend +on-the-fly for a given FoundationDB cluster using +{command}`fdbcli`.) + +Furthermore, only 1 server process and 1 backup agent are started in the +default configuration. See below for more on scaling to increase this. + +FoundationDB stores all data for all server processes under +{file}`/var/lib/foundationdb`. You can override this using +{option}`services.foundationdb.dataDir`, e.g. +``` +services.foundationdb.dataDir = "/data/fdb"; +``` + +Similarly, logs are stored under {file}`/var/log/foundationdb` +by default, and there is a corresponding +{option}`services.foundationdb.logDir` as well. + +## Scaling processes and backup agents {#module-services-foundationdb-scaling} + +Scaling the number of server processes is quite easy; simply specify +{option}`services.foundationdb.serverProcesses` to be the number of +FoundationDB worker processes that should be started on the machine. + +FoundationDB worker processes typically require 4GB of RAM per-process at +minimum for good performance, so this option is set to 1 by default since +the maximum amount of RAM is unknown. You're advised to abide by this +restriction, so pick a number of processes so that each has 4GB or more. + +A similar option exists in order to scale backup agent processes, +{option}`services.foundationdb.backupProcesses`. Backup agents are +not as performance/RAM sensitive, so feel free to experiment with the number +of available backup processes. + +## Clustering {#module-services-foundationdb-clustering} + +FoundationDB on NixOS works similarly to other Linux systems, so this +section will be brief. Please refer to the full FoundationDB documentation +for more on clustering. + +FoundationDB organizes clusters using a set of +*coordinators*, which are just specially-designated +worker processes. By default, every installation of FoundationDB on NixOS +will start as its own individual cluster, with a single coordinator: the +first worker process on {command}`localhost`. + +Coordinators are specified globally using the +{command}`/etc/foundationdb/fdb.cluster` file, which all servers and +client applications will use to find and join coordinators. Note that this +file *can not* be managed by NixOS so easily: +FoundationDB is designed so that it will rewrite the file at runtime for all +clients and nodes when cluster coordinators change, with clients +transparently handling this without intervention. It is fundamentally a +mutable file, and you should not try to manage it in any way in NixOS. + +When dealing with a cluster, there are two main things you want to do: + + - Add a node to the cluster for storage/compute. + - Promote an ordinary worker to a coordinator. + +A node must already be a member of the cluster in order to properly be +promoted to a coordinator, so you must always add it first if you wish to +promote it. + +To add a machine to a FoundationDB cluster: + + - Choose one of the servers to start as the initial coordinator. + - Copy the {command}`/etc/foundationdb/fdb.cluster` file from this + server to all the other servers. Restart FoundationDB on all of these + other servers, so they join the cluster. + - All of these servers are now connected and working together in the + cluster, under the chosen coordinator. + +At this point, you can add as many nodes as you want by just repeating the +above steps. By default there will still be a single coordinator: you can +use {command}`fdbcli` to change this and add new coordinators. + +As a convenience, FoundationDB can automatically assign coordinators based +on the redundancy mode you wish to achieve for the cluster. Once all the +nodes have been joined, simply set the replication policy, and then issue +the {command}`coordinators auto` command + +For example, assuming we have 3 nodes available, we can enable double +redundancy mode, then auto-select coordinators. For double redundancy, 3 +coordinators is ideal: therefore FoundationDB will make +*every* node a coordinator automatically: + +```ShellSession +fdbcli> configure double ssd +fdbcli> coordinators auto +``` + +This will transparently update all the servers within seconds, and +appropriately rewrite the {command}`fdb.cluster` file, as well as +informing all client processes to do the same. + +## Client connectivity {#module-services-foundationdb-connectivity} + +By default, all clients must use the current {command}`fdb.cluster` +file to access a given FoundationDB cluster. This file is located by default +in {command}`/etc/foundationdb/fdb.cluster` on all machines with the +FoundationDB service enabled, so you may copy the active one from your +cluster to a new node in order to connect, if it is not part of the cluster. + +## Client authorization and TLS {#module-services-foundationdb-authorization} + +By default, any user who can connect to a FoundationDB process with the +correct cluster configuration can access anything. FoundationDB uses a +pluggable design to transport security, and out of the box it supports a +LibreSSL-based plugin for TLS support. This plugin not only does in-flight +encryption, but also performs client authorization based on the given +endpoint's certificate chain. For example, a FoundationDB server may be +configured to only accept client connections over TLS, where the client TLS +certificate is from organization *Acme Co* in the +*Research and Development* unit. + +Configuring TLS with FoundationDB is done using the +{option}`services.foundationdb.tls` options in order to control the +peer verification string, as well as the certificate and its private key. + +Note that the certificate and its private key must be accessible to the +FoundationDB user account that the server runs under. These files are also +NOT managed by NixOS, as putting them into the store may reveal private +information. + +After you have a key and certificate file in place, it is not enough to +simply set the NixOS module options -- you must also configure the +{command}`fdb.cluster` file to specify that a given set of +coordinators use TLS. This is as simple as adding the suffix +{command}`:tls` to your cluster coordinator configuration, after the +port number. For example, assuming you have a coordinator on localhost with +the default configuration, simply specifying: + +``` +XXXXXX:XXXXXX@127.0.0.1:4500:tls +``` + +will configure all clients and server processes to use TLS from now on. + +## Backups and Disaster Recovery {#module-services-foundationdb-disaster-recovery} + +The usual rules for doing FoundationDB backups apply on NixOS as written in +the FoundationDB manual. However, one important difference is the security +profile for NixOS: by default, the {command}`foundationdb` systemd +unit uses *Linux namespaces* to restrict write access to +the system, except for the log directory, data directory, and the +{command}`/etc/foundationdb/` directory. This is enforced by default +and cannot be disabled. + +However, a side effect of this is that the {command}`fdbbackup` +command doesn't work properly for local filesystem backups: FoundationDB +uses a server process alongside the database processes to perform backups +and copy the backups to the filesystem. As a result, this process is put +under the restricted namespaces above: the backup process can only write to +a limited number of paths. + +In order to allow flexible backup locations on local disks, the FoundationDB +NixOS module supports a +{option}`services.foundationdb.extraReadWritePaths` option. This +option takes a list of paths, and adds them to the systemd unit, allowing +the processes inside the service to write (and read) the specified +directories. + +For example, to create backups in {command}`/opt/fdb-backups`, first +set up the paths in the module options: + +``` +services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ]; +``` + +Restart the FoundationDB service, and it will now be able to write to this +directory (even if it does not yet exist.) Note: this path +*must* exist before restarting the unit. Otherwise, +systemd will not include it in the private FoundationDB namespace (and it +will not add it dynamically at runtime). + +You can now perform a backup: + +```ShellSession +$ sudo -u foundationdb fdbbackup start -t default -d file:///opt/fdb-backups +$ sudo -u foundationdb fdbbackup status -t default +``` + +## Known limitations {#module-services-foundationdb-limitations} + +The FoundationDB setup for NixOS should currently be considered beta. +FoundationDB is not new software, but the NixOS compilation and integration +has only undergone fairly basic testing of all the available functionality. + + - There is no way to specify individual parameters for individual + {command}`fdbserver` processes. Currently, all server processes + inherit all the global {command}`fdbmonitor` settings. + - Ruby bindings are not currently installed. + - Go bindings are not currently installed. + +## Options {#module-services-foundationdb-options} + +NixOS's FoundationDB module allows you to configure all of the most relevant +configuration options for {command}`fdbmonitor`, matching it quite +closely. A complete list of options for the FoundationDB module may be found +[here](#opt-services.foundationdb.enable). You should +also read the FoundationDB documentation as well. + +## Full documentation {#module-services-foundationdb-full-docs} + +FoundationDB is a complex piece of software, and requires careful +administration to properly use. Full documentation for administration can be +found here: . diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index 16d539b661eb..48e9898a68c2 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -424,6 +424,6 @@ in }; }; - meta.doc = ./foundationdb.xml; + meta.doc = ./foundationdb.md; meta.maintainers = with lib.maintainers; [ thoughtpolice ]; } diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml deleted file mode 100644 index b0b1ebeab45f..000000000000 --- a/nixos/modules/services/databases/foundationdb.xml +++ /dev/null @@ -1,443 +0,0 @@ - - FoundationDB - - Source: - modules/services/databases/foundationdb.nix - - - Upstream documentation: - - - - Maintainer: Austin Seipp - - - Available version(s): 5.1.x, 5.2.x, 6.0.x - - - FoundationDB (or "FDB") is an open source, distributed, transactional - key-value store. - -
- Configuring and basic setup - - - To enable FoundationDB, add the following to your - configuration.nix: - -services.foundationdb.enable = true; -services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x - - - - - The option is required, and - must always be specified. Due to the fact FoundationDB network protocols and - on-disk storage formats may change between (major) versions, and upgrades - must be explicitly handled by the user, you must always manually specify - this yourself so that the NixOS module will use the proper version. Note - that minor, bugfix releases are always compatible. - - - - After running nixos-rebuild, you can verify whether - FoundationDB is running by executing fdbcli (which is - added to ): - -$ sudo -u foundationdb fdbcli -Using cluster file `/etc/foundationdb/fdb.cluster'. - -The database is available. - -Welcome to the fdbcli. For help, type `help'. -fdb> status - -Using cluster file `/etc/foundationdb/fdb.cluster'. - -Configuration: - Redundancy mode - single - Storage engine - memory - Coordinators - 1 - -Cluster: - FoundationDB processes - 1 - Machines - 1 - Memory availability - 5.4 GB per process on machine with least available - Fault Tolerance - 0 machines - Server time - 04/20/18 15:21:14 - -... - -fdb> - - - - - You can also write programs using the available client libraries. For - example, the following Python program can be run in order to grab the - cluster status, as a quick example. (This example uses - nix-shell shebang support to automatically supply the - necessary Python modules). - -a@link> cat fdb-status.py -#! /usr/bin/env nix-shell -#! nix-shell -i python -p python pythonPackages.foundationdb52 - -import fdb -import json - -def main(): - fdb.api_version(520) - db = fdb.open() - - @fdb.transactional - def get_status(tr): - return str(tr['\xff\xff/status/json']) - - obj = json.loads(get_status(db)) - print('FoundationDB available: %s' % obj['client']['database_status']['available']) - -if __name__ == "__main__": - main() -a@link> chmod +x fdb-status.py -a@link> ./fdb-status.py -FoundationDB available: True -a@link> - - - - - FoundationDB is run under the foundationdb user and group - by default, but this may be changed in the NixOS configuration. The systemd - unit foundationdb.service controls the - fdbmonitor process. - - - - By default, the NixOS module for FoundationDB creates a single SSD-storage - based database for development and basic usage. This storage engine is - designed for SSDs and will perform poorly on HDDs; however it can handle far - more data than the alternative "memory" engine and is a better default - choice for most deployments. (Note that you can change the storage backend - on-the-fly for a given FoundationDB cluster using - fdbcli.) - - - - Furthermore, only 1 server process and 1 backup agent are started in the - default configuration. See below for more on scaling to increase this. - - - - FoundationDB stores all data for all server processes under - /var/lib/foundationdb. You can override this using - , e.g. - -services.foundationdb.dataDir = "/data/fdb"; - - - - - Similarly, logs are stored under /var/log/foundationdb - by default, and there is a corresponding - as well. - -
-
- Scaling processes and backup agents - - - Scaling the number of server processes is quite easy; simply specify - to be the number of - FoundationDB worker processes that should be started on the machine. - - - - FoundationDB worker processes typically require 4GB of RAM per-process at - minimum for good performance, so this option is set to 1 by default since - the maximum amount of RAM is unknown. You're advised to abide by this - restriction, so pick a number of processes so that each has 4GB or more. - - - - A similar option exists in order to scale backup agent processes, - . Backup agents are - not as performance/RAM sensitive, so feel free to experiment with the number - of available backup processes. - -
-
- Clustering - - - FoundationDB on NixOS works similarly to other Linux systems, so this - section will be brief. Please refer to the full FoundationDB documentation - for more on clustering. - - - - FoundationDB organizes clusters using a set of - coordinators, which are just specially-designated - worker processes. By default, every installation of FoundationDB on NixOS - will start as its own individual cluster, with a single coordinator: the - first worker process on localhost. - - - - Coordinators are specified globally using the - /etc/foundationdb/fdb.cluster file, which all servers and - client applications will use to find and join coordinators. Note that this - file can not be managed by NixOS so easily: - FoundationDB is designed so that it will rewrite the file at runtime for all - clients and nodes when cluster coordinators change, with clients - transparently handling this without intervention. It is fundamentally a - mutable file, and you should not try to manage it in any way in NixOS. - - - - When dealing with a cluster, there are two main things you want to do: - - - - - - Add a node to the cluster for storage/compute. - - - - - Promote an ordinary worker to a coordinator. - - - - - - A node must already be a member of the cluster in order to properly be - promoted to a coordinator, so you must always add it first if you wish to - promote it. - - - - To add a machine to a FoundationDB cluster: - - - - - - Choose one of the servers to start as the initial coordinator. - - - - - Copy the /etc/foundationdb/fdb.cluster file from this - server to all the other servers. Restart FoundationDB on all of these - other servers, so they join the cluster. - - - - - All of these servers are now connected and working together in the - cluster, under the chosen coordinator. - - - - - - At this point, you can add as many nodes as you want by just repeating the - above steps. By default there will still be a single coordinator: you can - use fdbcli to change this and add new coordinators. - - - - As a convenience, FoundationDB can automatically assign coordinators based - on the redundancy mode you wish to achieve for the cluster. Once all the - nodes have been joined, simply set the replication policy, and then issue - the coordinators auto command - - - - For example, assuming we have 3 nodes available, we can enable double - redundancy mode, then auto-select coordinators. For double redundancy, 3 - coordinators is ideal: therefore FoundationDB will make - every node a coordinator automatically: - - - -fdbcli> configure double ssd -fdbcli> coordinators auto - - - - This will transparently update all the servers within seconds, and - appropriately rewrite the fdb.cluster file, as well as - informing all client processes to do the same. - -
-
- Client connectivity - - - By default, all clients must use the current fdb.cluster - file to access a given FoundationDB cluster. This file is located by default - in /etc/foundationdb/fdb.cluster on all machines with the - FoundationDB service enabled, so you may copy the active one from your - cluster to a new node in order to connect, if it is not part of the cluster. - -
-
- Client authorization and TLS - - - By default, any user who can connect to a FoundationDB process with the - correct cluster configuration can access anything. FoundationDB uses a - pluggable design to transport security, and out of the box it supports a - LibreSSL-based plugin for TLS support. This plugin not only does in-flight - encryption, but also performs client authorization based on the given - endpoint's certificate chain. For example, a FoundationDB server may be - configured to only accept client connections over TLS, where the client TLS - certificate is from organization Acme Co in the - Research and Development unit. - - - - Configuring TLS with FoundationDB is done using the - options in order to control the - peer verification string, as well as the certificate and its private key. - - - - Note that the certificate and its private key must be accessible to the - FoundationDB user account that the server runs under. These files are also - NOT managed by NixOS, as putting them into the store may reveal private - information. - - - - After you have a key and certificate file in place, it is not enough to - simply set the NixOS module options -- you must also configure the - fdb.cluster file to specify that a given set of - coordinators use TLS. This is as simple as adding the suffix - :tls to your cluster coordinator configuration, after the - port number. For example, assuming you have a coordinator on localhost with - the default configuration, simply specifying: - - - -XXXXXX:XXXXXX@127.0.0.1:4500:tls - - - - will configure all clients and server processes to use TLS from now on. - -
-
- Backups and Disaster Recovery - - - The usual rules for doing FoundationDB backups apply on NixOS as written in - the FoundationDB manual. However, one important difference is the security - profile for NixOS: by default, the foundationdb systemd - unit uses Linux namespaces to restrict write access to - the system, except for the log directory, data directory, and the - /etc/foundationdb/ directory. This is enforced by default - and cannot be disabled. - - - - However, a side effect of this is that the fdbbackup - command doesn't work properly for local filesystem backups: FoundationDB - uses a server process alongside the database processes to perform backups - and copy the backups to the filesystem. As a result, this process is put - under the restricted namespaces above: the backup process can only write to - a limited number of paths. - - - - In order to allow flexible backup locations on local disks, the FoundationDB - NixOS module supports a - option. This - option takes a list of paths, and adds them to the systemd unit, allowing - the processes inside the service to write (and read) the specified - directories. - - - - For example, to create backups in /opt/fdb-backups, first - set up the paths in the module options: - - - -services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ]; - - - - Restart the FoundationDB service, and it will now be able to write to this - directory (even if it does not yet exist.) Note: this path - must exist before restarting the unit. Otherwise, - systemd will not include it in the private FoundationDB namespace (and it - will not add it dynamically at runtime). - - - - You can now perform a backup: - - - -$ sudo -u foundationdb fdbbackup start -t default -d file:///opt/fdb-backups -$ sudo -u foundationdb fdbbackup status -t default - -
-
- Known limitations - - - The FoundationDB setup for NixOS should currently be considered beta. - FoundationDB is not new software, but the NixOS compilation and integration - has only undergone fairly basic testing of all the available functionality. - - - - - - There is no way to specify individual parameters for individual - fdbserver processes. Currently, all server processes - inherit all the global fdbmonitor settings. - - - - - Ruby bindings are not currently installed. - - - - - Go bindings are not currently installed. - - - -
-
- Options - - - NixOS's FoundationDB module allows you to configure all of the most relevant - configuration options for fdbmonitor, matching it quite - closely. A complete list of options for the FoundationDB module may be found - here. You should - also read the FoundationDB documentation as well. - -
-
- Full documentation - - - FoundationDB is a complex piece of software, and requires careful - administration to properly use. Full documentation for administration can be - found here: . - -
-
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index ec4524e9061d..128bb0862175 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -160,10 +160,12 @@ in List of database names and their initial schemas that should be used to create databases on the first startup of MySQL. The schema attribute is optional: If not specified, an empty database is created. ''; - example = [ - { name = "foodatabase"; schema = literalExpression "./foodatabase.sql"; } - { name = "bardatabase"; } - ]; + example = literalExpression '' + [ + { name = "foodatabase"; schema = ./foodatabase.sql; } + { name = "bardatabase"; } + ] + ''; }; initialScript = mkOption { diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 7a59de372f24..cba3442023cb 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -16,7 +16,7 @@ let # systemd/systemd#19604 description = '' LDAP value - either a string, or an attrset containing - path or base64 for included + `path` or `base64` for included values or base-64 encoded values respectively. ''; check = x: lib.isString x || (lib.isAttrs x && (x ? path || x ? base64)); diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md new file mode 100644 index 000000000000..1805bafe3be3 --- /dev/null +++ b/nixos/modules/services/databases/postgresql.md @@ -0,0 +1,173 @@ +# PostgreSQL {#module-postgresql} + + + + +*Source:* {file}`modules/services/databases/postgresql.nix` + +*Upstream documentation:* + + + +PostgreSQL is an advanced, free relational database. + + +## Configuring {#module-services-postgres-configuring} + +To enable PostgreSQL, add the following to your {file}`configuration.nix`: +``` +services.postgresql.enable = true; +services.postgresql.package = pkgs.postgresql_11; +``` +Note that you are required to specify the desired version of PostgreSQL (e.g. `pkgs.postgresql_11`). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for [](#opt-services.postgresql.package) such as the most recent release of PostgreSQL. + + + +By default, PostgreSQL stores its databases in {file}`/var/lib/postgresql/$psqlSchema`. You can override this using [](#opt-services.postgresql.dataDir), e.g. +``` +services.postgresql.dataDir = "/data/postgresql"; +``` + +## Upgrading {#module-services-postgres-upgrading} + +::: {.note} +The steps below demonstrate how to upgrade from an older version to `pkgs.postgresql_13`. +These instructions are also applicable to other versions. +::: + +Major PostgreSQL upgrades require a downtime and a few imperative steps to be called. This is the case because +each major version has some internal changes in the databases' state during major releases. Because of that, +NixOS places the state into {file}`/var/lib/postgresql/<version>` where each `version` +can be obtained like this: +``` +$ nix-instantiate --eval -A postgresql_13.psqlSchema +"13" +``` +For an upgrade, a script like this can be used to simplify the process: +``` +{ config, pkgs, ... }: +{ + environment.systemPackages = [ + (let + # XXX specify the postgresql package you'd like to upgrade to. + # Do not forget to list the extensions you need. + newPostgres = pkgs.postgresql_13.withPackages (pp: [ + # pp.plv8 + ]); + in pkgs.writeScriptBin "upgrade-pg-cluster" '' + set -eux + # XXX it's perhaps advisable to stop all services that depend on postgresql + systemctl stop postgresql + + export NEWDATA="/var/lib/postgresql/${newPostgres.psqlSchema}" + + export NEWBIN="${newPostgres}/bin" + + export OLDDATA="${config.services.postgresql.dataDir}" + export OLDBIN="${config.services.postgresql.package}/bin" + + install -d -m 0700 -o postgres -g postgres "$NEWDATA" + cd "$NEWDATA" + sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" + + sudo -u postgres $NEWBIN/pg_upgrade \ + --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \ + --old-bindir $OLDBIN --new-bindir $NEWBIN \ + "$@" + '') + ]; +} +``` + +The upgrade process is: + + 1. Rebuild nixos configuration with the configuration above added to your {file}`configuration.nix`. Alternatively, add that into separate file and reference it in `imports` list. + 2. Login as root (`sudo su -`) + 3. Run `upgrade-pg-cluster`. It will stop old postgresql, initialize a new one and migrate the old one to the new one. You may supply arguments like `--jobs 4` and `--link` to speedup migration process. See for details. + 4. Change postgresql package in NixOS configuration to the one you were upgrading to via [](#opt-services.postgresql.package). Rebuild NixOS. This should start new postgres using upgraded data directory and all services you stopped during the upgrade. + 5. After the upgrade it's advisable to analyze the new cluster. + + - For PostgreSQL ≥ 14, use the `vacuumdb` command printed by the upgrades script. + - For PostgreSQL < 14, run (as `su -l postgres` in the [](#opt-services.postgresql.dataDir), in this example {file}`/var/lib/postgresql/13`): + + ``` + $ ./analyze_new_cluster.sh + ``` + + ::: {.warning} + The next step removes the old state-directory! + ::: + + ``` + $ ./delete_old_cluster.sh + ``` + +## Options {#module-services-postgres-options} + +A complete list of options for the PostgreSQL module may be found [here](#opt-services.postgresql.enable). + +## Plugins {#module-services-postgres-plugins} + +Plugins collection for each PostgreSQL version can be accessed with `.pkgs`. For example, for `pkgs.postgresql_11` package, its plugin collection is accessed by `pkgs.postgresql_11.pkgs`: +```ShellSession +$ nix repl '' + +Loading ''... +Added 10574 variables. + +nix-repl> postgresql_11.pkgs. +postgresql_11.pkgs.cstore_fdw postgresql_11.pkgs.pg_repack +postgresql_11.pkgs.pg_auto_failover postgresql_11.pkgs.pg_safeupdate +postgresql_11.pkgs.pg_bigm postgresql_11.pkgs.pg_similarity +postgresql_11.pkgs.pg_cron postgresql_11.pkgs.pg_topn +postgresql_11.pkgs.pg_hll postgresql_11.pkgs.pgjwt +postgresql_11.pkgs.pg_partman postgresql_11.pkgs.pgroonga +... +``` + +To add plugins via NixOS configuration, set `services.postgresql.extraPlugins`: +``` +services.postgresql.package = pkgs.postgresql_11; +services.postgresql.extraPlugins = with pkgs.postgresql_11.pkgs; [ + pg_repack + postgis +]; +``` + +You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using function `.withPackages`. For example, creating a custom PostgreSQL package in an overlay can look like: +``` +self: super: { + postgresql_custom = self.postgresql_11.withPackages (ps: [ + ps.pg_repack + ps.postgis + ]); +} +``` + +Here's a recipe on how to override a particular plugin through an overlay: +``` +self: super: { + postgresql_11 = super.postgresql_11.override { this = self.postgresql_11; } // { + pkgs = super.postgresql_11.pkgs // { + pg_repack = super.postgresql_11.pkgs.pg_repack.overrideAttrs (_: { + name = "pg_repack-v20181024"; + src = self.fetchzip { + url = "https://github.com/reorg/pg_repack/archive/923fa2f3c709a506e111cc963034bf2fd127aa00.tar.gz"; + sha256 = "17k6hq9xaax87yz79j773qyigm4fwk8z4zh5cyp6z0sxnwfqxxw5"; + }; + }); + }; + }; +} +``` diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index e84116635a37..7bbe1ad22595 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -51,7 +51,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 5432; description = lib.mdDoc '' The port on which PostgreSQL listens. @@ -146,6 +146,7 @@ in Name of the user to ensure. ''; }; + ensurePermissions = mkOption { type = types.attrsOf types.str; default = {}; @@ -167,6 +168,154 @@ in } ''; }; + + ensureClauses = mkOption { + description = lib.mdDoc '' + An attrset of clauses to grant to the user. Under the hood this uses the + [ALTER USER syntax](https://www.postgresql.org/docs/current/sql-alteruser.html) for each attrName where + the attrValue is true in the attrSet: + `ALTER USER user.name WITH attrName` + ''; + example = literalExpression '' + { + superuser = true; + createrole = true; + createdb = true; + } + ''; + default = {}; + defaultText = lib.literalMD '' + The default, `null`, means that the user created will have the default permissions assigned by PostgreSQL. Subsequent server starts will not set or unset the clause, so imperative changes are preserved. + ''; + type = types.submodule { + options = let + defaultText = lib.literalMD '' + `null`: do not set. For newly created roles, use PostgreSQL's default. For existing roles, do not touch this clause. + ''; + in { + superuser = mkOption { + type = types.nullOr types.bool; + description = lib.mdDoc '' + Grants the user, created by the ensureUser attr, superuser permissions. From the postgres docs: + + A database superuser bypasses all permission checks, + except the right to log in. This is a dangerous privilege + and should not be used carelessly; it is best to do most + of your work as a role that is not a superuser. To create + a new database superuser, use CREATE ROLE name SUPERUSER. + You must do this as a role that is already a superuser. + + More information on postgres roles can be found [here](https://www.postgresql.org/docs/current/role-attributes.html) + ''; + default = null; + inherit defaultText; + }; + createrole = mkOption { + type = types.nullOr types.bool; + description = lib.mdDoc '' + Grants the user, created by the ensureUser attr, createrole permissions. From the postgres docs: + + A role must be explicitly given permission to create more + roles (except for superusers, since those bypass all + permission checks). To create such a role, use CREATE + ROLE name CREATEROLE. A role with CREATEROLE privilege + can alter and drop other roles, too, as well as grant or + revoke membership in them. However, to create, alter, + drop, or change membership of a superuser role, superuser + status is required; CREATEROLE is insufficient for that. + + More information on postgres roles can be found [here](https://www.postgresql.org/docs/current/role-attributes.html) + ''; + default = null; + inherit defaultText; + }; + createdb = mkOption { + type = types.nullOr types.bool; + description = lib.mdDoc '' + Grants the user, created by the ensureUser attr, createdb permissions. From the postgres docs: + + A role must be explicitly given permission to create + databases (except for superusers, since those bypass all + permission checks). To create such a role, use CREATE + ROLE name CREATEDB. + + More information on postgres roles can be found [here](https://www.postgresql.org/docs/current/role-attributes.html) + ''; + default = null; + inherit defaultText; + }; + "inherit" = mkOption { + type = types.nullOr types.bool; + description = lib.mdDoc '' + Grants the user created inherit permissions. From the postgres docs: + + A role is given permission to inherit the privileges of + roles it is a member of, by default. However, to create a + role without the permission, use CREATE ROLE name + NOINHERIT. + + More information on postgres roles can be found [here](https://www.postgresql.org/docs/current/role-attributes.html) + ''; + default = null; + inherit defaultText; + }; + login = mkOption { + type = types.nullOr types.bool; + description = lib.mdDoc '' + Grants the user, created by the ensureUser attr, login permissions. From the postgres docs: + + Only roles that have the LOGIN attribute can be used as + the initial role name for a database connection. A role + with the LOGIN attribute can be considered the same as a + “database user”. To create a role with login privilege, + use either: + + CREATE ROLE name LOGIN; CREATE USER name; + + (CREATE USER is equivalent to CREATE ROLE except that + CREATE USER includes LOGIN by default, while CREATE ROLE + does not.) + + More information on postgres roles can be found [here](https://www.postgresql.org/docs/current/role-attributes.html) + ''; + default = null; + inherit defaultText; + }; + replication = mkOption { + type = types.nullOr types.bool; + description = lib.mdDoc '' + Grants the user, created by the ensureUser attr, replication permissions. From the postgres docs: + + A role must explicitly be given permission to initiate + streaming replication (except for superusers, since those + bypass all permission checks). A role used for streaming + replication must have LOGIN permission as well. To create + such a role, use CREATE ROLE name REPLICATION LOGIN. + + More information on postgres roles can be found [here](https://www.postgresql.org/docs/current/role-attributes.html) + ''; + default = null; + inherit defaultText; + }; + bypassrls = mkOption { + type = types.nullOr types.bool; + description = lib.mdDoc '' + Grants the user, created by the ensureUser attr, replication permissions. From the postgres docs: + + A role must be explicitly given permission to bypass + every row-level security (RLS) policy (except for + superusers, since those bypass all permission checks). To + create such a role, use CREATE ROLE name BYPASSRLS as a + superuser. + + More information on postgres roles can be found [here](https://www.postgresql.org/docs/current/role-attributes.html) + ''; + default = null; + inherit defaultText; + }; + }; + }; + }; }; }); default = []; @@ -380,12 +529,29 @@ in $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${database}"' '') cfg.ensureDatabases} '' + '' - ${concatMapStrings (user: '' - $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"' - ${concatStringsSep "\n" (mapAttrsToList (database: permission: '' - $PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"' - '') user.ensurePermissions)} - '') cfg.ensureUsers} + ${ + concatMapStrings + (user: + let + userPermissions = concatStringsSep "\n" + (mapAttrsToList + (database: permission: ''$PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"' '') + user.ensurePermissions + ); + + filteredClauses = filterAttrs (name: value: value != null) user.ensureClauses; + + clauseSqlStatements = attrValues (mapAttrs (n: v: if v then n else "no${n}") filteredClauses); + + userClauses = ''$PSQL -tAc 'ALTER ROLE "${user.name}" ${concatStringsSep " " clauseSqlStatements}' ''; + in '' + $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"' + ${userPermissions} + ${userClauses} + '' + ) + cfg.ensureUsers + } ''; serviceConfig = mkMerge [ @@ -419,6 +585,6 @@ in }; - meta.doc = ./postgresql.xml; + meta.doc = ./postgresql.md; meta.maintainers = with lib.maintainers; [ thoughtpolice danbst ]; } diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml deleted file mode 100644 index e48c578e6ce6..000000000000 --- a/nixos/modules/services/databases/postgresql.xml +++ /dev/null @@ -1,231 +0,0 @@ - - PostgreSQL - - - - Source: modules/services/databases/postgresql.nix - - - Upstream documentation: - - - - PostgreSQL is an advanced, free relational database. - - -
- Configuring - - - To enable PostgreSQL, add the following to your configuration.nix: - - = true; - = pkgs.postgresql_11; - - Note that you are required to specify the desired version of PostgreSQL (e.g. pkgs.postgresql_11). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for such as the most recent release of PostgreSQL. - - - - - - By default, PostgreSQL stores its databases in /var/lib/postgresql/$psqlSchema. You can override this using , e.g. - - = "/data/postgresql"; - - -
-
- Upgrading - - - - The steps below demonstrate how to upgrade from an older version to pkgs.postgresql_13. - These instructions are also applicable to other versions. - - - - Major PostgreSQL upgrades require a downtime and a few imperative steps to be called. This is the case because - each major version has some internal changes in the databases' state during major releases. Because of that, - NixOS places the state into /var/lib/postgresql/<version> where each version - can be obtained like this: - -$ nix-instantiate --eval -A postgresql_13.psqlSchema -"13" - - For an upgrade, a script like this can be used to simplify the process: - -{ config, pkgs, ... }: -{ - = [ - (let - # XXX specify the postgresql package you'd like to upgrade to. - # Do not forget to list the extensions you need. - newPostgres = pkgs.postgresql_13.withPackages (pp: [ - # pp.plv8 - ]); - in pkgs.writeScriptBin "upgrade-pg-cluster" '' - set -eux - # XXX it's perhaps advisable to stop all services that depend on postgresql - systemctl stop postgresql - - export NEWDATA="/var/lib/postgresql/${newPostgres.psqlSchema}" - - export NEWBIN="${newPostgres}/bin" - - export OLDDATA="${config.}" - export OLDBIN="${config.}/bin" - - install -d -m 0700 -o postgres -g postgres "$NEWDATA" - cd "$NEWDATA" - sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" - - sudo -u postgres $NEWBIN/pg_upgrade \ - --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \ - --old-bindir $OLDBIN --new-bindir $NEWBIN \ - "$@" - '') - ]; -} - - - - - The upgrade process is: - - - - - - Rebuild nixos configuration with the configuration above added to your configuration.nix. Alternatively, add that into separate file and reference it in imports list. - - - - - Login as root (sudo su -) - - - - - Run upgrade-pg-cluster. It will stop old postgresql, initialize a new one and migrate the old one to the new one. You may supply arguments like --jobs 4 and --link to speedup migration process. See for details. - - - - - Change postgresql package in NixOS configuration to the one you were upgrading to via . Rebuild NixOS. This should start new postgres using upgraded data directory and all services you stopped during the upgrade. - - - - - After the upgrade it's advisable to analyze the new cluster. - - - - - For PostgreSQL ≥ 14, use the vacuumdb command printed by the upgrades script. - - - - - For PostgreSQL < 14, run (as su -l postgres in the , in this example /var/lib/postgresql/13): - -$ ./analyze_new_cluster.sh - - - - - - The next step removes the old state-directory! - -$ ./delete_old_cluster.sh - - - - -
-
- Options - - - A complete list of options for the PostgreSQL module may be found here. - -
-
- Plugins - - - Plugins collection for each PostgreSQL version can be accessed with .pkgs. For example, for pkgs.postgresql_11 package, its plugin collection is accessed by pkgs.postgresql_11.pkgs: - -$ nix repl '<nixpkgs>' - -Loading '<nixpkgs>'... -Added 10574 variables. - -nix-repl> postgresql_11.pkgs.<TAB><TAB> -postgresql_11.pkgs.cstore_fdw postgresql_11.pkgs.pg_repack -postgresql_11.pkgs.pg_auto_failover postgresql_11.pkgs.pg_safeupdate -postgresql_11.pkgs.pg_bigm postgresql_11.pkgs.pg_similarity -postgresql_11.pkgs.pg_cron postgresql_11.pkgs.pg_topn -postgresql_11.pkgs.pg_hll postgresql_11.pkgs.pgjwt -postgresql_11.pkgs.pg_partman postgresql_11.pkgs.pgroonga -... - - - - - To add plugins via NixOS configuration, set services.postgresql.extraPlugins: - - = pkgs.postgresql_11; - = with pkgs.postgresql_11.pkgs; [ - pg_repack - postgis -]; - - - - - You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using function .withPackages. For example, creating a custom PostgreSQL package in an overlay can look like: - -self: super: { - postgresql_custom = self.postgresql_11.withPackages (ps: [ - ps.pg_repack - ps.postgis - ]); -} - - - - - Here's a recipe on how to override a particular plugin through an overlay: - -self: super: { - postgresql_11 = super.postgresql_11.override { this = self.postgresql_11; } // { - pkgs = super.postgresql_11.pkgs // { - pg_repack = super.postgresql_11.pkgs.pg_repack.overrideAttrs (_: { - name = "pg_repack-v20181024"; - src = self.fetchzip { - url = "https://github.com/reorg/pg_repack/archive/923fa2f3c709a506e111cc963034bf2fd127aa00.tar.gz"; - sha256 = "17k6hq9xaax87yz79j773qyigm4fwk8z4zh5cyp6z0sxnwfqxxw5"; - }; - }); - }; - }; -} - - -
-
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 95c0afb8f835..1464f4487e39 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -67,7 +67,7 @@ in { ''); servers = mkOption { - type = with types; attrsOf (submodule ({config, name, ...}@args: { + type = with types; attrsOf (submodule ({ config, name, ... }: { options = { enable = mkEnableOption (lib.mdDoc '' Redis server. @@ -271,14 +271,11 @@ in { }; config.settings = mkMerge [ { - port = config.port; + inherit (config) port logfile databases maxclients appendOnly; daemonize = false; supervised = "systemd"; loglevel = config.logLevel; - logfile = config.logfile; syslog-enabled = config.syslog; - databases = config.databases; - maxclients = config.maxclients; save = if config.save == [] then ''""'' # Disable saving with `save = ""` else map @@ -286,12 +283,11 @@ in { config.save; dbfilename = "dump.rdb"; dir = "/var/lib/${redisName name}"; - appendOnly = config.appendOnly; appendfsync = config.appendFsync; slowlog-log-slower-than = config.slowLogLogSlowerThan; slowlog-max-len = config.slowLogMaxLen; } - (mkIf (config.bind != null) { bind = config.bind; }) + (mkIf (config.bind != null) { inherit (config) bind; }) (mkIf (config.unixSocket != null) { unixsocket = config.unixSocket; unixsocketperm = toString config.unixSocketPerm; diff --git a/nixos/modules/services/databases/surrealdb.nix b/nixos/modules/services/databases/surrealdb.nix index 27269eb02f64..050a5336cb4c 100644 --- a/nixos/modules/services/databases/surrealdb.nix +++ b/nixos/modules/services/databases/surrealdb.nix @@ -10,6 +10,15 @@ in { services.surrealdb = { enable = mkEnableOption (lib.mdDoc "A scalable, distributed, collaborative, document-graph database, for the realtime web "); + package = mkOption { + default = pkgs.surrealdb; + defaultText = literalExpression "pkgs.surrealdb"; + type = types.package; + description = lib.mdDoc '' + Which surrealdb derivation to use. + ''; + }; + dbPath = mkOption { type = types.str; description = lib.mdDoc '' @@ -37,21 +46,46 @@ in { default = 8000; example = 8000; }; + + userNamePath = mkOption { + type = types.path; + description = lib.mdDoc '' + Path to read the username from. + ''; + }; + + passwordPath = mkOption { + type = types.path; + description = lib.mdDoc '' + Path to read the password from. + ''; + }; }; }; config = mkIf cfg.enable { # Used to connect to the running service - environment.systemPackages = [ pkgs.surrealdb ] ; + environment.systemPackages = [ cfg.package ] ; systemd.services.surrealdb = { description = "A scalable, distributed, collaborative, document-graph database, for the realtime web "; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + script = '' + ${cfg.package}/bin/surreal start \ + --user $(${pkgs.systemd}/bin/systemd-creds cat SURREALDB_USERNAME) \ + --pass $(${pkgs.systemd}/bin/systemd-creds cat SURREALDB_PASSWORD) \ + --bind ${cfg.host}:${toString cfg.port} \ + -- ${cfg.dbPath} + ''; serviceConfig = { - ExecStart = "${pkgs.surrealdb}/bin/surreal start --bind ${cfg.host}:${toString cfg.port} ${optionalString (cfg.dbPath != null) "-- ${cfg.dbPath}"}"; + LoadCredential = [ + "SURREALDB_USERNAME:${cfg.userNamePath}" + "SURREALDB_PASSWORD:${cfg.passwordPath}" + ]; + DynamicUser = true; Restart = "on-failure"; StateDirectory = "surrealdb"; diff --git a/nixos/modules/services/desktops/flatpak.md b/nixos/modules/services/desktops/flatpak.md new file mode 100644 index 000000000000..65b1554d79b4 --- /dev/null +++ b/nixos/modules/services/desktops/flatpak.md @@ -0,0 +1,39 @@ +# Flatpak {#module-services-flatpak} + +*Source:* {file}`modules/services/desktop/flatpak.nix` + +*Upstream documentation:* + +Flatpak is a system for building, distributing, and running sandboxed desktop +applications on Linux. + +To enable Flatpak, add the following to your {file}`configuration.nix`: +``` + services.flatpak.enable = true; +``` + +For the sandboxed apps to work correctly, desktop integration portals need to +be installed. If you run GNOME, this will be handled automatically for you; +in other cases, you will need to add something like the following to your +{file}`configuration.nix`: +``` + xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; +``` + +Then, you will need to add a repository, for example, +[Flathub](https://github.com/flatpak/flatpak/wiki), +either using the following commands: +```ShellSession +$ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo +$ flatpak update +``` +or by opening the +[repository file](https://flathub.org/repo/flathub.flatpakrepo) in GNOME Software. + +Finally, you can search and install programs: +```ShellSession +$ flatpak search bustle +$ flatpak install flathub org.freedesktop.Bustle +$ flatpak run org.freedesktop.Bustle +``` +Again, GNOME Software offers graphical interface for these tasks. diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix index 3b14ad75ab30..d99faf381e01 100644 --- a/nixos/modules/services/desktops/flatpak.nix +++ b/nixos/modules/services/desktops/flatpak.nix @@ -7,7 +7,7 @@ let cfg = config.services.flatpak; in { meta = { - doc = ./flatpak.xml; + doc = ./flatpak.md; maintainers = pkgs.flatpak.meta.maintainers; }; diff --git a/nixos/modules/services/desktops/flatpak.xml b/nixos/modules/services/desktops/flatpak.xml deleted file mode 100644 index 8f080b250228..000000000000 --- a/nixos/modules/services/desktops/flatpak.xml +++ /dev/null @@ -1,56 +0,0 @@ - - Flatpak - - Source: - modules/services/desktop/flatpak.nix - - - Upstream documentation: - - - - Flatpak is a system for building, distributing, and running sandboxed desktop - applications on Linux. - - - To enable Flatpak, add the following to your - configuration.nix: - - = true; - - - - For the sandboxed apps to work correctly, desktop integration portals need to - be installed. If you run GNOME, this will be handled automatically for you; - in other cases, you will need to add something like the following to your - configuration.nix: - - = [ pkgs.xdg-desktop-portal-gtk ]; - - - - Then, you will need to add a repository, for example, - Flathub, - either using the following commands: - -$ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -$ flatpak update - - or by opening the - repository - file in GNOME Software. - - - Finally, you can search and install programs: - -$ flatpak search bustle -$ flatpak install flathub org.freedesktop.Bustle -$ flatpak run org.freedesktop.Bustle - - Again, GNOME Software offers graphical interface for these tasks. - - 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 9aa51b61431d..c204606193af 100644 --- a/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json @@ -35,5 +35,20 @@ } ], "filter.properties": {}, - "stream.properties": {} + "stream.properties": {}, + "alsa.properties": {}, + "alsa.rules": [ + { + "matches": [ + { + "application.process.binary": "resolve" + } + ], + "actions": { + "update-props": { + "alsa.buffer-bytes": 131072 + } + } + } + ] } diff --git a/nixos/modules/services/desktops/pipewire/daemon/jack.conf.json b/nixos/modules/services/desktops/pipewire/daemon/jack.conf.json index 128178bfa027..f2e396dd28d7 100644 --- a/nixos/modules/services/desktops/pipewire/daemon/jack.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/jack.conf.json @@ -33,6 +33,43 @@ "actions": { "update-props": {} } + }, + { + "matches": [ + { + "application.process.binary": "jack_bufsize" + } + ], + "actions": { + "update-props": { + "jack.global-buffer-size": true + } + } + }, + { + "matches": [ + { + "application.process.binary": "qsynth" + } + ], + "actions": { + "update-props": { + "node.pause-on-idle": false, + "node.passive": true + } + } + }, + { + "matches": [ + { + "client.name": "Mixxx" + } + ], + "actions": { + "update-props": { + "jack.merge-monitor": false + } + } } ] } 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 114afbfb0ea4..b1a864853325 100644 --- a/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json @@ -32,10 +32,12 @@ "args": {} } ], - "context.exec": [ + "context.exec": [], + "pulse.cmd": [ { - "path": "pactl", - "args": "load-module module-always-sink" + "cmd": "load-module", + "args": "module-always-sink", + "flags": [] } ], "stream.properties": {}, @@ -89,13 +91,14 @@ { "matches": [ { - "application.name": "~speech-dispatcher*" + "application.name": "~speech-dispatcher.*" } ], "actions": { "update-props": { - "pulse.min.req": "1024/48000", - "pulse.min.quantum": "1024/48000" + "pulse.min.req": "512/48000", + "pulse.min.quantum": "512/48000", + "pulse.idle.timeout": 5 } } } diff --git a/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json b/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json index bf3b2d660827..53fc103d2214 100644 --- a/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json @@ -70,6 +70,14 @@ }, { "name": "libpipewire-module-session-manager" + }, + { + "name": "libpipewire-module-x11-bell", + "args": {}, + "flags": [ + "ifexists", + "nofail" + ] } ], "context.objects": [ diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index a4ef88a45ad0..09cec9a79109 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -42,7 +42,7 @@ let in { meta = { - maintainers = teams.freedesktop.members; + maintainers = teams.freedesktop.members ++ [ lib.maintainers.k900 ]; # uses attributes of the linked package buildDocsInSandbox = false; }; diff --git a/nixos/modules/services/desktops/pipewire/wireplumber.nix b/nixos/modules/services/desktops/pipewire/wireplumber.nix index 32490773b5e9..4b36b99aa7c1 100644 --- a/nixos/modules/services/desktops/pipewire/wireplumber.nix +++ b/nixos/modules/services/desktops/pipewire/wireplumber.nix @@ -32,6 +32,10 @@ in assertion = !config.services.pipewire.media-session.enable; message = "WirePlumber and pipewire-media-session can't be enabled at the same time."; } + { + assertion = !config.hardware.bluetooth.hsphfpd.enable; + message = "Using Wireplumber conflicts with hsphfpd, as it provides the same functionality. `hardware.bluetooth.hsphfpd.enable` needs be set to false"; + } ]; environment.systemPackages = [ cfg.package ]; diff --git a/nixos/modules/services/development/blackfire.md b/nixos/modules/services/development/blackfire.md new file mode 100644 index 000000000000..e2e7e4780c79 --- /dev/null +++ b/nixos/modules/services/development/blackfire.md @@ -0,0 +1,39 @@ +# Blackfire profiler {#module-services-blackfire} + +*Source:* {file}`modules/services/development/blackfire.nix` + +*Upstream documentation:* + +[Blackfire](https://blackfire.io) is a proprietary tool for profiling applications. There are several languages supported by the product but currently only PHP support is packaged in Nixpkgs. The back-end consists of a module that is loaded into the language runtime (called *probe*) and a service (*agent*) that the probe connects to and that sends the profiles to the server. + +To use it, you will need to enable the agent and the probe on your server. The exact method will depend on the way you use PHP but here is an example of NixOS configuration for PHP-FPM: +``` +let + php = pkgs.php.withExtensions ({ enabled, all }: enabled ++ (with all; [ + blackfire + ])); +in { + # Enable the probe extension for PHP-FPM. + services.phpfpm = { + phpPackage = php; + }; + + # Enable and configure the agent. + services.blackfire-agent = { + enable = true; + settings = { + # You will need to get credentials at https://blackfire.io/my/settings/credentials + # You can also use other options described in https://blackfire.io/docs/up-and-running/configuration/agent + server-id = "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"; + server-token = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"; + }; + }; + + # Make the agent run on start-up. + # (WantedBy= from the upstream unit not respected: https://github.com/NixOS/nixpkgs/issues/81138) + # Alternately, you can start it manually with `systemctl start blackfire-agent`. + systemd.services.blackfire-agent.wantedBy = [ "phpfpm-foo.service" ]; +} +``` + +On your developer machine, you will also want to install [the client](https://blackfire.io/docs/up-and-running/installation#install-a-profiling-client) (see `blackfire` package) or the browser extension to actually trigger the profiling. diff --git a/nixos/modules/services/development/blackfire.nix b/nixos/modules/services/development/blackfire.nix index 054cef9ae80b..3c98d7a281c6 100644 --- a/nixos/modules/services/development/blackfire.nix +++ b/nixos/modules/services/development/blackfire.nix @@ -11,7 +11,7 @@ let in { meta = { maintainers = pkgs.blackfire.meta.maintainers; - doc = ./blackfire.xml; + doc = ./blackfire.md; }; options = { diff --git a/nixos/modules/services/development/blackfire.xml b/nixos/modules/services/development/blackfire.xml deleted file mode 100644 index cecd249dda48..000000000000 --- a/nixos/modules/services/development/blackfire.xml +++ /dev/null @@ -1,46 +0,0 @@ - - Blackfire profiler - - Source: - modules/services/development/blackfire.nix - - - Upstream documentation: - - - - Blackfire is a proprietary tool for profiling applications. There are several languages supported by the product but currently only PHP support is packaged in Nixpkgs. The back-end consists of a module that is loaded into the language runtime (called probe) and a service (agent) that the probe connects to and that sends the profiles to the server. - - - To use it, you will need to enable the agent and the probe on your server. The exact method will depend on the way you use PHP but here is an example of NixOS configuration for PHP-FPM: -let - php = pkgs.php.withExtensions ({ enabled, all }: enabled ++ (with all; [ - blackfire - ])); -in { - # Enable the probe extension for PHP-FPM. - services.phpfpm = { - phpPackage = php; - }; - - # Enable and configure the agent. - services.blackfire-agent = { - enable = true; - settings = { - # You will need to get credentials at https://blackfire.io/my/settings/credentials - # You can also use other options described in https://blackfire.io/docs/up-and-running/configuration/agent - server-id = "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"; - server-token = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"; - }; - }; - - # Make the agent run on start-up. - # (WantedBy= from the upstream unit not respected: https://github.com/NixOS/nixpkgs/issues/81138) - # Alternately, you can start it manually with `systemctl start blackfire-agent`. - systemd.services.blackfire-agent.wantedBy = [ "phpfpm-foo.service" ]; -} - - - On your developer machine, you will also want to install the client (see blackfire package) or the browser extension to actually trigger the profiling. - - diff --git a/nixos/modules/services/development/jupyter/default.nix b/nixos/modules/services/development/jupyter/default.nix index 9b0178d3ea68..9f7910844468 100644 --- a/nixos/modules/services/development/jupyter/default.nix +++ b/nixos/modules/services/development/jupyter/default.nix @@ -57,7 +57,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 8888; description = lib.mdDoc '' Port number Jupyter will be listening on. @@ -119,7 +119,7 @@ in { kernels = mkOption { type = types.nullOr (types.attrsOf(types.submodule (import ./kernel-options.nix { - inherit lib; + inherit lib pkgs; }))); default = null; diff --git a/nixos/modules/services/development/jupyter/kernel-options.nix b/nixos/modules/services/development/jupyter/kernel-options.nix index 42af47aeb3c8..6e406152de47 100644 --- a/nixos/modules/services/development/jupyter/kernel-options.nix +++ b/nixos/modules/services/development/jupyter/kernel-options.nix @@ -1,9 +1,11 @@ # Options that can be used for creating a jupyter kernel. -{lib }: +{ lib, pkgs }: with lib; { + freeformType = (pkgs.formats.json { }).type; + options = { displayName = mkOption { @@ -40,6 +42,15 @@ with lib; ''; }; + env = mkOption { + type = types.attrsOf types.str; + default = { }; + example = { OMP_NUM_THREADS = "1"; }; + description = lib.mdDoc '' + Environment variables to set for the kernel. + ''; + }; + logo32 = mkOption { type = types.nullOr types.path; default = null; diff --git a/nixos/modules/services/development/jupyterhub/default.nix b/nixos/modules/services/development/jupyterhub/default.nix index c0c0734cac09..cebc35a50476 100644 --- a/nixos/modules/services/development/jupyterhub/default.nix +++ b/nixos/modules/services/development/jupyterhub/default.nix @@ -119,7 +119,7 @@ in { kernels = mkOption { type = types.nullOr (types.attrsOf(types.submodule (import ../jupyter/kernel-options.nix { - inherit lib; + inherit lib pkgs; }))); default = null; diff --git a/nixos/modules/services/display-managers/greetd.nix b/nixos/modules/services/display-managers/greetd.nix index fa3f8fdf4f1d..3a0f59f62afb 100644 --- a/nixos/modules/services/display-managers/greetd.nix +++ b/nixos/modules/services/display-managers/greetd.nix @@ -45,7 +45,7 @@ in default = !(cfg.settings ? initial_session); defaultText = literalExpression "!(config.services.greetd.settings ? initial_session)"; description = lib.mdDoc '' - Wether to restart greetd when it terminates (e.g. on failure). + Whether to restart greetd when it terminates (e.g. on failure). This is usually desirable so a user can always log in, but should be disabled when using 'settings.initial_session' (autologin), because every greetd restart will trigger the autologin again. ''; @@ -89,6 +89,8 @@ in SendSIGHUP = true; TimeoutStopSec = "30s"; KeyringMode = "shared"; + + Type = "idle"; }; # Don't kill a user session when using nixos-rebuild diff --git a/nixos/modules/services/editors/emacs.md b/nixos/modules/services/editors/emacs.md new file mode 100644 index 000000000000..c072b3664ad1 --- /dev/null +++ b/nixos/modules/services/editors/emacs.md @@ -0,0 +1,399 @@ +# Emacs {#module-services-emacs} + + + +[Emacs](https://www.gnu.org/software/emacs/) is an +extensible, customizable, self-documenting real-time display editor — and +more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp +programming language with extensions to support text editing. + +Emacs runs within a graphical desktop environment using the X Window System, +but works equally well on a text terminal. Under +macOS, a "Mac port" edition is available, which +uses Apple's native GUI frameworks. + +Nixpkgs provides a superior environment for +running Emacs. It's simple to create custom builds +by overriding the default packages. Chaotic collections of Emacs Lisp code +and extensions can be brought under control using declarative package +management. NixOS even provides a +{command}`systemd` user service for automatically starting the Emacs +daemon. + +## Installing Emacs {#module-services-emacs-installing} + +Emacs can be installed in the normal way for Nix (see +[](#sec-package-management)). In addition, a NixOS +*service* can be enabled. + +### The Different Releases of Emacs {#module-services-emacs-releases} + +Nixpkgs defines several basic Emacs packages. +The following are attributes belonging to the {var}`pkgs` set: + + {var}`emacs` + : The latest stable version of Emacs using the [GTK 2](http://www.gtk.org) + widget toolkit. + + {var}`emacs-nox` + : Emacs built without any dependency on X11 libraries. + + {var}`emacsMacport` + : Emacs with the "Mac port" patches, providing a more native look and + feel under macOS. + +If those aren't suitable, then the following imitation Emacs editors are +also available in Nixpkgs: +[Zile](https://www.gnu.org/software/zile/), +[mg](http://homepage.boetes.org/software/mg/), +[Yi](http://yi-editor.github.io/), +[jmacs](https://joe-editor.sourceforge.io/). + +### Adding Packages to Emacs {#module-services-emacs-adding-packages} + +Emacs includes an entire ecosystem of functionality beyond text editing, +including a project planner, mail and news reader, debugger interface, +calendar, and more. + +Most extensions are gotten with the Emacs packaging system +({file}`package.el`) from +[Emacs Lisp Package Archive (ELPA)](https://elpa.gnu.org/), +[MELPA](https://melpa.org/), +[MELPA Stable](https://stable.melpa.org/), and +[Org ELPA](http://orgmode.org/elpa.html). Nixpkgs is +regularly updated to mirror all these archives. + +Under NixOS, you can continue to use +`package-list-packages` and +`package-install` to install packages. You can also +declare the set of Emacs packages you need using the derivations from +Nixpkgs. The rest of this section discusses declarative installation of +Emacs packages through nixpkgs. + +The first step to declare the list of packages you want in your Emacs +installation is to create a dedicated derivation. This can be done in a +dedicated {file}`emacs.nix` file such as: + +[]{#ex-emacsNix} + +```nix +/* +This is a nix expression to build Emacs and some Emacs packages I like +from source on any distribution where Nix is installed. This will install +all the dependencies from the nixpkgs repository and build the binary files +without interfering with the host distribution. + +To build the project, type the following from the current directory: + +$ nix-build emacs.nix + +To run the newly compiled executable: + +$ ./result/bin/emacs +*/ + +# The first non-comment line in this file indicates that +# the whole file represents a function. +{ pkgs ? import {} }: + +let + # The let expression below defines a myEmacs binding pointing to the + # current stable version of Emacs. This binding is here to separate + # the choice of the Emacs binary from the specification of the + # required packages. + myEmacs = pkgs.emacs; + # This generates an emacsWithPackages function. It takes a single + # argument: a function from a package set to a list of packages + # (the packages that will be available in Emacs). + emacsWithPackages = (pkgs.emacsPackagesFor myEmacs).emacsWithPackages; +in + # The rest of the file specifies the list of packages to install. In the + # example, two packages (magit and zerodark-theme) are taken from + # MELPA stable. + emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + magit # ; Integrate git + zerodark-theme # ; Nicolas' theme + ]) + # Two packages (undo-tree and zoom-frm) are taken from MELPA. + ++ (with epkgs.melpaPackages; [ + undo-tree # ; to show the undo tree + zoom-frm # ; increase/decrease font size for all buffers %lt;C-x C-+> + ]) + # Three packages are taken from GNU ELPA. + ++ (with epkgs.elpaPackages; [ + auctex # ; LaTeX mode + beacon # ; highlight my cursor when scrolling + nameless # ; hide current package name everywhere in elisp code + ]) + # notmuch is taken from a nixpkgs derivation which contains an Emacs mode. + ++ [ + pkgs.notmuch # From main packages set + ]) +``` + +The result of this configuration will be an {command}`emacs` +command which launches Emacs with all of your chosen packages in the +{var}`load-path`. + +You can check that it works by executing this in a terminal: +```ShellSession +$ nix-build emacs.nix +$ ./result/bin/emacs -q +``` +and then typing `M-x package-initialize`. Check that you +can use all the packages you want in this Emacs instance. For example, try +switching to the zerodark theme through `M-x load-theme zerodark y`. + +::: {.tip} +A few popular extensions worth checking out are: auctex, company, +edit-server, flycheck, helm, iedit, magit, multiple-cursors, projectile, +and yasnippet. +::: + +The list of available packages in the various ELPA repositories can be seen +with the following commands: +[]{#module-services-emacs-querying-packages} +``` +nix-env -f "" -qaP -A emacs.pkgs.elpaPackages +nix-env -f "" -qaP -A emacs.pkgs.melpaPackages +nix-env -f "" -qaP -A emacs.pkgs.melpaStablePackages +nix-env -f "" -qaP -A emacs.pkgs.orgPackages +``` + +If you are on NixOS, you can install this particular Emacs for all users by +adding it to the list of system packages (see +[](#sec-declarative-package-mgmt)). Simply modify your file +{file}`configuration.nix` to make it contain: +[]{#module-services-emacs-configuration-nix} +``` +{ + environment.systemPackages = [ + # [...] + (import /path/to/emacs.nix { inherit pkgs; }) + ]; +} +``` + +In this case, the next {command}`nixos-rebuild switch` will take +care of adding your {command}`emacs` to the {var}`PATH` +environment variable (see [](#sec-changing-config)). + + + +If you are not on NixOS or want to install this particular Emacs only for +yourself, you can do so by adding it to your +{file}`~/.config/nixpkgs/config.nix` (see +[Nixpkgs manual](https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides)): +[]{#module-services-emacs-config-nix} +``` +{ + packageOverrides = super: let self = super.pkgs; in { + myemacs = import /path/to/emacs.nix { pkgs = self; }; + }; +} +``` + +In this case, the next `nix-env -f '' -iA +myemacs` will take care of adding your emacs to the +{var}`PATH` environment variable. + +### Advanced Emacs Configuration {#module-services-emacs-advanced} + +If you want, you can tweak the Emacs package itself from your +{file}`emacs.nix`. For example, if you want to have a +GTK 3-based Emacs instead of the default GTK 2-based binary and remove the +automatically generated {file}`emacs.desktop` (useful if you +only use {command}`emacsclient`), you can change your file +{file}`emacs.nix` in this way: + +[]{#ex-emacsGtk3Nix} +``` +{ pkgs ? import {} }: +let + myEmacs = (pkgs.emacs.override { + # Use gtk3 instead of the default gtk2 + withGTK3 = true; + withGTK2 = false; + }).overrideAttrs (attrs: { + # I don't want emacs.desktop file because I only use + # emacsclient. + postInstall = (attrs.postInstall or "") + '' + rm $out/share/applications/emacs.desktop + ''; + }); +in [...] +``` + +After building this file as shown in [the example above](#ex-emacsNix), you +will get an GTK 3-based Emacs binary pre-loaded with your favorite packages. + +## Running Emacs as a Service {#module-services-emacs-running} + +NixOS provides an optional +{command}`systemd` service which launches +[Emacs daemon](https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html) +with the user's login session. + +*Source:* {file}`modules/services/editors/emacs.nix` + +### Enabling the Service {#module-services-emacs-enabling} + +To install and enable the {command}`systemd` user service for Emacs +daemon, add the following to your {file}`configuration.nix`: +``` +services.emacs.enable = true; +services.emacs.package = import /home/cassou/.emacs.d { pkgs = pkgs; }; +``` + +The {var}`services.emacs.package` option allows a custom +derivation to be used, for example, one created by +`emacsWithPackages`. + +Ensure that the Emacs server is enabled for your user's Emacs +configuration, either by customizing the {var}`server-mode` +variable, or by adding `(server-start)` to +{file}`~/.emacs.d/init.el`. + +To start the daemon, execute the following: +```ShellSession +$ nixos-rebuild switch # to activate the new configuration.nix +$ systemctl --user daemon-reload # to force systemd reload +$ systemctl --user start emacs.service # to start the Emacs daemon +``` +The server should now be ready to serve Emacs clients. + +### Starting the client {#module-services-emacs-starting-client} + +Ensure that the emacs server is enabled, either by customizing the +{var}`server-mode` variable, or by adding +`(server-start)` to {file}`~/.emacs`. + +To connect to the emacs daemon, run one of the following: +``` +emacsclient FILENAME +emacsclient --create-frame # opens a new frame (window) +emacsclient --create-frame --tty # opens a new frame on the current terminal +``` + +### Configuring the {var}`EDITOR` variable {#module-services-emacs-editor-variable} + + + +If [](#opt-services.emacs.defaultEditor) is +`true`, the {var}`EDITOR` variable will be set +to a wrapper script which launches {command}`emacsclient`. + +Any setting of {var}`EDITOR` in the shell config files will +override {var}`services.emacs.defaultEditor`. To make sure +{var}`EDITOR` refers to the Emacs wrapper script, remove any +existing {var}`EDITOR` assignment from +{file}`.profile`, {file}`.bashrc`, +{file}`.zshenv` or any other shell config file. + +If you have formed certain bad habits when editing files, these can be +corrected with a shell alias to the wrapper script: +``` +alias vi=$EDITOR +``` + +### Per-User Enabling of the Service {#module-services-emacs-per-user} + +In general, {command}`systemd` user services are globally enabled +by symlinks in {file}`/etc/systemd/user`. In the case where +Emacs daemon is not wanted for all users, it is possible to install the +service but not globally enable it: +``` +services.emacs.enable = false; +services.emacs.install = true; +``` + +To enable the {command}`systemd` user service for just the +currently logged in user, run: +``` +systemctl --user enable emacs +``` +This will add the symlink +{file}`~/.config/systemd/user/emacs.service`. + +## Configuring Emacs {#module-services-emacs-configuring} + +The Emacs init file should be changed to load the extension packages at +startup: +[]{#module-services-emacs-package-initialisation} +``` +(require 'package) + +;; optional. makes unpure packages archives unavailable +(setq package-archives nil) + +(setq package-enable-at-startup nil) +(package-initialize) +``` + +After the declarative emacs package configuration has been tested, +previously downloaded packages can be cleaned up by removing +{file}`~/.emacs.d/elpa` (do make a backup first, in case you +forgot a package). + + + +### A Major Mode for Nix Expressions {#module-services-emacs-major-mode} + +Of interest may be {var}`melpaPackages.nix-mode`, which +provides syntax highlighting for the Nix language. This is particularly +convenient if you regularly edit Nix files. + +### Accessing man pages {#module-services-emacs-man-pages} + +You can use `woman` to get completion of all available +man pages. For example, type `M-x woman nixos-rebuild .` + +### Editing DocBook 5 XML Documents {#sec-emacs-docbook-xml} + +Emacs includes +[nXML](https://www.gnu.org/software/emacs/manual/html_node/nxml-mode/Introduction.html), +a major-mode for validating and editing XML documents. When editing DocBook +5.0 documents, such as [this one](#book-nixos-manual), +nXML needs to be configured with the relevant schema, which is not +included. + +To install the DocBook 5.0 schemas, either add +{var}`pkgs.docbook5` to [](#opt-environment.systemPackages) +([NixOS](#sec-declarative-package-mgmt)), or run +`nix-env -f '' -iA docbook5` +([Nix](#sec-ad-hoc-packages)). + +Then customize the variable {var}`rng-schema-locating-files` to +include {file}`~/.emacs.d/schemas.xml` and put the following +text into that file: +[]{#ex-emacs-docbook-xml} +```xml + + + + + + + +``` diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix index 5ae28cd9bbb3..2be46e47d64c 100644 --- a/nixos/modules/services/editors/emacs.nix +++ b/nixos/modules/services/editors/emacs.nix @@ -99,5 +99,5 @@ in environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "${editorScript}/bin/emacseditor"); }; - meta.doc = ./emacs.xml; + meta.doc = ./emacs.md; } diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml deleted file mode 100644 index fd99ee9442c9..000000000000 --- a/nixos/modules/services/editors/emacs.xml +++ /dev/null @@ -1,580 +0,0 @@ - - Emacs - - - Emacs is an - extensible, customizable, self-documenting real-time display editor — and - more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp - programming language with extensions to support text editing. - - - Emacs runs within a graphical desktop environment using the X Window System, - but works equally well on a text terminal. Under - macOS, a "Mac port" edition is available, which - uses Apple's native GUI frameworks. - - - Nixpkgs provides a superior environment for - running Emacs. It's simple to create custom builds - by overriding the default packages. Chaotic collections of Emacs Lisp code - and extensions can be brought under control using declarative package - management. NixOS even provides a - systemd user service for automatically starting the Emacs - daemon. - -
- Installing <application>Emacs</application> - - - Emacs can be installed in the normal way for Nix (see - ). In addition, a NixOS - service can be enabled. - - -
- The Different Releases of Emacs - - - Nixpkgs defines several basic Emacs packages. - The following are attributes belonging to the pkgs set: - - - - emacs - - - emacs - - - - The latest stable version of Emacs using the - GTK 2 - widget toolkit. - - - - - - emacs-nox - - - - Emacs built without any dependency on X11 libraries. - - - - - - emacsMacport - - - emacsMacport - - - - Emacs with the "Mac port" patches, providing a more native look and - feel under macOS. - - - - - - - - If those aren't suitable, then the following imitation Emacs editors are - also available in Nixpkgs: - Zile, - mg, - Yi, - jmacs. - -
- -
- Adding Packages to Emacs - - - Emacs includes an entire ecosystem of functionality beyond text editing, - including a project planner, mail and news reader, debugger interface, - calendar, and more. - - - - Most extensions are gotten with the Emacs packaging system - (package.el) from - Emacs Lisp Package Archive - (ELPA), - MELPA, - MELPA Stable, and - Org ELPA. Nixpkgs is - regularly updated to mirror all these archives. - - - - Under NixOS, you can continue to use - package-list-packages and - package-install to install packages. You can also - declare the set of Emacs packages you need using the derivations from - Nixpkgs. The rest of this section discusses declarative installation of - Emacs packages through nixpkgs. - - - - The first step to declare the list of packages you want in your Emacs - installation is to create a dedicated derivation. This can be done in a - dedicated emacs.nix file such as: - - Nix expression to build Emacs with packages (<filename>emacs.nix</filename>) - -/* -This is a nix expression to build Emacs and some Emacs packages I like -from source on any distribution where Nix is installed. This will install -all the dependencies from the nixpkgs repository and build the binary files -without interfering with the host distribution. - -To build the project, type the following from the current directory: - -$ nix-build emacs.nix - -To run the newly compiled executable: - -$ ./result/bin/emacs -*/ -{ pkgs ? import <nixpkgs> {} }: - -let - myEmacs = pkgs.emacs; - emacsWithPackages = (pkgs.emacsPackagesFor myEmacs).emacsWithPackages; -in - emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ - magit # ; Integrate git <C-x g> - zerodark-theme # ; Nicolas' theme - ]) ++ (with epkgs.melpaPackages; [ - undo-tree # ; <C-x u> to show the undo tree - zoom-frm # ; increase/decrease font size for all buffers %lt;C-x C-+> - ]) ++ (with epkgs.elpaPackages; [ - auctex # ; LaTeX mode - beacon # ; highlight my cursor when scrolling - nameless # ; hide current package name everywhere in elisp code - ]) ++ [ - pkgs.notmuch # From main packages set - ]) - - - - - - The first non-comment line in this file ({ pkgs ? ... - }) indicates that the whole file represents a function. - - - - - The let expression below defines a - myEmacs binding pointing to the current stable - version of Emacs. This binding is here to separate the choice of the - Emacs binary from the specification of the required packages. - - - - - This generates an emacsWithPackages function. It - takes a single argument: a function from a package set to a list of - packages (the packages that will be available in Emacs). - - - - - The rest of the file specifies the list of packages to install. In the - example, two packages (magit and - zerodark-theme) are taken from MELPA stable. - - - - - Two packages (undo-tree and - zoom-frm) are taken from MELPA. - - - - - Three packages are taken from GNU ELPA. - - - - - notmuch is taken from a nixpkgs derivation which - contains an Emacs mode. - - - - - - - The result of this configuration will be an emacs - command which launches Emacs with all of your chosen packages in the - load-path. - - - - You can check that it works by executing this in a terminal: - -$ nix-build emacs.nix -$ ./result/bin/emacs -q - - and then typing M-x package-initialize. Check that you - can use all the packages you want in this Emacs instance. For example, try - switching to the zerodark theme through M-x load-theme <RET> - zerodark <RET> y. - - - - - A few popular extensions worth checking out are: auctex, company, - edit-server, flycheck, helm, iedit, magit, multiple-cursors, projectile, - and yasnippet. - - - - - The list of available packages in the various ELPA repositories can be seen - with the following commands: - - Querying Emacs packages -" -qaP -A emacs.pkgs.elpaPackages -nix-env -f "" -qaP -A emacs.pkgs.melpaPackages -nix-env -f "" -qaP -A emacs.pkgs.melpaStablePackages -nix-env -f "" -qaP -A emacs.pkgs.orgPackages -]]> - - - - - If you are on NixOS, you can install this particular Emacs for all users by - adding it to the list of system packages (see - ). Simply modify your file - configuration.nix to make it contain: - - Custom Emacs in <filename>configuration.nix</filename> - - - - - - In this case, the next nixos-rebuild switch will take - care of adding your emacs to the PATH - environment variable (see ). - - - - - - If you are not on NixOS or want to install this particular Emacs only for - yourself, you can do so by adding it to your - ~/.config/nixpkgs/config.nix (see - Nixpkgs - manual): - - Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename> - - - - - - In this case, the next nix-env -f '<nixpkgs>' -iA - myemacs will take care of adding your emacs to the - PATH environment variable. - -
- -
- Advanced Emacs Configuration - - - If you want, you can tweak the Emacs package itself from your - emacs.nix. For example, if you want to have a - GTK 3-based Emacs instead of the default GTK 2-based binary and remove the - automatically generated emacs.desktop (useful if you - only use emacsclient), you can change your file - emacs.nix in this way: - - - - Custom Emacs build - {} }: -let - myEmacs = (pkgs.emacs.override { - # Use gtk3 instead of the default gtk2 - withGTK3 = true; - withGTK2 = false; - }).overrideAttrs (attrs: { - # I don't want emacs.desktop file because I only use - # emacsclient. - postInstall = (attrs.postInstall or "") + '' - rm $out/share/applications/emacs.desktop - ''; - }); -in [...] -]]> - - - - After building this file as shown in , you - will get an GTK 3-based Emacs binary pre-loaded with your favorite packages. - -
-
-
- Running Emacs as a Service - - - NixOS provides an optional - systemd service which launches - - Emacs daemon with the user's login session. - - - - Source: - modules/services/editors/emacs.nix - - -
- Enabling the Service - - - To install and enable the systemd user service for Emacs - daemon, add the following to your configuration.nix: - - = true; - = import /home/cassou/.emacs.d { pkgs = pkgs; }; - - - - - The services.emacs.package option allows a custom - derivation to be used, for example, one created by - emacsWithPackages. - - - - Ensure that the Emacs server is enabled for your user's Emacs - configuration, either by customizing the server-mode - variable, or by adding (server-start) to - ~/.emacs.d/init.el. - - - - To start the daemon, execute the following: - -$ nixos-rebuild switch # to activate the new configuration.nix -$ systemctl --user daemon-reload # to force systemd reload -$ systemctl --user start emacs.service # to start the Emacs daemon - - The server should now be ready to serve Emacs clients. - -
- -
- Starting the client - - - Ensure that the emacs server is enabled, either by customizing the - server-mode variable, or by adding - (server-start) to ~/.emacs. - - - - To connect to the emacs daemon, run one of the following: - - -
- -
- Configuring the <varname>EDITOR</varname> variable - - - - - If is - true, the EDITOR variable will be set - to a wrapper script which launches emacsclient. - - - - Any setting of EDITOR in the shell config files will - override services.emacs.defaultEditor. To make sure - EDITOR refers to the Emacs wrapper script, remove any - existing EDITOR assignment from - .profile, .bashrc, - .zshenv or any other shell config file. - - - - If you have formed certain bad habits when editing files, these can be - corrected with a shell alias to the wrapper script: -alias vi=$EDITOR - -
- -
- Per-User Enabling of the Service - - - In general, systemd user services are globally enabled - by symlinks in /etc/systemd/user. In the case where - Emacs daemon is not wanted for all users, it is possible to install the - service but not globally enable it: - - = false; - = true; - - - - - To enable the systemd user service for just the - currently logged in user, run: -systemctl --user enable emacs - This will add the symlink - ~/.config/systemd/user/emacs.service. - -
-
-
- Configuring Emacs - - - The Emacs init file should be changed to load the extension packages at - startup: - - Package initialization in <filename>.emacs</filename> - - - - - - After the declarative emacs package configuration has been tested, - previously downloaded packages can be cleaned up by removing - ~/.emacs.d/elpa (do make a backup first, in case you - forgot a package). - - - - -
- A Major Mode for Nix Expressions - - - Of interest may be melpaPackages.nix-mode, which - provides syntax highlighting for the Nix language. This is particularly - convenient if you regularly edit Nix files. - -
- -
- Accessing man pages - - - You can use woman to get completion of all available - man pages. For example, type M-x woman <RET> nixos-rebuild - <RET>. - -
- -
- Editing DocBook 5 XML Documents - - - Emacs includes - nXML, - a major-mode for validating and editing XML documents. When editing DocBook - 5.0 documents, such as this one, - nXML needs to be configured with the relevant schema, which is not - included. - - - - To install the DocBook 5.0 schemas, either add - pkgs.docbook5 to - - (NixOS), or run - nix-env -f '<nixpkgs>' -iA docbook5 - (Nix). - - - - Then customize the variable rng-schema-locating-files to - include ~/.emacs.d/schemas.xml and put the following - text into that file: - - nXML Schema Configuration (<filename>~/.emacs.d/schemas.xml</filename>) - - - - - - - -]]> - - -
-
-
diff --git a/nixos/modules/services/games/asf.nix b/nixos/modules/services/games/asf.nix index 10847e8f11f3..7585d56b2d78 100644 --- a/nixos/modules/services/games/asf.nix +++ b/nixos/modules/services/games/asf.nix @@ -35,7 +35,7 @@ in description = lib.mdDoc '' If enabled, starts the ArchisSteamFarm service. For configuring the SteamGuard token you will need to use the web-ui, which is enabled by default over on 127.0.0.1:1242. - You cannot configure ASF in any way outside of nix, since all the config files get wiped on restart and replaced with the programatically set ones by nix. + You cannot configure ASF in any way outside of nix, since all the config files get wiped on restart and replaced with the programnatically set ones by nix. ''; default = false; }; @@ -43,12 +43,14 @@ in web-ui = mkOption { type = types.submodule { options = { - enable = mkEnableOption - (lib.mdDoc "Wheter to start the web-ui. This is the preferred way of configuring things such as the steam guard token"); + enable = mkEnableOption "" // { + description = lib.mdDoc "Whether to start the web-ui. This is the preferred way of configuring things such as the steam guard token."; + }; package = mkOption { type = types.package; default = pkgs.ArchiSteamFarm.ui; + defaultText = lib.literalExpression "pkgs.ArchiSteamFarm.ui"; description = lib.mdDoc "Web-UI package to use. Contents must be in lib/dist."; }; @@ -56,7 +58,6 @@ in }; default = { enable = true; - package = pkgs.ArchiSteamFarm.ui; }; example = { enable = false; @@ -67,6 +68,7 @@ in package = mkOption { type = types.package; default = pkgs.ArchiSteamFarm; + defaultText = lib.literalExpression "pkgs.ArchiSteamFarm"; description = lib.mdDoc "Package to use. Should always be the latest version, for security reasons, since this module uses very new features and to not get out of sync with the Steam API."; }; @@ -96,7 +98,7 @@ in ipcPasswordFile = mkOption { type = types.nullOr types.path; default = null; - description = lib.mdDoc "Path to a file containig the password. The file must be readable by the `asf` user/group."; + description = lib.mdDoc "Path to a file containing the password. The file must be readable by the `asf` user/group."; }; ipcSettings = mkOption { @@ -127,7 +129,7 @@ in }; passwordFile = mkOption { type = types.path; - description = lib.mdDoc "Path to a file containig the password. The file must be readable by the `asf` user/group."; + description = lib.mdDoc "Path to a file containing the password. The file must be readable by the `asf` user/group."; }; enabled = mkOption { type = types.bool; diff --git a/nixos/modules/services/games/crossfire-server.nix b/nixos/modules/services/games/crossfire-server.nix index 7820a08be40b..0849667e61c9 100644 --- a/nixos/modules/services/games/crossfire-server.nix +++ b/nixos/modules/services/games/crossfire-server.nix @@ -131,9 +131,9 @@ in { exp_table = ""; forbid = ""; metaserver2 = ""; - motd = (fileContents "${cfg.package}/etc/crossfire/motd"); - news = (fileContents "${cfg.package}/etc/crossfire/news"); - rules = (fileContents "${cfg.package}/etc/crossfire/rules"); + motd = fileContents "${cfg.package}/etc/crossfire/motd"; + news = fileContents "${cfg.package}/etc/crossfire/news"; + rules = fileContents "${cfg.package}/etc/crossfire/rules"; settings = ""; stat_bonus = ""; } // cfg.configFiles); diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index f54c265c34b0..9b15cac149d5 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -39,14 +39,14 @@ let } // cfg.extraSettings; serverSettingsFile = pkgs.writeText "server-settings.json" (builtins.toJSON (filterAttrsRecursive (n: v: v != null) serverSettings)); serverAdminsFile = pkgs.writeText "server-adminlist.json" (builtins.toJSON cfg.admins); - modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods; + modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods cfg.mods-dat; in { options = { services.factorio = { enable = mkEnableOption (lib.mdDoc name); port = mkOption { - type = types.int; + type = types.port; default = 34197; description = lib.mdDoc '' The port to which the service should bind. @@ -136,6 +136,15 @@ in derivations via nixos-channel. Until then, this is for experts only. ''; }; + mods-dat = mkOption { + type = types.nullOr types.path; + default = null; + description = lib.mdDoc '' + Mods settings can be changed by specifying a dat file, in the [mod + settings file + format](https://wiki.factorio.com/Mod_settings_file_format). + ''; + }; game-name = mkOption { type = types.nullOr types.str; default = "Factorio Game"; diff --git a/nixos/modules/services/games/minetest-server.nix b/nixos/modules/services/games/minetest-server.nix index 34e0ba8c8e5c..e8c96881673b 100644 --- a/nixos/modules/services/games/minetest-server.nix +++ b/nixos/modules/services/games/minetest-server.nix @@ -62,7 +62,7 @@ in Path to logfile for logging. If set to null, logging will be output to stdout which means - all output will be catched by systemd. + all output will be caught by systemd. ''; }; diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix index 571bcde2c5b2..ccdd779165b8 100644 --- a/nixos/modules/services/games/terraria.nix +++ b/nixos/modules/services/games/terraria.nix @@ -116,7 +116,7 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = lib.mdDoc "Wheter to open ports in the firewall"; + description = lib.mdDoc "Whether to open ports in the firewall"; }; dataDir = mkOption { diff --git a/nixos/modules/services/hardware/argonone.nix b/nixos/modules/services/hardware/argonone.nix index dc90e09e985b..e67c2625062e 100644 --- a/nixos/modules/services/hardware/argonone.nix +++ b/nixos/modules/services/hardware/argonone.nix @@ -9,7 +9,7 @@ in package = lib.mkOption { type = lib.types.package; default = pkgs.argononed; - defaultText = "pkgs.argononed"; + defaultText = lib.literalExpression "pkgs.argononed"; description = lib.mdDoc '' The package implementing the Argon One driver ''; diff --git a/nixos/modules/services/hardware/asusd.nix b/nixos/modules/services/hardware/asusd.nix new file mode 100644 index 000000000000..fba9b059bbbb --- /dev/null +++ b/nixos/modules/services/hardware/asusd.nix @@ -0,0 +1,114 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.asusd; + json = pkgs.formats.json { }; + toml = pkgs.formats.toml { }; +in +{ + options = { + services.asusd = { + enable = lib.mkEnableOption (lib.mdDoc "the asusd service for ASUS ROG laptops"); + + enableUserService = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc '' + Activate the asusd-user service. + ''; + }; + + animeConfig = lib.mkOption { + type = json.type; + default = { }; + description = lib.mdDoc '' + The content of /etc/asusd/anime.conf. + See https://asus-linux.org/asusctl/#anime-control. + ''; + }; + + asusdConfig = lib.mkOption { + type = json.type; + default = { }; + description = lib.mdDoc '' + The content of /etc/asusd/asusd.conf. + See https://asus-linux.org/asusctl/. + ''; + }; + + auraConfig = lib.mkOption { + type = json.type; + default = { }; + description = lib.mdDoc '' + The content of /etc/asusd/aura.conf. + See https://asus-linux.org/asusctl/#led-keyboard-control. + ''; + }; + + profileConfig = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = ""; + description = lib.mdDoc '' + The content of /etc/asusd/profile.conf. + See https://asus-linux.org/asusctl/#profiles. + ''; + }; + + ledModesConfig = lib.mkOption { + type = lib.types.nullOr toml.type; + default = null; + description = lib.mdDoc '' + The content of /etc/asusd/asusd-ledmodes.toml. Leave `null` to use default settings. + See https://asus-linux.org/asusctl/#led-keyboard-control. + ''; + }; + + userLedModesConfig = lib.mkOption { + type = lib.types.nullOr toml.type; + default = null; + description = lib.mdDoc '' + The content of /etc/asusd/asusd-user-ledmodes.toml. + See https://asus-linux.org/asusctl/#led-keyboard-control. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ pkgs.asusctl ]; + + environment.etc = + let + maybeConfig = name: cfg: lib.mkIf (cfg != { }) { + source = json.generate name cfg; + mode = "0644"; + }; + in + { + "asusd/anime.conf" = maybeConfig "anime.conf" cfg.animeConfig; + "asusd/asusd.conf" = maybeConfig "asusd.conf" cfg.asusdConfig; + "asusd/aura.conf" = maybeConfig "aura.conf" cfg.auraConfig; + "asusd/profile.conf" = lib.mkIf (cfg.profileConfig != null) { + source = pkgs.writeText "profile.conf" cfg.profileConfig; + mode = "0644"; + }; + "asusd/asusd-ledmodes.toml" = { + source = + if cfg.ledModesConfig == null + then "${pkgs.asusctl}/share/asusd/data/asusd-ledmodes.toml" + else toml.generate "asusd-ledmodes.toml" cfg.ledModesConfig; + mode = "0644"; + }; + }; + + services.dbus.enable = true; + systemd.packages = [ pkgs.asusctl ]; + services.dbus.packages = [ pkgs.asusctl ]; + services.udev.packages = [ pkgs.asusctl ]; + services.supergfxd.enable = lib.mkDefault true; + + systemd.user.services.asusd-user.enable = cfg.enableUserService; + }; + + meta.maintainers = pkgs.asusctl.meta.maintainers; +} diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index 8b90c1913bc5..2a58be51bb02 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -50,14 +50,8 @@ in type = types.package; default = pkgs.bluez; defaultText = literalExpression "pkgs.bluez"; - example = literalExpression "pkgs.bluezFull"; description = lib.mdDoc '' Which BlueZ package to use. - - ::: {.note} - Use the `pkgs.bluezFull` package to enable all - bluez plugins. - ::: ''; }; @@ -77,6 +71,29 @@ in }; description = lib.mdDoc "Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf)."; }; + + input = mkOption { + type = cfgFmt.type; + default = { }; + example = { + General = { + IdleTimeout = 30; + ClassicBondedOnly = true; + }; + }; + description = lib.mdDoc "Set configuration for the input service (/etc/bluetooth/input.conf)."; + }; + + network = mkOption { + type = cfgFmt.type; + default = { }; + example = { + General = { + DisableSecurity = true; + }; + }; + description = lib.mdDoc "Set configuration for the network service (/etc/bluetooth/network.conf)."; + }; }; }; @@ -86,6 +103,10 @@ in environment.systemPackages = [ package ] ++ optional cfg.hsphfpd.enable pkgs.hsphfpd; + environment.etc."bluetooth/input.conf".source = + cfgFmt.generate "input.conf" cfg.input; + environment.etc."bluetooth/network.conf".source = + cfgFmt.generate "network.conf" cfg.network; environment.etc."bluetooth/main.conf".source = cfgFmt.generate "main.conf" (recursiveUpdate defaults cfg.settings); services.udev.packages = [ package ]; diff --git a/nixos/modules/services/hardware/fancontrol.nix b/nixos/modules/services/hardware/fancontrol.nix index e7eb8ebf92be..993c37b2364f 100644 --- a/nixos/modules/services/hardware/fancontrol.nix +++ b/nixos/modules/services/hardware/fancontrol.nix @@ -42,6 +42,13 @@ in ExecStart = "${pkgs.lm_sensors}/sbin/fancontrol ${configFile}"; }; }; + + # On some systems, the fancontrol service does not resume properly after sleep because the pwm status of the fans + # is not reset properly. Restarting the service fixes this, in accordance with https://github.com/lm-sensors/lm-sensors/issues/172. + powerManagement.resumeCommands = '' + systemctl restart fancontrol.service + ''; + }; meta.maintainers = [ maintainers.evils ]; diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix index 98f837bd7824..4e7d730d127b 100644 --- a/nixos/modules/services/hardware/fwupd.nix +++ b/nixos/modules/services/hardware/fwupd.nix @@ -7,19 +7,16 @@ with lib; let cfg = config.services.fwupd; + format = pkgs.formats.ini { + listToValue = l: lib.concatStringsSep ";" (map (s: generators.mkValueStringDefault {} s) l); + mkKeyValue = generators.mkKeyValueDefault {} "="; + }; + customEtc = { "fwupd/daemon.conf" = { - source = pkgs.writeText "daemon.conf" '' - [fwupd] - DisabledDevices=${lib.concatStringsSep ";" cfg.disabledDevices} - DisabledPlugins=${lib.concatStringsSep ";" cfg.disabledPlugins} - ''; - }; - "fwupd/uefi_capsule.conf" = { - source = pkgs.writeText "uefi_capsule.conf" '' - [uefi_capsule] - OverrideESPMountPoint=${config.boot.loader.efi.efiSysMountPoint} - ''; + source = format.generate "daemon.conf" { + fwupd = cfg.daemonSettings; + }; }; }; @@ -67,24 +64,6 @@ in { ''; }; - disabledDevices = mkOption { - type = types.listOf types.str; - default = []; - example = [ "2082b5e0-7a64-478a-b1b2-e3404fab6dad" ]; - description = lib.mdDoc '' - Allow disabling specific devices by their GUID - ''; - }; - - disabledPlugins = mkOption { - type = types.listOf types.str; - default = []; - example = [ "udev" ]; - description = lib.mdDoc '' - Allow disabling specific plugins - ''; - }; - extraTrustedKeys = mkOption { type = types.listOf types.path; default = []; @@ -120,18 +99,62 @@ in { Which fwupd package to use. ''; }; + + daemonSettings = mkOption { + type = types.submodule { + freeformType = format.type.nestedTypes.elemType; + options = { + DisabledDevices = mkOption { + type = types.listOf types.str; + default = []; + example = [ "2082b5e0-7a64-478a-b1b2-e3404fab6dad" ]; + description = lib.mdDoc '' + List of device GUIDs to be disabled. + ''; + }; + + DisabledPlugins = mkOption { + type = types.listOf types.str; + default = []; + example = [ "udev" ]; + description = lib.mdDoc '' + List of plugins to be disabled. + ''; + }; + + EspLocation = mkOption { + type = types.path; + default = config.boot.loader.efi.efiSysMountPoint; + defaultText = lib.literalExpression "config.boot.loader.efi.efiSysMountPoint"; + description = lib.mdDoc '' + The EFI system partition (ESP) path used if UDisks is not available + or if this partition is not mounted at /boot/efi, /boot, or /efi + ''; + }; + }; + }; + default = {}; + description = lib.mdDoc '' + Configurations for the fwupd daemon. + ''; + }; }; }; imports = [ - (mkRenamedOptionModule [ "services" "fwupd" "blacklistDevices"] [ "services" "fwupd" "disabledDevices" ]) - (mkRenamedOptionModule [ "services" "fwupd" "blacklistPlugins"] [ "services" "fwupd" "disabledPlugins" ]) + (mkRenamedOptionModule [ "services" "fwupd" "blacklistDevices"] [ "services" "fwupd" "daemonSettings" "DisabledDevices" ]) + (mkRenamedOptionModule [ "services" "fwupd" "blacklistPlugins"] [ "services" "fwupd" "daemonSettings" "DisabledPlugins" ]) + (mkRenamedOptionModule [ "services" "fwupd" "disabledDevices" ] [ "services" "fwupd" "daemonSettings" "DisabledDevices" ]) + (mkRenamedOptionModule [ "services" "fwupd" "disabledPlugins" ] [ "services" "fwupd" "daemonSettings" "DisabledPlugins" ]) ]; ###### implementation config = mkIf cfg.enable { # Disable test related plug-ins implicitly so that users do not have to care about them. - services.fwupd.disabledPlugins = cfg.package.defaultDisabledPlugins; + services.fwupd.daemonSettings = { + DisabledPlugins = cfg.package.defaultDisabledPlugins; + EspLocation = config.boot.loader.efi.efiSysMountPoint; + }; environment.systemPackages = [ cfg.package ]; @@ -142,6 +165,9 @@ in { services.udev.packages = [ cfg.package ]; + # required to update the firmware of disks + services.udisks2.enable = true; + systemd.packages = [ cfg.package ]; security.polkit.enable = true; diff --git a/nixos/modules/services/hardware/joycond.nix b/nixos/modules/services/hardware/joycond.nix index f4da00762a43..1af18b3b63d3 100644 --- a/nixos/modules/services/hardware/joycond.nix +++ b/nixos/modules/services/hardware/joycond.nix @@ -14,7 +14,7 @@ with lib; package = mkOption { type = types.package; default = pkgs.joycond; - defaultText = "pkgs.joycond"; + defaultText = lib.literalExpression "pkgs.joycond"; description = lib.mdDoc '' The joycond package to use. ''; diff --git a/nixos/modules/services/hardware/lirc.nix b/nixos/modules/services/hardware/lirc.nix index acc43cd4186b..5b1a8d10c729 100644 --- a/nixos/modules/services/hardware/lirc.nix +++ b/nixos/modules/services/hardware/lirc.nix @@ -19,7 +19,7 @@ in { [lircd] nodaemon = False ''; - description = lib.mdDoc "LIRC default options descriped in man:lircd(8) ({file}`lirc_options.conf`)"; + description = lib.mdDoc "LIRC default options described in man:lircd(8) ({file}`lirc_options.conf`)"; }; configs = mkOption { diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index dd5c65b1f6a6..2cac2e8e8bb4 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -28,7 +28,7 @@ let }; env = { - SANE_CONFIG_DIR = "/etc/sane.d"; + SANE_CONFIG_DIR = "/etc/sane-config"; LD_LIBRARY_PATH = [ "/etc/sane-libs" ]; }; @@ -126,13 +126,22 @@ in ''; }; + hardware.sane.openFirewall = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Open ports needed for discovery of scanners on the local network, e.g. + needed for Canon scanners (BJNP protocol). + ''; + }; + services.saned.enable = mkOption { type = types.bool; default = false; description = lib.mdDoc '' Enable saned network daemon for remote connection to scanners. - saned would be runned from `scanner` user; to allow + saned would be run from `scanner` user; to allow access to hardware that doesn't have `scanner` group you should add needed groups to this user. ''; @@ -158,11 +167,12 @@ in environment.systemPackages = backends; environment.sessionVariables = env; - environment.etc."sane.d".source = config.hardware.sane.configDir; + environment.etc."sane-config".source = config.hardware.sane.configDir; environment.etc."sane-libs".source = "${saneConfig}/lib/sane"; services.udev.packages = backends; users.groups.scanner.gid = config.ids.gids.scanner; + networking.firewall.allowedUDPPorts = mkIf config.hardware.sane.openFirewall [ 8612 ]; }) (mkIf config.services.saned.enable { diff --git a/nixos/modules/services/hardware/supergfxd.nix b/nixos/modules/services/hardware/supergfxd.nix new file mode 100644 index 000000000000..df339e4ba011 --- /dev/null +++ b/nixos/modules/services/hardware/supergfxd.nix @@ -0,0 +1,41 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.supergfxd; + json = pkgs.formats.json { }; +in +{ + options = { + services.supergfxd = { + enable = lib.mkEnableOption (lib.mdDoc "Enable the supergfxd service"); + + settings = lib.mkOption { + type = lib.types.nullOr json.type; + default = null; + description = lib.mdDoc '' + The content of /etc/supergfxd.conf. + See https://gitlab.com/asus-linux/supergfxctl/#config-options-etcsupergfxdconf. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ pkgs.supergfxctl ]; + + environment.etc."supergfxd.conf" = lib.mkIf (cfg.settings != null) { + source = json.generate "supergfxd.conf" cfg.settings; + mode = "0644"; + }; + + services.dbus.enable = true; + + systemd.packages = [ pkgs.supergfxctl ]; + systemd.services.supergfxd.wantedBy = [ "multi-user.target" ]; + + services.dbus.packages = [ pkgs.supergfxctl ]; + services.udev.packages = [ pkgs.supergfxctl ]; + }; + + meta.maintainers = pkgs.supergfxctl.meta.maintainers; +} diff --git a/nixos/modules/services/hardware/throttled.nix b/nixos/modules/services/hardware/throttled.nix index 99735ff6519d..afca24d976e1 100644 --- a/nixos/modules/services/hardware/throttled.nix +++ b/nixos/modules/services/hardware/throttled.nix @@ -20,12 +20,12 @@ in { config = mkIf cfg.enable { systemd.packages = [ pkgs.throttled ]; # The upstream package has this in Install, but that's not enough, see the NixOS manual - systemd.services.lenovo_fix.wantedBy = [ "multi-user.target" ]; + systemd.services.throttled.wantedBy = [ "multi-user.target" ]; - environment.etc."lenovo_fix.conf".source = + environment.etc."throttled.conf".source = if cfg.extraConfig != "" - then pkgs.writeText "lenovo_fix.conf" cfg.extraConfig - else "${pkgs.throttled}/etc/lenovo_fix.conf"; + then pkgs.writeText "throttled.conf" cfg.extraConfig + else "${pkgs.throttled}/etc/throttled.conf"; # Kernel 5.9 spams warnings whenever userspace writes to CPU MSRs. # See https://github.com/erpalma/throttled/issues/215 diff --git a/nixos/modules/services/hardware/trezord.md b/nixos/modules/services/hardware/trezord.md new file mode 100644 index 000000000000..58c244a44bc1 --- /dev/null +++ b/nixos/modules/services/hardware/trezord.md @@ -0,0 +1,17 @@ +# Trezor {#trezor} + +Trezor is an open-source cryptocurrency hardware wallet and security token +allowing secure storage of private keys. + +It offers advanced features such U2F two-factor authorization, SSH login +through +[Trezor SSH agent](https://wiki.trezor.io/Apps:SSH_agent), +[GPG](https://wiki.trezor.io/GPG) and a +[password manager](https://wiki.trezor.io/Trezor_Password_Manager). +For more information, guides and documentation, see . + +To enable Trezor support, add the following to your {file}`configuration.nix`: + + services.trezord.enable = true; + +This will add all necessary udev rules and start Trezor Bridge. diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix index 70c1fd09860e..b2217fc97124 100644 --- a/nixos/modules/services/hardware/trezord.nix +++ b/nixos/modules/services/hardware/trezord.nix @@ -8,7 +8,7 @@ in { ### docs meta = { - doc = ./trezord.xml; + doc = ./trezord.md; }; ### interface diff --git a/nixos/modules/services/hardware/trezord.xml b/nixos/modules/services/hardware/trezord.xml deleted file mode 100644 index 972d409d9d0e..000000000000 --- a/nixos/modules/services/hardware/trezord.xml +++ /dev/null @@ -1,26 +0,0 @@ - - Trezor - - Trezor is an open-source cryptocurrency hardware wallet and security token - allowing secure storage of private keys. - - - It offers advanced features such U2F two-factor authorization, SSH login - through - Trezor SSH agent, - GPG and a - password manager. - For more information, guides and documentation, see . - - - To enable Trezor support, add the following to your configuration.nix: - - = true; - - This will add all necessary udev rules and start Trezor Bridge. - - diff --git a/nixos/modules/services/hardware/usbmuxd.nix b/nixos/modules/services/hardware/usbmuxd.nix index b4c954906dd3..9466ea26995b 100644 --- a/nixos/modules/services/hardware/usbmuxd.nix +++ b/nixos/modules/services/hardware/usbmuxd.nix @@ -13,6 +13,7 @@ in { options.services.usbmuxd = { + enable = mkOption { type = types.bool; default = false; @@ -39,6 +40,15 @@ in The group usbmuxd should use to run after startup. ''; }; + + package = mkOption { + type = types.package; + default = pkgs.usbmuxd; + defaultText = literalExpression "pkgs.usbmuxd"; + description = lib.mdDoc "Which package to use for the usbmuxd daemon."; + relatedPackages = [ "usbmuxd" "usbmuxd2" ]; + }; + }; config = mkIf cfg.enable { @@ -68,7 +78,7 @@ in # Trigger the udev rule manually. This doesn't require replugging the # device when first enabling the option to get it to work ExecStartPre = "${pkgs.udev}/bin/udevadm trigger -s usb -a idVendor=${apple}"; - ExecStart = "${pkgs.usbmuxd}/bin/usbmuxd -U ${cfg.user} -f"; + ExecStart = "${cfg.package}/bin/usbmuxd -U ${cfg.user} -v"; }; }; diff --git a/nixos/modules/services/home-automation/evcc.nix b/nixos/modules/services/home-automation/evcc.nix index c12ba9d0c1e2..efa2cf244313 100644 --- a/nixos/modules/services/home-automation/evcc.nix +++ b/nixos/modules/services/home-automation/evcc.nix @@ -48,7 +48,10 @@ in wantedBy = [ "multi-user.target" ]; - + environment.HOME = "/var/lib/evcc"; + path = with pkgs; [ + glibc # requires getent + ]; serviceConfig = { ExecStart = "${package}/bin/evcc --config ${configFile} ${escapeShellArgs cfg.extraArgs}"; CapabilityBoundingSet = [ "" ]; @@ -77,6 +80,7 @@ in ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "invisible"; + StateDirectory = "evcc"; SystemCallArchitectures = "native"; SystemCallFilter = [ "@system-service" diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 2962e52c08bb..9f6f153a1056 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -435,13 +435,16 @@ in { "august" "august_ble" "airthings_ble" + "aranet" "bluemaestro" "bluetooth" + "bluetooth_adapters" "bluetooth_le_tracker" "bluetooth_tracker" "bthome" "default_config" "eq3btsmart" + "eufylife_ble" "esphome" "fjaraskupan" "govee_ble" @@ -451,10 +454,15 @@ in { "led_ble" "melnor" "moat" + "mopeka" "oralb" "qingping" + "ruuvi_gateway" + "ruuvitag_ble" + "sensirion_ble" "sensorpro" "sensorpush" + "shelly" "snooz" "switchbot" "thermobeacon" diff --git a/nixos/modules/services/home-automation/zigbee2mqtt.nix b/nixos/modules/services/home-automation/zigbee2mqtt.nix index 71f6e7a25840..796de3a491e4 100644 --- a/nixos/modules/services/home-automation/zigbee2mqtt.nix +++ b/nixos/modules/services/home-automation/zigbee2mqtt.nix @@ -119,9 +119,8 @@ in ]; SystemCallArchitectures = "native"; SystemCallFilter = [ - "@system-service" - "~@privileged" - "~@resources" + "@system-service @pkey" + "~@privileged @resources" ]; UMask = "0077"; }; diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index fd41b982678f..1799e9282b3b 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -163,7 +163,7 @@ in default = null; description = lib.mdDoc '' How often to rotate the logs. Defaults to previously set global setting, - which itself defauts to weekly. + which itself defaults to weekly. ''; }; diff --git a/nixos/modules/services/logging/ulogd.nix b/nixos/modules/services/logging/ulogd.nix new file mode 100644 index 000000000000..065032b531c6 --- /dev/null +++ b/nixos/modules/services/logging/ulogd.nix @@ -0,0 +1,48 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.ulogd; + settingsFormat = pkgs.formats.ini { }; + settingsFile = settingsFormat.generate "ulogd.conf" cfg.settings; +in { + options = { + services.ulogd = { + enable = mkEnableOption (lib.mdDoc "ulogd"); + + settings = mkOption { + example = { + global.stack = "stack=log1:NFLOG,base1:BASE,pcap1:PCAP"; + log1.group = 2; + pcap1 = { + file = "/var/log/ulogd.pcap"; + sync = 1; + }; + }; + type = settingsFormat.type; + default = { }; + description = lib.mdDoc "Configuration for ulogd. See {file}`/share/doc/ulogd/` in `pkgs.ulogd.doc`."; + }; + + logLevel = mkOption { + type = types.enum [ 1 3 5 7 8 ]; + default = 5; + description = lib.mdDoc "Log level (1 = debug, 3 = info, 5 = notice, 7 = error, 8 = fatal)"; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.ulogd = { + description = "Ulogd Daemon"; + wantedBy = [ "multi-user.target" ]; + wants = [ "network-pre.target" ]; + before = [ "network-pre.target" ]; + + serviceConfig = { + ExecStart = "${pkgs.ulogd}/bin/ulogd -c ${settingsFile} --verbose --loglevel ${toString cfg.logLevel}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + }; +} diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix index cd0da4fc5098..a9504acee351 100644 --- a/nixos/modules/services/mail/exim.nix +++ b/nixos/modules/services/mail/exim.nix @@ -116,8 +116,9 @@ in wantedBy = [ "multi-user.target" ]; restartTriggers = [ config.environment.etc."exim.conf".source ]; serviceConfig = { - ExecStart = "${cfg.package}/bin/exim -bdf -q${cfg.queueRunnerInterval}"; - ExecReload = "${coreutils}/bin/kill -HUP $MAINPID"; + ExecStart = "+${cfg.package}/bin/exim -bdf -q${cfg.queueRunnerInterval}"; + ExecReload = "+${coreutils}/bin/kill -HUP $MAINPID"; + User = cfg.user; }; preStart = '' if ! test -d ${cfg.spoolDir}; then diff --git a/nixos/modules/services/mail/goeland.nix b/nixos/modules/services/mail/goeland.nix new file mode 100644 index 000000000000..13092a65ed90 --- /dev/null +++ b/nixos/modules/services/mail/goeland.nix @@ -0,0 +1,74 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.goeland; + tomlFormat = pkgs.formats.toml { }; +in +{ + options.services.goeland = { + enable = mkEnableOption (mdDoc "goeland"); + + settings = mkOption { + description = mdDoc '' + Configuration of goeland. + See the [example config file](https://github.com/slurdge/goeland/blob/master/cmd/asset/config.default.toml) for the available options. + ''; + default = { }; + type = tomlFormat.type; + }; + schedule = mkOption { + type = types.str; + default = "12h"; + example = "Mon, 00:00:00"; + description = mdDoc "How often to run goeland, in systemd time format."; + }; + stateDir = mkOption { + type = types.path; + default = "/var/lib/goeland"; + description = mdDoc '' + The data directory for goeland where the database will reside if using the unseen filter. + If left as the default value this directory will automatically be created before the goeland + server starts, otherwise you are responsible for ensuring the directory exists with + appropriate ownership and permissions. + ''; + }; + }; + + config = mkIf cfg.enable { + services.goeland.settings.database = "${cfg.stateDir}/goeland.db"; + + systemd.services.goeland = { + serviceConfig = let confFile = tomlFormat.generate "config.toml" cfg.settings; in mkMerge [ + { + ExecStart = "${pkgs.goeland}/bin/goeland run -c ${confFile}"; + User = "goeland"; + Group = "goeland"; + } + (mkIf (cfg.stateDir == "/var/lib/goeland") { + StateDirectory = "goeland"; + StateDirectoryMode = "0750"; + }) + ]; + startAt = cfg.schedule; + }; + + users.users.goeland = { + description = "goeland user"; + group = "goeland"; + isSystemUser = true; + }; + users.groups.goeland = { }; + + warnings = optionals (hasAttr "password" cfg.settings.email) [ + '' + It is not recommended to set the "services.goeland.settings.email.password" + option as it will be in cleartext in the Nix store. + Please use "services.goeland.settings.email.password_file" instead. + '' + ]; + }; + + meta.maintainers = with maintainers; [ sweenu ]; +} diff --git a/nixos/modules/services/mail/listmonk.nix b/nixos/modules/services/mail/listmonk.nix index c4ea6747196c..251362fdd89d 100644 --- a/nixos/modules/services/mail/listmonk.nix +++ b/nixos/modules/services/mail/listmonk.nix @@ -8,7 +8,7 @@ let # Escaping is done according to https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-CONSTANTS setDatabaseOption = key: value: "UPDATE settings SET value = '${ - lib.replaceChars [ "'" ] [ "''" ] (builtins.toJSON value) + lib.replaceStrings [ "'" ] [ "''" ] (builtins.toJSON value) }' WHERE key = '${key}';"; updateDatabaseConfigSQL = pkgs.writeText "update-database-config.sql" (concatStringsSep "\n" (mapAttrsToList setDatabaseOption @@ -128,7 +128,7 @@ in { ''; }; }; - package = mkPackageOption pkgs "listmonk" {}; + package = mkPackageOptionMD pkgs "listmonk" {}; settings = mkOption { type = types.submodule { freeformType = tomlFormat.type; }; description = lib.mdDoc '' diff --git a/nixos/modules/services/mail/mailman.md b/nixos/modules/services/mail/mailman.md new file mode 100644 index 000000000000..55b61f8a2582 --- /dev/null +++ b/nixos/modules/services/mail/mailman.md @@ -0,0 +1,82 @@ +# Mailman {#module-services-mailman} + +[Mailman](https://www.list.org) is free +software for managing electronic mail discussion and e-newsletter +lists. Mailman and its web interface can be configured using the +corresponding NixOS module. Note that this service is best used with +an existing, securely configured Postfix setup, as it does not automatically configure this. + +## Basic usage with Postfix {#module-services-mailman-basic-usage} + +For a basic configuration with Postfix as the MTA, the following settings are suggested: +``` +{ config, ... }: { + services.postfix = { + enable = true; + relayDomains = ["hash:/var/lib/mailman/data/postfix_domains"]; + sslCert = config.security.acme.certs."lists.example.org".directory + "/full.pem"; + sslKey = config.security.acme.certs."lists.example.org".directory + "/key.pem"; + config = { + transport_maps = ["hash:/var/lib/mailman/data/postfix_lmtp"]; + local_recipient_maps = ["hash:/var/lib/mailman/data/postfix_lmtp"]; + }; + }; + services.mailman = { + enable = true; + serve.enable = true; + hyperkitty.enable = true; + webHosts = ["lists.example.org"]; + siteOwner = "mailman@example.org"; + }; + services.nginx.virtualHosts."lists.example.org".enableACME = true; + networking.firewall.allowedTCPPorts = [ 25 80 443 ]; +} +``` + +DNS records will also be required: + + - `AAAA` and `A` records pointing to the host in question, in order for browsers to be able to discover the address of the web server; + - An `MX` record pointing to a domain name at which the host is reachable, in order for other mail servers to be able to deliver emails to the mailing lists it hosts. + +After this has been done and appropriate DNS records have been +set up, the Postorius mailing list manager and the Hyperkitty +archive browser will be available at +https://lists.example.org/. Note that this setup is not +sufficient to deliver emails to most email providers nor to +avoid spam -- a number of additional measures for authenticating +incoming and outgoing mails, such as SPF, DMARC and DKIM are +necessary, but outside the scope of the Mailman module. + +## Using with other MTAs {#module-services-mailman-other-mtas} + +Mailman also supports other MTA, though with a little bit more configuration. For example, to use Mailman with Exim, you can use the following settings: +``` +{ config, ... }: { + services = { + mailman = { + enable = true; + siteOwner = "mailman@example.org"; + enablePostfix = false; + settings.mta = { + incoming = "mailman.mta.exim4.LMTP"; + outgoing = "mailman.mta.deliver.deliver"; + lmtp_host = "localhost"; + lmtp_port = "8024"; + smtp_host = "localhost"; + smtp_port = "25"; + configuration = "python:mailman.config.exim4"; + }; + }; + exim = { + enable = true; + # You can configure Exim in a separate file to reduce configuration.nix clutter + config = builtins.readFile ./exim.conf; + }; + }; +} +``` + +The exim config needs some special additions to work with Mailman. Currently +NixOS can't manage Exim config with such granularity. Please refer to +[Mailman documentation](https://mailman.readthedocs.io/en/latest/src/mailman/docs/mta.html) +for more info on configuring Mailman for working with Exim. diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 198c2f3280f5..9273f71db7d5 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -113,7 +113,7 @@ in { type = types.str; example = "/run/secrets/ldap-bind"; description = lib.mdDoc '' - Path to the file containing the bind password of the servie account + Path to the file containing the bind password of the service account defined by [](#opt-services.mailman.ldap.bindDn). ''; }; @@ -443,7 +443,7 @@ in { virtualHosts = lib.genAttrs cfg.webHosts (webHost: { locations = { ${cfg.serve.virtualRoot}.extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;"; - "${cfg.serve.virtualRoot}/static/".alias = webSettings.STATIC_ROOT + "/"; + "${removeSuffix "/" cfg.serve.virtualRoot}/static/".alias = webSettings.STATIC_ROOT + "/"; }; }); }; @@ -570,10 +570,14 @@ in { type = "normal"; plugins = ["python3"]; home = webEnv; - manage-script-name = true; - mount = "${cfg.serve.virtualRoot}=mailman_web.wsgi:application"; http = "127.0.0.1:18507"; - }; + } + // (if cfg.serve.virtualRoot == "/" + then { module = "mailman_web.wsgi:application"; } + else { + mount = "${cfg.serve.virtualRoot}=mailman_web.wsgi:application"; + manage-script-name = true; + }); uwsgiConfigFile = pkgs.writeText "uwsgi-mailman.json" (builtins.toJSON uwsgiConfig); in { wantedBy = ["multi-user.target"]; @@ -638,7 +642,7 @@ in { meta = { maintainers = with lib.maintainers; [ lheckemann qyliss ma27 ]; - doc = ./mailman.xml; + doc = ./mailman.md; }; } diff --git a/nixos/modules/services/mail/mailman.xml b/nixos/modules/services/mail/mailman.xml deleted file mode 100644 index 27247fb064f2..000000000000 --- a/nixos/modules/services/mail/mailman.xml +++ /dev/null @@ -1,94 +0,0 @@ - - Mailman - - Mailman is free - software for managing electronic mail discussion and e-newsletter - lists. Mailman and its web interface can be configured using the - corresponding NixOS module. Note that this service is best used with - an existing, securely configured Postfix setup, as it does not automatically configure this. - - -
- Basic usage with Postfix - - For a basic configuration with Postfix as the MTA, the following settings are suggested: - { config, ... }: { - services.postfix = { - enable = true; - relayDomains = ["hash:/var/lib/mailman/data/postfix_domains"]; - sslCert = config.security.acme.certs."lists.example.org".directory + "/full.pem"; - sslKey = config.security.acme.certs."lists.example.org".directory + "/key.pem"; - config = { - transport_maps = ["hash:/var/lib/mailman/data/postfix_lmtp"]; - local_recipient_maps = ["hash:/var/lib/mailman/data/postfix_lmtp"]; - }; - }; - services.mailman = { - enable = true; - serve.enable = true; - hyperkitty.enable = true; - webHosts = ["lists.example.org"]; - siteOwner = "mailman@example.org"; - }; - services.nginx.virtualHosts."lists.example.org".enableACME = true; - networking.firewall.allowedTCPPorts = [ 25 80 443 ]; -} - - - DNS records will also be required: - - AAAA and A records pointing to the host in question, in order for browsers to be able to discover the address of the web server; - An MX record pointing to a domain name at which the host is reachable, in order for other mail servers to be able to deliver emails to the mailing lists it hosts. - - - - After this has been done and appropriate DNS records have been - set up, the Postorius mailing list manager and the Hyperkitty - archive browser will be available at - https://lists.example.org/. Note that this setup is not - sufficient to deliver emails to most email providers nor to - avoid spam -- a number of additional measures for authenticating - incoming and outgoing mails, such as SPF, DMARC and DKIM are - necessary, but outside the scope of the Mailman module. - -
-
- Using with other MTAs - - Mailman also supports other MTA, though with a little bit more configuration. For example, to use Mailman with Exim, you can use the following settings: - { config, ... }: { - services = { - mailman = { - enable = true; - siteOwner = "mailman@example.org"; - enablePostfix = false; - settings.mta = { - incoming = "mailman.mta.exim4.LMTP"; - outgoing = "mailman.mta.deliver.deliver"; - lmtp_host = "localhost"; - lmtp_port = "8024"; - smtp_host = "localhost"; - smtp_port = "25"; - configuration = "python:mailman.config.exim4"; - }; - }; - exim = { - enable = true; - # You can configure Exim in a separate file to reduce configuration.nix clutter - config = builtins.readFile ./exim.conf; - }; - }; -} - - - The exim config needs some special additions to work with Mailman. Currently - NixOS can't manage Exim config with such granularity. Please refer to - Mailman documentation - for more info on configuring Mailman for working with Exim. - -
-
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 5461e89a801d..d01734d61e87 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -234,12 +234,12 @@ let headerChecks = concatStringsSep "\n" (map (x: "${x.pattern} ${x.action}") cfg.headerChecks) + cfg.extraHeaderChecks; - aliases = let seperator = if cfg.aliasMapType == "hash" then ":" else ""; in + aliases = let separator = if cfg.aliasMapType == "hash" then ":" else ""; in optionalString (cfg.postmasterAlias != "") '' - postmaster${seperator} ${cfg.postmasterAlias} + postmaster${separator} ${cfg.postmasterAlias} '' + optionalString (cfg.rootAlias != "") '' - root${seperator} ${cfg.rootAlias} + root${separator} ${cfg.rootAlias} '' + cfg.extraAliases ; diff --git a/nixos/modules/services/mail/public-inbox.nix b/nixos/modules/services/mail/public-inbox.nix index ab7ff5f726a4..9cd6726e6cb2 100644 --- a/nixos/modules/services/mail/public-inbox.nix +++ b/nixos/modules/services/mail/public-inbox.nix @@ -275,7 +275,11 @@ in default = {}; description = lib.mdDoc "public inboxes"; type = types.submodule { - freeformType = with types; /*inbox name*/attrsOf (/*inbox option name*/attrsOf /*inbox option value*/iniAtom); + # Keeping in line with the tradition of unnecessarily specific types, allow users to set + # freeform settings either globally under the `publicinbox` section, or for specific + # inboxes through additional nesting. + freeformType = with types; attrsOf (oneOf [ iniAtom (attrsOf iniAtom) ]); + options.css = mkOption { type = with types; listOf str; default = []; diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index d8adf53e48a9..e05820fb87cf 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -39,7 +39,7 @@ in ''; description = lib.mdDoc '' - The package which contains roundcube's sources. Can be overriden to create + The package which contains roundcube's sources. Can be overridden to create an environment which contains roundcube and third-party plugins. ''; }; @@ -92,7 +92,7 @@ in default = []; example = literalExpression "with pkgs.aspellDicts; [ en fr de ]"; description = lib.mdDoc '' - List of aspell dictionnaries for spell checking. If empty, spell checking is disabled. + List of aspell dictionaries for spell checking. If empty, spell checking is disabled. ''; }; diff --git a/nixos/modules/services/matrix/conduit.nix b/nixos/modules/services/matrix/conduit.nix index 812d463e9e86..c8d89ed33f51 100644 --- a/nixos/modules/services/matrix/conduit.nix +++ b/nixos/modules/services/matrix/conduit.nix @@ -23,8 +23,7 @@ in package = mkOption { type = types.package; default = pkgs.matrix-conduit; - defaultText = "pkgs.matrix-conduit"; - example = "pkgs.matrix-conduit"; + defaultText = lib.literalExpression "pkgs.matrix-conduit"; description = lib.mdDoc '' Package of the conduit matrix server to use. ''; diff --git a/nixos/modules/services/matrix/mautrix-telegram.nix b/nixos/modules/services/matrix/mautrix-telegram.nix index 2d9c2dc76c29..5a632fd27e80 100644 --- a/nixos/modules/services/matrix/mautrix-telegram.nix +++ b/nixos/modules/services/matrix/mautrix-telegram.nix @@ -105,7 +105,7 @@ in { `MAUTRIX_TELEGRAM_TELEGRAM_BOT_TOKEN`. These environment variables can also be used to set other options by - replacing hierachy levels by `.`, converting the name to uppercase + replacing hierarchy levels by `.`, converting the name to uppercase and prepending `MAUTRIX_TELEGRAM_`. For example, the first value above maps to {option}`settings.appservice.as_token`. @@ -140,7 +140,7 @@ in { path = [ pkgs.lottieconverter ]; # mautrix-telegram tries to generate a dotfile in the home directory of - # the running user if using a postgresql databse: + # the running user if using a postgresql database: # # File "python3.10/site-packages/asyncpg/connect_utils.py", line 257, in _dot_postgre> # return (pathlib.Path.home() / '.postgresql' / filename).resolve() diff --git a/nixos/modules/services/matrix/mjolnir.md b/nixos/modules/services/matrix/mjolnir.md new file mode 100644 index 000000000000..f6994eeb8fa5 --- /dev/null +++ b/nixos/modules/services/matrix/mjolnir.md @@ -0,0 +1,110 @@ +# Mjolnir (Matrix Moderation Tool) {#module-services-mjolnir} + +This chapter will show you how to set up your own, self-hosted +[Mjolnir](https://github.com/matrix-org/mjolnir) instance. + +As an all-in-one moderation tool, it can protect your server from +malicious invites, spam messages, and whatever else you don't want. +In addition to server-level protection, Mjolnir is great for communities +wanting to protect their rooms without having to use their personal +accounts for moderation. + +The bot by default includes support for bans, redactions, anti-spam, +server ACLs, room directory changes, room alias transfers, account +deactivation, room shutdown, and more. + +See the [README](https://github.com/matrix-org/mjolnir#readme) +page and the [Moderator's guide](https://github.com/matrix-org/mjolnir/blob/main/docs/moderators.md) +for additional instructions on how to setup and use Mjolnir. + +For [additional settings](#opt-services.mjolnir.settings) +see [the default configuration](https://github.com/matrix-org/mjolnir/blob/main/config/default.yaml). + +## Mjolnir Setup {#module-services-mjolnir-setup} + +First create a new Room which will be used as a management room for Mjolnir. In +this room, Mjolnir will log possible errors and debugging information. You'll +need to set this Room-ID in [services.mjolnir.managementRoom](#opt-services.mjolnir.managementRoom). + +Next, create a new user for Mjolnir on your homeserver, if not present already. + +The Mjolnir Matrix user expects to be free of any rate limiting. +See [Synapse #6286](https://github.com/matrix-org/synapse/issues/6286) +for an example on how to achieve this. + +If you want Mjolnir to be able to deactivate users, move room aliases, shutdown rooms, etc. +you'll need to make the Mjolnir user a Matrix server admin. + +Now invite the Mjolnir user to the management room. + +It is recommended to use [Pantalaimon](https://github.com/matrix-org/pantalaimon), +so your management room can be encrypted. This also applies if you are looking to moderate an encrypted room. + +To enable the Pantalaimon E2E Proxy for mjolnir, enable +[services.mjolnir.pantalaimon](#opt-services.mjolnir.pantalaimon.enable). This will +autoconfigure a new Pantalaimon instance, which will connect to the homeserver +set in [services.mjolnir.homeserverUrl](#opt-services.mjolnir.homeserverUrl) and Mjolnir itself +will be configured to connect to the new Pantalaimon instance. + +``` +{ + services.mjolnir = { + enable = true; + homeserverUrl = "https://matrix.domain.tld"; + pantalaimon = { + enable = true; + username = "mjolnir"; + passwordFile = "/run/secrets/mjolnir-password"; + }; + protectedRooms = [ + "https://matrix.to/#/!xxx:domain.tld" + ]; + managementRoom = "!yyy:domain.tld"; + }; +} +``` + +### Element Matrix Services (EMS) {#module-services-mjolnir-setup-ems} + +If you are using a managed ["Element Matrix Services (EMS)"](https://ems.element.io/) +server, you will need to consent to the terms and conditions. Upon startup, an error +log entry with a URL to the consent page will be generated. + +## Synapse Antispam Module {#module-services-mjolnir-matrix-synapse-antispam} + +A Synapse module is also available to apply the same rulesets the bot +uses across an entire homeserver. + +To use the Antispam Module, add `matrix-synapse-plugins.matrix-synapse-mjolnir-antispam` +to the Synapse plugin list and enable the `mjolnir.Module` module. + +``` +{ + services.matrix-synapse = { + plugins = with pkgs; [ + matrix-synapse-plugins.matrix-synapse-mjolnir-antispam + ]; + extraConfig = '' + modules: + - module: mjolnir.Module + config: + # Prevent servers/users in the ban lists from inviting users on this + # server to rooms. Default true. + block_invites: true + # Flag messages sent by servers/users in the ban lists as spam. Currently + # this means that spammy messages will appear as empty to users. Default + # false. + block_messages: false + # Remove users from the user directory search by filtering matrix IDs and + # display names by the entries in the user ban list. Default false. + block_usernames: false + # The room IDs of the ban lists to honour. Unlike other parts of Mjolnir, + # this list cannot be room aliases or permalinks. This server is expected + # to already be joined to the room - Mjolnir will not automatically join + # these rooms. + ban_lists: + - "!roomid:example.org" + ''; + }; +} +``` diff --git a/nixos/modules/services/matrix/mjolnir.nix b/nixos/modules/services/matrix/mjolnir.nix index cbf7b93329d7..b6a3e5e8c730 100644 --- a/nixos/modules/services/matrix/mjolnir.nix +++ b/nixos/modules/services/matrix/mjolnir.nix @@ -236,7 +236,7 @@ in }; meta = { - doc = ./mjolnir.xml; + doc = ./mjolnir.md; maintainers = with maintainers; [ jojosch ]; }; } diff --git a/nixos/modules/services/matrix/mjolnir.xml b/nixos/modules/services/matrix/mjolnir.xml deleted file mode 100644 index b07abe339791..000000000000 --- a/nixos/modules/services/matrix/mjolnir.xml +++ /dev/null @@ -1,134 +0,0 @@ - - Mjolnir (Matrix Moderation Tool) - - This chapter will show you how to set up your own, self-hosted - Mjolnir - instance. - - - As an all-in-one moderation tool, it can protect your server from - malicious invites, spam messages, and whatever else you don't want. - In addition to server-level protection, Mjolnir is great for communities - wanting to protect their rooms without having to use their personal - accounts for moderation. - - - The bot by default includes support for bans, redactions, anti-spam, - server ACLs, room directory changes, room alias transfers, account - deactivation, room shutdown, and more. - - - See the README - page and the Moderator's guide - for additional instructions on how to setup and use Mjolnir. - - - For additional settings - see the default configuration. - -
- Mjolnir Setup - - First create a new Room which will be used as a management room for Mjolnir. In - this room, Mjolnir will log possible errors and debugging information. You'll - need to set this Room-ID in services.mjolnir.managementRoom. - - - Next, create a new user for Mjolnir on your homeserver, if not present already. - - - The Mjolnir Matrix user expects to be free of any rate limiting. - See Synapse #6286 - for an example on how to achieve this. - - - If you want Mjolnir to be able to deactivate users, move room aliases, shutdown rooms, etc. - you'll need to make the Mjolnir user a Matrix server admin. - - - Now invite the Mjolnir user to the management room. - - - It is recommended to use Pantalaimon, - so your management room can be encrypted. This also applies if you are looking to moderate an encrypted room. - - - To enable the Pantalaimon E2E Proxy for mjolnir, enable - services.mjolnir.pantalaimon. This will - autoconfigure a new Pantalaimon instance, which will connect to the homeserver - set in services.mjolnir.homeserverUrl and Mjolnir itself - will be configured to connect to the new Pantalaimon instance. - - -{ - services.mjolnir = { - enable = true; - homeserverUrl = "https://matrix.domain.tld"; - pantalaimon = { - enable = true; - username = "mjolnir"; - passwordFile = "/run/secrets/mjolnir-password"; - }; - protectedRooms = [ - "https://matrix.to/#/!xxx:domain.tld" - ]; - managementRoom = "!yyy:domain.tld"; - }; -} - -
- Element Matrix Services (EMS) - - If you are using a managed "Element Matrix Services (EMS)" - server, you will need to consent to the terms and conditions. Upon startup, an error - log entry with a URL to the consent page will be generated. - -
-
- -
- Synapse Antispam Module - - A Synapse module is also available to apply the same rulesets the bot - uses across an entire homeserver. - - - To use the Antispam Module, add matrix-synapse-plugins.matrix-synapse-mjolnir-antispam - to the Synapse plugin list and enable the mjolnir.Module module. - - -{ - services.matrix-synapse = { - plugins = with pkgs; [ - matrix-synapse-plugins.matrix-synapse-mjolnir-antispam - ]; - extraConfig = '' - modules: - - module: mjolnir.Module - config: - # Prevent servers/users in the ban lists from inviting users on this - # server to rooms. Default true. - block_invites: true - # Flag messages sent by servers/users in the ban lists as spam. Currently - # this means that spammy messages will appear as empty to users. Default - # false. - block_messages: false - # Remove users from the user directory search by filtering matrix IDs and - # display names by the entries in the user ban list. Default false. - block_usernames: false - # The room IDs of the ban lists to honour. Unlike other parts of Mjolnir, - # this list cannot be room aliases or permalinks. This server is expected - # to already be joined to the room - Mjolnir will not automatically join - # these rooms. - ban_lists: - - "!roomid:example.org" - ''; - }; -} - -
-
diff --git a/nixos/modules/services/misc/mx-puppet-discord.nix b/nixos/modules/services/matrix/mx-puppet-discord.nix similarity index 100% rename from nixos/modules/services/misc/mx-puppet-discord.nix rename to nixos/modules/services/matrix/mx-puppet-discord.nix diff --git a/nixos/modules/services/matrix/synapse.md b/nixos/modules/services/matrix/synapse.md new file mode 100644 index 000000000000..22f3bce64a40 --- /dev/null +++ b/nixos/modules/services/matrix/synapse.md @@ -0,0 +1,216 @@ +# Matrix {#module-services-matrix} + +[Matrix](https://matrix.org/) is an open standard for +interoperable, decentralised, real-time communication over IP. It can be used +to power Instant Messaging, VoIP/WebRTC signalling, Internet of Things +communication - or anywhere you need a standard HTTP API for publishing and +subscribing to data whilst tracking the conversation history. + +This chapter will show you how to set up your own, self-hosted Matrix +homeserver using the Synapse reference homeserver, and how to serve your own +copy of the Element web client. See the +[Try Matrix Now!](https://matrix.org/docs/projects/try-matrix-now.html) +overview page for links to Element Apps for Android and iOS, +desktop clients, as well as bridges to other networks and other projects +around Matrix. + +## Synapse Homeserver {#module-services-matrix-synapse} + +[Synapse](https://github.com/matrix-org/synapse) is +the reference homeserver implementation of Matrix from the core development +team at matrix.org. The following configuration example will set up a +synapse server for the `example.org` domain, served from +the host `myhostname.example.org`. For more information, +please refer to the +[installation instructions of Synapse](https://matrix-org.github.io/synapse/latest/setup/installation.html) . +``` +{ pkgs, lib, config, ... }: +let + fqdn = "${config.networking.hostName}.${config.networking.domain}"; + clientConfig = { + "m.homeserver".base_url = "https://${fqdn}"; + "m.identity_server" = {}; + }; + serverConfig."m.server" = "${config.services.matrix-synapse.settings.server_name}:443"; + mkWellKnown = data: '' + add_header Content-Type application/json; + add_header Access-Control-Allow-Origin *; + return 200 '${builtins.toJSON data}'; + ''; +in { + networking.hostName = "myhostname"; + networking.domain = "example.org"; + networking.firewall.allowedTCPPorts = [ 80 443 ]; + + services.postgresql.enable = true; + services.postgresql.initialScript = pkgs.writeText "synapse-init.sql" '' + CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse'; + CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" + TEMPLATE template0 + LC_COLLATE = "C" + LC_CTYPE = "C"; + ''; + + services.nginx = { + enable = true; + recommendedTlsSettings = true; + recommendedOptimisation = true; + recommendedGzipSettings = true; + recommendedProxySettings = true; + virtualHosts = { + # If the A and AAAA DNS records on example.org do not point on the same host as the + # records for myhostname.example.org, you can easily move the /.well-known + # virtualHost section of the code to the host that is serving example.org, while + # the rest stays on myhostname.example.org with no other changes required. + # This pattern also allows to seamlessly move the homeserver from + # myhostname.example.org to myotherhost.example.org by only changing the + # /.well-known redirection target. + "${config.networking.domain}" = { + enableACME = true; + forceSSL = true; + # This section is not needed if the server_name of matrix-synapse is equal to + # the domain (i.e. example.org from @foo:example.org) and the federation port + # is 8448. + # Further reference can be found in the docs about delegation under + # https://matrix-org.github.io/synapse/latest/delegate.html + locations."= /.well-known/matrix/server".extraConfig = mkWellKnown serverConfig; + # This is usually needed for homeserver discovery (from e.g. other Matrix clients). + # Further reference can be found in the upstream docs at + # https://spec.matrix.org/latest/client-server-api/#getwell-knownmatrixclient + locations."= /.well-known/matrix/client".extraConfig = mkWellKnown clientConfig; + }; + "${fqdn}" = { + enableACME = true; + forceSSL = true; + # It's also possible to do a redirect here or something else, this vhost is not + # needed for Matrix. It's recommended though to *not put* element + # here, see also the section about Element. + locations."/".extraConfig = '' + return 404; + ''; + # Forward all Matrix API calls to the synapse Matrix homeserver. A trailing slash + # *must not* be used here. + locations."/_matrix".proxyPass = "http://[::1]:8008"; + # Forward requests for e.g. SSO and password-resets. + locations."/_synapse/client".proxyPass = "http://[::1]:8008"; + }; + }; + }; + + services.matrix-synapse = { + enable = true; + settings.server_name = config.networking.domain; + settings.listeners = [ + { port = 8008; + bind_addresses = [ "::1" ]; + type = "http"; + tls = false; + x_forwarded = true; + resources = [ { + names = [ "client" "federation" ]; + compress = true; + } ]; + } + ]; + }; +} +``` + +## Registering Matrix users {#module-services-matrix-register-users} + +If you want to run a server with public registration by anybody, you can +then enable `services.matrix-synapse.settings.enable_registration = true;`. +Otherwise, or you can generate a registration secret with +{command}`pwgen -s 64 1` and set it with +[](#opt-services.matrix-synapse.settings.registration_shared_secret). +To create a new user or admin, run the following after you have set the secret +and have rebuilt NixOS: +```ShellSession +$ nix-shell -p matrix-synapse +$ register_new_matrix_user -k your-registration-shared-secret http://localhost:8008 +New user localpart: your-username +Password: +Confirm password: +Make admin [no]: +Success! +``` +In the example, this would create a user with the Matrix Identifier +`@your-username:example.org`. + +::: {.warning} +When using [](#opt-services.matrix-synapse.settings.registration_shared_secret), the secret +will end up in the world-readable store. Instead it's recommended to deploy the secret +in an additional file like this: + + - Create a file with the following contents: + + ``` + registration_shared_secret: your-very-secret-secret + ``` + - Deploy the file with a secret-manager such as + [{option}`deployment.keys`](https://nixops.readthedocs.io/en/latest/overview.html#managing-keys) + from {manpage}`nixops(1)` or [sops-nix](https://github.com/Mic92/sops-nix/) to + e.g. {file}`/run/secrets/matrix-shared-secret` and ensure that it's readable + by `matrix-synapse`. + - Include the file like this in your configuration: + + ``` + { + services.matrix-synapse.extraConfigFiles = [ + "/run/secrets/matrix-shared-secret" + ]; + } + ``` +::: + +::: {.note} +It's also possible to user alternative authentication mechanism such as +[LDAP (via `matrix-synapse-ldap3`)](https://github.com/matrix-org/matrix-synapse-ldap3) +or [OpenID](https://matrix-org.github.io/synapse/latest/openid.html). +::: + +## Element (formerly known as Riot) Web Client {#module-services-matrix-element-web} + +[Element Web](https://github.com/vector-im/riot-web/) is +the reference web client for Matrix and developed by the core team at +matrix.org. Element was formerly known as Riot.im, see the +[Element introductory blog post](https://element.io/blog/welcome-to-element/) +for more information. The following snippet can be optionally added to the code before +to complete the synapse installation with a web client served at +`https://element.myhostname.example.org` and +`https://element.example.org`. Alternatively, you can use the hosted +copy at , +or use other web clients or native client applications. Due to the +`/.well-known` urls set up done above, many clients should +fill in the required connection details automatically when you enter your +Matrix Identifier. See +[Try Matrix Now!](https://matrix.org/docs/projects/try-matrix-now.html) +for a list of existing clients and their supported featureset. +``` +{ + services.nginx.virtualHosts."element.${fqdn}" = { + enableACME = true; + forceSSL = true; + serverAliases = [ + "element.${config.networking.domain}" + ]; + + root = pkgs.element-web.override { + conf = { + default_server_config = clientConfig; # see `clientConfig` from the snippet above. + }; + }; + }; +} +``` + +::: {.note} +The Element developers do not recommend running Element and your Matrix +homeserver on the same fully-qualified domain name for security reasons. In +the example, this means that you should not reuse the +`myhostname.example.org` virtualHost to also serve Element, +but instead serve it on a different subdomain, like +`element.example.org` in the example. See the +[Element Important Security Notes](https://github.com/vector-im/element-web/tree/v1.10.0#important-security-notes) +for more information on this subject. +::: diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix index 86662055222a..aee275dab1ec 100644 --- a/nixos/modules/services/matrix/synapse.nix +++ b/nixos/modules/services/matrix/synapse.nix @@ -80,7 +80,7 @@ in { (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 + # options that were moved into rfc42 style settings (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" ) @@ -286,6 +286,7 @@ in { log_config = mkOption { type = types.path; default = ./synapse-log_config.yaml; + defaultText = lib.literalExpression "nixos/modules/services/matrix/synapse-log_config.yaml"; description = lib.mdDoc '' The file that holds the logging configuration. ''; @@ -506,6 +507,12 @@ in { sqlite3 = null; psycopg2 = "matrix-synapse"; }.${cfg.settings.database.name}; + defaultText = lib.literalExpression '' + { + sqlite3 = null; + psycopg2 = "matrix-synapse"; + }.''${cfg.settings.database.name}; + ''; description = lib.mdDoc '' Username to connect with psycopg2, set to null when using sqlite3. @@ -794,7 +801,7 @@ in { meta = { buildDocsInSandbox = false; - doc = ./synapse.xml; + doc = ./synapse.md; maintainers = teams.matrix.members; }; diff --git a/nixos/modules/services/matrix/synapse.xml b/nixos/modules/services/matrix/synapse.xml deleted file mode 100644 index 40ad72173a53..000000000000 --- a/nixos/modules/services/matrix/synapse.xml +++ /dev/null @@ -1,276 +0,0 @@ - - Matrix - - Matrix is an open standard for - interoperable, decentralised, real-time communication over IP. It can be used - to power Instant Messaging, VoIP/WebRTC signalling, Internet of Things - communication - or anywhere you need a standard HTTP API for publishing and - subscribing to data whilst tracking the conversation history. - - - This chapter will show you how to set up your own, self-hosted Matrix - homeserver using the Synapse reference homeserver, and how to serve your own - copy of the Element web client. See the - Try - Matrix Now! overview page for links to Element Apps for Android and iOS, - desktop clients, as well as bridges to other networks and other projects - around Matrix. - -
- Synapse Homeserver - - - Synapse is - the reference homeserver implementation of Matrix from the core development - team at matrix.org. The following configuration example will set up a - synapse server for the example.org domain, served from - the host myhostname.example.org. For more information, - please refer to the - - installation instructions of Synapse . - -{ pkgs, lib, config, ... }: -let - fqdn = "${config.networking.hostName}.${config.networking.domain}"; - clientConfig = { - "m.homeserver".base_url = "https://${fqdn}"; - "m.identity_server" = {}; - }; - serverConfig."m.server" = "${config.services.matrix-synapse.settings.server_name}:443"; - mkWellKnown = data: '' - add_header Content-Type application/json; - add_header Access-Control-Allow-Origin *; - return 200 '${builtins.toJSON data}'; - ''; -in { - = "myhostname"; - = "example.org"; - = [ 80 443 ]; - - = true; - = pkgs.writeText "synapse-init.sql" '' - CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse'; - CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" - TEMPLATE template0 - LC_COLLATE = "C" - LC_CTYPE = "C"; - ''; - - services.nginx = { - enable = true; - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - recommendedProxySettings = true; - virtualHosts = { - "${config.networking.domain}" = { - enableACME = true; - forceSSL = true; - locations."= /.well-known/matrix/server".extraConfig = mkWellKnown serverConfig; - locations."= /.well-known/matrix/client".extraConfig = mkWellKnown clientConfig; - }; - "${fqdn}" = { - enableACME = true; - forceSSL = true; - locations."/".extraConfig = '' - return 404; - ''; - locations."/_matrix".proxyPass = "http://[::1]:8008"; - locations."/_synapse/client".proxyPass = "http://[::1]:8008"; - }; - }; - }; - - services.matrix-synapse = { - enable = true; - settings.server_name = config.networking.domain; - settings.listeners = [ - { port = 8008; - bind_addresses = [ "::1" ]; - type = "http"; - tls = false; - x_forwarded = true; - resources = [ { - names = [ "client" "federation" ]; - compress = true; - } ]; - } - ]; - }; -} - - - - - - If the A and AAAA DNS records on - example.org do not point on the same host as the records - for myhostname.example.org, you can easily move the - /.well-known virtualHost section of the code to the host that - is serving example.org, while the rest stays on - myhostname.example.org with no other changes required. - This pattern also allows to seamlessly move the homeserver from - myhostname.example.org to - myotherhost.example.org by only changing the - /.well-known redirection target. - - - - - This section is not needed if the server_name - of matrix-synapse is equal to the domain (i.e. - example.org from @foo:example.org) - and the federation port is 8448. - Further reference can be found in the docs - about delegation. - - - - - This is usually needed for homeserver discovery (from e.g. other Matrix clients). - Further reference can be found in the upstream docs - - - - - It's also possible to do a redirect here or something else, this vhost is not - needed for Matrix. It's recommended though to not put element - here, see also the section about Element. - - - - - Forward all Matrix API calls to the synapse Matrix homeserver. A trailing slash - must not be used here. - - - - - Forward requests for e.g. SSO and password-resets. - - - -
-
- Registering Matrix users - - If you want to run a server with public registration by anybody, you can - 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 - and have rebuilt NixOS: - -$ nix-shell -p matrix-synapse -$ register_new_matrix_user -k your-registration-shared-secret http://localhost:8008 -New user localpart: your-username -Password: -Confirm password: -Make admin [no]: -Success! - - In the example, this would create a user with the Matrix Identifier - @your-username:example.org. - - - When using , the secret - will end up in the world-readable store. Instead it's recommended to deploy the secret - in an additional file like this: - - - - Create a file with the following contents: -registration_shared_secret: your-very-secret-secret - - - - - Deploy the file with a secret-manager such as - from nixops1 - or sops-nix to - e.g. /run/secrets/matrix-shared-secret and ensure that it's readable - by matrix-synapse. - - - - - Include the file like this in your configuration: - -{ - = [ - "/run/secrets/matrix-shared-secret" - ]; -} - - - - - - - - - - It's also possible to user alternative authentication mechanism such as - LDAP (via matrix-synapse-ldap3) - or OpenID. - - -
-
- Element (formerly known as Riot) Web Client - - - Element Web is - the reference web client for Matrix and developed by the core team at - matrix.org. Element was formerly known as Riot.im, see the - Element introductory blog post - for more information. The following snippet can be optionally added to the code before - to complete the synapse installation with a web client served at - https://element.myhostname.example.org and - https://element.example.org. Alternatively, you can use the hosted - copy at https://app.element.io/, - or use other web clients or native client applications. Due to the - /.well-known urls set up done above, many clients should - fill in the required connection details automatically when you enter your - Matrix Identifier. See - Try - Matrix Now! for a list of existing clients and their supported - featureset. - -{ - services.nginx.virtualHosts."element.${fqdn}" = { - enableACME = true; - forceSSL = true; - serverAliases = [ - "element.${config.networking.domain}" - ]; - - root = pkgs.element-web.override { - conf = { - default_server_config = clientConfig; # see `clientConfig` from the snippet above. - }; - }; - }; -} - - - - - - The Element developers do not recommend running Element and your Matrix - homeserver on the same fully-qualified domain name for security reasons. In - the example, this means that you should not reuse the - myhostname.example.org virtualHost to also serve Element, - but instead serve it on a different subdomain, like - element.example.org in the example. See the - Element - Important Security Notes for more information on this subject. - - -
-
diff --git a/nixos/modules/services/misc/atuin.nix b/nixos/modules/services/misc/atuin.nix new file mode 100644 index 000000000000..c94852e3aad9 --- /dev/null +++ b/nixos/modules/services/misc/atuin.nix @@ -0,0 +1,85 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.atuin; +in +{ + options = { + services.atuin = { + enable = mkEnableOption (mdDoc "Enable server for shell history sync with atuin."); + + openRegistration = mkOption { + type = types.bool; + default = false; + description = mdDoc "Allow new user registrations with the atuin server."; + }; + + path = mkOption { + type = types.str; + default = ""; + description = mdDoc "A path to prepend to all the routes of the server."; + }; + + host = mkOption { + type = types.str; + default = "127.0.0.1"; + description = mdDoc "The host address the atuin server should listen on."; + }; + + port = mkOption { + type = types.port; + default = 8888; + description = mdDoc "The port the atuin server should listen on."; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = mdDoc "Open ports in the firewall for the atuin server."; + }; + + }; + }; + + config = mkIf cfg.enable { + + # enable postgres to host atuin db + services.postgresql = { + enable = true; + ensureUsers = [{ + name = "atuin"; + ensurePermissions = { + "DATABASE atuin" = "ALL PRIVILEGES"; + }; + }]; + ensureDatabases = [ "atuin" ]; + }; + + systemd.services.atuin = { + description = "atuin server"; + after = [ "network.target" "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = "${pkgs.atuin}/bin/atuin server start"; + RuntimeDirectory = "atuin"; + RuntimeDirectoryMode = "0700"; + DynamicUser = true; + }; + + environment = { + ATUIN_HOST = cfg.host; + ATUIN_PORT = toString cfg.port; + ATUIN_OPEN_REGISTRATION = boolToString cfg.openRegistration; + ATUIN_DB_URI = "postgresql:///atuin"; + ATUIN_PATH = cfg.path; + ATUIN_CONFIG_DIR = "/run/atuin"; # required to start, but not used as configuration is via environment variables + }; + }; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + + }; +} diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix index 365fdd5fcc39..aa96acb61306 100644 --- a/nixos/modules/services/misc/autorandr.nix +++ b/nixos/modules/services/misc/autorandr.nix @@ -254,11 +254,17 @@ in { ''; }; + ignoreLid = mkOption { + default = false; + type = types.bool; + description = lib.mdDoc "Treat outputs as connected even if their lids are closed"; + }; + hooks = mkOption { type = hooksModule; description = lib.mdDoc "Global hook scripts"; default = { }; - example = '' + example = literalExpression '' { postswitch = { "notify-i3" = "''${pkgs.i3}/bin/i3-msg restart"; @@ -279,7 +285,7 @@ in { exit 1 esac echo "Xft.dpi: $DPI" | ''${pkgs.xorg.xrdb}/bin/xrdb -merge - ''' + '''; }; } ''; @@ -340,7 +346,13 @@ in { startLimitIntervalSec = 5; startLimitBurst = 1; serviceConfig = { - ExecStart = "${pkgs.autorandr}/bin/autorandr --batch --change --default ${cfg.defaultTarget}"; + ExecStart = '' + ${pkgs.autorandr}/bin/autorandr \ + --batch \ + --change \ + --default ${cfg.defaultTarget} \ + ${optionalString cfg.ignoreLid "--ignore-lid"} + ''; Type = "oneshot"; RemainAfterExit = false; KillMode = "process"; diff --git a/nixos/modules/services/misc/autosuspend.nix b/nixos/modules/services/misc/autosuspend.nix new file mode 100644 index 000000000000..b3e362533a09 --- /dev/null +++ b/nixos/modules/services/misc/autosuspend.nix @@ -0,0 +1,230 @@ +{ config, pkgs, lib, ... }: +let + inherit (lib) mapAttrs' nameValuePair filterAttrs types mkEnableOption + mdDoc mkPackageOptionMD mkOption literalExpression mkIf flatten + maintainers attrValues; + + cfg = config.services.autosuspend; + + settingsFormat = pkgs.formats.ini { }; + + checks = + mapAttrs' + (n: v: nameValuePair "check.${n}" (filterAttrs (_: v: v != null) v)) + cfg.checks; + wakeups = + mapAttrs' + (n: v: nameValuePair "wakeup.${n}" (filterAttrs (_: v: v != null) v)) + cfg.wakeups; + + # Whether the given check is enabled + hasCheck = class: + (filterAttrs + (n: v: v.enabled && (if v.class == null then n else v.class) == class) + cfg.checks) + != { }; + + # Dependencies needed by specific checks + dependenciesForChecks = { + "Smb" = pkgs.samba; + "XIdleTime" = [ pkgs.xprintidle pkgs.sudo ]; + }; + + autosuspend-conf = + settingsFormat.generate "autosuspend.conf" ({ general = cfg.settings; } // checks // wakeups); + + autosuspend = cfg.package; + + checkType = types.submodule { + freeformType = settingsFormat.type.nestedTypes.elemType; + + options.enabled = mkEnableOption (mdDoc "this activity check") // { default = true; }; + + options.class = mkOption { + default = null; + type = with types; nullOr (enum [ + "ActiveCalendarEvent" + "ActiveConnection" + "ExternalCommand" + "JsonPath" + "Kodi" + "KodiIdleTime" + "LastLogActivity" + "Load" + "LogindSessionsIdle" + "Mpd" + "NetworkBandwidth" + "Ping" + "Processes" + "Smb" + "Users" + "XIdleTime" + "XPath" + ]); + description = mdDoc '' + Name of the class implementing the check. If this option is not specified, the check's + name must represent a valid internal check class. + ''; + }; + }; + + wakeupType = types.submodule { + freeformType = settingsFormat.type.nestedTypes.elemType; + + options.enabled = mkEnableOption (mdDoc "this wake-up check") // { default = true; }; + + options.class = mkOption { + default = null; + type = with types; nullOr (enum [ + "Calendar" + "Command" + "File" + "Periodic" + "SystemdTimer" + "XPath" + "XPathDelta" + ]); + description = mdDoc '' + Name of the class implementing the check. If this option is not specified, the check's + name must represent a valid internal check class. + ''; + }; + }; +in +{ + options = { + services.autosuspend = { + enable = mkEnableOption (mdDoc "the autosuspend daemon"); + + package = mkPackageOptionMD pkgs "autosuspend" { }; + + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type.nestedTypes.elemType; + + options = { + # Provide reasonable defaults for these two (required) options + suspend_cmd = mkOption { + default = "systemctl suspend"; + type = with types; str; + description = mdDoc '' + The command to execute in case the host shall be suspended. This line can contain + additional command line arguments to the command to execute. + ''; + }; + wakeup_cmd = mkOption { + default = ''sh -c 'echo 0 > /sys/class/rtc/rtc0/wakealarm && echo {timestamp:.0f} > /sys/class/rtc/rtc0/wakealarm' ''; + type = with types; str; + description = mdDoc '' + The command to execute for scheduling a wake up of the system. The given string is + processed using Python’s `str.format()` and a format argument called `timestamp` + encodes the UTC timestamp of the planned wake up time (float). Additionally `iso` + can be used to acquire the timestamp in ISO 8601 format. + ''; + }; + }; + }; + default = { }; + example = literalExpression '' + { + enable = true; + interval = 30; + idle_time = 120; + } + ''; + description = mdDoc '' + Configuration for autosuspend, see + + for supported values. + ''; + }; + + checks = mkOption { + default = { }; + type = with types; attrsOf checkType; + description = mdDoc '' + Checks for activity. For more information, see: + - + - + ''; + example = literalExpression '' + { + # Basic activity check configuration. + # The check class name is derived from the section header (Ping in this case). + # Remember to enable desired checks. They are disabled by default. + Ping = { + hosts = "192.168.0.7"; + }; + + # This check is disabled. + Smb.enabled = false; + + # Example for a custom check name. + # This will use the Users check with the custom name RemoteUsers. + # Custom names are necessary in case a check class is used multiple times. + # Custom names can also be used for clarification. + RemoteUsers = { + class = "Users"; + name = ".*"; + terminal = ".*"; + host = "[0-9].*"; + }; + + # Here the Users activity check is used again with different settings and a different name + LocalUsers = { + class = "Users"; + name = ".*"; + terminal = ".*"; + host = "localhost"; + }; + } + ''; + }; + + wakeups = mkOption { + default = { }; + type = with types; attrsOf wakeupType; + description = mdDoc '' + Checks for wake up. For more information, see: + - + - + ''; + example = literalExpression '' + { + # Wake up checks reuse the same configuration mechanism as activity checks. + Calendar = { + url = "http://example.org/test.ics"; + }; + } + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.autosuspend = { + description = "A daemon to suspend your server in case of inactivity"; + documentation = [ "https://autosuspend.readthedocs.io/en/latest/systemd_integration.html" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + path = flatten (attrValues (filterAttrs (n: _: hasCheck n) dependenciesForChecks)); + serviceConfig = { + ExecStart = ''${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} daemon''; + }; + }; + + systemd.services.autosuspend-detect-suspend = { + description = "Notifies autosuspend about suspension"; + documentation = [ "https://autosuspend.readthedocs.io/en/latest/systemd_integration.html" ]; + wantedBy = [ "sleep.target" ]; + after = [ "sleep.target" ]; + serviceConfig = { + ExecStart = ''${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} presuspend''; + }; + }; + }; + + meta = { + maintainers = with maintainers; [ xlambein ]; + }; +} diff --git a/nixos/modules/services/misc/beanstalkd.nix b/nixos/modules/services/misc/beanstalkd.nix index 5d34355aebfc..4262cae323b9 100644 --- a/nixos/modules/services/misc/beanstalkd.nix +++ b/nixos/modules/services/misc/beanstalkd.nix @@ -16,7 +16,7 @@ in listen = { port = mkOption { - type = types.int; + type = types.port; description = lib.mdDoc "TCP port that will be used to accept client connections."; default = 11300; }; diff --git a/nixos/modules/services/misc/domoticz.nix b/nixos/modules/services/misc/domoticz.nix index 3358b4de466a..fd9fcf0b78eb 100644 --- a/nixos/modules/services/misc/domoticz.nix +++ b/nixos/modules/services/misc/domoticz.nix @@ -21,7 +21,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 8080; description = lib.mdDoc "Port to bind to for HTTP, set to 0 to disable HTTP."; }; diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix index 4d748ec6eb66..0f92265ccbea 100644 --- a/nixos/modules/services/misc/dysnomia.nix +++ b/nixos/modules/services/misc/dysnomia.nix @@ -114,7 +114,7 @@ in }; components = mkOption { - description = lib.mdDoc "An atttribute set in which each key represents a container and each value an attribute set in which each key represents a component and each value a derivation constructing its initial state"; + description = lib.mdDoc "An attribute set in which each key represents a container and each value an attribute set in which each key represents a component and each value a derivation constructing its initial state"; default = {}; type = types.attrsOf types.attrs; }; diff --git a/nixos/modules/services/misc/etebase-server.nix b/nixos/modules/services/misc/etebase-server.nix index c3723d188146..045048a1a2e3 100644 --- a/nixos/modules/services/misc/etebase-server.nix +++ b/nixos/modules/services/misc/etebase-server.nix @@ -179,21 +179,21 @@ in description = "An Etebase (EteSync 2.0) server"; after = [ "network.target" "systemd-tmpfiles-setup.service" ]; wantedBy = [ "multi-user.target" ]; + path = [ pythonEnv ]; serviceConfig = { User = cfg.user; Restart = "always"; WorkingDirectory = cfg.dataDir; }; environment = { - PYTHONPATH = "${pythonEnv}/${pkgs.python3.sitePackages}"; ETEBASE_EASY_CONFIG_PATH = configIni; }; preStart = '' # Auto-migrate on first run or if the package has changed versionFile="${cfg.dataDir}/src-version" if [[ $(cat "$versionFile" 2>/dev/null) != ${pkgs.etebase-server} ]]; then - ${pythonEnv}/bin/etebase-server migrate --no-input - ${pythonEnv}/bin/etebase-server collectstatic --no-input --clear + etebase-server migrate --no-input + etebase-server collectstatic --no-input --clear echo ${pkgs.etebase-server} > "$versionFile" fi ''; @@ -204,7 +204,7 @@ in else "-b 0.0.0.0 -p ${toString cfg.port}"; in '' cd "${pythonEnv}/lib/etebase-server"; - ${pythonEnv}/bin/daphne ${networking} \ + daphne ${networking} \ etebase_server.asgi:application ''; }; diff --git a/nixos/modules/services/misc/gammu-smsd.nix b/nixos/modules/services/misc/gammu-smsd.nix index 72e83a249c84..83f4efe695a2 100644 --- a/nixos/modules/services/misc/gammu-smsd.nix +++ b/nixos/modules/services/misc/gammu-smsd.nix @@ -45,8 +45,8 @@ let initDBDir = "share/doc/gammu/examples/sql"; gammuPackage = with cfg.backend; (pkgs.gammu.override { - dbiSupport = (service == "sql" && sql.driver == "sqlite"); - postgresSupport = (service == "sql" && sql.driver == "native_pgsql"); + dbiSupport = service == "sql" && sql.driver == "sqlite"; + postgresSupport = service == "sql" && sql.driver == "native_pgsql"; }); in { @@ -192,7 +192,7 @@ in { password = mkOption { type = types.nullOr types.str; default = null; - description = lib.mdDoc "User password used for connetion to the database"; + description = lib.mdDoc "User password used for connection to the database"; }; }; }; diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index ac598108a01e..14bf6aebb681 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -175,7 +175,7 @@ in }; type = mkOption { - type = types.enum [ "zip" "rar" "tar" "sz" "tar.gz" "tar.xz" "tar.bz2" "tar.br" "tar.lz4" ]; + type = types.enum [ "zip" "rar" "tar" "sz" "tar.gz" "tar.xz" "tar.bz2" "tar.br" "tar.lz4" "tar.zst" ]; default = "zip"; description = lib.mdDoc "Archive format used to store the dump file."; }; @@ -183,7 +183,7 @@ in file = mkOption { type = types.nullOr types.str; default = null; - description = lib.mdDoc "Filename to be used for the dump. If `null` a default name is choosen by gitea."; + description = lib.mdDoc "Filename to be used for the dump. If `null` a default name is chosen by gitea."; example = "gitea-dump"; }; }; @@ -235,7 +235,7 @@ in }; httpPort = mkOption { - type = types.int; + type = types.port; default = 3000; description = lib.mdDoc "HTTP listen port."; }; @@ -310,7 +310,7 @@ in }; SSH_PORT = mkOption { - type = types.int; + type = types.port; default = 22; example = 2222; description = lib.mdDoc '' @@ -395,7 +395,7 @@ in ROOT_URL = cfg.rootUrl; } (mkIf cfg.enableUnixSocket { - PROTOCOL = "unix"; + PROTOCOL = "http+unix"; HTTP_ADDR = "/run/gitea/gitea.sock"; }) (mkIf (!cfg.enableUnixSocket) { @@ -404,7 +404,6 @@ in }) (mkIf cfg.lfs.enable { LFS_START_SERVER = true; - LFS_CONTENT_PATH = cfg.lfs.contentDir; }) ]; @@ -426,6 +425,10 @@ in oauth2 = { JWT_SECRET = "#oauth2jwtsecret#"; }; + + lfs = mkIf (cfg.lfs.enable) { + PATH = cfg.lfs.contentDir; + }; }; services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) { @@ -465,12 +468,14 @@ in "d '${cfg.stateDir}/conf' 0750 ${cfg.user} gitea - -" "d '${cfg.stateDir}/custom' 0750 ${cfg.user} gitea - -" "d '${cfg.stateDir}/custom/conf' 0750 ${cfg.user} gitea - -" + "d '${cfg.stateDir}/data' 0750 ${cfg.user} gitea - -" "d '${cfg.stateDir}/log' 0750 ${cfg.user} gitea - -" "z '${cfg.stateDir}' 0750 ${cfg.user} gitea - -" "z '${cfg.stateDir}/.ssh' 0700 ${cfg.user} gitea - -" "z '${cfg.stateDir}/conf' 0750 ${cfg.user} gitea - -" "z '${cfg.stateDir}/custom' 0750 ${cfg.user} gitea - -" "z '${cfg.stateDir}/custom/conf' 0750 ${cfg.user} gitea - -" + "z '${cfg.stateDir}/data' 0750 ${cfg.user} gitea - -" "z '${cfg.stateDir}/log' 0750 ${cfg.user} gitea - -" "Z '${cfg.stateDir}' - ${cfg.user} gitea - -" @@ -483,11 +488,11 @@ in description = "gitea"; after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service"; wantedBy = [ "multi-user.target" ]; - path = [ gitea pkgs.git ]; + path = [ gitea pkgs.git pkgs.gnupg ]; # In older versions the secret naming for JWT was kind of confusing. # The file jwt_secret hold the value for LFS_JWT_SECRET and JWT_SECRET - # wasn't persistant at all. + # wasn't persistent at all. # To fix that, there is now the file oauth2_jwt_secret containing the # values for JWT_SECRET and the file jwt_secret gets renamed to # lfs_jwt_secret. @@ -630,7 +635,6 @@ in systemd.services.gitea-dump = mkIf cfg.dump.enable { description = "gitea dump"; after = [ "gitea.service" ]; - wantedBy = [ "default.target" ]; path = [ gitea ]; environment = { diff --git a/nixos/modules/services/misc/gitlab.md b/nixos/modules/services/misc/gitlab.md new file mode 100644 index 000000000000..916b23584ed0 --- /dev/null +++ b/nixos/modules/services/misc/gitlab.md @@ -0,0 +1,112 @@ +# GitLab {#module-services-gitlab} + +GitLab is a feature-rich git hosting service. + +## Prerequisites {#module-services-gitlab-prerequisites} + +The `gitlab` service exposes only an Unix socket at +`/run/gitlab/gitlab-workhorse.socket`. You need to +configure a webserver to proxy HTTP requests to the socket. + +For instance, the following configuration could be used to use nginx as +frontend proxy: +``` +services.nginx = { + enable = true; + recommendedGzipSettings = true; + recommendedOptimisation = true; + recommendedProxySettings = true; + recommendedTlsSettings = true; + virtualHosts."git.example.com" = { + enableACME = true; + forceSSL = true; + locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; + }; +}; +``` + +## Configuring {#module-services-gitlab-configuring} + +GitLab depends on both PostgreSQL and Redis and will automatically enable +both services. In the case of PostgreSQL, a database and a role will be +created. + +The default state dir is `/var/gitlab/state`. This is where +all data like the repositories and uploads will be stored. + +A basic configuration with some custom settings could look like this: +``` +services.gitlab = { + enable = true; + databasePasswordFile = "/var/keys/gitlab/db_password"; + initialRootPasswordFile = "/var/keys/gitlab/root_password"; + https = true; + host = "git.example.com"; + port = 443; + user = "git"; + group = "git"; + smtp = { + enable = true; + address = "localhost"; + port = 25; + }; + secrets = { + dbFile = "/var/keys/gitlab/db"; + secretFile = "/var/keys/gitlab/secret"; + otpFile = "/var/keys/gitlab/otp"; + jwsFile = "/var/keys/gitlab/jws"; + }; + extraConfig = { + gitlab = { + email_from = "gitlab-no-reply@example.com"; + email_display_name = "Example GitLab"; + email_reply_to = "gitlab-no-reply@example.com"; + default_projects_features = { builds = false; }; + }; + }; +}; +``` + +If you're setting up a new GitLab instance, generate new +secrets. You for instance use +`tr -dc A-Za-z0-9 < /dev/urandom | head -c 128 > /var/keys/gitlab/db` to +generate a new db secret. Make sure the files can be read by, and +only by, the user specified by +[services.gitlab.user](#opt-services.gitlab.user). GitLab +encrypts sensitive data stored in the database. If you're restoring +an existing GitLab instance, you must specify the secrets secret +from `config/secrets.yml` located in your GitLab +state folder. + +When `incoming_mail.enabled` is set to `true` +in [extraConfig](#opt-services.gitlab.extraConfig) an additional +service called `gitlab-mailroom` is enabled for fetching incoming mail. + +Refer to [](#ch-options) for all available configuration +options for the [services.gitlab](#opt-services.gitlab.enable) module. + +## Maintenance {#module-services-gitlab-maintenance} + +### Backups {#module-services-gitlab-maintenance-backups} + +Backups can be configured with the options in +[services.gitlab.backup](#opt-services.gitlab.backup.keepTime). Use +the [services.gitlab.backup.startAt](#opt-services.gitlab.backup.startAt) +option to configure regular backups. + +To run a manual backup, start the `gitlab-backup` service: +```ShellSession +$ systemctl start gitlab-backup.service +``` + +### Rake tasks {#module-services-gitlab-maintenance-rake} + +You can run GitLab's rake tasks with `gitlab-rake` +which will be available on the system when GitLab is enabled. You +will have to run the command as the user that you configured to run +GitLab with. + +A list of all available rake tasks can be obtained by running: +```ShellSession +$ sudo -u git -H gitlab-rake -T +``` diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 13453d9cc785..179359c97a3a 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -16,22 +16,6 @@ let else pkgs.postgresql_12; - # Git 2.36.1 seemingly contains a commit-graph related bug which is - # easily triggered through GitLab, so we downgrade it to 2.35.x - # until this issue is solved. See - # https://gitlab.com/gitlab-org/gitlab/-/issues/360783#note_992870101. - gitPackage = - let - version = "2.35.4"; - in - pkgs.git.overrideAttrs (oldAttrs: rec { - inherit version; - src = pkgs.fetchurl { - url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "sha256-mv13OdNkXggeKQkJ+47QcJ6lYmcw6Qjri1ZJ2ETCTOk="; - }; - }); - gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket"; gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket"; pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url; @@ -56,11 +40,12 @@ let gitalyToml = pkgs.writeText "gitaly.toml" '' socket_path = "${lib.escape ["\""] gitalySocket}" + runtime_dir = "/run/gitaly" bin_dir = "${cfg.packages.gitaly}/bin" prometheus_listen_addr = "localhost:9236" [git] - bin_path = "${gitPackage}/bin/git" + bin_path = "${pkgs.git}/bin/git" [gitaly-ruby] dir = "${cfg.packages.gitaly.ruby}" @@ -157,7 +142,7 @@ let }; workhorse.secret_file = "${cfg.statePath}/.gitlab_workhorse_secret"; gitlab_kas.secret_file = "${cfg.statePath}/.gitlab_kas_secret"; - git.bin_path = "${gitPackage}/bin/git"; + git.bin_path = "git"; monitoring = { ip_whitelist = [ "127.0.0.0/8" "::1/128" ]; sidekiq_exporter = { @@ -576,7 +561,7 @@ in { description = lib.mdDoc "GitLab container registry host name."; }; port = mkOption { - type = types.int; + type = types.port; default = 4567; description = lib.mdDoc "GitLab container registry port."; }; @@ -629,7 +614,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 25; description = lib.mdDoc "Port of the SMTP server for GitLab."; }; @@ -1325,7 +1310,7 @@ in { }); path = with pkgs; [ postgresqlPackage - gitPackage + git ruby openssh nodejs @@ -1356,7 +1341,7 @@ in { path = with pkgs; [ openssh procps # See https://gitlab.com/gitlab-org/gitaly/issues/1562 - gitPackage + git cfg.packages.gitaly.rubyEnv cfg.packages.gitaly.rubyEnv.wrappedRuby gzip @@ -1369,6 +1354,7 @@ in { TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = gitlabEnv.HOME; + RuntimeDirectory = "gitaly"; ExecStart = "${cfg.packages.gitaly}/bin/gitaly ${gitalyToml}"; }; }; @@ -1402,7 +1388,7 @@ in { path = with pkgs; [ remarshal exiftool - gitPackage + git gnutar gzip openssh @@ -1475,7 +1461,7 @@ in { environment = gitlabEnv; path = with pkgs; [ postgresqlPackage - gitPackage + git openssh nodejs procps @@ -1518,6 +1504,6 @@ in { }; - meta.doc = ./gitlab.xml; + meta.doc = ./gitlab.md; } diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml deleted file mode 100644 index 40424c5039a2..000000000000 --- a/nixos/modules/services/misc/gitlab.xml +++ /dev/null @@ -1,151 +0,0 @@ - - GitLab - - GitLab is a feature-rich git hosting service. - -
- Prerequisites - - - The gitlab service exposes only an Unix socket at - /run/gitlab/gitlab-workhorse.socket. You need to - configure a webserver to proxy HTTP requests to the socket. - - - - For instance, the following configuration could be used to use nginx as - frontend proxy: - -services.nginx = { - enable = true; - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - virtualHosts."git.example.com" = { - enableACME = true; - forceSSL = true; - locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; - }; -}; - - -
-
- Configuring - - - GitLab depends on both PostgreSQL and Redis and will automatically enable - both services. In the case of PostgreSQL, a database and a role will be - created. - - - - The default state dir is /var/gitlab/state. This is where - all data like the repositories and uploads will be stored. - - - - A basic configuration with some custom settings could look like this: - -services.gitlab = { - enable = true; - databasePasswordFile = "/var/keys/gitlab/db_password"; - initialRootPasswordFile = "/var/keys/gitlab/root_password"; - https = true; - host = "git.example.com"; - port = 443; - user = "git"; - group = "git"; - smtp = { - enable = true; - address = "localhost"; - port = 25; - }; - secrets = { - dbFile = "/var/keys/gitlab/db"; - secretFile = "/var/keys/gitlab/secret"; - otpFile = "/var/keys/gitlab/otp"; - jwsFile = "/var/keys/gitlab/jws"; - }; - extraConfig = { - gitlab = { - email_from = "gitlab-no-reply@example.com"; - email_display_name = "Example GitLab"; - email_reply_to = "gitlab-no-reply@example.com"; - default_projects_features = { builds = false; }; - }; - }; -}; - - - - - If you're setting up a new GitLab instance, generate new - secrets. You for instance use tr -dc A-Za-z0-9 < - /dev/urandom | head -c 128 > /var/keys/gitlab/db to - generate a new db secret. Make sure the files can be read by, and - only by, the user specified by services.gitlab.user. GitLab - encrypts sensitive data stored in the database. If you're restoring - an existing GitLab instance, you must specify the secrets secret - from config/secrets.yml located in your GitLab - state folder. - - - - When incoming_mail.enabled is set to true - in extraConfig an additional - service called gitlab-mailroom is enabled for fetching incoming mail. - - - - Refer to for all available configuration - options for the - services.gitlab module. - -
-
- Maintenance - -
- Backups - - Backups can be configured with the options in services.gitlab.backup. Use - the services.gitlab.backup.startAt - option to configure regular backups. - - - - To run a manual backup, start the gitlab-backup service: - -$ systemctl start gitlab-backup.service - - -
- -
- Rake tasks - - - You can run GitLab's rake tasks with gitlab-rake - which will be available on the system when GitLab is enabled. You - will have to run the command as the user that you configured to run - GitLab with. - - - - A list of all availabe rake tasks can be obtained by running: - -$ sudo -u git -H gitlab-rake -T - - -
-
-
diff --git a/nixos/modules/services/misc/gpsd.nix b/nixos/modules/services/misc/gpsd.nix index 1ab8d1bbe062..9b03b6f9662e 100644 --- a/nixos/modules/services/misc/gpsd.nix +++ b/nixos/modules/services/misc/gpsd.nix @@ -22,7 +22,7 @@ in type = types.bool; default = false; description = lib.mdDoc '' - Whether to enable `gpsd', a GPS service daemon. + Whether to enable `gpsd`, a GPS service daemon. ''; }; @@ -77,6 +77,14 @@ in ''; }; + listenany = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Listen on all addresses rather than just loopback. + ''; + }; + }; }; @@ -106,6 +114,7 @@ in -S "${toString cfg.port}" \ ${optionalString cfg.readonly "-b"} \ ${optionalString cfg.nowait "-n"} \ + ${optionalString cfg.listenany "-G"} \ "${cfg.device}" ''; }; diff --git a/nixos/modules/services/misc/heisenbridge.nix b/nixos/modules/services/misc/heisenbridge.nix index 13ba362b33db..d07e0e420462 100644 --- a/nixos/modules/services/misc/heisenbridge.nix +++ b/nixos/modules/services/misc/heisenbridge.nix @@ -28,8 +28,7 @@ in package = mkOption { type = types.package; default = pkgs.heisenbridge; - defaultText = "pkgs.heisenbridge"; - example = "pkgs.heisenbridge.override { … = …; }"; + defaultText = lib.literalExpression "pkgs.heisenbridge"; description = lib.mdDoc '' Package of the application to run, exposed for overriding purposes. ''; diff --git a/nixos/modules/services/misc/input-remapper.nix b/nixos/modules/services/misc/input-remapper.nix index 51e1abdc98a0..6353966f5c3f 100644 --- a/nixos/modules/services/misc/input-remapper.nix +++ b/nixos/modules/services/misc/input-remapper.nix @@ -7,7 +7,7 @@ let cfg = config.services.input-remapper; in options = { services.input-remapper = { enable = mkEnableOption (lib.mdDoc "input-remapper, an easy to use tool to change the mapping of your input device buttons."); - package = options.mkPackageOption pkgs "input-remapper" { }; + package = mkPackageOptionMD pkgs "input-remapper" { }; enableUdevRules = mkEnableOption (lib.mdDoc "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" ]; diff --git a/nixos/modules/services/misc/jellyfin.nix b/nixos/modules/services/misc/jellyfin.nix index f49657a07533..2a4483199d7d 100644 --- a/nixos/modules/services/misc/jellyfin.nix +++ b/nixos/modules/services/misc/jellyfin.nix @@ -81,7 +81,7 @@ in ProtectKernelTunables = !config.boot.isContainer; LockPersonality = true; PrivateTmp = !config.boot.isContainer; - # needed for hardware accelaration + # needed for hardware acceleration PrivateDevices = false; PrivateUsers = true; RemoveIPC = true; diff --git a/nixos/modules/services/misc/libreddit.nix b/nixos/modules/services/misc/libreddit.nix index c961d13da473..fd58928d2821 100644 --- a/nixos/modules/services/misc/libreddit.nix +++ b/nixos/modules/services/misc/libreddit.nix @@ -15,6 +15,13 @@ in services.libreddit = { enable = mkEnableOption (lib.mdDoc "Private front-end for Reddit"); + package = mkOption { + type = types.package; + default = pkgs.libreddit; + defaultText = literalExpression "pkgs.libreddit"; + description = lib.mdDoc "Libreddit package to use."; + }; + address = mkOption { default = "0.0.0.0"; example = "127.0.0.1"; @@ -45,7 +52,7 @@ in after = [ "network.target" ]; serviceConfig = { DynamicUser = true; - ExecStart = "${pkgs.libreddit}/bin/libreddit ${args}"; + ExecStart = "${cfg.package}/bin/libreddit ${args}"; AmbientCapabilities = lib.mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ]; Restart = "on-failure"; RestartSec = "2s"; diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index 3f0bd585371f..632b7caaac40 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -288,7 +288,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 49152; description = lib.mdDoc '' The network port to listen on. diff --git a/nixos/modules/services/misc/n8n.nix b/nixos/modules/services/misc/n8n.nix index f59df471e1e0..cdfe9dc8482c 100644 --- a/nixos/modules/services/misc/n8n.nix +++ b/nixos/modules/services/misc/n8n.nix @@ -9,7 +9,6 @@ let in { options.services.n8n = { - enable = mkEnableOption (lib.mdDoc "n8n server"); openFirewall = mkOption { @@ -22,7 +21,7 @@ in type = format.type; default = {}; description = lib.mdDoc '' - Configuration for n8n, see + Configuration for n8n, see for supported values. ''; }; @@ -45,6 +44,10 @@ in N8N_USER_FOLDER = "/var/lib/n8n"; HOME = "/var/lib/n8n"; N8N_CONFIG_FILES = "${configFile}"; + + # Don't phone home + N8N_DIAGNOSTICS_ENABLED = "false"; + N8N_VERSION_NOTIFICATIONS_ENABLED = "false"; }; serviceConfig = { Type = "simple"; diff --git a/nixos/modules/services/misc/nitter.nix b/nixos/modules/services/misc/nitter.nix index 95394d9d2113..f0cb5cc15138 100644 --- a/nixos/modules/services/misc/nitter.nix +++ b/nixos/modules/services/misc/nitter.nix @@ -47,7 +47,7 @@ in { options = { services.nitter = { - enable = mkEnableOption (lib.mdDoc "If enabled, start Nitter."); + enable = mkEnableOption (lib.mdDoc "Nitter"); package = mkOption { default = pkgs.nitter; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 26e7cbfca733..f37d197f1621 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -42,7 +42,7 @@ let else if isDerivation v then toString v else if builtins.isPath v then toString v else if isString v then v - else if isCoercibleToString v then toString v + else if strings.isConvertibleWithToString v then toString v else abort "The nix conf value: ${toPretty {} v} can not be encoded"; mkKeyValue = k: v: "${escape [ "=" ] k} = ${mkValueString v}"; @@ -115,6 +115,7 @@ in (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" ]; }) + (mkRenamedOptionModuleWith { sinceRelease = 2211; from = [ "nix" "readOnlyStore" ]; to = [ "boot" "readOnlyNixStore" ]; }) (mkRemovedOptionModule [ "nix" "daemonNiceLevel" ] "Consider nix.daemonCPUSchedPolicy instead.") ] ++ mapAttrsToList (oldConf: newConf: mkRenamedOptionModuleWith { sinceRelease = 2205; from = [ "nix" oldConf ]; to = [ "nix" "settings" newConf ]; }) legacyConfMappings; @@ -366,17 +367,6 @@ in ''; }; - readOnlyStore = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - If set, NixOS will enforce the immutability of the Nix store - by making {file}`/nix/store` a read-only bind - mount. Nix will automatically make the store writable when - needed. - ''; - }; - nixPath = mkOption { type = types.listOf types.str; default = [ @@ -414,6 +404,7 @@ in str int bool + path package ]); in @@ -618,7 +609,7 @@ in By default, pseudo-features `nixos-test`, `benchmark`, and `big-parallel` used in Nixpkgs are set, `kvm` - is also included in it is avaliable. + is also included if it is available. ''; }; @@ -651,7 +642,7 @@ in description = lib.mdDoc '' Configuration for Nix, see or - {manpage}`nix.conf(5)` for avalaible options. + {manpage}`nix.conf(5)` for available options. The value declared here will be translated directly to the key-value pairs Nix expects. You can use {command}`nix-instantiate --eval --strict '' -A config.nix.settings` @@ -801,7 +792,10 @@ in fi ''; - nix.nrBuildUsers = mkDefault (max 32 (if cfg.settings.max-jobs == "auto" then 0 else cfg.settings.max-jobs)); + nix.nrBuildUsers = mkDefault ( + if cfg.settings.auto-allocate-uids or false then 0 + else max 32 (if cfg.settings.max-jobs == "auto" then 0 else cfg.settings.max-jobs) + ); users.users = nixbldUsers; @@ -825,10 +819,10 @@ in system-features = mkDefault ( [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ - optionals (pkgs.hostPlatform ? gcc.arch) ( + optionals (pkgs.stdenv.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} + [ "gccarch-${pkgs.stdenv.hostPlatform.gcc.arch}" ] ++ + map (x: "gccarch-${x}") (systems.architectures.inferiors.${pkgs.stdenv.hostPlatform.gcc.arch} or []) ) ); } diff --git a/nixos/modules/services/misc/ntfy-sh.nix b/nixos/modules/services/misc/ntfy-sh.nix index 9d52fcf25364..d66b47a2d68a 100644 --- a/nixos/modules/services/misc/ntfy-sh.nix +++ b/nixos/modules/services/misc/ntfy-sh.nix @@ -59,6 +59,10 @@ in systemPackages = [ cfg.package ]; }; + services.ntfy-sh.settings = { + auth-file = mkDefault "/var/lib/ntfy-sh/user.db"; + }; + systemd.services.ntfy-sh = { description = "Push notifications server"; @@ -68,6 +72,7 @@ in serviceConfig = { ExecStart = "${cfg.package}/bin/ntfy serve -c ${configuration}"; User = cfg.user; + StateDirectory = "ntfy-sh"; AmbientCapabilities = "CAP_NET_BIND_SERVICE"; PrivateTmp = true; diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 196adb180a5b..43e0ce0c21d3 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -17,7 +17,7 @@ let cfgUpdate = pkgs.writeText "octoprint-config.yaml" (builtins.toJSON fullConfig); - pluginsEnv = package.python.withPackages (ps: [ps.octoprint] ++ (cfg.plugins ps)); + pluginsEnv = package.python.withPackages (ps: [ ps.octoprint ] ++ (cfg.plugins ps)); package = pkgs.octoprint; @@ -47,6 +47,12 @@ in ''; }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Open ports in the firewall for OctoPrint."; + }; + user = mkOption { type = types.str; default = "octoprint"; @@ -67,7 +73,7 @@ in plugins = mkOption { type = types.functionTo (types.listOf types.package); - default = plugins: []; + default = plugins: [ ]; defaultText = literalExpression "plugins: []"; example = literalExpression "plugins: with plugins; [ themeify stlviewer ]"; description = lib.mdDoc "Additional plugins to be used. Available plugins are passed through the plugins input."; @@ -75,7 +81,7 @@ in extraConfig = mkOption { type = types.attrs; - default = {}; + default = { }; description = lib.mdDoc "Extra options which are added to OctoPrint's YAML configuration file."; }; @@ -100,6 +106,9 @@ in systemd.tmpfiles.rules = [ "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -" + # this will allow octoprint access to raspberry specific hardware to check for throttling + # read-only will not work: "VCHI initialization failed" error + "a /dev/vchiq - - - - u:octoprint:rw" ]; systemd.services.octoprint = { @@ -128,6 +137,6 @@ in }; }; + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; }; - } diff --git a/nixos/modules/services/misc/osrm.nix b/nixos/modules/services/misc/osrm.nix index bcfb868422cc..12c908a761e3 100644 --- a/nixos/modules/services/misc/osrm.nix +++ b/nixos/modules/services/misc/osrm.nix @@ -21,7 +21,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 5000; description = lib.mdDoc "Port on which the web server will run."; }; diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 6a98d5cb686d..667f16d98f82 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -211,28 +211,41 @@ in ]; systemd.services.paperless-scheduler = { - description = "Paperless scheduler"; + description = "Paperless Celery Beat"; + wantedBy = [ "multi-user.target" ]; + wants = [ "paperless-consumer.service" "paperless-web.service" "paperless-task-queue.service" ]; serviceConfig = defaultServiceConfig // { User = cfg.user; - ExecStart = "${pkg}/bin/paperless-ngx qcluster"; + ExecStart = "${pkg}/bin/celery --app paperless beat --loglevel INFO"; Restart = "on-failure"; - # The `mbind` syscall is needed for running the classifier. - SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "mbind" ]; - # Needs to talk to mail server for automated import rules - PrivateNetwork = false; }; environment = env; - wantedBy = [ "multi-user.target" ]; - wants = [ "paperless-consumer.service" "paperless-web.service" ]; preStart = '' ln -sf ${manage} ${cfg.dataDir}/paperless-manage # Auto-migrate on first run or if the package has changed versionFile="${cfg.dataDir}/src-version" - if [[ $(cat "$versionFile" 2>/dev/null) != ${pkg} ]]; then + version=$(cat "$versionFile" 2>/dev/null || echo 0) + + if [[ $version != ${pkg.version} ]]; then ${pkg}/bin/paperless-ngx migrate - echo ${pkg} > "$versionFile" + + # Parse old version string format for backwards compatibility + version=$(echo "$version" | grep -ohP '[^-]+$') + + versionLessThan() { + target=$1 + [[ $({ echo "$version"; echo "$target"; } | sort -V | head -1) != "$target" ]] + } + + if versionLessThan 1.12.0; then + # Reindex documents as mentioned in https://github.com/paperless-ngx/paperless-ngx/releases/tag/v1.12.1 + echo "Reindexing documents, to allow searching old comments. Required after the 1.12.x upgrade." + ${pkg}/bin/paperless-ngx document_index reindex + fi + + echo ${pkg.version} > "$versionFile" fi '' + optionalString (cfg.passwordFile != null) '' @@ -250,6 +263,21 @@ in after = [ "redis-paperless.service" ]; }; + systemd.services.paperless-task-queue = { + description = "Paperless Celery Workers"; + after = [ "paperless-scheduler.service" ]; + serviceConfig = defaultServiceConfig // { + User = cfg.user; + ExecStart = "${pkg}/bin/celery --app paperless worker --loglevel INFO"; + Restart = "on-failure"; + # The `mbind` syscall is needed for running the classifier. + SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "mbind" ]; + # Needs to talk to mail server for automated import rules + PrivateNetwork = false; + }; + environment = env; + }; + # Reading the user-provided password file requires root access systemd.services.paperless-copy-password = mkIf (cfg.passwordFile != null) { requiredBy = [ "paperless-scheduler.service" ]; @@ -265,20 +293,24 @@ in systemd.services.paperless-consumer = { description = "Paperless document consumer"; + # Bind to `paperless-scheduler` so that the consumer never runs + # during migrations + bindsTo = [ "paperless-scheduler.service" ]; + after = [ "paperless-scheduler.service" ]; serviceConfig = defaultServiceConfig // { User = cfg.user; ExecStart = "${pkg}/bin/paperless-ngx document_consumer"; Restart = "on-failure"; }; environment = env; - # Bind to `paperless-scheduler` so that the consumer never runs - # during migrations - bindsTo = [ "paperless-scheduler.service" ]; - after = [ "paperless-scheduler.service" ]; }; systemd.services.paperless-web = { description = "Paperless web server"; + # Bind to `paperless-scheduler` so that the web server never runs + # during migrations + bindsTo = [ "paperless-scheduler.service" ]; + after = [ "paperless-scheduler.service" ]; serviceConfig = defaultServiceConfig // { User = cfg.user; ExecStart = '' @@ -301,11 +333,7 @@ in }; # Allow the web interface to access the private /tmp directory of the server. # This is required to support uploading files via the web interface. - unitConfig.JoinsNamespaceOf = "paperless-scheduler.service"; - # Bind to `paperless-scheduler` so that the web server never runs - # during migrations - bindsTo = [ "paperless-scheduler.service" ]; - after = [ "paperless-scheduler.service" ]; + unitConfig.JoinsNamespaceOf = "paperless-task-queue.service"; }; users = optionalAttrs (cfg.user == defaultUser) { diff --git a/nixos/modules/services/misc/pinnwand.nix b/nixos/modules/services/misc/pinnwand.nix index 294769861111..5fca9f4125a8 100644 --- a/nixos/modules/services/misc/pinnwand.nix +++ b/nixos/modules/services/misc/pinnwand.nix @@ -19,29 +19,66 @@ in }; settings = mkOption { - type = format.type; + default = {}; description = lib.mdDoc '' Your {file}`pinnwand.toml` as a Nix attribute set. Look up - possible options in the [pinnwand.toml-example](https://github.com/supakeen/pinnwand/blob/master/pinnwand.toml-example). + possible options in the [documentation](https://pinnwand.readthedocs.io/en/v${pkgs.pinnwand.version}/configuration.html). ''; - default = {}; + type = types.submodule { + freeformType = format.type; + options = { + database_uri = mkOption { + type = types.str; + default = "sqlite:////var/lib/pinnwand/pinnwand.db"; + example = "sqlite:///:memory"; + description = lib.mdDoc '' + Database URI compatible with [SQLAlchemyhttps://docs.sqlalchemy.org/en/14/core/engines.html#database-urls]. + + Additional packages may need to be introduced into the environment for certain databases. + ''; + }; + + paste_size = mkOption { + type = types.ints.positive; + default = 262144; + example = 524288; + description = lib.mdDoc '' + Maximum size of a paste in bytes. + ''; + }; + paste_help = mkOption { + type = types.str; + default = '' +

Welcome to pinnwand, this site is a pastebin. It allows you to share code with others. If you write code in the text area below and press the paste button you will be given a link you can share with others so they can view your code as well.

People with the link can view your pasted code, only you can remove your paste and it expires automatically. Note that anyone could guess the URI to your paste so don't rely on it being private.

+ ''; + description = lib.mdDoc '' + Raw HTML help text shown in the header area. + ''; + }; + footer = mkOption { + type = types.str; + default = '' + View source code, the removal or expiry stories, or read the about page. + ''; + description = lib.mdDoc '' + The footer in raw HTML. + ''; + }; + }; + }; }; }; config = mkIf cfg.enable { - services.pinnwand.settings = { - database_uri = mkDefault "sqlite:////var/lib/pinnwand/pinnwand.db"; - paste_size = mkDefault 262144; - paste_help = mkDefault '' -

Welcome to pinnwand, this site is a pastebin. It allows you to share code with others. If you write code in the text area below and press the paste button you will be given a link you can share with others so they can view your code as well.

People with the link can view your pasted code, only you can remove your paste and it expires automatically. Note that anyone could guess the URI to your paste so don't rely on it being private.

- ''; - footer = mkDefault '' - View source code, the removal or expiry stories, or read the about page. - ''; - }; + systemd.services.pinnwand = { + description = "Pinnwannd HTTP Server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; - systemd.services = let - hardeningOptions = { + unitConfig.Documentation = "https://pinnwand.readthedocs.io/en/latest/"; + + serviceConfig = { + ExecStart = "${pkgs.pinnwand}/bin/pinnwand --configuration-path ${configFile} http --port ${toString cfg.port}"; User = "pinnwand"; DynamicUser = true; @@ -72,32 +109,14 @@ in RestrictNamespaces = true; RestrictRealtime = true; SystemCallArchitectures = "native"; - SystemCallFilter = "@system-service"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; UMask = "0077"; }; - - command = "${pkgs.pinnwand}/bin/pinnwand --configuration-path ${configFile}"; - in { - pinnwand = { - description = "Pinnwannd HTTP Server"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - - unitConfig.Documentation = "https://pinnwand.readthedocs.io/en/latest/"; - - serviceConfig = { - ExecStart = "${command} http --port ${toString(cfg.port)}"; - } // hardeningOptions; - }; - - pinnwand-reaper = { - description = "Pinnwand Reaper"; - startAt = "daily"; - - serviceConfig = { - ExecStart = "${command} -vvvv reap"; # verbosity increased to show number of deleted pastes - } // hardeningOptions; - }; }; }; + + meta.buildDocsInSandbox = false; } diff --git a/nixos/modules/services/misc/podgrab.nix b/nixos/modules/services/misc/podgrab.nix index c0a124718505..c596122fd31c 100644 --- a/nixos/modules/services/misc/podgrab.nix +++ b/nixos/modules/services/misc/podgrab.nix @@ -12,7 +12,7 @@ in example = "/run/secrets/password.env"; description = lib.mdDoc '' The path to a file containing the PASSWORD environment variable - definition for Podgrab's authentification. + definition for Podgrab's authentication. ''; }; diff --git a/nixos/modules/services/misc/polaris.nix b/nixos/modules/services/misc/polaris.nix index 83da486083b4..70f097f02840 100644 --- a/nixos/modules/services/misc/polaris.nix +++ b/nixos/modules/services/misc/polaris.nix @@ -13,7 +13,7 @@ in services.polaris = { enable = mkEnableOption (lib.mdDoc "Polaris Music Server"); - package = mkPackageOption pkgs "polaris" { }; + package = mkPackageOptionMD pkgs "polaris" { }; user = mkOption { type = types.str; diff --git a/nixos/modules/services/misc/portunus.nix b/nixos/modules/services/misc/portunus.nix index 0b283ea27d82..f60cbe347713 100644 --- a/nixos/modules/services/misc/portunus.nix +++ b/nixos/modules/services/misc/portunus.nix @@ -29,7 +29,7 @@ in package = mkOption { type = types.package; default = pkgs.portunus; - defaultText = "pkgs.portunus"; + defaultText = lib.literalExpression "pkgs.portunus"; description = lib.mdDoc "The Portunus package to use."; }; @@ -108,7 +108,7 @@ in package = mkOption { type = types.package; default = pkgs.openldap; - defaultText = "pkgs.openldap"; + defaultText = lib.literalExpression "pkgs.openldap"; description = lib.mdDoc "The OpenLDAP package to use."; }; @@ -135,7 +135,7 @@ in type = types.bool; default = false; description = lib.mdDoc '' - Wether to enable LDAPS protocol. + Whether to enable LDAPS protocol. This also adds two entries to the `/etc/hosts` file to point [](#opt-services.portunus.domain) to localhost, so that CLIs and programs can use ldaps protocol and verify the certificate without opening the firewall port for the protocol. diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 75c5a4e26e0f..58a595b5c76f 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -206,6 +206,57 @@ in description = lib.mdDoc "Create the database and database user locally."; }; }; + + components = { + subversion = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Subversion integration."; + }; + + mercurial = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Mercurial integration."; + }; + + git = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "git integration."; + }; + + cvs = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "cvs integration."; + }; + + breezy = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "bazaar integration."; + }; + + imagemagick = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Allows exporting Gant diagrams as PNG."; + }; + + ghostscript = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Allows exporting Gant diagrams as PDF."; + }; + + minimagick_font_path = mkOption { + type = types.str; + default = ""; + description = lib.mdDoc "MiniMagick font path"; + example = "/run/current-system/sw/share/X11/fonts/LiberationSans-Regular.ttf"; + }; + }; }; }; @@ -225,16 +276,21 @@ in { assertion = cfg.database.createLocally -> cfg.database.host == "localhost"; message = "services.redmine.database.host must be set to localhost if services.redmine.database.createLocally is set to true"; } + { assertion = cfg.components.imagemagick -> cfg.components.minimagick_font_path != ""; + message = "services.redmine.components.minimagick_font_path must be configured with a path to a font file if services.redmine.components.imagemagick is set to true."; + } ]; services.redmine.settings = { production = { - scm_subversion_command = "${pkgs.subversion}/bin/svn"; - scm_mercurial_command = "${pkgs.mercurial}/bin/hg"; - scm_git_command = "${pkgs.git}/bin/git"; - scm_cvs_command = "${pkgs.cvs}/bin/cvs"; - scm_bazaar_command = "${pkgs.breezy}/bin/bzr"; - scm_darcs_command = "${pkgs.darcs}/bin/darcs"; + scm_subversion_command = if cfg.components.subversion then "${pkgs.subversion}/bin/svn" else ""; + scm_mercurial_command = if cfg.components.mercurial then "${pkgs.mercurial}/bin/hg" else ""; + scm_git_command = if cfg.components.git then "${pkgs.git}/bin/git" else ""; + scm_cvs_command = if cfg.components.cvs then "${pkgs.cvs}/bin/cvs" else ""; + scm_bazaar_command = if cfg.components.breezy then "${pkgs.breezy}/bin/bzr" else ""; + imagemagick_convert_command = if cfg.components.imagemagick then "${pkgs.imagemagick}/bin/convert" else ""; + gs_command = if cfg.components.ghostscript then "${pkgs.ghostscript}/bin/gs" else ""; + minimagick_font_path = "${cfg.components.minimagick_font_path}"; }; }; @@ -296,14 +352,15 @@ in environment.REDMINE_LANG = "en"; environment.SCHEMA = "${cfg.stateDir}/cache/schema.db"; path = with pkgs; [ - imagemagick - breezy - cvs - darcs - git - mercurial - subversion - ]; + ] + ++ optional cfg.components.subversion subversion + ++ optional cfg.components.mercurial mercurial + ++ optional cfg.components.git git + ++ optional cfg.components.cvs cvs + ++ optional cfg.components.breezy breezy + ++ optional cfg.components.imagemagick imagemagick + ++ optional cfg.components.ghostscript ghostscript; + preStart = '' rm -rf "${cfg.stateDir}/plugins/"* rm -rf "${cfg.stateDir}/public/themes/"* diff --git a/nixos/modules/services/misc/ripple-data-api.nix b/nixos/modules/services/misc/ripple-data-api.nix index 2663d734980f..30623a321338 100644 --- a/nixos/modules/services/misc/ripple-data-api.nix +++ b/nixos/modules/services/misc/ripple-data-api.nix @@ -40,7 +40,7 @@ in { port = mkOption { description = lib.mdDoc "Ripple data api port"; default = 5993; - type = types.int; + type = types.port; }; importMode = mkOption { @@ -77,7 +77,7 @@ in { port = mkOption { description = lib.mdDoc "Ripple data api redis port."; default = 5984; - type = types.int; + type = types.port; }; }; @@ -91,7 +91,7 @@ in { port = mkOption { description = lib.mdDoc "Ripple data api couchdb port."; default = 5984; - type = types.int; + type = types.port; }; db = mkOption { diff --git a/nixos/modules/services/misc/serviio.nix b/nixos/modules/services/misc/serviio.nix index 57efebb2c03f..18e64030d79d 100644 --- a/nixos/modules/services/misc/serviio.nix +++ b/nixos/modules/services/misc/serviio.nix @@ -80,7 +80,7 @@ in { 23424 # mediabrowser ]; allowedUDPPorts = [ - 1900 # UPnP service discovey + 1900 # UPnP service discovery ]; }; }; diff --git a/nixos/modules/services/misc/snapper.nix b/nixos/modules/services/misc/snapper.nix index cfdfa2830ce9..30ed30e7a8fa 100644 --- a/nixos/modules/services/misc/snapper.nix +++ b/nixos/modules/services/misc/snapper.nix @@ -175,7 +175,7 @@ in description = "Take snapper snapshot of root on boot"; inherit documentation; serviceConfig.ExecStart = "${pkgs.snapper}/bin/snapper --config root create --cleanup-algorithm number --description boot"; - serviceConfig.type = "oneshot"; + serviceConfig.Type = "oneshot"; requires = [ "local-fs.target" ]; wantedBy = [ "multi-user.target" ]; unitConfig.ConditionPathExists = "/etc/snapper/configs/root"; diff --git a/nixos/modules/services/misc/sourcehut/default.md b/nixos/modules/services/misc/sourcehut/default.md new file mode 100644 index 000000000000..44d58aa0bef3 --- /dev/null +++ b/nixos/modules/services/misc/sourcehut/default.md @@ -0,0 +1,93 @@ +# Sourcehut {#module-services-sourcehut} + +[Sourcehut](https://sr.ht.com/) is an open-source, +self-hostable software development platform. The server setup can be automated using +[services.sourcehut](#opt-services.sourcehut.enable). + +## Basic usage {#module-services-sourcehut-basic-usage} + +Sourcehut is a Python and Go based set of applications. +This NixOS module also provides basic configuration integrating Sourcehut into locally running +`services.nginx`, `services.redis.servers.sourcehut`, `services.postfix` +and `services.postgresql` services. + +A very basic configuration may look like this: +``` +{ pkgs, ... }: +let + fqdn = + let + join = hostName: domain: hostName + optionalString (domain != null) ".${domain}"; + in join config.networking.hostName config.networking.domain; +in { + + networking = { + hostName = "srht"; + domain = "tld"; + firewall.allowedTCPPorts = [ 22 80 443 ]; + }; + + services.sourcehut = { + enable = true; + git.enable = true; + man.enable = true; + meta.enable = true; + nginx.enable = true; + postfix.enable = true; + postgresql.enable = true; + redis.enable = true; + settings = { + "sr.ht" = { + environment = "production"; + global-domain = fqdn; + origin = "https://${fqdn}"; + # Produce keys with srht-keygen from sourcehut.coresrht. + network-key = "/run/keys/path/to/network-key"; + service-key = "/run/keys/path/to/service-key"; + }; + webhooks.private-key= "/run/keys/path/to/webhook-key"; + }; + }; + + security.acme.certs."${fqdn}".extraDomainNames = [ + "meta.${fqdn}" + "man.${fqdn}" + "git.${fqdn}" + ]; + + services.nginx = { + enable = true; + # only recommendedProxySettings are strictly required, but the rest make sense as well. + recommendedTlsSettings = true; + recommendedOptimisation = true; + recommendedGzipSettings = true; + recommendedProxySettings = true; + + # Settings to setup what certificates are used for which endpoint. + virtualHosts = { + "${fqdn}".enableACME = true; + "meta.${fqdn}".useACMEHost = fqdn: + "man.${fqdn}".useACMEHost = fqdn: + "git.${fqdn}".useACMEHost = fqdn: + }; + }; +} +``` + + The `hostName` option is used internally to configure the nginx +reverse-proxy. The `settings` attribute set is +used by the configuration generator and the result is placed in `/etc/sr.ht/config.ini`. + +## Configuration {#module-services-sourcehut-configuration} + +All configuration parameters are also stored in +`/etc/sr.ht/config.ini` which is generated by +the module and linked from the store to ensure that all values from `config.ini` +can be modified by the module. + +## Using an alternative webserver as reverse-proxy (e.g. `httpd`) {#module-services-sourcehut-httpd} + +By default, `nginx` is used as reverse-proxy for `sourcehut`. +However, it's possible to use e.g. `httpd` by explicitly disabling +`nginx` using [](#opt-services.nginx.enable) and fixing the +`settings`. diff --git a/nixos/modules/services/misc/sourcehut/default.nix b/nixos/modules/services/misc/sourcehut/default.nix index a79149c8f58a..b2cadbf0c436 100644 --- a/nixos/modules/services/misc/sourcehut/default.nix +++ b/nixos/modules/services/misc/sourcehut/default.nix @@ -88,7 +88,6 @@ let # Sourcehut services srht buildsrht - dispatchsrht gitsrht hgsrht hubsrht @@ -109,13 +108,13 @@ in { options.services.sourcehut = { enable = mkEnableOption (lib.mdDoc '' - sourcehut - git hosting, continuous integration, mailing list, ticket tracking, - task dispatching, wiki and account management services + sourcehut - git hosting, continuous integration, mailing list, ticket tracking, wiki + and account management services ''); services = mkOption { type = with types; listOf (enum - [ "builds" "dispatch" "git" "hg" "hub" "lists" "man" "meta" "pages" "paste" "todo" ]); + [ "builds" "git" "hg" "hub" "lists" "man" "meta" "pages" "paste" "todo" ]); defaultText = "locally enabled services"; description = lib.mdDoc '' Services that may be displayed as links in the title bar of the Web interface. @@ -301,32 +300,6 @@ in }; }; - options."dispatch.sr.ht" = commonServiceSettings "dispatch" // { - }; - options."dispatch.sr.ht::github" = { - oauth-client-id = mkOptionNullOrStr "OAuth client id."; - oauth-client-secret = mkOptionNullOrStr "OAuth client secret."; - }; - options."dispatch.sr.ht::gitlab" = { - enabled = mkEnableOption (lib.mdDoc "GitLab integration"); - canonical-upstream = mkOption { - type = types.str; - description = lib.mdDoc "Canonical upstream."; - default = "gitlab.com"; - }; - repo-cache = mkOption { - type = types.str; - description = lib.mdDoc "Repository cache directory."; - default = "./repo-cache"; - }; - "gitlab.com" = mkOption { - type = with types; nullOr str; - description = lib.mdDoc "GitLab id and secret."; - default = null; - example = "GitLab:application id:secret"; - }; - }; - options."builds.sr.ht" = commonServiceSettings "builds" // { allow-free = mkEnableOption (lib.mdDoc "nonpaying users to submit builds"); redis = mkOption { @@ -532,7 +505,7 @@ in description = lib.mdDoc "Origin URL for API, 100 more than web."; type = types.str; default = "http://${cfg.listenAddress}:${toString (cfg.meta.port + 100)}"; - defaultText = ''http://:''${toString ( + 100)}''; + defaultText = lib.literalMD ''`"http://''${`[](#opt-services.sourcehut.listenAddress)`}:''${toString (`[](#opt-services.sourcehut.meta.port)` + 100)}"`''; }; webhooks = mkOption { description = lib.mdDoc "The Redis connection used for the webhooks worker."; @@ -1021,11 +994,6 @@ in ]; }) - (import ./service.nix "dispatch" { - inherit configIniOfService; - port = 5005; - }) - (import ./service.nix "git" (let baseService = { path = [ cfg.git.package ]; @@ -1416,8 +1384,12 @@ in (mkRenamedOptionModule [ "services" "sourcehut" "address" ] [ "services" "sourcehut" "listenAddress" ]) + (mkRemovedOptionModule [ "services" "sourcehut" "dispatch" ] '' + dispatch is deprecated. See https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/ + for more information. + '') ]; - meta.doc = ./sourcehut.xml; + meta.doc = ./default.md; meta.maintainers = with maintainers; [ tomberek ]; } diff --git a/nixos/modules/services/misc/sourcehut/service.nix b/nixos/modules/services/misc/sourcehut/service.nix index 37a439ee352b..aae13e0cc2c9 100644 --- a/nixos/modules/services/misc/sourcehut/service.nix +++ b/nixos/modules/services/misc/sourcehut/service.nix @@ -71,7 +71,7 @@ let # Note that each systemd service gets its own ${runDir}/config.ini file. ExecStartPre = mkBefore [("+"+pkgs.writeShellScript "${serviceName}-credentials" '' set -x - # Replace values begining with a '<' by the content of the file whose name is after. + # Replace values beginning with a '<' by the content of the file whose name is after. gawk '{ if (match($0,/^([^=]+=)<(.+)/,m)) { getline f < m[2]; print m[1] f } else print $0 }' ${configIni} | ${optionalString (!allowStripe) "gawk '!/^stripe-secret-key=/' |"} install -o ${srvCfg.user} -g root -m 400 /dev/stdin ${runDir}/config.ini diff --git a/nixos/modules/services/misc/sourcehut/sourcehut.xml b/nixos/modules/services/misc/sourcehut/sourcehut.xml deleted file mode 100644 index 41094f65a94d..000000000000 --- a/nixos/modules/services/misc/sourcehut/sourcehut.xml +++ /dev/null @@ -1,119 +0,0 @@ - - Sourcehut - - Sourcehut is an open-source, - self-hostable software development platform. The server setup can be automated using - services.sourcehut. - - -
- Basic usage - - Sourcehut is a Python and Go based set of applications. - This NixOS module also provides basic configuration integrating Sourcehut into locally running - services.nginx, - services.redis.servers.sourcehut, - services.postfix - and - services.postgresql services. - - - - A very basic configuration may look like this: - -{ pkgs, ... }: -let - fqdn = - let - join = hostName: domain: hostName + optionalString (domain != null) ".${domain}"; - in join config.networking.hostName config.networking.domain; -in { - - networking = { - hostName = "srht"; - domain = "tld"; - firewall.allowedTCPPorts = [ 22 80 443 ]; - }; - - services.sourcehut = { - enable = true; - git.enable = true; - man.enable = true; - meta.enable = true; - nginx.enable = true; - postfix.enable = true; - postgresql.enable = true; - redis.enable = true; - settings = { - "sr.ht" = { - environment = "production"; - global-domain = fqdn; - origin = "https://${fqdn}"; - # Produce keys with srht-keygen from sourcehut.coresrht. - network-key = "/run/keys/path/to/network-key"; - service-key = "/run/keys/path/to/service-key"; - }; - webhooks.private-key= "/run/keys/path/to/webhook-key"; - }; - }; - - security.acme.certs."${fqdn}".extraDomainNames = [ - "meta.${fqdn}" - "man.${fqdn}" - "git.${fqdn}" - ]; - - services.nginx = { - enable = true; - # only recommendedProxySettings are strictly required, but the rest make sense as well. - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - recommendedProxySettings = true; - - # Settings to setup what certificates are used for which endpoint. - virtualHosts = { - "${fqdn}".enableACME = true; - "meta.${fqdn}".useACMEHost = fqdn: - "man.${fqdn}".useACMEHost = fqdn: - "git.${fqdn}".useACMEHost = fqdn: - }; - }; -} - - - - - The hostName option is used internally to configure the nginx - reverse-proxy. The settings attribute set is - used by the configuration generator and the result is placed in /etc/sr.ht/config.ini. - -
- -
- Configuration - - - All configuration parameters are also stored in - /etc/sr.ht/config.ini which is generated by - the module and linked from the store to ensure that all values from config.ini - can be modified by the module. - - -
- -
- Using an alternative webserver as reverse-proxy (e.g. <literal>httpd</literal>) - - By default, nginx is used as reverse-proxy for sourcehut. - However, it's possible to use e.g. httpd by explicitly disabling - nginx using and fixing the - settings. - -
- -
diff --git a/nixos/modules/services/misc/taskserver/default.md b/nixos/modules/services/misc/taskserver/default.md new file mode 100644 index 000000000000..ee3b3908e2ae --- /dev/null +++ b/nixos/modules/services/misc/taskserver/default.md @@ -0,0 +1,93 @@ +# Taskserver {#module-services-taskserver} + +Taskserver is the server component of +[Taskwarrior](https://taskwarrior.org/), a free and +open source todo list application. + +*Upstream documentation:* + +## Configuration {#module-services-taskserver-configuration} + +Taskserver does all of its authentication via TLS using client certificates, +so you either need to roll your own CA or purchase a certificate from a +known CA, which allows creation of client certificates. These certificates +are usually advertised as "server certificates". + +So in order to make it easier to handle your own CA, there is a helper tool +called {command}`nixos-taskserver` which manages the custom CA along +with Taskserver organisations, users and groups. + +While the client certificates in Taskserver only authenticate whether a user +is allowed to connect, every user has its own UUID which identifies it as an +entity. + +With {command}`nixos-taskserver` the client certificate is created +along with the UUID of the user, so it handles all of the credentials needed +in order to setup the Taskwarrior client to work with a Taskserver. + +## The nixos-taskserver tool {#module-services-taskserver-nixos-taskserver-tool} + +Because Taskserver by default only provides scripts to setup users +imperatively, the {command}`nixos-taskserver` tool is used for +addition and deletion of organisations along with users and groups defined +by [](#opt-services.taskserver.organisations) and as well for +imperative set up. + +The tool is designed to not interfere if the command is used to manually set +up some organisations, users or groups. + +For example if you add a new organisation using {command}`nixos-taskserver +org add foo`, the organisation is not modified and deleted no +matter what you define in +{option}`services.taskserver.organisations`, even if you're adding +the same organisation in that option. + +The tool is modelled to imitate the official {command}`taskd` +command, documentation for each subcommand can be shown by using the +{option}`--help` switch. + +## Declarative/automatic CA management {#module-services-taskserver-declarative-ca-management} + +Everything is done according to what you specify in the module options, +however in order to set up a Taskwarrior client for synchronisation with a +Taskserver instance, you have to transfer the keys and certificates to the +client machine. + +This is done using {command}`nixos-taskserver user export $orgname +$username` which is printing a shell script fragment to stdout +which can either be used verbatim or adjusted to import the user on the +client machine. + +For example, let's say you have the following configuration: +```ShellSession +{ + services.taskserver.enable = true; + services.taskserver.fqdn = "server"; + services.taskserver.listenHost = "::"; + services.taskserver.organisations.my-company.users = [ "alice" ]; +} +``` +This creates an organisation called `my-company` with the +user `alice`. + +Now in order to import the `alice` user to another machine +`alicebox`, all we need to do is something like this: +```ShellSession +$ ssh server nixos-taskserver user export my-company alice | sh +``` +Of course, if no SSH daemon is available on the server you can also copy +& paste it directly into a shell. + +After this step the user should be set up and you can start synchronising +your tasks for the first time with {command}`task sync init` on +`alicebox`. + +Subsequent synchronisation requests merely require the command {command}`task +sync` after that stage. + +## Manual CA management {#module-services-taskserver-manual-ca-management} + +If you set any options within +[service.taskserver.pki.manual](#opt-services.taskserver.pki.manual.ca.cert).*, +{command}`nixos-taskserver` won't issue certificates, but you can +still use it for adding or removing user accounts. diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index aeefd657f4d0..775b3b6d2eae 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -145,7 +145,7 @@ in { in lib.mdDoc '' Whether to enable the Taskwarrior server. - More instructions about NixOS in conjuction with Taskserver can be + More instructions about NixOS in conjunction with Taskserver can be found [in the NixOS manual](${url}). ''; }; @@ -251,7 +251,7 @@ in { client id (such as `task 2.3.0`). The values `all` or `none` have - special meaning. Overidden by any entry in the option + special meaning. Overridden by any entry in the option {option}`services.taskserver.disallowedClientIDs`. ''; }; @@ -566,5 +566,5 @@ in { }) ]; - meta.doc = ./doc.xml; + meta.doc = ./default.md; } diff --git a/nixos/modules/services/misc/taskserver/doc.xml b/nixos/modules/services/misc/taskserver/doc.xml deleted file mode 100644 index f6ead7c37857..000000000000 --- a/nixos/modules/services/misc/taskserver/doc.xml +++ /dev/null @@ -1,135 +0,0 @@ - - Taskserver - - Taskserver is the server component of - Taskwarrior, a free and - open source todo list application. - - - Upstream documentation: - - -
- Configuration - - - Taskserver does all of its authentication via TLS using client certificates, - so you either need to roll your own CA or purchase a certificate from a - known CA, which allows creation of client certificates. These certificates - are usually advertised as server certificates. - - - - So in order to make it easier to handle your own CA, there is a helper tool - called nixos-taskserver which manages the custom CA along - with Taskserver organisations, users and groups. - - - - While the client certificates in Taskserver only authenticate whether a user - is allowed to connect, every user has its own UUID which identifies it as an - entity. - - - - With nixos-taskserver the client certificate is created - along with the UUID of the user, so it handles all of the credentials needed - in order to setup the Taskwarrior client to work with a Taskserver. - -
-
- The nixos-taskserver tool - - - Because Taskserver by default only provides scripts to setup users - imperatively, the nixos-taskserver tool is used for - addition and deletion of organisations along with users and groups defined - by and as well for - imperative set up. - - - - The tool is designed to not interfere if the command is used to manually set - up some organisations, users or groups. - - - - For example if you add a new organisation using nixos-taskserver - org add foo, the organisation is not modified and deleted no - matter what you define in - , even if you're adding - the same organisation in that option. - - - - The tool is modelled to imitate the official taskd - command, documentation for each subcommand can be shown by using the - switch. - -
-
- Declarative/automatic CA management - - - Everything is done according to what you specify in the module options, - however in order to set up a Taskwarrior client for synchronisation with a - Taskserver instance, you have to transfer the keys and certificates to the - client machine. - - - - This is done using nixos-taskserver user export $orgname - $username which is printing a shell script fragment to stdout - which can either be used verbatim or adjusted to import the user on the - client machine. - - - - For example, let's say you have the following configuration: - -{ - = true; - = "server"; - = "::"; - services.taskserver.organisations.my-company.users = [ "alice" ]; -} - - This creates an organisation called my-company with the - user alice. - - - - Now in order to import the alice user to another machine - alicebox, all we need to do is something like this: - -$ ssh server nixos-taskserver user export my-company alice | sh - - Of course, if no SSH daemon is available on the server you can also copy - & paste it directly into a shell. - - - - After this step the user should be set up and you can start synchronising - your tasks for the first time with task sync init on - alicebox. - - - - Subsequent synchronisation requests merely require the command task - sync after that stage. - -
-
- Manual CA management - - - If you set any options within - service.taskserver.pki.manual.*, - nixos-taskserver won't issue certificates, but you can - still use it for adding or removing user accounts. - -
-
diff --git a/nixos/modules/services/misc/weechat.md b/nixos/modules/services/misc/weechat.md new file mode 100644 index 000000000000..21f41be5b4a0 --- /dev/null +++ b/nixos/modules/services/misc/weechat.md @@ -0,0 +1,46 @@ +# WeeChat {#module-services-weechat} + +[WeeChat](https://weechat.org/) is a fast and +extensible IRC client. + +## Basic Usage {#module-services-weechat-basic-usage} + +By default, the module creates a +[`systemd`](https://www.freedesktop.org/wiki/Software/systemd/) +unit which runs the chat client in a detached +[`screen`](https://www.gnu.org/software/screen/) +session. + +This can be done by enabling the `weechat` service: +``` +{ ... }: + +{ + services.weechat.enable = true; +} +``` + +The service is managed by a dedicated user named `weechat` +in the state directory `/var/lib/weechat`. + +## Re-attaching to WeeChat {#module-services-weechat-reattach} + +WeeChat runs in a screen session owned by a dedicated user. To explicitly +allow your another user to attach to this session, the +`screenrc` needs to be tweaked by adding +[multiuser](https://www.gnu.org/software/screen/manual/html_node/Multiuser.html#Multiuser) +support: +``` +{ + programs.screen.screenrc = '' + multiuser on + acladd normal_user + ''; +} +``` +Now, the session can be re-attached like this: +``` +screen -x weechat/weechat-screen +``` + +*The session name can be changed using [services.weechat.sessionName.](options.html#opt-services.weechat.sessionName)* diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix index 663a767a0c18..338493e3cd37 100644 --- a/nixos/modules/services/misc/weechat.nix +++ b/nixos/modules/services/misc/weechat.nix @@ -15,7 +15,7 @@ in default = "/var/lib/weechat"; }; sessionName = mkOption { - description = lib.mdDoc "Name of the `screen' session for weechat."; + description = lib.mdDoc "Name of the `screen` session for weechat."; default = "weechat-screen"; type = types.str; }; @@ -59,5 +59,5 @@ in }; }; - meta.doc = ./weechat.xml; + meta.doc = ./weechat.md; } diff --git a/nixos/modules/services/misc/weechat.xml b/nixos/modules/services/misc/weechat.xml deleted file mode 100644 index 7255edfb9da3..000000000000 --- a/nixos/modules/services/misc/weechat.xml +++ /dev/null @@ -1,66 +0,0 @@ - - WeeChat - - WeeChat is a fast and - extensible IRC client. - -
- Basic Usage - - - By default, the module creates a - systemd - unit which runs the chat client in a detached - screen - session. - - - - This can be done by enabling the weechat service: - -{ ... }: - -{ - services.weechat.enable = true; -} - - - - - The service is managed by a dedicated user named weechat - in the state directory /var/lib/weechat. - -
-
- Re-attaching to WeeChat - - - WeeChat runs in a screen session owned by a dedicated user. To explicitly - allow your another user to attach to this session, the - screenrc needs to be tweaked by adding - multiuser - support: - -{ - programs.screen.screenrc = '' - multiuser on - acladd normal_user - ''; -} - - Now, the session can be re-attached like this: - -screen -x weechat/weechat-screen - - - - - The session name can be changed using - services.weechat.sessionName. - -
-
diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix index d4216b44cdc8..666479c78a84 100644 --- a/nixos/modules/services/monitoring/apcupsd.nix +++ b/nixos/modules/services/monitoring/apcupsd.nix @@ -62,6 +62,21 @@ let ); + # Ensure the CLI uses our generated configFile + wrappedBinaries = pkgs.runCommandLocal "apcupsd-wrapped-binaries" + { nativeBuildInputs = [ pkgs.makeWrapper ]; } + '' + for p in "${lib.getBin pkgs.apcupsd}/bin/"*; do + bname=$(basename "$p") + makeWrapper "$p" "$out/bin/$bname" --add-flags "-f ${configFile}" + done + ''; + + apcupsdWrapped = pkgs.symlinkJoin { + name = "apcupsd-wrapped"; + # Put wrappers first so they "win" + paths = [ wrappedBinaries pkgs.apcupsd ]; + }; in { @@ -138,7 +153,7 @@ in } ]; # Give users access to the "apcaccess" tool - environment.systemPackages = [ pkgs.apcupsd ]; + environment.systemPackages = [ apcupsdWrapped ]; # NOTE 1: apcupsd runs as root because it needs permission to run # "shutdown" diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index a8fba4e6e8ce..68e6e8e40b31 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -123,7 +123,7 @@ in { ${escapeShellArgs cfg.extraOptions} \ ${optionalString (cfg.storageDriver != null) '' -storage_driver "${cfg.storageDriver}" \ - -storage_driver_user "${cfg.storageDriverHost}" \ + -storage_driver_host "${cfg.storageDriverHost}" \ -storage_driver_db "${cfg.storageDriverDb}" \ -storage_driver_user "${cfg.storageDriverUser}" \ -storage_driver_password "$(cat "${cfg.storageDriverPasswordFile}")" \ diff --git a/nixos/modules/services/monitoring/grafana-agent.nix b/nixos/modules/services/monitoring/grafana-agent.nix index ecb39a924f58..270d888afb78 100644 --- a/nixos/modules/services/monitoring/grafana-agent.nix +++ b/nixos/modules/services/monitoring/grafana-agent.nix @@ -16,7 +16,7 @@ in package = mkOption { type = types.package; default = pkgs.grafana-agent; - defaultText = "pkgs.grafana-agent"; + defaultText = lib.literalExpression "pkgs.grafana-agent"; description = lib.mdDoc "The grafana-agent package to use."; }; @@ -49,17 +49,19 @@ in }; default = { }; - defaultText = '' - metrics = { - wal_directory = "\''${STATE_DIRECTORY}"; - global.scrape_interval = "5s"; - }; - integrations = { - agent.enabled = true; - agent.scrape_integration = true; - node_exporter.enabled = true; - replace_instance_label = true; - }; + defaultText = lib.literalExpression '' + { + metrics = { + wal_directory = "\''${STATE_DIRECTORY}"; + global.scrape_interval = "5s"; + }; + integrations = { + agent.enabled = true; + agent.scrape_integration = true; + node_exporter.enabled = true; + replace_instance_label = true; + }; + } ''; example = { metrics.global.remote_write = [{ diff --git a/nixos/modules/services/monitoring/grafana-image-renderer.nix b/nixos/modules/services/monitoring/grafana-image-renderer.nix index 60f6e84c63c7..7ea17b07567c 100644 --- a/nixos/modules/services/monitoring/grafana-image-renderer.nix +++ b/nixos/modules/services/monitoring/grafana-image-renderer.nix @@ -108,7 +108,7 @@ in { services.grafana.settings.rendering = mkIf cfg.provisionGrafana { url = "http://localhost:${toString cfg.settings.service.port}/render"; - callback_url = "http://localhost:${toString config.services.grafana.port}"; + callback_url = "http://localhost:${toString config.services.grafana.settings.server.http_port}"; }; services.grafana-image-renderer.chromium = mkDefault pkgs.chromium; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 9b3068796d8e..ba3f89e24dd4 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -56,7 +56,7 @@ let provisionConfDir = pkgs.runCommand "grafana-provisioning" { nativeBuildInputs = [ pkgs.xorg.lndir ]; } '' mkdir -p $out/{datasources,dashboards,notifiers,alerting} ${ln { src = datasourceFileOrDir; dir = "datasources"; filename = "datasource"; }} - ${ln { src = dashboardFileOrDir; dir = "dashboards"; filename = "dashbaord"; }} + ${ln { src = dashboardFileOrDir; dir = "dashboards"; filename = "dashboard"; }} ${ln { src = notifierFileOrDir; dir = "notifiers"; filename = "notifier"; }} ${ln { src = rulesFileOrDir; dir = "alerting"; filename = "rules"; }} ${ln { src = contactPointsFileOrDir; dir = "alerting"; filename = "contactPoints"; }} @@ -364,9 +364,15 @@ in { }; http_addr = mkOption { - description = lib.mdDoc "Listening address."; - default = ""; type = types.str; + default = "127.0.0.1"; + description = lib.mdDoc '' + Listening address. + + ::: {.note} + This setting intentionally varies from upstream's default to be a bit more secure by default. + ::: + ''; }; http_port = mkOption { @@ -555,7 +561,7 @@ in { auto_assign_org_role = mkOption { description = lib.mdDoc "Default role new users will be auto assigned."; default = "Viewer"; - type = types.enum ["Viewer" "Editor"]; + type = types.enum ["Viewer" "Editor" "Admin"]; }; }; @@ -1291,7 +1297,10 @@ in { SystemCallArchitectures = "native"; # Upstream grafana is not setting SystemCallFilter for compatibility # reasons, see https://github.com/grafana/grafana/pull/40176 - SystemCallFilter = [ "@system-service" "~@privileged" ]; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ] ++ lib.optional (cfg.settings.server.protocol == "socket") [ "@chown" ]; UMask = "0027"; }; preStart = '' diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 8edb2ca09974..65c91b8f79bb 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -94,7 +94,7 @@ in { port = mkOption { description = lib.mdDoc "Graphite web frontend port."; default = 8080; - type = types.int; + type = types.port; }; extraConfig = mkOption { @@ -154,14 +154,14 @@ in { }; blacklist = mkOption { - description = lib.mdDoc "Any metrics received which match one of the experssions will be dropped."; + description = lib.mdDoc "Any metrics received which match one of the expressions will be dropped."; default = null; type = types.nullOr types.str; example = "^some\\.noisy\\.metric\\.prefix\\..*"; }; whitelist = mkOption { - description = lib.mdDoc "Only metrics received which match one of the experssions will be persisted."; + description = lib.mdDoc "Only metrics received which match one of the expressions will be persisted."; default = null; type = types.nullOr types.str; example = ".*"; @@ -225,7 +225,7 @@ in { port = mkOption { description = lib.mdDoc "Seyren listening port."; default = 8081; - type = types.int; + type = types.port; }; seyrenUrl = mkOption { diff --git a/nixos/modules/services/monitoring/kapacitor.nix b/nixos/modules/services/monitoring/kapacitor.nix index 61529c2e4526..727b694047b4 100644 --- a/nixos/modules/services/monitoring/kapacitor.nix +++ b/nixos/modules/services/monitoring/kapacitor.nix @@ -66,7 +66,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 9092; description = lib.mdDoc "Port of Kapacitor"; }; diff --git a/nixos/modules/services/monitoring/parsedmarc.md b/nixos/modules/services/monitoring/parsedmarc.md index d93134a4cc76..eac07e0cc9fe 100644 --- a/nixos/modules/services/monitoring/parsedmarc.md +++ b/nixos/modules/services/monitoring/parsedmarc.md @@ -17,7 +17,6 @@ services.parsedmarc = { host = "imap.example.com"; user = "alice@example.com"; password = "/path/to/imap_password_file"; - watch = true; }; provision.geoIp = false; # Not recommended! }; @@ -26,7 +25,7 @@ services.parsedmarc = { Note that GeoIP provisioning is disabled in the example for simplicity, but should be turned on for fully functional reports. -## Local mail +## Local mail {#module-services-parsedmarc-local-mail} Instead of watching an external inbox, a local inbox can be automatically provisioned. The recipient's name is by default set to `dmarc`, but can be configured in @@ -50,7 +49,7 @@ services.parsedmarc = { }; ``` -## Grafana and GeoIP +## Grafana and GeoIP {#module-services-parsedmarc-grafana-geoip} The reports can be visualized and summarized with parsedmarc's official Grafana dashboard. For all views to work, and for the data to be complete, GeoIP databases are also required. The following example diff --git a/nixos/modules/services/monitoring/parsedmarc.nix b/nixos/modules/services/monitoring/parsedmarc.nix index 3540d91fc9f3..fdaefbe17f2d 100644 --- a/nixos/modules/services/monitoring/parsedmarc.nix +++ b/nixos/modules/services/monitoring/parsedmarc.nix @@ -123,7 +123,10 @@ in host = "imap.example.com"; user = "alice@example.com"; password = { _secret = "/run/keys/imap_password" }; + }; + mailbox = { watch = true; + batch_size = 30; }; splunk_hec = { url = "https://splunkhec.example.com"; @@ -170,6 +173,24 @@ in }; }; + mailbox = { + watch = lib.mkOption { + type = lib.types.bool; + default = true; + description = lib.mdDoc '' + Use the IMAP IDLE command to process messages as they arrive. + ''; + }; + + delete = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc '' + Delete messages after processing them, instead of archiving them. + ''; + }; + }; + imap = { host = lib.mkOption { type = lib.types.str; @@ -216,22 +237,6 @@ in ''; apply = x: if isAttrs x || x == null then x else { _secret = x; }; }; - - watch = lib.mkOption { - type = lib.types.bool; - default = true; - description = lib.mdDoc '' - Use the IMAP IDLE command to process messages as they arrive. - ''; - }; - - delete = lib.mkOption { - type = lib.types.bool; - default = false; - description = lib.mdDoc '' - Delete messages after processing them, instead of archiving them. - ''; - }; }; smtp = { @@ -360,6 +365,13 @@ in config = lib.mkIf cfg.enable { + warnings = let + deprecationWarning = optname: "Starting in 8.0.0, the `${optname}` option has been moved from the `services.parsedmarc.settings.imap`" + + "configuration section to the `services.parsedmarc.settings.mailbox` configuration section."; + hasImapOpt = lib.flip builtins.hasAttr cfg.settings.imap; + movedOptions = [ "reports_folder" "archive_folder" "watch" "delete" "test" "batch_size" ]; + in builtins.map deprecationWarning (builtins.filter hasImapOpt movedOptions); + services.elasticsearch.enable = lib.mkDefault cfg.provision.elasticsearch; services.geoipupdate = lib.mkIf cfg.provision.geoIp { @@ -444,6 +456,8 @@ in ssl = false; user = cfg.provision.localMail.recipientName; password = "${pkgs.writeText "imap-password" "@imap-password@"}"; + }; + mailbox = { watch = true; }; }) @@ -525,8 +539,6 @@ in }; }; - # Don't edit the docbook xml directly, edit the md and generate it: - # `pandoc parsedmarc.md -t docbook --top-level-division=chapter --extract-media=media -f markdown+smart > parsedmarc.xml` - meta.doc = ./parsedmarc.xml; + meta.doc = ./parsedmarc.md; meta.maintainers = [ lib.maintainers.talyz ]; } diff --git a/nixos/modules/services/monitoring/parsedmarc.xml b/nixos/modules/services/monitoring/parsedmarc.xml deleted file mode 100644 index 7167b52d0357..000000000000 --- a/nixos/modules/services/monitoring/parsedmarc.xml +++ /dev/null @@ -1,125 +0,0 @@ - - parsedmarc - - parsedmarc - is a service which parses incoming - DMARC reports and - stores or sends them to a downstream service for further analysis. - In combination with Elasticsearch, Grafana and the included Grafana - dashboard, it provides a handy overview of DMARC reports over time. - -
- Basic usage - - A very minimal setup which reads incoming reports from an external - email address and saves them to a local Elasticsearch instance - looks like this: - - -services.parsedmarc = { - enable = true; - settings.imap = { - host = "imap.example.com"; - user = "alice@example.com"; - password = "/path/to/imap_password_file"; - watch = true; - }; - provision.geoIp = false; # Not recommended! -}; - - - Note that GeoIP provisioning is disabled in the example for - simplicity, but should be turned on for fully functional reports. - -
-
- Local mail - - Instead of watching an external inbox, a local inbox can be - automatically provisioned. The recipient’s name is by default set - to dmarc, but can be configured in - services.parsedmarc.provision.localMail.recipientName. - You need to add an MX record pointing to the host. More - concretely: for the example to work, an MX record needs to be set - up for monitoring.example.com and the complete - email address that should be configured in the domain’s dmarc - policy is dmarc@monitoring.example.com. - - -services.parsedmarc = { - enable = true; - provision = { - localMail = { - enable = true; - hostname = monitoring.example.com; - }; - geoIp = false; # Not recommended! - }; -}; - -
-
- Grafana and GeoIP - - The reports can be visualized and summarized with parsedmarc’s - official Grafana dashboard. For all views to work, and for the - data to be complete, GeoIP databases are also required. The - following example shows a basic deployment where the provisioned - Elasticsearch instance is automatically added as a Grafana - datasource, and the dashboard is added to Grafana as well. - - -services.parsedmarc = { - enable = true; - provision = { - localMail = { - enable = true; - hostname = url; - }; - grafana = { - datasource = true; - dashboard = true; - }; - }; -}; - -# Not required, but recommended for full functionality -services.geoipupdate = { - settings = { - AccountID = 000000; - LicenseKey = "/path/to/license_key_file"; - }; -}; - -services.grafana = { - enable = true; - addr = "0.0.0.0"; - domain = url; - rootUrl = "https://" + url; - protocol = "socket"; - security = { - adminUser = "admin"; - adminPasswordFile = "/path/to/admin_password_file"; - secretKeyFile = "/path/to/secret_key_file"; - }; -}; - -services.nginx = { - enable = true; - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - recommendedProxySettings = true; - upstreams.grafana.servers."unix:/${config.services.grafana.socket}" = {}; - virtualHosts.${url} = { - root = config.services.grafana.staticRootPath; - enableACME = true; - forceSSL = true; - locations."/".tryFiles = "$uri @grafana"; - locations."@grafana".proxyPass = "http://grafana"; - }; -}; -users.users.nginx.extraGroups = [ "grafana" ]; - -
-
diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix index ee2533ef1213..0c0931d3d295 100644 --- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix +++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -34,7 +34,7 @@ in { (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "group" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a group setting.") (mkRemovedOptionModule [ "services" "prometheus" "alertmanagerURL" ] '' Due to incompatibility, the alertmanagerURL option has been removed, - please use 'services.prometheus2.alertmanagers' instead. + please use 'services.prometheus.alertmanagers' instead. '') ]; @@ -107,7 +107,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 9093; description = lib.mdDoc '' Port to listen on for the web interface and API. diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index f6bae8f9e965..f516b75ab10f 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -3,7 +3,7 @@ with lib; let - json = pkgs.formats.json { }; + yaml = pkgs.formats.yaml { }; cfg = config.services.prometheus; checkConfigEnabled = (lib.isBool cfg.checkConfig && cfg.checkConfig) @@ -11,8 +11,6 @@ let workingDir = "/var/lib/" + cfg.stateDir; - prometheusYmlOut = "${workingDir}/prometheus-substituted.yaml"; - triggerReload = pkgs.writeShellScriptBin "trigger-reload-prometheus" '' PATH="${makeBinPath (with pkgs; [ systemd ])}" if systemctl -q is-active prometheus.service; then @@ -38,7 +36,7 @@ let promtool ${what} $out '' else file; - generatedPrometheusYml = json.generate "prometheus.yml" promConfig; + generatedPrometheusYml = yaml.generate "prometheus.yml" promConfig; # This becomes the main config file for Prometheus promConfig = { @@ -73,7 +71,8 @@ let "--web.listen-address=${cfg.listenAddress}:${builtins.toString cfg.port}" "--alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}" ] ++ optional (cfg.webExternalUrl != null) "--web.external-url=${cfg.webExternalUrl}" - ++ optional (cfg.retentionTime != null) "--storage.tsdb.retention.time=${cfg.retentionTime}"; + ++ optional (cfg.retentionTime != null) "--storage.tsdb.retention.time=${cfg.retentionTime}" + ++ optional (cfg.webConfigFile != null) "--web.config.file=${cfg.webConfigFile}"; filterValidPrometheus = filterAttrsListRecursive (n: v: !(n == "_module" || v == null)); filterAttrsListRecursive = pred: x: @@ -1719,6 +1718,15 @@ in ''; }; + webConfigFile = mkOption { + type = types.nullOr types.path; + default = null; + description = lib.mdDoc '' + Specifies which file should be used as web.config.file and be passed on startup. + See https://prometheus.io/docs/prometheus/latest/configuration/https/ for valid options. + ''; + }; + checkConfig = mkOption { type = with types; either bool (enum [ "syntax-only" ]); default = true; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.md b/nixos/modules/services/monitoring/prometheus/exporters.md new file mode 100644 index 000000000000..c085e46d20d7 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters.md @@ -0,0 +1,180 @@ +# Prometheus exporters {#module-services-prometheus-exporters} + +Prometheus exporters provide metrics for the +[prometheus monitoring system](https://prometheus.io). + +## Configuration {#module-services-prometheus-exporters-configuration} + +One of the most common exporters is the +[node exporter](https://github.com/prometheus/node_exporter), +it provides hardware and OS metrics from the host it's +running on. The exporter could be configured as follows: +``` + services.prometheus.exporters.node = { + enable = true; + port = 9100; + enabledCollectors = [ + "logind" + "systemd" + ]; + disabledCollectors = [ + "textfile" + ]; + openFirewall = true; + firewallFilter = "-i br0 -p tcp -m tcp --dport 9100"; + }; +``` +It should now serve all metrics from the collectors that are explicitly +enabled and the ones that are +[enabled by default](https://github.com/prometheus/node_exporter#enabled-by-default), +via http under `/metrics`. In this +example the firewall should just allow incoming connections to the +exporter's port on the bridge interface `br0` (this would +have to be configured separately of course). For more information about +configuration see `man configuration.nix` or search through +the [available options](https://nixos.org/nixos/options.html#prometheus.exporters). + +Prometheus can now be configured to consume the metrics produced by the exporter: +``` + services.prometheus = { + # ... + + scrapeConfigs = [ + { + job_name = "node"; + static_configs = [{ + targets = [ "localhost:${toString config.services.prometheus.exporters.node.port}" ]; + }]; + } + ]; + + # ... + } +``` + +## Adding a new exporter {#module-services-prometheus-exporters-new-exporter} + +To add a new exporter, it has to be packaged first (see +`nixpkgs/pkgs/servers/monitoring/prometheus/` for +examples), then a module can be added. The postfix exporter is used in this +example: + + - Some default options for all exporters are provided by + `nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix`: + + - `enable` + - `port` + - `listenAddress` + - `extraFlags` + - `openFirewall` + - `firewallFilter` + - `user` + - `group` + - As there is already a package available, the module can now be added. This + is accomplished by adding a new file to the + `nixos/modules/services/monitoring/prometheus/exporters/` + directory, which will be called postfix.nix and contains all exporter + specific options and configuration: + ``` + # nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix + { config, lib, pkgs, options }: + + with lib; + + let + # for convenience we define cfg here + cfg = config.services.prometheus.exporters.postfix; + in + { + port = 9154; # The postfix exporter listens on this port by default + + # `extraOpts` is an attribute set which contains additional options + # (and optional overrides for default options). + # Note that this attribute is optional. + extraOpts = { + telemetryPath = mkOption { + type = types.str; + default = "/metrics"; + description = '' + Path under which to expose metrics. + ''; + }; + logfilePath = mkOption { + type = types.path; + default = /var/log/postfix_exporter_input.log; + example = /var/log/mail.log; + description = '' + Path where Postfix writes log entries. + This file will be truncated by this exporter! + ''; + }; + showqPath = mkOption { + type = types.path; + default = /var/spool/postfix/public/showq; + example = /var/lib/postfix/queue/public/showq; + description = '' + Path at which Postfix places its showq socket. + ''; + }; + }; + + # `serviceOpts` is an attribute set which contains configuration + # for the exporter's systemd service. One of + # `serviceOpts.script` and `serviceOpts.serviceConfig.ExecStart` + # has to be specified here. This will be merged with the default + # service configuration. + # Note that by default 'DynamicUser' is 'true'. + serviceOpts = { + serviceConfig = { + DynamicUser = false; + ExecStart = '' + ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; + } + ``` + - This should already be enough for the postfix exporter. Additionally one + could now add assertions and conditional default values. This can be done + in the 'meta-module' that combines all exporter definitions and generates + the submodules: + `nixpkgs/nixos/modules/services/prometheus/exporters.nix` + +## Updating an exporter module {#module-services-prometheus-exporters-update-exporter-module} + +Should an exporter option change at some point, it is possible to add +information about the change to the exporter definition similar to +`nixpkgs/nixos/modules/rename.nix`: +``` +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.nginx; +in +{ + port = 9113; + extraOpts = { + # additional module options + # ... + }; + serviceOpts = { + # service configuration + # ... + }; + imports = [ + # 'services.prometheus.exporters.nginx.telemetryEndpoint' -> 'services.prometheus.exporters.nginx.telemetryPath' + (mkRenamedOptionModule [ "telemetryEndpoint" ] [ "telemetryPath" ]) + + # removed option 'services.prometheus.exporters.nginx.insecure' + (mkRemovedOptionModule [ "insecure" ] '' + This option was replaced by 'prometheus.exporters.nginx.sslVerify' which defaults to true. + '') + ({ options.warnings = options.warnings; }) + ]; +} +``` diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 8826d80a70c7..fd40dce1410c 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -51,6 +51,7 @@ let "nginx" "nginxlog" "node" + "nut" "openldap" "openvpn" "pihole" @@ -63,16 +64,18 @@ let "rspamd" "rtl_433" "script" + "shelly" "snmp" "smartctl" "smokeping" "sql" + "statsd" "surfboard" "systemd" "tor" "unbound" "unifi" - "unifi-poller" + "unpoller" "v2ray" "varnish" "wireguard" @@ -229,6 +232,10 @@ in options.services.prometheus.exporters = mkOption { type = types.submodule { options = (mkSubModules); + imports = [ + ../../../misc/assertions.nix + (lib.mkRenamedOptionModule [ "unifi-poller" ] [ "unpoller" ]) + ]; }; description = lib.mdDoc "Prometheus exporter configuration"; default = {}; @@ -292,13 +299,14 @@ in Please specify either 'services.prometheus.exporters.sql.configuration' or 'services.prometheus.exporters.sql.configFile' ''; - } ] ++ (flip map (attrNames cfg) (exporter: { + } ] ++ (flip map (attrNames exporterOpts) (exporter: { assertion = cfg.${exporter}.firewallFilter != null -> cfg.${exporter}.openFirewall; message = '' The `firewallFilter'-option of exporter ${exporter} doesn't have any effect unless `openFirewall' is set to `true'! ''; - })); + })) ++ config.services.prometheus.exporters.assertions; + warnings = config.services.prometheus.exporters.warnings; }] ++ [(mkIf config.services.minio.enable { services.prometheus.exporters.minio.minioAddress = mkDefault "http://localhost:9000"; services.prometheus.exporters.minio.minioAccessKey = mkDefault config.services.minio.accessKey; @@ -316,7 +324,7 @@ in ); meta = { - doc = ./exporters.xml; + doc = ./exporters.md; maintainers = [ maintainers.willibutz ]; }; } diff --git a/nixos/modules/services/monitoring/prometheus/exporters.xml b/nixos/modules/services/monitoring/prometheus/exporters.xml deleted file mode 100644 index 1df88bb61a12..000000000000 --- a/nixos/modules/services/monitoring/prometheus/exporters.xml +++ /dev/null @@ -1,248 +0,0 @@ - - Prometheus exporters - - Prometheus exporters provide metrics for the - prometheus monitoring system. - -
- Configuration - - - One of the most common exporters is the - node - exporter, it provides hardware and OS metrics from the host it's - running on. The exporter could be configured as follows: - - services.prometheus.exporters.node = { - enable = true; - port = 9100; - enabledCollectors = [ - "logind" - "systemd" - ]; - disabledCollectors = [ - "textfile" - ]; - openFirewall = true; - firewallFilter = "-i br0 -p tcp -m tcp --dport 9100"; - }; - - It should now serve all metrics from the collectors that are explicitly - enabled and the ones that are - enabled - by default, via http under /metrics. In this - example the firewall should just allow incoming connections to the - exporter's port on the bridge interface br0 (this would - have to be configured seperately of course). For more information about - configuration see man configuration.nix or search through - the - available - options. - - - - Prometheus can now be configured to consume the metrics produced by the exporter: - - services.prometheus = { - # ... - - scrapeConfigs = [ - { - job_name = "node"; - static_configs = [{ - targets = [ "localhost:${toString config.services.prometheus.exporters.node.port}" ]; - }]; - } - ]; - - # ... - } - - -
-
- Adding a new exporter - - - To add a new exporter, it has to be packaged first (see - nixpkgs/pkgs/servers/monitoring/prometheus/ for - examples), then a module can be added. The postfix exporter is used in this - example: - - - - - - Some default options for all exporters are provided by - nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix: - - - - - - - enable - - - - - port - - - - - listenAddress - - - - - extraFlags - - - - - openFirewall - - - - - firewallFilter - - - - - user - - - - - group - - - - - - - As there is already a package available, the module can now be added. This - is accomplished by adding a new file to the - nixos/modules/services/monitoring/prometheus/exporters/ - directory, which will be called postfix.nix and contains all exporter - specific options and configuration: - -# nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix -{ config, lib, pkgs, options }: - -with lib; - -let - # for convenience we define cfg here - cfg = config.services.prometheus.exporters.postfix; -in -{ - port = 9154; # The postfix exporter listens on this port by default - - # `extraOpts` is an attribute set which contains additional options - # (and optional overrides for default options). - # Note that this attribute is optional. - extraOpts = { - telemetryPath = mkOption { - type = types.str; - default = "/metrics"; - description = '' - Path under which to expose metrics. - ''; - }; - logfilePath = mkOption { - type = types.path; - default = /var/log/postfix_exporter_input.log; - example = /var/log/mail.log; - description = '' - Path where Postfix writes log entries. - This file will be truncated by this exporter! - ''; - }; - showqPath = mkOption { - type = types.path; - default = /var/spool/postfix/public/showq; - example = /var/lib/postfix/queue/public/showq; - description = '' - Path at which Postfix places its showq socket. - ''; - }; - }; - - # `serviceOpts` is an attribute set which contains configuration - # for the exporter's systemd service. One of - # `serviceOpts.script` and `serviceOpts.serviceConfig.ExecStart` - # has to be specified here. This will be merged with the default - # service confiuration. - # Note that by default 'DynamicUser' is 'true'. - serviceOpts = { - serviceConfig = { - DynamicUser = false; - ExecStart = '' - ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \ - --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ - --web.telemetry-path ${cfg.telemetryPath} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - }; - }; -} - - - - - - This should already be enough for the postfix exporter. Additionally one - could now add assertions and conditional default values. This can be done - in the 'meta-module' that combines all exporter definitions and generates - the submodules: - nixpkgs/nixos/modules/services/prometheus/exporters.nix - - - -
-
- Updating an exporter module - - Should an exporter option change at some point, it is possible to add - information about the change to the exporter definition similar to - nixpkgs/nixos/modules/rename.nix: - -{ config, lib, pkgs, options }: - -with lib; - -let - cfg = config.services.prometheus.exporters.nginx; -in -{ - port = 9113; - extraOpts = { - # additional module options - # ... - }; - serviceOpts = { - # service configuration - # ... - }; - imports = [ - # 'services.prometheus.exporters.nginx.telemetryEndpoint' -> 'services.prometheus.exporters.nginx.telemetryPath' - (mkRenamedOptionModule [ "telemetryEndpoint" ] [ "telemetryPath" ]) - - # removed option 'services.prometheus.exporters.nginx.insecure' - (mkRemovedOptionModule [ "insecure" ] '' - This option was replaced by 'prometheus.exporters.nginx.sslVerify' which defaults to true. - '') - ({ options.warnings = options.warnings; }) - ]; -} - - -
-
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix index d9eedd237c8b..0c2de683ecf7 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix @@ -18,7 +18,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 25826; description = lib.mdDoc "Network address on which to accept collectd binary network packets."; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix index 9e507423c7d6..674dc9dd4158 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix @@ -17,7 +17,7 @@ in { settings that can all be used here: https://github.com/martin-helmich/prometheus-nginxlog-exporter The `listen` object is already generated by `port`, `listenAddress` and `metricsEndpoint` and - will be merged with the value of `settings` before writting it as JSON. + will be merged with the value of `settings` before writing it as JSON. ''; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nut.nix b/nixos/modules/services/monitoring/prometheus/exporters/nut.nix new file mode 100644 index 000000000000..1c86b48b4509 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/nut.nix @@ -0,0 +1,50 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.nut; +in +{ + port = 9199; + extraOpts = { + nutServer = mkOption { + type = types.str; + default = "127.0.0.1"; + description = lib.mdDoc '' + Hostname or address of the NUT server + ''; + }; + nutUser = mkOption { + type = types.str; + default = ""; + example = "nut"; + description = lib.mdDoc '' + The user to log in into NUT server. If set, passwordPath should + also be set. + + Default NUT configs usually permit reading variables without + authentication. + ''; + }; + passwordPath = mkOption { + type = types.nullOr types.path; + default = null; + apply = final: if final == null then null else toString final; + description = lib.mdDoc '' + A run-time path to the nutUser password file, which should be + provisioned outside of Nix store. + ''; + }; + }; + serviceOpts = { + script = '' + ${optionalString (cfg.passwordPath != null) + "export NUT_EXPORTER_PASSWORD=$(cat ${toString cfg.passwordPath})"} + ${pkgs.prometheus-nut-exporter}/bin/nut_exporter \ + --nut.server=${cfg.nutServer} \ + --web.listen-address="${cfg.listenAddress}:${toString cfg.port}" \ + ${optionalString (cfg.nutUser != "") "--nut.username=${cfg.nutUser}"} + ''; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pve.nix b/nixos/modules/services/monitoring/prometheus/exporters/pve.nix index 8e2573d084bc..e02acad3ecd1 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/pve.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/pve.nix @@ -10,7 +10,7 @@ let text = "default:"; }; - computedConfigFile = "${if cfg.configFile == null then emptyConfigFile else cfg.configFile}"; + computedConfigFile = if cfg.configFile == null then emptyConfigFile else cfg.configFile; in { port = 9221; @@ -100,6 +100,8 @@ in }; serviceOpts = { serviceConfig = { + DynamicUser = cfg.environmentFile == null; + LoadCredential = "configFile:${computedConfigFile}"; ExecStart = '' ${cfg.package}/bin/pve_exporter \ --${if cfg.collectors.status == true then "" else "no-"}collector.status \ @@ -108,11 +110,11 @@ in --${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} \ + %d/configFile \ ${toString cfg.port} ${cfg.listenAddress} ''; } // optionalAttrs (cfg.environmentFile != null) { - EnvironmentFile = cfg.environmentFile; + EnvironmentFile = cfg.environmentFile; }; }; } diff --git a/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix b/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix index 0b48827f43f7..f9dcfad07d30 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix @@ -9,7 +9,7 @@ let pkgs.writeText "rspamd-exporter-config.yml" (builtins.toJSON conf); generateConfig = extraLabels: { - metrics = (map (path: { + modules.default.metrics = (map (path: { name = "rspamd_${replaceStrings [ "[" "." " " "]" "\\" "'" ] [ "_" "_" "_" "" "" "" ] path}"; path = "{ .${path} }"; labels = extraLabels; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/shelly.nix b/nixos/modules/services/monitoring/prometheus/exporters/shelly.nix new file mode 100644 index 000000000000..b9cfd1b1e84a --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/shelly.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.shelly; +in +{ + port = 9784; + extraOpts = { + metrics-file = mkOption { + type = types.path; + description = lib.mdDoc '' + Path to the JSON file with the metric definitions + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-shelly-exporter}/bin/shelly_exporter \ + -metrics-file ${cfg.metrics-file} \ + -listen-address ${cfg.listenAddress}:${toString cfg.port} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix b/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix index df424ede6066..0c5648c14149 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix @@ -4,16 +4,12 @@ with lib; let cfg = config.services.prometheus.exporters.smartctl; - format = pkgs.formats.yaml {}; - configFile = format.generate "smartctl-exporter.yml" { - smartctl_exporter = { - bind_to = "${cfg.listenAddress}:${toString cfg.port}"; - url_path = "/metrics"; - smartctl_location = "${pkgs.smartmontools}/bin/smartctl"; - collect_not_more_than_period = cfg.maxInterval; - devices = cfg.devices; - }; - }; + args = concatStrings [ + "--web.listen-address=\"${cfg.listenAddress}:${toString cfg.port}\" " + "--smartctl.path=\"${pkgs.smartmontools}/bin/smartctl\" " + "--smartctl.interval=\"${cfg.maxInterval}\" " + "${concatMapStringsSep " " (device: "--smartctl.device=${device}") cfg.devices}" + ]; in { port = 9633; @@ -50,17 +46,13 @@ in { "CAP_SYS_ADMIN" ]; DevicePolicy = "closed"; - DeviceAllow = lib.mkOverride 50 ( - if cfg.devices != [] then - cfg.devices - else [ - "block-blkext rw" - "block-sd rw" - "char-nvme rw" - ] - ); + DeviceAllow = lib.mkOverride 50 [ + "block-blkext rw" + "block-sd rw" + "char-nvme rw" + ]; ExecStart = '' - ${pkgs.prometheus-smartctl-exporter}/bin/smartctl_exporter -config ${configFile} + ${pkgs.prometheus-smartctl-exporter}/bin/smartctl_exporter ${args} ''; PrivateDevices = lib.mkForce false; ProtectProc = "invisible"; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/statsd.nix b/nixos/modules/services/monitoring/prometheus/exporters/statsd.nix new file mode 100644 index 000000000000..d9d732d8c125 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/statsd.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.statsd; +in +{ + port = 9102; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-statsd-exporter}/bin/statsd_exporter \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/unifi-poller.nix b/nixos/modules/services/monitoring/prometheus/exporters/unpoller.nix similarity index 64% rename from nixos/modules/services/monitoring/prometheus/exporters/unifi-poller.nix rename to nixos/modules/services/monitoring/prometheus/exporters/unpoller.nix index d1c82b2fd1c2..5cd1e2c65e90 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/unifi-poller.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/unpoller.nix @@ -3,12 +3,13 @@ with lib; let - cfg = config.services.prometheus.exporters.unifi-poller; + cfg = config.services.prometheus.exporters.unpoller; - configFile = pkgs.writeText "prometheus-unifi-poller-exporter.json" (generators.toJSON {} { + configFile = pkgs.writeText "prometheus-unpoller-exporter.json" (generators.toJSON {} { poller = { inherit (cfg.log) debug quiet; }; unifi = { inherit (cfg) controllers; }; influxdb.disable = true; + datadog.disable = true; # workaround for https://github.com/unpoller/unpoller/issues/442 prometheus = { http_listen = "${cfg.listenAddress}:${toString cfg.port}"; report_errors = cfg.log.prometheusErrors; @@ -20,8 +21,8 @@ in { port = 9130; extraOpts = { - inherit (options.services.unifi-poller.unifi) controllers; - inherit (options.services.unifi-poller) loki; + inherit (options.services.unpoller.unifi) controllers; + inherit (options.services.unpoller) loki; log = { debug = mkEnableOption (lib.mdDoc "debug logging including line numbers, high resolution timestamps, per-device logs."); quiet = mkEnableOption (lib.mdDoc "startup and error logs only."); @@ -30,7 +31,7 @@ in { }; serviceOpts.serviceConfig = { - ExecStart = "${pkgs.unifi-poller}/bin/unifi-poller --config ${configFile}"; + ExecStart = "${pkgs.unpoller}/bin/unpoller --config ${configFile}"; DynamicUser = false; }; } diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix index 41462da4ff4c..e6d8afc66624 100644 --- a/nixos/modules/services/monitoring/thanos.nix +++ b/nixos/modules/services/monitoring/thanos.nix @@ -300,7 +300,7 @@ let max-time = mkParamDef types.str "9999-12-31T23:59:59Z" '' End of time range limit to serve. - Thanos Store serves only blocks, which happened eariler than this + Thanos Store serves only blocks, which happened earlier than this value. Option can be a constant time in RFC3339 format or time duration relative to current time, such as -1d or 2h45m. Valid duration units are ms, s, m, h, d, w, y. diff --git a/nixos/modules/services/monitoring/tuptime.nix b/nixos/modules/services/monitoring/tuptime.nix index d97e408bce31..97cc37526254 100644 --- a/nixos/modules/services/monitoring/tuptime.nix +++ b/nixos/modules/services/monitoring/tuptime.nix @@ -54,8 +54,8 @@ in { Type = "oneshot"; User = "_tuptime"; RemainAfterExit = true; - ExecStart = "${pkgs.tuptime}/bin/tuptime -x"; - ExecStop = "${pkgs.tuptime}/bin/tuptime -xg"; + ExecStart = "${pkgs.tuptime}/bin/tuptime -q"; + ExecStop = "${pkgs.tuptime}/bin/tuptime -qg"; }; }; @@ -64,7 +64,7 @@ in { serviceConfig = { Type = "oneshot"; User = "_tuptime"; - ExecStart = "${pkgs.tuptime}/bin/tuptime -x"; + ExecStart = "${pkgs.tuptime}/bin/tuptime -q"; }; }; }; diff --git a/nixos/modules/services/monitoring/unifi-poller.nix b/nixos/modules/services/monitoring/unpoller.nix similarity index 91% rename from nixos/modules/services/monitoring/unifi-poller.nix rename to nixos/modules/services/monitoring/unpoller.nix index b30e28a3ecc9..f0ced5513d64 100644 --- a/nixos/modules/services/monitoring/unifi-poller.nix +++ b/nixos/modules/services/monitoring/unpoller.nix @@ -3,15 +3,19 @@ with lib; let - cfg = config.services.unifi-poller; + cfg = config.services.unpoller; - configFile = pkgs.writeText "unifi-poller.json" (generators.toJSON {} { + configFile = pkgs.writeText "unpoller.json" (generators.toJSON {} { inherit (cfg) poller influxdb loki prometheus unifi; }); in { - options.services.unifi-poller = { - enable = mkEnableOption (lib.mdDoc "unifi-poller"); + imports = [ + (lib.mkRenamedOptionModule [ "services" "unifi-poller" ] [ "services" "unpoller" ]) + ]; + + options.services.unpoller = { + enable = mkEnableOption (lib.mdDoc "unpoller"); poller = { debug = mkOption { @@ -86,8 +90,8 @@ in { }; pass = mkOption { type = types.path; - default = pkgs.writeText "unifi-poller-influxdb-default.password" "unifipoller"; - defaultText = literalExpression "unifi-poller-influxdb-default.password"; + default = pkgs.writeText "unpoller-influxdb-default.password" "unifipoller"; + defaultText = literalExpression "unpoller-influxdb-default.password"; description = lib.mdDoc '' Path of a file containing the password for influxdb. This file needs to be readable by the unifi-poller user. @@ -135,8 +139,8 @@ in { }; pass = mkOption { type = types.path; - default = pkgs.writeText "unifi-poller-loki-default.password" ""; - defaultText = "unifi-poller-influxdb-default.password"; + default = pkgs.writeText "unpoller-loki-default.password" ""; + defaultText = "unpoller-influxdb-default.password"; description = lib.mdDoc '' Path of a file containing the password for Loki. This file needs to be readable by the unifi-poller user. @@ -184,8 +188,8 @@ in { }; pass = mkOption { type = types.path; - default = pkgs.writeText "unifi-poller-unifi-default.password" "unifi"; - defaultText = literalExpression "unifi-poller-unifi-default.password"; + default = pkgs.writeText "unpoller-unifi-default.password" "unifi"; + defaultText = literalExpression "unpoller-unifi-default.password"; description = lib.mdDoc '' Path of a file containing the password for the unifi service user. This file needs to be readable by the unifi-poller user. @@ -303,7 +307,7 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - ExecStart = "${pkgs.unifi-poller}/bin/unifi-poller --config ${configFile}"; + ExecStart = "${pkgs.unpoller}/bin/unpoller --config ${configFile}"; Restart = "always"; PrivateTmp = true; ProtectHome = true; diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index c7abaeb2973e..bb11b6a1c1d0 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -12,7 +12,7 @@ let upsOptions = {name, config, ...}: { options = { - # This can be infered from the UPS model by looking at + # This can be inferred from the UPS model by looking at # /nix/store/nut/share/driver.list driver = mkOption { type = types.str; @@ -228,7 +228,7 @@ in "} ''; "nut/upssched.conf".source = cfg.schedulerRules; - # These file are containing private informations and thus should not + # These file are containing private information and thus should not # be stored inside the Nix store. /* "nut/upsd.conf".source = ""; diff --git a/nixos/modules/services/monitoring/uptime-kuma.nix b/nixos/modules/services/monitoring/uptime-kuma.nix index 3a6091de679d..886e14b5f6c9 100644 --- a/nixos/modules/services/monitoring/uptime-kuma.nix +++ b/nixos/modules/services/monitoring/uptime-kuma.nix @@ -7,21 +7,23 @@ let in { + meta.maintainers = [ lib.maintainers.julienmalka ]; + options = { services.uptime-kuma = { enable = mkEnableOption (mdDoc "Uptime Kuma, this assumes a reverse proxy to be set."); package = mkOption { type = types.package; - example = literalExpression "pkgs.uptime-kuma"; default = pkgs.uptime-kuma; - defaultText = "pkgs.uptime-kuma"; + defaultText = literalExpression "pkgs.uptime-kuma"; description = lib.mdDoc "Uptime Kuma package to use."; }; + appriseSupport = mkEnableOption (mdDoc "apprise support for notifications."); + settings = lib.mkOption { - type = - lib.types.submodule { freeformType = with lib.types; attrsOf str; }; + type = lib.types.submodule { freeformType = with lib.types; attrsOf str; }; default = { }; example = { PORT = "4000"; @@ -29,7 +31,7 @@ in }; description = lib.mdDoc '' Additional configuration for Uptime Kuma, see - + for supported values. ''; }; @@ -48,6 +50,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; environment = cfg.settings; + path = with pkgs; [ unixtools.ping ] ++ lib.optional cfg.appriseSupport apprise; serviceConfig = { Type = "simple"; StateDirectory = "uptime-kuma"; diff --git a/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixos/modules/services/monitoring/zabbix-proxy.nix index e7e353f36604..85da416ba6c3 100644 --- a/nixos/modules/services/monitoring/zabbix-proxy.nix +++ b/nixos/modules/services/monitoring/zabbix-proxy.nix @@ -102,7 +102,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = if cfg.database.type == "mysql" then mysql.port else pgsql.port; defaultText = literalExpression '' if config.${opt.database.type} == "mysql" diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix index 51e1282db418..4d423c905986 100644 --- a/nixos/modules/services/network-filesystems/kubo.nix +++ b/nixos/modules/services/network-filesystems/kubo.nix @@ -5,6 +5,23 @@ let settingsFormat = pkgs.formats.json {}; + rawDefaultConfig = lib.importJSON (pkgs.runCommand "kubo-default-config" { + nativeBuildInputs = [ cfg.package ]; + } '' + export IPFS_PATH="$TMPDIR" + ipfs init --empty-repo --profile=${profile} + ipfs --offline config show > "$out" + ''); + + # Remove the PeerID (an attribute of "Identity") of the temporary Kubo repo. + # The "Pinning" section contains the "RemoteServices" section, which would prevent + # the daemon from starting as that setting can't be changed via ipfs config replace. + defaultConfig = builtins.removeAttrs rawDefaultConfig [ "Identity" "Pinning" ]; + + customizedConfig = lib.recursiveUpdate defaultConfig cfg.settings; + + configFile = settingsFormat.generate "kubo-config.json" customizedConfig; + kuboFlags = utils.escapeSystemdExecArgs ( optional cfg.autoMount "--mount" ++ optional cfg.enableGC "--enable-gc" ++ @@ -54,7 +71,7 @@ in services.kubo = { - enable = mkEnableOption (lib.mdDoc "Interplanetary File System (WARNING: may cause severe network degredation)"); + enable = mkEnableOption (lib.mdDoc "Interplanetary File System (WARNING: may cause severe network degradation)"); package = mkOption { type = types.package; @@ -161,9 +178,9 @@ in }; }; description = lib.mdDoc '' - Attrset of daemon configuration to set using {command}`ipfs config`, every time the daemon starts. + Attrset of daemon configuration. See [https://github.com/ipfs/kubo/blob/master/docs/config.md](https://github.com/ipfs/kubo/blob/master/docs/config.md) for reference. - Keep in mind that this configuration is stateful; i.e., unsetting anything in here does not reset the value to the default! + You can't set `Identity` or `Pinning`. ''; default = { }; example = { @@ -211,6 +228,21 @@ in ###### implementation config = mkIf cfg.enable { + assertions = [ + { + assertion = !builtins.hasAttr "Identity" cfg.settings; + message = '' + You can't set services.kubo.settings.Identity because the ``config replace`` subcommand used at startup does not support modifying any of the Identity settings. + ''; + } + { + assertion = !((builtins.hasAttr "Pinning" cfg.settings) && (builtins.hasAttr "RemoteServices" cfg.settings.Pinning)); + message = '' + You can't set services.kubo.settings.Pinning.RemoteServices because the ``config replace`` subcommand used at startup does not work with it. + ''; + } + ]; + environment.systemPackages = [ cfg.package ]; environment.variables.IPFS_PATH = cfg.dataDir; @@ -262,21 +294,26 @@ in preStart = '' if [[ ! -f "$IPFS_PATH/config" ]]; then - ipfs init ${optionalString cfg.emptyRepo "-e"} --profile=${profile} + ipfs init ${optionalString cfg.emptyRepo "-e"} else # After an unclean shutdown this file may exist which will cause the config command to attempt to talk to the daemon. This will hang forever if systemd is holding our sockets open. rm -vf "$IPFS_PATH/api" '' + optionalString cfg.autoMigrate '' ${pkgs.kubo-migrator}/bin/fs-repo-migrations -to '${cfg.package.repoVersion}' -y '' + '' - ipfs --offline config profile apply ${profile} >/dev/null fi - '' + '' - ipfs --offline config show \ - | ${pkgs.jq}/bin/jq '. * $settings' --argjson settings ${ - escapeShellArg (builtins.toJSON cfg.settings) - } \ - | ipfs --offline config replace - + ipfs --offline config show | + ${pkgs.jq}/bin/jq -s '.[0].Pinning as $Pinning | .[0].Identity as $Identity | .[1] + {$Identity,$Pinning}' - '${configFile}' | + + # This command automatically injects the private key and other secrets from + # the old config file back into the new config file. + # Unfortunately, it doesn't keep the original `Identity.PeerID`, + # so we need `ipfs config show` and jq above. + # See https://github.com/ipfs/kubo/issues/8993 for progress on fixing this problem. + # Kubo also wants a specific version of the original "Pinning.RemoteServices" + # section (redacted by `ipfs config show`), such that that section doesn't + # change when the changes are applied. Whyyyyyy..... + ipfs --offline config replace - ''; serviceConfig = { ExecStart = [ "" "${cfg.package}/bin/ipfs daemon ${kuboFlags}" ]; diff --git a/nixos/modules/services/network-filesystems/litestream/litestream.xml b/nixos/modules/services/network-filesystems/litestream/default.md similarity index 51% rename from nixos/modules/services/network-filesystems/litestream/litestream.xml rename to nixos/modules/services/network-filesystems/litestream/default.md index 8f5597bb6891..8d8486507b77 100644 --- a/nixos/modules/services/network-filesystems/litestream/litestream.xml +++ b/nixos/modules/services/network-filesystems/litestream/default.md @@ -1,23 +1,14 @@ - - Litestream - - Litestream is a standalone streaming - replication tool for SQLite. - +# Litestream {#module-services-litestream} -
- Configuration +[Litestream](https://litestream.io/) is a standalone streaming +replication tool for SQLite. - - Litestream service is managed by a dedicated user named litestream - which needs permission to the database file. Here's an example config which gives - required permissions to access - grafana database: - +## Configuration {#module-services-litestream-configuration} + +Litestream service is managed by a dedicated user named `litestream` +which needs permission to the database file. Here's an example config which gives +required permissions to access [grafana database](#opt-services.grafana.settings.database.path): +``` { pkgs, ... }: { users.users.litestream.extraGroups = [ "grafana" ]; @@ -58,8 +49,4 @@ }; }; } - - -
- -
+``` diff --git a/nixos/modules/services/network-filesystems/litestream/default.nix b/nixos/modules/services/network-filesystems/litestream/default.nix index 884ffa50e7c6..6e2ec1ccaa3c 100644 --- a/nixos/modules/services/network-filesystems/litestream/default.nix +++ b/nixos/modules/services/network-filesystems/litestream/default.nix @@ -94,5 +94,6 @@ in }; users.groups.litestream = {}; }; - meta.doc = ./litestream.xml; + + meta.doc = ./default.md; } diff --git a/nixos/modules/services/network-filesystems/moosefs.nix b/nixos/modules/services/network-filesystems/moosefs.nix index c9a5a43ebcd9..ab82a2a07dd4 100644 --- a/nixos/modules/services/network-filesystems/moosefs.nix +++ b/nixos/modules/services/network-filesystems/moosefs.nix @@ -52,7 +52,7 @@ let chunkserverCfg = settingsFormat.generate "mfschunkserver.cfg" cfg.chunkserver.settings; - # generic template for all deamons + # generic template for all daemons systemdService = name: extraConfig: configFile: { wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ]; @@ -94,7 +94,7 @@ in { Enable Moosefs master daemon. You need to run `mfsmaster-init` on a freshly installed master server to - initialize the `DATA_PATH` direcory. + initialize the `DATA_PATH` directory. ''; default = false; }; diff --git a/nixos/modules/services/network-filesystems/orangefs/client.nix b/nixos/modules/services/network-filesystems/orangefs/client.nix index 471e17970ae1..68f23f477af1 100644 --- a/nixos/modules/services/network-filesystems/orangefs/client.nix +++ b/nixos/modules/services/network-filesystems/orangefs/client.nix @@ -21,7 +21,7 @@ in { fileSystems = mkOption { description = lib.mdDoc '' The orangefs file systems to be mounted. - This option is prefered over using {option}`fileSystems` directly since + This option is preferred over using {option}`fileSystems` directly since the pvfs client service needs to be running for it to be mounted. ''; diff --git a/nixos/modules/services/network-filesystems/orangefs/server.nix b/nixos/modules/services/network-filesystems/orangefs/server.nix index 8e6838c04678..e20e7975ebaa 100644 --- a/nixos/modules/services/network-filesystems/orangefs/server.nix +++ b/nixos/modules/services/network-filesystems/orangefs/server.nix @@ -209,7 +209,7 @@ in { after = [ "network-online.target" ]; serviceConfig = { - # Run as "simple" in forground mode. + # Run as "simple" in foreground mode. # This is more reliable ExecStart = '' ${pkgs.orangefs}/bin/pvfs2-server -d \ diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index 4213f437f4b2..14c0a3d4725f 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -18,7 +18,7 @@ in }; tub.port = mkOption { default = 3458; - type = types.int; + type = types.port; description = lib.mdDoc '' The port on which the introducer will listen. ''; @@ -58,7 +58,7 @@ in }; tub.port = mkOption { default = 3457; - type = types.int; + type = types.port; description = lib.mdDoc '' The port on which the tub will listen. @@ -80,7 +80,7 @@ in }; web.port = mkOption { default = 3456; - type = types.int; + type = types.port; description = lib.mdDoc '' The port on which the Web server will listen. diff --git a/nixos/modules/services/networking/3proxy.nix b/nixos/modules/services/networking/3proxy.nix index e643ed941315..ef695a7f49fa 100644 --- a/nixos/modules/services/networking/3proxy.nix +++ b/nixos/modules/services/networking/3proxy.nix @@ -158,7 +158,7 @@ in { description = lib.mdDoc '' List of target IP ranges, use empty list for any. May also contain host names instead of addresses. - It's possible to use wildmask in the begginning and in the the end of hostname, e.g. `*badsite.com` or `*badcontent*`. + It's possible to use wildmask in the beginning and in the the end of hostname, e.g. `*badsite.com` or `*badcontent*`. Hostname is only checked if hostname presents in request. ''; }; diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 56113bd34594..103f73fdaa68 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -47,7 +47,7 @@ in Whether to run the Avahi daemon, which allows Avahi clients to use Avahi's service discovery facilities and also allows the local machine to advertise its presence and services - (through the mDNS responder implemented by `avahi-daemon'). + (through the mDNS responder implemented by `avahi-daemon`). ''; }; @@ -106,13 +106,14 @@ in default = true; description = lib.mdDoc '' Whether to open the firewall for UDP port 5353. + Disabling this setting also disables discovering of network devices. ''; }; allowPointToPoint = mkOption { type = types.bool; default = false; - description= lib.mdDoc '' + description = lib.mdDoc '' Whether to use POINTTOPOINT interfaces. Might make mDNS unreliable due to usually large latencies with such links and opens a potential security hole by allowing mDNS access from Internet connections. @@ -204,7 +205,7 @@ in default = false; description = lib.mdDoc '' Whether to enable the mDNS NSS (Name Service Switch) plug-in. - Enabling it allows applications to resolve names in the `.local' + Enabling it allows applications to resolve names in the `.local` domain by transparently querying the Avahi daemon. ''; }; @@ -274,6 +275,7 @@ in BusName = "org.freedesktop.Avahi"; Type = "dbus"; ExecStart = "${pkgs.avahi}/sbin/avahi-daemon --syslog -f ${avahiDaemonConf}"; + ConfigurationDirectory = "avahi/services"; }; }; diff --git a/nixos/modules/services/networking/biboumi.nix b/nixos/modules/services/networking/biboumi.nix index 896a2350e3d5..1428856764e6 100644 --- a/nixos/modules/services/networking/biboumi.nix +++ b/nixos/modules/services/networking/biboumi.nix @@ -45,7 +45,7 @@ in default = "/etc/ssl/certs/ca-certificates.crt"; description = lib.mdDoc '' Specifies which file should be used as the list of trusted CA - when negociating a TLS session. + when negotiating a TLS session. ''; }; options.db_name = mkOption { @@ -111,7 +111,7 @@ in description = lib.mdDoc '' A directory that should contain the policy files, used to customize Botan’s behaviour - when negociating the TLS connections with the IRC servers. + when negotiating the TLS connections with the IRC servers. ''; }; options.port = mkOption { diff --git a/nixos/modules/services/networking/bitcoind.nix b/nixos/modules/services/networking/bitcoind.nix index 6df809a8b764..a86d52b7202d 100644 --- a/nixos/modules/services/networking/bitcoind.nix +++ b/nixos/modules/services/networking/bitcoind.nix @@ -95,7 +95,7 @@ let } ''; type = types.attrsOf (types.submodule rpcUserOpts); - description = lib.mdDoc "RPC user information for JSON-RPC connnections."; + description = lib.mdDoc "RPC user information for JSON-RPC connections."; }; }; diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index 88c04597e2bc..146bffaa6edf 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -60,7 +60,7 @@ in type = types.str; default = "127.0.0.1"; description = lib.mdDoc '' - The interface the BitlBee deamon will be listening to. If `127.0.0.1`, + The interface the BitlBee daemon will be listening to. If `127.0.0.1`, only clients on the local host can connect to it; if `0.0.0.0`, clients can access it from any network interface. ''; diff --git a/nixos/modules/services/networking/blocky.nix b/nixos/modules/services/networking/blocky.nix index 971448545616..30a41fa6a421 100644 --- a/nixos/modules/services/networking/blocky.nix +++ b/nixos/modules/services/networking/blocky.nix @@ -31,6 +31,7 @@ in serviceConfig = { DynamicUser = true; ExecStart = "${pkgs.blocky}/bin/blocky --config ${configFile}"; + Restart = "on-failure"; AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; diff --git a/nixos/modules/services/networking/chisel-server.nix b/nixos/modules/services/networking/chisel-server.nix index d3724743209b..134c71430cd0 100644 --- a/nixos/modules/services/networking/chisel-server.nix +++ b/nixos/modules/services/networking/chisel-server.nix @@ -17,7 +17,7 @@ in { }; port = mkOption { description = mdDoc "Port to listen on, falls back to 8080"; - type = with types; nullOr int; + type = with types; nullOr port; default = null; }; authfile = mkOption { diff --git a/nixos/modules/services/networking/cloudflared.nix b/nixos/modules/services/networking/cloudflared.nix new file mode 100644 index 000000000000..b3f0e37d8e9e --- /dev/null +++ b/nixos/modules/services/networking/cloudflared.nix @@ -0,0 +1,331 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.cloudflared; + + originRequest = { + connectTimeout = mkOption { + type = with types; nullOr str; + default = null; + example = "30s"; + description = lib.mdDoc '' + Timeout for establishing a new TCP connection to your origin server. This excludes the time taken to establish TLS, which is controlled by [https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/configuration/local-management/ingress/#tlstimeout](tlsTimeout). + ''; + }; + + tlsTimeout = mkOption { + type = with types; nullOr str; + default = null; + example = "10s"; + description = lib.mdDoc '' + Timeout for completing a TLS handshake to your origin server, if you have chosen to connect Tunnel to an HTTPS server. + ''; + }; + + tcpKeepAlive = mkOption { + type = with types; nullOr str; + default = null; + example = "30s"; + description = lib.mdDoc '' + The timeout after which a TCP keepalive packet is sent on a connection between Tunnel and the origin server. + ''; + }; + + noHappyEyeballs = mkOption { + type = with types; nullOr bool; + default = null; + example = false; + description = lib.mdDoc '' + Disable the “happy eyeballs” algorithm for IPv4/IPv6 fallback if your local network has misconfigured one of the protocols. + ''; + }; + + keepAliveConnections = mkOption { + type = with types; nullOr int; + default = null; + example = 100; + description = lib.mdDoc '' + Maximum number of idle keepalive connections between Tunnel and your origin. This does not restrict the total number of concurrent connections. + ''; + }; + + keepAliveTimeout = mkOption { + type = with types; nullOr str; + default = null; + example = "1m30s"; + description = lib.mdDoc '' + Timeout after which an idle keepalive connection can be discarded. + ''; + }; + + httpHostHeader = mkOption { + type = with types; nullOr str; + default = null; + example = ""; + description = lib.mdDoc '' + Sets the HTTP `Host` header on requests sent to the local service. + ''; + }; + + originServerName = mkOption { + type = with types; nullOr str; + default = null; + example = ""; + description = lib.mdDoc '' + Hostname that `cloudflared` should expect from your origin server certificate. + ''; + }; + + caPool = mkOption { + type = with types; nullOr (either str path); + default = null; + example = ""; + description = lib.mdDoc '' + Path to the certificate authority (CA) for the certificate of your origin. This option should be used only if your certificate is not signed by Cloudflare. + ''; + }; + + noTLSVerify = mkOption { + type = with types; nullOr bool; + default = null; + example = false; + description = lib.mdDoc '' + Disables TLS verification of the certificate presented by your origin. Will allow any certificate from the origin to be accepted. + ''; + }; + + disableChunkedEncoding = mkOption { + type = with types; nullOr bool; + default = null; + example = false; + description = lib.mdDoc '' + Disables chunked transfer encoding. Useful if you are running a WSGI server. + ''; + }; + + proxyAddress = mkOption { + type = with types; nullOr str; + default = null; + example = "127.0.0.1"; + description = lib.mdDoc '' + `cloudflared` starts a proxy server to translate HTTP traffic into TCP when proxying, for example, SSH or RDP. This configures the listen address for that proxy. + ''; + }; + + proxyPort = mkOption { + type = with types; nullOr int; + default = null; + example = 0; + description = lib.mdDoc '' + `cloudflared` starts a proxy server to translate HTTP traffic into TCP when proxying, for example, SSH or RDP. This configures the listen port for that proxy. If set to zero, an unused port will randomly be chosen. + ''; + }; + + proxyType = mkOption { + type = with types; nullOr (enum [ "" "socks" ]); + default = null; + example = ""; + description = lib.mdDoc '' + `cloudflared` starts a proxy server to translate HTTP traffic into TCP when proxying, for example, SSH or RDP. This configures what type of proxy will be started. Valid options are: + + - `""` for the regular proxy + - `"socks"` for a SOCKS5 proxy. Refer to the [https://developers.cloudflare.com/cloudflare-one/tutorials/kubectl/](tutorial on connecting through Cloudflare Access using kubectl) for more information. + ''; + }; + }; +in +{ + options.services.cloudflared = { + enable = mkEnableOption (lib.mdDoc "Cloudflare Tunnel client daemon (formerly Argo Tunnel)"); + + user = mkOption { + type = types.str; + default = "cloudflared"; + description = lib.mdDoc "User account under which Cloudflared runs."; + }; + + group = mkOption { + type = types.str; + default = "cloudflared"; + description = lib.mdDoc "Group under which cloudflared runs."; + }; + + package = mkOption { + type = types.package; + default = pkgs.cloudflared; + defaultText = "pkgs.cloudflared"; + description = lib.mdDoc "The package to use for Cloudflared."; + }; + + tunnels = mkOption { + description = lib.mdDoc '' + Cloudflare tunnels. + ''; + type = types.attrsOf (types.submodule ({ name, ... }: { + options = { + inherit originRequest; + + credentialsFile = mkOption { + type = types.str; + description = lib.mdDoc '' + Credential file. + + See [https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/tunnel-useful-terms/#credentials-file](Credentials file). + ''; + }; + + warp-routing = { + enabled = mkOption { + type = with types; nullOr bool; + default = null; + description = lib.mdDoc '' + Enable warp routing. + + See [https://developers.cloudflare.com/cloudflare-one/tutorials/warp-to-tunnel/](Connect from WARP to a private network on Cloudflare using Cloudflare Tunnel). + ''; + }; + }; + + default = mkOption { + type = types.str; + description = lib.mdDoc '' + Catch-all service if no ingress matches. + + See `service`. + ''; + example = "http_status:404"; + }; + + ingress = mkOption { + type = with types; attrsOf (either str (submodule ({ hostname, ... }: { + options = { + inherit originRequest; + + service = mkOption { + type = with types; nullOr str; + default = null; + description = lib.mdDoc '' + Service to pass the traffic. + + See [https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/configuration/local-management/ingress/#supported-protocols](Supported protocols). + ''; + example = "http://localhost:80, tcp://localhost:8000, unix:/home/production/echo.sock, hello_world or http_status:404"; + }; + + path = mkOption { + type = with types; nullOr str; + default = null; + description = lib.mdDoc '' + Path filter. + + If not specified, all paths will be matched. + ''; + example = "/*.(jpg|png|css|js)"; + }; + + }; + }))); + default = { }; + description = lib.mdDoc '' + Ingress rules. + + See [https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/configuration/local-management/ingress/](Ingress rules). + ''; + example = { + "*.domain.com" = "http://localhost:80"; + "*.anotherone.com" = "http://localhost:80"; + }; + }; + }; + })); + + default = { }; + example = { + "00000000-0000-0000-0000-000000000000" = { + credentialsFile = "/tmp/test"; + ingress = { + "*.domain1.com" = { + service = "http://localhost:80"; + }; + }; + default = "http_status:404"; + }; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.targets = + mapAttrs' + (name: tunnel: + nameValuePair "cloudflared-tunnel-${name}" { + description = "Cloudflare tunnel '${name}' target"; + requires = [ "cloudflared-tunnel-${name}.service" ]; + after = [ "cloudflared-tunnel-${name}.service" ]; + unitConfig.StopWhenUnneeded = true; + } + ) + config.services.cloudflared.tunnels; + + systemd.services = + mapAttrs' + (name: tunnel: + let + filterConfig = lib.attrsets.filterAttrsRecursive (_: v: ! builtins.elem v [ null [ ] { } ]); + + filterIngressSet = filterAttrs (_: v: builtins.typeOf v == "set"); + filterIngressStr = filterAttrs (_: v: builtins.typeOf v == "string"); + + ingressesSet = filterIngressSet tunnel.ingress; + ingressesStr = filterIngressStr tunnel.ingress; + + fullConfig = { + tunnel = name; + "credentials-file" = tunnel.credentialsFile; + ingress = + (map + (key: { + hostname = key; + } // getAttr key (filterConfig (filterConfig ingressesSet))) + (attrNames ingressesSet)) + ++ + (map + (key: { + hostname = key; + service = getAttr key ingressesStr; + }) + (attrNames ingressesStr)) + ++ [{ service = tunnel.default; }]; + }; + mkConfigFile = pkgs.writeText "cloudflared.yml" (builtins.toJSON fullConfig); + in + nameValuePair "cloudflared-tunnel-${name}" ({ + after = [ "network.target" "network-online.target" ]; + wants = [ "network.target" "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStart = "${cfg.package}/bin/cloudflared tunnel --config=${mkConfigFile} --no-autoupdate run"; + Restart = "on-failure"; + }; + }) + ) + config.services.cloudflared.tunnels; + + users.users = mkIf (cfg.user == "cloudflared") { + cloudflared = { + group = cfg.group; + isSystemUser = true; + }; + }; + + users.groups = mkIf (cfg.group == "cloudflared") { + cloudflared = { }; + }; + }; + + meta.maintainers = with maintainers; [ bbigras ]; +} diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index bee41dcf765d..f1c36138be3e 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -142,7 +142,7 @@ in }; consulAddr = mkOption { - description = lib.mdDoc "Consul api listening adddress"; + description = lib.mdDoc "Consul api listening address"; default = "localhost:8500"; type = types.str; }; diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 5c32817979af..4d843641f58a 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -71,7 +71,7 @@ with lib; package = mkOption { type = package; default = pkgs.ddclient; - defaultText = "pkgs.ddclient"; + defaultText = lib.literalExpression "pkgs.ddclient"; description = lib.mdDoc '' The ddclient executable package run by the service. ''; diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index ac5d45a65e3b..9a0b29fbe5a7 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -33,6 +33,13 @@ let (if !config.networking.useDHCP && enableDHCP then map (i: i.name) (filter (i: i.useDHCP == true) interfaces) else null); + staticIPv6Addresses = map (i: i.name) (filter (i: i.ipv6.addresses != [ ]) interfaces); + + noIPv6rs = concatStringsSep "\n" (map (name: '' + interface ${name} + noipv6rs + '') staticIPv6Addresses); + # Config file adapted from the one that ships with dhcpcd. dhcpcdConf = pkgs.writeText "dhcpcd.conf" '' @@ -75,6 +82,8 @@ let ''} ${cfg.extraConfig} + + ${optionalString config.networking.enableIPv6 noIPv6rs} ''; exitHook = pkgs.writeText "dhcpcd.exit-hook" diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index cfc37b74b9a9..4886654e8c03 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -7,15 +7,27 @@ let dnsmasq = pkgs.dnsmasq; stateDir = "/var/lib/dnsmasq"; + # True values are just put as `name` instead of `name=true`, and false values + # are turned to comments (false values are expected to be overrides e.g. + # mkForce) + formatKeyValue = + name: value: + if value == true + then name + else if value == false + then "# setting `${name}` explicitly set to false" + else generators.mkKeyValueDefault { } "=" name value; + + settingsFormat = pkgs.formats.keyValue { + mkKeyValue = formatKeyValue; + listsAsDuplicateKeys = true; + }; + + # Because formats.generate is outputting a file, we use of conf-file. Once + # `extraConfig` is deprecated we can just use + # `dnsmasqConf = format.generate "dnsmasq.conf" cfg.settings` dnsmasqConf = pkgs.writeText "dnsmasq.conf" '' - dhcp-leasefile=${stateDir}/dnsmasq.leases - ${optionalString cfg.resolveLocalQueries '' - conf-file=/etc/dnsmasq-conf.conf - resolv-file=/etc/dnsmasq-resolv.conf - ''} - ${flip concatMapStrings cfg.servers (server: '' - server=${server} - '')} + conf-file=${settingsFormat.generate "dnsmasq.conf" cfg.settings} ${cfg.extraConfig} ''; @@ -23,6 +35,10 @@ in { + imports = [ + (mkRenamedOptionModule [ "services" "dnsmasq" "servers" ] [ "services" "dnsmasq" "settings" "server" ]) + ]; + ###### interface options = { @@ -46,15 +62,6 @@ in ''; }; - servers = mkOption { - type = types.listOf types.str; - default = []; - example = [ "8.8.8.8" "8.8.4.4" ]; - description = lib.mdDoc '' - The DNS servers which dnsmasq should query. - ''; - }; - alwaysKeepRunning = mkOption { type = types.bool; default = false; @@ -63,12 +70,49 @@ in ''; }; + settings = mkOption { + type = types.submodule { + + freeformType = settingsFormat.type; + + options.server = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "8.8.8.8" "8.8.4.4" ]; + description = lib.mdDoc '' + The DNS servers which dnsmasq should query. + ''; + }; + + }; + default = { }; + description = lib.mdDoc '' + Configuration of dnsmasq. Lists get added one value per line (empty + lists and false values don't get added, though false values get + turned to comments). Gets merged with + + { + dhcp-leasefile = "${stateDir}/dnsmasq.leases"; + conf-file = optional cfg.resolveLocalQueries "/etc/dnsmasq-conf.conf"; + resolv-file = optional cfg.resolveLocalQueries "/etc/dnsmasq-resolv.conf"; + } + ''; + example = literalExpression '' + { + domain-needed = true; + dhcp-range = [ "192.168.0.2,192.168.0.254" ]; + } + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; description = lib.mdDoc '' Extra configuration directives that should be added to `dnsmasq.conf`. + + This option is deprecated, please use {option}`settings` instead. ''; }; @@ -81,6 +125,14 @@ in config = mkIf cfg.enable { + warnings = lib.optional (cfg.extraConfig != "") "Text based config is deprecated, dnsmasq now supports `services.dnsmasq.settings` for an attribute-set based config"; + + services.dnsmasq.settings = { + dhcp-leasefile = mkDefault "${stateDir}/dnsmasq.leases"; + conf-file = mkDefault (optional cfg.resolveLocalQueries "/etc/dnsmasq-conf.conf"); + resolv-file = mkDefault (optional cfg.resolveLocalQueries "/etc/dnsmasq-resolv.conf"); + }; + networking.nameservers = optional cfg.resolveLocalQueries "127.0.0.1"; diff --git a/nixos/modules/services/networking/epmd.nix b/nixos/modules/services/networking/epmd.nix index 534b80906211..0bc8c71f4eaa 100644 --- a/nixos/modules/services/networking/epmd.nix +++ b/nixos/modules/services/networking/epmd.nix @@ -32,7 +32,7 @@ in default = "[::]:4369"; description = lib.mdDoc '' the listenStream used by the systemd socket. - see https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream= for more informations. + see https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream= for more information. use this to change the port epmd will run on. if not defined, epmd will use "[::]:4369" ''; diff --git a/nixos/modules/services/networking/ergochat.nix b/nixos/modules/services/networking/ergochat.nix index 1a70b1f8613e..a003512677eb 100644 --- a/nixos/modules/services/networking/ergochat.nix +++ b/nixos/modules/services/networking/ergochat.nix @@ -17,10 +17,10 @@ in { configFile = lib.mkOption { type = lib.types.path; default = (pkgs.formats.yaml {}).generate "ergo.conf" cfg.settings; - defaultText = "generated config file from .settings"; + defaultText = lib.literalMD "generated config file from `settings`"; description = lib.mdDoc '' Path to configuration file. - Setting this will skip any configuration done via `.settings` + Setting this will skip any configuration done via `settings` ''; }; diff --git a/nixos/modules/services/networking/firefox-syncserver.nix b/nixos/modules/services/networking/firefox-syncserver.nix index c3d9f43f7457..a06b9573a850 100644 --- a/nixos/modules/services/networking/firefox-syncserver.nix +++ b/nixos/modules/services/networking/firefox-syncserver.nix @@ -11,8 +11,10 @@ let format = pkgs.formats.toml {}; settings = { - database_url = dbURL; human_logs = true; + syncstorage = { + database_url = dbURL; + }; tokenserver = { node_type = "mysql"; database_url = dbURL; @@ -253,8 +255,7 @@ in serviceConfig = { User = defaultUser; Group = defaultUser; - ExecStart = "${cfg.package}/bin/syncstorage --config ${configFile}"; - Stderr = "journal"; + ExecStart = "${cfg.package}/bin/syncserver --config ${configFile}"; EnvironmentFile = lib.mkIf (cfg.secrets != null) "${cfg.secrets}"; # hardening @@ -310,8 +311,6 @@ in meta = { maintainers = with lib.maintainers; [ pennae ]; - # Don't edit the docbook xml directly, edit the md and generate it: - # `pandoc firefox-syncserver.md -t docbook --top-level-division=chapter --extract-media=media -f markdown+smart > firefox-syncserver.xml` - doc = ./firefox-syncserver.xml; + doc = ./firefox-syncserver.md; }; } diff --git a/nixos/modules/services/networking/firefox-syncserver.xml b/nixos/modules/services/networking/firefox-syncserver.xml deleted file mode 100644 index 66c812266951..000000000000 --- a/nixos/modules/services/networking/firefox-syncserver.xml +++ /dev/null @@ -1,77 +0,0 @@ - - Firefox Sync server - - A storage server for Firefox Sync that you can easily host yourself. - -
- Quickstart - - The absolute minimal configuration for the sync server looks like - this: - - -services.mysql.package = pkgs.mariadb; - -services.firefox-syncserver = { - enable = true; - secrets = builtins.toFile "sync-secrets" '' - SYNC_MASTER_SECRET=this-secret-is-actually-leaked-to-/nix/store - ''; - singleNode = { - enable = true; - hostname = "localhost"; - url = "http://localhost:5000"; - }; -}; - - - This will start a sync server that is only accessible locally. - Once the services is running you can navigate to - about:config in your Firefox profile and set - identity.sync.tokenserver.uri to - http://localhost:5000/1.0/sync/1.5. Your - browser will now use your local sync server for data storage. - - - - This configuration should never be used in production. It is not - encrypted and stores its secrets in a world-readable location. - - -
-
- More detailed setup - - The firefox-syncserver service provides a - number of options to make setting up small deployment easier. - These are grouped under the singleNode element - of the option tree and allow simple configuration of the most - important parameters. - - - Single node setup is split into two kinds of options: those that - affect the sync server itself, and those that affect its - surroundings. Options that affect the sync server are - capacity, which configures how many accounts - may be active on this instance, and url, which - holds the URL under which the sync server can be accessed. The - url can be configured automatically when using - nginx. - - - Options that affect the surroundings of the sync server are - enableNginx, enableTLS and - hostnam. If enableNginx is - set the sync server module will automatically add an nginx virtual - host to the system using hostname as the domain - and set url accordingly. If - enableTLS is set the module will also enable - ACME certificates on the new virtual host and force all - connections to be made via TLS. - - - For actual deployment it is also recommended to store the - secrets file in a secure location. - -
-
diff --git a/nixos/modules/services/networking/firewall-iptables.nix b/nixos/modules/services/networking/firewall-iptables.nix new file mode 100644 index 000000000000..63e952194d67 --- /dev/null +++ b/nixos/modules/services/networking/firewall-iptables.nix @@ -0,0 +1,334 @@ +/* This module enables a simple firewall. + + The firewall can be customised in arbitrary ways by setting + ‘networking.firewall.extraCommands’. For modularity, the firewall + uses several chains: + + - ‘nixos-fw’ is the main chain for input packet processing. + + - ‘nixos-fw-accept’ is called for accepted packets. If you want + additional logging, or want to reject certain packets anyway, you + can insert rules at the start of this chain. + + - ‘nixos-fw-log-refuse’ and ‘nixos-fw-refuse’ are called for + refused packets. (The former jumps to the latter after logging + the packet.) If you want additional logging, or want to accept + certain packets anyway, you can insert rules at the start of + this chain. + + - ‘nixos-fw-rpfilter’ is used as the main chain in the mangle table, + called from the built-in ‘PREROUTING’ chain. If the kernel + supports it and `cfg.checkReversePath` is set this chain will + perform a reverse path filter test. + + - ‘nixos-drop’ is used while reloading the firewall in order to drop + all traffic. Since reloading isn't implemented in an atomic way + this'll prevent any traffic from leaking through while reloading + the firewall. However, if the reloading fails, the ‘firewall-stop’ + script will be called which in return will effectively disable the + complete firewall (in the default configuration). + +*/ + +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.networking.firewall; + + inherit (config.boot.kernelPackages) kernel; + + kernelHasRPFilter = ((kernel.config.isEnabled or (x: false)) "IP_NF_MATCH_RPFILTER") || (kernel.features.netfilterRPFilter or false); + + helpers = import ./helpers.nix { inherit config lib; }; + + writeShScript = name: text: + let + dir = pkgs.writeScriptBin name '' + #! ${pkgs.runtimeShell} -e + ${text} + ''; + in + "${dir}/bin/${name}"; + + startScript = writeShScript "firewall-start" '' + ${helpers} + + # Flush the old firewall rules. !!! Ideally, updating the + # firewall would be atomic. Apparently that's possible + # with iptables-restore. + ip46tables -D INPUT -j nixos-fw 2> /dev/null || true + for chain in nixos-fw nixos-fw-accept nixos-fw-log-refuse nixos-fw-refuse; do + ip46tables -F "$chain" 2> /dev/null || true + ip46tables -X "$chain" 2> /dev/null || true + done + + + # The "nixos-fw-accept" chain just accepts packets. + ip46tables -N nixos-fw-accept + ip46tables -A nixos-fw-accept -j ACCEPT + + + # The "nixos-fw-refuse" chain rejects or drops packets. + ip46tables -N nixos-fw-refuse + + ${if cfg.rejectPackets then '' + # Send a reset for existing TCP connections that we've + # somehow forgotten about. Send ICMP "port unreachable" + # for everything else. + ip46tables -A nixos-fw-refuse -p tcp ! --syn -j REJECT --reject-with tcp-reset + ip46tables -A nixos-fw-refuse -j REJECT + '' else '' + ip46tables -A nixos-fw-refuse -j DROP + ''} + + + # The "nixos-fw-log-refuse" chain performs logging, then + # jumps to the "nixos-fw-refuse" chain. + ip46tables -N nixos-fw-log-refuse + + ${optionalString cfg.logRefusedConnections '' + ip46tables -A nixos-fw-log-refuse -p tcp --syn -j LOG --log-level info --log-prefix "refused connection: " + ''} + ${optionalString (cfg.logRefusedPackets && !cfg.logRefusedUnicastsOnly) '' + ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type broadcast \ + -j LOG --log-level info --log-prefix "refused broadcast: " + ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type multicast \ + -j LOG --log-level info --log-prefix "refused multicast: " + ''} + ip46tables -A nixos-fw-log-refuse -m pkttype ! --pkt-type unicast -j nixos-fw-refuse + ${optionalString cfg.logRefusedPackets '' + ip46tables -A nixos-fw-log-refuse \ + -j LOG --log-level info --log-prefix "refused packet: " + ''} + ip46tables -A nixos-fw-log-refuse -j nixos-fw-refuse + + + # The "nixos-fw" chain does the actual work. + ip46tables -N nixos-fw + + # Clean up rpfilter rules + ip46tables -t mangle -D PREROUTING -j nixos-fw-rpfilter 2> /dev/null || true + ip46tables -t mangle -F nixos-fw-rpfilter 2> /dev/null || true + ip46tables -t mangle -X nixos-fw-rpfilter 2> /dev/null || true + + ${optionalString (kernelHasRPFilter && (cfg.checkReversePath != false)) '' + # Perform a reverse-path test to refuse spoofers + # For now, we just drop, as the mangle table doesn't have a log-refuse yet + ip46tables -t mangle -N nixos-fw-rpfilter 2> /dev/null || true + ip46tables -t mangle -A nixos-fw-rpfilter -m rpfilter --validmark ${optionalString (cfg.checkReversePath == "loose") "--loose"} -j RETURN + + # Allows this host to act as a DHCP4 client without first having to use APIPA + iptables -t mangle -A nixos-fw-rpfilter -p udp --sport 67 --dport 68 -j RETURN + + # Allows this host to act as a DHCPv4 server + iptables -t mangle -A nixos-fw-rpfilter -s 0.0.0.0 -d 255.255.255.255 -p udp --sport 68 --dport 67 -j RETURN + + ${optionalString cfg.logReversePathDrops '' + ip46tables -t mangle -A nixos-fw-rpfilter -j LOG --log-level info --log-prefix "rpfilter drop: " + ''} + ip46tables -t mangle -A nixos-fw-rpfilter -j DROP + + ip46tables -t mangle -A PREROUTING -j nixos-fw-rpfilter + ''} + + # Accept all traffic on the trusted interfaces. + ${flip concatMapStrings cfg.trustedInterfaces (iface: '' + ip46tables -A nixos-fw -i ${iface} -j nixos-fw-accept + '')} + + # Accept packets from established or related connections. + ip46tables -A nixos-fw -m conntrack --ctstate ESTABLISHED,RELATED -j nixos-fw-accept + + # Accept connections to the allowed TCP ports. + ${concatStrings (mapAttrsToList (iface: cfg: + concatMapStrings (port: + '' + ip46tables -A nixos-fw -p tcp --dport ${toString port} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} + '' + ) cfg.allowedTCPPorts + ) cfg.allInterfaces)} + + # Accept connections to the allowed TCP port ranges. + ${concatStrings (mapAttrsToList (iface: cfg: + concatMapStrings (rangeAttr: + let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in + '' + ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} + '' + ) cfg.allowedTCPPortRanges + ) cfg.allInterfaces)} + + # Accept packets on the allowed UDP ports. + ${concatStrings (mapAttrsToList (iface: cfg: + concatMapStrings (port: + '' + ip46tables -A nixos-fw -p udp --dport ${toString port} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} + '' + ) cfg.allowedUDPPorts + ) cfg.allInterfaces)} + + # Accept packets on the allowed UDP port ranges. + ${concatStrings (mapAttrsToList (iface: cfg: + concatMapStrings (rangeAttr: + let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in + '' + ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} + '' + ) cfg.allowedUDPPortRanges + ) cfg.allInterfaces)} + + # Optionally respond to ICMPv4 pings. + ${optionalString cfg.allowPing '' + iptables -w -A nixos-fw -p icmp --icmp-type echo-request ${optionalString (cfg.pingLimit != null) + "-m limit ${cfg.pingLimit} " + }-j nixos-fw-accept + ''} + + ${optionalString config.networking.enableIPv6 '' + # Accept all ICMPv6 messages except redirects and node + # information queries (type 139). See RFC 4890, section + # 4.4. + ip6tables -A nixos-fw -p icmpv6 --icmpv6-type redirect -j DROP + ip6tables -A nixos-fw -p icmpv6 --icmpv6-type 139 -j DROP + ip6tables -A nixos-fw -p icmpv6 -j nixos-fw-accept + + # Allow this host to act as a DHCPv6 client + ip6tables -A nixos-fw -d fe80::/64 -p udp --dport 546 -j nixos-fw-accept + ''} + + ${cfg.extraCommands} + + # Reject/drop everything else. + ip46tables -A nixos-fw -j nixos-fw-log-refuse + + + # Enable the firewall. + ip46tables -A INPUT -j nixos-fw + ''; + + stopScript = writeShScript "firewall-stop" '' + ${helpers} + + # Clean up in case reload fails + ip46tables -D INPUT -j nixos-drop 2>/dev/null || true + + # Clean up after added ruleset + ip46tables -D INPUT -j nixos-fw 2>/dev/null || true + + ${optionalString (kernelHasRPFilter && (cfg.checkReversePath != false)) '' + ip46tables -t mangle -D PREROUTING -j nixos-fw-rpfilter 2>/dev/null || true + ''} + + ${cfg.extraStopCommands} + ''; + + reloadScript = writeShScript "firewall-reload" '' + ${helpers} + + # Create a unique drop rule + ip46tables -D INPUT -j nixos-drop 2>/dev/null || true + ip46tables -F nixos-drop 2>/dev/null || true + ip46tables -X nixos-drop 2>/dev/null || true + ip46tables -N nixos-drop + ip46tables -A nixos-drop -j DROP + + # Don't allow traffic to leak out until the script has completed + ip46tables -A INPUT -j nixos-drop + + ${cfg.extraStopCommands} + + if ${startScript}; then + ip46tables -D INPUT -j nixos-drop 2>/dev/null || true + else + echo "Failed to reload firewall... Stopping" + ${stopScript} + exit 1 + fi + ''; + +in + +{ + + options = { + + networking.firewall = { + extraCommands = mkOption { + type = types.lines; + default = ""; + example = "iptables -A INPUT -p icmp -j ACCEPT"; + description = lib.mdDoc '' + Additional shell commands executed as part of the firewall + initialisation script. These are executed just before the + final "reject" firewall rule is added, so they can be used + to allow packets that would otherwise be refused. + + This option only works with the iptables based firewall. + ''; + }; + + extraStopCommands = mkOption { + type = types.lines; + default = ""; + example = "iptables -P INPUT ACCEPT"; + description = lib.mdDoc '' + Additional shell commands executed as part of the firewall + shutdown script. These are executed just after the removal + of the NixOS input rule, or if the service enters a failed + state. + + This option only works with the iptables based firewall. + ''; + }; + }; + + }; + + # FIXME: Maybe if `enable' is false, the firewall should still be + # built but not started by default? + config = mkIf (cfg.enable && config.networking.nftables.enable == false) { + + assertions = [ + # This is approximately "checkReversePath -> kernelHasRPFilter", + # but the checkReversePath option can include non-boolean + # values. + { + assertion = cfg.checkReversePath == false || kernelHasRPFilter; + message = "This kernel does not support rpfilter"; + } + ]; + + networking.firewall.checkReversePath = mkIf (!kernelHasRPFilter) (mkDefault false); + + systemd.services.firewall = { + description = "Firewall"; + wantedBy = [ "sysinit.target" ]; + wants = [ "network-pre.target" ]; + before = [ "network-pre.target" ]; + after = [ "systemd-modules-load.service" ]; + + path = [ cfg.package ] ++ cfg.extraPackages; + + # FIXME: this module may also try to load kernel modules, but + # containers don't have CAP_SYS_MODULE. So the host system had + # better have all necessary modules already loaded. + unitConfig.ConditionCapability = "CAP_NET_ADMIN"; + unitConfig.DefaultDependencies = false; + + reloadIfChanged = true; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "@${startScript} firewall-start"; + ExecReload = "@${reloadScript} firewall-reload"; + ExecStop = "@${stopScript} firewall-stop"; + }; + }; + + }; + +} diff --git a/nixos/modules/services/networking/firewall-nftables.nix b/nixos/modules/services/networking/firewall-nftables.nix new file mode 100644 index 000000000000..0ed3c228075d --- /dev/null +++ b/nixos/modules/services/networking/firewall-nftables.nix @@ -0,0 +1,167 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.networking.firewall; + + ifaceSet = concatStringsSep ", " ( + map (x: ''"${x}"'') cfg.trustedInterfaces + ); + + portsToNftSet = ports: portRanges: concatStringsSep ", " ( + map (x: toString x) ports + ++ map (x: "${toString x.from}-${toString x.to}") portRanges + ); + +in + +{ + + options = { + + networking.firewall = { + extraInputRules = mkOption { + type = types.lines; + default = ""; + example = "ip6 saddr { fc00::/7, fe80::/10 } tcp dport 24800 accept"; + description = lib.mdDoc '' + Additional nftables rules to be appended to the input-allow + chain. + + This option only works with the nftables based firewall. + ''; + }; + + extraForwardRules = mkOption { + type = types.lines; + default = ""; + example = "iifname wg0 accept"; + description = lib.mdDoc '' + Additional nftables rules to be appended to the forward-allow + chain. + + This option only works with the nftables based firewall. + ''; + }; + }; + + }; + + config = mkIf (cfg.enable && config.networking.nftables.enable) { + + assertions = [ + { + assertion = cfg.extraCommands == ""; + message = "extraCommands is incompatible with the nftables based firewall: ${cfg.extraCommands}"; + } + { + assertion = cfg.extraStopCommands == ""; + message = "extraStopCommands is incompatible with the nftables based firewall: ${cfg.extraStopCommands}"; + } + { + assertion = cfg.pingLimit == null || !(hasPrefix "--" cfg.pingLimit); + message = "nftables syntax like \"2/second\" should be used in networking.firewall.pingLimit"; + } + { + assertion = config.networking.nftables.rulesetFile == null; + message = "networking.nftables.rulesetFile conflicts with the firewall"; + } + ]; + + networking.nftables.ruleset = '' + + table inet nixos-fw { + + ${optionalString (cfg.checkReversePath != false) '' + chain rpfilter { + type filter hook prerouting priority mangle + 10; policy drop; + + meta nfproto ipv4 udp sport . udp dport { 67 . 68, 68 . 67 } accept comment "DHCPv4 client/server" + fib saddr . mark ${optionalString (cfg.checkReversePath != "loose") ". iif"} oif exists accept + + ${optionalString cfg.logReversePathDrops '' + log level info prefix "rpfilter drop: " + ''} + + } + ''} + + chain input { + type filter hook input priority filter; policy drop; + + ${optionalString (ifaceSet != "") ''iifname { ${ifaceSet} } accept comment "trusted interfaces"''} + + # Some ICMPv6 types like NDP is untracked + ct state vmap { invalid : drop, established : accept, related : accept, * : jump input-allow } comment "*: new and untracked" + + ${optionalString cfg.logRefusedConnections '' + tcp flags syn / fin,syn,rst,ack log level info prefix "refused connection: " + ''} + ${optionalString (cfg.logRefusedPackets && !cfg.logRefusedUnicastsOnly) '' + pkttype broadcast log level info prefix "refused broadcast: " + pkttype multicast log level info prefix "refused multicast: " + ''} + ${optionalString cfg.logRefusedPackets '' + pkttype host log level info prefix "refused packet: " + ''} + + ${optionalString cfg.rejectPackets '' + meta l4proto tcp reject with tcp reset + reject + ''} + + } + + chain input-allow { + + ${concatStrings (mapAttrsToList (iface: cfg: + let + ifaceExpr = optionalString (iface != "default") "iifname ${iface}"; + tcpSet = portsToNftSet cfg.allowedTCPPorts cfg.allowedTCPPortRanges; + udpSet = portsToNftSet cfg.allowedUDPPorts cfg.allowedUDPPortRanges; + in + '' + ${optionalString (tcpSet != "") "${ifaceExpr} tcp dport { ${tcpSet} } accept"} + ${optionalString (udpSet != "") "${ifaceExpr} udp dport { ${udpSet} } accept"} + '' + ) cfg.allInterfaces)} + + ${optionalString cfg.allowPing '' + icmp type echo-request ${optionalString (cfg.pingLimit != null) "limit rate ${cfg.pingLimit}"} accept comment "allow ping" + ''} + + icmpv6 type != { nd-redirect, 139 } accept comment "Accept all ICMPv6 messages except redirects and node information queries (type 139). See RFC 4890, section 4.4." + ip6 daddr fe80::/64 udp dport 546 accept comment "DHCPv6 client" + + ${cfg.extraInputRules} + + } + + ${optionalString cfg.filterForward '' + chain forward { + type filter hook forward priority filter; policy drop; + + ct state vmap { invalid : drop, established : accept, related : accept, * : jump forward-allow } comment "*: new and untracked" + + } + + chain forward-allow { + + icmpv6 type != { router-renumbering, 139 } accept comment "Accept all ICMPv6 messages except renumbering and node information queries (type 139). See RFC 4890, section 4.3." + + ct status dnat accept comment "allow port forward" + + ${cfg.extraForwardRules} + + } + ''} + + } + + ''; + + }; + +} diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 27119dcc57c5..4e332d489e4d 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -1,35 +1,3 @@ -/* This module enables a simple firewall. - - The firewall can be customised in arbitrary ways by setting - ‘networking.firewall.extraCommands’. For modularity, the firewall - uses several chains: - - - ‘nixos-fw’ is the main chain for input packet processing. - - - ‘nixos-fw-accept’ is called for accepted packets. If you want - additional logging, or want to reject certain packets anyway, you - can insert rules at the start of this chain. - - - ‘nixos-fw-log-refuse’ and ‘nixos-fw-refuse’ are called for - refused packets. (The former jumps to the latter after logging - the packet.) If you want additional logging, or want to accept - certain packets anyway, you can insert rules at the start of - this chain. - - - ‘nixos-fw-rpfilter’ is used as the main chain in the mangle table, - called from the built-in ‘PREROUTING’ chain. If the kernel - supports it and `cfg.checkReversePath` is set this chain will - perform a reverse path filter test. - - - ‘nixos-drop’ is used while reloading the firewall in order to drop - all traffic. Since reloading isn't implemented in an atomic way - this'll prevent any traffic from leaking through while reloading - the firewall. However, if the reloading fails, the ‘firewall-stop’ - script will be called which in return will effectively disable the - complete firewall (in the default configuration). - -*/ - { config, lib, pkgs, ... }: with lib; @@ -38,216 +6,6 @@ let cfg = config.networking.firewall; - inherit (config.boot.kernelPackages) kernel; - - kernelHasRPFilter = ((kernel.config.isEnabled or (x: false)) "IP_NF_MATCH_RPFILTER") || (kernel.features.netfilterRPFilter or false); - - helpers = import ./helpers.nix { inherit config lib; }; - - writeShScript = name: text: let dir = pkgs.writeScriptBin name '' - #! ${pkgs.runtimeShell} -e - ${text} - ''; in "${dir}/bin/${name}"; - - defaultInterface = { default = mapAttrs (name: value: cfg.${name}) commonOptions; }; - allInterfaces = defaultInterface // cfg.interfaces; - - startScript = writeShScript "firewall-start" '' - ${helpers} - - # Flush the old firewall rules. !!! Ideally, updating the - # firewall would be atomic. Apparently that's possible - # with iptables-restore. - ip46tables -D INPUT -j nixos-fw 2> /dev/null || true - for chain in nixos-fw nixos-fw-accept nixos-fw-log-refuse nixos-fw-refuse; do - ip46tables -F "$chain" 2> /dev/null || true - ip46tables -X "$chain" 2> /dev/null || true - done - - - # The "nixos-fw-accept" chain just accepts packets. - ip46tables -N nixos-fw-accept - ip46tables -A nixos-fw-accept -j ACCEPT - - - # The "nixos-fw-refuse" chain rejects or drops packets. - ip46tables -N nixos-fw-refuse - - ${if cfg.rejectPackets then '' - # Send a reset for existing TCP connections that we've - # somehow forgotten about. Send ICMP "port unreachable" - # for everything else. - ip46tables -A nixos-fw-refuse -p tcp ! --syn -j REJECT --reject-with tcp-reset - ip46tables -A nixos-fw-refuse -j REJECT - '' else '' - ip46tables -A nixos-fw-refuse -j DROP - ''} - - - # The "nixos-fw-log-refuse" chain performs logging, then - # jumps to the "nixos-fw-refuse" chain. - ip46tables -N nixos-fw-log-refuse - - ${optionalString cfg.logRefusedConnections '' - ip46tables -A nixos-fw-log-refuse -p tcp --syn -j LOG --log-level info --log-prefix "refused connection: " - ''} - ${optionalString (cfg.logRefusedPackets && !cfg.logRefusedUnicastsOnly) '' - ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type broadcast \ - -j LOG --log-level info --log-prefix "refused broadcast: " - ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type multicast \ - -j LOG --log-level info --log-prefix "refused multicast: " - ''} - ip46tables -A nixos-fw-log-refuse -m pkttype ! --pkt-type unicast -j nixos-fw-refuse - ${optionalString cfg.logRefusedPackets '' - ip46tables -A nixos-fw-log-refuse \ - -j LOG --log-level info --log-prefix "refused packet: " - ''} - ip46tables -A nixos-fw-log-refuse -j nixos-fw-refuse - - - # The "nixos-fw" chain does the actual work. - ip46tables -N nixos-fw - - # Clean up rpfilter rules - ip46tables -t mangle -D PREROUTING -j nixos-fw-rpfilter 2> /dev/null || true - ip46tables -t mangle -F nixos-fw-rpfilter 2> /dev/null || true - ip46tables -t mangle -X nixos-fw-rpfilter 2> /dev/null || true - - ${optionalString (kernelHasRPFilter && (cfg.checkReversePath != false)) '' - # Perform a reverse-path test to refuse spoofers - # For now, we just drop, as the mangle table doesn't have a log-refuse yet - ip46tables -t mangle -N nixos-fw-rpfilter 2> /dev/null || true - ip46tables -t mangle -A nixos-fw-rpfilter -m rpfilter --validmark ${optionalString (cfg.checkReversePath == "loose") "--loose"} -j RETURN - - # Allows this host to act as a DHCP4 client without first having to use APIPA - iptables -t mangle -A nixos-fw-rpfilter -p udp --sport 67 --dport 68 -j RETURN - - # Allows this host to act as a DHCPv4 server - iptables -t mangle -A nixos-fw-rpfilter -s 0.0.0.0 -d 255.255.255.255 -p udp --sport 68 --dport 67 -j RETURN - - ${optionalString cfg.logReversePathDrops '' - ip46tables -t mangle -A nixos-fw-rpfilter -j LOG --log-level info --log-prefix "rpfilter drop: " - ''} - ip46tables -t mangle -A nixos-fw-rpfilter -j DROP - - ip46tables -t mangle -A PREROUTING -j nixos-fw-rpfilter - ''} - - # Accept all traffic on the trusted interfaces. - ${flip concatMapStrings cfg.trustedInterfaces (iface: '' - ip46tables -A nixos-fw -i ${iface} -j nixos-fw-accept - '')} - - # Accept packets from established or related connections. - ip46tables -A nixos-fw -m conntrack --ctstate ESTABLISHED,RELATED -j nixos-fw-accept - - # Accept connections to the allowed TCP ports. - ${concatStrings (mapAttrsToList (iface: cfg: - concatMapStrings (port: - '' - ip46tables -A nixos-fw -p tcp --dport ${toString port} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} - '' - ) cfg.allowedTCPPorts - ) allInterfaces)} - - # Accept connections to the allowed TCP port ranges. - ${concatStrings (mapAttrsToList (iface: cfg: - concatMapStrings (rangeAttr: - let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in - '' - ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} - '' - ) cfg.allowedTCPPortRanges - ) allInterfaces)} - - # Accept packets on the allowed UDP ports. - ${concatStrings (mapAttrsToList (iface: cfg: - concatMapStrings (port: - '' - ip46tables -A nixos-fw -p udp --dport ${toString port} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} - '' - ) cfg.allowedUDPPorts - ) allInterfaces)} - - # Accept packets on the allowed UDP port ranges. - ${concatStrings (mapAttrsToList (iface: cfg: - concatMapStrings (rangeAttr: - let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in - '' - ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} - '' - ) cfg.allowedUDPPortRanges - ) allInterfaces)} - - # Optionally respond to ICMPv4 pings. - ${optionalString cfg.allowPing '' - iptables -w -A nixos-fw -p icmp --icmp-type echo-request ${optionalString (cfg.pingLimit != null) - "-m limit ${cfg.pingLimit} " - }-j nixos-fw-accept - ''} - - ${optionalString config.networking.enableIPv6 '' - # Accept all ICMPv6 messages except redirects and node - # information queries (type 139). See RFC 4890, section - # 4.4. - ip6tables -A nixos-fw -p icmpv6 --icmpv6-type redirect -j DROP - ip6tables -A nixos-fw -p icmpv6 --icmpv6-type 139 -j DROP - ip6tables -A nixos-fw -p icmpv6 -j nixos-fw-accept - - # Allow this host to act as a DHCPv6 client - ip6tables -A nixos-fw -d fe80::/64 -p udp --dport 546 -j nixos-fw-accept - ''} - - ${cfg.extraCommands} - - # Reject/drop everything else. - ip46tables -A nixos-fw -j nixos-fw-log-refuse - - - # Enable the firewall. - ip46tables -A INPUT -j nixos-fw - ''; - - stopScript = writeShScript "firewall-stop" '' - ${helpers} - - # Clean up in case reload fails - ip46tables -D INPUT -j nixos-drop 2>/dev/null || true - - # Clean up after added ruleset - ip46tables -D INPUT -j nixos-fw 2>/dev/null || true - - ${optionalString (kernelHasRPFilter && (cfg.checkReversePath != false)) '' - ip46tables -t mangle -D PREROUTING -j nixos-fw-rpfilter 2>/dev/null || true - ''} - - ${cfg.extraStopCommands} - ''; - - reloadScript = writeShScript "firewall-reload" '' - ${helpers} - - # Create a unique drop rule - ip46tables -D INPUT -j nixos-drop 2>/dev/null || true - ip46tables -F nixos-drop 2>/dev/null || true - ip46tables -X nixos-drop 2>/dev/null || true - ip46tables -N nixos-drop - ip46tables -A nixos-drop -j DROP - - # Don't allow traffic to leak out until the script has completed - ip46tables -A INPUT -j nixos-drop - - ${cfg.extraStopCommands} - - if ${startScript}; then - ip46tables -D INPUT -j nixos-drop 2>/dev/null || true - else - echo "Failed to reload firewall... Stopping" - ${stopScript} - exit 1 - fi - ''; - canonicalizePortList = ports: lib.unique (builtins.sort builtins.lessThan ports); @@ -257,22 +15,20 @@ let default = [ ]; apply = canonicalizePortList; example = [ 22 80 ]; - description = - lib.mdDoc '' - List of TCP ports on which incoming connections are - accepted. - ''; + description = lib.mdDoc '' + List of TCP ports on which incoming connections are + accepted. + ''; }; allowedTCPPortRanges = mkOption { type = types.listOf (types.attrsOf types.port); default = [ ]; - example = [ { from = 8999; to = 9003; } ]; - description = - lib.mdDoc '' - A range of TCP ports on which incoming connections are - accepted. - ''; + example = [{ from = 8999; to = 9003; }]; + description = lib.mdDoc '' + A range of TCP ports on which incoming connections are + accepted. + ''; }; allowedUDPPorts = mkOption { @@ -280,20 +36,18 @@ let default = [ ]; apply = canonicalizePortList; example = [ 53 ]; - description = - lib.mdDoc '' - List of open UDP ports. - ''; + description = lib.mdDoc '' + List of open UDP ports. + ''; }; allowedUDPPortRanges = mkOption { type = types.listOf (types.attrsOf types.port); default = [ ]; - example = [ { from = 60000; to = 61000; } ]; - description = - lib.mdDoc '' - Range of open UDP ports. - ''; + example = [{ from = 60000; to = 61000; }]; + description = lib.mdDoc '' + Range of open UDP ports. + ''; }; }; @@ -301,240 +55,222 @@ in { - ###### interface - options = { networking.firewall = { enable = mkOption { type = types.bool; default = true; - description = - lib.mdDoc '' - Whether to enable the firewall. This is a simple stateful - firewall that blocks connection attempts to unauthorised TCP - or UDP ports on this machine. It does not affect packet - forwarding. - ''; + description = lib.mdDoc '' + Whether to enable the firewall. This is a simple stateful + firewall that blocks connection attempts to unauthorised TCP + or UDP ports on this machine. + ''; }; package = mkOption { type = types.package; - default = pkgs.iptables; - defaultText = literalExpression "pkgs.iptables"; + default = if config.networking.nftables.enable then pkgs.nftables else pkgs.iptables; + defaultText = literalExpression ''if config.networking.nftables.enable then "pkgs.nftables" else "pkgs.iptables"''; example = literalExpression "pkgs.iptables-legacy"; - description = - lib.mdDoc '' - The iptables package to use for running the firewall service. - ''; + description = lib.mdDoc '' + The package to use for running the firewall service. + ''; }; logRefusedConnections = mkOption { type = types.bool; default = true; - description = - lib.mdDoc '' - Whether to log rejected or dropped incoming connections. - Note: The logs are found in the kernel logs, i.e. dmesg - or journalctl -k. - ''; + description = lib.mdDoc '' + Whether to log rejected or dropped incoming connections. + Note: The logs are found in the kernel logs, i.e. dmesg + or journalctl -k. + ''; }; logRefusedPackets = mkOption { type = types.bool; default = false; - description = - lib.mdDoc '' - Whether to log all rejected or dropped incoming packets. - This tends to give a lot of log messages, so it's mostly - useful for debugging. - Note: The logs are found in the kernel logs, i.e. dmesg - or journalctl -k. - ''; + description = lib.mdDoc '' + Whether to log all rejected or dropped incoming packets. + This tends to give a lot of log messages, so it's mostly + useful for debugging. + Note: The logs are found in the kernel logs, i.e. dmesg + or journalctl -k. + ''; }; logRefusedUnicastsOnly = mkOption { type = types.bool; default = true; - description = - lib.mdDoc '' - If {option}`networking.firewall.logRefusedPackets` - and this option are enabled, then only log packets - specifically directed at this machine, i.e., not broadcasts - or multicasts. - ''; + description = lib.mdDoc '' + If {option}`networking.firewall.logRefusedPackets` + and this option are enabled, then only log packets + specifically directed at this machine, i.e., not broadcasts + or multicasts. + ''; }; rejectPackets = mkOption { type = types.bool; default = false; - description = - lib.mdDoc '' - If set, refused packets are rejected rather than dropped - (ignored). This means that an ICMP "port unreachable" error - message is sent back to the client (or a TCP RST packet in - case of an existing connection). Rejecting packets makes - port scanning somewhat easier. - ''; + description = lib.mdDoc '' + If set, refused packets are rejected rather than dropped + (ignored). This means that an ICMP "port unreachable" error + message is sent back to the client (or a TCP RST packet in + case of an existing connection). Rejecting packets makes + port scanning somewhat easier. + ''; }; trustedInterfaces = mkOption { type = types.listOf types.str; default = [ ]; example = [ "enp0s2" ]; - description = - lib.mdDoc '' - Traffic coming in from these interfaces will be accepted - unconditionally. Traffic from the loopback (lo) interface - will always be accepted. - ''; + description = lib.mdDoc '' + Traffic coming in from these interfaces will be accepted + unconditionally. Traffic from the loopback (lo) interface + will always be accepted. + ''; }; allowPing = mkOption { type = types.bool; default = true; - description = - lib.mdDoc '' - Whether to respond to incoming ICMPv4 echo requests - ("pings"). ICMPv6 pings are always allowed because the - larger address space of IPv6 makes network scanning much - less effective. - ''; + description = lib.mdDoc '' + Whether to respond to incoming ICMPv4 echo requests + ("pings"). ICMPv6 pings are always allowed because the + larger address space of IPv6 makes network scanning much + less effective. + ''; }; pingLimit = mkOption { type = types.nullOr (types.separatedString " "); default = null; example = "--limit 1/minute --limit-burst 5"; - description = - lib.mdDoc '' - If pings are allowed, this allows setting rate limits - on them. If non-null, this option should be in the form of - flags like "--limit 1/minute --limit-burst 5" - ''; + description = lib.mdDoc '' + If pings are allowed, this allows setting rate limits on them. + + For the iptables based firewall, it should be set like + "--limit 1/minute --limit-burst 5". + + For the nftables based firewall, it should be set like + "2/second" or "1/minute burst 5 packets". + ''; }; checkReversePath = mkOption { - type = types.either types.bool (types.enum ["strict" "loose"]); - default = kernelHasRPFilter; - defaultText = literalMD "`true` if supported by the chosen kernel"; + type = types.either types.bool (types.enum [ "strict" "loose" ]); + default = true; + defaultText = literalMD "`true` except if the iptables based firewall is in use and the kernel lacks rpfilter support"; example = "loose"; - description = - lib.mdDoc '' - Performs a reverse path filter test on a packet. If a reply - to the packet would not be sent via the same interface that - the packet arrived on, it is refused. + description = lib.mdDoc '' + Performs a reverse path filter test on a packet. If a reply + to the packet would not be sent via the same interface that + the packet arrived on, it is refused. - If using asymmetric routing or other complicated routing, set - this option to loose mode or disable it and setup your own - counter-measures. + If using asymmetric routing or other complicated routing, set + this option to loose mode or disable it and setup your own + counter-measures. - This option can be either true (or "strict"), "loose" (only - drop the packet if the source address is not reachable via any - interface) or false. Defaults to the value of - kernelHasRPFilter. - ''; + This option can be either true (or "strict"), "loose" (only + drop the packet if the source address is not reachable via any + interface) or false. + ''; }; logReversePathDrops = mkOption { type = types.bool; default = false; - description = - lib.mdDoc '' - Logs dropped packets failing the reverse path filter test if - the option networking.firewall.checkReversePath is enabled. - ''; + description = lib.mdDoc '' + Logs dropped packets failing the reverse path filter test if + the option networking.firewall.checkReversePath is enabled. + ''; + }; + + filterForward = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Enable filtering in IP forwarding. + + This option only works with the nftables based firewall. + ''; }; connectionTrackingModules = mkOption { type = types.listOf types.str; default = [ ]; example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ]; - description = - lib.mdDoc '' - List of connection-tracking helpers that are auto-loaded. - The complete list of possible values is given in the example. + description = lib.mdDoc '' + List of connection-tracking helpers that are auto-loaded. + The complete list of possible values is given in the example. - As helpers can pose as a security risk, it is advised to - set this to an empty list and disable the setting - networking.firewall.autoLoadConntrackHelpers unless you - know what you are doing. Connection tracking is disabled - by default. + As helpers can pose as a security risk, it is advised to + set this to an empty list and disable the setting + networking.firewall.autoLoadConntrackHelpers unless you + know what you are doing. Connection tracking is disabled + by default. - Loading of helpers is recommended to be done through the - CT target. More info: - https://home.regit.org/netfilter-en/secure-use-of-helpers/ - ''; + Loading of helpers is recommended to be done through the + CT target. More info: + https://home.regit.org/netfilter-en/secure-use-of-helpers/ + ''; }; autoLoadConntrackHelpers = mkOption { type = types.bool; default = false; - description = - lib.mdDoc '' - Whether to auto-load connection-tracking helpers. - See the description at networking.firewall.connectionTrackingModules + description = lib.mdDoc '' + Whether to auto-load connection-tracking helpers. + See the description at networking.firewall.connectionTrackingModules - (needs kernel 3.5+) - ''; - }; - - extraCommands = mkOption { - type = types.lines; - default = ""; - example = "iptables -A INPUT -p icmp -j ACCEPT"; - description = - lib.mdDoc '' - Additional shell commands executed as part of the firewall - initialisation script. These are executed just before the - final "reject" firewall rule is added, so they can be used - to allow packets that would otherwise be refused. - ''; + (needs kernel 3.5+) + ''; }; extraPackages = mkOption { type = types.listOf types.package; default = [ ]; example = literalExpression "[ pkgs.ipset ]"; - description = - lib.mdDoc '' - Additional packages to be included in the environment of the system - as well as the path of networking.firewall.extraCommands. - ''; - }; - - extraStopCommands = mkOption { - type = types.lines; - default = ""; - example = "iptables -P INPUT ACCEPT"; - description = - lib.mdDoc '' - Additional shell commands executed as part of the firewall - shutdown script. These are executed just after the removal - of the NixOS input rule, or if the service enters a failed - state. - ''; + description = lib.mdDoc '' + Additional packages to be included in the environment of the system + as well as the path of networking.firewall.extraCommands. + ''; }; interfaces = mkOption { default = { }; - type = with types; attrsOf (submodule [ { options = commonOptions; } ]); - description = - lib.mdDoc '' - Interface-specific open ports. - ''; + type = with types; attrsOf (submodule [{ options = commonOptions; }]); + description = lib.mdDoc '' + Interface-specific open ports. + ''; + }; + + allInterfaces = mkOption { + internal = true; + visible = false; + default = { default = mapAttrs (name: value: cfg.${name}) commonOptions; } // cfg.interfaces; + type = with types; attrsOf (submodule [{ options = commonOptions; }]); + description = lib.mdDoc '' + All open ports. + ''; }; } // commonOptions; }; - ###### implementation - - # FIXME: Maybe if `enable' is false, the firewall should still be - # built but not started by default? config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.filterForward -> config.networking.nftables.enable; + message = "filterForward only works with the nftables based firewall"; + } + ]; + networking.firewall.trustedInterfaces = [ "lo" ]; environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages; @@ -545,40 +281,6 @@ in options nf_conntrack nf_conntrack_helper=1 ''; - assertions = [ - # This is approximately "checkReversePath -> kernelHasRPFilter", - # but the checkReversePath option can include non-boolean - # values. - { assertion = cfg.checkReversePath == false || kernelHasRPFilter; - message = "This kernel does not support rpfilter"; } - ]; - - systemd.services.firewall = { - description = "Firewall"; - wantedBy = [ "sysinit.target" ]; - wants = [ "network-pre.target" ]; - before = [ "network-pre.target" ]; - after = [ "systemd-modules-load.service" ]; - - path = [ cfg.package ] ++ cfg.extraPackages; - - # FIXME: this module may also try to load kernel modules, but - # containers don't have CAP_SYS_MODULE. So the host system had - # better have all necessary modules already loaded. - unitConfig.ConditionCapability = "CAP_NET_ADMIN"; - unitConfig.DefaultDependencies = false; - - reloadIfChanged = true; - - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "@${startScript} firewall-start"; - ExecReload = "@${reloadScript} firewall-reload"; - ExecStop = "@${stopScript} firewall-stop"; - }; - }; - }; } diff --git a/nixos/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix index 9d1c9746f728..301fe021b0aa 100644 --- a/nixos/modules/services/networking/gnunet.nix +++ b/nixos/modules/services/networking/gnunet.nix @@ -124,8 +124,8 @@ in type = types.lines; default = ""; description = lib.mdDoc '' - Additional options that will be copied verbatim in `gnunet.conf'. - See `gnunet.conf(5)' for details. + Additional options that will be copied verbatim in `gnunet.conf`. + See {manpage}`gnunet.conf(5)` for details. ''; }; }; diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix index ffb2ee841c64..3ea95b3bdae9 100644 --- a/nixos/modules/services/networking/hans.nix +++ b/nixos/modules/services/networking/hans.nix @@ -55,7 +55,7 @@ in passwordFile = mkOption { type = types.str; default = ""; - description = lib.mdDoc "File that containts password"; + description = lib.mdDoc "File that contains password"; }; }; @@ -92,7 +92,7 @@ in passwordFile = mkOption { type = types.str; default = ""; - description = lib.mdDoc "File that containts password"; + description = lib.mdDoc "File that contains password"; }; }; diff --git a/nixos/modules/services/networking/headscale.nix b/nixos/modules/services/networking/headscale.nix index 0334c5a00bab..cc46819eed5a 100644 --- a/nixos/modules/services/networking/headscale.nix +++ b/nixos/modules/services/networking/headscale.nix @@ -1,15 +1,18 @@ -{ config, lib, pkgs, ... }: -with lib; -let +{ + config, + lib, + pkgs, + ... +}: +with lib; let cfg = config.services.headscale; dataDir = "/var/lib/headscale"; runDir = "/run/headscale"; - settingsFormat = pkgs.formats.yaml { }; + settingsFormat = pkgs.formats.yaml {}; configFile = settingsFormat.generate "headscale.yaml" cfg.settings; -in -{ +in { options = { services.headscale = { enable = mkEnableOption (lib.mdDoc "headscale, Open Source coordination server for Tailscale"); @@ -51,15 +54,6 @@ in ''; }; - serverUrl = mkOption { - type = types.str; - default = "http://127.0.0.1:8080"; - description = lib.mdDoc '' - The url clients will connect to. - ''; - example = "https://myheadscale.example.com:443"; - }; - address = mkOption { type = types.str; default = "127.0.0.1"; @@ -78,337 +72,346 @@ in example = 443; }; - privateKeyFile = mkOption { - type = types.path; - default = "${dataDir}/private.key"; - description = lib.mdDoc '' - 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 = lib.mdDoc '' - List of urls containing DERP maps. - See [How Tailscale works](https://tailscale.com/blog/how-tailscale-works/) for more information on DERP maps. - ''; - }; - - paths = mkOption { - type = types.listOf types.path; - default = [ ]; - description = lib.mdDoc '' - List of file paths containing DERP maps. - See [How Tailscale works](https://tailscale.com/blog/how-tailscale-works/) for more information on DERP maps. - ''; - }; - - - autoUpdate = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether to automatically update DERP maps on a set frequency. - ''; - example = false; - }; - - updateFrequency = mkOption { - type = types.str; - default = "24h"; - description = lib.mdDoc '' - Frequency to update DERP maps. - ''; - example = "5m"; - }; - - }; - - ephemeralNodeInactivityTimeout = mkOption { - type = types.str; - default = "30m"; - description = lib.mdDoc '' - Time before an inactive ephemeral node is deleted. - ''; - example = "5m"; - }; - - database = { - type = mkOption { - type = types.enum [ "sqlite3" "postgres" ]; - example = "postgres"; - default = "sqlite3"; - description = lib.mdDoc "Database engine to use."; - }; - - host = mkOption { - type = types.nullOr types.str; - default = null; - example = "127.0.0.1"; - description = lib.mdDoc "Database host address."; - }; - - port = mkOption { - type = types.nullOr types.port; - default = null; - example = 3306; - description = lib.mdDoc "Database host port."; - }; - - name = mkOption { - type = types.nullOr types.str; - default = null; - example = "headscale"; - description = lib.mdDoc "Database name."; - }; - - user = mkOption { - type = types.nullOr types.str; - default = null; - example = "headscale"; - description = lib.mdDoc "Database user."; - }; - - passwordFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/run/keys/headscale-dbpassword"; - description = lib.mdDoc '' - A file containing the password corresponding to - {option}`database.user`. - ''; - }; - - path = mkOption { - type = types.nullOr types.str; - default = "${dataDir}/db.sqlite"; - description = lib.mdDoc "Path to the sqlite3 database file."; - }; - }; - - logLevel = mkOption { - type = types.str; - default = "info"; - description = lib.mdDoc '' - headscale log level. - ''; - example = "debug"; - }; - - dns = { - nameservers = mkOption { - type = types.listOf types.str; - default = [ "1.1.1.1" ]; - description = lib.mdDoc '' - List of nameservers to pass to Tailscale clients. - ''; - }; - - domains = mkOption { - type = types.listOf types.str; - default = [ ]; - description = lib.mdDoc '' - Search domains to inject to Tailscale clients. - ''; - example = [ "mydomain.internal" ]; - }; - - magicDns = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - 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 = lib.mdDoc '' - Defines the base domain to create the hostnames for MagicDNS. - {option}`baseDomain` 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 = lib.mdDoc '' - URL to OpenID issuer. - ''; - example = "https://openid.example.com"; - }; - - clientId = mkOption { - type = types.str; - default = ""; - description = lib.mdDoc '' - OpenID Connect client ID. - ''; - }; - - clientSecretFile = mkOption { - type = types.nullOr types.path; - default = null; - description = lib.mdDoc '' - Path to OpenID Connect client secret file. - ''; - }; - - domainMap = mkOption { - type = types.attrsOf types.str; - default = { }; - description = lib.mdDoc '' - 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 = lib.mdDoc '' - Domain name to request a TLS certificate for. - ''; - }; - challengeType = mkOption { - type = types.enum [ "TLS-ALPN-01" "HTTP-01" ]; - default = "HTTP-01"; - description = lib.mdDoc '' - 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 = lib.mdDoc '' - 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 = lib.mdDoc '' - Path to already created certificate. - ''; - }; - keyFile = mkOption { - type = types.nullOr types.path; - default = null; - description = lib.mdDoc '' - Path to key for already created certificate. - ''; - }; - }; - - aclPolicyFile = mkOption { - type = types.nullOr types.path; - default = null; - description = lib.mdDoc '' - Path to a file containg ACL policies. - ''; - }; - settings = mkOption { - type = settingsFormat.type; - default = { }; description = lib.mdDoc '' Overrides to {file}`config.yaml` as a Nix attribute set. - This option is ideal for overriding settings not exposed as Nix options. Check the [example config](https://github.com/juanfont/headscale/blob/main/config-example.yaml) for possible options. ''; + type = types.submodule { + freeformType = settingsFormat.type; + + options = { + server_url = mkOption { + type = types.str; + default = "http://127.0.0.1:8080"; + description = lib.mdDoc '' + The url clients will connect to. + ''; + example = "https://myheadscale.example.com:443"; + }; + + private_key_path = mkOption { + type = types.path; + default = "${dataDir}/private.key"; + description = lib.mdDoc '' + Path to private key file, generated automatically if it does not exist. + ''; + }; + + noise.private_key_path = mkOption { + type = types.path; + default = "${dataDir}/noise_private.key"; + description = lib.mdDoc '' + Path to noise 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 = lib.mdDoc '' + List of urls containing DERP maps. + See [How Tailscale works](https://tailscale.com/blog/how-tailscale-works/) for more information on DERP maps. + ''; + }; + + paths = mkOption { + type = types.listOf types.path; + default = []; + description = lib.mdDoc '' + List of file paths containing DERP maps. + See [How Tailscale works](https://tailscale.com/blog/how-tailscale-works/) for more information on DERP maps. + ''; + }; + + auto_update_enable = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether to automatically update DERP maps on a set frequency. + ''; + example = false; + }; + + update_frequency = mkOption { + type = types.str; + default = "24h"; + description = lib.mdDoc '' + Frequency to update DERP maps. + ''; + example = "5m"; + }; + }; + + ephemeral_node_inactivity_timeout = mkOption { + type = types.str; + default = "30m"; + description = lib.mdDoc '' + Time before an inactive ephemeral node is deleted. + ''; + example = "5m"; + }; + + db_type = mkOption { + type = types.enum ["sqlite3" "postgres"]; + example = "postgres"; + default = "sqlite3"; + description = lib.mdDoc "Database engine to use."; + }; + + db_host = mkOption { + type = types.nullOr types.str; + default = null; + example = "127.0.0.1"; + description = lib.mdDoc "Database host address."; + }; + + db_port = mkOption { + type = types.nullOr types.port; + default = null; + example = 3306; + description = lib.mdDoc "Database host port."; + }; + + db_name = mkOption { + type = types.nullOr types.str; + default = null; + example = "headscale"; + description = lib.mdDoc "Database name."; + }; + + db_user = mkOption { + type = types.nullOr types.str; + default = null; + example = "headscale"; + description = lib.mdDoc "Database user."; + }; + + db_password_file = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/headscale-dbpassword"; + description = lib.mdDoc '' + A file containing the password corresponding to + {option}`database.user`. + ''; + }; + + db_path = mkOption { + type = types.nullOr types.str; + default = "${dataDir}/db.sqlite"; + description = lib.mdDoc "Path to the sqlite3 database file."; + }; + + log.level = mkOption { + type = types.str; + default = "info"; + description = lib.mdDoc '' + headscale log level. + ''; + example = "debug"; + }; + + log.format = mkOption { + type = types.str; + default = "text"; + description = lib.mdDoc '' + headscale log format. + ''; + example = "json"; + }; + + dns_config = { + nameservers = mkOption { + type = types.listOf types.str; + default = ["1.1.1.1"]; + description = lib.mdDoc '' + List of nameservers to pass to Tailscale clients. + ''; + }; + + override_local_dns = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to use [Override local DNS](https://tailscale.com/kb/1054/dns/). + ''; + example = true; + }; + + domains = mkOption { + type = types.listOf types.str; + default = []; + description = lib.mdDoc '' + Search domains to inject to Tailscale clients. + ''; + example = ["mydomain.internal"]; + }; + + magic_dns = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether to use [MagicDNS](https://tailscale.com/kb/1081/magicdns/). + Only works if there is at least a nameserver defined. + ''; + example = false; + }; + + base_domain = mkOption { + type = types.str; + default = ""; + description = lib.mdDoc '' + Defines the base domain to create the hostnames for MagicDNS. + {option}`baseDomain` 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`). + ''; + }; + }; + + oidc = { + issuer = mkOption { + type = types.str; + default = ""; + description = lib.mdDoc '' + URL to OpenID issuer. + ''; + example = "https://openid.example.com"; + }; + + client_id = mkOption { + type = types.str; + default = ""; + description = lib.mdDoc '' + OpenID Connect client ID. + ''; + }; + + client_secret_file = mkOption { + type = types.nullOr types.path; + default = null; + description = lib.mdDoc '' + Path to OpenID Connect client secret file. + ''; + }; + + domain_map = mkOption { + type = types.attrsOf types.str; + default = {}; + description = lib.mdDoc '' + 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 = lib.mdDoc '' + Domain name to request a TLS certificate for. + ''; + }; + + tls_letsencrypt_challenge_type = mkOption { + type = types.enum ["TLS-ALPN-01" "HTTP-01"]; + default = "HTTP-01"; + description = lib.mdDoc '' + Type of ACME challenge to use, currently supported types: + `HTTP-01` or `TLS-ALPN-01`. + ''; + }; + + tls_letsencrypt_listen = mkOption { + type = types.nullOr types.str; + default = ":http"; + description = lib.mdDoc '' + When HTTP-01 challenge is chosen, letsencrypt must set up a + verification endpoint, and it will be listening on: + `:http = port 80`. + ''; + }; + + tls_cert_path = mkOption { + type = types.nullOr types.path; + default = null; + description = lib.mdDoc '' + Path to already created certificate. + ''; + }; + + tls_key_path = mkOption { + type = types.nullOr types.path; + default = null; + description = lib.mdDoc '' + Path to key for already created certificate. + ''; + }; + + acl_policy_path = mkOption { + type = types.nullOr types.path; + default = null; + description = lib.mdDoc '' + Path to a file containg ACL policies. + ''; + }; + }; + }; }; - - }; - }; + + imports = [ + # TODO address + port = listen_addr + (mkRenamedOptionModule ["services" "headscale" "serverUrl"] ["services" "headscale" "settings" "server_url"]) + (mkRenamedOptionModule ["services" "headscale" "privateKeyFile"] ["services" "headscale" "settings" "private_key_path"]) + (mkRenamedOptionModule ["services" "headscale" "derp" "urls"] ["services" "headscale" "settings" "derp" "urls"]) + (mkRenamedOptionModule ["services" "headscale" "derp" "paths"] ["services" "headscale" "settings" "derp" "paths"]) + (mkRenamedOptionModule ["services" "headscale" "derp" "autoUpdate"] ["services" "headscale" "settings" "derp" "auto_update_enable"]) + (mkRenamedOptionModule ["services" "headscale" "derp" "updateFrequency"] ["services" "headscale" "settings" "derp" "update_frequency"]) + (mkRenamedOptionModule ["services" "headscale" "ephemeralNodeInactivityTimeout"] ["services" "headscale" "settings" "ephemeral_node_inactivity_timeout"]) + (mkRenamedOptionModule ["services" "headscale" "database" "type"] ["services" "headscale" "settings" "db_type"]) + (mkRenamedOptionModule ["services" "headscale" "database" "path"] ["services" "headscale" "settings" "db_path"]) + (mkRenamedOptionModule ["services" "headscale" "database" "host"] ["services" "headscale" "settings" "db_host"]) + (mkRenamedOptionModule ["services" "headscale" "database" "port"] ["services" "headscale" "settings" "db_port"]) + (mkRenamedOptionModule ["services" "headscale" "database" "name"] ["services" "headscale" "settings" "db_name"]) + (mkRenamedOptionModule ["services" "headscale" "database" "user"] ["services" "headscale" "settings" "db_user"]) + (mkRenamedOptionModule ["services" "headscale" "database" "passwordFile"] ["services" "headscale" "settings" "db_password_file"]) + (mkRenamedOptionModule ["services" "headscale" "logLevel"] ["services" "headscale" "settings" "log" "level"]) + (mkRenamedOptionModule ["services" "headscale" "dns" "nameservers"] ["services" "headscale" "settings" "dns_config" "nameservers"]) + (mkRenamedOptionModule ["services" "headscale" "dns" "domains"] ["services" "headscale" "settings" "dns_config" "domains"]) + (mkRenamedOptionModule ["services" "headscale" "dns" "magicDns"] ["services" "headscale" "settings" "dns_config" "magic_dns"]) + (mkRenamedOptionModule ["services" "headscale" "dns" "baseDomain"] ["services" "headscale" "settings" "dns_config" "base_domain"]) + (mkRenamedOptionModule ["services" "headscale" "openIdConnect" "issuer"] ["services" "headscale" "settings" "oidc" "issuer"]) + (mkRenamedOptionModule ["services" "headscale" "openIdConnect" "clientId"] ["services" "headscale" "settings" "oidc" "client_id"]) + (mkRenamedOptionModule ["services" "headscale" "openIdConnect" "clientSecretFile"] ["services" "headscale" "settings" "oidc" "client_secret_file"]) + (mkRenamedOptionModule ["services" "headscale" "openIdConnect" "domainMap"] ["services" "headscale" "settings" "oidc" "domain_map"]) + (mkRenamedOptionModule ["services" "headscale" "tls" "letsencrypt" "hostname"] ["services" "headscale" "settings" "tls_letsencrypt_hostname"]) + (mkRenamedOptionModule ["services" "headscale" "tls" "letsencrypt" "challengeType"] ["services" "headscale" "settings" "tls_letsencrypt_challenge_type"]) + (mkRenamedOptionModule ["services" "headscale" "tls" "letsencrypt" "httpListen"] ["services" "headscale" "settings" "tls_letsencrypt_listen"]) + (mkRenamedOptionModule ["services" "headscale" "tls" "certFile"] ["services" "headscale" "settings" "tls_cert_path"]) + (mkRenamedOptionModule ["services" "headscale" "tls" "keyFile"] ["services" "headscale" "settings" "tls_key_path"]) + (mkRenamedOptionModule ["services" "headscale" "aclPolicyFile"] ["services" "headscale" "settings" "acl_policy_path"]) + ]; + 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 @@ -416,7 +419,7 @@ in # for communication. environment.etc."headscale/config.yaml".source = configFile; - users.groups.headscale = mkIf (cfg.group == "headscale") { }; + users.groups.headscale = mkIf (cfg.group == "headscale") {}; users.users.headscale = mkIf (cfg.user == "headscale") { description = "headscale user"; @@ -427,70 +430,68 @@ in systemd.services.headscale = { description = "headscale coordination server for Tailscale"; - after = [ "network-online.target" ]; - wantedBy = [ "multi-user.target" ]; - restartTriggers = [ configFile ]; + after = ["network-online.target"]; + wantedBy = ["multi-user.target"]; + restartTriggers = [configFile]; environment.GIN_MODE = "release"; script = '' - ${optionalString (cfg.database.passwordFile != null) '' - export HEADSCALE_DB_PASS="$(head -n1 ${escapeShellArg cfg.database.passwordFile})" + ${optionalString (cfg.settings.db_password_file != null) '' + export HEADSCALE_DB_PASS="$(head -n1 ${escapeShellArg cfg.settings.db_password_file})" ''} - ${optionalString (cfg.openIdConnect.clientSecretFile != null) '' - export HEADSCALE_OIDC_CLIENT_SECRET="$(head -n1 ${escapeShellArg cfg.openIdConnect.clientSecretFile})" + ${optionalString (cfg.settings.oidc.client_secret_file != null) '' + export HEADSCALE_OIDC_CLIENT_SECRET="$(head -n1 ${escapeShellArg cfg.settings.oidc.client_secret_file})" ''} 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; + 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"; + # Hardening options + RuntimeDirectory = "headscale"; + # Allow headscale group access so users can be added and use the CLI. + RuntimeDirectoryMode = "0750"; - StateDirectory = "headscale"; - StateDirectoryMode = "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"; + 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" "~@privileged" "@chown" ]; - SystemCallArchitectures = "native"; - RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX"; - }; + CapabilityBoundingSet = capabilityBoundingSet; + AmbientCapabilities = capabilityBoundingSet; + NoNewPrivileges = true; + LockPersonality = true; + RestrictRealtime = true; + SystemCallFilter = ["@system-service" "~@privileged" "@chown"]; + SystemCallArchitectures = "native"; + RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX"; + }; }; }; - meta.maintainers = with maintainers; [ kradalby ]; + meta.maintainers = with maintainers; [kradalby misterio77]; } diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 63bb44256dd6..f13457fcde25 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -94,7 +94,8 @@ in }; ssid = mkOption { - default = "nixos"; + default = config.system.nixos.distroId; + defaultText = literalExpression "config.system.nixos.distroId"; example = "mySpecialSSID"; type = types.str; description = lib.mdDoc "SSID to be used in IEEE 802.11 management frames."; diff --git a/nixos/modules/services/networking/hylafax/systemd.nix b/nixos/modules/services/networking/hylafax/systemd.nix index 4506bbbc5eb7..df6d0f49eec4 100644 --- a/nixos/modules/services/networking/hylafax/systemd.nix +++ b/nixos/modules/services/networking/hylafax/systemd.nix @@ -96,7 +96,7 @@ let hardenService = # Add some common systemd service hardening settings, # but allow each service (here) to override - # settings by explicitely setting those to `null`. + # settings by explicitly setting those to `null`. # More hardening would be nice but makes # customizing hylafax setups very difficult. # If at all, it should only be added along diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index b60cbe664b6f..3f6cb97296b5 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -473,7 +473,7 @@ in type = with types; nullOr str; default = null; description = lib.mdDoc '' - Router Familiy to trust for first hops. + Router Family to trust for first hops. ''; }; @@ -495,7 +495,7 @@ in ntcp2.enable = mkEnableTrueOption "NTCP2"; ntcp2.published = mkEnableOption (lib.mdDoc "NTCP2 publication"); ntcp2.port = mkOption { - type = types.int; + type = types.port; default = 0; description = lib.mdDoc '' Port to listen for incoming NTCP2 connections (0=auto). diff --git a/nixos/modules/services/networking/iperf3.nix b/nixos/modules/services/networking/iperf3.nix index a70085bb1f5a..0a204524e00f 100644 --- a/nixos/modules/services/networking/iperf3.nix +++ b/nixos/modules/services/networking/iperf3.nix @@ -7,7 +7,7 @@ let port = mkOption { type = types.ints.u16; default = 5201; - description = lib.mdDoc "Server port to listen on for iperf3 client requsts."; + description = lib.mdDoc "Server port to listen on for iperf3 client requests."; }; affinity = mkOption { type = types.nullOr types.ints.unsigned; diff --git a/nixos/modules/services/networking/ircd-hybrid/builder.sh b/nixos/modules/services/networking/ircd-hybrid/builder.sh index 38312210df25..d9d2e4264dfd 100644 --- a/nixos/modules/services/networking/ircd-hybrid/builder.sh +++ b/nixos/modules/services/networking/ircd-hybrid/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup doSub() { diff --git a/nixos/modules/services/networking/kea.nix b/nixos/modules/services/networking/kea.nix index f39b149dd609..945f4113bd47 100644 --- a/nixos/modules/services/networking/kea.nix +++ b/nixos/modules/services/networking/kea.nix @@ -47,7 +47,7 @@ in type = listOf str; default = []; description = lib.mdDoc '' - List of additonal arguments to pass to the daemon. + List of additional arguments to pass to the daemon. ''; }; @@ -86,7 +86,7 @@ in type = listOf str; default = []; description = lib.mdDoc '' - List of additonal arguments to pass to the daemon. + List of additional arguments to pass to the daemon. ''; }; @@ -146,7 +146,7 @@ in type = listOf str; default = []; description = lib.mdDoc '' - List of additonal arguments to pass to the daemon. + List of additional arguments to pass to the daemon. ''; }; @@ -207,7 +207,7 @@ in type = listOf str; default = []; description = lib.mdDoc '' - List of additonal arguments to pass to the daemon. + List of additional arguments to pass to the daemon. ''; }; diff --git a/nixos/modules/services/networking/keepalived/default.nix b/nixos/modules/services/networking/keepalived/default.nix index e9df08f00c37..29fbea5545c3 100644 --- a/nixos/modules/services/networking/keepalived/default.nix +++ b/nixos/modules/services/networking/keepalived/default.nix @@ -84,13 +84,11 @@ let '' ) vrrpInstances); - virtualIpLine = (ip: - ip.addr + virtualIpLine = ip: ip.addr + optionalString (notNullOrEmpty ip.brd) " brd ${ip.brd}" + optionalString (notNullOrEmpty ip.dev) " dev ${ip.dev}" + optionalString (notNullOrEmpty ip.scope) " scope ${ip.scope}" - + optionalString (notNullOrEmpty ip.label) " label ${ip.label}" - ); + + optionalString (notNullOrEmpty ip.label) " label ${ip.label}"; notNullOrEmpty = s: !(s == null || s == ""); diff --git a/nixos/modules/services/networking/knot.nix b/nixos/modules/services/networking/knot.nix index ee7ea83456d4..e97195d82919 100644 --- a/nixos/modules/services/networking/knot.nix +++ b/nixos/modules/services/networking/knot.nix @@ -43,7 +43,7 @@ in { type = types.listOf types.str; default = []; description = lib.mdDoc '' - List of additional command line paramters for knotd + List of additional command line parameters for knotd ''; }; diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index 55af6abd5e01..3ad757133a60 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -79,7 +79,7 @@ in { example = [ "53" ]; description = lib.mdDoc '' What addresses and ports the server should listen on. - For detailed syntax see ListenStream in man systemd.socket. + For detailed syntax see ListenStream in {manpage}`systemd.socket(5)`. ''; }; listenTLS = mkOption { @@ -88,7 +88,7 @@ in { example = [ "198.51.100.1:853" "[2001:db8::1]:853" "853" ]; description = lib.mdDoc '' Addresses and ports on which kresd should provide DNS over TLS (see RFC 7858). - For detailed syntax see ListenStream in man systemd.socket. + For detailed syntax see ListenStream in {manpage}`systemd.socket(5)`. ''; }; listenDoH = mkOption { @@ -97,7 +97,7 @@ in { example = [ "198.51.100.1:443" "[2001:db8::1]:443" "443" ]; description = lib.mdDoc '' Addresses and ports on which kresd should provide DNS over HTTPS/2 (see RFC 8484). - For detailed syntax see ListenStream in man systemd.socket. + For detailed syntax see ListenStream in {manpage}`systemd.socket(5)`. ''; }; instances = mkOption { diff --git a/nixos/modules/services/networking/libreswan.nix b/nixos/modules/services/networking/libreswan.nix index b5df31c28d7c..785729d8f742 100644 --- a/nixos/modules/services/networking/libreswan.nix +++ b/nixos/modules/services/networking/libreswan.nix @@ -106,7 +106,7 @@ in type = types.bool; default = true; description = lib.mdDoc '' - Whether to disable send and accept redirects for all nework interfaces. + Whether to disable send and accept redirects for all network interfaces. See the Libreswan [ FAQ](https://libreswan.org/wiki/FAQ#Why_is_it_recommended_to_disable_send_redirects_in_.2Fproc.2Fsys.2Fnet_.3F) page for why this is recommended. ''; diff --git a/nixos/modules/services/networking/lxd-image-server.nix b/nixos/modules/services/networking/lxd-image-server.nix index 1099169440a8..d8e32eb997e8 100644 --- a/nixos/modules/services/networking/lxd-image-server.nix +++ b/nixos/modules/services/networking/lxd-image-server.nix @@ -87,7 +87,7 @@ in }; }; }) - # this is seperate so it can be enabled on mirrored hosts + # this is separate so it can be enabled on mirrored hosts (mkIf (cfg.nginx.enable) { # https://github.com/Avature/lxd-image-server/blob/master/resources/nginx/includes/lxd-image-server.pkg.conf services.nginx.virtualHosts = { diff --git a/nixos/modules/services/networking/mmsd.nix b/nixos/modules/services/networking/mmsd.nix new file mode 100644 index 000000000000..7e262a9326c1 --- /dev/null +++ b/nixos/modules/services/networking/mmsd.nix @@ -0,0 +1,38 @@ +{ pkgs, lib, config, ... }: +with lib; +let + cfg = config.services.mmsd; + dbusServiceFile = pkgs.writeTextDir "share/dbus-1/services/org.ofono.mms.service" '' + [D-BUS Service] + Name=org.ofono.mms + SystemdService=dbus-org.ofono.mms.service + + # Exec= is still required despite SystemdService= being used: + # https://github.com/freedesktop/dbus/blob/ef55a3db0d8f17848f8a579092fb05900cc076f5/test/data/systemd-activation/com.example.SystemdActivatable1.service + Exec=${pkgs.coreutils}/bin/false mmsd + ''; +in +{ + options.services.mmsd = { + enable = mkEnableOption (mdDoc "Multimedia Messaging Service Daemon"); + extraArgs = mkOption { + type = with types; listOf str; + description = mdDoc "Extra arguments passed to `mmsd-tng`"; + default = []; + example = ["--debug"]; + }; + }; + config = mkIf cfg.enable { + services.dbus.packages = [ dbusServiceFile ]; + systemd.user.services.mmsd = { + after = [ "ModemManager.service" ]; + aliases = [ "dbus-org.ofono.mms.service" ]; + serviceConfig = { + Type = "dbus"; + ExecStart = "${pkgs.mmsd-tng}/bin/mmsdtng " + escapeShellArgs cfg.extraArgs; + BusName = "org.ofono.mms"; + Restart = "on-failure"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix index 4b20c34cfc9b..72514764a7c6 100644 --- a/nixos/modules/services/networking/morty.nix +++ b/nixos/modules/services/networking/morty.nix @@ -50,7 +50,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 3000; description = lib.mdDoc "Listing port"; }; diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index 6543eb34b4b2..a4fd2fd7c89f 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -479,7 +479,7 @@ let Directories to be scanned for further config files to include. Directories will processed in the order given, `*.conf` files in the directory will be - read in case-sensistive alphabetical order. + read in case-sensitive alphabetical order. ''; default = []; }; @@ -671,8 +671,6 @@ in meta = { maintainers = with lib.maintainers; [ pennae ]; - # Don't edit the docbook xml directly, edit the md and generate it: - # `pandoc mosquitto.md -t docbook --top-level-division=chapter --extract-media=media -f markdown+smart > mosquitto.xml` - doc = ./mosquitto.xml; + doc = ./mosquitto.md; }; } diff --git a/nixos/modules/services/networking/mosquitto.xml b/nixos/modules/services/networking/mosquitto.xml deleted file mode 100644 index d16ab28c0269..000000000000 --- a/nixos/modules/services/networking/mosquitto.xml +++ /dev/null @@ -1,147 +0,0 @@ - - Mosquitto - - Mosquitto is a MQTT broker often used for IoT or home automation - data transport. - -
- Quickstart - - A minimal configuration for Mosquitto is - - -services.mosquitto = { - enable = true; - listeners = [ { - acl = [ "pattern readwrite #" ]; - omitPasswordAuth = true; - settings.allow_anonymous = true; - } ]; -}; - - - This will start a broker on port 1883, listening on all interfaces - of the machine, allowing read/write access to all topics to any - user without password requirements. - - - User authentication can be configured with the - users key of listeners. A config that gives - full read access to a user monitor and - restricted write access to a user service could - look like - - -services.mosquitto = { - enable = true; - listeners = [ { - users = { - monitor = { - acl = [ "read #" ]; - password = "monitor"; - }; - service = { - acl = [ "write service/#" ]; - password = "service"; - }; - }; - } ]; -}; - - - TLS authentication is configured by setting TLS-related options of - the listener: - - -services.mosquitto = { - enable = true; - listeners = [ { - port = 8883; # port change is not required, but helpful to avoid mistakes - # ... - settings = { - cafile = "/path/to/mqtt.ca.pem"; - certfile = "/path/to/mqtt.pem"; - keyfile = "/path/to/mqtt.key"; - }; - } ]; - -
-
- Configuration - - The Mosquitto configuration has four distinct types of settings: - the global settings of the daemon, listeners, plugins, and - bridges. Bridges and listeners are part of the global - configuration, plugins are part of listeners. Users of the broker - are configured as parts of listeners rather than globally, - allowing configurations in which a given user is only allowed to - log in to the broker using specific listeners (eg to configure an - admin user with full access to all topics, but restricted to - localhost). - - - Almost all options of Mosquitto are available for configuration at - their appropriate levels, some as NixOS options written in camel - case, the remainders under settings with their - exact names in the Mosquitto config file. The exceptions are - acl_file (which is always set according to the - acl attributes of a listener and its users) and - per_listener_settings (which is always set to - true). - -
- Password authentication - - Mosquitto can be run in two modes, with a password file or - without. Each listener has its own password file, and different - listeners may use different password files. Password file - generation can be disabled by setting - omitPasswordAuth = true for a listener; in - this case it is necessary to either set - settings.allow_anonymous = true to allow all - logins, or to configure other authentication methods like TLS - client certificates with - settings.use_identity_as_username = true. - - - The default is to generate a password file for each listener - from the users configured to that listener. Users with no - configured password will not be added to the password file and - thus will not be able to use the broker. - -
-
- ACL format - - Every listener has a Mosquitto acl_file - attached to it. This ACL is configured via two attributes of the - config: - - - - - the acl attribute of the listener - configures pattern ACL entries and topic ACL entries for - anonymous users. Each entry must be prefixed with - pattern or topic to - distinguish between these two cases. - - - - - the acl attribute of every user - configures in the listener configured the ACL for that given - user. Only topic ACLs are supported by Mosquitto in this - setting, so no prefix is required or allowed. - - - - - The default ACL for a listener is empty, disallowing all - accesses from all clients. To configure a completely open ACL, - set acl = [ "pattern readwrite #" ] - in the listener. - -
-
-
diff --git a/nixos/modules/services/networking/mtprotoproxy.nix b/nixos/modules/services/networking/mtprotoproxy.nix index fc3d5dc963a0..3dd197697b23 100644 --- a/nixos/modules/services/networking/mtprotoproxy.nix +++ b/nixos/modules/services/networking/mtprotoproxy.nix @@ -40,7 +40,7 @@ in enable = mkEnableOption (lib.mdDoc "mtprotoproxy"); port = mkOption { - type = types.int; + type = types.port; default = 3256; description = lib.mdDoc '' TCP port to accept mtproto connections on. diff --git a/nixos/modules/services/networking/multipath.nix b/nixos/modules/services/networking/multipath.nix index cb6b6db272c2..b20ec76ddf59 100644 --- a/nixos/modules/services/networking/multipath.nix +++ b/nixos/modules/services/networking/multipath.nix @@ -28,7 +28,7 @@ in { type = package; description = lib.mdDoc "multipath-tools package to use"; default = pkgs.multipath-tools; - defaultText = "pkgs.multipath-tools"; + defaultText = lib.literalExpression "pkgs.multipath-tools"; }; devices = mkOption { @@ -516,7 +516,6 @@ in { ${optionalString (!isNull defaults) '' defaults { ${indentLines 2 defaults} - multipath_dir ${cfg.package}/lib/multipath } ''} ${optionalString (!isNull blacklist) '' diff --git a/nixos/modules/services/networking/nat-iptables.nix b/nixos/modules/services/networking/nat-iptables.nix new file mode 100644 index 000000000000..d1bed401feeb --- /dev/null +++ b/nixos/modules/services/networking/nat-iptables.nix @@ -0,0 +1,191 @@ +# This module enables Network Address Translation (NAT). +# XXX: todo: support multiple upstream links +# see http://yesican.chsoft.biz/lartc/MultihomedLinuxNetworking.html + +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.networking.nat; + + mkDest = externalIP: + if externalIP == null + then "-j MASQUERADE" + else "-j SNAT --to-source ${externalIP}"; + dest = mkDest cfg.externalIP; + destIPv6 = mkDest cfg.externalIPv6; + + # Whether given IP (plus optional port) is an IPv6. + isIPv6 = ip: builtins.length (lib.splitString ":" ip) > 2; + + helpers = import ./helpers.nix { inherit config lib; }; + + flushNat = '' + ${helpers} + ip46tables -w -t nat -D PREROUTING -j nixos-nat-pre 2>/dev/null|| true + ip46tables -w -t nat -F nixos-nat-pre 2>/dev/null || true + ip46tables -w -t nat -X nixos-nat-pre 2>/dev/null || true + ip46tables -w -t nat -D POSTROUTING -j nixos-nat-post 2>/dev/null || true + ip46tables -w -t nat -F nixos-nat-post 2>/dev/null || true + ip46tables -w -t nat -X nixos-nat-post 2>/dev/null || true + ip46tables -w -t nat -D OUTPUT -j nixos-nat-out 2>/dev/null || true + ip46tables -w -t nat -F nixos-nat-out 2>/dev/null || true + ip46tables -w -t nat -X nixos-nat-out 2>/dev/null || true + + ${cfg.extraStopCommands} + ''; + + mkSetupNat = { iptables, dest, internalIPs, forwardPorts }: '' + # We can't match on incoming interface in POSTROUTING, so + # mark packets coming from the internal interfaces. + ${concatMapStrings (iface: '' + ${iptables} -w -t nat -A nixos-nat-pre \ + -i '${iface}' -j MARK --set-mark 1 + '') cfg.internalInterfaces} + + # NAT the marked packets. + ${optionalString (cfg.internalInterfaces != []) '' + ${iptables} -w -t nat -A nixos-nat-post -m mark --mark 1 \ + ${optionalString (cfg.externalInterface != null) "-o ${cfg.externalInterface}"} ${dest} + ''} + + # NAT packets coming from the internal IPs. + ${concatMapStrings (range: '' + ${iptables} -w -t nat -A nixos-nat-post \ + -s '${range}' ${optionalString (cfg.externalInterface != null) "-o ${cfg.externalInterface}"} ${dest} + '') internalIPs} + + # NAT from external ports to internal ports. + ${concatMapStrings (fwd: '' + ${iptables} -w -t nat -A nixos-nat-pre \ + -i ${toString cfg.externalInterface} -p ${fwd.proto} \ + --dport ${builtins.toString fwd.sourcePort} \ + -j DNAT --to-destination ${fwd.destination} + + ${concatMapStrings (loopbackip: + let + matchIP = if isIPv6 fwd.destination then "[[]([0-9a-fA-F:]+)[]]" else "([0-9.]+)"; + m = builtins.match "${matchIP}:([0-9-]+)" fwd.destination; + destinationIP = if m == null then throw "bad ip:ports `${fwd.destination}'" else elemAt m 0; + destinationPorts = if m == null then throw "bad ip:ports `${fwd.destination}'" else builtins.replaceStrings ["-"] [":"] (elemAt m 1); + in '' + # Allow connections to ${loopbackip}:${toString fwd.sourcePort} from the host itself + ${iptables} -w -t nat -A nixos-nat-out \ + -d ${loopbackip} -p ${fwd.proto} \ + --dport ${builtins.toString fwd.sourcePort} \ + -j DNAT --to-destination ${fwd.destination} + + # Allow connections to ${loopbackip}:${toString fwd.sourcePort} from other hosts behind NAT + ${iptables} -w -t nat -A nixos-nat-pre \ + -d ${loopbackip} -p ${fwd.proto} \ + --dport ${builtins.toString fwd.sourcePort} \ + -j DNAT --to-destination ${fwd.destination} + + ${iptables} -w -t nat -A nixos-nat-post \ + -d ${destinationIP} -p ${fwd.proto} \ + --dport ${destinationPorts} \ + -j SNAT --to-source ${loopbackip} + '') fwd.loopbackIPs} + '') forwardPorts} + ''; + + setupNat = '' + ${helpers} + # Create subchains where we store rules + ip46tables -w -t nat -N nixos-nat-pre + ip46tables -w -t nat -N nixos-nat-post + ip46tables -w -t nat -N nixos-nat-out + + ${mkSetupNat { + iptables = "iptables"; + inherit dest; + inherit (cfg) internalIPs; + forwardPorts = filter (x: !(isIPv6 x.destination)) cfg.forwardPorts; + }} + + ${optionalString cfg.enableIPv6 (mkSetupNat { + iptables = "ip6tables"; + dest = destIPv6; + internalIPs = cfg.internalIPv6s; + forwardPorts = filter (x: isIPv6 x.destination) cfg.forwardPorts; + })} + + ${optionalString (cfg.dmzHost != null) '' + iptables -w -t nat -A nixos-nat-pre \ + -i ${toString cfg.externalInterface} -j DNAT \ + --to-destination ${cfg.dmzHost} + ''} + + ${cfg.extraCommands} + + # Append our chains to the nat tables + ip46tables -w -t nat -A PREROUTING -j nixos-nat-pre + ip46tables -w -t nat -A POSTROUTING -j nixos-nat-post + ip46tables -w -t nat -A OUTPUT -j nixos-nat-out + ''; + +in + +{ + + options = { + + networking.nat.extraCommands = mkOption { + type = types.lines; + default = ""; + example = "iptables -A INPUT -p icmp -j ACCEPT"; + description = lib.mdDoc '' + Additional shell commands executed as part of the nat + initialisation script. + + This option is incompatible with the nftables based nat module. + ''; + }; + + networking.nat.extraStopCommands = mkOption { + type = types.lines; + default = ""; + example = "iptables -D INPUT -p icmp -j ACCEPT || true"; + description = lib.mdDoc '' + Additional shell commands executed as part of the nat + teardown script. + + This option is incompatible with the nftables based nat module. + ''; + }; + + }; + + + config = mkIf (!config.networking.nftables.enable) + (mkMerge [ + ({ networking.firewall.extraCommands = mkBefore flushNat; }) + (mkIf config.networking.nat.enable { + + networking.firewall = mkIf config.networking.firewall.enable { + extraCommands = setupNat; + extraStopCommands = flushNat; + }; + + systemd.services = mkIf (!config.networking.firewall.enable) { + nat = { + description = "Network Address Translation"; + wantedBy = [ "network.target" ]; + after = [ "network-pre.target" "systemd-modules-load.service" ]; + path = [ config.networking.firewall.package ]; + unitConfig.ConditionCapability = "CAP_NET_ADMIN"; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + + script = flushNat + setupNat; + + postStop = flushNat; + }; + }; + }) + ]); +} diff --git a/nixos/modules/services/networking/nat-nftables.nix b/nixos/modules/services/networking/nat-nftables.nix new file mode 100644 index 000000000000..483910a16658 --- /dev/null +++ b/nixos/modules/services/networking/nat-nftables.nix @@ -0,0 +1,184 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.networking.nat; + + mkDest = externalIP: + if externalIP == null + then "masquerade" + else "snat ${externalIP}"; + dest = mkDest cfg.externalIP; + destIPv6 = mkDest cfg.externalIPv6; + + toNftSet = list: concatStringsSep ", " list; + toNftRange = ports: replaceStrings [ ":" ] [ "-" ] (toString ports); + + ifaceSet = toNftSet (map (x: ''"${x}"'') cfg.internalInterfaces); + ipSet = toNftSet cfg.internalIPs; + ipv6Set = toNftSet cfg.internalIPv6s; + oifExpr = optionalString (cfg.externalInterface != null) ''oifname "${cfg.externalInterface}"''; + + # Whether given IP (plus optional port) is an IPv6. + isIPv6 = ip: length (lib.splitString ":" ip) > 2; + + splitIPPorts = IPPorts: + let + matchIP = if isIPv6 IPPorts then "[[]([0-9a-fA-F:]+)[]]" else "([0-9.]+)"; + m = builtins.match "${matchIP}:([0-9-]+)" IPPorts; + in + { + IP = if m == null then throw "bad ip:ports `${IPPorts}'" else elemAt m 0; + ports = if m == null then throw "bad ip:ports `${IPPorts}'" else elemAt m 1; + }; + + mkTable = { ipVer, dest, ipSet, forwardPorts, dmzHost }: + let + # nftables does not support both port and port range as values in a dnat map. + # e.g. "dnat th dport map { 80 : 10.0.0.1 . 80, 443 : 10.0.0.2 . 900-1000 }" + # So we split them. + fwdPorts = filter (x: length (splitString "-" x.destination) == 1) forwardPorts; + fwdPortsRange = filter (x: length (splitString "-" x.destination) > 1) forwardPorts; + + # nftables maps for port forward + # l4proto . dport : addr . port + toFwdMap = forwardPorts: toNftSet (map + (fwd: + with (splitIPPorts fwd.destination); + "${fwd.proto} . ${toNftRange fwd.sourcePort} : ${IP} . ${ports}" + ) + forwardPorts); + fwdMap = toFwdMap fwdPorts; + fwdRangeMap = toFwdMap fwdPortsRange; + + # nftables maps for port forward loopback dnat + # daddr . l4proto . dport : addr . port + toFwdLoopDnatMap = forwardPorts: toNftSet (concatMap + (fwd: map + (loopbackip: + with (splitIPPorts fwd.destination); + "${loopbackip} . ${fwd.proto} . ${toNftRange fwd.sourcePort} : ${IP} . ${ports}" + ) + fwd.loopbackIPs) + forwardPorts); + fwdLoopDnatMap = toFwdLoopDnatMap fwdPorts; + fwdLoopDnatRangeMap = toFwdLoopDnatMap fwdPortsRange; + + # nftables set for port forward loopback snat + # daddr . l4proto . dport + fwdLoopSnatSet = toNftSet (map + (fwd: + with (splitIPPorts fwd.destination); + "${IP} . ${fwd.proto} . ${ports}" + ) + forwardPorts); + in + '' + chain pre { + type nat hook prerouting priority dstnat; + + ${optionalString (fwdMap != "") '' + iifname "${cfg.externalInterface}" dnat meta l4proto . th dport map { ${fwdMap} } comment "port forward" + ''} + ${optionalString (fwdRangeMap != "") '' + iifname "${cfg.externalInterface}" dnat meta l4proto . th dport map { ${fwdRangeMap} } comment "port forward" + ''} + + ${optionalString (fwdLoopDnatMap != "") '' + dnat ${ipVer} daddr . meta l4proto . th dport map { ${fwdLoopDnatMap} } comment "port forward loopback from other hosts behind NAT" + ''} + ${optionalString (fwdLoopDnatRangeMap != "") '' + dnat ${ipVer} daddr . meta l4proto . th dport map { ${fwdLoopDnatRangeMap} } comment "port forward loopback from other hosts behind NAT" + ''} + + ${optionalString (dmzHost != null) '' + iifname "${cfg.externalInterface}" dnat ${dmzHost} comment "dmz" + ''} + } + + chain post { + type nat hook postrouting priority srcnat; + + ${optionalString (ifaceSet != "") '' + iifname { ${ifaceSet} } ${oifExpr} ${dest} comment "from internal interfaces" + ''} + ${optionalString (ipSet != "") '' + ${ipVer} saddr { ${ipSet} } ${oifExpr} ${dest} comment "from internal IPs" + ''} + + ${optionalString (fwdLoopSnatSet != "") '' + iifname != "${cfg.externalInterface}" ${ipVer} daddr . meta l4proto . th dport { ${fwdLoopSnatSet} } masquerade comment "port forward loopback snat" + ''} + } + + chain out { + type nat hook output priority mangle; + + ${optionalString (fwdLoopDnatMap != "") '' + dnat ${ipVer} daddr . meta l4proto . th dport map { ${fwdLoopDnatMap} } comment "port forward loopback from the host itself" + ''} + ${optionalString (fwdLoopDnatRangeMap != "") '' + dnat ${ipVer} daddr . meta l4proto . th dport map { ${fwdLoopDnatRangeMap} } comment "port forward loopback from the host itself" + ''} + } + ''; + +in + +{ + + config = mkIf (config.networking.nftables.enable && cfg.enable) { + + assertions = [ + { + assertion = cfg.extraCommands == ""; + message = "extraCommands is incompatible with the nftables based nat module: ${cfg.extraCommands}"; + } + { + assertion = cfg.extraStopCommands == ""; + message = "extraStopCommands is incompatible with the nftables based nat module: ${cfg.extraStopCommands}"; + } + { + assertion = config.networking.nftables.rulesetFile == null; + message = "networking.nftables.rulesetFile conflicts with the nat module"; + } + ]; + + networking.nftables.ruleset = '' + table ip nixos-nat { + ${mkTable { + ipVer = "ip"; + inherit dest ipSet; + forwardPorts = filter (x: !(isIPv6 x.destination)) cfg.forwardPorts; + inherit (cfg) dmzHost; + }} + } + + ${optionalString cfg.enableIPv6 '' + table ip6 nixos-nat { + ${mkTable { + ipVer = "ip6"; + dest = destIPv6; + ipSet = ipv6Set; + forwardPorts = filter (x: isIPv6 x.destination) cfg.forwardPorts; + dmzHost = null; + }} + } + ''} + ''; + + networking.firewall.extraForwardRules = optionalString config.networking.firewall.filterForward '' + ${optionalString (ifaceSet != "") '' + iifname { ${ifaceSet} } ${oifExpr} accept comment "from internal interfaces" + ''} + ${optionalString (ipSet != "") '' + ip saddr { ${ipSet} } ${oifExpr} accept comment "from internal IPs" + ''} + ${optionalString (ipv6Set != "") '' + ip6 saddr { ${ipv6Set} } ${oifExpr} accept comment "from internal IPv6s" + ''} + ''; + + }; +} diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix index 0b70ae47ccf5..3afe6fe0a971 100644 --- a/nixos/modules/services/networking/nat.nix +++ b/nixos/modules/services/networking/nat.nix @@ -7,219 +7,95 @@ with lib; let + cfg = config.networking.nat; - mkDest = externalIP: if externalIP == null - then "-j MASQUERADE" - else "-j SNAT --to-source ${externalIP}"; - dest = mkDest cfg.externalIP; - destIPv6 = mkDest cfg.externalIPv6; - - # Whether given IP (plus optional port) is an IPv6. - isIPv6 = ip: builtins.length (lib.splitString ":" ip) > 2; - - helpers = import ./helpers.nix { inherit config lib; }; - - flushNat = '' - ${helpers} - ip46tables -w -t nat -D PREROUTING -j nixos-nat-pre 2>/dev/null|| true - ip46tables -w -t nat -F nixos-nat-pre 2>/dev/null || true - ip46tables -w -t nat -X nixos-nat-pre 2>/dev/null || true - ip46tables -w -t nat -D POSTROUTING -j nixos-nat-post 2>/dev/null || true - ip46tables -w -t nat -F nixos-nat-post 2>/dev/null || true - ip46tables -w -t nat -X nixos-nat-post 2>/dev/null || true - ip46tables -w -t nat -D OUTPUT -j nixos-nat-out 2>/dev/null || true - ip46tables -w -t nat -F nixos-nat-out 2>/dev/null || true - ip46tables -w -t nat -X nixos-nat-out 2>/dev/null || true - - ${cfg.extraStopCommands} - ''; - - mkSetupNat = { iptables, dest, internalIPs, forwardPorts }: '' - # We can't match on incoming interface in POSTROUTING, so - # mark packets coming from the internal interfaces. - ${concatMapStrings (iface: '' - ${iptables} -w -t nat -A nixos-nat-pre \ - -i '${iface}' -j MARK --set-mark 1 - '') cfg.internalInterfaces} - - # NAT the marked packets. - ${optionalString (cfg.internalInterfaces != []) '' - ${iptables} -w -t nat -A nixos-nat-post -m mark --mark 1 \ - ${optionalString (cfg.externalInterface != null) "-o ${cfg.externalInterface}"} ${dest} - ''} - - # NAT packets coming from the internal IPs. - ${concatMapStrings (range: '' - ${iptables} -w -t nat -A nixos-nat-post \ - -s '${range}' ${optionalString (cfg.externalInterface != null) "-o ${cfg.externalInterface}"} ${dest} - '') internalIPs} - - # NAT from external ports to internal ports. - ${concatMapStrings (fwd: '' - ${iptables} -w -t nat -A nixos-nat-pre \ - -i ${toString cfg.externalInterface} -p ${fwd.proto} \ - --dport ${builtins.toString fwd.sourcePort} \ - -j DNAT --to-destination ${fwd.destination} - - ${concatMapStrings (loopbackip: - let - matchIP = if isIPv6 fwd.destination then "[[]([0-9a-fA-F:]+)[]]" else "([0-9.]+)"; - m = builtins.match "${matchIP}:([0-9-]+)" fwd.destination; - destinationIP = if m == null then throw "bad ip:ports `${fwd.destination}'" else elemAt m 0; - destinationPorts = if m == null then throw "bad ip:ports `${fwd.destination}'" else builtins.replaceStrings ["-"] [":"] (elemAt m 1); - in '' - # Allow connections to ${loopbackip}:${toString fwd.sourcePort} from the host itself - ${iptables} -w -t nat -A nixos-nat-out \ - -d ${loopbackip} -p ${fwd.proto} \ - --dport ${builtins.toString fwd.sourcePort} \ - -j DNAT --to-destination ${fwd.destination} - - # Allow connections to ${loopbackip}:${toString fwd.sourcePort} from other hosts behind NAT - ${iptables} -w -t nat -A nixos-nat-pre \ - -d ${loopbackip} -p ${fwd.proto} \ - --dport ${builtins.toString fwd.sourcePort} \ - -j DNAT --to-destination ${fwd.destination} - - ${iptables} -w -t nat -A nixos-nat-post \ - -d ${destinationIP} -p ${fwd.proto} \ - --dport ${destinationPorts} \ - -j SNAT --to-source ${loopbackip} - '') fwd.loopbackIPs} - '') forwardPorts} - ''; - - setupNat = '' - ${helpers} - # Create subchains where we store rules - ip46tables -w -t nat -N nixos-nat-pre - ip46tables -w -t nat -N nixos-nat-post - ip46tables -w -t nat -N nixos-nat-out - - ${mkSetupNat { - iptables = "iptables"; - inherit dest; - inherit (cfg) internalIPs; - forwardPorts = filter (x: !(isIPv6 x.destination)) cfg.forwardPorts; - }} - - ${optionalString cfg.enableIPv6 (mkSetupNat { - iptables = "ip6tables"; - dest = destIPv6; - internalIPs = cfg.internalIPv6s; - forwardPorts = filter (x: isIPv6 x.destination) cfg.forwardPorts; - })} - - ${optionalString (cfg.dmzHost != null) '' - iptables -w -t nat -A nixos-nat-pre \ - -i ${toString cfg.externalInterface} -j DNAT \ - --to-destination ${cfg.dmzHost} - ''} - - ${cfg.extraCommands} - - # Append our chains to the nat tables - ip46tables -w -t nat -A PREROUTING -j nixos-nat-pre - ip46tables -w -t nat -A POSTROUTING -j nixos-nat-post - ip46tables -w -t nat -A OUTPUT -j nixos-nat-out - ''; - in { - ###### interface - options = { networking.nat.enable = mkOption { type = types.bool; default = false; - description = - lib.mdDoc '' - Whether to enable Network Address Translation (NAT). - ''; + description = lib.mdDoc '' + Whether to enable Network Address Translation (NAT). + ''; }; networking.nat.enableIPv6 = mkOption { type = types.bool; default = false; - description = - lib.mdDoc '' - Whether to enable IPv6 NAT. - ''; + description = lib.mdDoc '' + Whether to enable IPv6 NAT. + ''; }; networking.nat.internalInterfaces = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; example = [ "eth0" ]; - description = - lib.mdDoc '' - The interfaces for which to perform NAT. Packets coming from - these interface and destined for the external interface will - be rewritten. - ''; + description = lib.mdDoc '' + The interfaces for which to perform NAT. Packets coming from + these interface and destined for the external interface will + be rewritten. + ''; }; networking.nat.internalIPs = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; example = [ "192.168.1.0/24" ]; - description = - lib.mdDoc '' - The IP address ranges for which to perform NAT. Packets - coming from these addresses (on any interface) and destined - for the external interface will be rewritten. - ''; + description = lib.mdDoc '' + The IP address ranges for which to perform NAT. Packets + coming from these addresses (on any interface) and destined + for the external interface will be rewritten. + ''; }; networking.nat.internalIPv6s = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; example = [ "fc00::/64" ]; - description = - lib.mdDoc '' - The IPv6 address ranges for which to perform NAT. Packets - coming from these addresses (on any interface) and destined - for the external interface will be rewritten. - ''; + description = lib.mdDoc '' + The IPv6 address ranges for which to perform NAT. Packets + coming from these addresses (on any interface) and destined + for the external interface will be rewritten. + ''; }; networking.nat.externalInterface = mkOption { type = types.nullOr types.str; default = null; example = "eth1"; - description = - lib.mdDoc '' - The name of the external network interface. - ''; + description = lib.mdDoc '' + The name of the external network interface. + ''; }; networking.nat.externalIP = mkOption { type = types.nullOr types.str; default = null; example = "203.0.113.123"; - description = - lib.mdDoc '' - The public IP address to which packets from the local - network are to be rewritten. If this is left empty, the - IP address associated with the external interface will be - used. - ''; + description = lib.mdDoc '' + The public IP address to which packets from the local + network are to be rewritten. If this is left empty, the + IP address associated with the external interface will be + used. + ''; }; networking.nat.externalIPv6 = mkOption { type = types.nullOr types.str; default = null; example = "2001:dc0:2001:11::175"; - description = - lib.mdDoc '' - The public IPv6 address to which packets from the local - network are to be rewritten. If this is left empty, the - IP address associated with the external interface will be - used. - ''; + description = lib.mdDoc '' + The public IPv6 address to which packets from the local + network are to be rewritten. If this is left empty, the + IP address associated with the external interface will be + used. + ''; }; networking.nat.forwardPorts = mkOption { @@ -246,122 +122,75 @@ in loopbackIPs = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; example = literalExpression ''[ "55.1.2.3" ]''; - description = lib.mdDoc "Public IPs for NAT reflection; for connections to `loopbackip:sourcePort' from the host itself and from other hosts behind NAT"; + description = lib.mdDoc "Public IPs for NAT reflection; for connections to `loopbackip:sourcePort` from the host itself and from other hosts behind NAT"; }; }; }); - default = []; + default = [ ]; example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; proto = "tcp"; } { sourcePort = 8080; destination = "[fc00::2]:80"; proto = "tcp"; } ]; - description = - lib.mdDoc '' - List of forwarded ports from the external interface to - internal destinations by using DNAT. Destination can be - IPv6 if IPv6 NAT is enabled. - ''; + description = lib.mdDoc '' + List of forwarded ports from the external interface to + internal destinations by using DNAT. Destination can be + IPv6 if IPv6 NAT is enabled. + ''; }; networking.nat.dmzHost = mkOption { type = types.nullOr types.str; default = null; example = "10.0.0.1"; - description = - lib.mdDoc '' - The local IP address to which all traffic that does not match any - forwarding rule is forwarded. - ''; - }; - - networking.nat.extraCommands = mkOption { - type = types.lines; - default = ""; - example = "iptables -A INPUT -p icmp -j ACCEPT"; - description = - lib.mdDoc '' - Additional shell commands executed as part of the nat - initialisation script. - ''; - }; - - networking.nat.extraStopCommands = mkOption { - type = types.lines; - default = ""; - example = "iptables -D INPUT -p icmp -j ACCEPT || true"; - description = - lib.mdDoc '' - Additional shell commands executed as part of the nat - teardown script. - ''; + description = lib.mdDoc '' + The local IP address to which all traffic that does not match any + forwarding rule is forwarded. + ''; }; }; - ###### implementation + config = mkIf config.networking.nat.enable { - config = mkMerge [ - { networking.firewall.extraCommands = mkBefore flushNat; } - (mkIf config.networking.nat.enable { + assertions = [ + { + assertion = cfg.enableIPv6 -> config.networking.enableIPv6; + message = "networking.nat.enableIPv6 requires networking.enableIPv6"; + } + { + assertion = (cfg.dmzHost != null) -> (cfg.externalInterface != null); + message = "networking.nat.dmzHost requires networking.nat.externalInterface"; + } + { + assertion = (cfg.forwardPorts != [ ]) -> (cfg.externalInterface != null); + message = "networking.nat.forwardPorts requires networking.nat.externalInterface"; + } + ]; - assertions = [ - { assertion = cfg.enableIPv6 -> config.networking.enableIPv6; - message = "networking.nat.enableIPv6 requires networking.enableIPv6"; - } - { assertion = (cfg.dmzHost != null) -> (cfg.externalInterface != null); - message = "networking.nat.dmzHost requires networking.nat.externalInterface"; - } - { assertion = (cfg.forwardPorts != []) -> (cfg.externalInterface != null); - message = "networking.nat.forwardPorts requires networking.nat.externalInterface"; - } - ]; + # Use the same iptables package as in config.networking.firewall. + # When the firewall is enabled, this should be deduplicated without any + # error. + environment.systemPackages = [ config.networking.firewall.package ]; - # Use the same iptables package as in config.networking.firewall. - # When the firewall is enabled, this should be deduplicated without any - # error. - environment.systemPackages = [ config.networking.firewall.package ]; + boot = { + kernelModules = [ "nf_nat_ftp" ]; + kernel.sysctl = { + "net.ipv4.conf.all.forwarding" = mkOverride 99 true; + "net.ipv4.conf.default.forwarding" = mkOverride 99 true; + } // optionalAttrs cfg.enableIPv6 { + # Do not prevent IPv6 autoconfiguration. + # See . + "net.ipv6.conf.all.accept_ra" = mkOverride 99 2; + "net.ipv6.conf.default.accept_ra" = mkOverride 99 2; - boot = { - kernelModules = [ "nf_nat_ftp" ]; - kernel.sysctl = { - "net.ipv4.conf.all.forwarding" = mkOverride 99 true; - "net.ipv4.conf.default.forwarding" = mkOverride 99 true; - } // optionalAttrs cfg.enableIPv6 { - # Do not prevent IPv6 autoconfiguration. - # See . - "net.ipv6.conf.all.accept_ra" = mkOverride 99 2; - "net.ipv6.conf.default.accept_ra" = mkOverride 99 2; - - # Forward IPv6 packets. - "net.ipv6.conf.all.forwarding" = mkOverride 99 true; - "net.ipv6.conf.default.forwarding" = mkOverride 99 true; - }; + # Forward IPv6 packets. + "net.ipv6.conf.all.forwarding" = mkOverride 99 true; + "net.ipv6.conf.default.forwarding" = mkOverride 99 true; }; + }; - networking.firewall = mkIf config.networking.firewall.enable { - extraCommands = setupNat; - extraStopCommands = flushNat; - }; - - systemd.services = mkIf (!config.networking.firewall.enable) { nat = { - description = "Network Address Translation"; - wantedBy = [ "network.target" ]; - after = [ "network-pre.target" "systemd-modules-load.service" ]; - path = [ config.networking.firewall.package ]; - unitConfig.ConditionCapability = "CAP_NET_ADMIN"; - - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - }; - - script = flushNat + setupNat; - - postStop = flushNat; - }; }; - }) - ]; + }; } diff --git a/nixos/modules/services/networking/ncdns.nix b/nixos/modules/services/networking/ncdns.nix index 1d494332095f..cc97beb14e01 100644 --- a/nixos/modules/services/networking/ncdns.nix +++ b/nixos/modules/services/networking/ncdns.nix @@ -85,7 +85,7 @@ in ``` bit. IN NS ns1.example.com. ``` - If unset ncdns will generate an internal psuedo-hostname under the + If unset ncdns will generate an internal pseudo-hostname under the zone, which will resolve to the value of {option}`services.ncdns.identity.address`. If you are only using ncdns locally you can ignore this. diff --git a/nixos/modules/services/networking/ndppd.nix b/nixos/modules/services/networking/ndppd.nix index 6cbc9712be31..98c58d2d5db1 100644 --- a/nixos/modules/services/networking/ndppd.nix +++ b/nixos/modules/services/networking/ndppd.nix @@ -43,7 +43,7 @@ let timeout = mkOption { type = types.int; description = lib.mdDoc '' - Controls how long to wait for a Neighbor Advertisment Message before + Controls how long to wait for a Neighbor Advertisement Message before invalidating the entry, in milliseconds. ''; default = 500; @@ -74,7 +74,7 @@ let type = types.nullOr types.str; description = lib.mdDoc '' This is the target address is to match against. If no netmask - is provided, /128 is assumed. The addresses of serveral rules + is provided, /128 is assumed. The addresses of several rules may or may not overlap. Defaults to the name of the attrset. ''; diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix index d2d7543e8cf3..bd13e8c9929a 100644 --- a/nixos/modules/services/networking/nftables.nix +++ b/nixos/modules/services/networking/nftables.nix @@ -12,11 +12,9 @@ in default = false; description = lib.mdDoc '' - Whether to enable nftables. nftables is a Linux-based packet - filtering framework intended to replace frameworks like iptables. - - This conflicts with the standard networking firewall, so make sure to - disable it before using nftables. + Whether to enable nftables and use nftables based firewall if enabled. + nftables is a Linux-based packet filtering framework intended to + replace frameworks like iptables. Note that if you have Docker enabled you will not be able to use nftables without intervention. Docker uses iptables internally to @@ -37,7 +35,7 @@ in # Check out https://wiki.nftables.org/ for better documentation. # Table for both IPv4 and IPv6. table inet filter { - # Block all incomming connections traffic except SSH and "ping". + # Block all incoming connections traffic except SSH and "ping". chain input { type filter hook input priority 0; @@ -79,19 +77,17 @@ in lib.mdDoc '' The ruleset to be used with nftables. Should be in a format that can be loaded using "/bin/nft -f". The ruleset is updated atomically. + This option conflicts with rulesetFile. ''; }; networking.nftables.rulesetFile = mkOption { - type = types.path; - default = pkgs.writeTextFile { - name = "nftables-rules"; - text = cfg.ruleset; - }; - defaultText = literalMD ''a file with the contents of {option}`networking.nftables.ruleset`''; + type = types.nullOr types.path; + default = null; description = lib.mdDoc '' The ruleset file to be used with nftables. Should be in a format that can be loaded using "nft -f". The ruleset is updated atomically. + This option conflicts with ruleset and nftables based firewall. ''; }; }; @@ -99,10 +95,6 @@ in ###### implementation config = mkIf cfg.enable { - assertions = [{ - assertion = config.networking.firewall.enable == false; - message = "You can not use nftables and iptables at the same time. networking.firewall.enable must be set to false."; - }]; boot.blacklistedKernelModules = [ "ip_tables" ]; environment.systemPackages = [ pkgs.nftables ]; networking.networkmanager.firewallBackend = mkDefault "nftables"; @@ -116,7 +108,9 @@ in rulesScript = pkgs.writeScript "nftables-rules" '' #! ${pkgs.nftables}/bin/nft -f flush ruleset - include "${cfg.rulesetFile}" + ${if cfg.rulesetFile != null then '' + include "${cfg.rulesetFile}" + '' else cfg.ruleset} ''; in { Type = "oneshot"; diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix index 5e5d9469efc7..b1e51195247a 100644 --- a/nixos/modules/services/networking/nomad.nix +++ b/nixos/modules/services/networking/nomad.nix @@ -67,10 +67,21 @@ in Additional plugins dir used to configure nomad. ''; example = literalExpression '' - [ "" "pkgs."] + [ "" pkgs.nomad-driver-nix pkgs.nomad-driver-podman ] ''; }; + credentials = mkOption { + description = lib.mdDoc '' + Credentials envs used to configure nomad secrets. + ''; + type = types.attrsOf types.str; + default = { }; + + example = { + logs_remote_write_password = "/run/keys/nomad_write_password"; + }; + }; settings = mkOption { type = format.type; @@ -139,9 +150,17 @@ in { DynamicUser = cfg.dropPrivileges; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - ExecStart = "${cfg.package}/bin/nomad agent -config=/etc/nomad.json" + + ExecStart = + let + pluginsDir = pkgs.symlinkJoin + { + name = "nomad-plugins"; + paths = cfg.extraSettingsPlugins; + }; + in + "${cfg.package}/bin/nomad agent -config=/etc/nomad.json -plugin-dir=${pluginsDir}/bin" + concatMapStrings (path: " -config=${path}") cfg.extraSettingsPaths + - concatMapStrings (path: " -plugin-dir=${path}/bin") cfg.extraSettingsPlugins; + concatMapStrings (key: " -config=\${CREDENTIALS_DIRECTORY}/${key}") (lib.attrNames cfg.credentials); KillMode = "process"; KillSignal = "SIGINT"; LimitNOFILE = 65536; @@ -150,6 +169,7 @@ in Restart = "on-failure"; RestartSec = 2; TasksMax = "infinity"; + LoadCredential = lib.mapAttrsToList (key: value: "${key}:${value}") cfg.credentials; } (mkIf cfg.enableDocker { SupplementaryGroups = "docker"; # space-separated string diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 57da208bd7af..09f3bdc7ae07 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -371,7 +371,7 @@ let default = null; example = "2000::1@1234"; description = lib.mdDoc '' - This address will be used for zone-transfere requests if configured + This address will be used for zone-transfer requests if configured as a secondary server or notifications in case of a primary server. Supply either a plain IPv4 or IPv6 address with an optional port number (ip@port). @@ -588,7 +588,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 53; description = lib.mdDoc '' Port the service should bind do. @@ -825,7 +825,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 8952; description = lib.mdDoc '' Port number for remote control operations (uses TLS over TCP). diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index 7e3bb565d10b..6c8d7b985d5f 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -147,9 +147,9 @@ in systemd.services.systemd-timedated.environment = { SYSTEMD_TIMEDATED_NTP_SERVICES = "chronyd.service"; }; systemd.tmpfiles.rules = [ - "d ${stateDir} 0755 chrony chrony - -" - "f ${driftFile} 0640 chrony chrony -" - "f ${keyFile} 0640 chrony chrony -" + "d ${stateDir} 0750 chrony chrony - -" + "f ${driftFile} 0640 chrony chrony - -" + "f ${keyFile} 0640 chrony chrony - -" ]; systemd.services.chronyd = @@ -164,15 +164,47 @@ in path = [ chronyPkg ]; unitConfig.ConditionCapability = "CAP_SYS_TIME"; - serviceConfig = - { Type = "simple"; - ExecStart = "${chronyPkg}/bin/chronyd ${builtins.toString chronyFlags}"; - - ProtectHome = "yes"; - ProtectSystem = "full"; - PrivateTmp = "yes"; - }; + serviceConfig = { + Type = "simple"; + ExecStart = "${chronyPkg}/bin/chronyd ${builtins.toString chronyFlags}"; + # Proc filesystem + ProcSubset = "pid"; + ProtectProc = "invisible"; + # Access write directories + ReadWritePaths = [ "${stateDir}" ]; + UMask = "0027"; + # Capabilities + CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_DAC_OVERRIDE" "CAP_NET_BIND_SERVICE" "CAP_SETGID" "CAP_SETUID" "CAP_SYS_RESOURCE" "CAP_SYS_TIME" ]; + # Device Access + DeviceAllow = [ "char-pps rw" "char-ptp rw" "char-rtc rw" ]; + DevicePolicy = "closed"; + # Security + NoNewPrivileges = true; + # Sandboxing + ProtectSystem = "full"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = false; + PrivateUsers = false; + ProtectHostname = true; + ProtectClock = false; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RemoveIPC = true; + PrivateMounts = true; + # System Call Filtering + SystemCallArchitectures = "native"; + SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @resources" "@clock" "@setuid" "capset" "chown" ] ++ lib.optional pkgs.stdenv.hostPlatform.isAarch64 "fchownat"; + }; }; }; } diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix index 6ed832b6fa1b..401dbe97c52d 100644 --- a/nixos/modules/services/networking/nylon.nix +++ b/nixos/modules/services/networking/nylon.nix @@ -81,7 +81,7 @@ let }; port = mkOption { - type = types.int; + type = types.port; default = 1080; description = lib.mdDoc '' What port to listen for client requests, default is 1080. diff --git a/nixos/modules/services/networking/openconnect.nix b/nixos/modules/services/networking/openconnect.nix index 469f0a3bc3bb..7f9006053b89 100644 --- a/nixos/modules/services/networking/openconnect.nix +++ b/nixos/modules/services/networking/openconnect.nix @@ -32,6 +32,7 @@ let description = lib.mdDoc "Username to authenticate with."; example = "example-user"; type = types.nullOr types.str; + default = null; }; # Note: It does not make sense to provide a way to declaratively @@ -89,6 +90,7 @@ let generateConfig = name: icfg: pkgs.writeText "config" '' interface=${name} + ${optionalString (icfg.protocol != null) "protocol=${icfg.protocol}"} ${optionalString (icfg.user != null) "user=${icfg.user}"} ${optionalString (icfg.passwordFile != null) "passwd-on-stdin"} ${optionalString (icfg.certificate != null) @@ -108,14 +110,14 @@ let ExecStart = "${openconnect}/bin/openconnect --config=${ generateConfig name icfg } ${icfg.gateway}"; - StandardInput = "file:${icfg.passwordFile}"; + StandardInput = lib.mkIf (icfg.passwordFile != null) "file:${icfg.passwordFile}"; ProtectHome = true; }; }; in { options.networking.openconnect = { - package = mkPackageOption pkgs "openconnect" { }; + package = mkPackageOptionMD pkgs "openconnect" { }; interfaces = mkOption { description = lib.mdDoc "OpenConnect interfaces."; diff --git a/nixos/modules/services/networking/ostinato.nix b/nixos/modules/services/networking/ostinato.nix index 40c227ea0c68..dc07313ea901 100644 --- a/nixos/modules/services/networking/ostinato.nix +++ b/nixos/modules/services/networking/ostinato.nix @@ -54,7 +54,7 @@ in default = "0.0.0.0"; description = lib.mdDoc '' By default, the Drone RPC server will listen on all interfaces and - local IPv4 adresses for incoming connections from clients. Specify + local IPv4 addresses for incoming connections from clients. Specify a single IPv4 or IPv6 address if you want to restrict that. To listen on any IPv6 address, use :: ''; diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix index 473c2a1f1fba..2f07cefc736e 100644 --- a/nixos/modules/services/networking/pdns-recursor.nix +++ b/nixos/modules/services/networking/pdns-recursor.nix @@ -38,7 +38,7 @@ in { }; dns.port = mkOption { - type = types.int; + type = types.port; default = 53; description = lib.mdDoc '' Port number Recursor DNS server will bind to. @@ -67,7 +67,7 @@ in { }; api.port = mkOption { - type = types.int; + type = types.port; default = 8082; description = lib.mdDoc '' Port number Recursor REST API server will bind to. diff --git a/nixos/modules/services/networking/pixiecore.nix b/nixos/modules/services/networking/pixiecore.nix index ea4008d4d515..f410be471646 100644 --- a/nixos/modules/services/networking/pixiecore.nix +++ b/nixos/modules/services/networking/pixiecore.nix @@ -23,7 +23,7 @@ in mode = mkOption { description = lib.mdDoc "Which mode to use"; default = "boot"; - type = types.enum [ "api" "boot" ]; + type = types.enum [ "api" "boot" "quick" ]; }; debug = mkOption { @@ -38,6 +38,12 @@ in description = lib.mdDoc "Handle DHCP traffic without binding to the DHCP server port"; }; + quick = mkOption { + description = lib.mdDoc "Which quick option to use"; + default = "xyz"; + type = types.enum [ "arch" "centos" "coreos" "debian" "fedora" "ubuntu" "xyz" ]; + }; + kernel = mkOption { type = types.str or types.path; default = ""; @@ -117,6 +123,8 @@ in then [ "boot" cfg.kernel ] ++ optional (cfg.initrd != "") cfg.initrd ++ optionals (cfg.cmdLine != "") [ "--cmdline" cfg.cmdLine ] + else if cfg.mode == "quick" + then [ "quick" cfg.quick ] else [ "api" cfg.apiServer ]; in '' diff --git a/nixos/modules/services/networking/pleroma.md b/nixos/modules/services/networking/pleroma.md new file mode 100644 index 000000000000..7c499e1c616c --- /dev/null +++ b/nixos/modules/services/networking/pleroma.md @@ -0,0 +1,180 @@ +# Pleroma {#module-services-pleroma} + +[Pleroma](https://pleroma.social/) is a lightweight activity pub server. + +## Generating the Pleroma config {#module-services-pleroma-generate-config} + +The `pleroma_ctl` CLI utility will prompt you some questions and it will generate an initial config file. This is an example of usage +```ShellSession +$ mkdir tmp-pleroma +$ cd tmp-pleroma +$ nix-shell -p pleroma-otp +$ pleroma_ctl instance gen --output config.exs --output-psql setup.psql +``` + +The `config.exs` file can be further customized following the instructions on the [upstream documentation](https://docs-develop.pleroma.social/backend/configuration/cheatsheet/). Many refinements can be applied also after the service is running. + +## Initializing the database {#module-services-pleroma-initialize-db} + +First, the Postgresql service must be enabled in the NixOS configuration +``` +services.postgresql = { + enable = true; + package = pkgs.postgresql_13; +}; +``` +and activated with the usual +```ShellSession +$ nixos-rebuild switch +``` + +Then you can create and seed the database, using the `setup.psql` file that you generated in the previous section, by running +```ShellSession +$ sudo -u postgres psql -f setup.psql +``` + +## Enabling the Pleroma service locally {#module-services-pleroma-enable} + +In this section we will enable the Pleroma service only locally, so its configurations can be improved incrementally. + +This is an example of configuration, where [](#opt-services.pleroma.configs) option contains the content of the file `config.exs`, generated [in the first section](#module-services-pleroma-generate-config), but with the secrets (database password, endpoint secret key, salts, etc.) removed. Removing secrets is important, because otherwise they will be stored publicly in the Nix store. +``` +services.pleroma = { + enable = true; + secretConfigFile = "/var/lib/pleroma/secrets.exs"; + configs = [ + '' + import Config + + config :pleroma, Pleroma.Web.Endpoint, + url: [host: "pleroma.example.net", scheme: "https", port: 443], + http: [ip: {127, 0, 0, 1}, port: 4000] + + config :pleroma, :instance, + name: "Test", + email: "admin@example.net", + notify_email: "admin@example.net", + limit: 5000, + registrations_open: true + + config :pleroma, :media_proxy, + enabled: false, + redirect_on_failure: true + + config :pleroma, Pleroma.Repo, + adapter: Ecto.Adapters.Postgres, + username: "pleroma", + database: "pleroma", + hostname: "localhost" + + # Configure web push notifications + config :web_push_encryption, :vapid_details, + subject: "mailto:admin@example.net" + + # ... TO CONTINUE ... + '' + ]; +}; +``` + +Secrets must be moved into a file pointed by [](#opt-services.pleroma.secretConfigFile), in our case `/var/lib/pleroma/secrets.exs`. This file can be created copying the previously generated `config.exs` file and then removing all the settings, except the secrets. This is an example +``` +# Pleroma instance passwords + +import Config + +config :pleroma, Pleroma.Web.Endpoint, + secret_key_base: "", + signing_salt: "" + +config :pleroma, Pleroma.Repo, + password: "" + +# Configure web push notifications +config :web_push_encryption, :vapid_details, + public_key: "", + private_key: "" + +# ... TO CONTINUE ... +``` +Note that the lines of the same configuration group are comma separated (i.e. all the lines end with a comma, except the last one), so when the lines with passwords are added or removed, commas must be adjusted accordingly. + +The service can be enabled with the usual +```ShellSession +$ nixos-rebuild switch +``` + +The service is accessible only from the local `127.0.0.1:4000` port. It can be tested using a port forwarding like this +```ShellSession +$ ssh -L 4000:localhost:4000 myuser@example.net +``` +and then accessing from a web browser. + +## Creating the admin user {#module-services-pleroma-admin-user} + +After Pleroma service is running, all [Pleroma administration utilities](https://docs-develop.pleroma.social/) can be used. In particular an admin user can be created with +```ShellSession +$ pleroma_ctl user new --admin --moderator --password +``` + +## Configuring Nginx {#module-services-pleroma-nginx} + +In this configuration, Pleroma is listening only on the local port 4000. Nginx can be configured as a Reverse Proxy, for forwarding requests from public ports to the Pleroma service. This is an example of configuration, using +[Let's Encrypt](https://letsencrypt.org/) for the TLS certificates +``` +security.acme = { + email = "root@example.net"; + acceptTerms = true; +}; + +services.nginx = { + enable = true; + addSSL = true; + + recommendedTlsSettings = true; + recommendedOptimisation = true; + recommendedGzipSettings = true; + + recommendedProxySettings = false; + # NOTE: if enabled, the NixOS proxy optimizations will override the Pleroma + # specific settings, and they will enter in conflict. + + virtualHosts = { + "pleroma.example.net" = { + http2 = true; + enableACME = true; + forceSSL = true; + + locations."/" = { + proxyPass = "http://127.0.0.1:4000"; + + extraConfig = '' + etag on; + gzip on; + + add_header 'Access-Control-Allow-Origin' '*' always; + add_header 'Access-Control-Allow-Methods' 'POST, PUT, DELETE, GET, PATCH, OPTIONS' always; + add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, Idempotency-Key' always; + add_header 'Access-Control-Expose-Headers' 'Link, X-RateLimit-Reset, X-RateLimit-Limit, X-RateLimit-Remaining, X-Request-Id' always; + if ($request_method = OPTIONS) { + return 204; + } + add_header X-XSS-Protection "1; mode=block"; + add_header X-Permitted-Cross-Domain-Policies none; + add_header X-Frame-Options DENY; + add_header X-Content-Type-Options nosniff; + add_header Referrer-Policy same-origin; + add_header X-Download-Options noopen; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + + client_max_body_size 16m; + # NOTE: increase if users need to upload very big files + ''; + }; + }; + }; +}; +``` diff --git a/nixos/modules/services/networking/pleroma.nix b/nixos/modules/services/networking/pleroma.nix index dfd1ed4036ab..e9db7f3eab8e 100644 --- a/nixos/modules/services/networking/pleroma.nix +++ b/nixos/modules/services/networking/pleroma.nix @@ -52,7 +52,7 @@ in { the right place to store any secret Have a look to Pleroma section in the NixOS manual for more - informations. + information. ''; }; @@ -141,9 +141,11 @@ in { NoNewPrivileges = true; CapabilityBoundingSet = "~CAP_SYS_ADMIN"; }; + # disksup requires bash + path = [ pkgs.bash ]; }; }; meta.maintainers = with lib.maintainers; [ ninjatrappeur ]; - meta.doc = ./pleroma.xml; + meta.doc = ./pleroma.md; } diff --git a/nixos/modules/services/networking/pleroma.xml b/nixos/modules/services/networking/pleroma.xml deleted file mode 100644 index ad0a481af28b..000000000000 --- a/nixos/modules/services/networking/pleroma.xml +++ /dev/null @@ -1,188 +0,0 @@ - - Pleroma - - Pleroma is a lightweight activity pub server. -
- Generating the Pleroma config - The pleroma_ctl CLI utility will prompt you some questions and it will generate an initial config file. This is an example of usage - -$ mkdir tmp-pleroma -$ cd tmp-pleroma -$ nix-shell -p pleroma-otp -$ pleroma_ctl instance gen --output config.exs --output-psql setup.psql - - - The config.exs file can be further customized following the instructions on the upstream documentation. Many refinements can be applied also after the service is running. -
-
- Initializing the database - First, the Postgresql service must be enabled in the NixOS configuration - -services.postgresql = { - enable = true; - package = pkgs.postgresql_13; -}; - -and activated with the usual - -$ nixos-rebuild switch - - - Then you can create and seed the database, using the setup.psql file that you generated in the previous section, by running - -$ sudo -u postgres psql -f setup.psql - - -
-
- Enabling the Pleroma service locally - In this section we will enable the Pleroma service only locally, so its configurations can be improved incrementally. - This is an example of configuration, where services.pleroma.configs option contains the content of the file config.exs, generated in the first section, but with the secrets (database password, endpoint secret key, salts, etc.) removed. Removing secrets is important, because otherwise they will be stored publicly in the Nix store. - -services.pleroma = { - enable = true; - secretConfigFile = "/var/lib/pleroma/secrets.exs"; - configs = [ - '' - import Config - - config :pleroma, Pleroma.Web.Endpoint, - url: [host: "pleroma.example.net", scheme: "https", port: 443], - http: [ip: {127, 0, 0, 1}, port: 4000] - - config :pleroma, :instance, - name: "Test", - email: "admin@example.net", - notify_email: "admin@example.net", - limit: 5000, - registrations_open: true - - config :pleroma, :media_proxy, - enabled: false, - redirect_on_failure: true - - config :pleroma, Pleroma.Repo, - adapter: Ecto.Adapters.Postgres, - username: "pleroma", - database: "pleroma", - hostname: "localhost" - - # Configure web push notifications - config :web_push_encryption, :vapid_details, - subject: "mailto:admin@example.net" - - # ... TO CONTINUE ... - '' - ]; -}; - - - Secrets must be moved into a file pointed by services.pleroma.secretConfigFile, in our case /var/lib/pleroma/secrets.exs. This file can be created copying the previously generated config.exs file and then removing all the settings, except the secrets. This is an example - -# Pleroma instance passwords - -import Config - -config :pleroma, Pleroma.Web.Endpoint, - secret_key_base: "<the secret generated by pleroma_ctl>", - signing_salt: "<the secret generated by pleroma_ctl>" - -config :pleroma, Pleroma.Repo, - password: "<the secret generated by pleroma_ctl>" - -# Configure web push notifications -config :web_push_encryption, :vapid_details, - public_key: "<the secret generated by pleroma_ctl>", - private_key: "<the secret generated by pleroma_ctl>" - -# ... TO CONTINUE ... - - Note that the lines of the same configuration group are comma separated (i.e. all the lines end with a comma, except the last one), so when the lines with passwords are added or removed, commas must be adjusted accordingly. - - The service can be enabled with the usual - -$ nixos-rebuild switch - - - The service is accessible only from the local 127.0.0.1:4000 port. It can be tested using a port forwarding like this - -$ ssh -L 4000:localhost:4000 myuser@example.net - -and then accessing http://localhost:4000 from a web browser. -
-
- Creating the admin user - After Pleroma service is running, all Pleroma administration utilities can be used. In particular an admin user can be created with - -$ pleroma_ctl user new <nickname> <email> --admin --moderator --password <password> - - -
-
- Configuring Nginx - In this configuration, Pleroma is listening only on the local port 4000. Nginx can be configured as a Reverse Proxy, for forwarding requests from public ports to the Pleroma service. This is an example of configuration, using -Let's Encrypt for the TLS certificates - -security.acme = { - email = "root@example.net"; - acceptTerms = true; -}; - -services.nginx = { - enable = true; - addSSL = true; - - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - - recommendedProxySettings = false; - # NOTE: if enabled, the NixOS proxy optimizations will override the Pleroma - # specific settings, and they will enter in conflict. - - virtualHosts = { - "pleroma.example.net" = { - http2 = true; - enableACME = true; - forceSSL = true; - - locations."/" = { - proxyPass = "http://127.0.0.1:4000"; - - extraConfig = '' - etag on; - gzip on; - - add_header 'Access-Control-Allow-Origin' '*' always; - add_header 'Access-Control-Allow-Methods' 'POST, PUT, DELETE, GET, PATCH, OPTIONS' always; - add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, Idempotency-Key' always; - add_header 'Access-Control-Expose-Headers' 'Link, X-RateLimit-Reset, X-RateLimit-Limit, X-RateLimit-Remaining, X-Request-Id' always; - if ($request_method = OPTIONS) { - return 204; - } - add_header X-XSS-Protection "1; mode=block"; - add_header X-Permitted-Cross-Domain-Policies none; - add_header X-Frame-Options DENY; - add_header X-Content-Type-Options nosniff; - add_header Referrer-Policy same-origin; - add_header X-Download-Options noopen; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - - client_max_body_size 16m; - # NOTE: increase if users need to upload very big files - ''; - }; - }; - }; -}; - - -
-
diff --git a/nixos/modules/services/networking/powerdns.nix b/nixos/modules/services/networking/powerdns.nix index 6aa5928d6370..850a128cf1a4 100644 --- a/nixos/modules/services/networking/powerdns.nix +++ b/nixos/modules/services/networking/powerdns.nix @@ -5,6 +5,7 @@ with lib; let cfg = config.services.powerdns; configDir = pkgs.writeTextDir "pdns.conf" "${cfg.extraConfig}"; + finalConfigDir = if cfg.secretFile == null then configDir else "/run/pdns"; in { options = { services.powerdns = { @@ -19,6 +20,19 @@ in { for details on supported values. ''; }; + + secretFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/powerdns.env"; + description = lib.mdDoc '' + Environment variables from this file will be interpolated into the + final config file using envsubst with this syntax: `$ENVIRONMENT` + or `''${VARIABLE}`. + The file should contain lines formatted as `SECRET_VAR=SECRET_VALUE`. + This is useful to avoid putting secrets into the nix store. + ''; + }; }; }; @@ -31,7 +45,13 @@ in { after = [ "network.target" "mysql.service" "postgresql.service" "openldap.service" ]; serviceConfig = { - ExecStart = [ "" "${pkgs.pdns}/bin/pdns_server --config-dir=${configDir} --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no" ]; + EnvironmentFile = lib.optional (cfg.secretFile != null) cfg.secretFile; + ExecStartPre = lib.optional (cfg.secretFile != null) + (pkgs.writeShellScript "pdns-pre-start" '' + umask 077 + ${pkgs.envsubst}/bin/envsubst -i "${configDir}/pdns.conf" > ${finalConfigDir}/pdns.conf + ''); + ExecStart = [ "" "${pkgs.pdns}/bin/pdns_server --config-dir=${finalConfigDir} --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no" ]; }; }; diff --git a/nixos/modules/services/networking/prosody.md b/nixos/modules/services/networking/prosody.md new file mode 100644 index 000000000000..2da2c242a98b --- /dev/null +++ b/nixos/modules/services/networking/prosody.md @@ -0,0 +1,72 @@ +# Prosody {#module-services-prosody} + +[Prosody](https://prosody.im/) is an open-source, modern XMPP server. + +## Basic usage {#module-services-prosody-basic-usage} + +A common struggle for most XMPP newcomers is to find the right set +of XMPP Extensions (XEPs) to setup. Forget to activate a few of +those and your XMPP experience might turn into a nightmare! + +The XMPP community tackles this problem by creating a meta-XEP +listing a decent set of XEPs you should implement. This meta-XEP +is issued every year, the 2020 edition being +[XEP-0423](https://xmpp.org/extensions/xep-0423.html). + +The NixOS Prosody module will implement most of these recommendend XEPs out of +the box. That being said, two components still require some +manual configuration: the +[Multi User Chat (MUC)](https://xmpp.org/extensions/xep-0045.html) +and the [HTTP File Upload](https://xmpp.org/extensions/xep-0363.html) ones. +You'll need to create a DNS subdomain for each of those. The current convention is to name your +MUC endpoint `conference.example.org` and your HTTP upload domain `upload.example.org`. + +A good configuration to start with, including a +[Multi User Chat (MUC)](https://xmpp.org/extensions/xep-0045.html) +endpoint as well as a [HTTP File Upload](https://xmpp.org/extensions/xep-0363.html) +endpoint will look like this: +``` +services.prosody = { + enable = true; + admins = [ "root@example.org" ]; + ssl.cert = "/var/lib/acme/example.org/fullchain.pem"; + ssl.key = "/var/lib/acme/example.org/key.pem"; + virtualHosts."example.org" = { + enabled = true; + domain = "example.org"; + ssl.cert = "/var/lib/acme/example.org/fullchain.pem"; + ssl.key = "/var/lib/acme/example.org/key.pem"; + }; + muc = [ { + domain = "conference.example.org"; + } ]; + uploadHttp = { + domain = "upload.example.org"; + }; +}; +``` + +## Let's Encrypt Configuration {#module-services-prosody-letsencrypt} + +As you can see in the code snippet from the +[previous section](#module-services-prosody-basic-usage), +you'll need a single TLS certificate covering your main endpoint, +the MUC one as well as the HTTP Upload one. We can generate such a +certificate by leveraging the ACME +[extraDomainNames](#opt-security.acme.certs._name_.extraDomainNames) module option. + +Provided the setup detailed in the previous section, you'll need the following acme configuration to generate +a TLS certificate for the three endponits: +``` +security.acme = { + email = "root@example.org"; + acceptTerms = true; + certs = { + "example.org" = { + webroot = "/var/www/example.org"; + email = "root@example.org"; + extraDomainNames = [ "conference.example.org" "upload.example.org" ]; + }; + }; +}; +``` diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 6cd4678ae4ac..9f68853f9fa8 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -263,7 +263,7 @@ let if builtins.isString x then ''"${x}"'' else if builtins.isBool x then boolToString x else if builtins.isInt x then toString x - else if builtins.isList x then ''{ ${lib.concatStringsSep ", " (map (n: toLua n) x) } }'' + else if builtins.isList x then "{ ${lib.concatMapStringsSep ", " toLua x} }" else throw "Invalid Lua value"; createSSLOptsStr = o: '' @@ -309,7 +309,7 @@ let type = types.int; default = 300; description = lib.mdDoc '' - Timout after which the room is destroyed or unlocked if not + Timeout after which the room is destroyed or unlocked if not configured, in seconds ''; }; @@ -489,7 +489,7 @@ in Setting this option to true will prevent you from building a NixOS configuration which won't comply with this standard. - You can explicitely decide to ignore this standard if you + You can explicitly decide to ignore this standard if you know what you are doing by setting this option to false. [1] https://xmpp.org/extensions/xep-0423.html @@ -649,7 +649,7 @@ in extraPluginPaths = mkOption { type = types.listOf types.path; default = []; - description = lib.mdDoc "Addtional path in which to look find plugins/modules"; + description = lib.mdDoc "Additional path in which to look find plugins/modules"; }; uploadHttp = mkOption { @@ -733,7 +733,7 @@ in Having a server not XEP-0423-compliant might make your XMPP experience terrible. See the NixOS manual for further - informations. + information. If you know what you're doing, you can disable this warning by setting config.services.prosody.xmppComplianceSuite to false. @@ -904,5 +904,6 @@ in }; }; - meta.doc = ./prosody.xml; + + meta.doc = ./prosody.md; } diff --git a/nixos/modules/services/networking/prosody.xml b/nixos/modules/services/networking/prosody.xml deleted file mode 100644 index 6358d744ff78..000000000000 --- a/nixos/modules/services/networking/prosody.xml +++ /dev/null @@ -1,87 +0,0 @@ - - Prosody - - Prosody is an open-source, modern XMPP server. - -
- Basic usage - - - A common struggle for most XMPP newcomers is to find the right set - of XMPP Extensions (XEPs) to setup. Forget to activate a few of - those and your XMPP experience might turn into a nightmare! - - - - The XMPP community tackles this problem by creating a meta-XEP - listing a decent set of XEPs you should implement. This meta-XEP - is issued every year, the 2020 edition being - XEP-0423. - - - The NixOS Prosody module will implement most of these recommendend XEPs out of - the box. That being said, two components still require some - manual configuration: the - Multi User Chat (MUC) - and the HTTP File Upload ones. - You'll need to create a DNS subdomain for each of those. The current convention is to name your - MUC endpoint conference.example.org and your HTTP upload domain upload.example.org. - - - A good configuration to start with, including a - Multi User Chat (MUC) - endpoint as well as a HTTP File Upload - endpoint will look like this: - -services.prosody = { - enable = true; - admins = [ "root@example.org" ]; - ssl.cert = "/var/lib/acme/example.org/fullchain.pem"; - ssl.key = "/var/lib/acme/example.org/key.pem"; - virtualHosts."example.org" = { - enabled = true; - domain = "example.org"; - ssl.cert = "/var/lib/acme/example.org/fullchain.pem"; - ssl.key = "/var/lib/acme/example.org/key.pem"; - }; - muc = [ { - domain = "conference.example.org"; - } ]; - uploadHttp = { - domain = "upload.example.org"; - }; -}; - -
-
- Let's Encrypt Configuration - - As you can see in the code snippet from the - previous section, - you'll need a single TLS certificate covering your main endpoint, - the MUC one as well as the HTTP Upload one. We can generate such a - certificate by leveraging the ACME - extraDomainNames module option. - - - Provided the setup detailed in the previous section, you'll need the following acme configuration to generate - a TLS certificate for the three endponits: - -security.acme = { - email = "root@example.org"; - acceptTerms = true; - certs = { - "example.org" = { - webroot = "/var/www/example.org"; - email = "root@example.org"; - extraDomainNames = [ "conference.example.org" "upload.example.org" ]; - }; - }; -}; - -
-
diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index a343dab7af25..8e4789c7ca59 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -77,7 +77,7 @@ in { . This option only works in conjunction with {option}`settings`. Setting this will also set {option}`settings.rights.type` and - {option}`settings.rights.file` to approriate values. + {option}`settings.rights.file` to appropriate values. ''; default = { }; example = literalExpression '' @@ -200,5 +200,5 @@ in { }; }; - meta.maintainers = with lib.maintainers; [ aneeshusa infinisil dotlambda ]; + meta.maintainers = with lib.maintainers; [ infinisil dotlambda ]; } diff --git a/nixos/modules/services/networking/redsocks.nix b/nixos/modules/services/networking/redsocks.nix index 85ae3125ded8..30d6a0a6336d 100644 --- a/nixos/modules/services/networking/redsocks.nix +++ b/nixos/modules/services/networking/redsocks.nix @@ -37,7 +37,7 @@ in - stderr - file:/path/to/file - syslog:FACILITY where FACILITY is any of "daemon", "local0", - etc. + etc. ''; }; @@ -81,7 +81,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 12345; description = lib.mdDoc "Port on which redsocks should listen."; }; @@ -125,6 +125,7 @@ in lib.mdDoc '' Way to disclose client IP to the proxy. - "false": do not disclose + http-connect supports the following ways: - "X-Forwarded-For": add header "X-Forwarded-For: IP" - "Forwarded_ip": add header "Forwarded: for=IP" (see RFC7239) diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix index d21f108024e5..7f6358d00d0b 100644 --- a/nixos/modules/services/networking/resilio.nix +++ b/nixos/modules/services/networking/resilio.nix @@ -8,7 +8,6 @@ let resilioSync = pkgs.resilio-sync; sharedFoldersRecord = map (entry: { - secret = entry.secret; dir = entry.directory; use_relay_server = entry.useRelayServer; @@ -40,6 +39,36 @@ let shared_folders = sharedFoldersRecord; })); + sharedFoldersSecretFiles = map (entry: { + dir = entry.directory; + secretFile = if builtins.hasAttr "secret" entry then + toString (pkgs.writeTextFile { + name = "secret-file"; + text = entry.secret; + }) + else + entry.secretFile; + }) cfg.sharedFolders; + + runConfigPath = "/run/rslsync/config.json"; + + createConfig = pkgs.writeShellScriptBin "create-resilio-config" ( + if cfg.sharedFolders != [ ] then '' + ${pkgs.jq}/bin/jq \ + '.shared_folders |= map(.secret = $ARGS.named[.dir])' \ + ${ + lib.concatMapStringsSep " \\\n " + (entry: ''--arg '${entry.dir}' "$(cat '${entry.secretFile}')"'') + sharedFoldersSecretFiles + } \ + <${configFile} \ + >${runConfigPath} + '' else '' + # no secrets, passing through config + cp ${configFile} ${runConfigPath}; + '' + ); + in { options = { @@ -186,7 +215,7 @@ in default = []; type = types.listOf (types.attrsOf types.anything); example = - [ { secret = "AHMYFPCQAHBM7LQPFXQ7WV6Y42IGUXJ5Y"; + [ { secretFile = "/run/resilio-secret"; directory = "/home/user/sync_test"; useRelayServer = true; useTracker = true; @@ -202,9 +231,6 @@ in description = lib.mdDoc '' Shared folder list. If enabled, web UI must be disabled. Secrets can be generated using `rslsync --generate-secret`. - Note that this secret will be - put inside the Nix store, so it is realistically not very - secret. If you would like to be able to modify the contents of this directories, it is recommended that you make your user a @@ -256,10 +282,14 @@ in Restart = "on-abort"; UMask = "0002"; User = "rslsync"; + RuntimeDirectory = "rslsync"; + ExecStartPre = "${createConfig}/bin/create-resilio-config"; ExecStart = '' - ${resilioSync}/bin/rslsync --nodaemon --config ${configFile} + ${resilioSync}/bin/rslsync --nodaemon --config ${runConfigPath} ''; }; }; }; + + meta.maintainers = with maintainers; [ jwoudenberg ]; } diff --git a/nixos/modules/services/networking/rpcbind.nix b/nixos/modules/services/networking/rpcbind.nix index aa04214debb0..63c4859fbd07 100644 --- a/nixos/modules/services/networking/rpcbind.nix +++ b/nixos/modules/services/networking/rpcbind.nix @@ -14,7 +14,7 @@ with lib; type = types.bool; default = false; description = lib.mdDoc '' - Whether to enable `rpcbind', an ONC RPC directory service + Whether to enable `rpcbind`, an ONC RPC directory service notably used by NFS and NIS, and which can be queried using the rpcinfo(1) command. `rpcbind` is a replacement for `portmap`. @@ -35,6 +35,16 @@ with lib; systemd.services.rpcbind = { wantedBy = [ "multi-user.target" ]; + # rpcbind performs a check for /var/run/rpcbind.lock at startup + # and will crash if /var/run isn't present. In the stock NixOS + # var.conf tmpfiles configuration file, /var/run is symlinked to + # /run, so rpcbind can enter a race condition in which /var/run + # isn't symlinked yet but tries to interact with the path, so + # controlling the order explicitly here ensures that rpcbind can + # start successfully. The `wants` instead of `requires` should + # avoid creating a strict/brittle dependency. + wants = [ "systemd-tmpfiles-setup.service" ]; + after = [ "systemd-tmpfiles-setup.service" ]; }; users.users.rpc = { diff --git a/nixos/modules/services/networking/sabnzbd.nix b/nixos/modules/services/networking/sabnzbd.nix index 8486be1bc66c..8f3545df8995 100644 --- a/nixos/modules/services/networking/sabnzbd.nix +++ b/nixos/modules/services/networking/sabnzbd.nix @@ -20,7 +20,7 @@ in package = mkOption { type = types.package; default = pkgs.sabnzbd; - defaultText = "pkgs.sabnzbd"; + defaultText = lib.literalExpression "pkgs.sabnzbd"; description = lib.mdDoc "The sabnzbd executable package run by the service."; }; diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index 214b6c6a787a..6c57ddbde2d4 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -124,7 +124,7 @@ in description = lib.mdDoc '' Whether to run searx in uWSGI as a "vassal", instead of using its built-in HTTP server. This is the recommended mode for public or - large instances, but is unecessary for LAN or local-only use. + large instances, but is unnecessary for LAN or local-only use. ::: {.warning} The built-in HTTP server logs all queries by default. @@ -223,7 +223,7 @@ in module = "searx.webapp"; env = [ "SEARX_SETTINGS_PATH=${cfg.settingsFile}" - # searxng compatiblity https://github.com/searxng/searxng/issues/1519 + # searxng compatibility https://github.com/searxng/searxng/issues/1519 "SEARXNG_SETTINGS_PATH=${cfg.settingsFile}" ]; buffer-size = 32768; diff --git a/nixos/modules/services/networking/shellhub-agent.nix b/nixos/modules/services/networking/shellhub-agent.nix index ad33c50f9d63..7cce23cb9c4e 100644 --- a/nixos/modules/services/networking/shellhub-agent.nix +++ b/nixos/modules/services/networking/shellhub-agent.nix @@ -14,7 +14,7 @@ in enable = mkEnableOption (lib.mdDoc "ShellHub Agent daemon"); - package = mkPackageOption pkgs "shellhub-agent" { }; + package = mkPackageOptionMD pkgs "shellhub-agent" { }; preferredHostname = mkOption { type = types.str; diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix index 8d69b5304c88..c8e888eafcc2 100644 --- a/nixos/modules/services/networking/softether.nix +++ b/nixos/modules/services/networking/softether.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.softether; - package = cfg.package.override { dataDir = cfg.dataDir; }; + package = cfg.package.override { inherit (cfg) dataDir; }; in { @@ -88,7 +88,7 @@ in }; } - (mkIf (cfg.vpnserver.enable) { + (mkIf cfg.vpnserver.enable { systemd.services.vpnserver = { description = "SoftEther VPN Server"; after = [ "softether-init.service" ]; @@ -109,7 +109,7 @@ in }; }) - (mkIf (cfg.vpnbridge.enable) { + (mkIf cfg.vpnbridge.enable { systemd.services.vpnbridge = { description = "SoftEther VPN Bridge"; after = [ "softether-init.service" ]; @@ -130,7 +130,7 @@ in }; }) - (mkIf (cfg.vpnclient.enable) { + (mkIf cfg.vpnclient.enable { systemd.services.vpnclient = { description = "SoftEther VPN Client"; after = [ "softether-init.service" ]; diff --git a/nixos/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix index 41c4ec2d2951..7932bac9ca3a 100644 --- a/nixos/modules/services/networking/ssh/lshd.nix +++ b/nixos/modules/services/networking/ssh/lshd.nix @@ -40,7 +40,7 @@ in type = types.listOf types.str; description = lib.mdDoc '' List of network interfaces where listening for connections. - When providing the empty list, `[]', lshd listens on all + When providing the empty list, `[]`, lshd listens on all network interfaces. ''; example = [ "localhost" "1.2.3.4:443" ]; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index af8200c7e295..f2b8d12ccc94 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -12,8 +12,23 @@ let then cfgc.package else pkgs.buildPackages.openssh; + # reports boolean as yes / no + mkValueStringSshd = v: + if isInt v then toString v + else if isString v then v + else if true == v then "yes" + else if false == v then "no" + else throw "unsupported type ${typeOf v}: ${(lib.generators.toPretty {}) v}"; + + # dont use the "=" operator + settingsFormat = (pkgs.formats.keyValue { + mkKeyValue = lib.generators.mkKeyValueDefault { + mkValueString = mkValueStringSshd; + } " ";}); + + configFile = settingsFormat.generate "config" cfg.settings; sshconf = pkgs.runCommand "sshd.conf-validated" { nativeBuildInputs = [ validationPackage ]; } '' - cat >$out <$out <. + Note that this attribute set does not exactly match the documented + xml format. Instead, this is the format of the json rest api. There + are slight differences. For example, this xml: + ```xml + + default + 1 + + ``` + corresponds to the json: + ```json + { + options: { + listenAddresses = [ + "default" + ]; + minHomeDiskFree = { + unit = "%"; + value = 1; + }; + }; + } + ``` ''; example = { options.localAnnounceEnabled = false; diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index 26997dd96013..233bfdf9ebf5 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -4,10 +4,7 @@ with lib; let cfg = config.services.tailscale; - firewallOn = config.networking.firewall.enable; - rpfMode = config.networking.firewall.checkReversePath; isNetworkd = config.networking.useNetworkd; - rpfIsStrict = rpfMode == true || rpfMode == "strict"; in { meta.maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 ]; @@ -38,14 +35,23 @@ in { defaultText = literalExpression "pkgs.tailscale"; description = lib.mdDoc "The package to use for tailscale"; }; + + useRoutingFeatures = mkOption { + type = types.enum [ "none" "client" "server" "both" ]; + default = "none"; + example = "server"; + description = lib.mdDoc '' + Enables settings required for Tailscale's routing features like subnet routers and exit nodes. + + To use these these features, you will still need to call `sudo tailscale up` with the relevant flags like `--advertise-exit-node` and `--exit-node`. + + When set to `client` or `both`, reverse path filtering will be set to loose instead of strict. + When set to `server` or `both`, IP forwarding will be enabled. + ''; + }; }; config = mkIf cfg.enable { - warnings = optional (firewallOn && rpfIsStrict) '' - Strict reverse path filtering breaks Tailscale exit node use and some subnet routing setups. Consider setting: - - networking.firewall.checkReversePath = "loose"; - ''; environment.systemPackages = [ cfg.package ]; # for the CLI systemd.packages = [ cfg.package ]; systemd.services.tailscaled = { @@ -75,6 +81,13 @@ in { stopIfChanged = false; }; + boot.kernel.sysctl = mkIf (cfg.useRoutingFeatures == "server" || cfg.useRoutingFeatures == "both") { + "net.ipv4.conf.all.forwarding" = mkDefault true; + "net.ipv6.conf.all.forwarding" = mkDefault true; + }; + + networking.firewall.checkReversePath = mkIf (cfg.useRoutingFeatures == "client" || cfg.useRoutingFeatures == "both") "loose"; + networking.dhcpcd.denyInterfaces = [ cfg.interfaceName ]; systemd.network.networks."50-tailscale" = mkIf isNetworkd { diff --git a/nixos/modules/services/networking/tayga.nix b/nixos/modules/services/networking/tayga.nix new file mode 100644 index 000000000000..299ae2777f7c --- /dev/null +++ b/nixos/modules/services/networking/tayga.nix @@ -0,0 +1,195 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.tayga; + + # Converts an address set to a string + strAddr = addr: "${addr.address}/${toString addr.prefixLength}"; + + configFile = pkgs.writeText "tayga.conf" '' + tun-device ${cfg.tunDevice} + + ipv4-addr ${cfg.ipv4.address} + ${optionalString (cfg.ipv6.address != null) "ipv6-addr ${cfg.ipv6.address}"} + + prefix ${strAddr cfg.ipv6.pool} + dynamic-pool ${strAddr cfg.ipv4.pool} + data-dir ${cfg.dataDir} + ''; + + addrOpts = v: + assert v == 4 || v == 6; + { + options = { + address = mkOption { + type = types.str; + description = lib.mdDoc "IPv${toString v} address."; + }; + + prefixLength = mkOption { + type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128)); + description = lib.mdDoc '' + Subnet mask of the interface, specified as the number of + bits in the prefix ("${if v == 4 then "24" else "64"}"). + ''; + }; + }; + }; + + versionOpts = v: { + options = { + router = { + address = mkOption { + type = types.str; + description = lib.mdDoc "The IPv${toString v} address of the router."; + }; + }; + + address = mkOption { + type = types.nullOr types.str; + default = null; + description = lib.mdDoc "The source IPv${toString v} address of the TAYGA server."; + }; + + pool = mkOption { + type = with types; nullOr (submodule (addrOpts v)); + description = lib.mdDoc "The pool of IPv${toString v} addresses which are used for translation."; + }; + }; + }; +in +{ + options = { + services.tayga = { + enable = mkEnableOption (lib.mdDoc "Tayga"); + + package = mkOption { + type = types.package; + default = pkgs.tayga; + defaultText = lib.literalMD "pkgs.tayga"; + description = lib.mdDoc "This option specifies the TAYGA package to use."; + }; + + ipv4 = mkOption { + type = types.submodule (versionOpts 4); + description = lib.mdDoc "IPv4-specific configuration."; + example = literalExpression '' + { + address = "192.0.2.0"; + router = { + address = "192.0.2.1"; + }; + pool = { + address = "192.0.2.1"; + prefixLength = 24; + }; + } + ''; + }; + + ipv6 = mkOption { + type = types.submodule (versionOpts 6); + description = lib.mdDoc "IPv6-specific configuration."; + example = literalExpression '' + { + address = "2001:db8::1"; + router = { + address = "64:ff9b::1"; + }; + pool = { + address = "64:ff9b::"; + prefixLength = 96; + }; + } + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/tayga"; + description = lib.mdDoc "Directory for persistent data"; + }; + + tunDevice = mkOption { + type = types.str; + default = "nat64"; + description = lib.mdDoc "Name of the nat64 tun device"; + }; + }; + }; + + config = mkIf cfg.enable { + networking.interfaces."${cfg.tunDevice}" = { + virtual = true; + virtualType = "tun"; + virtualOwner = mkIf config.networking.useNetworkd ""; + ipv4 = { + addresses = [ + { address = cfg.ipv4.router.address; prefixLength = 32; } + ]; + routes = [ + cfg.ipv4.pool + ]; + }; + ipv6 = { + addresses = [ + { address = cfg.ipv6.router.address; prefixLength = 128; } + ]; + routes = [ + cfg.ipv6.pool + ]; + }; + }; + + systemd.services.tayga = { + description = "Stateless NAT64 implementation"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/tayga -d --nodetach --config ${configFile}"; + ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID"; + Restart = "always"; + + # Hardening Score: + # - nixos-scripts: 2.1 + # - systemd-networkd: 1.6 + ProtectHome = true; + SystemCallFilter = [ + "@network-io" + "@system-service" + "~@privileged" + "~@resources" + ]; + ProtectKernelLogs = true; + AmbientCapabilities = [ + "CAP_NET_ADMIN" + ]; + CapabilityBoundingSet = ""; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + ]; + StateDirectory = "tayga"; + DynamicUser = mkIf config.networking.useNetworkd true; + MemoryDenyWriteExecute = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + ProtectHostname = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictNamespaces = true; + NoNewPrivileges = true; + ProtectControlGroups = true; + SystemCallArchitectures = "native"; + PrivateTmp = true; + LockPersonality = true; + ProtectSystem = true; + PrivateUsers = true; + ProtectProc = "invisible"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 09b23a60a4af..7db83e6a584b 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -349,91 +349,94 @@ in ###### implementation - config = mkIf (cfg.networks != { }) { + config = mkIf (cfg.networks != { }) ( + let + etcConfig = foldr (a: b: a // b) { } + (flip mapAttrsToList cfg.networks (network: data: + flip mapAttrs' data.hosts (host: text: nameValuePair + ("tinc/${network}/hosts/${host}") + ({ mode = "0644"; user = "tinc.${network}"; inherit text; }) + ) // { + "tinc/${network}/tinc.conf" = { + mode = "0444"; + text = '' + ${toTincConf ({ Interface = "tinc.${network}"; } // data.settings)} + ${data.extraConfig} + ''; + }; + } + )); + in { + environment.etc = etcConfig; - environment.etc = foldr (a: b: a // b) { } - (flip mapAttrsToList cfg.networks (network: data: - flip mapAttrs' data.hosts (host: text: nameValuePair - ("tinc/${network}/hosts/${host}") - ({ mode = "0644"; user = "tinc.${network}"; inherit text; }) - ) // { - "tinc/${network}/tinc.conf" = { - mode = "0444"; - text = '' - ${toTincConf ({ Interface = "tinc.${network}"; } // data.settings)} - ${data.extraConfig} - ''; + systemd.services = flip mapAttrs' cfg.networks (network: data: nameValuePair + ("tinc.${network}") + (let version = getVersion data.package; in { + description = "Tinc Daemon - ${network}"; + wantedBy = [ "multi-user.target" ]; + path = [ data.package ]; + reloadTriggers = mkIf (versionAtLeast version "1.1pre") [ (builtins.toJSON etcConfig) ]; + restartTriggers = mkIf (versionOlder version "1.1pre") [ (builtins.toJSON etcConfig) ]; + serviceConfig = { + Type = "simple"; + Restart = "always"; + RestartSec = "3"; + ExecReload = mkIf (versionAtLeast version "1.1pre") "${data.package}/bin/tinc -n ${network} reload"; + ExecStart = "${data.package}/bin/tincd -D -U tinc.${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}"; }; - } - )); + preStart = '' + mkdir -p /etc/tinc/${network}/hosts + chown tinc.${network} /etc/tinc/${network}/hosts + mkdir -p /etc/tinc/${network}/invitations + chown tinc.${network} /etc/tinc/${network}/invitations - systemd.services = flip mapAttrs' cfg.networks (network: data: nameValuePair - ("tinc.${network}") - ({ - description = "Tinc Daemon - ${network}"; - wantedBy = [ "multi-user.target" ]; - path = [ data.package ]; - restartTriggers = [ config.environment.etc."tinc/${network}/tinc.conf".source ]; - serviceConfig = { - Type = "simple"; - Restart = "always"; - RestartSec = "3"; - ExecReload = mkIf (versionAtLeast (getVersion data.package) "1.1pre") "${data.package}/bin/tinc -n ${network} reload"; - ExecStart = "${data.package}/bin/tincd -D -U tinc.${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}"; + # Determine how we should generate our keys + if type tinc >/dev/null 2>&1; then + # Tinc 1.1+ uses the tinc helper application for key generation + ${if data.ed25519PrivateKeyFile != null then " # ed25519 Keyfile managed by nix" else '' + # Prefer ED25519 keys (only in 1.1+) + [ -f "/etc/tinc/${network}/ed25519_key.priv" ] || tinc -n ${network} generate-ed25519-keys + ''} + ${if data.rsaPrivateKeyFile != null then " # RSA Keyfile managed by nix" else '' + [ -f "/etc/tinc/${network}/rsa_key.priv" ] || tinc -n ${network} generate-rsa-keys 4096 + ''} + # In case there isn't anything to do + true + else + # Tinc 1.0 uses the tincd application + [ -f "/etc/tinc/${network}/rsa_key.priv" ] || tincd -n ${network} -K 4096 + fi + ''; + }) + ); + + environment.systemPackages = let + cli-wrappers = pkgs.stdenv.mkDerivation { + name = "tinc-cli-wrappers"; + nativeBuildInputs = [ pkgs.makeWrapper ]; + buildCommand = '' + mkdir -p $out/bin + ${concatStringsSep "\n" (mapAttrsToList (network: data: + optionalString (versionAtLeast data.package.version "1.1pre") '' + makeWrapper ${data.package}/bin/tinc "$out/bin/tinc.${network}" \ + --add-flags "--pidfile=/run/tinc.${network}.pid" \ + --add-flags "--config=/etc/tinc/${network}" + '') cfg.networks)} + ''; }; - preStart = '' - mkdir -p /etc/tinc/${network}/hosts - chown tinc.${network} /etc/tinc/${network}/hosts - mkdir -p /etc/tinc/${network}/invitations - chown tinc.${network} /etc/tinc/${network}/invitations + in [ cli-wrappers ]; - # Determine how we should generate our keys - if type tinc >/dev/null 2>&1; then - # Tinc 1.1+ uses the tinc helper application for key generation - ${if data.ed25519PrivateKeyFile != null then " # ed25519 Keyfile managed by nix" else '' - # Prefer ED25519 keys (only in 1.1+) - [ -f "/etc/tinc/${network}/ed25519_key.priv" ] || tinc -n ${network} generate-ed25519-keys - ''} - ${if data.rsaPrivateKeyFile != null then " # RSA Keyfile managed by nix" else '' - [ -f "/etc/tinc/${network}/rsa_key.priv" ] || tinc -n ${network} generate-rsa-keys 4096 - ''} - # In case there isn't anything to do - true - else - # Tinc 1.0 uses the tincd application - [ -f "/etc/tinc/${network}/rsa_key.priv" ] || tincd -n ${network} -K 4096 - fi - ''; - }) - ); - - environment.systemPackages = let - cli-wrappers = pkgs.stdenv.mkDerivation { - name = "tinc-cli-wrappers"; - nativeBuildInputs = [ pkgs.makeWrapper ]; - buildCommand = '' - mkdir -p $out/bin - ${concatStringsSep "\n" (mapAttrsToList (network: data: - optionalString (versionAtLeast data.package.version "1.1pre") '' - makeWrapper ${data.package}/bin/tinc "$out/bin/tinc.${network}" \ - --add-flags "--pidfile=/run/tinc.${network}.pid" \ - --add-flags "--config=/etc/tinc/${network}" - '') cfg.networks)} - ''; - }; - in [ cli-wrappers ]; - - users.users = flip mapAttrs' cfg.networks (network: _: - nameValuePair ("tinc.${network}") ({ - description = "Tinc daemon user for ${network}"; - isSystemUser = true; - group = "tinc.${network}"; - }) - ); - users.groups = flip mapAttrs' cfg.networks (network: _: - nameValuePair "tinc.${network}" {} - ); - }; + users.users = flip mapAttrs' cfg.networks (network: _: + nameValuePair ("tinc.${network}") ({ + description = "Tinc daemon user for ${network}"; + isSystemUser = true; + group = "tinc.${network}"; + }) + ); + users.groups = flip mapAttrs' cfg.networks (network: _: + nameValuePair "tinc.${network}" {} + ); + }); meta.maintainers = with maintainers; [ minijackson mic92 ]; } diff --git a/nixos/modules/services/networking/tmate-ssh-server.nix b/nixos/modules/services/networking/tmate-ssh-server.nix index 1b8f6662ef4c..ff4ce0773309 100644 --- a/nixos/modules/services/networking/tmate-ssh-server.nix +++ b/nixos/modules/services/networking/tmate-ssh-server.nix @@ -28,7 +28,7 @@ in host = mkOption { type = types.str; description = mdDoc "External host name"; - defaultText = lib.literalExpression "config.networking.domain or config.networking.hostName "; + defaultText = lib.literalExpression "config.networking.domain or config.networking.hostName"; default = if domain == null then config.networking.hostName @@ -44,7 +44,7 @@ in openFirewall = mkOption { type = types.bool; - default = true; + default = false; description = mdDoc "Whether to automatically open the specified ports in the firewall."; }; diff --git a/nixos/modules/services/networking/tox-node.nix b/nixos/modules/services/networking/tox-node.nix index fa5b241f9183..884fd55dae51 100644 --- a/nixos/modules/services/networking/tox-node.nix +++ b/nixos/modules/services/networking/tox-node.nix @@ -8,7 +8,7 @@ let homeDir = "/var/lib/tox-node"; configFile = let - src = "${pkg.src}/dpkg/config.yml"; + src = "${pkg.src}/tox_node/dpkg/config.yml"; confJSON = pkgs.writeText "config.json" ( builtins.toJSON { log-type = cfg.logType; diff --git a/nixos/modules/services/networking/twingate.nix b/nixos/modules/services/networking/twingate.nix new file mode 100644 index 000000000000..17140bffd218 --- /dev/null +++ b/nixos/modules/services/networking/twingate.nix @@ -0,0 +1,28 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.twingate; + +in { + + options.services.twingate = { + enable = mkEnableOption (lib.mdDoc "Twingate Client daemon"); + }; + + config = mkIf cfg.enable { + + networking.firewall.checkReversePath = lib.mkDefault false; + networking.networkmanager.enable = true; + + environment.systemPackages = [ pkgs.twingate ]; # for the CLI + systemd.packages = [ pkgs.twingate ]; + + systemd.services.twingate.preStart = '' + cp -r -n ${pkgs.twingate}/etc/twingate/. /etc/twingate/ + ''; + + systemd.services.twingate.wantedBy = [ "multi-user.target" ]; + }; +} diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index fa24c70e63de..c85dd03867f7 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -245,7 +245,7 @@ in { NotifyAccess = "main"; Type = "notify"; - # FIXME: Which of these do we actualy need, can we drop the chroot flag? + # FIXME: Which of these do we actually need, can we drop the chroot flag? AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_NET_RAW" diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index d30f7c89633b..91eb385518c3 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -24,8 +24,8 @@ in services.unifi.jrePackage = mkOption { type = types.package; - default = pkgs.jre8; - defaultText = literalExpression "pkgs.jre8"; + default = if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3") then pkgs.jdk11 else pkgs.jre8; + defaultText = literalExpression ''if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3" then pkgs.jdk11 else pkgs.jre8''; description = lib.mdDoc '' The JRE package to use. Check the release notes to ensure it is supported. ''; @@ -33,8 +33,8 @@ in services.unifi.unifiPackage = mkOption { type = types.package; - default = pkgs.unifiLTS; - defaultText = literalExpression "pkgs.unifiLTS"; + default = pkgs.unifi5; + defaultText = literalExpression "pkgs.unifi5"; description = lib.mdDoc '' The unifi package to use. ''; @@ -42,10 +42,10 @@ in services.unifi.mongodbPackage = mkOption { type = types.package; - default = pkgs.mongodb; + default = pkgs.mongodb-4_2; defaultText = literalExpression "pkgs.mongodb"; description = lib.mdDoc '' - The mongodb package to use. + The mongodb package to use. Please note: unifi7 officially only supports mongodb up until 3.6 but works with 4.2. ''; }; @@ -76,7 +76,7 @@ in default = null; example = 4096; description = lib.mdDoc '' - Set the maximimum heap size for the JVM in MB. If this option isn't set, the + Set the maximum heap size for the JVM in MB. If this option isn't set, the JVM will decide this value at runtime. ''; }; diff --git a/nixos/modules/services/networking/v2raya.nix b/nixos/modules/services/networking/v2raya.nix new file mode 100644 index 000000000000..2d697b4fb56f --- /dev/null +++ b/nixos/modules/services/networking/v2raya.nix @@ -0,0 +1,39 @@ +{ config, pkgs, lib, ... }: + +with lib; + +{ + options = { + services.v2raya = { + enable = options.mkEnableOption (mdDoc "the v2rayA service"); + }; + }; + + config = mkIf config.services.v2raya.enable { + environment.systemPackages = [ pkgs.v2raya ]; + + systemd.services.v2raya = { + unitConfig = { + Description = "v2rayA service"; + Documentation = "https://github.com/v2rayA/v2rayA/wiki"; + After = [ "network.target" "nss-lookup.target" "iptables.service" "ip6tables.service" ]; + Wants = [ "network.target" ]; + }; + + serviceConfig = { + User = "root"; + ExecStart = "${getExe pkgs.v2raya} --log-disable-timestamp"; + Environment = [ "V2RAYA_LOG_FILE=/var/log/v2raya/v2raya.log" ]; + LimitNPROC = 500; + LimitNOFILE = 1000000; + Restart = "on-failure"; + Type = "simple"; + }; + + wantedBy = [ "multi-user.target" ]; + path = with pkgs; [ iptables bash iproute2 ]; # required by v2rayA TProxy functionality + }; + }; + + meta.maintainers = with maintainers; [ elliot ]; +} diff --git a/nixos/modules/services/networking/vdirsyncer.nix b/nixos/modules/services/networking/vdirsyncer.nix index 6a069943434d..f9b880c763e3 100644 --- a/nixos/modules/services/networking/vdirsyncer.nix +++ b/nixos/modules/services/networking/vdirsyncer.nix @@ -71,7 +71,7 @@ in services.vdirsyncer = { enable = mkEnableOption (mdDoc "vdirsyncer"); - package = mkPackageOption pkgs "vdirsyncer" {}; + package = mkPackageOptionMD pkgs "vdirsyncer" {}; jobs = mkOption { description = mdDoc "vdirsyncer job configurations"; diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index 5fee7b66a4dc..b1f0f7403243 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -168,7 +168,7 @@ in The default is a file containing the users from {option}`userlist`. - If explicitely set to null userlist_file will not be set in vsftpd's config file. + If explicitly set to null userlist_file will not be set in vsftpd's config file. ''; }; diff --git a/nixos/modules/services/networking/webhook.nix b/nixos/modules/services/networking/webhook.nix new file mode 100644 index 000000000000..2a78491941cf --- /dev/null +++ b/nixos/modules/services/networking/webhook.nix @@ -0,0 +1,214 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.webhook; + defaultUser = "webhook"; + + hookFormat = pkgs.formats.json {}; + + hookType = types.submodule ({ name, ... }: { + freeformType = hookFormat.type; + options = { + id = mkOption { + type = types.str; + default = name; + description = mdDoc '' + The ID of your hook. This value is used to create the HTTP endpoint (`protocol://yourserver:port/prefix/''${id}`). + ''; + }; + execute-command = mkOption { + type = types.str; + description = mdDoc "The command that should be executed when the hook is triggered."; + }; + }; + }); + + hookFiles = mapAttrsToList (name: hook: hookFormat.generate "webhook-${name}.json" [ hook ]) cfg.hooks + ++ mapAttrsToList (name: hook: pkgs.writeText "webhook-${name}.json.tmpl" "[${hook}]") cfg.hooksTemplated; + +in { + options = { + services.webhook = { + enable = mkEnableOption (mdDoc '' + [Webhook](https://github.com/adnanh/webhook), a server written in Go that allows you to create HTTP endpoints (hooks), + which execute configured commands for any person or service that knows the URL + ''); + + package = mkPackageOptionMD pkgs "webhook" {}; + user = mkOption { + type = types.str; + default = defaultUser; + description = mdDoc '' + Webhook will be run under this user. + + If set, you must create this user yourself! + ''; + }; + group = mkOption { + type = types.str; + default = defaultUser; + description = mdDoc '' + Webhook will be run under this group. + + If set, you must create this group yourself! + ''; + }; + ip = mkOption { + type = types.str; + default = "0.0.0.0"; + description = mdDoc '' + The IP webhook should serve hooks on. + + The default means it can be reached on any interface if `openFirewall = true`. + ''; + }; + port = mkOption { + type = types.port; + default = 9000; + description = mdDoc "The port webhook should be reachable from."; + }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Open the configured port in the firewall for external ingress traffic. + Preferably the Webhook server is instead put behind a reverse proxy. + ''; + }; + enableTemplates = mkOption { + type = types.bool; + default = cfg.hooksTemplated != {}; + defaultText = literalExpression "hooksTemplated != {}"; + description = mdDoc '' + Enable the generated hooks file to be parsed as a Go template. + See [the documentation](https://github.com/adnanh/webhook/blob/master/docs/Templates.md) for more information. + ''; + }; + urlPrefix = mkOption { + type = types.str; + default = "hooks"; + description = mdDoc '' + The URL path prefix to use for served hooks (`protocol://yourserver:port/''${prefix}/hook-id`). + ''; + }; + hooks = mkOption { + type = types.attrsOf hookType; + default = {}; + example = { + echo = { + execute-command = "echo"; + response-message = "Webhook is reachable!"; + }; + redeploy-webhook = { + execute-command = "/var/scripts/redeploy.sh"; + command-working-directory = "/var/webhook"; + }; + }; + description = mdDoc '' + The actual configuration of which hooks will be served. + + Read more on the [project homepage] and on the [hook definition] page. + At least one hook needs to be configured. + + [hook definition]: https://github.com/adnanh/webhook/blob/master/docs/Hook-Definition.md + [project homepage]: https://github.com/adnanh/webhook#configuration + ''; + }; + hooksTemplated = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { + echo-template = '' + { + "id": "echo-template", + "execute-command": "echo", + "response-message": "{{ getenv "MESSAGE" }}" + } + ''; + }; + description = mdDoc '' + Same as {option}`hooks`, but these hooks are specified as literal strings instead of Nix values, + and hence can include [template syntax](https://github.com/adnanh/webhook/blob/master/docs/Templates.md) + which might not be representable as JSON. + + Template syntax requires the {option}`enableTemplates` option to be set to `true`, which is + done by default if this option is set. + ''; + }; + verbose = mkOption { + type = types.bool; + default = true; + description = mdDoc "Whether to show verbose output."; + }; + extraArgs = mkOption { + type = types.listOf types.str; + default = []; + example = [ "-secure" ]; + description = mdDoc '' + These are arguments passed to the webhook command in the systemd service. + You can find the available arguments and options in the [documentation][parameters]. + + [parameters]: https://github.com/adnanh/webhook/blob/master/docs/Webhook-Parameters.md + ''; + }; + environment = mkOption { + type = types.attrsOf types.str; + default = {}; + description = mdDoc "Extra environment variables passed to webhook."; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = let + overlappingHooks = builtins.intersectAttrs cfg.hooks cfg.hooksTemplated; + in [ + { + assertion = hookFiles != []; + message = "At least one hook needs to be configured for webhook to run."; + } + { + assertion = overlappingHooks == {}; + message = "`services.webhook.hooks` and `services.webhook.hooksTemplated` have overlapping attribute(s): ${concatStringsSep ", " (builtins.attrNames overlappingHooks)}"; + } + ]; + + users.users = mkIf (cfg.user == defaultUser) { + ${defaultUser} = + { + isSystemUser = true; + group = cfg.group; + description = "Webhook daemon user"; + }; + }; + + users.groups = mkIf (cfg.user == defaultUser && cfg.group == defaultUser) { + ${defaultUser} = {}; + }; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + + systemd.services.webhook = { + description = "Webhook service"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + environment = config.networking.proxy.envVars // cfg.environment; + script = let + args = [ "-ip" cfg.ip "-port" (toString cfg.port) "-urlprefix" cfg.urlPrefix ] + ++ concatMap (hook: [ "-hooks" hook ]) hookFiles + ++ optional cfg.enableTemplates "-template" + ++ optional cfg.verbose "-verbose" + ++ cfg.extraArgs; + in '' + ${cfg.package}/bin/webhook ${escapeShellArgs args} + ''; + serviceConfig = { + Restart = "on-failure"; + User = cfg.user; + Group = cfg.group; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/wg-quick.nix b/nixos/modules/services/networking/wg-quick.nix index a678d743bb77..34210580f538 100644 --- a/nixos/modules/services/networking/wg-quick.nix +++ b/nixos/modules/services/networking/wg-quick.nix @@ -273,7 +273,11 @@ let after = [ "network.target" "network-online.target" ]; wantedBy = optional values.autostart "multi-user.target"; environment.DEVICE = name; - path = [ pkgs.kmod pkgs.wireguard-tools config.networking.resolvconf.package ]; + path = [ + pkgs.wireguard-tools + config.networking.firewall.package # iptables or nftables + config.networking.resolvconf.package # openresolv or systemd + ]; serviceConfig = { Type = "oneshot"; @@ -281,7 +285,7 @@ let }; script = '' - ${optionalString (!config.boot.isContainer) "modprobe wireguard"} + ${optionalString (!config.boot.isContainer) "${pkgs.kmod}/bin/modprobe wireguard"} ${optionalString (values.configFile != null) '' cp ${values.configFile} ${configPath} ''} diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index e3c3d3ba3c96..1d6556f626be 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -251,6 +251,21 @@ let ''; }; + dynamicEndpointRefreshRestartSeconds = mkOption { + default = null; + example = 5; + type = with types; nullOr ints.unsigned; + description = lib.mdDoc '' + When the dynamic endpoint refresh that is configured via + dynamicEndpointRefreshSeconds exits (likely due to a failure), + restart that service after this many seconds. + + If set to `null` the value of + {option}`networking.wireguard.dynamicEndpointRefreshSeconds` + will be used as the default. + ''; + }; + persistentKeepalive = mkOption { default = null; type = with types; nullOr int; @@ -288,7 +303,7 @@ let set -e # If the parent dir does not already exist, create it. - # Otherwise, does nothing, keeping existing permisions intact. + # Otherwise, does nothing, keeping existing permissions intact. mkdir -p --mode 0755 "${dirOf values.privateKeyFile}" if [ ! -f "${values.privateKeyFile}" ]; then @@ -300,7 +315,7 @@ let peerUnitServiceName = interfaceName: publicKey: dynamicRefreshEnabled: let - keyToUnitName = replaceChars + keyToUnitName = replaceStrings [ "/" "-" " " "+" "=" ] [ "-" "\\x2d" "\\x20" "\\x2b" "\\x3d" ]; unitName = keyToUnitName publicKey; @@ -348,7 +363,16 @@ let # cannot be used with systemd timers (see `man systemd.timer`), # which is why `simple` with a loop is the best choice here. # It also makes starting and stopping easiest. + # + # Restart if the service exits (e.g. when wireguard gives up after "Name or service not known" dns failures): + Restart = "always"; + RestartSec = if null != peer.dynamicEndpointRefreshRestartSeconds + then peer.dynamicEndpointRefreshRestartSeconds + else peer.dynamicEndpointRefreshSeconds; }; + unitConfig = lib.optionalAttrs dynamicRefreshEnabled { + StartLimitIntervalSec = 0; + }; script = let wg_setup = concatStringsSep " " ( diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 119575bdddb4..0595e9e6df23 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -121,11 +121,15 @@ let ''} # substitute environment variables - ${pkgs.gawk}/bin/awk '{ - for(varname in ENVIRON) - gsub("@"varname"@", ENVIRON[varname]) - print - }' "${configFile}" > "${finalConfig}" + if [ -f "${configFile}" ]; then + ${pkgs.gawk}/bin/awk '{ + for(varname in ENVIRON) + gsub("@"varname"@", ENVIRON[varname]) + print + }' "${configFile}" > "${finalConfig}" + else + touch "${finalConfig}" + fi iface_args="-s ${optionalString cfg.dbusControlled "-u"} -D${cfg.driver} ${configStr}" diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix index 2ec0cd18dcba..b9120f37ba24 100644 --- a/nixos/modules/services/networking/xinetd.nix +++ b/nixos/modules/services/networking/xinetd.nix @@ -78,7 +78,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 0; example = 123; description = lib.mdDoc "Port number of the service."; diff --git a/nixos/modules/services/networking/yggdrasil.xml b/nixos/modules/services/networking/yggdrasil.md similarity index 66% rename from nixos/modules/services/networking/yggdrasil.xml rename to nixos/modules/services/networking/yggdrasil.md index bc9da84fa431..bbaea5bc74aa 100644 --- a/nixos/modules/services/networking/yggdrasil.xml +++ b/nixos/modules/services/networking/yggdrasil.md @@ -1,25 +1,18 @@ - - - Yggdrasil - - Source: - modules/services/networking/yggdrasil/default.nix - - - Upstream documentation: - - - +# Yggdrasil {#module-services-networking-yggdrasil} + +*Source:* {file}`modules/services/networking/yggdrasil/default.nix` + +*Upstream documentation:* + Yggdrasil is an early-stage implementation of a fully end-to-end encrypted, self-arranging IPv6 network. - -
- Configuration -
- Simple ephemeral node - + +## Configuration {#module-services-networking-yggdrasil-configuration} + +### Simple ephemeral node {#module-services-networking-yggdrasil-configuration-simple} + An annotated example of a simple configuration: - +``` { services.yggdrasil = { enable = true; @@ -30,7 +23,7 @@ An annotated example of a simple configuration: settings = { Peers = [ # Yggdrasil will automatically connect and "peer" with other nodes it - # discovers via link-local multicast annoucements. Unless this is the + # discovers via link-local multicast announcements. Unless this is the # case (it probably isn't) a node needs peers within the existing # network that it can tunnel to. "tcp://1.2.3.4:1024" @@ -41,14 +34,12 @@ An annotated example of a simple configuration: }; }; } - - -
-
- Persistent node with prefix - +``` + +### Persistent node with prefix {#module-services-networking-yggdrasil-configuration-prefix} + A node with a fixed address that announces a prefix: - +``` let address = "210:5217:69c0:9afc:1b95:b9f:8718:c3d2"; prefix = "310:5217:69c0:9afc"; @@ -78,7 +69,7 @@ in { }]; services.radvd = { - # Annouce the 300::/8 prefix to eth0. + # Announce the 300::/8 prefix to eth0. enable = true; config = '' interface eth0 @@ -93,15 +84,13 @@ in { ''; }; } - - -
-
- Yggdrasil attached Container - +``` + +### Yggdrasil attached Container {#module-services-networking-yggdrasil-configuration-container} + A NixOS container attached to the Yggdrasil network via a node running on the host: - +``` let yggPrefix64 = "310:5217:69c0:9afc"; # Again, taken from the output of "yggdrasilctl getself". @@ -112,10 +101,10 @@ in networking = { bridges.br0.interfaces = [ ]; - # A bridge only to containers… + # A bridge only to containers… interfaces.br0 = { - # … configured with a prefix address. + # … configured with a prefix address. ipv6.addresses = [{ address = "${yggPrefix64}::1"; prefixLength = 64; @@ -149,8 +138,4 @@ in }; } - - -
-
-
+``` diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix index 3d5cbdd2dc3e..fd7193154c6c 100644 --- a/nixos/modules/services/networking/yggdrasil.nix +++ b/nixos/modules/services/networking/yggdrasil.nix @@ -193,7 +193,7 @@ in { environment.systemPackages = [ cfg.package ]; }); meta = { - doc = ./yggdrasil.xml; + doc = ./yggdrasil.md; maintainers = with lib.maintainers; [ gazally ehmry ]; }; } diff --git a/nixos/modules/services/networking/znc/default.nix b/nixos/modules/services/networking/znc/default.nix index 2befab373ba0..d3ba4a524197 100644 --- a/nixos/modules/services/networking/znc/default.nix +++ b/nixos/modules/services/networking/znc/default.nix @@ -169,7 +169,7 @@ in gracefully be applied to this option. If you intend to update the configuration through this option, be sure - to enable {option}`services.znc.mutable`, otherwise none of the + to disable {option}`services.znc.mutable`, otherwise none of the changes here will be applied after the initial deploy. ''; }; diff --git a/nixos/modules/services/networking/znc/options.nix b/nixos/modules/services/networking/znc/options.nix index ce8e7a89a4df..bd67ec86d513 100644 --- a/nixos/modules/services/networking/znc/options.nix +++ b/nixos/modules/services/networking/znc/options.nix @@ -18,7 +18,7 @@ let }; port = mkOption { - type = types.ints.u16; + type = types.port; default = 6697; description = lib.mdDoc '' IRC server port. @@ -188,7 +188,7 @@ in port = mkOption { default = 5000; - type = types.int; + type = types.port; description = lib.mdDoc '' Specifies the port on which to listen. ''; diff --git a/nixos/modules/services/printing/cups-pdf.nix b/nixos/modules/services/printing/cups-pdf.nix new file mode 100644 index 000000000000..07f24367132f --- /dev/null +++ b/nixos/modules/services/printing/cups-pdf.nix @@ -0,0 +1,185 @@ +{ config, lib, pkgs, ... }: + +let + + # cups calls its backends as user `lp` (which is good!), + # but cups-pdf wants to be called as `root`, so it can change ownership of files. + # We add a suid wrapper and a wrapper script to trick cups into calling the suid wrapper. + # Note that a symlink to the suid wrapper alone wouldn't suffice, cups would complain + # > File "/nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-cups-progs/lib/cups/backend/cups-pdf" has insecure permissions (0104554/uid=0/gid=20) + + # wrapper script that redirects calls to the suid wrapper + cups-pdf-wrapper = pkgs.writeTextFile { + name = "${pkgs.cups-pdf-to-pdf.name}-wrapper.sh"; + executable = true; + destination = "/lib/cups/backend/cups-pdf"; + checkPhase = '' + ${pkgs.stdenv.shellDryRun} "$target" + ${lib.getExe pkgs.shellcheck} "$target" + ''; + text = '' + #! ${pkgs.runtimeShell} + exec "${config.security.wrapperDir}/cups-pdf" "$@" + ''; + }; + + # wrapped cups-pdf package that uses the suid wrapper + cups-pdf-wrapped = pkgs.buildEnv { + name = "${pkgs.cups-pdf-to-pdf.name}-wrapped"; + # using the wrapper as first path ensures it is used + paths = [ cups-pdf-wrapper pkgs.cups-pdf-to-pdf ]; + ignoreCollisions = true; + }; + + instanceSettings = name: { + freeformType = with lib.types; nullOr (oneOf [ int str path package ]); + # override defaults: + # inject instance name into paths, + # also avoid conflicts between user names and special dirs + options.Out = lib.mkOption { + type = with lib.types; nullOr singleLineStr; + default = "/var/spool/cups-pdf-${name}/users/\${USER}"; + defaultText = "/var/spool/cups-pdf-{instance-name}/users/\${USER}"; + example = "\${HOME}/cups-pdf"; + description = lib.mdDoc '' + output directory; + `''${HOME}` will be expanded to the user's home directory, + `''${USER}` will be expanded to the user name. + ''; + }; + options.AnonDirName = lib.mkOption { + type = with lib.types; nullOr singleLineStr; + default = "/var/spool/cups-pdf-${name}/anonymous"; + defaultText = "/var/spool/cups-pdf-{instance-name}/anonymous"; + example = "/var/lib/cups-pdf"; + description = lib.mdDoc "path for anonymously created PDF files"; + }; + options.Spool = lib.mkOption { + type = with lib.types; nullOr singleLineStr; + default = "/var/spool/cups-pdf-${name}/spool"; + defaultText = "/var/spool/cups-pdf-{instance-name}/spool"; + example = "/var/lib/cups-pdf"; + description = lib.mdDoc "spool directory"; + }; + options.Anonuser = lib.mkOption { + type = lib.types.singleLineStr; + default = "root"; + description = lib.mdDoc '' + User for anonymous PDF creation. + An empty string disables this feature. + ''; + }; + options.GhostScript = lib.mkOption { + type = with lib.types; nullOr path; + default = lib.getExe pkgs.ghostscript; + defaultText = lib.literalExpression "lib.getExe pkgs.ghostscript"; + example = lib.literalExpression ''''${pkgs.ghostscript}/bin/ps2pdf''; + description = lib.mdDoc "location of GhostScript binary"; + }; + }; + + instanceConfig = { name, config, ... }: { + options = { + enable = (lib.mkEnableOption (lib.mdDoc "this cups-pdf instance")) // { default = true; }; + installPrinter = (lib.mkEnableOption (lib.mdDoc '' + a CUPS printer queue for this instance. + The queue will be named after the instance and will use the {file}`CUPS-PDF_opt.ppd` ppd file. + If this is disabled, you need to add the queue yourself to use the instance + '')) // { default = true; }; + confFileText = lib.mkOption { + type = lib.types.lines; + description = lib.mdDoc '' + This will contain the contents of {file}`cups-pdf.conf` for this instance, derived from {option}`settings`. + You can use this option to append text to the file. + ''; + }; + settings = lib.mkOption { + type = lib.types.submodule (instanceSettings name); + default = {}; + example = { + Out = "\${HOME}/cups-pdf"; + UserUMask = "0033"; + }; + description = lib.mdDoc '' + Settings for a cups-pdf instance, see the descriptions in the template config file in the cups-pdf package. + The key value pairs declared here will be translated into proper key value pairs for {file}`cups-pdf.conf`. + Setting a value to `null` disables the option and removes it from the file. + ''; + }; + }; + config.confFileText = lib.pipe config.settings [ + (lib.filterAttrs (key: value: value != null)) + (lib.mapAttrs (key: builtins.toString)) + (lib.mapAttrsToList (key: value: "${key} ${value}\n")) + lib.concatStrings + ]; + }; + + cupsPdfCfg = config.services.printing.cups-pdf; + + copyConfigFileCmds = lib.pipe cupsPdfCfg.instances [ + (lib.filterAttrs (name: lib.getAttr "enable")) + (lib.mapAttrs (name: lib.getAttr "confFileText")) + (lib.mapAttrs (name: pkgs.writeText "cups-pdf-${name}.conf")) + (lib.mapAttrsToList (name: confFile: "ln --symbolic --no-target-directory ${confFile} /var/lib/cups/cups-pdf-${name}.conf\n")) + lib.concatStrings + ]; + + printerSettings = lib.pipe cupsPdfCfg.instances [ + (lib.filterAttrs (name: lib.getAttr "enable")) + (lib.filterAttrs (name: lib.getAttr "installPrinter")) + (lib.mapAttrsToList (name: instance: (lib.mapAttrs (key: lib.mkDefault) { + inherit name; + model = "CUPS-PDF_opt.ppd"; + deviceUri = "cups-pdf:/${name}"; + description = "virtual printer for cups-pdf instance ${name}"; + location = instance.settings.Out; + }))) + ]; + +in + +{ + + options.services.printing.cups-pdf = { + enable = lib.mkEnableOption (lib.mdDoc '' + the cups-pdf virtual pdf printer backend. + By default, this will install a single printer `pdf`. + but this can be changed/extended with {option}`services.printing.cups-pdf.instances` + ''); + instances = lib.mkOption { + type = lib.types.attrsOf (lib.types.submodule instanceConfig); + default.pdf = {}; + example.pdf.settings = { + Out = "\${HOME}/cups-pdf"; + UserUMask = "0033"; + }; + description = lib.mdDoc '' + Permits to raise one or more cups-pdf instances. + Each instance is named by an attribute name, and the attribute's values control the instance' configuration. + ''; + }; + }; + + config = lib.mkIf cupsPdfCfg.enable { + services.printing.enable = true; + services.printing.drivers = [ cups-pdf-wrapped ]; + hardware.printers.ensurePrinters = printerSettings; + # the cups module will install the default config file, + # but we don't need it and it would confuse cups-pdf + systemd.services.cups.preStart = lib.mkAfter '' + rm -f /var/lib/cups/cups-pdf.conf + ${copyConfigFileCmds} + ''; + security.wrappers.cups-pdf = { + group = "lp"; + owner = "root"; + permissions = "+r,ug+x"; + setuid = true; + source = "${pkgs.cups-pdf-to-pdf}/lib/cups/backend/cups-pdf"; + }; + }; + + meta.maintainers = [ lib.maintainers.yarny ]; + +} diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index ae59dcc226de..9ac89e057620 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -341,7 +341,7 @@ in systemd.sockets.cups = mkIf cfg.startWhenNeeded { wantedBy = [ "sockets.target" ]; - listenStreams = [ "/run/cups/cups.sock" ] + listenStreams = [ "" "/run/cups/cups.sock" ] ++ map (x: replaceStrings ["localhost"] ["127.0.0.1"] (removePrefix "*:" x)) cfg.listenAddresses; }; @@ -395,10 +395,7 @@ in ''} ''; - serviceConfig = { - PrivateTmp = true; - RuntimeDirectory = [ "cups" ]; - }; + serviceConfig.PrivateTmp = true; }; systemd.services.cups-browsed = mkIf avahiEnabled diff --git a/nixos/modules/services/printing/ipp-usb.nix b/nixos/modules/services/printing/ipp-usb.nix new file mode 100644 index 000000000000..8ed2ff826871 --- /dev/null +++ b/nixos/modules/services/printing/ipp-usb.nix @@ -0,0 +1,63 @@ +{ config, lib, pkgs, ... }: { + options = { + services.ipp-usb = { + enable = lib.mkEnableOption (lib.mdDoc "ipp-usb, a daemon to turn an USB printer/scanner supporting IPP everywhere (aka AirPrint, WSD, AirScan) into a locally accessible network printer/scanner"); + }; + }; + config = lib.mkIf config.services.ipp-usb.enable { + systemd.services.ipp-usb = { + description = "Daemon for IPP over USB printer support"; + after = [ "cups.service" "avahi-daemon.service" ]; + wants = [ "avahi-daemon.service" ]; + serviceConfig = { + ExecStart = [ "${pkgs.ipp-usb}/bin/ipp-usb" ]; + Type = "simple"; + Restart = "on-failure"; + StateDirectory = "ipp-usb"; + LogsDirectory = "ipp-usb"; + + # hardening. + ProtectHome = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectControlGroups = true; + MemoryDenyWriteExecute = true; + # breaks the daemon, presumably because it messes with DeviceAllow + ProtectClock = false; + ProtectKernelTunables = true; + ProtectKernelLogs = true; + ProtectSystem = "strict"; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + PrivateMounts = true; + ProtectHostname = true; + ProtectKernelModules = true; + RemoveIPC = true; + RestrictNamespaces = true; + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_NETLINK" "AF_INET" "AF_INET6" ]; + ProtectProc = "noaccess"; + }; + }; + + # starts the systemd service + services.udev.packages = [ pkgs.ipp-usb ]; + services.avahi = { + enable = true; + publish = { + enable = true; + userServices = true; + }; + }; + # enable printing and scanning by default, but not required. + services.printing.enable = lib.mkDefault true; + hardware.sane.enable = lib.mkDefault true; + # so that sane discovers scanners + hardware.sane.extraBackends = [ pkgs.sane-airscan ]; + }; +} + + diff --git a/nixos/modules/services/search/elasticsearch-curator.nix b/nixos/modules/services/search/elasticsearch-curator.nix index f073ec7cf2bd..0a21d705ef87 100644 --- a/nixos/modules/services/search/elasticsearch-curator.nix +++ b/nixos/modules/services/search/elasticsearch-curator.nix @@ -50,7 +50,7 @@ in { }; port = mkOption { description = lib.mdDoc "the port that elasticsearch is listening on"; - type = types.int; + type = types.port; default = 9200; }; actionYAML = mkOption { diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 4a9dd50310e2..fa1627566ebe 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -66,7 +66,7 @@ in port = mkOption { description = lib.mdDoc "Elasticsearch port to listen for HTTP traffic."; default = 9200; - type = types.int; + type = types.port; }; tcp_port = mkOption { diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix index ffc7c4b68cae..5eb2381d5d39 100644 --- a/nixos/modules/services/search/kibana.nix +++ b/nixos/modules/services/search/kibana.nix @@ -43,7 +43,7 @@ in { port = mkOption { description = lib.mdDoc "Kibana listening port"; default = 5601; - type = types.int; + type = types.port; }; cert = mkOption { diff --git a/nixos/modules/services/search/meilisearch.md b/nixos/modules/services/search/meilisearch.md index 98e7c542cb9a..98af396117c8 100644 --- a/nixos/modules/services/search/meilisearch.md +++ b/nixos/modules/services/search/meilisearch.md @@ -2,7 +2,7 @@ Meilisearch is a lightweight, fast and powerful search engine. Think elastic search with a much smaller footprint. -## Quickstart +## Quickstart {#module-services-meilisearch-quickstart} the minimum to start meilisearch is @@ -14,19 +14,19 @@ this will start the http server included with meilisearch on port 7700. test with `curl -X GET 'http://localhost:7700/health'` -## Usage +## Usage {#module-services-meilisearch-usage} you first need to add documents to an index before you can search for documents. -### Add a documents to the `movies` index +### Add a documents to the `movies` index {#module-services-meilisearch-quickstart-add} `curl -X POST 'http://127.0.0.1:7700/indexes/movies/documents' --data '[{"id": "123", "title": "Superman"}, {"id": 234, "title": "Batman"}]'` -### Search documents in the `movies` index +### Search documents in the `movies` index {#module-services-meilisearch-quickstart-search} `curl 'http://127.0.0.1:7700/indexes/movies/search' --data '{ "q": "botman" }'` (note the typo is intentional and there to demonstrate the typo tolerant capabilities) -## Defaults +## Defaults {#module-services-meilisearch-defaults} - The default nixos package doesn't come with the [dashboard](https://docs.meilisearch.com/learn/getting_started/quick_start.html#search), since the dashboard features makes some assets downloads at compile time. @@ -34,6 +34,6 @@ you first need to add documents to an index before you can search for documents. - Default deployment is development mode. It doesn't require a secret master key. All routes are not protected and accessible. -## Missing +## Missing {#module-services-meilisearch-missing} - the snapshot feature is not yet configurable from the module, it's just a matter of adding the relevant environment variables. diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index 9262b927cba4..73567ca0bc98 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/nixos/modules/services/search/meilisearch.nix @@ -9,9 +9,7 @@ in { meta.maintainers = with maintainers; [ Br1ght0ne happysalada ]; - # Don't edit the docbook xml directly, edit the md and generate it: - # `pandoc meilisearch.md -t docbook --top-level-division=chapter --extract-media=media -f markdown+smart > meilisearch.xml` - meta.doc = ./meilisearch.xml; + meta.doc = ./meilisearch.md; ###### interface @@ -21,7 +19,7 @@ in package = mkOption { description = lib.mdDoc "The package to use for meilisearch. Use this if you require specific features to be enabled. The default package has no features."; default = pkgs.meilisearch; - defaultText = "pkgs.meilisearch"; + defaultText = lib.literalExpression "pkgs.meilisearch"; type = types.package; }; diff --git a/nixos/modules/services/search/meilisearch.xml b/nixos/modules/services/search/meilisearch.xml deleted file mode 100644 index c1a73f358c28..000000000000 --- a/nixos/modules/services/search/meilisearch.xml +++ /dev/null @@ -1,85 +0,0 @@ - - Meilisearch - - Meilisearch is a lightweight, fast and powerful search engine. Think - elastic search with a much smaller footprint. - -
- Quickstart - - the minimum to start meilisearch is - - -services.meilisearch.enable = true; - - - this will start the http server included with meilisearch on port - 7700. - - - test with - curl -X GET 'http://localhost:7700/health' - -
-
- Usage - - you first need to add documents to an index before you can search - for documents. - -
- Add a documents to the <literal>movies</literal> - index - - curl -X POST 'http://127.0.0.1:7700/indexes/movies/documents' --data '[{"id": "123", "title": "Superman"}, {"id": 234, "title": "Batman"}]' - -
-
- Search documents in the <literal>movies</literal> - index - - curl 'http://127.0.0.1:7700/indexes/movies/search' --data '{ "q": "botman" }' - (note the typo is intentional and there to demonstrate the typo - tolerant capabilities) - -
-
-
- Defaults - - - - The default nixos package doesn’t come with the - dashboard, - since the dashboard features makes some assets downloads at - compile time. - - - - - Anonimized Analytics sent to meilisearch are disabled by - default. - - - - - Default deployment is development mode. It doesn’t require a - secret master key. All routes are not protected and - accessible. - - - -
-
- Missing - - - - the snapshot feature is not yet configurable from the module, - it’s just a matter of adding the relevant environment - variables. - - - -
-
diff --git a/nixos/modules/services/security/aesmd.nix b/nixos/modules/services/security/aesmd.nix index 7b0a46d6d029..8b3f010d7c4d 100644 --- a/nixos/modules/services/security/aesmd.nix +++ b/nixos/modules/services/security/aesmd.nix @@ -25,6 +25,22 @@ in default = false; description = lib.mdDoc "Whether to build the PSW package in debug mode."; }; + environment = mkOption { + type = with types; attrsOf str; + default = { }; + description = mdDoc "Additional environment variables to pass to the AESM service."; + # Example environment variable for `sgx-azure-dcap-client` provider library + example = { + AZDCAP_COLLATERAL_VERSION = "v2"; + AZDCAP_DEBUG_LOG_LEVEL = "INFO"; + }; + }; + quoteProviderLibrary = mkOption { + type = with types; nullOr path; + default = null; + example = literalExpression "pkgs.sgx-azure-dcap-client"; + description = lib.mdDoc "Custom quote provider library to use."; + }; settings = mkOption { description = lib.mdDoc "AESM configuration"; default = { }; @@ -83,7 +99,6 @@ in storeAesmFolder = "${sgx-psw}/aesm"; # Hardcoded path AESM_DATA_FOLDER in psw/ae/aesm_service/source/oal/linux/aesm_util.cpp aesmDataFolder = "/var/opt/aesmd/data"; - aesmStateDirSystemd = "%S/aesmd"; in { description = "Intel Architectural Enclave Service Manager"; @@ -98,8 +113,8 @@ in environment = { NAME = "aesm_service"; AESM_PATH = storeAesmFolder; - LD_LIBRARY_PATH = storeAesmFolder; - }; + LD_LIBRARY_PATH = makeLibraryPath [ cfg.quoteProviderLibrary ]; + } // cfg.environment; # Make sure any of the SGX application enclave devices is available unitConfig.AssertPathExists = [ diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index e208eed008ae..3c4bcd1ac265 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -62,11 +62,10 @@ in }; packageFirewall = mkOption { - default = pkgs.iptables; - defaultText = literalExpression "pkgs.iptables"; + default = config.networking.firewall.package; + defaultText = literalExpression "config.networking.firewall.package"; type = types.package; - example = literalExpression "pkgs.nftables"; - description = lib.mdDoc "The firewall package used by fail2ban service."; + description = lib.mdDoc "The firewall package used by fail2ban service. Defaults to the package for your firewall (iptables or nftables)."; }; extraPackages = mkOption { @@ -86,24 +85,24 @@ in }; banaction = mkOption { - default = "iptables-multiport"; + default = if config.networking.nftables.enable then "nftables-multiport" else "iptables-multiport"; + defaultText = literalExpression ''if config.networking.nftables.enable then "nftables-multiport" else "iptables-multiport"''; type = types.str; - example = "nftables-multiport"; description = lib.mdDoc '' Default banning action (e.g. iptables, iptables-new, iptables-multiport, - iptables-ipset-proto6-allports, shorewall, etc) It is used to + iptables-ipset-proto6-allports, shorewall, etc). It is used to define action_* variables. Can be overridden globally or per section within jail.local file ''; }; banaction-allports = mkOption { - default = "iptables-allport"; + default = if config.networking.nftables.enable then "nftables-allport" else "iptables-allport"; + defaultText = literalExpression ''if config.networking.nftables.enable then "nftables-allport" else "iptables-allport"''; type = types.str; - example = "nftables-allport"; description = lib.mdDoc '' Default banning action (e.g. iptables, iptables-new, iptables-multiport, - shorewall, etc) It is used to define action_* variables. Can be overridden + shorewall, etc) for "allports" jails. It is used to define action_* variables. Can be overridden globally or per section within jail.local file ''; }; @@ -161,7 +160,7 @@ in type = types.str; example = "2 4 16 128"; description = lib.mdDoc '' - "bantime-increment.multipliers" used to calculate next value of ban time instead of formula, coresponding + "bantime-increment.multipliers" used to calculate next value of ban time instead of formula, corresponding previously ban count and given "bantime.factor" (for multipliers default is 1); following example grows ban time by 1, 2, 4, 8, 16 ... and if last ban count greater as multipliers count, always used last multiplier (64 in example), for factor '1' and original ban time 600 - 10.6 hours @@ -174,7 +173,7 @@ in example = true; description = lib.mdDoc '' "bantime-increment.overalljails" (if true) specifies the search of IP in the database will be executed - cross over all jails, if false (dafault), only current jail of the ban IP will be searched + cross over all jails, if false (default), only current jail of the ban IP will be searched ''; }; @@ -340,7 +339,7 @@ in # Block SSH if there are too many failing connection attempts. # Benefits from verbose sshd logging to observe failed login attempts, # so we set that here unless the user overrode it. - services.openssh.logLevel = lib.mkDefault "VERBOSE"; + services.openssh.settings.LogLevel = lib.mkDefault "VERBOSE"; services.fail2ban.jails.sshd = mkDefault '' enabled = true port = ${concatMapStringsSep "," (p: toString p) config.services.openssh.ports} diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index 788e06ffecf0..55120799c993 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -100,6 +100,14 @@ in readOnly = true; type = lib.types.path; }; + tls_chain = lib.mkOption { + description = lib.mdDoc "TLS chain in pem format."; + type = lib.types.path; + }; + tls_key = lib.mkOption { + description = lib.mdDoc "TLS key in pem format."; + type = lib.types.path; + }; log_level = lib.mkOption { description = lib.mdDoc "Log level of the server."; default = "default"; diff --git a/nixos/modules/services/security/opensnitch.nix b/nixos/modules/services/security/opensnitch.nix index 1612b0edf016..98695b1ef060 100644 --- a/nixos/modules/services/security/opensnitch.nix +++ b/nixos/modules/services/security/opensnitch.nix @@ -5,10 +5,47 @@ with lib; let cfg = config.services.opensnitch; format = pkgs.formats.json {}; + + predefinedRules = flip mapAttrs cfg.rules (name: cfg: { + file = pkgs.writeText "rule" (builtins.toJSON cfg); + }); + in { options = { services.opensnitch = { - enable = mkEnableOption (lib.mdDoc "Opensnitch application firewall"); + enable = mkEnableOption (mdDoc "Opensnitch application firewall"); + + rules = mkOption { + default = {}; + example = literalExpression '' + { + "tor" = { + "name" = "tor"; + "enabled" = true; + "action" = "allow"; + "duration" = "always"; + "operator" = { + "type" ="simple"; + "sensitive" = false; + "operand" = "process.path"; + "data" = "''${lib.getBin pkgs.tor}/bin/tor"; + }; + }; + }; + ''; + + description = mdDoc '' + Declarative configuration of firewall rules. + All rules will be stored in `/var/lib/opensnitch/rules`. + See [upstream documentation](https://github.com/evilsocket/opensnitch/wiki/Rules) + for available options. + ''; + + type = types.submodule { + freeformType = format.type; + }; + }; + settings = mkOption { type = types.submodule { freeformType = format.type; @@ -18,7 +55,7 @@ in { Address = mkOption { type = types.str; - description = lib.mdDoc '' + description = mdDoc '' Unix socket path (unix:///tmp/osui.sock, the "unix:///" part is mandatory) or TCP socket (192.168.1.100:50051). ''; @@ -26,7 +63,7 @@ in { LogFile = mkOption { type = types.path; - description = lib.mdDoc '' + description = mdDoc '' File to write logs to (use /dev/stdout to write logs to standard output). ''; @@ -36,7 +73,7 @@ in { DefaultAction = mkOption { type = types.enum [ "allow" "deny" ]; - description = lib.mdDoc '' + description = mdDoc '' Default action whether to block or allow application internet access. ''; @@ -46,28 +83,28 @@ in { type = types.enum [ "once" "always" "until restart" "30s" "5m" "15m" "30m" "1h" ]; - description = lib.mdDoc '' + description = mdDoc '' Default duration of firewall rule. ''; }; InterceptUnknown = mkOption { type = types.bool; - description = lib.mdDoc '' - Wheter to intercept spare connections. + description = mdDoc '' + Whether to intercept spare connections. ''; }; ProcMonitorMethod = mkOption { type = types.enum [ "ebpf" "proc" "ftrace" "audit" ]; - description = lib.mdDoc '' + description = mdDoc '' Which process monitoring method to use. ''; }; LogLevel = mkOption { type = types.enum [ 0 1 2 3 4 ]; - description = lib.mdDoc '' + description = mdDoc '' Default log level from 0 to 4 (debug, info, important, warning, error). ''; @@ -75,7 +112,7 @@ in { Firewall = mkOption { type = types.enum [ "iptables" "nftables" ]; - description = lib.mdDoc '' + description = mdDoc '' Which firewall backend to use. ''; }; @@ -84,14 +121,14 @@ in { MaxEvents = mkOption { type = types.int; - description = lib.mdDoc '' + description = mdDoc '' Max events to send to the GUI. ''; }; MaxStats = mkOption { type = types.int; - description = lib.mdDoc '' + description = mdDoc '' Max stats per item to keep in backlog. ''; }; @@ -99,9 +136,8 @@ in { }; }; }; - description = lib.mdDoc '' - opensnitchd configuration. Refer to - + description = mdDoc '' + opensnitchd configuration. Refer to [upstream documentation](https://github.com/evilsocket/opensnitch/wiki/Configurations) for details on supported values. ''; }; @@ -118,6 +154,25 @@ in { services.opensnitchd.wantedBy = [ "multi-user.target" ]; }; + systemd.services.opensnitchd.preStart = mkIf (cfg.rules != {}) (let + rules = flip mapAttrsToList predefinedRules (file: content: { + inherit (content) file; + local = "/var/lib/opensnitch/rules/${file}.json"; + }); + in '' + # Remove all firewall rules from `/var/lib/opensnitch/rules` that are symlinks to a store-path, + # but aren't declared in `cfg.rules` (i.e. all networks that were "removed" from + # `cfg.rules`). + find /var/lib/opensnitch/rules -type l -lname '${builtins.storeDir}/*' ${optionalString (rules != {}) '' + -not \( ${concatMapStringsSep " -o " ({ local, ... }: + "-name '${baseNameOf local}*'") + rules} \) \ + ''} -delete + ${concatMapStrings ({ file, local }: '' + ln -sf '${file}' "${local}" + '') rules} + ''); + environment.etc."opensnitchd/default-config.json".source = format.generate "default-config.json" cfg.settings; }; diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix index 3db9e0ac4458..cd7747659152 100644 --- a/nixos/modules/services/security/physlock.nix +++ b/nixos/modules/services/security/physlock.nix @@ -57,6 +57,14 @@ in ''; }; + muteKernelMessages = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Disable kernel messages on console while physlock is running. + ''; + }; + lockOn = { suspend = mkOption { @@ -116,7 +124,7 @@ in ++ cfg.lockOn.extraTargets; serviceConfig = { Type = "forking"; - ExecStart = "${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}${optionalString (cfg.lockMessage != "") " -p \"${cfg.lockMessage}\""}"; + ExecStart = "${pkgs.physlock}/bin/physlock -d${optionalString cfg.muteKernelMessages "m"}${optionalString cfg.disableSysRq "s"}${optionalString (cfg.lockMessage != "") " -p \"${cfg.lockMessage}\""}"; }; }; diff --git a/nixos/modules/services/security/shibboleth-sp.nix b/nixos/modules/services/security/shibboleth-sp.nix index 6626ea213625..e7897c3324cf 100644 --- a/nixos/modules/services/security/shibboleth-sp.nix +++ b/nixos/modules/services/security/shibboleth-sp.nix @@ -27,13 +27,13 @@ in { fastcgi.shibAuthorizerPort = mkOption { type = types.int; default = 9100; - description = lib.mdDoc "Port for shibauthorizer FastCGI proccess to bind to"; + description = lib.mdDoc "Port for shibauthorizer FastCGI process to bind to"; }; fastcgi.shibResponderPort = mkOption { type = types.int; default = 9101; - description = lib.mdDoc "Port for shibauthorizer FastCGI proccess to bind to"; + description = lib.mdDoc "Port for shibauthorizer FastCGI process to bind to"; }; }; }; diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index b85b78f269a1..2aa2964f8818 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -146,7 +146,7 @@ let ]))]; description = lib.mdDoc (descriptionGeneric optionName); }; - optionBandwith = optionName: mkOption { + optionBandwidth = optionName: mkOption { type = with types; nullOr (either int str); default = null; description = lib.mdDoc (descriptionGeneric optionName); @@ -205,7 +205,7 @@ in (mkRemovedOptionModule [ "services" "tor" "client" "transparentProxy" "isolationOptions" ] "Use services.tor.settings.TransPort instead.") (mkRemovedOptionModule [ "services" "tor" "client" "transparentProxy" "listenAddress" ] "Use services.tor.settings.TransPort instead.") (mkRenamedOptionModule [ "services" "tor" "controlPort" ] [ "services" "tor" "settings" "ControlPort" ]) - (mkRemovedOptionModule [ "services" "tor" "extraConfig" ] "Plese use services.tor.settings instead.") + (mkRemovedOptionModule [ "services" "tor" "extraConfig" ] "Please use services.tor.settings instead.") (mkRenamedOptionModule [ "services" "tor" "hiddenServices" ] [ "services" "tor" "relay" "onionServices" ]) (mkRenamedOptionModule [ "services" "tor" "relay" "accountingMax" ] [ "services" "tor" "settings" "AccountingMax" ]) (mkRenamedOptionModule [ "services" "tor" "relay" "accountingStart" ] [ "services" "tor" "settings" "AccountingStart" ]) @@ -546,7 +546,7 @@ in }; options.Address = optionString "Address"; options.AssumeReachable = optionBool "AssumeReachable"; - options.AccountingMax = optionBandwith "AccountingMax"; + options.AccountingMax = optionBandwidth "AccountingMax"; options.AccountingStart = optionString "AccountingStart"; options.AuthDirHasIPv6Connectivity = optionBool "AuthDirHasIPv6Connectivity"; options.AuthDirListBadExits = optionBool "AuthDirListBadExits"; @@ -559,8 +559,8 @@ in default = [".onion" ".exit"]; example = [".onion"]; }; - options.BandwidthBurst = optionBandwith "BandwidthBurst"; - options.BandwidthRate = optionBandwith "BandwidthRate"; + options.BandwidthBurst = optionBandwidth "BandwidthBurst"; + options.BandwidthRate = optionBandwidth "BandwidthRate"; options.BridgeAuthoritativeDir = optionBool "BridgeAuthoritativeDir"; options.BridgeRecordUsageByCountry = optionBool "BridgeRecordUsageByCountry"; options.BridgeRelay = optionBool "BridgeRelay" // { default = false; }; @@ -709,7 +709,7 @@ in options.LogMessageDomains = optionBool "LogMessageDomains"; options.LongLivedPorts = optionPorts "LongLivedPorts"; options.MainloopStats = optionBool "MainloopStats"; - options.MaxAdvertisedBandwidth = optionBandwith "MaxAdvertisedBandwidth"; + options.MaxAdvertisedBandwidth = optionBandwidth "MaxAdvertisedBandwidth"; options.MaxCircuitDirtiness = optionInt "MaxCircuitDirtiness"; options.MaxClientCircuitsPending = optionInt "MaxClientCircuitsPending"; options.NATDPort = optionIsolablePorts "NATDPort"; @@ -719,8 +719,8 @@ in options.OfflineMasterKey = optionBool "OfflineMasterKey"; options.OptimisticData = optionBool "OptimisticData"; # default is null and like "auto" options.PaddingStatistics = optionBool "PaddingStatistics"; - options.PerConnBWBurst = optionBandwith "PerConnBWBurst"; - options.PerConnBWRate = optionBandwith "PerConnBWRate"; + options.PerConnBWBurst = optionBandwidth "PerConnBWBurst"; + options.PerConnBWRate = optionBandwidth "PerConnBWRate"; options.PidFile = optionPath "PidFile"; options.ProtocolWarnings = optionBool "ProtocolWarnings"; options.PublishHidServDescriptors = optionBool "PublishHidServDescriptors"; @@ -732,8 +732,8 @@ in options.ReducedExitPolicy = optionBool "ReducedExitPolicy"; options.RefuseUnknownExits = optionBool "RefuseUnknownExits"; # default is null and like "auto" options.RejectPlaintextPorts = optionPorts "RejectPlaintextPorts"; - options.RelayBandwidthBurst = optionBandwith "RelayBandwidthBurst"; - options.RelayBandwidthRate = optionBandwith "RelayBandwidthRate"; + options.RelayBandwidthBurst = optionBandwidth "RelayBandwidthBurst"; + options.RelayBandwidthRate = optionBandwidth "RelayBandwidthRate"; #options.RunAsDaemon options.Sandbox = optionBool "Sandbox"; options.ServerDNSAllowBrokenConfig = optionBool "ServerDNSAllowBrokenConfig"; diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix index 1b1fa84c4fa3..1d846b194077 100644 --- a/nixos/modules/services/security/usbguard.nix +++ b/nixos/modules/services/security/usbguard.nix @@ -118,9 +118,9 @@ in description = lib.mdDoc '' The USBGuard daemon modifies some attributes of controller devices like the default authorization state of new child device - instances. Using this setting, you can controll whether the daemon + instances. Using this setting, you can control whether the daemon will try to restore the attribute values to the state before - modificaton on shutdown. + modification on shutdown. ''; }; diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index 3ef0bfb090ac..aaa3f5507f77 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -162,8 +162,8 @@ in { webVaultPackage = mkOption { type = package; - default = pkgs.vaultwarden-vault; - defaultText = literalExpression "pkgs.vaultwarden-vault"; + default = pkgs.vaultwarden.webvault; + defaultText = literalExpression "pkgs.vaultwarden.webvault"; description = lib.mdDoc "Web vault package to use."; }; }; diff --git a/nixos/modules/services/system/cachix-agent/default.nix b/nixos/modules/services/system/cachix-agent/default.nix index aa3b2153422c..11769d4e3095 100644 --- a/nixos/modules/services/system/cachix-agent/default.nix +++ b/nixos/modules/services/system/cachix-agent/default.nix @@ -67,7 +67,8 @@ in { serviceConfig = { # we don't want to kill children processes as those are deployments KillMode = "process"; - Restart = "on-failure"; + Restart = "always"; + RestartSec = 5; EnvironmentFile = cfg.credentialsFile; ExecStart = '' ${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} ${lib.optionalString (cfg.host != null) "--host ${cfg.host}"} \ diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix index 30b2ca568e12..d75070dea434 100644 --- a/nixos/modules/services/system/cloud-init.nix +++ b/nixos/modules/services/system/cloud-init.nix @@ -27,7 +27,7 @@ in This configuration is not completely compatible with the NixOS way of doing configuration, as configuration done by - cloud-init might be overriden by a subsequent nixos-rebuild + cloud-init might be overridden by a subsequent nixos-rebuild call. However, some parts of cloud-init fall outside of NixOS's responsibility, like filesystem resizing and ssh public key provisioning, and cloud-init is useful for that diff --git a/nixos/modules/services/system/kerberos/default.nix b/nixos/modules/services/system/kerberos/default.nix index 0c9e44a45c15..4ed48e463741 100644 --- a/nixos/modules/services/system/kerberos/default.nix +++ b/nixos/modules/services/system/kerberos/default.nix @@ -51,7 +51,7 @@ in ###### interface options = { services.kerberos_server = { - enable = lib.mkEnableOption (lib.mdDoc "the kerberos authentification server"); + enable = lib.mkEnableOption (lib.mdDoc "the kerberos authentication server"); realms = mkOption { type = types.attrsOf (types.submodule realm); diff --git a/nixos/modules/services/system/kerberos/mit.nix b/nixos/modules/services/system/kerberos/mit.nix index 25d7d51e808a..112000140453 100644 --- a/nixos/modules/services/system/kerberos/mit.nix +++ b/nixos/modules/services/system/kerberos/mit.nix @@ -33,7 +33,7 @@ let in { - config = mkIf (cfg.enable && kerberos == pkgs.krb5Full) { + config = mkIf (cfg.enable && kerberos == pkgs.krb5) { systemd.services.kadmind = { description = "Kerberos Administration Daemon"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index fdc5190d084b..971dffbadc13 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -29,10 +29,11 @@ in enableNsncd = mkOption { type = types.bool; - default = false; + default = true; description = lib.mdDoc '' - Whether to use nsncd instead of nscd. + Whether to use nsncd instead of nscd from glibc. This is a nscd-compatible daemon, that proxies lookups, without any caching. + Using nscd from glibc is discouraged. ''; }; @@ -55,7 +56,10 @@ in config = mkOption { type = types.lines; default = builtins.readFile ./nscd.conf; - description = lib.mdDoc "Configuration to use for Name Service Cache Daemon."; + description = lib.mdDoc '' + Configuration to use for Name Service Cache Daemon. + Only used in case glibc-nscd is used. + ''; }; package = mkOption { diff --git a/nixos/modules/services/system/self-deploy.nix b/nixos/modules/services/system/self-deploy.nix index 9b1ebfd37522..16a793a42253 100644 --- a/nixos/modules/services/system/self-deploy.nix +++ b/nixos/modules/services/system/self-deploy.nix @@ -18,7 +18,7 @@ let in lib.concatStrings (lib.mapAttrsToList toArg args); - isPathType = x: lib.strings.isCoercibleToString x && builtins.substring 0 1 (toString x) == "/"; + isPathType = x: lib.types.path.check x; in { diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix index 70fad4d7d76c..de3d077daec9 100644 --- a/nixos/modules/services/torrent/deluge.nix +++ b/nixos/modules/services/torrent/deluge.nix @@ -66,7 +66,7 @@ in { `true`. String values must be quoted, integer and boolean values must not. See - for the availaible options. + for the available options. ''; }; @@ -117,7 +117,7 @@ in { when {option}`services.deluge.declarative` is set to `true`. See for - more informations. + more information. ''; }; diff --git a/nixos/modules/services/torrent/flexget.nix b/nixos/modules/services/torrent/flexget.nix index 2a9ffac18d9b..1b971838b32e 100644 --- a/nixos/modules/services/torrent/flexget.nix +++ b/nixos/modules/services/torrent/flexget.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.flexget; - pkg = pkgs.flexget; + pkg = cfg.package; ymlFile = pkgs.writeText "flexget.yml" '' ${cfg.config} @@ -16,6 +16,8 @@ in { services.flexget = { enable = mkEnableOption (lib.mdDoc "Run FlexGet Daemon"); + package = mkPackageOptionMD pkgs "flexget" {}; + user = mkOption { default = "deluge"; example = "some_user"; diff --git a/nixos/modules/services/torrent/magnetico.nix b/nixos/modules/services/torrent/magnetico.nix index b681c58dfe2a..dc6b4e9aa734 100644 --- a/nixos/modules/services/torrent/magnetico.nix +++ b/nixos/modules/services/torrent/magnetico.nix @@ -143,8 +143,8 @@ in { The path to the file holding the credentials to access the web interface. If unset no authentication will be required. - The file must constain user names and password hashes in the format - `username:hash `, one for each line. Usernames must + The file must contain user names and password hashes in the format + `username:hash`, one for each line. Usernames must start with a lowecase ([a-z]) ASCII character, might contain non-consecutive underscores except at the end, and consists of small-case a-z characters and digits 0-9. diff --git a/nixos/modules/services/torrent/rtorrent.nix b/nixos/modules/services/torrent/rtorrent.nix index 935c11e3eb00..64cda7fb675f 100644 --- a/nixos/modules/services/torrent/rtorrent.nix +++ b/nixos/modules/services/torrent/rtorrent.nix @@ -19,6 +19,15 @@ in { ''; }; + dataPermissions = mkOption { + type = types.str; + default = "0750"; + example = "0755"; + description = lib.mdDoc '' + Unix Permissions in octal on the rtorrent directory. + ''; + }; + downloadDir = mkOption { type = types.str; default = "${cfg.dataDir}/download"; @@ -82,7 +91,7 @@ in { type = types.lines; default = ""; description = lib.mdDoc '' - The content of {file}`rtorrent.rc`. The [modernized configuration template](https://rtorrent-docs.readthedocs.io/en/latest/cookbook.html#modernized-configuration-template) with the values specified in this module will be prepended using mkBefore. You can use mkForce to overwrite the config completly. + The content of {file}`rtorrent.rc`. The [modernized configuration template](https://rtorrent-docs.readthedocs.io/en/latest/cookbook.html#modernized-configuration-template) with the values specified in this module will be prepended using mkBefore. You can use mkForce to overwrite the config completely. ''; }; }; @@ -205,7 +214,7 @@ in { }; }; - tmpfiles.rules = [ "d '${cfg.dataDir}' 0750 ${cfg.user} ${cfg.group} -" ]; + tmpfiles.rules = [ "d '${cfg.dataDir}' ${cfg.dataPermissions} ${cfg.user} ${cfg.group} -" ]; }; }; } diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 9b53f5de143d..752ab91fe631 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -19,8 +19,8 @@ in imports = [ (mkRenamedOptionModule ["services" "transmission" "port"] ["services" "transmission" "settings" "rpc-port"]) - (mkAliasOptionModule ["services" "transmission" "openFirewall"] - ["services" "transmission" "openPeerPorts"]) + (mkAliasOptionModuleMD ["services" "transmission" "openFirewall"] + ["services" "transmission" "openPeerPorts"]) ]; options = { services.transmission = { @@ -44,7 +44,7 @@ in (each time the service starts). See [Transmission's Wiki](https://github.com/transmission/transmission/wiki/Editing-Configuration-Files) - for documentation of settings not explicitely covered by this module. + for documentation of settings not explicitly covered by this module. ''; default = {}; type = types.submodule { @@ -174,6 +174,8 @@ in }; }; + package = mkPackageOptionMD pkgs "transmission" {}; + downloadDirPermissions = mkOption { type = with types; nullOr str; default = null; @@ -287,7 +289,7 @@ in install -D -m 600 -o '${cfg.user}' -g '${cfg.group}' /dev/stdin \ '${cfg.home}/${settingsDir}/settings.json' '')]; - ExecStart="${pkgs.transmission}/bin/transmission-daemon -f -g ${cfg.home}/${settingsDir} ${escapeShellArgs cfg.extraFlags}"; + ExecStart="${cfg.package}/bin/transmission-daemon -f -g ${cfg.home}/${settingsDir} ${escapeShellArgs cfg.extraFlags}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; User = cfg.user; Group = cfg.group; @@ -353,7 +355,7 @@ in PrivateUsers = true; ProtectClock = true; ProtectControlGroups = true; - # ProtectHome=true would not allow BindPaths= to work accross /home, + # ProtectHome=true would not allow BindPaths= to work across /home, # and ProtectHome=tmpfs would break statfs(), # preventing transmission-daemon to report the available free space. # However, RootDirectory= is used, so this is not a security concern @@ -385,7 +387,7 @@ in }; # It's useful to have transmission in path, e.g. for remote control - environment.systemPackages = [ pkgs.transmission ]; + environment.systemPackages = [ cfg.package ]; users.users = optionalAttrs (cfg.user == "transmission") ({ transmission = { @@ -457,7 +459,7 @@ in ]; security.apparmor.policies."bin.transmission-daemon".profile = '' - include "${pkgs.transmission.apparmor}/bin.transmission-daemon" + include "${cfg.package.apparmor}/bin.transmission-daemon" ''; security.apparmor.includes."local/bin.transmission-daemon" = '' r ${config.systemd.services.transmission.environment.CURL_CA_BUNDLE}, diff --git a/nixos/modules/services/video/unifi-video.nix b/nixos/modules/services/video/unifi-video.nix index fcc3cb02a1b0..78dc19086312 100644 --- a/nixos/modules/services/video/unifi-video.nix +++ b/nixos/modules/services/video/unifi-video.nix @@ -123,7 +123,7 @@ in mongodbPackage = mkOption { type = types.package; - default = pkgs.mongodb-4_0; + default = pkgs.mongodb-4_2; defaultText = literalExpression "pkgs.mongodb"; description = lib.mdDoc '' The mongodb package to use. @@ -148,7 +148,7 @@ in openFirewall = mkOption { type = types.bool; - default = true; + default = false; description = lib.mdDoc '' Whether or not to open the required ports on the firewall. ''; @@ -159,7 +159,7 @@ in default = 1024; example = 4096; description = lib.mdDoc '' - Set the maximimum heap size for the JVM in MB. + Set the maximum heap size for the JVM in MB. ''; }; diff --git a/nixos/modules/services/web-apps/akkoma.md b/nixos/modules/services/web-apps/akkoma.md new file mode 100644 index 000000000000..fc849be0c872 --- /dev/null +++ b/nixos/modules/services/web-apps/akkoma.md @@ -0,0 +1,332 @@ +# Akkoma {#module-services-akkoma} + +[Akkoma](https://akkoma.dev/) is a lightweight ActivityPub microblogging server forked from Pleroma. + +## Service configuration {#modules-services-akkoma-service-configuration} + +The Elixir configuration file required by Akkoma is generated automatically from +[{option}`services.akkoma.config`](options.html#opt-services.akkoma.config). Secrets must be +included from external files outside of the Nix store by setting the configuration option to +an attribute set containing the attribute {option}`_secret` – a string pointing to the file +containing the actual value of the option. + +For the mandatory configuration settings these secrets will be generated automatically if the +referenced file does not exist during startup, unless disabled through +[{option}`services.akkoma.initSecrets`](options.html#opt-services.akkoma.initSecrets). + +The following configuration binds Akkoma to the Unix socket `/run/akkoma/socket`, expecting to +be run behind a HTTP proxy on `fediverse.example.com`. + + +```nix +services.akkoma.enable = true; +services.akkoma.config = { + ":pleroma" = { + ":instance" = { + name = "My Akkoma instance"; + description = "More detailed description"; + email = "admin@example.com"; + registration_open = false; + }; + + "Pleroma.Web.Endpoint" = { + url.host = "fediverse.example.com"; + }; + }; +}; +``` + +Please refer to the [configuration cheat sheet](https://docs.akkoma.dev/stable/configuration/cheatsheet/) +for additional configuration options. + +## User management {#modules-services-akkoma-user-management} + +After the Akkoma service is running, the administration utility can be used to +[manage users](https://docs.akkoma.dev/stable/administration/CLI_tasks/user/). In particular an +administrative user can be created with + +```ShellSession +$ pleroma_ctl user new --admin --moderator --password +``` + +## Proxy configuration {#modules-services-akkoma-proxy-configuration} + +Although it is possible to expose Akkoma directly, it is common practice to operate it behind an +HTTP reverse proxy such as nginx. + +```nix +services.akkoma.nginx = { + enableACME = true; + forceSSL = true; +}; + +services.nginx = { + enable = true; + + clientMaxBodySize = "16m"; + recommendedTlsSettings = true; + recommendedOptimisation = true; + recommendedGzipSettings = true; +}; +``` + +Please refer to [](#module-security-acme) for details on how to provision an SSL/TLS certificate. + +### Media proxy {#modules-services-akkoma-media-proxy} + +Without the media proxy function, Akkoma does not store any remote media like pictures or video +locally, and clients have to fetch them directly from the source server. + +```nix +# Enable nginx slice module distributed with Tengine +services.nginx.package = pkgs.tengine; + +# Enable media proxy +services.akkoma.config.":pleroma".":media_proxy" = { + enabled = true; + proxy_opts.redirect_on_failure = true; +}; + +# Adjust the persistent cache size as needed: +# Assuming an average object size of 128 KiB, around 1 MiB +# of memory is required for the key zone per GiB of cache. +# Ensure that the cache directory exists and is writable by nginx. +services.nginx.commonHttpConfig = '' + proxy_cache_path /var/cache/nginx/cache/akkoma-media-cache + levels= keys_zone=akkoma_media_cache:16m max_size=16g + inactive=1y use_temp_path=off; +''; + +services.akkoma.nginx = { + locations."/proxy" = { + proxyPass = "http://unix:/run/akkoma/socket"; + + extraConfig = '' + proxy_cache akkoma_media_cache; + + # Cache objects in slices of 1 MiB + slice 1m; + proxy_cache_key $host$uri$is_args$args$slice_range; + proxy_set_header Range $slice_range; + + # Decouple proxy and upstream responses + proxy_buffering on; + proxy_cache_lock on; + proxy_ignore_client_abort on; + + # Default cache times for various responses + proxy_cache_valid 200 1y; + proxy_cache_valid 206 301 304 1h; + + # Allow serving of stale items + proxy_cache_use_stale error timeout invalid_header updating; + ''; + }; +}; +``` + +#### Prefetch remote media {#modules-services-akkoma-prefetch-remote-media} + +The following example enables the `MediaProxyWarmingPolicy` MRF policy which automatically +fetches all media associated with a post through the media proxy, as soon as the post is +received by the instance. + +```nix +services.akkoma.config.":pleroma".":mrf".policies = + map (pkgs.formats.elixirConf { }).lib.mkRaw [ + "Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy" +]; +``` + +#### Media previews {#modules-services-akkoma-media-previews} + +Akkoma can generate previews for media. + +```nix +services.akkoma.config.":pleroma".":media_preview_proxy" = { + enabled = true; + thumbnail_max_width = 1920; + thumbnail_max_height = 1080; +}; +``` + +## Frontend management {#modules-services-akkoma-frontend-management} + +Akkoma will be deployed with the `pleroma-fe` and `admin-fe` frontends by default. These can be +modified by setting +[{option}`services.akkoma.frontends`](options.html#opt-services.akkoma.frontends). + +The following example overrides the primary frontend’s default configuration using a custom +derivation. + +```nix +services.akkoma.frontends.primary.package = pkgs.runCommand "pleroma-fe" { + config = builtins.toJSON { + expertLevel = 1; + collapseMessageWithSubject = false; + stopGifs = false; + replyVisibility = "following"; + webPushHideIfCW = true; + hideScopeNotice = true; + renderMisskeyMarkdown = false; + hideSiteFavicon = true; + postContentType = "text/markdown"; + showNavShortcuts = false; + }; + nativeBuildInputs = with pkgs; [ jq xorg.lndir ]; + passAsFile = [ "config" ]; +} '' + mkdir $out + lndir ${pkgs.akkoma-frontends.pleroma-fe} $out + + rm $out/static/config.json + jq -s add ${pkgs.akkoma-frontends.pleroma-fe}/static/config.json ${config} \ + >$out/static/config.json +''; +``` + +## Federation policies {#modules-services-akkoma-federation-policies} + +Akkoma comes with a number of modules to police federation with other ActivityPub instances. +The most valuable for typical users is the +[`:mrf_simple`](https://docs.akkoma.dev/stable/configuration/cheatsheet/#mrf_simple) module +which allows limiting federation based on instance hostnames. + +This configuration snippet provides an example on how these can be used. Choosing an adequate +federation policy is not trivial and entails finding a balance between connectivity to the rest +of the fediverse and providing a pleasant experience to the users of an instance. + + +```nix +services.akkoma.config.":pleroma" = with (pkgs.formats.elixirConf { }).lib; { + ":mrf".policies = map mkRaw [ + "Pleroma.Web.ActivityPub.MRF.SimplePolicy" + ]; + + ":mrf_simple" = { + # Tag all media as sensitive + media_nsfw = mkMap { + "nsfw.weird.kinky" = "Untagged NSFW content"; + }; + + # Reject all activities except deletes + reject = mkMap { + "kiwifarms.cc" = "Persistent harassment of users, no moderation"; + }; + + # Force posts to be visible by followers only + followers_only = mkMap { + "beta.birdsite.live" = "Avoid polluting timelines with Twitter posts"; + }; + }; +}; +``` + +## Upload filters {#modules-services-akkoma-upload-filters} + +This example strips GPS and location metadata from uploads, deduplicates them and anonymises the +the file name. + +```nix +services.akkoma.config.":pleroma"."Pleroma.Upload".filters = + map (pkgs.formats.elixirConf { }).lib.mkRaw [ + "Pleroma.Upload.Filter.Exiftool" + "Pleroma.Upload.Filter.Dedupe" + "Pleroma.Upload.Filter.AnonymizeFilename" + ]; +``` + +## Migration from Pleroma {#modules-services-akkoma-migration-pleroma} + +Pleroma instances can be migrated to Akkoma either by copying the database and upload data or by +pointing Akkoma to the existing data. The necessary database migrations are run automatically +during startup of the service. + +The configuration has to be copy‐edited manually. + +Depending on the size of the database, the initial migration may take a long time and exceed the +startup timeout of the system manager. To work around this issue one may adjust the startup timeout +{option}`systemd.services.akkoma.serviceConfig.TimeoutStartSec` or simply run the migrations +manually: + +```ShellSession +pleroma_ctl migrate +``` + +### Copying data {#modules-services-akkoma-migration-pleroma-copy} + +Copying the Pleroma data instead of re‐using it in place may permit easier reversion to Pleroma, +but allows the two data sets to diverge. + +First disable Pleroma and then copy its database and upload data: + +```ShellSession +# Create a copy of the database +nix-shell -p postgresql --run 'createdb -T pleroma akkoma' + +# Copy upload data +mkdir /var/lib/akkoma +cp -R --reflink=auto /var/lib/pleroma/uploads /var/lib/akkoma/ +``` + +After the data has been copied, enable the Akkoma service and verify that the migration has been +successful. If no longer required, the original data may then be deleted: + +```ShellSession +# Delete original database +nix-shell -p postgresql --run 'dropdb pleroma' + +# Delete original Pleroma state +rm -r /var/lib/pleroma +``` + +### Re‐using data {#modules-services-akkoma-migration-pleroma-reuse} + +To re‐use the Pleroma data in place, disable Pleroma and enable Akkoma, pointing it to the +Pleroma database and upload directory. + +```nix +# Adjust these settings according to the database name and upload directory path used by Pleroma +services.akkoma.config.":pleroma"."Pleroma.Repo".database = "pleroma"; +services.akkoma.config.":pleroma".":instance".upload_dir = "/var/lib/pleroma/uploads"; +``` + +Please keep in mind that after the Akkoma service has been started, any migrations applied by +Akkoma have to be rolled back before the database can be used again with Pleroma. This can be +achieved through `pleroma_ctl ecto.rollback`. Refer to the +[Ecto SQL documentation](https://hexdocs.pm/ecto_sql/Mix.Tasks.Ecto.Rollback.html) for +details. + +## Advanced deployment options {#modules-services-akkoma-advanced-deployment} + +### Confinement {#modules-services-akkoma-confinement} + +The Akkoma systemd service may be confined to a chroot with + +```nix +services.systemd.akkoma.confinement.enable = true; +``` + +Confinement of services is not generally supported in NixOS and therefore disabled by default. +Depending on the Akkoma configuration, the default confinement settings may be insufficient and +lead to subtle errors at run time, requiring adjustment: + +Use +[{option}`services.systemd.akkoma.confinement.packages`](options.html#opt-systemd.services._name_.confinement.packages) +to make packages available in the chroot. + +{option}`services.systemd.akkoma.serviceConfig.BindPaths` and +{option}`services.systemd.akkoma.serviceConfig.BindReadOnlyPaths` permit access to outside paths +through bind mounts. Refer to +[{manpage}`systemd.exec(5)`](https://www.freedesktop.org/software/systemd/man/systemd.exec.html#BindPaths=) +for details. + +### Distributed deployment {#modules-services-akkoma-distributed-deployment} + +Being an Elixir application, Akkoma can be deployed in a distributed fashion. + +This requires setting +[{option}`services.akkoma.dist.address`](options.html#opt-services.akkoma.dist.address) and +[{option}`services.akkoma.dist.cookie`](options.html#opt-services.akkoma.dist.cookie). The +specifics depend strongly on the deployment environment. For more information please check the +relevant [Erlang documentation](https://www.erlang.org/doc/reference_manual/distributed.html). diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix new file mode 100644 index 000000000000..fc482ff32deb --- /dev/null +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -0,0 +1,1086 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.akkoma; + ex = cfg.config; + db = ex.":pleroma"."Pleroma.Repo"; + web = ex.":pleroma"."Pleroma.Web.Endpoint"; + + isConfined = config.systemd.services.akkoma.confinement.enable; + hasSmtp = (attrByPath [ ":pleroma" "Pleroma.Emails.Mailer" "adapter" "value" ] null ex) == "Swoosh.Adapters.SMTP"; + + isAbsolutePath = v: isString v && substring 0 1 v == "/"; + isSecret = v: isAttrs v && v ? _secret && isAbsolutePath v._secret; + + absolutePath = with types; mkOptionType { + name = "absolutePath"; + description = "absolute path"; + descriptionClass = "noun"; + check = isAbsolutePath; + inherit (str) merge; + }; + + secret = mkOptionType { + name = "secret"; + description = "secret value"; + descriptionClass = "noun"; + check = isSecret; + nestedTypes = { + _secret = absolutePath; + }; + }; + + ipAddress = with types; mkOptionType { + name = "ipAddress"; + description = "IPv4 or IPv6 address"; + descriptionClass = "conjunction"; + check = x: str.check x && builtins.match "[.0-9:A-Fa-f]+" x != null; + inherit (str) merge; + }; + + elixirValue = let + elixirValue' = with types; + nullOr (oneOf [ bool int float str (attrsOf elixirValue') (listOf elixirValue') ]) // { + description = "Elixir value"; + }; + in elixirValue'; + + frontend = { + options = { + package = mkOption { + type = types.package; + description = mdDoc "Akkoma frontend package."; + example = literalExpression "pkgs.akkoma-frontends.pleroma-fe"; + }; + + name = mkOption { + type = types.nonEmptyStr; + description = mdDoc "Akkoma frontend name."; + example = "pleroma-fe"; + }; + + ref = mkOption { + type = types.nonEmptyStr; + description = mdDoc "Akkoma frontend reference."; + example = "stable"; + }; + }; + }; + + sha256 = builtins.hashString "sha256"; + + replaceSec = let + replaceSec' = { }@args: v: + if isAttrs v + then if v ? _secret + then if isAbsolutePath v._secret + then sha256 v._secret + else abort "Invalid secret path (_secret = ${v._secret})" + else mapAttrs (_: val: replaceSec' args val) v + else if isList v + then map (replaceSec' args) v + else v; + in replaceSec' { }; + + # Erlang/Elixir uses a somewhat special format for IP addresses + erlAddr = addr: fileContents + (pkgs.runCommand addr { + nativeBuildInputs = with pkgs; [ elixir ]; + code = '' + case :inet.parse_address('${addr}') do + {:ok, addr} -> IO.inspect addr + {:error, _} -> System.halt(65) + end + ''; + passAsFile = [ "code" ]; + } ''elixir "$codePath" >"$out"''); + + format = pkgs.formats.elixirConf { }; + configFile = format.generate "config.exs" + (replaceSec + (attrsets.updateManyAttrsByPath [{ + path = [ ":pleroma" "Pleroma.Web.Endpoint" "http" "ip" ]; + update = addr: + if isAbsolutePath addr + then format.lib.mkTuple + [ (format.lib.mkAtom ":local") addr ] + else format.lib.mkRaw (erlAddr addr); + }] cfg.config)); + + writeShell = { name, text, runtimeInputs ? [ ] }: + pkgs.writeShellApplication { inherit name text runtimeInputs; } + "/bin/${name}"; + + genScript = writeShell { + name = "akkoma-gen-cookie"; + runtimeInputs = with pkgs; [ coreutils util-linux ]; + text = '' + install -m 0400 \ + -o ${escapeShellArg cfg.user } \ + -g ${escapeShellArg cfg.group} \ + <(hexdump -n 16 -e '"%02x"' /dev/urandom) \ + "$RUNTIME_DIRECTORY/cookie" + ''; + }; + + copyScript = writeShell { + name = "akkoma-copy-cookie"; + runtimeInputs = with pkgs; [ coreutils ]; + text = '' + install -m 0400 \ + -o ${escapeShellArg cfg.user} \ + -g ${escapeShellArg cfg.group} \ + ${escapeShellArg cfg.dist.cookie._secret} \ + "$RUNTIME_DIRECTORY/cookie" + ''; + }; + + secretPaths = catAttrs "_secret" (collect isSecret cfg.config); + + vapidKeygen = pkgs.writeText "vapidKeygen.exs" '' + [public_path, private_path] = System.argv() + {public_key, private_key} = :crypto.generate_key :ecdh, :prime256v1 + File.write! public_path, Base.url_encode64(public_key, padding: false) + File.write! private_path, Base.url_encode64(private_key, padding: false) + ''; + + initSecretsScript = writeShell { + name = "akkoma-init-secrets"; + runtimeInputs = with pkgs; [ coreutils elixir ]; + text = let + key-base = web.secret_key_base; + jwt-signer = ex.":joken".":default_signer"; + signing-salt = web.signing_salt; + liveview-salt = web.live_view.signing_salt; + vapid-private = ex.":web_push_encryption".":vapid_details".private_key; + vapid-public = ex.":web_push_encryption".":vapid_details".public_key; + in '' + secret() { + # Generate default secret if non‐existent + test -e "$2" || install -D -m 0600 <(tr -dc 'A-Za-z-._~' &2 + exit 65 + fi + } + + secret 64 ${escapeShellArg key-base._secret} + secret 64 ${escapeShellArg jwt-signer._secret} + secret 8 ${escapeShellArg signing-salt._secret} + secret 8 ${escapeShellArg liveview-salt._secret} + + ${optionalString (isSecret vapid-public) '' + { test -e ${escapeShellArg vapid-private._secret} && \ + test -e ${escapeShellArg vapid-public._secret}; } || \ + elixir ${escapeShellArgs [ vapidKeygen vapid-public._secret vapid-private._secret ]} + ''} + ''; + }; + + configScript = writeShell { + name = "akkoma-config"; + runtimeInputs = with pkgs; [ coreutils replace-secret ]; + text = '' + cd "$RUNTIME_DIRECTORY" + tmp="$(mktemp config.exs.XXXXXXXXXX)" + trap 'rm -f "$tmp"' EXIT TERM + + cat ${escapeShellArg configFile} >"$tmp" + ${concatMapStrings (file: '' + replace-secret ${escapeShellArgs [ (sha256 file) file ]} "$tmp" + '') secretPaths} + + chown ${escapeShellArg cfg.user}:${escapeShellArg cfg.group} "$tmp" + chmod 0400 "$tmp" + mv -f "$tmp" config.exs + ''; + }; + + pgpass = let + esc = escape [ ":" ''\'' ]; + in if (cfg.initDb.password != null) + then pkgs.writeText "pgpass.conf" '' + *:*:*${esc cfg.initDb.username}:${esc (sha256 cfg.initDb.password._secret)} + '' + else null; + + escapeSqlId = x: ''"${replaceStrings [ ''"'' ] [ ''""'' ] x}"''; + escapeSqlStr = x: "'${replaceStrings [ "'" ] [ "''" ] x}'"; + + setupSql = pkgs.writeText "setup.psql" '' + \set ON_ERROR_STOP on + + ALTER ROLE ${escapeSqlId db.username} + LOGIN PASSWORD ${if db ? password + then "${escapeSqlStr (sha256 db.password._secret)}" + else "NULL"}; + + ALTER DATABASE ${escapeSqlId db.database} + OWNER TO ${escapeSqlId db.username}; + + \connect ${escapeSqlId db.database} + CREATE EXTENSION IF NOT EXISTS citext; + CREATE EXTENSION IF NOT EXISTS pg_trgm; + CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; + ''; + + dbHost = if db ? socket_dir then db.socket_dir + else if db ? socket then db.socket + else if db ? hostname then db.hostname + else null; + + initDbScript = writeShell { + name = "akkoma-initdb"; + runtimeInputs = with pkgs; [ coreutils replace-secret config.services.postgresql.package ]; + text = '' + pgpass="$(mktemp -t pgpass-XXXXXXXXXX.conf)" + setupSql="$(mktemp -t setup-XXXXXXXXXX.psql)" + trap 'rm -f "$pgpass $setupSql"' EXIT TERM + + ${optionalString (dbHost != null) '' + export PGHOST=${escapeShellArg dbHost} + ''} + export PGUSER=${escapeShellArg cfg.initDb.username} + ${optionalString (pgpass != null) '' + cat ${escapeShellArg pgpass} >"$pgpass" + replace-secret ${escapeShellArgs [ + (sha256 cfg.initDb.password._secret) cfg.initDb.password._secret ]} "$pgpass" + export PGPASSFILE="$pgpass" + ''} + + cat ${escapeShellArg setupSql} >"$setupSql" + ${optionalString (db ? password) '' + replace-secret ${escapeShellArgs [ + (sha256 db.password._secret) db.password._secret ]} "$setupSql" + ''} + + # Create role if non‐existent + psql -tAc "SELECT 1 FROM pg_roles + WHERE rolname = "${escapeShellArg (escapeSqlStr db.username)} | grep -F -q 1 || \ + psql -tAc "CREATE ROLE "${escapeShellArg (escapeSqlId db.username)} + + # Create database if non‐existent + psql -tAc "SELECT 1 FROM pg_database + WHERE datname = "${escapeShellArg (escapeSqlStr db.database)} | grep -F -q 1 || \ + psql -tAc "CREATE DATABASE "${escapeShellArg (escapeSqlId db.database)}" + OWNER "${escapeShellArg (escapeSqlId db.username)}" + TEMPLATE template0 + ENCODING 'utf8' + LOCALE 'C'" + + psql -f "$setupSql" + ''; + }; + + envWrapper = let + script = writeShell { + name = "akkoma-env"; + text = '' + cd "${cfg.package}" + + RUNTIME_DIRECTORY="''${RUNTIME_DIRECTORY:-/run/akkoma}" + AKKOMA_CONFIG_PATH="$RUNTIME_DIRECTORY/config.exs" \ + ERL_EPMD_ADDRESS="${cfg.dist.address}" \ + ERL_EPMD_PORT="${toString cfg.dist.epmdPort}" \ + ERL_FLAGS="${concatStringsSep " " [ + "-kernel inet_dist_use_interface '${erlAddr cfg.dist.address}'" + "-kernel inet_dist_listen_min ${toString cfg.dist.portMin}" + "-kernel inet_dist_listen_max ${toString cfg.dist.portMax}" + ]}" \ + RELEASE_COOKIE="$(<"$RUNTIME_DIRECTORY/cookie")" \ + RELEASE_NAME="akkoma" \ + exec "${cfg.package}/bin/$(basename "$0")" "$@" + ''; + }; + in pkgs.runCommandLocal "akkoma-env" { } '' + mkdir -p "$out/bin" + + ln -r -s ${escapeShellArg script} "$out/bin/pleroma" + ln -r -s ${escapeShellArg script} "$out/bin/pleroma_ctl" + ''; + + userWrapper = pkgs.writeShellApplication { + name = "pleroma_ctl"; + text = '' + if [ "''${1-}" == "update" ]; then + echo "OTP releases are not supported on NixOS." >&2 + exit 64 + fi + + exec sudo -u ${escapeShellArg cfg.user} \ + "${envWrapper}/bin/pleroma_ctl" "$@" + ''; + }; + + socketScript = if isAbsolutePath web.http.ip + then writeShell { + name = "akkoma-socket"; + runtimeInputs = with pkgs; [ coreutils inotify-tools ]; + text = '' + coproc { + inotifywait -q -m -e create ${escapeShellArg (dirOf web.http.ip)} + } + + trap 'kill "$COPROC_PID"' EXIT TERM + + until test -S ${escapeShellArg web.http.ip} + do read -r -u "''${COPROC[0]}" + done + + chmod 0666 ${escapeShellArg web.http.ip} + ''; + } + else null; + + staticDir = ex.":pleroma".":instance".static_dir; + uploadDir = ex.":pleroma".":instance".upload_dir; + + staticFiles = pkgs.runCommandLocal "akkoma-static" { } '' + ${concatStringsSep "\n" (mapAttrsToList (key: val: '' + mkdir -p $out/frontends/${escapeShellArg val.name}/ + ln -s ${escapeShellArg val.package} $out/frontends/${escapeShellArg val.name}/${escapeShellArg val.ref} + '') cfg.frontends)} + + ${optionalString (cfg.extraStatic != null) + (concatStringsSep "\n" (mapAttrsToList (key: val: '' + mkdir -p "$out/$(dirname ${escapeShellArg key})" + ln -s ${escapeShellArg val} $out/${escapeShellArg key} + '') cfg.extraStatic))} + ''; +in { + options = { + services.akkoma = { + enable = mkEnableOption (mdDoc "Akkoma"); + + package = mkOption { + type = types.package; + default = pkgs.akkoma; + defaultText = literalExpression "pkgs.akkoma"; + description = mdDoc "Akkoma package to use."; + }; + + user = mkOption { + type = types.nonEmptyStr; + default = "akkoma"; + description = mdDoc "User account under which Akkoma runs."; + }; + + group = mkOption { + type = types.nonEmptyStr; + default = "akkoma"; + description = mdDoc "Group account under which Akkoma runs."; + }; + + initDb = { + enable = mkOption { + type = types.bool; + default = true; + description = mdDoc '' + Whether to automatically initialise the database on startup. This will create a + database role and database if they do not already exist, and (re)set the role password + and the ownership of the database. + + This setting can be used safely even if the database already exists and contains data. + + The database settings are configured through + [{option}`config.services.akkoma.config.":pleroma"."Pleroma.Repo"`](#opt-services.akkoma.config.__pleroma_._Pleroma.Repo_). + + If disabled, the database has to be set up manually: + + ```SQL + CREATE ROLE akkoma LOGIN; + + CREATE DATABASE akkoma + OWNER akkoma + TEMPLATE template0 + ENCODING 'utf8' + LOCALE 'C'; + + \connect akkoma + CREATE EXTENSION IF NOT EXISTS citext; + CREATE EXTENSION IF NOT EXISTS pg_trgm; + CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; + ``` + ''; + }; + + username = mkOption { + type = types.nonEmptyStr; + default = config.services.postgresql.superUser; + defaultText = literalExpression "config.services.postgresql.superUser"; + description = mdDoc '' + Name of the database user to initialise the database with. + + This user is required to have the `CREATEROLE` and `CREATEDB` capabilities. + ''; + }; + + password = mkOption { + type = types.nullOr secret; + default = null; + description = mdDoc '' + Password of the database user to initialise the database with. + + If set to `null`, no password will be used. + + The attribute `_secret` should point to a file containing the secret. + ''; + }; + }; + + initSecrets = mkOption { + type = types.bool; + default = true; + description = mdDoc '' + Whether to initialise non‐existent secrets with random values. + + If enabled, appropriate secrets for the following options will be created automatically + if the files referenced in the `_secrets` attribute do not exist during startup. + + - {option}`config.":pleroma"."Pleroma.Web.Endpoint".secret_key_base` + - {option}`config.":pleroma"."Pleroma.Web.Endpoint".signing_salt` + - {option}`config.":pleroma"."Pleroma.Web.Endpoint".live_view.signing_salt` + - {option}`config.":web_push_encryption".":vapid_details".private_key` + - {option}`config.":web_push_encryption".":vapid_details".public_key` + - {option}`config.":joken".":default_signer"` + ''; + }; + + installWrapper = mkOption { + type = types.bool; + default = true; + description = mdDoc '' + Whether to install a wrapper around `pleroma_ctl` to simplify administration of the + Akkoma instance. + ''; + }; + + extraPackages = mkOption { + type = with types; listOf package; + default = with pkgs; [ exiftool ffmpeg_5-headless graphicsmagick-imagemagick-compat ]; + defaultText = literalExpression "with pkgs; [ exiftool graphicsmagick-imagemagick-compat ffmpeg_5-headless ]"; + example = literalExpression "with pkgs; [ exiftool imagemagick ffmpeg_5-full ]"; + description = mdDoc '' + List of extra packages to include in the executable search path of the service unit. + These are needed by various configurable components such as: + + - ExifTool for the `Pleroma.Upload.Filter.Exiftool` upload filter, + - ImageMagick for still image previews in the media proxy as well as for the + `Pleroma.Upload.Filters.Mogrify` upload filter, and + - ffmpeg for video previews in the media proxy. + ''; + }; + + frontends = mkOption { + description = mdDoc "Akkoma frontends."; + type = with types; attrsOf (submodule frontend); + default = { + primary = { + package = pkgs.akkoma-frontends.pleroma-fe; + name = "pleroma-fe"; + ref = "stable"; + }; + admin = { + package = pkgs.akkoma-frontends.admin-fe; + name = "admin-fe"; + ref = "stable"; + }; + }; + defaultText = literalExpression '' + { + primary = { + package = pkgs.akkoma-frontends.pleroma-fe; + name = "pleroma-fe"; + ref = "stable"; + }; + admin = { + package = pkgs.akkoma-frontends.admin-fe; + name = "admin-fe"; + ref = "stable"; + }; + } + ''; + }; + + extraStatic = mkOption { + type = with types; nullOr (attrsOf package); + description = mdDoc '' + Attribute set of extra packages to add to the static files directory. + + Do not add frontends here. These should be configured through + [{option}`services.akkoma.frontends`](#opt-services.akkoma.frontends). + ''; + default = null; + example = literalExpression '' + { + "emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg; + "static/terms-of-service.html" = pkgs.writeText "terms-of-service.html" ''' + … + '''; + "favicon.png" = let + rev = "697a8211b0f427a921e7935a35d14bb3e32d0a2c"; + in pkgs.stdenvNoCC.mkDerivation { + name = "favicon.png"; + + src = pkgs.fetchurl { + url = "https://raw.githubusercontent.com/TilCreator/NixOwO/''${rev}/NixOwO_plain.svg"; + hash = "sha256-tWhHMfJ3Od58N9H5yOKPMfM56hYWSOnr/TGCBi8bo9E="; + }; + + nativeBuildInputs = with pkgs; [ librsvg ]; + + dontUnpack = true; + installPhase = ''' + rsvg-convert -o $out -w 96 -h 96 $src + '''; + }; + } + ''; + }; + + dist = { + address = mkOption { + type = ipAddress; + default = "127.0.0.1"; + description = mdDoc '' + Listen address for Erlang distribution protocol and Port Mapper Daemon (epmd). + ''; + }; + + epmdPort = mkOption { + type = types.port; + default = 4369; + description = mdDoc "TCP port to bind Erlang Port Mapper Daemon to."; + }; + + portMin = mkOption { + type = types.port; + default = 49152; + description = mdDoc "Lower bound for Erlang distribution protocol TCP port."; + }; + + portMax = mkOption { + type = types.port; + default = 65535; + description = mdDoc "Upper bound for Erlang distribution protocol TCP port."; + }; + + cookie = mkOption { + type = types.nullOr secret; + default = null; + example = { _secret = "/var/lib/secrets/akkoma/releaseCookie"; }; + description = mdDoc '' + Erlang release cookie. + + If set to `null`, a temporary random cookie will be generated. + ''; + }; + }; + + config = mkOption { + description = mdDoc '' + Configuration for Akkoma. The attributes are serialised to Elixir DSL. + + Refer to for + configuration options. + + Settings containing secret data should be set to an attribute set containing the + attribute `_secret` - a string pointing to a file containing the value the option + should be set to. + ''; + type = types.submodule { + freeformType = format.type; + options = { + ":pleroma" = { + ":instance" = { + name = mkOption { + type = types.nonEmptyStr; + description = mdDoc "Instance name."; + }; + + email = mkOption { + type = types.nonEmptyStr; + description = mdDoc "Instance administrator email."; + }; + + description = mkOption { + type = types.nonEmptyStr; + description = mdDoc "Instance description."; + }; + + static_dir = mkOption { + type = types.path; + default = toString staticFiles; + defaultText = literalMD '' + Derivation gathering the following paths into a directory: + + - [{option}`services.akkoma.frontends`](#opt-services.akkoma.frontends) + - [{option}`services.akkoma.extraStatic`](#opt-services.akkoma.extraStatic) + ''; + description = mdDoc '' + Directory of static files. + + This directory can be built using a derivation, or it can be managed as mutable + state by setting the option to an absolute path. + ''; + }; + + upload_dir = mkOption { + type = absolutePath; + default = "/var/lib/akkoma/uploads"; + description = mdDoc '' + Directory where Akkoma will put uploaded files. + ''; + }; + }; + + "Pleroma.Repo" = mkOption { + type = elixirValue; + default = { + adapter = format.lib.mkRaw "Ecto.Adapters.Postgres"; + socket_dir = "/run/postgresql"; + username = cfg.user; + database = "akkoma"; + }; + defaultText = literalExpression '' + { + adapter = (pkgs.formats.elixirConf { }).lib.mkRaw "Ecto.Adapters.Postgres"; + socket_dir = "/run/postgresql"; + username = config.services.akkoma.user; + database = "akkoma"; + } + ''; + description = mdDoc '' + Database configuration. + + Refer to + + for options. + ''; + }; + + "Pleroma.Web.Endpoint" = { + url = { + host = mkOption { + type = types.nonEmptyStr; + default = config.networking.fqdn; + defaultText = literalExpression "config.networking.fqdn"; + description = mdDoc "Domain name of the instance."; + }; + + scheme = mkOption { + type = types.nonEmptyStr; + default = "https"; + description = mdDoc "URL scheme."; + }; + + port = mkOption { + type = types.port; + default = 443; + description = mdDoc "External port number."; + }; + }; + + http = { + ip = mkOption { + type = types.either absolutePath ipAddress; + default = "/run/akkoma/socket"; + example = "::1"; + description = mdDoc '' + Listener IP address or Unix socket path. + + The value is automatically converted to Elixir’s internal address + representation during serialisation. + ''; + }; + + port = mkOption { + type = types.port; + default = if isAbsolutePath web.http.ip then 0 else 4000; + defaultText = literalExpression '' + if isAbsolutePath config.services.akkoma.config.:pleroma"."Pleroma.Web.Endpoint".http.ip + then 0 + else 4000; + ''; + description = mdDoc '' + Listener port number. + + Must be 0 if using a Unix socket. + ''; + }; + }; + + secret_key_base = mkOption { + type = secret; + default = { _secret = "/var/lib/secrets/akkoma/key-base"; }; + description = mdDoc '' + Secret key used as a base to generate further secrets for encrypting and + signing data. + + The attribute `_secret` should point to a file containing the secret. + + This key can generated can be generated as follows: + + ```ShellSession + $ tr -dc 'A-Za-z-._~' + for options. + ''; + }; + }; + }; + + ":tzdata" = { + ":data_dir" = mkOption { + type = elixirValue; + internal = true; + default = format.lib.mkRaw '' + Path.join(System.fetch_env!("CACHE_DIRECTORY"), "tzdata") + ''; + }; + }; + }; + }; + }; + + nginx = mkOption { + type = with types; nullOr (submodule + (import ../web-servers/nginx/vhost-options.nix { inherit config lib; })); + default = null; + description = mdDoc '' + Extra configuration for the nginx virtual host of Akkoma. + + If set to `null`, no virtual host will be added to the nginx configuration. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + warnings = optionals (!config.security.sudo.enable) ['' + The pleroma_ctl wrapper enabled by the installWrapper option relies on + sudo, which appears to have been disabled through security.sudo.enable. + '']; + + users = { + users."${cfg.user}" = { + description = "Akkoma user"; + group = cfg.group; + isSystemUser = true; + }; + groups."${cfg.group}" = { }; + }; + + # Confinement of the main service unit requires separation of the + # configuration generation into a separate unit to permit access to secrets + # residing outside of the chroot. + systemd.services.akkoma-config = { + description = "Akkoma social network configuration"; + reloadTriggers = [ configFile ] ++ secretPaths; + + unitConfig.PropagatesReloadTo = [ "akkoma.service" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + UMask = "0077"; + + RuntimeDirectory = "akkoma"; + + ExecStart = mkMerge [ + (mkIf (cfg.dist.cookie == null) [ genScript ]) + (mkIf (cfg.dist.cookie != null) [ copyScript ]) + (mkIf cfg.initSecrets [ initSecretsScript ]) + [ configScript ] + ]; + + ExecReload = mkMerge [ + (mkIf cfg.initSecrets [ initSecretsScript ]) + [ configScript ] + ]; + }; + }; + + systemd.services.akkoma-initdb = mkIf cfg.initDb.enable { + description = "Akkoma social network database setup"; + requires = [ "akkoma-config.service" ]; + requiredBy = [ "akkoma.service" ]; + after = [ "akkoma-config.service" "postgresql.service" ]; + before = [ "akkoma.service" ]; + + serviceConfig = { + Type = "oneshot"; + User = mkIf (db ? socket_dir || db ? socket) + cfg.initDb.username; + RemainAfterExit = true; + UMask = "0077"; + ExecStart = initDbScript; + PrivateTmp = true; + }; + }; + + systemd.services.akkoma = let + runtimeInputs = with pkgs; [ coreutils gawk gnused ] ++ cfg.extraPackages; + in { + description = "Akkoma social network"; + documentation = [ "https://docs.akkoma.dev/stable/" ]; + + # This service depends on network-online.target and is sequenced after + # it because it requires access to the Internet to function properly. + bindsTo = [ "akkoma-config.service" ]; + wants = [ "network-online.service" ]; + wantedBy = [ "multi-user.target" ]; + after = [ + "akkoma-config.target" + "network.target" + "network-online.target" + "postgresql.service" + ]; + + confinement.packages = mkIf isConfined runtimeInputs; + path = runtimeInputs; + + serviceConfig = { + Type = "exec"; + User = cfg.user; + Group = cfg.group; + UMask = "0077"; + + # The run‐time directory is preserved as it is managed by the akkoma-config.service unit. + RuntimeDirectory = "akkoma"; + RuntimeDirectoryPreserve = true; + + CacheDirectory = "akkoma"; + + BindPaths = [ "${uploadDir}:${uploadDir}:norbind" ]; + BindReadOnlyPaths = mkMerge [ + (mkIf (!isStorePath staticDir) [ "${staticDir}:${staticDir}:norbind" ]) + (mkIf isConfined (mkMerge [ + [ "/etc/hosts" "/etc/resolv.conf" ] + (mkIf (isStorePath staticDir) (map (dir: "${dir}:${dir}:norbind") + (splitString "\n" (readFile ((pkgs.closureInfo { rootPaths = staticDir; }) + "/store-paths"))))) + (mkIf (db ? socket_dir) [ "${db.socket_dir}:${db.socket_dir}:norbind" ]) + (mkIf (db ? socket) [ "${db.socket}:${db.socket}:norbind" ]) + ])) + ]; + + ExecStartPre = "${envWrapper}/bin/pleroma_ctl migrate"; + ExecStart = "${envWrapper}/bin/pleroma start"; + ExecStartPost = socketScript; + ExecStop = "${envWrapper}/bin/pleroma stop"; + ExecStopPost = mkIf (isAbsolutePath web.http.ip) + "${pkgs.coreutils}/bin/rm -f '${web.http.ip}'"; + + ProtectProc = "noaccess"; + ProcSubset = "pid"; + ProtectSystem = mkIf (!isConfined) "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateIPC = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + LockPersonality = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RemoveIPC = true; + + CapabilityBoundingSet = mkIf + (any (port: port > 0 && port < 1024) + [ web.http.port cfg.dist.epmdPort cfg.dist.portMin ]) + [ "CAP_NET_BIND_SERVICE" ]; + + NoNewPrivileges = true; + SystemCallFilter = [ "@system-service" "~@privileged" "@chown" ]; + SystemCallArchitectures = "native"; + + DeviceAllow = null; + DevicePolicy = "closed"; + + # SMTP adapter uses dynamic port 0 binding, which is incompatible with bind address filtering + SocketBindAllow = mkIf (!hasSmtp) (mkMerge [ + [ "tcp:${toString cfg.dist.epmdPort}" "tcp:${toString cfg.dist.portMin}-${toString cfg.dist.portMax}" ] + (mkIf (web.http.port != 0) [ "tcp:${toString web.http.port}" ]) + ]); + SocketBindDeny = mkIf (!hasSmtp) "any"; + }; + }; + + systemd.tmpfiles.rules = [ + "d ${uploadDir} 0700 ${cfg.user} ${cfg.group} - -" + "Z ${uploadDir} ~0700 ${cfg.user} ${cfg.group} - -" + ]; + + environment.systemPackages = mkIf (cfg.installWrapper) [ userWrapper ]; + + services.nginx.virtualHosts = mkIf (cfg.nginx != null) { + ${web.url.host} = mkMerge [ cfg.nginx { + locations."/" = { + proxyPass = + if isAbsolutePath web.http.ip + then "http://unix:${web.http.ip}" + else if hasInfix ":" web.http.ip + then "http://[${web.http.ip}]:${toString web.http.port}" + else "http://${web.http.ip}:${toString web.http.port}"; + + proxyWebsockets = true; + recommendedProxySettings = true; + }; + }]; + }; + }; + + meta.maintainers = with maintainers; [ mvs ]; + meta.doc = ./akkoma.md; +} diff --git a/nixos/modules/services/web-apps/alps.nix b/nixos/modules/services/web-apps/alps.nix index 4681739af4ab..1a58df2da1d2 100644 --- a/nixos/modules/services/web-apps/alps.nix +++ b/nixos/modules/services/web-apps/alps.nix @@ -98,11 +98,11 @@ in { serviceConfig = { ExecStart = "${cfg.package}/bin/alps ${escapeShellArgs cfg.args}"; + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; DynamicUser = true; - ## This is desirable but would restrict bindIP to 127.0.0.1 - #IPAddressAllow = "localhost"; - #IPAddressDeny = "any"; LockPersonality = true; + MemoryDenyWriteExecute = true; NoNewPrivileges = true; PrivateDevices = true; PrivateIPC = true; @@ -122,8 +122,10 @@ in { RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; + SocketBindAllow = cfg.port; + SocketBindDeny = "any"; SystemCallArchitectures = "native"; - SystemCallFilter = [ "@system-service @resources" "~@privileged @obsolete" ]; + SystemCallFilter = [ "@system-service" "~@privileged @obsolete" ]; }; }; }; diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix index 08cff3286571..fe98c1777ea0 100644 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -56,7 +56,7 @@ in }; listenPort = mkOption { - type = types.int; + type = types.port; default = 8090; description = lib.mdDoc "Port to listen on."; }; @@ -78,7 +78,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 443; example = 80; description = lib.mdDoc "Port used at the proxy"; diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index 8d28eb162ef2..4cc858216944 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -56,7 +56,7 @@ in }; listenPort = mkOption { - type = types.int; + type = types.port; default = 8091; description = lib.mdDoc "Port to listen on."; }; @@ -78,7 +78,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 443; example = 80; description = lib.mdDoc "Port used at the proxy"; diff --git a/nixos/modules/services/web-apps/bookstack.nix b/nixos/modules/services/web-apps/bookstack.nix index 40bb377e2c88..d846c98577c8 100644 --- a/nixos/modules/services/web-apps/bookstack.nix +++ b/nixos/modules/services/web-apps/bookstack.nix @@ -359,7 +359,7 @@ in { }; systemd.services.bookstack-setup = { - description = "Preperation tasks for BookStack"; + description = "Preparation tasks for BookStack"; before = [ "phpfpm-bookstack.service" ]; after = optional db.createLocally "mysql.service"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/web-apps/changedetection-io.nix b/nixos/modules/services/web-apps/changedetection-io.nix index ace4cf1eabc9..bbf4c2aed186 100644 --- a/nixos/modules/services/web-apps/changedetection-io.nix +++ b/nixos/modules/services/web-apps/changedetection-io.nix @@ -138,7 +138,8 @@ in StateDirectory = mkIf defaultStateDir "changedetection-io"; StateDirectoryMode = mkIf defaultStateDir "0750"; WorkingDirectory = cfg.datastorePath; - Environment = lib.optional (cfg.baseURL != null) "BASE_URL=${cfg.baseURL}" + Environment = [ "HIDE_REFERER=true" ] + ++ lib.optional (cfg.baseURL != null) "BASE_URL=${cfg.baseURL}" ++ lib.optional cfg.behindProxy "USE_X_SETTINGS=1" ++ lib.optional cfg.webDriverSupport "WEBDRIVER_URL=http://127.0.0.1:${toString cfg.chromePort}/wd/hub" ++ lib.optional cfg.playwrightSupport "PLAYWRIGHT_DRIVER_URL=ws://127.0.0.1:${toString cfg.chromePort}/?stealth=1&--disable-web-security=true"; @@ -213,7 +214,7 @@ in }; }) ]; - podman.defaultNetwork.dnsname.enable = true; + podman.defaultNetwork.settings.dns_enabled = true; }; }; } diff --git a/nixos/modules/services/web-apps/cloudlog.nix b/nixos/modules/services/web-apps/cloudlog.nix new file mode 100644 index 000000000000..ffd1085bde65 --- /dev/null +++ b/nixos/modules/services/web-apps/cloudlog.nix @@ -0,0 +1,502 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.cloudlog; + dbFile = let + password = if cfg.database.createLocally + then "''" + else "trim(file_get_contents('${cfg.database.passwordFile}'))"; + in pkgs.writeText "database.php" '' + "", + 'hostname' => '${cfg.database.host}', + 'username' => '${cfg.database.user}', + 'password' => ${password}, + 'database' => '${cfg.database.name}', + 'dbdriver' => 'mysqli', + 'dbprefix' => "", + 'pconnect' => TRUE, + 'db_debug' => (ENVIRONMENT !== 'production'), + 'cache_on' => FALSE, + 'cachedir' => "", + 'char_set' => 'utf8mb4', + 'dbcollat' => 'utf8mb4_general_ci', + 'swap_pre' => "", + 'encrypt' => FALSE, + 'compress' => FALSE, + 'stricton' => FALSE, + 'failover' => array(), + 'save_queries' => TRUE + ); + ''; + configFile = pkgs.writeText "config.php" '' + ${strings.fileContents "${pkgs.cloudlog}/install/config/config.php"} + $config['datadir'] = "${cfg.dataDir}/"; + $config['base_url'] = "${cfg.baseUrl}"; + ${cfg.extraConfig} + ''; + package = pkgs.stdenv.mkDerivation rec { + pname = "cloudlog"; + version = src.version; + src = pkgs.cloudlog; + installPhase = '' + mkdir -p $out + cp -r * $out/ + + ln -s ${configFile} $out/application/config/config.php + ln -s ${dbFile} $out/application/config/database.php + + # link writable directories + for directory in updates uploads backup logbook; do + rm -rf $out/$directory + ln -s ${cfg.dataDir}/$directory $out/$directory + done + + # link writable asset files + for asset in dok sota wwff; do + rm -rf $out/assets/json/$asset.txt + ln -s ${cfg.dataDir}/assets/json/$asset.txt $out/assets/json/$asset.txt + done + ''; + }; +in +{ + options.services.cloudlog = with types; { + enable = mkEnableOption (mdDoc "Whether to enable Cloudlog."); + dataDir = mkOption { + type = str; + default = "/var/lib/cloudlog"; + description = mdDoc "Cloudlog data directory."; + }; + baseUrl = mkOption { + type = str; + default = "http://localhost"; + description = mdDoc "Cloudlog base URL"; + }; + user = mkOption { + type = str; + default = "cloudlog"; + description = mdDoc "User account under which Cloudlog runs."; + }; + database = { + createLocally = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc "Create the database and database user locally."; + }; + host = mkOption { + type = str; + description = mdDoc "MySQL database host"; + default = "localhost"; + }; + name = mkOption { + type = str; + description = mdDoc "MySQL database name."; + default = "cloudlog"; + }; + user = mkOption { + type = str; + description = mdDoc "MySQL user name."; + default = "cloudlog"; + }; + passwordFile = mkOption { + type = nullOr str; + description = mdDoc "MySQL user password file."; + default = null; + }; + }; + poolConfig = mkOption { + type = attrsOf (oneOf [ str int bool ]); + default = { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + }; + description = mdDoc '' + Options for Cloudlog's PHP-FPM pool. + ''; + }; + virtualHost = mkOption { + type = nullOr str; + default = "localhost"; + description = mdDoc '' + Name of the nginx virtualhost to use and setup. If null, do not setup + any virtualhost. + ''; + }; + extraConfig = mkOption { + description = mdDoc '' + Any additional text to be appended to the config.php + configuration file. This is a PHP script. For configuration + settings, see . + ''; + default = ""; + type = str; + example = '' + $config['show_time'] = TRUE; + ''; + }; + upload-lotw = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically upload logs to LoTW. If enabled, a systemd + timer will run the log upload task as specified by the interval + option. + ''; + }; + interval = mkOption { + type = str; + default = "daily"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the + time at which the LoTW upload will occur. + ''; + }; + }; + upload-clublog = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically upload logs to Clublog. If enabled, a systemd + timer will run the log upload task as specified by the interval option. + ''; + }; + interval = mkOption { + type = str; + default = "daily"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the time + at which the Clublog upload will occur. + ''; + }; + }; + update-lotw-users = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically update the list of LoTW users. If enabled, a + systemd timer will run the update task as specified by the interval + option. + ''; + }; + interval = mkOption { + type = str; + default = "weekly"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the + time at which the LoTW user update will occur. + ''; + }; + }; + update-dok = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically update the DOK resource file. If enabled, a + systemd timer will run the update task as specified by the interval option. + ''; + }; + interval = mkOption { + type = str; + default = "monthly"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the + time at which the DOK update will occur. + ''; + }; + }; + update-clublog-scp = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically update the Clublog SCP database. If enabled, + a systemd timer will run the update task as specified by the interval + option. + ''; + }; + interval = mkOption { + type = str; + default = "monthly"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the time + at which the Clublog SCP update will occur. + ''; + }; + }; + update-wwff = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically update the WWFF database. If enabled, a + systemd timer will run the update task as specified by the interval + option. + ''; + }; + interval = mkOption { + type = str; + default = "monthly"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the time + at which the WWFF update will occur. + ''; + }; + }; + upload-qrz = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically upload logs to QRZ. If enabled, a systemd + timer will run the update task as specified by the interval option. + ''; + }; + interval = mkOption { + type = str; + default = "daily"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the + time at which the QRZ upload will occur. + ''; + }; + }; + update-sota = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically update the SOTA database. If enabled, a + systemd timer will run the update task as specified by the interval option. + ''; + }; + interval = mkOption { + type = str; + default = "monthly"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the time + at which the SOTA update will occur. + ''; + }; + }; + }; + config = mkIf cfg.enable { + + assertions = [ + { + assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; + message = "services.cloudlog.database.passwordFile cannot be specified if services.cloudlog.database.createLocally is set to true."; + } + ]; + + services.phpfpm = { + pools.cloudlog = { + inherit (cfg) user; + group = config.services.nginx.group; + settings = { + "listen.owner" = config.services.nginx.user; + "listen.group" = config.services.nginx.group; + } // cfg.poolConfig; + }; + }; + + services.nginx = mkIf (cfg.virtualHost != null) { + enable = true; + virtualHosts = { + "${cfg.virtualHost}" = { + root = "${package}"; + locations."/".tryFiles = "$uri /index.php$is_args$args"; + locations."~ ^/index.php(/|$)".extraConfig = '' + include ${config.services.nginx.package}/conf/fastcgi_params; + include ${pkgs.nginx}/conf/fastcgi.conf; + fastcgi_split_path_info ^(.+\.php)(.+)$; + fastcgi_pass unix:${config.services.phpfpm.pools.cloudlog.socket}; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + ''; + }; + }; + }; + + services.mysql = mkIf cfg.database.createLocally { + enable = true; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [{ + name = cfg.database.user; + ensurePermissions = { + "${cfg.database.name}.*" = "ALL PRIVILEGES"; + }; + }]; + }; + + systemd = { + services = { + cloudlog-setup-database = mkIf cfg.database.createLocally { + description = "Set up cloudlog database"; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + wantedBy = [ "phpfpm-cloudlog.service" ]; + after = [ "mysql.service" ]; + script = let + mysql = "${config.services.mysql.package}/bin/mysql"; + in '' + if [ ! -f ${cfg.dataDir}/.dbexists ]; then + ${mysql} ${cfg.database.name} < ${pkgs.cloudlog}/install/assets/install.sql + touch ${cfg.dataDir}/.dbexists + fi + ''; + }; + cloudlog-upload-lotw = { + description = "Upload QSOs to LoTW if certs have been provided"; + enable = cfg.upload-lotw.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/lotw/lotw_upload"; + }; + cloudlog-update-lotw-users = { + description = "Update LOTW Users Database"; + enable = cfg.update-lotw-users.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/lotw/load_users"; + }; + cloudlog-update-dok = { + description = "Update DOK File for autocomplete"; + enable = cfg.update-dok.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_dok"; + }; + cloudlog-update-clublog-scp = { + description = "Update Clublog SCP Database File"; + enable = cfg.update-clublog-scp.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_clublog_scp"; + }; + cloudlog-update-wwff = { + description = "Update WWFF File for autocomplete"; + enable = cfg.update-wwff.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_wwff"; + }; + cloudlog-upload-qrz = { + description = "Upload QSOs to QRZ Logbook"; + enable = cfg.upload-qrz.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/qrz/upload"; + }; + cloudlog-update-sota = { + description = "Update SOTA File for autocomplete"; + enable = cfg.update-sota.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_sota"; + }; + }; + timers = { + cloudlog-upload-lotw = { + enable = cfg.upload-lotw.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-upload-lotw.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.upload-lotw.interval; + Persistent = true; + }; + }; + cloudlog-upload-clublog = { + enable = cfg.upload-clublog.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-upload-clublog.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.upload-clublog.interval; + Persistent = true; + }; + }; + cloudlog-update-lotw-users = { + enable = cfg.update-lotw-users.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-update-lotw-users.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.update-lotw-users.interval; + Persistent = true; + }; + }; + cloudlog-update-dok = { + enable = cfg.update-dok.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-update-dok.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.update-dok.interval; + Persistent = true; + }; + }; + cloudlog-update-clublog-scp = { + enable = cfg.update-clublog-scp.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-update-clublog-scp.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.update-clublog-scp.interval; + Persistent = true; + }; + }; + cloudlog-update-wwff = { + enable = cfg.update-wwff.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-update-wwff.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.update-wwff.interval; + Persistent = true; + }; + }; + cloudlog-upload-qrz = { + enable = cfg.upload-qrz.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-upload-qrz.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.upload-qrz.interval; + Persistent = true; + }; + }; + cloudlog-update-sota = { + enable = cfg.update-sota.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-update-sota.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.update-sota.interval; + Persistent = true; + }; + }; + }; + tmpfiles.rules = let + group = config.services.nginx.group; + in [ + "d ${cfg.dataDir} 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/updates 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/uploads 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/backup 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/logbook 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/assets/json 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/assets/qslcard 0750 ${cfg.user} ${group} - -" + ]; + }; + + users.users."${cfg.user}" = { + isSystemUser = true; + group = config.services.nginx.group; + }; + }; + + meta.maintainers = with maintainers; [ melling ]; +} diff --git a/nixos/modules/services/web-apps/code-server.nix b/nixos/modules/services/web-apps/code-server.nix index 0d6b6c529b6d..24e34e0c5833 100644 --- a/nixos/modules/services/web-apps/code-server.nix +++ b/nixos/modules/services/web-apps/code-server.nix @@ -15,7 +15,7 @@ in { package = mkOption { default = pkgs.code-server; - defaultText = "pkgs.code-server"; + defaultText = lib.literalExpression "pkgs.code-server"; description = lib.mdDoc "Which code-server derivation to use."; type = types.package; }; diff --git a/nixos/modules/services/web-apps/dex.nix b/nixos/modules/services/web-apps/dex.nix index 1dcc6f7a7c5b..f69f1749aeb8 100644 --- a/nixos/modules/services/web-apps/dex.nix +++ b/nixos/modules/services/web-apps/dex.nix @@ -83,11 +83,12 @@ in AmbientCapabilities = "CAP_NET_BIND_SERVICE"; BindReadOnlyPaths = [ "/nix/store" - "-/etc/resolv.conf" - "-/etc/nsswitch.conf" + "-/etc/dex" "-/etc/hosts" "-/etc/localtime" - "-/etc/dex" + "-/etc/nsswitch.conf" + "-/etc/resolv.conf" + "-/etc/ssl/certs/ca-certificates.crt" ]; BindPaths = optional (cfg.settings.storage.type == "postgres") "/var/run/postgresql"; CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; diff --git a/nixos/modules/services/web-apps/discourse.md b/nixos/modules/services/web-apps/discourse.md new file mode 100644 index 000000000000..35180bea87d9 --- /dev/null +++ b/nixos/modules/services/web-apps/discourse.md @@ -0,0 +1,286 @@ +# Discourse {#module-services-discourse} + +[Discourse](https://www.discourse.org/) is a +modern and open source discussion platform. + +## Basic usage {#module-services-discourse-basic-usage} + +A minimal configuration using Let's Encrypt for TLS certificates looks like this: +``` +services.discourse = { + enable = true; + hostname = "discourse.example.com"; + admin = { + email = "admin@example.com"; + username = "admin"; + fullName = "Administrator"; + passwordFile = "/path/to/password_file"; + }; + secretKeyBaseFile = "/path/to/secret_key_base_file"; +}; +security.acme.email = "me@example.com"; +security.acme.acceptTerms = true; +``` + +Provided a proper DNS setup, you'll be able to connect to the +instance at `discourse.example.com` and log in +using the credentials provided in +`services.discourse.admin`. + +## Using a regular TLS certificate {#module-services-discourse-tls} + +To set up TLS using a regular certificate and key on file, use +the [](#opt-services.discourse.sslCertificate) +and [](#opt-services.discourse.sslCertificateKey) +options: + +``` +services.discourse = { + enable = true; + hostname = "discourse.example.com"; + sslCertificate = "/path/to/ssl_certificate"; + sslCertificateKey = "/path/to/ssl_certificate_key"; + admin = { + email = "admin@example.com"; + username = "admin"; + fullName = "Administrator"; + passwordFile = "/path/to/password_file"; + }; + secretKeyBaseFile = "/path/to/secret_key_base_file"; +}; +``` + +## Database access {#module-services-discourse-database} + +Discourse uses PostgreSQL to store most of its +data. A database will automatically be enabled and a database +and role created unless [](#opt-services.discourse.database.host) is changed from +its default of `null` or [](#opt-services.discourse.database.createLocally) is set +to `false`. + +External database access can also be configured by setting +[](#opt-services.discourse.database.host), +[](#opt-services.discourse.database.username) and +[](#opt-services.discourse.database.passwordFile) as +appropriate. Note that you need to manually create a database +called `discourse` (or the name you chose in +[](#opt-services.discourse.database.name)) and +allow the configured database user full access to it. + +## Email {#module-services-discourse-mail} + +In addition to the basic setup, you'll want to configure an SMTP +server Discourse can use to send user +registration and password reset emails, among others. You can +also optionally let Discourse receive +email, which enables people to reply to threads and conversations +via email. + +A basic setup which assumes you want to use your configured +[hostname](#opt-services.discourse.hostname) as +email domain can be done like this: + +``` +services.discourse = { + enable = true; + hostname = "discourse.example.com"; + sslCertificate = "/path/to/ssl_certificate"; + sslCertificateKey = "/path/to/ssl_certificate_key"; + admin = { + email = "admin@example.com"; + username = "admin"; + fullName = "Administrator"; + passwordFile = "/path/to/password_file"; + }; + mail.outgoing = { + serverAddress = "smtp.emailprovider.com"; + port = 587; + username = "user@emailprovider.com"; + passwordFile = "/path/to/smtp_password_file"; + }; + mail.incoming.enable = true; + secretKeyBaseFile = "/path/to/secret_key_base_file"; +}; +``` + +This assumes you have set up an MX record for the address you've +set in [hostname](#opt-services.discourse.hostname) and +requires proper SPF, DKIM and DMARC configuration to be done for +the domain you're sending from, in order for email to be reliably delivered. + +If you want to use a different domain for your outgoing email +(for example `example.com` instead of +`discourse.example.com`) you should set +[](#opt-services.discourse.mail.notificationEmailAddress) and +[](#opt-services.discourse.mail.contactEmailAddress) manually. + +::: {.note} +Setup of TLS for incoming email is currently only configured +automatically when a regular TLS certificate is used, i.e. when +[](#opt-services.discourse.sslCertificate) and +[](#opt-services.discourse.sslCertificateKey) are +set. +::: + +## Additional settings {#module-services-discourse-settings} + +Additional site settings and backend settings, for which no +explicit NixOS options are provided, +can be set in [](#opt-services.discourse.siteSettings) and +[](#opt-services.discourse.backendSettings) respectively. + +### Site settings {#module-services-discourse-site-settings} + +"Site settings" are the settings that can be +changed through the Discourse +UI. Their *default* values can be set using +[](#opt-services.discourse.siteSettings). + +Settings are expressed as a Nix attribute set which matches the +structure of the configuration in +[config/site_settings.yml](https://github.com/discourse/discourse/blob/master/config/site_settings.yml). +To find a setting's path, you only need to care about the first +two levels; i.e. its category (e.g. `login`) +and name (e.g. `invite_only`). + +Settings containing secret data should be set to an attribute +set containing the attribute `_secret` - a +string pointing to a file containing the value the option +should be set to. See the example. + +### Backend settings {#module-services-discourse-backend-settings} + +Settings are expressed as a Nix attribute set which matches the +structure of the configuration in +[config/discourse.conf](https://github.com/discourse/discourse/blob/stable/config/discourse_defaults.conf). +Empty parameters can be defined by setting them to +`null`. + +### Example {#module-services-discourse-settings-example} + +The following example sets the title and description of the +Discourse instance and enables +GitHub login in the site settings, +and changes a few request limits in the backend settings: +``` +services.discourse = { + enable = true; + hostname = "discourse.example.com"; + sslCertificate = "/path/to/ssl_certificate"; + sslCertificateKey = "/path/to/ssl_certificate_key"; + admin = { + email = "admin@example.com"; + username = "admin"; + fullName = "Administrator"; + passwordFile = "/path/to/password_file"; + }; + mail.outgoing = { + serverAddress = "smtp.emailprovider.com"; + port = 587; + username = "user@emailprovider.com"; + passwordFile = "/path/to/smtp_password_file"; + }; + mail.incoming.enable = true; + siteSettings = { + required = { + title = "My Cats"; + site_description = "Discuss My Cats (and be nice plz)"; + }; + login = { + enable_github_logins = true; + github_client_id = "a2f6dfe838cb3206ce20"; + github_client_secret._secret = /run/keys/discourse_github_client_secret; + }; + }; + backendSettings = { + max_reqs_per_ip_per_minute = 300; + max_reqs_per_ip_per_10_seconds = 60; + max_asset_reqs_per_ip_per_10_seconds = 250; + max_reqs_per_ip_mode = "warn+block"; + }; + secretKeyBaseFile = "/path/to/secret_key_base_file"; +}; +``` + +In the resulting site settings file, the +`login.github_client_secret` key will be set +to the contents of the +{file}`/run/keys/discourse_github_client_secret` +file. + +## Plugins {#module-services-discourse-plugins} + +You can install Discourse plugins +using the [](#opt-services.discourse.plugins) +option. Pre-packaged plugins are provided in +`.plugins`. If +you want the full suite of plugins provided through +`nixpkgs`, you can also set the [](#opt-services.discourse.package) option to +`pkgs.discourseAllPlugins`. + +Plugins can be built with the +`.mkDiscoursePlugin` +function. Normally, it should suffice to provide a +`name` and `src` attribute. If +the plugin has Ruby dependencies, however, they need to be +packaged in accordance with the [Developing with Ruby](https://nixos.org/manual/nixpkgs/stable/#developing-with-ruby) +section of the Nixpkgs manual and the +appropriate gem options set in `bundlerEnvArgs` +(normally `gemdir` is sufficient). A plugin's +Ruby dependencies are listed in its +{file}`plugin.rb` file as function calls to +`gem`. To construct the corresponding +{file}`Gemfile` manually, run {command}`bundle init`, then add the `gem` lines to it +verbatim. + +Much of the packaging can be done automatically by the +{file}`nixpkgs/pkgs/servers/web-apps/discourse/update.py` +script - just add the plugin to the `plugins` +list in the `update_plugins` function and run +the script: +```bash +./update.py update-plugins +``` + +Some plugins provide [site settings](#module-services-discourse-site-settings). +Their defaults can be configured using [](#opt-services.discourse.siteSettings), just like +regular site settings. To find the names of these settings, look +in the `config/settings.yml` file of the plugin +repo. + +For example, to add the [discourse-spoiler-alert](https://github.com/discourse/discourse-spoiler-alert) +and [discourse-solved](https://github.com/discourse/discourse-solved) +plugins, and disable `discourse-spoiler-alert` +by default: + +``` +services.discourse = { + enable = true; + hostname = "discourse.example.com"; + sslCertificate = "/path/to/ssl_certificate"; + sslCertificateKey = "/path/to/ssl_certificate_key"; + admin = { + email = "admin@example.com"; + username = "admin"; + fullName = "Administrator"; + passwordFile = "/path/to/password_file"; + }; + mail.outgoing = { + serverAddress = "smtp.emailprovider.com"; + port = 587; + username = "user@emailprovider.com"; + passwordFile = "/path/to/smtp_password_file"; + }; + mail.incoming.enable = true; + plugins = with config.services.discourse.package.plugins; [ + discourse-spoiler-alert + discourse-solved + ]; + siteSettings = { + plugins = { + spoiler_enabled = false; + }; + }; + secretKeyBaseFile = "/path/to/secret_key_base_file"; +}; +``` diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 6500b8cad217..5565a4f45d1e 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -19,9 +19,9 @@ let # We only want to create a database if we're actually going to connect to it. databaseActuallyCreateLocally = cfg.database.createLocally && cfg.database.host == null; - tlsEnabled = (cfg.enableACME + tlsEnabled = cfg.enableACME || cfg.sslCertificate != null - || cfg.sslCertificateKey != null); + || cfg.sslCertificateKey != null; in { options = { @@ -820,10 +820,10 @@ in services.nginx = lib.mkIf cfg.nginx.enable { enable = true; - additionalModules = [ pkgs.nginxModules.brotli ]; recommendedTlsSettings = true; recommendedOptimisation = true; + recommendedBrotliSettings = true; recommendedGzipSettings = true; recommendedProxySettings = true; @@ -1080,6 +1080,6 @@ in ]; }; - meta.doc = ./discourse.xml; + meta.doc = ./discourse.md; meta.maintainers = [ lib.maintainers.talyz ]; } diff --git a/nixos/modules/services/web-apps/discourse.xml b/nixos/modules/services/web-apps/discourse.xml deleted file mode 100644 index ad9b65abf51e..000000000000 --- a/nixos/modules/services/web-apps/discourse.xml +++ /dev/null @@ -1,355 +0,0 @@ - - Discourse - - Discourse is a - modern and open source discussion platform. - - -
- Basic usage - - A minimal configuration using Let's Encrypt for TLS certificates looks like this: - -services.discourse = { - enable = true; - hostname = "discourse.example.com"; - admin = { - email = "admin@example.com"; - username = "admin"; - fullName = "Administrator"; - passwordFile = "/path/to/password_file"; - }; - secretKeyBaseFile = "/path/to/secret_key_base_file"; -}; -security.acme.email = "me@example.com"; -security.acme.acceptTerms = true; - - - - - Provided a proper DNS setup, you'll be able to connect to the - instance at discourse.example.com and log in - using the credentials provided in - services.discourse.admin. - -
- -
- Using a regular TLS certificate - - To set up TLS using a regular certificate and key on file, use - the - and - options: - - -services.discourse = { - enable = true; - hostname = "discourse.example.com"; - sslCertificate = "/path/to/ssl_certificate"; - sslCertificateKey = "/path/to/ssl_certificate_key"; - admin = { - email = "admin@example.com"; - username = "admin"; - fullName = "Administrator"; - passwordFile = "/path/to/password_file"; - }; - secretKeyBaseFile = "/path/to/secret_key_base_file"; -}; - - - -
- -
- Database access - - Discourse uses - PostgreSQL to store most of its - data. A database will automatically be enabled and a database - and role created unless is changed from - its default of null or is set - to false. - - - - External database access can also be configured by setting - , and as - appropriate. Note that you need to manually create a database - called discourse (or the name you chose in - ) and - allow the configured database user full access to it. - -
- -
- Email - - In addition to the basic setup, you'll want to configure an SMTP - server Discourse can use to send user - registration and password reset emails, among others. You can - also optionally let Discourse receive - email, which enables people to reply to threads and conversations - via email. - - - - A basic setup which assumes you want to use your configured hostname as - email domain can be done like this: - - -services.discourse = { - enable = true; - hostname = "discourse.example.com"; - sslCertificate = "/path/to/ssl_certificate"; - sslCertificateKey = "/path/to/ssl_certificate_key"; - admin = { - email = "admin@example.com"; - username = "admin"; - fullName = "Administrator"; - passwordFile = "/path/to/password_file"; - }; - mail.outgoing = { - serverAddress = "smtp.emailprovider.com"; - port = 587; - username = "user@emailprovider.com"; - passwordFile = "/path/to/smtp_password_file"; - }; - mail.incoming.enable = true; - secretKeyBaseFile = "/path/to/secret_key_base_file"; -}; - - - This assumes you have set up an MX record for the address you've - set in hostname and - requires proper SPF, DKIM and DMARC configuration to be done for - the domain you're sending from, in order for email to be reliably delivered. - - - - If you want to use a different domain for your outgoing email - (for example example.com instead of - discourse.example.com) you should set - and - manually. - - - - - Setup of TLS for incoming email is currently only configured - automatically when a regular TLS certificate is used, i.e. when - and - are - set. - - - -
- -
- Additional settings - - Additional site settings and backend settings, for which no - explicit NixOS options are provided, - can be set in and - respectively. - - -
- Site settings - - Site settings are the settings that can be - changed through the Discourse - UI. Their default values can be set using - . - - - - Settings are expressed as a Nix attribute set which matches the - structure of the configuration in - config/site_settings.yml. - To find a setting's path, you only need to care about the first - two levels; i.e. its category (e.g. login) - and name (e.g. invite_only). - - - - Settings containing secret data should be set to an attribute - set containing the attribute _secret - a - string pointing to a file containing the value the option - should be set to. See the example. - -
- -
- Backend settings - - Settings are expressed as a Nix attribute set which matches the - structure of the configuration in - config/discourse.conf. - Empty parameters can be defined by setting them to - null. - -
- -
- Example - - The following example sets the title and description of the - Discourse instance and enables - GitHub login in the site settings, - and changes a few request limits in the backend settings: - -services.discourse = { - enable = true; - hostname = "discourse.example.com"; - sslCertificate = "/path/to/ssl_certificate"; - sslCertificateKey = "/path/to/ssl_certificate_key"; - admin = { - email = "admin@example.com"; - username = "admin"; - fullName = "Administrator"; - passwordFile = "/path/to/password_file"; - }; - mail.outgoing = { - serverAddress = "smtp.emailprovider.com"; - port = 587; - username = "user@emailprovider.com"; - passwordFile = "/path/to/smtp_password_file"; - }; - mail.incoming.enable = true; - siteSettings = { - required = { - title = "My Cats"; - site_description = "Discuss My Cats (and be nice plz)"; - }; - login = { - enable_github_logins = true; - github_client_id = "a2f6dfe838cb3206ce20"; - github_client_secret._secret = /run/keys/discourse_github_client_secret; - }; - }; - backendSettings = { - max_reqs_per_ip_per_minute = 300; - max_reqs_per_ip_per_10_seconds = 60; - max_asset_reqs_per_ip_per_10_seconds = 250; - max_reqs_per_ip_mode = "warn+block"; - }; - secretKeyBaseFile = "/path/to/secret_key_base_file"; -}; - - - - In the resulting site settings file, the - login.github_client_secret key will be set - to the contents of the - /run/keys/discourse_github_client_secret - file. - -
-
-
- Plugins - - You can install Discourse plugins - using the - option. Pre-packaged plugins are provided in - <your_discourse_package_here>.plugins. If - you want the full suite of plugins provided through - nixpkgs, you can also set the option to - pkgs.discourseAllPlugins. - - - - Plugins can be built with the - <your_discourse_package_here>.mkDiscoursePlugin - function. Normally, it should suffice to provide a - name and src attribute. If - the plugin has Ruby dependencies, however, they need to be - packaged in accordance with the Developing - with Ruby section of the Nixpkgs manual and the - appropriate gem options set in bundlerEnvArgs - (normally gemdir is sufficient). A plugin's - Ruby dependencies are listed in its - plugin.rb file as function calls to - gem. To construct the corresponding - Gemfile manually, run bundle - init, then add the gem lines to it - verbatim. - - - - Much of the packaging can be done automatically by the - nixpkgs/pkgs/servers/web-apps/discourse/update.py - script - just add the plugin to the plugins - list in the update_plugins function and run - the script: - -./update.py update-plugins - - - - - Some plugins provide site - settings. Their defaults can be configured using , just like - regular site settings. To find the names of these settings, look - in the config/settings.yml file of the plugin - repo. - - - - For example, to add the discourse-spoiler-alert - and discourse-solved - plugins, and disable discourse-spoiler-alert - by default: - - -services.discourse = { - enable = true; - hostname = "discourse.example.com"; - sslCertificate = "/path/to/ssl_certificate"; - sslCertificateKey = "/path/to/ssl_certificate_key"; - admin = { - email = "admin@example.com"; - username = "admin"; - fullName = "Administrator"; - passwordFile = "/path/to/password_file"; - }; - mail.outgoing = { - serverAddress = "smtp.emailprovider.com"; - port = 587; - username = "user@emailprovider.com"; - passwordFile = "/path/to/smtp_password_file"; - }; - mail.incoming.enable = true; - plugins = with config.services.discourse.package.plugins; [ - discourse-spoiler-alert - discourse-solved - ]; - siteSettings = { - plugins = { - spoiler_enabled = false; - }; - }; - secretKeyBaseFile = "/path/to/secret_key_base_file"; -}; - - - -
-
diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index f0b3c7b2bcf8..54cd5fd33bef 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -8,56 +8,145 @@ let user = "dokuwiki"; webserver = config.services.${cfg.webserver}; - dokuwikiAclAuthConfig = hostName: cfg: pkgs.writeText "acl.auth-${hostName}.php" '' + mkPhpIni = generators.toKeyValue { + mkKeyValue = generators.mkKeyValueDefault {} " = "; + }; + mkPhpPackage = cfg: cfg.phpPackage.buildEnv { + extraConfig = mkPhpIni cfg.phpOptions; + }; + + dokuwikiAclAuthConfig = hostName: cfg: let + inherit (cfg) acl; + acl_gen = concatMapStringsSep "\n" (l: "${l.page} \t ${l.actor} \t ${toString l.level}"); + in pkgs.writeText "acl.auth-${hostName}.php" '' # acl.auth.php # # # Access Control Lists # - ${toString cfg.acl} + ${if isString acl then acl else acl_gen acl} ''; - dokuwikiLocalConfig = hostName: cfg: pkgs.writeText "local-${hostName}.php" '' - for explanation + ''; + example = "read"; + }; + + }; }; siteOpts = { config, lib, name, ... }: { + imports = [ + # NOTE: These will sadly not print the absolute argument path but only the name. Related to #96006 + (mkRenamedOptionModule [ "aclUse" ] [ "settings" "useacl" ] ) + (mkRenamedOptionModule [ "superUser" ] [ "settings" "superuser" ] ) + (mkRenamedOptionModule [ "disableActions" ] [ "settings" "disableactions" ] ) + ({ config, options, name, ...}: { + config.warnings = + (optional (isString config.pluginsConfig) '' + Passing plain strings to services.dokuwiki.sites.${name}.pluginsConfig has been deprecated and will not be continue to be supported in the future. + Please pass structured settings instead. + '') + ++ (optional (isString config.acl) '' + Passing a plain string to services.dokuwiki.sites.${name}.acl has been deprecated and will not continue to be supported in the future. + Please pass structured settings instead. + '') + ++ (optional (config.extraConfig != null) '' + services.dokuwiki.sites.${name}.extraConfig is deprecated and will be removed in the future. + Please pass structured settings to services.dokuwiki.sites.${name}.settings instead. + '') + ; + }) + ]; + options = { enable = mkEnableOption (lib.mdDoc "DokuWiki web application."); @@ -75,9 +164,22 @@ let }; acl = mkOption { - type = types.nullOr types.lines; + type = with types; nullOr (oneOf [ lines (listOf (submodule aclOpts)) ]); default = null; - example = "* @ALL 8"; + example = literalExpression '' + [ + { + page = "start"; + actor = "@external"; + level = "read"; + } + { + page = "*"; + actor = "@users"; + level = "upload"; + } + ] + ''; description = lib.mdDoc '' Access Control Lists: see Mutually exclusive with services.dokuwiki.aclFile @@ -90,7 +192,7 @@ let aclFile = mkOption { type = with types; nullOr str; - default = if (config.aclUse && config.acl == null) then "/var/lib/dokuwiki/${name}/acl.auth.php" else null; + default = if (config.mergedConfig.useacl && config.acl == null) then "/var/lib/dokuwiki/${name}/acl.auth.php" else null; description = lib.mdDoc '' Location of the dokuwiki acl rules. Mutually exclusive with services.dokuwiki.acl Mutually exclusive with services.dokuwiki.acl which is preferred. @@ -100,42 +202,22 @@ let example = "/var/lib/dokuwiki/${name}/acl.auth.php"; }; - aclUse = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Necessary for users to log in into the system. - Also limits anonymous users. When disabled, - everyone is able to create and edit content. - ''; - }; - pluginsConfig = mkOption { - type = types.lines; - default = '' - $plugins['authad'] = 0; - $plugins['authldap'] = 0; - $plugins['authmysql'] = 0; - $plugins['authpgsql'] = 0; - ''; + type = with types; oneOf [lines (attrsOf bool)]; + default = { + authad = false; + authldap = false; + authmysql = false; + authpgsql = false; + }; description = lib.mdDoc '' List of the dokuwiki (un)loaded plugins. ''; }; - superUser = mkOption { - type = types.nullOr types.str; - default = "@admin"; - description = lib.mdDoc '' - You can set either a username, a list of usernames (“admin1,admin2”), - or the name of a group by prepending an @ char to the groupname - Consult documentation for further instructions. - ''; - }; - usersFile = mkOption { type = with types; nullOr str; - default = if config.aclUse then "/var/lib/dokuwiki/${name}/users.auth.php" else null; + default = if config.mergedConfig.useacl then "/var/lib/dokuwiki/${name}/users.auth.php" else null; description = lib.mdDoc '' Location of the dokuwiki users file. List of users. Format: @@ -150,17 +232,6 @@ let example = "/var/lib/dokuwiki/${name}/users.auth.php"; }; - disableActions = mkOption { - type = types.nullOr types.str; - default = ""; - example = "search,register"; - description = lib.mdDoc '' - Disable individual action modes. Refer to - - for details on supported values. - ''; - }; - plugins = mkOption { type = types.listOf types.path; default = []; @@ -173,18 +244,14 @@ let ''; example = literalExpression '' let - # Let's package the icalevents plugin - plugin-icalevents = pkgs.stdenv.mkDerivation { + plugin-icalevents = pkgs.stdenv.mkDerivation rec { name = "icalevents"; - # Download the plugin from the dokuwiki site - src = pkgs.fetchurl { - url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip"; - sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8"; + version = "2017-06-16"; + src = pkgs.fetchzip { + stripRoot = false; + url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/''${version}/dokuwiki-plugin-icalevents-''${version}.zip"; + hash = "sha256-IPs4+qgEfe8AAWevbcCM9PnyI0uoyamtWeg4rEb+9Wc="; }; - sourceRoot = "."; - # We need unzip to build this package - buildInputs = [ pkgs.unzip ]; - # Installing simply means copying all files to the output directory installPhase = "mkdir -p $out; cp -R * $out/"; }; # And then pass this theme to the plugin list like this: @@ -204,19 +271,17 @@ let ''; example = literalExpression '' let - # Let's package the bootstrap3 theme - template-bootstrap3 = pkgs.stdenv.mkDerivation { - name = "bootstrap3"; - # Download the theme from the dokuwiki site - src = pkgs.fetchurl { - url = "https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip"; - sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6"; - }; - # We need unzip to build this package - buildInputs = [ pkgs.unzip ]; - # Installing simply means copying all files to the output directory - installPhase = "mkdir -p $out; cp -R * $out/"; + template-bootstrap3 = pkgs.stdenv.mkDerivation rec { + name = "bootstrap3"; + version = "2022-07-27"; + src = pkgs.fetchFromGitHub { + owner = "giterlizzi"; + repo = "dokuwiki-template-bootstrap3"; + rev = "v''${version}"; + hash = "sha256-B3Yd4lxdwqfCnfmZdp+i/Mzwn/aEuZ0ovagDxuR6lxo="; }; + installPhase = "mkdir -p $out; cp -R * $out/"; + }; # And then pass this theme to the template list like this: in [ template-bootstrap3 ] ''; @@ -238,7 +303,77 @@ let ''; }; + phpPackage = mkOption { + type = types.package; + relatedPackages = [ "php80" "php81" ]; + default = pkgs.php81; + defaultText = "pkgs.php81"; + description = lib.mdDoc '' + PHP package to use for this dokuwiki site. + ''; + }; + + phpOptions = mkOption { + type = types.attrsOf types.str; + default = {}; + description = lib.mdDoc '' + Options for PHP's php.ini file for this dokuwiki site. + ''; + example = literalExpression '' + { + "opcache.interned_strings_buffer" = "8"; + "opcache.max_accelerated_files" = "10000"; + "opcache.memory_consumption" = "128"; + "opcache.revalidate_freq" = "15"; + "opcache.fast_shutdown" = "1"; + } + ''; + }; + + settings = mkOption { + type = types.attrsOf types.anything; + default = { + useacl = true; + superuser = "admin"; + }; + description = lib.mdDoc '' + Structural DokuWiki configuration. + Refer to + for details and supported values. + Settings can either be directly set from nix, + loaded from a file using `._file` or obtained from any + PHP function calls using `._raw`. + ''; + example = literalExpression '' + { + title = "My Wiki"; + userewrite = 1; + disableactions = [ "register" ]; # Will be concatenated with commas + plugin.smtp = { + smtp_pass._file = "/var/run/secrets/dokuwiki/smtp_pass"; + smtp_user._raw = "getenv('DOKUWIKI_SMTP_USER')"; + }; + } + ''; + }; + + mergedConfig = mkOption { + readOnly = true; + default = mergeConfig config; + defaultText = literalExpression '' + { + useacl = true; + } + ''; + description = lib.mdDoc '' + Read only representation of the final configuration. + ''; + }; + extraConfig = mkOption { + # This Option is deprecated and only kept until sometime before 23.05 for compatibility reasons + # FIXME (@e1mo): Actually remember removing this before 23.05. + visible = false; type = types.nullOr types.lines; default = null; example = '' @@ -249,15 +384,26 @@ let DokuWiki configuration. Refer to for details on supported values. + + **Note**: Please pass Structured settings via + `services.dokuwiki.sites.${name}.settings` instead. ''; }; + # Required for the mkRenamedOptionModule + # TODO: Remove me once https://github.com/NixOS/nixpkgs/issues/96006 is fixed + # or the aclUse, ... options are removed. + warnings = mkOption { + type = types.listOf types.unspecified; + default = [ ]; + visible = false; + internal = true; }; }; + }; in { - # interface options = { services.dokuwiki = { @@ -276,8 +422,8 @@ in Further nginx configuration can be done by adapting `services.nginx.virtualHosts.`. See [](#opt-services.nginx.virtualHosts) for further information. - Further apache2 configuration can be done by adapting `services.httpd.virtualHosts.`. - See [](#opt-services.httpd.virtualHosts) for further information. + Further caddy configuration can be done by adapting `services.caddy.virtualHosts.`. + See [](#opt-services.caddy.virtualHosts) for further information. ''; }; @@ -287,14 +433,16 @@ in # implementation config = mkIf (eachSite != {}) (mkMerge [{ + warnings = flatten (mapAttrsToList (_: cfg: cfg.warnings) eachSite); + assertions = flatten (mapAttrsToList (hostName: cfg: [{ - assertion = cfg.aclUse -> (cfg.acl != null || cfg.aclFile != null); - message = "Either services.dokuwiki.sites.${hostName}.acl or services.dokuwiki.sites.${hostName}.aclFile is mandatory if aclUse true"; + assertion = cfg.mergedConfig.useacl -> (cfg.acl != null || cfg.aclFile != null); + message = "Either services.dokuwiki.sites.${hostName}.acl or services.dokuwiki.sites.${hostName}.aclFile is mandatory if settings.useacl is true"; } { - assertion = cfg.usersFile != null -> cfg.aclUse != false; - message = "services.dokuwiki.sites.${hostName}.aclUse must must be true if usersFile is not null"; + assertion = cfg.usersFile != null -> cfg.mergedConfig.useacl != false; + message = "services.dokuwiki.sites.${hostName}.settings.useacl must must be true if usersFile is not null"; } ]) eachSite); @@ -303,13 +451,10 @@ in inherit user; group = webserver.group; - phpPackage = pkgs.php81; - phpEnv = { - DOKUWIKI_LOCAL_CONFIG = "${dokuwikiLocalConfig hostName cfg}"; - DOKUWIKI_PLUGINS_LOCAL_CONFIG = "${dokuwikiPluginsLocalConfig hostName cfg}"; - } // optionalAttrs (cfg.usersFile != null) { + phpPackage = mkPhpPackage cfg; + phpEnv = optionalAttrs (cfg.usersFile != null) { DOKUWIKI_USERS_AUTH_CONFIG = "${cfg.usersFile}"; - } //optionalAttrs (cfg.aclUse) { + } // optionalAttrs (cfg.mergedConfig.useacl) { DOKUWIKI_ACL_AUTH_CONFIG = if (cfg.acl != null) then "${dokuwikiAclAuthConfig hostName cfg}" else "${toString cfg.aclFile}"; }; @@ -444,5 +589,6 @@ in _1000101 onny dandellion + e1mo ]; } diff --git a/nixos/modules/services/web-apps/dolibarr.nix b/nixos/modules/services/web-apps/dolibarr.nix index 5335c439329c..f262099354d2 100644 --- a/nixos/modules/services/web-apps/dolibarr.nix +++ b/nixos/modules/services/web-apps/dolibarr.nix @@ -1,11 +1,11 @@ { config, pkgs, lib, ... }: let - inherit (lib) any boolToString concatStringsSep isBool isString literalExpression mapAttrsToList mkDefault mkEnableOption mkIf mkOption optionalAttrs types; + inherit (lib) any boolToString concatStringsSep isBool isString mapAttrsToList mkDefault mkEnableOption mkIf mkMerge mkOption optionalAttrs types; package = pkgs.dolibarr.override { inherit (cfg) stateDir; }; cfg = config.services.dolibarr; - vhostCfg = config.services.nginx.virtualHosts."${cfg.domain}"; + vhostCfg = lib.optionalAttr (cfg.nginx != null) config.services.nginx.virtualHosts."${cfg.domain}"; mkConfigFile = filename: settings: let @@ -38,7 +38,7 @@ let force_install_database = cfg.database.name; force_install_databaselogin = cfg.database.user; - force_install_mainforcehttps = vhostCfg.forceSSL; + force_install_mainforcehttps = vhostCfg.forceSSL or false; force_install_createuser = false; force_install_dolibarrlogin = null; } // optionalAttrs (cfg.database.passwordFile != null) { @@ -183,7 +183,8 @@ in }; # implementation - config = mkIf cfg.enable { + config = mkIf cfg.enable (mkMerge [ + { assertions = [ { assertion = cfg.database.createLocally -> cfg.database.user == cfg.user; @@ -214,7 +215,7 @@ in # Security settings dolibarr_main_prod = true; - dolibarr_main_force_https = vhostCfg.forceSSL; + dolibarr_main_force_https = vhostCfg.forceSSL or false; dolibarr_main_restrict_os_commands = "${pkgs.mariadb}/bin/mysqldump, ${pkgs.mariadb}/bin/mysql"; dolibarr_nocsrfcheck = false; dolibarr_main_instance_unique_id = '' @@ -314,7 +315,9 @@ in users.groups = optionalAttrs (cfg.group == "dolibarr") { dolibarr = { }; }; - - users.users."${config.services.nginx.group}".extraGroups = [ cfg.group ]; - }; + } + (mkIf (cfg.nginx != null) { + users.users."${config.services.nginx.group}".extraGroups = mkIf (cfg.nginx != null) [ cfg.group ]; + }) +]); } diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index c05e7b2c4f7f..89e29f7ccb51 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -60,7 +60,7 @@ in }; port = mkOption { - type = with types; nullOr port; + type = types.nullOr types.port; default = null; description = mdDoc "Database port for FreshRSS."; example = 3306; @@ -73,7 +73,7 @@ in }; passFile = mkOption { - type = types.nullOr types.str; + type = types.nullOr types.path; default = null; description = mdDoc "Database password file for FreshRSS."; example = "/run/secrets/freshrss"; @@ -116,12 +116,18 @@ in with default values. ''; }; - }; + user = mkOption { + type = types.str; + default = "freshrss"; + description = lib.mdDoc "User under which Freshrss runs."; + }; + }; config = let - systemd-hardening = { + defaultServiceConfig = { + ReadWritePaths = "${cfg.dataDir}"; CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; DeviceAllow = ""; LockPersonality = true; @@ -146,6 +152,11 @@ in SystemCallArchitectures = "native"; SystemCallFilter = [ "@system-service" "~@resources" "~@privileged" ]; UMask = "0007"; + Type = "oneshot"; + User = cfg.user; + Group = config.users.users.${cfg.user}.group; + StateDirectory = "freshrss"; + WorkingDirectory = cfg.package; }; in mkIf cfg.enable { @@ -199,12 +210,17 @@ in }; }; - users.users.freshrss = { + users.users."${cfg.user}" = { description = "FreshRSS service user"; isSystemUser = true; - group = "freshrss"; + group = "${cfg.user}"; + home = cfg.dataDir; }; - users.groups.freshrss = { }; + users.groups."${cfg.user}" = { }; + + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -" + ]; systemd.services.freshrss-config = let @@ -228,30 +244,24 @@ in { description = "Set up the state directory for FreshRSS before use"; wantedBy = [ "multi-user.target" ]; - serviceConfig = { + serviceConfig = defaultServiceConfig //{ Type = "oneshot"; User = "freshrss"; Group = "freshrss"; StateDirectory = "freshrss"; WorkingDirectory = cfg.package; - } // systemd-hardening; + }; environment = { FRESHRSS_DATA_PATH = cfg.dataDir; }; script = '' - # create files with correct permissions - mkdir -m 755 -p ${cfg.dataDir} - # do installation or reconfigure if test -f ${cfg.dataDir}/config.php; then # reconfigure with settings ./cli/reconfigure.php ${settingsFlags} ./cli/update-user.php --user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})" else - # Copy the user data template directory - cp -r ./data ${cfg.dataDir} - # check correct folders in data folder ./cli/prepare.php # install with settings @@ -269,14 +279,9 @@ in environment = { FRESHRSS_DATA_PATH = cfg.dataDir; }; - serviceConfig = { - Type = "oneshot"; - User = "freshrss"; - Group = "freshrss"; - StateDirectory = "freshrss"; - WorkingDirectory = cfg.package; + serviceConfig = defaultServiceConfig //{ ExecStart = "${cfg.package}/app/actualize_script.php"; - } // systemd-hardening; + }; }; }; } diff --git a/nixos/modules/services/web-apps/grocy.md b/nixos/modules/services/web-apps/grocy.md new file mode 100644 index 000000000000..62aad4b103df --- /dev/null +++ b/nixos/modules/services/web-apps/grocy.md @@ -0,0 +1,66 @@ +# Grocy {#module-services-grocy} + +[Grocy](https://grocy.info/) is a web-based self-hosted groceries +& household management solution for your home. + +## Basic usage {#module-services-grocy-basic-usage} + +A very basic configuration may look like this: +``` +{ pkgs, ... }: +{ + services.grocy = { + enable = true; + hostName = "grocy.tld"; + }; +} +``` +This configures a simple vhost using [nginx](#opt-services.nginx.enable) +which listens to `grocy.tld` with fully configured ACME/LE (this can be +disabled by setting [services.grocy.nginx.enableSSL](#opt-services.grocy.nginx.enableSSL) +to `false`). After the initial setup the credentials `admin:admin` +can be used to login. + +The application's state is persisted at `/var/lib/grocy/grocy.db` in a +`sqlite3` database. The migration is applied when requesting the `/`-route +of the application. + +## Settings {#module-services-grocy-settings} + +The configuration for `grocy` is located at `/etc/grocy/config.php`. +By default, the following settings can be defined in the NixOS-configuration: +``` +{ pkgs, ... }: +{ + services.grocy.settings = { + # The default currency in the system for invoices etc. + # Please note that exchange rates aren't taken into account, this + # is just the setting for what's shown in the frontend. + currency = "EUR"; + + # The display language (and locale configuration) for grocy. + culture = "de"; + + calendar = { + # Whether or not to show the week-numbers + # in the calendar. + showWeekNumber = true; + + # Index of the first day to be shown in the calendar (0=Sunday, 1=Monday, + # 2=Tuesday and so on). + firstDayOfWeek = 2; + }; + }; +} +``` + +If you want to alter the configuration file on your own, you can do this manually with +an expression like this: +``` +{ lib, ... }: +{ + environment.etc."grocy/config.php".text = lib.mkAfter '' + // Arbitrary PHP code in grocy's configuration file + ''; +} +``` diff --git a/nixos/modules/services/web-apps/grocy.nix b/nixos/modules/services/web-apps/grocy.nix index 6efc2ccfd302..3bcda3caedac 100644 --- a/nixos/modules/services/web-apps/grocy.nix +++ b/nixos/modules/services/web-apps/grocy.nix @@ -167,6 +167,6 @@ in { meta = { maintainers = with maintainers; [ ma27 ]; - doc = ./grocy.xml; + doc = ./grocy.md; }; } diff --git a/nixos/modules/services/web-apps/grocy.xml b/nixos/modules/services/web-apps/grocy.xml deleted file mode 100644 index fdf6d00f4b12..000000000000 --- a/nixos/modules/services/web-apps/grocy.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - Grocy - - Grocy is a web-based self-hosted groceries - & household management solution for your home. - - -
- Basic usage - - A very basic configuration may look like this: -{ pkgs, ... }: -{ - services.grocy = { - enable = true; - hostName = "grocy.tld"; - }; -} - This configures a simple vhost using nginx - which listens to grocy.tld with fully configured ACME/LE (this can be - disabled by setting services.grocy.nginx.enableSSL - to false). After the initial setup the credentials admin:admin - can be used to login. - - - The application's state is persisted at /var/lib/grocy/grocy.db in a - sqlite3 database. The migration is applied when requesting the /-route - of the application. - -
- -
- Settings - - The configuration for grocy is located at /etc/grocy/config.php. - By default, the following settings can be defined in the NixOS-configuration: -{ pkgs, ... }: -{ - services.grocy.settings = { - # The default currency in the system for invoices etc. - # Please note that exchange rates aren't taken into account, this - # is just the setting for what's shown in the frontend. - currency = "EUR"; - - # The display language (and locale configuration) for grocy. - culture = "de"; - - calendar = { - # Whether or not to show the week-numbers - # in the calendar. - showWeekNumber = true; - - # Index of the first day to be shown in the calendar (0=Sunday, 1=Monday, - # 2=Tuesday and so on). - firstDayOfWeek = 2; - }; - }; -} - - - If you want to alter the configuration file on your own, you can do this manually with - an expression like this: -{ lib, ... }: -{ - environment.etc."grocy/config.php".text = lib.mkAfter '' - // Arbitrary PHP code in grocy's configuration file - ''; -} - -
- -
diff --git a/nixos/modules/services/web-apps/healthchecks.nix b/nixos/modules/services/web-apps/healthchecks.nix index 7da6dce1f954..b3fdb681e2f3 100644 --- a/nixos/modules/services/web-apps/healthchecks.nix +++ b/nixos/modules/services/web-apps/healthchecks.nix @@ -98,7 +98,7 @@ in description = lib.mdDoc '' Environment variables which are read by healthchecks `(local)_settings.py`. - Settings which are explictly covered in options bewlow, are type-checked and/or transformed + Settings which are explicitly covered in options bewlow, are type-checked and/or transformed before added to the environment, everything else is passed as a string. See diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index e26dee68615e..a7823354ce88 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -76,7 +76,7 @@ in ''; }; port = mkOption { - type = types.int; + type = types.port; default = 3000; example = 80; description = lib.mdDoc '' @@ -291,7 +291,8 @@ in }; defaultNotePath = mkOption { type = types.nullOr types.str; - default = "./public/default.md"; + default = "${cfg.package}/public/default.md"; + defaultText = literalExpression "\"\${cfg.package}/public/default.md\""; description = lib.mdDoc '' Path to the default Note file. (Non-canonical paths are relative to HedgeDoc's base directory) @@ -299,7 +300,8 @@ in }; docsPath = mkOption { type = types.nullOr types.str; - default = "./public/docs"; + default = "${cfg.package}/public/docs"; + defaultText = literalExpression "\"\${cfg.package}/public/docs\""; description = lib.mdDoc '' Path to the docs directory. (Non-canonical paths are relative to HedgeDoc's base directory) @@ -307,7 +309,8 @@ in }; indexPath = mkOption { type = types.nullOr types.str; - default = "./public/views/index.ejs"; + default = "${cfg.package}/public/views/index.ejs"; + defaultText = literalExpression "\"\${cfg.package}/public/views/index.ejs\""; description = lib.mdDoc '' Path to the index template file. (Non-canonical paths are relative to HedgeDoc's base directory) @@ -315,7 +318,8 @@ in }; hackmdPath = mkOption { type = types.nullOr types.str; - default = "./public/views/hackmd.ejs"; + default = "${cfg.package}/public/views/hackmd.ejs"; + defaultText = literalExpression "\"\${cfg.package}/public/views/hackmd.ejs\""; description = lib.mdDoc '' Path to the hackmd template file. (Non-canonical paths are relative to HedgeDoc's base directory) @@ -323,8 +327,8 @@ in }; errorPath = mkOption { type = types.nullOr types.str; - default = null; - defaultText = literalExpression "./public/views/error.ejs"; + default = "${cfg.package}/public/views/error.ejs"; + defaultText = literalExpression "\"\${cfg.package}/public/views/error.ejs\""; description = lib.mdDoc '' Path to the error template file. (Non-canonical paths are relative to HedgeDoc's base directory) @@ -332,8 +336,8 @@ in }; prettyPath = mkOption { type = types.nullOr types.str; - default = null; - defaultText = literalExpression "./public/views/pretty.ejs"; + default = "${cfg.package}/public/views/pretty.ejs"; + defaultText = literalExpression "\"\${cfg.package}/public/views/pretty.ejs\""; description = lib.mdDoc '' Path to the pretty template file. (Non-canonical paths are relative to HedgeDoc's base directory) @@ -341,8 +345,8 @@ in }; slidePath = mkOption { type = types.nullOr types.str; - default = null; - defaultText = literalExpression "./public/views/slide.hbs"; + default = "${cfg.package}/public/views/slide.hbs"; + defaultText = literalExpression "\"\${cfg.package}/public/views/slide.hbs\""; description = lib.mdDoc '' Path to the slide template file. (Non-canonical paths are relative to HedgeDoc's base directory) @@ -351,7 +355,7 @@ in uploadsPath = mkOption { type = types.str; default = "${cfg.workDir}/uploads"; - defaultText = literalExpression "/var/lib/${name}/uploads"; + defaultText = literalExpression "\"\${cfg.workDir}/uploads\""; description = lib.mdDoc '' Path under which uploaded files are saved. ''; @@ -449,7 +453,7 @@ in ''; }; port = mkOption { - type = types.int; + type = types.port; default = 9000; description = lib.mdDoc '' Minio listen port. @@ -946,16 +950,16 @@ in type = types.str; default = ""; description = lib.mdDoc '' - Attribute map for `id'. - Defaults to `NameID' of SAML response. + Attribute map for `id`. + Defaults to `NameID` of SAML response. ''; }; username = mkOption { type = types.str; default = ""; description = lib.mdDoc '' - Attribute map for `username'. - Defaults to `NameID' of SAML response. + Attribute map for `username`. + Defaults to `NameID` of SAML response. ''; }; email = mkOption { @@ -999,8 +1003,8 @@ in ``` # snippet of HedgeDoc-related config - services.hedgedoc.configuration.dbURL = "postgres://hedgedoc:\''${DB_PASSWORD}@db-host:5432/hedgedocdb"; - services.hedgedoc.configuration.minio.secretKey = "$MINIO_SECRET_KEY"; + services.hedgedoc.settings.dbURL = "postgres://hedgedoc:\''${DB_PASSWORD}@db-host:5432/hedgedocdb"; + services.hedgedoc.settings.minio.secretKey = "$MINIO_SECRET_KEY"; ``` ``` diff --git a/nixos/modules/services/web-apps/ihatemoney/default.nix b/nixos/modules/services/web-apps/ihatemoney/default.nix index b0da0acfcf8a..a61aa445f82c 100644 --- a/nixos/modules/services/web-apps/ihatemoney/default.nix +++ b/nixos/modules/services/web-apps/ihatemoney/default.nix @@ -68,7 +68,7 @@ in example = { http = ":8000"; }; - description = lib.mdDoc "Additionnal configuration of the UWSGI vassal running ihatemoney. It should notably specify on which interfaces and ports the vassal should listen."; + description = lib.mdDoc "Additional configuration of the UWSGI vassal running ihatemoney. It should notably specify on which interfaces and ports the vassal should listen."; }; defaultSender = { name = mkOption { diff --git a/nixos/modules/services/web-apps/invidious.nix b/nixos/modules/services/web-apps/invidious.nix index e106478628f5..61c52ee03dc6 100644 --- a/nixos/modules/services/web-apps/invidious.nix +++ b/nixos/modules/services/web-apps/invidious.nix @@ -151,7 +151,7 @@ in package = lib.mkOption { type = types.package; default = pkgs.invidious; - defaultText = "pkgs.invidious"; + defaultText = lib.literalExpression "pkgs.invidious"; description = lib.mdDoc "The Invidious package to use."; }; @@ -171,7 +171,7 @@ in description = lib.mdDoc '' A file including Invidious settings. - It gets merged with the setttings specified in {option}`services.invidious.settings` + It gets merged with the settings specified in {option}`services.invidious.settings` and can be used to store secrets like `hmac_key` outside of the nix store. ''; }; diff --git a/nixos/modules/services/web-apps/invoiceplane.nix b/nixos/modules/services/web-apps/invoiceplane.nix index cccf70295e89..8be1fd3055d0 100644 --- a/nixos/modules/services/web-apps/invoiceplane.nix +++ b/nixos/modules/services/web-apps/invoiceplane.nix @@ -74,7 +74,7 @@ let type = types.path; default = "/var/lib/invoiceplane/${name}"; description = lib.mdDoc '' - This directory is used for uploads of attachements and cache. + This directory is used for uploads of attachments and cache. The directory passed here is automatically created and permissions adjusted as required. ''; @@ -327,7 +327,7 @@ in )) eachSite; systemd.services = - (mapAttrs' (hostName: cfg: ( + mapAttrs' (hostName: cfg: ( nameValuePair "invoiceplane-cron-${hostName}" (mkIf cfg.cron.enable { serviceConfig = { Type = "oneshot"; @@ -335,7 +335,7 @@ in ExecStart = "${pkgs.curl}/bin/curl --header 'Host: ${hostName}' http://localhost/invoices/cron/recur/${cfg.cron.key}"; }; }) - )) eachSite); + )) eachSite; } diff --git a/nixos/modules/services/web-apps/isso.nix b/nixos/modules/services/web-apps/isso.nix index 941e1dd0f9ea..1a852ec352f2 100644 --- a/nixos/modules/services/web-apps/isso.nix +++ b/nixos/modules/services/web-apps/isso.nix @@ -63,6 +63,28 @@ in { Restart = "on-failure"; RestartSec = 1; + + # Hardening + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ "" ]; + LockPersonality = true; + PrivateDevices = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; + UMask = "0077"; }; }; }; diff --git a/nixos/modules/services/web-apps/jitsi-meet.md b/nixos/modules/services/web-apps/jitsi-meet.md new file mode 100644 index 000000000000..060ef9752650 --- /dev/null +++ b/nixos/modules/services/web-apps/jitsi-meet.md @@ -0,0 +1,45 @@ +# Jitsi Meet {#module-services-jitsi-meet} + +With Jitsi Meet on NixOS you can quickly configure a complete, +private, self-hosted video conferencing solution. + +## Basic usage {#module-services-jitsi-basic-usage} + +A minimal configuration using Let's Encrypt for TLS certificates looks like this: +``` +{ + services.jitsi-meet = { + enable = true; + hostName = "jitsi.example.com"; + }; + services.jitsi-videobridge.openFirewall = true; + networking.firewall.allowedTCPPorts = [ 80 443 ]; + security.acme.email = "me@example.com"; + security.acme.acceptTerms = true; +} +``` + +## Configuration {#module-services-jitsi-configuration} + +Here is the minimal configuration with additional configurations: +``` +{ + services.jitsi-meet = { + enable = true; + hostName = "jitsi.example.com"; + config = { + enableWelcomePage = false; + prejoinPageEnabled = true; + defaultLang = "fi"; + }; + interfaceConfig = { + SHOW_JITSI_WATERMARK = false; + SHOW_WATERMARK_FOR_GUESTS = false; + }; + }; + services.jitsi-videobridge.openFirewall = true; + networking.firewall.allowedTCPPorts = [ 80 443 ]; + security.acme.email = "me@example.com"; + security.acme.acceptTerms = true; +} +``` diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index a42e249189f6..28be3a3702eb 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -28,7 +28,7 @@ let ''); # Essential config - it's probably not good to have these as option default because - # types.attrs doesn't do merging. Let's merge explicitly, can still be overriden if + # types.attrs doesn't do merging. Let's merge explicitly, can still be overridden if # user desires. defaultCfg = { hosts = { @@ -451,6 +451,6 @@ in }; }; - meta.doc = ./jitsi-meet.xml; + meta.doc = ./jitsi-meet.md; meta.maintainers = lib.teams.jitsi.members; } diff --git a/nixos/modules/services/web-apps/jitsi-meet.xml b/nixos/modules/services/web-apps/jitsi-meet.xml deleted file mode 100644 index ff44c724adf4..000000000000 --- a/nixos/modules/services/web-apps/jitsi-meet.xml +++ /dev/null @@ -1,55 +0,0 @@ - - Jitsi Meet - - With Jitsi Meet on NixOS you can quickly configure a complete, - private, self-hosted video conferencing solution. - - -
- Basic usage - - A minimal configuration using Let's Encrypt for TLS certificates looks like this: -{ - services.jitsi-meet = { - enable = true; - hostName = "jitsi.example.com"; - }; - services.jitsi-videobridge.openFirewall = true; - networking.firewall.allowedTCPPorts = [ 80 443 ]; - security.acme.email = "me@example.com"; - security.acme.acceptTerms = true; -} - -
- -
- Configuration - - Here is the minimal configuration with additional configurations: -{ - services.jitsi-meet = { - enable = true; - hostName = "jitsi.example.com"; - config = { - enableWelcomePage = false; - prejoinPageEnabled = true; - defaultLang = "fi"; - }; - interfaceConfig = { - SHOW_JITSI_WATERMARK = false; - SHOW_WATERMARK_FOR_GUESTS = false; - }; - }; - services.jitsi-videobridge.openFirewall = true; - networking.firewall.allowedTCPPorts = [ 80 443 ]; - security.acme.email = "me@example.com"; - security.acme.acceptTerms = true; -} - -
- -
diff --git a/nixos/modules/services/web-apps/kasmweb/default.nix b/nixos/modules/services/web-apps/kasmweb/default.nix new file mode 100644 index 000000000000..0d78025ecf0f --- /dev/null +++ b/nixos/modules/services/web-apps/kasmweb/default.nix @@ -0,0 +1,275 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.kasmweb; +in +{ + options.services.kasmweb = { + enable = lib.mkEnableOption (lib.mdDoc "kasmweb"); + + networkSubnet = lib.mkOption { + default = "172.20.0.0/16"; + type = lib.types.str; + description = lib.mdDoc '' + The network subnet to use for the containers. + ''; + }; + + postgres = { + user = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + Username to use for the postgres database. + ''; + }; + password = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + password to use for the postgres database. + ''; + }; + }; + + redisPassword = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + password to use for the redis cache. + ''; + }; + + defaultAdminPassword = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + default admin password to use. + ''; + }; + + defaultUserPassword = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + default user password to use. + ''; + }; + + defaultManagerToken = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + default manager token to use. + ''; + }; + + defaultGuacToken = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + default guac token to use. + ''; + }; + + defaultRegistrationToken = lib.mkOption { + default = "kasmweb"; + type = lib.types.str; + description = lib.mdDoc '' + default registration token to use. + ''; + }; + + datastorePath = lib.mkOption { + type = lib.types.str; + default = "/var/lib/kasmweb"; + description = lib.mdDoc '' + The directory used to store all data for kasmweb. + ''; + }; + + listenAddress = lib.mkOption { + type = lib.types.str; + default = "0.0.0.0"; + description = lib.mdDoc '' + The address on which kasmweb should listen. + ''; + }; + + listenPort = lib.mkOption { + type = lib.types.int; + default = 443; + description = lib.mdDoc '' + The port on which kasmweb should listen. + ''; + }; + + sslCertificate = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = lib.mdDoc '' + The SSL certificate to be used for kasmweb. + ''; + }; + + sslCertificateKey = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = lib.mdDoc '' + The SSL certificate's key to be used for kasmweb. Make sure to specify + this as a string and not a literal path, so that it is not accidentally + included in your nixstore. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + + systemd.services = { + "init-kasmweb" = { + wantedBy = [ + "docker-kasm_db.service" + ]; + before = [ + "docker-kasm_db.service" + "docker-kasm_redis.service" + "docker-kasm_db_init.service" + "docker-kasm_api.service" + "docker-kasm_agent.service" + "docker-kasm_manager.service" + "docker-kasm_share.service" + "docker-kasm_guac.service" + "docker-kasm_proxy.service" + ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = pkgs.substituteAll { + src = ./initialize_kasmweb.sh; + isExecutable = true; + binPath = lib.makeBinPath [ pkgs.docker pkgs.openssl pkgs.gnused ]; + runtimeShell = pkgs.runtimeShell; + kasmweb = pkgs.kasmweb; + postgresUser = cfg.postgres.user; + postgresPassword = cfg.postgres.password; + inherit (cfg) + datastorePath + sslCertificate + sslCertificateKey + redisPassword + defaultUserPassword + defaultAdminPassword + defaultManagerToken + defaultRegistrationToken + defaultGuacToken; + }; + }; + }; + }; + + virtualisation = { + oci-containers.containers = { + kasm_db = { + image = "postgres:12-alpine"; + environment = { + POSTGRES_PASSWORD = cfg.postgres.password; + POSTGRES_USER = cfg.postgres.user; + POSTGRES_DB = "kasm"; + }; + volumes = [ + "${cfg.datastorePath}/conf/database/data.sql:/docker-entrypoint-initdb.d/data.sql" + "${cfg.datastorePath}/conf/database/:/tmp/" + "kasmweb_db:/var/lib/postgresql/data" + ]; + extraOptions = [ "--network=kasm_default_network" ]; + }; + kasm_db_init = { + image = "kasmweb/api:${pkgs.kasmweb.version}"; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/:/opt/kasm/current/" + "kasmweb_api_data:/tmp" + ]; + dependsOn = [ "kasm_db" ]; + entrypoint = "/bin/bash"; + cmd = [ "/opt/kasm/current/init_seeds.sh" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" ]; + }; + kasm_redis = { + image = "redis:5-alpine"; + entrypoint = "/bin/sh"; + cmd = [ + "-c" + "redis-server --requirepass ${cfg.redisPassword}" + ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" ]; + }; + kasm_api = { + image = "kasmweb/api:${pkgs.kasmweb.version}"; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/:/opt/kasm/current/" + "kasmweb_api_data:/tmp" + ]; + dependsOn = [ "kasm_db_init" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" ]; + }; + kasm_manager = { + image = "kasmweb/manager:${pkgs.kasmweb.version}"; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/:/opt/kasm/current/" + ]; + dependsOn = [ "kasm_db" "kasm_api" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only"]; + }; + kasm_agent = { + image = "kasmweb/agent:${pkgs.kasmweb.version}"; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/:/opt/kasm/current/" + "/var/run/docker.sock:/var/run/docker.sock" + "${pkgs.docker}/bin/docker:/usr/bin/docker" + "${cfg.datastorePath}/conf/nginx:/etc/nginx/conf.d" + ]; + dependsOn = [ "kasm_manager" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only" ]; + }; + kasm_share = { + image = "kasmweb/share:${pkgs.kasmweb.version}"; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/:/opt/kasm/current/" + ]; + dependsOn = [ "kasm_db" "kasm_redis" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only" ]; + }; + kasm_guac = { + image = "kasmweb/kasm-guac:${pkgs.kasmweb.version}"; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/:/opt/kasm/current/" + ]; + dependsOn = [ "kasm_db" "kasm_redis" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only" ]; + }; + kasm_proxy = { + image = "kasmweb/nginx:latest"; + ports = [ "${cfg.listenAddress}:${toString cfg.listenPort}:443" ]; + user = "root:root"; + volumes = [ + "${cfg.datastorePath}/conf/nginx:/etc/nginx/conf.d:ro" + "${cfg.datastorePath}/certs/kasm_nginx.key:/etc/ssl/private/kasm_nginx.key" + "${cfg.datastorePath}/certs/kasm_nginx.crt:/etc/ssl/certs/kasm_nginx.crt" + "${cfg.datastorePath}/www:/srv/www:ro" + "${cfg.datastorePath}/log/nginx:/var/log/external/nginx" + "${cfg.datastorePath}/log/logrotate:/var/log/external/logrotate" + ]; + dependsOn = [ "kasm_manager" "kasm_api" "kasm_agent" "kasm_share" + "kasm_guac" ]; + extraOptions = [ "--network=kasm_default_network" "--userns=host" + "--network-alias=proxy"]; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh b/nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh new file mode 100644 index 000000000000..dbf043b98693 --- /dev/null +++ b/nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh @@ -0,0 +1,114 @@ +#! @runtimeShell@ +export PATH=@binPath@:$PATH + +mkdir -p @datastorePath@/log +chmod -R a+rw @datastorePath@ + +ln -sf @kasmweb@/bin @datastorePath@ +rm -r @datastorePath@/conf +cp -r @kasmweb@/conf @datastorePath@ +mkdir -p @datastorePath@/conf/nginx/containers.d +chmod -R a+rw @datastorePath@/conf +ln -sf @kasmweb@/www @datastorePath@ + + +docker network inspect kasm_default_network >/dev/null || docker network create kasm_default_network --subnet @networkSubnet@ +if docker volume inspect kasmweb_db >/dev/null; then + source @datastorePath@/ids.env + echo 'echo "skipping database init"' > @datastorePath@/init_seeds.sh + echo 'while true; do sleep 10 ; done' >> @datastorePath@/init_seeds.sh +else + API_SERVER_ID=$(cat /proc/sys/kernel/random/uuid) + MANAGER_ID=$(cat /proc/sys/kernel/random/uuid) + SHARE_ID=$(cat /proc/sys/kernel/random/uuid) + SERVER_ID=$(cat /proc/sys/kernel/random/uuid) + echo "export API_SERVER_ID=$API_SERVER_ID" > @datastorePath@/ids.env + echo "export MANAGER_ID=$MANAGER_ID" >> @datastorePath@/ids.env + echo "export SHARE_ID=$SHARE_ID" >> @datastorePath@/ids.env + echo "export SERVER_ID=$SERVER_ID" >> @datastorePath@/ids.env + + mkdir -p @datastorePath@/certs + openssl req -x509 -nodes -days 1825 -newkey rsa:2048 -keyout @datastorePath@/certs/kasm_nginx.key -out @datastorePath@/certs/kasm_nginx.crt -subj "/C=US/ST=VA/L=None/O=None/OU=DoFu/CN=$(hostname)/emailAddress=none@none.none" 2> /dev/null + + docker volume create kasmweb_db + rm @datastorePath@/.done_initing_data + cat >@datastorePath@/init_seeds.sh <&1 | grep -v UserWarning + /usr/bin/kasm_server.so --cfg \ + /opt/kasm/current/conf/app/api.app.config.yaml \ + --populate-production \ + --seed-file \ + /opt/kasm/current/conf/database/seed_data/default_agents.yaml \ + 2>&1 | grep -v UserWarning + /usr/bin/kasm_server.so --cfg \ + /opt/kasm/current/conf/app/api.app.config.yaml \ + --populate-production \ + --seed-file \ + /opt/kasm/current/conf/database/seed_data/default_connection_proxies.yaml \ + 2>&1 | grep -v UserWarning + /usr/bin/kasm_server.so --cfg \ + /opt/kasm/current/conf/app/api.app.config.yaml \ + --populate-production \ + --seed-file \ + /opt/kasm/current/conf/database/seed_data/default_images_amd64.yaml \ + 2>&1 | grep -v UserWarning + touch /opt/kasm/current/.done_initing_data + while true; do sleep 10 ; done +else + echo "skipping database init" + while true; do sleep 10 ; done +fi +EOF +fi + +chmod +x @datastorePath@/init_seeds.sh +chmod a+w @datastorePath@/init_seeds.sh + +if [ -e @sslCertificate@ ]; then + cp @sslCertificate@ @datastorePath@/certs/kasm_nginx.crt + cp @sslCertificateKey@ @datastorePath@/certs/kasm_nginx.key +fi + +sed -i -e "s/username.*/username: @postgresUser@/g" \ + -e "s/password.*/password: @postgresPassword@/g" \ + -e "s/host.*db/host: kasm_db/g" \ + -e "s/ssl: true/ssl: false/g" \ + -e "s/redisPassword.*/redisPassword: @redisPassword@/g" \ + -e "s/server_hostname.*/server_hostname: kasm_api/g" \ + -e "s/server_id.*/server_id: $API_SERVER_ID/g" \ + -e "s/manager_id.*/manager_id: $MANAGER_ID/g" \ + -e "s/share_id.*/share_id: $SHARE_ID/g" \ + @datastorePath@/conf/app/api.app.config.yaml + +sed -i -e "s/ token:.*/ token: \"@defaultManagerToken@\"/g" \ + -e "s/hostnames: \['proxy.*/hostnames: \['kasm_proxy'\]/g" \ + -e "s/server_id.*/server_id: $SERVER_ID/g" \ + @datastorePath@/conf/app/agent.app.config.yaml + + +sed -i -e "s/password: admin.*/password: \"@defaultAdminPassword@\"/g" \ + -e "s/password: user.*/password: \"@defaultUserPassword@\"/g" \ + -e "s/default-manager-token/@defaultManagerToken@/g" \ + -e "s/default-registration-token/@defaultRegistrationToken@/g" \ + -e "s/upstream_auth_address:.*/upstream_auth_address: 'proxy'/g" \ + @datastorePath@/conf/database/seed_data/default_properties.yaml + +sed -i -e "s/GUACTOKEN/@defaultGuacToken@/g" \ + -e "s/APIHOSTNAME/proxy/g" \ + @datastorePath@/conf/app/kasmguac.app.config.yaml + +sed -i -e "s/GUACTOKEN/@defaultGuacToken@/g" \ + -e "s/APIHOSTNAME/proxy/g" \ + @datastorePath@/conf/database/seed_data/default_connection_proxies.yaml + +sed -i "s/00000000-0000-0000-0000-000000000000/$SERVER_ID/g" \ + @datastorePath@/conf/database/seed_data/default_agents.yaml + diff --git a/nixos/modules/services/web-apps/keycloak.md b/nixos/modules/services/web-apps/keycloak.md new file mode 100644 index 000000000000..aa8de40d642b --- /dev/null +++ b/nixos/modules/services/web-apps/keycloak.md @@ -0,0 +1,141 @@ +# Keycloak {#module-services-keycloak} + +[Keycloak](https://www.keycloak.org/) is an +open source identity and access management server with support for +[OpenID Connect](https://openid.net/connect/), +[OAUTH 2.0](https://oauth.net/2/) and +[SAML 2.0](https://en.wikipedia.org/wiki/SAML_2.0). + +## Administration {#module-services-keycloak-admin} + +An administrative user with the username +`admin` is automatically created in the +`master` realm. Its initial password can be +configured by setting [](#opt-services.keycloak.initialAdminPassword) +and defaults to `changeme`. The password is +not stored safely and should be changed immediately in the +admin panel. + +Refer to the [Keycloak Server Administration Guide]( + https://www.keycloak.org/docs/latest/server_admin/index.html +) for information on +how to administer your Keycloak +instance. + +## Database access {#module-services-keycloak-database} + +Keycloak can be used with either PostgreSQL, MariaDB or +MySQL. Which one is used can be +configured in [](#opt-services.keycloak.database.type). The selected +database will automatically be enabled and a database and role +created unless [](#opt-services.keycloak.database.host) is changed +from its default of `localhost` or +[](#opt-services.keycloak.database.createLocally) is set to `false`. + +External database access can also be configured by setting +[](#opt-services.keycloak.database.host), +[](#opt-services.keycloak.database.name), +[](#opt-services.keycloak.database.username), +[](#opt-services.keycloak.database.useSSL) and +[](#opt-services.keycloak.database.caCert) as +appropriate. Note that you need to manually create the database +and allow the configured database user full access to it. + +[](#opt-services.keycloak.database.passwordFile) +must be set to the path to a file containing the password used +to log in to the database. If [](#opt-services.keycloak.database.host) +and [](#opt-services.keycloak.database.createLocally) +are kept at their defaults, the database role +`keycloak` with that password is provisioned +on the local database instance. + +::: {.warning} +The path should be provided as a string, not a Nix path, since Nix +paths are copied into the world readable Nix store. +::: + +## Hostname {#module-services-keycloak-hostname} + +The hostname is used to build the public URL used as base for +all frontend requests and must be configured through +[](#opt-services.keycloak.settings.hostname). + +::: {.note} +If you're migrating an old Wildfly based Keycloak instance +and want to keep compatibility with your current clients, +you'll likely want to set [](#opt-services.keycloak.settings.http-relative-path) +to `/auth`. See the option description +for more details. +::: + +[](#opt-services.keycloak.settings.hostname-strict-backchannel) +determines whether Keycloak should force all requests to go +through the frontend URL. By default, +Keycloak allows backend requests to +instead use its local hostname or IP address and may also +advertise it to clients through its OpenID Connect Discovery +endpoint. + +For more information on hostname configuration, see the [Hostname +section of the Keycloak Server Installation and Configuration +Guide](https://www.keycloak.org/server/hostname). + +## Setting up TLS/SSL {#module-services-keycloak-tls} + +By default, Keycloak won't accept +unsecured HTTP connections originating from outside its local +network. + +HTTPS support requires a TLS/SSL certificate and a private key, +both [PEM formatted](https://en.wikipedia.org/wiki/Privacy-Enhanced_Mail). +Their paths should be set through +[](#opt-services.keycloak.sslCertificate) and +[](#opt-services.keycloak.sslCertificateKey). + +::: {.warning} + The paths should be provided as a strings, not a Nix paths, +since Nix paths are copied into the world readable Nix store. +::: + +## Themes {#module-services-keycloak-themes} + +You can package custom themes and make them visible to +Keycloak through [](#opt-services.keycloak.themes). See the +[Themes section of the Keycloak Server Development Guide]( + https://www.keycloak.org/docs/latest/server_development/#_themes +) and the description of the aforementioned NixOS option for +more information. + +## Configuration file settings {#module-services-keycloak-settings} + +Keycloak server configuration parameters can be set in +[](#opt-services.keycloak.settings). These correspond +directly to options in +{file}`conf/keycloak.conf`. Some of the most +important parameters are documented as suboptions, the rest can +be found in the [All +configuration section of the Keycloak Server Installation and +Configuration Guide](https://www.keycloak.org/server/all-config). + +Options containing secret data should be set to an attribute +set containing the attribute `_secret` - a +string pointing to a file containing the value the option +should be set to. See the description of +[](#opt-services.keycloak.settings) for an example. + +## Example configuration {#module-services-keycloak-example-config} + +A basic configuration with some custom settings could look like this: +``` +services.keycloak = { + enable = true; + settings = { + hostname = "keycloak.example.com"; + hostname-strict-backchannel = true; + }; + initialAdminPassword = "e6Wcm0RrtegMEHl"; # change on first login + sslCertificate = "/run/keys/ssl_cert"; + sslCertificateKey = "/run/keys/ssl_key"; + database.passwordFile = "/run/keys/db_password"; +}; +``` diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index d52190a28648..a7e4fab8ea28 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -674,6 +674,6 @@ in mkIf createLocalMySQL (mkDefault dbPkg); }; - meta.doc = ./keycloak.xml; + meta.doc = ./keycloak.md; meta.maintainers = [ maintainers.talyz ]; } diff --git a/nixos/modules/services/web-apps/keycloak.xml b/nixos/modules/services/web-apps/keycloak.xml deleted file mode 100644 index 861756e33ac0..000000000000 --- a/nixos/modules/services/web-apps/keycloak.xml +++ /dev/null @@ -1,202 +0,0 @@ - - Keycloak - - Keycloak is an - open source identity and access management server with support for - OpenID - Connect, OAUTH - 2.0 and SAML - 2.0. - -
- Administration - - An administrative user with the username - admin is automatically created in the - master realm. Its initial password can be - configured by setting - and defaults to changeme. The password is - not stored safely and should be changed immediately in the - admin panel. - - - - Refer to the - Keycloak Server Administration Guide for information on - how to administer your Keycloak - instance. - -
- -
- Database access - - Keycloak can be used with either - PostgreSQL, - MariaDB or - MySQL. Which one is used can be - configured in . The selected - database will automatically be enabled and a database and role - created unless is changed - from its default of localhost or is - set to false. - - - - External database access can also be configured by setting - , , , and as - appropriate. Note that you need to manually create the database - and allow the configured database user full access to it. - - - - - must be set to the path to a file containing the password used - to log in to the database. If - and - are kept at their defaults, the database role - keycloak with that password is provisioned - on the local database instance. - - - - - The path should be provided as a string, not a Nix path, since Nix - paths are copied into the world readable Nix store. - - -
- -
- Hostname - - The hostname is used to build the public URL used as base for - all frontend requests and must be configured through . - - - - - If you're migrating an old Wildfly based Keycloak instance - and want to keep compatibility with your current clients, - you'll likely want to set to /auth. See the option description - for more details. - - - - - - determines whether Keycloak should force all requests to go - through the frontend URL. By default, - Keycloak allows backend requests to - instead use its local hostname or IP address and may also - advertise it to clients through its OpenID Connect Discovery - endpoint. - - - - For more information on hostname configuration, see the Hostname - section of the Keycloak Server Installation and Configuration - Guide. - -
- -
- Setting up TLS/SSL - - By default, Keycloak won't accept - unsecured HTTP connections originating from outside its local - network. - - - - HTTPS support requires a TLS/SSL certificate and a private key, - both PEM - formatted. Their paths should be set through and . - - - - - The paths should be provided as a strings, not a Nix paths, - since Nix paths are copied into the world readable Nix store. - - -
- -
- Themes - - You can package custom themes and make them visible to - Keycloak through . See the - Themes section of the Keycloak Server Development Guide - and the description of the aforementioned NixOS option for - more information. - -
- -
- Configuration file settings - - Keycloak server configuration parameters can be set in . These correspond - directly to options in - conf/keycloak.conf. Some of the most - important parameters are documented as suboptions, the rest can - be found in the All - configuration section of the Keycloak Server Installation and - Configuration Guide. - - - - Options containing secret data should be set to an attribute - set containing the attribute _secret - a - string pointing to a file containing the value the option - should be set to. See the description of for an example. - -
- - -
- Example configuration - - A basic configuration with some custom settings could look like this: - -services.keycloak = { - enable = true; - settings = { - hostname = "keycloak.example.com"; - hostname-strict-backchannel = true; - }; - initialAdminPassword = "e6Wcm0RrtegMEHl"; # change on first login - sslCertificate = "/run/keys/ssl_cert"; - sslCertificateKey = "/run/keys/ssl_key"; - database.passwordFile = "/run/keys/db_password"; -}; - - - -
-
diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix index 267584dd0ca7..af0fb38121a3 100644 --- a/nixos/modules/services/web-apps/lemmy.nix +++ b/nixos/modules/services/web-apps/lemmy.nix @@ -6,9 +6,7 @@ let in { meta.maintainers = with maintainers; [ happysalada ]; - # Don't edit the docbook xml directly, edit the md and generate it: - # `pandoc lemmy.md -t docbook --top-level-division=chapter --extract-media=media -f markdown+smart > lemmy.xml` - meta.doc = ./lemmy.xml; + meta.doc = ./lemmy.md; imports = [ (mkRemovedOptionModule [ "services" "lemmy" "jwtSecretPath" ] "As of v0.13.0, Lemmy auto-generates the JWT secret.") diff --git a/nixos/modules/services/web-apps/lemmy.xml b/nixos/modules/services/web-apps/lemmy.xml deleted file mode 100644 index f04316b3c515..000000000000 --- a/nixos/modules/services/web-apps/lemmy.xml +++ /dev/null @@ -1,51 +0,0 @@ - - Lemmy - - Lemmy is a federated alternative to reddit in rust. - -
- Quickstart - - the minimum to start lemmy is - - -services.lemmy = { - enable = true; - settings = { - hostname = "lemmy.union.rocks"; - database.createLocally = true; - }; - caddy.enable = true; -} - - - this will start the backend on port 8536 and the frontend on port - 1234. It will expose your instance with a caddy reverse proxy to - the hostname you’ve provided. Postgres will be initialized on that - same instance automatically. - -
-
- Usage - - On first connection you will be asked to define an admin user. - -
-
- Missing - - - - Exposing with nginx is not implemented yet. - - - - - This has been tested using a local database with a unix socket - connection. Using different database settings will likely - require modifications - - - -
-
diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix index f6a1b5595243..7093d1de0dac 100644 --- a/nixos/modules/services/web-apps/limesurvey.nix +++ b/nixos/modules/services/web-apps/limesurvey.nix @@ -49,7 +49,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = if cfg.database.type == "pgsql" then 5442 else 3306; defaultText = literalExpression "3306"; description = lib.mdDoc "Database host port."; diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index 1e9e04dcc055..1b6e1ac583af 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -1,7 +1,9 @@ -{ config, lib, pkgs, ... }: +{ lib, pkgs, config, options, ... }: let cfg = config.services.mastodon; + opt = options.services.mastodon; + # We only want to create a database if we're actually going to connect to it. databaseActuallyCreateLocally = cfg.database.createLocally && cfg.database.host == "/run/postgresql"; @@ -23,7 +25,6 @@ let REDIS_HOST = cfg.redis.host; REDIS_PORT = toString(cfg.redis.port); DB_HOST = cfg.database.host; - DB_PORT = toString(cfg.database.port); DB_NAME = cfg.database.name; LOCAL_DOMAIN = cfg.localDomain; SMTP_SERVER = cfg.smtp.host; @@ -37,7 +38,8 @@ let TRUSTED_PROXY_IP = cfg.trustedProxy; } - // (if cfg.smtp.authenticate then { SMTP_LOGIN = cfg.smtp.user; } else {}) + // lib.optionalAttrs (cfg.database.host != "/run/postgresql" && cfg.database.port != null) { DB_PORT = toString cfg.database.port; } + // lib.optionalAttrs cfg.smtp.authenticate { SMTP_LOGIN = cfg.smtp.user; } // cfg.extraConfig; systemCallsList = [ "@cpu-emulation" "@debug" "@keyring" "@ipc" "@mount" "@obsolete" "@privileged" "@setuid" ]; @@ -92,12 +94,20 @@ let ] else [] ) env)))); - mastodonEnv = pkgs.writeShellScriptBin "mastodon-env" '' + mastodonTootctl = let + sourceExtraEnv = lib.concatMapStrings (p: "source ${p}\n") cfg.extraEnvFiles; + in pkgs.writeShellScriptBin "mastodon-tootctl" '' set -a export RAILS_ROOT="${cfg.package}" source "${envFile}" source /var/lib/mastodon/.secrets_env - eval -- "\$@" + ${sourceExtraEnv} + + sudo=exec + if [[ "$USER" != ${cfg.user} ]]; then + sudo='exec /run/wrappers/bin/sudo -u ${cfg.user} --preserve-env' + fi + $sudo ${cfg.package}/bin/tootctl "$@" ''; in { @@ -133,15 +143,10 @@ in { description = lib.mdDoc '' User under which mastodon runs. If it is set to "mastodon", that user will be created, otherwise it should be set to the - name of a user created elsewhere. In both cases, - `mastodon` and a package containing only - the shell script `mastodon-env` will be added to - the user's package set. To run a command from - `mastodon` such as `tootctl` - with the environment configured by this module use - `mastodon-env`, as in: - - `mastodon-env tootctl accounts create newuser --email newuser@example.com` + name of a user created elsewhere. + In both cases, the `mastodon` package will be added to the user's package set + and a tootctl wrapper to system packages that switches to the configured account + and load the right environment. ''; type = lib.types.str; default = "mastodon"; @@ -313,8 +318,13 @@ in { }; port = lib.mkOption { - type = lib.types.int; - default = 5432; + type = lib.types.nullOr lib.types.port; + default = if cfg.database.createLocally then null else 5432; + defaultText = lib.literalExpression '' + if config.${opt.database.createLocally} + then null + else 5432 + ''; description = lib.mdDoc "Database host port."; }; @@ -332,8 +342,8 @@ in { passwordFile = lib.mkOption { type = lib.types.nullOr lib.types.path; - default = "/var/lib/mastodon/secrets/db-password"; - example = "/run/keys/mastodon-db-password"; + default = null; + example = "/var/lib/mastodon/secrets/db-password"; description = lib.mdDoc '' A file containing the password corresponding to {option}`database.user`. @@ -372,17 +382,19 @@ in { }; user = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + example = "mastodon@example.com"; description = lib.mdDoc "SMTP login name."; - type = lib.types.str; }; passwordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/var/lib/mastodon/secrets/smtp-password"; description = lib.mdDoc '' Path to file containing the SMTP password. ''; - default = "/var/lib/mastodon/secrets/smtp-password"; - example = "/run/keys/mastodon-smtp-password"; - type = lib.types.str; }; }; @@ -418,6 +430,15 @@ in { ''; }; + extraEnvFiles = lib.mkOption { + type = with lib.types; listOf path; + default = []; + description = lib.mdDoc '' + Extra environment files to pass to all mastodon services. Useful for passing down environemntal secrets. + ''; + example = [ "/etc/mastodon/s3config.env" ]; + }; + automaticMigrations = lib.mkOption { type = lib.types.bool; default = true; @@ -465,10 +486,37 @@ in { assertions = [ { assertion = databaseActuallyCreateLocally -> (cfg.user == cfg.database.user); - message = ''For local automatic database provisioning (services.mastodon.database.createLocally == true) with peer authentication (services.mastodon.database.host == "/run/postgresql") to work services.mastodon.user and services.mastodon.database.user must be identical.''; + message = '' + For local automatic database provisioning (services.mastodon.database.createLocally == true) with peer + authentication (services.mastodon.database.host == "/run/postgresql") to work services.mastodon.user + and services.mastodon.database.user must be identical. + ''; + } + { + assertion = !databaseActuallyCreateLocally -> (cfg.database.host != "/run/postgresql"); + message = '' + needs to be set if + is not enabled. + ''; + } + { + assertion = cfg.smtp.authenticate -> (cfg.smtp.user != null); + message = '' + needs to be set if + is enabled. + ''; + } + { + assertion = cfg.smtp.authenticate -> (cfg.smtp.passwordFile != null); + message = '' + needs to be set if + is enabled. + ''; } ]; + environment.systemPackages = [ mastodonTootctl ]; + systemd.services.mastodon-init-dirs = { script = '' umask 077 @@ -493,10 +541,11 @@ in { OTP_SECRET="$(cat ${cfg.otpSecretFile})" VAPID_PRIVATE_KEY="$(cat ${cfg.vapidPrivateKeyFile})" VAPID_PUBLIC_KEY="$(cat ${cfg.vapidPublicKeyFile})" + '' + lib.optionalString (cfg.database.passwordFile != null) '' DB_PASS="$(cat ${cfg.database.passwordFile})" - '' + (if cfg.smtp.authenticate then '' + '' + lib.optionalString cfg.smtp.authenticate '' SMTP_PASSWORD="$(cat ${cfg.smtp.passwordFile})" - '' else "") + '' + '' + '' EOF ''; environment = env; @@ -511,7 +560,16 @@ in { }; systemd.services.mastodon-init-db = lib.mkIf cfg.automaticMigrations { - script = '' + script = lib.optionalString (!databaseActuallyCreateLocally) '' + umask 077 + + export PGPASSFILE + PGPASSFILE=$(mktemp) + cat > $PGPASSFILE < - Matomo - - Matomo is a real-time web analytics application. This module configures - php-fpm as backend for Matomo, optionally configuring an nginx vhost as well. - - - An automatic setup is not suported by Matomo, so you need to configure Matomo - itself in the browser-based Matomo setup. - -
- Database Setup - - - You also need to configure a MariaDB or MySQL database and -user for Matomo - yourself, and enter those credentials in your browser. You can use - passwordless database authentication via the UNIX_SOCKET authentication - plugin with the following SQL commands: - -# For MariaDB -INSTALL PLUGIN unix_socket SONAME 'auth_socket'; -CREATE DATABASE matomo; -CREATE USER 'matomo'@'localhost' IDENTIFIED WITH unix_socket; -GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; - -# For MySQL -INSTALL PLUGIN auth_socket SONAME 'auth_socket.so'; -CREATE DATABASE matomo; -CREATE USER 'matomo'@'localhost' IDENTIFIED WITH auth_socket; -GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; - - Then fill in matomo as database user and database name, - and leave the password field blank. This authentication works by allowing - only the matomo unix user to authenticate as the - matomo database user (without needing a password), but no - other users. For more information on passwordless login, see - . - - - - Of course, you can use password based authentication as well, e.g. when the - database is not on the same host. - -
-
- Archive Processing - - - This module comes with the systemd service - matomo-archive-processing.service and a timer that - automatically triggers archive processing every hour. This means that you - can safely - - disable browser triggers for Matomo archiving at - Administration > System > General Settings. - - - - With automatic archive processing, you can now also enable to - - delete old visitor logs at Administration > System > - Privacy, but make sure that you run systemctl start - matomo-archive-processing.service at least once without errors if - you have already collected data before, so that the reports get archived - before the source data gets deleted. - -
-
- Backup - - - You only need to take backups of your MySQL database and the - /var/lib/matomo/config/config.ini.php file. Use a user - in the matomo group or root to access the file. For more - information, see - . - -
-
- Issues - - - - - Matomo will warn you that the JavaScript tracker is not writable. This is - because it's located in the read-only nix store. You can safely ignore - this, unless you need a plugin that needs JavaScript tracker access. - - - -
-
- Using other Web Servers than nginx - - - You can use other web servers by forwarding calls for - index.php and piwik.php to the - services.phpfpm.pools.<name>.socket fastcgi unix socket. You can use - the nginx configuration in the module code as a reference to what else - should be configured. - -
- diff --git a/nixos/modules/services/web-apps/matomo.md b/nixos/modules/services/web-apps/matomo.md new file mode 100644 index 000000000000..f5536a35f7a8 --- /dev/null +++ b/nixos/modules/services/web-apps/matomo.md @@ -0,0 +1,77 @@ +# Matomo {#module-services-matomo} + +Matomo is a real-time web analytics application. This module configures +php-fpm as backend for Matomo, optionally configuring an nginx vhost as well. + +An automatic setup is not suported by Matomo, so you need to configure Matomo +itself in the browser-based Matomo setup. + +## Database Setup {#module-services-matomo-database-setup} + +You also need to configure a MariaDB or MySQL database and -user for Matomo +yourself, and enter those credentials in your browser. You can use +passwordless database authentication via the UNIX_SOCKET authentication +plugin with the following SQL commands: +``` +# For MariaDB +INSTALL PLUGIN unix_socket SONAME 'auth_socket'; +CREATE DATABASE matomo; +CREATE USER 'matomo'@'localhost' IDENTIFIED WITH unix_socket; +GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; + +# For MySQL +INSTALL PLUGIN auth_socket SONAME 'auth_socket.so'; +CREATE DATABASE matomo; +CREATE USER 'matomo'@'localhost' IDENTIFIED WITH auth_socket; +GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; +``` +Then fill in `matomo` as database user and database name, +and leave the password field blank. This authentication works by allowing +only the `matomo` unix user to authenticate as the +`matomo` database user (without needing a password), but no +other users. For more information on passwordless login, see +. + +Of course, you can use password based authentication as well, e.g. when the +database is not on the same host. + +## Archive Processing {#module-services-matomo-archive-processing} + +This module comes with the systemd service +`matomo-archive-processing.service` and a timer that +automatically triggers archive processing every hour. This means that you +can safely +[disable browser triggers for Matomo archiving]( +https://matomo.org/docs/setup-auto-archiving/#disable-browser-triggers-for-matomo-archiving-and-limit-matomo-reports-to-updating-every-hour +) at +`Administration > System > General Settings`. + +With automatic archive processing, you can now also enable to +[delete old visitor logs](https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs) +at `Administration > System > Privacy`, but make sure that you run `systemctl start +matomo-archive-processing.service` at least once without errors if +you have already collected data before, so that the reports get archived +before the source data gets deleted. + +## Backup {#module-services-matomo-backups} + +You only need to take backups of your MySQL database and the +{file}`/var/lib/matomo/config/config.ini.php` file. Use a user +in the `matomo` group or root to access the file. For more +information, see +. + +## Issues {#module-services-matomo-issues} + + - Matomo will warn you that the JavaScript tracker is not writable. This is + because it's located in the read-only nix store. You can safely ignore + this, unless you need a plugin that needs JavaScript tracker access. + +## Using other Web Servers than nginx {#module-services-matomo-other-web-servers} + +You can use other web servers by forwarding calls for +{file}`index.php` and {file}`piwik.php` to the +[`services.phpfpm.pools..socket`](#opt-services.phpfpm.pools._name_.socket) +fastcgi unix socket. You can use +the nginx configuration in the module code as a reference to what else +should be configured. diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index 117d540ba36b..eadf8b62b977 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -174,7 +174,7 @@ in { CURRENT_PACKAGE=$(readlink ${dataDir}/current-package) NEW_PACKAGE=${cfg.package} if [ "$CURRENT_PACKAGE" != "$NEW_PACKAGE" ]; then - # keeping tmp arround between upgrades seems to bork stuff, so delete it + # keeping tmp around between upgrades seems to bork stuff, so delete it rm -rf ${dataDir}/tmp fi elif [ -e ${dataDir}/tmp ]; then @@ -325,7 +325,7 @@ in { }; meta = { - doc = ./matomo-doc.xml; + doc = ./matomo.md; maintainers = with lib.maintainers; [ florianjacob ]; }; } diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index 71292c47d63a..56a53198b3fb 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -106,7 +106,7 @@ in package = mkOption { type = types.package; default = pkgs.mattermost; - defaultText = "pkgs.mattermost"; + defaultText = lib.literalExpression "pkgs.mattermost"; description = lib.mdDoc "Mattermost derivation to use."; }; @@ -170,7 +170,7 @@ in type = types.attrs; default = { }; description = lib.mdDoc '' - Addtional configuration options as Nix attribute set in config.json schema. + Additional configuration options as Nix attribute set in config.json schema. ''; }; @@ -238,7 +238,7 @@ in package = mkOption { type = types.package; default = pkgs.matterircd; - defaultText = "pkgs.matterircd"; + defaultText = lib.literalExpression "pkgs.matterircd"; description = lib.mdDoc "matterircd derivation to use."; }; parameters = mkOption { diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index e332847f5a28..07f296748629 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -129,7 +129,7 @@ let ## Set $wgCacheDirectory to a writable directory on the web server ## to make your wiki go slightly faster. The directory should not - ## be publically accessible from the web. + ## be publicly accessible from the web. $wgCacheDirectory = "${cacheDir}"; # Site language code, should be one of the list in ./languages/data/Names.php diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 34a108cebd2b..7cc8ce10ffe0 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -21,6 +21,13 @@ in services.miniflux = { enable = mkEnableOption (lib.mdDoc "miniflux and creates a local postgres database for it"); + package = mkOption { + type = types.package; + default = pkgs.miniflux; + defaultText = literalExpression "pkgs.miniflux"; + description = lib.mdDoc "Miniflux package to use."; + }; + config = mkOption { type = types.attrsOf types.str; example = literalExpression '' @@ -89,7 +96,7 @@ in after = [ "network.target" "postgresql.service" "miniflux-dbsetup.service" ]; serviceConfig = { - ExecStart = "${pkgs.miniflux}/bin/miniflux"; + ExecStart = "${cfg.package}/bin/miniflux"; User = dbUser; DynamicUser = true; RuntimeDirectory = "miniflux"; @@ -122,6 +129,6 @@ in environment = cfg.config; }; - environment.systemPackages = [ pkgs.miniflux ]; + environment.systemPackages = [ cfg.package ]; }; } diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix index dc434d0fc803..5f8d9c5b15f4 100644 --- a/nixos/modules/services/web-apps/moodle.nix +++ b/nixos/modules/services/web-apps/moodle.nix @@ -96,7 +96,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; description = lib.mdDoc "Database host port."; default = { mysql = 3306; diff --git a/nixos/modules/services/web-apps/netbox.nix b/nixos/modules/services/web-apps/netbox.nix index f09a8dfc5b21..e028f16004ef 100644 --- a/nixos/modules/services/web-apps/netbox.nix +++ b/nixos/modules/services/web-apps/netbox.nix @@ -9,6 +9,10 @@ let name = "configuration.py"; text = '' STATIC_ROOT = '${staticDir}' + MEDIA_ROOT = '${cfg.dataDir}/media' + REPORTS_ROOT = '${cfg.dataDir}/reports' + SCRIPTS_ROOT = '${cfg.dataDir}/scripts' + ALLOWED_HOSTS = ['*'] DATABASE = { 'NAME': 'netbox', @@ -42,11 +46,10 @@ let installPhase = old.installPhase + '' ln -s ${configFile} $out/opt/netbox/netbox/netbox/configuration.py '' + optionalString cfg.enableLdap '' - ln -s ${ldapConfigPath} $out/opt/netbox/netbox/netbox/ldap_config.py + ln -s ${cfg.ldapConfigPath} $out/opt/netbox/netbox/netbox/ldap_config.py ''; })).override { - plugins = ps: ((cfg.plugins ps) - ++ optionals cfg.enableLdap [ ps.django-auth-ldap ]); + inherit (cfg) plugins; }; netboxManageScript = with pkgs; (writeScriptBin "netbox-manage" '' #!${stdenv.shell} @@ -132,13 +135,15 @@ in { type = types.path; default = ""; description = lib.mdDoc '' - Path to the Configuration-File for LDAP-Authentification, will be loaded as `ldap_config.py`. + Path to the Configuration-File for LDAP-Authentication, will be loaded as `ldap_config.py`. See the [documentation](https://netbox.readthedocs.io/en/stable/installation/6-ldap/#configuration) for possible options. ''; }; }; config = mkIf cfg.enable { + services.netbox.plugins = mkIf cfg.enableLdap (ps: [ ps.django-auth-ldap ]); + services.redis.servers.netbox.enable = true; services.postgresql = { diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md new file mode 100644 index 000000000000..014807f3da23 --- /dev/null +++ b/nixos/modules/services/web-apps/nextcloud.md @@ -0,0 +1,237 @@ +# Nextcloud {#module-services-nextcloud} + +[Nextcloud](https://nextcloud.com/) is an open-source, +self-hostable cloud platform. The server setup can be automated using +[services.nextcloud](#opt-services.nextcloud.enable). A +desktop client is packaged at `pkgs.nextcloud-client`. + +The current default by NixOS is `nextcloud25` which is also the latest +major version available. + +## Basic usage {#module-services-nextcloud-basic-usage} + +Nextcloud is a PHP-based application which requires an HTTP server +([`services.nextcloud`](#opt-services.nextcloud.enable) +optionally supports +[`services.nginx`](#opt-services.nginx.enable)) +and a database (it's recommended to use +[`services.postgresql`](#opt-services.postgresql.enable)). + +A very basic configuration may look like this: +``` +{ pkgs, ... }: +{ + services.nextcloud = { + enable = true; + hostName = "nextcloud.tld"; + config = { + dbtype = "pgsql"; + dbuser = "nextcloud"; + dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself + dbname = "nextcloud"; + adminpassFile = "/path/to/admin-pass-file"; + adminuser = "root"; + }; + }; + + services.postgresql = { + enable = true; + ensureDatabases = [ "nextcloud" ]; + ensureUsers = [ + { name = "nextcloud"; + ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + } + ]; + }; + + # ensure that postgres is running *before* running the setup + systemd.services."nextcloud-setup" = { + requires = ["postgresql.service"]; + after = ["postgresql.service"]; + }; + + networking.firewall.allowedTCPPorts = [ 80 443 ]; +} +``` + +The `hostName` option is used internally to configure an HTTP +server using [`PHP-FPM`](https://php-fpm.org/) +and `nginx`. The `config` attribute set is +used by the imperative installer and all values are written to an additional file +to ensure that changes can be applied by changing the module's options. + +In case the application serves multiple domains (those are checked with +[`$_SERVER['HTTP_HOST']`](http://php.net/manual/en/reserved.variables.server.php)) +it's needed to add them to +[`services.nextcloud.config.extraTrustedDomains`](#opt-services.nextcloud.config.extraTrustedDomains). + +Auto updates for Nextcloud apps can be enabled using +[`services.nextcloud.autoUpdateApps`](#opt-services.nextcloud.autoUpdateApps.enable). + +## Common problems {#module-services-nextcloud-pitfalls-during-upgrade} + + - **General notes.** + Unfortunately Nextcloud appears to be very stateful when it comes to + managing its own configuration. The config file lives in the home directory + of the `nextcloud` user (by default + `/var/lib/nextcloud/config/config.php`) and is also used to + track several states of the application (e.g., whether installed or not). + + All configuration parameters are also stored in + {file}`/var/lib/nextcloud/config/override.config.php` which is generated by + the module and linked from the store to ensure that all values from + {file}`config.php` can be modified by the module. + However {file}`config.php` manages the application's state and shouldn't be + touched manually because of that. + + ::: {.warning} + Don't delete {file}`config.php`! This file + tracks the application's state and a deletion can cause unwanted + side-effects! + ::: + + ::: {.warning} + Don't rerun `nextcloud-occ maintenance:install`! + This command tries to install the application + and can cause unwanted side-effects! + ::: + - **Multiple version upgrades.** + Nextcloud doesn't allow to move more than one major-version forward. E.g., if you're on + `v16`, you cannot upgrade to `v18`, you need to upgrade to + `v17` first. This is ensured automatically as long as the + [stateVersion](#opt-system.stateVersion) is declared properly. In that case + the oldest version available (one major behind the one from the previous NixOS + release) will be selected by default and the module will generate a warning that reminds + the user to upgrade to latest Nextcloud *after* that deploy. + - **`Error: Command "upgrade" is not defined.`** + This error usually occurs if the initial installation + ({command}`nextcloud-occ maintenance:install`) has failed. After that, the application + is not installed, but the upgrade is attempted to be executed. Further context can + be found in [NixOS/nixpkgs#111175](https://github.com/NixOS/nixpkgs/issues/111175). + + First of all, it makes sense to find out what went wrong by looking at the logs + of the installation via {command}`journalctl -u nextcloud-setup` and try to fix + the underlying issue. + + - If this occurs on an *existing* setup, this is most likely because + the maintenance mode is active. It can be deactivated by running + {command}`nextcloud-occ maintenance:mode --off`. It's advisable though to + check the logs first on why the maintenance mode was activated. + - ::: {.warning} + Only perform the following measures on + *freshly installed instances!* + ::: + + A re-run of the installer can be forced by *deleting* + {file}`/var/lib/nextcloud/config/config.php`. This is the only time + advisable because the fresh install doesn't have any state that can be lost. + In case that doesn't help, an entire re-creation can be forced via + {command}`rm -rf ~nextcloud/`. + + - **Server-side encryption.** + Nextcloud supports [server-side encryption (SSE)](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/encryption_configuration.html). + This is not an end-to-end encryption, but can be used to encrypt files that will be persisted + to external storage such as S3. Please note that this won't work anymore when using OpenSSL 3 + for PHP's openssl extension because this is implemented using the legacy cipher RC4. + If [](#opt-system.stateVersion) is *above* `22.05`, + this is disabled by default. To turn it on again and for further information please refer to + [](#opt-services.nextcloud.enableBrokenCiphersForSSE). + +## Using an alternative webserver as reverse-proxy (e.g. `httpd`) {#module-services-nextcloud-httpd} + +By default, `nginx` is used as reverse-proxy for `nextcloud`. +However, it's possible to use e.g. `httpd` by explicitly disabling +`nginx` using [](#opt-services.nginx.enable) and fixing the +settings `listen.owner` & `listen.group` in the +[corresponding `phpfpm` pool](#opt-services.phpfpm.pools). + +An exemplary configuration may look like this: +``` +{ config, lib, pkgs, ... }: { + services.nginx.enable = false; + services.nextcloud = { + enable = true; + hostName = "localhost"; + + /* further, required options */ + }; + services.phpfpm.pools.nextcloud.settings = { + "listen.owner" = config.services.httpd.user; + "listen.group" = config.services.httpd.group; + }; + services.httpd = { + enable = true; + adminAddr = "webmaster@localhost"; + extraModules = [ "proxy_fcgi" ]; + virtualHosts."localhost" = { + documentRoot = config.services.nextcloud.package; + extraConfig = '' + + + + SetHandler "proxy:unix:${config.services.phpfpm.pools.nextcloud.socket}|fcgi://localhost/" + + + + RewriteEngine On + RewriteBase / + RewriteRule ^index\.php$ - [L] + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule . /index.php [L] + + DirectoryIndex index.php + Require all granted + Options +FollowSymLinks + + ''; + }; + }; +} +``` + +## Installing Apps and PHP extensions {#installing-apps-php-extensions-nextcloud} + +Nextcloud apps are installed statefully through the web interface. +Some apps may require extra PHP extensions to be installed. +This can be configured with the [](#opt-services.nextcloud.phpExtraExtensions) setting. + +Alternatively, extra apps can also be declared with the [](#opt-services.nextcloud.extraApps) setting. +When using this setting, apps can no longer be managed statefully because this can lead to Nextcloud updating apps +that are managed by Nix. If you want automatic updates it is recommended that you use web interface to install apps. + +## Maintainer information {#module-services-nextcloud-maintainer-info} + +As stated in the previous paragraph, we must provide a clean upgrade-path for Nextcloud +since it cannot move more than one major version forward on a single upgrade. This chapter +adds some notes how Nextcloud updates should be rolled out in the future. + +While minor and patch-level updates are no problem and can be done directly in the +package-expression (and should be backported to supported stable branches after that), +major-releases should be added in a new attribute (e.g. Nextcloud `v19.0.0` +should be available in `nixpkgs` as `pkgs.nextcloud19`). +To provide simple upgrade paths it's generally useful to backport those as well to stable +branches. As long as the package-default isn't altered, this won't break existing setups. +After that, the versioning-warning in the `nextcloud`-module should be +updated to make sure that the +[package](#opt-services.nextcloud.package)-option selects the latest version +on fresh setups. + +If major-releases will be abandoned by upstream, we should check first if those are needed +in NixOS for a safe upgrade-path before removing those. In that case we should keep those +packages, but mark them as insecure in an expression like this (in +``): +``` +/* ... */ +{ + nextcloud17 = generic { + version = "17.0.x"; + sha256 = "0000000000000000000000000000000000000000000000000000"; + eol = true; + }; +} +``` + +Ideally we should make sure that it's possible to jump two NixOS versions forward: +i.e. the warnings and the logic in the module should guard a user to upgrade from a +Nextcloud on e.g. 19.09 to a Nextcloud on 20.09. diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index da621573f2a2..50c2d68c77e4 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -16,7 +16,7 @@ let # disable default openssl extension (lib.filter (e: e.pname != "php-openssl") enabled) # use OpenSSL 1.1 for RC4 Nextcloud encryption if user - # has acknowledged the brokeness of the ciphers (RC4). + # has acknowledged the brokenness of the ciphers (RC4). # TODO: remove when https://github.com/nextcloud/server/issues/32003 is fixed. ++ (if cfg.enableBrokenCiphersForSSE then [ cfg.phpPackage.extensions.openssl-legacy ] else [ cfg.phpPackage.extensions.openssl ]) ++ optional cfg.enableImagemagick imagick @@ -76,7 +76,7 @@ in { * setting `listen.owner` & `listen.group` in the phpfpm-pool to a different value Further details about this can be found in the `Nextcloud`-section of the NixOS-manual - (which can be openend e.g. by running `nixos-help`). + (which can be opened e.g. by running `nixos-help`). '') (mkRemovedOptionModule [ "services" "nextcloud" "disableImagemagick" ] '' Use services.nextcloud.nginx.enableImagemagick instead. @@ -388,7 +388,7 @@ in { default = []; description = lib.mdDoc '' Trusted domains, from which the nextcloud installation will be - acessible. You don't need to add + accessible. You don't need to add `services.nextcloud.hostname` here. ''; }; @@ -698,7 +698,7 @@ in { services.nextcloud.enableBrokenCiphersForSSE = false; - If you need to use server-side encryption you can ignore this waring. + If you need to use server-side encryption you can ignore this warning. Otherwise you'd have to disable server-side encryption first in order to be able to safely disable this option and get rid of this warning. See on how to achieve this. @@ -758,7 +758,7 @@ in { nextcloud-setup = let c = cfg.config; - writePhpArrary = a: "[${concatMapStringsSep "," (val: ''"${toString val}"'') a}]"; + writePhpArray = a: "[${concatMapStringsSep "," (val: ''"${toString val}"'') a}]"; requiresReadSecretFunction = c.dbpassFile != null || c.objectstore.s3.enable; objectstoreConfig = let s3 = c.objectstore.s3; in optionalString s3.enable '' 'objectstore' => [ @@ -838,8 +838,8 @@ in { '' } 'dbtype' => '${c.dbtype}', - 'trusted_domains' => ${writePhpArrary ([ cfg.hostName ] ++ c.extraTrustedDomains)}, - 'trusted_proxies' => ${writePhpArrary (c.trustedProxies)}, + 'trusted_domains' => ${writePhpArray ([ cfg.hostName ] ++ c.extraTrustedDomains)}, + 'trusted_proxies' => ${writePhpArray (c.trustedProxies)}, ${optionalString (c.defaultPhoneRegion != null) "'default_phone_region' => '${c.defaultPhoneRegion}',"} ${optionalString (nextcloudGreaterOrEqualThan "23") "'profile.enabled' => ${boolToString cfg.globalProfiles},"} ${objectstoreConfig} @@ -1146,5 +1146,5 @@ in { } ]); - meta.doc = ./nextcloud.xml; + meta.doc = ./nextcloud.md; } diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml deleted file mode 100644 index ca57692fc16a..000000000000 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ /dev/null @@ -1,305 +0,0 @@ - - Nextcloud - - Nextcloud is an open-source, - self-hostable cloud platform. The server setup can be automated using - services.nextcloud. A - desktop client is packaged at pkgs.nextcloud-client. - - - The current default by NixOS is nextcloud25 which is also the latest - major version available. - -
- Basic usage - - - Nextcloud is a PHP-based application which requires an HTTP server - (services.nextcloud - optionally supports - services.nginx) - and a database (it's recommended to use - services.postgresql). - - - - A very basic configuration may look like this: -{ pkgs, ... }: -{ - services.nextcloud = { - enable = true; - hostName = "nextcloud.tld"; - config = { - dbtype = "pgsql"; - dbuser = "nextcloud"; - dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself - dbname = "nextcloud"; - adminpassFile = "/path/to/admin-pass-file"; - adminuser = "root"; - }; - }; - - services.postgresql = { - enable = true; - ensureDatabases = [ "nextcloud" ]; - ensureUsers = [ - { name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; - } - ]; - }; - - # ensure that postgres is running *before* running the setup - systemd.services."nextcloud-setup" = { - requires = ["postgresql.service"]; - after = ["postgresql.service"]; - }; - - networking.firewall.allowedTCPPorts = [ 80 443 ]; -} - - - - The hostName option is used internally to configure an HTTP - server using PHP-FPM - and nginx. The config attribute set is - used by the imperative installer and all values are written to an additional file - to ensure that changes can be applied by changing the module's options. - - - - In case the application serves multiple domains (those are checked with - $_SERVER['HTTP_HOST']) - it's needed to add them to - services.nextcloud.config.extraTrustedDomains. - - - - Auto updates for Nextcloud apps can be enabled using - services.nextcloud.autoUpdateApps. - - -
- -
- Common problems - - - - General notes - - Unfortunately Nextcloud appears to be very stateful when it comes to - managing its own configuration. The config file lives in the home directory - of the nextcloud user (by default - /var/lib/nextcloud/config/config.php) and is also used to - track several states of the application (e.g., whether installed or not). - - - - All configuration parameters are also stored in - /var/lib/nextcloud/config/override.config.php which is generated by - the module and linked from the store to ensure that all values from - config.php can be modified by the module. - However config.php manages the application's state and shouldn't be - touched manually because of that. - - - Don't delete config.php! This file - tracks the application's state and a deletion can cause unwanted - side-effects! - - - - Don't rerun nextcloud-occ - maintenance:install! This command tries to install the application - and can cause unwanted side-effects! - - - - - Multiple version upgrades - - Nextcloud doesn't allow to move more than one major-version forward. E.g., if you're on - v16, you cannot upgrade to v18, you need to upgrade to - v17 first. This is ensured automatically as long as the - stateVersion is declared properly. In that case - the oldest version available (one major behind the one from the previous NixOS - release) will be selected by default and the module will generate a warning that reminds - the user to upgrade to latest Nextcloud after that deploy. - - - - - - <literal>Error: Command "upgrade" is not defined.</literal> - - This error usually occurs if the initial installation - (nextcloud-occ maintenance:install) has failed. After that, the application - is not installed, but the upgrade is attempted to be executed. Further context can - be found in NixOS/nixpkgs#111175. - - - - First of all, it makes sense to find out what went wrong by looking at the logs - of the installation via journalctl -u nextcloud-setup and try to fix - the underlying issue. - - - - - If this occurs on an existing setup, this is most likely because - the maintenance mode is active. It can be deactivated by running - nextcloud-occ maintenance:mode --off. It's advisable though to - check the logs first on why the maintenance mode was activated. - - - - Only perform the following measures on - freshly installed instances! - - A re-run of the installer can be forced by deleting - /var/lib/nextcloud/config/config.php. This is the only time - advisable because the fresh install doesn't have any state that can be lost. - In case that doesn't help, an entire re-creation can be forced via - rm -rf ~nextcloud/. - - - - - - - Server-side encryption - - Nextcloud supports server-side encryption (SSE). - This is not an end-to-end encryption, but can be used to encrypt files that will be persisted - to external storage such as S3. Please note that this won't work anymore when using OpenSSL 3 - for PHP's openssl extension because this is implemented using the legacy cipher RC4. - If is above 22.05, - this is disabled by default. To turn it on again and for further information please refer to - . - - - - -
- -
- Using an alternative webserver as reverse-proxy (e.g. <literal>httpd</literal>) - - By default, nginx is used as reverse-proxy for nextcloud. - However, it's possible to use e.g. httpd by explicitly disabling - nginx using and fixing the - settings listen.owner & listen.group in the - corresponding phpfpm pool. - - - An exemplary configuration may look like this: -{ config, lib, pkgs, ... }: { - services.nginx.enable = false; - services.nextcloud = { - enable = true; - hostName = "localhost"; - - /* further, required options */ - }; - services.phpfpm.pools.nextcloud.settings = { - "listen.owner" = config.services.httpd.user; - "listen.group" = config.services.httpd.group; - }; - services.httpd = { - enable = true; - adminAddr = "webmaster@localhost"; - extraModules = [ "proxy_fcgi" ]; - virtualHosts."localhost" = { - documentRoot = config.services.nextcloud.package; - extraConfig = '' - <Directory "${config.services.nextcloud.package}"> - <FilesMatch "\.php$"> - <If "-f %{REQUEST_FILENAME}"> - SetHandler "proxy:unix:${config.services.phpfpm.pools.nextcloud.socket}|fcgi://localhost/" - </If> - </FilesMatch> - <IfModule mod_rewrite.c> - RewriteEngine On - RewriteBase / - RewriteRule ^index\.php$ - [L] - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteRule . /index.php [L] - </IfModule> - DirectoryIndex index.php - Require all granted - Options +FollowSymLinks - </Directory> - ''; - }; - }; -} - -
- -
- Installing Apps and PHP extensions - - - Nextcloud apps are installed statefully through the web interface. - - Some apps may require extra PHP extensions to be installed. - This can be configured with the setting. - - - - Alternatively, extra apps can also be declared with the setting. - When using this setting, apps can no longer be managed statefully because this can lead to Nextcloud updating apps - that are managed by Nix. If you want automatic updates it is recommended that you use web interface to install apps. - -
- -
- Maintainer information - - - As stated in the previous paragraph, we must provide a clean upgrade-path for Nextcloud - since it cannot move more than one major version forward on a single upgrade. This chapter - adds some notes how Nextcloud updates should be rolled out in the future. - - - - While minor and patch-level updates are no problem and can be done directly in the - package-expression (and should be backported to supported stable branches after that), - major-releases should be added in a new attribute (e.g. Nextcloud v19.0.0 - should be available in nixpkgs as pkgs.nextcloud19). - To provide simple upgrade paths it's generally useful to backport those as well to stable - branches. As long as the package-default isn't altered, this won't break existing setups. - After that, the versioning-warning in the nextcloud-module should be - updated to make sure that the - package-option selects the latest version - on fresh setups. - - - - If major-releases will be abandoned by upstream, we should check first if those are needed - in NixOS for a safe upgrade-path before removing those. In that case we shold keep those - packages, but mark them as insecure in an expression like this (in - <nixpkgs/pkgs/servers/nextcloud/default.nix>): -/* ... */ -{ - nextcloud17 = generic { - version = "17.0.x"; - sha256 = "0000000000000000000000000000000000000000000000000000"; - eol = true; - }; -} - - - - Ideally we should make sure that it's possible to jump two NixOS versions forward: - i.e. the warnings and the logic in the module should guard a user to upgrade from a - Nextcloud on e.g. 19.09 to a Nextcloud on 20.09. - -
-
diff --git a/nixos/modules/services/web-apps/onlyoffice.nix b/nixos/modules/services/web-apps/onlyoffice.nix index db4a9582794e..79ed3e43dd18 100644 --- a/nixos/modules/services/web-apps/onlyoffice.nix +++ b/nixos/modules/services/web-apps/onlyoffice.nix @@ -29,7 +29,7 @@ in package = mkOption { type = types.package; default = pkgs.onlyoffice-documentserver; - defaultText = "pkgs.onlyoffice-documentserver"; + defaultText = lib.literalExpression "pkgs.onlyoffice-documentserver"; description = lib.mdDoc "Which package to use for the OnlyOffice instance."; }; @@ -54,7 +54,7 @@ in postgresName = mkOption { type = types.str; default = "onlyoffice"; - description = lib.mdDoc "The name of databse OnlyOffice should user."; + description = lib.mdDoc "The name of database OnlyOffice should user."; }; postgresPasswordFile = mkOption { diff --git a/nixos/modules/services/web-apps/outline.nix b/nixos/modules/services/web-apps/outline.nix index 701930393f01..b72dd8243bb4 100644 --- a/nixos/modules/services/web-apps/outline.nix +++ b/nixos/modules/services/web-apps/outline.nix @@ -465,7 +465,7 @@ in options = { host = lib.mkOption { type = lib.types.str; - description = lib.mdDoc "Host name or IP adress of the SMTP server."; + description = lib.mdDoc "Host name or IP address of the SMTP server."; }; port = lib.mkOption { type = lib.types.port; diff --git a/nixos/modules/services/web-apps/peering-manager.nix b/nixos/modules/services/web-apps/peering-manager.nix new file mode 100644 index 000000000000..666b82621268 --- /dev/null +++ b/nixos/modules/services/web-apps/peering-manager.nix @@ -0,0 +1,265 @@ +{ config, lib, pkgs, buildEnv, ... }: + +with lib; + +let + cfg = config.services.peering-manager; + configFile = pkgs.writeTextFile { + name = "configuration.py"; + text = '' + ALLOWED_HOSTS = ['*'] + DATABASE = { + 'NAME': 'peering-manager', + 'USER': 'peering-manager', + 'HOST': '/run/postgresql', + } + + # Redis database settings. Redis is used for caching and for queuing background tasks such as webhook events. A separate + # configuration exists for each. Full connection details are required in both sections, and it is strongly recommended + # to use two separate database IDs. + REDIS = { + 'tasks': { + 'UNIX_SOCKET_PATH': '${config.services.redis.servers.peering-manager.unixSocket}', + 'DATABASE': 0, + }, + 'caching': { + 'UNIX_SOCKET_PATH': '${config.services.redis.servers.peering-manager.unixSocket}', + 'DATABASE': 1, + } + } + + with open("${cfg.secretKeyFile}", "r") as file: + SECRET_KEY = file.readline() + '' + lib.optionalString (cfg.peeringdbApiKeyFile != null) '' + with open("${cfg.peeringdbApiKeyFile}", "r") as file: + PEERINGDB_API_KEY = file.readline() + '' + '' + + ${cfg.extraConfig} + ''; + }; + pkg = (pkgs.peering-manager.overrideAttrs (old: { + postInstall = '' + ln -s ${configFile} $out/opt/peering-manager/peering_manager/configuration.py + '' + optionalString cfg.enableLdap '' + ln -s ${cfg.ldapConfigPath} $out/opt/peering-manager/peering_manager/ldap_config.py + ''; + })).override { + inherit (cfg) plugins; + }; + peeringManagerManageScript = with pkgs; (writeScriptBin "peering-manager-manage" '' + #!${stdenv.shell} + export PYTHONPATH=${pkg.pythonPath} + sudo -u peering-manager ${pkg}/bin/peering-manager "$@" + ''); + +in { + options.services.peering-manager = { + enable = mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc '' + Enable Peering Manager. + + This module requires a reverse proxy that serves `/static` separately. + See this [example](https://github.com/peering-manager-community/peering-manager/blob/develop/contrib/nginx.conf/) on how to configure this. + ''; + }; + + listenAddress = mkOption { + type = types.str; + default = "[::1]"; + description = lib.mdDoc '' + Address the server will listen on. + ''; + }; + + port = mkOption { + type = types.port; + default = 8001; + description = lib.mdDoc '' + Port the server will listen on. + ''; + }; + + plugins = mkOption { + type = types.functionTo (types.listOf types.package); + default = _: []; + defaultText = literalExpression '' + python3Packages: with python3Packages; []; + ''; + description = lib.mdDoc '' + List of plugin packages to install. + ''; + }; + + secretKeyFile = mkOption { + type = types.path; + description = lib.mdDoc '' + Path to a file containing the secret key. + ''; + }; + + peeringdbApiKeyFile = mkOption { + type = with types; nullOr path; + default = null; + description = lib.mdDoc '' + Path to a file containing the PeeringDB API key. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = lib.mdDoc '' + Additional lines of configuration appended to the `configuration.py`. + See the [documentation](https://peering-manager.readthedocs.io/en/stable/configuration/optional-settings/) for more possible options. + ''; + }; + + enableLdap = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Enable LDAP-Authentication for Peering Manager. + + This requires a configuration file being pass through `ldapConfigPath`. + ''; + }; + + ldapConfigPath = mkOption { + type = types.path; + description = lib.mdDoc '' + Path to the Configuration-File for LDAP-Authentication, will be loaded as `ldap_config.py`. + See the [documentation](https://peering-manager.readthedocs.io/en/stable/setup/6-ldap/#configuration) for possible options. + ''; + }; + }; + + config = mkIf cfg.enable { + services.peering-manager.plugins = mkIf cfg.enableLdap (ps: [ ps.django-auth-ldap ]); + + system.build.peeringManagerPkg = pkg; + + services.redis.servers.peering-manager.enable = true; + + services.postgresql = { + enable = true; + ensureDatabases = [ "peering-manager" ]; + ensureUsers = [ + { + name = "peering-manager"; + ensurePermissions = { + "DATABASE \"peering-manager\"" = "ALL PRIVILEGES"; + }; + } + ]; + }; + + environment.systemPackages = [ peeringManagerManageScript ]; + + systemd.targets.peering-manager = { + description = "Target for all Peering Manager services"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" "redis-peering-manager.service" ]; + }; + + systemd.services = let + defaultServiceConfig = { + WorkingDirectory = "/var/lib/peering-manager"; + User = "peering-manager"; + Group = "peering-manager"; + StateDirectory = "peering-manager"; + StateDirectoryMode = "0750"; + Restart = "on-failure"; + }; + in { + peering-manager-migration = { + description = "Peering Manager migrations"; + wantedBy = [ "peering-manager.target" ]; + + environment = { + PYTHONPATH = pkg.pythonPath; + }; + + serviceConfig = defaultServiceConfig // { + Type = "oneshot"; + ExecStart = '' + ${pkg}/bin/peering-manager migrate + ''; + }; + }; + + peering-manager = { + description = "Peering Manager WSGI Service"; + wantedBy = [ "peering-manager.target" ]; + after = [ "peering-manager-migration.service" ]; + + preStart = '' + ${pkg}/bin/peering-manager remove_stale_contenttypes --no-input + ''; + + environment = { + PYTHONPATH = pkg.pythonPath; + }; + + serviceConfig = defaultServiceConfig // { + ExecStart = '' + ${pkg.python.pkgs.gunicorn}/bin/gunicorn peering_manager.wsgi \ + --bind ${cfg.listenAddress}:${toString cfg.port} \ + --pythonpath ${pkg}/opt/peering-manager + ''; + }; + }; + + peering-manager-rq = { + description = "Peering Manager Request Queue Worker"; + wantedBy = [ "peering-manager.target" ]; + after = [ "peering-manager.service" ]; + + environment = { + PYTHONPATH = pkg.pythonPath; + }; + + serviceConfig = defaultServiceConfig // { + ExecStart = '' + ${pkg}/bin/peering-manager rqworker high default low + ''; + }; + }; + + peering-manager-housekeeping = { + description = "Peering Manager housekeeping job"; + after = [ "peering-manager.service" ]; + + environment = { + PYTHONPATH = pkg.pythonPath; + }; + + serviceConfig = defaultServiceConfig // { + Type = "oneshot"; + ExecStart = '' + ${pkg}/bin/peering-manager housekeeping + ''; + }; + }; + }; + + systemd.timers.peering-manager-housekeeping = { + description = "Run Peering Manager housekeeping job"; + wantedBy = [ "timers.target" ]; + + timerConfig = { + OnCalendar = "daily"; + }; + }; + + users.users.peering-manager = { + home = "/var/lib/peering-manager"; + isSystemUser = true; + group = "peering-manager"; + }; + users.groups.peering-manager = {}; + users.groups."${config.services.redis.servers.peering-manager.user}".members = [ "peering-manager" ]; + }; +} diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index 4dbcb09d2ae2..7e418f2869c8 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -161,6 +161,18 @@ in { description = lib.mdDoc "Configure nginx as a reverse proxy for peertube."; }; + secrets = { + secretsFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/run/secrets/peertube"; + description = lib.mdDoc '' + Secrets to run PeerTube. + Generate one using `openssl rand -hex 32` + ''; + }; + }; + database = { createLocally = lib.mkOption { type = lib.types.bool; @@ -201,7 +213,7 @@ in { passwordFile = lib.mkOption { type = lib.types.nullOr lib.types.path; default = null; - example = "/run/keys/peertube/password-posgressql-db"; + example = "/run/keys/peertube/password-postgresql"; description = lib.mdDoc "Password for PostgreSQL database."; }; }; @@ -282,6 +294,11 @@ in { prevent this. ''; } + { assertion = cfg.secrets.secretsFile != null; + message = '' + needs to be set. + ''; + } { assertion = !(cfg.redis.enableUnixSocket && (cfg.redis.host != null || cfg.redis.port != null)); message = '' and redis network connection ( or ) enabled. Disable either of them. @@ -349,6 +366,7 @@ in { captions = lib.mkDefault "/var/lib/peertube/storage/captions/"; cache = lib.mkDefault "/var/lib/peertube/storage/cache/"; plugins = lib.mkDefault "/var/lib/peertube/storage/plugins/"; + well_known = lib.mkDefault "/var/lib/peertube/storage/well_known/"; client_overrides = lib.mkDefault "/var/lib/peertube/storage/client-overrides/"; }; import = { @@ -417,6 +435,10 @@ in { #!/bin/sh umask 077 cat > /var/lib/peertube/config/local.yaml < pict-rs.xml` - meta.doc = ./pict-rs.xml; + meta.doc = ./pict-rs.md; options.services.pict-rs = { enable = mkEnableOption (lib.mdDoc "pict-rs server"); diff --git a/nixos/modules/services/web-apps/pict-rs.xml b/nixos/modules/services/web-apps/pict-rs.xml deleted file mode 100644 index bf129f5cc2ac..000000000000 --- a/nixos/modules/services/web-apps/pict-rs.xml +++ /dev/null @@ -1,162 +0,0 @@ - - Pict-rs - - pict-rs is a a simple image hosting service. - -
- Quickstart - - the minimum to start pict-rs is - - -services.pict-rs.enable = true; - - - this will start the http server on port 8080 by default. - -
-
- Usage - - pict-rs offers the following endpoints: - - POST /image for uploading an image. Uploaded - content must be valid multipart/form-data with an image array - located within the images[] key - - -This endpoint returns the following JSON structure on success with a 201 Created status -```json -{ - "files": [ - { - "delete_token": "JFvFhqJA98", - "file": "lkWZDRvugm.jpg" - }, - { - "delete_token": "kAYy9nk2WK", - "file": "8qFS0QooAn.jpg" - }, - { - "delete_token": "OxRpM3sf0Y", - "file": "1hJaYfGE01.jpg" - } - ], - "msg": "ok" -} -``` - - - - - GET /image/download?url=... Download an - image from a remote server, returning the same JSON payload as - the POST endpoint - - - - - GET /image/original/{file} for getting a - full-resolution image. file here is the - file key from the /image - endpoint’s JSON - - - - - GET /image/details/original/{file} for - getting the details of a full-resolution image. The returned - JSON is structured like so: - json { "width": 800, "height": 537, "content_type": "image/webp", "created_at": [ 2020, 345, 67376, 394363487 ] } - - - - - GET /image/process.{ext}?src={file}&... - get a file with transformations applied. existing - transformations include - - - - - identity=true: apply no changes - - - - - blur={float}: apply a gaussian blur to - the file - - - - - thumbnail={int}: produce a thumbnail of - the image fitting inside an {int} by - {int} square using raw pixel sampling - - - - - resize={int}: produce a thumbnail of - the image fitting inside an {int} by - {int} square using a Lanczos2 filter. - This is slower than sampling but looks a bit better in - some cases - - - - - crop={int-w}x{int-h}: produce a cropped - version of the image with an {int-w} by - {int-h} aspect ratio. The resulting - crop will be centered on the image. Either the width or - height of the image will remain full-size, depending on - the image’s aspect ratio and the requested aspect ratio. - For example, a 1600x900 image cropped with a 1x1 aspect - ratio will become 900x900. A 1600x1100 image cropped with - a 16x9 aspect ratio will become 1600x900. - - - - - Supported ext file extensions include - png, jpg, and - webp - - - An example of usage could be - GET /image/process.jpg?src=asdf.png&thumbnail=256&blur=3.0 - which would create a 256x256px JPEG thumbnail and blur it - - - - - GET /image/details/process.{ext}?src={file}&... - for getting the details of a processed image. The returned - JSON is the same format as listed for the full-resolution - details endpoint. - - - - - DELETE /image/delete/{delete_token}/{file} - or GET /image/delete/{delete_token}/{file} - to delete a file, where delete_token and - file are from the /image - endpoint’s JSON - - - -
-
- Missing - - - - Configuring the secure-api-key is not included yet. The - envisioned basic use case is consumption on localhost by other - services without exposing the service to the internet. - - - -
-
diff --git a/nixos/modules/services/web-apps/plausible.md b/nixos/modules/services/web-apps/plausible.md new file mode 100644 index 000000000000..1328ce69441a --- /dev/null +++ b/nixos/modules/services/web-apps/plausible.md @@ -0,0 +1,35 @@ +# Plausible {#module-services-plausible} + +[Plausible](https://plausible.io/) is a privacy-friendly alternative to +Google analytics. + +## Basic Usage {#module-services-plausible-basic-usage} + +At first, a secret key is needed to be generated. This can be done with e.g. +```ShellSession +$ openssl rand -base64 64 +``` + +After that, `plausible` can be deployed like this: +``` +{ + services.plausible = { + enable = true; + adminUser = { + # activate is used to skip the email verification of the admin-user that's + # automatically created by plausible. This is only supported if + # postgresql is configured by the module. This is done by default, but + # can be turned off with services.plausible.database.postgres.setup. + activate = true; + email = "admin@localhost"; + passwordFile = "/run/secrets/plausible-admin-pwd"; + }; + server = { + baseUrl = "http://analytics.example.org"; + # secretKeybaseFile is a path to the file which contains the secret generated + # with openssl as described above. + secretKeybaseFile = "/run/secrets/plausible-secret-key-base"; + }; + }; +} +``` diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index e5dc1b103601..f64254d62524 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -292,5 +292,5 @@ in { }; meta.maintainers = with maintainers; [ ma27 ]; - meta.doc = ./plausible.xml; + meta.doc = ./plausible.md; } diff --git a/nixos/modules/services/web-apps/plausible.xml b/nixos/modules/services/web-apps/plausible.xml deleted file mode 100644 index 92a571b9fbdb..000000000000 --- a/nixos/modules/services/web-apps/plausible.xml +++ /dev/null @@ -1,51 +0,0 @@ - - Plausible - - Plausible is a privacy-friendly alternative to - Google analytics. - -
- Basic Usage - - At first, a secret key is needed to be generated. This can be done with e.g. - $ openssl rand -base64 64 - - - After that, plausible can be deployed like this: -{ - services.plausible = { - enable = true; - adminUser = { - activate = true; - email = "admin@localhost"; - passwordFile = "/run/secrets/plausible-admin-pwd"; - }; - server = { - baseUrl = "http://analytics.example.org"; - secretKeybaseFile = "/run/secrets/plausible-secret-key-base"; - }; - }; -} - - - - activate is used to skip the email verification of the admin-user that's - automatically created by plausible. This is only supported if - postgresql is configured by the module. This is done by default, but - can be turned off with . - - - - - secretKeybaseFile is a path to the file which contains the secret generated - with openssl as described above. - - - - -
-
diff --git a/nixos/modules/services/web-apps/snipe-it.nix b/nixos/modules/services/web-apps/snipe-it.nix index 6da44f1bdf34..93b0aafab64b 100644 --- a/nixos/modules/services/web-apps/snipe-it.nix +++ b/nixos/modules/services/web-apps/snipe-it.nix @@ -381,7 +381,7 @@ in { }; systemd.services.snipe-it-setup = { - description = "Preperation tasks for snipe-it"; + description = "Preparation tasks for snipe-it"; before = [ "phpfpm-snipe-it.service" ]; after = optional db.createLocally "mysql.service"; wantedBy = [ "multi-user.target" ]; @@ -454,8 +454,9 @@ in { # A placeholder file for invalid barcodes invalid_barcode_location="${cfg.dataDir}/public/uploads/barcodes/invalid_barcode.gif" - [ ! -e "$invalid_barcode_location" ] \ - && cp ${snipe-it}/share/snipe-it/invalid_barcode.gif "$invalid_barcode_location" + if [ ! -e "$invalid_barcode_location" ]; then + cp ${snipe-it}/share/snipe-it/invalid_barcode.gif "$invalid_barcode_location" + fi ''; }; diff --git a/nixos/modules/services/web-apps/sogo.nix b/nixos/modules/services/web-apps/sogo.nix index ca1f426623f5..5e5d9472829d 100644 --- a/nixos/modules/services/web-apps/sogo.nix +++ b/nixos/modules/services/web-apps/sogo.nix @@ -49,7 +49,7 @@ in { Replacement-filepath mapping for sogo.conf. Every key is replaced with the contents of the file specified as value. - In the example, every occurence of LDAP_BINDPW will be replaced with the text of the + In the example, every occurrence of LDAP_BINDPW will be replaced with the text of the specified file. ''; type = attrsOf str; diff --git a/nixos/modules/services/web-apps/wiki-js.nix b/nixos/modules/services/web-apps/wiki-js.nix index c5627a28b849..b0210c8a5d2b 100644 --- a/nixos/modules/services/web-apps/wiki-js.nix +++ b/nixos/modules/services/web-apps/wiki-js.nix @@ -17,7 +17,7 @@ in { default = null; example = "/root/wiki-js.env"; description = lib.mdDoc '' - Environment fiel to inject e.g. secrets into the configuration. + Environment file to inject e.g. secrets into the configuration. ''; }; @@ -113,7 +113,13 @@ in { documentation = [ "https://docs.requarks.io/" ]; wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ coreutils ]; + path = with pkgs; [ + # Needed for git storage. + git + # Needed for git+ssh storage. + openssh + ]; + preStart = '' ln -sf ${configFile} /var/lib/${cfg.stateDirectoryName}/config.yml ln -sf ${pkgs.wiki-js}/server /var/lib/${cfg.stateDirectoryName} diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index 43a6d7e75dc6..d4c987da1144 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -32,35 +32,59 @@ let # Since hard linking directories is not allowed, copying is the next best thing. # copy additional plugin(s), theme(s) and language(s) - ${concatMapStringsSep "\n" (theme: "cp -r ${theme} $out/share/wordpress/wp-content/themes/${theme.name}") cfg.themes} - ${concatMapStringsSep "\n" (plugin: "cp -r ${plugin} $out/share/wordpress/wp-content/plugins/${plugin.name}") cfg.plugins} + ${concatStringsSep "\n" (mapAttrsToList (name: theme: "cp -r ${theme} $out/share/wordpress/wp-content/themes/${name}") cfg.themes)} + ${concatStringsSep "\n" (mapAttrsToList (name: plugin: "cp -r ${plugin} $out/share/wordpress/wp-content/plugins/${name}") cfg.plugins)} ${concatMapStringsSep "\n" (language: "cp -r ${language} $out/share/wordpress/wp-content/languages/") cfg.languages} ''; }; - wpConfig = hostName: cfg: pkgs.writeText "wp-config-${hostName}.php" '' - - ''; + require_once(ABSPATH . 'wp-settings.php'); + ?> + ''; + checkPhase = "${pkgs.php81}/bin/php --syntax-check $target"; + }; + + mkPhpValue = v: let + isHasAttr = s: isAttrs v && hasAttr s v; + in + if isString v then escapeShellArg v + # NOTE: If any value contains a , (comma) this will not get escaped + else if isList v && any lib.strings.isCoercibleToString v then escapeShellArg (concatMapStringsSep "," toString v) + else if isInt v then toString v + else if isBool v then boolToString v + else if isHasAttr "_file" then "trim(file_get_contents(${lib.escapeShellArg v._file}))" + else if isHasAttr "_raw" then v._raw + else abort "The Wordpress config value ${lib.generators.toPretty {} v} can not be encoded." + ; secretsVars = [ "AUTH_KEY" "SECURE_AUTH_KEY" "LOGGED_IN_KEY" "NONCE_KEY" "AUTH_SALT" "SECURE_AUTH_SALT" "LOGGED_IN_SALT" "NONCE_SALT" ]; secretsScript = hostStateDir: '' @@ -77,7 +101,7 @@ let fi ''; - siteOpts = { lib, name, ... }: + siteOpts = { lib, name, config, ... }: { options = { package = mkOption { @@ -106,62 +130,45 @@ let }; plugins = mkOption { - type = types.listOf types.path; - default = []; + type = with types; coercedTo + (listOf path) + (l: warn "setting this option with a list is deprecated" + listToAttrs (map (p: nameValuePair (p.name or (throw "${p} does not have a name")) p) l)) + (attrsOf path); + default = {}; description = lib.mdDoc '' - List of path(s) to respective plugin(s) which are copied from the 'plugins' directory. + Path(s) to respective plugin(s) which are copied from the 'plugins' directory. ::: {.note} These plugins need to be packaged before use, see example. ::: ''; example = literalExpression '' - let - # Wordpress plugin 'embed-pdf-viewer' installation example - embedPdfViewerPlugin = pkgs.stdenv.mkDerivation { - name = "embed-pdf-viewer-plugin"; - # Download the theme from the wordpress site - src = pkgs.fetchurl { - url = "https://downloads.wordpress.org/plugin/embed-pdf-viewer.2.0.3.zip"; - sha256 = "1rhba5h5fjlhy8p05zf0p14c9iagfh96y91r36ni0rmk6y891lyd"; - }; - # We need unzip to build this package - nativeBuildInputs = [ pkgs.unzip ]; - # Installing simply means copying all files to the output directory - installPhase = "mkdir -p $out; cp -R * $out/"; - }; - # And then pass this theme to the themes list like this: - in [ embedPdfViewerPlugin ] + { + inherit (pkgs.wordpressPackages.plugins) embed-pdf-viewer-plugin; + } ''; }; themes = mkOption { - type = types.listOf types.path; - default = []; + type = with types; coercedTo + (listOf path) + (l: warn "setting this option with a list is deprecated" + listToAttrs (map (p: nameValuePair (p.name or (throw "${p} does not have a name")) p) l)) + (attrsOf path); + default = { inherit (pkgs.wordpressPackages.themes) twentytwentythree; }; + defaultText = literalExpression "{ inherit (pkgs.wordpressPackages.themes) twentytwentythree; }"; description = lib.mdDoc '' - List of path(s) to respective theme(s) which are copied from the 'theme' directory. + Path(s) to respective theme(s) which are copied from the 'theme' directory. ::: {.note} These themes need to be packaged before use, see example. ::: ''; example = literalExpression '' - let - # Let's package the responsive theme - responsiveTheme = pkgs.stdenv.mkDerivation { - name = "responsive-theme"; - # Download the theme from the wordpress site - src = pkgs.fetchurl { - url = "https://downloads.wordpress.org/theme/responsive.3.14.zip"; - sha256 = "0rjwm811f4aa4q43r77zxlpklyb85q08f9c8ns2akcarrvj5ydx3"; - }; - # We need unzip to build this package - nativeBuildInputs = [ pkgs.unzip ]; - # Installing simply means copying all files to the output directory - installPhase = "mkdir -p $out; cp -R * $out/"; - }; - # And then pass this theme to the themes list like this: - in [ responsiveTheme ] + { + inherit (pkgs.wordpressPackages.themes) responsive-theme; + } ''; }; @@ -283,6 +290,42 @@ let ''; }; + settings = mkOption { + type = types.attrsOf types.anything; + default = {}; + description = lib.mdDoc '' + Structural Wordpress configuration. + Refer to + for details and supported values. + ''; + example = literalExpression '' + { + WP_DEFAULT_THEME = "twentytwentytwo"; + WP_SITEURL = "https://example.org"; + WP_HOME = "https://example.org"; + WP_DEBUG = true; + WP_DEBUG_DISPLAY = true; + WPLANG = "de_DE"; + FORCE_SSL_ADMIN = true; + AUTOMATIC_UPDATER_DISABLED = true; + } + ''; + }; + + mergedConfig = mkOption { + readOnly = true; + default = mergeConfig config; + defaultText = literalExpression '' + { + DISALLOW_FILE_EDIT = true; + AUTOMATIC_UPDATER_DISABLED = true; + } + ''; + description = lib.mdDoc '' + Read only representation of the final configuration. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -290,11 +333,16 @@ let Any additional text to be appended to the wp-config.php configuration file. This is a PHP script. For configuration settings, see . + + **Note**: Please pass structured settings via + `services.wordpress.sites.${name}.settings` instead. ''; example = '' - define( 'AUTOSAVE_INTERVAL', 60 ); // Seconds + @ini_set( 'log_errors', 'Off' ); + @ini_set( 'display_errors', 'On' ); ''; }; + }; config.virtualHost.hostName = mkDefault name; diff --git a/nixos/modules/services/web-apps/zabbix.nix b/nixos/modules/services/web-apps/zabbix.nix index 0e43922f35de..2cea7e7cea72 100644 --- a/nixos/modules/services/web-apps/zabbix.nix +++ b/nixos/modules/services/web-apps/zabbix.nix @@ -51,7 +51,7 @@ in server = { port = mkOption { - type = types.int; + type = types.port; description = lib.mdDoc "The port of the Zabbix server to connect to."; default = 10051; }; @@ -78,7 +78,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = if cfg.database.type == "mysql" then config.services.mysql.port else if cfg.database.type == "pgsql" then config.services.postgresql.port diff --git a/nixos/modules/services/web-servers/agate.nix b/nixos/modules/services/web-servers/agate.nix index 9d635c64a44e..a0c8a8c94ee5 100644 --- a/nixos/modules/services/web-servers/agate.nix +++ b/nixos/modules/services/web-servers/agate.nix @@ -43,7 +43,7 @@ in type = types.listOf types.str; description = lib.mdDoc '' Domain name of this Gemini server, enables checking hostname and port - in requests. (multiple occurences means basic vhosts) + in requests. (multiple occurrences means basic vhosts) ''; }; diff --git a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix index 0d60d533c994..7b87f9ef4bde 100644 --- a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix @@ -61,7 +61,7 @@ in description = lib.mdDoc '' Listen addresses for this virtual host. - Compared to `listen` this only sets the addreses + Compared to `listen` this only sets the addresses and the ports are chosen automatically. ''; default = [ "*" ]; diff --git a/nixos/modules/services/web-servers/garage.md b/nixos/modules/services/web-servers/garage.md new file mode 100644 index 000000000000..b1003e5dae1e --- /dev/null +++ b/nixos/modules/services/web-servers/garage.md @@ -0,0 +1,96 @@ +# Garage {#module-services-garage} + +[Garage](https://garagehq.deuxfleurs.fr/) +is an open-source, self-hostable S3 store, simpler than MinIO, for geodistributed stores. +The server setup can be automated using +[services.garage](#opt-services.garage.enable). A + client configured to your local Garage instance is available in + the global environment as `garage-manage`. + +The current default by NixOS is `garage_0_8` which is also the latest +major version available. + +## General considerations on upgrades {#module-services-garage-upgrade-scenarios} + +Garage provides a cookbook documentation on how to upgrade: + + +::: {.warning} +Garage has two types of upgrades: patch-level upgrades and minor/major version upgrades. + +In all cases, you should read the changelog and ideally test the upgrade on a staging cluster. + +Checking the health of your cluster can be achieved using `garage-manage repair`. +::: + +::: {.warning} +Until 1.0 is released, patch-level upgrades are considered as minor version upgrades. +Minor version upgrades are considered as major version upgrades. +i.e. 0.6 to 0.7 is a major version upgrade. +::: + + - **Straightforward upgrades (patch-level upgrades).** + Upgrades must be performed one by one, i.e. for each node, stop it, upgrade it : change [stateVersion](#opt-system.stateVersion) or [services.garage.package](#opt-services.garage.package), restart it if it was not already by switching. + - **Multiple version upgrades.** + Garage do not provide any guarantee on moving more than one major-version forward. + E.g., if you're on `0.7`, you cannot upgrade to `0.9`. + You need to upgrade to `0.8` first. + As long as [stateVersion](#opt-system.stateVersion) is declared properly, + this is enforced automatically. The module will issue a warning to remind the user to upgrade to latest + Garage *after* that deploy. + +## Advanced upgrades (minor/major version upgrades) {#module-services-garage-advanced-upgrades} + +Here are some baseline instructions to handle advanced upgrades in Garage, when in doubt, please refer to upstream instructions. + + - Disable API and web access to Garage. + - Perform `garage-manage repair --all-nodes --yes tables` and `garage-manage repair --all-nodes --yes blocks`. + - Verify the resulting logs and check that data is synced properly between all nodes. + If you have time, do additional checks (`scrub`, `block_refs`, etc.). + - Check if queues are empty by `garage-manage stats` or through monitoring tools. + - Run `systemctl stop garage` to stop the actual Garage version. + - Backup the metadata folder of ALL your nodes, e.g. for a metadata directory (the default one) in `/var/lib/garage/meta`, + you can run `pushd /var/lib/garage; tar -acf meta-v0.7.tar.zst meta/; popd`. + - Run the offline migration: `nix-shell -p garage_0_8 --run "garage offline-repair --yes"`, this can take some time depending on how many objects are stored in your cluster. + - Bump Garage version in your NixOS configuration, either by changing [stateVersion](#opt-system.stateVersion) or bumping [services.garage.package](#opt-services.garage.package), this should restart Garage automatically. + - Perform `garage-manage repair --all-nodes --yes tables` and `garage-manage repair --all-nodes --yes blocks`. + - Wait for a full table sync to run. + +Your upgraded cluster should be in a working state, re-enable API and web access. + +## Maintainer information {#module-services-garage-maintainer-info} + +As stated in the previous paragraph, we must provide a clean upgrade-path for Garage +since it cannot move more than one major version forward on a single upgrade. This chapter +adds some notes how Garage updates should be rolled out in the future. +This is inspired from how Nextcloud does it. + +While patch-level updates are no problem and can be done directly in the +package-expression (and should be backported to supported stable branches after that), +major-releases should be added in a new attribute (e.g. Garage `v0.8.0` +should be available in `nixpkgs` as `pkgs.garage_0_8_0`). +To provide simple upgrade paths it's generally useful to backport those as well to stable +branches. As long as the package-default isn't altered, this won't break existing setups. +After that, the versioning-warning in the `garage`-module should be +updated to make sure that the +[package](#opt-services.garage.package)-option selects the latest version +on fresh setups. + +If major-releases will be abandoned by upstream, we should check first if those are needed +in NixOS for a safe upgrade-path before removing those. In that case we shold keep those +packages, but mark them as insecure in an expression like this (in +``): +``` +/* ... */ +{ + garage_0_7_3 = generic { + version = "0.7.3"; + sha256 = "0000000000000000000000000000000000000000000000000000"; + eol = true; + }; +} +``` + +Ideally we should make sure that it's possible to jump two NixOS versions forward: +i.e. the warnings and the logic in the module should guard a user to upgrade from a +Garage on e.g. 22.11 to a Garage on 23.11. diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix index 76ab273483eb..2491c788d6c5 100644 --- a/nixos/modules/services/web-servers/garage.nix +++ b/nixos/modules/services/web-servers/garage.nix @@ -8,7 +8,10 @@ let configFile = toml.generate "garage.toml" cfg.settings; in { - meta.maintainers = [ maintainers.raitobezarius ]; + meta = { + doc = ./garage.md; + maintainers = with pkgs.lib.maintainers; [ raitobezarius ]; + }; options.services.garage = { enable = mkEnableOption (lib.mdDoc "Garage Object Storage (S3 compatible)"); @@ -56,10 +59,12 @@ in }; package = mkOption { - default = pkgs.garage; - defaultText = literalExpression "pkgs.garage"; + # TODO: when 23.05 is released and if Garage 0.9 is the default, put a stateVersion check. + default = if versionAtLeast stateVersion "23.05" then pkgs.garage_0_8_0 + else pkgs.garage_0_7; + defaultText = literalExpression "pkgs.garage_0_7"; type = types.package; - description = lib.mdDoc "Garage package to use."; + description = lib.mdDoc "Garage package to use, if you are upgrading from a major version, please read NixOS and Garage release notes for upgrade instructions."; }; }; diff --git a/nixos/modules/services/web-servers/jboss/builder.sh b/nixos/modules/services/web-servers/jboss/builder.sh index 0e5af324c13f..ac573089cd5a 100644 --- a/nixos/modules/services/web-servers/jboss/builder.sh +++ b/nixos/modules/services/web-servers/jboss/builder.sh @@ -1,5 +1,6 @@ set -e +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup mkdir -p $out/bin diff --git a/nixos/modules/services/web-servers/keter/default.nix b/nixos/modules/services/web-servers/keter/default.nix index 42ab6640b4c9..9adbe65de69f 100644 --- a/nixos/modules/services/web-servers/keter/default.nix +++ b/nixos/modules/services/web-servers/keter/default.nix @@ -140,7 +140,7 @@ Keep an old app running and swap the ports when the new one is booted. # On deploy this will load our app, by moving it into the incoming dir # If the bundle content changes, this will run again. - # Because the bundle content contains the nix path to the exectuable, + # Because the bundle content contains the nix path to the executable, # we inherit nix based cache busting. systemd.services.load-keter-bundle = { description = "load keter bundle into incoming folder"; diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index ec847495d741..811afe8e0af6 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -137,7 +137,7 @@ in package = mkOption { default = pkgs.lighttpd; - defaultText = "pkgs.lighttpd"; + defaultText = lib.literalExpression "pkgs.lighttpd"; type = types.package; description = lib.mdDoc '' lighttpd package to use. diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 12afc23592ba..1837ec936c69 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.nginx; - certs = config.security.acme.certs; + inherit (config.security.acme) certs; vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts; acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME || vhostConfig.useACMEHost != null) vhostsConfigs; dependentCertNames = unique (map (hostOpts: hostOpts.certName) acmeEnabledVhosts); @@ -27,7 +27,44 @@ let else "${certs.${certName}.directory}/chain.pem"; }) ) cfg.virtualHosts; - enableIPv6 = config.networking.enableIPv6; + inherit (config.networking) enableIPv6; + + # Mime.types values are taken from brotli sample configuration - https://github.com/google/ngx_brotli + # and Nginx Server Configs - https://github.com/h5bp/server-configs-nginx + compressMimeTypes = [ + "application/atom+xml" + "application/geo+json" + "application/json" + "application/ld+json" + "application/manifest+json" + "application/rdf+xml" + "application/vnd.ms-fontobject" + "application/wasm" + "application/x-rss+xml" + "application/x-web-app-manifest+json" + "application/xhtml+xml" + "application/xliff+xml" + "application/xml" + "font/collection" + "font/otf" + "font/ttf" + "image/bmp" + "image/svg+xml" + "image/vnd.microsoft.icon" + "text/cache-manifest" + "text/calendar" + "text/css" + "text/csv" + "text/html" + "text/javascript" + "text/markdown" + "text/plain" + "text/vcard" + "text/vnd.rim.location.xloc" + "text/vtt" + "text/x-component" + "text/xml" + ]; defaultFastcgiParams = { SCRIPT_FILENAME = "$document_root$fastcgi_script_name"; @@ -80,7 +117,7 @@ let # used by most other Linux distributions by default. include ${pkgs.mailcap}/etc/nginx/mime.types; # When recommendedOptimisation is disabled nginx fails to start because the mailmap mime.types database - # contains 1026 enries and the default is only 1024. Setting to a higher number to remove the need to + # contains 1026 entries and the default is only 1024. Setting to a higher number to remove the need to # overwrite it because nginx does not allow duplicated settings. types_hash_max_size 4096; @@ -112,7 +149,7 @@ let ''} ${upstreamConfig} - ${optionalString (cfg.recommendedOptimisation) '' + ${optionalString cfg.recommendedOptimisation '' # optimisation sendfile on; tcp_nopush on; @@ -124,7 +161,7 @@ let ${optionalString (cfg.sslCiphers != null) "ssl_ciphers ${cfg.sslCiphers};"} ${optionalString (cfg.sslDhparam != null) "ssl_dhparam ${cfg.sslDhparam};"} - ${optionalString (cfg.recommendedTlsSettings) '' + ${optionalString cfg.recommendedTlsSettings '' # Keep in sync with https://ssl-config.mozilla.org/#server=nginx&config=intermediate ssl_session_timeout 1d; @@ -140,30 +177,34 @@ let ssl_stapling_verify on; ''} - ${optionalString (cfg.recommendedGzipSettings) '' - gzip on; - gzip_proxied any; - gzip_comp_level 5; - gzip_types - application/atom+xml - application/javascript - application/json - application/xml - application/xml+rss - image/svg+xml - text/css - text/javascript - text/plain - text/xml; - gzip_vary on; + ${optionalString cfg.recommendedBrotliSettings '' + brotli on; + brotli_static on; + brotli_comp_level 5; + brotli_window 512k; + brotli_min_length 256; + brotli_types ${lib.concatStringsSep " " compressMimeTypes}; ''} - ${optionalString (cfg.recommendedProxySettings) '' + # https://docs.nginx.com/nginx/admin-guide/web-server/compression/ + ${optionalString cfg.recommendedGzipSettings '' + gzip on; + gzip_static on; + gzip_vary on; + gzip_comp_level 5; + gzip_min_length 256; + gzip_proxied expired no-cache no-store private auth; + gzip_types ${lib.concatStringsSep " " compressMimeTypes}; + ''} + + ${optionalString cfg.recommendedProxySettings '' proxy_redirect off; proxy_connect_timeout ${cfg.proxyTimeout}; proxy_send_timeout ${cfg.proxyTimeout}; proxy_read_timeout ${cfg.proxyTimeout}; proxy_http_version 1.1; + # don't let clients close the keep-alive connection to upstream + proxy_set_header "Connection" ""; include ${recommendedProxyConfig}; ''} @@ -192,6 +233,14 @@ let server_tokens ${if cfg.serverTokens then "on" else "off"}; + ${optionalString cfg.proxyCache.enable '' + proxy_cache_path /var/cache/nginx keys_zone=${cfg.proxyCache.keysZoneName}:${cfg.proxyCache.keysZoneSize} + levels=${cfg.proxyCache.levels} + use_temp_path=${if cfg.proxyCache.useTempPath then "on" else "off"} + inactive=${cfg.proxyCache.inactive} + max_size=${cfg.proxyCache.maxSize}; + ''} + ${cfg.commonHttpConfig} ${vhosts} @@ -310,7 +359,9 @@ let ${acmeLocation} ${optionalString (vhost.root != null) "root ${vhost.root};"} ${optionalString (vhost.globalRedirect != null) '' - return 301 http${optionalString hasSSL "s"}://${vhost.globalRedirect}$request_uri; + location / { + return 301 http${optionalString hasSSL "s"}://${vhost.globalRedirect}$request_uri; + } ''} ${optionalString hasSSL '' ssl_certificate ${vhost.sslCertificate}; @@ -414,6 +465,16 @@ in ''; }; + recommendedBrotliSettings = mkOption { + default = false; + type = types.bool; + description = lib.mdDoc '' + Enable recommended brotli settings. Learn more about compression in Brotli format [here](https://github.com/google/ngx_brotli/blob/master/README.md). + + This adds `pkgs.nginxModules.brotli` to `services.nginx.additionalModules`. + ''; + }; + recommendedGzipSettings = mkOption { default = false; type = types.bool; @@ -472,7 +533,7 @@ in defaultText = literalExpression "pkgs.nginxStable"; type = types.package; apply = p: p.override { - modules = p.modules ++ cfg.additionalModules; + modules = lib.unique (p.modules ++ cfg.additionalModules); }; description = lib.mdDoc '' Nginx package to use. This defaults to the stable version. Note @@ -484,11 +545,10 @@ in additionalModules = mkOption { default = []; type = types.listOf (types.attrsOf types.anything); - example = literalExpression "[ pkgs.nginxModules.brotli ]"; + example = literalExpression "[ pkgs.nginxModules.echo ]"; description = lib.mdDoc '' Additional [third-party nginx modules](https://www.nginx.com/resources/wiki/modules/) - to install. Packaged modules are available in - `pkgs.nginxModules`. + to install. Packaged modules are available in `pkgs.nginxModules`. ''; }; @@ -707,6 +767,72 @@ in ''; }; + proxyCache = mkOption { + type = types.submodule { + options = { + enable = mkEnableOption (lib.mdDoc "Enable proxy cache"); + + keysZoneName = mkOption { + type = types.str; + default = "cache"; + example = "my_cache"; + description = lib.mdDoc "Set name to shared memory zone."; + }; + + keysZoneSize = mkOption { + type = types.str; + default = "10m"; + example = "32m"; + description = lib.mdDoc "Set size to shared memory zone."; + }; + + levels = mkOption { + type = types.str; + default = "1:2"; + example = "1:2:2"; + description = lib.mdDoc '' + The levels parameter defines structure of subdirectories in cache: from + 1 to 3, each level accepts values 1 or 2. Сan be used any combination of + 1 and 2 in these formats: x, x:x and x:x:x. + ''; + }; + + useTempPath = mkOption { + type = types.bool; + default = false; + example = true; + description = lib.mdDoc '' + Nginx first writes files that are destined for the cache to a temporary + storage area, and the use_temp_path=off directive instructs Nginx to + write them to the same directories where they will be cached. Recommended + that you set this parameter to off to avoid unnecessary copying of data + between file systems. + ''; + }; + + inactive = mkOption { + type = types.str; + default = "10m"; + example = "1d"; + description = lib.mdDoc '' + Cached data that has not been accessed for the time specified by + the inactive parameter is removed from the cache, regardless of + its freshness. + ''; + }; + + maxSize = mkOption { + type = types.str; + default = "1g"; + example = "2048m"; + description = lib.mdDoc "Set maximum cache size"; + }; + }; + }; + default = {}; + description = lib.mdDoc "Configure proxy cache"; + }; + resolver = mkOption { type = types.submodule { options = { @@ -818,8 +944,6 @@ in ]; config = mkIf cfg.enable { - # TODO: test user supplied config file pases syntax test - warnings = let deprecatedSSL = name: config: optional config.enableSSL @@ -880,6 +1004,8 @@ in groups = config.users.groups; }) dependentCertNames; + services.nginx.additionalModules = optional cfg.recommendedBrotliSettings pkgs.nginxModules.brotli; + systemd.services.nginx = { description = "Nginx Web Server"; wantedBy = [ "multi-user.target" ]; @@ -965,14 +1091,14 @@ in sslServices = map (certName: "acme-${certName}.service") dependentCertNames; sslTargets = map (certName: "acme-finished-${certName}.target") dependentCertNames; in mkIf (cfg.enableReload || sslServices != []) { - wants = optionals (cfg.enableReload) [ "nginx.service" ]; + wants = optionals cfg.enableReload [ "nginx.service" ]; wantedBy = sslServices ++ [ "multi-user.target" ]; # Before the finished targets, after the renew services. # This service might be needed for HTTP-01 challenges, but we only want to confirm # certs are updated _after_ config has been reloaded. before = sslTargets; after = sslServices; - restartTriggers = optionals (cfg.enableReload) [ configFile ]; + restartTriggers = optionals cfg.enableReload [ configFile ]; # Block reloading if not all certs exist yet. # Happens when config changes add new vhosts/certs. unitConfig.ConditionPathExists = optionals (sslServices != []) (map (certName: certs.${certName}.directory + "/fullchain.pem") dependentCertNames); diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index e3d4afc074cf..089decb5f433 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -29,7 +29,7 @@ with lib; listen = mkOption { type = with types; listOf (submodule { options = { addr = mkOption { type = str; description = lib.mdDoc "IP address."; }; - port = mkOption { type = int; description = lib.mdDoc "Port number."; default = 80; }; + port = mkOption { type = port; description = lib.mdDoc "Port number."; default = 80; }; ssl = mkOption { type = bool; description = lib.mdDoc "Enable SSL."; default = false; }; extraParameters = mkOption { type = listOf str; description = lib.mdDoc "Extra parameters of this listen directive."; default = []; example = [ "backlog=1024" "deferred" ]; }; }; }); @@ -54,8 +54,8 @@ with lib; description = lib.mdDoc '' Listen addresses for this virtual host. - Compared to `listen` this only sets the addreses - and the ports are choosen automatically. + Compared to `listen` this only sets the addresses + and the ports are chosen automatically. Note: This option overrides `enableIPv6` ''; diff --git a/nixos/modules/services/web-servers/ttyd.nix b/nixos/modules/services/web-servers/ttyd.nix index affd5bbeea3c..e0a8b5179e06 100644 --- a/nixos/modules/services/web-servers/ttyd.nix +++ b/nixos/modules/services/web-servers/ttyd.nix @@ -163,7 +163,7 @@ in assertions = [ { assertion = cfg.enableSSL -> cfg.certFile != null && cfg.keyFile != null && cfg.caFile != null; - message = "SSL is enabled for ttyd, but no certFile, keyFile or caFile has been specefied."; } + message = "SSL is enabled for ttyd, but no certFile, keyFile or caFile has been specified."; } { assertion = ! (cfg.interface != null && cfg.socket != null); message = "Cannot set both interface and socket for ttyd."; } { assertion = (cfg.username != null) == (cfg.passwordFile != null); diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix index a80fe882f1a7..a17fe6bc2082 100644 --- a/nixos/modules/services/web-servers/zope2.nix +++ b/nixos/modules/services/web-servers/zope2.nix @@ -95,7 +95,7 @@ in }; } ''; - description = lib.mdDoc "zope2 instances to be created automaticaly by the system."; + description = lib.mdDoc "zope2 instances to be created automatically by the system."; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 2c59ee410d5f..2d8addb0f10e 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -67,13 +67,17 @@ in # Taken from mint-artwork.gschema.override theme = mkIf (notExcluded pkgs.cinnamon.mint-themes) { - name = mkDefault "Mint-X"; + name = mkDefault "Mint-Y-Aqua"; package = mkDefault pkgs.cinnamon.mint-themes; }; iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-x-icons) { - name = mkDefault "Mint-X-Dark"; + name = mkDefault "Mint-Y-Aqua"; package = mkDefault pkgs.cinnamon.mint-x-icons; }; + cursorTheme = mkIf (notExcluded pkgs.cinnamon.mint-cursor-themes) { + name = mkDefault "Bibata-Modern-Classic"; + package = mkDefault pkgs.cinnamon.mint-cursor-themes; + }; }; services.xserver.displayManager.sessionCommands = '' if test "$XDG_CURRENT_DESKTOP" = "Cinnamon"; then @@ -101,10 +105,11 @@ in services.dbus.packages = with pkgs.cinnamon; [ cinnamon-common cinnamon-screensaver - nemo + nemo-with-extensions xapp ]; services.cinnamon.apps.enable = mkDefault true; + services.gnome.evolution-data-server.enable = true; services.gnome.glib-networking.enable = true; services.gnome.gnome-keyring.enable = true; services.gvfs.enable = true; @@ -150,7 +155,7 @@ in polkit_gnome # packages - nemo + nemo-with-extensions cinnamon-control-center cinnamon-settings-daemon libgnomekbd @@ -172,10 +177,11 @@ in sound-theme-freedesktop nixos-artwork.wallpapers.simple-dark-gray mint-artwork + mint-cursor-themes mint-themes mint-x-icons mint-y-icons - vanilla-dmz + xapp # provides some xapp-* icons ] config.environment.cinnamon.excludePackages); xdg.mime.enable = true; @@ -193,10 +199,10 @@ in programs.bash.vteIntegration = mkDefault true; programs.zsh.vteIntegration = mkDefault true; - # Harmonize Qt5 applications under Cinnamon - qt5.enable = true; - qt5.platformTheme = "gnome"; - qt5.style = "adwaita"; + # Harmonize Qt applications under Cinnamon + qt.enable = true; + qt.platformTheme = "gnome"; + qt.style = "adwaita"; # Default Fonts fonts.fonts = with pkgs; [ @@ -209,7 +215,6 @@ in programs.geary.enable = mkDefault true; programs.gnome-disks.enable = mkDefault true; programs.gnome-terminal.enable = mkDefault true; - programs.evince.enable = mkDefault true; programs.file-roller.enable = mkDefault true; environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [ @@ -227,6 +232,7 @@ in # external apps shipped with linux-mint hexchat gnome-calculator + gnome-calendar gnome-screenshot ] config.environment.cinnamon.excludePackages; }) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.md b/nixos/modules/services/x11/desktop-managers/gnome.md new file mode 100644 index 000000000000..d9e75bfe6bdd --- /dev/null +++ b/nixos/modules/services/x11/desktop-managers/gnome.md @@ -0,0 +1,167 @@ +# GNOME Desktop {#chap-gnome} + +GNOME provides a simple, yet full-featured desktop environment with a focus on productivity. Its Mutter compositor supports both Wayland and X server, and the GNOME Shell user interface is fully customizable by extensions. + +## Enabling GNOME {#sec-gnome-enable} + +All of the core apps, optional apps, games, and core developer tools from GNOME are available. + +To enable the GNOME desktop use: + +``` +services.xserver.desktopManager.gnome.enable = true; +services.xserver.displayManager.gdm.enable = true; +``` + +::: {.note} +While it is not strictly necessary to use GDM as the display manager with GNOME, it is recommended, as some features such as screen lock [might not work](#sec-gnome-faq-can-i-use-lightdm-with-gnome) without it. +::: + +The default applications used in NixOS are very minimal, inspired by the defaults used in [gnome-build-meta](https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/40.0/elements/core/meta-gnome-core-utilities.bst). + +### GNOME without the apps {#sec-gnome-without-the-apps} + +If you’d like to only use the GNOME desktop and not the apps, you can disable them with: + +``` +services.gnome.core-utilities.enable = false; +``` + +and none of them will be installed. + +If you’d only like to omit a subset of the core utilities, you can use +[](#opt-environment.gnome.excludePackages). +Note that this mechanism can only exclude core utilities, games and core developer tools. + +### Disabling GNOME services {#sec-gnome-disabling-services} + +It is also possible to disable many of the [core services](https://github.com/NixOS/nixpkgs/blob/b8ec4fd2a4edc4e30d02ba7b1a2cc1358f3db1d5/nixos/modules/services/x11/desktop-managers/gnome.nix#L329-L348). For example, if you do not need indexing files, you can disable Tracker with: + +``` +services.gnome.tracker-miners.enable = false; +services.gnome.tracker.enable = false; +``` + +Note, however, that doing so is not supported and might break some applications. Notably, GNOME Music cannot work without Tracker. + +### GNOME games {#sec-gnome-games} + +You can install all of the GNOME games with: + +``` +services.gnome.games.enable = true; +``` + +### GNOME core developer tools {#sec-gnome-core-developer-tools} + +You can install GNOME core developer tools with: + +``` +services.gnome.core-developer-tools.enable = true; +``` + +## Enabling GNOME Flashback {#sec-gnome-enable-flashback} + +GNOME Flashback provides a desktop environment based on the classic GNOME 2 architecture. You can enable the default GNOME Flashback session, which uses the Metacity window manager, with: + +``` +services.xserver.desktopManager.gnome.flashback.enableMetacity = true; +``` + +It is also possible to create custom sessions that replace Metacity with a different window manager using [](#opt-services.xserver.desktopManager.gnome.flashback.customSessions). + +The following example uses `xmonad` window manager: + +``` +services.xserver.desktopManager.gnome.flashback.customSessions = [ + { + wmName = "xmonad"; + wmLabel = "XMonad"; + wmCommand = "${pkgs.haskellPackages.xmonad}/bin/xmonad"; + enableGnomePanel = false; + } +]; +``` + +## Icons and GTK Themes {#sec-gnome-icons-and-gtk-themes} + +Icon themes and GTK themes don’t require any special option to install in NixOS. + +You can add them to [](#opt-environment.systemPackages) and switch to them with GNOME Tweaks. +If you’d like to do this manually in dconf, change the values of the following keys: + +``` +/org/gnome/desktop/interface/gtk-theme +/org/gnome/desktop/interface/icon-theme +``` + +in `dconf-editor` + +## Shell Extensions {#sec-gnome-shell-extensions} + +Most Shell extensions are packaged under the `gnomeExtensions` attribute. +Some packages that include Shell extensions, like `gnome.gpaste`, don’t have their extension decoupled under this attribute. + +You can install them like any other package: + +``` +environment.systemPackages = [ + gnomeExtensions.dash-to-dock + gnomeExtensions.gsconnect + gnomeExtensions.mpris-indicator-button +]; +``` + +Unfortunately, we lack a way for these to be managed in a completely declarative way. +So you have to enable them manually with an Extensions application. +It is possible to use a [GSettings override](#sec-gnome-gsettings-overrides) for this on `org.gnome.shell.enabled-extensions`, but that will only influence the default value. + +## GSettings Overrides {#sec-gnome-gsettings-overrides} + +Majority of software building on the GNOME platform use GLib’s [GSettings](https://developer.gnome.org/gio/unstable/GSettings.html) system to manage runtime configuration. For our purposes, the system consists of XML schemas describing the individual configuration options, stored in the package, and a settings backend, where the values of the settings are stored. On NixOS, like on most Linux distributions, dconf database is used as the backend. + +[GSettings vendor overrides](https://developer.gnome.org/gio/unstable/GSettings.html#id-1.4.19.2.9.25) can be used to adjust the default values for settings of the GNOME desktop and apps by replacing the default values specified in the XML schemas. Using overrides will allow you to pre-seed user settings before you even start the session. + +::: {.warning} +Overrides really only change the default values for GSettings keys so if you or an application changes the setting value, the value set by the override will be ignored. Until [NixOS’s dconf module implements changing values](https://github.com/NixOS/nixpkgs/issues/54150), you will either need to keep that in mind and clear the setting from the backend using `dconf reset` command when that happens, or use the [module from home-manager](https://nix-community.github.io/home-manager/options.html#opt-dconf.settings). +::: + +You can override the default GSettings values using the +[](#opt-services.xserver.desktopManager.gnome.extraGSettingsOverrides) option. + +Take note that whatever packages you want to override GSettings for, you need to add them to +[](#opt-services.xserver.desktopManager.gnome.extraGSettingsOverridePackages). + +You can use `dconf-editor` tool to explore which GSettings you can set. + +### Example {#sec-gnome-gsettings-overrides-example} + +``` +services.xserver.desktopManager.gnome = { + extraGSettingsOverrides = '' + # Change default background + [org.gnome.desktop.background] + picture-uri='file://${pkgs.nixos-artwork.wallpapers.mosaic-blue.gnomeFilePath}' + + # Favorite apps in gnome-shell + [org.gnome.shell] + favorite-apps=['org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop'] + ''; + + extraGSettingsOverridePackages = [ + pkgs.gsettings-desktop-schemas # for org.gnome.desktop + pkgs.gnome.gnome-shell # for org.gnome.shell + ]; +}; +``` + +## Frequently Asked Questions {#sec-gnome-faq} + +### Can I use LightDM with GNOME? {#sec-gnome-faq-can-i-use-lightdm-with-gnome} + +Yes you can, and any other display-manager in NixOS. + +However, it doesn’t work correctly for the Wayland session of GNOME Shell yet, and +won’t be able to lock your screen. + +See [this issue.](https://github.com/NixOS/nixpkgs/issues/56342) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 9c1978e362bc..79b2e7c6ead7 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -66,7 +66,7 @@ in { meta = { - doc = ./gnome.xml; + doc = ./gnome.md; maintainers = teams.gnome.members; }; @@ -352,8 +352,8 @@ in }) ]; - # Harmonize Qt5 application style and also make them use the portal for file chooser dialog. - qt5 = { + # Harmonize Qt application style and also make them use the portal for file chooser dialog. + qt = { enable = mkDefault true; platformTheme = mkDefault "gnome"; style = mkDefault "adwaita"; diff --git a/nixos/modules/services/x11/desktop-managers/gnome.xml b/nixos/modules/services/x11/desktop-managers/gnome.xml deleted file mode 100644 index 807c9d64e204..000000000000 --- a/nixos/modules/services/x11/desktop-managers/gnome.xml +++ /dev/null @@ -1,253 +0,0 @@ - - GNOME Desktop - - GNOME provides a simple, yet full-featured desktop environment with a focus on productivity. Its Mutter compositor supports both Wayland and X server, and the GNOME Shell user interface is fully customizable by extensions. - - -
- Enabling GNOME - - - All of the core apps, optional apps, games, and core developer tools from GNOME are available. - - - - To enable the GNOME desktop use: - - - - = true; - = true; - - - - - While it is not strictly necessary to use GDM as the display manager with GNOME, it is recommended, as some features such as screen lock might not work without it. - - - - - The default applications used in NixOS are very minimal, inspired by the defaults used in gnome-build-meta. - - -
- GNOME without the apps - - - If you’d like to only use the GNOME desktop and not the apps, you can disable them with: - - - - = false; - - - - and none of them will be installed. - - - - If you’d only like to omit a subset of the core utilities, you can use . - Note that this mechanism can only exclude core utilities, games and core developer tools. - -
- -
- Disabling GNOME services - - - It is also possible to disable many of the core services. For example, if you do not need indexing files, you can disable Tracker with: - - - - = false; - = false; - - - - Note, however, that doing so is not supported and might break some applications. Notably, GNOME Music cannot work without Tracker. - -
- -
- GNOME games - - - You can install all of the GNOME games with: - - - - = true; - -
- -
- GNOME core developer tools - - - You can install GNOME core developer tools with: - - - - = true; - -
-
- -
- Enabling GNOME Flashback - - - GNOME Flashback provides a desktop environment based on the classic GNOME 2 architecture. You can enable the default GNOME Flashback session, which uses the Metacity window manager, with: - - - - = true; - - - - It is also possible to create custom sessions that replace Metacity with a different window manager using . - - - - The following example uses xmonad window manager: - - - - = [ - { - wmName = "xmonad"; - wmLabel = "XMonad"; - wmCommand = "${pkgs.haskellPackages.xmonad}/bin/xmonad"; - enableGnomePanel = false; - } -]; - - -
- -
- Icons and GTK Themes - - - Icon themes and GTK themes don’t require any special option to install in NixOS. - - - - You can add them to and switch to them with GNOME Tweaks. - If you’d like to do this manually in dconf, change the values of the following keys: - - - -/org/gnome/desktop/interface/gtk-theme -/org/gnome/desktop/interface/icon-theme - - - - in dconf-editor - -
- -
- Shell Extensions - - - Most Shell extensions are packaged under the gnomeExtensions attribute. - Some packages that include Shell extensions, like gnome.gpaste, don’t have their extension decoupled under this attribute. - - - - You can install them like any other package: - - - - = [ - gnomeExtensions.dash-to-dock - gnomeExtensions.gsconnect - gnomeExtensions.mpris-indicator-button -]; - - - - Unfortunately, we lack a way for these to be managed in a completely declarative way. - So you have to enable them manually with an Extensions application. - It is possible to use a GSettings override for this on org.gnome.shell.enabled-extensions, but that will only influence the default value. - -
- -
- GSettings Overrides - - - Majority of software building on the GNOME platform use GLib’s GSettings system to manage runtime configuration. For our purposes, the system consists of XML schemas describing the individual configuration options, stored in the package, and a settings backend, where the values of the settings are stored. On NixOS, like on most Linux distributions, dconf database is used as the backend. - - - - GSettings vendor overrides can be used to adjust the default values for settings of the GNOME desktop and apps by replacing the default values specified in the XML schemas. Using overrides will allow you to pre-seed user settings before you even start the session. - - - - - Overrides really only change the default values for GSettings keys so if you or an application changes the setting value, the value set by the override will be ignored. Until NixOS’s dconf module implements changing values, you will either need to keep that in mind and clear the setting from the backend using dconf reset command when that happens, or use the module from home-manager. - - - - - You can override the default GSettings values using the option. - - - - Take note that whatever packages you want to override GSettings for, you need to add them to - . - - - - You can use dconf-editor tool to explore which GSettings you can set. - - -
- Example - - -services.xserver.desktopManager.gnome = { - extraGSettingsOverrides = '' - # Change default background - [org.gnome.desktop.background] - picture-uri='file://${pkgs.nixos-artwork.wallpapers.mosaic-blue.gnomeFilePath}' - - # Favorite apps in gnome-shell - [org.gnome.shell] - favorite-apps=['org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop'] - ''; - - extraGSettingsOverridePackages = [ - pkgs.gsettings-desktop-schemas # for org.gnome.desktop - pkgs.gnome.gnome-shell # for org.gnome.shell - ]; -}; - -
-
- -
- Frequently Asked Questions - -
- Can I use LightDM with GNOME? - - - Yes you can, and any other display-manager in NixOS. - - - - However, it doesn’t work correctly for the Wayland session of GNOME Shell yet, and - won’t be able to lock your screen. - - - - See this issue. - -
-
-
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.md b/nixos/modules/services/x11/desktop-managers/pantheon.md new file mode 100644 index 000000000000..1c14ede84749 --- /dev/null +++ b/nixos/modules/services/x11/desktop-managers/pantheon.md @@ -0,0 +1,74 @@ +# Pantheon Desktop {#chap-pantheon} + +Pantheon is the desktop environment created for the elementary OS distribution. It is written from scratch in Vala, utilizing GNOME technologies with GTK and Granite. + +## Enabling Pantheon {#sec-pantheon-enable} + +All of Pantheon is working in NixOS and the applications should be available, aside from a few [exceptions](https://github.com/NixOS/nixpkgs/issues/58161). To enable Pantheon, set +``` +services.xserver.desktopManager.pantheon.enable = true; +``` +This automatically enables LightDM and Pantheon's LightDM greeter. If you'd like to disable this, set +``` +services.xserver.displayManager.lightdm.greeters.pantheon.enable = false; +services.xserver.displayManager.lightdm.enable = false; +``` +but please be aware using Pantheon without LightDM as a display manager will break screenlocking from the UI. The NixOS module for Pantheon installs all of Pantheon's default applications. If you'd like to not install Pantheon's apps, set +``` +services.pantheon.apps.enable = false; +``` +You can also use [](#opt-environment.pantheon.excludePackages) to remove any other app (like `elementary-mail`). + +## Wingpanel and Switchboard plugins {#sec-pantheon-wingpanel-switchboard} + +Wingpanel and Switchboard work differently than they do in other distributions, as far as using plugins. You cannot install a plugin globally (like with {option}`environment.systemPackages`) to start using it. You should instead be using the following options: + + - [](#opt-services.xserver.desktopManager.pantheon.extraWingpanelIndicators) + - [](#opt-services.xserver.desktopManager.pantheon.extraSwitchboardPlugs) + +to configure the programs with plugs or indicators. + +The difference in NixOS is both these programs are patched to load plugins from a directory that is the value of an environment variable. All of which is controlled in Nix. If you need to configure the particular packages manually you can override the packages like: +``` +wingpanel-with-indicators.override { + indicators = [ + pkgs.some-special-indicator + ]; +}; + +switchboard-with-plugs.override { + plugs = [ + pkgs.some-special-plug + ]; +}; +``` +please note that, like how the NixOS options describe these as extra plugins, this would only add to the default plugins included with the programs. If for some reason you'd like to configure which plugins to use exactly, both packages have an argument for this: +``` +wingpanel-with-indicators.override { + useDefaultIndicators = false; + indicators = specialListOfIndicators; +}; + +switchboard-with-plugs.override { + useDefaultPlugs = false; + plugs = specialListOfPlugs; +}; +``` +this could be most useful for testing a particular plug-in in isolation. + +## FAQ {#sec-pantheon-faq} + +[I have switched from a different desktop and Pantheon’s theming looks messed up.]{#sec-pantheon-faq-messed-up-theme} + : Open Switchboard and go to: Administration → About → Restore Default Settings → Restore Settings. This will reset any dconf settings to their Pantheon defaults. Note this could reset certain GNOME specific preferences if that desktop was used prior. + +[I cannot enable both GNOME and Pantheon.]{#sec-pantheon-faq-gnome-and-pantheon} + : This is a known [issue](https://github.com/NixOS/nixpkgs/issues/64611) and there is no known workaround. + +[Does AppCenter work, or is it available?]{#sec-pantheon-faq-appcenter} + : 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](https://github.com/NixOS/nixpkgs/issues/15932). + + If you are using Pantheon, AppCenter should be installed by default if you have [Flatpak support](#module-services-flatpak) enabled. If you also wish to add the `appcenter` Flatpak remote: + + ```ShellSession + $ flatpak remote-add --if-not-exists appcenter https://flatpak.elementary.io/repo.flatpakrepo + ``` diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 5c0203224e13..7791a98965d1 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -17,7 +17,7 @@ in { meta = { - doc = ./pantheon.xml; + doc = ./pantheon.md; maintainers = teams.pantheon.members; }; @@ -250,10 +250,10 @@ in programs.bash.vteIntegration = mkDefault true; programs.zsh.vteIntegration = mkDefault true; - # Harmonize Qt5 applications under Pantheon - qt5.enable = true; - qt5.platformTheme = "gnome"; - qt5.style = "adwaita"; + # Harmonize Qt applications under Pantheon + qt.enable = true; + qt.platformTheme = "gnome"; + qt.style = "adwaita"; # Default Fonts fonts.fonts = with pkgs; [ diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.xml b/nixos/modules/services/x11/desktop-managers/pantheon.xml deleted file mode 100644 index 6226f8f6a272..000000000000 --- a/nixos/modules/services/x11/desktop-managers/pantheon.xml +++ /dev/null @@ -1,120 +0,0 @@ - - Pantheon Desktop - - Pantheon is the desktop environment created for the elementary OS distribution. It is written from scratch in Vala, utilizing GNOME technologies with GTK and Granite. - -
- Enabling Pantheon - - - All of Pantheon is working in NixOS and the applications should be available, aside from a few exceptions. To enable Pantheon, set - - = true; - - This automatically enables LightDM and Pantheon's LightDM greeter. If you'd like to disable this, set - - = false; - = false; - - but please be aware using Pantheon without LightDM as a display manager will break screenlocking from the UI. The NixOS module for Pantheon installs all of Pantheon's default applications. If you'd like to not install Pantheon's apps, set - - = false; - - You can also use to remove any other app (like elementary-mail). - -
-
- Wingpanel and Switchboard plugins - - - Wingpanel and Switchboard work differently than they do in other distributions, as far as using plugins. You cannot install a plugin globally (like with ) to start using it. You should instead be using the following options: - - - - - - - - - - - - - to configure the programs with plugs or indicators. - - - - The difference in NixOS is both these programs are patched to load plugins from a directory that is the value of an environment variable. All of which is controlled in Nix. If you need to configure the particular packages manually you can override the packages like: - -wingpanel-with-indicators.override { - indicators = [ - pkgs.some-special-indicator - ]; -}; - -switchboard-with-plugs.override { - plugs = [ - pkgs.some-special-plug - ]; -}; - - please note that, like how the NixOS options describe these as extra plugins, this would only add to the default plugins included with the programs. If for some reason you'd like to configure which plugins to use exactly, both packages have an argument for this: - -wingpanel-with-indicators.override { - useDefaultIndicators = false; - indicators = specialListOfIndicators; -}; - -switchboard-with-plugs.override { - useDefaultPlugs = false; - plugs = specialListOfPlugs; -}; - - this could be most useful for testing a particular plug-in in isolation. - -
-
- FAQ - - - - - I have switched from a different desktop and Pantheon’s theming looks messed up. - - - - Open Switchboard and go to: AdministrationAboutRestore Default SettingsRestore Settings. This will reset any dconf settings to their Pantheon defaults. Note this could reset certain GNOME specific preferences if that desktop was used prior. - - - - - - I cannot enable both GNOME and Pantheon. - - - - This is a known issue and there is no known workaround. - - - - - - Does AppCenter work, or is it available? - - - - 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. - - - 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 a6ab3053087c..65b94f61c4ae 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -32,7 +32,7 @@ let inherit (lib) getBin optionalString literalExpression mkRemovedOptionModule mkRenamedOptionModule - mkDefault mkIf mkMerge mkOption types; + mkDefault mkIf mkMerge mkOption mkPackageOptionMD types; ini = pkgs.formats.ini { }; @@ -198,6 +198,11 @@ in example = literalExpression "[ pkgs.plasma5Packages.oxygen ]"; }; + notoPackage = mkPackageOptionMD pkgs "Noto fonts" { + default = [ "noto-fonts" ]; + example = "noto-fonts-lgc-plus"; + }; + # Internally allows configuring kdeglobals globally kdeglobals = mkOption { internal = true; @@ -360,6 +365,7 @@ in pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ ]; optionalPackages = [ + pkgs.aha # needed by kinfocenter for fwupd support plasma-browser-integration konsole oxygen @@ -384,6 +390,11 @@ in ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ] ++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet; + # Extra services for D-Bus activation + services.dbus.packages = [ + plasma5.kactivitymanagerd + ]; + environment.pathsToLink = [ # FIXME: modules should link subdirs of `/share` rather than relying on this "/share" @@ -391,12 +402,23 @@ in environment.etc."X11/xkb".source = xcfg.xkbDir; - environment.sessionVariables.PLASMA_USE_QT_SCALING = mkIf cfg.useQtScaling "1"; + environment.sessionVariables = { + PLASMA_USE_QT_SCALING = mkIf cfg.useQtScaling "1"; + + # Needed for things that depend on other store.kde.org packages to install correctly, + # notably Plasma look-and-feel packages (a.k.a. Global Themes) + # + # FIXME: this is annoyingly impure and should really be fixed at source level somehow, + # but kpackage is a library so we can't just wrap the one thing invoking it and be done. + # This also means things won't work for people not on Plasma, but at least this way it + # works for SOME people. + KPACKAGE_DEP_RESOLVERS_PATH = "${pkgs.plasma5Packages.frameworkintegration.out}/libexec/kf5/kpackagehandlers"; + }; # Enable GTK applications to load SVG icons services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ]; - fonts.fonts = with pkgs; [ noto-fonts hack-font ]; + fonts.fonts = with pkgs; [ cfg.notoPackage hack-font ]; fonts.fontconfig.defaultFonts = { monospace = [ "Hack" "Noto Sans Mono" ]; sansSerif = [ "Noto Sans" ]; @@ -446,6 +468,9 @@ in xdg.portal.enable = true; xdg.portal.extraPortals = [ plasma5.xdg-desktop-portal-kde ]; + # xdg-desktop-portal-kde expects PipeWire to be running. + # This does not, by default, replace PulseAudio. + services.pipewire.enable = mkDefault true; # Update the start menu for each user that is currently logged in system.userActivationScripts.plasmaSetup = activationScript; @@ -537,7 +562,7 @@ in } { # The user interface breaks without pulse - assertion = config.hardware.pulseaudio.enable; + assertion = config.hardware.pulseaudio.enable || (config.services.pipewire.enable && config.services.pipewire.pulse.enable); message = "Plasma Mobile requires pulseaudio."; } ]; @@ -577,6 +602,8 @@ in hardware.bluetooth.enable = true; hardware.pulseaudio.enable = true; networking.networkmanager.enable = true; + # Required for autorotate + hardware.sensor.iio.enable = lib.mkDefault true; # Recommendations can be found here: # - https://invent.kde.org/plasma-mobile/plasma-phone-settings/-/tree/master/etc/xdg diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix index 00fa8af71dc5..4456374cc569 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix @@ -11,6 +11,7 @@ let theme = cfg.theme.package; icons = cfg.iconTheme.package; font = cfg.font.package; + cursors = cfg.cursorTheme.package; slickGreeterConf = writeText "slick-greeter.conf" '' [Greeter] @@ -18,6 +19,8 @@ let theme-name=${cfg.theme.name} icon-theme-name=${cfg.iconTheme.name} font-name=${cfg.font.name} + cursor-theme-name=${cfg.cursorTheme.name} + cursor-theme-size=${toString cfg.cursorTheme.size} draw-user-backgrounds=${boolToString cfg.draw-user-backgrounds} ${cfg.extraConfig} ''; @@ -84,6 +87,33 @@ in }; }; + cursorTheme = { + package = mkOption { + type = types.package; + default = pkgs.gnome.adwaita-icon-theme; + defaultText = literalExpression "pkgs.gnome.adwaita-icon-theme"; + description = lib.mdDoc '' + The package path that contains the cursor theme given in the name option. + ''; + }; + + name = mkOption { + type = types.str; + default = "Adwaita"; + description = lib.mdDoc '' + Name of the cursor theme to use for the lightdm-slick-greeter. + ''; + }; + + size = mkOption { + type = types.int; + default = 24; + description = lib.mdDoc '' + Size of the cursor theme to use for the lightdm-slick-greeter. + ''; + }; + }; + draw-user-backgrounds = mkEnableOption (lib.mdDoc "draw user backgrounds"); extraConfig = mkOption { @@ -107,6 +137,7 @@ in }; environment.systemPackages = [ + cursors icons theme ]; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index f74e8efb8f64..65f414705fc5 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -32,7 +32,7 @@ let usersConf = writeText "users.conf" '' [UserList] - minimum-uid=500 + minimum-uid=1000 hidden-users=${concatStringsSep " " dmcfg.hiddenUsers} hidden-shells=/run/current-system/sw/bin/nologin ''; diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index e86a18ff618e..a3f03d7a19a6 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -123,7 +123,7 @@ in }; }; description = lib.mdDoc '' - Extra settings merged in and overwritting defaults in sddm.conf. + Extra settings merged in and overwriting defaults in sddm.conf. ''; }; diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index 0d30b9b5e68d..f77036360e02 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -171,7 +171,7 @@ let cfg = config.services.xserver.libinput; lib.mdDoc '' Enables or disables drag lock during tapping behavior. When enabled, a finger up during tap- and-drag will not immediately release the button. If the finger is set down again within the - timeout, the draging process continues. + timeout, the dragging process continues. ''; }; diff --git a/nixos/modules/services/x11/imwheel.nix b/nixos/modules/services/x11/imwheel.nix index 03cbdbfb09a4..133e64c65cdd 100644 --- a/nixos/modules/services/x11/imwheel.nix +++ b/nixos/modules/services/x11/imwheel.nix @@ -37,8 +37,8 @@ in Window class translation rules. /etc/X11/imwheelrc is generated based on this config which means this config is global for all users. - See [offical man pages](http://imwheel.sourceforge.net/imwheel.1.html) - for more informations. + See [official man pages](http://imwheel.sourceforge.net/imwheel.1.html) + for more information. ''; }; }; diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix index 56b55709e47f..1d6f3daa4022 100644 --- a/nixos/modules/services/x11/picom.nix +++ b/nixos/modules/services/x11/picom.nix @@ -41,7 +41,7 @@ let in { imports = [ - (mkAliasOptionModule [ "services" "compton" ] [ "services" "picom" ]) + (mkAliasOptionModuleMD [ "services" "compton" ] [ "services" "picom" ]) (mkRemovedOptionModule [ "services" "picom" "refreshRate" ] '' This option corresponds to `refresh-rate`, which has been unused since picom v6 and was subsequently removed by upstream. @@ -199,10 +199,10 @@ in { }; backend = mkOption { - type = types.enum [ "glx" "xrender" "xr_glx_hybrid" ]; + type = types.enum [ "egl" "glx" "xrender" "xr_glx_hybrid" ]; default = "xrender"; description = lib.mdDoc '' - Backend to use: `glx`, `xrender` or `xr_glx_hybrid`. + Backend to use: `egl`, `glx`, `xrender` or `xr_glx_hybrid`. ''; }; diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix index 64109e0c39fd..5bb73cd0bfb1 100644 --- a/nixos/modules/services/x11/window-managers/i3.nix +++ b/nixos/modules/services/x11/window-managers/i3.nix @@ -31,7 +31,6 @@ in type = types.package; default = pkgs.i3; defaultText = literalExpression "pkgs.i3"; - example = literalExpression "pkgs.i3-gaps"; description = lib.mdDoc '' i3 package to use. ''; @@ -73,6 +72,6 @@ in imports = [ (mkRemovedOptionModule [ "services" "xserver" "windowManager" "i3-gaps" "enable" ] - "Use services.xserver.windowManager.i3.enable and set services.xserver.windowManager.i3.package to pkgs.i3-gaps to use i3-gaps.") + "i3-gaps was merged into i3. Use services.xserver.windowManager.i3.enable instead.") ]; } diff --git a/nixos/modules/services/x11/window-managers/katriawm.nix b/nixos/modules/services/x11/window-managers/katriawm.nix new file mode 100644 index 000000000000..9a3fd5f3ca44 --- /dev/null +++ b/nixos/modules/services/x11/window-managers/katriawm.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mdDoc mkEnableOption mkIf mkPackageOptionMD singleton; + cfg = config.services.xserver.windowManager.katriawm; +in +{ + ###### interface + options = { + services.xserver.windowManager.katriawm = { + enable = mkEnableOption (mdDoc "katriawm"); + package = mkPackageOptionMD pkgs "katriawm" {}; + }; + }; + + ###### implementation + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "katriawm"; + start = '' + ${cfg.package}/bin/katriawm & + waitPID=$! + ''; + }; + environment.systemPackages = [ cfg.package ]; + }; +} diff --git a/nixos/modules/services/x11/window-managers/qtile.nix b/nixos/modules/services/x11/window-managers/qtile.nix index 523642591d94..fc27566d49ee 100644 --- a/nixos/modules/services/x11/window-managers/qtile.nix +++ b/nixos/modules/services/x11/window-managers/qtile.nix @@ -10,7 +10,7 @@ in options.services.xserver.windowManager.qtile = { enable = mkEnableOption (lib.mdDoc "qtile"); - package = mkPackageOption pkgs "qtile" { }; + package = mkPackageOptionMD pkgs "qtile" { }; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/xautolock.nix b/nixos/modules/services/x11/xautolock.nix index 8200057660e5..5b8b748a086b 100644 --- a/nixos/modules/services/x11/xautolock.nix +++ b/nixos/modules/services/x11/xautolock.nix @@ -71,7 +71,7 @@ in type = types.nullOr types.str; description = lib.mdDoc '' - The script to use when nothing has happend for as long as {option}`killtime` + The script to use when nothing has happened for as long as {option}`killtime` ''; }; diff --git a/nixos/modules/system/activation/bootspec.cue b/nixos/modules/system/activation/bootspec.cue new file mode 100644 index 000000000000..9f857a1b1cd8 --- /dev/null +++ b/nixos/modules/system/activation/bootspec.cue @@ -0,0 +1,18 @@ +#V1: { + system: string + init: string + initrd?: string + initrdSecrets?: string + kernel: string + kernelParams: [...string] + label: string + toplevel: string + specialisation?: { + [=~"^"]: #V1 + } + extensions?: {...} +} + +Document: { + v1: #V1 +} diff --git a/nixos/modules/system/activation/bootspec.nix b/nixos/modules/system/activation/bootspec.nix new file mode 100644 index 000000000000..1055ed1dda90 --- /dev/null +++ b/nixos/modules/system/activation/bootspec.nix @@ -0,0 +1,126 @@ +# Note that these schemas are defined by RFC-0125. +# This document is considered a stable API, and is depended upon by external tooling. +# Changes to the structure of the document, or the semantics of the values should go through an RFC. +# +# See: https://github.com/NixOS/rfcs/pull/125 +{ config +, pkgs +, lib +, ... +}: +let + cfg = config.boot.bootspec; + children = lib.mapAttrs (childName: childConfig: childConfig.configuration.system.build.toplevel) config.specialisation; + schemas = { + v1 = rec { + filename = "boot.json"; + json = + pkgs.writeText filename + (builtins.toJSON + { + v1 = { + system = config.boot.kernelPackages.stdenv.hostPlatform.system; + kernel = "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}"; + kernelParams = config.boot.kernelParams; + label = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} (Linux ${config.boot.kernelPackages.kernel.modDirVersion})"; + + inherit (cfg) extensions; + } // lib.optionalAttrs config.boot.initrd.enable { + initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}"; + initrdSecrets = "${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets"; + }; + }); + + generator = + let + # NOTE: Be careful to not introduce excess newlines at the end of the + # injectors, as that may affect the pipes and redirects. + + # Inject toplevel and init into the bootspec. + # This can only be done here because we *cannot* depend on $out + # referring to the toplevel, except by living in the toplevel itself. + toplevelInjector = lib.escapeShellArgs [ + "${pkgs.jq}/bin/jq" + '' + .v1.toplevel = $toplevel | + .v1.init = $init + '' + "--sort-keys" + "--arg" "toplevel" "${placeholder "out"}" + "--arg" "init" "${placeholder "out"}/init" + ] + " < ${json}"; + + # We slurp all specialisations and inject them as values, such that + # `.specialisations.${name}` embeds the specialisation's bootspec + # document. + specialisationInjector = + let + specialisationLoader = (lib.mapAttrsToList + (childName: childToplevel: lib.escapeShellArgs [ "--slurpfile" childName "${childToplevel}/${filename}" ]) + children); + in + lib.escapeShellArgs [ + "${pkgs.jq}/bin/jq" + "--sort-keys" + ".v1.specialisation = ($ARGS.named | map_values(. | first | .v1))" + ] + " ${lib.concatStringsSep " " specialisationLoader}"; + in + '' + mkdir -p $out/bootspec + + ${toplevelInjector} | ${specialisationInjector} > $out/${filename} + ''; + + validator = pkgs.writeCueValidator ./bootspec.cue { + document = "Document"; # Universal validator for any version as long the schema is correctly set. + }; + }; + }; +in +{ + options.boot.bootspec = { + enable = lib.mkEnableOption (lib.mdDoc "Enable generation of RFC-0125 bootspec in $system/bootspec, e.g. /run/current-system/bootspec"); + + extensions = lib.mkOption { + type = lib.types.attrsOf lib.types.attrs; # : { ...namespace-specific fields } + default = { }; + description = lib.mdDoc '' + User-defined data that extends the bootspec document. + + To reduce incompatibility and prevent names from clashing + between applications, it is **highly recommended** to use a + unique namespace for your extensions. + ''; + }; + + # This will be run as a part of the `systemBuilder` in ./top-level.nix. This + # means `$out` points to the output of `config.system.build.toplevel` and can + # be used for a variety of things (though, for now, it's only used to report + # the path of the `toplevel` itself and the `init` executable). + writer = lib.mkOption { + internal = true; + default = schemas.v1.generator; + }; + + validator = lib.mkOption { + internal = true; + default = schemas.v1.validator; + }; + + filename = lib.mkOption { + internal = true; + default = schemas.v1.filename; + }; + }; + + config = lib.mkIf (cfg.enable) { + warnings = [ + ''RFC-0125 is not merged yet, this is a feature preview of bootspec. + The schema is not definitive and features are not guaranteed to be stable until RFC-0125 is merged. + See: + - https://github.com/NixOS/nixpkgs/pull/172237 to track merge status in nixpkgs. + - https://github.com/NixOS/rfcs/pull/125 to track RFC status. + '' + ]; + }; +} diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 9a4c635402d1..de6e43dd30d8 100755 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -84,7 +84,7 @@ EOF # This is a NixOS installation if it has /etc/NIXOS or a proper # /etc/os-release. -if (!-f "/etc/NIXOS" && (read_file("/etc/os-release", err_mode => "quiet") // "") !~ /^ID="?nixos"?/msx) { +if (!-f "/etc/NIXOS" && (read_file("/etc/os-release", err_mode => "quiet") // "") !~ /^ID="?@distroId@"?/msx) { die("This is not a NixOS installation!\n"); } diff --git a/nixos/modules/system/activation/test.nix b/nixos/modules/system/activation/test.nix new file mode 100644 index 000000000000..8cf000451c6e --- /dev/null +++ b/nixos/modules/system/activation/test.nix @@ -0,0 +1,27 @@ +{ lib +, nixos +, expect +, testers +}: +let + node-forbiddenDependencies-fail = nixos ({ ... }: { + system.forbiddenDependenciesRegex = "-dev$"; + environment.etc."dev-dependency" = { + text = "${expect.dev}"; + }; + documentation.enable = false; + fileSystems."/".device = "ignore-root-device"; + boot.loader.grub.enable = false; + }); + node-forbiddenDependencies-succeed = nixos ({ ... }: { + system.forbiddenDependenciesRegex = "-dev$"; + system.extraDependencies = [ expect.dev ]; + documentation.enable = false; + fileSystems."/".device = "ignore-root-device"; + boot.loader.grub.enable = false; + }); +in +lib.recurseIntoAttrs { + test-forbiddenDependencies-fail = testers.testBuildFailure node-forbiddenDependencies-fail.config.system.build.toplevel; + test-forbiddenDependencies-succeed = node-forbiddenDependencies-succeed.config.system.build.toplevel; +} diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 55ff98db5382..240e20959175 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -65,6 +65,7 @@ let mkdir $out/bin export localeArchive="${config.i18n.glibcLocales}/lib/locale/locale-archive" + export distroId=${config.system.nixos.distroId}; substituteAll ${./switch-to-configuration.pl} $out/bin/switch-to-configuration chmod +x $out/bin/switch-to-configuration ${optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' @@ -77,7 +78,12 @@ let ${config.system.systemBuilderCommands} - echo -n "${toString config.system.extraDependencies}" > $out/extra-dependencies + echo -n "$extraDependencies" > $out/extra-dependencies + + ${optionalString (!config.boot.isContainer && config.boot.bootspec.enable) '' + ${config.boot.bootspec.writer} + ${config.boot.bootspec.validator} "$out/${config.boot.bootspec.filename}" + ''} ${config.system.extraSystemBuilderCmds} ''; @@ -105,6 +111,8 @@ let dryActivationScript = config.system.dryActivationScript; nixosLabel = config.system.nixos.label; + inherit (config.system) extraDependencies; + # Needed by switch-to-configuration. perl = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp ]); } // config.system.systemBuilderArgs); @@ -223,6 +231,16 @@ in ''; }; + system.forbiddenDependenciesRegex = mkOption { + default = ""; + example = "-dev$"; + type = types.str; + description = lib.mdDoc '' + A POSIX Extended Regular Expression that matches store paths that + should not appear in the system closure, with the exception of {option}`system.extraDependencies`, which is not checked. + ''; + }; + system.extraSystemBuilderCmds = mkOption { type = types.lines; internal = true; @@ -298,8 +316,26 @@ in config.system.copySystemConfiguration ''ln -s '${import ../../../lib/from-env.nix "NIXOS_CONFIG" }' \ "$out/configuration.nix" + '' + + optionalString + (config.system.forbiddenDependenciesRegex != "") + '' + if [[ $forbiddenDependenciesRegex != "" && -n $closureInfo ]]; then + if forbiddenPaths="$(grep -E -- "$forbiddenDependenciesRegex" $closureInfo/store-paths)"; then + echo -e "System closure $out contains the following disallowed paths:\n$forbiddenPaths" + exit 1 + fi + fi ''; + system.systemBuilderArgs = lib.optionalAttrs (config.system.forbiddenDependenciesRegex != "") { + inherit (config.system) forbiddenDependenciesRegex; + closureInfo = pkgs.closureInfo { rootPaths = [ + # override to avoid infinite recursion (and to allow using extraDependencies to add forbidden dependencies) + (config.system.build.toplevel.overrideAttrs (_: { extraDependencies = []; closureInfo = null; })) + ]; }; + }; + system.build.toplevel = system; }; diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index 87e66f73be0e..7f817e5d350d 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: let - inherit (lib) mkOption types optionalString stringAfter; + inherit (lib) mkOption mkDefault types optionalString stringAfter; cfg = config.boot.binfmt; @@ -281,7 +281,7 @@ in { config = { boot.binfmt.registrations = builtins.listToAttrs (map (system: { name = system; - value = let + value = { config, ... }: let interpreter = getEmulator system; qemuArch = getQemuArch system; @@ -292,13 +292,13 @@ in { in if preserveArgvZero then "${wrapper}/bin/${wrapperName}" else interpreter; - in { - inherit preserveArgvZero; + in ({ + preserveArgvZero = mkDefault preserveArgvZero; - interpreter = interpreterReg; - wrapInterpreterInShell = !preserveArgvZero; - interpreterSandboxPath = dirOf (dirOf interpreterReg); - } // (magics.${system} or (throw "Cannot create binfmt registration for system ${system}")); + interpreter = mkDefault interpreterReg; + wrapInterpreterInShell = mkDefault (!config.preserveArgvZero); + interpreterSandboxPath = mkDefault (dirOf (dirOf config.interpreter)); + } // (magics.${system} or (throw "Cannot create binfmt registration for system ${system}"))); }) cfg.emulatedSystems); nix.settings = lib.mkIf (cfg.emulatedSystems != []) { extra-platforms = cfg.emulatedSystems ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "i686-linux"; diff --git a/nixos/modules/system/boot/initrd-openvpn.nix b/nixos/modules/system/boot/initrd-openvpn.nix index b41e7524320e..cbc61d55d6bb 100644 --- a/nixos/modules/system/boot/initrd-openvpn.nix +++ b/nixos/modules/system/boot/initrd-openvpn.nix @@ -68,11 +68,8 @@ in $out/bin/openvpn --show-gateway ''; - # Add `iproute /bin/ip` to the config, to ensure that openvpn - # is able to set the routes boot.initrd.network.postCommands = '' - (cat /etc/initrd.ovpn; echo -e '\niproute /bin/ip') | \ - openvpn /dev/stdin & + openvpn /etc/initrd.ovpn & ''; }; diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 673655f20ee8..701d242abc15 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -73,6 +73,15 @@ in ''; }; + ignoreEmptyHostKeys = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Allow leaving {option}`config.boot.initrd.network.ssh` empty, + to deploy ssh host keys out of band. + ''; + }; + authorizedKeys = mkOption { type = types.listOf types.str; default = config.users.users.root.openssh.authorizedKeys.keys; @@ -141,7 +150,7 @@ in } { - assertion = cfg.hostKeys != []; + assertion = (cfg.hostKeys != []) || cfg.ignoreEmptyHostKeys; message = '' You must now pre-generate the host keys for initrd SSH. See the boot.initrd.network.ssh.hostKeys documentation diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 6783f8ec62ff..8f203b2c8b32 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -62,14 +62,57 @@ in configuration. For instance, if you use the NVIDIA X driver, then it also needs to contain an attribute {var}`nvidia_x11`. + + Please note that we strictly support kernel versions that are + maintained by the Linux developers only. More information on the + availability of kernel versions is documented + [in the Linux section of the manual](https://nixos.org/manual/nixos/unstable/index.html#sec-kernel-config). ''; }; boot.kernelPatches = mkOption { type = types.listOf types.attrs; default = []; - example = literalExpression "[ pkgs.kernelPatches.ubuntu_fan_4_4 ]"; - description = lib.mdDoc "A list of additional patches to apply to the kernel."; + example = literalExpression '' + [ + { + name = "foo"; + patch = ./foo.patch; + extraStructuredConfig.FOO = lib.kernel.yes; + features.foo = true; + } + ] + ''; + description = lib.mdDoc '' + A list of additional patches to apply to the kernel. + + Every item should be an attribute set with the following attributes: + + ```nix + { + name = "foo"; # descriptive name, required + + patch = ./foo.patch; # path or derivation that contains the patch source + # (required, but can be null if only config changes + # are needed) + + extraStructuredConfig = { # attrset of extra configuration parameters + FOO = lib.kernel.yes; # (without the CONFIG_ prefix, optional) + }; # values should generally be lib.kernel.yes, + # lib.kernel.no or lib.kernel.module + + features = { # attrset of extra "features" the kernel is considered to have + foo = true; # (may be checked by other NixOS modules, optional) + }; + + extraConfig = "CONFIG_FOO y"; # extra configuration options in string form + # (deprecated, use extraStructuredConfig instead, optional) + } + ``` + + There's a small set of existing kernel patches in Nixpkgs, available as `pkgs.kernelPatches`, + that follow this format and can be used directly. + ''; }; boot.kernel.randstructSeed = mkOption { diff --git a/nixos/modules/system/boot/loader/external/external.md b/nixos/modules/system/boot/loader/external/external.md new file mode 100644 index 000000000000..4f5b559dfc40 --- /dev/null +++ b/nixos/modules/system/boot/loader/external/external.md @@ -0,0 +1,26 @@ +# External Bootloader Backends {#sec-bootloader-external} + +NixOS has support for several bootloader backends by default: systemd-boot, grub, uboot, etc. +The built-in bootloader backend support is generic and supports most use cases. +Some users may prefer to create advanced workflows around managing the bootloader and bootable entries. + +You can replace the built-in bootloader support with your own tooling using the "external" bootloader option. + +Imagine you have created a new package called FooBoot. +FooBoot provides a program at `${pkgs.fooboot}/bin/fooboot-install` which takes the system closure's path as its only argument and configures the system's bootloader. + +You can enable FooBoot like this: + +```nix +{ pkgs, ... }: { + boot.loader.external = { + enable = true; + installHook = "${pkgs.fooboot}/bin/fooboot-install"; + }; +} +``` + +## Developing Custom Bootloader Backends {#sec-bootloader-external-developing} + +Bootloaders should use [RFC-0125](https://github.com/NixOS/rfcs/pull/125)'s Bootspec format and synthesis tools to identify the key properties for bootable system generations. + diff --git a/nixos/modules/system/boot/loader/external/external.nix b/nixos/modules/system/boot/loader/external/external.nix new file mode 100644 index 000000000000..926cbd2b4b3f --- /dev/null +++ b/nixos/modules/system/boot/loader/external/external.nix @@ -0,0 +1,36 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.boot.loader.external; +in +{ + meta = { + maintainers = with maintainers; [ cole-h grahamc raitobezarius ]; + doc = ./external.md; + }; + + options.boot.loader.external = { + enable = mkEnableOption (lib.mdDoc "use an external tool to install your bootloader"); + + installHook = mkOption { + type = with types; path; + description = lib.mdDoc '' + The full path to a program of your choosing which performs the bootloader installation process. + + The program will be called with an argument pointing to the output of the system's toplevel. + ''; + }; + }; + + config = mkIf cfg.enable { + boot.loader = { + grub.enable = mkDefault false; + systemd-boot.enable = mkDefault false; + supportsInitrdSecrets = mkDefault false; + }; + + system.build.installBootLoader = cfg.installHook; + }; +} diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index a67b10608aa7..121d7e88e74d 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -38,7 +38,7 @@ let grubConfig = args: let efiSysMountPoint = if args.efiSysMountPoint == null then args.path else args.efiSysMountPoint; - efiSysMountPoint' = replaceChars [ "/" ] [ "-" ] efiSysMountPoint; + efiSysMountPoint' = replaceStrings [ "/" ] [ "-" ] efiSysMountPoint; in pkgs.writeText "grub-config.xml" (builtins.toXML { splashImage = f cfg.splashImage; @@ -55,7 +55,7 @@ let grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else ""; bootPath = args.path; storePath = config.boot.loader.grub.storePath; - bootloaderId = if args.efiBootloaderId == null then "NixOS${efiSysMountPoint'}" else args.efiBootloaderId; + bootloaderId = if args.efiBootloaderId == null then "${config.system.nixos.distroName}${efiSysMountPoint'}" else args.efiBootloaderId; timeout = if config.boot.loader.timeout == null then -1 else config.boot.loader.timeout; users = if cfg.users == {} || cfg.version != 1 then cfg.users else throw "GRUB version 1 does not support user accounts."; theme = f cfg.theme; @@ -759,6 +759,7 @@ in src = ./install-grub.pl; utillinux = pkgs.util-linux; btrfsprogs = pkgs.btrfs-progs; + inherit (config.system.nixos) distroName; }; perl = pkgs.perl.withPackages (p: with p; [ FileSlurp FileCopyRecursive diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index d5f019423b64..205f1513fd93 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -442,7 +442,7 @@ sub copyToKernelsDir { } sub addEntry { - my ($name, $path, $options) = @_; + my ($name, $path, $options, $current) = @_; return unless -e "$path/kernel" && -e "$path/initrd"; my $kernel = copyToKernelsDir(Cwd::abs_path("$path/kernel")); @@ -458,7 +458,14 @@ sub addEntry { # Make sure initrd is not world readable (won't work if /boot is FAT) umask 0137; my $initrdSecretsPathTemp = File::Temp::mktemp("$initrdSecretsPath.XXXXXXXX"); - system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secrets: $!\n"; + if (system("$path/append-initrd-secrets", $initrdSecretsPathTemp) != 0) { + if ($current) { + die "failed to create initrd secrets $!\n"; + } else { + say STDERR "warning: failed to create initrd secrets for \"$name\", an older generation"; + say STDERR "note: this is normal after having removed or renamed a file in `boot.initrd.secrets`"; + } + } # Check whether any secrets were actually added if (-e $initrdSecretsPathTemp && ! -z _) { rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place: $!\n"; @@ -491,7 +498,7 @@ sub addEntry { } $conf .= "\n"; } else { - $conf .= "menuentry \"$name\" " . ($options||"") . " {\n"; + $conf .= "menuentry \"$name\" " . $options . " {\n"; if ($saveDefault) { $conf .= " savedefault\n"; } @@ -511,7 +518,7 @@ sub addEntry { # Add default entries. $conf .= "$extraEntries\n" if $extraEntriesBeforeNixOS; -addEntry("NixOS - Default", $defaultConfig, $entryOptions); +addEntry("@distroName@ - Default", $defaultConfig, $entryOptions, 1); $conf .= "$extraEntries\n" unless $extraEntriesBeforeNixOS; @@ -536,7 +543,7 @@ foreach my $link (@links) { my $linkname = basename($link); $entryName = "($linkname - $date - $version)"; } - addEntry("NixOS - $entryName", $link); + addEntry("@distroName@ - $entryName", $link, "", 1); } my $grubBootPath = $grubBoot->path; @@ -568,19 +575,19 @@ sub addProfile { -e "$link/nixos-version" ? readFile("$link/nixos-version") : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]); - addEntry("NixOS - Configuration " . nrFromGen($link) . " ($date - $version)", $link, $subEntryOptions); + addEntry("@distroName@ - Configuration " . nrFromGen($link) . " ($date - $version)", $link, $subEntryOptions, 0); } $conf .= "}\n" if $grubVersion == 2; } -addProfile "/nix/var/nix/profiles/system", "NixOS - All configurations"; +addProfile "/nix/var/nix/profiles/system", "@distroName@ - All configurations"; if ($grubVersion == 2) { for my $profile (glob "/nix/var/nix/profiles/system-profiles/*") { my $name = basename($profile); next unless $name =~ /^\w+$/; - addProfile $profile, "NixOS - Profile '$name'"; + addProfile $profile, "@distroName@ - Profile '$name'"; } } diff --git a/nixos/modules/system/boot/loader/init-script/init-script-builder.sh b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh index bd3fc64999da..755ea259c425 100644 --- a/nixos/modules/system/boot/loader/init-script/init-script-builder.sh +++ b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh @@ -64,13 +64,13 @@ addEntry() { mkdir -p /boot /sbin -addEntry "NixOS - Default" $defaultConfig "" +addEntry "@distroName@ - Default" $defaultConfig "" # Add all generations of the system profile to the menu, in reverse # (most recent to least recent) order. for link in $((ls -d $defaultConfig/specialisation/* ) | sort -n); do date=$(stat --printf="%y\n" $link | sed 's/\..*//') - addEntry "NixOS - variation" $link "" + addEntry "@distroName@ - variation" $link "" done for generation in $( @@ -85,7 +85,7 @@ for generation in $( else suffix="($date)" fi - addEntry "NixOS - Configuration $generation $suffix" $link "$generation ($date)" + addEntry "@distroName@ - Configuration $generation $suffix" $link "$generation ($date)" done mv $tmpOther $targetOther diff --git a/nixos/modules/system/boot/loader/init-script/init-script.nix b/nixos/modules/system/boot/loader/init-script/init-script.nix index 8287131d3213..4d33ed6b665b 100644 --- a/nixos/modules/system/boot/loader/init-script/init-script.nix +++ b/nixos/modules/system/boot/loader/init-script/init-script.nix @@ -8,6 +8,7 @@ let src = ./init-script-builder.sh; isExecutable = true; inherit (pkgs) bash; + inherit (config.system.nixos) distroName; path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; }; 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 old mode 100644 new mode 100755 index 68da20615917..3e3683211f1e --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -16,6 +16,7 @@ import datetime import glob import os.path from typing import NamedTuple, List, Optional +from packaging import version class SystemIdentifier(NamedTuple): profile: Optional[str] @@ -41,7 +42,7 @@ def system_dir(profile: Optional[str], generation: int, specialisation: Optional else: return d -BOOT_ENTRY = """title NixOS{profile}{specialisation} +BOOT_ENTRY = """title {title} version Generation {generation} {description} linux {kernel} initrd {initrd} @@ -98,21 +99,36 @@ def describe_generation(generation_dir: str) -> str: build_time = int(os.path.getctime(generation_dir)) build_date = datetime.datetime.fromtimestamp(build_time).strftime('%F') - description = "NixOS {}, Linux Kernel {}, Built on {}".format( + description = "@distroName@ {}, Linux Kernel {}, Built on {}".format( nixos_version, kernel_version, build_date ) return description -def write_entry(profile: Optional[str], generation: int, specialisation: Optional[str], machine_id: str) -> None: +def write_entry(profile: Optional[str], generation: int, specialisation: Optional[str], + machine_id: str, current: bool) -> None: kernel = copy_from_profile(profile, generation, specialisation, "kernel") initrd = copy_from_profile(profile, generation, specialisation, "initrd") + + title = "@distroName@{profile}{specialisation}".format( + profile=" [" + profile + "]" if profile else "", + specialisation=" (%s)" % specialisation if specialisation else "") + try: append_initrd_secrets = profile_path(profile, generation, specialisation, "append-initrd-secrets") subprocess.check_call([append_initrd_secrets, "@efiSysMountPoint@%s" % (initrd)]) except FileNotFoundError: pass + except subprocess.CalledProcessError: + if current: + print("failed to create initrd secrets!", file=sys.stderr) + sys.exit(1) + else: + print("warning: failed to create initrd secrets " + f'for "{title} - Configuration {generation}", an older generation', file=sys.stderr) + print("note: this is normal after having removed " + "or renamed a file in `boot.initrd.secrets`", file=sys.stderr) entry_file = "@efiSysMountPoint@/loader/entries/%s" % ( generation_conf_filename(profile, generation, specialisation)) generation_dir = os.readlink(system_dir(profile, generation, specialisation)) @@ -122,8 +138,7 @@ def write_entry(profile: Optional[str], generation: int, specialisation: Optiona with open("%s/kernel-params" % (generation_dir)) as params_file: kernel_params = kernel_params + params_file.read() with open(tmp_path, 'w') as f: - f.write(BOOT_ENTRY.format(profile=" [" + profile + "]" if profile else "", - specialisation=" (%s)" % specialisation if specialisation else "", + f.write(BOOT_ENTRY.format(title=title, generation=generation, kernel=kernel, initrd=initrd, @@ -205,8 +220,8 @@ def get_profiles() -> List[str]: return [] def main() -> None: - parser = argparse.ArgumentParser(description='Update NixOS-related systemd-boot files') - parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default NixOS config to boot') + parser = argparse.ArgumentParser(description='Update @distroName@-related systemd-boot files') + parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default @distroName@ config to boot') args = parser.parse_args() try: @@ -227,20 +242,21 @@ def main() -> None: warnings.warn("NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER", DeprecationWarning) os.environ["NIXOS_INSTALL_BOOTLOADER"] = "1" + # flags to pass to bootctl install/update + bootctl_flags = [] + + if "@canTouchEfiVariables@" != "1": + bootctl_flags.append("--no-variables") + + if "@graceful@" == "1": + bootctl_flags.append("--graceful") + if os.getenv("NIXOS_INSTALL_BOOTLOADER") == "1": # bootctl uses fopen() with modes "wxe" and fails if the file exists. if os.path.exists("@efiSysMountPoint@/loader/loader.conf"): os.unlink("@efiSysMountPoint@/loader/loader.conf") - flags = [] - - if "@canTouchEfiVariables@" != "1": - flags.append("--no-variables") - - if "@graceful@" == "1": - flags.append("--graceful") - - subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + flags + ["install"]) + subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + bootctl_flags + ["install"]) else: # Update bootloader to latest if needed available_out = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[2] @@ -258,12 +274,18 @@ def main() -> None: if available_match is None: raise Exception("could not determine systemd-boot version") - installed_version = installed_match.group(1) - available_version = available_match.group(1) + installed_version = version.parse(installed_match.group(1)) + available_version = version.parse(available_match.group(1)) + # systemd 252 has a regression that leaves some machines unbootable, so we skip that update. + # The fix is in 252.2 + # See https://github.com/systemd/systemd/issues/25363 and https://github.com/NixOS/nixpkgs/pull/201558#issuecomment-1348603263 if installed_version < available_version: - print("updating systemd-boot from %s to %s" % (installed_version, available_version)) - subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@", "update"]) + if version.parse('252') <= available_version < version.parse('252.2'): + print("skipping systemd-boot update to %s because of known regression" % available_version) + else: + print("updating systemd-boot from %s to %s" % (installed_version, available_version)) + subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + bootctl_flags + ["update"]) mkdir_p("@efiSysMountPoint@/efi/nixos") mkdir_p("@efiSysMountPoint@/loader/entries") @@ -274,10 +296,11 @@ def main() -> None: remove_old_entries(gens) for gen in gens: try: - write_entry(*gen, machine_id) + is_default = os.readlink(system_dir(*gen)) == args.default_config + write_entry(*gen, machine_id, current=is_default) for specialisation in get_specialisations(*gen): - write_entry(*specialisation, machine_id) - if os.readlink(system_dir(*gen)) == args.default_config: + write_entry(*specialisation, machine_id, current=is_default) + if is_default: write_loader_conf(*gen) except OSError as e: profile = f"profile '{gen.profile}'" if gen.profile else "default profile" diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 8cb7c7b8e47b..757dc080d4b6 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -7,12 +7,14 @@ let efi = config.boot.loader.efi; + python3 = pkgs.python3.withPackages (ps: [ ps.packaging ]); + systemdBootBuilder = pkgs.substituteAll { src = ./systemd-boot-builder.py; isExecutable = true; - inherit (pkgs) python3; + inherit python3; systemd = config.systemd.package; @@ -28,6 +30,8 @@ let inherit (efi) efiSysMountPoint canTouchEfiVariables; + inherit (config.system.nixos) distroName; + memtest86 = if cfg.memtest86.enable then pkgs.memtest86-efi else ""; netbootxyz = if cfg.netbootxyz.enable then pkgs.netbootxyz-efi else ""; @@ -48,7 +52,7 @@ let }; checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" { - nativeBuildInputs = [ pkgs.mypy ]; + nativeBuildInputs = [ pkgs.mypy python3 ]; } '' install -m755 ${systemdBootBuilder} $out mypy \ diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index c8ab3b0d8e4a..d751c4462d3f 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -7,6 +7,9 @@ with lib; ###### interface options = { + boot.modprobeConfig.enable = mkEnableOption (lib.mdDoc "modprobe config. This is useful for systems like containers which do not require a kernel") // { + default = true; + }; boot.blacklistedKernelModules = mkOption { type = types.listOf types.str; @@ -38,7 +41,7 @@ with lib; ###### implementation - config = mkIf (!config.boot.isContainer) { + config = mkIf config.boot.modprobeConfig.enable { environment.etc."modprobe.d/ubuntu.conf".source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 28abf820ec09..188f2f64dc84 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -928,6 +928,8 @@ let type = types.bool; description = lib.mdDoc '' Whether to manage network configuration using {command}`systemd-network`. + + This also enables {option}`systemd.networkd.enable`. ''; }; @@ -1900,6 +1902,20 @@ in }; systemd.network.wait-online = { + enable = mkOption { + type = types.bool; + default = true; + example = false; + description = lib.mdDoc '' + Whether to enable the systemd-networkd-wait-online service. + + systemd-networkd-wait-online can timeout and fail if there are no network interfaces + available for it to manage. When systemd-networkd is enabled but a different service is + responsible for managing the system's internet connection (for example, NetworkManager or + connman are used to manage WiFi connections), this service is unnecessary and can be + disabled. + ''; + }; anyInterface = mkOption { description = lib.mdDoc '' Whether to consider the network online when any interface is online, as opposed to all of them. @@ -1981,6 +1997,7 @@ in }; systemd.services.systemd-networkd-wait-online = { + inherit (cfg.wait-online) enable; wantedBy = [ "network-online.target" ]; serviceConfig.ExecStart = [ "" diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 9b6472fea429..a1ab70938575 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -146,6 +146,9 @@ in systemd.services.systemd-ask-password-plymouth.wantedBy = [ "multi-user.target" ]; systemd.paths.systemd-ask-password-plymouth.wantedBy = [ "multi-user.target" ]; + # Prevent Plymouth taking over the screen during system updates. + systemd.services.plymouth-start.restartIfChanged = false; + boot.initrd.systemd = { extraBin.plymouth = "${plymouth}/bin/plymouth"; # for the recovery shell storePaths = [ diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 4596c160a957..af57310bda7d 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -73,7 +73,7 @@ trap 'fail' 0 # Print a greeting. info -info "<<< NixOS Stage 1 >>>" +info "<<< @distroName@ Stage 1 >>>" info # Make several required directories. @@ -234,8 +234,7 @@ done mkdir -p /lib ln -s @modulesClosure@/lib/modules /lib/modules ln -s @modulesClosure@/lib/firmware /lib/firmware -# see comment in stage-1.nix for explanation -echo @extraUtils@/bin/modprobe-kernel > /proc/sys/kernel/modprobe +echo @extraUtils@/bin/modprobe > /proc/sys/kernel/modprobe for i in @kernelModules@; do info "loading module $(basename $i)..." modprobe $i @@ -422,7 +421,7 @@ lustrateRoot () { local root="$1" echo - echo -e "\e[1;33m<<< NixOS is now lustrating the root filesystem (cruft goes to /old-root) >>>\e[0m" + echo -e "\e[1;33m<<< @distroName@ is now lustrating the root filesystem (cruft goes to /old-root) >>>\e[0m" echo mkdir -m 0755 -p "$root/old-root.tmp" diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 28c76fb169f1..d26ea7597c45 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -90,7 +90,7 @@ let # copy what we need. Instead of using statically linked binaries, # we just copy what we need from Glibc and use patchelf to make it # work. - extraUtils = pkgs.runCommandCC "extra-utils" + extraUtils = pkgs.runCommand "extra-utils" { nativeBuildInputs = [pkgs.buildPackages.nukeReferences]; allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd } @@ -150,26 +150,6 @@ let copy_bin_and_libs ${pkgs.kmod}/bin/kmod ln -sf kmod $out/bin/modprobe - # Dirty hack to make sure the kernel properly loads modules - # such as ext4 on demand (e.g. on a `mount(2)` syscall). This is necessary - # because `kmod` isn't linked against `libpthread.so.0` anymore (since - # it was merged into `libc.so.6` since version `2.34`), but still needs - # to access it for some reason. This is not an issue in stage-1 itself - # because of the `LD_LIBRARY_PATH`-variable and anytime later because the rpath of - # kmod/modprobe points to glibc's `$out/lib` where `libpthread.so.6` exists. - # However, this is a problem when the kernel calls `modprobe` inside - # the initial ramdisk because it doesn't know about the - # `LD_LIBRARY_PATH` and the rpath was nuked. - # - # Also, we can't use `makeWrapper` here because `kmod` only does - # `modprobe` functionality if `argv[0] == "modprobe"`. - cat >$out/bin/modprobe-kernel <>>\e[0m" + echo -e "\e[1;32m<<< @distroName@ Stage 2 >>>\e[0m" echo @@ -68,7 +68,7 @@ fi # like squashfs. chown -f 0:30000 /nix/store chmod -f 1775 /nix/store -if [ -n "@readOnlyStore@" ]; then +if [ -n "@readOnlyNixStore@" ]; then if ! [[ "$(findmnt --noheadings --output OPTIONS /nix/store)" =~ ro(,|$) ]]; then if [ -z "$container" ]; then mount --bind /nix/store /nix/store diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix index 6b4193ea2967..001380158d5f 100644 --- a/nixos/modules/system/boot/stage-2.nix +++ b/nixos/modules/system/boot/stage-2.nix @@ -10,9 +10,9 @@ let src = ./stage-2-init.sh; shellDebug = "${pkgs.bashInteractive}/bin/bash"; shell = "${pkgs.bash}/bin/bash"; - inherit (config.boot) systemdExecutable extraSystemdUnitPaths; + inherit (config.boot) readOnlyNixStore systemdExecutable extraSystemdUnitPaths; + inherit (config.system.nixos) distroName; isExecutable = true; - inherit (config.nix) readOnlyStore; inherit useHostResolvConf; inherit (config.system.build) earlyMountScript; path = lib.makeBinPath ([ @@ -42,6 +42,17 @@ in ''; }; + readOnlyNixStore = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + If set, NixOS will enforce the immutability of the Nix store + by making {file}`/nix/store` a read-only bind + mount. Nix will automatically make the store writable when + needed. + ''; + }; + systemdExecutable = mkOption { default = "/run/current-system/systemd/lib/systemd/systemd"; type = types.str; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 8f1086c9c539..679a663362b6 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -450,7 +450,7 @@ in (mkAfter [ "systemd" ]) ]); group = (mkMerge [ - (mkAfter [ "systemd" ]) + (mkAfter [ "[success=merge] systemd" ]) # need merge so that NSS won't stop at file-based groups ]); }; @@ -612,6 +612,10 @@ in boot.kernelParams = optional (!cfg.enableUnifiedCgroupHierarchy) "systemd.unified_cgroup_hierarchy=0"; + # Avoid potentially degraded system state due to + # "Userspace Out-Of-Memory (OOM) Killer was skipped because of a failed condition check (ConditionControlGroupController=v2)." + systemd.services.systemd-oomd.enable = mkIf (!cfg.enableUnifiedCgroupHierarchy) false; + services.logrotate.settings = { "/var/log/btmp" = mapAttrs (_: mkDefault) { frequency = "monthly"; diff --git a/nixos/modules/system/boot/systemd/coredump.nix b/nixos/modules/system/boot/systemd/coredump.nix index c2ca973d3807..03ef00e5683c 100644 --- a/nixos/modules/system/boot/systemd/coredump.nix +++ b/nixos/modules/system/boot/systemd/coredump.nix @@ -44,7 +44,21 @@ in { ''; # install provided sysctl snippets - "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf"; + "sysctl.d/50-coredump.conf".source = + # Fix systemd-coredump error caused by truncation of `kernel.core_pattern` + # when the `systemd` derivation name is too long. This works by substituting + # the path to `systemd` with a symlink that has a constant-length path. + # + # See: https://github.com/NixOS/nixpkgs/issues/213408 + pkgs.substitute { + src = "${systemd}/example/sysctl.d/50-coredump.conf"; + replacements = [ + "--replace" + "${systemd}" + "${pkgs.symlinkJoin { name = "systemd"; paths = [ systemd ]; }}" + ]; + }; + "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf"; }; diff --git a/nixos/modules/system/boot/systemd/homed.nix b/nixos/modules/system/boot/systemd/homed.nix new file mode 100644 index 000000000000..403d1690124d --- /dev/null +++ b/nixos/modules/system/boot/systemd/homed.nix @@ -0,0 +1,43 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.homed; +in +{ + options.services.homed.enable = lib.mkEnableOption (lib.mdDoc '' + Enable systemd home area/user account manager + ''); + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = config.services.nscd.enable; + message = "systemd-homed requires the use of systemd nss module. services.nscd.enable must be set to true,"; + } + ]; + + systemd.additionalUpstreamSystemUnits = [ + "systemd-homed.service" + "systemd-homed-activate.service" + ]; + + # This is mentioned in homed's [Install] section. + # + # While homed appears to work without it, it's probably better + # to follow upstream recommendations. + services.userdbd.enable = lib.mkDefault true; + + systemd.services = { + systemd-homed = { + # These packages are required to manage encrypted volumes + path = config.system.fsPackages; + aliases = [ "dbus-org.freedesktop.home1.service" ]; + wantedBy = [ "multi-user.target" ]; + }; + + systemd-homed-activate = { + wantedBy = [ "systemd-homed.service" ]; + }; + }; + }; +} diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 31702499b0f1..620d76aef20d 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -142,12 +142,22 @@ in { ''; }; - package = (mkPackageOption pkgs "systemd" { + package = (mkPackageOptionMD pkgs "systemd" { default = "systemdStage1"; }) // { visible = false; }; + extraConfig = mkOption { + default = ""; + type = types.lines; + example = "DefaultLimitCORE=infinity"; + description = lib.mdDoc '' + Extra config options for systemd. See systemd-system.conf(5) man page + for available options. + ''; + }; + contents = mkOption { description = lib.mdDoc "Set of files that have to be linked into the initrd"; example = literalExpression '' @@ -333,9 +343,11 @@ in { system.build = { inherit initialRamdisk; }; boot.initrd.availableKernelModules = [ - "autofs4" # systemd needs this for some features - "tpm-tis" "tpm-crb" # systemd-cryptenroll - ]; + # systemd needs this for some features + "autofs4" + # systemd-cryptenroll + "tpm-tis" + ] ++ lib.optional (pkgs.stdenv.hostPlatform.system != "riscv64-linux") "tpm-crb"; boot.initrd.systemd = { initrdBin = [pkgs.bash pkgs.coreutils cfg.package.kmod cfg.package] ++ config.system.fsPackages; @@ -352,6 +364,7 @@ in { "/etc/systemd/system.conf".text = '' [Manager] DefaultEnvironment=PATH=/bin:/sbin ${optionalString (isBool cfg.emergencyAccess && cfg.emergencyAccess) "SYSTEMD_SULOGIN_FORCE=1"} + ${cfg.extraConfig} ''; "/lib/modules".source = "${modulesClosure}/lib/modules"; diff --git a/nixos/modules/system/boot/systemd/user.nix b/nixos/modules/system/boot/systemd/user.nix index 46d66fe4e688..92e1b087392d 100644 --- a/nixos/modules/system/boot/systemd/user.nix +++ b/nixos/modules/system/boot/systemd/user.nix @@ -39,6 +39,20 @@ let "timers.target" "xdg-desktop-autostart.target" ] ++ config.systemd.additionalUpstreamUserUnits; + + writeTmpfiles = { rules, user ? null }: + let + suffix = if user == null then "" else "-${user}"; + in + pkgs.writeTextFile { + name = "nixos-user-tmpfiles.d${suffix}"; + destination = "/etc/xdg/user-tmpfiles.d/00-nixos${suffix}.conf"; + text = '' + # This file is created automatically and should not be modified. + # Please change the options ‘systemd.user.tmpfiles’ instead. + ${concatStringsSep "\n" rules} + ''; + }; in { options = { systemd.user.extraConfig = mkOption { @@ -46,7 +60,7 @@ in { type = types.lines; example = "DefaultCPUAccounting=yes"; description = lib.mdDoc '' - Extra config options for systemd user instances. See man systemd-user.conf for + Extra config options for systemd user instances. See {manpage}`systemd-user.conf(5)` for available options. ''; }; @@ -93,6 +107,43 @@ in { description = lib.mdDoc "Definition of systemd per-user timer units."; }; + systemd.user.tmpfiles = { + rules = mkOption { + type = types.listOf types.str; + default = []; + example = [ "D %C - - - 7d" ]; + description = lib.mdDoc '' + Global user rules for creation, deletion and cleaning of volatile and + temporary files automatically. See + {manpage}`tmpfiles.d(5)` + for the exact format. + ''; + }; + + users = mkOption { + description = mdDoc '' + Per-user rules for creation, deletion and cleaning of volatile and + temporary files automatically. + ''; + default = {}; + type = types.attrsOf (types.submodule { + options = { + rules = mkOption { + type = types.listOf types.str; + default = []; + example = [ "D %C - - - 7d" ]; + description = mdDoc '' + Per-user rules for creation, deletion and cleaning of volatile and + temporary files automatically. See + {manpage}`tmpfiles.d(5)` + for the exact format. + ''; + }; + }; + }); + }; + }; + systemd.additionalUpstreamUserUnits = mkOption { default = []; type = types.listOf types.str; @@ -154,5 +205,30 @@ in { # Some overrides to upstream units. systemd.services."user@".restartIfChanged = false; systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions. + + # enable systemd user tmpfiles + systemd.user.services.systemd-tmpfiles-setup.wantedBy = + optional + (cfg.tmpfiles.rules != [] || any (cfg': cfg'.rules != []) (attrValues cfg.tmpfiles.users)) + "basic.target"; + + # /run/current-system/sw/etc/xdg is in systemd's $XDG_CONFIG_DIRS so we can + # write the tmpfiles.d rules for everyone there + environment.systemPackages = + optional + (cfg.tmpfiles.rules != []) + (writeTmpfiles { inherit (cfg.tmpfiles) rules; }); + + # /etc/profiles/per-user/$USER/etc/xdg is in systemd's $XDG_CONFIG_DIRS so + # we can write a single user's tmpfiles.d rules there + users.users = + mapAttrs + (user: cfg': { + packages = optional (cfg'.rules != []) (writeTmpfiles { + inherit (cfg') rules; + inherit user; + }); + }) + cfg.tmpfiles.users; }; } diff --git a/nixos/modules/system/boot/systemd/userdbd.nix b/nixos/modules/system/boot/systemd/userdbd.nix new file mode 100644 index 000000000000..994aa3ca3b8c --- /dev/null +++ b/nixos/modules/system/boot/systemd/userdbd.nix @@ -0,0 +1,18 @@ +{ config, lib, ... }: + +let + cfg = config.services.userdbd; +in +{ + options.services.userdbd.enable = lib.mkEnableOption (lib.mdDoc '' + Enables the systemd JSON user/group record lookup service + ''); + config = lib.mkIf cfg.enable { + systemd.additionalUpstreamSystemUnits = [ + "systemd-userdbd.socket" + "systemd-userdbd.service" + ]; + + systemd.sockets.systemd-userdbd.wantedBy = [ "sockets.target" ]; + }; +} diff --git a/nixos/modules/system/etc/setup-etc.pl b/nixos/modules/system/etc/setup-etc.pl index a048261a3df1..ea0a38308172 100644 --- a/nixos/modules/system/etc/setup-etc.pl +++ b/nixos/modules/system/etc/setup-etc.pl @@ -13,8 +13,12 @@ sub atomicSymlink { my $tmp = "$target.tmp"; unlink $tmp; symlink $source, $tmp or return 0; - rename $tmp, $target or return 0; - return 1; + if (rename $tmp, $target) { + return 1; + } else { + unlink $tmp; + return 0; + } } @@ -87,6 +91,12 @@ my @copied; sub link { my $fn = substr $File::Find::name, length($etc) + 1 or next; + + # nixos-enter sets up /etc/resolv.conf as a bind mount, so skip it. + if ($fn eq "resolv.conf" and $ENV{'IN_NIXOS_ENTER'}) { + return; + } + my $target = "/etc/$fn"; File::Path::make_path(dirname $target); $created{$fn} = 1; @@ -103,7 +113,7 @@ sub link { if (-e "$_.mode") { my $mode = read_file("$_.mode"); chomp $mode; if ($mode eq "direct-symlink") { - atomicSymlink readlink("$static/$fn"), $target or warn; + atomicSymlink readlink("$static/$fn"), $target or warn "could not create symlink $target"; } else { my $uid = read_file("$_.uid"); chomp $uid; my $gid = read_file("$_.gid"); chomp $gid; @@ -112,12 +122,15 @@ sub link { $gid = getgrnam $gid unless $gid =~ /^\+/; chown int($uid), int($gid), "$target.tmp" or warn; chmod oct($mode), "$target.tmp" or warn; - rename "$target.tmp", $target or warn; + unless (rename "$target.tmp", $target) { + warn "could not create target $target"; + unlink "$target.tmp"; + } } push @copied, $fn; print CLEAN "$fn\n"; } elsif (-l "$_") { - atomicSymlink "$static/$fn", $target or warn; + atomicSymlink "$static/$fn", $target or warn "could not create symlink $target"; } } diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 7ab8f8dc676c..7f2c8a41b20a 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -33,7 +33,7 @@ let mountPoint = mkOption { example = "/mnt/usb"; type = nonEmptyWithoutTrailingSlash; - description = lib.mdDoc "Location of the mounted the file system."; + description = lib.mdDoc "Location of the mounted file system."; }; device = mkOption { @@ -54,7 +54,7 @@ let default = [ "defaults" ]; example = [ "data=journal" ]; description = lib.mdDoc "Options used to mount the file system."; - type = types.listOf nonEmptyStr; + type = types.nonEmptyListOf nonEmptyStr; }; depends = mkOption { diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index ac41ba5f93a4..e3ad52a7b056 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -42,7 +42,11 @@ in { config = mkIf (elem "bcachefs" config.boot.supportedFilesystems) (mkMerge [ { - system.fsPackages = [ pkgs.bcachefs-tools ]; + # We do not want to include bachefs in the fsPackages for systemd-initrd + # because we provide the unwrapped version of mount.bcachefs + # through the extraBin option, which will make it available for use. + system.fsPackages = lib.optional (!config.boot.initrd.systemd.enable) pkgs.bcachefs-tools; + environment.systemPackages = lib.optional (config.boot.initrd.systemd.enable) pkgs.bcachefs-tools; # use kernel package with bcachefs support until it's in mainline boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs; @@ -52,7 +56,14 @@ in # chacha20 and poly1305 are required only for decryption attempts boot.initrd.availableKernelModules = [ "bcachefs" "sha256" "chacha20" "poly1305" ]; - boot.initrd.extraUtilsCommands = '' + boot.initrd.systemd.extraBin = { + "bcachefs" = "${pkgs.bcachefs-tools}/bin/bcachefs"; + "mount.bcachefs" = pkgs.runCommand "mount.bcachefs" {} '' + cp -pdv ${pkgs.bcachefs-tools}/bin/.mount.bcachefs.sh-wrapped $out + ''; + }; + + boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs ''; boot.initrd.extraUtilsCommandsTest = '' diff --git a/nixos/modules/tasks/filesystems/envfs.nix b/nixos/modules/tasks/filesystems/envfs.nix new file mode 100644 index 000000000000..450b805f0f58 --- /dev/null +++ b/nixos/modules/tasks/filesystems/envfs.nix @@ -0,0 +1,51 @@ +{ pkgs, config, lib, ... }: + +let + cfg = config.services.envfs; + mounts = { + "/usr/bin" = { + device = "none"; + fsType = "envfs"; + options = [ + "fallback-path=${pkgs.runCommand "fallback-path" {} '' + mkdir -p $out + ln -s ${pkgs.coreutils}/bin/env $out/env + ln -s ${config.system.build.binsh}/bin/sh $out/sh + ''}" + ]; + }; + "/bin" = { + device = "/usr/bin"; + fsType = "none"; + options = [ "bind" ]; + }; + }; +in { + options = { + services.envfs = { + enable = lib.mkEnableOption (lib.mdDoc "Envfs filesystem") // { + description = lib.mdDoc '' + Fuse filesystem that returns symlinks to executables based on the PATH + of the requesting process. This is useful to execute shebangs on NixOS + that assume hard coded locations in locations like /bin or /usr/bin + etc. + ''; + }; + package = lib.mkOption { + type = lib.types.package; + description = lib.mdDoc "Which package to use for the envfs."; + default = pkgs.envfs; + defaultText = lib.literalExpression "pkgs.envfs"; + }; + }; + }; + config = lib.mkIf (cfg.enable) { + environment.systemPackages = [ cfg.package ]; + # we also want these mounts in virtual machines. + fileSystems = if config.virtualisation ? qemu then lib.mkVMOverride mounts else mounts; + + # We no longer need those when using envfs + system.activationScripts.usrbinenv = lib.mkForce ""; + system.activationScripts.binsh = lib.mkForce ""; + }; +} diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 4b4f4cc801ab..6c7759647517 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -97,10 +97,15 @@ let in map (x: "${mountPoint x}.mount") (getPoolFilesystems pool); - getKeyLocations = pool: - if isBool cfgZfs.requestEncryptionCredentials - then "${cfgZfs.package}/sbin/zfs list -rHo name,keylocation,keystatus ${pool}" - else "${cfgZfs.package}/sbin/zfs list -Ho name,keylocation,keystatus ${toString (filter (x: datasetToPool x == pool) cfgZfs.requestEncryptionCredentials)}"; + getKeyLocations = pool: if isBool cfgZfs.requestEncryptionCredentials then { + hasKeys = cfgZfs.requestEncryptionCredentials; + command = "${cfgZfs.package}/sbin/zfs list -rHo name,keylocation,keystatus ${pool}"; + } else let + keys = filter (x: datasetToPool x == pool) cfgZfs.requestEncryptionCredentials; + in { + hasKeys = keys != []; + command = "${cfgZfs.package}/sbin/zfs list -Ho name,keylocation,keystatus ${toString keys}"; + }; createImportService = { pool, systemd, force, prefix ? "" }: nameValuePair "zfs-import-${pool}" { @@ -124,7 +129,9 @@ let RemainAfterExit = true; }; environment.ZFS_FORCE = optionalString force "-f"; - script = (importLib { + script = let + keyLocations = getKeyLocations pool; + in (importLib { # See comments at importLib definition. zpoolCmd = "${cfgZfs.package}/sbin/zpool"; awkCmd = "${pkgs.gawk}/bin/awk"; @@ -139,10 +146,8 @@ let done poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool. if poolImported "${pool}"; then - ${optionalString (if isBool cfgZfs.requestEncryptionCredentials - then cfgZfs.requestEncryptionCredentials - else cfgZfs.requestEncryptionCredentials != []) '' - ${getKeyLocations pool} | while IFS=$'\t' read ds kl ks; do + ${optionalString keyLocations.hasKeys '' + ${keyLocations.command} | while IFS=$'\t' read ds kl ks; do { if [[ "$ks" != unavailable ]]; then continue @@ -503,6 +508,10 @@ in assertion = !cfgZfs.forceImportAll || cfgZfs.forceImportRoot; message = "If you enable boot.zfs.forceImportAll, you must also enable boot.zfs.forceImportRoot"; } + { + assertion = cfgZfs.allowHibernation -> !cfgZfs.forceImportRoot && !cfgZfs.forceImportAll; + message = "boot.zfs.allowHibernation while force importing is enabled will cause data corruption"; + } ]; boot = { @@ -561,7 +570,7 @@ in '' else concatMapStrings (fs: '' zfs load-key -- ${escapeShellArg fs} - '') cfgZfs.requestEncryptionCredentials} + '') (filter (x: datasetToPool x == pool) cfgZfs.requestEncryptionCredentials)} '') rootPools)); # Systemd in stage 1 diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix index 760133fafa29..a14f26c02e48 100644 --- a/nixos/modules/tasks/lvm.nix +++ b/nixos/modules/tasks/lvm.nix @@ -5,6 +5,10 @@ let cfg = config.services.lvm; in { options.services.lvm = { + enable = mkEnableOption (lib.mdDoc "lvm2") // { + default = true; + }; + package = mkOption { type = types.package; default = pkgs.lvm2; @@ -30,7 +34,7 @@ in { # minimal configuration file to make lvmconfig/lvm2-activation-generator happy environment.etc."lvm/lvm.conf".text = "config {}"; }) - (mkIf (!config.boot.isContainer) { + (mkIf cfg.enable { systemd.tmpfiles.packages = [ cfg.package.out ]; environment.systemPackages = [ cfg.package ]; systemd.packages = [ cfg.package ]; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index b7a4282f9727..954d7ffba71d 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -434,7 +434,8 @@ in options = { networking.hostName = mkOption { - default = "nixos"; + default = config.system.nixos.distroId; + defaultText = literalExpression "config.system.nixos.distroId"; # Only allow hostnames without the domain name part (i.e. no FQDNs, see # e.g. "man 5 hostname") and require valid DNS labels (recommended # syntax). Note: We also allow underscores for compatibility/legacy @@ -1377,12 +1378,12 @@ in # networkmanager falls back to "/proc/sys/net/ipv6/conf/default/use_tempaddr" "net.ipv6.conf.default.use_tempaddr" = tempaddrValues.${cfg.tempAddresses}.sysctl; } // listToAttrs (forEach interfaces - (i: nameValuePair "net.ipv4.conf.${replaceChars ["."] ["/"] i.name}.proxy_arp" i.proxyARP)) + (i: nameValuePair "net.ipv4.conf.${replaceStrings ["."] ["/"] i.name}.proxy_arp" i.proxyARP)) // listToAttrs (forEach interfaces (i: let opt = i.tempAddress; val = tempaddrValues.${opt}.sysctl; - in nameValuePair "net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr" val)); + in nameValuePair "net.ipv6.conf.${replaceStrings ["."] ["/"] i.name}.use_tempaddr" val)); security.wrappers = { ping = { @@ -1411,9 +1412,10 @@ in # Set the host and domain names in the activation script. Don't # clear it if it's not configured in the NixOS configuration, # since it may have been set by dhcpcd in the meantime. - system.activationScripts.hostname = - optionalString (cfg.hostName != "") '' - hostname "${cfg.hostName}" + system.activationScripts.hostname = let + effectiveHostname = config.boot.kernel.sysctl."kernel.hostname" or cfg.hostName; + in optionalString (effectiveHostname != "") '' + hostname "${effectiveHostname}" ''; system.activationScripts.domain = optionalString (cfg.domain != null) '' @@ -1494,7 +1496,7 @@ in in '' # override to ${msg} for ${i.name} - ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr=${val}" + ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.${replaceStrings ["."] ["/"] i.name}.use_tempaddr=${val}" '') (filter (i: i.tempAddress != cfg.tempAddresses) interfaces); }) ] ++ lib.optional (cfg.wlanInterfaces != {}) diff --git a/nixos/modules/testing/minimal-kernel.nix b/nixos/modules/testing/minimal-kernel.nix deleted file mode 100644 index 7c2b9c05cf9a..000000000000 --- a/nixos/modules/testing/minimal-kernel.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, pkgs, lib, ... }: - -let - configfile = builtins.storePath (builtins.toFile "config" (lib.concatStringsSep "\n" - (map (builtins.getAttr "configLine") config.system.requiredKernelConfig)) - ); - - origKernel = pkgs.buildLinux { - inherit (pkgs.linux) src version stdenv; - inherit configfile; - allowImportFromDerivation = true; - kernelPatches = [ pkgs.kernelPatches.cifs_timeout_2_6_38 ]; - }; - - kernel = origKernel // (derivation (origKernel.drvAttrs // { - configurePhase = '' - runHook preConfigure - mkdir ../build - make $makeFlags "''${makeFlagsArray[@]}" mrproper - make $makeFlags "''${makeFlagsArray[@]}" KCONFIG_ALLCONFIG=${configfile} allnoconfig - runHook postConfigure - ''; - })); - - kernelPackages = pkgs.linuxPackagesFor kernel; -in { - boot.kernelPackages = kernelPackages; -} diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 4ab2578eb81e..028099c64643 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -96,6 +96,12 @@ in MaxLevelConsole=debug ''; + boot.initrd.systemd.contents."/etc/systemd/journald.conf".text = '' + [Journal] + ForwardToConsole=yes + MaxLevelConsole=debug + ''; + systemd.extraConfig = '' # Don't clobber the console with duplicate systemd messages. ShowStatus=no @@ -107,6 +113,8 @@ in DefaultTimeoutStartSec=300 ''; + boot.initrd.systemd.extraConfig = config.systemd.extraConfig; + boot.consoleLogLevel = 7; # Prevent tests from accessing the Internet. diff --git a/nixos/modules/virtualisation/amazon-ec2-amis.nix b/nixos/modules/virtualisation/amazon-ec2-amis.nix index 0324c5332cff..446a1b0ecaab 100644 --- a/nixos/modules/virtualisation/amazon-ec2-amis.nix +++ b/nixos/modules/virtualisation/amazon-ec2-amis.nix @@ -488,5 +488,53 @@ let self = { "22.05".us-west-1.aarch64-linux.hvm-ebs = "ami-0f96be48071c13ab2"; "22.05".us-west-2.aarch64-linux.hvm-ebs = "ami-084bc5d777585adfb"; - latest = self."22.05"; + # 22.11.466.596a8e828c5 + + "22.11".eu-west-1.x86_64-linux.hvm-ebs = "ami-01aafe08a4e74bd9a"; + "22.11".af-south-1.x86_64-linux.hvm-ebs = "ami-0d937fc7bf7b8c2ed"; + "22.11".ap-east-1.x86_64-linux.hvm-ebs = "ami-020e59f6affef2732"; + "22.11".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-04a7bd7a969506a87"; + "22.11".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-007b9209171e2dcdd"; + "22.11".ap-northeast-3.x86_64-linux.hvm-ebs = "ami-0c4d0b584cd570584"; + "22.11".ap-south-1.x86_64-linux.hvm-ebs = "ami-02aa47f84c215d593"; + "22.11".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-067a7fca4a01c4dda"; + "22.11".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-0638db75ba113c635"; + "22.11".ap-southeast-3.x86_64-linux.hvm-ebs = "ami-08dcda749c59e8747"; + "22.11".ca-central-1.x86_64-linux.hvm-ebs = "ami-09b007688e369f794"; + "22.11".eu-central-1.x86_64-linux.hvm-ebs = "ami-05df1b211df600977"; + "22.11".eu-north-1.x86_64-linux.hvm-ebs = "ami-0427d0897b928e191"; + "22.11".eu-south-1.x86_64-linux.hvm-ebs = "ami-051beda489f0dd109"; + "22.11".eu-west-2.x86_64-linux.hvm-ebs = "ami-0c2090b73fc610ac3"; + "22.11".eu-west-3.x86_64-linux.hvm-ebs = "ami-0d03a150cf6c07022"; + "22.11".me-south-1.x86_64-linux.hvm-ebs = "ami-0443b1af94bff9e3d"; + "22.11".sa-east-1.x86_64-linux.hvm-ebs = "ami-07b2ce95ba17b6bc1"; + "22.11".us-east-1.x86_64-linux.hvm-ebs = "ami-0508167db03652cc4"; + "22.11".us-east-2.x86_64-linux.hvm-ebs = "ami-0e41ac272a7d67029"; + "22.11".us-west-1.x86_64-linux.hvm-ebs = "ami-02f3fb062ee9af563"; + "22.11".us-west-2.x86_64-linux.hvm-ebs = "ami-06b260b3a958948a0"; + + "22.11".eu-west-1.aarch64-linux.hvm-ebs = "ami-0c4132540cabbc7df"; + "22.11".af-south-1.aarch64-linux.hvm-ebs = "ami-0f12780247b337357"; + "22.11".ap-east-1.aarch64-linux.hvm-ebs = "ami-04789617e858da6fb"; + "22.11".ap-northeast-1.aarch64-linux.hvm-ebs = "ami-0f4d8517ab163b274"; + "22.11".ap-northeast-2.aarch64-linux.hvm-ebs = "ami-051a06893bcc696c1"; + "22.11".ap-northeast-3.aarch64-linux.hvm-ebs = "ami-05a086610680a7d8b"; + "22.11".ap-south-1.aarch64-linux.hvm-ebs = "ami-04cd79197824124cd"; + "22.11".ap-southeast-1.aarch64-linux.hvm-ebs = "ami-0437f330961467257"; + "22.11".ap-southeast-2.aarch64-linux.hvm-ebs = "ami-000c2ecbc430c36d7"; + "22.11".ap-southeast-3.aarch64-linux.hvm-ebs = "ami-062e917296b5087c0"; + "22.11".ca-central-1.aarch64-linux.hvm-ebs = "ami-0c91995b735d1b8b6"; + "22.11".eu-central-1.aarch64-linux.hvm-ebs = "ami-0537d704b177a676b"; + "22.11".eu-north-1.aarch64-linux.hvm-ebs = "ami-05f1f532f90d8e16c"; + "22.11".eu-south-1.aarch64-linux.hvm-ebs = "ami-097fe290eafff61ad"; + "22.11".eu-west-2.aarch64-linux.hvm-ebs = "ami-053b6cc7a3394891a"; + "22.11".eu-west-3.aarch64-linux.hvm-ebs = "ami-0a5b6d023afde63c3"; + "22.11".me-south-1.aarch64-linux.hvm-ebs = "ami-024fcb01f8638ed08"; + "22.11".sa-east-1.aarch64-linux.hvm-ebs = "ami-06d72c6e930037236"; + "22.11".us-east-1.aarch64-linux.hvm-ebs = "ami-0b33ffb684d6b07b5"; + "22.11".us-east-2.aarch64-linux.hvm-ebs = "ami-033ff64078c59f378"; + "22.11".us-west-1.aarch64-linux.hvm-ebs = "ami-052d52b9e30a18562"; + "22.11".us-west-2.aarch64-linux.hvm-ebs = "ami-07418b6a4782c9521"; + + latest = self."22.11"; }; in self diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 12fe6fa44479..aa44f2642697 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -10,11 +10,6 @@ with lib; let cfg = config.ec2; - metadataFetcher = import ./ec2-metadata-fetcher.nix { - inherit (pkgs) curl; - targetRoot = "$targetRoot/"; - wgetExtraOptions = "-q"; - }; in { @@ -30,19 +25,9 @@ in config = { - assertions = [ - { assertion = cfg.hvm; - message = "Paravirtualized EC2 instances are no longer supported."; - } - { assertion = cfg.efi -> cfg.hvm; - message = "EC2 instances using EFI must be HVM instances."; - } - { assertion = versionOlder config.boot.kernelPackages.kernel.version "5.17"; - message = "ENA driver fails to build with kernel >= 5.17"; - } - ]; + assertions = [ ]; - boot.growPartition = cfg.hvm; + boot.growPartition = true; fileSystems."/" = mkIf (!cfg.zfs.enable) { device = "/dev/disk/by-label/nixos"; @@ -64,9 +49,9 @@ in boot.extraModulePackages = [ config.boot.kernelPackages.ena ]; - boot.initrd.kernelModules = [ "xen-blkfront" "xen-netfront" ]; - boot.initrd.availableKernelModules = [ "ixgbevf" "ena" "nvme" ]; - boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0,115200n8" "random.trust_cpu=on" ]; + boot.initrd.kernelModules = [ "xen-blkfront" ]; + boot.initrd.availableKernelModules = [ "nvme" ]; + boot.kernelParams = [ "console=ttyS0,115200n8" "random.trust_cpu=on" ]; # Prevent the nouveau kernel module from being loaded, as it # interferes with the nvidia/nvidia-uvm modules needed for CUDA. @@ -74,10 +59,7 @@ in # boot. boot.blacklistedKernelModules = [ "nouveau" "xen_fbfront" ]; - # Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd. - boot.loader.grub.version = if cfg.hvm then 2 else 1; - boot.loader.grub.device = if (cfg.hvm && !cfg.efi) then "/dev/xvda" else "nodev"; - boot.loader.grub.extraPerEntryConfig = mkIf (!cfg.hvm) "root (hd0)"; + boot.loader.grub.device = if cfg.efi then "nodev" else "/dev/xvda"; boot.loader.grub.efiSupport = cfg.efi; boot.loader.grub.efiInstallAsRemovable = cfg.efi; boot.loader.timeout = 1; @@ -87,72 +69,19 @@ in terminal_input console serial ''; - boot.initrd.network.enable = true; - - # Mount all formatted ephemeral disks and activate all swap devices. - # We cannot do this with the ‘fileSystems’ and ‘swapDevices’ options - # because the set of devices is dependent on the instance type - # (e.g. "m1.small" has one ephemeral filesystem and one swap device, - # while "m1.large" has two ephemeral filesystems and no swap - # devices). Also, put /tmp and /var on /disk0, since it has a lot - # more space than the root device. Similarly, "move" /nix to /disk0 - # by layering a unionfs-fuse mount on top of it so we have a lot more space for - # Nix operations. - boot.initrd.postMountCommands = - '' - ${metadataFetcher} - - diskNr=0 - diskForUnionfs= - for device in /dev/xvd[abcde]*; do - if [ "$device" = /dev/xvda -o "$device" = /dev/xvda1 ]; then continue; fi - fsType=$(blkid -o value -s TYPE "$device" || true) - if [ "$fsType" = swap ]; then - echo "activating swap device $device..." - swapon "$device" || true - elif [ "$fsType" = ext3 ]; then - mp="/disk$diskNr" - diskNr=$((diskNr + 1)) - if mountFS "$device" "$mp" "" ext3; then - if [ -z "$diskForUnionfs" ]; then diskForUnionfs="$mp"; fi - fi - else - echo "skipping unknown device type $device" - fi - done - - if [ -n "$diskForUnionfs" ]; then - mkdir -m 755 -p $targetRoot/$diskForUnionfs/root - - mkdir -m 1777 -p $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp - mount --bind $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp - - if [ "$(cat "$metaDir/ami-manifest-path")" != "(unknown)" ]; then - mkdir -m 755 -p $targetRoot/$diskForUnionfs/root/var $targetRoot/var - mount --bind $targetRoot/$diskForUnionfs/root/var $targetRoot/var - - mkdir -p /unionfs-chroot/ro-nix - mount --rbind $targetRoot/nix /unionfs-chroot/ro-nix - - mkdir -m 755 -p $targetRoot/$diskForUnionfs/root/nix - mkdir -p /unionfs-chroot/rw-nix - mount --rbind $targetRoot/$diskForUnionfs/root/nix /unionfs-chroot/rw-nix - - unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-nix=RW:/ro-nix=RO $targetRoot/nix - fi - fi - ''; - - boot.initrd.extraUtilsCommands = - '' - # We need swapon in the initrd. - copy_bin_and_libs ${pkgs.util-linux}/sbin/swapon - ''; + systemd.services.fetch-ec2-metadata = { + wantedBy = [ "multi-user.target" ]; + after = ["network-online.target"]; + path = [ pkgs.curl ]; + script = builtins.readFile ./ec2-metadata-fetcher.sh; + serviceConfig.Type = "oneshot"; + serviceConfig.StandardOutput = "journal+console"; + }; # Allow root logins only using the SSH key that the user specified # at instance creation time. services.openssh.enable = true; - services.openssh.permitRootLogin = "prohibit-password"; + services.openssh.settings.PermitRootLogin = "prohibit-password"; # Enable the serial console on ttyS0 systemd.services."serial-getty@ttyS0".enable = true; @@ -166,8 +95,6 @@ in # Always include cryptsetup so that Charon can use it. environment.systemPackages = [ pkgs.cryptsetup ]; - boot.initrd.supportedFilesystems = [ "unionfs-fuse" ]; - # EC2 has its own NTP server provided by the hypervisor networking.timeServers = [ "169.254.169.123" ]; diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix index 227f3e433c10..3ea4a6cf7818 100644 --- a/nixos/modules/virtualisation/amazon-options.nix +++ b/nixos/modules/virtualisation/amazon-options.nix @@ -28,26 +28,19 @@ in { options = { mount = lib.mkOption { description = lib.mdDoc "Where to mount this dataset."; - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; }; properties = lib.mkOption { description = lib.mdDoc "Properties to set on this dataset."; - type = types.attrsOf types.string; + type = types.attrsOf types.str; default = {}; }; }; }); }; }; - hvm = lib.mkOption { - default = lib.versionAtLeast config.system.stateVersion "17.03"; - internal = true; - description = lib.mdDoc '' - Whether the EC2 instance is a HVM instance. - ''; - }; efi = lib.mkOption { default = pkgs.stdenv.hostPlatform.isAarch64; defaultText = literalExpression "pkgs.stdenv.hostPlatform.isAarch64"; @@ -56,6 +49,12 @@ in { Whether the EC2 instance is using EFI. ''; }; + hvm = lib.mkOption { + description = "Unused legacy option. While support for non-hvm has been dropped, we keep this option around so that NixOps remains compatible with a somewhat recent `nixpkgs` and machines with an old `stateVersion`."; + internal = true; + default = true; + readOnly = true; + }; }; }; diff --git a/nixos/modules/virtualisation/appvm.nix b/nixos/modules/virtualisation/appvm.nix index b23b321095cf..9fe2995d37a0 100644 --- a/nixos/modules/virtualisation/appvm.nix +++ b/nixos/modules/virtualisation/appvm.nix @@ -20,7 +20,7 @@ in { user = mkOption { type = types.str; description = lib.mdDoc '' - AppVM user login. Currenly only AppVMs are supported for a single user only. + AppVM user login. Currently only AppVMs are supported for a single user only. ''; }; }; diff --git a/nixos/modules/virtualisation/azure-agent-entropy.patch b/nixos/modules/virtualisation/azure-agent-entropy.patch deleted file mode 100644 index 2a7ad08a4afc..000000000000 --- a/nixos/modules/virtualisation/azure-agent-entropy.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/waagent 2016-03-12 09:58:15.728088851 +0200 -+++ a/waagent 2016-03-12 09:58:43.572680025 +0200 -@@ -6173,10 +6173,10 @@ - Log("MAC address: " + ":".join(["%02X" % Ord(a) for a in mac])) - - # Consume Entropy in ACPI table provided by Hyper-V -- try: -- SetFileContents("/dev/random", GetFileContents("/sys/firmware/acpi/tables/OEM0")) -- except: -- pass -+ #try: -+ # SetFileContents("/dev/random", GetFileContents("/sys/firmware/acpi/tables/OEM0")) -+ #except: -+ # pass - - Log("Probing for Azure environment.") - self.Endpoint = self.DoDhcpWork() diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix index abe6455a1a69..6e6021cf80fe 100644 --- a/nixos/modules/virtualisation/azure-agent.nix +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -1,51 +1,10 @@ { config, lib, pkgs, ... }: with lib; - let cfg = config.virtualisation.azure.agent; - waagent = with pkgs; stdenv.mkDerivation rec { - name = "waagent-2.0"; - src = pkgs.fetchFromGitHub { - owner = "Azure"; - repo = "WALinuxAgent"; - rev = "1b3a8407a95344d9d12a2a377f64140975f1e8e4"; - sha256 = "10byzvmpgrmr4d5mdn2kq04aapqb3sgr1admk13wjmy5cd6bwd2x"; - }; - - patches = [ ./azure-agent-entropy.patch ]; - - nativeBuildInputs = [ makeWrapper python pythonPackages.wrapPython ]; - runtimeDeps = [ findutils gnugrep gawk coreutils openssl openssh - nettools # for hostname - procps # for pidof - shadow # for useradd, usermod - util-linux # for (u)mount, fdisk, sfdisk, mkswap - parted - ]; - pythonPath = [ pythonPackages.pyasn1 ]; - - configurePhase = false; - buildPhase = false; - - installPhase = '' - substituteInPlace config/99-azure-product-uuid.rules \ - --replace /bin/chmod "${coreutils}/bin/chmod" - mkdir -p $out/lib/udev/rules.d - cp config/*.rules $out/lib/udev/rules.d - - mkdir -p $out/bin - cp waagent $out/bin/ - chmod +x $out/bin/waagent - - wrapProgram "$out/bin/waagent" \ - --prefix PYTHONPATH : $PYTHONPATH \ - --prefix PATH : "${makeBinPath runtimeDeps}" - ''; - }; - provisionedHook = pkgs.writeScript "provisioned-hook" '' #!${pkgs.runtimeShell} /run/current-system/systemd/bin/systemctl start provisioned.target @@ -74,14 +33,15 @@ in ###### implementation - config = mkIf cfg.enable { - assertions = [ { + config = lib.mkIf cfg.enable { + assertions = [{ assertion = pkgs.stdenv.hostPlatform.isx86; message = "Azure not currently supported on ${pkgs.stdenv.hostPlatform.system}"; - } { - assertion = config.networking.networkmanager.enable == false; - message = "Windows Azure Linux Agent is not compatible with NetworkManager"; - } ]; + } + { + assertion = config.networking.networkmanager.enable == false; + message = "Windows Azure Linux Agent is not compatible with NetworkManager"; + }]; boot.initrd.kernelModules = [ "ata_piix" ]; networking.firewall.allowedUDPPorts = [ 68 ]; @@ -89,13 +49,19 @@ in environment.etc."waagent.conf".text = '' # - # Windows Azure Linux Agent Configuration + # Microsoft Azure Linux Agent Configuration # - Role.StateConsumer=${provisionedHook} + # Enable extension handling. Do not disable this unless you do not need password reset, + # backup, monitoring, or any extension handling whatsoever. + Extensions.Enabled=y - # Enable instance creation - Provisioning.Enabled=y + # How often (in seconds) to poll for new goal states + Extensions.GoalStatePeriod=6 + + # Which provisioning agent to use. Supported values are "auto" (default), "waagent", + # "cloud-init", or "disabled". + Provisioning.Agent=disabled # Password authentication for root account will be unavailable. Provisioning.DeleteRootPassword=n @@ -103,18 +69,31 @@ in # Generate fresh host key pair. Provisioning.RegenerateSshHostKeyPair=n - # Supported values are "rsa", "dsa" and "ecdsa". + # Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto". + # The "auto" option is supported on OpenSSH 5.9 (2011) and later. Provisioning.SshHostKeyPairType=ed25519 # Monitor host name changes and publish changes via DHCP requests. Provisioning.MonitorHostName=y + # How often (in seconds) to monitor host name changes. + Provisioning.MonitorHostNamePeriod=30 + # Decode CustomData from Base64. Provisioning.DecodeCustomData=n # Execute CustomData after provisioning. Provisioning.ExecuteCustomData=n + # Algorithm used by crypt when generating password hash. + #Provisioning.PasswordCryptId=6 + + # Length of random salt used when generating password hash. + #Provisioning.PasswordCryptSaltLength=10 + + # Allow reset password of sys user + Provisioning.AllowResetSysUser=n + # Format if unformatted. If 'n', resource disk will not be mounted. ResourceDisk.Format=${if cfg.mountResourceDisk then "y" else "n"} @@ -125,22 +104,103 @@ in # Mount point for the resource disk ResourceDisk.MountPoint=/mnt/resource - # Respond to load balancer probes if requested by Windows Azure. - LBProbeResponder=y + # Create and use swapfile on resource disk. + ResourceDisk.EnableSwap=n - # Enable logging to serial console (y|n) - # When stdout is not enough... - # 'y' if not set - Logs.Console=y + # Size of the swapfile. + ResourceDisk.SwapSizeMB=0 + + # Comma-separated list of mount options. See mount(8) for valid options. + ResourceDisk.MountOptions=None # Enable verbose logging (y|n) Logs.Verbose=${if cfg.verboseLogging then "y" else "n"} + # Enable Console logging, default is y + # Logs.Console=y + + # Enable periodic log collection, default is n + Logs.Collect=n + + # How frequently to collect logs, default is each hour + Logs.CollectPeriod=3600 + + # Is FIPS enabled + OS.EnableFIPS=n + # Root device timeout in seconds. OS.RootDeviceScsiTimeout=300 + + # How often (in seconds) to set the root device timeout. + OS.RootDeviceScsiTimeoutPeriod=30 + + # If "None", the system default version is used. + OS.OpensslPath=${pkgs.openssl_3.bin}/bin/openssl + + # Set the SSH ClientAliveInterval + # OS.SshClientAliveInterval=180 + + # Set the path to SSH keys and configuration files + OS.SshDir=/etc/ssh + + # If set, agent will use proxy server to access internet + #HttpProxy.Host=None + #HttpProxy.Port=None + + # Detect Scvmm environment, default is n + # DetectScvmmEnv=n + + # + # Lib.Dir=/var/lib/waagent + + # + # DVD.MountPoint=/mnt/cdrom/secure + + # + # Pid.File=/var/run/waagent.pid + + # + # Extension.LogDir=/var/log/azure + + # + # Home.Dir=/home + + # Enable RDMA management and set up, should only be used in HPC images + OS.EnableRDMA=n + + # Enable checking RDMA driver version and update + # OS.CheckRdmaDriver=y + + # Enable or disable goal state processing auto-update, default is enabled + AutoUpdate.Enabled=n + + # Determine the update family, this should not be changed + # AutoUpdate.GAFamily=Prod + + # Determine if the overprovisioning feature is enabled. If yes, hold extension + # handling until inVMArtifactsProfile.OnHold is false. + # Default is enabled + EnableOverProvisioning=n + + # Allow fallback to HTTP if HTTPS is unavailable + # Note: Allowing HTTP (vs. HTTPS) may cause security risks + # OS.AllowHTTP=n + + # Add firewall rules to protect access to Azure host node services + OS.EnableFirewall=n + + # How often (in seconds) to check the firewall rules + OS.EnableFirewallPeriod=30 + + # How often (in seconds) to remove the udev rules for persistent network interface + # names (75-persistent-net-generator.rules and /etc/udev/rules.d/70-persistent-net.rules) + OS.RemovePersistentNetRulesPeriod=30 + + # How often (in seconds) to monitor for DHCP client restarts + OS.MonitorDhcpClientRestartPeriod=30 ''; - services.udev.packages = [ waagent ]; + services.udev.packages = [ pkgs.waagent ]; networking.dhcpcd.persistent = true; @@ -157,23 +217,24 @@ in description = "Services Requiring Azure VM provisioning to have finished"; }; - systemd.services.consume-hypervisor-entropy = - { description = "Consume entropy in ACPI table provided by Hyper-V"; + systemd.services.consume-hypervisor-entropy = + { + description = "Consume entropy in ACPI table provided by Hyper-V"; - wantedBy = [ "sshd.service" "waagent.service" ]; - before = [ "sshd.service" "waagent.service" ]; + wantedBy = [ "sshd.service" "waagent.service" ]; + before = [ "sshd.service" "waagent.service" ]; - path = [ pkgs.coreutils ]; - script = - '' - echo "Fetching entropy..." - cat /sys/firmware/acpi/tables/OEM0 > /dev/random - ''; - serviceConfig.Type = "oneshot"; - serviceConfig.RemainAfterExit = true; - serviceConfig.StandardError = "journal+console"; - serviceConfig.StandardOutput = "journal+console"; - }; + path = [ pkgs.coreutils ]; + script = + '' + echo "Fetching entropy..." + cat /sys/firmware/acpi/tables/OEM0 > /dev/random + ''; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + serviceConfig.StandardError = "journal+console"; + serviceConfig.StandardOutput = "journal+console"; + }; systemd.services.waagent = { wantedBy = [ "multi-user.target" ]; @@ -184,11 +245,10 @@ in description = "Windows Azure Agent Service"; unitConfig.ConditionPathExists = "/etc/waagent.conf"; serviceConfig = { - ExecStart = "${waagent}/bin/waagent -daemon"; + ExecStart = "${pkgs.waagent}/bin/waagent -daemon"; Type = "simple"; }; }; }; - } diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix index dc7853b95032..f29d368137ae 100644 --- a/nixos/modules/virtualisation/azure-common.nix +++ b/nixos/modules/virtualisation/azure-common.nix @@ -30,10 +30,8 @@ with lib; # Allow root logins only using the SSH key that the user specified # at instance creation time, ping client connections to avoid timeouts services.openssh.enable = true; - services.openssh.permitRootLogin = "prohibit-password"; - services.openssh.extraConfig = '' - ClientAliveInterval 180 - ''; + services.openssh.settings.PermitRootLogin = "prohibit-password"; + services.openssh.settings.ClientAliveInterval = 180; # Force getting the hostname from Azure networking.hostName = mkDefault ""; diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix index 9641b693f184..15f8fd6d8f7d 100644 --- a/nixos/modules/virtualisation/brightbox-image.nix +++ b/nixos/modules/virtualisation/brightbox-image.nix @@ -103,7 +103,7 @@ in # Allow root logins only using the SSH key that the user specified # at instance creation time. services.openssh.enable = true; - services.openssh.permitRootLogin = "prohibit-password"; + services.openssh.settings.PermitRootLogin = "prohibit-password"; # Force getting the hostname from Google Compute. networking.hostName = mkDefault ""; diff --git a/nixos/modules/virtualisation/cloudstack-config.nix b/nixos/modules/virtualisation/cloudstack-config.nix index 78afebdc5dd3..7df3c9c613b4 100644 --- a/nixos/modules/virtualisation/cloudstack-config.nix +++ b/nixos/modules/virtualisation/cloudstack-config.nix @@ -21,7 +21,7 @@ with lib; # Allow root logins services.openssh = { enable = true; - permitRootLogin = "prohibit-password"; + settings.PermitRootLogin = "prohibit-password"; }; # Cloud-init configuration. diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix index 09a2d9de040a..2460ec45e3fc 100644 --- a/nixos/modules/virtualisation/container-config.nix +++ b/nixos/modules/virtualisation/container-config.nix @@ -8,7 +8,9 @@ with lib; # Disable some features that are not useful in a container. + # containers don't have a kernel boot.kernel.enable = false; + boot.modprobeConfig.enable = false; console.enable = mkDefault false; @@ -24,6 +26,9 @@ with lib; # containers do not need to setup devices services.udev.enable = false; + # containers normally do not need to manage logical volumes + services.lvm.enable = lib.mkDefault false; + # Shut up warnings about not having a boot loader. system.build.installBootLoader = lib.mkDefault "${pkgs.coreutils}/bin/true"; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index fb9c19d79c13..3e33cabf2660 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, utils, ... }: +{ config, lib, pkgs, ... }: let cfg = config.virtualisation.containers; @@ -136,7 +136,7 @@ in environment.etc."containers/policy.json".source = if cfg.policy != { } then pkgs.writeText "policy.json" (builtins.toJSON cfg.policy) - else utils.copyFile "${pkgs.skopeo.src}/default-policy.json"; + else "${pkgs.skopeo.policy}/default-policy.json"; }; } diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 95ce1fea58bb..3503a6fff6a9 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, utils, ... }: +{ config, lib, pkgs, ... }: with lib; let @@ -93,7 +93,7 @@ in config = mkIf cfg.enable { environment.systemPackages = [ cfg.package pkgs.cri-tools ]; - environment.etc."crictl.yaml".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml"; + environment.etc."crictl.yaml".source = "${cfg.package}/etc/crictl.yaml"; virtualisation.cri-o.settings.crio = { storage_driver = cfg.storageDriver; @@ -124,8 +124,8 @@ in }; }; - environment.etc."cni/net.d/10-crio-bridge.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf"; - environment.etc."cni/net.d/99-loopback.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf"; + environment.etc."cni/net.d/10-crio-bridge.conflist".source = "${cfg.package}/etc/cni/net.d/10-crio-bridge.conflist"; + environment.etc."cni/net.d/99-loopback.conflist".source = "${cfg.package}/etc/cni/net.d/99-loopback.conflist"; environment.etc."crio/crio.conf.d/00-default.conf".source = cfgFile; # Enable common /etc/containers configuration diff --git a/nixos/modules/virtualisation/digital-ocean-config.nix b/nixos/modules/virtualisation/digital-ocean-config.nix index 754bc1a51857..e004b7880aad 100644 --- a/nixos/modules/virtualisation/digital-ocean-config.nix +++ b/nixos/modules/virtualisation/digital-ocean-config.nix @@ -49,7 +49,7 @@ with lib; }; services.openssh = { enable = mkDefault true; - passwordAuthentication = mkDefault false; + settings.PasswordAuthentication = mkDefault false; }; services.do-agent.enable = mkDefault true; networking = { diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix index 1b764e7e4d80..0cc6d9938e22 100644 --- a/nixos/modules/virtualisation/ec2-data.nix +++ b/nixos/modules/virtualisation/ec2-data.nix @@ -18,6 +18,7 @@ with lib; wantedBy = [ "multi-user.target" "sshd.service" ]; before = [ "sshd.service" ]; + after = ["fetch-ec2-metadata.service"]; path = [ pkgs.iproute2 ]; diff --git a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix deleted file mode 100644 index 760f024f33fb..000000000000 --- a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ curl, targetRoot, wgetExtraOptions }: -# Note: be very cautious about dependencies, each dependency grows -# the closure of the initrd. Ideally we would not even require curl, -# but there is no reasonable way to send an HTTP PUT request without -# it. Note: do not be fooled: the wget referenced in this script -# is busybox's wget, not the fully featured one with --method support. -# -# Make sure that every package you depend on here is already listed as -# a channel blocker for both the full-sized and small channels. -# Otherwise, we risk breaking user deploys in released channels. -# -# Also note: OpenStack's metadata service for its instances aims to be -# compatible with the EC2 IMDS. Where possible, try to keep the set of -# fetched metadata in sync with ./openstack-metadata-fetcher.nix . -'' - metaDir=${targetRoot}etc/ec2-metadata - mkdir -m 0755 -p "$metaDir" - rm -f "$metaDir/*" - - get_imds_token() { - # retry-delay of 1 selected to give the system a second to get going, - # but not add a lot to the bootup time - ${curl}/bin/curl \ - -v \ - --retry 3 \ - --retry-delay 1 \ - --fail \ - -X PUT \ - --connect-timeout 1 \ - -H "X-aws-ec2-metadata-token-ttl-seconds: 600" \ - http://169.254.169.254/latest/api/token - } - - preflight_imds_token() { - # retry-delay of 1 selected to give the system a second to get going, - # but not add a lot to the bootup time - ${curl}/bin/curl \ - -v \ - --retry 3 \ - --retry-delay 1 \ - --fail \ - --connect-timeout 1 \ - -H "X-aws-ec2-metadata-token: $IMDS_TOKEN" \ - http://169.254.169.254/1.0/meta-data/instance-id - } - - try=1 - while [ $try -le 3 ]; do - echo "(attempt $try/3) getting an EC2 instance metadata service v2 token..." - IMDS_TOKEN=$(get_imds_token) && break - try=$((try + 1)) - sleep 1 - done - - if [ "x$IMDS_TOKEN" == "x" ]; then - echo "failed to fetch an IMDS2v token." - fi - - try=1 - while [ $try -le 10 ]; do - echo "(attempt $try/10) validating the EC2 instance metadata service v2 token..." - preflight_imds_token && break - try=$((try + 1)) - sleep 1 - done - - echo "getting EC2 instance metadata..." - - wget_imds() { - wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" "$@"; - } - - 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) - 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/ec2-metadata-fetcher.sh b/nixos/modules/virtualisation/ec2-metadata-fetcher.sh new file mode 100644 index 000000000000..9e204d45dbd8 --- /dev/null +++ b/nixos/modules/virtualisation/ec2-metadata-fetcher.sh @@ -0,0 +1,67 @@ +metaDir=/etc/ec2-metadata +mkdir -m 0755 -p "$metaDir" +rm -f "$metaDir/*" + +get_imds_token() { + # retry-delay of 1 selected to give the system a second to get going, + # but not add a lot to the bootup time + curl \ + --silent \ + --show-error \ + --retry 3 \ + --retry-delay 1 \ + --fail \ + -X PUT \ + --connect-timeout 1 \ + -H "X-aws-ec2-metadata-token-ttl-seconds: 600" \ + http://169.254.169.254/latest/api/token +} + +preflight_imds_token() { + # retry-delay of 1 selected to give the system a second to get going, + # but not add a lot to the bootup time + curl \ + --silent \ + --show-error \ + --retry 3 \ + --retry-delay 1 \ + --fail \ + --connect-timeout 1 \ + -H "X-aws-ec2-metadata-token: $IMDS_TOKEN" \ + -o /dev/null \ + http://169.254.169.254/1.0/meta-data/instance-id +} + +try=1 +while [ $try -le 3 ]; do + echo "(attempt $try/3) getting an EC2 instance metadata service v2 token..." + IMDS_TOKEN=$(get_imds_token) && break + try=$((try + 1)) + sleep 1 +done + +if [ "x$IMDS_TOKEN" == "x" ]; then + echo "failed to fetch an IMDS2v token." +fi + +try=1 +while [ $try -le 10 ]; do + echo "(attempt $try/10) validating the EC2 instance metadata service v2 token..." + preflight_imds_token && break + try=$((try + 1)) + sleep 1 +done + +echo "getting EC2 instance metadata..." + +get_imds() { + # Intentionally no --fail here, so that we proceed even if e.g. a + # 404 was returned (but we still fail if we can't reach the IMDS + # server). + curl --silent --show-error --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" "$@" +} + +get_imds -o "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path +(umask 077 && get_imds -o "$metaDir/user-data" http://169.254.169.254/1.0/user-data) +get_imds -o "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname +get_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/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix index 44d2a589511f..0bed0dc933e3 100644 --- a/nixos/modules/virtualisation/google-compute-config.nix +++ b/nixos/modules/virtualisation/google-compute-config.nix @@ -29,8 +29,8 @@ with lib; # Allow root logins only using SSH keys # and disable password authentication in general services.openssh.enable = true; - services.openssh.permitRootLogin = "prohibit-password"; - services.openssh.passwordAuthentication = mkDefault false; + services.openssh.settings.PermitRootLogin = "prohibit-password"; + services.openssh.settings.PasswordAuthentication = mkDefault false; # enable OS Login. This also requires setting enable-oslogin=TRUE metadata on # instance or project level diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixos/modules/virtualisation/hyperv-guest.nix index 7c73e32be695..cba4f92abe82 100644 --- a/nixos/modules/virtualisation/hyperv-guest.nix +++ b/nixos/modules/virtualisation/hyperv-guest.nix @@ -56,8 +56,6 @@ in { systemd = { packages = [ config.boot.kernelPackages.hyperv-daemons.lib ]; - services.hv-vss.unitConfig.ConditionPathExists = [ "/dev/vmbus/hv_vss" ]; - targets.hyperv-daemons = { wantedBy = [ "multi-user.target" ]; }; diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 3b30bc8c4165..7c95405ed318 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -220,6 +220,17 @@ in ''; }; + parallelShutdown = mkOption { + type = types.ints.unsigned; + default = 0; + description = lib.mdDoc '' + Number of guests that will be shutdown concurrently, taking effect when onShutdown + is set to "shutdown". If set to 0, guests will be shutdown one after another. + Number of guests on shutdown at any time will not exceed number set in this + variable. + ''; + }; + allowedBridges = mkOption { type = types.listOf types.str; default = [ "virbr0" ]; @@ -373,6 +384,7 @@ in environment.ON_BOOT = "${cfg.onBoot}"; environment.ON_SHUTDOWN = "${cfg.onShutdown}"; + environment.PARALLEL_SHUTDOWN = "${toString cfg.parallelShutdown}"; }; systemd.sockets.virtlogd = { diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index f05f04baa35d..96b749102241 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -51,8 +51,8 @@ in { imports = [ ../installer/cd-dvd/channel.nix - ../profiles/minimal.nix ../profiles/clone-config.nix + ../profiles/minimal.nix ]; options = { @@ -88,6 +88,16 @@ in }; ''; }; + + privilegedContainer = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether this LXC container will be running as a privileged container or not. If set to `true` then + additional configuration will be applied to the `systemd` instance running within the container as + recommended by [distrobuilder](https://linuxcontainers.org/distrobuilder/introduction/). + ''; + }; }; }; @@ -113,8 +123,8 @@ in architecture = builtins.elemAt (builtins.match "^([a-z0-9_]+).+" (toString pkgs.system)) 0; creation_date = 1; properties = { - description = "NixOS ${config.system.nixos.codeName} ${config.system.nixos.label} ${pkgs.system}"; - os = "nixos"; + description = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} ${pkgs.system}"; + os = "${config.system.nixos.distroId}"; release = "${config.system.nixos.codeName}"; }; templates = templates.properties; @@ -140,18 +150,43 @@ in source = config.system.build.toplevel + "/init"; target = "/sbin/init"; } + # Technically this is not required for lxc, but having also make this configuration work with systemd-nspawn. + # Nixos will setup the same symlink after start. + { + source = config.system.build.toplevel + "/etc/os-release"; + target = "/etc/os-release"; + } ]; extraCommands = "mkdir -p proc sys dev"; }; # Add the overrides from lxd distrobuilder - systemd.extraConfig = '' - [Service] - ProtectProc=default - ProtectControlGroups=no - ProtectKernelTunables=no - ''; + # https://github.com/lxc/distrobuilder/blob/05978d0d5a72718154f1525c7d043e090ba7c3e0/distrobuilder/main.go#L630 + systemd.packages = [ + (pkgs.writeTextFile { + name = "systemd-lxc-service-overrides"; + destination = "/etc/systemd/system/service.d/zzz-lxc-service.conf"; + text = '' + [Service] + ProcSubset=all + ProtectProc=default + ProtectControlGroups=no + ProtectKernelTunables=no + NoNewPrivileges=no + LoadCredential= + '' + optionalString cfg.privilegedContainer '' + # Additional settings for privileged containers + ProtectHome=no + ProtectSystem=no + PrivateDevices=no + PrivateTmp=no + ProtectKernelLogs=no + ProtectKernelModules=no + ReadWritePaths= + ''; + }) + ]; # Allow the user to login as root without password. users.users.root.initialHashedPassword = mkOverride 150 ""; @@ -170,5 +205,11 @@ in # Containers should be light-weight, so start sshd on demand. services.openssh.enable = mkDefault true; services.openssh.startWhenNeeded = mkDefault true; + + # As this is intended as a standalone image, undo some of the minimal profile stuff + environment.noXlibs = false; + documentation.enable = true; + documentation.nixos.enable = true; + services.logrotate.enable = true; }; } diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 764bb5e3b40e..c06716e5eb60 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -129,11 +129,19 @@ in { description = "LXD Container Management Daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target" "lxcfs.service" ]; - requires = [ "network-online.target" "lxd.socket" "lxcfs.service" ]; + after = [ + "network-online.target" + (mkIf config.virtualisation.lxc.lxcfs.enable "lxcfs.service") + ]; + requires = [ + "network-online.target" + "lxd.socket" + (mkIf config.virtualisation.lxc.lxcfs.enable "lxcfs.service") + ]; documentation = [ "man:lxd(1)" ]; - path = optional cfg.zfsSupport config.boot.zfs.package; + path = [ pkgs.util-linux ] + ++ optional cfg.zfsSupport config.boot.zfs.package; serviceConfig = { ExecStart = "@${cfg.package}/bin/lxd lxd --group lxd"; diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index 61066c3cbd75..a9f4ab77f866 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -230,7 +230,10 @@ let escapedName = escapeShellArg name; in { wantedBy = [] ++ optional (container.autoStart) "multi-user.target"; - after = lib.optionals (cfg.backend == "docker") [ "docker.service" "docker.socket" ] ++ dependsOn; + after = lib.optionals (cfg.backend == "docker") [ "docker.service" "docker.socket" ] + # if imageFile is not set, the service needs the network to download the image from the registry + ++ lib.optionals (container.imageFile == null) [ "network-online.target" ] + ++ dependsOn; requires = dependsOn; environment = proxy_env; diff --git a/nixos/modules/virtualisation/openstack-config.nix b/nixos/modules/virtualisation/openstack-config.nix index af4f57466109..0ef7a3b50106 100644 --- a/nixos/modules/virtualisation/openstack-config.nix +++ b/nixos/modules/virtualisation/openstack-config.nix @@ -59,8 +59,8 @@ in # Allow root logins services.openssh = { enable = true; - permitRootLogin = "prohibit-password"; - passwordAuthentication = mkDefault false; + settings.PermitRootLogin = "prohibit-password"; + settings.PasswordAuthentication = mkDefault false; }; users.users.root.initialPassword = "foobar"; diff --git a/nixos/modules/virtualisation/openstack-options.nix b/nixos/modules/virtualisation/openstack-options.nix index c71b581b02ca..52f45de92ecb 100644 --- a/nixos/modules/virtualisation/openstack-options.nix +++ b/nixos/modules/virtualisation/openstack-options.nix @@ -29,13 +29,13 @@ in options = { mount = lib.mkOption { description = lib.mdDoc "Where to mount this dataset."; - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; }; properties = lib.mkOption { description = lib.mdDoc "Properties to set on this dataset."; - type = types.attrsOf types.string; + type = types.attrsOf types.str; default = { }; }; }; diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index 118bf82cdd66..6c00fabaa185 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: let cfg = config.virtualisation.podman; - toml = pkgs.formats.toml { }; json = pkgs.formats.json { }; inherit (lib) mkOption types; @@ -27,24 +26,13 @@ let done ''; - net-conflist = pkgs.runCommand "87-podman-bridge.conflist" - { - nativeBuildInputs = [ pkgs.jq ]; - extraPlugins = builtins.toJSON cfg.defaultNetwork.extraPlugins; - jqScript = '' - . + { "plugins": (.plugins + $extraPlugins) } - ''; - } '' - jq <${cfg.package}/etc/cni/net.d/87-podman-bridge.conflist \ - --argjson extraPlugins "$extraPlugins" \ - "$jqScript" \ - >$out - ''; - in { imports = [ - ./dnsname.nix + (lib.mkRemovedOptionModule [ "virtualisation" "podman" "defaultNetwork" "dnsname" ] + "Use virtualisation.podman.defaultNetwork.settings.dns_enabled instead.") + (lib.mkRemovedOptionModule [ "virtualisation" "podman" "defaultNetwork" "extraPlugins" ] + "Netavark isn't compatible with CNI plugins.") ./network-socket.nix ]; @@ -109,6 +97,37 @@ in ''; }; + autoPrune = { + enable = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to periodically prune Podman resources. If enabled, a + systemd timer will run `podman system prune -f` + as specified by the `dates` option. + ''; + }; + + flags = mkOption { + type = types.listOf types.str; + default = []; + example = [ "--all" ]; + description = lib.mdDoc '' + Any additional flags passed to {command}`podman system prune`. + ''; + }; + + dates = mkOption { + default = "weekly"; + type = types.str; + description = lib.mdDoc '' + Specification (in the format described by + {manpage}`systemd.time(7)`) of the time at + which the prune will occur. + ''; + }; + }; + package = lib.mkOption { type = types.package; default = podmanPackage; @@ -118,11 +137,11 @@ in ''; }; - defaultNetwork.extraPlugins = lib.mkOption { - type = types.listOf json.type; - default = [ ]; + defaultNetwork.settings = lib.mkOption { + type = json.type; + default = { }; description = lib.mdDoc '' - Extra CNI plugin configurations to add to podman's default network. + Settings for podman's default network. ''; }; @@ -133,11 +152,26 @@ in environment.systemPackages = [ cfg.package ] ++ lib.optional cfg.dockerCompat dockerCompat; - environment.etc."cni/net.d/87-podman-bridge.conflist".source = net-conflist; + # https://github.com/containers/podman/blob/097cc6eb6dd8e598c0e8676d21267b4edb11e144/docs/tutorials/basic_networking.md#default-network + environment.etc."containers/networks/podman.json" = lib.mkIf (cfg.defaultNetwork.settings != { }) { + source = json.generate "podman.json" ({ + dns_enabled = false; + driver = "bridge"; + id = "0000000000000000000000000000000000000000000000000000000000000000"; + internal = false; + ipam_options = { driver = "host-local"; }; + ipv6_enabled = false; + name = "podman"; + network_interface = "podman0"; + subnets = [{ gateway = "10.88.0.1"; subnet = "10.88.0.0/16"; }]; + } // cfg.defaultNetwork.settings); + }; virtualisation.containers = { enable = true; # Enable common /etc/containers configuration - containersConf.settings = lib.optionalAttrs cfg.enableNvidia { + containersConf.settings = { + network.network_backend = "netavark"; + } // lib.optionalAttrs cfg.enableNvidia { engine = { conmon_env_vars = [ "PATH=${lib.makeBinPath [ pkgs.nvidia-podman ]}" ]; runtimes.nvidia = [ "${pkgs.nvidia-podman}/bin/nvidia-container-runtime" ]; @@ -151,6 +185,23 @@ in ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ]; }; + systemd.services.podman-prune = { + description = "Prune podman resources"; + + restartIfChanged = false; + unitConfig.X-StopOnRemoval = false; + + serviceConfig.Type = "oneshot"; + + script = '' + ${cfg.package}/bin/podman system prune -f ${toString cfg.autoPrune.flags} + ''; + + startAt = lib.optional cfg.autoPrune.enable cfg.autoPrune.dates; + after = [ "podman.service" ]; + requires = [ "podman.service" ]; + }; + systemd.sockets.podman.wantedBy = [ "sockets.target" ]; systemd.sockets.podman.socketConfig.SocketGroup = "podman"; diff --git a/nixos/modules/virtualisation/podman/dnsname.nix b/nixos/modules/virtualisation/podman/dnsname.nix deleted file mode 100644 index 3e7d35ae1e44..000000000000 --- a/nixos/modules/virtualisation/podman/dnsname.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ config, lib, pkgs, ... }: -let - inherit (lib) - mkOption - mkIf - types - ; - - cfg = config.virtualisation.podman; - -in -{ - options = { - virtualisation.podman = { - - defaultNetwork.dnsname.enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Enable DNS resolution in the default podman network. - ''; - }; - - }; - }; - - config = { - virtualisation.containers.containersConf.cniPlugins = mkIf cfg.defaultNetwork.dnsname.enable [ pkgs.dnsname-cni ]; - virtualisation.podman.defaultNetwork.extraPlugins = - lib.optional cfg.defaultNetwork.dnsname.enable { - type = "dnsname"; - domainName = "dns.podman"; - capabilities.aliases = true; - }; - }; -} diff --git a/nixos/modules/virtualisation/proxmox-image.nix b/nixos/modules/virtualisation/proxmox-image.nix index 42c52c12edf0..6a4220fd265c 100644 --- a/nixos/modules/virtualisation/proxmox-image.nix +++ b/nixos/modules/virtualisation/proxmox-image.nix @@ -28,7 +28,7 @@ with lib; default = "local-lvm:vm-9999-disk-0"; example = "ceph:vm-123-disk-0"; description = lib.mdDoc '' - Configuration for the default virtio disk. It can be used as a cue for PVE to autodetect the target sotrage. + Configuration for the default virtio disk. It can be used as a cue for PVE to autodetect the target storage. This parameter is required by PVE even if it isn't used. ''; }; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index edc6dfdc15ae..06210529eb8c 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -211,7 +211,7 @@ let '' mkdir $out diskImage=$out/disk.img - ${qemu}/bin/qemu-img create -f qcow2 $diskImage "60M" + ${qemu}/bin/qemu-img create -f qcow2 $diskImage "120M" ${if cfg.useEFIBoot then '' efiVars=$out/efi-vars.fd cp ${cfg.efi.variables} $efiVars @@ -225,7 +225,7 @@ let + " -drive if=pflash,format=raw,unit=1,file=$efiVars"); } '' - # Create a /boot EFI partition with 60M and arbitrary but fixed GUIDs for reproducibility + # Create a /boot EFI partition with 120M and arbitrary but fixed GUIDs for reproducibility ${pkgs.gptfdisk}/bin/sgdisk \ --set-alignment=1 --new=1:34:2047 --change-name=1:BIOSBootPartition --typecode=1:ef02 \ --set-alignment=512 --largest-new=2 --change-name=2:EFISystem --typecode=2:ef00 \ @@ -528,6 +528,20 @@ in ''; }; + virtualisation.restrictNetwork = + mkOption { + type = types.bool; + default = false; + example = true; + description = + lib.mdDoc '' + If this option is enabled, the guest will be isolated, i.e. it will + not be able to contact the host and no guest IP packets will be + routed over the host to the outside. This option does not affect + any explicitly set forwarding rules. + ''; + }; + virtualisation.vlans = mkOption { type = types.listOf types.ints.unsigned; @@ -580,7 +594,7 @@ in virtualisation.host.pkgs = mkOption { type = options.nixpkgs.pkgs.type; default = pkgs; - defaultText = "pkgs"; + defaultText = literalExpression "pkgs"; example = literalExpression '' import pkgs.path { system = "x86_64-darwin"; } ''; @@ -595,7 +609,8 @@ in mkOption { type = types.package; default = cfg.host.pkgs.qemu_kvm; - example = "pkgs.qemu_test"; + defaultText = literalExpression "config.virtualisation.host.pkgs.qemu_kvm"; + example = literalExpression "pkgs.qemu_test"; description = lib.mdDoc "QEMU package to use."; }; @@ -721,7 +736,7 @@ in firmware = mkOption { type = types.path; default = pkgs.OVMF.firmware; - defaultText = "pkgs.OVMF.firmware"; + defaultText = literalExpression "pkgs.OVMF.firmware"; description = lib.mdDoc '' Firmware binary for EFI implementation, defaults to OVMF. @@ -731,7 +746,7 @@ in variables = mkOption { type = types.path; default = pkgs.OVMF.variables; - defaultText = "pkgs.OVMF.variables"; + defaultText = literalExpression "pkgs.OVMF.variables"; description = lib.mdDoc '' Platform-specific flash binary for EFI variables, implementation-dependent to the EFI firmware. @@ -806,7 +821,7 @@ in optional ( cfg.writableStore && cfg.useNixStoreImage && - opt.writableStore.highestPrio > lib.modules.defaultPriority) + opt.writableStore.highestPrio > lib.modules.defaultOverridePriority) '' You have enabled ${opt.useNixStoreImage} = true, without setting ${opt.writableStore} = false. @@ -858,7 +873,8 @@ in # If the disk image appears to be empty, run mke2fs to # initialise. FSTYPE=$(blkid -o value -s TYPE ${cfg.bootDevice} || true) - if test -z "$FSTYPE"; then + PARTTYPE=$(blkid -o value -s PTTYPE ${cfg.bootDevice} || true) + if test -z "$FSTYPE" -a -z "$PARTTYPE"; then mke2fs -t ext4 ${cfg.bootDevice} fi ''; @@ -934,10 +950,11 @@ in else "'guestfwd=${proto}:${guest.address}:${toString guest.port}-" + "cmd:${pkgs.netcat}/bin/nc ${host.address} ${toString host.port}'," ); + restrictNetworkOption = lib.optionalString cfg.restrictNetwork "restrict=on,"; in [ "-net nic,netdev=user.0,model=virtio" - "-netdev user,id=user.0,${forwardingOptions}\"$QEMU_NET_OPTS\"" + "-netdev user,id=user.0,${forwardingOptions}${restrictNetworkOption}\"$QEMU_NET_OPTS\"" ]; # FIXME: Consolidate this one day. diff --git a/nixos/modules/virtualisation/rosetta.nix b/nixos/modules/virtualisation/rosetta.nix new file mode 100644 index 000000000000..109b114d649c --- /dev/null +++ b/nixos/modules/virtualisation/rosetta.nix @@ -0,0 +1,73 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.virtualisation.rosetta; + inherit (lib) types; +in +{ + options = { + virtualisation.rosetta.enable = lib.mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to enable [Rosetta](https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment) support. + + This feature requires the system to be a virtualised guest on an Apple silicon host. + + The default settings are suitable for the [UTM](https://docs.getutm.app/) virtualisation [package](https://search.nixos.org/packages?channel=unstable&show=utm&from=0&size=1&sort=relevance&type=packages&query=utm). + Make sure to select 'Apple Virtualization' as the virtualisation engine and then tick the 'Enable Rosetta' option. + ''; + }; + + virtualisation.rosetta.mountPoint = lib.mkOption { + type = types.str; + default = "/run/rosetta"; + internal = true; + description = lib.mdDoc '' + The mount point for the Rosetta runtime inside the guest system. + + The proprietary runtime is exposed through a VirtioFS directory share and then mounted at this directory. + ''; + }; + + virtualisation.rosetta.mountTag = lib.mkOption { + type = types.str; + default = "rosetta"; + description = lib.mdDoc '' + The VirtioFS mount tag for the Rosetta runtime, exposed by the host's virtualisation software. + + If supported, your virtualisation software should provide instructions on how register the Rosetta runtime inside Linux guests. + These instructions should mention the name of the mount tag used for the VirtioFS directory share that contains the Rosetta runtime. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = pkgs.stdenv.hostPlatform.isAarch64; + message = "Rosetta is only supported on aarch64 systems"; + } + ]; + + fileSystems."${cfg.mountPoint}" = { + device = cfg.mountTag; + fsType = "virtiofs"; + }; + + boot.binfmt.registrations.rosetta = { + interpreter = "${cfg.mountPoint}/rosetta"; + + # The required flags for binfmt are documented by Apple: + # https://developer.apple.com/documentation/virtualization/running_intel_binaries_in_linux_vms_with_rosetta + magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00''; + mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + fixBinary = true; + matchCredentials = true; + preserveArgvZero = false; + + # Remove the shell wrapper and call the runtime directly + wrapInterpreterInShell = false; + }; + }; +} diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 0c095c01ad80..2ea23d958cf7 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -41,7 +41,7 @@ in { }; vmName = mkOption { type = types.str; - default = "NixOS ${config.system.nixos.label} (${pkgs.stdenv.hostPlatform.system})"; + default = "${config.system.nixos.distroName} ${config.system.nixos.label} (${pkgs.stdenv.hostPlatform.system})"; description = lib.mdDoc '' The name of the VirtualBox appliance. ''; diff --git a/nixos/modules/virtualisation/vmware-host.nix b/nixos/modules/virtualisation/vmware-host.nix index e1d695640be1..4b2dc28aeac7 100644 --- a/nixos/modules/virtualisation/vmware-host.nix +++ b/nixos/modules/virtualisation/vmware-host.nix @@ -120,7 +120,7 @@ in # Services systemd.services."vmware-authdlauncher" = { - description = "VMware Authentification Daemon"; + description = "VMware Authentication Daemon"; serviceConfig = { Type = "forking"; ExecStart = [ "${cfg.package}/bin/vmware-authdlauncher" ]; diff --git a/nixos/modules/virtualisation/waydroid.nix b/nixos/modules/virtualisation/waydroid.nix index a2cfd806f322..46e5f901015d 100644 --- a/nixos/modules/virtualisation/waydroid.nix +++ b/nixos/modules/virtualisation/waydroid.nix @@ -56,12 +56,8 @@ in wantedBy = [ "multi-user.target" ]; - unitConfig = { - ConditionPathExists = "/var/lib/waydroid/lxc/waydroid"; - }; - serviceConfig = { - ExecStart = "${pkgs.waydroid}/bin/waydroid container start"; + ExecStart = "${pkgs.waydroid}/bin/waydroid -w container start"; ExecStop = "${pkgs.waydroid}/bin/waydroid container stop"; ExecStopPost = "${pkgs.waydroid}/bin/waydroid session stop"; }; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 337b5192776f..ed698b63ee63 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -146,7 +146,8 @@ in rec { (onFullSupported "nixos.tests.predictable-interface-names.predictable") (onFullSupported "nixos.tests.predictable-interface-names.unpredictableNetworkd") (onFullSupported "nixos.tests.predictable-interface-names.unpredictable") - (onFullSupported "nixos.tests.printing") + (onFullSupported "nixos.tests.printing-service") + (onFullSupported "nixos.tests.printing-socket") (onFullSupported "nixos.tests.proxy") (onFullSupported "nixos.tests.sddm.default") (onFullSupported "nixos.tests.shadow") diff --git a/nixos/release.nix b/nixos/release.nix index 919aa86a2d63..946379bcd661 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -181,14 +181,22 @@ in rec { inherit system; }); - # A variant with a more recent (but possibly less stable) kernel - # that might support more hardware. + # A variant with a more recent (but possibly less stable) kernel that might support more hardware. + # This variant keeps zfs support enabled, hoping it will build and work. iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeIso { module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix; type = "minimal-new-kernel"; inherit system; }); + # A variant with a more recent (but possibly less stable) kernel that might support more hardware. + # ZFS support disabled since it is unlikely to support the latest kernel. + iso_minimal_new_kernel_no_zfs = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeIso { + module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix; + type = "minimal-new-kernel-no-zfs"; + inherit system; + }); + sd_image = forMatchingSystems [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ] (system: makeSdImage { module = { armv6l-linux = ./modules/installer/sd-card/sd-image-raspberrypi-installer.nix; @@ -206,6 +214,14 @@ in rec { inherit system; }); + sd_image_new_kernel_no_zfs = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage { + module = { + aarch64-linux = ./modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix; + }.${system}; + type = "minimal-new-kernel-no-zfs"; + inherit system; + }); + # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). ova = forMatchingSystems [ "x86_64-linux" ] (system: diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index d540bc6ec31b..d62bf0c0fd92 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -144,7 +144,11 @@ in { name = "acme"; - meta.maintainers = lib.teams.acme.members; + meta = { + maintainers = lib.teams.acme.members; + # Hard timeout in seconds. Average run time is about 7 minutes. + timeout = 1800; + }; nodes = { # The fake ACME server which will respond to client requests @@ -277,7 +281,7 @@ in { }; }; - # Test compatiblity with Caddy + # Test compatibility with Caddy # It only supports useACMEHost, hence not using mkServerConfigs } // (let baseCaddyConfig = { nodes, config, ... }: { @@ -357,6 +361,30 @@ in { import time + TOTAL_RETRIES = 20 + + + class BackoffTracker(object): + delay = 1 + increment = 1 + + def handle_fail(self, retries, message) -> int: + assert retries < TOTAL_RETRIES, message + + print(f"Retrying in {self.delay}s, {retries + 1}/{TOTAL_RETRIES}") + time.sleep(self.delay) + + # Only increment after the first try + if retries == 0: + self.delay += self.increment + self.increment *= 2 + + return retries + 1 + + + backoff = BackoffTracker() + + def switch_to(node, name): # On first switch, this will create a symlink to the current system so that we can # quickly switch between derivations @@ -404,9 +432,7 @@ in { assert False - def check_connection(node, domain, retries=3): - assert retries >= 0, f"Failed to connect to https://{domain}" - + def check_connection(node, domain, retries=0): result = node.succeed( "openssl s_client -brief -verify 2 -CAfile /tmp/ca.crt" f" -servername {domain} -connect {domain}:443 < /dev/null 2>&1" @@ -414,13 +440,11 @@ in { for line in result.lower().split("\n"): if "verification" in line and "error" in line: - time.sleep(3) - return check_connection(node, domain, retries - 1) + retries = backoff.handle_fail(retries, f"Failed to connect to https://{domain}") + return check_connection(node, domain, retries) - def check_connection_key_bits(node, domain, bits, retries=3): - assert retries >= 0, f"Did not find expected number of bits ({bits}) in key" - + def check_connection_key_bits(node, domain, bits, retries=0): result = node.succeed( "openssl s_client -CAfile /tmp/ca.crt" f" -servername {domain} -connect {domain}:443 < /dev/null" @@ -429,13 +453,11 @@ in { print("Key type:", result) if bits not in result: - time.sleep(3) - return check_connection_key_bits(node, domain, bits, retries - 1) + retries = backoff.handle_fail(retries, f"Did not find expected number of bits ({bits}) in key") + return check_connection_key_bits(node, domain, bits, retries) - def check_stapling(node, domain, retries=3): - assert retries >= 0, "OCSP Stapling check failed" - + def check_stapling(node, domain, retries=0): # Pebble doesn't provide a full OCSP responder, so just check the URL result = node.succeed( "openssl s_client -CAfile /tmp/ca.crt" @@ -445,21 +467,19 @@ in { print("OCSP Responder URL:", result) if "${caDomain}:4002" not in result.lower(): - time.sleep(3) - return check_stapling(node, domain, retries - 1) + retries = backoff.handle_fail(retries, "OCSP Stapling check failed") + return check_stapling(node, domain, retries) - def download_ca_certs(node, retries=5): - assert retries >= 0, "Failed to connect to pebble to download root CA certs" - + def download_ca_certs(node, retries=0): exit_code, _ = node.execute("curl https://${caDomain}:15000/roots/0 > /tmp/ca.crt") exit_code_2, _ = node.execute( "curl https://${caDomain}:15000/intermediate-keys/0 >> /tmp/ca.crt" ) if exit_code + exit_code_2 > 0: - time.sleep(3) - return download_ca_certs(node, retries - 1) + retries = backoff.handle_fail(retries, "Failed to connect to pebble to download root CA certs") + return download_ca_certs(node, retries) start_all() diff --git a/nixos/tests/aesmd.nix b/nixos/tests/aesmd.nix index 5da661afd548..848e1c599201 100644 --- a/nixos/tests/aesmd.nix +++ b/nixos/tests/aesmd.nix @@ -1,7 +1,7 @@ { pkgs, lib, ... }: { name = "aesmd"; meta = { - maintainers = with lib.maintainers; [ veehaitch ]; + maintainers = with lib.maintainers; [ trundle veehaitch ]; }; nodes.machine = { lib, ... }: { @@ -25,38 +25,78 @@ # We don't have a real SGX machine in NixOS tests systemd.services.aesmd.unitConfig.AssertPathExists = lib.mkForce [ ]; + + specialisation = { + withQuoteProvider.configuration = { ... }: { + services.aesmd = { + quoteProviderLibrary = pkgs.sgx-azure-dcap-client; + environment = { + AZDCAP_DEBUG_LOG_LEVEL = "INFO"; + }; + }; + }; + }; }; - testScript = '' - with subtest("aesmd.service starts"): - machine.wait_for_unit("aesmd.service") - status, main_pid = machine.systemctl("show --property MainPID --value aesmd.service") - assert status == 0, "Could not get MainPID of aesmd.service" - main_pid = main_pid.strip() + testScript = { nodes, ... }: + let + specialisations = "${nodes.machine.system.build.toplevel}/specialisation"; + in + '' + def get_aesmd_pid(): + status, main_pid = machine.systemctl("show --property MainPID --value aesmd.service") + assert status == 0, "Could not get MainPID of aesmd.service" + return main_pid.strip() - with subtest("aesmd.service runtime directory permissions"): - runtime_dir = "/run/aesmd"; - res = machine.succeed(f"stat -c '%a %U %G' {runtime_dir}").strip() - assert "750 aesmd sgx" == res, f"{runtime_dir} does not have the expected permissions: {res}" + with subtest("aesmd.service starts"): + machine.wait_for_unit("aesmd.service") - with subtest("aesm.socket available on host"): - socket_path = "/var/run/aesmd/aesm.socket" - machine.wait_until_succeeds(f"test -S {socket_path}") - machine.succeed(f"test 777 -eq $(stat -c '%a' {socket_path})") - for op in [ "-r", "-w", "-x" ]: - machine.succeed(f"sudo -u sgxtest test {op} {socket_path}") - machine.fail(f"sudo -u nosgxtest test {op} {socket_path}") + main_pid = get_aesmd_pid() - with subtest("Copies white_list_cert_to_be_verify.bin"): - whitelist_path = "/var/opt/aesmd/data/white_list_cert_to_be_verify.bin" - whitelist_perms = machine.succeed( - f"nsenter -m -t {main_pid} ${pkgs.coreutils}/bin/stat -c '%a' {whitelist_path}" - ).strip() - assert "644" == whitelist_perms, f"white_list_cert_to_be_verify.bin has permissions {whitelist_perms}" + with subtest("aesmd.service runtime directory permissions"): + runtime_dir = "/run/aesmd"; + res = machine.succeed(f"stat -c '%a %U %G' {runtime_dir}").strip() + assert "750 aesmd sgx" == res, f"{runtime_dir} does not have the expected permissions: {res}" - with subtest("Writes and binds aesm.conf in service namespace"): - aesmd_config = machine.succeed(f"nsenter -m -t {main_pid} ${pkgs.coreutils}/bin/cat /etc/aesmd.conf") + with subtest("aesm.socket available on host"): + socket_path = "/var/run/aesmd/aesm.socket" + machine.wait_until_succeeds(f"test -S {socket_path}") + machine.succeed(f"test 777 -eq $(stat -c '%a' {socket_path})") + for op in [ "-r", "-w", "-x" ]: + machine.succeed(f"sudo -u sgxtest test {op} {socket_path}") + machine.fail(f"sudo -u nosgxtest test {op} {socket_path}") - assert aesmd_config == "whitelist url = http://nixos.org\nproxy type = direct\ndefault quoting type = ecdsa_256\n", "aesmd.conf differs" - ''; + with subtest("Copies white_list_cert_to_be_verify.bin"): + whitelist_path = "/var/opt/aesmd/data/white_list_cert_to_be_verify.bin" + whitelist_perms = machine.succeed( + f"nsenter -m -t {main_pid} ${pkgs.coreutils}/bin/stat -c '%a' {whitelist_path}" + ).strip() + assert "644" == whitelist_perms, f"white_list_cert_to_be_verify.bin has permissions {whitelist_perms}" + + with subtest("Writes and binds aesm.conf in service namespace"): + aesmd_config = machine.succeed(f"nsenter -m -t {main_pid} ${pkgs.coreutils}/bin/cat /etc/aesmd.conf") + + assert aesmd_config == "whitelist url = http://nixos.org\nproxy type = direct\ndefault quoting type = ecdsa_256\n", "aesmd.conf differs" + + with subtest("aesmd.service without quote provider library has correct LD_LIBRARY_PATH"): + status, environment = machine.systemctl("show --property Environment --value aesmd.service") + assert status == 0, "Could not get Environment of aesmd.service" + env_by_name = dict(entry.split("=", 1) for entry in environment.split()) + assert not env_by_name["LD_LIBRARY_PATH"], "LD_LIBRARY_PATH is not empty" + + with subtest("aesmd.service with quote provider library starts"): + machine.succeed('${specialisations}/withQuoteProvider/bin/switch-to-configuration test') + machine.wait_for_unit("aesmd.service") + + main_pid = get_aesmd_pid() + + with subtest("aesmd.service with quote provider library has correct LD_LIBRARY_PATH"): + ld_library_path = machine.succeed(f"xargs -0 -L1 -a /proc/{main_pid}/environ | grep LD_LIBRARY_PATH") + assert ld_library_path.startswith("LD_LIBRARY_PATH=${pkgs.sgx-azure-dcap-client}/lib:"), \ + "LD_LIBRARY_PATH is not set to the configured quote provider library" + + with subtest("aesmd.service with quote provider library has set AZDCAP_DEBUG_LOG_LEVEL"): + azdcp_debug_log_level = machine.succeed(f"xargs -0 -L1 -a /proc/{main_pid}/environ | grep AZDCAP_DEBUG_LOG_LEVEL") + assert azdcp_debug_log_level == "AZDCAP_DEBUG_LOG_LEVEL=INFO\n", "AZDCAP_DEBUG_LOG_LEVEL is not set to INFO" + ''; } diff --git a/nixos/tests/akkoma.nix b/nixos/tests/akkoma.nix new file mode 100644 index 000000000000..7115c0beed34 --- /dev/null +++ b/nixos/tests/akkoma.nix @@ -0,0 +1,121 @@ +/* + End-to-end test for Akkoma. + + Based in part on nixos/tests/pleroma. + + TODO: Test federation. +*/ +import ./make-test-python.nix ({ pkgs, package ? pkgs.akkoma, confined ? false, ... }: +let + userPassword = "4LKOrGo8SgbPm1a6NclVU5Wb"; + + provisionUser = pkgs.writers.writeBashBin "provisionUser" '' + set -eu -o errtrace -o pipefail + + pleroma_ctl user new jamy jamy@nixos.test --password '${userPassword}' --moderator --admin -y + ''; + + tlsCert = pkgs.runCommand "selfSignedCerts" { + nativeBuildInputs = with pkgs; [ openssl ]; + } '' + mkdir -p $out + openssl req -x509 \ + -subj '/CN=akkoma.nixos.test/' -days 49710 \ + -addext 'subjectAltName = DNS:akkoma.nixos.test' \ + -keyout "$out/key.pem" -newkey ed25519 \ + -out "$out/cert.pem" -noenc + ''; + + sendToot = pkgs.writers.writeBashBin "sendToot" '' + set -eu -o errtrace -o pipefail + + export REQUESTS_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt" + + echo '${userPassword}' | ${pkgs.toot}/bin/toot login_cli -i "akkoma.nixos.test" -e "jamy@nixos.test" + echo "y" | ${pkgs.toot}/bin/toot post "hello world Jamy here" + echo "y" | ${pkgs.toot}/bin/toot timeline | grep -F -q "hello world Jamy here" + + # Test file upload + echo "y" | ${pkgs.toot}/bin/toot upload <(dd if=/dev/zero bs=1024 count=1024 status=none) \ + | grep -F -q "https://akkoma.nixos.test/media" + ''; + + checkFe = pkgs.writers.writeBashBin "checkFe" '' + set -eu -o errtrace -o pipefail + + paths=( / /static/{config,styles}.json /pleroma/admin/ ) + + for path in "''${paths[@]}"; do + diff \ + <(${pkgs.curl}/bin/curl -f -S -s -o /dev/null -w '%{response_code}' "https://akkoma.nixos.test$path") \ + <(echo -n 200) + done + ''; + + hosts = nodes: '' + ${nodes.akkoma.networking.primaryIPAddress} akkoma.nixos.test + ${nodes.client.networking.primaryIPAddress} client.nixos.test + ''; +in +{ + name = "akkoma"; + nodes = { + client = { nodes, pkgs, config, ... }: { + security.pki.certificateFiles = [ "${tlsCert}/cert.pem" ]; + networking.extraHosts = hosts nodes; + }; + + akkoma = { nodes, pkgs, config, ... }: { + networking.extraHosts = hosts nodes; + networking.firewall.allowedTCPPorts = [ 443 ]; + environment.systemPackages = with pkgs; [ provisionUser ]; + systemd.services.akkoma.confinement.enable = confined; + + services.akkoma = { + enable = true; + package = package; + config = { + ":pleroma" = { + ":instance" = { + name = "NixOS test Akkoma server"; + description = "NixOS test Akkoma server"; + email = "akkoma@nixos.test"; + notify_email = "akkoma@nixos.test"; + registration_open = true; + }; + + ":media_proxy" = { + enabled = false; + }; + + "Pleroma.Web.Endpoint" = { + url.host = "akkoma.nixos.test"; + }; + }; + }; + + nginx = { + addSSL = true; + sslCertificate = "${tlsCert}/cert.pem"; + sslCertificateKey = "${tlsCert}/key.pem"; + }; + }; + + services.nginx.enable = true; + services.postgresql.enable = true; + }; + }; + + testScript = { nodes, ... }: '' + start_all() + akkoma.wait_for_unit('akkoma-initdb.service') + akkoma.systemctl('restart akkoma-initdb.service') # test repeated initialisation + akkoma.wait_for_unit('akkoma.service') + akkoma.wait_for_file('/run/akkoma/socket'); + akkoma.succeed('${provisionUser}/bin/provisionUser') + akkoma.wait_for_unit('nginx.service') + client.succeed('${sendToot}/bin/sendToot') + client.succeed('${checkFe}/bin/checkFe') + ''; +}) + diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7b1006ba6015..1fc8bb777db0 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -69,17 +69,21 @@ in { _3proxy = runTest ./3proxy.nix; acme = runTest ./acme.nix; adguardhome = runTest ./adguardhome.nix; - aesmd = runTest ./aesmd.nix; + aesmd = runTestOn ["x86_64-linux"] ./aesmd.nix; agate = runTest ./web-servers/agate.nix; agda = handleTest ./agda.nix {}; airsonic = handleTest ./airsonic.nix {}; + akkoma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./akkoma.nix {}; + akkoma-confined = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./akkoma.nix { confined = true; }; allTerminfo = handleTest ./all-terminfo.nix {}; alps = handleTest ./alps.nix {}; amazon-init-shell = handleTest ./amazon-init-shell.nix {}; + apcupsd = handleTest ./apcupsd.nix {}; apfs = handleTest ./apfs.nix {}; apparmor = handleTest ./apparmor.nix {}; atd = handleTest ./atd.nix {}; atop = handleTest ./atop.nix {}; + atuin = handleTest ./atuin.nix {}; auth-mysql = handleTest ./auth-mysql.nix {}; avahi = handleTest ./avahi.nix {}; avahi-with-resolved = handleTest ./avahi.nix { networkd = true; }; @@ -95,6 +99,7 @@ in { blockbook-frontend = handleTest ./blockbook-frontend.nix {}; blocky = handleTest ./blocky.nix {}; boot = handleTestOn ["x86_64-linux" "aarch64-linux"] ./boot.nix {}; + bootspec = handleTestOn ["x86_64-linux"] ./bootspec.nix {}; boot-stage1 = handleTest ./boot-stage1.nix {}; borgbackup = handleTest ./borgbackup.nix {}; botamusique = handleTest ./botamusique.nix {}; @@ -113,6 +118,7 @@ in { calibre-web = handleTest ./calibre-web.nix {}; cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; }; cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; }; + cassandra_4 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_4; }; ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {}; ceph-single-node = handleTestOn ["x86_64-linux"] ./ceph-single-node.nix {}; ceph-single-node-bluestore = handleTestOn ["x86_64-linux"] ./ceph-single-node-bluestore.nix {}; @@ -120,14 +126,17 @@ in { cfssl = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cfssl.nix {}; charliecloud = handleTest ./charliecloud.nix {}; chromium = (handleTestOn ["aarch64-linux" "x86_64-linux"] ./chromium.nix {}).stable or {}; + chrony-ptp = handleTestOn ["aarch64-linux" "x86_64-linux"] ./chrony-ptp.nix {}; cinnamon = handleTest ./cinnamon.nix {}; cjdns = handleTest ./cjdns.nix {}; clickhouse = handleTest ./clickhouse.nix {}; cloud-init = handleTest ./cloud-init.nix {}; cloud-init-hostname = handleTest ./cloud-init-hostname.nix {}; + cloudlog = handleTest ./cloudlog.nix {}; cntr = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cntr.nix {}; cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {}; collectd = handleTest ./collectd.nix {}; + connman = handleTest ./connman.nix {}; consul = handleTest ./consul.nix {}; containers-bridge = handleTest ./containers-bridge.nix {}; containers-custom-pkgs.nix = handleTest ./containers-custom-pkgs.nix {}; @@ -150,6 +159,7 @@ in { coturn = handleTest ./coturn.nix {}; couchdb = handleTest ./couchdb.nix {}; cri-o = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cri-o.nix {}; + cups-pdf = handleTest ./cups-pdf.nix {}; custom-ca = handleTest ./custom-ca.nix {}; croc = handleTest ./croc.nix {}; deluge = handleTest ./deluge.nix {}; @@ -189,10 +199,12 @@ in { engelsystem = handleTest ./engelsystem.nix {}; enlightenment = handleTest ./enlightenment.nix {}; env = handleTest ./env.nix {}; + envfs = handleTest ./envfs.nix {}; envoy = handleTest ./envoy.nix {}; ergo = handleTest ./ergo.nix {}; ergochat = handleTest ./ergochat.nix {}; etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; }; + activation = pkgs.callPackage ../modules/system/activation/test.nix { }; etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {}; etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {}; etebase-server = handleTest ./etebase-server.nix {}; @@ -207,19 +219,22 @@ in { firefox-esr = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job firefox-esr-102 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-102; }; firejail = handleTest ./firejail.nix {}; - firewall = handleTest ./firewall.nix {}; + firewall = handleTest ./firewall.nix { nftables = false; }; + firewall-nftables = handleTest ./firewall.nix { nftables = true; }; fish = handleTest ./fish.nix {}; flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {}; fluentd = handleTest ./fluentd.nix {}; fluidd = handleTest ./fluidd.nix {}; fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {}; + freenet = handleTest ./freenet.nix {}; freeswitch = handleTest ./freeswitch.nix {}; - freshrss = handleTest ./freshrss.nix {}; + freshrss-sqlite = handleTest ./freshrss-sqlite.nix {}; + freshrss-pgsql = handleTest ./freshrss-pgsql.nix {}; frr = handleTest ./frr.nix {}; fsck = handleTest ./fsck.nix {}; ft2-clone = handleTest ./ft2-clone.nix {}; mimir = handleTest ./mimir.nix {}; - garage = handleTest ./garage.nix {}; + garage = handleTest ./garage {}; gerrit = handleTest ./gerrit.nix {}; geth = handleTest ./geth.nix {}; ghostunnel = handleTest ./ghostunnel.nix {}; @@ -230,6 +245,7 @@ in { gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {}; glusterfs = handleTest ./glusterfs.nix {}; gnome = handleTest ./gnome.nix {}; + gnome-flashback = handleTest ./gnome-flashback.nix {}; gnome-xorg = handleTest ./gnome-xorg.nix {}; go-neb = handleTest ./go-neb.nix {}; gobgpd = handleTest ./gobgpd.nix {}; @@ -252,6 +268,7 @@ in { haste-server = handleTest ./haste-server.nix {}; haproxy = handleTest ./haproxy.nix {}; hardened = handleTest ./hardened.nix {}; + headscale = handleTest ./headscale.nix {}; healthchecks = handleTest ./web-apps/healthchecks.nix {}; hbase2 = handleTest ./hbase.nix { package=pkgs.hbase2; }; hbase_2_4 = handleTest ./hbase.nix { package=pkgs.hbase_2_4; }; @@ -362,7 +379,8 @@ 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 {}; + mastodon = discoverTests (import ./web-apps/mastodon { inherit handleTestOn; }); + mate = handleTest ./mate.nix {}; matomo = handleTest ./matomo.nix {}; matrix-appservice-irc = handleTest ./matrix/appservice-irc.nix {}; matrix-conduit = handleTest ./matrix/conduit.nix {}; @@ -374,11 +392,13 @@ in { memcached = handleTest ./memcached.nix {}; merecat = handleTest ./merecat.nix {}; metabase = handleTest ./metabase.nix {}; + mindustry = handleTest ./mindustry.nix {}; minecraft = handleTest ./minecraft.nix {}; minecraft-server = handleTest ./minecraft-server.nix {}; minidlna = handleTest ./minidlna.nix {}; miniflux = handleTest ./miniflux.nix {}; minio = handleTest ./minio.nix {}; + miriway = handleTest ./miriway.nix {}; misc = handleTest ./misc.nix {}; mjolnir = handleTest ./matrix/mjolnir.nix {}; mod_perl = handleTest ./mod_perl.nix {}; @@ -407,6 +427,9 @@ in { nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; nat.standalone = handleTest ./nat.nix { withFirewall = false; }; + nat.nftables.firewall = handleTest ./nat.nix { withFirewall = true; nftables = true; }; + nat.nftables.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; nftables = true; }; + nat.nftables.standalone = handleTest ./nat.nix { withFirewall = false; nftables = true; }; nats = handleTest ./nats.nix {}; navidrome = handleTest ./navidrome.nix {}; nbd = handleTest ./nbd.nix {}; @@ -418,7 +441,6 @@ in { netdata = handleTest ./netdata.nix {}; networking.networkd = handleTest ./networking.nix { networkd = true; }; networking.scripted = handleTest ./networking.nix { networkd = false; }; - specialisation = handleTest ./specialisation.nix {}; netbox = handleTest ./web-apps/netbox.nix {}; # TODO: put in networking.nix after the test becomes more complete networkingProxy = handleTest ./networking-proxy.nix {}; @@ -431,6 +453,7 @@ in { nginx = handleTest ./nginx.nix {}; nginx-auth = handleTest ./nginx-auth.nix {}; nginx-etag = handleTest ./nginx-etag.nix {}; + nginx-globalredirect = handleTest ./nginx-globalredirect.nix {}; nginx-http3 = handleTest ./nginx-http3.nix {}; nginx-modsecurity = handleTest ./nginx-modsecurity.nix {}; nginx-njs = handleTest ./nginx-njs.nix {}; @@ -445,6 +468,7 @@ in { nix-serve-ssh = handleTest ./nix-serve-ssh.nix {}; nixops = handleTest ./nixops/default.nix {}; nixos-generate-config = handleTest ./nixos-generate-config.nix {}; + nixos-rebuild-specialisations = handleTest ./nixos-rebuild-specialisations.nix {}; nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; }; node-red = handleTest ./node-red.nix {}; nomad = handleTest ./nomad.nix {}; @@ -464,6 +488,7 @@ in { opensmtpd = handleTest ./opensmtpd.nix {}; opensmtpd-rspamd = handleTest ./opensmtpd-rspamd.nix {}; openssh = handleTest ./openssh.nix {}; + octoprint = handleTest ./octoprint.nix {}; openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {}; openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; opentabletdriver = handleTest ./opentabletdriver.nix {}; @@ -480,19 +505,21 @@ in { pam-u2f = handleTest ./pam/pam-u2f.nix {}; pam-ussh = handleTest ./pam/pam-ussh.nix {}; pass-secret-service = handleTest ./pass-secret-service.nix {}; - patroni = handleTest ./patroni.nix {}; + patroni = handleTestOn ["x86_64-linux"] ./patroni.nix {}; pantalaimon = handleTest ./matrix/pantalaimon.nix {}; pantheon = handleTest ./pantheon.nix {}; paperless = handleTest ./paperless.nix {}; parsedmarc = handleTest ./parsedmarc {}; pdns-recursor = handleTest ./pdns-recursor.nix {}; peerflix = handleTest ./peerflix.nix {}; + peering-manager = handleTest ./web-apps/peering-manager.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 {}; phosh = handleTest ./phosh.nix {}; + photoprism = handleTest ./photoprism.nix {}; php = handleTest ./php {}; php80 = handleTest ./php { php = pkgs.php80; }; php81 = handleTest ./php { php = pkgs.php81; }; @@ -510,7 +537,6 @@ in { plotinus = handleTest ./plotinus.nix {}; podgrab = handleTest ./podgrab.nix {}; podman = handleTestOn ["aarch64-linux" "x86_64-linux"] ./podman/default.nix {}; - podman-dnsname = handleTestOn ["aarch64-linux" "x86_64-linux"] ./podman/dnsname.nix {}; podman-tls-ghostunnel = handleTestOn ["aarch64-linux" "x86_64-linux"] ./podman/tls-ghostunnel.nix {}; polaris = handleTest ./polaris.nix {}; pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {}; @@ -525,7 +551,8 @@ in { power-profiles-daemon = handleTest ./power-profiles-daemon.nix {}; pppd = handleTest ./pppd.nix {}; predictable-interface-names = handleTest ./predictable-interface-names.nix {}; - printing = handleTest ./printing.nix {}; + printing-socket = handleTest ./printing.nix { socket = true; }; + printing-service = handleTest ./printing.nix { socket = false; }; privacyidea = handleTest ./privacyidea.nix {}; privoxy = handleTest ./privoxy.nix {}; prometheus = handleTest ./prometheus.nix {}; @@ -539,6 +566,7 @@ in { public-inbox = handleTest ./public-inbox.nix {}; pulseaudio = discoverTests (import ./pulseaudio.nix); qboot = handleTestOn ["x86_64-linux" "i686-linux"] ./qboot.nix {}; + qemu-vm-restrictnetwork = handleTest ./qemu-vm-restrictnetwork.nix {}; quorum = handleTest ./quorum.nix {}; quake3 = handleTest ./quake3.nix {}; rabbitmq = handleTest ./rabbitmq.nix {}; @@ -586,6 +614,7 @@ in { sourcehut = handleTest ./sourcehut.nix {}; spacecookie = handleTest ./spacecookie.nix {}; spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {}; + sqlite3-to-mysql = handleTest ./sqlite3-to-mysql.nix {}; sslh = handleTest ./sslh.nix {}; sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {}; sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {}; @@ -595,6 +624,7 @@ in { strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; stunnel = handleTest ./stunnel.nix {}; sudo = handleTest ./sudo.nix {}; + swap-file-btrfs = handleTest ./swap-file-btrfs.nix {}; swap-partition = handleTest ./swap-partition.nix {}; sway = handleTest ./sway.nix {}; switchTest = handleTest ./switch-test.nix {}; @@ -633,9 +663,13 @@ in { systemd-portabled = handleTest ./systemd-portabled.nix {}; systemd-shutdown = handleTest ./systemd-shutdown.nix {}; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; + systemd-user-tmpfiles-rules = handleTest ./systemd-user-tmpfiles-rules.nix {}; systemd-misc = handleTest ./systemd-misc.nix {}; + systemd-userdbd = handleTest ./systemd-userdbd.nix {}; + systemd-homed = handleTest ./systemd-homed.nix {}; tandoor-recipes = handleTest ./tandoor-recipes.nix {}; taskserver = handleTest ./taskserver.nix {}; + tayga = handleTest ./tayga.nix {}; teeworlds = handleTest ./teeworlds.nix {}; telegraf = handleTest ./telegraf.nix {}; teleport = handleTest ./teleport.nix {}; @@ -665,6 +699,7 @@ in { tuxguitar = handleTest ./tuxguitar.nix {}; ucarp = handleTest ./ucarp.nix {}; udisks2 = handleTest ./udisks2.nix {}; + ulogd = handleTest ./ulogd.nix {}; unbound = handleTest ./unbound.nix {}; unifi = handleTest ./unifi.nix {}; unit-php = handleTest ./web-servers/unit-php.nix {}; @@ -689,7 +724,9 @@ in { virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; vscodium = discoverTests (import ./vscodium.nix); vsftpd = handleTest ./vsftpd.nix {}; + warzone2100 = handleTest ./warzone2100.nix {}; wasabibackend = handleTest ./wasabibackend.nix {}; + webhook = runTest ./webhook.nix; wiki-js = handleTest ./wiki-js.nix {}; wine = handleTest ./wine.nix {}; wireguard = handleTest ./wireguard {}; @@ -717,6 +754,7 @@ in { zigbee2mqtt = handleTest ./zigbee2mqtt.nix {}; zoneminder = handleTest ./zoneminder.nix {}; zookeeper = handleTest ./zookeeper.nix {}; + zram-generator = handleTest ./zram-generator.nix {}; zrepl = handleTest ./zrepl.nix {}; zsh-history = handleTest ./zsh-history.nix {}; } diff --git a/nixos/tests/alps.nix b/nixos/tests/alps.nix index 8d7814117df1..9756f2d4da15 100644 --- a/nixos/tests/alps.nix +++ b/nixos/tests/alps.nix @@ -4,6 +4,9 @@ let in import ./make-test-python.nix ({ pkgs, ... }: { name = "alps"; + meta = with pkgs.lib.maintainers; { + maintainers = [ hmenke ]; + }; nodes = { server = { @@ -90,7 +93,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; }; - testScript = '' + testScript = { nodes, ... }: '' server.start() server.wait_for_unit("postfix.service") server.wait_for_unit("dovecot2.service") @@ -99,6 +102,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { client.start() client.wait_for_unit("alps.service") + client.wait_for_open_port(${toString nodes.client.config.services.alps.port}) client.succeed("test-alps-login") ''; }) diff --git a/nixos/tests/apcupsd.nix b/nixos/tests/apcupsd.nix new file mode 100644 index 000000000000..287140f039d8 --- /dev/null +++ b/nixos/tests/apcupsd.nix @@ -0,0 +1,41 @@ +let + # arbitrary address + ipAddr = "192.168.42.42"; +in +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "apcupsd"; + meta.maintainers = with lib.maintainers; [ bjornfor ]; + + nodes = { + machine = { + services.apcupsd = { + enable = true; + configText = '' + UPSTYPE usb + BATTERYLEVEL 42 + # Configure NISIP so that the only way apcaccess can work is to read + # this config. + NISIP ${ipAddr} + ''; + }; + networking.interfaces.eth1 = { + ipv4.addresses = [{ + address = ipAddr; + prefixLength = 24; + }]; + }; + }; + }; + + # Check that the service starts, that the CLI (apcaccess) works and that it + # uses the config (ipAddr) defined in the service config. + testScript = '' + start_all() + machine.wait_for_unit("apcupsd.service") + machine.wait_for_open_port(3551, "${ipAddr}") + res = machine.succeed("apcaccess") + expect_line="MBATTCHG : 42 Percent" + assert "MBATTCHG : 42 Percent" in res, f"expected apcaccess output to contain '{expect_line}' but got '{res}'" + machine.shutdown() + ''; +}) diff --git a/nixos/tests/apfs.nix b/nixos/tests/apfs.nix index a8841fe93046..ac0459b57e9c 100644 --- a/nixos/tests/apfs.nix +++ b/nixos/tests/apfs.nix @@ -21,9 +21,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { 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", + "mount -o cknodes,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", @@ -36,13 +34,13 @@ import ./make-test-python.nix ({ pkgs, ... }: { with subtest("Disable case sensitivity and normalization sensitivity"): machine.succeed( "mkapfs /dev/vdb", - "mount -o readwrite /dev/vdb /tmp/mnt", + "mount -o cknodes,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", + "mount -o cknodes,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", diff --git a/nixos/tests/atuin.nix b/nixos/tests/atuin.nix new file mode 100644 index 000000000000..85213d1e53ea --- /dev/null +++ b/nixos/tests/atuin.nix @@ -0,0 +1,65 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + +let + testPort = 8888; + testUser = "testerman"; + testPass = "password"; + testEmail = "test.testerman@test.com"; +in +with lib; +{ + name = "atuin"; + meta.maintainers = with pkgs.lib.maintainers; [ devusb ]; + + nodes = { + server = + { ... }: + { + services.atuin = { + enable = true; + port = testPort; + host = "0.0.0.0"; + openFirewall = true; + openRegistration = true; + }; + }; + + client = + { ... }: + { }; + + }; + + testScript = with pkgs; '' + start_all() + + # wait for atuin server startup + server.wait_for_unit("atuin.service") + server.wait_for_open_port(${toString testPort}) + + # configure atuin client on server node + server.execute("mkdir -p ~/.config/atuin") + server.execute("echo 'sync_address = \"http://localhost:${toString testPort}\"' > ~/.config/atuin/config.toml") + + # register with atuin server on server node + server.succeed("${atuin}/bin/atuin register -u ${testUser} -p ${testPass} -e ${testEmail}") + _, key = server.execute("${atuin}/bin/atuin key") + + # store test record in atuin server and sync + server.succeed("ATUIN_SESSION=$(${atuin}/bin/atuin uuid) ${atuin}/bin/atuin history start 'shazbot'") + server.succeed("${atuin}/bin/atuin sync") + + # configure atuin client on client node + client.execute("mkdir -p ~/.config/atuin") + client.execute("echo 'sync_address = \"http://server:${toString testPort}\"' > ~/.config/atuin/config.toml") + + # log in to atuin server on client node + client.succeed(f"${atuin}/bin/atuin login -u ${testUser} -p ${testPass} -k {key}") + + # pull records from atuin server + client.succeed("${atuin}/bin/atuin sync -f") + + # check for test record + client.succeed("ATUIN_SESSION=$(${atuin}/bin/atuin uuid) ${atuin}/bin/atuin history list | grep shazbot") + ''; +}) diff --git a/nixos/tests/bazarr.nix b/nixos/tests/bazarr.nix index 13b27bb530c0..e59833e5e945 100644 --- a/nixos/tests/bazarr.nix +++ b/nixos/tests/bazarr.nix @@ -16,10 +16,6 @@ in enable = true; listenPort = port; }; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) ["unrar"]; - # Workaround for https://github.com/morpheus65535/bazarr/issues/1983 - # ("Crash when running without timezone info"). - time.timeZone = "UTC"; }; testScript = '' diff --git a/nixos/tests/bootspec.nix b/nixos/tests/bootspec.nix new file mode 100644 index 000000000000..077dff918e0d --- /dev/null +++ b/nixos/tests/bootspec.nix @@ -0,0 +1,170 @@ +{ system ? builtins.currentSystem, + config ? {}, + pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +let + baseline = { + virtualisation.useBootLoader = true; + }; + grub = { + boot.loader.grub.enable = true; + }; + systemd-boot = { + boot.loader.systemd-boot.enable = true; + }; + uefi = { + virtualisation.useEFIBoot = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.grub.efiSupport = true; + environment.systemPackages = [ pkgs.efibootmgr ]; + }; + standard = { + boot.bootspec.enable = true; + + imports = [ + baseline + systemd-boot + uefi + ]; + }; +in +{ + basic = makeTest { + name = "systemd-boot-with-bootspec"; + meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ]; + + nodes.machine = standard; + + testScript = '' + machine.start() + machine.wait_for_unit("multi-user.target") + + machine.succeed("test -e /run/current-system/boot.json") + ''; + }; + + grub = makeTest { + name = "grub-with-bootspec"; + meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ]; + + nodes.machine = { + boot.bootspec.enable = true; + + imports = [ + baseline + grub + uefi + ]; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("multi-user.target") + + machine.succeed("test -e /run/current-system/boot.json") + ''; + }; + + legacy-boot = makeTest { + name = "legacy-boot-with-bootspec"; + meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ]; + + nodes.machine = { + boot.bootspec.enable = true; + + imports = [ + baseline + grub + ]; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("multi-user.target") + + machine.succeed("test -e /run/current-system/boot.json") + ''; + }; + + # Check that initrd create corresponding entries in bootspec. + initrd = makeTest { + name = "bootspec-with-initrd"; + meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ]; + + nodes.machine = { + imports = [ standard ]; + environment.systemPackages = [ pkgs.jq ]; + # It's probably the case, but we want to make it explicit here. + boot.initrd.enable = true; + }; + + testScript = '' + import json + + machine.start() + machine.wait_for_unit("multi-user.target") + + machine.succeed("test -e /run/current-system/bootspec/boot.json") + + bootspec = json.loads(machine.succeed("jq -r '.v1' /run/current-system/bootspec/boot.json")) + + assert all(key in bootspec for key in ('initrd', 'initrdSecrets')), "Bootspec should contain initrd or initrdSecrets field when initrd is enabled" + ''; + }; + + # Check that specialisations create corresponding entries in bootspec. + specialisation = makeTest { + name = "bootspec-with-specialisation"; + meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ]; + + nodes.machine = { + imports = [ standard ]; + environment.systemPackages = [ pkgs.jq ]; + specialisation.something.configuration = {}; + }; + + testScript = '' + import json + + machine.start() + machine.wait_for_unit("multi-user.target") + + machine.succeed("test -e /run/current-system/boot.json") + machine.succeed("test -e /run/current-system/specialisation/something/boot.json") + + sp_in_parent = json.loads(machine.succeed("jq -r '.v1.specialisation.something' /run/current-system/boot.json")) + sp_in_fs = json.loads(machine.succeed("cat /run/current-system/specialisation/something/boot.json")) + + assert sp_in_parent == sp_in_fs['v1'], "Bootspecs of the same specialisation are different!" + ''; + }; + + # Check that extensions are propagated. + extensions = makeTest { + name = "bootspec-with-extensions"; + meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ]; + + nodes.machine = { config, ... }: { + imports = [ standard ]; + environment.systemPackages = [ pkgs.jq ]; + boot.bootspec.extensions = { + osRelease = config.environment.etc."os-release".source; + }; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("multi-user.target") + + current_os_release = machine.succeed("cat /etc/os-release") + bootspec_os_release = machine.succeed("cat $(jq -r '.v1.extensions.osRelease' /run/current-system/boot.json)") + + assert current_os_release == bootspec_os_release, "Filename referenced by extension has unexpected contents" + ''; + }; + +} diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix index d3cd6c66bfeb..4160e727f047 100644 --- a/nixos/tests/borgbackup.nix +++ b/nixos/tests/borgbackup.nix @@ -99,14 +99,28 @@ in { environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519"; }; + sleepInhibited = { + inhibitsSleep = true; + # Blocks indefinitely while "backing up" so that we can try to suspend the local system while it's hung + dumpCommand = pkgs.writeScript "sleepInhibited" '' + cat /dev/zero + ''; + repo = remoteRepo; + encryption.mode = "none"; + startAt = [ ]; + environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519"; + }; + }; }; server = { ... }: { services.openssh = { enable = true; - passwordAuthentication = false; - kbdInteractiveAuthentication = false; + settings = { + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + }; }; services.borgbackup.repos.repo1 = { @@ -204,5 +218,13 @@ in { client.wait_for_unit("network.target") client.systemctl("start --wait borgbackup-job-commandFail") client.succeed("systemctl is-failed borgbackup-job-commandFail") + + with subtest("sleepInhibited"): + server.wait_for_unit("sshd.service") + client.wait_for_unit("network.target") + client.fail("systemd-inhibit --list | grep -q borgbackup") + client.systemctl("start borgbackup-job-sleepInhibited") + client.wait_until_succeeds("systemd-inhibit --list | grep -q borgbackup") + client.systemctl("stop borgbackup-job-sleepInhibited") ''; }) diff --git a/nixos/tests/bpf.nix b/nixos/tests/bpf.nix index 5868e3bfcb4c..5dc97404772b 100644 --- a/nixos/tests/bpf.nix +++ b/nixos/tests/bpf.nix @@ -25,5 +25,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { print(machine.succeed("bpftrace -e 'kprobe:schedule { " " printf(\"tgid: %d\", ((struct task_struct*) curtask)->tgid); exit() " "}'")) + # module BTF (bpftrace >= 0.17) + print(machine.succeed("bpftrace -e 'kfunc:nft_trans_alloc_gfp { " + " printf(\"portid: %d\\n\",args->ctx->portid); " + "} BEGIN { exit() }'")) ''; }) diff --git a/nixos/tests/btrbk.nix b/nixos/tests/btrbk.nix index 9f34f7dfbe38..5261321dfa2c 100644 --- a/nixos/tests/btrbk.nix +++ b/nixos/tests/btrbk.nix @@ -52,8 +52,10 @@ import ./make-test-python.nix ({ pkgs, ... }: environment.systemPackages = with pkgs; [ btrfs-progs ]; services.openssh = { enable = true; - passwordAuthentication = false; - kbdInteractiveAuthentication = false; + settings = { + KbdInteractiveAuthentication = false; + PasswordAuthentication = false; + }; }; services.btrbk = { extraPackages = [ pkgs.lz4 ]; diff --git a/nixos/tests/ceph-single-node.nix b/nixos/tests/ceph-single-node.nix index 4fe5dc59ff8f..4a5636fac156 100644 --- a/nixos/tests/ceph-single-node.nix +++ b/nixos/tests/ceph-single-node.nix @@ -181,6 +181,17 @@ let monA.wait_until_succeeds("ceph osd stat | grep -e '3 osds: 3 up[^,]*, 3 in'") monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'") monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") + + # Enable the dashboard and recheck health + monA.succeed( + "ceph mgr module enable dashboard", + "ceph config set mgr mgr/dashboard/ssl false", + # default is 8080 but it's better to be explicit + "ceph config set mgr mgr/dashboard/server_port 8080", + ) + monA.wait_for_open_port(8080) + monA.wait_until_succeeds("curl -q --fail http://localhost:8080") + monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") ''; in { name = "basic-single-node-ceph-cluster"; diff --git a/nixos/tests/chrony-ptp.nix b/nixos/tests/chrony-ptp.nix new file mode 100644 index 000000000000..b2634a8cfc5c --- /dev/null +++ b/nixos/tests/chrony-ptp.nix @@ -0,0 +1,28 @@ +import ./make-test-python.nix ({ lib, ... }: +{ + name = "chrony-ptp"; + + meta = { + maintainers = with lib.maintainers; [ gkleen ]; + }; + + nodes = { + qemuGuest = { lib, ... }: { + boot.kernelModules = [ "ptp_kvm" ]; + + services.chrony = { + enable = true; + extraConfig = '' + refclock PHC /dev/ptp_kvm poll 2 dpoll -2 offset 0 stratum 3 + ''; + }; + }; + }; + + testScript = '' + start_all() + + qemuGuest.wait_for_unit('multi-user.target') + qemuGuest.succeed('systemctl is-active chronyd.service') + ''; +}) diff --git a/nixos/tests/cloudlog.nix b/nixos/tests/cloudlog.nix new file mode 100644 index 000000000000..c99951c1b22c --- /dev/null +++ b/nixos/tests/cloudlog.nix @@ -0,0 +1,18 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "cloudlog"; + meta = { + maintainers = with pkgs.lib.maintainers; [ melling ]; + }; + nodes = { + machine = { + services.mysql.package = pkgs.mariadb; + services.cloudlog.enable = true; + }; + }; + testScript = '' + start_all() + machine.wait_for_unit("phpfpm-cloudlog") + machine.wait_for_open_port(80); + machine.wait_until_succeeds("curl -s -L --fail http://localhost | grep 'Login - Cloudlog'") + ''; +}) diff --git a/nixos/tests/cockroachdb.nix b/nixos/tests/cockroachdb.nix index d793842f0ab2..5b1e1a7dee1f 100644 --- a/nixos/tests/cockroachdb.nix +++ b/nixos/tests/cockroachdb.nix @@ -8,7 +8,7 @@ # Cluster joins that are outside this window will fail, and nodes that skew # outside the window after joining will promptly get kicked out. # -# To accomodate this, we use QEMU/virtio infrastructure and load the 'ptp_kvm' +# To accommodate this, we use QEMU/virtio infrastructure and load the 'ptp_kvm' # driver inside a guest. This driver allows the host machine to pass its clock # through to the guest as a hardware clock that appears as a Precision Time # Protocol (PTP) Clock device, generally /dev/ptp0. PTP devices can be measured diff --git a/nixos/tests/common/acme/server/acme.test.cert.pem b/nixos/tests/common/acme/server/acme.test.cert.pem index 562e7a329b68..48f488ab8f90 100644 --- a/nixos/tests/common/acme/server/acme.test.cert.pem +++ b/nixos/tests/common/acme/server/acme.test.cert.pem @@ -1,19 +1,19 @@ -----BEGIN CERTIFICATE----- -MIIDLDCCAhSgAwIBAgIIHvJkPAdMFGAwDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UE -AxMVbWluaWNhIHJvb3QgY2EgNDYwMjMxMB4XDTIyMTEyMDE1MzcwNFoXDTI0MTIy -MDE1MzcwNFowFDESMBAGA1UEAxMJYWNtZS50ZXN0MIIBIjANBgkqhkiG9w0BAQEF -AAOCAQ8AMIIBCgKCAQEAs/Xad8Jn0YMI8nTjbVakGsFplxSKkgWs9Jv8tETC1FBV -KNo3yF6IElBhzKw3eF6piZqDwNFXobuMCZ3Ckaj+EOdSA0DhjwUSBmEok/0siIu4 -WbAS2iKwZGuJlJRYOmfXRPt2nNSPhuNHtZJoTWufN5K1XS+4v1dsVUWdWvkUuaC5 -/uoujcYd4D6XDhJCubDCE+WSYk0KBLtMQ8irbNu4FGoCn5T7kDq46XwVjulWxc5q -dZ/Z/zgKQkoLaHgWKLjvuu7/CZw6RXyBlwVJh36pljixRnpnLfMMykO9Sq7Z3cR2 -aVcMRjjeH0uScfFHIb3hvqyZLd+NHw3SqE8la/Nq1wIDAQABo3YwdDAOBgNVHQ8B +MIIDLDCCAhSgAwIBAgIIajCXIUnozqQwDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UE +AxMVbWluaWNhIHJvb3QgY2EgMjMwYjU4MB4XDTIyMTEyMTE3MTcxMFoXDTQyMTEy +MTE3MTcxMFowFDESMBAGA1UEAxMJYWNtZS50ZXN0MIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEA5INxJwKDVYNfTnkXwvKM/SufBNjvxWZxlkaMFbkAN5wJ +6HwuesRZE9IgfRO9N+rSq1U2lDBm9gFPERqsQJVZHHJ5kkaNUr89h25+wgX5emGy +UV2KEpCFssDD4aSBF+b0sryguCa1ZRj9b+pdfRxiYaORjSh5UzlXZoRm9iwHdzHT +oKLlmqozqzEt0o9qpZL8gv+rv8C5BGOY6hfXAHYmkWRt87FN5BkSjgEWiY++DOAU +X0TdobdSTrs/xJP+IbadRchqTH2kiG0g2BoCSXUsl7Mdh4IOUeQGDz/F5tH8PAtz +p3dyjdQEFex2J5tlScLfVHoCBKV3gpCg+Keuum2j8QIDAQABo3YwdDAOBgNVHQ8B Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB -/wQCMAAwHwYDVR0jBBgwFoAUW4rxHHeasqLl7KMK+F3uVN0JGwYwFAYDVR0RBA0w -C4IJYWNtZS50ZXN0MA0GCSqGSIb3DQEBCwUAA4IBAQBDT8HY62N6YbG7Fp3gPD2L -Y0ZFHAAYM5l+Qn55aYkaTxpaRFPAeh0POmTIgSXfFSQYR00w3x2ni0K1ecBI814y -Mkgoki+jP6JhgV1fPTa5Wqm2x/Ufcr6LbTIDVqO5zFxTdkqZHfC7sMahDNULVrN2 -RVkTLppDfmQ+oFcwNvZSgK9SDJNMlsNllOyGGUuMSd1KjWU4/Wr0AmaS+V3Cjf14 -MsvgVhN66ECom1yyy3q9HZgAoZy6lnHOWHD4BVXOmbS2Y1lSVv/atmiGH7F9nvNN -Ggh/+RmkXGczV80wT2TnivEamJGHA4kwThL40SRKfaTTX7miImI25E6+390hBXyw +/wQCMAAwHwYDVR0jBBgwFoAUvTCE3Lj/P6OWkmOGtsjcTcIDzkAwFAYDVR0RBA0w +C4IJYWNtZS50ZXN0MA0GCSqGSIb3DQEBCwUAA4IBAQAvZM4Ik1NOXQfbPRgbolyL +b3afsSHbhHl9B2f0HGi5EAPdwyeWZsK3BF+SKFGAW5BlXr2SSlW/MQOMiUKTadnS +8xTOFc1Ws8JWWc82zQqWcOWEXhU+AI8p70sTVFeXPWwLFy3nBRwDH4ZPU8UFHeje +YXqbfxrsdEFXrbCfWSzPQP24xqVt7n9Am/5XFGtDkRsYlVgLwq/F6lN9hO0/gYIx +8NsZ8Xy+QvBlGL+z9Zo7EylB8bP9OBtOtEv9fZcnxgughieiTDs36GwdQRE2aI+d +cG3lQX8NGxgcpDoH8+rNx7Uw7odg0gVbI3agyyvax6DPht+/bzXmHm8ogklGTOoG -----END CERTIFICATE----- diff --git a/nixos/tests/common/acme/server/acme.test.key.pem b/nixos/tests/common/acme/server/acme.test.key.pem index fd3e9f7dbcf6..4837f19b3024 100644 --- a/nixos/tests/common/acme/server/acme.test.key.pem +++ b/nixos/tests/common/acme/server/acme.test.key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAs/Xad8Jn0YMI8nTjbVakGsFplxSKkgWs9Jv8tETC1FBVKNo3 -yF6IElBhzKw3eF6piZqDwNFXobuMCZ3Ckaj+EOdSA0DhjwUSBmEok/0siIu4WbAS -2iKwZGuJlJRYOmfXRPt2nNSPhuNHtZJoTWufN5K1XS+4v1dsVUWdWvkUuaC5/uou -jcYd4D6XDhJCubDCE+WSYk0KBLtMQ8irbNu4FGoCn5T7kDq46XwVjulWxc5qdZ/Z -/zgKQkoLaHgWKLjvuu7/CZw6RXyBlwVJh36pljixRnpnLfMMykO9Sq7Z3cR2aVcM -RjjeH0uScfFHIb3hvqyZLd+NHw3SqE8la/Nq1wIDAQABAoIBAG2s50FXjLgmONyz -Giv3wrm/qF94GF+X7+l/64nd4jNM5imonJiT7C/lJ0V6q6/DWWXQcn2f191slJMD -v6HQMU8R+2yaLR1hxLN4oSdYA70QEgEvCr5Ap+n7k/SmWAL4aDzVWFuKPBLED178 -ZG7SqU1QLxIk1F5gpFhvvc/Ev7nE0KAzTJ3jGyWHZjJ1TKAWHx6oeKOw4OejRcGO -+rDBfQrV59fiCy8CFraGPDGie5Eb7ioXyt4cf4/odtLol7bSIwH4BLwfvKJbRobi -gSjvL5JJLjhjWzeoj+JC4o0sWQegytWpNCHSFETfHQ8rlcagTN8JaTcBg6+wrR2O -OPeoFqkCgYEA7o9jSk7i23SiKo3C+T9KFIL2OS7akwUqIQZehZJ6LXljYEDP1lcz -wjvWuLGVzlST3fmumHIMZLjjBU1cMYAPZrbUrEeayATD4jBxyiXbHqhB3DQ0W4CX -obUhcdsLGsKp0zXls8FeiQs6GOeEwSDU+1nAL9/hLK7w6cJ2zyj8HBUCgYEAwR3H -/ltIjD8tXNF05ayOguzrbivx2vaXusskZgn9QqntoGqqsXLOgsqcUH0dtiTyVOn+ -Nba7w+o5NfaAfE9uR+oeZSo1IJU8oEi/EZqXTcYf5p3oAjXXZ9wXX8kl91EjCzKl -0kDpSpsMhUzdB2i5I9Oh1fLaW4iMwyuY1CgnqjsCgYBHIJFmEmcpL3k6XtIHJoub -2gA3xHR+6UdKWW/NO4MaE9tBU5GkQpO4EcdPggM8ZZNA17Tq1vZDAa0OY6ZdS+VL -pq96Pk8z29fblL4Ym3jdhyU71oTV011iZXL3U2vYKrofsy4tjjX1fldwHXdDbdqS -povaulGU1QQXblemJH4mkQKBgC3IUq6Rk4x0OdvkaFM+6nZNlq8Cyg7AIU6OdG2g -dqNER+qc/yScdCr7v70xPEb/UVgiNTskvDUBJVkOvH08E4gHD/ep3vh/iOTy+iFB -RheRHeT9kJBdlVixC/WQaWjNmoJAGqHS87vVME214Dyubh35QUfIkE3c/IoUnuHF -N0obAoGBANJpPBF36H1nb+TcVerOBXI8oqeIyoq7f4W/wbIirnZq/XfBaaOL5R6v -6+p4LEcQ1Mf33Yfr5M4aR0q7fgNDg/g4LcMg6fI3+UwPC6lJY+K8zzF4fmGDhheC -D+LsZG0Funl9kT0yxPBQhCJmmkJNIHiSNuRLt9Infne2408+YV+T +MIIEpQIBAAKCAQEA5INxJwKDVYNfTnkXwvKM/SufBNjvxWZxlkaMFbkAN5wJ6Hwu +esRZE9IgfRO9N+rSq1U2lDBm9gFPERqsQJVZHHJ5kkaNUr89h25+wgX5emGyUV2K +EpCFssDD4aSBF+b0sryguCa1ZRj9b+pdfRxiYaORjSh5UzlXZoRm9iwHdzHToKLl +mqozqzEt0o9qpZL8gv+rv8C5BGOY6hfXAHYmkWRt87FN5BkSjgEWiY++DOAUX0Td +obdSTrs/xJP+IbadRchqTH2kiG0g2BoCSXUsl7Mdh4IOUeQGDz/F5tH8PAtzp3dy +jdQEFex2J5tlScLfVHoCBKV3gpCg+Keuum2j8QIDAQABAoIBAHfnUHQ7qVYxfMzc +VU+BneEqBmKwwf8+ZdOIaPDtBeQoCDrpDip05Ji15T48IUk5+hjUubLAQwZKYYaE +DGZG918p4giS5IzKtCpgHDsKj4FbyglPn6dmFgFZjG7VtrcoBLXUrDB0fzHxDuqu +eyeuwSCihzkeR6sXp3iveKcrKy+rA31aqWvJZb24qyAu1y8KIcf2ZMUiYcJF2kpL +XZz4uyx4x/B9NE+PmLqo7x/9iS+p5aT2kWVCVUGmhII0ChFnWSnjxqecBMhWFY1O +3U0lKhloj6UKBya91hGospEJdaLHpHCWUgYPvA5mG+48kqYkPkecmTf8Xha3TxPf +g1qv3sECgYEA+hMO1qTlnqhBajCMcAGIlpRHwr97hQMdSylHBXob1xCnuTEJKHOo +7UmQw9hJgD4JgYxcivg/OFErXdefbSae9NqSNdOshxmrxz6DFTN3Ms3WR1I1be3c +B2mpGllMPbxJ3CKFet2CQSvOM9jfbK68R7Jlhiap0bESvWrT9ztUCWUCgYEA6e2Y +iMNNo1dWushSMVvCkWR9CLAsnWnjFG4FYIPz/iuxJjRXDiWyR6x4WYjUx3ZBhpf5 +wVFUK7VaPJBfOn7KCan59dqOvL3LSB/5SupwRMecCEhYPQvSaxn4MNrx0Vi83O4C +togyD9/UJ4ji+TXwMj2eMzwRspmO/26hXkQGzZ0CgYEA0qlLTrYKWOUUdgf/xjsE +fRTcfsofm6VMAAz9rzd2TG3TXMZaGKGWJI5cTR7ejBG2oFNFgiwt1ZtLFPqXarOm +JE4b7QwrwoN1mZqngiygtUOAxwQRzlEZkYUI1xFykG8VKURLfX0sRQpJ4pNHY56v +LRazP5dCZ0rrpnVfql1oJaECgYEAxtvT728XcOOuNtpUBOGcZTynjds2EhsRjyx4 +JbQGlutNjMyxtLUW+RcEuBg5ydYdne1Tw6L/iqiALTwNuAxQdCaq9vT0oj41sPp9 +UdI53j5Rxji5yitilOlesylsqCpnYuhyJflhlV0RXQpg6LmRlyQKeEN4R/uCNGI3 +i4sIvYECgYEA4DC2qObfB0UkN81uGluwwM5rR04qvIc5xX3QIvHuIJOs/uP54daD +OiEDTxTpiqDNsFL0Pyl07aL7jubHNqU/eQpQIEZRlDy4Mr31QSbQ9R2/NNBwHu22 +BnnNKzZ97T0NVgxJXOqcOlRGjwb/5OUDpaIClJY+GqilEdOeu7Pl3aA= -----END RSA PRIVATE KEY----- diff --git a/nixos/tests/common/acme/server/ca.cert.pem b/nixos/tests/common/acme/server/ca.cert.pem index 8d52a0a8f462..b6f2b9e3a91f 100644 --- a/nixos/tests/common/acme/server/ca.cert.pem +++ b/nixos/tests/common/acme/server/ca.cert.pem @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDSzCCAjOgAwIBAgIIRgIx/Q6DdK0wDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UE -AxMVbWluaWNhIHJvb3QgY2EgNDYwMjMxMCAXDTIyMTEyMDE1MzcwNFoYDzIxMjIx -MTIwMTUzNzA0WjAgMR4wHAYDVQQDExVtaW5pY2Egcm9vdCBjYSA0NjAyMzEwggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYxM/efiS7rNNzdu+AK+J57+om -QYsoteVpmwcU6Ul8Zr6pcsBSLetV2PCWGVKKfXdK1Ep+JdBoiuG8EY/wffYJy+So -WRRWX+bGIFly74urX2iOH/yimF8XMaHj4CzjMD1wM2rFLswL3VK2DM+wrCMO2zE2 -BAiUAJ++ws99Dl74DQ9lGne8hMjFgzakINCNd948/t2+LMVxqCgQ7fI+iHA1X7QF -1AT5c86wd/GxLzfl343DxLSeMRFbGUVSH6NBBnIQdFDq1GjNGPbn8ZlDXw5WWeR5 -ufnxcRRNpp3GnHG3/VOebFAr++5/0ze+QvF6XPXk9RZWvhh0dD14/8W/PMK1AgMB +MIIDSzCCAjOgAwIBAgIIIwtYp+WlBbswDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UE +AxMVbWluaWNhIHJvb3QgY2EgMjMwYjU4MCAXDTIyMTEyMTE3MTcxMFoYDzIxMjIx +MTIxMTcxNzEwWjAgMR4wHAYDVQQDExVtaW5pY2Egcm9vdCBjYSAyMzBiNTgwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvqAoAyV8igrmBnU6T1nQDfkkQ +HjQp+ANCthNCi4kGPOoTxrYrUMWa6d/aSIv5hKO2A+r2GdTeM1RvSo6GUr3GmsJc +WUMbIsJ0SJSLQEyvmFPpzfV3NdfIt6vZRiqJbLt7yuDiZil33GdQEKYywJxIsCb2 +CSd55V1cZSiLItWEIURAhHhSxHabMRmIF/xZWxKFEDeagzXOxUBPAvIwzzqQroBv +3vZhfgcAjCyS0crJ/E2Wa6GLKfFvaXGEj/KlXftwpbvFtnNBtmtJcNy9a8LJoOcA +E+ZjD21hidnCc+Yag7LaR3ZtAVkpeRJ9rRNBkVP4rv2mq2skIkgDfY/F8smPAgMB AAGjgYYwgYMwDgYDVR0PAQH/BAQDAgKEMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr -BgEFBQcDAjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBRbivEcd5qyouXs -owr4Xe5U3QkbBjAfBgNVHSMEGDAWgBRbivEcd5qyouXsowr4Xe5U3QkbBjANBgkq -hkiG9w0BAQsFAAOCAQEAdSudxwrpXf/nxXJ8THob63UEvvof0o7uENbNPjqt7VZZ -lQeKnZOrzjYbTcsbyDpm/zsniT9620ntVcL4/IG2eeuSPA9btHNiFM6R3Nby8Op4 -emqNzrS0DFqV/CAOAue+C44Vb9IS+ibFxEpI3GTH0FVWpEglLuesXKV+boy1aCNq -BYvk6lVplmnTtyfEUAQxyjJhTHu0+ZDwmw1+/NY9Wn2aeile+/G8ao+MBXARELmq -aoGKfFfrMGRT/KDSyODBEdJ1XkLr0TYjNvyctsaYBp9FhVQiuNMOyCku7EB8y+tZ -odYtLw6ecNnrjgQAnxSDg1ChrQ0wNSdPyjvycNgvjQ== +BgEFBQcDAjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBS9MITcuP8/o5aS +Y4a2yNxNwgPOQDAfBgNVHSMEGDAWgBS9MITcuP8/o5aSY4a2yNxNwgPOQDANBgkq +hkiG9w0BAQsFAAOCAQEADCcgaxrI/pqjkYb0c3QHwfKCNz4khSWs/9tBpBfdxdUX +uvG7rZzVW7pkzML+m4tSo2wm9sHRAgG+dIpzbSoRTouMntWlvYEnrr1SCw4NyBo1 +cwmNUz4JL+E3dnpI4FSOpyFyO87qL9ep0dxQEADWSppyCA762wfFpY+FvT6b/he8 +eDEc/Umjfm+X0tqNWx3aVoeyIJT46AeElry2IRLAk7z/vEPGFFzgd2Jh6Qsdeagk +YkU0tFl9q9BotPYGlCMtVjmzbJtxh4uM9YCgiz1THzFjrUvfaTM8VjuBxbpoCZkS +85mNhFZvNq8/cgYc0kYZOg8+jRdy87xmTRp64LBd6w== -----END CERTIFICATE----- diff --git a/nixos/tests/common/acme/server/ca.key.pem b/nixos/tests/common/acme/server/ca.key.pem index cde4e8ac7c75..5d46c025788f 100644 --- a/nixos/tests/common/acme/server/ca.key.pem +++ b/nixos/tests/common/acme/server/ca.key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAmMTP3n4ku6zTc3bvgCviee/qJkGLKLXlaZsHFOlJfGa+qXLA -Ui3rVdjwlhlSin13StRKfiXQaIrhvBGP8H32CcvkqFkUVl/mxiBZcu+Lq19ojh/8 -ophfFzGh4+As4zA9cDNqxS7MC91StgzPsKwjDtsxNgQIlACfvsLPfQ5e+A0PZRp3 -vITIxYM2pCDQjXfePP7dvizFcagoEO3yPohwNV+0BdQE+XPOsHfxsS835d+Nw8S0 -njERWxlFUh+jQQZyEHRQ6tRozRj25/GZQ18OVlnkebn58XEUTaadxpxxt/1TnmxQ -K/vuf9M3vkLxelz15PUWVr4YdHQ9eP/FvzzCtQIDAQABAoIBAAMvJv4GNxHKWmXv -trI/N+s+uuytNQ9WKz/2QUGIU0XKhnLVt3h/CIazjOA0CupkDxZ6MktK0ns7WdUn -sI5cscImg8+We7wJJ7A9gF/K6mhaBr3foM5qyqCbIjqzs3vQx5cNG06c2RfuNwkg -XzvZeqmWnAH6N4uOL8Y0HUsH/6a/5rHEBTgUOnOidR8T1vdIN5vnpknef/H575ab -jTdDyb15Vns7nC4Q8lortkLsQzOt//LWpVuLZXGDm1Xi47ahNXM8Fo/MFK+xcBDF -onMFuclxImN3FqkyMH6PgJS392bZ1LLcmS4bqZ0oIwfUZ/kIEwAI2cTwEYfYmN7C -ekgvpsECgYEAxoJUcZW4iWvT8kznWKKT+YJAfTYmgwOxB1Dn3RxFA8cXocQQvwvM -mSl1AKOjWHFl/eW9s4zwy/fOnsN1m1tCTuWSNn5sudZSJfbd5CCiYaYTI66McCCm -5FGzqLM44Wm5y2qLa7l3in8Tza/645RpLXZyRfMInoW5In0XKbokLbkCgYEAxQM/ -p63V5KuZYsm9BWNcCvAbS6G9NHjbeRrkAd171SSdibdwLIBeyn7A5JCiVqhZZbsO -1q1okO4m4j+JHzntWi63yXwG49sEVNaFbExPE4tfJeHD0Po8MJffoLNVTE+INT0B -fl1elhMpE9qpizFIHF7L8KnUf5Igi+yp0d6Amt0CgYACAhmGmKQoR736KosAm4xx -rr6mRaD4HFZzI39k/j84fZAgo9IjjKQCPKghXIZvg54rhmJ36YoaFiSx+Ho9Gxw9 -nhbvlDHXY3KrTacLAsWBxWNWLhLfo4TstGLj5wRBS4eEpkxIx7SM4yI5J3mbScoS -mqsnSAEjUWkBD1DnrClniQKBgQCdfC9SNp+Yn6OJWIKE4Bwfkjf/iVbZrxKiCGDj -LM1kYFSeVciRijw72n8PNp7ObtyneZQu/4dq8zSZ/vf5wjB9uoKnyUEou1cHCkS1 -gXpkwTBZ89K4JpAeuAjHSROSYLEc/ZtIDBMkHETl3hFRdx+RriWQR/HZ2FG0CIbn -gNmE8QKBgDlFu+TcspI2R9mKbHrbPTXOAlmi2g7RZ3jF1m4S/aZqSL/bqPRBb0OU -dY7MX4GHhJYR7RnMMROZQI0H4ZwWSMfokBDa96MDY107atK8TqZmYKaZQsEB8B4r -fMmKnQljYj91d/reowLJrQRf5SjBvtDIEIsiC8UgjQImAsZ8huEX +MIIEowIBAAKCAQEAr6gKAMlfIoK5gZ1Ok9Z0A35JEB40KfgDQrYTQouJBjzqE8a2 +K1DFmunf2kiL+YSjtgPq9hnU3jNUb0qOhlK9xprCXFlDGyLCdEiUi0BMr5hT6c31 +dzXXyLer2UYqiWy7e8rg4mYpd9xnUBCmMsCcSLAm9gkneeVdXGUoiyLVhCFEQIR4 +UsR2mzEZiBf8WVsShRA3moM1zsVATwLyMM86kK6Ab972YX4HAIwsktHKyfxNlmuh +iynxb2lxhI/ypV37cKW7xbZzQbZrSXDcvWvCyaDnABPmYw9tYYnZwnPmGoOy2kd2 +bQFZKXkSfa0TQZFT+K79pqtrJCJIA32PxfLJjwIDAQABAoIBAErEFJXnIIY47Cq+ +QS7t7e16uDCTGpLujLy9cQ83AzjTfrKyNuHS/HkGqRBpJqMrEN+tZTohHpkBciP4 +sRd9amd5gdb663RGZExIhGmNEdb/2F/BGYUHNvSpMQ1HL13VGSwE25mh8G6jMppC +q+sYTq0lxT+d/96DgSyNpicqyYT2S2CTCRkWGAsc6KQwRpBYqoEqUeakyGfe2k85 +pj32H53Si/49fkWkQ9RciPdg7qcu7u/iegwAkkjKoATeEjNf0NqBlkWag1qU0UHR +r2xDin+3ffEU2GQEwSvnGwlo7uyAN0UsryEWa9suuhX5T4eSWAMgTL4iVkh8Aa24 ++YEFOGkCgYEA0DUb++31+nuxU8N+GPaPQXiob8C0RmSzSzSHJ3daJpzq8k576jqs +3TgkhLDzQepcTYVU2ucn6+9ziXEsz4H06W3FNGktnyK4BRqYitt5TjZvPc+WTPhR +0U+iUqBZilCAhUkIsNUiGvnMhz9VfcS/gn+NqhL7kvYi11/jAc4bbB0CgYEA1/oh ++t1ZKVLkbANrma/M8AX27Vl3k4jgOWGzFwAVD10zN31gGyVjv1knmG22pmL2+N+Z +8CnVmdHQQQIWV1pYbgwRkvpnZWyH7AvHd9l1XLYyOU3VEpz+e2bpMtzesaza3UWW +k8NELNE5sBopY939XkQ9G3aMXtbkx01zX+0BZJsCgYB+MdJ2TfKrEVGXfYPuSXLm +seUVZu1dRSfOy1WnvBVuFenpV1yPyWSA6MhpjH7EUvIDIm8eBsERpZ6XjXslgpUY +7ql6bM10CK0UmtwePYw2tZOTGUD2AgRFI0k1X28mAEkFgBC+bVAwnXsz9lUw15Fj +3T/V9493savIcpu6uluwmQKBgQCE/I4jzFv0aAgiwlBlB6znNqT/LRHGFIgMjS4b +QX+2QCsjRd4BmRo8XodVAmlvNozgXb6J9RiDaIAVJ1XeX9EHogLIP8ue1h8zp2Uh +VRNBDScLxfMnTOgd0BZTrVCqkscJbKn1Pk0iU4pz9wf5aF10yAvgdzSjySqB1hzu +uh8bdQKBgEpFIyhqfXf/NzchI5y23Cok14LFIPJ1yERD/B8taS7muVQwpgffy+Ld +BH7dhafWSDVqIk1e6yl+82b4amleTEmDfopgc6FR7uPid1JoFxrwhnEfC3FjZamp +1OzXAOE/mX3jHf1spqpB2J/rDVPKi934ocQVoWnBeRopGTXxzbed -----END RSA PRIVATE KEY----- diff --git a/nixos/tests/common/acme/server/generate-certs.nix b/nixos/tests/common/acme/server/generate-certs.nix index cd8fe0dffca1..4f38ca309b05 100644 --- a/nixos/tests/common/acme/server/generate-certs.nix +++ b/nixos/tests/common/acme/server/generate-certs.nix @@ -10,8 +10,12 @@ let domain = conf.domain; in mkDerivation { name = "test-certs"; - buildInputs = [ minica ]; - phases = [ "buildPhase" "installPhase" ]; + buildInputs = [ (minica.overrideAttrs (old: { + prePatch = '' + sed -i 's_NotAfter: time.Now().AddDate(2, 0, 30),_NotAfter: time.Now().AddDate(20, 0, 0),_' main.go + ''; + })) ]; + dontUnpack = true; buildPhase = '' minica \ diff --git a/nixos/tests/common/ec2.nix b/nixos/tests/common/ec2.nix index 64b0a91ac1f7..6ed420e0aae7 100644 --- a/nixos/tests/common/ec2.nix +++ b/nixos/tests/common/ec2.nix @@ -46,7 +46,7 @@ with pkgs.lib; # Note: we use net=169.0.0.0/8 rather than # net=169.254.0.0/16 to prevent dhcpcd from getting horribly # confused. (It would get a DHCP lease in the 169.254.* - # range, which it would then configure and prompty delete + # range, which it would then configure and promptly delete # again when it deletes link-local addresses.) Ideally we'd # turn off the DHCP server, but qemu does not have an option # to do that. diff --git a/nixos/tests/connman.nix b/nixos/tests/connman.nix new file mode 100644 index 000000000000..348b2a895a63 --- /dev/null +++ b/nixos/tests/connman.nix @@ -0,0 +1,77 @@ +import ./make-test-python.nix ({ pkgs, lib, ...}: +{ + name = "connman"; + meta = with lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; + + # Router running radvd on VLAN 1 + nodes.router = { ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + virtualisation.vlans = [ 1 ]; + + boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true; + + networking = { + useDHCP = false; + interfaces.eth1.ipv6.addresses = + [ { address = "fd12::1"; prefixLength = 64; } ]; + }; + + services.radvd = { + enable = true; + config = '' + interface eth1 { + AdvSendAdvert on; + AdvManagedFlag on; + AdvOtherConfigFlag on; + prefix fd12::/64 { + AdvAutonomous off; + }; + }; + ''; + }; + }; + + # Client running connman, connected to VLAN 1 + nodes.client = { ... }: { + virtualisation.vlans = [ 1 ]; + + # add a virtual wlan interface + boot.kernelModules = [ "mac80211_hwsim" ]; + boot.extraModprobeConfig = '' + options mac80211_hwsim radios=1 + ''; + + # Note: the overrides are needed because the wifi is + # disabled with mkVMOverride in qemu-vm.nix. + services.connman.enable = lib.mkOverride 0 true; + services.connman.networkInterfaceBlacklist = [ "eth0" ]; + networking.wireless.enable = lib.mkOverride 0 true; + networking.wireless.interfaces = [ "wlan0" ]; + }; + + testScript = + '' + start_all() + + with subtest("Router is ready"): + router.wait_for_unit("radvd.service") + + with subtest("Daemons are running"): + client.wait_for_unit("wpa_supplicant-wlan0.service") + client.wait_for_unit("connman.service") + client.wait_until_succeeds("connmanctl state | grep -q ready") + + with subtest("Wired interface is configured"): + client.wait_until_succeeds("ip -6 route | grep -q fd12::/64") + client.wait_until_succeeds("ping -c 1 fd12::1") + + with subtest("Can set up a wireless access point"): + client.succeed("connmanctl enable wifi") + client.wait_until_succeeds("connmanctl tether wifi on nixos-test reproducibility | grep -q 'Enabled'") + client.wait_until_succeeds("iw wlan0 info | grep -q nixos-test") + ''; +}) + diff --git a/nixos/tests/coturn.nix b/nixos/tests/coturn.nix index dff832281c7c..301b34b0da70 100644 --- a/nixos/tests/coturn.nix +++ b/nixos/tests/coturn.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ ... }: { +import ./make-test-python.nix ({ pkgs, ... }: { name = "coturn"; nodes = { default = { @@ -25,5 +25,9 @@ import ./make-test-python.nix ({ ... }: { with subtest("works with static-auth-secret-file"): secretsfile.wait_for_unit("coturn.service") secretsfile.succeed("grep 'some-very-secret-string' /run/coturn/turnserver.cfg") + # Forbidden IP, fails: + secretsfile.fail("${pkgs.coturn}/bin/turnutils_uclient -W some-very-secret-string 127.0.0.1 -DgX -e 127.0.0.1 -n 1 -c -y") + # allowed-peer-ip, should succeed: + secretsfile.succeed("${pkgs.coturn}/bin/turnutils_uclient -W some-very-secret-string 192.168.1.2 -DgX -e 192.168.1.2 -n 1 -c -y") ''; }) diff --git a/nixos/tests/cups-pdf.nix b/nixos/tests/cups-pdf.nix new file mode 100644 index 000000000000..70d14f29e2e5 --- /dev/null +++ b/nixos/tests/cups-pdf.nix @@ -0,0 +1,40 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "cups-pdf"; + + nodes.machine = { pkgs, ... }: { + imports = [ ./common/user-account.nix ]; + environment.systemPackages = [ pkgs.poppler_utils ]; + fonts.fonts = [ pkgs.dejavu_fonts ]; # yields more OCR-able pdf + services.printing.cups-pdf.enable = true; + services.printing.cups-pdf.instances = { + opt = {}; + noopt.installPrinter = false; + }; + hardware.printers.ensurePrinters = [{ + name = "noopt"; + model = "CUPS-PDF_noopt.ppd"; + deviceUri = "cups-pdf:/noopt"; + }]; + }; + + # we cannot check the files with pdftotext, due to + # https://github.com/alexivkin/CUPS-PDF-to-PDF/issues/7 + # we need `imagemagickBig` as it has ghostscript support + + testScript = '' + from subprocess import run + machine.wait_for_unit("cups.service") + for name in ("opt", "noopt"): + text = f"test text {name}".upper() + machine.wait_until_succeeds(f"lpstat -v {name}") + machine.succeed(f"su - alice -c 'echo -e \"\n {text}\" | lp -d {name}'") + # wait until the pdf files are completely produced and readable by alice + machine.wait_until_succeeds(f"su - alice -c 'pdfinfo /var/spool/cups-pdf-{name}/users/alice/*.pdf'") + machine.succeed(f"cp /var/spool/cups-pdf-{name}/users/alice/*.pdf /tmp/{name}.pdf") + machine.copy_from_vm(f"/tmp/{name}.pdf", "") + run(f"${pkgs.imagemagickBig}/bin/convert -density 300 $out/{name}.pdf $out/{name}.jpeg", shell=True, check=True) + assert text.encode() in run(f"${lib.getExe pkgs.tesseract} $out/{name}.jpeg stdout", shell=True, check=True, capture_output=True).stdout + ''; + + meta.maintainers = [ lib.maintainers.yarny ]; +}) diff --git a/nixos/tests/dnscrypt-proxy2.nix b/nixos/tests/dnscrypt-proxy2.nix index 4435d77bbf3b..a75a745d3553 100644 --- a/nixos/tests/dnscrypt-proxy2.nix +++ b/nixos/tests/dnscrypt-proxy2.nix @@ -26,7 +26,7 @@ in { }; services.dnsmasq.enable = true; - services.dnsmasq.servers = [ "127.0.0.1#${toString localProxyPort}" ]; + services.dnsmasq.settings.server = [ "127.0.0.1#${toString localProxyPort}" ]; }; }; diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 21a727dbd97c..98704ecb2fb6 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -419,6 +419,20 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker rmi layered-image-with-path", ) + with subtest("Ensure correct architecture is present in manifests."): + docker.succeed(""" + docker load --input='${examples.build-image-with-architecture}' + docker inspect build-image-with-architecture \ + | ${pkgs.jq}/bin/jq -er '.[] | select(.Architecture=="arm64").Architecture' + docker rmi build-image-with-architecture + """) + docker.succeed(""" + ${examples.layered-image-with-architecture} | docker load + docker inspect layered-image-with-architecture \ + | ${pkgs.jq}/bin/jq -er '.[] | select(.Architecture=="arm64").Architecture' + docker rmi layered-image-with-architecture + """) + with subtest("etc"): docker.succeed("${examples.etc} | docker load") docker.succeed("docker run --rm etc | grep localhost") @@ -431,5 +445,58 @@ import ./make-test-python.nix ({ pkgs, ... }: { docker.succeed("docker run --rm image-with-certs:latest test -r /etc/pki/tls/certs/ca-bundle.crt") docker.succeed("docker image rm image-with-certs:latest") + with subtest("buildNixShellImage: Can build a basic derivation"): + docker.succeed( + "${examples.nix-shell-basic} | docker load", + "docker run --rm nix-shell-basic bash -c 'buildDerivation && $out/bin/hello' | grep '^Hello, world!$'" + ) + + with subtest("buildNixShellImage: Runs the shell hook"): + docker.succeed( + "${examples.nix-shell-hook} | docker load", + "docker run --rm -it nix-shell-hook | grep 'This is the shell hook!'" + ) + + with subtest("buildNixShellImage: Sources stdenv, making build inputs available"): + docker.succeed( + "${examples.nix-shell-inputs} | docker load", + "docker run --rm -it nix-shell-inputs | grep 'Hello, world!'" + ) + + with subtest("buildNixShellImage: passAsFile works"): + docker.succeed( + "${examples.nix-shell-pass-as-file} | docker load", + "docker run --rm -it nix-shell-pass-as-file | grep 'this is a string'" + ) + + with subtest("buildNixShellImage: run argument works"): + docker.succeed( + "${examples.nix-shell-run} | docker load", + "docker run --rm -it nix-shell-run | grep 'This shell is not interactive'" + ) + + with subtest("buildNixShellImage: command argument works"): + docker.succeed( + "${examples.nix-shell-command} | docker load", + "docker run --rm -it nix-shell-command | grep 'This shell is interactive'" + ) + + with subtest("buildNixShellImage: home directory is writable by default"): + docker.succeed( + "${examples.nix-shell-writable-home} | docker load", + "docker run --rm -it nix-shell-writable-home" + ) + + with subtest("buildNixShellImage: home directory can be made non-existent"): + docker.succeed( + "${examples.nix-shell-nonexistent-home} | docker load", + "docker run --rm -it nix-shell-nonexistent-home" + ) + + with subtest("buildNixShellImage: can build derivations"): + docker.succeed( + "${examples.nix-shell-build-derivation} | docker load", + "docker run --rm -it nix-shell-build-derivation" + ) ''; }) diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index 67657e89f74c..55908a11f3f4 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -1,86 +1,101 @@ import ./make-test-python.nix ({ pkgs, ... }: let - template-bootstrap3 = pkgs.stdenv.mkDerivation { + template-bootstrap3 = pkgs.stdenv.mkDerivation rec { name = "bootstrap3"; - # Download the theme from the dokuwiki site - src = pkgs.fetchurl { - url = "https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip"; - sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6"; + version = "2022-07-27"; + src = pkgs.fetchFromGitHub { + owner = "giterlizzi"; + repo = "dokuwiki-template-bootstrap3"; + rev = "v${version}"; + hash = "sha256-B3Yd4lxdwqfCnfmZdp+i/Mzwn/aEuZ0ovagDxuR6lxo="; }; - # We need unzip to build this package - nativeBuildInputs = [ pkgs.unzip ]; - # Installing simply means copying all files to the output directory installPhase = "mkdir -p $out; cp -R * $out/"; }; - # Let's package the icalevents plugin - plugin-icalevents = pkgs.stdenv.mkDerivation { + plugin-icalevents = pkgs.stdenv.mkDerivation rec { name = "icalevents"; - # Download the plugin from the dokuwiki site - src = pkgs.fetchurl { - url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip"; - sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8"; + version = "2017-06-16"; + src = pkgs.fetchzip { + stripRoot = false; + url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/${version}/dokuwiki-plugin-icalevents-${version}.zip"; + hash = "sha256-IPs4+qgEfe8AAWevbcCM9PnyI0uoyamtWeg4rEb+9Wc="; }; - # We need unzip to build this package - nativeBuildInputs = [ pkgs.unzip ]; - sourceRoot = "."; - # Installing simply means copying all files to the output directory installPhase = "mkdir -p $out; cp -R * $out/"; }; + acronymsFile = pkgs.writeText "acronyms.local.conf" '' + r13y reproducibility + ''; + + dwWithAcronyms = pkgs.dokuwiki.overrideAttrs (prev: { + installPhase = prev.installPhase or "" + '' + ln -sf ${acronymsFile} $out/share/dokuwiki/conf/acronyms.local.conf + ''; + }); + + mkNode = webserver: { ... }: { + services.dokuwiki = { + inherit webserver; + + sites = { + "site1.local" = { + templates = [ template-bootstrap3 ]; + settings = { + useacl = false; + userewrite = true; + template = "bootstrap3"; + }; + }; + "site2.local" = { + package = dwWithAcronyms; + usersFile = "/var/lib/dokuwiki/site2.local/users.auth.php"; + plugins = [ plugin-icalevents ]; + settings = { + useacl = true; + superuser = "admin"; + title._file = titleFile; + plugin.dummy.empty = "This is just for testing purposes"; + }; + acl = [ + { page = "*"; + actor = "@ALL"; + level = "read"; } + { page = "acl-test"; + actor = "@ALL"; + level = "none"; } + ]; + pluginsConfig = { + authad = false; + authldap = false; + authmysql = false; + authpgsql = false; + tag = false; + icalevents = true; + }; + }; + }; + }; + + networking.firewall.allowedTCPPorts = [ 80 ]; + networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; + }; + + titleFile = pkgs.writeText "dokuwiki-title" "DokuWiki on site2"; in { name = "dokuwiki"; meta = with pkgs.lib; { maintainers = with maintainers; [ _1000101 onny + e1mo ]; }; nodes = { - dokuwiki_nginx = {...}: { - services.dokuwiki = { - sites = { - "site1.local" = { - aclUse = false; - superUser = "admin"; - }; - "site2.local" = { - usersFile = "/var/lib/dokuwiki/site2.local/users.auth.php"; - superUser = "admin"; - templates = [ template-bootstrap3 ]; - plugins = [ plugin-icalevents ]; - }; - }; - }; - - networking.firewall.allowedTCPPorts = [ 80 ]; - networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; - }; - - dokuwiki_caddy = {...}: { - services.dokuwiki = { - webserver = "caddy"; - sites = { - "site1.local" = { - aclUse = false; - superUser = "admin"; - }; - "site2.local" = { - usersFile = "/var/lib/dokuwiki/site2.local/users.auth.php"; - superUser = "admin"; - templates = [ template-bootstrap3 ]; - plugins = [ plugin-icalevents ]; - }; - }; - }; - - networking.firewall.allowedTCPPorts = [ 80 ]; - networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; - }; - + dokuwiki_nginx = mkNode "nginx"; + dokuwiki_caddy = mkNode "caddy"; }; testScript = '' @@ -99,13 +114,48 @@ in { machine.succeed("curl -sSfL http://site1.local/ | grep 'DokuWiki'") machine.fail("curl -sSfL 'http://site1.local/doku.php?do=login' | grep 'Login'") - machine.succeed("curl -sSfL http://site2.local/ | grep 'DokuWiki'") + machine.succeed("curl -sSfL http://site2.local/ | grep 'DokuWiki on site2'") machine.succeed("curl -sSfL 'http://site2.local/doku.php?do=login' | grep 'Login'") - machine.succeed( + with subtest("ACL Operations"): + machine.succeed( "echo 'admin:$2y$10$ijdBQMzSVV20SrKtCna8gue36vnsbVm2wItAXvdm876sshI4uwy6S:Admin:admin@example.test:user' >> /var/lib/dokuwiki/site2.local/users.auth.php", "curl -sSfL -d 'u=admin&p=password' --cookie-jar cjar 'http://site2.local/doku.php?do=login'", "curl -sSfL --cookie cjar --cookie-jar cjar 'http://site2.local/doku.php?do=login' | grep 'Logged in as: Admin'", - ) + ) + + # Ensure the generated ACL is valid + machine.succeed( + "echo 'No Hello World! for @ALL here' >> /var/lib/dokuwiki/site2.local/data/pages/acl-test.txt", + "curl -sSL 'http://site2.local/doku.php?id=acl-test' | grep 'Permission Denied'" + ) + + with subtest("Customizing Dokuwiki"): + machine.succeed( + "echo 'r13y is awesome!' >> /var/lib/dokuwiki/site2.local/data/pages/acronyms-test.txt", + "curl -sSfL 'http://site2.local/doku.php?id=acronyms-test' | grep 'r13y'", + ) + + # Testing if plugins (a) be correctly loaded and (b) configuration to enable them works + machine.succeed( + "echo '~~INFO:syntaxplugins~~' >> /var/lib/dokuwiki/site2.local/data/pages/plugin-list.txt", + "curl -sSfL 'http://site2.local/doku.php?id=plugin-list' | grep 'plugin:icalevents'", + "curl -sSfL 'http://site2.local/doku.php?id=plugin-list' | (! grep 'plugin:tag')", + ) + + # Test if theme is applied and working correctly (no weired relative PHP import errors) + machine.succeed( + "curl -sSfL 'http://site1.local/doku.php' | grep 'bootstrap3/images/logo.png'", + "curl -sSfL 'http://site1.local/lib/exe/css.php' | grep 'bootstrap3'", + "curl -sSfL 'http://site1.local/lib/tpl/bootstrap3/css.php'", + ) + + + # Just to ensure both Webserver configurations are consistent in allowing that + with subtest("Rewriting"): + machine.succeed( + "echo 'Hello, NixOS!' >> /var/lib/dokuwiki/site1.local/data/pages/rewrite-test.txt", + "curl -sSfL http://site1.local/rewrite-test | grep 'Hello, NixOS!'", + ) ''; }) diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index aa3c2b7051f6..e649761d029d 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -16,8 +16,6 @@ let ../modules/testing/test-instrumentation.nix ../modules/profiles/qemu-guest.nix { - ec2.hvm = true; - # Hack to make the partition resizing work in QEMU. boot.initrd.postDeviceCommands = mkBefore '' ln -s vda /dev/xvda diff --git a/nixos/tests/envfs.nix b/nixos/tests/envfs.nix new file mode 100644 index 000000000000..3f9cd1edb595 --- /dev/null +++ b/nixos/tests/envfs.nix @@ -0,0 +1,42 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: +let + pythonShebang = pkgs.writeScript "python-shebang" '' + #!/usr/bin/python + print("OK") + ''; + + bashShebang = pkgs.writeScript "bash-shebang" '' + #!/usr/bin/bash + echo "OK" + ''; +in +{ + name = "envfs"; + nodes.machine.services.envfs.enable = true; + + testScript = '' + start_all() + machine.wait_until_succeeds("mountpoint -q /usr/bin/") + machine.succeed( + "PATH=${pkgs.coreutils}/bin /usr/bin/cp --version", + # check fallback paths + "PATH= /usr/bin/sh --version", + "PATH= /usr/bin/env --version", + "PATH= test -e /usr/bin/sh", + "PATH= test -e /usr/bin/env", + # no stat + "! test -e /usr/bin/cp", + # also picks up PATH that was set after execve + "! /usr/bin/hello", + "PATH=${pkgs.hello}/bin /usr/bin/hello", + ) + + out = machine.succeed("PATH=${pkgs.python3}/bin ${pythonShebang}") + print(out) + assert out == "OK\n" + + out = machine.succeed("PATH=${pkgs.bash}/bin ${bashShebang}") + print(out) + assert out == "OK\n" + ''; +}) diff --git a/nixos/tests/evcc.nix b/nixos/tests/evcc.nix index 0fc261142f78..b445735ede98 100644 --- a/nixos/tests/evcc.nix +++ b/nixos/tests/evcc.nix @@ -87,7 +87,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with subtest("Check journal for errors"): _, output = machine.execute("journalctl -o cat -u evcc.service") - assert "ERROR" not in output + assert "FATAL" not in output with subtest("Check systemd hardening"): _, output = machine.execute("systemd-analyze security evcc.service | grep -v '✓'") diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix index 5c434c1cb6d6..dd7551f143a5 100644 --- a/nixos/tests/firewall.nix +++ b/nixos/tests/firewall.nix @@ -1,7 +1,7 @@ # Test the firewall module. -import ./make-test-python.nix ( { pkgs, ... } : { - name = "firewall"; +import ./make-test-python.nix ( { pkgs, nftables, ... } : { + name = "firewall" + pkgs.lib.optionalString nftables "-nftables"; meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; @@ -11,6 +11,7 @@ import ./make-test-python.nix ( { pkgs, ... } : { { ... }: { networking.firewall.enable = true; networking.firewall.logRefusedPackets = true; + networking.nftables.enable = nftables; services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; }; @@ -23,6 +24,7 @@ import ./make-test-python.nix ( { pkgs, ... } : { { ... }: { networking.firewall.enable = true; networking.firewall.rejectPackets = true; + networking.nftables.enable = nftables; }; attacker = @@ -35,10 +37,11 @@ import ./make-test-python.nix ( { pkgs, ... } : { testScript = { nodes, ... }: let newSystem = nodes.walled2.config.system.build.toplevel; + unit = if nftables then "nftables" else "firewall"; in '' start_all() - walled.wait_for_unit("firewall") + walled.wait_for_unit("${unit}") walled.wait_for_unit("httpd") attacker.wait_for_unit("network.target") @@ -54,12 +57,12 @@ import ./make-test-python.nix ( { pkgs, ... } : { walled.succeed("ping -c 1 attacker >&2") # If we stop the firewall, then connections should succeed. - walled.stop_job("firewall") + walled.stop_job("${unit}") attacker.succeed("curl -v http://walled/ >&2") # Check whether activation of a new configuration reloads the firewall. walled.succeed( - "${newSystem}/bin/switch-to-configuration test 2>&1 | grep -qF firewall.service" + "${newSystem}/bin/switch-to-configuration test 2>&1 | grep -qF ${unit}.service" ) ''; }) diff --git a/nixos/tests/freenet.nix b/nixos/tests/freenet.nix new file mode 100644 index 000000000000..96dbb4caa129 --- /dev/null +++ b/nixos/tests/freenet.nix @@ -0,0 +1,19 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "freenet"; + meta = with pkgs.lib.maintainers; { + maintainers = [ nagy ]; + }; + + nodes = { + machine = { ... }: { + services.freenet.enable = true; + }; + }; + + testScript = '' + machine.wait_for_unit("freenet.service") + machine.wait_for_open_port(8888) + machine.wait_until_succeeds("curl -sfL http://localhost:8888/ | grep Freenet") + machine.succeed("systemctl stop freenet") + ''; +}) diff --git a/nixos/tests/freshrss-pgsql.nix b/nixos/tests/freshrss-pgsql.nix new file mode 100644 index 000000000000..055bd51ed43d --- /dev/null +++ b/nixos/tests/freshrss-pgsql.nix @@ -0,0 +1,48 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "freshrss"; + meta.maintainers = with lib.maintainers; [ etu stunkymonkey ]; + + nodes.machine = { pkgs, ... }: { + services.freshrss = { + enable = true; + baseUrl = "http://localhost"; + passwordFile = pkgs.writeText "password" "secret"; + dataDir = "/srv/freshrss"; + database = { + type = "pgsql"; + port = 5432; + user = "freshrss"; + passFile = pkgs.writeText "db-password" "db-secret"; + }; + }; + + services.postgresql = { + enable = true; + ensureDatabases = [ "freshrss" ]; + ensureUsers = [ + { + name = "freshrss"; + ensurePermissions = { + "DATABASE freshrss" = "ALL PRIVILEGES"; + }; + } + ]; + initialScript = pkgs.writeText "postgresql-password" '' + CREATE ROLE freshrss WITH LOGIN PASSWORD 'db-secret' CREATEDB; + ''; + }; + + systemd.services."freshrss-config" = { + requires = [ "postgresql.service" ]; + after = [ "postgresql.service" ]; + }; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + machine.wait_for_open_port(5432) + machine.wait_for_open_port(80) + response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://127.0.0.1:80/i/") + assert 'Login · FreshRSS' in response, "Login page didn't load successfully" + ''; +}) diff --git a/nixos/tests/freshrss.nix b/nixos/tests/freshrss-sqlite.nix similarity index 94% rename from nixos/tests/freshrss.nix rename to nixos/tests/freshrss-sqlite.nix index 7bdbf29e9230..b821c98a7e7a 100644 --- a/nixos/tests/freshrss.nix +++ b/nixos/tests/freshrss-sqlite.nix @@ -7,6 +7,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { enable = true; baseUrl = "http://localhost"; passwordFile = pkgs.writeText "password" "secret"; + dataDir = "/srv/freshrss"; }; }; diff --git a/nixos/tests/garage/basic.nix b/nixos/tests/garage/basic.nix new file mode 100644 index 000000000000..b6df1e72af98 --- /dev/null +++ b/nixos/tests/garage/basic.nix @@ -0,0 +1,98 @@ +args@{ mkNode, ... }: +(import ../make-test-python.nix ({ pkgs, ...} : { + name = "garage-basic"; + meta = { + maintainers = with pkgs.lib.maintainers; [ raitobezarius ]; + }; + + nodes = { + single_node = mkNode { replicationMode = "none"; }; + }; + + testScript = '' + from typing import List + from dataclasses import dataclass + import re + + start_all() + + cur_version_regex = re.compile('Current cluster layout version: (?P\d*)') + key_creation_regex = re.compile('Key name: (?P.*)\nKey ID: (?P.*)\nSecret key: (?P.*)') + + @dataclass + class S3Key: + key_name: str + key_id: str + secret_key: str + + @dataclass + class GarageNode: + node_id: str + host: str + + def get_node_fqn(machine: Machine) -> GarageNode: + node_id, host = machine.succeed("garage node id").split('@') + return GarageNode(node_id=node_id, host=host) + + def get_node_id(machine: Machine) -> str: + return get_node_fqn(machine).node_id + + def get_layout_version(machine: Machine) -> int: + version_data = machine.succeed("garage layout show") + m = cur_version_regex.search(version_data) + if m and m.group('ver') is not None: + return int(m.group('ver')) + 1 + else: + raise ValueError('Cannot find current layout version') + + def apply_garage_layout(machine: Machine, layouts: List[str]): + for layout in layouts: + machine.succeed(f"garage layout assign {layout}") + version = get_layout_version(machine) + machine.succeed(f"garage layout apply --version {version}") + + def create_api_key(machine: Machine, key_name: str) -> S3Key: + output = machine.succeed(f"garage key new --name {key_name}") + m = key_creation_regex.match(output) + if not m or not m.group('key_id') or not m.group('secret_key'): + raise ValueError('Cannot parse API key data') + return S3Key(key_name=key_name, key_id=m.group('key_id'), secret_key=m.group('secret_key')) + + def get_api_key(machine: Machine, key_pattern: str) -> S3Key: + output = machine.succeed(f"garage key info {key_pattern}") + m = key_creation_regex.match(output) + if not m or not m.group('key_name') or not m.group('key_id') or not m.group('secret_key'): + raise ValueError('Cannot parse API key data') + return S3Key(key_name=m.group('key_name'), key_id=m.group('key_id'), secret_key=m.group('secret_key')) + + def test_bucket_writes(node): + node.succeed("garage bucket create test-bucket") + s3_key = create_api_key(node, "test-api-key") + node.succeed("garage bucket allow --read --write test-bucket --key test-api-key") + other_s3_key = get_api_key(node, 'test-api-key') + assert other_s3_key.secret_key == other_s3_key.secret_key + node.succeed( + f"mc alias set test-garage http://[::1]:3900 {s3_key.key_id} {s3_key.secret_key} --api S3v4" + ) + node.succeed("echo test | mc pipe test-garage/test-bucket/test.txt") + assert node.succeed("mc cat test-garage/test-bucket/test.txt").strip() == "test" + + def test_bucket_over_http(node, bucket='test-bucket', url=None): + if url is None: + url = f"{bucket}.web.garage" + + node.succeed(f'garage bucket website --allow {bucket}') + node.succeed(f'echo hello world | mc pipe test-garage/{bucket}/index.html') + assert (node.succeed(f"curl -H 'Host: {url}' http://localhost:3902")).strip() == 'hello world' + + with subtest("Garage works as a single-node S3 storage"): + single_node.wait_for_unit("garage.service") + single_node.wait_for_open_port(3900) + # Now Garage is initialized. + single_node_id = get_node_id(single_node) + apply_garage_layout(single_node, [f'-z qemutest -c 1 "{single_node_id}"']) + # Now Garage is operational. + test_bucket_writes(single_node) + test_bucket_over_http(single_node) + ''; +})) args diff --git a/nixos/tests/garage/default.nix b/nixos/tests/garage/default.nix new file mode 100644 index 000000000000..4c38ea1bc898 --- /dev/null +++ b/nixos/tests/garage/default.nix @@ -0,0 +1,53 @@ +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../../.. { inherit system config; } +}: +with pkgs.lib; + +let + mkNode = package: { replicationMode, publicV6Address ? "::1" }: { pkgs, ... }: { + networking.interfaces.eth1.ipv6.addresses = [{ + address = publicV6Address; + prefixLength = 64; + }]; + + networking.firewall.allowedTCPPorts = [ 3901 3902 ]; + + services.garage = { + enable = true; + inherit package; + settings = { + replication_mode = replicationMode; + + rpc_bind_addr = "[::]:3901"; + rpc_public_addr = "[${publicV6Address}]:3901"; + rpc_secret = "5c1915fa04d0b6739675c61bf5907eb0fe3d9c69850c83820f51b4d25d13868c"; + + s3_api = { + s3_region = "garage"; + api_bind_addr = "[::]:3900"; + root_domain = ".s3.garage"; + }; + + s3_web = { + bind_addr = "[::]:3902"; + root_domain = ".web.garage"; + index = "index.html"; + }; + }; + }; + environment.systemPackages = [ pkgs.minio-client ]; + + # Garage requires at least 1GiB of free disk space to run. + virtualisation.diskSize = 2 * 1024; + }; +in + foldl + (matrix: ver: matrix // { + "basic${toString ver}" = import ./basic.nix { inherit system pkgs; mkNode = mkNode pkgs."garage_${ver}"; }; + "with-3node-replication${toString ver}" = import ./with-3node-replication.nix { inherit system pkgs; mkNode = mkNode pkgs."garage_${ver}"; }; + }) + {} + [ + "0_8_0" + ] diff --git a/nixos/tests/garage.nix b/nixos/tests/garage/with-3node-replication.nix similarity index 74% rename from nixos/tests/garage.nix rename to nixos/tests/garage/with-3node-replication.nix index dc1f83e7f8f3..d372ad1aa000 100644 --- a/nixos/tests/garage.nix +++ b/nixos/tests/garage/with-3node-replication.nix @@ -1,50 +1,12 @@ -import ./make-test-python.nix ({ pkgs, ...} : -let - mkNode = { replicationMode, publicV6Address ? "::1" }: { pkgs, ... }: { - networking.interfaces.eth1.ipv6.addresses = [{ - address = publicV6Address; - prefixLength = 64; - }]; - - networking.firewall.allowedTCPPorts = [ 3901 3902 ]; - - services.garage = { - enable = true; - settings = { - replication_mode = replicationMode; - - rpc_bind_addr = "[::]:3901"; - rpc_public_addr = "[${publicV6Address}]:3901"; - rpc_secret = "5c1915fa04d0b6739675c61bf5907eb0fe3d9c69850c83820f51b4d25d13868c"; - - s3_api = { - s3_region = "garage"; - api_bind_addr = "[::]:3900"; - root_domain = ".s3.garage"; - }; - - s3_web = { - bind_addr = "[::]:3902"; - root_domain = ".web.garage"; - index = "index.html"; - }; - }; - }; - environment.systemPackages = [ pkgs.minio-client ]; - - # Garage requires at least 1GiB of free disk space to run. - virtualisation.diskSize = 2 * 1024; - }; - - -in { - name = "garage"; +args@{ mkNode, ... }: +(import ../make-test-python.nix ({ pkgs, ...} : +{ + name = "garage-3node-replication"; meta = { maintainers = with pkgs.lib.maintainers; [ raitobezarius ]; }; nodes = { - single_node = mkNode { replicationMode = "none"; }; node1 = mkNode { replicationMode = 3; publicV6Address = "fc00:1::1"; }; node2 = mkNode { replicationMode = 3; publicV6Address = "fc00:1::2"; }; node3 = mkNode { replicationMode = 3; publicV6Address = "fc00:1::3"; }; @@ -126,16 +88,6 @@ in { node.succeed(f'echo hello world | mc pipe test-garage/{bucket}/index.html') assert (node.succeed(f"curl -H 'Host: {url}' http://localhost:3902")).strip() == 'hello world' - with subtest("Garage works as a single-node S3 storage"): - single_node.wait_for_unit("garage.service") - single_node.wait_for_open_port(3900) - # Now Garage is initialized. - single_node_id = get_node_id(single_node) - apply_garage_layout(single_node, [f'-z qemutest -c 1 "{single_node_id}"']) - # Now Garage is operational. - test_bucket_writes(single_node) - test_bucket_over_http(single_node) - with subtest("Garage works as a multi-node S3 storage"): nodes = ('node1', 'node2', 'node3', 'node4') rev_machines = {m.name: m for m in machines} @@ -166,4 +118,4 @@ in { for node in nodes: test_bucket_over_http(get_machine(node)) ''; -}) +})) args diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index d9d75d1cbd89..59dbc99052a6 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -17,13 +17,13 @@ let aliceUsername = "alice"; aliceUserId = "2"; - alicePassword = "alicepassword"; + alicePassword = "R5twyCgU0uXC71wT9BBTCqLs6HFZ7h3L"; aliceProjectId = "2"; aliceProjectName = "test-alice"; bobUsername = "bob"; bobUserId = "3"; - bobPassword = "bobpassword"; + bobPassword = "XwkkBbl2SiIwabQzgcoaTbhsotijEEtF"; bobProjectId = "3"; in { name = "gitlab"; diff --git a/nixos/tests/gnome-flashback.nix b/nixos/tests/gnome-flashback.nix new file mode 100644 index 000000000000..c97264e6928a --- /dev/null +++ b/nixos/tests/gnome-flashback.nix @@ -0,0 +1,51 @@ +import ./make-test-python.nix ({ pkgs, lib, ...} : { + name = "gnome-flashback"; + meta = with lib; { + maintainers = teams.gnome.members ++ [ maintainers.chpatrick ]; + }; + + nodes.machine = { nodes, ... }: let + user = nodes.machine.config.users.users.alice; + in + + { imports = [ ./common/user-account.nix ]; + + services.xserver.enable = true; + + services.xserver.displayManager = { + gdm.enable = true; + gdm.debug = true; + autoLogin = { + enable = true; + user = user.name; + }; + }; + + services.xserver.desktopManager.gnome.enable = true; + services.xserver.desktopManager.gnome.debug = true; + services.xserver.desktopManager.gnome.flashback.enableMetacity = true; + services.xserver.displayManager.defaultSession = "gnome-flashback-metacity"; + }; + + testScript = { nodes, ... }: let + user = nodes.machine.config.users.users.alice; + uid = toString user.uid; + xauthority = "/run/user/${uid}/gdm/Xauthority"; + in '' + with subtest("Login to GNOME Flashback with GDM"): + machine.wait_for_x() + # Wait for alice to be logged in" + machine.wait_for_unit("default.target", "${user.name}") + machine.wait_for_file("${xauthority}") + machine.succeed("xauth merge ${xauthority}") + # Check that logging in has given the user ownership of devices + assert "alice" in machine.succeed("getfacl -p /dev/snd/timer") + + with subtest("Wait for Metacity"): + machine.wait_until_succeeds( + "pgrep metacity" + ) + machine.sleep(20) + machine.screenshot("screen") + ''; +}) diff --git a/nixos/tests/google-oslogin/server.nix b/nixos/tests/google-oslogin/server.nix index faf5e847d7e9..3df41155c92d 100644 --- a/nixos/tests/google-oslogin/server.nix +++ b/nixos/tests/google-oslogin/server.nix @@ -17,8 +17,8 @@ in { }; services.openssh.enable = true; - services.openssh.kbdInteractiveAuthentication = false; - services.openssh.passwordAuthentication = false; + services.openssh.settings.KbdInteractiveAuthentication = false; + services.openssh.settings.PasswordAuthentication = false; security.googleOsLogin.enable = true; diff --git a/nixos/tests/grafana/basic.nix b/nixos/tests/grafana/basic.nix index f6566d449709..8bf4caad7fbf 100644 --- a/nixos/tests/grafana/basic.nix +++ b/nixos/tests/grafana/basic.nix @@ -25,6 +25,22 @@ let extraNodeConfs = { sqlite = {}; + socket = { config, ... }: { + services.grafana.settings.server = { + protocol = "socket"; + socket = "/run/grafana/sock"; + socket_gid = config.users.groups.nginx.gid; + }; + + users.users.grafana.extraGroups = [ "nginx" ]; + + services.nginx = { + enable = true; + recommendedProxySettings = true; + virtualHosts."_".locations."/".proxyPass = "http://unix:/run/grafana/sock"; + }; + }; + declarativePlugins = { services.grafana.declarativePlugins = [ pkgs.grafanaPlugins.grafana-clock-panel ]; }; @@ -92,6 +108,17 @@ in { ) sqlite.shutdown() + with subtest("Successful API query as admin user with sqlite db listening on socket"): + socket.wait_for_unit("grafana.service") + socket.wait_for_open_port(80) + print(socket.succeed( + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1/api/org/users -i" + )) + socket.succeed( + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1/api/org/users | grep admin\@localhost" + ) + socket.shutdown() + with subtest("Successful API query as admin user with postgresql db"): postgresql.wait_for_unit("grafana.service") postgresql.wait_for_unit("postgresql.service") diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index 1eb927632eb7..96378452ade3 100644 --- a/nixos/tests/grafana/provision/default.nix +++ b/nixos/tests/grafana/provision/default.nix @@ -22,9 +22,15 @@ let }; }; - systemd.tmpfiles.rules = [ - "L /var/lib/grafana/dashboards/test.json 0700 grafana grafana - ${pkgs.writeText "test.json" (builtins.readFile ./test_dashboard.json)}" - ]; + system.activationScripts.setup-grafana = { + deps = [ "users" ]; + text = '' + mkdir -p /var/lib/grafana/dashboards + chown -R grafana:grafana /var/lib/grafana + chmod 0700 -R /var/lib/grafana/dashboards + cp ${pkgs.writeText "test.json" (builtins.readFile ./test_dashboard.json)} /var/lib/grafana/dashboards/ + ''; + }; }; extraNodeConfs = { diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix index c534d45428e1..de6cd8a50e17 100644 --- a/nixos/tests/graphite.nix +++ b/nixos/tests/graphite.nix @@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, ... } : ''; }; carbon.enableCache = true; - seyren.enable = false; # Implicitely requires openssl-1.0.2u which is marked insecure + seyren.enable = false; # Implicitly requires openssl-1.0.2u which is marked insecure }; }; }; diff --git a/nixos/tests/grocy.nix b/nixos/tests/grocy.nix index fe0ddd341486..48bbc9f7d3fa 100644 --- a/nixos/tests/grocy.nix +++ b/nixos/tests/grocy.nix @@ -14,6 +14,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; testScript = '' + from base64 import b64encode + from urllib.parse import quote + machine.start() machine.wait_for_open_port(80) machine.wait_for_unit("multi-user.target") @@ -42,6 +45,29 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.succeed("curl -sSI http://localhost/api/tasks 2>&1 | grep '401 Unauthorized'") + file_name = "test.txt" + file_name_base64 = b64encode(file_name.encode('ascii')).decode('ascii') + file_name_base64_urlencode = quote(file_name_base64) + + machine.succeed( + f"echo Sample equipment manual > /tmp/{file_name}" + ) + + machine.succeed( + f"curl -sSf -X 'PUT' -b 'grocy_session={cookie}' " + + f" 'http://localhost/api/files/equipmentmanuals/{file_name_base64_urlencode}' " + + " --header 'Accept: */*' " + + " --header 'Content-Type: application/octet-stream' " + + f" --data-binary '@/tmp/{file_name}' " + ) + + machine.succeed( + f"curl -sSf -X 'GET' -b 'grocy_session={cookie}' " + + f" 'http://localhost/api/files/equipmentmanuals/{file_name_base64_urlencode}' " + + " --header 'Accept: application/octet-stream' " + + f" | cmp /tmp/{file_name}" + ) + machine.shutdown() ''; }) diff --git a/nixos/tests/headscale.nix b/nixos/tests/headscale.nix new file mode 100644 index 000000000000..48658b5dade4 --- /dev/null +++ b/nixos/tests/headscale.nix @@ -0,0 +1,17 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "headscale"; + meta.maintainers = with lib.maintainers; [ misterio77 ]; + + nodes.machine = { ... }: { + services.headscale.enable = true; + environment.systemPackages = [ pkgs.headscale ]; + }; + + testScript = '' + machine.wait_for_unit("headscale") + machine.wait_for_open_port(8080) + # Test basic funcionality + machine.succeed("headscale namespaces create test") + machine.succeed("headscale preauthkeys -n test create") + ''; +}) diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 0bbeffd18cf0..8d58de75eabc 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -120,7 +120,7 @@ in { start_all() # Parse the package path out of the systemd unit, as we cannot - # access the final package, that is overriden inside the module, + # access the final package, that is overridden 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] diff --git a/nixos/tests/initrd-network-openvpn/default.nix b/nixos/tests/initrd-network-openvpn/default.nix index bb4c41e6d709..dbb34c28eea7 100644 --- a/nixos/tests/initrd-network-openvpn/default.nix +++ b/nixos/tests/initrd-network-openvpn/default.nix @@ -91,6 +91,7 @@ import ../make-test-python.nix ({ lib, ...}: config = '' dev tun0 ifconfig 10.8.0.1 10.8.0.2 + cipher AES-256-CBC ${secretblock} ''; }; diff --git a/nixos/tests/initrd-network-openvpn/initrd.ovpn b/nixos/tests/initrd-network-openvpn/initrd.ovpn index 5926a48af00f..3ada4130e868 100644 --- a/nixos/tests/initrd-network-openvpn/initrd.ovpn +++ b/nixos/tests/initrd-network-openvpn/initrd.ovpn @@ -3,6 +3,7 @@ dev tun ifconfig 10.8.0.2 10.8.0.1 # Only force VLAN 2 through the VPN route 192.168.2.0 255.255.255.0 10.8.0.1 +cipher AES-256-CBC secret [inline] # @@ -26,4 +27,4 @@ be5a69522a8e60ccb217f8521681b45d e7811584363597599cce2040a68ac00e f2125540e0f7f4adc37cb3f0d922eeb7 -----END OpenVPN Static key V1----- - \ No newline at end of file + diff --git a/nixos/tests/installed-tests/fwupd.nix b/nixos/tests/installed-tests/fwupd.nix index 65614e2689d8..c095a50dc836 100644 --- a/nixos/tests/installed-tests/fwupd.nix +++ b/nixos/tests/installed-tests/fwupd.nix @@ -5,7 +5,7 @@ makeInstalledTest { testConfig = { services.fwupd.enable = true; - services.fwupd.disabledPlugins = lib.mkForce []; # don't disable test plugin + services.fwupd.daemonSettings.DisabledPlugins = lib.mkForce [ ]; # don't disable test plugin services.fwupd.enableTestRemote = true; }; } diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 9b3c8a762991..3adfa979edcc 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -21,6 +21,8 @@ let ]; + documentation.enable = false; + # To ensure that we can rebuild the grub configuration on the nixos-rebuild system.extraDependencies = with pkgs; [ stdenvNoCC ]; @@ -49,6 +51,8 @@ let boot.loader.systemd-boot.enable = true; ''} + boot.initrd.secrets."/etc/secret" = ./secret; + users.users.alice = { isNormalUser = true; home = "/home/alice"; @@ -57,7 +61,7 @@ let hardware.enableAllFirmware = lib.mkForce false; - ${replaceChars ["\n"] ["\n "] extraConfig} + ${replaceStrings ["\n"] ["\n "] extraConfig} } ''; @@ -124,6 +128,7 @@ let }", "/mnt/etc/nixos/configuration.nix", ) + machine.copy_from_host("${pkgs.writeText "secret" "secret"}", "/mnt/etc/nixos/secret") with subtest("Perform the installation"): machine.succeed("nixos-install < /dev/null >&2") @@ -131,9 +136,21 @@ let with subtest("Do it again to make sure it's idempotent"): machine.succeed("nixos-install < /dev/null >&2") + with subtest("Check that we can build things in nixos-enter"): + machine.succeed( + """ + nixos-enter -- nix-build --option substitute false -E 'derivation { + name = "t"; + builder = "/bin/sh"; + args = ["-c" "echo nixos-enter build > $out"]; + system = builtins.currentSystem; + preferLocalBuild = true; + }' + """ + ) + with subtest("Shutdown system after installation"): - machine.succeed("umount /mnt/boot || true") - machine.succeed("umount /mnt") + machine.succeed("umount -R /mnt") machine.succeed("sync") machine.shutdown() @@ -465,8 +482,12 @@ let ''; testSpecialisationConfig = true; }; - - + # disable zfs so we can support latest kernel if needed + no-zfs-module = { + nixpkgs.overlays = [(final: super: { + zfs = super.zfs.overrideAttrs(_: {meta.platforms = [];});} + )]; + }; in { # !!! `parted mkpart' seems to silently create overlapping partitions. @@ -650,6 +671,55 @@ in { ''; }; + # Full disk encryption (root, kernel and initrd encrypted) using GRUB, GPT/UEFI, + # LVM-on-LUKS and a keyfile in initrd.secrets to enter the passphrase once + fullDiskEncryption = makeInstallerTest "fullDiskEncryption" { + createPartitions = '' + machine.succeed( + "flock /dev/vda parted --script /dev/vda -- mklabel gpt" + + " mkpart ESP fat32 1M 100MiB" # /boot/efi + + " set 1 boot on" + + " mkpart primary ext2 1024MiB -1MiB", # LUKS + "udevadm settle", + "modprobe dm_mod dm_crypt", + "dd if=/dev/random of=luks.key bs=256 count=1", + "echo -n supersecret | cryptsetup luksFormat -q --pbkdf-force-iterations 1000 --type luks1 /dev/vda2 -", + "echo -n supersecret | cryptsetup luksAddKey -q --pbkdf-force-iterations 1000 --key-file - /dev/vda2 luks.key", + "echo -n supersecret | cryptsetup luksOpen --key-file - /dev/vda2 crypt", + "pvcreate /dev/mapper/crypt", + "vgcreate crypt /dev/mapper/crypt", + "lvcreate -L 100M -n swap crypt", + "lvcreate -l '100%FREE' -n nixos crypt", + "mkfs.vfat -n efi /dev/vda1", + "mkfs.ext4 -L nixos /dev/crypt/nixos", + "mkswap -L swap /dev/crypt/swap", + "mount LABEL=nixos /mnt", + "mkdir -p /mnt/{etc/nixos,boot/efi}", + "mount LABEL=efi /mnt/boot/efi", + "swapon -L swap", + "mv luks.key /mnt/etc/nixos/" + ) + ''; + bootLoader = "grub"; + grubUseEfi = true; + extraConfig = '' + boot.loader.grub.enableCryptodisk = true; + boot.loader.efi.efiSysMountPoint = "/boot/efi"; + + boot.initrd.secrets."/luks.key" = ./luks.key; + boot.initrd.luks.devices.crypt = + { device = "/dev/vda2"; + keyFile = "/luks.key"; + }; + ''; + enableOCR = true; + preBootCommands = '' + machine.start() + machine.wait_for_text("Enter passphrase for") + machine.send_chars("supersecret\n") + ''; + }; + swraid = makeInstallerTest "swraid" { createPartitions = '' machine.succeed( @@ -714,6 +784,7 @@ in { bcachefsSimple = makeInstallerTest "bcachefs-simple" { extraInstallerConfig = { boot.supportedFilesystems = [ "bcachefs" ]; + imports = [ no-zfs-module ]; }; createPartitions = '' @@ -737,13 +808,22 @@ in { bcachefsEncrypted = makeInstallerTest "bcachefs-encrypted" { extraInstallerConfig = { boot.supportedFilesystems = [ "bcachefs" ]; + + # disable zfs so we can support latest kernel if needed + imports = [ no-zfs-module ]; + environment.systemPackages = with pkgs; [ keyutils ]; }; - # We don't want to use the normal way of unlocking bcachefs defined in tasks/filesystems/bcachefs.nix. - # So, override initrd.postDeviceCommands completely and simply unlock with the predefined password. extraConfig = '' - boot.initrd.postDeviceCommands = lib.mkForce "echo password | bcachefs unlock /dev/vda3"; + boot.kernelParams = lib.mkAfter [ "console=tty0" ]; + ''; + + enableOCR = true; + preBootCommands = '' + machine.start() + machine.wait_for_text("enter passphrase for ") + machine.send_chars("password\n") ''; createPartitions = '' @@ -769,6 +849,9 @@ in { bcachefsMulti = makeInstallerTest "bcachefs-multi" { extraInstallerConfig = { boot.supportedFilesystems = [ "bcachefs" ]; + + # disable zfs so we can support latest kernel if needed + imports = [ no-zfs-module ]; }; createPartitions = '' diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix index 7f8a4e501777..33c65026b9b1 100644 --- a/nixos/tests/kanidm.nix +++ b/nixos/tests/kanidm.nix @@ -13,26 +13,17 @@ import ./make-test-python.nix ({ pkgs, ... }: serverSettings = { origin = "https://${serverDomain}"; domain = serverDomain; - bindaddress = "[::1]:8443"; + bindaddress = "[::]:443"; ldapbindaddress = "[::1]:636"; - }; - }; - - services.nginx = { - enable = true; - recommendedProxySettings = true; - virtualHosts."${serverDomain}" = { - forceSSL = true; - sslCertificate = certs."${serverDomain}".cert; - sslCertificateKey = certs."${serverDomain}".key; - locations."/".proxyPass = "http://[::1]:8443"; + tls_chain = certs."${serverDomain}".cert; + tls_key = certs."${serverDomain}".key; }; }; security.pki.certificateFiles = [ certs.ca.cert ]; networking.hosts."::1" = [ serverDomain ]; - networking.firewall.allowedTCPPorts = [ 80 443 ]; + networking.firewall.allowedTCPPorts = [ 443 ]; users.users.kanidm.shell = pkgs.bashInteractive; @@ -73,7 +64,7 @@ import ./make-test-python.nix ({ pkgs, ... }: start_all() server.wait_for_unit("kanidm.service") server.wait_until_succeeds("curl -sf https://${serverDomain} | grep Kanidm") - server.succeed("ldapsearch -H ldap://[::1]:636 -b '${ldapBaseDN}' -x '(name=test)'") + server.succeed("ldapsearch -H ldaps://${serverDomain}:636 -b '${ldapBaseDN}' -x '(name=test)'") client.succeed("kanidm login -D anonymous && kanidm self whoami | grep anonymous@${serverDomain}") rv, result = server.execute("kanidmd recover_account -c ${serverConfigFile} idm_admin 2>&1 | rg -o '[A-Za-z0-9]{48}'") assert rv == 0 diff --git a/nixos/tests/keepassxc.nix b/nixos/tests/keepassxc.nix index 303be1330405..debb469032a6 100644 --- a/nixos/tests/keepassxc.nix +++ b/nixos/tests/keepassxc.nix @@ -17,7 +17,7 @@ import ./make-test-python.nix ({ pkgs, ...} : services.xserver.enable = true; # Regression test for https://github.com/NixOS/nixpkgs/issues/163482 - qt5 = { + qt = { enable = true; platformTheme = "gnome"; style = "adwaita-dark"; diff --git a/nixos/tests/kerberos/mit.nix b/nixos/tests/kerberos/mit.nix index b475b7e4c92b..7e427ffef0ba 100644 --- a/nixos/tests/kerberos/mit.nix +++ b/nixos/tests/kerberos/mit.nix @@ -9,7 +9,7 @@ import ../make-test-python.nix ({pkgs, ...}: { }; krb5 = { enable = true; - kerberos = pkgs.krb5Full; + kerberos = pkgs.krb5; libdefaults = { default_realm = "FOO.BAR"; }; diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 7ee734a1eff0..3e74554de339 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -30,7 +30,7 @@ let linux_5_4_hardened linux_5_10_hardened linux_5_15_hardened - linux_6_0_hardened + linux_6_1_hardened linux_testing; }; diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix index 4306a9ae2cf9..0bde21093b0a 100644 --- a/nixos/tests/keymap.nix +++ b/nixos/tests/keymap.nix @@ -64,7 +64,6 @@ let # wait for reader to be ready machine.wait_for_file("${readyFile}") - machine.sleep(1) # send all keys for key in inputs: @@ -78,9 +77,18 @@ let with open("${pkgs.writeText "tests.json" (builtins.toJSON tests)}") as json_file: tests = json.load(json_file) + # These environments used to run in the opposite order, causing the + # following error at openvt startup. + # + # openvt: Couldn't deallocate console 1 + # + # This error did not appear in successful runs. + # I don't know the exact cause, but I it seems that openvt and X are + # fighting over the virtual terminal. This does not appear to be a problem + # when the X test runs first. keymap_environments = { - "VT Keymap": "openvt -sw --", "Xorg Keymap": "DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e", + "VT Keymap": "openvt -sw --", } machine.wait_for_x() diff --git a/nixos/tests/krb5/example-config.nix b/nixos/tests/krb5/example-config.nix index 1125b02f01ca..9a5c3b2af249 100644 --- a/nixos/tests/krb5/example-config.nix +++ b/nixos/tests/krb5/example-config.nix @@ -11,7 +11,7 @@ import ../make-test-python.nix ({ pkgs, ...} : { { pkgs, ... }: { krb5 = { enable = true; - kerberos = pkgs.krb5Full; + kerberos = pkgs.krb5; libdefaults = { default_realm = "ATHENA.MIT.EDU"; }; diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix index 6299b7ff988a..1b7145eb5d5e 100644 --- a/nixos/tests/kubernetes/dns.nix +++ b/nixos/tests/kubernetes/dns.nix @@ -69,7 +69,7 @@ let extraConfiguration = { config, pkgs, lib, ... }: { environment.systemPackages = [ pkgs.bind.host ]; services.dnsmasq.enable = true; - services.dnsmasq.servers = [ + services.dnsmasq.settings.server = [ "/cluster.local/${config.services.kubernetes.addons.dns.clusterIp}#53" ]; }; diff --git a/nixos/tests/libvirtd.nix b/nixos/tests/libvirtd.nix index 49258fcb93ea..b6e604075997 100644 --- a/nixos/tests/libvirtd.nix +++ b/nixos/tests/libvirtd.nix @@ -21,7 +21,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; testScript = let - nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.hostPlatform.system}; + nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.stdenv.hostPlatform.system}; virshShutdownCmd = if pkgs.stdenv.isx86_64 then "shutdown" else "destroy"; in '' start_all() diff --git a/nixos/tests/make-test-python.nix b/nixos/tests/make-test-python.nix index 7a96f538d8d7..28569f1d2955 100644 --- a/nixos/tests/make-test-python.nix +++ b/nixos/tests/make-test-python.nix @@ -1,6 +1,6 @@ f: { system ? builtins.currentSystem, - pkgs ? import ../.. { inherit system; }, + pkgs ? import ../.. { inherit system; config = {}; overlays = []; }, ... } @ args: diff --git a/nixos/tests/mate.nix b/nixos/tests/mate.nix new file mode 100644 index 000000000000..78ba59c5fc20 --- /dev/null +++ b/nixos/tests/mate.nix @@ -0,0 +1,58 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "mate"; + + meta = { + maintainers = lib.teams.mate.members; + }; + + nodes.machine = { ... }: { + imports = [ + ./common/user-account.nix + ]; + + services.xserver.enable = true; + + services.xserver.displayManager = { + lightdm.enable = true; + autoLogin = { + enable = true; + user = "alice"; + }; + }; + + services.xserver.desktopManager.mate.enable = true; + + # Silence log spam due to no sound drivers loaded: + # ALSA lib confmisc.c:855:(parse_card) cannot find card '0' + hardware.pulseaudio.enable = true; + }; + + testScript = { nodes, ... }: + let + user = nodes.machine.users.users.alice; + in + '' + with subtest("Wait for login"): + machine.wait_for_x() + machine.wait_for_file("${user.home}/.Xauthority") + machine.succeed("xauth merge ${user.home}/.Xauthority") + + with subtest("Check that logging in has given the user ownership of devices"): + machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") + + with subtest("Check if MATE session components actually start"): + machine.wait_until_succeeds("pgrep marco") + machine.wait_for_window("marco") + machine.wait_until_succeeds("pgrep mate-panel") + machine.wait_for_window("Top Panel") + machine.wait_for_window("Bottom Panel") + machine.wait_until_succeeds("pgrep caja") + machine.wait_for_window("Caja") + + with subtest("Open MATE terminal"): + machine.succeed("su - ${user.name} -c 'DISPLAY=:0.0 mate-terminal >&2 &'") + machine.wait_for_window("Terminal") + machine.sleep(20) + machine.screenshot("screen") + ''; +}) diff --git a/nixos/tests/mindustry.nix b/nixos/tests/mindustry.nix new file mode 100644 index 000000000000..b3f5423c601b --- /dev/null +++ b/nixos/tests/mindustry.nix @@ -0,0 +1,28 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "mindustry"; + meta = with pkgs.lib.maintainers; { + maintainers = [ fgaz ]; + }; + + nodes.machine = { config, pkgs, ... }: { + imports = [ + ./common/x11.nix + ]; + + services.xserver.enable = true; + environment.systemPackages = [ pkgs.mindustry ]; + }; + + enableOCR = true; + + testScript = + '' + machine.wait_for_x() + machine.execute("mindustry >&2 &") + machine.wait_for_window("Mindustry") + # Loading can take a while. Avoid wasting cycles on OCR during that time + machine.sleep(60) + machine.wait_for_text(r"(Play|Database|Editor|Mods|Settings|Quit)") + machine.screenshot("screen") + ''; +}) diff --git a/nixos/tests/miriway.nix b/nixos/tests/miriway.nix new file mode 100644 index 000000000000..c4c50646f015 --- /dev/null +++ b/nixos/tests/miriway.nix @@ -0,0 +1,126 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "miriway"; + + meta = { + maintainers = with lib.maintainers; [ OPNA2608 ]; + # FIXME On ARM Miriway inside the VM doesn't receive keyboard inputs, why? + broken = pkgs.stdenv.hostPlatform.isAarch; + }; + + nodes.machine = { config, ... }: { + imports = [ + ./common/auto.nix + ./common/user-account.nix + ]; + + # Seems to very rarely get interrupted by oom-killer + virtualisation.memorySize = 2047; + + test-support.displayManager.auto = { + enable = true; + user = "alice"; + }; + + services.xserver = { + enable = true; + displayManager.defaultSession = lib.mkForce "miriway"; + }; + + programs.miriway = { + enable = true; + config = '' + add-wayland-extensions=all + + ctrl-alt=t:foot --maximized + ctrl-alt=a:env WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty --option window.startup_mode=maximized + + shell-component=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY + + shell-component=foot --maximized + ''; + }; + + environment = { + shellAliases = { + test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok"; + test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok"; + }; + + systemPackages = with pkgs; [ + mesa-demos + wayland-utils + foot + alacritty + ]; + + # To help with OCR + etc."xdg/foot/foot.ini".text = lib.generators.toINI { } { + main = { + font = "inconsolata:size=16"; + }; + colors = rec { + foreground = "000000"; + background = "ffffff"; + regular2 = foreground; + }; + }; + etc."xdg/alacritty/alacritty.yml".text = lib.generators.toYAML { } { + font = rec { + normal.family = "Inconsolata"; + bold.family = normal.family; + italic.family = normal.family; + bold_italic.family = normal.family; + size = 16; + }; + colors = rec { + primary = { + foreground = "0x000000"; + background = "0xffffff"; + }; + normal = { + green = primary.foreground; + }; + }; + }; + }; + + fonts.fonts = [ pkgs.inconsolata ]; + }; + + enableOCR = true; + + testScript = { nodes, ... }: '' + start_all() + machine.wait_for_unit("multi-user.target") + + # Wait for Miriway to complete startup + machine.wait_for_file("/run/user/1000/wayland-0") + machine.succeed("pgrep miriway-shell") + machine.screenshot("miriway_launched") + + # Test Wayland + # We let Miriway start the first terminal, as we might get stuck if it's not ready to process the first keybind + # machine.send_key("ctrl-alt-t") + machine.wait_for_text("alice@machine") + machine.send_chars("test-wayland\n") + machine.wait_for_file("/tmp/test-wayland-exit-ok") + machine.copy_from_vm("/tmp/test-wayland.out") + machine.screenshot("foot_wayland_info") + # Only succeeds when a mouse is moved inside an interactive session? + # machine.send_chars("exit\n") + # machine.wait_until_fails("pgrep foot") + machine.succeed("pkill foot") + + # Test XWayland + machine.send_key("ctrl-alt-a") + machine.wait_for_text("alice@machine") + machine.send_chars("test-x11\n") + machine.wait_for_file("/tmp/test-x11-exit-ok") + machine.copy_from_vm("/tmp/test-x11.out") + machine.screenshot("alacritty_glinfo") + # Only succeeds when a mouse is moved inside an interactive session? + # machine.send_chars("exit\n") + # machine.wait_until_fails("pgrep alacritty") + machine.succeed("pkill alacritty") + ''; +}) diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix index edd074f5163c..c26dc3ac32d3 100644 --- a/nixos/tests/mongodb.nix +++ b/nixos/tests/mongodb.nix @@ -33,9 +33,6 @@ import ./make-test-python.nix ({ pkgs, ... }: nodes = { node = {...}: { environment.systemPackages = with pkgs; [ - mongodb-3_4 - mongodb-3_6 - mongodb-4_0 mongodb-4_2 mongodb-4_4 mongodb-5_0 @@ -46,9 +43,6 @@ import ./make-test-python.nix ({ pkgs, ... }: testScript = '' node.start() '' - + runMongoDBTest pkgs.mongodb-3_4 - + runMongoDBTest pkgs.mongodb-3_6 - + runMongoDBTest pkgs.mongodb-4_0 + runMongoDBTest pkgs.mongodb-4_2 + runMongoDBTest pkgs.mongodb-4_4 + runMongoDBTest pkgs.mongodb-5_0 diff --git a/nixos/tests/musescore.nix b/nixos/tests/musescore.nix index 18de0a550239..ac2f4ba74c0f 100644 --- a/nixos/tests/musescore.nix +++ b/nixos/tests/musescore.nix @@ -69,6 +69,10 @@ in # Wait until the export dialogue appears. machine.wait_for_window("Export") machine.screenshot("MuseScore1") + machine.send_key("shift-tab") + machine.sleep(1) + machine.send_key("shift-tab") + machine.sleep(1) machine.send_key("ret") machine.sleep(1) machine.send_key("ret") diff --git a/nixos/tests/n8n.nix b/nixos/tests/n8n.nix index c1753a418f67..044240fbce7f 100644 --- a/nixos/tests/n8n.nix +++ b/nixos/tests/n8n.nix @@ -19,7 +19,7 @@ in testScript = '' machine.wait_for_unit("n8n.service") - machine.wait_for_open_port(${toString port}) - machine.succeed("curl --fail http://localhost:${toString port}/") + machine.wait_for_console_text("Editor is now accessible via") + machine.succeed("curl --fail -vvv http://localhost:${toString port}/") ''; }) diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index 545eb46f2bf5..912a04deae8b 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -3,14 +3,16 @@ # client on the inside network, a server on the outside network, and a # router connected to both that performs Network Address Translation # for the client. -import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, ... }: +import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, nftables ? false, ... }: let - unit = if withFirewall then "firewall" else "nat"; + unit = if nftables then "nftables" else (if withFirewall then "firewall" else "nat"); routerBase = lib.mkMerge [ { virtualisation.vlans = [ 2 1 ]; networking.firewall.enable = withFirewall; + networking.firewall.filterForward = nftables; + networking.nftables.enable = nftables; networking.nat.internalIPs = [ "192.168.1.0/24" ]; networking.nat.externalInterface = "eth1"; } @@ -21,7 +23,8 @@ import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? ]; in { - name = "nat" + (if withFirewall then "WithFirewall" else "Standalone") + name = "nat" + (lib.optionalString nftables "Nftables") + + (if withFirewall then "WithFirewall" else "Standalone") + (lib.optionalString withConntrackHelpers "withConntrackHelpers"); meta = with pkgs.lib.maintainers; { maintainers = [ eelco rob ]; @@ -34,6 +37,7 @@ import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? { virtualisation.vlans = [ 1 ]; networking.defaultGateway = (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ipv4.addresses).address; + networking.nftables.enable = nftables; } (lib.optionalAttrs withConntrackHelpers { networking.firewall.connectionTrackingModules = [ "ftp" ]; @@ -111,7 +115,7 @@ import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? # FIXME: this should not be necessary, but nat.service is not started because # network.target is not triggered # (https://github.com/NixOS/nixpkgs/issues/16230#issuecomment-226408359) - ${lib.optionalString (!withFirewall) '' + ${lib.optionalString (!withFirewall && !nftables) '' router.succeed("systemctl start nat.service") ''} client.succeed("curl --fail http://server/ >&2") diff --git a/nixos/tests/networking-proxy.nix b/nixos/tests/networking-proxy.nix index fcb2558cf3b0..330bac2588a5 100644 --- a/nixos/tests/networking-proxy.nix +++ b/nixos/tests/networking-proxy.nix @@ -37,7 +37,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { default-config // { networking.proxy = { - # useless because overriden by the next options + # useless because overridden by the next options default = "http://user:pass@host:port"; # advanced proxy setup httpProxy = "123-http://user:pass@http-host:port"; diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 71b82b871270..441d258afc08 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -971,6 +971,7 @@ let print(machine.succeed("ip link show dev custom_name")) ''; }; + nodes = { }; # even with disabled networkd, systemd.network.links should work # (as it's handled by udev, not networkd) link = { diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index b8d3ba75b51a..350486e8c733 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -26,4 +26,4 @@ foldl }; }) { } - [ 24 25 ] + [ 24 25 26 ] diff --git a/nixos/tests/nginx-globalredirect.nix b/nixos/tests/nginx-globalredirect.nix new file mode 100644 index 000000000000..5f5f4f344d82 --- /dev/null +++ b/nixos/tests/nginx-globalredirect.nix @@ -0,0 +1,24 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "nginx-globalredirect"; + + nodes = { + webserver = { pkgs, lib, ... }: { + services.nginx = { + enable = true; + virtualHosts.localhost = { + globalRedirect = "other.example.com"; + # Add an exception + locations."/noredirect".return = "200 'foo'"; + }; + }; + }; + }; + + testScript = '' + webserver.wait_for_unit("nginx") + webserver.wait_for_open_port(80) + + webserver.succeed("curl --fail -si http://localhost/alf | grep '^Location:.*/alf'") + webserver.fail("curl --fail -si http://localhost/noredirect | grep '^Location:'") + ''; +}) diff --git a/nixos/tests/nginx-modsecurity.nix b/nixos/tests/nginx-modsecurity.nix index 5ceee3787297..3c41da3e8d9b 100644 --- a/nixos/tests/nginx-modsecurity.nix +++ b/nixos/tests/nginx-modsecurity.nix @@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { nodes.machine = { config, lib, pkgs, ... }: { services.nginx = { enable = true; - additionalModules = [ pkgs.nginxModules.modsecurity-nginx ]; + additionalModules = [ pkgs.nginxModules.modsecurity ]; virtualHosts.localhost = let modsecurity_conf = pkgs.writeText "modsecurity.conf" '' SecRuleEngine On diff --git a/nixos/tests/nix-ld.nix b/nixos/tests/nix-ld.nix index ae5297ab87ea..8733f5b0c397 100644 --- a/nixos/tests/nix-ld.nix +++ b/nixos/tests/nix-ld.nix @@ -12,9 +12,6 @@ import ./make-test-python.nix ({ lib, pkgs, ...} : }; 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") + machine.succeed("hello") ''; }) diff --git a/nixos/tests/nixos-rebuild-specialisations.nix b/nixos/tests/nixos-rebuild-specialisations.nix new file mode 100644 index 000000000000..c61f81b8ca65 --- /dev/null +++ b/nixos/tests/nixos-rebuild-specialisations.nix @@ -0,0 +1,131 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "nixos-rebuild-specialisations"; + + nodes = { + machine = { lib, pkgs, ... }: { + imports = [ + ../modules/profiles/installation-device.nix + ../modules/profiles/base.nix + ]; + + nix.settings = { + substituters = lib.mkForce [ ]; + hashed-mirrors = null; + connect-timeout = 1; + }; + + system.extraDependencies = with pkgs; [ + curl + desktop-file-utils + docbook5 + docbook_xsl_ns + grub2 + kmod.dev + libarchive + libarchive.dev + libxml2.bin + libxslt.bin + python3Minimal + shared-mime-info + stdenv + sudo + xorg.lndir + ]; + + virtualisation = { + cores = 2; + memorySize = 2048; + }; + }; + }; + + testScript = + let + configFile = pkgs.writeText "configuration.nix" '' + { lib, pkgs, ... }: { + imports = [ + ./hardware-configuration.nix + + ]; + + boot.loader.grub = { + enable = true; + device = "/dev/vda"; + forceInstall = true; + }; + + documentation.enable = false; + + environment.systemPackages = [ + (pkgs.writeShellScriptBin "parent" "") + ]; + + specialisation.foo = { + inheritParentConfig = true; + + configuration = { ... }: { + environment.systemPackages = [ + (pkgs.writeShellScriptBin "foo" "") + ]; + }; + }; + + specialisation.bar = { + inheritParentConfig = true; + + configuration = { ... }: { + environment.systemPackages = [ + (pkgs.writeShellScriptBin "bar" "") + ]; + }; + }; + } + ''; + + in + '' + machine.start() + machine.succeed("udevadm settle") + machine.wait_for_unit("multi-user.target") + + machine.succeed("nixos-generate-config") + machine.copy_from_host( + "${configFile}", + "/etc/nixos/configuration.nix", + ) + + with subtest("Switch to the base system"): + machine.succeed("nixos-rebuild switch") + machine.succeed("parent") + machine.fail("foo") + machine.fail("bar") + + with subtest("Switch from base system into a specialization"): + machine.succeed("nixos-rebuild switch --specialisation foo") + machine.succeed("parent") + machine.succeed("foo") + machine.fail("bar") + + with subtest("Switch from specialization into another specialization"): + machine.succeed("nixos-rebuild switch -c bar") + machine.succeed("parent") + machine.fail("foo") + machine.succeed("bar") + + with subtest("Switch from specialization into the base system"): + machine.succeed("nixos-rebuild switch") + machine.succeed("parent") + machine.fail("foo") + machine.fail("bar") + + with subtest("Switch into specialization using `nixos-rebuild test`"): + machine.succeed("nixos-rebuild test --specialisation foo") + machine.succeed("parent") + machine.succeed("foo") + machine.fail("bar") + + with subtest("Make sure nonsense command combinations are forbidden"): + machine.fail("nixos-rebuild boot --specialisation foo") + machine.fail("nixos-rebuild boot -c foo") + ''; +}) diff --git a/nixos/tests/nscd.nix b/nixos/tests/nscd.nix index 1922812ef8c8..356c6d2e2a54 100644 --- a/nixos/tests/nscd.nix +++ b/nixos/tests/nscd.nix @@ -40,11 +40,12 @@ in }; specialisation = { - withUnscd.configuration = { ... }: { - services.nscd.package = pkgs.unscd; + withGlibcNscd.configuration = { ... }: { + services.nscd.enableNsncd = false; }; - withNsncd.configuration = { ... }: { - services.nscd.enableNsncd = true; + withUnscd.configuration = { ... }: { + services.nscd.enableNsncd = false; + services.nscd.package = pkgs.unscd; }; }; }; @@ -118,6 +119,14 @@ in test_host_lookups() test_nss_myhostname() + with subtest("glibc-nscd"): + machine.succeed('${specialisations}/withGlibcNscd/bin/switch-to-configuration test') + machine.wait_for_unit("default.target") + + test_dynamic_user() + test_host_lookups() + test_nss_myhostname() + with subtest("unscd"): machine.succeed('${specialisations}/withUnscd/bin/switch-to-configuration test') machine.wait_for_unit("default.target") @@ -129,13 +138,5 @@ in # known to fail, unscd doesn't load external NSS modules # test_nss_myhostname() - - with subtest("nsncd"): - machine.succeed('${specialisations}/withNsncd/bin/switch-to-configuration test') - machine.wait_for_unit("default.target") - - test_dynamic_user() - test_host_lookups() - test_nss_myhostname() ''; }) diff --git a/nixos/tests/ntfy-sh.nix b/nixos/tests/ntfy-sh.nix index c0c289b904b6..4492fb44cedc 100644 --- a/nixos/tests/ntfy-sh.nix +++ b/nixos/tests/ntfy-sh.nix @@ -1,4 +1,5 @@ import ./make-test-python.nix { + name = "ntfy-sh"; nodes.machine = { ... }: { services.ntfy-sh.enable = true; @@ -11,6 +12,8 @@ import ./make-test-python.nix { machine.wait_for_unit("multi-user.target") + machine.wait_for_open_port(80) + machine.succeed(f"curl -d '{msg}' localhost:80/test") notif = json.loads(machine.succeed("curl -s localhost:80/test/json?poll=1")) diff --git a/nixos/tests/octoprint.nix b/nixos/tests/octoprint.nix new file mode 100644 index 000000000000..15a2d677d4cf --- /dev/null +++ b/nixos/tests/octoprint.nix @@ -0,0 +1,61 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + +let + apikey = "testapikey"; +in +{ + name = "octoprint"; + meta.maintainers = with lib.maintainers; [ gador ]; + + nodes.machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ jq ]; + services.octoprint = { + enable = true; + extraConfig = { + server = { + firstRun = false; + }; + api = { + enabled = true; + key = apikey; + }; + plugins = { + # these need internet access and pollute the output with connection failed errors + _disabled = [ "softwareupdate" "announcements" "pluginmanager" ]; + }; + }; + }; + }; + + testScript = '' + import json + + @polling_condition + def octoprint_running(): + machine.succeed("pgrep octoprint") + + with subtest("Wait for octoprint service to start"): + machine.wait_for_unit("octoprint.service") + machine.wait_until_succeeds("pgrep octoprint") + + with subtest("Wait for final boot"): + # this appears whe octoprint is almost finished starting + machine.wait_for_file("/var/lib/octoprint/uploads") + + # octoprint takes some time to start. This makes sure we'll retry just in case it takes longer + # retry-all-errors in necessary, since octoprint will report a 404 error when not yet ready + curl_cmd = "curl --retry-all-errors --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 0 \ + --retry-max-time 40 -X GET --header 'X-API-Key: ${apikey}' " + + # used to fail early, in case octoprint first starts and then crashes + with octoprint_running: # type: ignore[union-attr] + with subtest("Check for web interface"): + machine.wait_until_succeeds("curl -s localhost:5000") + + with subtest("Check API"): + version = json.loads(machine.succeed(curl_cmd + "localhost:5000/api/version")) + server = json.loads(machine.succeed(curl_cmd + "localhost:5000/api/server")) + assert version["server"] == str("${pkgs.octoprint.version}") + assert server["safemode"] == None + ''; +}) diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix index 1c89cf8c1c67..8f3e2494047c 100644 --- a/nixos/tests/os-prober.nix +++ b/nixos/tests/os-prober.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({pkgs, lib, ...}: let # A filesystem image with a (presumably) bootable debian - debianImage = pkgs.vmTools.diskImageFuns.debian9i386 { + debianImage = pkgs.vmTools.diskImageFuns.debian11i386 { # os-prober cannot detect systems installed on disks without a partition table # so we create the disk ourselves createRootFS = with pkgs; '' diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index 52f85f5c07da..0773fc0472aa 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -20,8 +20,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; - bob = nodes.machine.config.users.users.bob; + user = nodes.machine.users.users.alice; + bob = nodes.machine.users.users.bob; in '' machine.wait_for_unit("display-manager.service") @@ -40,7 +40,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with subtest("Check that logging in has given the user ownership of devices"): machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") - # TODO: DBus API could eliminate this? Pantheon uses Bamf. with subtest("Check if pantheon session components actually start"): machine.wait_until_succeeds("pgrep gala") machine.wait_for_window("gala") @@ -49,6 +48,12 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : machine.wait_until_succeeds("pgrep plank") machine.wait_for_window("plank") + with subtest("Open system settings"): + machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.switchboard >&2 &'") + # Wait for all plugins to be loaded before we check if the window is still there. + machine.sleep(5) + machine.wait_for_window("io.elementary.switchboard") + with subtest("Open elementary terminal"): machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.terminal >&2 &'") machine.wait_for_window("io.elementary.terminal") diff --git a/nixos/tests/paperless.nix b/nixos/tests/paperless.nix index b97834835c2c..7f36de4c29b7 100644 --- a/nixos/tests/paperless.nix +++ b/nixos/tests/paperless.nix @@ -26,6 +26,10 @@ import ./make-test-python.nix ({ lib, ... }: { # Wait until server accepts connections machine.wait_until_succeeds("curl -fs localhost:28981") + # Required for consuming documents via the web interface + with subtest("Task-queue gets ready"): + machine.wait_for_unit("paperless-task-queue.service") + with subtest("Add a document via the web interface"): machine.succeed( "convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 -fill black " diff --git a/nixos/tests/parsedmarc/default.nix b/nixos/tests/parsedmarc/default.nix index 50b977723e9c..837cf9d7e6dc 100644 --- a/nixos/tests/parsedmarc/default.nix +++ b/nixos/tests/parsedmarc/default.nix @@ -155,7 +155,6 @@ in ssl = true; user = "alice"; password = "${pkgs.writeText "imap-password" "foobar"}"; - watch = true; }; }; diff --git a/nixos/tests/patroni.nix b/nixos/tests/patroni.nix index f512fddcdbdd..1f15cd59677a 100644 --- a/nixos/tests/patroni.nix +++ b/nixos/tests/patroni.nix @@ -166,6 +166,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: start_all() + etcd.wait_for_unit("etcd.service") + with subtest("should bootstrap a new patroni cluster"): wait_for_all_nodes_ready() diff --git a/nixos/tests/pgadmin4-standalone.nix b/nixos/tests/pgadmin4-standalone.nix index 442570c5306b..5aa17fcb5bb9 100644 --- a/nixos/tests/pgadmin4-standalone.nix +++ b/nixos/tests/pgadmin4-standalone.nix @@ -1,5 +1,5 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: - # This is seperate from pgadmin4 since we don't want both running at once + # This is separate from pgadmin4 since we don't want both running at once { name = "pgadmin4-standalone"; diff --git a/nixos/tests/pgadmin4.nix b/nixos/tests/pgadmin4.nix index bec2554a3f04..2a2b5aaa2841 100644 --- a/nixos/tests/pgadmin4.nix +++ b/nixos/tests/pgadmin4.nix @@ -106,7 +106,7 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], .. && sed -i 's|driver_local.maximize_window()||' web/regression/runtests.py" ) - # Don't bother to test LDAP or kerberos authentification + # Don't bother to test LDAP or kerberos authentication with subtest("run browser test"): machine.succeed( 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ diff --git a/nixos/tests/phosh.nix b/nixos/tests/phosh.nix index 6c6357f58096..25bf4848542e 100644 --- a/nixos/tests/phosh.nix +++ b/nixos/tests/phosh.nix @@ -61,5 +61,10 @@ in { phone.wait_for_text("All Apps") phone.screenshot("03launcher") + + with subtest("Check the on-screen keyboard shows"): + phone.send_chars("setting", delay=0.2) + phone.wait_for_text("123") # A button on the OSK + phone.screenshot("04osk") ''; }) diff --git a/nixos/tests/photoprism.nix b/nixos/tests/photoprism.nix new file mode 100644 index 000000000000..a77ab59f5c9a --- /dev/null +++ b/nixos/tests/photoprism.nix @@ -0,0 +1,23 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "photoprism"; + meta.maintainers = with lib.maintainers; [ stunkymonkey ]; + + nodes.machine = { pkgs, ... }: { + services.photoprism = { + enable = true; + port = 8080; + originalsPath = "/media/photos/"; + passwordFile = pkgs.writeText "password" "secret"; + }; + environment.extraInit = '' + mkdir -p /media/photos + ''; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + machine.wait_for_open_port(8080) + response = machine.succeed("curl -vvv -s -H 'Host: photoprism' http://127.0.0.1:8080/library/login") + assert 'PhotoPrism' in response, "Login page didn't load successfully" + ''; +}) diff --git a/nixos/tests/php/pcre.nix b/nixos/tests/php/pcre.nix index 57407477f4b8..8e37d5dcf97b 100644 --- a/nixos/tests/php/pcre.nix +++ b/nixos/tests/php/pcre.nix @@ -1,7 +1,7 @@ let testString = "can-use-subgroups"; in -import ../make-test-python.nix ({ lib, php, ... }: { +import ../make-test-python.nix ({ pkgs, lib, php, ... }: { name = "php-${php.version}-httpd-pcre-jit-test"; meta.maintainers = lib.teams.php.members; @@ -31,12 +31,22 @@ import ../make-test-python.nix ({ lib, php, ... }: { ''; }; }; - testScript = { ... }: - '' + testScript = let + # PCRE JIT SEAlloc feature does not play well with fork() + # The feature needs to either be disabled or PHP configured correctly + # More information in https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630 + pcreJitSeallocForkIssue = pkgs.writeText "pcre-jit-sealloc-issue.php" '' + /tmp/machine-id") client.succeed("diff /tmp/machine-id /etc/machine-id") @@ -89,6 +88,6 @@ in client.succeed(f"curl {removal_link}") client.fail(f"curl --fail {raw_url}") - server.log(server.succeed("systemd-analyze security pinnwand")) + server.log(server.execute("systemd-analyze security pinnwand | grep '✗'")[1]) ''; }) diff --git a/nixos/tests/podman/default.nix b/nixos/tests/podman/default.nix index 106ba2057d06..c2ea399d65af 100644 --- a/nixos/tests/podman/default.nix +++ b/nixos/tests/podman/default.nix @@ -13,6 +13,13 @@ import ../make-test-python.nix ( isNormalUser = true; }; }; + dns = { pkgs, ... }: { + virtualisation.podman.enable = true; + + virtualisation.podman.defaultNetwork.settings.dns_enabled = true; + + networking.firewall.allowedUDPPorts = [ 53 ]; + }; docker = { pkgs, ... }: { virtualisation.podman.enable = true; @@ -43,6 +50,7 @@ import ../make-test-python.nix ( podman.wait_for_unit("sockets.target") + dns.wait_for_unit("sockets.target") docker.wait_for_unit("sockets.target") start_all() @@ -120,6 +128,23 @@ import ../make-test-python.nix ( pid = podman.succeed("podman run --rm --init busybox readlink /proc/self").strip() assert pid == "2" + with subtest("aardvark-dns"): + dns.succeed("tar cv --files-from /dev/null | podman import - scratchimg") + dns.succeed( + "podman run -d --name=webserver -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin -w ${pkgs.writeTextDir "index.html" "

Hi

"} scratchimg ${pkgs.python3}/bin/python -m http.server 8000" + ) + dns.succeed("podman ps | grep webserver") + dns.succeed(""" + for i in `seq 0 120`; do + podman run --rm --name=client -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg ${pkgs.curl}/bin/curl http://webserver:8000 >/dev/console \ + && exit 0 + sleep 0.5 + done + exit 1 + """) + dns.succeed("podman stop webserver") + dns.succeed("podman rm webserver") + with subtest("A podman member can use the docker cli"): docker.succeed(su_cmd("docker version")) diff --git a/nixos/tests/podman/dnsname.nix b/nixos/tests/podman/dnsname.nix deleted file mode 100644 index 3768ae79e067..000000000000 --- a/nixos/tests/podman/dnsname.nix +++ /dev/null @@ -1,42 +0,0 @@ -import ../make-test-python.nix ( - { pkgs, lib, ... }: - let - inherit (pkgs) writeTextDir python3 curl; - webroot = writeTextDir "index.html" "

Hi

"; - in - { - name = "podman-dnsname"; - meta = { - maintainers = with lib.maintainers; [ roberth ] ++ lib.teams.podman.members; - }; - - nodes = { - podman = { pkgs, ... }: { - virtualisation.podman.enable = true; - virtualisation.podman.defaultNetwork.dnsname.enable = true; - }; - }; - - testScript = '' - podman.wait_for_unit("sockets.target") - - with subtest("DNS works"): # also tests inter-container tcp routing - podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") - podman.succeed( - "podman run -d --name=webserver -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin -w ${webroot} scratchimg ${python3}/bin/python -m http.server 8000" - ) - podman.succeed("podman ps | grep webserver") - podman.succeed(""" - for i in `seq 0 120`; do - podman run --rm --name=client -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg ${curl}/bin/curl http://webserver:8000 >/dev/console \ - && exit 0 - sleep 0.5 - done - exit 1 - """) - podman.succeed("podman stop webserver") - podman.succeed("podman rm webserver") - - ''; - } -) diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index 7864f5d6ff32..7e0a82c38828 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -130,8 +130,97 @@ let ''; }; + + mk-ensure-clauses-test = postgresql-name: postgresql-package: makeTest { + name = postgresql-name; + meta = with pkgs.lib.maintainers; { + maintainers = [ zagy ]; + }; + + machine = {...}: + { + services.postgresql = { + enable = true; + package = postgresql-package; + ensureUsers = [ + { + name = "all-clauses"; + ensureClauses = { + superuser = true; + createdb = true; + createrole = true; + "inherit" = true; + login = true; + replication = true; + bypassrls = true; + }; + } + { + name = "default-clauses"; + } + ]; + }; + }; + + testScript = let + getClausesQuery = user: pkgs.lib.concatStringsSep " " + [ + "SELECT row_to_json(row)" + "FROM (" + "SELECT" + "rolsuper," + "rolinherit," + "rolcreaterole," + "rolcreatedb," + "rolcanlogin," + "rolreplication," + "rolbypassrls" + "FROM pg_roles" + "WHERE rolname = '${user}'" + ") row;" + ]; + in '' + import json + machine.start() + machine.wait_for_unit("postgresql") + + with subtest("All user permissions are set according to the ensureClauses attr"): + clauses = json.loads( + machine.succeed( + "sudo -u postgres psql -tc \"${getClausesQuery "all-clauses"}\"" + ) + ) + print(clauses) + assert clauses['rolsuper'], 'expected user with clauses to have superuser clause' + assert clauses['rolinherit'], 'expected user with clauses to have inherit clause' + assert clauses['rolcreaterole'], 'expected user with clauses to have create role clause' + assert clauses['rolcreatedb'], 'expected user with clauses to have create db clause' + assert clauses['rolcanlogin'], 'expected user with clauses to have login clause' + assert clauses['rolreplication'], 'expected user with clauses to have replication clause' + assert clauses['rolbypassrls'], 'expected user with clauses to have bypassrls clause' + + with subtest("All user permissions default when ensureClauses is not provided"): + clauses = json.loads( + machine.succeed( + "sudo -u postgres psql -tc \"${getClausesQuery "default-clauses"}\"" + ) + ) + assert not clauses['rolsuper'], 'expected user with no clauses set to have default superuser clause' + assert clauses['rolinherit'], 'expected user with no clauses set to have default inherit clause' + assert not clauses['rolcreaterole'], 'expected user with no clauses set to have default create role clause' + assert not clauses['rolcreatedb'], 'expected user with no clauses set to have default create db clause' + assert clauses['rolcanlogin'], 'expected user with no clauses set to have default login clause' + assert not clauses['rolreplication'], 'expected user with no clauses set to have default replication clause' + assert not clauses['rolbypassrls'], 'expected user with no clauses set to have default bypassrls clause' + + machine.shutdown() + ''; + }; in - (mapAttrs' (name: package: { inherit name; value=make-postgresql-test name package false;}) postgresql-versions) // { + concatMapAttrs (name: package: { + ${name} = make-postgresql-test name package false; + ${name + "-clauses"} = mk-ensure-clauses-test name package; + }) postgresql-versions + // { postgresql_11-backup-all = make-postgresql-test "postgresql_11-backup-all" postgresql-versions.postgresql_11 true; } - diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index cfebe232d92a..7df042e72e90 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -1,19 +1,31 @@ # Test printing via CUPS. -import ./make-test-python.nix ({pkgs, ... }: -let - printingServer = startWhenNeeded: { - services.printing.enable = true; - services.printing.stateless = true; - services.printing.startWhenNeeded = startWhenNeeded; - services.printing.listenAddresses = [ "*:631" ]; - services.printing.defaultShared = true; - services.printing.extraConf = '' - - Order allow,deny - Allow from all - - ''; +import ./make-test-python.nix ( +{ pkgs +, socket ? true # whether to use socket activation +, ... +}: + +{ + name = "printing"; + meta = with pkgs.lib.maintainers; { + maintainers = [ domenkozar eelco matthewbauer ]; + }; + + nodes.server = { ... }: { + services.printing = { + enable = true; + stateless = true; + startWhenNeeded = socket; + listenAddresses = [ "*:631" ]; + defaultShared = true; + extraConf = '' + + Order allow,deny + Allow from all + + ''; + }; networking.firewall.allowedTCPPorts = [ 631 ]; # Add a HP Deskjet printer connected via USB to the server. hardware.printers.ensurePrinters = [{ @@ -22,32 +34,19 @@ let model = "drv:///sample.drv/deskjet.ppd"; }]; }; - printingClient = startWhenNeeded: { + + nodes.client = { ... }: { services.printing.enable = true; - services.printing.startWhenNeeded = startWhenNeeded; + services.printing.startWhenNeeded = socket; # Add printer to the client as well, via IPP. hardware.printers.ensurePrinters = [{ name = "DeskjetRemote"; - deviceUri = "ipp://${if startWhenNeeded then "socketActivatedServer" else "serviceServer"}/printers/DeskjetLocal"; + deviceUri = "ipp://server/printers/DeskjetLocal"; model = "drv:///sample.drv/deskjet.ppd"; }]; hardware.printers.ensureDefaultPrinter = "DeskjetRemote"; }; -in { - name = "printing"; - meta = with pkgs.lib.maintainers; { - maintainers = [ domenkozar eelco matthewbauer ]; - }; - - nodes = { - socketActivatedServer = { ... }: (printingServer true); - serviceServer = { ... }: (printingServer false); - - socketActivatedClient = { ... }: (printingClient true); - serviceClient = { ... }: (printingClient false); - }; - testScript = '' import os import re @@ -55,75 +54,69 @@ in { start_all() with subtest("Make sure that cups is up on both sides and printers are set up"): - serviceServer.wait_for_unit("cups.service") - serviceClient.wait_for_unit("cups.service") - socketActivatedClient.wait_for_unit("ensure-printers.service") + server.wait_for_unit("cups.${if socket then "socket" else "service"}") + client.wait_for_unit("cups.${if socket then "socket" else "service"}") + assert "scheduler is running" in client.succeed("lpstat -r") - def test_printing(client, server): - assert "scheduler is running" in client.succeed("lpstat -r") + with subtest("UNIX socket is used for connections"): + assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H") - with subtest("UNIX socket is used for connections"): - assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H") - with subtest("HTTP server is available too"): - client.succeed("curl --fail http://localhost:631/") - client.succeed(f"curl --fail http://{server.name}:631/") - server.fail(f"curl --fail --connect-timeout 2 http://{client.name}:631/") + with subtest("HTTP server is available too"): + client.succeed("curl --fail http://localhost:631/") + client.succeed(f"curl --fail http://{server.name}:631/") + server.fail(f"curl --fail --connect-timeout 2 http://{client.name}:631/") - with subtest("LP status checks"): - assert "DeskjetRemote accepting requests" in client.succeed("lpstat -a") - assert "DeskjetLocal accepting requests" in client.succeed( - f"lpstat -h {server.name}:631 -a" - ) - client.succeed("cupsdisable DeskjetRemote") - out = client.succeed("lpq") - print(out) - assert re.search( - "DeskjetRemote is not ready.*no entries", - client.succeed("lpq"), - flags=re.DOTALL, - ) - client.succeed("cupsenable DeskjetRemote") - assert re.match( - "DeskjetRemote is ready.*no entries", client.succeed("lpq"), flags=re.DOTALL + with subtest("LP status checks"): + assert "DeskjetRemote accepting requests" in client.succeed("lpstat -a") + assert "DeskjetLocal accepting requests" in client.succeed( + f"lpstat -h {server.name}:631 -a" + ) + client.succeed("cupsdisable DeskjetRemote") + out = client.succeed("lpq") + print(out) + assert re.search( + "DeskjetRemote is not ready.*no entries", + client.succeed("lpq"), + flags=re.DOTALL, + ) + client.succeed("cupsenable DeskjetRemote") + assert re.match( + "DeskjetRemote is ready.*no entries", client.succeed("lpq"), flags=re.DOTALL + ) + + # Test printing various file types. + for file in [ + "${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf", + "${pkgs.groff.doc}/share/doc/*/meref.ps", + "${pkgs.cups.out}/share/doc/cups/images/cups.png", + "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt", + ]: + file_name = os.path.basename(file) + with subtest(f"print {file_name}"): + # Print the file on the client. + print(client.succeed("lpq")) + client.succeed(f"lp {file}") + client.wait_until_succeeds( + f"lpq; lpq | grep -q -E 'active.*root.*{file_name}'" ) - # Test printing various file types. - for file in [ - "${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf", - "${pkgs.groff.doc}/share/doc/*/meref.ps", - "${pkgs.cups.out}/share/doc/cups/images/cups.png", - "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt", - ]: - file_name = os.path.basename(file) - with subtest(f"print {file_name}"): - # Print the file on the client. - print(client.succeed("lpq")) - client.succeed(f"lp {file}") - client.wait_until_succeeds( - f"lpq; lpq | grep -q -E 'active.*root.*{file_name}'" - ) + # Ensure that a raw PCL file appeared in the server's queue + # (showing that the right filters have been applied). Of + # course, since there is no actual USB printer attached, the + # file will stay in the queue forever. + server.wait_for_file("/var/spool/cups/d*-001") + server.wait_until_succeeds(f"lpq -a | grep -q -E '{file_name}'") - # Ensure that a raw PCL file appeared in the server's queue - # (showing that the right filters have been applied). Of - # course, since there is no actual USB printer attached, the - # file will stay in the queue forever. - server.wait_for_file("/var/spool/cups/d*-001") - server.wait_until_succeeds(f"lpq -a | grep -q -E '{file_name}'") + # Delete the job on the client. It should disappear on the + # server as well. + client.succeed("lprm") + client.wait_until_succeeds("lpq -a | grep -q -E 'no entries'") - # Delete the job on the client. It should disappear on the - # server as well. - client.succeed("lprm") - client.wait_until_succeeds("lpq -a | grep -q -E 'no entries'") + retry(lambda _: "no entries" in server.succeed("lpq -a")) - retry(lambda _: "no entries" in server.succeed("lpq -a")) - - # The queue is empty already, so this should be safe. - # Otherwise, pairs of "c*"-"d*-001" files might persist. - server.execute("rm /var/spool/cups/*") - - - test_printing(serviceClient, serviceServer) - test_printing(socketActivatedClient, socketActivatedServer) + # The queue is empty already, so this should be safe. + # Otherwise, pairs of "c*"-"d*-001" files might persist. + server.execute("rm /var/spool/cups/*") ''; }) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index d91fc52f1cb4..82d50da63818 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -6,7 +6,7 @@ let inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; inherit (pkgs.lib) concatStringsSep maintainers mapAttrs mkMerge - removeSuffix replaceChars singleton splitString; + removeSuffix replaceStrings singleton splitString; /* * The attrset `exporterTests` contains one attribute @@ -182,7 +182,7 @@ let enable = true; extraFlags = [ "--web.collectd-push-path /collectd" ]; }; - exporterTest = let postData = replaceChars [ "\n" ] [ "" ] '' + exporterTest = let postData = replaceStrings [ "\n" ] [ "" ] '' [{ "values":[23], "dstypes":["gauge"], @@ -1060,6 +1060,20 @@ let ''; }; + shelly = { + exporterConfig = { + enable = true; + metrics-file = "${pkgs.writeText "test.json" ''{}''}"; + }; + exporterTest = '' + wait_for_unit("prometheus-shelly-exporter.service") + wait_for_open_port(9784) + wait_until_succeeds( + "curl -sSf 'localhost:9784/metrics'" + ) + ''; + }; + script = { exporterConfig = { enable = true; @@ -1086,13 +1100,8 @@ let ]; }; exporterTest = '' - wait_for_unit("prometheus-smartctl-exporter.service") - wait_for_open_port(9633) wait_until_succeeds( - "curl -sSf 'localhost:9633/metrics'" - ) - wait_until_succeeds( - 'journalctl -eu prometheus-smartctl-exporter.service -o cat | grep "/dev/vda: Unable to detect device type"' + 'journalctl -eu prometheus-smartctl-exporter.service -o cat | grep "Device unavailable"' ) ''; }; @@ -1177,6 +1186,25 @@ let ''; }; + statsd = { + exporterConfig = { + enable = true; + }; + exporterTest = '' + wait_for_unit("prometheus-statsd-exporter.service") + wait_for_open_port(9102) + succeed("curl http://localhost:9102/metrics | grep 'statsd_exporter_build_info{'") + succeed( + "echo 'test.udp:1|c' > /dev/udp/localhost/9125", + "curl http://localhost:9102/metrics | grep 'test_udp 1'", + ) + succeed( + "echo 'test.tcp:1|c' > /dev/tcp/localhost/9125", + "curl http://localhost:9102/metrics | grep 'test_tcp 1'", + ) + ''; + }; + surfboard = { exporterConfig = { enable = true; @@ -1244,15 +1272,13 @@ let ''; }; - unifi-poller = { - nodeName = "unifi_poller"; + unpoller = { + nodeName = "unpoller"; exporterConfig.enable = true; exporterConfig.controllers = [{ }]; exporterTest = '' - wait_for_unit("prometheus-unifi-poller-exporter.service") - wait_for_open_port(9130) - succeed( - "curl -sSf localhost:9130/metrics | grep 'unifipoller_build_info{.\\+} 1'" + wait_until_succeeds( + 'journalctl -eu prometheus-unpoller-exporter.service -o cat | grep "Connection Error"' ) ''; }; diff --git a/nixos/tests/qemu-vm-restrictnetwork.nix b/nixos/tests/qemu-vm-restrictnetwork.nix new file mode 100644 index 000000000000..49a105ef1076 --- /dev/null +++ b/nixos/tests/qemu-vm-restrictnetwork.nix @@ -0,0 +1,36 @@ +import ./make-test-python.nix ({ + name = "qemu-vm-restrictnetwork"; + + nodes = { + unrestricted = { config, pkgs, ... }: { + virtualisation.restrictNetwork = false; + }; + + restricted = { config, pkgs, ... }: { + virtualisation.restrictNetwork = true; + }; + }; + + testScript = '' + import os + + if os.fork() == 0: + # Start some HTTP server on the qemu host to test guest isolation. + from http.server import HTTPServer, BaseHTTPRequestHandler + HTTPServer(("", 8000), BaseHTTPRequestHandler).serve_forever() + + else: + start_all() + unrestricted.wait_for_unit("network-online.target") + restricted.wait_for_unit("network-online.target") + + # Guests should be able to reach each other on the same VLAN. + unrestricted.succeed("ping -c1 restricted") + restricted.succeed("ping -c1 unrestricted") + + # Only the unrestricted guest should be able to reach host services. + # 10.0.2.2 is the gateway mapping to the host's loopback interface. + unrestricted.succeed("curl -s http://10.0.2.2:8000") + restricted.fail("curl -s http://10.0.2.2:8000") + ''; +}) diff --git a/nixos/tests/restic.nix b/nixos/tests/restic.nix index 16dd5f8c5c8a..42af0783863e 100644 --- a/nixos/tests/restic.nix +++ b/nixos/tests/restic.nix @@ -2,24 +2,32 @@ import ./make-test-python.nix ( { pkgs, ... }: let - password = "some_password"; - repository = "/tmp/restic-backup"; - repositoryFile = "${pkgs.writeText "repositoryFile" "/tmp/restic-backup-from-file"}"; + remoteRepository = "/tmp/restic-backup"; + remoteFromFileRepository = "/tmp/restic-backup-from-file"; rcloneRepository = "rclone:local:/tmp/restic-rclone-backup"; backupPrepareCommand = '' - touch /opt/backupPrepareCommand - test ! -e /opt/backupCleanupCommand + touch /tmp/backupPrepareCommand + test ! -e /tmp/backupCleanupCommand ''; backupCleanupCommand = '' - rm /opt/backupPrepareCommand - touch /opt/backupCleanupCommand + rm /tmp/backupPrepareCommand + touch /tmp/backupCleanupCommand ''; + testDir = pkgs.stdenvNoCC.mkDerivation { + name = "test-files-to-backup"; + unpackPhase = "true"; + installPhase = '' + mkdir $out + touch $out/some_file + ''; + }; + passwordFile = "${pkgs.writeText "password" "correcthorsebatterystaple"}"; - initialize = true; paths = [ "/opt" ]; + exclude = [ "/opt/excluded_file_*" ]; pruneOpts = [ "--keep-daily 2" "--keep-weekly 1" @@ -40,12 +48,18 @@ import ./make-test-python.nix ( { services.restic.backups = { remotebackup = { - inherit repository passwordFile initialize paths pruneOpts backupPrepareCommand backupCleanupCommand; + inherit passwordFile paths exclude pruneOpts backupPrepareCommand backupCleanupCommand; + repository = remoteRepository; + initialize = true; }; - remotebackup-from-file = { - inherit repositoryFile passwordFile initialize paths pruneOpts; + remote-from-file-backup = { + inherit passwordFile paths exclude pruneOpts; + initialize = true; + repositoryFile = pkgs.writeText "repositoryFile" remoteFromFileRepository; }; rclonebackup = { + inherit passwordFile paths exclude pruneOpts; + initialize = true; repository = rcloneRepository; rcloneConfig = { type = "local"; @@ -57,14 +71,15 @@ import ./make-test-python.nix ( [local] type=ftp ''; - inherit passwordFile initialize paths pruneOpts; }; remoteprune = { - inherit repository passwordFile; + inherit passwordFile; + repository = remoteRepository; pruneOpts = [ "--keep-last 1" ]; }; custompackage = { - inherit repository passwordFile paths; + inherit passwordFile paths; + repository = "some-fake-repository"; package = pkgs.writeShellScriptBin "restic" '' echo "$@" >> /tmp/fake-restic.log; ''; @@ -82,50 +97,74 @@ import ./make-test-python.nix ( server.start() server.wait_for_unit("dbus.socket") server.fail( - "${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots", - '${pkgs.restic}/bin/restic --repository-file ${repositoryFile} -p ${passwordFile} snapshots"', + "${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} snapshots", + '${pkgs.restic}/bin/restic -r ${remoteFromFileRepository} -p ${passwordFile} snapshots"', "${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots", "grep 'backup .* /opt' /tmp/fake-restic.log", ) server.succeed( - "mkdir -p /opt", - "touch /opt/some_file", + # set up + "cp -rT ${testDir} /opt", + "touch /opt/excluded_file_1 /opt/excluded_file_2", "mkdir -p /tmp/restic-rclone-backup", + + # test that remotebackup runs custom commands and produces a snapshot "timedatectl set-time '2016-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", - "rm /opt/backupCleanupCommand", - "systemctl start restic-backups-remotebackup-from-file.service", + "rm /tmp/backupCleanupCommand", + '${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', + + # test that restoring that snapshot produces the same directory + "mkdir /tmp/restore-1", + "${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} restore latest -t /tmp/restore-1", + "diff -ru ${testDir} /tmp/restore-1/opt", + + # test that remote-from-file-backup produces a snapshot + "systemctl start restic-backups-remote-from-file-backup.service", + '${pkgs.restic}/bin/restic -r ${remoteFromFileRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', + + # test that rclonebackup produces a snapshot "systemctl start restic-backups-rclonebackup.service", - '${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"', - '${pkgs.restic}/bin/restic --repository-file ${repositoryFile} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"', - '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"', + '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', + + # test that custompackage runs both `restic backup` and `restic check` with reasonable commandlines "systemctl start restic-backups-custompackage.service", "grep 'backup .* /opt' /tmp/fake-restic.log", "grep 'check .* --some-check-option' /tmp/fake-restic.log", + + # test that we can create four snapshots in remotebackup and rclonebackup "timedatectl set-time '2017-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", - "rm /opt/backupCleanupCommand", + "rm /tmp/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", + "timedatectl set-time '2018-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", - "rm /opt/backupCleanupCommand", + "rm /tmp/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", + "timedatectl set-time '2018-12-14 13:45'", "systemctl start restic-backups-remotebackup.service", - "rm /opt/backupCleanupCommand", + "rm /tmp/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", + "timedatectl set-time '2018-12-15 13:45'", "systemctl start restic-backups-remotebackup.service", - "rm /opt/backupCleanupCommand", + "rm /tmp/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", + "timedatectl set-time '2018-12-16 13:45'", "systemctl start restic-backups-remotebackup.service", - "rm /opt/backupCleanupCommand", + "rm /tmp/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", - '${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^4 snapshot"', - '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^4 snapshot"', + + '${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 4"', + '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 4"', + + # test that remoteprune brings us back to 1 snapshot in remotebackup "systemctl start restic-backups-remoteprune.service", - '${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"', + '${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', + ) ''; } diff --git a/nixos/tests/schleuder.nix b/nixos/tests/schleuder.nix index a9e4cc325bc7..e57ef66bb8f9 100644 --- a/nixos/tests/schleuder.nix +++ b/nixos/tests/schleuder.nix @@ -82,9 +82,7 @@ import ./make-test-python.nix { # Since we don't have internet here, use dnsmasq to provide MX records from /etc/hosts services.dnsmasq = { enable = true; - extraConfig = '' - selfmx - ''; + settings.selfmx = true; }; networking.extraHosts = '' diff --git a/nixos/tests/sourcehut.nix b/nixos/tests/sourcehut.nix index d52fbddd20f3..87e6d82bdd8f 100644 --- a/nixos/tests/sourcehut.nix +++ b/nixos/tests/sourcehut.nix @@ -18,8 +18,10 @@ let # passwordless ssh server services.openssh = { enable = true; - permitRootLogin = "yes"; - extraConfig = "PermitEmptyPasswords yes"; + settings = { + PermitRootLogin = "yes"; + PermitEmptyPasswords = true; + }; }; users = { @@ -35,7 +37,7 @@ let }; security.sudo.wheelNeedsPassword = false; - nix.trustedUsers = [ "root" "build" ]; + nix.settings.trusted-users = [ "root" "build" ]; documentation.nixos.enable = false; # builds.sr.ht-image-specific network settings diff --git a/nixos/tests/specialisation.nix b/nixos/tests/specialisation.nix deleted file mode 100644 index b8d4b8279f4d..000000000000 --- a/nixos/tests/specialisation.nix +++ /dev/null @@ -1,43 +0,0 @@ -import ./make-test-python.nix { - name = "specialisation"; - nodes = { - inheritconf = { pkgs, ... }: { - environment.systemPackages = [ pkgs.cowsay ]; - specialisation.inheritconf.configuration = { pkgs, ... }: { - environment.systemPackages = [ pkgs.hello ]; - }; - }; - noinheritconf = { pkgs, ... }: { - environment.systemPackages = [ pkgs.cowsay ]; - specialisation.noinheritconf = { - inheritParentConfig = false; - configuration = { pkgs, ... }: { - environment.systemPackages = [ pkgs.hello ]; - }; - }; - }; - }; - testScript = '' - inheritconf.wait_for_unit("default.target") - inheritconf.succeed("cowsay hey") - inheritconf.fail("hello") - - with subtest("Nested clones do inherit from parent"): - inheritconf.succeed( - "/run/current-system/specialisation/inheritconf/bin/switch-to-configuration test" - ) - inheritconf.succeed("cowsay hey") - inheritconf.succeed("hello") - - noinheritconf.wait_for_unit("default.target") - noinheritconf.succeed("cowsay hey") - noinheritconf.fail("hello") - - with subtest("Nested children do not inherit from parent"): - noinheritconf.succeed( - "/run/current-system/specialisation/noinheritconf/bin/switch-to-configuration test" - ) - noinheritconf.fail("cowsay hey") - noinheritconf.succeed("hello") - ''; -} diff --git a/nixos/tests/sqlite3-to-mysql.nix b/nixos/tests/sqlite3-to-mysql.nix new file mode 100644 index 000000000000..029058187df3 --- /dev/null +++ b/nixos/tests/sqlite3-to-mysql.nix @@ -0,0 +1,65 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + +/* + This test suite replaces the typical pytestCheckHook function in + sqlite3-to-mysql due to the need of a running mysql instance. +*/ + +{ + name = "sqlite3-to-mysql"; + meta.maintainers = with lib.maintainers; [ gador ]; + + nodes.machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ + sqlite3-to-mysql + # create one coherent python environment + (python3.withPackages + (ps: sqlite3-to-mysql.propagatedBuildInputs ++ + [ + python3Packages.pytest + python3Packages.pytest-mock + python3Packages.pytest-timeout + python3Packages.factory_boy + python3Packages.docker # only needed so import does not fail + sqlite3-to-mysql + ]) + ) + ]; + services.mysql = { + package = pkgs.mariadb; + enable = true; + # from https://github.com/techouse/sqlite3-to-mysql/blob/master/tests/conftest.py + # and https://github.com/techouse/sqlite3-to-mysql/blob/master/.github/workflows/test.yml + initialScript = pkgs.writeText "mysql-init.sql" '' + create database test_db DEFAULT CHARACTER SET utf8mb4; + create user tester identified by 'testpass'; + grant all on test_db.* to tester; + create user tester@localhost identified by 'testpass'; + grant all on test_db.* to tester@localhost; + ''; + settings = { + mysqld = { + character-set-server = "utf8mb4"; + collation-server = "utf8mb4_unicode_ci"; + log_warnings = 1; + }; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("mysql") + + machine.succeed( + "sqlite3mysql --version | grep ${pkgs.sqlite3-to-mysql.version}" + ) + + # invalid_database_name: assert '1045 (28000): Access denied' in "1044 (42000): Access denied [...] + # invalid_database_user: does not return non-zero exit for some reason + # test_version: has problems importing sqlite3_to_mysql and determining the version + machine.succeed( + "cd ${pkgs.sqlite3-to-mysql.src} \ + && pytest -v --no-docker -k \"not test_invalid_database_name and not test_invalid_database_user and not test_version\"" + ) + ''; +}) diff --git a/nixos/tests/stratis/encryption.nix b/nixos/tests/stratis/encryption.nix index 3faa3171843f..a555ff8a8e85 100644 --- a/nixos/tests/stratis/encryption.nix +++ b/nixos/tests/stratis/encryption.nix @@ -26,8 +26,7 @@ import ../make-test-python.nix ({ pkgs, ... }: # test rebinding encrypted pool machine.succeed("stratis pool rebind keyring testpool testkey2") # test restarting encrypted pool - uuid = machine.succeed("stratis pool list | grep -oE '[0-9a-fA-F-]{36}'").rstrip('\n') - machine.succeed(" stratis pool stop testpool") - machine.succeed(f"stratis pool start {uuid} --unlock-method keyring") + machine.succeed("stratis pool stop testpool") + machine.succeed("stratis pool start --name testpool --unlock-method keyring") ''; }) diff --git a/nixos/tests/stratis/simple.nix b/nixos/tests/stratis/simple.nix index 7357d71fc52b..543789f59c05 100644 --- a/nixos/tests/stratis/simple.nix +++ b/nixos/tests/stratis/simple.nix @@ -8,7 +8,7 @@ import ../make-test-python.nix ({ pkgs, ... }: nodes.machine = { pkgs, ... }: { services.stratis.enable = true; - virtualisation.emptyDiskImages = [ 1024 1024 1024 1024 ]; + virtualisation.emptyDiskImages = [ 2048 1024 1024 1024 ]; }; testScript = '' diff --git a/nixos/tests/swap-file-btrfs.nix b/nixos/tests/swap-file-btrfs.nix new file mode 100644 index 000000000000..4f73942b5f32 --- /dev/null +++ b/nixos/tests/swap-file-btrfs.nix @@ -0,0 +1,46 @@ +import ./make-test-python.nix ({ lib, ... }: +{ + name = "swap-file-btrfs"; + + meta.maintainers = with lib.maintainers; [ oxalica ]; + + nodes.machine = + { pkgs, ... }: + { + virtualisation.useDefaultFilesystems = false; + + virtualisation.bootDevice = "/dev/vda"; + + boot.initrd.postDeviceCommands = '' + ${pkgs.btrfs-progs}/bin/mkfs.btrfs --label root /dev/vda + ''; + + virtualisation.fileSystems = { + "/" = { + device = "/dev/disk/by-label/root"; + fsType = "btrfs"; + }; + }; + + swapDevices = [ + { + device = "/var/swapfile"; + size = 1; # 1MiB. + } + ]; + }; + + testScript = '' + machine.wait_for_unit('var-swapfile.swap') + machine.succeed("stat --file-system --format=%T /var/swapfile | grep btrfs") + # First run. Auto creation. + machine.succeed("swapon --show | grep /var/swapfile") + + machine.shutdown() + machine.start() + + # Second run. Use it as-is. + machine.wait_for_unit('var-swapfile.swap') + machine.succeed("swapon --show | grep /var/swapfile") + ''; +}) diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index 039e6bdd9d5a..94e269ff37bb 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -101,13 +101,13 @@ in # Replace version inside sd-boot with something older. See magic[] string in systemd src/boot/efi/boot.c machine.succeed( """ - find /boot -iname '*.efi' -print0 | \ + find /boot -iname '*boot*.efi' -print0 | \ xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot .* ####/#### LoaderInfo: systemd-boot 000.0-1-notnixos ####/' '{}' """ ) output = machine.succeed("/run/current-system/bin/switch-to-configuration boot") - assert "updating systemd-boot from (000.0-1-notnixos) to " in output + assert "updating systemd-boot from 000.0-1-notnixos to " in output ''; }; diff --git a/nixos/tests/systemd-homed.nix b/nixos/tests/systemd-homed.nix new file mode 100644 index 000000000000..ecc92e98eddc --- /dev/null +++ b/nixos/tests/systemd-homed.nix @@ -0,0 +1,99 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: +let + password = "foobar"; + newPass = "barfoo"; +in +{ + name = "systemd-homed"; + nodes.machine = { config, pkgs, ... }: { + services.homed.enable = true; + + users.users.test-normal-user = { + extraGroups = [ "wheel" ]; + isNormalUser = true; + initialPassword = password; + }; + }; + testScript = '' + def switchTTY(number): + machine.send_key(f"alt-f{number}") + machine.wait_until_succeeds(f"[ $(fgconsole) = {number} ]") + machine.wait_for_unit(f"getty@tty{number}.service") + machine.wait_until_succeeds(f"pgrep -f 'agetty.*tty{number}'") + + machine.wait_for_unit("multi-user.target") + + # Smoke test to make sure the pam changes didn't break regular users. + machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'") + with subtest("login as regular user"): + switchTTY(2) + machine.wait_until_tty_matches("2", "login: ") + machine.send_chars("test-normal-user\n") + machine.wait_until_tty_matches("2", "login: test-normal-user") + machine.wait_until_tty_matches("2", "Password: ") + machine.send_chars("${password}\n") + machine.wait_until_succeeds("pgrep -u test-normal-user bash") + machine.send_chars("whoami > /tmp/1\n") + machine.wait_for_file("/tmp/1") + assert "test-normal-user" in machine.succeed("cat /tmp/1") + + with subtest("create homed encrypted user"): + # TODO: Figure out how to pass password manually. + # + # This environment variable is used for homed internal testing + # and is not documented. + machine.succeed("NEWPASSWORD=${password} homectl create --shell=/run/current-system/sw/bin/bash --storage=luks -G wheel test-homed-user") + + with subtest("login as homed user"): + switchTTY(3) + machine.wait_until_tty_matches("3", "login: ") + machine.send_chars("test-homed-user\n") + machine.wait_until_tty_matches("3", "login: test-homed-user") + machine.wait_until_tty_matches("3", "Password: ") + machine.send_chars("${password}\n") + machine.wait_until_succeeds("pgrep -t tty3 -u test-homed-user bash") + machine.send_chars("whoami > /tmp/2\n") + machine.wait_for_file("/tmp/2") + assert "test-homed-user" in machine.succeed("cat /tmp/2") + + with subtest("change homed user password"): + switchTTY(4) + machine.wait_until_tty_matches("4", "login: ") + machine.send_chars("test-homed-user\n") + machine.wait_until_tty_matches("4", "login: test-homed-user") + machine.wait_until_tty_matches("4", "Password: ") + machine.send_chars("${password}\n") + machine.wait_until_succeeds("pgrep -t tty4 -u test-homed-user bash") + machine.send_chars("passwd\n") + # homed does it in a weird order, it asks for new passes, then it asks + # for the old one. + machine.sleep(2) + machine.send_chars("${newPass}\n") + machine.sleep(2) + machine.send_chars("${newPass}\n") + machine.sleep(4) + machine.send_chars("${password}\n") + machine.wait_until_fails("pgrep -t tty4 passwd") + + @polling_condition + def not_logged_in_tty5(): + machine.fail("pgrep -t tty5 bash") + + switchTTY(5) + with not_logged_in_tty5: # type: ignore[union-attr] + machine.wait_until_tty_matches("5", "login: ") + machine.send_chars("test-homed-user\n") + machine.wait_until_tty_matches("5", "login: test-homed-user") + machine.wait_until_tty_matches("5", "Password: ") + machine.send_chars("${password}\n") + machine.wait_until_tty_matches("5", "Password incorrect or not sufficient for authentication of user test-homed-user.") + machine.wait_until_tty_matches("5", "Sorry, try again: ") + machine.send_chars("${newPass}\n") + machine.send_chars("whoami > /tmp/4\n") + machine.wait_for_file("/tmp/4") + assert "test-homed-user" in machine.succeed("cat /tmp/4") + + with subtest("homed user should be in wheel according to NSS"): + machine.succeed("userdbctl group wheel -s io.systemd.NameServiceSwitch | grep test-homed-user") + ''; +}) diff --git a/nixos/tests/systemd-user-tmpfiles-rules.nix b/nixos/tests/systemd-user-tmpfiles-rules.nix new file mode 100644 index 000000000000..bf29b4b57be3 --- /dev/null +++ b/nixos/tests/systemd-user-tmpfiles-rules.nix @@ -0,0 +1,35 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "systemd-user-tmpfiles-rules"; + + meta = with lib.maintainers; { + maintainers = [ schnusch ]; + }; + + nodes.machine = { ... }: { + users.users = { + alice.isNormalUser = true; + bob.isNormalUser = true; + }; + + systemd.user.tmpfiles = { + rules = [ + "d %h/user_tmpfiles_created" + ]; + users.alice.rules = [ + "d %h/only_alice" + ]; + }; + }; + + testScript = { ... }: '' + machine.succeed("loginctl enable-linger alice bob") + + machine.wait_until_succeeds("systemctl --user --machine=alice@ is-active systemd-tmpfiles-setup.service") + machine.succeed("[ -d ~alice/user_tmpfiles_created ]") + machine.succeed("[ -d ~alice/only_alice ]") + + machine.wait_until_succeeds("systemctl --user --machine=bob@ is-active systemd-tmpfiles-setup.service") + machine.succeed("[ -d ~bob/user_tmpfiles_created ]") + machine.succeed("[ ! -e ~bob/only_alice ]") + ''; +}) diff --git a/nixos/tests/systemd-userdbd.nix b/nixos/tests/systemd-userdbd.nix new file mode 100644 index 000000000000..5d0233ffd9fb --- /dev/null +++ b/nixos/tests/systemd-userdbd.nix @@ -0,0 +1,32 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "systemd-userdbd"; + nodes.machine = { config, pkgs, ... }: { + services.userdbd.enable = true; + + users.users.test-user-nss = { + isNormalUser = true; + }; + + environment.etc."userdb/test-user-dropin.user".text = builtins.toJSON { + userName = "test-user-dropin"; + }; + + environment.systemPackages = with pkgs; [ libvarlink ]; + }; + testScript = '' + import json + from shlex import quote + + def getUserRecord(name): + Interface = "unix:/run/systemd/userdb/io.systemd.Multiplexer/io.systemd.UserDatabase" + payload = json.dumps({ + "service": "io.systemd.Multiplexer", + "userName": name + }) + return json.loads(machine.succeed(f"varlink call {Interface}.GetUserRecord {quote(payload)}")) + + machine.wait_for_unit("systemd-userdbd.socket") + getUserRecord("test-user-nss") + getUserRecord("test-user-dropin") + ''; +}) diff --git a/nixos/tests/tayga.nix b/nixos/tests/tayga.nix new file mode 100644 index 000000000000..44974f6efea8 --- /dev/null +++ b/nixos/tests/tayga.nix @@ -0,0 +1,235 @@ +# This test verifies that we can ping an IPv4-only server from an IPv6-only +# client via a NAT64 router. The hosts and networks are configured as follows: +# +# +------ +# Client | eth1 Address: 2001:db8::2/64 +# | | Route: 64:ff9b::/96 via 2001:db8::1 +# +--|--- +# | VLAN 3 +# +--|--- +# | eth2 Address: 2001:db8::1/64 +# Router | +# | nat64 Address: 64:ff9b::1/128 +# | Route: 64:ff9b::/96 +# | Address: 192.0.2.0/32 +# | Route: 192.0.2.0/24 +# | +# | eth1 Address: 100.64.0.1/24 +# +--|--- +# | VLAN 2 +# +--|--- +# Server | eth1 Address: 100.64.0.2/24 +# | Route: 192.0.2.0/24 via 100.64.0.1 +# +------ + +import ./make-test-python.nix ({ pkgs, lib, ... }: + +{ + name = "tayga"; + meta = with pkgs.lib.maintainers; { + maintainers = [ hax404 ]; + }; + + nodes = { + # The server is configured with static IPv4 addresses. RFC 6052 Section 3.1 + # disallows the mapping of non-global IPv4 addresses like RFC 1918 into the + # Well-Known Prefix 64:ff9b::/96. TAYGA also does not allow the mapping of + # documentation space (RFC 5737). To circumvent this, 100.64.0.2/24 from + # RFC 6589 (Carrier Grade NAT) is used here. + # To reach the IPv4 address pool of the NAT64 gateway, there is a static + # route configured. In normal cases, where the router would also source NAT + # the pool addresses to one IPv4 addresses, this would not be needed. + server = { + virtualisation.vlans = [ + 2 # towards router + ]; + networking = { + useDHCP = false; + interfaces.eth1 = lib.mkForce {}; + }; + systemd.network = { + enable = true; + networks."vlan1" = { + matchConfig.Name = "eth1"; + address = [ + "100.64.0.2/24" + ]; + routes = [ + { routeConfig = { Destination = "192.0.2.0/24"; Gateway = "100.64.0.1"; }; } + ]; + }; + }; + }; + + # The router is configured with static IPv4 addresses towards the server + # and IPv6 addresses towards the client. For NAT64, the Well-Known prefix + # 64:ff9b::/96 is used. NAT64 is done with TAYGA which provides the + # tun-interface nat64 and does the translation over it. The IPv6 packets + # are sent to this interfaces and received as IPv4 packets and vice versa. + # As TAYGA only translates IPv6 addresses to dedicated IPv4 addresses, it + # needs a pool of IPv4 addresses which must be at least as big as the + # expected amount of clients. In this test, the packets from the pool are + # directly routed towards the client. In normal cases, there would be a + # second source NAT44 to map all clients behind one IPv4 address. + router_systemd = { + boot.kernel.sysctl = { + "net.ipv4.ip_forward" = 1; + "net.ipv6.conf.all.forwarding" = 1; + }; + + virtualisation.vlans = [ + 2 # towards server + 3 # towards client + ]; + + networking = { + useDHCP = false; + useNetworkd = true; + firewall.enable = false; + interfaces.eth1 = lib.mkForce { + ipv4 = { + addresses = [ { address = "100.64.0.1"; prefixLength = 24; } ]; + }; + }; + interfaces.eth2 = lib.mkForce { + ipv6 = { + addresses = [ { address = "2001:db8::1"; prefixLength = 64; } ]; + }; + }; + }; + + services.tayga = { + enable = true; + ipv4 = { + address = "192.0.2.0"; + router = { + address = "192.0.2.1"; + }; + pool = { + address = "192.0.2.0"; + prefixLength = 24; + }; + }; + ipv6 = { + address = "2001:db8::1"; + router = { + address = "64:ff9b::1"; + }; + pool = { + address = "64:ff9b::"; + prefixLength = 96; + }; + }; + }; + }; + + router_nixos = { + boot.kernel.sysctl = { + "net.ipv4.ip_forward" = 1; + "net.ipv6.conf.all.forwarding" = 1; + }; + + virtualisation.vlans = [ + 2 # towards server + 3 # towards client + ]; + + networking = { + useDHCP = false; + firewall.enable = false; + interfaces.eth1 = lib.mkForce { + ipv4 = { + addresses = [ { address = "100.64.0.1"; prefixLength = 24; } ]; + }; + }; + interfaces.eth2 = lib.mkForce { + ipv6 = { + addresses = [ { address = "2001:db8::1"; prefixLength = 64; } ]; + }; + }; + }; + + services.tayga = { + enable = true; + ipv4 = { + address = "192.0.2.0"; + router = { + address = "192.0.2.1"; + }; + pool = { + address = "192.0.2.0"; + prefixLength = 24; + }; + }; + ipv6 = { + address = "2001:db8::1"; + router = { + address = "64:ff9b::1"; + }; + pool = { + address = "64:ff9b::"; + prefixLength = 96; + }; + }; + }; + }; + + # The client is configured with static IPv6 addresses. It has also a static + # route for the NAT64 IP space where the IPv4 addresses are mapped in. In + # normal cases, there would be only a default route. + client = { + virtualisation.vlans = [ + 3 # towards router + ]; + + networking = { + useDHCP = false; + interfaces.eth1 = lib.mkForce {}; + }; + + systemd.network = { + enable = true; + networks."vlan1" = { + matchConfig.Name = "eth1"; + address = [ + "2001:db8::2/64" + ]; + routes = [ + { routeConfig = { Destination = "64:ff9b::/96"; Gateway = "2001:db8::1"; }; } + ]; + }; + }; + environment.systemPackages = [ pkgs.mtr ]; + }; + }; + + testScript = '' + # start client and server + for machine in client, server: + machine.wait_for_unit("network-online.target") + machine.log(machine.execute("ip addr")[1]) + machine.log(machine.execute("ip route")[1]) + machine.log(machine.execute("ip -6 route")[1]) + + # test systemd-networkd and nixos-scripts based router + for router in router_systemd, router_nixos: + router.start() + router.wait_for_unit("network-online.target") + router.wait_for_unit("tayga.service") + router.log(machine.execute("ip addr")[1]) + router.log(machine.execute("ip route")[1]) + router.log(machine.execute("ip -6 route")[1]) + + with subtest("Wait for tayga"): + router.wait_for_unit("tayga.service") + + with subtest("Test ICMP"): + client.wait_until_succeeds("ping -c 3 64:ff9b::100.64.0.2 >&2") + + with subtest("Test ICMP and show a traceroute"): + client.wait_until_succeeds("mtr --show-ips --report-wide 64:ff9b::100.64.0.2 >&2") + + router.log(router.execute("systemd-analyze security tayga.service")[1]) + router.shutdown() + ''; +}) diff --git a/nixos/tests/tracee.nix b/nixos/tests/tracee.nix index 72e82ec0b7ed..1609d3abc69f 100644 --- a/nixos/tests/tracee.nix +++ b/nixos/tests/tracee.nix @@ -2,27 +2,32 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "tracee-integration"; nodes = { machine = { config, pkgs, ... }: { - # EventFilters/trace_only_events_from_new_containers requires docker - # podman with docker compat will suffice - virtualisation.podman.enable = true; - virtualisation.podman.dockerCompat = true; + # EventFilters/trace_only_events_from_new_containers and + # Test_EventFilters/trace_only_events_from_"dockerd"_binary_and_contain_it's_pid + # require docker/dockerd + virtualisation.docker.enable = true; environment.systemPackages = [ + # required by Test_EventFilters/trace_events_from_ls_and_which_binary_in_separate_scopes + pkgs.which # build the go integration tests as a binary (pkgs.tracee.overrideAttrs (oa: { pname = oa.pname + "-integration"; - patches = oa.patches or [] ++ [ - # change the prefix from /usr/bin to /run to find nix processes - ../../pkgs/tools/security/tracee/test-EventFilters-prefix-nix-friendly.patch - ]; + postPatch = oa.postPatch or "" + '' + # prepare tester.sh (which will be embedded in the test binary) + patchShebangs tests/integration/tester.sh + + # fix the test to look at nixos paths for running programs + substituteInPlace tests/integration/integration_test.go \ + --replace "bin=/usr/bin/" "comm=" \ + --replace "/usr/bin/dockerd" "dockerd" \ + --replace "/usr/bin" "/run/current-system/sw/bin" + ''; + nativeBuildInputs = oa.nativeBuildInputs or [ ] ++ [ pkgs.makeWrapper ]; buildPhase = '' runHook preBuild # just build the static lib we need for the go test binary - make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES} bpf-core ./dist/btfhub - - # remove the /usr/bin prefix to work with the patch above - substituteInPlace tests/integration/integration_test.go \ - --replace "/usr/bin/ls" "ls" + make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES} bpf-core ./dist/btfhub # then compile the tests to be ran later CGO_LDFLAGS="$(pkg-config --libs libbpf)" go test -tags core,ebpf,integration -p 1 -c -o $GOPATH/tracee-integration ./tests/integration/... @@ -31,7 +36,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { doCheck = false; installPhase = '' mkdir -p $out/bin - cp $GOPATH/tracee-integration $out/bin + mv $GOPATH/tracee-integration $out/bin/ ''; doInstallCheck = false; })) @@ -40,10 +45,16 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; testScript = '' + machine.wait_for_unit("docker.service") + with subtest("run integration tests"): # EventFilters/trace_only_events_from_new_containers also requires a container called "alpine" - machine.succeed('tar cv -C ${pkgs.pkgsStatic.busybox} . | podman import - alpine --change ENTRYPOINT=sleep') + machine.succeed('tar c -C ${pkgs.pkgsStatic.busybox} . | docker import - alpine --change "ENTRYPOINT [\"sleep\"]"') - print(machine.succeed('TRC_BIN="${pkgs.tracee}" tracee-integration -test.v')) + # Test_EventFilters/trace_event_set_in_a_specific_scope expects to be in a dir that includes "integration" + print(machine.succeed( + 'mkdir /tmp/integration', + 'cd /tmp/integration && tracee-integration -test.v' + )) ''; }) diff --git a/nixos/tests/trafficserver.nix b/nixos/tests/trafficserver.nix index 983ded4f172e..e4557c6c50e5 100644 --- a/nixos/tests/trafficserver.nix +++ b/nixos/tests/trafficserver.nix @@ -172,6 +172,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { assert re.fullmatch(expected, out) is not None, "no matching logs" out = json.loads(ats.succeed(f"traffic_logstats -jf {access_log_path}")) + assert isinstance(out, dict) assert out["total"]["error.total"]["req"] == "0", "unexpected log stat" ''; }) diff --git a/nixos/tests/turbovnc-headless-server.nix b/nixos/tests/turbovnc-headless-server.nix index 1dbf9297c813..a155f9f907b2 100644 --- a/nixos/tests/turbovnc-headless-server.nix +++ b/nixos/tests/turbovnc-headless-server.nix @@ -26,7 +26,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { # So that we can ssh into the VM, see e.g. # http://blog.patapon.info/nixos-local-vm/#accessing-the-vm-with-ssh services.openssh.enable = true; - services.openssh.permitRootLogin = "yes"; + services.openssh.settings.PermitRootLogin = "yes"; users.extraUsers.root.password = ""; users.mutableUsers = false; }; diff --git a/nixos/tests/ulogd.nix b/nixos/tests/ulogd.nix new file mode 100644 index 000000000000..ce52d855ffc2 --- /dev/null +++ b/nixos/tests/ulogd.nix @@ -0,0 +1,84 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "ulogd"; + + meta = with lib; { + maintainers = with maintainers; [ p-h ]; + }; + + nodes.machine = { ... }: { + networking.firewall.enable = false; + networking.nftables.enable = true; + networking.nftables.ruleset = '' + table inet filter { + chain input { + type filter hook input priority 0; + log group 2 accept + } + + chain output { + type filter hook output priority 0; policy accept; + log group 2 accept + } + + chain forward { + type filter hook forward priority 0; policy drop; + log group 2 accept + } + + } + ''; + services.ulogd = { + enable = true; + settings = { + global = { + logfile = "/var/log/ulogd.log"; + stack = "log1:NFLOG,base1:BASE,pcap1:PCAP"; + }; + + log1.group = 2; + + pcap1 = { + file = "/var/log/ulogd.pcap"; + sync = 1; + }; + }; + }; + + environment.systemPackages = with pkgs; [ + tcpdump + ]; + }; + + testScript = '' + start_all() + machine.wait_for_unit("ulogd.service") + machine.wait_for_unit("network-online.target") + + with subtest("Ulogd is running"): + machine.succeed("pgrep ulogd >&2") + + # All packets show up twice in the logs + with subtest("Logs are collected"): + machine.succeed("ping -f 127.0.0.1 -c 5 >&2") + machine.succeed("sleep 2") + machine.wait_until_succeeds("du /var/log/ulogd.pcap >&2") + _, echo_request_packets = machine.execute("tcpdump -r /var/log/ulogd.pcap icmp[0] == 8 and host 127.0.0.1") + expected, actual = 5*2, len(echo_request_packets.splitlines()) + assert expected == actual, f"Expected {expected} packets, got: {actual}" + _, echo_reply_packets = machine.execute("tcpdump -r /var/log/ulogd.pcap icmp[0] == 0 and host 127.0.0.1") + expected, actual = 5*2, len(echo_reply_packets.splitlines()) + assert expected == actual, f"Expected {expected} packets, got: {actual}" + + with subtest("Reloading service reopens log file"): + machine.succeed("mv /var/log/ulogd.pcap /var/log/old_ulogd.pcap") + machine.succeed("systemctl reload ulogd.service") + machine.succeed("ping -f 127.0.0.1 -c 5 >&2") + machine.succeed("sleep 2") + _, echo_request_packets = machine.execute("tcpdump -r /var/log/ulogd.pcap icmp[0] == 8 and host 127.0.0.1") + expected, actual = 5*2, len(echo_request_packets.splitlines()) + assert expected == actual, f"Expected {expected} packets, got: {actual}" + _, echo_reply_packets = machine.execute("tcpdump -r /var/log/ulogd.pcap icmp[0] == 0 and host 127.0.0.1") + expected, actual = 5*2, len(echo_reply_packets.splitlines()) + assert expected == actual, f"Expected {expected} packets, got: {actual}" + ''; +}) diff --git a/nixos/tests/vaultwarden.nix b/nixos/tests/vaultwarden.nix index 408019666da3..d0b11e00538f 100644 --- a/nixos/tests/vaultwarden.nix +++ b/nixos/tests/vaultwarden.nix @@ -87,6 +87,9 @@ let testRunner = pkgs.writers.writePython3Bin "test-runner" { libraries = [ pkgs.python3Packages.selenium ]; + flakeIgnore = [ + "E501" + ]; } '' from selenium.webdriver.common.by import By @@ -104,39 +107,41 @@ let wait = WebDriverWait(driver, 10) - wait.until(EC.title_contains("Create Account")) + wait.until(EC.title_contains("Create account")) - driver.find_element(By.CSS_SELECTOR, 'input#email').send_keys( - '${userEmail}' + driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_email').send_keys( + '${userEmail}' ) - driver.find_element(By.CSS_SELECTOR, 'input#name').send_keys( - 'A Cat' + driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_name').send_keys( + 'A Cat' ) - driver.find_element(By.CSS_SELECTOR, 'input#masterPassword').send_keys( - '${userPassword}' + driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_master-password').send_keys( + '${userPassword}' ) - driver.find_element(By.CSS_SELECTOR, 'input#masterPasswordRetype').send_keys( - '${userPassword}' + driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_confirm-master-password').send_keys( + '${userPassword}' ) - driver.find_element(By.XPATH, "//button[contains(., 'Submit')]").click() + driver.find_element(By.XPATH, "//button[contains(., 'Create account')]").click() - wait.until_not(EC.title_contains("Create Account")) + wait.until_not(EC.title_contains("Create account")) - driver.find_element(By.CSS_SELECTOR, 'input#masterPassword').send_keys( - '${userPassword}' + driver.find_element(By.XPATH, "//button[contains(., 'Continue')]").click() + + driver.find_element(By.CSS_SELECTOR, 'input#login_input_master-password').send_keys( + '${userPassword}' ) - driver.find_element(By.XPATH, "//button[contains(., 'Log In')]").click() + driver.find_element(By.XPATH, "//button[contains(., 'Log in')]").click() - wait.until(EC.title_contains("Bitwarden Web Vault")) + wait.until(EC.title_contains("Vaultwarden Web Vault")) - driver.find_element(By.XPATH, "//button[contains(., 'Add Item')]").click() + driver.find_element(By.XPATH, "//button[contains(., 'Add item')]").click() driver.find_element(By.CSS_SELECTOR, 'input#name').send_keys( - 'secrets' + 'secrets' ) driver.find_element(By.CSS_SELECTOR, 'input#loginPassword').send_keys( - '${storedPassword}' + '${storedPassword}' ) driver.find_element(By.XPATH, "//button[contains(., 'Save')]").click() @@ -161,7 +166,7 @@ let with subtest("configure the cli"): client.succeed("bw --nointeraction config server http://server") - with subtest("can't login to nonexistant account"): + with subtest("can't login to nonexistent account"): client.fail( "bw --nointeraction --raw login ${userEmail} ${userPassword}" ) diff --git a/nixos/tests/vector.nix b/nixos/tests/vector.nix index ecf94e33ff17..9309f6a14dd7 100644 --- a/nixos/tests/vector.nix +++ b/nixos/tests/vector.nix @@ -21,7 +21,7 @@ with pkgs.lib; type = "file"; inputs = [ "journald" ]; path = "/var/lib/vector/logs.log"; - encoding = { codec = "ndjson"; }; + encoding = { codec = "json"; }; }; }; }; diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 1c1b0dac7f37..0be22bdcaea6 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -28,8 +28,8 @@ let messagebus:x:1: EOF - "${pkgs.dbus.daemon}/bin/dbus-daemon" --fork \ - --config-file="${pkgs.dbus.daemon}/share/dbus-1/system.conf" + "${pkgs.dbus}/bin/dbus-daemon" --fork \ + --config-file="${pkgs.dbus}/share/dbus-1/system.conf" ${guestAdditions}/bin/VBoxService ${(attrs.vmScript or (const "")) pkgs} diff --git a/nixos/tests/vscodium.nix b/nixos/tests/vscodium.nix index ee884cc4295d..37bb649889b4 100644 --- a/nixos/tests/vscodium.nix +++ b/nixos/tests/vscodium.nix @@ -49,8 +49,8 @@ let start_all() machine.wait_for_unit('graphical.target') - machine.wait_until_succeeds('pgrep -x codium') + codium_running.wait() with codium_running: # Wait until vscodium is visible. "File" is in the menu bar. machine.wait_for_text('Get Started') diff --git a/nixos/tests/warzone2100.nix b/nixos/tests/warzone2100.nix new file mode 100644 index 000000000000..568e04a46999 --- /dev/null +++ b/nixos/tests/warzone2100.nix @@ -0,0 +1,26 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "warzone2100"; + meta = with pkgs.lib.maintainers; { + maintainers = [ fgaz ]; + }; + + nodes.machine = { config, pkgs, ... }: { + imports = [ + ./common/x11.nix + ]; + + services.xserver.enable = true; + environment.systemPackages = [ pkgs.warzone2100 ]; + }; + + enableOCR = true; + + testScript = + '' + machine.wait_for_x() + machine.execute("warzone2100 >&2 &") + machine.wait_for_window("Warzone 2100") + machine.wait_for_text(r"(Single Player|Multi Player|Tutorial|Options|Quit Game)") + machine.screenshot("screen") + ''; +}) diff --git a/nixos/tests/web-apps/mastodon.nix b/nixos/tests/web-apps/mastodon.nix deleted file mode 100644 index bc1122e7268f..000000000000 --- a/nixos/tests/web-apps/mastodon.nix +++ /dev/null @@ -1,176 +0,0 @@ -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 turion ]; - - 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, ... }: { - - virtualisation.memorySize = 2048; - - 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) - - # Check that mastodon-media-auto-remove is scheduled - server.succeed("systemctl status mastodon-media-auto-remove.timer") - - 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/mastodon/default.nix b/nixos/tests/web-apps/mastodon/default.nix new file mode 100644 index 000000000000..411ebfcd731b --- /dev/null +++ b/nixos/tests/web-apps/mastodon/default.nix @@ -0,0 +1,9 @@ +{ system ? builtins.currentSystem, handleTestOn }: +let + supportedSystems = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; + +in +{ + standard = handleTestOn supportedSystems ./standard.nix { inherit system; }; + remote-postgresql = handleTestOn supportedSystems ./remote-postgresql.nix { inherit system; }; +} diff --git a/nixos/tests/web-apps/mastodon/remote-postgresql.nix b/nixos/tests/web-apps/mastodon/remote-postgresql.nix new file mode 100644 index 000000000000..2fd3983e13ec --- /dev/null +++ b/nixos/tests/web-apps/mastodon/remote-postgresql.nix @@ -0,0 +1,160 @@ +import ../../make-test-python.nix ({pkgs, ...}: +let + cert = pkgs: pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' + openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=mastodon.local' -days 36500 + mkdir -p $out + cp key.pem cert.pem $out + ''; + + hosts = '' + 192.168.2.103 mastodon.local + ''; + +in +{ + name = "mastodon-remote-postgresql"; + meta.maintainers = with pkgs.lib.maintainers; [ erictapen izorkin turion ]; + + nodes = { + database = { + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.2.102"; prefixLength = 24; } + ]; + }; + extraHosts = hosts; + firewall.allowedTCPPorts = [ 5432 ]; + }; + + services.postgresql = { + enable = true; + enableTCPIP = true; + authentication = '' + hostnossl mastodon_local mastodon_test 192.168.2.201/32 md5 + ''; + initialScript = pkgs.writeText "postgresql_init.sql" '' + CREATE ROLE mastodon_test LOGIN PASSWORD 'SoDTZcISc3f1M1LJsRLT'; + CREATE DATABASE mastodon_local TEMPLATE template0 ENCODING UTF8; + GRANT ALL PRIVILEGES ON DATABASE mastodon_local TO mastodon_test; + ''; + }; + }; + + nginx = { + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.2.103"; prefixLength = 24; } + ]; + }; + extraHosts = hosts; + firewall.allowedTCPPorts = [ 80 443 ]; + }; + + security = { + pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; + }; + + services.nginx = { + enable = true; + recommendedProxySettings = true; + virtualHosts."mastodon.local" = { + root = "/var/empty"; + forceSSL = true; + enableACME = pkgs.lib.mkForce false; + sslCertificate = "${cert pkgs}/cert.pem"; + sslCertificateKey = "${cert pkgs}/key.pem"; + locations."/" = { + tryFiles = "$uri @proxy"; + }; + locations."@proxy" = { + proxyPass = "http://192.168.2.201:55001"; + proxyWebsockets = true; + }; + locations."/api/v1/streaming/" = { + proxyPass = "http://192.168.2.201:55002"; + proxyWebsockets = true; + }; + }; + }; + }; + + server = { pkgs, ... }: { + virtualisation.memorySize = 2048; + + environment = { + etc = { + "mastodon/password-posgressql-db".text = '' + SoDTZcISc3f1M1LJsRLT + ''; + }; + }; + + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.2.201"; prefixLength = 24; } + ]; + }; + extraHosts = hosts; + firewall.allowedTCPPorts = [ 55001 55002 ]; + }; + + services.mastodon = { + enable = true; + configureNginx = false; + localDomain = "mastodon.local"; + enableUnixSocket = false; + database = { + createLocally = false; + host = "192.168.2.102"; + port = 5432; + name = "mastodon_local"; + user = "mastodon_test"; + passwordFile = "/etc/mastodon/password-posgressql-db"; + }; + smtp = { + createLocally = false; + fromAddress = "mastodon@mastodon.local"; + }; + extraConfig = { + BIND = "0.0.0.0"; + EMAIL_DOMAIN_ALLOWLIST = "example.com"; + RAILS_SERVE_STATIC_FILES = "true"; + TRUSTED_PROXY_IP = "192.168.2.103"; + }; + }; + }; + + client = { pkgs, ... }: { + environment.systemPackages = [ pkgs.jq ]; + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.2.202"; prefixLength = 24; } + ]; + }; + extraHosts = hosts; + }; + + security = { + pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; + }; + }; + }; + + testScript = import ./script.nix { + inherit pkgs; + extraInit = '' + nginx.wait_for_unit("nginx.service") + nginx.wait_for_open_port(443) + database.wait_for_unit("postgresql.service") + database.wait_for_open_port(5432) + ''; + extraShutdown = '' + nginx.shutdown() + database.shutdown() + ''; + }; +}) diff --git a/nixos/tests/web-apps/mastodon/script.nix b/nixos/tests/web-apps/mastodon/script.nix new file mode 100644 index 000000000000..cdb1d4379b64 --- /dev/null +++ b/nixos/tests/web-apps/mastodon/script.nix @@ -0,0 +1,54 @@ +{ pkgs +, extraInit ? "" +, extraShutdown ? "" +}: + +'' + start_all() + + ${extraInit} + + server.wait_for_unit("redis-mastodon.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 that mastodon-media-auto-remove is scheduled + server.succeed("systemctl status mastodon-media-auto-remove.timer") + + # Check Mastodon version from remote client + client.succeed("curl --fail https://mastodon.local/api/v1/instance | jq -r '.version' | grep '${pkgs.mastodon.version}'") + + # Check access from remote client + client.succeed("curl --fail https://mastodon.local/about | grep 'Mastodon hosted on mastodon.local'") + client.succeed("curl --fail $(curl https://mastodon.local/api/v1/instance 2> /dev/null | jq -r .thumbnail) --output /dev/null") + + # Simple check tootctl commands + # Check Mastodon version + server.succeed("mastodon-tootctl version | grep '${pkgs.mastodon.version}'") + + # Manage accounts + server.succeed("mastodon-tootctl email_domain_blocks add example.com") + server.succeed("mastodon-tootctl email_domain_blocks list | grep example.com") + server.fail("mastodon-tootctl email_domain_blocks list | grep mastodon.local") + server.fail("mastodon-tootctl accounts create alice --email=alice@example.com") + server.succeed("mastodon-tootctl email_domain_blocks remove example.com") + server.succeed("mastodon-tootctl accounts create bob --email=bob@example.com") + server.succeed("mastodon-tootctl accounts approve bob") + server.succeed("mastodon-tootctl accounts delete bob") + + # Manage IP access + server.succeed("mastodon-tootctl ip_blocks add 192.168.0.0/16 --severity=no_access") + server.succeed("mastodon-tootctl ip_blocks export | grep 192.168.0.0/16") + server.fail("mastodon-tootctl ip_blocks export | grep 172.16.0.0/16") + client.fail("curl --fail https://mastodon.local/about") + server.succeed("mastodon-tootctl ip_blocks remove 192.168.0.0/16") + client.succeed("curl --fail https://mastodon.local/about") + + server.shutdown() + client.shutdown() + + ${extraShutdown} +'' diff --git a/nixos/tests/web-apps/mastodon/standard.nix b/nixos/tests/web-apps/mastodon/standard.nix new file mode 100644 index 000000000000..14311afea3f7 --- /dev/null +++ b/nixos/tests/web-apps/mastodon/standard.nix @@ -0,0 +1,92 @@ +import ../../make-test-python.nix ({pkgs, ...}: +let + cert = pkgs: pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' + openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=mastodon.local' -days 36500 + mkdir -p $out + cp key.pem cert.pem $out + ''; + + hosts = '' + 192.168.2.101 mastodon.local + ''; + +in +{ + name = "mastodon-standard"; + meta.maintainers = with pkgs.lib.maintainers; [ erictapen izorkin turion ]; + + nodes = { + server = { pkgs, ... }: { + + virtualisation.memorySize = 2048; + + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.2.101"; prefixLength = 24; } + ]; + }; + extraHosts = hosts; + firewall.allowedTCPPorts = [ 80 443 ]; + }; + + security = { + pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; + }; + + services.redis.servers.mastodon = { + enable = true; + bind = "127.0.0.1"; + port = 31637; + }; + + services.mastodon = { + enable = true; + configureNginx = true; + localDomain = "mastodon.local"; + enableUnixSocket = false; + smtp = { + createLocally = false; + fromAddress = "mastodon@mastodon.local"; + }; + extraConfig = { + EMAIL_DOMAIN_ALLOWLIST = "example.com"; + }; + }; + + services.nginx = { + virtualHosts."mastodon.local" = { + enableACME = pkgs.lib.mkForce false; + sslCertificate = "${cert pkgs}/cert.pem"; + sslCertificateKey = "${cert pkgs}/key.pem"; + }; + }; + }; + + client = { pkgs, ... }: { + environment.systemPackages = [ pkgs.jq ]; + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.2.102"; prefixLength = 24; } + ]; + }; + extraHosts = hosts; + }; + + security = { + pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; + }; + }; + }; + + testScript = import ./script.nix { + inherit pkgs; + extraInit = '' + server.wait_for_unit("nginx.service") + server.wait_for_open_port(443) + server.wait_for_unit("postgresql.service") + server.wait_for_open_port(5432) + ''; + }; +}) diff --git a/nixos/tests/web-apps/peering-manager.nix b/nixos/tests/web-apps/peering-manager.nix new file mode 100644 index 000000000000..56b7eebfadff --- /dev/null +++ b/nixos/tests/web-apps/peering-manager.nix @@ -0,0 +1,40 @@ +import ../make-test-python.nix ({ lib, pkgs, ... }: { + name = "peering-manager"; + + meta = with lib.maintainers; { + maintainers = [ yuka ]; + }; + + nodes.machine = { ... }: { + services.peering-manager = { + enable = true; + secretKeyFile = pkgs.writeText "secret" '' + abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + ''; + }; + }; + + testScript = { nodes }: '' + machine.start() + machine.wait_for_unit("peering-manager.target") + machine.wait_until_succeeds("journalctl --since -1m --unit peering-manager --grep Listening") + + print(machine.succeed( + "curl -sSfL http://[::1]:8001" + )) + with subtest("Home screen loads"): + machine.succeed( + "curl -sSfL http://[::1]:8001 | grep 'Home - Peering Manager'" + ) + with subtest("checks succeed"): + machine.succeed( + "systemctl stop peering-manager peering-manager-rq" + ) + machine.succeed( + "sudo -u postgres psql -c 'ALTER USER \"peering-manager\" WITH SUPERUSER;'" + ) + machine.succeed( + "cd ${nodes.machine.config.system.build.peeringManagerPkg}/opt/peering-manager ; peering-manager-manage test --no-input" + ) + ''; +}) diff --git a/nixos/tests/web-apps/peertube.nix b/nixos/tests/web-apps/peertube.nix index ecc45bff2e2c..0e5f39c08a02 100644 --- a/nixos/tests/web-apps/peertube.nix +++ b/nixos/tests/web-apps/peertube.nix @@ -41,6 +41,9 @@ import ../make-test-python.nix ({pkgs, ...}: server = { pkgs, ... }: { environment = { etc = { + "peertube/secrets-peertube".text = '' + 063d9c60d519597acef26003d5ecc32729083965d09181ef3949200cbe5f09ee + ''; "peertube/password-posgressql-db".text = '' 0gUN0C1mgST6czvjZ8T9 ''; @@ -67,6 +70,10 @@ import ../make-test-python.nix ({pkgs, ...}: localDomain = "peertube.local"; enableWebHttps = false; + secrets = { + secretsFile = "/etc/peertube/secrets-peertube"; + }; + database = { host = "192.168.2.10"; name = "peertube_local"; diff --git a/nixos/tests/webhook.nix b/nixos/tests/webhook.nix new file mode 100644 index 000000000000..ed7051408640 --- /dev/null +++ b/nixos/tests/webhook.nix @@ -0,0 +1,65 @@ +{ pkgs, ... }: +let + forwardedPort = 19000; + internalPort = 9000; +in +{ + name = "webhook"; + + nodes = { + webhookMachine = { pkgs, ... }: { + virtualisation.forwardPorts = [{ + host.port = forwardedPort; + guest.port = internalPort; + }]; + services.webhook = { + enable = true; + port = internalPort; + openFirewall = true; + hooks = { + echo = { + execute-command = "echo"; + response-message = "Webhook is reachable!"; + }; + }; + hooksTemplated = { + echoTemplate = '' + { + "id": "echo-template", + "execute-command": "echo", + "response-message": "{{ getenv "WEBHOOK_MESSAGE" }}" + } + ''; + }; + environment.WEBHOOK_MESSAGE = "Templates are working!"; + }; + }; + }; + + extraPythonPackages = p: [ + p.requests + p.types-requests + ]; + + testScript = { nodes, ... }: '' + import requests + webhookMachine.wait_for_unit("webhook") + webhookMachine.wait_for_open_port(${toString internalPort}) + + with subtest("Check that webhooks can be called externally"): + response = requests.get("http://localhost:${toString forwardedPort}/hooks/echo") + print(f"Response code: {response.status_code}") + print("Response: %r" % response.content) + + assert response.status_code == 200 + assert response.content == b"Webhook is reachable!" + + with subtest("Check that templated webhooks can be called externally"): + response = requests.get("http://localhost:${toString forwardedPort}/hooks/echo-template") + print(f"Response code: {response.status_code}") + print("Response: %r" % response.content) + + assert response.status_code == 200 + assert response.content == b"Templates are working!" + ''; +} diff --git a/nixos/tests/wireguard/basic.nix b/nixos/tests/wireguard/basic.nix index 36ab226cde0e..96b0a681c364 100644 --- a/nixos/tests/wireguard/basic.nix +++ b/nixos/tests/wireguard/basic.nix @@ -1,5 +1,4 @@ -{ kernelPackages ? null }: -import ../make-test-python.nix ({ pkgs, lib, ...} : +import ../make-test-python.nix ({ pkgs, lib, kernelPackages ? null, ...} : let wg-snakeoil-keys = import ./snakeoil-keys.nix; peer = (import ./make-peer.nix) { inherit lib; }; diff --git a/nixos/tests/wireguard/default.nix b/nixos/tests/wireguard/default.nix index dedb321ff2ef..c30f1b74770b 100644 --- a/nixos/tests/wireguard/default.nix +++ b/nixos/tests/wireguard/default.nix @@ -7,10 +7,11 @@ with pkgs.lib; let - tests = let callTest = p: flip (import p) { inherit system pkgs; }; in { + tests = let callTest = p: args: import p ({ inherit system pkgs; } // args); in { basic = callTest ./basic.nix; namespaces = callTest ./namespaces.nix; wg-quick = callTest ./wg-quick.nix; + wg-quick-nftables = args: callTest ./wg-quick.nix ({ nftables = true; } // args); generated = callTest ./generated.nix; }; in diff --git a/nixos/tests/wireguard/generated.nix b/nixos/tests/wireguard/generated.nix index 84a35d29b453..c58f7a75071e 100644 --- a/nixos/tests/wireguard/generated.nix +++ b/nixos/tests/wireguard/generated.nix @@ -1,5 +1,4 @@ -{ kernelPackages ? null }: -import ../make-test-python.nix ({ pkgs, lib, ... } : { +import ../make-test-python.nix ({ pkgs, lib, kernelPackages ? null, ... } : { name = "wireguard-generated"; meta = with pkgs.lib.maintainers; { maintainers = [ ma27 grahamc ]; diff --git a/nixos/tests/wireguard/namespaces.nix b/nixos/tests/wireguard/namespaces.nix index 93dc84a8768e..1790c45bb1f6 100644 --- a/nixos/tests/wireguard/namespaces.nix +++ b/nixos/tests/wireguard/namespaces.nix @@ -1,5 +1,3 @@ -{ kernelPackages ? null }: - let listenPort = 12345; socketNamespace = "foo"; @@ -15,7 +13,7 @@ let in -import ../make-test-python.nix ({ pkgs, lib, ... } : { +import ../make-test-python.nix ({ pkgs, lib, kernelPackages ? null, ... } : { name = "wireguard-with-namespaces"; meta = with pkgs.lib.maintainers; { maintainers = [ asymmetric ]; diff --git a/nixos/tests/wireguard/wg-quick.nix b/nixos/tests/wireguard/wg-quick.nix index bc2cba911888..ec2b8d7f2d9d 100644 --- a/nixos/tests/wireguard/wg-quick.nix +++ b/nixos/tests/wireguard/wg-quick.nix @@ -1,9 +1,13 @@ -{ kernelPackages ? null }: - -import ../make-test-python.nix ({ pkgs, lib, ... }: +import ../make-test-python.nix ({ pkgs, lib, kernelPackages ? null, nftables ? false, ... }: let wg-snakeoil-keys = import ./snakeoil-keys.nix; - peer = (import ./make-peer.nix) { inherit lib; }; + peer = import ./make-peer.nix { inherit lib; }; + commonConfig = { + boot.kernelPackages = lib.mkIf (kernelPackages != null) kernelPackages; + networking.nftables.enable = nftables; + # Make sure iptables doesn't work with nftables enabled + boot.blacklistedKernelModules = lib.mkIf nftables [ "nft_compat" ]; + }; in { name = "wg-quick"; @@ -15,47 +19,51 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: peer0 = peer { ip4 = "192.168.0.1"; ip6 = "fd00::1"; - extraConfig = { - boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; - networking.firewall.allowedUDPPorts = [ 23542 ]; - networking.wg-quick.interfaces.wg0 = { - address = [ "10.23.42.1/32" "fc00::1/128" ]; - listenPort = 23542; + extraConfig = lib.mkMerge [ + commonConfig + { + networking.firewall.allowedUDPPorts = [ 23542 ]; + networking.wg-quick.interfaces.wg0 = { + address = [ "10.23.42.1/32" "fc00::1/128" ]; + listenPort = 23542; - inherit (wg-snakeoil-keys.peer0) privateKey; + inherit (wg-snakeoil-keys.peer0) privateKey; - peers = lib.singleton { - allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ]; + peers = lib.singleton { + allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ]; - inherit (wg-snakeoil-keys.peer1) publicKey; + inherit (wg-snakeoil-keys.peer1) publicKey; + }; + + dns = [ "10.23.42.2" "fc00::2" "wg0" ]; }; - - dns = [ "10.23.42.2" "fc00::2" "wg0" ]; - }; - }; + } + ]; }; peer1 = peer { ip4 = "192.168.0.2"; ip6 = "fd00::2"; - extraConfig = { - boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; - networking.useNetworkd = true; - networking.wg-quick.interfaces.wg0 = { - address = [ "10.23.42.2/32" "fc00::2/128" ]; - inherit (wg-snakeoil-keys.peer1) privateKey; + extraConfig = lib.mkMerge [ + commonConfig + { + networking.useNetworkd = true; + networking.wg-quick.interfaces.wg0 = { + address = [ "10.23.42.2/32" "fc00::2/128" ]; + inherit (wg-snakeoil-keys.peer1) privateKey; - peers = lib.singleton { - allowedIPs = [ "0.0.0.0/0" "::/0" ]; - endpoint = "192.168.0.1:23542"; - persistentKeepalive = 25; + peers = lib.singleton { + allowedIPs = [ "0.0.0.0/0" "::/0" ]; + endpoint = "192.168.0.1:23542"; + persistentKeepalive = 25; - inherit (wg-snakeoil-keys.peer0) publicKey; + inherit (wg-snakeoil-keys.peer0) publicKey; + }; + + dns = [ "10.23.42.1" "fc00::1" "wg0" ]; }; - - dns = [ "10.23.42.1" "fc00::1" "wg0" ]; - }; - }; + } + ]; }; }; diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index 416a20aa7fe8..6a460dbce354 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -1,6 +1,6 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ./make-test-python.nix ({ lib, pkgs, ... }: -{ +rec { name = "wordpress"; meta = with pkgs.lib.maintainers; { maintainers = [ @@ -10,17 +10,22 @@ import ./make-test-python.nix ({ pkgs, ... }: ]; }; - nodes = { - wp_httpd = { ... }: { + nodes = lib.foldl (a: version: let + package = pkgs."wordpress${version}"; + in a // { + "wp${version}_httpd" = _: { services.httpd.adminAddr = "webmaster@site.local"; services.httpd.logPerVirtualHost = true; + services.wordpress.webserver = "httpd"; services.wordpress.sites = { "site1.local" = { database.tablePrefix = "site1_"; + inherit package; }; "site2.local" = { database.tablePrefix = "site2_"; + inherit package; }; }; @@ -28,14 +33,16 @@ import ./make-test-python.nix ({ pkgs, ... }: networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; }; - wp_nginx = { ... }: { + "wp${version}_nginx" = _: { services.wordpress.webserver = "nginx"; services.wordpress.sites = { "site1.local" = { database.tablePrefix = "site1_"; + inherit package; }; "site2.local" = { database.tablePrefix = "site2_"; + inherit package; }; }; @@ -43,34 +50,38 @@ import ./make-test-python.nix ({ pkgs, ... }: networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; }; - wp_caddy = { ... }: { + "wp${version}_caddy" = _: { services.wordpress.webserver = "caddy"; services.wordpress.sites = { "site1.local" = { database.tablePrefix = "site1_"; + inherit package; }; "site2.local" = { database.tablePrefix = "site2_"; + inherit package; }; }; networking.firewall.allowedTCPPorts = [ 80 ]; networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; }; - }; + }) {} [ + "6_1" + ]; testScript = '' import re start_all() - wp_httpd.wait_for_unit("httpd") - wp_nginx.wait_for_unit("nginx") - wp_caddy.wait_for_unit("caddy") + ${lib.concatStrings (lib.mapAttrsToList (name: value: '' + ${name}.wait_for_unit("${(value null).services.wordpress.webserver}") + '') nodes)} site_names = ["site1.local", "site2.local"] - for machine in (wp_httpd, wp_nginx, wp_caddy): + for machine in (${lib.concatStringsSep ", " (builtins.attrNames nodes)}): for site_name in site_names: machine.wait_for_unit(f"phpfpm-wordpress-{site_name}") diff --git a/nixos/tests/xmpp/prosody.nix b/nixos/tests/xmpp/prosody.nix index 14eab56fb821..045ae6430fd4 100644 --- a/nixos/tests/xmpp/prosody.nix +++ b/nixos/tests/xmpp/prosody.nix @@ -42,7 +42,7 @@ in import ../make-test-python.nix { ${nodes.server.config.networking.primaryIPAddress} uploads.example.com ''; environment.systemPackages = [ - (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; }) + (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = "example.com"; }) ]; }; server = { config, pkgs, ... }: { @@ -82,6 +82,7 @@ in import ../make-test-python.nix { testScript = { nodes, ... }: '' # Check with sqlite storage + start_all() server.wait_for_unit("prosody.service") server.succeed('prosodyctl status | grep "Prosody is running"') diff --git a/nixos/tests/xmpp/xmpp-sendmessage.nix b/nixos/tests/xmpp/xmpp-sendmessage.nix index 4c009464b704..8ccac0612491 100644 --- a/nixos/tests/xmpp/xmpp-sendmessage.nix +++ b/nixos/tests/xmpp/xmpp-sendmessage.nix @@ -12,6 +12,7 @@ in writeScriptBin "send-message" '' #!${(python3.withPackages (ps: [ ps.slixmpp ])).interpreter} import logging import sys +import signal from types import MethodType from slixmpp import ClientXMPP @@ -64,8 +65,13 @@ class CthonTest(ClientXMPP): log.info('MUC join success!') log.info('XMPP SCRIPT TEST SUCCESS') +def timeout_handler(signalnum, stackframe): + print('ERROR: xmpp-sendmessage timed out') + sys.exit(1) if __name__ == '__main__': + signal.signal(signal.SIGALRM, timeout_handler) + signal.alarm(120) logging.basicConfig(level=logging.DEBUG, format='%(levelname)-8s %(message)s') @@ -76,7 +82,7 @@ if __name__ == '__main__': ct.register_plugin('xep_0363') # MUC ct.register_plugin('xep_0045') - ct.connect(("server", 5222)) + ct.connect(("${connectTo}", 5222)) ct.process(forever=False) if not ct.test_succeeded: diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 29df691cecbe..3e55369daa06 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -17,103 +17,151 @@ let makeTest { name = "zfs-" + name; meta = with pkgs.lib.maintainers; { - maintainers = [ adisbladis ]; + maintainers = [ adisbladis elvishjerricco ]; }; nodes.machine = { pkgs, lib, ... }: let usersharePath = "/var/lib/samba/usershares"; in { - virtualisation.emptyDiskImages = [ 4096 ]; + virtualisation = { + emptyDiskImages = [ 4096 4096 ]; + useBootLoader = true; + useEFIBoot = true; + }; + boot.loader.systemd-boot.enable = true; + boot.loader.timeout = 0; + boot.loader.efi.canTouchEfiVariables = true; networking.hostId = "deadbeef"; boot.kernelPackages = kernelPackage; boot.supportedFilesystems = [ "zfs" ]; boot.zfs.enableUnstable = enableUnstable; - services.samba = { - enable = true; - extraConfig = '' - registry shares = yes - usershare path = ${usersharePath} - usershare allow guests = yes - usershare max shares = 100 - usershare owner only = no - ''; - }; - systemd.services.samba-smbd.serviceConfig.ExecStartPre = - "${pkgs.coreutils}/bin/mkdir -m +t -p ${usersharePath}"; - environment.systemPackages = [ pkgs.parted ]; - # Setup regular fileSystems machinery to ensure forceImportAll can be - # tested via the regular service units. - virtualisation.fileSystems = { - "/forcepool" = { - device = "forcepool"; + # /dev/disk/by-id doesn't get populated in the NixOS test framework + boot.zfs.devNodes = "/dev/disk/by-uuid"; + + specialisation.samba.configuration = { + services.samba = { + enable = true; + extraConfig = '' + registry shares = yes + usershare path = ${usersharePath} + usershare allow guests = yes + usershare max shares = 100 + usershare owner only = no + ''; + }; + systemd.services.samba-smbd.serviceConfig.ExecStartPre = + "${pkgs.coreutils}/bin/mkdir -m +t -p ${usersharePath}"; + virtualisation.fileSystems = { + "/tmp/mnt" = { + device = "rpool/root"; + fsType = "zfs"; + }; + }; + }; + + specialisation.encryption.configuration = { + boot.zfs.requestEncryptionCredentials = [ "automatic" ]; + virtualisation.fileSystems."/automatic" = { + device = "automatic"; + fsType = "zfs"; + }; + virtualisation.fileSystems."/manual" = { + device = "manual"; + fsType = "zfs"; + }; + virtualisation.fileSystems."/manual/encrypted" = { + device = "manual/encrypted"; fsType = "zfs"; options = [ "noauto" ]; }; }; - # forcepool doesn't exist at first boot, and we need to manually test - # the import after tweaking the hostId. - systemd.services.zfs-import-forcepool.wantedBy = lib.mkVMOverride []; - systemd.targets.zfs.wantedBy = lib.mkVMOverride []; - boot.zfs.forceImportAll = true; - # /dev/disk/by-id doesn't get populated in the NixOS test framework - boot.zfs.devNodes = "/dev/disk/by-uuid"; + specialisation.forcepool.configuration = { + systemd.services.zfs-import-forcepool.wantedBy = lib.mkVMOverride [ "forcepool.mount" ]; + systemd.targets.zfs.wantedBy = lib.mkVMOverride []; + boot.zfs.forceImportAll = true; + virtualisation.fileSystems."/forcepool" = { + device = "forcepool"; + fsType = "zfs"; + options = [ "noauto" ]; + }; + }; }; testScript = '' + machine.wait_for_unit("multi-user.target") machine.succeed( - "modprobe zfs", "zpool status", - "ls /dev", - "mkdir /tmp/mnt", - "udevadm settle", - "parted --script /dev/vdb mklabel msdos", - "parted --script /dev/vdb -- mkpart primary 1024M -1s", - "udevadm settle", - "zpool create rpool /dev/vdb1", - "zfs create -o mountpoint=legacy rpool/root", - # shared datasets cannot have legacy mountpoint - "zfs create rpool/shared_smb", - "mount -t zfs rpool/root /tmp/mnt", - "udevadm settle", - # wait for samba services - "systemctl is-system-running --wait", - "zfs set sharesmb=on rpool/shared_smb", - "zfs share rpool/shared_smb", - "smbclient -gNL localhost | grep rpool_shared_smb", - "umount /tmp/mnt", - "zpool destroy rpool", - "udevadm settle", + "parted --script /dev/vdc mklabel msdos", + "parted --script /dev/vdc -- mkpart primary 1024M -1s", + "parted --script /dev/vdd mklabel msdos", + "parted --script /dev/vdd -- mkpart primary 1024M -1s", ) - machine.succeed( - 'echo password | zpool create -o altroot="/tmp/mnt" ' - + "-O encryption=aes-256-gcm -O keyformat=passphrase rpool /dev/vdb1", - "zfs create -o mountpoint=legacy rpool/root", - "mount -t zfs rpool/root /tmp/mnt", - "udevadm settle", - "umount /tmp/mnt", - "zpool destroy rpool", - "udevadm settle", - ) + with subtest("sharesmb works"): + machine.succeed( + "zpool create rpool /dev/vdc1", + "zfs create -o mountpoint=legacy rpool/root", + # shared datasets cannot have legacy mountpoint + "zfs create rpool/shared_smb", + "bootctl set-default nixos-generation-1-specialisation-samba.conf", + "sync", + ) + machine.crash() + machine.wait_for_unit("multi-user.target") + machine.succeed( + "zfs set sharesmb=on rpool/shared_smb", + "zfs share rpool/shared_smb", + "smbclient -gNL localhost | grep rpool_shared_smb", + "umount /tmp/mnt", + "zpool destroy rpool", + ) + + with subtest("encryption works"): + machine.succeed( + 'echo password | zpool create -O mountpoint=legacy ' + + "-O encryption=aes-256-gcm -O keyformat=passphrase automatic /dev/vdc1", + "zpool create -O mountpoint=legacy manual /dev/vdd1", + "echo otherpass | zfs create " + + "-o encryption=aes-256-gcm -o keyformat=passphrase manual/encrypted", + "bootctl set-default nixos-generation-1-specialisation-encryption.conf", + "sync", + "zpool export automatic", + "zpool export manual", + ) + machine.crash() + machine.start() + machine.wait_for_console_text("Starting password query on") + machine.send_console("password\n") + machine.wait_for_unit("multi-user.target") + machine.succeed( + "zfs get keystatus manual/encrypted | grep unavailable", + "echo otherpass | zfs load-key manual/encrypted", + "systemctl start manual-encrypted.mount", + "umount /automatic /manual/encrypted /manual", + "zpool destroy automatic", + "zpool destroy manual", + ) with subtest("boot.zfs.forceImportAll works"): machine.succeed( "rm /etc/hostid", "zgenhostid deadcafe", - "zpool create forcepool /dev/vdb1 -O mountpoint=legacy", + "zpool create forcepool /dev/vdc1 -O mountpoint=legacy", + "bootctl set-default nixos-generation-1-specialisation-forcepool.conf", + "rm /etc/hostid", + "sync", ) - machine.shutdown() - machine.start() - machine.succeed("udevadm settle") + machine.crash() + machine.wait_for_unit("multi-user.target") machine.fail("zpool import forcepool") machine.succeed( - "systemctl start zfs-import-forcepool.service", - "mount -t zfs forcepool /tmp/mnt", + "systemctl start forcepool.mount", + "mount | grep forcepool", ) '' + extraTest; diff --git a/nixos/tests/zram-generator.nix b/nixos/tests/zram-generator.nix new file mode 100644 index 000000000000..affa081bcc35 --- /dev/null +++ b/nixos/tests/zram-generator.nix @@ -0,0 +1,18 @@ +import ./make-test-python.nix { + name = "zram-generator"; + + nodes.machine = { pkgs, ... }: { + environment.etc."systemd/zram-generator.conf".text = '' + [zram0] + zram-size = ram / 2 + ''; + systemd.packages = [ pkgs.zram-generator ]; + systemd.services."systemd-zram-setup@".path = [ pkgs.util-linux ]; # for mkswap + }; + + testScript = '' + machine.wait_for_unit("systemd-zram-setup@zram0.service") + assert "zram0" in machine.succeed("zramctl -n") + assert "zram0" in machine.succeed("swapon --show --noheadings") + ''; +} diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index 2f9e40616d57..d72c1043a975 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/applications/accessibility/contrast/default.nix @@ -70,6 +70,8 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; + # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 9cb084a6182b..eca4567984ed 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -16,6 +16,7 @@ , feedbackd , wrapGAppsHook , fetchpatch +, nixosTests }: stdenv.mkDerivation rec { @@ -68,6 +69,8 @@ stdenv.mkDerivation rec { feedbackd ]; + passthru.tests.phosh = nixosTests.phosh; + meta = with lib; { description = "A virtual keyboard supporting Wayland"; homepage = "https://source.puri.sm/Librem5/squeekboard"; diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/applications/audio/AMB-plugins/default.nix index 8b03a97d1280..b388674fa449 100644 --- a/pkgs/applications/audio/AMB-plugins/default.nix +++ b/pkgs/applications/audio/AMB-plugins/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { sed -i 's@/usr/bin/install@install@g' Makefile sed -i 's@/bin/rm@rm@g' Makefile sed -i 's@/usr/lib/ladspa@$(out)/lib/ladspa@g' Makefile + sed -i 's@g++@$(CXX)@g' Makefile ''; preInstall="mkdir -p $out/lib/ladspa"; diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix index 517a53a5fecc..62a72fea62a0 100644 --- a/pkgs/applications/audio/aacgain/default.nix +++ b/pkgs/applications/audio/aacgain/default.nix @@ -1,68 +1,45 @@ -{ lib, stdenv, fetchFromGitLab, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, autoconf +, automake +, libtool +, faad2 +, mp4v2 +}: stdenv.mkDerivation rec { pname = "aacgain"; - version = "1.9.0"; + version = "2.0.0"; - src = fetchFromGitLab { - owner = "mulx"; - repo = "aacgain"; - rev = "7c29dccd878ade1301710959aeebe87a8f0828f5"; - sha256 = "07hl432vsscqg01b6wr99qmsj4gbx0i02x4k565432y6zpfmaxm0"; + src = fetchFromGitHub { + owner = "dgilman"; + repo = pname; + rev = version; + sha256 = "sha256-9Y23Zh7q3oB4ha17Fpm1Hu2+wtQOA1llj6WDUAO2ARU="; }; - hardeningDisable = [ "format" ]; - - # -Wnarrowing is enabled by default in recent GCC versions, - # causing compilation to fail. - NIX_CFLAGS_COMPILE = "-Wno-narrowing"; - postPatch = '' - ( - cd mp4v2 - patch -p0 < ${fetchpatch { - name = "fix_missing_ptr_deref.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_missing_ptr_deref.patch?h=aacgain-cvs&id=e1a19c920f57063e64bab75cb0d8624731f6e3d7"; - sha256 = "1cq7r005nvmwdjb25z80grcam7jv6k57jnl2bh349mg3ajmslbq9"; - }} - ) + cp -R ${faad2.src}/* 3rdparty/faad2 + cp -R ${mp4v2.src}/* 3rdparty/mp4v2 + chmod -R +w 3rdparty ''; - configurePhase = '' - runHook preConfigure - cd mp4v2 - ./configure + nativeBuildInputs = [ + cmake + autoconf + automake + libtool + ]; - cd ../faad2 - ./configure - - cd .. - ./configure - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - cd mp4v2 - make libmp4v2.la - - cd ../faad2 - make LDFLAGS=-static - - cd .. - make - runHook postBuild - ''; - - installPhase = '' - install -D aacgain/aacgain "$out/bin/aacgain" - ''; + NIX_CFLAGS_COMPILE = "-Wno-error=narrowing"; meta = with lib; { description = "ReplayGain for AAC files"; - homepage = "https://aacgain.altosdesign.com"; - license = licenses.gpl2; - platforms = platforms.linux; + homepage = "https://github.com/dgilman/aacgain"; + license = licenses.gpl2Plus; + platforms = platforms.unix; maintainers = [ maintainers.robbinch ]; }; } diff --git a/pkgs/applications/audio/aaxtomp3/default.nix b/pkgs/applications/audio/aaxtomp3/default.nix new file mode 100644 index 000000000000..59bd228d4751 --- /dev/null +++ b/pkgs/applications/audio/aaxtomp3/default.nix @@ -0,0 +1,78 @@ +{ bash +, bc +, coreutils +, fetchFromGitHub +, ffmpeg +, findutils +, gawk +, gnugrep +, gnused +, jq +, lame +, lib +, mediainfo +, mp4v2 +, ncurses +, resholve +}: + +resholve.mkDerivation rec { + pname = "aaxtomp3"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "krumpetpirate"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7a9ZVvobWH/gPxa3cFiPL+vlu8h1Dxtcq0trm3HzlQg="; + }; + + postPatch = '' + substituteInPlace AAXtoMP3 \ + --replace 'AAXtoMP3' 'aaxtomp3' + substituteInPlace interactiveAAXtoMP3 \ + --replace 'AAXtoMP3' 'aaxtomp3' \ + --replace 'call="./aaxtomp3"' 'call="$AAXTOMP3"' + ''; + + installPhase = '' + install -Dm 755 AAXtoMP3 $out/bin/aaxtomp3 + install -Dm 755 interactiveAAXtoMP3 $out/bin/interactiveaaxtomp3 + ''; + + solutions.default = { + scripts = [ + "bin/aaxtomp3" + "bin/interactiveaaxtomp3" + ]; + interpreter = "${bash}/bin/bash"; + inputs = [ + bc + coreutils + ffmpeg + findutils + gawk + gnugrep + gnused + jq + lame + mediainfo + mp4v2 + ncurses + ]; + keep."$call" = true; + fix = { + "$AAXTOMP3" = [ "${placeholder "out"}/bin/aaxtomp3" ]; + "$FIND" = [ "find" ]; + "$GREP" = [ "grep" ]; + "$SED" = [ "sed" ]; + }; + }; + + meta = with lib; { + description = "Convert Audible's .aax filetype to MP3, FLAC, M4A, or OPUS"; + homepage = "https://krumpetpirate.github.io/AAXtoMP3"; + license = licenses.wtfpl; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index d8ef7d2b4fa5..df61d3896155 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "aeolus"; - version = "0.9.9"; + version = "0.10.4"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "04y1j36y7vc93bv299vfiawbww4ym6q7avfx8vw6rmxr817zrch3"; + sha256 = "sha256-J9xrd/N4LrvGgi89Yj4ob4ZPUAEchrXJJQ+YVJ29Qhk="; }; buildInputs = [ diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/applications/audio/airwindows-lv2/default.nix index 3585f20f5e35..b58dbddc811f 100644 --- a/pkgs/applications/audio/airwindows-lv2/default.nix +++ b/pkgs/applications/audio/airwindows-lv2/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "airwindows-lv2"; - version = "12.0"; + version = "14.0"; src = fetchFromGitHub { owner = "hannesbraun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e5iMhkcIhQikPcDrMILqBkmBjh8Ngnr2odqyefnrekI="; + sha256 = "sha256-urlj9XwMqKt5JvvsA1f7YpuLhQXMGxp0V1pGv+LTroE="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/applications/audio/alsa-scarlett-gui/default.nix b/pkgs/applications/audio/alsa-scarlett-gui/default.nix new file mode 100644 index 000000000000..8365532b7c13 --- /dev/null +++ b/pkgs/applications/audio/alsa-scarlett-gui/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, alsa-lib +, gtk4 +, wrapGAppsHook4 +}: + +stdenv.mkDerivation rec { + pname = "alsa-scarlett-gui"; + version = "unstable-2022-08-11"; + + src = fetchFromGitHub { + owner = "geoffreybennett"; + repo = pname; + rev = "65c0f6aa432501355803a823be1d3f8aafe907a8"; + sha256 = "sha256-wzBOPTs8PTHzu5RpKwKhx552E7QnDx2Zn4OFaes8Q2I="; + }; + + makeFlags = [ "DESTDIR=\${out}" "PREFIX=''" ]; + sourceRoot = "source/src"; + nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; + buildInputs = [ gtk4 alsa-lib ]; + + meta = with lib; { + description = "GUI for alsa controls presented by Focusrite Scarlett Gen 2/3 Mixer Driver"; + homepage = "https://github.com/geoffreybennett/alsa-scarlett-gui"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ sebtm ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/amberol/default.nix b/pkgs/applications/audio/amberol/default.nix index 5c905f97c4a8..3051dc7ceb82 100644 --- a/pkgs/applications/audio/amberol/default.nix +++ b/pkgs/applications/audio/amberol/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "amberol"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - hash = "sha256-UZFOQw9eXSyCey4YQ4pWV91BIo+5tFw1N8es5H03+fc="; + hash = "sha256-L8yHKwtCAZC1myIouL0Oq3lj0QPWn5dVe0g3nkyAKI8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-ebo718+HAZFd7Pjy06jAzmaLdjR3o4Hn0xEeO7yiIC0="; + hash = "sha256-0XuWBUG37GNHRXgjz0/Vv6VSqaPG36xTj7oN0ukFIJY="; }; postPatch = '' diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index f9fedfcc28ff..5b956e8f5961 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GTK client for MPD (Music player daemon)"; - homepage = "http://ario-player.sourceforge.net/"; + homepage = "https://ario-player.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = [ maintainers.garrison ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix index bd5a64485740..fa75711acea2 100644 --- a/pkgs/applications/audio/ashuffle/default.nix +++ b/pkgs/applications/audio/ashuffle/default.nix @@ -6,7 +6,7 @@ , meson , ninja , libmpdclient -, libyamlcpp +, yaml-cpp }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; nativeBuildInputs = [ cmake pkg-config meson ninja ]; - buildInputs = [ libmpdclient libyamlcpp ]; + buildInputs = [ libmpdclient yaml-cpp ]; mesonFlags = [ "-Dunsupported_use_system_yamlcpp=true" ]; diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index c3cba87e300c..d6efada90763 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -9,8 +9,6 @@ #, aacSupport ? false, TODO: neroAacEnc }: -with lib; - stdenv.mkDerivation rec { version = "2.9.7"; pname = "asunder"; @@ -23,20 +21,20 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 libcddb ]; runtimeDeps = - optional mp3Support lame ++ - optional oggSupport vorbis-tools ++ - optional flacSupport flac ++ - optional opusSupport opusTools ++ - optional wavpackSupport wavpack ++ - optional monkeysAudioSupport monkeysAudio ++ + lib.optional mp3Support lame ++ + lib.optional oggSupport vorbis-tools ++ + lib.optional flacSupport flac ++ + lib.optional opusSupport opusTools ++ + lib.optional wavpackSupport wavpack ++ + lib.optional monkeysAudioSupport monkeysAudio ++ [ cdparanoia ]; postInstall = '' wrapProgram "$out/bin/asunder" \ - --prefix PATH : "${makeBinPath runtimeDeps}" + --prefix PATH : "${lib.makeBinPath runtimeDeps}" ''; - meta = { + meta = with lib; { description = "A graphical Audio CD ripper and encoder for Linux"; homepage = "http://littlesvr.ca/asunder/index.php"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index c12cc30df26d..4a652e1ac474 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -53,30 +53,21 @@ , libpng , libjpeg , AppKit -, AudioToolbox -, AudioUnit -, Carbon -, CoreAudio , CoreAudioKit -, CoreServices }: # TODO # 1. detach sbsms -let - inherit (lib) optionals; - pname = "audacity"; - version = "3.2.1"; -in stdenv.mkDerivation rec { - inherit pname version; + pname = "audacity"; + version = "3.2.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "Audacity-${version}"; - sha256 = "sha256-7rfttp9LnfM2LBT5seupPyDckS7LEzWDZoqtLsGgqgI="; + hash = "sha256-gz2o0Rj4364nJAvJmMQzwIQycoQmqz2/43DBvd3qbho="; }; postPatch = '' @@ -84,10 +75,6 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isLinux '' substituteInPlace libraries/lib-files/FileNames.cpp \ --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h - '' - # error: unknown type name 'NSAppearanceName' - + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' - sed -z -i "s/if (@available(macOS 10.14, \*)).*}/}/g" src/AudacityApp.mm ''; nativeBuildInputs = [ @@ -97,7 +84,7 @@ stdenv.mkDerivation rec { python3 makeWrapper wrapGAppsHook - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ linuxHeaders ]; @@ -106,6 +93,9 @@ stdenv.mkDerivation rec { ffmpeg_4 file flac + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + ] ++ [ gtk3 lame libid3tag @@ -131,7 +121,7 @@ stdenv.mkDerivation rec { portaudio wavpack wxGTK32 - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ alsa-lib # for portaudio at-spi2-core dbus @@ -144,10 +134,8 @@ stdenv.mkDerivation rec { libsepol libuuid util-linux - ] ++ optionals stdenv.isDarwin [ - AppKit - CoreAudioKit - AudioUnit AudioToolbox CoreAudio CoreServices Carbon # for portaudio + ] ++ lib.optionals stdenv.isDarwin [ + CoreAudioKit # for portaudio libpng libjpeg ]; diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 875daa196d5d..08e347911924 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -12,14 +12,14 @@ mkDerivation rec { pname = "bambootracker"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "BambooTracker"; repo = "BambooTracker"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-OaktEUWWDEW+MYnQkaB8FvkuH29VDXFqBVSTEJ7Sz7A="; + sha256 = "sha256-yubaKTc8NFLxMY0/5c2VubRHgAGOsRlitmXJ1UHzl60="; }; nativeBuildInputs = [ qmake qttools pkg-config ]; diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix index 623aa1584521..e6aaeb129158 100644 --- a/pkgs/applications/audio/bchoppr/default.nix +++ b/pkgs/applications/audio/bchoppr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bchoppr"; - version = "1.10.10"; + version = "1.12.2"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "sha256-LNPG/ETRmgPv8LsYVHol4p5oRCvg+dSYVEe61i8Dvz8="; + sha256 = "sha256-P6sbxhgnlek1IJ4i9yTe/3g/2C8oLPKXI3zbLdswvl8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 8da04de579e6..940e6c3c0c68 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -1,16 +1,34 @@ -{ stdenv, fetchurl, alsa-lib, cairo, dpkg, freetype -, gdk-pixbuf, glib, gtk3, lib, xorg -, libglvnd, libjack2, ffmpeg -, libxkbcommon, xdg-utils, zlib, pipewire, pulseaudio -, wrapGAppsHook, makeWrapper }: +{ stdenv +, fetchurl +, alsa-lib +, cairo +, dpkg +, ffmpeg +, freetype +, gdk-pixbuf +, glib +, gtk3 +, lib +, libglvnd +, libjack2 +, libjpeg +, libxkbcommon +, makeWrapper +, pipewire +, pulseaudio +, wrapGAppsHook +, xdg-utils +, xorg +, zlib +}: stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "4.4.3"; + version = "4.4.6"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-NP9cM1xIHblMdUFKIviPKDi6su6Nc3xsX2pnPeP7hdQ="; + sha256 = "sha256-VcK74JrVH81sgNeh1FDvCO1jtgkVeLpx5IqlXuzH27A="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; @@ -24,7 +42,27 @@ stdenv.mkDerivation rec { dontWrapGApps = true; # we only want $gappsWrapperArgs here buildInputs = with xorg; [ - alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pipewire pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib + alsa-lib + cairo + freetype + gdk-pixbuf + glib + gtk3 + libglvnd + libjack2 + # libjpeg8 is required for converting jpeg's to colour palettes + libjpeg + libxcb + libXcursor + libX11 + libXtst + libxkbcommon + pipewire + pulseaudio + stdenv.cc.cc.lib + xcbutil + xcbutilwm + zlib ]; installPhase = '' diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index e1f6d25c2d7b..68eb295c4852 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { pname = "cardinal"; - version = "22.10"; + version = "22.11"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; - sha256 = "sha256-qr6akeSN0y6cDVZ8Y6SNuJ8OnAuwrlJL1pqhPPJ+/EQ="; + sha256 = "sha256-xYQi209whY5/lN+6Fp7PTp7JSzL6RS6VL+Exst7RrS0="; }; prePatch = '' @@ -62,5 +62,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.all; + # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 82259d563ce9..70ef1ebdf644 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -5,8 +5,6 @@ withGtk2 ? true, gtk2 ? null, withGtk3 ? true, gtk3 ? null }: -with lib; - assert withFrontend -> python3Packages ? pyqt5; assert withQt -> qtbase != null; assert withQt -> wrapQtAppsHook != null; @@ -30,13 +28,13 @@ stdenv.mkDerivation rec { pythonPath = with python3Packages; [ rdflib pyliblo - ] ++ optional withFrontend pyqt5; + ] ++ lib.optional withFrontend pyqt5; buildInputs = [ file liblo alsa-lib fluidsynth jack2 libpulseaudio libsndfile - ] ++ optional withQt qtbase - ++ optional withGtk2 gtk2 - ++ optional withGtk3 gtk3; + ] ++ lib.optional withQt qtbase + ++ lib.optional withGtk2 gtk2 + ++ lib.optional withGtk3 gtk3; propagatedBuildInputs = pythonPath; diff --git a/pkgs/applications/audio/cavalier/default.nix b/pkgs/applications/audio/cavalier/default.nix new file mode 100644 index 000000000000..17fdabc5bc0d --- /dev/null +++ b/pkgs/applications/audio/cavalier/default.nix @@ -0,0 +1,68 @@ +{ lib +, python3 +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gobject-introspection +, glib +, gtk4 +, librsvg +, libadwaita +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +, cava +}: + +python3.pkgs.buildPythonApplication rec { + pname = "cavalier"; + version = "2023.01.29"; + format = "other"; + + src = fetchFromGitHub { + owner = "fsobolev"; + repo = pname; + rev = version; + hash = "sha256-6bvi73cFQHtIyD4d4+mqje0qkmG4wkahZ2ohda5RvRQ="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + appstream-glib + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk4 + librsvg + libadwaita + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + ]; + + # Prevent double wrapping + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH ":" "${lib.makeBinPath [ cava ]}" + ) + ''; + + meta = with lib; { + description = "Audio visualizer based on CAVA with customizable LibAdwaita interface"; + homepage = "https://github.com/fsobolev/cavalier"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index 21d58eccb741..a62337d7d55a 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -1,35 +1,27 @@ -{ stdenv, lib, fetchurl, alsa-lib, bison, flex, libsndfile, which -, AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel +{ stdenv, lib, fetchurl, alsa-lib, bison, flex, libsndfile, which, DarwinTools, xcbuild +, AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel, MultitouchSupport }: stdenv.mkDerivation rec { - version = "1.4.1.0"; + version = "1.4.2.0"; pname = "chuck"; src = fetchurl { url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; - sha256 = "sha256-dL+ZrVFeMRPFW4MxUpNvrQKjzwBqVBBf8Rd3xHMZSSg="; + sha256 = "sha256-hIwsC9rYgXWSTFqUufKGqoT0Gnsf4nR4KQ0iSVbj8xg="; }; - nativeBuildInputs = [ flex bison which ]; + nativeBuildInputs = [ flex bison which ] + ++ lib.optionals stdenv.isDarwin [ DarwinTools xcbuild ]; buildInputs = [ libsndfile ] ++ lib.optional (!stdenv.isDarwin) alsa-lib - ++ lib.optionals stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel ]; + ++ lib.optionals stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport ]; patches = [ ./darwin-limits.patch ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-missing-sysroot"; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework MultitouchSupport"; - - postPatch = '' - substituteInPlace src/core/makefile.x/makefile.osx \ - --replace "weak_framework" "framework" \ - --replace "MACOSX_DEPLOYMENT_TARGET=10.9" "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" - ''; - makeFlags = [ "-C src" "DESTDIR=$(out)/bin" ]; - buildFlags = [ (if stdenv.isDarwin then "osx" else "linux-alsa") ]; + buildFlags = [ (if stdenv.isDarwin then "mac" else "linux-alsa") ]; meta = with lib; { description = "Programming language for real-time sound synthesis and music creation"; diff --git a/pkgs/applications/audio/cider/default.nix b/pkgs/applications/audio/cider/default.nix index 7deb21bcef28..dfbe70194bbe 100644 --- a/pkgs/applications/audio/cider/default.nix +++ b/pkgs/applications/audio/cider/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "cider"; - version = "1.5.7"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/ciderapp/cider-releases/releases/download/v${version}/Cider-${version}.AppImage"; - sha256 = "sha256-fWpt7YxqEDa1U4CwyVZwgbiwe0lrh64v0cJG9pbNMUU="; + sha256 = "sha256-fbeUl+vQpEdP17m3koblKv9z4CRpLNYtVQf7bs8ZP1M="; }; extraInstallCommands = diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index fa64cd74e71a..15b2ad85ea7e 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation { description = "An MPD client built on top of rofi"; homepage = "https://github.com/carnager/clerk"; license = licenses.mit; + broken = true; # not compatible with current version of rofi maintainers = with maintainers; [ anderspapitto ]; }; } diff --git a/pkgs/applications/audio/cmt/default.nix b/pkgs/applications/audio/cmt/default.nix index 1062d897c6bd..bf7ed0ee37d4 100644 --- a/pkgs/applications/audio/cmt/default.nix +++ b/pkgs/applications/audio/cmt/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "cmt"; - version = "1.17"; + version = "1.18"; src = fetchurl { url = "http://www.ladspa.org/download/cmt_${version}.tgz"; - sha256 = "07xd0xmwpa0j12813jpf87fr9hwzihii5l35mp8ady7xxfmxfmpb"; + sha256 = "sha256-qC+GNt4fSto4ahmaAXqc13Wkm0nnFrEejdP3I8k99so="; }; buildInputs = [ ladspaH ]; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 66c172ff01d8..6d37e33b5eee 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -39,8 +39,6 @@ #, vtxSupport ? true, libayemu ? null }: -with lib; - assert samplerateSupport -> jackSupport; # vorbis and tremor are mutually exclusive @@ -90,14 +88,6 @@ let #(mkFlag vtxSupport "CONFIG_VTX=y" libayemu) ]; - - clangGCC = runCommand "clang-gcc" {} '' - #! ${stdenv.shell} - mkdir -p $out/bin - ln -s ${stdenv.cc}/bin/clang $out/bin/gcc - ln -s ${stdenv.cc}/bin/clang++ $out/bin/g++ - ''; - in stdenv.mkDerivation rec { @@ -113,16 +103,17 @@ stdenv.mkDerivation rec { patches = [ ./option-debugging.patch ]; - configurePhase = "./configure " + concatStringsSep " " ([ - "prefix=$out" - "CONFIG_WAV=y" - ] ++ concatMap (a: a.flags) opts); - nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] - ++ lib.optional stdenv.cc.isClang clangGCC ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit VideoToolbox ] - ++ flatten (concatMap (a: a.deps) opts); + ++ lib.flatten (lib.concatMap (a: a.deps) opts); + + prefixKey = "prefix="; + + configureFlags = [ + "CONFIG_WAV=y" + "HOSTCC=${stdenv.cc.targetPrefix}cc" + ] ++ lib.concatMap (a: a.flags) opts; makeFlags = [ "LD=$(CC)" ]; diff --git a/pkgs/applications/audio/cplay-ng/default.nix b/pkgs/applications/audio/cplay-ng/default.nix new file mode 100644 index 000000000000..965cb31fde54 --- /dev/null +++ b/pkgs/applications/audio/cplay-ng/default.nix @@ -0,0 +1,48 @@ +{ lib +, python3 +, fetchFromGitHub +, makeWrapper +, mpv +, pulseaudio +}: + +python3.pkgs.buildPythonApplication rec { + pname = "cplay-ng"; + version = "5.1.0"; + + src = fetchFromGitHub { + owner = "xi"; + repo = "cplay-ng"; + rev = version; + hash = "sha256-pmuZ1NgrQKEJLoJEVC9wp5deFWc6DiX5DpnISeOOw4k="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + postInstall = '' + wrapProgram $out/bin/cplay-ng \ + --prefix PATH : ${lib.makeBinPath [ mpv pulseaudio ]} + ''; + + meta = with lib; { + homepage = "https://github.com/xi/cplay-ng"; + description = "Simple curses audio player"; + longDescription = '' + cplay is a minimalist music player with a textual user interface written + in Python. It aims to provide a power-user-friendly interface with simple + filelist and playlist control. + + Instead of building an elaborate database of your music library, cplay + allows you to quickly browse the filesystem and enqueue files, + directories, and playlists. + + The original cplay was started by Ulf Betlehem in 1998 and is no longer + maintained. This is a rewrite that aims to stay true to the original + design while evolving with a shifting environment. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix index d41ebed09606..f837ad6603e3 100644 --- a/pkgs/applications/audio/crip/default.nix +++ b/pkgs/applications/audio/crip/default.nix @@ -16,8 +16,6 @@ , which }: -with lib; - stdenv.mkDerivation rec { pname = "crip"; version = "3.9"; @@ -29,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ perlPackages.perl perlPackages.CDDB_get ]; nativeBuildInputs = [ makeWrapper ]; - toolDeps = makeBinPath [ + toolDeps = lib.makeBinPath [ cdparanoia coreutils eject @@ -46,7 +44,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin/ - for script in ${escapeShellArgs scripts}; do + for script in ${lib.escapeShellArgs scripts}; do cp $script $out/bin/ substituteInPlace $out/bin/$script \ @@ -63,6 +61,6 @@ stdenv.mkDerivation rec { description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files"; license = lib.licenses.gpl1Only; platforms = lib.platforms.linux; - maintainers = [ maintainers.endgame ]; + maintainers = [ lib.maintainers.endgame ]; }; } diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix index 53c1340ba2a2..ffb4821d767d 100644 --- a/pkgs/applications/audio/csound/csound-manual/default.nix +++ b/pkgs/applications/audio/csound/csound-manual/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "csound-manual"; - version = "6.17.0"; + version = "6.18.0"; src = fetchFromGitHub { owner = "csound"; repo = "manual"; rev = version; - sha256 = "sha256-8X9Egn/MIwlNDEKUmEEz4Dnw6rGa37jRjYsVEt8ziW8="; + sha256 = "sha256-W8MghqUBr3V7LPgNwU6Ugw16wdK3G37zAPuasMlZ2+I="; }; prePatch = '' diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index 953a919d0c70..e48b45aec3e4 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -1,28 +1,23 @@ { lib, stdenv, csound, desktop-file-utils, fetchFromGitHub, python, python-qt, qmake, - qtwebengine, qtxmlpatterns, rtmidi, fetchpatch }: + qtwebengine, qtxmlpatterns, rtmidi, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "csound-qt"; - version = "0.9.6-beta3"; + version = "1.1.1"; src = fetchFromGitHub { owner = "CsoundQt"; repo = "CsoundQt"; - rev = version; - sha256 = "007jhkh0k6qk52r77i067999dwdiimazix6ggp2hvyc4pj6n5dip"; + rev = "v${version}"; + hash = "sha256-PdylVOnunbB36dbZX/wzd9A8CJPDv/xH5HPLAUkRu28="; }; patches = [ - (fetchpatch { - name = "examplepath.patch"; - url = "https://github.com/CsoundQt/CsoundQt/commit/09f2d515bff638cbcacb450979d66e273a59fdec.diff"; - sha256 = "0y23kf8m1mh9mklsvf908b2b8m2w2rji8qvws44paf1kpwnwdmgm"; - }) ./rtmidipath.patch ]; - nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns ]; + nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns wrapQtAppsHook ]; buildInputs = [ csound desktop-file-utils rtmidi ]; @@ -35,13 +30,11 @@ stdenv.mkDerivation rec { "PYTHONQT_LIB_DIR=${python-qt}/lib" "LIBS+=-L${python-qt}/lib" "INCLUDEPATH+=${python-qt}/include/PythonQt" - "INCLUDEPATH+=${python}/include/python2.7" + "INCLUDEPATH+=${python}/include/python${python.pythonVersion}" "INSTALL_DIR=${placeholder "out"}" "SHARE_DIR=${placeholder "out"}/share" ]; - dontWrapQtApps = true; - meta = with lib; { description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features"; homepage = "https://csoundqt.github.io/"; diff --git a/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch b/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch index 4cbab8a128fc..4e22295d43ff 100644 --- a/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch +++ b/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch @@ -1,8 +1,8 @@ -diff --git a/src/src.pri b/src/src.pri -index e5e0c896..9a9fa513 100644 ---- a/src/src.pri -+++ b/src/src.pri -@@ -155,9 +155,9 @@ pythonqt { +diff --git a/src/src.pri b/src/src.pri +index e5e0c896..9a9fa513 100644 +--- a/src/src.pri ++++ b/src/src.pri +@@ -155,9 +155,9 @@ pythonqt { "src/pyqcsobject.cpp" } rtmidi { diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 4da3efbffe47..6afddb467d0d 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -3,6 +3,7 @@ , AudioUnit , CoreAudio , CoreMIDI +, portaudio , alsa-lib ? null , libpulseaudio ? null , libjack2 ? null @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { pname = "csound"; - version = "6.17.0"; + version = "6.18.1"; hardeningDisable = [ "format" ]; @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "sha256-O19jm3JxHg4TcQzWQZu1uFjfYN2FR41fCRq5YGnTGD0="; + sha256 = "sha256-O7s92N54+zIl07eIdK/puoSve/qJ3O01fTh0TP+VdZA="; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake flex bison gettext ]; buildInputs = [ libsndfile libsamplerate boost ] ++ lib.optionals stdenv.isDarwin [ - Accelerate AudioUnit CoreAudio CoreMIDI + Accelerate AudioUnit CoreAudio CoreMIDI portaudio ] ++ lib.optionals stdenv.isLinux (builtins.filter (optional: optional != null) [ alsa-lib libpulseaudio libjack2 liblo ladspa-sdk fluidsynth eigen diff --git a/pkgs/applications/audio/cyanrip/default.nix b/pkgs/applications/audio/cyanrip/default.nix index 4f3a5a08af2e..358c769ea07c 100644 --- a/pkgs/applications/audio/cyanrip/default.nix +++ b/pkgs/applications/audio/cyanrip/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, ffmpeg +, ffmpeg-headless , libcdio , libcdio-paranoia , libmusicbrainz5 @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ ffmpeg libcdio libcdio-paranoia libmusicbrainz5 curl ]; + buildInputs = [ ffmpeg-headless libcdio libcdio-paranoia libmusicbrainz5 curl ]; meta = with lib; { homepage = "https://github.com/cyanreg/cyanrip"; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 13e258c61a90..d86d8c6c1adb 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -40,7 +40,7 @@ assert gtk2Support || gtk3Support; let inherit (lib) optionals; - version = "1.9.3"; + version = "1.9.4"; in clangStdenv.mkDerivation { pname = "deadbeef"; inherit version; @@ -50,7 +50,7 @@ in clangStdenv.mkDerivation { repo = "deadbeef"; fetchSubmodules = true; rev = version; - sha256 = "sha256-Vt5JHrkNyxerqlShIBVbzZaunG0ZbHm5qf3fq9kMMXc="; + sha256 = "sha256-ow+Aw/lp+oe9GhbOWM7XcX/tJjfAAu7KOUY1us7+f84="; }; buildInputs = [ diff --git a/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix b/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix new file mode 100644 index 000000000000..5d5c057d724b --- /dev/null +++ b/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchurl, stdenv, unzip, fpc }: + +stdenv.mkDerivation rec { + pname = "dolbybcsoftwaredecode"; + version = "april-2018"; + + src = fetchurl { + url = "mirror://sourceforge/dolbybcsoftwaredecode/April-2018/SourceCode.zip"; + sha256 = "sha256-uLcsRIpwmJlstlGV8I4+/30+D9GDpUt7DOIP/GkXWp4="; + }; + + nativeBuildInputs = [ unzip fpc ]; + buildPhase = '' + fpc DolbyBi64.PP + ''; + installPhase = '' + mkdir -p $out/bin + cp DolbyBi64 $out/bin/ + ''; + + meta = with lib; { + description = "A Dolby B & C software decoder"; + homepage = "https://sourceforge.net/projects/dolbybcsoftwaredecode/"; + maintainers = with maintainers; [ lorenz ]; + + # Project is has source code available, but has no explicit license. + # I asked upstream to assign a license, so maybe this can be free + # in the future, but for now let's play it safe and make it unfree. + license = lib.licenses.unfree; + }; +} diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index 731578d04e46..151f03797cc8 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dragonfly-reverb"; - version = "3.2.7"; + version = "3.2.8"; src = fetchFromGitHub { owner = "michaelwillis"; repo = "dragonfly-reverb"; rev = version; - sha256 = "sha256-DJ6J5PuRFDin6PtkNYjIRI1gEVQkKmnZLhnj7L4JtPM="; + sha256 = "sha256-Jz0t9IO3H+guL4NiETCBHSb4rxFTxZRHw2v20yS/wlk="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index 71841a616a35..d6f468dbc563 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "0.9.19"; + version = "0.9.20"; pname = "drumgizmo"; src = fetchurl { url = "https://www.drumgizmo.org/releases/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "18x28vhif0c97xz02k22xwqxxig6fi6j0356mlz2vf7vb25z69kl"; + sha256 = "sha256-AF8gQLiB29j963uI84TyNHIC0qwEWOCqmZIUWGq8V2o="; }; configureFlags = [ "--enable-lv2" ]; diff --git a/pkgs/applications/audio/eartag/default.nix b/pkgs/applications/audio/eartag/default.nix index aad765041e4b..0db9da5d2161 100644 --- a/pkgs/applications/audio/eartag/default.nix +++ b/pkgs/applications/audio/eartag/default.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "eartag"; - version = "0.2.1"; + version = "0.3.1"; format = "other"; src = fetchFromGitHub { owner = "knuxify"; repo = pname; - rev = version; - sha256 = "sha256-TlY2F2y7ZZ9f+vkYYkES5zoIGcuTWP1+rOJI62wc4SU="; + rev = "refs/tags/${version}"; + sha256 = "sha256-gN3V5ZHlhHp52Jg/i+hDLEDpSvP8yFngujyw5ZncQQg="; }; postPatch = '' diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index 4e65d79ab21a..1d363e4b2c77 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -3,9 +3,11 @@ , desktop-file-utils , fetchFromGitHub , calf +, fftw , fftwFloat -, fmt_8 +, fmt_9 , glib +, gsl , gtk4 , itstool , libadwaita @@ -25,6 +27,7 @@ , pkg-config , rnnoise , rubberband +, speex , speexdsp , tbb , wrapGAppsHook4 @@ -34,13 +37,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "6.3.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - sha256 = "sha256-OLxuE1jiALuKlC9U9esVlhaMBEaoZyNae8OO8upE4ZM="; + sha256 = "sha256-SjhJj5kClPd8DT1vzbSdqJ9AJw0XiX9Q8/R8SDnxGPQ="; }; nativeBuildInputs = [ @@ -53,9 +56,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + fftw fftwFloat - fmt_8 + fmt_9 glib + gsl gtk4 libadwaita libbs2b @@ -69,6 +74,7 @@ stdenv.mkDerivation rec { pipewire rnnoise rubberband + speex speexdsp tbb zita-convolver diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index ba0715eb1dfb..84c8333d1857 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { 64 bits floating point internal audio processing. Nice GUI with powerful metering for every plugin. ''; - homepage = "http://eq10q.sourceforge.net/"; + homepage = "https://eq10q.sourceforge.net/"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index e5579175bbb7..2c59068720d0 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Compact open source software speech synthesizer"; - homepage = "http://espeak.sourceforge.net/"; + homepage = "https://espeak.sourceforge.net/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index 2c86a036ceb2..6c4da056c848 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Phoneme editor for espeak"; - homepage = "http://espeak.sourceforge.net/"; + homepage = "https://espeak.sourceforge.net/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/exaile/default.nix b/pkgs/applications/audio/exaile/default.nix index 46b1480be382..c6000c86c639 100644 --- a/pkgs/applications/audio/exaile/default.nix +++ b/pkgs/applications/audio/exaile/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ++ lib.optional podcastSupport python3.pkgs.feedparser ++ lib.optional wikipediaSupport webkitgtk; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest ]; diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix index 1ff08bd06b93..81a2646ad74a 100644 --- a/pkgs/applications/audio/famistudio/default.nix +++ b/pkgs/applications/audio/famistudio/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "famistudio"; - version = "4.0.4"; + version = "4.0.6"; src = fetchzip { url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip"; stripRoot = false; - sha256 = "sha256-qdSldObfwC5J1b4tpHT9S/xxJ2StBTsPA80QS7bs2vo="; + sha256 = "sha256-Se9EIQTjZQM5qqzlEB4hGVRHDFdu6GecNGpw9gYMbW4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 19468b3af345..d1dd74a35dde 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -20,13 +20,13 @@ with lib.strings; let - version = "2.41.1"; + version = "2.54.9"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-x0nBWyILrNJijs7CIvRrgYG6vgB3UlxLj9i7E4cHr9I="; + sha256 = "sha256-7eSZUsZ0h0vWJIpZWXaS+SHV6N2i9nv6Gr6a9cuu4Fg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 87f2920c200b..b393041eeb12 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "faustlive"; - version = "2.5.12"; + version = "2.5.13"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; rev = version; - sha256 = "sha256-pq9zO4opCh9GEEtuQjrxKdNvOasDlcGGUsQD4je7Wyw="; + sha256 = "sha256-Tgb9UYj8mI4JsxA/PaTokm2NzQ14P8cOdKK8KCcnSIQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index 720bc1613b1d..bc28a2238b84 100644 --- a/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.50.6"; + version = "2.54.9"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-Q/vrm3WPsjkE3Xf/XEirsJPFXHNSW/Ve3Jbi/5nIrx8="; + sha256 = "sha256-1ZS7SVTWI1vNOGycZIDyKLgwfNooIGDa8Wmr6qfFSkU="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/pkgs/applications/audio/fdkaac/default.nix b/pkgs/applications/audio/fdkaac/default.nix index 7aef140da651..be6e0fcca228 100644 --- a/pkgs/applications/audio/fdkaac/default.nix +++ b/pkgs/applications/audio/fdkaac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoreconfHook, fetchFromGitHub, fdk_aac }: +{ lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch, fdk_aac }: stdenv.mkDerivation rec { pname = "fdkaac"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-7a8JlQtMGuMWgU/HePd31/EvtBNc2tBMz8V8NQivuNo="; }; + patches = [ + # To be removed when 1.0.4 is released, see https://github.com/nu774/fdkaac/issues/54 + (fetchpatch { + name = "CVE-2022-37781.patch"; + url = "https://github.com/nu774/fdkaac/commit/ecddb7d63306e01d137d65bbbe7b78c1e779943c.patch"; + sha256 = "sha256-uZPf5tqBmF7VWp1fJcjp5pbYGRfzqgPZpBHpkdWYkV0="; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ fdk_aac ]; diff --git a/pkgs/applications/audio/flac123/default.nix b/pkgs/applications/audio/flac123/default.nix index 09c7b44d92dd..5da071805cad 100644 --- a/pkgs/applications/audio/flac123/default.nix +++ b/pkgs/applications/audio/flac123/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ flac libao libogg popt ]; meta = with lib; { - homepage = "http://flac-tools.sourceforge.net/"; + homepage = "https://flac-tools.sourceforge.net/"; description = "A command-line program for playing FLAC audio files"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index 3a78e89717ab..4564fcccc4e1 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "flacon"; - version = "9.2.0"; + version = "10.0.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "sha256-qnjWpsgCRAi09o9O7CBc0R9MN1EpXVmCoxB2npc9qpM="; + sha256 = "sha256-59p5x+d7Vmxx+bdBDxrlf4+NRIdUBuRk+DqohV98XYY="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 09abaa862f51..df42258700ca 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "sha256-7SuM7a8IIecAJ83QvJfUba/wArAEXywqL2HwVbeG8H4="; + sha256 = "05lr9f0q4x1kvgfa3xrfmagpwvijv9m1s316aa9figqlkcc5vv4k"; }; nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ]; @@ -20,7 +20,11 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ] ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ]; - cmakeFlags = [ "-Denable-framework=off" ]; + cmakeFlags = [ + "-Denable-framework=off" + # set CMAKE_INSTALL_NAME_DIR to correct value on darwin + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; meta = with lib; { description = "Real-time software synthesizer based on the SoundFont 2 specifications"; diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 7e376c89d36a..7fcfeb32fd3a 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -7,8 +7,6 @@ assert alsaSupport -> alsa-lib != null; assert jackSupport -> libjack2 != null; assert portaudioSupport -> portaudio != null; -with lib; - mkDerivation rec { pname = "fmit"; version = "1.2.14"; @@ -22,9 +20,9 @@ mkDerivation rec { nativeBuildInputs = [ qmake itstool wrapQtAppsHook ]; buildInputs = [ fftw qtbase qtmultimedia ] - ++ optionals alsaSupport [ alsa-lib ] - ++ optionals jackSupport [ libjack2 ] - ++ optionals portaudioSupport [ portaudio ]; + ++ lib.optionals alsaSupport [ alsa-lib ] + ++ lib.optionals jackSupport [ libjack2 ] + ++ lib.optionals portaudioSupport [ portaudio ]; postPatch = '' substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}' @@ -32,13 +30,13 @@ mkDerivation rec { preConfigure = '' qmakeFlags="$qmakeFlags \ - CONFIG+=${optionalString alsaSupport "acs_alsa"} \ - CONFIG+=${optionalString jackSupport "acs_jack"} \ - CONFIG+=${optionalString portaudioSupport "acs_portaudio"} \ + CONFIG+=${lib.optionalString alsaSupport "acs_alsa"} \ + CONFIG+=${lib.optionalString jackSupport "acs_jack"} \ + CONFIG+=${lib.optionalString portaudioSupport "acs_portaudio"} \ PREFIXSHORTCUT=$out" ''; - meta = { + meta = with lib; { description = "Free Musical Instrument Tuner"; longDescription = '' FMIT is a graphical utility for tuning musical instruments, with error diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 5b1fbbb2d7df..886662faf473 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.61"; + version = "1.63"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-dm+l+CECsr3TzL1ZGAqW+NLQXNh5JRtdYVROKOjKMXY="; + sha256 = "sha256-uDAW97lTeL15PPpR5vlIS371EZ7BBNd86ETPEB8joSU="; }; # 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 index 9bae2b126f5b..0f15775b38d5 100644 --- a/pkgs/applications/audio/furnace/default.nix +++ b/pkgs/applications/audio/furnace/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "furnace"; - version = "0.6pre1.5"; + version = "0.6pre3"; src = fetchFromGitHub { owner = "tildearrow"; repo = "furnace"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-2Bl6CFZJkhdNxMZiJ392zjcVMu8BgyK58R8aE4ToskY="; + sha256 = "sha256-bHVeTw69k6LLcrfkmGxvjlFfR/hWiCfm/P3utknid1o="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/galaxy-buds-client/deps.nix b/pkgs/applications/audio/galaxy-buds-client/deps.nix index 104e36a63e71..d45dd12b8b20 100644 --- a/pkgs/applications/audio/galaxy-buds-client/deps.nix +++ b/pkgs/applications/audio/galaxy-buds-client/deps.nix @@ -1,3 +1,6 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ (fetchNuGet { pname = "Avalonia"; version = "0.10.14"; sha256 = "0nn3xgkf7v47dwpnsxjg0b25ifqa4mbq02ja5rvnlc3q2k6k0fxv"; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index 4bd9c6dcd8f8..29d676598203 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Generates playlists such that each song sounds good following the previous song"; - homepage = "http://gjay.sourceforge.net/"; + homepage = "https://gjay.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix index 1cdea4629bbc..42b28eacc4f4 100644 --- a/pkgs/applications/audio/gnaural/default.nix +++ b/pkgs/applications/audio/gnaural/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Programmable auditory binaural-beat synthesizer"; - homepage = "http://gnaural.sourceforge.net/"; + homepage = "https://gnaural.sourceforge.net/"; maintainers = with maintainers; [ ehmry ]; license = with licenses; [ gpl2Only ]; }; diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix new file mode 100644 index 000000000000..cf5ac3f8c52e --- /dev/null +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -0,0 +1,50 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, clangStdenv +, pkg-config +, alsa-lib +, flac +}: + +# gcc only supports objc on darwin +buildGoModule.override { stdenv = clangStdenv; } rec { + pname = "go-musicfox"; + version = "3.6.1"; + + src = fetchFromGitHub { + owner = "anhoder"; + repo = pname; + rev = "v${version}"; + hash = "sha256-iinEo+HrcNM3gx1iUqe1duRd45PrYgVybRt9NKphwuY="; + }; + + deleteVendor = true; + + vendorHash = "sha256-DbdAEvcspTYMYMvc5IBEUtQAJMW8JZpNi0UA/DvzGFo="; + + subPackages = [ "cmd/musicfox.go" ]; + + ldflags = [ + "-s" + "-w" + "-X go-musicfox/pkg/constants.AppVersion=${version}" + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + alsa-lib + flac + ]; + + meta = with lib; { + description = "Terminal netease cloud music client written in Go"; + homepage = "https://github.com/anhoder/go-musicfox"; + license = licenses.mit; + mainProgram = "musicfox"; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/audio/goattracker/default.nix b/pkgs/applications/audio/goattracker/default.nix index 1fb848ae1eda..b85aa4c0df76 100644 --- a/pkgs/applications/audio/goattracker/default.nix +++ b/pkgs/applications/audio/goattracker/default.nix @@ -8,12 +8,11 @@ , isStereo ? false }: -with lib; let - pname = "goattracker" + optionalString isStereo "-stereo"; + pname = "goattracker" + lib.optionalString isStereo "-stereo"; desktopItem = makeDesktopItem { name = pname; - desktopName = "GoatTracker 2" + optionalString isStereo " Stereo"; + desktopName = "GoatTracker 2" + lib.optionalString isStereo " Stereo"; genericName = "Music Tracker"; exec = if isStereo then "gt2stereo" @@ -30,7 +29,7 @@ in stdenv.mkDerivation rec { else "2.76"; # normal src = fetchurl { - url = "mirror://sourceforge/goattracker2/GoatTracker_${version}${optionalString isStereo "_Stereo"}.zip"; + url = "mirror://sourceforge/goattracker2/GoatTracker_${version}${lib.optionalString isStereo "_Stereo"}.zip"; sha256 = if isStereo then "1hiig2d152sv9kazwz33i56x1c54h5sh21ipkqnp6qlnwj8x1ksy" # stereo else "0d7a3han4jw4bwiba3j87racswaajgl3pj4sb5lawdqdxicv3dn1"; # normal @@ -63,11 +62,11 @@ in stdenv.mkDerivation rec { meta = { description = "A crossplatform music editor for creating Commodore 64 music. Uses reSID library by Dag Lem and supports alternatively HardSID & CatWeasel devices" - + optionalString isStereo " - Stereo version"; + + lib.optionalString isStereo " - Stereo version"; homepage = "https://cadaver.github.io/tools.html"; downloadPage = "https://sourceforge.net/projects/goattracker2/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/audio/goodvibes/default.nix b/pkgs/applications/audio/goodvibes/default.nix index 1f09d99c8889..f51daf7081c2 100644 --- a/pkgs/applications/audio/goodvibes/default.nix +++ b/pkgs/applications/audio/goodvibes/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "goodvibes"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-CE9f0GnXr7wSpp8jyW0ZxGKx16r6tOaObzQXKcy5nPY="; + hash = "sha256-w0nmTYcq2DBHSjQ23zWxT6optyH+lRAMRa210F7XEvE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 6db530a2c233..a6164189c1db 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { gnome.adwaita-icon-theme ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ minimock pytest pytest-httpserver diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 5fe2ca2ce645..0bbe0b1f0da5 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.9.0-1"; + version = "3.9.5-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-+LWEjoke7f+6f4K4jO9nCG88Mdg9C49+v3FboM9/NkU="; + sha256 = "sha256-5OqTQBOYE6XU3BRiVwXOHrn22bVZzIIeZI8pgsWxhPw="; }; postPatch = '' @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { meta = { description = "Virtual Pipe Organ Software"; - homepage = "https://sourceforge.net/projects/ourorgan"; - license = lib.licenses.gpl2; + homepage = "https://github.com/GrandOrgue/grandorgue"; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.puzzlewolf ]; }; diff --git a/pkgs/applications/audio/gtkcord4/default.nix b/pkgs/applications/audio/gtkcord4/default.nix new file mode 100644 index 000000000000..7471a0afb4ca --- /dev/null +++ b/pkgs/applications/audio/gtkcord4/default.nix @@ -0,0 +1,72 @@ +{ buildGoModule +, cairo +, fetchFromGitHub +, gdk-pixbuf +, glib +, gobject-introspection +, graphene +, gst_all_1 +, gtk4 +, lib +, libadwaita +, libcanberra-gtk3 +, pango +, pkg-config +, sound-theme-freedesktop +, withLibadwaita ? false +, wrapGAppsHook4 +}: + +buildGoModule rec { + pname = "gtkcord4"; + version = "0.0.8"; + + src = fetchFromGitHub { + owner = "diamondburned"; + repo = pname; + rev = "v${version}"; + hash = "sha256-aJRVk9KFCJbIFInkg5BCJ6ygBlDCFF53WXO9qyACFus="; + }; + + nativeBuildInputs = [ + gobject-introspection + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + cairo + gdk-pixbuf + glib + graphene + gtk4 + pango + # Optional according to upstream but required for sound and video + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + gst_all_1.gstreamer + libcanberra-gtk3 + sound-theme-freedesktop + ] ++ lib.optionals withLibadwaita [ + libadwaita + ]; + + tags = lib.optionals withLibadwaita [ "libadwaita" ]; + + postInstall = '' + install -D -m 444 -t $out/share/applications nix/xyz.diamondb.gtkcord4.desktop + install -D -m 444 internal/icons/svg/logo.svg $out/share/icons/hicolor/scalable/apps/gtkcord4.svg + install -D -m 444 internal/icons/png/logo.png $out/share/icons/hicolor/256x256/apps/gtkcord4.png + ''; + + vendorHash = "sha256-usnlaOqyMd8rdnFpuCqfaCES8bPaB+NbdL4pFybKJbM="; + + meta = with lib; { + description = "GTK4 Discord client in Go, attempt #4."; + homepage = "https://github.com/diamondburned/gtkcord4"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ hmenke urandom ]; + }; +} diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix index 798af97ab32f..684f074b4e61 100644 --- a/pkgs/applications/audio/helvum/default.nix +++ b/pkgs/applications/audio/helvum/default.nix @@ -50,6 +50,9 @@ stdenv.mkDerivation rec { pipewire ]; + # FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream + NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ]; + meta = with lib; { description = "A GTK patchbay for pipewire"; homepage = "https://gitlab.freedesktop.org/pipewire/helvum"; diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index 17c8f936efd1..bacb67806ebc 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -89,5 +89,7 @@ mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ lovesegfault ]; + # src link returns 403 + broken = true; }; } diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index f6c88bc456e9..7b8ece0e7182 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A command line editor for id3v2 tags"; - homepage = "http://id3v2.sourceforge.net/"; + homepage = "https://id3v2.sourceforge.net/"; license = licenses.gpl2Plus; platforms = with platforms; unix; }; diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index 25ee53d3f435..420c11562e2a 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { be controlled using the ALSA sequencer. It's phat; it turns your computer into an effects box. ''; - homepage = "http://jack-rack.sourceforge.net/"; + homepage = "https://jack-rack.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.astsmtl ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index e9d2abee91cd..ed2d2a499303 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -1,4 +1,6 @@ -{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsa-lib }: +{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsa-lib +, fetchpatch +}: mkDerivation rec { pname = "jackmix"; @@ -11,9 +13,16 @@ mkDerivation rec { sha256 = "0p59411vk38lccn24r7nih10jpgg9i46yc26zpc3x13amxwwpd4h"; }; - patches = [ ./no_error.patch ]; + patches = [ + ./no_error.patch + (fetchpatch { + name = "sconstruct-python3.patch"; + url = "https://github.com/kampfschlaefer/jackmix/commit/3a0c868b267728fdbc69cc3dc1941edac27d97f6.patch"; + hash = "sha256-MLgxIiZ0+C1IVEci9Q347DR+SJUlPG2N3iPvuhRptJU="; + }) + ]; - nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkg-config ]; + nativeBuildInputs = [ sconsPackages.scons_latest pkg-config ]; buildInputs = [ qtbase lash diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix index d9d7bf19e7d6..7a1676e7873c 100644 --- a/pkgs/applications/audio/jmusicbot/default.nix +++ b/pkgs/applications/audio/jmusicbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeWrapper, jre }: +{ stdenv, lib, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { pname = "JMusicBot"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib cp $src $out/lib/JMusicBot - makeWrapper ${jre}/bin/java $out/bin/JMusicBot \ + makeWrapper ${jre_headless}/bin/java $out/bin/JMusicBot \ --add-flags "-Xmx1G -Dnogui=true -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -jar $out/lib/JMusicBot" ''; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; - platforms = platforms.all; + inherit (jre_headless.meta) platforms; }; } diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index c3667ee57a5d..24a72501db54 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { management, no track suggestions, no media player. Just a fast, efficient workflow tool. ''; - homepage = "http://www.ibrahimshaath.co.uk/keyfinder/"; + homepage = "https://www.ibrahimshaath.co.uk/keyfinder/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index b4961384080e..843738babbc5 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "kid3"; - version = "3.9.2"; + version = "3.9.3"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-R4Xv+PmzKZQF1tFtSQTFjaisGug2EKM6mPVoGutNnok="; + sha256 = "sha256-D2hrdej2Q69AYjDn2Ey4vBSOmzBY3UzZMUdJSRjurdA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix index 281a7148dfea..7c762adf371f 100644 --- a/pkgs/applications/audio/klick/default.nix +++ b/pkgs/applications/audio/klick/default.nix @@ -1,22 +1,37 @@ -{ lib, stdenv, fetchurl, sconsPackages, pkg-config -, libsamplerate, libsndfile, liblo, libjack2, boost }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, sconsPackages +, rubberband +, boost +, libjack2 +, liblo +, libsamplerate +, libsndfile +}: stdenv.mkDerivation rec { pname = "klick"; - version = "0.12.2"; + version = "0.14.2"; - src = fetchurl { - url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz"; - sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42"; + src = fetchFromGitHub { + owner = "Allfifthstuning"; + repo = "klick"; + rev = version; + hash = "sha256-jHyeVCmyy9ipbVaF7GSW19DOVpU9EQJoLcGq9uos+eY="; }; - nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkg-config ]; + nativeBuildInputs = [ + pkg-config + rubberband + sconsPackages.scons_latest + ]; buildInputs = [ libsamplerate libsndfile liblo libjack2 boost ]; prefixKey = "PREFIX="; - NIX_CFLAGS_COMPILE = "-fpermissive"; meta = { - homepage = "http://das.nasophon.de/klick/"; + homepage = "https://das.nasophon.de/klick/"; description = "Advanced command-line metronome for JACK"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix index 47a36ed1b5df..8055683a3fcf 100644 --- a/pkgs/applications/audio/ladspa-sdk/default.nix +++ b/pkgs/applications/audio/ladspa-sdk/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl }: + stdenv.mkDerivation rec { pname = "ladspa-sdk"; version = "1.15"; @@ -7,12 +8,27 @@ stdenv.mkDerivation rec { sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2"; }; + sourceRoot = "ladspa_sdk_${version}/src"; + + strictDeps = true; + patchPhase = '' - cd src sed -i 's@/usr/@$(out)/@g' Makefile - sed -i 's@-mkdirhier@mkdir -p@g' Makefile ''; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CPP=${stdenv.cc.targetPrefix}c++" + ]; + + # The default target also runs tests, which we don't want to do in + # the build phase as it would break cross. + buildFlags = [ "targets" ]; + + # Tests try to create and play a sound file. Playing will fail, but + # it's probably still useful to run the part that creates the file. + doCheck = true; + meta = { description = "The SDK for the LADSPA audio plugin standard"; longDescription = '' diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index 5917739f2442..f477b811d70f 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -1,6 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true -, withALSA ? true, alsa-lib ? null, withPulseAudio ? false, libpulseaudio ? null -, withPortAudio ? false, portaudio ? null }: +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, stdenv +, openssl +, withALSA ? true +, alsa-lib +, withPortAudio ? false +, portaudio +, withPulseAudio ? false +, libpulseaudio +, withRodio ? true +}: rustPlatform.buildRustPackage rec { pname = "librespot"; @@ -15,26 +26,26 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ + rustPlatform.bindgenHook + ]; - buildInputs = [ openssl ] ++ lib.optional withALSA alsa-lib - ++ lib.optional withPulseAudio libpulseaudio - ++ lib.optional withPortAudio portaudio; + buildInputs = [ openssl ] + ++ lib.optional withALSA alsa-lib + ++ lib.optional withPortAudio portaudio + ++ lib.optional withPulseAudio libpulseaudio; buildNoDefaultFeatures = true; buildFeatures = lib.optional withRodio "rodio-backend" ++ lib.optional withALSA "alsa-backend" - ++ lib.optional withPulseAudio "pulseaudio-backend" - ++ lib.optional withPortAudio "portaudio-backend"; - - doCheck = false; + ++ lib.optional withPortAudio "portaudio-backend" + ++ lib.optional withPulseAudio "pulseaudio-backend"; meta = with lib; { description = "Open Source Spotify client library and playback daemon"; homepage = "https://github.com/librespot-org/librespot"; + changelog = "https://github.com/librespot-org/librespot/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ bennofs ]; - platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/librespot.x86_64-darwin }; } diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index 4d7d70aebd66..abeaa7dff427 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { channels. Additionally, the program can drive MIDI instruments (with the gp32 and gp2x a custom MIDI interface is required). ''; - homepage = "http://www.littlegptracker.com/"; - downloadPage = "http://www.littlegptracker.com/download.php"; + homepage = "https://www.littlegptracker.com/"; + downloadPage = "https://www.littlegptracker.com/download.php"; license = licenses.bsd3; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 0da23254aa81..3ee546de223b 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -95,9 +95,7 @@ python3.pkgs.buildPythonApplication rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index f53f4c972af8..dd00bd1f2c02 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.2.3"; + version = "1.2.5"; src = fetchurl { url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-ej8t3xk29VLJMO1lvXuzUlD00al8TTkPLL8z62fmTys="; + sha256 = "sha256-YYrt+FbpY7iEui0aw4Ce94BW1SHDk0OH8gFSzkW2fkw="; }; nativeBuildInputs = [ pkg-config php makeWrapper ]; diff --git a/pkgs/applications/audio/midi-visualizer/default.nix b/pkgs/applications/audio/midi-visualizer/default.nix index a50e5dcd6690..ed48c129418c 100644 --- a/pkgs/applications/audio/midi-visualizer/default.nix +++ b/pkgs/applications/audio/midi-visualizer/default.nix @@ -1,30 +1,62 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, glfw, makeWrapper, - libXrandr, libXinerama, libXcursor, gtk3, ffmpeg-full, ...}: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, libX11 +, glfw +, makeWrapper +, libXrandr +, libXinerama +, libXcursor +, gtk3 +, ffmpeg-full +, AppKit +, Carbon +, Cocoa +, CoreAudio +, CoreMIDI +, CoreServices +, Kernel +}: stdenv.mkDerivation rec { pname = "MIDIVisualizer"; - version = "6.5"; + version = "7.0"; src = fetchFromGitHub { owner = "kosua20"; repo = pname; rev = "v${version}"; - sha256 = "sha256-thRcRJ88bz3jwu6rKaQxt2MkBSf5Ri1jygkKDguP2eE="; + sha256 = "sha256-wfPSPH+E9cErVvfJZqHttFtjiUYJopM/u6w6NpRHifE="; }; nativeBuildInputs = [ cmake pkg-config makeWrapper]; buildInputs = [ - libX11 glfw + ffmpeg-full + ] ++ lib.optionals stdenv.isLinux [ + libX11 libXrandr libXinerama libXcursor gtk3 - ffmpeg-full + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + Carbon + Cocoa + CoreAudio + CoreMIDI + CoreServices + Kernel ]; - installPhase = '' + installPhase = if stdenv.isDarwin then '' + mkdir -p $out/Applications $out/bin + cp -r MIDIVisualizer.app $out/Applications/ + ln -s ../Applications/MIDIVisualizer.app/Contents/MacOS/MIDIVisualizer $out/bin/ + '' else '' mkdir -p $out/bin cp MIDIVisualizer $out/bin @@ -36,7 +68,7 @@ stdenv.mkDerivation rec { description = "A small MIDI visualizer tool, using OpenGL"; homepage = "https://github.com/kosua20/MIDIVisualizer"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.ericdallo ]; }; } diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/applications/audio/midisheetmusic/default.nix index 6a5626d98a69..0d07663d115a 100644 --- a/pkgs/applications/audio/midisheetmusic/default.nix +++ b/pkgs/applications/audio/midisheetmusic/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { sha256 = "05c6zskj50g29f51lx8fvgzsi3f31z01zj6ssjjrgr7jfs7ak70p"; }; - checkInputs = (with dotnetPackages; [ NUnitConsole ]); + nativeCheckInputs = (with dotnetPackages; [ NUnitConsole ]); nativeBuildInputs = [ mono makeWrapper ]; buildPhase = '' diff --git a/pkgs/applications/audio/miniplayer/default.nix b/pkgs/applications/audio/miniplayer/default.nix index 4eea3dbcb7f9..bc9c88b292a0 100644 --- a/pkgs/applications/audio/miniplayer/default.nix +++ b/pkgs/applications/audio/miniplayer/default.nix @@ -6,12 +6,12 @@ with python3Packages; buildPythonApplication rec { pname = "miniplayer"; - version = "1.7.1"; + version = "1.8.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-NrIDv61mRDe9JWpSP8cvlU4CGoN6Ou6XuNOIn1p47Pw="; + hash = "sha256-iUUsVIDLQAiaMomfA2LvvJZ2ePhgADtC6GCwIpRC1MA="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix index bf343e101c96..90a86b0dfec6 100644 --- a/pkgs/applications/audio/mmlgui/default.nix +++ b/pkgs/applications/audio/mmlgui/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { Cocoa ]; - checkInputs = [ + nativeCheckInputs = [ cppunit ]; diff --git a/pkgs/applications/audio/mmtc/default.nix b/pkgs/applications/audio/mmtc/default.nix index db6e0d27be75..5a229f0ae348 100644 --- a/pkgs/applications/audio/mmtc/default.nix +++ b/pkgs/applications/audio/mmtc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mmtc"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "figsoda"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fWd349IDlN6XNv7MrqJeLwkmevZoKXLSz8a09YWsNcI="; + sha256 = "sha256-7jQwa4BfyI1CPnMt1YEP9rE6cok90FbEJpyLAPFuxtE="; }; - cargoSha256 = "sha256-WrEC3zWwY1plOn8DrspbJFI3R/fE6yDQT2u2lVubbQU="; + cargoSha256 = "sha256-f18aXs8PyA0IaGnPG568ZB/oPsAO+U44WsoDNEgKKXk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 05857ce0142b..053be90621d7 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -27,6 +27,8 @@ lib.makeScope newScope (self: with self; { mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { }; + mopidy-notify = callPackage ./notify.nix { }; + mopidy-podcast = callPackage ./podcast.nix { }; mopidy-scrobbler = callPackage ./scrobbler.nix { }; @@ -35,6 +37,8 @@ lib.makeScope newScope (self: with self; { mopidy-soundcloud = callPackage ./soundcloud.nix { }; + mopidy-tidal = callPackage ./tidal.nix { }; + mopidy-tunein = callPackage ./tunein.nix { }; mopidy-youtube = callPackage ./youtube.nix { }; diff --git a/pkgs/applications/audio/mopidy/local.nix b/pkgs/applications/audio/mopidy/local.nix index 4e9b18d7eb65..c72fec06cdd7 100644 --- a/pkgs/applications/audio/mopidy/local.nix +++ b/pkgs/applications/audio/mopidy/local.nix @@ -2,6 +2,7 @@ , lib , mopidy , python3Packages +, fetchpatch }: python3Packages.buildPythonApplication rec { @@ -13,17 +14,25 @@ python3Packages.buildPythonApplication rec { sha256 = "18w39mxpv8p17whd6zfw5653d21q138f8xd6ili6ks2g2dbm25i9"; }; + patches = [ + # Fix tests with newer Mopidy versions >=3.4.0 -- mopidy/mopidy-local#69 + (fetchpatch { + name = "update-tests-for-mopidy-3.4.0.patch"; + url = "https://github.com/mopidy/mopidy-local/commit/f2c198f8eb253f62100afc58f652e73a76d5a090.patch"; + hash = "sha256-jrlZc/pd00S5q9nOfV1OXu+uP/SvH+Xbi7U52aZajj4="; + }) + ]; + propagatedBuildInputs = [ mopidy python3Packages.uritools ]; - checkInputs = [ + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://github.com/mopidy/mopidy-local"; description = "Mopidy extension for playing music from your local music archive"; license = licenses.asl20; diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 6d3db5d50970..78e00655ad3e 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy"; - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy"; rev = "refs/tags/v${version}"; - sha256 = "sha256-F0fIl9DrludZZdzsrl/xsp7TLMgTPbVGtGvMHyD52Yw="; + sha256 = "sha256-IUQe5WH2vsrAOgokhTNVVM3lnJXphT2xNGu27hWBLSo="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix index 1e2cb8d06094..2352a65dcc95 100644 --- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix +++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, mopidy }: +{ lib +, fetchFromGitHub +, pythonPackages +, mopidy +}: pythonPackages.buildPythonApplication rec { pname = "mopidy-musicbox-webclient"; @@ -6,19 +10,22 @@ pythonPackages.buildPythonApplication rec { src = fetchFromGitHub { owner = "pimusicbox"; - repo = "mopidy-musicbox-webclient"; + repo = pname; rev = "v${version}"; sha256 = "1lzarazq67gciyn6r8cdms0f7j0ayyfwhpf28z93ydb280mfrrb9"; }; - propagatedBuildInputs = [ mopidy ]; + propagatedBuildInputs = [ + mopidy + ]; doCheck = false; meta = with lib; { - description = "Mopidy extension for playing music from SoundCloud"; - license = licenses.mit; - broken = stdenv.isDarwin; - maintainers = [ maintainers.spwhitt ]; + description = "A Mopidy frontend extension and web client with additional features for Pi MusicBox"; + homepage = "https://github.com/pimusicbox/mopidy-musicbox-webclient"; + changelog = "https://github.com/pimusicbox/mopidy-musicbox-webclient/blob/v${version}/CHANGELOG.rst"; + license = licenses.asl20; + maintainers = with maintainers; [ spwhitt ]; }; } diff --git a/pkgs/applications/audio/mopidy/notify.nix b/pkgs/applications/audio/mopidy/notify.nix new file mode 100644 index 000000000000..6df8e3e45ef9 --- /dev/null +++ b/pkgs/applications/audio/mopidy/notify.nix @@ -0,0 +1,29 @@ +{ lib, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + pname = "Mopidy-Notify"; + version = "0.2.0"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "sha256-lzZupjlS0kbNvsn18serOoMfu0sRb0nRwpowvOPvt/g="; + }; + + propagatedBuildInputs = [ + mopidy + pythonPackages.pydbus + ]; + + nativeBuildInputs = [ + pythonPackages.pytestCheckHook + ]; + + pythonImportsCheck = [ "mopidy_notify" ]; + + meta = with lib; { + homepage = "https://github.com/phijor/mopidy-notify"; + description = "Mopidy extension for showing desktop notifications on track change"; + license = licenses.asl20; + maintainers = with maintainers; [ lilyinstarlight ]; + }; +} diff --git a/pkgs/applications/audio/mopidy/podcast.nix b/pkgs/applications/audio/mopidy/podcast.nix index 8a5c4ec2b3d6..7aacc2f7befe 100644 --- a/pkgs/applications/audio/mopidy/podcast.nix +++ b/pkgs/applications/audio/mopidy/podcast.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { python3Packages.uritools ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/applications/audio/mopidy/subidy.nix b/pkgs/applications/audio/mopidy/subidy.nix index 98d69816b73f..b84a14106fdc 100644 --- a/pkgs/applications/audio/mopidy/subidy.nix +++ b/pkgs/applications/audio/mopidy/subidy.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = [ mopidy pythonPackages.py-sonic ]; - checkInputs = with pythonPackages; [ pytestCheckHook ]; + nativeCheckInputs = with pythonPackages; [ pytestCheckHook ]; meta = with lib; { homepage = "https://www.mopidy.com/"; diff --git a/pkgs/applications/audio/mopidy/tidal.nix b/pkgs/applications/audio/mopidy/tidal.nix new file mode 100644 index 000000000000..b470e0489e90 --- /dev/null +++ b/pkgs/applications/audio/mopidy/tidal.nix @@ -0,0 +1,35 @@ +{ lib +, python3Packages +, mopidy +}: + +python3Packages.buildPythonApplication rec { + pname = "Mopidy-Tidal"; + version = "0.3.2"; + + src = python3Packages.fetchPypi { + inherit pname version; + hash = "sha256-ekqhzKyU2WqTOeRR1ZSZA9yW3UXsLBsC2Bk6FZrQgmc="; + }; + + propagatedBuildInputs = [ + mopidy + python3Packages.tidalapi + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + pytest-mock + ]; + + pytestFlagsArray = [ "tests/" ]; + + meta = with lib; { + description = "Mopidy extension for playing music from Tidal"; + homepage = "https://github.com/tehkillerbee/mopidy-tidal"; + license = licenses.mit; + maintainers = [ maintainers.rodrgz ]; + }; +} + + diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index 5110d6ace93f..99eec8187082 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { mopidy ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ vcrpy pytestCheckHook ]; diff --git a/pkgs/applications/audio/mopidy/ytmusic.nix b/pkgs/applications/audio/mopidy/ytmusic.nix index a66620294dde..70c7942f3d76 100644 --- a/pkgs/applications/audio/mopidy/ytmusic.nix +++ b/pkgs/applications/audio/mopidy/ytmusic.nix @@ -3,33 +3,20 @@ , mopidy }: -let - python = python3.override { - packageOverrides = self: super: { - ytmusicapi = super.ytmusicapi.overridePythonAttrs (old: rec { - version = "0.22.0"; - format = "setuptools"; - src = old.src.override { - inherit version; - hash = "sha256-CZ4uoW4UHn5C+MckQXysTdydaApn99b0UCnF5RPb7DI="; - }; - }); - }; - }; -in python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "mopidy-ytmusic"; - version = "0.3.7"; + version = "0.3.8"; - src = python.pkgs.fetchPypi { + src = python3.pkgs.fetchPypi { inherit version; - pname = "Mopidy-YTMusic"; - sha256 = "0gqjvi3nfzkqvbdhihzai241p1h5p037bj2475cc93xwzyyqxcrq"; + pname = "mopidy_ytmusic"; + sha256 = "6b4d8ff9c477dbdd30d0259a009494ebe104cad3f8b37241ae503e5bce4ec2e8"; }; propagatedBuildInputs = [ - (mopidy.override { pythonPackages = python.pkgs; }) - python.pkgs.ytmusicapi - python.pkgs.pytube + (mopidy.override { pythonPackages = python3.pkgs; }) + python3.pkgs.ytmusicapi + python3.pkgs.pytube ]; pythonImportsCheck = [ "mopidy_ytmusic" ]; @@ -38,6 +25,7 @@ in python.pkgs.buildPythonApplication rec { doCheck = false; meta = with lib; { + changelog = "https://github.com/OzymandiasTheGreat/mopidy-ytmusic/blob/v${version}/CHANGELOG.rst"; description = "Mopidy extension for playing music from YouTube Music"; homepage = "https://github.com/OzymandiasTheGreat/mopidy-ytmusic"; license = licenses.asl20; diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/applications/audio/mousai/default.nix index 96d686864fbc..51b5aa037f06 100644 --- a/pkgs/applications/audio/mousai/default.nix +++ b/pkgs/applications/audio/mousai/default.nix @@ -50,6 +50,7 @@ python3.pkgs.buildPythonApplication rec { desktop-file-utils gettext glib + gobject-introspection gtk4 meson ninja @@ -58,7 +59,6 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = [ - gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix index ba2a757e090c..a0e6a0527f7d 100644 --- a/pkgs/applications/audio/mp3gain/default.nix +++ b/pkgs/applications/audio/mp3gain/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lossless mp3 normalizer with statistical analysis"; - homepage = "http://mp3gain.sourceforge.net/"; + homepage = "https://mp3gain.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ devhell ]; diff --git a/pkgs/applications/audio/mp3val/default.nix b/pkgs/applications/audio/mp3val/default.nix index dc1a30858318..559f04f919f1 100644 --- a/pkgs/applications/audio/mp3val/default.nix +++ b/pkgs/applications/audio/mp3val/default.nix @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { files' integrity. It can be useful for finding corrupted files (e.g. incompletely downloaded, truncated, containing garbage). MP3val is also able to fix most of the problems. Being a multiplatform application, - MP3val can be runned both under Windows and under Linux (or BSD). The most + MP3val can be run both under Windows and under Linux (or BSD). The most common MPEG audio file type is MPEG 1 Layer III (mp3), but MP3val supports also other MPEG versions and layers. The tool is also aware of the most common types of tags (ID3v1, ID3v2, APEv2). ''; - homepage = "http://mp3val.sourceforge.net/index.shtml"; + homepage = "https://mp3val.sourceforge.net/index.shtml"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.devhell ]; diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index e247ebeb2b1d..9a693c0eaa39 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://mpc123.sourceforge.net/"; + homepage = "https://mpc123.sourceforge.net/"; description = "A Musepack (.mpc) audio player"; diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index 08cfbada9313..4a73ddf03c87 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command-line MP3 player"; - homepage = "http://mpg321.sourceforge.net/"; + homepage = "https://mpg321.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/applications/audio/munt/libmt32emu.nix index d8b2ae1510cc..75cf863fc769 100644 --- a/pkgs/applications/audio/munt/libmt32emu.nix +++ b/pkgs/applications/audio/munt/libmt32emu.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "munt"; repo = "munt"; - rev = "${pname}_${lib.replaceChars [ "." ] [ "_" ] version}"; + rev = "${pname}_${lib.replaceStrings [ "." ] [ "_" ] version}"; sha256 = "sha256-XGds9lDfSiY0D8RhYG4TGyjYEVvVYuAfNSv9+VxiJEs="; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://munt.sourceforge.net/"; + homepage = "https://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 ]; diff --git a/pkgs/applications/audio/munt/mt32emu-qt.nix b/pkgs/applications/audio/munt/mt32emu-qt.nix index 207fbc3717f7..51501de4a89e 100644 --- a/pkgs/applications/audio/munt/mt32emu-qt.nix +++ b/pkgs/applications/audio/munt/mt32emu-qt.nix @@ -14,7 +14,7 @@ }: let - char2underscore = char: str: lib.replaceChars [ char ] [ "_" ] str; + char2underscore = char: str: lib.replaceStrings [ char ] [ "_" ] str; in mkDerivation rec { pname = "mt32emu-qt"; @@ -63,7 +63,7 @@ mkDerivation rec { ''; meta = with lib; { - homepage = "http://munt.sourceforge.net/"; + homepage = "https://munt.sourceforge.net/"; description = "A synthesizer application built on Qt and libmt32emu"; longDescription = '' mt32emu-qt is a synthesiser application that facilitates both realtime diff --git a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix index 86b5dcee4a65..517d1b200aab 100644 --- a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix +++ b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix @@ -8,7 +8,7 @@ }: let - char2underscore = char: str: lib.replaceChars [ char ] [ "_" ] str; + char2underscore = char: str: lib.replaceStrings [ char ] [ "_" ] str; in stdenv.mkDerivation rec { pname = "mt32emu-smf2wav"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://munt.sourceforge.net/"; + homepage = "https://munt.sourceforge.net/"; description = "Produces a WAVE file from a Standard MIDI file (SMF)"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ OPNA2608 ]; diff --git a/pkgs/applications/audio/museeks/default.nix b/pkgs/applications/audio/museeks/default.nix new file mode 100644 index 000000000000..2db7b9e46df4 --- /dev/null +++ b/pkgs/applications/audio/museeks/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "museeks"; + version = "0.13.1"; + + src = fetchurl { + url = "https://github.com/martpie/museeks/releases/download/${version}/museeks-x86_64.AppImage"; + hash = "sha256-LvunhCFmpv00TnXzWjp3kQUAhoKpmp6pqKgcaUqZV+o="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname version src; + }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + mkdir -p $out/share/${pname} + cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + cp -a ${appimageContents}/usr/share/icons $out/share/ + install -Dm 444 ${appimageContents}/${pname}.desktop -t $out/share/applications + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "A simple, clean and cross-platform music player"; + homepage = "https://github.com/martpie/museeks"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index add56f99d9b3..88b5d3b74c15 100644 --- a/pkgs/applications/audio/musescore/darwin.nix +++ b/pkgs/applications/audio/musescore/darwin.nix @@ -5,17 +5,15 @@ let appName = "MuseScore ${builtins.head versionComponents}"; in -with lib; - stdenv.mkDerivation rec { pname = "musescore-darwin"; - version = concatStringsSep "." versionComponents; + version = lib.concatStringsSep "." versionComponents; # The disk image contains the .app and a symlink to /Applications. sourceRoot = "${appName}.app"; src = fetchurl { - url = "https://github.com/musescore/MuseScore/releases/download/v${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg"; + url = "https://github.com/musescore/MuseScore/releases/download/v${lib.concatStringsSep "." (lib.take 3 versionComponents)}/MuseScore-${version}.dmg"; sha256 = "sha256-lHckfhTTrDzaGwlbnZ5w0O1gMPbRmrmgATIGMY517l0="; }; diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 38e96c7f098e..706a36b5327f 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -1,24 +1,25 @@ -{ cmake +{ lib +, stdenv +, cmake , pkg-config -, boost , curl +, asio , fetchFromGitHub , fetchpatch , ffmpeg , gnutls , lame , libev +, game-music-emu , libmicrohttpd , libopenmpt , mpg123 , ncurses -, lib -, stdenv , taglib # Linux Dependencies , alsa-lib , pulseaudio -, systemdSupport ? stdenv.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd # Darwin Dependencies , Cocoa @@ -27,13 +28,13 @@ stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.98.1"; + version = "0.99.4"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "sha256-pnAdlCCqWzR0W8dF9CE48K8yHMVIx3egZlXvibxU18A="; + sha256 = "sha256-GAO3CKtlZF8Ol4K+40lD8n2RtewiHj3f59d5RIatNws="; }; outputs = [ "out" "dev" ]; @@ -44,12 +45,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost + asio curl ffmpeg gnutls lame libev + game-music-emu libmicrohttpd libopenmpt mpg123 diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 739d0c3c499e..870691ae1c3f 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -12,8 +12,6 @@ , pcreSupport ? false, pcre ? null }: -with lib; - assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { @@ -28,13 +26,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib ncurses libmpdclient boost ] - ++ optional pcreSupport pcre; + ++ lib.optional pcreSupport pcre; nativeBuildInputs = [ meson ninja pkg-config gettext ]; mesonFlags = [ "-Dlirc=disabled" "-Ddocumentation=disabled" - ] ++ optional (!pcreSupport) "-Dregex=disabled"; + ] ++ lib.optional (!pcreSupport) "-Dregex=disabled"; meta = with lib; { description = "Curses-based interface for MPD (music player daemon)"; diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 2a56b6aa3ccf..c15f6b9c14e1 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "sha256-xJzj387exWDvNias50fELvoAxgIoxDHVVRoAD4FJHUw="; + sha256 = "sha256-kqGYBaXmGeGuGJ5fcc4OQzHISU8fVuQNGwiD8nyPa/0="; }; - cargoSha256 = "sha256-6QOD8IhrnjyaOEYVYt2DA3dI6Wcu1tCXnIp+Ruc+EEo="; + cargoSha256 = "sha256-gVXH2pFtyMfYkCqda9NrqOgczvmxiWHe0zArJfnnrgE="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/netease-music-tui/cargo-lock.patch b/pkgs/applications/audio/netease-music-tui/cargo-lock.patch index f47c233d6aee..45754a1f9e5d 100644 --- a/pkgs/applications/audio/netease-music-tui/cargo-lock.patch +++ b/pkgs/applications/audio/netease-music-tui/cargo-lock.patch @@ -1,16 +1,18 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..f191345 +index 0000000..471b1a5 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,2649 @@ +@@ -0,0 +1,2778 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. ++version = 3 ++ +[[package]] +name = "addr2line" -+version = "0.14.1" ++version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" ++checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +dependencies = [ + "gimli", +] @@ -23,18 +25,18 @@ index 0000000..f191345 + +[[package]] +name = "aho-corasick" -+version = "0.7.15" ++version = "0.7.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" ++checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +dependencies = [ + "memchr", +] + +[[package]] +name = "alsa" -+version = "0.5.0" ++version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75c4da790adcb2ce5e758c064b4f3ec17a30349f9961d3e5e6c9688b052a9e18" ++checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" +dependencies = [ + "alsa-sys", + "bitflags", @@ -53,43 +55,41 @@ index 0000000..f191345 +] + +[[package]] -+name = "arrayref" -+version = "0.3.6" ++name = "android_system_properties" ++version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" -+ -+[[package]] -+name = "arrayvec" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" ++checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" ++dependencies = [ ++ "libc", ++] + +[[package]] +name = "async-compression" -+version = "0.3.7" ++version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b72c1f1154e234325b50864a349b9c8e56939e266a4c307c0f159812df2f9537" ++checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +dependencies = [ + "bytes 0.5.6", + "flate2", + "futures-core", + "memchr", -+ "pin-project-lite 0.2.6", ++ "pin-project-lite 0.2.9", +] + +[[package]] +name = "autocfg" -+version = "1.0.1" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" -+version = "0.3.56" ++version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" ++checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +dependencies = [ + "addr2line", ++ "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", @@ -99,9 +99,9 @@ index 0000000..f191345 + +[[package]] +name = "base-x" -+version = "0.2.8" ++version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" ++checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + +[[package]] +name = "base64" @@ -111,15 +111,15 @@ index 0000000..f191345 + +[[package]] +name = "base64" -+version = "0.13.0" ++version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ++checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "bindgen" -+version = "0.56.0" ++version = "0.61.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239" ++checksum = "8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a" +dependencies = [ + "bitflags", + "cexpr", @@ -132,30 +132,20 @@ index 0000000..f191345 + "regex", + "rustc-hash", + "shlex", ++ "syn", +] + +[[package]] +name = "bitflags" -+version = "1.2.1" ++version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+ -+[[package]] -+name = "blake2b_simd" -+version = "0.5.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -+dependencies = [ -+ "arrayref", -+ "arrayvec", -+ "constant_time_eq", -+] ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bumpalo" -+version = "3.6.1" ++version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" ++checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" + +[[package]] +name = "byteorder" @@ -181,9 +171,9 @@ index 0000000..f191345 + +[[package]] +name = "bytes" -+version = "1.0.1" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" ++checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" + +[[package]] +name = "cassowary" @@ -193,9 +183,9 @@ index 0000000..f191345 + +[[package]] +name = "cc" -+version = "1.0.67" ++version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" ++checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" +dependencies = [ + "jobserver", +] @@ -208,11 +198,11 @@ index 0000000..f191345 + +[[package]] +name = "cexpr" -+version = "0.4.0" ++version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" ++checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ -+ "nom 5.1.2", ++ "nom 7.1.1", +] + +[[package]] @@ -229,22 +219,24 @@ index 0000000..f191345 + +[[package]] +name = "chrono" -+version = "0.4.19" ++version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" ++checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +dependencies = [ -+ "libc", ++ "iana-time-zone", ++ "js-sys", + "num-integer", -+ "num-traits 0.2.14", -+ "time 0.1.43", ++ "num-traits 0.2.15", ++ "time 0.1.44", ++ "wasm-bindgen", + "winapi 0.3.9", +] + +[[package]] +name = "clang-sys" -+version = "1.1.1" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f54d78e30b388d4815220c8dd03fea5656b6c6d32adb59e89061552a102f8da1" ++checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" +dependencies = [ + "glob", + "libc", @@ -258,12 +250,22 @@ index 0000000..f191345 +checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" + +[[package]] -+name = "combine" -+version = "4.5.2" ++name = "codespan-reporting" ++version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cc4369b5e4c0cddf64ad8981c0111e7df4f7078f4d6ba98fb31f2e17c4c57b7e" ++checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ -+ "bytes 1.0.1", ++ "termcolor", ++ "unicode-width", ++] ++ ++[[package]] ++name = "combine" ++version = "4.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" ++dependencies = [ ++ "bytes 1.2.1", + "memchr", +] + @@ -276,7 +278,7 @@ index 0000000..f191345 + "lazy_static 1.4.0", + "nom 4.2.3", + "rust-ini", -+ "serde 1.0.125", ++ "serde 1.0.147", + "serde-hjson", + "serde_json", + "toml 0.4.10", @@ -285,15 +287,9 @@ index 0000000..f191345 + +[[package]] +name = "const_fn" -+version = "0.4.6" ++version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "076a6803b0dacd6a88cfe64deba628b01533ff5ef265687e6938280c1afd0a28" -+ -+[[package]] -+name = "constant_time_eq" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" ++checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" + +[[package]] +name = "cookie" @@ -302,8 +298,8 @@ index 0000000..f191345 +checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" +dependencies = [ + "percent-encoding", -+ "time 0.2.26", -+ "version_check 0.9.3", ++ "time 0.2.27", ++ "version_check 0.9.4", +] + +[[package]] @@ -313,36 +309,30 @@ index 0000000..f191345 +checksum = "3818dfca4b0cb5211a659bbcbb94225b7127407b2b135e650d717bfb78ab10d3" +dependencies = [ + "cookie", -+ "idna", ++ "idna 0.2.3", + "log", + "publicsuffix", -+ "serde 1.0.125", ++ "serde 1.0.147", + "serde_json", -+ "time 0.2.26", ++ "time 0.2.27", + "url", +] + +[[package]] +name = "core-foundation" -+version = "0.9.1" ++version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" ++checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ -+ "core-foundation-sys 0.8.2", ++ "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" -+version = "0.6.2" ++version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" -+ -+[[package]] -+name = "core-foundation-sys" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" ++checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "coreaudio-rs" @@ -356,21 +346,21 @@ index 0000000..f191345 + +[[package]] +name = "coreaudio-sys" -+version = "0.2.8" ++version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2b7e3347be6a09b46aba228d6608386739fb70beff4f61e07422da87b0bb31fa" ++checksum = "1a9444b94b8024feecc29e01a9706c69c1e26bfee480221c90764200cfd778fb" +dependencies = [ + "bindgen", +] + +[[package]] +name = "cpal" -+version = "0.13.3" ++version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8351ddf2aaa3c583fa388029f8b3d26f3c7035a20911fdd5f2e2ed7ab57dad25" ++checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116" +dependencies = [ + "alsa", -+ "core-foundation-sys 0.6.2", ++ "core-foundation-sys", + "coreaudio-rs", + "jni", + "js-sys", @@ -390,29 +380,62 @@ index 0000000..f191345 + +[[package]] +name = "crc32fast" -+version = "1.2.1" ++version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" ++checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] -+name = "crossbeam-utils" -+version = "0.8.3" ++name = "cxx" ++version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" ++checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" +dependencies = [ -+ "autocfg", -+ "cfg-if 1.0.0", -+ "lazy_static 1.4.0", ++ "cc", ++ "cxxbridge-flags", ++ "cxxbridge-macro", ++ "link-cplusplus", ++] ++ ++[[package]] ++name = "cxx-build" ++version = "1.0.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0" ++dependencies = [ ++ "cc", ++ "codespan-reporting", ++ "once_cell", ++ "proc-macro2", ++ "quote", ++ "scratch", ++ "syn", ++] ++ ++[[package]] ++name = "cxxbridge-flags" ++version = "1.0.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71" ++ ++[[package]] ++name = "cxxbridge-macro" ++version = "1.0.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", +] + +[[package]] +name = "darling" -+version = "0.10.2" ++version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" ++checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +dependencies = [ + "darling_core", + "darling_macro", @@ -420,9 +443,9 @@ index 0000000..f191345 + +[[package]] +name = "darling_core" -+version = "0.10.2" ++version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" ++checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +dependencies = [ + "fnv", + "ident_case", @@ -434,9 +457,9 @@ index 0000000..f191345 + +[[package]] +name = "darling_macro" -+version = "0.10.2" ++version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" ++checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +dependencies = [ + "darling_core", + "quote", @@ -454,17 +477,6 @@ index 0000000..f191345 +] + +[[package]] -+name = "derivative" -+version = "2.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] +name = "dirs" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -476,9 +488,9 @@ index 0000000..f191345 + +[[package]] +name = "dirs-sys" -+version = "0.3.5" ++version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" ++checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", @@ -499,15 +511,15 @@ index 0000000..f191345 + +[[package]] +name = "either" -+version = "1.6.1" ++version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "encoding_rs" -+version = "0.8.28" ++version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" ++checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +dependencies = [ + "cfg-if 1.0.0", +] @@ -535,14 +547,21 @@ index 0000000..f191345 +] + +[[package]] -+name = "flate2" -+version = "1.0.20" ++name = "fastrand" ++version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" ++checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" ++dependencies = [ ++ "instant", ++] ++ ++[[package]] ++name = "flate2" ++version = "1.0.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +dependencies = [ -+ "cfg-if 1.0.0", + "crc32fast", -+ "libc", + "miniz_oxide", +] + @@ -569,11 +588,10 @@ index 0000000..f191345 + +[[package]] +name = "form_urlencoded" -+version = "1.0.1" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" ++checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ -+ "matches", + "percent-encoding", +] + @@ -595,9 +613,9 @@ index 0000000..f191345 + +[[package]] +name = "futures" -+version = "0.3.13" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1" ++checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +dependencies = [ + "futures-channel", + "futures-core", @@ -610,9 +628,9 @@ index 0000000..f191345 + +[[package]] +name = "futures-channel" -+version = "0.3.13" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939" ++checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +dependencies = [ + "futures-core", + "futures-sink", @@ -620,15 +638,15 @@ index 0000000..f191345 + +[[package]] +name = "futures-core" -+version = "0.3.13" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94" ++checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" + +[[package]] +name = "futures-executor" -+version = "0.3.13" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1" ++checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +dependencies = [ + "futures-core", + "futures-task", @@ -637,17 +655,16 @@ index 0000000..f191345 + +[[package]] +name = "futures-io" -+version = "0.3.13" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59" ++checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" + +[[package]] +name = "futures-macro" -+version = "0.3.13" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7" ++checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +dependencies = [ -+ "proc-macro-hack", + "proc-macro2", + "quote", + "syn", @@ -655,21 +672,21 @@ index 0000000..f191345 + +[[package]] +name = "futures-sink" -+version = "0.3.13" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3" ++checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" + +[[package]] +name = "futures-task" -+version = "0.3.13" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80" ++checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" + +[[package]] +name = "futures-util" -+version = "0.3.13" ++version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1" ++checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +dependencies = [ + "futures-channel", + "futures-core", @@ -678,10 +695,8 @@ index 0000000..f191345 + "futures-sink", + "futures-task", + "memchr", -+ "pin-project-lite 0.2.6", ++ "pin-project-lite 0.2.9", + "pin-utils", -+ "proc-macro-hack", -+ "proc-macro-nested", + "slab", +] + @@ -698,20 +713,20 @@ index 0000000..f191345 + +[[package]] +name = "getrandom" -+version = "0.2.2" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" ++checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if 1.0.0", + "libc", -+ "wasi 0.10.2+wasi-snapshot-preview1", ++ "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gimli" -+version = "0.23.0" ++version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" ++checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" + +[[package]] +name = "glob" @@ -741,15 +756,15 @@ index 0000000..f191345 + +[[package]] +name = "hashbrown" -+version = "0.9.1" ++version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" ++checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hermit-abi" -+version = "0.1.18" ++version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] @@ -762,19 +777,19 @@ index 0000000..f191345 + +[[package]] +name = "hound" -+version = "3.4.0" ++version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549" ++checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1" + +[[package]] +name = "http" -+version = "0.2.3" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747" ++checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ -+ "bytes 1.0.1", ++ "bytes 1.2.1", + "fnv", -+ "itoa", ++ "itoa 1.0.4", +] + +[[package]] @@ -789,9 +804,9 @@ index 0000000..f191345 + +[[package]] +name = "httparse" -+version = "1.3.5" ++version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691" ++checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" @@ -814,7 +829,7 @@ index 0000000..f191345 + "http-body", + "httparse", + "httpdate", -+ "itoa", ++ "itoa 0.4.8", + "pin-project", + "socket2", + "tokio", @@ -837,6 +852,30 @@ index 0000000..f191345 +] + +[[package]] ++name = "iana-time-zone" ++version = "0.1.53" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" ++dependencies = [ ++ "android_system_properties", ++ "core-foundation-sys", ++ "iana-time-zone-haiku", ++ "js-sys", ++ "wasm-bindgen", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "iana-time-zone-haiku" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" ++dependencies = [ ++ "cxx", ++ "cxx-build", ++] ++ ++[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -844,9 +883,9 @@ index 0000000..f191345 + +[[package]] +name = "idna" -+version = "0.2.2" ++version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" ++checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", @@ -854,10 +893,20 @@ index 0000000..f191345 +] + +[[package]] -+name = "indexmap" -+version = "1.6.2" ++name = "idna" ++version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" ++checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" ++dependencies = [ ++ "unicode-bidi", ++ "unicode-normalization", ++] ++ ++[[package]] ++name = "indexmap" ++version = "1.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", @@ -865,9 +914,9 @@ index 0000000..f191345 + +[[package]] +name = "instant" -+version = "0.1.9" ++version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" ++checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if 1.0.0", +] @@ -883,9 +932,9 @@ index 0000000..f191345 + +[[package]] +name = "ipnet" -+version = "2.3.0" ++version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" ++checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" + +[[package]] +name = "itertools" @@ -898,15 +947,21 @@ index 0000000..f191345 + +[[package]] +name = "itoa" -+version = "0.4.7" ++version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" ++checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" ++ ++[[package]] ++name = "itoa" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" + +[[package]] +name = "jni" -+version = "0.18.0" ++version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "24967112a1e4301ca5342ea339763613a37592b8a6ce6cf2e4494537c7a42faf" ++checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", @@ -924,18 +979,18 @@ index 0000000..f191345 + +[[package]] +name = "jobserver" -+version = "0.1.21" ++version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2" ++checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" -+version = "0.3.50" ++version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" ++checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] @@ -981,30 +1036,39 @@ index 0000000..f191345 + +[[package]] +name = "libc" -+version = "0.2.92" ++version = "0.2.137" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "56d855069fafbb9b344c0f962150cd2c1187975cb1c22c1522c240d8c4986714" ++checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" + +[[package]] +name = "libdbus-sys" -+version = "0.2.1" ++version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc12a3bc971424edbbf7edaf6e5740483444db63aa8e23d3751ff12a30f306f0" ++checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "libloading" -+version = "0.7.0" ++version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" ++checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if 1.0.0", + "winapi 0.3.9", +] + +[[package]] ++name = "link-cplusplus" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" ++dependencies = [ ++ "cc", ++] ++ ++[[package]] +name = "linked-hash-map" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1016,33 +1080,34 @@ index 0000000..f191345 + +[[package]] +name = "linked-hash-map" -+version = "0.5.4" ++version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" ++checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "lock_api" -+version = "0.4.2" ++version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" ++checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ ++ "autocfg", + "scopeguard", +] + +[[package]] +name = "log" -+version = "0.4.14" ++version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" ++checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "log-panics" -+version = "2.0.0" ++version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ae0136257df209261daa18d6c16394757c63e032e27aafd8b07788b051082bef" ++checksum = "68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f" +dependencies = [ + "log", +] @@ -1058,15 +1123,24 @@ index 0000000..f191345 + +[[package]] +name = "matches" -+version = "0.1.8" ++version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "memchr" -+version = "2.3.4" ++version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" ++checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" ++ ++[[package]] ++name = "memoffset" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" ++dependencies = [ ++ "autocfg", ++] + +[[package]] +name = "mime" @@ -1076,15 +1150,21 @@ index 0000000..f191345 + +[[package]] +name = "mime_guess" -+version = "2.0.3" ++version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" ++checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] ++name = "minimal-lexical" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" ++ ++[[package]] +name = "minimp3" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1106,12 +1186,11 @@ index 0000000..f191345 + +[[package]] +name = "miniz_oxide" -+version = "0.4.4" ++version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" ++checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +dependencies = [ + "adler", -+ "autocfg", +] + +[[package]] @@ -1156,9 +1235,9 @@ index 0000000..f191345 + +[[package]] +name = "native-tls" -+version = "0.2.7" ++version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4" ++checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static 1.4.0", + "libc", @@ -1174,10 +1253,11 @@ index 0000000..f191345 + +[[package]] +name = "ndk" -+version = "0.3.0" ++version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab" ++checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ ++ "bitflags", + "jni-sys", + "ndk-sys", + "num_enum", @@ -1185,24 +1265,31 @@ index 0000000..f191345 +] + +[[package]] -+name = "ndk-glue" -+version = "0.3.0" ++name = "ndk-context" ++version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385" ++checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" ++ ++[[package]] ++name = "ndk-glue" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f" +dependencies = [ + "lazy_static 1.4.0", + "libc", + "log", + "ndk", ++ "ndk-context", + "ndk-macro", + "ndk-sys", +] + +[[package]] +name = "ndk-macro" -+version = "0.2.0" ++version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" ++checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" +dependencies = [ + "darling", + "proc-macro-crate", @@ -1213,15 +1300,18 @@ index 0000000..f191345 + +[[package]] +name = "ndk-sys" -+version = "0.2.1" ++version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c44922cb3dbb1c70b5e5f443d63b64363a898564d739ba5198e3a9138442868d" ++checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" ++dependencies = [ ++ "jni-sys", ++] + +[[package]] +name = "net2" -+version = "0.2.37" ++version = "0.2.38" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" ++checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" +dependencies = [ + "cfg-if 0.1.10", + "libc", @@ -1237,6 +1327,7 @@ index 0000000..f191345 + "bytes 0.4.12", + "chrono", + "config", ++ "cpal", + "dbus", + "dirs", + "failure", @@ -1248,11 +1339,11 @@ index 0000000..f191345 + "mp3-duration", + "num-bigint", + "openssl", -+ "rand 0.7.3", ++ "rand", + "regex", + "reqwest", + "rodio", -+ "serde 1.0.125", ++ "serde 1.0.147", + "serde_derive", + "serde_json", + "serde_urlencoded 0.6.1", @@ -1266,14 +1357,15 @@ index 0000000..f191345 + +[[package]] +name = "nix" -+version = "0.20.0" ++version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" ++checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +dependencies = [ + "bitflags", + "cc", + "cfg-if 1.0.0", + "libc", ++ "memoffset", +] + +[[package]] @@ -1288,12 +1380,12 @@ index 0000000..f191345 + +[[package]] +name = "nom" -+version = "5.1.2" ++version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" ++checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +dependencies = [ + "memchr", -+ "version_check 0.9.3", ++ "minimal-lexical", +] + +[[package]] @@ -1304,7 +1396,7 @@ index 0000000..f191345 +dependencies = [ + "autocfg", + "num-integer", -+ "num-traits 0.2.14", ++ "num-traits 0.2.15", +] + +[[package]] @@ -1320,12 +1412,12 @@ index 0000000..f191345 + +[[package]] +name = "num-integer" -+version = "0.1.44" ++version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" ++checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", -+ "num-traits 0.2.14", ++ "num-traits 0.2.15", +] + +[[package]] @@ -1334,23 +1426,23 @@ index 0000000..f191345 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +dependencies = [ -+ "num-traits 0.2.14", ++ "num-traits 0.2.15", +] + +[[package]] +name = "num-traits" -+version = "0.2.14" ++version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" -+version = "1.13.0" ++version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" ++checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +dependencies = [ + "hermit-abi", + "libc", @@ -1358,19 +1450,18 @@ index 0000000..f191345 + +[[package]] +name = "num_enum" -+version = "0.5.1" ++version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066" ++checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" +dependencies = [ -+ "derivative", + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" -+version = "0.5.1" ++version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e" ++checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" +dependencies = [ + "proc-macro-crate", + "proc-macro2", @@ -1386,29 +1477,32 @@ index 0000000..f191345 + +[[package]] +name = "object" -+version = "0.23.0" ++version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" ++checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" ++dependencies = [ ++ "memchr", ++] + +[[package]] +name = "oboe" -+version = "0.4.1" ++version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4cfb2390bddb9546c0f7448fd1d2abdd39e6075206f960991eb28c7fa7f126c4" ++checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1" +dependencies = [ + "jni", + "ndk", -+ "ndk-glue", ++ "ndk-context", + "num-derive", -+ "num-traits 0.2.14", ++ "num-traits 0.2.15", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" -+version = "0.4.0" ++version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fe069264d082fc820dfa172f79be3f2e088ecfece9b1c47b0c9fd838d2bef103" ++checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd" +dependencies = [ + "cc", +] @@ -1424,35 +1518,47 @@ index 0000000..f191345 + +[[package]] +name = "once_cell" -+version = "1.7.2" ++version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" ++checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" + +[[package]] +name = "openssl" -+version = "0.10.33" ++version = "0.10.42" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577" ++checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "foreign-types", + "libc", + "once_cell", ++ "openssl-macros", + "openssl-sys", +] + +[[package]] -+name = "openssl-probe" -+version = "0.1.2" ++name = "openssl-macros" ++version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "openssl-probe" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" -+version = "0.9.61" ++version = "0.9.77" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f" ++checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" +dependencies = [ + "autocfg", + "cc", @@ -1463,9 +1569,9 @@ index 0000000..f191345 + +[[package]] +name = "parking_lot" -+version = "0.11.1" ++version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" ++checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", @@ -1474,14 +1580,14 @@ index 0000000..f191345 + +[[package]] +name = "parking_lot_core" -+version = "0.8.3" ++version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" ++checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +dependencies = [ + "cfg-if 1.0.0", + "instant", + "libc", -+ "redox_syscall 0.2.5", ++ "redox_syscall 0.2.16", + "smallvec", + "winapi 0.3.9", +] @@ -1494,24 +1600,24 @@ index 0000000..f191345 + +[[package]] +name = "percent-encoding" -+version = "2.1.0" ++version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" ++checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pin-project" -+version = "1.0.6" ++version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6" ++checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" -+version = "1.0.6" ++version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5" ++checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +dependencies = [ + "proc-macro2", + "quote", @@ -1526,9 +1632,9 @@ index 0000000..f191345 + +[[package]] +name = "pin-project-lite" -+version = "0.2.6" ++version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" ++checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" @@ -1538,23 +1644,25 @@ index 0000000..f191345 + +[[package]] +name = "pkg-config" -+version = "0.3.19" ++version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" ++checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "ppv-lite86" -+version = "0.2.10" ++version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" ++checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" -+version = "0.1.5" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" ++checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +dependencies = [ -+ "toml 0.5.8", ++ "once_cell", ++ "thiserror", ++ "toml 0.5.9", +] + +[[package]] @@ -1564,18 +1672,12 @@ index 0000000..f191345 +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] -+name = "proc-macro-nested" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" -+ -+[[package]] +name = "proc-macro2" -+version = "1.0.26" ++version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" ++checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +dependencies = [ -+ "unicode-xid", ++ "unicode-ident", +] + +[[package]] @@ -1584,15 +1686,15 @@ index 0000000..f191345 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" +dependencies = [ -+ "idna", ++ "idna 0.2.3", + "url", +] + +[[package]] +name = "quote" -+version = "1.0.9" ++version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +dependencies = [ + "proc-macro2", +] @@ -1605,21 +1707,9 @@ index 0000000..f191345 +dependencies = [ + "getrandom 0.1.16", + "libc", -+ "rand_chacha 0.2.2", -+ "rand_core 0.5.1", -+ "rand_hc 0.2.0", -+] -+ -+[[package]] -+name = "rand" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" -+dependencies = [ -+ "libc", -+ "rand_chacha 0.3.0", -+ "rand_core 0.6.2", -+ "rand_hc 0.3.0", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", +] + +[[package]] @@ -1629,17 +1719,7 @@ index 0000000..f191345 +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", -+ "rand_core 0.5.1", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" -+dependencies = [ -+ "ppv-lite86", -+ "rand_core 0.6.2", ++ "rand_core", +] + +[[package]] @@ -1652,30 +1732,12 @@ index 0000000..f191345 +] + +[[package]] -+name = "rand_core" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" -+dependencies = [ -+ "getrandom 0.2.2", -+] -+ -+[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ -+ "rand_core 0.5.1", -+] -+ -+[[package]] -+name = "rand_hc" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" -+dependencies = [ -+ "rand_core 0.6.2", ++ "rand_core", +] + +[[package]] @@ -1686,9 +1748,9 @@ index 0000000..f191345 + +[[package]] +name = "redox_syscall" -+version = "0.2.5" ++version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" ++checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] @@ -1699,25 +1761,25 @@ index 0000000..f191345 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" +dependencies = [ -+ "redox_syscall 0.2.5", ++ "redox_syscall 0.2.16", +] + +[[package]] +name = "redox_users" -+version = "0.3.5" ++version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" ++checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ -+ "getrandom 0.1.16", -+ "redox_syscall 0.1.57", -+ "rust-argon2", ++ "getrandom 0.2.8", ++ "redox_syscall 0.2.16", ++ "thiserror", +] + +[[package]] +name = "regex" -+version = "1.4.5" ++version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" ++checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +dependencies = [ + "aho-corasick", + "memchr", @@ -1726,9 +1788,9 @@ index 0000000..f191345 + +[[package]] +name = "regex-syntax" -+version = "0.6.23" ++version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" ++checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "remove_dir_all" @@ -1746,7 +1808,7 @@ index 0000000..f191345 +checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" +dependencies = [ + "async-compression", -+ "base64 0.13.0", ++ "base64 0.13.1", + "bytes 0.5.6", + "cookie", + "cookie_store", @@ -1765,10 +1827,10 @@ index 0000000..f191345 + "mime_guess", + "native-tls", + "percent-encoding", -+ "pin-project-lite 0.2.6", -+ "serde 1.0.125", -+ "serde_urlencoded 0.7.0", -+ "time 0.2.26", ++ "pin-project-lite 0.2.9", ++ "serde 1.0.147", ++ "serde_urlencoded 0.7.1", ++ "time 0.2.27", + "tokio", + "tokio-socks", + "tokio-tls", @@ -1781,9 +1843,9 @@ index 0000000..f191345 + +[[package]] +name = "rodio" -+version = "0.13.1" ++version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b65c2eda643191f6d1bb12ea323a9db8d9ba95374e9be3780b5a9fb5cfb8520f" ++checksum = "ec0939e9f626e6c6f1989adb6226a039c855ca483053f0ee7c98b90e41cf731e" +dependencies = [ + "claxon", + "cpal", @@ -1793,18 +1855,6 @@ index 0000000..f191345 +] + +[[package]] -+name = "rust-argon2" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -+dependencies = [ -+ "base64 0.13.0", -+ "blake2b_simd", -+ "constant_time_eq", -+ "crossbeam-utils", -+] -+ -+[[package]] +name = "rust-ini" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1812,9 +1862,9 @@ index 0000000..f191345 + +[[package]] +name = "rustc-demangle" -+version = "0.1.18" ++version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" ++checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[package]] +name = "rustc-hash" @@ -1833,9 +1883,9 @@ index 0000000..f191345 + +[[package]] +name = "ryu" -+version = "1.0.5" ++version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" + +[[package]] +name = "same-file" @@ -1848,12 +1898,12 @@ index 0000000..f191345 + +[[package]] +name = "schannel" -+version = "0.1.19" ++version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" ++checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +dependencies = [ + "lazy_static 1.4.0", -+ "winapi 0.3.9", ++ "windows-sys", +] + +[[package]] @@ -1863,25 +1913,31 @@ index 0000000..f191345 +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] -+name = "security-framework" -+version = "2.2.0" ++name = "scratch" ++version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84" ++checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" ++ ++[[package]] ++name = "security-framework" ++version = "2.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +dependencies = [ + "bitflags", + "core-foundation", -+ "core-foundation-sys 0.8.2", ++ "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" -+version = "2.2.0" ++version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339" ++checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +dependencies = [ -+ "core-foundation-sys 0.8.2", ++ "core-foundation-sys", + "libc", +] + @@ -1908,9 +1964,9 @@ index 0000000..f191345 + +[[package]] +name = "serde" -+version = "1.0.125" ++version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" ++checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +dependencies = [ + "serde_derive", +] @@ -1930,9 +1986,9 @@ index 0000000..f191345 + +[[package]] +name = "serde_derive" -+version = "1.0.125" ++version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" ++checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +dependencies = [ + "proc-macro2", + "quote", @@ -1941,13 +1997,13 @@ index 0000000..f191345 + +[[package]] +name = "serde_json" -+version = "1.0.64" ++version = "1.0.88" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" ++checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" +dependencies = [ -+ "itoa", ++ "itoa 1.0.4", + "ryu", -+ "serde 1.0.125", ++ "serde 1.0.147", +] + +[[package]] @@ -1966,34 +2022,43 @@ index 0000000..f191345 +checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" +dependencies = [ + "dtoa", -+ "itoa", -+ "serde 1.0.125", ++ "itoa 0.4.8", ++ "serde 1.0.147", + "url", +] + +[[package]] +name = "serde_urlencoded" -+version = "0.7.0" ++version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" ++checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", -+ "itoa", ++ "itoa 1.0.4", + "ryu", -+ "serde 1.0.125", ++ "serde 1.0.147", +] + +[[package]] +name = "sha1" -+version = "0.6.0" ++version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" ++checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" ++dependencies = [ ++ "sha1_smol", ++] ++ ++[[package]] ++name = "sha1_smol" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + +[[package]] +name = "shlex" -+version = "0.1.1" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" ++checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + +[[package]] +name = "simple-logging" @@ -2008,9 +2073,12 @@ index 0000000..f191345 + +[[package]] +name = "slab" -+version = "0.4.2" ++version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" ++dependencies = [ ++ "autocfg", ++] + +[[package]] +name = "slice-deque" @@ -2025,9 +2093,9 @@ index 0000000..f191345 + +[[package]] +name = "smallvec" -+version = "1.6.1" ++version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" ++checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" @@ -2046,7 +2114,7 @@ index 0000000..f191345 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +dependencies = [ -+ "version_check 0.9.3", ++ "version_check 0.9.4", +] + +[[package]] @@ -2077,7 +2145,7 @@ index 0000000..f191345 +dependencies = [ + "proc-macro2", + "quote", -+ "serde 1.0.125", ++ "serde 1.0.147", + "serde_derive", + "syn", +] @@ -2091,7 +2159,7 @@ index 0000000..f191345 + "base-x", + "proc-macro2", + "quote", -+ "serde 1.0.125", ++ "serde 1.0.147", + "serde_derive", + "serde_json", + "sha1", @@ -2106,26 +2174,26 @@ index 0000000..f191345 + +[[package]] +name = "strsim" -+version = "0.9.3" ++version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" ++checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" -+version = "1.0.68" ++version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3ce15dd3ed8aa2f8eeac4716d6ef5ab58b6b9256db41d7e1a0224c2788e8fd87" ++checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +dependencies = [ + "proc-macro2", + "quote", -+ "unicode-xid", ++ "unicode-ident", +] + +[[package]] +name = "synstructure" -+version = "0.12.4" ++version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" ++checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", @@ -2135,19 +2203,28 @@ index 0000000..f191345 + +[[package]] +name = "tempfile" -+version = "3.2.0" ++version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" ++checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if 1.0.0", ++ "fastrand", + "libc", -+ "rand 0.8.3", -+ "redox_syscall 0.2.5", ++ "redox_syscall 0.2.16", + "remove_dir_all", + "winapi 0.3.9", +] + +[[package]] ++name = "termcolor" ++version = "1.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] +name = "termion" +version = "1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2155,24 +2232,24 @@ index 0000000..f191345 +dependencies = [ + "libc", + "numtoa", -+ "redox_syscall 0.2.5", ++ "redox_syscall 0.2.16", + "redox_termios", +] + +[[package]] +name = "thiserror" -+version = "1.0.24" ++version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" ++checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" -+version = "1.0.24" ++version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" ++checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +dependencies = [ + "proc-macro2", + "quote", @@ -2192,26 +2269,27 @@ index 0000000..f191345 + +[[package]] +name = "time" -+version = "0.1.43" ++version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" ++checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", ++ "wasi 0.10.0+wasi-snapshot-preview1", + "winapi 0.3.9", +] + +[[package]] +name = "time" -+version = "0.2.26" ++version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08a8cbfbf47955132d0202d1662f49b2423ae35862aee471f3ba4b133358f372" ++checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +dependencies = [ + "const_fn", + "libc", + "standback", + "stdweb 0.4.20", + "time-macros", -+ "version_check 0.9.3", ++ "version_check 0.9.4", + "winapi 0.3.9", +] + @@ -2227,9 +2305,9 @@ index 0000000..f191345 + +[[package]] +name = "time-macros-impl" -+version = "0.1.1" ++version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa" ++checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +dependencies = [ + "proc-macro-hack", + "proc-macro2", @@ -2240,9 +2318,9 @@ index 0000000..f191345 + +[[package]] +name = "tinyvec" -+version = "1.1.1" ++version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023" ++checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] @@ -2326,43 +2404,43 @@ index 0000000..f191345 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" +dependencies = [ -+ "serde 1.0.125", ++ "serde 1.0.147", +] + +[[package]] +name = "toml" -+version = "0.5.8" ++version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" ++checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +dependencies = [ -+ "serde 1.0.125", ++ "serde 1.0.147", +] + +[[package]] +name = "tower-service" -+version = "0.3.1" ++version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" ++checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" -+version = "0.1.25" ++version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f" ++checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if 1.0.0", + "log", -+ "pin-project-lite 0.2.6", ++ "pin-project-lite 0.2.9", + "tracing-core", +] + +[[package]] +name = "tracing-core" -+version = "0.1.17" ++version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" ++checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ -+ "lazy_static 1.4.0", ++ "once_cell", +] + +[[package]] @@ -2403,62 +2481,64 @@ index 0000000..f191345 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ -+ "version_check 0.9.3", ++ "version_check 0.9.4", +] + +[[package]] +name = "unicode-bidi" -+version = "0.3.4" ++version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -+dependencies = [ -+ "matches", -+] ++checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[package]] +name = "unicode-normalization" -+version = "0.1.17" ++version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" ++checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" -+version = "1.7.1" ++version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" ++checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" + +[[package]] +name = "unicode-width" -+version = "0.1.8" ++version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unicode-xid" -+version = "0.2.1" ++version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "url" -+version = "2.2.1" ++version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" ++checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", -+ "idna", -+ "matches", ++ "idna 0.3.0", + "percent-encoding", +] + +[[package]] +name = "vcpkg" -+version = "0.2.11" ++version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" ++checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" @@ -2468,9 +2548,9 @@ index 0000000..f191345 + +[[package]] +name = "version_check" -+version = "0.9.3" ++version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" ++checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" @@ -2501,31 +2581,37 @@ index 0000000..f191345 + +[[package]] +name = "wasi" -+version = "0.10.2+wasi-snapshot-preview1" ++version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" ++checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" ++ ++[[package]] ++name = "wasi" ++version = "0.11.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" -+version = "0.2.73" ++version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" ++checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if 1.0.0", -+ "serde 1.0.125", ++ "serde 1.0.147", + "serde_json", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" -+version = "0.2.73" ++version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" ++checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", -+ "lazy_static 1.4.0", + "log", ++ "once_cell", + "proc-macro2", + "quote", + "syn", @@ -2534,9 +2620,9 @@ index 0000000..f191345 + +[[package]] +name = "wasm-bindgen-futures" -+version = "0.4.23" ++version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea" ++checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", @@ -2546,9 +2632,9 @@ index 0000000..f191345 + +[[package]] +name = "wasm-bindgen-macro" -+version = "0.2.73" ++version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" ++checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", @@ -2556,9 +2642,9 @@ index 0000000..f191345 + +[[package]] +name = "wasm-bindgen-macro-support" -+version = "0.2.73" ++version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" ++checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", @@ -2569,15 +2655,15 @@ index 0000000..f191345 + +[[package]] +name = "wasm-bindgen-shared" -+version = "0.2.73" ++version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" ++checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "web-sys" -+version = "0.3.50" ++version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" ++checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", @@ -2627,6 +2713,49 @@ index 0000000..f191345 +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] ++name = "windows-sys" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" ++dependencies = [ ++ "windows_aarch64_msvc", ++ "windows_i686_gnu", ++ "windows_i686_msvc", ++ "windows_x86_64_gnu", ++ "windows_x86_64_msvc", ++] ++ ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" ++ ++[[package]] ++name = "windows_i686_gnu" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" ++ ++[[package]] ++name = "windows_i686_msvc" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" ++ ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" ++ ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" ++ ++[[package]] +name = "winreg" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2651,5 +2780,5 @@ index 0000000..f191345 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ -+ "linked-hash-map 0.5.4", ++ "linked-hash-map 0.5.6", +] diff --git a/pkgs/applications/audio/netease-music-tui/default.nix b/pkgs/applications/audio/netease-music-tui/default.nix index f6ccee3e535e..90d645804b77 100644 --- a/pkgs/applications/audio/netease-music-tui/default.nix +++ b/pkgs/applications/audio/netease-music-tui/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "netease-music-tui"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "betta-cyber"; repo = "netease-music-tui"; rev = "v${version}"; - sha256 = "sha256-ILJkejRKG2DRXgR6O2tAFbrbd8HtnLZJmITq7hF41DQ="; + sha256 = "sha256-+zRXihWg65DtyX3yD04CsW8aXIvNph36PW2veeg36lg="; }; cargoPatches = [ ./cargo-lock.patch ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib openssl ]; - cargoSha256 = "sha256-/JQDUtSSkuO9nrYVSkQOaZjps1BUuH8Bc1SMyDSSJS4="; + cargoSha256 = "sha256-i+W/KwnqdaHcrdaWYUuCUeFlRKekVuEvFh/pxDolPNU="; meta = with lib; { homepage = "https://github.com/betta-cyber/netease-music-tui"; diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index 0fe6da9537da..8a672948634a 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -9,20 +9,20 @@ stdenv.mkDerivation { sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i"; }; - nativeBuildInputs = [ pkg-config sconsPackages.scons_3_0_1 ]; + nativeBuildInputs = [ pkg-config sconsPackages.scons_latest ]; buildInputs = [ boost ladspaH ]; patchPhase = '' # remove TERM: sed -i -e '4d' SConstruct - sed -i "s@mfpmath=sse@mfpmath=sse -I ${boost.dev}/include@g" SConstruct + sed -i 's@Options@Variables@g' SConstruct + sed -i "s@-fomit-frame-pointer -ffast-math -mfpmath=sse@-I ${boost.dev}/include@g" SConstruct sed -i "s@ladspa.h@${ladspaH}/include/ladspa.h@g" filters.cpp sed -i "s@LADSPA_HINT_SAMPLE_RATE, 0, 0.5@LADSPA_HINT_SAMPLE_RATE, 0.0001, 0.5@g" filters.cpp sed -i "s/= check/= detail::filter_base::check/" nova/source/dsp/filter.hpp ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "LADSPA plugins based on filters of nova"; homepage = "http://klingt.org/~tim/nova-filters/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 4077f5be2107..f40fb1413264 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.15"; + version = "3.11.21"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-l3Fv0gKKGYrbxpGHH6MXflK5fCrGoq3Qu+XkqFqMJJk="; + sha256 = "sha256-nItqx3g4W3s1phHe6F8EtOL4nwJQ0XnKB8Ujg71/Q3Q="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 015265774507..0860501c87c4 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -2,21 +2,21 @@ buildNpmPackage rec { pname = "open-stage-control"; - version = "1.20.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-XgwlRdwUSl4gIRKqk6BnMAKarVvp291zk8vmNkuRWKo="; + hash = "sha256-tfWimJ9eEFBUxPRVNjgbu8tQNokPbXOxOXO64mFuMfM="; }; - patches = [ - # Use generated package-lock.json since upstream does not provide one in releases - ./package-lock.json.patch - ]; + # Remove some Electron stuff from package.json + postPatch = '' + sed -i -e '/"electron"\|"electron-installer-debian"/d' package.json + ''; - npmDepsHash = "sha256-SGLcFjPnmhFoeXtP4gfGr4Qa1dTaXwSnzkweEvYW/1k="; + npmDepsHash = "sha256-M+6+zrxy8VpJQS0dG/xORMbflKEq8wO2DEOjGrA6OUw="; nativeBuildInputs = [ copyDesktopItems @@ -33,16 +33,13 @@ buildNpmPackage rec { makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; - # Override installPhase so we can copy the only folders that matter (app and node_modules) + # Override installPhase so we can copy the only directory that matters (app) installPhase = '' runHook preInstall - # prune unused deps - npm prune --omit dev $npmFlags - # copy built app and node_modules directories mkdir -p $out/lib/node_modules/open-stage-control - cp -r app node_modules $out/lib/node_modules/open-stage-control/ + cp -r app $out/lib/node_modules/open-stage-control/ # copy icon install -Dm644 resources/images/logo.png $out/share/icons/hicolor/256x256/apps/open-stage-control.png diff --git a/pkgs/applications/audio/open-stage-control/package-lock.json.patch b/pkgs/applications/audio/open-stage-control/package-lock.json.patch deleted file mode 100644 index 44a82d595aad..000000000000 --- a/pkgs/applications/audio/open-stage-control/package-lock.json.patch +++ /dev/null @@ -1,18247 +0,0 @@ ---- /dev/null 2022-11-10 08:46:51.851132440 -0500 -+++ ./package-lock.json 2022-11-10 10:15:51.122373816 -0500 -@@ -0,0 +1,18244 @@ -+{ -+ "name": "open-stage-control", -+ "version": "1.20.0", -+ "lockfileVersion": 2, -+ "requires": true, -+ "packages": { -+ "": { -+ "name": "open-stage-control", -+ "version": "1.20.0", -+ "hasInstallScript": true, -+ "license": "GPL-3.0", -+ "dependencies": { -+ "@babel/core": "7.18.0", -+ "@babel/eslint-parser": "7.17.0", -+ "@babel/plugin-proposal-object-rest-spread": "7.18.0", -+ "@babel/polyfill": "7.12.1", -+ "@babel/preset-env": "7.18.0", -+ "@electron/remote": "2.0.8", -+ "ansi-html": "0.0.9", -+ "babelify": "10.0.0", -+ "balanced-match": "2.0.0", -+ "bonjour": "github:jean-emmanuel/bonjour", -+ "brace": "0.11.1", -+ "browserify": "17.0.0", -+ "chokidar": "3.5.3", -+ "chroma-js": "2.4.2", -+ "core-js": "3.22.5", -+ "cpr": "3.0.1", -+ "deep-extend": "0.6.0", -+ "electron-localshortcut": "3.2.1", -+ "electron-packager": "15.2.0", -+ "electron-packager-plugin-non-proprietary-codecs-ffmpeg": "1.0.2", -+ "env-paths": "2.2.1", -+ "eslint": "8.16.0", -+ "exorcist": "2.0.0", -+ "fastdom": "1.0.10", -+ "file-saver": "2.0.5", -+ "gyronorm": "2.0.6", -+ "http-auth": "4.1.9", -+ "json5": "2.2.1", -+ "jsondiffpatch": "0.4.1", -+ "keyboardjs": "2.6.4", -+ "licensify": "3.1.3", -+ "loop-protect": "github:jean-emmanuel/loop-protect#v1.0.1", -+ "minimatch": "5.1.0", -+ "nanohtml": "1.10.0", -+ "nanoid": "3.3.4", -+ "nanomorph": "5.4.3", -+ "node-forge": "1.3.1", -+ "node-mouse": "0.0.2", -+ "node-sass": "7.0.1", -+ "nodemon": "2.0.16", -+ "nosleep.js": "0.12.0", -+ "open": "8.4.0", -+ "osc": "github:jean-emmanuel/osc.js", -+ "python-shell": "3.0.1", -+ "replacestream": "4.0.3", -+ "sanitize-html": "1.27.5", -+ "scope-css": "1.2.1", -+ "screenfull": "5.2.0", -+ "semver": "7.3.7", -+ "send": "0.18.0", -+ "sortablejs": "1.15.0", -+ "source-map-support": "0.5.21", -+ "stacktrace-js": "2.0.2", -+ "through": "2.3.8", -+ "uglifyify": "5.0.2", -+ "webworkify": "1.5.0", -+ "ws": "8.6.0", -+ "yargs": "17.5.1" -+ }, -+ "devDependencies": { -+ "watchify": "4.0.0" -+ }, -+ "engines": { -+ "node": "16" -+ } -+ }, -+ "node_modules/@ampproject/remapping": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", -+ "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", -+ "dependencies": { -+ "@jridgewell/gen-mapping": "^0.1.0", -+ "@jridgewell/trace-mapping": "^0.3.9" -+ }, -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/@babel/code-frame": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", -+ "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", -+ "dependencies": { -+ "@babel/highlight": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/compat-data": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz", -+ "integrity": "sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==", -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/core": { -+ "version": "7.18.0", -+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.0.tgz", -+ "integrity": "sha512-Xyw74OlJwDijToNi0+6BBI5mLLR5+5R3bcSH80LXzjzEGEUlvNzujEE71BaD/ApEZHAvFI/Mlmp4M5lIkdeeWw==", -+ "dependencies": { -+ "@ampproject/remapping": "^2.1.0", -+ "@babel/code-frame": "^7.16.7", -+ "@babel/generator": "^7.18.0", -+ "@babel/helper-compilation-targets": "^7.17.10", -+ "@babel/helper-module-transforms": "^7.18.0", -+ "@babel/helpers": "^7.18.0", -+ "@babel/parser": "^7.18.0", -+ "@babel/template": "^7.16.7", -+ "@babel/traverse": "^7.18.0", -+ "@babel/types": "^7.18.0", -+ "convert-source-map": "^1.7.0", -+ "debug": "^4.1.0", -+ "gensync": "^1.0.0-beta.2", -+ "json5": "^2.2.1", -+ "semver": "^6.3.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "funding": { -+ "type": "opencollective", -+ "url": "https://opencollective.com/babel" -+ } -+ }, -+ "node_modules/@babel/core/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/@babel/eslint-parser": { -+ "version": "7.17.0", -+ "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz", -+ "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==", -+ "dependencies": { -+ "eslint-scope": "^5.1.1", -+ "eslint-visitor-keys": "^2.1.0", -+ "semver": "^6.3.0" -+ }, -+ "engines": { -+ "node": "^10.13.0 || ^12.13.0 || >=14.0.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": ">=7.11.0", -+ "eslint": "^7.5.0 || ^8.0.0" -+ } -+ }, -+ "node_modules/@babel/eslint-parser/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/@babel/generator": { -+ "version": "7.20.4", -+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.4.tgz", -+ "integrity": "sha512-luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA==", -+ "dependencies": { -+ "@babel/types": "^7.20.2", -+ "@jridgewell/gen-mapping": "^0.3.2", -+ "jsesc": "^2.5.1" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": { -+ "version": "0.3.2", -+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", -+ "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", -+ "dependencies": { -+ "@jridgewell/set-array": "^1.0.1", -+ "@jridgewell/sourcemap-codec": "^1.4.10", -+ "@jridgewell/trace-mapping": "^0.3.9" -+ }, -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/@babel/helper-annotate-as-pure": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz", -+ "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==", -+ "dependencies": { -+ "@babel/types": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz", -+ "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==", -+ "dependencies": { -+ "@babel/helper-explode-assignable-expression": "^7.18.6", -+ "@babel/types": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-compilation-targets": { -+ "version": "7.20.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz", -+ "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==", -+ "dependencies": { -+ "@babel/compat-data": "^7.20.0", -+ "@babel/helper-validator-option": "^7.18.6", -+ "browserslist": "^4.21.3", -+ "semver": "^6.3.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0" -+ } -+ }, -+ "node_modules/@babel/helper-compilation-targets/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/@babel/helper-create-class-features-plugin": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.2.tgz", -+ "integrity": "sha512-k22GoYRAHPYr9I+Gvy2ZQlAe5mGy8BqWst2wRt8cwIufWTxrsVshhIBvYNqC80N0GSFWTsqRVexOtfzlgOEDvA==", -+ "dependencies": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-function-name": "^7.19.0", -+ "@babel/helper-member-expression-to-functions": "^7.18.9", -+ "@babel/helper-optimise-call-expression": "^7.18.6", -+ "@babel/helper-replace-supers": "^7.19.1", -+ "@babel/helper-split-export-declaration": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0" -+ } -+ }, -+ "node_modules/@babel/helper-create-regexp-features-plugin": { -+ "version": "7.19.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz", -+ "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==", -+ "dependencies": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "regexpu-core": "^5.1.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0" -+ } -+ }, -+ "node_modules/@babel/helper-define-polyfill-provider": { -+ "version": "0.3.3", -+ "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz", -+ "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==", -+ "dependencies": { -+ "@babel/helper-compilation-targets": "^7.17.7", -+ "@babel/helper-plugin-utils": "^7.16.7", -+ "debug": "^4.1.1", -+ "lodash.debounce": "^4.0.8", -+ "resolve": "^1.14.2", -+ "semver": "^6.1.2" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.4.0-0" -+ } -+ }, -+ "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/@babel/helper-environment-visitor": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", -+ "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-explode-assignable-expression": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz", -+ "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==", -+ "dependencies": { -+ "@babel/types": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-function-name": { -+ "version": "7.19.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", -+ "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", -+ "dependencies": { -+ "@babel/template": "^7.18.10", -+ "@babel/types": "^7.19.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-hoist-variables": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", -+ "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", -+ "dependencies": { -+ "@babel/types": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-member-expression-to-functions": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz", -+ "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==", -+ "dependencies": { -+ "@babel/types": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-module-imports": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", -+ "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", -+ "dependencies": { -+ "@babel/types": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-module-transforms": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz", -+ "integrity": "sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==", -+ "dependencies": { -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-module-imports": "^7.18.6", -+ "@babel/helper-simple-access": "^7.20.2", -+ "@babel/helper-split-export-declaration": "^7.18.6", -+ "@babel/helper-validator-identifier": "^7.19.1", -+ "@babel/template": "^7.18.10", -+ "@babel/traverse": "^7.20.1", -+ "@babel/types": "^7.20.2" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-optimise-call-expression": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz", -+ "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==", -+ "dependencies": { -+ "@babel/types": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-plugin-utils": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", -+ "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==", -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-remap-async-to-generator": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz", -+ "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==", -+ "dependencies": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-wrap-function": "^7.18.9", -+ "@babel/types": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0" -+ } -+ }, -+ "node_modules/@babel/helper-replace-supers": { -+ "version": "7.19.1", -+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz", -+ "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==", -+ "dependencies": { -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-member-expression-to-functions": "^7.18.9", -+ "@babel/helper-optimise-call-expression": "^7.18.6", -+ "@babel/traverse": "^7.19.1", -+ "@babel/types": "^7.19.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-simple-access": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", -+ "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", -+ "dependencies": { -+ "@babel/types": "^7.20.2" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-skip-transparent-expression-wrappers": { -+ "version": "7.20.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz", -+ "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==", -+ "dependencies": { -+ "@babel/types": "^7.20.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-split-export-declaration": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", -+ "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", -+ "dependencies": { -+ "@babel/types": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-string-parser": { -+ "version": "7.19.4", -+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", -+ "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-validator-identifier": { -+ "version": "7.19.1", -+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", -+ "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-validator-option": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", -+ "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==", -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helper-wrap-function": { -+ "version": "7.19.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz", -+ "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==", -+ "dependencies": { -+ "@babel/helper-function-name": "^7.19.0", -+ "@babel/template": "^7.18.10", -+ "@babel/traverse": "^7.19.0", -+ "@babel/types": "^7.19.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/helpers": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.1.tgz", -+ "integrity": "sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==", -+ "dependencies": { -+ "@babel/template": "^7.18.10", -+ "@babel/traverse": "^7.20.1", -+ "@babel/types": "^7.20.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/highlight": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", -+ "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", -+ "dependencies": { -+ "@babel/helper-validator-identifier": "^7.18.6", -+ "chalk": "^2.0.0", -+ "js-tokens": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/parser": { -+ "version": "7.20.3", -+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.3.tgz", -+ "integrity": "sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==", -+ "bin": { -+ "parser": "bin/babel-parser.js" -+ }, -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz", -+ "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0" -+ } -+ }, -+ "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz", -+ "integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9", -+ "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9", -+ "@babel/plugin-proposal-optional-chaining": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.13.0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-async-generator-functions": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz", -+ "integrity": "sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==", -+ "dependencies": { -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-plugin-utils": "^7.19.0", -+ "@babel/helper-remap-async-to-generator": "^7.18.9", -+ "@babel/plugin-syntax-async-generators": "^7.8.4" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-class-properties": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz", -+ "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==", -+ "dependencies": { -+ "@babel/helper-create-class-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-class-static-block": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz", -+ "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==", -+ "dependencies": { -+ "@babel/helper-create-class-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-class-static-block": "^7.14.5" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.12.0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-dynamic-import": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz", -+ "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-dynamic-import": "^7.8.3" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-export-namespace-from": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz", -+ "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9", -+ "@babel/plugin-syntax-export-namespace-from": "^7.8.3" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-json-strings": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz", -+ "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-json-strings": "^7.8.3" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-logical-assignment-operators": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz", -+ "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9", -+ "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz", -+ "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-numeric-separator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz", -+ "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-numeric-separator": "^7.10.4" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-object-rest-spread": { -+ "version": "7.18.0", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz", -+ "integrity": "sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==", -+ "dependencies": { -+ "@babel/compat-data": "^7.17.10", -+ "@babel/helper-compilation-targets": "^7.17.10", -+ "@babel/helper-plugin-utils": "^7.17.12", -+ "@babel/plugin-syntax-object-rest-spread": "^7.8.3", -+ "@babel/plugin-transform-parameters": "^7.17.12" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-optional-catch-binding": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz", -+ "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-optional-chaining": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz", -+ "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9", -+ "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9", -+ "@babel/plugin-syntax-optional-chaining": "^7.8.3" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-private-methods": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz", -+ "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==", -+ "dependencies": { -+ "@babel/helper-create-class-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-private-property-in-object": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz", -+ "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==", -+ "dependencies": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "@babel/helper-create-class-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-proposal-unicode-property-regex": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz", -+ "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==", -+ "dependencies": { -+ "@babel/helper-create-regexp-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=4" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-async-generators": { -+ "version": "7.8.4", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", -+ "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-class-properties": { -+ "version": "7.12.13", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", -+ "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.12.13" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-class-static-block": { -+ "version": "7.14.5", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", -+ "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.14.5" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-dynamic-import": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", -+ "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-export-namespace-from": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", -+ "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.8.3" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-import-assertions": { -+ "version": "7.20.0", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz", -+ "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.19.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-json-strings": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", -+ "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-logical-assignment-operators": { -+ "version": "7.10.4", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", -+ "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.10.4" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", -+ "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-numeric-separator": { -+ "version": "7.10.4", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", -+ "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.10.4" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-object-rest-spread": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", -+ "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-optional-catch-binding": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", -+ "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-optional-chaining": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", -+ "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-private-property-in-object": { -+ "version": "7.14.5", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", -+ "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.14.5" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-syntax-top-level-await": { -+ "version": "7.14.5", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", -+ "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.14.5" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-arrow-functions": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz", -+ "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-async-to-generator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz", -+ "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==", -+ "dependencies": { -+ "@babel/helper-module-imports": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/helper-remap-async-to-generator": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-block-scoped-functions": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz", -+ "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-block-scoping": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz", -+ "integrity": "sha512-y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.20.2" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-classes": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz", -+ "integrity": "sha512-9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g==", -+ "dependencies": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "@babel/helper-compilation-targets": "^7.20.0", -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-function-name": "^7.19.0", -+ "@babel/helper-optimise-call-expression": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.20.2", -+ "@babel/helper-replace-supers": "^7.19.1", -+ "@babel/helper-split-export-declaration": "^7.18.6", -+ "globals": "^11.1.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-computed-properties": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz", -+ "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-destructuring": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz", -+ "integrity": "sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.20.2" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-dotall-regex": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz", -+ "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==", -+ "dependencies": { -+ "@babel/helper-create-regexp-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-duplicate-keys": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz", -+ "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-exponentiation-operator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz", -+ "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==", -+ "dependencies": { -+ "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-for-of": { -+ "version": "7.18.8", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz", -+ "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-function-name": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz", -+ "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==", -+ "dependencies": { -+ "@babel/helper-compilation-targets": "^7.18.9", -+ "@babel/helper-function-name": "^7.18.9", -+ "@babel/helper-plugin-utils": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-literals": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz", -+ "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-member-expression-literals": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz", -+ "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-modules-amd": { -+ "version": "7.19.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz", -+ "integrity": "sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==", -+ "dependencies": { -+ "@babel/helper-module-transforms": "^7.19.6", -+ "@babel/helper-plugin-utils": "^7.19.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-modules-commonjs": { -+ "version": "7.19.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz", -+ "integrity": "sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==", -+ "dependencies": { -+ "@babel/helper-module-transforms": "^7.19.6", -+ "@babel/helper-plugin-utils": "^7.19.0", -+ "@babel/helper-simple-access": "^7.19.4" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-modules-systemjs": { -+ "version": "7.19.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz", -+ "integrity": "sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==", -+ "dependencies": { -+ "@babel/helper-hoist-variables": "^7.18.6", -+ "@babel/helper-module-transforms": "^7.19.6", -+ "@babel/helper-plugin-utils": "^7.19.0", -+ "@babel/helper-validator-identifier": "^7.19.1" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-modules-umd": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz", -+ "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==", -+ "dependencies": { -+ "@babel/helper-module-transforms": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { -+ "version": "7.19.1", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz", -+ "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==", -+ "dependencies": { -+ "@babel/helper-create-regexp-features-plugin": "^7.19.0", -+ "@babel/helper-plugin-utils": "^7.19.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-new-target": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz", -+ "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-object-super": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz", -+ "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/helper-replace-supers": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-parameters": { -+ "version": "7.20.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.3.tgz", -+ "integrity": "sha512-oZg/Fpx0YDrj13KsLyO8I/CX3Zdw7z0O9qOd95SqcoIzuqy/WTGWvePeHAnZCN54SfdyjHcb1S30gc8zlzlHcA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.20.2" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-property-literals": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz", -+ "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-regenerator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz", -+ "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "regenerator-transform": "^0.15.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-reserved-words": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz", -+ "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-shorthand-properties": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz", -+ "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-spread": { -+ "version": "7.19.0", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz", -+ "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.19.0", -+ "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-sticky-regex": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz", -+ "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-template-literals": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz", -+ "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-typeof-symbol": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz", -+ "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-unicode-escapes": { -+ "version": "7.18.10", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz", -+ "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/plugin-transform-unicode-regex": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz", -+ "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==", -+ "dependencies": { -+ "@babel/helper-create-regexp-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/polyfill": { -+ "version": "7.12.1", -+ "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz", -+ "integrity": "sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==", -+ "deprecated": "🚨 This package has been deprecated in favor of separate inclusion of a polyfill and regenerator-runtime (when needed). See the @babel/polyfill docs (https://babeljs.io/docs/en/babel-polyfill) for more information.", -+ "dependencies": { -+ "core-js": "^2.6.5", -+ "regenerator-runtime": "^0.13.4" -+ } -+ }, -+ "node_modules/@babel/polyfill/node_modules/core-js": { -+ "version": "2.6.12", -+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", -+ "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", -+ "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.", -+ "hasInstallScript": true -+ }, -+ "node_modules/@babel/preset-env": { -+ "version": "7.18.0", -+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.0.tgz", -+ "integrity": "sha512-cP74OMs7ECLPeG1reiCQ/D/ypyOxgfm8uR6HRYV23vTJ7Lu1nbgj9DQDo/vH59gnn7GOAwtTDPPYV4aXzsMKHA==", -+ "dependencies": { -+ "@babel/compat-data": "^7.17.10", -+ "@babel/helper-compilation-targets": "^7.17.10", -+ "@babel/helper-plugin-utils": "^7.17.12", -+ "@babel/helper-validator-option": "^7.16.7", -+ "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.17.12", -+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.17.12", -+ "@babel/plugin-proposal-async-generator-functions": "^7.17.12", -+ "@babel/plugin-proposal-class-properties": "^7.17.12", -+ "@babel/plugin-proposal-class-static-block": "^7.18.0", -+ "@babel/plugin-proposal-dynamic-import": "^7.16.7", -+ "@babel/plugin-proposal-export-namespace-from": "^7.17.12", -+ "@babel/plugin-proposal-json-strings": "^7.17.12", -+ "@babel/plugin-proposal-logical-assignment-operators": "^7.17.12", -+ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12", -+ "@babel/plugin-proposal-numeric-separator": "^7.16.7", -+ "@babel/plugin-proposal-object-rest-spread": "^7.18.0", -+ "@babel/plugin-proposal-optional-catch-binding": "^7.16.7", -+ "@babel/plugin-proposal-optional-chaining": "^7.17.12", -+ "@babel/plugin-proposal-private-methods": "^7.17.12", -+ "@babel/plugin-proposal-private-property-in-object": "^7.17.12", -+ "@babel/plugin-proposal-unicode-property-regex": "^7.17.12", -+ "@babel/plugin-syntax-async-generators": "^7.8.4", -+ "@babel/plugin-syntax-class-properties": "^7.12.13", -+ "@babel/plugin-syntax-class-static-block": "^7.14.5", -+ "@babel/plugin-syntax-dynamic-import": "^7.8.3", -+ "@babel/plugin-syntax-export-namespace-from": "^7.8.3", -+ "@babel/plugin-syntax-import-assertions": "^7.17.12", -+ "@babel/plugin-syntax-json-strings": "^7.8.3", -+ "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", -+ "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", -+ "@babel/plugin-syntax-numeric-separator": "^7.10.4", -+ "@babel/plugin-syntax-object-rest-spread": "^7.8.3", -+ "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", -+ "@babel/plugin-syntax-optional-chaining": "^7.8.3", -+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5", -+ "@babel/plugin-syntax-top-level-await": "^7.14.5", -+ "@babel/plugin-transform-arrow-functions": "^7.17.12", -+ "@babel/plugin-transform-async-to-generator": "^7.17.12", -+ "@babel/plugin-transform-block-scoped-functions": "^7.16.7", -+ "@babel/plugin-transform-block-scoping": "^7.17.12", -+ "@babel/plugin-transform-classes": "^7.17.12", -+ "@babel/plugin-transform-computed-properties": "^7.17.12", -+ "@babel/plugin-transform-destructuring": "^7.18.0", -+ "@babel/plugin-transform-dotall-regex": "^7.16.7", -+ "@babel/plugin-transform-duplicate-keys": "^7.17.12", -+ "@babel/plugin-transform-exponentiation-operator": "^7.16.7", -+ "@babel/plugin-transform-for-of": "^7.17.12", -+ "@babel/plugin-transform-function-name": "^7.16.7", -+ "@babel/plugin-transform-literals": "^7.17.12", -+ "@babel/plugin-transform-member-expression-literals": "^7.16.7", -+ "@babel/plugin-transform-modules-amd": "^7.18.0", -+ "@babel/plugin-transform-modules-commonjs": "^7.18.0", -+ "@babel/plugin-transform-modules-systemjs": "^7.18.0", -+ "@babel/plugin-transform-modules-umd": "^7.18.0", -+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.17.12", -+ "@babel/plugin-transform-new-target": "^7.17.12", -+ "@babel/plugin-transform-object-super": "^7.16.7", -+ "@babel/plugin-transform-parameters": "^7.17.12", -+ "@babel/plugin-transform-property-literals": "^7.16.7", -+ "@babel/plugin-transform-regenerator": "^7.18.0", -+ "@babel/plugin-transform-reserved-words": "^7.17.12", -+ "@babel/plugin-transform-shorthand-properties": "^7.16.7", -+ "@babel/plugin-transform-spread": "^7.17.12", -+ "@babel/plugin-transform-sticky-regex": "^7.16.7", -+ "@babel/plugin-transform-template-literals": "^7.17.12", -+ "@babel/plugin-transform-typeof-symbol": "^7.17.12", -+ "@babel/plugin-transform-unicode-escapes": "^7.16.7", -+ "@babel/plugin-transform-unicode-regex": "^7.16.7", -+ "@babel/preset-modules": "^0.1.5", -+ "@babel/types": "^7.18.0", -+ "babel-plugin-polyfill-corejs2": "^0.3.0", -+ "babel-plugin-polyfill-corejs3": "^0.5.0", -+ "babel-plugin-polyfill-regenerator": "^0.3.0", -+ "core-js-compat": "^3.22.1", -+ "semver": "^6.3.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/preset-env/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/@babel/preset-modules": { -+ "version": "0.1.5", -+ "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz", -+ "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==", -+ "dependencies": { -+ "@babel/helper-plugin-utils": "^7.0.0", -+ "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", -+ "@babel/plugin-transform-dotall-regex": "^7.4.4", -+ "@babel/types": "^7.4.4", -+ "esutils": "^2.0.2" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/runtime": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz", -+ "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==", -+ "dependencies": { -+ "regenerator-runtime": "^0.13.10" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/template": { -+ "version": "7.18.10", -+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", -+ "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", -+ "dependencies": { -+ "@babel/code-frame": "^7.18.6", -+ "@babel/parser": "^7.18.10", -+ "@babel/types": "^7.18.10" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/traverse": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz", -+ "integrity": "sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==", -+ "dependencies": { -+ "@babel/code-frame": "^7.18.6", -+ "@babel/generator": "^7.20.1", -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-function-name": "^7.19.0", -+ "@babel/helper-hoist-variables": "^7.18.6", -+ "@babel/helper-split-export-declaration": "^7.18.6", -+ "@babel/parser": "^7.20.1", -+ "@babel/types": "^7.20.0", -+ "debug": "^4.1.0", -+ "globals": "^11.1.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/types": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz", -+ "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==", -+ "dependencies": { -+ "@babel/helper-string-parser": "^7.19.4", -+ "@babel/helper-validator-identifier": "^7.19.1", -+ "to-fast-properties": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@electron/get": { -+ "version": "1.14.1", -+ "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.14.1.tgz", -+ "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" -+ }, -+ "engines": { -+ "node": ">=8.6" -+ }, -+ "optionalDependencies": { -+ "global-agent": "^3.0.0", -+ "global-tunnel-ng": "^2.7.1" -+ } -+ }, -+ "node_modules/@electron/get/node_modules/fs-extra": { -+ "version": "8.1.0", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", -+ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", -+ "dependencies": { -+ "graceful-fs": "^4.2.0", -+ "jsonfile": "^4.0.0", -+ "universalify": "^0.1.0" -+ }, -+ "engines": { -+ "node": ">=6 <7 || >=8" -+ } -+ }, -+ "node_modules/@electron/get/node_modules/jsonfile": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", -+ "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", -+ "optionalDependencies": { -+ "graceful-fs": "^4.1.6" -+ } -+ }, -+ "node_modules/@electron/get/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/@electron/get/node_modules/universalify": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", -+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", -+ "engines": { -+ "node": ">= 4.0.0" -+ } -+ }, -+ "node_modules/@electron/remote": { -+ "version": "2.0.8", -+ "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.0.8.tgz", -+ "integrity": "sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw==", -+ "peerDependencies": { -+ "electron": ">= 13.0.0" -+ } -+ }, -+ "node_modules/@eslint/eslintrc": { -+ "version": "1.3.3", -+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz", -+ "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==", -+ "dependencies": { -+ "ajv": "^6.12.4", -+ "debug": "^4.3.2", -+ "espree": "^9.4.0", -+ "globals": "^13.15.0", -+ "ignore": "^5.2.0", -+ "import-fresh": "^3.2.1", -+ "js-yaml": "^4.1.0", -+ "minimatch": "^3.1.2", -+ "strip-json-comments": "^3.1.1" -+ }, -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/eslint" -+ } -+ }, -+ "node_modules/@eslint/eslintrc/node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "node_modules/@eslint/eslintrc/node_modules/globals": { -+ "version": "13.17.0", -+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", -+ "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", -+ "dependencies": { -+ "type-fest": "^0.20.2" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/@eslint/eslintrc/node_modules/minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/@eslint/eslintrc/node_modules/type-fest": { -+ "version": "0.20.2", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", -+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/@gar/promisify": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", -+ "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==" -+ }, -+ "node_modules/@humanwhocodes/config-array": { -+ "version": "0.9.5", -+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", -+ "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==", -+ "dependencies": { -+ "@humanwhocodes/object-schema": "^1.2.1", -+ "debug": "^4.1.1", -+ "minimatch": "^3.0.4" -+ }, -+ "engines": { -+ "node": ">=10.10.0" -+ } -+ }, -+ "node_modules/@humanwhocodes/config-array/node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/@humanwhocodes/object-schema": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", -+ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==" -+ }, -+ "node_modules/@jridgewell/gen-mapping": { -+ "version": "0.1.1", -+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", -+ "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", -+ "dependencies": { -+ "@jridgewell/set-array": "^1.0.0", -+ "@jridgewell/sourcemap-codec": "^1.4.10" -+ }, -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/@jridgewell/resolve-uri": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", -+ "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/@jridgewell/set-array": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", -+ "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/@jridgewell/sourcemap-codec": { -+ "version": "1.4.14", -+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", -+ "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" -+ }, -+ "node_modules/@jridgewell/trace-mapping": { -+ "version": "0.3.17", -+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", -+ "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", -+ "dependencies": { -+ "@jridgewell/resolve-uri": "3.1.0", -+ "@jridgewell/sourcemap-codec": "1.4.14" -+ } -+ }, -+ "node_modules/@npmcli/fs": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz", -+ "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==", -+ "dependencies": { -+ "@gar/promisify": "^1.0.1", -+ "semver": "^7.3.5" -+ } -+ }, -+ "node_modules/@npmcli/move-file": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", -+ "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", -+ "deprecated": "This functionality has been moved to @npmcli/fs", -+ "dependencies": { -+ "mkdirp": "^1.0.4", -+ "rimraf": "^3.0.2" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/@npmcli/move-file/node_modules/mkdirp": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", -+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", -+ "bin": { -+ "mkdirp": "bin/cmd.js" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/@npmcli/move-file/node_modules/rimraf": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", -+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", -+ "dependencies": { -+ "glob": "^7.1.3" -+ }, -+ "bin": { -+ "rimraf": "bin.js" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/isaacs" -+ } -+ }, -+ "node_modules/@serialport/binding-abstract": { -+ "version": "9.2.4", -+ "resolved": "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.2.4.tgz", -+ "integrity": "sha512-UESvncat2oQKnAp29eDVJ2jB9sADatCgoojPPB4RVvp3+3Wqu5QVEh/UCjHRUeDJ20fkSFnKAw9D0vNoBQ+5Kw==", -+ "deprecated": "This package has been renamed to @serialport/bindings-interface", -+ "optional": true, -+ "dependencies": { -+ "debug": "^4.3.2" -+ }, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/binding-mock": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-9.0.7.tgz", -+ "integrity": "sha512-aR8H+htZwwZZkVb1MdbnNvGWw8eXVRqQ2qPhkbKyx0N/LY5aVIgCgT98Kt1YylLsG7SzNG+Jbhd4wzwEuPVT5Q==", -+ "optional": true, -+ "dependencies": { -+ "@serialport/binding-abstract": "^9.0.7", -+ "debug": "^4.3.1" -+ }, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/bindings": { -+ "version": "9.2.9", -+ "resolved": "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.2.9.tgz", -+ "integrity": "sha512-An7PiVlyNMx/0RDnSBxFHIsd4kt0/zPlDALlTjhVQKXbG6e0xRqLKbkoZVzHMS8rg7HzCu8G1nplifoAwNm5Lg==", -+ "deprecated": "This package has been renamed to @serialport/bindings-cpp.", -+ "hasInstallScript": true, -+ "optional": true, -+ "dependencies": { -+ "@serialport/binding-abstract": "9.2.3", -+ "@serialport/parser-readline": "9.2.4", -+ "bindings": "^1.5.0", -+ "debug": "^4.3.2", -+ "nan": "^2.15.0", -+ "prebuild-install": "^7.0.0" -+ }, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/bindings/node_modules/@serialport/binding-abstract": { -+ "version": "9.2.3", -+ "resolved": "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.2.3.tgz", -+ "integrity": "sha512-cQs9tbIlG3P0IrOWyVirqlhWuJ7Ms2Zh9m2108z6Y5UW/iVj6wEOiW8EmK9QX9jmJXYllE7wgGgvVozP5oCj3w==", -+ "optional": true, -+ "dependencies": { -+ "debug": "^4.3.2" -+ }, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/bindings/node_modules/@serialport/parser-delimiter": { -+ "version": "9.2.4", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-9.2.4.tgz", -+ "integrity": "sha512-4nvTAoYAgkxFiXrkI+3CA49Yd43CODjeszh89EK+I9c8wOZ+etZduRCzINYPiy26g7zO+GRAb9FoPCsY+sYcbQ==", -+ "optional": true, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/bindings/node_modules/@serialport/parser-readline": { -+ "version": "9.2.4", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-9.2.4.tgz", -+ "integrity": "sha512-Z1/qrZTQUVhNSJP1hd9YfDvq0o7d87rNwAjjRKbVpa7Qi51tG5BnKt43IV3NFMyBlVcRe0rnIb3tJu57E0SOwg==", -+ "optional": true, -+ "dependencies": { -+ "@serialport/parser-delimiter": "9.2.4" -+ }, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/parser-byte-length": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-9.0.7.tgz", -+ "integrity": "sha512-evf7oOOSBMBn2AZZbgBFMRIyEzlsyQkhqaPm7IBCPTxMDXRf4tKkFYJHYZB0/6d1W4eI0meH079UqmSsh/uoDA==", -+ "optional": true, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/parser-cctalk": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-9.0.7.tgz", -+ "integrity": "sha512-ert5jhMkeiTfr44TkbdySC09J8UwAsf/RxBucVN5Mz5enG509RggnkfFi4mfj3UCG2vZ7qsmM6gtZ62DshY02Q==", -+ "optional": true, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/parser-delimiter": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-9.0.7.tgz", -+ "integrity": "sha512-Vb2NPeXPZ/28M4m5x4OAHFd8jRAeddNCgvL+Q+H/hqFPY1w47JcMLchC7pigRW8Cnt1fklmzfwdNQ8Fb+kMkxQ==", -+ "optional": true, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/parser-inter-byte-timeout": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-9.0.7.tgz", -+ "integrity": "sha512-lUZ3cwgUluBvJ1jf+0LQsqoiPYAokDO6+fRCw9HCfnrF/OS60Gm4rxuyo2uQIueqZkJ7NIFP+ibKsULrA47AEA==", -+ "optional": true, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/parser-readline": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-9.0.7.tgz", -+ "integrity": "sha512-ydoLbgVQQPxWrwbe3Fhh4XnZexbkEQAC6M/qgRTzjnKvTjrD61CJNxLc3vyDaAPI9bJIhTiI7eTX3JB5jJv8Hg==", -+ "optional": true, -+ "dependencies": { -+ "@serialport/parser-delimiter": "^9.0.7" -+ }, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/parser-ready": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-9.0.7.tgz", -+ "integrity": "sha512-3qYhI4cNUPAYqVYvdwV57Y+PVRl4dJf1fPBtMoWtwDgwopsAXTR93WCs49WuUq9JCyNW+8Hrfqv8x8eNAD5Dqg==", -+ "optional": true, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/parser-regex": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-9.0.7.tgz", -+ "integrity": "sha512-5XF+FXbhqQ/5bVKM4NaGs1m+E9KjfmeCx/obwsKaUZognQF67jwoTfjJJWNP/21jKfxdl8XoCYjZjASl3XKRAw==", -+ "optional": true, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@serialport/stream": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/stream/-/stream-9.0.7.tgz", -+ "integrity": "sha512-c/h7HPAeFiryD9iTGlaSvPqHFHSZ0NMQHxC4rcmKS2Vu3qJuEtkBdTLABwsMp7iWEiSnI4KC3s7bHapaXP06FQ==", -+ "optional": true, -+ "dependencies": { -+ "debug": "^4.3.1" -+ }, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/@sindresorhus/is": { -+ "version": "0.14.0", -+ "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", -+ "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/@szmarczak/http-timer": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", -+ "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", -+ "dependencies": { -+ "defer-to-connect": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/@tootallnate/once": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", -+ "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/@types/glob": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", -+ "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", -+ "optional": true, -+ "dependencies": { -+ "@types/minimatch": "*", -+ "@types/node": "*" -+ } -+ }, -+ "node_modules/@types/minimatch": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", -+ "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", -+ "optional": true -+ }, -+ "node_modules/@types/minimist": { -+ "version": "1.2.2", -+ "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", -+ "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==" -+ }, -+ "node_modules/@types/node": { -+ "version": "18.11.9", -+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz", -+ "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==", -+ "optional": true -+ }, -+ "node_modules/@types/normalize-package-data": { -+ "version": "2.4.1", -+ "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz", -+ "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==" -+ }, -+ "node_modules/@types/yauzl": { -+ "version": "2.10.0", -+ "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", -+ "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", -+ "optional": true, -+ "dependencies": { -+ "@types/node": "*" -+ } -+ }, -+ "node_modules/7zip": { -+ "version": "0.0.6", -+ "resolved": "https://registry.npmjs.org/7zip/-/7zip-0.0.6.tgz", -+ "integrity": "sha512-ns8vKbKhIQm338AeWo/YdDSWil3pldwCMoyR2npoM2qDAzF8Vuko8BtDxpNt/wE15SXOh5K5WbjSLR4kTOAHLA==", -+ "bin": { -+ "7z": "7zip-lite/7z.exe" -+ } -+ }, -+ "node_modules/abbrev": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", -+ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" -+ }, -+ "node_modules/acorn": { -+ "version": "8.8.1", -+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", -+ "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", -+ "bin": { -+ "acorn": "bin/acorn" -+ }, -+ "engines": { -+ "node": ">=0.4.0" -+ } -+ }, -+ "node_modules/acorn-jsx": { -+ "version": "5.3.2", -+ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", -+ "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", -+ "peerDependencies": { -+ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" -+ } -+ }, -+ "node_modules/acorn-node": { -+ "version": "1.8.2", -+ "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz", -+ "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==", -+ "dependencies": { -+ "acorn": "^7.0.0", -+ "acorn-walk": "^7.0.0", -+ "xtend": "^4.0.2" -+ } -+ }, -+ "node_modules/acorn-node/node_modules/acorn": { -+ "version": "7.4.1", -+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", -+ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", -+ "bin": { -+ "acorn": "bin/acorn" -+ }, -+ "engines": { -+ "node": ">=0.4.0" -+ } -+ }, -+ "node_modules/acorn-walk": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", -+ "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", -+ "engines": { -+ "node": ">=0.4.0" -+ } -+ }, -+ "node_modules/agent-base": { -+ "version": "6.0.2", -+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", -+ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", -+ "dependencies": { -+ "debug": "4" -+ }, -+ "engines": { -+ "node": ">= 6.0.0" -+ } -+ }, -+ "node_modules/agentkeepalive": { -+ "version": "4.2.1", -+ "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz", -+ "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==", -+ "dependencies": { -+ "debug": "^4.1.0", -+ "depd": "^1.1.2", -+ "humanize-ms": "^1.2.1" -+ }, -+ "engines": { -+ "node": ">= 8.0.0" -+ } -+ }, -+ "node_modules/aggregate-error": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", -+ "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", -+ "dependencies": { -+ "clean-stack": "^2.0.0", -+ "indent-string": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/ajv": { -+ "version": "6.12.6", -+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", -+ "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" -+ }, -+ "funding": { -+ "type": "github", -+ "url": "https://github.com/sponsors/epoberezkin" -+ } -+ }, -+ "node_modules/ansi-align": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", -+ "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", -+ "dependencies": { -+ "string-width": "^4.1.0" -+ } -+ }, -+ "node_modules/ansi-html": { -+ "version": "0.0.9", -+ "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.9.tgz", -+ "integrity": "sha512-ozbS3LuenHVxNRh/wdnN16QapUHzauqSomAl1jwwJRRsGwFwtj644lIhxfWu0Fy0acCij2+AEgHvjscq3dlVXg==", -+ "engines": [ -+ "node >= 0.8.0" -+ ], -+ "bin": { -+ "ansi-html": "bin/ansi-html" -+ } -+ }, -+ "node_modules/ansi-regex": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", -+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/ansi-styles": { -+ "version": "3.2.1", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", -+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", -+ "dependencies": { -+ "color-convert": "^1.9.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/anymatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", -+ "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", -+ "dependencies": { -+ "normalize-path": "^3.0.0", -+ "picomatch": "^2.0.4" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/apache-crypt": { -+ "version": "1.2.6", -+ "resolved": "https://registry.npmjs.org/apache-crypt/-/apache-crypt-1.2.6.tgz", -+ "integrity": "sha512-072WetlM4blL8PREJVeY+WHiUh1R5VNt2HfceGS8aKqttPHcmqE5pkKuXPz/ULmJOFkc8Hw3kfKl6vy7Qka6DA==", -+ "dependencies": { -+ "unix-crypt-td-js": "^1.1.4" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/apache-md5": { -+ "version": "1.1.8", -+ "resolved": "https://registry.npmjs.org/apache-md5/-/apache-md5-1.1.8.tgz", -+ "integrity": "sha512-FCAJojipPn0bXjuEpjOOOMN8FZDkxfWWp4JGN9mifU2IhxvKyXZYqpzPHdnTSUpmPDy+tsslB6Z1g+Vg6nVbYA==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/aproba": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", -+ "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==" -+ }, -+ "node_modules/are-we-there-yet": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", -+ "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", -+ "dependencies": { -+ "delegates": "^1.0.0", -+ "readable-stream": "^3.6.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/are-we-there-yet/node_modules/readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/argparse": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", -+ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" -+ }, -+ "node_modules/array-flatten": { -+ "version": "2.1.2", -+ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", -+ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==" -+ }, -+ "node_modules/arrify": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", -+ "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/asar": { -+ "version": "3.2.0", -+ "resolved": "https://registry.npmjs.org/asar/-/asar-3.2.0.tgz", -+ "integrity": "sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg==", -+ "deprecated": "Please use @electron/asar moving forward. There is no API change, just a package name change", -+ "dependencies": { -+ "chromium-pickle-js": "^0.2.0", -+ "commander": "^5.0.0", -+ "glob": "^7.1.6", -+ "minimatch": "^3.0.4" -+ }, -+ "bin": { -+ "asar": "bin/asar.js" -+ }, -+ "engines": { -+ "node": ">=10.12.0" -+ }, -+ "optionalDependencies": { -+ "@types/glob": "^7.1.1" -+ } -+ }, -+ "node_modules/asar/node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/asar/node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "node_modules/asar/node_modules/minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/asn1": { -+ "version": "0.2.6", -+ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", -+ "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", -+ "dependencies": { -+ "safer-buffer": "~2.1.0" -+ } -+ }, -+ "node_modules/asn1.js": { -+ "version": "5.4.1", -+ "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", -+ "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", -+ "dependencies": { -+ "bn.js": "^4.0.0", -+ "inherits": "^2.0.1", -+ "minimalistic-assert": "^1.0.0", -+ "safer-buffer": "^2.1.0" -+ } -+ }, -+ "node_modules/asn1.js/node_modules/bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ }, -+ "node_modules/assert": { -+ "version": "1.5.0", -+ "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", -+ "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", -+ "dependencies": { -+ "object-assign": "^4.1.1", -+ "util": "0.10.3" -+ } -+ }, -+ "node_modules/assert-plus": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", -+ "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", -+ "engines": { -+ "node": ">=0.8" -+ } -+ }, -+ "node_modules/assert/node_modules/inherits": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", -+ "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==" -+ }, -+ "node_modules/assert/node_modules/util": { -+ "version": "0.10.3", -+ "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", -+ "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==", -+ "dependencies": { -+ "inherits": "2.0.1" -+ } -+ }, -+ "node_modules/async-foreach": { -+ "version": "0.1.3", -+ "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", -+ "integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==", -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/asynckit": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", -+ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" -+ }, -+ "node_modules/at-least-node": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", -+ "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", -+ "engines": { -+ "node": ">= 4.0.0" -+ } -+ }, -+ "node_modules/author-regex": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz", -+ "integrity": "sha512-KbWgR8wOYRAPekEmMXrYYdc7BRyhn2Ftk7KWfMUnQ43hFdojWEFRxhhRUm3/OFEdPa1r0KAvTTg9YQK57xTe0g==", -+ "engines": { -+ "node": ">=0.8" -+ } -+ }, -+ "node_modules/available-typed-arrays": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", -+ "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/aws-sign2": { -+ "version": "0.7.0", -+ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", -+ "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==", -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/aws4": { -+ "version": "1.11.0", -+ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", -+ "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" -+ }, -+ "node_modules/babel-plugin-polyfill-corejs2": { -+ "version": "0.3.3", -+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz", -+ "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==", -+ "dependencies": { -+ "@babel/compat-data": "^7.17.7", -+ "@babel/helper-define-polyfill-provider": "^0.3.3", -+ "semver": "^6.1.1" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/babel-plugin-polyfill-corejs3": { -+ "version": "0.5.3", -+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz", -+ "integrity": "sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==", -+ "dependencies": { -+ "@babel/helper-define-polyfill-provider": "^0.3.2", -+ "core-js-compat": "^3.21.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/babel-plugin-polyfill-regenerator": { -+ "version": "0.3.1", -+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz", -+ "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==", -+ "dependencies": { -+ "@babel/helper-define-polyfill-provider": "^0.3.1" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/babelify": { -+ "version": "10.0.0", -+ "resolved": "https://registry.npmjs.org/babelify/-/babelify-10.0.0.tgz", -+ "integrity": "sha512-X40FaxyH7t3X+JFAKvb1H9wooWKLRCi8pg3m8poqtdZaIng+bjzp9RvKQCvRjF9isHiPkXspbbXT/zwXLtwgwg==", -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0" -+ } -+ }, -+ "node_modules/balanced-match": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", -+ "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==" -+ }, -+ "node_modules/base64-js": { -+ "version": "1.5.1", -+ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", -+ "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/feross" -+ }, -+ { -+ "type": "patreon", -+ "url": "https://www.patreon.com/feross" -+ }, -+ { -+ "type": "consulting", -+ "url": "https://feross.org/support" -+ } -+ ] -+ }, -+ "node_modules/bcrypt-pbkdf": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", -+ "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", -+ "dependencies": { -+ "tweetnacl": "^0.14.3" -+ } -+ }, -+ "node_modules/bcryptjs": { -+ "version": "2.4.3", -+ "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz", -+ "integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==" -+ }, -+ "node_modules/binary-extensions": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", -+ "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/bindings": { -+ "version": "1.5.0", -+ "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", -+ "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", -+ "optional": true, -+ "dependencies": { -+ "file-uri-to-path": "1.0.0" -+ } -+ }, -+ "node_modules/bl": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", -+ "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", -+ "optional": true, -+ "dependencies": { -+ "buffer": "^5.5.0", -+ "inherits": "^2.0.4", -+ "readable-stream": "^3.4.0" -+ } -+ }, -+ "node_modules/bl/node_modules/buffer": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", -+ "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/feross" -+ }, -+ { -+ "type": "patreon", -+ "url": "https://www.patreon.com/feross" -+ }, -+ { -+ "type": "consulting", -+ "url": "https://feross.org/support" -+ } -+ ], -+ "optional": true, -+ "dependencies": { -+ "base64-js": "^1.3.1", -+ "ieee754": "^1.1.13" -+ } -+ }, -+ "node_modules/bl/node_modules/readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "optional": true, -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/bluebird": { -+ "version": "3.7.2", -+ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", -+ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" -+ }, -+ "node_modules/bn.js": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", -+ "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" -+ }, -+ "node_modules/bonjour": { -+ "version": "4.0.0", -+ "resolved": "git+ssh://git@github.com/jean-emmanuel/bonjour.git#33d7fa28c568d05cb7ffda1fd2b20f4cc364e273", -+ "license": "MIT", -+ "dependencies": { -+ "array-flatten": "^2.1.0", -+ "deep-equal": "^1.0.1", -+ "dns-equal": "^1.0.0", -+ "dns-txt": "github:jean-emmanuel/dns-txt#v2.0.3", -+ "multicast-dns": "github:jean-emmanuel/multicast-dns", -+ "multicast-dns-service-types": "^1.1.0" -+ } -+ }, -+ "node_modules/boolean": { -+ "version": "3.2.0", -+ "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz", -+ "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==", -+ "optional": true -+ }, -+ "node_modules/boxen": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz", -+ "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" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/boxen/node_modules/ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "dependencies": { -+ "color-convert": "^2.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/ansi-styles?sponsor=1" -+ } -+ }, -+ "node_modules/boxen/node_modules/camelcase": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", -+ "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/boxen/node_modules/chalk": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", -+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -+ "dependencies": { -+ "ansi-styles": "^4.1.0", -+ "supports-color": "^7.1.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/chalk?sponsor=1" -+ } -+ }, -+ "node_modules/boxen/node_modules/color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "dependencies": { -+ "color-name": "~1.1.4" -+ }, -+ "engines": { -+ "node": ">=7.0.0" -+ } -+ }, -+ "node_modules/boxen/node_modules/color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "node_modules/boxen/node_modules/has-flag": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/boxen/node_modules/supports-color": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -+ "dependencies": { -+ "has-flag": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/boxen/node_modules/type-fest": { -+ "version": "0.20.2", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", -+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/brace": { -+ "version": "0.11.1", -+ "resolved": "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz", -+ "integrity": "sha512-Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q==" -+ }, -+ "node_modules/brace-expansion": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", -+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0" -+ } -+ }, -+ "node_modules/brace-expansion/node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/braces": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", -+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", -+ "dependencies": { -+ "fill-range": "^7.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/brorand": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", -+ "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==" -+ }, -+ "node_modules/browser-pack": { -+ "version": "6.1.0", -+ "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz", -+ "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==", -+ "dependencies": { -+ "combine-source-map": "~0.8.0", -+ "defined": "^1.0.0", -+ "JSONStream": "^1.0.3", -+ "safe-buffer": "^5.1.1", -+ "through2": "^2.0.0", -+ "umd": "^3.0.0" -+ }, -+ "bin": { -+ "browser-pack": "bin/cmd.js" -+ } -+ }, -+ "node_modules/browser-process-hrtime": { -+ "version": "0.1.3", -+ "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz", -+ "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==" -+ }, -+ "node_modules/browser-resolve": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz", -+ "integrity": "sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==", -+ "dependencies": { -+ "resolve": "^1.17.0" -+ } -+ }, -+ "node_modules/browserify": { -+ "version": "17.0.0", -+ "resolved": "https://registry.npmjs.org/browserify/-/browserify-17.0.0.tgz", -+ "integrity": "sha512-SaHqzhku9v/j6XsQMRxPyBrSP3gnwmE27gLJYZgMT2GeK3J0+0toN+MnuNYDfHwVGQfLiMZ7KSNSIXHemy905w==", -+ "dependencies": { -+ "assert": "^1.4.0", -+ "browser-pack": "^6.0.1", -+ "browser-resolve": "^2.0.0", -+ "browserify-zlib": "~0.2.0", -+ "buffer": "~5.2.1", -+ "cached-path-relative": "^1.0.0", -+ "concat-stream": "^1.6.0", -+ "console-browserify": "^1.1.0", -+ "constants-browserify": "~1.0.0", -+ "crypto-browserify": "^3.0.0", -+ "defined": "^1.0.0", -+ "deps-sort": "^2.0.1", -+ "domain-browser": "^1.2.0", -+ "duplexer2": "~0.1.2", -+ "events": "^3.0.0", -+ "glob": "^7.1.0", -+ "has": "^1.0.0", -+ "htmlescape": "^1.1.0", -+ "https-browserify": "^1.0.0", -+ "inherits": "~2.0.1", -+ "insert-module-globals": "^7.2.1", -+ "JSONStream": "^1.0.3", -+ "labeled-stream-splicer": "^2.0.0", -+ "mkdirp-classic": "^0.5.2", -+ "module-deps": "^6.2.3", -+ "os-browserify": "~0.3.0", -+ "parents": "^1.0.1", -+ "path-browserify": "^1.0.0", -+ "process": "~0.11.0", -+ "punycode": "^1.3.2", -+ "querystring-es3": "~0.2.0", -+ "read-only-stream": "^2.0.0", -+ "readable-stream": "^2.0.2", -+ "resolve": "^1.1.4", -+ "shasum-object": "^1.0.0", -+ "shell-quote": "^1.6.1", -+ "stream-browserify": "^3.0.0", -+ "stream-http": "^3.0.0", -+ "string_decoder": "^1.1.1", -+ "subarg": "^1.0.0", -+ "syntax-error": "^1.1.1", -+ "through2": "^2.0.0", -+ "timers-browserify": "^1.0.1", -+ "tty-browserify": "0.0.1", -+ "url": "~0.11.0", -+ "util": "~0.12.0", -+ "vm-browserify": "^1.0.0", -+ "xtend": "^4.0.0" -+ }, -+ "bin": { -+ "browserify": "bin/cmd.js" -+ }, -+ "engines": { -+ "node": ">= 0.8" -+ } -+ }, -+ "node_modules/browserify-aes": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", -+ "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", -+ "dependencies": { -+ "buffer-xor": "^1.0.3", -+ "cipher-base": "^1.0.0", -+ "create-hash": "^1.1.0", -+ "evp_bytestokey": "^1.0.3", -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.0.1" -+ } -+ }, -+ "node_modules/browserify-cipher": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", -+ "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", -+ "dependencies": { -+ "browserify-aes": "^1.0.4", -+ "browserify-des": "^1.0.0", -+ "evp_bytestokey": "^1.0.0" -+ } -+ }, -+ "node_modules/browserify-des": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", -+ "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", -+ "dependencies": { -+ "cipher-base": "^1.0.1", -+ "des.js": "^1.0.0", -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.1.2" -+ } -+ }, -+ "node_modules/browserify-rsa": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", -+ "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", -+ "dependencies": { -+ "bn.js": "^5.0.0", -+ "randombytes": "^2.0.1" -+ } -+ }, -+ "node_modules/browserify-sign": { -+ "version": "4.2.1", -+ "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", -+ "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", -+ "dependencies": { -+ "bn.js": "^5.1.1", -+ "browserify-rsa": "^4.0.1", -+ "create-hash": "^1.2.0", -+ "create-hmac": "^1.1.7", -+ "elliptic": "^6.5.3", -+ "inherits": "^2.0.4", -+ "parse-asn1": "^5.1.5", -+ "readable-stream": "^3.6.0", -+ "safe-buffer": "^5.2.0" -+ } -+ }, -+ "node_modules/browserify-sign/node_modules/readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/browserify-zlib": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", -+ "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", -+ "dependencies": { -+ "pako": "~1.0.5" -+ } -+ }, -+ "node_modules/browserslist": { -+ "version": "4.21.4", -+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", -+ "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", -+ "funding": [ -+ { -+ "type": "opencollective", -+ "url": "https://opencollective.com/browserslist" -+ }, -+ { -+ "type": "tidelift", -+ "url": "https://tidelift.com/funding/github/npm/browserslist" -+ } -+ ], -+ "dependencies": { -+ "caniuse-lite": "^1.0.30001400", -+ "electron-to-chromium": "^1.4.251", -+ "node-releases": "^2.0.6", -+ "update-browserslist-db": "^1.0.9" -+ }, -+ "bin": { -+ "browserslist": "cli.js" -+ }, -+ "engines": { -+ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" -+ } -+ }, -+ "node_modules/buffer": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz", -+ "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==", -+ "dependencies": { -+ "base64-js": "^1.0.2", -+ "ieee754": "^1.1.4" -+ } -+ }, -+ "node_modules/buffer-alloc": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", -+ "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", -+ "dependencies": { -+ "buffer-alloc-unsafe": "^1.1.0", -+ "buffer-fill": "^1.0.0" -+ } -+ }, -+ "node_modules/buffer-alloc-unsafe": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", -+ "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==" -+ }, -+ "node_modules/buffer-crc32": { -+ "version": "0.2.13", -+ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", -+ "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/buffer-fill": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", -+ "integrity": "sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==" -+ }, -+ "node_modules/buffer-from": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", -+ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" -+ }, -+ "node_modules/buffer-indexof": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", -+ "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==" -+ }, -+ "node_modules/buffer-xor": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", -+ "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==" -+ }, -+ "node_modules/builtin-status-codes": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", -+ "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==" -+ }, -+ "node_modules/cacache": { -+ "version": "15.3.0", -+ "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", -+ "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==", -+ "dependencies": { -+ "@npmcli/fs": "^1.0.0", -+ "@npmcli/move-file": "^1.0.1", -+ "chownr": "^2.0.0", -+ "fs-minipass": "^2.0.0", -+ "glob": "^7.1.4", -+ "infer-owner": "^1.0.4", -+ "lru-cache": "^6.0.0", -+ "minipass": "^3.1.1", -+ "minipass-collect": "^1.0.2", -+ "minipass-flush": "^1.0.5", -+ "minipass-pipeline": "^1.2.2", -+ "mkdirp": "^1.0.3", -+ "p-map": "^4.0.0", -+ "promise-inflight": "^1.0.1", -+ "rimraf": "^3.0.2", -+ "ssri": "^8.0.1", -+ "tar": "^6.0.2", -+ "unique-filename": "^1.1.1" -+ }, -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/cacache/node_modules/mkdirp": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", -+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", -+ "bin": { -+ "mkdirp": "bin/cmd.js" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/cacache/node_modules/rimraf": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", -+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", -+ "dependencies": { -+ "glob": "^7.1.3" -+ }, -+ "bin": { -+ "rimraf": "bin.js" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/isaacs" -+ } -+ }, -+ "node_modules/cacheable-request": { -+ "version": "6.1.0", -+ "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", -+ "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" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/cacheable-request/node_modules/lowercase-keys": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", -+ "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/cached-path-relative": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.1.0.tgz", -+ "integrity": "sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA==" -+ }, -+ "node_modules/call-bind": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", -+ "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", -+ "dependencies": { -+ "function-bind": "^1.1.1", -+ "get-intrinsic": "^1.0.2" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/callsites": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", -+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/camel-case": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", -+ "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==", -+ "dependencies": { -+ "no-case": "^2.2.0", -+ "upper-case": "^1.1.1" -+ } -+ }, -+ "node_modules/camelcase": { -+ "version": "5.3.1", -+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", -+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/camelcase-keys": { -+ "version": "6.2.2", -+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", -+ "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", -+ "dependencies": { -+ "camelcase": "^5.3.1", -+ "map-obj": "^4.0.0", -+ "quick-lru": "^4.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/caniuse-lite": { -+ "version": "1.0.30001431", -+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz", -+ "integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==", -+ "funding": [ -+ { -+ "type": "opencollective", -+ "url": "https://opencollective.com/browserslist" -+ }, -+ { -+ "type": "tidelift", -+ "url": "https://tidelift.com/funding/github/npm/caniuse-lite" -+ } -+ ] -+ }, -+ "node_modules/caseless": { -+ "version": "0.12.0", -+ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", -+ "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==" -+ }, -+ "node_modules/chalk": { -+ "version": "2.4.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", -+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", -+ "dependencies": { -+ "ansi-styles": "^3.2.1", -+ "escape-string-regexp": "^1.0.5", -+ "supports-color": "^5.3.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/chokidar": { -+ "version": "3.5.3", -+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", -+ "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", -+ "funding": [ -+ { -+ "type": "individual", -+ "url": "https://paulmillr.com/funding/" -+ } -+ ], -+ "dependencies": { -+ "anymatch": "~3.1.2", -+ "braces": "~3.0.2", -+ "glob-parent": "~5.1.2", -+ "is-binary-path": "~2.1.0", -+ "is-glob": "~4.0.1", -+ "normalize-path": "~3.0.0", -+ "readdirp": "~3.6.0" -+ }, -+ "engines": { -+ "node": ">= 8.10.0" -+ }, -+ "optionalDependencies": { -+ "fsevents": "~2.3.2" -+ } -+ }, -+ "node_modules/chownr": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", -+ "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/chroma-js": { -+ "version": "2.4.2", -+ "resolved": "https://registry.npmjs.org/chroma-js/-/chroma-js-2.4.2.tgz", -+ "integrity": "sha512-U9eDw6+wt7V8z5NncY2jJfZa+hUH8XEj8FQHgFJTrUFnJfXYf4Ml4adI2vXZOjqRDpFWtYVWypDfZwnJ+HIR4A==" -+ }, -+ "node_modules/chromium-pickle-js": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz", -+ "integrity": "sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==" -+ }, -+ "node_modules/ci-info": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", -+ "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==" -+ }, -+ "node_modules/cipher-base": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", -+ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", -+ "dependencies": { -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.0.1" -+ } -+ }, -+ "node_modules/clean-stack": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", -+ "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/cli-boxes": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", -+ "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==", -+ "engines": { -+ "node": ">=6" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/cliui": { -+ "version": "7.0.4", -+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", -+ "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", -+ "dependencies": { -+ "string-width": "^4.2.0", -+ "strip-ansi": "^6.0.0", -+ "wrap-ansi": "^7.0.0" -+ } -+ }, -+ "node_modules/clone-response": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", -+ "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", -+ "dependencies": { -+ "mimic-response": "^1.0.0" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/color-convert": { -+ "version": "1.9.3", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", -+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", -+ "dependencies": { -+ "color-name": "1.1.3" -+ } -+ }, -+ "node_modules/color-name": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", -+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" -+ }, -+ "node_modules/color-support": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", -+ "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", -+ "bin": { -+ "color-support": "bin.js" -+ } -+ }, -+ "node_modules/combine-source-map": { -+ "version": "0.8.0", -+ "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz", -+ "integrity": "sha512-UlxQ9Vw0b/Bt/KYwCFqdEwsQ1eL8d1gibiFb7lxQJFdvTgc2hIZi6ugsg+kyhzhPV+QEpUiEIwInIAIrgoEkrg==", -+ "dependencies": { -+ "convert-source-map": "~1.1.0", -+ "inline-source-map": "~0.6.0", -+ "lodash.memoize": "~3.0.3", -+ "source-map": "~0.5.3" -+ } -+ }, -+ "node_modules/combine-source-map/node_modules/convert-source-map": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz", -+ "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==" -+ }, -+ "node_modules/combined-stream": { -+ "version": "1.0.8", -+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", -+ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", -+ "dependencies": { -+ "delayed-stream": "~1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.8" -+ } -+ }, -+ "node_modules/commander": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", -+ "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/compare-version": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", -+ "integrity": "sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/concat-map": { -+ "version": "0.0.1", -+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", -+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" -+ }, -+ "node_modules/concat-stream": { -+ "version": "1.6.2", -+ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", -+ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", -+ "engines": [ -+ "node >= 0.8" -+ ], -+ "dependencies": { -+ "buffer-from": "^1.0.0", -+ "inherits": "^2.0.3", -+ "readable-stream": "^2.2.2", -+ "typedarray": "^0.0.6" -+ } -+ }, -+ "node_modules/config-chain": { -+ "version": "1.1.13", -+ "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", -+ "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", -+ "optional": true, -+ "dependencies": { -+ "ini": "^1.3.4", -+ "proto-list": "~1.2.1" -+ } -+ }, -+ "node_modules/configstore": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", -+ "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" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/console-browserify": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", -+ "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" -+ }, -+ "node_modules/console-control-strings": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", -+ "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==" -+ }, -+ "node_modules/constants-browserify": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", -+ "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==" -+ }, -+ "node_modules/convert-source-map": { -+ "version": "1.9.0", -+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", -+ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" -+ }, -+ "node_modules/core-js": { -+ "version": "3.22.5", -+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz", -+ "integrity": "sha512-VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA==", -+ "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.", -+ "hasInstallScript": true, -+ "funding": { -+ "type": "opencollective", -+ "url": "https://opencollective.com/core-js" -+ } -+ }, -+ "node_modules/core-js-compat": { -+ "version": "3.26.0", -+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz", -+ "integrity": "sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==", -+ "dependencies": { -+ "browserslist": "^4.21.4" -+ }, -+ "funding": { -+ "type": "opencollective", -+ "url": "https://opencollective.com/core-js" -+ } -+ }, -+ "node_modules/core-util-is": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", -+ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" -+ }, -+ "node_modules/cpr": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/cpr/-/cpr-3.0.1.tgz", -+ "integrity": "sha512-Xch4PXQ/KC8lJ+KfJ9JI6eG/nmppLrPPWg5Q+vh65Qr9EjuJEubxh/H/Le1TmCZ7+Xv7iJuNRqapyOFZB+wsxA==", -+ "dependencies": { -+ "graceful-fs": "^4.1.5", -+ "minimist": "^1.2.0", -+ "mkdirp": "~0.5.1", -+ "rimraf": "^2.5.4" -+ }, -+ "bin": { -+ "cpr": "bin/cpr" -+ } -+ }, -+ "node_modules/create-ecdh": { -+ "version": "4.0.4", -+ "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", -+ "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", -+ "dependencies": { -+ "bn.js": "^4.1.0", -+ "elliptic": "^6.5.3" -+ } -+ }, -+ "node_modules/create-ecdh/node_modules/bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ }, -+ "node_modules/create-hash": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", -+ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", -+ "dependencies": { -+ "cipher-base": "^1.0.1", -+ "inherits": "^2.0.1", -+ "md5.js": "^1.3.4", -+ "ripemd160": "^2.0.1", -+ "sha.js": "^2.4.0" -+ } -+ }, -+ "node_modules/create-hmac": { -+ "version": "1.1.7", -+ "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", -+ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", -+ "dependencies": { -+ "cipher-base": "^1.0.3", -+ "create-hash": "^1.1.0", -+ "inherits": "^2.0.1", -+ "ripemd160": "^2.0.0", -+ "safe-buffer": "^5.0.1", -+ "sha.js": "^2.4.8" -+ } -+ }, -+ "node_modules/cross-spawn": { -+ "version": "7.0.3", -+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", -+ "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", -+ "dependencies": { -+ "path-key": "^3.1.0", -+ "shebang-command": "^2.0.0", -+ "which": "^2.0.1" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/cross-unzip": { -+ "version": "0.0.2", -+ "resolved": "https://registry.npmjs.org/cross-unzip/-/cross-unzip-0.0.2.tgz", -+ "integrity": "sha512-nRJ5c+aqHz0OJVU4V1bqoaDggydfauK/Gha/H/ScBvuIjhZvl8YIpdWVzSR3vUhzCloqB1tvBdQ4V7J8qK7HzQ==" -+ }, -+ "node_modules/crypto-browserify": { -+ "version": "3.12.0", -+ "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", -+ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", -+ "dependencies": { -+ "browserify-cipher": "^1.0.0", -+ "browserify-sign": "^4.0.0", -+ "create-ecdh": "^4.0.0", -+ "create-hash": "^1.1.0", -+ "create-hmac": "^1.1.0", -+ "diffie-hellman": "^5.0.0", -+ "inherits": "^2.0.1", -+ "pbkdf2": "^3.0.3", -+ "public-encrypt": "^4.0.0", -+ "randombytes": "^2.0.0", -+ "randomfill": "^1.0.3" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/crypto-random-string": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", -+ "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/dash-ast": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz", -+ "integrity": "sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA==" -+ }, -+ "node_modules/dashdash": { -+ "version": "1.14.1", -+ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", -+ "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==", -+ "dependencies": { -+ "assert-plus": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">=0.10" -+ } -+ }, -+ "node_modules/debug": { -+ "version": "4.3.4", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", -+ "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", -+ "dependencies": { -+ "ms": "2.1.2" -+ }, -+ "engines": { -+ "node": ">=6.0" -+ }, -+ "peerDependenciesMeta": { -+ "supports-color": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/decamelize": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", -+ "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/decamelize-keys": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz", -+ "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==", -+ "dependencies": { -+ "decamelize": "^1.1.0", -+ "map-obj": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/decamelize-keys/node_modules/map-obj": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", -+ "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/decompress-response": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", -+ "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==", -+ "dependencies": { -+ "mimic-response": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/deep-equal": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", -+ "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", -+ "dependencies": { -+ "is-arguments": "^1.0.4", -+ "is-date-object": "^1.0.1", -+ "is-regex": "^1.0.4", -+ "object-is": "^1.0.1", -+ "object-keys": "^1.1.1", -+ "regexp.prototype.flags": "^1.2.0" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/deep-extend": { -+ "version": "0.6.0", -+ "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", -+ "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", -+ "engines": { -+ "node": ">=4.0.0" -+ } -+ }, -+ "node_modules/deep-is": { -+ "version": "0.1.4", -+ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", -+ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" -+ }, -+ "node_modules/defer-to-connect": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", -+ "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" -+ }, -+ "node_modules/define-lazy-prop": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", -+ "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/define-properties": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", -+ "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", -+ "dependencies": { -+ "has-property-descriptors": "^1.0.0", -+ "object-keys": "^1.1.1" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/defined": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz", -+ "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==", -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/delayed-stream": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", -+ "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", -+ "engines": { -+ "node": ">=0.4.0" -+ } -+ }, -+ "node_modules/delegates": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", -+ "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==" -+ }, -+ "node_modules/depd": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", -+ "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", -+ "engines": { -+ "node": ">= 0.6" -+ } -+ }, -+ "node_modules/deps-sort": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.1.tgz", -+ "integrity": "sha512-1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw==", -+ "dependencies": { -+ "JSONStream": "^1.0.3", -+ "shasum-object": "^1.0.0", -+ "subarg": "^1.0.0", -+ "through2": "^2.0.0" -+ }, -+ "bin": { -+ "deps-sort": "bin/cmd.js" -+ } -+ }, -+ "node_modules/des.js": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", -+ "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", -+ "dependencies": { -+ "inherits": "^2.0.1", -+ "minimalistic-assert": "^1.0.0" -+ } -+ }, -+ "node_modules/destroy": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", -+ "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", -+ "engines": { -+ "node": ">= 0.8", -+ "npm": "1.2.8000 || >= 1.4.16" -+ } -+ }, -+ "node_modules/detect-libc": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", -+ "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==", -+ "optional": true, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/detect-node": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", -+ "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", -+ "optional": true -+ }, -+ "node_modules/detective": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz", -+ "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==", -+ "dependencies": { -+ "acorn-node": "^1.8.2", -+ "defined": "^1.0.0", -+ "minimist": "^1.2.6" -+ }, -+ "bin": { -+ "detective": "bin/detective.js" -+ }, -+ "engines": { -+ "node": ">=0.8.0" -+ } -+ }, -+ "node_modules/diff-match-patch": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz", -+ "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==" -+ }, -+ "node_modules/diffie-hellman": { -+ "version": "5.0.3", -+ "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", -+ "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", -+ "dependencies": { -+ "bn.js": "^4.1.0", -+ "miller-rabin": "^4.0.0", -+ "randombytes": "^2.0.0" -+ } -+ }, -+ "node_modules/diffie-hellman/node_modules/bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ }, -+ "node_modules/dns-equal": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", -+ "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==" -+ }, -+ "node_modules/dns-packet": { -+ "version": "1.3.4", -+ "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz", -+ "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==", -+ "dependencies": { -+ "ip": "^1.1.0", -+ "safe-buffer": "^5.0.1" -+ } -+ }, -+ "node_modules/dns-txt": { -+ "version": "2.0.3", -+ "resolved": "git+ssh://git@github.com/jean-emmanuel/dns-txt.git#3bee7785c32d8bc71230d5e01383c61fb72a4b4f", -+ "license": "MIT", -+ "dependencies": { -+ "buffer-indexof": "^1.0.0" -+ } -+ }, -+ "node_modules/doctrine": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", -+ "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", -+ "dependencies": { -+ "esutils": "^2.0.2" -+ }, -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/dom-serializer": { -+ "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", -+ "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", -+ "dependencies": { -+ "domelementtype": "^2.0.1", -+ "domhandler": "^4.2.0", -+ "entities": "^2.0.0" -+ }, -+ "funding": { -+ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" -+ } -+ }, -+ "node_modules/dom-serializer/node_modules/domhandler": { -+ "version": "4.3.1", -+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", -+ "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", -+ "dependencies": { -+ "domelementtype": "^2.2.0" -+ }, -+ "engines": { -+ "node": ">= 4" -+ }, -+ "funding": { -+ "url": "https://github.com/fb55/domhandler?sponsor=1" -+ } -+ }, -+ "node_modules/domain-browser": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", -+ "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", -+ "engines": { -+ "node": ">=0.4", -+ "npm": ">=1.2" -+ } -+ }, -+ "node_modules/domelementtype": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", -+ "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/fb55" -+ } -+ ] -+ }, -+ "node_modules/domhandler": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz", -+ "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==", -+ "dependencies": { -+ "domelementtype": "^2.0.1" -+ }, -+ "engines": { -+ "node": ">= 4" -+ }, -+ "funding": { -+ "url": "https://github.com/fb55/domhandler?sponsor=1" -+ } -+ }, -+ "node_modules/domutils": { -+ "version": "2.8.0", -+ "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", -+ "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", -+ "dependencies": { -+ "dom-serializer": "^1.0.1", -+ "domelementtype": "^2.2.0", -+ "domhandler": "^4.2.0" -+ }, -+ "funding": { -+ "url": "https://github.com/fb55/domutils?sponsor=1" -+ } -+ }, -+ "node_modules/domutils/node_modules/domhandler": { -+ "version": "4.3.1", -+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", -+ "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", -+ "dependencies": { -+ "domelementtype": "^2.2.0" -+ }, -+ "engines": { -+ "node": ">= 4" -+ }, -+ "funding": { -+ "url": "https://github.com/fb55/domhandler?sponsor=1" -+ } -+ }, -+ "node_modules/dot-prop": { -+ "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", -+ "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", -+ "dependencies": { -+ "is-obj": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/duplexer2": { -+ "version": "0.1.4", -+ "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", -+ "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==", -+ "dependencies": { -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "node_modules/duplexer3": { -+ "version": "0.1.5", -+ "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz", -+ "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==" -+ }, -+ "node_modules/ecc-jsbn": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", -+ "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==", -+ "dependencies": { -+ "jsbn": "~0.1.0", -+ "safer-buffer": "^2.1.0" -+ } -+ }, -+ "node_modules/ee-first": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", -+ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" -+ }, -+ "node_modules/electron-is-accelerator": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz", -+ "integrity": "sha512-fLGSAjXZtdn1sbtZxx52+krefmtNuVwnJCV2gNiVt735/ARUboMl8jnNC9fZEqQdlAv2ZrETfmBUsoQci5evJA==" -+ }, -+ "node_modules/electron-localshortcut": { -+ "version": "3.2.1", -+ "resolved": "https://registry.npmjs.org/electron-localshortcut/-/electron-localshortcut-3.2.1.tgz", -+ "integrity": "sha512-DWvhKv36GsdXKnaFFhEiK8kZZA+24/yFLgtTwJJHc7AFgDjNRIBJZ/jq62Y/dWv9E4ypYwrVWN2bVrCYw1uv7Q==", -+ "dependencies": { -+ "debug": "^4.0.1", -+ "electron-is-accelerator": "^0.1.0", -+ "keyboardevent-from-electron-accelerator": "^2.0.0", -+ "keyboardevents-areequal": "^0.2.1" -+ } -+ }, -+ "node_modules/electron-notarize": { -+ "version": "1.2.2", -+ "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.2.2.tgz", -+ "integrity": "sha512-ZStVWYcWI7g87/PgjPJSIIhwQXOaw4/XeXU+pWqMMktSLHaGMLHdyPPN7Cmao7+Cr7fYufA16npdtMndYciHNw==", -+ "deprecated": "Please use @electron/notarize moving forward. There is no API change, just a package name change", -+ "dependencies": { -+ "debug": "^4.1.1", -+ "fs-extra": "^9.0.1" -+ }, -+ "engines": { -+ "node": ">= 10.0.0" -+ } -+ }, -+ "node_modules/electron-osx-sign": { -+ "version": "0.5.0", -+ "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz", -+ "integrity": "sha512-icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ==", -+ "deprecated": "Please use @electron/osx-sign moving forward. Be aware the API is slightly different", -+ "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" -+ }, -+ "bin": { -+ "electron-osx-flat": "bin/electron-osx-flat.js", -+ "electron-osx-sign": "bin/electron-osx-sign.js" -+ }, -+ "engines": { -+ "node": ">=4.0.0" -+ } -+ }, -+ "node_modules/electron-osx-sign/node_modules/debug": { -+ "version": "2.6.9", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", -+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -+ "dependencies": { -+ "ms": "2.0.0" -+ } -+ }, -+ "node_modules/electron-osx-sign/node_modules/ms": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", -+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" -+ }, -+ "node_modules/electron-packager": { -+ "version": "15.2.0", -+ "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-15.2.0.tgz", -+ "integrity": "sha512-BaklTBRQy1JTijR3hi8XxHf/uo76rHbDCNM/eQHSblzE9C0NoNfOe86nPxB7y1u2jwlqoEJ4zFiHpTFioKGGRA==", -+ "dependencies": { -+ "@electron/get": "^1.6.0", -+ "asar": "^3.0.0", -+ "debug": "^4.0.1", -+ "electron-notarize": "^1.0.0", -+ "electron-osx-sign": "^0.5.0", -+ "extract-zip": "^2.0.0", -+ "filenamify": "^4.1.0", -+ "fs-extra": "^9.0.0", -+ "galactus": "^0.2.1", -+ "get-package-info": "^1.0.0", -+ "junk": "^3.1.0", -+ "parse-author": "^2.0.0", -+ "plist": "^3.0.0", -+ "rcedit": "^2.0.0", -+ "resolve": "^1.1.6", -+ "semver": "^7.1.3", -+ "yargs-parser": "^20.0.0" -+ }, -+ "bin": { -+ "electron-packager": "bin/electron-packager.js" -+ }, -+ "engines": { -+ "node": ">= 10.12.0" -+ }, -+ "funding": { -+ "url": "https://github.com/electron/electron-packager?sponsor=1" -+ } -+ }, -+ "node_modules/electron-packager-plugin-non-proprietary-codecs-ffmpeg": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/electron-packager-plugin-non-proprietary-codecs-ffmpeg/-/electron-packager-plugin-non-proprietary-codecs-ffmpeg-1.0.2.tgz", -+ "integrity": "sha512-xPkbzndg2KODqmNe9yIx0dhNOfaOqrdNZ1ZSSZN4h1wT0T5SV/YES0tNyN932jQd+c5cFPv6AWYYjuPWKvcITg==", -+ "dependencies": { -+ "7zip": "0.0.6", -+ "cross-unzip": "0.0.2", -+ "mkdirp": "^0.5.1", -+ "request": "^2.73.0", -+ "semver": "^5.2.0" -+ } -+ }, -+ "node_modules/electron-packager-plugin-non-proprietary-codecs-ffmpeg/node_modules/semver": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", -+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", -+ "bin": { -+ "semver": "bin/semver" -+ } -+ }, -+ "node_modules/electron-to-chromium": { -+ "version": "1.4.284", -+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", -+ "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" -+ }, -+ "node_modules/elliptic": { -+ "version": "6.5.4", -+ "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", -+ "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", -+ "dependencies": { -+ "bn.js": "^4.11.9", -+ "brorand": "^1.1.0", -+ "hash.js": "^1.0.0", -+ "hmac-drbg": "^1.0.1", -+ "inherits": "^2.0.4", -+ "minimalistic-assert": "^1.0.1", -+ "minimalistic-crypto-utils": "^1.0.1" -+ } -+ }, -+ "node_modules/elliptic/node_modules/bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ }, -+ "node_modules/emoji-regex": { -+ "version": "8.0.0", -+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", -+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" -+ }, -+ "node_modules/encodeurl": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", -+ "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", -+ "engines": { -+ "node": ">= 0.8" -+ } -+ }, -+ "node_modules/encoding": { -+ "version": "0.1.13", -+ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", -+ "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", -+ "optional": true, -+ "dependencies": { -+ "iconv-lite": "^0.6.2" -+ } -+ }, -+ "node_modules/end-of-stream": { -+ "version": "1.4.4", -+ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", -+ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", -+ "dependencies": { -+ "once": "^1.4.0" -+ } -+ }, -+ "node_modules/entities": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", -+ "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", -+ "funding": { -+ "url": "https://github.com/fb55/entities?sponsor=1" -+ } -+ }, -+ "node_modules/env-paths": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", -+ "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/err-code": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", -+ "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==" -+ }, -+ "node_modules/error-ex": { -+ "version": "1.3.2", -+ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", -+ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", -+ "dependencies": { -+ "is-arrayish": "^0.2.1" -+ } -+ }, -+ "node_modules/error-stack-parser": { -+ "version": "2.1.4", -+ "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz", -+ "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==", -+ "dependencies": { -+ "stackframe": "^1.3.4" -+ } -+ }, -+ "node_modules/es6-error": { -+ "version": "4.1.1", -+ "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", -+ "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", -+ "optional": true -+ }, -+ "node_modules/escalade": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", -+ "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/escape-goat": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz", -+ "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/escape-html": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", -+ "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" -+ }, -+ "node_modules/escape-string-regexp": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", -+ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", -+ "engines": { -+ "node": ">=0.8.0" -+ } -+ }, -+ "node_modules/escaper": { -+ "version": "2.5.3", -+ "resolved": "https://registry.npmjs.org/escaper/-/escaper-2.5.3.tgz", -+ "integrity": "sha512-QGb9sFxBVpbzMggrKTX0ry1oiI4CSDAl9vIL702hzl1jGW8VZs7qfqTRX7WDOjoNDoEVGcEtu1ZOQgReSfT2kQ==" -+ }, -+ "node_modules/eslint": { -+ "version": "8.16.0", -+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz", -+ "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==", -+ "dependencies": { -+ "@eslint/eslintrc": "^1.3.0", -+ "@humanwhocodes/config-array": "^0.9.2", -+ "ajv": "^6.10.0", -+ "chalk": "^4.0.0", -+ "cross-spawn": "^7.0.2", -+ "debug": "^4.3.2", -+ "doctrine": "^3.0.0", -+ "escape-string-regexp": "^4.0.0", -+ "eslint-scope": "^7.1.1", -+ "eslint-utils": "^3.0.0", -+ "eslint-visitor-keys": "^3.3.0", -+ "espree": "^9.3.2", -+ "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": "^6.0.1", -+ "globals": "^13.15.0", -+ "ignore": "^5.2.0", -+ "import-fresh": "^3.0.0", -+ "imurmurhash": "^0.1.4", -+ "is-glob": "^4.0.0", -+ "js-yaml": "^4.1.0", -+ "json-stable-stringify-without-jsonify": "^1.0.1", -+ "levn": "^0.4.1", -+ "lodash.merge": "^4.6.2", -+ "minimatch": "^3.1.2", -+ "natural-compare": "^1.4.0", -+ "optionator": "^0.9.1", -+ "regexpp": "^3.2.0", -+ "strip-ansi": "^6.0.1", -+ "strip-json-comments": "^3.1.0", -+ "text-table": "^0.2.0", -+ "v8-compile-cache": "^2.0.3" -+ }, -+ "bin": { -+ "eslint": "bin/eslint.js" -+ }, -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/eslint" -+ } -+ }, -+ "node_modules/eslint-scope": { -+ "version": "5.1.1", -+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", -+ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", -+ "dependencies": { -+ "esrecurse": "^4.3.0", -+ "estraverse": "^4.1.1" -+ }, -+ "engines": { -+ "node": ">=8.0.0" -+ } -+ }, -+ "node_modules/eslint-utils": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", -+ "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", -+ "dependencies": { -+ "eslint-visitor-keys": "^2.0.0" -+ }, -+ "engines": { -+ "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/mysticatea" -+ }, -+ "peerDependencies": { -+ "eslint": ">=5" -+ } -+ }, -+ "node_modules/eslint-visitor-keys": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", -+ "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/eslint/node_modules/ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "dependencies": { -+ "color-convert": "^2.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/ansi-styles?sponsor=1" -+ } -+ }, -+ "node_modules/eslint/node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/eslint/node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "node_modules/eslint/node_modules/chalk": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", -+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -+ "dependencies": { -+ "ansi-styles": "^4.1.0", -+ "supports-color": "^7.1.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/chalk?sponsor=1" -+ } -+ }, -+ "node_modules/eslint/node_modules/color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "dependencies": { -+ "color-name": "~1.1.4" -+ }, -+ "engines": { -+ "node": ">=7.0.0" -+ } -+ }, -+ "node_modules/eslint/node_modules/color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "node_modules/eslint/node_modules/escape-string-regexp": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", -+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/eslint/node_modules/eslint-scope": { -+ "version": "7.1.1", -+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", -+ "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", -+ "dependencies": { -+ "esrecurse": "^4.3.0", -+ "estraverse": "^5.2.0" -+ }, -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ } -+ }, -+ "node_modules/eslint/node_modules/eslint-visitor-keys": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", -+ "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ } -+ }, -+ "node_modules/eslint/node_modules/estraverse": { -+ "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", -+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", -+ "engines": { -+ "node": ">=4.0" -+ } -+ }, -+ "node_modules/eslint/node_modules/glob-parent": { -+ "version": "6.0.2", -+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", -+ "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", -+ "dependencies": { -+ "is-glob": "^4.0.3" -+ }, -+ "engines": { -+ "node": ">=10.13.0" -+ } -+ }, -+ "node_modules/eslint/node_modules/globals": { -+ "version": "13.17.0", -+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", -+ "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", -+ "dependencies": { -+ "type-fest": "^0.20.2" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/eslint/node_modules/has-flag": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/eslint/node_modules/minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/eslint/node_modules/supports-color": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -+ "dependencies": { -+ "has-flag": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/eslint/node_modules/type-fest": { -+ "version": "0.20.2", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", -+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/espree": { -+ "version": "9.4.1", -+ "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz", -+ "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==", -+ "dependencies": { -+ "acorn": "^8.8.0", -+ "acorn-jsx": "^5.3.2", -+ "eslint-visitor-keys": "^3.3.0" -+ }, -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/eslint" -+ } -+ }, -+ "node_modules/espree/node_modules/eslint-visitor-keys": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", -+ "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ } -+ }, -+ "node_modules/esquery": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", -+ "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", -+ "dependencies": { -+ "estraverse": "^5.1.0" -+ }, -+ "engines": { -+ "node": ">=0.10" -+ } -+ }, -+ "node_modules/esquery/node_modules/estraverse": { -+ "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", -+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", -+ "engines": { -+ "node": ">=4.0" -+ } -+ }, -+ "node_modules/esrecurse": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", -+ "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", -+ "dependencies": { -+ "estraverse": "^5.2.0" -+ }, -+ "engines": { -+ "node": ">=4.0" -+ } -+ }, -+ "node_modules/esrecurse/node_modules/estraverse": { -+ "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", -+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", -+ "engines": { -+ "node": ">=4.0" -+ } -+ }, -+ "node_modules/estraverse": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", -+ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", -+ "engines": { -+ "node": ">=4.0" -+ } -+ }, -+ "node_modules/estree-is-member-expression": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/estree-is-member-expression/-/estree-is-member-expression-1.0.0.tgz", -+ "integrity": "sha512-Ec+X44CapIGExvSZN+pGkmr5p7HwUVQoPQSd458Lqwvaf4/61k/invHSh4BYK8OXnCkfEhWuIoG5hayKLQStIg==" -+ }, -+ "node_modules/esutils": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", -+ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/etag": { -+ "version": "1.8.1", -+ "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", -+ "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", -+ "engines": { -+ "node": ">= 0.6" -+ } -+ }, -+ "node_modules/events": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", -+ "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", -+ "engines": { -+ "node": ">=0.8.x" -+ } -+ }, -+ "node_modules/evp_bytestokey": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", -+ "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", -+ "dependencies": { -+ "md5.js": "^1.3.4", -+ "safe-buffer": "^5.1.1" -+ } -+ }, -+ "node_modules/exorcist": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/exorcist/-/exorcist-2.0.0.tgz", -+ "integrity": "sha512-+c63SvhBq/HjmbV9cu9vkDkjXFiuI4lpqOZU5Y3t5GSV2l4TQCqVli9c7nIASHxkUL4THaOZDUcb6XNBI/eYjw==", -+ "dependencies": { -+ "is-stream": "^2.0.0", -+ "minimist": "^1.2.5", -+ "mkdirp": "^1.0.4", -+ "mold-source-map": "^0.4.0" -+ }, -+ "bin": { -+ "exorcist": "bin/exorcist.js" -+ } -+ }, -+ "node_modules/exorcist/node_modules/mkdirp": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", -+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", -+ "bin": { -+ "mkdirp": "bin/cmd.js" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/expand-template": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", -+ "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", -+ "optional": true, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/extend": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", -+ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" -+ }, -+ "node_modules/extract-zip": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", -+ "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", -+ "dependencies": { -+ "debug": "^4.1.1", -+ "get-stream": "^5.1.0", -+ "yauzl": "^2.10.0" -+ }, -+ "bin": { -+ "extract-zip": "cli.js" -+ }, -+ "engines": { -+ "node": ">= 10.17.0" -+ }, -+ "optionalDependencies": { -+ "@types/yauzl": "^2.9.1" -+ } -+ }, -+ "node_modules/extsprintf": { -+ "version": "1.3.0", -+ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", -+ "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==", -+ "engines": [ -+ "node >=0.6.0" -+ ] -+ }, -+ "node_modules/fast-deep-equal": { -+ "version": "3.1.3", -+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", -+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" -+ }, -+ "node_modules/fast-json-stable-stringify": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", -+ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" -+ }, -+ "node_modules/fast-levenshtein": { -+ "version": "2.0.6", -+ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", -+ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" -+ }, -+ "node_modules/fast-safe-stringify": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", -+ "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==" -+ }, -+ "node_modules/fastdom": { -+ "version": "1.0.10", -+ "resolved": "https://registry.npmjs.org/fastdom/-/fastdom-1.0.10.tgz", -+ "integrity": "sha512-sbL4h358IlZn8VsTvA5TYnKVLYif46XhPEll+HTSxVtDSpqZEO/17D/QqlxE9V2K7AQ82GXeYeQLU2HWwKgk1A==", -+ "dependencies": { -+ "strictdom": "^1.0.1" -+ } -+ }, -+ "node_modules/fd-slicer": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", -+ "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", -+ "dependencies": { -+ "pend": "~1.2.0" -+ } -+ }, -+ "node_modules/file-entry-cache": { -+ "version": "6.0.1", -+ "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", -+ "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", -+ "dependencies": { -+ "flat-cache": "^3.0.4" -+ }, -+ "engines": { -+ "node": "^10.12.0 || >=12.0.0" -+ } -+ }, -+ "node_modules/file-saver": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", -+ "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" -+ }, -+ "node_modules/file-uri-to-path": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", -+ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", -+ "optional": true -+ }, -+ "node_modules/filename-reserved-regex": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz", -+ "integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/filenamify": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz", -+ "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==", -+ "dependencies": { -+ "filename-reserved-regex": "^2.0.0", -+ "strip-outer": "^1.0.1", -+ "trim-repeated": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/fill-range": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", -+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", -+ "dependencies": { -+ "to-regex-range": "^5.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/find-up": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", -+ "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==", -+ "dependencies": { -+ "locate-path": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/flat-cache": { -+ "version": "3.0.4", -+ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", -+ "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", -+ "dependencies": { -+ "flatted": "^3.1.0", -+ "rimraf": "^3.0.2" -+ }, -+ "engines": { -+ "node": "^10.12.0 || >=12.0.0" -+ } -+ }, -+ "node_modules/flat-cache/node_modules/rimraf": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", -+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", -+ "dependencies": { -+ "glob": "^7.1.3" -+ }, -+ "bin": { -+ "rimraf": "bin.js" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/isaacs" -+ } -+ }, -+ "node_modules/flatted": { -+ "version": "3.2.7", -+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", -+ "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==" -+ }, -+ "node_modules/flora-colossus": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/flora-colossus/-/flora-colossus-1.0.1.tgz", -+ "integrity": "sha512-d+9na7t9FyH8gBJoNDSi28mE4NgQVGGvxQ4aHtFRetjyh5SXjuus+V5EZaxFmFdXVemSOrx0lsgEl/ZMjnOWJA==", -+ "dependencies": { -+ "debug": "^4.1.1", -+ "fs-extra": "^7.0.0" -+ }, -+ "engines": { -+ "node": ">= 6.0.0" -+ } -+ }, -+ "node_modules/flora-colossus/node_modules/fs-extra": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", -+ "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", -+ "dependencies": { -+ "graceful-fs": "^4.1.2", -+ "jsonfile": "^4.0.0", -+ "universalify": "^0.1.0" -+ }, -+ "engines": { -+ "node": ">=6 <7 || >=8" -+ } -+ }, -+ "node_modules/flora-colossus/node_modules/jsonfile": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", -+ "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", -+ "optionalDependencies": { -+ "graceful-fs": "^4.1.6" -+ } -+ }, -+ "node_modules/flora-colossus/node_modules/universalify": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", -+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", -+ "engines": { -+ "node": ">= 4.0.0" -+ } -+ }, -+ "node_modules/for-each": { -+ "version": "0.3.3", -+ "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", -+ "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", -+ "dependencies": { -+ "is-callable": "^1.1.3" -+ } -+ }, -+ "node_modules/forever-agent": { -+ "version": "0.6.1", -+ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", -+ "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==", -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/form-data": { -+ "version": "2.3.3", -+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", -+ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", -+ "dependencies": { -+ "asynckit": "^0.4.0", -+ "combined-stream": "^1.0.6", -+ "mime-types": "^2.1.12" -+ }, -+ "engines": { -+ "node": ">= 0.12" -+ } -+ }, -+ "node_modules/fresh": { -+ "version": "0.5.2", -+ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", -+ "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", -+ "engines": { -+ "node": ">= 0.6" -+ } -+ }, -+ "node_modules/fs-constants": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", -+ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", -+ "optional": true -+ }, -+ "node_modules/fs-extra": { -+ "version": "9.1.0", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", -+ "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" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/fs-minipass": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", -+ "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", -+ "dependencies": { -+ "minipass": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/fs.realpath": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", -+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" -+ }, -+ "node_modules/fsevents": { -+ "version": "2.3.2", -+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", -+ "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", -+ "hasInstallScript": true, -+ "optional": true, -+ "os": [ -+ "darwin" -+ ], -+ "engines": { -+ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" -+ } -+ }, -+ "node_modules/function-bind": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", -+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" -+ }, -+ "node_modules/functional-red-black-tree": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", -+ "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==" -+ }, -+ "node_modules/functions-have-names": { -+ "version": "1.2.3", -+ "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", -+ "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/galactus": { -+ "version": "0.2.1", -+ "resolved": "https://registry.npmjs.org/galactus/-/galactus-0.2.1.tgz", -+ "integrity": "sha512-mDc8EQJKtxjp9PMYS3PbpjjbX3oXhBTxoGaPahw620XZBIHJ4+nvw5KN/tRtmmSDR9dypstGNvqQ3C29QGoGHQ==", -+ "dependencies": { -+ "debug": "^3.1.0", -+ "flora-colossus": "^1.0.0", -+ "fs-extra": "^4.0.0" -+ } -+ }, -+ "node_modules/galactus/node_modules/debug": { -+ "version": "3.2.7", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", -+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", -+ "dependencies": { -+ "ms": "^2.1.1" -+ } -+ }, -+ "node_modules/galactus/node_modules/fs-extra": { -+ "version": "4.0.3", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", -+ "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", -+ "dependencies": { -+ "graceful-fs": "^4.1.2", -+ "jsonfile": "^4.0.0", -+ "universalify": "^0.1.0" -+ } -+ }, -+ "node_modules/galactus/node_modules/jsonfile": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", -+ "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", -+ "optionalDependencies": { -+ "graceful-fs": "^4.1.6" -+ } -+ }, -+ "node_modules/galactus/node_modules/universalify": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", -+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", -+ "engines": { -+ "node": ">= 4.0.0" -+ } -+ }, -+ "node_modules/gauge": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", -+ "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", -+ "dependencies": { -+ "aproba": "^1.0.3 || ^2.0.0", -+ "color-support": "^1.1.2", -+ "console-control-strings": "^1.0.0", -+ "has-unicode": "^2.0.1", -+ "object-assign": "^4.1.1", -+ "signal-exit": "^3.0.0", -+ "string-width": "^4.2.3", -+ "strip-ansi": "^6.0.1", -+ "wide-align": "^1.1.2" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/gaze": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", -+ "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", -+ "dependencies": { -+ "globule": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 4.0.0" -+ } -+ }, -+ "node_modules/gensync": { -+ "version": "1.0.0-beta.2", -+ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", -+ "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/get-assigned-identifiers": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz", -+ "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==" -+ }, -+ "node_modules/get-caller-file": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", -+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", -+ "engines": { -+ "node": "6.* || 8.* || >= 10.*" -+ } -+ }, -+ "node_modules/get-intrinsic": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", -+ "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", -+ "dependencies": { -+ "function-bind": "^1.1.1", -+ "has": "^1.0.3", -+ "has-symbols": "^1.0.3" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/get-package-info": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/get-package-info/-/get-package-info-1.0.0.tgz", -+ "integrity": "sha512-SCbprXGAPdIhKAXiG+Mk6yeoFH61JlYunqdFQFHDtLjJlDjFf6x07dsS8acO+xWt52jpdVo49AlVDnUVK1sDNw==", -+ "dependencies": { -+ "bluebird": "^3.1.1", -+ "debug": "^2.2.0", -+ "lodash.get": "^4.0.0", -+ "read-pkg-up": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">= 4.0" -+ } -+ }, -+ "node_modules/get-package-info/node_modules/debug": { -+ "version": "2.6.9", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", -+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -+ "dependencies": { -+ "ms": "2.0.0" -+ } -+ }, -+ "node_modules/get-package-info/node_modules/ms": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", -+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" -+ }, -+ "node_modules/get-stdin": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", -+ "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/get-stream": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", -+ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", -+ "dependencies": { -+ "pump": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/getpass": { -+ "version": "0.1.7", -+ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", -+ "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==", -+ "dependencies": { -+ "assert-plus": "^1.0.0" -+ } -+ }, -+ "node_modules/github-from-package": { -+ "version": "0.0.0", -+ "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", -+ "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", -+ "optional": true -+ }, -+ "node_modules/glob": { -+ "version": "7.2.3", -+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", -+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", -+ "dependencies": { -+ "fs.realpath": "^1.0.0", -+ "inflight": "^1.0.4", -+ "inherits": "2", -+ "minimatch": "^3.1.1", -+ "once": "^1.3.0", -+ "path-is-absolute": "^1.0.0" -+ }, -+ "engines": { -+ "node": "*" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/isaacs" -+ } -+ }, -+ "node_modules/glob-parent": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", -+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", -+ "dependencies": { -+ "is-glob": "^4.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/glob/node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/glob/node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "node_modules/glob/node_modules/minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/global-agent": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz", -+ "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==", -+ "optional": true, -+ "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" -+ }, -+ "engines": { -+ "node": ">=10.0" -+ } -+ }, -+ "node_modules/global-dirs": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz", -+ "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==", -+ "dependencies": { -+ "ini": "2.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/global-dirs/node_modules/ini": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", -+ "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==", -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/global-tunnel-ng": { -+ "version": "2.7.1", -+ "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz", -+ "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==", -+ "optional": true, -+ "dependencies": { -+ "encodeurl": "^1.0.2", -+ "lodash": "^4.17.10", -+ "npm-conf": "^1.1.3", -+ "tunnel": "^0.0.6" -+ }, -+ "engines": { -+ "node": ">=0.10" -+ } -+ }, -+ "node_modules/globals": { -+ "version": "11.12.0", -+ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", -+ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/globalthis": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", -+ "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", -+ "optional": true, -+ "dependencies": { -+ "define-properties": "^1.1.3" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/globule": { -+ "version": "1.3.4", -+ "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz", -+ "integrity": "sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==", -+ "dependencies": { -+ "glob": "~7.1.1", -+ "lodash": "^4.17.21", -+ "minimatch": "~3.0.2" -+ }, -+ "engines": { -+ "node": ">= 0.10" -+ } -+ }, -+ "node_modules/globule/node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/globule/node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "node_modules/globule/node_modules/glob": { -+ "version": "7.1.7", -+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", -+ "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", -+ "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" -+ }, -+ "engines": { -+ "node": "*" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/isaacs" -+ } -+ }, -+ "node_modules/globule/node_modules/minimatch": { -+ "version": "3.0.8", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz", -+ "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==", -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/gopd": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", -+ "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", -+ "dependencies": { -+ "get-intrinsic": "^1.1.3" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/got": { -+ "version": "9.6.0", -+ "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", -+ "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" -+ }, -+ "engines": { -+ "node": ">=8.6" -+ } -+ }, -+ "node_modules/got/node_modules/get-stream": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", -+ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", -+ "dependencies": { -+ "pump": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/graceful-fs": { -+ "version": "4.2.10", -+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", -+ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" -+ }, -+ "node_modules/gyronorm": { -+ "version": "2.0.6", -+ "resolved": "https://registry.npmjs.org/gyronorm/-/gyronorm-2.0.6.tgz", -+ "integrity": "sha512-pE66zEK/3G9t1dpikTKIjNuY1JauXgtNiulgPKc28IKwMJ5NuJ03mOQ5ArqnkOyQxhlJSY71i3YdFcHhzx4TOg==" -+ }, -+ "node_modules/har-schema": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", -+ "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/har-validator": { -+ "version": "5.1.5", -+ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", -+ "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", -+ "deprecated": "this library is no longer supported", -+ "dependencies": { -+ "ajv": "^6.12.3", -+ "har-schema": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/hard-rejection": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", -+ "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/has": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", -+ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", -+ "dependencies": { -+ "function-bind": "^1.1.1" -+ }, -+ "engines": { -+ "node": ">= 0.4.0" -+ } -+ }, -+ "node_modules/has-ansi": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", -+ "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==", -+ "dependencies": { -+ "ansi-regex": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/has-ansi/node_modules/ansi-regex": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", -+ "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/has-flag": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", -+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/has-property-descriptors": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", -+ "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", -+ "dependencies": { -+ "get-intrinsic": "^1.1.1" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/has-symbols": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", -+ "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/has-tostringtag": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", -+ "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", -+ "dependencies": { -+ "has-symbols": "^1.0.2" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/has-unicode": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", -+ "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==" -+ }, -+ "node_modules/has-yarn": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", -+ "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/hash-base": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", -+ "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", -+ "dependencies": { -+ "inherits": "^2.0.4", -+ "readable-stream": "^3.6.0", -+ "safe-buffer": "^5.2.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/hash-base/node_modules/readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/hash.js": { -+ "version": "1.1.7", -+ "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", -+ "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "minimalistic-assert": "^1.0.1" -+ } -+ }, -+ "node_modules/hmac-drbg": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", -+ "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", -+ "dependencies": { -+ "hash.js": "^1.0.3", -+ "minimalistic-assert": "^1.0.0", -+ "minimalistic-crypto-utils": "^1.0.1" -+ } -+ }, -+ "node_modules/hosted-git-info": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", -+ "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", -+ "dependencies": { -+ "lru-cache": "^6.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/htmlescape": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz", -+ "integrity": "sha512-eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg==", -+ "engines": { -+ "node": ">=0.10" -+ } -+ }, -+ "node_modules/htmlparser2": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz", -+ "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==", -+ "dependencies": { -+ "domelementtype": "^2.0.1", -+ "domhandler": "^3.0.0", -+ "domutils": "^2.0.0", -+ "entities": "^2.0.0" -+ } -+ }, -+ "node_modules/http-auth": { -+ "version": "4.1.9", -+ "resolved": "https://registry.npmjs.org/http-auth/-/http-auth-4.1.9.tgz", -+ "integrity": "sha512-kvPYxNGc9EKGTXvOMnTBQw2RZfuiSihK/mLw/a4pbtRueTE45S55Lw/3k5CktIf7Ak0veMKEIteDj4YkNmCzmQ==", -+ "dependencies": { -+ "apache-crypt": "^1.1.2", -+ "apache-md5": "^1.0.6", -+ "bcryptjs": "^2.4.3", -+ "uuid": "^8.3.2" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/http-cache-semantics": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", -+ "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" -+ }, -+ "node_modules/http-errors": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", -+ "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", -+ "dependencies": { -+ "depd": "2.0.0", -+ "inherits": "2.0.4", -+ "setprototypeof": "1.2.0", -+ "statuses": "2.0.1", -+ "toidentifier": "1.0.1" -+ }, -+ "engines": { -+ "node": ">= 0.8" -+ } -+ }, -+ "node_modules/http-errors/node_modules/depd": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", -+ "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", -+ "engines": { -+ "node": ">= 0.8" -+ } -+ }, -+ "node_modules/http-proxy-agent": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", -+ "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", -+ "dependencies": { -+ "@tootallnate/once": "1", -+ "agent-base": "6", -+ "debug": "4" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/http-signature": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", -+ "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==", -+ "dependencies": { -+ "assert-plus": "^1.0.0", -+ "jsprim": "^1.2.2", -+ "sshpk": "^1.7.0" -+ }, -+ "engines": { -+ "node": ">=0.8", -+ "npm": ">=1.3.7" -+ } -+ }, -+ "node_modules/https-browserify": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", -+ "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==" -+ }, -+ "node_modules/https-proxy-agent": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", -+ "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", -+ "dependencies": { -+ "agent-base": "6", -+ "debug": "4" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/humanize-ms": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", -+ "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", -+ "dependencies": { -+ "ms": "^2.0.0" -+ } -+ }, -+ "node_modules/hyperscript-attribute-to-property": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/hyperscript-attribute-to-property/-/hyperscript-attribute-to-property-1.0.2.tgz", -+ "integrity": "sha512-oerMul16jZCmrbNsUw8QgrtDzF8lKgFri1bKQjReLw1IhiiNkI59CWuzZjJDGT79UQ1YiWqXhJMv/tRMVqgtkA==" -+ }, -+ "node_modules/hyperx": { -+ "version": "2.5.4", -+ "resolved": "https://registry.npmjs.org/hyperx/-/hyperx-2.5.4.tgz", -+ "integrity": "sha512-iOkSh7Yse7lsN/B9y7OsevLWjeXPqGuHQ5SbwaiJM5xAhWFqhoN6erpK1dQsS12OFU36lyai1pnx1mmzWLQqcA==", -+ "dependencies": { -+ "hyperscript-attribute-to-property": "^1.0.0" -+ } -+ }, -+ "node_modules/iconv-lite": { -+ "version": "0.6.3", -+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", -+ "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", -+ "optional": true, -+ "dependencies": { -+ "safer-buffer": ">= 2.1.2 < 3.0.0" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/ieee754": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", -+ "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/feross" -+ }, -+ { -+ "type": "patreon", -+ "url": "https://www.patreon.com/feross" -+ }, -+ { -+ "type": "consulting", -+ "url": "https://feross.org/support" -+ } -+ ] -+ }, -+ "node_modules/ignore": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", -+ "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", -+ "engines": { -+ "node": ">= 4" -+ } -+ }, -+ "node_modules/ignore-by-default": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", -+ "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==" -+ }, -+ "node_modules/import-fresh": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", -+ "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", -+ "dependencies": { -+ "parent-module": "^1.0.0", -+ "resolve-from": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=6" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/import-lazy": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", -+ "integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/imurmurhash": { -+ "version": "0.1.4", -+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", -+ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", -+ "engines": { -+ "node": ">=0.8.19" -+ } -+ }, -+ "node_modules/indent-string": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", -+ "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/infer-owner": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", -+ "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==" -+ }, -+ "node_modules/inflight": { -+ "version": "1.0.6", -+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", -+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", -+ "dependencies": { -+ "once": "^1.3.0", -+ "wrappy": "1" -+ } -+ }, -+ "node_modules/inherits": { -+ "version": "2.0.4", -+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", -+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" -+ }, -+ "node_modules/ini": { -+ "version": "1.3.8", -+ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", -+ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" -+ }, -+ "node_modules/inline-source-map": { -+ "version": "0.6.2", -+ "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz", -+ "integrity": "sha512-0mVWSSbNDvedDWIN4wxLsdPM4a7cIPcpyMxj3QZ406QRwQ6ePGB1YIHxVPjqpcUGbWQ5C+nHTwGNWAGvt7ggVA==", -+ "dependencies": { -+ "source-map": "~0.5.3" -+ } -+ }, -+ "node_modules/insert-module-globals": { -+ "version": "7.2.1", -+ "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.1.tgz", -+ "integrity": "sha512-ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg==", -+ "dependencies": { -+ "acorn-node": "^1.5.2", -+ "combine-source-map": "^0.8.0", -+ "concat-stream": "^1.6.1", -+ "is-buffer": "^1.1.0", -+ "JSONStream": "^1.0.3", -+ "path-is-absolute": "^1.0.1", -+ "process": "~0.11.0", -+ "through2": "^2.0.0", -+ "undeclared-identifiers": "^1.1.2", -+ "xtend": "^4.0.0" -+ }, -+ "bin": { -+ "insert-module-globals": "bin/cmd.js" -+ } -+ }, -+ "node_modules/ip": { -+ "version": "1.1.8", -+ "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", -+ "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==" -+ }, -+ "node_modules/is-arguments": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", -+ "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "has-tostringtag": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-arrayish": { -+ "version": "0.2.1", -+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", -+ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" -+ }, -+ "node_modules/is-binary-path": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", -+ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", -+ "dependencies": { -+ "binary-extensions": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/is-boolean-attribute": { -+ "version": "0.0.1", -+ "resolved": "https://registry.npmjs.org/is-boolean-attribute/-/is-boolean-attribute-0.0.1.tgz", -+ "integrity": "sha512-0kXT52Scokg2Miscvsn5UVqg6y1691vcLJcagie1YHJB4zOEuAhMERLX992jtvaStGy2xQTqOtJhvmG/MK1T5w==" -+ }, -+ "node_modules/is-buffer": { -+ "version": "1.1.6", -+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", -+ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" -+ }, -+ "node_modules/is-callable": { -+ "version": "1.2.7", -+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", -+ "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-ci": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", -+ "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", -+ "dependencies": { -+ "ci-info": "^2.0.0" -+ }, -+ "bin": { -+ "is-ci": "bin.js" -+ } -+ }, -+ "node_modules/is-core-module": { -+ "version": "2.11.0", -+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", -+ "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", -+ "dependencies": { -+ "has": "^1.0.3" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-date-object": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", -+ "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", -+ "dependencies": { -+ "has-tostringtag": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-docker": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", -+ "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", -+ "bin": { -+ "is-docker": "cli.js" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/is-extglob": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", -+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/is-fullwidth-code-point": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", -+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/is-generator-function": { -+ "version": "1.0.10", -+ "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", -+ "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", -+ "dependencies": { -+ "has-tostringtag": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-glob": { -+ "version": "4.0.3", -+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", -+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", -+ "dependencies": { -+ "is-extglob": "^2.1.1" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/is-installed-globally": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", -+ "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", -+ "dependencies": { -+ "global-dirs": "^3.0.0", -+ "is-path-inside": "^3.0.2" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/is-lambda": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", -+ "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==" -+ }, -+ "node_modules/is-npm": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz", -+ "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/is-number": { -+ "version": "7.0.0", -+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", -+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", -+ "engines": { -+ "node": ">=0.12.0" -+ } -+ }, -+ "node_modules/is-obj": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", -+ "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/is-path-inside": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", -+ "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/is-plain-obj": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", -+ "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/is-regex": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", -+ "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "has-tostringtag": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-regexp": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", -+ "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/is-stream": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", -+ "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/is-typed-array": { -+ "version": "1.1.10", -+ "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", -+ "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", -+ "dependencies": { -+ "available-typed-arrays": "^1.0.5", -+ "call-bind": "^1.0.2", -+ "for-each": "^0.3.3", -+ "gopd": "^1.0.1", -+ "has-tostringtag": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-typedarray": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", -+ "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==" -+ }, -+ "node_modules/is-wsl": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", -+ "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", -+ "dependencies": { -+ "is-docker": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/is-yarn-global": { -+ "version": "0.3.0", -+ "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz", -+ "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==" -+ }, -+ "node_modules/isarray": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", -+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" -+ }, -+ "node_modules/isbinaryfile": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz", -+ "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", -+ "dependencies": { -+ "buffer-alloc": "^1.2.0" -+ }, -+ "engines": { -+ "node": ">=0.6.0" -+ } -+ }, -+ "node_modules/isexe": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", -+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" -+ }, -+ "node_modules/isstream": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", -+ "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==" -+ }, -+ "node_modules/js-base64": { -+ "version": "2.6.4", -+ "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", -+ "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" -+ }, -+ "node_modules/js-tokens": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", -+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" -+ }, -+ "node_modules/js-yaml": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", -+ "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", -+ "dependencies": { -+ "argparse": "^2.0.1" -+ }, -+ "bin": { -+ "js-yaml": "bin/js-yaml.js" -+ } -+ }, -+ "node_modules/jsbn": { -+ "version": "0.1.1", -+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", -+ "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==" -+ }, -+ "node_modules/jsesc": { -+ "version": "2.5.2", -+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", -+ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", -+ "bin": { -+ "jsesc": "bin/jsesc" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/json-buffer": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", -+ "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==" -+ }, -+ "node_modules/json-parse-even-better-errors": { -+ "version": "2.3.1", -+ "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", -+ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" -+ }, -+ "node_modules/json-schema": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", -+ "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" -+ }, -+ "node_modules/json-schema-traverse": { -+ "version": "0.4.1", -+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", -+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" -+ }, -+ "node_modules/json-stable-stringify-without-jsonify": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", -+ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" -+ }, -+ "node_modules/json-stringify-safe": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", -+ "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==" -+ }, -+ "node_modules/json5": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", -+ "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", -+ "bin": { -+ "json5": "lib/cli.js" -+ }, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/jsondiffpatch": { -+ "version": "0.4.1", -+ "resolved": "https://registry.npmjs.org/jsondiffpatch/-/jsondiffpatch-0.4.1.tgz", -+ "integrity": "sha512-t0etAxTUk1w5MYdNOkZBZ8rvYYN5iL+2dHCCx/DpkFm/bW28M6y5nUS83D4XdZiHy35Fpaw6LBb+F88fHZnVCw==", -+ "dependencies": { -+ "chalk": "^2.3.0", -+ "diff-match-patch": "^1.0.0" -+ }, -+ "bin": { -+ "jsondiffpatch": "bin/jsondiffpatch" -+ }, -+ "engines": { -+ "node": ">=8.17.0" -+ } -+ }, -+ "node_modules/jsonfile": { -+ "version": "6.1.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", -+ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", -+ "dependencies": { -+ "universalify": "^2.0.0" -+ }, -+ "optionalDependencies": { -+ "graceful-fs": "^4.1.6" -+ } -+ }, -+ "node_modules/jsonparse": { -+ "version": "1.3.1", -+ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", -+ "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", -+ "engines": [ -+ "node >= 0.2.0" -+ ] -+ }, -+ "node_modules/JSONStream": { -+ "version": "1.3.5", -+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", -+ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", -+ "dependencies": { -+ "jsonparse": "^1.2.0", -+ "through": ">=2.2.7 <3" -+ }, -+ "bin": { -+ "JSONStream": "bin.js" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/jsprim": { -+ "version": "1.4.2", -+ "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", -+ "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", -+ "dependencies": { -+ "assert-plus": "1.0.0", -+ "extsprintf": "1.3.0", -+ "json-schema": "0.4.0", -+ "verror": "1.10.0" -+ }, -+ "engines": { -+ "node": ">=0.6.0" -+ } -+ }, -+ "node_modules/junk": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz", -+ "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/keyboardevent-from-electron-accelerator": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-2.0.0.tgz", -+ "integrity": "sha512-iQcmNA0M4ETMNi0kG/q0h/43wZk7rMeKYrXP7sqKIJbHkTU8Koowgzv+ieR/vWJbOwxx5nDC3UnudZ0aLSu4VA==" -+ }, -+ "node_modules/keyboardevents-areequal": { -+ "version": "0.2.2", -+ "resolved": "https://registry.npmjs.org/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz", -+ "integrity": "sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw==" -+ }, -+ "node_modules/keyboardjs": { -+ "version": "2.6.4", -+ "resolved": "https://registry.npmjs.org/keyboardjs/-/keyboardjs-2.6.4.tgz", -+ "integrity": "sha512-xDiNwiwH3KUqap++RFJiLAXzbvRB5Yw08xliuceOgLhM1o7g1puKKR9vWy6wp9H/Bi4VP0+SQMpiWXMWWmR6rA==" -+ }, -+ "node_modules/keyv": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", -+ "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", -+ "dependencies": { -+ "json-buffer": "3.0.0" -+ } -+ }, -+ "node_modules/kind-of": { -+ "version": "6.0.3", -+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", -+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/labeled-stream-splicer": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz", -+ "integrity": "sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==", -+ "dependencies": { -+ "inherits": "^2.0.1", -+ "stream-splicer": "^2.0.0" -+ } -+ }, -+ "node_modules/latest-version": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz", -+ "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==", -+ "dependencies": { -+ "package-json": "^6.3.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/levn": { -+ "version": "0.4.1", -+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", -+ "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", -+ "dependencies": { -+ "prelude-ls": "^1.2.1", -+ "type-check": "~0.4.0" -+ }, -+ "engines": { -+ "node": ">= 0.8.0" -+ } -+ }, -+ "node_modules/licensify": { -+ "version": "3.1.3", -+ "resolved": "https://registry.npmjs.org/licensify/-/licensify-3.1.3.tgz", -+ "integrity": "sha512-3sEEBR0Cxq8yeSrV1KGZwpjm4KJKp8Cx/WHZxBnG/YX319ZTvxGtL+NCF+A9pcXwh8KwKB4BmVrc6eRrfk/Raw==", -+ "dependencies": { -+ "convert-source-map": "^1.1.3", -+ "offset-sourcemap-lines": "^1.0.0", -+ "oss-license-name-to-url": "^1.2.1", -+ "through2": "^2.0.0", -+ "type-name": "^2.0.0" -+ } -+ }, -+ "node_modules/lines-and-columns": { -+ "version": "1.2.4", -+ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", -+ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" -+ }, -+ "node_modules/load-json-file": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", -+ "integrity": "sha512-3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ==", -+ "dependencies": { -+ "graceful-fs": "^4.1.2", -+ "parse-json": "^2.2.0", -+ "pify": "^2.0.0", -+ "strip-bom": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/load-json-file/node_modules/pify": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", -+ "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/locate-path": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", -+ "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==", -+ "dependencies": { -+ "p-locate": "^2.0.0", -+ "path-exists": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/lodash": { -+ "version": "4.17.21", -+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", -+ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" -+ }, -+ "node_modules/lodash.debounce": { -+ "version": "4.0.8", -+ "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", -+ "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" -+ }, -+ "node_modules/lodash.get": { -+ "version": "4.4.2", -+ "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", -+ "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==" -+ }, -+ "node_modules/lodash.memoize": { -+ "version": "3.0.4", -+ "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz", -+ "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A==" -+ }, -+ "node_modules/lodash.merge": { -+ "version": "4.6.2", -+ "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", -+ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" -+ }, -+ "node_modules/long": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", -+ "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" -+ }, -+ "node_modules/loop-protect": { -+ "version": "1.0.1", -+ "resolved": "git+ssh://git@github.com/jean-emmanuel/loop-protect.git#335856f37ee4a805704bfcd1d7429ab94620bf6d" -+ }, -+ "node_modules/lower-case": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", -+ "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==" -+ }, -+ "node_modules/lowercase-keys": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", -+ "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/lru-cache": { -+ "version": "6.0.0", -+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", -+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", -+ "dependencies": { -+ "yallist": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/magic-string": { -+ "version": "0.23.2", -+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.23.2.tgz", -+ "integrity": "sha512-oIUZaAxbcxYIp4AyLafV6OVKoB3YouZs0UTCJ8mOKBHNyJgGDaMJ4TgA+VylJh6fx7EQCC52XkbURxxG9IoJXA==", -+ "dependencies": { -+ "sourcemap-codec": "^1.4.1" -+ } -+ }, -+ "node_modules/make-dir": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", -+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", -+ "dependencies": { -+ "semver": "^6.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/make-dir/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/make-fetch-happen": { -+ "version": "9.1.0", -+ "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz", -+ "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==", -+ "dependencies": { -+ "agentkeepalive": "^4.1.3", -+ "cacache": "^15.2.0", -+ "http-cache-semantics": "^4.1.0", -+ "http-proxy-agent": "^4.0.1", -+ "https-proxy-agent": "^5.0.0", -+ "is-lambda": "^1.0.1", -+ "lru-cache": "^6.0.0", -+ "minipass": "^3.1.3", -+ "minipass-collect": "^1.0.2", -+ "minipass-fetch": "^1.3.2", -+ "minipass-flush": "^1.0.5", -+ "minipass-pipeline": "^1.2.4", -+ "negotiator": "^0.6.2", -+ "promise-retry": "^2.0.1", -+ "socks-proxy-agent": "^6.0.0", -+ "ssri": "^8.0.0" -+ }, -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/map-obj": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", -+ "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/matcher": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz", -+ "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==", -+ "optional": true, -+ "dependencies": { -+ "escape-string-regexp": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/matcher/node_modules/escape-string-regexp": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", -+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", -+ "optional": true, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/md5.js": { -+ "version": "1.3.5", -+ "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", -+ "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", -+ "dependencies": { -+ "hash-base": "^3.0.0", -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.1.2" -+ } -+ }, -+ "node_modules/meow": { -+ "version": "9.0.0", -+ "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz", -+ "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" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/meow/node_modules/find-up": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", -+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", -+ "dependencies": { -+ "locate-path": "^5.0.0", -+ "path-exists": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/meow/node_modules/hosted-git-info": { -+ "version": "2.8.9", -+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", -+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" -+ }, -+ "node_modules/meow/node_modules/locate-path": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", -+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", -+ "dependencies": { -+ "p-locate": "^4.1.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/meow/node_modules/p-limit": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", -+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", -+ "dependencies": { -+ "p-try": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=6" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/meow/node_modules/p-locate": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", -+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", -+ "dependencies": { -+ "p-limit": "^2.2.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/meow/node_modules/p-try": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", -+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/meow/node_modules/parse-json": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", -+ "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" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/meow/node_modules/path-exists": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", -+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/meow/node_modules/read-pkg": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", -+ "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" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/meow/node_modules/read-pkg-up": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", -+ "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", -+ "dependencies": { -+ "find-up": "^4.1.0", -+ "read-pkg": "^5.2.0", -+ "type-fest": "^0.8.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/meow/node_modules/read-pkg-up/node_modules/type-fest": { -+ "version": "0.8.1", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", -+ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/meow/node_modules/read-pkg/node_modules/normalize-package-data": { -+ "version": "2.5.0", -+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", -+ "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" -+ } -+ }, -+ "node_modules/meow/node_modules/read-pkg/node_modules/type-fest": { -+ "version": "0.6.0", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", -+ "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/meow/node_modules/semver": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", -+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", -+ "bin": { -+ "semver": "bin/semver" -+ } -+ }, -+ "node_modules/merge-source-map": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz", -+ "integrity": "sha512-PGSmS0kfnTnMJCzJ16BLLCEe6oeYCamKFFdQKshi4BmM6FUwipjVOcBFGxqtQtirtAG4iZvHlqST9CpZKqlRjA==", -+ "dependencies": { -+ "source-map": "^0.5.6" -+ } -+ }, -+ "node_modules/miller-rabin": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", -+ "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", -+ "dependencies": { -+ "bn.js": "^4.0.0", -+ "brorand": "^1.0.1" -+ }, -+ "bin": { -+ "miller-rabin": "bin/miller-rabin" -+ } -+ }, -+ "node_modules/miller-rabin/node_modules/bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ }, -+ "node_modules/mime": { -+ "version": "1.6.0", -+ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", -+ "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", -+ "bin": { -+ "mime": "cli.js" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/mime-db": { -+ "version": "1.52.0", -+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", -+ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", -+ "engines": { -+ "node": ">= 0.6" -+ } -+ }, -+ "node_modules/mime-types": { -+ "version": "2.1.35", -+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", -+ "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", -+ "dependencies": { -+ "mime-db": "1.52.0" -+ }, -+ "engines": { -+ "node": ">= 0.6" -+ } -+ }, -+ "node_modules/mimic-response": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", -+ "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/min-indent": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", -+ "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/minimalistic-assert": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", -+ "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" -+ }, -+ "node_modules/minimalistic-crypto-utils": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", -+ "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==" -+ }, -+ "node_modules/minimatch": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz", -+ "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==", -+ "dependencies": { -+ "brace-expansion": "^2.0.1" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/minimist": { -+ "version": "1.2.7", -+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", -+ "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/minimist-options": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", -+ "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", -+ "dependencies": { -+ "arrify": "^1.0.1", -+ "is-plain-obj": "^1.1.0", -+ "kind-of": "^6.0.3" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/minipass": { -+ "version": "3.3.4", -+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz", -+ "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==", -+ "dependencies": { -+ "yallist": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/minipass-collect": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", -+ "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", -+ "dependencies": { -+ "minipass": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/minipass-fetch": { -+ "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz", -+ "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==", -+ "dependencies": { -+ "minipass": "^3.1.0", -+ "minipass-sized": "^1.0.3", -+ "minizlib": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "optionalDependencies": { -+ "encoding": "^0.1.12" -+ } -+ }, -+ "node_modules/minipass-flush": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", -+ "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", -+ "dependencies": { -+ "minipass": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/minipass-pipeline": { -+ "version": "1.2.4", -+ "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", -+ "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", -+ "dependencies": { -+ "minipass": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/minipass-sized": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", -+ "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", -+ "dependencies": { -+ "minipass": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/minizlib": { -+ "version": "2.1.2", -+ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", -+ "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", -+ "dependencies": { -+ "minipass": "^3.0.0", -+ "yallist": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/mkdirp": { -+ "version": "0.5.6", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", -+ "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", -+ "dependencies": { -+ "minimist": "^1.2.6" -+ }, -+ "bin": { -+ "mkdirp": "bin/cmd.js" -+ } -+ }, -+ "node_modules/mkdirp-classic": { -+ "version": "0.5.3", -+ "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", -+ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" -+ }, -+ "node_modules/module-deps": { -+ "version": "6.2.3", -+ "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz", -+ "integrity": "sha512-fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA==", -+ "dependencies": { -+ "browser-resolve": "^2.0.0", -+ "cached-path-relative": "^1.0.2", -+ "concat-stream": "~1.6.0", -+ "defined": "^1.0.0", -+ "detective": "^5.2.0", -+ "duplexer2": "^0.1.2", -+ "inherits": "^2.0.1", -+ "JSONStream": "^1.0.3", -+ "parents": "^1.0.0", -+ "readable-stream": "^2.0.2", -+ "resolve": "^1.4.0", -+ "stream-combiner2": "^1.1.1", -+ "subarg": "^1.0.0", -+ "through2": "^2.0.0", -+ "xtend": "^4.0.0" -+ }, -+ "bin": { -+ "module-deps": "bin/cmd.js" -+ }, -+ "engines": { -+ "node": ">= 0.8.0" -+ } -+ }, -+ "node_modules/mold-source-map": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/mold-source-map/-/mold-source-map-0.4.0.tgz", -+ "integrity": "sha512-Y0uA/sDKVuPgLd7BmaJOai+fqzjrOlR6vZgx5cJIvturI/xOPQPgbf3X7ZbzJd6MvqQ6ucIfK8dSteFyc2Mw2w==", -+ "dependencies": { -+ "convert-source-map": "^1.1.0", -+ "through": "~2.2.7" -+ } -+ }, -+ "node_modules/mold-source-map/node_modules/through": { -+ "version": "2.2.7", -+ "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz", -+ "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==" -+ }, -+ "node_modules/ms": { -+ "version": "2.1.2", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", -+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" -+ }, -+ "node_modules/multicast-dns": { -+ "version": "7.2.1", -+ "resolved": "git+ssh://git@github.com/jean-emmanuel/multicast-dns.git#1bb9f6ba892eba88f2cb12ca96a1c1b3088413c0", -+ "license": "MIT", -+ "dependencies": { -+ "dns-packet": "^1.3.1", -+ "thunky": "^1.0.2" -+ }, -+ "bin": { -+ "multicast-dns": "cli.js" -+ } -+ }, -+ "node_modules/multicast-dns-service-types": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", -+ "integrity": "sha512-cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ==" -+ }, -+ "node_modules/mutexify": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/mutexify/-/mutexify-1.4.0.tgz", -+ "integrity": "sha512-pbYSsOrSB/AKN5h/WzzLRMFgZhClWccf2XIB4RSMC8JbquiB0e0/SH5AIfdQMdyHmYtv4seU7yV/TvAwPLJ1Yg==", -+ "dependencies": { -+ "queue-tick": "^1.0.0" -+ } -+ }, -+ "node_modules/nan": { -+ "version": "2.17.0", -+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", -+ "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==" -+ }, -+ "node_modules/nanoassert": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz", -+ "integrity": "sha512-C40jQ3NzfkP53NsO8kEOFd79p4b9kDXQMwgiY1z8ZwrDZgUyom0AHwGegF4Dm99L+YoYhuaB0ceerUcXmqr1rQ==" -+ }, -+ "node_modules/nanobench": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/nanobench/-/nanobench-2.1.1.tgz", -+ "integrity": "sha512-z+Vv7zElcjN+OpzAxAquUayFLGK3JI/ubCl0Oh64YQqsTGG09CGqieJVQw4ui8huDnnAgrvTv93qi5UaOoNj8A==", -+ "dependencies": { -+ "browser-process-hrtime": "^0.1.2", -+ "chalk": "^1.1.3", -+ "mutexify": "^1.1.0", -+ "pretty-hrtime": "^1.0.2" -+ }, -+ "bin": { -+ "nanobench": "run.js", -+ "nanobench-compare": "compare.js" -+ } -+ }, -+ "node_modules/nanobench/node_modules/ansi-regex": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", -+ "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/nanobench/node_modules/ansi-styles": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", -+ "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/nanobench/node_modules/chalk": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", -+ "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==", -+ "dependencies": { -+ "ansi-styles": "^2.2.1", -+ "escape-string-regexp": "^1.0.2", -+ "has-ansi": "^2.0.0", -+ "strip-ansi": "^3.0.0", -+ "supports-color": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/nanobench/node_modules/strip-ansi": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", -+ "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", -+ "dependencies": { -+ "ansi-regex": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/nanobench/node_modules/supports-color": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", -+ "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==", -+ "engines": { -+ "node": ">=0.8.0" -+ } -+ }, -+ "node_modules/nanohtml": { -+ "version": "1.10.0", -+ "resolved": "https://registry.npmjs.org/nanohtml/-/nanohtml-1.10.0.tgz", -+ "integrity": "sha512-r/3AQl+jxAxUIJRiKExUjBtFcE1cm4yTOsTIdVqqlxPNtBxJh522ANrcQYzdNHhPzbPgb7j6qujq6eGehBX0kg==", -+ "dependencies": { -+ "acorn-node": "^1.8.2", -+ "camel-case": "^3.0.0", -+ "convert-source-map": "^1.5.1", -+ "estree-is-member-expression": "^1.0.0", -+ "hyperx": "^2.5.0", -+ "is-boolean-attribute": "0.0.1", -+ "nanoassert": "^1.1.0", -+ "nanobench": "^2.1.0", -+ "normalize-html-whitespace": "^0.2.0", -+ "through2": "^2.0.3", -+ "transform-ast": "^2.4.0" -+ } -+ }, -+ "node_modules/nanoid": { -+ "version": "3.3.4", -+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", -+ "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", -+ "bin": { -+ "nanoid": "bin/nanoid.cjs" -+ }, -+ "engines": { -+ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" -+ } -+ }, -+ "node_modules/nanomorph": { -+ "version": "5.4.3", -+ "resolved": "https://registry.npmjs.org/nanomorph/-/nanomorph-5.4.3.tgz", -+ "integrity": "sha512-uPP5y0x21KISffZCKHh1A0QW0RHZFQS0BR7LetlHBlay6UWAbjwhjiJTxOO6JeMHko5Cigl617zFoGrYFJ8ZLg==", -+ "dependencies": { -+ "nanoassert": "^1.1.0" -+ } -+ }, -+ "node_modules/napi-build-utils": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", -+ "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==", -+ "optional": true -+ }, -+ "node_modules/natural-compare": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", -+ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" -+ }, -+ "node_modules/negotiator": { -+ "version": "0.6.3", -+ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", -+ "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", -+ "engines": { -+ "node": ">= 0.6" -+ } -+ }, -+ "node_modules/no-case": { -+ "version": "2.3.2", -+ "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", -+ "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", -+ "dependencies": { -+ "lower-case": "^1.1.1" -+ } -+ }, -+ "node_modules/node-abi": { -+ "version": "3.28.0", -+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.28.0.tgz", -+ "integrity": "sha512-fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A==", -+ "optional": true, -+ "dependencies": { -+ "semver": "^7.3.5" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/node-forge": { -+ "version": "1.3.1", -+ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", -+ "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", -+ "engines": { -+ "node": ">= 6.13.0" -+ } -+ }, -+ "node_modules/node-gyp": { -+ "version": "8.4.1", -+ "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz", -+ "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==", -+ "dependencies": { -+ "env-paths": "^2.2.0", -+ "glob": "^7.1.4", -+ "graceful-fs": "^4.2.6", -+ "make-fetch-happen": "^9.1.0", -+ "nopt": "^5.0.0", -+ "npmlog": "^6.0.0", -+ "rimraf": "^3.0.2", -+ "semver": "^7.3.5", -+ "tar": "^6.1.2", -+ "which": "^2.0.2" -+ }, -+ "bin": { -+ "node-gyp": "bin/node-gyp.js" -+ }, -+ "engines": { -+ "node": ">= 10.12.0" -+ } -+ }, -+ "node_modules/node-gyp/node_modules/are-we-there-yet": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", -+ "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", -+ "dependencies": { -+ "delegates": "^1.0.0", -+ "readable-stream": "^3.6.0" -+ }, -+ "engines": { -+ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" -+ } -+ }, -+ "node_modules/node-gyp/node_modules/gauge": { -+ "version": "4.0.4", -+ "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", -+ "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", -+ "dependencies": { -+ "aproba": "^1.0.3 || ^2.0.0", -+ "color-support": "^1.1.3", -+ "console-control-strings": "^1.1.0", -+ "has-unicode": "^2.0.1", -+ "signal-exit": "^3.0.7", -+ "string-width": "^4.2.3", -+ "strip-ansi": "^6.0.1", -+ "wide-align": "^1.1.5" -+ }, -+ "engines": { -+ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" -+ } -+ }, -+ "node_modules/node-gyp/node_modules/npmlog": { -+ "version": "6.0.2", -+ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", -+ "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", -+ "dependencies": { -+ "are-we-there-yet": "^3.0.0", -+ "console-control-strings": "^1.1.0", -+ "gauge": "^4.0.3", -+ "set-blocking": "^2.0.0" -+ }, -+ "engines": { -+ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" -+ } -+ }, -+ "node_modules/node-gyp/node_modules/readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/node-gyp/node_modules/rimraf": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", -+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", -+ "dependencies": { -+ "glob": "^7.1.3" -+ }, -+ "bin": { -+ "rimraf": "bin.js" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/isaacs" -+ } -+ }, -+ "node_modules/node-mouse": { -+ "version": "0.0.2", -+ "resolved": "https://registry.npmjs.org/node-mouse/-/node-mouse-0.0.2.tgz", -+ "integrity": "sha512-qqm+c/uKB1ceGMrKW+mxAxPKFTu0HD1DWoCElJHA0VQDloudzZD4bI++Z18mSDA3n5lix+RTXiOiu3XAOSYVHA==" -+ }, -+ "node_modules/node-releases": { -+ "version": "2.0.6", -+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", -+ "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==" -+ }, -+ "node_modules/node-sass": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-7.0.1.tgz", -+ "integrity": "sha512-uMy+Xt29NlqKCFdFRZyXKOTqGt+QaKHexv9STj2WeLottnlqZEEWx6Bj0MXNthmFRRdM/YwyNo/8Tr46TOM0jQ==", -+ "hasInstallScript": true, -+ "dependencies": { -+ "async-foreach": "^0.1.3", -+ "chalk": "^4.1.2", -+ "cross-spawn": "^7.0.3", -+ "gaze": "^1.0.0", -+ "get-stdin": "^4.0.1", -+ "glob": "^7.0.3", -+ "lodash": "^4.17.15", -+ "meow": "^9.0.0", -+ "nan": "^2.13.2", -+ "node-gyp": "^8.4.1", -+ "npmlog": "^5.0.0", -+ "request": "^2.88.0", -+ "sass-graph": "4.0.0", -+ "stdout-stream": "^1.4.0", -+ "true-case-path": "^1.0.2" -+ }, -+ "bin": { -+ "node-sass": "bin/node-sass" -+ }, -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/node-sass/node_modules/ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "dependencies": { -+ "color-convert": "^2.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/ansi-styles?sponsor=1" -+ } -+ }, -+ "node_modules/node-sass/node_modules/chalk": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", -+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -+ "dependencies": { -+ "ansi-styles": "^4.1.0", -+ "supports-color": "^7.1.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/chalk?sponsor=1" -+ } -+ }, -+ "node_modules/node-sass/node_modules/color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "dependencies": { -+ "color-name": "~1.1.4" -+ }, -+ "engines": { -+ "node": ">=7.0.0" -+ } -+ }, -+ "node_modules/node-sass/node_modules/color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "node_modules/node-sass/node_modules/has-flag": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/node-sass/node_modules/supports-color": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -+ "dependencies": { -+ "has-flag": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/nodemon": { -+ "version": "2.0.16", -+ "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.16.tgz", -+ "integrity": "sha512-zsrcaOfTWRuUzBn3P44RDliLlp263Z/76FPoHFr3cFFkOz0lTPAcIw8dCzfdVIx/t3AtDYCZRCDkoCojJqaG3w==", -+ "hasInstallScript": true, -+ "dependencies": { -+ "chokidar": "^3.5.2", -+ "debug": "^3.2.7", -+ "ignore-by-default": "^1.0.1", -+ "minimatch": "^3.0.4", -+ "pstree.remy": "^1.1.8", -+ "semver": "^5.7.1", -+ "supports-color": "^5.5.0", -+ "touch": "^3.1.0", -+ "undefsafe": "^2.0.5", -+ "update-notifier": "^5.1.0" -+ }, -+ "bin": { -+ "nodemon": "bin/nodemon.js" -+ }, -+ "engines": { -+ "node": ">=8.10.0" -+ }, -+ "funding": { -+ "type": "opencollective", -+ "url": "https://opencollective.com/nodemon" -+ } -+ }, -+ "node_modules/nodemon/node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/nodemon/node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "node_modules/nodemon/node_modules/debug": { -+ "version": "3.2.7", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", -+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", -+ "dependencies": { -+ "ms": "^2.1.1" -+ } -+ }, -+ "node_modules/nodemon/node_modules/minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/nodemon/node_modules/semver": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", -+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", -+ "bin": { -+ "semver": "bin/semver" -+ } -+ }, -+ "node_modules/nopt": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", -+ "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", -+ "dependencies": { -+ "abbrev": "1" -+ }, -+ "bin": { -+ "nopt": "bin/nopt.js" -+ }, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/normalize-html-whitespace": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/normalize-html-whitespace/-/normalize-html-whitespace-0.2.0.tgz", -+ "integrity": "sha512-5CZAEQ4bQi8Msqw0GAT6rrkrjNN4ZKqAG3+jJMwms4O6XoMvh6ekwOueG4mRS1LbPUR1r9EdnhxxfpzMTOdzKw==", -+ "engines": { -+ "node": ">= 0.10" -+ } -+ }, -+ "node_modules/normalize-package-data": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", -+ "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" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/normalize-path": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", -+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/normalize-url": { -+ "version": "4.5.1", -+ "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz", -+ "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/nosleep.js": { -+ "version": "0.12.0", -+ "resolved": "https://registry.npmjs.org/nosleep.js/-/nosleep.js-0.12.0.tgz", -+ "integrity": "sha512-9d1HbpKLh3sdWlhXMhU6MMH+wQzKkrgfRkYV0EBdvt99YJfj0ilCJrWRDYG2130Tm4GXbEoTCx5b34JSaP+HhA==" -+ }, -+ "node_modules/npm-conf": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", -+ "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", -+ "optional": true, -+ "dependencies": { -+ "config-chain": "^1.1.11", -+ "pify": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/npmlog": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", -+ "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", -+ "dependencies": { -+ "are-we-there-yet": "^2.0.0", -+ "console-control-strings": "^1.1.0", -+ "gauge": "^3.0.0", -+ "set-blocking": "^2.0.0" -+ } -+ }, -+ "node_modules/oauth-sign": { -+ "version": "0.9.0", -+ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", -+ "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/object-assign": { -+ "version": "4.1.1", -+ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", -+ "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/object-is": { -+ "version": "1.1.5", -+ "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", -+ "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.3" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/object-keys": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", -+ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", -+ "engines": { -+ "node": ">= 0.4" -+ } -+ }, -+ "node_modules/offset-sourcemap-lines": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/offset-sourcemap-lines/-/offset-sourcemap-lines-1.0.1.tgz", -+ "integrity": "sha512-8giJa0GProV9hPLOp9qAobkvi6OiZnzeM6fdubVjhqcrISX8FYMk1jMVzG6R9d7HQWLysG22jyXEIF6sWu4fJw==", -+ "dependencies": { -+ "source-map": "^0.5.0" -+ } -+ }, -+ "node_modules/on-finished": { -+ "version": "2.4.1", -+ "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", -+ "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", -+ "dependencies": { -+ "ee-first": "1.1.1" -+ }, -+ "engines": { -+ "node": ">= 0.8" -+ } -+ }, -+ "node_modules/once": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", -+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", -+ "dependencies": { -+ "wrappy": "1" -+ } -+ }, -+ "node_modules/open": { -+ "version": "8.4.0", -+ "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz", -+ "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==", -+ "dependencies": { -+ "define-lazy-prop": "^2.0.0", -+ "is-docker": "^2.1.1", -+ "is-wsl": "^2.2.0" -+ }, -+ "engines": { -+ "node": ">=12" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/optionator": { -+ "version": "0.9.1", -+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", -+ "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" -+ }, -+ "engines": { -+ "node": ">= 0.8.0" -+ } -+ }, -+ "node_modules/os-browserify": { -+ "version": "0.3.0", -+ "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", -+ "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==" -+ }, -+ "node_modules/osc": { -+ "version": "2.4.2", -+ "resolved": "git+ssh://git@github.com/jean-emmanuel/osc.js.git#9197739162f26086e6a72670103c3fa036e9dcd5", -+ "license": "(MIT OR GPL-2.0)", -+ "dependencies": { -+ "long": "4.0.0", -+ "slip": "1.0.2", -+ "wolfy87-eventemitter": "5.2.9", -+ "ws": "7.5.3" -+ }, -+ "optionalDependencies": { -+ "serialport": "9.2.0" -+ } -+ }, -+ "node_modules/osc/node_modules/ws": { -+ "version": "7.5.3", -+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz", -+ "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==", -+ "engines": { -+ "node": ">=8.3.0" -+ }, -+ "peerDependencies": { -+ "bufferutil": "^4.0.1", -+ "utf-8-validate": "^5.0.2" -+ }, -+ "peerDependenciesMeta": { -+ "bufferutil": { -+ "optional": true -+ }, -+ "utf-8-validate": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/osi-licenses": { -+ "version": "0.1.1", -+ "resolved": "https://registry.npmjs.org/osi-licenses/-/osi-licenses-0.1.1.tgz", -+ "integrity": "sha512-ZGAGO6dIxTS/mXxEJCpIdYetAoxIOOr7uYpMOoDWo4+b/6rf+2GagOjTbegL+eoMI8aYAiyNgKWUT7vWJRPl9A==", -+ "engines": { -+ "node": ">=0.10", -+ "npm": ">=1.2" -+ } -+ }, -+ "node_modules/oss-license-name-to-url": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/oss-license-name-to-url/-/oss-license-name-to-url-1.2.1.tgz", -+ "integrity": "sha512-apFbKq0EAYi70q0pOpS0tDfSviZYdG3KM6U1GpofZPsRMwgDga0DQiPQ/GHyQx7PDDrLCGvFBNPLMLV/K4Jr4Q==", -+ "dependencies": { -+ "osi-licenses": "^0.1.0" -+ } -+ }, -+ "node_modules/outpipe": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/outpipe/-/outpipe-1.1.1.tgz", -+ "integrity": "sha512-BnNY/RwnDrkmQdUa9U+OfN/Y7AWmKuUPCCd+hbRclZnnANvYpO72zp/a6Q4n829hPbdqEac31XCcsvlEvb+rtA==", -+ "dev": true, -+ "dependencies": { -+ "shell-quote": "^1.4.2" -+ } -+ }, -+ "node_modules/p-cancelable": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", -+ "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/p-limit": { -+ "version": "1.3.0", -+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", -+ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", -+ "dependencies": { -+ "p-try": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/p-locate": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", -+ "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==", -+ "dependencies": { -+ "p-limit": "^1.1.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/p-map": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", -+ "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", -+ "dependencies": { -+ "aggregate-error": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/p-try": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", -+ "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/package-json": { -+ "version": "6.5.0", -+ "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz", -+ "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==", -+ "dependencies": { -+ "got": "^9.6.0", -+ "registry-auth-token": "^4.0.0", -+ "registry-url": "^5.0.0", -+ "semver": "^6.2.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/package-json/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/pako": { -+ "version": "1.0.11", -+ "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", -+ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" -+ }, -+ "node_modules/parent-module": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", -+ "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", -+ "dependencies": { -+ "callsites": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/parents": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz", -+ "integrity": "sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg==", -+ "dependencies": { -+ "path-platform": "~0.11.15" -+ } -+ }, -+ "node_modules/parse-asn1": { -+ "version": "5.1.6", -+ "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", -+ "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", -+ "dependencies": { -+ "asn1.js": "^5.2.0", -+ "browserify-aes": "^1.0.0", -+ "evp_bytestokey": "^1.0.0", -+ "pbkdf2": "^3.0.3", -+ "safe-buffer": "^5.1.1" -+ } -+ }, -+ "node_modules/parse-author": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz", -+ "integrity": "sha512-yx5DfvkN8JsHL2xk2Os9oTia467qnvRgey4ahSm2X8epehBLx/gWLcy5KI+Y36ful5DzGbCS6RazqZGgy1gHNw==", -+ "dependencies": { -+ "author-regex": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/parse-json": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", -+ "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==", -+ "dependencies": { -+ "error-ex": "^1.2.0" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/parse-srcset": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz", -+ "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==" -+ }, -+ "node_modules/path-browserify": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", -+ "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==" -+ }, -+ "node_modules/path-exists": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", -+ "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/path-is-absolute": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", -+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/path-key": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", -+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/path-parse": { -+ "version": "1.0.7", -+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", -+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" -+ }, -+ "node_modules/path-platform": { -+ "version": "0.11.15", -+ "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz", -+ "integrity": "sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==", -+ "engines": { -+ "node": ">= 0.8.0" -+ } -+ }, -+ "node_modules/path-type": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", -+ "integrity": "sha512-dUnb5dXUf+kzhC/W/F4e5/SkluXIFf5VUHolW1Eg1irn1hGWjPGdsRcvYJ1nD6lhk8Ir7VM0bHJKsYTx8Jx9OQ==", -+ "dependencies": { -+ "pify": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/path-type/node_modules/pify": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", -+ "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/pbkdf2": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", -+ "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", -+ "dependencies": { -+ "create-hash": "^1.1.2", -+ "create-hmac": "^1.1.4", -+ "ripemd160": "^2.0.1", -+ "safe-buffer": "^5.0.1", -+ "sha.js": "^2.4.8" -+ }, -+ "engines": { -+ "node": ">=0.12" -+ } -+ }, -+ "node_modules/pend": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", -+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==" -+ }, -+ "node_modules/performance-now": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", -+ "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==" -+ }, -+ "node_modules/picocolors": { -+ "version": "0.2.1", -+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", -+ "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==" -+ }, -+ "node_modules/picomatch": { -+ "version": "2.3.1", -+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", -+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", -+ "engines": { -+ "node": ">=8.6" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/jonschlinkert" -+ } -+ }, -+ "node_modules/pify": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", -+ "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", -+ "optional": true, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/plist": { -+ "version": "3.0.6", -+ "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.6.tgz", -+ "integrity": "sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==", -+ "dependencies": { -+ "base64-js": "^1.5.1", -+ "xmlbuilder": "^15.1.1" -+ }, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/postcss": { -+ "version": "7.0.39", -+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", -+ "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", -+ "dependencies": { -+ "picocolors": "^0.2.1", -+ "source-map": "^0.6.1" -+ }, -+ "engines": { -+ "node": ">=6.0.0" -+ }, -+ "funding": { -+ "type": "opencollective", -+ "url": "https://opencollective.com/postcss/" -+ } -+ }, -+ "node_modules/postcss/node_modules/source-map": { -+ "version": "0.6.1", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", -+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/prebuild-install": { -+ "version": "7.1.1", -+ "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz", -+ "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==", -+ "optional": true, -+ "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", -+ "pump": "^3.0.0", -+ "rc": "^1.2.7", -+ "simple-get": "^4.0.0", -+ "tar-fs": "^2.0.0", -+ "tunnel-agent": "^0.6.0" -+ }, -+ "bin": { -+ "prebuild-install": "bin.js" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/prelude-ls": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", -+ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", -+ "engines": { -+ "node": ">= 0.8.0" -+ } -+ }, -+ "node_modules/prepend-http": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", -+ "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/pretty-hrtime": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", -+ "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==", -+ "engines": { -+ "node": ">= 0.8" -+ } -+ }, -+ "node_modules/process": { -+ "version": "0.11.10", -+ "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", -+ "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", -+ "engines": { -+ "node": ">= 0.6.0" -+ } -+ }, -+ "node_modules/process-nextick-args": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", -+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" -+ }, -+ "node_modules/progress": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", -+ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", -+ "engines": { -+ "node": ">=0.4.0" -+ } -+ }, -+ "node_modules/promise-inflight": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", -+ "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==" -+ }, -+ "node_modules/promise-retry": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", -+ "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", -+ "dependencies": { -+ "err-code": "^2.0.2", -+ "retry": "^0.12.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/proto-list": { -+ "version": "1.2.4", -+ "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", -+ "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", -+ "optional": true -+ }, -+ "node_modules/psl": { -+ "version": "1.9.0", -+ "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", -+ "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==" -+ }, -+ "node_modules/pstree.remy": { -+ "version": "1.1.8", -+ "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", -+ "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==" -+ }, -+ "node_modules/public-encrypt": { -+ "version": "4.0.3", -+ "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", -+ "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", -+ "dependencies": { -+ "bn.js": "^4.1.0", -+ "browserify-rsa": "^4.0.0", -+ "create-hash": "^1.1.0", -+ "parse-asn1": "^5.0.0", -+ "randombytes": "^2.0.1", -+ "safe-buffer": "^5.1.2" -+ } -+ }, -+ "node_modules/public-encrypt/node_modules/bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ }, -+ "node_modules/pump": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", -+ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", -+ "dependencies": { -+ "end-of-stream": "^1.1.0", -+ "once": "^1.3.1" -+ } -+ }, -+ "node_modules/punycode": { -+ "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", -+ "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==" -+ }, -+ "node_modules/pupa": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz", -+ "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==", -+ "dependencies": { -+ "escape-goat": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/python-shell": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/python-shell/-/python-shell-3.0.1.tgz", -+ "integrity": "sha512-TWeotuxe1auhXa5bGRScxnc2J+0r41NBntSa6RYZtMBLtAEsvCboKrEbW6DvASosWQepVkhZZlT3B5Ei766G+Q==", -+ "engines": { -+ "node": ">=0.10" -+ } -+ }, -+ "node_modules/qs": { -+ "version": "6.5.3", -+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", -+ "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", -+ "engines": { -+ "node": ">=0.6" -+ } -+ }, -+ "node_modules/querystring": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", -+ "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==", -+ "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", -+ "engines": { -+ "node": ">=0.4.x" -+ } -+ }, -+ "node_modules/querystring-es3": { -+ "version": "0.2.1", -+ "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", -+ "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==", -+ "engines": { -+ "node": ">=0.4.x" -+ } -+ }, -+ "node_modules/queue-tick": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz", -+ "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==" -+ }, -+ "node_modules/quick-lru": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", -+ "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/randombytes": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", -+ "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", -+ "dependencies": { -+ "safe-buffer": "^5.1.0" -+ } -+ }, -+ "node_modules/randomfill": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", -+ "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", -+ "dependencies": { -+ "randombytes": "^2.0.5", -+ "safe-buffer": "^5.1.0" -+ } -+ }, -+ "node_modules/range-parser": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", -+ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", -+ "engines": { -+ "node": ">= 0.6" -+ } -+ }, -+ "node_modules/rc": { -+ "version": "1.2.8", -+ "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", -+ "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", -+ "dependencies": { -+ "deep-extend": "^0.6.0", -+ "ini": "~1.3.0", -+ "minimist": "^1.2.0", -+ "strip-json-comments": "~2.0.1" -+ }, -+ "bin": { -+ "rc": "cli.js" -+ } -+ }, -+ "node_modules/rc/node_modules/strip-json-comments": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", -+ "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/rcedit": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-2.3.0.tgz", -+ "integrity": "sha512-h1gNEl9Oai1oijwyJ1WYqYSXTStHnOcv1KYljg/8WM4NAg3H1KBK3azIaKkQ1WQl+d7PoJpcBMscPfLXVKgCLQ==", -+ "engines": { -+ "node": ">= 8.0.0" -+ } -+ }, -+ "node_modules/read-only-stream": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz", -+ "integrity": "sha512-3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w==", -+ "dependencies": { -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "node_modules/read-pkg": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", -+ "integrity": "sha512-eFIBOPW7FGjzBuk3hdXEuNSiTZS/xEMlH49HxMyzb0hyPfu4EhVjT2DH32K1hSSmVq4sebAWnZuuY5auISUTGA==", -+ "dependencies": { -+ "load-json-file": "^2.0.0", -+ "normalize-package-data": "^2.3.2", -+ "path-type": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/read-pkg-up": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", -+ "integrity": "sha512-1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w==", -+ "dependencies": { -+ "find-up": "^2.0.0", -+ "read-pkg": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/read-pkg/node_modules/hosted-git-info": { -+ "version": "2.8.9", -+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", -+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" -+ }, -+ "node_modules/read-pkg/node_modules/normalize-package-data": { -+ "version": "2.5.0", -+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", -+ "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" -+ } -+ }, -+ "node_modules/read-pkg/node_modules/semver": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", -+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", -+ "bin": { -+ "semver": "bin/semver" -+ } -+ }, -+ "node_modules/readable-stream": { -+ "version": "2.3.7", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", -+ "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" -+ } -+ }, -+ "node_modules/readable-stream/node_modules/safe-buffer": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", -+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" -+ }, -+ "node_modules/readable-stream/node_modules/string_decoder": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", -+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", -+ "dependencies": { -+ "safe-buffer": "~5.1.0" -+ } -+ }, -+ "node_modules/readdirp": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", -+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", -+ "dependencies": { -+ "picomatch": "^2.2.1" -+ }, -+ "engines": { -+ "node": ">=8.10.0" -+ } -+ }, -+ "node_modules/redent": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", -+ "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", -+ "dependencies": { -+ "indent-string": "^4.0.0", -+ "strip-indent": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/regenerate": { -+ "version": "1.4.2", -+ "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", -+ "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==" -+ }, -+ "node_modules/regenerate-unicode-properties": { -+ "version": "10.1.0", -+ "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz", -+ "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==", -+ "dependencies": { -+ "regenerate": "^1.4.2" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/regenerator-runtime": { -+ "version": "0.13.10", -+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz", -+ "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==" -+ }, -+ "node_modules/regenerator-transform": { -+ "version": "0.15.0", -+ "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz", -+ "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==", -+ "dependencies": { -+ "@babel/runtime": "^7.8.4" -+ } -+ }, -+ "node_modules/regexp.prototype.flags": { -+ "version": "1.4.3", -+ "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", -+ "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.3", -+ "functions-have-names": "^1.2.2" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/regexpp": { -+ "version": "3.2.0", -+ "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", -+ "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/mysticatea" -+ } -+ }, -+ "node_modules/regexpu-core": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz", -+ "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==", -+ "dependencies": { -+ "regenerate": "^1.4.2", -+ "regenerate-unicode-properties": "^10.1.0", -+ "regjsgen": "^0.7.1", -+ "regjsparser": "^0.9.1", -+ "unicode-match-property-ecmascript": "^2.0.0", -+ "unicode-match-property-value-ecmascript": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/registry-auth-token": { -+ "version": "4.2.2", -+ "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.2.tgz", -+ "integrity": "sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg==", -+ "dependencies": { -+ "rc": "1.2.8" -+ }, -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/registry-url": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz", -+ "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==", -+ "dependencies": { -+ "rc": "^1.2.8" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/regjsgen": { -+ "version": "0.7.1", -+ "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz", -+ "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==" -+ }, -+ "node_modules/regjsparser": { -+ "version": "0.9.1", -+ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", -+ "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", -+ "dependencies": { -+ "jsesc": "~0.5.0" -+ }, -+ "bin": { -+ "regjsparser": "bin/parser" -+ } -+ }, -+ "node_modules/regjsparser/node_modules/jsesc": { -+ "version": "0.5.0", -+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", -+ "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", -+ "bin": { -+ "jsesc": "bin/jsesc" -+ } -+ }, -+ "node_modules/replacestream": { -+ "version": "4.0.3", -+ "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz", -+ "integrity": "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==", -+ "dependencies": { -+ "escape-string-regexp": "^1.0.3", -+ "object-assign": "^4.0.1", -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "node_modules/request": { -+ "version": "2.88.2", -+ "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", -+ "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", -+ "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", -+ "dependencies": { -+ "aws-sign2": "~0.7.0", -+ "aws4": "^1.8.0", -+ "caseless": "~0.12.0", -+ "combined-stream": "~1.0.6", -+ "extend": "~3.0.2", -+ "forever-agent": "~0.6.1", -+ "form-data": "~2.3.2", -+ "har-validator": "~5.1.3", -+ "http-signature": "~1.2.0", -+ "is-typedarray": "~1.0.0", -+ "isstream": "~0.1.2", -+ "json-stringify-safe": "~5.0.1", -+ "mime-types": "~2.1.19", -+ "oauth-sign": "~0.9.0", -+ "performance-now": "^2.1.0", -+ "qs": "~6.5.2", -+ "safe-buffer": "^5.1.2", -+ "tough-cookie": "~2.5.0", -+ "tunnel-agent": "^0.6.0", -+ "uuid": "^3.3.2" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/request/node_modules/uuid": { -+ "version": "3.4.0", -+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", -+ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", -+ "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", -+ "bin": { -+ "uuid": "bin/uuid" -+ } -+ }, -+ "node_modules/require-directory": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", -+ "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/resolve": { -+ "version": "1.22.1", -+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", -+ "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", -+ "dependencies": { -+ "is-core-module": "^2.9.0", -+ "path-parse": "^1.0.7", -+ "supports-preserve-symlinks-flag": "^1.0.0" -+ }, -+ "bin": { -+ "resolve": "bin/resolve" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/resolve-from": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", -+ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/responselike": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", -+ "integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==", -+ "dependencies": { -+ "lowercase-keys": "^1.0.0" -+ } -+ }, -+ "node_modules/retry": { -+ "version": "0.12.0", -+ "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", -+ "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", -+ "engines": { -+ "node": ">= 4" -+ } -+ }, -+ "node_modules/rimraf": { -+ "version": "2.7.1", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", -+ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", -+ "dependencies": { -+ "glob": "^7.1.3" -+ }, -+ "bin": { -+ "rimraf": "bin.js" -+ } -+ }, -+ "node_modules/ripemd160": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", -+ "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", -+ "dependencies": { -+ "hash-base": "^3.0.0", -+ "inherits": "^2.0.1" -+ } -+ }, -+ "node_modules/roarr": { -+ "version": "2.15.4", -+ "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz", -+ "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==", -+ "optional": true, -+ "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" -+ }, -+ "engines": { -+ "node": ">=8.0" -+ } -+ }, -+ "node_modules/safe-buffer": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", -+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/feross" -+ }, -+ { -+ "type": "patreon", -+ "url": "https://www.patreon.com/feross" -+ }, -+ { -+ "type": "consulting", -+ "url": "https://feross.org/support" -+ } -+ ] -+ }, -+ "node_modules/safer-buffer": { -+ "version": "2.1.2", -+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", -+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" -+ }, -+ "node_modules/sanitize-html": { -+ "version": "1.27.5", -+ "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.27.5.tgz", -+ "integrity": "sha512-M4M5iXDAUEcZKLXkmk90zSYWEtk5NH3JmojQxKxV371fnMh+x9t1rqdmXaGoyEHw3z/X/8vnFhKjGL5xFGOJ3A==", -+ "dependencies": { -+ "htmlparser2": "^4.1.0", -+ "lodash": "^4.17.15", -+ "parse-srcset": "^1.0.2", -+ "postcss": "^7.0.27" -+ } -+ }, -+ "node_modules/sass-graph": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-4.0.0.tgz", -+ "integrity": "sha512-WSO/MfXqKH7/TS8RdkCX3lVkPFQzCgbqdGsmSKq6tlPU+GpGEsa/5aW18JqItnqh+lPtcjifqdZ/VmiILkKckQ==", -+ "dependencies": { -+ "glob": "^7.0.0", -+ "lodash": "^4.17.11", -+ "scss-tokenizer": "^0.3.0", -+ "yargs": "^17.2.1" -+ }, -+ "bin": { -+ "sassgraph": "bin/sassgraph" -+ }, -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/scope-css": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/scope-css/-/scope-css-1.2.1.tgz", -+ "integrity": "sha512-UjLRmyEYaDNiOS673xlVkZFlVCtckJR/dKgr434VMm7Lb+AOOqXKdAcY7PpGlJYErjXXJzKN7HWo4uRPiZZG0Q==", -+ "dependencies": { -+ "escaper": "^2.5.3", -+ "slugify": "^1.3.1", -+ "strip-css-comments": "^3.0.0" -+ } -+ }, -+ "node_modules/screenfull": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/screenfull/-/screenfull-5.2.0.tgz", -+ "integrity": "sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==", -+ "engines": { -+ "node": ">=0.10.0" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/scss-tokenizer": { -+ "version": "0.3.0", -+ "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.3.0.tgz", -+ "integrity": "sha512-14Zl9GcbBvOT9057ZKjpz5yPOyUWG2ojd9D5io28wHRYsOrs7U95Q+KNL87+32p8rc+LvDpbu/i9ZYjM9Q+FsQ==", -+ "dependencies": { -+ "js-base64": "^2.4.3", -+ "source-map": "^0.7.1" -+ } -+ }, -+ "node_modules/scss-tokenizer/node_modules/source-map": { -+ "version": "0.7.4", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", -+ "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/semver": { -+ "version": "7.3.7", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", -+ "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", -+ "dependencies": { -+ "lru-cache": "^6.0.0" -+ }, -+ "bin": { -+ "semver": "bin/semver.js" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/semver-compare": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", -+ "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", -+ "optional": true -+ }, -+ "node_modules/semver-diff": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz", -+ "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==", -+ "dependencies": { -+ "semver": "^6.3.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/semver-diff/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/send": { -+ "version": "0.18.0", -+ "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", -+ "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", -+ "dependencies": { -+ "debug": "2.6.9", -+ "depd": "2.0.0", -+ "destroy": "1.2.0", -+ "encodeurl": "~1.0.2", -+ "escape-html": "~1.0.3", -+ "etag": "~1.8.1", -+ "fresh": "0.5.2", -+ "http-errors": "2.0.0", -+ "mime": "1.6.0", -+ "ms": "2.1.3", -+ "on-finished": "2.4.1", -+ "range-parser": "~1.2.1", -+ "statuses": "2.0.1" -+ }, -+ "engines": { -+ "node": ">= 0.8.0" -+ } -+ }, -+ "node_modules/send/node_modules/debug": { -+ "version": "2.6.9", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", -+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -+ "dependencies": { -+ "ms": "2.0.0" -+ } -+ }, -+ "node_modules/send/node_modules/debug/node_modules/ms": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", -+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" -+ }, -+ "node_modules/send/node_modules/depd": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", -+ "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", -+ "engines": { -+ "node": ">= 0.8" -+ } -+ }, -+ "node_modules/send/node_modules/ms": { -+ "version": "2.1.3", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", -+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" -+ }, -+ "node_modules/serialize-error": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", -+ "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", -+ "optional": true, -+ "dependencies": { -+ "type-fest": "^0.13.1" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/serialize-error/node_modules/type-fest": { -+ "version": "0.13.1", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", -+ "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", -+ "optional": true, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/serialport": { -+ "version": "9.2.0", -+ "resolved": "https://registry.npmjs.org/serialport/-/serialport-9.2.0.tgz", -+ "integrity": "sha512-C6AQ4jD4mre3tn3QA+atn++mEZDh4r40CIeh1sKhskKE+Q4eiIr/nzVMOiPxHb8gskrSNxujH+Br49tl3i9s9g==", -+ "optional": true, -+ "dependencies": { -+ "@serialport/binding-mock": "9.0.7", -+ "@serialport/bindings": "^9.2.0", -+ "@serialport/parser-byte-length": "9.0.7", -+ "@serialport/parser-cctalk": "9.0.7", -+ "@serialport/parser-delimiter": "9.0.7", -+ "@serialport/parser-inter-byte-timeout": "9.0.7", -+ "@serialport/parser-readline": "9.0.7", -+ "@serialport/parser-ready": "9.0.7", -+ "@serialport/parser-regex": "9.0.7", -+ "@serialport/stream": "9.0.7", -+ "debug": "^4.3.1" -+ }, -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/serialport/donate" -+ } -+ }, -+ "node_modules/set-blocking": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", -+ "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" -+ }, -+ "node_modules/setprototypeof": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", -+ "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" -+ }, -+ "node_modules/sha.js": { -+ "version": "2.4.11", -+ "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", -+ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", -+ "dependencies": { -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.0.1" -+ }, -+ "bin": { -+ "sha.js": "bin.js" -+ } -+ }, -+ "node_modules/shasum-object": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz", -+ "integrity": "sha512-Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg==", -+ "dependencies": { -+ "fast-safe-stringify": "^2.0.7" -+ } -+ }, -+ "node_modules/shebang-command": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", -+ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", -+ "dependencies": { -+ "shebang-regex": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/shebang-regex": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", -+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/shell-quote": { -+ "version": "1.7.4", -+ "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.4.tgz", -+ "integrity": "sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw==", -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/signal-exit": { -+ "version": "3.0.7", -+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", -+ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" -+ }, -+ "node_modules/simple-concat": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", -+ "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/feross" -+ }, -+ { -+ "type": "patreon", -+ "url": "https://www.patreon.com/feross" -+ }, -+ { -+ "type": "consulting", -+ "url": "https://feross.org/support" -+ } -+ ] -+ }, -+ "node_modules/simple-get": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", -+ "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/feross" -+ }, -+ { -+ "type": "patreon", -+ "url": "https://www.patreon.com/feross" -+ }, -+ { -+ "type": "consulting", -+ "url": "https://feross.org/support" -+ } -+ ], -+ "optional": true, -+ "dependencies": { -+ "decompress-response": "^6.0.0", -+ "once": "^1.3.1", -+ "simple-concat": "^1.0.0" -+ } -+ }, -+ "node_modules/simple-get/node_modules/decompress-response": { -+ "version": "6.0.0", -+ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", -+ "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", -+ "optional": true, -+ "dependencies": { -+ "mimic-response": "^3.1.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/simple-get/node_modules/mimic-response": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", -+ "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", -+ "optional": true, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/slip": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/slip/-/slip-1.0.2.tgz", -+ "integrity": "sha512-XrcHe3NAcyD3wO+O4I13RcS4/3AF+S9RvGNj9JhJeS02HyImwD2E3QWLrmn9hBfL+fB6yapagwxRkeyYzhk98g==" -+ }, -+ "node_modules/slugify": { -+ "version": "1.6.5", -+ "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.5.tgz", -+ "integrity": "sha512-8mo9bslnBO3tr5PEVFzMPIWwWnipGS0xVbYf65zxDqfNwmzYn1LpiKNrR6DlClusuvo+hDHd1zKpmfAe83NQSQ==", -+ "engines": { -+ "node": ">=8.0.0" -+ } -+ }, -+ "node_modules/smart-buffer": { -+ "version": "4.2.0", -+ "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", -+ "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", -+ "engines": { -+ "node": ">= 6.0.0", -+ "npm": ">= 3.0.0" -+ } -+ }, -+ "node_modules/socks": { -+ "version": "2.7.1", -+ "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz", -+ "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", -+ "dependencies": { -+ "ip": "^2.0.0", -+ "smart-buffer": "^4.2.0" -+ }, -+ "engines": { -+ "node": ">= 10.13.0", -+ "npm": ">= 3.0.0" -+ } -+ }, -+ "node_modules/socks-proxy-agent": { -+ "version": "6.2.1", -+ "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz", -+ "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==", -+ "dependencies": { -+ "agent-base": "^6.0.2", -+ "debug": "^4.3.3", -+ "socks": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/socks/node_modules/ip": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", -+ "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==" -+ }, -+ "node_modules/sortablejs": { -+ "version": "1.15.0", -+ "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz", -+ "integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==" -+ }, -+ "node_modules/source-map": { -+ "version": "0.5.7", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", -+ "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/source-map-support": { -+ "version": "0.5.21", -+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", -+ "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", -+ "dependencies": { -+ "buffer-from": "^1.0.0", -+ "source-map": "^0.6.0" -+ } -+ }, -+ "node_modules/source-map-support/node_modules/source-map": { -+ "version": "0.6.1", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", -+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/sourcemap-codec": { -+ "version": "1.4.8", -+ "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", -+ "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==" -+ }, -+ "node_modules/spdx-correct": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", -+ "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", -+ "dependencies": { -+ "spdx-expression-parse": "^3.0.0", -+ "spdx-license-ids": "^3.0.0" -+ } -+ }, -+ "node_modules/spdx-exceptions": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", -+ "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" -+ }, -+ "node_modules/spdx-expression-parse": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", -+ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", -+ "dependencies": { -+ "spdx-exceptions": "^2.1.0", -+ "spdx-license-ids": "^3.0.0" -+ } -+ }, -+ "node_modules/spdx-license-ids": { -+ "version": "3.0.12", -+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz", -+ "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==" -+ }, -+ "node_modules/sprintf-js": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", -+ "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", -+ "optional": true -+ }, -+ "node_modules/sshpk": { -+ "version": "1.17.0", -+ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz", -+ "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==", -+ "dependencies": { -+ "asn1": "~0.2.3", -+ "assert-plus": "^1.0.0", -+ "bcrypt-pbkdf": "^1.0.0", -+ "dashdash": "^1.12.0", -+ "ecc-jsbn": "~0.1.1", -+ "getpass": "^0.1.1", -+ "jsbn": "~0.1.0", -+ "safer-buffer": "^2.0.2", -+ "tweetnacl": "~0.14.0" -+ }, -+ "bin": { -+ "sshpk-conv": "bin/sshpk-conv", -+ "sshpk-sign": "bin/sshpk-sign", -+ "sshpk-verify": "bin/sshpk-verify" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/ssri": { -+ "version": "8.0.1", -+ "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", -+ "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", -+ "dependencies": { -+ "minipass": "^3.1.1" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/stack-generator": { -+ "version": "2.0.10", -+ "resolved": "https://registry.npmjs.org/stack-generator/-/stack-generator-2.0.10.tgz", -+ "integrity": "sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ==", -+ "dependencies": { -+ "stackframe": "^1.3.4" -+ } -+ }, -+ "node_modules/stackframe": { -+ "version": "1.3.4", -+ "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz", -+ "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==" -+ }, -+ "node_modules/stacktrace-gps": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz", -+ "integrity": "sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==", -+ "dependencies": { -+ "source-map": "0.5.6", -+ "stackframe": "^1.3.4" -+ } -+ }, -+ "node_modules/stacktrace-gps/node_modules/source-map": { -+ "version": "0.5.6", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", -+ "integrity": "sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/stacktrace-js": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/stacktrace-js/-/stacktrace-js-2.0.2.tgz", -+ "integrity": "sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg==", -+ "dependencies": { -+ "error-stack-parser": "^2.0.6", -+ "stack-generator": "^2.0.5", -+ "stacktrace-gps": "^3.0.4" -+ } -+ }, -+ "node_modules/statuses": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", -+ "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", -+ "engines": { -+ "node": ">= 0.8" -+ } -+ }, -+ "node_modules/stdout-stream": { -+ "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", -+ "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", -+ "dependencies": { -+ "readable-stream": "^2.0.1" -+ } -+ }, -+ "node_modules/stream-browserify": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz", -+ "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==", -+ "dependencies": { -+ "inherits": "~2.0.4", -+ "readable-stream": "^3.5.0" -+ } -+ }, -+ "node_modules/stream-browserify/node_modules/readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/stream-combiner2": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz", -+ "integrity": "sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==", -+ "dependencies": { -+ "duplexer2": "~0.1.0", -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "node_modules/stream-http": { -+ "version": "3.2.0", -+ "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz", -+ "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==", -+ "dependencies": { -+ "builtin-status-codes": "^3.0.0", -+ "inherits": "^2.0.4", -+ "readable-stream": "^3.6.0", -+ "xtend": "^4.0.2" -+ } -+ }, -+ "node_modules/stream-http/node_modules/readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/stream-splicer": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz", -+ "integrity": "sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg==", -+ "dependencies": { -+ "inherits": "^2.0.1", -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "node_modules/strictdom": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/strictdom/-/strictdom-1.0.1.tgz", -+ "integrity": "sha512-cEmp9QeXXRmjj/rVp9oyiqcvyocWab/HaoN4+bwFeZ7QzykJD6L3yD4v12K1x0tHpqRqVpJevN3gW7kyM39Bqg==" -+ }, -+ "node_modules/string_decoder": { -+ "version": "1.3.0", -+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", -+ "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", -+ "dependencies": { -+ "safe-buffer": "~5.2.0" -+ } -+ }, -+ "node_modules/string-width": { -+ "version": "4.2.3", -+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", -+ "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" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/strip-ansi": { -+ "version": "6.0.1", -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", -+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -+ "dependencies": { -+ "ansi-regex": "^5.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/strip-bom": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", -+ "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/strip-css-comments": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/strip-css-comments/-/strip-css-comments-3.0.0.tgz", -+ "integrity": "sha512-xJwk2yMZ6j+0Clj7ETUfqQ6frsaCIqNGg3zjTVswIt3SbiOsCQgRI1E93hdt/JgGfh5De/sTwxrnrBhhWzMwcg==", -+ "dependencies": { -+ "is-regexp": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/strip-indent": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", -+ "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", -+ "dependencies": { -+ "min-indent": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/strip-json-comments": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", -+ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/strip-outer": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz", -+ "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==", -+ "dependencies": { -+ "escape-string-regexp": "^1.0.2" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/subarg": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz", -+ "integrity": "sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==", -+ "dependencies": { -+ "minimist": "^1.1.0" -+ } -+ }, -+ "node_modules/sumchecker": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", -+ "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", -+ "dependencies": { -+ "debug": "^4.1.0" -+ }, -+ "engines": { -+ "node": ">= 8.0" -+ } -+ }, -+ "node_modules/supports-color": { -+ "version": "5.5.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", -+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", -+ "dependencies": { -+ "has-flag": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/supports-preserve-symlinks-flag": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", -+ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/syntax-error": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz", -+ "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==", -+ "dependencies": { -+ "acorn-node": "^1.2.0" -+ } -+ }, -+ "node_modules/tar": { -+ "version": "6.1.12", -+ "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.12.tgz", -+ "integrity": "sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw==", -+ "dependencies": { -+ "chownr": "^2.0.0", -+ "fs-minipass": "^2.0.0", -+ "minipass": "^3.0.0", -+ "minizlib": "^2.1.1", -+ "mkdirp": "^1.0.3", -+ "yallist": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/tar-fs": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", -+ "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", -+ "optional": true, -+ "dependencies": { -+ "chownr": "^1.1.1", -+ "mkdirp-classic": "^0.5.2", -+ "pump": "^3.0.0", -+ "tar-stream": "^2.1.4" -+ } -+ }, -+ "node_modules/tar-fs/node_modules/chownr": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", -+ "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", -+ "optional": true -+ }, -+ "node_modules/tar-stream": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", -+ "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", -+ "optional": true, -+ "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" -+ }, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/tar-stream/node_modules/readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "optional": true, -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/tar/node_modules/mkdirp": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", -+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", -+ "bin": { -+ "mkdirp": "bin/cmd.js" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/terser": { -+ "version": "3.17.0", -+ "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", -+ "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", -+ "dependencies": { -+ "commander": "^2.19.0", -+ "source-map": "~0.6.1", -+ "source-map-support": "~0.5.10" -+ }, -+ "bin": { -+ "terser": "bin/uglifyjs" -+ }, -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/terser/node_modules/commander": { -+ "version": "2.20.3", -+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", -+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" -+ }, -+ "node_modules/terser/node_modules/source-map": { -+ "version": "0.6.1", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", -+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/text-table": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", -+ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" -+ }, -+ "node_modules/through": { -+ "version": "2.3.8", -+ "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", -+ "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" -+ }, -+ "node_modules/through2": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", -+ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", -+ "dependencies": { -+ "readable-stream": "~2.3.6", -+ "xtend": "~4.0.1" -+ } -+ }, -+ "node_modules/thunky": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", -+ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==" -+ }, -+ "node_modules/timers-browserify": { -+ "version": "1.4.2", -+ "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz", -+ "integrity": "sha512-PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q==", -+ "dependencies": { -+ "process": "~0.11.0" -+ }, -+ "engines": { -+ "node": ">=0.6.0" -+ } -+ }, -+ "node_modules/to-fast-properties": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", -+ "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/to-readable-stream": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", -+ "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/to-regex-range": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", -+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", -+ "dependencies": { -+ "is-number": "^7.0.0" -+ }, -+ "engines": { -+ "node": ">=8.0" -+ } -+ }, -+ "node_modules/toidentifier": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", -+ "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", -+ "engines": { -+ "node": ">=0.6" -+ } -+ }, -+ "node_modules/touch": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", -+ "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", -+ "dependencies": { -+ "nopt": "~1.0.10" -+ }, -+ "bin": { -+ "nodetouch": "bin/nodetouch.js" -+ } -+ }, -+ "node_modules/touch/node_modules/nopt": { -+ "version": "1.0.10", -+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", -+ "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", -+ "dependencies": { -+ "abbrev": "1" -+ }, -+ "bin": { -+ "nopt": "bin/nopt.js" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/tough-cookie": { -+ "version": "2.5.0", -+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", -+ "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", -+ "dependencies": { -+ "psl": "^1.1.28", -+ "punycode": "^2.1.1" -+ }, -+ "engines": { -+ "node": ">=0.8" -+ } -+ }, -+ "node_modules/tough-cookie/node_modules/punycode": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", -+ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/transform-ast": { -+ "version": "2.4.4", -+ "resolved": "https://registry.npmjs.org/transform-ast/-/transform-ast-2.4.4.tgz", -+ "integrity": "sha512-AxjeZAcIOUO2lev2GDe3/xZ1Q0cVGjIMk5IsriTy8zbWlsEnjeB025AhkhBJHoy997mXpLd4R+kRbvnnQVuQHQ==", -+ "dependencies": { -+ "acorn-node": "^1.3.0", -+ "convert-source-map": "^1.5.1", -+ "dash-ast": "^1.0.0", -+ "is-buffer": "^2.0.0", -+ "magic-string": "^0.23.2", -+ "merge-source-map": "1.0.4", -+ "nanobench": "^2.1.1" -+ } -+ }, -+ "node_modules/transform-ast/node_modules/is-buffer": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", -+ "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/feross" -+ }, -+ { -+ "type": "patreon", -+ "url": "https://www.patreon.com/feross" -+ }, -+ { -+ "type": "consulting", -+ "url": "https://feross.org/support" -+ } -+ ], -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/trim-newlines": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", -+ "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/trim-repeated": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", -+ "integrity": "sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==", -+ "dependencies": { -+ "escape-string-regexp": "^1.0.2" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/true-case-path": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", -+ "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", -+ "dependencies": { -+ "glob": "^7.1.2" -+ } -+ }, -+ "node_modules/tty-browserify": { -+ "version": "0.0.1", -+ "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", -+ "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==" -+ }, -+ "node_modules/tunnel": { -+ "version": "0.0.6", -+ "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", -+ "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==", -+ "optional": true, -+ "engines": { -+ "node": ">=0.6.11 <=0.7.0 || >=0.7.3" -+ } -+ }, -+ "node_modules/tunnel-agent": { -+ "version": "0.6.0", -+ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", -+ "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", -+ "dependencies": { -+ "safe-buffer": "^5.0.1" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/tweetnacl": { -+ "version": "0.14.5", -+ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", -+ "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" -+ }, -+ "node_modules/type-check": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", -+ "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", -+ "dependencies": { -+ "prelude-ls": "^1.2.1" -+ }, -+ "engines": { -+ "node": ">= 0.8.0" -+ } -+ }, -+ "node_modules/type-fest": { -+ "version": "0.18.1", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", -+ "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/type-name": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/type-name/-/type-name-2.0.2.tgz", -+ "integrity": "sha512-kkgkuqR/jKdKO5oh/I2SMu2dGbLXoJq0zkdgbxaqYK+hr9S9edwVVGf+tMUFTx2gH9TN2+Zu9JZ/Njonb3cjhA==" -+ }, -+ "node_modules/typedarray": { -+ "version": "0.0.6", -+ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", -+ "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" -+ }, -+ "node_modules/typedarray-to-buffer": { -+ "version": "3.1.5", -+ "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", -+ "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", -+ "dependencies": { -+ "is-typedarray": "^1.0.0" -+ } -+ }, -+ "node_modules/uglifyify": { -+ "version": "5.0.2", -+ "resolved": "https://registry.npmjs.org/uglifyify/-/uglifyify-5.0.2.tgz", -+ "integrity": "sha512-NcSk6pgoC+IgwZZ2tVLVHq+VNKSvLPlLkF5oUiHPVOJI0s/OlSVYEGXG9PCAH0hcyFZLyvt4KBdPAQBRlVDn1Q==", -+ "dependencies": { -+ "convert-source-map": "~1.1.0", -+ "minimatch": "^3.0.2", -+ "terser": "^3.7.5", -+ "through": "~2.3.4", -+ "xtend": "^4.0.1" -+ } -+ }, -+ "node_modules/uglifyify/node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/uglifyify/node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "node_modules/uglifyify/node_modules/convert-source-map": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz", -+ "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==" -+ }, -+ "node_modules/uglifyify/node_modules/minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/umd": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz", -+ "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==", -+ "bin": { -+ "umd": "bin/cli.js" -+ } -+ }, -+ "node_modules/undeclared-identifiers": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz", -+ "integrity": "sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==", -+ "dependencies": { -+ "acorn-node": "^1.3.0", -+ "dash-ast": "^1.0.0", -+ "get-assigned-identifiers": "^1.2.0", -+ "simple-concat": "^1.0.0", -+ "xtend": "^4.0.1" -+ }, -+ "bin": { -+ "undeclared-identifiers": "bin.js" -+ } -+ }, -+ "node_modules/undefsafe": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", -+ "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==" -+ }, -+ "node_modules/unicode-canonical-property-names-ecmascript": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", -+ "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/unicode-match-property-ecmascript": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", -+ "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", -+ "dependencies": { -+ "unicode-canonical-property-names-ecmascript": "^2.0.0", -+ "unicode-property-aliases-ecmascript": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/unicode-match-property-value-ecmascript": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz", -+ "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/unicode-property-aliases-ecmascript": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz", -+ "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/unique-filename": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", -+ "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", -+ "dependencies": { -+ "unique-slug": "^2.0.0" -+ } -+ }, -+ "node_modules/unique-slug": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", -+ "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", -+ "dependencies": { -+ "imurmurhash": "^0.1.4" -+ } -+ }, -+ "node_modules/unique-string": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", -+ "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", -+ "dependencies": { -+ "crypto-random-string": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/universalify": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", -+ "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", -+ "engines": { -+ "node": ">= 10.0.0" -+ } -+ }, -+ "node_modules/unix-crypt-td-js": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/unix-crypt-td-js/-/unix-crypt-td-js-1.1.4.tgz", -+ "integrity": "sha512-8rMeVYWSIyccIJscb9NdCfZKSRBKYTeVnwmiRYT2ulE3qd1RaDQ0xQDP+rI3ccIWbhu/zuo5cgN8z73belNZgw==" -+ }, -+ "node_modules/update-browserslist-db": { -+ "version": "1.0.10", -+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", -+ "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", -+ "funding": [ -+ { -+ "type": "opencollective", -+ "url": "https://opencollective.com/browserslist" -+ }, -+ { -+ "type": "tidelift", -+ "url": "https://tidelift.com/funding/github/npm/browserslist" -+ } -+ ], -+ "dependencies": { -+ "escalade": "^3.1.1", -+ "picocolors": "^1.0.0" -+ }, -+ "bin": { -+ "browserslist-lint": "cli.js" -+ }, -+ "peerDependencies": { -+ "browserslist": ">= 4.21.0" -+ } -+ }, -+ "node_modules/update-browserslist-db/node_modules/picocolors": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", -+ "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" -+ }, -+ "node_modules/update-notifier": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz", -+ "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" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/yeoman/update-notifier?sponsor=1" -+ } -+ }, -+ "node_modules/update-notifier/node_modules/ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "dependencies": { -+ "color-convert": "^2.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/ansi-styles?sponsor=1" -+ } -+ }, -+ "node_modules/update-notifier/node_modules/chalk": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", -+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -+ "dependencies": { -+ "ansi-styles": "^4.1.0", -+ "supports-color": "^7.1.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/chalk?sponsor=1" -+ } -+ }, -+ "node_modules/update-notifier/node_modules/color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "dependencies": { -+ "color-name": "~1.1.4" -+ }, -+ "engines": { -+ "node": ">=7.0.0" -+ } -+ }, -+ "node_modules/update-notifier/node_modules/color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "node_modules/update-notifier/node_modules/has-flag": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/update-notifier/node_modules/supports-color": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -+ "dependencies": { -+ "has-flag": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/upper-case": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", -+ "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==" -+ }, -+ "node_modules/uri-js": { -+ "version": "4.4.1", -+ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", -+ "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", -+ "dependencies": { -+ "punycode": "^2.1.0" -+ } -+ }, -+ "node_modules/uri-js/node_modules/punycode": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", -+ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/url": { -+ "version": "0.11.0", -+ "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", -+ "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", -+ "dependencies": { -+ "punycode": "1.3.2", -+ "querystring": "0.2.0" -+ } -+ }, -+ "node_modules/url-parse-lax": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", -+ "integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==", -+ "dependencies": { -+ "prepend-http": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/url/node_modules/punycode": { -+ "version": "1.3.2", -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", -+ "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==" -+ }, -+ "node_modules/util": { -+ "version": "0.12.5", -+ "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", -+ "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "is-arguments": "^1.0.4", -+ "is-generator-function": "^1.0.7", -+ "is-typed-array": "^1.1.3", -+ "which-typed-array": "^1.1.2" -+ } -+ }, -+ "node_modules/util-deprecate": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", -+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" -+ }, -+ "node_modules/uuid": { -+ "version": "8.3.2", -+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", -+ "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", -+ "bin": { -+ "uuid": "dist/bin/uuid" -+ } -+ }, -+ "node_modules/v8-compile-cache": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", -+ "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==" -+ }, -+ "node_modules/validate-npm-package-license": { -+ "version": "3.0.4", -+ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", -+ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", -+ "dependencies": { -+ "spdx-correct": "^3.0.0", -+ "spdx-expression-parse": "^3.0.0" -+ } -+ }, -+ "node_modules/verror": { -+ "version": "1.10.0", -+ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", -+ "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==", -+ "engines": [ -+ "node >=0.6.0" -+ ], -+ "dependencies": { -+ "assert-plus": "^1.0.0", -+ "core-util-is": "1.0.2", -+ "extsprintf": "^1.2.0" -+ } -+ }, -+ "node_modules/verror/node_modules/core-util-is": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", -+ "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==" -+ }, -+ "node_modules/vm-browserify": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", -+ "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" -+ }, -+ "node_modules/watchify": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/watchify/-/watchify-4.0.0.tgz", -+ "integrity": "sha512-2Z04dxwoOeNxa11qzWumBTgSAohTC0+ScuY7XMenPnH+W2lhTcpEOJP4g2EIG/SWeLadPk47x++Yh+8BqPM/lA==", -+ "dev": true, -+ "dependencies": { -+ "anymatch": "^3.1.0", -+ "browserify": "^17.0.0", -+ "chokidar": "^3.4.0", -+ "defined": "^1.0.0", -+ "outpipe": "^1.1.0", -+ "through2": "^4.0.2", -+ "xtend": "^4.0.2" -+ }, -+ "bin": { -+ "watchify": "bin/cmd.js" -+ }, -+ "engines": { -+ "node": ">= 8.10.0" -+ } -+ }, -+ "node_modules/watchify/node_modules/readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "dev": true, -+ "dependencies": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/watchify/node_modules/through2": { -+ "version": "4.0.2", -+ "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", -+ "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", -+ "dev": true, -+ "dependencies": { -+ "readable-stream": "3" -+ } -+ }, -+ "node_modules/webworkify": { -+ "version": "1.5.0", -+ "resolved": "https://registry.npmjs.org/webworkify/-/webworkify-1.5.0.tgz", -+ "integrity": "sha512-AMcUeyXAhbACL8S2hqqdqOLqvJ8ylmIbNwUIqQujRSouf4+eUFaXbG6F1Rbu+srlJMmxQWsiU7mOJi0nMBfM1g==" -+ }, -+ "node_modules/which": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", -+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", -+ "dependencies": { -+ "isexe": "^2.0.0" -+ }, -+ "bin": { -+ "node-which": "bin/node-which" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/which-typed-array": { -+ "version": "1.1.9", -+ "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", -+ "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", -+ "dependencies": { -+ "available-typed-arrays": "^1.0.5", -+ "call-bind": "^1.0.2", -+ "for-each": "^0.3.3", -+ "gopd": "^1.0.1", -+ "has-tostringtag": "^1.0.0", -+ "is-typed-array": "^1.1.10" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/wide-align": { -+ "version": "1.1.5", -+ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", -+ "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", -+ "dependencies": { -+ "string-width": "^1.0.2 || 2 || 3 || 4" -+ } -+ }, -+ "node_modules/widest-line": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", -+ "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", -+ "dependencies": { -+ "string-width": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/wolfy87-eventemitter": { -+ "version": "5.2.9", -+ "resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.9.tgz", -+ "integrity": "sha512-P+6vtWyuDw+MB01X7UeF8TaHBvbCovf4HPEMF/SV7BdDc1SMTiBy13SRD71lQh4ExFTG1d/WNzDGDCyOKSMblw==" -+ }, -+ "node_modules/word-wrap": { -+ "version": "1.2.3", -+ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", -+ "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/wrap-ansi": { -+ "version": "7.0.0", -+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", -+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", -+ "dependencies": { -+ "ansi-styles": "^4.0.0", -+ "string-width": "^4.1.0", -+ "strip-ansi": "^6.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" -+ } -+ }, -+ "node_modules/wrap-ansi/node_modules/ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "dependencies": { -+ "color-convert": "^2.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/ansi-styles?sponsor=1" -+ } -+ }, -+ "node_modules/wrap-ansi/node_modules/color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "dependencies": { -+ "color-name": "~1.1.4" -+ }, -+ "engines": { -+ "node": ">=7.0.0" -+ } -+ }, -+ "node_modules/wrap-ansi/node_modules/color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "node_modules/wrappy": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", -+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" -+ }, -+ "node_modules/write-file-atomic": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", -+ "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" -+ } -+ }, -+ "node_modules/ws": { -+ "version": "8.6.0", -+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz", -+ "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==", -+ "engines": { -+ "node": ">=10.0.0" -+ }, -+ "peerDependencies": { -+ "bufferutil": "^4.0.1", -+ "utf-8-validate": "^5.0.2" -+ }, -+ "peerDependenciesMeta": { -+ "bufferutil": { -+ "optional": true -+ }, -+ "utf-8-validate": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/xdg-basedir": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", -+ "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/xmlbuilder": { -+ "version": "15.1.1", -+ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", -+ "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==", -+ "engines": { -+ "node": ">=8.0" -+ } -+ }, -+ "node_modules/xtend": { -+ "version": "4.0.2", -+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", -+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", -+ "engines": { -+ "node": ">=0.4" -+ } -+ }, -+ "node_modules/y18n": { -+ "version": "5.0.8", -+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", -+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/yallist": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", -+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" -+ }, -+ "node_modules/yargs": { -+ "version": "17.5.1", -+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz", -+ "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==", -+ "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" -+ }, -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/yargs-parser": { -+ "version": "20.2.9", -+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", -+ "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/yargs/node_modules/yargs-parser": { -+ "version": "21.1.1", -+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", -+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/yauzl": { -+ "version": "2.10.0", -+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", -+ "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", -+ "dependencies": { -+ "buffer-crc32": "~0.2.3", -+ "fd-slicer": "~1.1.0" -+ } -+ } -+ }, -+ "dependencies": { -+ "@ampproject/remapping": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", -+ "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", -+ "requires": { -+ "@jridgewell/gen-mapping": "^0.1.0", -+ "@jridgewell/trace-mapping": "^0.3.9" -+ } -+ }, -+ "@babel/code-frame": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", -+ "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", -+ "requires": { -+ "@babel/highlight": "^7.18.6" -+ } -+ }, -+ "@babel/compat-data": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz", -+ "integrity": "sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==" -+ }, -+ "@babel/core": { -+ "version": "7.18.0", -+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.0.tgz", -+ "integrity": "sha512-Xyw74OlJwDijToNi0+6BBI5mLLR5+5R3bcSH80LXzjzEGEUlvNzujEE71BaD/ApEZHAvFI/Mlmp4M5lIkdeeWw==", -+ "requires": { -+ "@ampproject/remapping": "^2.1.0", -+ "@babel/code-frame": "^7.16.7", -+ "@babel/generator": "^7.18.0", -+ "@babel/helper-compilation-targets": "^7.17.10", -+ "@babel/helper-module-transforms": "^7.18.0", -+ "@babel/helpers": "^7.18.0", -+ "@babel/parser": "^7.18.0", -+ "@babel/template": "^7.16.7", -+ "@babel/traverse": "^7.18.0", -+ "@babel/types": "^7.18.0", -+ "convert-source-map": "^1.7.0", -+ "debug": "^4.1.0", -+ "gensync": "^1.0.0-beta.2", -+ "json5": "^2.2.1", -+ "semver": "^6.3.0" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ } -+ } -+ }, -+ "@babel/eslint-parser": { -+ "version": "7.17.0", -+ "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz", -+ "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==", -+ "requires": { -+ "eslint-scope": "^5.1.1", -+ "eslint-visitor-keys": "^2.1.0", -+ "semver": "^6.3.0" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ } -+ } -+ }, -+ "@babel/generator": { -+ "version": "7.20.4", -+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.4.tgz", -+ "integrity": "sha512-luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA==", -+ "requires": { -+ "@babel/types": "^7.20.2", -+ "@jridgewell/gen-mapping": "^0.3.2", -+ "jsesc": "^2.5.1" -+ }, -+ "dependencies": { -+ "@jridgewell/gen-mapping": { -+ "version": "0.3.2", -+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", -+ "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", -+ "requires": { -+ "@jridgewell/set-array": "^1.0.1", -+ "@jridgewell/sourcemap-codec": "^1.4.10", -+ "@jridgewell/trace-mapping": "^0.3.9" -+ } -+ } -+ } -+ }, -+ "@babel/helper-annotate-as-pure": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz", -+ "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==", -+ "requires": { -+ "@babel/types": "^7.18.6" -+ } -+ }, -+ "@babel/helper-builder-binary-assignment-operator-visitor": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz", -+ "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==", -+ "requires": { -+ "@babel/helper-explode-assignable-expression": "^7.18.6", -+ "@babel/types": "^7.18.9" -+ } -+ }, -+ "@babel/helper-compilation-targets": { -+ "version": "7.20.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz", -+ "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==", -+ "requires": { -+ "@babel/compat-data": "^7.20.0", -+ "@babel/helper-validator-option": "^7.18.6", -+ "browserslist": "^4.21.3", -+ "semver": "^6.3.0" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ } -+ } -+ }, -+ "@babel/helper-create-class-features-plugin": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.2.tgz", -+ "integrity": "sha512-k22GoYRAHPYr9I+Gvy2ZQlAe5mGy8BqWst2wRt8cwIufWTxrsVshhIBvYNqC80N0GSFWTsqRVexOtfzlgOEDvA==", -+ "requires": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-function-name": "^7.19.0", -+ "@babel/helper-member-expression-to-functions": "^7.18.9", -+ "@babel/helper-optimise-call-expression": "^7.18.6", -+ "@babel/helper-replace-supers": "^7.19.1", -+ "@babel/helper-split-export-declaration": "^7.18.6" -+ } -+ }, -+ "@babel/helper-create-regexp-features-plugin": { -+ "version": "7.19.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz", -+ "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==", -+ "requires": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "regexpu-core": "^5.1.0" -+ } -+ }, -+ "@babel/helper-define-polyfill-provider": { -+ "version": "0.3.3", -+ "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz", -+ "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==", -+ "requires": { -+ "@babel/helper-compilation-targets": "^7.17.7", -+ "@babel/helper-plugin-utils": "^7.16.7", -+ "debug": "^4.1.1", -+ "lodash.debounce": "^4.0.8", -+ "resolve": "^1.14.2", -+ "semver": "^6.1.2" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ } -+ } -+ }, -+ "@babel/helper-environment-visitor": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", -+ "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==" -+ }, -+ "@babel/helper-explode-assignable-expression": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz", -+ "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==", -+ "requires": { -+ "@babel/types": "^7.18.6" -+ } -+ }, -+ "@babel/helper-function-name": { -+ "version": "7.19.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", -+ "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", -+ "requires": { -+ "@babel/template": "^7.18.10", -+ "@babel/types": "^7.19.0" -+ } -+ }, -+ "@babel/helper-hoist-variables": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", -+ "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", -+ "requires": { -+ "@babel/types": "^7.18.6" -+ } -+ }, -+ "@babel/helper-member-expression-to-functions": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz", -+ "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==", -+ "requires": { -+ "@babel/types": "^7.18.9" -+ } -+ }, -+ "@babel/helper-module-imports": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", -+ "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", -+ "requires": { -+ "@babel/types": "^7.18.6" -+ } -+ }, -+ "@babel/helper-module-transforms": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz", -+ "integrity": "sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==", -+ "requires": { -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-module-imports": "^7.18.6", -+ "@babel/helper-simple-access": "^7.20.2", -+ "@babel/helper-split-export-declaration": "^7.18.6", -+ "@babel/helper-validator-identifier": "^7.19.1", -+ "@babel/template": "^7.18.10", -+ "@babel/traverse": "^7.20.1", -+ "@babel/types": "^7.20.2" -+ } -+ }, -+ "@babel/helper-optimise-call-expression": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz", -+ "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==", -+ "requires": { -+ "@babel/types": "^7.18.6" -+ } -+ }, -+ "@babel/helper-plugin-utils": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", -+ "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==" -+ }, -+ "@babel/helper-remap-async-to-generator": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz", -+ "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==", -+ "requires": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-wrap-function": "^7.18.9", -+ "@babel/types": "^7.18.9" -+ } -+ }, -+ "@babel/helper-replace-supers": { -+ "version": "7.19.1", -+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz", -+ "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==", -+ "requires": { -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-member-expression-to-functions": "^7.18.9", -+ "@babel/helper-optimise-call-expression": "^7.18.6", -+ "@babel/traverse": "^7.19.1", -+ "@babel/types": "^7.19.0" -+ } -+ }, -+ "@babel/helper-simple-access": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", -+ "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", -+ "requires": { -+ "@babel/types": "^7.20.2" -+ } -+ }, -+ "@babel/helper-skip-transparent-expression-wrappers": { -+ "version": "7.20.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz", -+ "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==", -+ "requires": { -+ "@babel/types": "^7.20.0" -+ } -+ }, -+ "@babel/helper-split-export-declaration": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", -+ "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", -+ "requires": { -+ "@babel/types": "^7.18.6" -+ } -+ }, -+ "@babel/helper-string-parser": { -+ "version": "7.19.4", -+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", -+ "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==" -+ }, -+ "@babel/helper-validator-identifier": { -+ "version": "7.19.1", -+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", -+ "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==" -+ }, -+ "@babel/helper-validator-option": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", -+ "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==" -+ }, -+ "@babel/helper-wrap-function": { -+ "version": "7.19.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz", -+ "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==", -+ "requires": { -+ "@babel/helper-function-name": "^7.19.0", -+ "@babel/template": "^7.18.10", -+ "@babel/traverse": "^7.19.0", -+ "@babel/types": "^7.19.0" -+ } -+ }, -+ "@babel/helpers": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.1.tgz", -+ "integrity": "sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==", -+ "requires": { -+ "@babel/template": "^7.18.10", -+ "@babel/traverse": "^7.20.1", -+ "@babel/types": "^7.20.0" -+ } -+ }, -+ "@babel/highlight": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", -+ "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", -+ "requires": { -+ "@babel/helper-validator-identifier": "^7.18.6", -+ "chalk": "^2.0.0", -+ "js-tokens": "^4.0.0" -+ } -+ }, -+ "@babel/parser": { -+ "version": "7.20.3", -+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.3.tgz", -+ "integrity": "sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==" -+ }, -+ "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz", -+ "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz", -+ "integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9", -+ "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9", -+ "@babel/plugin-proposal-optional-chaining": "^7.18.9" -+ } -+ }, -+ "@babel/plugin-proposal-async-generator-functions": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz", -+ "integrity": "sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==", -+ "requires": { -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-plugin-utils": "^7.19.0", -+ "@babel/helper-remap-async-to-generator": "^7.18.9", -+ "@babel/plugin-syntax-async-generators": "^7.8.4" -+ } -+ }, -+ "@babel/plugin-proposal-class-properties": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz", -+ "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==", -+ "requires": { -+ "@babel/helper-create-class-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-proposal-class-static-block": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz", -+ "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==", -+ "requires": { -+ "@babel/helper-create-class-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-class-static-block": "^7.14.5" -+ } -+ }, -+ "@babel/plugin-proposal-dynamic-import": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz", -+ "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-dynamic-import": "^7.8.3" -+ } -+ }, -+ "@babel/plugin-proposal-export-namespace-from": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz", -+ "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9", -+ "@babel/plugin-syntax-export-namespace-from": "^7.8.3" -+ } -+ }, -+ "@babel/plugin-proposal-json-strings": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz", -+ "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-json-strings": "^7.8.3" -+ } -+ }, -+ "@babel/plugin-proposal-logical-assignment-operators": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz", -+ "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9", -+ "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" -+ } -+ }, -+ "@babel/plugin-proposal-nullish-coalescing-operator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz", -+ "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" -+ } -+ }, -+ "@babel/plugin-proposal-numeric-separator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz", -+ "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-numeric-separator": "^7.10.4" -+ } -+ }, -+ "@babel/plugin-proposal-object-rest-spread": { -+ "version": "7.18.0", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz", -+ "integrity": "sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==", -+ "requires": { -+ "@babel/compat-data": "^7.17.10", -+ "@babel/helper-compilation-targets": "^7.17.10", -+ "@babel/helper-plugin-utils": "^7.17.12", -+ "@babel/plugin-syntax-object-rest-spread": "^7.8.3", -+ "@babel/plugin-transform-parameters": "^7.17.12" -+ } -+ }, -+ "@babel/plugin-proposal-optional-catch-binding": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz", -+ "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" -+ } -+ }, -+ "@babel/plugin-proposal-optional-chaining": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz", -+ "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9", -+ "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9", -+ "@babel/plugin-syntax-optional-chaining": "^7.8.3" -+ } -+ }, -+ "@babel/plugin-proposal-private-methods": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz", -+ "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==", -+ "requires": { -+ "@babel/helper-create-class-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-proposal-private-property-in-object": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz", -+ "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==", -+ "requires": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "@babel/helper-create-class-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5" -+ } -+ }, -+ "@babel/plugin-proposal-unicode-property-regex": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz", -+ "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==", -+ "requires": { -+ "@babel/helper-create-regexp-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-syntax-async-generators": { -+ "version": "7.8.4", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", -+ "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ } -+ }, -+ "@babel/plugin-syntax-class-properties": { -+ "version": "7.12.13", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", -+ "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.12.13" -+ } -+ }, -+ "@babel/plugin-syntax-class-static-block": { -+ "version": "7.14.5", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", -+ "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.14.5" -+ } -+ }, -+ "@babel/plugin-syntax-dynamic-import": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", -+ "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ } -+ }, -+ "@babel/plugin-syntax-export-namespace-from": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", -+ "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.8.3" -+ } -+ }, -+ "@babel/plugin-syntax-import-assertions": { -+ "version": "7.20.0", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz", -+ "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.19.0" -+ } -+ }, -+ "@babel/plugin-syntax-json-strings": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", -+ "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ } -+ }, -+ "@babel/plugin-syntax-logical-assignment-operators": { -+ "version": "7.10.4", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", -+ "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.10.4" -+ } -+ }, -+ "@babel/plugin-syntax-nullish-coalescing-operator": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", -+ "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ } -+ }, -+ "@babel/plugin-syntax-numeric-separator": { -+ "version": "7.10.4", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", -+ "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.10.4" -+ } -+ }, -+ "@babel/plugin-syntax-object-rest-spread": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", -+ "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ } -+ }, -+ "@babel/plugin-syntax-optional-catch-binding": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", -+ "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ } -+ }, -+ "@babel/plugin-syntax-optional-chaining": { -+ "version": "7.8.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", -+ "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.8.0" -+ } -+ }, -+ "@babel/plugin-syntax-private-property-in-object": { -+ "version": "7.14.5", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", -+ "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.14.5" -+ } -+ }, -+ "@babel/plugin-syntax-top-level-await": { -+ "version": "7.14.5", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", -+ "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.14.5" -+ } -+ }, -+ "@babel/plugin-transform-arrow-functions": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz", -+ "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-async-to-generator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz", -+ "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==", -+ "requires": { -+ "@babel/helper-module-imports": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/helper-remap-async-to-generator": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-block-scoped-functions": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz", -+ "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-block-scoping": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz", -+ "integrity": "sha512-y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.20.2" -+ } -+ }, -+ "@babel/plugin-transform-classes": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz", -+ "integrity": "sha512-9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g==", -+ "requires": { -+ "@babel/helper-annotate-as-pure": "^7.18.6", -+ "@babel/helper-compilation-targets": "^7.20.0", -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-function-name": "^7.19.0", -+ "@babel/helper-optimise-call-expression": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.20.2", -+ "@babel/helper-replace-supers": "^7.19.1", -+ "@babel/helper-split-export-declaration": "^7.18.6", -+ "globals": "^11.1.0" -+ } -+ }, -+ "@babel/plugin-transform-computed-properties": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz", -+ "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ } -+ }, -+ "@babel/plugin-transform-destructuring": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz", -+ "integrity": "sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.20.2" -+ } -+ }, -+ "@babel/plugin-transform-dotall-regex": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz", -+ "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==", -+ "requires": { -+ "@babel/helper-create-regexp-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-duplicate-keys": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz", -+ "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ } -+ }, -+ "@babel/plugin-transform-exponentiation-operator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz", -+ "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==", -+ "requires": { -+ "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-for-of": { -+ "version": "7.18.8", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz", -+ "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-function-name": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz", -+ "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==", -+ "requires": { -+ "@babel/helper-compilation-targets": "^7.18.9", -+ "@babel/helper-function-name": "^7.18.9", -+ "@babel/helper-plugin-utils": "^7.18.9" -+ } -+ }, -+ "@babel/plugin-transform-literals": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz", -+ "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ } -+ }, -+ "@babel/plugin-transform-member-expression-literals": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz", -+ "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-modules-amd": { -+ "version": "7.19.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz", -+ "integrity": "sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==", -+ "requires": { -+ "@babel/helper-module-transforms": "^7.19.6", -+ "@babel/helper-plugin-utils": "^7.19.0" -+ } -+ }, -+ "@babel/plugin-transform-modules-commonjs": { -+ "version": "7.19.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz", -+ "integrity": "sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==", -+ "requires": { -+ "@babel/helper-module-transforms": "^7.19.6", -+ "@babel/helper-plugin-utils": "^7.19.0", -+ "@babel/helper-simple-access": "^7.19.4" -+ } -+ }, -+ "@babel/plugin-transform-modules-systemjs": { -+ "version": "7.19.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz", -+ "integrity": "sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==", -+ "requires": { -+ "@babel/helper-hoist-variables": "^7.18.6", -+ "@babel/helper-module-transforms": "^7.19.6", -+ "@babel/helper-plugin-utils": "^7.19.0", -+ "@babel/helper-validator-identifier": "^7.19.1" -+ } -+ }, -+ "@babel/plugin-transform-modules-umd": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz", -+ "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==", -+ "requires": { -+ "@babel/helper-module-transforms": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-named-capturing-groups-regex": { -+ "version": "7.19.1", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz", -+ "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==", -+ "requires": { -+ "@babel/helper-create-regexp-features-plugin": "^7.19.0", -+ "@babel/helper-plugin-utils": "^7.19.0" -+ } -+ }, -+ "@babel/plugin-transform-new-target": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz", -+ "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-object-super": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz", -+ "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "@babel/helper-replace-supers": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-parameters": { -+ "version": "7.20.3", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.3.tgz", -+ "integrity": "sha512-oZg/Fpx0YDrj13KsLyO8I/CX3Zdw7z0O9qOd95SqcoIzuqy/WTGWvePeHAnZCN54SfdyjHcb1S30gc8zlzlHcA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.20.2" -+ } -+ }, -+ "@babel/plugin-transform-property-literals": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz", -+ "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-regenerator": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz", -+ "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6", -+ "regenerator-transform": "^0.15.0" -+ } -+ }, -+ "@babel/plugin-transform-reserved-words": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz", -+ "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-shorthand-properties": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz", -+ "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-spread": { -+ "version": "7.19.0", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz", -+ "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.19.0", -+ "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9" -+ } -+ }, -+ "@babel/plugin-transform-sticky-regex": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz", -+ "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/plugin-transform-template-literals": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz", -+ "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ } -+ }, -+ "@babel/plugin-transform-typeof-symbol": { -+ "version": "7.18.9", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz", -+ "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ } -+ }, -+ "@babel/plugin-transform-unicode-escapes": { -+ "version": "7.18.10", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz", -+ "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.18.9" -+ } -+ }, -+ "@babel/plugin-transform-unicode-regex": { -+ "version": "7.18.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz", -+ "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==", -+ "requires": { -+ "@babel/helper-create-regexp-features-plugin": "^7.18.6", -+ "@babel/helper-plugin-utils": "^7.18.6" -+ } -+ }, -+ "@babel/polyfill": { -+ "version": "7.12.1", -+ "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz", -+ "integrity": "sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==", -+ "requires": { -+ "core-js": "^2.6.5", -+ "regenerator-runtime": "^0.13.4" -+ }, -+ "dependencies": { -+ "core-js": { -+ "version": "2.6.12", -+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", -+ "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==" -+ } -+ } -+ }, -+ "@babel/preset-env": { -+ "version": "7.18.0", -+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.0.tgz", -+ "integrity": "sha512-cP74OMs7ECLPeG1reiCQ/D/ypyOxgfm8uR6HRYV23vTJ7Lu1nbgj9DQDo/vH59gnn7GOAwtTDPPYV4aXzsMKHA==", -+ "requires": { -+ "@babel/compat-data": "^7.17.10", -+ "@babel/helper-compilation-targets": "^7.17.10", -+ "@babel/helper-plugin-utils": "^7.17.12", -+ "@babel/helper-validator-option": "^7.16.7", -+ "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.17.12", -+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.17.12", -+ "@babel/plugin-proposal-async-generator-functions": "^7.17.12", -+ "@babel/plugin-proposal-class-properties": "^7.17.12", -+ "@babel/plugin-proposal-class-static-block": "^7.18.0", -+ "@babel/plugin-proposal-dynamic-import": "^7.16.7", -+ "@babel/plugin-proposal-export-namespace-from": "^7.17.12", -+ "@babel/plugin-proposal-json-strings": "^7.17.12", -+ "@babel/plugin-proposal-logical-assignment-operators": "^7.17.12", -+ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12", -+ "@babel/plugin-proposal-numeric-separator": "^7.16.7", -+ "@babel/plugin-proposal-object-rest-spread": "^7.18.0", -+ "@babel/plugin-proposal-optional-catch-binding": "^7.16.7", -+ "@babel/plugin-proposal-optional-chaining": "^7.17.12", -+ "@babel/plugin-proposal-private-methods": "^7.17.12", -+ "@babel/plugin-proposal-private-property-in-object": "^7.17.12", -+ "@babel/plugin-proposal-unicode-property-regex": "^7.17.12", -+ "@babel/plugin-syntax-async-generators": "^7.8.4", -+ "@babel/plugin-syntax-class-properties": "^7.12.13", -+ "@babel/plugin-syntax-class-static-block": "^7.14.5", -+ "@babel/plugin-syntax-dynamic-import": "^7.8.3", -+ "@babel/plugin-syntax-export-namespace-from": "^7.8.3", -+ "@babel/plugin-syntax-import-assertions": "^7.17.12", -+ "@babel/plugin-syntax-json-strings": "^7.8.3", -+ "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", -+ "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", -+ "@babel/plugin-syntax-numeric-separator": "^7.10.4", -+ "@babel/plugin-syntax-object-rest-spread": "^7.8.3", -+ "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", -+ "@babel/plugin-syntax-optional-chaining": "^7.8.3", -+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5", -+ "@babel/plugin-syntax-top-level-await": "^7.14.5", -+ "@babel/plugin-transform-arrow-functions": "^7.17.12", -+ "@babel/plugin-transform-async-to-generator": "^7.17.12", -+ "@babel/plugin-transform-block-scoped-functions": "^7.16.7", -+ "@babel/plugin-transform-block-scoping": "^7.17.12", -+ "@babel/plugin-transform-classes": "^7.17.12", -+ "@babel/plugin-transform-computed-properties": "^7.17.12", -+ "@babel/plugin-transform-destructuring": "^7.18.0", -+ "@babel/plugin-transform-dotall-regex": "^7.16.7", -+ "@babel/plugin-transform-duplicate-keys": "^7.17.12", -+ "@babel/plugin-transform-exponentiation-operator": "^7.16.7", -+ "@babel/plugin-transform-for-of": "^7.17.12", -+ "@babel/plugin-transform-function-name": "^7.16.7", -+ "@babel/plugin-transform-literals": "^7.17.12", -+ "@babel/plugin-transform-member-expression-literals": "^7.16.7", -+ "@babel/plugin-transform-modules-amd": "^7.18.0", -+ "@babel/plugin-transform-modules-commonjs": "^7.18.0", -+ "@babel/plugin-transform-modules-systemjs": "^7.18.0", -+ "@babel/plugin-transform-modules-umd": "^7.18.0", -+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.17.12", -+ "@babel/plugin-transform-new-target": "^7.17.12", -+ "@babel/plugin-transform-object-super": "^7.16.7", -+ "@babel/plugin-transform-parameters": "^7.17.12", -+ "@babel/plugin-transform-property-literals": "^7.16.7", -+ "@babel/plugin-transform-regenerator": "^7.18.0", -+ "@babel/plugin-transform-reserved-words": "^7.17.12", -+ "@babel/plugin-transform-shorthand-properties": "^7.16.7", -+ "@babel/plugin-transform-spread": "^7.17.12", -+ "@babel/plugin-transform-sticky-regex": "^7.16.7", -+ "@babel/plugin-transform-template-literals": "^7.17.12", -+ "@babel/plugin-transform-typeof-symbol": "^7.17.12", -+ "@babel/plugin-transform-unicode-escapes": "^7.16.7", -+ "@babel/plugin-transform-unicode-regex": "^7.16.7", -+ "@babel/preset-modules": "^0.1.5", -+ "@babel/types": "^7.18.0", -+ "babel-plugin-polyfill-corejs2": "^0.3.0", -+ "babel-plugin-polyfill-corejs3": "^0.5.0", -+ "babel-plugin-polyfill-regenerator": "^0.3.0", -+ "core-js-compat": "^3.22.1", -+ "semver": "^6.3.0" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ } -+ } -+ }, -+ "@babel/preset-modules": { -+ "version": "0.1.5", -+ "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz", -+ "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==", -+ "requires": { -+ "@babel/helper-plugin-utils": "^7.0.0", -+ "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", -+ "@babel/plugin-transform-dotall-regex": "^7.4.4", -+ "@babel/types": "^7.4.4", -+ "esutils": "^2.0.2" -+ } -+ }, -+ "@babel/runtime": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz", -+ "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==", -+ "requires": { -+ "regenerator-runtime": "^0.13.10" -+ } -+ }, -+ "@babel/template": { -+ "version": "7.18.10", -+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", -+ "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", -+ "requires": { -+ "@babel/code-frame": "^7.18.6", -+ "@babel/parser": "^7.18.10", -+ "@babel/types": "^7.18.10" -+ } -+ }, -+ "@babel/traverse": { -+ "version": "7.20.1", -+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz", -+ "integrity": "sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==", -+ "requires": { -+ "@babel/code-frame": "^7.18.6", -+ "@babel/generator": "^7.20.1", -+ "@babel/helper-environment-visitor": "^7.18.9", -+ "@babel/helper-function-name": "^7.19.0", -+ "@babel/helper-hoist-variables": "^7.18.6", -+ "@babel/helper-split-export-declaration": "^7.18.6", -+ "@babel/parser": "^7.20.1", -+ "@babel/types": "^7.20.0", -+ "debug": "^4.1.0", -+ "globals": "^11.1.0" -+ } -+ }, -+ "@babel/types": { -+ "version": "7.20.2", -+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz", -+ "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==", -+ "requires": { -+ "@babel/helper-string-parser": "^7.19.4", -+ "@babel/helper-validator-identifier": "^7.19.1", -+ "to-fast-properties": "^2.0.0" -+ } -+ }, -+ "@electron/get": { -+ "version": "1.14.1", -+ "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.14.1.tgz", -+ "integrity": "sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==", -+ "requires": { -+ "debug": "^4.1.1", -+ "env-paths": "^2.2.0", -+ "fs-extra": "^8.1.0", -+ "global-agent": "^3.0.0", -+ "global-tunnel-ng": "^2.7.1", -+ "got": "^9.6.0", -+ "progress": "^2.0.3", -+ "semver": "^6.2.0", -+ "sumchecker": "^3.0.1" -+ }, -+ "dependencies": { -+ "fs-extra": { -+ "version": "8.1.0", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", -+ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", -+ "requires": { -+ "graceful-fs": "^4.2.0", -+ "jsonfile": "^4.0.0", -+ "universalify": "^0.1.0" -+ } -+ }, -+ "jsonfile": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", -+ "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", -+ "requires": { -+ "graceful-fs": "^4.1.6" -+ } -+ }, -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ }, -+ "universalify": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", -+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" -+ } -+ } -+ }, -+ "@electron/remote": { -+ "version": "2.0.8", -+ "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.0.8.tgz", -+ "integrity": "sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw==" -+ }, -+ "@eslint/eslintrc": { -+ "version": "1.3.3", -+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz", -+ "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==", -+ "requires": { -+ "ajv": "^6.12.4", -+ "debug": "^4.3.2", -+ "espree": "^9.4.0", -+ "globals": "^13.15.0", -+ "ignore": "^5.2.0", -+ "import-fresh": "^3.2.1", -+ "js-yaml": "^4.1.0", -+ "minimatch": "^3.1.2", -+ "strip-json-comments": "^3.1.1" -+ }, -+ "dependencies": { -+ "balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "requires": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "globals": { -+ "version": "13.17.0", -+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", -+ "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", -+ "requires": { -+ "type-fest": "^0.20.2" -+ } -+ }, -+ "minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "requires": { -+ "brace-expansion": "^1.1.7" -+ } -+ }, -+ "type-fest": { -+ "version": "0.20.2", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", -+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" -+ } -+ } -+ }, -+ "@gar/promisify": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", -+ "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==" -+ }, -+ "@humanwhocodes/config-array": { -+ "version": "0.9.5", -+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", -+ "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==", -+ "requires": { -+ "@humanwhocodes/object-schema": "^1.2.1", -+ "debug": "^4.1.1", -+ "minimatch": "^3.0.4" -+ }, -+ "dependencies": { -+ "balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "requires": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "requires": { -+ "brace-expansion": "^1.1.7" -+ } -+ } -+ } -+ }, -+ "@humanwhocodes/object-schema": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", -+ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==" -+ }, -+ "@jridgewell/gen-mapping": { -+ "version": "0.1.1", -+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", -+ "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", -+ "requires": { -+ "@jridgewell/set-array": "^1.0.0", -+ "@jridgewell/sourcemap-codec": "^1.4.10" -+ } -+ }, -+ "@jridgewell/resolve-uri": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", -+ "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==" -+ }, -+ "@jridgewell/set-array": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", -+ "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==" -+ }, -+ "@jridgewell/sourcemap-codec": { -+ "version": "1.4.14", -+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", -+ "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" -+ }, -+ "@jridgewell/trace-mapping": { -+ "version": "0.3.17", -+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", -+ "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", -+ "requires": { -+ "@jridgewell/resolve-uri": "3.1.0", -+ "@jridgewell/sourcemap-codec": "1.4.14" -+ } -+ }, -+ "@npmcli/fs": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz", -+ "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==", -+ "requires": { -+ "@gar/promisify": "^1.0.1", -+ "semver": "^7.3.5" -+ } -+ }, -+ "@npmcli/move-file": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", -+ "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", -+ "requires": { -+ "mkdirp": "^1.0.4", -+ "rimraf": "^3.0.2" -+ }, -+ "dependencies": { -+ "mkdirp": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", -+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" -+ }, -+ "rimraf": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", -+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", -+ "requires": { -+ "glob": "^7.1.3" -+ } -+ } -+ } -+ }, -+ "@serialport/binding-abstract": { -+ "version": "9.2.4", -+ "resolved": "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.2.4.tgz", -+ "integrity": "sha512-UESvncat2oQKnAp29eDVJ2jB9sADatCgoojPPB4RVvp3+3Wqu5QVEh/UCjHRUeDJ20fkSFnKAw9D0vNoBQ+5Kw==", -+ "optional": true, -+ "requires": { -+ "debug": "^4.3.2" -+ } -+ }, -+ "@serialport/binding-mock": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-9.0.7.tgz", -+ "integrity": "sha512-aR8H+htZwwZZkVb1MdbnNvGWw8eXVRqQ2qPhkbKyx0N/LY5aVIgCgT98Kt1YylLsG7SzNG+Jbhd4wzwEuPVT5Q==", -+ "optional": true, -+ "requires": { -+ "@serialport/binding-abstract": "^9.0.7", -+ "debug": "^4.3.1" -+ } -+ }, -+ "@serialport/bindings": { -+ "version": "9.2.9", -+ "resolved": "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.2.9.tgz", -+ "integrity": "sha512-An7PiVlyNMx/0RDnSBxFHIsd4kt0/zPlDALlTjhVQKXbG6e0xRqLKbkoZVzHMS8rg7HzCu8G1nplifoAwNm5Lg==", -+ "optional": true, -+ "requires": { -+ "@serialport/binding-abstract": "9.2.3", -+ "@serialport/parser-readline": "9.2.4", -+ "bindings": "^1.5.0", -+ "debug": "^4.3.2", -+ "nan": "^2.15.0", -+ "prebuild-install": "^7.0.0" -+ }, -+ "dependencies": { -+ "@serialport/binding-abstract": { -+ "version": "9.2.3", -+ "resolved": "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.2.3.tgz", -+ "integrity": "sha512-cQs9tbIlG3P0IrOWyVirqlhWuJ7Ms2Zh9m2108z6Y5UW/iVj6wEOiW8EmK9QX9jmJXYllE7wgGgvVozP5oCj3w==", -+ "optional": true, -+ "requires": { -+ "debug": "^4.3.2" -+ } -+ }, -+ "@serialport/parser-delimiter": { -+ "version": "9.2.4", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-9.2.4.tgz", -+ "integrity": "sha512-4nvTAoYAgkxFiXrkI+3CA49Yd43CODjeszh89EK+I9c8wOZ+etZduRCzINYPiy26g7zO+GRAb9FoPCsY+sYcbQ==", -+ "optional": true -+ }, -+ "@serialport/parser-readline": { -+ "version": "9.2.4", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-9.2.4.tgz", -+ "integrity": "sha512-Z1/qrZTQUVhNSJP1hd9YfDvq0o7d87rNwAjjRKbVpa7Qi51tG5BnKt43IV3NFMyBlVcRe0rnIb3tJu57E0SOwg==", -+ "optional": true, -+ "requires": { -+ "@serialport/parser-delimiter": "9.2.4" -+ } -+ } -+ } -+ }, -+ "@serialport/parser-byte-length": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-9.0.7.tgz", -+ "integrity": "sha512-evf7oOOSBMBn2AZZbgBFMRIyEzlsyQkhqaPm7IBCPTxMDXRf4tKkFYJHYZB0/6d1W4eI0meH079UqmSsh/uoDA==", -+ "optional": true -+ }, -+ "@serialport/parser-cctalk": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-9.0.7.tgz", -+ "integrity": "sha512-ert5jhMkeiTfr44TkbdySC09J8UwAsf/RxBucVN5Mz5enG509RggnkfFi4mfj3UCG2vZ7qsmM6gtZ62DshY02Q==", -+ "optional": true -+ }, -+ "@serialport/parser-delimiter": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-9.0.7.tgz", -+ "integrity": "sha512-Vb2NPeXPZ/28M4m5x4OAHFd8jRAeddNCgvL+Q+H/hqFPY1w47JcMLchC7pigRW8Cnt1fklmzfwdNQ8Fb+kMkxQ==", -+ "optional": true -+ }, -+ "@serialport/parser-inter-byte-timeout": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-9.0.7.tgz", -+ "integrity": "sha512-lUZ3cwgUluBvJ1jf+0LQsqoiPYAokDO6+fRCw9HCfnrF/OS60Gm4rxuyo2uQIueqZkJ7NIFP+ibKsULrA47AEA==", -+ "optional": true -+ }, -+ "@serialport/parser-readline": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-9.0.7.tgz", -+ "integrity": "sha512-ydoLbgVQQPxWrwbe3Fhh4XnZexbkEQAC6M/qgRTzjnKvTjrD61CJNxLc3vyDaAPI9bJIhTiI7eTX3JB5jJv8Hg==", -+ "optional": true, -+ "requires": { -+ "@serialport/parser-delimiter": "^9.0.7" -+ } -+ }, -+ "@serialport/parser-ready": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-9.0.7.tgz", -+ "integrity": "sha512-3qYhI4cNUPAYqVYvdwV57Y+PVRl4dJf1fPBtMoWtwDgwopsAXTR93WCs49WuUq9JCyNW+8Hrfqv8x8eNAD5Dqg==", -+ "optional": true -+ }, -+ "@serialport/parser-regex": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-9.0.7.tgz", -+ "integrity": "sha512-5XF+FXbhqQ/5bVKM4NaGs1m+E9KjfmeCx/obwsKaUZognQF67jwoTfjJJWNP/21jKfxdl8XoCYjZjASl3XKRAw==", -+ "optional": true -+ }, -+ "@serialport/stream": { -+ "version": "9.0.7", -+ "resolved": "https://registry.npmjs.org/@serialport/stream/-/stream-9.0.7.tgz", -+ "integrity": "sha512-c/h7HPAeFiryD9iTGlaSvPqHFHSZ0NMQHxC4rcmKS2Vu3qJuEtkBdTLABwsMp7iWEiSnI4KC3s7bHapaXP06FQ==", -+ "optional": true, -+ "requires": { -+ "debug": "^4.3.1" -+ } -+ }, -+ "@sindresorhus/is": { -+ "version": "0.14.0", -+ "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", -+ "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" -+ }, -+ "@szmarczak/http-timer": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", -+ "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", -+ "requires": { -+ "defer-to-connect": "^1.0.1" -+ } -+ }, -+ "@tootallnate/once": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", -+ "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==" -+ }, -+ "@types/glob": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", -+ "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", -+ "optional": true, -+ "requires": { -+ "@types/minimatch": "*", -+ "@types/node": "*" -+ } -+ }, -+ "@types/minimatch": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", -+ "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", -+ "optional": true -+ }, -+ "@types/minimist": { -+ "version": "1.2.2", -+ "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", -+ "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==" -+ }, -+ "@types/node": { -+ "version": "18.11.9", -+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz", -+ "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==", -+ "optional": true -+ }, -+ "@types/normalize-package-data": { -+ "version": "2.4.1", -+ "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz", -+ "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==" -+ }, -+ "@types/yauzl": { -+ "version": "2.10.0", -+ "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", -+ "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", -+ "optional": true, -+ "requires": { -+ "@types/node": "*" -+ } -+ }, -+ "7zip": { -+ "version": "0.0.6", -+ "resolved": "https://registry.npmjs.org/7zip/-/7zip-0.0.6.tgz", -+ "integrity": "sha512-ns8vKbKhIQm338AeWo/YdDSWil3pldwCMoyR2npoM2qDAzF8Vuko8BtDxpNt/wE15SXOh5K5WbjSLR4kTOAHLA==" -+ }, -+ "abbrev": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", -+ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" -+ }, -+ "acorn": { -+ "version": "8.8.1", -+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", -+ "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==" -+ }, -+ "acorn-jsx": { -+ "version": "5.3.2", -+ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", -+ "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==" -+ }, -+ "acorn-node": { -+ "version": "1.8.2", -+ "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz", -+ "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==", -+ "requires": { -+ "acorn": "^7.0.0", -+ "acorn-walk": "^7.0.0", -+ "xtend": "^4.0.2" -+ }, -+ "dependencies": { -+ "acorn": { -+ "version": "7.4.1", -+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", -+ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==" -+ } -+ } -+ }, -+ "acorn-walk": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", -+ "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==" -+ }, -+ "agent-base": { -+ "version": "6.0.2", -+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", -+ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", -+ "requires": { -+ "debug": "4" -+ } -+ }, -+ "agentkeepalive": { -+ "version": "4.2.1", -+ "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz", -+ "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==", -+ "requires": { -+ "debug": "^4.1.0", -+ "depd": "^1.1.2", -+ "humanize-ms": "^1.2.1" -+ } -+ }, -+ "aggregate-error": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", -+ "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", -+ "requires": { -+ "clean-stack": "^2.0.0", -+ "indent-string": "^4.0.0" -+ } -+ }, -+ "ajv": { -+ "version": "6.12.6", -+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", -+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", -+ "requires": { -+ "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": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", -+ "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", -+ "requires": { -+ "string-width": "^4.1.0" -+ } -+ }, -+ "ansi-html": { -+ "version": "0.0.9", -+ "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.9.tgz", -+ "integrity": "sha512-ozbS3LuenHVxNRh/wdnN16QapUHzauqSomAl1jwwJRRsGwFwtj644lIhxfWu0Fy0acCij2+AEgHvjscq3dlVXg==" -+ }, -+ "ansi-regex": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", -+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" -+ }, -+ "ansi-styles": { -+ "version": "3.2.1", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", -+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", -+ "requires": { -+ "color-convert": "^1.9.0" -+ } -+ }, -+ "anymatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", -+ "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", -+ "requires": { -+ "normalize-path": "^3.0.0", -+ "picomatch": "^2.0.4" -+ } -+ }, -+ "apache-crypt": { -+ "version": "1.2.6", -+ "resolved": "https://registry.npmjs.org/apache-crypt/-/apache-crypt-1.2.6.tgz", -+ "integrity": "sha512-072WetlM4blL8PREJVeY+WHiUh1R5VNt2HfceGS8aKqttPHcmqE5pkKuXPz/ULmJOFkc8Hw3kfKl6vy7Qka6DA==", -+ "requires": { -+ "unix-crypt-td-js": "^1.1.4" -+ } -+ }, -+ "apache-md5": { -+ "version": "1.1.8", -+ "resolved": "https://registry.npmjs.org/apache-md5/-/apache-md5-1.1.8.tgz", -+ "integrity": "sha512-FCAJojipPn0bXjuEpjOOOMN8FZDkxfWWp4JGN9mifU2IhxvKyXZYqpzPHdnTSUpmPDy+tsslB6Z1g+Vg6nVbYA==" -+ }, -+ "aproba": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", -+ "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==" -+ }, -+ "are-we-there-yet": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", -+ "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", -+ "requires": { -+ "delegates": "^1.0.0", -+ "readable-stream": "^3.6.0" -+ }, -+ "dependencies": { -+ "readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "requires": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ } -+ } -+ } -+ }, -+ "argparse": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", -+ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" -+ }, -+ "array-flatten": { -+ "version": "2.1.2", -+ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", -+ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==" -+ }, -+ "arrify": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", -+ "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==" -+ }, -+ "asar": { -+ "version": "3.2.0", -+ "resolved": "https://registry.npmjs.org/asar/-/asar-3.2.0.tgz", -+ "integrity": "sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg==", -+ "requires": { -+ "@types/glob": "^7.1.1", -+ "chromium-pickle-js": "^0.2.0", -+ "commander": "^5.0.0", -+ "glob": "^7.1.6", -+ "minimatch": "^3.0.4" -+ }, -+ "dependencies": { -+ "balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "requires": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "requires": { -+ "brace-expansion": "^1.1.7" -+ } -+ } -+ } -+ }, -+ "asn1": { -+ "version": "0.2.6", -+ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", -+ "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", -+ "requires": { -+ "safer-buffer": "~2.1.0" -+ } -+ }, -+ "asn1.js": { -+ "version": "5.4.1", -+ "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", -+ "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", -+ "requires": { -+ "bn.js": "^4.0.0", -+ "inherits": "^2.0.1", -+ "minimalistic-assert": "^1.0.0", -+ "safer-buffer": "^2.1.0" -+ }, -+ "dependencies": { -+ "bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ } -+ } -+ }, -+ "assert": { -+ "version": "1.5.0", -+ "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", -+ "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", -+ "requires": { -+ "object-assign": "^4.1.1", -+ "util": "0.10.3" -+ }, -+ "dependencies": { -+ "inherits": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", -+ "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==" -+ }, -+ "util": { -+ "version": "0.10.3", -+ "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", -+ "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==", -+ "requires": { -+ "inherits": "2.0.1" -+ } -+ } -+ } -+ }, -+ "assert-plus": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", -+ "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==" -+ }, -+ "async-foreach": { -+ "version": "0.1.3", -+ "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", -+ "integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==" -+ }, -+ "asynckit": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", -+ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" -+ }, -+ "at-least-node": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", -+ "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==" -+ }, -+ "author-regex": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz", -+ "integrity": "sha512-KbWgR8wOYRAPekEmMXrYYdc7BRyhn2Ftk7KWfMUnQ43hFdojWEFRxhhRUm3/OFEdPa1r0KAvTTg9YQK57xTe0g==" -+ }, -+ "available-typed-arrays": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", -+ "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==" -+ }, -+ "aws-sign2": { -+ "version": "0.7.0", -+ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", -+ "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==" -+ }, -+ "aws4": { -+ "version": "1.11.0", -+ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", -+ "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" -+ }, -+ "babel-plugin-polyfill-corejs2": { -+ "version": "0.3.3", -+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz", -+ "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==", -+ "requires": { -+ "@babel/compat-data": "^7.17.7", -+ "@babel/helper-define-polyfill-provider": "^0.3.3", -+ "semver": "^6.1.1" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ } -+ } -+ }, -+ "babel-plugin-polyfill-corejs3": { -+ "version": "0.5.3", -+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz", -+ "integrity": "sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==", -+ "requires": { -+ "@babel/helper-define-polyfill-provider": "^0.3.2", -+ "core-js-compat": "^3.21.0" -+ } -+ }, -+ "babel-plugin-polyfill-regenerator": { -+ "version": "0.3.1", -+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz", -+ "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==", -+ "requires": { -+ "@babel/helper-define-polyfill-provider": "^0.3.1" -+ } -+ }, -+ "babelify": { -+ "version": "10.0.0", -+ "resolved": "https://registry.npmjs.org/babelify/-/babelify-10.0.0.tgz", -+ "integrity": "sha512-X40FaxyH7t3X+JFAKvb1H9wooWKLRCi8pg3m8poqtdZaIng+bjzp9RvKQCvRjF9isHiPkXspbbXT/zwXLtwgwg==" -+ }, -+ "balanced-match": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", -+ "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==" -+ }, -+ "base64-js": { -+ "version": "1.5.1", -+ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", -+ "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" -+ }, -+ "bcrypt-pbkdf": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", -+ "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", -+ "requires": { -+ "tweetnacl": "^0.14.3" -+ } -+ }, -+ "bcryptjs": { -+ "version": "2.4.3", -+ "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz", -+ "integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==" -+ }, -+ "binary-extensions": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", -+ "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" -+ }, -+ "bindings": { -+ "version": "1.5.0", -+ "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", -+ "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", -+ "optional": true, -+ "requires": { -+ "file-uri-to-path": "1.0.0" -+ } -+ }, -+ "bl": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", -+ "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", -+ "optional": true, -+ "requires": { -+ "buffer": "^5.5.0", -+ "inherits": "^2.0.4", -+ "readable-stream": "^3.4.0" -+ }, -+ "dependencies": { -+ "buffer": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", -+ "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", -+ "optional": true, -+ "requires": { -+ "base64-js": "^1.3.1", -+ "ieee754": "^1.1.13" -+ } -+ }, -+ "readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "optional": true, -+ "requires": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ } -+ } -+ } -+ }, -+ "bluebird": { -+ "version": "3.7.2", -+ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", -+ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" -+ }, -+ "bn.js": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", -+ "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" -+ }, -+ "bonjour": { -+ "version": "git+ssh://git@github.com/jean-emmanuel/bonjour.git#33d7fa28c568d05cb7ffda1fd2b20f4cc364e273", -+ "from": "bonjour@github:jean-emmanuel/bonjour", -+ "requires": { -+ "array-flatten": "^2.1.0", -+ "deep-equal": "^1.0.1", -+ "dns-equal": "^1.0.0", -+ "dns-txt": "github:jean-emmanuel/dns-txt#v2.0.3", -+ "multicast-dns": "github:jean-emmanuel/multicast-dns", -+ "multicast-dns-service-types": "^1.1.0" -+ } -+ }, -+ "boolean": { -+ "version": "3.2.0", -+ "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz", -+ "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==", -+ "optional": true -+ }, -+ "boxen": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz", -+ "integrity": "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==", -+ "requires": { -+ "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" -+ }, -+ "dependencies": { -+ "ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "requires": { -+ "color-convert": "^2.0.1" -+ } -+ }, -+ "camelcase": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", -+ "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==" -+ }, -+ "chalk": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", -+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -+ "requires": { -+ "ansi-styles": "^4.1.0", -+ "supports-color": "^7.1.0" -+ } -+ }, -+ "color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "requires": { -+ "color-name": "~1.1.4" -+ } -+ }, -+ "color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "has-flag": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" -+ }, -+ "supports-color": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -+ "requires": { -+ "has-flag": "^4.0.0" -+ } -+ }, -+ "type-fest": { -+ "version": "0.20.2", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", -+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" -+ } -+ } -+ }, -+ "brace": { -+ "version": "0.11.1", -+ "resolved": "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz", -+ "integrity": "sha512-Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q==" -+ }, -+ "brace-expansion": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", -+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", -+ "requires": { -+ "balanced-match": "^1.0.0" -+ }, -+ "dependencies": { -+ "balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ } -+ } -+ }, -+ "braces": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", -+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", -+ "requires": { -+ "fill-range": "^7.0.1" -+ } -+ }, -+ "brorand": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", -+ "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==" -+ }, -+ "browser-pack": { -+ "version": "6.1.0", -+ "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz", -+ "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==", -+ "requires": { -+ "combine-source-map": "~0.8.0", -+ "defined": "^1.0.0", -+ "JSONStream": "^1.0.3", -+ "safe-buffer": "^5.1.1", -+ "through2": "^2.0.0", -+ "umd": "^3.0.0" -+ } -+ }, -+ "browser-process-hrtime": { -+ "version": "0.1.3", -+ "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz", -+ "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==" -+ }, -+ "browser-resolve": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz", -+ "integrity": "sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==", -+ "requires": { -+ "resolve": "^1.17.0" -+ } -+ }, -+ "browserify": { -+ "version": "17.0.0", -+ "resolved": "https://registry.npmjs.org/browserify/-/browserify-17.0.0.tgz", -+ "integrity": "sha512-SaHqzhku9v/j6XsQMRxPyBrSP3gnwmE27gLJYZgMT2GeK3J0+0toN+MnuNYDfHwVGQfLiMZ7KSNSIXHemy905w==", -+ "requires": { -+ "assert": "^1.4.0", -+ "browser-pack": "^6.0.1", -+ "browser-resolve": "^2.0.0", -+ "browserify-zlib": "~0.2.0", -+ "buffer": "~5.2.1", -+ "cached-path-relative": "^1.0.0", -+ "concat-stream": "^1.6.0", -+ "console-browserify": "^1.1.0", -+ "constants-browserify": "~1.0.0", -+ "crypto-browserify": "^3.0.0", -+ "defined": "^1.0.0", -+ "deps-sort": "^2.0.1", -+ "domain-browser": "^1.2.0", -+ "duplexer2": "~0.1.2", -+ "events": "^3.0.0", -+ "glob": "^7.1.0", -+ "has": "^1.0.0", -+ "htmlescape": "^1.1.0", -+ "https-browserify": "^1.0.0", -+ "inherits": "~2.0.1", -+ "insert-module-globals": "^7.2.1", -+ "JSONStream": "^1.0.3", -+ "labeled-stream-splicer": "^2.0.0", -+ "mkdirp-classic": "^0.5.2", -+ "module-deps": "^6.2.3", -+ "os-browserify": "~0.3.0", -+ "parents": "^1.0.1", -+ "path-browserify": "^1.0.0", -+ "process": "~0.11.0", -+ "punycode": "^1.3.2", -+ "querystring-es3": "~0.2.0", -+ "read-only-stream": "^2.0.0", -+ "readable-stream": "^2.0.2", -+ "resolve": "^1.1.4", -+ "shasum-object": "^1.0.0", -+ "shell-quote": "^1.6.1", -+ "stream-browserify": "^3.0.0", -+ "stream-http": "^3.0.0", -+ "string_decoder": "^1.1.1", -+ "subarg": "^1.0.0", -+ "syntax-error": "^1.1.1", -+ "through2": "^2.0.0", -+ "timers-browserify": "^1.0.1", -+ "tty-browserify": "0.0.1", -+ "url": "~0.11.0", -+ "util": "~0.12.0", -+ "vm-browserify": "^1.0.0", -+ "xtend": "^4.0.0" -+ } -+ }, -+ "browserify-aes": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", -+ "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", -+ "requires": { -+ "buffer-xor": "^1.0.3", -+ "cipher-base": "^1.0.0", -+ "create-hash": "^1.1.0", -+ "evp_bytestokey": "^1.0.3", -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.0.1" -+ } -+ }, -+ "browserify-cipher": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", -+ "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", -+ "requires": { -+ "browserify-aes": "^1.0.4", -+ "browserify-des": "^1.0.0", -+ "evp_bytestokey": "^1.0.0" -+ } -+ }, -+ "browserify-des": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", -+ "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", -+ "requires": { -+ "cipher-base": "^1.0.1", -+ "des.js": "^1.0.0", -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.1.2" -+ } -+ }, -+ "browserify-rsa": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", -+ "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", -+ "requires": { -+ "bn.js": "^5.0.0", -+ "randombytes": "^2.0.1" -+ } -+ }, -+ "browserify-sign": { -+ "version": "4.2.1", -+ "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", -+ "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", -+ "requires": { -+ "bn.js": "^5.1.1", -+ "browserify-rsa": "^4.0.1", -+ "create-hash": "^1.2.0", -+ "create-hmac": "^1.1.7", -+ "elliptic": "^6.5.3", -+ "inherits": "^2.0.4", -+ "parse-asn1": "^5.1.5", -+ "readable-stream": "^3.6.0", -+ "safe-buffer": "^5.2.0" -+ }, -+ "dependencies": { -+ "readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "requires": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ } -+ } -+ } -+ }, -+ "browserify-zlib": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", -+ "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", -+ "requires": { -+ "pako": "~1.0.5" -+ } -+ }, -+ "browserslist": { -+ "version": "4.21.4", -+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", -+ "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", -+ "requires": { -+ "caniuse-lite": "^1.0.30001400", -+ "electron-to-chromium": "^1.4.251", -+ "node-releases": "^2.0.6", -+ "update-browserslist-db": "^1.0.9" -+ } -+ }, -+ "buffer": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz", -+ "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==", -+ "requires": { -+ "base64-js": "^1.0.2", -+ "ieee754": "^1.1.4" -+ } -+ }, -+ "buffer-alloc": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", -+ "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", -+ "requires": { -+ "buffer-alloc-unsafe": "^1.1.0", -+ "buffer-fill": "^1.0.0" -+ } -+ }, -+ "buffer-alloc-unsafe": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", -+ "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==" -+ }, -+ "buffer-crc32": { -+ "version": "0.2.13", -+ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", -+ "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==" -+ }, -+ "buffer-fill": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", -+ "integrity": "sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==" -+ }, -+ "buffer-from": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", -+ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" -+ }, -+ "buffer-indexof": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", -+ "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==" -+ }, -+ "buffer-xor": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", -+ "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==" -+ }, -+ "builtin-status-codes": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", -+ "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==" -+ }, -+ "cacache": { -+ "version": "15.3.0", -+ "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", -+ "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==", -+ "requires": { -+ "@npmcli/fs": "^1.0.0", -+ "@npmcli/move-file": "^1.0.1", -+ "chownr": "^2.0.0", -+ "fs-minipass": "^2.0.0", -+ "glob": "^7.1.4", -+ "infer-owner": "^1.0.4", -+ "lru-cache": "^6.0.0", -+ "minipass": "^3.1.1", -+ "minipass-collect": "^1.0.2", -+ "minipass-flush": "^1.0.5", -+ "minipass-pipeline": "^1.2.2", -+ "mkdirp": "^1.0.3", -+ "p-map": "^4.0.0", -+ "promise-inflight": "^1.0.1", -+ "rimraf": "^3.0.2", -+ "ssri": "^8.0.1", -+ "tar": "^6.0.2", -+ "unique-filename": "^1.1.1" -+ }, -+ "dependencies": { -+ "mkdirp": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", -+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" -+ }, -+ "rimraf": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", -+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", -+ "requires": { -+ "glob": "^7.1.3" -+ } -+ } -+ } -+ }, -+ "cacheable-request": { -+ "version": "6.1.0", -+ "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", -+ "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", -+ "requires": { -+ "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" -+ }, -+ "dependencies": { -+ "lowercase-keys": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", -+ "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" -+ } -+ } -+ }, -+ "cached-path-relative": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.1.0.tgz", -+ "integrity": "sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA==" -+ }, -+ "call-bind": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", -+ "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", -+ "requires": { -+ "function-bind": "^1.1.1", -+ "get-intrinsic": "^1.0.2" -+ } -+ }, -+ "callsites": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", -+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" -+ }, -+ "camel-case": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", -+ "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==", -+ "requires": { -+ "no-case": "^2.2.0", -+ "upper-case": "^1.1.1" -+ } -+ }, -+ "camelcase": { -+ "version": "5.3.1", -+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", -+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" -+ }, -+ "camelcase-keys": { -+ "version": "6.2.2", -+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", -+ "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", -+ "requires": { -+ "camelcase": "^5.3.1", -+ "map-obj": "^4.0.0", -+ "quick-lru": "^4.0.1" -+ } -+ }, -+ "caniuse-lite": { -+ "version": "1.0.30001431", -+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz", -+ "integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==" -+ }, -+ "caseless": { -+ "version": "0.12.0", -+ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", -+ "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==" -+ }, -+ "chalk": { -+ "version": "2.4.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", -+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", -+ "requires": { -+ "ansi-styles": "^3.2.1", -+ "escape-string-regexp": "^1.0.5", -+ "supports-color": "^5.3.0" -+ } -+ }, -+ "chokidar": { -+ "version": "3.5.3", -+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", -+ "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", -+ "requires": { -+ "anymatch": "~3.1.2", -+ "braces": "~3.0.2", -+ "fsevents": "~2.3.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" -+ } -+ }, -+ "chownr": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", -+ "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" -+ }, -+ "chroma-js": { -+ "version": "2.4.2", -+ "resolved": "https://registry.npmjs.org/chroma-js/-/chroma-js-2.4.2.tgz", -+ "integrity": "sha512-U9eDw6+wt7V8z5NncY2jJfZa+hUH8XEj8FQHgFJTrUFnJfXYf4Ml4adI2vXZOjqRDpFWtYVWypDfZwnJ+HIR4A==" -+ }, -+ "chromium-pickle-js": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz", -+ "integrity": "sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==" -+ }, -+ "ci-info": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", -+ "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==" -+ }, -+ "cipher-base": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", -+ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", -+ "requires": { -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.0.1" -+ } -+ }, -+ "clean-stack": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", -+ "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==" -+ }, -+ "cli-boxes": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", -+ "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==" -+ }, -+ "cliui": { -+ "version": "7.0.4", -+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", -+ "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", -+ "requires": { -+ "string-width": "^4.2.0", -+ "strip-ansi": "^6.0.0", -+ "wrap-ansi": "^7.0.0" -+ } -+ }, -+ "clone-response": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", -+ "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", -+ "requires": { -+ "mimic-response": "^1.0.0" -+ } -+ }, -+ "color-convert": { -+ "version": "1.9.3", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", -+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", -+ "requires": { -+ "color-name": "1.1.3" -+ } -+ }, -+ "color-name": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", -+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" -+ }, -+ "color-support": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", -+ "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==" -+ }, -+ "combine-source-map": { -+ "version": "0.8.0", -+ "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz", -+ "integrity": "sha512-UlxQ9Vw0b/Bt/KYwCFqdEwsQ1eL8d1gibiFb7lxQJFdvTgc2hIZi6ugsg+kyhzhPV+QEpUiEIwInIAIrgoEkrg==", -+ "requires": { -+ "convert-source-map": "~1.1.0", -+ "inline-source-map": "~0.6.0", -+ "lodash.memoize": "~3.0.3", -+ "source-map": "~0.5.3" -+ }, -+ "dependencies": { -+ "convert-source-map": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz", -+ "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==" -+ } -+ } -+ }, -+ "combined-stream": { -+ "version": "1.0.8", -+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", -+ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", -+ "requires": { -+ "delayed-stream": "~1.0.0" -+ } -+ }, -+ "commander": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", -+ "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==" -+ }, -+ "compare-version": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", -+ "integrity": "sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==" -+ }, -+ "concat-map": { -+ "version": "0.0.1", -+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", -+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" -+ }, -+ "concat-stream": { -+ "version": "1.6.2", -+ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", -+ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", -+ "requires": { -+ "buffer-from": "^1.0.0", -+ "inherits": "^2.0.3", -+ "readable-stream": "^2.2.2", -+ "typedarray": "^0.0.6" -+ } -+ }, -+ "config-chain": { -+ "version": "1.1.13", -+ "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", -+ "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", -+ "optional": true, -+ "requires": { -+ "ini": "^1.3.4", -+ "proto-list": "~1.2.1" -+ } -+ }, -+ "configstore": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", -+ "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", -+ "requires": { -+ "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" -+ } -+ }, -+ "console-browserify": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", -+ "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" -+ }, -+ "console-control-strings": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", -+ "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==" -+ }, -+ "constants-browserify": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", -+ "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==" -+ }, -+ "convert-source-map": { -+ "version": "1.9.0", -+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", -+ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" -+ }, -+ "core-js": { -+ "version": "3.22.5", -+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz", -+ "integrity": "sha512-VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA==" -+ }, -+ "core-js-compat": { -+ "version": "3.26.0", -+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz", -+ "integrity": "sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==", -+ "requires": { -+ "browserslist": "^4.21.4" -+ } -+ }, -+ "core-util-is": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", -+ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" -+ }, -+ "cpr": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/cpr/-/cpr-3.0.1.tgz", -+ "integrity": "sha512-Xch4PXQ/KC8lJ+KfJ9JI6eG/nmppLrPPWg5Q+vh65Qr9EjuJEubxh/H/Le1TmCZ7+Xv7iJuNRqapyOFZB+wsxA==", -+ "requires": { -+ "graceful-fs": "^4.1.5", -+ "minimist": "^1.2.0", -+ "mkdirp": "~0.5.1", -+ "rimraf": "^2.5.4" -+ } -+ }, -+ "create-ecdh": { -+ "version": "4.0.4", -+ "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", -+ "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", -+ "requires": { -+ "bn.js": "^4.1.0", -+ "elliptic": "^6.5.3" -+ }, -+ "dependencies": { -+ "bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ } -+ } -+ }, -+ "create-hash": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", -+ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", -+ "requires": { -+ "cipher-base": "^1.0.1", -+ "inherits": "^2.0.1", -+ "md5.js": "^1.3.4", -+ "ripemd160": "^2.0.1", -+ "sha.js": "^2.4.0" -+ } -+ }, -+ "create-hmac": { -+ "version": "1.1.7", -+ "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", -+ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", -+ "requires": { -+ "cipher-base": "^1.0.3", -+ "create-hash": "^1.1.0", -+ "inherits": "^2.0.1", -+ "ripemd160": "^2.0.0", -+ "safe-buffer": "^5.0.1", -+ "sha.js": "^2.4.8" -+ } -+ }, -+ "cross-spawn": { -+ "version": "7.0.3", -+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", -+ "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", -+ "requires": { -+ "path-key": "^3.1.0", -+ "shebang-command": "^2.0.0", -+ "which": "^2.0.1" -+ } -+ }, -+ "cross-unzip": { -+ "version": "0.0.2", -+ "resolved": "https://registry.npmjs.org/cross-unzip/-/cross-unzip-0.0.2.tgz", -+ "integrity": "sha512-nRJ5c+aqHz0OJVU4V1bqoaDggydfauK/Gha/H/ScBvuIjhZvl8YIpdWVzSR3vUhzCloqB1tvBdQ4V7J8qK7HzQ==" -+ }, -+ "crypto-browserify": { -+ "version": "3.12.0", -+ "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", -+ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", -+ "requires": { -+ "browserify-cipher": "^1.0.0", -+ "browserify-sign": "^4.0.0", -+ "create-ecdh": "^4.0.0", -+ "create-hash": "^1.1.0", -+ "create-hmac": "^1.1.0", -+ "diffie-hellman": "^5.0.0", -+ "inherits": "^2.0.1", -+ "pbkdf2": "^3.0.3", -+ "public-encrypt": "^4.0.0", -+ "randombytes": "^2.0.0", -+ "randomfill": "^1.0.3" -+ } -+ }, -+ "crypto-random-string": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", -+ "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==" -+ }, -+ "dash-ast": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz", -+ "integrity": "sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA==" -+ }, -+ "dashdash": { -+ "version": "1.14.1", -+ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", -+ "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==", -+ "requires": { -+ "assert-plus": "^1.0.0" -+ } -+ }, -+ "debug": { -+ "version": "4.3.4", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", -+ "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", -+ "requires": { -+ "ms": "2.1.2" -+ } -+ }, -+ "decamelize": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", -+ "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==" -+ }, -+ "decamelize-keys": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz", -+ "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==", -+ "requires": { -+ "decamelize": "^1.1.0", -+ "map-obj": "^1.0.0" -+ }, -+ "dependencies": { -+ "map-obj": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", -+ "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==" -+ } -+ } -+ }, -+ "decompress-response": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", -+ "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==", -+ "requires": { -+ "mimic-response": "^1.0.0" -+ } -+ }, -+ "deep-equal": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", -+ "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", -+ "requires": { -+ "is-arguments": "^1.0.4", -+ "is-date-object": "^1.0.1", -+ "is-regex": "^1.0.4", -+ "object-is": "^1.0.1", -+ "object-keys": "^1.1.1", -+ "regexp.prototype.flags": "^1.2.0" -+ } -+ }, -+ "deep-extend": { -+ "version": "0.6.0", -+ "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", -+ "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" -+ }, -+ "deep-is": { -+ "version": "0.1.4", -+ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", -+ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" -+ }, -+ "defer-to-connect": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", -+ "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" -+ }, -+ "define-lazy-prop": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", -+ "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==" -+ }, -+ "define-properties": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", -+ "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", -+ "requires": { -+ "has-property-descriptors": "^1.0.0", -+ "object-keys": "^1.1.1" -+ } -+ }, -+ "defined": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz", -+ "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==" -+ }, -+ "delayed-stream": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", -+ "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" -+ }, -+ "delegates": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", -+ "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==" -+ }, -+ "depd": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", -+ "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==" -+ }, -+ "deps-sort": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.1.tgz", -+ "integrity": "sha512-1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw==", -+ "requires": { -+ "JSONStream": "^1.0.3", -+ "shasum-object": "^1.0.0", -+ "subarg": "^1.0.0", -+ "through2": "^2.0.0" -+ } -+ }, -+ "des.js": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", -+ "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", -+ "requires": { -+ "inherits": "^2.0.1", -+ "minimalistic-assert": "^1.0.0" -+ } -+ }, -+ "destroy": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", -+ "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" -+ }, -+ "detect-libc": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", -+ "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==", -+ "optional": true -+ }, -+ "detect-node": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", -+ "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", -+ "optional": true -+ }, -+ "detective": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz", -+ "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==", -+ "requires": { -+ "acorn-node": "^1.8.2", -+ "defined": "^1.0.0", -+ "minimist": "^1.2.6" -+ } -+ }, -+ "diff-match-patch": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz", -+ "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==" -+ }, -+ "diffie-hellman": { -+ "version": "5.0.3", -+ "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", -+ "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", -+ "requires": { -+ "bn.js": "^4.1.0", -+ "miller-rabin": "^4.0.0", -+ "randombytes": "^2.0.0" -+ }, -+ "dependencies": { -+ "bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ } -+ } -+ }, -+ "dns-equal": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", -+ "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==" -+ }, -+ "dns-packet": { -+ "version": "1.3.4", -+ "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz", -+ "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==", -+ "requires": { -+ "ip": "^1.1.0", -+ "safe-buffer": "^5.0.1" -+ } -+ }, -+ "dns-txt": { -+ "version": "git+ssh://git@github.com/jean-emmanuel/dns-txt.git#3bee7785c32d8bc71230d5e01383c61fb72a4b4f", -+ "from": "dns-txt@github:jean-emmanuel/dns-txt#v2.0.3", -+ "requires": { -+ "buffer-indexof": "^1.0.0" -+ } -+ }, -+ "doctrine": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", -+ "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", -+ "requires": { -+ "esutils": "^2.0.2" -+ } -+ }, -+ "dom-serializer": { -+ "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", -+ "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", -+ "requires": { -+ "domelementtype": "^2.0.1", -+ "domhandler": "^4.2.0", -+ "entities": "^2.0.0" -+ }, -+ "dependencies": { -+ "domhandler": { -+ "version": "4.3.1", -+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", -+ "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", -+ "requires": { -+ "domelementtype": "^2.2.0" -+ } -+ } -+ } -+ }, -+ "domain-browser": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", -+ "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==" -+ }, -+ "domelementtype": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", -+ "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==" -+ }, -+ "domhandler": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz", -+ "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==", -+ "requires": { -+ "domelementtype": "^2.0.1" -+ } -+ }, -+ "domutils": { -+ "version": "2.8.0", -+ "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", -+ "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", -+ "requires": { -+ "dom-serializer": "^1.0.1", -+ "domelementtype": "^2.2.0", -+ "domhandler": "^4.2.0" -+ }, -+ "dependencies": { -+ "domhandler": { -+ "version": "4.3.1", -+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", -+ "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", -+ "requires": { -+ "domelementtype": "^2.2.0" -+ } -+ } -+ } -+ }, -+ "dot-prop": { -+ "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", -+ "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", -+ "requires": { -+ "is-obj": "^2.0.0" -+ } -+ }, -+ "duplexer2": { -+ "version": "0.1.4", -+ "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", -+ "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==", -+ "requires": { -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "duplexer3": { -+ "version": "0.1.5", -+ "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz", -+ "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==" -+ }, -+ "ecc-jsbn": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", -+ "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==", -+ "requires": { -+ "jsbn": "~0.1.0", -+ "safer-buffer": "^2.1.0" -+ } -+ }, -+ "ee-first": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", -+ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" -+ }, -+ "electron-is-accelerator": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz", -+ "integrity": "sha512-fLGSAjXZtdn1sbtZxx52+krefmtNuVwnJCV2gNiVt735/ARUboMl8jnNC9fZEqQdlAv2ZrETfmBUsoQci5evJA==" -+ }, -+ "electron-localshortcut": { -+ "version": "3.2.1", -+ "resolved": "https://registry.npmjs.org/electron-localshortcut/-/electron-localshortcut-3.2.1.tgz", -+ "integrity": "sha512-DWvhKv36GsdXKnaFFhEiK8kZZA+24/yFLgtTwJJHc7AFgDjNRIBJZ/jq62Y/dWv9E4ypYwrVWN2bVrCYw1uv7Q==", -+ "requires": { -+ "debug": "^4.0.1", -+ "electron-is-accelerator": "^0.1.0", -+ "keyboardevent-from-electron-accelerator": "^2.0.0", -+ "keyboardevents-areequal": "^0.2.1" -+ } -+ }, -+ "electron-notarize": { -+ "version": "1.2.2", -+ "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.2.2.tgz", -+ "integrity": "sha512-ZStVWYcWI7g87/PgjPJSIIhwQXOaw4/XeXU+pWqMMktSLHaGMLHdyPPN7Cmao7+Cr7fYufA16npdtMndYciHNw==", -+ "requires": { -+ "debug": "^4.1.1", -+ "fs-extra": "^9.0.1" -+ } -+ }, -+ "electron-osx-sign": { -+ "version": "0.5.0", -+ "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz", -+ "integrity": "sha512-icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ==", -+ "requires": { -+ "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" -+ }, -+ "dependencies": { -+ "debug": { -+ "version": "2.6.9", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", -+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -+ "requires": { -+ "ms": "2.0.0" -+ } -+ }, -+ "ms": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", -+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" -+ } -+ } -+ }, -+ "electron-packager": { -+ "version": "15.2.0", -+ "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-15.2.0.tgz", -+ "integrity": "sha512-BaklTBRQy1JTijR3hi8XxHf/uo76rHbDCNM/eQHSblzE9C0NoNfOe86nPxB7y1u2jwlqoEJ4zFiHpTFioKGGRA==", -+ "requires": { -+ "@electron/get": "^1.6.0", -+ "asar": "^3.0.0", -+ "debug": "^4.0.1", -+ "electron-notarize": "^1.0.0", -+ "electron-osx-sign": "^0.5.0", -+ "extract-zip": "^2.0.0", -+ "filenamify": "^4.1.0", -+ "fs-extra": "^9.0.0", -+ "galactus": "^0.2.1", -+ "get-package-info": "^1.0.0", -+ "junk": "^3.1.0", -+ "parse-author": "^2.0.0", -+ "plist": "^3.0.0", -+ "rcedit": "^2.0.0", -+ "resolve": "^1.1.6", -+ "semver": "^7.1.3", -+ "yargs-parser": "^20.0.0" -+ } -+ }, -+ "electron-packager-plugin-non-proprietary-codecs-ffmpeg": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/electron-packager-plugin-non-proprietary-codecs-ffmpeg/-/electron-packager-plugin-non-proprietary-codecs-ffmpeg-1.0.2.tgz", -+ "integrity": "sha512-xPkbzndg2KODqmNe9yIx0dhNOfaOqrdNZ1ZSSZN4h1wT0T5SV/YES0tNyN932jQd+c5cFPv6AWYYjuPWKvcITg==", -+ "requires": { -+ "7zip": "0.0.6", -+ "cross-unzip": "0.0.2", -+ "mkdirp": "^0.5.1", -+ "request": "^2.73.0", -+ "semver": "^5.2.0" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", -+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" -+ } -+ } -+ }, -+ "electron-to-chromium": { -+ "version": "1.4.284", -+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", -+ "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" -+ }, -+ "elliptic": { -+ "version": "6.5.4", -+ "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", -+ "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", -+ "requires": { -+ "bn.js": "^4.11.9", -+ "brorand": "^1.1.0", -+ "hash.js": "^1.0.0", -+ "hmac-drbg": "^1.0.1", -+ "inherits": "^2.0.4", -+ "minimalistic-assert": "^1.0.1", -+ "minimalistic-crypto-utils": "^1.0.1" -+ }, -+ "dependencies": { -+ "bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ } -+ } -+ }, -+ "emoji-regex": { -+ "version": "8.0.0", -+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", -+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" -+ }, -+ "encodeurl": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", -+ "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" -+ }, -+ "encoding": { -+ "version": "0.1.13", -+ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", -+ "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", -+ "optional": true, -+ "requires": { -+ "iconv-lite": "^0.6.2" -+ } -+ }, -+ "end-of-stream": { -+ "version": "1.4.4", -+ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", -+ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", -+ "requires": { -+ "once": "^1.4.0" -+ } -+ }, -+ "entities": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", -+ "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" -+ }, -+ "env-paths": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", -+ "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==" -+ }, -+ "err-code": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", -+ "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==" -+ }, -+ "error-ex": { -+ "version": "1.3.2", -+ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", -+ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", -+ "requires": { -+ "is-arrayish": "^0.2.1" -+ } -+ }, -+ "error-stack-parser": { -+ "version": "2.1.4", -+ "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz", -+ "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==", -+ "requires": { -+ "stackframe": "^1.3.4" -+ } -+ }, -+ "es6-error": { -+ "version": "4.1.1", -+ "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", -+ "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", -+ "optional": true -+ }, -+ "escalade": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", -+ "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" -+ }, -+ "escape-goat": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz", -+ "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==" -+ }, -+ "escape-html": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", -+ "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" -+ }, -+ "escape-string-regexp": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", -+ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==" -+ }, -+ "escaper": { -+ "version": "2.5.3", -+ "resolved": "https://registry.npmjs.org/escaper/-/escaper-2.5.3.tgz", -+ "integrity": "sha512-QGb9sFxBVpbzMggrKTX0ry1oiI4CSDAl9vIL702hzl1jGW8VZs7qfqTRX7WDOjoNDoEVGcEtu1ZOQgReSfT2kQ==" -+ }, -+ "eslint": { -+ "version": "8.16.0", -+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz", -+ "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==", -+ "requires": { -+ "@eslint/eslintrc": "^1.3.0", -+ "@humanwhocodes/config-array": "^0.9.2", -+ "ajv": "^6.10.0", -+ "chalk": "^4.0.0", -+ "cross-spawn": "^7.0.2", -+ "debug": "^4.3.2", -+ "doctrine": "^3.0.0", -+ "escape-string-regexp": "^4.0.0", -+ "eslint-scope": "^7.1.1", -+ "eslint-utils": "^3.0.0", -+ "eslint-visitor-keys": "^3.3.0", -+ "espree": "^9.3.2", -+ "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": "^6.0.1", -+ "globals": "^13.15.0", -+ "ignore": "^5.2.0", -+ "import-fresh": "^3.0.0", -+ "imurmurhash": "^0.1.4", -+ "is-glob": "^4.0.0", -+ "js-yaml": "^4.1.0", -+ "json-stable-stringify-without-jsonify": "^1.0.1", -+ "levn": "^0.4.1", -+ "lodash.merge": "^4.6.2", -+ "minimatch": "^3.1.2", -+ "natural-compare": "^1.4.0", -+ "optionator": "^0.9.1", -+ "regexpp": "^3.2.0", -+ "strip-ansi": "^6.0.1", -+ "strip-json-comments": "^3.1.0", -+ "text-table": "^0.2.0", -+ "v8-compile-cache": "^2.0.3" -+ }, -+ "dependencies": { -+ "ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "requires": { -+ "color-convert": "^2.0.1" -+ } -+ }, -+ "balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "requires": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "chalk": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", -+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -+ "requires": { -+ "ansi-styles": "^4.1.0", -+ "supports-color": "^7.1.0" -+ } -+ }, -+ "color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "requires": { -+ "color-name": "~1.1.4" -+ } -+ }, -+ "color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "escape-string-regexp": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", -+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" -+ }, -+ "eslint-scope": { -+ "version": "7.1.1", -+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", -+ "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", -+ "requires": { -+ "esrecurse": "^4.3.0", -+ "estraverse": "^5.2.0" -+ } -+ }, -+ "eslint-visitor-keys": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", -+ "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==" -+ }, -+ "estraverse": { -+ "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", -+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" -+ }, -+ "glob-parent": { -+ "version": "6.0.2", -+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", -+ "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", -+ "requires": { -+ "is-glob": "^4.0.3" -+ } -+ }, -+ "globals": { -+ "version": "13.17.0", -+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", -+ "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", -+ "requires": { -+ "type-fest": "^0.20.2" -+ } -+ }, -+ "has-flag": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" -+ }, -+ "minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "requires": { -+ "brace-expansion": "^1.1.7" -+ } -+ }, -+ "supports-color": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -+ "requires": { -+ "has-flag": "^4.0.0" -+ } -+ }, -+ "type-fest": { -+ "version": "0.20.2", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", -+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" -+ } -+ } -+ }, -+ "eslint-scope": { -+ "version": "5.1.1", -+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", -+ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", -+ "requires": { -+ "esrecurse": "^4.3.0", -+ "estraverse": "^4.1.1" -+ } -+ }, -+ "eslint-utils": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", -+ "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", -+ "requires": { -+ "eslint-visitor-keys": "^2.0.0" -+ } -+ }, -+ "eslint-visitor-keys": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", -+ "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==" -+ }, -+ "espree": { -+ "version": "9.4.1", -+ "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz", -+ "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==", -+ "requires": { -+ "acorn": "^8.8.0", -+ "acorn-jsx": "^5.3.2", -+ "eslint-visitor-keys": "^3.3.0" -+ }, -+ "dependencies": { -+ "eslint-visitor-keys": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", -+ "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==" -+ } -+ } -+ }, -+ "esquery": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", -+ "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", -+ "requires": { -+ "estraverse": "^5.1.0" -+ }, -+ "dependencies": { -+ "estraverse": { -+ "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", -+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" -+ } -+ } -+ }, -+ "esrecurse": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", -+ "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", -+ "requires": { -+ "estraverse": "^5.2.0" -+ }, -+ "dependencies": { -+ "estraverse": { -+ "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", -+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" -+ } -+ } -+ }, -+ "estraverse": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", -+ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" -+ }, -+ "estree-is-member-expression": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/estree-is-member-expression/-/estree-is-member-expression-1.0.0.tgz", -+ "integrity": "sha512-Ec+X44CapIGExvSZN+pGkmr5p7HwUVQoPQSd458Lqwvaf4/61k/invHSh4BYK8OXnCkfEhWuIoG5hayKLQStIg==" -+ }, -+ "esutils": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", -+ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" -+ }, -+ "etag": { -+ "version": "1.8.1", -+ "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", -+ "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" -+ }, -+ "events": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", -+ "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" -+ }, -+ "evp_bytestokey": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", -+ "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", -+ "requires": { -+ "md5.js": "^1.3.4", -+ "safe-buffer": "^5.1.1" -+ } -+ }, -+ "exorcist": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/exorcist/-/exorcist-2.0.0.tgz", -+ "integrity": "sha512-+c63SvhBq/HjmbV9cu9vkDkjXFiuI4lpqOZU5Y3t5GSV2l4TQCqVli9c7nIASHxkUL4THaOZDUcb6XNBI/eYjw==", -+ "requires": { -+ "is-stream": "^2.0.0", -+ "minimist": "^1.2.5", -+ "mkdirp": "^1.0.4", -+ "mold-source-map": "^0.4.0" -+ }, -+ "dependencies": { -+ "mkdirp": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", -+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" -+ } -+ } -+ }, -+ "expand-template": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", -+ "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", -+ "optional": true -+ }, -+ "extend": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", -+ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" -+ }, -+ "extract-zip": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", -+ "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", -+ "requires": { -+ "@types/yauzl": "^2.9.1", -+ "debug": "^4.1.1", -+ "get-stream": "^5.1.0", -+ "yauzl": "^2.10.0" -+ } -+ }, -+ "extsprintf": { -+ "version": "1.3.0", -+ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", -+ "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==" -+ }, -+ "fast-deep-equal": { -+ "version": "3.1.3", -+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", -+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" -+ }, -+ "fast-json-stable-stringify": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", -+ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" -+ }, -+ "fast-levenshtein": { -+ "version": "2.0.6", -+ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", -+ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" -+ }, -+ "fast-safe-stringify": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", -+ "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==" -+ }, -+ "fastdom": { -+ "version": "1.0.10", -+ "resolved": "https://registry.npmjs.org/fastdom/-/fastdom-1.0.10.tgz", -+ "integrity": "sha512-sbL4h358IlZn8VsTvA5TYnKVLYif46XhPEll+HTSxVtDSpqZEO/17D/QqlxE9V2K7AQ82GXeYeQLU2HWwKgk1A==", -+ "requires": { -+ "strictdom": "^1.0.1" -+ } -+ }, -+ "fd-slicer": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", -+ "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", -+ "requires": { -+ "pend": "~1.2.0" -+ } -+ }, -+ "file-entry-cache": { -+ "version": "6.0.1", -+ "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", -+ "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", -+ "requires": { -+ "flat-cache": "^3.0.4" -+ } -+ }, -+ "file-saver": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", -+ "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" -+ }, -+ "file-uri-to-path": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", -+ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", -+ "optional": true -+ }, -+ "filename-reserved-regex": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz", -+ "integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==" -+ }, -+ "filenamify": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz", -+ "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==", -+ "requires": { -+ "filename-reserved-regex": "^2.0.0", -+ "strip-outer": "^1.0.1", -+ "trim-repeated": "^1.0.0" -+ } -+ }, -+ "fill-range": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", -+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", -+ "requires": { -+ "to-regex-range": "^5.0.1" -+ } -+ }, -+ "find-up": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", -+ "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==", -+ "requires": { -+ "locate-path": "^2.0.0" -+ } -+ }, -+ "flat-cache": { -+ "version": "3.0.4", -+ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", -+ "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", -+ "requires": { -+ "flatted": "^3.1.0", -+ "rimraf": "^3.0.2" -+ }, -+ "dependencies": { -+ "rimraf": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", -+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", -+ "requires": { -+ "glob": "^7.1.3" -+ } -+ } -+ } -+ }, -+ "flatted": { -+ "version": "3.2.7", -+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", -+ "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==" -+ }, -+ "flora-colossus": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/flora-colossus/-/flora-colossus-1.0.1.tgz", -+ "integrity": "sha512-d+9na7t9FyH8gBJoNDSi28mE4NgQVGGvxQ4aHtFRetjyh5SXjuus+V5EZaxFmFdXVemSOrx0lsgEl/ZMjnOWJA==", -+ "requires": { -+ "debug": "^4.1.1", -+ "fs-extra": "^7.0.0" -+ }, -+ "dependencies": { -+ "fs-extra": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", -+ "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", -+ "requires": { -+ "graceful-fs": "^4.1.2", -+ "jsonfile": "^4.0.0", -+ "universalify": "^0.1.0" -+ } -+ }, -+ "jsonfile": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", -+ "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", -+ "requires": { -+ "graceful-fs": "^4.1.6" -+ } -+ }, -+ "universalify": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", -+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" -+ } -+ } -+ }, -+ "for-each": { -+ "version": "0.3.3", -+ "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", -+ "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", -+ "requires": { -+ "is-callable": "^1.1.3" -+ } -+ }, -+ "forever-agent": { -+ "version": "0.6.1", -+ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", -+ "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==" -+ }, -+ "form-data": { -+ "version": "2.3.3", -+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", -+ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", -+ "requires": { -+ "asynckit": "^0.4.0", -+ "combined-stream": "^1.0.6", -+ "mime-types": "^2.1.12" -+ } -+ }, -+ "fresh": { -+ "version": "0.5.2", -+ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", -+ "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==" -+ }, -+ "fs-constants": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", -+ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", -+ "optional": true -+ }, -+ "fs-extra": { -+ "version": "9.1.0", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", -+ "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", -+ "requires": { -+ "at-least-node": "^1.0.0", -+ "graceful-fs": "^4.2.0", -+ "jsonfile": "^6.0.1", -+ "universalify": "^2.0.0" -+ } -+ }, -+ "fs-minipass": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", -+ "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", -+ "requires": { -+ "minipass": "^3.0.0" -+ } -+ }, -+ "fs.realpath": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", -+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" -+ }, -+ "fsevents": { -+ "version": "2.3.2", -+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", -+ "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", -+ "optional": true -+ }, -+ "function-bind": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", -+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" -+ }, -+ "functional-red-black-tree": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", -+ "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==" -+ }, -+ "functions-have-names": { -+ "version": "1.2.3", -+ "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", -+ "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==" -+ }, -+ "galactus": { -+ "version": "0.2.1", -+ "resolved": "https://registry.npmjs.org/galactus/-/galactus-0.2.1.tgz", -+ "integrity": "sha512-mDc8EQJKtxjp9PMYS3PbpjjbX3oXhBTxoGaPahw620XZBIHJ4+nvw5KN/tRtmmSDR9dypstGNvqQ3C29QGoGHQ==", -+ "requires": { -+ "debug": "^3.1.0", -+ "flora-colossus": "^1.0.0", -+ "fs-extra": "^4.0.0" -+ }, -+ "dependencies": { -+ "debug": { -+ "version": "3.2.7", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", -+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", -+ "requires": { -+ "ms": "^2.1.1" -+ } -+ }, -+ "fs-extra": { -+ "version": "4.0.3", -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", -+ "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", -+ "requires": { -+ "graceful-fs": "^4.1.2", -+ "jsonfile": "^4.0.0", -+ "universalify": "^0.1.0" -+ } -+ }, -+ "jsonfile": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", -+ "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", -+ "requires": { -+ "graceful-fs": "^4.1.6" -+ } -+ }, -+ "universalify": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", -+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" -+ } -+ } -+ }, -+ "gauge": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", -+ "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", -+ "requires": { -+ "aproba": "^1.0.3 || ^2.0.0", -+ "color-support": "^1.1.2", -+ "console-control-strings": "^1.0.0", -+ "has-unicode": "^2.0.1", -+ "object-assign": "^4.1.1", -+ "signal-exit": "^3.0.0", -+ "string-width": "^4.2.3", -+ "strip-ansi": "^6.0.1", -+ "wide-align": "^1.1.2" -+ } -+ }, -+ "gaze": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", -+ "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", -+ "requires": { -+ "globule": "^1.0.0" -+ } -+ }, -+ "gensync": { -+ "version": "1.0.0-beta.2", -+ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", -+ "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==" -+ }, -+ "get-assigned-identifiers": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz", -+ "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==" -+ }, -+ "get-caller-file": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", -+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" -+ }, -+ "get-intrinsic": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", -+ "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", -+ "requires": { -+ "function-bind": "^1.1.1", -+ "has": "^1.0.3", -+ "has-symbols": "^1.0.3" -+ } -+ }, -+ "get-package-info": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/get-package-info/-/get-package-info-1.0.0.tgz", -+ "integrity": "sha512-SCbprXGAPdIhKAXiG+Mk6yeoFH61JlYunqdFQFHDtLjJlDjFf6x07dsS8acO+xWt52jpdVo49AlVDnUVK1sDNw==", -+ "requires": { -+ "bluebird": "^3.1.1", -+ "debug": "^2.2.0", -+ "lodash.get": "^4.0.0", -+ "read-pkg-up": "^2.0.0" -+ }, -+ "dependencies": { -+ "debug": { -+ "version": "2.6.9", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", -+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -+ "requires": { -+ "ms": "2.0.0" -+ } -+ }, -+ "ms": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", -+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" -+ } -+ } -+ }, -+ "get-stdin": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", -+ "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==" -+ }, -+ "get-stream": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", -+ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", -+ "requires": { -+ "pump": "^3.0.0" -+ } -+ }, -+ "getpass": { -+ "version": "0.1.7", -+ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", -+ "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==", -+ "requires": { -+ "assert-plus": "^1.0.0" -+ } -+ }, -+ "github-from-package": { -+ "version": "0.0.0", -+ "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", -+ "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", -+ "optional": true -+ }, -+ "glob": { -+ "version": "7.2.3", -+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", -+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", -+ "requires": { -+ "fs.realpath": "^1.0.0", -+ "inflight": "^1.0.4", -+ "inherits": "2", -+ "minimatch": "^3.1.1", -+ "once": "^1.3.0", -+ "path-is-absolute": "^1.0.0" -+ }, -+ "dependencies": { -+ "balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "requires": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "requires": { -+ "brace-expansion": "^1.1.7" -+ } -+ } -+ } -+ }, -+ "glob-parent": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", -+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", -+ "requires": { -+ "is-glob": "^4.0.1" -+ } -+ }, -+ "global-agent": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz", -+ "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==", -+ "optional": true, -+ "requires": { -+ "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": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz", -+ "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==", -+ "requires": { -+ "ini": "2.0.0" -+ }, -+ "dependencies": { -+ "ini": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", -+ "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==" -+ } -+ } -+ }, -+ "global-tunnel-ng": { -+ "version": "2.7.1", -+ "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz", -+ "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==", -+ "optional": true, -+ "requires": { -+ "encodeurl": "^1.0.2", -+ "lodash": "^4.17.10", -+ "npm-conf": "^1.1.3", -+ "tunnel": "^0.0.6" -+ } -+ }, -+ "globals": { -+ "version": "11.12.0", -+ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", -+ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" -+ }, -+ "globalthis": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", -+ "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", -+ "optional": true, -+ "requires": { -+ "define-properties": "^1.1.3" -+ } -+ }, -+ "globule": { -+ "version": "1.3.4", -+ "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz", -+ "integrity": "sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==", -+ "requires": { -+ "glob": "~7.1.1", -+ "lodash": "^4.17.21", -+ "minimatch": "~3.0.2" -+ }, -+ "dependencies": { -+ "balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "requires": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "glob": { -+ "version": "7.1.7", -+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", -+ "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", -+ "requires": { -+ "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" -+ } -+ }, -+ "minimatch": { -+ "version": "3.0.8", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz", -+ "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==", -+ "requires": { -+ "brace-expansion": "^1.1.7" -+ } -+ } -+ } -+ }, -+ "gopd": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", -+ "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", -+ "requires": { -+ "get-intrinsic": "^1.1.3" -+ } -+ }, -+ "got": { -+ "version": "9.6.0", -+ "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", -+ "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", -+ "requires": { -+ "@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" -+ }, -+ "dependencies": { -+ "get-stream": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", -+ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", -+ "requires": { -+ "pump": "^3.0.0" -+ } -+ } -+ } -+ }, -+ "graceful-fs": { -+ "version": "4.2.10", -+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", -+ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" -+ }, -+ "gyronorm": { -+ "version": "2.0.6", -+ "resolved": "https://registry.npmjs.org/gyronorm/-/gyronorm-2.0.6.tgz", -+ "integrity": "sha512-pE66zEK/3G9t1dpikTKIjNuY1JauXgtNiulgPKc28IKwMJ5NuJ03mOQ5ArqnkOyQxhlJSY71i3YdFcHhzx4TOg==" -+ }, -+ "har-schema": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", -+ "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==" -+ }, -+ "har-validator": { -+ "version": "5.1.5", -+ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", -+ "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", -+ "requires": { -+ "ajv": "^6.12.3", -+ "har-schema": "^2.0.0" -+ } -+ }, -+ "hard-rejection": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", -+ "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==" -+ }, -+ "has": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", -+ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", -+ "requires": { -+ "function-bind": "^1.1.1" -+ } -+ }, -+ "has-ansi": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", -+ "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==", -+ "requires": { -+ "ansi-regex": "^2.0.0" -+ }, -+ "dependencies": { -+ "ansi-regex": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", -+ "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==" -+ } -+ } -+ }, -+ "has-flag": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", -+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" -+ }, -+ "has-property-descriptors": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", -+ "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", -+ "requires": { -+ "get-intrinsic": "^1.1.1" -+ } -+ }, -+ "has-symbols": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", -+ "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" -+ }, -+ "has-tostringtag": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", -+ "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", -+ "requires": { -+ "has-symbols": "^1.0.2" -+ } -+ }, -+ "has-unicode": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", -+ "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==" -+ }, -+ "has-yarn": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", -+ "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==" -+ }, -+ "hash-base": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", -+ "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", -+ "requires": { -+ "inherits": "^2.0.4", -+ "readable-stream": "^3.6.0", -+ "safe-buffer": "^5.2.0" -+ }, -+ "dependencies": { -+ "readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "requires": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ } -+ } -+ } -+ }, -+ "hash.js": { -+ "version": "1.1.7", -+ "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", -+ "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", -+ "requires": { -+ "inherits": "^2.0.3", -+ "minimalistic-assert": "^1.0.1" -+ } -+ }, -+ "hmac-drbg": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", -+ "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", -+ "requires": { -+ "hash.js": "^1.0.3", -+ "minimalistic-assert": "^1.0.0", -+ "minimalistic-crypto-utils": "^1.0.1" -+ } -+ }, -+ "hosted-git-info": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", -+ "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", -+ "requires": { -+ "lru-cache": "^6.0.0" -+ } -+ }, -+ "htmlescape": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz", -+ "integrity": "sha512-eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg==" -+ }, -+ "htmlparser2": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz", -+ "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==", -+ "requires": { -+ "domelementtype": "^2.0.1", -+ "domhandler": "^3.0.0", -+ "domutils": "^2.0.0", -+ "entities": "^2.0.0" -+ } -+ }, -+ "http-auth": { -+ "version": "4.1.9", -+ "resolved": "https://registry.npmjs.org/http-auth/-/http-auth-4.1.9.tgz", -+ "integrity": "sha512-kvPYxNGc9EKGTXvOMnTBQw2RZfuiSihK/mLw/a4pbtRueTE45S55Lw/3k5CktIf7Ak0veMKEIteDj4YkNmCzmQ==", -+ "requires": { -+ "apache-crypt": "^1.1.2", -+ "apache-md5": "^1.0.6", -+ "bcryptjs": "^2.4.3", -+ "uuid": "^8.3.2" -+ } -+ }, -+ "http-cache-semantics": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", -+ "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" -+ }, -+ "http-errors": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", -+ "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", -+ "requires": { -+ "depd": "2.0.0", -+ "inherits": "2.0.4", -+ "setprototypeof": "1.2.0", -+ "statuses": "2.0.1", -+ "toidentifier": "1.0.1" -+ }, -+ "dependencies": { -+ "depd": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", -+ "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" -+ } -+ } -+ }, -+ "http-proxy-agent": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", -+ "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", -+ "requires": { -+ "@tootallnate/once": "1", -+ "agent-base": "6", -+ "debug": "4" -+ } -+ }, -+ "http-signature": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", -+ "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==", -+ "requires": { -+ "assert-plus": "^1.0.0", -+ "jsprim": "^1.2.2", -+ "sshpk": "^1.7.0" -+ } -+ }, -+ "https-browserify": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", -+ "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==" -+ }, -+ "https-proxy-agent": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", -+ "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", -+ "requires": { -+ "agent-base": "6", -+ "debug": "4" -+ } -+ }, -+ "humanize-ms": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", -+ "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", -+ "requires": { -+ "ms": "^2.0.0" -+ } -+ }, -+ "hyperscript-attribute-to-property": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/hyperscript-attribute-to-property/-/hyperscript-attribute-to-property-1.0.2.tgz", -+ "integrity": "sha512-oerMul16jZCmrbNsUw8QgrtDzF8lKgFri1bKQjReLw1IhiiNkI59CWuzZjJDGT79UQ1YiWqXhJMv/tRMVqgtkA==" -+ }, -+ "hyperx": { -+ "version": "2.5.4", -+ "resolved": "https://registry.npmjs.org/hyperx/-/hyperx-2.5.4.tgz", -+ "integrity": "sha512-iOkSh7Yse7lsN/B9y7OsevLWjeXPqGuHQ5SbwaiJM5xAhWFqhoN6erpK1dQsS12OFU36lyai1pnx1mmzWLQqcA==", -+ "requires": { -+ "hyperscript-attribute-to-property": "^1.0.0" -+ } -+ }, -+ "iconv-lite": { -+ "version": "0.6.3", -+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", -+ "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", -+ "optional": true, -+ "requires": { -+ "safer-buffer": ">= 2.1.2 < 3.0.0" -+ } -+ }, -+ "ieee754": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", -+ "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" -+ }, -+ "ignore": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", -+ "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==" -+ }, -+ "ignore-by-default": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", -+ "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==" -+ }, -+ "import-fresh": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", -+ "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", -+ "requires": { -+ "parent-module": "^1.0.0", -+ "resolve-from": "^4.0.0" -+ } -+ }, -+ "import-lazy": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", -+ "integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==" -+ }, -+ "imurmurhash": { -+ "version": "0.1.4", -+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", -+ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" -+ }, -+ "indent-string": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", -+ "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" -+ }, -+ "infer-owner": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", -+ "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==" -+ }, -+ "inflight": { -+ "version": "1.0.6", -+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", -+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", -+ "requires": { -+ "once": "^1.3.0", -+ "wrappy": "1" -+ } -+ }, -+ "inherits": { -+ "version": "2.0.4", -+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", -+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" -+ }, -+ "ini": { -+ "version": "1.3.8", -+ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", -+ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" -+ }, -+ "inline-source-map": { -+ "version": "0.6.2", -+ "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz", -+ "integrity": "sha512-0mVWSSbNDvedDWIN4wxLsdPM4a7cIPcpyMxj3QZ406QRwQ6ePGB1YIHxVPjqpcUGbWQ5C+nHTwGNWAGvt7ggVA==", -+ "requires": { -+ "source-map": "~0.5.3" -+ } -+ }, -+ "insert-module-globals": { -+ "version": "7.2.1", -+ "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.1.tgz", -+ "integrity": "sha512-ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg==", -+ "requires": { -+ "acorn-node": "^1.5.2", -+ "combine-source-map": "^0.8.0", -+ "concat-stream": "^1.6.1", -+ "is-buffer": "^1.1.0", -+ "JSONStream": "^1.0.3", -+ "path-is-absolute": "^1.0.1", -+ "process": "~0.11.0", -+ "through2": "^2.0.0", -+ "undeclared-identifiers": "^1.1.2", -+ "xtend": "^4.0.0" -+ } -+ }, -+ "ip": { -+ "version": "1.1.8", -+ "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", -+ "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==" -+ }, -+ "is-arguments": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", -+ "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", -+ "requires": { -+ "call-bind": "^1.0.2", -+ "has-tostringtag": "^1.0.0" -+ } -+ }, -+ "is-arrayish": { -+ "version": "0.2.1", -+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", -+ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" -+ }, -+ "is-binary-path": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", -+ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", -+ "requires": { -+ "binary-extensions": "^2.0.0" -+ } -+ }, -+ "is-boolean-attribute": { -+ "version": "0.0.1", -+ "resolved": "https://registry.npmjs.org/is-boolean-attribute/-/is-boolean-attribute-0.0.1.tgz", -+ "integrity": "sha512-0kXT52Scokg2Miscvsn5UVqg6y1691vcLJcagie1YHJB4zOEuAhMERLX992jtvaStGy2xQTqOtJhvmG/MK1T5w==" -+ }, -+ "is-buffer": { -+ "version": "1.1.6", -+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", -+ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" -+ }, -+ "is-callable": { -+ "version": "1.2.7", -+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", -+ "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==" -+ }, -+ "is-ci": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", -+ "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", -+ "requires": { -+ "ci-info": "^2.0.0" -+ } -+ }, -+ "is-core-module": { -+ "version": "2.11.0", -+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", -+ "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", -+ "requires": { -+ "has": "^1.0.3" -+ } -+ }, -+ "is-date-object": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", -+ "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", -+ "requires": { -+ "has-tostringtag": "^1.0.0" -+ } -+ }, -+ "is-docker": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", -+ "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==" -+ }, -+ "is-extglob": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", -+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" -+ }, -+ "is-fullwidth-code-point": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", -+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" -+ }, -+ "is-generator-function": { -+ "version": "1.0.10", -+ "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", -+ "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", -+ "requires": { -+ "has-tostringtag": "^1.0.0" -+ } -+ }, -+ "is-glob": { -+ "version": "4.0.3", -+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", -+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", -+ "requires": { -+ "is-extglob": "^2.1.1" -+ } -+ }, -+ "is-installed-globally": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", -+ "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", -+ "requires": { -+ "global-dirs": "^3.0.0", -+ "is-path-inside": "^3.0.2" -+ } -+ }, -+ "is-lambda": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", -+ "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==" -+ }, -+ "is-npm": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz", -+ "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==" -+ }, -+ "is-number": { -+ "version": "7.0.0", -+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", -+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" -+ }, -+ "is-obj": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", -+ "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" -+ }, -+ "is-path-inside": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", -+ "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==" -+ }, -+ "is-plain-obj": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", -+ "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==" -+ }, -+ "is-regex": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", -+ "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", -+ "requires": { -+ "call-bind": "^1.0.2", -+ "has-tostringtag": "^1.0.0" -+ } -+ }, -+ "is-regexp": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", -+ "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==" -+ }, -+ "is-stream": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", -+ "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" -+ }, -+ "is-typed-array": { -+ "version": "1.1.10", -+ "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", -+ "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", -+ "requires": { -+ "available-typed-arrays": "^1.0.5", -+ "call-bind": "^1.0.2", -+ "for-each": "^0.3.3", -+ "gopd": "^1.0.1", -+ "has-tostringtag": "^1.0.0" -+ } -+ }, -+ "is-typedarray": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", -+ "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==" -+ }, -+ "is-wsl": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", -+ "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", -+ "requires": { -+ "is-docker": "^2.0.0" -+ } -+ }, -+ "is-yarn-global": { -+ "version": "0.3.0", -+ "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz", -+ "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==" -+ }, -+ "isarray": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", -+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" -+ }, -+ "isbinaryfile": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz", -+ "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", -+ "requires": { -+ "buffer-alloc": "^1.2.0" -+ } -+ }, -+ "isexe": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", -+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" -+ }, -+ "isstream": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", -+ "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==" -+ }, -+ "js-base64": { -+ "version": "2.6.4", -+ "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", -+ "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" -+ }, -+ "js-tokens": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", -+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" -+ }, -+ "js-yaml": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", -+ "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", -+ "requires": { -+ "argparse": "^2.0.1" -+ } -+ }, -+ "jsbn": { -+ "version": "0.1.1", -+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", -+ "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==" -+ }, -+ "jsesc": { -+ "version": "2.5.2", -+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", -+ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" -+ }, -+ "json-buffer": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", -+ "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==" -+ }, -+ "json-parse-even-better-errors": { -+ "version": "2.3.1", -+ "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", -+ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" -+ }, -+ "json-schema": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", -+ "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" -+ }, -+ "json-schema-traverse": { -+ "version": "0.4.1", -+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", -+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" -+ }, -+ "json-stable-stringify-without-jsonify": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", -+ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" -+ }, -+ "json-stringify-safe": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", -+ "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==" -+ }, -+ "json5": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", -+ "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==" -+ }, -+ "jsondiffpatch": { -+ "version": "0.4.1", -+ "resolved": "https://registry.npmjs.org/jsondiffpatch/-/jsondiffpatch-0.4.1.tgz", -+ "integrity": "sha512-t0etAxTUk1w5MYdNOkZBZ8rvYYN5iL+2dHCCx/DpkFm/bW28M6y5nUS83D4XdZiHy35Fpaw6LBb+F88fHZnVCw==", -+ "requires": { -+ "chalk": "^2.3.0", -+ "diff-match-patch": "^1.0.0" -+ } -+ }, -+ "jsonfile": { -+ "version": "6.1.0", -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", -+ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", -+ "requires": { -+ "graceful-fs": "^4.1.6", -+ "universalify": "^2.0.0" -+ } -+ }, -+ "jsonparse": { -+ "version": "1.3.1", -+ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", -+ "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==" -+ }, -+ "JSONStream": { -+ "version": "1.3.5", -+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", -+ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", -+ "requires": { -+ "jsonparse": "^1.2.0", -+ "through": ">=2.2.7 <3" -+ } -+ }, -+ "jsprim": { -+ "version": "1.4.2", -+ "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", -+ "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", -+ "requires": { -+ "assert-plus": "1.0.0", -+ "extsprintf": "1.3.0", -+ "json-schema": "0.4.0", -+ "verror": "1.10.0" -+ } -+ }, -+ "junk": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz", -+ "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==" -+ }, -+ "keyboardevent-from-electron-accelerator": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-2.0.0.tgz", -+ "integrity": "sha512-iQcmNA0M4ETMNi0kG/q0h/43wZk7rMeKYrXP7sqKIJbHkTU8Koowgzv+ieR/vWJbOwxx5nDC3UnudZ0aLSu4VA==" -+ }, -+ "keyboardevents-areequal": { -+ "version": "0.2.2", -+ "resolved": "https://registry.npmjs.org/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz", -+ "integrity": "sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw==" -+ }, -+ "keyboardjs": { -+ "version": "2.6.4", -+ "resolved": "https://registry.npmjs.org/keyboardjs/-/keyboardjs-2.6.4.tgz", -+ "integrity": "sha512-xDiNwiwH3KUqap++RFJiLAXzbvRB5Yw08xliuceOgLhM1o7g1puKKR9vWy6wp9H/Bi4VP0+SQMpiWXMWWmR6rA==" -+ }, -+ "keyv": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", -+ "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", -+ "requires": { -+ "json-buffer": "3.0.0" -+ } -+ }, -+ "kind-of": { -+ "version": "6.0.3", -+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", -+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" -+ }, -+ "labeled-stream-splicer": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz", -+ "integrity": "sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==", -+ "requires": { -+ "inherits": "^2.0.1", -+ "stream-splicer": "^2.0.0" -+ } -+ }, -+ "latest-version": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz", -+ "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==", -+ "requires": { -+ "package-json": "^6.3.0" -+ } -+ }, -+ "levn": { -+ "version": "0.4.1", -+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", -+ "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", -+ "requires": { -+ "prelude-ls": "^1.2.1", -+ "type-check": "~0.4.0" -+ } -+ }, -+ "licensify": { -+ "version": "3.1.3", -+ "resolved": "https://registry.npmjs.org/licensify/-/licensify-3.1.3.tgz", -+ "integrity": "sha512-3sEEBR0Cxq8yeSrV1KGZwpjm4KJKp8Cx/WHZxBnG/YX319ZTvxGtL+NCF+A9pcXwh8KwKB4BmVrc6eRrfk/Raw==", -+ "requires": { -+ "convert-source-map": "^1.1.3", -+ "offset-sourcemap-lines": "^1.0.0", -+ "oss-license-name-to-url": "^1.2.1", -+ "through2": "^2.0.0", -+ "type-name": "^2.0.0" -+ } -+ }, -+ "lines-and-columns": { -+ "version": "1.2.4", -+ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", -+ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" -+ }, -+ "load-json-file": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", -+ "integrity": "sha512-3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ==", -+ "requires": { -+ "graceful-fs": "^4.1.2", -+ "parse-json": "^2.2.0", -+ "pify": "^2.0.0", -+ "strip-bom": "^3.0.0" -+ }, -+ "dependencies": { -+ "pify": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", -+ "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==" -+ } -+ } -+ }, -+ "locate-path": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", -+ "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==", -+ "requires": { -+ "p-locate": "^2.0.0", -+ "path-exists": "^3.0.0" -+ } -+ }, -+ "lodash": { -+ "version": "4.17.21", -+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", -+ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" -+ }, -+ "lodash.debounce": { -+ "version": "4.0.8", -+ "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", -+ "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" -+ }, -+ "lodash.get": { -+ "version": "4.4.2", -+ "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", -+ "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==" -+ }, -+ "lodash.memoize": { -+ "version": "3.0.4", -+ "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz", -+ "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A==" -+ }, -+ "lodash.merge": { -+ "version": "4.6.2", -+ "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", -+ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" -+ }, -+ "long": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", -+ "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" -+ }, -+ "loop-protect": { -+ "version": "git+ssh://git@github.com/jean-emmanuel/loop-protect.git#335856f37ee4a805704bfcd1d7429ab94620bf6d", -+ "from": "loop-protect@github:jean-emmanuel/loop-protect#v1.0.1" -+ }, -+ "lower-case": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", -+ "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==" -+ }, -+ "lowercase-keys": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", -+ "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" -+ }, -+ "lru-cache": { -+ "version": "6.0.0", -+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", -+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", -+ "requires": { -+ "yallist": "^4.0.0" -+ } -+ }, -+ "magic-string": { -+ "version": "0.23.2", -+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.23.2.tgz", -+ "integrity": "sha512-oIUZaAxbcxYIp4AyLafV6OVKoB3YouZs0UTCJ8mOKBHNyJgGDaMJ4TgA+VylJh6fx7EQCC52XkbURxxG9IoJXA==", -+ "requires": { -+ "sourcemap-codec": "^1.4.1" -+ } -+ }, -+ "make-dir": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", -+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", -+ "requires": { -+ "semver": "^6.0.0" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ } -+ } -+ }, -+ "make-fetch-happen": { -+ "version": "9.1.0", -+ "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz", -+ "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==", -+ "requires": { -+ "agentkeepalive": "^4.1.3", -+ "cacache": "^15.2.0", -+ "http-cache-semantics": "^4.1.0", -+ "http-proxy-agent": "^4.0.1", -+ "https-proxy-agent": "^5.0.0", -+ "is-lambda": "^1.0.1", -+ "lru-cache": "^6.0.0", -+ "minipass": "^3.1.3", -+ "minipass-collect": "^1.0.2", -+ "minipass-fetch": "^1.3.2", -+ "minipass-flush": "^1.0.5", -+ "minipass-pipeline": "^1.2.4", -+ "negotiator": "^0.6.2", -+ "promise-retry": "^2.0.1", -+ "socks-proxy-agent": "^6.0.0", -+ "ssri": "^8.0.0" -+ } -+ }, -+ "map-obj": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", -+ "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==" -+ }, -+ "matcher": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz", -+ "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==", -+ "optional": true, -+ "requires": { -+ "escape-string-regexp": "^4.0.0" -+ }, -+ "dependencies": { -+ "escape-string-regexp": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", -+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", -+ "optional": true -+ } -+ } -+ }, -+ "md5.js": { -+ "version": "1.3.5", -+ "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", -+ "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", -+ "requires": { -+ "hash-base": "^3.0.0", -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.1.2" -+ } -+ }, -+ "meow": { -+ "version": "9.0.0", -+ "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz", -+ "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==", -+ "requires": { -+ "@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" -+ }, -+ "dependencies": { -+ "find-up": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", -+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", -+ "requires": { -+ "locate-path": "^5.0.0", -+ "path-exists": "^4.0.0" -+ } -+ }, -+ "hosted-git-info": { -+ "version": "2.8.9", -+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", -+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" -+ }, -+ "locate-path": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", -+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", -+ "requires": { -+ "p-locate": "^4.1.0" -+ } -+ }, -+ "p-limit": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", -+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", -+ "requires": { -+ "p-try": "^2.0.0" -+ } -+ }, -+ "p-locate": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", -+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", -+ "requires": { -+ "p-limit": "^2.2.0" -+ } -+ }, -+ "p-try": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", -+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" -+ }, -+ "parse-json": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", -+ "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", -+ "requires": { -+ "@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": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", -+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" -+ }, -+ "read-pkg": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", -+ "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", -+ "requires": { -+ "@types/normalize-package-data": "^2.4.0", -+ "normalize-package-data": "^2.5.0", -+ "parse-json": "^5.0.0", -+ "type-fest": "^0.6.0" -+ }, -+ "dependencies": { -+ "normalize-package-data": { -+ "version": "2.5.0", -+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", -+ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", -+ "requires": { -+ "hosted-git-info": "^2.1.4", -+ "resolve": "^1.10.0", -+ "semver": "2 || 3 || 4 || 5", -+ "validate-npm-package-license": "^3.0.1" -+ } -+ }, -+ "type-fest": { -+ "version": "0.6.0", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", -+ "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==" -+ } -+ } -+ }, -+ "read-pkg-up": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", -+ "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", -+ "requires": { -+ "find-up": "^4.1.0", -+ "read-pkg": "^5.2.0", -+ "type-fest": "^0.8.1" -+ }, -+ "dependencies": { -+ "type-fest": { -+ "version": "0.8.1", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", -+ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" -+ } -+ } -+ }, -+ "semver": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", -+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" -+ } -+ } -+ }, -+ "merge-source-map": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz", -+ "integrity": "sha512-PGSmS0kfnTnMJCzJ16BLLCEe6oeYCamKFFdQKshi4BmM6FUwipjVOcBFGxqtQtirtAG4iZvHlqST9CpZKqlRjA==", -+ "requires": { -+ "source-map": "^0.5.6" -+ } -+ }, -+ "miller-rabin": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", -+ "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", -+ "requires": { -+ "bn.js": "^4.0.0", -+ "brorand": "^1.0.1" -+ }, -+ "dependencies": { -+ "bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ } -+ } -+ }, -+ "mime": { -+ "version": "1.6.0", -+ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", -+ "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" -+ }, -+ "mime-db": { -+ "version": "1.52.0", -+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", -+ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" -+ }, -+ "mime-types": { -+ "version": "2.1.35", -+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", -+ "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", -+ "requires": { -+ "mime-db": "1.52.0" -+ } -+ }, -+ "mimic-response": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", -+ "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" -+ }, -+ "min-indent": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", -+ "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==" -+ }, -+ "minimalistic-assert": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", -+ "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" -+ }, -+ "minimalistic-crypto-utils": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", -+ "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==" -+ }, -+ "minimatch": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz", -+ "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==", -+ "requires": { -+ "brace-expansion": "^2.0.1" -+ } -+ }, -+ "minimist": { -+ "version": "1.2.7", -+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", -+ "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==" -+ }, -+ "minimist-options": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", -+ "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", -+ "requires": { -+ "arrify": "^1.0.1", -+ "is-plain-obj": "^1.1.0", -+ "kind-of": "^6.0.3" -+ } -+ }, -+ "minipass": { -+ "version": "3.3.4", -+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz", -+ "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==", -+ "requires": { -+ "yallist": "^4.0.0" -+ } -+ }, -+ "minipass-collect": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", -+ "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", -+ "requires": { -+ "minipass": "^3.0.0" -+ } -+ }, -+ "minipass-fetch": { -+ "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz", -+ "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==", -+ "requires": { -+ "encoding": "^0.1.12", -+ "minipass": "^3.1.0", -+ "minipass-sized": "^1.0.3", -+ "minizlib": "^2.0.0" -+ } -+ }, -+ "minipass-flush": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", -+ "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", -+ "requires": { -+ "minipass": "^3.0.0" -+ } -+ }, -+ "minipass-pipeline": { -+ "version": "1.2.4", -+ "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", -+ "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", -+ "requires": { -+ "minipass": "^3.0.0" -+ } -+ }, -+ "minipass-sized": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", -+ "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", -+ "requires": { -+ "minipass": "^3.0.0" -+ } -+ }, -+ "minizlib": { -+ "version": "2.1.2", -+ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", -+ "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", -+ "requires": { -+ "minipass": "^3.0.0", -+ "yallist": "^4.0.0" -+ } -+ }, -+ "mkdirp": { -+ "version": "0.5.6", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", -+ "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", -+ "requires": { -+ "minimist": "^1.2.6" -+ } -+ }, -+ "mkdirp-classic": { -+ "version": "0.5.3", -+ "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", -+ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" -+ }, -+ "module-deps": { -+ "version": "6.2.3", -+ "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz", -+ "integrity": "sha512-fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA==", -+ "requires": { -+ "browser-resolve": "^2.0.0", -+ "cached-path-relative": "^1.0.2", -+ "concat-stream": "~1.6.0", -+ "defined": "^1.0.0", -+ "detective": "^5.2.0", -+ "duplexer2": "^0.1.2", -+ "inherits": "^2.0.1", -+ "JSONStream": "^1.0.3", -+ "parents": "^1.0.0", -+ "readable-stream": "^2.0.2", -+ "resolve": "^1.4.0", -+ "stream-combiner2": "^1.1.1", -+ "subarg": "^1.0.0", -+ "through2": "^2.0.0", -+ "xtend": "^4.0.0" -+ } -+ }, -+ "mold-source-map": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/mold-source-map/-/mold-source-map-0.4.0.tgz", -+ "integrity": "sha512-Y0uA/sDKVuPgLd7BmaJOai+fqzjrOlR6vZgx5cJIvturI/xOPQPgbf3X7ZbzJd6MvqQ6ucIfK8dSteFyc2Mw2w==", -+ "requires": { -+ "convert-source-map": "^1.1.0", -+ "through": "~2.2.7" -+ }, -+ "dependencies": { -+ "through": { -+ "version": "2.2.7", -+ "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz", -+ "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==" -+ } -+ } -+ }, -+ "ms": { -+ "version": "2.1.2", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", -+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" -+ }, -+ "multicast-dns": { -+ "version": "git+ssh://git@github.com/jean-emmanuel/multicast-dns.git#1bb9f6ba892eba88f2cb12ca96a1c1b3088413c0", -+ "from": "multicast-dns@github:jean-emmanuel/multicast-dns", -+ "requires": { -+ "dns-packet": "^1.3.1", -+ "thunky": "^1.0.2" -+ } -+ }, -+ "multicast-dns-service-types": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", -+ "integrity": "sha512-cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ==" -+ }, -+ "mutexify": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/mutexify/-/mutexify-1.4.0.tgz", -+ "integrity": "sha512-pbYSsOrSB/AKN5h/WzzLRMFgZhClWccf2XIB4RSMC8JbquiB0e0/SH5AIfdQMdyHmYtv4seU7yV/TvAwPLJ1Yg==", -+ "requires": { -+ "queue-tick": "^1.0.0" -+ } -+ }, -+ "nan": { -+ "version": "2.17.0", -+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", -+ "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==" -+ }, -+ "nanoassert": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz", -+ "integrity": "sha512-C40jQ3NzfkP53NsO8kEOFd79p4b9kDXQMwgiY1z8ZwrDZgUyom0AHwGegF4Dm99L+YoYhuaB0ceerUcXmqr1rQ==" -+ }, -+ "nanobench": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/nanobench/-/nanobench-2.1.1.tgz", -+ "integrity": "sha512-z+Vv7zElcjN+OpzAxAquUayFLGK3JI/ubCl0Oh64YQqsTGG09CGqieJVQw4ui8huDnnAgrvTv93qi5UaOoNj8A==", -+ "requires": { -+ "browser-process-hrtime": "^0.1.2", -+ "chalk": "^1.1.3", -+ "mutexify": "^1.1.0", -+ "pretty-hrtime": "^1.0.2" -+ }, -+ "dependencies": { -+ "ansi-regex": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", -+ "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==" -+ }, -+ "ansi-styles": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", -+ "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==" -+ }, -+ "chalk": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", -+ "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==", -+ "requires": { -+ "ansi-styles": "^2.2.1", -+ "escape-string-regexp": "^1.0.2", -+ "has-ansi": "^2.0.0", -+ "strip-ansi": "^3.0.0", -+ "supports-color": "^2.0.0" -+ } -+ }, -+ "strip-ansi": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", -+ "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", -+ "requires": { -+ "ansi-regex": "^2.0.0" -+ } -+ }, -+ "supports-color": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", -+ "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==" -+ } -+ } -+ }, -+ "nanohtml": { -+ "version": "1.10.0", -+ "resolved": "https://registry.npmjs.org/nanohtml/-/nanohtml-1.10.0.tgz", -+ "integrity": "sha512-r/3AQl+jxAxUIJRiKExUjBtFcE1cm4yTOsTIdVqqlxPNtBxJh522ANrcQYzdNHhPzbPgb7j6qujq6eGehBX0kg==", -+ "requires": { -+ "acorn-node": "^1.8.2", -+ "camel-case": "^3.0.0", -+ "convert-source-map": "^1.5.1", -+ "estree-is-member-expression": "^1.0.0", -+ "hyperx": "^2.5.0", -+ "is-boolean-attribute": "0.0.1", -+ "nanoassert": "^1.1.0", -+ "nanobench": "^2.1.0", -+ "normalize-html-whitespace": "^0.2.0", -+ "through2": "^2.0.3", -+ "transform-ast": "^2.4.0" -+ } -+ }, -+ "nanoid": { -+ "version": "3.3.4", -+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", -+ "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==" -+ }, -+ "nanomorph": { -+ "version": "5.4.3", -+ "resolved": "https://registry.npmjs.org/nanomorph/-/nanomorph-5.4.3.tgz", -+ "integrity": "sha512-uPP5y0x21KISffZCKHh1A0QW0RHZFQS0BR7LetlHBlay6UWAbjwhjiJTxOO6JeMHko5Cigl617zFoGrYFJ8ZLg==", -+ "requires": { -+ "nanoassert": "^1.1.0" -+ } -+ }, -+ "napi-build-utils": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", -+ "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==", -+ "optional": true -+ }, -+ "natural-compare": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", -+ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" -+ }, -+ "negotiator": { -+ "version": "0.6.3", -+ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", -+ "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" -+ }, -+ "no-case": { -+ "version": "2.3.2", -+ "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", -+ "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", -+ "requires": { -+ "lower-case": "^1.1.1" -+ } -+ }, -+ "node-abi": { -+ "version": "3.28.0", -+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.28.0.tgz", -+ "integrity": "sha512-fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A==", -+ "optional": true, -+ "requires": { -+ "semver": "^7.3.5" -+ } -+ }, -+ "node-forge": { -+ "version": "1.3.1", -+ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", -+ "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==" -+ }, -+ "node-gyp": { -+ "version": "8.4.1", -+ "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz", -+ "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==", -+ "requires": { -+ "env-paths": "^2.2.0", -+ "glob": "^7.1.4", -+ "graceful-fs": "^4.2.6", -+ "make-fetch-happen": "^9.1.0", -+ "nopt": "^5.0.0", -+ "npmlog": "^6.0.0", -+ "rimraf": "^3.0.2", -+ "semver": "^7.3.5", -+ "tar": "^6.1.2", -+ "which": "^2.0.2" -+ }, -+ "dependencies": { -+ "are-we-there-yet": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", -+ "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", -+ "requires": { -+ "delegates": "^1.0.0", -+ "readable-stream": "^3.6.0" -+ } -+ }, -+ "gauge": { -+ "version": "4.0.4", -+ "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", -+ "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", -+ "requires": { -+ "aproba": "^1.0.3 || ^2.0.0", -+ "color-support": "^1.1.3", -+ "console-control-strings": "^1.1.0", -+ "has-unicode": "^2.0.1", -+ "signal-exit": "^3.0.7", -+ "string-width": "^4.2.3", -+ "strip-ansi": "^6.0.1", -+ "wide-align": "^1.1.5" -+ } -+ }, -+ "npmlog": { -+ "version": "6.0.2", -+ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", -+ "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", -+ "requires": { -+ "are-we-there-yet": "^3.0.0", -+ "console-control-strings": "^1.1.0", -+ "gauge": "^4.0.3", -+ "set-blocking": "^2.0.0" -+ } -+ }, -+ "readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "requires": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ } -+ }, -+ "rimraf": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", -+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", -+ "requires": { -+ "glob": "^7.1.3" -+ } -+ } -+ } -+ }, -+ "node-mouse": { -+ "version": "0.0.2", -+ "resolved": "https://registry.npmjs.org/node-mouse/-/node-mouse-0.0.2.tgz", -+ "integrity": "sha512-qqm+c/uKB1ceGMrKW+mxAxPKFTu0HD1DWoCElJHA0VQDloudzZD4bI++Z18mSDA3n5lix+RTXiOiu3XAOSYVHA==" -+ }, -+ "node-releases": { -+ "version": "2.0.6", -+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", -+ "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==" -+ }, -+ "node-sass": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-7.0.1.tgz", -+ "integrity": "sha512-uMy+Xt29NlqKCFdFRZyXKOTqGt+QaKHexv9STj2WeLottnlqZEEWx6Bj0MXNthmFRRdM/YwyNo/8Tr46TOM0jQ==", -+ "requires": { -+ "async-foreach": "^0.1.3", -+ "chalk": "^4.1.2", -+ "cross-spawn": "^7.0.3", -+ "gaze": "^1.0.0", -+ "get-stdin": "^4.0.1", -+ "glob": "^7.0.3", -+ "lodash": "^4.17.15", -+ "meow": "^9.0.0", -+ "nan": "^2.13.2", -+ "node-gyp": "^8.4.1", -+ "npmlog": "^5.0.0", -+ "request": "^2.88.0", -+ "sass-graph": "4.0.0", -+ "stdout-stream": "^1.4.0", -+ "true-case-path": "^1.0.2" -+ }, -+ "dependencies": { -+ "ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "requires": { -+ "color-convert": "^2.0.1" -+ } -+ }, -+ "chalk": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", -+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -+ "requires": { -+ "ansi-styles": "^4.1.0", -+ "supports-color": "^7.1.0" -+ } -+ }, -+ "color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "requires": { -+ "color-name": "~1.1.4" -+ } -+ }, -+ "color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "has-flag": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" -+ }, -+ "supports-color": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -+ "requires": { -+ "has-flag": "^4.0.0" -+ } -+ } -+ } -+ }, -+ "nodemon": { -+ "version": "2.0.16", -+ "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.16.tgz", -+ "integrity": "sha512-zsrcaOfTWRuUzBn3P44RDliLlp263Z/76FPoHFr3cFFkOz0lTPAcIw8dCzfdVIx/t3AtDYCZRCDkoCojJqaG3w==", -+ "requires": { -+ "chokidar": "^3.5.2", -+ "debug": "^3.2.7", -+ "ignore-by-default": "^1.0.1", -+ "minimatch": "^3.0.4", -+ "pstree.remy": "^1.1.8", -+ "semver": "^5.7.1", -+ "supports-color": "^5.5.0", -+ "touch": "^3.1.0", -+ "undefsafe": "^2.0.5", -+ "update-notifier": "^5.1.0" -+ }, -+ "dependencies": { -+ "balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "requires": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "debug": { -+ "version": "3.2.7", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", -+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", -+ "requires": { -+ "ms": "^2.1.1" -+ } -+ }, -+ "minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "requires": { -+ "brace-expansion": "^1.1.7" -+ } -+ }, -+ "semver": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", -+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" -+ } -+ } -+ }, -+ "nopt": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", -+ "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", -+ "requires": { -+ "abbrev": "1" -+ } -+ }, -+ "normalize-html-whitespace": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/normalize-html-whitespace/-/normalize-html-whitespace-0.2.0.tgz", -+ "integrity": "sha512-5CZAEQ4bQi8Msqw0GAT6rrkrjNN4ZKqAG3+jJMwms4O6XoMvh6ekwOueG4mRS1LbPUR1r9EdnhxxfpzMTOdzKw==" -+ }, -+ "normalize-package-data": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", -+ "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", -+ "requires": { -+ "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": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", -+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" -+ }, -+ "normalize-url": { -+ "version": "4.5.1", -+ "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz", -+ "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==" -+ }, -+ "nosleep.js": { -+ "version": "0.12.0", -+ "resolved": "https://registry.npmjs.org/nosleep.js/-/nosleep.js-0.12.0.tgz", -+ "integrity": "sha512-9d1HbpKLh3sdWlhXMhU6MMH+wQzKkrgfRkYV0EBdvt99YJfj0ilCJrWRDYG2130Tm4GXbEoTCx5b34JSaP+HhA==" -+ }, -+ "npm-conf": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", -+ "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", -+ "optional": true, -+ "requires": { -+ "config-chain": "^1.1.11", -+ "pify": "^3.0.0" -+ } -+ }, -+ "npmlog": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", -+ "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", -+ "requires": { -+ "are-we-there-yet": "^2.0.0", -+ "console-control-strings": "^1.1.0", -+ "gauge": "^3.0.0", -+ "set-blocking": "^2.0.0" -+ } -+ }, -+ "oauth-sign": { -+ "version": "0.9.0", -+ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", -+ "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" -+ }, -+ "object-assign": { -+ "version": "4.1.1", -+ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", -+ "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" -+ }, -+ "object-is": { -+ "version": "1.1.5", -+ "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", -+ "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", -+ "requires": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.3" -+ } -+ }, -+ "object-keys": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", -+ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" -+ }, -+ "offset-sourcemap-lines": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/offset-sourcemap-lines/-/offset-sourcemap-lines-1.0.1.tgz", -+ "integrity": "sha512-8giJa0GProV9hPLOp9qAobkvi6OiZnzeM6fdubVjhqcrISX8FYMk1jMVzG6R9d7HQWLysG22jyXEIF6sWu4fJw==", -+ "requires": { -+ "source-map": "^0.5.0" -+ } -+ }, -+ "on-finished": { -+ "version": "2.4.1", -+ "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", -+ "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", -+ "requires": { -+ "ee-first": "1.1.1" -+ } -+ }, -+ "once": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", -+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", -+ "requires": { -+ "wrappy": "1" -+ } -+ }, -+ "open": { -+ "version": "8.4.0", -+ "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz", -+ "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==", -+ "requires": { -+ "define-lazy-prop": "^2.0.0", -+ "is-docker": "^2.1.1", -+ "is-wsl": "^2.2.0" -+ } -+ }, -+ "optionator": { -+ "version": "0.9.1", -+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", -+ "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", -+ "requires": { -+ "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" -+ } -+ }, -+ "os-browserify": { -+ "version": "0.3.0", -+ "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", -+ "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==" -+ }, -+ "osc": { -+ "version": "git+ssh://git@github.com/jean-emmanuel/osc.js.git#9197739162f26086e6a72670103c3fa036e9dcd5", -+ "from": "osc@github:jean-emmanuel/osc.js", -+ "requires": { -+ "long": "4.0.0", -+ "serialport": "9.2.0", -+ "slip": "1.0.2", -+ "wolfy87-eventemitter": "5.2.9", -+ "ws": "7.5.3" -+ }, -+ "dependencies": { -+ "ws": { -+ "version": "7.5.3", -+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz", -+ "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==" -+ } -+ } -+ }, -+ "osi-licenses": { -+ "version": "0.1.1", -+ "resolved": "https://registry.npmjs.org/osi-licenses/-/osi-licenses-0.1.1.tgz", -+ "integrity": "sha512-ZGAGO6dIxTS/mXxEJCpIdYetAoxIOOr7uYpMOoDWo4+b/6rf+2GagOjTbegL+eoMI8aYAiyNgKWUT7vWJRPl9A==" -+ }, -+ "oss-license-name-to-url": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/oss-license-name-to-url/-/oss-license-name-to-url-1.2.1.tgz", -+ "integrity": "sha512-apFbKq0EAYi70q0pOpS0tDfSviZYdG3KM6U1GpofZPsRMwgDga0DQiPQ/GHyQx7PDDrLCGvFBNPLMLV/K4Jr4Q==", -+ "requires": { -+ "osi-licenses": "^0.1.0" -+ } -+ }, -+ "outpipe": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/outpipe/-/outpipe-1.1.1.tgz", -+ "integrity": "sha512-BnNY/RwnDrkmQdUa9U+OfN/Y7AWmKuUPCCd+hbRclZnnANvYpO72zp/a6Q4n829hPbdqEac31XCcsvlEvb+rtA==", -+ "dev": true, -+ "requires": { -+ "shell-quote": "^1.4.2" -+ } -+ }, -+ "p-cancelable": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", -+ "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==" -+ }, -+ "p-limit": { -+ "version": "1.3.0", -+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", -+ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", -+ "requires": { -+ "p-try": "^1.0.0" -+ } -+ }, -+ "p-locate": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", -+ "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==", -+ "requires": { -+ "p-limit": "^1.1.0" -+ } -+ }, -+ "p-map": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", -+ "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", -+ "requires": { -+ "aggregate-error": "^3.0.0" -+ } -+ }, -+ "p-try": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", -+ "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==" -+ }, -+ "package-json": { -+ "version": "6.5.0", -+ "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz", -+ "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==", -+ "requires": { -+ "got": "^9.6.0", -+ "registry-auth-token": "^4.0.0", -+ "registry-url": "^5.0.0", -+ "semver": "^6.2.0" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ } -+ } -+ }, -+ "pako": { -+ "version": "1.0.11", -+ "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", -+ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" -+ }, -+ "parent-module": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", -+ "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", -+ "requires": { -+ "callsites": "^3.0.0" -+ } -+ }, -+ "parents": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz", -+ "integrity": "sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg==", -+ "requires": { -+ "path-platform": "~0.11.15" -+ } -+ }, -+ "parse-asn1": { -+ "version": "5.1.6", -+ "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", -+ "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", -+ "requires": { -+ "asn1.js": "^5.2.0", -+ "browserify-aes": "^1.0.0", -+ "evp_bytestokey": "^1.0.0", -+ "pbkdf2": "^3.0.3", -+ "safe-buffer": "^5.1.1" -+ } -+ }, -+ "parse-author": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz", -+ "integrity": "sha512-yx5DfvkN8JsHL2xk2Os9oTia467qnvRgey4ahSm2X8epehBLx/gWLcy5KI+Y36ful5DzGbCS6RazqZGgy1gHNw==", -+ "requires": { -+ "author-regex": "^1.0.0" -+ } -+ }, -+ "parse-json": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", -+ "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==", -+ "requires": { -+ "error-ex": "^1.2.0" -+ } -+ }, -+ "parse-srcset": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz", -+ "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==" -+ }, -+ "path-browserify": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", -+ "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==" -+ }, -+ "path-exists": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", -+ "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==" -+ }, -+ "path-is-absolute": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", -+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" -+ }, -+ "path-key": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", -+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" -+ }, -+ "path-parse": { -+ "version": "1.0.7", -+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", -+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" -+ }, -+ "path-platform": { -+ "version": "0.11.15", -+ "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz", -+ "integrity": "sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==" -+ }, -+ "path-type": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", -+ "integrity": "sha512-dUnb5dXUf+kzhC/W/F4e5/SkluXIFf5VUHolW1Eg1irn1hGWjPGdsRcvYJ1nD6lhk8Ir7VM0bHJKsYTx8Jx9OQ==", -+ "requires": { -+ "pify": "^2.0.0" -+ }, -+ "dependencies": { -+ "pify": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", -+ "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==" -+ } -+ } -+ }, -+ "pbkdf2": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", -+ "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", -+ "requires": { -+ "create-hash": "^1.1.2", -+ "create-hmac": "^1.1.4", -+ "ripemd160": "^2.0.1", -+ "safe-buffer": "^5.0.1", -+ "sha.js": "^2.4.8" -+ } -+ }, -+ "pend": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", -+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==" -+ }, -+ "performance-now": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", -+ "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==" -+ }, -+ "picocolors": { -+ "version": "0.2.1", -+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", -+ "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==" -+ }, -+ "picomatch": { -+ "version": "2.3.1", -+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", -+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" -+ }, -+ "pify": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", -+ "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", -+ "optional": true -+ }, -+ "plist": { -+ "version": "3.0.6", -+ "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.6.tgz", -+ "integrity": "sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==", -+ "requires": { -+ "base64-js": "^1.5.1", -+ "xmlbuilder": "^15.1.1" -+ } -+ }, -+ "postcss": { -+ "version": "7.0.39", -+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", -+ "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", -+ "requires": { -+ "picocolors": "^0.2.1", -+ "source-map": "^0.6.1" -+ }, -+ "dependencies": { -+ "source-map": { -+ "version": "0.6.1", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", -+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" -+ } -+ } -+ }, -+ "prebuild-install": { -+ "version": "7.1.1", -+ "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz", -+ "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==", -+ "optional": true, -+ "requires": { -+ "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", -+ "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": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", -+ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==" -+ }, -+ "prepend-http": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", -+ "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==" -+ }, -+ "pretty-hrtime": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", -+ "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==" -+ }, -+ "process": { -+ "version": "0.11.10", -+ "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", -+ "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==" -+ }, -+ "process-nextick-args": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", -+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" -+ }, -+ "progress": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", -+ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" -+ }, -+ "promise-inflight": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", -+ "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==" -+ }, -+ "promise-retry": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", -+ "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", -+ "requires": { -+ "err-code": "^2.0.2", -+ "retry": "^0.12.0" -+ } -+ }, -+ "proto-list": { -+ "version": "1.2.4", -+ "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", -+ "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", -+ "optional": true -+ }, -+ "psl": { -+ "version": "1.9.0", -+ "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", -+ "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==" -+ }, -+ "pstree.remy": { -+ "version": "1.1.8", -+ "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", -+ "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==" -+ }, -+ "public-encrypt": { -+ "version": "4.0.3", -+ "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", -+ "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", -+ "requires": { -+ "bn.js": "^4.1.0", -+ "browserify-rsa": "^4.0.0", -+ "create-hash": "^1.1.0", -+ "parse-asn1": "^5.0.0", -+ "randombytes": "^2.0.1", -+ "safe-buffer": "^5.1.2" -+ }, -+ "dependencies": { -+ "bn.js": { -+ "version": "4.12.0", -+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", -+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" -+ } -+ } -+ }, -+ "pump": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", -+ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", -+ "requires": { -+ "end-of-stream": "^1.1.0", -+ "once": "^1.3.1" -+ } -+ }, -+ "punycode": { -+ "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", -+ "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==" -+ }, -+ "pupa": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz", -+ "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==", -+ "requires": { -+ "escape-goat": "^2.0.0" -+ } -+ }, -+ "python-shell": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/python-shell/-/python-shell-3.0.1.tgz", -+ "integrity": "sha512-TWeotuxe1auhXa5bGRScxnc2J+0r41NBntSa6RYZtMBLtAEsvCboKrEbW6DvASosWQepVkhZZlT3B5Ei766G+Q==" -+ }, -+ "qs": { -+ "version": "6.5.3", -+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", -+ "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==" -+ }, -+ "querystring": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", -+ "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==" -+ }, -+ "querystring-es3": { -+ "version": "0.2.1", -+ "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", -+ "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==" -+ }, -+ "queue-tick": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz", -+ "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==" -+ }, -+ "quick-lru": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", -+ "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==" -+ }, -+ "randombytes": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", -+ "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", -+ "requires": { -+ "safe-buffer": "^5.1.0" -+ } -+ }, -+ "randomfill": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", -+ "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", -+ "requires": { -+ "randombytes": "^2.0.5", -+ "safe-buffer": "^5.1.0" -+ } -+ }, -+ "range-parser": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", -+ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" -+ }, -+ "rc": { -+ "version": "1.2.8", -+ "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", -+ "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", -+ "requires": { -+ "deep-extend": "^0.6.0", -+ "ini": "~1.3.0", -+ "minimist": "^1.2.0", -+ "strip-json-comments": "~2.0.1" -+ }, -+ "dependencies": { -+ "strip-json-comments": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", -+ "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==" -+ } -+ } -+ }, -+ "rcedit": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-2.3.0.tgz", -+ "integrity": "sha512-h1gNEl9Oai1oijwyJ1WYqYSXTStHnOcv1KYljg/8WM4NAg3H1KBK3azIaKkQ1WQl+d7PoJpcBMscPfLXVKgCLQ==" -+ }, -+ "read-only-stream": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz", -+ "integrity": "sha512-3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w==", -+ "requires": { -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "read-pkg": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", -+ "integrity": "sha512-eFIBOPW7FGjzBuk3hdXEuNSiTZS/xEMlH49HxMyzb0hyPfu4EhVjT2DH32K1hSSmVq4sebAWnZuuY5auISUTGA==", -+ "requires": { -+ "load-json-file": "^2.0.0", -+ "normalize-package-data": "^2.3.2", -+ "path-type": "^2.0.0" -+ }, -+ "dependencies": { -+ "hosted-git-info": { -+ "version": "2.8.9", -+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", -+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" -+ }, -+ "normalize-package-data": { -+ "version": "2.5.0", -+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", -+ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", -+ "requires": { -+ "hosted-git-info": "^2.1.4", -+ "resolve": "^1.10.0", -+ "semver": "2 || 3 || 4 || 5", -+ "validate-npm-package-license": "^3.0.1" -+ } -+ }, -+ "semver": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", -+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" -+ } -+ } -+ }, -+ "read-pkg-up": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", -+ "integrity": "sha512-1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w==", -+ "requires": { -+ "find-up": "^2.0.0", -+ "read-pkg": "^2.0.0" -+ } -+ }, -+ "readable-stream": { -+ "version": "2.3.7", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", -+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", -+ "requires": { -+ "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" -+ }, -+ "dependencies": { -+ "safe-buffer": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", -+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" -+ }, -+ "string_decoder": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", -+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", -+ "requires": { -+ "safe-buffer": "~5.1.0" -+ } -+ } -+ } -+ }, -+ "readdirp": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", -+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", -+ "requires": { -+ "picomatch": "^2.2.1" -+ } -+ }, -+ "redent": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", -+ "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", -+ "requires": { -+ "indent-string": "^4.0.0", -+ "strip-indent": "^3.0.0" -+ } -+ }, -+ "regenerate": { -+ "version": "1.4.2", -+ "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", -+ "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==" -+ }, -+ "regenerate-unicode-properties": { -+ "version": "10.1.0", -+ "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz", -+ "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==", -+ "requires": { -+ "regenerate": "^1.4.2" -+ } -+ }, -+ "regenerator-runtime": { -+ "version": "0.13.10", -+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz", -+ "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==" -+ }, -+ "regenerator-transform": { -+ "version": "0.15.0", -+ "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz", -+ "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==", -+ "requires": { -+ "@babel/runtime": "^7.8.4" -+ } -+ }, -+ "regexp.prototype.flags": { -+ "version": "1.4.3", -+ "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", -+ "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", -+ "requires": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.3", -+ "functions-have-names": "^1.2.2" -+ } -+ }, -+ "regexpp": { -+ "version": "3.2.0", -+ "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", -+ "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==" -+ }, -+ "regexpu-core": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz", -+ "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==", -+ "requires": { -+ "regenerate": "^1.4.2", -+ "regenerate-unicode-properties": "^10.1.0", -+ "regjsgen": "^0.7.1", -+ "regjsparser": "^0.9.1", -+ "unicode-match-property-ecmascript": "^2.0.0", -+ "unicode-match-property-value-ecmascript": "^2.0.0" -+ } -+ }, -+ "registry-auth-token": { -+ "version": "4.2.2", -+ "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.2.tgz", -+ "integrity": "sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg==", -+ "requires": { -+ "rc": "1.2.8" -+ } -+ }, -+ "registry-url": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz", -+ "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==", -+ "requires": { -+ "rc": "^1.2.8" -+ } -+ }, -+ "regjsgen": { -+ "version": "0.7.1", -+ "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz", -+ "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==" -+ }, -+ "regjsparser": { -+ "version": "0.9.1", -+ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", -+ "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", -+ "requires": { -+ "jsesc": "~0.5.0" -+ }, -+ "dependencies": { -+ "jsesc": { -+ "version": "0.5.0", -+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", -+ "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==" -+ } -+ } -+ }, -+ "replacestream": { -+ "version": "4.0.3", -+ "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz", -+ "integrity": "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==", -+ "requires": { -+ "escape-string-regexp": "^1.0.3", -+ "object-assign": "^4.0.1", -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "request": { -+ "version": "2.88.2", -+ "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", -+ "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", -+ "requires": { -+ "aws-sign2": "~0.7.0", -+ "aws4": "^1.8.0", -+ "caseless": "~0.12.0", -+ "combined-stream": "~1.0.6", -+ "extend": "~3.0.2", -+ "forever-agent": "~0.6.1", -+ "form-data": "~2.3.2", -+ "har-validator": "~5.1.3", -+ "http-signature": "~1.2.0", -+ "is-typedarray": "~1.0.0", -+ "isstream": "~0.1.2", -+ "json-stringify-safe": "~5.0.1", -+ "mime-types": "~2.1.19", -+ "oauth-sign": "~0.9.0", -+ "performance-now": "^2.1.0", -+ "qs": "~6.5.2", -+ "safe-buffer": "^5.1.2", -+ "tough-cookie": "~2.5.0", -+ "tunnel-agent": "^0.6.0", -+ "uuid": "^3.3.2" -+ }, -+ "dependencies": { -+ "uuid": { -+ "version": "3.4.0", -+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", -+ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" -+ } -+ } -+ }, -+ "require-directory": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", -+ "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" -+ }, -+ "resolve": { -+ "version": "1.22.1", -+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", -+ "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", -+ "requires": { -+ "is-core-module": "^2.9.0", -+ "path-parse": "^1.0.7", -+ "supports-preserve-symlinks-flag": "^1.0.0" -+ } -+ }, -+ "resolve-from": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", -+ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" -+ }, -+ "responselike": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", -+ "integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==", -+ "requires": { -+ "lowercase-keys": "^1.0.0" -+ } -+ }, -+ "retry": { -+ "version": "0.12.0", -+ "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", -+ "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==" -+ }, -+ "rimraf": { -+ "version": "2.7.1", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", -+ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", -+ "requires": { -+ "glob": "^7.1.3" -+ } -+ }, -+ "ripemd160": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", -+ "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", -+ "requires": { -+ "hash-base": "^3.0.0", -+ "inherits": "^2.0.1" -+ } -+ }, -+ "roarr": { -+ "version": "2.15.4", -+ "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz", -+ "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==", -+ "optional": true, -+ "requires": { -+ "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": { -+ "version": "5.2.1", -+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", -+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" -+ }, -+ "safer-buffer": { -+ "version": "2.1.2", -+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", -+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" -+ }, -+ "sanitize-html": { -+ "version": "1.27.5", -+ "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.27.5.tgz", -+ "integrity": "sha512-M4M5iXDAUEcZKLXkmk90zSYWEtk5NH3JmojQxKxV371fnMh+x9t1rqdmXaGoyEHw3z/X/8vnFhKjGL5xFGOJ3A==", -+ "requires": { -+ "htmlparser2": "^4.1.0", -+ "lodash": "^4.17.15", -+ "parse-srcset": "^1.0.2", -+ "postcss": "^7.0.27" -+ } -+ }, -+ "sass-graph": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-4.0.0.tgz", -+ "integrity": "sha512-WSO/MfXqKH7/TS8RdkCX3lVkPFQzCgbqdGsmSKq6tlPU+GpGEsa/5aW18JqItnqh+lPtcjifqdZ/VmiILkKckQ==", -+ "requires": { -+ "glob": "^7.0.0", -+ "lodash": "^4.17.11", -+ "scss-tokenizer": "^0.3.0", -+ "yargs": "^17.2.1" -+ } -+ }, -+ "scope-css": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/scope-css/-/scope-css-1.2.1.tgz", -+ "integrity": "sha512-UjLRmyEYaDNiOS673xlVkZFlVCtckJR/dKgr434VMm7Lb+AOOqXKdAcY7PpGlJYErjXXJzKN7HWo4uRPiZZG0Q==", -+ "requires": { -+ "escaper": "^2.5.3", -+ "slugify": "^1.3.1", -+ "strip-css-comments": "^3.0.0" -+ } -+ }, -+ "screenfull": { -+ "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/screenfull/-/screenfull-5.2.0.tgz", -+ "integrity": "sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==" -+ }, -+ "scss-tokenizer": { -+ "version": "0.3.0", -+ "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.3.0.tgz", -+ "integrity": "sha512-14Zl9GcbBvOT9057ZKjpz5yPOyUWG2ojd9D5io28wHRYsOrs7U95Q+KNL87+32p8rc+LvDpbu/i9ZYjM9Q+FsQ==", -+ "requires": { -+ "js-base64": "^2.4.3", -+ "source-map": "^0.7.1" -+ }, -+ "dependencies": { -+ "source-map": { -+ "version": "0.7.4", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", -+ "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==" -+ } -+ } -+ }, -+ "semver": { -+ "version": "7.3.7", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", -+ "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", -+ "requires": { -+ "lru-cache": "^6.0.0" -+ } -+ }, -+ "semver-compare": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", -+ "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", -+ "optional": true -+ }, -+ "semver-diff": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz", -+ "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==", -+ "requires": { -+ "semver": "^6.3.0" -+ }, -+ "dependencies": { -+ "semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" -+ } -+ } -+ }, -+ "send": { -+ "version": "0.18.0", -+ "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", -+ "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", -+ "requires": { -+ "debug": "2.6.9", -+ "depd": "2.0.0", -+ "destroy": "1.2.0", -+ "encodeurl": "~1.0.2", -+ "escape-html": "~1.0.3", -+ "etag": "~1.8.1", -+ "fresh": "0.5.2", -+ "http-errors": "2.0.0", -+ "mime": "1.6.0", -+ "ms": "2.1.3", -+ "on-finished": "2.4.1", -+ "range-parser": "~1.2.1", -+ "statuses": "2.0.1" -+ }, -+ "dependencies": { -+ "debug": { -+ "version": "2.6.9", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", -+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -+ "requires": { -+ "ms": "2.0.0" -+ }, -+ "dependencies": { -+ "ms": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", -+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" -+ } -+ } -+ }, -+ "depd": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", -+ "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" -+ }, -+ "ms": { -+ "version": "2.1.3", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", -+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" -+ } -+ } -+ }, -+ "serialize-error": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", -+ "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", -+ "optional": true, -+ "requires": { -+ "type-fest": "^0.13.1" -+ }, -+ "dependencies": { -+ "type-fest": { -+ "version": "0.13.1", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", -+ "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", -+ "optional": true -+ } -+ } -+ }, -+ "serialport": { -+ "version": "9.2.0", -+ "resolved": "https://registry.npmjs.org/serialport/-/serialport-9.2.0.tgz", -+ "integrity": "sha512-C6AQ4jD4mre3tn3QA+atn++mEZDh4r40CIeh1sKhskKE+Q4eiIr/nzVMOiPxHb8gskrSNxujH+Br49tl3i9s9g==", -+ "optional": true, -+ "requires": { -+ "@serialport/binding-mock": "9.0.7", -+ "@serialport/bindings": "^9.2.0", -+ "@serialport/parser-byte-length": "9.0.7", -+ "@serialport/parser-cctalk": "9.0.7", -+ "@serialport/parser-delimiter": "9.0.7", -+ "@serialport/parser-inter-byte-timeout": "9.0.7", -+ "@serialport/parser-readline": "9.0.7", -+ "@serialport/parser-ready": "9.0.7", -+ "@serialport/parser-regex": "9.0.7", -+ "@serialport/stream": "9.0.7", -+ "debug": "^4.3.1" -+ } -+ }, -+ "set-blocking": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", -+ "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" -+ }, -+ "setprototypeof": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", -+ "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" -+ }, -+ "sha.js": { -+ "version": "2.4.11", -+ "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", -+ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", -+ "requires": { -+ "inherits": "^2.0.1", -+ "safe-buffer": "^5.0.1" -+ } -+ }, -+ "shasum-object": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz", -+ "integrity": "sha512-Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg==", -+ "requires": { -+ "fast-safe-stringify": "^2.0.7" -+ } -+ }, -+ "shebang-command": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", -+ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", -+ "requires": { -+ "shebang-regex": "^3.0.0" -+ } -+ }, -+ "shebang-regex": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", -+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" -+ }, -+ "shell-quote": { -+ "version": "1.7.4", -+ "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.4.tgz", -+ "integrity": "sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw==" -+ }, -+ "signal-exit": { -+ "version": "3.0.7", -+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", -+ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" -+ }, -+ "simple-concat": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", -+ "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==" -+ }, -+ "simple-get": { -+ "version": "4.0.1", -+ "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", -+ "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", -+ "optional": true, -+ "requires": { -+ "decompress-response": "^6.0.0", -+ "once": "^1.3.1", -+ "simple-concat": "^1.0.0" -+ }, -+ "dependencies": { -+ "decompress-response": { -+ "version": "6.0.0", -+ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", -+ "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", -+ "optional": true, -+ "requires": { -+ "mimic-response": "^3.1.0" -+ } -+ }, -+ "mimic-response": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", -+ "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", -+ "optional": true -+ } -+ } -+ }, -+ "slip": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/slip/-/slip-1.0.2.tgz", -+ "integrity": "sha512-XrcHe3NAcyD3wO+O4I13RcS4/3AF+S9RvGNj9JhJeS02HyImwD2E3QWLrmn9hBfL+fB6yapagwxRkeyYzhk98g==" -+ }, -+ "slugify": { -+ "version": "1.6.5", -+ "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.5.tgz", -+ "integrity": "sha512-8mo9bslnBO3tr5PEVFzMPIWwWnipGS0xVbYf65zxDqfNwmzYn1LpiKNrR6DlClusuvo+hDHd1zKpmfAe83NQSQ==" -+ }, -+ "smart-buffer": { -+ "version": "4.2.0", -+ "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", -+ "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==" -+ }, -+ "socks": { -+ "version": "2.7.1", -+ "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz", -+ "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", -+ "requires": { -+ "ip": "^2.0.0", -+ "smart-buffer": "^4.2.0" -+ }, -+ "dependencies": { -+ "ip": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", -+ "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==" -+ } -+ } -+ }, -+ "socks-proxy-agent": { -+ "version": "6.2.1", -+ "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz", -+ "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==", -+ "requires": { -+ "agent-base": "^6.0.2", -+ "debug": "^4.3.3", -+ "socks": "^2.6.2" -+ } -+ }, -+ "sortablejs": { -+ "version": "1.15.0", -+ "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz", -+ "integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==" -+ }, -+ "source-map": { -+ "version": "0.5.7", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", -+ "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==" -+ }, -+ "source-map-support": { -+ "version": "0.5.21", -+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", -+ "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", -+ "requires": { -+ "buffer-from": "^1.0.0", -+ "source-map": "^0.6.0" -+ }, -+ "dependencies": { -+ "source-map": { -+ "version": "0.6.1", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", -+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" -+ } -+ } -+ }, -+ "sourcemap-codec": { -+ "version": "1.4.8", -+ "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", -+ "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==" -+ }, -+ "spdx-correct": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", -+ "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", -+ "requires": { -+ "spdx-expression-parse": "^3.0.0", -+ "spdx-license-ids": "^3.0.0" -+ } -+ }, -+ "spdx-exceptions": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", -+ "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" -+ }, -+ "spdx-expression-parse": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", -+ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", -+ "requires": { -+ "spdx-exceptions": "^2.1.0", -+ "spdx-license-ids": "^3.0.0" -+ } -+ }, -+ "spdx-license-ids": { -+ "version": "3.0.12", -+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz", -+ "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==" -+ }, -+ "sprintf-js": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", -+ "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", -+ "optional": true -+ }, -+ "sshpk": { -+ "version": "1.17.0", -+ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz", -+ "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==", -+ "requires": { -+ "asn1": "~0.2.3", -+ "assert-plus": "^1.0.0", -+ "bcrypt-pbkdf": "^1.0.0", -+ "dashdash": "^1.12.0", -+ "ecc-jsbn": "~0.1.1", -+ "getpass": "^0.1.1", -+ "jsbn": "~0.1.0", -+ "safer-buffer": "^2.0.2", -+ "tweetnacl": "~0.14.0" -+ } -+ }, -+ "ssri": { -+ "version": "8.0.1", -+ "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", -+ "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", -+ "requires": { -+ "minipass": "^3.1.1" -+ } -+ }, -+ "stack-generator": { -+ "version": "2.0.10", -+ "resolved": "https://registry.npmjs.org/stack-generator/-/stack-generator-2.0.10.tgz", -+ "integrity": "sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ==", -+ "requires": { -+ "stackframe": "^1.3.4" -+ } -+ }, -+ "stackframe": { -+ "version": "1.3.4", -+ "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz", -+ "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==" -+ }, -+ "stacktrace-gps": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz", -+ "integrity": "sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==", -+ "requires": { -+ "source-map": "0.5.6", -+ "stackframe": "^1.3.4" -+ }, -+ "dependencies": { -+ "source-map": { -+ "version": "0.5.6", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", -+ "integrity": "sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==" -+ } -+ } -+ }, -+ "stacktrace-js": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/stacktrace-js/-/stacktrace-js-2.0.2.tgz", -+ "integrity": "sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg==", -+ "requires": { -+ "error-stack-parser": "^2.0.6", -+ "stack-generator": "^2.0.5", -+ "stacktrace-gps": "^3.0.4" -+ } -+ }, -+ "statuses": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", -+ "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" -+ }, -+ "stdout-stream": { -+ "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", -+ "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", -+ "requires": { -+ "readable-stream": "^2.0.1" -+ } -+ }, -+ "stream-browserify": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz", -+ "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==", -+ "requires": { -+ "inherits": "~2.0.4", -+ "readable-stream": "^3.5.0" -+ }, -+ "dependencies": { -+ "readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "requires": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ } -+ } -+ } -+ }, -+ "stream-combiner2": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz", -+ "integrity": "sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==", -+ "requires": { -+ "duplexer2": "~0.1.0", -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "stream-http": { -+ "version": "3.2.0", -+ "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz", -+ "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==", -+ "requires": { -+ "builtin-status-codes": "^3.0.0", -+ "inherits": "^2.0.4", -+ "readable-stream": "^3.6.0", -+ "xtend": "^4.0.2" -+ }, -+ "dependencies": { -+ "readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "requires": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ } -+ } -+ } -+ }, -+ "stream-splicer": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz", -+ "integrity": "sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg==", -+ "requires": { -+ "inherits": "^2.0.1", -+ "readable-stream": "^2.0.2" -+ } -+ }, -+ "strictdom": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/strictdom/-/strictdom-1.0.1.tgz", -+ "integrity": "sha512-cEmp9QeXXRmjj/rVp9oyiqcvyocWab/HaoN4+bwFeZ7QzykJD6L3yD4v12K1x0tHpqRqVpJevN3gW7kyM39Bqg==" -+ }, -+ "string_decoder": { -+ "version": "1.3.0", -+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", -+ "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", -+ "requires": { -+ "safe-buffer": "~5.2.0" -+ } -+ }, -+ "string-width": { -+ "version": "4.2.3", -+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", -+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", -+ "requires": { -+ "emoji-regex": "^8.0.0", -+ "is-fullwidth-code-point": "^3.0.0", -+ "strip-ansi": "^6.0.1" -+ } -+ }, -+ "strip-ansi": { -+ "version": "6.0.1", -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", -+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -+ "requires": { -+ "ansi-regex": "^5.0.1" -+ } -+ }, -+ "strip-bom": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", -+ "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==" -+ }, -+ "strip-css-comments": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/strip-css-comments/-/strip-css-comments-3.0.0.tgz", -+ "integrity": "sha512-xJwk2yMZ6j+0Clj7ETUfqQ6frsaCIqNGg3zjTVswIt3SbiOsCQgRI1E93hdt/JgGfh5De/sTwxrnrBhhWzMwcg==", -+ "requires": { -+ "is-regexp": "^1.0.0" -+ } -+ }, -+ "strip-indent": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", -+ "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", -+ "requires": { -+ "min-indent": "^1.0.0" -+ } -+ }, -+ "strip-json-comments": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", -+ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==" -+ }, -+ "strip-outer": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz", -+ "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==", -+ "requires": { -+ "escape-string-regexp": "^1.0.2" -+ } -+ }, -+ "subarg": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz", -+ "integrity": "sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==", -+ "requires": { -+ "minimist": "^1.1.0" -+ } -+ }, -+ "sumchecker": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", -+ "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", -+ "requires": { -+ "debug": "^4.1.0" -+ } -+ }, -+ "supports-color": { -+ "version": "5.5.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", -+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", -+ "requires": { -+ "has-flag": "^3.0.0" -+ } -+ }, -+ "supports-preserve-symlinks-flag": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", -+ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" -+ }, -+ "syntax-error": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz", -+ "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==", -+ "requires": { -+ "acorn-node": "^1.2.0" -+ } -+ }, -+ "tar": { -+ "version": "6.1.12", -+ "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.12.tgz", -+ "integrity": "sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw==", -+ "requires": { -+ "chownr": "^2.0.0", -+ "fs-minipass": "^2.0.0", -+ "minipass": "^3.0.0", -+ "minizlib": "^2.1.1", -+ "mkdirp": "^1.0.3", -+ "yallist": "^4.0.0" -+ }, -+ "dependencies": { -+ "mkdirp": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", -+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" -+ } -+ } -+ }, -+ "tar-fs": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", -+ "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", -+ "optional": true, -+ "requires": { -+ "chownr": "^1.1.1", -+ "mkdirp-classic": "^0.5.2", -+ "pump": "^3.0.0", -+ "tar-stream": "^2.1.4" -+ }, -+ "dependencies": { -+ "chownr": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", -+ "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", -+ "optional": true -+ } -+ } -+ }, -+ "tar-stream": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", -+ "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", -+ "optional": true, -+ "requires": { -+ "bl": "^4.0.3", -+ "end-of-stream": "^1.4.1", -+ "fs-constants": "^1.0.0", -+ "inherits": "^2.0.3", -+ "readable-stream": "^3.1.1" -+ }, -+ "dependencies": { -+ "readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "optional": true, -+ "requires": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ } -+ } -+ } -+ }, -+ "terser": { -+ "version": "3.17.0", -+ "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", -+ "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", -+ "requires": { -+ "commander": "^2.19.0", -+ "source-map": "~0.6.1", -+ "source-map-support": "~0.5.10" -+ }, -+ "dependencies": { -+ "commander": { -+ "version": "2.20.3", -+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", -+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" -+ }, -+ "source-map": { -+ "version": "0.6.1", -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", -+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" -+ } -+ } -+ }, -+ "text-table": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", -+ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" -+ }, -+ "through": { -+ "version": "2.3.8", -+ "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", -+ "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" -+ }, -+ "through2": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", -+ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", -+ "requires": { -+ "readable-stream": "~2.3.6", -+ "xtend": "~4.0.1" -+ } -+ }, -+ "thunky": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", -+ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==" -+ }, -+ "timers-browserify": { -+ "version": "1.4.2", -+ "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz", -+ "integrity": "sha512-PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q==", -+ "requires": { -+ "process": "~0.11.0" -+ } -+ }, -+ "to-fast-properties": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", -+ "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==" -+ }, -+ "to-readable-stream": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", -+ "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" -+ }, -+ "to-regex-range": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", -+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", -+ "requires": { -+ "is-number": "^7.0.0" -+ } -+ }, -+ "toidentifier": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", -+ "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" -+ }, -+ "touch": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", -+ "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", -+ "requires": { -+ "nopt": "~1.0.10" -+ }, -+ "dependencies": { -+ "nopt": { -+ "version": "1.0.10", -+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", -+ "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", -+ "requires": { -+ "abbrev": "1" -+ } -+ } -+ } -+ }, -+ "tough-cookie": { -+ "version": "2.5.0", -+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", -+ "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", -+ "requires": { -+ "psl": "^1.1.28", -+ "punycode": "^2.1.1" -+ }, -+ "dependencies": { -+ "punycode": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", -+ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" -+ } -+ } -+ }, -+ "transform-ast": { -+ "version": "2.4.4", -+ "resolved": "https://registry.npmjs.org/transform-ast/-/transform-ast-2.4.4.tgz", -+ "integrity": "sha512-AxjeZAcIOUO2lev2GDe3/xZ1Q0cVGjIMk5IsriTy8zbWlsEnjeB025AhkhBJHoy997mXpLd4R+kRbvnnQVuQHQ==", -+ "requires": { -+ "acorn-node": "^1.3.0", -+ "convert-source-map": "^1.5.1", -+ "dash-ast": "^1.0.0", -+ "is-buffer": "^2.0.0", -+ "magic-string": "^0.23.2", -+ "merge-source-map": "1.0.4", -+ "nanobench": "^2.1.1" -+ }, -+ "dependencies": { -+ "is-buffer": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", -+ "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==" -+ } -+ } -+ }, -+ "trim-newlines": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", -+ "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==" -+ }, -+ "trim-repeated": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", -+ "integrity": "sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==", -+ "requires": { -+ "escape-string-regexp": "^1.0.2" -+ } -+ }, -+ "true-case-path": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", -+ "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", -+ "requires": { -+ "glob": "^7.1.2" -+ } -+ }, -+ "tty-browserify": { -+ "version": "0.0.1", -+ "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", -+ "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==" -+ }, -+ "tunnel": { -+ "version": "0.0.6", -+ "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", -+ "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==", -+ "optional": true -+ }, -+ "tunnel-agent": { -+ "version": "0.6.0", -+ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", -+ "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", -+ "requires": { -+ "safe-buffer": "^5.0.1" -+ } -+ }, -+ "tweetnacl": { -+ "version": "0.14.5", -+ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", -+ "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" -+ }, -+ "type-check": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", -+ "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", -+ "requires": { -+ "prelude-ls": "^1.2.1" -+ } -+ }, -+ "type-fest": { -+ "version": "0.18.1", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", -+ "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==" -+ }, -+ "type-name": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/type-name/-/type-name-2.0.2.tgz", -+ "integrity": "sha512-kkgkuqR/jKdKO5oh/I2SMu2dGbLXoJq0zkdgbxaqYK+hr9S9edwVVGf+tMUFTx2gH9TN2+Zu9JZ/Njonb3cjhA==" -+ }, -+ "typedarray": { -+ "version": "0.0.6", -+ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", -+ "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" -+ }, -+ "typedarray-to-buffer": { -+ "version": "3.1.5", -+ "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", -+ "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", -+ "requires": { -+ "is-typedarray": "^1.0.0" -+ } -+ }, -+ "uglifyify": { -+ "version": "5.0.2", -+ "resolved": "https://registry.npmjs.org/uglifyify/-/uglifyify-5.0.2.tgz", -+ "integrity": "sha512-NcSk6pgoC+IgwZZ2tVLVHq+VNKSvLPlLkF5oUiHPVOJI0s/OlSVYEGXG9PCAH0hcyFZLyvt4KBdPAQBRlVDn1Q==", -+ "requires": { -+ "convert-source-map": "~1.1.0", -+ "minimatch": "^3.0.2", -+ "terser": "^3.7.5", -+ "through": "~2.3.4", -+ "xtend": "^4.0.1" -+ }, -+ "dependencies": { -+ "balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "requires": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "convert-source-map": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz", -+ "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==" -+ }, -+ "minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "requires": { -+ "brace-expansion": "^1.1.7" -+ } -+ } -+ } -+ }, -+ "umd": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz", -+ "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==" -+ }, -+ "undeclared-identifiers": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz", -+ "integrity": "sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==", -+ "requires": { -+ "acorn-node": "^1.3.0", -+ "dash-ast": "^1.0.0", -+ "get-assigned-identifiers": "^1.2.0", -+ "simple-concat": "^1.0.0", -+ "xtend": "^4.0.1" -+ } -+ }, -+ "undefsafe": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", -+ "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==" -+ }, -+ "unicode-canonical-property-names-ecmascript": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", -+ "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==" -+ }, -+ "unicode-match-property-ecmascript": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", -+ "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", -+ "requires": { -+ "unicode-canonical-property-names-ecmascript": "^2.0.0", -+ "unicode-property-aliases-ecmascript": "^2.0.0" -+ } -+ }, -+ "unicode-match-property-value-ecmascript": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz", -+ "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==" -+ }, -+ "unicode-property-aliases-ecmascript": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz", -+ "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==" -+ }, -+ "unique-filename": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", -+ "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", -+ "requires": { -+ "unique-slug": "^2.0.0" -+ } -+ }, -+ "unique-slug": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", -+ "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", -+ "requires": { -+ "imurmurhash": "^0.1.4" -+ } -+ }, -+ "unique-string": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", -+ "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", -+ "requires": { -+ "crypto-random-string": "^2.0.0" -+ } -+ }, -+ "universalify": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", -+ "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" -+ }, -+ "unix-crypt-td-js": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/unix-crypt-td-js/-/unix-crypt-td-js-1.1.4.tgz", -+ "integrity": "sha512-8rMeVYWSIyccIJscb9NdCfZKSRBKYTeVnwmiRYT2ulE3qd1RaDQ0xQDP+rI3ccIWbhu/zuo5cgN8z73belNZgw==" -+ }, -+ "update-browserslist-db": { -+ "version": "1.0.10", -+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", -+ "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", -+ "requires": { -+ "escalade": "^3.1.1", -+ "picocolors": "^1.0.0" -+ }, -+ "dependencies": { -+ "picocolors": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", -+ "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" -+ } -+ } -+ }, -+ "update-notifier": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz", -+ "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==", -+ "requires": { -+ "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" -+ }, -+ "dependencies": { -+ "ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "requires": { -+ "color-convert": "^2.0.1" -+ } -+ }, -+ "chalk": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", -+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -+ "requires": { -+ "ansi-styles": "^4.1.0", -+ "supports-color": "^7.1.0" -+ } -+ }, -+ "color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "requires": { -+ "color-name": "~1.1.4" -+ } -+ }, -+ "color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "has-flag": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" -+ }, -+ "supports-color": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -+ "requires": { -+ "has-flag": "^4.0.0" -+ } -+ } -+ } -+ }, -+ "upper-case": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", -+ "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==" -+ }, -+ "uri-js": { -+ "version": "4.4.1", -+ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", -+ "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", -+ "requires": { -+ "punycode": "^2.1.0" -+ }, -+ "dependencies": { -+ "punycode": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", -+ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" -+ } -+ } -+ }, -+ "url": { -+ "version": "0.11.0", -+ "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", -+ "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", -+ "requires": { -+ "punycode": "1.3.2", -+ "querystring": "0.2.0" -+ }, -+ "dependencies": { -+ "punycode": { -+ "version": "1.3.2", -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", -+ "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==" -+ } -+ } -+ }, -+ "url-parse-lax": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", -+ "integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==", -+ "requires": { -+ "prepend-http": "^2.0.0" -+ } -+ }, -+ "util": { -+ "version": "0.12.5", -+ "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", -+ "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", -+ "requires": { -+ "inherits": "^2.0.3", -+ "is-arguments": "^1.0.4", -+ "is-generator-function": "^1.0.7", -+ "is-typed-array": "^1.1.3", -+ "which-typed-array": "^1.1.2" -+ } -+ }, -+ "util-deprecate": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", -+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" -+ }, -+ "uuid": { -+ "version": "8.3.2", -+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", -+ "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" -+ }, -+ "v8-compile-cache": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", -+ "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==" -+ }, -+ "validate-npm-package-license": { -+ "version": "3.0.4", -+ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", -+ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", -+ "requires": { -+ "spdx-correct": "^3.0.0", -+ "spdx-expression-parse": "^3.0.0" -+ } -+ }, -+ "verror": { -+ "version": "1.10.0", -+ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", -+ "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==", -+ "requires": { -+ "assert-plus": "^1.0.0", -+ "core-util-is": "1.0.2", -+ "extsprintf": "^1.2.0" -+ }, -+ "dependencies": { -+ "core-util-is": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", -+ "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==" -+ } -+ } -+ }, -+ "vm-browserify": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", -+ "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" -+ }, -+ "watchify": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/watchify/-/watchify-4.0.0.tgz", -+ "integrity": "sha512-2Z04dxwoOeNxa11qzWumBTgSAohTC0+ScuY7XMenPnH+W2lhTcpEOJP4g2EIG/SWeLadPk47x++Yh+8BqPM/lA==", -+ "dev": true, -+ "requires": { -+ "anymatch": "^3.1.0", -+ "browserify": "^17.0.0", -+ "chokidar": "^3.4.0", -+ "defined": "^1.0.0", -+ "outpipe": "^1.1.0", -+ "through2": "^4.0.2", -+ "xtend": "^4.0.2" -+ }, -+ "dependencies": { -+ "readable-stream": { -+ "version": "3.6.0", -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", -+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", -+ "dev": true, -+ "requires": { -+ "inherits": "^2.0.3", -+ "string_decoder": "^1.1.1", -+ "util-deprecate": "^1.0.1" -+ } -+ }, -+ "through2": { -+ "version": "4.0.2", -+ "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", -+ "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", -+ "dev": true, -+ "requires": { -+ "readable-stream": "3" -+ } -+ } -+ } -+ }, -+ "webworkify": { -+ "version": "1.5.0", -+ "resolved": "https://registry.npmjs.org/webworkify/-/webworkify-1.5.0.tgz", -+ "integrity": "sha512-AMcUeyXAhbACL8S2hqqdqOLqvJ8ylmIbNwUIqQujRSouf4+eUFaXbG6F1Rbu+srlJMmxQWsiU7mOJi0nMBfM1g==" -+ }, -+ "which": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", -+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", -+ "requires": { -+ "isexe": "^2.0.0" -+ } -+ }, -+ "which-typed-array": { -+ "version": "1.1.9", -+ "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", -+ "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", -+ "requires": { -+ "available-typed-arrays": "^1.0.5", -+ "call-bind": "^1.0.2", -+ "for-each": "^0.3.3", -+ "gopd": "^1.0.1", -+ "has-tostringtag": "^1.0.0", -+ "is-typed-array": "^1.1.10" -+ } -+ }, -+ "wide-align": { -+ "version": "1.1.5", -+ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", -+ "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", -+ "requires": { -+ "string-width": "^1.0.2 || 2 || 3 || 4" -+ } -+ }, -+ "widest-line": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", -+ "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", -+ "requires": { -+ "string-width": "^4.0.0" -+ } -+ }, -+ "wolfy87-eventemitter": { -+ "version": "5.2.9", -+ "resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.9.tgz", -+ "integrity": "sha512-P+6vtWyuDw+MB01X7UeF8TaHBvbCovf4HPEMF/SV7BdDc1SMTiBy13SRD71lQh4ExFTG1d/WNzDGDCyOKSMblw==" -+ }, -+ "word-wrap": { -+ "version": "1.2.3", -+ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", -+ "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==" -+ }, -+ "wrap-ansi": { -+ "version": "7.0.0", -+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", -+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", -+ "requires": { -+ "ansi-styles": "^4.0.0", -+ "string-width": "^4.1.0", -+ "strip-ansi": "^6.0.0" -+ }, -+ "dependencies": { -+ "ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "requires": { -+ "color-convert": "^2.0.1" -+ } -+ }, -+ "color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "requires": { -+ "color-name": "~1.1.4" -+ } -+ }, -+ "color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ } -+ } -+ }, -+ "wrappy": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", -+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" -+ }, -+ "write-file-atomic": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", -+ "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", -+ "requires": { -+ "imurmurhash": "^0.1.4", -+ "is-typedarray": "^1.0.0", -+ "signal-exit": "^3.0.2", -+ "typedarray-to-buffer": "^3.1.5" -+ } -+ }, -+ "ws": { -+ "version": "8.6.0", -+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz", -+ "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==" -+ }, -+ "xdg-basedir": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", -+ "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==" -+ }, -+ "xmlbuilder": { -+ "version": "15.1.1", -+ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", -+ "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==" -+ }, -+ "xtend": { -+ "version": "4.0.2", -+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", -+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" -+ }, -+ "y18n": { -+ "version": "5.0.8", -+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", -+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" -+ }, -+ "yallist": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", -+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" -+ }, -+ "yargs": { -+ "version": "17.5.1", -+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz", -+ "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==", -+ "requires": { -+ "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" -+ }, -+ "dependencies": { -+ "yargs-parser": { -+ "version": "21.1.1", -+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", -+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==" -+ } -+ } -+ }, -+ "yargs-parser": { -+ "version": "20.2.9", -+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", -+ "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" -+ }, -+ "yauzl": { -+ "version": "2.10.0", -+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", -+ "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", -+ "requires": { -+ "buffer-crc32": "~0.2.3", -+ "fd-slicer": "~1.1.0" -+ } -+ } -+ } -+} diff --git a/pkgs/applications/audio/open-stage-control/update.sh b/pkgs/applications/audio/open-stage-control/update.sh index 58b0441438eb..30f1b4c293f1 100755 --- a/pkgs/applications/audio/open-stage-control/update.sh +++ b/pkgs/applications/audio/open-stage-control/update.sh @@ -14,7 +14,7 @@ nixeval() { } vendorhash() { - (nix --extra-experimental-features nix-command build --impure -f "$nixpkgs" --no-link "$1" 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true + (nix --extra-experimental-features nix-command build --impure --argstr nixpkgs "$nixpkgs" --argstr attr "$1" --expr '{ nixpkgs, attr }: let pkgs = import nixpkgs {}; in with pkgs.lib; (getAttrFromPath (splitString "." attr) pkgs).overrideAttrs (attrs: { outputHash = fakeHash; })' --no-link 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true } findpath() { @@ -32,7 +32,6 @@ attr="${UPDATE_NIX_ATTR_PATH:-open-stage-control}" version="$(cd "$nixpkgs" && list-git-tags --pname="$(nixeval "$attr".pname)" --attr-path="$attr" | grep '^v' | sed -e 's|^v||' | sort -V | tail -n1)" pkgpath="$(findpath "$attr")" -pkgdir="$(dirname "$pkgpath")" updated="$(cd "$nixpkgs" && update-source-version "$attr" "$version" --file="$pkgpath" --print-changes | jq -r length)" @@ -41,17 +40,6 @@ if [ "$updated" -eq 0 ]; then exit 0 fi -# Download package.json from the latest release -curl -sSL https://raw.githubusercontent.com/jean-emmanuel/open-stage-control/v"$version"/package.json | grep -v '"electron"\|"electron-installer-debian"' >"$pkgdir"/package.json - -# Lock dependencies with npm -(cd "$pkgdir" && npm install --package-lock-only --ignore-scripts --legacy-peer-deps) - -# Turn lock file into patch file -(cd "$pkgdir" && (diff -u /dev/null ./package-lock.json || [ $? -eq 1 ])) >"$pkgdir"/package-lock.json.patch - -rm -f "$pkgdir"/{package.json,package-lock.json} - # Update FOD hash curhash="$(nixeval "$attr.npmDeps.outputHash")" newhash="$(vendorhash "$attr.npmDeps")" diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/applications/audio/opustags/default.nix index 83cf44853a5a..357799a11226 100644 --- a/pkgs/applications/audio/opustags/default.nix +++ b/pkgs/applications/audio/opustags/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ ffmpeg glibcLocales perl ] ++ (with perlPackages; [ ListMoreUtils ]); + nativeCheckInputs = [ ffmpeg glibcLocales perl ] ++ (with perlPackages; [ ListMoreUtils ]); checkPhase = '' export LANG="en_US.UTF-8" diff --git a/pkgs/applications/audio/osdlyrics/default.nix b/pkgs/applications/audio/osdlyrics/default.nix index ccac79763114..3dd43fe3044c 100644 --- a/pkgs/applications/audio/osdlyrics/default.nix +++ b/pkgs/applications/audio/osdlyrics/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "osdlyrics"; - version = "0.5.12"; + version = "0.5.13"; src = fetchFromGitHub { owner = "osdlyrics"; repo = "osdlyrics"; rev = version; - sha256 = "sha256-QGgwxmurdwo0xyq7p+1xditRebv64ewGTvNJI7MUnq4="; + sha256 = "sha256-E4pVXopqQYJW+a5nUf9dMabxJ9nYPu3C2ti8LlY470c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index ac3df5c5f958..65d58ffd5774 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -1,19 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, boost, libpulseaudio }: +{ lib +, stdenv +, fetchFromGitHub +, boost +, cxxopts +, libpulseaudio +, meson +, ninja +, pkg-config +}: stdenv.mkDerivation rec { pname = "pamixer"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "cdemoulins"; repo = "pamixer"; rev = version; - sha256 = "sha256-7VNhHAQ1CecQPlqb8SMKK0U1SsFZxDuS+QkPqJfMqrQ="; + hash = "sha256-LbRhsW2MiTYWSH6X9Pz9XdJdH9Na0QCO8CFmlzZmDjQ="; }; - buildInputs = [ boost libpulseaudio ]; + nativeBuildInputs = [ pkg-config meson ninja ]; - makeFlags = [ "PREFIX=$(out)" ]; + buildInputs = [ boost cxxopts libpulseaudio ]; meta = with lib; { description = "Pulseaudio command line mixer"; diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix index 1d701004622e..5e781a9f5115 100644 --- a/pkgs/applications/audio/paulstretch/default.nix +++ b/pkgs/applications/audio/paulstretch/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { special effects by "spectral smoothing" the sounds. It can transform any sound/music to a texture. ''; - homepage = "http://hypermammut.sourceforge.net/paulstretch/"; + homepage = "https://hypermammut.sourceforge.net/paulstretch/"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix index 308d5b65f3e5..55ab6261aa9e 100644 --- a/pkgs/applications/audio/pianoteq/default.nix +++ b/pkgs/applications/audio/pianoteq/default.nix @@ -93,14 +93,11 @@ let fetchWithCurlScript { inherit name sha256; script = '' - "''${curl[@]}" --silent --request POST \ + "''${curl[@]}" --silent --request GET \ --cookie cookies \ - --header "modartt-json: request" \ - --header "origin: https://www.modartt.com" \ - --header "content-type: application/json; charset=UTF-8" \ - --header "accept: application/json, text/javascript, */*" \ - --data-raw '{"file": "${name}", "get": "url"}' \ - https://www.modartt.com/json/download -o /dev/null + --header "accept: */*" \ + https://www.modartt.com/ -o /dev/null + json=$( "''${curl[@]}" --silent --request POST \ --cookie cookies \ @@ -109,8 +106,9 @@ let --header "content-type: application/json; charset=UTF-8" \ --header "accept: application/json, text/javascript, */*" \ --data-raw '{"file": "${name}", "get": "url"}' \ - https://www.modartt.com/json/download + https://www.modartt.com/api/0/download ) + url=$(echo $json | ${jq}/bin/jq -r .url) "''${curl[@]}" --progress-bar --cookie cookies -o $out "$url" ''; @@ -140,7 +138,7 @@ let --header "content-type: application/json; charset=UTF-8" \ --header "accept: application/json, text/javascript, */*" \ --data @login.json \ - https://www.modartt.com/json/session + https://www.modartt.com/api/0/session json=$( "''${curl[@]}" --silent --request POST \ @@ -150,10 +148,10 @@ let --header "content-type: application/json; charset=UTF-8" \ --header "accept: application/json, text/javascript, */*" \ --data-raw '{"file": "${name}", "get": "url"}' \ - https://www.modartt.com/json/download + https://www.modartt.com/api/0/download ) - url=$(echo $json | ${jq}/bin/jq -r .url) + url=$(echo $json | ${jq}/bin/jq -r .url) "''${curl[@]}" --progress-bar --cookie cookies -o $out "$url" ''; }; @@ -162,20 +160,20 @@ in { # TODO currently can't install more than one because `lame` clashes stage-trial = mkPianoteq rec { name = "stage-trial"; - version = "7.5.4"; + version = "8.0.5"; archdir = "x86-64bit"; src = fetchPianoteqTrial { name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z"; - sha256 = "sha256-ybtq+hjnaQxpLxv2KE0ZcbQXtn5DJJsnMwCmh3rlrIc="; + sha256 = "sha256-9Lo4e1SM1gw2/+TmpDUdZCOQcHEpT/aaG6P80/GRPQY="; }; }; standard-trial = mkPianoteq rec { name = "standard-trial"; - version = "7.5.4"; + version = "8.0.5"; archdir = "x86-64bit"; src = fetchPianoteqTrial { name = "pianoteq_linux_trial_v${versionForFile version}.7z"; - sha256 = "sha256-3a3+SKTEhvDtqK5Kg4E6KiLvn5+j6JN6ntIb72u2bdQ="; + sha256 = "sha256-qxViVIbld8zTMj1+TIfOsIOhmujOGJux2/u2J4hvsqw="; }; }; stage-6 = mkPianoteq rec { diff --git a/pkgs/applications/audio/pianotrans/default.nix b/pkgs/applications/audio/pianotrans/default.nix new file mode 100644 index 000000000000..89e0716a0adc --- /dev/null +++ b/pkgs/applications/audio/pianotrans/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchFromGitHub +, python3 +, ffmpeg +}: + +python3.pkgs.buildPythonApplication rec { + pname = "pianotrans"; + version = "1.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "azuwis"; + repo = pname; + rev = "v${version}"; + hash = "sha256-6Otup1Yat1dBZdSoR4lDfpytUQ2RbDXC6ieo835Nw+U="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + piano-transcription-inference + torch + tkinter + ]; + + # Project has no tests + doCheck = false; + + makeWrapperArgs = [ + ''--prefix PATH : "${lib.makeBinPath [ ffmpeg ]}"'' + ]; + + meta = with lib; { + description = "Simple GUI for ByteDance's Piano Transcription with Pedals"; + homepage = "https://github.com/azuwis/pianotrans"; + license = licenses.mit; + maintainers = with maintainers; [ azuwis ]; + }; +} diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 9db6656dd38d..4e7323b128b3 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -19,24 +19,15 @@ let in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.8.3"; + version = "2.8.5"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "refs/tags/release-${version}"; - sha256 = "sha256-KUHciIlwaKXvyCCkAzdh1vpe9cunDizrMUl0SoCpxgY="; + sha256 = "sha256-ukqlAXGaqX89U77cM9Ux0RYquT31Ho8ri1Ue7S3+MwQ="; }; - patches = [ - # fix for tests failing with newer mutagen, remove after >2.8.3 - # https://tickets.metabrainz.org/browse/PICARD-2583 - (fetchpatch { - url = "https://github.com/metabrainz/picard/commit/76c2dff6b61140bbc7675c9e9f62a086b885e539.patch"; - hash = "sha256-V1/oq1tEcb1mtqbYAA9o7mJcw16vRO0IK3GGmJkwO1Q="; - }) - ]; - nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] ++ lib.optionals (pyqt5.multimediaEnabled) [ qt5.qtmultimedia.bin @@ -71,6 +62,7 @@ pythonPackages.buildPythonApplication rec { meta = with lib; { homepage = "https://picard.musicbrainz.org/"; + changelog = "https://picard.musicbrainz.org/changelog/"; description = "The official MusicBrainz tagger"; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/pipecontrol/default.nix b/pkgs/applications/audio/pipecontrol/default.nix index a2abab72ec69..dacfd63164af 100644 --- a/pkgs/applications/audio/pipecontrol/default.nix +++ b/pkgs/applications/audio/pipecontrol/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "pipecontrol"; - version = "0.2.4"; + version = "0.2.8"; src = fetchFromGitHub { owner = "portaloffreedom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F3faJMkvjAY6A5ieNpAxjk6BHPb6uCvYYfwrI9/Iskg="; + sha256 = "sha256-x33L/oLgJFiHp19FzinVuGT9k73wOhdSaTTemq52ZVg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index ae9ab6229e2f..df008d1cfb33 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "4.5.2"; + version = "4.6.1"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "/0CW5S5n4xh9FF/Sfxl3H0bNCpbUfz4ik4ptVTIwvEcXw2NoKS5dLxFSTn9lfVZAV+UfzSqcrWH5HknN+o5wQw=="; + sha512 = "9wkhSDn7kvj6pqCawTJDBO8HfYe8eEYtAR1Bi9/fxiOBXRYUUHEZzSGLF9QoTVYMuGGHeX35c+QvnA2VsdsWCw=="; }; 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/47"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/48"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/pms/default.nix b/pkgs/applications/audio/pms/default.nix new file mode 100644 index 000000000000..bb6d018efe4a --- /dev/null +++ b/pkgs/applications/audio/pms/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule { + pname = "pms"; + version = "unstable-2022-11-12"; + + src = fetchFromGitHub { + owner = "ambientsound"; + repo = "pms"; + rev = "40d6e37111293187ab4542c7a64bd73d1b13974f"; + sha256 = "sha256-294MiS4c2PO2lFSSRrg8ns7sXzZsEUAqPG3q2z3TRUg="; + }; + + vendorHash = "sha256-XNFzG4hGDUN0wWbpBoQWUH1bWIgoYcyP4tNRGSV4ro4="; + + meta = with lib; { + description = "An interactive Vim-like console client for MPD"; + homepage = "https://ambientsound.github.io/pms/"; + license = licenses.mit; + maintainers = with maintainers; [ deejayem ]; + }; +} diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 5dd17a74f491..519f59a1d89d 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.3"; + version = "6.3.05"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-/XSBUM6HkANATl1Y9vs8mQFgBTyVeCv8TxcaIdP/Nm8="; + sha256 = "sha256-0e225cmP0CSYjRYNEXi4Oqq9o8XR2N7bNS1X5x+mQKw="; }; configurePhase = '' diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index bbabcb45187e..b0aa2ae19ba1 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.53.1"; + version = "1.57"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-7qBvv4D86uX8oqqJ+UDI+fbaG5g1+Zg1otuU9lqyTdo="; + sha256 = "sha256-YUGTcL/k+MbAnB/kcWPEmrGxGF/kSHdIgdBVUqCsDWM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix index 842b8f0aa070..9f35ea4c4e71 100644 --- a/pkgs/applications/audio/ptcollab/default.nix +++ b/pkgs/applications/audio/ptcollab/default.nix @@ -38,9 +38,7 @@ mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index ef31c2a6ee99..74668b03f2b3 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -1,17 +1,23 @@ -{ lib, python3Packages, fetchFromGitHub, installShellFiles }: +{ lib +, python3Packages +, fetchFromGitHub +, installShellFiles +}: python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.9.28"; + version = "0.9.0"; src = fetchFromGitHub { owner = "coderholic"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-0j0AQZk+WEkcRTL/peAxzRw23gThlGtMnqoms2aUCrc="; + hash = "sha256-8Kr+DRbkTKvhetIIs4htOHlIXGLpoe+T+0yxjm/JcWk="; }; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; propagatedBuildInputs = with python3Packages; [ requests @@ -30,6 +36,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "http://www.coderholic.com/pyradio/"; description = "Curses based internet radio player"; + changelog = "https://github.com/coderholic/pyradio/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ contrun ]; }; diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 434be82f6fb3..a9cc966af2ed 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - version = "0.9.7"; + version = "0.9.8"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally @@ -13,8 +13,8 @@ mkDerivation rec { src = fetchFromGitHub { owner = "rncbc"; repo = "qjackctl"; - rev = "${pname}_${lib.replaceChars ["."] ["_"] version}"; - sha256 = "sha256-PchW9cM5qEP51G9RXUZ3j/AvKqTkgNiw3esqSQqsy0M="; + rev = "${pname}_${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "sha256-GEnxxYul4qir/92hGq4L+29dnpy1MxHonM1llkzSLPw="; }; buildInputs = [ diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 6eea4562de99..00931a21011c 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -1,21 +1,19 @@ -{ lib, mkDerivation, fetchurl, cmake, pkg-config -, qtbase, qttools, qtmultimedia, qtx11extras +{ lib, stdenv, fetchurl, cmake, pkg-config +, qtbase, qttools, qtmultimedia, wrapQtAppsHook # transports , curl, libmms # input plugins , libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile -, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi +, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi, libbs2b, game-music-emu # output plugins -, alsa-lib, libpulseaudio +, alsa-lib, libpulseaudio, pipewire # effect plugins , libsamplerate }: # Additional plugins that can be added: # wavpack (https://www.wavpack.com/) -# gme (Game music support) # Ogg Opus support -# BS2B effect plugin (http://bs2b.sourceforge.net/) # JACK audio support # ProjectM visualization plugin @@ -28,26 +26,27 @@ # Qmmp installs working .desktop file(s) all by itself, so we don't need to # handle that. -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qmmp"; - version = "1.4.4"; + version = "2.1.2"; src = fetchurl { - url = "https://qmmp.ylsoftware.com/files/${pname}-${version}.tar.bz2"; - sha256 = "sha256-sZRZVhCf2ceETuV4AULA0kVkuIMn3C+aYdKThqvPnVQ="; + url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2"; + hash = "sha256-U86LoAkg6mBFVa/cgB8kpCa5KwdkR0PMQmAGvf/KAXo="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + buildInputs = [ # basic requirements - qtbase qttools qtmultimedia qtx11extras + qtbase qttools qtmultimedia # transports curl libmms # input plugins libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile - libcdio cdparanoia libcddb faad2 ffmpeg wildmidi + libcdio cdparanoia libcddb faad2 ffmpeg wildmidi libbs2b game-music-emu # output plugins - alsa-lib libpulseaudio + alsa-lib libpulseaudio pipewire # effect plugins libsamplerate ]; diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index e9b6e76368e9..3e0206a654bf 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.3.6"; + version = "0.3.9"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-uN3SAmpurINV+7vw51fWdwnuW2yBxnedY6BXdwn/S2s="; + sha256 = "sha256-KGZ67FF3WlKwUzVV3qz1DR/7i1mXsfXVVyuNoIR9uP0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index c5f02d7085de..f0dc71aa4775 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -97,6 +97,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-base gstreamer ] ++ lib.optionals (withGstPlugins) [ + gst-libav gst-plugins-bad gst-plugins-good gst-plugins-ugly @@ -118,8 +119,8 @@ python3.pkgs.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; - checkInputs = [ - dbus.daemon + nativeCheckInputs = [ + dbus gdk-pixbuf glibcLocales hicolor-icon-theme @@ -154,7 +155,7 @@ python3.pkgs.buildPythonApplication rec { runHook preCheck xvfb-run -s '-screen 0 1920x1080x24' \ - dbus-run-session --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf \ pytest $pytestFlags runHook postCheck diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/applications/audio/r128gain/default.nix index c02ee512669a..8cf6871a76b4 100644 --- a/pkgs/applications/audio/r128gain/default.nix +++ b/pkgs/applications/audio/r128gain/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ crcmod ffmpeg-python mutagen tqdm ]; - checkInputs = with python3Packages; [ requests sox ]; + nativeCheckInputs = with python3Packages; [ requests sox ]; # Testing downloads media files for testing, which requires the # sandbox to be disabled. diff --git a/pkgs/applications/audio/radioboat/default.nix b/pkgs/applications/audio/radioboat/default.nix index bd73237f79f6..729a56c0f723 100644 --- a/pkgs/applications/audio/radioboat/default.nix +++ b/pkgs/applications/audio/radioboat/default.nix @@ -42,7 +42,7 @@ buildGoModule rec { ''; passthru = { - updateScript = nix-update-script { attrPath = pname; }; + updateScript = nix-update-script { }; tests.version = testers.testVersion { package = radioboat; command = "radioboat version"; diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 178b63797835..1d638c01f205 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}" ]; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; doCheck = !stdenv.isAarch64; # single failure that I can't explain preFixup = '' diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 6b09e086fa3d..542e47cd16b7 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -9,6 +9,7 @@ , ffmpeg , vlc , xdg-utils +, xdotool , which , jackSupport ? true @@ -22,13 +23,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "6.66"; + version = "6.73"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; hash = { - x86_64-linux = "sha256-kMXHHd+uIc5tKlDlxKjphZsfNMYvvV/4Zx84eRwPGcs="; - aarch64-linux = "sha256-pB3qj9CJbI5iWBNKNX2niIfHrpSz9+qotX/zKGYDwYo="; + x86_64-linux = "sha256-omQ2XdL4C78BQRuYKy90QlMko2XYHoVhd4X0C+Zyp8E="; + aarch64-linux = "sha256-XHohznrfFMHHgif4iFrpXb0FNddYiBb0gB7ZznlU834="; }.${stdenv.hostPlatform.system}; }; @@ -69,7 +70,7 @@ stdenv.mkDerivation rec { # seem to have an effect for some plugins. # We opt for wrapping the executable with LD_LIBRARY_PATH prefix. wrapProgram $out/opt/REAPER/reaper \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ lame ffmpeg vlc ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ lame ffmpeg vlc xdotool ]}" mkdir $out/bin ln -s $out/opt/REAPER/reaper $out/bin/ diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 1be3f53dce5f..44dbff6077bc 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -1,15 +1,13 @@ { lib, stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsa-lib , mpg123, releasePath ? null }: -with lib; - # To use the full release version: # 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. let - urlVersion = replaceStrings [ "." ] [ "_" ]; + urlVersion = lib.replaceStrings [ "." ] [ "_" ]; in stdenv.mkDerivation rec { @@ -80,7 +78,7 @@ stdenv.mkDerivation rec { description = "Modern tracker-based DAW"; homepage = "https://www.renoise.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + license = lib.licenses.unfree; maintainers = []; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch index fed5a2ea5e1d..0b2cab3975e5 100644 --- a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch +++ b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch @@ -1,5 +1,3 @@ -diff --git a/SConstruct b/SConstruct -index 3ad4d9a..fb02365 100644 --- a/SConstruct +++ b/SConstruct @@ -94,11 +94,8 @@ def CheckWiX(context): @@ -16,13 +14,15 @@ index 3ad4d9a..fb02365 100644 def validate_spd_version(key,val,env): m=re.match(r"^\d+\.\d+",val) -@@ -208,9 +205,9 @@ def create_base_env(user_vars): +@@ -207,10 +204,10 @@ def create_base_env(user_vars): + env_args["LIBS"]=[] env_args["package_name"]="RHVoice" env_args["CPPDEFINES"]=[("RHVOICE","1")] - env=Environment(**env_args) +- env=Environment(**env_args) - if env["dev"]: - env["prefix"]=os.path.abspath("local") - env["RPATH"]=env.Dir("$libdir").abspath ++ env=Environment(ENV = os.environ, **env_args) + env.PrependENVPath("PATH", os.environ["PATH"]) + env["ENV"]["PKG_CONFIG_PATH"]=os.environ["PKG_CONFIG_PATH"] + env["RPATH"]=env.Dir("$libdir").abspath diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 853613c9a5f5..fe9f4a835c84 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { libnotify ] ++ gst_plugins; - checkInputs = [ + nativeCheckInputs = [ check ]; diff --git a/pkgs/applications/audio/roomeqwizard/default.nix b/pkgs/applications/audio/roomeqwizard/default.nix index b02ab65cd87c..acb7ae6e43a1 100644 --- a/pkgs/applications/audio/roomeqwizard/default.nix +++ b/pkgs/applications/audio/roomeqwizard/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { version = "5.20.5"; src = fetchurl { - url = "https://www.roomeqwizard.com/installers/REW_linux_${lib.replaceChars [ "." ] [ "_" ] version}.sh"; + url = "https://www.roomeqwizard.com/installers/REW_linux_${lib.replaceStrings [ "." ] [ "_" ] version}.sh"; sha256 = "NYTRiOZmwkni4k+jI2SV84z5umO7+l+eKpwPCdlDD3U="; }; diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index dd0112d82162..0a82a4671db2 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "rosegarden"; - version = "20.12"; + version = "22.12.1"; src = fetchurl { url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2"; - sha256 = "sha256-iGaEr8WFipV4I00fhFGI2xMBFPf784IIxNXs2hUTHFs="; + sha256 = "sha256-fqeif37lxJeBcI+cYVpRkZuJImSlmeZO3yzSNzPZkgY="; }; postPhase = '' diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix index 12a7ab0325eb..d578a4f30784 100644 --- a/pkgs/applications/audio/sayonara/default.nix +++ b/pkgs/applications/audio/sayonara/default.nix @@ -63,9 +63,7 @@ mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/audio/sc68/default.nix b/pkgs/applications/audio/sc68/default.nix index 3f6bb032ec4f..a779576d05d9 100644 --- a/pkgs/applications/audio/sc68/default.nix +++ b/pkgs/applications/audio/sc68/default.nix @@ -13,21 +13,32 @@ stdenv.mkDerivation rec { pname = "sc68"; - version = "unstable-2021-08-23"; + version = "unstable-2022-11-24"; src = fetchsvn { url = "svn://svn.code.sf.net/p/sc68/code/"; - rev = "694"; - sha256 = "1yycnr4ndzfhbmki41c30zskwyizpb9wb8sf0gxcprllmbq6a421"; + rev = "695"; + sha256 = "sha256-RO3Yhjalu49BUM0fYOZtI2l6KbuUuw03whRxlKneabo="; }; preConfigure = "tools/svn-bootstrap.sh"; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config which autoconf automake libtool hexdump ]; + nativeBuildInputs = [ + autoconf + automake + hexdump + libtool + pkg-config + which + ]; - buildInputs = [ libao zlib curl ]; + buildInputs = [ + curl + libao + zlib + ]; meta = with lib; { description = "Atari ST and Amiga music player"; diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index 95a40b1a998e..7abe0e15de6b 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -39,9 +39,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index 5aa407a15023..8fd514abea51 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Simple audio oscilloscope with variable time scale, triggering, cursors and numeric readout in LV2 plugin format"; homepage = "http://x42.github.io/sisco.lv2/"; license = licenses.gpl2; - maintainers = [ maintainers.e-user ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 612d18f13571..558948ab4a0d 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, darwin +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config , alsa-lib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr +, IOKit, AudioToolbox , aixlog, popl , pulseaudioSupport ? false, libpulseaudio , nixosTests }: @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { aixlog popl soxr ] ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.AudioToolbox]; + ++ lib.optionals stdenv.isDarwin [ IOKit AudioToolbox ]; TARGET=lib.optionalString stdenv.isDarwin "MACOS"; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index bcb254ad87cc..86f5cf83ad40 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.5"; + version = "23.0"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-a/nYq6Cfbx93jfA6I8it+U0U36dOAFSpRis32spPks4="; + sha256 = "sha256-WnQtXr1IcOpNJBrSvLf2rNu2XPs8JU01LWsQSzvvivA="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 1f5bb36a5144..8d10b2f2a34b 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { fmt ]; - checkInputs = [ + nativeCheckInputs = [ parallel ruby supercollider-with-sc3-plugins diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index 1cad71ae2973..35fb524ab301 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , which @@ -8,7 +10,7 @@ , libxml2 , libjack2 , libsndfile -, wxGTK30 +, wxGTK32 , libsigcxx , libsamplerate , rubberband @@ -20,28 +22,41 @@ stdenv.mkDerivation rec { pname = "sooperlooper"; - version = "1.7.4"; + version = "1.7.8"; src = fetchFromGitHub { owner = "essej"; repo = "sooperlooper"; - rev = "v${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1jng9bkb7iikad0dy1fkiq9wjjdhh1xi1p0cp2lvnz1dsc4yk6iw"; + rev = "v${version}"; + sha256 = "sha256-Lrsz/UDCgoac63FJ3CaPVaYwvBtzkGQQRLhUi6lUusE="; }; + patches = [ + (fetchpatch { + name = "10-build_with_wx_32.patch"; + url = "https://sources.debian.org/data/main/s/sooperlooper/1.7.8~dfsg0-2/debian/patches/10-build_with_wx_32.patch"; + sha256 = "sha256-NF/w+zgRBNkSTqUJhfH9kQogXSYEF70pCN+loR0hjpg="; + }) + ]; + autoreconfPhase = '' patchShebangs ./autogen.sh ./autogen.sh ''; - nativeBuildInputs = [ autoreconfHook pkg-config which libtool ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + which + libtool + ]; buildInputs = [ liblo libxml2 libjack2 libsndfile - wxGTK30 + wxGTK32 libsigcxx libsamplerate rubberband @@ -62,7 +77,7 @@ stdenv.mkDerivation rec { However, this kind of live performance looping tool is most effectively used via hardware (midi footpedals, etc) and the engine can be run standalone on a computer without a monitor. ''; - homepage = "http://essej.net/sooperlooper/"; # https is broken + homepage = "https://sonosaurus.com/sooperlooper/"; license = licenses.gpl2; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/soundconverter/default.nix b/pkgs/applications/audio/soundconverter/default.nix index c0966e9ab3fd..208d50a2773c 100644 --- a/pkgs/applications/audio/soundconverter/default.nix +++ b/pkgs/applications/audio/soundconverter/default.nix @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec { python3Packages.pygobject3 ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run ]; diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/applications/audio/soundtracker/default.nix index 251725ea6b29..48acd5517179 100644 --- a/pkgs/applications/audio/soundtracker/default.nix +++ b/pkgs/applications/audio/soundtracker/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "soundtracker"; - version = "1.0.2.1"; + version = "1.0.3"; src = fetchurl { # Past releases get moved to the "old releases" directory. @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Nonetheless, only the name of the file seems to affect which file is # downloaded, so this path should be fine both for old and current releases. url = "mirror://sourceforge/soundtracker/soundtracker-${version}.tar.xz"; - sha256 = "0nh0dwz8nldc040q6n06vlazhss8ms42r2dffhjcrqj3hbrvfx82"; + sha256 = "sha256-k+TB1DIauOIeQSCVV5uYu69wwRx7vCRAlSCTAtDguKo="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/applications/audio/soundux/default.nix b/pkgs/applications/audio/soundux/default.nix new file mode 100644 index 000000000000..f6616e58353e --- /dev/null +++ b/pkgs/applications/audio/soundux/default.nix @@ -0,0 +1,142 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, makeBinaryWrapper +, pipewire +, libpulseaudio +, libappindicator +, libstartup_notification +, openssl +, libwnck +, pcre +, util-linux +, libselinux +, libsepol +, libthai +, libdatrie +, xorg +, libxkbcommon +, libepoxy +, dbus +, at-spi2-core +, nlohmann_json +, fancypp +, httplib +, semver-cpp +, webkitgtk +, yt-dlp +, ffmpeg +, lsb-release +}: + +stdenv.mkDerivation rec { + pname = "soundux"; + version = "0.2.7"; + + src = fetchFromGitHub { + owner = "Soundux"; + repo = "Soundux"; + rev = version; + sha256 = "sha256-aSCsg6nJt6F+6O7UeXnvYva0vllTfsxK/cjaeOhObZY="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + pkg-config + makeBinaryWrapper + ]; + + buildInputs = [ + pipewire + libpulseaudio + libappindicator + openssl + libwnck + pcre + util-linux + libselinux + libsepol + libthai + libdatrie + xorg.libXdmcp + xorg.libXtst + xorg.libXres + libxkbcommon + libepoxy + dbus + at-spi2-core + nlohmann_json + fancypp + httplib + semver-cpp + libstartup_notification + webkitgtk + yt-dlp + ffmpeg + ]; + + postPatch = '' + # cannot be overwritten with variables + substituteInPlace CMakeLists.txt \ + --replace "set(CMAKE_INSTALL_PREFIX \"/opt/soundux\" CACHE PATH \"Install path prefix, prepended onto install directories.\" FORCE)" "" \ + --replace "/usr/share" "$out/usr/share" + substituteInPlace src/ui/impl/webview/webview.cpp \ + --replace "/usr/share/pixmaps/soundux.png" "$out/share/pixmaps/soundux.png" + ''; + + # We need to append /opt to our CMAKE_INSTALL_PREFIX + dontAddPrefix = true; + + preConfigure = '' + # This needs to be set in preConfigure to access the $prefix variable + export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix/opt $cmakeFlags" + + # Replace some fetched submodules with symlinks nix packages. + rm -rf \ + lib/json \ + lib/fancypp \ + lib/lib-httplib \ + lib/semver + + ln -s ${nlohmann_json} lib/json + ln -s ${fancypp} lib/fancypp + ln -s ${httplib} lib/lib-httplib + ln -s ${semver-cpp} lib/semver + ''; + + # Somehow some of the install destination paths in the build system still + # gets transformed to point to /var/empty/share, even though they are at least + # relative to the nix output directory with our earlier patching. + postInstall = '' + mv "$out/var/empty/share" "$out" + rm -rf "$out/var" + mkdir "$out/bin" + ln -s "$out/opt/soundux" "$out/bin" + substituteInPlace "$out/share/applications/soundux.desktop" \ + --replace "/opt/soundux/soundux" "soundux" + ''; + + postFixup = let + rpaths = lib.makeLibraryPath [libwnck pipewire libpulseaudio]; + in '' + # Wnck, PipeWire, and PulseAudio are dlopen-ed by Soundux, so they do + # not end up on the RPATH during the build process. + patchelf --add-rpath "${rpaths}" "$out/opt/soundux-${version}" + + # Work around upstream bug https://github.com/Soundux/Soundux/issues/435 + wrapProgram "$out/bin/soundux" \ + --set WEBKIT_DISABLE_COMPOSITING_MODE 1 \ + --prefix PATH : ${lib.makeBinPath [ yt-dlp ffmpeg lsb-release ]} \ + ''; + + meta = with lib; { + description = "A cross-platform soundboard."; + homepage = "https://soundux.rocks/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ aidalgol ]; + }; +} diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix index 1a73b8adea72..0c1aa5fa0e2f 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/applications/audio/spek/default.nix @@ -1,22 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK32, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "spek"; - version = "unstable-2018-12-29"; + version = "0.8.4"; src = fetchFromGitHub { owner = "alexkay"; repo = "spek"; - rev = "f071c2956176ad53c7c8059e5c00e694ded31ded"; - sha256 = "1l9gj9c1n92zlcjnyjyk211h83dk0idk644xnm5rs7q40p2zliy5"; + rev = "v${version}"; + sha256 = "sha256-JLQx5LlnVe1TT1KVO3/QSVRqYL+pAMCxoDWrnkUNmRU="; }; - # needed for autoreconfHook - AUTOPOINT="intltoolize --automake --copy"; - nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; - buildInputs = [ ffmpeg wxGTK30-gtk3 wxGTK30-gtk3.gtk ]; + buildInputs = [ ffmpeg wxGTK32 gtk3 ]; meta = with lib; { description = "Analyse your audio files by showing their spectrogram"; diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix index 31724eff9dc3..568898d5cbfe 100644 --- a/pkgs/applications/audio/spot/default.nix +++ b/pkgs/applications/audio/spot/default.nix @@ -72,9 +72,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix new file mode 100644 index 000000000000..b15031a52914 --- /dev/null +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -0,0 +1,53 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, cmake +, alsa-lib +, dbus +, fontconfig +}: + +rustPlatform.buildRustPackage rec { + pname = "spotify-player"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "aome510"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-bHPWpx8EJibr2kNuzuGAQPZ0DE6qeJwIRYDy+NFS/PQ="; + }; + + cargoSha256 = "sha256-QeQ3PYI5RmbJ+VQ9hLSTXgQXVVoID5zbRqSTrbWzVy8="; + + nativeBuildInputs = [ + pkg-config + cmake + ]; + + buildInputs = [ + openssl + alsa-lib + dbus + fontconfig + ]; + + buildNoDefaultFeatures = true; + + buildFeatures = [ + "rodio-backend" + "media-control" + "image" + "lyric-finder" + ]; + + meta = with lib; { + description = "A command driven spotify player"; + homepage = "https://github.com/aome510/spotify-player"; + mainProgram = "spotify_player"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index bfeb8a7dab3a..274b054955b7 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -9,16 +9,16 @@ rustPackages.rustPlatform.buildRustPackage rec { pname = "spotifyd"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "Spotifyd"; repo = "spotifyd"; rev = "v${version}"; - sha256 = "1liql2wp7cx0x4ha1578wx3m4byd295m4ph268s05yw2wrnr3v6c"; + sha256 = "sha256-9zwHBDrdvE2R/cdrWgjsfHlm3wEZ9SB2VNcqezB/Op0="; }; - cargoSha256 = "1plvqd55d1gj0ydimv3154pwgj2sh1fqx2182nw8akzdfmzg1150"; + cargoSha256 = "sha256-fQm7imXpm5AcKdg0cU/Rf2mAeg2ebZKRisJZSnG0REI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/sptlrx/default.nix b/pkgs/applications/audio/sptlrx/default.nix index 7b31325164b8..aa0d85a6cbdd 100644 --- a/pkgs/applications/audio/sptlrx/default.nix +++ b/pkgs/applications/audio/sptlrx/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; passthru = { - updateScript = nix-update-script { attrPath = pname; }; + updateScript = nix-update-script { }; tests.version = testers.testVersion { package = sptlrx; version = "v${version}"; # needed because testVersion uses grep -Fw diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index f5f1feacb00c..fa63fee80065 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation { pname = binName; # versions are specified in `squeezelite.h` # see https://github.com/ralph-irving/squeezelite/issues/29 - version = "1.9.9.1411"; + version = "1.9.9.1419"; src = fetchFromGitHub { owner = "ralph-irving"; repo = "squeezelite"; - rev = "ca44fc6e258bb413d6281d927063b25940f42e5c"; - hash = "sha256-aZ+2nyy6tK3VwgTCWGoNaU4//kkHUzd6DZSfTEIgbvY="; + rev = "226efa300c4cf037e8486bad635e9deb3104636f"; + hash = "sha256-ZZWliw1prFbBZMFp0QmXg6MKuHPNuFh2lFxQ8bbuWAM="; }; buildInputs = [ flac libmad libvorbis mpg123 ] @@ -60,7 +60,7 @@ stdenv.mkDerivation { EXECUTABLE = binName; - OPTS = [ "-DLINKALL" ] + OPTS = [ "-DLINKALL" "-DGPIO" ] ++ optional dsdSupport "-DDSD" ++ optional (!faad2Support) "-DNO_FAAD" ++ optional ffmpegSupport "-DFFMPEG" diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix index 1ac1d6658f8d..d6d776c86058 100644 --- a/pkgs/applications/audio/ssrc/default.nix +++ b/pkgs/applications/audio/ssrc/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; version = version; - homepage = "http://shibatch.sourceforge.net/"; + homepage = "https://shibatch.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ leenaars]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/applications/audio/stochas/default.nix index d295689716b2..84376a1bbe9e 100644 --- a/pkgs/applications/audio/stochas/default.nix +++ b/pkgs/applications/audio/stochas/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stochas"; - version = "1.3.5"; + version = "1.3.9"; src = fetchFromGitHub { owner = "surge-synthesizer"; repo = pname; rev = "v${version}"; - sha256 = "1z8q53qfigw6wwbvpca92b9pf9d0mv3nyb0fmszz5ikj3pcybi7m"; + sha256 = "sha256-AnYViWterLBsTtd0wohff1CEwrSYA4CvOLGhJnPFUt8="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 13dc80c1dc63..eeed1e1837cd 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.0.10"; + version = "1.0.14"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-N3jLw2UXLXLpTmFIHihzcMXrxJY0gmvwoawTQ0vRR+w="; + hash = "sha256-ThfycS5yNpp6+mE33qPqEWlhSB3OIF7d/t2XvI+rF2E="; }; # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index 6fae14e2b1ad..a44a77237d1f 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libogg libvorbis libmad ]; meta = with lib; { - homepage = "http://streamripper.sourceforge.net/"; + homepage = "https://streamripper.sourceforge.net/"; description = "Application that lets you record streaming mp3 to your hard drive"; license = licenses.gpl2; }; diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index a9329c34212d..d469c9689a5d 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -1,5 +1,5 @@ -{ fetchFromGitLab -, lib +{ lib +, fetchFromGitLab , python3Packages , gobject-introspection , gtk3 @@ -9,8 +9,10 @@ , chromecastSupport ? false , serverSupport ? false , keyringSupport ? true -, notifySupport ? true, libnotify -, networkSupport ? true, networkmanager +, notifySupport ? true +, libnotify +, networkSupport ? true +, networkmanager }: python3Packages.buildPythonApplication rec { @@ -21,8 +23,8 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitLab { owner = "sublime-music"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-n77mTgElwwFaX3WQL8tZzbkPwnsyQ08OW9imSOjpBlg="; + rev = "refs/tags/v${version}"; + hash = "sha256-n77mTgElwwFaX3WQL8tZzbkPwnsyQ08OW9imSOjpBlg="; }; nativeBuildInputs = [ @@ -38,12 +40,21 @@ python3Packages.buildPythonApplication rec { "python-mpv" ]; + postPatch = '' + sed -i "/--cov/d" setup.cfg + sed -i "/--no-cov-on-fail/d" setup.cfg + # https://github.com/sublime-music/sublime-music/pull/370 + # Can be removed in later versions (probably > 0.11.16) + substituteInPlace pyproject.toml \ + --replace 'python-Levenshtein = "^0.12.0"' 'Levenshtein = ">0.12.0"' + ''; + buildInputs = [ gtk3 pango ] - ++ lib.optional notifySupport libnotify - ++ lib.optional networkSupport networkmanager + ++ lib.optional notifySupport libnotify + ++ lib.optional networkSupport networkmanager ; propagatedBuildInputs = with python3Packages; [ @@ -54,26 +65,21 @@ python3Packages.buildPythonApplication rec { mpv peewee pygobject3 - python-Levenshtein + levenshtein python-dateutil requests semver ] - ++ lib.optional chromecastSupport PyChromecast - ++ lib.optional keyringSupport keyring - ++ lib.optional serverSupport bottle + ++ lib.optional chromecastSupport PyChromecast + ++ lib.optional keyringSupport keyring + ++ lib.optional serverSupport bottle ; - postPatch = '' - sed -i "/--cov/d" setup.cfg - sed -i "/--no-cov-on-fail/d" setup.cfg - ''; - # hook for gobject-introspection doesn't like strictDeps # https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytest ]; @@ -98,6 +104,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "GTK3 Subsonic/Airsonic client"; homepage = "https://sublimemusic.app/"; + changelog = "https://github.com/sublime-music/sublime-music/blob/v${version}/CHANGELOG.rst"; license = licenses.gpl3Plus; maintainers = with maintainers; [ albakham sumnerevans ]; }; diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index 46f75442157c..47c6a32ad1f2 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "tageditor"; - version = "3.7.5"; + version = "3.7.7"; src = fetchFromGitHub { owner = "martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-/0zzzOEkzNr1aIpPFdflFaM/0HTs3TlIRxau3Yt+Hog="; + hash = "sha256-CjbV/Uwpe+x7LBDUDY+NRonUt549MrjGnlJ2olIrKQ4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/tagger/default.nix b/pkgs/applications/audio/tagger/default.nix index d7cfd5d75aaa..bac0d7c9d833 100644 --- a/pkgs/applications/audio/tagger/default.nix +++ b/pkgs/applications/audio/tagger/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "tagger"; - version = "2022.11.1-f1"; + version = "2022.11.2"; src = fetchFromGitHub { owner = "nlogozzo"; repo = "NickvisionTagger"; rev = version; - hash = "sha256-JeQTWs3TSs3Y+WGRR0bHINQr0OuS95dDxo+MkWte2Qw="; + hash = "sha256-gFpnTuUROYwPANrkD+g7a3FHSCVY2oB97flCK+LLowY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/tap-plugins/default.nix b/pkgs/applications/audio/tap-plugins/default.nix index 56ff4c0e1911..9b6f4efe1661 100644 --- a/pkgs/applications/audio/tap-plugins/default.nix +++ b/pkgs/applications/audio/tap-plugins/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { TAP Pitch Shifter, TAP Reflector, TAP Reverberator, TAP Rotary Speaker, TAP Scaling Limiter, TAP Sigmoid Booster, TAP Stereo Echo, TAP Tremolo, TAP TubeWarmth, TAP Vibrato. ''; - homepage = "http://tap-plugins.sourceforge.net/ladspa.html"; + homepage = "https://tap-plugins.sourceforge.net/ladspa.html"; license = licenses.gpl3; maintainers = [ maintainers.fps ]; }; diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 24c8e610a692..d6e56c98125f 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "tauon"; - version = "7.4.3"; + version = "7.4.7"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "sha256-eB4fwW5UvylVslSEvDFdCVYcEK3M2H+8VJGHH13vvA0="; + sha256 = "sha256-WUHMXsbnNaDlV/5bCOPMadJKWoF5i2UlFf9fcX6GCZ0="; }; postUnpack = '' @@ -131,6 +131,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The Linux desktop music player from the future"; homepage = "https://tauonmusicbox.rocks/"; + changelog = "https://github.com/Taiko2k/TauonMusicBox/releases/tag/v${version}"; license = licenses.gpl3; maintainers = with maintainers; [ jansol ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/applications/audio/termusic/default.nix index 08420191127d..c26ffd7e64af 100644 --- a/pkgs/applications/audio/termusic/default.nix +++ b/pkgs/applications/audio/termusic/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "termusic"; - version = "0.7.5"; + version = "0.7.8"; src = fetchCrate { inherit pname version; - sha256 = "sha256-/wpaxXY0hT7XX44cW1f3JuowE5u46/aLMC2VXgty/jE="; + sha256 = "sha256-1RlG1/2+NuMO9zqFHQaEkEX1YrYYMjnaNprjdl1ZnHQ="; }; - cargoHash = "sha256-TznzZ1dcun57IQ8e2T2FOxSdyqxS6etnuvxOY8n1y14="; + cargoHash = "sha256-SYk2SiFbp40/6Z0aBoX4MPnPLHjEfsJKCW4cErm0D78="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib ]; diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index 8905351da533..93b8d3203534 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { pname = "tidal-hifi"; - version = "4.3.1"; + version = "4.4.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; - sha256 = "sha256-Q+K8oF1VEsuhmhPH6K3as1+71vCfaKCdzRzCIxtiXvE="; + sha256 = "sha256-6KlcxBV/zHN+ZnvIu1PcKNeS0u7LqhDqAjbXawT5Vv8="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; @@ -109,13 +109,12 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ "''${gappsWrapperArgs[@]}" substituteInPlace $out/share/applications/tidal-hifi.desktop \ - --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi" \ - --replace "/usr/share/icons/hicolor/0x0/apps/tidal-hifi.png" "tidal-hifi.png" + --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi" for size in 48 64 128 256 512; do mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps/ convert $out/share/icons/hicolor/0x0/apps/tidal-hifi.png \ - -resize ''${size}x''${size} $out/share/icons/hicolor/''${size}x''${size}/apps/tidal-hifi.png + -resize ''${size}x''${size} $out/share/icons/hicolor/''${size}x''${size}/apps/icon.png done ''; @@ -124,7 +123,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Mastermindzh/tidal-hifi"; changelog = "https://github.com/Mastermindzh/tidal-hifi/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ alternateved ]; + maintainers = with maintainers; [ qbit ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index 5c9f31b75002..93922313ddfd 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -2,6 +2,8 @@ , fetchzip , lib , wrapGAppsHook +, xdg-utils +, which , alsa-lib , atk , cairo @@ -31,7 +33,11 @@ stdenv.mkDerivation rec { } else throw "Platform not supported"; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ + which + xdg-utils + wrapGAppsHook + ]; buildInputs = with gst_all_1; [ gst-plugins-base @@ -65,8 +71,13 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/libexec $out/share/doc cp transcribe $out/libexec cp xschelp.htb readme_gtk.html $out/share/doc - cp -r gtkicons $out/share/icons ln -s $out/share/doc/xschelp.htb $out/libexec + # The script normally installs to the home dir + sed -i -E 's!BIN_DST=.*!BIN_DST=$out!' install-linux.sh + sed -i -e 's!Exec=''${BIN_DST}/transcribe/transcribe!Exec=transcribe!' install-linux.sh + sed -i -e 's!''${BIN_DST}/transcribe!''${BIN_DST}/libexec!' install-linux.sh + rm -f xschelp.htb readme_gtk.html *.so + XDG_DATA_HOME=$out/share bash install-linux.sh -i patchelf \ --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ $out/libexec/transcribe @@ -97,6 +108,7 @@ stdenv.mkDerivation rec { homepage = "https://www.seventhstring.com/xscribe/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; + maintainers = with maintainers; [ iwanb ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/tuner/default.nix b/pkgs/applications/audio/tuner/default.nix new file mode 100644 index 000000000000..0f4db5af20a6 --- /dev/null +++ b/pkgs/applications/audio/tuner/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, meson +, ninja +, vala +, glib +, itstool +, wrapGAppsHook +, desktop-file-utils +, libsoup +, json-glib +, geoclue2 +, geocode-glib +, libgee +, gtk3 +, pantheon +, gst_all_1 +}: + +stdenv.mkDerivation rec { + pname = "tuner"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "louis77"; + repo = pname; + rev = version; + sha256 = "sha256-tG1AMEqHcp4jHNgWDy9fS2FtlxFTlpMD5MVbepIY+GY="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + vala + glib + itstool + wrapGAppsHook + desktop-file-utils + ]; + + buildInputs = [ + libsoup + json-glib + geoclue2 + geocode-glib + libgee + glib + gtk3 + pantheon.granite + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + ]; + + meta = with lib; { + homepage = "https://github.com/louis77/tuner"; + description = "An app to discover and play internet radio stations"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + mainProgram = "com.github.louis77.tuner"; + maintainers = [ maintainers.abbe ]; + }; +} diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index e7d101546d3a..4c7df0f02d5b 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -25,7 +25,7 @@ , makeWrapper , pkg-config , rtmidi -, speex +, speexdsp , stdenv , wrapGAppsHook , zstd @@ -45,8 +45,8 @@ let fuzzysearchdatabase-source = fetchFromBitbucket { owner = "j_norberg"; repo = "fuzzysearchdatabase"; - rev = "fe62479811e503ef3c091f5a859d27bfcf0a44da"; - sha256 = "zgeUzuuInHPeveBIjlivRGIz+NSb7cW/9hMndxm6qOA="; + rev = "a3a1bf557b8e6ee58b55fa82ff77ff7a3d141949"; + sha256 = "13ib72acbxn1cnf66im0v4nlr1464v7j08ra2bprznjmy127xckm"; }; nanovg-source = fetchFromGitHub { owner = "VCVRack"; @@ -72,11 +72,23 @@ let rev = "2fc6405883f8451944ed080547d073c8f9f31898"; sha256 = "/QZFZuI5kSsEvSfMJlcqB1HiZ9Vcf3vqLqWIMEgxQK8="; }; + simde-source = fetchFromGitHub { + owner = "simd-everywhere"; + repo = "simde"; + rev = "dd0b662fd8cf4b1617dbbb4d08aa053e512b08e4"; + sha256 = "1kxwzdlh21scak7wsbb60vwfvndppidj5fgbi26mmh73zsj02mnv"; + }; + tinyexpr-source = fetchFromGitHub { + owner = "codeplea"; + repo = "tinyexpr"; + rev = "4e8cc0067a1e2378faae23eb2dfdd21e9e9907c2"; + sha256 = "1yxkxsw3bc81cjm2knvyr1z9rlzwmjvq5zd125n34xwq568v904d"; + }; fundamental-source = fetchFromGitHub { owner = "VCVRack"; repo = "Fundamental"; - rev = "03bd00b96ad19e0575939bb7a0b8b08eff22f076"; # tip of branch v2 - sha256 = "1rd5yvdr6k03mc3r2y7wxhmiqd69jfvqmpqagxb83y1mn0zfv0pr"; + rev = "f80e1a0e78dc043a0ff0b777ef98a36b91063622"; # tip of branch v2 + sha256 = "0hnwrr1xhf7dpkw1v63f633x5dlrvijgbah4aj5h5xr2jchip9nx"; }; vcv-rtaudio = stdenv.mkDerivation rec { pname = "vcv-rtaudio"; @@ -103,7 +115,7 @@ let in stdenv.mkDerivation rec { pname = "VCV-Rack"; - version = "2.1.2"; + version = "2.2.1"; desktopItems = [ (makeDesktopItem { @@ -123,7 +135,7 @@ stdenv.mkDerivation rec { owner = "VCVRack"; repo = "Rack"; rev = "v${version}"; - sha256 = "0583izk3j36mg7wm30ss2387j9dqsbbxkxrdh3993azb4q5naf02"; + sha256 = "079alr6y0101k92v5lrnycljcbifh0hsvklbf4w5ax2zrxnyplq8"; }; patches = [ @@ -141,6 +153,8 @@ stdenv.mkDerivation rec { cp -r ${nanosvg-source}/* dep/nanosvg cp -r ${osdialog-source}/* dep/osdialog cp -r ${oui-blendish-source}/* dep/oui-blendish + cp -r ${simde-source}/* dep/simde + cp -r ${tinyexpr-source}/* dep/tinyexpr cp dep/pffft/*.h dep/include cp dep/fuzzysearchdatabase/src/*.hpp dep/include @@ -148,6 +162,8 @@ stdenv.mkDerivation rec { cp dep/nanovg/src/*.h dep/include cp dep/osdialog/*.h dep/include cp dep/oui-blendish/*.h dep/include + cp -r dep/simde/simde dep/include + cp dep/tinyexpr/tinyexpr.h dep/include # Build and dist the Fundamental plugins cp -r ${fundamental-source} plugins/Fundamental/ @@ -182,12 +198,17 @@ stdenv.mkDerivation rec { libpulseaudio libsamplerate rtmidi - speex + speexdsp vcv-rtaudio zstd ]; - makeFlags = [ "all" "plugins" ]; + makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + ] ++ [ + "all" + "plugins" + ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch index 506ab6053053..58f1b1f16f07 100644 --- a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch +++ b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch @@ -1,7 +1,8 @@ -diff -ru a/Makefile b/Makefile ---- a/Makefile 1970-01-01 01:00:01.000000000 +0100 -+++ b/Makefile 1970-01-01 01:00:01.000000000 +0100 -@@ -36,7 +36,7 @@ build/dep/osdialog/osdialog_gtk3.c.o: FLAGS += $(shell pkg-config --cflags gtk+- +diff --git a/Makefile b/Makefile +index fc7c3af1..c3672c6a 100644 +--- a/Makefile ++++ b/Makefile +@@ -34,7 +34,7 @@ ifdef ARCH_LIN LDFLAGS += -Wl,--whole-archive LDFLAGS += -static-libstdc++ -static-libgcc @@ -9,4 +10,4 @@ diff -ru a/Makefile b/Makefile + LDFLAGS += -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -larchive -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio LDFLAGS += -Wl,--no-whole-archive LDFLAGS += -lpthread -lGL -ldl -lX11 -lasound -ljack -lpulse -lpulse-simple - LDFLAGS += $(shell pkg-config --libs gtk+-3.0) + endif diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index 5cc3c1099995..7e834efb9524 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "A vi/vim inspired client for the Music Player Daemon (mpd)"; homepage = "https://github.com/boysetsfrog/vimpc"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index 0c80dda703e7..e5ab69c14b3a 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -80,9 +80,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index e3c4b4522489..e92b2f13187e 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -56,7 +56,7 @@ in python3.pkgs.buildPythonApplication rec { buildInputs = [ libsndfile ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ twisted ] ++ bins; diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix index b61ea3fc4d4b..ae96ea63cb0b 100644 --- a/pkgs/applications/audio/wolf-shaper/default.nix +++ b/pkgs/applications/audio/wolf-shaper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wolf-shaper"; - version = "0.1.8"; + version = "1.0.0"; src = fetchFromGitHub { owner = "pdesaulniers"; repo = "wolf-shaper"; rev = "v${version}"; - sha256 = "1j9xmh1nkf45ay1c5dz2g165qvrwlanzcq6mvb3nfxar265drd9q"; + sha256 = "sha256-BREv0nQVysWdx/sVd0cdFji49xtLmHEL8b2jLtgjDfI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index a1613946150b..e4cbfacedc0b 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20220923"; + version = "20221119"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "sha256-9Y9up5Ziipm6ums1wESfcADKgMwas2SESgGPn74RTt4="; + sha256 = "sha256-q5RiEzV2QKNWXP8KB6nQjyNCTftiYgeowcbD709PEIk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 5f99555d376c..6c0d439a0d1b 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Extended module player"; - homepage = "http://xmp.sourceforge.net/"; + homepage = "https://xmp.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index 87305027e4c4..e28d773d6e2a 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { synths) with user interfaces, permitting them to be hosted in-process by audio applications. ''; - homepage = "http://dssi.sourceforge.net/download.html#Xsynth-DSSI"; + homepage = "https://dssi.sourceforge.net/download.html#Xsynth-DSSI"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/yesplaymusic/default.nix b/pkgs/applications/audio/yesplaymusic/default.nix new file mode 100644 index 000000000000..aee0d1d192fe --- /dev/null +++ b/pkgs/applications/audio/yesplaymusic/default.nix @@ -0,0 +1,120 @@ +{ lib +, stdenv +, fetchurl +, undmg +, dpkg +, autoPatchelfHook +, wrapGAppsHook +, makeWrapper +, alsa-lib +, at-spi2-atk +, cups +, nspr +, nss +, mesa # for libgbm +, xorg +, xdg-utils +, libdrm +, libnotify +, libsecret +, libuuid +, gtk3 +, systemd +}: +let + pname = "yesplaymusic"; + version = "0.4.7"; + + srcs = { + x86_64-linux = fetchurl { + url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/yesplaymusic_${version}_amd64.deb"; + hash = "sha256-nnnHE2OgIqoz3dC+G0219FVBhvnWivLW1BX6+NYo6Ng="; + }; + aarch64-linux = fetchurl { + url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/yesplaymusic_${version}_arm64.deb"; + hash = "sha256-+rrhY5iDDt/nYs0Vz5/Ef0sgpsdBKMtb1aVfCZLgRgg="; + }; + x86_64-darwin = fetchurl { + url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/YesPlayMusic-mac-${version}-x64.dmg"; + hash = "sha256-z8CASZRWKlj1g3mhxTMMeR4klTvQ2ReSrL7Rt18qQbM="; + }; + aarch64-darwin = fetchurl { + url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/YesPlayMusic-mac-${version}-arm64.dmg"; + hash = "sha256-McYLczudKG4tRNIw/Ws4rht0n4tiKA2M99yKtJbdlY8="; + }; + }; + src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + libraries = [ + alsa-lib + at-spi2-atk + cups + nspr + nss + mesa + xorg.libxshmfence + xorg.libXScrnSaver + xorg.libXtst + xdg-utils + libdrm + libnotify + libsecret + libuuid + gtk3 + ]; + + meta = with lib; { + description = "A good-looking third-party netease cloud music player"; + homepage = "https://github.com/qier222/YesPlayMusic/"; + license = licenses.mit; + maintainers = with maintainers; [ ChaosAttractor ]; + platforms = builtins.attrNames srcs; + }; +in +if stdenv.isDarwin +then stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/Applications + cp -r *.app $out/Applications + ''; +} +else stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + makeWrapper + ]; + + buildInputs = libraries; + + runtimeDependencies = [ + (lib.getLib systemd) + ]; + + unpackPhase = '' + ${dpkg}/bin/dpkg-deb -x $src . + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r opt $out/opt + cp -r usr/share $out/share + substituteInPlace $out/share/applications/yesplaymusic.desktop \ + --replace "/opt/YesPlayMusic/yesplaymusic" "$out/bin/yesplaymusic" + makeWrapper $out/opt/YesPlayMusic/yesplaymusic $out/bin/yesplaymusic \ + --argv0 "yesplaymusic" \ + --add-flags "$out/opt/YesPlayMusic/resources/app.asar" + + runHook postInstall + ''; +} diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index ac28733c81bc..ed36ab263a05 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -2,17 +2,19 @@ let pname = "youtube-music"; - version = "1.17.0"; + version = "1.19.0"; src = fetchurl { url = "https://github.com/th-ch/youtube-music/releases/download/v${version}/YouTube-Music-${version}.AppImage"; - sha256 = "sha256-3QNmCek6UD0WNaqalIksYWLHGfMgetLRLi8mEM1J39I="; + sha256 = "sha256-o/a+6EKPEcE9waXQK3hxtp7FPqokteoUAt0iOJk8bYw="; }; appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 rec { inherit pname version src; + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) + ++ [ pkgs.libappindicator ]; extraInstallCommands = '' mv $out/bin/{${pname}-${version},${pname}} @@ -29,7 +31,7 @@ appimageTools.wrapType2 rec { description = "Electron wrapper around YouTube Music"; homepage = "https://th-ch.github.io/youtube-music/"; license = licenses.mit; - sourceProvenance = with sourceTypes; [ fromSource ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; maintainers = [ maintainers.aacebedo ]; }; diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index a07bfa60b054..c676e6a774b5 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zam-plugins"; - version = "3.14"; + version = "4.1"; src = fetchFromGitHub { owner = "zamaudio"; repo = pname; rev = version; - sha256 = "sha256-zlANfFuEXQdXlSu4CuXNyChiuV7wkumaOJqgthl6Y9Q="; + sha256 = "sha256-NKa6lOP3fpAFMYwzZAMFgW0tBSM/F89oB/nDbEUeflw="; fetchSubmodules = true; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://www.zamaudio.com/?p=976"; + homepage = "https://www.zamaudio.com/?p=976"; description = "A collection of LV2/LADSPA/VST/JACK audio plugins by ZamAudio"; license = licenses.gpl2Plus; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix index 9500c63a7af3..7b92626d5b33 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/applications/audio/zrythm/default.nix @@ -160,6 +160,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( --prefix GSETTINGS_SCHEMA_DIR : "$out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas/" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ) ''; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index fae337c079f0..2c8ecfd199e0 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -95,7 +95,7 @@ in stdenv.mkDerivation rec { ++ lib.optional (guiModule == "fltk") "-DFLTK_SKIP_OPENGL=ON"; doCheck = true; - checkInputs = [ cxxtest ruby ]; + nativeCheckInputs = [ cxxtest ruby ]; # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829 checkPhase = let diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 9055b46284c0..afe3cde3a596 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "deja-dup"; - version = "43.4"; + version = "44.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "sha256-8eqrBQrMvS4cta5RP0ibo4Zc3B8hlkftxaRyvb6JuEY="; + sha256 = "sha256-dIH6VPgzJxvXEUtPAYQzpQ8I9R9MwsfeylV25ASfW/k="; }; patches = [ diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/applications/backup/ludusavi/default.nix index e7826fc6e949..44f5c5acfb9b 100644 --- a/pkgs/applications/backup/ludusavi/default.nix +++ b/pkgs/applications/backup/ludusavi/default.nix @@ -13,7 +13,7 @@ , libXrandr , libXi , gnome -, kdialog +, libsForQt5 }: rustPlatform.buildRustPackage rec { @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { in '' patchelf --set-rpath "${libPath}" "$out/bin/$pname" - wrapProgram $out/bin/$pname --prefix PATH : ${lib.makeBinPath [ gnome.zenity kdialog ]} + wrapProgram $out/bin/$pname --prefix PATH : ${lib.makeBinPath [ gnome.zenity libsForQt5.kdialog ]} ''; diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 81a0cd8b02e1..8e86b35cf7cc 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "timeshift"; - version = "22.06.5"; + version = "22.11.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - sha256 = "IHX/F3tnl3ckX20mnPHmuK/W4pRTFHzBUfaJg2sMpqc="; + sha256 = "yZNERRoNZ1K7BRiAu7sqVQyhghsS/AeZSODMVSm46oY="; }; patches = [ diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/applications/backup/unifi-protect-backup/default.nix index dbfff51d8fde..36f554761f08 100644 --- a/pkgs/applications/backup/unifi-protect-backup/default.nix +++ b/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -1,8 +1,11 @@ -{ fetchFromGitHub, python3, lib }: +{ lib +, fetchFromGitHub +, python3 +}: python3.pkgs.buildPythonApplication rec { pname = "unifi-protect-backup"; - version = "0.7.4"; + version = "0.8.8"; format = "pyproject"; @@ -10,32 +13,42 @@ python3.pkgs.buildPythonApplication rec { owner = "ep1cman"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4Kpz89yqKmxHmnaPYpvJ2hx46yfcaCYjOioyya+38vE="; + hash = "sha256-Z8qK7LprMyXl5irx9Xrs/RgqvNcFVBqLBSljovr6oiE="; }; - preBuild = '' - sed -i 's_click = "8.0.1"_click = "^8"_' pyproject.toml - sed -i 's_pyunifiprotect = .*_pyunifiprotect = "*"_' pyproject.toml - ''; + pythonRelaxDeps = [ + "aiorun" + "aiosqlite" + "click" + "pyunifiprotect" + ]; + + pythonRemoveDeps = [ + "pylint" + ]; nativeBuildInputs = with python3.pkgs; [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ aiocron + aiorun + aiosqlite click pyunifiprotect ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; meta = with lib; { description = "Python tool to backup unifi event clips in realtime"; homepage = "https://github.com/ep1cman/unifi-protect-backup"; - maintainers = with maintainers; [ ajs124 ]; + changelog = "https://github.com/ep1cman/unifi-protect-backup/blob/v${version}/CHANGELOG.md"; license = licenses.mit; + maintainers = with maintainers; [ ajs124 ]; }; } diff --git a/pkgs/applications/backup/urbackup-client/default.nix b/pkgs/applications/backup/urbackup-client/default.nix index 16ae8fcf3e89..7263e72c6490 100644 --- a/pkgs/applications/backup/urbackup-client/default.nix +++ b/pkgs/applications/backup/urbackup-client/default.nix @@ -1,16 +1,29 @@ -{ stdenv, lib, fetchzip, wxGTK30, zlib, zstd }: +{ stdenv +, lib +, fetchzip +, wxGTK32 +, zlib +, zstd +}: stdenv.mkDerivation rec { pname = "urbackup-client"; - version = "2.4.11"; + version = "2.5.20"; src = fetchzip { url = "https://hndl.urbackup.org/Client/${version}/urbackup-client-${version}.tar.gz"; - sha256 = "0cciy9v1pxj9qaklpbhp2d5rdbkmfm74vhpqx6b4phww0f10wvzh"; + sha256 = "sha256-i1g3xUhspqQRfIUhy6STOWNuncK3tMFocJw652r1X9g="; }; - configureFlags = [ "--enable-embedded-cryptopp" ]; - buildInputs = [ wxGTK30 zlib zstd ]; + buildInputs = [ + wxGTK32 + zlib + zstd + ]; + + configureFlags = [ + "--enable-embedded-cryptopp" + ]; meta = with lib; { description = "An easy to setup Open Source client/server backup system"; diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index ad55ef1ab8c8..05d3cc862635 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "vorta"; - version = "0.8.9"; + version = "0.8.10"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "refs/tags/v${version}"; - sha256 = "sha256-5RZXHMov3CX0zRprs7sgz0+cGEdESLrg4I2glRnTkcU="; + hash = "sha256-okxZ1kALB5l94ShStAJLfzD37MLhob8MCzhbqfVISkw="; }; nativeBuildInputs = [ wrapQtAppsHook ]; @@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec { ) ''; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytest-qt pytest-mock pytestCheckHook @@ -84,10 +84,11 @@ python3Packages.buildPythonApplication rec { ]; meta = with lib; { - license = licenses.gpl3Only; - homepage = "https://vorta.borgbase.com/"; - maintainers = with maintainers; [ ma27 ]; + changelog = "https://github.com/borgbase/vorta/releases/tag/v0.8.10"; description = "Desktop Backup Client for Borg"; + homepage = "https://vorta.borgbase.com/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ma27 ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/besu/default.nix b/pkgs/applications/blockchains/besu/default.nix index 68ddcca4a138..7993887be65a 100644 --- a/pkgs/applications/blockchains/besu/default.nix +++ b/pkgs/applications/blockchains/besu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "besu"; - version = "22.7.6"; + version = "22.10.3"; src = fetchurl { url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-nlOIUvFv05uITEw0K+qtgT4zqySJBjTAHu49N9wdqJM="; + sha256 = "sha256-chP5RFqEoZbpSuGHfG/bHlHTe/sZYV2gLvUSHU9A44w="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 05542ef4c24e..36bc0ebfb883 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -34,11 +34,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.9.6"; + version = "1.9.9"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "02j6n693lhfn9x8kaz253xm76zzsdz8h10rkyxnlqiwwbn1wnmsa"; + sha256 = "0jisxzajsc4wfvxabvfzd0x9y1fxzg39fkhap1781q7wyi4ry9kd"; }; nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ]; diff --git a/pkgs/applications/blockchains/bisq-desktop/update.sh b/pkgs/applications/blockchains/bisq-desktop/update.sh index 393447834bba..c65e04e3de40 100755 --- a/pkgs/applications/blockchains/bisq-desktop/update.sh +++ b/pkgs/applications/blockchains/bisq-desktop/update.sh @@ -7,14 +7,13 @@ version="$(curl -s https://api.github.com/repos/bisq-network/bisq/releases| jq ' depname="Bisq-64bit-$version.deb" src="https://github.com/bisq-network/bisq/releases/download/v$version/$depname" signature="$src.asc" -key="CB36 D7D2 EBB2 E35D 9B75 500B CD5D C1C5 29CD FD3B" pushd $(mktemp -d --suffix=-bisq-updater) export GNUPGHOME=$PWD/gnupg mkdir -m 700 -p "$GNUPGHOME" curl -L -o "$depname" -- "$src" curl -L -o signature.asc -- "$signature" -gpg --batch --recv-keys "$key" +curl https://bisq.network/pubkey/E222AA02.asc | gpg --import gpg --batch --verify signature.asc "$depname" sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$depname") popd diff --git a/pkgs/applications/blockchains/bitcoin-classic/default.nix b/pkgs/applications/blockchains/bitcoin-classic/default.nix deleted file mode 100644 index 4a0a99e288ae..000000000000 --- a/pkgs/applications/blockchains/bitcoin-classic/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, autoreconfHook -, openssl -, db48 -, boost -, zlib -, miniupnpc -, qtbase ? null -, qttools ? null -, util-linux -, protobuf -, qrencode -, libevent -, withGui -}: - -stdenv.mkDerivation rec { - pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-classic"; - version = "1.3.8uahf"; - - src = fetchFromGitHub { - owner = "bitcoinclassic"; - repo = "bitcoinclassic"; - rev = "v${version}"; - sha256 = "sha256-fVmFD1B4kKoejd2cmPPF5TJJQTAA6AVsGlVY8IIUNK4="; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ - openssl - db48 - boost - zlib - miniupnpc - util-linux - protobuf - libevent - ] ++ lib.optionals withGui [ qtbase qttools qrencode ]; - - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ lib.optionals withGui [ - "--with-gui=qt5" - "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" - ]; - - CXXFLAGS = [ "-std=c++14" ]; - - enableParallelBuilding = true; - - dontWrapQtApps = true; - - meta = with lib; { - description = "Peer-to-peer electronic cash system (Classic client)"; - longDescription = '' - Bitcoin is a free open source peer-to-peer electronic cash system that is - completely decentralized, without the need for a central server or trusted - parties. Users hold the crypto keys to their own money and transact directly - with each other, with the help of a P2P network to check for double-spending. - - Bitcoin Classic stands for the original Bitcoin as Satoshi described it, - "A Peer-to-Peer Electronic Cash System". We are writing the software that - miners and users say they want. We will make sure it solves their needs, help - them deploy it, and gracefully upgrade the bitcoin network's capacity - together. The data shows that Bitcoin can grow, on-chain, to welcome many - more users onto our coin in a safe and distributed manner. In the future we - will continue to release updates that are in line with Satoshi’s whitepaper & - vision, and are agreed upon by the community. - ''; - homepage = "https://bitcoinclassic.com/"; - maintainers = with maintainers; [ jefdaj ]; - license = licenses.mit; - broken = stdenv.isDarwin; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/blockchains/bitcoin-gold/default.nix b/pkgs/applications/blockchains/bitcoin-gold/default.nix deleted file mode 100644 index 5d6775f729aa..000000000000 --- a/pkgs/applications/blockchains/bitcoin-gold/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, openssl -, boost -, libb2 -, libevent -, autoreconfHook -, db4 -, pkg-config -, protobuf -, hexdump -, zeromq -, libsodium -, withGui -, qtbase ? null -, qttools ? null -, wrapQtAppsHook ? null -}: - -with lib; - -stdenv.mkDerivation rec { - - pname = "bitcoin" + toString (optional (!withGui) "d") + "-gold"; - version = "0.17.3"; - - src = fetchFromGitHub { - owner = "BTCGPU"; - repo = "BTCGPU"; - rev = "v${version}"; - sha256 = "sha256-1tFoUNsCPJkHSmNRl5gE3n2EQD6RZSry1zIM5hiTzEI="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - hexdump - ] ++ optionals withGui [ - wrapQtAppsHook - ]; - - buildInputs = [ - openssl - boost - libevent - db4 - zeromq - libsodium - libb2 - ] ++ optionals withGui [ - qtbase - qttools - protobuf - ]; - - enableParallelBuilding = true; - - configureFlags = [ - "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals withGui [ - "--with-gui=qt5" - "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" - ]; - - meta = { - description = "BTG is a cryptocurrency with Bitcoin fundamentals, mined on common GPUs instead of specialty ASICs"; - homepage = "https://bitcoingold.org/"; - license = licenses.mit; - maintainers = [ maintainers.mmahut ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index ca998248a6c5..d1e419425570 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -23,7 +23,6 @@ , withWallet ? true }: -with lib; stdenv.mkDerivation rec { pname = if withGui then "bitcoin-knots" else "bitcoind-knots"; version = "23.0.knots20220529"; @@ -35,29 +34,29 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ optionals stdenv.isLinux [ util-linux ] - ++ optionals stdenv.isDarwin [ hexdump ] - ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] - ++ optionals withGui [ wrapQtAppsHook ]; + ++ lib.optionals stdenv.isLinux [ util-linux ] + ++ lib.optionals stdenv.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ optionals withWallet [ db48 sqlite ] - ++ optionals withGui [ qrencode qtbase qttools ]; + ++ lib.optionals withWallet [ db48 sqlite ] + ++ lib.optionals withGui [ qrencode qtbase qttools ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--disable-bench" - ] ++ optionals (!doCheck) [ + ] ++ lib.optionals (!doCheck) [ "--disable-tests" "--disable-gui-tests" - ] ++ optionals (!withWallet) [ + ] ++ lib.optionals (!withWallet) [ "--disable-wallet" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = true; @@ -65,7 +64,7 @@ stdenv.mkDerivation rec { [ "LC_ALL=en_US.UTF-8" ] # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. # See also https://github.com/NixOS/nixpkgs/issues/24256 - ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; + ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; enableParallelBuilding = true; @@ -73,7 +72,7 @@ stdenv.mkDerivation rec { smoke-test = nixosTests.bitcoind-knots; }; - meta = { + meta = with lib; { description = "A derivative of Bitcoin Core with a collection of improvements"; homepage = "https://bitcoinknots.org/"; maintainers = with maintainers; [ prusnak mmahut ]; diff --git a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix index d019c3f02d6d..3fbf9615f7db 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix @@ -3,10 +3,8 @@ , withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null , Foundation, ApplicationServices, AppKit }: -with lib; - stdenv.mkDerivation rec { - pname = "bitcoin" + optionalString (!withGui) "d" + "-unlimited"; + pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-unlimited"; version = "1.10.0.0"; src = fetchFromGitLab { @@ -17,19 +15,19 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config autoreconfHook python3 ] - ++ optionals withGui [ wrapQtAppsHook qttools ]; + ++ lib.optionals withGui [ wrapQtAppsHook qttools ]; buildInputs = [ openssl db48 boost zlib miniupnpc util-linux protobuf libevent ] - ++ optionals withGui [ qtbase qttools qrencode ] - ++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; + ++ lib.optionals withGui [ qtbase qttools qrencode ] + ++ lib.optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt5" + ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Peer-to-peer electronic cash system (Unlimited client)"; longDescription= '' Bitcoin is a free open source peer-to-peer electronic cash system that is diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index d039d4d5ec99..98483391973d 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -23,39 +23,37 @@ , withWallet ? true }: -with lib; let - version = "23.0"; - majorVersion = versions.major version; desktop = fetchurl { - url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorVersion}.x/debian/bitcoin-qt.desktop"; + # c2e5f3e is the last commit when the debian/bitcoin-qt.desktop file was changed + url = "https://raw.githubusercontent.com/bitcoin-core/packaging/c2e5f3e20a8093ea02b73cbaf113bc0947b4140e/debian/bitcoin-qt.desktop"; sha256 = "0cpna0nxcd1dw3nnzli36nf9zj28d2g9jf5y0zl9j18lvanvniha"; }; in stdenv.mkDerivation rec { pname = if withGui then "bitcoin" else "bitcoind"; - inherit version; + version = "24.0.1"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" - "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "26748bf49d6d6b4014d0fedccac46bf2bcca42e9d34b3acfd9e3467c415acc05"; + # hash retrieved from signed SHA256SUMS + sha256 = "12d4ad6dfab4767d460d73307e56d13c72997e114fad4f274650f95560f5f2ff"; }; nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ optionals stdenv.isLinux [ util-linux ] - ++ optionals stdenv.isDarwin [ hexdump ] - ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] - ++ optionals withGui [ wrapQtAppsHook ]; + ++ lib.optionals stdenv.isLinux [ util-linux ] + ++ lib.optionals stdenv.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ optionals withWallet [ db48 sqlite ] - ++ optionals withGui [ qrencode qtbase qttools ]; + ++ lib.optionals withWallet [ db48 sqlite ] + ++ lib.optionals withGui [ qrencode qtbase qttools ]; - postInstall = optionalString withGui '' + postInstall = lib.optionalString withGui '' install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop substituteInPlace $out/share/applications/bitcoin-qt.desktop --replace "Icon=bitcoin128" "Icon=bitcoin" install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png @@ -64,21 +62,17 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--disable-bench" - ] ++ optionals (!doCheck) [ + ] ++ lib.optionals (!doCheck) [ "--disable-tests" "--disable-gui-tests" - ] ++ optionals (!withWallet) [ + ] ++ lib.optionals (!withWallet) [ "--disable-wallet" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - # fix "Killed: 9 test/test_bitcoin" - # https://github.com/NixOS/nixpkgs/issues/179474 - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "fortify" "stackprotector" ]; - - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = true; @@ -86,7 +80,7 @@ stdenv.mkDerivation rec { [ "LC_ALL=en_US.UTF-8" ] # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. # See also https://github.com/NixOS/nixpkgs/issues/24256 - ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; + ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; enableParallelBuilding = true; @@ -94,7 +88,7 @@ stdenv.mkDerivation rec { smoke-test = nixosTests.bitcoind; }; - meta = { + meta = with lib; { description = "Peer-to-peer electronic cash system"; longDescription = '' Bitcoin is a free open source peer-to-peer electronic cash system that is diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/applications/blockchains/btcdeb/default.nix index 4f8a08333a86..f4c00d00858e 100644 --- a/pkgs/applications/blockchains/btcdeb/default.nix +++ b/pkgs/applications/blockchains/btcdeb/default.nix @@ -5,7 +5,6 @@ , openssl }: -with lib; stdenv.mkDerivation rec { pname = "btcdeb"; version = "unstable-2022-04-03"; @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl ]; - meta = { + meta = with lib; { description = "Bitcoin Script Debugger"; homepage = "https://github.com/bitcoin-core/btcdeb"; license = licenses.mit; diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index a1b0f2890e9d..69004bb73c3f 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.6.12"; + version = "1.7.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-izjKrzHbyRsUhlUAf0PELVGBt5JmzvBzgBytB9z80cI="; + sha256 = "sha256-xycNt3jzZY2a4hNv3arWLt+EfMqpFVMDHMuzOWnL7aQ="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index a06494477a01..8a05f8276b3f 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -1,1957 +1,397 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ - (fetchNuGet { - pname = "AngleSharp.Css"; - version = "0.14.2"; - sha256 = "1d34a8ab5dri4wlw07jvk7b1z0d0zizwihwpdfva3sxhb4279ahd"; - }) - (fetchNuGet { - pname = "AngleSharp"; - version = "0.14.0"; - sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; - }) - (fetchNuGet { - pname = "AWSSDK.Core"; - version = "3.3.104.14"; - sha256 = "157694kb63z1szbsv861515fvjv7amrjrfmgbm3idpyw31afk650"; - }) - (fetchNuGet { - pname = "AWSSDK.S3"; - version = "3.3.110.10"; - sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; - }) - (fetchNuGet { - pname = "BIP78.Sender"; - version = "0.2.2"; - sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; - }) - (fetchNuGet { - pname = "BTCPayServer.Hwi"; - version = "2.0.2"; - sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; - }) - (fetchNuGet { - pname = "BTCPayServer.Lightning.All"; - version = "1.4.5"; - sha256 = "1x4500b71cmv8qba2phk1j0624w8gln5c1jzyw3x782ddvlbznna"; - }) - (fetchNuGet { - pname = "BTCPayServer.Lightning.Charge"; - version = "1.3.12"; - sha256 = "0bf9k5wx9h53fwis6887gy43683xgljwk26kr44r6gzqbzwzac1m"; - }) - (fetchNuGet { - pname = "BTCPayServer.Lightning.CLightning"; - version = "1.3.14"; - sha256 = "0320bm9fz6mym3b450avwx0ng8y334w4rm2gcpicnwglp53cagx7"; - }) - (fetchNuGet { - pname = "BTCPayServer.Lightning.Common"; - version = "1.3.13"; - sha256 = "1yy78w4zcl17z99l0n5p86ay9cvsbhwxm42f1f2ll9k2p495bmr3"; - }) - (fetchNuGet { - pname = "BTCPayServer.Lightning.Common"; - version = "1.3.7"; - sha256 = "1hsn51zx34fswjph1dgplwj92045d4ymallryjxbm5gl1wgnvqvz"; - }) - (fetchNuGet { - pname = "BTCPayServer.Lightning.Eclair"; - version = "1.3.12"; - sha256 = "0jqaimrcdgd7iwyy8fkqysrxfbz3gzvv4pi30fc0nz1x1b11w48j"; - }) - (fetchNuGet { - pname = "BTCPayServer.Lightning.LNBank"; - version = "1.3.14"; - sha256 = "1zsjg0zgp51vgkhq7vv05pxz5jrpahkjl042ilywb8jqlz3my9jw"; - }) - (fetchNuGet { - pname = "BTCPayServer.Lightning.LND"; - version = "1.4.4"; - sha256 = "0qm7xgd19s629swnm6b83qv5b9p57b7bq9bi5l340yim6w8yb4mb"; - }) - (fetchNuGet { - pname = "BTCPayServer.Lightning.LNDhub"; - version = "1.0.7"; - sha256 = "10npvkaa6hr0a3lb4lnfakfnbzr87058irsa4jrbj238hc5m8zwg"; - }) - (fetchNuGet { - pname = "BuildBundlerMinifier"; - version = "3.2.449"; - sha256 = "1dcjlfl5w2vfppx2hq3jj6xy24id2x3hcajwylhphlz9jw2bnhsv"; - }) - (fetchNuGet { - pname = "BundlerMinifier.Core"; - version = "3.2.449"; - sha256 = "1bqc8k346b9yl7a5ywbl5g1m5982qyg7s2kihak100fzlb7g7rxs"; - }) - (fetchNuGet { - pname = "BundlerMinifier.TagHelpers"; - version = "3.2.435"; - sha256 = "0ksmby0lzgsxkv0xfzr840262kcqra9vds91mcx0rf20blksfvsk"; - }) - (fetchNuGet { - pname = "CsvHelper"; - version = "15.0.5"; - sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; - }) - (fetchNuGet { - pname = "Dapper"; - version = "2.0.123"; - sha256 = "15hxrchfgiqnmgf8fqhrf4pb4c8l9igg5qnkw9yk3rkagcqfkk91"; - }) - (fetchNuGet { - pname = "DigitalRuby.ExchangeSharp"; - version = "1.0.2"; - sha256 = "1l6g61l18jqnc0h8rpsilfjjnyapm4ld8wcsr8bp0hp34p6wpidm"; - }) - (fetchNuGet { - pname = "Fido2.AspNet"; - version = "2.0.2"; - sha256 = "0x2k1wyd0p7cy4ir15m2bxiggckl98znc65b4vq75ckjyd6dm1a1"; - }) - (fetchNuGet { - pname = "Fido2.Models"; - version = "2.0.2"; - sha256 = "1vk4h9sv2dhdr0jvh2a7yk6v9rhxk9y8hxz4mkal8vd9psajz5cg"; - }) - (fetchNuGet { - pname = "Fido2"; - version = "2.0.2"; - sha256 = "1wqlk48apm7h637da7sav0r1a8yz2yy2gxhifpvydjqk1n3qybz4"; - }) - (fetchNuGet { - pname = "Google.Api.Gax.Rest"; - version = "2.5.0"; - sha256 = "1zkjl5zh6qwdz4qmnxnk5877pas638i2qi25znilhqqf3mrkp0rp"; - }) - (fetchNuGet { - pname = "Google.Api.Gax"; - version = "2.5.0"; - sha256 = "0q6pi53px998i3gdndla8v0zqdpyi9gnsy9mdcfpkrg09vfbdsl9"; - }) - (fetchNuGet { - pname = "Google.Apis.Auth"; - version = "1.35.1"; - sha256 = "1qdnd1nq9bfgyljmiww91pfi0iz1n29rz2dlizhxcijqya2ldha3"; - }) - (fetchNuGet { - pname = "Google.Apis.Auth"; - version = "1.38.0"; - sha256 = "0x3bdwiyqjxw5df99bfasmsv09kb47wzisag938631cijl0g277y"; - }) - (fetchNuGet { - pname = "Google.Apis.Core"; - version = "1.35.1"; - sha256 = "01dfw2kxknlc5pm7x1q88lv9j979509lkkgvlffjry5bawsxsja4"; - }) - (fetchNuGet { - pname = "Google.Apis.Core"; - version = "1.38.0"; - sha256 = "012gslhnx65vqfyzjnqx4bqk9kb8bwbx966q2f9fdgrfcn26gj9j"; - }) - (fetchNuGet { - pname = "Google.Apis.Storage.v1"; - version = "1.38.0.1470"; - sha256 = "0mfrz7fmpfbjvp4zfpjasmnfbgxgxrrjkf8xgp9p6h9g8qh2f2h2"; - }) - (fetchNuGet { - pname = "Google.Apis"; - version = "1.35.1"; - sha256 = "1022l8m7v9f3rkjc9l11mkzwsbmqx9sk5f4aym035vn9hdr16d49"; - }) - (fetchNuGet { - pname = "Google.Apis"; - version = "1.38.0"; - sha256 = "01j3d1lv106cqw9n0lwgclrxghy852fsibv6av4xr03ivrkm8g40"; - }) - (fetchNuGet { - pname = "Google.Cloud.Storage.V1"; - version = "2.3.0"; - sha256 = "01jhrd6m6md8m28chzg2dkdfd4yris79j1xi7r1ydm1cfjhmlj64"; - }) - (fetchNuGet { - pname = "HtmlSanitizer"; - version = "5.0.372"; - sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r"; - }) - (fetchNuGet { - pname = "Humanizer.Core"; - version = "2.8.26"; - sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; - }) - (fetchNuGet { - pname = "libsodium"; - version = "1.0.18"; - sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; - }) - (fetchNuGet { - pname = "LNURL"; - version = "0.0.24"; - sha256 = "1hqa95gbcis03c0m5kwl7zzn26kwv1my94yq96766qp0rnl6c4lw"; - }) - (fetchNuGet { - pname = "MailKit"; - version = "3.3.0"; - sha256 = "18l0jkrc4d553kiw4vdjzzpafpvsgjs1n19kjbi8isnhzidmsl4j"; - }) - (fetchNuGet { - pname = "McMaster.NETCore.Plugins.Mvc"; - version = "1.4.0"; - sha256 = "07i0p6236hyh1c3cb5v6zkayq5807rd6msc341v2jh6yd5radasy"; - }) - (fetchNuGet { - pname = "McMaster.NETCore.Plugins"; - version = "1.4.0"; - sha256 = "1k2qz0qnf2b1kfwbzcynivy93jm7dcwl866d0fl7qlgq5vql7niy"; - }) - (fetchNuGet { - pname = "Microsoft.AspNet.SignalR.Client"; - version = "2.4.3"; - sha256 = "1whxcmxydcxjkw84sqk5idd406v3ia0xj2m4ia4b6wqbvkdqn7rf"; - }) - (fetchNuGet { - pname = "Microsoft.AspNet.WebApi.Client"; - version = "5.2.9"; - sha256 = "1sy1q36bm9fz3gi780w4jgysw3dwaz2f3a5gcn6jxw1gkmdasb08"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.Connections.Abstractions"; - version = "3.1.10"; - sha256 = "05drcgbpzq700kvxnfxha10w3jgfp2jp0r2h4hpczjxj6cywbbi6"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.Cryptography.Internal"; - version = "6.0.9"; - sha256 = "11wxfjbx111rl5s737wwbiz4b86fpbh98rlb87ycqb0b2y3yvmw3"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; - version = "6.0.9"; - sha256 = "0102pl980h0q9qfpad2nkhk3a6aygbf7i1gbgr2zm4r22fkbmb2n"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.Hosting.Abstractions"; - version = "2.0.0"; - sha256 = "0x6vw7kiy9z7cdmgbqav0d9wq66032wg39l2c9cv6xvxxvdpbkz7"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; - version = "2.0.0"; - sha256 = "1k4dr6l32swi8zasfvzxixnjvgbrra7v6lgpri0929vb3r5lagjb"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.Http.Abstractions"; - version = "2.0.0"; - sha256 = "1hgmnd5mj35g8cqq3mdhjf9cmi3wm5lqiyrj5mgfscnig6i686xr"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.Http.Connections.Client"; - version = "3.1.10"; - sha256 = "1sni7hjpylamxaf98insalx3jj2k8skb02mhkmamxxj2488r2p9j"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.Http.Connections.Common"; - version = "3.1.10"; - sha256 = "19mddj0dpy4j6fwh8b1q7aznnckjrkpvbqiyq4sq4z7lcgw6pbq6"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.Http.Features"; - version = "2.0.0"; - sha256 = "1zk5ad3laa7ma83md8r80kijqzps6dcrvv0k1015nddfk1qd74s6"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.Http.Features"; - version = "3.1.10"; - sha256 = "1y6zf2qgph6ga59272msywdv2xrycg56wz50bjm5pivmh6wv9240"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; - version = "6.0.9"; - sha256 = "1r5rchb180addd9jqk8xgxxmh7ckcy86dcynnfb2igbs0n5m0jg7"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.JsonPatch"; - version = "6.0.9"; - sha256 = "0hvz79sas53949hx5sc9r1h0sxnvdggscqyp7h7qk0i27p3a9rqv"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; - version = "6.0.9"; - sha256 = "13vnkradd2hd7lq4jl0ikz2s965wk49snmjcf4722za3azil6sr5"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; - version = "6.0.9"; - sha256 = "0ck1zy967gmbx9kha8dbp3npygq2nh3c39h78fvqrpkr3i6jycp0"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"; - version = "6.0.9"; - sha256 = "1y28w2cxk665g5503yinyzkl77hgwni7cmammvrfxgcyhviy10ch"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.Razor.Language"; - version = "6.0.9"; - sha256 = "0f6ffg62f3g55gn1wkfgiwiff4lawzlm2yn4k6a89bgrgrfp2jlr"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.SignalR.Client.Core"; - version = "3.1.10"; - sha256 = "1289624ilk45ca8rkyvirqdjsg9jsnqn8dzbjr6f83641fi73s69"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.SignalR.Client"; - version = "3.1.10"; - sha256 = "1s352srycksfnvz5hhi7himpg2gn39iw2gizlc3g30w6pvy8p29c"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.SignalR.Common"; - version = "3.1.10"; - sha256 = "0c6lim7my3alq43xxqkgykba068hjlzdcif6c956irailijc0smw"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; - version = "3.1.10"; - sha256 = "0qzdpblmgqm3bl5wr14igkqp35zwx4wdkwlh55xm4v3hzhq6l46m"; - }) - (fetchNuGet { - pname = "Microsoft.CodeAnalysis.Analyzers"; - version = "3.3.2"; - sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; - }) - (fetchNuGet { - pname = "Microsoft.CodeAnalysis.Analyzers"; - version = "3.3.3"; - sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; - }) - (fetchNuGet { - pname = "Microsoft.CodeAnalysis.Common"; - version = "4.0.0"; - sha256 = "1rwnz5zy7ia9312n2qzzar95x9p7iiw57cql7ssdwv255xl1ix29"; - }) - (fetchNuGet { - pname = "Microsoft.CodeAnalysis.Common"; - version = "4.3.1"; - sha256 = "0rgr6wxk5pfvljlr0841jfvss3dz5dff06h08rjgvw3793wdg592"; - }) - (fetchNuGet { - pname = "Microsoft.CodeAnalysis.CSharp"; - version = "4.0.0"; - sha256 = "1mzxjy7xp8r9x25xyspq89ngsz0hmkbp0l0h3v1jv2rcrw63wqb4"; - }) - (fetchNuGet { - pname = "Microsoft.CodeAnalysis.CSharp"; - version = "4.3.1"; - sha256 = "0mgw0f2k1a1lbhnf64k1sxbhy9cz46qv9d0l92bvkwh4nn3aybfg"; - }) - (fetchNuGet { - pname = "Microsoft.CodeAnalysis.Razor"; - version = "6.0.9"; - sha256 = "0rq3qbj2rn33bzhr6i5nsc4vrcngfvfv8r927k93nn3kjn11q71s"; - }) - (fetchNuGet { - pname = "Microsoft.CodeCoverage"; - version = "17.3.2"; - sha256 = "1f05l2vm8inlwhk36lfbyszjlcnvdd2qw2832npaah0dldn6dz00"; - }) - (fetchNuGet { - pname = "Microsoft.CSharp"; - version = "4.0.1"; - sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; - }) - (fetchNuGet { - pname = "Microsoft.CSharp"; - version = "4.5.0"; - sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; - }) - (fetchNuGet { - pname = "Microsoft.CSharp"; - version = "4.7.0"; - sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; - }) - (fetchNuGet { - pname = "Microsoft.Data.Sqlite.Core"; - version = "6.0.9"; - sha256 = "1453zyq14v9fvfzc39656gb6pazq5gwmqb3r2pni4cy5jdgd9rpi"; - }) - (fetchNuGet { - pname = "Microsoft.DotNet.PlatformAbstractions"; - version = "2.0.4"; - sha256 = "1fdzln4im9hb55agzwchbfgm3vmngigmbpci5j89b0gqcxixmv8j"; - }) - (fetchNuGet { - pname = "Microsoft.DotNet.PlatformAbstractions"; - version = "3.1.6"; - sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; - }) - (fetchNuGet { - pname = "Microsoft.EntityFrameworkCore.Abstractions"; - version = "6.0.7"; - sha256 = "0xhkh9k3xpgjdsizg1wdncwz4rdjvffq3x0sfcarscmg2j5fa4yj"; - }) - (fetchNuGet { - pname = "Microsoft.EntityFrameworkCore.Abstractions"; - version = "6.0.9"; - sha256 = "1n87lzcbvc7r0z1g2p4g0cp7081zrbkzzvlnn4n7f7jcc1mlbjb2"; - }) - (fetchNuGet { - pname = "Microsoft.EntityFrameworkCore.Analyzers"; - version = "6.0.9"; - sha256 = "1y023q4i0v1pxk269i8rmzrndsl35l6lgw8h17a0vimg7ismg3sn"; - }) - (fetchNuGet { - pname = "Microsoft.EntityFrameworkCore.Design"; - version = "6.0.9"; - sha256 = "1sj73327s4xyhml3ny7kxafdrp7s1p48niv45mlmy86qqpyps55r"; - }) - (fetchNuGet { - pname = "Microsoft.EntityFrameworkCore.Relational"; - version = "6.0.1"; - sha256 = "0224qas1rl3jv02ribb2lwfqcd64ij40v6q10369h4mrwr071zr2"; - }) - (fetchNuGet { - pname = "Microsoft.EntityFrameworkCore.Relational"; - version = "6.0.7"; - sha256 = "1kx0ac7jgf8nmp5nra4cd6h2xbwvb3zkyzx7cds60y1j9nm7lx1g"; - }) - (fetchNuGet { - pname = "Microsoft.EntityFrameworkCore.Relational"; - version = "6.0.9"; - sha256 = "18wfjh8b6j4z9ndil0d6h3bwjx1gxka94z6i4sgn8sg2lz65qlfs"; - }) - (fetchNuGet { - pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; - version = "6.0.9"; - sha256 = "0yxsqdfcszxls3s82fminb4dkwz78ywgry18gb9bhsx0y3az3hqz"; - }) - (fetchNuGet { - pname = "Microsoft.EntityFrameworkCore.Sqlite"; - version = "6.0.9"; - sha256 = "0wdajhdlls17gfvvf01czbl5m12nkac42hx8yyjn3vgcb5vdp81f"; - }) - (fetchNuGet { - pname = "Microsoft.EntityFrameworkCore"; - version = "6.0.9"; - sha256 = "1y5c0l3mckpn9fjvnc65rycym2w1fghwp7dn0srbb14yn8livb0a"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Caching.Abstractions"; - version = "2.2.0"; - sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Caching.Abstractions"; - version = "6.0.0"; - sha256 = "0qn30d3pg4rx1x2k525jj4x5g1fxm2v5m0ksz2dmk1gmqalpask8"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Caching.Memory"; - version = "6.0.1"; - sha256 = "0ra0ldbg09r40jzvfqhpb3h42h80nafvka9hg51dja32k3mxn5gk"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.Abstractions"; - version = "1.1.2"; - sha256 = "0z83kxfzsgqlshg4x1mhdnhlrprrwsgnnibvwk257drzy9079994"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.Abstractions"; - version = "2.0.0"; - sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.Abstractions"; - version = "2.1.0"; - sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.Abstractions"; - version = "3.1.10"; - sha256 = "1pj4n3c015ils13fwky2rfv5q8xza671ixb54vr479pc7an2fah3"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.Abstractions"; - version = "3.1.5"; - sha256 = "03jwqjrfyx11ax19bq84c28qzaiyj4whrx7vayy4hr7sv0p28h8k"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.Abstractions"; - version = "6.0.0"; - sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.Binder"; - version = "2.0.0"; - sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.Binder"; - version = "3.1.10"; - sha256 = "004f9nshm5jg0g4n9f48phjx90pzmj88qbqyiimzgvwl0qkk870q"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.Binder"; - version = "3.1.5"; - sha256 = "0310pvrwbbqak7k4s32syryqxlkwli8w8bwlpnqmz42svh2302wv"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; - version = "2.1.0"; - sha256 = "0xx3idb1l5y1da5zynlys5gyarijmw5pc9hgci8xdxbrcv6rzbjb"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.FileExtensions"; - version = "2.1.0"; - sha256 = "1lz2xwm63clbh9dfhmygbqvcp4dsrwh5jihv82dmqd5h7lqngl40"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.Ini"; - version = "2.1.0"; - sha256 = "0bchsljywcq36si4zs2dcx2gj8x98ww93dh2bx2z6x5ilxyjnfip"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration"; - version = "2.0.0"; - sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration"; - version = "2.1.0"; - sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration"; - version = "3.1.10"; - sha256 = "04xjhi2pmvycx4yam7i3j2l2yjzzbzvxn4i12f00r39j4kkfwqsn"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration"; - version = "3.1.5"; - sha256 = "1i7zm8ghgxwp655anyfm910qm7rcpvrz48fxjyzw9w63hj4sv6bk"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "2.0.0"; - sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "2.1.0"; - sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "3.1.10"; - sha256 = "0c9p32jd8fi5k02nbp7ilj0jmnl63kq2464acpsb6ajs4837c02q"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "3.1.5"; - sha256 = "1wkf8ajh4pj6g3wwd18g3hjc3lqqny8052rl373ddcardxrs2gvn"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "6.0.0"; - sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.DependencyInjection"; - version = "2.0.0"; - sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.DependencyInjection"; - version = "3.1.10"; - sha256 = "0if1g8gj3ngvqf4ddkjhz30p4y2yax8m5vlbrjzgixq80g3apy6d"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.DependencyInjection"; - version = "6.0.0"; - sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.DependencyModel"; - version = "2.0.4"; - sha256 = "041i1vlcibpzgalxxzdk81g5pgmqvmz2g61k0rqa2sky0wpvijx9"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.DependencyModel"; - version = "5.0.0"; - sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.DependencyModel"; - version = "6.0.0"; - sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.FileProviders.Abstractions"; - version = "2.0.0"; - sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.FileProviders.Abstractions"; - version = "2.1.0"; - sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.FileProviders.Physical"; - version = "2.1.0"; - sha256 = "1firpsl5bk219i9gdfgiqw1zm68146h1dzx9hvawfpw9slfaa56w"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.FileSystemGlobbing"; - version = "2.1.0"; - sha256 = "1d2622qp22x1cnlwycnzjbc3sgi9jria26fk78zwzsa08npa3avv"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Hosting.Abstractions"; - version = "2.0.0"; - sha256 = "056wgjcdzvz1qwb26xv6hgxq4xya56qiimhk30v8an8cgsrjk3mc"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Hosting.Abstractions"; - version = "2.1.0"; - sha256 = "04vm9mdjjzg3lpp2rzpgkpn8h5bzdl3bwcr22lshd3kp602ws4k9"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Identity.Core"; - version = "6.0.9"; - sha256 = "1g9jsqxaif9z5m228rci54w6cqmg07i0cm618iwa0jibsphx86fk"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Identity.Stores"; - version = "6.0.9"; - sha256 = "1fkv6knvv20n86i4nxpgxhr98js1xvmb8h5mazs8vgafbj3pq505"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Abstractions"; - version = "1.0.0"; - sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Abstractions"; - version = "1.1.2"; - sha256 = "0j9b4z3pf8a5xphx3ksn6jm01rf4z001vfll5kcbxw995xcidjw1"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Abstractions"; - version = "2.0.0"; - sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Abstractions"; - version = "2.1.0"; - sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Abstractions"; - version = "3.1.10"; - sha256 = "1571q9iznbsmd7p87w420parmpdgi8zfjcs4kynmwv344dwdismz"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Abstractions"; - version = "3.1.5"; - sha256 = "0lr22hlf52csrna9ly2lbz3y1agfgdlg7rvsqjg7ik488dhkmhji"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Abstractions"; - version = "6.0.0"; - sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Filter"; - version = "1.1.2"; - sha256 = "1pip87q89376xxpi3r5pf9vxhqxx21qrp179fbldbkr2m1577k9m"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging"; - version = "2.0.0"; - sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging"; - version = "3.1.10"; - sha256 = "1lf1hgpk0d5g9mv68f9b2cp6jhpnc4a6bflc1f2mn9x4dvmpv2wi"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging"; - version = "6.0.0"; - sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; - version = "2.0.0"; - sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; - version = "3.1.5"; - sha256 = "10w78fj2jpmghvprz6b046xcr68zzp6x550a7m1iivn0h7a3l7pi"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Options"; - version = "2.0.0"; - sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Options"; - version = "3.1.10"; - sha256 = "0kmh12w0y4bf2jnmbbxk10mqnynjqa5qks5pa0zg4vsnfscj8i95"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Options"; - version = "3.1.5"; - sha256 = "0rhqyqa7vhlmz2g0250zhypaayvckx4dv89micdg521cpvr5arpr"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Options"; - version = "6.0.0"; - sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.PlatformAbstractions"; - version = "1.1.0"; - sha256 = "0r4j8v2vvp3kalvb11ny9cvpls3nrvqj0c81rxbkh99ynd2dbscp"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Primitives"; - version = "1.1.1"; - sha256 = "0rcwxz1r89y96s8k3bmg0v6zdqanqfp09khy5l99wnl777y15g7x"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Primitives"; - version = "2.0.0"; - sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Primitives"; - version = "2.1.0"; - sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Primitives"; - version = "2.2.0"; - sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Primitives"; - version = "3.1.10"; - sha256 = "0a3f35427hpai0wq1wlqpn4m5aacfddkq25hp71nwlz5zm1dqfmk"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Primitives"; - version = "3.1.5"; - sha256 = "0n2pk1sy8ikd29282sx4ps9r1wnhzgg4nwmkka9ypjizd8lkkk2m"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Primitives"; - version = "6.0.0"; - sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; - }) - (fetchNuGet { - pname = "Microsoft.IdentityModel.JsonWebTokens"; - version = "6.6.0"; - sha256 = "06z5a1jpqpdd1pix85is7kkpn4v0l4an909skji2p8gm09p5sfyv"; - }) - (fetchNuGet { - pname = "Microsoft.IdentityModel.Logging"; - version = "6.6.0"; - sha256 = "1mpkx544cbxws1a22zwxbp3lqqamcc3x915l23spsxqvgr02jjrq"; - }) - (fetchNuGet { - pname = "Microsoft.IdentityModel.Tokens"; - version = "6.6.0"; - sha256 = "0h5vbsd5x9cf7nqyrwn7d7y1axhf1zz0jr9prvi4xpxawa3kajyj"; - }) - (fetchNuGet { - pname = "Microsoft.NET.Test.Sdk"; - version = "17.3.2"; - sha256 = "0pm06nxqi8aw04lciqy7iz8ln1qm5mx06cpwgqa2dfwvnjp7zxnm"; - }) - (fetchNuGet { - pname = "Microsoft.NetCore.Analyzers"; - version = "3.3.2"; - sha256 = "1h1bjiiw64qncs61p2idwxswv4kzq06bbl2rlghiagv6sbjk4pnq"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Platforms"; - version = "1.0.1"; - sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Platforms"; - version = "2.0.0"; - sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Platforms"; - version = "2.1.2"; - sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Targets"; - version = "1.0.1"; - sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Targets"; - version = "1.1.0"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }) - (fetchNuGet { - pname = "Microsoft.TestPlatform.ObjectModel"; - version = "17.3.2"; - sha256 = "0bs38r5kdw1xpbjbi5l82xbhfnfbzr5xhg5520lk05pg914d1ln1"; - }) - (fetchNuGet { - pname = "Microsoft.TestPlatform.TestHost"; - version = "17.3.2"; - sha256 = "089nmaxzvm5xcf20pm4iiavz2k6lwh69r51xlbqg0ry605mnl869"; - }) - (fetchNuGet { - pname = "Microsoft.Win32.Primitives"; - version = "4.3.0"; - sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; - }) - (fetchNuGet { - pname = "Microsoft.Win32.SystemEvents"; - version = "6.0.0"; - sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; - }) - (fetchNuGet { - pname = "MimeKit"; - version = "3.3.0"; - sha256 = "0rslxmwlv6w2fssv0mz2v6qi6zg1v0lmly6hvh258xqdfxrhn0y8"; - }) - (fetchNuGet { - pname = "MySqlConnector"; - version = "2.1.2"; - sha256 = "12wgwns172vjldp1cvcq212zizpw18za7z3438rdh40zkq55s5yz"; - }) - (fetchNuGet { - pname = "NBitcoin.Altcoins"; - version = "3.0.8"; - sha256 = "1qck2nfj8494pxwzhccslq4cbypsgnwcv3nvz24czsd87wn8n618"; - }) - (fetchNuGet { - pname = "NBitcoin"; - version = "5.0.40"; - sha256 = "1rqzn84yaww4afagwg8jg1l5qdkvqyjdfcyd5widddqwxabbsjvh"; - }) - (fetchNuGet { - pname = "NBitcoin"; - version = "6.0.18"; - sha256 = "1dr669h68cx6yfzr3n97yzzwbgnsv5g2008diyxngdjm55nh3q9s"; - }) - (fetchNuGet { - pname = "NBitcoin"; - version = "6.0.8"; - sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; - }) - (fetchNuGet { - pname = "NBitcoin"; - version = "7.0.1"; - sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7"; - }) - (fetchNuGet { - pname = "NBitcoin"; - version = "7.0.11"; - sha256 = "1v5fiyi2jci162jjga9cgmh2p6ig6yxj4zr151x0fa8rwaz5f1md"; - }) - (fetchNuGet { - pname = "NBitpayClient"; - version = "1.0.0.39"; - sha256 = "1sgwradg7jnb4n3chwqfkximj1qhgl3r23p0sifmaa0kql2hlira"; - }) - (fetchNuGet { - pname = "NBXplorer.Client"; - version = "4.2.0"; - sha256 = "1adbn5cbr42cjfvijaf1lffhcrcn0ws1arfi7mrg3kjshbzfgims"; - }) - (fetchNuGet { - pname = "NETStandard.Library"; - version = "1.6.1"; - sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; - }) - (fetchNuGet { - pname = "Newtonsoft.Json.Bson"; - version = "1.0.1"; - sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; - }) - (fetchNuGet { - pname = "Newtonsoft.Json.Bson"; - version = "1.0.2"; - sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; - }) - (fetchNuGet { - pname = "Newtonsoft.Json.Schema"; - version = "3.0.14"; - sha256 = "1njk1arrf8pbx0i0p3yww459i70p0fcx02vs0jnbb6znvcy4mvh6"; - }) - (fetchNuGet { - pname = "Newtonsoft.Json"; - version = "11.0.2"; - sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; - }) - (fetchNuGet { - pname = "Newtonsoft.Json"; - version = "12.0.3"; - sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; - }) - (fetchNuGet { - pname = "Newtonsoft.Json"; - version = "13.0.1"; - sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; - }) - (fetchNuGet { - pname = "Newtonsoft.Json"; - version = "9.0.1"; - sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; - }) - (fetchNuGet { - pname = "NicolasDorier.CommandLine.Configuration"; - version = "1.0.0.3"; - sha256 = "0al0pd4zhjpmn8m208xjmy17cbyab68grzdvzr2lhsckwkl6b1jg"; - }) - (fetchNuGet { - pname = "NicolasDorier.CommandLine"; - version = "1.0.0.2"; - sha256 = "08a9l18zkhcfa6f56xqylzvmqjzgxsmgkpm2r3ckvxfyml6w0qyy"; - }) - (fetchNuGet { - pname = "NicolasDorier.RateLimits"; - version = "1.2.3"; - sha256 = "197cqb0yxd2hfxyikxw53m4lmxh87l9sqrr8xihg1j0knvwzgyyp"; - }) - (fetchNuGet { - pname = "NicolasDorier.StandardConfiguration"; - version = "1.0.0.18"; - sha256 = "0lgssxafv6cqlw21fb79fm0fcln0clgsk6zadcwrnjv9vampfw7b"; - }) - (fetchNuGet { - pname = "NLog"; - version = "4.7.14"; - sha256 = "1pjkxlf20vrh9b8r6wzay1563fdhhxslxb7acdkn5ss8gvd2m23n"; - }) - (fetchNuGet { - pname = "Npgsql.EntityFrameworkCore.PostgreSQL"; - version = "6.0.7"; - sha256 = "0gsvjf0vk7anmc889my8x68wpd47bsdgsk1rwbg77rrb9zsf4nxp"; - }) - (fetchNuGet { - pname = "Npgsql"; - version = "6.0.7"; - sha256 = "0c5zyd9n3597ryzqh9qfisp3wvr7q0krbnl26w2sy33xm4hvls2c"; - }) - (fetchNuGet { - pname = "NSec.Cryptography"; - version = "20.2.0"; - sha256 = "19slji51v8s8i4836nqqg7qb3i3p4ahqahz0fbb3gwpp67pn6izx"; - }) - (fetchNuGet { - pname = "NuGet.Frameworks"; - version = "5.11.0"; - sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; - }) - (fetchNuGet { - pname = "NUglify"; - version = "1.5.14"; - sha256 = "00sy6m88z9q08ad7v55vczibxa74xwb2izrg9zinxdbihprgw92w"; - }) - (fetchNuGet { - pname = "PeterO.Cbor"; - version = "4.1.3"; - sha256 = "0882i3bhhx2yag2m4lbdsgngjwaj9ff4v0ab9zb839i4r77aq1yn"; - }) - (fetchNuGet { - pname = "PeterO.Numbers"; - version = "1.6.0"; - sha256 = "04kfdkfr600h69g67g6izbn57bxqjamvaadyw3p9gjsc0wrivi98"; - }) - (fetchNuGet { - pname = "PeterO.URIUtility"; - version = "1.0.0"; - sha256 = "04ihfbk2lf0smznwfb62h57qknls5jyxirdz72g5wn9h1dcgkdac"; - }) - (fetchNuGet { - pname = "Pomelo.EntityFrameworkCore.MySql"; - version = "6.0.1"; - sha256 = "1g212yfzlphn97gn7v4zcpi4ihfk1xp014kw498pcma49dqirn54"; - }) - (fetchNuGet { - pname = "Portable.BouncyCastle"; - version = "1.9.0"; - sha256 = "0kphjwz4hk2nki3b4f9z096xzd520nrpvi3cjib8fkjk6zhwrr8q"; - }) - (fetchNuGet { - pname = "QRCoder"; - version = "1.4.3"; - sha256 = "1hmlqbdyq5n9bsmns5h0dwcxpd2jvqr9a2y6dyc9kbjmc8j1dpla"; - }) - (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.Net.Security"; - version = "4.3.0"; - sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; - }) - (fetchNuGet { - pname = "runtime.native.System.Security.Cryptography.Apple"; - version = "4.3.0"; - sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; - }) - (fetchNuGet { - pname = "runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; - }) - (fetchNuGet { - pname = "runtime.native.System"; - version = "4.0.0"; - sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; - }) - (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 = "Selenium.Support"; - version = "4.1.1"; - sha256 = "1bcvvcybbw22yv9bz10jdms5za2ajczil9kzwjh9zs6yy41gqnwl"; - }) - (fetchNuGet { - pname = "Selenium.WebDriver.ChromeDriver"; - version = "105.0.5195.5200"; - sha256 = "0vna0mnd2zay6gpgjkd0c4haf2ga8l6grbbhjb6ffzhglyz14993"; - }) - (fetchNuGet { - pname = "Selenium.WebDriver"; - version = "4.1.1"; - sha256 = "0gavlsanyiff9rxn34cinv0q2m3a8wh66ynlm9mxwkmmybzbbqz4"; - }) - (fetchNuGet { - pname = "Serilog.AspNetCore"; - version = "3.2.0"; - sha256 = "14d1lsw1djsshlkxbn5lkmdvj4372hnddb6788m6ix0mv4mhj3bj"; - }) - (fetchNuGet { - pname = "Serilog.Extensions.Hosting"; - version = "3.0.0"; - sha256 = "1r01lsy4rp0wj7ffbjcf9dcg3aipdhy7066yjicja45m0z2y42w6"; - }) - (fetchNuGet { - pname = "Serilog.Extensions.Logging"; - version = "3.0.1"; - sha256 = "069qy7dm5nxb372ij112ppa6m99b4iaimj3sji74m659fwrcrl9a"; - }) - (fetchNuGet { - pname = "Serilog.Formatting.Compact"; - version = "1.0.0"; - sha256 = "0mi1yzzj33v4nkyspyshhc6nn2mx3y07z5dvv26hl7hw6kb6yazw"; - }) - (fetchNuGet { - pname = "Serilog.Settings.Configuration"; - version = "3.1.0"; - sha256 = "1cj5am4n073331gbfm2ylqb9cadl4q3ppzgwmm5c8m1drxpiwkb5"; - }) - (fetchNuGet { - pname = "Serilog.Sinks.Console"; - version = "3.1.1"; - sha256 = "0j99as641y1k6havwwkhyr0n08vibiblmfjj6nz051mz8g3864fn"; - }) - (fetchNuGet { - pname = "Serilog.Sinks.Debug"; - version = "1.0.1"; - sha256 = "0969mb254kr59bgkq01ybyzca89z3f4n9ng5mdj8m53d5653zf22"; - }) - (fetchNuGet { - pname = "Serilog.Sinks.File"; - version = "4.1.0"; - sha256 = "1ry7p9hf1zlnai1j5zjhjp4dqm2agsbpq6cvxgpf5l8m26x6mgca"; - }) - (fetchNuGet { - pname = "Serilog"; - version = "2.9.0"; - sha256 = "0z0ib82w9b229a728bbyhzc2hnlbl0ki7nnvmgnv3l741f2vr4i6"; - }) - (fetchNuGet { - pname = "SocketIOClient"; - version = "3.0.6"; - sha256 = "0yvvwyg05sjlam8841kxy1qv6bc7a1kykdk5jdy2jvw89d40k31d"; - }) - (fetchNuGet { - pname = "SQLitePCLRaw.bundle_e_sqlite3"; - version = "2.0.6"; - sha256 = "1ip0a653dx5cqybxg27zyz5ps31f2yz50g3jvz3vx39isx79gax3"; - }) - (fetchNuGet { - pname = "SQLitePCLRaw.core"; - version = "2.0.6"; - sha256 = "1w4iyg0v1v1z2m7akq7rv8lsgixp2m08732vr14vgpqs918bsy1i"; - }) - (fetchNuGet { - pname = "SQLitePCLRaw.lib.e_sqlite3"; - version = "2.0.6"; - sha256 = "16378rh1lcqxynf5qj0kh8mrsb0jp37qqwg4285kqc5pknvh1bx3"; - }) - (fetchNuGet { - pname = "SQLitePCLRaw.provider.e_sqlite3"; - version = "2.0.6"; - sha256 = "0chgrqyycb1kqnaxnhhfg0850b94blhzni8zn79c7ggb3pd2ykyz"; - }) - (fetchNuGet { - pname = "SSH.NET"; - version = "2020.0.2"; - sha256 = "18mq7jjdbzc7qcsh5wg2j0gd39qbnrxkn811cy8wrdvki0pfi0sm"; - }) - (fetchNuGet { - pname = "SshNet.Security.Cryptography"; - version = "1.3.0"; - sha256 = "1y9r9c2dn81l1l4nn976fwf0by83qbvb0sp1hw7m19pqz7pmaflh"; - }) - (fetchNuGet { - pname = "System.AppContext"; - version = "4.1.0"; - sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; - }) - (fetchNuGet { - pname = "System.AppContext"; - version = "4.3.0"; - sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; - }) - (fetchNuGet { - pname = "System.Buffers"; - version = "4.3.0"; - sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; - }) - (fetchNuGet { - pname = "System.Buffers"; - version = "4.5.1"; - sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; - }) - (fetchNuGet { - pname = "System.Collections.Concurrent"; - version = "4.0.12"; - sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; - }) - (fetchNuGet { - pname = "System.Collections.Concurrent"; - version = "4.3.0"; - sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; - }) - (fetchNuGet { - pname = "System.Collections.Immutable"; - version = "5.0.0"; - sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; - }) - (fetchNuGet { - pname = "System.Collections.Immutable"; - version = "6.0.0"; - sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; - }) - (fetchNuGet { - pname = "System.Collections"; - version = "4.0.11"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; - }) - (fetchNuGet { - pname = "System.Collections"; - version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; - }) - (fetchNuGet { - pname = "System.Configuration.ConfigurationManager"; - version = "6.0.0"; - sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; - }) - (fetchNuGet { - pname = "System.Console"; - version = "4.3.0"; - sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; - }) - (fetchNuGet { - pname = "System.Diagnostics.Debug"; - version = "4.0.11"; - sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; - }) - (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.DiagnosticSource"; - version = "6.0.0"; - sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; - }) - (fetchNuGet { - pname = "System.Diagnostics.Tools"; - version = "4.0.1"; - sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; - }) - (fetchNuGet { - pname = "System.Diagnostics.Tools"; - version = "4.3.0"; - sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; - }) - (fetchNuGet { - pname = "System.Diagnostics.Tracing"; - version = "4.1.0"; - sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; - }) - (fetchNuGet { - pname = "System.Diagnostics.Tracing"; - version = "4.3.0"; - sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; - }) - (fetchNuGet { - pname = "System.Drawing.Common"; - version = "6.0.0"; - sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; - }) - (fetchNuGet { - pname = "System.Dynamic.Runtime"; - version = "4.0.11"; - sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; - }) - (fetchNuGet { - pname = "System.Formats.Asn1"; - version = "6.0.0"; - sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; - }) - (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.0.11"; - sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; - }) - (fetchNuGet { - pname = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - (fetchNuGet { - pname = "System.IdentityModel.Tokens.Jwt"; - version = "6.6.0"; - sha256 = "17i6a43g1fksq9xy77dgsz54klz71pz062pb58lqx8h06p1818h1"; - }) - (fetchNuGet { - pname = "System.Interactive.Async"; - version = "3.1.1"; - sha256 = "03iq20gq0n2b2sdzs5jhxf46nzkfgvzip6q5248vka2rcvn1yanh"; - }) - (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.0.1"; - sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; - }) - (fetchNuGet { - pname = "System.IO.FileSystem.Primitives"; - version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; - }) - (fetchNuGet { - pname = "System.IO.FileSystem"; - version = "4.0.1"; - sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; - }) - (fetchNuGet { - pname = "System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; - }) - (fetchNuGet { - pname = "System.IO.Pipelines"; - version = "6.0.3"; - sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; - }) - (fetchNuGet { - pname = "System.IO"; - version = "4.1.0"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; - }) - (fetchNuGet { - pname = "System.IO"; - version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }) - (fetchNuGet { - pname = "System.Linq.Expressions"; - version = "4.1.0"; - sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; - }) - (fetchNuGet { - pname = "System.Linq.Expressions"; - version = "4.3.0"; - sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; - }) - (fetchNuGet { - pname = "System.Linq"; - version = "4.1.0"; - sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; - }) - (fetchNuGet { - pname = "System.Linq"; - version = "4.3.0"; - sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; - }) - (fetchNuGet { - pname = "System.Memory"; - version = "4.5.0"; - sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; - }) - (fetchNuGet { - pname = "System.Memory"; - version = "4.5.1"; - sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; - }) - (fetchNuGet { - pname = "System.Memory"; - version = "4.5.3"; - sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; - }) - (fetchNuGet { - pname = "System.Memory"; - version = "4.5.4"; - sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; - }) - (fetchNuGet { - pname = "System.Net.Http"; - version = "4.3.0"; - sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; - }) - (fetchNuGet { - pname = "System.Net.NameResolution"; - version = "4.3.0"; - sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; - }) - (fetchNuGet { - pname = "System.Net.Primitives"; - version = "4.3.0"; - sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; - }) - (fetchNuGet { - pname = "System.Net.Security"; - version = "4.3.0"; - sha256 = "1aa5igz31ivk6kpgsrwck3jccab7wd88wr52lddmgypmbh9mmf87"; - }) - (fetchNuGet { - pname = "System.Net.Sockets"; - version = "4.3.0"; - sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; - }) - (fetchNuGet { - pname = "System.Net.WebHeaderCollection"; - version = "4.3.0"; - sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; - }) - (fetchNuGet { - pname = "System.Net.WebSockets.Client"; - version = "4.3.2"; - sha256 = "103y8lfsfa5xd1sqmq9sml4qyp4rij2i3fnnw119h119hb04l0rk"; - }) - (fetchNuGet { - pname = "System.Net.WebSockets"; - version = "4.3.0"; - sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; - }) - (fetchNuGet { - pname = "System.ObjectModel"; - version = "4.0.12"; - sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; - }) - (fetchNuGet { - pname = "System.ObjectModel"; - version = "4.3.0"; - sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; - }) - (fetchNuGet { - pname = "System.Reactive"; - version = "5.0.0"; - sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; - }) - (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"; - }) - (fetchNuGet { - pname = "System.Reflection.Emit.Lightweight"; - version = "4.3.0"; - sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; - }) - (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.Extensions"; - version = "4.0.1"; - sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; - }) - (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.Metadata"; - version = "5.0.0"; - sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; - }) - (fetchNuGet { - pname = "System.Reflection.Primitives"; - version = "4.0.1"; - sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; - }) - (fetchNuGet { - pname = "System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; - }) - (fetchNuGet { - pname = "System.Reflection.TypeExtensions"; - version = "4.1.0"; - sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; - }) - (fetchNuGet { - pname = "System.Reflection.TypeExtensions"; - version = "4.3.0"; - sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; - }) - (fetchNuGet { - pname = "System.Reflection"; - version = "4.1.0"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; - }) - (fetchNuGet { - pname = "System.Reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }) - (fetchNuGet { - pname = "System.Resources.ResourceManager"; - version = "4.0.1"; - sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; - }) - (fetchNuGet { - pname = "System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; - }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; - version = "4.3.0"; - sha256 = "149xcsa1pphlrc2zfmca9n822g4mxk7s2a44phvf34r0fajm3hk8"; - }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; - version = "4.4.0"; - sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; - }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; - version = "4.5.0"; - sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; - }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; - version = "4.5.1"; - sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; - }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; - version = "4.7.0"; - sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; - }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; - version = "5.0.0"; - sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; - }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; - version = "6.0.0"; - sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; - }) - (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"; - }) - (fetchNuGet { - pname = "System.Runtime.Handles"; - version = "4.3.0"; - sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; - }) - (fetchNuGet { - pname = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.0.0"; - sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; - }) - (fetchNuGet { - pname = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.3.0"; - sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; - }) - (fetchNuGet { - pname = "System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; - }) - (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.Serialization.Primitives"; - version = "4.1.1"; - sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; - }) - (fetchNuGet { - pname = "System.Runtime"; - version = "4.1.0"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; - }) - (fetchNuGet { - pname = "System.Runtime"; - version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }) - (fetchNuGet { - pname = "System.Security.AccessControl"; - version = "6.0.0"; - sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; - }) - (fetchNuGet { - pname = "System.Security.Claims"; - version = "4.3.0"; - sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.Algorithms"; - version = "4.3.0"; - sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.Cng"; - version = "4.3.0"; - sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.Cng"; - version = "4.7.0"; - sha256 = "00797sqbba8lys486ifxblz9j52m29kidclvmqpk531820k55x9j"; - }) - (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.Pkcs"; - version = "6.0.0"; - sha256 = "1q80znpwkv5wrzgx0qnzxqaa5k1s72fnk3g1yng62l7y14d8ki64"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.Primitives"; - version = "4.3.0"; - sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.ProtectedData"; - version = "6.0.0"; - sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.X509Certificates"; - version = "4.3.0"; - sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; - }) - (fetchNuGet { - pname = "System.Security.Permissions"; - version = "6.0.0"; - sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; - }) - (fetchNuGet { - pname = "System.Security.Principal.Windows"; - version = "4.3.0"; - sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; - }) - (fetchNuGet { - pname = "System.Security.Principal"; - version = "4.3.0"; - sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; - }) - (fetchNuGet { - pname = "System.Text.Encoding.CodePages"; - version = "4.5.0"; - sha256 = "19x38911pawq4mrxrm04l2bnxwxxlzq8v8rj4cbxnfjj8pnd3vj3"; - }) - (fetchNuGet { - pname = "System.Text.Encoding.CodePages"; - version = "4.5.1"; - sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; - }) - (fetchNuGet { - pname = "System.Text.Encoding.CodePages"; - version = "6.0.0"; - sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; - }) - (fetchNuGet { - pname = "System.Text.Encoding.Extensions"; - version = "4.0.11"; - sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; - }) - (fetchNuGet { - pname = "System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; - }) - (fetchNuGet { - pname = "System.Text.Encoding"; - version = "4.0.11"; - sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; - }) - (fetchNuGet { - pname = "System.Text.Encoding"; - version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; - }) - (fetchNuGet { - pname = "System.Text.Encodings.Web"; - version = "4.4.0"; - sha256 = "05qp3yivh6gz0vva0v3wjlj3g1b45d5jmz362f2y8ah6yb3rx088"; - }) - (fetchNuGet { - pname = "System.Text.Encodings.Web"; - version = "6.0.0"; - sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; - }) - (fetchNuGet { - pname = "System.Text.Json"; - version = "6.0.0"; - sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; - }) - (fetchNuGet { - pname = "System.Text.Json"; - version = "6.0.2"; - sha256 = "1lz6gx1r4if8sbx6yp9h0mi0g9ffr40x0cg518l0z2aiqgil3fk0"; - }) - (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.Channels"; - version = "4.5.0"; - sha256 = "0n6z3wjia7h2a5vl727p97riydnb6jhhkb1pdcnizza02dwkz0nz"; - }) - (fetchNuGet { - pname = "System.Threading.Channels"; - version = "4.7.1"; - sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2"; - }) - (fetchNuGet { - pname = "System.Threading.Tasks.Extensions"; - version = "4.0.0"; - sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; - }) - (fetchNuGet { - pname = "System.Threading.Tasks.Extensions"; - version = "4.3.0"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; - }) - (fetchNuGet { - pname = "System.Threading.Tasks.Extensions"; - version = "4.5.4"; - sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; - }) - (fetchNuGet { - pname = "System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; - }) - (fetchNuGet { - pname = "System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; - }) - (fetchNuGet { - pname = "System.Threading.ThreadPool"; - version = "4.3.0"; - sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; - }) - (fetchNuGet { - pname = "System.Threading.Timer"; - version = "4.0.1"; - sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; - }) - (fetchNuGet { - pname = "System.Threading.Timer"; - version = "4.3.0"; - sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; - }) - (fetchNuGet { - pname = "System.Threading"; - version = "4.0.11"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; - }) - (fetchNuGet { - pname = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }) - (fetchNuGet { - pname = "System.Windows.Extensions"; - version = "6.0.0"; - sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; - }) - (fetchNuGet { - pname = "System.Xml.ReaderWriter"; - version = "4.0.11"; - sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; - }) - (fetchNuGet { - pname = "System.Xml.ReaderWriter"; - version = "4.3.0"; - sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; - }) - (fetchNuGet { - pname = "System.Xml.XDocument"; - version = "4.0.11"; - sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; - }) - (fetchNuGet { - pname = "System.Xml.XDocument"; - version = "4.3.0"; - sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; - }) - (fetchNuGet { - pname = "Text.Analyzers"; - version = "3.3.3"; - sha256 = "1fkx07xi049mlzskrw9422zpikdppsgf7vi2lq97qs5rvly3rfvp"; - }) - (fetchNuGet { - pname = "TwentyTwenty.Storage.Amazon"; - version = "2.12.1"; - sha256 = "03nrkvhki35w1rqx94s97rwxl0qwqlczyiimhrkc72vjppn5p6ph"; - }) - (fetchNuGet { - pname = "TwentyTwenty.Storage.Azure"; - version = "2.12.1"; - sha256 = "10q7gpr8kmgzmxrzj3paqlnw4d8li8scwpxkzs11ildscfp6hvlv"; - }) - (fetchNuGet { - pname = "TwentyTwenty.Storage.Google"; - version = "2.12.1"; - sha256 = "0d8s7p9brp03h9dpv3wxnqg0xsm7d9p4k6dpxpb9jak535khxzhp"; - }) - (fetchNuGet { - pname = "TwentyTwenty.Storage.Local"; - version = "2.12.1"; - sha256 = "1zmjqwd1v3z78ab4vdmaadh94465k1qgpv7ylv8x3sdx4z78yjm8"; - }) - (fetchNuGet { - pname = "TwentyTwenty.Storage"; - version = "2.12.1"; - sha256 = "0m41dxzc3hh0f4j1k4q915pvcq6zr0hv1pj6b3sayrn8vjhk64qb"; - }) - (fetchNuGet { - pname = "WindowsAzure.Storage"; - version = "9.3.3"; - sha256 = "14b0b0nj85yvyn0h8ghr3kj6di2nkbzjxc2q98f1wcr0151xvdfx"; - }) - (fetchNuGet { - pname = "xunit.abstractions"; - version = "2.0.3"; - sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; - }) - (fetchNuGet { - pname = "xunit.analyzers"; - version = "1.0.0"; - sha256 = "0p4f24c462z49gvbh3k4z5ksa8ffa6p8abdgysqbbladl96im4c5"; - }) - (fetchNuGet { - pname = "xunit.assert"; - version = "2.4.2"; - sha256 = "0ifdry9qq3yaw2lfxdll30ljx1jkyhwwy3ydw6gd97y3kifr3k60"; - }) - (fetchNuGet { - pname = "xunit.core"; - version = "2.4.2"; - sha256 = "1ir029igwm6b571lcm6585v5yxagy66rwrg26v4a1fnjq9dnh4cd"; - }) - (fetchNuGet { - pname = "xunit.extensibility.core"; - version = "2.4.2"; - sha256 = "1h0a62xddsd82lljfjldn1nqy17imga905jb7j0ddr10wi8cqm62"; - }) - (fetchNuGet { - pname = "xunit.extensibility.execution"; - version = "2.4.2"; - sha256 = "0r9gczqz4bc59cwl6d6wali6pvlw210i97chc1nlwn2qh383m54p"; - }) - (fetchNuGet { - pname = "xunit.runner.visualstudio"; - version = "2.4.5"; - sha256 = "0y8w33ci80z8k580pp24mfnaw1r8ji0w3az543xxcz6aagax9zhs"; - }) - (fetchNuGet { - pname = "xunit"; - version = "2.4.2"; - sha256 = "0barl6x1qwx9srjxnanw9z0jik7lv1fp6cvmgqhk10aiv57dgqxm"; - }) - (fetchNuGet { - pname = "YamlDotNet"; - version = "8.0.0"; - sha256 = "09hr1jimmfhcpk97p963y94h2k5p7wzcj4mpwqpdnwzbyrp2flpm"; - }) + (fetchNuGet { pname = "AngleSharp"; version = "0.14.0"; sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; }) + (fetchNuGet { pname = "AngleSharp.Css"; version = "0.14.2"; sha256 = "1d34a8ab5dri4wlw07jvk7b1z0d0zizwihwpdfva3sxhb4279ahd"; }) + (fetchNuGet { pname = "AWSSDK.Core"; version = "3.3.104.14"; sha256 = "157694kb63z1szbsv861515fvjv7amrjrfmgbm3idpyw31afk650"; }) + (fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; }) + (fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; }) + (fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.18"; sha256 = "1w1h6za2mjk04njkw4hny3lx38h2m03gmvwrihj9h2rak7jf2gij"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.24"; sha256 = "0i0lqpxx0gy9zbssjigz0vq0way88x0slyyfijsx4sasrhrbv5qs"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; sha256 = "042xwfsxd30zgwiz0w14ynb755w5sldkplxgw1fkw68lrz66x5s4"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.20"; sha256 = "093w82mcxxxbvx66j0sp3lsfm2bkbi3igm80iz9zdghy85845kc9"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.23"; sha256 = "036cggc386448i05s38pnhzs7qqbix6lml7j2zn84gcgk8w741gi"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.14"; sha256 = "1gzqz34lgk42kf86ldi3z0k4m9x91hlkqh6d7rq93nphl57mwqar"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.16"; sha256 = "0l6pnjc6phsacwg145kwsakjpkd44jm1w53y0s166bwzpcdmljq0"; }) + (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; }) + (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; }) + (fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; }) + (fetchNuGet { pname = "Dapper"; version = "2.0.123"; sha256 = "15hxrchfgiqnmgf8fqhrf4pb4c8l9igg5qnkw9yk3rkagcqfkk91"; }) + (fetchNuGet { pname = "DigitalRuby.ExchangeSharp"; version = "1.0.2"; sha256 = "1l6g61l18jqnc0h8rpsilfjjnyapm4ld8wcsr8bp0hp34p6wpidm"; }) + (fetchNuGet { pname = "Fido2"; version = "2.0.2"; sha256 = "1wqlk48apm7h637da7sav0r1a8yz2yy2gxhifpvydjqk1n3qybz4"; }) + (fetchNuGet { pname = "Fido2.AspNet"; version = "2.0.2"; sha256 = "0x2k1wyd0p7cy4ir15m2bxiggckl98znc65b4vq75ckjyd6dm1a1"; }) + (fetchNuGet { pname = "Fido2.Models"; version = "2.0.2"; sha256 = "1vk4h9sv2dhdr0jvh2a7yk6v9rhxk9y8hxz4mkal8vd9psajz5cg"; }) + (fetchNuGet { pname = "Google.Api.Gax"; version = "2.5.0"; sha256 = "0q6pi53px998i3gdndla8v0zqdpyi9gnsy9mdcfpkrg09vfbdsl9"; }) + (fetchNuGet { pname = "Google.Api.Gax.Rest"; version = "2.5.0"; sha256 = "1zkjl5zh6qwdz4qmnxnk5877pas638i2qi25znilhqqf3mrkp0rp"; }) + (fetchNuGet { pname = "Google.Apis"; version = "1.35.1"; sha256 = "1022l8m7v9f3rkjc9l11mkzwsbmqx9sk5f4aym035vn9hdr16d49"; }) + (fetchNuGet { pname = "Google.Apis"; version = "1.38.0"; sha256 = "01j3d1lv106cqw9n0lwgclrxghy852fsibv6av4xr03ivrkm8g40"; }) + (fetchNuGet { pname = "Google.Apis.Auth"; version = "1.35.1"; sha256 = "1qdnd1nq9bfgyljmiww91pfi0iz1n29rz2dlizhxcijqya2ldha3"; }) + (fetchNuGet { pname = "Google.Apis.Auth"; version = "1.38.0"; sha256 = "0x3bdwiyqjxw5df99bfasmsv09kb47wzisag938631cijl0g277y"; }) + (fetchNuGet { pname = "Google.Apis.Core"; version = "1.35.1"; sha256 = "01dfw2kxknlc5pm7x1q88lv9j979509lkkgvlffjry5bawsxsja4"; }) + (fetchNuGet { pname = "Google.Apis.Core"; version = "1.38.0"; sha256 = "012gslhnx65vqfyzjnqx4bqk9kb8bwbx966q2f9fdgrfcn26gj9j"; }) + (fetchNuGet { pname = "Google.Apis.Storage.v1"; version = "1.38.0.1470"; sha256 = "0mfrz7fmpfbjvp4zfpjasmnfbgxgxrrjkf8xgp9p6h9g8qh2f2h2"; }) + (fetchNuGet { pname = "Google.Cloud.Storage.V1"; version = "2.3.0"; sha256 = "01jhrd6m6md8m28chzg2dkdfd4yris79j1xi7r1ydm1cfjhmlj64"; }) + (fetchNuGet { pname = "HtmlSanitizer"; version = "5.0.372"; sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r"; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "2.8.26"; sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; }) + (fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; }) + (fetchNuGet { pname = "LNURL"; version = "0.0.28"; sha256 = "1fcrq5ib02scz6n4zvmnbvm2aahj6qwwq6wsfix90caqm2c2bq64"; }) + (fetchNuGet { pname = "MailKit"; version = "3.3.0"; sha256 = "18l0jkrc4d553kiw4vdjzzpafpvsgjs1n19kjbi8isnhzidmsl4j"; }) + (fetchNuGet { pname = "Microsoft.AspNet.SignalR.Client"; version = "2.4.3"; sha256 = "1whxcmxydcxjkw84sqk5idd406v3ia0xj2m4ia4b6wqbvkdqn7rf"; }) + (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; sha256 = "1sy1q36bm9fz3gi780w4jgysw3dwaz2f3a5gcn6jxw1gkmdasb08"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "3.1.10"; sha256 = "05drcgbpzq700kvxnfxha10w3jgfp2jp0r2h4hpczjxj6cywbbi6"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "6.0.9"; sha256 = "11wxfjbx111rl5s737wwbiz4b86fpbh98rlb87ycqb0b2y3yvmw3"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; version = "6.0.9"; sha256 = "0102pl980h0q9qfpad2nkhk3a6aygbf7i1gbgr2zm4r22fkbmb2n"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Abstractions"; version = "2.0.0"; sha256 = "0x6vw7kiy9z7cdmgbqav0d9wq66032wg39l2c9cv6xvxxvdpbkz7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; version = "2.0.0"; sha256 = "1k4dr6l32swi8zasfvzxixnjvgbrra7v6lgpri0929vb3r5lagjb"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Abstractions"; version = "2.0.0"; sha256 = "1hgmnd5mj35g8cqq3mdhjf9cmi3wm5lqiyrj5mgfscnig6i686xr"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "3.1.10"; sha256 = "1sni7hjpylamxaf98insalx3jj2k8skb02mhkmamxxj2488r2p9j"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "3.1.10"; sha256 = "19mddj0dpy4j6fwh8b1q7aznnckjrkpvbqiyq4sq4z7lcgw6pbq6"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "2.0.0"; sha256 = "1zk5ad3laa7ma83md8r80kijqzps6dcrvv0k1015nddfk1qd74s6"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "3.1.10"; sha256 = "1y6zf2qgph6ga59272msywdv2xrycg56wz50bjm5pivmh6wv9240"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; version = "6.0.9"; sha256 = "1r5rchb180addd9jqk8xgxxmh7ckcy86dcynnfb2igbs0n5m0jg7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.9"; sha256 = "0hvz79sas53949hx5sc9r1h0sxnvdggscqyp7h7qk0i27p3a9rqv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.9"; sha256 = "13vnkradd2hd7lq4jl0ikz2s965wk49snmjcf4722za3azil6sr5"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; version = "6.0.9"; sha256 = "0ck1zy967gmbx9kha8dbp3npygq2nh3c39h78fvqrpkr3i6jycp0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"; version = "6.0.9"; sha256 = "1y28w2cxk665g5503yinyzkl77hgwni7cmammvrfxgcyhviy10ch"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.Language"; version = "6.0.9"; sha256 = "0f6ffg62f3g55gn1wkfgiwiff4lawzlm2yn4k6a89bgrgrfp2jlr"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "3.1.10"; sha256 = "1s352srycksfnvz5hhi7himpg2gn39iw2gizlc3g30w6pvy8p29c"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "3.1.10"; sha256 = "1289624ilk45ca8rkyvirqdjsg9jsnqn8dzbjr6f83641fi73s69"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "3.1.10"; sha256 = "0c6lim7my3alq43xxqkgykba068hjlzdcif6c956irailijc0smw"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "3.1.10"; sha256 = "0qzdpblmgqm3bl5wr14igkqp35zwx4wdkwlh55xm4v3hzhq6l46m"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.2"; sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.0.0"; sha256 = "1rwnz5zy7ia9312n2qzzar95x9p7iiw57cql7ssdwv255xl1ix29"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.3.1"; sha256 = "0rgr6wxk5pfvljlr0841jfvss3dz5dff06h08rjgvw3793wdg592"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.0.0"; sha256 = "1mzxjy7xp8r9x25xyspq89ngsz0hmkbp0l0h3v1jv2rcrw63wqb4"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.3.1"; sha256 = "0mgw0f2k1a1lbhnf64k1sxbhy9cz46qv9d0l92bvkwh4nn3aybfg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Razor"; version = "6.0.9"; sha256 = "0rq3qbj2rn33bzhr6i5nsc4vrcngfvfv8r927k93nn3kjn11q71s"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "6.0.9"; sha256 = "1453zyq14v9fvfzc39656gb6pazq5gwmqb3r2pni4cy5jdgd9rpi"; }) + (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.0.4"; sha256 = "1fdzln4im9hb55agzwchbfgm3vmngigmbpci5j89b0gqcxixmv8j"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "6.0.9"; sha256 = "1y5c0l3mckpn9fjvnc65rycym2w1fghwp7dn0srbb14yn8livb0a"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "6.0.7"; sha256 = "0xhkh9k3xpgjdsizg1wdncwz4rdjvffq3x0sfcarscmg2j5fa4yj"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "6.0.9"; sha256 = "1n87lzcbvc7r0z1g2p4g0cp7081zrbkzzvlnn4n7f7jcc1mlbjb2"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "6.0.9"; sha256 = "1y023q4i0v1pxk269i8rmzrndsl35l6lgw8h17a0vimg7ismg3sn"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "6.0.9"; sha256 = "1sj73327s4xyhml3ny7kxafdrp7s1p48niv45mlmy86qqpyps55r"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "6.0.1"; sha256 = "0224qas1rl3jv02ribb2lwfqcd64ij40v6q10369h4mrwr071zr2"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "6.0.7"; sha256 = "1kx0ac7jgf8nmp5nra4cd6h2xbwvb3zkyzx7cds60y1j9nm7lx1g"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "6.0.9"; sha256 = "18wfjh8b6j4z9ndil0d6h3bwjx1gxka94z6i4sgn8sg2lz65qlfs"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "6.0.9"; sha256 = "0wdajhdlls17gfvvf01czbl5m12nkac42hx8yyjn3vgcb5vdp81f"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "6.0.9"; sha256 = "0yxsqdfcszxls3s82fminb4dkwz78ywgry18gb9bhsx0y3az3hqz"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "2.2.0"; sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "6.0.0"; sha256 = "0qn30d3pg4rx1x2k525jj4x5g1fxm2v5m0ksz2dmk1gmqalpask8"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "6.0.1"; sha256 = "0ra0ldbg09r40jzvfqhpb3h42h80nafvka9hg51dja32k3mxn5gk"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.10"; sha256 = "04xjhi2pmvycx4yam7i3j2l2yjzzbzvxn4i12f00r39j4kkfwqsn"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.5"; sha256 = "1i7zm8ghgxwp655anyfm910qm7rcpvrz48fxjyzw9w63hj4sv6bk"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.0"; sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.10"; sha256 = "1pj4n3c015ils13fwky2rfv5q8xza671ixb54vr479pc7an2fah3"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.5"; sha256 = "03jwqjrfyx11ax19bq84c28qzaiyj4whrx7vayy4hr7sv0p28h8k"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.10"; sha256 = "004f9nshm5jg0g4n9f48phjx90pzmj88qbqyiimzgvwl0qkk870q"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.5"; sha256 = "0310pvrwbbqak7k4s32syryqxlkwli8w8bwlpnqmz42svh2302wv"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "6.0.0"; sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Ini"; version = "6.0.0"; sha256 = "18qg1f7yvgvrgsq40cgc1yvpb9av84ma80k3grhvwn1cyam2img6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.1.10"; sha256 = "0if1g8gj3ngvqf4ddkjhz30p4y2yax8m5vlbrjzgixq80g3apy6d"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.1.0"; sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.10"; sha256 = "0c9p32jd8fi5k02nbp7ilj0jmnl63kq2464acpsb6ajs4837c02q"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.5"; sha256 = "1wkf8ajh4pj6g3wwd18g3hjc3lqqny8052rl373ddcardxrs2gvn"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.4"; sha256 = "041i1vlcibpzgalxxzdk81g5pgmqvmz2g61k0rqa2sky0wpvijx9"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.0.0"; sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.1.0"; sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.0.0"; sha256 = "056wgjcdzvz1qwb26xv6hgxq4xya56qiimhk30v8an8cgsrjk3mc"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.1.0"; sha256 = "04vm9mdjjzg3lpp2rzpgkpn8h5bzdl3bwcr22lshd3kp602ws4k9"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Identity.Core"; version = "6.0.9"; sha256 = "1g9jsqxaif9z5m228rci54w6cqmg07i0cm618iwa0jibsphx86fk"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Identity.Stores"; version = "6.0.9"; sha256 = "1fkv6knvv20n86i4nxpgxhr98js1xvmb8h5mazs8vgafbj3pq505"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "3.1.10"; sha256 = "1lf1hgpk0d5g9mv68f9b2cp6jhpnc4a6bflc1f2mn9x4dvmpv2wi"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "1.0.0"; sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.0"; sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.5"; sha256 = "0lr22hlf52csrna9ly2lbz3y1agfgdlg7rvsqjg7ik488dhkmhji"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "3.1.10"; sha256 = "0kmh12w0y4bf2jnmbbxk10mqnynjqa5qks5pa0zg4vsnfscj8i95"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "3.1.5"; sha256 = "0rhqyqa7vhlmz2g0250zhypaayvckx4dv89micdg521cpvr5arpr"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "2.0.0"; sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "3.1.5"; sha256 = "10w78fj2jpmghvprz6b046xcr68zzp6x550a7m1iivn0h7a3l7pi"; }) + (fetchNuGet { pname = "Microsoft.Extensions.PlatformAbstractions"; version = "1.1.0"; sha256 = "0r4j8v2vvp3kalvb11ny9cvpls3nrvqj0c81rxbkh99ynd2dbscp"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.1.0"; sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.10"; sha256 = "0a3f35427hpai0wq1wlqpn4m5aacfddkq25hp71nwlz5zm1dqfmk"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.5"; sha256 = "0n2pk1sy8ikd29282sx4ps9r1wnhzgg4nwmkka9ypjizd8lkkk2m"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.6.0"; sha256 = "06z5a1jpqpdd1pix85is7kkpn4v0l4an909skji2p8gm09p5sfyv"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.6.0"; sha256 = "1mpkx544cbxws1a22zwxbp3lqqamcc3x915l23spsxqvgr02jjrq"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.6.0"; sha256 = "0h5vbsd5x9cf7nqyrwn7d7y1axhf1zz0jr9prvi4xpxawa3kajyj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) + (fetchNuGet { pname = "MimeKit"; version = "3.3.0"; sha256 = "0rslxmwlv6w2fssv0mz2v6qi6zg1v0lmly6hvh258xqdfxrhn0y8"; }) + (fetchNuGet { pname = "MySqlConnector"; version = "2.1.2"; sha256 = "12wgwns172vjldp1cvcq212zizpw18za7z3438rdh40zkq55s5yz"; }) + (fetchNuGet { pname = "NBitcoin"; version = "5.0.40"; sha256 = "1rqzn84yaww4afagwg8jg1l5qdkvqyjdfcyd5widddqwxabbsjvh"; }) + (fetchNuGet { pname = "NBitcoin"; version = "6.0.8"; sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.1"; sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7"; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.24"; sha256 = "0yc6cgwp2xr2dzjsrkawyh43whixv66nvvq6rh1pi6gi14iaqmfa"; }) + (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.18"; sha256 = "054i15qan5154iy8m13jmhnz1w5rs208i1xhlfnivwiq2v1c2qby"; }) + (fetchNuGet { pname = "NBitpayClient"; version = "1.0.0.39"; sha256 = "1sgwradg7jnb4n3chwqfkximj1qhgl3r23p0sifmaa0kql2hlira"; }) + (fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.3"; sha256 = "0lf5qsf5yr5m1fx826mn47l237x5y2wkimv6klc3rvwwc7f10dmm"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) + (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) + (fetchNuGet { pname = "NicolasDorier.CommandLine"; version = "2.0.0"; sha256 = "0gywvl0gqs3crlzwgwzcqf0qsrbhk3dxjycpimxqvs1ihg4dhb1f"; }) + (fetchNuGet { pname = "NicolasDorier.CommandLine.Configuration"; version = "2.0.0"; sha256 = "1cng096r3kb85lf5wjill4yhxx8nv9v0d6ksbn1i1vvdawwl6fkw"; }) + (fetchNuGet { pname = "NicolasDorier.RateLimits"; version = "1.2.3"; sha256 = "197cqb0yxd2hfxyikxw53m4lmxh87l9sqrr8xihg1j0knvwzgyyp"; }) + (fetchNuGet { pname = "NicolasDorier.StandardConfiguration"; version = "2.0.1"; sha256 = "1jiinqj1y8vv78p766asml4bd0k5gwrpl9ksi176h0z7wsj6ilrx"; }) + (fetchNuGet { pname = "NLog"; version = "4.7.14"; sha256 = "1pjkxlf20vrh9b8r6wzay1563fdhhxslxb7acdkn5ss8gvd2m23n"; }) + (fetchNuGet { pname = "Npgsql"; version = "6.0.7"; sha256 = "0c5zyd9n3597ryzqh9qfisp3wvr7q0krbnl26w2sy33xm4hvls2c"; }) + (fetchNuGet { pname = "Npgsql.EntityFrameworkCore.PostgreSQL"; version = "6.0.7"; sha256 = "0gsvjf0vk7anmc889my8x68wpd47bsdgsk1rwbg77rrb9zsf4nxp"; }) + (fetchNuGet { pname = "NSec.Cryptography"; version = "20.2.0"; sha256 = "19slji51v8s8i4836nqqg7qb3i3p4ahqahz0fbb3gwpp67pn6izx"; }) + (fetchNuGet { pname = "PeterO.Cbor"; version = "4.1.3"; sha256 = "0882i3bhhx2yag2m4lbdsgngjwaj9ff4v0ab9zb839i4r77aq1yn"; }) + (fetchNuGet { pname = "PeterO.Numbers"; version = "1.6.0"; sha256 = "04kfdkfr600h69g67g6izbn57bxqjamvaadyw3p9gjsc0wrivi98"; }) + (fetchNuGet { pname = "PeterO.URIUtility"; version = "1.0.0"; sha256 = "04ihfbk2lf0smznwfb62h57qknls5jyxirdz72g5wn9h1dcgkdac"; }) + (fetchNuGet { pname = "Pomelo.EntityFrameworkCore.MySql"; version = "6.0.1"; sha256 = "1g212yfzlphn97gn7v4zcpi4ihfk1xp014kw498pcma49dqirn54"; }) + (fetchNuGet { pname = "Portable.BouncyCastle"; version = "1.9.0"; sha256 = "0kphjwz4hk2nki3b4f9z096xzd520nrpvi3cjib8fkjk6zhwrr8q"; }) + (fetchNuGet { pname = "QRCoder"; version = "1.4.3"; sha256 = "1hmlqbdyq5n9bsmns5h0dwcxpd2jvqr9a2y6dyc9kbjmc8j1dpla"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.0.11"; sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "041im8hmp1zdgrx6jzyrdch6kshvbddmkar7r2mlm1ksb5c5kwpq"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.0.11"; sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.1.0"; sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.1.0"; sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.1.0"; sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.0.1"; sha256 = "1kswgqhy34qvc49i981fk711s7knd6z13bp0rin8ms6axkh98nas"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.0.11"; sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.0.11"; sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.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"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Security"; version = "4.3.0"; sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (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 = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.0.1"; sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "Serilog"; version = "2.9.0"; sha256 = "0z0ib82w9b229a728bbyhzc2hnlbl0ki7nnvmgnv3l741f2vr4i6"; }) + (fetchNuGet { pname = "Serilog.AspNetCore"; version = "3.2.0"; sha256 = "14d1lsw1djsshlkxbn5lkmdvj4372hnddb6788m6ix0mv4mhj3bj"; }) + (fetchNuGet { pname = "Serilog.Extensions.Hosting"; version = "3.0.0"; sha256 = "1r01lsy4rp0wj7ffbjcf9dcg3aipdhy7066yjicja45m0z2y42w6"; }) + (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "3.0.1"; sha256 = "069qy7dm5nxb372ij112ppa6m99b4iaimj3sji74m659fwrcrl9a"; }) + (fetchNuGet { pname = "Serilog.Formatting.Compact"; version = "1.0.0"; sha256 = "0mi1yzzj33v4nkyspyshhc6nn2mx3y07z5dvv26hl7hw6kb6yazw"; }) + (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "3.1.0"; sha256 = "1cj5am4n073331gbfm2ylqb9cadl4q3ppzgwmm5c8m1drxpiwkb5"; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "3.1.1"; sha256 = "0j99as641y1k6havwwkhyr0n08vibiblmfjj6nz051mz8g3864fn"; }) + (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "1.0.1"; sha256 = "0969mb254kr59bgkq01ybyzca89z3f4n9ng5mdj8m53d5653zf22"; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "4.1.0"; sha256 = "1ry7p9hf1zlnai1j5zjhjp4dqm2agsbpq6cvxgpf5l8m26x6mgca"; }) + (fetchNuGet { pname = "SocketIOClient"; version = "3.0.6"; sha256 = "0yvvwyg05sjlam8841kxy1qv6bc7a1kykdk5jdy2jvw89d40k31d"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.0.6"; sha256 = "1ip0a653dx5cqybxg27zyz5ps31f2yz50g3jvz3vx39isx79gax3"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.0.6"; sha256 = "1w4iyg0v1v1z2m7akq7rv8lsgixp2m08732vr14vgpqs918bsy1i"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.0.6"; sha256 = "16378rh1lcqxynf5qj0kh8mrsb0jp37qqwg4285kqc5pknvh1bx3"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.0.6"; sha256 = "0chgrqyycb1kqnaxnhhfg0850b94blhzni8zn79c7ggb3pd2ykyz"; }) + (fetchNuGet { pname = "SSH.NET"; version = "2020.0.2"; sha256 = "18mq7jjdbzc7qcsh5wg2j0gd39qbnrxkn811cy8wrdvki0pfi0sm"; }) + (fetchNuGet { pname = "SshNet.Security.Cryptography"; version = "1.3.0"; sha256 = "1y9r9c2dn81l1l4nn976fwf0by83qbvb0sp1hw7m19pqz7pmaflh"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (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.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (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 = "6.6.0"; sha256 = "17i6a43g1fksq9xy77dgsz54klz71pz062pb58lqx8h06p1818h1"; }) + (fetchNuGet { pname = "System.Interactive.Async"; version = "3.1.1"; sha256 = "03iq20gq0n2b2sdzs5jhxf46nzkfgvzip6q5248vka2rcvn1yanh"; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Net.Security"; version = "4.3.0"; sha256 = "1aa5igz31ivk6kpgsrwck3jccab7wd88wr52lddmgypmbh9mmf87"; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.3.0"; sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; }) + (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) + (fetchNuGet { pname = "System.Net.WebSockets.Client"; version = "4.3.2"; sha256 = "103y8lfsfa5xd1sqmq9sml4qyp4rij2i3fnnw119h119hb04l0rk"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.0.1"; sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (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"; }) + (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"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) + (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"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.7.0"; sha256 = "00797sqbba8lys486ifxblz9j52m29kidclvmqpk531820k55x9j"; }) + (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.Pkcs"; version = "6.0.0"; sha256 = "1q80znpwkv5wrzgx0qnzxqaa5k1s72fnk3g1yng62l7y14d8ki64"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.0"; sha256 = "19x38911pawq4mrxrm04l2bnxwxxlzq8v8rj4cbxnfjj8pnd3vj3"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.4.0"; sha256 = "05qp3yivh6gz0vva0v3wjlj3g1b45d5jmz362f2y8ah6yb3rx088"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "6.0.2"; sha256 = "1lz6gx1r4if8sbx6yp9h0mi0g9ffr40x0cg518l0z2aiqgil3fk0"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "4.5.0"; sha256 = "0n6z3wjia7h2a5vl727p97riydnb6jhhkb1pdcnizza02dwkz0nz"; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "4.7.1"; sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { pname = "TwentyTwenty.Storage"; version = "2.12.1"; sha256 = "0m41dxzc3hh0f4j1k4q915pvcq6zr0hv1pj6b3sayrn8vjhk64qb"; }) + (fetchNuGet { pname = "TwentyTwenty.Storage.Amazon"; version = "2.12.1"; sha256 = "03nrkvhki35w1rqx94s97rwxl0qwqlczyiimhrkc72vjppn5p6ph"; }) + (fetchNuGet { pname = "TwentyTwenty.Storage.Azure"; version = "2.12.1"; sha256 = "10q7gpr8kmgzmxrzj3paqlnw4d8li8scwpxkzs11ildscfp6hvlv"; }) + (fetchNuGet { pname = "TwentyTwenty.Storage.Google"; version = "2.12.1"; sha256 = "0d8s7p9brp03h9dpv3wxnqg0xsm7d9p4k6dpxpb9jak535khxzhp"; }) + (fetchNuGet { pname = "TwentyTwenty.Storage.Local"; version = "2.12.1"; sha256 = "1zmjqwd1v3z78ab4vdmaadh94465k1qgpv7ylv8x3sdx4z78yjm8"; }) + (fetchNuGet { pname = "WindowsAzure.Storage"; version = "9.3.3"; sha256 = "14b0b0nj85yvyn0h8ghr3kj6di2nkbzjxc2q98f1wcr0151xvdfx"; }) + (fetchNuGet { pname = "YamlDotNet"; version = "8.0.0"; sha256 = "09hr1jimmfhcpk97p963y94h2k5p7wzcj4mpwqpdnwzbyrp2flpm"; }) ] diff --git a/pkgs/applications/blockchains/btcpayserver/update.sh b/pkgs/applications/blockchains/btcpayserver/update.sh index 082911b42a3d..9debe6780f23 100755 --- a/pkgs/applications/blockchains/btcpayserver/update.sh +++ b/pkgs/applications/blockchains/btcpayserver/update.sh @@ -8,5 +8,4 @@ echo "Updating nbxplorer" ../nbxplorer/update.sh echo echo "Updating btcpayserver" -# Include Razor SDK packages in deps.nix -../nbxplorer/util/update-common.sh btcpayserver deps.nix '"/p:Configuration="Altcoins-Release" /p:RazorCompileOnBuild=false' +../nbxplorer/util/update-common.sh btcpayserver deps.nix diff --git a/pkgs/applications/blockchains/charge-lnd/default.nix b/pkgs/applications/blockchains/charge-lnd/default.nix index 83b3c0c29b39..521a44de1dd0 100644 --- a/pkgs/applications/blockchains/charge-lnd/default.nix +++ b/pkgs/applications/blockchains/charge-lnd/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "charge-lnd"; - version = "0.2.12"; + version = "0.2.13"; src = fetchFromGitHub { owner = "accumulator"; repo = pname; - rev = "v${version}"; - sha256 = "uiXmLdQAglgLxOX6IoF1iNZvje4EM7Tr25Okx9TPyzI="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-mNU8bhiZqvYbNUU8vJNk9WbpAVrCTi9Fy3hlIpb06ac="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/blockchains/chia-dev-tools/default.nix b/pkgs/applications/blockchains/chia-dev-tools/default.nix new file mode 100644 index 000000000000..e7b92b268a64 --- /dev/null +++ b/pkgs/applications/blockchains/chia-dev-tools/default.nix @@ -0,0 +1,64 @@ +{ lib +, fetchFromGitHub +, substituteAll +, python3Packages +, chia +, +}: +python3Packages.buildPythonApplication rec { + pname = "chia-dev-tools"; + version = "1.1.4"; + + src = fetchFromGitHub { + owner = "Chia-Network"; + repo = pname; + rev = "v${version}"; + hash = "sha256-lE7FTSDqVS6AstcxZSMdQwgygMvcvh1fqYVTTSSNZpA="; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit chia; + }) + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "==" ">=" + ''; + + nativeBuildInputs = [ + python3Packages.setuptools-scm + ]; + + # give a hint to setuptools-scm on package version + SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; + + propagatedBuildInputs = with python3Packages; [ + (toPythonModule chia) + pytest # required at runtime by the "test" command + pytest-asyncio + pytimeparse + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + postCheck = "unset HOME"; + + disabledTests = [ + "test_spendbundles" + ]; + + meta = with lib; { + homepage = "https://www.chia.net/"; + description = "Utility for developing in the Chia ecosystem: Chialisp functions, object inspection, RPC client and more"; + license = with licenses; [ asl20 ]; + maintainers = teams.chia.members; + }; +} diff --git a/pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch b/pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch new file mode 100644 index 000000000000..9fb8fefe197a --- /dev/null +++ b/pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/cdv/cmds/sim_utils.py b/cdv/cmds/sim_utils.py +index e59ba8f..20912ff 100644 +--- a/cdv/cmds/sim_utils.py ++++ b/cdv/cmds/sim_utils.py +@@ -67,7 +67,7 @@ async def start_async(root_path: Path, group: Any, restart: bool) -> None: + + from chia.cmds.start_funcs import async_start + +- sys.argv[0] = str(Path(sys.executable).parent / "chia") # this gives the correct path to the chia executable ++ sys.argv[0] = "@chia@/bin/chia" # this gives the correct path to the chia executable + if root_path.exists(): + config = load_config(root_path, "config.yaml") + await async_start(root_path, config, group, restart) diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 33ce321cb4c6..99fe1595def1 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,21 +6,16 @@ let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.6.0"; + version = "1.6.2"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - hash = "sha256-TNaHPvN19fkRqkQHtqdeEDwhqbntcVhxXhY8TNIScEg="; + hash = "sha256-BgUgTYpjFsKisfFni8TzSYQ8+S3P+7m78DuyjWF5xh8="; }; - patches = [ - # chia tries to put lock files in the python modules directory - ./dont_lock_in_store.patch - ]; - postPatch = '' substituteInPlace setup.py \ --replace "==" ">=" @@ -59,6 +54,7 @@ let chia = python3Packages.buildPythonApplication rec { fasteners filelock keyrings-cryptfile + psutil pyyaml setproctitle setuptools # needs pkg_resources at runtime @@ -68,7 +64,7 @@ let chia = python3Packages.buildPythonApplication rec { zstd ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/applications/blockchains/chia/dont_lock_in_store.patch b/pkgs/applications/blockchains/chia/dont_lock_in_store.patch deleted file mode 100644 index f923b11801a1..000000000000 --- a/pkgs/applications/blockchains/chia/dont_lock_in_store.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/chia/wallet/puzzles/load_clvm.py -+++ b/chia/wallet/puzzles/load_clvm.py -@@ -82,18 +82,6 @@ def load_serialized_clvm(clvm_filename, package_or_requirement=__name__) -> Seri - """ - hex_filename = f"{clvm_filename}.hex" - -- try: -- if pkg_resources.resource_exists(package_or_requirement, clvm_filename): -- # Establish whether the size is zero on entry -- full_path = pathlib.Path(pkg_resources.resource_filename(package_or_requirement, clvm_filename)) -- output = full_path.parent / hex_filename -- compile_clvm(full_path, output, search_paths=[full_path.parent]) -- -- except NotImplementedError: -- # pyinstaller doesn't support `pkg_resources.resource_exists` -- # so we just fall through to loading the hex clvm -- pass -- - clvm_hex = pkg_resources.resource_string(package_or_requirement, hex_filename).decode("utf8") - assert len(clvm_hex.strip()) != 0 - clvm_blob = bytes.fromhex(clvm_hex) diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 4dfeebfe0962..45854ddcd631 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -22,11 +22,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "0.12.1"; + version = "22.11.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "sha256-SlDDOJ6H2UVT/dof23CYSzCliAc+5CAYQc87AzOtYjg="; + sha256 = "sha256-F48jmG9voNp6+IMRVkJi6O0DXVQxKyYkOA0UBCKktIw="; }; # when building on darwin we need dawin.cctools to provide the correct libtool diff --git a/pkgs/applications/blockchains/digibyte/default.nix b/pkgs/applications/blockchains/digibyte/default.nix index acf0b355e640..4e563d21fa22 100644 --- a/pkgs/applications/blockchains/digibyte/default.nix +++ b/pkgs/applications/blockchains/digibyte/default.nix @@ -15,26 +15,24 @@ , wrapQtAppsHook ? null }: -with lib; - stdenv.mkDerivation rec { pname = "digibyte"; - version = "7.17.2"; + version = "7.17.3"; - name = pname + toString (optional (!withGui) "d") + "-" + version; + name = pname + toString (lib.optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { - owner = pname; + owner = "digibyte-core"; repo = pname; rev = "v${version}"; - sha256 = "04czj7mx3wpbx4832npk686p9pg5zb6qwlcvnmvqf31hm5qylbxj"; + sha256 = "zPwnC2qd28fA1saG4nysPlKU1nnXhfuSG3DpCY6T+kM="; }; nativeBuildInputs = [ autoreconfHook pkg-config hexdump - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ wrapQtAppsHook ]; @@ -44,7 +42,7 @@ stdenv.mkDerivation rec { libevent db4 zeromq - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ qtbase qttools protobuf @@ -54,12 +52,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - meta = { + meta = with lib; { description = "DigiByte (DGB) is a rapidly growing decentralized, global blockchain"; homepage = "https://digibyte.io/"; license = licenses.mit; diff --git a/pkgs/applications/blockchains/dogecoin/default.nix b/pkgs/applications/blockchains/dogecoin/default.nix index 7c92cc0831d6..421c2fe667e0 100644 --- a/pkgs/applications/blockchains/dogecoin/default.nix +++ b/pkgs/applications/blockchains/dogecoin/default.nix @@ -2,13 +2,12 @@ , pkg-config, autoreconfHook , db5, openssl, boost, zlib, miniupnpc, libevent , protobuf, qtbase ? null -, wrapQtAppsHook ? null, qttools, qmake ? null, qrencode +, wrapQtAppsHook ? null, qttools ? null, qmake ? null, qrencode , withGui, withUpnp ? true, withUtils ? true, withWallet ? true , withZmq ? true, zeromq, util-linux ? null, Cocoa ? null }: -with lib; stdenv.mkDerivation rec { - pname = "dogecoin" + optionalString (!withGui) "d"; + pname = "dogecoin" + lib.optionalString (!withGui) "d"; version = "1.14.6"; src = fetchFromGitHub { @@ -18,32 +17,32 @@ stdenv.mkDerivation rec { sha256 = "sha256-PmbmmA2Mq07dwB3cI7A9c/ewtu0I+sWvQT39Yekm/sU="; }; - preConfigure = optionalString withGui '' - export LRELEASE=${getDev qttools}/bin/lrelease + preConfigure = lib.optionalString withGui '' + export LRELEASE=${lib.getDev qttools}/bin/lrelease ''; nativeBuildInputs = [ pkg-config autoreconfHook util-linux ] - ++ optionals withGui [ wrapQtAppsHook qttools ]; + ++ lib.optionals withGui [ wrapQtAppsHook qttools ]; buildInputs = [ openssl protobuf boost zlib libevent ] - ++ optionals withGui [ qtbase qrencode ] - ++ optionals withUpnp [ miniupnpc ] - ++ optionals withWallet [ db5 ] - ++ optionals withZmq [ zeromq ] - ++ optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals withGui [ qtbase qrencode ] + ++ lib.optionals withUpnp [ miniupnpc ] + ++ lib.optionals withWallet [ db5 ] + ++ lib.optionals withZmq [ zeromq ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; configureFlags = [ "--with-incompatible-bdb" "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals (!withGui) [ "--with-gui=no" ] - ++ optionals (!withUpnp) [ "--without-miniupnpc" ] - ++ optionals (!withUtils) [ "--without-utils" ] - ++ optionals (!withWallet) [ "--disable-wallet" ] - ++ optionals (!withZmq) [ "--disable-zmq" ]; + ] ++ lib.optionals (!withGui) [ "--with-gui=no" ] + ++ lib.optionals (!withUpnp) [ "--without-miniupnpc" ] + ++ lib.optionals (!withUtils) [ "--without-utils" ] + ++ lib.optionals (!withWallet) [ "--disable-wallet" ] + ++ lib.optionals (!withZmq) [ "--disable-zmq" ]; enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Wow, such coin, much shiba, very rich"; longDescription = '' Dogecoin is a decentralized, peer-to-peer digital currency that diff --git a/pkgs/applications/blockchains/eclair/default.nix b/pkgs/applications/blockchains/eclair/default.nix index 7c5d71f35f53..3d05546caff6 100644 --- a/pkgs/applications/blockchains/eclair/default.nix +++ b/pkgs/applications/blockchains/eclair/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "eclair"; - version = "0.7.0-patch-disconnect"; - revision = "cad88bf"; + version = "0.8.0"; + revision = "0077471"; src = fetchzip { url = "https://github.com/ACINQ/eclair/releases/download/v${version}/eclair-node-${version}-${revision}-bin.zip"; - hash = "sha256-agOxflCXfoeSeGliB/PAMMyCdqYYajciHMfLrSiZx1Q="; + hash = "sha256-jkXdt1aQRVgItfFPuyh45uXjUFgJtKng/17Po5i7ang="; }; propagatedBuildInputs = [ jq openjdk11 ]; diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 35470a7b8542..1ce458ffb11b 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -12,20 +12,19 @@ let in rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.9.10"; + version = "0.9.11"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-GqFtCK5hxnEfIfw3ITufeu26yueknuFZhLtGSXmJ8fE="; + hash = "sha256-iudHdsSjoPal+ORMB3lU7ejGYv69q/8HcxScZS8D/u8="; }; - cargoHash = "sha256-p4t+G13XaCl7+IbX5YyBFF0PmARbw4XlRvnA0PRcjvQ="; + cargoHash = "sha256-Ft1AluPfV6BIRGEddrrIGNRmaZIzUsA2DN2TcghCnSQ="; # needed for librocksdb-sys - nativeBuildInputs = [ llvmPackages.clang ]; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; # link rocksdb dynamically ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix index 1c02076c570d..a39cbc341e89 100644 --- a/pkgs/applications/blockchains/elements/default.nix +++ b/pkgs/applications/blockchains/elements/default.nix @@ -22,7 +22,6 @@ , withWallet ? true }: -with lib; stdenv.mkDerivation rec { pname = if withGui then "elements" else "elementsd"; version = "22.0.2"; @@ -36,24 +35,24 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ optionals stdenv.isLinux [ util-linux ] - ++ optionals stdenv.isDarwin [ hexdump ] - ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] - ++ optionals withGui [ wrapQtAppsHook ]; + ++ lib.optionals stdenv.isLinux [ util-linux ] + ++ lib.optionals stdenv.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ optionals withWallet [ db48 sqlite ] - ++ optionals withGui [ qrencode qtbase qttools ]; + ++ lib.optionals withWallet [ db48 sqlite ] + ++ lib.optionals withGui [ qrencode qtbase qttools ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--disable-bench" - ] ++ optionals (!doCheck) [ + ] ++ lib.optionals (!doCheck) [ "--disable-tests" "--disable-gui-tests" - ] ++ optionals (!withWallet) [ + ] ++ lib.optionals (!withWallet) [ "--disable-wallet" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; @@ -62,7 +61,7 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/179474 hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "fortify" "stackprotector" ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = true; @@ -70,11 +69,11 @@ stdenv.mkDerivation rec { [ "LC_ALL=en_US.UTF-8" ] # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. # See also https://github.com/NixOS/nixpkgs/issues/24256 - ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; + ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Open Source implementation of advanced blockchain features extending the Bitcoin protocol"; longDescription= '' The Elements blockchain platform is a collection of feature experiments and extensions to the diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 3d14ec40f238..e65684353642 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "5.0.3"; + version = "5.0.6"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-IDAss4qX39qPyOsPpVg5zU6zq/QV/RTnbHTGVl9UmOA="; + sha256 = "sha256-UiPwvZcdkeFOTMVcUT1Xr5ByrJC+yzodCfi8Br61hjU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon/default.nix similarity index 70% rename from pkgs/applications/blockchains/erigon.nix rename to pkgs/applications/blockchains/erigon/default.nix index d656db3c47c8..a17bef8cae37 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon/default.nix @@ -1,18 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nix-update-script }: -buildGoModule rec { +let pname = "erigon"; - version = "2.30.0"; + version = "2.37.0"; +in +buildGoModule { + inherit pname version; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s5D+Ps5S95AyNh7tt2SnTvUxNHzOothsMZA7NW3x0yM="; + sha256 = "sha256-r/mumt/f0wrOsXyEHo/NX0lJGt8zqXEVNC+9DWDkHAM="; fetchSubmodules = true; }; - vendorSha256 = "sha256-ICoThps7c4+9NQPeaASQ88YVbczJD/MgF2ldOmKjgvc="; + vendorSha256 = "sha256-vSJZ1wIx1CiLE04ZBDnQDQqM2v8BBLxw5qbAsixC3/U="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: @@ -26,6 +29,8 @@ buildGoModule rec { "cmd/rlpdump" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://github.com/ledgerwatch/erigon/"; description = "Ethereum node implementation focused on scalability and modularity"; diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index f3884106a4d9..1bc33588c42d 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "22.8.12"; src = fetchzip { - url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; + url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip"; sha256 = "sha256-jNzHh4zYhFzpFZAC9rHmwjTdFkbpROSEN3qpL7geiOU="; }; diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix index 02efa6f26974..28571a57e1a0 100644 --- a/pkgs/applications/blockchains/fulcrum/default.nix +++ b/pkgs/applications/blockchains/fulcrum/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fulcrum"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "cculianu"; repo = "Fulcrum"; rev = "v${version}"; - sha256 = "sha256-sX9GeY+c/mcsAWApQ0E5LwoXZgWUC4w7YY8/PEzMhl8="; + sha256 = "sha256-HAA5YRShLzxVP9aIP1RdDH09cZqjiZhZOxxc2EVGvx8="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/blockchains/groestlcoin/default.nix b/pkgs/applications/blockchains/groestlcoin/default.nix index 6d5bf0de2e72..bcc25cf2460a 100644 --- a/pkgs/applications/blockchains/groestlcoin/default.nix +++ b/pkgs/applications/blockchains/groestlcoin/default.nix @@ -24,21 +24,21 @@ }: let - version = "23.0"; desktop = fetchurl { - url = "https://raw.githubusercontent.com/Groestlcoin/packaging/${version}/debian/groestlcoin-qt.desktop"; + # de45048 is the last commit when the debian/groestlcoin-qt.desktop file was changed + url = "https://raw.githubusercontent.com/Groestlcoin/packaging/de4504844e47cf2c7604789650a5db4f3f7a48aa/debian/groestlcoin-qt.desktop"; sha256 = "0mxwq4jvcip44a796iwz7n1ljkhl3a4p47z7qlsxcfxw3zmm0k0k"; }; in stdenv.mkDerivation rec { pname = if withGui then "groestlcoin" else "groestlcoind"; - inherit version; + version = "24.0.1"; src = fetchFromGitHub { owner = "Groestlcoin"; repo = "groestlcoin"; rev = "v${version}"; - sha256 = "1ag7wpaw4zssx1g482kziqr95yl2vk9r332689s3093xv9i9pz4s"; + sha256 = "0k14y3iv5l26r820wzkwqxi67kwh26i0yq20ffd72shicjs1d3qc"; }; nativeBuildInputs = [ autoreconfHook pkg-config ] @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; checkFlags = [ "LC_ALL=en_US.UTF-8" ] # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Groestlcoin's GUI. diff --git a/pkgs/applications/blockchains/haven-cli/default.nix b/pkgs/applications/blockchains/haven-cli/default.nix index 635dff4f92e9..4f53eaf580cc 100644 --- a/pkgs/applications/blockchains/haven-cli/default.nix +++ b/pkgs/applications/blockchains/haven-cli/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "haven-cli"; - version = "2.2.3"; + version = "3.0.7"; src = fetchFromGitHub { owner = "haven-protocol-org"; repo = "haven-main"; rev = "v${version}"; - sha256 = "sha256-nBVLNT0jWIewr6MPDGwDqXoVtyFLyls1IEQraVoWDQ4="; + sha256 = "sha256-HLZ9j75MtF7FkHA4uefkrYp07pVZe1Ac1wny7T0CMpA="; fetchSubmodules = true; }; @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { rm -r external/{miniupnp,randomx,rapidjson,unbound} # export patched source for haven-gui cp -r . $source + # fix build on aarch64-darwin + substituteInPlace CMakeLists.txt --replace "-march=x86-64" "" ''; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 4f6ae53ec784..d64376aae18d 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -1,33 +1,21 @@ -{ lib, fetchurl, appimageTools, imagemagick, systemd }: +{ lib, fetchurl, appimageTools, imagemagick }: let pname = "ledger-live-desktop"; - version = "2.49.2"; + version = "2.51.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-8KGZRTJu3uGFyf4vogoC9kDrKegD8Op4Z7gqQK+UFl8="; + hash = "sha256-qpgzGJsj7hrrK2i+xP0T+hcw7WMlGBILbHVJBHD5duo="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; - - # Hotplug events from udevd are fired into the kernel, which then re-broadcasts them over a - # special socket, to every libudev client listening for hotplug when the kernel does that. It will - # try to preserve the uid of the sender but a non-root namespace (like the fhs-env) cant map root - # to a uid, for security reasons, so the uid of the sender becomes nobody and libudev actively - # rejects such messages. This patch disables that bit of security in libudev. - # See: https://github.com/NixOS/nixpkgs/issues/116361 - systemdPatched = systemd.overrideAttrs ({ patches ? [ ], ... }: { - patches = patches ++ [ ./systemd.patch ]; - }); in appimageTools.wrapType2 rec { inherit pname version src; - extraPkgs = pkgs: [ systemdPatched ]; - extraInstallCommands = '' mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop diff --git a/pkgs/applications/blockchains/ledger-live-desktop/systemd.patch b/pkgs/applications/blockchains/ledger-live-desktop/systemd.patch deleted file mode 100644 index a70053d71180..000000000000 --- a/pkgs/applications/blockchains/ledger-live-desktop/systemd.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/libsystemd/sd-device/device-monitor.c b/src/libsystemd/sd-device/device-monitor.c -index fd5900704d..f9106fdbe5 100644 ---- a/src/libsystemd/sd-device/device-monitor.c -+++ b/src/libsystemd/sd-device/device-monitor.c -@@ -445,9 +445,6 @@ int device_monitor_receive_device(sd_device_monitor *m, sd_device **ret) { - "sd-device-monitor: No sender credentials received, message ignored."); - - cred = (struct ucred*) CMSG_DATA(cmsg); -- if (cred->uid != 0) -- return log_debug_errno(SYNTHETIC_ERRNO(EAGAIN), -- "sd-device-monitor: Sender uid="UID_FMT", message ignored.", cred->uid); - - if (streq(buf.raw, "libudev")) { - /* udev message needs proper version magic */ diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index c778ce3f7575..7a5607d01c5e 100644 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -10,14 +10,17 @@ , protobuf , rustPlatform , Security +, CoreFoundation , stdenv , testers , unzip +, nix-update-script +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "lighthouse"; - version = "3.2.1"; + version = "3.4.0"; # lighthouse/common/deposit_contract/build.rs depositContractSpecVersion = "0.12.1"; @@ -27,21 +30,21 @@ rustPlatform.buildRustPackage rec { owner = "sigp"; repo = "lighthouse"; rev = "v${version}"; - sha256 = "sha256-Aqc3kk1rquhLKNZDlEun4bQpKI4Nsk7+Wr7E2IkJQEs="; + hash = "sha256-4auiM5+kj/HjZKu2YP7JEnwDNxHuL39XCfmV/dc5jLE="; }; - cargoSha256 = "sha256-wGEk7OfEmyeRW65kq5stvKCdnCjfssyXUmNWGkGq42M="; + cargoHash = "sha256-ihfGwdxL7Ttw86dhaVBp5meb0caXjzgbbP27Io8zv/c="; buildFeatures = [ "modern" "gnosis" ]; - nativeBuildInputs = [ clang cmake perl protobuf ]; + nativeBuildInputs = [ rustPlatform.bindgenHook cmake perl protobuf ]; buildInputs = lib.optionals stdenv.isDarwin [ Security + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + CoreFoundation SystemConfiguration ]; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - depositContractSpec = fetchurl { url = "https://raw.githubusercontent.com/ethereum/eth2.0-specs/v${depositContractSpecVersion}/deposit_contract/contracts/validator_registration.json"; hash = "sha256-ZslAe1wkmkg8Tua/AmmEfBmjqMVcGIiYHwi+WssEwa8="; @@ -84,14 +87,17 @@ rustPlatform.buildRustPackage rec { "--skip subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe" ]; - checkInputs = [ + nativeCheckInputs = [ nodePackages.ganache ]; - passthru.tests.version = testers.testVersion { - package = lighthouse; - command = "lighthouse --version"; - version = "v${lighthouse.version}"; + passthru = { + tests.version = testers.testVersion { + package = lighthouse; + command = "lighthouse --version"; + version = "v${lighthouse.version}"; + }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/blockchains/litecoin/default.nix b/pkgs/applications/blockchains/litecoin/default.nix index d150d7347493..3eeeafe8d815 100644 --- a/pkgs/applications/blockchains/litecoin/default.nix +++ b/pkgs/applications/blockchains/litecoin/default.nix @@ -9,10 +9,8 @@ , fmt }: -with lib; - mkDerivation rec { - pname = "litecoin" + optionalString (!withGui) "d"; + pname = "litecoin" + lib.optionalString (!withGui) "d"; version = "0.21.2.1"; src = fetchFromGitHub { @@ -25,11 +23,11 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db48 boost zlib zeromq fmt miniupnpc glib protobuf util-linux libevent ] - ++ optionals stdenv.isDarwin [ AppKit ] - ++ optionals withGui [ qtbase qttools qrencode ]; + ++ lib.optionals stdenv.isDarwin [ AppKit ] + ++ lib.optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ + ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; @@ -40,7 +38,7 @@ mkDerivation rec { ./src/test/test_litecoin ''; - meta = { + meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "A lite version of Bitcoin using scrypt as a proof-of-work algorithm"; longDescription= '' diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index a5cc7431246b..d63e68ddcb77 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.15.4-beta"; + version = "0.15.5-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "sha256-/PKW2Y6+PlWk88pC4DHFi1ZRqMfQzoO9MVLYZrB2UNc="; + sha256 = "sha256-DZElTLZHpmW/jqZc6jh/Z0+7mtFgY/X/T+srS+cDHik="; }; - vendorSha256 = "sha256-bUo0PhtOFhsZfhAXtRJMjfaLrAsOv3ksxsrPOlMNv48="; + vendorSha256 = "sha256-+jHoZymocBga5j9UI3wmI1TIBwiM9I6YEZO3IDGAllU="; subPackages = [ "cmd/lncli" "cmd/lnd" ]; diff --git a/pkgs/applications/blockchains/lndhub-go/default.nix b/pkgs/applications/blockchains/lndhub-go/default.nix index a563703c6bcb..8cb8ed147aac 100644 --- a/pkgs/applications/blockchains/lndhub-go/default.nix +++ b/pkgs/applications/blockchains/lndhub-go/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "lndhub-go"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "getAlby"; repo = "lndhub.go"; rev = "${version}"; - sha256 = "sha256-f/CkmO0KHupmi4XZDWRbvesLnYIxT6DlThgX3S/kdJ8="; + sha256 = "sha256-bwwypqaqlO+T/8ppKIHqGSzVerhQVl7YHrORyrpaa2w="; }; - vendorSha256 = "sha256-SWQudULFRMrKmxY6ZgH0NL8d6UPxowQnovhRx+209D4="; + vendorSha256 = "sha256-AiRbUSgMoU8nTzis/7H9HRW2/xZxXFf39JipRbukeiA="; doCheck = false; # tests require networking diff --git a/pkgs/applications/blockchains/miniscript/default.nix b/pkgs/applications/blockchains/miniscript/default.nix index 5d8e887209a4..e9d68b756212 100644 --- a/pkgs/applications/blockchains/miniscript/default.nix +++ b/pkgs/applications/blockchains/miniscript/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Compiler and inspector for the miniscript Bitcoin policy language"; longDescription = "Miniscript is a language for writing (a subset of) Bitcoin Scripts in a structured way, enabling analysis, composition, generic signing and more."; - homepage = "http://bitcoin.sipa.be/miniscript/"; + homepage = "https://bitcoin.sipa.be/miniscript/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ RaghavSood jb55 ]; diff --git a/pkgs/applications/blockchains/namecoin/default.nix b/pkgs/applications/blockchains/namecoin/default.nix index a42e474c258a..e2f2d57fc829 100644 --- a/pkgs/applications/blockchains/namecoin/default.nix +++ b/pkgs/applications/blockchains/namecoin/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "namecoin" + lib.optionalString (!withGui) "d"; - version = "23.0"; + version = "24.0"; src = fetchFromGitHub { owner = "namecoin"; repo = "namecoin-core"; rev = "nc${version}"; - sha256 = "sha256-MfqJ7EcJvlQ01Mr1RQpXVNUlGIwNqFTxrVwGa+Hus+A="; + sha256 = "sha256-DSUYqNHgPsHVwx3G83pZdzsTjhX2X2mMqt+lAlIuGp0="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; homepage = "https://namecoin.org"; license = licenses.mit; - maintainers = with maintainers; [ infinisil ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index a9e77ae6fb28..08def5dd7917 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.3.41"; + version = "2.3.57"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-xifL6XafK8FCtOoXt5H8ymCWETZlfzTKk51/saBGxHE="; + sha256 = "sha256-oLkkGdzjyvgIXi0HZiFPCShzbBR8cOgMf1h1Nf1U6Rk="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index b32c7d1a0cf8..e9b1de7ed900 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -1,1057 +1,219 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ - (fetchNuGet { - pname = "Dapper"; - version = "2.0.123"; - sha256 = "15hxrchfgiqnmgf8fqhrf4pb4c8l9igg5qnkw9yk3rkagcqfkk91"; - }) - (fetchNuGet { - pname = "DBTrie"; - version = "1.0.39"; - sha256 = "0kbvl3kf73hrh1w2n3d2wshlxpqsv1pwydhwv2wxigmvs70fn1xp"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.JsonPatch"; - version = "6.0.9"; - sha256 = "0hvz79sas53949hx5sc9r1h0sxnvdggscqyp7h7qk0i27p3a9rqv"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; - version = "6.0.9"; - sha256 = "13vnkradd2hd7lq4jl0ikz2s965wk49snmjcf4722za3azil6sr5"; - }) - (fetchNuGet { - pname = "Microsoft.Azure.Amqp"; - version = "2.4.9"; - sha256 = "15kvklhfl17713kwin8p71lcxq2jx87bk1d8gsl597z3w6l4cqma"; - }) - (fetchNuGet { - pname = "Microsoft.Azure.ServiceBus"; - version = "4.2.1"; - sha256 = "0akxqds078p7djd5g95i9dh4wrlfarabkq2ybn614cqdgl4z0is5"; - }) - (fetchNuGet { - pname = "Microsoft.Azure.Services.AppAuthentication"; - version = "1.0.3"; - sha256 = "0as64agcsilwgbvwx7iw3abdxyp9cbfpczbagjz49mqmmgnqp899"; - }) - (fetchNuGet { - pname = "Microsoft.CodeCoverage"; - version = "17.3.2"; - sha256 = "1f05l2vm8inlwhk36lfbyszjlcnvdd2qw2832npaah0dldn6dz00"; - }) - (fetchNuGet { - pname = "Microsoft.CSharp"; - version = "4.0.1"; - sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; - }) - (fetchNuGet { - pname = "Microsoft.CSharp"; - version = "4.3.0"; - sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; - }) - (fetchNuGet { - pname = "Microsoft.CSharp"; - version = "4.7.0"; - sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.Abstractions"; - version = "6.0.0"; - sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; - version = "6.0.0"; - sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.FileExtensions"; - version = "6.0.0"; - sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.Ini"; - version = "6.0.0"; - sha256 = "18qg1f7yvgvrgsq40cgc1yvpb9av84ma80k3grhvwn1cyam2img6"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration"; - version = "6.0.0"; - sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.FileProviders.Abstractions"; - version = "6.0.0"; - sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.FileProviders.Physical"; - version = "6.0.0"; - sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.FileSystemGlobbing"; - version = "6.0.0"; - sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Abstractions"; - version = "1.0.0"; - sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Abstractions"; - version = "6.0.0"; - sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; - }) - (fetchNuGet { - pname = "Microsoft.Extensions.Primitives"; - version = "6.0.0"; - sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; - }) - (fetchNuGet { - pname = "Microsoft.IdentityModel.Clients.ActiveDirectory"; - version = "3.14.2"; - sha256 = "0g9a2z1qjxd71lqqghp0a542xk9jkvz951bbnnnw43is4hlnqncq"; - }) - (fetchNuGet { - pname = "Microsoft.IdentityModel.JsonWebTokens"; - version = "5.4.0"; - sha256 = "0a5fn0p10dmkwa7vvbq28xw78aq33xm7c82l7vhla95n0lr178n8"; - }) - (fetchNuGet { - pname = "Microsoft.IdentityModel.Logging"; - version = "5.4.0"; - sha256 = "1idlpyg3q3syam6aflfbnsa7iql685mjralr1cnfpryf00lm59v0"; - }) - (fetchNuGet { - pname = "Microsoft.IdentityModel.Tokens"; - version = "5.4.0"; - sha256 = "0gpdh5rs0p97zm41pphha8n3ccd50b1iszikj3917f111khpw8l0"; - }) - (fetchNuGet { - pname = "Microsoft.NET.Test.Sdk"; - version = "17.3.2"; - sha256 = "0pm06nxqi8aw04lciqy7iz8ln1qm5mx06cpwgqa2dfwvnjp7zxnm"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Platforms"; - version = "1.0.1"; - sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Platforms"; - version = "1.0.2"; - sha256 = "17rrj0awknxx6rpdxr7yijdxqdmbbpdlcf2nsadjbd4d2gw7dck0"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Targets"; - version = "1.0.1"; - sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Targets"; - version = "1.1.0"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }) - (fetchNuGet { - pname = "Microsoft.TestPlatform.ObjectModel"; - version = "17.3.2"; - sha256 = "0bs38r5kdw1xpbjbi5l82xbhfnfbzr5xhg5520lk05pg914d1ln1"; - }) - (fetchNuGet { - pname = "Microsoft.TestPlatform.TestHost"; - version = "17.3.2"; - sha256 = "089nmaxzvm5xcf20pm4iiavz2k6lwh69r51xlbqg0ry605mnl869"; - }) - (fetchNuGet { - pname = "Microsoft.Win32.Primitives"; - version = "4.0.1"; - sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; - }) - (fetchNuGet { - pname = "Microsoft.Win32.Primitives"; - version = "4.3.0"; - sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; - }) - (fetchNuGet { - pname = "Microsoft.Win32.Registry"; - version = "4.3.0"; - sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; - }) - (fetchNuGet { - pname = "NBitcoin.Altcoins"; - version = "3.0.17"; - sha256 = "1rqcfpcs3c7zqlw3fnvnyw3d3mmplg5nsaikm50lnzpl8z3cq936"; - }) - (fetchNuGet { - pname = "NBitcoin.TestFramework"; - version = "3.0.15"; - sha256 = "1bhm9hrm33nx4sn5i25az19nrmkfg074m52zpz0yf02ccdvk5x5w"; - }) - (fetchNuGet { - pname = "NBitcoin"; - version = "7.0.14"; - sha256 = "18nxx13fz3i7kmigijnynvrbx2i5cb3v4m89nvnxl38vcw7w5jys"; - }) - (fetchNuGet { - pname = "NETStandard.Library"; - version = "1.6.1"; - sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; - }) - (fetchNuGet { - pname = "Newtonsoft.Json.Bson"; - version = "1.0.2"; - sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; - }) - (fetchNuGet { - pname = "Newtonsoft.Json"; - version = "10.0.3"; - sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; - }) - (fetchNuGet { - pname = "Newtonsoft.Json"; - version = "13.0.1"; - sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; - }) - (fetchNuGet { - pname = "Newtonsoft.Json"; - version = "9.0.1"; - sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; - }) - (fetchNuGet { - pname = "NicolasDorier.CommandLine.Configuration"; - version = "2.0.0"; - sha256 = "1cng096r3kb85lf5wjill4yhxx8nv9v0d6ksbn1i1vvdawwl6fkw"; - }) - (fetchNuGet { - pname = "NicolasDorier.CommandLine"; - version = "2.0.0"; - sha256 = "0gywvl0gqs3crlzwgwzcqf0qsrbhk3dxjycpimxqvs1ihg4dhb1f"; - }) - (fetchNuGet { - pname = "NicolasDorier.StandardConfiguration"; - version = "2.0.0"; - sha256 = "0058dx34ja2idw468bmw7l3w21wr2am6yx57sqp7llhjl5ayy0wv"; - }) - (fetchNuGet { - pname = "Npgsql"; - version = "6.0.7"; - sha256 = "0c5zyd9n3597ryzqh9qfisp3wvr7q0krbnl26w2sy33xm4hvls2c"; - }) - (fetchNuGet { - pname = "NuGet.Frameworks"; - version = "5.11.0"; - sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; - }) - (fetchNuGet { - pname = "RabbitMQ.Client"; - version = "5.1.2"; - sha256 = "195nxmnva1z2p0ahvn0kswv4d39f5bdy2sl3cxcvfziamc21xrmd"; - }) - (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.0.1"; - sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; - }) - (fetchNuGet { - pname = "runtime.native.System.Net.Http"; - version = "4.3.0"; - sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; - }) - (fetchNuGet { - pname = "runtime.native.System.Net.Security"; - version = "4.3.0"; - sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; - }) - (fetchNuGet { - pname = "runtime.native.System.Security.Cryptography.Apple"; - version = "4.3.0"; - sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; - }) - (fetchNuGet { - pname = "runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; - }) - (fetchNuGet { - pname = "runtime.native.System.Security.Cryptography"; - version = "4.0.0"; - sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; - }) - (fetchNuGet { - pname = "runtime.native.System"; - version = "4.0.0"; - sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; - }) - (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.0.12"; - sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; - }) - (fetchNuGet { - pname = "System.Collections.Concurrent"; - version = "4.3.0"; - sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; - }) - (fetchNuGet { - pname = "System.Collections.NonGeneric"; - version = "4.3.0"; - sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; - }) - (fetchNuGet { - pname = "System.Collections.Specialized"; - version = "4.3.0"; - sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; - }) - (fetchNuGet { - pname = "System.Collections"; - version = "4.0.11"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; - }) - (fetchNuGet { - pname = "System.Collections"; - version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; - }) - (fetchNuGet { - pname = "System.ComponentModel.Primitives"; - version = "4.3.0"; - sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; - }) - (fetchNuGet { - pname = "System.ComponentModel.TypeConverter"; - version = "4.3.0"; - sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; - }) - (fetchNuGet { - pname = "System.ComponentModel"; - version = "4.3.0"; - sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; - }) - (fetchNuGet { - pname = "System.Console"; - version = "4.3.0"; - sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; - }) - (fetchNuGet { - pname = "System.Diagnostics.Debug"; - version = "4.0.11"; - sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; - }) - (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.DiagnosticSource"; - version = "4.5.1"; - sha256 = "1j8dgilsgd0n7y87wq1cdlnwck96wijhbyhdp4d01l1gzm3074c1"; - }) - (fetchNuGet { - pname = "System.Diagnostics.Process"; - version = "4.3.0"; - sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; - }) - (fetchNuGet { - pname = "System.Diagnostics.Tools"; - version = "4.0.1"; - sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; - }) - (fetchNuGet { - pname = "System.Diagnostics.Tools"; - version = "4.3.0"; - sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; - }) - (fetchNuGet { - pname = "System.Diagnostics.Tracing"; - version = "4.1.0"; - sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; - }) - (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.Calendars"; - version = "4.0.1"; - sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; - }) - (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.0.11"; - sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; - }) - (fetchNuGet { - pname = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - (fetchNuGet { - pname = "System.IdentityModel.Tokens.Jwt"; - version = "5.4.0"; - sha256 = "05f91fjn054bwphmbbg7c38ipl4i81v73j232jgcq6y16dx6ifyc"; - }) - (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.0.1"; - sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; - }) - (fetchNuGet { - pname = "System.IO.FileSystem.Primitives"; - version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; - }) - (fetchNuGet { - pname = "System.IO.FileSystem"; - version = "4.0.1"; - sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; - }) - (fetchNuGet { - pname = "System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; - }) - (fetchNuGet { - pname = "System.IO"; - version = "4.1.0"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; - }) - (fetchNuGet { - pname = "System.IO"; - version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }) - (fetchNuGet { - pname = "System.Linq.Expressions"; - version = "4.1.0"; - sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; - }) - (fetchNuGet { - pname = "System.Linq.Expressions"; - version = "4.3.0"; - sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; - }) - (fetchNuGet { - pname = "System.Linq"; - version = "4.1.0"; - sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; - }) - (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.NameResolution"; - version = "4.3.0"; - sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; - }) - (fetchNuGet { - pname = "System.Net.Primitives"; - version = "4.0.11"; - sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; - }) - (fetchNuGet { - pname = "System.Net.Primitives"; - version = "4.3.0"; - sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; - }) - (fetchNuGet { - pname = "System.Net.Security"; - version = "4.3.0"; - sha256 = "1aa5igz31ivk6kpgsrwck3jccab7wd88wr52lddmgypmbh9mmf87"; - }) - (fetchNuGet { - pname = "System.Net.Sockets"; - version = "4.3.0"; - sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; - }) - (fetchNuGet { - pname = "System.Net.WebHeaderCollection"; - version = "4.0.1"; - sha256 = "10bxpxj80c4z00z3ksrfswspq9qqsw8jwxcbzvymzycb97m9b55q"; - }) - (fetchNuGet { - pname = "System.Net.WebHeaderCollection"; - version = "4.3.0"; - sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; - }) - (fetchNuGet { - pname = "System.Net.WebSockets.Client"; - version = "4.0.2"; - sha256 = "0p8m9h94h9za8281hngpi6awka6v26s1gkk0npmxzqq4ilas6b4s"; - }) - (fetchNuGet { - pname = "System.Net.WebSockets.Client"; - version = "4.3.2"; - sha256 = "103y8lfsfa5xd1sqmq9sml4qyp4rij2i3fnnw119h119hb04l0rk"; - }) - (fetchNuGet { - pname = "System.Net.WebSockets"; - version = "4.0.0"; - sha256 = "04jdhq9dp43x1m6hddn06sq74skc50i1yk6hip0224pj6fwxa4k2"; - }) - (fetchNuGet { - pname = "System.Net.WebSockets"; - version = "4.3.0"; - sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; - }) - (fetchNuGet { - pname = "System.ObjectModel"; - version = "4.0.12"; - sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; - }) - (fetchNuGet { - pname = "System.ObjectModel"; - version = "4.3.0"; - sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; - }) - (fetchNuGet { - pname = "System.Private.DataContractSerialization"; - version = "4.1.1"; - sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; - }) - (fetchNuGet { - pname = "System.Private.DataContractSerialization"; - version = "4.3.0"; - sha256 = "06fjipqvjp559rrm825x6pll8gimdj9x1n3larigh5hsm584gndw"; - }) - (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"; - }) - (fetchNuGet { - pname = "System.Reflection.Emit.Lightweight"; - version = "4.3.0"; - sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; - }) - (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.Extensions"; - version = "4.0.1"; - sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; - }) - (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"; - sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; - }) - (fetchNuGet { - pname = "System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; - }) - (fetchNuGet { - pname = "System.Reflection.TypeExtensions"; - version = "4.1.0"; - sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; - }) - (fetchNuGet { - pname = "System.Reflection.TypeExtensions"; - version = "4.3.0"; - sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; - }) - (fetchNuGet { - pname = "System.Reflection"; - version = "4.1.0"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; - }) - (fetchNuGet { - pname = "System.Reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }) - (fetchNuGet { - pname = "System.Resources.ResourceManager"; - version = "4.0.1"; - sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; - }) - (fetchNuGet { - pname = "System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; - }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; - version = "6.0.0"; - sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; - }) - (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"; - }) - (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.1.0"; - sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; - }) - (fetchNuGet { - pname = "System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; - }) - (fetchNuGet { - pname = "System.Runtime.Numerics"; - version = "4.0.1"; - sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; - }) - (fetchNuGet { - pname = "System.Runtime.Numerics"; - version = "4.3.0"; - sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; - }) - (fetchNuGet { - pname = "System.Runtime.Serialization.Formatters"; - version = "4.3.0"; - sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; - }) - (fetchNuGet { - pname = "System.Runtime.Serialization.Json"; - version = "4.0.2"; - sha256 = "08ypbzs0sb302ga04ds5b2wxa2gg0q50zpa0nvc87ipjhs0v66dn"; - }) - (fetchNuGet { - pname = "System.Runtime.Serialization.Primitives"; - version = "4.1.1"; - sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; - }) - (fetchNuGet { - pname = "System.Runtime.Serialization.Primitives"; - version = "4.3.0"; - sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; - }) - (fetchNuGet { - pname = "System.Runtime.Serialization.Xml"; - version = "4.3.0"; - sha256 = "1b2cxl2h7s8cydbhbmxhvvq071n9ck61g08npg4gyw7nvg37rfni"; - }) - (fetchNuGet { - pname = "System.Runtime"; - version = "4.1.0"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; - }) - (fetchNuGet { - pname = "System.Runtime"; - version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }) - (fetchNuGet { - pname = "System.Security.Claims"; - version = "4.3.0"; - sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.Algorithms"; - version = "4.2.0"; - sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.Algorithms"; - version = "4.3.0"; - sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.Cng"; - version = "4.2.0"; - sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.Cng"; - version = "4.3.0"; - sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.Csp"; - version = "4.0.0"; - sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.Csp"; - version = "4.3.0"; - sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.Encoding"; - version = "4.0.0"; - sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.Encoding"; - version = "4.3.0"; - sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.OpenSsl"; - version = "4.0.0"; - sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.Primitives"; - version = "4.0.0"; - sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.Primitives"; - version = "4.3.0"; - sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.X509Certificates"; - version = "4.1.0"; - sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.X509Certificates"; - version = "4.3.0"; - sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; - }) - (fetchNuGet { - pname = "System.Security.Principal.Windows"; - version = "4.3.0"; - sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; - }) - (fetchNuGet { - pname = "System.Security.Principal"; - version = "4.3.0"; - sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; - }) - (fetchNuGet { - pname = "System.Text.Encoding.Extensions"; - version = "4.0.11"; - sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; - }) - (fetchNuGet { - pname = "System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; - }) - (fetchNuGet { - pname = "System.Text.Encoding"; - version = "4.0.11"; - sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; - }) - (fetchNuGet { - pname = "System.Text.Encoding"; - version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; - }) - (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.Channels"; - version = "4.7.1"; - sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2"; - }) - (fetchNuGet { - pname = "System.Threading.Tasks.Extensions"; - version = "4.0.0"; - sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; - }) - (fetchNuGet { - pname = "System.Threading.Tasks.Extensions"; - version = "4.3.0"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; - }) - (fetchNuGet { - pname = "System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; - }) - (fetchNuGet { - pname = "System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; - }) - (fetchNuGet { - pname = "System.Threading.Thread"; - version = "4.3.0"; - sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; - }) - (fetchNuGet { - pname = "System.Threading.ThreadPool"; - version = "4.3.0"; - sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; - }) - (fetchNuGet { - pname = "System.Threading.Timer"; - version = "4.3.0"; - sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; - }) - (fetchNuGet { - pname = "System.Threading"; - version = "4.0.11"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; - }) - (fetchNuGet { - pname = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }) - (fetchNuGet { - pname = "System.Xml.ReaderWriter"; - version = "4.0.11"; - sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; - }) - (fetchNuGet { - pname = "System.Xml.ReaderWriter"; - version = "4.3.0"; - sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; - }) - (fetchNuGet { - pname = "System.Xml.XDocument"; - version = "4.0.11"; - sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; - }) - (fetchNuGet { - pname = "System.Xml.XDocument"; - version = "4.3.0"; - sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; - }) - (fetchNuGet { - pname = "System.Xml.XmlDocument"; - version = "4.0.1"; - sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; - }) - (fetchNuGet { - pname = "System.Xml.XmlDocument"; - version = "4.3.0"; - sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; - }) - (fetchNuGet { - pname = "System.Xml.XmlSerializer"; - version = "4.0.11"; - sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; - }) - (fetchNuGet { - pname = "System.Xml.XmlSerializer"; - version = "4.3.0"; - sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; - }) - (fetchNuGet { - pname = "xunit.abstractions"; - version = "2.0.3"; - sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; - }) - (fetchNuGet { - pname = "xunit.analyzers"; - version = "1.0.0"; - sha256 = "0p4f24c462z49gvbh3k4z5ksa8ffa6p8abdgysqbbladl96im4c5"; - }) - (fetchNuGet { - pname = "xunit.assert"; - version = "2.4.2"; - sha256 = "0ifdry9qq3yaw2lfxdll30ljx1jkyhwwy3ydw6gd97y3kifr3k60"; - }) - (fetchNuGet { - pname = "xunit.core"; - version = "2.4.2"; - sha256 = "1ir029igwm6b571lcm6585v5yxagy66rwrg26v4a1fnjq9dnh4cd"; - }) - (fetchNuGet { - pname = "xunit.extensibility.core"; - version = "2.4.2"; - sha256 = "1h0a62xddsd82lljfjldn1nqy17imga905jb7j0ddr10wi8cqm62"; - }) - (fetchNuGet { - pname = "xunit.extensibility.execution"; - version = "2.4.2"; - sha256 = "0r9gczqz4bc59cwl6d6wali6pvlw210i97chc1nlwn2qh383m54p"; - }) - (fetchNuGet { - pname = "xunit.runner.visualstudio"; - version = "2.4.5"; - sha256 = "0y8w33ci80z8k580pp24mfnaw1r8ji0w3az543xxcz6aagax9zhs"; - }) - (fetchNuGet { - pname = "xunit"; - version = "2.4.2"; - sha256 = "0barl6x1qwx9srjxnanw9z0jik7lv1fp6cvmgqhk10aiv57dgqxm"; - }) + (fetchNuGet { pname = "Dapper"; version = "2.0.123"; sha256 = "15hxrchfgiqnmgf8fqhrf4pb4c8l9igg5qnkw9yk3rkagcqfkk91"; }) + (fetchNuGet { pname = "DBTrie"; version = "1.0.39"; sha256 = "0kbvl3kf73hrh1w2n3d2wshlxpqsv1pwydhwv2wxigmvs70fn1xp"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.9"; sha256 = "0hvz79sas53949hx5sc9r1h0sxnvdggscqyp7h7qk0i27p3a9rqv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.9"; sha256 = "13vnkradd2hd7lq4jl0ikz2s965wk49snmjcf4722za3azil6sr5"; }) + (fetchNuGet { pname = "Microsoft.Azure.Amqp"; version = "2.4.9"; sha256 = "15kvklhfl17713kwin8p71lcxq2jx87bk1d8gsl597z3w6l4cqma"; }) + (fetchNuGet { pname = "Microsoft.Azure.ServiceBus"; version = "4.2.1"; sha256 = "0akxqds078p7djd5g95i9dh4wrlfarabkq2ybn614cqdgl4z0is5"; }) + (fetchNuGet { pname = "Microsoft.Azure.Services.AppAuthentication"; version = "1.0.3"; sha256 = "0as64agcsilwgbvwx7iw3abdxyp9cbfpczbagjz49mqmmgnqp899"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "6.0.0"; sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Ini"; version = "6.0.0"; sha256 = "18qg1f7yvgvrgsq40cgc1yvpb9av84ma80k3grhvwn1cyam2img6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "1.0.0"; sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Clients.ActiveDirectory"; version = "3.14.2"; sha256 = "0g9a2z1qjxd71lqqghp0a542xk9jkvz951bbnnnw43is4hlnqncq"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "5.4.0"; sha256 = "0a5fn0p10dmkwa7vvbq28xw78aq33xm7c82l7vhla95n0lr178n8"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "5.4.0"; sha256 = "1idlpyg3q3syam6aflfbnsa7iql685mjralr1cnfpryf00lm59v0"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "5.4.0"; sha256 = "0gpdh5rs0p97zm41pphha8n3ccd50b1iszikj3917f111khpw8l0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.2"; sha256 = "17rrj0awknxx6rpdxr7yijdxqdmbbpdlcf2nsadjbd4d2gw7dck0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (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.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.24"; sha256 = "0yc6cgwp2xr2dzjsrkawyh43whixv66nvvq6rh1pi6gi14iaqmfa"; }) + (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.18"; sha256 = "054i15qan5154iy8m13jmhnz1w5rs208i1xhlfnivwiq2v1c2qby"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.3"; sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) + (fetchNuGet { pname = "NicolasDorier.CommandLine"; version = "2.0.0"; sha256 = "0gywvl0gqs3crlzwgwzcqf0qsrbhk3dxjycpimxqvs1ihg4dhb1f"; }) + (fetchNuGet { pname = "NicolasDorier.CommandLine.Configuration"; version = "2.0.0"; sha256 = "1cng096r3kb85lf5wjill4yhxx8nv9v0d6ksbn1i1vvdawwl6fkw"; }) + (fetchNuGet { pname = "NicolasDorier.StandardConfiguration"; version = "2.0.0"; sha256 = "0058dx34ja2idw468bmw7l3w21wr2am6yx57sqp7llhjl5ayy0wv"; }) + (fetchNuGet { pname = "Npgsql"; version = "6.0.7"; sha256 = "0c5zyd9n3597ryzqh9qfisp3wvr7q0krbnl26w2sy33xm4hvls2c"; }) + (fetchNuGet { pname = "RabbitMQ.Client"; version = "5.1.2"; sha256 = "195nxmnva1z2p0ahvn0kswv4d39f5bdy2sl3cxcvfziamc21xrmd"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.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"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.0.1"; sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Security"; version = "4.3.0"; sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (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 = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) + (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) + (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) + (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) + (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.5.1"; sha256 = "1j8dgilsgd0n7y87wq1cdlnwck96wijhbyhdp4d01l1gzm3074c1"; }) + (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) + (fetchNuGet { pname = "System.Globalization.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.4.0"; sha256 = "05f91fjn054bwphmbbg7c38ipl4i81v73j232jgcq6y16dx6ifyc"; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Net.Security"; version = "4.3.0"; sha256 = "1aa5igz31ivk6kpgsrwck3jccab7wd88wr52lddmgypmbh9mmf87"; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.0.1"; sha256 = "10bxpxj80c4z00z3ksrfswspq9qqsw8jwxcbzvymzycb97m9b55q"; }) + (fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.3.0"; sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; }) + (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.0.0"; sha256 = "04jdhq9dp43x1m6hddn06sq74skc50i1yk6hip0224pj6fwxa4k2"; }) + (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) + (fetchNuGet { pname = "System.Net.WebSockets.Client"; version = "4.0.2"; sha256 = "0p8m9h94h9za8281hngpi6awka6v26s1gkk0npmxzqq4ilas6b4s"; }) + (fetchNuGet { pname = "System.Net.WebSockets.Client"; version = "4.3.2"; sha256 = "103y8lfsfa5xd1sqmq9sml4qyp4rij2i3fnnw119h119hb04l0rk"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.DataContractSerialization"; version = "4.1.1"; sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; }) + (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"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (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"; }) + (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"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) + (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"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Formatters"; version = "4.3.0"; sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Json"; version = "4.0.2"; sha256 = "08ypbzs0sb302ga04ds5b2wxa2gg0q50zpa0nvc87ipjhs0v66dn"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Xml"; version = "4.3.0"; sha256 = "1b2cxl2h7s8cydbhbmxhvvq071n9ck61g08npg4gyw7nvg37rfni"; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.2.0"; sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.0.0"; sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.0.0"; sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.0.0"; sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.0.0"; sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (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"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "4.7.1"; sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.0.1"; sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) + (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.0.11"; sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; }) + (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.3.0"; sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; }) ] diff --git a/pkgs/applications/blockchains/nbxplorer/update.sh b/pkgs/applications/blockchains/nbxplorer/update.sh index caab20c928f8..5db2723ef8e9 100755 --- a/pkgs/applications/blockchains/nbxplorer/update.sh +++ b/pkgs/applications/blockchains/nbxplorer/update.sh @@ -3,4 +3,4 @@ set -euo pipefail scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) -getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix '' +getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix diff --git a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh deleted file mode 100755 index 2a862c31c881..000000000000 --- a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p dotnet-sdk_6 -set -euo pipefail - -# Writes deps for dotnet package in $pkgSrc to $depsFile. -# Expects $pkgSrc to contain a single .sln file. - -pkgSrc=$1 -depsFile=$(realpath "$2") -customFlags=$3 - -sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1) -[[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; } - -tmpdir=$(mktemp -d /tmp/$pkgName-src.XXX) -echo "Using tmp dir: $tmpdir" -cp -rT "$pkgSrc" "$tmpdir" -chmod -R +w "$tmpdir" - -pushd "$tmpdir" > /dev/null -mkdir home -echo "Running dotnet restore for $sln" -HOME=home DOTNET_CLI_TELEMETRY_OPTOUT=1 \ - dotnet restore $customFlags -v normal --no-cache "$sln" > restore_log - -echo "{ fetchNuGet }: [" > "$depsFile" -while read pkgSpec; do - { read pname; read version; } < <( - # Ignore build version part: 1.0.0-beta2+77df2220 -> 1.0.0-beta2 - sed -nE 's/.*([^<]*).*/\1/p; s/.*([^<+]*).*/\1/p' "$pkgSpec" - ) - sha256=$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkgSpec")"/*.nupkg) - cat >> "$depsFile" <> "$depsFile" - -echo "Created $depsFile" - -popd > /dev/null -rm -r $tmpdir diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh index ee5238944867..6346c2fa9f40 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -10,7 +10,6 @@ trap 'echo "Error at ${BASH_SOURCE[0]}:$LINENO"' ERR pkgName=$1 depsFile=$2 -customFlags=$3 : ${getVersionFromTags:=} : ${refetch:=} @@ -75,5 +74,4 @@ fi echo # Create deps file -storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)" -. "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" "$customFlags" +$(nix-build "$nixpkgs" -A $pkgName.fetch-deps --no-out-link) "$depsFile" diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix index 058888d965da..4931ec51078c 100644 --- a/pkgs/applications/blockchains/nearcore/default.nix +++ b/pkgs/applications/blockchains/nearcore/default.nix @@ -4,7 +4,7 @@ }: rustPlatform.buildRustPackage rec { pname = "nearcore"; - version = "1.29.1"; + version = "1.30.0"; # https://github.com/near/nearcore/tags src = fetchFromGitHub { @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { # there is also a branch for this version number, so we need to be explicit rev = "refs/tags/${version}"; - sha256 = "sha256-TmmGLrDpNOfadOIwmG7XRgI89XQjaqIavxCEE2plumc="; + sha256 = "sha256-Co8896RojUf/R8ZiRn7zSO1AWH7x5rYom6TbGohH1KM="; }; - cargoSha256 = "sha256-4suoHP6AXhXlt7+sHMX5RW/LGZrbMhNNmzYvFBcnMTs="; + cargoSha256 = "sha256-M+vhLBXsd+R97Sh5s6jFzon/47XohJeQKh//9QP6PXw="; cargoPatches = [ ./0001-make-near-test-contracts-optional.patch ]; postPatch = '' @@ -42,14 +42,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config protobuf + rustPlatform.bindgenHook ]; # fat LTO requires ~3.4GB RAM requiredSystemFeatures = [ "big-parallel" ]; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - BINDGEN_EXTRA_CLANG_ARGS = "-isystem ${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include"; - meta = with lib; { description = "Reference client for NEAR Protocol"; homepage = "https://github.com/near/nearcore"; diff --git a/pkgs/applications/blockchains/particl-core/default.nix b/pkgs/applications/blockchains/particl-core/default.nix index fb9fc3dc4bac..942f0a71cbf4 100644 --- a/pkgs/applications/blockchains/particl-core/default.nix +++ b/pkgs/applications/blockchains/particl-core/default.nix @@ -14,17 +14,15 @@ , python3 }: -with lib; - stdenv.mkDerivation rec { pname = "particl-core"; - version = "0.19.2.20"; + version = "23.0.3.0"; src = fetchFromGitHub { owner = "particl"; repo = "particl-core"; rev = "v${version}"; - sha256 = "sha256-gvpqOCJTUIhzrNbOaYFftx/G/dO0BCfHAMUrBk6pczc="; + sha256 = "sha256-jrIsErKeHP9CMUWsrD42RmfmApP7J091OLA5JNY0fe0="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; @@ -33,7 +31,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-bench" "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals (!doCheck) [ + ] ++ lib.optionals (!doCheck) [ "--enable-tests=no" ]; @@ -42,8 +40,8 @@ stdenv.mkDerivation rec { preCheck = "patchShebangs test"; enableParallelBuilding = true; - meta = { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Privacy-Focused Marketplace & Decentralized Application Platform"; longDescription = '' An open source, decentralized privacy platform built for global person to person eCommerce. diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 31c610f255fe..883514b7da5b 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -3,20 +3,22 @@ , lib , llvmPackages , protobuf +, rocksdb , rustPlatform , stdenv , writeShellScriptBin , Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.32"; + version = "0.9.37"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-bE7PzvkHKAP/nqNkoBMTGvZZwmf8YY+cGnJ2EM/2xAs="; + hash = "sha256-/mgJNjliPUmMkhT/1oiX9+BJHfY3SMsKfFv9HCyWRQQ="; # 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. @@ -32,19 +34,19 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-NI50KFXvQgUV+G1l5D2gnAo1EohnCpQWlFCZ0iP2CVQ="; + cargoHash = "sha256-o+APFYKgA3zjQSGrkpnyf5LEBBqvZtcfWlzCk6nL02A="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - nativeBuildInputs = [ clang ]; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; preBuild = '' export SUBSTRATE_CLI_GIT_COMMIT_HASH=$(cat .git_commit) rm .git_commit ''; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; PROTOC = "${protobuf}/bin/protoc"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; # NOTE: We don't build the WASM runtimes since this would require a more # complicated rust environment setup and this is only needed for developer diff --git a/pkgs/applications/blockchains/snarkos/default.nix b/pkgs/applications/blockchains/snarkos/default.nix index 82c3555f64d6..fe8b24b6ca22 100644 --- a/pkgs/applications/blockchains/snarkos/default.nix +++ b/pkgs/applications/blockchains/snarkos/default.nix @@ -23,15 +23,13 @@ rustPlatform.buildRustPackage rec { # buildAndTestSubdir = "cli"; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config llvmPackages.clang ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config rustPlatform.bindgenHook ]; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; OPENSSL_DIR="${lib.getDev openssl}"; - LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"; - # TODO check why rust compilation fails by including the rocksdb from nixpkgs # Used by build.rs in the rocksdb-sys crate. If we don't set these, it would # try to build RocksDB from source. diff --git a/pkgs/applications/blockchains/solana-validator/default.nix b/pkgs/applications/blockchains/solana-validator/default.nix index 503d4b404e72..c0d7926129d2 100644 --- a/pkgs/applications/blockchains/solana-validator/default.nix +++ b/pkgs/applications/blockchains/solana-validator/default.nix @@ -68,12 +68,9 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs; # weird errors. see https://github.com/NixOS/nixpkgs/issues/52447#issuecomment-852079285 - LIBCLANG_PATH = "${libclang.lib}/lib"; - BINDGEN_EXTRA_CLANG_ARGS = - "-isystem ${libclang.lib}/lib/clang/${lib.getVersion clang}/include"; - LLVM_CONFIG_PATH = "${llvm}/bin/llvm-config"; + # LLVM_CONFIG_PATH = "${llvm}/bin/llvm-config"; - nativeBuildInputs = [ clang llvm pkg-config protobuf rustfmt perl ]; + nativeBuildInputs = [ pkg-config protobuf rustfmt perl rustPlatform.bindgenHook ]; buildInputs = [ openssl zlib libclang hidapi ] ++ (lib.optionals stdenv.isLinux [ udev ]); strictDeps = true; @@ -86,6 +83,8 @@ rustPlatform.buildRustPackage rec { license = licenses.asl20; maintainers = with maintainers; [ adjacentresearch ]; platforms = platforms.unix; + # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin; }; passthru.updateScript = ./update.sh; } diff --git a/pkgs/applications/blockchains/solana/default.nix b/pkgs/applications/blockchains/solana/default.nix index a91d1f390534..488672021863 100644 --- a/pkgs/applications/blockchains/solana/default.nix +++ b/pkgs/applications/blockchains/solana/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; # all the following are needed for the checkphase - # checkInputs = lib.optionals stdenv.isDarwin [ pkg-config rustfmt ]; + # nativeCheckInputs = lib.optionals stdenv.isDarwin [ pkg-config rustfmt ]; # Needed to get openssl-sys to use pkg-config. # OPENSSL_NO_VENDOR = 1; # OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; diff --git a/pkgs/applications/blockchains/sparrow/default.nix b/pkgs/applications/blockchains/sparrow/default.nix index 9a184bed83a5..85d5abdd178c 100644 --- a/pkgs/applications/blockchains/sparrow/default.nix +++ b/pkgs/applications/blockchains/sparrow/default.nix @@ -5,7 +5,7 @@ , makeDesktopItem , copyDesktopItems , autoPatchelfHook -, openjdk18 +, openjdk , gtk3 , gsettings-desktop-schemas , writeScript @@ -20,11 +20,11 @@ let pname = "sparrow"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz"; - sha256 = "1rrf5xba733c2vxgd7bf164iswc66ggp64ywh79d0vf188imzmwr"; + sha256 = "0q31b4ncvbhr9gb47wplphg43pwlg5vpd1b12qiidqlrkgm2vjy8"; }; launcher = writeScript "sparrow" '' @@ -60,7 +60,7 @@ let -m com.sparrowwallet.sparrow ) - XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS ${openjdk18}/bin/java ''${params[@]} $@ + XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS ${openjdk}/bin/java ''${params[@]} $@ ''; torWrapper = writeScript "tor-wrapper" '' @@ -71,14 +71,14 @@ let jdk-modules = stdenv.mkDerivation { name = "jdk-modules"; - nativeBuildInputs = [ openjdk18 ]; + nativeBuildInputs = [ openjdk ]; dontUnpack = true; buildPhase = '' # Extract the JDK's JIMAGE and generate a list of modules. mkdir modules pushd modules - jimage extract ${openjdk18}/lib/openjdk/lib/modules + jimage extract ${openjdk}/lib/openjdk/lib/modules ls | xargs -d " " -- echo > ../manifest.txt popd ''; @@ -93,7 +93,7 @@ let sparrow-modules = stdenv.mkDerivation { pname = "sparrow-modules"; inherit version src; - nativeBuildInputs = [ makeWrapper gnugrep openjdk18 autoPatchelfHook stdenv.cc.cc.lib zlib ]; + nativeBuildInputs = [ makeWrapper gnugrep openjdk autoPatchelfHook stdenv.cc.cc.lib zlib ]; buildPhase = '' # Extract Sparrow's JIMAGE and generate a list of them. diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/applications/blockchains/stellar-core/default.nix index fbbd05be46ed..8f3fd4b1c886 100644 --- a/pkgs/applications/blockchains/stellar-core/default.nix +++ b/pkgs/applications/blockchains/stellar-core/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "stellar-core"; - version = "19.4.0"; + version = "19.6.0"; src = fetchFromGitHub { owner = "stellar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pgwLCtlj2Ak34KfE+ffIxQ1Z4Epxm3f1Y2aqYOIlLUc="; + sha256 = "sha256-lDefmPZM8ow6t5CpNBxef+9BoT773p5UgeMhgF+em2w="; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/sumokoin/default.nix b/pkgs/applications/blockchains/sumokoin/default.nix index 8a193d906ece..0c3a3d239599 100644 --- a/pkgs/applications/blockchains/sumokoin/default.nix +++ b/pkgs/applications/blockchains/sumokoin/default.nix @@ -1,33 +1,56 @@ -{ lib, stdenv, fetchFromGitHub, cmake, unbound, openssl, boost -, libunwind, lmdb, miniupnpc }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, boost +, openssl +, libsodium +, libunwind +, lmdb +, unbound +, zeromq +}: stdenv.mkDerivation rec { pname = "sumokoin"; - version = "0.2.0.0"; + version = "0.8.1.0"; src = fetchFromGitHub { owner = "sumoprojects"; repo = "sumokoin"; rev = "v${version}"; - sha256 = "0ndgcawhxh3qb3llrrilrwzhs36qpxv7f53rxgcansbff9b3za6n"; + hash = "sha256-CHZ6hh60U6mSR68CYDKMWTYyX1koF4gA7YrA1P5f0Dk="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ unbound openssl boost libunwind lmdb miniupnpc ]; - + # disable POST_BUILD postPatch = '' - substituteInPlace src/blockchain_db/lmdb/db_lmdb.cpp --replace mdb_size_t size_t + sed -i 's/if (UNIX)/if (0)/g' src/utilities/*_utilities/CMakeLists.txt ''; - cmakeFlags = [ - "-DLMDB_INCLUDE=${lmdb}/include" + nativeBuildInputs = [ + cmake + pkg-config ]; + buildInputs = [ + boost + openssl + libsodium + libunwind + lmdb + unbound + zeromq + ]; + + # cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security] + hardeningDisable = [ "format" ]; + meta = with lib; { description = "A fork of Monero and a truely fungible cryptocurrency"; homepage = "https://www.sumokoin.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ wegank ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix index 197246770d0d..b1fb1a77c1d4 100644 --- a/pkgs/applications/blockchains/teos/default.nix +++ b/pkgs/applications/blockchains/teos/default.nix @@ -38,11 +38,8 @@ let perl # used by openssl-sys to configure protobuf rustfmt - llvmPackages.clang + rustPlatform.bindgenHook ]; - - - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; in { teos = rustPlatform.buildRustPackage { @@ -50,7 +47,7 @@ in cargoSha256 = "sha256-7VYYYSMJ2JP1KuA8sD0X3wInubH/jbA/sgzsTsomyEc="; buildAndTestSubdir = "teos"; - inherit version src cargoPatches buildInputs nativeBuildInputs LIBCLANG_PATH; + inherit version src cargoPatches buildInputs nativeBuildInputs; meta = common.meta // { description = "A Lightning watchtower compliant with BOLT13, written in Rust"; @@ -66,7 +63,7 @@ in cargoSha256 = "sha256-xL+DiEfgBYJQ1UJm7LAr1/f34pkU8FRl4Seic8MFAlM="; buildAndTestSubdir = "watchtower-plugin"; - inherit version src cargoPatches buildInputs nativeBuildInputs LIBCLANG_PATH; + inherit version src cargoPatches buildInputs nativeBuildInputs; meta = common.meta // { description = "A Lightning watchtower plugin for clightning"; diff --git a/pkgs/applications/blockchains/ton/default.nix b/pkgs/applications/blockchains/ton/default.nix new file mode 100644 index 000000000000..f333fcd05dc7 --- /dev/null +++ b/pkgs/applications/blockchains/ton/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, git +, gperf +, libmicrohttpd +, openssl +, readline +, zlib +}: + +stdenv.mkDerivation rec { + pname = "ton"; + version = "2023.01"; + + src = fetchFromGitHub { + owner = "ton-blockchain"; + repo = "ton"; + rev = "v${version}"; + sha256 = "sha256-wb96vh0YcTBFE8EzBItdTf88cvRMLW2XxcGJpNetOi8="; + fetchSubmodules = true; + }; + + postPatch = '' + # without this fails on aarch64-darwin with clang-11: error: the clang compiler does not support '-mcpu=apple-m1' + substituteInPlace CMakeLists.txt \ + --replace 'set(TON_ARCH "apple-m1")' "" + ''; + + nativeBuildInputs = [ + cmake + git + ]; + + buildInputs = [ + gperf + libmicrohttpd + openssl + readline + zlib + ]; + + meta = with lib; { + description = "A fully decentralized layer-1 blockchain designed by Telegram"; + homepage = "https://ton.org/"; + license = licenses.lgpl2Only; + platforms = platforms.all; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/pkgs/applications/blockchains/torq/default.nix b/pkgs/applications/blockchains/torq/default.nix new file mode 100644 index 000000000000..cf7722238ef7 --- /dev/null +++ b/pkgs/applications/blockchains/torq/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "torq"; + version = "0.17.3"; + + src = fetchFromGitHub { + owner = "lncapital"; + repo = pname; + rev = "v${version}"; + hash = "sha256-fqHJZi1NQCrZqsa+N+FVYZ8s9o0D555Sqn5qNlJ1MmI="; + }; + + vendorHash = "sha256-HETN2IMnpxnTyg6bQDpoD0saJu+gKocdEf0VzEi12Gs="; + + subPackages = [ "cmd/torq" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/lncapital/torq/build.version=v${version}" + ]; + + meta = with lib; { + description = "Capital management tool for lightning network nodes"; + license = licenses.mit; + homepage = "https://github.com/lncapital/torq"; + maintainers = with maintainers; [ mmilata prusnak ]; + }; +} diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 311f14bb1fa2..0141dc32d28e 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 = "22.10.3"; + version = "22.11.1"; 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-fI0N1V+6SEZ9eNf+G/w5RcY8oeA5MsVzJnpnWoMzkkHZh5jVHgNbcqVgSPbzvQ/WZNv1MX37KETcxmDwRx//yw=="; - x86_64-linux = "sha512-zN89Qw6fQh27EaN9ARNwqhiBaiNoMic6Aq2UPG0OSUtOjEOdkGJ2pbR8MgWVccSgRH8ZmAAXZ0snVKfZWHbCjA=="; + aarch64-linux = "sha512-cZZFc1Ij7KrF0Kc1Xmtg/73ASv56a6SFWFy3Miwl3P5u8ieZGXVDlSQyv84CsuYMbE0Vga3X0XS/BiF7nKNcnA=="; + x86_64-linux = "sha512-X/IEZGs43riUn6vC5bPyj4DS/VK+s7C10PbBnvwieaclBSVJyQ8H8hbn4eKi0kMVNEl0A9o8W09gXBxAhdNR9g=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/blockchains/vertcoin/default.nix b/pkgs/applications/blockchains/vertcoin/default.nix index acb02298e116..90e4dd14a685 100644 --- a/pkgs/applications/blockchains/vertcoin/default.nix +++ b/pkgs/applications/blockchains/vertcoin/default.nix @@ -9,32 +9,31 @@ , protobuf , hexdump , zeromq +, gmp , withGui , qtbase ? null , qttools ? null , wrapQtAppsHook ? null }: -with lib; - stdenv.mkDerivation rec { pname = "vertcoin"; - version = "0.15.0.1"; + version = "0.18.0"; - name = pname + toString (optional (!withGui) "d") + "-" + version; + name = pname + toString (lib.optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { owner = pname + "-project"; repo = pname + "-core"; - rev = version; - sha256 = "09q7qicw52gv225hq6wlpsf4zr4hjc8miyim5cygi5nxxrlw7kd3"; + rev = "2bd6dba7a822400581d5a6014afd671fb7e61f36"; + sha256 = "ua9xXA+UQHGVpCZL0srX58DDUgpfNa+AAIKsxZbhvMk="; }; nativeBuildInputs = [ autoreconfHook pkg-config hexdump - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ wrapQtAppsHook ]; @@ -44,7 +43,8 @@ stdenv.mkDerivation rec { libevent db4 zeromq - ] ++ optionals withGui [ + gmp + ] ++ lib.optionals withGui [ qtbase qttools protobuf @@ -54,12 +54,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - meta = { + meta = with lib; { description = "A digital currency with mining decentralisation and ASIC resistance as a key focus"; homepage = "https://vertcoin.org/"; license = licenses.mit; diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix index e4e97cae21a0..79355f3979dc 100644 --- a/pkgs/applications/blockchains/wasabibackend/default.nix +++ b/pkgs/applications/blockchains/wasabibackend/default.nix @@ -1,34 +1,34 @@ -{ lib -, stdenv -, fetchFromGitHub -, buildDotnetModule -, dotnetCorePackages -, autoPatchelfHook -, zlib -, openssl +{ + lib, + stdenv, + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, + autoPatchelfHook, + zlib, + openssl, }: - buildDotnetModule rec { pname = "wasabibackend"; - version = "1.1.13.1"; + version = "2.0.2.1"; src = fetchFromGitHub { owner = "zkSNACKs"; repo = "WalletWasabi"; - rev = "v${version}"; - sha256 = "sha256-Hwav7moG6XKAcR7L0Q7CtifP3zCNRfHIihlaFw+dzbk="; + rev = "refs/tags/v${version}"; + hash = "sha512-JuCl3SyejzwUd2n8Fy7EdxUuO4bIcGb8yMWZQOhZzsY4fvg9prFOnVZEquxahD0a41MLKHRNA1R2N3NMapcc0A=="; }; projectFile = "WalletWasabi.Backend/WalletWasabi.Backend.csproj"; nugetDeps = ./deps.nix; - dotnet-sdk = dotnetCorePackages.sdk_3_1; - dotnet-runtime = dotnetCorePackages.aspnetcore_3_1; + dotnet-sdk = dotnetCorePackages.sdk_7_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib zlib ]; + nativeBuildInputs = [autoPatchelfHook]; + buildInputs = [stdenv.cc.cc.lib zlib]; - runtimeDeps = [ openssl zlib ]; + runtimeDeps = [openssl zlib]; preConfigure = '' makeWrapperArgs+=( @@ -43,9 +43,9 @@ buildDotnetModule rec { meta = with lib; { description = "Backend for the Wasabi Wallet"; homepage = "https://wasabiwallet.io/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with sourceTypes; [binaryNativeCode]; license = licenses.mit; - maintainers = with maintainers; [ mmahut ]; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [mmahut]; + platforms = ["x86_64-linux"]; }; } diff --git a/pkgs/applications/blockchains/wasabibackend/deps.nix b/pkgs/applications/blockchains/wasabibackend/deps.nix index 273f2a5eafd7..eb55fd9f503e 100644 --- a/pkgs/applications/blockchains/wasabibackend/deps.nix +++ b/pkgs/applications/blockchains/wasabibackend/deps.nix @@ -1,9 +1,9 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.26"; sha256 = "0rib2121wri6wj6h4f6w4yqw9qp2xsad3ind63fmp1sr649jifyh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.26"; sha256 = "0z29rrhc87g0bi273lcqd608f7ngd16nv85v8549231yvf99n60x"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "3.1.26"; sha256 = "0pbm6hpibsvq5w8hyvvllz4qns287x3l8bc07krffv23yfbv8zwy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "3.1.1"; sha256 = "0c0aaz9rlh9chc53dnv5jryp0x0415hipaizrmih3kzwd3fmqpml"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "3.1.1"; sha256 = "1c2lrlp64kkacnjgdyygr6fqdawk10l8j4qgppii6rq61yjwhcig"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "15.3.409"; sha256 = "0vzq6csp2yys9s96c7i37bjml439rdi47g8f5rzqdr7xf5a1jk81"; }) (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "15.3.409"; sha256 = "1dhanwb9ihbfay85xj7cwn0byzmmdz94hqfi3q6r1ncwdjd8y1s2"; }) (fetchNuGet { pname = "Microsoft.Build.Runtime"; version = "15.3.409"; sha256 = "135ycnqz5jfg61y5zaapgc7xdpjx2aq4icmxb9ph7h5inl445q7q"; }) @@ -11,40 +11,33 @@ (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "15.3.409"; sha256 = "1p8a0l9sxmjj86qha748qjw2s2n07q8mn41mj5r6apjnwl27ywnf"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "3.0.0"; sha256 = "13a47xcqyi5gz85swxd4mgp7ndgl4kknrvv3xwmbn71hsh953hsh"; }) + (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.0.0"; sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "2.0.0"; sha256 = "0l0l92g7sq4122n139av1pn1jl6wlw92hjmdnr47xdss0ndmwrs3"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "2.0.0"; sha256 = "02lzy6r14ghwfwm384xajq08vv3pl3ww0mi5isrr10vivhijhgg4"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "1.0.0"; sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) (fetchNuGet { pname = "Microsoft.NETCore.App"; version = "2.0.5"; sha256 = "0qb7k624w7l0zhapdp519ymqg84a67r8zyd8cpj42hywsgb0dqv6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.26"; sha256 = "1vk4dr2z72nmjg2skqvy2m2h5brqp21v51pnd7ldpm7asgr5ck8n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "3.1.26"; sha256 = "0l5yfnpbd36n38rjlmhsnq4bniq1fcssv4qh8kb9h3qigz40qxj9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.26"; sha256 = "1h9b8fwgwbycvn1ngxnpdz3s1zh59wi2iy8n4y2nfkmz2rbldrrm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.26"; sha256 = "0y06qz4pgflwia222mljg19nlfmhcg0qs1a8wm3zwj602wzy3nll"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "3.1.26"; sha256 = "1half7rywhxb1x19gzddvjqbll4whx9wmwdlk57iy68djas95lmy"; }) (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "2.0.5"; sha256 = "00bsxdg9c8msjxyffvfi8siqk8v2m7ca8fqy1npv7b2pzg3byjws"; }) (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "2.0.5"; sha256 = "0v5csskiwpk8kz8wclqad8kcjmxr7ik4w99wl05740qvaag3qysk"; }) (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "2.0.5"; sha256 = "1sz2fdp8fdwz21x3lr2m1zhhrbix6iz699fjkwiryqdjl4ygd3hw"; }) (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.1"; sha256 = "1j2hmnivgb4plni2dd205kafzg6mkg7r4knrd3s7mg75wn2l25np"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.0"; sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; }) (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.OpenApi"; version = "1.1.4"; sha256 = "1sn79829nhx6chi2qxsza1801di7zdl5fd983m0jakawzbjhjcb3"; }) + (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Web.CodeGeneration.Contracts"; version = "2.0.2"; sha256 = "1fs6sbjn0chx6rv38d61zgk8mhyyxz44xp4wsfya0lvkckyszyn1"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Web.CodeGeneration.Tools"; version = "2.0.2"; sha256 = "0fkjm06irs53d77z29i6dwj5pjhgj9ivhad8v39ghnrwasc0ivq6"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.0.0"; sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.7.0"; sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; }) - (fetchNuGet { pname = "NBitcoin"; version = "5.0.81"; sha256 = "1fba94kc8yzykb1m5lvpx1hm63mpycpww9cz5zfp85phs1spdn8x"; }) - (fetchNuGet { pname = "NBitcoin.Secp256k1"; version = "1.0.10"; sha256 = "14hngbhxk2xjr5kcbsb26l788xnd1lmxn7fhmm2kvx49kdb1malp"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.14"; sha256 = "18nxx13fz3i7kmigijnynvrbx2i5cb3v4m89nvnxl38vcw7w5jys"; }) + (fetchNuGet { pname = "NBitcoin.Secp256k1"; version = "3.0.1"; sha256 = "17wxn0dinmp5fbqdirflfkz75wykqvw9a7ydv2inx1sajxnsy1f3"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.0"; sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.1"; sha256 = "0d44wjxphs1ck838v7dapm0ag0b91zpiy33cr5vflsrwrqgj51dk"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.1"; sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "4.0.0"; sha256 = "0nar684cm53cvzx28gzl6kmpg9mrfr1yv29323din7xqal4pscgq"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.0.11"; sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0"; }) @@ -66,13 +59,10 @@ (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.0.1"; sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; }) - (fetchNuGet { pname = "runtime.win.System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "1ylkj4v7aq00svij7aq82d86afpwqgrqf2kpikabxl26p19ry9wm"; }) - (fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.1.0"; sha256 = "1zmx2msa04ka8mgh8viahi4pqpp86vdhzij2rg1jg131bwlv59yw"; }) - (fetchNuGet { pname = "runtime.win7.System.Private.Uri"; version = "4.0.1"; sha256 = "1ibrwabavdpqapnplm5kh6nz9vgcwv0wn61w1p60v262kif6sglp"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "5.0.0"; sha256 = "0rn2awmzrsrppk97xbbwk4kq1mys9bygb5xhl6mphbk0hchrvh09"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "5.0.0"; sha256 = "1341nv8nmh6avs3y7w2szzir5qd0bndxwrkdmvvj3hcxj1126w2f"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "5.0.0"; sha256 = "00swg2avqnb38q2bsxljd34n8rpknp74h9vbn0fdnfds3a32cqr4"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "5.0.0"; sha256 = "0d7vjq489rz208j6k3rb7vq6mzxzff3mqg83yk2rqy25vklrsbjd"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.4.0"; sha256 = "1jkgjnkjcb6dif0lzn7whjwwdd4fi6mzkmkdx8sfmv5cffzq4fvk"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.4.0"; sha256 = "1wccx8ig2xc6xcfh774m5z34w6jn0hjffiwc5sq9yl63zkv01vnn"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.4.0"; sha256 = "1k58j6lfqcgrl5f7dw0xnbq6w5bvr42a9fc44vwbzl52kzjdlnh2"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.4.0"; sha256 = "1rxgf0hbkkzywh8z7asky2rrh1gpnrr514v1aj5vnmh49sa31kiz"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) @@ -160,7 +150,6 @@ (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) (fetchNuGet { pname = "System.Runtime.Serialization.Xml"; version = "4.1.1"; sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }) (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.2.0"; sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; }) (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.0.0"; sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; }) @@ -169,7 +158,6 @@ (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.0.0"; sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) (fetchNuGet { pname = "System.Security.Principal"; version = "4.0.1"; sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.0.1"; sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; }) diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 70c67db31c99..c4c8de947f1d 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -1,8 +1,11 @@ { lib, stdenv +, autoPatchelfHook +, makeWrapper , fetchurl , makeDesktopItem , curl , dotnetCorePackages +, lttng-ust_2_12 , fontconfig , krb5 , openssl @@ -11,29 +14,31 @@ }: let - dotnet-runtime = dotnetCorePackages.runtime_5_0; - libPath = lib.makeLibraryPath [ + dotnet-runtime = dotnetCorePackages.runtime_6_0; + # These libraries are dynamically loaded by the application, + # and need to be present in LD_LIBRARY_PATH + runtimeLibs = [ curl - dotnet-runtime fontconfig.lib krb5 openssl stdenv.cc.cc.lib xorg.libX11 + xorg.libICE + xorg.libSM zlib ]; in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "2.0.1.3"; + version = "2.0.2.1"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-cATqg/n4/BDQtuCVjHAx3EfMLmlX5EjeQ01gavy/L8o="; + sha256 = "sha256-kvUwWRZZmalJQL65tRNdgTg7ZQHhmIbfmsfHbHBYz7w="; }; dontBuild = true; - dontPatchELF = true; desktopItem = makeDesktopItem { name = "wasabi"; @@ -44,16 +49,19 @@ stdenv.mkDerivation rec { categories = [ "Network" "Utility" ]; }; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + buildInputs = runtimeLibs ++ [ + lttng-ust_2_12 + ]; + installPhase = '' mkdir -p $out/opt/${pname} $out/bin $out/share/applications cp -Rv . $out/opt/${pname} - cd $out/opt/${pname} - for i in $(find . -type f -name '*.so') wassabee - do - patchelf --set-rpath ${libPath} $i - done - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee - ln -s $out/opt/${pname}/wassabee $out/bin/${pname} + + makeWrapper "${dotnet-runtime}/bin/dotnet" "$out/bin/${pname}" \ + --add-flags "$out/opt/${pname}/WalletWasabi.Fluent.Desktop.dll" \ + --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" + cp -v $desktopItem/share/applications/* $out/share/applications ''; diff --git a/pkgs/applications/blockchains/wownero/default.nix b/pkgs/applications/blockchains/wownero/default.nix index 14e17c766dd9..9c68a094b878 100644 --- a/pkgs/applications/blockchains/wownero/default.nix +++ b/pkgs/applications/blockchains/wownero/default.nix @@ -2,7 +2,6 @@ , readline, libsodium, rapidjson }: -with lib; stdenv.mkDerivation rec { pname = "wownero"; version = "0.8.0.1"; @@ -41,7 +40,7 @@ stdenv.mkDerivation rec { "-DMANUAL_SUBMODULES=ON" ]; - meta = { + meta = with lib; { description = '' A privacy-centric memecoin that was fairly launched on April 1, 2018 with no pre-mine, stealth-mine or ICO diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 7466ff31d581..04340e75a7a8 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -1,5 +1,5 @@ { autoreconfHook, boost180, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub -, hexdump, hostPlatform, lib, libevent, libsodium, makeWrapper, rust, rustPlatform +, hexdump, lib, libevent, libsodium, makeWrapper, rust, rustPlatform , pkg-config, Security, stdenv, testers, utf8cpp, util-linux, zcash, zeromq }: @@ -82,6 +82,6 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { license = licenses.mit; # https://github.com/zcash/zcash/issues/4405 - broken = hostPlatform.isAarch64 && hostPlatform.isDarwin; + broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/display-managers/emptty/default.nix b/pkgs/applications/display-managers/emptty/default.nix new file mode 100644 index 000000000000..61413a7bbcf1 --- /dev/null +++ b/pkgs/applications/display-managers/emptty/default.nix @@ -0,0 +1,32 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, libX11 +, pam +, stdenv +}: + +buildGoModule rec { + pname = "emptty"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "tvrzna"; + repo = pname; + rev = "v${version}"; + hash = "sha256-CbTPJgnKMWMXdG6Hr8xT9ae4Q9MxAfhITn5WSCzCmI4="; + }; + + buildInputs = [ pam libX11 ]; + + vendorHash = "sha256-tviPb05puHvBdDkSsRrBExUVxQy+DzmkjB+W9W2CG4M="; + + meta = with lib; { + description = "Dead simple CLI Display Manager on TTY"; + homepage = "https://github.com/tvrzna/emptty"; + license = licenses.mit; + maintainers = with maintainers; [ urandom ]; + # many undefined functions + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/display-managers/greetd/wlgreet.nix b/pkgs/applications/display-managers/greetd/wlgreet.nix index 932aa47fd714..cea23577cc45 100644 --- a/pkgs/applications/display-managers/greetd/wlgreet.nix +++ b/pkgs/applications/display-managers/greetd/wlgreet.nix @@ -4,17 +4,17 @@ }: rustPlatform.buildRustPackage rec { - pname = "wlgreet-unstable"; - version = "2022-01-25"; + pname = "wlgreet"; + version = "0.4.1"; src = fetchFromSourcehut { owner = "~kennylevinsen"; - repo = "wlgreet"; - rev = "8517e578cb64a8fb3bd8f8a438cdbe46f208b87c"; - sha256 = "0la4xlikw61cxvbkil1d22dgvazi7rs17n5i2z02090fvnfxxzxh"; + repo = pname; + rev = version; + hash = "sha256-qfEzr8tAE1+PK7xs1NQ1q6d/GlFA7/kSWXbJDOCrEsw="; }; - cargoSha256 = "651d2bf01612534f1c4b0472c812095a86eb064d16879380c87f684c04fe0d8d"; + cargoHash = "sha256-1ugExUtrzqyd9dTlBHcc44UrtEfYrfUryuG79IkTv2Y="; meta = with lib; { description = "Raw wayland greeter for greetd, to be run under sway or similar"; diff --git a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix index fe912d2cc30a..605b5bc286ab 100644 --- a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "lightdm-slick-greeter"; - version = "1.5.9"; + version = "1.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "slick-greeter"; rev = version; - sha256 = "sha256-UEzidH4ZWggcOWHHuAclHbbgATDBdogL99Ze0PlwRoc="; + sha256 = "sha256-k/E3bR63kesHQ/we+ctC0UEYE5YdZ6Lv5lYuXqCOvKA="; }; nativeBuildInputs = [ @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { substituteInPlace src/slick-greeter.vala \ --replace "/usr/bin/numlockx" "${numlockx}/bin/numlockx" \ --replace "/usr/share/xsessions/" "/run/current-system/sw/share/xsessions/" \ + --replace "/usr/share/wayland-sessions/" "/run/current-system/sw/share/wayland-sessions/" \ --replace "/usr/bin/slick-greeter" "${placeholder "out"}/bin/slick-greeter" substituteInPlace src/session-list.vala \ diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 1817910c295a..8365ac3b5a22 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -30,8 +30,6 @@ , yelp-tools }: -with lib; - stdenv.mkDerivation rec { pname = "lightdm"; version = "1.32.0"; @@ -69,7 +67,7 @@ stdenv.mkDerivation rec { libxklavier pam polkit - ] ++ optional withQt5 qtbase; + ] ++ lib.optional withQt5 qtbase; patches = [ # Adds option to disable writing dmrc files @@ -96,7 +94,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--disable-tests" "--disable-dmrc" - ] ++ optional withQt5 "--enable-liblightdm-qt5"; + ] ++ lib.optional withQt5 "--enable-liblightdm-qt5"; installFlags = [ "sysconfdir=${placeholder "out"}/etc" @@ -116,13 +114,11 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; - meta = { + meta = with lib; { homepage = "https://github.com/canonical/lightdm"; description = "A cross-desktop display manager"; platforms = platforms.linux; diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix index 8472a91c596f..6e817646d9e7 100644 --- a/pkgs/applications/editors/aewan/default.nix +++ b/pkgs/applications/editors/aewan/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Ascii-art Editor Without A Name"; - homepage = "http://aewan.sourceforge.net/"; + homepage = "https://aewan.sourceforge.net/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index bc74edf5261d..3d96ebd8deab 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -79,7 +79,7 @@ let installPhase = '' cp -r . $out wrapProgram $out/bin/studio.sh \ - --set-default JAVA_HOME "$out/jre" \ + --set-default JAVA_HOME "$out/jbr" \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ ${lib.optionalString tiling_wm "--set _JAVA_AWT_WM_NONREPARENTING 1"} \ diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 70d146db3218..494a02f3041f 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -10,16 +10,16 @@ let inherit tiling_wm; }; stableVersion = { - version = "2021.3.1.17"; # "Android Studio Dolphin (2021.3.1)" - sha256Hash = "sha256-ia2wzg/6RreJTnv+2xQrH11SxDwXHmpsualaSfd3Vso="; + version = "2022.1.1.19"; # "Android Studio Electric Eel (2022.1.1)" + sha256Hash = "luxE6a2C86JB28ezuIZV49TyE314S1RcNXQnCQamjUA="; }; betaVersion = { - version = "2022.1.1.12"; # "Android Studio Electric Eel (2022.1.1) Beta 2" - sha256Hash = "8iSFPH0PTQkzV1t8bEq7CBtOU8pzdnD/PrpVcgPnO6Q="; + version = "2022.2.1.12"; # "Android Studio Flamingo (2022.2.1) Beta 1" + sha256Hash = "tIgmX9KiRInIupgIXWgg4dMf8bTwkVopOxAO5O1PUAc="; }; latestVersion = { # canary & dev - version = "2022.2.1.2"; # "Android Studio Flamingo (2022.2.1) Canary 2" - sha256Hash = "hlHlgyl9If2LH4aExpElx0rqmWeoFX+qx4w6RRb5e8U="; + version = "2022.3.1.1"; # "Android Studio Girrafe (2022.3.1) Canary 1" + sha256Hash = "I7Zc4DDByUB6XOnk7v+91ccpNI7eX/T4d3vH60ih8ec="; }; 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 fc6ddd93567c..674b27330802 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -7,7 +7,7 @@ let pythonEnv = pythonPackages.python.withPackages(p: with p; [ - regex setuptools python-Levenshtein pyenchant + regex setuptools levenshtein pyenchant pygobject3 pycairo pypandoc chardet ]); diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix index caa1d2ab79b9..e435e834e7e5 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 = "2022-02-05"; + version = "2022-08-20"; src = fetchFromGitHub { owner = "Gargaj"; repo = pname; rev = version; - sha256 = "sha256-y0zNluIDxms+Lpg7yBiEJNNyxx5TLaSiWBKXjqXiVJg="; + sha256 = "sha256-AaUMefxQd00O+MAH4OLoyQIXZCRQQbt2ucgt7pVvN24="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix index ddef8467646b..e4e41ec732b2 100644 --- a/pkgs/applications/editors/bvi/default.nix +++ b/pkgs/applications/editors/bvi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Hex editor with vim style keybindings"; - homepage = "http://bvi.sourceforge.net/download.html"; + homepage = "https://bvi.sourceforge.net/download.html"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 7a1c0af2c643..441b224ef022 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -2,8 +2,6 @@ , contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook }: -with lib; - stdenv.mkDerivation rec { name = "${pname}-${lib.optionalString contribPlugins "full-"}${version}"; version = "20.03"; @@ -16,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ]; buildInputs = [ wxGTK31 gtk3 ] - ++ optionals contribPlugins [ hunspell gamin boost ]; + ++ lib.optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; patches = [ ./writable-projects.patch @@ -56,16 +54,16 @@ stdenv.mkDerivation rec { }) ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; - configureFlags = [ "--enable-pch=no" ] ++ optionals contribPlugins [ - ("--with-contrib-plugins" + optionalString stdenv.isDarwin "=all,-FileManager,-NassiShneiderman") + postConfigure = lib.optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; + configureFlags = [ "--enable-pch=no" ] ++ lib.optionals contribPlugins [ + ("--with-contrib-plugins" + lib.optionalString stdenv.isDarwin "=all,-FileManager,-NassiShneiderman") "--with-boost-libdir=${boost}/lib" ]; - postInstall = optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' ln -s $out/lib/codeblocks/plugins $out/share/codeblocks/plugins ''; - meta = { + meta = with lib; { maintainers = [ maintainers.linquize ]; platforms = platforms.all; description = "The open source, cross platform, free C, C++ and Fortran IDE"; diff --git a/pkgs/applications/editors/cpeditor/default.nix b/pkgs/applications/editors/cpeditor/default.nix index 74394418fd53..eaa2b0d9959c 100644 --- a/pkgs/applications/editors/cpeditor/default.nix +++ b/pkgs/applications/editors/cpeditor/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cpeditor"; - version = "6.10.1"; + version = "6.11.1"; src = fetchFromGitHub { owner = "cpeditor"; repo = "cpeditor"; rev = version; - sha256 = "sha256-SIREoOapaZTLtqi0Z07lKmNqF9a9qIpgGxuhqaY3yfU="; + sha256 = "sha256-Uwo7ZE+9yrHV/+D6rvfew2d3ZJbpFOjgek38iYkPppw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index d2a0080859da..7773c1e75f23 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -2,7 +2,7 @@ , 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 }: +{ name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description }: stdenv.mkDerivation rec { inherit name src; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { tar xfvz $src -C $out # Patch binaries. - interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2) + interpreter="$(cat $NIX_BINTOOLS/nix-support/dynamic-linker)" libCairo=$out/eclipse/libcairo-swt.so patchelf --set-interpreter $interpreter $out/eclipse/eclipse [ -f $libCairo ] && patchelf --set-rpath ${lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} $libCairo @@ -38,13 +38,14 @@ stdenv.mkDerivation rec { # settings in ~/.eclipse/org.eclipse.platform_ rather # than ~/.eclipse/org.eclipse.platform__. productId=$(sed 's/id=//; t; d' $out/eclipse/.eclipseproduct) + productVersion=$(sed 's/version=//; t; d' $out/eclipse/.eclipseproduct) 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" + --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" # Create desktop item. mkdir -p $out/share/applications @@ -57,10 +58,10 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = "http://www.eclipse.org/"; + homepage = "https://www.eclipse.org/"; inherit description; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 64204deaa4aa..a57a3901f63a 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -14,21 +14,24 @@ let platform_major = "4"; - platform_minor = "25"; + platform_minor = "26"; year = "2022"; - month = "09"; #release month - buildmonth = "08"; #sometimes differs from release month - timestamp = "${year}${buildmonth}311800"; + month = "12"; #release month + buildmonth = "11"; #sometimes differs from release month + timestamp = "${year}${buildmonth}231800"; gtk = gtk3; + arch = if stdenv.hostPlatform.isx86_64 then + "x86_64" + else if stdenv.hostPlatform.isAarch64 then + "aarch64" + else throw "don't know what platform suffix for ${stdenv.hostPlatform.system} will be"; in rec { - # work around https://bugs.eclipse.org/bugs/show_bug.cgi?id=476075#c3 - buildEclipseUnversioned = callPackage ./build-eclipse.nix { + buildEclipse = callPackage ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib jdk glib gtk libXtst gsettings-desktop-schemas webkitgtk makeWrapper; }; - buildEclipse = eclipseData: buildEclipseUnversioned (eclipseData // { productVersion = "${platform_major}.${platform_minor}"; }); ### Eclipse CPP @@ -37,8 +40,11 @@ in rec { description = "Eclipse IDE for C/C++ Developers"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-1sUQ/jDOQMqnKLKY6oh28STvS5pbH89+2zs+H77euiJOsBgB+yEkEntnhI39O67qmOK/EkQ3y3NkQcumbax56A=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-nqqY4dewq1bjeNoZdWvOez+cBti+f9qXshx1eqJ2lB7sGJva5mcR9e+CZTVD0+EtVJ/U+8viJ+E1Veht1ZnqOw=="; + aarch64 = "sha512-kmeNH6F8oK72LtrYtiJVLKhy6Q1HwnU+Bh+mpXdXSrfj9KtqzHQkJ0kTnnJkGYLtpi+zyXDwsxzyjh6pPyDRJA=="; + }.${arch}; }; }; @@ -49,8 +55,11 @@ in rec { description = "Eclipse Modeling Tools"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-Qb2BmfXtmVeTLIZZav91hayPkwSGYMAG3fod3BmyJdo1DPas6VC+MzBwklAjpC1wqLTzKCAKzVZtdtPYC9QCqw=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-WU2BJt6GL3ug3yOUOd5y6/AbGLcr2MkCg+QJiNIMkSXvoU9TF6R6oimoGVc3kPZmazRy6WYoes55T3bWrHnO8Q=="; + aarch64 = "sha512-F63f2o9u/p7hhrxI+Eu6NiL4sPccIYw876Nnj8mfSZ7bozs1OVNWftZj+xbdLLbr0bVz3WKnt4BHzcLUA6QG7g=="; + }.${arch}; }; }; @@ -61,24 +70,29 @@ in rec { description = "Eclipse Platform ${year}-${month}"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - hash = "sha512-RW+5H82AcH/U9XUzIlUCU5heN9qQAlMl3rmxsKnTYxVWdIjSN461Nf71F6jPhL/Q+VCAMesguOEF0AqyhnH0nw=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-hmdWGteMDt4HhYq+k9twuftalpTzHtGnVVLphZcpJcw+6vJfersciDMaeLRqbCAeFbzJdgzjYo76bpP6FubySw=="; + aarch64 = "sha512-BvUkOdCsjwtscPeuBXG7ZpitOr8EQK5JL8nSGpw/RhhBEFz46nsc7W18l0aYjdzRHh2ie55RylS2PEQELkS/hQ=="; + }.${arch}; }; }; ### Eclipse Scala SDK eclipse-scala-sdk = - buildEclipseUnversioned.override { jdk = jdk8; gtk = gtk2; } { + (buildEclipse.override { jdk = jdk8; gtk = gtk2; } { name = "eclipse-scala-sdk-4.7.0"; description = "Eclipse IDE for Scala Developers"; - productVersion = "4.7"; src = fetchurl { url = "https://downloads.typesafe.com/scalaide-pack/4.7.0-vfinal-oxygen-212-20170929/scala-SDK-4.7.0-vfinal-2.12-linux.gtk.x86_64.tar.gz"; sha256 = "1n5w2a7mh9ajv6fxcas1gpgwb04pdxbr9v5dzr67gsz5bhahq4ya"; }; - }; + }).overrideAttrs(oa: { + # Only download for x86_64 + meta.platforms = [ "x86_64-linux" ]; + }); ### Eclipse SDK @@ -87,8 +101,11 @@ in rec { description = "Eclipse ${year}-${month} Classic"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - hash = "sha512-1wjKNBl6A2XENRVZNtDelPSMAYtc4wRXdQ4CJX/1YcFUPEzbPsX7plO2uJXmDpZcjw3wkQNxqy4bmZF6YnXy/Q=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-hmdWGteMDt4HhYq+k9twuftalpTzHtGnVVLphZcpJcw+6vJfersciDMaeLRqbCAeFbzJdgzjYo76bpP6FubySw=="; + aarch64 = "sha512-UYp8t7r2RrN3rKN180cWpJyhyO5LVXL8LrTRKJzttUgB7kM1nroTEI3DesBu+Hw4Ynl7eLiBK397rqcpOAfxJw=="; + }.${arch}; }; }; @@ -99,8 +116,11 @@ in rec { description = "Eclipse IDE for Java Developers"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-UejE0pzgwBYpmNbdGEegMM5iEOMYP+VvebU17YQeJUzh/qYr0B6sfXwJ+cdTCavKCNGLMMDenJMYk9V/6DSZHw=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-71mXYVLVnyDjYZbJGBKc0aDPq8sbTxlVZRQq7GlSUDv2fsoNYWYgqYfK7RSED5yoasCfs3HUYr7QowRAKJOnfQ=="; + aarch64 = "sha512-KOQ6BZuQJeVpbMQVxF67M3F/KXMmDhmZQBNq0yWM+/8+d0DiBRkwJtqPYsnTqrax8FSunn2yy+CzlfyHSoNvpg=="; + }.${arch}; }; }; @@ -111,8 +131,11 @@ in rec { description = "Eclipse IDE for Enterprise Java and Web Developers"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-9E0Zwv64qRwVdPouhmIYT6SkbTkd3zLnfkHduHy2VXvmqW7xaOfmplvxpr+V1RDpnfDfw4RouU+WQdhFqBqcWg=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-55i9YVOa+vKHt72vHIqy9BmKMkg1KaLqMStjTtfaLTH5yP0ei+NTP2XL8IBHOgu0hCEJqYXTq+3I3RQy476etQ=="; + aarch64 = "sha512-iaoTB/Pinoj1weiGBBv0plQ4jGNdFs2JiBG7S/icUoAX5O6jTGAgJvOwh7Nzn+0N6YL6+HPWaV24a6lM43y8Og=="; + }.${arch}; }; }; @@ -123,8 +146,11 @@ in rec { description = "Eclipse IDE for Eclipse Committers and Eclipse Platform Plugin Developers"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-V7GmvqQVZnTkkhKmuGyMiZlFlRpFbXM7r6w9yS0FxBOHNHIzkX4pJ6sgn+ww1lvwsdPqBFYtbWUiuKo73eTKzg=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-zGeynifM0dn1214HEVS7OVtv7xa8asjLzOXh5riJK8c/DWvNrRduHn6o6PGnxYOYVIfC9BzNRAjG1STkWu9j+Q=="; + aarch64 = "sha512-B866dFJcsTkq+h0RZ61CxXE83TWvCf8ZAbGeIC385PpPR3i/gZnRjN2oRrDP22CNR5XXA+PfXKxqvERhJB5ebA=="; + }.${arch}; }; }; @@ -135,8 +161,11 @@ in rec { description = "Eclipse IDE for RCP and RAP Developers"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha256-8qQWwUiNemJLTAncZwO14fBfr7kTmmXPSeqBLfV8wTw="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha256-ml76ix0fHuR0KqYWQuTftEBAgq7iaOIyvr8V6WhuzeU="; + aarch64 = "sha256-sMB6a3f0fiL6ZentIjJTMi59ZOh7dizXrkMQuIRbds0="; + }.${arch}; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 8c9189466c83..5ae155f39f9a 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -255,12 +255,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; # find current version at https://www.eclipse.org/cdt/downloads.php - version = "10.7.0"; + version = "11.0.0"; src = fetchzip { stripRoot = false; url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip"; - hash = "sha256-/lQ3TLFQ1IgwYM540gxAFiEGOfHQIQQMf/pqCZ29ztQ="; + hash = "sha256-2rt9crMqNFevIHFIdOGWDq+j0ZJPVt1a9Z7P9HG58Ks="; }; meta = with lib; { diff --git a/pkgs/applications/editors/edlin/default.nix b/pkgs/applications/editors/edlin/default.nix new file mode 100644 index 000000000000..9de4f8d4a8c7 --- /dev/null +++ b/pkgs/applications/editors/edlin/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "edlin"; + version = "2.21"; + + src = let + inherit (finalAttrs) version; + in fetchurl { + url = "mirror://sourceforge/freedos-edlin/freedos-edlin/${version}/edlin-${version}.tar.bz2"; + hash = "sha256-lQ/tw8dvEKV81k5GV05o49glOmfYcEeJBmgPUmL3S2I="; + }; + + postInstall = '' + mkdir -p $out/share/doc/edlin-${finalAttrs.version}/ + cp AUTHORS ChangeLog README TODO edlin.htm $out/share/doc/edlin-${finalAttrs.version}/ + ''; + + meta = with lib; { + homepage = "https://sourceforge.net/projects/freedos-edlin/"; + description = "FreeDOS line editor"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +}) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 3b19adfa1719..2a98995b5d59 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -60,6 +60,7 @@ self: let else super.org-transclusion; rcirc-menu = markBroken super.rcirc-menu; # Missing file header cl-lib = null; # builtin + cl-print = null; # builtin tle = null; # builtin advice = null; # builtin seq = if lib.versionAtLeast self.emacs.version "27" diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix index 82ea42aa2b83..c2a6fca64fea 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix @@ -1,20 +1,13 @@ -{ lib, stdenv, fetchurl }: +{ lib, trivialBuild, fetchurl }: -stdenv.mkDerivation { - name = "control-lock"; +trivialBuild { + pname = "control-lock"; src = fetchurl { - url = "https://github.com/emacsmirror/emacswiki.org/blob/185fdc34fb1e02b43759ad933d3ee5646b0e78f8/control-lock.el"; - sha256 = "1b5xcgq2r565pr1c14dwrmn1fl05p56infapa5pqvajv2kpfla7h"; + url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/185fdc34fb1e02b43759ad933d3ee5646b0e78f8/control-lock.el"; + hash = "sha256-JCrmS3FSGDHSR+eAR0X/uO0nAgd3TUmFxwEVH5+KV+4="; }; - dontUnpack = true; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install $src $out/share/emacs/site-lisp/control-lock.el - ''; - meta = { description = "Like caps-lock, but for your control key. Give your pinky a rest!"; homepage = "https://www.emacswiki.org/emacs/control-lock.el"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix index 04a105ed5145..7473a8587929 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix @@ -2,11 +2,11 @@ trivialBuild rec { pname = "ebuild-mode"; - version = "1.60"; + version = "1.61"; src = fetchurl { url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz"; - sha256 = "sha256-XN+RLVff4yvxjaAuNjUgSOzU0KdnVGMt9B78rfW389g="; + sha256 = "sha256-/n3gs99psdiCA1Kjtljfx9T5anGPphtsMIC2nOCv0wk="; }; meta = with lib; { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix index ad12c606abb9..178fb16751e2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix @@ -1,19 +1,17 @@ -{ lib -, trivial-build +{ trivialBuild , fetchurl }: -trivial-build { - name = "perl-completion"; +trivialBuild { + pname = "perl-completion"; src = fetchurl { url = "http://emacswiki.org/emacs/download/perl-completion.el"; sha256 = "0x6qsgs4hm87k0z9q3g4p6508kc3y123j5jayll3jf3lcl2vm6ks"; }; - dontUnpack = true; - meta = { + broken = true; description = "Minor mode provides useful features for editing perl codes"; homepage = "http://emacswiki.org/emacs/PerlCompletion"; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix index 71f9981f461a..f21e79c8f33d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { (add-hook 'after-init-hook 'session-initialize) */ description = "Small session management for emacs"; - homepage = "http://emacs-session.sourceforge.net/"; + homepage = "https://emacs-session.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix index a9462298979d..9825ed0834a2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix @@ -43,13 +43,9 @@ let pname = "tsc-dyn"; - nativeBuildInputs = [ clang ]; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; sourceRoot = "source/core"; - configurePhase = '' - export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib" - ''; - postInstall = '' LIB=($out/lib/libtsc_dyn.*) TSC_PATH=$out/share/emacs/site-lisp/elpa/tsc-${version} diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 21d286ff3a2c..feed7ba5b41e 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -7,13 +7,13 @@ , patches ? _: [ ] , macportVersion ? null }: -{ stdenv, llvmPackages_6, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm +{ stdenv, llvmPackages_6, lib, fetchurl, fetchpatch, substituteAll, ncurses, libXaw, libXpm , Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib , libtiff, librsvg, libwebp, gconf, libxml2, imagemagick, gnutls, libselinux , alsa-lib, cairo, acl, gpm, m17n_lib, libotf , sigtool, jansson, harfbuzz, sqlite, nixosTests , recurseIntoAttrs, emacsPackagesFor -, libgccjit, targetPlatform, makeWrapper # native-comp params +, libgccjit, makeWrapper # native-comp params , fetchFromSavannah, fetchFromBitbucket # macOS dependencies for NS and macPort @@ -44,7 +44,7 @@ else if withMotif then "motif" else if withAthena then "athena" else "lucid") -, withSystemd ? stdenv.isLinux, systemd +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: assert (libXft != null) -> libpng != null; # probably a bug @@ -67,7 +67,25 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation pname = pname + lib.optionalString ( !withX && !withNS && !withMacport && !withGTK2 && !withGTK3 ) "-nox"; inherit version; - patches = patches fetchpatch; + patches = patches fetchpatch ++ lib.optionals nativeComp [ + (substituteAll { + src = if lib.versionOlder version "29" + then ./native-comp-driver-options-28.patch + else ./native-comp-driver-options.patch; + backendPath = (lib.concatStringsSep " " + (builtins.map (x: ''"-B${x}"'') [ + # Paths necessary so the JIT compiler finds its libraries: + "${lib.getLib libgccjit}/lib" + "${lib.getLib libgccjit}/lib/gcc" + "${lib.getLib stdenv.cc.libc}/lib" + + # Executable paths necessary for compilation (ld, as): + "${lib.getBin stdenv.cc.cc}/bin" + "${lib.getBin stdenv.cc.bintools}/bin" + "${lib.getBin stdenv.cc.bintools.bintools}/bin" + ])); + }) + ]; src = if macportVersion != null then fetchFromBitbucket { owner = "mituharu"; @@ -112,25 +130,6 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation done '' - # Make native compilation work both inside and outside of nix build - (lib.optionalString nativeComp (let - backendPath = (lib.concatStringsSep " " - (builtins.map (x: ''\"-B${x}\"'') [ - # Paths necessary so the JIT compiler finds its libraries: - "${lib.getLib libgccjit}/lib" - "${lib.getLib libgccjit}/lib/gcc" - "${lib.getLib stdenv.cc.libc}/lib" - - # Executable paths necessary for compilation (ld, as): - "${lib.getBin stdenv.cc.cc}/bin" - "${lib.getBin stdenv.cc.bintools}/bin" - "${lib.getBin stdenv.cc.bintools.bintools}/bin" - ])); - in '' - substituteInPlace lisp/emacs-lisp/comp.el --replace \ - "(defcustom native-comp-driver-options nil" \ - "(defcustom native-comp-driver-options '(${backendPath})" - '')) "" ]; @@ -144,9 +143,10 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation ++ lib.optionals stdenv.isLinux [ dbus libselinux alsa-lib acl gpm ] ++ lib.optionals withSystemd [ systemd ] ++ lib.optionals withX - [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg giflib libtiff libXft - gconf cairo ] - ++ lib.optionals (withX || withNS) [ librsvg ] + [ libXaw Xaw3d gconf cairo ] + ++ lib.optionals (withX || withPgtk) + [ libXpm libpng libjpeg giflib libtiff ] + ++ lib.optionals (withX || withNS || withPgtk ) [ librsvg ] ++ lib.optionals withImageMagick [ imagemagick ] ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ] ++ lib.optional (withX && withGTK2) gtk2-x11 @@ -178,8 +178,10 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation then [ "--disable-ns-self-contained" ] else if withX then [ "--with-x-toolkit=${toolkit}" "--with-xft" "--with-cairo" ] - else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" - "--with-gif=no" "--with-tiff=no" ]) + else if withPgtk + then [ "--with-pgtk" ] + else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" + "--with-gif=no" "--with-tiff=no" ]) ++ lib.optionals withMacport [ "--with-mac" "--enable-mac-app=$$out/Applications" @@ -189,7 +191,6 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation ++ lib.optional withXwidgets "--with-xwidgets" ++ lib.optional nativeComp "--with-native-compilation" ++ lib.optional withImageMagick "--with-imagemagick" - ++ lib.optional withPgtk "--with-pgtk" ++ lib.optional withXinput2 "--with-xinput2" ++ lib.optional (!withToolkitScrollBars) "--without-toolkit-scroll-bars" ; diff --git a/pkgs/applications/editors/emacs/native-comp-driver-options-28.patch b/pkgs/applications/editors/emacs/native-comp-driver-options-28.patch new file mode 100644 index 000000000000..98c6da305145 --- /dev/null +++ b/pkgs/applications/editors/emacs/native-comp-driver-options-28.patch @@ -0,0 +1,16 @@ +diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el +index a5ab12ae38..e33e71cb55 100644 +--- a/lisp/emacs-lisp/comp.el ++++ b/lisp/emacs-lisp/comp.el +@@ -178,7 +178,7 @@ native-comp-compiler-options + :type '(repeat string) + :version "28.1") + +-(defcustom native-comp-driver-options nil ++(defcustom native-comp-driver-options '(@backendPath@) + "Options passed verbatim to the native compiler's back-end driver. + Note that not all options are meaningful; typically only the options + affecting the assembler and linker are likely to be useful. +-- +2.37.3 + diff --git a/pkgs/applications/editors/emacs/native-comp-driver-options.patch b/pkgs/applications/editors/emacs/native-comp-driver-options.patch new file mode 100644 index 000000000000..58eee35aed0a --- /dev/null +++ b/pkgs/applications/editors/emacs/native-comp-driver-options.patch @@ -0,0 +1,19 @@ +diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el +index 2c9b79334b..50c6b5ac85 100644 +--- a/lisp/emacs-lisp/comp.el ++++ b/lisp/emacs-lisp/comp.el +@@ -178,8 +178,9 @@ native-comp-compiler-options + :type '(repeat string) + :version "28.1") + +-(defcustom native-comp-driver-options (when (eq system-type 'darwin) +- '("-Wl,-w")) ++(defcustom native-comp-driver-options (append (when (eq system-type 'darwin) ++ '("-Wl,-w")) ++ '(@backendPath@)) + "Options passed verbatim to the native compiler's back-end driver. + Note that not all options are meaningful; typically only the options + affecting the assembler and linker are likely to be useful. +-- +2.37.3 + diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index dc00e09b9743..b7cca4ff3ec9 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "featherpad"; - version = "1.3.1"; + version = "1.3.5"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; rev = "V${version}"; - sha256 = "sha256-OLipBhSrXf9lLpSYLwjjOv5AYJDt46MlnEW4YetXZjI="; + sha256 = "sha256-deQDLcymci8x9QvVOfNwroZPvifovxV6+jT9Grl3sxA="; }; nativeBuildInputs = [ cmake pkg-config qttools ]; diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix index b4b5e74887c1..c2b3229d4523 100644 --- a/pkgs/applications/editors/fte/default.nix +++ b/pkgs/applications/editors/fte/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free text editor for developers"; - homepage = "http://fte.sourceforge.net/"; + homepage = "https://fte.sourceforge.net/"; license = licenses.gpl2; maintainers = [ ]; platforms = platforms.all; diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index dde5083d9c8d..5472b28b62b9 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glow"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "glow"; rev = "v${version}"; - sha256 = "0m673xf67q9gjhd98ysh3dvwiqbj6lgsbm20c4zxyz76vdn5k6x8"; + sha256 = "sha256-CI0S9XJtJQClpQvI6iSb5rcHafEUwr2V6+Fq560lRfM="; }; - vendorSha256 = "0ngasfcimizahm80gflxzz3cxz0ir10l62i03l73w8syx4wll0q4"; + vendorHash = "sha256-2QrHBbhJ04r/vPK2m8J2KZSFrREDCc18tlKd7evghBc="; doCheck = false; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 54625d75e5c5..2518b6bd7d99 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "43.2"; + version = "43.5"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "dzIhF6ERsnR7zOitYFeKZ5wgIeSGkRz29OY0FjKKuzM="; + sha256 = "Rav15H1s4jzjTXjFcOgeBrIntD6ZoRMlcy7GXhskU+o="; }; patches = [ @@ -66,14 +66,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils - (gi-docgen.overrideAttrs (attrs: { - patches = attrs.patches ++ [ - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gi-docgen/-/commit/f4ff4787cce962b705fb2588b31f2988c5063c13.patch"; - sha256 = "11VGFFb2PLVxnX/qUQdLPLfhGQWx4sf4apBP7R2JWjA="; - }) - ]; - })) + gi-docgen gobject-introspection meson ninja @@ -111,7 +104,7 @@ stdenv.mkDerivation rec { webkitgtk_5_0 ]; - checkInputs = [ + nativeCheckInputs = [ dbus xvfb-run ]; @@ -136,9 +129,9 @@ stdenv.mkDerivation rec { ''; checkPhase = '' - export NO_AT_BRIDGE=1 + GTK_A11Y=none \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs ''; diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 156e8eaac7e7..573b8cdfee9e 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -21,12 +21,12 @@ }: stdenv.mkDerivation rec { - version = "3.42.0"; + version = "3.44.0"; pname = "gnome-latex"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ASMecEE3WNGu1pYNqhoigfqRNaYFkQuodM7VMn3LhUM="; + sha256 = "iL1TQL0ox+0Bx5ZqOgBzK72QJ3PfWsZZvmrRGAap50Q="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index d3d0c7c2f939..55135c255bfb 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "helix"; - version = "22.08.1"; + version = "22.12"; # This release tarball includes source code for the tree-sitter grammars, # which is not ordinarily part of the repository. src = fetchzip { url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz"; - sha256 = "sha256-pqAhUxKeFN7eebVdNN3Ge38sA30SUSu4Xn4HDZAjjyY="; + sha256 = "sha256-En6SOyAPNPPzDGdm2XTjbGG0NQFGBVzjjoyCbdnHFao="; stripRoot = false; }; - cargoSha256 = "sha256-idItRkymr+cxk3zv2mPBR/frCGvzEUdSAhY7gghfR3M="; + cargoSha256 = "sha256-oSS0LkLg2JSRLYoF0+FVQzFUJtFuVKtU2MWYenmFC0s="; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix index 424295b12c98..cc3b39ed4bf7 100644 --- a/pkgs/applications/editors/hexdino/default.nix +++ b/pkgs/applications/editors/hexdino/default.nix @@ -1,19 +1,17 @@ -{ lib, fetchFromGitHub, rustPlatform, ncurses }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "hexdino"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "Luz"; repo = pname; rev = version; - sha256 = "1n8gizawx8h58hpyyqivp7vwy7yhn6scipl5rrbvkpnav8qpmk1r"; + sha256 = "sha256-OFtOa6StpOuLgkULnY5MlqDcSTEiMxogowHIBEiGr4E="; }; - cargoSha256 = "01869b1d7gbsprcxxj7h9z16pvnzb02j2hywh97gfq5x96gnmkz3"; - - buildInputs = [ ncurses ]; + cargoSha256 = "sha256-lvLiRQNH3rpu+JTXWhQtXczmGRWGtnnLDknZaMp3d0s="; meta = with lib; { description = "A hex editor with vim like keybindings written in Rust"; diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix index 2c959519f41f..ff9a30074120 100644 --- a/pkgs/applications/editors/howl/default.nix +++ b/pkgs/applications/editors/howl/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, gtk3, librsvg }: -with lib; - stdenv.mkDerivation rec { pname = "howl"; version = "0.6"; @@ -27,7 +25,7 @@ stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; - meta = { + meta = with lib; { homepage = "https://howl.io/"; description = "A general purpose, fast and lightweight editor with a keyboard-centric minimalistic user interface"; license = licenses.mit; diff --git a/pkgs/applications/editors/imhex/default.nix b/pkgs/applications/editors/imhex/default.nix index b35f9aa06ca4..50693018f081 100644 --- a/pkgs/applications/editors/imhex/default.nix +++ b/pkgs/applications/editors/imhex/default.nix @@ -22,13 +22,13 @@ let # when bumping the version, check if imhex has gotten support for the capstone version in nixpkgs - version = "1.19.3"; + version = "1.26.2"; patterns_src = fetchFromGitHub { owner = "WerWolv"; repo = "ImHex-Patterns"; rev = "ImHex-v${version}"; - hash = "sha256-mukGPN2TugJZLLuZ5FTvZ4DxUsMGfVNhBFAPnBRC0qs="; + hash = "sha256-2+7bJzgwHfXcINM5oxwi3vEbUtq9gGJc/uxFOwT4RnM="; }; in @@ -41,7 +41,7 @@ gcc12Stdenv.mkDerivation rec { owner = "WerWolv"; repo = pname; rev = "v${version}"; - hash = "sha256-SFv5ulyjm5Yf+3Gpx+A74so2YClCJx1sx0LE5fh5eG4="; + hash = "sha256-H2bnRByCUAltngmVWgPW4vW8k5AWecOAzwtBKsjbpTw="; }; nativeBuildInputs = [ cmake llvm python3 perl pkg-config ]; @@ -72,10 +72,8 @@ gcc12Stdenv.mkDerivation rec { "-DUSE_SYSTEM_YARA=ON" ]; - # for reasons unknown, the built-in plugin isn't found unless made available under $out/bin postInstall = '' - ln -s $out/share/imhex/plugins $out/bin/ - + mkdir -p $out/share/imhex for d in ${patterns_src}/{constants,encodings,includes,magic,patterns}; do cp -r $d $out/share/imhex/ done diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 096fdf8427a8..c04e215b9908 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -11,15 +11,13 @@ , vmopts ? null }: -with lib; - let 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)); + versions = builtins.fromJSON (lib.readFile (./versions.json)); versionKey = if stdenv.isLinux then "linux" else system; products = versions.${versionKey} or (throw "Unsupported system: ${system}"); @@ -42,11 +40,11 @@ let maintainers = with maintainers; [ edwtjo mic92 ]; }; }).overrideAttrs (attrs: { - nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ optionals (stdenv.isLinux) [ + nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ lib.optionals (stdenv.isLinux) [ autoPatchelfHook patchelf ]; - buildInputs = (attrs.buildInputs or []) ++ optionals (stdenv.isLinux) [ + buildInputs = (attrs.buildInputs or []) ++ lib.optionals (stdenv.isLinux) [ python3 stdenv.cc.cc libdbusmenu @@ -54,7 +52,7 @@ let expat ]; dontAutoPatchelf = true; - postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) '' + postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' ( cd $out/clion # bundled cmake does not find libc @@ -64,7 +62,7 @@ let rm -rf bin/gdb/linux ln -s ${gdb} bin/gdb/linux - ls -d $PWD/bin/lldb/linux/lib/python3.8/lib-dynload/* | + ls -d $PWD/bin/lldb/linux/x64/lib/python3.8/lib-dynload/* | xargs patchelf \ --replace-needed libssl.so.10 libssl.so \ --replace-needed libcrypto.so.10 libcrypto.so @@ -93,10 +91,10 @@ let }; }); - buildGateway = { pname, version, src, license, description, wmClass, ... }: + buildGateway = { pname, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct { - inherit pname version src wmClass jdk; - product = "Gateway"; + inherit pname version src wmClass jdk product; + productShort = "Gateway"; meta = with lib; { homepage = "https://www.jetbrains.com/remote-development/gateway/"; inherit description license platforms; @@ -127,9 +125,9 @@ let }).overrideAttrs (attrs: { 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 + patchelf --set-interpreter $interp $out/goland/plugins/go-plugin/lib/dlv/linux/dlv - chmod +x $out/goland*/plugins/go/lib/dlv/linux/dlv + chmod +x $out/goland/plugins/go-plugin/lib/dlv/linux/dlv # fortify source breaks build since delve compiles with -O0 wrapProgram $out/bin/goland \ @@ -217,7 +215,7 @@ let ''; maintainers = with maintainers; [ ]; }; - }).overrideAttrs (finalAttrs: previousAttrs: optionalAttrs cythonSpeedup { + }).overrideAttrs (finalAttrs: previousAttrs: lib.optionalAttrs cythonSpeedup { buildInputs = with python3.pkgs; [ python3 setuptools ]; preInstall = '' echo "compiling cython debug speedups" @@ -252,7 +250,9 @@ let }).overrideAttrs (attrs: { postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp lib/ReSharperHost/linux-x64/Rider.Backend + patchelf --set-interpreter $interp \ + lib/ReSharperHost/linux-x64/Rider.Backend \ + plugins/dotCommon/DotFiles/linux-x64/JetBrains.Profiler.PdbServer rm -rf lib/ReSharperHost/linux-x64/dotnet ln -s ${dotnet-sdk_6} lib/ReSharperHost/linux-x64/dotnet @@ -285,12 +285,6 @@ let ''; maintainers = with maintainers; [ abaldeau ]; }; - }).overrideAttrs (attrs: { - postPatch = (attrs.postPatch or "") + optionalString (stdenv.isLinux) '' - # Webstorm tries to use bundled jre if available. - # Lets prevent this for the moment - rm -r jbr - ''; }); in @@ -326,6 +320,7 @@ in gateway = buildGateway rec { pname = "gateway"; + product = "JetBrains Gateway"; version = products.gateway.version; description = "Your single entry point to all remote development environments"; license = lib.licenses.unfree; diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index fde3e52632e8..7443842e7bf9 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -5,10 +5,8 @@ { pname, product, productShort ? product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: -with lib; - -let loName = toLower productShort; - hiName = toUpper productShort; +let loName = lib.toLower productShort; + hiName = lib.toUpper productShort; vmoptsName = loName + lib.optionalString stdenv.hostPlatform.is64bit "64" + ".vmoptions"; @@ -21,7 +19,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { desktopItem = makeDesktopItem { name = pname; exec = pname; - comment = lib.replaceChars ["\n"] [" "] meta.longDescription; + comment = lib.replaceStrings ["\n"] [" "] meta.longDescription; desktopName = product; genericName = meta.description; categories = [ "Development" ]; @@ -29,7 +27,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { startupWMClass = wmClass; }; - vmoptsFile = optionalString (vmopts != null) (writeText vmoptsName vmopts); + vmoptsFile = lib.optionalString (vmopts != null) (writeText vmoptsName vmopts); nativeBuildInputs = [ makeWrapper patchelf unzip ]; @@ -46,6 +44,8 @@ with stdenv; lib.makeOverridable mkDerivation (rec { truncate --size=$size $fname } + rm -rf jbr + interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2) if [[ "${stdenv.hostPlatform.system}" == "x86_64-linux" && -e bin/fsnotifier64 ]]; then target_size=$(get_file_size bin/fsnotifier64) @@ -63,7 +63,8 @@ with stdenv; lib.makeOverridable mkDerivation (rec { 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 + [[ -f $out/$pname/bin/${loName}.png ]] && ln -s $out/$pname/bin/${loName}.png $out/share/pixmaps/${pname}.png + [[ -f $out/$pname/bin/${loName}.svg ]] && ln -s $out/$pname/bin/${loName}.svg $out/share/pixmaps/${pname}.svg mv bin/fsnotifier* $out/libexec/${pname}/. jdk=${jdk.home} diff --git a/pkgs/applications/editors/jetbrains/update.py b/pkgs/applications/editors/jetbrains/update.py index fe57f75c72e1..1c22acf8e747 100755 --- a/pkgs/applications/editors/jetbrains/update.py +++ b/pkgs/applications/editors/jetbrains/update.py @@ -64,7 +64,7 @@ def update_product(name, product): build = latest_build(channel) new_version = build["@version"] new_build_number = build["@fullNumber"] - if "EAP" not in channel["@name"]: + if all(x not in channel["@name"] for x in ["EAP", "Gateway"]): version_or_build_number = new_version else: version_or_build_number = new_build_number diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index a197ec3bf9ae..0dc6e8297c6b 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -3,357 +3,321 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2022.2.4", - "sha256": "d88794c698d7bf4d970ba102b85166d5f8c3cb08c4ed5b4cbc150bb505320fab", - "url": "https://download.jetbrains.com/cpp/CLion-2022.2.4.tar.gz", - "version-major-minor": "2022.2", - "build_number": "222.4345.21" + "version": "2022.3.2", + "sha256": "896e9cc5b908aa51e091201c320f6f08033f9064382e44b107fccc554ed94895", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2.tar.gz", + "build_number": "223.8617.54" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2022.2.5", - "sha256": "55b28f3b79eda126fe778e2945804d50b1145503737f1b5e25ab6ae2d2a0e3ae", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5.tar.gz", - "version-major-minor": "2022.1.1", - "build_number": "222.4345.5" + "version": "2022.3.3", + "sha256": "a5575ff7e80dd4e9390eb64fc54ed4a924403950da0c38da548de3c4bd97b34b", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.3.tar.gz", + "build_number": "223.8617.3" }, "gateway": { - "update-channel": "Gateway EAP", + "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2022.3 EAP", - "sha256": "4868baed9350065c1db760f07a09badd1473132af640cc19330e20c8a0940d7d", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21.tar.gz", - "version-major-minor": "2022.3", - "build_number": "223.6646.21" + "version": "2022.3.2", + "sha256": "987f6dca9518da262f556ba1a5afe6190cc5c13a6692c194b4f9ee05d4e66318", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56.tar.gz", + "build_number": "223.8617.56" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2022.2.4", - "sha256": "e39aaae39e6021e87cece7622c51860d23e2a5b5ac2683fb67d369ec7d609084", - "url": "https://download.jetbrains.com/go/goland-2022.2.4.tar.gz", - "version-major-minor": "2022.2", - "build_number": "222.4345.24" + "version": "2022.3.2", + "sha256": "f130d0e4c2c89dcd291e05cca33484eb08e247e9ec29c13deaf67176afbf6a36", + "url": "https://download.jetbrains.com/go/goland-2022.3.2.tar.gz", + "build_number": "223.8617.58" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "4ba5faafad48d58db5099fae080ae2238086d3d9803080082de8efe35d8bf4ed", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3.tar.gz", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.2", + "sha256": "02bc35281eb4e1285eeb9d797ec2b31ec7370e320ad0e89f6f1fa704d78ec4bf", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2.tar.gz", + "build_number": "223.8617.56" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", - "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-no-jbr.tar.gz", - "version": "2022.2.3", - "sha256": "7454d7e0b8f4e3d8d805dde645d28b842101bd77aea8b29125880c592e6b8c85", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3-no-jbr.tar.gz", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", + "version": "2022.3.2", + "sha256": "6fa3aff1c730bb79bf3e2e29edcce6d4cdbccfa631524c6253de518be6b6f3d2", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2.tar.gz", + "build_number": "223.8617.56" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2021.3.1", - "sha256": "b7d41c4362e71f30adeaed9f0ec30afd5ac0e6eea9650ee4a19d70a5783db3e6", - "url": "https://download.jetbrains.com/mps/2021.3.1/MPS-2021.3.1.tar.gz", - "version-major-minor": "2021.3", - "build_number": "213.7172.958" + "version": "2022.2", + "sha256": "aaee4d2bb9bc34d0b4bc62c7ef08139cc6144b433ba1675ef306e6d3d95e37a1", + "url": "https://download.jetbrains.com/mps/2022.2/MPS-2022.2.tar.gz", + "build_number": "222.3345.1295" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "2376cd043bb941524df62db40f9125b1c693be11df80a41fd5b3dd9dcd3446e9", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.3.tar.gz", - "version-major-minor": "2022.1", - "build_number": "222.4345.15" + "version": "2022.3.2", + "sha256": "7592d18fa1e199087cfd661b64c2fad717840f8ff3e3faf4d88db58bdb397e03", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.2.tar.gz", + "build_number": "223.8617.59", + "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "cb03d44599a03419c0c63fc917846fca28c9ea664ed2b2a1c36240dcffb2a387", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.3.tar.gz", - "version-major-minor": "2022.2", - "build_number": "222.4345.23" + "version": "2022.3.2", + "sha256": "0ae72d1931a6effbeb2329f6e5c35859d933798a494479f066ef0a7b2be6b553", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2.tar.gz", + "build_number": "223.8617.48" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "c73750a2e27ed2410741a739071a920cca9844608a81f07735ed2e35a024cca1", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.3.tar.gz", - "version-major-minor": "2022.2", - "build_number": "222.4345.23" + "version": "2022.3.2", + "sha256": "56430090dd471e106fdc48463027d89de624759f8757248ced9776978854e4f6", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2.tar.gz", + "build_number": "223.8617.48" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "2fdff8616fd1574a0ef7baaed855aa39a1254ea164b74d1b4dda11241e58ab2d", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3.tar.gz", - "version-major-minor": "2022.1", - "build_number": "222.4167.23" + "version": "2022.3.2", + "sha256": "ad853b75bc1e1379593bece3a5fbecec21d1de30263d0d5fef067a352b7d27ef", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2.tar.gz", + "build_number": "223.8617.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "a8c3412db30ab7bd8b8601b0a50c95dc48a412391f1c33df27c47cf5d2204257", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.3.tar.gz", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.2", + "sha256": "8c803914c55a3c1801ff9b619870d81597fabedbfb08a7c1aecf24f5d0884aea", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.2.tar.gz", + "build_number": "223.8617.48" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "1d7d464bbcb83d5af48359aeda6aa7d165038bfaa1f26fef1019761eb278fa22", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3.tar.gz", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.2", + "sha256": "2b612177c99ff0c6c542abe005846c3aa6cf170faa0202daafeb4ab1627c3794", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2.tar.gz", + "build_number": "223.8617.44" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2022.2.4", - "sha256": "b72fae2bee3bd10374d10a4efb86888d289931080d5321385ede30373d31a55a", - "url": "https://download.jetbrains.com/cpp/CLion-2022.2.4.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.21" + "version": "2022.3.2", + "sha256": "482461646f61f355c7fd976e655bf77dadfa545483c6ab47352ff22eb1193e33", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2.dmg", + "build_number": "223.8617.54" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2022.2.5", - "sha256": "cdf0302b0ab65d3dfce4e48004ef45873c9912c844d2e3c82bfe19de2b11cfda", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5.dmg", - "version-major-minor": "2022.1.1", - "build_number": "222.4345.5" + "version": "2022.3.3", + "sha256": "e9da8036c7d268368b3f82034389481730cb663b809659b1fa1ab91fd9bdc8cd", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.3.dmg", + "build_number": "223.8617.3" }, "gateway": { - "update-channel": "Gateway EAP", + "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2022.3 EAP", - "sha256": "2db71a052501db41d5cfe142f1a6e3178fe02830f0da127d00fbf93a4629c61b", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21.dmg", - "version-major-minor": "2022.3", - "build_number": "223.6646.21" + "version": "2022.3.2", + "sha256": "26ff68ea27952c1adc651ad5f2fae7ad4ca7b744f70f582bdf1bd4c1d17132f4", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56.dmg", + "build_number": "223.8617.56" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2022.2.4", - "sha256": "456957075636f7f9ccffbd8d3bd37d2218547289a2cbce043bb9e32c436654f6", - "url": "https://download.jetbrains.com/go/goland-2022.2.4.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.24" + "version": "2022.3.2", + "sha256": "8e12ae0ee0d88cd716ac76a8a49392a51236287984d84c19324a19758fe8fc03", + "url": "https://download.jetbrains.com/go/goland-2022.3.2.dmg", + "build_number": "223.8617.58" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2022.2.3", - "sha256": "6ec3721d9961918a14630eaf068765eeba97e71baecd95ec67510dc25c8bd1b1", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.2", + "sha256": "14b3f587e868adfb132791e17e3b1978a2fb5fd55447eae589c4d95d70c9ace7", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2.dmg", + "build_number": "223.8617.56" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2022.2.3", - "sha256": "df780c841398532e090adc2c6af35a7fbcdd29fddb37e5a68f33d61a9032d5a3", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.2", + "sha256": "54d51ba7b65f84545faa7f8fc001b2bce48ef3ddb76006a44de9e95c6b395b8c", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2.dmg", + "build_number": "223.8617.56" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", - "version": "2021.3.1", - "sha256": "2c5517518fec31ac960e4309fa848ad831f9048ef15df1b362e12aa8f41d9dbd", - "url": "https://download.jetbrains.com/mps/2021.3.1/MPS-2021.3.1-macos.dmg", - "version-major-minor": "2021.3", - "build_number": "213.7172.958" + "version": "2022.2", + "sha256": "4e36c60d281596c220287ab2191165be37ef01c3c54ab5f5e4e535c8b81bc754", + "url": "https://download.jetbrains.com/mps/2022.2/MPS-2022.2-macos.dmg", + "build_number": "222.3345.1295" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2022.2.3", - "sha256": "8dbe5cd8e31c7f6bc6795db6946e2430c82f0aa2c13e7805c40733428b02241d", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.3.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.15" + "version": "2022.3.2", + "sha256": "a2833c575cfa17c8d30a5f2e0d4ff06167372e7d8190ff08fc2f14e57a21396c", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.2.dmg", + "build_number": "223.8617.59", + "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2022.2.3", - "sha256": "01eec651f6e8d92e1bfe5688aeb179ad5eb92e77ef77d102793d4848f8efc0d4", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.3.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.23" + "version": "2022.3.2", + "sha256": "0a5a396b71533ab7ec77b2f10e08a20a970ac5712cfeb3378728020ec84be416", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2.dmg", + "build_number": "223.8617.48" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2022.2.3", - "sha256": "920326a35589fee80e70b84d23184daf1d3efc8ecf4ec8c273c2bf2ec764a5b7", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.3.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.23" + "version": "2022.3.2", + "sha256": "6537fe033c13fb9b06da7583c875b0dc5f20660e5b349edc39bd8fdddffaf0f3", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2.dmg", + "build_number": "223.8617.48" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2022.2.3", - "sha256": "aa02c2c621d356486a0b698a45d773f5830ff4ef431940059f82e8d3c17a2335", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4167.23" + "version": "2022.3.2", + "sha256": "896dadb76b44bacef79b31619719107f8cf0e729331bda2d6b9f80e8be6dea92", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2.dmg", + "build_number": "223.8617.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2022.2.3", - "sha256": "a04700159fcf3bfed74d196edc4c1150e5906dc4730d06ffd017b6bbb9bc853b", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.3.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.2", + "sha256": "bea0a86a4ca00c08d78ccca7568ad5170798544c4a64b21bbfede126bdff0a99", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.2.dmg", + "build_number": "223.8617.48" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2022.2.3", - "sha256": "e6532a9a840c3508cdf26511200fbba34ec9a275154d717538019f72ebc5fc51", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.2", + "sha256": "87e716107156d15aa68230369b6eab2d25c5f6134cfe38cdb01e5b10f2a24418", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2.dmg", + "build_number": "223.8617.44" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2022.2.4", - "sha256": "2b95358770cd56b94b46e4bcb86080e2c97771c0f34ad50543de206bb3c81d47", - "url": "https://download.jetbrains.com/cpp/CLion-2022.2.4-aarch64.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.21" + "version": "2022.3.2", + "sha256": "0d3d8ccce520a26781a2d126b887d5a829e97987b728104203528510ff9a4423", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2-aarch64.dmg", + "build_number": "223.8617.54" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2022.2.5", - "sha256": "8ff78e440e4753adc8dbd4ee408fde114f7d9c65ee780f012b917498b63993ee", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5-aarch64.dmg", - "version-major-minor": "2022.1.1", - "build_number": "222.4345.5" + "version": "2022.3.3", + "sha256": "ef76c7d61c64f7f0f831ef2774bd908e68d651a20648fc4e63618e24a81be6dd", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.3-aarch64.dmg", + "build_number": "223.8617.3" }, "gateway": { - "update-channel": "Gateway EAP", + "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2022.3 EAP", - "sha256": "513d3a271c5ff20fdc5c22f6e28eb21cfbb283d01ade2d11f33bb7eb79317410", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21-aarch64.dmg", - "version-major-minor": "2022.3", - "build_number": "223.6646.21" + "version": "2022.3.2", + "sha256": "776ff0a5f0293cd4b4c29380199757b359e6e195a57b69d2cef73f9cc44ee456", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56-aarch64.dmg", + "build_number": "223.8617.56" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2022.2.4", - "sha256": "f1b1bb4f28a09b23a185fc2437792a3125b2c8856fa533c9bcb09b7eef16fe09", - "url": "https://download.jetbrains.com/go/goland-2022.2.4-aarch64.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.24" + "version": "2022.3.2", + "sha256": "1df4707686f88e284e15a7fd63945b476dabf8e5a041894c281aba4838c603d9", + "url": "https://download.jetbrains.com/go/goland-2022.3.2-aarch64.dmg", + "build_number": "223.8617.58" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "333c70caf452034ae332cdded4d24a71592049b4045725eb57826a0b997d1c7a", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.2", + "sha256": "808fa52e8dceacb8beb6b84705ac44ded04b67d07c1310449d7cd5c7afbdea46", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2-aarch64.dmg", + "build_number": "223.8617.56" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "9e5c32fffd17d651d8d875c2588a067902a9ebb9bf815d06aabfd75b9f4ee3cd", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.2", + "sha256": "ea6da172fc8f27b7bad5475f0e1fc3359c492885bba8b6de59be727cb7b65284", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2-aarch64.dmg", + "build_number": "223.8617.56" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg", - "version": "2021.3.1", - "url": "https://download.jetbrains.com/mps/2021.3.1/MPS-2021.3.1-macos-aarch64.dmg", - "sha256": "3ace6d45db718dffd80bf126a76735fb65099de292112a01cc078aa61c475a70", - "version-major-minor": "2021.3", - "build_number": "213.7172.958" + "version": "2022.2", + "url": "https://download.jetbrains.com/mps/2022.2/MPS-2022.2-macos-aarch64.dmg", + "sha256": "bdc83d9c7a3430cc2b0b0361a9e4eab82e951bfe87f0e4754106d09850947077", + "build_number": "222.3345.1295" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "0dee8fe654cccdafa73b65da1a2ef844401a9438ecee726fe6f6af1f09d07c38", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.15" + "version": "2022.3.2", + "sha256": "4e1244d7fa459a7f07ec43725ed4271e2c669c3202cc04cc074f11fb07bbb25e", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.2-aarch64.dmg", + "build_number": "223.8617.59", + "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "6b87c85f6b5b3262904b34d0bbb6775d2654610685a8bca9977b147644b113ea", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.23" + "version": "2022.3.2", + "sha256": "5a0fcb9fdc94896cd5651d9d60fa708596aebe374bc35944b3ff6133f4eb5aae", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2-aarch64.dmg", + "build_number": "223.8617.48" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "59d9553ab01de9460984f082c12fb0586aeb84eb00a4501bab358e516f1f6847", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.23" + "version": "2022.3.2", + "sha256": "3237e19f920880a92712d7a61df5eadd6b8e1652cf97115078289468e17332a4", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2-aarch64.dmg", + "build_number": "223.8617.48" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "5dd892ed16dd1bc819a97ffb62cdfbb3b60c6019581ba18358afc5c0a39585f5", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4167.23" + "version": "2022.3.2", + "sha256": "a680b91d6c909f913317c91b1912b1b822c121d14d78962f7f44f7473e54b5a2", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2-aarch64.dmg", + "build_number": "223.8617.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "cd7a967c2745aca566569a320eb276773638d05fcd25839db18a098803d2c5f4", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.2", + "sha256": "346b990c412f272acc2fc7e87448f456d8d6a1978b7a94eb645f9cea806b083c", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.2-aarch64.dmg", + "build_number": "223.8617.48" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "7ffd746e5e33f2d69f7b8c39920f67de149f183a0d372d20f3f6bc4febf2e355", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.2", + "sha256": "a869cd1c1c7b01bbd98f9a1cfd08b1b18ebe77f1c4422ee7e11ddc2c3cb250ce", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2-aarch64.dmg", + "build_number": "223.8617.44" } } } diff --git a/pkgs/applications/editors/jove/default.nix b/pkgs/applications/editors/jove/default.nix index 2fd28714481c..fc8026fb5caf 100644 --- a/pkgs/applications/editors/jove/default.nix +++ b/pkgs/applications/editors/jove/default.nix @@ -1,21 +1,24 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub , groff -, ncurses , makeWrapper -} : +, ncurses +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jove"; - version = "4.17.4.6"; + version = "4.17.4.9"; src = fetchFromGitHub { owner = "jonmacs"; repo = "jove"; - rev = version; - sha256 = "sha256-UCjqF0i43TSvtG5uxb2SA/F9oGBeo/WdEVJlrSSHV8g="; + rev = finalAttrs.version; + sha256 = "sha256-Lo5S3t4vewkpoihVdxa3yRrEzNWeNLHCZHXiLCxOH5o="; }; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ groff ncurses @@ -34,11 +37,13 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Jonathan's Own Version of Emacs"; homepage = "https://github.com/jonmacs/jove"; + description = "Jonathan's Own Version of Emacs"; + changelog = "https://github.com/jonmacs/jove/releases/tag/${finalAttrs.version}"; license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/jove.x86_64-darwin + # never built on Hydra: https://hydra.nixos.org/job/nixpkgs/trunk/jove.x86_64-darwin + broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index b06c93c10340..01ab62c6de4f 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -3,13 +3,11 @@ libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3, coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: -with lib; - stdenv.mkDerivation rec { pname = "juicipp"; version = "1.2.3"; - meta = { + meta = with lib; { homepage = "https://github.com/cppit/jucipp"; description = "A lightweight, platform independent C++-IDE with support for C++11, C++14, and experimental C++17 features depending on libclang version"; license = licenses.mit; diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix index c5265aa255c2..cb814ddbc95a 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix @@ -20,7 +20,7 @@ in rec { launcher = runCommand "octave-kernel-launcher" { inherit octave; - python = python3.withPackages (ps: [ ps.traitlets ps.jupyter_core ps.ipykernel ps.metakernel kernel ]); + python = python3.withPackages (ps: [ ps.traitlets ps.jupyter-core ps.ipykernel ps.metakernel kernel ]); nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 26788ddb0677..77d75eb131ff 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,15 +1,13 @@ { lib, stdenv, fetchFromGitHub }: -with lib; - stdenv.mkDerivation rec { pname = "kakoune-unwrapped"; - version = "2021.11.08"; + version = "2022.10.31"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; rev = "v${version}"; - sha256 = "sha256-lMGMt0H1G8EN/7zSVSvU1yU4BYPnSF1vWmozLdrRTQk="; + sha256 = "sha256-vmzGaGl0KSjseSD/s6DXxvMUTmAle+Iv/ZP9llaFnXk="; }; makeFlags = [ "debug=no" "PREFIX=${placeholder "out"}" ]; @@ -33,7 +31,7 @@ stdenv.mkDerivation rec { ln -s --relative "$autoload_target" autoload ''; - meta = { + meta = with lib; { homepage = "http://kakoune.org/"; description = "A vim inspired text editor"; license = licenses.publicDomain; diff --git a/pkgs/applications/editors/kakoune/plugins/aliases.nix b/pkgs/applications/editors/kakoune/plugins/aliases.nix index cf9a65c43f2b..2f097dee5275 100644 --- a/pkgs/applications/editors/kakoune/plugins/aliases.nix +++ b/pkgs/applications/editors/kakoune/plugins/aliases.nix @@ -1,8 +1,8 @@ # Deprecated aliases - for backward compatibility -lib: overriden: +lib: overridden: -with overriden; +with overridden; let # Removing recurseForDerivation prevents derivations of aliased attribute @@ -21,7 +21,7 @@ let # Make sure that we are not shadowing something from # all-packages.nix. - checkInPkgs = n: alias: if builtins.hasAttr n overriden + checkInPkgs = n: alias: if builtins.hasAttr n overridden then throw "Alias ${n} is still in kakounePlugins" else alias; diff --git a/pkgs/applications/editors/kakoune/plugins/generated.nix b/pkgs/applications/editors/kakoune/plugins/generated.nix index 953c95c47248..a37c90fb99d3 100644 --- a/pkgs/applications/editors/kakoune/plugins/generated.nix +++ b/pkgs/applications/editors/kakoune/plugins/generated.nix @@ -1,15 +1,15 @@ # This file has been generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit! { lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: let - packages = ( self: +packages = ( self: { active-window-kak = buildKakounePluginFrom2Nix { pname = "active-window-kak"; - version = "2020-05-13"; + version = "2022-11-14"; src = fetchFromGitHub { owner = "greenfork"; repo = "active-window.kak"; - rev = "988db69cfbb88bd741d089bb43b0be551693e7c1"; + rev = "36bf0364eed856a52cddf274072e9f255902c0ee"; sha256 = "1fv1cp9q212gamf9z2papl5xcl2w31fpcmbgdzbxcxdl1pvfsqp8"; }; meta.homepage = "https://github.com/greenfork/active-window.kak/"; @@ -17,12 +17,12 @@ let auto-pairs-kak = buildKakounePluginFrom2Nix { pname = "auto-pairs-kak"; - version = "2021-03-28"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "alexherbo2"; repo = "auto-pairs.kak"; - rev = "526779a26a5cf5f48e7c4f5c5fecca274968a737"; - sha256 = "0gkhvwxyh8pdfydrj7zkfidk0drrbhvdi1fq3pkzllna3vz8q181"; + rev = "bfdcb8566076f653ec707f86207f83ea75173ce9"; + sha256 = "0vx9msk8wlj8p9qf6yiv9gzrbanb5w245cidnx5cppgld2w842ij"; }; meta.homepage = "https://github.com/alexherbo2/auto-pairs.kak/"; }; @@ -41,48 +41,48 @@ let fzf-kak = buildKakounePluginFrom2Nix { pname = "fzf-kak"; - version = "2021-04-03"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "andreyorst"; repo = "fzf.kak"; - rev = "1b3a3beebbe7134e671fde2ef2f4242b34ae2c60"; - sha256 = "0rsd65zcizbq3isy8576gqw7mcml5ixw84padaz6ndwfif5fv701"; + rev = "6910bfb4c23cac59c17f5b7850f7bd49aba3e5cb"; + sha256 = "1hlals4d9x5i4mwigxjlx4f9xgc9rw15yzvbvc64cminxic2i3i8"; }; meta.homepage = "https://github.com/andreyorst/fzf.kak/"; }; kakboard = buildKakounePluginFrom2Nix { pname = "kakboard"; - version = "2020-05-09"; + version = "2022-04-02"; src = fetchFromGitHub { owner = "lePerdu"; repo = "kakboard"; - rev = "2f13f5cd99591b76ad5cba230815b80138825120"; - sha256 = "1kvnbsv20y09rlnyar87qr0h26i16qsq801krswvxcwhid7ijlvd"; + rev = "5759dcc5af593ff88a7faecc41a8f549ec440771"; + sha256 = "0g8q0rkdnzsfvlibjd1zfcapngfli5aa3qrgmkgdi24n9ad8wzvh"; }; meta.homepage = "https://github.com/lePerdu/kakboard/"; }; kakoune-buffer-switcher = buildKakounePluginFrom2Nix { pname = "kakoune-buffer-switcher"; - version = "2020-12-27"; + version = "2022-09-18"; src = fetchFromGitHub { owner = "occivink"; repo = "kakoune-buffer-switcher"; - rev = "6a27c45db87a23070c34fab36d2f8d812cd002a6"; - sha256 = "1rmwy317908v8p54806m721bpzm8sgygb9abri34537ka6r05y5j"; + rev = "21319aa08e7c9072dcf1a4f2f5583887d701fc37"; + sha256 = "0lnvcb4khw1ywxd369phd2xibsh5f6qc11x5vrla331wr1q7y8j8"; }; meta.homepage = "https://github.com/occivink/kakoune-buffer-switcher/"; }; kakoune-buffers = buildKakounePluginFrom2Nix { pname = "kakoune-buffers"; - version = "2021-04-02"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "Delapouite"; repo = "kakoune-buffers"; - rev = "7832ea7a4528363482f5684f16cbcebcbec0adfd"; - sha256 = "196d36jww6asf5zr03l1rwg49kkv16s2d4zyryb2m3zvy7prf2bb"; + rev = "6b2081f5b7d58c72de319a5cba7bf628b6802881"; + sha256 = "0pbrgydifw2a8yf3ringyqq91fccfv4lm4v8sk5349hbcz6apr4c"; }; meta.homepage = "https://github.com/Delapouite/kakoune-buffers/"; }; @@ -101,12 +101,12 @@ let kakoune-extra-filetypes = buildKakounePluginFrom2Nix { pname = "kakoune-extra-filetypes"; - version = "2021-01-15"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "kakoune-editor"; repo = "kakoune-extra-filetypes"; - rev = "c6f8aaccd8c9cd6b487964c8943416e21fbe7c18"; - sha256 = "1vkff8xbycfgxv8x09cvc79qcg5fdzn2x77mbmifmkq236khrwrg"; + rev = "8ffeec08068edfee42e076c5f6d56a54a498bad2"; + sha256 = "1v87aqfk2jcysbdls3mh2v1yafk1albbinfxsxp11m4nxd2b9agl"; }; meta.homepage = "https://github.com/kakoune-editor/kakoune-extra-filetypes/"; }; @@ -125,24 +125,24 @@ let kakoune-registers = buildKakounePluginFrom2Nix { pname = "kakoune-registers"; - version = "2020-06-19"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "Delapouite"; repo = "kakoune-registers"; - rev = "9531947baecd83c1d4c3bea0adf10f4462f1e120"; - sha256 = "08v9ndghh7wvr8rsrqm05gksk9ai5vnwvw9gwqasbppb48cv4a8c"; + rev = "b8ca8e04ebe50671a937bceccba69c62b68ae8b0"; + sha256 = "0vy5dc6jly5xqcck0vhnmbjxjdy3615b6d329v0b04amzy0hdlck"; }; meta.homepage = "https://github.com/Delapouite/kakoune-registers/"; }; kakoune-vertical-selection = buildKakounePluginFrom2Nix { pname = "kakoune-vertical-selection"; - version = "2019-04-11"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "occivink"; repo = "kakoune-vertical-selection"; - rev = "c420f8b867ce47375fac303886e31623669a42b7"; - sha256 = "13jdyd2j45wvgqvxdzw9zww14ly93bqjb6700zzxj7mkbiff6wsb"; + rev = "227b3fd9643e6e3b9d36fab324081a988c038e21"; + sha256 = "0ygqhlk31ilczpwws28iqya8i1qhnwkb5rw6bn2zqgxj428a1kqj"; }; meta.homepage = "https://github.com/occivink/kakoune-vertical-selection/"; }; @@ -161,24 +161,24 @@ let pandoc-kak = buildKakounePluginFrom2Nix { pname = "pandoc-kak"; - version = "2020-11-30"; + version = "2021-06-29"; src = fetchFromGitHub { owner = "basbebe"; repo = "pandoc.kak"; - rev = "63979f7e08b86d80436bbe2d9dba173a56057b97"; - sha256 = "16pmmnpyxf8r7gpj8g1lwa960nscjmcl52n1a7s6xcqkp9856wxs"; + rev = "e9597e8df58427884161ce27392a9558930832a7"; + sha256 = "1baslidszbybx2ngdkm7wns2m5l27gc0mb3blhhydiav8fcfvc6m"; }; meta.homepage = "https://github.com/basbebe/pandoc.kak/"; }; powerline-kak = buildKakounePluginFrom2Nix { pname = "powerline-kak"; - version = "2021-04-06"; + version = "2022-04-05"; src = fetchFromGitHub { owner = "andreyorst"; repo = "powerline.kak"; - rev = "6fa5ad383f2884f201d6e3ef07a4687c606df525"; - sha256 = "1s7ggjby0bymq48njzhdvkkarmzl44803xv0dlnzrj7q9c3xv27a"; + rev = "c5ef9a845bbd886c73ef00c0efff986e02d5f5d8"; + sha256 = "1lshlnz5xrxzafxmb6w05g2i6nvi49aqyd8852k9l0lmzqryp7l2"; }; meta.homepage = "https://github.com/andreyorst/powerline.kak/"; }; @@ -195,41 +195,41 @@ let meta.homepage = "https://github.com/kakounedotcom/prelude.kak/"; }; - replace-mode-kak = buildKakounePluginFrom2Nix { - pname = "replace-mode-kak"; - version = "2020-10-07"; + smarttab-kak = buildKakounePluginFrom2Nix { + pname = "smarttab-kak"; + version = "2022-04-10"; src = fetchFromGitHub { - owner = "alexherbo2"; - repo = "replace-mode.kak"; - rev = "5f4c73cdbaf5aeb964ee35ad4b9081b233af90c0"; - sha256 = "1cmylx99bm7jwfb4hclb69sdc4n8f29ssyy2byjiw53ni9rnc8q0"; + owner = "andreyorst"; + repo = "smarttab.kak"; + rev = "86ac6599b13617ff938905ba4cdd8225d7eb6a2e"; + sha256 = "1992xwf2aygzfd26lhg3yiy253g0hl1iagj0kq9yhcqg0i5xjcj9"; }; - meta.homepage = "https://github.com/alexherbo2/replace-mode.kak/"; - }; - - sleuth-kak = buildKakounePluginFrom2Nix { - pname = "sleuth-kak"; - version = "2020-11-06"; - src = fetchFromGitHub { - owner = "alexherbo2"; - repo = "sleuth.kak"; - rev = "911db8bd208ad0d289b8fa15a2ac665ff39bd6bd"; - sha256 = "0g41c0038fpmihqva71xl4vfbmvsp13i47gp6fnmaikajpynzc51"; - }; - meta.homepage = "https://github.com/alexherbo2/sleuth.kak/"; + meta.homepage = "https://github.com/andreyorst/smarttab.kak/"; }; tabs-kak = buildKakounePluginFrom2Nix { pname = "tabs-kak"; - version = "2021-04-14"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "enricozb"; repo = "tabs.kak"; - rev = "048f83455ea7c671ab06e9b9578ac25e5de1d6fb"; - sha256 = "0xswpsdf1bj54inl6vf2lzbjkxfc6g0fyv5kd6y9ahlh5irij8z0"; + rev = "1cb19e410a3ef299f7a701fa5bec98c2d9284dac"; + sha256 = "0hxa4mvw1k74vscxkm520c6g7iwcaqh8kj9g4mwy6n5kkvr1drf0"; }; meta.homepage = "https://github.com/enricozb/tabs.kak/"; }; + zig-kak = buildKakounePluginFrom2Nix { + pname = "zig-kak"; + version = "2019-05-06"; + src = fetchFromGitHub { + owner = "adrusi"; + repo = "zig.kak"; + rev = "5a7e84e138324e6b8d140fe384dfe5cc941e26b7"; + sha256 = "1w0nmhsgchjga4by9ch9md3pdc1bwn0p157g6zwnfpj7lnaahsmq"; + }; + meta.homepage = "https://github.com/adrusi/zig.kak/"; + }; + }); in lib.fix' (lib.extends overrides packages) diff --git a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names index a6cae7a4505b..b856308c7831 100644 --- a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names +++ b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names @@ -1,20 +1,20 @@ repo,branch,alias -alexherbo2/auto-pairs.kak,, -alexherbo2/replace-mode.kak,, -alexherbo2/sleuth.kak,, -andreyorst/fzf.kak,, -andreyorst/powerline.kak,, -basbebe/pandoc.kak,, -danr/kakoune-easymotion,, -Delapouite/kakoune-buffers,, -Delapouite/kakoune-registers,, -enricozb/tabs.kak@main,, -greenfork/active-window.kak,, -kakoune-editor/kakoune-extra-filetypes,, -kakounedotcom/connect.kak,, -kakounedotcom/prelude.kak,, -lePerdu/kakboard,, -listentolist/kakoune-rainbow,, -mayjs/openscad.kak,, -occivink/kakoune-buffer-switcher,, -occivink/kakoune-vertical-selection,, +https://github.com/greenfork/active-window.kak/,, +https://github.com/alexherbo2/auto-pairs.kak/,, +https://github.com/kakounedotcom/connect.kak/,, +https://github.com/andreyorst/fzf.kak/,, +https://github.com/lePerdu/kakboard/,, +https://github.com/occivink/kakoune-buffer-switcher/,, +https://github.com/Delapouite/kakoune-buffers/,, +https://github.com/danr/kakoune-easymotion/,, +https://github.com/kakoune-editor/kakoune-extra-filetypes/,, +https://github.com/listentolist/kakoune-rainbow/,, +https://github.com/Delapouite/kakoune-registers/,, +https://github.com/occivink/kakoune-vertical-selection/,, +https://github.com/mayjs/openscad.kak/,, +https://github.com/basbebe/pandoc.kak/,, +https://github.com/andreyorst/powerline.kak/,, +https://github.com/kakounedotcom/prelude.kak/,, +https://github.com/andreyorst/smarttab.kak/,, +https://github.com/enricozb/tabs.kak/,, +https://github.com/adrusi/zig.kak/,, diff --git a/pkgs/applications/editors/kakoune/plugins/update-shell.nix b/pkgs/applications/editors/kakoune/plugins/update-shell.nix index ca83f09c7154..b323574169aa 100644 --- a/pkgs/applications/editors/kakoune/plugins/update-shell.nix +++ b/pkgs/applications/editors/kakoune/plugins/update-shell.nix @@ -2,7 +2,7 @@ with pkgs; let - pyEnv = python3.withPackages (ps: [ ps.GitPython ]); + pyEnv = python3.withPackages (ps: [ ps.gitpython ]); in mkShell { diff --git a/pkgs/applications/editors/kakoune/plugins/update.py b/pkgs/applications/editors/kakoune/plugins/update.py index dd8765db28a4..49662a0e8e2e 100755 --- a/pkgs/applications/editors/kakoune/plugins/update.py +++ b/pkgs/applications/editors/kakoune/plugins/update.py @@ -42,19 +42,19 @@ HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/ class KakouneEditor(pluginupdate.Editor): - def generate_nix(self, plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): - sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) + def generate_nix(self, plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]], outfile: str): + sorted_plugins = sorted(plugins, key=lambda v: v[1].name.lower()) with open(outfile, "w+") as f: f.write(HEADER) f.write( """ - { lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: - let - packages = ( self: - {""" +{ lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: +let +packages = ( self: +{""" ) - for owner, repo, plugin in sorted_plugins: + for pluginDesc, plugin in sorted_plugins: if plugin.has_submodules: submodule_attr = "\n fetchSubmodules = true;" else: @@ -62,24 +62,19 @@ class KakouneEditor(pluginupdate.Editor): f.write( f""" - {plugin.normalized_name} = buildKakounePluginFrom2Nix {{ - pname = "{plugin.normalized_name}"; - version = "{plugin.version}"; - src = fetchFromGitHub {{ - owner = "{owner}"; - repo = "{repo}"; - rev = "{plugin.commit}"; - sha256 = "{plugin.sha256}";{submodule_attr} - }}; - meta.homepage = "https://github.com/{owner}/{repo}/"; - }}; - """ + {plugin.normalized_name} = buildKakounePluginFrom2Nix {{ + pname = "{plugin.normalized_name}"; + version = "{plugin.version}"; + src = {pluginDesc.repo.as_nix(plugin)}; + meta.homepage = "{pluginDesc.repo.url("")}"; + }}; +""" ) f.write( """ - }); - in lib.fix' (lib.extends overrides packages) - """ +}); +in lib.fix' (lib.extends overrides packages) +""" ) print(f"updated {outfile}") diff --git a/pkgs/applications/editors/l3afpad/default.nix b/pkgs/applications/editors/l3afpad/default.nix new file mode 100644 index 000000000000..e047aaa27028 --- /dev/null +++ b/pkgs/applications/editors/l3afpad/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl, intltool, pkg-config, gtk3, fetchFromGitHub +, autoreconfHook, wrapGAppsHook }: + +stdenv.mkDerivation rec { + version = "unstable-2022-02-14"; + pname = "l3afpad"; + + src = fetchFromGitHub { + owner = "stevenhoneyman"; + repo = pname; + rev = "16f22222116b78b7f6a6fd83289937cdaabed624"; + sha256 = "sha256-ly2w9jmRlprm/PnyC0LYjrxBVK+J0DLiSpzuTUMZpWA="; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; + buildInputs = [ intltool gtk3 ]; + + meta = with lib; { + description = "Simple text editor forked from Leafpad using GTK+ 3.x"; + homepage = "https://github.com/stevenhoneyman/l3afpad"; + platforms = platforms.linux; + maintainers = with maintainers; [ ckie ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index c9af2f89627f..765139a9c5c1 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, nix-update-script , rustPlatform , cmake , pkg-config @@ -23,16 +24,16 @@ rustPlatform.buildRustPackage rec { pname = "lapce"; - version = "unstable-2022-09-21"; + version = "0.2.5"; src = fetchFromGitHub { owner = "lapce"; repo = pname; - rev = "c5a924ef34250e9117e2b57c19c1f29f6b9b3ea7"; - sha256 = "sha256-0nAUbtokDgSxPcJCa9xGM8Rpbu282o7OHAQtAfdNmJU="; + rev = "v${version}"; + sha256 = "sha256-WFFn1l7d70x5v6jo5m+Thq1WoZjY7f8Lvr3U473xx48="; }; - cargoSha256 = "sha256-uIFC5x8TzsvTGylQ0AttIRAUWU0k0P7UeF96vUc7cKw="; + cargoSha256 = "sha256-9e0pUztrIL5HGHrS2pHA1hkH2v24AEQ2RiogLRAxyeo="; nativeBuildInputs = [ cmake @@ -75,6 +76,8 @@ rustPlatform.buildRustPackage rec { categories = [ "Development" "Utility" "TextEditor" ]; }) ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Lightning-fast and Powerful Code Editor written in Rust"; homepage = "https://github.com/lapce/lapce"; diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix index 175026440daa..3e6346f57e41 100644 --- a/pkgs/applications/editors/ldtk/default.nix +++ b/pkgs/applications/editors/ldtk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "ldtk"; - version = "1.1.3"; + version = "1.2.5"; src = fetchurl { url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip"; - sha256 = "sha256-qw7+4k4IH2+9DX4ny8EBbSlyXBrk/y91W04+zWPGupk="; + sha256 = "sha256-kx4GOENYYbS09HxAiCCvqm/ztc32sdB39W8uv6D+R+A="; }; nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ]; diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index 0376e3af6bfb..d0b38bcd35a8 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, intltool, pkg-config, gtk2 }: stdenv.mkDerivation rec { - version = "0.8.18.1"; + version = "0.8.19"; pname = "leafpad"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/leafpad/${pname}-${version}.tar.gz"; - sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; + sha256 = "sha256-B9P3EvTb0KMyUf0d7hTiGv3J+SCQ/HaMEasKxVatvpc="; }; nativeBuildInputs = [ pkg-config intltool ]; diff --git a/pkgs/applications/editors/lifeograph/default.nix b/pkgs/applications/editors/lifeograph/default.nix index 895a9e11d5e8..099aec1558b2 100644 --- a/pkgs/applications/editors/lifeograph/default.nix +++ b/pkgs/applications/editors/lifeograph/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://lifeograph.sourceforge.net/wiki/Main_Page"; + homepage = "https://lifeograph.sourceforge.net/wiki/Main_Page"; description = "Lifeograph is an off-line and private journal and note taking application"; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix index 11dd38752377..577ea527804c 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.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "lite-xl"; repo = "lite-xl"; rev = "v${version}"; - sha256 = "sha256-9nQFdii6SY14Cul7Ki0DUEsu75HWTCeEZtXaU6KGRiM="; + sha256 = "sha256-tZ9bCazs4ygNl5RKFNUtxboaMcG8a7mIz2FuiExX1d4="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/applications/editors/molsketch/default.nix b/pkgs/applications/editors/molsketch/default.nix new file mode 100644 index 000000000000..cb94cef3a328 --- /dev/null +++ b/pkgs/applications/editors/molsketch/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, mkDerivation +, fetchurl +, cmake +, pkg-config +, hicolor-icon-theme +, openbabel +, desktop-file-utils +, qttranslations +}: + +mkDerivation rec { + pname = "molsketch"; + version = "0.7.3"; + + src = fetchurl { + url = "mirror://sourceforge/molsketch/Molsketch-${version}-src.tar.gz"; + hash = "sha256-82iNJRiXqESwidjifKBf0+ljcqbFD1WehsXI8VUgrwQ="; + }; + + preConfigure = '' + cmakeFlags="$cmakeFlags -DMSK_PREFIX=$out" + ''; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + hicolor-icon-theme + openbabel + desktop-file-utils + qttranslations + ]; + + meta = with lib; { + description = "2D molecule editor"; + homepage = "https://sourceforge.net/projects/molsketch/"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.fortuneteller2k ]; + }; +} diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index d7b1f54d3912..bd8049699514 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -4,8 +4,6 @@ assert enableNls -> (gettext != null); -with lib; - let nixSyntaxHighlight = fetchFromGitHub { owner = "seitz"; @@ -16,14 +14,14 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "7.0"; + version = "7.2"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "jdbqw4srh4bYJoHw4a/YT2t1IQ0XORtkQ8Q35FFVIUk="; + sha256 = "hvNEJ2i9KHPOxpP4PN+AtLRErTzBR2C3Q2FHT8h6RSY="; }; - nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; + nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; buildInputs = [ ncurses ]; outputs = [ "out" "info" ]; @@ -71,7 +69,7 @@ in stdenv.mkDerivation rec { ''; }; - meta = { + meta = with lib; { homepage = "https://www.nano-editor.org/"; description = "A small, user-friendly console text editor"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 0a3b5ca421d3..23734f3f23cd 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv +, fetchpatch , libuv, lua, ncurses, pkg-config , unibilium, gperf , libvterm-neovim @@ -12,27 +13,35 @@ , nodejs ? null, fish ? null, python3 ? null }: -with lib; - let neovimLuaEnv = lua.withPackages(ps: (with ps; [ lpeg luabitop mpack ] - ++ optionals doCheck [ + ++ lib.optionals doCheck [ nvim-client luv coxpcall busted luafilesystem penlight inspect ] )); + codegenLua = + if lua.pkgs.isLuaJIT + then + let deterministicLuajit = + lua.override { + deterministicStringIds = true; + self = deterministicLuajit; + }; + in deterministicLuajit.withPackages(ps: [ ps.mpack ps.lpeg ]) + else lua; pyEnv = python3.withPackages(ps: with ps; [ pynvim msgpack ]); in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "sha256-B2ZpwhdmdvPOnxVyJDfNzUT5rTVuBhJXyMwwzCl9Fac="; + sha256 = "sha256-eqiH/K8w0FZNHLBBMjiTSQjNQyONqcx3X+d85gPnFJg="; }; patches = [ @@ -40,6 +49,13 @@ in # necessary so that nix can handle `UpdateRemotePlugins` for the plugins # it installs. See https://github.com/neovim/neovim/issues/9413. ./system_rplugin_manifest.patch + # make the build reproducible, rebased version of + # https://github.com/neovim/neovim/pull/21586 + (fetchpatch { + name = "neovim-build-make-generated-source-files-reproducible.patch"; + url = "https://github.com/raboof/neovim/commit/485dd2af3efbfd174163583c46e0bb2a01ff04f1.patch"; + hash = "sha256-9aRVK4lDkL/W4RVjeKptrZFY7rYYBx6/RGR4bQSbCsM="; + }) ]; dontFixCmake = true; @@ -61,8 +77,8 @@ in neovimLuaEnv tree-sitter unibilium - ] ++ optionals stdenv.isDarwin [ libiconv CoreServices ] - ++ optionals doCheck [ glibcLocales procps ] + ] ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ] + ++ lib.optionals doCheck [ glibcLocales procps ] ; inherit doCheck; @@ -80,19 +96,18 @@ in ]; # extra programs test via `make functionaltest` - checkInputs = [ + nativeCheckInputs = [ fish nodejs pyEnv # for src/clint.py ]; - # nvim --version output retains compilation flags and references to build tools postPatch = '' substituteInPlace src/nvim/version.c --replace NVIM_VERSION_CFLAGS ""; ''; # check that the above patching actually works - disallowedReferences = [ stdenv.cc ]; + disallowedReferences = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua; cmakeFlags = [ # Don't use downloaded dependencies. At the end of the configurePhase one @@ -101,10 +116,15 @@ in # third-party/CMakeLists.txt is not read at all. "-DUSE_BUNDLED=OFF" ] - ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" + ++ lib.optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" ; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString lua.pkgs.isLuaJIT '' + cmakeFlagsArray+=( + "-DLUAC_PRG=${codegenLua}/bin/luajit -b -s %s -" + "-DLUA_GEN_PRG=${codegenLua}/bin/luajit" + ) + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/nvim/CMakeLists.txt --replace " util" "" ''; @@ -112,7 +132,7 @@ in export VIMRUNTIME=$PWD/runtime ''; - meta = { + meta = with lib; { description = "Vim text editor fork focused on extensibility and agility"; longDescription = '' Neovim is a project that seeks to aggressively refactor Vim in order to: diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index 3a32516b7d3c..f9c3ea8a7c78 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -1,40 +1,34 @@ -{ rustPlatform -, runCommand -, lib +{ lib +, rustPlatform +, clangStdenv , fetchFromGitHub +, linkFarm , fetchgit -, fetchurl +, runCommand +, gn +, ninja , makeWrapper , pkg-config -, python2 , python3 -, openssl +, removeReferencesTo +, xcbuild , SDL2 , fontconfig -, freetype -, ninja -, gn -, llvmPackages -, makeFontsConf +, xorg +, stdenv +, darwin , libglvnd , libxkbcommon -, stdenv , enableWayland ? stdenv.isLinux , wayland -, xorg -, xcbuild -, Security -, ApplicationServices -, AppKit -, Carbon -, removeReferencesTo }: -rustPlatform.buildRustPackage rec { + +rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { pname = "neovide"; version = "0.10.3"; src = fetchFromGitHub { - owner = "Kethku"; + owner = "neovide"; repo = "neovide"; rev = version; sha256 = "sha256-CcBiCcfOJzuq0DnokTUHpMdo7Ry29ugQ+N7Hk0R+cQE="; @@ -52,35 +46,24 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-w5dw/lGm40gKkHPR1ji/L82Oa808Kuh8qaCeiqBLkLw="; }; # The externals for skia are taken from skia/DEPS - externals = lib.mapAttrs (n: fetchgit) (lib.importJSON ./skia-externals.json); + externals = linkFarm "skia-externals" (lib.mapAttrsToList + (name: value: { inherit name; path = fetchgit value; }) + (lib.importJSON ./skia-externals.json)); in - runCommand "source" {} ( - '' - cp -R ${repo} $out - chmod -R +w $out + runCommand "source" { } '' + cp -R ${repo} $out + chmod -R +w $out + ln -s ${externals} $out/third_party/externals + '' + ; - mkdir -p $out/third_party/externals - cd $out/third_party/externals - '' + (builtins.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "cp -ra ${value} ${name}") externals)) - ); - - SKIA_NINJA_COMMAND = "${ninja}/bin/ninja"; SKIA_GN_COMMAND = "${gn}/bin/gn"; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - - preConfigure = '' - unset CC CXX - ''; - - # test needs a valid fontconfig file - FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + SKIA_NINJA_COMMAND = "${ninja}/bin/ninja"; nativeBuildInputs = [ - pkg-config makeWrapper - python2 # skia-bindings - python3 # rust-xcb - llvmPackages.clang # skia + pkg-config + python3 # skia removeReferencesTo ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; @@ -91,21 +74,12 @@ rustPlatform.buildRustPackage rec { doCheck = false; buildInputs = [ - openssl SDL2 - (fontconfig.overrideAttrs (old: { - propagatedBuildInputs = [ - # skia is not compatible with freetype 2.11.0 - (freetype.overrideAttrs (old: rec { - version = "2.10.4"; - src = fetchurl { - url = "mirror://savannah/${old.pname}/${old.pname}-${version}.tar.xz"; - sha256 = "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46"; - }; - })) - ]; - })) - ] ++ lib.optionals stdenv.isDarwin [ Security ApplicationServices Carbon AppKit ]; + fontconfig + rustPlatform.bindgenHook + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + ]; postFixup = let libPath = lib.makeLibraryPath ([ @@ -138,10 +112,9 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "This is a simple graphical user interface for Neovim."; - homepage = "https://github.com/Kethku/neovide"; + homepage = "https://github.com/neovide/neovide"; + changelog = "https://github.com/neovide/neovide/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ck3d ]; - platforms = platforms.all; - mainProgram = "neovide"; }; } diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 6cfcec8f1f7b..0f3c2359aab1 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -30,7 +30,7 @@ with python3.pkgs; buildPythonApplication rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ neovim pytestCheckHook ]; diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 3fed7fda38ac..29749c35db1f 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -1,5 +1,5 @@ # run tests by building `neovim.tests` -{ vimUtils, vim_configurable, writeText, neovim, vimPlugins +{ vimUtils, writeText, neovim, vimPlugins , lib, fetchFromGitHub, neovimUtils, wrapNeovimUnstable , neovim-unwrapped , fetchFromGitLab diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 0502e79cb5d1..fac9b3c30990 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -5,8 +5,6 @@ , python3Packages , callPackage }: -with lib; - neovim: let @@ -32,7 +30,7 @@ let }@args: let - wrapperArgsStr = if isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; + wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; # If configure != {}, we can't generate the rplugin.vim file with e.g # NVIM_SYSTEM_RPLUGIN_MANIFEST *and* NVIM_RPLUGIN_MANIFEST env vars set in @@ -43,7 +41,7 @@ let finalMakeWrapperArgs = [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] ++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ] - ++ optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ] + ++ lib.optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ] ; in assert withPython2 -> throw "Python2 support has been removed from the neovim wrapper, please remove withPython2 and python2Env."; @@ -55,24 +53,24 @@ let postBuild = lib.optionalString stdenv.isLinux '' rm $out/share/applications/nvim.desktop substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ - --replace 'Name=Neovim' 'Name=WrappedNeovim' + --replace 'Name=Neovim' 'Name=Neovim wrapper' '' - + optionalString withPython3 '' + + lib.optionalString withPython3 '' makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH '' - + optionalString (rubyEnv != null) '' + + lib.optionalString (rubyEnv != null) '' ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby '' - + optionalString withNodeJs '' + + lib.optionalString withNodeJs '' ln -s ${nodePackages.neovim}/bin/neovim-node-host $out/bin/nvim-node '' - + optionalString vimAlias '' + + lib.optionalString vimAlias '' ln -s $out/bin/nvim $out/bin/vim '' - + optionalString viAlias '' + + lib.optionalString viAlias '' ln -s $out/bin/nvim $out/bin/vi '' - + optionalString (manifestRc != null) (let + + lib.optionalString (manifestRc != null) (let manifestWrapperArgs = [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim-wrapper" ]; in '' diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index a004598fe846..9146b526262f 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "15"; + version = "16"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - hash = "sha512-WxqAQiPKdMfQCw9Hxaa7K2VIGTJj+Hu9WO2ehG4yQUkHBd+l0f0siLKk/i2xqLE1ZA522rxKud6iwXDuAsjjDg=="; + hash = "sha512-k+Zj6TKW0tOSYvM6V1okF4Qz62gZMETC6XG98W23Vtz3+vdiaddd8BC2DBg7p9Z1CofRq8sbwtpeTJM3FaXv0g=="; }; buildCommand = '' @@ -64,6 +64,10 @@ stdenv.mkDerivation { description = "An integrated development environment for Java, C, C++ and PHP"; homepage = "https://netbeans.apache.org/"; license = lib.licenses.asl20; + sourceProvenance = with lib.sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; maintainers = with lib.maintainers; [ sander rszibele asbachb ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/applications/editors/notepad-next/default.nix b/pkgs/applications/editors/notepad-next/default.nix index 77b41ea610dc..ab9489cd381f 100644 --- a/pkgs/applications/editors/notepad-next/default.nix +++ b/pkgs/applications/editors/notepad-next/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "notepad-next"; - version = "0.5.5"; + version = "0.6"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; rev = "v${version}"; - sha256 = "sha256-ZjDvAN/NNz1GY7/0eKlxogYPg2Ba7Ncg6TXyKQEdWrU="; + sha256 = "sha256-t+TfyhQjUp4xJQ4vihAwm691dpt8ctQwLYDRRAQI7OM="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/o/default.nix b/pkgs/applications/editors/o/default.nix index 5272ea3a5f1b..18654f3901e6 100644 --- a/pkgs/applications/editors/o/default.nix +++ b/pkgs/applications/editors/o/default.nix @@ -1,25 +1,29 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, makeWrapper, pkg-config -, tcsh -, withGui ? stdenv.isLinux, vte # vte is broken on darwin +, withGui ? true, vte }: buildGoModule rec { pname = "o"; - version = "2.57.0"; + version = "2.58.0"; src = fetchFromGitHub { owner = "xyproto"; repo = "o"; rev = "v${version}"; - hash = "sha256-UKFquf5h1e7gRAZgtcTdEpoNv+TOC8BYb2ED26X274s="; + hash = "sha256-oYWlciTQ/4mm/gTSQEkD/xPeLfDjIAMksjj1DVodZW4="; }; - postPatch = '' - substituteInPlace ko/main.cpp --replace '/bin/csh' '${tcsh}/bin/tcsh' - ''; - vendorSha256 = null; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace "-Wl,--as-needed" "" + + # Requires impure pbcopy and pbpaste + substituteInPlace v2/pbcopy_test.go \ + --replace TestPBcopy SkipTestPBcopy + ''; + nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ]; buildInputs = lib.optional withGui vte; @@ -31,7 +35,7 @@ buildGoModule rec { installManPage o.1 '' + lib.optionalString withGui '' make install-gui PREFIX=$out - wrapProgram $out/bin/ko --prefix PATH : $out/bin + wrapProgram $out/bin/og --prefix PATH : $out/bin ''; meta = with lib; { diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index e94fb02fcd99..446b73dc50c8 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -10,18 +10,36 @@ , gtk3 , wrapGAppsHook , makeWrapper +, pinegrowVersion ? "7" }: +let + # major version upgrade requires a new license. So keep version 6 around. + versions = { + "6" = { + version = "6.8"; + src = fetchurl { + url = "https://download.pinegrow.com/PinegrowLinux64.${versions."6".version}.zip"; + hash = "sha256-gqRmu0VR8Aj57UwYYLKICd4FnYZMhM6pTTSGIY5MLMk="; + }; + }; + "7" = { + version = "7.05.2"; + src = fetchurl { + url = "https://github.com/Pinegrow/PinegrowReleases/releases/download/pg${builtins.substring 0 4 (versions."7".version)}/PinegrowLinux64.${versions."7".version}.zip"; + hash = "sha256-Cvy4JwnQHMp7K0mKtIH8lk1bZ9hwa8nvtmimBK0UAf8="; + }; + }; + }; +in + stdenv.mkDerivation rec { pname = "pinegrow"; # deactivate auto update, because an old 6.21 version is getting mixed up # see e.g. https://github.com/NixOS/nixpkgs/pull/184460 - version = "6.8"; # nixpkgs-update: no auto update + version = versions.${pinegrowVersion}.version; # nixpkgs-update: no auto update - src = fetchurl { - url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip"; - sha256 = "sha256-gqRmu0VR8Aj57UwYYLKICd4FnYZMhM6pTTSGIY5MLMk="; - }; + src = versions.${pinegrowVersion}.src; nativeBuildInputs = [ unzip diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index bcc959bc200a..8f4bcfd67263 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = !isCross; - checkInputs = lib.optionals (!isCross) [ dejagnu ]; + nativeCheckInputs = lib.optionals (!isCross) [ dejagnu ]; postInstall = '' moveToOutput share/emacs "$out" diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index d8e57fdb508f..50eacf97bf85 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -44,6 +44,7 @@ in buildFHSUserEnv rec { xorg.libXext xorg.libXrender libudev0-shim + libxcrypt ]; passthru = { inherit unwrapped; }; diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index c323a10e9b29..2018e1d5e2af 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.26"; + version = "2.29.3"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "refs/tags/v${version}"; - sha256 = "sha256-QKK0bHy6pe+elPhnQlYAwmFP93LwCGxqRtBy10vj4i4="; + sha256 = "sha256-2qgWJ/bIravil/SuApA7pNXkxS5xUcdFpjVGO/ogDpw="; }; # We have not packaged tests. diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index afb48ad65f4f..574d83f1be97 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -1,7 +1,11 @@ { lib , python3 +, fetchzip , fetchFromGitHub , wrapQtAppsHook +, qtbase +, qttools +, qtsvg , buildEnv , aspellDicts # Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries @@ -11,18 +15,29 @@ python3.pkgs.buildPythonApplication rec { pname = "retext"; - version = "7.2.3"; + version = "8.0.0"; format = "setuptools"; src = fetchFromGitHub { owner = "retext-project"; - repo = "retext"; + repo = pname; rev = version; - hash = "sha256-EwaJFODnkZGbqVw1oQrTrx2ME4vRttVW4CMPkWvMtHA="; + hash = "sha256-22yqNwIehgTfeElqhN5Jzye7LbcAiseTeoMgenpmsL0="; + }; + + toolbarIcons = fetchzip { + url = "https://github.com/retext-project/retext/archive/icons.zip"; + hash = "sha256-LQtSFCGWcKvXis9pFDmPqAMd1m6QieHQiz2yykeTdnI="; }; nativeBuildInputs = [ wrapQtAppsHook + qttools.dev + ]; + + buildInputs = [ + qtbase + qtsvg ]; propagatedBuildInputs = with python3.pkgs; [ @@ -32,14 +47,19 @@ python3.pkgs.buildPythonApplication rec { markups pyenchant pygments - pyqt5 + pyqt6 + pyqt6-webengine ]; - postPatch = '' - # Remove wheel check - sed -i -e '31,36d' setup.py + patches = [ ./remove-wheel-check.patch ]; + + preConfigure = '' + lrelease ReText/locale/*.ts ''; + # prevent double wrapping + dontWrapQtApps = true; + postInstall = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") makeWrapperArgs+=( @@ -49,9 +69,11 @@ python3.pkgs.buildPythonApplication rec { }}" ) + cp ${toolbarIcons}/* $out/${python3.pkgs.python.sitePackages}/ReText/icons + substituteInPlace $out/share/applications/me.mitya57.ReText.desktop \ --replace "Exec=ReText-${version}.data/scripts/retext %F" "Exec=$out/bin/retext %F" \ - --replace "Icon=ReText-${version}.data/data/share/retext/icons/retext.svg" "Icon=$out/share/retext/icons/retext.svg" + --replace "Icon=ReText/icons/retext.svg" "Icon=retext" ''; doCheck = false; @@ -63,7 +85,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Editor for Markdown and reStructuredText"; homepage = "https://github.com/retext-project/retext/"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ klntsky ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/retext/remove-wheel-check.patch b/pkgs/applications/editors/retext/remove-wheel-check.patch new file mode 100644 index 000000000000..d736a3c3ccc9 --- /dev/null +++ b/pkgs/applications/editors/retext/remove-wheel-check.patch @@ -0,0 +1,28 @@ +From f07d08d3056c46f62674f65eabae0efa2b65d681 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Sat, 15 Oct 2022 16:53:27 +0200 +Subject: [PATCH] disable wheel check +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index a9cae37..e0e1e5b 100755 +--- a/setup.py ++++ b/setup.py +@@ -101,7 +101,7 @@ def run(self): + + desktop_file_path = join(self.install_data, 'share', 'applications', + 'me.mitya57.ReText.desktop') +- if self.root and self.root.endswith('/wheel'): ++ if False and self.root and self.root.endswith('/wheel'): + # Desktop files don't allow relative paths, and we don't know the + # absolute path when building a wheel. + log.info('removing the .desktop file from the wheel') +-- +2.37.3 diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 70e69503749b..2d8b3c2bb09c 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -25,7 +25,7 @@ , makeWrapper , pandoc , llvmPackages -, libyamlcpp +, yaml-cpp , soci , postgresql , nodejs @@ -95,7 +95,7 @@ in openssl R libuuid - libyamlcpp + yaml-cpp soci postgresql ] ++ (if server then [ @@ -206,7 +206,7 @@ in homepage = "https://www.rstudio.com/"; license = licenses.agpl3Only; maintainers = with maintainers; [ ciil cfhammill ]; - mainProgram = "rstudio" + optionalString server "-server"; + mainProgram = "rstudio" + lib.optionalString server "-server"; platforms = platforms.linux; }; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 409f99e37afa..138c886e7639 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.9.10"; + version = "1.9.20"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "sha256-FWUrhTTV1TCoBhitopQc469I7SRy4UDKdRLifVKhCCg="; + sha256 = "sha256-rpJ+HBYmGuhxnZbJn59mc+IokBc5834X2uyriIGnsqA="; }; pythonPath = with python3Packages; [ lxml ]; diff --git a/pkgs/applications/editors/spacevim/default.nix b/pkgs/applications/editors/spacevim/default.nix index ef3a6538c7c4..8252f8ce1c14 100644 --- a/pkgs/applications/editors/spacevim/default.nix +++ b/pkgs/applications/editors/spacevim/default.nix @@ -2,7 +2,7 @@ , git , fzf , makeWrapper -, vim_configurable +, vim-full , vimPlugins , fetchFromGitHub , lib @@ -14,7 +14,7 @@ let format = formats.toml { }; - vim-customized = vim_configurable.customize { + vim-customized = vim-full.customize { name = "vim"; # Not clear at the moment how to import plugins such that # SpaceVim finds them and does not auto download them to diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index d4e43b4f71de..461e8dc504dc 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,26 +1,14 @@ -{ lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils +{ callPackage, lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils , fetchurl, libsecret }: let - version = "3.23.69"; + srcjson = builtins.fromJSON (builtins.readFile ./src.json); + version = srcjson.version; pname = "standardnotes"; name = "${pname}-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; - plat = { - i686-linux = "i386"; - x86_64-linux = "x86_64"; - }.${stdenv.hostPlatform.system} or throwSystem; - - sha256 = { - i686-linux = "sha256-/A2LjV8ky20bcKgs0ijwldryi5VkyROwz49vWYXYQus="; - x86_64-linux = "sha256-fA9WH9qUtvAHF9hTFRtxQdpz2dpK0joD0zX9VYBo10g="; - }.${stdenv.hostPlatform.system} or throwSystem; - - src = fetchurl { - url = "https://github.com/standardnotes/app/releases/download/%40standardnotes%2Fdesktop%40${version}/standard-notes-${version}-linux-${plat}.AppImage"; - inherit sha256; - }; + src = fetchurl (srcjson.appimage.${stdenv.hostPlatform.system} or throwSystem); appimageContents = appimageTools.extract { inherit name src; @@ -47,6 +35,8 @@ in appimageTools.wrapType2 rec { ln -s ${appimageContents}/usr/share/icons share ''; + passthru.updateScript = callPackage ./update.nix {}; + meta = with lib; { description = "A simple and private notes app"; longDescription = '' @@ -55,8 +45,8 @@ in appimageTools.wrapType2 rec { ''; homepage = "https://standardnotes.org"; license = licenses.agpl3; - maintainers = with maintainers; [ mgregoire chuangzhu ]; + maintainers = with maintainers; [ mgregoire chuangzhu squalus ]; sourceProvenance = [ sourceTypes.binaryNativeCode ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = builtins.attrNames srcjson.appimage; }; } diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json new file mode 100644 index 000000000000..09b5a7665d32 --- /dev/null +++ b/pkgs/applications/editors/standardnotes/src.json @@ -0,0 +1,13 @@ +{ + "version": "3.142.1", + "appimage": { + "x86_64-linux": { + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.142.1/standard-notes-3.142.1-linux-x86_64.AppImage", + "hash": "sha512-tf6vk108RMnxk7ZCFIAbWnlTvQqCkU6NtG+JCmMK/oR+/N3T5TDaHyufNJ9yVIh9pZrmaKMHjDUdCUgGc7lIRA==" + }, + "aarch64-linux": { + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.142.1/standard-notes-3.142.1-linux-arm64.AppImage", + "hash": "sha512-wQYeWUDLbthgcWPWcz5TbqR1rk3OkdISr/SsdbbrLIyroAaXppg+7FA/FbPW7wlrksiMKowJ/hAPQz1NIxSRZg==" + } + } +} diff --git a/pkgs/applications/editors/standardnotes/update.nix b/pkgs/applications/editors/standardnotes/update.nix new file mode 100644 index 000000000000..7b5f6616602b --- /dev/null +++ b/pkgs/applications/editors/standardnotes/update.nix @@ -0,0 +1,54 @@ +{ writeScript +, lib, curl, runtimeShell, jq, coreutils, moreutils, nix, gnused }: + +writeScript "update-standardnotes" '' + #!${runtimeShell} + PATH=${lib.makeBinPath [ jq curl nix coreutils moreutils gnused ]} + + set -euo pipefail + set -x + + tmpDir=$(mktemp -d) + srcJson=pkgs/applications/editors/standardnotes/src.json + jsonPath="$tmpDir"/latest + + oldVersion=$(jq -r .version < "$srcJson") + + curl https://api.github.com/repos/standardnotes/app/releases/latest > "$jsonPath" + + tagName=$(jq -r .tag_name < "$jsonPath") + + if [[ ! "$tagName" =~ "desktop" ]]; then + echo "latest release '$tagName' not a desktop release" + exit 1 + fi + + newVersion=$(jq -r .tag_name < "$jsonPath" | sed s,@standardnotes/desktop@,,g) + + if [[ "$oldVersion" == "$newVersion" ]]; then + echo "version did not change" + exit 0 + fi + + function getDownloadUrl() { + jq -r ".assets[] | select(.name==\"standard-notes-$newVersion-$1.AppImage\") | .browser_download_url" < "$jsonPath" + } + + function setJsonKey() { + jq "$1 = \"$2\"" "$srcJson" | sponge "$srcJson" + } + + function updatePlatform() { + nixPlatform="$1" + upstreamPlatform="$2" + url=$(getDownloadUrl "$upstreamPlatform") + hash=$(nix-prefetch-url "$url" --type sha512) + sriHash=$(nix hash to-sri --type sha512 $hash) + setJsonKey .appimage[\""$nixPlatform"\"].url "$url" + setJsonKey .appimage[\""$nixPlatform"\"].hash "$sriHash" + } + + updatePlatform x86_64-linux linux-x86_64 + updatePlatform aarch64-linux linux-arm64 + setJsonKey .version "$newVersion" +'' diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index ebf6cc2c53e1..7a8cc75e540b 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -3,6 +3,7 @@ { fetchurl, stdenv, lib, xorg, glib, libglvnd, glibcLocales, gtk3, cairo, pango, makeWrapper, wrapGAppsHook , writeShellScript, common-updater-scripts, curl , openssl_1_1, bzip2, bash, unzip, zip +, sqlite }: let @@ -15,7 +16,19 @@ let versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}"; versionFile = builtins.toString ./packages.nix; - libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libXtst glib libglvnd openssl_1_1 gtk3 cairo pango curl ]; + neededLibraries = [ + xorg.libX11 + xorg.libXtst + glib + libglvnd + openssl_1_1 + gtk3 + cairo + pango + curl + ] ++ lib.optionals (lib.versionAtLeast buildVersion "4145") [ + sqlite + ]; in let binaryPackage = stdenv.mkDerivation rec { pname = "${pnameBase}-bin"; @@ -52,7 +65,7 @@ in let for binary in ${ builtins.concatStringsSep " " binaries }; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${lib.makeLibraryPath neededLibraries}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ $binary done @@ -67,6 +80,7 @@ in let # No need to patch these libraries, it works well with our own rm libcrypto.so.1.1 libssl.so.1.1 + ${lib.optionalString (lib.versionAtLeast buildVersion "4145") "rm libsqlite3.so"} mkdir -p $out cp -r * $out/ diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index d5a37aee5a47..5a60ce185c12 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -11,9 +11,9 @@ in } {}; sublime4-dev = common { - buildVersion = "4141"; + buildVersion = "4147"; dev = true; - x64sha256 = "eFo9v4hSrp1gV56adVyFB9sOApOXlKNvVBW0wbFYG4g="; - aarch64sha256 = "MmwSptvSH507+X9GT8GC4tzZFzEfT2pKc+/Qu5SbMkM="; + x64sha256 = "9zs+2cp+pid0y/v5tHJN4jp7sM1oGB5EgGzMASL3y4o="; + aarch64sha256 = "KyvHJPqBEfeQQJnuyWZA7vGhWkYFqMaTMx+uy+3cZ30="; } {}; } diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 6a0f498fa554..96fb32e80f36 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.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - hash = "sha256-BaTfebLilUeDNtCJZmgAx+hN+L+4MtnuL6t3wQRX/Ns="; + hash = "sha256-3w9JKX0tT5J3tJthIxJ+ZMlG8+gEeQAl9Gn+Zyjhmt4="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index d859b5c88840..73cd6139ba14 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -4,13 +4,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "thonny"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "sha256-VGP9JVw92rk1yXZDqTKcMzJt8t+T8YAg8zYxFaWxGr4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-TxfpzKAsU/5ble4VzJ+4pokCiyJsdisjmNwWfxOMKzE="; }; nativeBuildInputs = [ copyDesktopItems ]; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 7be6d4897109..03c6d19b80c4 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,19 +1,65 @@ -{ lib, mkDerivation, fetchFromGitHub, pkg-config, qmake -, python3, qtbase, qttools }: +{ lib +, stdenv +, env +, fetchFromGitHub +, pkg-config +, qbs +, wrapQtAppsHook +, qtbase +, qtdeclarative +, qttools +, qtsvg +, zlib +, libGL +}: -mkDerivation rec { +let + qtEnv = env "tiled-qt-env" [ qtbase qtdeclarative qtsvg qttools ]; +in + +stdenv.mkDerivation rec { pname = "tiled"; - version = "1.8.4"; + version = "1.9.2"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QYA2krbwH807BkzVST+/+sjSR6So/aGY/YenEjYxE48="; + sha256 = "sha256-026OO7r8n1BUapUtKRHvqKdSZiClTQIiYfajiC2TAcQ="; }; - nativeBuildInputs = [ pkg-config qmake ]; - buildInputs = [ python3 qtbase qttools ]; + nativeBuildInputs = [ pkg-config qbs wrapQtAppsHook ]; + buildInputs = [ qtEnv zlib libGL ]; + + outputs = [ "out" "dev" ]; + + strictDeps = true; + + configurePhase = '' + runHook preConfigure + + qbs setup-qt --settings-dir . ${qtEnv}/bin/qmake qtenv + qbs config --settings-dir . defaultProfile qtenv + qbs resolve --settings-dir . config:release qbs.installPrefix:/ projects.Tiled.installHeaders:true + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + qbs build --settings-dir . config:release + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + qbs install --settings-dir . --install-root $out config:release + + runHook postInstall + ''; meta = with lib; { description = "Free, easy to use and flexible tile map editor"; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 11ddddaefc24..ad64772de554 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -63,7 +63,7 @@ let in stdenv.mkDerivation rec { - pname = "vim_configurable"; + pname = "vim-full"; inherit (common) version postPatch hardeningDisable enableParallelBuilding meta; diff --git a/pkgs/applications/editors/vim/macvim-configurable.nix b/pkgs/applications/editors/vim/macvim-configurable.nix index 7ed3dee9b6b9..5c436307897f 100644 --- a/pkgs/applications/editors/vim/macvim-configurable.nix +++ b/pkgs/applications/editors/vim/macvim-configurable.nix @@ -6,9 +6,9 @@ let makeCustomizable = macvim: macvim // { # configure expects the same args as vimUtils.vimrcFile. # This is the same as the value given to neovim.override { configure = … } - # or the value of vim_configurable.customize { vimrcConfig = … } + # or the value of vim-full.customize { vimrcConfig = … } # - # Note: Like neovim and vim_configurable, configuring macvim disables the + # Note: Like neovim and vim-full, configuring macvim disables the # sourcing of the user's vimrc. Use `customRC = "source $HOME/.vim/vimrc"` # if you want to preserve that behavior. configure = let diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 806e2f9d4fd0..8440d1fd6d9c 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -1,18 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, runCommand, ncurses, gettext -, pkg-config, cscope, ruby, tcl, perl, luajit +{ lib +, stdenv +, fetchFromGitHub +, runCommand +, ncurses +, gettext +, pkg-config +, cscope +, ruby +, tcl +, perl +, luajit , darwin - -, usePython27 ? false -, python27 ? null, python37 ? null +, python3 }: -let - python = if usePython27 - then { pkg = python27; name = "python"; } - else { pkg = python37; name = "python3"; }; -in -assert python.pkg != null; - let # Building requires a few system tools to be in PATH. # Some of these we could patch into the relevant source files (such as xcodebuild and @@ -40,7 +41,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config buildSymlinks ]; buildInputs = [ - gettext ncurses cscope luajit ruby tcl perl python.pkg + gettext ncurses cscope luajit ruby tcl perl python3 ]; patches = [ ./macvim.patch ]; @@ -53,14 +54,14 @@ stdenv.mkDerivation { "--enable-multibyte" "--enable-nls" "--enable-luainterp=dynamic" - "--enable-${python.name}interp=dynamic" + "--enable-python3interp=dynamic" "--enable-perlinterp=dynamic" "--enable-rubyinterp=dynamic" "--enable-tclinterp=yes" "--without-local-dir" "--with-luajit" "--with-lua-prefix=${luajit}" - "--with-${python.name}-command=${python.pkg}/bin/${python.name}" + "--with-python3-command=${python3}/bin/python3" "--with-ruby-command=${ruby}/bin/ruby" "--with-tclsh=${tcl}/bin/tclsh" "--with-tlib=ncurses" @@ -158,7 +159,7 @@ stdenv.mkDerivation { libperl=$(dirname $(find ${perl} -name "libperl.dylib")) install_name_tool -add_rpath ${luajit}/lib $exe install_name_tool -add_rpath ${tcl}/lib $exe - install_name_tool -add_rpath ${python.pkg}/lib $exe + install_name_tool -add_rpath ${python3}/lib $exe install_name_tool -add_rpath $libperl $exe install_name_tool -add_rpath ${ruby}/lib $exe diff --git a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix index 66234c2c198e..20641908115c 100644 --- a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix +++ b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix @@ -1,9 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , rtpPath -, vim -, vimCommandCheckHook -, vimGenDocHook -, neovimRequireCheckHook , toVimPlugin }: @@ -14,39 +11,46 @@ rec { overrideAttrs = f: addRtp (drv.overrideAttrs f); }; - buildVimPlugin = attrs@{ - name ? "${attrs.pname}-${attrs.version}", - namePrefix ? "vimplugin-", - src, - unpackPhase ? "", - configurePhase ? "", - buildPhase ? "", - preInstall ? "", - postInstall ? "", - path ? ".", - addonInfo ? null, - ... - }: - let drv = stdenv.mkDerivation (attrs // { - name = namePrefix + name; + buildVimPlugin = + { name ? "${attrs.pname}-${attrs.version}" + , namePrefix ? "vimplugin-" + , src + , unpackPhase ? "" + , configurePhase ? "" + , buildPhase ? "" + , preInstall ? "" + , postInstall ? "" + , path ? "." + , addonInfo ? null + , meta ? { } + , ... + }@attrs: + let + drv = stdenv.mkDerivation (attrs // { + name = namePrefix + name; - inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; + inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - target=$out/${rtpPath}/${path} - mkdir -p $out/${rtpPath} - cp -r . $target + target=$out/${rtpPath}/${path} + mkdir -p $out/${rtpPath} + cp -r . $target - runHook postInstall - ''; - }); - in addRtp (toVimPlugin drv); + runHook postInstall + ''; + + meta = { + platforms = lib.platforms.all; + } // meta; + }); + in + addRtp (toVimPlugin drv); buildVimPluginFrom2Nix = attrs: buildVimPlugin ({ # vim plugins may override this buildPhase = ":"; - configurePhase =":"; + configurePhase = ":"; } // attrs); } diff --git a/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix index 17e03b7dd76d..ab31ac6539b9 100644 --- a/pkgs/applications/editors/vim/plugins/default.nix +++ b/pkgs/applications/editors/vim/plugins/default.nix @@ -7,7 +7,7 @@ let inherit (vimUtils.override {inherit vim;}) - buildVimPluginFrom2Nix vimGenDocHook vimCommandCheckHook; + buildVimPluginFrom2Nix; inherit (lib) extends; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 9486403c9236..71af02bee7dd 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -27,6 +27,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/BufOnly.vim/"; }; + ChatGPT-nvim = buildVimPluginFrom2Nix { + pname = "ChatGPT.nvim"; + version = "2023-01-19"; + src = fetchFromGitHub { + owner = "jackMort"; + repo = "ChatGPT.nvim"; + rev = "dac83f630fc6aafd256b149a2c2ae0d4466ec85e"; + sha256 = "1ny56csbrk2kzfqr9a3m858j4vi4iwpmx8w71fr9k6ncychk9pip"; + }; + meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; + }; + CheckAttach = buildVimPluginFrom2Nix { pname = "CheckAttach"; version = "2019-05-08"; @@ -53,12 +65,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-09-30"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "98c99cc950f147a877d56a590d92b357c24086b9"; - sha256 = "06q4riwy7gdmcrqjqnsgw98r382jwsk5qn1f43pg04cwdaksjy4k"; + rev = "564a64651578164b5c7f2503e306bc436beb88da"; + sha256 = "151w10p8w7ml9v7h18y3zzgbr48ffpxsxj3lnxl8lm44dab76qp1"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -113,12 +125,12 @@ final: prev: Ionide-vim = buildVimPluginFrom2Nix { pname = "Ionide-vim"; - version = "2022-09-02"; + version = "2022-11-24"; src = fetchFromGitHub { owner = "ionide"; repo = "Ionide-vim"; - rev = "a0685e9184c75beb6c608d783389d95446775c93"; - sha256 = "0y3amhzsnzanibq4i6im1p7ha8li115mjscfywc91v3zk9zim22i"; + rev = "a66845162ae4c2ad06d76e003c0aab235aac2ede"; + sha256 = "1hiq3h2ahwzfhci9lmxg3if78h7kb8cn6sab356qzyh6z2saxcvm"; }; meta.homepage = "https://github.com/ionide/Ionide-vim/"; }; @@ -161,12 +173,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-10-13"; + version = "2022-12-18"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "ebb1f3a20b83a950938c59200434a4e66b69612d"; - sha256 = "0f25qsfpk5m92cc70pjjsbh1ph11aybw2rfraxwdrcywwdr61w7w"; + rev = "43433aa8dad1601acf923d3c25fa3325799508aa"; + sha256 = "111nhw85v6hkyjzfs8jx566s44i89mihvlcnwdgwc08pnmnm7fci"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -185,12 +197,12 @@ final: prev: Navigator-nvim = buildVimPluginFrom2Nix { pname = "Navigator.nvim"; - version = "2022-11-16"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "numToStr"; repo = "Navigator.nvim"; - rev = "2ef04f4be7a9ffc648751e8c0d0c7236074c1dc1"; - sha256 = "0yszjbl4q4pn3f6k90jx2i4bkqm55r4gjl7s6fmf6igcphmslkgm"; + rev = "91d86506ac2a039504d5205d32a1d4bc7aa57072"; + sha256 = "12hsdwj4jqbkh8z3hcr1c660jmh44c0j4rzlchnc326gcbrayarv"; }; meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; }; @@ -281,12 +293,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-11-10"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "f92c7fce6a8ddb5b5b906d5cf7a2985b4741b9a8"; - sha256 = "07sjzaxa85zzxskq1247124x9519pz5g2s78n2h7z4hkixrd6g63"; + rev = "bb952ae19d2b227b549133a3b0ed69a3436d208e"; + sha256 = "0lg5ibn3q1kw951k7j11f7c24qmf4sy9y3y2pqlpvk9bvc095jyl"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -329,24 +341,24 @@ final: prev: SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2022-11-15"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "8ff0ed105d1403a60e1f79150b8b645a3465b3a0"; - sha256 = "06bddfpmnabhw7q8q459qa55gh3x7xqzb0lq7qpq1i4kg6qsc7ck"; + rev = "fab8e52ec7d67000c8d96028b2d643573a4289b1"; + sha256 = "0kk482si63v67a4086hk9va1lsjqpmbaf71y2cqyrw9vidbmy38g"; }; meta.homepage = "https://github.com/jaredgorski/SpaceCamp/"; }; SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-11-19"; + version = "2023-01-17"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "e40635a03538f73e67e68a18c82c63fe1832e304"; - sha256 = "0d3d02fylm4ng67yx1k67hb9gfrj9msbwxn3sd5vikx1qhgsfzvv"; + rev = "25e2819b0e6ad38f51c918ea09e159c8a09bbdc3"; + sha256 = "15s0ndfpji3zms2fbijm7ys40x5p8994cdir3a0ya1nksf3yb9jj"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -437,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2022-11-19"; + version = "2023-01-17"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "2d1de481a94a3be428c87ab0404c38e58b386813"; - sha256 = "0g780ykjiya6clc3yi8ky4lxhyj2ayc629wn5i2iq8siwm4ab07v"; + rev = "50379d35ddc38ee3651f568d080442d5e4cb4a3a"; + sha256 = "0s830zxirqbw880xv7ddza8m988i4ljrd4vgdk1yxaifid2zx8yg"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -486,12 +498,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-11-16"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "4b42ddbd453caec3b12541af80e498a02d47cf20"; - sha256 = "0r3giqdvdpi3066ky4yib4lv36xy7cvsk3ry8j339ghiw00rjfv4"; + rev = "4428a478e70f6a6b52e86d16ced677020267f409"; + sha256 = "18dvm2k6h0xvzhf6wr317b9j85qq46gkh2scxmi8b20p8d3kfi52"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -521,6 +533,18 @@ final: prev: meta.homepage = "https://github.com/derekelkins/agda-vim/"; }; + ai-vim = buildVimPluginFrom2Nix { + pname = "ai.vim"; + version = "2023-01-05"; + src = fetchFromGitHub { + owner = "aduros"; + repo = "ai.vim"; + rev = "bc77f9f7565928169fe35d64123736b7d918f30c"; + sha256 = "0bn4712rwyr0fwwb8fx1cpxpz7x6fppfh24l20xpgaphdg0j78ih"; + }; + meta.homepage = "https://github.com/aduros/ai.vim/"; + }; + alchemist-vim = buildVimPluginFrom2Nix { pname = "alchemist.vim"; version = "2020-04-27"; @@ -535,12 +559,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-11-07"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "4b433e5693ccec8e408504c4b139b8f7cc6a4aa3"; - sha256 = "08ik0a5g54m295pqyxfzkgav9apyqrchbfsxssb8hjgq3sl00vjv"; + rev = "45a3e3f574172028338de70ce8f8f606dec0a1b0"; + sha256 = "0xyglfdqr8bq4s5mqq7wvj8czl1n9pgs16368q2zjj9j35x6m8xr"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -559,24 +583,24 @@ final: prev: alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; - version = "2022-11-14"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "a858e4e7b0805835e61fab2b54704450427d47c3"; - sha256 = "0lcdywjbnh2rzjpyk9834invl8a8svmm2xwpmybdx1wrx9q6iip9"; + rev = "21a0f2520ad3a7c32c0822f943368dc063a569fb"; + sha256 = "1s9ywy69kap0gngpm5xnfkwlrb2apci9xv2ahs2xhhkjncqm38mq"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2022-08-24"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "9892a40d4cf970a2916a984544b7f984fc12f55c"; - sha256 = "1dbhvbaiabc8f9p3vfch3pkail2zx234g048mywl005s90d339kz"; + rev = "a7445c340fb7a0529f3c413eb99d3f8d29f50ba2"; + sha256 = "1rj1c4jljz83w1509y39lagmr86xngivzsjzngrdivnw3swbc59y"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -643,12 +667,12 @@ final: prev: asyncomplete-lsp-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-lsp.vim"; - version = "2021-12-17"; + version = "2022-11-21"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete-lsp.vim"; - rev = "f6d6a6354ff279ba707c20292aef0dfaadc436a3"; - sha256 = "1y0wpq982nw0ibqhvcvb7md58jvadygkxc1ibg99zxw1kznfpla6"; + rev = "cc5247bc268fb2c79d8b127bd772514554efb3ee"; + sha256 = "1lyl4k10fxv8h0b84x17yfxdrm00aw38vmckmpgd3bgdz35h1qa9"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete-lsp.vim/"; }; @@ -667,24 +691,24 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2022-11-18"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "6d5e981c56a9fec9e5b617eaaad3d302bfe18dd8"; - sha256 = "11qyggn16ghpa272nv9qflf0xbqn0n36qbmv8w4mmphpcf5mq6yz"; + rev = "bd240b2a2ac5c975216744fda57abe5ff8f39957"; + sha256 = "0mwrn4kxqn96n1jyr3sk1y39g8smgpa9kcdip3928p5vzsa8lbir"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; asynctasks-vim = buildVimPluginFrom2Nix { pname = "asynctasks.vim"; - version = "2022-11-10"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "9053c97fc77ac3335761527d4431f936631e3a24"; - sha256 = "0jm4grwgz6wql22d3yqpmayqg0vnssdcp19csgvcjac9lrxl0m9y"; + rev = "784a4b1f75a913cc6c43dd6c4dbe69d648dbbfa5"; + sha256 = "1mwabzkdvikyy41f7q6nqym28y93v4jmjvlkak9i2rb2l4lx5ski"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; @@ -703,12 +727,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2022-11-15"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "87ecb98982f11bb62a61a2ed4d46676c72918a4d"; - sha256 = "147yd7v21y8b59wj89zc103q1lp8dzmkyciby2nn8qb1kzvwvh0g"; + rev = "ef44f07a563d59b23c3f17792f4ff3b5fb4280a1"; + sha256 = "14w830fnr19rnjqwg5yqns4xf27nhvc169qrmkjn8y054i6yjsg2"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -751,16 +775,28 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-11-18"; + version = "2022-12-13"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "04bae4b2b531f0420824acd8d411129712da96e3"; - sha256 = "044iwsa1c95354l470kakrd77bnp6xbl87bhxydmlzjfwpshs89i"; + rev = "c8b2f4048f846387361bd04cc185bf1aa7d2e3d1"; + sha256 = "0z02981n9gd5migx774cs4gnwpq9ksd4ava53f4xn973gc8jf4jn"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; + autoclose-nvim = buildVimPluginFrom2Nix { + pname = "autoclose.nvim"; + version = "2023-02-03"; + src = fetchFromGitHub { + owner = "m4xshen"; + repo = "autoclose.nvim"; + rev = "5c63f2c28a48d556644f3650daccdf0ba03ea177"; + sha256 = "0c8klbm0wwr1rq1kkq2lq18n3d8kbi977zac70xc8h3dcfdnzc4m"; + }; + meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; + }; + autoload_cscope-vim = buildVimPluginFrom2Nix { pname = "autoload_cscope.vim"; version = "2011-01-28"; @@ -797,26 +833,38 @@ final: prev: meta.homepage = "https://github.com/ayu-theme/ayu-vim/"; }; + b64-nvim = buildVimPluginFrom2Nix { + pname = "b64.nvim"; + version = "2022-08-22"; + src = fetchFromGitHub { + owner = "taybart"; + repo = "b64.nvim"; + rev = "12dde6ebc3035f010833f513cfbd9abad92b28b3"; + sha256 = "0h3ghaddqf00q7gih53ni7mx0iw5k9m616j34yg6hdf6s12zp5qw"; + }; + meta.homepage = "https://github.com/taybart/b64.nvim/"; + }; + barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-11-18"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "36ed977ab56d3718c41f078d01db9b218d11250c"; - sha256 = "12b2ngkcgd89ky1dnqsfyv9x0qm7lw48wrf2pr6l1ddx2izlf7pq"; + rev = "065c6d792a2a3aaf67a754ccd46800c8d1964812"; + sha256 = "1y04sfcnzw4hnygbgg91bfsn7jas5xbcsxrhp7766whd22rl6dsh"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2022-11-18"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "f13fad8217cabea67e4d06a82bba79fdcc56344b"; - sha256 = "103g4lzyd6amygksafhxb08ll74a33ahp66di9x7r0b7jqw53ym4"; + rev = "ed0a85f5212124cafb611af8365c162b64e4064d"; + sha256 = "05ya1zpg86w6q9r1s3i8bm42hw5h612aa2jghl34j7z7pdwcy3ns"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -833,6 +881,18 @@ final: prev: meta.homepage = "https://github.com/chriskempson/base16-vim/"; }; + bat-vim = buildVimPluginFrom2Nix { + pname = "bat.vim"; + version = "2022-11-14"; + src = fetchFromGitHub { + owner = "jamespwilliams"; + repo = "bat.vim"; + rev = "cc038af97410bfc8da2e29f7eefa51f565346993"; + sha256 = "17f9vwy3qfyl553hddah5zbj8gwww772frlvw51zskf9phdg17la"; + }; + meta.homepage = "https://github.com/jamespwilliams/bat.vim/"; + }; + bats-vim = buildVimPluginFrom2Nix { pname = "bats.vim"; version = "2013-07-03"; @@ -859,12 +919,12 @@ final: prev: better-escape-nvim = buildVimPluginFrom2Nix { pname = "better-escape.nvim"; - version = "2022-03-28"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "d5ee0cef56a7e41a86048c14f25e964876ac20c1"; - sha256 = "04hi2zmaz02fiyvjs94lqn7imp20fn2vpwww37sg7gim18b1mpl4"; + rev = "6fed33809cde3b416087fc540ad9eb17ec470193"; + sha256 = "1wqps75qkr7rqdvrsn6f8m02nkqap9g6cca1jqf53y9476jsbml7"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -893,6 +953,18 @@ final: prev: meta.homepage = "https://github.com/blueballs-theme/blueballs-neovim/"; }; + boole-nvim = buildVimPluginFrom2Nix { + pname = "boole.nvim"; + version = "2023-01-14"; + src = fetchFromGitHub { + owner = "nat-418"; + repo = "boole.nvim"; + rev = "f4f9996f91159e54b8f1893b20e2e599c91bc1bd"; + sha256 = "0kilw1g57nrwxp07qpycig4bswafwg751kaiqnlnn70xbb88xppg"; + }; + meta.homepage = "https://github.com/nat-418/boole.nvim/"; + }; + bracey-vim = buildVimPluginFrom2Nix { pname = "bracey.vim"; version = "2021-08-20"; @@ -919,36 +991,48 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2022-11-16"; + version = "2022-12-04"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "3ebf4a98c380ec27b3066eaa5f1fdda332df1a9d"; - sha256 = "1cnlhl7kin27v57l2v4yn9v4kvdb9lp4h20ipyw3jh7r13p3y8gv"; + rev = "f79e9d186b42fba5f1b1362006e7c70240db97a4"; + sha256 = "08avd9icr7jclljlkzg8q74c95g0knzhxkldgfg9kl298h7qc521"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; bufexplorer = buildVimPluginFrom2Nix { pname = "bufexplorer"; - version = "2022-09-20"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "e782dab0fe9523ac65d9fe4f726f2efe924e3f43"; - sha256 = "1zbaqs96rimwawcf6nhxi3l02gs1yzdr4qk5aqh2ka0g6mx8mldn"; + rev = "5a830d5d2d7417bf02339ec279c90e98dde822f8"; + sha256 = "1vcfz4ngk5jsh66l74na9r0z2d3y6annb518kv0lgv76z99g5vy8"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; + bufferize-vim = buildVimPluginFrom2Nix { + pname = "bufferize.vim"; + version = "2022-06-25"; + src = fetchFromGitHub { + owner = "AndrewRadev"; + repo = "bufferize.vim"; + rev = "013857c12340bc14e285727eaf7d0bfb9807c768"; + sha256 = "1f4681p7zxchzi628n633j54y6mw13ayjcw0sf6yy2iywrrppdfy"; + }; + meta.homepage = "https://github.com/AndrewRadev/bufferize.vim/"; + }; + bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-11-16"; + version = "2022-12-24"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "4ecfa81e470a589e74adcde3d5bb1727dd407363"; - sha256 = "0l2d28bh85cv722c25qda74nkwmd19nifyyqmsn5ac2s027pasd8"; + rev = "c7492a76ce8218e3335f027af44930576b561013"; + sha256 = "18vfx8mq2gsv2hqy0c0vgbmx5mhr63bb8ixrmzmjgvbx2djz1jdb"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -967,12 +1051,12 @@ final: prev: calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2022-10-27"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "e4b6212f028f4293f965ed7d83e21516fe9d94c1"; - sha256 = "10dblr72w8zjckjz8ikpfh0f06ljm07aby27m6cbgjyf0qmsyjjv"; + rev = "6004885c90fd0239b84ce242babbcfe7cd379535"; + sha256 = "0avpcl9y718xldlhc6ip8hq6y6wp50k4hqdfrm3zg1z6l7iladwh"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -1003,12 +1087,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2022-11-09"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "da5ed534bf401819eb4bc6a78c11c11b8bf3fb65"; - sha256 = "074c56gwg91jpn66rrxf05m89kx1l0is96lm2pffi35ig67c45px"; + rev = "be0a8122fd77efb7b6a0d672bab10417e68fab8b"; + sha256 = "1w7km6b4r3pvnx5g5i4wndj9524klx3g4q9li8xv8z6lhdz27c15"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1051,36 +1135,36 @@ final: prev: circles-nvim = buildVimPluginFrom2Nix { pname = "circles.nvim"; - version = "2022-11-09"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "projekt0n"; repo = "circles.nvim"; - rev = "67bc0cb720ed2f6d57073b24a7c1cf0531f2ce7e"; - sha256 = "0q88yjssn4mm7m2fbddlp2yvixrfdmf5b8hrrq9zknx6q0b7bwpb"; + rev = "06357817f6944de132f0a58ee5c1486e4dcc6dda"; + sha256 = "1rvbz9m02vmjs5dg9yhnzzdr46ck1rqdrc7a94sybj8qvw3l5nq1"; }; meta.homepage = "https://github.com/projekt0n/circles.nvim/"; }; clang_complete = buildVimPluginFrom2Nix { pname = "clang_complete"; - version = "2022-09-01"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "xavierd"; repo = "clang_complete"; - rev = "e25b6a54e5cf648eb36d5be5b82c1bbb22260fde"; - sha256 = "0ik55akiyivq70a0jds35f8jqvs78mzxq3b302vhyq07w44mk7vx"; + rev = "d866f31a6b1cfc725dd015293e0a275a6ae9beb0"; + sha256 = "1fz1mjk049b2f31ymk4ph287km8q3yan9xm5ipj41mjwaavdmzi3"; }; meta.homepage = "https://github.com/xavierd/clang_complete/"; }; clangd_extensions-nvim = buildVimPluginFrom2Nix { pname = "clangd_extensions.nvim"; - version = "2022-11-11"; + version = "2023-01-02"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "9bd6073dd1230e667f97760b5a73f81547a19528"; - sha256 = "00jzl7aaas26181b0ldnk7nskmp0l491c8j2r5lld623bvv2hdsl"; + rev = "a5c3c8390dfb342d630bdc25941a4d8f433510be"; + sha256 = "0picfypj5by4zmq37h0dmszwk8vzj5dq04q2jy8lb9p5n36rkwya"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -1159,12 +1243,12 @@ final: prev: cmp-cmdline = buildVimPluginFrom2Nix { pname = "cmp-cmdline"; - version = "2022-11-13"; + version = "2022-11-27"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-cmdline"; - rev = "8bc9c4a34b223888b7ffbe45c4fe39a7bee5b74d"; - sha256 = "0rx8ncap1dfrgwkx1wsmhybr6cs1kdh0li5hssbhws2d6igij8zq"; + rev = "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063"; + sha256 = "0vffivj94736njjhlazrs0jkc1nyvcdjpw64w38d1lhlyflf4cl7"; }; meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; @@ -1183,12 +1267,12 @@ final: prev: cmp-conjure = buildVimPluginFrom2Nix { pname = "cmp-conjure"; - version = "2021-10-09"; + version = "2022-12-05"; src = fetchFromGitHub { owner = "PaterJason"; repo = "cmp-conjure"; - rev = "ca39e595a0a64150a3fbad340635b0179fe275ec"; - sha256 = "08vpd8ibz9472iblw0qc64phvwvkm0byrkvw9b9lq0jcsmw2sgs5"; + rev = "d76e1fe5d724afe604dfa7b4b5ba93f3d3730617"; + sha256 = "026kmjrhfwqllr8qh0z4jgdl2fcxy4cqf33yy4lnalkgvapnja5s"; }; meta.homepage = "https://github.com/PaterJason/cmp-conjure/"; }; @@ -1231,12 +1315,12 @@ final: prev: cmp-dictionary = buildVimPluginFrom2Nix { pname = "cmp-dictionary"; - version = "2022-11-01"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "c942c48eaafe1d9c5a5cdc7f7299336bd60e24f5"; - sha256 = "13rrqcxhif7990575vsccadzz011zjhy1qbwspyhisffz13isbcv"; + rev = "8b5acfbc79eea0bfe2c08ffeb8f137f13449ab56"; + sha256 = "18j7rdq32xmmdh2bazfyv1q0d37ravz8x9brm8v1z9gracbly43a"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -1279,36 +1363,36 @@ final: prev: cmp-fuzzy-buffer = buildVimPluginFrom2Nix { pname = "cmp-fuzzy-buffer"; - version = "2022-11-15"; + version = "2022-11-22"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-fuzzy-buffer"; - rev = "7fdc50bedc9fd0f3bc10a2110285e5715fe2de15"; - sha256 = "0dj07y6z6p20qw2kc2js8rxwrwb48jrzgxh6jqd2410h4gw4zndf"; + rev = "471949d19b1246f069eaf50729b39231eab3221b"; + sha256 = "1l10acnb8rxis7hs1a333b23cfcjllwzr98cn9xh18mrh77my7w5"; }; meta.homepage = "https://github.com/tzachar/cmp-fuzzy-buffer/"; }; cmp-fuzzy-path = buildVimPluginFrom2Nix { pname = "cmp-fuzzy-path"; - version = "2022-10-30"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-fuzzy-path"; - rev = "18ee8f81ab704f3f6656cfe52180dec6f7b497a7"; - sha256 = "15yivkvjsx3yfgf5i485q4kxmfmqghfqsi869wifff7v0x6y9ghk"; + rev = "28735cebc314f0b080a41350adae8612b6fc7814"; + sha256 = "0jwr9xb0axs1i3xk0z773jrp77jy1a274pwwd09lradm4rfa052q"; }; meta.homepage = "https://github.com/tzachar/cmp-fuzzy-path/"; }; cmp-git = buildVimPluginFrom2Nix { pname = "cmp-git"; - version = "2022-08-08"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "fae6cdb407ad6c63a0b1928670bad1a67a55b887"; - sha256 = "1iz6jkwk6fpn8vpqn8nvxrn35bbx6q2ssgycsrpny5293dkyiwgx"; + rev = "6bcb61c0a5ec2e0d522ece7c8fb3e009f1c79261"; + sha256 = "0n00apdpm920hjddmyhzynqxzdqz1scmqays9p4c4b6dq06jblbr"; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; }; @@ -1327,12 +1411,12 @@ final: prev: cmp-latex-symbols = buildVimPluginFrom2Nix { pname = "cmp-latex-symbols"; - version = "2022-06-17"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "kdheepak"; repo = "cmp-latex-symbols"; - rev = "46e7627afa8c8ff57158d1c29d721d8efebbc39f"; - sha256 = "10354d12in7sr5hdamj0cw8hgja6pwl70i9lcxlnha5jzkx8xm03"; + rev = "165fb66afdbd016eaa1570e41672c4c557b57124"; + sha256 = "19hrj03b1l6n981h0rjy6y98fach7hj64hh3l787w1wkhq3pirxj"; }; meta.homepage = "https://github.com/kdheepak/cmp-latex-symbols/"; }; @@ -1399,24 +1483,24 @@ final: prev: cmp-nvim-lsp-signature-help = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp-signature-help"; - version = "2022-10-14"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp-signature-help"; - rev = "d2768cb1b83de649d57d967085fe73c5e01f8fd7"; - sha256 = "13imcdv0yws084z2x2lmdj17zy4ngf126i7djknnwp2jfkca1120"; + rev = "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1"; + sha256 = "0bkviamzpkw6yv4cyqa9pqm1g2gsvzk87v8xc4574yf86jz5hg68"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/"; }; cmp-nvim-lua = buildVimPluginFrom2Nix { pname = "cmp-nvim-lua"; - version = "2021-10-11"; + version = "2023-01-05"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lua"; - rev = "d276254e7198ab7d00f117e88e223b4bd8c02d21"; - sha256 = "11mhpb2jdc7zq7yiwzkks844b7alrdd08h96r6y7p3cxjv1iy5gz"; + rev = "f3491638d123cfd2c8048aefaf66d246ff250ca6"; + sha256 = "0qydmgfgarf17hz10i6ffqvppmyrj3q1dm2awksk4l4y6z0cgg7w"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/"; }; @@ -1435,12 +1519,12 @@ final: prev: cmp-nvim-ultisnips = buildVimPluginFrom2Nix { pname = "cmp-nvim-ultisnips"; - version = "2022-04-22"; + version = "2023-01-12"; src = fetchFromGitHub { owner = "quangnguyen30192"; repo = "cmp-nvim-ultisnips"; - rev = "21f02b62deb409ce69928a23406076bd0043ddbc"; - sha256 = "0jil0i9g33i0h3ynng58qaam5k18sdlqdzrbyqgn4gjzchcxpfqv"; + rev = "43b69a235b2dc54db692049fe0d5cc60c6b58b4b"; + sha256 = "0h3xm2pclylvr923sw9g9jj6bh867n0f2c4a9ndg803wky0pxmh0"; }; meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/"; }; @@ -1531,12 +1615,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2022-11-13"; + version = "2022-12-27"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "0f56fc14792602da05ac17517c755bee9645a9a7"; - sha256 = "09c3jwrraq1m9yyiwsr1rh3a7ixilmx2v85nd1haaclb6dfd5x10"; + rev = "ee1341c53e7b82f55c6e83287828f652c2ac35e1"; + sha256 = "0x61dhbx1wvbnf1pjz1an3zhmp25xy07wshw8dw5yf46qi623l09"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -1603,12 +1687,12 @@ final: prev: cmp-vsnip = buildVimPluginFrom2Nix { pname = "cmp-vsnip"; - version = "2022-10-17"; + version = "2022-11-22"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-vsnip"; - rev = "1ae05c6c867d9ad44bce811056e861e0d5c531cb"; - sha256 = "1cqb21a180lvkprixibr1i42zxswxmzxa3zp6w8n262kfqgnl2v3"; + rev = "989a8a73c44e926199bfd05fa7a516d51f2d2752"; + sha256 = "1hs1gv7q0vfn82pwdwpy46nsi4n5z6yljnzl0rpvwfp8g79hssfs"; }; meta.homepage = "https://github.com/hrsh7th/cmp-vsnip/"; }; @@ -1663,24 +1747,24 @@ final: prev: coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2022-11-14"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "403e69ff873cf4447adad0477db7b7563813f13a"; - sha256 = "1njkvzy0q7r9ssq2994rc389isjwycs05lyxba5l9jsi7df7had9"; + rev = "5fae5a15497750483e21fc207aa6005f340f02f2"; + sha256 = "1r9jhdxm3y1lpdmwmlk48skihf7jxdm2sxirzyd1kwb88nvn4c3r"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2022-11-08"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "cdb82f176b13d4be5bed05c586ac1f141306a09a"; - sha256 = "1cfxzrir827wa3mnbg3gjv4n0afk220r0v55ajqqy8r5aycd68w7"; + rev = "80858aa01d57ed2f93c6bc388bad373810d41a21"; + sha256 = "0rcikmjdhcw39kngx93snpnn0sh780drqnn342gg9ifnysbva3d9"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1723,12 +1807,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-11-19"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "d227a0f0f15e1d9c7d3bb00628190ab153d13586"; - sha256 = "1zsy0i6i758g9bxjg6s0lf2zn7i42z0i7nk8fjs0vhn2wsi2nakz"; + rev = "bbaa1d5d1ff3cbd9d26bb37cfda1a990494c4043"; + sha256 = "116h45vnz98ni60i12f2z6rwz9gkpp1k4ysp1ry0qpjgmb5fcbsy"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1747,12 +1831,12 @@ final: prev: codi-vim = buildVimPluginFrom2Nix { pname = "codi.vim"; - version = "2022-08-16"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "metakirby5"; repo = "codi.vim"; - rev = "28983696f59f47221380b4f7d78237dc04f9c62f"; - sha256 = "11di3w5gvw6a0npjj6y4n7ajra0xzv20nmz7rvq4aw78cvgrxa6a"; + rev = "ab8c5faa867424c79a7d5d3a7f55d3a2528ee9b9"; + sha256 = "0d3rpj31wd5xzwcrnv7rwm54g81s3i4hxs7lcwph8k1j7pb8i1nl"; }; meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; @@ -1783,36 +1867,36 @@ final: prev: com-cloudedmountain-ide-neovim = buildVimPluginFrom2Nix { pname = "com.cloudedmountain.ide.neovim"; - version = "2022-05-19"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "Domeee"; repo = "com.cloudedmountain.ide.neovim"; - rev = "d5d6c5151e8643abfabd22e9fe7e31467c679be2"; - sha256 = "1h2379ibzadv7549i13zjzavya7n7q8z532awvwqdr8incja5b4c"; + rev = "d479b806f06cd6714e321cf88e94aae858e8274e"; + sha256 = "0nwp8drcy1bxd493gmi3bz41yw0avpvbfwx9dq03x9kxsjc81rsz"; }; meta.homepage = "https://github.com/Domeee/com.cloudedmountain.ide.neovim/"; }; command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2022-10-21"; + version = "2022-12-16"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "491ffa37ea7033850998d7f0ef04387c063ed2f6"; - sha256 = "19pdrway7zx0rd9w96i8dl84v5m2ac8ag1c0qg3dny9c6ain2bjv"; + rev = "23d2860931dcbcbdfb3543bed002e35d7b3b898b"; + sha256 = "0wqpyzggaxqplwi9w7ivndjkfisjv8f3lqw5dw7dps5zdk042svn"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-11-18"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "5f01c1a89adafc52bf34e3bf690f80d9d726715d"; - sha256 = "0qgb1vx5ipzcgglphhk9wck55hdscx6bdh4lr2y7f7wfxg54r3d6"; + rev = "eab2c83a0207369900e92783f56990808082eac2"; + sha256 = "0kin87qixkbib55763bd38xrbcgw4nx2rdklg3lmjgkd9w05jjzd"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1879,12 +1963,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2022-11-07"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "ab94958b819916a40770f9088db3a33336545dce"; - sha256 = "1pf26fw667rj5fzjrx3zkpz247i7y78wvrrl3b04jz581s4x5rrk"; + rev = "1528b525d17a98dfc6f7b07aa28672106df9cde7"; + sha256 = "1mv844ijirg9vv8klphrdka3qyji9hvgfqcwf2v2a3c4h2vd78rf"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -1963,12 +2047,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2022-10-08"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "839fe23a7746f03aa9ef1ebf087501cd6126cf0f"; - sha256 = "1009jc5zz20hfi8g7j4znnrwm6jdj6041a24i3ayklgl5dqw2519"; + rev = "d2e69a13b32e8574decfe81ea275292234eba6ea"; + sha256 = "0b1f0dx5xknm83b0ydq8ndf4207a5nqzvsbjzh4rngwxpc5kf5nc"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1997,38 +2081,62 @@ final: prev: meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; + copilot-cmp = buildVimPluginFrom2Nix { + pname = "copilot-cmp"; + version = "2023-01-07"; + src = fetchFromGitHub { + owner = "zbirenbaum"; + repo = "copilot-cmp"; + rev = "b732a58ac8b7287b981cd9f0d9c0f61e5e9d5760"; + sha256 = "0l05mrkc5v04nmrnazlqsb8p5ibv6p8lzy4ywvfrask14ajlfmz3"; + }; + meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/"; + }; + + copilot-lua = buildVimPluginFrom2Nix { + pname = "copilot.lua"; + version = "2023-02-02"; + src = fetchFromGitHub { + owner = "zbirenbaum"; + repo = "copilot.lua"; + rev = "a54e7b11a2c6efc9ddd3f42e56cf7d9eed1a9683"; + sha256 = "05bpgrq11zcp9flqp0gm0xjcaq622z46yjxlf6iliv8a4pmbrbgr"; + }; + meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; + }; + copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2022-11-09"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "5a411d19ce7334ab10ba12516743fc25dad363fa"; - sha256 = "1v72i3f1w7q481grffm2grb9m11qiazs85xq3j89yiqh6jvvpvzh"; + rev = "c7d166ebda265370f38cec374e33f02eeec2f857"; + sha256 = "1j2q62sac9gwcdzgc2cdxvvpxjgxi12sy33p49lk3gh5mlld53ij"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-11-19"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "3ba5d159c41915cb882781bd06f26f351338e54c"; - sha256 = "0kkkj677z3p89856hyhblx4zmzqyrllgfkv6glvj0cssyxs28h69"; + rev = "53513efa7cc878ae7929ec6a389028effa569441"; + sha256 = "0syix30ag4fda8hzpraijm0v6s64gr4vwz4i9c3lvcwssd4q6dfw"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-11-19"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "a6a52bc30497222e95f81b99df5bc4b999f75ba0"; - sha256 = "0swxylqp3bn7abxfqs66pnhidxqzbngl14cv2373603xmbflkfj2"; + rev = "5b9fb4da049d48a1e8872f92c180a3646f610a14"; + sha256 = "0bplxcdv3yxls893myc6a6kpq01wfypw2sgnd61pc8k78xkhmdps"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2047,12 +2155,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-11-19"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "07d1b5582e0b327becc9bfad7979699caf1da68a"; - sha256 = "109iddmkr5jw583jqs38vdskbsfm63ph489q6pyfvpf68a6jr1nc"; + rev = "67b7623184406dda85ae0ea678cb82a6f2a509d0"; + sha256 = "0gzna1qyialp6b4iap9jnfhf3w7anp7xlg6hdal2r0i60h9f0igm"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2083,12 +2191,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2022-11-17"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "e11e27864428a68b25e43b833e9081e350a38d96"; - sha256 = "15yma6waw0914i3z3ck50ndris4s7b9297lcjzsb7vxwkfnrkn9i"; + rev = "1bca9122ddc4bf4c6573402bf6686fc084470a7e"; + sha256 = "0isvyph3lpqpijxpfj5rjfh1w1mh3629jpyahy5sj2g8hn46mj08"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2119,12 +2227,12 @@ final: prev: csv-vim = buildVimPluginFrom2Nix { pname = "csv.vim"; - version = "2022-08-30"; + version = "2022-11-23"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "2fcac7660734223f6cc57a3c5ec5d87e5a52d2e2"; - sha256 = "0fwxfsfnmr6jh3w3hh1lw03zapgwcsn7y5kwlvd98273qa4m290k"; + rev = "fb159987bb430bb61e07928d132e4487e54a82ef"; + sha256 = "1c6fas33baabdfsm95icbi8n84ica2hysyvkprx4zpz5zn2b8rk5"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -2191,12 +2299,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2022-10-29"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "1aab263f4773106abecae06e684f762d20ef587e"; - sha256 = "1w7z01r7pakz6jxajp0j3b71dcl2k7sh6g8x07kb0z1ir1lcgfh6"; + rev = "5d7b14dfa88a32040647649b1e714051235bfd32"; + sha256 = "1iknwbwiq2rykf36vr3agdzlyb54mkppjywh4qdgqgach71016l3"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2287,12 +2395,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2022-07-26"; + version = "2022-11-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "6a5adf9a8860888076766c8a0d921236ff5deb0e"; - sha256 = "1b83s7nq4ymg3wjldfqq7in46hjylpschm1lqnfy91prg0r1djmp"; + rev = "3926c67752a14acecc293dedd1cbf9d9bfb68541"; + sha256 = "1l3xfxg9hzhvq9wi401dpfx58ajxd39f628kjca6id0rhziz8wmc"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -2409,12 +2517,12 @@ final: prev: deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2022-10-31"; + version = "2022-12-13"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-lsp"; - rev = "09a476e0301c7253e7cf459cea605878c51c370d"; - sha256 = "1px4wnnd3fg5ri5m57l57d296zks6xardyv6fwny22mnx6nfhngl"; + rev = "bc41a2f523909f852251e9d179bdf6433892bdda"; + sha256 = "061352gf9wv2bvf4bqn3pip0lwdxdv92m8i2y55wjrhfvmmq52xx"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; @@ -2565,28 +2673,40 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2022-10-22"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "9ba17c2ee636a8e7fdef5b69d6aac54dd26f4384"; - sha256 = "0c22dg8mscgv8kgxmynj0vagp2lrccp1mjv0ski3mr5d4gq83x9q"; + rev = "5020da900cc5dfd7067f181ee2ebd872ca7c84e8"; + sha256 = "0qxd2wn6q5v60ai222yjhzqkcb9v0dnlr4k2pvn9zqcwhj0qc2py"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2022-11-17"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "f32a7224096cca11c3c91b0dd412808e63f3d720"; - sha256 = "0a5dwjqnnpn05mvnz7khgy2mzqrxc0fbhm2iz8dwj5r4zjx1wg38"; + rev = "ab3757c1ea1b84ef59f7dda54f11d10022e0e3b7"; + sha256 = "1rbcf3llcq542533l0cxqf3bwnzk99x76k9yclfdy12zfdcjx4fv"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; + dirbuf-nvim = buildVimPluginFrom2Nix { + pname = "dirbuf.nvim"; + version = "2022-08-28"; + src = fetchFromGitHub { + owner = "elihunter173"; + repo = "dirbuf.nvim"; + rev = "ac7ad3c8e61630d15af1f6266441984f54f54fd2"; + sha256 = "09sbkgidj2fl7aj7kwzg37s5nynslbli9p3vwsh1yqxlag4lv6nz"; + }; + meta.homepage = "https://github.com/elihunter173/dirbuf.nvim/"; + }; + direnv-vim = buildVimPluginFrom2Nix { pname = "direnv.vim"; version = "2022-04-09"; @@ -2601,72 +2721,72 @@ final: prev: doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2022-11-16"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "2d1345239ae7327339bcbd645425ec993bc855d1"; - sha256 = "1p2vjxry2bf9avxnf3hfbvxz8h37gh9rsdw4km3v42aphk49lvr0"; + rev = "407c75de0049a184d6eb09ad415d2ccbc22ba612"; + sha256 = "1f38pgfwfa114f768f77fdy733nbn12ch33q7gskji28mwmdp8yy"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2022-11-10"; + version = "2023-01-19"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "fe57c180fd7fdea39bc0d85bac9252aa6a8645e8"; - sha256 = "1jac9pmg9sn28x62xx6n5brzycmgfsb825dfsh6mkny425705zsm"; + rev = "a0b129d7dea51b317fa8064f13b29f68004839c4"; + sha256 = "0q7ly95hp123z9z8qh4sih5a53dnbxv0jxa80b1s7d6h1wpr2w5j"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-11-18"; + version = "2022-12-13"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "7894d5bc504deacf37f0a479a53fa4746fe30a45"; - sha256 = "1jw8y86lq7k9d1ss4dg3ch1ij8c3b196g8giz881jipdkjy9q7w1"; + rev = "4436d6f41e2f6b8ada57588acd1a9f8b3d21453c"; + sha256 = "1iwxqfqp3x09wz3rnvli3y80n38rw149cmjj9pmbkhiqgsm9p461"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc.vim"; - version = "2022-06-04"; + version = "2022-11-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "945cdbbbd0e3c93d6514c0283425c32c35cddb17"; - sha256 = "0jqy96mc5kdgh7gxcxlgl94fvaxgazhkwkydki78vpgszvshrbry"; + rev = "8c7e99e825f9643627f169f3f45a43a3aae21901"; + sha256 = "0spgv2ml216s4zj5sgwny2l47jamh3gi86f4iy9p81gmfgvfpm1k"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-11-13"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "b0b61bc4b6c94ea487fee0e9e33725c45711e32f"; - sha256 = "1wpai52r4486fpz8ys5lv71sj2kmjhhn3knj01awrincgzkql7w1"; + rev = "c9a87dd0b7b5417c3797332ef06b17733626387f"; + sha256 = "1cjl5gyp2wibhb8d4rwsav62bs0x12n4xjrkmz189rc5dmh1yplw"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2022-11-12"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "30ddc057f71287c3ac2beca876e7ae6d5abe26a0"; - sha256 = "1pscf8a3fd79gzqm91gb22pmd44ijahyim9f8vq94c99silyvrjh"; + rev = "ee6e91ca09d59043d365bd96a32e989bd75abe84"; + sha256 = "068af4iznkvkafxnyj54clwalmzcywlfxphlzas4psg6qxzcdj13"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -2674,12 +2794,12 @@ final: prev: editorconfig-nvim = buildVimPluginFrom2Nix { pname = "editorconfig.nvim"; - version = "2022-11-19"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "gpanders"; repo = "editorconfig.nvim"; - rev = "2af880947129f1ab776b732a4eecb92528472ef5"; - sha256 = "1rv70658l6f047qyqyfb4fsgypzsf8bgl4h0wi1k29ac888qdkiw"; + rev = "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf"; + sha256 = "1rkkq11qwql4h7f3fa1pj7gmnwgx5wb9j9p1jrw62m6xhjs7n7m5"; }; meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; }; @@ -2735,12 +2855,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2022-11-13"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "03dec15a3b2c05758d8969ed1d736fb682dc88ee"; - sha256 = "09yrzs23p9g9cg4ycppaz1rqmhy5a2i8iwinb35i53f8z6qycl2w"; + rev = "aa97c07ee7b327120e467927c85a57ff1d713754"; + sha256 = "0pr4igijc9n8gwr64x4srgbwg21m6x0bkl2v00ps6iscblfmzzr3"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -2783,24 +2903,24 @@ final: prev: fcitx-vim = buildVimPluginFrom2Nix { pname = "fcitx.vim"; - version = "2022-11-15"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "lilydjwg"; repo = "fcitx.vim"; - rev = "dc95d0301b61a7db1f1badfe743fb627ea6e06d1"; - sha256 = "1z6n9ax8mnr9p1j64hrl463kqnaf7gc08975j5n7c77rrz23bd1q"; + rev = "92247352c6f05c8deebea2f50d8e842bfd91c294"; + sha256 = "01p7w8pc0d3crbksn5xwz4zcbnb7phjz5n6lk59v9b326sjm3rai"; }; meta.homepage = "https://github.com/lilydjwg/fcitx.vim/"; }; feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2022-11-16"; + version = "2022-12-22"; src = fetchFromGitHub { owner = "feline-nvim"; repo = "feline.nvim"; - rev = "6d4e3f934bffaa1893a690cd9b8f8b584ef0a7ea"; - sha256 = "10bwbw2fhmyhscm135jd4qc091xzqb155y2bbn7ms35jrwvaz0z4"; + rev = "d48b6f92c6ccdd6654c956f437be49ea160b5b0c"; + sha256 = "1d3sj499mj63djy2bjp7yx5qyrzsq8gphzy3wl9fnfnni1bzwg4g"; }; meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; }; @@ -2819,36 +2939,36 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-11-07"; + version = "2023-01-15"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "908a3db77d5a061d98a45c36f8483886a8868c90"; - sha256 = "0fbz3317bilp8iznrjm6vzqgby20fq11nha5c2wzps92f4bcyp96"; + rev = "4841c8830f0354808952fd4f64869383413c194f"; + sha256 = "0jmv0wqx0234dz0xlqjf1rhn7y4hnd4vxxqfr0f166nz678fld05"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2022-06-12"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "3d064304876941e4197db6b4264db6b72bd9f83d"; - sha256 = "1lkznmavw2f4ckh3yjjvdhja313ia0aayn5pkf6ygjny1089gcih"; + rev = "22cf052269b1143cd579b81c9390880ac712b67f"; + sha256 = "0pwwyf0fwwqaxa9sqm74aqy5r0wvyh24csg8mwp4cyhkdnk2w1rf"; }; meta.homepage = "https://github.com/wincent/ferret/"; }; fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-10-25"; + version = "2022-11-27"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "2cf9997d3bde2323a1a0934826ec553423005a26"; - sha256 = "04y9lm3cm4ik0hi5b95p1wch6l460wn29dxcrn9abqbsfzwnv3d7"; + rev = "44585a0c0085765195e6961c15529ba6c5a2a13b"; + sha256 = "112mjmy2nrqwj3l9dp3gzxsygaidcdrz2l6vzn27k1a57a7jyb8l"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2865,6 +2985,18 @@ final: prev: meta.homepage = "https://github.com/bogado/file-line/"; }; + firenvim = buildVimPluginFrom2Nix { + pname = "firenvim"; + version = "2023-01-31"; + src = fetchFromGitHub { + owner = "glacambre"; + repo = "firenvim"; + rev = "35b34ba566d9d9f6761cde3574f668d505c5137f"; + sha256 = "06lrhk7xladf9vf5d3qk06ffh4fw3s1wzpckwrk285lqz3mqc2gm"; + }; + meta.homepage = "https://github.com/glacambre/firenvim/"; + }; + flake8-vim = buildVimPluginFrom2Nix { pname = "flake8-vim"; version = "2020-10-20"; @@ -2928,24 +3060,24 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2022-11-17"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "b666a057108c7655882cbc64217222228aad68da"; - sha256 = "0m2zmpcnv3zbjq83v0qfbqa7wvmhdscrsyfs9kr0yq3rfb7bmpzz"; + rev = "f84836a906fac21e9fb096ce15478051cd7df589"; + sha256 = "1j725v2cf9k1dlxnpmzcz1ys7v9iyj0vyvjw9bkmjvy17hqcrxaw"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2022-11-08"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "804b96c0b7fea538af1a0a31daa2dabed0b16ad4"; - sha256 = "13wxjyzr1hq8iaa85yxqsa53ja4ccrq395q2gsk3g4vvjxcsw9wy"; + rev = "8a4c961330cc4688087f23d18fa7d2f1af9a4902"; + sha256 = "1s7ckv8xj8pjbl99niz3bb15ybhjvhqhs0vxj1a0vanfi8n4pjlb"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -2964,12 +3096,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-11-16"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "ef8caa5002e53977779ce8ab18a9c393ed624386"; - sha256 = "1kb3gh0qlbc75qkwy3ybhgsm9gcwbdba75ffhpcbifd6s6rdfj0n"; + rev = "a6f7a1609addb4e57daa6bedc300f77f8d225ab7"; + sha256 = "1rw4r8g4hblmlddbddd5skf5x8i4zaba8ncmzbr26svdmayk1c16"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3036,12 +3168,12 @@ final: prev: fzf-checkout-vim = buildVimPluginFrom2Nix { pname = "fzf-checkout.vim"; - version = "2021-06-25"; + version = "2022-12-27"; src = fetchFromGitHub { owner = "stsewd"; repo = "fzf-checkout.vim"; - rev = "4d5ecae74460de8fed4f743f6bd53c4c31d32797"; - sha256 = "0mia7p2z8l3lrid0v8ml4i8y190gh4ll9898yyg4gcghhxp83zpm"; + rev = "00d953bbe2fba8d816f61bfe675070d4505f7a4f"; + sha256 = "0c5k4l2glvs23z6f9pynsxjdc8ascbgngvrqncbnsp0djs8wgasj"; }; meta.homepage = "https://github.com/stsewd/fzf-checkout.vim/"; }; @@ -3060,36 +3192,36 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2022-07-16"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "f8988d7d738a0e9e7aba2f0a9512df6356bbda07"; - sha256 = "1bl8a3mnz9p9a03pqq3gdxpfxk8j3pjj8g4828nca3df72nk9vrn"; + rev = "16905056051759b15a388709a3fa65ff098eb243"; + sha256 = "1330a2ycs9bz0kkkygbsri5fh9grldzkg5fwahv30vf3nsybsrpc"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2022-11-10"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "0c6e614eeeb34ac9a7e1143861435609d1c65ba1"; - sha256 = "1mczan3wsdb5in33xdkz98x7s23pcw1r7403sd1mdahj72lqbslz"; + rev = "5ad5771eb77d233ec7a4352240d2780dde8034d1"; + sha256 = "0fkwsi9f2qymgavfpgxzrbga1z0z0024sri1wslsp66g1512x92f"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2022-09-22"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "9ceac718026fd39498d95ff04fa04d3e40c465d7"; - sha256 = "1zyypxi8kv3gcc8crwkd52c1nnp06yqdyz9ici02sq121lpdfklg"; + rev = "dc71692255b62d1f67dc55c8e51ab1aa467b1d46"; + sha256 = "0h8yq3rxm6dfryjlh57n13bylwg4f4c4skc9z0krgl200v39ard0"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -3120,24 +3252,24 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2022-07-13"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "3bc67579b990d53cdcf2ba9b016995b41d2b26a3"; - sha256 = "1przyjqp6pjgbmiwx378k5dx5p1j18c5f89zqjihr52q0p7x90f0"; + rev = "8abf42d2035374df1c87cb1b26039393c807ddd5"; + sha256 = "1vka4b9qs54wrs2wzk8msbpadc01wc5b1py0zng8hq67dplcg9yx"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2022-09-19"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "0e05a83f7683140038b1c5513938e1256f9b190e"; - sha256 = "04zn8a7b47z9vkg5acqv6my790d0f28gi94wwrxndm9c70fcw55l"; + rev = "41dd2cfd805478c5601df229549029b20f930381"; + sha256 = "1zwrh2wss3igx10bh85zh55hjahhn5nda2w8na8cz8qld0prpc3v"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -3168,12 +3300,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2022-11-05"; + version = "2023-01-14"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "d3afb1c57918720548effb42edec530232436378"; - sha256 = "1dwnkrp1h452129xsa1jszrw38as0czhiykf0fvqvfa5yhsq0aga"; + rev = "5ddf157139ecfc0d2161f00c2cce4874578dc355"; + sha256 = "0d4caahrnqgy06mvqvxhhcr2li2hvk44hwqvw9dkxh9g6hyfjj87"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3216,24 +3348,24 @@ final: prev: gitlinker-nvim = buildVimPluginFrom2Nix { pname = "gitlinker.nvim"; - version = "2022-09-26"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "ruifm"; repo = "gitlinker.nvim"; - rev = "c68d4873a14d2ae614875685ccca2e49472989e8"; - sha256 = "1lr55vn4mr9gdhr1zxihm98hjv1ypp47k5vhq5fkv14sd37hmwf8"; + rev = "cc59f732f3d043b626c8702cb725c82e54d35c25"; + sha256 = "000gg83j6fcx6iwp39m3dljfpg0f5vna8pkvwp1b13jf4hjyzcff"; }; meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-11-09"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "9ff7dfb051e5104088ff80556203634fc8f8546d"; - sha256 = "0cfssyyhcjndwr2xlk91rxzyir4ng5hk1f4fgij5hgrhhh3wgjdv"; + rev = "ec4742a7eebf68bec663041d359b95637242b5c3"; + sha256 = "18bwp15m2v4mrxp9i2vz061cfpv3ah08c8il3fx24aqhfbmaq6lz"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3250,6 +3382,18 @@ final: prev: meta.homepage = "https://github.com/gregsexton/gitv/"; }; + glance-nvim = buildVimPluginFrom2Nix { + pname = "glance.nvim"; + version = "2023-01-30"; + src = fetchFromGitHub { + owner = "DNLHC"; + repo = "glance.nvim"; + rev = "3b7fbbe4e785bedbdaa1a9573dcd800261a7e32b"; + sha256 = "09jcq6315njcw0khasnv41vi0lscbxk07cajzxqbm5pgjzww26fq"; + }; + meta.homepage = "https://github.com/DNLHC/glance.nvim/"; + }; + gleam-vim = buildVimPluginFrom2Nix { pname = "gleam.vim"; version = "2020-06-24"; @@ -3264,16 +3408,28 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2022-10-07"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "9038d7cdd76a930973b6158d800c8dbc02236a4b"; - sha256 = "0x49l7g84m1328fqad501f4iqqy3imbl8r8rh4rxsi1zam46f2ba"; + rev = "c87b1120b618577e64d910a7493a26829044a8a2"; + sha256 = "1i5d249jga0slnwnk6as1zqlc03x8nxd0vbrxr43qg6vw322sj7k"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; + godbolt-nvim = buildVimPluginFrom2Nix { + pname = "godbolt.nvim"; + version = "2023-01-02"; + src = fetchFromGitHub { + owner = "p00f"; + repo = "godbolt.nvim"; + rev = "a55d794e9faebfc09896bff3e9efd1156527f300"; + sha256 = "0cfwm1acj3ahk7kcrjwz7fqm7dqr13bgzkzybpkm4gncfzz3srph"; + }; + meta.homepage = "https://github.com/p00f/godbolt.nvim/"; + }; + golden-ratio = buildVimPluginFrom2Nix { pname = "golden-ratio"; version = "2022-06-28"; @@ -3300,12 +3456,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2022-10-22"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "778cf600684a87eb36f9bb469346cfa8d5384a76"; - sha256 = "1f4mxr73q1jgfrfir6ydmaa165fbhzmayxrl1srwx1n96ws5q4fg"; + rev = "54a5e18f6a42b39021b7aef62aae4dda8680d666"; + sha256 = "1bbrjmywbdggl4l7mzg7fahp86qwr0gi4nw2b8arpj2cr8r9hy9f"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -3336,12 +3492,12 @@ final: prev: graphviz-vim = buildVimPluginFrom2Nix { pname = "graphviz.vim"; - version = "2021-04-09"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "graphviz.vim"; - rev = "12b04c512694ace2fc15735676f5afdd05519466"; - sha256 = "1ky9rar3gxvsf0n3y71qfln4pxmz3hpq3dqimbf0r8l8q7sw483r"; + rev = "773d5a5d014af5ed19ec3f2c182c1a167ff958f2"; + sha256 = "1hhn96pm7vkxjridf0piqy400z79injvqw1hg943w0aa7pq2y46z"; }; meta.homepage = "https://github.com/liuchengxu/graphviz.vim/"; }; @@ -3360,36 +3516,36 @@ final: prev: gruvbox-flat-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-flat.nvim"; - version = "2022-10-17"; + version = "2022-12-20"; src = fetchFromGitHub { owner = "eddyekofo94"; repo = "gruvbox-flat.nvim"; - rev = "45d485921bc667956d843ee6777da7071ebca5d8"; - sha256 = "1bhyz70alv9mmm32xpa1aqjrnrczamwpjc7f27y1ia5h6wga8g5d"; + rev = "172269867994c0da7adcf02e89a068cda85eb805"; + sha256 = "10wamh4f8kkydgj0wckbaajzc1cyc04q9bidkz612vj14809dc6w"; }; meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/"; }; gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-11-13"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "66f66f64788f66c8101aa35344dd005143356b6b"; - sha256 = "1issvqjvqix7c5iwlyffl52qpiz2c997pddkrwy4rmd8d2n0yclh"; + rev = "13b7eb4589d9ab0f388ca51047051f7158c930e5"; + sha256 = "0mivkynl1xl40mk9ppiixk5mk8z70g30i7bm3lwpg02746vyp04v"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-11-14"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "5ac400bbd7bbe5d5911a79c45347df6d3afd388e"; - sha256 = "0r3bqlw9i1m1x5anmjcaxgx6iscd3347bc7yp47vg9bywwa4if5d"; + rev = "2e93ac50b3e95d650e62729f8810a005861e77ad"; + sha256 = "0ahgpgjazrwsvqpvsgbgwzhiglzb291d1ww20f8grakdhppvas3h"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3432,35 +3588,35 @@ final: prev: hare-vim = buildVimPluginFrom2Nix { pname = "hare.vim"; - version = "2022-10-10"; + version = "2023-01-30"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "267fb4dac4e8cd4df1d9b57fa587ce718f5fc256"; - sha256 = "1spl17vd8w5k5xgqvmr80fi5samzhxfcqnkmzpqjk2sf5z88k80k"; + rev = "92e8a80edc11ad5df6fdcfccee567515027682eb"; + sha256 = "10fl95n5c2yk8v00hr4r4zbbi4rrdhbz6jg7r86d8jw6qjxl6c1b"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; - version = "2022-10-06"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "4dfe94e633945c14ad0f03044f601b8e6a99c708"; - sha256 = "1jr4k56glyd98lk19dj9r7i8zx72hhzn5lz1w846ffvsci5ffw1g"; + rev = "8c0bb0a328e57278f4783bb0e2ea32f296d36db1"; + sha256 = "0w1v0r420m9aqkl4h4wjzhc7am8pf43pbv6g8mkf50x8mgxqyac6"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2022-11-19"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "146a4427391df19001cc1d9f9db8f7f31fbce2a9"; - sha256 = "1306hq56lqf7cid3dhfcdbsl6chxw0dxqi70d3z2ifzakyy8anfn"; + rev = "03dfa7fa3d08a34cdef09ca05a6da166a1ba22a2"; + sha256 = "166ar0qy3pl2jvw7y6im7v7gmrsji44ph1aahxqdpgbf170xx6pa"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3501,6 +3657,18 @@ final: prev: meta.homepage = "https://github.com/travitch/hasksyn/"; }; + heirline-nvim = buildVimPluginFrom2Nix { + pname = "heirline.nvim"; + version = "2023-01-30"; + src = fetchFromGitHub { + owner = "rebelot"; + repo = "heirline.nvim"; + rev = "81ceb3025e6c7030c42accc3951dad94f31ff0c8"; + sha256 = "0m8z7k0pw7vmwmw21lcil0iprdb9l9yfx4yjk05h65027j8xhk7c"; + }; + meta.homepage = "https://github.com/rebelot/heirline.nvim/"; + }; + hiPairs = buildVimPluginFrom2Nix { pname = "hiPairs"; version = "2020-12-10"; @@ -3574,24 +3742,36 @@ final: prev: hotpot-nvim = buildVimPluginFrom2Nix { pname = "hotpot.nvim"; - version = "2022-11-12"; + version = "2022-12-02"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "562e3e0e04c092c43a9cddffae4c9a748afb186f"; - sha256 = "0gvr9fwbc22m2rfwz3ficlrk5yk0q4zaaplma4l5zarrxswv9csb"; + rev = "1002bcdea7af06c5a7bfce0536d96bc4b03ab42e"; + sha256 = "0cbw07w65kmp1w2l2k4vbnv10vhpj30ija14mdn8mfbqwbp8pb2j"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; + html5-vim = buildVimPluginFrom2Nix { + pname = "html5.vim"; + version = "2020-08-22"; + src = fetchFromGitHub { + owner = "othree"; + repo = "html5.vim"; + rev = "7c9f6f38ce4f9d35db7eeedb764035b6b63922c6"; + sha256 = "1hgbvdpmn3yffk5ahz7hz36a7f5zjc1k3pan5ybgncmdq9f4rzq6"; + }; + meta.homepage = "https://github.com/othree/html5.vim/"; + }; + hydra-nvim = buildVimPluginFrom2Nix { pname = "hydra.nvim"; - version = "2022-11-19"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "anuvyklack"; repo = "hydra.nvim"; - rev = "96119af8ebaf0f55567108638c662784d612eb97"; - sha256 = "0zix3lw4sm1j386vrbjfcxnmyj61g0qlz8y260gxhsc3vd2f5jdj"; + rev = "d00274f05363c13f29ed1fa571026a066a634cce"; + sha256 = "1scf9pmwch081l2rvfm0np6cjd4kj3kzpzkjlbc7zjw4gbbrbr9s"; }; meta.homepage = "https://github.com/anuvyklack/hydra.nvim/"; }; @@ -3610,12 +3790,12 @@ final: prev: iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg.vim"; - version = "2022-11-15"; + version = "2022-11-23"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "a94c2a9110986cbc92d2c059ee65b52b70a4416d"; - sha256 = "1aiarshkw8cs3kjfdj3v30294i7dj1x7pmv9j83wnssj7i4y6kp5"; + rev = "e01ac08c2202e7544531f4d806f6893539da6471"; + sha256 = "19a0wk1qjp385jmd3kp3r5mkmly90j0jipz64zkbpdsh0v8fvsnk"; }; meta.homepage = "https://github.com/cocopon/iceberg.vim/"; }; @@ -3646,12 +3826,12 @@ final: prev: impatient-nvim = buildVimPluginFrom2Nix { pname = "impatient.nvim"; - version = "2022-11-12"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "lewis6991"; repo = "impatient.nvim"; - rev = "d3dd30ff0b811756e735eb9020609fa315bfbbcc"; - sha256 = "04wv6hzmdwcd563kl68n33yyyydhr0rdbjc93874dlh2nlfm7ixn"; + rev = "c90e273f7b8c50a02f956c24ce4804a47f18162e"; + sha256 = "1cd1l55lax3938ym0kpwz0gpzmfi8rxq8rgl3l8vhq9frlaqyn53"; }; meta.homepage = "https://github.com/lewis6991/impatient.nvim/"; }; @@ -3694,12 +3874,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2022-09-02"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "db7cbcb40cc00fc5d6074d7569fb37197705e7f6"; - sha256 = "1r9y6zqar0gv8kvqqxlh07ifa16h5yqa24fj22qw63vgnysbxqbp"; + rev = "8299fe7703dfff4b1752aeed271c3b95281a952d"; + sha256 = "1z2rnaa9p62yid89n9pni9jzzdlcdc55i95c67yn5qzxd3h637hi"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -3814,12 +3994,12 @@ final: prev: jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2022-04-08"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "e82d07faa17c3b3fe04b4fa6ab074e8e8601a596"; - sha256 = "1h5zdwfi584kgjh1mws240mgirf9ai0nrc0rx0zylvcdfk19l9v1"; + rev = "be483a2dcb63e992b02c5a0faff5d555720246fc"; + sha256 = "0ir2n9prdi50lvxrc23ya6pzmdp6fw1rdlls41zh0qbah0681yc3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -3851,12 +4031,12 @@ final: prev: jq-vim = buildVimPluginFrom2Nix { pname = "jq.vim"; - version = "2019-05-21"; + version = "2022-11-26"; src = fetchFromGitHub { owner = "vito-c"; repo = "jq.vim"; - rev = "6e056fa297ce58d45500b0937b8214400e9a50fa"; - sha256 = "0dfsym34xiza9221bdsr51jykcxmz8bnkzi846bqxxjxiw0p3yk1"; + rev = "6ff60efab7a15c60ff073c5bb7aec2858a0bafba"; + sha256 = "0fzzqixnzhv2k8dhznn9yzx6h4ivc960dbj7qlbp3czs9fvs8x76"; }; meta.homepage = "https://github.com/vito-c/jq.vim/"; }; @@ -3887,12 +4067,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-11-09"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "52cfa270317121672c1416c725361fa653684de0"; - sha256 = "10wz64aks52bmhxgg0hv84zmbqfbrh9sfjcsa8ygiq38fc568g1r"; + rev = "4c8d48726621a7f3998c7ed35b2c2535abc22def"; + sha256 = "0fq022r5wyvhrrmr6calw7bcz31hf30smz412y0g8g3bxildql3i"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -3911,24 +4091,24 @@ final: prev: kommentary = buildVimPluginFrom2Nix { pname = "kommentary"; - version = "2022-11-06"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "b3nj5m1n"; repo = "kommentary"; - rev = "981d56735ecc13e3c52b2d0cae269f5b9dcfe8ff"; - sha256 = "1pnxfarr1znv5zvy4pnapalyqg0pvnrrw5yk7ygyavfzzch1kzf0"; + rev = "3a80117148c6798972bb69414423311ab151d368"; + sha256 = "0d98hijynmdys7pyh9alk30lsp6ihsbbgzhi8gzjbms16fvgk29p"; }; meta.homepage = "https://github.com/b3nj5m1n/kommentary/"; }; kotlin-vim = buildVimPluginFrom2Nix { pname = "kotlin-vim"; - version = "2022-06-27"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "udalov"; repo = "kotlin-vim"; - rev = "1261f851e5fb2192b3a5e1691650597c71dfce2f"; - sha256 = "0ly58dcxgwyfv5wdbi5i4g187zv6gw3bzxck0402jwadvxnq7x6d"; + rev = "53fe045906df8eeb07cb77b078fc93acda6c90b8"; + sha256 = "1fpfbjrh7k0g9bwji3r5snpjfwg0as937xy7k6hdsvrifkd2fb0j"; }; meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; @@ -3981,6 +4161,18 @@ final: prev: meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; + lazy-nvim = buildVimPluginFrom2Nix { + pname = "lazy.nvim"; + version = "2023-02-01"; + src = fetchFromGitHub { + owner = "folke"; + repo = "lazy.nvim"; + rev = "3d2dcb2d5ef99106c5ff412da88c6f59a9f8a693"; + sha256 = "0gac6zw7zp53szjd8rfhb5ysgnhrsn01gb759pczmkayp2b2x4fd"; + }; + meta.homepage = "https://github.com/folke/lazy.nvim/"; + }; + lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit.nvim"; version = "2022-11-05"; @@ -3995,12 +4187,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-10-29"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "60d71f31b895cc1a1cb319f780df44de7664f0ee"; - sha256 = "1x1rdcxh2ga35x527f7csp0sfif7zrb8j4q1lsmvvzvi41y6rq70"; + rev = "f69875f98317c11fd48c4c4a8166a408244b7fe8"; + sha256 = "1xhmp3zbi65n6dv6vv2023zj83bxnfvzxzdi5s6rsm0ls8dq9084"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4031,24 +4223,24 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2022-11-19"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "cd90202232806ec2dab9c76c7287bd2190a17459"; - sha256 = "0fk686d4hs7ld4a85gfhqmd4nk9f951bjjhkknbkkq0rijdrpysa"; + rev = "6068651f7f2bdb379344de52b9833d82bce27cec"; + sha256 = "0skyq97hzslpx3w5y6ikcqbblzn1yqfwmk1wxrrmwayvyfcqqh9j"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2022-11-17"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "3b643d7bb4a521e0c9f0fcd00f299b1432441eb8"; - sha256 = "1mq7c382bzd8kwqlx2lljqkd96cr0yz9zha2zyg6vz4l60aa53h3"; + rev = "3008ed68c8f309ced07587684c8af53884791d35"; + sha256 = "113y46yf33ymb53wpqnc9glzv2m3lfsnxsmnxn3cpk016zy9fp3z"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4079,12 +4271,12 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima.vim"; - version = "2022-11-18"; + version = "2022-11-28"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "984ea9552fce06d24afee3d9051813a7433e1439"; - sha256 = "0nb2ik2dx0akilfdfff3sjk2pfbrscih5rrr0dy0kxk1c86fdpqx"; + rev = "36781e59099b9b46eed564283b95938f90cd852d"; + sha256 = "1p9x56iw26kkkv3dk6z8kf1bhsysr72gsc2x1ki2mhlf2i15axbn"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -4139,12 +4331,12 @@ final: prev: lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2022-09-06"; + version = "2022-12-17"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "8b6e29e65e9711b75df289879186ff3888feed00"; - sha256 = "0lmrqv20qxiiipljkybpv3m1jsskddks6h92i6hrfldvpn1a8vx3"; + rev = "c0199a7027da92d9770d1e2a9f4bf6257c7ec7ef"; + sha256 = "0q0s9gbakmlyd13mb33gq41brkf0qs2isjaz7fd5xpgakqsldl3b"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -4223,12 +4415,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2022-09-14"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "c1aeb96fae55bb6cac3d01ce5123a843d7235396"; - sha256 = "03fia0m7w2q20m9jvm4wdm6w5bfh976fm0d7h4n055hbqgy73qf9"; + rev = "3aa6c2029499625dc76911cb007e9cd370137f11"; + sha256 = "1pbpssf24zam4py6wg5k2m7hadivlsv25yvm4gxr0cnn79fv5cqp"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -4283,12 +4475,12 @@ final: prev: litee-nvim = buildVimPluginFrom2Nix { pname = "litee.nvim"; - version = "2022-10-15"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "c28f62b9eb78afc398e070b650c59e1fb8668b66"; - sha256 = "06mn4np083am7l3dspf7j8nfkin5k86pdg3gymyqzf6mj8vs90y8"; + rev = "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2"; + sha256 = "1kl3wb0p5dwdf543hzmai07myf9i28s36y11mlxw5j7hai1cabmq"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; @@ -4307,48 +4499,48 @@ final: prev: lsp-colors-nvim = buildVimPluginFrom2Nix { pname = "lsp-colors.nvim"; - version = "2022-09-05"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "lsp-colors.nvim"; - rev = "4e6da1984d23da88a947805866580c48fc3cc8d7"; - sha256 = "1mckrs0rfbrz86wrvachdklfcl0c55a8h7mp5jlk7nc9cbvn280m"; + rev = "d0b245232aeb197bbd097111d8b69621b0671edb"; + sha256 = "1nvspfsd3x3i5wv8y3a0kvnnl56wha038dblz2d8psrbkghr1fbh"; }; meta.homepage = "https://github.com/folke/lsp-colors.nvim/"; }; lsp-format-nvim = buildVimPluginFrom2Nix { pname = "lsp-format.nvim"; - version = "2022-09-05"; + version = "2022-11-25"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "lsp-format.nvim"; - rev = "b611bd6cea82ccc127cf8fd781a1cb784b0d6d3c"; - sha256 = "1sx09l5c8xi9n4nbnmwn7hx0wzsih3kdavgdygjckknjl1261bm1"; + rev = "ca0df5c8544e51517209ea7b86ecc522c98d4f0a"; + sha256 = "1c4hwd1v72scdwh5ydcqirx7m03ngsw3mxmjvd9cd3n3n7x8rrsi"; }; meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/"; }; lsp-inlayhints-nvim = buildVimPluginFrom2Nix { pname = "lsp-inlayhints.nvim"; - version = "2022-10-11"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "lvimuser"; repo = "lsp-inlayhints.nvim"; - rev = "439b4811276a149e3fccb226cc9a43ff2fb0e33b"; - sha256 = "08yhjc5zqvjv8m254d7vrhz3nhm8dr4xckhmd9q0sazp8pjd5b8h"; + rev = "84ca3abe8aaecbb5b30ad89e4701d4a9c821b72c"; + sha256 = "0fx0swsagjdng9m9x73wkfqnk464qk63q9wi32rhywllbm7gsflf"; }; meta.homepage = "https://github.com/lvimuser/lsp-inlayhints.nvim/"; }; lsp-overloads-nvim = buildVimPluginFrom2Nix { pname = "lsp-overloads.nvim"; - version = "2022-10-21"; + version = "2022-12-04"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "2d8671d6787045bed518dce9c2f82a0ece76ed66"; - sha256 = "1v873y2b52v2sa09ans6rs3f5kylb6izx2ffd9wpdg5y8i9s83s1"; + rev = "12f5468781d2d1d3feb6ad7459de764fc33898fe"; + sha256 = "1lxsg05qv87v2imhsfwa9mqfib4332cvhflivpzkamg1acs6bc9j"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -4377,6 +4569,18 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; + lsp-zero-nvim = buildVimPluginFrom2Nix { + pname = "lsp-zero.nvim"; + version = "2023-01-31"; + src = fetchFromGitHub { + owner = "VonHeikemen"; + repo = "lsp-zero.nvim"; + rev = "42bc5a1081666098a7154532e6ff5e3edc483b39"; + sha256 = "1y6jv9sldap59466v8jivbd5w6xs31anr8iqg3zyapdmr6pwflck"; + }; + meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; + }; + lsp_extensions-nvim = buildVimPluginFrom2Nix { pname = "lsp_extensions.nvim"; version = "2022-07-07"; @@ -4402,24 +4606,24 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-11-11"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "12c0807919ae60c7bdae8c0bd0072ee9d752fa1a"; - sha256 = "00y3hb0lzqg9xs5h5whkhdvj9r0qizm0mwfwl8lqbgqhcns5ggk9"; + rev = "6f6252f63b0baf0f2224c4caea33819a27f3f550"; + sha256 = "01913fb3g3f8291fw48a3rlsr4wkn6imljpk0h60vg65d2xc15l3"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; lspcontainers-nvim = buildVimPluginFrom2Nix { pname = "lspcontainers.nvim"; - version = "2022-10-23"; + version = "2022-11-21"; src = fetchFromGitHub { owner = "lspcontainers"; repo = "lspcontainers.nvim"; - rev = "648dfb56195b3d4450c3974ce86fb1f2ff8b55d5"; - sha256 = "1xrf4knmddf5mhinsfjwgcgi3h1lff19ck2ffih2868kmps771dl"; + rev = "b01e19356d4a407d5d45d8f26388d59276e84929"; + sha256 = "10pb1w8z3aiyzxlix9hlaw5fr4s2p8hbmfp41slc22hykmyky8nd"; }; meta.homepage = "https://github.com/lspcontainers/lspcontainers.nvim/"; }; @@ -4438,12 +4642,12 @@ final: prev: lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2022-08-20"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "kkharji"; repo = "lspsaga.nvim"; - rev = "9ec569a49aa7ff265764081acff9e5da839c13fe"; - sha256 = "1h4r63na7n18pnfbl0n3x7pkfm1pd01zz2h0py6pxd1az6il9dng"; + rev = "5faeec9f2508d2d49a66c0ac0d191096b4e3fa81"; + sha256 = "1bw71db69na2sriv9q167z9bgkir4nwny1bdfv9z606bmng4hhzc"; }; meta.homepage = "https://github.com/kkharji/lspsaga.nvim/"; }; @@ -4462,24 +4666,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-10-23"; + version = "2023-01-11"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "3325d5d43a7a2bc9baeef2b7e58e1d915278beaf"; - sha256 = "1kz3kzgz7hl27hvxqb9kdiw6y7gyc9qyd3qppm1bp3s4kxbp2fm6"; + rev = "0050b308552e45f7128f399886c86afefc3eb988"; + sha256 = "12c6f3xcj38zbiya3m4glwr5pkh0fq51gmch994i2mg5xy1ni3yw"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-11-17"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "59bb7ea0d26524cef0fce6dcf6192963ec232fdf"; - sha256 = "0lazbc8vrx17p4jc27agqqdzn4rik7r1k824s8yk8dr07134byh5"; + rev = "d404ec306bfa4cdb0c3605dbb17e8a93a9597337"; + sha256 = "1m6dmfplyln4xvc09srqxby93ksq1a62qai09j9msnd5pv4yqniy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4499,12 +4703,12 @@ final: prev: lush-nvim = buildNeovimPluginFrom2Nix { pname = "lush.nvim"; - version = "2022-11-09"; + version = "2023-01-02"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "979f4d206e7111c2b710aa85cc723f6140d2ec98"; - sha256 = "1xmndvhxjzb6lsfd0i7ifyqk0p37hyb9qy6l3aj75k7ifd4bsy2w"; + rev = "b1e8eb1da3fee95ef31515a73c9eff9bf251088d"; + sha256 = "0q3prq4fm9rpczl7b1lgqnhs0z5jgvpdy0cp45jfpw4bvcy6vkpq"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -4535,16 +4739,52 @@ final: prev: marks-nvim = buildVimPluginFrom2Nix { pname = "marks.nvim"; - version = "2022-07-31"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "chentoast"; repo = "marks.nvim"; - rev = "b27cbb78e9082229590b396d3ae4fe07f1aeafe0"; - sha256 = "02bhaal3lq0bly1rx2v8n14nibjnj2lsr0r2gx9xf740dchy1mjx"; + rev = "c3b18b97912720a6586fb537c5c0dfc9e06a68f1"; + sha256 = "1qgzvqzlnnb6axlcnyzw8lmafx8absv7dprqxkbgk5fkrdlcd9mm"; }; meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; + mason-lspconfig-nvim = buildVimPluginFrom2Nix { + pname = "mason-lspconfig.nvim"; + version = "2023-01-31"; + src = fetchFromGitHub { + owner = "williamboman"; + repo = "mason-lspconfig.nvim"; + rev = "53f3a8bdcb77d4a95b082fd57e12173f353c6c3e"; + sha256 = "0588rpf28fk922nmj44nl5m74a9762g2xx8y72b61k5iwpi2vp3h"; + }; + meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; + }; + + mason-tool-installer-nvim = buildVimPluginFrom2Nix { + pname = "mason-tool-installer.nvim"; + version = "2023-01-26"; + src = fetchFromGitHub { + owner = "WhoIsSethDaniel"; + repo = "mason-tool-installer.nvim"; + rev = "6ca38efeb0406dea8da6c97f61d6f6ef30ab0576"; + sha256 = "0a4h7hmm53qaydnqfrfp7yb4j157da0mvr0ivkm77f270rr2pwg0"; + }; + meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; + }; + + mason-nvim = buildVimPluginFrom2Nix { + pname = "mason.nvim"; + version = "2023-02-02"; + src = fetchFromGitHub { + owner = "williamboman"; + repo = "mason.nvim"; + rev = "24846a00941ec020c8addc7f52040a1b2fc12174"; + sha256 = "1civr6qrq7c0z50yx7y9ly6w76vv5a1h0iqa1rxw8spc7h66hdva"; + }; + meta.homepage = "https://github.com/williamboman/mason.nvim/"; + }; + matchit-zip = buildVimPluginFrom2Nix { pname = "matchit.zip"; version = "2010-10-18"; @@ -4559,24 +4799,24 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-11-16"; + version = "2023-01-13"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "36189183cee0c91fe6d9c68f6f9868418dda6c19"; - sha256 = "04yym03wainxxjy23z6hpg5p8hz2silg1s1kp70zndvwh8lvcxds"; + rev = "c5f6a24d526a8ddcd651c5d1291de89a51f923fa"; + sha256 = "1lwrxaaa11q9fwmiagy4zgx0chc69fdapqq5kw2nqc7f4wrqc6mm"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; material-vim = buildVimPluginFrom2Nix { pname = "material.vim"; - version = "2022-09-14"; + version = "2023-01-12"; src = fetchFromGitHub { owner = "kaicataldo"; repo = "material.vim"; - rev = "81d5d0bb30677b0846a2721a600f2f45db6d10a7"; - sha256 = "1j23wi0hh5h0pc0rk5dxvsc60k484h5haa2gfxzahjqd7kzil4y8"; + rev = "ec5a2cecee50ea2074e6f19bd1c98e7d868a52c7"; + sha256 = "08s8k9nwnmyqzlpvfz2pp1j8dhip1syhkilrrzbj723xknclxyzf"; }; meta.homepage = "https://github.com/kaicataldo/material.vim/"; }; @@ -4593,14 +4833,26 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/mayansmoke/"; }; + mediawiki-vim = buildVimPluginFrom2Nix { + pname = "mediawiki.vim"; + version = "2015-11-15"; + src = fetchFromGitHub { + owner = "chikamichi"; + repo = "mediawiki.vim"; + rev = "26e5737264354be41cb11d16d48132779795e168"; + sha256 = "1laiiww2lhn0v1039n0mx97fyyj7wdzwi0ybwl1ysdik03nxl32f"; + }; + meta.homepage = "https://github.com/chikamichi/mediawiki.vim/"; + }; + mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-11-15"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "dd0b7f85269d544aec6dee3bf48dc44ed284c462"; - sha256 = "1y28vqp5glvdypv8ghp9x6yg7mhf74711mas16n6abn1vaimmgsp"; + rev = "4f97a8771a480bcacf1d1d0dbf82e47f682aba2c"; + sha256 = "1pnivvwh9bfddmqvzgs4qsc3qy2m8j4zk31d5l6dgz8bfp45c7w1"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -4919,24 +5171,24 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2022-10-31"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "d43fa219390094ce2a8f5c929331f0a9e2f666d1"; - sha256 = "15ri234c2hfgmbd00l3yx4a3wb8nbz2x4fnk0m0s6jaw0njsas0h"; + rev = "6c581808ac3179ea0c640e43c77de48bbbec4fbc"; + sha256 = "0jad8phdvslv57mah0psp0xlvh116s2dwmh7v1g4kmk598j4ljm4"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2022-11-05"; + version = "2023-01-12"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "5c209e52681db48ca714817a4a907523ee98b377"; - sha256 = "135dkpklv1pndymkjnpnwr05cah9gm4ayhzxbchx6p11lzz70h63"; + rev = "8238865e1d9c61f1a260c290653f2c419503e0a9"; + sha256 = "18rndx83magknmjyihl02vjnqjra2x6y5d9wzz5qkhhacl8jhhbb"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -4953,6 +5205,18 @@ final: prev: meta.homepage = "https://github.com/Shougo/neocomplete.vim/"; }; + neoconf-nvim = buildVimPluginFrom2Nix { + pname = "neoconf.nvim"; + version = "2023-02-03"; + src = fetchFromGitHub { + owner = "folke"; + repo = "neoconf.nvim"; + rev = "a16d133b426fe5ddfd97d30e3658772d403847f3"; + sha256 = "03dbdllmvp68cfzf8m3sz8v9795h4mp28gd27bcvxyfjiif7r5lj"; + }; + meta.homepage = "https://github.com/folke/neoconf.nvim/"; + }; + neodark-vim = buildVimPluginFrom2Nix { pname = "neodark.vim"; version = "2022-11-13"; @@ -4967,36 +5231,36 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2022-11-18"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "071c8895bbff0e4d1d3d4c531adfe20e3a2a6e82"; - sha256 = "0qi0wl36m152ss2ca4hshyvf529xap19dhc0k5h98blq0h5ln0q9"; + rev = "d9a8d651501cd2f287742472af4b3103d991cd68"; + sha256 = "1pi2b2j647cwc58cp5iwgrrfls7lfwh7573r092k3c42i2x9k8cd"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2022-11-12"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "1f79f6e6b2a1e2b3ace87d4760769feb4146ff35"; - sha256 = "02vik8gfqncxjhr065sr9bw7fd9lhbwkjjkzn2j9p7y2gw0yjcis"; + rev = "2b956364bfd64cceecb12cf43dfe81d6b831fb35"; + sha256 = "1ycr3s1g00imih7g8gqvyzj9rg0dh1qwdvn78cwfn0hqm24ab8dc"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-11-12"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "c1a2a1aa5b4fd774dc26c53f7f256f1320c0ff15"; - sha256 = "0m8n27yb6m5ad3jhrflw0vd7kxjd4dr5liwvk9b8gz4fw598v2n5"; + rev = "089d388876a535032ac6a3f80e19420f09e4ddda"; + sha256 = "0h44l14frinh9mcbjps04d0s853pppw0qlwdjkdg5wrfnh975vya"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5039,36 +5303,36 @@ final: prev: neon = buildVimPluginFrom2Nix { pname = "neon"; - version = "2022-08-10"; + version = "2022-11-27"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "neon"; - rev = "c7834a5a8f58ef99200cafcf705d03edda26d220"; - sha256 = "0ngbwhfnpiz3dg97n1x1aiz2liph77n2x696f4brp9qy6qgh78v8"; + rev = "7765aaa7d1cd3804176140644640766e4411c766"; + sha256 = "1rdgbx76kvlzg81cn653bqg9lj52gxnf15zla1kscw7wgh6hjvyh"; }; meta.homepage = "https://github.com/rafamadriz/neon/"; }; neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-11-19"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "0b46a9ae7e40037fced280131bef7fdc25a2041d"; - sha256 = "1klw05m8wicq1jn5qscy74nl16h50hr9pk8b3wbpy77jh7a0g753"; + rev = "7cc4c95d685c96071f48d352b7378dfe8fcd24a1"; + sha256 = "0rhn1j9sx0wcp13fzlrsy39mvqb4djy29l18pyyig293gqbgjfd7"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; neoscroll-nvim = buildVimPluginFrom2Nix { pname = "neoscroll.nvim"; - version = "2022-07-11"; + version = "2023-01-15"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "54c5c419f6ee2b35557b3a6a7d631724234ba97a"; - sha256 = "09xlpdkbi0rpyh18f80w77454krx65kw463rs12241f5m0bax7xb"; + rev = "d7601c26c8a183fa8994ed339e70c2d841253e93"; + sha256 = "0ns9r2x82r2jwzmbv5jwk01a43d5qymhia9llmi9c30l6wnxg76g"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -5111,48 +5375,48 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2022-11-19"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "a11933e578e85dfd2defc4f83e0b83cf400e9e84"; - sha256 = "1b3kl97v9kvqbspk6pdv9fjzp5531a4bif14vjzp66ijsihg0az0"; + rev = "392808a91d6ee28d27cbfb93c9fd9781759b5d00"; + sha256 = "03s8kkj386i77vryss1br3033azmbjhf4wzaqnrm9238951hls5w"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2022-11-14"; + version = "2023-01-14"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "920a68bbb4eee1f923136c94ccb29981f6cd77e8"; - sha256 = "0np8hzqjcq2k42iiwbvql3mzgnha56war8sj79dgyr02mpf43436"; + rev = "0bf23c10e4e72c7f21a2bb4cb8d8a28ac93f6f5f"; + sha256 = "0gwwm402lgnnk4zcsydbfx9iw4sndmc1xg1yfsab04mna8560bg6"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-11-13"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "88f427fbdd9ba7fe2c60f7c6e6ba68834b39ccd1"; - sha256 = "0w44z219hns0kq98v236qbdc7021aj7k6bb2y76jn6pl83bgmbkj"; + rev = "ba749799e48a8c5065106989eb8bf9915b51081d"; + sha256 = "0xqdz4qb0sdb9g2hdgm5c2ry0m3ar78hyp0n93k92dwd1v575996"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; neovim-fuzzy = buildVimPluginFrom2Nix { pname = "neovim-fuzzy"; - version = "2021-07-02"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "cloudhead"; repo = "neovim-fuzzy"; - rev = "0bef4e1a81c65fc05d31380dd74454bd67733837"; - sha256 = "02a8ipk341bs6y8mk7nixdkbk1c4jdddsjp1qvqgyyca0shaqsz8"; + rev = "f6a1429bd0ac9953eb1d838ba800e69685fbcac1"; + sha256 = "0d2r8dx9sicf4fjf87ksclsvdvx2f7npjqpscyvycn04wrzvjsaq"; }; meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/"; }; @@ -5183,12 +5447,12 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2022-11-09"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "98cc4a2d64ca67cccbf5b5cf47c682ebadaaff58"; - sha256 = "0s8czq77lsf10b2fsw6mhavirc1ivby1a9c5y49zj9fva876h968"; + rev = "06f6166e5dfcf78eb0d055c21274cafc3927d461"; + sha256 = "0h340y2v4bb1wfqa8015skd7yb694iwqgq3v42mqpcsa3ssnvh70"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -5243,24 +5507,24 @@ final: prev: nginx-vim = buildVimPluginFrom2Nix { pname = "nginx.vim"; - version = "2021-10-03"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "chr4"; repo = "nginx.vim"; - rev = "ceeab164880ad90e73ab1be31dc3932777b9ef20"; - sha256 = "178rd4zi8lspsq7qy5ag5gnqr87hivv92pcgqszbriqkga30srpc"; + rev = "8a42e93c9f004fbc5b32bb2e4940107fb7b70a42"; + sha256 = "12dhzglvmpv1b0ynwig224dnilakqkwh4npidmgh5njy2rrqvy9m"; }; meta.homepage = "https://github.com/chr4/nginx.vim/"; }; nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-11-18"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "d9d2cda9ff999d3bf32164029c67444071323eb1"; - sha256 = "0mkfbafrsz6zy2zamg72figqxxy6w2iq24cj7h2qsz1crc81pi9r"; + rev = "aa793975d10dda69817190faea84e28eeb176934"; + sha256 = "15ml496n90dd80z4gm09562wzfv8npch3sz0kdv6hjkkgg04p3rw"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5277,14 +5541,38 @@ final: prev: meta.homepage = "https://github.com/zah/nim.vim/"; }; + nix-develop-nvim = buildVimPluginFrom2Nix { + pname = "nix-develop.nvim"; + version = "2023-01-11"; + src = fetchFromGitHub { + owner = "figsoda"; + repo = "nix-develop.nvim"; + rev = "ce61f6d964232c86b522c292667841f42ebee618"; + sha256 = "0yfs2iws6d370scq4jgc7gq3n5r3a0lwqfs7awcliks524768c6j"; + }; + meta.homepage = "https://github.com/figsoda/nix-develop.nvim/"; + }; + + nlsp-settings-nvim = buildVimPluginFrom2Nix { + pname = "nlsp-settings.nvim"; + version = "2023-02-03"; + src = fetchFromGitHub { + owner = "tamago324"; + repo = "nlsp-settings.nvim"; + rev = "dcd316d381c5768cd6a11d53a3331e92c3943f3b"; + sha256 = "06cd6hyckmp2jvrh8k2sp465yarkznk6adwh0lmd95i6wrb1zhky"; + }; + meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; + }; + nlua-nvim = buildVimPluginFrom2Nix { pname = "nlua.nvim"; - version = "2021-12-14"; + version = "2022-12-20"; src = fetchFromGitHub { owner = "tjdevries"; repo = "nlua.nvim"; - rev = "3603ee35ed928acd961847aeac30c92a3a048997"; - sha256 = "0bdpplmgn0cvlgw37jn8qhl91qx4sjsyl88r1qzp6c0gjn0qfwi6"; + rev = "01aa428ff00605d52d0c0ece560f6a6d7971726b"; + sha256 = "1v80qmhhqc1frpvnz42wa84qaz6xkasyrz59aisifp1vqcn01lgk"; }; meta.homepage = "https://github.com/tjdevries/nlua.nvim/"; }; @@ -5303,12 +5591,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2022-11-17"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "b10bbbb91215d0324d7d7f4cd0d8de3d1332648f"; - sha256 = "1yd8w7jfxyg8y8gw4sn96jnhisfvda9vs148cnszqms6n8244n4n"; + rev = "34f7cf628666c6eb0c93fbe8a0490e977ac78b7b"; + sha256 = "0nkk0zji3fdjzjhd5l2lmqb5208mkw08xkgvvxbddsjwgxx3jbg4"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5327,24 +5615,24 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-11-01"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "a6bb6a8b71fdd5329d0ae0fd637e700b12e4a5cb"; - sha256 = "0p1bdpi1h4nxrpkv90xqzhlbbgndy18xg64ws7izxqhkwjm5bv79"; + rev = "9824b8511dcb7d89de628d7e9bab5fa65c9d59d1"; + sha256 = "0y6paf8kyj30kkkwi9w2hank27b6f68l0swnly3w6abxfariwnpz"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; nordic-nvim = buildVimPluginFrom2Nix { pname = "nordic.nvim"; - version = "2022-11-05"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "cb2d7dff4e698cda93775ad61169b08c9461ca88"; - sha256 = "0ryp42mcvgknxj9yq0i314vx1ig1x88qjvi2ipb92l6mvwnaqps7"; + rev = "cd552784eeeae61644fec60f6cc52c267dbddc73"; + sha256 = "0pv3z3kz1v399q283fymz10rq46980a5z2nvhzrfg3i0ws4gpni0"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; @@ -5363,24 +5651,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-10-27"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "d12a6977846b2fa978bff89b439e509320854e10"; - sha256 = "1ghj8kjv2skh2hd9m6sghvj6pya8d9jvr5m9l9q1r0sg1i5x1kjy"; + rev = "d147222a1300901656f3ebd5b95f91732785a329"; + sha256 = "0p2sc3jnkvxax55acizjjna2rh9bnwfrm7z5apyasyzvlixgxxz2"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-11-10"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "07d4ed4c6b561914aafd787453a685598bec510f"; - sha256 = "1avfwys8lyd6fr2f7bfjr5nlvqw5bn5n5afs8j8j33r8ssi3g3na"; + rev = "8f5d730021497233c39d3adbf4b8043d4be163f8"; + sha256 = "0isrsbba9clpjjx5z37p4d0s8fasd7gxr1gxxjsvgkp2yn7blvi0"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5409,6 +5697,18 @@ final: prev: meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; + nvim-FeMaco-lua = buildVimPluginFrom2Nix { + pname = "nvim-FeMaco.lua"; + version = "2022-10-10"; + src = fetchFromGitHub { + owner = "AckslD"; + repo = "nvim-FeMaco.lua"; + rev = "469465fc1adf8bddc2c9bbe549d38304de95e9f7"; + sha256 = "1rv3ppjfndi27dbg7dsapxacbal1mj2a9dx2vq0yvi2v1gb97b3x"; + }; + meta.homepage = "https://github.com/AckslD/nvim-FeMaco.lua/"; + }; + nvim-ale-diagnostic = buildVimPluginFrom2Nix { pname = "nvim-ale-diagnostic"; version = "2021-11-06"; @@ -5423,48 +5723,48 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-10-27"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "6b6e35fc9aca1030a74cc022220bc22ea6c5daf4"; - sha256 = "1laskay0f6rf9283cgiv1db3ph4imzyfk10j0wn6f8zsm8n13m1v"; + rev = "5a3523ddb573804752de6c021c5cb82e267b79ca"; + sha256 = "1s17rmxgnadz6wbcd21x8504ra8crbxf27qjdxh6b4a1g0w75hy1"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2022-11-02"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "bd172d833538c48bd3d589fbc8bc2f3a395ecc7b"; - sha256 = "1h9d127s9w7qiq54596wsdgjbmhxvd7ik055n923wr4r84087vcn"; + rev = "a3e0146ba46a797a0118da0177cbec5e28722399"; + sha256 = "079f6dvdcl6zzdl8rgyxr7g8gla066w41ndmg2qakrbj5fap3fyn"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; nvim-biscuits = buildVimPluginFrom2Nix { pname = "nvim-biscuits"; - version = "2022-11-06"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "code-biscuits"; repo = "nvim-biscuits"; - rev = "5cfee78603bd4795e0709b8947e7ffaa2007cb1d"; - sha256 = "0qmkki3bpnk9rv90vaxyr8qi5y1lrd65x7fvk3h8bcyqnz7hhk28"; + rev = "25a880605fa4533b7075c54a0fdb5f0a25bc4f84"; + sha256 = "12lij0yv3n596yp2jbrdh17awrgvsm8gfyrafgvdzj4jibn16c68"; }; meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-11-18"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "324701806c681d43dc4d7a6a777037af4d5f5ce3"; - sha256 = "16kgzr0fzgl6mw11akzn6pg9sk1h8gvqh9rh9cvv4zh7g41nk77z"; + rev = "da1cd2557a16386829a213330e0fd46b61db7632"; + sha256 = "0ws45yilaq9kyssm5s1rj65k0xsiflg8fivjgggb3g3fvr6286p3"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -5495,36 +5795,36 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-11-18"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "8a9e8a89eec87f86b6245d77f313a040a94081c1"; - sha256 = "1gkm3pl06xvzxl5phk2g2hg8zqdpznn3jd5hjjspjfycgwscxbsx"; + rev = "cfafe0a1ca8933f7b7968a287d39904156f2c57d"; + sha256 = "1qgvlvjwah6581vppsb8racgkfjpjx2xqbk2ji1fmczc3rsk80h6"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; nvim-code-action-menu = buildVimPluginFrom2Nix { pname = "nvim-code-action-menu"; - version = "2022-10-07"; + version = "2022-12-20"; src = fetchFromGitHub { owner = "weilbith"; repo = "nvim-code-action-menu"; - rev = "58e12501ea028ff1171f8f06ea53891f7c6e1c3f"; - sha256 = "18vfrfkwr27jswflwrsppv17ylvi1l2rgxrv4p14cmyr03h8zx22"; + rev = "e4399dbaf6eabff998d3d5f1cbcd8d9933710027"; + sha256 = "01pbr8z8fn16vsdlsxrhd83rbx41pah477xr6p01lnmsqzwg3k7f"; }; meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; nvim-cokeline = buildVimPluginFrom2Nix { pname = "nvim-cokeline"; - version = "2022-09-11"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "noib3"; repo = "nvim-cokeline"; - rev = "501f93ec84af0d505d95d3827cad470b9c5e86dc"; - sha256 = "1vb6p497rwi6jmj08a3vpcxkc6c9qkblkv56gn1qgrdrx66gh0q5"; + rev = "dc72c4a8dcbcc4763e33899876512b15c2d2aa4e"; + sha256 = "0lqzzycim4g1x5715845mcp4rrabgpl37jk7mrhh2k4mciraxwmg"; }; meta.homepage = "https://github.com/noib3/nvim-cokeline/"; }; @@ -5603,60 +5903,60 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-11-05"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "61643680dcb771a29073cd432894e2f81a7c2ae3"; - sha256 = "0qcf6rsg610wcyz4663jjl0d6570pyxg66x6k01yyxbjsqv0jdzm"; + rev = "0e376f00e7fac143e29e1017d2ac2cc3df13d185"; + sha256 = "0xdbvbah2zxy27irc4dn9kz7ga5jv88d0z5vsbdgnqpnvv7gzc1c"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPluginFrom2Nix { pname = "nvim-dap-go"; - version = "2022-11-04"; + version = "2023-01-04"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "c75921726ccfe97070285f206de49eddff276ea5"; - sha256 = "1sgz5vkkw0zmpnmdfla2k3bvkax5pvn2y9g79xq3vhg9x6gyil5s"; + rev = "6f045a72a05a78e4071dd0880f08214a2bb1461b"; + sha256 = "153dxjwq93wg1079485hqpvq81mai1yzqjmc9qybda09zra5wlk9"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; nvim-dap-python = buildVimPluginFrom2Nix { pname = "nvim-dap-python"; - version = "2022-11-01"; + version = "2022-12-18"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "27a0eff2bd3114269bb010d895b179e667e712bd"; - sha256 = "1pypxg18qj74yjlfrr9wdd0w0hlh2mvd5xv381rhnzvb4h8hnp2j"; + rev = "d4400d075c21ed8fb8e8ac6a5ff56f58f6e93531"; + sha256 = "1glhxrv57gc3g60i876d5p3429z4kl6mhkbvrf41kvcqqb8m21m0"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-11-19"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "aec0163784ac3c6d25c3735fbabdd5b294f21670"; - sha256 = "1if4ccvc1v0ljh9y8ivjxjxa22rrsfzxjiwhims8yk36r4jc3drg"; + rev = "885e958ff9de30cfbc359259eccf28cc493ad46b"; + sha256 = "1j7nbrilk63vdmnr1dp3gdzhdpa2m001jzd6ch6i8j8dzjjnbyss"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2022-08-05"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "2971ce3e89b1711cc26e27f73d3f854b559a77d4"; - sha256 = "0hq6cmbl681x18s6c093dmwm9r9mzrx8icix304m9nm28d3l6179"; + rev = "7f7f2af549e72a0b7bddc3b4f827beb027ea8ce3"; + sha256 = "0ljipdw5cbcny6790r85hsfhnf0may6bamf27s3mzabrczayyd1w"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -5687,24 +5987,24 @@ final: prev: nvim-fzf-commands = buildVimPluginFrom2Nix { pname = "nvim-fzf-commands"; - version = "2022-03-31"; + version = "2022-12-20"; src = fetchFromGitHub { owner = "vijaymarupudi"; repo = "nvim-fzf-commands"; - rev = "015e77ea3185ca9175544e879e2cbb2cfb08323f"; - sha256 = "1w6s1kl83fyvwycym3i5azcx4q5ryzsjszh6wvk5pxqm2pmzs8lx"; + rev = "52f9450cd69f462aa1ecc5dc3e05ef3b77840e4f"; + sha256 = "03q1zzyarjirays1ih6d2d5jdy5hac7sglxa95n5hlrap3w9y859"; }; meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf-commands/"; }; nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2022-10-30"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "2ff5622755810e795b2ed33476ab7fbfab918d15"; - sha256 = "19qc0q70l7z3q3jgyk8z5y9j6jsh97x4gaxq940zqlhya5qs783g"; + rev = "9a6adc688bf9acf1628b014d2c7217443dd6fa6f"; + sha256 = "17rkx4bwr392minrp2db6s4rq3j4sz53mhcq8caz9cfmny2c3idr"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -5723,36 +6023,36 @@ final: prev: nvim-highlight-colors = buildVimPluginFrom2Nix { pname = "nvim-highlight-colors"; - version = "2022-09-28"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "5d20935b99d976ffa0d8226a78a8b2e091f0f699"; - sha256 = "0mqczqcrz2iz0k52k5bglad6rbsr8dddm5mvb1gsihbqp0ijyj85"; + rev = "af051bfe2971fc888d21cdfc59f5444904353b43"; + sha256 = "0xi4546f7qcdmyq04l1rjzyvw7rj9dlhmhskwk1pzq90rnd8xa5w"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2022-08-22"; + version = "2023-01-03"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "8895dc24c1590412bbb0ae6b06b53db99abe003d"; - sha256 = "1kd2glnihamfnqkn2qs25xxffj947l94xn302w3c7sr97cj1mm96"; + rev = "718f09fc3ee6381d881863a817e44935bf41b1ab"; + sha256 = "1i2s8a6bgvm65iynbhhbyii72sr0f4wsnpvpxxyh3fnr2vlf61wc"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-11-19"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "a48ddd710c6daf9a2e90646978c99e5db500dfd3"; - sha256 = "0lk3gc8kicrz6xs57mpy1znxwi6wlc7zm44cg8q0yz7ka0f4520v"; + rev = "5e3e9088fba7508cee3612ee50b14dfdd3ab19af"; + sha256 = "1ih4zkb025wvns0bgk3g9ps9krwj5jfzi49qqvg5v3v707ypq2kj"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -5771,12 +6071,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-11-01"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "7bc572fc357d7dec8d3ca620b53e763776472582"; - sha256 = "10rm01cxc1xnw7m886ssnmb5ihlsfjhp6sqm9dhmrkg4ywkbhj9m"; + rev = "1f640d14d17f20cfc63c1acc26a10f9466e66a75"; + sha256 = "1cfl5cjjfcijdsnbh1f23vp3msjlpkvr81am6lpkhx5as2dfws67"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -5795,12 +6095,12 @@ final: prev: nvim-lastplace = buildVimPluginFrom2Nix { pname = "nvim-lastplace"; - version = "2022-07-05"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "ethanholz"; repo = "nvim-lastplace"; - rev = "ecced899435c6bcdd81becb5efc6d5751d0dc4c8"; - sha256 = "030gc8q7xrkmqcsrx4h1issm4zjxxvypwawzq56kzm8x3d9bvbm0"; + rev = "65c5d6e2501a3af9c2cd15c6548e67fa035bf640"; + sha256 = "0klhy38a0x6g45z0k56gc48d1r4kqfq87yq4g8gr7fhy9fclmlza"; }; meta.homepage = "https://github.com/ethanholz/nvim-lastplace/"; }; @@ -5831,12 +6131,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-11-19"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "666ed80fcb78cf6355f3d5b7ebdbacef6465578c"; - sha256 = "1zncna7k5k3ifr24wfjzbsby1g79cyr718lkq1vfyz798f9pkk03"; + rev = "379be679d3c5f80964bc19131554b846dce5d34e"; + sha256 = "019wc4kxdyzpdbjazsy9ji1r0ymgbwx620ghvqw4wdvccyklg5if"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -5855,12 +6155,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-11-19"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "0fd98b0d01bfc5603e56a959acb8e875e4039ac7"; - sha256 = "0xikn3mf5k7m9f79lfk8llvpp5ry7nc4bbznbxd2d1hxjd2iz604"; + rev = "902d6aa31450d26e11bedcbef8af5b6fe2e1ffe8"; + sha256 = "1hmkm3znqm7c6fi0qai1i424qjm5b9dh9l0srzyy7cax3629yyfr"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5891,24 +6191,24 @@ final: prev: nvim-luapad = buildVimPluginFrom2Nix { pname = "nvim-luapad"; - version = "2022-10-26"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "rafcamlet"; repo = "nvim-luapad"; - rev = "6efe3806c6e0d9ae684d756d4d7053cbdfb562eb"; - sha256 = "0d0lcaxxqwg2cw8gx4zmddwvb49xxrvlc03ij68wwwmvjgvw2v01"; + rev = "a5b3d6aa1fe5fe75e6124927392a9d3a60a0ecce"; + sha256 = "05b2wnw9p5wpcc85fh40ddw90ls4k0mcmpa5rcadhy5c4xaf3q2h"; }; meta.homepage = "https://github.com/rafcamlet/nvim-luapad/"; }; nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-11-17"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "1071ddc47e9d9629ba754ffbf3cc11fa8be4218b"; - sha256 = "17wr3g4f4nk98jzp4g94l8nhksmwc32lc5v7bk56zn0933gr3m1v"; + rev = "0b9c5303b7402ae24971ed2f0e5890fd72505532"; + sha256 = "18r8vhflf9k8rmbw7czv2v7l46144nv7ia3sszhby8p1npd57ld7"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -5927,48 +6227,48 @@ final: prev: nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2022-11-18"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "40c0ab2640a0e17c4fad7e17f260414d18852ce6"; - sha256 = "194r8p8nljvh5jb8i860qp8kr4i16s5q84nc6phqjygwacsq69s8"; + rev = "11e08391eeed00effa85ca24ff9d1e0472cbcd6a"; + sha256 = "16nr10lyzq45hm49mh2y6xjk8f59bra1mzgybclz09l9aikzmkhq"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; nvim-neoclip-lua = buildVimPluginFrom2Nix { pname = "nvim-neoclip.lua"; - version = "2022-10-13"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "3e0b9a134838c7356d743f84a272c92410c47d8d"; - sha256 = "19xwirhaw8y9blll37xwk13cn74cw6cl1j76773nkxgx5m5cynpg"; + rev = "5b9286a40ea2020352280caeb713515badb03d99"; + sha256 = "182jzsgqvzhlpzadi6rpnh6j2fakvinbmwwzgfnn6jyxw2cglbv2"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; nvim-nonicons = buildVimPluginFrom2Nix { pname = "nvim-nonicons"; - version = "2021-12-06"; + version = "2022-12-22"; src = fetchFromGitHub { owner = "yamatsum"; repo = "nvim-nonicons"; - rev = "cdb104f58c46a62ff9f484f49f8660d46db6326f"; - sha256 = "0xqhcfp9qxnqn96ykycsyamwjjqrp7qfv7hshs9h4xa6c51yaqy4"; + rev = "68ecb6476f1b96d03c702dce6cf3ef1e5171c9a8"; + sha256 = "1vmzl5b3a07kh8b4wqqxd05sygvlyxq9vkrsshn2lrxmpbdg6227"; }; meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-11-10"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "43c54aec682854b39a7e0e89b4c3ba00426d74a8"; - sha256 = "0ga67fj7wf54mvrbsq423ccw3rvsgrd66dg0pq7cz7x9i7v5dz4d"; + rev = "bdd647f61a05c9b8a57c83b78341a0690e9c29d7"; + sha256 = "0fnn4jarxmp43jyk4j13wpk9zd7r7pjjmgqbr8brzfd3f9xabx6c"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -5987,48 +6287,48 @@ final: prev: nvim-rename-state = buildVimPluginFrom2Nix { pname = "nvim-rename-state"; - version = "2022-10-16"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "olrtg"; repo = "nvim-rename-state"; - rev = "43f2a8eb313eef767f1a28b69758cd86fc221e65"; - sha256 = "08q5q7l2l4jvw7yh4zddcczwndcajddbaj3zddwc04ykzlh2ks1f"; + rev = "8ba78ea517a605ea1a89bd1ed335886435010882"; + sha256 = "15n1xnip4dzil7fh50s2216wbryzv75jggmz4qabdfv0s6zz67n2"; }; meta.homepage = "https://github.com/olrtg/nvim-rename-state/"; }; nvim-scrollbar = buildVimPluginFrom2Nix { pname = "nvim-scrollbar"; - version = "2022-11-17"; + version = "2023-01-12"; src = fetchFromGitHub { owner = "petertriho"; repo = "nvim-scrollbar"; - rev = "dd0adc741c2b0a5cbd52e4888aa46e4ab3f53cb1"; - sha256 = "199833kqpyhvaa59306zv6qg2iq0jvhlxgdpx6v2mgqrzmg4iyrw"; + rev = "6a2065fbcd032075a06d2ab54508b69842bc4496"; + sha256 = "0i6kg4lw7v9fggi7j13lyb7ncchk1w10qdkzdgxn2cani2clwx9s"; }; meta.homepage = "https://github.com/petertriho/nvim-scrollbar/"; }; nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2022-11-18"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "b10165f3727f519566d69382c4a4830f16375910"; - sha256 = "0ha1hdrw5cakgxnp0n5dzn0w7kbyxfw0y396rndp70mcqanqg34r"; + rev = "c0699da2f00976943d39c7b32c015c768f68e74b"; + sha256 = "1pji89p1f49ag7n46iq3rsl9n8ssnw29d8m5p5b02sk3i8ppsnn3"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2022-11-17"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "a6a86665ba52d299b69259d7a020e5ee11fce31e"; - sha256 = "139gfsgpj22zf4dm60my82f4z5qsbhwwdpj0aqwj63chr3i0knpq"; + rev = "a5580956e2c1841a248fae6ba88e21f72df9f04d"; + sha256 = "1607d7igrhrzhfaypnf20awgi1l32w57i5g1jdz4d5dpch1wi6wn"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -6047,28 +6347,40 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2022-10-20"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "e27cf9f4506e39ba11a162c6c4aa8e5ff8f296f1"; - sha256 = "0f3sy23jac31fgrcbphhdkl6y8iwi79i9c8yi8gsz3m6a3czhkpw"; + rev = "17b7c84ea8884bfec8e71b8021e924cb3a39c180"; + sha256 = "1r6jran2nqyzjgxmwnykd53k38iz8pdc5x9ndcqd8w88ybg3bbpd"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2022-11-19"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "93380716d94e451c340e653ce09d73e9cabe54c6"; - sha256 = "0xzx9iwdyz95l9bxsbb74bc35bvp5va5855c56qvimc4bcflgp5a"; + rev = "ad56e6234bf42fb7f7e4dccc7752e25abd5ec80e"; + sha256 = "1fi5lk3iacjdbq1p4wm0bia93awwqfn7jiy019vpg4gngi41azrz"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; + nvim-teal-maker = buildVimPluginFrom2Nix { + pname = "nvim-teal-maker"; + version = "2022-04-09"; + src = fetchFromGitHub { + owner = "svermeulen"; + repo = "nvim-teal-maker"; + rev = "4d7ef05fa47de4bd9d02c4578d66b7cdc6848807"; + sha256 = "1axz6znqs9p9a9vzqwm0znp7parn6msl2vwrmg5q6javcvzldym4"; + }; + meta.homepage = "https://github.com/svermeulen/nvim-teal-maker/"; + }; + nvim-terminal-lua = buildVimPluginFrom2Nix { pname = "nvim-terminal.lua"; version = "2019-10-17"; @@ -6083,36 +6395,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-11-19"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "e38e061710c593d9b88c8ebb2c48f2842c89dc31"; - sha256 = "1i3lb7j3nwflidkxzxwpi78ha50qvy45lsb8i4rql1hlb7ya15sd"; + rev = "215b29bfad74518442621b9d0483a621483b066b"; + sha256 = "00rvb70s9wg9vqnsm6a63vakpjyznvpc4yplbmqjqa4dnfwp9kl2"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-11-19"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "24caa23402247cf03cfcdd54de8cdb8ed00690ba"; - sha256 = "0f10bcszvd3wj62mv198389gcd48glqy2vii7ddks17lccf3g8xm"; + rev = "0e6d4b4172f30c4aa44a9adc9ea5719723a1fac3"; + sha256 = "1n98salqvdh23yxkx1m490sf6hvjqjzpyxm459sk33znj2j7nzvv"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2022-10-25"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "0dd5eae6dbf226107da2c2041ffbb695d9e267c1"; - sha256 = "151lk77jwwm7jnx2x3s4jb214ldjzd5jdvqq35bw29cqczdqdwhp"; + rev = "cacee4828152dd3a83736169ae61bbcd29a3d213"; + sha256 = "0d9j5wz1fqk8ipf2x8vym0m3zpydslivwsnha8h1qz6yp6zyq5hc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -6143,12 +6455,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-11-19"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "1435ea532a3c9e6ea48ed3438fdf48bb37277578"; - sha256 = "1m3hfidjim2cy4x3np4rqcg67cq1kqz64yaqkcj7qlwlxd29gi6p"; + rev = "249d90a84df63f3ffff65fcc06a45d58415672de"; + sha256 = "01wm4gnwimsxgvdhjgn15d23nq6d1304jjvkr1wdjz7xk5g0xvaz"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6167,36 +6479,47 @@ final: prev: nvim-ts-context-commentstring = buildVimPluginFrom2Nix { pname = "nvim-ts-context-commentstring"; - version = "2022-10-29"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "32d9627123321db65a4f158b72b757bcaef1a3f4"; - sha256 = "176dqn0kxdcsjfxh3nhlkiwh7nrj9792rzbmmrkgghjjw87zrd4p"; + rev = "a0f89563ba36b3bacd62cf967b46beb4c2c29e52"; + sha256 = "0z91g5yn4i24myiv1dw0w28nd5j5vkgfp2jrn8wfkrrkmdmj6yqw"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-11-04"; + version = "2023-01-09"; src = fetchFromGitHub { - owner = "p00f"; + owner = "mrjones2014"; repo = "nvim-ts-rainbow"; - rev = "064fd6c0a15fae7f876c2c6dd4524ca3fad96750"; - sha256 = "1b7z8xyiplb9rjkdqwijnypjqrssrz5lr1wnl5vk1pyb6dnxspzg"; + rev = "aa83e4967bf78f85ffd9a11e159900c7ea7e423b"; + sha256 = "09x3bq4j9398avmzix78gm1qam0m34r9ifz7rb6l5rcqw7lhvr5q"; }; - meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; + meta.homepage = "https://github.com/mrjones2014/nvim-ts-rainbow/"; + }; + + nvim-ts-rainbow2 = buildVimPluginFrom2Nix { + pname = "nvim-ts-rainbow2"; + version = "2023-02-03"; + src = fetchgit { + url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; + rev = "b915c4d4926f723c0a424e1a639384018e7d9efc"; + sha256 = "0sllv769q0v73alcxs1r8dpij8kp9f771sq93z9c413c35wwmcnz"; + }; + meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2022-11-14"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "3b1b794bc17b7ac3df3ae471f1c18f18d1a0f958"; - sha256 = "1yxrv5kc5prfllgfcj2h8c8b74rydwdc8hm2fwbk1d0d9jcs66w7"; + rev = "a421d183ef37dfa13f51a5805bed2381aebf9080"; + sha256 = "0754m29aizcav7ynqflpbv3kzz2n7mw2xx8aliay3slzq18kix8d"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6239,12 +6562,12 @@ final: prev: nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev.nvim"; - version = "2022-11-10"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "5f4f2f294d45dbdf1936b81b9bcae97651f46fbd"; - sha256 = "0xzfjfs3z4v3w3hc7kvq33a8xyfxxha0x6vpgl4p7vh8rvxc5n8d"; + rev = "63eba53a0ed93c8495623aee194ee0d4d44162f0"; + sha256 = "00acn9iq7p00280ixwh9325wh6k4r8a1s84afwsz3a2yvsvyssrf"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; @@ -6275,24 +6598,37 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-10-18"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "b75630f93822a569f3fc2360bb2066ec1b205bd0"; - sha256 = "1wddcdgy8gs3449ww9kgh4kd5y3xwcsi6rm14z3wsqxc03m2ji7i"; + rev = "7900dc0cd37e7bb5d4175a37c9c4c3dfb94a1f7b"; + sha256 = "1197x2agkc5h97z1hi6pk72sbx397vccpc5xsxc9hrsq5llpx37n"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; + oil-nvim = buildVimPluginFrom2Nix { + pname = "oil.nvim"; + version = "2023-02-03"; + src = fetchFromGitHub { + owner = "stevearc"; + repo = "oil.nvim"; + rev = "7371dd220f1d08789cc225846d8cafed938777e9"; + sha256 = "0rcx62q9vrx0w6qgkpz39173r0fba6xk9ja212s93l3zwqp49wwb"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/stevearc/oil.nvim/"; + }; + omnisharp-extended-lsp-nvim = buildVimPluginFrom2Nix { pname = "omnisharp-extended-lsp.nvim"; - version = "2022-10-29"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "Hoffs"; repo = "omnisharp-extended-lsp.nvim"; - rev = "83be0f285afa360ca4a134820381e54b4b7aadd3"; - sha256 = "1hdsc68qzf4j83xah72yjan7mlsvdz7w310m1qw81yzd45z0scyd"; + rev = "55cb3d7310e07e38d0d420d195f353c51eb603fb"; + sha256 = "1wy2cpg4cb2f18751lxiy8lbhxmp17z9d01b7qwbz6pxyr4l6k2p"; }; meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/"; }; @@ -6311,12 +6647,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2022-10-28"; + version = "2023-01-19"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "cad3d983e57f467ba8e8252b0567e96dde9a8f0d"; - sha256 = "1jsj9a1ggii2zcjpi6wn6clzsj0vbl2frwqp0h259zlkvwrkx2ri"; + rev = "f0a70e0993acbb348c32a52a88058cc60c160992"; + sha256 = "0mscpy6949zvcwfdp18nn4bkzrp9r5iyw4h2v310p5mr8gd3fjpv"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -6335,12 +6671,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-11-19"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "6de1c32d7b654e20a184ef93aa26930e1b699142"; - sha256 = "0fs3dfm10ki5q358217jcglrz730v07lnpry2gwa0ghjk0k0ar81"; + rev = "64d5c6d75c9769f8edca674138cf63e71efcf65b"; + sha256 = "1zacxqgrmbpnmx7xp99b9g1s348874i5vmf4dj3f9hxzawlqq351"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6359,12 +6695,12 @@ final: prev: onenord-nvim = buildVimPluginFrom2Nix { pname = "onenord.nvim"; - version = "2022-11-06"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "0cd9f681bee019715bfbe928891579a3af3331e8"; - sha256 = "0rgmzi1ivh1xjjmsfdjwljvm175sr0pbmbf2gixqmi22dfkndcwq"; + rev = "09aab5d7ea230c9c4829e44698020b642e00d840"; + sha256 = "07hrppbj1njnjdyq4v6vxx3nfycr4dx45my23h0ix2kwqhw8f4ad"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -6395,16 +6731,28 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-11-18"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "b82cc5df76a766c0f585f4792db7339a73e25e77"; - sha256 = "16awk2x650aj56niwi9i87bwpqj572k1vzablchym0sbkaj3726a"; + rev = "7ddbdc0741fdc90f73faa17fb332bc8700acadbf"; + sha256 = "01pf6pi9mm88slf7667np60a7x9zk0rwxz40cyxrfc4d012ivs3a"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; + oxocarbon-nvim = buildVimPluginFrom2Nix { + pname = "oxocarbon.nvim"; + version = "2023-02-02"; + src = fetchFromGitHub { + owner = "nyoom-engineering"; + repo = "oxocarbon.nvim"; + rev = "f7b05feadc985f39639650067f1a333285cb4085"; + sha256 = "0pwk7g59cmfpnqvvflbxxknmy3hnp6g9rz5la1gs00n7391gmcqq"; + }; + meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; + }; + package-info-nvim = buildVimPluginFrom2Nix { pname = "package-info.nvim"; version = "2022-11-17"; @@ -6419,12 +6767,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2022-09-10"; + version = "2023-01-11"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "6afb67460283f0e990d35d229fd38fdc04063e0a"; - sha256 = "1wx7wm4c6i1qnvc08b0jzjfaf95cnnxrnkscggzs90w5ncdyy80a"; + rev = "1d0cf98a561f7fd654c970c49f917d74fafe1530"; + sha256 = "1nx3ip7pab0a2c4w3rwmpj8a1qizmpw06b11v6js3mbp4hb40230"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -6527,24 +6875,24 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2022-11-17"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "1290fdf6f2f0189eb3b4ce8073d3fda6a3658376"; - sha256 = "1yznmc5a32b4bw0c9q0jfkbd77xmi7rmihfr0f44bcgqdxlp8151"; + rev = "c481c660fa903a0e295902b1765ecfbd6e76a556"; + sha256 = "0d30s2rnjdizy8mibxl7pw99ij8209k09myv03d2sqnzapgx28ib"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildNeovimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-10-01"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "4b7e52044bbb84242158d977a50c4cbcd85070c7"; - sha256 = "11815h0h2mf5ym282ghk7xav90635r88qbgaflpgbyk2banl31wl"; + rev = "9a0d3bf7b832818c042aaf30f692b081ddd58bd9"; + sha256 = "1xy4hs0pckzbxd249zwg2r0vi94fy9arb966nypw1dx4vxw8072z"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -6588,12 +6936,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence.nvim"; - version = "2022-11-17"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "c1c54758824cbecd4e18065d37191f7666fdd097"; - sha256 = "0j23gdp29xb1rfb7crr5s1xs61wjzrsxwdpv01s79cjnwcvxzgxz"; + rev = "87c857a56b7703f976d3a5ef15967d80508df6e6"; + sha256 = "06cql88anhwnwxmssgbzaxwnx9d88mp04rjbh7cgrzr7pff2x6v6"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -6648,24 +6996,24 @@ final: prev: purescript-vim = buildVimPluginFrom2Nix { pname = "purescript-vim"; - version = "2022-06-15"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "purescript-contrib"; repo = "purescript-vim"; - rev = "af5fae0b43241e9fc3e0442782272728844bec3f"; - sha256 = "05v81i4ialja4wq3rp1fy09zjh7rvwb6pjhig7zg9pfddd015pki"; + rev = "7af25a840d38dc6767c85edd1f35c1f835618071"; + sha256 = "1aw0bd0cx76ldm5nx17lqsxshlaiw8v9j0rwf1mlbz5k40c5v2w9"; }; meta.homepage = "https://github.com/purescript-contrib/purescript-vim/"; }; python-mode = buildVimPluginFrom2Nix { pname = "python-mode"; - version = "2022-01-28"; + version = "2022-11-25"; src = fetchFromGitHub { owner = "python-mode"; repo = "python-mode"; - rev = "85d2cd1a196ac1def79d4599b5be69395ed5b603"; - sha256 = "0jk8pssliyar4qs42x9m1jgri446cr4yc7iv8l9wc9xn6r3qnm29"; + rev = "149ccf7c5be0753f5e9872c023ab2eeec3442105"; + sha256 = "1l577vb781fqsnin44r5ny0zd5mac9yxbg65fyxcr0x9x7iw97x2"; fetchSubmodules = true; }; meta.homepage = "https://github.com/python-mode/python-mode/"; @@ -6809,7 +7157,7 @@ final: prev: src = fetchFromGitHub { owner = "ryvnf"; repo = "readline.vim"; - rev = "b5eff41db2803b6f5a264cc71867e8498e7318d1"; + rev = "1213ebcf558b4ee2e9df2c761cc01cc076fc764f"; sha256 = "03sn2rpadd746ax5ynidi8msp90phzb3a82w523q8b07kn32dgdw"; }; meta.homepage = "https://github.com/ryvnf/readline.vim/"; @@ -6817,24 +7165,24 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-09-03"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "c9ca8e3bbf7218101f16e6a03b15bf72b99b2cae"; - sha256 = "10b7235ia2klad1vdriw24g4vvjb8lcbw8z878h5hd1q9nryn7bs"; + rev = "57c32c6b7a211e5a3a5e4ddc4ad2033daff5cf9a"; + sha256 = "0w4gw09b94dhxbbkyl0zhwxl5m370qp8la6frbjcan06bqh85xcv"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-11-10"; + version = "2022-12-15"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "2c4f82a8a68b7d3cee7bd345669f2f50bdc6f889"; - sha256 = "1g6jnql1jrdkw6ckb6q1fivcxjkksdqpcy8najxmmw9lv4sksh4k"; + rev = "667ae447d2c7efb64461a2c58f5311d1248cdb5f"; + sha256 = "0j2mp8kan6gf1ynv90pkwghjpsqzhxdfxs1v0kh55vmld2r31r56"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -6853,12 +7201,12 @@ final: prev: rest-nvim = buildNeovimPluginFrom2Nix { pname = "rest.nvim"; - version = "2022-11-16"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "2e368cd681379f014906ad0268111eb5c95f9aa6"; - sha256 = "0hxabk1c6fn9yrvdsm00frws1m858finl9ai7rgj2s56056zx9p4"; + rev = "0fdb69f328529b34a2279c14be63b3325dc52740"; + sha256 = "0dn9g6a3lidavw381cd9ckhw3biiq81vypgg4bl5yl6w4avp5nr0"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -6877,12 +7225,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2022-11-09"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "e9af3795f4233b3273e4b7e9d6bb7d7c8e191412"; - sha256 = "1dv9rnqpjmsfmsxzjshiqdx4kgnh341b9kypb7j0dn65gj2narsq"; + rev = "40b4e0be0231eabc7406168b432d507c6b6332f9"; + sha256 = "1wap2hazm84yzd1x6in6mnglnx67xbavg17k5fqd117biyw8i5ir"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -6937,23 +7285,23 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2022-11-06"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "99fd1238c6068d0637df30b6cee9a264334015e9"; - sha256 = "0y95kj77p4zjskn6j7bp04scrlgg5l8827zc3m6f18cgcy1qnngf"; + rev = "b297167d9e01accc9b9afe872ce91e791df2dde0"; + sha256 = "1fwjykp6gaafniflb3816z2nkfkpwa9pkxdcs6l2ka06ngr3xdih"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; rust-vim = buildVimPluginFrom2Nix { pname = "rust.vim"; - version = "2022-09-28"; + version = "2022-11-27"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "1cdc5cb4bd061bc30b502e07321682b5a4396dca"; + rev = "889b9a7515db477f4cb6808bef1769e53493c578"; sha256 = "1xklq4g6dvqd3a5msnrir899hzqmjkscpb8bq9wd4fi3ivmjjjgg"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; @@ -6985,12 +7333,12 @@ final: prev: satellite-nvim = buildVimPluginFrom2Nix { pname = "satellite.nvim"; - version = "2022-11-12"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "024920b94611684840731ea79f5a9c6a687683e8"; - sha256 = "0nmzabqmfmkx7j7fn9m20vpqmd2bkdw0zk94k44w4dx467zl757y"; + rev = "d522369aa50cf8c0116c952ddc55253c505e8bf7"; + sha256 = "1sbq1akv33sj3apqyw8sc7zpw36cyxk8m1inhmwdwgampzhl9sxc"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; @@ -7081,16 +7429,28 @@ final: prev: seoul256-vim = buildVimPluginFrom2Nix { pname = "seoul256.vim"; - version = "2022-08-18"; + version = "2023-01-05"; src = fetchFromGitHub { owner = "junegunn"; repo = "seoul256.vim"; - rev = "1c48e3e1e3f3521920788d90a83819cff14eadc9"; - sha256 = "092szdfi1nmap52i7pcm51k2ymqj0hd4kii66pgaqsskslnc03gk"; + rev = "8f81a2f9f7ced9f8edea7f8a06caf5eaa9d9a217"; + sha256 = "0vjdmiapz4mx9c2hg39hs45k9zwj5zk8cl757dfwbj6y5fqkznv6"; }; meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; + sg-nvim = buildVimPluginFrom2Nix { + pname = "sg.nvim"; + version = "2023-01-30"; + src = fetchFromGitHub { + owner = "tjdevries"; + repo = "sg.nvim"; + rev = "c5e4ab788efeec9453706a4489bcaeaa867aeeb3"; + sha256 = "1yd006gykkxddr57mc0mpfqc817akaaaj2cabih9gbdsm7qy131p"; + }; + meta.homepage = "https://github.com/tjdevries/sg.nvim/"; + }; + shabadou-vim = buildVimPluginFrom2Nix { pname = "shabadou.vim"; version = "2016-07-19"; @@ -7105,12 +7465,12 @@ final: prev: sideways-vim = buildVimPluginFrom2Nix { pname = "sideways.vim"; - version = "2022-02-12"; + version = "2023-01-17"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "ab20cc8a6a7cb95679f99bc4ec724544f9b94c62"; - sha256 = "01slcxzw485ik7mszj97x67576yw1l7i6imv3rfdn3cv7d216rj8"; + rev = "e683ed0fc57eda718c6b28dce0ff5190089d13d3"; + sha256 = "09d34043bn9n89f2gg5y9whiza0rh6rf63qspl0r9bgiygl534b1"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -7152,6 +7512,18 @@ final: prev: meta.homepage = "https://github.com/kovisoft/slimv/"; }; + smart-splits-nvim = buildVimPluginFrom2Nix { + pname = "smart-splits.nvim"; + version = "2022-12-21"; + src = fetchFromGitHub { + owner = "mrjones2014"; + repo = "smart-splits.nvim"; + rev = "fdd158ce7554dc830fb86e0fe952cd9476cdf726"; + sha256 = "17xjcfjfzmy4crs6ks8drdjcygdnri776gf3vmnssjyvmzab3mdl"; + }; + meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; + }; + smartpairs-vim = buildVimPluginFrom2Nix { pname = "smartpairs.vim"; version = "2018-01-01"; @@ -7188,14 +7560,26 @@ final: prev: meta.homepage = "https://github.com/norcalli/snippets.nvim/"; }; + solarized-nvim = buildVimPluginFrom2Nix { + pname = "solarized.nvim"; + version = "2022-12-02"; + src = fetchFromGitHub { + owner = "shaunsingh"; + repo = "solarized.nvim"; + rev = "36615f1e4d16b87def801a75132f4aab5944e9fc"; + sha256 = "1nn12zpsgiq9idsa93s04m8l2mpb2aq7f7n11cs2yhv2kbb9krlf"; + }; + meta.homepage = "https://github.com/shaunsingh/solarized.nvim/"; + }; + sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-11-13"; + version = "2023-01-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "d58ed627c7569cca7d8ea326cce79123cbb94620"; - sha256 = "0b6v3ysv0dqir7f7l5l7mzxclqrmq72jbi9c502p3kf4arpvilg2"; + rev = "c55985d5df53751a44fc532a53bed3be9f3b0d14"; + sha256 = "0jmwsdpmj01g78gkv4cc7l5fxxhxrzlx2lkwmj5r9klkx07fpsrg"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -7323,24 +7707,24 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2022-11-18"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "kkharji"; repo = "sqlite.lua"; - rev = "53cac3fdb5f5e4e63e243232b6eccf3c764ae18a"; - sha256 = "0qp3b6jd6khp8wmc4s8n6sc518p6m44l7f7ln8pr91jz6qh5z30p"; + rev = "93ff5824682ecc874200e338fd8ca9ccd08508f8"; + sha256 = "07wv8shiilibgnp7l0pk9b6qwydwwfvdzdv2vvwn0k0jpaxsjvmy"; }; meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2022-11-02"; + version = "2022-12-20"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "cdb0bc36fda80eb58d38ecddfb1c7b2fab3a4d53"; - sha256 = "0x055kynvxym614vzxi1vv2zcndfadzjhwk92f4h6z5zvld7fpxj"; + rev = "91958b5bcac9dd78d6c66fc75816464fac29e27c"; + sha256 = "18wp8kj8wj2w3x3qk1jlz0hsniw7jn9igps0rcgcfr6122qggh11"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -7357,6 +7741,18 @@ final: prev: meta.homepage = "https://github.com/chr4/sslsecure.vim/"; }; + ssr-nvim = buildVimPluginFrom2Nix { + pname = "ssr.nvim"; + version = "2022-12-27"; + src = fetchFromGitHub { + owner = "cshuaimin"; + repo = "ssr.nvim"; + rev = "e6a11a702483d26f767f937575d549ac73b2fea3"; + sha256 = "0f8674wisl5l7xwglk6zw956yd0s9ml20dwfvxmvslz0c1an8q0c"; + }; + meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; + }; + stabilize-nvim = buildVimPluginFrom2Nix { pname = "stabilize.nvim"; version = "2022-10-06"; @@ -7419,12 +7815,12 @@ final: prev: suda-vim = buildVimPluginFrom2Nix { pname = "suda.vim"; - version = "2022-10-19"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "suda.vim"; - rev = "2fc45dc4bcafb245b613ebd6847a244924735cc6"; - sha256 = "1k8cx22p2xb1bvnz5zcwrxd8qnhdcwlrs9xqhjry5y4jpb16hdzc"; + rev = "08abd39dfe1cee681b8ce3e7321da5fa03e045c1"; + sha256 = "0sivx4smg6d02dd16d9aa4v652vl90lpkbpz69kpi5llii6kb1xf"; }; meta.homepage = "https://github.com/lambdalisue/suda.vim/"; }; @@ -7467,12 +7863,12 @@ final: prev: swayconfig-vim = buildVimPluginFrom2Nix { pname = "swayconfig.vim"; - version = "2022-10-05"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "jamespeapen"; repo = "swayconfig.vim"; - rev = "30014a34d0ab46f26311f47c1c11ba0b9166f1d5"; - sha256 = "03jw3w80zgmql8ngs8s1j8digwkn7206psklmcnmc1p2drb2d3pf"; + rev = "ce04a8e8c494590382d1b32a20ed3b451d608623"; + sha256 = "0lirihvrx0qn59nbg5s3sh1jgv0v3q4ag7kgvc3r7q9a2fbjg46y"; }; meta.homepage = "https://github.com/jamespeapen/swayconfig.vim/"; }; @@ -7491,12 +7887,12 @@ final: prev: switch-vim = buildVimPluginFrom2Nix { pname = "switch.vim"; - version = "2021-09-29"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "switch.vim"; - rev = "900c5d3ee79b1771c5e07bf7290068ea35881756"; - sha256 = "0fqvwlf01v7bpsmb3ssqw1kbpvfrk7qvrwxsy4y1bnm60kvnqb7a"; + rev = "41fec8581f4816291481ab6c6e0516bf904d4a7a"; + sha256 = "0gxipkigllr82gadgnhlhj4kk47131ykqac26zp6yxamgrnx43sq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/switch.vim/"; @@ -7504,12 +7900,12 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline.nvim"; - version = "2022-08-29"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "6a3ed24c5631da7a5d418bced57c16b32af7747c"; - sha256 = "0x4jq7z54nj7p4abnaqc2cnldyi7rcl5r444n9jc82i5pmg6ck27"; + rev = "512791925d57a61c545bc303356e8a8f7869763c"; + sha256 = "11c5gr117cad9zw5c8msh7xrk1n02kmyb52vwbrzd0vd0kzy52ia"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -7528,12 +7924,12 @@ final: prev: tabby-nvim = buildVimPluginFrom2Nix { pname = "tabby.nvim"; - version = "2022-11-02"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "1718f42d4044ce612091fd7a7bff0dc7313ff5b8"; - sha256 = "01p7fkhflv23slsr54j7b4cvz0bl2nwn6x0zq1c373cjq3zq2x5a"; + rev = "9065c65138b59ea8182024216a5bbcf0d77baebb"; + sha256 = "0jfgg02l2872ickl3bwsm6xyh5nl5sqgn3yfk9kn45aba3kd7nvm"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -7564,12 +7960,12 @@ final: prev: tabnine-vim = buildVimPluginFrom2Nix { pname = "tabnine-vim"; - version = "2022-02-25"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "codota"; repo = "tabnine-vim"; - rev = "e27face391a4d9a3e43ff251010f77deddf0c88d"; - sha256 = "1y5haygvixnav9cck49yvvm14afyy5gyq8rwiybqvkd6vfxlv99f"; + rev = "9944f213fe47a7d2ff269cda334ba28c14a4df79"; + sha256 = "1s6636s0pah340fgi5lip9zpnbd08f06idcywis5w9jqqy234b37"; fetchSubmodules = true; }; meta.homepage = "https://github.com/codota/tabnine-vim/"; @@ -7625,12 +8021,12 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2022-11-04"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "6c3e15ea4a1ef9619c248c2b1eced56a47b61a9e"; - sha256 = "1x47bxvxhw7c4g7ij86xs1zwmb61yr5wcrn3xm606x74c11ff650"; + rev = "af3ce7c3cec81f2852bdb0a0651d2485fcd01214"; + sha256 = "1r0vn0v74g8bgyz4ycc9z8clpkn6fdy5v65y7igizcrjzxd3nlpb"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -7661,24 +8057,24 @@ final: prev: taskwiki = buildVimPluginFrom2Nix { pname = "taskwiki"; - version = "2022-10-21"; + version = "2022-12-14"; src = fetchFromGitHub { owner = "tools-life"; repo = "taskwiki"; - rev = "c8e379f8acab92e77b9378c03758976bdc79bcab"; - sha256 = "0d1za9qab4h7wia13pvlkisl6cc2zg5655q88vl2dy1y0pkpjxbr"; + rev = "7a74ad8ed3743142830ba29a599c7bd23dd2b158"; + sha256 = "0nj5ndfd0rlvmr6h7mb1vzlka3d0ybj7m70ly521na17j9q4vlg0"; }; meta.homepage = "https://github.com/tools-life/taskwiki/"; }; tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2022-07-22"; + version = "2022-12-17"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "e77e1bf61b4f1ddc7b13c6160b7389df42aba24d"; - sha256 = "00cvap0qp016x09h4wkk6d0b9px7q8dplj8fj5c7j95r15k6z2r7"; + rev = "b4930f9da28647e5417d462c341013f88184be7e"; + sha256 = "06nlnnrxh3jgnlcbbr7czpaz9v7n2g60mw28lshc14wzqpl01vvx"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; @@ -7709,60 +8105,60 @@ final: prev: telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2022-10-20"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "0193fe529edd2cb61ccc020b492df76528f880fc"; - sha256 = "1y7kav5749bznz5m7102igba29yvfbasnbn6hzsx57g8vj36kwbb"; + rev = "878c8ac14f809f7a1247a090408f7c23fa075470"; + sha256 = "0q237i5cwxqzzhfmnbvljsmc4z7gmdfapz965pp135ybid4nh5xh"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; telescope-dap-nvim = buildVimPluginFrom2Nix { pname = "telescope-dap.nvim"; - version = "2021-03-26"; + version = "2022-12-02"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-dap.nvim"; - rev = "b4134fff5cbaf3b876e6011212ed60646e56f060"; - sha256 = "1fcpw42bwl5iych3hxrrl08s5hm6r6k0qx2savw853f3ff982s38"; + rev = "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c"; + sha256 = "0dkmmg30bxpbz990wgpndfhzql2015knrlmnscgz4cwyd39wwgpm"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-dap.nvim/"; }; telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-10-16"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "2429ecfd2d76e3eb6c9f8d8ba2c6ce328975a95a"; - sha256 = "1rmxz31rbb4xiisnmgsmcmrx3r1cjhdrj82l99sdjp09cqavd2bw"; + rev = "304508fb7bea78e3c0eeddd88c4837501e403ae8"; + sha256 = "0hyy1fwp06748qy7rs7gf27p7904xfrr53v1sbrmqhlxinlsyp0m"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; - version = "2022-11-06"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "10771fdb7b4c4b59f2b5c1e8757b0379e1314659"; - sha256 = "0gdaa7bvxi5ppy3is3ac42fbcd7wgp91ircikm0j9sg9f39vjk1i"; + rev = "62cbd4e7f55fb6de2b8081087ce97026022ffcd2"; + sha256 = "1mmwag20ljszzy9x1vfgxly20pkiwciq7n7cv5d6d6d20xjr7v06"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; telescope-fzf-native-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-native.nvim"; - version = "2022-09-06"; + version = "2022-12-18"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "65c0ee3d4bb9cb696e262bca1ea5e9af3938fc90"; - sha256 = "0nyvhlalrgg6n793lp3yrxgszv5j0ln9sjbh45pxxg0wn15jxm45"; + rev = "fab3e2212e206f4f8b3bbaa656e129443c9b802e"; + sha256 = "0paiaag3aazfv8rr0i43maq34pn3iga3lkjyllhfysqvdm8jk50f"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -7830,12 +8226,12 @@ final: prev: telescope-manix = buildVimPluginFrom2Nix { pname = "telescope-manix"; - version = "2022-11-12"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "e1ac51513b1952e980edd5bad9ed98f155717b07"; - sha256 = "1bip4njr0sk8v20r5vq41ik5pxrh5d84l448fn3id2r16dqjh9aq"; + rev = "28c0100c90dc200dd42471003d458fa8a2b71428"; + sha256 = "0sd914iybjxrvfmakzw8wb6k97sjvw1nnmfli7a0wvrrbak562rk"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -7854,12 +8250,12 @@ final: prev: telescope-project-nvim = buildVimPluginFrom2Nix { pname = "telescope-project.nvim"; - version = "2022-10-10"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "ff4d3cea905383a67d1a47b9dd210c4907d858c2"; - sha256 = "16byj7gcyxpn837x096a074vpj67drbd5ndcfpkvp1xyam9604b4"; + rev = "8e8ee37b7210761502cdf2c3a82b5ba8fb5b2972"; + sha256 = "0br4skyavnsk41s45z5qw0ny7g2lamd60c6clmwyrvim6hgqx12b"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; @@ -7938,12 +8334,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-11-11"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "7a4ffef931769c3fe7544214ed7ffde5852653f6"; - sha256 = "0n2cz7pgnn5wbklw0wax0k0gvhbf5gc1rs7i9d1bmwrljipgi4ak"; + rev = "203bf5609137600d73e8ed82703d6b0e320a5f36"; + sha256 = "1h64qyvvnzv7ph49vciv2izv9ws7ds1z9cncrmxs7jwlh3vv10ig"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -7962,12 +8358,12 @@ final: prev: template-string-nvim = buildVimPluginFrom2Nix { pname = "template-string.nvim"; - version = "2022-11-10"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "axelvc"; repo = "template-string.nvim"; - rev = "fa94fd309f511ac19bcba0b4390104520f07a08d"; - sha256 = "00q8f8v6zcs85iyv36byil0a9v20m7q7scmkx1231nq0z21kzadc"; + rev = "b97ee201fa2d5edced1c6dbaf432d00fec0468f1"; + sha256 = "0cygqc07grd55w4bk42qil80353fr7hf3f73mc9n2y43knijamf8"; }; meta.homepage = "https://github.com/axelvc/template-string.nvim/"; }; @@ -7984,6 +8380,18 @@ final: prev: meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; + term-edit-nvim = buildVimPluginFrom2Nix { + pname = "term-edit.nvim"; + version = "2023-01-25"; + src = fetchFromGitHub { + owner = "chomosuke"; + repo = "term-edit.nvim"; + rev = "9efbb3298ce63807750a415a091d7d535ff0a7e8"; + sha256 = "1qb16nnraxg1b9v2hwi8ywzzxgd6p8hxy673d5x561firnfj1zqi"; + }; + meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; + }; + terminus = buildVimPluginFrom2Nix { pname = "terminus"; version = "2021-12-28"; @@ -8046,12 +8454,12 @@ final: prev: thesaurus_query-vim = buildVimPluginFrom2Nix { pname = "thesaurus_query.vim"; - version = "2022-01-30"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "ron89"; repo = "thesaurus_query.vim"; - rev = "23d8aa3f7d1a785e31e760e1b6b3b4c18abf8332"; - sha256 = "0mh87m2jimblmdkfw5hr07li3zh2zmvgp23izc79k1i41v4yffsi"; + rev = "92be7e003236f4d43b86ad1b84d092fceb982ed4"; + sha256 = "0xpkns5c8f0svcj6h9kff6y0909vw0yzg1fs9n9xgnx7r1qgcb5k"; }; meta.homepage = "https://github.com/ron89/thesaurus_query.vim/"; }; @@ -8118,12 +8526,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments.nvim"; - version = "2022-11-16"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "1b9df577262b2c4c4ea422161742927f80ffa131"; - sha256 = "14yiibv5qh89y8d7ps1rv65sxq2ckj7mky5wv9fkzhplvjzg84zi"; + rev = "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1"; + sha256 = "1k42l9ghpkds2fqxj8f0anlh4gkpiid28zwkhy29k2br21m7q5fq"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -8155,24 +8563,24 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-11-03"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "3ba683827c623affb4d9aa518e97b34db2623093"; - sha256 = "043rchc7qbn65b7wfgvp6fdg67xijgd3i3jfm82i1rha7dlymb41"; + rev = "19aad0f41f47affbba1274f05e3c067e6d718e1e"; + sha256 = "1zslvsdv6y15yiqjyq52mdib15rk7k7k2qg1shwxhjjipgzykvpl"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2022-11-15"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "62b4e89ea1766baa3b5343ca77d62c817f5f48d0"; - sha256 = "1gqvynnq93dy3dchf9igvgw13ympc8zny0qjp77kq0jj77yq4jg3"; + rev = "affb21a81e6d7de073378eb86d02864c594104d9"; + sha256 = "0q37ldqajhp46g0ikc3yfnq9bgmghqdb8884rc56sraql9g0nwmi"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -8201,6 +8609,18 @@ final: prev: meta.homepage = "https://github.com/tjdevries/train.nvim/"; }; + treesj = buildVimPluginFrom2Nix { + pname = "treesj"; + version = "2023-01-30"; + src = fetchFromGitHub { + owner = "Wansmer"; + repo = "treesj"; + rev = "2723d63aed0ca4564565cc2949e0d6d2bc2b8287"; + sha256 = "1bxzww9qxb442ch3i7m4bw58hn3l9lzckr0vnqp9hh55vqh7c3xk"; + }; + meta.homepage = "https://github.com/Wansmer/treesj/"; + }; + tremor-vim = buildVimPluginFrom2Nix { pname = "tremor-vim"; version = "2021-09-07"; @@ -8227,12 +8647,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2022-11-16"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "897542f90050c3230856bc6e45de58b94c700bbf"; - sha256 = "09niz0xw32g0mxarxhf6v6whchqqllklbqm966j93wqkqbhl30ph"; + rev = "490f7fe6d227f4f7a64f00be8c7dcd7a508ed271"; + sha256 = "1bdhn3y4zs5m66bj009lqyn5spdn36vr8yc04k35xv5434011p0i"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -8275,12 +8695,12 @@ final: prev: twilight-nvim = buildVimPluginFrom2Nix { pname = "twilight.nvim"; - version = "2022-09-05"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "twilight.nvim"; - rev = "1ffa6a4d89fb2fbb784c6674044bf54f1fca936f"; - sha256 = "1aw1my5a2xz35j4v7kgq78mgh3g6clkxwahcyzqj9355zryxha5g"; + rev = "9410252bed96887ca5a86bf16435a3a51a0e6ce5"; + sha256 = "17mw3zqlviz4jsmjfsvddjd60xgkfihc60jv391rinl1w36l79ld"; }; meta.homepage = "https://github.com/folke/twilight.nvim/"; }; @@ -8299,36 +8719,36 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2022-10-02"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "e99fdf15cd55a4a8e0cb0a80a6810c1867a5c401"; - sha256 = "1ym6myhxq4z9h6nnh1dxvkqc4nbhq500wy4mj494lm2hz6nnhl09"; + rev = "0ad238b1910d447476b2d98f593322c1cdb71285"; + sha256 = "1ii9bb2h45ngy3a9ycqiw6i6vg5lyv59ibidgasg4xirnmsrmk1y"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2022-10-08"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "bd60cb564e3c3220b35293679669bb77af5f389d"; - sha256 = "0w05yhyjh6j7gcdfghvbjylc64wba42fagnj4bxk1lbcqvnnzxc8"; + rev = "1a23ea84bd02c34f50d8e10a8b4bfc89597ffe4e"; + sha256 = "00r0jnsrqdfns08ndj3xhwfx3yf65dgsin9pihad64gj9fmwvbv3"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; unicode-vim = buildVimPluginFrom2Nix { pname = "unicode.vim"; - version = "2022-09-25"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "4c851a24310fcfb5540a7e2b17c563f1f542e3a2"; - sha256 = "0zgycqvr1z88mjh1xfyvmr00nriwfxk7imvcfqskh9l0wy6z0m52"; + rev = "d4925c55b5d6d57003100b3ce17b82b9e44d161c"; + sha256 = "192ln697rv7m3nk4401p4w75d3afsjlcc5m4hcmf00ci3vimk7mn"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; @@ -8347,12 +8767,12 @@ final: prev: urlview-nvim = buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2022-11-17"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "f8d30320ca277956852fda6db082e231153b8618"; - sha256 = "0y6vqv83f075a3728jrzrzx11wf8a1p3l6rn2irwgxd037b1ql7z"; + rev = "6a2f1ae05ba036ca1e9c505f4d58b9a188ef51bd"; + sha256 = "12rs0c7sx0j8k646ycvypc9vi9k9fx17pihd3fhvccwyjwk7iafi"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; @@ -8395,36 +8815,36 @@ final: prev: venn-nvim = buildVimPluginFrom2Nix { pname = "venn.nvim"; - version = "2022-08-02"; + version = "2022-11-22"; src = fetchFromGitHub { owner = "jbyuki"; repo = "venn.nvim"; - rev = "288329d9b5b8c2ffcb58cfe38fa3dd4ddf2139a0"; - sha256 = "1b7nlg0xrm0bxwl3zda9m08pj3zmnmryjnpc9zx6b1g8qa4a4vjw"; + rev = "c114563960b8fb1197695d42798d1f3e7190b798"; + sha256 = "02fcn8h0k750vw8a4pibc3cvy02pbv25c8b01davhcill98nmkia"; }; meta.homepage = "https://github.com/jbyuki/venn.nvim/"; }; verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog.vim"; - version = "2022-09-12"; + version = "2022-11-20"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "0141e62f5609e98862002ae78c548a928386460e"; - sha256 = "011igyjvq6q0xxk11r2dvvlpad7jzaxjxy751y53943jbkdlp6c7"; + rev = "5bf36012ecd4f82a987acaee1c8504cbc8711aeb"; + sha256 = "1v2d2jyp9h2mjrmkmya879ilmsjbwdbpms1lfhiw7gx8bzb5qa62"; }; meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2022-10-21"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "0a547a2e4c80e78f2f1a002851802ab2a2bfa3c6"; - sha256 = "0kdxmammf2gdr6pa8acz6h9wbqbzb14g1glq3sl9hlhgxqxcclxy"; + rev = "13a24c0a09d29db4a1683ef950f929d97c57ef90"; + sha256 = "044s9di41cif3d7ij349v135vnxqhrl10fnagq6lyn364jw3lad1"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -8503,12 +8923,12 @@ final: prev: vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2021-03-20"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "3f0c8faadf0c5b68bcf40785c1c42e3731bfa522"; - sha256 = "1w9zim2v1av3f43z8q7zh0ia8dgjxjwnvmzd4j3y25vy25avn0lb"; + rev = "d55c90d6c9995ccb79d2152564a4939cd84d73e9"; + sha256 = "0vfhjv7jpx15lqd6kf7jds5x5x4x5gj9cbr5rgm0cbbcn2734gji"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; @@ -8755,12 +9175,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-11-17"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "2654f838ae4eb4383ee26cf32d04a597822008cf"; - sha256 = "1sfd0ssi549y03i0rkz9qds24v19vgn2qdbnv010xpwbnxhsrbv0"; + rev = "038e3a6ca59f11b3bb6a94087c1792322d1a1d5c"; + sha256 = "0m59sij2y38sgcmzic3jxw08bwkycywkjxn906xgfkwn2rvhv8cv"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -8815,12 +9235,12 @@ final: prev: vim-anzu = buildVimPluginFrom2Nix { pname = "vim-anzu"; - version = "2022-11-08"; + version = "2022-12-18"; src = fetchFromGitHub { owner = "osyo-manga"; repo = "vim-anzu"; - rev = "727da5e402d4f96127afafa4d8d2bf222f9c99f6"; - sha256 = "0i5pg88rl54dhwk8ldiqg7dkgz441xq2z9yc1v942s7kwlha609v"; + rev = "e0a61e479bc86323fb66bf75e4e36f6924cee4ce"; + sha256 = "0fba3918ik69cndpp9wb46aim6phdc9vwwk4i5f8w5wwv2baqb5w"; }; meta.homepage = "https://github.com/osyo-manga/vim-anzu/"; }; @@ -8899,12 +9319,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2022-09-10"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "63866f84095888d69af4e03d04ee6384fb93ef9b"; - sha256 = "0501jskp4yxva9h12awmkk50hj8l8yxkqrbm362hgji7gh5n3za8"; + rev = "d529e3e09a378695367969bf01735b9b997014ec"; + sha256 = "06p0246rw4cra2c9zr6bml9ylflyb4kcx4h5nfcriz0rsqgph0ha"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -8959,12 +9379,12 @@ final: prev: vim-beancount = buildVimPluginFrom2Nix { pname = "vim-beancount"; - version = "2021-04-29"; + version = "2023-01-02"; src = fetchFromGitHub { owner = "nathangrigg"; repo = "vim-beancount"; - rev = "2f970a0c826275f7d07fa145ba9a35c15b15232d"; - sha256 = "0fzacrlfr8fy5j1kps1mbkik0ln7lgd9c9jv74xd3mrz50hzqzby"; + rev = "25bcbc773554b5798d253a1a5fa5de158792f95e"; + sha256 = "1fa03kjhvii80lf6kv4zrp2gbpr0f75vgq7pr7qcf02pkl85pqqc"; }; meta.homepage = "https://github.com/nathangrigg/vim-beancount/"; }; @@ -9151,12 +9571,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-11-12"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "58e05a4e38afc3fddd513bbb0f35601e4b502cf5"; - sha256 = "148gywsna247fw0fr25y15g6x50k7gs04kmhnppjn4p8waabb8ah"; + rev = "6a90a1db48569814e73d201c95d90f38ae4aa27f"; + sha256 = "0svshn3g4w86wizxc7nybqgwkbr5nfs454vanr8q1z7ypgqax99h"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9211,24 +9631,24 @@ final: prev: vim-code-dark = buildVimPluginFrom2Nix { pname = "vim-code-dark"; - version = "2022-10-13"; + version = "2022-12-16"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "f002d6d256a11c14a9de40c45a8ecb75b2292f8a"; - sha256 = "1f5v7msmdkpsgg7yhcg2b4ysfg97w2hhrwqbahq64j3y616426ir"; + rev = "48d44707a821f962f56c3d0553144c77211749fa"; + sha256 = "0pgrmcq79jbj68zw1s9wfa5lq133xn34gx3zd2r1dllp2ybqf62a"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2022-11-18"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "3494825e8f3e78869d2da4551fb00814f8e3f285"; - sha256 = "04mdfxwdp7c0l9c1wxfhsrldy6p3nxr0zk2wa5bxwyhqzzajq7mn"; + rev = "64ffe0761b9499f15ea8b56b153644c488b5bf74"; + sha256 = "1apym7104z3pxx57srb7ih1qsyidf421f3d6rzfs8nc2vvgdd061"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -9319,12 +9739,12 @@ final: prev: vim-cool = buildVimPluginFrom2Nix { pname = "vim-cool"; - version = "2022-09-19"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "romainl"; repo = "vim-cool"; - rev = "e797f80545073f9e5b0689b91633feda7bb17cc2"; - sha256 = "0qhh3c02nraqfa5li9akar0his715cfkbfpa202yyhgsxl6ybxbc"; + rev = "80c19445728d70595c2f72d0436527e28292ebd9"; + sha256 = "1imhhsf5rhj13gchddfkgadn5z5i96gnw822nmx0ddcdvrm6kisf"; }; meta.homepage = "https://github.com/romainl/vim-cool/"; }; @@ -9415,48 +9835,48 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2022-10-29"; + version = "2022-12-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "87785156a7919f51409f3e6656ea2b3a9e0e8e97"; - sha256 = "0rbrp8cnkngfnvfvrfv2nfs3c7ryyv9zs738xay15nmcgif4by1s"; + rev = "a09e40664e9cd30cd2b3f8866b796598302070f6"; + sha256 = "0fhbb5yq6ll58gc2wyai7h4c889lfdmvhwzidw1gw529jpgwvc67"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; vim-dadbod-completion = buildVimPluginFrom2Nix { pname = "vim-dadbod-completion"; - version = "2022-11-15"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "01c4f7a66786095c6f00f877c616eaf34c425a06"; - sha256 = "1kyyr6gsghs1h0654xil27acwrc3815mivdh55xvlq8cs350mbjj"; + rev = "e71eb6140556c5ced80de6299a1fdfe22bd3c1b1"; + sha256 = "1d3gg2s9krvq9nasa3iwb7kv3jx5v74h0h55syp7d7hl7idysgdd"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2022-10-12"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "6a2b841d2f0b82386c637ce4e9954ae12c7eaee8"; - sha256 = "1s1kz89k8iklf8sbgy4p52h7y2x90141jwgzwhhhqlp7h9ar9mmw"; + rev = "f4ead480930a37dd2b0cf917a8c387ed36c2d86a"; + sha256 = "00nmcsna4z1p8i5k74jykzci16by2ga2lf904f1aya0yhwpwrjg2"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; vim-dasht = buildVimPluginFrom2Nix { pname = "vim-dasht"; - version = "2020-07-11"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "sunaku"; repo = "vim-dasht"; - rev = "c1c91ecfd30f0e4e946854a6f7c67eb2d1e21c98"; - sha256 = "0ldkyzsn4b555pb9qdr0k6w6m3w7ziy7v6bcnx0n8ppq4fl68pz2"; + rev = "fcfd4ec32d681745d6c1855097b30b988053fc2f"; + sha256 = "1y97fcmz8lvpj9z0cq46x6m6ac2ck8syfdgyjj62x2m1j40sv63m"; }; meta.homepage = "https://github.com/sunaku/vim-dasht/"; }; @@ -9511,12 +9931,12 @@ final: prev: vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2022-07-14"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "81b40878f286f370df2a2b3a52c4d860643d2142"; - sha256 = "19wmp9bx3sgf4vjvq504ah12hh6zm7hvqjyq07sccy2z7ld87bd5"; + rev = "6233243f0caa71d27d27ea102540a88bce8eb6ea"; + sha256 = "03nvv5y4zv2kh4fkg3xx0zf247mqv201zf89aalczvslvwdf7gqf"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -9569,6 +9989,18 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-docbk/"; }; + vim-dotenv = buildVimPluginFrom2Nix { + pname = "vim-dotenv"; + version = "2022-05-15"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-dotenv"; + rev = "5c51cfcf8d87280d6414e03cd6b253eb70ecb800"; + sha256 = "06117ilmanj07kasshg1da3gai03fk5s3az2x8vw7rqbr9s50snp"; + }; + meta.homepage = "https://github.com/tpope/vim-dotenv/"; + }; + vim-easy-align = buildVimPluginFrom2Nix { pname = "vim-easy-align"; version = "2019-04-29"; @@ -9679,12 +10111,12 @@ final: prev: vim-endwise = buildVimPluginFrom2Nix { pname = "vim-endwise"; - version = "2022-08-17"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-endwise"; - rev = "4e5c8358d751625bb040b187b9fe430c2b769f0a"; - sha256 = "0vfkvq20kr6jbm526vkvyliv4zybha7jpp7iaimvw4zx1mjs5pih"; + rev = "43301cf9a0fafd78cec7c2e5b9c0e2cfd9436e8a"; + sha256 = "0lcgax5m1zmngdz5dk9lx89didicw831zgyyjx0w9iih6d9amj18"; }; meta.homepage = "https://github.com/tpope/vim-endwise/"; }; @@ -9799,12 +10231,12 @@ final: prev: vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2022-04-19"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "b6bef833b56632df917bcf33bc50b8a5d1e26139"; - sha256 = "1b0qw5l8gyq3bf8ii1f2xb7kfdgyi0c4yivcmmziq8nqvrzwwzwp"; + rev = "614622790b9dbe2d5a47b435b01accddf17be3e6"; + sha256 = "1v9xk5gapbl8s5lb5j3kc87a865hidj2cx164kvw80rjbwx4knnq"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -9859,24 +10291,24 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2022-11-03"; + version = "2023-01-14"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "280b34a0760801168a67f952542b6c49292aa5f3"; - sha256 = "19hb8bqkk6iqy8lm4gs6kiiw6igjjyvazw9fx6gnmf86pkajk3cw"; + rev = "06c73980682f61307e890fe652d1343be82e7ec7"; + sha256 = "0xwf9613h5lq8wsjh4y4k4pz80cpbnc8kddhsk77jfpnf305pi4c"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2022-09-17"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "c880254c0d56a9dba0bfe7bc3a5f99cd15273363"; - sha256 = "1zf2i2z2y2sdnl0yvbrhwg4j9vnz85v4ycplsqvas0kfvc2vcrka"; + rev = "2ba8af2c9682e3560db5b813d10acf3ba3415bc1"; + sha256 = "0rnyk3q6zkd6b9xi5q61jr8885mqx7xz0v7yyxb3y37lrl0wfz66"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -9931,12 +10363,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-11-16"; + version = "2023-01-17"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "23b9b9b2a3b88bdefee8dfd1126efb91e34e1a57"; - sha256 = "0spghyavc5vxja7b2apck501j61s8gc43bqv1388akwmdanmbk1p"; + rev = "2febbe1f00be04f16daa6464cb39214a8566ec4b"; + sha256 = "0njzhsn5xlwjcgr6nkm8pds4rby46dldl0b25dwj2bj6nyydaa23"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -9955,12 +10387,12 @@ final: prev: vim-gh-line = buildVimPluginFrom2Nix { pname = "vim-gh-line"; - version = "2022-06-30"; + version = "2022-11-25"; src = fetchFromGitHub { owner = "ruanyl"; repo = "vim-gh-line"; - rev = "622d7812a268b3e869e8f8c7ee5871e7ee98ab43"; - sha256 = "1bz40bdfhsvh8cdnydf00qixf9yz41c1lzabb4vbrwbb9wizh4zi"; + rev = "fbf368bdfad7e5478009a6dc62559e6b2c72d603"; + sha256 = "0phxvn08z5bwdq0hkan9l1rl94ylsjc2hhv1ahzqvda0rk8lqxj9"; }; meta.homepage = "https://github.com/ruanyl/vim-gh-line/"; }; @@ -10027,12 +10459,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2022-10-22"; + version = "2022-12-21"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "400a12081f188f3fb639f8f962456764f39c6ff1"; - sha256 = "1rfg2wniappm64y5b6j6nmqsp41axgs6f3ghdzcjgak71b6mbng9"; + rev = "00df1089b6267f47c7c0f13536789feb9db1e65b"; + sha256 = "1qj22fhkhamva23jn1f1044vj01p3n4203zdhqasn8836jpw0f82"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -10075,12 +10507,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2022-11-01"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "0550762a69a2ef13d9f723c9478155dbc6ad7ddb"; - sha256 = "185ysbbipqf6fivryi4pxjmdm4vfn319w1mgm3xpg2920scybwbq"; + rev = "7bf2074f340447c10b3af4ace96cc61e5f325693"; + sha256 = "0ry67a7g0dpgaiwfcr79pgpw54x5v8dmfg4pypyd039ini0l0w46"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -10099,12 +10531,12 @@ final: prev: vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2022-06-05"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "4bf5d33bda83117537aa3c117dee5b9b14fc9333"; - sha256 = "119ldy55w58mq31zb8whlq17rp3ginvx7n45h1r91279p2gl1ch6"; + rev = "996749a7d69a3709768fa8c4d259f79b5fd9bdb1"; + sha256 = "1fm5rvvp7kh1lqfz6g9s8vjgbrbjqrdwysr573ymxacavbx8iri2"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -10147,12 +10579,12 @@ final: prev: vim-gutentags = buildVimPluginFrom2Nix { pname = "vim-gutentags"; - version = "2022-05-12"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "ludovicchabant"; repo = "vim-gutentags"; - rev = "b77b8fabcb0b052c32fe17efcc0d44f020975244"; - sha256 = "0wiqy5m7wvrmr3d2vy5j5lz6wh3z2c2v7amy9ji7prq1gxv3n095"; + rev = "1337b1891b9d98d6f4881982f27aa22b02c80084"; + sha256 = "0hzdhaingqrf57lhjdl8abhpfd5wi3zmrx12xrps31z9ik6l5041"; }; meta.homepage = "https://github.com/ludovicchabant/vim-gutentags/"; }; @@ -10376,12 +10808,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2022-11-11"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "a6d0b28ea7d6b9d139374be1f94a16bd120fcda3"; - sha256 = "0wby253z3njala4syizy3m463gi8l45gcf7rj866r2jhnfxg9ba8"; + rev = "d6ca7f77eeaf61b3e6ce9f0e5a978d606df44298"; + sha256 = "02sgnp9yr0bdg8r5w24cxdvy01vw2whkh0fx11d9vfg0gqshi2hh"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -10460,12 +10892,12 @@ final: prev: vim-jack-in = buildVimPluginFrom2Nix { pname = "vim-jack-in"; - version = "2022-04-03"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "clojure-vim"; repo = "vim-jack-in"; - rev = "5467e00e26f15680b0a7998f8aa20d5a7dd44cd5"; - sha256 = "1wi379l8d793v6hjx11v0dhgdn8a9ihx64gv51v9wpmjlvp9xbzd"; + rev = "c7f73e6788b5a97ac700f6c1fe09c26ebfa324d0"; + sha256 = "1f95877cgv9mvln6v78sgccwdfgvbaga9wbyckxw8rrbnrikwxam"; }; meta.homepage = "https://github.com/clojure-vim/vim-jack-in/"; }; @@ -10545,12 +10977,12 @@ final: prev: vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2021-11-20"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "71c98ed6eacb4f1c0b9e4950ef679eda6a651cdd"; - sha256 = "0jxcmriva73s0icllpbh6q6s2fw0ysjm7fk449kdd5fvd5y5ssq5"; + rev = "9234b2e2590e973c06113c05abd180de0c9dbcc1"; + sha256 = "04793snqfy6p27pl31mghfaszbwwb08fg93bv35ah3ghv3abyh7c"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -10653,12 +11085,12 @@ final: prev: vim-lawrencium = buildVimPluginFrom2Nix { pname = "vim-lawrencium"; - version = "2021-11-08"; + version = "2022-01-19"; src = fetchFromGitHub { owner = "ludovicchabant"; repo = "vim-lawrencium"; - rev = "eee52c9da9a58c1f079adb4a3134a0620bc6e945"; - sha256 = "12431h344dhjswg0pm8nvfszy8hp8b61nm0r8gsry9a6w1j1a86b"; + rev = "cfda83655a3885f410fcf96ea1104ea0431570c3"; + sha256 = "0jxk4xc10n6llr4hx67laxkx9rygrk0w6zyfvb2cpzcjranfmxnp"; }; meta.homepage = "https://github.com/ludovicchabant/vim-lawrencium/"; }; @@ -10689,12 +11121,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2022-09-30"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "212e3aa210c9f0965e4b234653a08fd3aa525470"; - sha256 = "1vbkm5rs0n9hhcv462ldrf3acx4q170fgzzp44444dmxd7w2pgf9"; + rev = "ab78b1b16601274c1b93a43792080ef3faff06e9"; + sha256 = "0k2h8508x6ga4gayrknrdqh6w5jhpf4vbz0ba8018264pnvz9fqd"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -10761,12 +11193,12 @@ final: prev: vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2022-05-11"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "244a92ceae63b8c23a74022eaf205b431745fcb6"; - sha256 = "1y56xh4k7zqagsnw86lkm747l1x4i5l95r0jks4j35d1fcmpq81i"; + rev = "6cc9f9ffaaf44b45bd5268f8a541363619bf1b13"; + sha256 = "05j14v41jrjm4p1kbqxgx3n54isv4y93w2iy679jyggrrdzi5m71"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; @@ -10809,12 +11241,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-11-10"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "e42203b4f0e46a927dd17b28f142fa91661d7163"; - sha256 = "12v2mh049b037b70q5cpkz0dgqi07hsz4sx2ywvqvwmykv5lrpcv"; + rev = "25337623cf11e2ac9c73dcba1a48b86fe103d887"; + sha256 = "020c8m76yp0ddwln4iajy231ifia2bxvly0b4ibfn5sgnqqf2cxm"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -10881,12 +11313,12 @@ final: prev: vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2022-11-13"; + version = "2022-11-24"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "7231fa4bbc47c5d0c64fd7f6187b07f0cae18dcd"; - sha256 = "0s75filccsp51z9sh14avjrh8vb3359b33285s9zix9i1zsm0fxb"; + rev = "df4be8626e2c5b2a42eb60e1f100fce469b81f7d"; + sha256 = "0z0lgxjxs2vjbzkmmp1286rrc57am5l7igiapq4fx4jr5bzyrbz6"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; @@ -10918,16 +11350,28 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2022-11-13"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "55e3330436784fb8ccc35a5cfeb13e48bab9dcd2"; - sha256 = "170ic9lp566x1l0brj2gj2zpbz5wl57df9wbi3zixm3agj56gnh6"; + rev = "959e0e79ea240cdee29efbdd0d2e2e718931ccec"; + sha256 = "0fyh7894fwnf8hxp8y9016blzmw7qv99izhy62bg11rhdjcgz4n8"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; + vim-mediawiki-editor = buildVimPluginFrom2Nix { + pname = "vim-mediawiki-editor"; + version = "2022-10-29"; + src = fetchFromGitHub { + owner = "aquach"; + repo = "vim-mediawiki-editor"; + rev = "ba6a1139bdde0bdf2990f7110a42b304815f76b5"; + sha256 = "00d1vwf0say9vsrsvz710483ybbhwn5799k3qb4skna0vzjryayz"; + }; + meta.homepage = "https://github.com/aquach/vim-mediawiki-editor/"; + }; + vim-mergetool = buildVimPluginFrom2Nix { pname = "vim-mergetool"; version = "2019-06-22"; @@ -10978,12 +11422,12 @@ final: prev: vim-monokai = buildVimPluginFrom2Nix { pname = "vim-monokai"; - version = "2021-05-06"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "66f7dc9c63296ea6ba408faa60bebe54a34c57f2"; - sha256 = "10ip0y9p2qf869h2yhp2zs6qc048rw1x5i0spziajca96251gvig"; + rev = "6b6c2b698e94d0af8d8f2307be01571ab8b7b74f"; + sha256 = "1pa1fylfzammcy7xvl2wlgg2qw8yzrzr7yf0vdalqfmxkakma1z8"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -11000,6 +11444,18 @@ final: prev: meta.homepage = "https://github.com/phanviet/vim-monokai-pro/"; }; + vim-monokai-tasty = buildVimPluginFrom2Nix { + pname = "vim-monokai-tasty"; + version = "2022-11-25"; + src = fetchFromGitHub { + owner = "patstockwell"; + repo = "vim-monokai-tasty"; + rev = "55dcb855be754178967b860b0fa63621c319ce0a"; + sha256 = "0yll7qm014ydfa2svx3zaskv8g65scw6mw8m5fsjsi9g2v3369g8"; + }; + meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/"; + }; + vim-move = buildVimPluginFrom2Nix { pname = "vim-move"; version = "2022-07-01"; @@ -11110,12 +11566,12 @@ final: prev: vim-nickel = buildVimPluginFrom2Nix { pname = "vim-nickel"; - version = "2022-03-16"; + version = "2022-12-15"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "vim-nickel"; - rev = "2f0f5f8ce2a8e719a5e39d7210ca914ae403374c"; - sha256 = "1li3wc5164mcqrvj42dc8zh3j8wml10gpgffapnjilwa5c85kv3q"; + rev = "55e7d1b6a723115497ec214d3d72e37a6114a767"; + sha256 = "1424vw1hrp4v45vp8skygvn53437ln3c44zal8jl0nflvmpkc9z6"; }; meta.homepage = "https://github.com/nickel-lang/vim-nickel/"; }; @@ -11146,12 +11602,12 @@ final: prev: vim-nixhash = buildVimPluginFrom2Nix { pname = "vim-nixhash"; - version = "2022-09-01"; + version = "2023-01-09"; src = fetchFromGitHub { owner = "symphorien"; repo = "vim-nixhash"; - rev = "e03af8d0c1bae3c015ffdb45ce79556c0561e59d"; - sha256 = "1kdg84666gf1d3qiwwqmk7nwshspr2kpb8hjyh2m0nx0zmjji2ij"; + rev = "71676294bcb22c52d372bd8850b1bd3d7173bfac"; + sha256 = "14chq3c5dhkvllkmrrnpd8lbmlbm8ji1gqxn686bnh0d1w2r9hyk"; }; meta.homepage = "https://github.com/symphorien/vim-nixhash/"; }; @@ -11194,24 +11650,24 @@ final: prev: vim-obsession = buildVimPluginFrom2Nix { pname = "vim-obsession"; - version = "2022-04-05"; + version = "2022-12-02"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-obsession"; - rev = "7d39576149d17bde3c096fd57e3a2cdae65deaf5"; - sha256 = "0g716c3dvd7068lfgcbxlzn86529kji4zms5n2xgrn3h0vn722zz"; + rev = "fe9d3e1a9a50171e7d316a52e1e56d868e4c1fe5"; + sha256 = "0x60j6bq9aql9fqq704cg8bc930c7n1jiaczwsn6slwa55c03zmr"; }; meta.homepage = "https://github.com/tpope/vim-obsession/"; }; vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2022-11-14"; + version = "2023-01-24"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "284c37e2607446ef798c4b61a4691c41a5661f03"; - sha256 = "17d094gqm5ixlgadrd6fplg2zrx761m091mw7gjpi7bdh1nzw1bw"; + rev = "4c907ef607810662c42795098d42f23a224fe6e7"; + sha256 = "1355c0kf6g0v0q6sb5xnl8rssm4hjkpkjqwbi9yb0r9sj8z7zx96"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -11240,6 +11696,18 @@ final: prev: meta.homepage = "https://github.com/petRUShka/vim-opencl/"; }; + vim-openscad = buildVimPluginFrom2Nix { + pname = "vim-openscad"; + version = "2022-07-26"; + src = fetchFromGitHub { + owner = "sirtaj"; + repo = "vim-openscad"; + rev = "11ed125209e2277d439cf6d0340c6fca263cb09b"; + sha256 = "1r86pz95yva0rsgnh7mnl94r6yra6704iify95r8fbj4zsawfclp"; + }; + meta.homepage = "https://github.com/sirtaj/vim-openscad/"; + }; + vim-operator-replace = buildVimPluginFrom2Nix { pname = "vim-operator-replace"; version = "2015-02-24"; @@ -11278,12 +11746,12 @@ final: prev: vim-orgmode = buildVimPluginFrom2Nix { pname = "vim-orgmode"; - version = "2022-01-23"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "66cd7ee69a9cddc73f65566e32da159f1e51401f"; - sha256 = "1ywf5vcn3b8isfw4gxqfplchn94jvbqvaap15w1yk5ljmp46gxgk"; + rev = "b27feaba9a316e8307cfd7a56797b378fb52df83"; + sha256 = "0b2y49ylbrp1i5r5abznziv1n43d063mib07v4ila0873k7fzir6"; }; meta.homepage = "https://github.com/jceb/vim-orgmode/"; }; @@ -11314,12 +11782,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2022-08-31"; + version = "2022-11-24"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "849c67adf24a86935b8be62860ad9acb00cf4572"; - sha256 = "1f23accmz82835kxvfsksjp77w9khkbcp4064c646p90ck194lji"; + rev = "e6298736a7835bcb365dd45a8e8bfe86d935c1f8"; + sha256 = "0j08s46s8v2zgh9bf3djkdbga94mycr9if8bh3d4yq68bw8q463b"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -11386,24 +11854,24 @@ final: prev: vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2022-07-23"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "2baeabb9584bb948618806f22bc4cef5685535fc"; - sha256 = "095hsn5vm0s8ky84l85cshn9hsa3cmyy27r9n9cdq28x373nabdr"; + rev = "4268535e1d33117a680a91160d845cd3833dfe28"; + sha256 = "0wd6fxv3l19rh7a6zfqi7ylcd1wjk8haiix7cq3zzyvq3zfidp0z"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; vim-parinfer = buildVimPluginFrom2Nix { pname = "vim-parinfer"; - version = "2022-04-19"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "bhurlow"; repo = "vim-parinfer"; - rev = "e8ae788a91f41d627cec905c61a2dec9c9183341"; - sha256 = "0dkxfdakgcs6743dzja7l5vdc2pczv3ahr79g93mzjj0wbn6gd1i"; + rev = "a5490e430452a749a3ad665ebae54392d9657414"; + sha256 = "1mr2a44xjk6mr9kbh6axg8nd1fspbgi2r98g5d5cqjzvkzqfj6mm"; }; meta.homepage = "https://github.com/bhurlow/vim-parinfer/"; }; @@ -11482,12 +11950,12 @@ final: prev: vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2022-09-13"; + version = "2023-01-19"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "ddce935b16fbaaf02ac96f9f238deb04d4d33a31"; - sha256 = "14fpa2z4cpb7if1wf4xkn7zqydhf7iz531lv3y5kvx3hp0yh02qi"; + rev = "034e8445908e828351da6e428022d8487c57ce99"; + sha256 = "1xjvgzcr8l3f6wv82vla1nd5jxa32zdxgyw9fizf6xsm6m74n7jn"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -11578,24 +12046,24 @@ final: prev: vim-prisma = buildVimPluginFrom2Nix { pname = "vim-prisma"; - version = "2020-04-04"; + version = "2023-01-24"; src = fetchFromGitHub { - owner = "pantharshit00"; + owner = "prisma"; repo = "vim-prisma"; - rev = "e91ac5011232e1bd8ea53204db8d01203d5d0f3c"; - sha256 = "0pc203n70g1b0qfvrnfi5sxg2vr9zfw274s9lpgpxmribknpxi86"; + rev = "95c5b25066efb34c75bce78698baa371fe0ee7c2"; + sha256 = "046lpazz44f6b1lcvklaq1jl0sbyiklj6kcv580rrff89511nzsy"; }; - meta.homepage = "https://github.com/pantharshit00/vim-prisma/"; + meta.homepage = "https://github.com/prisma/vim-prisma/"; }; vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2022-09-11"; + version = "2023-01-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "558013b66ba8f30e75fd67a67374662fd6961eb8"; - sha256 = "1hdj0391ja2sz4qyk2c96xlnafxfyfcdbqdq2r8mpzqy3x7ii5zh"; + rev = "3a088946adb24a2fac7b47f3dea97a3b99f52ddd"; + sha256 = "11vklmj35gj7l4n84fpn503rhpmbg7inlmwlvs3adgc0bfpccflf"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -11626,12 +12094,12 @@ final: prev: vim-ps1 = buildVimPluginFrom2Nix { pname = "vim-ps1"; - version = "2022-09-12"; + version = "2023-01-11"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "e7cc3b08f6f9e2dc1909f397aa3d5b0a7acb661c"; - sha256 = "1n4c6sgmpr2zb0m5f1nw866fg4s4hqbbsbkz46x2sndr96r6gk1l"; + rev = "502590f90a21f0de2b7664d6d0dcc90e5bb28a9c"; + sha256 = "0v335bgbf1a6ry8dvphfqwmlhlz8x94cj4x6z7ssz16hpasrlhx6"; }; meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; @@ -11734,12 +12202,12 @@ final: prev: vim-racket = buildVimPluginFrom2Nix { pname = "vim-racket"; - version = "2021-04-11"; + version = "2022-12-30"; src = fetchFromGitHub { owner = "wlangstroth"; repo = "vim-racket"; - rev = "32ad23165c96d05da7f3b9931d2889b7e39dcb86"; - sha256 = "1yyqx471p11vj6gya4yzkiy07vfwzpx10bf6s7dh2h7zp2nz10br"; + rev = "2c7ec0f35a2ad1ca00305e5d67837bc1f1d4b6cc"; + sha256 = "02cliv5798l5lgf082g48g6cimsphvdvysalj3x86q3273rf9dgv"; }; meta.homepage = "https://github.com/wlangstroth/vim-racket/"; }; @@ -11758,12 +12226,12 @@ final: prev: vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2022-09-27"; + version = "2023-01-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "a6d2bac95b446a5c23eff4638eca164b0d77454a"; - sha256 = "0mxc8jv8y7dfy8a14y3xbgs75fv8443nnpf27wk4bz8vdp6nbfha"; + rev = "959e94b76e6ebdf984acef61649ba7d0f62bd425"; + sha256 = "05v2gi42jv1rly8g7vhwfhjl01x3ld5xnrzgi7kadl5kppjnp5g8"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -11806,12 +12274,12 @@ final: prev: vim-rooter = buildVimPluginFrom2Nix { pname = "vim-rooter"; - version = "2021-07-28"; + version = "2023-01-13"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "0415be8b5989e56f6c9e382a04906b7f719cfb38"; - sha256 = "1v7akjwrk62q2bk03iqhvziw6s13wnh2lk0vppzvlksv6rj0cmpi"; + rev = "4f52ca556a0b9e257bf920658714470ea0320b7a"; + sha256 = "12rwb51xc0ncs0g1ha4sbbp473w9ijx00krns271al387q6dwhys"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -11854,12 +12322,12 @@ final: prev: vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2022-07-22"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "74898e6f5c5ea37e17163f00bf4981049f785eed"; - sha256 = "09zx0081bmprvf1zv3wxjnl0j4viks9w3yysbwgg1qqi38fls5rg"; + rev = "c5a2cc438ce6ea2005c556dc833732aa53cae21a"; + sha256 = "1b1rim7q398dnwdaqakcycvyvw04rw32k10ij7w7mqpbn9hklpm5"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -11926,12 +12394,12 @@ final: prev: vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2022-08-26"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "8985da7669bbd73afce85ef0e4a3e1ce2e488595"; - sha256 = "15pvhbk7hkf3z7zsv1bqizqmiw75nvckf3j6njckj5ijx6kzjsnj"; + rev = "16283468becaa6985839f96fea212f8634fbd7d2"; + sha256 = "0grp80kahfnjkns5mbkprigr2j2vh38ajy0r7rh7pp17s3awdy7i"; }; meta.homepage = "https://github.com/tpope/vim-sensible/"; }; @@ -11950,12 +12418,12 @@ final: prev: vim-sexp-mappings-for-regular-people = buildVimPluginFrom2Nix { pname = "vim-sexp-mappings-for-regular-people"; - version = "2022-10-04"; + version = "2022-11-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sexp-mappings-for-regular-people"; - rev = "ffe645ff61e22d0b7c282d53b8745be4298104e6"; - sha256 = "1g0zi26lppgp35f9q12484c00q7yj58d7wrpfs57v4six02292dc"; + rev = "cc5923e357373ea6ef0c13eae82f44e6b9b1d374"; + sha256 = "0jr5dyqbysp0g2pahgirq1lhzr26wv50rmnyc5l4jbvdwvnhzhjn"; }; meta.homepage = "https://github.com/tpope/vim-sexp-mappings-for-regular-people/"; }; @@ -11986,12 +12454,12 @@ final: prev: vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2022-09-26"; + version = "2022-12-28"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "8bc268c79d4053c2f5ccaadcf0b666dd16ed3a58"; - sha256 = "0nc3c66vrbd18sf0krxn6llfz1v832f7xqbkrfacl9jbhsfch5hk"; + rev = "a05e63ba72411977f5087c27c1564c9287bfab66"; + sha256 = "1z435v9y7nkffwr2b7rnmjla21nfb3wvdnf6s32vw4h6n5wgj3bl"; }; meta.homepage = "https://github.com/mhinz/vim-signify/"; }; @@ -12022,24 +12490,24 @@ final: prev: vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2022-10-06"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "8332f123a63c739c870c96907d987cc3ff719d24"; - sha256 = "15aln4mb82d2k67brgh6xq8nx9rn9ymy3a2ciwwjnxawzjs2pbpg"; + rev = "1cc4557420f215d02c4d2645a748a816c220e99b"; + sha256 = "0l8mw3r6lb6q1p3afvf5psp6cg8vdi84b5j8whmdm83f4mynsn8a"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2022-10-29"; + version = "2023-01-15"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "55e8604bda53f11cbce5d2b976bacb157de70297"; - sha256 = "19r7hx4xkw3b8fc81gp1sqc4xk3w2i55mpcbsrjr1mjyjwydjb84"; + rev = "5308556987857eb0fc5f1a774496b29d8dd70f34"; + sha256 = "0c0bqc3cs4k6vzfrpamzay98rxqi7pjg3vgr8sxj0z7ljc5x1101"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -12068,6 +12536,30 @@ final: prev: meta.homepage = "https://github.com/t9md/vim-smalls/"; }; + vim-smartbd = buildVimPluginFrom2Nix { + pname = "vim-smartbd"; + version = "2015-12-20"; + src = fetchFromGitHub { + owner = "Industrial"; + repo = "vim-smartbd"; + rev = "62c267401f634d4f8f65933c812469610ba505ea"; + sha256 = "0a4ls93bgy5r7ar3r60zgdn2jzdkk10wrws14lw2xl8yg65rc0mg"; + }; + meta.homepage = "https://github.com/Industrial/vim-smartbd/"; + }; + + vim-smartbw = buildVimPluginFrom2Nix { + pname = "vim-smartbw"; + version = "2015-12-20"; + src = fetchFromGitHub { + owner = "Industrial"; + repo = "vim-smartbw"; + rev = "8091e5e452f63b10d4c9eacf0cc84cba394148f7"; + sha256 = "08i8qyqahj2jv44pay7bi2dxajhsrx244i44v53y4iiddps6smxn"; + }; + meta.homepage = "https://github.com/Industrial/vim-smartbw/"; + }; + vim-smoothie = buildVimPluginFrom2Nix { pname = "vim-smoothie"; version = "2022-06-10"; @@ -12118,12 +12610,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-10-13"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "b47c2e37237875185d170f32cac67af5ab72f22d"; - sha256 = "07y85ah7hqlr9phpd4j6shhsd1q0h1fgb9863hykc3xkg04n401x"; + rev = "8f9eead6c4dfdfee9052d4ea667c1c9d8a396f80"; + sha256 = "1zpffb0f8scgsmpv0y4pbnlp09kv0lgmrn9ss8h53byrqsa14rif"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -12190,12 +12682,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-11-18"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "1acb5fa4aa29a24c36d559474b672cda9b9a9b6d"; - sha256 = "1rvga45kgz5sh7yc5nqsxm6ndhdamvq8a67pw8ci1zi3n53j9xij"; + rev = "6580cf539c33a212f4f5542068a3b4dd2b3ad834"; + sha256 = "1977l3k7crzrr1cc80afnz7cs6bz2y16qn02gz56marc0pn215mx"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -12332,14 +12824,26 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-tbone/"; }; + vim-teal = buildVimPluginFrom2Nix { + pname = "vim-teal"; + version = "2021-01-05"; + src = fetchFromGitHub { + owner = "teal-language"; + repo = "vim-teal"; + rev = "d2aa107b257879e774680792a2aebaf9cd5742e0"; + sha256 = "02ag8vhmh1zj99vhvqslfnasw9i5psx396r7qyag0yyzyp9ynzkc"; + }; + meta.homepage = "https://github.com/teal-language/vim-teal/"; + }; + vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2021-07-10"; + version = "2023-01-11"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "f0b17ac9f1bbdf3a29dba8b17ab429b1eed5d443"; - sha256 = "0j87i6kxafwl8a8szy2gzv7d0qhzwynd93iw8k0i42jnpqm8rp3a"; + rev = "d00503de9bed3a1da7206090cb148c6a1acce870"; + sha256 = "1vh8yv2cpyfnqmmjza8dm3b11mhz9x8lwln865hdjggzbj9vdbcg"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -12359,12 +12863,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2022-11-10"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "ab7feab8cb139e5b4955cb4c6ddf52e968cb24be"; - sha256 = "0glnzs21xhwgir4ndnrv3jlmi5g6b4znybcpp5d4aqxd5sqa80m3"; + rev = "048f15403d9edfa513a50fafd7b107306c5512e4"; + sha256 = "07vjls2cgrnrqb84vc3g00rc3c65xpvrnxyzwjm1kaprzw70wwmm"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -12479,12 +12983,12 @@ final: prev: vim-tmux-clipboard = buildVimPluginFrom2Nix { pname = "vim-tmux-clipboard"; - version = "2019-04-07"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "roxma"; repo = "vim-tmux-clipboard"; - rev = "47187740b88f9dab213f44678800cc797223808e"; - sha256 = "1a7rpbvb7dgjfnrh95zg2ia6iiz2mz2xps31msb8h14hcj6dsv6y"; + rev = "e1be6608410c260479dc4807ad8c103faf5460d8"; + sha256 = "07a8jj1j8422a8grvp440qbrxmzchqxc3mgmpa7hsyqlkw5fjkj8"; }; meta.homepage = "https://github.com/roxma/vim-tmux-clipboard/"; }; @@ -12503,12 +13007,12 @@ final: prev: vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2022-11-13"; + version = "2023-01-10"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "c2dab181185101070b0ad6c33451f4e2f56a446a"; - sha256 = "15581nighr1a82gkn0blkx75l6bz0vfq573nf626dw1qa652nipz"; + rev = "cdd66d6a37d991bba7997d593586fc51a5b37aa8"; + sha256 = "12jb59c9x3xbhfc9xps64dq3h9a5gsjfb60hv8kd8k2hl3jmnpc0"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -12539,12 +13043,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-10-30"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "b8bb357570b2d95bf893345d45fed722808571ef"; - sha256 = "145crqkr4b588k64y1rczhy5ygwada8rzsrfa3gvv6xrhkya6sgg"; + rev = "0dfb1bf84bf8899dc57ae1102605336b929898e7"; + sha256 = "1pyk4bf3mrmhylmmrxj0wlq145ilanmkiblyjmdl0imwn8m5jyl9"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -12563,12 +13067,12 @@ final: prev: vim-tridactyl = buildVimPluginFrom2Nix { pname = "vim-tridactyl"; - version = "2022-02-10"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "tridactyl"; repo = "vim-tridactyl"; - rev = "f2eaa5d32614f6c35dad268dd4ed7ff33cae5070"; - sha256 = "139kl89k5alh8bpa4wywsmvjnxlxzsdbhxn2w8rvclhwgrhkzvgd"; + rev = "fdd069bde3a34c786abed4601b6d59a065590ad9"; + sha256 = "07km8yp0vsipw2amkxd0rjp9qz18g0b7bvsb2vj9vgkr8wc0d780"; }; meta.homepage = "https://github.com/tridactyl/vim-tridactyl/"; }; @@ -12635,12 +13139,12 @@ final: prev: vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2022-05-26"; + version = "2022-11-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "efdc6475f7ea789346716dabf9900ac04ee8604a"; - sha256 = "1lwi0dpp5jrrnzjwrl4qs88a0q4gfgiqlpjcz62j5hmmdcbj5j4s"; + rev = "6d44a6dc2ec34607c41ec78acf81657248580bf1"; + sha256 = "1ak992awy2xv01h1w3js2hrz6j5n9wj55b9r7mp2dnvyisy6chr9"; }; meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; @@ -12693,6 +13197,18 @@ final: prev: meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; + vim-visual-star-search = buildVimPluginFrom2Nix { + pname = "vim-visual-star-search"; + version = "2021-07-14"; + src = fetchFromGitHub { + owner = "bronson"; + repo = "vim-visual-star-search"; + rev = "7c32edb9e3c85d473d9be4dec721a4c9d5d4d69c"; + sha256 = "1g3n84bwvy2535n8xwh14j3s8n1jwvl577vigg8zsxxvhjzl878b"; + }; + meta.homepage = "https://github.com/bronson/vim-visual-star-search/"; + }; + vim-visualstar = buildVimPluginFrom2Nix { pname = "vim-visualstar"; version = "2015-08-27"; @@ -12719,12 +13235,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2022-11-14"; + version = "2022-12-20"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "6f873418c4dc601d8ad019a5906eddff5088de9b"; - sha256 = "0jw8580w0x515772gnyw6y922yp0hmxk84r67iw1mv50zbkmafgz"; + rev = "8dde8c0ef10bb1afdbb301e2bd7eb1c153dd558e"; + sha256 = "09vxb458xglzrmxjahxabnqkrkb0cbl6sf9jplp01v0cy3jjfmmw"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -12755,12 +13271,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2022-06-27"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "4692ec3e77ade9e65171182296cca74352a39a12"; - sha256 = "16av4rd4ga85w3mnb40i762x6kwk9k29pgbpq5qnldyi1pfiph6f"; + rev = "b67957731086466ed5d967cd1dac7f6981603156"; + sha256 = "0s35cx7yxx6rc7qs88c4j0109y7b9lgwd15p0a33pwbwj0h3x6ap"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -12779,24 +13295,24 @@ final: prev: vim-wayland-clipboard = buildVimPluginFrom2Nix { pname = "vim-wayland-clipboard"; - version = "2022-02-19"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "7dcfcc17094eab71fd5fb467eb73c34abdde586c"; - sha256 = "1rs2zhr500ib1drvnk63yciw4g3z1jsfksm6s2a0ywsxv1b240n2"; + rev = "9b6def0924e716fb5314d52e062965b950b707f8"; + sha256 = "0j383bs1s2l8qxmym3zwby8nj8md8dsx7nk7xnspcrgah4g3j4mm"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; }; vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2022-10-30"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "398adc5bf2918ee84e78bd974a9f9d64ddfc0801"; - sha256 = "18kjcw8jdidihfscir5kihz22mvlwkbab1w5m8hc2w9qjljcza50"; + rev = "c0eb7a63e80ed0dc2c91eb8c879b7396a795f775"; + sha256 = "14v47fjp1klnacbbn2ly9ya0xs4dv2bsf9pg391zfcpp9rzf6mrl"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -12851,12 +13367,12 @@ final: prev: vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2022-11-14"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "9ac90d328f7863039c6edff0b4b8081349a378e8"; - sha256 = "1j5vmavmgwvwrarc768x1p5ng4bjyb3fdm118z019r0zpcdknpgx"; + rev = "c75c8bfb0ce01d17bb41cf2c351f98ee3c019bb7"; + sha256 = "0zjbfhz2k414y61kksbh2za6b90ixrshgczppss377jcrxv2y0fi"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -12897,6 +13413,18 @@ final: prev: meta.homepage = "https://github.com/simonrw/vim-yapf/"; }; + vim-zettel = buildVimPluginFrom2Nix { + pname = "vim-zettel"; + version = "2022-12-22"; + src = fetchFromGitHub { + owner = "michal-h21"; + repo = "vim-zettel"; + rev = "7bd110f8d370c1beb812b30af82336556fa44096"; + sha256 = "04r72b7vwbb5m7ik8lczknpl8qpfar3lhzj7plhzpq1sbqyj4kpm"; + }; + meta.homepage = "https://github.com/michal-h21/vim-zettel/"; + }; + vim2hs = buildVimPluginFrom2Nix { pname = "vim2hs"; version = "2014-04-16"; @@ -13007,12 +13535,12 @@ final: prev: vimproc-vim = buildVimPluginFrom2Nix { pname = "vimproc.vim"; - version = "2022-10-15"; + version = "2023-01-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "f396529d7868b43d88978eb347bb203353991184"; - sha256 = "1jn9z0c98hmza5nyjbhyjfdljq9rf8ypjn3q0qq82xxs9xzg9y6w"; + rev = "bf06f3f9bb1b60542fccde1ed7499798d1154db6"; + sha256 = "1nd6wrwwgz499inl42gih99da0nbpgwak6mswavs3ra906d3nsy3"; }; meta.homepage = "https://github.com/Shougo/vimproc.vim/"; }; @@ -13043,12 +13571,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-11-14"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "56f469c787c16bf3e57ab27d2d2b3f97064e7686"; - sha256 = "0i6g0flnnby189c1vbkam214ax76kpw5w0w6m326lpakqv4zbvp8"; + rev = "ecf0c51b07ffedeca054581623bdda0d458e39d2"; + sha256 = "0xvpfsbglr65zjs26slwms9n8ibjy4s93vny2p5s2q5f5mgnlsd7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -13056,12 +13584,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-11-19"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "b2a69e8f780709a4637f6e2fe809d6bd2a39af52"; - sha256 = "11h6bdndglq22y6w7fxzk43dia9kslgfc40l9z8r3cikd7w0pd0a"; + rev = "8ef5b0d9b85e7bb57b00b4571db4804aec0e10eb"; + sha256 = "1nk85v06s4kybvnmh8raxcmj49snph4nsbfyizwcixwr592amcs1"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13080,12 +13608,12 @@ final: prev: vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2022-03-10"; + version = "2022-12-05"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "63af6e72dd3fa840bffb3ebcb8c96970c02e0913"; - sha256 = "1cvi3bb9kqfwjh3d4biwxgavankj2ljiyss36q8z96czzaz2w40v"; + rev = "fea8bee382b2051b0137fd2cacf0862823ee69b3"; + sha256 = "1iwwy7ay01jkxgq83frr1xq0y3jvvs86paa43mn1ky6gk3q57s80"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; @@ -13128,12 +13656,12 @@ final: prev: vista-vim = buildVimPluginFrom2Nix { pname = "vista.vim"; - version = "2022-10-25"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "9ddb3707b066cb288aa1ac9c33477280e0ef95d3"; - sha256 = "03qls1ggnjqv38xg8sk2ssl02pibd2r2k36g0hxanx7zqq3nvgn0"; + rev = "33774aff5d8b224f24c2e4c6015c613c1a17bf74"; + sha256 = "0c3255id5wzgb1v5zsga7ig1b8mqmrbklmz40x98av4j5dqghfw7"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -13152,24 +13680,24 @@ final: prev: webapi-vim = buildVimPluginFrom2Nix { pname = "webapi-vim"; - version = "2022-03-11"; + version = "2022-11-23"; src = fetchFromGitHub { owner = "mattn"; repo = "webapi-vim"; - rev = "e9fdce27dc542f491c034a288bce5d74a79fb92d"; - sha256 = "09shpfr42h96qv4s9z3csjk39ppqmyxi183kpnli4479mc4z4df4"; + rev = "70c49ada7827d3545a65cbdab04c5c89a3a8464e"; + sha256 = "0sqhx4h2qchihf37g5fpa3arpxrnzsfpjj34ca3sdn4db89a0c8n"; }; meta.homepage = "https://github.com/mattn/webapi-vim/"; }; which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2022-10-28"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "61553aeb3d5ca8c11eea8be6eadf478062982ac9"; - sha256 = "11wvm95484axpjzar8y3pc8ah9162gn6s63yhn7z7y4c7zm4zci1"; + rev = "684e96c5e8477f1ee9b3f2e9a12d802fd12c5531"; + sha256 = "0kdmv1jkkfcrhrvc6mcdy173cx39mwq5nwq3yni46zgcn5iyxiq3"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -13198,14 +13726,26 @@ final: prev: meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; + winbar-nvim = buildVimPluginFrom2Nix { + pname = "winbar.nvim"; + version = "2022-07-18"; + src = fetchFromGitHub { + owner = "fgheng"; + repo = "winbar.nvim"; + rev = "13739fdb31be51a1000486189662596f07a59a31"; + sha256 = "1b9zfn5fpgibgjn64a6hb8w9d0zprkm1bz050fcd1vrv9dq1s7s7"; + }; + meta.homepage = "https://github.com/fgheng/winbar.nvim/"; + }; + windows-nvim = buildVimPluginFrom2Nix { pname = "windows.nvim"; - version = "2022-11-17"; + version = "2023-01-16"; src = fetchFromGitHub { owner = "anuvyklack"; repo = "windows.nvim"; - rev = "a37b5d021afbe9baf741bb40818bd14604dde424"; - sha256 = "0fyfjsf5ivl0w6ywj6wvahxv9xsixqjpg2hh3w36rikz7r9b5bz8"; + rev = "c7492552b23d0ab30325e90b56066ec51242adc8"; + sha256 = "0dcznmjsvh8hky76svvj523flxg10l351k0ps7zws0va87rdvz1m"; }; meta.homepage = "https://github.com/anuvyklack/windows.nvim/"; }; @@ -13284,12 +13824,12 @@ final: prev: xterm-color-table-vim = buildVimPluginFrom2Nix { pname = "xterm-color-table.vim"; - version = "2014-01-01"; + version = "2022-11-21"; src = fetchFromGitHub { owner = "guns"; repo = "xterm-color-table.vim"; - rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4"; - sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19"; + rev = "8785bb47a38a8bce3f5e452c083907e1a9b32763"; + sha256 = "0kh805r4a2b5smphqrg51l884fsgmsd0rsagq7lj2xy6b68dbpdz"; }; meta.homepage = "https://github.com/guns/xterm-color-table.vim/"; }; @@ -13333,24 +13873,24 @@ final: prev: zen-mode-nvim = buildVimPluginFrom2Nix { pname = "zen-mode.nvim"; - version = "2022-09-05"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "6f5702db4fd4a4c9a212f8de3b7b982f3d93b03c"; - sha256 = "04i8d7dlxmzgxiysy9jffxkpkw8h3qjkrv3l74z7pfksdmhlbbwz"; + rev = "136dda65769cee45119f16e4bc3d3f13a7aecb28"; + sha256 = "0bsnvcixvk2vrimbyhxblj9anhig69jwxscyd2l05pp1njpzb424"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; zenbones-nvim = buildVimPluginFrom2Nix { pname = "zenbones.nvim"; - version = "2022-10-22"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "mcchrish"; repo = "zenbones.nvim"; - rev = "0f7e9eb1ef309098e69e5e317508e9a7af299d94"; - sha256 = "03439c2z4p286mqncgii6gyg2pz7kk9mdfqbbfyg14ycwmfn949a"; + rev = "910b8c240c6aaf5263db038db81c538602c766c3"; + sha256 = "1r84wgz4p9zvpnz247xk0svq6r92ir3pgdlsbzf73qjwgph94q7k"; }; meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; @@ -13369,36 +13909,36 @@ final: prev: zephyr-nvim = buildVimPluginFrom2Nix { pname = "zephyr-nvim"; - version = "2022-10-17"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "glepnir"; repo = "zephyr-nvim"; - rev = "e36e00155a2f2c30efcbd43d7f8b518a5aef4b25"; - sha256 = "0vwlvmhwk8qsp1zxszgkzriwkzx939s46smq30mpl0vjqgm7vjr7"; + rev = "7fd86b7164442d3b5ec2c81b2694d040e716b5cf"; + sha256 = "12ichp7jmawgf1clwpd2w22a2amqlv578lnb89ppzf9hjz5kcxnb"; }; meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; }; zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2022-10-19"; + version = "2022-12-31"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "c33e1e312fc0f9523d09d7ddb845ea5d52db41d0"; - sha256 = "17iwx87n8w2ksi9f8ravsa69ng7gzn0px0d5pd58n3lsdvhcsm59"; + rev = "c8caa9ab97334ca5af2d69900108bb4af20933c5"; + sha256 = "0mpzlxbf9dclgs4r9pffhc31hri09c78dk9lpij8fr089srgcp5i"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; zk-nvim = buildVimPluginFrom2Nix { pname = "zk-nvim"; - version = "2022-11-13"; + version = "2022-12-19"; src = fetchFromGitHub { owner = "mickael-menu"; repo = "zk-nvim"; - rev = "1d2ebc679eeea8bfddc908e31bbe9e8b0928ef21"; - sha256 = "0inbay3sn8f78wvf1pl785nl0pdiv6m4604d3zh8a27myhw6lr2b"; + rev = "2fd9f9f29270bb28477e000100625276ec2a2377"; + sha256 = "1b8w280yivsb34547y7kdcsvgcil41sfj8kvyvs6d24yrxbqs20w"; }; meta.homepage = "https://github.com/mickael-menu/zk-nvim/"; }; @@ -13417,72 +13957,72 @@ final: prev: zoxide-vim = buildVimPluginFrom2Nix { pname = "zoxide.vim"; - version = "2022-06-29"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "nanotee"; repo = "zoxide.vim"; - rev = "7add42b0474b07c206c94d1693997e52d25c5fec"; - sha256 = "1csr4k4f9nybwa0h6fnd7wgr5cgqzqqqamr0xvrv4z1j4h24i5hr"; + rev = "f247421ca0c1934b8bb29abe06d334f0adc93d14"; + sha256 = "1h17aqjicfhp4qsrbwgw3vry8cvy8raxj9bq013n2vzq6h38392h"; }; meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-11-19"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "8d4b9ed1f9cb5a575a1fa25c506409416d347241"; - sha256 = "0q26mk92h1c6n0d9l6w3r6rpb6gka4iqd5as58p6bwxxbq23w6am"; + rev = "8769e767f12f5bf0b7d1250ee067088e7054809a"; + sha256 = "1k57sb89abypkiwx94w0dadbg5qc73q5lfragmnvm81hhikdbf5p"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; catppuccin-vim = buildVimPluginFrom2Nix { pname = "catppuccin-vim"; - version = "2022-11-18"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "catppuccin"; repo = "vim"; - rev = "a98a00617cc8f158eee2c100eb97113cac7e3204"; - sha256 = "0ci0ww6alb6j5x7dsg58bq4nq2km49pzk53d07fs1piad3z3hsvx"; + rev = "cf186cffa9b3b896b03e94247ac4b56994a09e34"; + sha256 = "17di30zm743sj707z8hg95z2g7687nd1wsxyyn20xy5s3f8lnx0v"; }; meta.homepage = "https://github.com/catppuccin/vim/"; }; chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-11-19"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "e95c1a8d8c2a849c3da63bbf7c98772b92fad7e9"; - sha256 = "1zhyiwasy207khr8dbgnl9xvay32b6wxl4plvarrpi263099z0yk"; + rev = "e82eb7f40313a52f80e2e14e6d8b5d014c83b053"; + sha256 = "02p7fvbampijqbkbjfq74hjm7h1ak6p5m6w5pv9askfc4vw0mcnj"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2022-11-07"; + version = "2022-12-22"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "b9f4f3a169266031d3744335595eee02a6e396c6"; - sha256 = "1a9vxpdh6ry9760m69762s5annq4k52k5bk9gy3v0lr4zyvfcfgf"; + rev = "eb577d47b0cfc9191bf04c414b4042d5f1a980f8"; + sha256 = "1zp55jg5prsvvq12y8c03arlwplgwwpr5hy14w9hhfmp2bix98lq"; }; meta.homepage = "https://github.com/dracula/vim/"; }; embark-vim = buildVimPluginFrom2Nix { pname = "embark-vim"; - version = "2022-09-12"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "96fdfff7dac84dda937d843a0aceb1c39acba761"; - sha256 = "1yms82s3iwis6lk5h1kapa9vlhlhbk1kqxlywlvvy6kz7d1iyvjj"; + rev = "89a044730bf5402c49db03475a9fa56782ca9d1c"; + sha256 = "0d7956wi0lcbimxbn5cmghw11vb8gfsg2pd6yr4xja6bb4ldlbrk"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -13499,6 +14039,18 @@ final: prev: meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; + lspsaga-nvim-original = buildVimPluginFrom2Nix { + pname = "lspsaga-nvim-original"; + version = "2023-02-03"; + src = fetchFromGitHub { + owner = "glepnir"; + repo = "lspsaga.nvim"; + rev = "2afe6de953b76d43822cf8377c019ff831a7c73b"; + sha256 = "1japfd2f7yw2vbyk7mh1qr0x6dnnra1k7frl3k077spc3nanh57r"; + }; + meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; + }; + mattn-calendar-vim = buildVimPluginFrom2Nix { pname = "mattn-calendar-vim"; version = "2022-02-10"; @@ -13525,12 +14077,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2022-11-09"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "bfc2aa0006ad56f1a9792d6c52dc7f04fb4af94d"; - sha256 = "088wwwsqwxhii7n88k3kd6mqf7jajiva9a4a3g87nflf4g11fh57"; + rev = "845a6ad5443e3559dde42910c4523a5835c9233b"; + sha256 = "189h3x01jz0hqcvrldfpicnl64f05v00hr93vyldj2isdrspm3pc"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 14c265b92840..a1b0c2af0316 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -1,12 +1,23 @@ # generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py -{ buildGrammar, fetchFromGitHub, fetchFromGitLab, fetchgit }: +{ buildGrammar, fetchCrate, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchHex, fetchPypi, fetchgit, fetchhg, fetchsvn }: { + ada = buildGrammar { + language = "ada"; + version = "e9e2ec9"; + src = fetchFromGitHub { + owner = "briot"; + repo = "tree-sitter-ada"; + rev = "e9e2ec9d3b6302e9b455901bec00036e29d1c121"; + hash = "sha256-buTQ1GjaJSVy4SPikZq88bifWubyHtPSI4ac7p1/tOg="; + }; + meta.homepage = "https://github.com/briot/tree-sitter-ada"; + }; agda = buildGrammar { language = "agda"; version = "80ea622"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "AusCyberman"; repo = "tree-sitter-agda"; rev = "80ea622cf952a0059e168e5c92a798b2f1925652"; @@ -17,7 +28,7 @@ arduino = buildGrammar { language = "arduino"; version = "c473c09"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; rev = "c473c09f23b13d9404ec5208fad3eddea89d70f8"; @@ -27,19 +38,19 @@ }; astro = buildGrammar { language = "astro"; - version = "947e930"; - source = fetchFromGitHub { + version = "a1f66bf"; + src = fetchFromGitHub { owner = "virchau13"; repo = "tree-sitter-astro"; - rev = "947e93089e60c66e681eba22283f4037841451e7"; - hash = "sha256-q1ni++SPbq5y+47fPb6TryMw86gpULwNcXwi5yjXCWI="; + rev = "a1f66bf72ed68b87f779bce9a52e5c6521fc867e"; + hash = "sha256-Q+nOJQAAHqvyH8PVckh38q0TJ6b9jjb/pZHC/U2Hs5Q="; }; meta.homepage = "https://github.com/virchau13/tree-sitter-astro"; }; awk = buildGrammar { language = "awk"; version = "e559793"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; rev = "e559793754c60c2cdf00cbb0409842d75f0a41dc"; @@ -49,30 +60,30 @@ }; bash = buildGrammar { language = "bash"; - version = "77cf8a7"; - source = fetchFromGitHub { + version = "7f9506c"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "77cf8a7cab8904baf1a721762e012644ac1d4c7b"; - hash = "sha256-UPMJ7iL8Y0NkAHtPDrkTjG1qFwr8rXuGqvsG+LTWqEY="; + rev = "7f9506c34ab6a0f4e3e052b7a49cbeef91f71236"; + hash = "sha256-D9FesfedHnHWUcCIPGs72fpgeBO3xZ2rWTRDewa4qzM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; beancount = buildGrammar { language = "beancount"; - version = "4cbd1f0"; - source = fetchFromGitHub { + version = "f3741a3"; + src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "4cbd1f09cd07c1f1fabf867c2cf354f9da53cc4c"; - hash = "sha256-Uh9/yBYXNKBvdpqNv1kr5eREYmKy3Z/kvaSZQpUl+0U="; + rev = "f3741a3a68ade59ec894ed84a64673494d2ba8f3"; + hash = "sha256-WtZ3FindaePKbtlnilK9KkOoPxBaxRKNVM+8D52DtBE="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; bibtex = buildGrammar { language = "bibtex"; version = "ccfd77d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-bibtex"; rev = "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"; @@ -83,7 +94,7 @@ blueprint = buildGrammar { language = "blueprint"; version = "6ef91ca"; - source = fetchFromGitLab { + src = fetchFromGitLab { owner = "gabmus"; repo = "tree-sitter-blueprint"; rev = "6ef91ca8270f0112b9c6d27ecb9966c741a5d103"; @@ -94,7 +105,7 @@ c = buildGrammar { language = "c"; version = "7175a6d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; rev = "7175a6dd5fc1cee660dce6fe23f6043d75af424a"; @@ -104,41 +115,52 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "3ef3f7f"; - source = fetchFromGitHub { + version = "a29bac0"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "3ef3f7f99e16e528e6689eae44dff35150993307"; - hash = "sha256-xBRSwuodQTrKHjwx3JVgnwsAkp9EO+6su3hc2d+6DBQ="; + rev = "a29bac0681802139710b4d3875540901504d15cb"; + hash = "sha256-TpOaxR0Do7oGjAZ8IrbXJAP6//Kt7VxhkrWEz7yNiLY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; + capnp = buildGrammar { + language = "capnp"; + version = "740c757"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-capnp"; + rev = "740c757b9585925b1ed27cef7d61ac39b7824304"; + hash = "sha256-0zCSWV3afsEIhN6XavMnn4LrLenjerhdnTfQ/EaL4aA="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-capnp"; + }; clojure = buildGrammar { language = "clojure"; - version = "087bac7"; - source = fetchFromGitHub { + version = "262d6d6"; + src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-clojure"; - rev = "087bac78c53fe1387756cd5b8e68a69b3f6d7244"; - hash = "sha256-KiuSAchtqlVlwyBL4rU+p0fPjm52DrNDPq2ETVXOHQU="; + rev = "262d6d60f39f0f77b3dd08da8ec895bd5a044416"; + hash = "sha256-9+tMkv329FfxYzALxkr6QZBEmJJBKUDBK4RzIsNL7S0="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-clojure"; }; cmake = buildGrammar { language = "cmake"; - version = "6e51463"; - source = fetchFromGitHub { + version = "a322653"; + src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "6e51463ef3052dd3b328322c22172eda093727ad"; - hash = "sha256-2xJaDgrCJQ2obGYvhsHk2/2p8lFNwuScjbjdxJihh5I="; + rev = "a32265307aa2d31941056d69e8b6633e61750b2f"; + hash = "sha256-LBd3SMem1dxZr/dOdJdEFTQxI6d+H8uYE46yN02E/6Y="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; comment = buildGrammar { language = "comment"; version = "a37ca37"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-comment"; rev = "a37ca370310ac6f89b6e0ebf2b86b2219780494e"; @@ -149,7 +171,7 @@ commonlisp = buildGrammar { language = "commonlisp"; version = "c7e8149"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-commonlisp"; rev = "c7e814975ab0d0d04333d1f32391c41180c58919"; @@ -160,7 +182,7 @@ cooklang = buildGrammar { language = "cooklang"; version = "5e11341"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "addcninblue"; repo = "tree-sitter-cooklang"; rev = "5e113412aadb78955c27010daa4dbe1d202013cf"; @@ -170,19 +192,19 @@ }; cpp = buildGrammar { language = "cpp"; - version = "5ead1e2"; - source = fetchFromGitHub { + version = "56cec4c"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "5ead1e26c6ab71919db0f1880c46a278a93bc5ea"; - hash = "sha256-h6mJdmQzJlxYIcY+d5IiaFghraUgBGZwqFPKwB3E4pQ="; + rev = "56cec4c2eb5d6af3d2942e69e35db15ae2433740"; + hash = "sha256-CWh5p0tlBQizABjwBRN1VoxeEriOPhTy3lFZI9PjsTA="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; css = buildGrammar { language = "css"; version = "769203d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-css"; rev = "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"; @@ -192,19 +214,19 @@ }; cuda = buildGrammar { language = "cuda"; - version = "7f1a79e"; - source = fetchFromGitHub { + version = "a02c214"; + src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "7f1a79e612160aa02be87f1a24469ae3655fe818"; - hash = "sha256-zBlv/KyUPNHRA8fKWaDgCeE1AX3EYTkwjo/RYHaKjK0="; + rev = "a02c21408c592e6e6856eaabe4727faa97cf8d85"; + hash = "sha256-bgyisXPNZXlvPF0nRPD5LeVhvbTx0TLgnToue9IFHwI="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; d = buildGrammar { language = "d"; version = "c2fbf21"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "CyberShadow"; repo = "tree-sitter-d"; rev = "c2fbf21bd3aa45495fe13247e040ad5815250032"; @@ -216,7 +238,7 @@ dart = buildGrammar { language = "dart"; version = "53485a8"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; rev = "53485a8f301254e19c518aa20c80f1bcf7cf5c62"; @@ -227,7 +249,7 @@ devicetree = buildGrammar { language = "devicetree"; version = "ea30a05"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "joelspadin"; repo = "tree-sitter-devicetree"; rev = "ea30a05d0f0446a96d8b096ad11828ad4f8ad849"; @@ -238,30 +260,30 @@ }; diff = buildGrammar { language = "diff"; - version = "330eb64"; - source = fetchFromGitHub { + version = "1d63cd4"; + src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-diff"; - rev = "330eb648bbc257b4e91621e82a85372be7dde27a"; - hash = "sha256-WK6pEUvIu6Xwsy5RuuUyNWLuSKkNkWh5R0hmyksIu8k="; + rev = "1d63cd49529ef3153393cf8f620718b274bba715"; + hash = "sha256-nAU3IFUsxcqgx/2cFoqNJXtJ7v7KRHVrfKYIVQEJCEk="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff"; }; dockerfile = buildGrammar { language = "dockerfile"; - version = "f913be9"; - source = fetchFromGitHub { + version = "09e316d"; + src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-dockerfile"; - rev = "f913be9bb8689af22114605012693146fbe9ddaa"; - hash = "sha256-EoZDjUyL4dEwE6E9r9KruQ8Kb83bAyyFq7a/NFBdZjU="; + rev = "09e316dba307b869831e9399b11a83bbf0f2a24b"; + hash = "sha256-FffwAt9FJurxFJajLTsQe5tLeZty3nSbXBRkgdjNOJ4="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile"; }; dot = buildGrammar { language = "dot"; version = "9ab8555"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "rydesun"; repo = "tree-sitter-dot"; rev = "9ab85550c896d8b294d9b9ca1e30698736f08cea"; @@ -269,10 +291,22 @@ }; meta.homepage = "https://github.com/rydesun/tree-sitter-dot"; }; + ebnf = buildGrammar { + language = "ebnf"; + version = "ef241bc"; + src = fetchFromGitHub { + owner = "RubixDev"; + repo = "ebnf"; + rev = "ef241bc09f2f105c35f5e4f2ccd8a522dd99071c"; + hash = "sha256-N5TGYJnYNjYIdFXspGn+dDRm0wmJymXHY+Io43wSKlI="; + }; + location = "crates/tree-sitter-ebnf"; + meta.homepage = "https://github.com/RubixDev/ebnf.git"; + }; eex = buildGrammar { language = "eex"; version = "f742f2f"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-eex"; rev = "f742f2fe327463335e8671a87c0b9b396905d1d1"; @@ -283,7 +317,7 @@ elixir = buildGrammar { language = "elixir"; version = "b20eaa7"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; rev = "b20eaa75565243c50be5e35e253d8beb58f45d56"; @@ -294,7 +328,7 @@ elm = buildGrammar { language = "elm"; version = "28bb193"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; rev = "28bb193640d916dfaf947912c1413cebb0484841"; @@ -302,10 +336,21 @@ }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; + elsa = buildGrammar { + language = "elsa"; + version = "c83c21c"; + src = fetchFromGitHub { + owner = "glapa-grossklag"; + repo = "tree-sitter-elsa"; + rev = "c83c21c1f8f6b38dfc5bd1392de03a7b05bb78f4"; + hash = "sha256-6PnI58jxuRuluK11/6hjTI24AVq2IQcuIplhvCv10nA="; + }; + meta.homepage = "https://github.com/glapa-grossklag/tree-sitter-elsa"; + }; elvish = buildGrammar { language = "elvish"; version = "f32711e"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ckafi"; repo = "tree-sitter-elvish"; rev = "f32711e31e987fd5c2c002f3daba02f25c68672f"; @@ -315,30 +360,30 @@ }; embedded_template = buildGrammar { language = "embedded_template"; - version = "91fc5ae"; - source = fetchFromGitHub { + version = "a130858"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-embedded-template"; - rev = "91fc5ae1140d5c9d922312431f7d251a48d7b8ce"; - hash = "sha256-WAMCwKS+gOvBVC9h0qKHLgNedCRQwbJV+++SDqHhK5g="; + rev = "a13085849cf69e2401ec44e38cffc3d73f22f3df"; + hash = "sha256-JNyLOW/na8J0WEsLDv3BuC+UXxGpYMYvAlywq4z6Wzo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template"; }; erlang = buildGrammar { language = "erlang"; - version = "3a9c769"; - source = fetchFromGitHub { - owner = "AbstractMachinesLab"; + version = "2422bc9"; + src = fetchFromGitHub { + owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "3a9c769444f08bbccce03845270efac0c641c5e7"; - hash = "sha256-ZsjHTNUfTEPo3Wb1ihW0M2YTWK6mpNhxQG/nLfMaG4I="; + rev = "2422bc9373094bfa97653ac540e08759f812523c"; + hash = "sha256-DTIA3EP2RQtts6Hl6FThSxN1SwEUbRVJJig8zOUQRCo="; }; - meta.homepage = "https://github.com/AbstractMachinesLab/tree-sitter-erlang"; + meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; fennel = buildGrammar { language = "fennel"; version = "5171959"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "travonted"; repo = "tree-sitter-fennel"; rev = "517195970428aacca60891b050aa53eabf4ba78d"; @@ -348,41 +393,63 @@ }; fish = buildGrammar { language = "fish"; - version = "84436cf"; - source = fetchFromGitHub { + version = "6675b56"; + src = fetchFromGitHub { owner = "ram02z"; repo = "tree-sitter-fish"; - rev = "84436cf24c2b3176bfbb220922a0fdbd0141e406"; - hash = "sha256-oJuCd+2mTCEP/rNQzweShc7TZiqwKBIDRQqnV8VqQ4s="; + rev = "6675b56266b3f615fb112205b6b83a79315309c4"; + hash = "sha256-hU2QMiNfO5/Drjl0QoUb9ERaK/3ETGaIsDBHMZ70n/A="; }; meta.homepage = "https://github.com/ram02z/tree-sitter-fish"; }; foam = buildGrammar { language = "foam"; - version = "fdb7f14"; - source = fetchFromGitHub { + version = "c238f4a"; + src = fetchFromGitHub { owner = "FoamScience"; repo = "tree-sitter-foam"; - rev = "fdb7f14b885abfc4df57728c9b2a2f2ad24d3cb7"; - hash = "sha256-E5Fr8185ypZbkaGIDE9lhQ0Vf1Dphx7n5suNkK0AFHU="; + rev = "c238f4af9a5723a212cf1a4c9b31dd5c1d5270a2"; + hash = "sha256-GCVV7kj+5S12jedyMajw2OcFOJ0Wz8hiDCImh/G1ngg="; }; meta.homepage = "https://github.com/FoamScience/tree-sitter-foam"; }; fortran = buildGrammar { language = "fortran"; - version = "f0f2f10"; - source = fetchFromGitHub { + version = "edcb337"; + src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "f0f2f100952a353e64e26b0fa710b4c296d7af13"; - hash = "sha256-ylQLalRFqRu5N/lUxvwOds/UbLH2JJ7T/rOpo9H4MZ4="; + rev = "edcb3374f4698aaedf24bc572f6b2f5ef0e89ac7"; + hash = "sha256-xZfWtRHWy3MQtkzN9jSwx+sAwLlcRiVLTJjYXyWEIs8="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; + fsh = buildGrammar { + language = "fsh"; + version = "fa33477"; + src = fetchFromGitHub { + owner = "mgramigna"; + repo = "tree-sitter-fsh"; + rev = "fa3347712f7a59ed02ccf508284554689c6cde28"; + hash = "sha256-6TLG2edQeo+jRVAnO6mq3pC8RYNFi2UVVT3mQGZqk5U="; + }; + meta.homepage = "https://github.com/mgramigna/tree-sitter-fsh"; + }; + func = buildGrammar { + language = "func"; + version = "88ee7d0"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-func"; + rev = "88ee7d0f569af10ab8c78a12f37217a8d15a0ffa"; + hash = "sha256-SLI59AtprfCQr6VccCVr+2sazEtUSXnAwHcclWrkXxA="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-func"; + }; fusion = buildGrammar { language = "fusion"; version = "19db2f4"; - source = fetchFromGitLab { + src = fetchFromGitLab { owner = "jirgn"; repo = "tree-sitter-fusion"; rev = "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6"; @@ -392,19 +459,19 @@ }; gdscript = buildGrammar { language = "gdscript"; - version = "2a6abda"; - source = fetchFromGitHub { + version = "a8fa839"; + src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-gdscript"; - rev = "2a6abdaa47fcb91397e09a97c7433fd995ea46c6"; - hash = "sha256-YDLPYwWHnwqj7CpgUKRXQYj2a6ZJUKc0bcalVSJ99Ew="; + rev = "a8fa839150d05baaf4d5a472520ee71e9b1d8b3c"; + hash = "sha256-uSpic8MKMvl1p7LOHNn5EJGp1iOYkeqcRt7skdROmBo="; }; meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript"; }; git_rebase = buildGrammar { language = "git_rebase"; version = "127f5b5"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-rebase"; rev = "127f5b56c1ad3e8a449a7d6e0c7412ead7f7724c"; @@ -414,19 +481,30 @@ }; gitattributes = buildGrammar { language = "gitattributes"; - version = "cee9f88"; - source = fetchFromGitHub { + version = "577a075"; + src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-gitattributes"; - rev = "cee9f8865694b29bb9e85e0b90805f92ad3fc47e"; - hash = "sha256-Ne9D4c58AWvZz/2ytP0lJzKIss2hJtZFgSKsot9MOJE="; + rev = "577a075d46ea109905c5cb6179809df88da61ce9"; + hash = "sha256-gBfLmNf7aaqMY3yMF7svFuqif43BAmmY1yYkvVcNUhI="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gitattributes"; }; + gitcommit = buildGrammar { + language = "gitcommit"; + version = "f71b93f"; + src = fetchFromGitHub { + owner = "gbprod"; + repo = "tree-sitter-gitcommit"; + rev = "f71b93f399c9c2b315825827c95466e7405ec622"; + hash = "sha256-489Rbi75XbW/IuFLijFThsI+BNXqVY1tVALwMT6yie0="; + }; + meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; + }; gitignore = buildGrammar { language = "gitignore"; version = "f4685bf"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "shunsambongi"; repo = "tree-sitter-gitignore"; rev = "f4685bf11ac466dd278449bcfe5fd014e94aa504"; @@ -438,7 +516,7 @@ gleam = buildGrammar { language = "gleam"; version = "cfcbca3"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "J3RN"; repo = "tree-sitter-gleam"; rev = "cfcbca3f8f734773878e00d7bfcedea98eb10be2"; @@ -448,41 +526,41 @@ }; glimmer = buildGrammar { language = "glimmer"; - version = "abcc997"; - source = fetchFromGitHub { + version = "c0bfd26"; + src = fetchFromGitHub { owner = "alexlafroscia"; repo = "tree-sitter-glimmer"; - rev = "abcc9970da0ed0645741bf52ea70232374bc9e52"; - hash = "sha256-kkNnyaAXeZJ770Jl4mmOdyXvq6bQd/9Q6eVyr+JV2jY="; + rev = "c0bfd260cdcbe2976f4633547c218f09f7222a89"; + hash = "sha256-Goj900MJxO44KYkzD0UpGFEGHAwr6qhe2bmCzpx5BhE="; }; meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer"; }; glsl = buildGrammar { language = "glsl"; - version = "a743ada"; - source = fetchFromGitHub { + version = "e2c2214"; + src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "a743ada24fa17da9acc5665133f07d56e03530be"; - hash = "sha256-l2t2U4fZYMMpc1Nkv8JODtDny0/kSUsbiJ/VVD5VyhI="; + rev = "e2c2214045de2628b81089b1a739962f59654558"; + hash = "sha256-GrbheFLeJLAvm3LE4WOfmYnIjVcRkD9pfugJJuIc25A="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; go = buildGrammar { language = "go"; - version = "05900fa"; - source = fetchFromGitHub { + version = "64457ea"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; - rev = "05900faa3cdb5d2d8c8bd5e77ee698487e0a8611"; - hash = "sha256-f885YTswEDH/QfRPUxcLp/1E2zXLKl25R9IyTGKb1eM="; + rev = "64457ea6b73ef5422ed1687178d4545c3e91334a"; + hash = "sha256-38pkqR9iEIEf9r3IHJPIYgKfWBlb9aQWi1kij04Vo5k="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; godot_resource = buildGrammar { language = "godot_resource"; version = "b6ef076"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-godot-resource"; rev = "b6ef0768711086a86b3297056f9ffb5cc1d77b4a"; @@ -494,7 +572,7 @@ gomod = buildGrammar { language = "gomod"; version = "4a65743"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-go-mod"; rev = "4a65743dbc2bb3094114dd2b43da03c820aa5234"; @@ -502,10 +580,21 @@ }; meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod"; }; + gosum = buildGrammar { + language = "gosum"; + version = "68974b6"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-go-sum"; + rev = "68974b63c19dc6e27214a5c76b6e26c0c40fe5b7"; + hash = "sha256-Avk9nAICwy59VYIlLhp9FkozAna9kMwY60pAqKyJsK4="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-go-sum"; + }; gowork = buildGrammar { language = "gowork"; version = "949a8a4"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "omertuc"; repo = "tree-sitter-go-work"; rev = "949a8a470559543857a62102c84700d291fc984c"; @@ -516,7 +605,7 @@ graphql = buildGrammar { language = "graphql"; version = "5e66e96"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "bkegley"; repo = "tree-sitter-graphql"; rev = "5e66e961eee421786bdda8495ed1db045e06b5fe"; @@ -527,7 +616,7 @@ hack = buildGrammar { language = "hack"; version = "b7bd692"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "slackhq"; repo = "tree-sitter-hack"; rev = "b7bd6928532ada34dddb1dece4a158ab62c6e783"; @@ -538,7 +627,7 @@ haskell = buildGrammar { language = "haskell"; version = "aee3725"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; rev = "aee3725d02cf3bca5f307b35dd3a96a97e109b4e"; @@ -548,19 +637,19 @@ }; hcl = buildGrammar { language = "hcl"; - version = "45ce22c"; - source = fetchFromGitHub { + version = "0ff887f"; + src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "45ce22c16ec924e34517cf785e23c07952e45893"; - hash = "sha256-SczU8y70mdqDl2iVKTfD8Taq580x31xMswUhoU48yfE="; + rev = "0ff887f2a60a147452d52db060de6b42f42f1441"; + hash = "sha256-L4B2qtGqrtyLHyUMx1p0t4aKncm72dUE+e19Fv5iqUA="; }; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; heex = buildGrammar { language = "heex"; version = "2e1348c"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-heex"; rev = "2e1348c3cf2c9323e87c2744796cf3f3868aa82a"; @@ -570,19 +659,19 @@ }; help = buildGrammar { language = "help"; - version = "49cdef5"; - source = fetchFromGitHub { + version = "8f75ef3"; + src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "49cdef52ded4a886bf34bc474876b09f9270d48f"; - hash = "sha256-szNY2yw5i9pgF+MpaEAkP8BgSYEe6nrFW+17sbSZ6Yc="; + rev = "8f75ef3ec86bc315d5fdb939899b397289389181"; + hash = "sha256-zzD899bOSVn0/RCki6i8wHEQgaIrCurRw4AxnN3J+VA="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; hjson = buildGrammar { language = "hjson"; version = "02fa3b7"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "winston0410"; repo = "tree-sitter-hjson"; rev = "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"; @@ -592,19 +681,19 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "384b26e"; - source = fetchFromGitHub { + version = "8e2f090"; + src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "384b26ec65e10f26cf147bfcde772c50ca5ef0d0"; - hash = "sha256-f6jKhC1vPpNTY0Rv1WMdJMNXRFiLsCApy/kIv7CBesA="; + rev = "8e2f0907e8d2e17a88a375025e70054bafdaa8b0"; + hash = "sha256-kBSigaBR6uM4E9uHI79gYlxBrN0E5i1zTW8syMPIQdI="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; hocon = buildGrammar { language = "hocon"; version = "c390f10"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "antosha417"; repo = "tree-sitter-hocon"; rev = "c390f10519ae69fdb03b3e5764f5592fb6924bcc"; @@ -615,7 +704,7 @@ html = buildGrammar { language = "html"; version = "29f53d8"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; rev = "29f53d8f4f2335e61bf6418ab8958dac3282077a"; @@ -623,43 +712,65 @@ }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; + htmldjango = buildGrammar { + language = "htmldjango"; + version = "b2dba02"; + src = fetchFromGitHub { + owner = "interdependence"; + repo = "tree-sitter-htmldjango"; + rev = "b2dba02eddab66be669022320273d0dfe1ff923d"; + hash = "sha256-FEsvr9i0Lys8CzDlm2lhdJEAQNnmqRSFjn4I+CcZYM8="; + }; + meta.homepage = "https://github.com/interdependence/tree-sitter-htmldjango"; + }; http = buildGrammar { language = "http"; - version = "30a9c17"; - source = fetchFromGitHub { + version = "2c6c445"; + src = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; - rev = "30a9c1789d64429a830802cde5b1760ff1064312"; - hash = "sha256-XpKw6v6fnowdJmoIZGn3N1r9JXdJnNifgj+DPNFuoz0="; + rev = "2c6c44574031263326cb1e51658bbc0c084326e7"; + hash = "sha256-R81n6vb7JzZlnK17SkiwYeJeMs0xYTXx/qFdTvT8V5c="; }; meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; + ini = buildGrammar { + language = "ini"; + version = "1a0ce07"; + src = fetchFromGitHub { + owner = "justinmk"; + repo = "tree-sitter-ini"; + rev = "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44"; + hash = "sha256-pPtKokpTgjoNzPW4dRkOnyzBBJFeJj3+CW3LbHSKsmU="; + }; + meta.homepage = "https://github.com/justinmk/tree-sitter-ini"; + }; java = buildGrammar { language = "java"; - version = "09d650d"; - source = fetchFromGitHub { + version = "dd597f1"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "09d650def6cdf7f479f4b78f595e9ef5b58ce31e"; - hash = "sha256-tGBi6gJJIPpp6oOwmAQdqBD6eaJRBRcYbWtm1BHsgBA="; + rev = "dd597f13eb9bab0c1bccc9aec390e8e6ebf9e0a6"; + hash = "sha256-JeQZ4TMpt6Lfbcfc6m/PzhFZEgTdouasJ3b1sPISy2s="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "936d976"; - source = fetchFromGitHub { + version = "15e85e8"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "936d976a782e75395d9b1c8c7c7bf4ba6fe0d86b"; - hash = "sha256-uZW1L9ZE1YSZbwxiqSDiKycWv5mSRG4k4MlWFYoWRbw="; + rev = "15e85e80b851983fab6b12dce5a535f5a0df0f9c"; + hash = "sha256-2SAJBnY8pmynGqB8OVqHeeAKovskO+C/XiJbLTKSlcM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; jq = buildGrammar { language = "jq"; version = "13990f5"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "flurie"; repo = "tree-sitter-jq"; rev = "13990f530e8e6709b7978503da9bc8701d366791"; @@ -670,7 +781,7 @@ jsdoc = buildGrammar { language = "jsdoc"; version = "189a6a4"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-jsdoc"; rev = "189a6a4829beb9cdbe837260653b4a3dfb0cc3db"; @@ -681,7 +792,7 @@ json = buildGrammar { language = "json"; version = "7307675"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-json"; rev = "73076754005a460947cafe8e03a8cf5fa4fa2938"; @@ -692,7 +803,7 @@ json5 = buildGrammar { language = "json5"; version = "5dd5cdc"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Joakker"; repo = "tree-sitter-json5"; rev = "5dd5cdc418d9659682556b6adca2dd9ace0ac6d2"; @@ -703,7 +814,7 @@ jsonc = buildGrammar { language = "jsonc"; version = "02b0165"; - source = fetchFromGitLab { + src = fetchFromGitLab { owner = "WhyNotHugo"; repo = "tree-sitter-jsonc"; rev = "02b01653c8a1c198ae7287d566efa86a135b30d5"; @@ -713,41 +824,52 @@ }; jsonnet = buildGrammar { language = "jsonnet"; - version = "0475a50"; - source = fetchFromGitHub { + version = "505f5bd"; + src = fetchFromGitHub { owner = "sourcegraph"; repo = "tree-sitter-jsonnet"; - rev = "0475a5017ad7dc84845d1d33187f2321abcb261d"; - hash = "sha256-7LdIA+tsFUIvAk9GoqJwSU5tJDNPtsziv0rbiiLmCLY="; + rev = "505f5bd90053ae895aa3d6f2bac8071dd9abd8b2"; + hash = "sha256-XZqywAzM+UCKto/OFn50hhRpEyFVLpFV7Q1Z0NKoPsI="; }; meta.homepage = "https://github.com/sourcegraph/tree-sitter-jsonnet"; }; julia = buildGrammar { language = "julia"; - version = "6287135"; - source = fetchFromGitHub { + version = "e2f449e"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "628713553c42f30595a3b0085bb587e9359b986a"; - hash = "sha256-vB9HnWQ+659Itu8cvd0meLbbLzn62/dDroA3vB7ZtIs="; + rev = "e2f449e2bcc95f1d07ceb62d67f986005f73a6be"; + hash = "sha256-ZXnEvHtheP8rI/lwPf94lVCF5S5rw38bewuZ0GHxjr8="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; + kdl = buildGrammar { + language = "kdl"; + version = "f83f394"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-kdl"; + rev = "f83f3943568c7e7b4f5e0de1b04d722223bd4d80"; + hash = "sha256-BakY6V4A2N/ZZCkyr7KU04/DWeGTAkkJua5TyZ6uNW4="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-kdl"; + }; kotlin = buildGrammar { language = "kotlin"; - version = "b953dbd"; - source = fetchFromGitHub { + version = "e463703"; + src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "b953dbdd05257fcb2b64bc4d9c1578fac12e3c28"; - hash = "sha256-xTbRn7bDN6FR9UOzw43RVHIahI/DFjwLGQj3cYoPurY="; + rev = "e4637037a5fe6f25fe66c305669faa0855f35692"; + hash = "sha256-Xoj9RJqtyNtwag5tXRfu5iJpTnajRk1g7ClflBbFZyI="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; lalrpop = buildGrammar { language = "lalrpop"; version = "7744b56"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "traxys"; repo = "tree-sitter-lalrpop"; rev = "7744b56f03ac1e5643fad23c9dd90837fe97291e"; @@ -757,19 +879,19 @@ }; latex = buildGrammar { language = "latex"; - version = "8c75e93"; - source = fetchFromGitHub { + version = "6b7ea83"; + src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "8c75e93cd08ccb7ce1ccab22c1fbd6360e3bcea6"; - hash = "sha256-zkp4De2eBoOsPZRHHT3mIPVWFPYboTvn6AQ4AkwXhFE="; + rev = "6b7ea839307670e6bda011f888717d3a882ecc09"; + hash = "sha256-fmMm6HM9ZCnTyDxKmouoKFPYWkbrM//gHwVEFsICzUs="; }; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; }; ledger = buildGrammar { language = "ledger"; version = "47b8971"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "cbarrete"; repo = "tree-sitter-ledger"; rev = "47b8971448ce5e9abac865f450c1b14fb3b6eee9"; @@ -780,7 +902,7 @@ llvm = buildGrammar { language = "llvm"; version = "e9948ed"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "benwilliamgraham"; repo = "tree-sitter-llvm"; rev = "e9948edc41e9e5869af99dddb2b5ff5cc5581af6"; @@ -790,19 +912,19 @@ }; lua = buildGrammar { language = "lua"; - version = "fb30e8c"; - source = fetchFromGitHub { + version = "0fc8996"; + src = fetchFromGitHub { owner = "MunifTanjim"; repo = "tree-sitter-lua"; - rev = "fb30e8cb605e2ebd6c643e6981325a63fbbde320"; - hash = "sha256-gT2WHH3rkFzb6iER0ryVU7bqVbh36RbTI9HSWMh3DsI="; + rev = "0fc89962b7ff5c7d676b8592c1cbce1ceaa806fd"; + hash = "sha256-MbNP1/NKdSkUTydmK819o8vMKUZFan1yE7d227xMsh4="; }; meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua"; }; m68k = buildGrammar { language = "m68k"; version = "d097b12"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "grahambates"; repo = "tree-sitter-m68k"; rev = "d097b123f19c6eaba2bf181c05420d88b9fc489d"; @@ -813,7 +935,7 @@ make = buildGrammar { language = "make"; version = "a4b9187"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "alemuller"; repo = "tree-sitter-make"; rev = "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"; @@ -823,24 +945,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "272e080"; - source = fetchFromGitHub { + version = "abea13b"; + src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "272e080bca0efd19a06a7f4252d746417224959e"; - hash = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE="; + rev = "abea13b86c404564991244b69b7afc4ca362d0c0"; + hash = "sha256-gdRl+jTSGlijc3/hn1BYClAlpYljzSRVpRoi9Q446PU="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "272e080"; - source = fetchFromGitHub { + version = "abea13b"; + src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "272e080bca0efd19a06a7f4252d746417224959e"; - hash = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE="; + rev = "abea13b86c404564991244b69b7afc4ca362d0c0"; + hash = "sha256-gdRl+jTSGlijc3/hn1BYClAlpYljzSRVpRoi9Q446PU="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -848,7 +970,7 @@ menhir = buildGrammar { language = "menhir"; version = "db7953a"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Kerl13"; repo = "tree-sitter-menhir"; rev = "db7953acb0d5551f207373c81fa07a57d7b085cb"; @@ -856,32 +978,43 @@ }; meta.homepage = "https://github.com/Kerl13/tree-sitter-menhir"; }; + mermaid = buildGrammar { + language = "mermaid"; + version = "d787c66"; + src = fetchFromGitHub { + owner = "monaqa"; + repo = "tree-sitter-mermaid"; + rev = "d787c66276e7e95899230539f556e8b83ee16f6d"; + hash = "sha256-JwQ3jfwwOvM9eJWP/D3wXUBDysRxpa+mktYFajwA3IA="; + }; + meta.homepage = "https://github.com/monaqa/tree-sitter-mermaid"; + }; meson = buildGrammar { language = "meson"; - version = "153d225"; - source = fetchFromGitHub { + version = "5f3138d"; + src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-meson"; - rev = "153d22588fb5c1eee16a165a084f9ea30f29d941"; - hash = "sha256-q0qcRe94+zFvNzZV6vGGihL5xLl8Vr0lwDZAIYKPq2A="; + rev = "5f3138d555aceef976ec9a1d4a3f78e13b31e45f"; + hash = "sha256-P0S2JpRjAznDLaU97NMzLuuNyPqqy4RNqBa+PKvyl6s="; }; meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson"; }; nickel = buildGrammar { language = "nickel"; - version = "9d83db4"; - source = fetchFromGitHub { + version = "d6c7eeb"; + src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "9d83db400b6c11260b9106f131f93ddda8131933"; - hash = "sha256-Jv7GMm6TpJE8+0pG045rFWkW/9rkv1Pn/6ko2a0bpmY="; + rev = "d6c7eeb751038f934b5b1aa7ff236376d0235c56"; + hash = "sha256-D/RRwXsWyHMxoU7Z8VVJ6jn7zUFKaKusLT/ofON7sOE="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; ninja = buildGrammar { language = "ninja"; version = "0a95cfd"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "alemuller"; repo = "tree-sitter-ninja"; rev = "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"; @@ -892,7 +1025,7 @@ nix = buildGrammar { language = "nix"; version = "6b71a81"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; rev = "6b71a810c0acd49b980c50fc79092561f7cee307"; @@ -902,35 +1035,35 @@ }; norg = buildGrammar { language = "norg"; - version = "8ad2005"; - source = fetchFromGitHub { + version = "6348056"; + src = fetchFromGitHub { owner = "nvim-neorg"; repo = "tree-sitter-norg"; - rev = "8ad20059c6f128861c4506fff866150ffee1d6f4"; - hash = "sha256-1cKH3k/nbZhZleINZ91M+glG1m2SlBJR/AP7mz/SAvI="; + rev = "6348056b999f06c2c7f43bb0a5aa7cfde5302712"; + hash = "sha256-5g4K+pYpS0DyYShKAoBCe6PD1wEZ+bvYMuI+ZbNPgJI="; }; meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; }; ocaml = buildGrammar { language = "ocaml"; - version = "cc26b1e"; - source = fetchFromGitHub { + version = "f1106bf"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "cc26b1ef111100f26a137bcbcd39fd4e35be9a59"; - hash = "sha256-gTmRBFFCBrA48Yn1MO2mMQPpa6u3uv5McC4BDuMXKuM="; + rev = "f1106bf834703f1f2f795da1a3b5f8f40174ffcc"; + hash = "sha256-5X2c2Deb8xNlp0LPQKFWIT3jwxKuuKdFlp9b3iA818Y="; }; location = "ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "cc26b1e"; - source = fetchFromGitHub { + version = "f1106bf"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "cc26b1ef111100f26a137bcbcd39fd4e35be9a59"; - hash = "sha256-gTmRBFFCBrA48Yn1MO2mMQPpa6u3uv5McC4BDuMXKuM="; + rev = "f1106bf834703f1f2f795da1a3b5f8f40174ffcc"; + hash = "sha256-5X2c2Deb8xNlp0LPQKFWIT3jwxKuuKdFlp9b3iA818Y="; }; location = "interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; @@ -938,7 +1071,7 @@ ocamllex = buildGrammar { language = "ocamllex"; version = "ac1d595"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "atom-ocaml"; repo = "tree-sitter-ocamllex"; rev = "ac1d5957e719d49bd6acd27439b79843e4daf8ed"; @@ -950,7 +1083,7 @@ org = buildGrammar { language = "org"; version = "081179c"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "milisims"; repo = "tree-sitter-org"; rev = "081179c52b3e8175af62b9b91dc099d010c38770"; @@ -960,19 +1093,19 @@ }; pascal = buildGrammar { language = "pascal"; - version = "2fd40f4"; - source = fetchFromGitHub { + version = "9e99540"; + src = fetchFromGitHub { owner = "Isopod"; repo = "tree-sitter-pascal"; - rev = "2fd40f477d3e2794af152618ccfac8d92eb72a66"; - hash = "sha256-/nChZspacQymw+1P7yrkOpa7BIBVIKeLKUv0y9Hk8oc="; + rev = "9e995404ddff8319631d72d4b46552e737206912"; + hash = "sha256-y8xPnVZ15+eAnjrLSGjS5wIbLgSKbz9bipgL0o8acmA="; }; meta.homepage = "https://github.com/Isopod/tree-sitter-pascal.git"; }; perl = buildGrammar { language = "perl"; version = "749d26f"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ganezdragon"; repo = "tree-sitter-perl"; rev = "749d26fe13fb131b92e6515416096e572575b981"; @@ -982,19 +1115,19 @@ }; php = buildGrammar { language = "php"; - version = "ab2e721"; - source = fetchFromGitHub { + version = "973694f"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "ab2e72179ceb8bb0b249c8ac9162a148e911b3dc"; - hash = "sha256-Lg4gEi6bCYosakr2McmgOwGHsmsVSjD+oyG6XNTd0j0="; + rev = "973694ffcdeebca245b7ecf0d7c4cadd4f41b3c9"; + hash = "sha256-upJ8WwosOe4Xv/H9LUFVUVThLSLS+5Htr71Lyc/ZTJo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; phpdoc = buildGrammar { language = "phpdoc"; version = "2f4d16c"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "claytonrcarter"; repo = "tree-sitter-phpdoc"; rev = "2f4d16c861b5a454b577d057f247f9902d7b47f5"; @@ -1005,7 +1138,7 @@ pioasm = buildGrammar { language = "pioasm"; version = "924aada"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "leo60228"; repo = "tree-sitter-pioasm"; rev = "924aadaf5dea2a6074d72027b064f939acf32e20"; @@ -1013,21 +1146,32 @@ }; meta.homepage = "https://github.com/leo60228/tree-sitter-pioasm"; }; + poe_filter = buildGrammar { + language = "poe_filter"; + version = "80dc101"; + src = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-poe-filter"; + rev = "80dc10195e26c72598ed1ab02cdf2d8e4c792e7b"; + hash = "sha256-KDsi8eLrTnZaD9XwyF24edmBNHre3FoTiD7RE/MpvEQ="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter"; + }; prisma = buildGrammar { language = "prisma"; - version = "17a5923"; - source = fetchFromGitHub { + version = "eca2596"; + src = fetchFromGitHub { owner = "victorhqc"; repo = "tree-sitter-prisma"; - rev = "17a59236ac25413b81b1613ea6ba5d8d52d7cd6c"; - hash = "sha256-EdeKTmai/OM0WzCjcLmzHI41EqJWH/dOJJxvCE2sid8="; + rev = "eca2596a355b1a9952b4f80f8f9caed300a272b5"; + hash = "sha256-MOqkM7DCQl1L8Jn9nyw89EoAr0ez4+d39HeKy2cb66c="; }; meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma"; }; proto = buildGrammar { language = "proto"; version = "42d82fa"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "mitchellh"; repo = "tree-sitter-proto"; rev = "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f"; @@ -1037,30 +1181,30 @@ }; pug = buildGrammar { language = "pug"; - version = "63e2149"; - source = fetchFromGitHub { + version = "26f6ac8"; + src = fetchFromGitHub { owner = "zealot128"; repo = "tree-sitter-pug"; - rev = "63e214905970e75f065688b1e8aa90823c3aacdc"; - hash = "sha256-t/KRUV1DMlU/xu5BRe1VZm+dliXdtUVhFO+6psiHf+Q="; + rev = "26f6ac805e11e19c4492089f24aa44fe71be7c1f"; + hash = "sha256-KUIjt8p4B3LrU9vRQGL9Pf3ZYMfdDrazC2kNwTpRAgg="; }; meta.homepage = "https://github.com/zealot128/tree-sitter-pug"; }; python = buildGrammar { language = "python"; - version = "b14614e"; - source = fetchFromGitHub { + version = "9e53981"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "b14614e2144b8f9ee54deed5a24f3c6f51f9ffa8"; - hash = "sha256-4TDEK3v7hqinisXtAi/iJL0rUKqII07oVg/Jz3IV2yA="; + rev = "9e53981ec31b789ee26162ea335de71f02186003"; + hash = "sha256-D2++Xg7dRfjGM2r4cxaXGQnBOAX5JBREcEAJeNa7Y9M="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; ql = buildGrammar { language = "ql"; version = "bd08702"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ql"; rev = "bd087020f0d8c183080ca615d38de0ec827aeeaf"; @@ -1070,30 +1214,30 @@ }; qmljs = buildGrammar { language = "qmljs"; - version = "0b2b25b"; - source = fetchFromGitHub { + version = "ab75be9"; + src = fetchFromGitHub { owner = "yuja"; repo = "tree-sitter-qmljs"; - rev = "0b2b25bcaa7d4925d5f0dda16f6a99c588a437f1"; - hash = "sha256-Hf8LfrN3YjN9hpGtTVmK3ZjJ/b/fsRCg9FG7hSSj/mk="; + rev = "ab75be9750e6f2f804638824d1790034286a830c"; + hash = "sha256-UP/+svGOSMlUOMmNMpXKtDDPY9ZIldjWF5sM+PMbE9M="; }; meta.homepage = "https://github.com/yuja/tree-sitter-qmljs"; }; query = buildGrammar { language = "query"; - version = "0695cd0"; - source = fetchFromGitHub { + version = "0717de0"; + src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "tree-sitter-query"; - rev = "0695cd0760532de7b54f23c667d459b5d1332b44"; - hash = "sha256-DwhvOvUb3hNmZTTk5HkZ9X1DCWz+G3+YJ0l/PqLVDdU="; + rev = "0717de07078a20a8608c98ad5f26c208949d0e15"; + hash = "sha256-dWWof8rYFTto3A4BfbKTKcNieRbwFdF6xDXW9tQvAqQ="; }; meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query"; }; r = buildGrammar { language = "r"; version = "80efda5"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "r-lib"; repo = "tree-sitter-r"; rev = "80efda55672d1293aa738f956c7ae384ecdc31b4"; @@ -1103,30 +1247,30 @@ }; racket = buildGrammar { language = "racket"; - version = "09cb27a"; - source = fetchFromGitHub { + version = "dc9c334"; + src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "09cb27a06415bce529a26774a842f5a80d50d362"; - hash = "sha256-+chEzpHh4eBTEpx2+sFXDMco18zNPFUu5HMQ3dB+LwI="; + rev = "dc9c33451fefc2d84d226e55c828adc8a66f2e37"; + hash = "sha256-ie64no94TtAWsSYaBXmic4oyRAA01fMl97+JWcFU1E8="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; rasi = buildGrammar { language = "rasi"; - version = "1239134"; - source = fetchFromGitHub { + version = "5f04634"; + src = fetchFromGitHub { owner = "Fymyte"; repo = "tree-sitter-rasi"; - rev = "12391343979463a2484e6353e5afb6dcb8c31e8b"; - hash = "sha256-JmL2Ei2DZhsZ4jFQ8s6B0ig9bflDs9dLr5/QknDqqRc="; + rev = "5f04634dd4e12de4574c4a3dc9d6d5d4da4a2a1b"; + hash = "sha256-2n8nHinlgtLKBlDLiphu7vqPi7W02brRY1h8BGkcoZc="; }; meta.homepage = "https://github.com/Fymyte/tree-sitter-rasi"; }; regex = buildGrammar { language = "regex"; version = "e1cfca3"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-regex"; rev = "e1cfca3c79896ff79842f057ea13e529b66af636"; @@ -1137,7 +1281,7 @@ rego = buildGrammar { language = "rego"; version = "b2667c9"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "FallenAngel97"; repo = "tree-sitter-rego"; rev = "b2667c975f07b33be3ceb83bea5cfbad88095866"; @@ -1148,7 +1292,7 @@ rnoweb = buildGrammar { language = "rnoweb"; version = "502c112"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "bamonroe"; repo = "tree-sitter-rnoweb"; rev = "502c1126dc6777f09af5bef16e72a42f75bd081e"; @@ -1159,7 +1303,7 @@ rst = buildGrammar { language = "rst"; version = "25e6328"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-rst"; rev = "25e6328872ac3a764ba8b926aea12719741103f1"; @@ -1169,52 +1313,52 @@ }; ruby = buildGrammar { language = "ruby"; - version = "c919603"; - source = fetchFromGitHub { + version = "7a1921b"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; - rev = "c91960320d0f337bdd48308a8ad5500bd2616979"; - hash = "sha256-zUNs7s7SLGLU4h08FHLUA3YhbhRotMQVqk+zG9bmtjE="; + rev = "7a1921bcfd90e3a04c1ad011059087aaf0168dd4"; + hash = "sha256-niL8gqKv1Nq1z8y4c49amqkDo+FoIP3XEJz+dV2UmWo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby"; }; rust = buildGrammar { language = "rust"; - version = "0431a2c"; - source = fetchFromGitHub { + version = "f7fb205"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "0431a2c60828731f27491ee9fdefe25e250ce9c9"; - hash = "sha256-DnUq8TwLGPtN1GXw0AV2t+tj7UKrU4kU32rjGoCHMpE="; + rev = "f7fb205c424b0962de59b26b931fe484e1262b35"; + hash = "sha256-Onk8i2vGHySsjg/O3OZvl7OlDpg3b5/7481f+jJMPCU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; scala = buildGrammar { language = "scala"; - version = "140c96c"; - source = fetchFromGitHub { + version = "628e0aa"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "140c96cf398693189d4e50f76d19ddfcd8a018f8"; - hash = "sha256-Sr4+avj0v1y8K6XXPAVwJDTa6+RmbKe/4dzd0k0y3cE="; + rev = "628e0aab6c2f7d31cf3b7d730f964d4fd9b340ee"; + hash = "sha256-LbVebyhVPKobPxosLDl21NGGtNlZ5gUhJN6fGX87iak="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; scheme = buildGrammar { language = "scheme"; - version = "bdcd2c8"; - source = fetchFromGitHub { + version = "67b90a3"; + src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-scheme"; - rev = "bdcd2c8496701153506a9e3e1b76dfed852873ba"; - hash = "sha256-KfcWGE92nx9lrs3V/lKeE0pPqCqFC/mHamkyryrcdoo="; + rev = "67b90a365bebf4406af4e5a546d6336de787e135"; + hash = "sha256-aHYOzOPK74Jd6MWFsap/k+dG+aJDTXQ05q7NoP5kfd8="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-scheme"; }; scss = buildGrammar { language = "scss"; version = "c478c68"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "serenadeai"; repo = "tree-sitter-scss"; rev = "c478c6868648eff49eb04a4df90d703dc45b312a"; @@ -1224,19 +1368,41 @@ }; slint = buildGrammar { language = "slint"; - version = "d422300"; - source = fetchFromGitHub { + version = "0754752"; + src = fetchFromGitHub { owner = "jrmoulton"; repo = "tree-sitter-slint"; - rev = "d422300f5d6ccce8f9a617dfed57aafb636fadb2"; - hash = "sha256-j6NBJaix0oOUKLAaeo+/1XdYatStqyaTyLKawq/nFvc="; + rev = "07547525cdf4627343dca5891f1743ae45e879bb"; + hash = "sha256-FB5uDzvJKBN3KH+g71kn2/SX8KIZdLv3OamX8f1NeVE="; }; meta.homepage = "https://github.com/jrmoulton/tree-sitter-slint"; }; + smali = buildGrammar { + language = "smali"; + version = "d7f535e"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-smali"; + rev = "d7f535e176c928d33b0e202dd808ac247cacf2ff"; + hash = "sha256-wSUHzQdpWtIXuqfFvqMNJPQjvdRZ29PBcwtMnyKwRR4="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-smali"; + }; + smithy = buildGrammar { + language = "smithy"; + version = "cf8c7eb"; + src = fetchFromGitHub { + owner = "indoorvivants"; + repo = "tree-sitter-smithy"; + rev = "cf8c7eb9faf7c7049839585eac19c94af231e6a0"; + hash = "sha256-3cqT6+e0uqAtd92M55qSbza1eph8gklGlEGyO9R170w="; + }; + meta.homepage = "https://github.com/indoorvivants/tree-sitter-smithy"; + }; solidity = buildGrammar { language = "solidity"; version = "52ed088"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "YongJieYongJie"; repo = "tree-sitter-solidity"; rev = "52ed0880c0126df2f2c7693f215fe6f38e4a2e0a"; @@ -1247,7 +1413,7 @@ sparql = buildGrammar { language = "sparql"; version = "05f949d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "BonaBeavis"; repo = "tree-sitter-sparql"; rev = "05f949d3c1c15e3261473a244d3ce87777374dec"; @@ -1257,19 +1423,20 @@ }; sql = buildGrammar { language = "sql"; - version = "4f1b912"; - source = fetchFromGitHub { + version = "30e15d4"; + src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "4f1b91246b43190e34957d9de9a0f3625879ba33"; - hash = "sha256-g1dQ897JQwthConYMlGY25hsypr4weDsDCOWyafriw8="; + rev = "30e15d45dceb24ea51acf81ee7d75d81567b6e02"; + hash = "sha256-s8jeS8FRDPQQ9Iq0Vi12GrshM/E8opdPI0Xxre5oL0I="; }; + generate = true; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; supercollider = buildGrammar { language = "supercollider"; version = "90c6d9f"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "madskjeldgaard"; repo = "tree-sitter-supercollider"; rev = "90c6d9f777d2b8c4ce497c48b5f270a44bcf3ea0"; @@ -1280,7 +1447,7 @@ surface = buildGrammar { language = "surface"; version = "f4586b3"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-surface"; rev = "f4586b35ac8548667a9aaa4eae44456c1f43d032"; @@ -1291,7 +1458,7 @@ svelte = buildGrammar { language = "svelte"; version = "52e122a"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Himujjal"; repo = "tree-sitter-svelte"; rev = "52e122ae68b316d3aa960a0a422d3645ba717f42"; @@ -1301,12 +1468,12 @@ }; swift = buildGrammar { language = "swift"; - version = "25f8de3"; - source = fetchFromGitHub { + version = "0fe0de5"; + src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "25f8de356e3c33099ed691bd3b8b5c0fe3a11e15"; - hash = "sha256-x9m5QFQY33NWdkq0lkWiskfKxqRPz5ePSbVUDY7IBLU="; + rev = "0fe0de56b528cbf24a654c734ca181b48be3831d"; + hash = "sha256-tU6UTyTR5biS6qBG0z6NbjJQUtZItzzscAKftUAzLq0="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -1314,7 +1481,7 @@ sxhkdrc = buildGrammar { language = "sxhkdrc"; version = "440d5f9"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "RaafatTurki"; repo = "tree-sitter-sxhkdrc"; rev = "440d5f913d9465c9c776a1bd92334d32febcf065"; @@ -1322,10 +1489,22 @@ }; meta.homepage = "https://github.com/RaafatTurki/tree-sitter-sxhkdrc"; }; + t32 = buildGrammar { + language = "t32"; + version = "f8106fc"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "xasc"; + repo = "tree-sitter-t32"; + rev = "f8106fcf5a27f905b3d9d55d9cd3e910bea70c60"; + hash = "sha256-hKddSekx67Yqm4+LqVaH8Sf1+73RlCnXE6th2FTHB34="; + }; + meta.homepage = "https://codeberg.org/xasc/tree-sitter-t32"; + }; teal = buildGrammar { language = "teal"; version = "1ae8c68"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "euclidianAce"; repo = "tree-sitter-teal"; rev = "1ae8c68e90523b26b93af56feb7868fe4214e2b2"; @@ -1334,32 +1513,55 @@ generate = true; meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal"; }; + terraform = buildGrammar { + language = "terraform"; + version = "0ff887f"; + src = fetchFromGitHub { + owner = "MichaHoffmann"; + repo = "tree-sitter-hcl"; + rev = "0ff887f2a60a147452d52db060de6b42f42f1441"; + hash = "sha256-L4B2qtGqrtyLHyUMx1p0t4aKncm72dUE+e19Fv5iqUA="; + }; + location = "dialects/terraform"; + meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; + }; + thrift = buildGrammar { + language = "thrift"; + version = "634a73f"; + src = fetchFromGitHub { + owner = "duskmoon314"; + repo = "tree-sitter-thrift"; + rev = "634a73fd2c80e169f302917ba665c07ec0b6ff7b"; + hash = "sha256-pB7zd48aonYYKdvD3+35zsD76+F/lqBYveFBxBQISvA="; + }; + meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift"; + }; tiger = buildGrammar { language = "tiger"; - version = "eb1d371"; - source = fetchFromGitHub { + version = "a233ebe"; + src = fetchFromGitHub { owner = "ambroisie"; repo = "tree-sitter-tiger"; - rev = "eb1d3714998977ae76ca7c6a102b10ee37efc2b5"; - hash = "sha256-kbwERaTHk5Pj5AfpbXPuRS6speB+xLMfrhRXTVOyMNw="; + rev = "a233ebe360a73a92c50978e5c4e9e471bc59ff42"; + hash = "sha256-lQ3WkA1v3J2FuK2zPUwqahPnHPkAuevpBJrLtrlqaEs="; }; meta.homepage = "https://github.com/ambroisie/tree-sitter-tiger"; }; tlaplus = buildGrammar { language = "tlaplus"; - version = "deaf0e5"; - source = fetchFromGitHub { + version = "6fd16d8"; + src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "deaf0e5c573ad4e2bbfc9a29abb7b6dcb572556e"; - hash = "sha256-D4A2k14SpVR4iKCMwql403XjHGg7p17EYazvAUiJ2gY="; + rev = "6fd16d8469c6898317423d61738d97e2b3f5caf7"; + hash = "sha256-s5mYc/kPZ4wHhm1ZeC5WBjBfzTFnANPRAZeE8UOVE1I="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; todotxt = buildGrammar { language = "todotxt"; version = "0207f6a"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "arnarg"; repo = "tree-sitter-todotxt"; rev = "0207f6a4ab6aeafc4b091914d31d8235049a2578"; @@ -1370,7 +1572,7 @@ toml = buildGrammar { language = "toml"; version = "8bd2056"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ikatyang"; repo = "tree-sitter-toml"; rev = "8bd2056818b21860e3d756b5a58c4f6e05fb744e"; @@ -1380,12 +1582,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0ab9d99"; - source = fetchFromGitHub { + version = "5d20856"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "0ab9d99867435a7667c5548a6617a6bf73dbd830"; - hash = "sha256-Nx+K7Ic/ePKAXPIMlrRn6zELYE59f/FnnZ/LM5ELaU8="; + rev = "5d20856f34315b068c41edaee2ac8a100081d259"; + hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -1393,7 +1595,7 @@ turtle = buildGrammar { language = "turtle"; version = "085437f"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "BonaBeavis"; repo = "tree-sitter-turtle"; rev = "085437f5cb117703b7f520dd92161140a684f092"; @@ -1403,35 +1605,35 @@ }; twig = buildGrammar { language = "twig"; - version = "035f549"; - source = fetchFromGitHub { + version = "2457993"; + src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-twig"; - rev = "035f549ec8c043e734f04341d7ccdc669bb2ba91"; - hash = "sha256-XSE0E6a9o+WpvmMIXHu0N89VqzaIk9eFHofKAPHtT20="; + rev = "2457993b13a06dec2706e6a6c3d5b65bb23024b8"; + hash = "sha256-8H2luJtjSZt2AWP1L0A64jm+DeEH8cFaC+yvIDLKk4o="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-twig"; }; typescript = buildGrammar { language = "typescript"; - version = "0ab9d99"; - source = fetchFromGitHub { + version = "5d20856"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "0ab9d99867435a7667c5548a6617a6bf73dbd830"; - hash = "sha256-Nx+K7Ic/ePKAXPIMlrRn6zELYE59f/FnnZ/LM5ELaU8="; + rev = "5d20856f34315b068c41edaee2ac8a100081d259"; + hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; }; v = buildGrammar { language = "v"; - version = "66b92a8"; - source = fetchFromGitHub { + version = "719cf0c"; + src = fetchFromGitHub { owner = "vlang"; repo = "vls"; - rev = "66b92a89ef1e149300df79c0b2a934ad959c8eec"; - hash = "sha256-R6Irz3sdyzKH1qWOUwUYK1OKhYs0PUYS/azYn/nb6jk="; + rev = "719cf0cd297f9b2f45ecfbeb0115379fb8cfa9c3"; + hash = "sha256-4xb5x/JZN1pFvPVqazcZMdZm8DTpBb5nW5AgOrB3YHc="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/vls"; @@ -1439,7 +1641,7 @@ vala = buildGrammar { language = "vala"; version = "8f690bf"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "vala-lang"; repo = "tree-sitter-vala"; rev = "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"; @@ -1450,7 +1652,7 @@ verilog = buildGrammar { language = "verilog"; version = "4457145"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-verilog"; rev = "4457145e795b363f072463e697dfe2f6973c9a52"; @@ -1460,30 +1662,30 @@ }; vhs = buildGrammar { language = "vhs"; - version = "2f87b9d"; - source = fetchFromGitHub { + version = "8a0df32"; + src = fetchFromGitHub { owner = "charmbracelet"; repo = "tree-sitter-vhs"; - rev = "2f87b9d973597e69552ecf6a4fe16470fbd8c44e"; - hash = "sha256-G1ytXVBeGN1606aFrPdNFp3Khlg/BTFq2VS176Knb7k="; + rev = "8a0df32b72a8cf8d3e3e84f16c19e9ba46d3dba5"; + hash = "sha256-bWI/MW7U5ht7jmL3BSm5HwD1BMDNGwkBShJIpRlhonI="; }; meta.homepage = "https://github.com/charmbracelet/tree-sitter-vhs"; }; vim = buildGrammar { language = "vim"; - version = "4ae7bd6"; - source = fetchFromGitHub { + version = "55ff1b0"; + src = fetchFromGitHub { owner = "vigoux"; repo = "tree-sitter-viml"; - rev = "4ae7bd67706d7e10afed827ce2ded884ab41650f"; - hash = "sha256-5gNqs6ykt2m48ghFv9y5OxsHDPTWRicdT9eR+DDiXiA="; + rev = "55ff1b080c09edeced9b748cf4c16d0b49d17fb9"; + hash = "sha256-bMh6RPP0+zpNkMS/mpbKTaug9EL6u4kTcztnEXaNGyA="; }; meta.homepage = "https://github.com/vigoux/tree-sitter-viml"; }; vue = buildGrammar { language = "vue"; version = "91fe275"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ikatyang"; repo = "tree-sitter-vue"; rev = "91fe2754796cd8fba5f229505a23fa08f3546c06"; @@ -1493,19 +1695,30 @@ }; wgsl = buildGrammar { language = "wgsl"; - version = "af16e7d"; - source = fetchFromGitHub { + version = "40259f3"; + src = fetchFromGitHub { owner = "szebniok"; repo = "tree-sitter-wgsl"; - rev = "af16e7d9e230004888fb52d33599ad38b4cf6052"; - hash = "sha256-rp6SqiGVAxlAbrYhNLhwqawjpFXZd2R4A4cNQx6qFZs="; + rev = "40259f3c77ea856841a4e0c4c807705f3e4a2b65"; + hash = "sha256-voLkcJ/062hzipb3Ak/mgQvFbrLUJdnXq1IupzjMJXA="; }; meta.homepage = "https://github.com/szebniok/tree-sitter-wgsl"; }; + wgsl_bevy = buildGrammar { + language = "wgsl_bevy"; + version = "7cd38d6"; + src = fetchFromGitHub { + owner = "theHamsta"; + repo = "tree-sitter-wgsl-bevy"; + rev = "7cd38d6895060b023353e04f7af099ec64add5d1"; + hash = "sha256-QzfeFzGhWJGD+l+MeKyedRpdZsH+dGKE7UxRmh2uMH0="; + }; + meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy"; + }; yaml = buildGrammar { language = "yaml"; version = "0e36bed"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ikatyang"; repo = "tree-sitter-yaml"; rev = "0e36bed171768908f331ff7dff9d956bae016efb"; @@ -1515,19 +1728,19 @@ }; yang = buildGrammar { language = "yang"; - version = "8e9d175"; - source = fetchFromGitHub { + version = "2c0e6be"; + src = fetchFromGitHub { owner = "Hubro"; repo = "tree-sitter-yang"; - rev = "8e9d175982afcefa3dac8ca20d40d1643accd2bd"; - hash = "sha256-QSOy5wLb52hKkfW8bJY827zGrXTsMO5sZtl2NaNLmBA="; + rev = "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"; + hash = "sha256-6EIK1EStHrUHBLZBsZqd1LL05ZAJ6PKUyIzBBsTVjO8="; }; meta.homepage = "https://github.com/Hubro/tree-sitter-yang"; }; zig = buildGrammar { language = "zig"; version = "d90d38d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "maxxnino"; repo = "tree-sitter-zig"; rev = "d90d38d28ce8cc27bfea8b4e0c75211e9e2398ca"; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index f1c72991a506..bacebe9a7468 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -4,7 +4,7 @@ self: super: let generatedGrammars = callPackage ./generated.nix { - buildGrammar = callPackage ../../../../../development/tools/parsing/tree-sitter/grammar.nix { }; + inherit (tree-sitter) buildGrammar; }; generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars; @@ -94,5 +94,8 @@ in ''; }; - meta.maintainers = with lib.maintainers; [ figsoda ]; + meta = with lib; (super.nvim-treesitter.meta or { }) // { + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + }; } diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update-shell.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update-shell.nix index ca8c4d801c2b..04d83d42c873 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update-shell.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update-shell.nix @@ -11,7 +11,7 @@ let in mkShell { - packages = [ neovim nix-prefetch python3 ]; + packages = [ neovim nurl python3 ]; NVIM_TREESITTER = nvim-treesitter; } diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py index 580c1aa22dab..380100978999 100755 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py @@ -2,8 +2,8 @@ #!nix-shell update-shell.nix -i python import json -import re import subprocess +from concurrent.futures import ThreadPoolExecutor from os import environ from os.path import dirname, join @@ -22,8 +22,6 @@ configs = json.loads( ) ) -regex = re.compile("^https?://(github.com|gitlab.com)/(.+?)/(.+?)(.git)?$") - def generate_grammar(item): lang, lock = item @@ -38,49 +36,10 @@ def generate_grammar(item): generated = f""" {lang} = buildGrammar {{ language = "{lang}"; version = "{rev[:7]}"; - source = """ + src = """ - m = regex.fullmatch(url) - cmd = ["nix-prefetch", "--rev", rev] - - match m and m.group(1, 2, 3): - case "github.com", owner, repo: - cmd += [ - "fetchFromGitHub", - "--owner", - owner, - "--repo", - repo, - ] - - generated += f"""fetchFromGitHub {{ - owner = "{owner}"; - repo = "{repo}";""" - - case "gitlab.com", owner, repo: - cmd += [ - "fetchFromGitLab", - "--owner", - owner, - "--repo", - repo, - ] - - generated += f"""fetchFromGitLab {{ - owner = "{owner}"; - repo = "{repo}";""" - - case _: - cmd += ["fetchgit", "url"] - generated += f"""fetchgit {{ - url = "{url}";""" - - hash = subprocess.check_output(cmd, text=True).strip() - - generated += f""" - rev = "{rev}"; - hash = "{hash}"; - }};""" + generated += subprocess.check_output(["nurl", url, rev, "--indent=4"], text=True) + generated += ";" location = info.get("location") if location: @@ -101,12 +60,16 @@ def generate_grammar(item): generated_file = """# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py -{ buildGrammar, fetchFromGitHub, fetchFromGitLab, fetchgit }: +{ buildGrammar, """ + +generated_file += subprocess.check_output(["nurl", "-Ls", ", "], text=True) + +generated_file += """ }: { """ -for generated in map(generate_grammar, lockfile.items()): +for generated in ThreadPoolExecutor().map(generate_grammar, lockfile.items()): generated_file += generated generated_file += "}\n" diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index d821dea94917..4f28c4bde69d 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -10,7 +10,6 @@ , substituteAll # Language dependencies -, python2 , python3 , rustPlatform @@ -69,6 +68,9 @@ # nvim-treesitter dependencies , callPackage + # sg.nvim dependencies +, darwin + # sved dependencies , glib , gobject-introspection @@ -114,7 +116,7 @@ self: super: { - barbecue-nvim = super.vimshell-vim.overrideAttrs (old: { + barbecue-nvim = super.barbecue-nvim.overrideAttrs (old: { dependencies = with self; [ nvim-lspconfig nvim-navic nvim-web-devicons ]; meta = { description = "A VS Code like winbar for Neovim"; @@ -124,6 +126,10 @@ self: super: { }; }); + ChatGPT-nvim = super.ChatGPT-nvim.overrideAttrs (old: { + dependencies = with self; [ nui-nvim plenary-nvim telescope-nvim ]; + }); + clang_complete = super.clang_complete.overrideAttrs (old: { # In addition to the arguments you pass to your compiler, you also need to # specify the path of the C++ std header (if you are using C++). @@ -310,7 +316,21 @@ self: super: { }); ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs (old: { - buildInputs = [ python2 ]; + # drop Python 2 patches + # https://github.com/JazzCore/ctrlp-cmatcher/pull/44 + patches = [ + (fetchpatch { + name = "drop_python2_pt1.patch"; + url = "https://github.com/JazzCore/ctrlp-cmatcher/commit/3abad6ea155a7f6e138e1de3ac5428177bfb0254.patch"; + sha256 = "sha256-fn2puqYeJdPTdlTT4JjwVz7b3A+Xcuj/xtP6TETlB1U="; + }) + (fetchpatch { + name = "drop_python2_pt2.patch"; + url = "https://github.com/JazzCore/ctrlp-cmatcher/commit/385c8d02398dbb328b1a943a94e7109fe6473a08.patch"; + sha256 = "sha256-yXKCq8sqO0Db/sZREuSeqKwKO71cmTsAvWftoOQehZo="; + }) + ]; + buildInputs = with python3.pkgs; [ python3 setuptools ]; buildPhase = '' patchShebangs . ./install.sh @@ -374,7 +394,7 @@ self: super: { }); forms = super.forms.overrideAttrs (old: { - dependencies = with self; [ self.self ]; + dependencies = [ self.self ]; }); fruzzy = @@ -467,10 +487,6 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); - gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: { - dependencies = with self; [ lush-nvim ]; - }); - himalaya-vim = super.himalaya-vim.overrideAttrs (old: { postPatch = '' substituteInPlace plugin/himalaya.vim \ @@ -489,6 +505,10 @@ self: super: { }; }); + jellybeans-nvim = super.jellybeans-nvim.overrideAttrs (old: { + dependencies = with self; [ lush-nvim ]; + }); + LanguageClient-neovim = let version = "0.1.161"; @@ -581,6 +601,14 @@ self: super: { ''; }); + mason-lspconfig-nvim = super.mason-lspconfig-nvim.overrideAttrs (old: { + dependencies = with self; [ mason-nvim nvim-lspconfig ]; + }); + + mason-tool-installer-nvim = super.mason-tool-installer-nvim.overrideAttrs (old: { + dependencies = with self; [ mason-nvim ]; + }); + meson = buildVimPluginFrom2Nix { inherit (meson) pname version src; preInstall = "cd data/syntax-highlighting/vim"; @@ -652,10 +680,22 @@ self: super: { dontBuild = true; }); + vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs (old: { + passthru.python3Dependencies = [ python3.pkgs.mwclient ]; + }); + nvim-spectre = super.nvim-spectre.overrideAttrs (old: { dependencies = with self; [ plenary-nvim ]; }); + nvim-teal-maker = super.nvim-teal-maker.overrideAttrs (old: { + postPatch = '' + substituteInPlace lua/tealmaker/init.lua \ + --replace cyan ${luaPackages.cyan}/bin/cyan + ''; + vimCommandCheck = "TealBuild"; + }); + nvim-treesitter = super.nvim-treesitter.overrideAttrs (old: callPackage ./nvim-treesitter/overrides.nix { } self super ); @@ -668,8 +708,19 @@ self: super: { configurePhase = "cd vim"; }); + orgmode = super.orgmode.overrideAttrs (old: { + dependencies = with self; [ (nvim-treesitter.withPlugins (p: [ p.org ])) ]; + }); + inherit parinfer-rust; + playground = super.playground.overrideAttrs (old: { + dependencies = with self; [ + # we need the 'query' grammer to make + (nvim-treesitter.withPlugins (p: [ p.query ])) + ]; + }); + plenary-nvim = super.plenary-nvim.overrideAttrs (old: { postPatch = '' sed -Ei lua/plenary/curl.lua \ @@ -690,9 +741,40 @@ self: super: { # needs "http" and "json" treesitter grammars too rest-nvim = super.rest-nvim.overrideAttrs (old: { - dependencies = with self; [ plenary-nvim ]; + dependencies = with self; [ + plenary-nvim + (nvim-treesitter.withPlugins (p: [ p.http p.json ])) + ]; }); + sg-nvim = super.sg-nvim.overrideAttrs (old: + let + sg-nvim-rust = rustPlatform.buildRustPackage { + pname = "sg-nvim-rust"; + inherit (old) version src; + + cargoHash = "sha256-nm9muH4RC92HdUiytmcW0WNyMQJcIH6dgwjUrwcqq4I="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + cargoBuildFlags = [ "--workspace" ]; + + # tests are broken + doCheck = false; + }; + in + { + dependencies = with self; [ plenary-nvim ]; + postInstall = '' + mkdir -p $out/target/debug + ln -s ${sg-nvim-rust}/{bin,lib}/* $out/target/debug + ''; + }); + skim = buildVimPluginFrom2Nix { pname = "skim"; inherit (skim) version; @@ -700,23 +782,23 @@ self: super: { }; skim-vim = super.skim-vim.overrideAttrs (old: { - dependencies = with self; [ skim ]; + dependencies = [ self.skim ]; }); sniprun = let - version = "1.1.2"; + version = "1.2.8"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; rev = "v${version}"; - sha256 = "sha256-WL0eXwiPhcndI74wtFox2tSnZn1siE86x2MLkfpxxT4="; + sha256 = "sha256-iPZ0DPAErkMJIn85t1FIiGhLcMZlL06iNKLqmRu7gXI="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; inherit version src; - cargoSha256 = "sha256-1WbgnsjoFdvko6VRKY+IjafMNqvJvyIZCDk8I9GV3GM="; + cargoSha256 = "sha256-HZEh6jtuRqsyjyDbDIV38x2N1unbSu24D8vrPZ17ktE="; nativeBuildInputs = [ makeWrapper ]; @@ -749,6 +831,10 @@ self: super: { ''; }); + ssr = super.ssr-nvim.overrideAttrs (old: { + dependencies = with self; [ nvim-treesitter ]; + }); + statix = buildVimPluginFrom2Nix rec { inherit (statix) pname src meta; version = "0.1.0"; @@ -997,7 +1083,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-MzacdTuCaBIAyWxH+Uza1KToGZgGPcwMCe5JtQ+68/M="; + cargoSha256 = "sha256-jpO26OXaYcWirQ5tTKIwlva7dHIfdmnruF4WdwSq0nI="; }; in '' @@ -1021,6 +1107,10 @@ self: super: { }); }); + vim-dadbod-ui = super.vim-dadbod-ui.overrideAttrs (old: { + dependencies = with self; [ vim-dadbod ]; + }); + vim-dasht = super.vim-dasht.overrideAttrs (old: { preFixup = '' substituteInPlace $out/autoload/dasht.vim \ @@ -1130,6 +1220,8 @@ self: super: { pname = "vim-markdown-composer-bin"; inherit (super.vim-markdown-composer) src version; cargoSha256 = "sha256-Vie8vLTplhaVU4E9IohvxERfz3eBpd62m8/1Ukzk8e4="; + # tests require network access + doCheck = false; }; in super.vim-markdown-composer.overrideAttrs (old: { @@ -1174,7 +1266,7 @@ self: super: { }); vim-wakatime = super.vim-wakatime.overrideAttrs (old: { - buildInputs = [ python2 ]; + buildInputs = [ python3 ]; }); vim-xdebug = super.vim-xdebug.overrideAttrs (old: { @@ -1243,6 +1335,10 @@ self: super: { dependencies = with self; [ vimproc-vim ]; }); + vim-zettel = super.vim-zettel.overrideAttrs (old: { + dependencies = with self; [ vimwiki fzf-vim ]; + }); + YankRing-vim = super.YankRing-vim.overrideAttrs (old: { sourceRoot = "."; }); @@ -1297,6 +1393,7 @@ self: super: { "coc-jest" "coc-json" "coc-lists" + "coc-ltex" "coc-markdownlint" "coc-metals" "coc-pairs" diff --git a/pkgs/applications/editors/vim/plugins/update-shell.nix b/pkgs/applications/editors/vim/plugins/update-shell.nix index 52a9e741af21..eae7db7f53ec 100644 --- a/pkgs/applications/editors/vim/plugins/update-shell.nix +++ b/pkgs/applications/editors/vim/plugins/update-shell.nix @@ -3,7 +3,7 @@ # Ideally, pkgs points to default.nix file of Nixpkgs official tree with pkgs; let - pyEnv = python3.withPackages (ps: [ ps.GitPython ]); + pyEnv = python3.withPackages (ps: [ ps.gitpython ]); in mkShell { diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index 7e5c7380597c..20336c66ed6e 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -137,11 +137,15 @@ def main(): subprocess.check_call([nvim_treesitter_dir.joinpath("update.py")]) if editor.nixpkgs_repo: - msg = "vimPlugins.nvim-treesitter: update grammars" - print(f"committing to nixpkgs: {msg}") index = editor.nixpkgs_repo.index - index.add([str(nvim_treesitter_dir.joinpath("generated.nix"))]) - index.commit(msg) + for diff in index.diff(None): + if diff.a_path == "pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix": + msg = "vimPlugins.nvim-treesitter: update grammars" + print(f"committing to nixpkgs: {msg}") + index.add([str(nvim_treesitter_dir.joinpath("generated.nix"))]) + index.commit(msg) + return + print("no updates to nvim-treesitter grammars") if __name__ == "__main__": diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 291038bb6eb7..27125fb21fe8 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1,6 +1,7 @@ repo,branch,alias https://github.com/euclidianAce/BetterLua.vim/,, https://github.com/vim-scripts/BufOnly.vim/,, +https://github.com/jackMort/ChatGPT.nvim/,HEAD, https://github.com/chrisbra/CheckAttach/,, https://github.com/vim-scripts/Colour-Sampler-Pack/,, https://github.com/whonore/Coqtail/,, @@ -42,6 +43,7 @@ https://github.com/eikenb/acp/,, https://github.com/stevearc/aerial.nvim/,, https://github.com/Numkil/ag.nvim/,, https://github.com/derekelkins/agda-vim/,, +https://github.com/aduros/ai.vim/,HEAD, https://github.com/slashmili/alchemist.vim/,, https://github.com/dense-analysis/ale/,, https://github.com/vim-scripts/align/,, @@ -62,21 +64,26 @@ https://github.com/hotwatermorning/auto-git-diff/,, https://github.com/jiangmiao/auto-pairs/,, https://github.com/pocco81/auto-save.nvim/,HEAD, https://github.com/rmagatti/auto-session/,, +https://github.com/m4xshen/autoclose.nvim/,HEAD, https://github.com/vim-scripts/autoload_cscope.vim/,, https://github.com/rafi/awesome-vim-colorschemes/,, https://github.com/ayu-theme/ayu-vim/,, +https://github.com/taybart/b64.nvim/,HEAD, https://github.com/romgrk/barbar.nvim/,, https://github.com/utilyre/barbecue.nvim/,, https://github.com/chriskempson/base16-vim/,, +https://github.com/jamespwilliams/bat.vim/,HEAD, https://github.com/vim-scripts/bats.vim/,, https://github.com/rbgrouleff/bclose.vim/,, https://github.com/max397574/better-escape.nvim/,, https://github.com/sblumentritt/bitbake.vim/,, https://github.com/blueballs-theme/blueballs-neovim/,, +https://github.com/nat-418/boole.nvim/,HEAD, https://github.com/turbio/bracey.vim/,, https://github.com/fruit-in/brainfuck-vim/,, https://github.com/famiu/bufdelete.nvim/,, https://github.com/jlanzarotta/bufexplorer/,, +https://github.com/AndrewRadev/bufferize.vim/,HEAD, https://github.com/akinsho/bufferline.nvim/,, https://github.com/dkarter/bullets.vim/,, https://github.com/mattn/calendar-vim/,,mattn-calendar-vim @@ -167,6 +174,8 @@ https://github.com/rhysd/conflict-marker.vim/,, https://github.com/Olical/conjure/,, https://github.com/wellle/context.vim/,, https://github.com/Shougo/context_filetype.vim/,, +https://github.com/zbirenbaum/copilot-cmp/,HEAD, +https://github.com/zbirenbaum/copilot.lua/,HEAD, https://github.com/github/copilot.vim/,, https://github.com/ms-jpq/coq.artifacts/,HEAD, https://github.com/ms-jpq/coq.thirdparty/,HEAD, @@ -216,6 +225,7 @@ https://github.com/onsails/diaglist.nvim/,, https://github.com/nvim-lua/diagnostic-nvim/,, https://github.com/monaqa/dial.nvim/,HEAD, https://github.com/sindrets/diffview.nvim/,, +https://github.com/elihunter173/dirbuf.nvim/,HEAD, https://github.com/direnv/direnv.vim/,, https://github.com/doki-theme/doki-theme-vim/,, https://github.com/Mofiqul/dracula.nvim/,HEAD, @@ -239,6 +249,7 @@ https://github.com/lambdalisue/fern.vim/,, https://github.com/wincent/ferret/,, https://github.com/j-hui/fidget.nvim/,, https://github.com/bogado/file-line/,, +https://github.com/glacambre/firenvim/,HEAD, https://github.com/andviro/flake8-vim/,, https://github.com/ggandor/flit.nvim/,HEAD, https://github.com/ncm2/float-preview.nvim/,, @@ -271,8 +282,10 @@ https://github.com/vim-scripts/gitignore.vim/,, https://github.com/ruifm/gitlinker.nvim/,, https://github.com/lewis6991/gitsigns.nvim/,, https://github.com/gregsexton/gitv/,, +https://github.com/DNLHC/glance.nvim/,HEAD, https://github.com/gleam-lang/gleam.vim/,, https://github.com/ellisonleao/glow.nvim/,, +https://github.com/p00f/godbolt.nvim/,HEAD, https://github.com/roman/golden-ratio/,, https://github.com/buoto/gotests-vim/,, https://github.com/rmagatti/goto-preview/,, @@ -293,6 +306,7 @@ https://github.com/MrcJkb/haskell-tools.nvim/,HEAD, https://github.com/neovimhaskell/haskell-vim/,, https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD, https://github.com/travitch/hasksyn/,, +https://github.com/rebelot/heirline.nvim/,, https://github.com/Yggdroot/hiPairs/,, https://git.sr.ht/~soywod/himalaya-vim,, https://github.com/mpickering/hlint-refactor-vim/,, @@ -300,6 +314,7 @@ https://github.com/edluffy/hologram.nvim/,, https://github.com/urbit/hoon.vim/,, https://github.com/phaazon/hop.nvim/,, https://github.com/rktjmp/hotpot.nvim/,, +https://github.com/othree/html5.vim/,HEAD, https://github.com/anuvyklack/hydra.nvim/,HEAD, https://github.com/mboughaba/i3config.vim/,, https://github.com/cocopon/iceberg.vim/,, @@ -333,6 +348,7 @@ https://github.com/qnighy/lalrpop.vim/,, https://github.com/sk1418/last256/,, https://github.com/latex-box-team/latex-box/,, https://github.com/dundalek/lazy-lsp.nvim/,HEAD, +https://github.com/folke/lazy.nvim/,HEAD, https://github.com/kdheepak/lazygit.nvim/,, https://github.com/Julian/lean.nvim/,, https://github.com/leanprover/lean.vim/,, @@ -366,12 +382,14 @@ https://github.com/lvimuser/lsp-inlayhints.nvim/,HEAD, https://github.com/Issafalcon/lsp-overloads.nvim/,main, https://github.com/ahmedkhalf/lsp-rooter.nvim/,, https://github.com/nvim-lua/lsp-status.nvim/,, +https://github.com/VonHeikemen/lsp-zero.nvim/,main, https://github.com/nvim-lua/lsp_extensions.nvim/,, https://git.sr.ht/~whynothugo/lsp_lines.nvim,, https://github.com/ray-x/lsp_signature.nvim/,, https://github.com/lspcontainers/lspcontainers.nvim/,, https://github.com/onsails/lspkind-nvim/,, https://github.com/tami5/lspsaga.nvim/,, +https://github.com/glepnir/lspsaga.nvim/,main,lspsaga-nvim-original https://github.com/arkav/lualine-lsp-progress/,, https://github.com/nvim-lualine/lualine.nvim/,, https://github.com/l3mon4d3/luasnip/,, @@ -380,10 +398,14 @@ https://github.com/rktjmp/lush.nvim/,, https://github.com/mkasa/lushtags/,, https://github.com/iamcco/markdown-preview.nvim/,, https://github.com/chentoast/marks.nvim/,, +https://github.com/williamboman/mason-lspconfig.nvim/,HEAD, +https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD, +https://github.com/williamboman/mason.nvim/,HEAD, https://github.com/vim-scripts/matchit.zip/,, https://github.com/marko-cerovac/material.nvim/,, https://github.com/kaicataldo/material.vim/,HEAD, https://github.com/vim-scripts/mayansmoke/,, +https://github.com/chikamichi/mediawiki.vim/,HEAD, https://github.com/echasnovski/mini.nvim/,, https://github.com/wfxr/minimap.vim/,, https://github.com/jose-elias-alvarez/minsnip.nvim/,, @@ -415,6 +437,7 @@ https://github.com/Shougo/neco-syntax/,, https://github.com/Shougo/neco-vim/,, https://github.com/nvim-neo-tree/neo-tree.nvim/,HEAD, https://github.com/Shougo/neocomplete.vim/,, +https://github.com/folke/neoconf.nvim/,HEAD, https://github.com/KeitaNakamura/neodark.vim/,, https://github.com/folke/neodev.nvim/,HEAD, https://github.com/sbdchd/neoformat/,, @@ -443,6 +466,8 @@ https://github.com/fiatjaf/neuron.vim/,, https://github.com/chr4/nginx.vim/,, https://github.com/EdenEast/nightfox.nvim/,, https://github.com/zah/nim.vim/,, +https://github.com/figsoda/nix-develop.nvim/,HEAD, +https://github.com/tamago324/nlsp-settings.nvim/,main, https://github.com/tjdevries/nlua.nvim/,, https://github.com/mcchrish/nnn.vim/,, https://github.com/folke/noice.nvim/,HEAD, @@ -455,6 +480,7 @@ https://github.com/jose-elias-alvarez/null-ls.nvim/,, https://github.com/nacro90/numb.nvim/,, https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/,, https://github.com/catppuccin/nvim/,,catppuccin-nvim +https://github.com/AckslD/nvim-FeMaco.lua/,HEAD, https://github.com/nathanmsmith/nvim-ale-diagnostic/,, https://github.com/windwp/nvim-autopairs/,, https://github.com/RRethy/nvim-base16/,, @@ -510,6 +536,7 @@ https://github.com/dcampos/nvim-snippy/,HEAD, https://github.com/ishan9299/nvim-solarized-lua/,, https://github.com/nvim-pack/nvim-spectre/,, https://github.com/kylechui/nvim-surround/,main, +https://github.com/svermeulen/nvim-teal-maker/,HEAD, https://github.com/norcalli/nvim-terminal.lua/,, https://github.com/kyazdani42/nvim-tree.lua/,, https://github.com/nvim-treesitter/nvim-treesitter/,, @@ -519,7 +546,8 @@ https://github.com/nvim-treesitter/nvim-treesitter-refactor/,, https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,, https://github.com/windwp/nvim-ts-autotag/,, https://github.com/joosepalviste/nvim-ts-context-commentstring/,, -https://github.com/p00f/nvim-ts-rainbow/,, +https://github.com/mrjones2014/nvim-ts-rainbow/,, +https://gitlab.com/HiPhish/nvim-ts-rainbow2,HEAD, https://github.com/kyazdani42/nvim-web-devicons/,, https://github.com/AckslD/nvim-whichkey-setup.lua/,, https://github.com/roxma/nvim-yarp/,, @@ -528,6 +556,7 @@ https://github.com/neovim/nvimdev.nvim/,, https://github.com/glepnir/oceanic-material/,, https://github.com/mhartington/oceanic-next/,, https://github.com/pwntester/octo.nvim/,, +https://github.com/stevearc/oil.nvim/,HEAD, https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD, https://github.com/Th3Whit3Wolf/one-nvim/,, https://github.com/navarasu/onedark.nvim/,, @@ -538,6 +567,7 @@ https://github.com/rmehri01/onenord.nvim/,main, https://github.com/tyru/open-browser-github.vim/,, https://github.com/tyru/open-browser.vim/,, https://github.com/nvim-orgmode/orgmode/,, +https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD, https://github.com/vuki656/package-info.nvim/,, https://github.com/wbthomason/packer.nvim/,, https://github.com/drewtempelmeyer/palenight.vim/,, @@ -595,14 +625,17 @@ https://github.com/megaannum/self/,, https://github.com/jaxbot/semantic-highlight.vim/,, https://github.com/numirias/semshi/,, https://github.com/junegunn/seoul256.vim/,, +https://github.com/tjdevries/sg.nvim/,HEAD, https://github.com/osyo-manga/shabadou.vim/,, https://github.com/AndrewRadev/sideways.vim/,, https://github.com/lotabout/skim.vim/,, https://github.com/mopp/sky-color-clock.vim/,, https://github.com/kovisoft/slimv/,, +https://github.com/mrjones2014/smart-splits.nvim/,, https://github.com/gorkunov/smartpairs.vim/,, https://github.com/camspiers/snap/,, https://github.com/norcalli/snippets.nvim/,, +https://github.com/shaunsingh/solarized.nvim/,HEAD, https://github.com/sainnhe/sonokai/,, https://github.com/chikatoike/sourcemap.vim/,, https://github.com/liuchengxu/space-vim/,, @@ -617,6 +650,7 @@ https://github.com/AndrewRadev/splitjoin.vim/,, https://github.com/tami5/sqlite.lua/,, https://github.com/srcery-colors/srcery-vim/,, https://github.com/chr4/sslsecure.vim/,, +https://github.com/cshuaimin/ssr.nvim/,HEAD, https://github.com/luukvbaal/stabilize.nvim/,, https://github.com/eigenfoo/stan-vim/,, https://github.com/darfink/starsearch.vim/,, @@ -669,6 +703,7 @@ https://github.com/nvim-telescope/telescope.nvim/,, https://github.com/luc-tielen/telescope_hoogle/,HEAD, https://github.com/axelvc/template-string.nvim/,HEAD, https://github.com/jacoborus/tender.vim/,, +https://github.com/chomosuke/term-edit.nvim/,HEAD, https://github.com/wincent/terminus/,, https://github.com/oberblastmeister/termwrapper.nvim/,, https://github.com/ternjs/tern_for_vim/,, @@ -687,6 +722,7 @@ https://github.com/akinsho/toggleterm.nvim/,, https://github.com/folke/tokyonight.nvim/,, https://github.com/markonm/traces.vim/,, https://github.com/tjdevries/train.nvim/,, +https://github.com/Wansmer/treesj/,main, https://github.com/tremor-rs/tremor-vim/,, https://github.com/cappyzawa/trim.nvim/,, https://github.com/folke/trouble.nvim/,, @@ -804,6 +840,7 @@ https://github.com/kristijanhusak/vim-dirvish-git/,, https://github.com/tpope/vim-dispatch/,, https://github.com/radenling/vim-dispatch-neovim/,, https://github.com/jhradilek/vim-docbk/,, +https://github.com/tpope/vim-dotenv/,, https://github.com/junegunn/vim-easy-align/,, https://github.com/zhou13/vim-easyescape/,, https://github.com/neoclide/vim-easygit/,, @@ -917,12 +954,14 @@ https://github.com/preservim/vim-markdown/,, https://github.com/euclio/vim-markdown-composer/,, https://github.com/mzlogin/vim-markdown-toc/,, https://github.com/andymass/vim-matchup/,, +https://github.com/aquach/vim-mediawiki-editor/,HEAD, https://github.com/samoshkin/vim-mergetool/,, https://github.com/idanarye/vim-merginal/,, https://github.com/david-a-wheeler/vim-metamath/,, https://github.com/xolox/vim-misc/,, https://github.com/crusoexia/vim-monokai/,, https://github.com/phanviet/vim-monokai-pro/,, +https://github.com/patstockwell/vim-monokai-tasty/,HEAD, https://github.com/matze/vim-move/,, https://github.com/lifepillar/vim-mucomplete/,, https://github.com/terryma/vim-multiple-cursors/,, @@ -943,6 +982,7 @@ https://github.com/tpope/vim-obsession/,, https://github.com/ocaml/vim-ocaml/,, https://github.com/rakr/vim-one/,, https://github.com/petRUShka/vim-opencl/,, +https://github.com/sirtaj/vim-openscad/,HEAD, https://github.com/kana/vim-operator-replace/,, https://github.com/rhysd/vim-operator-surround/,, https://github.com/kana/vim-operator-user/,, @@ -1012,6 +1052,8 @@ https://github.com/tpope/vim-sleuth/,, https://github.com/jpalardy/vim-slime/,, https://github.com/mzlogin/vim-smali/,, https://github.com/t9md/vim-smalls/,, +https://github.com/Industrial/vim-smartbd/,HEAD, +https://github.com/Industrial/vim-smartbw/,HEAD, https://github.com/psliwka/vim-smoothie/,, https://github.com/bohlender/vim-smt2/,, https://github.com/justinmk/vim-sneak/,, @@ -1035,6 +1077,7 @@ https://github.com/machakann/vim-swap/,, https://github.com/dhruvasagar/vim-table-mode/,, https://github.com/kana/vim-tabpagecd/,, https://github.com/tpope/vim-tbone/,, +https://github.com/teal-language/vim-teal/,HEAD, https://github.com/hashivim/vim-terraform/,, https://github.com/juliosueiras/vim-terraform-completion/,, https://github.com/vim-test/vim-test/,, @@ -1065,6 +1108,7 @@ https://github.com/hashivim/vim-vagrant/,, https://github.com/tpope/vim-vinegar/,, https://github.com/triglav/vim-visual-increment/,, https://github.com/mg979/vim-visual-multi/,, +https://github.com/bronson/vim-visual-star-search/,HEAD, https://github.com/thinca/vim-visualstar/,, https://github.com/ngemily/vim-vp4/,HEAD, https://github.com/hrsh7th/vim-vsnip/,, @@ -1082,6 +1126,7 @@ https://github.com/lyokha/vim-xkbswitch/,, https://github.com/mg979/vim-xtabline/,, https://github.com/stephpy/vim-yaml/,, https://github.com/mindriot101/vim-yapf/,, +https://github.com/michal-h21/vim-zettel/,HEAD, https://github.com/dag/vim2hs/,, https://github.com/dominikduda/vim_current_word/,, https://github.com/andrep/vimacs/,, @@ -1107,6 +1152,7 @@ https://github.com/mattn/webapi-vim/,, https://github.com/folke/which-key.nvim/,, https://github.com/gelguy/wilder.nvim/,, https://github.com/gcmt/wildfire.vim/,, +https://github.com/fgheng/winbar.nvim/,main, https://github.com/anuvyklack/windows.nvim/,, https://github.com/sindrets/winshift.nvim/,, https://github.com/wannesm/wmgraphviz.vim/,, diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 09c5527cd0ec..4235aa5e929e 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -1,8 +1,6 @@ # tests available at pkgs/test/vim -{ lib, stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText +{ lib, stdenv, vim, vimPlugins, buildEnv, writeText , runCommand, makeWrapper -, nix-prefetch-hg, nix-prefetch-git -, fetchFromGitHub, runtimeShell , python3 , callPackage, makeSetupHook , linkFarm @@ -16,7 +14,7 @@ USAGE EXAMPLE Install Vim like this eg using nixos option environment.systemPackages which will provide vim-with-plugins in PATH: - vim_configurable.customize { + vim-full.customize { name = "vim-with-plugins"; # optional # add custom .vimrc lines like this: @@ -107,7 +105,7 @@ fitting the vimrcConfig.vam.pluginDictionaries option. Thus the most simple usage would be: vim_with_plugins = - let vim = vim_configurable; + let vim = vim-full; inherit (vimUtil.override {inherit vim}) rtpPath addRtp buildVimPlugin vimHelpTags; vimPlugins = [ # the derivation list from the buffer created by nix#ExportPluginsForNix @@ -186,9 +184,9 @@ let depsOfOptionalPlugins = lib.subtractLists opt (findDependenciesRecursively opt); startWithDeps = findDependenciesRecursively start; allPlugins = lib.unique (startWithDeps ++ depsOfOptionalPlugins); - python3Env = python3.withPackages (ps: - lib.flatten (builtins.map (plugin: (plugin.python3Dependencies or (_: [])) ps) allPlugins) - ); + allPython3Dependencies = ps: + lib.flatten (builtins.map (plugin: (plugin.python3Dependencies or (_: [])) ps) allPlugins); + python3Env = python3.withPackages allPython3Dependencies; packdirStart = vimFarm "pack/${packageName}/start" "packdir-start" allPlugins; packdirOpt = vimFarm "pack/${packageName}/opt" "packdir-opt" opt; @@ -201,7 +199,7 @@ let ln -s ${python3Env}/${python3Env.sitePackages} $out/pack/${packageName}/start/__python3_dependencies/python3 ''; in - [ packdirStart packdirOpt python3link ]; + [ packdirStart packdirOpt ] ++ lib.optional (allPython3Dependencies python3.pkgs != []) python3link; in buildEnv { name = "vim-pack-dir"; @@ -393,8 +391,7 @@ rec { } ./neovim-require-check-hook.sh) {}; inherit (import ./build-vim-plugin.nix { - inherit lib stdenv rtpPath vim vimGenDocHook - toVimPlugin vimCommandCheckHook neovimRequireCheckHook; + inherit lib stdenv rtpPath toVimPlugin; }) buildVimPlugin buildVimPluginFrom2Nix; diff --git a/pkgs/applications/editors/vim/vimacs.nix b/pkgs/applications/editors/vim/vimacs.nix index f8a087cbe6ee..e65439df5236 100644 --- a/pkgs/applications/editors/vim/vimacs.nix +++ b/pkgs/applications/editors/vim/vimacs.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, config, vim_configurable, macvim, vimPlugins +{ lib, stdenv, config, vim-full, macvim, vimPlugins , useMacvim ? stdenv.isDarwin && (config.vimacs.macvim or true) , vimacsExtraArgs ? "" }: stdenv.mkDerivation rec { pname = "vimacs"; version = lib.getVersion vimPackage; - vimPackage = if useMacvim then macvim else vim_configurable; + vimPackage = if useMacvim then macvim else vim-full; buildInputs = [ vimPackage vimPlugins.vimacs ]; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3b0ba9efddfb..9e4548ad0fe1 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -301,6 +301,23 @@ let }; }; + astro-build.astro-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "astro-vscode"; + publisher = "astro-build"; + version = "0.29.1"; + sha256 = "sha256-fMeEeYCZuORhZRds0A8HjHPncK0+SQbV0+f/zU5AIg4="; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/astro-build.astro-vscode/changelog"; + description = "Astro language support for VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=astro-build.astro-vscode"; + homepage = "https://github.com/withastro/language-tools"; + license = licenses.mit; + maintainers = with maintainers; [ wackbyte ]; + }; + }; + asvetliakov.vscode-neovim = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-neovim"; @@ -529,8 +546,8 @@ let mktplcRef = { name = "markdown-mermaid"; publisher = "bierner"; - version = "1.14.2"; - sha256 = "RZyAY2d3imnLhm1mLur+wTx/quxrNWYR9PCjC+co1FE="; + version = "1.17.4"; + sha256 = "sha256-jJnALJJc8G4/0L7WMmKSZ7I+7Usmyj+WhufBdSzcEK0="; }; meta = with lib; { license = licenses.mit; @@ -588,12 +605,27 @@ let }; }; + bmewburn.vscode-intelephense-client = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-intelephense-client"; + publisher = "bmewburn"; + version = "1.8.2"; + sha256 = "OvWdDQfhprQNve017pNSksMuCK3Ccaar5Ko5Oegdiuo="; + }; + meta = with lib; { + description = "PHP code intelligence for Visual Studio Code"; + license = licenses.mit; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bmewburn.vscode-intelephense-client"; + maintainers = with maintainers; [ drupol ]; + }; + }; + catppuccin.catppuccin-vsc = buildVscodeMarketplaceExtension { mktplcRef = { name = "catppuccin-vsc"; publisher = "catppuccin"; - version = "2.2.1"; - sha256 = "sha256-vS+hz3RxG71F5QoO4LQOgOgFh6GQ8QX/+4mMD0KC1kA="; + version = "2.5.0"; + sha256 = "sha256-+dM6MKIjzPdYoRe1DYJ08A+nHHlkTsm+I6CYmnmSRj4="; }; meta = with lib; { description = "Soothing pastel theme for VSCode"; @@ -674,6 +706,22 @@ let }; }; + colejcummins.llvm-syntax-highlighting = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "llvm-syntax-highlighting"; + publisher = "colejcummins"; + version = "0.0.3"; + sha256 = "sha256-D5zLp3ruq0F9UFT9emgOBDLr1tya2Vw52VvCc40TtV0="; + }; + meta = with lib; { + description = "Lightweight syntax highlighting for LLVM IR"; + homepage = "https://github.com/colejcummins/llvm-syntax-highlighting"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=colejcummins.llvm-syntax-highlighting"; + maintainers = with lib.maintainers; [ inclyc ]; + license = licenses.mit; + }; + }; + coolbear.systemd-unit-file = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "coolbear"; @@ -708,8 +756,13 @@ let version = "2.2.6"; sha256 = "sha256-1yZeyLrXuubhKzobWcd00F/CdU824uJDTkB6qlHkJlQ="; }; - meta = { - license = lib.licenses.mit; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; + description = "Integrates ESLint JavaScript into VS Code."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint"; + homepage = "https://github.com/Microsoft/vscode-eslint"; + license = licenses.mit; + maintainers = with maintainers; [ datafoo ]; }; }; @@ -730,8 +783,8 @@ let mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.48.1"; - sha256 = "sha256-3TpZGvas+pfabHayaA6Yd9nOO2MbfXbCvCiTcbja9Vo="; + version = "0.49.0"; + sha256 = "sha256-Mh/OoRK410aXEr3sK2CYFDsXGSqFT+JOWi9jHOdK01Y="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; @@ -874,8 +927,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "12.1.2"; - sha256 = "0wpmfrfpi6wl9v3dknx2qr2m74azpcw8bvhac21v67w6jxnl3jd9"; + version = "2022.12.604"; + sha256 = "sha256-yfqGITviASp5ZDEJA+zyVz1LpPWV4FM/4fU4eq52Xng="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -966,8 +1019,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "9.9.0"; - sha256 = "sha256-Yr7M4HyRNcsBf8YglQLvyZjblMhtkpMP+f9SH8oUav0="; + version = "9.10.4"; + sha256 = "sha256-khtyB0Qbm+iuM1GsAaF32YRv1VBTIy7daeCKdgwCIC8="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; @@ -1254,8 +1307,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.56.7152"; - sha256 = "sha256-9WEvTcVY/yMF00GJVj4h57aWhfBYTSatbw10DjjAaAM="; + version = "1.70.8099"; + sha256 = "sha256-+jlLM9UC1DZFBrtiiri4jvpuc/Rf9PcSVP8D8pmQC2s="; }; meta = with lib; { description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor."; @@ -1287,8 +1340,8 @@ let mktplcRef = { name = "vscode-pull-request-github"; publisher = "github"; - version = "0.45.2022062709"; - sha256 = "119dz79vl2pngf6327zbfw97qnci8xg14d23wdd4n75jmra2wrbz"; + version = "0.55.2022120109"; + sha256 = "036gfgj3iyz4w3j74zhx3zh7m7rmakm2lg0h7mm11lqbpfwwrki1"; }; meta = { license = lib.licenses.mit; }; }; @@ -1298,8 +1351,8 @@ let mktplcRef = { name = "Go"; publisher = "golang"; - version = "0.33.1"; - sha256 = "0dsjxs04dchw1dbzf45ryhxsb5xhalqwy40xw6cngxkp69lhf91g"; + version = "0.37.1"; + sha256 = "sha256-xOiMVUkcgwkMjYfNzFB3Qhfg26jf5nssaTfw0U+sAX0="; }; meta = { license = lib.licenses.mit; @@ -1322,8 +1375,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.215"; - sha256 = "sha256-WK9J6TvmMCLoqeKWh5FVp1mNAXPWVmRvi/iFuLWMylM="; + version = "0.0.220"; + sha256 = "06kzb4msfdv11lij4dwbn1vxdxhvnpfcjqw0gvydgkqjy7dridjk"; }; meta = with lib; { license = licenses.mit; @@ -1334,8 +1387,8 @@ let mktplcRef = { name = "haskell"; publisher = "haskell"; - version = "2.2.0"; - sha256 = "sha256-YGPytmI4PgH6GQuWaRF5quiKGoOabkv7On+WVupI92E="; + version = "2.2.1"; + sha256 = "14p9g07zsb3da4ilaasgsdvh3wagfzayqr8ichsf6k5c952zi8fk"; }; meta = with lib; { license = licenses.mit; @@ -1406,8 +1459,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.11.0"; - sha256 = "sha256-okvwyD0m2r8ar85VtuBUNMUZGGrCfJ4DB9v7aSX5PjM="; + version = "0.13.0"; + sha256 = "sha256-1uaLFTMvkcYrYAt9qDdISJneKxHo9qsris70iowGW2s="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; @@ -1451,8 +1504,8 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "8.29.0"; - sha256 = "sha256-khAlxN+y06aneZE97fqNg2esj/wvIUINiMdVc/exd38="; + version = "9.5.0"; + sha256 = "sha256-Av4RYnCh0gXQ+uRByl3Can+hvYD8Pc3x0Ec2jDcP6Fk="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; @@ -1467,8 +1520,8 @@ let mktplcRef = { name = "gruvbox"; publisher = "jdinhlife"; - version = "1.5.1"; - sha256 = "sha256-0ghB0E+Wa9W2bNFFiH2Q3pUJ9HV5+JfKohX4cRyevC8="; + version = "1.8.0"; + sha256 = "sha256-P4FbbcRcKWbnC86TSnzQaGn2gHWkDM9I4hj4GiHNPS4="; }; meta = with lib; { description = "Gruvbox Theme"; @@ -1502,8 +1555,8 @@ let mktplcRef = { name = "svg"; publisher = "jock"; - version = "1.4.19"; - sha256 = "1yl5pxsayplkdqv5jipii7pyj85j2lc4zmibyr69470b6li264rq"; + version = "1.4.23"; + sha256 = "11f1g4a8v8330ki4240bvg5zpydagg1dwqfh1sar9ds7p1795ims"; }; meta = with lib; { license = licenses.mit; @@ -1514,8 +1567,8 @@ let mktplcRef = { name = "vscode-peacock"; publisher = "johnpapa"; - version = "4.0.1"; - sha256 = "sha256-oYXYOamwacgRqv3+ZREJ1vqRlwMz8LpO+wa6CVEEdbI="; + version = "4.2.2"; + sha256 = "1z9crpz025ha9hgc9mxxg3vyrsfpf9d16zm1vrf4q592j9156d2m"; }; meta = with lib; { license = licenses.mit; @@ -1550,8 +1603,8 @@ let mktplcRef = { name = "magit"; publisher = "kahole"; - version = "0.6.18"; - sha256 = "0sqzz5bbqqg60aypvwxcqnxrr72gmwfj9sv0amgkyaf60zg5sf7w"; + version = "0.6.36"; + sha256 = "sha256-4712BPibXJkkq0XEO9n0ZrdXAcID7IAabu/FOTiTeTo="; }; meta = { license = lib.licenses.mit; @@ -1629,8 +1682,8 @@ let mktplcRef = { name = "vscode-clangd"; publisher = "llvm-vs-code-extensions"; - version = "0.1.17"; - sha256 = "1vgk4xsdbx0v6sy09wkb63qz6i64n6qcmpiy49qgh2xybskrrzvf"; + version = "0.1.23"; + sha256 = "125incws4n688irqii3s2a1cznj0kvkbhv3sa8585chj5g4zvmfy"; }; meta = { license = lib.licenses.mit; @@ -1709,8 +1762,8 @@ let mktplcRef = { publisher = "maximedenes"; name = "vscoq"; - version = "0.3.6"; - sha256 = "sha256-b0gCaEzt5yAj53oLFZSXSD3bum9J1fYes/uf9+OlUek="; + version = "0.3.7"; + sha256 = "sha256-QT+fb23g+IXlNKNAbjADEpqrS6ll2W8Yd0YzwJAjhQQ="; }; meta = with lib; { description = "VsCoq is an extension for Visual Studio Code (VS Code) and VSCodium with support for the Coq Proof Assistant."; @@ -1737,8 +1790,8 @@ let mktplcRef = { name = "marp-vscode"; publisher = "marp-team"; - version = "1.5.0"; - sha256 = "0wqsj8rp58vl3nafkjvyw394h5j4jd7d24ra6hkvfpnlzrgv4yhs"; + version = "2.4.1"; + sha256 = "sha256-h59OmFreja9IdFzH2zZaXXh+pnODirL2fPkUmvAgDyA="; }; meta = { license = lib.licenses.mit; @@ -1773,8 +1826,8 @@ let mktplcRef = { name = "direnv"; publisher = "mkhl"; - version = "0.7.0"; - sha256 = "sha256-MLBPhDBU8vPVvbde3fdwhxKvQa8orUMKAAXoOfNrbh4="; + version = "0.10.1"; + sha256 = "0m89sx1qqdkwa9pfmd9b11lp8z0dqpi6jn27js5q4ymscyg41bqd"; }; meta = with lib; { description = "direnv support for Visual Studio Code"; @@ -1812,8 +1865,8 @@ let mktplcRef = { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "1.22.1"; - sha256 = "1ix363fjxi9g450rs3ghx44z3hppvasf0xpzgha93m90djd7ai52"; + version = "1.22.2"; + sha256 = "13scns5iazzsjx8rli311ym2z8i8f4nvbcd5w8hqj5z0rzsds6xi"; }; meta = { license = lib.licenses.mit; @@ -1842,8 +1895,8 @@ let mktplcRef = { name = "cmake-tools"; publisher = "ms-vscode"; - version = "1.13.17"; - sha256 = "sha256-RF4KTHXnYBfRCD06GYmprwJNkdplyZyk4ioq5Nu+UDM="; + version = "1.13.26"; + sha256 = "1bkjqlv48slgb8nf8y2g4nf11c1appr0ycka2w3mmbiczwdmyjr5"; }; meta.license = lib.licenses.mit; }; @@ -1876,8 +1929,8 @@ let mktplcRef = { name = "PowerShell"; publisher = "ms-vscode"; - version = "2022.7.2"; - sha256 = "sha256-YL90dRmOvfbizT+hfkNu267JtG122LTMS9MHCfaMzkk="; + version = "2022.11.0"; + sha256 = "01pq84rqh2q6rd0ljfql37q6i1kg597qy0mr7fiz5ddi15zcfn19"; }; meta = with lib; { description = "A Visual Studio Code extension for PowerShell language support"; @@ -1910,8 +1963,8 @@ let mktplcRef = { name = "pyright"; publisher = "ms-pyright"; - version = "1.1.250"; - sha256 = "sha256-UHSY32F5wzqAHmmBWyCUkLL0z+LMWDwn/YvUOF3q87I="; + version = "1.1.282"; + sha256 = "14qkk9gbpwnbkk3dk7b7s92smj374ha7axlsi74fllw74lp4ziwn"; }; meta = with lib; { description = "VS Code static type checking for Python"; @@ -1979,8 +2032,8 @@ let mktplcRef = { name = "jupyter-renderers"; publisher = "ms-toolsai"; - version = "1.0.4"; - sha256 = "sha256-aKWu0Gp0f28DCv2akF/G8UDaGfTN410CcH8CAmW7mgU="; + version = "1.0.12"; + sha256 = "12l5z60kpz3nx77l8ck6a6w4qdzyz3xkn6k9670r30w365q9lf0z"; }; meta = { license = lib.licenses.mit; @@ -2093,8 +2146,8 @@ let mktplcRef = { name = "java"; publisher = "redhat"; - version = "1.4.0"; - sha256 = "sha256-9q3ilNukx3sQ6Fr1LhuQdjHHS251SDoHxC33w+qrfAI="; + version = "1.14.2022120303"; + sha256 = "sha256-tlWb2rkDcEWgdpuidkBGN5Nxr3pmkYxnPJN/UdbQfEw="; }; buildInputs = [ jdk ]; meta = { @@ -2107,8 +2160,8 @@ let mktplcRef = { name = "vscode-xml"; publisher = "redhat"; - version = "0.22.0"; - sha256 = "sha256-7QOw0EVcfa7MFnZAHAsUtDZHXD5AFlW54f1qaN3h+2U="; + version = "0.23.2022120303"; + sha256 = "sha256-rQvbb7GOUwVwg/049jchJMJTwaFsOP63AovcEmr2HXs="; }; meta.license = lib.licenses.epl20; }; @@ -2117,8 +2170,8 @@ let mktplcRef = { name = "vscode-yaml"; publisher = "redhat"; - version = "1.9.1"; - sha256 = "10m70sahl7vf8y82gqz9yk6bk4k4b923xn5rk7fax1nqw0pkln2w"; + version = "1.11.10112022"; + sha256 = "0i53n9whcfpds9496r4pa27j3zmd4jc1kpkf4m4rfxzswwngg47x"; }; meta = { license = lib.licenses.mit; @@ -2173,8 +2226,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.19.0"; - sha256 = "1azkkp4bnd7n8v0m4325hfrr6p6ikid88xbxaanypji25pnyq5a4"; + version = "4.22.0"; + sha256 = "0irrivfidgjqfd205gh27r2ccj2anvqgvq7lfaaf92wrrc2zvlsk"; }; meta = { license = lib.licenses.mit; @@ -2197,8 +2250,8 @@ let mktplcRef = { name = "adwaita-theme"; publisher = "piousdeer"; - version = "1.0.8"; - sha256 = "XyzxiwKQGDUIXp6rnt1BmPzfpd1WrG8HnEqYEOJV6P8="; + version = "1.1.0"; + sha256 = "sha256-tKpKLUcc33YrgDS95PJu22ngxhwjqeVMC1Mhhy+IPGE="; }; meta = with lib; { description = "Theme for the GNOME desktop"; @@ -2451,6 +2504,16 @@ let }; }; + sonarsource.sonarlint-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "sonarlint-vscode"; + publisher = "sonarsource"; + version = "3.12.0"; + sha256 = "sha256-vVOmqb0iEIGgN+LkJfazNN+KNWvnWRbIsqetXfeabJU="; + }; + meta.license = lib.licenses.lgpl3Only; + }; + spywhere.guides = buildVscodeMarketplaceExtension { mktplcRef = { name = "guides"; @@ -2517,8 +2580,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.11.0"; - sha256 = "sha256-ZYbkCe/FdSxmipV9TTq0AF/Ft01+LTUeo3sVyKMP3iQ="; + version = "2.15.0"; + sha256 = "sha256-YfcO/01nO+92xZEJgYyLYAkqXMqfV/QDkcN9Dnjp5ZA="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -2536,8 +2599,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "105.21.0"; - sha256 = "12p6msv8wi773piqm1y5zik3ky652bdaw9s83ffwnlndsh87s9n5"; + version = "106.3.0"; + sha256 = "sha256-xe1Ad24r2Ks85WAfaD5em8KGwaQ5h6i5qkUouU6lmtc="; }; meta = { changelog = "https://github.com/sveltejs/language-tools/releases"; @@ -2622,8 +2685,8 @@ let mktplcRef = { name = "vscode-nushell-lang"; publisher = "thenuprojectcontributors"; - version = "0.7.0"; - sha256 = "sha256-+AGJkFx/uzgQzuRnRBZ44xGNQ6a/QWt7SNiQgwPTZxo="; + version = "0.8.0"; + sha256 = "0065ckgpsalqgv9zw8gvxxkqzwl7mjp6mydnlm1m3y9qxlfl010s"; }; meta.license = lib.licenses.mit; }; @@ -2802,8 +2865,8 @@ let mktplcRef = { name = "vscode-java-debug"; publisher = "vscjava"; - version = "0.44.0"; - sha256 = "sha256-8/H7rihSKAvXp8QxK949txgMKwt6aYVN4EQdwhphIiQ="; + version = "0.47.2022112823"; + sha256 = "0nlkkpc2v755g39lcb5bhx207b0kjn44q539w07al9b021y2vq54"; }; meta = { license = lib.licenses.mit; @@ -2814,8 +2877,8 @@ let mktplcRef = { name = "vscode-java-dependency"; publisher = "vscjava"; - version = "0.21.0"; - sha256 = "0rjxjf137qrn91nxmvv4j0a25xgwv2p2w2a1vb7yykkqlkfazmm6"; + version = "0.21.2022111900"; + sha256 = "1k5wk27s0lk2ywc6ajvraldhr1d48i0l2fj7jlaayds41zhyj73l"; }; meta = { license = lib.licenses.mit; @@ -2826,8 +2889,8 @@ let mktplcRef = { name = "vscode-java-test"; publisher = "vscjava"; - version = "0.37.1"; - sha256 = "sha256-QpDMG+0RbiRY9YQYXQhA6ESBoIjBeUxq+bEZ1Y71oSM="; + version = "0.37.2022090902"; + sha256 = "17i9jfwpjjxp81dg6nnviczzmr47pvz33zc4bwfvz69ckn6v74j4"; }; meta = { license = lib.licenses.mit; @@ -2838,8 +2901,8 @@ let mktplcRef = { name = "vscode-maven"; publisher = "vscjava"; - version = "0.39.0"; - sha256 = "1603s2s9abg1pqfakj43zp3dfl0y92pblra85wj2rccbzf3asba3"; + version = "0.40.2022120203"; + sha256 = "063b0k74zy62qg6mh2bms15jiydysv58mds8p82nw3iajm6ppm5i"; }; meta = { license = lib.licenses.mit; @@ -2858,12 +2921,28 @@ let }; }; + vscode-icons-team.vscode-icons = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-icons"; + publisher = "vscode-icons-team"; + version = "12.2.0"; + sha256 = "12s5br0s9n99vjn6chivzdsjb71p0lai6vnif7lv13x497dkw4rz"; + }; + meta = with lib; { + description = "Bring real icons to your Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=vscode-icons-team.vscode-icons"; + homepage = "https://github.com/vscode-icons/vscode-icons"; + license = licenses.mit; + maintainers = with maintainers; [ ggwpaiushtha ]; + }; + }; + vscodevim.vim = buildVscodeMarketplaceExtension { mktplcRef = { name = "vim"; publisher = "vscodevim"; - version = "1.24.1"; - sha256 = "00gq6mqqwqipc6d7di2x9mmi1lya11vhkkww9563avchavczb9sv"; + version = "1.24.3"; + sha256 = "sha256-4fPoRBttWVE8Z3e4O6Yrkf04iOu9ElspQFP57HOPVAk="; }; meta = { license = lib.licenses.mit; @@ -2947,8 +3026,8 @@ let mktplcRef = { name = "markdown-all-in-one"; publisher = "yzhang"; - version = "3.4.0"; - sha256 = "0ihfrsg2sc8d441a2lkc453zbw1jcpadmmkbkaf42x9b9cipd5qb"; + version = "3.4.4"; + sha256 = "2lZfWP+yk0Dp8INLjlJY5ROGu0sLaWhb4fT+O9xGg0s="; }; meta = { license = lib.licenses.mit; @@ -2969,6 +3048,22 @@ let llvm-org.lldb-vscode = llvmPackages_8.lldb; + waderyan.gitblame = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "gitblame"; + publisher = "waderyan"; + version = "10.1.0"; + sha256 = "TTYBaJ4gcMVICz4bGZTvbNRPpWD4tXuAJbI8QcHNDv0="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/waderyan.gitblame/changelog"; + description = "Visual Studio Code Extension - See Git Blame info in status bar"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=waderyan.gitblame"; + homepage = "https://github.com/Sertion/vscode-gitblame"; + license = lib.licenses.mit; + }; + }; + WakaTime.vscode-wakatime = callPackage ./wakatime { }; wingrunr21.vscode-ruby = buildVscodeMarketplaceExtension { diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix index a427c1f8764a..e713ba29e84b 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix @@ -7,8 +7,8 @@ in buildVscodeMarketplaceExtension { mktplcRef = { name = "jupyter"; publisher = "ms-toolsai"; - version = "2022.9.1202862440"; - sha256 = "sha256-0F6eTEXt0PJY0+1o/qZEuUcD9sjHSnUrI1OS4IO2WLc="; + version = "2022.11.1003381023"; + sha256 = "0cbnr52pq0yw6i4yzyrifyrz186l482m9s01h4l7d74fby9ska8h"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix index 8aa121cbe203..f1ce06b7ca0f 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix @@ -7,8 +7,6 @@ , desktop-file-utils, xprop, xsel }: -with lib; - let # https://docs.microsoft.com/en-us/visualstudio/liveshare/reference/linux#install-prerequisites-manually libs = [ @@ -118,12 +116,12 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens # which will break when copying over the files. mv dotnet_modules/vsls-agent{,-wrapped} makeWrapper $PWD/dotnet_modules/vsls-agent{-wrapped,} \ - --prefix LD_LIBRARY_PATH : "${makeLibraryPath libs}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}" \ --set LD_PRELOAD $PWD/dotnet_modules/noop-syslog.so \ --set DOTNET_ROOT ${dotnet-sdk_3} ''; - meta = { + meta = with lib; { description = "Live Share lets you achieve greater confidence at speed by streamlining collaborative editing, debugging, and more in real-time during development"; homepage = "https://aka.ms/vsls-docs"; license = licenses.unfree; diff --git a/pkgs/applications/editors/vscode/extensions/python/default.nix b/pkgs/applications/editors/vscode/extensions/python/default.nix index 00121d29a34f..0a62a5b02daa 100644 --- a/pkgs/applications/editors/vscode/extensions/python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/python/default.nix @@ -12,6 +12,7 @@ , curl , coreutils , gnused +, jq , nix }: @@ -19,8 +20,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2022.17.13011006"; - sha256 = "sha256-f5vbXcqKwCnL+vsTcOX7rWUfoXNih5ZaWr3XUpCYB/M="; + version = "2023.1.10091012"; + sha256 = "sha256-JosFv6ngJmw1XRILwTZMVxlGIdWFLFQjj4olfnVwAIM="; }; buildInputs = [ icu ]; @@ -29,7 +30,6 @@ vscode-utils.buildVscodeMarketplaceExtension rec { propagatedBuildInputs = with python3.pkgs; [ debugpy - isort jedi-language-server ]; @@ -57,14 +57,16 @@ vscode-utils.buildVscodeMarketplaceExtension rec { curl coreutils gnused + jq nix ]} api=$(curl -s 'https://marketplace.visualstudio.com/_apis/public/gallery/extensionquery' \ -H 'accept: application/json;api-version=3.0-preview.1' \ -H 'content-type: application/json' \ - --data-raw '{"filters":[{"criteria":[{"filterType":7,"value":"${mktplcRef.publisher}.${mktplcRef.name}"}]}],"flags":512}') - version=$(echo $api | sed -n -E 's|^.*"version":"([0-9.]+)".*$|\1|p') + --data-raw '{"filters":[{"criteria":[{"filterType":7,"value":"${mktplcRef.publisher}.${mktplcRef.name}"}]}],"flags":16}') + # Find the latest version compatible with stable vscode version + version=$(echo $api | jq -r '.results[0].extensions[0].versions | map(select(has("properties"))) | map(select(.properties | map(select(.key == "Microsoft.VisualStudio.Code.Engine")) | .[0].value | test("\\^[0-9.]+$"))) | .[0].version') if [[ $version != ${mktplcRef.version} ]]; then tmp=$(mktemp) diff --git a/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix index ae9cbb7fb095..ee2f8dbec9a6 100644 --- a/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix +++ b/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix @@ -9,28 +9,69 @@ let inherit (vscode-utils) buildVscodeMarketplaceExtension; - # patch runs on remote machine hence use of which - # links to local node if version is 12 + nodeVersion = "16"; + + # As VS Code executes this code on the remote machine + # we test to see if we can build Node from Nixpkgs + # otherwise we check if the globally installed Node + # is usable. patch = '' - f="$HOME/.vscode-server/bin/$COMMIT_ID/node" - localNodePath=''$(which node) - if [ -x "''$localNodePath" ]; then - localNodeVersion=''$(node -v) - if [ "\''${localNodeVersion:1:2}" = "12" ]; then - echo PATCH: replacing ''$f with ''$localNodePath - rm ''$f - ln -s ''$localNodePath ''$f + # Use Node from nixpkgs for NixOS hosts + # + + serverDir="$HOME/.vscode-server/bin/$COMMIT_ID" + serverNode="$serverDir/node" + echo "VS Code Node: $serverNode" + + # Check if VS Code Server has a non-working Node or the wrong version of Node + if ! nodeVersion=$($serverNode -v) || [ "\''${nodeVersion:1:2}" != "${nodeVersion}" ]; then + echo "VS Code Node Version: $nodeVersion" + + if nix-build "" -A nodejs-${nodeVersion}_x --out-link "$serverDir/nix" && [ -e "$serverDir/nix/bin/node" ]; then + nodePath="$serverDir/nix/bin/node" + fi + + echo "Node from Nix: $nodePath" + + nodeVersion=$($nodePath -v) + echo "Node from Nix Version: $nodeVersion" + + if [ "\''${nodeVersion:1:2}" != "${nodeVersion}" ]; then + echo "Getting Node from Nix failed, use Local Node instead" + nodePath=$(which node) + echo "Local Node: $nodePath" + nodeVersion=$($nodePath -v) + echo "Local Node Version: $nodeVersion" + fi + + if [ "\''${nodeVersion:1:2}" == "${nodeVersion}" ]; then + echo PATCH: replacing $serverNode with $nodePath + ln -sf $nodePath $serverNode fi fi + + nodeVersion=$($serverNode -v) + echo "VS Code Node Version: $nodeVersion" + + if [ "\''${nodeVersion:1:2}" != "${nodeVersion}" ]; then + echo "Unsupported VS Code Node version: $nodeVersion", quitting + fail_with_exitcode ''${o.InstallExitCode.ServerTransferFailed} + fi + ${lib.optionalString useLocalExtensions '' # Use local extensions if [ -d $HOME/.vscode/extensions ]; then - if ! test -L "$HOME/.vscode-server/extensions"; then - mkdir -p $HOME/.vscode-server - ln -s $HOME/.vscode/extensions $HOME/.vscode-server/ + if [ -e $HOME/.vscode-server/extensions ]; then + mv $HOME/.vscode-server/extensions $HOME/.vscode-server/extensions.bak fi + + mkdir -p $HOME/.vscode-server + ln -s $HOME/.vscode/extensions $HOME/.vscode-server/extensions fi ''} + + # + # Start the server ''; in buildVscodeMarketplaceExtension { @@ -43,7 +84,7 @@ buildVscodeMarketplaceExtension { postPatch = '' substituteInPlace "out/extension.js" \ - --replace "# install extensions" '${patch}' + --replace '# Start the server\n' '${patch}' ''; meta = with lib; { diff --git a/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix index c7088c9f2461..531e44f66685 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix @@ -69,6 +69,8 @@ vscode-utils.buildVscodeExtension { name = "${pname}-${version}"; src = "${vsix}/${pname}.zip"; vscodeExtUniqueId = "${publisher}.${pname}"; + vscodeExtPublisher = publisher; + vscodeExtName = pname; nativeBuildInputs = lib.optionals setDefaultServerPath [ jq moreutils ]; diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix index 9eba40330b96..c704e6f47300 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix @@ -5,15 +5,17 @@ assert lib.versionAtLeast python3.version "3.5"; let publisher = "vadimcn"; pname = "vscode-lldb"; - version = "1.7.4"; + version = "1.8.1"; vscodeExtUniqueId = "${publisher}.${pname}"; + vscodeExtPublisher = publisher; + vscodeExtName = pname; src = fetchFromGitHub { owner = "vadimcn"; repo = "vscode-lldb"; rev = "v${version}"; - sha256 = "sha256-yAB0qxeC2sWCQ1EcKG/7LsuUrxV/kbxkcOzRfAotxFc="; + sha256 = "sha256-5wrw8LNH14WAyIKIRGFbvrISb5RUXeD5Uh/weja9p4Q="; }; # need to build a custom version of lldb and llvm for enhanced rust support @@ -23,7 +25,7 @@ let pname = "${pname}-adapter"; inherit version src; - cargoSha256 = "sha256-Ly7yIGB6kLy0c9RzWt8BFuX90dxu2QASocNTEdQA3yo="; + cargoSha256 = "sha256-Lpo2jaDMaZGwSrpQBvBCscVbWi2Db1Cx1Tv84v1H4Es="; nativeBuildInputs = [ makeWrapper ]; @@ -52,7 +54,7 @@ let in stdenv.mkDerivation { pname = "vscode-extension-${publisher}-${pname}"; - inherit src version vscodeExtUniqueId; + inherit src version vscodeExtUniqueId vscodeExtPublisher vscodeExtName; installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 8f0112e5f608..eff075c49398 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -5,6 +5,8 @@ let src, # Same as "Unique Identifier" on the extension's web page. # For the moment, only serve as unique extension dir. + vscodeExtPublisher, + vscodeExtName, vscodeExtUniqueId, configurePhase ? '' runHook preConfigure @@ -17,13 +19,17 @@ let dontPatchELF ? true, dontStrip ? true, nativeBuildInputs ? [], + passthru ? { }, ... }: stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // { name = "vscode-extension-${name}"; - inherit vscodeExtUniqueId; + passthru = passthru // { + inherit vscodeExtPublisher vscodeExtName vscodeExtUniqueId; + }; + inherit configurePhase buildPhase dontPatchELF dontStrip; installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; @@ -54,9 +60,12 @@ let }: assert "" == name; assert null == src; buildVscodeExtension ((removeAttrs a [ "mktplcRef" "vsix" ]) // { name = "${mktplcRef.publisher}-${mktplcRef.name}-${mktplcRef.version}"; + version = mktplcRef.version; src = if (vsix != null) then vsix else fetchVsixFromVscodeMarketplace mktplcRef; + vscodeExtPublisher = mktplcRef.publisher; + vscodeExtName = mktplcRef.name; vscodeExtUniqueId = "${mktplcRef.publisher}.${mktplcRef.name}"; }); @@ -82,7 +91,6 @@ let vscodeDefault = vscode; }; - vscodeExts2nix = import ./vscodeExts2nix.nix { inherit lib writeShellScriptBin; vscodeDefault = vscode; @@ -92,10 +100,41 @@ let inherit lib buildEnv writeShellScriptBin extensionsFromVscodeMarketplace jq; vscodeDefault = vscode; }; + + toExtensionJsonEntry = ext: rec { + identifier = { + id = ext.vscodeExtUniqueId; + uuid = ""; + }; + + version = ext.version; + + location = { + "$mid" = 1; + fsPath = ext.outPath + "/share/vscode/extensions/${ext.vscodeExtUniqueId}"; + path = location.fsPath; + scheme = "file"; + }; + + metadata = { + id = ""; + publisherId = ""; + publisherDisplayName = ext.vscodeExtPublisher; + targetPlatform = "undefined"; + isApplicationScoped = false; + updated = false; + isPreReleaseVersion = false; + installedTimestamp = 0; + preRelease = false; + }; + }; + + toExtensionJson = extensions: builtins.toJSON (map toExtensionJsonEntry extensions); in { inherit fetchVsixFromVscodeMarketplace buildVscodeExtension buildVscodeMarketplaceExtension extensionFromVscodeMarketplace extensionsFromVscodeMarketplace - vscodeWithConfiguration vscodeExts2nix vscodeEnv; + vscodeWithConfiguration vscodeExts2nix vscodeEnv + toExtensionJsonEntry toExtensionJson; } diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 59910c89428b..1b4f4508fbf0 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -1,7 +1,7 @@ { stdenv, lib, makeDesktopItem -, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook, makeWrapper +, unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages , atomEnv, at-spi2-atk, autoPatchelfHook -, systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap +, systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap, wayland # Populate passthru.tests , tests @@ -66,13 +66,14 @@ let buildInputs = [ libsecret libXScrnSaver libxshmfence ] ++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk ] ++ atomEnv.packages); - runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu ]; + runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland ]; nativeBuildInputs = [ unzip ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook nodePackages.asar - (wrapGAppsHook.override { inherit makeWrapper; }) + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + (buildPackages.wrapGAppsHook.override { inherit (buildPackages) makeWrapper; }) ]; dontBuild = true; @@ -162,6 +163,7 @@ let icu libunwind libuuid + lttng-ust openssl zlib @@ -169,6 +171,10 @@ let krb5 ]) ++ additionalPkgs pkgs; + extraBwrapArgs = [ + "--bind-try /etc/nixos/ /etc/nixos/" + ]; + # symlink shared assets, including icons and desktop entries extraInstallCommands = '' ln -s "${unwrapped}/share" "$out/" diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 5f7204012762..1e6195021c69 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1m5mz6wdrivqrw699iivvh62bdn4yzm6hmph455sdyvk5icq59dq"; - x86_64-darwin = "1zn0h9p05kb3fcn816fpxh8asaglycjmpiwkrmxd0s8jwjq7m4gn"; - aarch64-linux = "1gs810iz08jxqfhcgi6ab41m46ib5h3m7i3pnyvlimxx99r5lirf"; - aarch64-darwin = "1dvasr1h28snxi33m6yx95pp3jd4irwy6yav4ilwrcl22cf6ybvi"; - armv7l-linux = "1j5vrpdaqihcr02pdsd5nz07zsk0027xmkfp30npnjy1gjrjvnim"; + x86_64-linux = "1b1xk4f736lxg7vsqhnra0x1vvb3x9fj7ijxqk5liz5pap18k1c8"; + x86_64-darwin = "1pi2kspq162aaj42ssmrf67bbdk4n0vx618z8avxnbx3wbcrsnap"; + aarch64-linux = "1j6qim8k94a2baj8w098l6x3i94n34g62c1brfmhha8fr48jzlir"; + aarch64-darwin = "0agl2n6ljd5rc5shypn5j1292pf673nhqhmwhg5bg9qsawar0ksf"; + armv7l-linux = "10k4pzp9lyn5g8frgixcx9jyixwckr1481d1npdzrgcdwfwrmf20"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.73.1"; + version = "1.75.0"; 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 fcf6dea5e147..08219714061d 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "09ymqhg10flv3w38cb3fhrf5fvxz6aa12y75i009j01rjckvsymr"; - x86_64-darwin = "0kd9a8vk4ddp78m0y1fbzbpgpr5rwhxnfbg52wvky0grl58dh6v6"; - aarch64-linux = "17hwxwvvl3vy2s6wl1n2qkkdhlrf40z8wy0r5jhqrni79f6drkjz"; - aarch64-darwin = "1skgnn6rq0rkhj98q8y19cyyllk8xa1752lwn4qcgi568anap1lw"; - armv7l-linux = "0drz8kigjl82m3hfkpbqnmymy6fpgwmgbpkdwl2jkbl81iijvxvp"; + x86_64-linux = "0mm6xa0kizgg2f6cql6jk8h83pn89h6q7rrs1kypvj3j0x6ysqsg"; + x86_64-darwin = "1g9syvinj2mx292wrnrdn2znqhg17mrjqij0z1ilag5bi4xmzhcj"; + aarch64-linux = "0xbq6fla0lxan08jgmsva91cbcv8rhzd7mqixrm1lsqh4h0wpssz"; + aarch64-darwin = "1b4a56j256rib1997g9wwiak206axkppl124qg021vyab42x8rim"; + armv7l-linux = "0gb96hi854kyh8694j9mbgl78f4y68czkwmjxhzb054l5b4adjla"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.73.1.22314"; + version = "1.74.3.23010"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix index 1c9c4be45631..7cd5b4e267d6 100644 --- a/pkgs/applications/editors/vscode/with-extensions.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runCommand, buildEnv, vscode, makeWrapper +{ lib, stdenv, runCommand, buildEnv, vscode, vscode-utils, makeWrapper, writeTextFile , vscodeExtensions ? [] }: /* @@ -46,18 +46,22 @@ let wrappedPkgVersion = lib.getVersion vscode; wrappedPkgName = lib.removeSuffix "-${wrappedPkgVersion}" vscode.name; - combinedExtensionsDrv = buildEnv { - name = "vscode-extensions"; - paths = vscodeExtensions; + extensionJsonFile = writeTextFile { + name = "vscode-extensions-json"; + destination = "/share/vscode/extensions/extensions.json"; + text = vscode-utils.toExtensionJson vscodeExtensions; }; - extensionsFlag = lib.optionalString (vscodeExtensions != []) '' + combinedExtensionsDrv = buildEnv { + name = "vscode-extensions"; + paths = vscodeExtensions ++ [ extensionJsonFile ]; + }; + + extensionsFlag = '' --add-flags "--extensions-dir ${combinedExtensionsDrv}/share/vscode/extensions" ''; in -# When no extensions are requested, we simply redirect to the original -# non-wrapped vscode executable. runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ vscode ]; diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index efcbe32f78d7..a036e0532977 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python2, gettext, openmp, Cocoa }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoconf +, automake +, gettext +, libtool +, python3 +, wxGTK +, openmp +, Cocoa +}: stdenv.mkDerivation rec { pname = "wxHexEditor"; @@ -11,10 +23,22 @@ stdenv.mkDerivation rec { sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj"; }; - nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ wxGTK libtool python2 gettext ] - ++ lib.optionals stdenv.cc.isClang [ openmp ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + strictDeps = true; + + nativeBuildInputs = [ + autoconf + automake + gettext + libtool + python3 + wxGTK + ]; + + buildInputs = lib.optionals stdenv.cc.isClang [ + openmp + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + ]; preConfigure = "patchShebangs ."; @@ -49,7 +73,7 @@ stdenv.mkDerivation rec { wxHexEditor could edit HDD/SDD disk devices or partitions in raw up to exabyte sizes. ''; homepage = "http://www.wxhexeditor.org/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ wegank ]; }; diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index 16331ba79e07..0796dbe72185 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.2.7"; + version = "3.2.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-aO5ilmlkSAxlkWYdSLmrcm7pC8GbITpCitd4TXp5tfY="; + sha256 = "sha256-ax769qjV0oZ6tnEE5FsXNbHETI6KNgvh0WviBsPs9j8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/xedit/default.nix b/pkgs/applications/editors/xedit/default.nix index d032ef2da66e..a6a29addc7a9 100644 --- a/pkgs/applications/editors/xedit/default.nix +++ b/pkgs/applications/editors/xedit/default.nix @@ -48,5 +48,7 @@ stdenv.mkDerivation rec { license = with licenses; [ mit ]; maintainers = with maintainers; [ shamilton ]; platforms = platforms.unix; + # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix index a7456590ab81..356a04b36e96 100644 --- a/pkgs/applications/editors/yi/wrapper.nix +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation { # This wrapper and wrapper only is under PD license = licenses.publicDomain; maintainers = with maintainers; [ ]; + + # dependency yi-language no longer builds + hydraPlatforms = lib.platforms.none; + broken = true; }; } diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index 094274aa7bd7..09bc1793818a 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 = "1403"; + version = "1503"; src = fetchFromGitHub { owner = "your-editor"; repo = "yed"; rev = version; - sha256 = "sha256-hG0ZRAxWOdFtDgKcDysu89LOdULZmJHLi7grfVjAbwM="; + sha256 = "sha256-tRS01z2SnWTDDUfQxZTWiagQuIULDA4aQ8390ZFBqn0="; }; installPhase = '' diff --git a/pkgs/applications/editors/zee/default.nix b/pkgs/applications/editors/zee/default.nix index 9442044a1697..8de11fd5d59c 100644 --- a/pkgs/applications/editors/zee/default.nix +++ b/pkgs/applications/editors/zee/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch, pkg-config, openssl, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "zee"; @@ -11,6 +11,11 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-/9SogKOaXdFDB+e0//lrenTTbfmXqNFGr23L+6Pnm8w="; }; + cargoPatches = [ + # fixed upstream but unreleased + ./update-ropey-for-rust-1.65.diff + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; @@ -20,7 +25,7 @@ rustPlatform.buildRustPackage rec { # see https://github.com/zee-editor/zee#syntax-highlighting ZEE_DISABLE_GRAMMAR_BUILD=1; - cargoSha256 = "sha256-mbqI1csnU95VWgax4GjIxB+nhMtmpaeJ8QQ3qb0hY4c="; + cargoHash = "sha256-fBBjtjM7AnyAL6EOFstL4h6yS+UoLgxck6Mc0tJcXaI="; meta = with lib; { description = "A modern text editor for the terminal written in Rust"; diff --git a/pkgs/applications/editors/zee/update-ropey-for-rust-1.65.diff b/pkgs/applications/editors/zee/update-ropey-for-rust-1.65.diff new file mode 100644 index 000000000000..edc3f6baa4b7 --- /dev/null +++ b/pkgs/applications/editors/zee/update-ropey-for-rust-1.65.diff @@ -0,0 +1,28 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 7159c28..0fa43c2 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1248,9 +1248,9 @@ dependencies = [ + + [[package]] + name = "ropey" +-version = "1.4.1" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fa0dd9b26e2a102b33d400b7b7d196c81a4014eb96eda90b1c5b48d7215d9633" ++checksum = "bbd22239fafefc42138ca5da064f3c17726a80d2379d817a3521240e78dd0064" + dependencies = [ + "smallvec", + "str_indices", +@@ -1408,9 +1408,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + + [[package]] + name = "str_indices" +-version = "0.3.2" ++version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "adfad63a1b47951101cd667a85b2959a62910cf03f814fff25df89c460b873f8" ++checksum = "9d9199fa80c817e074620be84374a520062ebac833f358d74b37060ce4a0f2c0" + + [[package]] + name = "strsim" diff --git a/pkgs/applications/emulators/atari800/default.nix b/pkgs/applications/emulators/atari800/default.nix index c1f685827047..0f1d4a47582e 100644 --- a/pkgs/applications/emulators/atari800/default.nix +++ b/pkgs/applications/emulators/atari800/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "atari800"; repo = "atari800"; - rev = "ATARI800_${replaceChars ["."] ["_"] version}"; + rev = "ATARI800_${replaceStrings ["."] ["_"] version}"; sha256 = "sha256-+eJXhqPyU0GhmzF7DbteTXzEnn5klCor9Io/UgXQfQg="; }; diff --git a/pkgs/applications/emulators/box64/default.nix b/pkgs/applications/emulators/box64/default.nix index e383333c4208..12c13bb9ae87 100644 --- a/pkgs/applications/emulators/box64/default.nix +++ b/pkgs/applications/emulators/box64/default.nix @@ -1,66 +1,96 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch +, gitUpdater , cmake , python3 +, withDynarec ? stdenv.hostPlatform.isAarch64 +, runCommand +, hello-x86_64 +, box64 }: +# Currently only supported on ARM +assert withDynarec -> stdenv.hostPlatform.isAarch64; + stdenv.mkDerivation rec { pname = "box64"; - version = "0.1.8"; + version = "0.2.0"; src = fetchFromGitHub { owner = "ptitSeb"; repo = pname; rev = "v${version}"; - hash = "sha256-6k8Enbafnj19ATtgmw8W7LxtRpM3Ousj1bpZbbtq8TM="; + hash = "sha256-eMp2eSWMRJQvLRQKUirBua6Kt7ZtyebfUnKIlibkNFU="; }; + patches = [ + # Fix mmx & cppThreads tests on x86_64 + # Remove when version > 0.2.0 + (fetchpatch { + url = "https://github.com/ptitSeb/box64/commit/3819aecf078fcf47b2bc73713531361406a51895.patch"; + hash = "sha256-11hy5Ol5FSE/kNJmXAIwNLbapldhlZGKtOLIoL6pYrg="; + }) + ]; + nativeBuildInputs = [ cmake python3 ]; cmakeFlags = [ - "-DNOGIT=1" - ] ++ ( - if stdenv.hostPlatform.system == "aarch64-linux" then - [ - "-DARM_DYNAREC=ON" - ] - else [ - "-DLD80BITS=1" - "-DNOALIGN=1" - ] - ); + "-DNOGIT=ON" + "-DARM_DYNAREC=${if withDynarec then "ON" else "OFF"}" + "-DRV64=${if stdenv.hostPlatform.isRiscV64 then "ON" else "OFF"}" + "-DPPC64LE=${if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then "ON" else "OFF"}" + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + "-DLD80BITS=ON" + "-DNOALIGN=ON" + ]; installPhase = '' runHook preInstall + install -Dm 0755 box64 "$out/bin/box64" + runHook postInstall ''; doCheck = true; - checkPhase = '' - runHook preCheck - ctest - runHook postCheck - ''; - doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck + + echo Checking if it works $out/bin/box64 -v + + echo Checking if Dynarec option was respected + $out/bin/box64 -v | grep ${lib.optionalString (!withDynarec) "-v"} Dynarec + runHook postInstallCheck ''; + passthru = { + updateScript = gitUpdater { + rev-prefix = "v"; + }; + tests.hello = runCommand "box64-test-hello" { + nativeBuildInputs = [ box64 hello-x86_64 ]; + } '' + # There is no actual "Hello, world!" with any of the logging enabled, and with all logging disabled it's hard to + # tell what problems the emulator has run into. + BOX64_NOBANNER=0 BOX64_LOG=1 box64 ${hello-x86_64}/bin/hello --version | tee $out + ''; + }; + meta = with lib; { homepage = "https://box86.org/"; description = "Lets you run x86_64 Linux programs on non-x86_64 Linux systems"; license = licenses.mit; - maintainers = with maintainers; [ gador ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ gador OPNA2608 ]; + platforms = [ "x86_64-linux" "aarch64-linux" "riscv64-linux" "powerpc64le-linux" ]; }; } diff --git a/pkgs/applications/emulators/bsnes/ares/002-sips-to-png2icns.patch b/pkgs/applications/emulators/bsnes/ares/002-sips-to-png2icns.patch new file mode 100644 index 000000000000..4c2259d63a33 --- /dev/null +++ b/pkgs/applications/emulators/bsnes/ares/002-sips-to-png2icns.patch @@ -0,0 +1,39 @@ +diff --git a/desktop-ui/GNUmakefile b/desktop-ui/GNUmakefile +index 4515610d3..916c8fcd8 100644 +--- a/desktop-ui/GNUmakefile ++++ b/desktop-ui/GNUmakefile +@@ -91,7 +91,7 @@ endif + cp resource/$(name).plist $(output.path)/$(name).app/Contents/Info.plist + cp -R $(ares.path)/Shaders $(output.path)/$(name).app/Contents/Resources/ + cp -R $(mia.path)/Database $(output.path)/$(name).app/Contents/Resources/ +- sips -s format icns resource/$(name).png --out $(output.path)/$(name).app/Contents/Resources/$(name).icns ++ png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png + codesign --force --deep --options runtime --entitlements resource/$(name).selfsigned.entitlements --sign - $(output.path)/$(name).app + else ifeq ($(platform),windows) + $(call mkdir,$(output.path)/Shaders/) +diff --git a/genius/GNUmakefile b/genius/GNUmakefile +index 5287309a8..8d80f9306 100644 +--- a/genius/GNUmakefile ++++ b/genius/GNUmakefile +@@ -24,7 +24,7 @@ ifeq ($(platform),macos) + mkdir -p $(output.path)/$(name).app/Contents/Resources/ + mv $(output.path)/$(name) $(output.path)/$(name).app/Contents/MacOS/$(name) + cp data/$(name).plist $(output.path)/$(name).app/Contents/Info.plist +- sips -s format icns data/$(name).png --$(output.path) $(output.path)/$(name).app/Contents/Resources/$(name).icns ++ png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns data/$(name).png + endif + + verbose: hiro.verbose nall.verbose all; +diff --git a/mia/GNUmakefile b/mia/GNUmakefile +index b6930b6df..7a51b5028 100644 +--- a/mia/GNUmakefile ++++ b/mia/GNUmakefile +@@ -32,7 +32,7 @@ ifeq ($(platform),macos) + mkdir -p $(output.path)/$(name).app/Contents/Resources/ + mv $(output.path)/$(name) $(output.path)/$(name).app/Contents/MacOS/$(name) + cp resource/$(name).plist $(output.path)/$(name).app/Contents/Info.plist +- sips -s format icns resource/$(name).png --out $(output.path)/$(name).app/Contents/Resources/$(name).icns ++ png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png + endif + + verbose: hiro.verbose nall.verbose all; diff --git a/pkgs/applications/emulators/bsnes/ares/003-fix-darwin-install.patch b/pkgs/applications/emulators/bsnes/ares/003-fix-darwin-install.patch new file mode 100644 index 000000000000..5b216ac267e2 --- /dev/null +++ b/pkgs/applications/emulators/bsnes/ares/003-fix-darwin-install.patch @@ -0,0 +1,23 @@ +diff --git a/desktop-ui/GNUmakefile b/desktop-ui/GNUmakefile +index 916c8fcd8..b767c1335 100644 +--- a/desktop-ui/GNUmakefile ++++ b/desktop-ui/GNUmakefile +@@ -92,7 +92,6 @@ endif + cp -R $(ares.path)/Shaders $(output.path)/$(name).app/Contents/Resources/ + cp -R $(mia.path)/Database $(output.path)/$(name).app/Contents/Resources/ + png2icns $(output.path)/$(name).app/Contents/Resources/$(name).icns resource/$(name).png +- codesign --force --deep --options runtime --entitlements resource/$(name).selfsigned.entitlements --sign - $(output.path)/$(name).app + else ifeq ($(platform),windows) + $(call mkdir,$(output.path)/Shaders/) + $(call mkdir,$(output.path)/Database/) +@@ -115,8 +114,8 @@ ifeq ($(platform),windows) + else ifeq ($(shell id -un),root) + $(error "make install should not be run as root") + else ifeq ($(platform),macos) +- mkdir -p ~/Library/Application\ Support/$(name)/ +- cp -R $(output.path)/$(name).app /Applications/$(name).app ++ mkdir -p $(prefix)/Applications/ ++ cp -R $(output.path)/$(name).app $(prefix)/Applications/$(name).app + else ifneq ($(filter $(platform),linux bsd),) + mkdir -p $(prefix)/bin/ + mkdir -p $(prefix)/share/applications/ diff --git a/pkgs/applications/emulators/bsnes/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix index 7a6dae5784ce..36d2dfe1ff33 100644 --- a/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/pkgs/applications/emulators/bsnes/ares/default.nix @@ -2,7 +2,9 @@ , stdenv , fetchFromGitHub , pkg-config +, which , wrapGAppsHook +, libicns , SDL2 , alsa-lib , gtk3 @@ -15,31 +17,42 @@ , libpulseaudio , openal , udev +, darwin }: +let + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa OpenAL; +in stdenv.mkDerivation (finalAttrs: { pname = "ares"; - version = "130.1"; + version = "131"; src = fetchFromGitHub { owner = "ares-emulator"; repo = "ares"; rev = "v${finalAttrs.version}"; - hash = "sha256-q2wDpbNaDyKPBL20FDaHScKQEJYstlQdJ4CzbRoSPlk="; + hash = "sha256-gex53bh/175/i0cMimcPO26C6cxqQGPo4sp2bxh1sAw="; }; patches = [ ./000-dont-rebuild-on-install.patch ./001-fix-ruby.patch + ./002-sips-to-png2icns.patch + ./003-fix-darwin-install.patch ]; nativeBuildInputs = [ pkg-config + which wrapGAppsHook + ] ++ lib.optionals stdenv.isDarwin [ + libicns ]; buildInputs = [ SDL2 + libao + ] ++ lib.optionals stdenv.isLinux [ alsa-lib gtk3 gtksourceview3 @@ -47,29 +60,37 @@ stdenv.mkDerivation (finalAttrs: { libGLU libX11 libXv - libao libpulseaudio openal udev + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + OpenAL ]; enableParallelBuilding = true; - makeFlags = [ + makeFlags = lib.optionals stdenv.isLinux [ "hiro=gtk3" + ] ++ lib.optionals stdenv.isDarwin [ + "hiro=cocoa" + "lto=false" + "vulkan=false" + ] ++ [ "local=false" "openmp=true" "prefix=$(out)" "-C desktop-ui" ]; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.14"; + meta = with lib; { homepage = "https://ares-emu.net"; description = "Open-source multi-system emulator with a focus on accuracy and preservation"; license = licenses.isc; maintainers = with maintainers; [ Madouura AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }) # TODO: select between Qt, GTK2 and GTK3 -# TODO: support Darwin diff --git a/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix index 641018969949..b6d158a7a7c8 100644 --- a/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix +++ b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix @@ -6,9 +6,12 @@ , SDL2 , gtk3, gtksourceview3 , alsa-lib, libao, openal, libpulseaudio -, libicns, Cocoa, OpenAL +, libicns, makeWrapper, darwin }: +let + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa OpenAL; +in stdenv.mkDerivation { pname = "bsnes-hd"; version = "10.6-beta"; @@ -35,8 +38,9 @@ stdenv.mkDerivation { ./macos-copy-app-to-prefix.patch ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook ] - ++ lib.optionals stdenv.isDarwin [ libicns ]; + nativeBuildInputs = [ pkg-config ] + ++ lib.optionals stdenv.isLinux [ wrapGAppsHook ] + ++ lib.optionals stdenv.isDarwin [ libicns makeWrapper ]; buildInputs = [ SDL2 libao ] ++ lib.optionals stdenv.isLinux [ libX11 libXv udev gtk3 gtksourceview3 alsa-lib openal libpulseaudio ] @@ -44,10 +48,17 @@ stdenv.mkDerivation { enableParallelBuilding = true; - makeFlags = [ "-C" "bsnes" "hiro=gtk3" "prefix=$(out)" ]; + makeFlags = [ "-C" "bsnes" "prefix=$(out)" ] + ++ lib.optionals stdenv.isLinux [ "hiro=gtk3" ] + ++ lib.optionals stdenv.isDarwin [ "hiro=cocoa" ]; + + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/bin + makeWrapper $out/{Applications/bsnes.app/Contents/MacOS,bin}/bsnes + ''; # https://github.com/bsnes-emu/bsnes/issues/107 - preFixup = '' + preFixup = lib.optionalString stdenv.isLinux '' gappsWrapperArgs+=( --prefix GDK_BACKEND : x11 ) @@ -59,9 +70,6 @@ stdenv.mkDerivation { license = licenses.gpl3Only; maintainers = with maintainers; [ stevebob ]; platforms = platforms.unix; - # ../nall/traits.hpp:19:14: error: no member named 'is_floating_point_v' in namespace 'std'; did you mean 'is_floating_point'? - # using std::is_floating_point_v; - broken = (stdenv.isDarwin && stdenv.isx86_64); mainProgram = "bsnes"; }; } diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index 2e7b99f4c607..f8e585501289 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -20,21 +20,24 @@ , pugixml , rapidjson , vulkan-headers +, wayland , wxGTK32 , zarchive , vulkan-loader + +, nix-update-script }: stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-13"; + version = "2.0-22"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-0yomEJoXMKZV2PAjINegSvtDB6gbYxQ6XcXA60/ZkEM="; + hash = "sha256-ZQfJHQnT5mV6GC3dO6QV1fGsnyZMYqXiVdBSsimL5yU="; }; patches = [ @@ -68,6 +71,7 @@ stdenv.mkDerivation rec { pugixml rapidjson vulkan-headers + wayland wxGTK32 zarchive ]; @@ -106,9 +110,13 @@ stdenv.mkDerivation rec { preFixup = let libs = [ vulkan-loader ] ++ cubeb.passthru.backendLibs; in '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}") + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}" + ) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Cemu is a Wii U emulator"; homepage = "https://cemu.info"; diff --git a/pkgs/applications/emulators/citra/update.sh b/pkgs/applications/emulators/citra/update.sh index eec36818fede..e9150e34e0a1 100755 --- a/pkgs/applications/emulators/citra/update.sh +++ b/pkgs/applications/emulators/citra/update.sh @@ -27,7 +27,7 @@ updateNightly() { OLD_NIGHTLY_VERSION="$(getLocalVersion "citra-nightly")" OLD_NIGHTLY_HASH="$(getLocalHash "citra-nightly")" - NEW_NIGHTLY_VERSION="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ + NEW_NIGHTLY_VERSION="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ "https://api.github.com/repos/citra-emu/citra-nightly/releases?per_page=1" | jq -r '.[0].name' | cut -d"-" -f2 | cut -d" " -f2)" if [[ "${OLD_NIGHTLY_VERSION}" = "${NEW_NIGHTLY_VERSION}" ]]; then @@ -42,7 +42,7 @@ updateNightly() { NEW_NIGHTLY_HASH="$(nix-prefetch-git --quiet --fetch-submodules --rev "nightly-${NEW_NIGHTLY_VERSION}" "https://github.com/citra-emu/citra-nightly" | jq -r '.sha256')" - echo " Succesfully fetched. hash: ${NEW_NIGHTLY_HASH}" + echo " Successfully fetched. hash: ${NEW_NIGHTLY_HASH}" sed -i "s/${OLD_NIGHTLY_VERSION}/${NEW_NIGHTLY_VERSION}/" ./default.nix sed -i "s/${OLD_NIGHTLY_HASH}/${NEW_NIGHTLY_HASH}/" ./default.nix @@ -52,7 +52,7 @@ updateCanary() { OLD_CANARY_VERSION="$(getLocalVersion "citra-canary")" OLD_CANARY_HASH="$(getLocalHash "citra-canary")" - NEW_CANARY_VERSION="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ + NEW_CANARY_VERSION="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ "https://api.github.com/repos/citra-emu/citra-canary/releases?per_page=1" | jq -r '.[0].name' | cut -d"-" -f2 | cut -d" " -f1)" if [[ "${OLD_CANARY_VERSION}" = "${NEW_CANARY_VERSION}" ]]; then @@ -67,7 +67,7 @@ updateCanary() { NEW_CANARY_HASH="$(nix-prefetch-git --quiet --fetch-submodules --rev "canary-${NEW_CANARY_VERSION}" "https://github.com/citra-emu/citra-canary" | jq -r '.sha256')" - echo " Succesfully fetched. hash: ${NEW_CANARY_HASH}" + echo " Successfully fetched. hash: ${NEW_CANARY_HASH}" sed -i "s/${OLD_CANARY_VERSION}/${NEW_CANARY_VERSION}/" ./default.nix sed -i "s/${OLD_CANARY_HASH}/${NEW_CANARY_HASH}/" ./default.nix diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index d2668c473a62..202d49c19add 100644 --- a/pkgs/applications/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix @@ -14,29 +14,30 @@ }: let + version = "2.7.3"; craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; - rev = "v2.6.6"; - sha256 = "cCXH1GTRqJQ57/6sWIxik366YBx/ii3nzQwx4YpEh1w="; + rev = "v${version}"; + sha256 = "sha256-lMqYfSA3sI7+glRE+eUf03uLfbf7lipmoqgt74FUaJQ="; }; craftos2-rom = fetchFromGitHub { owner = "McJack123"; repo = "craftos2-rom"; - rev = "v2.6.6"; - sha256 = "VzIqvf83k121DxuH5zgZfFS9smipDonyqqhVgj2kgYw="; + rev = "v${version}"; + sha256 = "sha256-t76Yltx7vHNoAAFvNpYLKuwFja4On6M20upmG6w3C1M="; }; in stdenv.mkDerivation rec { pname = "craftos-pc"; - version = "2.6.6"; + inherit version; src = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - sha256 = "9lpAWYFli3/OBfmu2dQxKi+/TaHaBQNpZsCURvl0h/E="; + sha256 = "sha256-a7oMLfjZUkEWPjxDDywlSW4qLhcQrCXPPY2BEOgiafU="; }; buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ]; @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { homepage = "https://www.craftos-pc.cc"; license = with licenses; [ mit free ]; platforms = platforms.linux; - maintainers = [ maintainers.siraben ]; + maintainers = with maintainers; [ siraben tomodachi94 ]; mainProgram = "craftos"; }; } diff --git a/pkgs/applications/emulators/desmume/default.nix b/pkgs/applications/emulators/desmume/default.nix index 5472069f4168..2b3deaba653b 100644 --- a/pkgs/applications/emulators/desmume/default.nix +++ b/pkgs/applications/emulators/desmume/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , SDL2 , agg , alsa-lib @@ -28,10 +29,18 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "TASVideos"; repo = "desmume"; - rev = "release_${lib.replaceChars ["."] ["_"] finalAttrs.version}"; + rev = "release_${lib.replaceStrings ["."] ["_"] finalAttrs.version}"; hash = "sha256-vmjKXa/iXLTwtqnG+ZUvOnOQPZROeMpfM5J3Jh/Ynfo="; }; + patches = [ + # Fix compiling on GCC for AArch64 + (fetchpatch { + url = "https://github.com/TASEmulators/desmume/commit/24eb5ed95c6cbdaba8b3c63a99e95e899e8a5061.patch"; + hash = "sha256-J3ZRU1tPTl+4/jg0DBo6ro6DTUZkpQCey+QGF2EugCQ="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils intltool @@ -81,8 +90,5 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isAarch64 && stdenv.isLinux; # ofborg failed }; }) -# TODO: investigate the patches -# TODO: investigate other platforms diff --git a/pkgs/applications/emulators/dgen-sdl/default.nix b/pkgs/applications/emulators/dgen-sdl/default.nix index cbcdad4a3c2b..a501139ff47b 100644 --- a/pkgs/applications/emulators/dgen-sdl/default.nix +++ b/pkgs/applications/emulators/dgen-sdl/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://dgen.sourceforge.net/"; + homepage = "https://dgen.sourceforge.net/"; description = "Sega Genesis/Mega Drive emulator"; longDescription = '' DGen/SDL is a free, open source emulator for Sega Genesis/Mega Drive diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index c2d73d3e7fff..ad9c470bf427 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -6,7 +6,7 @@ , bluez , ffmpeg , libao -, gtk2 +, gtk3 , glib , libGLU , libGL @@ -24,7 +24,7 @@ , wxGTK30 , soundtouch , miniupnpc -, mbedtls +, mbedtls_2 , curl , lzo , sfml @@ -43,29 +43,33 @@ stdenv.mkDerivation rec { }; patches = [ - # Fix build with soundtouch 2.1.2 + # Fix FTBFS with glibc 2.26 (fetchpatch { - url = "https://src.fedoraproject.org/rpms/dolphin-emu/raw/a1b91fdf94981e12c8889a02cba0ec2267d0f303/f/dolphin-emu-5.0-soundtouch-exception-fix.patch"; - name = "dolphin-emu-5.0-soundtouch-exception-fix.patch"; - sha256 = "0yd3l46nja5qiknnl30ryad98f3v8911jwnr67hn61dzx2kwbbaw"; + url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/02_glibc-2.26.patch"; + name = "02_glibc-2.26.patch"; + sha256 = "sha256-LBXT3rf5klwmX9YQXt4/iv06GghsWZprNhLGYlKiDqk="; }) - # Fix build with gcc 8 + # Fix FTBFS with GCC 8 (fetchpatch { - url = "https://salsa.debian.org/games-team/dolphin-emu/raw/9b7b4aeac1b60dcf28bdcafbed6bc498b2aeb0ad/debian/patches/03_gcc8.patch"; + url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/03_gcc8.patch"; name = "03_gcc8.patch"; - sha256 = "1da95gb8c95kd5cjhdvg19cv2z863lj3va5gx3bqc7g8r36glqxr"; + sha256 = "sha256-uWP6zMjoHYbX6K+oPSQdBn2xWQpvNyhZabMkhtYrSbU="; + }) + # Fix FTBFS with SoundTouch 2.1.2 + (fetchpatch { + url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/05_soundtouch-2.1.2.patch"; + name = "05_soundtouch-2.1.2.patch"; + sha256 = "sha256-Y7CNM6GQC9GRhlOBLZlxkIpj1CFhIwA5L8lGXur/bwY="; + }) + # Use GTK+3 wxWidgets backend + (fetchpatch { + url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/06_gtk3.patch"; + name = "06_gtk3.patch"; + sha256 = "sha256-pu5Q0+8kNwmpf2DoXCXHFqxF0EGTnFXJipkBz1Vh2cs="; }) ]; - postPatch = '' - substituteInPlace Source/Core/VideoBackends/OGL/RasterFont.cpp \ - --replace " CHAR_WIDTH " " CHARWIDTH " - ''; - cmakeFlags = [ - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" - "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0" "-DENABLE_LTO=True" ]; @@ -80,7 +84,7 @@ stdenv.mkDerivation rec { libao libGLU libGL - gtk2 + gtk3 glib gettext libpthreadstubs @@ -100,7 +104,7 @@ stdenv.mkDerivation rec { wxGTK30 soundtouch miniupnpc - mbedtls + mbedtls_2 curl lzo sfml @@ -117,6 +121,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ MP2E ashkitten ]; # x86_32 is an unsupported platform. # Enable generic build if you really want a JIT-less binary. - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index eee0213ea12b..7f68b5821495 100644 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix @@ -20,9 +20,10 @@ , alsa-lib , miniupnpc , enet -, mbedtls +, mbedtls_2 , soundtouch , sfml +, minizip-ng , xz , hidapi , fmt_8 @@ -52,13 +53,13 @@ stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-17269"; + version = "5.0-17995"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "48c9c224cf9f82f0f9f2690b7cc6283d7448480c"; - sha256 = "sha256-WC3jukRygZigLx987CzRmOmJ7DeS1atXrMzU98sRzEg="; + rev = "8bad821019721b9b72701b495da95656ace5fea5"; + sha256 = "sha256-uxHzn+tXRBr11OPpZ4ELBw7DTJH4mnqUBOeyPlXNAh8="; fetchSubmodules = true; }; @@ -90,9 +91,10 @@ stdenv.mkDerivation rec { hidapi miniupnpc enet - mbedtls + mbedtls_2 soundtouch sfml + minizip-ng xz qtbase fmt_8 @@ -131,12 +133,17 @@ stdenv.mkDerivation rec { ]; qtWrapperArgs = lib.optionals stdenv.isLinux [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [vulkan-loader]}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" # https://bugs.dolphin-emu.org/issues/11807 # The .desktop file should already set this, but Dolphin may be launched in other ways "--set QT_QPA_PLATFORM xcb" + # https://bugs.dolphin-emu.org/issues/12913 + "--set QT_XCB_NO_XI2 1" ]; + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + # Use nix-provided libraries instead of submodules postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace CMakeLists.txt \ @@ -183,5 +190,7 @@ stdenv.mkDerivation rec { xfix ivar ]; + # Requires both LLVM and SDK bump + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index 93ed03097be9..73a4485af260 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -29,7 +29,7 @@ , alsa-lib , miniupnpc , enet -, mbedtls +, mbedtls_2 , soundtouch , sfml , fmt @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { hidapi miniupnpc enet - mbedtls + mbedtls_2 soundtouch sfml fmt diff --git a/pkgs/applications/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix index b197742ce276..852586cc6986 100644 --- a/pkgs/applications/emulators/dosbox/default.nix +++ b/pkgs/applications/emulators/dosbox/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , autoreconfHook -, SDL_compat +, SDL , SDL_net , SDL_sound , copyDesktopItems @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - SDL_compat + SDL SDL_net SDL_sound libGL diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index 31869fa9fe36..0f48dd71e6c4 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -15,6 +15,7 @@ , qtbase , qtsvg , qttools +, qtwayland , vulkan-loader , wayland , wrapQtAppsHook @@ -23,23 +24,25 @@ stdenv.mkDerivation { pname = "duckstation"; - version = "unstable-2022-11-18"; + version = "unstable-2023-01-01"; src = fetchFromGitHub { owner = "stenzek"; repo = "duckstation"; - rev = "8d7aea5e19859ed483699cc4a5dbd47165c7be8b"; - sha256 = "sha256-92Wn1ZEEZszmVK/KrJqjDuQf/lyD8/VScfTI/St5dY4="; + rev = "06d6447e59f208f21ba42f4df1665b789db13fb7"; + sha256 = "sha256-DyuQ7J7MVSQHpvPZhMtwqNM8ifjI8UFYQ9SxY5kikBI="; }; nativeBuildInputs = [ cmake - extra-cmake-modules copyDesktopItems ninja pkg-config qttools wrapQtAppsHook + ] + ++ lib.optionals enableWayland [ + extra-cmake-modules ]; buildInputs = [ @@ -52,7 +55,10 @@ stdenv.mkDerivation { qtsvg vulkan-loader ] - ++ lib.optionals enableWayland [ wayland ]; + ++ lib.optionals enableWayland [ + qtwayland + wayland + ]; cmakeFlags = [ "-DUSE_DRMKMS=ON" @@ -93,9 +99,7 @@ stdenv.mkDerivation { runHook postCheck ''; - # Libpulseaudio fixes https://github.com/NixOS/nixpkgs/issues/171173 qtWrapperArgs = [ - "--set QT_QPA_PLATFORM xcb" "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}" ]; diff --git a/pkgs/applications/emulators/dynamips/default.nix b/pkgs/applications/emulators/dynamips/default.nix index 9c7261f09301..80910700da93 100644 --- a/pkgs/applications/emulators/dynamips/default.nix +++ b/pkgs/applications/emulators/dynamips/default.nix @@ -4,17 +4,18 @@ , cmake , libelf , libpcap +, nix-update-script }: stdenv.mkDerivation rec { pname = "dynamips"; - version = "0.2.22"; + version = "0.2.23"; src = fetchFromGitHub { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "1fjjjdaxlw1k95kyq73fndn21qfhrm4cn79av0i4sn7anhg8m83f"; + hash = "sha256-+h+WsZ/QrDd+dNrR6CJb2uMG+vbUvK8GTxFJZOxknL0="; }; nativeBuildInputs = [ cmake ]; @@ -22,6 +23,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { inherit (src.meta) homepage; description = "A Cisco router emulator"; diff --git a/pkgs/applications/emulators/fuse-emulator/default.nix b/pkgs/applications/emulators/fuse-emulator/default.nix index 35e28ba55f6a..91aec6d52ed6 100644 --- a/pkgs/applications/emulators/fuse-emulator/default.nix +++ b/pkgs/applications/emulators/fuse-emulator/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://fuse-emulator.sourceforge.net/"; + homepage = "https://fuse-emulator.sourceforge.net/"; description = "ZX Spectrum emulator"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/emulators/mame/001-use-absolute-paths.diff b/pkgs/applications/emulators/mame/001-use-absolute-paths.diff new file mode 100644 index 000000000000..e349cacb2d96 --- /dev/null +++ b/pkgs/applications/emulators/mame/001-use-absolute-paths.diff @@ -0,0 +1,29 @@ +diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp +index 3defd33d0bb..33daacc4fc8 100644 +--- a/src/emu/emuopts.cpp ++++ b/src/emu/emuopts.cpp +@@ -39,16 +39,16 @@ const options_entry emu_options::s_option_entries[] = + { nullptr, nullptr, core_options::option_type::HEADER, "CORE SEARCH PATH OPTIONS" }, + { OPTION_PLUGINDATAPATH, ".", core_options::option_type::PATH, "path to base folder for plugin data (read/write)" }, + { OPTION_MEDIAPATH ";rp;biospath;bp", "roms", core_options::option_type::MULTIPATH, "path to ROM sets and hard disk images" }, +- { OPTION_HASHPATH ";hash_directory;hash", "hash", core_options::option_type::MULTIPATH, "path to software definition files" }, +- { OPTION_SAMPLEPATH ";sp", "samples", core_options::option_type::MULTIPATH, "path to audio sample sets" }, +- { OPTION_ARTPATH, "artwork", core_options::option_type::MULTIPATH, "path to artwork files" }, +- { OPTION_CTRLRPATH, "ctrlr", core_options::option_type::MULTIPATH, "path to controller definitions" }, +- { OPTION_INIPATH, ".;ini;ini/presets", core_options::option_type::MULTIPATH, "path to ini files" }, +- { OPTION_FONTPATH, ".", core_options::option_type::MULTIPATH, "path to font files" }, ++ { OPTION_HASHPATH ";hash_directory;hash", "hash;@mamePath@/hash", core_options::option_type::MULTIPATH, "path to software definition files" }, ++ { OPTION_SAMPLEPATH ";sp", "samples;@mamePath@/samples", core_options::option_type::MULTIPATH, "path to audio sample sets" }, ++ { OPTION_ARTPATH, "artwork;@mamePath@/artwork", core_options::option_type::MULTIPATH, "path to artwork files" }, ++ { OPTION_CTRLRPATH, "ctrlr;@mamePath@/ctrlr", core_options::option_type::MULTIPATH, "path to controller definitions" }, ++ { OPTION_INIPATH, ".;ini;ini/presets;@mamePath@/ini/presets", core_options::option_type::MULTIPATH, "path to ini files" }, ++ { OPTION_FONTPATH, ".;@mamePath@", core_options::option_type::MULTIPATH, "path to font files" }, + { OPTION_CHEATPATH, "cheat", core_options::option_type::MULTIPATH, "path to cheat files" }, + { OPTION_CROSSHAIRPATH, "crosshair", core_options::option_type::MULTIPATH, "path to crosshair files" }, +- { OPTION_PLUGINSPATH, "plugins", core_options::option_type::MULTIPATH, "path to plugin files" }, +- { OPTION_LANGUAGEPATH, "language", core_options::option_type::MULTIPATH, "path to UI translation files" }, ++ { OPTION_PLUGINSPATH, "plugins;@mamePath@/plugins", core_options::option_type::MULTIPATH, "path to plugin files" }, ++ { OPTION_LANGUAGEPATH, "language;@mamePath@/language", core_options::option_type::MULTIPATH, "path to UI translation files" }, + { OPTION_SWPATH, "software", core_options::option_type::MULTIPATH, "path to loose software" }, + + // output directory options diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 48d77ce5e6fe..084bf0745429 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -1,24 +1,24 @@ { lib , stdenv -, alsa-lib -, copyDesktopItems -, CoreAudioKit -, expat , fetchFromGitHub -, fetchurl +, alsa-lib +, SDL2 +, SDL2_ttf +, copyDesktopItems +, expat , flac , fontconfig -, ForceFeedback , glm , installShellFiles +, libXi +, libXinerama , libjpeg , libpcap , libpulseaudio -, libXi -, libXinerama , lua5_3 , makeDesktopItem , makeWrapper +, papirus-icon-theme , pkg-config , portaudio , portmidi @@ -26,32 +26,27 @@ , python3 , qtbase , rapidjson -, SDL2 -, SDL2_ttf , sqlite , utf8proc , which , writeScript , zlib +, darwin }: let - # Get icon from Arch Linux package - icon = fetchurl { - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/614b24ef3856cb52b5cafc386b0f77923cbc9156/trunk/mame.svg"; - sha256 = "sha256-F8RCyTPXZBdeTOHeUKgMDC3dXXM8rwnDzV5rppesQ/Q="; - }; - dest = "$out/opt/mame"; + inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; in stdenv.mkDerivation rec { pname = "mame"; - version = "0.249"; + version = "0.251"; + srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; - rev = "mame${builtins.replaceStrings [ "." ] [ "" ] version}"; - sha256 = "sha256-im6y/E0pQxruX2kNXZLE3fHq+zXfsstnOoC1QvH4fd4="; + rev = "mame${srcVersion}"; + hash = "sha256-x+QV4gunnERBHyYB2fXJ2LvMv437Z2omvk+fYkmZfqA="; }; outputs = [ "out" "tools" ]; @@ -109,15 +104,17 @@ stdenv.mkDerivation rec { ]; patches = [ - # by default MAME assumes that paths with stock resources - # are relative and that you run MAME changing to - # install directory, so we add absolute paths here - ./emuopts.patch + # by default MAME assumes that paths with stock resources are relative and + # that you run MAME changing to install directory, so we add absolute paths + # here + ./001-use-absolute-paths.diff ]; + # Since the bug described in https://github.com/NixOS/nixpkgs/issues/135438, + # it is not possible to use substituteAll postPatch = '' substituteInPlace src/emu/emuopts.cpp \ - --subst-var-by mame ${dest} + --subst-var-by mamePath "$out/opt/mame" ''; desktopItems = [ @@ -134,23 +131,26 @@ stdenv.mkDerivation rec { }) ]; - installPhase = '' + # TODO: copy shaders from src/osd/modules/opengl/shader/glsl*.*h + # to the final package after we figure out how they work + installPhase = let + icon = "${papirus-icon-theme}/share/icons/Papirus/32x32/apps/mame.svg"; + in '' runHook preInstall # mame - mkdir -p ${dest} + mkdir -p $out/opt/mame install -Dm755 mame -t $out/bin install -Dm644 ${icon} $out/share/icons/hicolor/scalable/apps/mame.svg installManPage docs/man/*.1 docs/man/*.6 - cp -ar {artwork,bgfx,plugins,language,ctrlr,keymaps,hash} ${dest} - # TODO: copy shaders from src/osd/modules/opengl/shader/glsl*.*h - # to the final package after we figure out how they work + cp -ar {artwork,bgfx,plugins,language,ctrlr,keymaps,hash} $out/opt/mame # mame-tools - for _i in castool chdman floptool imgtool jedutil ldresample ldverify nltool nlwav pngcmp regrep romcmp \ - split srcclean testkeys unidasm; do - install -Dm755 $_i -t $tools/bin + for _tool in castool chdman floptool imgtool jedutil ldresample ldverify \ + nltool nlwav pngcmp regrep romcmp split srcclean testkeys \ + unidasm; do + install -Dm755 $_tool -t $tools/bin done mv $tools/bin/{,mame-}split @@ -176,11 +176,26 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; - description = "Is a multi-purpose emulation framework"; homepage = "https://www.mamedev.org/"; + description = "A multi-purpose emulation framework"; + longDescription = '' + MAME's purpose is to preserve decades of software history. As electronic + technology continues to rush forward, MAME prevents this important + "vintage" software from being lost and forgotten. This is achieved by + documenting the hardware and how it functions. The source code to MAME + serves as this documentation. The fact that the software is usable serves + primarily to validate the accuracy of the documentation (how else can you + prove that you have recreated the hardware faithfully?). Over time, MAME + (originally stood for Multiple Arcade Machine Emulator) absorbed the + sister-project MESS (Multi Emulator Super System), so MAME now documents a + wide variety of (mostly vintage) computers, video game consoles and + calculators, in addition to the arcade video games that were its initial + focus. + ''; + changelog = "https://github.com/mamedev/mame/releases/download/mame${srcVersion}/whatsnew_${srcVersion}.txt"; license = with licenses; [ bsd3 gpl2Plus ]; - platforms = platforms.unix; maintainers = with maintainers; [ thiagokokada ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/emulators/mame/emuopts.patch b/pkgs/applications/emulators/mame/emuopts.patch deleted file mode 100644 index 233d64eb15d0..000000000000 --- a/pkgs/applications/emulators/mame/emuopts.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/src/emu/emuopts.cpp 2022-10-29 15:05:18.591381088 +0200 -+++ b/src/emu/emuopts.cpp 2022-10-29 15:10:10.938037551 +0200 -@@ -39,16 +39,16 @@ - { nullptr, nullptr, core_options::option_type::HEADER, "CORE SEARCH PATH OPTIONS" }, - { OPTION_PLUGINDATAPATH, ".", core_options::option_type::STRING, "path to base folder for plugin data (read/write)" }, - { OPTION_MEDIAPATH ";rp;biospath;bp", "roms", core_options::option_type::STRING, "path to ROM sets and hard disk images" }, -- { OPTION_HASHPATH ";hash_directory;hash", "hash", core_options::option_type::STRING, "path to software definition files" }, -- { OPTION_SAMPLEPATH ";sp", "samples", core_options::option_type::STRING, "path to audio sample sets" }, -- { OPTION_ARTPATH, "artwork", core_options::option_type::STRING, "path to artwork files" }, -- { OPTION_CTRLRPATH, "ctrlr", core_options::option_type::STRING, "path to controller definitions" }, -- { OPTION_INIPATH, ".;ini;ini/presets", core_options::option_type::STRING, "path to ini files" }, -- { OPTION_FONTPATH, ".", core_options::option_type::STRING, "path to font files" }, -+ { OPTION_HASHPATH ";hash_directory;hash", "hash;@mame@/hash", core_options::option_type::STRING, "path to software definition files" }, -+ { OPTION_SAMPLEPATH ";sp", "samples;@mame@/samples", core_options::option_type::STRING, "path to audio sample sets" }, -+ { OPTION_ARTPATH, "artwork;@mame@/artwork", core_options::option_type::STRING, "path to artwork files" }, -+ { OPTION_CTRLRPATH, "ctrlr;@mame@/ctrlr", core_options::option_type::STRING, "path to controller definitions" }, -+ { OPTION_INIPATH, ".;ini;ini/presets;@mame@/ini/presets", core_options::option_type::STRING, "path to ini files" }, -+ { OPTION_FONTPATH, ".;@mame@", core_options::option_type::STRING, "path to font files" }, - { OPTION_CHEATPATH, "cheat", core_options::option_type::STRING, "path to cheat files" }, - { OPTION_CROSSHAIRPATH, "crosshair", core_options::option_type::STRING, "path to crosshair files" }, -- { OPTION_PLUGINSPATH, "plugins", core_options::option_type::STRING, "path to plugin files" }, -- { OPTION_LANGUAGEPATH, "language", core_options::option_type::STRING, "path to UI translation files" }, -+ { OPTION_PLUGINSPATH, "plugins;@mame@/plugins", core_options::option_type::STRING, "path to plugin files" }, -+ { OPTION_LANGUAGEPATH, "language;@mame@/language", core_options::option_type::STRING, "path to UI translation files" }, - { OPTION_SWPATH, "software", core_options::option_type::STRING, "path to loose software" }, - - // output directory options -@@ -1301,3 +1301,4 @@ - m_entry = entry; - return entry; - } -+ diff --git a/pkgs/applications/emulators/melonDS/default.nix b/pkgs/applications/emulators/melonDS/default.nix index 6e389b8daf64..06ef3d99088e 100644 --- a/pkgs/applications/emulators/melonDS/default.nix +++ b/pkgs/applications/emulators/melonDS/default.nix @@ -1,40 +1,50 @@ { lib , fetchFromGitHub -, mkDerivation +, stdenv , cmake -, libepoxy +, extra-cmake-modules , libarchive , libpcap , libslirp , pkg-config , qtbase +, qtmultimedia , SDL2 +, wayland +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "melonDS"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "Arisotura"; repo = pname; rev = version; - sha256 = "sha256-FSacau7DixU6R4eKNIYVRZiMb/GhijTzHbcGlZ6WG/I="; + sha256 = "sha256-n4Vkxb/7fr214PgB6VFNgH1tMDgTBS/UHUQ6V4uGkDA="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + wrapQtAppsHook + ]; + buildInputs = [ - libepoxy libarchive libslirp qtbase + qtmultimedia SDL2 + wayland ]; qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}" ]; meta = with lib; { - homepage = "http://melonds.kuribo64.net/"; + homepage = "https://melonds.kuribo64.net/"; description = "Work in progress Nintendo DS emulator"; license = licenses.gpl3Plus; maintainers = with maintainers; [ artemist benley shamilton xfix ]; diff --git a/pkgs/applications/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix index d8aec3aa54c2..fc568275d330 100644 --- a/pkgs/applications/emulators/mgba/default.nix +++ b/pkgs/applications/emulators/mgba/default.nix @@ -3,30 +3,36 @@ , fetchFromGitHub , SDL2 , cmake -, ffmpeg +, ffmpeg_4 , imagemagick , libedit , libelf , libepoxy , libzip -, lua +, lua5_4 , minizip , pkg-config -, qtbase -, qtmultimedia -, qttools -, wrapQtAppsHook +, libsForQt5 }: +let + ffmpeg = ffmpeg_4; + lua = lua5_4; + inherit (libsForQt5) + qtbase + qtmultimedia + qttools + wrapQtAppsHook; +in stdenv.mkDerivation (finalAttrs: { pname = "mgba"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = finalAttrs.version; - hash = "sha256-2thc2v3aD8t1PrREZIjzRuYfP7b3BA7uFb6R95zxsZI="; + hash = "sha256-oWrgYrN7s5tdGJ/GhA2ZaKDVqZq9411fHSoYnLKWDl8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/pcem/default.nix b/pkgs/applications/emulators/pcem/default.nix index 22173fe9e085..bd9503f01778 100644 --- a/pkgs/applications/emulators/pcem/default.nix +++ b/pkgs/applications/emulators/pcem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, wxGTK32, coreutils, SDL2, openal, alsa-lib, pkg-config +{ stdenv, lib, fetchzip, wxGTK32, coreutils, SDL2, openal, alsa-lib, pkg-config, gtk3, wrapGAppsHook , autoreconfHook, withNetworking ? true, withALSA ? true }: stdenv.mkDerivation rec { @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "067pbnc15h6a4pnnym82klr1w8qwfm6p0pkx93gx06wvwqsxvbdv"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ wxGTK32 coreutils SDL2 openal ] + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + buildInputs = [ wxGTK32 coreutils SDL2 openal gtk3 ] ++ lib.optional withALSA alsa-lib; configureFlags = [ "--enable-release-build" ] diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index 2d1f583d7419..a2664e12641d 100644 --- a/pkgs/applications/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix @@ -12,89 +12,92 @@ , makeWrapper , pkg-config , python3 -, qtbase ? null -, qtmultimedia ? null +, qtbase +, qtmultimedia , snappy , vulkan-loader , wayland -, wrapQtAppsHook ? null +, wrapQtAppsHook , zlib +, enableQt ? false , enableVulkan ? true , forceWayland ? false }: let - enableQt = (qtbase != null); - frontend = if enableQt then "Qt" else "SDL and headless"; - vulkanPath = lib.makeLibraryPath [ vulkan-loader ]; - # experimental, see https://github.com/hrydgard/ppsspp/issues/13845 vulkanWayland = enableVulkan && forceWayland; in - # Only SDL front end needs to specify whether to use Wayland - assert forceWayland -> !enableQt; - stdenv.mkDerivation (finalAttrs: { - pname = "ppsspp" - + lib.optionalString enableQt "-qt" - + lib.optionalString (!enableQt) "-sdl" - + lib.optionalString forceWayland "-wayland"; - version = "1.13.2"; +# Only SDL frontend needs to specify whether to use Wayland +assert forceWayland -> !enableQt; +stdenv.mkDerivation (self: { + pname = "ppsspp" + + lib.optionalString enableQt "-qt" + + lib.optionalString (!enableQt) "-sdl" + + lib.optionalString forceWayland "-wayland"; + version = "1.14.4"; - src = fetchFromGitHub { - owner = "hrydgard"; - repo = "ppsspp"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - sha256 = "sha256-Ubbl2KCZ4QlWDtTxl4my0nKNGY25DOkD/iEurzVx4gU="; - }; + src = fetchFromGitHub { + owner = "hrydgard"; + repo = "ppsspp"; + rev = "v${self.version}"; + fetchSubmodules = true; + sha256 = "sha256-7xzhN8JIQD4LZg8sQ8rLNYZrW0nCNBfZFgzoKdoWbKc="; + }; - postPatch = '' - substituteInPlace git-version.cmake --replace unknown ${finalAttrs.src.rev} - substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share - ''; + postPatch = '' + substituteInPlace git-version.cmake --replace unknown ${self.src.rev} + substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share + ''; - nativeBuildInputs = [ - cmake - copyDesktopItems - makeWrapper - pkg-config - python3 - wrapQtAppsHook - ]; + nativeBuildInputs = [ + cmake + copyDesktopItems + makeWrapper + pkg-config + python3 + ] ++ lib.optional enableQt wrapQtAppsHook; - buildInputs = [ - SDL2 - ffmpeg - (glew.override { enableEGL = forceWayland; }) - libzip - qtbase - qtmultimedia - snappy - zlib - ] ++ lib.optional enableVulkan vulkan-loader - ++ lib.optionals vulkanWayland [ wayland libffi ]; + buildInputs = [ + SDL2 + ffmpeg + (glew.override { enableEGL = forceWayland; }) + libzip + snappy + zlib + ] ++ lib.optionals enableQt [ + qtbase + qtmultimedia + ] ++ lib.optional enableVulkan vulkan-loader + ++ lib.optionals vulkanWayland [ wayland libffi ]; - cmakeFlags = [ - "-DHEADLESS=${if enableQt then "OFF" else "ON"}" - "-DOpenGL_GL_PREFERENCE=GLVND" - "-DUSE_SYSTEM_FFMPEG=ON" - "-DUSE_SYSTEM_LIBZIP=ON" - "-DUSE_SYSTEM_SNAPPY=ON" - "-DUSE_WAYLAND_WSI=${if vulkanWayland then "ON" else "OFF"}" - "-DUSING_QT_UI=${if enableQt then "ON" else "OFF"}" - ]; + cmakeFlags = [ + "-DHEADLESS=${if enableQt then "OFF" else "ON"}" + "-DOpenGL_GL_PREFERENCE=GLVND" + "-DUSE_SYSTEM_FFMPEG=ON" + "-DUSE_SYSTEM_LIBZIP=ON" + "-DUSE_SYSTEM_SNAPPY=ON" + "-DUSE_WAYLAND_WSI=${if vulkanWayland then "ON" else "OFF"}" + "-DUSING_QT_UI=${if enableQt then "ON" else "OFF"}" + ]; - desktopItems = [(makeDesktopItem { + desktopItems = [ + (makeDesktopItem { desktopName = "PPSSPP"; name = "ppsspp"; exec = "ppsspp"; icon = "ppsspp"; comment = "Play PSP games on your computer"; categories = [ "Game" "Emulator" ]; - })]; + }) + ]; - installPhase = '' + installPhase = let + vulkanPath = lib.makeLibraryPath [ vulkan-loader ]; + in + '' runHook preInstall + mkdir -p $out/share/{applications,ppsspp} '' + (if enableQt then '' install -Dm555 PPSSPPQt $out/bin/ppsspp @@ -108,14 +111,16 @@ in --prefix LD_LIBRARY_PATH : ${vulkanPath} \ '' + "\n" + '' mv assets $out/share/ppsspp + runHook postInstall ''; - meta = with lib; { - homepage = "https://www.ppsspp.org/"; - description = "A HLE Playstation Portable emulator, written in C++ (${frontend})"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; - }; - }) + meta = { + homepage = "https://www.ppsspp.org/"; + description = "A HLE Playstation Portable emulator, written in C++ (" + + (if enableQt then "Qt" else "SDL + headless") + ")"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/applications/emulators/proton-caller/default.nix b/pkgs/applications/emulators/proton-caller/default.nix index 22bc7054da38..4b5da92d1d61 100644 --- a/pkgs/applications/emulators/proton-caller/default.nix +++ b/pkgs/applications/emulators/proton-caller/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "proton-caller"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "caverym"; repo = pname; rev = version; - sha256 = "sha256-eyHFKAGx8du4osoGDsMFzVE/TC/ZMPsx6mrWUPDCLJ4="; + sha256 = "sha256-fN/8woLkTFD0aGILwweHhpey3cGQw2NolvpOmdkEEGA="; }; - cargoSha256 = "sha256-/4+r5rvRUqQL8EVIg/22ZytXyE4+SV4UEcXiEw4795U="; + cargoSha256 = "sha256-2zczu9MtsDDbfjbmLXCiPJrxNoNNBN0KAGeN+a53SRg="; meta = with lib; { description = "Run Windows programs with Proton"; diff --git a/pkgs/applications/emulators/punes/default.nix b/pkgs/applications/emulators/punes/default.nix index dba83f41305d..529dce536430 100644 --- a/pkgs/applications/emulators/punes/default.nix +++ b/pkgs/applications/emulators/punes/default.nix @@ -1,13 +1,8 @@ -{ mkDerivation -, stdenv +{ stdenv , lib , fetchFromGitHub , fetchpatch -, nix-update-script -, qtbase -, qtsvg -, qttools -, autoreconfHook +, gitUpdater , cmake , pkg-config , ffmpeg @@ -16,42 +11,62 @@ , libX11 , libXrandr , sndio +, qtbase +, qtsvg +, qttools +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "punes"; - version = "0.109"; + version = "0.110"; src = fetchFromGitHub { owner = "punesemu"; repo = "puNES"; rev = "v${version}"; - sha256 = "sha256-6aRtR/d8nhzmpN9QKSZ62jye7qjfO+FpRMCXkX4Yubk="; + sha256 = "sha256-+hL168r40aYUjyLbWFXWk9G2srrrG1TH1gLYMliHftU="; }; - postPatch = '' - substituteInPlace configure.ac \ - --replace '`$PKG_CONFIG --variable=host_bins Qt5Core`/lrelease' '${qttools.dev}/bin/lrelease' - ''; - - nativeBuildInputs = [ autoreconfHook cmake pkg-config qttools ]; - - buildInputs = [ ffmpeg qtbase qtsvg libGLU ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libX11 libXrandr ] - ++ lib.optionals stdenv.hostPlatform.isBSD [ sndio ]; - - dontUseCmakeConfigure = true; - - enableParallelBuilding = true; - - configureFlags = [ - "--prefix=${placeholder "out"}" - "--without-opengl-nvidia-cg" - "--with-ffmpeg" + patches = [ + # Fixes compilation on aarch64 + # Remove when version > 0.110 + (fetchpatch { + url = "https://github.com/punesemu/puNES/commit/90dd5bc90412bbd199c2716f67a24aa88b24d80f.patch"; + hash = "sha256-/KNpTds4qjwyaTUebWWPlVXfuxVh6M4zOInxUfYztJg="; + }) ]; - passthru.updateScript = nix-update-script { - attrPath = pname; + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + ffmpeg + libGLU + qtbase + qtsvg + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libX11 + libXrandr + ] ++ lib.optionals stdenv.hostPlatform.isBSD [ + sndio + ]; + + cmakeFlags = [ + "-DENABLE_GIT_INFO=OFF" + "-DENABLE_RELEASE=ON" + "-DENABLE_FFMPEG=ON" + "-DENABLE_OPENGL=ON" + "-DENABLE_QT6_LIBS=${if lib.versionAtLeast qtbase.version "6.0" then "ON" else "OFF"}" + ]; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; }; meta = with lib; { diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index a738432a8ec3..c72ff4929b22 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -6,7 +6,6 @@ , cmake , curl , fetchFromGitHub -, fetchpatch , ffmpeg , fluidsynth , gettext @@ -50,7 +49,7 @@ let mkLibretroCore = { core , src ? (getCoreSrc core) - , version ? "unstable-2022-10-18" + , version ? "unstable-2022-12-20" , ... }@args: import ./mkLibretroCore.nix ({ @@ -796,11 +795,6 @@ in puae = mkLibretroCore { core = "puae"; makefile = "Makefile"; - # https://github.com/libretro/libretro-uae/pull/529 - patches = fetchpatch { - url = "https://github.com/libretro/libretro-uae/commit/90ba4c9bb940e566781c3590553270ad69cf212e.patch"; - sha256 = "sha256-9xkRravvyFZc0xsIj0OSm2ux5BqYogfQ1TDnH9l6jKw="; - }; meta = { description = "Amiga emulator based on WinUAE"; license = lib.licenses.gpl2Only; diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index d0a281afc373..7befac996fed 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -2,12 +2,15 @@ , stdenv , nixosTests , enableNvidiaCgToolkit ? false +, withAssets ? false +, withCoreInfo ? false , withGamemode ? stdenv.isLinux , withVulkan ? stdenv.isLinux , withWayland ? stdenv.isLinux , alsa-lib , dbus , fetchFromGitHub +, fetchpatch , ffmpeg_4 , flac , freetype @@ -25,16 +28,20 @@ , libxml2 , libXxf86vm , makeWrapper -, mbedtls +, mbedtls_2 , mesa , nvidia_cg_toolkit , pkg-config , python3 +, qtbase +, retroarch-assets , SDL2 +, spirv-tools , substituteAll , udev , vulkan-loader , wayland +, wrapQtAppsHook , zlib }: @@ -45,23 +52,29 @@ let in stdenv.mkDerivation rec { pname = "retroarch-bare"; - version = "1.12.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - hash = "sha256-doLWNA8aTAllxx3zABtvZaegBQEPIi8276zbytPSdBU="; + hash = "sha256-oEENGehbzjJq1kTiz6gkXHMMe/rXjWPxxMoe4RqdqK4="; rev = "v${version}"; }; patches = [ - (substituteAll { - src = ./use-fixed-path-for-libretro_core_info.patch; - libretro_info_path = libretro-core-info; + ./use-default-values-for-libretro_info_path-assets_directory.patch + # TODO: remove those two patches in the next RetroArch release + (fetchpatch { + url = "https://github.com/libretro/RetroArch/commit/894c44c5ea7f1eada9207be3c29e8d5c0a7a9e1f.patch"; + hash = "sha256-ThB6jd9pmsipT8zjehz7znK/s0ofHHCJeEYBKur6sO8="; + }) + (fetchpatch { + url = "https://github.com/libretro/RetroArch/commit/c5bfd52159cf97312bb28fc42203c39418d1bbbd.patch"; + hash = "sha256-rb1maAvCSUgq2VtJ67iqUY+Fz00Fchl8YGG0EPm0+F0="; }) ]; - nativeBuildInputs = [ pkg-config ] ++ + nativeBuildInputs = [ pkg-config wrapQtAppsHook ] ++ lib.optional withWayland wayland ++ lib.optional (runtimeLibs != [ ]) makeWrapper; @@ -72,9 +85,11 @@ stdenv.mkDerivation rec { libGL libGLU libxml2 - mbedtls + mbedtls_2 python3 + qtbase SDL2 + spirv-tools zlib ] ++ lib.optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ @@ -100,9 +115,18 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-update_cores" "--disable-builtinmbedtls" + "--enable-systemmbedtls" "--disable-builtinzlib" "--disable-builtinflac" ] ++ + lib.optionals withAssets [ + "--disable-update_assets" + "--with-assets_dir=${retroarch-assets}/share" + ] ++ + lib.optionals withCoreInfo [ + "--disable-update_core_info" + "--with-core_info_dir=${libretro-core-info}/share" + ] ++ lib.optionals stdenv.isLinux [ "--enable-dbus" "--enable-egl" @@ -112,9 +136,16 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString (runtimeLibs != [ ]) '' wrapProgram $out/bin/retroarch \ --prefix LD_LIBRARY_PATH ':' ${lib.makeLibraryPath runtimeLibs} + '' + + lib.optionalString enableNvidiaCgToolkit '' + wrapProgram $out/bin/retroarch-cg2glsl \ + --prefix PATH ':' ${lib.makeBinPath [ nvidia_cg_toolkit ]} ''; - preFixup = "rm $out/bin/retroarch-cg2glsl"; + preFixup = lib.optionalString (!enableNvidiaCgToolkit) '' + rm $out/bin/retroarch-cg2glsl + rm $out/share/man/man6/retroarch-cg2glsl.6* + ''; passthru.tests = nixosTests.retroarch; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index af63572e61c0..e4198184edc2 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -14,8 +14,8 @@ "beetle-lynx": { "owner": "libretro", "repo": "beetle-lynx-libretro", - "rev": "3d2fcc5a555bea748b76f92a082c40227dff8222", - "sha256": "PpFLi9DIvv8igtAqDPkLfH1CjkbeOumcpNCP7K9C1PY=" + "rev": "9c48124dc15604b3eb6892e3616dfb77992a6fd6", + "sha256": "ZXFU4QmjVQVU5bE5TVmGm4gepZpuoS8+p60l+Ha4I9s=" }, "beetle-ngp": { "owner": "libretro", @@ -26,26 +26,26 @@ "beetle-pce-fast": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "cc248db4d2f47d0f255fbc1a3c651df4beb3d835", - "sha256": "euoNldhyEPfC9EgEX201mpSjns2qbCIAow0zmMKTnaE=" + "rev": "d4fa4480f17f067c3aba25380717a5aee059f026", + "sha256": "t7OJuqEWec3GvNq9dsmrRhgz+GybBzt1ZO6FwZ9L5yE=" }, "beetle-pcfx": { "owner": "libretro", "repo": "beetle-pcfx-libretro", - "rev": "08632fcbc039f70dbd6da5810db9dcc304d7fbde", - "sha256": "G+OUs6k8dwH4BK+0X/g47wbY7Dpb3lT5TslLwPWq6g4=" + "rev": "af16dfd8353ed6cf76ef381b98a6a9abf59051ec", + "sha256": "snAA5PCU2NRsCiQtBRYEzczPSGG9OT2jDTrGaPZqhic=" }, "beetle-psx": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "bd6b9ef3049fe3f70a18ee6f752a935ae83c2f2b", - "sha256": "CXcLMOF6IXUrp14nyTQ5KK2LR+FyWcF0UcvHTxEVSo0=" + "rev": "3827fb4bd0d36f0db7b59e0c220524c7daaf0430", + "sha256": "CGNzb6XDPsp+EitkgyvDha9DoZSy+e9JWye0nmCiOns=" }, "beetle-saturn": { "owner": "libretro", "repo": "beetle-saturn-libretro", - "rev": "054862a4ccb9b2f1bad9e5b075fc3d1116dc8055", - "sha256": "oL9YPvDGkUs0Tm/rNznnV+Tg5mcvqs1VcGVmz/fDHmw=" + "rev": "19ce186783174b93b90845c3f0e1fa1694904912", + "sha256": "mEuv9lrDi/q2ASV9hxYptievupcv4PfUWPYlDcNzXQg=" }, "beetle-snes": { "owner": "libretro", @@ -56,26 +56,26 @@ "beetle-supafaust": { "owner": "libretro", "repo": "supafaust", - "rev": "85b5527231a6ad6f9475c15c8ff1b9d16884cd30", - "sha256": "6ynxRfGYlp7Fuq3XT2uHsR9Uwu7WMIYjclLc0Pf/qNM=" + "rev": "75c658cce454e58ae04ea252f53a31c60d61548e", + "sha256": "2fXarVfb5/SYXF8t25/fGNFvODpGas5Bi0hLIbXgB+0=" }, "beetle-supergrafx": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "3cfafe8c684a2f4f4532bcf18e25d2f8760ca45d", - "sha256": "hIBUMpXgX5zPi/W1vAhkuxprGfZQ/K5ZrtiswV36EMQ=" + "rev": "787772dff157c8fe54b2e16bb770f2c344c8932b", + "sha256": "i4SnjIqA0U88FnaT7fz5fqMyp8FyfNvxxhflOaAv1mA=" }, "beetle-vb": { "owner": "libretro", "repo": "beetle-vb-libretro", - "rev": "162918f06d9a705330b2ba128e0d3b65fd1a1bcc", - "sha256": "BtrdDob+B5g8Lq93LUhF7E0uWFUIMZneWFgH0VcsgPE=" + "rev": "3e845666d7ce235a071eb306e94074f1a72633bf", + "sha256": "ukKzG+O2o6EAF0l7cmMQOkemJ1oweIpRH5rle1gqaFk=" }, "beetle-wswan": { "owner": "libretro", "repo": "beetle-wswan-libretro", - "rev": "16d96f64a32cbe1fa89c40b142298dbd007f2f4d", - "sha256": "LBtOQfVvP70OB6qMnFXtWdJUu7CkkMfSQ0iPGhe7xeI=" + "rev": "cccee4217e53e164fd70196e56dfb24b967e5fd8", + "sha256": "RpGYQwDWkfYY0qnrTuAMzVuOSfTX5AZph7FD8ijUggc=" }, "blastem": { "owner": "libretro", @@ -92,8 +92,8 @@ "bsnes": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "7679cb9618c37c9044158d5cf3da28ef25afa9af", - "sha256": "9ozzXvCAuafcZn9iq91tTq16e2mlYqjwauJUGSbFd+k=" + "rev": "dabf6679024124b2f819c79f279dbb85a5263255", + "sha256": "iv8gxC48i8JMzby3vR4eYDViqCwSf8JGlPekQE6AF4c=" }, "bsnes-hd": { "owner": "DerKoun", @@ -110,8 +110,8 @@ "citra": { "owner": "libretro", "repo": "citra", - "rev": "70bf7d8a63b0b501e8f5cff89a86a3e2d4083aa0", - "sha256": "uHWROH6/ZAZygkhEQGNyllncCp2XDCdYwy/CKgGKAcM=", + "rev": "f0b09a5c0cb3767d43f5f8ca12a783012298fd44", + "sha256": "v86R5TLmNNMhuTMCwU3mAAtLK5H0sP//soh4x+cFgTQ=", "fetchSubmodules": true }, "desmume": { @@ -129,8 +129,8 @@ "dolphin": { "owner": "libretro", "repo": "dolphin", - "rev": "9810e29a1f3633d32b6643b97a1147d83311d73a", - "sha256": "iIaVSJSC3mD1k751vQvWI6x0C/HhfjEaMwfX53FpZv4=" + "rev": "2f4b0f7902257d40a054f60b2c670d6e314f2a04", + "sha256": "9WYWbLehExYbPmGJpguhVFXqFJ9aR6VxzFVChd4QOEg=" }, "dosbox": { "owner": "libretro", @@ -141,8 +141,8 @@ "eightyone": { "owner": "libretro", "repo": "81-libretro", - "rev": "73f6cca62dabc84df946aea71cf457ce5ae5ea9d", - "sha256": "oovIKMZXxtLc+zmbguagTVoMPngokdN3xTBnb/+KUjY=" + "rev": "340a51b250fb8fbf1a9e5d3ad3924044250064e0", + "sha256": "Cz3gPwbME8lDMKju3dn8hM8O2u9h9+8EUg7Nf6a7epA=" }, "fbalpha2012": { "owner": "libretro", @@ -153,14 +153,14 @@ "fbneo": { "owner": "libretro", "repo": "fbneo", - "rev": "758f24740d81ff833c1868befd98ccd11909255f", - "sha256": "VhfsvohRWICWqKWry0fgUS76kiXBsnjY9DytxEvulKA=" + "rev": "ef17049274a21239e5f21198b026dacbb38d7b90", + "sha256": "2N7c5L9grp+Rkhj25SoB9K9rVHq4H9IzU2KSeb1O7/E=" }, "fceumm": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "3d3cc53c0177e296af2427c29bbb31902b26f3b8", - "sha256": "Z5LqP6IBq0H6uM0027PSkW6JLvVDA/4CrO6bI478Z1o=" + "rev": "8c3f690e61a1d65dfb25510426ae88eeae93e1ae", + "sha256": "vzPrAEII8SWj3Ki2OaZb0/9gbQDz04rp2dXf2LE1sXg=" }, "flycast": { "owner": "libretro", @@ -189,8 +189,8 @@ "genesis-plus-gx": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "5cdb31854074de1662266a0a675866ea7b787b42", - "sha256": "vMswSKM5aYlPZu5y4Z1L/+eaPBdQaLPPMKoC7B/xzqc=" + "rev": "74a2f6521aea975a51f99497b57c5db500d61ed9", + "sha256": "qTNbFXg5QFKSzMOWhDdDfc0FinF/D7n2OruG5zv+ANY=" }, "gpsp": { "owner": "libretro", @@ -219,8 +219,8 @@ "mame": { "owner": "libretro", "repo": "mame", - "rev": "0d935696dce53a13eaf0705f4a108ee348f3c613", - "sha256": "HnJ3eHzTpR7Lsi1ATn3B314y0KNKJ0+qNGcDbFvmZEA=" + "rev": "85581d60bb24fea14542b154aef2c7b624f5b60f", + "sha256": "AUqJAXJCvddv9vPqXt5EZncKNdeLaXoc6xhYWqOMebY=" }, "mame2000": { "owner": "libretro", @@ -231,14 +231,14 @@ "mame2003": { "owner": "libretro", "repo": "mame2003-libretro", - "rev": "cb0c89304b2cd584cda7105c6be4e69fa304f0e0", - "sha256": "ob/aUh5NZCfQvpA+nEs2QhVXeNBBVZesX/xQfatY9wU=" + "rev": "b1cc49cf1d8bbef88b890e1c2a315a39d009171b", + "sha256": "bc4uER92gHf20JjR/Qcetvlu89ZmldJ1DiQphJZt/EA=" }, "mame2003-plus": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "d88d5c118e8d7075ec0a4e6deebb4cd3f18a8dd1", - "sha256": "9offucQMCpMqo4StYscS6kivXCYHy4Sn+Cs/3MoNwsw=" + "rev": "3249de7ceaaa92ee18e93cbd8c2ace9f1ee34c08", + "sha256": "mBF1j4em4e/fKEmPA8MmAZrXXYQiqFfAloOHdMbVq+k=" }, "mame2010": { "owner": "libretro", @@ -261,14 +261,14 @@ "melonds": { "owner": "libretro", "repo": "melonds", - "rev": "5e52c245fb38cabe881fbfa6513280ee44fc5bd8", - "sha256": "jWBZ5wg1dKEgoEV09VTGJ+I4+8uiivAHhpTiD9tPaYg=" + "rev": "0e1f06da626cbe67215c3f06f6bdf510dd4e4649", + "sha256": "ax9Vu8+1pNAHWPXrx5QA0n5EsmaJ2T7KJ5Otz8DSZwM=" }, "mesen": { "owner": "libretro", "repo": "mesen", - "rev": "9b412c1533a6d7eec7b2904775cbd26c21f02119", - "sha256": "Tf+lWfSU7AuW6Um5TXkWNAeg35W08YkYQwW0Yx3iNTM=" + "rev": "c89474c9d87df967d21b7b7d5971dc9475fec028", + "sha256": "cnPNBWXbnCpjgW/wJIboiRBzv3zrHWxpNM1kg09ShLU=" }, "mesen-s": { "owner": "libretro", @@ -285,26 +285,26 @@ "mgba": { "owner": "libretro", "repo": "mgba", - "rev": "199a03e719436018779fe9299706c597fb2e9231", - "sha256": "3Q3MBzezCvl1Er45AeUM/QI0a+JiGn/PfYpqMaaiuds=" + "rev": "ec5ecb26deba8d7ac830fc66ade9fac0eeaeb4ae", + "sha256": "kDDs+M7TPu6UhFnj9+XGI9whQFQ5/+7fSb0YUN7oMsg=" }, "mupen64plus": { "owner": "libretro", "repo": "mupen64plus-libretro-nx", - "rev": "c10546e333d57eb2e5a6ccef1e84cb6f9274c526", - "sha256": "dbS32slJBfz8DHeIQy20lAYw0+ig0LRgIaGfqW082xs=" + "rev": "bc241538b9ef85d8b22c392d7699dc73f460e283", + "sha256": "eCosI2yL1HJpHWvZLYZQe6+1rmmyHLFYCY7bX+3hPec=" }, "neocd": { "owner": "libretro", "repo": "neocd_libretro", - "rev": "b7d96e794f2dfa500cba46c78cbc3c28349cfd05", - "sha256": "TG5xIqIM0MlHDNtPhyISqo/ctTqemKROwXgoqUsCQ0E=" + "rev": "53f5453311a1ac43700fedb2317c810586f9ccf5", + "sha256": "BZBpojShHk+j5wz/d7FnykpX562TgH6PAqTUigE+zUU=" }, "nestopia": { "owner": "libretro", "repo": "nestopia", - "rev": "a9ee6ca84f04990e209880fe47144e62b14253db", - "sha256": "q3pD2Cm/a62x3xW8JymU9w82zHlT0BoPlaSfzjZzh/c=" + "rev": "d30c55052292826836f6dbaa2adc46fdf1a2d93c", + "sha256": "R2Kbtr2EqNUyx5eGBYyyw/ugSxVRM70TP/IsIsU0EZM=" }, "np2kai": { "owner": "AZO234", @@ -316,8 +316,8 @@ "nxengine": { "owner": "libretro", "repo": "nxengine-libretro", - "rev": "aa32afb8df8461920037bdbbddbff00bf465c6de", - "sha256": "Ic5YsNLoEZJ/vkjthwypwLN3ntB/5EX8bU92V80S7R4=" + "rev": "e271c6262d73f07e5d92d285503f1c049801c51a", + "sha256": "PfzHV6/nGUdbnfZ8+aHuoIQhvKcxdbuKnjIMWIIFt7Q=" }, "o2em": { "owner": "libretro", @@ -340,34 +340,34 @@ "pcsx2": { "owner": "libretro", "repo": "pcsx2", - "rev": "ad7650949e6c8c87cd2c5e278af88e3722a321bc", - "sha256": "iqXCW28werxbZNo1hlDLiD3ywSZ9hvWmxwGPJ5bRZ+w=" + "rev": "d2e37b80cfe6f6eecfe0356c7537d8e98bee7a8d", + "sha256": "rHXJG2wGoyNGvxxeZVF/I1CpaSBPUwZNERJtkG/z7MU=" }, "pcsx_rearmed": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "5ced3945423cda0010597b27b7da6bce77b12baa", - "sha256": "8O2XyEr40HqQf8mHxmvB6/UT837HZw8SrKBy/JH66p4=" + "rev": "aced3eb3fcaa0fe13c44c4dd196cdab42555fd98", + "sha256": "RzcrSADagi3AIPINQxc36BfMjWjatP/JL6HY744XnZk=" }, "picodrive": { "owner": "libretro", "repo": "picodrive", - "rev": "0a4ec83cbfaebb65fb1c40f26ffaf28131f9003b", - "sha256": "NOMQoDmXGrxrquAcSLo6Otcz8bH4gnhqcG/zzet3Dtk=", + "rev": "62873cab5366999207c197e9f55987daee10be4a", + "sha256": "YErmanNczeh6BeanCGllwOoTjXO+9At8l/o4UhIek4o=", "fetchSubmodules": true }, "play": { "owner": "jpd002", "repo": "Play-", - "rev": "1126c39cd8ebf56af347c475139d4db97fc7cc19", - "sha256": "H/cYFWl8rA/ZdoygEjr7h1y6Z0n29Z+OCzzVMvIuVyo=", + "rev": "0483fc43da01b5b29883acb2cf1d02d33bba1e30", + "sha256": "OxBQFTQP0L8k0lH88Ey6KWybW912Ehsv7XjWrvFivxo=", "fetchSubmodules": true }, "ppsspp": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "4af4b0dddc638b00205d9943f17a2806e438fe83", - "sha256": "5n+Mg2ZDTJd5fk1OZAiYnCT13G3LAWahXPA+MwaOF08=", + "rev": "1fa2f7a97191d2a73f243bfc464edef69b26f652", + "sha256": "BDX2eHtFbsloC9XYORHwpix8tbRSQUbcoP7DKFIohW4=", "fetchSubmodules": true }, "prboom": { @@ -385,8 +385,8 @@ "puae": { "owner": "libretro", "repo": "libretro-uae", - "rev": "4d8ebafe3f91c4998e8d73940e9558d863ecf93b", - "sha256": "dzfZFm7L+Qe3WwSYiMLp3cQm8zk0pWVB68nBe/H1Hvc=" + "rev": "af9e35383c00980aabb38c929e679704b624dee0", + "sha256": "hp4XOQUKktmUfLtRfVv1Oe1vqHUYu+vagxSSef55APs=" }, "quicknes": { "owner": "libretro", @@ -415,8 +415,8 @@ "snes9x": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "28be1a196d2c59ed4b6489d487187569a7370aff", - "sha256": "FW4ynSS+R1ygQaCS0UrWGktfHGtcy0P/Mp/BXKfmII0=" + "rev": "3c4982edddfdba482204ed48cf0b1d41ccae5493", + "sha256": "d4luyBSU/4PdsDd2jLwWSyckBPAqXMJ3C1sNmLO+E6U=" }, "snes9x2002": { "owner": "libretro", @@ -439,8 +439,8 @@ "stella": { "owner": "stella-emu", "repo": "stella", - "rev": "7193c405327e0f2156d24d53836162f4b44af079", - "sha256": "A9icQON+0WrknjGp/0wiFNSWs2ot2s0X5lucCdk4O/s=" + "rev": "82da36dd685c68b09047d7c835175879edb68653", + "sha256": "y7AOSY2VUe4Jv+wteplvA1ul5iXHoeYQhgycD+nfIuc=" }, "stella2014": { "owner": "libretro", @@ -451,8 +451,8 @@ "swanstation": { "owner": "libretro", "repo": "swanstation", - "rev": "ff0b451a573885a5b3a4f291f7b22f3ffc667a17", - "sha256": "jz8tkvgonc4icRt12tt1BBCCiwec0ucix7Hp7PNPl8E=" + "rev": "f2e335bfd4751410dfb24d933f762b9a4fd7fdeb", + "sha256": "l3A1Xb6YD+OOTZEF6whst1Kr8fSRnXuIVIUN1BCa2Bw=" }, "tgbdual": { "owner": "libretro", @@ -494,8 +494,8 @@ "virtualjaguar": { "owner": "libretro", "repo": "virtualjaguar-libretro", - "rev": "263c979be4ca757c43fb525bd6f0887998e57041", - "sha256": "6Q6Y0IFUWS9ZPhnAK3EUo4hMGPdBn8eNEYCK/zLgAKU=" + "rev": "2cc06899b839639397b8b30384a191424b6f529d", + "sha256": "7FiU5/n1hVePttkz7aVfXXx88+zX06/5SJk3EaRYvhQ=" }, "yabause": { "owner": "libretro", diff --git a/pkgs/applications/emulators/retroarch/libretro-core-info.nix b/pkgs/applications/emulators/retroarch/libretro-core-info.nix index 1dd8b0e4b748..79f9002ed402 100644 --- a/pkgs/applications/emulators/retroarch/libretro-core-info.nix +++ b/pkgs/applications/emulators/retroarch/libretro-core-info.nix @@ -5,16 +5,21 @@ stdenvNoCC.mkDerivation rec { pname = "libretro-core-info"; - version = "1.12.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-core-info"; - hash = "sha256-ByATDM0V40UJxigqVLyTWkHY5tiCC2dvZebksl8GsUI="; + hash = "sha256-3nw8jUxBQJxiKlWS6OjTjwUYWKx3r2E7eHmbj4naWrk="; rev = "v${version}"; }; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "PREFIX=$(out)" + # By default install in $(PREFIX)/share/libretro/info + # that is not in RetroArch's core info path + "INSTALLDIR=$(PREFIX)/share/retroarch/cores" + ]; dontBuild = true; diff --git a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix index 6ab652127009..829b96387f11 100644 --- a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix +++ b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix @@ -16,7 +16,7 @@ }@args: let - d2u = if normalizeCore then (lib.replaceChars [ "-" ] [ "_" ]) else (x: x); + d2u = if normalizeCore then (lib.replaceStrings [ "-" ] [ "_" ]) else (x: x); coreDir = placeholder "out" + libretroCore; coreFilename = "${d2u core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary}"; mainProgram = "retroarch-${core}"; diff --git a/pkgs/applications/emulators/retroarch/retroarch-assets.nix b/pkgs/applications/emulators/retroarch/retroarch-assets.nix new file mode 100644 index 000000000000..265b82757718 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/retroarch-assets.nix @@ -0,0 +1,33 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "retroarch-assets"; + version = "unstable-2022-10-24"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "retroarch-assets"; + rev = "4ec80faf1b5439d1654f407805bb66141b880826"; + hash = "sha256-j1npVKEknq7hpFr/XfST2GNHI5KnEYjZAM0dw4tMsYk="; + }; + + makeFlags = [ + "PREFIX=$(out)" + # By default install in $(PREFIX)/share/libretro/assets + # that is not in RetroArch's assets path + "INSTALLDIR=$(PREFIX)/share/retroarch/assets" + ]; + + dontBuild = true; + + meta = with lib; { + description = "Assets needed for RetroArch"; + homepage = "https://libretro.com"; + license = licenses.mit; + maintainers = with maintainers; teams.libretro.members ++ [ ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/emulators/retroarch/update_cores.py b/pkgs/applications/emulators/retroarch/update_cores.py index b546569d283f..4ed9dbf34080 100755 --- a/pkgs/applications/emulators/retroarch/update_cores.py +++ b/pkgs/applications/emulators/retroarch/update_cores.py @@ -2,12 +2,15 @@ #!nix-shell -I nixpkgs=../../../../ -i python3 -p "python3.withPackages (ps: with ps; [ requests nix-prefetch-github ])" -p "git" import json -import sys +import os import subprocess +import sys from pathlib import Path +from concurrent.futures import ThreadPoolExecutor SCRIPT_PATH = Path(__file__).absolute().parent HASHES_PATH = SCRIPT_PATH / "hashes.json" +GET_REPO_THREADS = int(os.environ.get("GET_REPO_THREADS", 8)) CORES = { "atari800": {"repo": "libretro-atari800"}, "beetle-gba": {"repo": "beetle-gba-libretro"}, @@ -27,7 +30,7 @@ CORES = { "bsnes": {"repo": "bsnes-libretro"}, "bsnes-hd": {"repo": "bsnes-hd", "owner": "DerKoun"}, "bsnes-mercury": {"repo": "bsnes-mercury"}, - "citra": { "repo": "citra", "fetch_submodules": True }, + "citra": {"repo": "citra", "fetch_submodules": True}, "desmume": {"repo": "desmume"}, "desmume2015": {"repo": "desmume2015"}, "dolphin": {"repo": "dolphin"}, @@ -141,16 +144,23 @@ def get_repo_hash(fetcher="fetchFromGitHub", **kwargs): raise ValueError(f"Unsupported fetcher: {fetcher}") -def get_repo_hashes(cores_to_update=[]): +def get_repo_hashes(cores={}): + def get_repo_hash_from_core_def(core_def): + core, repo = core_def + info(f"Getting repo hash for '{core}'...") + result = core, get_repo_hash(**repo) + info(f"Got repo hash for '{core}'!") + return result + with open(HASHES_PATH) as f: repo_hashes = json.loads(f.read()) - for core, repo in CORES.items(): - if core in cores_to_update: - info(f"Getting repo hash for '{core}'...") - repo_hashes[core] = get_repo_hash(**repo) - else: - info(f"Skipping '{core}'...") + info(f"Running with {GET_REPO_THREADS} threads!") + with ThreadPoolExecutor(max_workers=GET_REPO_THREADS) as executor: + new_repo_hashes = executor.map(get_repo_hash_from_core_def, cores.items()) + + for core, repo in new_repo_hashes: + repo_hashes[core] = repo return repo_hashes @@ -164,7 +174,8 @@ def main(): else: cores_to_update = CORES.keys() - repo_hashes = get_repo_hashes(cores_to_update) + cores = {core: repo for core, repo in CORES.items() if core in cores_to_update} + repo_hashes = get_repo_hashes(cores) info(f"Generating '{HASHES_PATH}'...") with open(HASHES_PATH, "w") as f: f.write(json.dumps(dict(sorted(repo_hashes.items())), indent=4)) diff --git a/pkgs/applications/emulators/retroarch/use-default-values-for-libretro_info_path-assets_directory.patch b/pkgs/applications/emulators/retroarch/use-default-values-for-libretro_info_path-assets_directory.patch new file mode 100644 index 000000000000..7ef7f439ecd1 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/use-default-values-for-libretro_info_path-assets_directory.patch @@ -0,0 +1,34 @@ +From 6960855a0cdfd671d214030260b340a73878af52 Mon Sep 17 00:00:00 2001 +From: Thiago Kenji Okada +Date: Fri, 23 Dec 2022 21:42:15 +0000 +Subject: [PATCH] Use default values for libretro_info_path/assets_directories + +--- + configuration.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configuration.c b/configuration.c +index d9ab8370c4..15b575d8a2 100644 +--- a/configuration.c ++++ b/configuration.c +@@ -1483,7 +1483,7 @@ static struct config_path_setting *populate_settings_path( + SETTING_PATH("core_options_path", + settings->paths.path_core_options, false, NULL, true); + SETTING_PATH("libretro_info_path", +- settings->paths.path_libretro_info, false, NULL, true); ++ settings->paths.path_libretro_info, false, NULL, false); + SETTING_PATH("content_database_path", + settings->paths.path_content_database, false, NULL, true); + SETTING_PATH("cheat_database_path", +@@ -1539,7 +1539,7 @@ static struct config_path_setting *populate_settings_path( + SETTING_PATH("core_assets_directory", + settings->paths.directory_core_assets, true, NULL, true); + SETTING_PATH("assets_directory", +- settings->paths.directory_assets, true, NULL, true); ++ settings->paths.directory_assets, true, NULL, false); + SETTING_PATH("dynamic_wallpapers_directory", + settings->paths.directory_dynamic_wallpapers, true, NULL, true); + SETTING_PATH("thumbnails_directory", +-- +2.38.1 + diff --git a/pkgs/applications/emulators/retroarch/use-fixed-path-for-libretro_core_info.patch b/pkgs/applications/emulators/retroarch/use-fixed-path-for-libretro_core_info.patch deleted file mode 100644 index 256397fd49ea..000000000000 --- a/pkgs/applications/emulators/retroarch/use-fixed-path-for-libretro_core_info.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6145cb9ed935621f1974655fe1ab44cf2f0fbcce Mon Sep 17 00:00:00 2001 -From: Thiago Kenji Okada -Date: Sat, 29 Oct 2022 12:27:55 +0100 -Subject: [PATCH] Use fixed path for libretro_core_info - ---- - configuration.c | 2 +- - frontend/drivers/platform_unix.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configuration.c b/configuration.c -index af3fc8f43c..c6d56308b3 100644 ---- a/configuration.c -+++ b/configuration.c -@@ -1468,7 +1468,7 @@ static struct config_path_setting *populate_settings_path( - SETTING_PATH("core_options_path", - settings->paths.path_core_options, false, NULL, true); - SETTING_PATH("libretro_info_path", -- settings->paths.path_libretro_info, false, NULL, true); -+ settings->paths.path_libretro_info, false, NULL, false); - SETTING_PATH("content_database_path", - settings->paths.path_content_database, false, NULL, true); - SETTING_PATH("cheat_database_path", -diff --git a/frontend/drivers/platform_unix.c b/frontend/drivers/platform_unix.c -index fe5f7341c9..c2a91f8c99 100644 ---- a/frontend/drivers/platform_unix.c -+++ b/frontend/drivers/platform_unix.c -@@ -1799,8 +1799,8 @@ static void frontend_unix_get_env(int *argc, - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], base_path, - "core_info", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO])); - #else -- fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], base_path, -- "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO])); -+ fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], "@libretro_info_path@", -+ "share/libretro/info", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO])); - #endif - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG], base_path, - "autoconfig", sizeof(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG])); --- -2.38.0 - diff --git a/pkgs/applications/emulators/retroarch/wrapper.nix b/pkgs/applications/emulators/retroarch/wrapper.nix index 4136d263eac4..afef0bef8a48 100644 --- a/pkgs/applications/emulators/retroarch/wrapper.nix +++ b/pkgs/applications/emulators/retroarch/wrapper.nix @@ -3,7 +3,6 @@ , makeWrapper , retroarch , symlinkJoin -, writeTextDir , cores ? [ ] }: diff --git a/pkgs/applications/emulators/ripes/default.nix b/pkgs/applications/emulators/ripes/default.nix index e95b22d07f55..3966be9e76a1 100644 --- a/pkgs/applications/emulators/ripes/default.nix +++ b/pkgs/applications/emulators/ripes/default.nix @@ -12,14 +12,14 @@ mkDerivation rec { pname = "ripes"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "mortbopet"; repo = "Ripes"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-HdvLi3OKJmr+U/dxCGmq6JR91dWpUL3uoPumH2/B46k="; + sha256 = "sha256-fRkab0G2zjK1VYzH21yhL7Cr0rS4I8ir8gwH9ALy60A="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/rpcemu/default.nix b/pkgs/applications/emulators/rpcemu/default.nix new file mode 100644 index 000000000000..9befb172fe4b --- /dev/null +++ b/pkgs/applications/emulators/rpcemu/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchhg +, qt5 +}: + +let + inherit (qt5) qtbase qtmultimedia wrapQtAppsHook; +in +stdenv.mkDerivation (self: { + pname = "rpcemu"; + version = "0.9.4"; + + src = fetchhg { + url = "http://www.home.marutan.net/hg/rpcemu"; + rev = "release_${self.version}"; + sha256 = "sha256-UyjfTfUpSvJNFPkQWPKppxp/kO0hVGo5cE9RuCU8GJI="; + }; + + nativeBuildInputs = [ + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + qtmultimedia + ]; + + configurePhase = '' + runHook preConfigure + + cd src/qt5 + qmake + + runHook postConfigure + ''; + + installPhase = '' + runHook preInstall + + cd ../.. + install -Dm755 rpcemu-interpreter -t $out/bin + + runHook postInstall + ''; + + meta = { + homepage = "https://www.marutan.net/rpcemu/index.php"; + description = "Risc PC Emulator"; + longDescription = '' + RPCEmu is an emulator of classic Acorn computer systems, such as the Risc + PC and A7000. It runs on multiple platforms including Windows, Linux and + Mac OS X. + + RPCEmu should be considered Alpha Quality code. It has many known and + unknown bugs, and all files used with it should be well backed up before + using them with RPCEmu. + ''; + license = lib.licenses.gpl2Plus; + maintainers = builtins.attrValues { + inherit (lib.maintainers) AndersonTorres; + }; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index b88e5f264729..a97114a07a57 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14358-a00f9e421"; - rpcs3Version = "0.0.25-14358-a00f9e421"; - rpcs3Revision = "a00f9e42115527aa9654870f194cf2c64329f2ef"; - rpcs3Sha256 = "0avajihbs02nbfqs4kzgckl0v2z4z8h8fgcjs5m4zxvkgj5701nv"; + rpcs3GitVersion = "14637-c471120a8"; + rpcs3Version = "0.0.26-14637-c471120a8"; + rpcs3Revision = "c471120a80ec6f12cd4489e1a9be073d7d9c96f2"; + rpcs3Sha256 = "1fl7zarxbjaz6mi3lqv55kdwpvjfz8d02qfl0655zihwm6zzdny5"; ittapi = fetchFromGitHub { owner = "intel"; diff --git a/pkgs/applications/emulators/ruffle/default.nix b/pkgs/applications/emulators/ruffle/default.nix index 80dc86643eb8..3ae67cd7132e 100644 --- a/pkgs/applications/emulators/ruffle/default.nix +++ b/pkgs/applications/emulators/ruffle/default.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { pname = "ruffle"; - version = "nightly-2022-09-26"; + version = "nightly-2022-12-16"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = pname; rev = version; - sha256 = "sha256-o0geKXODFRPKN4JgW+Sg16uPhBS5rrlMCmFSc9AcNPQ="; + sha256 = "sha256-VOaXn/dJB0AbuZ8owBbUYEPrL/H8DM73MhwhBjxq2Pg="; }; nativeBuildInputs = [ @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { "''${gappsWrapperArgs[@]}" ''; - cargoSha256 = "sha256-erqBuU66k7SGG9ueyYEINjeXbyC7A2I/r1bBqdsJemY="; + cargoSha256 = "sha256-h5qshincT48zYvbNLMXcvxw7Ovupnn9c93lpqY7oNtc="; meta = with lib; { description = "An Adobe Flash Player emulator written in the Rust programming language."; diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 73e93707ceed..0ede7db9f10e 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -29,15 +29,18 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.327"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.489"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "9719b6a1129c017d96532ff026e2bb933c0b2d0b"; - sha256 = "1vm1zwjm02jp64gjcfn923lxc4hqwgw44w9rspjy97q2z6r9vwjh"; + rev = "37d27c4c99486312d9a282d7fc056c657efe0848"; + sha256 = "0h55vv2g9i81km0jzlb62arlky5ci4i45jyxig3znqr1zb4l0a67"; }; + dotnet-sdk = dotnetCorePackages.sdk_7_0; + dotnet-runtime = dotnetCorePackages.runtime_7_0; + nugetDeps = ./deps.nix; nativeBuildInputs = [ @@ -88,8 +91,6 @@ buildDotnetModule rec { "/p:ExtraDefineConstants=DISABLE_UPDATER" ]; - dotnetRestoreFlags = [ "--runtime ${dotnetCorePackages.sdk_6_0.systemToDotnetRid stdenvNoCC.targetPlatform.system}" ]; - executables = [ "Ryujinx.Headless.SDL2" "Ryujinx.Ava" diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 6486c13c7952..214d0ee747c3 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -2,98 +2,86 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AtkSharp"; version = "3.22.25.128"; sha256 = "0fg01zi7v6127043jzxzihirsdp187pyj83gfa6p79cx763l7z94"; }) - (fetchNuGet { pname = "Avalonia"; version = "0.10.15"; sha256 = "02rf96gxpafbk0ilg3nxf0fas9gkpb25kzqc2lnbxp8h366qg431"; }) + (fetchNuGet { pname = "Avalonia"; version = "0.10.18"; sha256 = "01x7fc8rdkzba40piwi1ngsk7f8jawzn5bcq2la96hphsiahaarh"; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.15"; sha256 = "064l23dazs5aj8qj40py8vg362z3vpn2nxwh3m5h73qf85npyhgm"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.15"; sha256 = "0wgc46vg227bv7nsybc9mxkqv9xlz2bj08bdipkigjlf23g0x4p6"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.15"; sha256 = "0k3fq7nrfsx0l07mhnjnm0y2i0mydsnhjpa76jxsbh1kvi4mz56i"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.15"; sha256 = "1bq2ha1mmgsb9gxmsibr3i6alcg6y3kizxi07qh4wgw38c3fkwzs"; }) - (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.15"; sha256 = "1qvay0wlpih6864hl6w85mskirs19k0xg513lxq2rhddqcnkh788"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.15"; sha256 = "0p0ih6ql5kyvpfhc6ll2mgy23kx0vwn88qji74713id493w2ab02"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.15"; sha256 = "1va9zwznfr161w2xjjg4swm5505685mdkxxs747l2s35mahl5072"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.14"; sha256 = "1cvyg94avqdscniszshx5r3vfvx0cnna262sp89ad4bianmd4qkj"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.15"; sha256 = "0xlnanssz24rcnybz1x0d3lclzmbzdjb9k0i37rd76dif3rgng0h"; }) - (fetchNuGet { pname = "Avalonia.Svg"; version = "0.10.14"; sha256 = "102567bgj41sxhl3igzpd7gb6kizc6nyqlar23d7xvisyr0z037j"; }) - (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "0.10.14"; sha256 = "1d8gkaw057xakaa50a100m8lf1njwv0mzrqzwidlfvjsiay2c28j"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.15"; sha256 = "1lxaj8la8bwc7j4d3cc3q5jklycc647lzpm8610ya241y64gryww"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.15"; sha256 = "120d19i8ad3b2m1516v5r1bj4h7fddmad6szrbkbpd711x3sh6ka"; }) - (fetchNuGet { pname = "CairoSharp"; version = "3.22.25.128"; sha256 = "1rjdxd4fq5z3n51qx8vrcaf4i277ccc62jxk88xzbsxapdmjjdf9"; }) - (fetchNuGet { pname = "CommandLineParser"; version = "2.8.0"; sha256 = "1m32xyilv2b7k55jy8ddg08c20glbcj2yi545kxs9hj2ahanhrbb"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.18"; sha256 = "1qbb527jvhv2p8dcxi7lhm3lczy96j546gb5w09gh90dmzaq45bw"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.18"; sha256 = "0iaby5696km0yl0bs2a8i6a5ypras54mimnmh9wjwarwniqj8yjs"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.18"; sha256 = "1qsrzv1fz73p46p9v60qqds229znfv9hawnams5hxwl46jn2v9cp"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.18"; sha256 = "173apfayxkm3lgj7xk9xzsbxmdhv44svr49ccqnd1dii7y69bgny"; }) + (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.18"; sha256 = "0vcbhwckzxgcq9wxim91zk30kzjaydr9szl4rbr3rz85447hj9pi"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.18"; sha256 = "1hvmjs7wfcbycviky79g1p5q3bzs8j31sr53nnqxqy6pnbmg0nxg"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.18"; sha256 = "0phxxz4r1llklvp4svy9qlsms3qw77crai3ww70g03fifmmr9qq2"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.18"; sha256 = "1vi83d9q6m2zd7b5snyzjxsj3vdp5bmi5vqhfslzghslpbhj2zwv"; }) + (fetchNuGet { pname = "Avalonia.Svg"; version = "0.10.18"; sha256 = "06h7yh2lkm4rqfchn7nxqjbqx4afh42w61z9sby7b5gj56h5a84q"; }) + (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "0.10.18"; sha256 = "0s25aq3xz0km55jwdxp59z8cc0d1zqaag1hiwnxdzd30id2ahn66"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.18"; sha256 = "1rvqydbzdi2n6jw4xx9q8i025w5zsgcli9vmv0vw1d51rd4cnc4k"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.18"; sha256 = "0bzhbnz0dimxbpjxcrphnjn8nk37hqw0b83s2nsha4gzqvpc75b2"; }) + (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; }) (fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; }) (fetchNuGet { pname = "Crc32.NET"; version = "1.2.0"; sha256 = "0qaj3192k1vfji87zf50rhydn5mrzyzybrs2k4v7ap29k8i0vi5h"; }) - (fetchNuGet { pname = "DiscordRichPresence"; version = "1.0.175"; sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) - (fetchNuGet { pname = "DynamicData"; version = "7.9.4"; sha256 = "0mfmlsdd48dpwiphqhq8gsix2528mc6anp7rakd6vyzmig60f520"; }) - (fetchNuGet { pname = "Fizzler"; version = "1.2.0"; sha256 = "1b8kvqli5wql53ab9fwyg78h572z4f286s8rjb9xxmsyav1hsyll"; }) - (fetchNuGet { pname = "FluentAvaloniaUI"; version = "1.4.1"; sha256 = "1jddr3iqb6402gv4v9wr8zaqbd2lh7988znlk3l3bmkfdviiflsx"; }) - (fetchNuGet { pname = "GdkSharp"; version = "3.22.25.128"; sha256 = "0bmn0ddaw8797pnhpyl03h2zl8i5ha67yv38gly4ydy50az2xhj7"; }) - (fetchNuGet { pname = "GioSharp"; version = "3.22.25.128"; sha256 = "0syfa1f2hg7wsxln5lh86n8m1lihhprc51b6km91gkl25l5hw5bv"; }) - (fetchNuGet { pname = "GLibSharp"; version = "3.22.25.128"; sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; }) - (fetchNuGet { pname = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) + (fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; }) + (fetchNuGet { pname = "DynamicData"; version = "7.12.11"; sha256 = "159037gd4rn8z5wdkbnb296rw5csay8rjigi1h4n35mjfg4nhm8f"; }) + (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; }) + (fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; }) + (fetchNuGet { pname = "FluentAvaloniaUI"; version = "1.4.5"; sha256 = "1j5ivy83f13dgn09qrfkq44ijvh0m9rbdx8760g47di70c4lda7j"; }) (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2"; sha256 = "12kxgnmv9ygmqzf92zcnw4dqz6l4m1wsaz5v9i7i88jja81k6l3a"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2-preview.178"; sha256 = "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2-preview.178"; sha256 = "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2"; sha256 = "0jkdqwjyhpxlkswd6pq45w4aix3ivl8937p68c1jl2y0m5p6259w"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2-preview.178"; sha256 = "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2-preview.178"; sha256 = "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2"; sha256 = "1g3i7rzns6xsiybsls3sifgnfr6ml148c2r8vs0hz4zlisyfr8pd"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2-preview.178"; sha256 = "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.108"; sha256 = "0xs4px4fy5b6glc77rqswzpi5ddhxvbar1md6q9wla7hckabnq0z"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.1-preview.108"; sha256 = "16wvgvyra2g1b38rxxgkk85wbz89hspixs54zfcm4racgmj1mrj4"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.1-preview.108"; sha256 = "16v7lrwwif2f5zfkx08n6y6w3m56mh4hy757biv0w9yffaf200js"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.1-preview.108"; sha256 = "15kqb353snwpavz3jja63mq8xjqsrw1f902scm8wxmsqrm5q6x55"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) (fetchNuGet { pname = "jp2masa.Avalonia.Flexbox"; version = "0.2.0"; sha256 = "1abck2gad29mgf9gwqgc6wr8iwl64v50n0sbxcj1bcxgkgndraiq"; }) - (fetchNuGet { pname = "LibHac"; version = "0.16.1"; sha256 = "131qnqa1asdmymwdvpjza6w646b05jzn1cxjdxgwh7qdcdb77xyx"; }) + (fetchNuGet { pname = "LibHac"; version = "0.17.0"; sha256 = "06ar4yv9mbvi42fpzs8g6j5yqrk1nbn5zssbh2k08sx3s757gd6f"; }) (fetchNuGet { pname = "MicroCom.CodeGenerator.MSBuild"; version = "0.10.4"; sha256 = "1bdgy6g15d1mln1xpvs6sy0l2zvfs4hxw6nc3qm16qb8hdgvb73y"; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.10.4"; sha256 = "0ccbzp0d01dcahm7ban7xyh1rk7k2pkml3l5i7s85cqk5lnczpw2"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.4.0"; sha256 = "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.2.0"; sha256 = "0ld6xxgaqc3c6zgyimlvpgrxncsykbz8irqs01jyj40rv150kp8s"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.4.0"; sha256 = "0lag1m6xmr3sascf8ni80nqjz34fj364yzxrfs13k02fz1rlw5ji"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.4.0"; sha256 = "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.2.0"; sha256 = "0i1c7055j3f5k1765bl66amp72dcw0zapczfszdldbg91iqmmkxg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.4.0"; sha256 = "0wjsm651z8y6whxl915nlmk9py3xys5rs0caczmi24js38zx9rx7"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.4.0"; sha256 = "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.4.0"; sha256 = "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.8.0"; sha256 = "1y05sjk7wgd29a47v1yhn2s1lrd8wgazkilvmjbvivmrrm3fqjs8"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.4.1"; sha256 = "0bf68gq6mc6kzri4zi8ydc0xrazqwqg38bhbpjpj90zmqc28kari"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "3.1.1"; sha256 = "0qa04dspjl4qk7l8d66wqyrvhp5dxcfn2j4r8mmj362xyrp3r8sh"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.15.0"; sha256 = "0dwx7dk8jr10784nriqbi364qbxzfwq0c6xia0ac5rzrp7179r4d"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.15.0"; sha256 = "0jn9a20a2zixnkm3bmpmvmiv7mk0hqdlnpi0qgjkg1nir87czm19"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.15.0"; sha256 = "1nbgydr45f7lp980xyrkzpyaw2mkkishjwp3slgxk7f0mz6q8i1v"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.8.0"; sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.25.1"; sha256 = "0kkwjci3w5hpmvm4ibnddw7xlqq97ab8pa9mfqm52ri5dq1l9ffp"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.25.1"; sha256 = "16nk02qj8xzqwpgsas50j1w0hhnnxdl7dhqrmgyg7s165qxi5h70"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.25.1"; sha256 = "1r0v67w94wyvyhikcvk92khnzbsqsvmmcdz3yd71wzv6fr4rvrrh"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.25.1"; sha256 = "0srnsqzvr8yinl52ybpps0yg3dp0c8c96h7zariysp9cgb9pv8ds"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.1"; sha256 = "02p1j9fncd4fb2hyp51kw49d0dz30vvazhzk24c9f5ccc00ijpra"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.8.0"; sha256 = "0ii9d88py6mjsxzj9v3zx4izh6rb9ma6s9kj85xmc0xrw7jc2g3m"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.8.0"; sha256 = "1rh8cga1km3jfafkwfjr0dwqrxb4306hf7fipwba9h02w7vlhb9a"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.4.1"; sha256 = "0s68wf9yphm4hni9p6kwfk0mjld85f4hkrs93qbk5lzf6vv3kba1"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.4.1"; sha256 = "1n9ilq8n5rhyxcri06njkxb0h2818dbmzddwd2rrvav91647m2s4"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.5.0"; sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; }) (fetchNuGet { pname = "MsgPack.Cli"; version = "1.0.1"; sha256 = "1dk2bs3g16lsxcjjm7gfx6jxa4667wccw94jlh2ql7y7smvh9z8r"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.0"; sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) - (fetchNuGet { pname = "NUnit"; version = "3.12.0"; sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) + (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) (fetchNuGet { pname = "NUnit3TestAdapter"; version = "3.17.0"; sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; }) - (fetchNuGet { pname = "OpenTK.Core"; version = "4.7.2"; sha256 = "023jav5xdn532kdlkq8pqrvcjl98g1p9ggc8r85fk9bry5121pra"; }) - (fetchNuGet { pname = "OpenTK.Graphics"; version = "4.7.2"; sha256 = "1wnf9x45ga336vq4px2a2fmma4zc9xrcr4qwrsmsh3l4w0d9s6ps"; }) - (fetchNuGet { pname = "OpenTK.Mathematics"; version = "4.7.2"; sha256 = "0ay1a8spmy8pn5nlvvac796smp74hjpxm3swvxdrbqqg4l4xqlfz"; }) - (fetchNuGet { pname = "OpenTK.OpenAL"; version = "4.7.2"; sha256 = "1m0wgf4khikyz2pvns5d9ffwm7psxjn9r4h128aqlca1iyay23f6"; }) - (fetchNuGet { pname = "OpenTK.redist.glfw"; version = "3.3.7.25"; sha256 = "0yf84sql0bayndjacr385lzar0vnjaxz5klrsxflfi48mgc8g55s"; }) - (fetchNuGet { pname = "OpenTK.Windowing.GraphicsLibraryFramework"; version = "4.7.2"; sha256 = "14nswj5ws9yq6lkfyjj1y1pd6522rjqascxs5jy9cgnp954lv2hv"; }) - (fetchNuGet { pname = "PangoSharp"; version = "3.22.25.128"; sha256 = "0dkl9j0yd65s5ds9xj5z6yb7yca7wlycqz25m8dng20d13sqr1zp"; }) + (fetchNuGet { pname = "OpenTK.Core"; version = "4.7.5"; sha256 = "1dzjw5hi55ig5fjaj8a2hibp8smsg1lmy29s3zpnp79nj4i03r1s"; }) + (fetchNuGet { pname = "OpenTK.Graphics"; version = "4.7.5"; sha256 = "0r5zhqbcnw0jsw2mqadrknh2wpc9asyz9kmpzh2d02ahk3x06faq"; }) + (fetchNuGet { pname = "OpenTK.Mathematics"; version = "4.7.5"; sha256 = "0fvyc3ibckjb5wvciks1ks86bmk16y8nmyr1sqn2sfawmdfq80d9"; }) + (fetchNuGet { pname = "OpenTK.OpenAL"; version = "4.7.5"; sha256 = "0p6xnlc852lm0m6cjwc8mdcxzhan5q6vna1lxk6n1bg78bd4slfv"; }) + (fetchNuGet { pname = "OpenTK.redist.glfw"; version = "3.3.8.30"; sha256 = "1zm1ngzg6p64x0abz2x9mnl9x7acc1hmk4d1svk1mab95pqbrgwz"; }) + (fetchNuGet { pname = "OpenTK.Windowing.GraphicsLibraryFramework"; version = "4.7.5"; sha256 = "1958vp738bwg98alpsax5m97vzfgrkks4r11r22an4zpv0gnd2sd"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) @@ -135,45 +123,48 @@ (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "Ryujinx.AtkSharp"; version = "3.24.24.59-ryujinx"; sha256 = "0497v1himb77qfir5crgx25fgi7h12vzx9m3c8xxlvbs8xg77bcq"; }) (fetchNuGet { pname = "Ryujinx.Audio.OpenAL.Dependencies"; version = "1.21.0.1"; sha256 = "0z5k42h252nr60d02p2ww9190d7k1kzrb26vil4ydfhxqqqv6w9l"; }) - (fetchNuGet { pname = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "5.0.1-build10"; sha256 = "05r3fh92raaydf4vcih77ivymbs97kqwjlgqdpaxa11aqq0hq753"; }) - (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.0.22-build20"; sha256 = "03d1rv0rlr2z7ynqixgj9xqlksplk1vsvq5wxjf5c6c6zcknx01r"; }) + (fetchNuGet { pname = "Ryujinx.CairoSharp"; version = "3.24.24.59-ryujinx"; sha256 = "1cfspnfrkmr1cv703smnygdkf8d2r9gwz0i1xcck7lhxb5b7h1gs"; }) + (fetchNuGet { pname = "Ryujinx.GdkSharp"; version = "3.24.24.59-ryujinx"; sha256 = "1fqilm4fzddq88y2g5jx811wcjbzjd6bk5n7cxvy4c71iknhlmdg"; }) + (fetchNuGet { pname = "Ryujinx.GioSharp"; version = "3.24.24.59-ryujinx"; sha256 = "1m8s91zvx8drynsar75xi1nm8c4jyvrq406qadf0p8clbsgxvdxi"; }) + (fetchNuGet { pname = "Ryujinx.GLibSharp"; version = "3.24.24.59-ryujinx"; sha256 = "0samifm14g1960z87hzxmqb8bzp0vckaja7gn5fy8akgh03z96yd"; }) + (fetchNuGet { pname = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "5.0.1-build13"; sha256 = "1hjr1604s8xyq4r8hh2l7xqwsfalvi65vnr74v8i9hffz15cq8zp"; }) + (fetchNuGet { pname = "Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK"; version = "1.2.0"; sha256 = "1qkas5b6k022r57acpc4h981ddmzz9rwjbgbxbphrjd8h7lz1l5x"; }) + (fetchNuGet { pname = "Ryujinx.GtkSharp"; version = "3.24.24.59-ryujinx"; sha256 = "0dri508x5kca2wk0mpgwg6fxj4n5n3kplapwdmlcpfcbwbmrrnyr"; }) + (fetchNuGet { pname = "Ryujinx.PangoSharp"; version = "3.24.24.59-ryujinx"; sha256 = "1bdxm5k54zs0h6n2dh20j5jlyn0yml9r8qr828ql0k8zl7yhlq40"; }) + (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.24.2-build21"; sha256 = "11ya698m1qbas68jjfhah2qzf07xs4rxmbzncd954rqmmszws99l"; }) (fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; sha256 = "0f35s9h0vj9f1rx9bssj66hibc3j9bzrb4wgb5q2jwkf5xncxbpq"; }) - (fetchNuGet { pname = "SharpZipLib"; version = "1.3.3"; sha256 = "1gij11wfj1mqm10631cjpnhzw882bnzx699jzwhdqakxm1610q8x"; }) - (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.14"; sha256 = "0ym0ayik0vq2za9h0kr8mhjd9zk4hx25hrrfyyg9wrc164xa11qb"; }) - (fetchNuGet { pname = "Silk.NET.Core"; version = "2.10.1"; sha256 = "02fabxqhfn2a8kyqmxcmraq09m1pvd8gbw8xad6y9iqyhr0q8s0j"; }) - (fetchNuGet { pname = "Silk.NET.Vulkan"; version = "2.10.1"; sha256 = "03aapzb23lkn4qyq71lipcgj8h3ji12jjivrph535v0pwqx9db35"; }) - (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.EXT"; version = "2.10.1"; sha256 = "0d8ml39dhxpj2rql88g7dw3rkcjxl5722rilw1wdnjaki7hqgrz7"; }) - (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.KHR"; version = "2.10.1"; sha256 = "07zc7bjbg9h71m3l71i9gx5kwx7bhv4l7vha88wpi8h8f86zyvzd"; }) + (fetchNuGet { pname = "SharpZipLib"; version = "1.4.1"; sha256 = "1dh1jhgzc9bzd2hvyjp2nblavf0619djniyzalx7kvrbsxhrdjb6"; }) + (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.18"; sha256 = "1i97f2zbsm8vhcbcfj6g4ml6g261gijdh7s3rmvwvxgfha6qyvkg"; }) + (fetchNuGet { pname = "Silk.NET.Core"; version = "2.16.0"; sha256 = "1mkqc2aicvknmpyfry2v7jjxh3apaxa6dmk1vfbwxnkysl417x0k"; }) + (fetchNuGet { pname = "Silk.NET.Vulkan"; version = "2.16.0"; sha256 = "0sg5mxv7ga5pq6wc0lz52j07fxrcfmb0an30r4cxsxk66298z2wy"; }) + (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.EXT"; version = "2.16.0"; sha256 = "05918f6fl8byla2m7qjp7dvxww2rbpj2sqd4xq26rl885fmddfvf"; }) + (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.KHR"; version = "2.16.0"; sha256 = "1j4wsv7kjgjkmf2vlm5jjnqkdh265rkz5s1hx42i0f4bmdaz2kj1"; }) (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0-beta0013"; sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; }) (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "1.0.4"; sha256 = "0fmgn414my76gjgp89qlc210a0lqvnvkvk2fcwnpwxdhqpfvyilr"; }) (fetchNuGet { pname = "SixLabors.ImageSharp.Drawing"; version = "1.0.0-beta11"; sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.0"; sha256 = "0wqfgzyp2m4myqrni9rgchiqi95axbf279hlqjflrj4c9z2412ni"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.1"; sha256 = "1i1px67hcr9kygmbfq4b9nqzlwm7v2gapsp4isg9i19ax5g8dlhm"; }) - (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.0"; sha256 = "0ygkwlk2d59sqjvvw0s92hh92wxnm68rdlbp7wfs2gz5nipkgdvi"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.0-preview.178"; sha256 = "07kga1j51l3l302nvf537zg5clf6rflinjy0xd6i06cmhpkf3ksw"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.1"; sha256 = "1r9qr3civk0ws1z7hg322qyr8yjm10853zfgs03szr2lvdqiy7d1"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.0"; sha256 = "0d0pdcm61jfy3fvgkxmm3hj9cijrwbmp6ky2af776m1l63ryii3q"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.1"; sha256 = "1w55nrwpl42psn6klia5a9aw2j1n25hpw2fdhchypm9f0v2iz24h"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.0-preview.178"; sha256 = "09jmcg5k1vpsal8jfs90mwv0isf2y5wq3h4hd77rv6vffn5ic4sm"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; sha256 = "0mwj2yl4gn40lry03yqkj7sbi1drmm672dv88481sgah4c21lzrq"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0"; sha256 = "135ni4rba4wy4wyzy9ip11f3dwb1ipn38z9ps1p9xhw8jc06y5vp"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; sha256 = "1k50abd147pif9z9lkckbbk91ga1vv6k4skjz2n7wpll6fn0fvlv"; }) - (fetchNuGet { pname = "SPB"; version = "0.0.4-build27"; sha256 = "16i10lp4w7gi5rzjs9v9vns858n735ixcb83kl2qqq9qwyrnv8mw"; }) - (fetchNuGet { pname = "Svg.Custom"; version = "0.5.14"; sha256 = "1wjghs2n5hk7zszzk2p2a8m6ga2gc8sfd5mdqi15sbfkmwg2nbw7"; }) - (fetchNuGet { pname = "Svg.Model"; version = "0.5.14"; sha256 = "1xilk95bmnsl93sbr7pah0jrjrnccf1ikcn8s7rkm0yjkj382hc8"; }) - (fetchNuGet { pname = "Svg.Skia"; version = "0.5.14"; sha256 = "02wv040wi8ijw9mwg3c84f8bfyfv9n99ji8q1v2bs11b463zsyd1"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.108"; sha256 = "01sm36hdgmcgkai9m09xn2qfz8v7xhh803n8fng8rlxwnw60rgg6"; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.1-preview.108"; sha256 = "1hjscqn2kfgvn367drxzwssj5f5arn919x6clywbbf2dhggcdnn5"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.108"; sha256 = "19jf2jcq2spwbpx3cfdi2a95jf4y8205rh56lmkh8zsxd2k7fjyp"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.108"; sha256 = "1vcpqd7slh2b9gsacpd7mk1266r1xfnkm6230k8chl3ng19qlf15"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.108"; sha256 = "0a89gqjw8k97arr0kyd0fm3f46k1qamksbnyns9xdlgydjg557dd"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.108"; sha256 = "05g9blprq5msw3wshrgsk19y0fvhjlqiybs1vdyhfmww330jlypn"; }) + (fetchNuGet { pname = "SPB"; version = "0.0.4-build28"; sha256 = "1ran6qwzlkv6xpvnp7n0nkva0zfrzwlcxj7zfzz9v8mpicqs297x"; }) + (fetchNuGet { pname = "Svg.Custom"; version = "0.5.18"; sha256 = "0x68cs525k7c2dvj3vhjhx7bcls600xlsjkhfi7xvj0621masxa4"; }) + (fetchNuGet { pname = "Svg.Model"; version = "0.5.18"; sha256 = "1pqqaphdsjv4w9qlzb2i0kf0aas8778nlb4nysyiy5rdvpp7zzng"; }) + (fetchNuGet { pname = "Svg.Skia"; version = "0.5.18"; sha256 = "0j1n096d49gd53j6zzngf5v81dnrdzaa4rx7fpmk8zp1xz2wjb2j"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.CodeDom"; version = "4.4.0"; sha256 = "1zgbafm5p380r50ap5iddp11kzhr9khrf2pnai6k593wjar74p1g"; }) - (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; sha256 = "1i55cxp8ycc03dmxx4n22qi6jkwfl23cgffb95izq7bjar8avxxq"; }) + (fetchNuGet { pname = "System.CodeDom"; version = "7.0.0"; sha256 = "08a2k2v7kdx8wmzl4xcpfj749yy476ggqsy4cps4iyqqszgyv0zc"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) @@ -189,16 +180,14 @@ (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "4.5.0"; sha256 = "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.15.0"; sha256 = "0kzc9rqwn8xgixwm1z5zajf6bapa2rvi9lv8vgz7hlp1lgi964zk"; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.25.1"; sha256 = "03ifsmlfs2v5ca6wc33q8xd89m2jm4h2q57s1s9f4yaigqbq1vrl"; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) @@ -211,9 +200,10 @@ (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Management"; version = "6.0.0"; sha256 = "0ra1g75ykapg6i5y0za721kpjd6xcq6dalijkdm6fsxxmz8iz4dr"; }) + (fetchNuGet { pname = "System.Management"; version = "7.0.0"; sha256 = "1x3xwjzkmlcrj6rl6f2y8lkkp1s8xkhwqlpqk9ylpwqz7w3mhis0"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; }) (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; }) @@ -261,7 +251,6 @@ (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) @@ -282,7 +271,9 @@ (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "4.7.0"; sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) @@ -304,5 +295,5 @@ (fetchNuGet { pname = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) (fetchNuGet { pname = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; }) (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; }) - (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.3.4"; sha256 = "0w1bz5sr6y5fhgx1f54xyl8rx7y3kyf1fhacnd6akq8970zjdkdi"; }) + (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.5.1"; sha256 = "11sld5a9z2rdglkykvylghka7y37ny18naywpgpxp485m9bc63wc"; }) ] diff --git a/pkgs/applications/emulators/vbam/default.nix b/pkgs/applications/emulators/vbam/default.nix index bb5e7cea4e00..4f480e67ee5e 100644 --- a/pkgs/applications/emulators/vbam/default.nix +++ b/pkgs/applications/emulators/vbam/default.nix @@ -5,6 +5,8 @@ , fetchpatch , ffmpeg , gettext +, wxGTK32 +, gtk3 , libGLU, libGL , openal , pkg-config @@ -16,12 +18,12 @@ stdenv.mkDerivation rec { pname = "visualboyadvance-m"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "visualboyadvance-m"; repo = "visualboyadvance-m"; rev = "v${version}"; - sha256 = "1kgpbvng3c12ws0dy92zc0azd94h0i3j4vm7b67zc8mi3pqsppdg"; + sha256 = "1sc3gdn7dqkipjsvlzchgd98mia9ic11169dw8v341vr9ppb1b6m"; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -30,12 +32,15 @@ stdenv.mkDerivation rec { cairo ffmpeg gettext - libGLU libGL + libGLU + libGL openal SDL2 sfml zip zlib + wxGTK32 + gtk3 ]; cmakeFlags = [ @@ -43,23 +48,13 @@ stdenv.mkDerivation rec { "-DENABLE_FFMPEG='true'" "-DENABLE_LINK='true'" "-DSYSCONFDIR=etc" - "-DENABLE_WX='false'" "-DENABLE_SDL='true'" ]; - patches = [ - (fetchpatch { - # https://github.com/visualboyadvance-m/visualboyadvance-m/pull/793 - name = "fix-build-SDL-2.0.14.patch"; - url = "https://github.com/visualboyadvance-m/visualboyadvance-m/commit/619a5cce683ec4b1d03f08f316ba276d8f8cd824.patch"; - sha256 = "099cbzgq4r9g83bvdra8a0swfl1vpfng120wf4q7h6vs0n102rk9"; - }) - ]; - meta = with lib; { description = "A merge of the original Visual Boy Advance forks"; license = licenses.gpl2; - maintainers = with maintainers; [ lassulus ]; + maintainers = with maintainers; [ lassulus netali ]; homepage = "https://vba-m.com/"; platforms = lib.platforms.linux; badPlatforms = [ "aarch64-linux" ]; diff --git a/pkgs/applications/emulators/wibo/default.nix b/pkgs/applications/emulators/wibo/default.nix index 69137cb8f030..54a544fc6004 100644 --- a/pkgs/applications/emulators/wibo/default.nix +++ b/pkgs/applications/emulators/wibo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "wibo"; - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "decompals"; repo = "wibo"; rev = version; - hash = "sha256-dpfKSiIWE9L5BLPH2t8RsUz7Ufkdo/5zn1dewaEgJl0="; + hash = "sha256-J5h/RpF+twb5fBjSDQMVB5SoTWWs8VD/EUuikuj73YA="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta.license = lib.licenses.unfree; }; in lib.optionalString doCheck '' - MWCIncludes=. ./wibo ${gc}/GC/2.7/mwcceppc.exe -c ../test/test.c + MWCIncludes=../test ./wibo ${gc}/GC/2.7/mwcceppc.exe -c ../test/test.c file test.o | grep "ELF 32-bit" ''; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 699aa303462a..ae38f5d3326f 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { }) // rec { inherit version src; - pname = prevName + lib.optionalString supportFlags.waylandSupport "wayland"; + pname = prevName + lib.optionalString supportFlags.waylandSupport "-wayland"; # Fixes "Compiler cannot create executables" building wineWow with mingwSupport strictDeps = true; @@ -185,6 +185,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { passthru = { inherit pkgArches; + inherit (src) updateScript; tests = { inherit (nixosTests) wine; }; }; meta = { diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 7306112ce259..0e8f129f91f6 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -12,12 +12,21 @@ let fetchurl = args@{url, sha256, ...}: pkgs.fetchFromGitHub { inherit owner repo rev sha256; } // args; fetchFromGitLab = args@{domain, owner, repo, rev, sha256, ...}: pkgs.fetchFromGitLab { inherit domain owner repo rev sha256; } // args; + + updateScriptPreamble = '' + set -eou pipefail + PATH=${with pkgs; lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused jq nix ]} + sources_file=${__curPos.file} + source ${./update-lib.sh} + ''; + + inherit (pkgs) writeShellScript; in rec { stable = fetchurl rec { - version = "7.0"; + version = "7.0.1"; url = "https://dl.winehq.org/wine/source/7.0/wine-${version}.tar.xz"; - sha256 = "sha256-W0PifVwIXLGPlzlORhgDENXu98HZHGiVQyo4ibLeCGs="; + sha256 = "sha256-gHyqeBIbFiUPJA0oKKB8pOPGCXOeVSTvD0z4muSagWw="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -42,6 +51,24 @@ in rec { # Also look for root certificates at $NIX_SSL_CERT_FILE ./cert-path.patch ]; + + updateScript = writeShellScript "update-wine-stable" ('' + ${updateScriptPreamble} + major=''${UPDATE_NIX_OLD_VERSION%.*} + latest_stable=$(get_latest_wine_version "$major.0") + latest_gecko=$(get_latest_lib_version wine-gecko) + + # Can't use autobump on stable because we don't want the path + # to become . + if [[ "$UPDATE_NIX_OLD_VERSION" != "$latest_stable" ]]; then + set_version_and_sha256 stable "$latest_stable" "$(nix-prefetch-url "$wine_url_base/source/$major.0/wine-$latest_stable.tar.xz")" + fi + + autobump stable.gecko32 "$latest_gecko" + autobump stable.gecko64 "$latest_gecko" + + do_update + ''); }; unstable = fetchurl rec { @@ -56,6 +83,23 @@ in rec { url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; sha256 = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw="; }; + + updateScript = writeShellScript "update-wine-unstable" '' + ${updateScriptPreamble} + major=''${UPDATE_NIX_OLD_VERSION%.*} + latest_unstable=$(get_latest_wine_version "$major.x") + latest_mono=$(get_latest_lib_version wine-mono) + + update_staging() { + staging_url=$(get_source_attr staging.url) + set_source_attr staging sha256 "\"$(to_sri "$(nix-prefetch-url --unpack "''${staging_url//$1/$2}")")\"" + } + + autobump unstable "$latest_unstable" "" update_staging + autobump unstable.mono "$latest_mono" + + do_update + ''; }; staging = fetchFromGitHub rec { @@ -81,6 +125,22 @@ in rec { inherit (unstable) gecko32 gecko64; inherit (unstable) mono; + + updateScript = writeShellScript "update-wine-wayland" '' + ${updateScriptPreamble} + wayland_rev=$(get_source_attr wayland.rev) + + latest_wayland_rev=$(curl -s 'https://gitlab.collabora.com/api/v4/projects/2847/repository/branches/wayland' | jq -r .commit.id) + + if [[ "$wayland_rev" != "$latest_wayland_rev" ]]; then + latest_wayland=$(curl -s 'https://gitlab.collabora.com/alf/wine/-/raw/wayland/VERSION' | cut -f3 -d' ') + wayland_url=$(get_source_attr wayland.url) + set_version_and_sha256 wayland "$latest_wayland" "$(nix-prefetch-url --unpack "''${wayland_url/$wayland_rev/$latest_wayland_rev}")" + set_source_attr wayland rev "\"$latest_wayland_rev\"" + fi + + do_update + ''; }; winetricks = fetchFromGitHub rec { @@ -90,5 +150,16 @@ in rec { owner = "Winetricks"; repo = "winetricks"; rev = version; + + updateScript = writeShellScript "update-winetricks" '' + ${updateScriptPreamble} + winetricks_repourl=$(get_source_attr winetricks.gitRepoUrl) + + latest_winetricks=$(list-git-tags --url="$winetricks_repourl" | grep -E '^[0-9]{8}$' | sort --reverse --numeric-sort | head -n 1) + + autobump winetricks "$latest_winetricks" 'nix-prefetch-url --unpack' + + do_update + ''; }; } diff --git a/pkgs/applications/emulators/wine/update-lib.sh b/pkgs/applications/emulators/wine/update-lib.sh new file mode 100644 index 000000000000..8192d3b5ab58 --- /dev/null +++ b/pkgs/applications/emulators/wine/update-lib.sh @@ -0,0 +1,49 @@ +wine_url_base=https://dl.winehq.org/wine + +sed_exprs=() + +get_source_attr() { + nix-instantiate --eval --json -E "(let pkgs = import ./. {}; in pkgs.callPackage $sources_file { inherit pkgs; }).$1" | jq -r +} + +set_source_attr() { + path="$1" + name="$2" + value="$3" + line=$(nix-instantiate --eval -E "(builtins.unsafeGetAttrPos \"$name\" (let pkgs = import ./. {}; in pkgs.callPackage $sources_file { inherit pkgs; }).$path).line") + sed_exprs+=(-e "${line}s@[^ ].*\$@$name = $value;@") +} + +set_version_and_sha256() { + set_source_attr "$1" version "\"$2\"" + set_source_attr "$1" sha256 "\"$(to_sri "$3")\"" +} + +get_latest_wine_version() { + list-directory-versions --pname=wine --url="$wine_url_base/source/$1" | grep -v 'diff\|rc\|tar' | sort --reverse --version-sort -u | head -n 1 +} + +get_latest_lib_version() { + curl -s "$wine_url_base/$1/" | grep -o 'href="[0-9.]*/"' | sed 's_^href="\(.*\)/"_\1_' | sort --reverse --version-sort -u | head -n 1 +} + +to_sri() { + nix --extra-experimental-features nix-command hash to-sri --type sha256 "$1" +} + +autobump() { + attr="$1" + latest="$2" + fetcher="${3:-nix-prefetch-url}" + more="${4:-}" + version=$(get_source_attr "$attr.version") + if [[ "$version" != "$latest" ]]; then + url=$(get_source_attr "$attr.url") + set_version_and_sha256 "$attr" "$latest" "$($fetcher "${url//$version/$latest}")" + [[ -z "$more" ]] || $more "$version" "$latest" + fi +} + +do_update() { + [[ "${#sed_exprs[@]}" -eq 0 ]] || sed -i "${sed_exprs[@]}" "$sources_file" +} diff --git a/pkgs/applications/emulators/wine/winetricks.nix b/pkgs/applications/emulators/wine/winetricks.nix index 61ca6515c448..c5d8e9bd95b3 100644 --- a/pkgs/applications/emulators/wine/winetricks.nix +++ b/pkgs/applications/emulators/wine/winetricks.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { "$out/bin/winetricks" ''; + passthru = { + inherit (src) updateScript; + }; + meta = { description = "A script to install DLLs needed to work around problems in Wine"; license = lib.licenses.lgpl21; diff --git a/pkgs/applications/emulators/yuzu/default.nix b/pkgs/applications/emulators/yuzu/default.nix index 7650ebad343d..8dae647b89d6 100644 --- a/pkgs/applications/emulators/yuzu/default.nix +++ b/pkgs/applications/emulators/yuzu/default.nix @@ -15,13 +15,13 @@ let in { mainline = libsForQt5.callPackage ./generic.nix rec { pname = "yuzu-mainline"; - version = "1162"; + version = "1245"; src = fetchFromGitHub { owner = "yuzu-emu"; repo = "yuzu-mainline"; rev = "mainline-0-${version}"; - sha256 = "sha256-1UNgB/3l6RN0OLRrmXqzwcEUgXlWGSE7PvHbZ8YSDro="; + sha256 = "sha256-lWXlY1KQC067MvCRUFhmr0c7KDrHDuwJOhIWMKw1f+A="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/yuzu/update.sh b/pkgs/applications/emulators/yuzu/update.sh index 074d5b155fbf..7234adf977bb 100755 --- a/pkgs/applications/emulators/yuzu/update.sh +++ b/pkgs/applications/emulators/yuzu/update.sh @@ -21,10 +21,10 @@ updateBranch() { oldHash="$(nix eval --raw -f "./default.nix" "$attribute".src.drvAttrs.outputHash)" if [[ "$branch" = "mainline" ]]; then - newVersion="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/yuzu-emu/yuzu-mainline/releases?per_page=1" \ + newVersion="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/yuzu-emu/yuzu-mainline/releases?per_page=1" \ | jq -r '.[0].name' | cut -d" " -f2)" elif [[ "$branch" = "early-access" ]]; then - newVersion="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=2" \ + newVersion="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=2" \ | jq -r '.[].tag_name' | grep '^EA-[0-9]*' | head -n1 | cut -d"-" -f2 | cut -d" " -f1)" fi @@ -45,18 +45,18 @@ updateBranch() { sed -i "s,${oldVersion},${newVersion}," "$DEFAULT_NIX" sed -i "s,${oldHash},${newHash},g" "$DEFAULT_NIX" - echo " succesfully updated $attribute. new hash: $newHash" + echo " successfully updated $attribute. new hash: $newHash" } updateCompatibilityList() { local latestRevision oldUrl newUrl oldHash newHash oldDate newDate - latestRevision="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/flathub/org.yuzu_emu.yuzu/commits/master" | jq -r '.sha')" + latestRevision="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/flathub/org.yuzu_emu.yuzu/commits/master" | jq -r '.sha')" oldUrl="$(sed -n '/yuzu-compat-list/,/url/p' "$DEFAULT_NIX" | tail -n1 | cut -d'"' -f2)" newUrl="https://raw.githubusercontent.com/flathub/org.yuzu_emu.yuzu/${latestRevision}/compatibility_list.json" oldDate="$(sed -n '/last updated.*/p' "$DEFAULT_NIX" | rev | cut -d' ' -f1 | rev)" - newDate="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/flathub/org.yuzu_emu.yuzu/commits/${latestRevision}" \ + newDate="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/flathub/org.yuzu_emu.yuzu/commits/${latestRevision}" \ | jq -r '.commit.committer.date' | cut -d'T' -f1)" oldHash="$(sed -n '/yuzu-compat-list/,/sha256/p' "$DEFAULT_NIX" | tail -n1 | cut -d'"' -f2)" @@ -72,7 +72,7 @@ updateCompatibilityList() { sed -i "s,${oldUrl},${newUrl},g" "$DEFAULT_NIX" sed -i "s,${oldHash},${newHash},g" "$DEFAULT_NIX" sed -i "s,${oldDate},${newDate},g" "$DEFAULT_NIX" - echo " succesfully updated compatibility_list. new hash: $newHash" + echo " successfully updated compatibility_list. new hash: $newHash" } if [[ "$BRANCH" = "mainline" ]] || [[ "$BRANCH" = "early-access" ]]; then diff --git a/pkgs/applications/emulators/zsnes/2.x.nix b/pkgs/applications/emulators/zsnes/2.x.nix new file mode 100644 index 000000000000..fdb4ad9fa139 --- /dev/null +++ b/pkgs/applications/emulators/zsnes/2.x.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromGitHub +, SDL +, libGL +, libGLU +, libpng +, nasm +, pkg-config +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "zsnes2"; + version = "2.0.10"; + + src = fetchFromGitHub { + owner = "xyproto"; + repo = "zsnes"; + rev = finalAttrs.version; + hash = "sha256-QFPl3I2nFWMmgQRGxrlt4Vh5N4SygvBLjeFiQpgRr8o="; + }; + + nativeBuildInputs = [ + nasm + pkg-config + ]; + + buildInputs = [ + SDL + libGL + libGLU + libpng + zlib + ]; + + dontConfigure = true; + + NIX_CFLAGS_COMPILE = [ + # Until upstream fixes the issues... + "-Wp,-D_FORTIFY_SOURCE=0" + ]; + + installFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + postInstall = '' + install -Dm644 linux/zsnes.desktop $out/share/applications/zsnes.desktop + install -Dm644 icons/16x16x32.png $out/share/icons/hicolor/16x16/apps/zsnes.png + install -Dm644 icons/32x32x32.png $out/share/icons/hicolor/32x32/apps/zsnes.png + install -Dm644 icons/48x48x32.png $out/share/icons/hicolor/48x48/apps/zsnes.png + install -Dm644 icons/64x64x32.png $out/share/icons/hicolor/64x64/apps/zsnes.png + ''; + + meta = { + homepage = "https://github.com/xyproto/zsnes"; + description = "A maintained fork of zsnes"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86; + }; +}) diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix index 52f087b9db4d..003b07cb9759 100644 --- a/pkgs/applications/file-managers/clifm/default.nix +++ b/pkgs/applications/file-managers/clifm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clifm"; - version = "1.7"; + version = "1.9"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7nMAaMLFLF5WuWgac9wdIvzRTTVpKRM7zB2tIlowBEE="; + sha256 = "sha256-jrP8V1EhHldliZEjiX55TJujc82ub46aWi1boJYDVTg="; }; buildInputs = [ libcap acl file readline ]; diff --git a/pkgs/applications/file-managers/doublecmd/default.nix b/pkgs/applications/file-managers/doublecmd/default.nix index 46e8e96f2acb..ca2839709ba3 100644 --- a/pkgs/applications/file-managers/doublecmd/default.nix +++ b/pkgs/applications/file-managers/doublecmd/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.0.8"; + version = "1.0.10"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-kuqleoDoxzOj3baTK0lBJpbDECoHeFubWhLXAVkEqAk="; + hash = "sha256-S30/exZsw9Rs/l5Sml/q7dqUIcS55ZxbLFYv+M9Jr6o="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index 3e5a8c4cc98c..f299d9fe3fa1 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.1.0"; + version = "2.2.4"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CLCzRnczItvnjXtS4BOc9FeBCPQm102U0bDIWAZPzYc="; + sha256 = "sha256-KuEuWZSxh04NefkkJBYClnKs+UP7VwlyPElACjNZ5k8="; }; - cargoSha256 = "sha256-H+uOo3Cm1nFPYyA0qOAcaD4mfSd4Uaq5U20t6V4mmcg="; + cargoSha256 = "sha256-jYDe/3PDGCweNgHb+8i9az7J7BATlRjd3yha0nOc/gc="; nativeBuildInputs = [ pkg-config ]; @@ -27,12 +27,13 @@ rustPlatform.buildRustPackage rec { zstd ]; - checkInputs = [ zoxide ]; + nativeCheckInputs = [ zoxide ]; buildFeatures = [ "zstd/pkg-config" ]; checkFlags = [ # extra test files not shipped with the repository + "--skip=functions::tests::test_list_up_contents" "--skip=magic_image::tests::test_inspect_image" "--skip=magic_packed::tests::test_inspect_signature" ]; diff --git a/pkgs/applications/file-managers/lf/default.nix b/pkgs/applications/file-managers/lf/default.nix index faff30377950..fe19e5408c71 100644 --- a/pkgs/applications/file-managers/lf/default.nix +++ b/pkgs/applications/file-managers/lf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "lf"; - version = "27"; + version = "28"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - hash = "sha256-CrtVw3HhrC+D3c4ltHX8FSQnDvBpQJ890oJHoD6qPt4="; + hash = "sha256-VEXWjpdUP5Kabimp9kKoLR7/FlE39MAroRBl9au2TI8="; }; - vendorSha256 = "sha256-evkQT624EGj6MUwx3/ajdIbUMYjA1QyOnIQFtTLt0Yo="; + vendorHash = "sha256-oIIyQbw42+B6T6Qn6nIV62Xr+8ms3tatfFI8ocYNr0A="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/file-managers/llama/default.nix b/pkgs/applications/file-managers/llama/default.nix index b71ab1cdf0f3..a4729c49bdb5 100644 --- a/pkgs/applications/file-managers/llama/default.nix +++ b/pkgs/applications/file-managers/llama/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "llama"; - version = "1.1.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = "llama"; rev = "v${version}"; - sha256 = "sha256-/YnaKodMkuHrB0xH1UNRq+a6VknKRqcbBIehaYM6Gyc="; + sha256 = "sha256-mJUxi2gqTMcodznCUDb2iB6j/p7bMUhhBLtZMbvfE1c="; }; - vendorSha256 = "sha256-nngto104p/qJpWM1NlmEqcrJThXSeCfcoXCzV1CClYQ="; + vendorHash = "sha256-nngto104p/qJpWM1NlmEqcrJThXSeCfcoXCzV1CClYQ="; meta = with lib; { description = "Terminal file manager"; diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/applications/file-managers/mc/default.nix index 9204aad535ea..8b54d79622a4 100644 --- a/pkgs/applications/file-managers/mc/default.nix +++ b/pkgs/applications/file-managers/mc/default.nix @@ -16,7 +16,6 @@ , libssh2 , openssl , coreutils -, autoreconfHook , autoSignDarwinBinariesHook # updater only @@ -25,23 +24,14 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.28"; + version = "4.8.29"; src = fetchurl { url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-6ZTZvppxcumsSkrWIQeSH2qjEuZosFbf5bi867r1OAM="; + sha256 = "sha256-AdijuU9YGAzKW/FyV7UHjR/W/SeptcDpcOx2dUlUCtQ="; }; - patches = [ - # Add support for PERL_FOR_BUILD to fix cross-compilation: - # https://midnight-commander.org/ticket/4399 - (fetchurl { - url = "https://midnight-commander.org/raw-attachment/ticket/4399/0001-configure.ac-introduce-PERL_FOR_BUILD.patch"; - hash = "sha256-i4cbg/pner+yPfgmP04DEIvpNDlM9YDca1TNBdhWhwI="; - }) - ]; - - nativeBuildInputs = [ pkg-config autoreconfHook unzip ] + nativeBuildInputs = [ pkg-config unzip ] # The preFixup hook rewrites the binary, which invaliates the code # signature. Add the fixup hook to sign the output. ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ diff --git a/pkgs/applications/file-managers/mucommander/default.nix b/pkgs/applications/file-managers/mucommander/default.nix index 5e474f81f187..d9d570db6aa3 100644 --- a/pkgs/applications/file-managers/mucommander/default.nix +++ b/pkgs/applications/file-managers/mucommander/default.nix @@ -5,7 +5,7 @@ , perl , makeWrapper , writeText -, jdk11 +, jdk , gsettings-desktop-schemas }: @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { makeWrapper $out/share/mucommander/mucommander.sh $out/bin/mucommander \ --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ - --set JAVA_HOME ${jdk11} + --set JAVA_HOME ${jdk} ''; meta = with lib; { diff --git a/pkgs/applications/file-managers/nnn/default.nix b/pkgs/applications/file-managers/nnn/default.nix index 05f65df87b95..d9ff3b15c798 100644 --- a/pkgs/applications/file-managers/nnn/default.nix +++ b/pkgs/applications/file-managers/nnn/default.nix @@ -19,19 +19,19 @@ assert withIcons -> withNerdIcons == false; assert withNerdIcons -> withIcons == false; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nnn"; - version = "4.6"; + version = "4.7"; src = fetchFromGitHub { owner = "jarun"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-+EAKOXZp1kxA2X3e16ItjPT7Sa3WZuP2oxOdXkceTIY="; + repo = "nnn"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ttG0aEqMlNyJaMhcVfrxbxlrhr1GSydrV58CYSq4CTM="; }; configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); - preBuild = lib.optionalString (conf != null) "cp ${configFile} src/nnn.h"; + preBuild = lib.optionalString (conf != null) "cp ${finalAttrs.configFile} src/nnn.h"; nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ]; buildInputs = [ readline ncurses ] ++ lib.optional stdenv.hostPlatform.isMusl musl-fts; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-I${musl-fts}/include"; NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-lfts"; - makeFlags = [ "PREFIX=${placeholder "out"}" ] + makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals withIcons [ "O_ICONS=1" ] ++ lib.optionals withNerdIcons [ "O_NERD=1" ]; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ jfrankenau Br1ght0ne ]; }; -} +}) diff --git a/pkgs/applications/file-managers/ranger/default.nix b/pkgs/applications/file-managers/ranger/default.nix index 95f85430ba0b..a192edb0b32a 100644 --- a/pkgs/applications/file-managers/ranger/default.nix +++ b/pkgs/applications/file-managers/ranger/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; - checkInputs = with python3Packages; [ pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; propagatedBuildInputs = [ less file diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix index 92b3fae31596..5ac0f5e3abab 100644 --- a/pkgs/applications/file-managers/xfe/default.nix +++ b/pkgs/applications/file-managers/xfe/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "xfe"; - version = "1.44"; + version = "1.45"; src = fetchurl { url = "mirror://sourceforge/xfe/xfe-${version}.tar.xz"; - sha256 = "594c14d185bdfc7e3132aefda7cf4e233625258ca9a1939359944a2c07c030b6"; + sha256 = "sha256-RmvVUzqCsRRwXgC4Yabt46uFHnL0XFWncQfXDG+owDc="; }; nativeBuildInputs = [ pkg-config intltool ]; diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index 9ae2d97a3d28..51aa407b04a4 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -51,7 +51,7 @@ let inherit version; sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; }; - checkInputs = old.checkInputs ++ (with self; [ + nativeCheckInputs = old.nativeCheckInputs ++ (with self; [ requests ]); disabledTests = old.disabledTests ++ [ diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index e0023f84faab..1f78d5398596 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -7,7 +7,6 @@ , bison , proj , geos -, xlibsWrapper , sqlite , gsl , qwt @@ -29,11 +28,12 @@ , qtkeychain , qt3d , qscintilla +, qtlocation , qtserialport , qtxmlpatterns , withGrass ? true , grass -, withWebKit ? true +, withWebKit ? false , qtwebkit , pdal , zstd @@ -73,14 +73,14 @@ let six ]; in mkDerivation rec { - version = "3.22.10"; + version = "3.22.15"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-v/PshUZpf8fVW2PrGBiuAMfyfC/osOkR9GcnNOyg0l4="; + hash = "sha256-0hly1yZ7NAcSe84XMwDlcmZPunPcNXYzvAhd0Z5rB0Q="; }; passthru = { @@ -92,7 +92,6 @@ in mkDerivation rec { openssl proj geos - xlibsWrapper sqlite gsl qwt @@ -111,6 +110,7 @@ in mkDerivation rec { qca-qt5 qtkeychain qscintilla + qtlocation qtserialport qtxmlpatterns qt3d @@ -134,7 +134,11 @@ in mkDerivation rec { "-DWITH_3D=True" "-DWITH_PDAL=TRUE" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + ++ lib.optional withGrass (let + gmajor = lib.versions.major grass.version; + gminor = lib.versions.minor grass.version; + in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}" + ); dontWrapGApps = true; # wrapper params passed below diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 047173f00f30..18603e38ec53 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -7,7 +7,6 @@ , bison , proj , geos -, xlibsWrapper , sqlite , gsl , qwt @@ -29,11 +28,12 @@ , qtkeychain , qt3d , qscintilla +, qtlocation , qtserialport , qtxmlpatterns , withGrass ? true , grass -, withWebKit ? true +, withWebKit ? false , qtwebkit , pdal , zstd @@ -73,14 +73,14 @@ let six ]; in mkDerivation rec { - version = "3.26.2"; + version = "3.28.3"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-WU1yamZM/UVhtZjoZ/5J8gt7FOHEHi0D2Z9BWEl4br0="; + hash = "sha256-nXauZSC78BX1fcx0SXniwQpRmdSLfoqZ5jlbXeHgRGI="; }; passthru = { @@ -92,7 +92,6 @@ in mkDerivation rec { openssl proj geos - xlibsWrapper sqlite gsl qwt @@ -111,6 +110,7 @@ in mkDerivation rec { qca-qt5 qtkeychain qscintilla + qtlocation qtserialport qtxmlpatterns qt3d @@ -134,7 +134,11 @@ in mkDerivation rec { "-DWITH_3D=True" "-DWITH_PDAL=TRUE" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + ++ lib.optional withGrass (let + gmajor = lib.versions.major grass.version; + gminor = lib.versions.minor grass.version; + in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}" + ); dontWrapGApps = true; # wrapper params passed below diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index fc940cfce301..59794b88a4fd 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -31,11 +31,11 @@ mkDerivation rec { pname = "saga"; - version = "8.4.0"; + version = "8.5.0"; src = fetchurl { url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; - sha256 = "sha256-v6DPwV20fcsznrEaFJk0/ewU4z3cTjzYYuLkyMwSLV0="; + sha256 = "sha256-JzSuu1wGfCkxIDcTbP5jpHtJNvl8eAP3jznXvwSPeY0="; }; sourceRoot = "saga-${version}/saga-gis"; diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index d0b76706dc92..1f05f8e9fa66 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -35,13 +35,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "6.9.12-26"; + version = "6.9.12-68"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; rev = version; - sha256 = "sha256-oNorY/93jk1v5BS1T3wqctXuzV4o8JlyZtHnsNYmO4U="; + sha256 = "sha256-slQcA0cblxtG/1DiJx5swUh7Kfwgz5HG70eqJFLaQJI="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { ++ lib.optional libXtSupport libXt ++ lib.optional libwebpSupport libwebp; - doCheck = false; # fails 6 out of 76 tests + doCheck = false; # fails 2 out of 76 tests postInstall = '' (cd "$dev/include" && ln -s ImageMagick* ImageMagick) @@ -116,5 +116,25 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; license = licenses.asl20; + knownVulnerabilities = [ + "CVE-2018-16328" + "CVE-2018-16329" + "CVE-2019-13136" + "CVE-2019-17547" + "CVE-2020-25663" + "CVE-2020-27768" + "CVE-2021-3596" + "CVE-2021-3596" + "CVE-2021-3596" + "CVE-2021-3610" + "CVE-2021-20244" + "CVE-2021-20244" + "CVE-2021-20310" + "CVE-2021-20311" + "CVE-2021-20312" + "CVE-2021-20313" + "CVE-2022-0284" + "CVE-2022-2719" + ]; }; } diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 44397108f245..d5d64aef6d86 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -46,13 +46,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-52"; + version = "7.1.0-57"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-GV71O4cHUKJ7+6u4T+vdaFz5q2SpZVDCfEAbfz0s6f4="; + hash = "sha256-1fFsrsrY8AAMr6miG8OPZIYaVZhtVi5kEaI/96dzip8="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 0b70d67b2719..50156802779c 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -5,19 +5,19 @@ }: let - gitRev = "8fb4b0929ce84cf375bfb83a9d522ccd80681eaf"; + gitRev = "8b805c674adad536f9dd552b4be75fadcb3c7db6"; gitBranch = "develop"; gitTag = "0.9.3"; in stdenv.mkDerivation { pname = "antimony"; - version = "2020-03-28"; + version = "2022-11-23"; src = fetchFromGitHub { owner = "mkeeter"; repo = "antimony"; rev = gitRev; - sha256 = "1s0zmq5jmhmb1wcsyaxfmii448g6x8b41mzvb1awlljj85qj0k2s"; + sha256 = "NmOuBewfHqtAim2cNP62LXgRjVWuVUGweV46sY1qjGk="; }; patches = [ ./paths-fix.patch ]; diff --git a/pkgs/applications/graphics/apngasm/2.nix b/pkgs/applications/graphics/apngasm/2.nix index 0313115ddfa8..81d2915c96df 100644 --- a/pkgs/applications/graphics/apngasm/2.nix +++ b/pkgs/applications/graphics/apngasm/2.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create highly optimized Animated PNG files from PNG/TGA images"; - homepage = "http://apngasm.sourceforge.net/"; + homepage = "https://apngasm.sourceforge.net/"; license = licenses.zlib; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/ascii-image-converter/default.nix b/pkgs/applications/graphics/ascii-image-converter/default.nix index 708c3b468286..ed99f1ac73aa 100644 --- a/pkgs/applications/graphics/ascii-image-converter/default.nix +++ b/pkgs/applications/graphics/ascii-image-converter/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ascii-image-converter"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "TheZoraiz"; repo = "ascii-image-converter"; rev = "v${version}"; - sha256 = "sha256-2kg5W5u6YjLce3wNS3A1e89ZYAVK2LyNmPGCm86HxPM="; + sha256 = "sha256-svM/TzGQU/QgjqHboy0470+A6p4kR76typ9gnfjfAJk="; }; vendorSha256 = "sha256-rQS3QH9vnEbQZszG3FOr1P5HYgS63BurCNCFQTTdvZs="; diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index e3b966353ffe..502aeddf8146 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://autotrace.sourceforge.net/"; + homepage = "https://autotrace.sourceforge.net/"; description = "Utility for converting bitmap into vector graphics"; platforms = platforms.unix; maintainers = with maintainers; [ hodapp ]; diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index 0e61da0041b6..a780fc039a14 100644 --- a/pkgs/applications/graphics/azpainter/default.nix +++ b/pkgs/applications/graphics/azpainter/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab -, desktop-file-utils, shared-mime-info +, desktop-file-utils, shared-mime-info, ninja, pkg-config , libiconv , libX11, libXcursor, libXext, libXi , freetype, fontconfig @@ -9,18 +9,20 @@ stdenv.mkDerivation rec { pname = "azpainter"; - version = "3.0.4"; + version = "3.0.6"; src = fetchFromGitLab { owner = "azelpg"; repo = pname; rev = "v${version}"; - hash = "sha256-2gTTF1ti9bO24d75mhwyvJISSgMKdmp+oJVmgzEQHdY="; + hash = "sha256-/shmLdZ4mCBZAeUuqJtCiUjeI8B5f/8dIGPqmXMjZ1I="; }; nativeBuildInputs = [ desktop-file-utils # for update-desktop-database shared-mime-info # for update-mime-info + ninja + pkg-config ]; buildInputs = [ @@ -30,6 +32,10 @@ stdenv.mkDerivation rec { zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + preBuild = '' + cd build + ''; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/applications/graphics/blockbench-electron/default.nix b/pkgs/applications/graphics/blockbench-electron/default.nix index 1968756496bb..5afd0f1d876f 100644 --- a/pkgs/applications/graphics/blockbench-electron/default.nix +++ b/pkgs/applications/graphics/blockbench-electron/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_16 }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_22 }: stdenv.mkDerivation rec { pname = "blockbench-electron"; - version = "4.1.1"; + version = "4.5.2"; src = fetchurl { url = "https://github.com/JannisX11/blockbench/releases/download/v${version}/Blockbench_${version}.AppImage"; - sha256 = "0mqdkjhmylrjjfrm05jv1967qqka5263fgcn9qzax08gcq93s18f"; + sha256 = "sha256-uUgVBdYMCF31+L/FV4ADIpUdEAmnW59KfscQxUStPWM="; name = "${pname}-${version}.AppImage"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron_16}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_22}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" ''; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "A boxy 3D model editor powered by Electron"; homepage = "https://blockbench.net/"; license = licenses.gpl3Only; - maintainers = [ maintainers.ckie ]; + maintainers = with maintainers; [ ckie ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index e38ca908fe07..58af10640484 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, itk, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, itk_5_2, Cocoa }: stdenv.mkDerivation rec { pname = "c3d"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ itk ] + buildInputs = [ itk_5_2 ] ++ lib.optional stdenv.isDarwin Cocoa; cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ]; diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 095905ff06d8..00733e8a603b 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; - homepage = "http://comical.sourceforge.net/"; + homepage = "https://comical.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ viric wegank ]; platforms = with lib.platforms; unix; diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix index bb157ad18db0..f63b3b1709c0 100644 --- a/pkgs/applications/graphics/cq-editor/default.nix +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -37,7 +37,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytest pytest-xvfb pytest-mock diff --git a/pkgs/applications/graphics/cyan/default.nix b/pkgs/applications/graphics/cyan/default.nix index 2e59c6716b71..22fab6cc8d92 100644 --- a/pkgs/applications/graphics/cyan/default.nix +++ b/pkgs/applications/graphics/cyan/default.nix @@ -27,9 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ imagemagick ]; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Image viewer and converter, designed for prepress (print) work"; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index c9d5afce614c..cc727a9a8509 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -27,6 +27,7 @@ , libpng , librsvg , libtiff +, libjxl , openexr_3 , osm-gps-map , pkg-config @@ -57,12 +58,12 @@ }: stdenv.mkDerivation rec { - version = "4.0.0"; + version = "4.2.0"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "0bfcag6bj5vcmg4z4xjirs43iafcx89al6jl41i5mrhpjzszh5hl"; + sha256 = "18b0917fdfe9b09f66c279a681cc3bd52894a566852bbf04b2e179ecfdb11af9"; }; nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; @@ -83,6 +84,7 @@ stdenv.mkDerivation rec { libpng librsvg libtiff + libjxl openexr_3 sqlite libxslt diff --git a/pkgs/applications/graphics/dia/CVE-2019-19451.patch b/pkgs/applications/graphics/dia/CVE-2019-19451.patch deleted file mode 100644 index 28d6598330a3..000000000000 --- a/pkgs/applications/graphics/dia/CVE-2019-19451.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru a/app/app_procs.c b/app/app_procs.c ---- a/app/app_procs.c 2021-01-30 11:09:52.000000000 -0500 -+++ b/app/app_procs.c 2021-01-30 11:11:05.000000000 -0500 -@@ -785,6 +785,7 @@ - - if (!filename) { - g_print (_("Filename conversion failed: %s\n"), filenames[i]); -+ ++i; - continue; - } - diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index d07904c8597b..6b75bf11d423 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,37 +1,68 @@ -{ lib, stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkg-config, perlPackages, -libxml2, gettext, python2, libxml2Python, docbook5, docbook_xsl, -libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, -gtk-mac-integration-gtk2 }: +{ lib +, stdenv +, fetchFromGitLab +, appstream-glib +, cmake +, dblatex +, desktop-file-utils +, graphene +, gtk2 +, gtk-mac-integration-gtk2 +, intltool +, libxml2 +, libxslt +, meson +, ninja +, pkg-config +, poppler +, python3 + # Building with docs are failing in unstable-2022-12-14 +, withDocs ? false +}: stdenv.mkDerivation { pname = "dia"; - version = "0.97.3.20170622"; + version = "unstable-2022-12-14"; - src = fetchgit { - url = "https://gitlab.gnome.org/GNOME/dia.git"; - rev = "b86085dfe2b048a2d37d587adf8ceba6fb8bc43c"; - sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96"; + src = fetchFromGitLab { + owner = "GNOME"; + repo = "dia"; + domain = "gitlab.gnome.org"; + rev = "4a619ec7cc93be5ddfbcc48d9e1572d04943bcad"; + hash = "sha256-xi45Ak4rlDQjs/FNkdkm145mx76GNHjE6Nrs1dc94ww="; }; - patches = [ - ./CVE-2019-19451.patch - ]; - - buildInputs = - [ gtk2 libxml2 gettext python2 libxml2Python docbook5 - libxslt docbook_xsl libart_lgpl ] - ++ lib.optional withGNOME libgnomeui - ++ lib.optional stdenv.isDarwin gtk-mac-integration-gtk2; - - nativeBuildInputs = [ autoconf automake libtool pkg-config intltool ] - ++ (with perlPackages; [ perl XMLParser ]); + patches = [ ./poppler-22_09-build-fix.patch ]; preConfigure = '' - NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough + patchShebangs . ''; - configureFlags = lib.optional withGNOME "--enable-gnome"; - hardeningDisable = [ "format" ]; + buildInputs = [ + graphene + gtk2 + libxml2 + python3 + poppler + ] ++ + lib.optionals withDocs [ + libxslt + ] ++ + lib.optionals stdenv.isDarwin [ + gtk-mac-integration-gtk2 + ]; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + intltool + meson + ninja + pkg-config + ] ++ + lib.optionals withDocs [ + dblatex + ]; meta = with lib; { description = "Gnome Diagram drawing software"; diff --git a/pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch b/pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch new file mode 100644 index 000000000000..c461d8a64291 --- /dev/null +++ b/pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch @@ -0,0 +1,93 @@ +diff --git a/plug-ins/pdf/pdf-import.cpp b/plug-ins/pdf/pdf-import.cpp +index 189737908..a2a479693 100644 +--- a/plug-ins/pdf/pdf-import.cpp ++++ b/plug-ins/pdf/pdf-import.cpp +@@ -152,12 +152,12 @@ public : + void + updateLineDash (GfxState *state) + { +- double *dashPattern; +- int dashLength; +- double dashStart; +- +- state->getLineDash (&dashPattern, &dashLength, &dashStart); +- this->dash_length = dashLength ? dashPattern[0] * scale : 1.0; ++ const double *dashPattern=NULL; ++ int dashLength=0; ++ double dashStart=0; ++ const std::vector &dash = state->getLineDash(&dashStart); // > Poppler 22.09 ... ++ dashPattern = dash.data(); ++ dashLength = dash.size(); + + if (dashLength == 0) + this->line_style = DIA_LINE_STYLE_SOLID; +@@ -318,10 +318,11 @@ public : + //FIXME: Dia is really unhappy about zero size fonts + if (!(state->getFontSize() > 0.0)) + return; +- GfxFont *f = state->getFont(); ++ const std::shared_ptr f = state->getFont(); // poppler 22.05 ... header changed ++ gconstpointer f1 = &f; // GLib typedef const void * gconstpointer; + + // instead of building the same font over and over again +- if (g_hash_table_lookup (this->font_map, f)) { ++ if (g_hash_table_lookup (this->font_map, f1)) { + ++font_map_hits; + return; + } +@@ -333,8 +334,9 @@ public : + gchar *family = g_strdup (f->getFamily() ? f->getFamily()->c_str() : "sans"); + + // we are (not anymore) building the same font over and over again ++ f1 = &f; + g_print ("Font 0x%x: '%s' size=%g (* %g)\n", +- GPOINTER_TO_INT (f), family, state->getTransformedFontSize(), scale); ++ GPOINTER_TO_INT (f1), family, state->getTransformedFontSize(), scale); + + // now try to make a fontname Dia/Pango can cope with + // strip style postfix - we already have extracted the style bits above +@@ -354,7 +356,9 @@ public : + fsize *= fabs(fm[3] / fm[0]); + font = dia_font_new (family, style, fsize * scale / 0.8); + +- g_hash_table_insert (this->font_map, f, font); ++ f1 = &f; ++ gpointer f2 = (gpointer)f1; // GLib typedef void* gpointer; ++ g_hash_table_insert (this->font_map, f2, font); + g_free (family); + } + void updateTextShift(GfxState *state, double shift) +@@ -721,11 +725,12 @@ DiaOutputDev::drawString(GfxState *state, GooString *s) + return; + if (!(state->getFontSize() > 0.0)) + return; +- font = (DiaFont *)g_hash_table_lookup (this->font_map, state->getFont()); ++ gconstpointer f_1 = &state->getFont(); ++ font = (DiaFont *)g_hash_table_lookup (this->font_map, f_1); + + // we have to decode the string data first + { +- GfxFont *f = state->getFont(); ++ const std::shared_ptr f = state->getFont(); + const char *p = s->c_str(); + CharCode code; + int j = 0, m, n; +@@ -870,8 +875,8 @@ import_pdf(const gchar *filename, DiagramData *dia, DiaContext *ctx, void* user_ + std::unique_ptr doc; + GooString *fileName = new GooString(filename); + // no passwords yet +- GooString *ownerPW = NULL; +- GooString *userPW = NULL; ++ const std::optional ownerPW; ++ const std::optional userPW; + gboolean ret = FALSE; + + // without this we will get strange crashes (at least with /O2 build) +@@ -899,6 +904,7 @@ import_pdf(const gchar *filename, DiagramData *dia, DiaContext *ctx, void* user_ + delete diaOut; + ret = TRUE; + } ++ doc.reset(); + delete fileName; + + return ret; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index f08e49283c12..19d0f5242e06 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -56,11 +56,11 @@ mkDerivation rec { pname = "digikam"; - version = "7.8.0"; + version = "7.9.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz"; - sha256 = "sha256-sIV3sLFe+ZhDaVcIqiwOmNVHMD2Fvio7OZBUhPLKts4="; + sha256 = "sha256-w7gKvAkNo8u8QuZ6QDCA1/X+CnyYaYc1vaVWxgMUurQ="; }; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 244f0c27648f..6386c39ce910 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -46,7 +46,7 @@ mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; description = "A portable DjVu viewer (Qt5) and browser (nsdejavu) plugin"; - homepage = "http://djvu.sourceforge.net/djview4.html"; + homepage = "https://djvu.sourceforge.net/djview4.html"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ Anton-Latukha ]; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index e5e77dccbbb4..b03073349f3f 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0vmxgn9wd3j80hp4gr5iq06jrl4gryz5zgfdd2ah30d12sfcfig0"; }; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook pytest-xdist responses ]; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index e755b708a063..c26b2f46e7f6 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 = "20.3.0"; + version = "20.8.10"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "bfcd363f549ce8dc13ae2287cec5099e4bf1d0d4b6f8deef40a81279f78817e1"; + sha256 = "118e9c9a328c92aeeda3c5925c8d8ed50d0993c07715726447ee720699958626"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 09d51db254ba..76409860ffa9 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -25,7 +25,7 @@ # optional server deps , libmicrohttpd , libsodium -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd ? null # options diff --git a/pkgs/applications/graphics/emblem/default.nix b/pkgs/applications/graphics/emblem/default.nix new file mode 100644 index 000000000000..8df8b7680139 --- /dev/null +++ b/pkgs/applications/graphics/emblem/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchFromGitLab +, rustPlatform +, pkg-config +, meson +, ninja +, glib +, gobject-introspection +, libadwaita +, libxml2 +, librsvg +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "emblem"; + version = "1.1.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World/design"; + repo = pname; + rev = version; + sha256 = "sha256-kNPV1SHkNTBXbMzDJGuDbaGz1WkBqMpVgZKjsh7ejmo="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-yhXxlUOe+mWVpAEB0yN9m5S5yfNRrHnx7XHLXbbf1hc="; + }; + + nativeBuildInputs = [ + appstream-glib + glib + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook4 + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = [ + desktop-file-utils + libadwaita + librsvg + libxml2 + ]; + + meta = with lib; { + description = "Generate project icons and avatars from a symbolic icon"; + homepage = "https://gitlab.gnome.org/World/design/emblem"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ foo-dogsquared ]; + }; +} diff --git a/pkgs/applications/graphics/evilpixie/default.nix b/pkgs/applications/graphics/evilpixie/default.nix index be8e00b5154a..49611f1709b7 100644 --- a/pkgs/applications/graphics/evilpixie/default.nix +++ b/pkgs/applications/graphics/evilpixie/default.nix @@ -1,52 +1,43 @@ -{ mkDerivation -, lib +{ lib +, stdenv , fetchFromGitHub -, makeDesktopItem -, qmake +, meson +, ninja +, pkg-config +, wrapQtAppsHook , qtbase , libpng , giflib +, libjpeg , impy }: -let - desktopItem = makeDesktopItem { - name = "EvilPixie"; - desktopName = "EvilPixie"; - exec = "evilpixie %F"; - icon = "evilpixie"; - genericName = "Image Editor"; - 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 { +stdenv.mkDerivation rec { pname = "evilpixie"; - version = "0.2.1"; + version = "0.3.1"; src = fetchFromGitHub { owner = "bcampbell"; repo = "evilpixie"; rev = "v${version}"; - sha256 = "0dwgfr8kmkfppgf5wx9i5f7fjz3gxk0ji1l06x1z4r3vj52hdbph"; + sha256 = "sha256-+DdAN+xDOYxLgLHUlr75piTEPrWpuOyXvxckhBEl7yU="; }; nativeBuildInputs = [ - qmake + meson + ninja + pkg-config + wrapQtAppsHook ]; buildInputs = [ qtbase libpng giflib + libjpeg impy ]; - postInstall = '' - ln -s ${desktopItem}/share/applications $out/share - install -Dm 444 icon_128x128.png $out/share/icons/hicolor/128x128/apps/evilpixie.png - ''; - meta = with lib; { description = "Pixel-oriented paint program, modelled on Deluxe Paint"; homepage = "https://github.com/bcampbell/evilpixie"; # http://evilpixie.scumways.com/ is gone @@ -54,6 +45,11 @@ in mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + # Undefined symbols for architecture x86_64: + # "_bundle_path", referenced from: App::SetupPaths() in src_app.cpp.o + broken = stdenv.isDarwin || + # https://github.com/bcampbell/evilpixie/issues/28 + stdenv.isAarch64; }; } diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix deleted file mode 100644 index 2bb480a54f4d..000000000000 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, fltk, openexr, libGLU, libGL, ctl }: - -stdenv.mkDerivation rec { - pname = "openexr_viewers"; - version = "2.2.1"; - - src = fetchurl { - url = "mirror://savannah/openexr/openexr_viewers-${version}.tar.gz"; - sha256 = "1ixx2wbjp4rvsf7h3bkja010gl1ihjrcjzy7h20jnn47ikg12vj8"; - }; - - configurePhase = '' - ./configure --prefix=$out --with-fltk-config=${fltk}/bin/fltk-config - ''; - - buildPhase = '' - make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl" - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openexr fltk libGLU libGL ctl ]; - - meta = { - description = "Application for viewing OpenEXR images on a display at various exposure settings"; - homepage = "http://openexr.com"; - platforms = lib.platforms.linux; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/applications/graphics/eyedropper/default.nix b/pkgs/applications/graphics/eyedropper/default.nix index 32098c977044..8b4411ad04b3 100644 --- a/pkgs/applications/graphics/eyedropper/default.nix +++ b/pkgs/applications/graphics/eyedropper/default.nix @@ -15,19 +15,19 @@ stdenv.mkDerivation rec { pname = "eyedropper"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "FineFindus"; repo = pname; - rev = version; - hash = "sha256-bOpwHaFOoUlh+yyC1go6BeFxfJhUmwZPi6kYAqCagEI="; + rev = "v${version}"; + hash = "sha256-kc/UREQpmw3suA6bYEr9fCIwMzNMrEY9E5qf+rhKsC4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-TkdOq+icU2zNbXzN6nbkXjL1o/Lfumqr/5S0pQaxY5Q="; + hash = "sha256-/eas1PObrj9IuDIzlBVbfhEhH8eDyZ7CD871JmAqnyY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 42671599a643..d32662937aff 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -13,9 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ vtk_9 ] - ++ lib.optionals stdenv.isLinux [ libGL libX11 ] - ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + buildInputs = [ vtk_9 ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; # conflict between VTK and Nixpkgs; # see https://github.com/NixOS/nixpkgs/issues/89167 diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 70f83e9a2f2c..428ddc5073da 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { --add-flags '--theme=feh' ''; - checkInputs = lib.singleton (perl.withPackages (p: [ p.TestCommand ])); + nativeCheckInputs = lib.singleton (perl.withPackages (p: [ p.TestCommand ])); doCheck = true; meta = with lib; { diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix index 984d67f6ba7b..80e13fda9222 100644 --- a/pkgs/applications/graphics/fig2dev/default.nix +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool to convert Xfig files to other formats"; - homepage = "http://mcj.sourceforge.net/"; + homepage = "https://mcj.sourceforge.net/"; license = licenses.xfig; platforms = platforms.unix; maintainers = with maintainers; [ lesuisse ]; diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index 70d35ed671bb..971ce42c03f9 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -22,26 +22,6 @@ , zlib }: let - libs = [ - alsa-lib - bzip2 - fftw - freeglut - freetype - glew - libjack2 - libGL - libGLU - libjpeg - liblo - libpng - libsndfile - libtiff - ode - openal - openssl - zlib - ]; racket = racket_7_9; in stdenv.mkDerivation rec { @@ -70,14 +50,13 @@ stdenv.mkDerivation rec { openssl.dev racket_7_9 ]; - nativeBuildInputs = [ sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ sconsPackages.scons_latest ]; patches = [ ./fix-build.patch ]; sconsFlags = [ "RacketPrefix=${racket}" "RacketInclude=${racket}/include/racket" "RacketLib=${racket}/lib/racket" - "LIBPATH=${lib.makeLibraryPath libs}" "DESTDIR=build" ]; configurePhase = '' diff --git a/pkgs/applications/graphics/fluxus/fix-build.patch b/pkgs/applications/graphics/fluxus/fix-build.patch index 7810dd59e357..b44327520e65 100644 --- a/pkgs/applications/graphics/fluxus/fix-build.patch +++ b/pkgs/applications/graphics/fluxus/fix-build.patch @@ -1,16 +1,100 @@ -diff --git a/SConstruct b/SConstruct -index 32cb644..0b3a208 100644 +scons does not use os environment by default: + https://scons.org/doc/2.1.0/HTML/scons-user/x1750.html + +nixpkgs' cc-wrapper on the other hand relies on various NIX_* variables +to be passed through like NIX_CFLAGS_COMPILE_BEFORE. + +While at it ported to python3-style print(). --- a/SConstruct +++ b/SConstruct -@@ -225,6 +225,11 @@ if env['PLATFORM'] == 'posix': - ["asound", "alsa/asoundlib.h"], - ["openal", "AL/al.h"]] - -+env.Append(ENV={'PATH': ' ' + os.environ['PATH'], }) -+env.Append(LIBPATH=ARGUMENTS.get('LIBPATH', '').split(':')) -+env.Append(CCFLAGS=' ' + os.environ.get('NIX_CFLAGS_COMPILE','')) -+env.Append(CCFLAGS=' -DNULL=0') -+ - ################################################################################ +@@ -6,7 +6,7 @@ + # application, then calls the sconscripts for libfluxus and + # the fluxus Racket modules + +-import os, os.path, sys, commands, subprocess ++import os, os.path, sys, subprocess + + MajorVersion = "0" + MinorVersion = "19" +@@ -100,6 +100,7 @@ IncludePaths = [ + paranoid = ' -W -Wcast-qual -Wwrite-strings -Wcast-align -Wpointer-arith -Wconversion -Wredundant-decls -Wunreachable-code -Winline -Wlarger-than-256' + + env = Environment(CCFLAGS = '-ggdb -pipe -Wall -O3 -ffast-math -Wno-unused -fPIC -pthread', ++ ENV = os.environ, + VERSION_NUM = FluxusVersion) + env.MergeFlags(ARGUMENTS.get('CCFLAGS', '').split()) + env.MergeFlags(ARGUMENTS.get('LDFLAGS', '').split()) +@@ -229,9 +230,9 @@ if env['PLATFORM'] == 'posix': # Make sure we have these libraries availible - + + if not GetOption('clean'): +- print '--------------------------------------------------------' +- print 'Fluxus: Configuring Build Environment' +- print '--------------------------------------------------------' ++ print('--------------------------------------------------------') ++ print('Fluxus: Configuring Build Environment') ++ print('--------------------------------------------------------') + # detect ode precision + if not GetOption('clean'): + try: +@@ -240,27 +241,27 @@ if not GetOption('clean'): + if isinstance(ode_str[0], str): + env.MergeFlags(ode_str[0]) + except: +- print 'WARNING: unable to run ode-config, cannot detect ODE precision' ++ print('WARNING: unable to run ode-config, cannot detect ODE precision') + + conf = Configure(env) + + # check Racket and OpenAL frameworks on osx + if env['PLATFORM'] == 'darwin': + if not conf.CheckHeader('scheme.h'): +- print "ERROR: 'racket3m' must be installed!" ++ print("ERROR: 'racket3m' must be installed!") + Exit(1) + if racket_framework: + LibList = filter(lambda x: x[0] != 'racket3m', LibList) + # OpenAL should be installed everywhere + if not conf.CheckHeader('OpenAL/al.h'): +- print "ERROR: 'OpenAL' must be installed!" ++ print("ERROR: 'OpenAL' must be installed!") + Exit(1) + + # all libraries are required, and some of them require each other, + # hence the order is important, and autoadd=1 + for (lib,headers) in LibList: + if not conf.CheckLibWithHeader(lib, headers, 'C', autoadd = 1): +- print "ERROR: '%s' must be installed!" % (lib) ++ print("ERROR: '%s' must be installed!" % (lib)) + Exit(1) + + if not conf.CheckFunc("dInitODE2"): +@@ -334,7 +335,7 @@ if not GetOption('clean'): + ]) + + if raco_status != 0: +- print "ERROR: Failed to run command 'raco'" ++ print("ERROR: Failed to run command 'raco'") + Exit(1) + + +@@ -377,8 +378,8 @@ if not GetOption('clean') and static_modules: + + app_env['LIBS'].remove("pthread") + app_env['LIBS'].remove("dl") +- app_env['LIBS'].remove("ode") +- app_env['LIBS'].remove("sndfile") ++ app_env['LIBS'].remove("ode") ++ app_env['LIBS'].remove("sndfile") + + # now go through the rest of the libs, removing them from + # the environment at the same time +@@ -425,7 +426,7 @@ SConscript(dirs = build_dirs, + if not GetOption('clean'): + helpmap_status = subprocess.call(["racket", "makehelpmap.scm"], cwd="docs/helpmap") + if helpmap_status != 0: +- print "ERROR: Failed to build 'docs/helpmap'" ++ print("ERROR: Failed to build 'docs/helpmap'") + Exit(1) + + ################################################################################ diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index c8d6fc6030d6..f3854b4c6989 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -58,9 +58,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://github.com/calo001/fondo"; diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix index a16f408fb135..e8fd0364808c 100644 --- a/pkgs/applications/graphics/foxotron/default.nix +++ b/pkgs/applications/graphics/foxotron/default.nix @@ -35,6 +35,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-WjsVvFhwVCzclHxA+Gu2YtR2yK0Opqhncwlg9FEhOLk="; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "set(CMAKE_OSX_ARCHITECTURES x86_64)" "" + ''; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ zlib ] @@ -55,9 +60,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 0cc93bbbe8ab..7ed9cc865d23 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , cmake , ninja -, GitPython +, gitpython , boost , coin3d , eigen @@ -39,7 +39,7 @@ , soqt , spaceNavSupport ? stdenv.isLinux , swig -, vtk +, vtk_8 , wrapQtAppsHook , wrapGAppsHook , xercesc @@ -48,13 +48,13 @@ mkDerivation rec { pname = "freecad"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; rev = version; - hash = "sha256-r2lhFv4ReASteoVxwwiW9TdSckpaju6QE8UegxeY4rE="; + hash = "sha256-v8hanhy0UE0o+XqqIH3ZUtVom3q0KGELcfXFRSDr0TA="; }; nativeBuildInputs = [ @@ -68,7 +68,7 @@ mkDerivation rec { ]; buildInputs = [ - GitPython # for addon manager + gitpython # for addon manager boost coin3d eigen @@ -97,7 +97,7 @@ mkDerivation rec { shiboken2 soqt swig - vtk + vtk_8 xercesc zlib ] ++ lib.optionals spaceNavSupport [ diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index d11798a9b290..c69c9af184b0 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source panorama viewer using GL"; - homepage = "http://freepv.sourceforge.net/"; + homepage = "https://freepv.sourceforge.net/"; license = [ lib.licenses.lgpl21 ]; }; } diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index 5caa54167047..61a41abac5b0 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "Simple GTK 2 color selector"; - homepage = "http://gcolor2.sourceforge.net/"; + homepage = "https://gcolor2.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ notthemessiah ]; platforms = with lib.platforms; unix; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index ddc2b451b24c..7d9a039a5b03 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -49,9 +49,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index ee733a0b1b0c..3ce6c56d94bb 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -30,7 +30,6 @@ , ghostscript , aalib , shared-mime-info -, python2 , libexif , gettext , makeWrapper @@ -48,6 +47,8 @@ , AppKit , Cocoa , gtk-mac-integration-gtk2 +, withPython ? false +, python2 }: let @@ -116,9 +117,6 @@ in stdenv.mkDerivation rec { shared-mime-info libwebp libheif - python - # Duplicated here because python.withPackages does not expose the dev output with pkg-config files - python2.pkgs.pygtk libexif xorg.libXpm glib-networking @@ -130,6 +128,10 @@ in stdenv.mkDerivation rec { gtk-mac-integration-gtk2 ] ++ lib.optionals stdenv.isLinux [ libgudev + ] ++ lib.optionals withPython [ + python + # Duplicated here because python.withPackages does not expose the dev output with pkg-config files + python2.pkgs.pygtk ]; # needed by gimp-2.0.pc @@ -144,6 +146,8 @@ in stdenv.mkDerivation rec { "--with-icc-directory=/run/current-system/sw/share/color/icc" # fix libdir in pc files (${exec_prefix} needs to be passed verbatim) "--libdir=\${exec_prefix}/lib" + ] ++ lib.optionals (!withPython) [ + "--disable-python" # depends on Python2 which was EOLed on 2020-01-01 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 21ba4c662c22..36bba9eaa4a1 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://jocr.sourceforge.net/"; + homepage = "https://jocr.sourceforge.net/"; description = "GPL Optical Character Recognition"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index 06c3b03ae533..f19c0282b187 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple and fast image viewer for X"; - homepage = "http://lxde.sourceforge.net/gpicview/"; + homepage = "https://lxde.sourceforge.net/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 d9b6db8d653d..55e57ac01e4c 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "graphicsmagick"; - version = "1.3.38"; + version = "1.3.39"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "sha256-1gzZ21k1HSucsZvrRDFwrKoo8HPRPSWPZ7NidjXjJnU="; + sha256 = "sha256-4wscpY6HPQoe4gg4RyRCTbLTwzpUA04mHRTo+7j40E8="; }; patches = [ diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index fc686ad1f212..9da51083c5ab 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -89,7 +89,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" "man" ]; - checkInputs = [ + nativeCheckInputs = [ imagemagick libtiff djvulibre @@ -128,7 +128,7 @@ perlPackages.buildPerlPackage rec { meta = { description = "A GUI to produce PDFs or DjVus from scanned documents"; - homepage = "http://gscan2pdf.sourceforge.net/"; + homepage = "https://gscan2pdf.sourceforge.net/"; license = licenses.gpl3; maintainers = with maintainers; [ pacien ]; }; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 3e68a4b9467d..f4d424b3fc30 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -13,7 +13,7 @@ , fftw , flann , gettext -, glew +, glew-egl , ilmbase , lcms2 , lensfun @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "hugin"; - version = "2021.0.0"; + version = "2022.0.0"; src = fetchurl { url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2"; - sha256 = "sha256-BHrqin+keESzTvJ8GdO2l+hJOdyx/bvrLCBGIbZu6tk="; + sha256 = "sha256-l8hWKgupp0PguVWkPf3gSLHGDNnl8u4rad4agWRuBac="; }; buildInputs = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { fftw flann gettext - glew + glew-egl ilmbase lcms2 lensfun diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 2bce94d52d81..6a31bfd0280d 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -51,7 +51,7 @@ python3Packages.buildPythonPackage rec { twisted ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ nose mock httmock diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index 9c854d9ffbf3..12706d6d36f6 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -51,9 +51,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix index 5988627d401c..e37539ceeec5 100644 --- a/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "imgbrd-grabber"; - version = "7.9.1"; + version = "7.10.0"; src = fetchFromGitHub { owner = "Bionus"; repo = "imgbrd-grabber"; rev = "v${version}"; - sha256 = "sha256-0CceSXH1GJbWKOnxZkjmbuyj7NBOQ6tpCYrCl7z4Vrw="; + sha256 = "sha256-AT6pN2do0LlH6xAXKcFQv+oderD88/EiG1JnCw6kOOg="; fetchSubmodules = true; }; @@ -67,8 +67,10 @@ stdenv.mkDerivation rec { # link the catch2 sources from nixpkgs ln -sf ${catch2.src} tests/src/vendor/catch + ''; - sed "s|strict\": true|strict\": false|g" -i ./sites/tsconfig.json + preBuild = '' + export HOME=$TMPDIR ''; postInstall = '' diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index f78a4f606815..30a8a24e3bc2 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -11,7 +11,7 @@ , icu , pango , inih -, withWindowSystem ? "all" +, withWindowSystem ? null , xorg , libxkbcommon , libGLU @@ -27,6 +27,12 @@ }: let + # default value of withWindowSystem + withWindowSystem' = + if withWindowSystem != null then withWindowSystem + else if stdenv.isLinux then "all" + else "x11"; + windowSystems = { all = windowSystems.x11 ++ windowSystems.wayland; x11 = [ libGLU xorg.libxcb xorg.libX11 ]; @@ -47,7 +53,7 @@ let in # check that given window system is valid -assert lib.assertOneOf "withWindowSystem" withWindowSystem +assert lib.assertOneOf "withWindowSystem" withWindowSystem' (builtins.attrNames windowSystems); # check that every given backend is valid assert builtins.all @@ -56,18 +62,18 @@ assert builtins.all stdenv.mkDerivation rec { pname = "imv"; - version = "4.3.1"; + version = "4.4.0"; outputs = [ "out" "man" ]; src = fetchFromSourcehut { owner = "~exec64"; repo = "imv"; rev = "v${version}"; - sha256 = "sha256-gMAd8skst72QT4jGFH7aRdWeAd4tf/uQgXhGaM/Dpgc="; + sha256 = "sha256-LLEEbriHzZhAOQivqHqdr6g7lh4uj++ytlme8AfRjf4="; }; mesonFlags = [ - "-Dwindows=${withWindowSystem}" + "-Dwindows=${withWindowSystem'}" "-Dtest=enabled" "-Dman=enabled" ] ++ backendFlags; @@ -87,7 +93,7 @@ stdenv.mkDerivation rec { libxkbcommon pango inih - ] ++ windowSystems."${withWindowSystem}" + ] ++ windowSystems."${withWindowSystem'}" ++ builtins.map (b: backends."${b}") withBackends; postInstall = '' @@ -96,7 +102,7 @@ stdenv.mkDerivation rec { install -Dm644 ../files/imv.desktop $out/share/applications/ ''; - postFixup = lib.optionalString (withWindowSystem == "all") '' + postFixup = lib.optionalString (withWindowSystem' == "all") '' # The `bin/imv` script assumes imv-wayland or imv-x11 in PATH, # so we have to fix those to the binaries we installed into the /nix/store @@ -109,9 +115,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A command line image viewer for tiling window managers"; - homepage = "https://github.com/eXeC64/imv"; + homepage = "https://sr.ht/~exec64/imv/"; license = licenses.mit; maintainers = with maintainers; [ rnhmjoj markus1189 ]; platforms = platforms.all; + badPlatforms = platforms.darwin; }; } diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 8a40bac446e8..6444537cac29 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -5,7 +5,6 @@ , cairo , cmake , fetchurl -, fetchpatch , gettext , ghostscript , glib @@ -59,11 +58,11 @@ let in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"; - sha256 = "Rs59oOunykutwdtw6cu2fgrfm7NCaH3G4ItcohuNTBs="; + sha256 = "oMf9DQPAohU15kjvMB3PgN18/B81ReUQZfvxuj7opcQ="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be @@ -79,12 +78,6 @@ stdenv.mkDerivation rec { # e.g., those from the "Effects" menu. python3 = "${python3Env}/bin/python"; }) - - # Fix build with Poppler 22.09 - (fetchpatch { - url = "https://github.com/archlinux/svntogit-packages/raw/b2f65dfb60ae0c8cd6cd9affd3d71064082a6201/trunk/inkscape-1.2.1-poppler-22.09.0.patch"; - sha256 = "pArvsS/qoCTMAisF8yj3agZKrb90zRFZkck1TX0KeGc="; - }) ]; postPatch = '' diff --git a/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix b/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix index f1bac3dd76c4..ceab3eaea3d9 100644 --- a/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "XWwkuw+Um/cflRWjIeIgQUxJLrk2DLDmx7K+pMWvIlI="; }; - checkInputs = [ + nativeCheckInputs = [ python3.pkgs.inkex python3.pkgs.pytestCheckHook ]; diff --git a/pkgs/applications/graphics/jpeginfo/default.nix b/pkgs/applications/graphics/jpeginfo/default.nix index 1660d89eacf9..c63bd78ce987 100644 --- a/pkgs/applications/graphics/jpeginfo/default.nix +++ b/pkgs/applications/graphics/jpeginfo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jpeginfo"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { url = "https://www.kokkonen.net/tjko/src/${pname}-${version}.tar.gz"; - sha256 = "0lvn3pnylyj56158d3ix9w1gas1s29klribw9bz1xym03p7k37k2"; + sha256 = "sha256-3JhQg0SNlwfULkm+2CaiR8Db2mkTyHDppdm/fHSTllk="; }; buildInputs = [ libjpeg ]; diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index d4582280079e..951bb9d7d894 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, libjpeg }: stdenv.mkDerivation rec { - version = "1.5.0"; + version = "1.5.1"; pname = "jpegoptim"; src = fetchFromGitHub { owner = "tjko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fTtNDjswxHv2kHU55RCzz9tdlXw+RUCSoe3qF4hQ7u4="; + sha256 = "sha256-QPipwBk+BS/u3YxB8ACeFXQSuoW1aynEyG3tEMrhcaE="; }; # There are no checks, it seems. diff --git a/pkgs/applications/graphics/json-plot/default.nix b/pkgs/applications/graphics/json-plot/default.nix index 9b43518a87d2..39c4b45cd1d6 100644 --- a/pkgs/applications/graphics/json-plot/default.nix +++ b/pkgs/applications/graphics/json-plot/default.nix @@ -1,10 +1,9 @@ { lib , fetchFromGitHub -, buildGoPackage +, fetchpatch +, buildGoModule }: -# upstream is pretty stale, but it still works, so until they merge module -# support we have to use gopath: see sgreben/jp#29 -buildGoPackage rec { +buildGoModule rec { pname = "json-plot"; version = "1.1.12"; @@ -15,7 +14,17 @@ buildGoPackage rec { hash = "sha256-WWARAh/CF3lGli3VLRzAGaCA8xQyryPi8WcuwvdInjk="; }; - goPackagePath = "github.com/sgreben/jp"; + vendorHash = "sha256-EPrlaUHAGATNFv3qgWKGmJdu9EHsV/0DJKEvQck+fWc="; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/sgreben/jp/commit/9516fb4d7c5b011071b4063ea8e8e9667e57a777.patch"; + hash = "sha256-Vz5HnStrCpMN1L7dne7JDX5F57up3EBPPf/9hN9opRc="; + }) + ]; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Dead simple terminal plots from JSON (or CSV) data. Bar charts, line charts, scatter plots, histograms and heatmaps are supported."; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index c0d930c9e28f..cfb63e0e3f7c 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "5.1.3"; + version = "5.1.4"; kde-channel = "stable"; - sha256 = "sha256-69+P0wMIciGxuc6tmWG1OospmvvwcZl6zHNQygEngo0="; + sha256 = "sha256-wisCCGJZbrL92RHhsXnbvOewgb4RFFei6sr2rhzKLcs="; }) diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix index 37ad3387f834..91562bb5d49e 100644 --- a/pkgs/applications/graphics/lazpaint/default.nix +++ b/pkgs/applications/graphics/lazpaint/default.nix @@ -7,24 +7,24 @@ let bgrabitmap = fetchFromGitHub { owner = "bgrabitmap"; repo = "bgrabitmap"; - rev = "v11.2.5"; - sha256 = "0w5pdihsxn039kalkf4cx23j69hz5r09qmhd358h2n74irv1r3x1"; + rev = "v11.5.3"; + sha256 = "sha256-qjBD9TVZQy1tKWHFWkuu6vdLjASzQb3+HRy0FLdd9a8="; }; bgracontrols = fetchFromGitHub { owner = "bgrabitmap"; repo = "bgracontrols"; - rev = "v7.0"; - sha256 = "0qz3cscrc9jvhrix1hbmzhdxv6mxk0mz9azr46canflsydda8fjy"; + rev = "v7.6"; + sha256 = "sha256-btg9DMdYg+C8h0H7MU+uoo2Kb4OeLHoxFYHAv7LbLBA="; }; in stdenv.mkDerivation rec { pname = "lazpaint"; - version = "7.1.5"; + version = "7.2.2"; src = fetchFromGitHub { owner = "bgrabitmap"; repo = "lazpaint"; rev = "v${version}"; - sha256 = "0bpk3rlqzbxvgrxmrzs0hcrgwhsqnpjqv1kdd9cp09knimmksvy5"; + sha256 = "sha256-J6s0GnGJ7twEYW5+B72bB3EX4AYvLnhSPLbdhZWzlkw="; }; nativeBuildInputs = [ lazarus fpc makeWrapper ]; @@ -33,6 +33,10 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; + preConfigure = '' + patchShebangs configure + ''; + buildPhase = '' cp -r --no-preserve=mode ${bgrabitmap} bgrabitmap cp -r --no-preserve=mode ${bgracontrols} bgracontrols @@ -47,6 +51,7 @@ in stdenv.mkDerivation rec { installPhase = '' # Reuse existing install script + substituteInPlace Makefile --replace "/bin/bash" $BASH cd lazpaint/release/debian substituteInPlace makedeb.sh --replace "rm -rf" "ls" patchShebangs ./makedeb.sh @@ -64,6 +69,5 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ ]; - broken = true; # 2022-11-16 }; } diff --git a/pkgs/applications/graphics/litemdview/default.nix b/pkgs/applications/graphics/litemdview/default.nix new file mode 100644 index 000000000000..ebd830868f6c --- /dev/null +++ b/pkgs/applications/graphics/litemdview/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitea +, gtkmm3 +, autoreconfHook +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "litemdview"; + # litemdview -v + version = "0.0.32"; + + src = fetchFromGitea { + domain = "notabug.org"; + owner = "g0tsu"; + repo = "litemdview"; + rev = "litemdview-0.0.32"; + hash = "sha256-XGjP+7i3mYCEzPYwVY+75DARdXJFY4vUWHFpPeoNqAE="; + }; + + buildInputs = [ + gtkmm3 + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + meta = with lib; { + homepage = "https://notabug.org/g0tsu/litemdview"; + description = "A suckless markdown viewer"; + longDescription = '' + LiteMDview is a lightweight, extremely fast markdown viewer with lots of useful features. One of them is ability to use your prefered text editor to edit markdown files, every time you save the file, litemdview reloads those changes (I call it live-reload). It has a convinient navigation through local directories, has support for a basic "git-like" folders hierarchy as well as vimwiki projects. + + Features: + + + - Does not use any of those bloated gecko(servo)-blink engines + - Lightweight and fast + - Live reload + - Convinient key bindings + - Supports text zooming + - Supports images + - Supports links + - Navigation history + - Cool name which associates with 1337, at least for me :) + - Builtin markdown css themes + - Supports emoji™️ + - vimwiki support + - Basic html support (very simple offline documents in html) + - Syntax highlighting + ''; + license = licenses.gpl2Only; + maintainers = with maintainers; [ WhiteBlackGoose ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index c44ff57d18f3..d0cf9af97d21 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { - homepage = "http://qtpfsgui.sourceforge.net/"; + homepage = "https://qtpfsgui.sourceforge.net/"; description = "A complete open source solution for HDR photography"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/mangareader/default.nix b/pkgs/applications/graphics/mangareader/default.nix index 5ae270cca8c1..81073c051152 100644 --- a/pkgs/applications/graphics/mangareader/default.nix +++ b/pkgs/applications/graphics/mangareader/default.nix @@ -41,9 +41,7 @@ stdenv.mkDerivation rec { kconfigwidgets ]; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Qt manga reader for local files"; diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 5c6e49ea9a64..fbc80d0da6d5 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -18,11 +18,11 @@ python3.pkgs.buildPythonApplication rec { pname = "mcomix"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { url = "mirror://sourceforge/mcomix/${pname}-${version}.tar.gz"; - sha256 = "sha256-7zjQcT5WoHxy+YzCDJ6s2ngOOfO4L9exuqBqacecClg="; + hash = "sha256-Nok4oqTezO84q9IDZvgi33ZeKfRL+tpg7QEDmp2ZZpU="; }; buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ]; diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index e8ce0dbd0cef..14a22bfbfe17 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -6,8 +6,10 @@ , ninja , pkg-config , wrapGAppsHook4 -, libepoxy +, feedbackd , gtk4 +, libepoxy +, xorg , zbar , tiffSupport ? true , libraw @@ -27,13 +29,13 @@ let in stdenv.mkDerivation rec { pname = "megapixels"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitLab { owner = "postmarketOS"; repo = "megapixels"; rev = version; - hash = "sha256-UH3NQdMlZTi4hc8HNSbCcQSm0rxI78RMCRYll1NCBO8="; + hash = "sha256-xrO9Xr9DPjlDs4yaKy32yb4X8wFqLKfy8rsjtBuN+Rg="; }; nativeBuildInputs = [ @@ -45,8 +47,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libepoxy + feedbackd gtk4 + libepoxy + xorg.libXrandr zbar ]; diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index f0693cc6121f..4a9b91d9c7b8 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://djvu.sourceforge.net/djview4.html"; + homepage = "https://djvu.sourceforge.net/djview4.html"; description = "Black-and-white djvu page encoder and decoder that use interpage information"; license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.viric ]; diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index 99e7b042d161..7a2577e8af50 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -47,14 +47,14 @@ stdenv.mkDerivation rec { pname = "monado"; - version = "unstable-2022-05-28"; + version = "unstable-2023-01-14"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "monado"; - rev = "011bcbdcff227e25507e5f2d81a83a2bbe478856"; - sha256 = "sha256-8velNKSCZJtKO8ATwXDl1nU8RbxZ8TeyGiUQFOXifuI="; + rev = "1ef49b92f2d6cb519039edd7ba7f70e8073fbe88"; + sha256 = "sha256-zieJmI6BKHpYyCPOOUora9qoWn+NXehbHKvoi4h81UA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix index 0acc873b3968..740f9c7cb193 100644 --- a/pkgs/applications/graphics/mtpaint/default.nix +++ b/pkgs/applications/graphics/mtpaint/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Due to its simplicity and lack of dependencies it runs well on GNU/Linux, Windows and older PC hardware. ''; - homepage = "http://mtpaint.sourceforge.net/"; + homepage = "https://mtpaint.sourceforge.net/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.vklquevs ]; diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 7f1ba67acce6..48cc00d008e9 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -74,7 +74,7 @@ in buildPythonApplication rec { pygobject3 ]; - checkInputs = [ + nativeCheckInputs = [ gtk3 ]; diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix new file mode 100644 index 000000000000..99dc64d5cad4 --- /dev/null +++ b/pkgs/applications/graphics/oculante/default.nix @@ -0,0 +1,66 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, cmake +, pkg-config +, openssl +, fontconfig +, nasm +, libX11 +, libXcursor +, libXrandr +, libXi +, libGL +, stdenv +, gtk3 +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "oculante"; + version = "0.6.41"; + + src = fetchFromGitHub { + owner = "woelper"; + repo = pname; + rev = version; + sha256 = "sha256-2pXfdR5KUD6IUasxyUptxLSLDcvJtwJwOmhHD3I7op8="; + }; + + cargoHash = "sha256-F/NKTsDRfoueVrwlq/RkBR6wNn79NiuT2InAR+XPbqw="; + + nativeBuildInputs = [ + cmake + pkg-config + nasm + ]; + + checkFlagsArray = [ "--skip=tests::net" ]; # requires network access + + buildInputs = [ + openssl + fontconfig + ] ++ lib.optionals stdenv.isLinux [ + libX11 + libXcursor + libXi + libXrandr + libGL + gtk3 + ] ++ lib.optionals stdenv.isDarwin [ + darwin.libobjc + ]; + + postFixup = lib.optionalString stdenv.isLinux '' + patchelf $out/bin/oculante --add-rpath ${lib.makeLibraryPath [ libGL ]} + ''; + + meta = with lib; { + broken = stdenv.isDarwin; + description = "A minimalistic crossplatform image viewer written in Rust"; + homepage = "https://github.com/woelper/oculante"; + changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index 0725acd2379d..3178c50c933d 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -1,10 +1,10 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch, copyDesktopItems, makeDesktopItem, qmake -, qtbase, qtxmlpatterns, qttools, qtwebkit, libGL, fontconfig, openssl, poppler +{ stdenv, lib, fetchFromGitHub, fetchpatch, copyDesktopItems, makeDesktopItem, qmake +, qtbase, qtxmlpatterns, qttools, qtwebengine, libGL, fontconfig, openssl, poppler, wrapQtAppsHook , ffmpeg, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg , libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }: let - importer = mkDerivation rec { + importer = stdenv.mkDerivation rec { pname = "openboard-importer"; version = "unstable-2016-10-08"; @@ -16,44 +16,38 @@ let }; nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase ]; + dontWrapQtApps = true; installPhase = '' install -Dm755 OpenBoardImporter $out/bin/OpenBoardImporter ''; }; -in mkDerivation rec { +in stdenv.mkDerivation { pname = "openboard"; - version = "1.6.1"; + version = "unstable-2022-11-28"; src = fetchFromGitHub { owner = "OpenBoard-org"; repo = "OpenBoard"; - rev = "v${version}"; - sha256 = "sha256-OlGXGIMghil/GG6eso20+CWo/hCjarXGs6edXX9pc/M="; + rev = "9de37af2df1a7c0d88f71c94ab2db1815d082862"; + sha256 = "sha256-TiKrSyxtF1g1bepCoFxoxGOdREXhsMrS3g8uZKSiugg="; }; - patches = [ - # Fix build with poppler >= 22.01 - (fetchpatch { - url = "https://github.com/OpenBoard-org/OpenBoard/commit/3a9b043e0fafec08e4123f362dcb7750f7476b59.patch"; - sha256 = "sha256-yD163FK79HBU1W7m6sLxhfsRo4r/38zYTFWgeyqwU1o="; - }) - ]; - postPatch = '' substituteInPlace OpenBoard.pro \ - --replace '/usr/include/quazip' '${quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ + --replace '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ --replace '-lquazip5' '-lquazip1-qt5' \ - --replace '/usr/include/poppler' '${poppler.dev}/include/poppler' + --replace '/usr/include/poppler' '${lib.getDev poppler}/include/poppler' ''; - nativeBuildInputs = [ qmake copyDesktopItems ]; + nativeBuildInputs = [ qmake copyDesktopItems wrapQtAppsHook ]; buildInputs = [ qtbase qtxmlpatterns qttools - qtwebkit + qtwebengine libGL fontconfig openssl diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix index 9c919273b545..596ae0d07a11 100644 --- a/pkgs/applications/graphics/ovito/default.nix +++ b/pkgs/applications/graphics/ovito/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "ovito"; - version = "3.7.7"; + version = "3.7.11"; src = fetchFromGitLab { owner = "stuko"; repo = "ovito"; rev = "v${version}"; - sha256 = "sha256-wKXnb7ZzWOPPrHj3jOeFazRy0PVqcV/OFeaBs6qgF1I="; + sha256 = "sha256-Z3uwjOYJ7di/LLllbzdKjzUE7m119i03bA8dJPqhxWA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index dbc5b973fe9c..0bd1fc20c59f 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { #doCheck = true; meta = { - homepage = "http://panotools.sourceforge.net/"; + homepage = "https://panotools.sourceforge.net/"; description = "Free software suite for authoring and displaying virtual reality panoramas"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix index 11737a01300a..c3207eb6c57c 100644 --- a/pkgs/applications/graphics/photoflare/default.nix +++ b/pkgs/applications/graphics/photoflare/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "photoflare"; - version = "1.6.11"; + version = "1.6.12"; src = fetchFromGitHub { owner = "PhotoFlare"; repo = "photoflare"; rev = "v${version}"; - sha256 = "sha256-nXVTkkfRpbLZ+zUgnSzKNlVixI86eKoG5FO8GqgnrDY="; + sha256 = "sha256-UIEHQil7NsdIKQlrNPpf7rxj6O6P1xlz0E7FNYTcdT4="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index 2877d81d4110..1cbbaf8ffe3b 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "pineapple-pictures"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; rev = version; - sha256 = "sha256-HOZ1BQIXrjVi2Y+2czt64pb++KGyN+6yDZ5Inu8NhJY="; + sha256 = "sha256-s4mJNPzrcg5UT8JC3D5ipaM8IvNFAK7e3V0TjVGeRdM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index 438fbaf40cf1..b59f17278e08 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -10,13 +10,16 @@ buildDotnetModule rec { pname = "Pinta"; - version = "2.0.2"; + version = "2.1"; nativeBuildInputs = [ intltool wrapGAppsHook ]; + dotnet-sdk = dotnetCorePackages.sdk_7_0; + dotnet-runtime = dotnetCorePackages.runtime_7_0; + runtimeDeps = [ gtk3 ]; buildInputs = runtimeDeps; @@ -33,7 +36,7 @@ buildDotnetModule rec { owner = "PintaProject"; repo = "Pinta"; rev = version; - sha256 = "sha256-Bvzs1beq7I1+10w9pmMePqGCz2TPDp5UK5Wa9hbKERU="; + hash = "sha256-hugV4I13wZhPnVTUlGlaVxdjpGRvWDnfRVXgV+oy+sE="; }; # https://github.com/NixOS/nixpkgs/issues/38991 @@ -61,8 +64,11 @@ buildDotnetModule rec { 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/ + for i in "Pinta.Resources/icons/hicolor/"*; do + res="$(basename $i)" + mkdir -p "$out/share/icons/hicolor/$res" + cp -rv "Pinta.Resources/icons/hicolor/$res/"* "$out/share/icons/hicolor/$res/" + done # Install dotnet build installer/linux/install.proj \ diff --git a/pkgs/applications/graphics/pinta/deps.nix b/pkgs/applications/graphics/pinta/deps.nix index 66f7e6126724..5f637d347f5c 100644 --- a/pkgs/applications/graphics/pinta/deps.nix +++ b/pkgs/applications/graphics/pinta/deps.nix @@ -2,14 +2,18 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.34"; sha256 = "1jn1vgi9xm0jp7769k6sbdi8d273kigjrsh93i6s4c03hqxv7cqs"; }) - (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.34"; sha256 = "0pydn1k0cam1gclg9sc1sbnmbyzh28qlc5qanyxcylwghink3kgz"; }) - (fetchNuGet { pname = "GdkSharp"; version = "3.24.24.34"; sha256 = "0r0x0yib7chwsyrbpvicrfwldwqx5lyqq4p86zaxpmzd6zdaj0x5"; }) - (fetchNuGet { pname = "GioSharp"; version = "3.24.24.34"; sha256 = "02hxvgjd4w9jpzbkk7qf9q9bkvyp5hfzwxfqp10vg5lpl9yl3xpx"; }) - (fetchNuGet { pname = "GLibSharp"; version = "3.24.24.34"; sha256 = "0kvp033fgdwc8p2abfp5z9pzq66cvwbnjfvr4v4bkpy5s5h181kq"; }) - (fetchNuGet { pname = "GtkSharp"; version = "3.24.24.34"; sha256 = "0028hzmmqyfx87qqmaf9cgb5psn7gkbmqvixcid67x1d6mzxjicb"; }) + (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.38"; sha256 = "12dv3j8nzhjb5c0093djajdnv8n7m0q7vq2d5ry2v4xk9wqzxpr7"; }) + (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.38"; sha256 = "0n3y5w088k81apxik9amfvjdwcic4k2ixxvnrk9cw6d2wh1d5r8d"; }) + (fetchNuGet { pname = "GdkSharp"; version = "3.24.24.38"; sha256 = "0c5gzg106bnnc4wwwhch6lja68623a9hk8r2sjcv35hl5dh21616"; }) + (fetchNuGet { pname = "GioSharp"; version = "3.24.24.38"; sha256 = "1b3irarxjbbpf24fw2avdglcslb5653gn6m829yhlcm5ay37pds4"; }) + (fetchNuGet { pname = "GLibSharp"; version = "3.24.24.38"; sha256 = "1a0ixdq1gdb46gkb2nnlydsi10bjrbd3risfyaphsy8fbsyzrzvm"; }) + (fetchNuGet { pname = "GtkSharp"; version = "3.24.24.38"; sha256 = "0cn8aggci6n088y5giiaxmyzv01rcz37r8pm738q2bsb57zppz2j"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "NGettext"; version = "0.6.7"; sha256 = "1lnq1lgd80xqn80qwq5ipfjnd7nl1ghinjc3krnd546r0c7hwqky"; }) - (fetchNuGet { pname = "PangoSharp"; version = "3.24.24.34"; sha256 = "1r0h14cklglfpv1lhv93cxmzi2w7d5s03gzpq3j5dmrz43flg9zw"; }) + (fetchNuGet { pname = "PangoSharp"; version = "3.24.24.38"; sha256 = "0cma8j4cy4j3fw0nvsxlqi0azjkvfjsw0wb6k6b2k21rdpy5rbbn"; }) (fetchNuGet { pname = "ParagonClipper"; version = "6.4.2"; sha256 = "0pam44f7iayqjz8nh1x29gxdd4dj00i7m5883cpa64i192pgl94c"; }) - (fetchNuGet { pname = "SharpZipLib"; version = "1.3.3"; sha256 = "1gij11wfj1mqm10631cjpnhzw882bnzx699jzwhdqakxm1610q8x"; }) + (fetchNuGet { pname = "SharpZipLib"; version = "1.4.1"; sha256 = "1dh1jhgzc9bzd2hvyjp2nblavf0619djniyzalx7kvrbsxhrdjb6"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.11.0"; sha256 = "067s9i5mjxlmw0nid3fblr9d0hy1b6zrjzhhi48rf4cs2j72pl64"; }) ] diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index b6e03baace81..9cf2e50ea3b2 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -2,7 +2,7 @@ , 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 +, qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qt3d, mlt }: stdenv.mkDerivation rec { @@ -62,7 +62,6 @@ stdenv.mkDerivation rec { qtserialbus qtvirtualkeyboard qtmultimedia - qtwebkit ] ++ (with xorg; [ libX11 libXdamage diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix index 9392f27c1713..b46c2060ede0 100644 --- a/pkgs/applications/graphics/potrace/default.nix +++ b/pkgs/applications/graphics/potrace/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.16"; src = fetchurl { - url = "http://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz"; + url = "https://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz"; sha256 = "1k3sxgjqq0jnpk9xxys05q32sl5hbf1lbk1gmfxcrmpdgnhli0my"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "http://potrace.sourceforge.net/"; + homepage = "https://potrace.sourceforge.net/"; description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image"; platforms = platforms.unix; maintainers = [ maintainers.pSub ]; diff --git a/pkgs/applications/graphics/potreeconverter/default.nix b/pkgs/applications/graphics/potreeconverter/default.nix new file mode 100644 index 000000000000..07fae1140812 --- /dev/null +++ b/pkgs/applications/graphics/potreeconverter/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, tbb +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "PotreeConverter"; + version = "unstable-2022-08-04"; + + src = fetchFromGitHub { + owner = "potree"; + repo = "PotreeConverter"; + rev = "758bbac98a662de5e57d2280675e11cc76241688"; + sha256 = "sha256-pDdV2/edYhhBWs153hSy1evI3cXD0Xq9nrEsw3JNcH4="; + }; + + buildInputs = [ + boost + tbb + ]; + + nativeBuildInputs = [ + makeWrapper + cmake + ]; + + patchPhase = '' + substituteInPlace ./CMakeLists.txt \ + --replace "find_package(TBB REQUIRED)" "" + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,lib} + mv liblaszip.so $out/lib + mv PotreeConverter $out/bin + ln -s $out/bin/PotreeConverter $out/bin/potreeconverter + + # Create an empty wrapper, since PotreeConverter segfaults if called via + # $PATH rather than absolute path. An empty wrapper forces an absolute path + # on each invocation + wrapProgram $out/bin/PotreeConverter + + runHook postInstall + ''; + + meta = with lib; { + description = "Create multi res point cloud to use with potree"; + homepage = "https://github.com/potree/PotreeConverter"; + license = licenses.bsd2; + maintainers = with maintainers; [ matthewcroughan ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/graphics/pureref/default.nix b/pkgs/applications/graphics/pureref/default.nix new file mode 100644 index 000000000000..5a0774a09f43 --- /dev/null +++ b/pkgs/applications/graphics/pureref/default.nix @@ -0,0 +1,25 @@ +{ lib, appimageTools, requireFile }: + +appimageTools.wrapType1 rec { + pname = "pureref"; + version = "1.11.1"; + + src = requireFile { + name = "PureRef-${version}_x64.Appimage"; + sha256 = "05naywdgykqrsgc3xybskr418cyvbx7vqs994yv9w8zf98gxvbvm"; + url = "https://www.pureref.com/download.php"; + }; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + ''; + + meta = with lib; { + description = "Reference Image Viewer"; + homepage = "https://www.pureref.com"; + license = licenses.unfree; + maintainers = with maintainers; [ elnudev ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +} diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index 0075abc0f6f0..96ec02294ffd 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, gtk2, imlib2, file, lcms2, libexif } : stdenv.mkDerivation (rec { - version = "2.3.2"; + version = "2.3.3"; pname = "qiv"; src = fetchurl { url = "https://spiegl.de/qiv/download/${pname}-${version}.tgz"; - sha256 = "1mc0f2nnas4q0d7zc9r6g4z93i32xlx0p9hl4fn5zkyml24a1q28"; + sha256 = "sha256-7whf/eLUiwWzZlk55a4eNZ06OBAI+4J2hPfW/UxTNwQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix index 7f4f4cc1a976..e5d148da8e6a 100644 --- a/pkgs/applications/graphics/qview/default.nix +++ b/pkgs/applications/graphics/qview/default.nix @@ -3,33 +3,31 @@ , fetchFromGitHub , qmake , qtbase +, qttools , qtimageformats , qtsvg }: mkDerivation rec { pname = "qview"; - version = "4.0"; + version = "5.0"; src = fetchFromGitHub { owner = "jurplel"; repo = "qView"; rev = version; - sha256 = "15n9cq7w3ckinnx38hvncxrbkv4qm4k51sal41q4y0pkvhmafhnr"; + hash = "sha256-VQ0H9iPrrxO9e/kMo7yZ/zN5I2qDWBCAFacS9uGuZLI="; }; nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase + qttools qtimageformats qtsvg ]; - patchPhase = '' - sed "s|/usr/|$out/|g" -i qView.pro - ''; - meta = with lib; { description = "Practical and minimal image viewer"; homepage = "https://interversehq.com/qview/"; diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index eb0eaaeda95d..8da308ba6175 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -6,7 +6,6 @@ , clang , cmake , desktop-file-utils -, gio-sharp , glib , gstreamer , gtk4 @@ -24,20 +23,19 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.5.7"; + version = "0.5.12"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-w4y+t8idcaNwvC2Wp9SRjcd4m23Zt+yHG2fjOA2rBU8="; + hash = "sha256-wrx8+18jVDIhYhxD8VgU8wlRDLoUwMWIBOzSUozjUII="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Hybbbokru4vz5ly3oZuNGdBa+lYbhdYjESUpRxIUqJc="; + hash = "sha256-t0nmfM6Z30c+n0iANjMBVifOhYMXdBqgjxYdhOPOhYQ="; }; nativeBuildInputs = [ @@ -60,7 +58,6 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib - gio-sharp glib gstreamer gtk4 @@ -73,14 +70,15 @@ stdenv.mkDerivation rec { postPatch = '' pushd build-aux - chmod +x meson_post_install.py - patchShebangs meson_post_install.py + chmod +x cargo_build.py meson_post_install.py + patchShebangs cargo_build.py 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"; + changelog = "https://github.com/flxzt/rnote/releases/tag/${src.rev}"; description = "Simple drawing application to create handwritten notes"; license = licenses.gpl3Only; maintainers = with maintainers; [ dotlambda yrd ]; diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index b867269db057..b7ee6d200af2 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { pname = "sane-backends"; - version = "1.0.32"; + version = "1.1.1"; src = fetchurl { # raw checkouts of the repo do not work because, the configure script is @@ -24,9 +24,9 @@ stdenv.mkDerivation { # https://gitlab.com/sane-project/backends/-/issues/440 # unfortunately this make the url unpredictable on update, to find the link # go to https://gitlab.com/sane-project/backends/-/releases and choose - # the link with other in the URL. - url = "https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/sane-backends-1.0.32.tar.gz"; - sha256 = "055iicihxa6b28iv5fnz13n67frdr5nrydq2c846f9x7q0vw4a1s"; + # the link under the heading "Other". + url = "https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/sane-backends-1.1.1.tar.gz"; + sha256 = "sha256-3UsEw3pC8UxGGejupqlX9MfGF/5Z4yrihys3OUCotgM="; }; patches = [ @@ -140,5 +140,6 @@ stdenv.mkDerivation { homepage = "http://www.sane-project.org/"; license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.darwin; + maintainers = [ maintainers.symphorien ]; }; } diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 007483fb5e26..cd64c7b8d44e 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab , sane-backends , sane-frontends , libX11 @@ -10,15 +10,19 @@ , libusb-compat-0_1 , gimpSupport ? false , gimp +, nix-update-script }: stdenv.mkDerivation rec { pname = "xsane"; version = "0.999"; - src = fetchurl { - url = "http://www.xsane.org/download/xsane-${version}.tar.gz"; - sha256 = "0jrb918sfb9jw3vmrz0z7np4q55hgsqqffpixs0ir5nwcwzd50jp"; + src = fetchFromGitLab { + owner = "frontend"; + group = "sane-project"; + repo = pname; + rev = version; + hash = "sha256-oOg94nUsT9LLKnHocY0S5g02Y9a1UazzZAjpEI/s+yM="; }; preConfigure = '' @@ -31,11 +35,13 @@ stdenv.mkDerivation rec { buildInputs = [ libpng libusb-compat-0_1 sane-backends sane-frontends libX11 gtk2 ] ++ lib.optional gimpSupport gimp; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "http://www.sane-project.org/"; description = "Graphical scanning frontend for sane"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ melling ]; }; } diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix deleted file mode 100644 index b62ca680cbc5..000000000000 --- a/pkgs/applications/graphics/screencloud/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, python2Packages }: - -with lib; -stdenv.mkDerivation rec { - pname = "screencloud"; - version = "1.2.0"; - - # API Keys. According to the author of the AUR package, these are only used - # for tracking usage. - consumerKey = "23e747012c68601f27ab69c6de129ed70552d55b6"; - consumerSecret = "4701cb00c1bd357bbcae7c3d713dd216"; - - src = fetchFromGitHub { - owner = "olav-st"; - repo = "screencloud"; - rev = "v${version}"; - sha256 = "1s0dxa1sa37nvna5nfqdsp294810favj68qb7ghl78qna7zw0cim"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 quazip qt-mobility qxt python2Packages.python python2Packages.pycrypto ]; - - patchPhase = '' - # Required to make the configure script work. Normally, screencloud's - # CMakeLists file sets the install prefix to /opt by force. This is stupid - # and breaks nix, so we force it to install where we want. Please don't - # write CMakeLists files like this, as things like this are why we can't - # have nice things. - substituteInPlace "CMakeLists.txt" --replace "set(CMAKE_INSTALL_PREFIX \"/opt\")" "" - ''; - - # We need to append /opt to our CMAKE_INSTALL_PREFIX, so we tell the Nix not - # to add the argument for us. - dontAddPrefix = true; - - cmakeFlags = [ - "-DQXT_QXTCORE_INCLUDE_DIR=${qxt}/include/QxtCore" - "-DQXT_QXTCORE_LIB_RELEASE=${qxt}/lib/libQxtCore.so" - "-DQXT_QXTGUI_INCLUDE_DIR=${qxt}/include/QxtGui" - "-DQXT_QXTGUI_LIB_RELEASE=${qxt}/lib/libQxtGui.so" - "-DCONSUMER_KEY_SCREENCLOUD=${consumerKey}" - "-DCONSUMER_SECRET_SCREENCLOUD=${consumerSecret}" - ]; - - setSourceRoot = '' - sourceRoot=$(echo */screencloud) - ''; - - preConfigure = '' - # This needs to be set in preConfigure instead of cmakeFlags in order to - # access the $prefix environment variable. - export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix/opt $cmakeFlags" - ''; - - # There are a number of issues with screencloud's installation. We need to add - # pycrypto to the PYTHONPATH so that the SFTP plugin will work properly; and - # we need to move the libPythonQt library into a folder where it can actually - # be found. - postInstall = '' - patchShebangs $prefix/opt/screencloud/screencloud.sh - substituteInPlace "$prefix/opt/screencloud/screencloud.sh" --replace "/opt" "$prefix/opt" - sed -i "2 i\export PYTHONPATH=$(toPythonPath ${python2Packages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh" - mkdir $prefix/bin - mkdir $prefix/lib - ln -s $prefix/opt/screencloud/screencloud.sh $prefix/bin/screencloud - ln -s $prefix/opt/screencloud/libPythonQt.so $prefix/lib/libPythonQt.so - ''; - - meta = { - homepage = "https://screencloud.net/"; - description = "Client for Screencloud, an easy to use screenshot sharing tool"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ forkk ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 251dfdef32f4..a566d9da788c 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -30,7 +30,6 @@ , wrapGAppsHook , gobject-introspection , itstool -, libchamplain , libsecret , gsettings-desktop-schemas , python3 @@ -86,7 +85,6 @@ stdenv.mkDerivation rec { librest gcr gnome.adwaita-icon-theme - libchamplain libsecret ]; diff --git a/pkgs/applications/graphics/symbolic-preview/default.nix b/pkgs/applications/graphics/symbolic-preview/default.nix index 85d7004555f5..b73d481966b1 100644 --- a/pkgs/applications/graphics/symbolic-preview/default.nix +++ b/pkgs/applications/graphics/symbolic-preview/default.nix @@ -23,5 +23,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ qyliss ]; license = licenses.gpl3Plus; platforms = platforms.unix; + # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix index c3dfab7abe22..a1b92e6f542d 100644 --- a/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "tesseract"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - sha256 = "sha256-SvnV6sY+66ozOvgznTE6Gd/GFx/NfugpkpgeANMoUTU="; + sha256 = "sha256-Y+RZOnBCjS8XrWeFA4ExUxwsuWA0DndNtpIWjtRi1G8="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix index 7a5dde82f16a..e32226ad2f97 100644 --- a/pkgs/applications/graphics/tev/default.nix +++ b/pkgs/applications/graphics/tev/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.unix; badPlatforms = [ "aarch64-linux" ]; # fails on Hydra since forever + broken = stdenv.isDarwin; # needs apple frameworks + SDK fix? see #205247 maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index a7b289e33b39..bbee8671cc67 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.22"; + version = "0.0.23"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${version}"; - sha256 = "sha256-OlOnr1Spy8kdie9CyLVOQkY1+ib6Uwcd/xP5TSaZkYg="; + sha256 = "sha256-wRqQ7x6eQTrzFU++Qgq/7NXXo5F1onlZBdQ9ttNvvEw="; }; nativeBuildInputs = [ @@ -106,7 +106,5 @@ stdenv.mkDerivation rec { 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/vipsdisp/default.nix b/pkgs/applications/graphics/vipsdisp/default.nix new file mode 100644 index 000000000000..01601657c8f3 --- /dev/null +++ b/pkgs/applications/graphics/vipsdisp/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wrapGAppsHook4 +, vips +, gtk4 +, python3 +}: + +stdenv.mkDerivation rec { + pname = "vipsdisp"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "jcupitt"; + repo = "vipsdisp"; + rev = "v${version}"; + sha256 = "sha256-zftvjH5hyWBpjRe5uQBDAqbThQaQFHz0UhzM5q8hSk8="; + }; + + postPatch = '' + chmod +x ./meson_post_install.py + patchShebangs ./meson_post_install.py + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + vips + gtk4 + python3 + ]; + + # No tests implemented. + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/jcupitt/vipsdisp"; + description = "Tiny image viewer with libvips"; + license = licenses.mit; + maintainers = with maintainers; [ foo-dogsquared ]; + }; +} diff --git a/pkgs/applications/graphics/vkdt/default.nix b/pkgs/applications/graphics/vkdt/default.nix new file mode 100644 index 000000000000..c6acd02a541c --- /dev/null +++ b/pkgs/applications/graphics/vkdt/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchurl +, vulkan-headers +, vulkan-tools +, vulkan-loader +, glslang +, glfw +, libjpeg +, pkg-config +, rsync +, cmake +, clang +, llvm +, llvmPackages +, pugixml +, freetype +, exiv2 +, ffmpeg +, libvorbis +, libmad +}: + +stdenv.mkDerivation rec { + pname = "vkdt"; + version = "0.5.3"; + + src = fetchurl { + url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-7b9mowMOdA4holdb5zUIqOGkB0/xB6AvJOfxA6IIfRc="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + clang + cmake + glslang + llvm + llvmPackages.openmp + pkg-config + rsync + ]; + + buildInputs = [ + exiv2 + ffmpeg + freetype + glfw + libjpeg + libmad + libvorbis + llvmPackages.openmp + pugixml + vulkan-headers + vulkan-loader + vulkan-tools + ]; + + dontUseCmakeConfigure = true; + + makeFlags = [ "DESTDIR=$(out)" "prefix=" ]; + + meta = with lib; { + description = "A vulkan-powered raw image processor"; + homepage = "https://github.com/hanatos/vkdt"; + license = licenses.bsd2; + maintainers = with maintainers; [ paperdigits ]; + platforms = platforms.linux; + broken = stdenv.isAarch64; + }; +} diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix index 6cef9384e4c7..0a238e87fac8 100644 --- a/pkgs/applications/graphics/weylus/default.nix +++ b/pkgs/applications/graphics/weylus/default.nix @@ -14,6 +14,7 @@ , pango , pipewire , cmake +, git , autoconf , libtool , nodePackages @@ -63,6 +64,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake + git nodePackages.typescript makeWrapper ] ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 2ba96fda3f0b..e79f322be5e4 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -1,32 +1,50 @@ -{ lib, stdenv, fetchurl, aalib, gsl, libpng, libX11, xorgproto, libXext -, libXt, zlib, gettext, intltool, perl }: +{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qttools, wrapQtAppsHook, copyDesktopItems }: -stdenv.mkDerivation rec { +let datapath = "$out/share/XaoS"; +in stdenv.mkDerivation rec { pname = "xaos"; - version = "3.6"; + version = "4.2.1"; + outputs = [ "out" "man" ]; - src = fetchurl { - url = "mirror://sourceforge/xaos/${pname}-${version}.tar.gz"; - sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq"; + src = fetchFromGitHub { + owner = "xaos-project"; + repo = pname; + rev = "release-${version}"; + hash = "sha256-JLF8Mz/OHZEEJG/aryKQuJ6B5R8hPJdvln7mbKoqXFU="; }; - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ qmake qttools wrapQtAppsHook copyDesktopItems ]; + buildInputs = [ qtbase ]; - nativeBuildInputs = [ intltool ]; - buildInputs = [ - aalib gsl libpng libX11 xorgproto libXext - libXt zlib gettext perl - ]; + QMAKE_LRELEASE = "lrelease"; + DEFINES = [ "USE_OPENGL" "USE_FLOAT128" ]; - preConfigure = '' - sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*') - mkdir -p $out/share/locale + postPatch = '' + substituteInPlace src/include/config.h \ + --replace "/usr/share/XaoS" "${datapath}" ''; - meta = { - homepage = "http://xaos.sourceforge.net/"; - description = "Fractal viewer"; + desktopItems = [ "xdg/xaos.desktop" ]; + + installPhase = '' + runHook preInstall + + install -D bin/xaos "$out/bin/xaos" + + mkdir -p "${datapath}" + cp -r tutorial examples catalogs "${datapath}" + + install -D "xdg/${pname}.png" "$out/share/icons/${pname}.png" + + install -D doc/xaos.6 "$man/man6/xaos.6" + runHook postInstall + ''; + + meta = src.meta // { + description = "Real-time interactive fractal zoomer"; + homepage = "https://xaos-project.github.io/"; license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ ehmry ]; }; } diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 47a47ae4f25d..288f0446b34a 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeDesktopItem , ghostscript, atk, gtk2, glib, fontconfig, freetype -, libgnomecanvas, libgnomeprint, libgnomeprintui +, libgnomecanvas , pango, libX11, xorgproto, zlib, poppler , autoconf, automake, libtool, pkg-config}: @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { ghostscript atk gtk2 glib fontconfig freetype libgnomecanvas pango libX11 xorgproto zlib poppler - ] ++ lib.optionals (!stdenv.isDarwin) [ - libgnomeprint libgnomeprintui ]; nativeBuildInputs = [ autoconf automake libtool pkg-config ]; @@ -56,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://xournal.sourceforge.net/"; + homepage = "https://xournal.sourceforge.net/"; description = "Note-taking application (supposes stylus)"; maintainers = [ maintainers.guibert ]; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index ce262d73be43..b36ac5968b38 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.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E/7S4JGLXR8u9fE8bTVPFb6XVKOC/BHnQwLhr7N2A48="; + sha256 = "sha256-Hn7IDnbrmK3V+iz8UqdmHRV2TS4MwYSgYtnH6igbGJ8="; }; nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index a92adee10624..ba6370a5a414 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "yacreader"; - version = "9.10.0"; + version = "9.11.0"; src = fetchFromGitHub { owner = "YACReader"; repo = pname; rev = version; - sha256 = "sha256-77+lsEvmwQ34maW+HA/IpPsEezlzYEYipc74yR6inwU="; + sha256 = "sha256-/fSIV+4j516PgHGn6zF+TfVaVW/lVWykf5J8bnQuttg="; }; nativeBuildInputs = [ qmake pkg-config ]; diff --git a/pkgs/applications/graphics/yeetgif/default.nix b/pkgs/applications/graphics/yeetgif/default.nix index 84bcdee5b76e..d464b56cb265 100644 --- a/pkgs/applications/graphics/yeetgif/default.nix +++ b/pkgs/applications/graphics/yeetgif/default.nix @@ -1,18 +1,29 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, fetchpatch, lib }: -buildGoPackage rec { +buildGoModule rec { pname = "yeetgif"; version = "1.23.6"; - goPackagePath = "github.com/sgreben/yeetgif"; - src = fetchFromGitHub { owner = "sgreben"; repo = pname; rev = version; - sha256 = "05z1ylsra60bb4cvr383g9im94zsph1dgicqbv5p73qgs634ckk7"; + hash = "sha256-Z05GhtEPj3PLXpjF1wK8+pNUY3oDjbwZWQsYlTX14Rc="; }; + deleteVendor = true; + vendorHash = "sha256-LhkOMCuYO4GHezk21SlI2dP1UPmBp4bv2SdNbUQMKsI="; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/sgreben/yeetgif/commit/5d2067b9832898c2b1ac51bf6a5f107619038270.patch"; + hash = "sha256-3eyqbpPyuQHjAN5mjQyZo0xY6L683T5Ytyx02II/iU4="; + }) + ]; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "gif effects CLI. single binary, no dependencies. linux, osx, windows. #1 workplace productivity booster. #yeetgif #eggplant #golang"; homepage = "https://github.com/sgreben/yeetgif"; diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/applications/kde/colord-kde.nix similarity index 78% rename from pkgs/tools/misc/colord-kde/default.nix rename to pkgs/applications/kde/colord-kde.nix index 33686498112b..e250df5633f7 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/applications/kde/colord-kde.nix @@ -7,12 +7,6 @@ mkDerivation rec { pname = "colord-kde"; - version = "0.5.0"; - - src = fetchurl { - url = "http://download.kde.org/stable/colord-kde/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c"; - }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 8414db45d59a..6968c50c6099 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -81,6 +81,7 @@ let bomber = callPackage ./bomber.nix {}; bovo = callPackage ./bovo.nix {}; calendarsupport = callPackage ./calendarsupport.nix {}; + colord-kde = callPackage ./colord-kde.nix {}; dolphin = callPackage ./dolphin.nix {}; dolphin-plugins = callPackage ./dolphin-plugins.nix {}; dragon = callPackage ./dragon.nix {}; @@ -93,6 +94,7 @@ let grantleetheme = callPackage ./grantleetheme {}; gwenview = callPackage ./gwenview.nix {}; incidenceeditor = callPackage ./incidenceeditor.nix {}; + juk = callPackage ./juk.nix {}; k3b = callPackage ./k3b.nix {}; kaccounts-integration = callPackage ./kaccounts-integration.nix {}; kaccounts-providers = callPackage ./kaccounts-providers.nix {}; @@ -222,6 +224,7 @@ let messagelib = callPackage ./messagelib.nix {}; minuet = callPackage ./minuet.nix {}; okular = callPackage ./okular.nix {}; + palapeli = callPackage ./palapeli.nix {}; picmi = callPackage ./picmi.nix {}; pim-data-exporter = callPackage ./pim-data-exporter.nix {}; pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 97cbb33a0377..a2e90571e93d 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/22.08.3/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.2/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix index f861c04a7287..2a6e349f2f23 100644 --- a/pkgs/applications/kde/filelight.nix +++ b/pkgs/applications/kde/filelight.nix @@ -1,7 +1,17 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - kio, kparts, kxmlgui, qtbase, qtscript, solid, qtquickcontrols2, kdeclarative +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kio +, kparts +, kxmlgui +, qtbase +, qtscript +, solid +, qtquickcontrols2 +, kdeclarative +, kirigami2 +, kquickcharts }: mkDerivation { @@ -15,7 +25,15 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ - kio kparts kxmlgui qtscript solid qtquickcontrols2 kdeclarative + kio + kparts + kxmlgui + qtscript + solid + qtquickcontrols2 + kdeclarative + kirigami2 + kquickcharts ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/juk.nix b/pkgs/applications/kde/juk.nix new file mode 100644 index 000000000000..70bd90b7e9ed --- /dev/null +++ b/pkgs/applications/kde/juk.nix @@ -0,0 +1,37 @@ +{ lib +, mkDerivation +, extra-cmake-modules +, wrapQtAppsHook +, kdoctools +, kcoreaddons +, kxmlgui +, kio +, phonon +, taglib +}: + +mkDerivation { + pname = "juk"; + + nativeBuildInputs = [ + extra-cmake-modules + wrapQtAppsHook + kdoctools + ]; + + buildInputs = [ + kcoreaddons + kxmlgui + kio + phonon + taglib + ]; + + meta = with lib; { + homepage = "https://invent.kde.org/multimedia/juk"; + description = "Audio jukebox app, supporting collections of MP3, Ogg Vorbis and FLAC audio files"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/kde/kalendar.nix b/pkgs/applications/kde/kalendar.nix index a762d605a32b..eb5649a32252 100644 --- a/pkgs/applications/kde/kalendar.nix +++ b/pkgs/applications/kde/kalendar.nix @@ -35,6 +35,10 @@ , akonadi-contacts , akonadi-calendar-tools , kdepim-runtime +, gpgme +, pimcommon +, mailcommon +, messagelib }: mkDerivation rec { @@ -76,6 +80,11 @@ mkDerivation rec { akonadi-contacts akonadi-calendar-tools kdepim-runtime + + gpgme + pimcommon + mailcommon + messagelib ]; propagatedUserEnvPkgs = [ akonadi kdepim-runtime akonadi-search ]; diff --git a/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix b/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix index f96e8cf6b677..468e264915c8 100644 --- a/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix +++ b/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdevelop-pg-qt"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1"; + sha256 = "sha256-PVZgTEefjwSuMqUj7pHzB4xxcRfQ3rOelz4iSUy7ZfE="; }; nativeBuildInputs = [ cmake pkg-config extra-cmake-modules ]; diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix index 8262febad7af..65213fa15afb 100644 --- a/pkgs/applications/kde/krfb.nix +++ b/pkgs/applications/kde/krfb.nix @@ -3,7 +3,7 @@ , kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet , kwidgetsaddons, kwindowsystem, kxmlgui, kwayland , libvncserver, libXtst, libXdamage -, qtx11extras +, qtx11extras, pipewire, plasma-wayland-protocols, wayland }: mkDerivation { @@ -20,6 +20,9 @@ mkDerivation { kconfig kcoreaddons kcrash kdbusaddons knotifications kwallet kwidgetsaddons kwindowsystem kxmlgui kwayland qtx11extras + pipewire + plasma-wayland-protocols + wayland ]; propagatedBuildInputs = [ kdnssd ]; } diff --git a/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch b/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch index 74e83761eb7d..5f0ad9fac261 100644 --- a/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch +++ b/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch @@ -15,7 +15,7 @@ index 83c2bcb..5f6d47c 100644 REQUIRED_HEADERS KSMTP_HEADERS ) --install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +-install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index f2f563042224..e2d468b4ff7b 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -1,23 +1,25 @@ -{ - stdenv, mkDerivation, lib, - extra-cmake-modules, kdoctools, - breeze-icons, chmlib, discount, djvulibre, ebook_tools, kactivities, - karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, - kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, - kpty, kpurpose, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler, - qca-qt5, qtdeclarative, qtsvg, threadweaver, kcrash, qtspeech +{ stdenv, mkDerivation, lib +, extra-cmake-modules, kdoctools +, breeze-icons, chmlib, discount, djvulibre, ebook_tools, kactivities +, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons +, kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts +, kpty, kpurpose, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler +, qca-qt5, qtdeclarative, qtsvg, threadweaver, kcrash +, withSpeech ? true, qtspeech }: mkDerivation { pname = "okular"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ breeze-icons discount djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kpurpose kwallet kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5 - qtdeclarative qtsvg threadweaver kcrash qtspeech chmlib - ]; + qtdeclarative qtsvg threadweaver kcrash chmlib + ] ++ lib.optional withSpeech qtspeech; # InitialPreference values are too high and end up making okular # default for anything considered text/plain. Resetting to 1, which @@ -27,6 +29,8 @@ mkDerivation { --replace InitialPreference=3 InitialPreference=1 ''; + cmakeFlags = lib.optional (!withSpeech) "-DFORCE_NOT_REQUIRED_DEPENDENCIES=Qt5TextToSpeech"; + meta = with lib; { homepage = "http://www.kde.org"; description = "KDE document viewer"; diff --git a/pkgs/applications/kde/palapeli.nix b/pkgs/applications/kde/palapeli.nix new file mode 100644 index 000000000000..13aa24df27d4 --- /dev/null +++ b/pkgs/applications/kde/palapeli.nix @@ -0,0 +1,22 @@ +{ lib +, mkDerivation +, extra-cmake-modules +, shared-mime-info +, kconfig +, kdoctools +, kio +, ktextwidgets +, libkdegames +}: + +mkDerivation { + pname = "palapeli"; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; + buildInputs = [ libkdegames kio ktextwidgets ]; + meta = { + homepage = "https://apps.kde.org/palapeli/"; + description = "A single-player jigsaw puzzle game"; + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ harrisonthorne ]; + }; +} diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index b8cbb6138b51..81ae24b71c83 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1867 +4,1875 @@ { akonadi = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/akonadi-22.08.3.tar.xz"; - sha256 = "0x4r620ivnhbsd6j3l3a2yb2mncv0a23sxhb2pfc5rs0yj225fm2"; - name = "akonadi-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-22.12.2.tar.xz"; + sha256 = "19cqzpn28xw8g1m9g4z45wh0z2waygx0cbir8yp6xwl78ax9qss1"; + name = "akonadi-22.12.2.tar.xz"; }; }; akonadi-calendar = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/akonadi-calendar-22.08.3.tar.xz"; - sha256 = "1y4552c1s7scy080vhr470a2qi8277a8qn2m6fscw7fibf8bzgrg"; - name = "akonadi-calendar-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-calendar-22.12.2.tar.xz"; + sha256 = "0y9dxh3c7044bilky05xhmx15mk3bq1yfpsirn1w6r0pygnrhvgs"; + name = "akonadi-calendar-22.12.2.tar.xz"; }; }; akonadi-calendar-tools = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/akonadi-calendar-tools-22.08.3.tar.xz"; - sha256 = "1r9hdw18bp2sllx9a65chpi2bfrai82ls6az70j00lq7v2hwb5vr"; - name = "akonadi-calendar-tools-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-calendar-tools-22.12.2.tar.xz"; + sha256 = "12p0702gddh0ssz8hnk0vxklj8bpq3n81qz565i4biifamn0zids"; + name = "akonadi-calendar-tools-22.12.2.tar.xz"; }; }; akonadi-contacts = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/akonadi-contacts-22.08.3.tar.xz"; - sha256 = "1bzmyh1wr8dy2jyza33syfg5m6f74by8b54rsx9mkgxp64ysa6qw"; - name = "akonadi-contacts-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-contacts-22.12.2.tar.xz"; + sha256 = "04q72c7k5jnwh16sxap3wlany5kl1wcxaidwk8s7zyssf4zpri1h"; + name = "akonadi-contacts-22.12.2.tar.xz"; }; }; akonadi-import-wizard = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/akonadi-import-wizard-22.08.3.tar.xz"; - sha256 = "1995s8qra9b8pc9c1pzlkwassfdqphgakwgn2qd22m53kgzkj6lv"; - name = "akonadi-import-wizard-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-import-wizard-22.12.2.tar.xz"; + sha256 = "1iiagyj1q321vn54azq69fkiqjf1ky01bb2ddd97zzll7z4ly5q0"; + name = "akonadi-import-wizard-22.12.2.tar.xz"; }; }; akonadi-mime = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/akonadi-mime-22.08.3.tar.xz"; - sha256 = "0w6yici0kswd07068khk6yrxg3z3801dib80h56ifgb3jpbcfs44"; - name = "akonadi-mime-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-mime-22.12.2.tar.xz"; + sha256 = "08d8hd5xxmwf2fxnc4g41almcr76pp6gdx54ndxs3n1s3l31mmip"; + name = "akonadi-mime-22.12.2.tar.xz"; }; }; akonadi-notes = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/akonadi-notes-22.08.3.tar.xz"; - sha256 = "1h8dpfcym532w29b0v3krvnvr6my75i9y35p3as8l0ndz1rbscw5"; - name = "akonadi-notes-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-notes-22.12.2.tar.xz"; + sha256 = "1n61acjdhsr7nhy5jr261x4h97a2fcf3hlrig7vin4sjp263ik6f"; + name = "akonadi-notes-22.12.2.tar.xz"; }; }; akonadi-search = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/akonadi-search-22.08.3.tar.xz"; - sha256 = "03xsaznqp3k7qffsb1njnc0g9izfqh5xdm2z5dwng61pb1gw1q3j"; - name = "akonadi-search-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-search-22.12.2.tar.xz"; + sha256 = "1zg0sqzw4vgxghp32k3yb5kixh4nivzpx3gacr94f22jq8h2pgny"; + name = "akonadi-search-22.12.2.tar.xz"; }; }; akonadiconsole = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/akonadiconsole-22.08.3.tar.xz"; - sha256 = "152hd6z7ank63pqlpxw92ad12l9k5spxhk8f7cjrb2gs290vbhbb"; - name = "akonadiconsole-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadiconsole-22.12.2.tar.xz"; + sha256 = "158xgm4z9hk8gzf9z8fnf5mqbryhf6rw3d68195gwfp9i0f3b488"; + name = "akonadiconsole-22.12.2.tar.xz"; }; }; akregator = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/akregator-22.08.3.tar.xz"; - sha256 = "05q3igigqj2vyd2ykkj44plndkr6mi36ff3bfavl47dih29yva3y"; - name = "akregator-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akregator-22.12.2.tar.xz"; + sha256 = "14s2rcfb7p3yyp46lf91a5ssi0bnh5ff2rcq2sd6z9d8yi01vl9s"; + name = "akregator-22.12.2.tar.xz"; }; }; analitza = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/analitza-22.08.3.tar.xz"; - sha256 = "1sjf7zycaq0448r29x6qbkfb2ws4rvn0gjr0ag6xg8b4qvf6bamy"; - name = "analitza-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/analitza-22.12.2.tar.xz"; + sha256 = "07ch3vsaf9dily42gdyvph52rnvbrcrfnmsav5nvs98ymvkqj241"; + name = "analitza-22.12.2.tar.xz"; }; }; ark = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ark-22.08.3.tar.xz"; - sha256 = "0rc0lwics1rqzrk5yjmc76vki6xbpfpg1xlg394ixdjyv48riiww"; - name = "ark-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ark-22.12.2.tar.xz"; + sha256 = "1hsh1anm555b5mckn60cj9p4sdl5h5g2m01k6ia784l2k4zsrvvb"; + name = "ark-22.12.2.tar.xz"; }; }; artikulate = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/artikulate-22.08.3.tar.xz"; - sha256 = "0k6ygq89qcgf38wkrdqk8mznsbrpwf7abw3p0a0ng5w66yxwn1yj"; - name = "artikulate-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/artikulate-22.12.2.tar.xz"; + sha256 = "1cvs0v0x2g8048ksrb9xb41bsvm7lq1g30gch1rjdj86vv3ysraa"; + name = "artikulate-22.12.2.tar.xz"; }; }; audiocd-kio = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/audiocd-kio-22.08.3.tar.xz"; - sha256 = "0jwzx7g0g8mg4r6h5q54j72p6cbrfr3dx1hv9r45g02hzvd2i2an"; - name = "audiocd-kio-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/audiocd-kio-22.12.2.tar.xz"; + sha256 = "1z46gk6lnar280chigjbw45l8zsr6majyk1gxd1kfnpyqgfh6pzj"; + name = "audiocd-kio-22.12.2.tar.xz"; }; }; baloo-widgets = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/baloo-widgets-22.08.3.tar.xz"; - sha256 = "0nnv54lnvln02yvxdaxvc497vxyx5gzpm3zvn7bz8mks4yzvrahb"; - name = "baloo-widgets-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/baloo-widgets-22.12.2.tar.xz"; + sha256 = "1041m3r4a3dps5br3m4fmg91fg4d0ww6c6yl2qngyh27arc1ashn"; + name = "baloo-widgets-22.12.2.tar.xz"; }; }; blinken = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/blinken-22.08.3.tar.xz"; - sha256 = "1avdphqp1y528lczb6bpxvdzaq9navrg4vxiqvfkvgkymhd36n2k"; - name = "blinken-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/blinken-22.12.2.tar.xz"; + sha256 = "0hz6sa3g7d5x388arsawspgbjzkhv0p85fpkmm8px8ysqa5vn189"; + name = "blinken-22.12.2.tar.xz"; }; }; bomber = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/bomber-22.08.3.tar.xz"; - sha256 = "1fm5fisxa5q2shc3154g4cfg271jz97411wfjcdpgry6mx96qs7k"; - name = "bomber-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/bomber-22.12.2.tar.xz"; + sha256 = "1ipzk0lys8s9wwmb8mrrsi9c7scdak19ggcbazq6dqzb2iqn381m"; + name = "bomber-22.12.2.tar.xz"; }; }; bovo = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/bovo-22.08.3.tar.xz"; - sha256 = "060gc854krafa4ichknj5naic0ingiviacbz1lmdg2fp68mggd50"; - name = "bovo-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/bovo-22.12.2.tar.xz"; + sha256 = "12j9g84bi4mkj2gw7jdvbmwf8bmgb4l0imxivifn0i1pz2bjaia1"; + name = "bovo-22.12.2.tar.xz"; }; }; calendarsupport = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/calendarsupport-22.08.3.tar.xz"; - sha256 = "1lmysb5g0xsaj5n75ays9hmjgcg71apg7fw3fg93rdh9hzn9in0x"; - name = "calendarsupport-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/calendarsupport-22.12.2.tar.xz"; + sha256 = "172j3n6s06aax5p3r49kj1c5mx1hz1zljbhvkjdrm4fj6kxwl829"; + name = "calendarsupport-22.12.2.tar.xz"; }; }; cantor = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/cantor-22.08.3.tar.xz"; - sha256 = "017zzxl60ycjc24i9zv7mjkxpdx4fa8kznxmfdhc601sdh1n0pja"; - name = "cantor-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/cantor-22.12.2.tar.xz"; + sha256 = "0yv8vq6wkybx0qdbkq0d5qm3xzcla80zlppf7wpf7icdvxqa9g76"; + name = "cantor-22.12.2.tar.xz"; }; }; cervisia = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/cervisia-22.08.3.tar.xz"; - sha256 = "1q668vd237wf7nd5sjygnkbygbj6qwbc9j0l3pgpbd51r220jh04"; - name = "cervisia-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/cervisia-22.12.2.tar.xz"; + sha256 = "0dl16s49msf4z59s3y03c552zkpq9b565fg4yan5950587sbpvfg"; + name = "cervisia-22.12.2.tar.xz"; + }; + }; + colord-kde = { + version = "22.12.2"; + src = fetchurl { + url = "${mirror}/stable/release-service/22.12.2/src/colord-kde-22.12.2.tar.xz"; + sha256 = "028f50ab0w08zg70ckisjdqnii3xs5hx5zgmhvvvfjgcacdpgvvb"; + name = "colord-kde-22.12.2.tar.xz"; }; }; dolphin = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/dolphin-22.08.3.tar.xz"; - sha256 = "18qmrwcx3qg5kxhf211m9syazpbshhak7ss245z2jsyxkjjqj54p"; - name = "dolphin-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/dolphin-22.12.2.tar.xz"; + sha256 = "0gjpvvwpghs7zf8cm1l7y7821459kggh42rc5jv5vybn1v8wzqg0"; + name = "dolphin-22.12.2.tar.xz"; }; }; dolphin-plugins = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/dolphin-plugins-22.08.3.tar.xz"; - sha256 = "05qmhl9lacs0gx45c5icm2iwpjxaqidwllhvl364i6pvsmk4cg3h"; - name = "dolphin-plugins-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/dolphin-plugins-22.12.2.tar.xz"; + sha256 = "1y2jkx7rq2kb5zsp5r8d3lhfil3p2nr8vfhlfiaqyisqaj138by1"; + name = "dolphin-plugins-22.12.2.tar.xz"; }; }; dragon = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/dragon-22.08.3.tar.xz"; - sha256 = "1bg6m47x4n8yaib8z0f3hvg97kpkg07hb8lq0nm6603qgi69ssga"; - name = "dragon-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/dragon-22.12.2.tar.xz"; + sha256 = "0qbhhl3kpq0syik17xhsfgfym16mw5nkz83c620dl0n5c65dyva9"; + name = "dragon-22.12.2.tar.xz"; }; }; elisa = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/elisa-22.08.3.tar.xz"; - sha256 = "07db9rkqiwq08arji6hf8aghc08k558nyddy38kpdl5gsk1xvkl2"; - name = "elisa-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/elisa-22.12.2.tar.xz"; + sha256 = "09kz7k7w6rs419sv6f2z5m5nqz3j3cdlmcn3ig9f5v9hlci1x1sr"; + name = "elisa-22.12.2.tar.xz"; }; }; eventviews = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/eventviews-22.08.3.tar.xz"; - sha256 = "14k9gg4abadajwkmz5lm1lsvhfvnck15dvggq910gwwa3ayah6c7"; - name = "eventviews-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/eventviews-22.12.2.tar.xz"; + sha256 = "127bxj6pnmkppjchv3pr8wqs75hw2nb3jsx3bgmr11zvm2mbivwc"; + name = "eventviews-22.12.2.tar.xz"; }; }; falkon = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/falkon-22.08.3.tar.xz"; - sha256 = "02gz6d82l8zly8k5kk41352jcyz3lqxrx7xz0pqbyhlxrpagwgp5"; - name = "falkon-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/falkon-22.12.2.tar.xz"; + sha256 = "1d6xxq18lx57aw20pzrv7mh0rdw84sli04l15ingvxj6crqkha4f"; + name = "falkon-22.12.2.tar.xz"; }; }; ffmpegthumbs = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ffmpegthumbs-22.08.3.tar.xz"; - sha256 = "04q1cd0biwqbx8ipbmy2mxf8l9yk4z3297yvkig99fg0sxbayvm6"; - name = "ffmpegthumbs-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ffmpegthumbs-22.12.2.tar.xz"; + sha256 = "0ykmlr4acx0lbg255xmhjva5kb448mmsbb8xq1xm763qbf9xkdrr"; + name = "ffmpegthumbs-22.12.2.tar.xz"; }; }; filelight = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/filelight-22.08.3.tar.xz"; - sha256 = "0vjglyrhvr8ihf7xd9arf8d6rd6rawpqf14f76blzg18csg9p2yj"; - name = "filelight-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/filelight-22.12.2.tar.xz"; + sha256 = "1kapmwhzpsmvs7757lgbm3d7nv7iaarn0vv5w7ndv3aygxf719d7"; + name = "filelight-22.12.2.tar.xz"; }; }; granatier = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/granatier-22.08.3.tar.xz"; - sha256 = "0n6lavlbmc13xy55fpf86jls8qx4y4mnfrszkfhmbrbdb45pqlhn"; - name = "granatier-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/granatier-22.12.2.tar.xz"; + sha256 = "1hngcg7zvgra7j26iksipxg635snmx9bpqxiw7r1v6qfk97hq6a7"; + name = "granatier-22.12.2.tar.xz"; }; }; grantlee-editor = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/grantlee-editor-22.08.3.tar.xz"; - sha256 = "03vkz698wkhfj0l8qhniw85q0pjlpmz6p957k6h3xlqc792rk3mh"; - name = "grantlee-editor-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/grantlee-editor-22.12.2.tar.xz"; + sha256 = "0fiyinazfmh82rxr97icfs3qgrzgydczicdghr2i1pb7frpgpxh1"; + name = "grantlee-editor-22.12.2.tar.xz"; }; }; grantleetheme = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/grantleetheme-22.08.3.tar.xz"; - sha256 = "093dmd81rmc0bq95xpwsfpwadmi2ikg1a5d6mmzr55s68rmxyxvk"; - name = "grantleetheme-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/grantleetheme-22.12.2.tar.xz"; + sha256 = "055cff24fbjhlgc5y7501yy3vyfkgqhsqsc10qbfx24xkgbjfb2i"; + name = "grantleetheme-22.12.2.tar.xz"; }; }; gwenview = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/gwenview-22.08.3.tar.xz"; - sha256 = "0vma08maf79k46rq59y991ryi9z69yjvr6qw8xjs47nqkmrfn9gi"; - name = "gwenview-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/gwenview-22.12.2.tar.xz"; + sha256 = "1dkggydnnhn8db2crlxnj7jz47rrrllpjqxg158rgf740dnhdhbx"; + name = "gwenview-22.12.2.tar.xz"; }; }; incidenceeditor = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/incidenceeditor-22.08.3.tar.xz"; - sha256 = "1r7dp574sqsbyzdm3avznbx99a5hvbw2gkx4ml8binx0q3gn5vn3"; - name = "incidenceeditor-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/incidenceeditor-22.12.2.tar.xz"; + sha256 = "0qy4kd1gf72mpi3kks1acdcqn625gys4hjy98cfgn6hz3vp7dfcb"; + name = "incidenceeditor-22.12.2.tar.xz"; }; }; itinerary = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/itinerary-22.08.3.tar.xz"; - sha256 = "1czqlgn2vxyl9jnmzw571kj11ppf9siqiwwg5c06b3s6nyc0aw2q"; - name = "itinerary-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/itinerary-22.12.2.tar.xz"; + sha256 = "13xm73wdwz2fsmmfvikyyq0x98x48j3vzpvijfafj8a1k82zc7g1"; + name = "itinerary-22.12.2.tar.xz"; }; }; juk = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/juk-22.08.3.tar.xz"; - sha256 = "04r6s3z620lsqm5x0lmwkxdqim4nczcwb3la9zfzznkyll1jh0fw"; - name = "juk-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/juk-22.12.2.tar.xz"; + sha256 = "1hi1ywbragllsbx2vf0hmv8a0jnnjnq4jinanxrpkpl2h9hj31bf"; + name = "juk-22.12.2.tar.xz"; }; }; k3b = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/k3b-22.08.3.tar.xz"; - sha256 = "1673711wim4yy3zx0fjhkyfn7n0qiilvhs211gcqqvip0mgc2gl9"; - name = "k3b-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/k3b-22.12.2.tar.xz"; + sha256 = "08979ns5mm92x5swphd6cf4jvin3nly65h3vzsr85g1h2vi5hywz"; + name = "k3b-22.12.2.tar.xz"; }; }; kaccounts-integration = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kaccounts-integration-22.08.3.tar.xz"; - sha256 = "04ha4bbawycgabz7gs2b2zs1nw0329034p1xk3x8rwkpi1sbwhhv"; - name = "kaccounts-integration-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kaccounts-integration-22.12.2.tar.xz"; + sha256 = "171jz49j565myd3iprhlfxla2pc5rs608w815z84qya8y0s9ji8q"; + name = "kaccounts-integration-22.12.2.tar.xz"; }; }; kaccounts-providers = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kaccounts-providers-22.08.3.tar.xz"; - sha256 = "0frd6h62glcszs5irxgn2zmssm70r4sddwcjky2xn131cia5zacs"; - name = "kaccounts-providers-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kaccounts-providers-22.12.2.tar.xz"; + sha256 = "0pdkhpprbxd6damdzx4zxd32gs0fdy27s9vhfg79hgb9a94ar8p3"; + name = "kaccounts-providers-22.12.2.tar.xz"; }; }; kaddressbook = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kaddressbook-22.08.3.tar.xz"; - sha256 = "11qdb2jpiy6l1mjd7ibd3djfddd6dlinz494nn9c6p0jz46w4ww3"; - name = "kaddressbook-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kaddressbook-22.12.2.tar.xz"; + sha256 = "1vwxfhjh4dk94aijazfnb25fdjwbd7520a90hg59g5cxrd3yrlqb"; + name = "kaddressbook-22.12.2.tar.xz"; }; }; kajongg = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kajongg-22.08.3.tar.xz"; - sha256 = "1n0z0dbgpkkxq3zl3vgx5ass6zvvqiqyr95c5kfnz1kvxfsffq71"; - name = "kajongg-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kajongg-22.12.2.tar.xz"; + sha256 = "1a2ps3vvrh89ryclz4hh072q4mfayys3kgkhp0r9b74yskjln8zv"; + name = "kajongg-22.12.2.tar.xz"; }; }; kalarm = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kalarm-22.08.3.tar.xz"; - sha256 = "03h08hvb2hz028h189hcpdvm5b4ki1wvjsxvqwwd5gggikki3p67"; - name = "kalarm-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kalarm-22.12.2.tar.xz"; + sha256 = "16aaxl4j1027p3xwrfilgriddr4dlm33vrbhz26w1kdanq7jicp9"; + name = "kalarm-22.12.2.tar.xz"; }; }; kalendar = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kalendar-22.08.3.tar.xz"; - sha256 = "1857y4g34ff2lik5kz6kph9vp9cnjvyqlmyxhxmmhfij4aj0fz4c"; - name = "kalendar-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kalendar-22.12.2.tar.xz"; + sha256 = "13wkxl4cv7h0jaf5c973ppkflfy5h8x4njmkzgg01fkb4zaxdkdy"; + name = "kalendar-22.12.2.tar.xz"; }; }; kalgebra = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kalgebra-22.08.3.tar.xz"; - sha256 = "0xzr29ajcw026dxr2gjqm4zv2bbw9az4j1214hb7g8bik9x01q42"; - name = "kalgebra-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kalgebra-22.12.2.tar.xz"; + sha256 = "1c8z2mpk2k737dshsg76bvipd1msf6fbp4zqjm167ar29bn5s52j"; + name = "kalgebra-22.12.2.tar.xz"; }; }; kalzium = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kalzium-22.08.3.tar.xz"; - sha256 = "0l2wx9vvgwxmsq5ai1ghs0kgv9yk1rsclqspc1lcmzv8xxy3yx0c"; - name = "kalzium-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kalzium-22.12.2.tar.xz"; + sha256 = "0z0brsxh4ivrna0250j76is9slswmpvkj6n3i6vd9j7x5ayh8kr2"; + name = "kalzium-22.12.2.tar.xz"; }; }; kamera = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kamera-22.08.3.tar.xz"; - sha256 = "1qzl0cvd0i3arvdx64z821xkc57j6fhqfaw2f9xxhajb16dmj19j"; - name = "kamera-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kamera-22.12.2.tar.xz"; + sha256 = "0i8l0happ7sg6ch4jp1680c4ikqvf99dfj6d3cfi0k35wh828x32"; + name = "kamera-22.12.2.tar.xz"; }; }; kamoso = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kamoso-22.08.3.tar.xz"; - sha256 = "1l101rdm163lvx9cq2jyc91svvpjk8p5pvif74y9rsxb396a35cj"; - name = "kamoso-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kamoso-22.12.2.tar.xz"; + sha256 = "1x1w0kgf5fh8jj5bha7q5sr7f8q93jr987v40h9h5d4xlj576n7n"; + name = "kamoso-22.12.2.tar.xz"; }; }; kanagram = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kanagram-22.08.3.tar.xz"; - sha256 = "1h8l3bzpg0m50mcirvj0a5d4z0im8ng4f5fp1zx6vj20xbd0scq9"; - name = "kanagram-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kanagram-22.12.2.tar.xz"; + sha256 = "0dgialia8qc09y2gv8031m2g2dn5dhfn5zyvrh3yb7p1bviw301c"; + name = "kanagram-22.12.2.tar.xz"; }; }; kapman = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kapman-22.08.3.tar.xz"; - sha256 = "1f414cdixmbhqmp5hxiip7cv4r7lggiwl29rlwp1sbcyil80r79p"; - name = "kapman-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kapman-22.12.2.tar.xz"; + sha256 = "1xm3bkp0l9if06l0mnfyk5ywmdd8q0vvdwgjy9xm12k06jqkyhgh"; + name = "kapman-22.12.2.tar.xz"; }; }; kapptemplate = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kapptemplate-22.08.3.tar.xz"; - sha256 = "1dsh5ajp1614kmlvfmxy8irl1zqc24shrigwj7jjdbwb8a0qrxxk"; - name = "kapptemplate-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kapptemplate-22.12.2.tar.xz"; + sha256 = "0l95qpw7bdj9na5x32glm465rghylxdmjacfc3372k934vm8ckdl"; + name = "kapptemplate-22.12.2.tar.xz"; }; }; kate = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kate-22.08.3.tar.xz"; - sha256 = "19jzjk3zsbdhrjgw7rrhrbc77rn46z58cmi24fhndvafrw7br5fi"; - name = "kate-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kate-22.12.2.tar.xz"; + sha256 = "199c807yj5vliy1aa0iz3ryymr3zxviakdkidr71imz4bq8v3m70"; + name = "kate-22.12.2.tar.xz"; }; }; katomic = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/katomic-22.08.3.tar.xz"; - sha256 = "1msly7134krz6ml06k1gmx3lq50c3valz67x2m3dlyfxn7v8dzlr"; - name = "katomic-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/katomic-22.12.2.tar.xz"; + sha256 = "000d28jl01sn6nil1d57j1iy1flmrv7z6yjc3ci7kjmapi1167mc"; + name = "katomic-22.12.2.tar.xz"; }; }; kbackup = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kbackup-22.08.3.tar.xz"; - sha256 = "16ybl4npq024xsncvb8m8cnnp7bdxkjj2fxw3nh3z0bvr5k5rqxw"; - name = "kbackup-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kbackup-22.12.2.tar.xz"; + sha256 = "1vyl303j7fzyay55agisbn5vj73g26hdk8ilnlwm946rg6nrcf67"; + name = "kbackup-22.12.2.tar.xz"; }; }; kblackbox = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kblackbox-22.08.3.tar.xz"; - sha256 = "1nr2xsam2fy1bxg5x8p98vgm6rgmsbkmai9vzp4jzizzi9apjxwc"; - name = "kblackbox-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kblackbox-22.12.2.tar.xz"; + sha256 = "17x4rgji7pnnmnq4dl6mhmdsc8csn3wnwap92jg3lc9r04vpfk5h"; + name = "kblackbox-22.12.2.tar.xz"; }; }; kblocks = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kblocks-22.08.3.tar.xz"; - sha256 = "0clm7myn4ra4ji2jgpjm0y03ys7pikxf4092jvpzhz9735g071w4"; - name = "kblocks-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kblocks-22.12.2.tar.xz"; + sha256 = "1qf1qf3r659ya8rr00pqikdxb69c05s0v8dzk2j8ajnbzc19w8sa"; + name = "kblocks-22.12.2.tar.xz"; }; }; kbounce = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kbounce-22.08.3.tar.xz"; - sha256 = "0n5bfw3vjqfgh4h1j78pniqkk9l0b74c94avibmi0d9avdr2hwbv"; - name = "kbounce-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kbounce-22.12.2.tar.xz"; + sha256 = "1lbdicwnv1zz3jlg4v2yblm2xjxslkb64nq0z94cgfp1nzwavq3n"; + name = "kbounce-22.12.2.tar.xz"; }; }; kbreakout = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kbreakout-22.08.3.tar.xz"; - sha256 = "0f7yvps9xnr6k3wbcbapcmi8g287ib2nk27n24dzamksc07k1hrl"; - name = "kbreakout-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kbreakout-22.12.2.tar.xz"; + sha256 = "0cx2m4hqw39kpzp4y5rsxa1y264q318q5qsbjwcflbnm50fdbjpd"; + name = "kbreakout-22.12.2.tar.xz"; }; }; kbruch = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kbruch-22.08.3.tar.xz"; - sha256 = "0nzq8ah7gwjaqnalvnb928argvrjjv79nsdhd0rbhndj0r5bpklh"; - name = "kbruch-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kbruch-22.12.2.tar.xz"; + sha256 = "1rc8kjyipknrraiyq7wabjzm3i00jsjkd75d8qfk50i2sdxm47kv"; + name = "kbruch-22.12.2.tar.xz"; }; }; kcachegrind = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kcachegrind-22.08.3.tar.xz"; - sha256 = "1iwa4630gri609570m9kivc5cvgj9p1kvz604rh9irp150prn2qn"; - name = "kcachegrind-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kcachegrind-22.12.2.tar.xz"; + sha256 = "065lp2g5cp2pmisjfb2m2m64f20r1c18vridlp7zdkran5d3fq0k"; + name = "kcachegrind-22.12.2.tar.xz"; }; }; kcalc = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kcalc-22.08.3.tar.xz"; - sha256 = "0jzxc6rl2ydk53j92l5kxzbk926fg5f7zc4m92am96f8xv67cgml"; - name = "kcalc-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kcalc-22.12.2.tar.xz"; + sha256 = "021njz922hah1bwrq2mqc96fzg0ap59ffa3n5ycgb66jld1vnn3n"; + name = "kcalc-22.12.2.tar.xz"; }; }; kcalutils = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kcalutils-22.08.3.tar.xz"; - sha256 = "0mmxgcvn3dr9afdawlv503pj8q1732jqiixmx70nsagd7mbw65cm"; - name = "kcalutils-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kcalutils-22.12.2.tar.xz"; + sha256 = "1kd2nci8j76r847jh91pjhpcy386ilg82caq0npq2n64li2lq0dq"; + name = "kcalutils-22.12.2.tar.xz"; }; }; kcharselect = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kcharselect-22.08.3.tar.xz"; - sha256 = "147lsnxbjj55y427mpx4xx4v760aw6q1xcrkcqqqi2ds7sgajfq6"; - name = "kcharselect-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kcharselect-22.12.2.tar.xz"; + sha256 = "1zhj2yzapcxi4vjx64k8mxqd45qknsb825s1la0bkbilkgzljg3p"; + name = "kcharselect-22.12.2.tar.xz"; }; }; kcolorchooser = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kcolorchooser-22.08.3.tar.xz"; - sha256 = "1z84c5nwp4hgnbhmfa1816ksalfvq27l3pp97fdz3sppd623570x"; - name = "kcolorchooser-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kcolorchooser-22.12.2.tar.xz"; + sha256 = "0zysz6z08xsxv0psyma0cym57w6fj9j2np14jka097qp58hpjkzi"; + name = "kcolorchooser-22.12.2.tar.xz"; }; }; kcron = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kcron-22.08.3.tar.xz"; - sha256 = "1s84kf6vzibv66wwajf4mh66hl5pz46pazgfkz7nlzixyz8qbrp1"; - name = "kcron-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kcron-22.12.2.tar.xz"; + sha256 = "1mnb47igwh3kgy75z0ggizj730wajmc2s6kjxbddc6qj33hlrg1k"; + name = "kcron-22.12.2.tar.xz"; }; }; kde-dev-scripts = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kde-dev-scripts-22.08.3.tar.xz"; - sha256 = "08vdygc9bn9b8p033azgwgdx1k09fnyqyxrv0kk6hp051c7h94s4"; - name = "kde-dev-scripts-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kde-dev-scripts-22.12.2.tar.xz"; + sha256 = "1sr8ykj8n2h4hg85zbz5x68m7kq9sb84k1d6wrxy67n3lzsklswj"; + name = "kde-dev-scripts-22.12.2.tar.xz"; }; }; kde-dev-utils = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kde-dev-utils-22.08.3.tar.xz"; - sha256 = "09p6v211s1smnnz2hr0nf4lk0rq6ql5bf1qvbdbrlgyx27j97ybw"; - name = "kde-dev-utils-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kde-dev-utils-22.12.2.tar.xz"; + sha256 = "1vq1mfys07513gprlj1vmxhl5ijj2p2dxx4ddj2iwg0i9qapjr25"; + name = "kde-dev-utils-22.12.2.tar.xz"; }; }; kdebugsettings = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kdebugsettings-22.08.3.tar.xz"; - sha256 = "0hri8bkvpyzr4201sz55ayh4ci3ihkfgd1lay1h5ylfg3gf19fjv"; - name = "kdebugsettings-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdebugsettings-22.12.2.tar.xz"; + sha256 = "07zw0icfvqg3ispalkyc5h13kln6mpfzgkirwkgnplksd059wzyv"; + name = "kdebugsettings-22.12.2.tar.xz"; }; }; kdeconnect-kde = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kdeconnect-kde-22.08.3.tar.xz"; - sha256 = "0ypbw7vbl9ibi2z1z0wwry3z5i7v980xadcargkkgwfjjf5a4aa4"; - name = "kdeconnect-kde-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdeconnect-kde-22.12.2.tar.xz"; + sha256 = "09h0by43jrizq2qcmhcr5jbsvhjkcqrgrblzy9i2r0ihhvlkwg87"; + name = "kdeconnect-kde-22.12.2.tar.xz"; }; }; kdeedu-data = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kdeedu-data-22.08.3.tar.xz"; - sha256 = "1969hy2r8xxzin60gikvr47gmi34h9plzd1v9z3w7xi8wblhy34x"; - name = "kdeedu-data-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdeedu-data-22.12.2.tar.xz"; + sha256 = "1nffvgy2imi1csq9z45v2yf7p7d22k8nh25ciiph2dax9w3qlj81"; + name = "kdeedu-data-22.12.2.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kdegraphics-mobipocket-22.08.3.tar.xz"; - sha256 = "1jjqxhf4bpjvdh0q6pnsqslza1h6wla4g3yq3p3chkapgdylcw4w"; - name = "kdegraphics-mobipocket-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdegraphics-mobipocket-22.12.2.tar.xz"; + sha256 = "1ly3jv64jdzppnipnzr3chm3s8azwfq1pn94pfxm7hj6p6ywn9fn"; + name = "kdegraphics-mobipocket-22.12.2.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kdegraphics-thumbnailers-22.08.3.tar.xz"; - sha256 = "0wxdvs42vmhrr3jqggxxrxdjyjxqwm5r7vyawb3b94njbni9c11x"; - name = "kdegraphics-thumbnailers-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdegraphics-thumbnailers-22.12.2.tar.xz"; + sha256 = "0rzy6icli31fp5z1l3jvnxgwq3fgfijlb3kfi5ci3d8raddyzf6r"; + name = "kdegraphics-thumbnailers-22.12.2.tar.xz"; }; }; kdenetwork-filesharing = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kdenetwork-filesharing-22.08.3.tar.xz"; - sha256 = "03d8qkdsfihvj1s7cqbjppgb2z7w5qs8ax38x934z71gg7nj22a1"; - name = "kdenetwork-filesharing-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdenetwork-filesharing-22.12.2.tar.xz"; + sha256 = "0z94la60pj8qnsnikr7j297mxhbyd4sdjhyccdix1dxdglskzqpy"; + name = "kdenetwork-filesharing-22.12.2.tar.xz"; }; }; kdenlive = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kdenlive-22.08.3.tar.xz"; - sha256 = "0a8f1nj7mhzpvcmb1m5x18y8v0nzsh7rdvq8wyj1v7fr4iyw6p4w"; - name = "kdenlive-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdenlive-22.12.2.tar.xz"; + sha256 = "1g5ylks4i1sfpdhzimyvvw6ljawk19b28242zsk8nz9cn8gbr786"; + name = "kdenlive-22.12.2.tar.xz"; }; }; kdepim-addons = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kdepim-addons-22.08.3.tar.xz"; - sha256 = "0wlf9ykgnh4g4vyi0ny3m3agg3nxjjqar5afz02j2pqw3aqjq0af"; - name = "kdepim-addons-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdepim-addons-22.12.2.tar.xz"; + sha256 = "059p7bb0rkp1ph7cigyld3777ib3i4likhr3rcr9q843ksbws43m"; + name = "kdepim-addons-22.12.2.tar.xz"; }; }; kdepim-runtime = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kdepim-runtime-22.08.3.tar.xz"; - sha256 = "09dgyjqf69i5h7xnqbfgni3pxn9ya6x9qrrvqldzamn74qq004r3"; - name = "kdepim-runtime-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdepim-runtime-22.12.2.tar.xz"; + sha256 = "16j6w6y0c05w9vni6wa633b6g0j3f7z5algn5y2292zqnfa9apzd"; + name = "kdepim-runtime-22.12.2.tar.xz"; }; }; kdesdk-kio = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kdesdk-kio-22.08.3.tar.xz"; - sha256 = "0yfif2shkn2z4by4hxns0q2avldkb39629zxl4m7b7r82rswpi70"; - name = "kdesdk-kio-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdesdk-kio-22.12.2.tar.xz"; + sha256 = "0nahw5747fcyvgzp0axm8cvhjfnlwjwl1q4020whp95nw9pa5yjz"; + name = "kdesdk-kio-22.12.2.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kdesdk-thumbnailers-22.08.3.tar.xz"; - sha256 = "1a50z8bsdr61gwawm6b7mj23jlj8arf56q0yq18x6300fq2sj0fz"; - name = "kdesdk-thumbnailers-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdesdk-thumbnailers-22.12.2.tar.xz"; + sha256 = "1d79xrxwi760sfjfbv6pjp2hp7n77r17lm6dyvn9m3i5gakq2njx"; + name = "kdesdk-thumbnailers-22.12.2.tar.xz"; }; }; kdev-php = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kdev-php-22.08.3.tar.xz"; - sha256 = "1h9ri1znd9cwd4rdxags5mx6cq6kfa0hq68p0081shlwgndyh9xp"; - name = "kdev-php-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdev-php-22.12.2.tar.xz"; + sha256 = "1ds27qf3dbf4m5i8fp5fljx8z41hmhc2915wwm5cqwpyzzmvvx8d"; + name = "kdev-php-22.12.2.tar.xz"; }; }; kdev-python = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kdev-python-22.08.3.tar.xz"; - sha256 = "0w40c15cj6a0jclkp8kl876sy8icx6law2p8rw5bwvbmfdm2z596"; - name = "kdev-python-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdev-python-22.12.2.tar.xz"; + sha256 = "0c348lrysz3hnb12763f92xw7p8asihc8qnry4mznk8plzrg4895"; + name = "kdev-python-22.12.2.tar.xz"; }; }; kdevelop = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kdevelop-22.08.3.tar.xz"; - sha256 = "1mpr444ghi0caz0pjn974mf26lp28cmnqydhnp6dgzyn5whsyfrw"; - name = "kdevelop-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdevelop-22.12.2.tar.xz"; + sha256 = "1jayqbvwx32n6mskdph2mcxf0azzbyc4qc206hfyf2myn5g5xy2p"; + name = "kdevelop-22.12.2.tar.xz"; }; }; kdf = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kdf-22.08.3.tar.xz"; - sha256 = "1ax8r59mnd24avkdf5gxp2krddk74bsvyq39c9wn5a1r6kaxhanv"; - name = "kdf-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdf-22.12.2.tar.xz"; + sha256 = "0vsy1m7lp7lkqg6pmdl5f351rgpcjdizzvihgc1cr6sr1mw4hsmg"; + name = "kdf-22.12.2.tar.xz"; }; }; kdialog = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kdialog-22.08.3.tar.xz"; - sha256 = "12va066njhz1wfhmrx8qy7s4x317k06gf65jl6nn99a6wvk2c4lx"; - name = "kdialog-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdialog-22.12.2.tar.xz"; + sha256 = "1lr6w8j5c38gzlm9qwbchapgn2bc696w7lz4amxb89ixb45miibj"; + name = "kdialog-22.12.2.tar.xz"; }; }; kdiamond = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kdiamond-22.08.3.tar.xz"; - sha256 = "12s4kvfj5xmcbdmmvhlzsw668q7i67i84bmid9klrv6bjsssq327"; - name = "kdiamond-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdiamond-22.12.2.tar.xz"; + sha256 = "14z8gy1yzwx6cqgx5dsrn4wy7vnwg4ynlxpm4zzqnpn0ry1v5ba3"; + name = "kdiamond-22.12.2.tar.xz"; }; }; keditbookmarks = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/keditbookmarks-22.08.3.tar.xz"; - sha256 = "1csvk5hhxxqwd6z2x1dss8brdylm38m16fh82ik7mxlvcgsynpmk"; - name = "keditbookmarks-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/keditbookmarks-22.12.2.tar.xz"; + sha256 = "0cgc6biqar78f7q355fcf1ds8zsbzvl24376s5ahgzm8ffcl3m6x"; + name = "keditbookmarks-22.12.2.tar.xz"; }; }; kfind = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kfind-22.08.3.tar.xz"; - sha256 = "1mssrlsz7ll7d97pw43xg17851405hpxpwamrnp7xmh5dy3pik1z"; - name = "kfind-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kfind-22.12.2.tar.xz"; + sha256 = "0p0bgyrxvjryzsr1fwxccv3gdbkbvsdwsc9plq9hq1z2wd078ps4"; + name = "kfind-22.12.2.tar.xz"; }; }; kfloppy = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kfloppy-22.08.3.tar.xz"; - sha256 = "01dmda10kbvh1i1xvaca7qmiy298l495r6zh0l7nif5sf84w0nl7"; - name = "kfloppy-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kfloppy-22.12.2.tar.xz"; + sha256 = "0bv9xkn8wdm4kxb379alx3l6l2l3k5ainmjgwafgz2hwgn52369m"; + name = "kfloppy-22.12.2.tar.xz"; }; }; kfourinline = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kfourinline-22.08.3.tar.xz"; - sha256 = "1dnvq7mdm7g6w0j1kk55p0x3ncyjkm2h1lkyrfq5vba1154z8njr"; - name = "kfourinline-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kfourinline-22.12.2.tar.xz"; + sha256 = "1cyvpg07y0q8dh1zl7840qkbppx7ndg52v1z95xwcxvggasmgqj6"; + name = "kfourinline-22.12.2.tar.xz"; }; }; kgeography = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kgeography-22.08.3.tar.xz"; - sha256 = "01wgxz54h4hxh63l8r9wvflcmnym175l2b5z5xfzh3pjf8w34rmc"; - name = "kgeography-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kgeography-22.12.2.tar.xz"; + sha256 = "1qcwdg9qkql7ky9m33fx21d1g6585xbm1z2z179sdsnbcpjmx34c"; + name = "kgeography-22.12.2.tar.xz"; }; }; kget = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kget-22.08.3.tar.xz"; - sha256 = "1b21xvxap2br55nh0jnj0s44qalh2ac0l27lsg5awsan14hhklnp"; - name = "kget-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kget-22.12.2.tar.xz"; + sha256 = "00z3h6b5f78cvczapzvbz8q12lr69668n6sryijsv5a2aykimgs7"; + name = "kget-22.12.2.tar.xz"; }; }; kgoldrunner = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kgoldrunner-22.08.3.tar.xz"; - sha256 = "1xsl31sb6g0j4zbb9jg1az80z1wm435gphwjn1bvli3x1rmr214m"; - name = "kgoldrunner-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kgoldrunner-22.12.2.tar.xz"; + sha256 = "134dp60a86p1a9rn8svzn8ia2ji7kan7bv53gnis4vgric97dm2v"; + name = "kgoldrunner-22.12.2.tar.xz"; }; }; kgpg = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kgpg-22.08.3.tar.xz"; - sha256 = "0x10h02ivxkkvk5d59154mx8cs1vcm98mki4xkhxvg77nsi6zfib"; - name = "kgpg-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kgpg-22.12.2.tar.xz"; + sha256 = "02qa3148rkcda21a3n83id1cqkr53y2cilhwlsm52cm5998xr4pd"; + name = "kgpg-22.12.2.tar.xz"; }; }; khangman = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/khangman-22.08.3.tar.xz"; - sha256 = "15wi925nxa59wi7w4kq0acvm1x424xc9cf9rx2dpljg698n7ymag"; - name = "khangman-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/khangman-22.12.2.tar.xz"; + sha256 = "1iw40hmxylhgla3cf40c67vcf1whgag18jkvlprbw9pap47qn6ql"; + name = "khangman-22.12.2.tar.xz"; }; }; khelpcenter = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/khelpcenter-22.08.3.tar.xz"; - sha256 = "004rlvgq46jalg6czxmqlqwp4kg9li8n7xrhjgqcpip8c2dr8q0r"; - name = "khelpcenter-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/khelpcenter-22.12.2.tar.xz"; + sha256 = "1xjmyw92711y5sfdc37q9al6y70css1h914nyn400m93pijl15kp"; + name = "khelpcenter-22.12.2.tar.xz"; }; }; kidentitymanagement = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kidentitymanagement-22.08.3.tar.xz"; - sha256 = "1n8bzm0v9viplg7fj1b5i0rl75amxf2vpv9s0q17gjjjv1xrqgsy"; - name = "kidentitymanagement-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kidentitymanagement-22.12.2.tar.xz"; + sha256 = "08021m509msn4sp7l89lrki0bzqdpnjmix3shg2y86pa7sq3r55h"; + name = "kidentitymanagement-22.12.2.tar.xz"; }; }; kig = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kig-22.08.3.tar.xz"; - sha256 = "13mgc40qfmrp98jv39nnkxvw7g72bim42yafsymlhfk0nv9irkc0"; - name = "kig-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kig-22.12.2.tar.xz"; + sha256 = "0r7wl2vpg38hyvx865kdfx39yjjijnyd4cyriq82vj6h4s60lkfh"; + name = "kig-22.12.2.tar.xz"; }; }; kigo = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kigo-22.08.3.tar.xz"; - sha256 = "0c1zql659qhb0qy9vk973gc96dv4b83sqlli222ccw9i2faqahwc"; - name = "kigo-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kigo-22.12.2.tar.xz"; + sha256 = "1wh929p33iq38yw1836zz1hhaz4wyr0834chx9x6zps0f4qbn6f7"; + name = "kigo-22.12.2.tar.xz"; }; }; killbots = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/killbots-22.08.3.tar.xz"; - sha256 = "007ajm08afvm7lbhd8014lcq4p3xsl85l7ymv31m9p27kqn1ini5"; - name = "killbots-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/killbots-22.12.2.tar.xz"; + sha256 = "1kx4c6gaijfxr7ylazlpr07bbby43fk6x3kgv0n9d9d87fkqwigr"; + name = "killbots-22.12.2.tar.xz"; }; }; kimagemapeditor = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kimagemapeditor-22.08.3.tar.xz"; - sha256 = "056bndyiw059r2vc9895wz06cvivq1bnlwkzaadvfr7rbf0n421f"; - name = "kimagemapeditor-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kimagemapeditor-22.12.2.tar.xz"; + sha256 = "01kmvlir5p3ip7rylvd9j9xg7zdp6b8f8i5b5qn9d5d220p2n59j"; + name = "kimagemapeditor-22.12.2.tar.xz"; }; }; kimap = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kimap-22.08.3.tar.xz"; - sha256 = "1blmsi7z6vw5raclrh355kyj6fmdmr9xgv89r41xpwq5z20dkvaz"; - name = "kimap-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kimap-22.12.2.tar.xz"; + sha256 = "03qxfybh8wp5pyyympqhzndbv0dxfj141wh7imwazgvhq5hxy1ia"; + name = "kimap-22.12.2.tar.xz"; }; }; kio-extras = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kio-extras-22.08.3.tar.xz"; - sha256 = "1svk7a21iwg4y5xxxks0bin6iajmvxg3aysbb6lapi24f10wjdi8"; - name = "kio-extras-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kio-extras-22.12.2.tar.xz"; + sha256 = "1420kwhff103h57ii60z23m9w2nr2yqys23faa39b59kg4bx01na"; + name = "kio-extras-22.12.2.tar.xz"; }; }; kio-gdrive = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kio-gdrive-22.08.3.tar.xz"; - sha256 = "17dn1ps7q7n6cqv7ma9jxv9xz590jhydxmgy307hyd1sb8n8cbrf"; - name = "kio-gdrive-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kio-gdrive-22.12.2.tar.xz"; + sha256 = "00vfrfd9j5qp6g71a4yz0sqckw2rgwd6l16agqkbvb7adiyhwlax"; + name = "kio-gdrive-22.12.2.tar.xz"; }; }; kio-zeroconf = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kio-zeroconf-22.08.3.tar.xz"; - sha256 = "14rl6ifqy48g6pbax9lvx2zamc6qivy0rv26s0q0dc6w5j7y5msp"; - name = "kio-zeroconf-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kio-zeroconf-22.12.2.tar.xz"; + sha256 = "13rbxds754yc7c7pa52am29ynv01dh7v9rl24znnckr674kw532d"; + name = "kio-zeroconf-22.12.2.tar.xz"; }; }; kipi-plugins = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kipi-plugins-22.08.3.tar.xz"; - sha256 = "1y4jbjpmg0bskqj66y3g46hkgc4vnqg0hd5fkzrr8qqbnzi5vnsn"; - name = "kipi-plugins-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kipi-plugins-22.12.2.tar.xz"; + sha256 = "09nk8fg97gjbrv7facdns64i65q0as592wfng8fc1ayr897rlf3i"; + name = "kipi-plugins-22.12.2.tar.xz"; }; }; kirigami-gallery = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kirigami-gallery-22.08.3.tar.xz"; - sha256 = "0sj5d2hc1ks4999a5l9lxxwx7wridw7pr40pr3r0x5wnav3y8vdx"; - name = "kirigami-gallery-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kirigami-gallery-22.12.2.tar.xz"; + sha256 = "0rx9dvimwb9wyxvamcmx2pndzm4gi23nz7lfsdk21vs61swhff03"; + name = "kirigami-gallery-22.12.2.tar.xz"; }; }; kiriki = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kiriki-22.08.3.tar.xz"; - sha256 = "11hf2455mjw0ix8paxk0w8zf9glcmksz7yi4z3c5krzb9954w8zx"; - name = "kiriki-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kiriki-22.12.2.tar.xz"; + sha256 = "1pvadk48qbc1qbzmdvn70zpr4idvabgw4gddccslgpx1kh1mv6lq"; + name = "kiriki-22.12.2.tar.xz"; }; }; kiten = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kiten-22.08.3.tar.xz"; - sha256 = "1lpd31idh1sikmzcnjqk8z22ivw4rb2670blxf1v7gll83ncif2l"; - name = "kiten-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kiten-22.12.2.tar.xz"; + sha256 = "0x7f820r6ql19zrfgmgka4766ni2qp2jrwz3qpz1fidkcxrifnhr"; + name = "kiten-22.12.2.tar.xz"; }; }; kitinerary = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kitinerary-22.08.3.tar.xz"; - sha256 = "0m31x86jw4fdxh9wrlrpqy14w6mfr03c6ksf0kfpysf5iy6gb79b"; - name = "kitinerary-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kitinerary-22.12.2.tar.xz"; + sha256 = "0773yb328msavm0azlmpfq9f3fnajcnwwz1njw1zxrgcmknx002h"; + name = "kitinerary-22.12.2.tar.xz"; }; }; kjumpingcube = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kjumpingcube-22.08.3.tar.xz"; - sha256 = "1q145xcwy845zgrzsnrp2iq1vg5d78n1ygjkkcx79zisg7jl2nxl"; - name = "kjumpingcube-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kjumpingcube-22.12.2.tar.xz"; + sha256 = "07vcf7n61izfzfpmci82v00k2sbqlj9lpir730cxiq4nxh4z7jqx"; + name = "kjumpingcube-22.12.2.tar.xz"; }; }; kldap = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kldap-22.08.3.tar.xz"; - sha256 = "16jdp9mxjbsxhjwbvwi9p9l28cm59v2l54hlgj6ap4qx9i7v5l3l"; - name = "kldap-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kldap-22.12.2.tar.xz"; + sha256 = "08ij0iv5pk2j7zbnf2dwq20jqcxbmbw8gkpyk45bsw4wv840kspc"; + name = "kldap-22.12.2.tar.xz"; }; }; kleopatra = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kleopatra-22.08.3.tar.xz"; - sha256 = "0xgqyxzjpp466pbjawfgqvpyx4hq1h2n84n7794c475zcw5gapp1"; - name = "kleopatra-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kleopatra-22.12.2.tar.xz"; + sha256 = "1rk0jpab600hfkw35zj2zv5bi1avix61xjxfwywzh5ql1kyv0cka"; + name = "kleopatra-22.12.2.tar.xz"; }; }; klettres = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/klettres-22.08.3.tar.xz"; - sha256 = "0k2k93ah435jw708l0d80bmh3lizzr10mzbp4yxmfpjx0wlzyhys"; - name = "klettres-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/klettres-22.12.2.tar.xz"; + sha256 = "1cp8w8fy85ij434nrl6ksivd8dw0nkz3vhwhwmwalrx2pj7h6dpa"; + name = "klettres-22.12.2.tar.xz"; }; }; klickety = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/klickety-22.08.3.tar.xz"; - sha256 = "1qnn1h3jv31jga2s5vs8zlib4w4arngl48hadvbz5ri1vm15didh"; - name = "klickety-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/klickety-22.12.2.tar.xz"; + sha256 = "0zq33801das6l9ph3f20mcx5wfrz10yms11v1dvwnzsjszb4mxb9"; + name = "klickety-22.12.2.tar.xz"; }; }; klines = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/klines-22.08.3.tar.xz"; - sha256 = "03qwfzkpain3lz8jvma8iw4jy92zfs7dv4bxbng2cb58ak7ssdx5"; - name = "klines-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/klines-22.12.2.tar.xz"; + sha256 = "18p7hls5pns5n6asdm4ccm6540qin8n7w4sbmlhrq2qqk07csq3z"; + name = "klines-22.12.2.tar.xz"; }; }; kmag = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kmag-22.08.3.tar.xz"; - sha256 = "09qn77b0c0cijfcxndcb682jlxw8kdg21n74n9yyjysapxc6i48n"; - name = "kmag-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmag-22.12.2.tar.xz"; + sha256 = "11ar70m4b4s2n30rw7b5a0r4bkasraxqcfzfbafyzh2bk51166m6"; + name = "kmag-22.12.2.tar.xz"; }; }; kmahjongg = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kmahjongg-22.08.3.tar.xz"; - sha256 = "175wvjhyici0k6wcz7a4glf1jx6w8nfc13sph1vjaxqcshg0sdi4"; - name = "kmahjongg-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmahjongg-22.12.2.tar.xz"; + sha256 = "1snkxbdsvc0nzqknsgq7cg42imz9ay43ddxxqzf7d47fqsvwac4f"; + name = "kmahjongg-22.12.2.tar.xz"; }; }; kmail = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kmail-22.08.3.tar.xz"; - sha256 = "15hq1dq88crqfjlg1n87hkfddlzc4k37qq289vx83wjp9jjzpqr0"; - name = "kmail-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmail-22.12.2.tar.xz"; + sha256 = "0cj56i27bkxmnl26r20dp7s9qzihp3nlwhznj2nz1xzk6dri6fhb"; + name = "kmail-22.12.2.tar.xz"; }; }; kmail-account-wizard = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kmail-account-wizard-22.08.3.tar.xz"; - sha256 = "08y0c4rqk8giryawglk6x5lk8sn6vj280r9wrpji0x3sg8mdkr97"; - name = "kmail-account-wizard-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmail-account-wizard-22.12.2.tar.xz"; + sha256 = "1ldypandladx520qhbrkasqb775i3ld1jnq8h2cm7549zm8rdjxj"; + name = "kmail-account-wizard-22.12.2.tar.xz"; }; }; kmailtransport = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kmailtransport-22.08.3.tar.xz"; - sha256 = "11z9l1d25hg5fr74jwqrdj2m8a7kcyig6006yxcpzpvg7xzf489p"; - name = "kmailtransport-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmailtransport-22.12.2.tar.xz"; + sha256 = "0x34fhn12prrc4l01yiwar0kvjr8mbyg7p1sjqvq1gz7pjqflyfa"; + name = "kmailtransport-22.12.2.tar.xz"; }; }; kmbox = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kmbox-22.08.3.tar.xz"; - sha256 = "03nrc6zcp2mmzj1mxjskcmz73gm2s9b8w822rg2yrfrwbr64g6wi"; - name = "kmbox-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmbox-22.12.2.tar.xz"; + sha256 = "1xk44ndglf15fipd9hpqviv2j46linj41lprj5x84w9i3lxcflrf"; + name = "kmbox-22.12.2.tar.xz"; }; }; kmime = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kmime-22.08.3.tar.xz"; - sha256 = "0lhk4h3824xncfhqpz7vmbasibhpkmxcimb9f5lvdq17fnfsy8ab"; - name = "kmime-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmime-22.12.2.tar.xz"; + sha256 = "1i3cfdh79wnmkrgidfbvgc3mdn3b8cfchy2zlkj1kbigx06l8cbc"; + name = "kmime-22.12.2.tar.xz"; }; }; kmines = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kmines-22.08.3.tar.xz"; - sha256 = "1dmid2m6w8d68zkc0r2j4v1a3qnlrn2pf4a6zz6k5xyylna1219c"; - name = "kmines-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmines-22.12.2.tar.xz"; + sha256 = "0n2nzx6b0fn9kkqiyavnijjgks7jgfpv4smzqrm55jskwcni9vry"; + name = "kmines-22.12.2.tar.xz"; }; }; kmix = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kmix-22.08.3.tar.xz"; - sha256 = "0sr0pzx5vzkdhi1ncrggsinad0b5yd1zck1nadmkmp8brffkgbra"; - name = "kmix-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmix-22.12.2.tar.xz"; + sha256 = "170rdwm18ld4khy3zck8d2936026cc90r1d37y0f70lw4p37lwpm"; + name = "kmix-22.12.2.tar.xz"; }; }; kmousetool = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kmousetool-22.08.3.tar.xz"; - sha256 = "0jcv784cb07k8jsjdcx9a7zirjpkv6gdkfh40ra2hdmh9wp3l5bd"; - name = "kmousetool-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmousetool-22.12.2.tar.xz"; + sha256 = "0pl0203zl989wjzpqg6rjqhr8k1fw22r7cw3plvbq2sgl1rlk7i2"; + name = "kmousetool-22.12.2.tar.xz"; }; }; kmouth = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kmouth-22.08.3.tar.xz"; - sha256 = "0irbx6k8d1brv8nsi3mwiwhivj4265lsbyhc4xwpqvpdb0xwws7c"; - name = "kmouth-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmouth-22.12.2.tar.xz"; + sha256 = "0cx3lnx9909d630ccv6ln9sahgvpcxrpf56xm77rrrx1a8b7483l"; + name = "kmouth-22.12.2.tar.xz"; }; }; kmplot = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kmplot-22.08.3.tar.xz"; - sha256 = "0s1b3iwqkid545axv18y6v3pkp5zvh9hihr5cxiygclsfbcn5vka"; - name = "kmplot-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmplot-22.12.2.tar.xz"; + sha256 = "0nb937war0ss0r4a2hp99qf4y9ac5cp8xfm0abnibsa9fykj9lsa"; + name = "kmplot-22.12.2.tar.xz"; }; }; knavalbattle = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/knavalbattle-22.08.3.tar.xz"; - sha256 = "1m6vb6y8fy8inv09b28p728308ljfp79r6m3bdp8q7swghcq0252"; - name = "knavalbattle-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/knavalbattle-22.12.2.tar.xz"; + sha256 = "0nkkdzysmhn1a7yadzsd829xpsl3aqmizm5rb8yadspfv2kkf6pb"; + name = "knavalbattle-22.12.2.tar.xz"; }; }; knetwalk = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/knetwalk-22.08.3.tar.xz"; - sha256 = "09r0mbd9ab04j3ylm59y7x6qn7ana1kjnrb3494cch8qdg6w0yvd"; - name = "knetwalk-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/knetwalk-22.12.2.tar.xz"; + sha256 = "1a4gv5pb8j2jfavwz2f0qh022ng84ib4851rfzx2piky6wajpx8f"; + name = "knetwalk-22.12.2.tar.xz"; }; }; knights = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/knights-22.08.3.tar.xz"; - sha256 = "19k0gppis93f0skg4nkmn46zvipw5mplgbdivka45ica6cqxfk3k"; - name = "knights-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/knights-22.12.2.tar.xz"; + sha256 = "1l1igm2fvz9aw2hmpb30cajppdnszhpqya7w980m3snm2br8b45b"; + name = "knights-22.12.2.tar.xz"; }; }; knotes = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/knotes-22.08.3.tar.xz"; - sha256 = "0kvcmm13ib47nq6qm4n2sgzqhrcajy0ihpf7ca5ivcbg094id1zm"; - name = "knotes-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/knotes-22.12.2.tar.xz"; + sha256 = "073az341ycmrls3mv9m0rr1d8jps0yrsp62sawirk6sqy18i4ngw"; + name = "knotes-22.12.2.tar.xz"; }; }; kolf = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kolf-22.08.3.tar.xz"; - sha256 = "0bmnbvk2jzwwqirvlpkx21alcffly8h31s890my2jnb54cvh082d"; - name = "kolf-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kolf-22.12.2.tar.xz"; + sha256 = "08kz6gc6dx0v1ldaa518z1sz1n4dilsik2w8f9rggbl6p1ry53bj"; + name = "kolf-22.12.2.tar.xz"; }; }; kollision = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kollision-22.08.3.tar.xz"; - sha256 = "14sk27lpma80mqg3c9l4gbqqwv2cwkqnmzlqgz8f14i4ykjkzvm0"; - name = "kollision-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kollision-22.12.2.tar.xz"; + sha256 = "0pkz2lv9pwal4dy9y8bi5vwbp8x9z69g3n9vhwbxc4fv9hcqndnm"; + name = "kollision-22.12.2.tar.xz"; }; }; kolourpaint = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kolourpaint-22.08.3.tar.xz"; - sha256 = "03y6x90g81vykdq7jf4n59624ddxjs762x3jinb6kqabgfp8qzil"; - name = "kolourpaint-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kolourpaint-22.12.2.tar.xz"; + sha256 = "07zpc8fxlvm49v53cprz7syj59d73733vi3372gbmzir03q3xcw0"; + name = "kolourpaint-22.12.2.tar.xz"; }; }; kompare = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kompare-22.08.3.tar.xz"; - sha256 = "0y49812irc1jqvx2ahp6frmjsvp2kzlfbfiirdhkskfrsciq61fv"; - name = "kompare-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kompare-22.12.2.tar.xz"; + sha256 = "14hyp72942alzrqzpv7mig3m4sgh4iivsnvnh1yacd9y4y1sdapy"; + name = "kompare-22.12.2.tar.xz"; }; }; konqueror = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/konqueror-22.08.3.tar.xz"; - sha256 = "06gbjax34la6pdq07ryl6kl5his0zd1cx11dvmd4lqi9xy1rlaxj"; - name = "konqueror-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/konqueror-22.12.2.tar.xz"; + sha256 = "1k3vf7sh21iy2v8j8bqxl83nnlpxisj14b6mbi1ldxxgsh6vzyly"; + name = "konqueror-22.12.2.tar.xz"; }; }; konquest = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/konquest-22.08.3.tar.xz"; - sha256 = "1fwjj5xknqv09y4yif2ixzjs2dm79ib7fs3imgkgwzzi3zgcn1jn"; - name = "konquest-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/konquest-22.12.2.tar.xz"; + sha256 = "1haa4zcfsgm25fcr20nvrr5pmy0ynz261q70qj722qh3ljz8cvgy"; + name = "konquest-22.12.2.tar.xz"; }; }; konsole = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/konsole-22.08.3.tar.xz"; - sha256 = "16n0z8h2fcx6r60ls5k39jskq7xjw5ppn4vi822cfljvq16prw56"; - name = "konsole-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/konsole-22.12.2.tar.xz"; + sha256 = "0d9lqq373vxw0fi54ipfll5qi7dz5ylaa7053csnfp26dmmhky9j"; + name = "konsole-22.12.2.tar.xz"; }; }; kontact = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kontact-22.08.3.tar.xz"; - sha256 = "1fsay42vwqv7lzn68scd97nix0bk804k6afnrrq5fzfn6j15kq08"; - name = "kontact-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kontact-22.12.2.tar.xz"; + sha256 = "11l7zd12yfqw66lak5bvacz7fc6ahv5820vkfx8iacynvm43x94f"; + name = "kontact-22.12.2.tar.xz"; }; }; kontactinterface = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kontactinterface-22.08.3.tar.xz"; - sha256 = "04flmnkfplykisl1523yc3b80z0sf5x1q7p3is42mkczqxagyi5x"; - name = "kontactinterface-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kontactinterface-22.12.2.tar.xz"; + sha256 = "0yxpz4az4988yvjxy6za93ayiz8w6q61cqpgi48az2q74kc99qik"; + name = "kontactinterface-22.12.2.tar.xz"; }; }; kontrast = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kontrast-22.08.3.tar.xz"; - sha256 = "05f9lndlg16xcqi6k3c04y87d25nvpgksjk25vvfzsm9jz62dxhv"; - name = "kontrast-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kontrast-22.12.2.tar.xz"; + sha256 = "1x8y26g9iy2hmiyadl3w22c5k3jwh9l59747px1nm7rjzsf11hf7"; + name = "kontrast-22.12.2.tar.xz"; }; }; konversation = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/konversation-22.08.3.tar.xz"; - sha256 = "1wa6dgm5pyvng2b0y5h701x6nhss1amrj6hgsvb7h31cqcj1kmxi"; - name = "konversation-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/konversation-22.12.2.tar.xz"; + sha256 = "1w12ld2xmncz2bmcsf9k5hxmd2djczbm7y8sh86f512km94m8dzg"; + name = "konversation-22.12.2.tar.xz"; }; }; kopeninghours = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kopeninghours-22.08.3.tar.xz"; - sha256 = "02gdzypcyk9rbrj9h3pwgaq6x8qmgyacchlq1w2lxxf33qlx9nr8"; - name = "kopeninghours-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kopeninghours-22.12.2.tar.xz"; + sha256 = "10bc9a0nljj345cgwpw676mcybp4mffzl4d6kfhc3qvcypagbnw7"; + name = "kopeninghours-22.12.2.tar.xz"; }; }; kopete = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kopete-22.08.3.tar.xz"; - sha256 = "0037zps0zppvnwxsk21x2p3iqvs5b037r5bs77nip8qridykf8as"; - name = "kopete-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kopete-22.12.2.tar.xz"; + sha256 = "0ans8fi0x3n8p13qw6ylviv952zf4i1zwa0m0qb0saqq11my0c1d"; + name = "kopete-22.12.2.tar.xz"; }; }; korganizer = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/korganizer-22.08.3.tar.xz"; - sha256 = "0aiwj988i139mv0dk0ygfa7pai7xfxipq8r9wy5g6wgnxq7rn1cl"; - name = "korganizer-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/korganizer-22.12.2.tar.xz"; + sha256 = "0gvplwpvrm0ylx75sig9khwpqz5gq7q7qlyjx37r9apd3jgjxmyd"; + name = "korganizer-22.12.2.tar.xz"; }; }; kosmindoormap = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kosmindoormap-22.08.3.tar.xz"; - sha256 = "1m863pg6visgyib01wcf0b40dpdv1f0vi1gb5x5cgcvyk0ihllcv"; - name = "kosmindoormap-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kosmindoormap-22.12.2.tar.xz"; + sha256 = "1nn5jafz2v262kwf45cgcy4hh8r7sccmzm36kjfinsbcjqci1vfq"; + name = "kosmindoormap-22.12.2.tar.xz"; }; }; kpat = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kpat-22.08.3.tar.xz"; - sha256 = "05jzhfv9qhfml390cg9pscvrrkfdbd72p3k1bdl3r9gf99nzxxxw"; - name = "kpat-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kpat-22.12.2.tar.xz"; + sha256 = "0qm6xizw8978xwysb0n120nqv4b1m5paw0hakw2v2sv5kn10mrns"; + name = "kpat-22.12.2.tar.xz"; }; }; kpimtextedit = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kpimtextedit-22.08.3.tar.xz"; - sha256 = "0f31j38y8d389yyj2yj7gkbr7wm1zbvdcf72a0ipdb7pjrzhs7lg"; - name = "kpimtextedit-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kpimtextedit-22.12.2.tar.xz"; + sha256 = "1g08j89dfw3444chndqmn9jwpr07k279rry10sd45l8rv77kdwdf"; + name = "kpimtextedit-22.12.2.tar.xz"; }; }; kpkpass = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kpkpass-22.08.3.tar.xz"; - sha256 = "1rprcf74d6sc561v2v6gvrb2k2z0jidjg9i7g3hdv8x1cby7gav4"; - name = "kpkpass-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kpkpass-22.12.2.tar.xz"; + sha256 = "1a8jgqyiv721plglvwsn7yj8zwh4rdz33g68qc23ka6g39s05nqn"; + name = "kpkpass-22.12.2.tar.xz"; }; }; kpmcore = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kpmcore-22.08.3.tar.xz"; - sha256 = "0ygwjiqpzcp7y1x46isbhh6nfcn6acml791cxiwq280ynzklkmil"; - name = "kpmcore-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kpmcore-22.12.2.tar.xz"; + sha256 = "1a7clvrqm7mn4qqxq9qba9lbvsj6y717xzdx8cwhkfkv1wwi92xj"; + name = "kpmcore-22.12.2.tar.xz"; }; }; kpublictransport = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kpublictransport-22.08.3.tar.xz"; - sha256 = "1zjdgs06dk44lvilikhpmk741cc3p6bkwxm7fkpqd4pc8jv3yvbz"; - name = "kpublictransport-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kpublictransport-22.12.2.tar.xz"; + sha256 = "1r1hrnc17jkdd73qi9hr2f94f1ca19w1vf4hvc51hnzfmf71blqk"; + name = "kpublictransport-22.12.2.tar.xz"; }; }; kqtquickcharts = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kqtquickcharts-22.08.3.tar.xz"; - sha256 = "1vcgpl50a9rp6sgm0sq77pn1w9gqzmvsabfbdd85v7z5h5bm9ifr"; - name = "kqtquickcharts-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kqtquickcharts-22.12.2.tar.xz"; + sha256 = "0m2zapifyi7lxidnhiwic3gp0sz8b5mvhxkz098zzbyygfs8pzwr"; + name = "kqtquickcharts-22.12.2.tar.xz"; }; }; krdc = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/krdc-22.08.3.tar.xz"; - sha256 = "0h70wgbrn1p64fknw4hx219r9bjcj05bsxc6brsk97vab6mkz7rp"; - name = "krdc-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/krdc-22.12.2.tar.xz"; + sha256 = "1nalhjx4gjr783vbdf9rq5b7ix4af20sxnq446qmkcj923m5rlpy"; + name = "krdc-22.12.2.tar.xz"; }; }; kreversi = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kreversi-22.08.3.tar.xz"; - sha256 = "0glfz7r4bapcr6p3i1rwrv49kljzdrpwr146nvcd8v8a0qc0aw86"; - name = "kreversi-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kreversi-22.12.2.tar.xz"; + sha256 = "0hsf6xkhradd5yy22rj338550h4ls058wzx820qbz3is0l7yh515"; + name = "kreversi-22.12.2.tar.xz"; }; }; krfb = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/krfb-22.08.3.tar.xz"; - sha256 = "1ccpp39x75ggz2hz1fzah9pzmg2bqp2z0gkvk5s3d08952b3lnls"; - name = "krfb-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/krfb-22.12.2.tar.xz"; + sha256 = "1fxzk5xrg57g84pwd23ibzmp587ly1l8i415mn5kiqkrvqb7i82i"; + name = "krfb-22.12.2.tar.xz"; }; }; kross-interpreters = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kross-interpreters-22.08.3.tar.xz"; - sha256 = "0xhly152145x7zhbvnngr753bj5ncwkj2467mpcx3xxddsnkgll9"; - name = "kross-interpreters-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kross-interpreters-22.12.2.tar.xz"; + sha256 = "18i86hh9rcjmmx8j30k5z8k6i56qk6rh1nyz2z8zzlcdmnzcnv36"; + name = "kross-interpreters-22.12.2.tar.xz"; }; }; kruler = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kruler-22.08.3.tar.xz"; - sha256 = "1s28hcacmsiab1g5zw33ncs2kn9kjsf3qjj2866azhjks1wpjzkz"; - name = "kruler-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kruler-22.12.2.tar.xz"; + sha256 = "0pspihnp7bbmb26jzj6d616j8xmly65cs1h4w6mj5727pnprb4hf"; + name = "kruler-22.12.2.tar.xz"; }; }; ksanecore = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ksanecore-22.08.3.tar.xz"; - sha256 = "1mq35m78dqxbswavhpn91nxbqjihxfvgnv6mc23sjvxmyy6khnqq"; - name = "ksanecore-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksanecore-22.12.2.tar.xz"; + sha256 = "133j2q1dm3lxyq10aflaxbjaprzcg875hpfk59z0214cfgnln6hy"; + name = "ksanecore-22.12.2.tar.xz"; }; }; kshisen = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kshisen-22.08.3.tar.xz"; - sha256 = "17adlx753qiglbvcsg5ik4ap24mvrm0mypkp8a3yq6h580n8lv57"; - name = "kshisen-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kshisen-22.12.2.tar.xz"; + sha256 = "0siqribywssqkzjglb3vzizibjzxv8rgizjqbzxsf9frvm9pwc8d"; + name = "kshisen-22.12.2.tar.xz"; }; }; ksirk = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ksirk-22.08.3.tar.xz"; - sha256 = "0aj2m3icy8sba9cbzl31pxhbhwvkcyd4kczkvxc4q1q70sd5da2s"; - name = "ksirk-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksirk-22.12.2.tar.xz"; + sha256 = "0i79iiaxqy0w2ikqx503vkdpf6ipwvhkcghhy8rmcqhvc8d1mglq"; + name = "ksirk-22.12.2.tar.xz"; }; }; ksmtp = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ksmtp-22.08.3.tar.xz"; - sha256 = "0knw35ai0qi252qpx92zq15ihgb2n5kq6dg6k17wnrzp03nnbslv"; - name = "ksmtp-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksmtp-22.12.2.tar.xz"; + sha256 = "0d04n4i18zglmmdghbzqg75h7qpi19562mgch9aff7jdavx4w582"; + name = "ksmtp-22.12.2.tar.xz"; }; }; ksnakeduel = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ksnakeduel-22.08.3.tar.xz"; - sha256 = "04j31cmb8g1q090dz84bhfqc789srqad902fz5f9zp2gl2rbvnrz"; - name = "ksnakeduel-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksnakeduel-22.12.2.tar.xz"; + sha256 = "08wcqi4cwsb2icf40skkkzhvvpr2gshmjaa33al23b4fmmjbfxyq"; + name = "ksnakeduel-22.12.2.tar.xz"; }; }; kspaceduel = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kspaceduel-22.08.3.tar.xz"; - sha256 = "10zrrblp9xzb7ldpknv3zsz7fr9qjv8317wxw6aihb2m3gb6c0hk"; - name = "kspaceduel-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kspaceduel-22.12.2.tar.xz"; + sha256 = "0ky59mrph08gpqs2yb6ykxb527qfaj6qgz5hs417a0bripjrznrm"; + name = "kspaceduel-22.12.2.tar.xz"; }; }; ksquares = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ksquares-22.08.3.tar.xz"; - sha256 = "0whwdkil3vqzrni0pqnh7x5dsqsd3i22m3xcv1adw1j3r5r8z05h"; - name = "ksquares-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksquares-22.12.2.tar.xz"; + sha256 = "1dxnhqr671mb2drzz1ybvg5iqm2sy3b6vmal0xyfda29zfs1pvia"; + name = "ksquares-22.12.2.tar.xz"; }; }; ksudoku = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ksudoku-22.08.3.tar.xz"; - sha256 = "0z8f0hyr60sps2zkbgsfqwyj8ksf7q5zvacjzbdpysg09h9fqyf7"; - name = "ksudoku-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksudoku-22.12.2.tar.xz"; + sha256 = "13s44cq0bz0r914ybll8p2f5jr9nfdvz4jx0inc2wzx58rcf6xw9"; + name = "ksudoku-22.12.2.tar.xz"; }; }; ksystemlog = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ksystemlog-22.08.3.tar.xz"; - sha256 = "0klsnnc7aljbx5drwv2nf3sd6w32k1dzlmnmpyi62cckvdcq0y3z"; - name = "ksystemlog-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksystemlog-22.12.2.tar.xz"; + sha256 = "10ax7x6qy7wnnf4pjazjqw43dp8y8lycibqv3sxqqykwkvvfhmyi"; + name = "ksystemlog-22.12.2.tar.xz"; }; }; kteatime = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kteatime-22.08.3.tar.xz"; - sha256 = "1magsihwm6mnrpwks29kg2s057fcakj22j5xj1d02dh49ch46rx7"; - name = "kteatime-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kteatime-22.12.2.tar.xz"; + sha256 = "1pa58lmp7gv8vm34b1pypv4m5rw8xlw6iydbsq0j6g2xlwjypx6f"; + name = "kteatime-22.12.2.tar.xz"; }; }; ktimer = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ktimer-22.08.3.tar.xz"; - sha256 = "0lyblql9dzmcm5bhj3y7bir4hrcr3289brxzj2ii7dqm3x0fxyq0"; - name = "ktimer-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktimer-22.12.2.tar.xz"; + sha256 = "1hmg5hni3yqyrz7p1nm54gr14p2iz7q9yr803sh8k5f60xmr58j4"; + name = "ktimer-22.12.2.tar.xz"; }; }; ktnef = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ktnef-22.08.3.tar.xz"; - sha256 = "1zqk83pzb6ix10xi453ccbx0y2cvyhwqyz1jbzrcyasl3y6s4ldw"; - name = "ktnef-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktnef-22.12.2.tar.xz"; + sha256 = "03rjdpavqvhipla84lr9x9fq5jmx7zvfnngzldn94acra2806sbj"; + name = "ktnef-22.12.2.tar.xz"; }; }; ktorrent = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ktorrent-22.08.3.tar.xz"; - sha256 = "1ddmx4v1fayb7vp3ic7wab4jj18jw5lq4gm4rbr3wmicsl6k0cjr"; - name = "ktorrent-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktorrent-22.12.2.tar.xz"; + sha256 = "008676q9v9psyb0jdkmbj7zbmp6y1mjn3ihbx4zmxv3swzd95dgz"; + name = "ktorrent-22.12.2.tar.xz"; }; }; ktouch = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ktouch-22.08.3.tar.xz"; - sha256 = "1f1c66gxjv3g3vj6ld6c8qmdnbf3mdxdd5s2dqyjc9yq6ql5g6qd"; - name = "ktouch-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktouch-22.12.2.tar.xz"; + sha256 = "1f50wm5xqdyk5v15k144dq15schb3l5xfpawqv38n0r16jj3ql1b"; + name = "ktouch-22.12.2.tar.xz"; }; }; ktp-accounts-kcm = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ktp-accounts-kcm-22.08.3.tar.xz"; - sha256 = "17prcf1irr8x62pcbzzfq8hl3l3k93wnaiva67wzr9mlh9b1a0cj"; - name = "ktp-accounts-kcm-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-accounts-kcm-22.12.2.tar.xz"; + sha256 = "1lcchdhxj9xba2l8sqv6xhan1559asncy753idy95lzbk10algqf"; + name = "ktp-accounts-kcm-22.12.2.tar.xz"; }; }; ktp-approver = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ktp-approver-22.08.3.tar.xz"; - sha256 = "1b2aqwmdbmsygg4qxdfwxfb94n09hlfpisck31wj5l67vy8hr3lg"; - name = "ktp-approver-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-approver-22.12.2.tar.xz"; + sha256 = "1696p98aarmi8lf9n4pzv6rhpbdzn6gs5ci5ms2ypazv1a6jsi3v"; + name = "ktp-approver-22.12.2.tar.xz"; }; }; ktp-auth-handler = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ktp-auth-handler-22.08.3.tar.xz"; - sha256 = "080anm0v8f1y1zyf6h7ym59g2vdlgvh8bq1l4riid1rg434hqhw3"; - name = "ktp-auth-handler-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-auth-handler-22.12.2.tar.xz"; + sha256 = "033g8ail8qkv34g1h2ns9wyp64qmz59v1180n83bc9k3jzsnrk2q"; + name = "ktp-auth-handler-22.12.2.tar.xz"; }; }; ktp-call-ui = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ktp-call-ui-22.08.3.tar.xz"; - sha256 = "1rmn7hz6b9wh5v2zfnkbjmg3klaldy6fc9m0pigd1g3cqlij5lmv"; - name = "ktp-call-ui-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-call-ui-22.12.2.tar.xz"; + sha256 = "030rzda1l5vir1hcahdirh5n3d49c74m1ijag3cxjip7mv39q7mq"; + name = "ktp-call-ui-22.12.2.tar.xz"; }; }; ktp-common-internals = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ktp-common-internals-22.08.3.tar.xz"; - sha256 = "1g2xyvdlcfba8pj575x1g3pjkz025lb8pqc418k5knw25mq0nyff"; - name = "ktp-common-internals-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-common-internals-22.12.2.tar.xz"; + sha256 = "1d9kzlbf28gprncw98ldwd32cvi4gpi5njb281z5fn1z8m2q6qxl"; + name = "ktp-common-internals-22.12.2.tar.xz"; }; }; ktp-contact-list = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ktp-contact-list-22.08.3.tar.xz"; - sha256 = "04d36hg052kiw5v58654bdhrpms1vrljq8wp05ii0ncl1ld9z24v"; - name = "ktp-contact-list-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-contact-list-22.12.2.tar.xz"; + sha256 = "1xwx74870gqgamb5j6mnngc9l4vyjplnhi7bjf0ik7srg1lq4f34"; + name = "ktp-contact-list-22.12.2.tar.xz"; }; }; ktp-contact-runner = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ktp-contact-runner-22.08.3.tar.xz"; - sha256 = "03xi68f1kx8x7l7fi1h9437v7zxbzb4yvmfypq1zdzp0jxwm62fs"; - name = "ktp-contact-runner-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-contact-runner-22.12.2.tar.xz"; + sha256 = "13j9vjdscdm5ljkqi4hy2kghz5w2r6lha78chyyzg3yjdrwayqp5"; + name = "ktp-contact-runner-22.12.2.tar.xz"; }; }; ktp-desktop-applets = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ktp-desktop-applets-22.08.3.tar.xz"; - sha256 = "0ji932mgszm7d5wq4r9mig62v1i7swf85yah31zck8mhnmb9867g"; - name = "ktp-desktop-applets-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-desktop-applets-22.12.2.tar.xz"; + sha256 = "1dxb0n8lq9d31yqrhx5jrqxj9j69x5qq5yq89lfipjz3xmqvws84"; + name = "ktp-desktop-applets-22.12.2.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ktp-filetransfer-handler-22.08.3.tar.xz"; - sha256 = "0kyqszi3n72p2iczfp0g1arf99cp1i6pf943gm7vzj7g012jql00"; - name = "ktp-filetransfer-handler-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-filetransfer-handler-22.12.2.tar.xz"; + sha256 = "0dqp2rzld67qlxxj85bi331jn8m6rc7mdd851h3396j6cz6g8bm5"; + name = "ktp-filetransfer-handler-22.12.2.tar.xz"; }; }; ktp-kded-module = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ktp-kded-module-22.08.3.tar.xz"; - sha256 = "0y4l7qdy571dlk8lvp4c0ar74p8f8msvaxwvz9p60rvxkq8j4z1n"; - name = "ktp-kded-module-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-kded-module-22.12.2.tar.xz"; + sha256 = "0bpvmf9a9hkiz5f482fnc4qf0imys82ax5iz0rz32blp5j8cydil"; + name = "ktp-kded-module-22.12.2.tar.xz"; }; }; ktp-send-file = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ktp-send-file-22.08.3.tar.xz"; - sha256 = "11dsifls2n20gadhqb611lb5r4zc40qj4q753kafv7zxsb7ia3xw"; - name = "ktp-send-file-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-send-file-22.12.2.tar.xz"; + sha256 = "0alfkv94s2zxxsxcm67dxvw3j9r5qj8wcn5w40wrp8qw93wigddy"; + name = "ktp-send-file-22.12.2.tar.xz"; }; }; ktp-text-ui = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ktp-text-ui-22.08.3.tar.xz"; - sha256 = "0y816fgx5g2d1wgm1sm1qix3a7pcqsqwf6a9plpcgdpkb6ddvgl7"; - name = "ktp-text-ui-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-text-ui-22.12.2.tar.xz"; + sha256 = "0ryvi9qsi9bh6c1jjpq69bpgzshp3qi1ap7m9xar8icjbih3nllh"; + name = "ktp-text-ui-22.12.2.tar.xz"; }; }; ktuberling = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/ktuberling-22.08.3.tar.xz"; - sha256 = "04vp3y0jm45m4kdi0mvkg8g653wbjg4csfr31cd5khkaj72rnl1s"; - name = "ktuberling-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktuberling-22.12.2.tar.xz"; + sha256 = "13ks4ai28mb3fhjz2nvlwpb1997pp95l7bdw851i9d3lp2rr8bgn"; + name = "ktuberling-22.12.2.tar.xz"; }; }; kturtle = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kturtle-22.08.3.tar.xz"; - sha256 = "0xl4gg4n1qz3v7yfkd754n7sbjkwx6s28iba6k0cqvfcnfinlg42"; - name = "kturtle-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kturtle-22.12.2.tar.xz"; + sha256 = "18zcq2y48l7nzg20bv8kx370s4rfwl6xix452p6bhbbik7msfr85"; + name = "kturtle-22.12.2.tar.xz"; }; }; kubrick = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kubrick-22.08.3.tar.xz"; - sha256 = "07vj9sb49kf8sggi07rh83svvwfvmnac5pb5dwhrmfcjbvlfks27"; - name = "kubrick-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kubrick-22.12.2.tar.xz"; + sha256 = "02npa6jlzy73zn10kl6nnglagwpzbynk3m6q4a92897xmlzsx537"; + name = "kubrick-22.12.2.tar.xz"; }; }; kwalletmanager = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kwalletmanager-22.08.3.tar.xz"; - sha256 = "008avscsl60qwk5l669i1qk7qvvhpnagdyqa494lqikdj5dp8mpf"; - name = "kwalletmanager-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kwalletmanager-22.12.2.tar.xz"; + sha256 = "1khbxnzciyi4l5dv6xkk5pjw1qk2wbn6l5n8v01azwkllh7wps4q"; + name = "kwalletmanager-22.12.2.tar.xz"; }; }; kwave = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kwave-22.08.3.tar.xz"; - sha256 = "1f2v8vrzd2nrxd3jf9sjwfj2l2m9rdx4036nhd9vpbspx1xsx9mb"; - name = "kwave-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kwave-22.12.2.tar.xz"; + sha256 = "0fz23sxn7yp5qvahyjp3ifl7fp7wm18jv20p0fiaq6xsj1q6nf2r"; + name = "kwave-22.12.2.tar.xz"; }; }; kwordquiz = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/kwordquiz-22.08.3.tar.xz"; - sha256 = "0zb71dywq342z1rz7hxip1f9330rx2bxwia1k5h3krw4kc546872"; - name = "kwordquiz-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kwordquiz-22.12.2.tar.xz"; + sha256 = "0jadvh00pxjy9bzs2kvn3raywl569rva1n9pa3v0jjgpaa6pkck8"; + name = "kwordquiz-22.12.2.tar.xz"; }; }; libgravatar = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/libgravatar-22.08.3.tar.xz"; - sha256 = "0r9dvyfmdyckpjaa9jnqrnllrkxpsq9x7w6kk2fmxdmi8mnclcfm"; - name = "libgravatar-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libgravatar-22.12.2.tar.xz"; + sha256 = "1paxv6x8sqzm8xhhnv7f2llk3vyyg9nir2fkdly1gi6b9nl1649q"; + name = "libgravatar-22.12.2.tar.xz"; }; }; libkcddb = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/libkcddb-22.08.3.tar.xz"; - sha256 = "01blqihx344cjyxzkbl3lhfhls5wvnqfq04xfyd39s58ljdd2031"; - name = "libkcddb-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkcddb-22.12.2.tar.xz"; + sha256 = "1z04y7ybyfpdzapa0i27w5ryymqfbk7p96ifkhmzf79xvl04g805"; + name = "libkcddb-22.12.2.tar.xz"; }; }; libkcompactdisc = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/libkcompactdisc-22.08.3.tar.xz"; - sha256 = "0fd4v1zfzkmvimli878mrmpd4vy7rrz4b12v7gq45micrkrch4b6"; - name = "libkcompactdisc-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkcompactdisc-22.12.2.tar.xz"; + sha256 = "169hbqyxy7nhddv3428ynv487fga2yz1m89cj9gjyhpj07pv3df4"; + name = "libkcompactdisc-22.12.2.tar.xz"; }; }; libkdcraw = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/libkdcraw-22.08.3.tar.xz"; - sha256 = "1q4zv1i3bfln0ka3jw3ldahvazn5yhhbsk7ynhg3ik2bgacbk54d"; - name = "libkdcraw-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkdcraw-22.12.2.tar.xz"; + sha256 = "11pnbbavviiryyia0ciyfrdhby4f76j988jd91s2hbg2pwh0l1hz"; + name = "libkdcraw-22.12.2.tar.xz"; }; }; libkdegames = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/libkdegames-22.08.3.tar.xz"; - sha256 = "15x068bqw7xaw294z0ly6k1bd7wx55aymrzc07cn9x1hamflvksc"; - name = "libkdegames-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkdegames-22.12.2.tar.xz"; + sha256 = "1x5bi4r6lsxrc68swvrapmszb1hi041aim5pkkp96mka3s97ybrz"; + name = "libkdegames-22.12.2.tar.xz"; }; }; libkdepim = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/libkdepim-22.08.3.tar.xz"; - sha256 = "07lfc73v3d00k1cwrc7xfmknmk37zvjpy0bq7n93hjs46v9gibwc"; - name = "libkdepim-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkdepim-22.12.2.tar.xz"; + sha256 = "1c3bry6z9qi3fhybv018rbrwy4an5km94gygb5jyrkfgpdy94w7h"; + name = "libkdepim-22.12.2.tar.xz"; }; }; libkeduvocdocument = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/libkeduvocdocument-22.08.3.tar.xz"; - sha256 = "161yrwp140gzf3m1nxhz23jpvfy44p7pyvm4gjy671zi5rk65wr3"; - name = "libkeduvocdocument-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkeduvocdocument-22.12.2.tar.xz"; + sha256 = "1ndzfyf7fn0saska59gvwhidq81arxnxx28ji66fdy7kvbr4a1bg"; + name = "libkeduvocdocument-22.12.2.tar.xz"; }; }; libkexiv2 = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/libkexiv2-22.08.3.tar.xz"; - sha256 = "1ldgv28y41987w8lqrh3cvfp1iq1j45bijaf5250grjimc2dgbwd"; - name = "libkexiv2-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkexiv2-22.12.2.tar.xz"; + sha256 = "0034lcsgcfdlkmz6vghxbbsvw3cr32hv6vh9hffz033j2035vc8l"; + name = "libkexiv2-22.12.2.tar.xz"; }; }; libkgapi = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/libkgapi-22.08.3.tar.xz"; - sha256 = "15r1wnbr6f89q661049w9wpkyxhnahknwk3izzpf22j6z9a1a5sd"; - name = "libkgapi-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkgapi-22.12.2.tar.xz"; + sha256 = "1n418dsic6jshqahby5drcngd72z6wg23fa9f1wi3h64z76qdddz"; + name = "libkgapi-22.12.2.tar.xz"; }; }; libkipi = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/libkipi-22.08.3.tar.xz"; - sha256 = "11ivz96q9zas8xlckcxpz11ra9pwy1hscq6ggqdwwy4yhs37p0wf"; - name = "libkipi-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkipi-22.12.2.tar.xz"; + sha256 = "05vrh94vhklyq7bvpfd9wj54hs48zhbn2z17ln75snvzans7mjq9"; + name = "libkipi-22.12.2.tar.xz"; }; }; libkleo = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/libkleo-22.08.3.tar.xz"; - sha256 = "056kgqn4r3k774h2ynkyg97byai1kvy7rgz1mp415c2di7qjwhl3"; - name = "libkleo-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkleo-22.12.2.tar.xz"; + sha256 = "10w14qvflqc9cx5wrgapgyidnj43ik6dl6s36y2k2qw691a3jrrx"; + name = "libkleo-22.12.2.tar.xz"; }; }; libkmahjongg = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/libkmahjongg-22.08.3.tar.xz"; - sha256 = "0v2bcanldr0ahv747allzjjqac7d9nc51yyj3d1rzsrdpw78zr0y"; - name = "libkmahjongg-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkmahjongg-22.12.2.tar.xz"; + sha256 = "0h09d2zb2lihwvr18vl77k5bl64zrpp5wn2nlf1czwkafna83pzy"; + name = "libkmahjongg-22.12.2.tar.xz"; }; }; libkomparediff2 = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/libkomparediff2-22.08.3.tar.xz"; - sha256 = "0c4zmwh9ycnh3v6qbdvn6s3m43jcc38n59dzdyh96kqq42vsnldx"; - name = "libkomparediff2-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkomparediff2-22.12.2.tar.xz"; + sha256 = "1gwc1dga01f8s2gapngw6zrvns3ks5sdkga0hmv5hrxi2zyx7vm3"; + name = "libkomparediff2-22.12.2.tar.xz"; }; }; libksane = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/libksane-22.08.3.tar.xz"; - sha256 = "12rfs8m1may1896mfhb7a8jiqsjpvsi7w6chp7dc0y9d69g9bsgr"; - name = "libksane-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libksane-22.12.2.tar.xz"; + sha256 = "0xj7vc2hnzgg0z14nh1z5ik4fqkszxjvvjh68qn64xrsf57g4994"; + name = "libksane-22.12.2.tar.xz"; }; }; libksieve = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/libksieve-22.08.3.tar.xz"; - sha256 = "10466zagivfh59n8gn7ah6kq2axkbz3864sjr9ws95ghcrh0vyz0"; - name = "libksieve-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libksieve-22.12.2.tar.xz"; + sha256 = "16507jn2zzvcg4a4ka870q716m696j1sbjfgnsh46vdy71zkxnrr"; + name = "libksieve-22.12.2.tar.xz"; }; }; libktorrent = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/libktorrent-22.08.3.tar.xz"; - sha256 = "0dhsmlmz8kvsnmkmnkfhpzzd8i5gvg3glhyzmyan985a9rnzg9hz"; - name = "libktorrent-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libktorrent-22.12.2.tar.xz"; + sha256 = "15npc4n6p5s9z472ww3j8hxbmnvsdjp032zl4004794gwi7iph0r"; + name = "libktorrent-22.12.2.tar.xz"; }; }; lokalize = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/lokalize-22.08.3.tar.xz"; - sha256 = "1va0ic5s6f4nwylz3ll2966dmz1cxd4wq90fcqfdivj2ir162y2p"; - name = "lokalize-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/lokalize-22.12.2.tar.xz"; + sha256 = "1fmi1szwif5absg3czzjzh28nwa6k9j332gsi39c9jrznrkfsmyr"; + name = "lokalize-22.12.2.tar.xz"; }; }; lskat = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/lskat-22.08.3.tar.xz"; - sha256 = "07374x7hqzhdx7f146nvisqz1jwk655j3di58prnwhf6scxb49yn"; - name = "lskat-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/lskat-22.12.2.tar.xz"; + sha256 = "1199glblbi2hbkyr2bd67v7ybsd9qpbmj9nbyswdis9gmk4jd0fp"; + name = "lskat-22.12.2.tar.xz"; }; }; mailcommon = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/mailcommon-22.08.3.tar.xz"; - sha256 = "1zkgizr9pw1nz9m67svnp5z1rhmwajn9cag52z7f50zvm4i4xic8"; - name = "mailcommon-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/mailcommon-22.12.2.tar.xz"; + sha256 = "171p4s5mfsa9lib6yk4jinircsz4rgry1x517ixxp8j5y7gm06b7"; + name = "mailcommon-22.12.2.tar.xz"; }; }; mailimporter = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/mailimporter-22.08.3.tar.xz"; - sha256 = "1564icsvqxksdlr2rxd1hyikmmqv1lci12g4n86p3x22srar99mr"; - name = "mailimporter-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/mailimporter-22.12.2.tar.xz"; + sha256 = "1mvbvj7h476a3s2nxgzwbpsv48l53h6gvlkwa9lpj0llsl3xzc4z"; + name = "mailimporter-22.12.2.tar.xz"; }; }; marble = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/marble-22.08.3.tar.xz"; - sha256 = "02znm95zxsylqqllns3idacjgzg6lys5dyqg6jv427j0m7ypfxsv"; - name = "marble-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/marble-22.12.2.tar.xz"; + sha256 = "0fnsxpa75h2s5ak5ydv6v1wpsdxgkq7aqa2ywb65fl2w7knnm6pd"; + name = "marble-22.12.2.tar.xz"; }; }; markdownpart = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/markdownpart-22.08.3.tar.xz"; - sha256 = "14hf1m3dhkhi57cfvq90fakl4y53pndy7pnxyab5xvw75n5ghvrm"; - name = "markdownpart-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/markdownpart-22.12.2.tar.xz"; + sha256 = "1w1p8q7rzbmw6q16nawiz2pzi1hgz3bsw6gzccwlpz76gsqrlfpy"; + name = "markdownpart-22.12.2.tar.xz"; }; }; mbox-importer = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/mbox-importer-22.08.3.tar.xz"; - sha256 = "03zqr5f8x1rikpbh6f19fjjzgab7bn24virgnm00mkhf0lgxa2mh"; - name = "mbox-importer-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/mbox-importer-22.12.2.tar.xz"; + sha256 = "00lccs9jm02j2rr5ia8wamx6y220z8ix5mjn8c3i6gampybv0446"; + name = "mbox-importer-22.12.2.tar.xz"; }; }; messagelib = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/messagelib-22.08.3.tar.xz"; - sha256 = "155l9warjalmvzc8224qv2v6whsinqjdqyyahxl0fvrkqzbwns27"; - name = "messagelib-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/messagelib-22.12.2.tar.xz"; + sha256 = "11c199q82w16nkx9mwswzg83lj4mv06vnv9dm4gqsg5rk7vf3jsz"; + name = "messagelib-22.12.2.tar.xz"; }; }; minuet = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/minuet-22.08.3.tar.xz"; - sha256 = "0wwdva797v2zms9l9php9vbsp5r3kmgp0kdgqpdiak4crh64mcz5"; - name = "minuet-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/minuet-22.12.2.tar.xz"; + sha256 = "1j9n7wqmvw27zwmk0ayl7jlr2i9wmd25b84m7pa9vhm34kgi1cc3"; + name = "minuet-22.12.2.tar.xz"; }; }; okular = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/okular-22.08.3.tar.xz"; - sha256 = "17lifjvrhyyq9zfnj7fjxv7y7m1m1ci3srnbpqc4v4bf5plamfs2"; - name = "okular-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/okular-22.12.2.tar.xz"; + sha256 = "0l0iakc8zyj8xnv70hwf9kp1h0ayai7hffwi06p6v6nk5f0wnbjw"; + name = "okular-22.12.2.tar.xz"; }; }; palapeli = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/palapeli-22.08.3.tar.xz"; - sha256 = "064vhgx09cvxj93bpl1c7nkd6b8jn97bp0z0gnz2b7aiwp2kflrg"; - name = "palapeli-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/palapeli-22.12.2.tar.xz"; + sha256 = "19s05d7v1x06ywcdfz5ch61nm4igj1493h9v3vkvp9ky4q6asspi"; + name = "palapeli-22.12.2.tar.xz"; }; }; parley = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/parley-22.08.3.tar.xz"; - sha256 = "1h9xjr3bar5i4k1hxziihmpx114lr0961f0rvi3h0fq1s91nv1kv"; - name = "parley-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/parley-22.12.2.tar.xz"; + sha256 = "0sdls4f31k99p3ls3ibg0qqcrgq6c3lf8wmllcj4xaps84y1ar5k"; + name = "parley-22.12.2.tar.xz"; }; }; partitionmanager = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/partitionmanager-22.08.3.tar.xz"; - sha256 = "1cxba47clq6igik8gdll1w5npb0z93kr2li9fx28xvn1bwlyq97r"; - name = "partitionmanager-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/partitionmanager-22.12.2.tar.xz"; + sha256 = "1l3nkk4jbzz4kmv1ibyzji5milnjjnpbq9xblazd8y52knqlaqk0"; + name = "partitionmanager-22.12.2.tar.xz"; }; }; picmi = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/picmi-22.08.3.tar.xz"; - sha256 = "1p77axcciqgwj9yirwqzj7dlyxmxa4x033im41w6llq113vzlbvh"; - name = "picmi-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/picmi-22.12.2.tar.xz"; + sha256 = "0dhqln0y366jrf5xs9q6ml8cc4rzi3brcaww96i4zhs707xiv8bb"; + name = "picmi-22.12.2.tar.xz"; }; }; pim-data-exporter = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/pim-data-exporter-22.08.3.tar.xz"; - sha256 = "1qsq4ysjmyxzd518hxficksdgn55ffmmqzd2z54fmc3nmqlzdlvv"; - name = "pim-data-exporter-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/pim-data-exporter-22.12.2.tar.xz"; + sha256 = "11qxbvrdcfhfbvnnc7f5v6vmfx04vkavwam60q39bvm5y1qyhnq3"; + name = "pim-data-exporter-22.12.2.tar.xz"; }; }; pim-sieve-editor = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/pim-sieve-editor-22.08.3.tar.xz"; - sha256 = "10g6rxxk6ba2xdriajim0dlxl12qrk1lgca3c5247fj521xaqadh"; - name = "pim-sieve-editor-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/pim-sieve-editor-22.12.2.tar.xz"; + sha256 = "0d2hsrp53wv1vzrijnqzx1faz1aqfdkx020v6l132haywz1f44jh"; + name = "pim-sieve-editor-22.12.2.tar.xz"; }; }; pimcommon = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/pimcommon-22.08.3.tar.xz"; - sha256 = "10x6l1kcqp2m53s60hb3v1q5jirwjimgdafprac1243nnz6fw2g4"; - name = "pimcommon-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/pimcommon-22.12.2.tar.xz"; + sha256 = "1d2m256kd8lyv165jvswqw91wkkhxgpxf73hfw1rlwzvdlpyy5qd"; + name = "pimcommon-22.12.2.tar.xz"; }; }; poxml = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/poxml-22.08.3.tar.xz"; - sha256 = "08mk5ls7zar6vkmw34pr4cvni2p6vapq2xyc17y5ddv00083yzxn"; - name = "poxml-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/poxml-22.12.2.tar.xz"; + sha256 = "0n3y1208ffya4p1lbbyj2g2g1mcw63h27wihxijax3iyp6lv6wwx"; + name = "poxml-22.12.2.tar.xz"; }; }; print-manager = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/print-manager-22.08.3.tar.xz"; - sha256 = "1yvvckqy9w9xff2zqxyi6nrx3m1w8cjkl2wh58r5nm6wx5x6xm1p"; - name = "print-manager-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/print-manager-22.12.2.tar.xz"; + sha256 = "1w1jrqvw10brn7gcpkzcq5618wcjbl9lqplr9nw5h2ag31b8gzhs"; + name = "print-manager-22.12.2.tar.xz"; }; }; rocs = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/rocs-22.08.3.tar.xz"; - sha256 = "1479014i0yal6j65djys7jwm9ixg0kim351yhbsci64islpbq7v6"; - name = "rocs-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/rocs-22.12.2.tar.xz"; + sha256 = "0xjxb1hgcyglnycywgq529sh5722chdngmby5cm4bhcjnmysr3vh"; + name = "rocs-22.12.2.tar.xz"; }; }; signon-kwallet-extension = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/signon-kwallet-extension-22.08.3.tar.xz"; - sha256 = "1c7jk0j1sqv5s4c5pka4qjskkzbapk2ry8nys5sfmv9fdlkihhsg"; - name = "signon-kwallet-extension-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/signon-kwallet-extension-22.12.2.tar.xz"; + sha256 = "1b7dhmpycdvvz269kphbddk9xrbhnq3d51mjxvp4aahziyqvjhr2"; + name = "signon-kwallet-extension-22.12.2.tar.xz"; }; }; skanlite = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/skanlite-22.08.3.tar.xz"; - sha256 = "0binx6ynnp78r1vilsn0pdf7icyb5xsl4wmw8lhmq7ynb1prndd0"; - name = "skanlite-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/skanlite-22.12.2.tar.xz"; + sha256 = "17jjx74syb2j7lrqjwfpym3wlk9cq5adgpf539k4zkszxhcqd4i0"; + name = "skanlite-22.12.2.tar.xz"; }; }; skanpage = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/skanpage-22.08.3.tar.xz"; - sha256 = "1yjsj95zvbxgj4j0d1ihlr012pd0zk8ybrbn396q33gzmz4xyh5q"; - name = "skanpage-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/skanpage-22.12.2.tar.xz"; + sha256 = "0ylh3grlfl77my135lszlz53fbhxvwyazf5aanhj33ryqwwyy925"; + name = "skanpage-22.12.2.tar.xz"; }; }; spectacle = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/spectacle-22.08.3.tar.xz"; - sha256 = "037k3lnnb9fsczdndwaqhl9np89fv4nmxvmk785g4rykcg33hzk3"; - name = "spectacle-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/spectacle-22.12.2.tar.xz"; + sha256 = "1gsz3wsir41a8ncyjlmfk8313c88x215myqgs3917wsb9f8x358j"; + name = "spectacle-22.12.2.tar.xz"; }; }; step = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/step-22.08.3.tar.xz"; - sha256 = "0f6kjmx74minvklcxpixh9b01nbzxwfmq5b6vjg64n5z78hfzckm"; - name = "step-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/step-22.12.2.tar.xz"; + sha256 = "056lhpnfjayv6qnng0g6pbr91zqhj0vzk2k87kj7k6snbhbvfm1w"; + name = "step-22.12.2.tar.xz"; }; }; svgpart = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/svgpart-22.08.3.tar.xz"; - sha256 = "0xjj1kyyba14dhi3bi5asibssv14l0vx4b6r9lx1jxws4w0w08fz"; - name = "svgpart-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/svgpart-22.12.2.tar.xz"; + sha256 = "0c3b3l86a1di6k6jjf359hdrdxpyxj2fif7kci41y1ig4hipra4x"; + name = "svgpart-22.12.2.tar.xz"; }; }; sweeper = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/sweeper-22.08.3.tar.xz"; - sha256 = "0f0zz4azwn2i2haz4wqrnzfmb588qhwyma3b9vlk3g5i5c43w75x"; - name = "sweeper-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/sweeper-22.12.2.tar.xz"; + sha256 = "0mj3vhlhjm768zqi0fzs1zwcm566gpr23d36pl436y0rb3d9fm2c"; + name = "sweeper-22.12.2.tar.xz"; }; }; umbrello = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/umbrello-22.08.3.tar.xz"; - sha256 = "0c11avj9cjji05iigrqzkr5xd2nwkd5iqv7jffd0l42p9sy8wgiy"; - name = "umbrello-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/umbrello-22.12.2.tar.xz"; + sha256 = "0l5rpi7nmky2q2rcnq66jx7g1wra2a21b2dq0hpnjn1f9fskxa97"; + name = "umbrello-22.12.2.tar.xz"; }; }; yakuake = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/yakuake-22.08.3.tar.xz"; - sha256 = "11dny7h6pbqhddspizdldq0kmpa2air0qwjzjxw17zgags0qbkxf"; - name = "yakuake-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/yakuake-22.12.2.tar.xz"; + sha256 = "07av7ikj70kj4xwjml2him4lin76gqzs3zrrz2w7q75m6m9qqzpj"; + name = "yakuake-22.12.2.tar.xz"; }; }; zanshin = { - version = "22.08.3"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.08.3/src/zanshin-22.08.3.tar.xz"; - sha256 = "1wz9b56j7rfz7bwyiy1411rnq3x1qpspaxlairyzxzywvmaqa7qh"; - name = "zanshin-22.08.3.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/zanshin-22.12.2.tar.xz"; + sha256 = "18df7by60w5vcjy330y10pnzg3xar8i6273q9zba81qkvpvqkwn2"; + name = "zanshin-22.12.2.tar.xz"; }; }; } diff --git a/pkgs/applications/maui/default.nix b/pkgs/applications/maui/default.nix index edb6837deaa3..6f045bda658b 100644 --- a/pkgs/applications/maui/default.nix +++ b/pkgs/applications/maui/default.nix @@ -64,6 +64,7 @@ let # libraries mauikit = callPackage ./mauikit.nix { }; mauikit-accounts = callPackage ./mauikit-accounts.nix { }; + mauikit-calendar = callPackage ./mauikit-calendar.nix { }; mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { }; mauikit-imagetools = callPackage ./mauikit-imagetools.nix { }; mauikit-texteditor = callPackage ./mauikit-texteditor.nix { }; @@ -78,6 +79,7 @@ let nota = callPackage ./nota.nix { }; pix = callPackage ./pix.nix { }; shelf = callPackage ./shelf.nix { }; + station = callPackage ./station.nix { }; vvave = callPackage ./vvave.nix { }; }; diff --git a/pkgs/applications/maui/mauikit-calendar.nix b/pkgs/applications/maui/mauikit-calendar.nix new file mode 100644 index 000000000000..508319f1616d --- /dev/null +++ b/pkgs/applications/maui/mauikit-calendar.nix @@ -0,0 +1,36 @@ +{ lib +, mkDerivation +, cmake +, extra-cmake-modules +, mauikit +, qtquickcontrols2 +, akonadi +, akonadi-contacts +, calendarsupport +, eventviews +}: + +mkDerivation { + pname = "mauikit-calendar"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + akonadi + akonadi-contacts + calendarsupport + eventviews + mauikit + qtquickcontrols2 + ]; + + meta = with lib; { + homepage = "https://invent.kde.org/maui/mauikit-calendar"; + description = "Calendar support components for Maui applications"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/applications/maui/srcs.nix b/pkgs/applications/maui/srcs.nix index cf751af9ef34..63dda7c13831 100644 --- a/pkgs/applications/maui/srcs.nix +++ b/pkgs/applications/maui/srcs.nix @@ -12,123 +12,139 @@ }; }; booth = { - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/booth/1.0.0/booth-1.0.0.tar.xz"; - sha256 = "0cdn3vkbf1mlq32akz86mdyjfrq661h4jrfmp1x62ih63930hix2"; - name = "booth-1.0.0.tar.xz"; + url = "${mirror}/stable/maui/booth/1.0.1/booth-1.0.1.tar.xz"; + sha256 = "02p3xxfk1fsqd8z55gmkhj68j8sjbgjyrj2anpq8qsmblznsvmdn"; + name = "booth-1.0.1.tar.xz"; }; }; buho = { - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "${mirror}/stable/maui/buho/2.2.0/buho-2.2.0.tar.xz"; - sha256 = "1jj9kygh5b88ksg22969zlsrbgps6z7z2n77g6ldqzvg8mmh2cwr"; - name = "buho-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/buho/2.2.1/buho-2.2.1.tar.xz"; + sha256 = "1iv30avnfdh78zq7kxigxlkzdp2jfzx0sl88vssjcisniabyd1ri"; + name = "buho-2.2.1.tar.xz"; }; }; clip = { - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "${mirror}/stable/maui/clip/2.2.0/clip-2.2.0.tar.xz"; - sha256 = "0ggymdscd7c942vvii3mswkq84lkygdcbvpg3s2lhqaqxpivy96z"; - name = "clip-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/clip/2.2.1/clip-2.2.1.tar.xz"; + sha256 = "00w9kgqw4dxb9b9rq11jzdb9pj48qdkdj23wdjwdk52nyfkw7sbh"; + name = "clip-2.2.1.tar.xz"; }; }; communicator = { - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "${mirror}/stable/maui/communicator/2.2.0/communicator-2.2.0.tar.xz"; - sha256 = "0njyjzf8w2aamrj1yajjw7551dc72db9m0iv14mnb0gcd9pphni7"; - name = "communicator-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/communicator/2.2.1/communicator-2.2.1.tar.xz"; + sha256 = "1h689dr9iy07r7ypyfgrb3n0ljigz847m6vq1jaia6phgix07hn6"; + name = "communicator-2.2.1.tar.xz"; }; }; index-fm = { - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "${mirror}/stable/maui/index/2.2.0/index-fm-2.2.0.tar.xz"; - sha256 = "0v39sfdqb21669cx96nd78vprwaxsvg3cpp3lly43n09nv6gkw41"; - name = "index-fm-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/index/2.2.1/index-fm-2.2.1.tar.xz"; + sha256 = "1gin3may65f8nafbgyv90k31z69xwx1awnnxmciqn5zz7cdh9slm"; + name = "index-fm-2.2.1.tar.xz"; }; }; mauikit = { - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit/2.2.0/mauikit-2.2.0.tar.xz"; - sha256 = "05bvgwl1yfbfrlxhl6ngvkdk34rg4y12fsrddm8f19b6dkvjzxq2"; - name = "mauikit-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit/2.2.1/mauikit-2.2.1.tar.xz"; + sha256 = "0rwjd2g82j1cvspr0l889nss6p26yf19h39q20h3d9ls7fbj897h"; + name = "mauikit-2.2.1.tar.xz"; }; }; mauikit-accounts = { - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-accounts/2.2.0/mauikit-accounts-2.2.0.tar.xz"; - sha256 = "1wc67mhhmxq0dq1g10338zm52kx274yry2ja34kagva3qkbhbb2i"; - name = "mauikit-accounts-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-accounts/2.2.1/mauikit-accounts-2.2.1.tar.xz"; + sha256 = "13k9y7z9mw17rdn1z9ixgi1bf6q2hf0afp53nb8d9gz5mqkaf6qh"; + name = "mauikit-accounts-2.2.1.tar.xz"; + }; + }; + mauikit-calendar = { + version = "1.0.0"; + src = fetchurl { + url = "${mirror}/stable/maui/mauikit-calendar/1.0.0/mauikit-calendar-1.0.0.tar.xz"; + sha256 = "1zqaf0nddb220w14ar9gg6p695p0my8whn8p8wgxm7mwjfb6hlil"; + name = "mauikit-calendar-1.0.0.tar.xz"; + }; + }; + mauikit-documents = { + version = "1.0.0"; + src = fetchurl { + url = "${mirror}/stable/maui/mauikit-documents/1.0.0/mauikit-documents-1.0.0.tar.xz"; + sha256 = "1dniab7f113vbxng9b1nwmh6wviv1m1gb842k98vxgnhmsljq24a"; + name = "mauikit-documents-1.0.0.tar.xz"; }; }; mauikit-filebrowsing = { - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-filebrowsing/2.2.0/mauikit-filebrowsing-2.2.0.tar.xz"; - sha256 = "1377mgkx1q66jzdlra87airqkmkl9cfj6n5xw1my1nihxcjq9bz1"; - name = "mauikit-filebrowsing-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-filebrowsing/2.2.1/mauikit-filebrowsing-2.2.1.tar.xz"; + sha256 = "1szghmp1p9pvsfqx8sk345j7riqxv2kib41l277rm14pwbs6zx1c"; + name = "mauikit-filebrowsing-2.2.1.tar.xz"; }; }; mauikit-imagetools = { - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-imagetools/2.2.0/mauikit-imagetools-2.2.0.tar.xz"; - sha256 = "07clir651sfi4c9awv0jnq4pck2cfzfv0fdkwcapl6hh0zq9qvpr"; - name = "mauikit-imagetools-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-imagetools/2.2.1/mauikit-imagetools-2.2.1.tar.xz"; + sha256 = "1wfhzkw4bs3518gylfxyp1arg2w204f73wg1l2s4pygbdh5ylav2"; + name = "mauikit-imagetools-2.2.1.tar.xz"; }; }; mauikit-texteditor = { - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-texteditor/2.2.0/mauikit-texteditor-2.2.0.tar.xz"; - sha256 = "0x1cblydgqkhcy86x6yd8dipwhy9l5d7xlmk5igh5dllnzvcaicq"; - name = "mauikit-texteditor-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-texteditor/2.2.1/mauikit-texteditor-2.2.1.tar.xz"; + sha256 = "0dzzlmdpl0y843lywfjc4za152r87kncafkmmbp8bdwc9j5fdzzv"; + name = "mauikit-texteditor-2.2.1.tar.xz"; }; }; mauiman = { - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauiman/1.0.0/mauiman-1.0.0.tar.xz"; - sha256 = "1risxzgjg684c8zwmwl03ihfrxx44lbb4j43v8z3wnjkq7p44w82"; - name = "mauiman-1.0.0.tar.xz"; + url = "${mirror}/stable/maui/mauiman/1.0.1/mauiman-1.0.1.tar.xz"; + sha256 = "0awqb8kygacirlhha58bzgrd47zsxmfm3h5k68g8liymqn00fh30"; + name = "mauiman-1.0.1.tar.xz"; }; }; nota = { - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "${mirror}/stable/maui/nota/2.2.0/nota-2.2.0.tar.xz"; - sha256 = "1nr8craafima1khkcxv47v1868yfwykjzaczlmmqmjha7bm1dlbd"; - name = "nota-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/nota/2.2.1/nota-2.2.1.tar.xz"; + sha256 = "1fl4w0l3l6rdgxw5w479nzbcff7rmdcxil7y6jdr8z2q50lkazj8"; + name = "nota-2.2.1.tar.xz"; }; }; pix = { - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "${mirror}/stable/maui/pix/2.2.0/pix-2.2.0.tar.xz"; - sha256 = "0nghp69ax73yf0wybd724a3lgbj7jiiznnmwp67n2ls74q8yrwwy"; - name = "pix-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/pix/2.2.1/pix-2.2.1.tar.xz"; + sha256 = "0j2kpcxgdz21phdl0mx84ynalzf6bf3qalq524j7p297pdkrq3d6"; + name = "pix-2.2.1.tar.xz"; }; }; shelf = { - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "${mirror}/stable/maui/shelf/2.2.0/shelf-2.2.0.tar.xz"; - sha256 = "028ll3pi4h3jxgilsf4s5ic2rq0z9q8kh9pram9dsjvgz24p7g0c"; - name = "shelf-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/shelf/2.2.1/shelf-2.2.1.tar.xz"; + sha256 = "1h24mrzq5p63b11caml51az99gjipdlyrbx3na2jsxy4rvzryddm"; + name = "shelf-2.2.1.tar.xz"; }; }; station = { - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "${mirror}/stable/maui/station/2.2.0/station-2.2.0.tar.xz"; - sha256 = "0za3jh5clkx8xf436vzs83nrsw5fyna4wcy73ihlf3xbra0358v1"; - name = "station-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/station/2.2.1/station-2.2.1.tar.xz"; + sha256 = "1ch5c4728hahh90nlpqwnlaljpingvwrjwxajan1j2kgwb5lynwz"; + name = "station-2.2.1.tar.xz"; }; }; strike = { @@ -140,11 +156,11 @@ }; }; vvave = { - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "${mirror}/stable/maui/vvave/2.2.0/vvave-2.2.0.tar.xz"; - sha256 = "0qnwklc875j6g2rg610dmvcizg3m4q80fhjk4c3i1xzn8dybbg5s"; - name = "vvave-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/vvave/2.2.1/vvave-2.2.1.tar.xz"; + sha256 = "0mg4p44da16xkcra1akvh6f2fixd682clmd6wqgc34j7n1a9y773"; + name = "vvave-2.2.1.tar.xz"; }; }; } diff --git a/pkgs/applications/maui/station.nix b/pkgs/applications/maui/station.nix new file mode 100644 index 000000000000..49e8cae3f63d --- /dev/null +++ b/pkgs/applications/maui/station.nix @@ -0,0 +1,36 @@ +{ lib +, mkDerivation +, cmake +, extra-cmake-modules +, kcoreaddons +, ki18n +, kirigami2 +, mauikit +, mauikit-filebrowsing +, qmltermwidget +}: + +mkDerivation { + pname = "station"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kcoreaddons + ki18n + kirigami2 + mauikit + mauikit-filebrowsing + qmltermwidget + ]; + + meta = with lib; { + description = "Convergent terminal emulator"; + homepage = "https://invent.kde.org/maui/station"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/applications/misc/1password-gui/darwin.nix b/pkgs/applications/misc/1password-gui/darwin.nix index 04bc10231162..6f3d86f51c34 100644 --- a/pkgs/applications/misc/1password-gui/darwin.nix +++ b/pkgs/applications/misc/1password-gui/darwin.nix @@ -18,4 +18,7 @@ stdenv.mkDerivation { mkdir -p $out/Applications cp -r *.app $out/Applications ''; + + # 1Password is notarized. + dontFixup = true; } diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index e6cf00d669de..3c08f1d8a9da 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -9,43 +9,43 @@ let pname = "1password"; - version = if channel == "stable" then "8.9.8" else "8.9.10-1.BETA"; + version = if channel == "stable" then "8.9.10" else "8.9.12-4.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-s5GFGsSelnvqdoEgCzU88BG0dc4bUG4IX3fbeciIPIk="; + sha256 = "sha256-aoa00W5zvZQeHKd2Eqyrxl5Z1PwLMHc5lkMUskLiD74="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "sha256-wNF9jwHTxuojFQ+s05jhb7dFihE/36cadaBONqrMYF0="; + sha256 = "sha256-Zt64UGKI3+DayS6XP7jTE+pxv52tUUZbUHiuzjcm1JI="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - sha256 = "sha256-Ok0M6jPZ513iTE646PDPu+dK6Y3b/J8oejJQQkQMS2w="; + sha256 = "sha256-sx9eASpMcgkIH1GRzJMqSQa5Y5GJlYU/20CZFyFK+OU="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - sha256 = "sha256-zocY/0IgiGwuY/ZrMbip34HoRp90ATWRpfAIRhyH9M8="; + sha256 = "sha256-Z1cEynO9iWZra542CVGmefrTNerMe13OcTAzWXNi8jI="; }; }; beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-fW+9mko1OZ5zlTnbZucOjvjus8KVZA4Mcga/4HJyJL4="; + sha256 = "sha256-/WXaLINqLFLft+wrmr+fV0kM9qS5w4etFiGltnzoVdo="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "sha256-jczDhKMCEHjE5yXr5jczSalGa4pVFs7V8BcIhueT88M="; + sha256 = "sha256-Zv9uHkFCZ0flBMAwQBjNhqFWhAXKyHBfZk733hbSag4="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - sha256 = "sha256-apgXMoZ7yNtUgf6efuSjAK6TGFR230FMK4j95OoXgwQ="; + sha256 = "sha256-Vryk6nMQY+0NIgwJkZ2j3vrxyhrzxbe96jbyoNbPIR0="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - sha256 = "sha256-tdGu648joHu5E8ECU1TpkxgfU6ZMHlJAy+VcNDtIscA="; + sha256 = "sha256-74iOaNkuPRKUsTNNd7UTpy5ahjoMmxiNT84Op5ztRGk="; }; }; }; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index e744388b8649..145f1ef4fdcd 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.7.3"; + version = "2.13.1"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-FxApOWyExyfuRFQhxAVBWZGqQNmarBFBRB4jqsreWL0=" "zip"; - i686-linux = fetch "linux_386" "sha256-Ta6mdmcsKnNRMz9vwEadZ/xXVBran5BIJQngzNz3PUs=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-Lvxnp5KmkIj9jnaWg02a27eRYIx7WTNSLx+RJ04Vt+g=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-6qrNgb5ae+qqlNsNDLbKNeWj0o/SRs+2G/4DfK5Wnhg=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-Zuy9ZQY5kzRgcGfzkndGr30koR8Z8cvEfCs+n+/P2zM=" "zip"; + i686-linux = fetch "linux_386" "sha256-MlUSL8+O7sDG1cSfJvw+nEC7d1N6Bb2By1fw2ooZQfc=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-EwUqjn3QKwTYqiYvm6vAsHnEcWHaRGJ2WzJ9OHP1XWM=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-Mag2UG5IhikxV0aA/OhA9Aauuytx9shUKlrGhXMjqTM=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index e2f817bfdcb3..ec699d668923 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildDotnetModule , fetchFromGitHub , dotnetCorePackages @@ -12,29 +13,36 @@ buildDotnetModule rec { pname = "archisteamfarm"; # nixpkgs-update: no auto update - version = "5.3.1.2"; + version = "5.4.1.11"; src = fetchFromGitHub { owner = "justarchinet"; repo = pname; rev = version; - sha256 = "sha256-plimvkMUjQWQ0Ewm1TXL5IB1xe62DFhwBlBc4UeCguU="; + sha256 = "sha256-t4azVZVvAJmCCsg/2o+ZWroEmCLfdPYn2iWwVwdhIZw="; }; - dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; + dotnet-sdk = dotnetCorePackages.sdk_7_0; nugetDeps = ./deps.nix; - # Without this dotnet attempts to restore for Windows targets, which it cannot find the dependencies for - dotnetRestoreFlags = [ "--runtime ${dotnetCorePackages.sdk_6_0.systemToDotnetRid stdenvNoCC.targetPlatform.system}" ]; - projectFile = "ArchiSteamFarm.sln"; executables = [ "ArchiSteamFarm" ]; + dotnetFlags = [ + "-p:PublishSingleFile=true" + "-p:PublishTrimmed=true" + ]; + selfContainedBuild = true; runtimeDeps = [ libkrb5 zlib openssl ]; doCheck = true; + preBuild = '' + export projectFile=(ArchiSteamFarm) + ''; + preInstall = '' # A mutable path, with this directory tree must be set. By default, this would point at the nix store causing errors. makeWrapperArgs+=( @@ -43,7 +51,19 @@ buildDotnetModule rec { ) ''; + postInstall = '' + buildPlugin() { + dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \ + --output $out/lib/${pname}/plugins/$1 --configuration Release \ + -p:TargetLatestRuntimePatch=false -p:UseAppHost=false --no-restore + } + + buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher + buildPlugin ArchiSteamFarm.OfficialPlugins.SteamTokenDumper + ''; + passthru = { + # nix-shell maintainers/scripts/update.nix --argstr package ArchiSteamFarm updateScript = ./update.sh; ui = callPackage ./web-ui { }; }; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index cc96bc66c27b..4b177bf5815a 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -56,92 +56,42 @@ (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.14.1"; sha256 = "1k6nnawd016xpwgzdzy84z1lcv2vc1cygcksw19wbgd8dharyyk7"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.1.0"; sha256 = "0lsqpssain0v9i3jhpi1c42r5s329y31cvqk5x7gqvy17f29y002"; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.3.1"; sha256 = "0lkhyyz25q82ygnxy26lwy5cl8fvkdc13pcn433xpjj8akzbmgd6"; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.30.4"; sha256 = "1bzc2vqpsq4mx6rw2rnk4hr14gqd5w8rf2h026gh7rqkwqd3r2dj"; }) (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.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.3.2"; sha256 = "1f05l2vm8inlwhk36lfbyszjlcnvdd2qw2832npaah0dldn6dz00"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.4.1"; sha256 = "0bf68gq6mc6kzri4zi8ydc0xrazqwqg38bhbpjpj90zmqc28kari"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) - (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.NET.Test.Sdk"; version = "17.3.2"; sha256 = "0pm06nxqi8aw04lciqy7iz8ln1qm5mx06cpwgqa2dfwvnjp7zxnm"; }) - (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.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.1"; sha256 = "02p1j9fncd4fb2hyp51kw49d0dz30vvazhzk24c9f5ccc00ijpra"; }) (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.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.3.2"; sha256 = "0bs38r5kdw1xpbjbi5l82xbhfnfbzr5xhg5520lk05pg914d1ln1"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.3.2"; sha256 = "089nmaxzvm5xcf20pm4iiavz2k6lwh69r51xlbqg0ry605mnl869"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.4.1"; sha256 = "0s68wf9yphm4hni9p6kwfk0mjld85f4hkrs93qbk5lzf6vv3kba1"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.4.1"; sha256 = "1n9ilq8n5rhyxcri06njkxb0h2818dbmzddwd2rrvav91647m2s4"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.2.10"; sha256 = "0w6c55n30w6imm0rjafl2sg0x8vf9852xmil9dzqb4h36cs7v6y6"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "2.2.10"; sha256 = "0j5p3p5a0pr3rmzg7va21z3w0lb929zqj5xcdd81iys5vvh1hjiw"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.3"; sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.2"; sha256 = "1pzn95nhmprfvchwshyy87jifzjpvdny21b5yhkqafr150nxlz77"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.2"; sha256 = "1yiwi0hi8pn9dv90vz1yw13izap8dv13asxvr9axcliis0ad5iaq"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) (fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; sha256 = "0sxvmqnv8a94k3pq1w3lh1vgjb8l62h1qamxcjl3pkq634h2fwrl"; }) (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.0.4"; sha256 = "1p1am57q0fz684cc7snv9d9jvmcvg6ym03np26ngvgyrlh9ph68r"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.4"; sha256 = "0cy8a82ijgfv9zdlw9jjr8467h9781jlk90r94bhr8lanmjv3k1k"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.1.4"; sha256 = "1y31n9b29aydyakhqmgv3yxyzx27ys549zlc3ij3vf67n8by0jj8"; }) + (fetchNuGet { pname = "NLog"; version = "5.1.1"; sha256 = "19m1ivp1cxz1ghlvysrxdhxlj7kzya9m7j812c3ssnxrfrr1077z"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.2.1"; sha256 = "1z9ayqag1xncn4cs0cz27gxa5cqk6caq5fd81bczlj4sqff7ah4p"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.2.1"; sha256 = "10y03374lza6cjsi01xmql1v6hcjf6x2r7wfnnckzhzs70x2hhnl"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.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"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (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 = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) (fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.4.0"; sha256 = "1jkgjnkjcb6dif0lzn7whjwwdd4fi6mzkmkdx8sfmv5cffzq4fvk"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.4.0"; sha256 = "0d01dpl4bcnrxqxyxcx0jhh9v375fqhva9w0siadj5y6m15h1sl5"; }) @@ -149,122 +99,21 @@ (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.4.0"; sha256 = "1wccx8ig2xc6xcfh774m5z34w6jn0hjffiwc5sq9yl63zkv01vnn"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.4.0"; sha256 = "1k58j6lfqcgrl5f7dw0xnbq6w5bvr42a9fc44vwbzl52kzjdlnh2"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.4.0"; sha256 = "1rxgf0hbkkzywh8z7asky2rrh1gpnrr514v1aj5vnmh49sa31kiz"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) - (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) - (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) - (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) - (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) - (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) - (fetchNuGet { pname = "System.Composition"; version = "6.0.0"; sha256 = "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z"; }) - (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; sha256 = "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k"; }) - (fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; sha256 = "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b"; }) - (fetchNuGet { pname = "System.Composition.Hosting"; version = "6.0.0"; sha256 = "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky"; }) - (fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; sha256 = "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw"; }) - (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; sha256 = "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) - (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.TextWriterTraceListener"; version = "4.3.0"; sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) - (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.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"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (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.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Composition"; version = "7.0.0"; sha256 = "1aii681g7a4gv8fvgd6hbnbbwi6lpzfcnl3k0k8hqx4m7fxp2f32"; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "7.0.0"; sha256 = "1cxrp0sk5b2gihhkn503iz8fa99k860js2qyzjpsw9rn547pdkny"; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "7.0.0"; sha256 = "1nbyn42xys0kv247jf45r748av6fp8kp27f1582lfhnj2n8290rp"; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "7.0.0"; sha256 = "0wqbjxgggskfn45ilvg86grqci3zx9xj34r5sradca4mqqc90n7f"; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "7.0.0"; sha256 = "1p9xpqzx42s8cdizv6nh15hcjvl2km0rwby66nfkj4cb472l339s"; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "7.0.0"; sha256 = "0syz7y6wgnxxgjvfqgymn9mnaa5fjy1qp06qnsvh3agr9mvcv779"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (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"; }) - (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"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) - (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"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (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"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Formatters"; version = "4.3.0"; sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (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.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.0"; sha256 = "15s9s6hsj9bz0nzw41mxbqdjgjd71w2djqbv0aj413gfi9amybk9"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (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"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) (fetchNuGet { pname = "zxcvbn-core"; version = "7.0.92"; sha256 = "1pbi0n3za8zsnkbvq19njy4h4hy12a6rv4rknf4a2m1kdhxb3cgx"; }) ] diff --git a/pkgs/applications/misc/ArchiSteamFarm/update.sh b/pkgs/applications/misc/ArchiSteamFarm/update.sh index 86a94575164e..857474c483e3 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/update.sh +++ b/pkgs/applications/misc/ArchiSteamFarm/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../.. -i bash -p curl gnused jq common-updater-scripts +#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq common-updater-scripts set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -16,7 +16,7 @@ if [[ "$new_version" == "$old_version" ]]; then fi asf_path=$PWD -cd ../../../.. +pushd ../../../.. if [[ "${1:-}" != "--deps-only" ]]; then update-source-version ArchiSteamFarm "$new_version" @@ -24,4 +24,5 @@ fi $(nix-build -A ArchiSteamFarm.fetch-deps --no-out-link) "$deps_file" -exec "$asf_path/web-ui/update.sh" +popd +"$asf_path/web-ui/update.sh" diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 86ce1163006e..2d9b681a2e46 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, fetchFromGitHub, nodejs, stdenv, ArchiSteamFarm, ... }: +{ lib, pkgs, fetchFromGitHub, nodejs, nodePackages, stdenv, ArchiSteamFarm }: let nodePackages = import ./node-composition.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 = "855ca01e6ec94947404ce728c447baf805c9a655"; - sha256 = "1s16i7hrp61nbq8wgwa3mxcsjqh0kkw91jiikdqysxrk2dgbaz77"; + rev = "a4617d145756f6dcf1f5729e5a60689aa484403b"; + sha256 = "178ip280bqyqd36rka9g2jx7b7wdf3zh56sahg53yxr55zwq5bcp"; }; in diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix index 4f761f55a1ae..6ee3318e1501 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix @@ -22,22 +22,22 @@ let sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.19.3" = { + "@babel/compat-data-7.20.5" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.19.3"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.3.tgz"; - sha512 = "prBHMK4JYYK+wDjJF1q99KK4JLL+egWS4nmNqdlMUgCExMZ+iZW0hGhyC3VEbsPjvaN0TBhW//VIFwBrk8sEiw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz"; + sha512 = "KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g=="; }; }; - "@babel/core-7.19.3" = { + "@babel/core-7.20.7" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.19.3"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz"; - sha512 = "WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.20.7.tgz"; + sha512 = "t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw=="; }; }; "@babel/eslint-parser-7.19.1" = { @@ -49,13 +49,13 @@ let sha512 = "AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ=="; }; }; - "@babel/generator-7.19.3" = { + "@babel/generator-7.20.7" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.19.3"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.19.3.tgz"; - sha512 = "fqVZnmp1ncvZU757UzDheKZpfPgatqY59XtW2/j/18H7u76akb8xqvjw82f+i2UKd/ksYsSick/BCLQUUtJ/qQ=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz"; + sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -76,13 +76,13 @@ let sha512 = "KT10c1oWEpmrIRYnthbzHgoOf6B+Xd6a5yhdbNtdhtG7aO1or5HViuf1TQR36xY/QprXA5nvxO6nAjhJ4y38jw=="; }; }; - "@babel/helper-compilation-targets-7.19.3" = { + "@babel/helper-compilation-targets-7.20.7" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.19.3"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz"; - sha512 = "65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz"; + sha512 = "4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ=="; }; }; "@babel/helper-create-class-features-plugin-7.18.6" = { @@ -166,13 +166,13 @@ let sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.19.0" = { + "@babel/helper-module-transforms-7.20.7" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.19.0"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz"; - sha512 = "3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz"; + sha512 = "FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA=="; }; }; "@babel/helper-optimise-call-expression-7.18.6" = { @@ -184,13 +184,13 @@ let sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="; }; }; - "@babel/helper-plugin-utils-7.19.0" = { + "@babel/helper-plugin-utils-7.20.2" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.19.0"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz"; - sha512 = "40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz"; + sha512 = "8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ=="; }; }; "@babel/helper-remap-async-to-generator-7.18.9" = { @@ -202,22 +202,22 @@ let sha512 = "dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA=="; }; }; - "@babel/helper-replace-supers-7.18.9" = { + "@babel/helper-replace-supers-7.19.1" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.18.9"; + version = "7.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz"; - sha512 = "dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz"; + sha512 = "T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw=="; }; }; - "@babel/helper-simple-access-7.18.6" = { + "@babel/helper-simple-access-7.20.2" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.18.6"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz"; - sha512 = "iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz"; + sha512 = "+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.18.9" = { @@ -238,13 +238,13 @@ let sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; }; }; - "@babel/helper-string-parser-7.18.10" = { + "@babel/helper-string-parser-7.19.4" = { name = "_at_babel_slash_helper-string-parser"; packageName = "@babel/helper-string-parser"; - version = "7.18.10"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz"; - sha512 = "XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="; + url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz"; + sha512 = "nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="; }; }; "@babel/helper-validator-identifier-7.19.1" = { @@ -274,13 +274,13 @@ let sha512 = "95NLBP59VWdfK2lyLKe6eTMq9xg+yWKzxzxbJ1wcYNi1Auz200+83fMDADjRxBvc2QQor5zja2yTQzXGhk2GtQ=="; }; }; - "@babel/helpers-7.19.0" = { + "@babel/helpers-7.20.7" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.19.0"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz"; - sha512 = "DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz"; + sha512 = "PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA=="; }; }; "@babel/highlight-7.18.6" = { @@ -292,13 +292,13 @@ let sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.19.3" = { + "@babel/parser-7.20.7" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.19.3"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.19.3.tgz"; - sha512 = "pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz"; + sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { @@ -319,13 +319,13 @@ let sha512 = "AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.19.1" = { + "@babel/plugin-proposal-async-generator-functions-7.20.1" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.19.1"; + version = "7.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz"; - sha512 = "0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz"; + sha512 = "Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g=="; }; }; "@babel/plugin-proposal-class-properties-7.18.6" = { @@ -400,13 +400,13 @@ let sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.18.9" = { + "@babel/plugin-proposal-object-rest-spread-7.20.2" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.18.9"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz"; - sha512 = "kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz"; + sha512 = "Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.18.6" = { @@ -499,13 +499,13 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; - "@babel/plugin-syntax-import-assertions-7.18.6" = { + "@babel/plugin-syntax-import-assertions-7.20.0" = { name = "_at_babel_slash_plugin-syntax-import-assertions"; packageName = "@babel/plugin-syntax-import-assertions"; - version = "7.18.6"; + version = "7.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz"; - sha512 = "/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz"; + sha512 = "IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ=="; }; }; "@babel/plugin-syntax-json-strings-7.8.3" = { @@ -616,22 +616,22 @@ let sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.18.9" = { + "@babel/plugin-transform-block-scoping-7.20.2" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.18.9"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz"; - sha512 = "5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz"; + sha512 = "y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ=="; }; }; - "@babel/plugin-transform-classes-7.19.0" = { + "@babel/plugin-transform-classes-7.20.2" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.19.0"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz"; - sha512 = "YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz"; + sha512 = "9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g=="; }; }; "@babel/plugin-transform-computed-properties-7.18.9" = { @@ -643,13 +643,13 @@ let sha512 = "+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw=="; }; }; - "@babel/plugin-transform-destructuring-7.18.13" = { + "@babel/plugin-transform-destructuring-7.20.2" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.18.13"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz"; - sha512 = "TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz"; + sha512 = "mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw=="; }; }; "@babel/plugin-transform-dotall-regex-7.18.6" = { @@ -715,31 +715,31 @@ let sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA=="; }; }; - "@babel/plugin-transform-modules-amd-7.18.6" = { + "@babel/plugin-transform-modules-amd-7.19.6" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.18.6"; + version = "7.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz"; - sha512 = "Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz"; + sha512 = "uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.18.6" = { + "@babel/plugin-transform-modules-commonjs-7.19.6" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.18.6"; + version = "7.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz"; - sha512 = "Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz"; + sha512 = "8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.19.0" = { + "@babel/plugin-transform-modules-systemjs-7.19.6" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.19.0"; + version = "7.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz"; - sha512 = "x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz"; + sha512 = "fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ=="; }; }; "@babel/plugin-transform-modules-umd-7.18.6" = { @@ -778,13 +778,13 @@ let sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="; }; }; - "@babel/plugin-transform-parameters-7.18.8" = { + "@babel/plugin-transform-parameters-7.20.1" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.18.8"; + version = "7.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz"; - sha512 = "ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.1.tgz"; + sha512 = "nDvKLrAvl+kf6BOy1UJ3MGwzzfTMgppxwiD2Jb4LO3xjYyZq30oQzDNJbCQpMdG9+j2IXHoiMrw5Cm/L6ZoxXQ=="; }; }; "@babel/plugin-transform-property-literals-7.18.6" = { @@ -877,13 +877,13 @@ let sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA=="; }; }; - "@babel/preset-env-7.19.3" = { + "@babel/preset-env-7.20.2" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.19.3"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.3.tgz"; - sha512 = "ziye1OTc9dGFOAXSWKUqQblYHNlBOaDl8wzqf2iKXJAltYiR3hKHUKmkt+S9PppW7RQpq4fFCrwwpIDj/f5P4w=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz"; + sha512 = "1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg=="; }; }; "@babel/preset-modules-0.1.5" = { @@ -904,31 +904,31 @@ let sha512 = "/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg=="; }; }; - "@babel/template-7.18.10" = { + "@babel/template-7.20.7" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.18.10"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz"; - sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz"; + sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; }; - "@babel/traverse-7.19.3" = { + "@babel/traverse-7.20.7" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.19.3"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.3.tgz"; - sha512 = "qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.7.tgz"; + sha512 = "xueOL5+ZKX2dJbg8z8o4f4uTRTqGDRjilva9D1hiRlayJbTY8jBRL+Ph67IeRTIE439/VifHk+Z4g0SwRtQE0A=="; }; }; - "@babel/types-7.19.3" = { + "@babel/types-7.20.7" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.19.3"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.19.3.tgz"; - sha512 = "hGCaQzIY22DJlDh9CH7NOxgKkFjBk0Cw9xDO1Xmh2151ti7wiGfQ3LauXzL4HP1fmFlTX6XjpRETTpUcv7wQLw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz"; + sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg=="; }; }; "@discoveryjs/json-ext-0.5.5" = { @@ -940,76 +940,67 @@ let sha512 = "6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA=="; }; }; - "@eslint/eslintrc-1.3.2" = { + "@eslint/eslintrc-1.4.0" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "1.3.2"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz"; - sha512 = "AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz"; + sha512 = "7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A=="; }; }; - "@fortawesome/fontawesome-common-types-6.2.0" = { + "@fortawesome/fontawesome-common-types-6.2.1" = { name = "_at_fortawesome_slash_fontawesome-common-types"; packageName = "@fortawesome/fontawesome-common-types"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz"; - sha512 = "rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg=="; + url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz"; + sha512 = "Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ=="; }; }; - "@fortawesome/fontawesome-svg-core-6.2.0" = { + "@fortawesome/fontawesome-svg-core-6.2.1" = { name = "_at_fortawesome_slash_fontawesome-svg-core"; packageName = "@fortawesome/fontawesome-svg-core"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.0.tgz"; - sha512 = "Cf2mAAeMWFMzpLC7Y9H1I4o3wEU+XovVJhTiNG8ZNgSQj53yl7OCJaS80K4YjrABWZzbAHVaoHE1dVJ27AAYXw=="; + url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.1.tgz"; + sha512 = "HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA=="; }; }; - "@fortawesome/free-brands-svg-icons-6.2.0" = { + "@fortawesome/free-brands-svg-icons-6.2.1" = { name = "_at_fortawesome_slash_free-brands-svg-icons"; packageName = "@fortawesome/free-brands-svg-icons"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.0.tgz"; - sha512 = "fm1y4NyZ2qKYNmYhdMz9VAWRw1Et7PMHNunSw3W0SVAwKwv6o0qiJworLH3Y9SnmhHzAymXJwCX1op22FFvGiA=="; + url = "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.1.tgz"; + sha512 = "L8l4MfdHPmZlJ72PvzdfwOwbwcCAL0vx48tJRnI6u1PJXh+j2f3yDoKyQgO3qjEsgD5Fr2tQV/cPP8F/k6aUig=="; }; }; - "@fortawesome/free-solid-svg-icons-6.2.0" = { + "@fortawesome/free-solid-svg-icons-6.2.1" = { name = "_at_fortawesome_slash_free-solid-svg-icons"; packageName = "@fortawesome/free-solid-svg-icons"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.0.tgz"; - sha512 = "UjCILHIQ4I8cN46EiQn0CZL/h8AwCGgR//1c4R96Q5viSRwuKVo0NdQEc4bm+69ZwC0dUvjbDqAHF1RR5FA3XA=="; + url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.1.tgz"; + sha512 = "oKuqrP5jbfEPJWTij4sM+/RvgX+RMFwx3QZCZcK9PrBDgxC35zuc7AOFsyMjMd/PIFPeB2JxyqDr5zs/DZFPPw=="; }; }; - "@fortawesome/vue-fontawesome-2.0.8" = { + "@fortawesome/vue-fontawesome-2.0.9" = { name = "_at_fortawesome_slash_vue-fontawesome"; packageName = "@fortawesome/vue-fontawesome"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.8.tgz"; - sha512 = "SRmP0q9Ox4zq8ydDR/hrH+23TVU1bdwYVnugLVaAIwklOHbf56gx6JUGlwES7zjuNYqzKgl8e39iYf6ph8qSQw=="; + url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.9.tgz"; + sha512 = "tUmO92PFHbLOplitjHNBVGMJm6S57vp16tBXJVPKSI/6CfjrgLycqKxEpC6f7qsOqUdoXs5nIv4HLUfrOMHzuw=="; }; }; - "@humanwhocodes/config-array-0.10.5" = { + "@humanwhocodes/config-array-0.11.8" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; - version = "0.10.5"; + version = "0.11.8"; src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.5.tgz"; - sha512 = "XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug=="; - }; - }; - "@humanwhocodes/gitignore-to-minimatch-1.0.2" = { - name = "_at_humanwhocodes_slash_gitignore-to-minimatch"; - packageName = "@humanwhocodes/gitignore-to-minimatch"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz"; - sha512 = "rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA=="; + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz"; + sha512 = "UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g=="; }; }; "@humanwhocodes/module-importer-1.0.1" = { @@ -1093,31 +1084,31 @@ let sha512 = "54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg=="; }; }; - "@nodelib/fs.scandir-2.1.4" = { + "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; - sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; }; }; - "@nodelib/fs.stat-2.0.4" = { + "@nodelib/fs.stat-2.0.5" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; - sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; }; }; - "@nodelib/fs.walk-1.2.6" = { + "@nodelib/fs.walk-1.2.8" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.6"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; - sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; "@polka/url-1.0.0-next.21" = { @@ -1345,13 +1336,13 @@ let sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w=="; }; }; - "@vue/compiler-sfc-2.7.10" = { + "@vue/compiler-sfc-2.7.14" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "2.7.10"; + version = "2.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz"; - sha512 = "55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz"; + sha512 = "aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA=="; }; }; "@vue/component-compiler-utils-3.2.2" = { @@ -1615,6 +1606,15 @@ let sha512 = "wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="; }; }; + "ajv-8.11.2" = { + name = "ajv"; + packageName = "ajv"; + version = "8.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz"; + sha512 = "E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg=="; + }; + }; "ajv-8.8.1" = { name = "ajv"; packageName = "ajv"; @@ -1750,15 +1750,6 @@ let sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; }; }; - "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=="; - }; - }; "array-uniq-1.0.3" = { name = "array-uniq"; packageName = "array-uniq"; @@ -1786,31 +1777,22 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "axios-0.27.2" = { + "axios-1.2.2" = { name = "axios"; packageName = "axios"; - version = "0.27.2"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"; - sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; + url = "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz"; + sha512 = "bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q=="; }; }; - "babel-loader-8.2.5" = { + "babel-loader-9.1.0" = { name = "babel-loader"; packageName = "babel-loader"; - version = "8.2.5"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz"; - sha512 = "OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ=="; - }; - }; - "babel-plugin-dynamic-import-node-2.3.3" = { - name = "babel-plugin-dynamic-import-node"; - packageName = "babel-plugin-dynamic-import-node"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; - sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.0.tgz"; + sha512 = "Antt61KJPinUMwHwIIz9T5zfMgevnfZkEVWYDWlG888fgdvRRGD0JTuf/fFozQnfT+uq64sk1bmdHDy/mOEWnA=="; }; }; "babel-plugin-polyfill-corejs2-0.3.3" = { @@ -1858,13 +1840,13 @@ let sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; }; }; - "before-build-webpack-0.2.12" = { + "before-build-webpack-0.2.13" = { name = "before-build-webpack"; packageName = "before-build-webpack"; - version = "0.2.12"; + version = "0.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/before-build-webpack/-/before-build-webpack-0.2.12.tgz"; - sha512 = "k91crmYKGUiKNRVa6sbP5jVD1m8c2Atjt9UIlVrjOla5kKPe96g1m45J98peZbImOtUCFZCSkT4fr5HNfK/Vew=="; + url = "https://registry.npmjs.org/before-build-webpack/-/before-build-webpack-0.2.13.tgz"; + sha512 = "Vtx55X83giRl+DQ7EZBhU1leUrOLb0t4cKSfvlE9fSub2+TPXFEXjBTYP0jsEnUi7Hd4jdQmUtq/cL6ncBXDFA=="; }; }; "big.js-5.2.2" = { @@ -2272,13 +2254,13 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; - "copy-to-clipboard-3.3.2" = { + "copy-to-clipboard-3.3.3" = { name = "copy-to-clipboard"; packageName = "copy-to-clipboard"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.2.tgz"; - sha512 = "Vme1Z6RUDzrb6xAI7EZlVZ5uvOk2F//GaxKUxajDqm9LhOVM1inxNAD2vy+UZDYsd0uyA9s7b3/FVZPSxqrCfg=="; + url = "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz"; + sha512 = "2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA=="; }; }; "copy-webpack-plugin-11.0.0" = { @@ -2317,13 +2299,13 @@ let sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; }; - "css-loader-6.7.1" = { + "css-loader-6.7.3" = { name = "css-loader"; packageName = "css-loader"; - version = "6.7.1"; + version = "6.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz"; - sha512 = "yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw=="; + url = "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz"; + sha512 = "qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ=="; }; }; "css-select-4.1.3" = { @@ -2731,13 +2713,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-8.24.0" = { + "eslint-8.30.0" = { name = "eslint"; packageName = "eslint"; - version = "8.24.0"; + version = "8.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.24.0.tgz"; - sha512 = "dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz"; + sha512 = "MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ=="; }; }; "eslint-config-airbnb-base-15.0.0" = { @@ -2776,13 +2758,13 @@ let sha512 = "hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA=="; }; }; - "eslint-plugin-vue-9.5.1" = { + "eslint-plugin-vue-9.8.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "9.5.1"; + version = "9.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.5.1.tgz"; - sha512 = "Y0sL2RY7Xc9S8kNih9lbwHIDmewUg9bfas6WSzsOWRgDXhIHKxRBZYNAnVcXBFfE+bMWHUA5GLChl7TcTYUI8w=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.8.0.tgz"; + sha512 = "E/AXwcTzunyzM83C2QqDHxepMzvI2y6x+mmeYHbVDQlKFqmKYvRrhaVixEeeG27uI44p9oKDFiyCRw4XxgtfHA=="; }; }; "eslint-scope-5.1.1" = { @@ -3100,13 +3082,13 @@ let sha512 = "8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="; }; }; - "follow-redirects-1.14.9" = { + "follow-redirects-1.15.2" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.9"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz"; - sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"; + sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; }; }; "form-data-4.0.0" = { @@ -3262,31 +3244,13 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-13.15.0" = { + "globals-13.19.0" = { name = "globals"; packageName = "globals"; - version = "13.15.0"; + version = "13.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz"; - sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; - }; - }; - "globals-13.17.0" = { - name = "globals"; - packageName = "globals"; - version = "13.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz"; - sha512 = "1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw=="; - }; - }; - "globby-11.1.0" = { - name = "globby"; - packageName = "globby"; - version = "11.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"; - sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; + url = "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz"; + sha512 = "dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ=="; }; }; "globby-13.1.1" = { @@ -3829,6 +3793,15 @@ let sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg=="; }; }; + "is-path-inside-3.0.3" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"; + sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; + }; + }; "is-plain-obj-3.0.0" = { name = "is-plain-obj"; packageName = "is-plain-obj"; @@ -4054,13 +4027,13 @@ let sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; }; }; - "json5-2.2.1" = { + "json5-2.2.2" = { name = "json5"; packageName = "json5"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; + url = "https://registry.npmjs.org/json5/-/json5-2.2.2.tgz"; + sha512 = "46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ=="; }; }; "kind-of-6.0.3" = { @@ -4090,13 +4063,22 @@ let sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; }; - "linkifyjs-3.0.5" = { + "linkify-html-4.0.2" = { + name = "linkify-html"; + packageName = "linkify-html"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/linkify-html/-/linkify-html-4.0.2.tgz"; + sha512 = "YcN3tsyutK2Y/uSuoG0zne8FQdoqzrAgNU5ko0DWE7M2oQ3ms4z/202f2W4TvRm9uxKdrsWAullfynANLaVMqw=="; + }; + }; + "linkifyjs-4.0.2" = { name = "linkifyjs"; packageName = "linkifyjs"; - version = "3.0.5"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/linkifyjs/-/linkifyjs-3.0.5.tgz"; - sha512 = "1Y9XQH65eQKA9p2xtk+zxvnTeQBG7rdAXSkUG97DmuI/Xhji9uaUzaWxRj6rf9YC0v8KKHkxav7tnLX82Sz5Fg=="; + url = "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.0.2.tgz"; + sha512 = "/VSoCZiglX0VMsXmL5PN3lRg45M86lrD9PskdkA2abWaTKap1bIcJ11LS4EE55bcUl9ZOR4eZ792UtQ9E/5xLA=="; }; }; "loader-runner-4.2.0" = { @@ -4126,15 +4108,6 @@ let sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="; }; }; - "loader-utils-2.0.2" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz"; - sha512 = "TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A=="; - }; - }; "locate-path-2.0.0" = { name = "locate-path"; packageName = "locate-path"; @@ -4216,6 +4189,15 @@ let sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; + "lru-cache-5.1.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; + }; + }; "lru-cache-6.0.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -4945,13 +4927,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.14" = { + "postcss-8.4.19" = { name = "postcss"; packageName = "postcss"; - version = "8.4.14"; + version = "8.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz"; - sha512 = "E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz"; + sha512 = "h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA=="; }; }; "postcss-modules-extract-imports-3.0.0" = { @@ -5053,6 +5035,15 @@ let sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; }; }; + "proxy-from-env-1.1.0" = { + name = "proxy-from-env"; + packageName = "proxy-from-env"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; + sha512 = "D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="; + }; + }; "pseudomap-1.0.2" = { name = "pseudomap"; packageName = "pseudomap"; @@ -5368,31 +5359,22 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sass-1.55.0" = { + "sass-1.57.1" = { name = "sass"; packageName = "sass"; - version = "1.55.0"; + version = "1.57.1"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.55.0.tgz"; - sha512 = "Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A=="; + url = "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz"; + sha512 = "O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw=="; }; }; - "sass-loader-13.0.2" = { + "sass-loader-13.2.0" = { name = "sass-loader"; packageName = "sass-loader"; - version = "13.0.2"; + version = "13.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.2.tgz"; - sha512 = "BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q=="; - }; - }; - "schema-utils-2.7.1" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz"; - sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; + url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.0.tgz"; + sha512 = "JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg=="; }; }; "schema-utils-3.0.0" = { @@ -5449,13 +5431,13 @@ let sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.3.7" = { + "semver-7.3.8" = { name = "semver"; packageName = "semver"; - version = "7.3.7"; + version = "7.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; - sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"; + sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; }; }; "send-0.17.2" = { @@ -5566,15 +5548,6 @@ let sha512 = "qx9go5yraB7ekT7bCMqUHJ5jEaOC/GXBxUWv+jeWnb7WzHUFdcQPGWk7YmAwFBaQBrogpuSqd/azbC2lZRqqmw=="; }; }; - "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=="; - }; - }; "slash-4.0.0" = { name = "slash"; packageName = "slash"; @@ -6043,13 +6016,13 @@ let sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; }; }; - "vue-2.7.10" = { + "vue-2.7.14" = { name = "vue"; packageName = "vue"; - version = "2.7.10"; + version = "2.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz"; - sha512 = "HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg=="; + url = "https://registry.npmjs.org/vue/-/vue-2.7.14.tgz"; + sha512 = "b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ=="; }; }; "vue-eslint-parser-8.3.0" = { @@ -6079,13 +6052,13 @@ let sha512 = "BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="; }; }; - "vue-loader-15.10.0" = { + "vue-loader-15.10.1" = { name = "vue-loader"; packageName = "vue-loader"; - version = "15.10.0"; + version = "15.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz"; - sha512 = "VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg=="; + url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz"; + sha512 = "SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA=="; }; }; "vue-meta-2.4.0" = { @@ -6142,13 +6115,13 @@ let sha512 = "sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg=="; }; }; - "vue-template-compiler-2.7.10" = { + "vue-template-compiler-2.7.14" = { name = "vue-template-compiler"; packageName = "vue-template-compiler"; - version = "2.7.10"; + version = "2.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz"; - sha512 = "QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ=="; + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz"; + sha512 = "zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ=="; }; }; "vue-template-es2015-compiler-1.9.1" = { @@ -6187,22 +6160,22 @@ let sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; }; }; - "webpack-5.74.0" = { + "webpack-5.75.0" = { name = "webpack"; packageName = "webpack"; - version = "5.74.0"; + version = "5.75.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz"; - sha512 = "A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz"; + sha512 = "piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ=="; }; }; - "webpack-bundle-analyzer-4.6.1" = { + "webpack-bundle-analyzer-4.7.0" = { name = "webpack-bundle-analyzer"; packageName = "webpack-bundle-analyzer"; - version = "4.6.1"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.6.1.tgz"; - sha512 = "oKz9Oz9j3rUciLNfpGFjOb49/jEpXNmWdVH8Ls//zNcnLlQdTGXQQMsBbb/gR7Zl8WNLxVCq+0Hqbx3zv6twBw=="; + url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz"; + sha512 = "j9b8ynpJS4K+zfO5GGwsAcQX4ZHpWV+yRiHDiL+bE0XHJ8NiPYLTNVQdlFYWxtpg9lfAQNlwJg16J9AJtFSXRg=="; }; }; "webpack-cli-4.10.0" = { @@ -6358,6 +6331,15 @@ let sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; + "yallist-3.1.1" = { + name = "yallist"; + packageName = "yallist"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + }; + }; "yallist-4.0.0" = { name = "yallist"; packageName = "yallist"; @@ -6385,11 +6367,11 @@ let dependencies = [ sources."@ampproject/remapping-2.1.1" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.3" - (sources."@babel/core-7.19.3" // { + sources."@babel/compat-data-7.20.5" + (sources."@babel/core-7.20.7" // { dependencies = [ sources."debug-4.3.4" - sources."json5-2.2.1" + sources."json5-2.2.2" sources."ms-2.1.2" sources."semver-6.3.0" ]; @@ -6400,12 +6382,14 @@ let sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.19.3" + sources."@babel/generator-7.20.7" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.6" - (sources."@babel/helper-compilation-targets-7.19.3" // { + (sources."@babel/helper-compilation-targets-7.20.7" // { dependencies = [ + sources."lru-cache-5.1.1" sources."semver-6.3.0" + sources."yallist-3.1.1" ]; }) sources."@babel/helper-create-class-features-plugin-7.18.6" @@ -6423,24 +6407,24 @@ let sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-member-expression-to-functions-7.18.9" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.19.0" + sources."@babel/helper-module-transforms-7.20.7" sources."@babel/helper-optimise-call-expression-7.18.6" - sources."@babel/helper-plugin-utils-7.19.0" + sources."@babel/helper-plugin-utils-7.20.2" sources."@babel/helper-remap-async-to-generator-7.18.9" - sources."@babel/helper-replace-supers-7.18.9" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-replace-supers-7.19.1" + sources."@babel/helper-simple-access-7.20.2" sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" sources."@babel/helper-wrap-function-7.18.10" - sources."@babel/helpers-7.19.0" + sources."@babel/helpers-7.20.7" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.20.7" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" - sources."@babel/plugin-proposal-async-generator-functions-7.19.1" + sources."@babel/plugin-proposal-async-generator-functions-7.20.1" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-class-static-block-7.18.6" sources."@babel/plugin-proposal-dynamic-import-7.18.6" @@ -6449,7 +6433,7 @@ let sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.18.9" + sources."@babel/plugin-proposal-object-rest-spread-7.20.2" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" sources."@babel/plugin-proposal-optional-chaining-7.18.9" sources."@babel/plugin-proposal-private-methods-7.18.6" @@ -6460,7 +6444,7 @@ let sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-import-assertions-7.18.6" + sources."@babel/plugin-syntax-import-assertions-7.20.0" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" @@ -6473,10 +6457,10 @@ let sources."@babel/plugin-transform-arrow-functions-7.18.6" sources."@babel/plugin-transform-async-to-generator-7.18.6" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.18.9" - sources."@babel/plugin-transform-classes-7.19.0" + sources."@babel/plugin-transform-block-scoping-7.20.2" + sources."@babel/plugin-transform-classes-7.20.2" sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.18.13" + sources."@babel/plugin-transform-destructuring-7.20.2" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -6484,14 +6468,14 @@ let sources."@babel/plugin-transform-function-name-7.18.9" sources."@babel/plugin-transform-literals-7.18.9" sources."@babel/plugin-transform-member-expression-literals-7.18.6" - sources."@babel/plugin-transform-modules-amd-7.18.6" - sources."@babel/plugin-transform-modules-commonjs-7.18.6" - sources."@babel/plugin-transform-modules-systemjs-7.19.0" + sources."@babel/plugin-transform-modules-amd-7.19.6" + sources."@babel/plugin-transform-modules-commonjs-7.19.6" + sources."@babel/plugin-transform-modules-systemjs-7.19.6" sources."@babel/plugin-transform-modules-umd-7.18.6" sources."@babel/plugin-transform-named-capturing-groups-regex-7.19.1" sources."@babel/plugin-transform-new-target-7.18.6" sources."@babel/plugin-transform-object-super-7.18.6" - sources."@babel/plugin-transform-parameters-7.18.8" + sources."@babel/plugin-transform-parameters-7.20.1" sources."@babel/plugin-transform-property-literals-7.18.6" sources."@babel/plugin-transform-regenerator-7.18.6" sources."@babel/plugin-transform-reserved-words-7.18.6" @@ -6502,41 +6486,40 @@ let sources."@babel/plugin-transform-typeof-symbol-7.18.9" sources."@babel/plugin-transform-unicode-escapes-7.18.10" sources."@babel/plugin-transform-unicode-regex-7.18.6" - (sources."@babel/preset-env-7.19.3" // { + (sources."@babel/preset-env-7.20.2" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.14.6" - sources."@babel/template-7.18.10" - (sources."@babel/traverse-7.19.3" // { + sources."@babel/template-7.20.7" + (sources."@babel/traverse-7.20.7" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.19.3" + sources."@babel/types-7.20.7" sources."@discoveryjs/json-ext-0.5.5" - (sources."@eslint/eslintrc-1.3.2" // { + (sources."@eslint/eslintrc-1.4.0" // { dependencies = [ sources."debug-4.3.3" - sources."globals-13.15.0" + sources."globals-13.19.0" sources."ms-2.1.2" ]; }) - sources."@fortawesome/fontawesome-common-types-6.2.0" - sources."@fortawesome/fontawesome-svg-core-6.2.0" - sources."@fortawesome/free-brands-svg-icons-6.2.0" - sources."@fortawesome/free-solid-svg-icons-6.2.0" - sources."@fortawesome/vue-fontawesome-2.0.8" - (sources."@humanwhocodes/config-array-0.10.5" // { + sources."@fortawesome/fontawesome-common-types-6.2.1" + sources."@fortawesome/fontawesome-svg-core-6.2.1" + sources."@fortawesome/free-brands-svg-icons-6.2.1" + sources."@fortawesome/free-solid-svg-icons-6.2.1" + sources."@fortawesome/vue-fontawesome-2.0.9" + (sources."@humanwhocodes/config-array-0.11.8" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@humanwhocodes/gitignore-to-minimatch-1.0.2" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" sources."@jridgewell/gen-mapping-0.3.2" @@ -6546,9 +6529,9 @@ let sources."@jridgewell/trace-mapping-0.3.13" sources."@leichtgewicht/ip-codec-2.0.3" sources."@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."@polka/url-1.0.0-next.21" sources."@types/body-parser-1.19.2" sources."@types/bonjour-3.5.10" @@ -6574,7 +6557,7 @@ let sources."@types/serve-static-1.13.10" sources."@types/sockjs-0.3.33" sources."@types/ws-8.5.3" - sources."@vue/compiler-sfc-2.7.10" + sources."@vue/compiler-sfc-2.7.14" (sources."@vue/component-compiler-utils-3.2.2" // { dependencies = [ sources."picocolors-0.2.1" @@ -6637,15 +6620,15 @@ let ]; }) sources."asynckit-0.4.0" - sources."axios-0.27.2" - (sources."babel-loader-8.2.5" // { + sources."axios-1.2.2" + (sources."babel-loader-9.1.0" // { dependencies = [ - sources."json5-2.2.1" - sources."loader-utils-2.0.2" - sources."schema-utils-2.7.1" + sources."ajv-8.11.2" + sources."ajv-keywords-5.1.0" + sources."json-schema-traverse-1.0.0" + sources."schema-utils-4.0.0" ]; }) - sources."babel-plugin-dynamic-import-node-2.3.3" (sources."babel-plugin-polyfill-corejs2-0.3.3" // { dependencies = [ sources."semver-6.3.0" @@ -6655,7 +6638,7 @@ let sources."babel-plugin-polyfill-regenerator-0.4.1" sources."balanced-match-1.0.0" sources."batch-0.6.1" - sources."before-build-webpack-0.2.12" + sources."before-build-webpack-0.2.13" sources."big.js-5.2.2" sources."binary-extensions-2.2.0" sources."bluebird-3.7.2" @@ -6707,7 +6690,7 @@ let sources."convert-source-map-1.8.0" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."copy-to-clipboard-3.3.2" + sources."copy-to-clipboard-3.3.3" (sources."copy-webpack-plugin-11.0.0" // { dependencies = [ sources."ajv-8.11.0" @@ -6721,7 +6704,7 @@ let sources."core-js-compat-3.25.1" sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" - sources."css-loader-6.7.1" + sources."css-loader-6.7.3" sources."css-select-4.1.3" sources."css-what-5.1.0" sources."cssesc-3.0.0" @@ -6781,10 +6764,9 @@ let sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.24.0" // { + (sources."eslint-8.30.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."array-union-2.1.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -6794,15 +6776,14 @@ let sources."estraverse-5.3.0" sources."find-up-5.0.0" sources."glob-parent-6.0.2" - sources."globals-13.17.0" - sources."globby-11.1.0" + sources."globals-13.19.0" sources."has-flag-4.0.0" + sources."is-path-inside-3.0.3" sources."locate-path-6.0.0" sources."ms-2.1.2" sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."path-exists-4.0.0" - sources."slash-3.0.0" sources."supports-color-7.2.0" ]; }) @@ -6828,7 +6809,7 @@ let sources."doctrine-2.1.0" ]; }) - (sources."eslint-plugin-vue-9.5.1" // { + (sources."eslint-plugin-vue-9.8.0" // { dependencies = [ sources."debug-4.3.4" sources."eslint-scope-7.1.1" @@ -6902,7 +6883,7 @@ let sources."flat-5.0.2" sources."flat-cache-3.0.4" sources."flatted-3.2.4" - sources."follow-redirects-1.14.9" + sources."follow-redirects-1.15.2" sources."form-data-4.0.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" @@ -7062,7 +7043,8 @@ let sources."kind-of-6.0.3" sources."klona-2.0.5" sources."levn-0.4.1" - sources."linkifyjs-3.0.5" + sources."linkify-html-4.0.2" + sources."linkifyjs-4.0.2" sources."loader-runner-4.2.0" (sources."loader-utils-1.4.0" // { dependencies = [ @@ -7163,7 +7145,7 @@ let sources."pinkie-promise-2.0.1" sources."plurals-cldr-2.0.1" sources."popper.js-1.16.1" - sources."postcss-8.4.14" + sources."postcss-8.4.19" sources."postcss-modules-extract-imports-3.0.0" sources."postcss-modules-local-by-default-4.0.0" sources."postcss-modules-scope-3.0.0" @@ -7179,6 +7161,7 @@ let sources."ipaddr.js-1.9.1" ]; }) + sources."proxy-from-env-1.1.0" sources."pseudomap-1.0.2" sources."punycode-2.1.1" sources."qs-6.9.7" @@ -7218,12 +7201,12 @@ let sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sass-1.55.0" - sources."sass-loader-13.0.2" + sources."sass-1.57.1" + sources."sass-loader-13.2.0" sources."schema-utils-3.1.1" sources."select-hose-2.0.0" sources."selfsigned-2.1.1" - (sources."semver-7.3.7" // { + (sources."semver-7.3.8" // { dependencies = [ sources."lru-cache-6.0.0" sources."yallist-4.0.0" @@ -7333,7 +7316,7 @@ let sources."uuid-8.3.2" sources."v-tooltip-2.1.3" sources."vary-1.1.2" - sources."vue-2.7.10" + sources."vue-2.7.14" (sources."vue-eslint-parser-8.3.0" // { dependencies = [ sources."debug-4.3.3" @@ -7343,20 +7326,20 @@ let ]; }) sources."vue-hot-reload-api-2.3.4" - sources."vue-loader-15.10.0" + sources."vue-loader-15.10.1" sources."vue-meta-2.4.0" sources."vue-multiselect-2.1.6" sources."vue-resize-1.0.1" sources."vue-router-3.6.5" sources."vue-snotify-3.2.1" sources."vue-style-loader-4.1.3" - sources."vue-template-compiler-2.7.10" + sources."vue-template-compiler-2.7.14" sources."vue-template-es2015-compiler-1.9.1" sources."vuex-3.6.2" sources."watchpack-2.4.0" sources."wbuf-1.7.3" - sources."webpack-5.74.0" - (sources."webpack-bundle-analyzer-4.6.1" // { + sources."webpack-5.75.0" + (sources."webpack-bundle-analyzer-4.7.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh index 8a382ee25fb4..a0c296900e39 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../../.. -i bash -p nodePackages.node2nix gnused jq curl -set -eoux pipefail +#! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix gnused jq curl +set -eou pipefail cd "$(dirname "$0")" pushd ../../../../.. diff --git a/pkgs/applications/misc/HentaiAtHome/default.nix b/pkgs/applications/misc/HentaiAtHome/default.nix index 4932379ef02d..4c94fa83485c 100644 --- a/pkgs/applications/misc/HentaiAtHome/default.nix +++ b/pkgs/applications/misc/HentaiAtHome/default.nix @@ -1,5 +1,4 @@ { buildPackages -, buildPlatform , fetchzip , javaOpts ? "-XX:+UseZGC" , jdk @@ -23,7 +22,7 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ jdk makeWrapper ]; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = lib.optionalString (buildPlatform.libc == "glibc") + LOCALE_ARCHIVE = lib.optionalString (stdenvNoCC.buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; buildPhase = '' diff --git a/pkgs/applications/misc/ablog/default.nix b/pkgs/applications/misc/ablog/default.nix index e578caad529b..48541402d4bc 100644 --- a/pkgs/applications/misc/ablog/default.nix +++ b/pkgs/applications/misc/ablog/default.nix @@ -6,11 +6,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "ablog"; - version = "0.10.29"; + version = "0.10.33"; src = fetchPypi { inherit pname version; - sha256 = "sha256-q2zoXCmnzzjXSBGFKzondOQRz7CjZp0wCiXxbgpXHIA="; + sha256 = "sha256-vCkLX64aPAem0QvKI1iUNAHWEJZlAOIb1DA9U7xPJkU="; }; propagatedBuildInputs = [ @@ -21,7 +21,7 @@ buildPythonApplication rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/pkgs/applications/misc/adobe-reader/builder.sh index 41281385c990..6047c0826430 100644 --- a/pkgs/applications/misc/adobe-reader/builder.sh +++ b/pkgs/applications/misc/adobe-reader/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup echo "unpacking $src..." diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 84499448a41b..1eb648bf188e 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -55,9 +55,7 @@ stdenv.mkDerivation rec { done ''; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "A fast and flexible keyboard launcher"; diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index 9e38a208e179..1362bab0afc3 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -53,9 +53,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 9ddcdc92c5bd..59af845e2948 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -44,6 +44,13 @@ stdenv.mkDerivation rec { hash = "sha256-9cpOwio69GvzVeDq79BSmJgds9WU5kA/KUlAkHcpN5c="; }; + outputs = [ + "out" + "dev" + "lib" + "man" + ]; + nativeBuildInputs = [ autoreconfHook autoconf-archive @@ -71,7 +78,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Sample Rate Converter for audio"; - homepage = "http://sox.sourceforge.net/"; + homepage = "https://sox.sourceforge.net/"; maintainers = with maintainers; [ marcweber ]; license = if enableAMR then licenses.unfree else licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/applications/misc/audio/wavrsocvt/default.nix b/pkgs/applications/misc/audio/wavrsocvt/default.nix index 10aac715b48a..c9f97c5602b2 100644 --- a/pkgs/applications/misc/audio/wavrsocvt/default.nix +++ b/pkgs/applications/misc/audio/wavrsocvt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "1.0.2.0"; src = fetchurl { - url = "http://bricxcc.sourceforge.net/wavrsocvt.tgz"; + url = "https://bricxcc.sourceforge.net/wavrsocvt.tgz"; sha256 = "15qlvdfwbiclljj7075ycm78yzqahzrgl4ky8pymix5179acm05h"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation { supported sample rates in the standard NXT firmware). You can then upload these with e.g. nxt-python. ''; - homepage = "http://bricxcc.sourceforge.net/"; + homepage = "https://bricxcc.sourceforge.net/"; license = licenses.mpl11; maintainers = with maintainers; [ leenaars ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 85579f052196..8758e5fe92f6 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.24.4"; + version = "1.26.2"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "sha256-YO0K8L03n/KQcINRKwls8BxG8nv5k3Myd95AU8agigI="; + hash = "sha256-jN4xKgdNO+LyDy+ySM13M5YCaijDq8zAxS+x4Io1ThE="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix index cdf6ca3e6f80..5fb336d8de37 100644 --- a/pkgs/applications/misc/authenticator/default.nix +++ b/pkgs/applications/misc/authenticator/default.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream-glib - clang desktop-file-utils meson ninja @@ -52,6 +51,7 @@ stdenv.mkDerivation rec { cargoSetupHook rust.cargo rust.rustc + bindgenHook ]); buildInputs = [ @@ -69,13 +69,16 @@ stdenv.mkDerivation rec { zbar ]; - LIBCLANG_PATH = "${lib.getLib libclang}/lib"; + # https://gitlab.gnome.org/World/Authenticator/-/issues/362 + preBuild = '' + export BINDGEN_EXTRA_CLANG_ARGS="$BINDGEN_EXTRA_CLANG_ARGS -DPW_ENABLE_DEPRECATED" + ''; meta = { description = "Two-factor authentication code generator for GNOME"; homepage = "https://gitlab.gnome.org/World/Authenticator"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ dotlambda ]; + maintainers = with lib.maintainers; [ austinbutler ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix index 2b6cd7049a5c..e5514f736cd2 100644 --- a/pkgs/applications/misc/authy/default.nix +++ b/pkgs/applications/misc/authy/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "authy"; # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version' - version = "2.2.1"; - rev = "11"; + version = "2.2.2"; + rev = "12"; src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap"; - sha256 = "sha256-/a0pMXVd7mEp7oaN2mBIJv5uOv1zQ3gvfgiz1XL9ZmM="; + sha256 = "sha256-vSbqT2s5lLEU1SSDaC+sS6qt446iSKYUgKudO5WMOu4="; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ]; diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index 37898709493e..1618bf746ce0 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.6.2"; + version = "1.6.4"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "sha256-3T0vpyAw21u2+csqaz3Yf10G8IQRDyjReedIo+I4fvw="; + sha256 = "sha256-Z5j5tSIF3AZiZjkFFtyyi3hMqWMXtf6ont2CQ/FSEjk="; }; buildInputs = [ libnotify glib ]; diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 5b78e9993201..ced6a70a2468 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.13"; + version = "0.6.14"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "sha256-YGaAJOyVZBHEWQuZVfPIIbtuntv1klQk9GcWRN+oVF4="; + sha256 = "sha256-bMnnuT+LNNKphmvVcD1aaNZxasSGOEcAveC4stCieG8="; }; nativeBuildInputs = [ pkg-config pcre ]; diff --git a/pkgs/applications/misc/bitwarden-menu/default.nix b/pkgs/applications/misc/bitwarden-menu/default.nix new file mode 100644 index 000000000000..95ec2826a52a --- /dev/null +++ b/pkgs/applications/misc/bitwarden-menu/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonApplication +, fetchPypi +, pynput +, xdg +}: + +buildPythonApplication rec { + pname = "bitwarden-menu"; + version = "0.4.1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-OC+MHEiUU6bDT2wSSDtu0KnwDwBpbLTBta0xjfuzlOI="; + }; + + propagatedBuildInputs = [ + pynput + xdg + ]; + + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/firecat53/bitwarden-menu/releases/tag/v${version}"; + description = "Dmenu/Rofi frontend for managing Bitwarden vaults. Uses the Bitwarden CLI tool to interact with the Bitwarden database."; + homepage = "https://github.com/firecat53/bitwarden-menu"; + license = licenses.mit; + maintainers = [ maintainers.rodrgz ]; + }; +} diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index d40a57323a13..7a667b187566 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -7,7 +7,6 @@ , glib , gtk3 , libnotify -, scandir ? null }: python3Packages.buildPythonApplication rec { @@ -37,7 +36,6 @@ python3Packages.buildPythonApplication rec { chardet pygobject3 requests - scandir ]; # Patch the many hardcoded uses of /usr/share/ and /usr/bin diff --git a/pkgs/applications/misc/blender/darwin.patch b/pkgs/applications/misc/blender/darwin.patch index d5156bfad3d9..c86aa2444602 100644 --- a/pkgs/applications/misc/blender/darwin.patch +++ b/pkgs/applications/misc/blender/darwin.patch @@ -1,7 +1,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1832,7 +1832,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO) +@@ -1894,7 +1894,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO) ADD_CHECK_CXX_COMPILER_FLAG(CXX_PREFIX_MAP_FLAGS CXX_MACRO_PREFIX_MAP -fmacro-prefix-map=foo=bar) if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP) if(APPLE) @@ -58,10 +58,10 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake - theora theoradec theoraenc vorbis vorbisenc - vorbisfile vpx x264 xvidcore) + swresample swscale) - find_package(FFmpeg) - endif() - -@@ -270,7 +263,6 @@ if(WITH_BOOST) + if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a) + list(APPEND FFMPEG_FIND_COMPONENTS aom) + endif() +@@ -273,7 +266,6 @@ if(WITH_BOOST) endif() if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG) @@ -69,7 +69,7 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake endif() if(WITH_PUGIXML) -@@ -399,7 +391,7 @@ endif() +@@ -402,7 +394,7 @@ endif() # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags. if(WITH_OPENMP) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 1d617718ff90..429097842630 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,7 +1,7 @@ { 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, python310Packages +, libtiff, libwebp, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio, openjpeg, python310Packages , openvdb, libXxf86vm, tbb, alembic , zlib, zstd, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , jackaudioSupport ? false, libjack2 @@ -16,7 +16,6 @@ , embree, gmp, libharu }: -with lib; let python = python310Packages.python; optix = fetchzip { @@ -38,11 +37,11 @@ stdenv.mkDerivation rec { patches = lib.optional stdenv.isDarwin ./darwin.patch; nativeBuildInputs = [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev ] - ++ optionals cudaSupport [ addOpenGLRunpath ]; + ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; buildInputs = [ boost ffmpeg gettext glew ilmbase - freetype libjpeg libpng libsamplerate libsndfile libtiff - opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib zstd fftw jemalloc + freetype libjpeg libpng libsamplerate libsndfile libtiff libwebp + opencolorio openexr openimagedenoise openimageio openjpeg python zlib zstd fftw jemalloc alembic (opensubdiv.override { inherit cudaSupport; }) tbb @@ -63,10 +62,10 @@ stdenv.mkDerivation rec { else [ llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL ]) - ++ optional jackaudioSupport libjack2 - ++ optional cudaSupport cudaPackages.cudatoolkit - ++ optional colladaSupport opencollada - ++ optional spaceNavSupport libspnav; + ++ lib.optional jackaudioSupport libjack2 + ++ lib.optional cudaSupport cudaPackages.cudatoolkit + ++ lib.optional colladaSupport opencollada + ++ lib.optional spaceNavSupport libspnav; pythonPath = with python310Packages; [ numpy requests ]; postPatch = '' @@ -118,16 +117,16 @@ stdenv.mkDerivation rec { "-DWITH_IMAGE_OPENJPEG=ON" "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" ] - ++ optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ "-DWITH_CYCLES_OSL=OFF" # requires LLVM "-DWITH_OPENVDB=OFF" # OpenVDB currently doesn't build on darwin "-DLIBDIR=/does-not-exist" ] # Clang doesn't support "-export-dynamic" - ++ optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" - ++ optional jackaudioSupport "-DWITH_JACK=ON" - ++ optionals cudaSupport [ + ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" + ++ lib.optional jackaudioSupport "-DWITH_JACK=ON" + ++ lib.optionals cudaSupport [ "-DWITH_CYCLES_CUDA_BINARIES=ON" "-DWITH_CYCLES_DEVICE_OPTIX=ON" "-DOPTIX_ROOT_DIR=${optix}" @@ -137,7 +136,7 @@ stdenv.mkDerivation rec { # Since some dependencies are built with gcc 6, we need gcc 6's # libstdc++ in our RPATH. Sigh. - NIX_LDFLAGS = optionalString cudaSupport "-rpath ${stdenv.cc.cc.lib}/lib"; + NIX_LDFLAGS = lib.optionalString cudaSupport "-rpath ${stdenv.cc.cc.lib}/lib"; blenderExecutable = placeholder "out" + (if stdenv.isDarwin then "/Applications/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); @@ -154,7 +153,7 @@ stdenv.mkDerivation rec { # Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be # found. See the explanation in libglvnd. - postFixup = optionalString cudaSupport '' + postFixup = lib.optionalString cudaSupport '' for program in $out/bin/blender $out/bin/.blender-wrapped; do isELF "$program" || continue addOpenGLRunpath "$program" diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 3ac928a3d36f..7fcd3e37481f 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -14,55 +14,33 @@ , gtk4 , gtksourceview5 , libadwaita -, steam , cabextract , p7zip , xdpyinfo , imagemagick +, lsb-release +, pciutils , procps , gamescope , mangohud +, vkbasalt-cli , vmtouch -, wine -, 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 = "2022.10.14.1"; + pname = "bottles-unwrapped"; + version = "50.2"; src = fetchFromGitHub { owner = "bottlesdevs"; - repo = pname; + repo = "bottles"; rev = version; - sha256 = "sha256-FO91GSGlc2f3TSLrlmRDPi5p933/Y16tdEpX4RcKhL0="; + sha256 = "sha256-+r/r3vExnvYQIicKAEmwZ+eRSep6kWte5k7gu9jC67w="; }; patches = [ ./vulkan_icd.patch ]; - postPatch = '' - chmod +x build-aux/meson/postinstall.py - patchShebangs build-aux/meson/postinstall.py - - substituteInPlace bottles/backend/wine/winecommand.py \ - --replace \ - "command = f\"{runner} {command}\"" \ - "command = f\"{''' if runner == 'wine' or runner == 'wine64' else '${steam-run}/bin/steam-run '}{runner} {command}\"" \ - --replace \ - "command = f\"{_picked['entry_point']} {command}\"" \ - "command = f\"${steam-run}/bin/steam-run {_picked['entry_point']} {command}\"" - ''; - + # https://github.com/bottlesdevs/Bottles/wiki/Packaging nativeBuildInputs = [ blueprint-compiler meson @@ -82,6 +60,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ + pycurl pyyaml requests pygobject3 @@ -101,12 +80,16 @@ python3Packages.buildPythonApplication rec { p7zip xdpyinfo imagemagick - procps + vkbasalt-cli gamescope mangohud vmtouch - wine + + # Undocumented (subprocess.Popen()) + lsb-release + pciutils + procps ]; format = "other"; diff --git a/pkgs/applications/misc/bottles/fhsenv.nix b/pkgs/applications/misc/bottles/fhsenv.nix new file mode 100644 index 000000000000..34036894d6e6 --- /dev/null +++ b/pkgs/applications/misc/bottles/fhsenv.nix @@ -0,0 +1,112 @@ +{ lib +, buildFHSUserEnvBubblewrap +, symlinkJoin +, bottles-unwrapped +, gst_all_1 +, extraPkgs ? pkgs: [ ] +, extraLibraries ? pkgs: [ ] +}: + +let fhsEnv = { + targetPkgs = pkgs: with pkgs; [ + bottles-unwrapped + # This only allows to enable the toggle, vkBasalt won't work if not installed with environment.systemPackages (or nix-env) + # See https://github.com/bottlesdevs/Bottles/issues/2401 + vkbasalt + ] ++ extraPkgs pkgs; + + multiPkgs = + let + xorgDeps = pkgs: with pkgs.xorg; [ + libpthreadstubs + libSM + libX11 + libXaw + libxcb + libXcomposite + libXcursor + libXdmcp + libXext + libXi + libXinerama + libXmu + libXrandr + libXrender + libXv + libXxf86vm + ]; + in + pkgs: with pkgs; [ + # https://wiki.winehq.org/Building_Wine + alsa-lib + cups + dbus + fontconfig + freetype + glib + gnutls + libglvnd + gsm + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + gst_all_1.gst-plugins-bad + gst_all_1.gst-libav + libgphoto2 + libjpeg_turbo + libkrb5 + libpcap + libpng + libpulseaudio + libtiff + libunwind + libusb1 + libv4l + libxml2 + mpg123 + ocl-icd + openldap + samba4 + sane-backends + SDL2 + udev + vulkan-loader + + # https://www.gloriouseggroll.tv/how-to-get-out-of-wine-dependency-hell/ + alsa-plugins + dosbox + giflib + gtk3 + libva + libxslt + ncurses + openal + + # Steam runtime + libgcrypt + libgpg-error + p11-kit + zlib # Freetype + ] ++ xorgDeps pkgs + ++ extraLibraries pkgs; + + profile = '' + export GST_PLUGIN_PATH=/usr/lib32/gstreamer-1.0:/usr/lib64/gstreamer-1.0 + ''; +}; +in +symlinkJoin { + name = "bottles"; + paths = [ + (buildFHSUserEnvBubblewrap (fhsEnv // { name = "bottles"; runScript = "bottles"; })) + (buildFHSUserEnvBubblewrap (fhsEnv // { name = "bottles-cli"; runScript = "bottles-cli"; })) + ]; + postBuild = '' + mkdir -p $out/share + ln -s ${bottles-unwrapped}/share/applications $out/share + ln -s ${bottles-unwrapped}/share/icons $out/share + ''; + + inherit (bottles-unwrapped) meta; +} diff --git a/pkgs/applications/misc/bottles/vulkan_icd.patch b/pkgs/applications/misc/bottles/vulkan_icd.patch index d638917151ea..ff376e136bb2 100644 --- a/pkgs/applications/misc/bottles/vulkan_icd.patch +++ b/pkgs/applications/misc/bottles/vulkan_icd.patch @@ -1,13 +1,15 @@ diff --git a/bottles/backend/utils/vulkan.py b/bottles/backend/utils/vulkan.py -index 6673493..07f70d1 100644 +index 6673493..9191004 100644 --- a/bottles/backend/utils/vulkan.py +++ b/bottles/backend/utils/vulkan.py -@@ -29,6 +29,8 @@ class VulkanUtils: +@@ -28,7 +28,9 @@ class VulkanUtils: + "/usr/share/vulkan", "/etc/vulkan", "/usr/local/share/vulkan", - "/usr/local/etc/vulkan" -+ "/run/opengl-driver/share/vulkan/", -+ "/run/opengl-driver-32/share/vulkan/", +- "/usr/local/etc/vulkan" ++ "/usr/local/etc/vulkan", ++ "/run/opengl-driver/share/vulkan", ++ "/run/opengl-driver-32/share/vulkan", ] if "FLATPAK_ID" in os.environ: __vk_icd_dirs += [ diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 702440c32b5e..249288c77c16 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -28,7 +28,7 @@ with python3.pkgs; buildPythonApplication rec { sha256 = "sha256-7piJK1hz9h6EWiU/q5MAS1PSvHFxnW7rZBKxq+wda1c="; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytest pytest-vcr diff --git a/pkgs/applications/misc/calcoo/default.nix b/pkgs/applications/misc/calcoo/default.nix index 4af71bae653e..b0fc6da5eb46 100644 --- a/pkgs/applications/misc/calcoo/default.nix +++ b/pkgs/applications/misc/calcoo/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://calcoo.sourceforge.net/"; + homepage = "https://calcoo.sourceforge.net/"; description = "RPN and algebraic scientific calculator"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index accfcfa2c237..acfe1d9284e5 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -25,16 +25,17 @@ , sqlite , wrapQtAppsHook , xdg-utils +, wrapGAppsHook , unrarSupport ? false }: stdenv.mkDerivation rec { pname = "calibre"; - version = "6.8.0"; + version = "6.11.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-d9JaWjAjJzKldjyrdrl6OyX1JSatp9U8agRog7K5n2s="; + hash = "sha256-ylOZ5ljA5uBb2bX/qFhsmPQW6dJVEH9jxQaR2u8C4Wc="; }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1 @@ -46,8 +47,8 @@ stdenv.mkDerivation rec { hash = "sha256-uL1mSjgCl5ZRLbSuKxJM6XTfvVwog70F7vgKtQzQNEQ="; }) (fetchpatch { - name = "0006-Hardening-Qt-code.patch"; - url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0006-Hardening-Qt-code.patch"; + name = "0007-Hardening-Qt-code.patch"; + url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0007-Hardening-Qt-code.patch"; hash = "sha256-CutVTb7K4tjewq1xAjHEGUHFcuuP/Z4FFtj4xQb4zKQ="; }) ] @@ -71,6 +72,7 @@ stdenv.mkDerivation rec { pkg-config qmake removeReferencesTo + wrapGAppsHook wrapQtAppsHook ]; @@ -94,7 +96,7 @@ stdenv.mkDerivation rec { xdg-utils ] ++ ( with python3Packages; [ - (apsw.overrideAttrs (oldAttrs: rec { + (apsw.overrideAttrs (oldAttrs: { setupPyBuildFlags = [ "--enable=load_extension" ]; })) beautifulsoup4 @@ -169,6 +171,7 @@ stdenv.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: @@ -178,7 +181,9 @@ stdenv.mkDerivation rec { $out/lib/calibre/calibre/plugins/podofo.so for program in $out/bin/*; do - wrapQtApp $program \ + wrapProgram $program \ + ''${qtWrapperArgs[@]} \ + ''${gappsWrapperArgs[@]} \ --prefix PYTHONPATH : $PYTHONPATH \ --prefix PATH : ${poppler_utils.out}/bin done diff --git a/pkgs/applications/misc/cask-server/default.nix b/pkgs/applications/misc/cask-server/default.nix new file mode 100644 index 000000000000..8a237a14bded --- /dev/null +++ b/pkgs/applications/misc/cask-server/default.nix @@ -0,0 +1,36 @@ +{ lib +, pkgs +, mkDerivation +, fetchFromGitHub +, cmake +, extra-cmake-modules +}: + +mkDerivation rec { + pname = "cask-server"; + version = "0.5.6"; + + src = fetchFromGitHub { + owner = "Nitrux"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-/dDrJcyp6+r6G3E0KPOEH0hEY9C5XIg1z2gRZV3GZcg="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + meta = with lib; { + description = "Public server and API to interface with Cask features"; + homepage = "https://github.com/Nitrux/cask-server"; + license = with licenses; [ + bsd2 + lgpl21Plus + cc0 + ]; + maintainers = with maintainers; [ onny ]; + }; + +} diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix index fb373938d5ac..8486db6f7fc0 100644 --- a/pkgs/applications/misc/cipher/default.nix +++ b/pkgs/applications/misc/cipher/default.nix @@ -49,9 +49,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/misc/citations/default.nix b/pkgs/applications/misc/citations/default.nix new file mode 100644 index 000000000000..928978ef47f4 --- /dev/null +++ b/pkgs/applications/misc/citations/default.nix @@ -0,0 +1,74 @@ +{ darwin +, desktop-file-utils +, fetchFromGitLab +, gettext +, glib +, gtk4 +, gtksourceview5 +, lib +, libadwaita +, meson +, ninja +, pkg-config +, poppler +, rustPlatform +, stdenv +, testers +, wrapGAppsHook4 +}: +stdenv.mkDerivation (finalAttrs: { + pname = "citations"; + version = "0.5.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = finalAttrs.pname; + rev = finalAttrs.version; + hash = "sha256-QPK6Nw0tDdttUDFKMgThTYMTxGXsn5OReqf1LNAai7g="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + src = finalAttrs.src; + name = "${finalAttrs.pname}-${finalAttrs.version}"; + hash = "sha256-Kounxi4JxoU4+rWMWNB8rzTyG3MDKYD0OzYfAHwm6bY="; + }; + + nativeBuildInputs = [ + desktop-file-utils + gettext + glib + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + gtk4 + gtksourceview5 + libadwaita + poppler + ] ++ lib.optional stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + ]; + + doCheck = true; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "citations --help"; + }; + + meta = with lib; { + description = "Manage your bibliographies using the BibTeX format"; + homepage = "https://apps.gnome.org/app/org.gnome.World.Citations"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ benediktbroich ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index d596a2444667..0ca80417df26 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "clightd"; - version = "5.6"; + version = "5.7"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "sha256-PxYOI/2ZOz3JSGCPIXfm3WfGZ19D8JhhdNS3FVuXus8="; + sha256 = "sha256-4daM6Z67d52v2LmzqSZ6RSAHznyZNEqvAdWCuVFi0Kw="; }; # dbus-1.pc has datadir=/etc diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix index 3592de5f1c65..4ca37673feeb 100644 --- a/pkgs/applications/misc/clight/default.nix +++ b/pkgs/applications/misc/clight/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clight"; - version = "4.8"; + version = "4.9"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clight"; rev = version; - sha256 = "sha256-nDI5Rq1iPVkj25HRpxmS9zxNDUy+9YsSwbZnEwYt86E="; + sha256 = "sha256-m1oKjyy7fMK6mIf5FRuWCbfAM8qlHXRR/rwHsCZADiY="; }; # dbus-1.pc has datadir=/etc diff --git a/pkgs/applications/misc/clipcat/default.nix b/pkgs/applications/misc/clipcat/default.nix index 38c0c103943a..be197e819371 100644 --- a/pkgs/applications/misc/clipcat/default.nix +++ b/pkgs/applications/misc/clipcat/default.nix @@ -14,8 +14,6 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1n4il3l59m2a6ca54vfaivzg25abf8s4w5kpd5q51p13624iz0kb"; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; @@ -23,8 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config - clang - llvmPackages.libclang + rustPlatform.bindgenHook rustfmt protobuf diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix index 1401a7a8df28..55bca8aa8058 100644 --- a/pkgs/applications/misc/cobang/default.nix +++ b/pkgs/applications/misc/cobang/default.nix @@ -67,7 +67,7 @@ buildPythonApplication rec { pango ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/applications/misc/conduktor/default.nix b/pkgs/applications/misc/conduktor/default.nix index 32d9e527dd49..6eb0e832bc95 100644 --- a/pkgs/applications/misc/conduktor/default.nix +++ b/pkgs/applications/misc/conduktor/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/conduktor/builds/releases/download/v${version}/Conduktor-linux-${version}.zip"; - sha256 = "1kr5yh9piqbl6njsnxgh6jzf3vifw8ja5x4qm4znmzi3r49sw0gx"; + sha256 = "sha256-9y/7jni5zIITUWd75AxsfG/b5vCYotmeMeC9aYM2WEs="; }; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index d79de578cab7..954d16ce3e73 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -1,42 +1,45 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake +, ninja , extra-cmake-modules , qtbase -, qtscript +, qtsvg +, qttools +, qtdeclarative , libXfixes , libXtst -, qtx11extras -, knotifications , qtwayland , wayland -, fetchpatch +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "CopyQ"; - version = "6.3.2"; + version = "6.4.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - hash = "sha256-Ge/TD9Llq4YTAqaL9LBEsgNI9qrf2jLDt7q2ZTI9rmE="; + hash = "sha256-HpWzIABzg0oJqzIehIGpeATLs3ZlmLgtRKaiMIUNAFI="; }; nativeBuildInputs = [ cmake + ninja extra-cmake-modules + wrapQtAppsHook ]; buildInputs = [ qtbase - qtscript + qtsvg + qttools + qtdeclarative libXfixes libXtst - qtx11extras - knotifications qtwayland wayland ]; @@ -46,13 +49,14 @@ mkDerivation rec { --replace copyq "$out/bin/copyq" ''; + cmakeFlags = [ "-DWITH_QT6=ON" ]; + meta = with lib; { homepage = "https://hluk.github.io/CopyQ"; description = "Clipboard Manager with Advanced Features"; license = licenses.gpl3Only; maintainers = with maintainers; [ artturin ]; # NOTE: CopyQ supports windows and osx, but I cannot test these. - # OSX build requires QT5. platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix new file mode 100644 index 000000000000..fb3e149bc8e8 --- /dev/null +++ b/pkgs/applications/misc/cotp/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, AppKit +, libxcb +}: + +rustPlatform.buildRustPackage rec { + name = "cotp"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "replydev"; + repo = "cotp"; + rev = "v${version}"; + hash = "sha256-DIb/lgJxwg+QuqzN/0YoUV1iZwRqh6PAN0KRK7TbWDs="; + }; + + cargoHash = "sha256-uvH4mdI8ya/MJJngXQ98oXjG7JjUdvPwIzvJrdwlOEE="; + + buildInputs = lib.optionals stdenv.isLinux [ libxcb ] + ++ lib.optionals stdenv.isDarwin [ AppKit ]; + + meta = with lib; { + homepage = "https://github.com/replydev/cotp"; + description = "Trustworthy, encrypted, command-line TOTP/HOTP authenticator app with import functionality"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ davsanchez ]; + }; +} diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix index 13386699ecbf..2d719e321fe6 100644 --- a/pkgs/applications/misc/coursera-dl/default.nix +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -20,7 +20,7 @@ in pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ attrs beautifulsoup4 configargparse keyring pyasn1 requests six urllib3 ]; - checkInputs = with pythonPackages; [ pytest mock ]; + nativeCheckInputs = with pythonPackages; [ pytest mock ]; postPatch = '' substituteInPlace requirements.txt \ @@ -38,9 +38,13 @@ in pythonPackages.buildPythonApplication rec { patches = [ (fetchpatch { - url = "https://github.com/coursera-dl/coursera-dl/pull/789.patch"; + url = "https://github.com/coursera-dl/coursera-dl/commit/c8796e567698be166cb15f54e095140c1a9b567e.patch"; sha256 = "sha256:07ca6zdyw3ypv7yzfv2kzmjvv86h0rwzllcg0zky27qppqz917bv"; }) + (fetchpatch { + url = "https://github.com/coursera-dl/coursera-dl/commit/6c221706ba828285ca7a30a08708e63e3891b36f.patch"; + sha256 = "sha256-/AKFvBPInSq/lsz+G0jVSl/ukVgCnt66oePAb+66AjI="; + }) ]; meta = with lib; { diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix index 4fc4dd8b6108..197e7ec86d08 100644 --- a/pkgs/applications/misc/cpu-x/default.nix +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -9,15 +9,20 @@ , libXtst }: +# Known issues: +# - The daemon can't be started from the GUI, because pkexec requires a shell +# registered in /etc/shells. The nix's bash is not in there when running +# cpu-x from nixpkgs. + stdenv.mkDerivation rec { pname = "cpu-x"; - version = "4.5.1"; + version = "4.5.2"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "v${version}"; - sha256 = "sha256-rmRfKw2KMLsO3qfy2QznCIugvM2CLSxBUDgIzONYULk="; + sha256 = "sha256-VPmwnzoOBNLDYZsoEknbcX7QP2Tcm08pL/rw1uCK8xM="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ]; @@ -40,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Free software that gathers information on CPU, motherboard and more"; - homepage = src.meta.homepage; + homepage = "https://thetumultuousunicornofdarkness.github.io/CPU-X"; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ viraptor ]; diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 4da0af251d5a..7ec45226785f 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "crow-translate"; - version = "2.10.1"; + version = "2.10.3"; src = fetchzip { url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz"; - hash = "sha256-xRXNT/IybcynS5S71XFFsx3PoLXDBcKuz81ybxoVtV4="; + hash = "sha256-K6mYzR4EIBHd0w/6Dpx4ldX4iDFszmfSLT6jNTfJlDQ="; }; patches = [ diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 5f7f101ad613..3912e8d221e9 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "2.6.1"; + version = "3.0.1"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-ZXqe+696dNYTkNidEA+s5QQ7Euu7WOdl0EMLU5pKdOY="; + sha256 = "sha256-UPphXaxq/Hnt1U3J+lgwa0lp3vX1B/Ou8eqD9rHe3sw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/darkman/default.nix b/pkgs/applications/misc/darkman/default.nix index 0114b353f20c..04b1af9bc2ae 100644 --- a/pkgs/applications/misc/darkman/default.nix +++ b/pkgs/applications/misc/darkman/default.nix @@ -36,9 +36,7 @@ buildGoModule rec { runHook postInstall ''; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Framework for dark-mode and light-mode transitions on Linux desktop"; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index e14aa6ece57e..3f613041ff93 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,30 +5,32 @@ buildGoModule rec { pname = "dasel"; - version = "1.27.3"; + version = "2.1.1"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-VrdjP9HlaBg8GY+2HPkQDwqJsoFtzTMz9QtQxhrUdxw="; + sha256 = "sha256-27tQEWnirDhqYt5smRFwADa9wKXSk6yXR8+mXvJVtYI="; }; - vendorSha256 = "sha256-zli9SEBU6n0JusAquqb9+O2W4yPZS7zmC5PCebVSeIA="; + vendorHash = "sha256-GO5Vg8zsXfjMBzRDC1/s/SYpviKUf59JB14vauKVFcE="; ldflags = [ - "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" + "-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}" ]; doInstallCheck = true; installCheckPhase = '' - if [[ "$("$out/bin/${pname}" --version)" == "${pname} version ${version}" ]]; then - echo "" | $out/bin/dasel put object -p yaml -t string -t int "my.favourites" colour=red number=3 | grep -q red - echo '${pname} smoke check passed' + runHook preInstallCheck + if [[ $($out/bin/dasel --version) == "dasel version ${version}" ]]; then + echo '{ "my": { "favourites": { "colour": "blue" } } }' \ + | $out/bin/dasel put -t json -r json -t string -v "red" "my.favourites.colour" \ + | grep "red" else - echo '${pname} smoke check failed' return 1 fi + runHook postInstallCheck ''; meta = with lib; { diff --git a/pkgs/applications/misc/databricks-sql-cli/default.nix b/pkgs/applications/misc/databricks-sql-cli/default.nix index 61191374b6ea..be798894ba86 100644 --- a/pkgs/applications/misc/databricks-sql-cli/default.nix +++ b/pkgs/applications/misc/databricks-sql-cli/default.nix @@ -53,7 +53,7 @@ buildPythonApplication rec { click ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "CLI for querying Databricks SQL"; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index e003787efc46..07d0534f0734 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -8,7 +8,7 @@ , freetype , glib , gtk3 -, jdk +, jdk17 , libX11 , libXrender , libXtst @@ -46,7 +46,7 @@ freetype glib gtk3 - jdk + jdk17 libX11 libXrender libXtst @@ -92,8 +92,8 @@ ln -s $out/Applications/DBeaver.app/Contents/MacOS/dbeaver $out/bin/dbeaver wrapProgram $out/Applications/DBeaver.app/Contents/MacOS/dbeaver \ - --prefix JAVA_HOME : ${jdk.home} \ - --prefix PATH : ${jdk}/bin + --prefix JAVA_HOME : ${jdk17.home} \ + --prefix PATH : ${jdk17}/bin runHook postInstall '' else '' @@ -107,7 +107,7 @@ patchelf --set-interpreter $interpreter $out/dbeaver/dbeaver makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ - --prefix PATH : ${jdk}/bin \ + --prefix PATH : ${jdk17}/bin \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk_4_1 glib-networking ])} \ --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix index 517b24597a89..cbcebae31237 100644 --- a/pkgs/applications/misc/dbx/default.nix +++ b/pkgs/applications/misc/dbx/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { watchdog ] ++ typer.optional-dependencies.all; - checkInputs = [ + nativeCheckInputs = [ git ] ++ (with python3.pkgs; [ pytest-asyncio diff --git a/pkgs/applications/misc/dialect/default.nix b/pkgs/applications/misc/dialect/default.nix index 6e504ab71736..8c04161844b1 100644 --- a/pkgs/applications/misc/dialect/default.nix +++ b/pkgs/applications/misc/dialect/default.nix @@ -14,11 +14,12 @@ , gst_all_1 , libsoup_3 , libadwaita +, nix-update-script }: python3.pkgs.buildPythonApplication rec { pname = "dialect"; - version = "2.0.2"; + version = "2.1.1"; format = "other"; @@ -27,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { repo = pname; rev = version; fetchSubmodules = true; - hash = "sha256-55vqxS0ySV8lItxLl1J+wLvPtmR87HzGfAiOKuhigFA="; + hash = "sha256-ytZnolQTOj0dpv+ouN1N7sypr1LxSN/Uhp7qP0ZOTHE="; }; nativeBuildInputs = [ @@ -69,6 +70,10 @@ python3.pkgs.buildPythonApplication rec { # handle setup hooks better strictDeps = false; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { homepage = "https://github.com/dialect-app/dialect"; description = "A translation app for GNOME"; diff --git a/pkgs/applications/misc/diffuse/default.nix b/pkgs/applications/misc/diffuse/default.nix index fa6825bf9d62..866ed16d44bd 100644 --- a/pkgs/applications/misc/diffuse/default.nix +++ b/pkgs/applications/misc/diffuse/default.nix @@ -45,6 +45,11 @@ python3.pkgs.buildPythonApplication rec { pygobject3 ]; + preConfigure = '' + # app bundle for macos + substituteInPlace src/diffuse/meson.build data/icons/meson.build --replace "/Applications" "$out/Applications"; + ''; + mesonFlags = [ "-Db_ndebug=true" ]; @@ -63,6 +68,6 @@ python3.pkgs.buildPythonApplication rec { description = "Graphical tool for merging and comparing text files"; license = licenses.gpl2; maintainers = with maintainers; [ k3a ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/dmenu-rs/Cargo.lock b/pkgs/applications/misc/dmenu-rs/Cargo.lock new file mode 100644 index 000000000000..8c4fd4f6a789 --- /dev/null +++ b/pkgs/applications/misc/dmenu-rs/Cargo.lock @@ -0,0 +1,862 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "arrayref" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "bindgen" +version = "0.53.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5" +dependencies = [ + "bitflags", + "cexpr", + "cfg-if 0.1.10", + "clang-sys", + "clap", + "env_logger", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "which", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "blake2b_simd" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +dependencies = [ + "arrayref", + "arrayvec", + "constant_time_eq", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "bstr" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +dependencies = [ + "lazy_static", + "memchr", + "regex-automata", + "serde", +] + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "cc" +version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" + +[[package]] +name = "cexpr" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clang-sys" +version = "0.29.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", + "yaml-rust", +] + +[[package]] +name = "clipboard" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a904646c0340239dcf7c51677b33928bf24fdf424b79a57909c0109075b2e7" +dependencies = [ + "clipboard-win", + "objc", + "objc-foundation", + "objc_id", + "x11-clipboard", +] + +[[package]] +name = "clipboard-win" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a093d6fed558e5fe24c3dfc85a68bb68f1c824f440d3ba5aca189e2998786b" +dependencies = [ + "winapi", +] + +[[package]] +name = "cmake" +version = "0.1.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" +dependencies = [ + "cc", +] + +[[package]] +name = "config" +version = "0.0.0" +dependencies = [ + "glob", + "itertools", + "man_dmenu", + "prettytable-rs", + "termcolor", + "yaml-rust", +] + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "crossbeam-utils" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "csv" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +dependencies = [ + "bstr", + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +dependencies = [ + "memchr", +] + +[[package]] +name = "dirs" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dmenu-build" +version = "0.0.0" +dependencies = [ + "clap", + "clipboard", + "itertools", + "lazy_static", + "libc", + "overrider", + "overrider_build", + "pledge", + "proc_use", + "regex", + "rustc_version_runtime", + "servo-fontconfig", + "termcolor", + "unicode-segmentation", + "x11", + "yaml-rust", +] + +[[package]] +name = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "env_logger" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "expat-sys" +version = "2.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" +dependencies = [ + "cmake", + "pkg-config", +] + +[[package]] +name = "freetype-sys" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" +dependencies = [ + "cmake", + "libc", + "pkg-config", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "headers" +version = "0.1.0" +dependencies = [ + "bindgen", + "termcolor", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +dependencies = [ + "quick-error", +] + +[[package]] +name = "itertools" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.137" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" + +[[package]] +name = "libloading" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" +dependencies = [ + "cc", + "winapi", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "man_dmenu" +version = "0.1.0" +dependencies = [ + "itertools", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[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 = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "overrider" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55b9fb8c67b6adf9fff65ad57571c42ccc80e8a9d2712e5427d00aa7fa293114" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "overrider_build" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d9709eba39b602b089deaf80b123e5c8ecfd071aab827a66c1a58412074fbcc" +dependencies = [ + "glob", + "syn", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "pledge" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "252599417b7d9a43b7fdc63dd790b0848666a8910b2ebe1a25118309c3c981e5" +dependencies = [ + "libc", +] + +[[package]] +name = "prettytable-rs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e" +dependencies = [ + "atty", + "csv", + "encode_unicode", + "lazy_static", + "term", + "unicode-width", +] + +[[package]] +name = "proc-macro2" +version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proc_use" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16b1c456def2ad84b3574651f069541dea178ee688e882943cb21232a5cb01" +dependencies = [ + "glob", + "itertools", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" + +[[package]] +name = "redox_users" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" +dependencies = [ + "getrandom", + "redox_syscall", + "rust-argon2", +] + +[[package]] +name = "regex" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rust-argon2" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" +dependencies = [ + "base64", + "blake2b_simd", + "constant_time_eq", + "crossbeam-utils", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver", +] + +[[package]] +name = "rustc_version_runtime" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d31b7153270ebf48bf91c65ae5b0c00e749c4cfad505f66530ac74950249582f" +dependencies = [ + "rustc_version", + "semver", +] + +[[package]] +name = "ryu" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" + +[[package]] +name = "servo-fontconfig" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" +dependencies = [ + "libc", + "servo-fontconfig-sys", +] + +[[package]] +name = "servo-fontconfig-sys" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" +dependencies = [ + "expat-sys", + "freetype-sys", + "pkg-config", +] + +[[package]] +name = "shlex" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "syn" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "term" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" +dependencies = [ + "byteorder", + "dirs", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +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 = "unicode-ident" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[package]] +name = "unicode-segmentation" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "which" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" +dependencies = [ + "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-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 = "x11" +version = "2.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7ae97874a928d821b061fce3d1fc52f08071dd53c89a6102bc06efcac3b2908" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-clipboard" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89bd49c06c9eb5d98e6ba6536cf64ac9f7ee3a009b2f53996d405b3944f6bcea" +dependencies = [ + "xcb", +] + +[[package]] +name = "xcb" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e917a3f24142e9ff8be2414e36c649d47d6cc2ba81f16201cdef96e533e02de" +dependencies = [ + "libc", + "log", +] + +[[package]] +name = "yaml-rust" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992" diff --git a/pkgs/applications/misc/dmenu-rs/default.nix b/pkgs/applications/misc/dmenu-rs/default.nix new file mode 100644 index 000000000000..8550dde61484 --- /dev/null +++ b/pkgs/applications/misc/dmenu-rs/default.nix @@ -0,0 +1,89 @@ +{ stdenv +, rustPlatform +, lib +, fetchFromGitHub +, cargo +, expat +, fontconfig +, libXft +, libXinerama +, m4 +, pkg-config +, python3 +}: + +# The dmenu-rs package has extensive plugin support. However, this derivation +# only builds the package with the default set of plugins. If you'd like to +# further customize dmenu-rs you can build it from the source. +# See: https://github.com/Shizcow/dmenu-rs#plugins +stdenv.mkDerivation rec { + pname = "dmenu-rs"; + version = "5.5.1"; + + src = fetchFromGitHub { + owner = "Shizcow"; + repo = pname; + rev = version; + sha256 = "sha256-WpDqBjIZ5ESnoRtWZmvm+gNTLKqxL4IibRVCj0yRIFM="; + }; + + nativeBuildInputs = [ + cargo + m4 + pkg-config + python3 + rustPlatform.bindgenHook + rustPlatform.cargoSetupHook + ]; + + buildInputs = [ + expat + fontconfig + libXft + libXinerama + ]; + + # The dmenu-rs repository does not include a Cargo.lock because of its + # dynamic build and plugin support. Generating it with make and checking it + # in to nixpkgs here was the easiest way to supply it to rustPlatform. + # See: https://github.com/Shizcow/dmenu-rs/issues/34#issuecomment-757415584 + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + # The rust-xcb dependency dynamically generates rust code at build time. + # This derivation uses nixpkgs rust functions that vendor each cargo + # dependency's source code into the READ-ONLY nix store. To avoid the code + # generation step failing, we copy the rust-xcb source out of the nix store + # and make it writeable. Also, we remove the build's hardcoded c compiler. + # See: https://github.com/rust-x-bindings/rust-xcb/tree/v0.8.2 + postPatch = '' + substituteInPlace config.mk --replace "clang" "" + + chmod +w "$NIX_BUILD_TOP/cargo-vendor-dir" + mkdir -p "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2-readwrite" + cp -r --no-preserve=mod "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2/." "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2-readwrite" + unlink "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2" + mv "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2-readwrite" "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2" + + cp ${./Cargo.lock} src/Cargo.lock + ''; + + cargoRoot = "src"; + + installFlags = [ "PREFIX=$(out)" ]; + + # Running make test requires an X11 server. It also runs dmenu, which then + # hangs on user input. It was too hard to figure out how to run these tests + # deterministically. See the original PR for some discussion on this. + doCheck = false; + + meta = with lib; { + description = "A pixel perfect port of dmenu, rewritten in Rust with extensive plugin support"; + homepage = "https://github.com/Shizcow/dmenu-rs"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ benjaminedwardwebb ]; + platforms = platforms.linux; + broken = (stdenv.isLinux && stdenv.isAarch64); + }; +} diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix index b62d154feb15..86a6cebc27c0 100644 --- a/pkgs/applications/misc/dotfiles/default.nix +++ b/pkgs/applications/misc/dotfiles/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { # No tests in archive doCheck = false; - checkInputs = with python3Packages; [ pytest ]; + nativeCheckInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = with python3Packages; [ click ]; meta = with lib; { diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 60a26b708824..c485375137ea 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { "NO_VENV=1" ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; preCheck = '' diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 285c5270948d..02455cf8f20e 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -1,27 +1,32 @@ -{ lib, stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff, pkg-config, -librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xine-lib, ghostscript, makeWrapper }: +{ lib, stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff +, libwebp, pkg-config, librsvg, glib, gtk2, libXext, libXxf86vm, poppler, vlc +, ghostscript, makeWrapper, tzdata, makeDesktopItem, copyDesktopItems }: stdenv.mkDerivation rec { pname = "eaglemode"; - version = "0.94.2"; + version = "0.96.0"; src = fetchurl { url = "mirror://sourceforge/eaglemode/${pname}-${version}.tar.bz2"; - sha256 = "10zxih7gmyhq0az1mnsw2x563l4bbwcns794s4png8rf4d6hjszm"; + hash = "sha256-aMVXJpfws9rh2Eaa/EzSLwtwvn0pVJlEbhxzvXME1hs="; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ perl libX11 libXinerama libjpeg libpng libtiff - librsvg glib gtk2 libXxf86vm libXext poppler xine-lib ghostscript ]; + # Fixes "Error: No time zones found." on the clock + postPatch = '' + substituteInPlace src/emClock/emTimeZonesModel.cpp --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + ''; + + nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ]; + buildInputs = [ perl libX11 libXinerama libjpeg libpng libtiff libwebp + librsvg glib gtk2 libXxf86vm libXext poppler vlc ghostscript ]; # The program tries to dlopen Xxf86vm, Xext and Xinerama, so we use the # trick on NIX_LDFLAGS and dontPatchELF to make it find them. - # I use 'yes y' to skip a build error linking with xine-lib, - # because xine stopped exporting "_x_vo_new_port" - # https://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261 buildPhase = '' + runHook preBuild export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext -lXinerama" perl make.pl build + runHook postBuild ''; dontPatchELF = true; @@ -29,15 +34,33 @@ stdenv.mkDerivation rec { forceShare = [ "man" "info" ]; installPhase = '' + runHook preInstall perl make.pl install dir=$out wrapProgram $out/bin/eaglemode --set EM_DIR "$out" --prefix LD_LIBRARY_PATH : "$out/lib" --prefix PATH : "${ghostscript}/bin" + for i in 32 48 96; do + mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps + ln -s $out/res/icons/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png + done + runHook postInstall ''; + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "Eagle Mode"; + genericName = meta.description; + categories = [ "Game" "Graphics" "System" "Utility" ]; + }) + ]; + meta = with lib; { homepage = "http://eaglemode.sourceforge.net"; description = "Zoomable User Interface"; + changelog = "https://eaglemode.sourceforge.net/ChangeLog.html"; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ chuangzhu ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/edgetx/default.nix b/pkgs/applications/misc/edgetx/default.nix index 2bf1e8f4f6c0..785ad0ba229a 100644 --- a/pkgs/applications/misc/edgetx/default.nix +++ b/pkgs/applications/misc/edgetx/default.nix @@ -6,14 +6,14 @@ mkDerivation rec { pname = "edgetx"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "EdgeTX"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-1l5EoDY17+2PDS3eRT3CHksVoZQgNLV9vRDu7nfzlrE="; + sha256 = "sha256-bKMAyONy1Udd+2nDVEMrtIsnfqrNuBVMWU7nCqvZ+3E="; }; nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 452c1edc99f8..0644471c5fa8 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec { --replace "(share_dir" "(\"share\"" ''; - checkInputs = with python3Packages; [ pytest ]; + nativeCheckInputs = with python3Packages; [ pytest ]; checkPhase = '' unset HOME diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 9421cce1d8f7..40f67c02c752 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -7,20 +7,11 @@ , zbar , secp256k1 , enableQt ? true -# for updater.nix -, writeScript -, common-updater-scripts -, bash -, coreutils -, curl -, gnugrep -, gnupg -, gnused -, nix +, callPackage }: let - version = "4.3.2"; + version = "4.3.4"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -37,7 +28,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "sha256-z2/UamKmBq/5a0PTbHdAqGK617Lc8xRhHRpbCc7jeZo="; + sha256 = "sha256-0xYGTCk+Sk7LP+E9r2Y7UJZsfbobLe6Yb+x5ZRCN40Y="; postFetch = '' mv $out ./all @@ -53,7 +44,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "sha256-vTZArTwbKcf6/vPQOvjubPecsg+h+QlZ6rdbl6qNfs0="; + sha256 = "sha256-+Z4NZK/unFN6mxCuMleHBxAoD+U1PzVk3/ZnZRmOOxo="; }; postUnpack = '' @@ -117,7 +108,7 @@ python3.pkgs.buildPythonApplication { wrapQtApp $out/bin/electrum ''; - checkInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; pytestFlagsArray = [ "electrum/tests" ]; @@ -125,23 +116,10 @@ python3.pkgs.buildPythonApplication { $out/bin/electrum help >/dev/null ''; - passthru.updateScript = import ./update.nix { - inherit lib; - inherit - writeScript - common-updater-scripts - bash - coreutils - curl - gnupg - gnugrep - gnused - nix - ; - }; + passthru.updateScript = callPackage ./update.nix { }; meta = with lib; { - description = "A lightweight Bitcoin wallet"; + description = "Lightweight Bitcoin wallet"; longDescription = '' An easy-to-use Bitcoin client featuring wallets generated from mnemonic seeds (in addition to other, more advanced, wallet options) diff --git a/pkgs/applications/misc/electrum-grs/default.nix b/pkgs/applications/misc/electrum/grs.nix similarity index 88% rename from pkgs/applications/misc/electrum-grs/default.nix rename to pkgs/applications/misc/electrum/grs.nix index e07e337477ae..a4166a3fe641 100644 --- a/pkgs/applications/misc/electrum-grs/default.nix +++ b/pkgs/applications/misc/electrum/grs.nix @@ -63,7 +63,13 @@ python3.pkgs.buildPythonApplication { qdarkstyle ]; - preBuild = '' + postPatch = '' + # make compatible with protobuf4 by easing dependencies ... + substituteInPlace ./contrib/requirements/requirements.txt \ + --replace "protobuf>=3.12,<4" "protobuf>=3.12" + # ... and regenerating the paymentrequest_pb2.py file + protoc --python_out=. electrum_grs/paymentrequest.proto + substituteInPlace ./electrum_grs/ecc_fast.py \ --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} '' + (if enableQt then '' @@ -85,6 +91,9 @@ python3.pkgs.buildPythonApplication { wrapQtApp $out/bin/electrum-grs ''; + # the tests are currently broken + doCheck = false; + postCheck = '' $out/bin/electrum-grs help >/dev/null ''; diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index c9332be23094..abb88796ddd0 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -7,16 +7,6 @@ , zbar , secp256k1 , enableQt ? true -# for updater.nix -, writeScript -, common-updater-scripts -, bash -, coreutils -, curl -, gnugrep -, gnupg -, gnused -, nix }: let @@ -29,6 +19,7 @@ let libzbar_name = if stdenv.isLinux then "libzbar.so.0" + else if stdenv.isDarwin then "libzbar.0.dylib" else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; # Not provided in official source releases, which are what upstream signs. @@ -118,7 +109,7 @@ python3.pkgs.buildPythonApplication { wrapQtApp $out/bin/electrum-ltc ''; - checkInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; pytestFlagsArray = [ "electrum_ltc/tests" ]; @@ -131,21 +122,6 @@ python3.pkgs.buildPythonApplication { $out/bin/electrum-ltc help >/dev/null ''; - passthru.updateScript = import ./update.nix { - inherit lib; - inherit - writeScript - common-updater-scripts - bash - coreutils - curl - gnupg - gnugrep - gnused - nix - ; - }; - meta = with lib; { description = "Lightweight Litecoin Client"; longDescription = '' diff --git a/pkgs/applications/misc/electrum/update.nix b/pkgs/applications/misc/electrum/update.nix index 247fabe3891f..7a0fb8fd3eb6 100644 --- a/pkgs/applications/misc/electrum/update.nix +++ b/pkgs/applications/misc/electrum/update.nix @@ -10,8 +10,6 @@ , nix }: -with lib; - let downloadPageUrl = "https://download.electrum.org"; @@ -23,7 +21,7 @@ writeScript "update-electrum" '' set -eu -o pipefail -export PATH=${makeBinPath [ +export PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl @@ -50,7 +48,7 @@ sigFile=$srcFile.asc export GNUPGHOME=$PWD/gnupg mkdir -m 700 -p "$GNUPGHOME" -gpg --batch --recv-keys ${concatStringsSep " " (map (x: "'${x}'") signingKeys)} +gpg --batch --recv-keys ${lib.concatStringsSep " " (map (x: "'${x}'") signingKeys)} gpg --batch --verify "$sigFile" "$srcFile" sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$srcFile") diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/applications/misc/elogind/default.nix index 7ff20b16d79a..56f8be698f32 100644 --- a/pkgs/applications/misc/elogind/default.nix +++ b/pkgs/applications/misc/elogind/default.nix @@ -25,8 +25,6 @@ , enableSystemd ? false }: -with lib; - stdenv.mkDerivation rec { pname = "elogind"; version = "246.10"; @@ -72,7 +70,7 @@ stdenv.mkDerivation rec { "-Dsysconfdir=${placeholder "out"}/etc" ]; - meta = { + meta = with lib; { homepage = "https://github.com/elogind/elogind"; description = ''The systemd project's "logind", extracted to a standalone package''; platforms = platforms.linux; # probably more diff --git a/pkgs/applications/misc/epr/default.nix b/pkgs/applications/misc/epr/default.nix index 478422a1c5c8..20b2b4ba8d90 100644 --- a/pkgs/applications/misc/epr/default.nix +++ b/pkgs/applications/misc/epr/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "epr"; - version = "2.3.0b"; + version = "2.4.13"; src = fetchFromGitHub { owner = "wustho"; repo = pname; rev = "v${version}"; - sha256 = "1a6md3015284hzmx0sby5kl59p7lwv73sq7sid35vrr15zrl0aw7"; + sha256 = "sha256-1qsqYlqGlCRhl7HINrcTDt5bGlb7g5PmaERylT+UvEg="; }; meta = with lib; { diff --git a/pkgs/applications/misc/eureka-ideas/default.nix b/pkgs/applications/misc/eureka-ideas/default.nix index ee15f31632cb..45e36010906b 100644 --- a/pkgs/applications/misc/eureka-ideas/default.nix +++ b/pkgs/applications/misc/eureka-ideas/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { Security ]; - dontUseCargoParallelTests = true; + useNextest = true; meta = with lib; { description = "CLI tool to input and store your ideas without leaving the terminal"; diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix index a50c4e42706a..54a3a2ed14c6 100644 --- a/pkgs/applications/misc/faircamp/default.nix +++ b/pkgs/applications/misc/faircamp/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage { pname = "faircamp"; - version = "unstable-2022-10-08"; + version = "unstable-2022-12-28"; # 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 = "630415985127298bf82bfc210d2fc8b214758db1"; - sha256 = "sha256-4pzDey0iV7LtHI0rbbcCjjuTaFt0CR88Vl0B1RU96v0="; + rev = "c77fd779cea6daecbac9a9beea65c1dc1ac56bc4"; + sha256 = "sha256-Tl3T/IoBIhYCNDEYT6cV1UyksDkoEDydBjYM9yzT4VQ="; }; - cargoHash = "sha256-GgWxxKHLGtsSGVbhli6HTfUu4TmbY4J9N7UA7AOzUkc="; + cargoHash = "sha256-20rtE8+LLDz97yvk0gKoUielsGZXEEOu2pfShf2WvHA="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index ad1660173159..781bdfcb90f2 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -30,7 +30,7 @@ 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+git20220520"; + version = "0.0.1"; outputs = [ "out" "dev" ] # remove if cross-compiling gobject-introspection works @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { owner = "Librem5"; repo = "feedbackd"; rev = "v${version}"; - hash = "sha256-4ftPC6LnX0kKFYVyH85yCH43B3YjuaZM5rzr8TGgZvc="; + hash = "sha256-l1FhECLPq8K9lzQ50sI/aH7fwR9xW1ATyk7EWRmLzuQ="; }; nativeBuildInputs = [ @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" ]; - checkInputs = [ + nativeCheckInputs = [ dbus ]; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 308f2fda8152..e4a5e3dd914b 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.34"; + version = "6.4.35"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-w73e0bXOI2lgvRzu7j8yVyIO2Zw+7ISl12u1YY4yWNQ="; + sha256 = "sha256-ewtWy8D8qFRQTxZ3lfq1MtWlTVp9O24+NqM/NKCWCgE="; }; buildInputs = [ openssl python3 ]; diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/applications/misc/flamerobin/default.nix index 8178288ba56e..5fd805994a6e 100644 --- a/pkgs/applications/misc/flamerobin/default.nix +++ b/pkgs/applications/misc/flamerobin/default.nix @@ -1,26 +1,40 @@ -{ lib, stdenv, fetchFromGitHub, wxGTK30, boost, firebird }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, wxGTK32 +, boost +, firebird +}: stdenv.mkDerivation rec { - version = "0.9.3.1"; + version = "0.9.3.12"; pname = "flamerobin"; src = fetchFromGitHub { owner = "mariuz"; repo = "flamerobin"; rev = version; - sha256 = "1wwcsca01hpgi9z5flvbdhs9zv7jvahnbn97j6ymy0hdyb8lv6si"; + sha256 = "sha256-uWx3riRc79VKh7qniWFjxxc7v6l6cW0i31HxoN1BSdA="; }; + patches = [ + # rely on compiler command line for __int128 and std::decimal::decimal128 + (fetchpatch { + url = "https://github.com/mariuz/flamerobin/commit/8e0ea6d42aa28a4baeaa8c8b8b57c56eb9ae3540.patch"; + sha256 = "sha256-l6LWXA/sRQGQKi798bzl0iIJ2vdvXHOjG7wdFSXv+NM="; + }) + ]; + enableParallelBuilding = true; - buildInputs = [ wxGTK30 boost firebird ]; + nativeBuildInputs = [ cmake ]; - preBuild = '' - sed -i 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -nostartfiles/' Makefile - ''; - - configureFlags = [ - "--disable-debug" + buildInputs = [ + wxGTK32 + boost + firebird ]; meta = with lib; { diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index b92110f99d98..457f8b14de61 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.21.1"; + version = "1.23.1"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-TahXPbZy7eoSJ/U2wL6GaMM8F6zypf7EU91JVWlevQg="; + sha256 = "sha256-ewffAfB9Lsac6ivHxI1obAxByk5wNNJjqrYmYL2xCr4="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index 440022da6eeb..f53ea0f030ca 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -63,9 +63,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index f1df7445fbe0..71145c6809f6 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.16"; + version = "3.0.17"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - hash = "sha256-hL4Ytu9zf8x+H/TuvJ3m0E3d8gMZFIDogWEYlaOap+g="; + hash = "sha256-3G2vRPupZtZKF1VazNQGa1AplqFzhI5M+olyeJ26kXo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix index b87c43226e0a..ff84ecdf55f0 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/applications/misc/freemind/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mind-mapping software"; - homepage = "http://freemind.sourceforge.net/wiki/index.php/Main_Page"; + homepage = "https://freemind.sourceforge.net/wiki/index.php/Main_Page"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/furtherance/default.nix b/pkgs/applications/misc/furtherance/default.nix new file mode 100644 index 000000000000..1d1772dd6727 --- /dev/null +++ b/pkgs/applications/misc/furtherance/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, appstream-glib, desktop-file-utils +, glib, libadwaita, meson, ninja, pkg-config, wrapGAppsHook4, dbus , gtk4, sqlite }: + +stdenv.mkDerivation rec { + pname = "furtherance"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "lakoliu"; + repo = "Furtherance"; + rev = "v${version}"; + sha256 = "xshZpwL5AQvYSPoyt9Qutaym5IGBQHWwz4ev3xnVcSk="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "J/e8NYd9JjmANj+4Eh3/Uq2/vS711CwERgmJ7i5orNw="; + }; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + wrapGAppsHook4 + ]; + + buildInputs = [ + dbus + glib + gtk4 + libadwaita + sqlite + ]; + + meta = with lib; { + description = "Track your time without being tracked"; + homepage = "https://github.com/lakoliu/Furtherance"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ CaptainJawZ ]; + }; +} diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index 162b6362fd7d..76785c266a47 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -17,7 +17,6 @@ , pngSupport ? true # Optional dependencies , cairo -, librsvg , libpng }: @@ -51,22 +50,21 @@ stdenv.mkDerivation rec { tllist fcft ] ++ lib.optional enableCairo cairo - ++ lib.optional pngSupport libpng - ++ lib.optional svgSupport librsvg; + ++ lib.optional pngSupport libpng; mesonBuildType = "release"; mesonFlags = [ "-Denable-cairo=${if enableCairo then "enabled" else "disabled"}" "-Dpng-backend=${if pngSupport then "libpng" else "none"}" - "-Dsvg-backend=${if svgSupport then "librsvg" else "none"}" + "-Dsvg-backend=${if svgSupport then "nanosvg" else "none"}" ]; meta = with lib; { description = "Wayland-native application launcher, similar to rofi’s drun mode"; homepage = "https://codeberg.org/dnkl/fuzzel"; - license = licenses.mit; - maintainers = with maintainers; [ fionera polykernel ]; + license = with licenses; [ mit zlib ]; + maintainers = with maintainers; [ fionera polykernel rodrgz ]; platforms = with platforms; linux; changelog = "https://codeberg.org/dnkl/fuzzel/releases/tag/${version}"; }; diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index f570a044309e..4e215f30fc31 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.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner= "manisandro"; repo = "gImageReader"; rev = "v${version}"; - sha256 = "sha256-lJ4wPLxVN3NERnru8vLreiWMEUip6xeCXAfoT8DcfiQ="; + sha256 = "sha256-vW4FbviMHBiJ3rwJY/yS7JDOoCT72nGV6jEeo+k6ylU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 0b7233e189c0..4da566bcfc82 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.24.0"; + version = "1.24.5"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-LGZjPkiX252IRgRG1fxVS4IdnKA3RgVjOhZLxYScIJo="; + sha256 = "sha256-P71JiGI9PpWMAlgk5TwQa/h3AUEZSEZ6/MahY+IIy9M="; }; propagatedBuildInputs = [ @@ -16,7 +16,7 @@ buildPythonApplication rec { yt-dlp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 8a33ba3ea3ac..78d5e010213c 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -4,8 +4,6 @@ , postgresSupport ? false, postgresql ? null }: -with lib; - stdenv.mkDerivation rec { pname = "gammu"; version = "1.42.0"; @@ -31,10 +29,10 @@ stdenv.mkDerivation rec { strictDeps = true; buildInputs = [ bash bluez libusb1 curl gettext sqlite libiconv ] - ++ optionals dbiSupport [ libdbi libdbiDrivers ] - ++ optionals postgresSupport [ postgresql ]; + ++ lib.optionals dbiSupport [ libdbi libdbiDrivers ] + ++ lib.optionals postgresSupport [ postgresql ]; - meta = { + meta = with lib; { homepage = "https://wammu.eu/gammu/"; description = "Command line utility and library to control mobile phones"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/geek-life/default.nix b/pkgs/applications/misc/geek-life/default.nix index 653c940024a6..ae0fa298594d 100644 --- a/pkgs/applications/misc/geek-life/default.nix +++ b/pkgs/applications/misc/geek-life/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "geek-life"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "ajaxray"; repo = "geek-life"; rev = "v${version}"; - sha256 = "083y2kv5vb217ghy9g2qylqgdgbjjggjj3cq454csnn3cjgq9zfh"; + sha256 = "sha256-7B/4pDOVXef2MaWKvzkUZH0/KM/O1gJjI3xPjEXqc/E="; }; - vendorSha256 = "05fcnmg2rygccf65r8js6kbijx740vfnvbrc035bjs1jvdw29h9j"; + vendorHash = "sha256-U80Yb8YXKQ8KJf+FxkC0EIUFKP4PKAFRtKTCvXSc0WI="; postInstall = '' mv $out/bin/app $out/bin/geek-life diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index f2692243db6b..2f244e20e155 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -1,7 +1,5 @@ { lib, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, perlPackages, rtmpdump}: -with lib; - perlPackages.buildPerlPackage rec { pname = "get_iplayer"; version = "3.27"; @@ -26,11 +24,11 @@ perlPackages.buildPerlPackage rec { installPhase = '' mkdir -p $out/bin $out/share/man/man1 cp get_iplayer $out/bin - wrapProgram $out/bin/get_iplayer --suffix PATH : ${makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB cp get_iplayer.1 $out/share/man/man1 ''; - meta = { + meta = with lib; { description = "Downloads TV and radio from BBC iPlayer"; license = licenses.gpl3Plus; homepage = "https://squarepenguin.co.uk/"; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 02f0a09e0df1..841aeca58969 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config gettext check dbus ]; buildInputs = [ libintl libiconv json_c ]; propagatedBuildInputs = [ glib gtk ]; - checkInputs = [ xvfb-run ]; + nativeCheckInputs = [ xvfb-run ]; doCheck = !stdenv.isDarwin; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { checkPhase = '' export NO_AT_BRIDGE=1 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs ''; diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix index a0af30ac84b9..14173fc7057f 100644 --- a/pkgs/applications/misc/glava/default.nix +++ b/pkgs/applications/misc/glava/default.nix @@ -55,8 +55,6 @@ in substituteInPlace Makefile \ --replace 'unknown' 'v${version}' - - export CFLAGS="-march=native" ''; makeFlags = optional (!enableGlfw) "DISABLE_GLFW=1"; diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix index 47d56288ed2f..363e6fadee41 100644 --- a/pkgs/applications/misc/glom/default.nix +++ b/pkgs/applications/misc/glom/default.nix @@ -28,7 +28,7 @@ , isocodes , gtksourceview , gtksourceviewmm -, postgresql +, postgresql_11 , gobject-introspection , yelp-tools , wrapGAppsHook @@ -93,7 +93,7 @@ in stdenv.mkDerivation rec { python3.pkgs.pygobject3 gtksourceview gtksourceviewmm - postgresql # for pg_config + postgresql_11 # for pg_config ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/gnome-epub-thumbnailer/default.nix b/pkgs/applications/misc/gnome-epub-thumbnailer/default.nix new file mode 100644 index 000000000000..3553dd118da0 --- /dev/null +++ b/pkgs/applications/misc/gnome-epub-thumbnailer/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, lib +, fetchurl +, wrapGAppsNoGuiHook +, meson +, ninja +, pkg-config +, gnome +, gdk-pixbuf +, glib +, libarchive +, librsvg +, libxml2 +}: + +stdenv.mkDerivation rec { + pname = "gnome-epub-thumbnailer"; + version = "1.7"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-epub-thumbnailer/${lib.versions.majorMinor version}/gnome-epub-thumbnailer-${version}.tar.xz"; + sha256 = "sha256-S7Ah++RCgNuY3xTBH6XkMgsWe4GpG9e6WGvqDE+il1I="; + }; + + nativeBuildInputs = [ + wrapGAppsNoGuiHook + meson + ninja + pkg-config + ]; + + buildInputs = [ + gdk-pixbuf + glib + libarchive + librsvg + libxml2 + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-epub-thumbnailer"; + }; + }; + + meta = with lib; { + description = "Thumbnailer for EPub and MOBI books"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-epub-thumbnailer"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/gnome-extension-manager/default.nix b/pkgs/applications/misc/gnome-extension-manager/default.nix index 28a4fa84caeb..05e7e73b4913 100644 --- a/pkgs/applications/misc/gnome-extension-manager/default.nix +++ b/pkgs/applications/misc/gnome-extension-manager/default.nix @@ -60,5 +60,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ foo-dogsquared ]; + # never built on aarch64-linux since first introduction in nixpkgs + broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/pkgs/applications/misc/gnome-firmware/default.nix b/pkgs/applications/misc/gnome-firmware/default.nix index 2aebbf5194a2..6d46727d5ab0 100644 --- a/pkgs/applications/misc/gnome-firmware/default.nix +++ b/pkgs/applications/misc/gnome-firmware/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "gnome-firmware"; - version = "42.2"; + version = "43.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "gnome-firmware"; rev = version; - sha256 = "L0R2lXU69I6NI7Srq5s+8N9261Ic8B7FVaaXNjz2Ll0="; + sha256 = "9QS6X1Cm9/wToQ8hnGNn3VytSCpZI8StZ3+vf0/wbAw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index 04526ec34656..818ef8fb96a0 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -64,9 +64,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/misc/gnome-secrets/default.nix b/pkgs/applications/misc/gnome-secrets/default.nix index 6052cf70facb..1b8a7e706dde 100644 --- a/pkgs/applications/misc/gnome-secrets/default.nix +++ b/pkgs/applications/misc/gnome-secrets/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { pname = "gnome-secrets"; - version = "6.5"; + version = "7.2"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "World"; repo = "secrets"; rev = version; - sha256 = "sha256-Hy2W7cvvzVcKtd/KzTn81awoolnfM3ST0Nm70YBLTYY="; + hash = "sha256-CE0iuXYHBhu07mjfXCnAPZQUD1Wy95L+tvBT+uepbrk="; }; nativeBuildInputs = [ @@ -44,7 +44,6 @@ python3Packages.buildPythonApplication rec { glib gdk-pixbuf libadwaita - python3Packages.libpwquality.dev # Use python-enabled libpwquality ]; propagatedBuildInputs = with python3Packages; [ @@ -52,7 +51,8 @@ python3Packages.buildPythonApplication rec { construct pykeepass pyotp - libpwquality + validators + zxcvbn ]; # Prevent double wrapping, let the Python wrapper use the args in preFixup. @@ -63,7 +63,6 @@ python3Packages.buildPythonApplication rec { ''; 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"; homepage = "https://gitlab.gnome.org/World/secrets"; license = licenses.gpl3Only; diff --git a/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch b/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch index f8f725f7f680..f410d0f18b2b 100644 --- a/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch +++ b/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch @@ -1,24 +1,5 @@ -From 8befa137776786829508f23dd33ab37e2b95a895 Mon Sep 17 00:00:00 2001 -From: Poncho -Date: Mon, 7 Sep 2020 09:39:49 +0200 -Subject: [PATCH] Fix building with bison 3.7 - -Bison 3.7 changes how header files are included [1][2], in that instead of -copying and inserting the contents of a file, the file itself is included -(by default as '"basename.h"'). - -[1] https://lists.gnu.org/archive/html/info-gnu/2020-07/msg00006.html -[2] https://www.gnu.org/software/bison/manual/html_node/_0025define-Summary.html - -Close: https://github.com/GoldenCheetah/GoldenCheetah/issues/3586 ---- - src/Core/DataFilter.y | 3 +++ - src/Core/RideDB.y | 2 ++ - src/FileIO/JsonRideFile.y | 3 +++ - 3 files changed, 8 insertions(+) - diff --git a/src/Core/DataFilter.y b/src/Core/DataFilter.y -index 7c5e481b0..142e80a5c 100644 +index 30070f131..15f746a10 100644 --- a/src/Core/DataFilter.y +++ b/src/Core/DataFilter.y @@ -49,6 +49,9 @@ extern Leaf *DataFilterroot; // root node for parsed statement @@ -28,8 +9,8 @@ index 7c5e481b0..142e80a5c 100644 +// generated by the scanner +%define api.header.include {"DataFilter_yacc.h"} + - // Symbol can be meta or metric name - %token SYMBOL PYTHON + // Symbol can be meta, metric, variable or function name + %token SYMBOL PYTHON diff --git a/src/Core/RideDB.y b/src/Core/RideDB.y index d6da086bd..f2001e23c 100644 @@ -58,6 +39,21 @@ index 2cbbef9fc..d5c77a779 100644 %pure-parser %lex-param { void *scanner } %parse-param { struct JsonContext *jc } --- -2.34.1 - +diff --git a/src/gcconfig.pri.in b/src/gcconfig.pri.in +index a280bbb6b..07e543372 100644 +--- a/src/gcconfig.pri.in ++++ b/src/gcconfig.pri.in +@@ -75,10 +75,10 @@ + + # Let us know where flex and bison are installed. + # You may need to specify the full path if things don't work. +-#QMAKE_LEX = flex +-#QMAKE_YACC = bison ++QMAKE_LEX = flex ++QMAKE_YACC = bison + # If you are using bison 3.7 or higher, uncomment the line below +-#QMAKE_MOVE = cp ++QMAKE_MOVE = cp + # If you're compiling with nmake and VC then you + # will likely also use win_flex and win_bison + # so uncomment below diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 7f796a2bb0c2..ee25c5e8cc0f 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, fetchpatch, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools , qtconnectivity, qtcharts, libusb-compat-0_1, gsl, blas -, bison, flex, zlib, qmake, makeDesktopItem, makeWrapper +, bison, flex, zlib, qmake, makeDesktopItem, wrapQtAppsHook }: let @@ -16,13 +16,13 @@ let }; in mkDerivation rec { pname = "golden-cheetah"; - version = "3.6-DEV2111"; + version = "3.6-RC3"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; - rev = "v${version}"; - sha256 = "17sk89szvaq31bcv6rgfn1bbw132k7w8zlalfb3ayflavdxbk6sa"; + rev = "refs/tags/v${version}"; + hash = "sha256-/LGVDeWJZZXy5r5WxElDuxUagpA/RIwHGRbkcdO8IrE="; }; buildInputs = [ @@ -39,7 +39,7 @@ in mkDerivation rec { gsl blas ]; - nativeBuildInputs = [ flex makeWrapper qmake bison ]; + nativeBuildInputs = [ flex wrapQtAppsHook qmake bison ]; patches = [ # allow building with bison 3.7 @@ -55,11 +55,10 @@ in mkDerivation rec { preConfigure = '' cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri - echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri - echo 'LIBUSB_INSTALL = ${libusb-compat-0_1}' >> src/gcconfig.pri - echo 'LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include' >> src/gcconfig.pri - echo 'LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb' >> src/gcconfig.pri - sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local + sed -i 's,^#QMAKE_LRELEASE.*,QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease,' src/gcconfig.pri + sed -i 's,^#LIBUSB_INSTALL.*,LIBUSB_INSTALL = ${libusb-compat-0_1},' src/gcconfig.pri + sed -i 's,^#LIBUSB_INCLUDE.*,LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include,' src/gcconfig.pri + sed -i 's,^#LIBUSB_LIBS.*,LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb,' src/gcconfig.pri ''; installPhase = '' @@ -76,7 +75,7 @@ in mkDerivation rec { meta = with lib; { description = "Performance software for cyclists, runners and triathletes"; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ adamcstephens ]; license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/gostatic/default.nix b/pkgs/applications/misc/gostatic/default.nix new file mode 100644 index 000000000000..240df1a91363 --- /dev/null +++ b/pkgs/applications/misc/gostatic/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "gostatic"; + version = "2.35"; + + src = fetchFromGitHub { + owner = "piranha"; + repo = pname; + rev = version; + hash = "sha256-pxk9tauB7u0oe6g4maHh+dREZXKwMz44v3KB43yYW6c="; + }; + + vendorHash = "sha256-9YCt9crLuYjd+TUXJyx/EAYIMWM5TD+ZyzLeu0RMxVc="; + + meta = with lib; { + description = "Fast static site generator"; + homepage = "https://github.com/piranha/gostatic"; + license = licenses.isc; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index d7ba62f28c5f..888672b5fa01 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ++ lib.optional withGUI qtserialport ++ lib.optional (withGUI && withMapPreview) qtwebengine; - checkInputs = [ libxml2 which ]; + nativeCheckInputs = [ libxml2 which ]; preConfigure = lib.optionalString withGUI '' lrelease gui/*.ts gui/coretool/*.ts diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index d7177906287e..a03107c2aff2 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,16 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, substituteAll -, qmake, qttools, qttranslations, qtlocation, qtpbfimageplugin, wrapQtAppsHook +{ lib +, stdenv +, fetchFromGitHub +, qmake +, nix-update-script +, substituteAll +, qtbase +, qttools +, qttranslations +, qtlocation ? null # qt5 only +, qtpositioning ? null # qt6 only +, qtpbfimageplugin +, qtsvg +, qt5compat ? null # qt6 only +, wrapQtAppsHook }: +let + isQt6 = lib.versions.major qtbase.version == "6"; + +in stdenv.mkDerivation rec { pname = "gpxsee"; - version = "11.6"; + version = "11.11"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - hash = "sha256-kwEltkLcMCZlUJyE+nyy70WboVO1FgMw0cH1hxLVtKQ="; + hash = "sha256-5kT1vcbCc0Fa3ylrcQetth50IQu57upiWRRpub93jlE="; }; patches = (substituteAll { @@ -19,7 +36,15 @@ stdenv.mkDerivation rec { inherit qttranslations; }); - buildInputs = [ qtlocation qtpbfimageplugin ]; + buildInputs = [ qtpbfimageplugin ] + ++ (if isQt6 then [ + qtbase + qtpositioning + qtsvg + qt5compat + ] else [ + qtlocation + ]); nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; @@ -33,9 +58,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { @@ -49,5 +72,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ womfoo sikmir ]; platforms = platforms.unix; + broken = isQt6 && stdenv.isDarwin; }; } diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 7365d297e3b8..9424ceeee51f 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -29,7 +29,7 @@ in buildPythonApplication rec { sha256 = "00358nzyw686ypqv45imc5k9frcqnhla0hpx9ynna3iy6iz5006x"; }; - pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ]; + pythonPath = with pythonPackages; [ bsddb3 pyicu pygobject3 pycairo ]; # Same installPhase as in buildPythonApplication but without --old-and-unmanageble # install flag. diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index 051fee4f6fb6..59f71a3f88c2 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.6.1"; + version = "3.6.2"; src = fetchzip { url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "sha256-lr3ffyAL8LBj7mt4EmN2Kq2pxvW4P7zd66gU9X4qzJw="; + sha256 = "sha256-c7uwXqmMrWDYZ9CpGuVoo1e5yWHsoNd0zihZKdCTg7E="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 4461df09c224..281f8dec2272 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "grip"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { url = "mirror://sourceforge/grip/grip-${version}.tar.gz"; - sha256 = "sha256-5Qgsf4+xs0ckhYJk2csKulXC3nWaLRAsQ15qaTkKkjw="; + sha256 = "sha256-lXu0mLLfcX8K1EmoFH0vp2cHluyRwhTL0/bW5Ax36mI="; }; nativeBuildInputs = [ pkg-config libtool ]; diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix index a225c15a4d01..73bc11d4940d 100644 --- a/pkgs/applications/misc/gsctl/default.nix +++ b/pkgs/applications/misc/gsctl/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/giantswarm/gsctl/buildinfo.Version=${version}" ]; - checkInputs = [ + nativeCheckInputs = [ kubectl ]; diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix index b622d9f19cca..53344338bd03 100644 --- a/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/pkgs/applications/misc/gtk2fontsel/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { Font selection tool similar to xfontsel implemented using GTK 2. Trivial, but useful nonetheless. ''; - homepage = "http://gtk2fontsel.sourceforge.net/"; + homepage = "https://gtk2fontsel.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/gtk2fontsel/"; license = licenses.gpl2; maintainers = [ maintainers.prikhi ]; diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index d5aa1ac88179..ca12e3bc77a9 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkg-config, libiconv }: +{ lib, stdenv, fetchurl, libXext, Xaw3d, ghostscriptX, perl, pkg-config, libiconv }: stdenv.mkDerivation rec { pname = "gv"; @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ + libXext Xaw3d ghostscriptX perl diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index 695706cefc5b..aa9b530dee30 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -52,7 +52,7 @@ buildPythonApplication rec { # will fail without pre-seeded config files doCheck = false; - checkInputs = [ unittestCheckHook mock ]; + nativeCheckInputs = [ unittestCheckHook mock ]; unittestFlagsArray = [ "-s" "tests" "-v" ]; diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 792eee4d9e36..c3571e01dbcd 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -1,23 +1,36 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, qttools, qtbase }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qttools +, qtbase +}: mkDerivation rec { pname = "heimer"; - version = "3.6.2"; + version = "3.6.4"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "sha256-NAjl7eRmMkRrVhlza87ErllEa1QfPZ8GRI1aljY6itI="; + hash = "sha256-hKVBPSWIbKXMEmk9C7k+3NBqLwYybN6Jql9qigIx4jE="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ qttools qtbase ]; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + qttools + qtbase + ]; meta = with lib; { description = "Simple cross-platform mind map and note-taking tool written in Qt"; homepage = "https://github.com/juzzlin/Heimer"; - license = licenses.gpl3; + changelog = "https://github.com/juzzlin/Heimer/blob/${version}/CHANGELOG"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/hovercraft/default.nix b/pkgs/applications/misc/hovercraft/default.nix index 5a03cfe23bac..ccb597db62d0 100644 --- a/pkgs/applications/misc/hovercraft/default.nix +++ b/pkgs/applications/misc/hovercraft/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { sha256 = "0k0gjlqjz424rymcfdjpj6a71ppblfls5f8y2hd800d1as4im8az"; }; - checkInputs = [ manuel ]; + nativeCheckInputs = [ manuel ]; propagatedBuildInputs = [ setuptools docutils lxml svg-path pygments watchdog ]; meta = with lib; { diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix index 706a8ff74955..7435d02c99c8 100644 --- a/pkgs/applications/misc/hr/default.nix +++ b/pkgs/applications/misc/hr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hr"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "LuRsT"; repo = "hr"; rev = version; - sha256 = "068kq37lbqfjzh28rlvkprni38ii991naawylwvq6d43y9dpzs2b"; + sha256 = "sha256-Pcnkiq7ipLoz6MFWZkCIxneUuZ3w/d+iqiyTz55WZvs="; }; dontBuild = true; diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index bb31be1ad27c..e7ad05b5085a 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hstr"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "dvorka"; repo = "hstr"; rev = version; - sha256 = "sha256-qIMnU+gRR3HPAOrrrduN68R5E8ZJKROfZ0sEHL0E4XU="; + sha256 = "sha256-yfaDISnTDb20DgMOvh6jJYisV6eL/Mp5jafnWEnFG8c="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/applications/misc/html5validator/default.nix b/pkgs/applications/misc/html5validator/default.nix index 657996d1da9f..71ba3dcf100a 100644 --- a/pkgs/applications/misc/html5validator/default.nix +++ b/pkgs/applications/misc/html5validator/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ openjdk ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = "PATH=$PATH:$out/bin nosetests"; meta = with lib; { diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/applications/misc/huggle/default.nix index 85c65a0eeb4a..327457a017b3 100644 --- a/pkgs/applications/misc/huggle/default.nix +++ b/pkgs/applications/misc/huggle/default.nix @@ -8,7 +8,7 @@ , unzip , wrapQtAppsHook , qtwebengine -, libyamlcpp +, yaml-cpp , libirc }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { which cmake ]; - buildInputs = [ ncurses libyamlcpp qtwebengine libirc ]; + buildInputs = [ ncurses yaml-cpp qtwebengine libirc ]; patches = [ ./00-remove-third-party.patch ./01-extensions.patch ]; postPatch = '' diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 49bacebdab93..f4f4f579ef56 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.106.0"; + version = "0.110.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Dyre/ou0kjEqbq8WGGM/n8+JBTMNslbnmj+5clYJUHs="; + hash = "sha256-7B0C8191lUGsv81+0eKDrBm+5hLlFjID3RTuajSg/RM="; }; - vendorSha256 = "sha256-dhsGGu4uNrqKv6szGqruAcI2UTbbXknKaKk5pVCQB5A="; + vendorHash = "sha256-GtywXjtAF5Q4jUz2clfseUJVqiU+eSguG/ZoKy2TzuA="; doCheck = false; diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix deleted file mode 100644 index b637cd077d76..000000000000 --- a/pkgs/applications/misc/imag/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv -, rustPlatform -, fetchFromGitHub -, llvmPackages -, openssl -, pkg-config -, installShellFiles -, Security -, gitMinimal -, util-linuxMinimal -}: - -rustPlatform.buildRustPackage rec { - pname = "imag"; - version = "0.10.1"; - - src = fetchFromGitHub { - owner = "matthiasbeyer"; - repo = pname; - rev = "v${version}"; - sha256 = "0f9915f083z5qqcxyavj0w6m973c8m1x7kfb89pah5agryy5mkaq"; - }; - - nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; - checkInputs = [ gitMinimal util-linuxMinimal ]; - - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - - cargoSha256 = "1vnrc72g2271i2p847z30kplxmdpi60n3dzpw0s7dahg33g14ai6"; - - checkPhase = '' - export HOME=$TMPDIR - git config --global user.email "nobody@example.com" - git config --global user.name "Nobody" - - # UI tests uses executables directly, so we need to build them before - # launching the tests - cargo build - '' + ( - # CLI uses the presence of a controlling TTY to check if arguments are - # passed in stdin, or in the command-line, so we use script to create - # a PTY for us. - if !stdenv.isDarwin then '' - script -qfec "cargo test --workspace" - '' else '' - script -q "cargo test --workspace" - '' - ); - - postInstall = '' - installShellCompletion target/imag.{bash,fish} --zsh target/_imag - ''; - - meta = with lib; { - description = "Commandline personal information management suite"; - homepage = "https://imag-pim.org/"; - license = licenses.lgpl21; - maintainers = with maintainers; [ Br1ght0ne minijackson ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index fbc436c882cf..d1162052cebb 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "IPMIView"; - version = "2.20.0"; - buildVersion = "220309"; + version = "2.21.0"; + buildVersion = "221118"; src = fetchurl { url = "https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz"; - hash = "sha256-qtklBMuK0jb9Ye0IkYM2WYFRMAfZg9tk08a1JQ64cjA="; + hash = "sha256-ZN0vadGbjGj9U2wPqvHLjS9fsk3DNCbXoNvzUfnn8IM="; }; nativeBuildInputs = [ patchelf makeWrapper ]; diff --git a/pkgs/applications/misc/itd/default.nix b/pkgs/applications/misc/itd/default.nix index facbda32238b..6e6f32ad3204 100644 --- a/pkgs/applications/misc/itd/default.nix +++ b/pkgs/applications/misc/itd/default.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "itd"; - version = "0.0.9"; + version = "1.0.0"; # https://gitea.arsenm.dev/Arsen6331/itd/tags src = fetchFromGitea { @@ -14,10 +14,10 @@ buildGoModule rec { owner = "Arsen6331"; repo = "itd"; rev = "v${version}"; - hash = "sha256-FefffF8YIEcB+eglifNWuuK7H5A1YXyxxZOXz1a8HfY="; + hash = "sha256-von/gvKnm69r/Z3Znm9IW97LfRq4v1cpv5z05h0ahek="; }; - vendorHash = "sha256-LFzrpKQQ4nFoK4vVTzJDQ5OGDe1y5BSfXPX+FRVunjQ="; + vendorHash = "sha256-Sj1ASrb80AgZDfIwmSspArRXSaxP8FlXYi9xyWfCYWk="; preBuild = '' echo r${version} > version.txt diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 99e7850cbbea..5fc41261bbf7 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -16,28 +16,29 @@ GEM eventmachine (1.2.7) ffi (1.15.5) forwardable-extended (2.6.0) - gemoji (3.0.1) + gemoji (4.0.1) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) i18n (1.12.0) concurrent-ruby (~> 1.0) - jekyll (4.2.2) + jekyll (4.3.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) i18n (~> 1.0) - jekyll-sass-converter (~> 2.0) + jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) - kramdown (~> 2.3) + kramdown (~> 2.3, >= 2.3.1) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.4.0) + mercenary (>= 0.3.6, < 0.5) pathutil (~> 0.9) - rouge (~> 3.0) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) - terminal-table (~> 2.0) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) jekyll-avatar (0.8.0) jekyll (>= 3.0, < 5.0) jekyll-mentions (1.6.0) @@ -51,8 +52,8 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.12.0) - gemoji (~> 3.0) + jemoji (0.13.0) + gemoji (>= 3, < 5) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) kramdown (2.4.0) @@ -66,7 +67,7 @@ GEM mercenary (0.4.0) mini_portile2 (2.8.0) minitest (5.16.3) - nokogiri (1.13.8) + nokogiri (1.13.9) mini_portile2 (~> 2.8.0) racc (~> 1.4) pathutil (0.16.2) @@ -77,15 +78,16 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.5) - rouge (3.30.0) + rouge (4.0.0) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) - terminal-table (2.0.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) tzinfo (2.0.5) concurrent-ruby (~> 1.0) - unicode-display_width (1.8.0) + unicode-display_width (2.3.0) + webrick (1.7.0) PLATFORMS ruby @@ -99,4 +101,4 @@ DEPENDENCIES jemoji BUNDLED WITH - 2.3.22 + 2.3.9 diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index 54cf7534fabf..2e20dc241dc0 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -87,10 +87,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0"; + sha256 = "07lkqllgn7161rvnhnfy7adnfqv0xvr4c3ncsfxixdgmzi6acn5h"; type = "gem"; }; - version = "3.0.1"; + version = "4.0.1"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; @@ -125,15 +125,15 @@ version = "1.12.0"; }; jekyll = { - dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; + dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dpvkd7i9szkps2acxbdqajn4qc9sqxxy80f3rf5dra1vj7yrhpp"; + sha256 = "0m866i41j7y5ipvl7f0vz82mypv5irqz9xxbx44s5pdsmi3dyawy"; type = "gem"; }; - version = "4.2.2"; + version = "4.3.1"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -207,10 +207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09sxbnrqz5vf6rxmh6lzism31gz2g3hw86ymg37r1ccknclv3cp9"; + sha256 = "0z4yabsvqdb8x1rr60yyzbaf950cyzv984n3jwwvgcmv5j73wk2x"; type = "gem"; }; - version = "0.12.0"; + version = "0.13.0"; }; kramdown = { dependencies = ["rexml"]; @@ -291,10 +291,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; + sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; type = "gem"; }; - version = "1.13.8"; + version = "1.13.9"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -363,10 +363,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dnfkrk8xx2m8r3r9m2p5xcq57viznyc09k7r3i4jbm758i57lx3"; + sha256 = "066w2wf3mwkzynz9h7qqvvr0w6rq6q45ngjfh9z0s08ny2gpdbmq"; type = "gem"; }; - version = "3.30.0"; + version = "4.0.0"; }; safe_yaml = { groups = ["default"]; @@ -395,10 +395,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18rbrh464ysqbdv53iwj0r8frshn65566kyj044cp3x9c2754jwh"; + sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr"; type = "gem"; }; - version = "2.0.0"; + version = "3.0.2"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -416,9 +416,19 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; + sha256 = "0ra70s8prfacpqwj5v2mqn1rbfz6xds3n9nsr9cwzs3z2c0wm5j7"; type = "gem"; }; - version = "1.8.0"; + version = "2.3.0"; + }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + type = "gem"; + }; + version = "1.7.0"; }; } diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/pkgs/applications/misc/jekyll/full/Gemfile index 2e72350f7e5e..5e7e2d9032a3 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile +++ b/pkgs/applications/misc/jekyll/full/Gemfile @@ -11,6 +11,7 @@ gem "jemoji" # Optional dependencies: gem "jekyll-coffeescript" #gem "jekyll-docs" +gem "jekyll-favicon" gem "jekyll-feed", "~> 0.9" gem "jekyll-gist" gem "jekyll-paginate" diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 3d1a02130736..6b1cc609e080 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -23,40 +23,45 @@ GEM http_parser.rb (~> 0) eventmachine (1.2.7) execjs (2.8.1) - faraday (2.6.0) + faraday (2.7.1) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.1) + faraday-net_http (3.0.2) fast-stemmer (1.0.2) ffi (1.15.5) forwardable-extended (2.6.0) - gemoji (3.0.1) + gemoji (4.0.1) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) i18n (1.12.0) concurrent-ruby (~> 1.0) - jekyll (4.2.2) + jekyll (4.3.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) i18n (~> 1.0) - jekyll-sass-converter (~> 2.0) + jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) - kramdown (~> 2.3) + kramdown (~> 2.3, >= 2.3.1) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.4.0) + mercenary (>= 0.3.6, < 0.5) pathutil (~> 0.9) - rouge (~> 3.0) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) - terminal-table (~> 2.0) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) jekyll-avatar (0.8.0) jekyll (>= 3.0, < 5.0) jekyll-coffeescript (2.0.0) coffee-script (~> 2.2) coffee-script-source (~> 1.12) + jekyll-favicon (1.1.0) + jekyll (>= 3.0, < 5.0) + mini_magick (~> 4.11) + rexml (~> 3.2, >= 3.2.5) jekyll-feed (0.17.0) jekyll (>= 3.7, < 5.0) jekyll-gist (1.5.0) @@ -77,8 +82,8 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.12.0) - gemoji (~> 3.0) + jemoji (0.13.0) + gemoji (>= 3, < 5) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) kramdown (2.4.0) @@ -99,9 +104,10 @@ GEM mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) + mini_magick (4.11.0) mini_portile2 (2.8.0) minitest (5.16.3) - nokogiri (1.13.8) + nokogiri (1.13.9) mini_portile2 (~> 2.8.0) racc (~> 1.4) octokit (4.25.1) @@ -119,7 +125,7 @@ GEM rdoc (6.4.0) psych (>= 4.0.0) rexml (3.2.5) - rouge (3.30.0) + rouge (4.0.0) ruby2_keywords (0.0.5) safe_yaml (1.0.5) sassc (2.4.0) @@ -128,12 +134,13 @@ GEM addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) stringio (3.0.2) - terminal-table (2.0.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) tomlrb (1.3.0) tzinfo (2.0.5) concurrent-ruby (~> 1.0) - unicode-display_width (1.8.0) + unicode-display_width (2.3.0) + webrick (1.7.0) yajl-ruby (1.4.3) PLATFORMS @@ -144,6 +151,7 @@ DEPENDENCIES jekyll jekyll-avatar jekyll-coffeescript + jekyll-favicon jekyll-feed (~> 0.9) jekyll-gist jekyll-mentions @@ -161,4 +169,4 @@ DEPENDENCIES yajl-ruby (~> 1.4) BUNDLED WITH - 2.3.22 + 2.3.9 diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 08e93427769c..3607b507cd9d 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -132,20 +132,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mqv17hfmph4ylmb2bqyccy64gsgpmzapq5yrmf5yjsqkvw9rxbv"; + sha256 = "1wyz9ab0mzi84gpf81fs19vrixglmmxi25k6n1mn9h141qmsp590"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.1"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13b717ddw90iaf4vijy06srmkvrfbzsnyjap93yll0nibad4dbxq"; + sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.2"; }; fast-stemmer = { groups = ["default"]; @@ -194,10 +194,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0"; + sha256 = "07lkqllgn7161rvnhnfy7adnfqv0xvr4c3ncsfxixdgmzi6acn5h"; type = "gem"; }; - version = "3.0.1"; + version = "4.0.1"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; @@ -232,15 +232,15 @@ version = "1.12.0"; }; jekyll = { - dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; + dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dpvkd7i9szkps2acxbdqajn4qc9sqxxy80f3rf5dra1vj7yrhpp"; + sha256 = "0m866i41j7y5ipvl7f0vz82mypv5irqz9xxbx44s5pdsmi3dyawy"; type = "gem"; }; - version = "4.2.2"; + version = "4.3.1"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -264,6 +264,17 @@ }; version = "2.0.0"; }; + jekyll-favicon = { + dependencies = ["jekyll" "mini_magick" "rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dyksm4i11n0qshd7wh6dvk8d0fc70dd32ir2dxs6igxq0gd6hi1"; + type = "gem"; + }; + version = "1.1.0"; + }; jekyll-feed = { dependencies = ["jekyll"]; groups = ["default"]; @@ -379,10 +390,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09sxbnrqz5vf6rxmh6lzism31gz2g3hw86ymg37r1ccknclv3cp9"; + sha256 = "0z4yabsvqdb8x1rr60yyzbaf950cyzv984n3jwwvgcmv5j73wk2x"; type = "gem"; }; - version = "0.12.0"; + version = "0.13.0"; }; kramdown = { dependencies = ["rexml"]; @@ -526,6 +537,16 @@ }; version = "3.2022.0105"; }; + mini_magick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs"; + type = "gem"; + }; + version = "4.11.0"; + }; mini_portile2 = { groups = ["default"]; platforms = []; @@ -552,10 +573,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; + sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; type = "gem"; }; - version = "1.13.8"; + version = "1.13.9"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -657,10 +678,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dnfkrk8xx2m8r3r9m2p5xcq57viznyc09k7r3i4jbm758i57lx3"; + sha256 = "066w2wf3mwkzynz9h7qqvvr0w6rq6q45ngjfh9z0s08ny2gpdbmq"; type = "gem"; }; - version = "3.30.0"; + version = "4.0.0"; }; ruby2_keywords = { groups = ["default"]; @@ -720,10 +741,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18rbrh464ysqbdv53iwj0r8frshn65566kyj044cp3x9c2754jwh"; + sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr"; type = "gem"; }; - version = "2.0.0"; + version = "3.0.2"; }; tomlrb = { groups = ["default"]; @@ -751,10 +772,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; + sha256 = "0ra70s8prfacpqwj5v2mqn1rbfz6xds3n9nsr9cwzs3z2c0wm5j7"; type = "gem"; }; - version = "1.8.0"; + version = "2.3.0"; + }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + type = "gem"; + }; + version = "1.7.0"; }; yajl-ruby = { groups = ["default"]; diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/applications/misc/jekyll/update.sh index 528f1062c733..bc3c0d5248b0 100755 --- a/pkgs/applications/misc/jekyll/update.sh +++ b/pkgs/applications/misc/jekyll/update.sh @@ -9,7 +9,7 @@ readonly BASEDIR="$(dirname $(readlink -f $0))" for directory in "basic" "full"; do pushd "$BASEDIR/$directory" rm -f Gemfile.lock gemset.nix - bundix --magic + BUNDLE_FORCE_RUBY_PLATFORM=true bundix --magic rm -rf .bundle vendor popd done diff --git a/pkgs/applications/misc/jiten/default.nix b/pkgs/applications/misc/jiten/default.nix index efd28fabae3a..7a3326bc8d9e 100644 --- a/pkgs/applications/misc/jiten/default.nix +++ b/pkgs/applications/misc/jiten/default.nix @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pcre sqlite ]; propagatedBuildInputs = with python3.pkgs; [ click flask kanjidraw ]; - checkInputs = [ nodejs ]; + nativeCheckInputs = [ nodejs ]; preBuild = '' export JITEN_VERSION=${version} # override `git describe` diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index d712712908f0..4cec4a97fe06 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.8.8"; + version = "2.9.17"; 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 = "0ivljlw6kdpg94q9syi11zmk54w06m8j3zicx9nppqg720fw4zv3"; - x86_64-darwin = "0gpr3zi6z98pkg8hsvcmpck754cph53kmgl3bhp3zmmmfj0kxjhs"; + x86_64-linux = "sha256-kdmxSXKHIyVdvVNEoZkSIQlOkTt97bpAdrV0sxhL1Ug="; + x86_64-darwin = "sha256-o3Q5foEuBi4OTHr6mP0ZXOxkkUw/c/jXaZOtztQf0gM="; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 7b2973b5075e..360c97d4a297 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18583"; + version = "18646"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-6S6E7ngTCBXb0epPfYxIswLvfm9r2Ql0wgOs/PxpmIM="; + hash = "sha256-nncN1cGpuVy4O3JeH56iQfwZGM5/xs3U/V+gVZbChOE="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-3XEoSCXEpeqZj1y4nns5+0JR1SINYE1rsmQ4fMflxRQ="; + hash = "sha256-ihBEOl6WnIaA7x40D2HTdVIDb30BYnhlh0sQrbNA/SU="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/applications/misc/jquake/default.nix b/pkgs/applications/misc/jquake/default.nix index 22e6764beeba..36b301dc4310 100644 --- a/pkgs/applications/misc/jquake/default.nix +++ b/pkgs/applications/misc/jquake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jquake"; - version = "1.8.1"; + version = "1.8.4"; src = fetchurl { - url = "https://fleneindre.github.io/downloads/JQuake_${version}_linux.zip"; - sha256 = "sha256-fIxCcqpv0KAXUBbyinTXr/fkAcufVtpr9FUTJkXSgTs="; + url = "https://github.com/fleneindre/fleneindre.github.io/raw/master/downloads/JQuake_${version}_linux.zip"; + sha256 = "sha256-oIYkYmI8uG4zjnm1Jq1mzIcSwRlKbWJqvACygQyp9sA="; }; nativeBuildInputs = [ unzip copyDesktopItems ]; @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Real-time earthquake map of Japan"; homepage = "https://jquake.net"; - downloadPage = "https://jquake.net/?down"; - changelog = "https://jquake.net/?docu"; + downloadPage = "https://jquake.net/en/terms.html?os=linux&arch=any"; + changelog = "https://jquake.net/en/changelog.html"; maintainers = with maintainers; [ nessdoor ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 141db33e8b1f..985ce9c1d165 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "jrnl"; - version = "3.0"; + version = "3.3"; format = "pyproject"; src = fetchFromGitHub { owner = "jrnl-org"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-wyN7dlAbQwqvES8qEJ4Zo+fDMM/Lh9tNjf215Ywop10="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-e2w0E8t6s0OWx2ROme2GdyzWhmCc6hnMfSdLTZqt3bg="; }; nativeBuildInputs = with python3.pkgs; [ @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { rich ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-bdd pytest-xdist pytestCheckHook @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"' + --replace 'rich = "^12.2.0"' 'rich = ">=12.2.0, <14.0.0"' ''; preCheck = '' @@ -66,6 +66,6 @@ python3.pkgs.buildPythonApplication rec { description = "Simple command line journal application that stores your journal in a plain text file"; homepage = "https://jrnl.sh/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ zalakain ]; + maintainers = with maintainers; [ bryanasdev000 zalakain ]; }; } diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index b001b50c4012..0bb01c38712f 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -8,8 +8,6 @@ , enableTesseract ? true, leptonica, tesseract4 }: -with lib; - # k2pdfopt is a pain to package. It requires modified versions of mupdf, # leptonica, and tesseract. Instead of shipping patches for these upstream # packages, k2pdfopt includes just the modified source files for these @@ -140,12 +138,12 @@ in stdenv.mkDerivation rec { }; in [ zlib libpng ] ++ - optional enableGSL gsl ++ - optional enableGhostScript ghostscript ++ - optional enableMuPDF mupdf_modded ++ - optional enableDJVU djvulibre ++ - optional enableGOCR gocr ++ - optionals enableTesseract [ leptonica_modded tesseract_modded ]; + lib.optional enableGSL gsl ++ + lib.optional enableGhostScript ghostscript ++ + lib.optional enableMuPDF mupdf_modded ++ + lib.optional enableDJVU djvulibre ++ + lib.optional enableGOCR gocr ++ + lib.optionals enableTesseract [ leptonica_modded tesseract_modded ]; dontUseCmakeBuildDir = true; @@ -157,7 +155,7 @@ in stdenv.mkDerivation rec { install -D -m 755 k2pdfopt $out/bin/k2pdfopt ''; - preFixup = optionalString enableTesseract '' + preFixup = lib.optionalString enableTesseract '' wrapProgram $out/bin/k2pdfopt --set-default TESSDATA_PREFIX ${tesseract4}/share/tessdata ''; diff --git a/pkgs/applications/misc/k40-whisperer/default.nix b/pkgs/applications/misc/k40-whisperer/default.nix index 429d798210e6..720536b18e51 100644 --- a/pkgs/applications/misc/k40-whisperer/default.nix +++ b/pkgs/applications/misc/k40-whisperer/default.nix @@ -23,12 +23,12 @@ let in stdenv.mkDerivation rec { pname = "k40-whisperer"; - version = "0.60"; + version = "0.62"; src = fetchzip { url = "https://www.scorchworks.com/K40whisperer/K40_Whisperer-${version}_src.zip"; stripRoot = true; - sha256 = "sha256-Nr7WYVu78msn5HuDNtSSvkdU6iCWtbiYZmh0rnMiyEg="; + sha256 = "sha256-3O+lCpmsCCu61REuxhrV8Uy01AgEGq/1DlMhjo45URM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index 85b409fe5ef3..69092b3acd5b 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.24"; + version = "1.2.26"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "sha256-s//GkCKvppqJ+7x8pNwVEaBsUOCKCGt+wLj9P+3N9hc="; + sha256 = "sha256-/Unxl9Vh9pEWjO89sSviGGPFzUwxdb1mbOfpTFTyRL0="; }; dontBuild = true; diff --git a/pkgs/applications/misc/kaufkauflist/default.nix b/pkgs/applications/misc/kaufkauflist/default.nix new file mode 100644 index 000000000000..a0034d203ce3 --- /dev/null +++ b/pkgs/applications/misc/kaufkauflist/default.nix @@ -0,0 +1,51 @@ +{ lib, buildPackages, buildGoModule, fetchFromGitHub, esbuild, buildNpmPackage, fetchFromGitea }: + +let + esbuild' = buildPackages.esbuild.override { + buildGoModule = args: buildPackages.buildGoModule (args // rec { + version = "0.16.15"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-iTAtPHjrBvHweSIiAbkkbBLgjF3v68jipJEzc0I4G04="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + }; +in buildNpmPackage rec { + pname = "kaufkauflist"; + version = "2.0.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "annaaurora"; + repo = "kaufkauflist"; + rev = "v${version}"; + hash = "sha256-oXrb6n1oD27bHt/zPWP0REQyCyZXI8BB57pdR/q42gY="; + }; + + npmDepsHash = "sha256-lSnGLK7+ac/wEpAxlpkZS/kgr9F+8WK+nRjCzkrPJt0="; + + ESBUILD_BINARY_PATH = "${lib.getExe esbuild'}"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/kaufkauflist $out/share/pocketbase + cp -vr build/* $out/share/kaufkauflist/ + cp -v pb_schema.json $out/share/pocketbase/ + + runHook postInstall + ''; + + # Uncomment this when nix-update-script supports Gitea. + #passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://codeberg.org/annaaurora/kaufkauflist"; + description = "A to-do list for shopping or other use cases"; + license = licenses.mit; + maintainers = with maintainers; [ annaaurora ]; + }; +} diff --git a/pkgs/applications/misc/keepass-diff/default.nix b/pkgs/applications/misc/keepass-diff/default.nix new file mode 100644 index 000000000000..3f88c00b4f5a --- /dev/null +++ b/pkgs/applications/misc/keepass-diff/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "keepass-diff"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "Narigo"; + repo = pname; + rev = version; + sha256 = "sha256-jd/cUkTHylLwzxolQUzMlXHauCfXUhcUr/1zKpdngbo="; + }; + + cargoSha256 = "sha256-2e2lGG72HmX7AFk0+J3U62Kch5ylrqvaIpitRF546JA="; + + meta = with lib; { + description = "A CLI-tool to diff Keepass (.kdbx) files"; + homepage = "https://keepass-diff.narigo.dev/"; + license = licenses.mit; + maintainers = with maintainers; [ wamserma ]; + }; +} diff --git a/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix b/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix index 780de142c5fd..abed55d91593 100644 --- a/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix +++ b/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix @@ -17,7 +17,7 @@ let homepage = "https://keepass.info/plugins.html#otpkeyprov"; platforms = with lib.platforms; linux; license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.ente ]; + maintainers = [ lib.maintainers.Enteee ]; }; pluginFilename = "OtpKeyProv.plgx"; diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index f9c78dfc6fbf..e062c35e80a6 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -4,11 +4,11 @@ let inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map; in buildDotnetPackage rec { pname = "keepass"; - version = "2.49"; + version = "2.52"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "sha256-1hg4bRuQSG+UzEQGeQcSURTmTxt5ITGQqfg0IS7RWt0="; + sha256 = "sha256-6dGCfysen26VGHIHETuNGkqHbPyeWRIEopqJa6AMzXA="; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/keepass/fix-paths.patch b/pkgs/applications/misc/keepass/fix-paths.patch index 5ff36a21c002..5d367b0a8266 100644 --- a/pkgs/applications/misc/keepass/fix-paths.patch +++ b/pkgs/applications/misc/keepass/fix-paths.patch @@ -43,15 +43,15 @@ diff --git a/KeePass/Util/AppLocator.cs b/KeePass/Util/AppLocator.cs index af02803..8a32c9d 100644 --- a/KeePass/Util/AppLocator.cs +++ b/KeePass/Util/AppLocator.cs -@@ -429,7 +429,7 @@ namespace KeePass.Util +@@ -468,7 +468,7 @@ namespace KeePass.Util if(NativeLib.GetPlatformID() == PlatformID.MacOSX) - strArgPrefix = string.Empty; // FR 3535696 + strOpt = string.Empty; // FR 3535696 -- string str = NativeLib.RunConsoleApp("whereis", strArgPrefix + strApp); -+ string str = NativeLib.RunConsoleApp("@whereis@", strArgPrefix + strApp); - if(str == null) return null; +- string str = NativeLib.RunConsoleApp("whereis", strOpt + strApp); ++ string str = NativeLib.RunConsoleApp("@whereis@", strOpt + strApp); + if(string.IsNullOrEmpty(str)) return null; - str = str.Trim(); + int iSep = str.IndexOf(':'); diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs index ab49ee2..7f6c50f 100644 --- a/KeePass/Util/ClipboardUtil.Unix.cs @@ -108,14 +108,14 @@ diff --git a/KeePassLib/Native/NativeLib.cs b/KeePassLib/Native/NativeLib.cs index 2d227a3..243f4ee 100644 --- a/KeePassLib/Native/NativeLib.cs +++ b/KeePassLib/Native/NativeLib.cs -@@ -145,7 +145,7 @@ namespace KeePassLib.Native - // Mono returns PlatformID.Unix on Mac OS X, workaround this - if(m_platID.Value == PlatformID.Unix) +@@ -143,7 +143,7 @@ namespace KeePassLib.Native + // Mono returns PlatformID.Unix on MacOS, workaround this + if(g_platID.Value == PlatformID.Unix) { - if((RunConsoleApp("uname", null) ?? string.Empty).Trim().Equals( + if((RunConsoleApp("@uname@", null) ?? string.Empty).Trim().Equals( "Darwin", StrUtil.CaseIgnoreCmp)) - m_platID = PlatformID.MacOSX; + g_platID = PlatformID.MacOSX; } diff --git a/KeePassLib/Utility/MonoWorkarounds.cs b/KeePassLib/Utility/MonoWorkarounds.cs index e20bb3a..4fd875b 100644 @@ -130,7 +130,7 @@ index e20bb3a..4fd875b 100644 private static Dictionary g_dForceReq = new Dictionary(); private static Thread g_thFixClip = null; -@@ -335,7 +335,7 @@ namespace KeePassLib.Utility +@@ -356,7 +356,7 @@ namespace KeePassLib.Utility // } // else { Debug.Assert(false); } diff --git a/pkgs/applications/misc/keepass/keepass-plugins.patch b/pkgs/applications/misc/keepass/keepass-plugins.patch index 891be1ffa314..978387eb9919 100644 --- a/pkgs/applications/misc/keepass/keepass-plugins.patch +++ b/pkgs/applications/misc/keepass/keepass-plugins.patch @@ -9,17 +9,17 @@ Subject: [PATCH] loadplugin diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs index 347eaf5..b92e1e2 100644 ---- a/KeePass/Forms/MainForm.cs -+++ b/KeePass/Forms/MainForm.cs -@@ -440,7 +440,$OUTPUT_LC$ @@ namespace KeePass.Forms - ToolStripItemCollection tsicT = m_ctxTray.Items; - ToolStripItem tsiPrevT = m_ctxTrayOptions; - -- m_pluginManager.LoadAllPlugins(); +--- a/KeePass/Forms/MainForm_Functions.cs ++++ b/KeePass/Forms/MainForm_Functions.cs +@@ -312,7 +312,$OUTPUT_LC$ @@ namespace KeePass.Forms + ToolStripItemCollection tsicT = m_ctxTray.Items; + ToolStripItem tsiPrevT = m_ctxTrayOptions; + +- m_pluginManager.LoadAllPlugins(); $DO_LOADS$+ - - m_pluginManager.AddMenuItems(PluginMenuType.Main, tsicM, tsiPrevM); - m_pluginManager.AddMenuItems(PluginMenuType.Group, tsicGM, tsiPrevGM); + + m_pluginManager.AddMenuItems(PluginMenuType.Main, tsicM, tsiPrevM); + m_pluginManager.AddMenuItems(PluginMenuType.Group, tsicGM, tsiPrevGM); -- 2.25.4 diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 258a2a51e72d..bf386c116d48 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake , qttools @@ -36,8 +37,6 @@ , nixosTests }: -with lib; - stdenv.mkDerivation rec { pname = "keepassxc"; version = "2.7.4"; @@ -49,13 +48,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-amedKK9nplLVJTldeabN3/c+g/QesrdH+qx+rba2/4s="; }; - NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang [ + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [ "-Wno-old-style-cast" "-Wno-error" "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" ]; - NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; patches = [ ./darwin.patch @@ -66,13 +65,13 @@ stdenv.mkDerivation rec { "-DWITH_GUI_TESTS=ON" "-DWITH_XC_UPDATECHECK=OFF" ] - ++ (optional (!withKeePassX11) "-DWITH_XC_X11=OFF") - ++ (optional (withKeePassFDOSecrets && stdenv.isLinux) "-DWITH_XC_FDOSECRETS=ON") - ++ (optional (withKeePassYubiKey && stdenv.isLinux) "-DWITH_XC_YUBIKEY=ON") - ++ (optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") - ++ (optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON") - ++ (optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON") - ++ (optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON"); + ++ (lib.optional (!withKeePassX11) "-DWITH_XC_X11=OFF") + ++ (lib.optional (withKeePassFDOSecrets && stdenv.isLinux) "-DWITH_XC_FDOSECRETS=ON") + ++ (lib.optional (withKeePassYubiKey && stdenv.isLinux) "-DWITH_XC_YUBIKEY=ON") + ++ (lib.optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") + ++ (lib.optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON") + ++ (lib.optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON") + ++ (lib.optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON"); doCheck = true; checkPhase = '' @@ -81,8 +80,9 @@ stdenv.mkDerivation rec { export LC_ALL="en_US.UTF-8" export QT_QPA_PLATFORM=offscreen export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" - # testcli and testgui are flaky - skip them both - make test ARGS+="-E 'testcli|testgui' --output-on-failure" + # testcli, testgui and testkdbx4 are flaky - skip them all + # testautotype on darwin throws "QWidget: Cannot create a QWidget without QApplication" + make test ARGS+="-E 'testcli|testgui${lib.optionalString stdenv.isDarwin "|testautotype|testkdbx4"}' --output-on-failure" runHook postCheck ''; @@ -90,8 +90,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ asciidoctor cmake wrapGAppsHook wrapQtAppsHook qttools pkg-config ]; dontWrapGApps = true; - postFixup = '' + preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + '' + lib.optionalString stdenv.isDarwin '' + wrapQtApp "$out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC" ''; buildInputs = [ @@ -108,14 +110,14 @@ stdenv.mkDerivation rec { readline zlib ] - ++ optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication - ++ optional stdenv.isDarwin qtmacextras - ++ optional stdenv.isLinux libusb1 - ++ optional withKeePassX11 qtx11extras; + ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication + ++ lib.optional stdenv.isDarwin qtmacextras + ++ lib.optional stdenv.isLinux libusb1 + ++ lib.optional withKeePassX11 qtx11extras; passthru.tests = nixosTests.keepassxc; - meta = { + meta = with lib; { description = "Offline password manager with many features."; longDescription = '' A community fork of KeePassX, which is itself a port of KeePass Password Safe. @@ -128,6 +130,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ jonafato turion srapenne ]; platforms = platforms.linux ++ platforms.darwin; - broken = stdenv.isDarwin; # see to https://github.com/NixOS/nixpkgs/issues/172165 }; } diff --git a/pkgs/applications/misc/keepmenu/default.nix b/pkgs/applications/misc/keepmenu/default.nix index d169e19a19a5..8cdbd69912d0 100644 --- a/pkgs/applications/misc/keepmenu/default.nix +++ b/pkgs/applications/misc/keepmenu/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { pynput ]; - checkInputs = [ xvfb-run ]; + nativeCheckInputs = [ xvfb-run ]; checkPhase = '' xvfb-run python setup.py test ''; diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/applications/misc/keeweb/default.nix index 6730d1f89b6c..7af5465ad9e0 100644 --- a/pkgs/applications/misc/keeweb/default.nix +++ b/pkgs/applications/misc/keeweb/default.nix @@ -1,13 +1,34 @@ -{ lib, stdenv, fetchurl, appimageTools, undmg, libsecret, libxshmfence }: +{ lib +, stdenv +, fetchurl +, undmg +, dpkg +, autoPatchelfHook +, wrapGAppsHook +, makeWrapper +, alsa-lib +, at-spi2-atk +, gdk-pixbuf +, glibc +, nss +, udev +, xorg +, gnome +, mesa +, gtk3 +, libusb1 +, libsecret +, libappindicator +, xdotool +}: let pname = "keeweb"; version = "1.18.7"; - name = "${pname}-${version}"; srcs = { x86_64-linux = fetchurl { - url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.AppImage"; - hash = "sha256-W3Dfo7YZfLObodAS7ZN3jqnYzLNAnjJIfJC6il5THwY="; + url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.x64.deb"; + hash = "sha256-/U+vn5TLIU9/J6cRFjuAdyGzlwC04mp4L2X2ETp+ZSE="; }; x86_64-darwin = fetchurl { url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.x64.dmg"; @@ -18,11 +39,29 @@ let hash = "sha256-bkhwsWYLkec16vMOfXUce7jfrmI9W2xHiZvU1asebK4="; }; }; - src = srcs.${stdenv.hostPlatform.system}; + src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - appimageContents = appimageTools.extract { - inherit name src; - }; + libraries = [ + alsa-lib + at-spi2-atk + gdk-pixbuf + nss + udev + xorg.libX11 + xorg.libXcomposite + xorg.libXext + xorg.libXrandr + xorg.libXScrnSaver + xorg.libXtst + xorg.libxshmfence + gnome.gnome-keyring + mesa + gtk3 + libusb1 + libsecret + libappindicator + xdotool + ]; meta = with lib; { description = "Free cross-platform password manager compatible with KeePass"; @@ -33,35 +72,46 @@ let maintainers = with maintainers; [ sikmir ]; platforms = builtins.attrNames srcs; }; - - linux = appimageTools.wrapType2 rec { - inherit name src meta; - - extraPkgs = pkgs: with pkgs; [ libsecret libxshmfence ]; - - extraInstallCommands = '' - mv $out/bin/{${name},${pname}} - install -Dm644 ${appimageContents}/keeweb.desktop -t $out/share/applications - install -Dm644 ${appimageContents}/keeweb.png -t $out/share/icons/hicolor/256x256/apps - install -Dm644 ${appimageContents}/usr/share/mime/keeweb.xml -t $out/share/mime - substituteInPlace $out/share/applications/keeweb.desktop \ - --replace "Exec=AppRun" "Exec=$out/bin/${pname}" - ''; - }; - - darwin = stdenv.mkDerivation { - inherit pname version src meta; - - nativeBuildInputs = [ undmg ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/Applications - cp -r *.app $out/Applications - ''; - }; in if stdenv.isDarwin -then darwin -else linux +then stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/Applications + cp -r *.app $out/Applications + ''; +} +else stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + makeWrapper + ]; + + buildInputs = libraries; + + unpackPhase = '' + ${dpkg}/bin/dpkg-deb --fsys-tarfile $src | tar --extract + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r usr/share $out/share + + makeWrapper $out/share/keeweb-desktop/keeweb $out/bin/keeweb \ + --argv0 "keeweb" \ + --add-flags "$out/share/keeweb-desktop/resources/app.asar" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libraries}" + + runHook postInstall + ''; +} diff --git a/pkgs/applications/misc/keystore-explorer/default.nix b/pkgs/applications/misc/keystore-explorer/default.nix index 2274aa00cb44..2c8a31acc18a 100644 --- a/pkgs/applications/misc/keystore-explorer/default.nix +++ b/pkgs/applications/misc/keystore-explorer/default.nix @@ -1,13 +1,17 @@ -{ fetchzip, lib, stdenv, jdk, runtimeShell }: +{ fetchzip, lib, stdenv, jdk, runtimeShell, glib, wrapGAppsHook }: stdenv.mkDerivation rec { - version = "5.4.4"; + version = "5.5.2"; pname = "keystore-explorer"; src = fetchzip { - url = "https://github.com/kaikramer/keystore-explorer/releases/download/v${version}/kse-544.zip"; - sha256 = "01kpa8g6p6vcqq9y70w5bm8jbw4kp55pbywj2zrhgjibrhgjqi0b"; + url = "https://github.com/kaikramer/keystore-explorer/releases/download/v${version}/kse-${lib.replaceStrings ["."] [""] version}.zip"; + sha256 = "sha256-mDi/TSYumCg2hAnMOI2QpdAOSlDMpdJPqzatFotAqUk="; }; + # glib is necessary so file dialogs don't hang. + buildInputs = [ glib ]; + nativeBuildInputs = [ wrapGAppsHook ]; + installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index b4819b70a933..18952865eb84 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { urwid ]; - checkInputs = with python3.pkgs;[ + nativeCheckInputs = with python3.pkgs;[ freezegun hypothesis packaging @@ -90,6 +90,8 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # timing based "test_etag" + "test_bogota" + "test_event_no_dst" ]; meta = with lib; { diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index f098cd6dbfb6..d4e6e8a47201 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,12 +1,12 @@ -{ lib, python3 }: +{ lib, python3, khard, testers }: python3.pkgs.buildPythonApplication rec { - version = "0.17.0"; + version = "0.18.0"; pname = "khard"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "062nv4xkfsjc11k9m52dh6xjn9z68a4a6x1s8z05wwv4jbp1lkhn"; + sha256 = "05860fdayqap128l7i6bcmi9kdyi2gx02g2pmh88d56xgysd927y"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -33,6 +33,8 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "khard" ]; + passthru.tests.version = testers.testVersion { package = khard; }; + meta = { homepage = "https://github.com/scheibler/khard"; description = "Console carddav client"; diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 7f13494f65f5..600ea299d18f 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub -, callPackage +, libkiwix , pkg-config , qmake , qtbase @@ -11,13 +11,13 @@ mkDerivation rec { pname = "kiwix"; - version = "2.2.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = pname; repo = "${pname}-desktop"; rev = version; - sha256 = "sha256-ks2d/guMp5pb2tiwGxNp3htQVm65MsYvZ/6tNjGXNr8="; + sha256 = "sha256-ghx4pW6IkWPzZXk0TtMGeQZIzm9HEN3mR4XQFJ1xHDo="; }; nativeBuildInputs = [ @@ -26,11 +26,11 @@ mkDerivation rec { ]; buildInputs = [ + libkiwix qtbase qtwebengine qtsvg qtimageformats - (callPackage ./lib.nix {}) ]; qtWrapperArgs = [ @@ -40,7 +40,7 @@ mkDerivation rec { meta = with lib; { description = "An offline reader for Web content"; homepage = "https://kiwix.org"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ ajs124 ]; }; diff --git a/pkgs/applications/misc/kiwix/lib.nix b/pkgs/applications/misc/kiwix/lib.nix index 37f8203e047a..144d83f6c150 100644 --- a/pkgs/applications/misc/kiwix/lib.nix +++ b/pkgs/applications/misc/kiwix/lib.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config , python3 , curl , icu +, libzim , pugixml -, zimlib , zlib , libmicrohttpd , mustache-hpp @@ -12,14 +12,14 @@ }: stdenv.mkDerivation rec { - pname = "kiwix-lib"; - version = "10.1.1"; + pname = "libkiwix"; + version = "12.0.0"; src = fetchFromGitHub { owner = "kiwix"; repo = pname; rev = version; - sha256 = "sha256-ECvdraN1J5XJQLeZDngxO5I7frwZ8+W8tFpbB7o8UeM="; + sha256 = "sha256-4FxLxJxVhqbeNqX4vorHkROUuRURvE6AXlteIZCEBtc="; }; nativeBuildInputs = [ @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ curl libmicrohttpd + libzim pugixml - zimlib ]; - checkInputs = [ + nativeCheckInputs = [ gtest ]; @@ -51,4 +51,12 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs scripts ''; + + meta = with lib; { + description = "Common code base for all Kiwix ports"; + homepage = "https://kiwix.org"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ colinsane ]; + }; } diff --git a/pkgs/applications/misc/kiwix/tools.nix b/pkgs/applications/misc/kiwix/tools.nix new file mode 100644 index 000000000000..fe70f5b317a2 --- /dev/null +++ b/pkgs/applications/misc/kiwix/tools.nix @@ -0,0 +1,41 @@ +{ lib +, fetchFromGitHub +, icu +, libkiwix +, meson +, ninja +, pkg-config +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "kiwix-tools"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "kiwix"; + repo = "kiwix-tools"; + rev = version; + sha256 = "sha256-r3/aTH/YoDuYpKLPakP4toS3OtiRueTUjmR34rdmr+w="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + icu + libkiwix + ]; + + meta = with lib; { + description = "Command line Kiwix tools: kiwix-serve, kiwix-manage, ..."; + homepage = "https://kiwix.org"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ colinsane ]; + }; +} + diff --git a/pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix b/pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix new file mode 100644 index 000000000000..7cec6c592235 --- /dev/null +++ b/pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix @@ -0,0 +1,29 @@ +{ lib +, gawk +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "lukesmithxyz-bible-kjv"; + version = "unstable-2022-06-01"; + + src = fetchFromGitHub { + owner = "lukesmithxyz"; + repo = "kjv"; + rev = "1b675c0396806a2a3d134c51fd11d9fed8ea3dc5"; + hash = "sha256-ii5SGZmO99VYbKdebfEbN3rL7LLSSQ0jm5mGqX2G3o0="; + }; + + buildInputs = [ gawk ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Read the Word of God from your terminal + Apocrypha"; + homepage = "https://lukesmith.xyz/articles/command-line-bibles"; + license = licenses.unlicense; + platforms = platforms.unix; + maintainers = [ maintainers.wesleyjrz ]; + }; +} diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 3ab41da35452..0386b25ee422 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.27.11"; + version = "0.28.3"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-w3ag+TPUrjPbPIy6N4HPsfraOyoHqBbvjwB1M6+qh60="; + hash = "sha256-keC+QLV/iEEGFDdy/Vt2pCr55qbqQzcx3HokdDi+xSU="; }; postPatch = '' diff --git a/pkgs/applications/misc/kord/default.nix b/pkgs/applications/misc/kord/default.nix new file mode 100644 index 000000000000..d42025a643bc --- /dev/null +++ b/pkgs/applications/misc/kord/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, alsa-lib +}: + +rustPlatform.buildRustPackage rec { + pname = "kord"; + version = "0.4.2"; + + # kord depends on nightly features + RUSTC_BOOTSTRAP = 1; + + src = fetchFromGitHub { + owner = "twitchax"; + repo = "kord"; + rev = "v${version}"; + sha256 = "sha256-B/UwnbzXI3ER8IMOVtn0ErVqFrkZXKoL+l7ll1AlzDg="; + }; + + cargoHash = "sha256-xhWSycTe72HW3E9meTo4wjOCHDcNq6fUPT6nqHoW9vE="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsa-lib ]; + + meta = with lib; { + description = "A music theory binary and library for Rust"; + homepage = "https://github.com/twitchax/kord"; + maintainers = with maintainers; [ kidsan ]; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 7e48781f5c47..f232400fbfbf 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { ./0001-Disable-autostart.patch ]; - fixupPhase = '' + postInstall = '' mkdir -p $out/etc/xdg/autostart cp $out/share/applications/org.kde.latte-dock.desktop $out/etc/xdg/autostart ''; diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index 1dac72bd0d74..80da168cdafe 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -1,40 +1,88 @@ -{ lib, stdenv, pkg-config, fetchFromGitHub, fetchpatch -, cmake, boost -, portmidi, sqlite -, freetype, libpng, pngpp, zlib -, wxGTK30, wxsqlite3 +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, makeWrapper +, boost +, portmidi +, sqlite +, freetype +, libpng +, pngpp +, zlib +, wxGTK32 +, wxsqlite3 +, fluidsynth +, fontconfig +, darwin +, soundfont-fluid +, openlilylib-fonts }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation rec { pname = "lenmus"; - version = "5.4.2"; + version = "6.0.1"; src = fetchFromGitHub { owner = "lenmus"; repo = "lenmus"; rev = "Release_${version}"; - sha256 = "1n639xr1qxx6rhqs0c6sjxp3bv8cwkmw1vfk1cji7514gj2a9v3p"; + sha256 = "sha256-qegOAc6vs2+6VViDHVjv0q+qjLZyTT7yPF3hFpTt5zE="; }; - patches = [ - (fetchpatch { - url = "https://github.com/lenmus/lenmus/commit/421760d84694a0e6e72d0e9b1d4fd30a7e129c6f.patch"; - sha256 = "1z1wwh0pcr8w1zlr8swx99si9y2kxx5bmavgwvy6bvdhxgm58yqs"; - }) - (fetchpatch { - url = "https://github.com/lenmus/lenmus/commit/6613d20d4051effc782203c9c6d92962a3f66b5f.patch"; - sha256 = "01vvzzpamv90jpqbbq1f2m2b4gb9xab9z70am8i41d90nqvg6agn"; - }) + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "/usr" "${placeholder "out"}" + sed -i 's/fixup_bundle.*")/")/g' CMakeLists.txt + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + makeWrapper ]; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost - portmidi sqlite - freetype libpng pngpp zlib - wxGTK30 wxsqlite3 + portmidi + sqlite + freetype + libpng + pngpp + zlib + wxGTK32 + wxsqlite3 + fluidsynth + fontconfig + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa ]; + preConfigure = '' + mkdir res/fonts + ln -s ${openlilylib-fonts.bravura}/share/lilypond/*/fonts/otf/Bravura.otf res/fonts/Bravura.otf + ln -s ${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2 res/sounds/FluidR3_GM.sf2 + ''; + + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DLENMUS_INSTALL_SOUNDFONT=ON" + "-DMAN_INSTALL_DIR=${placeholder "out"}/share/man" + ]; + + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin} + mv $out/lenmus.app $out/Applications + mv $out/Resources $out/Applications/lenmus.app/Contents + makeWrapper $out/{Applications/lenmus.app/Contents/MacOS,bin}/lenmus + ''; + meta = with lib; { description = "LenMus Phonascus is a program for learning music"; longDescription = '' @@ -45,7 +93,6 @@ stdenv.mkDerivation rec { homepage = "http://www.lenmus.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ramkromberg ]; - platforms = with platforms; linux; - broken = stdenv.hostPlatform.isAarch64; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 54ed6c10f42a..566730c12222 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,7 +1,6 @@ { lib , boost , fetchFromGitHub -, fetchpatch , installShellFiles , mkDerivation , muparser @@ -15,38 +14,42 @@ mkDerivation rec { pname = "librecad"; - version = "2.2.0-rc2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "LibreCAD"; repo = "LibreCAD"; rev = version; - sha256 = "sha256-RNg7ioMriH4A7V65+4mh8NhsUHs/8IbTt38nVkYilCE="; + sha256 = "sha256-horKTegmvcMg4m5NbZ4nzy4J6Ac/6+E5OkiZl0v6TBc="; }; - patches = [ - (fetchpatch { - url = "https://github.com/LibreCAD/LibreCAD/pull/1465/commits/4edcbe72679f95cb60979c77a348c1522a20b0f4.patch"; - sha256 = "sha256-P0G2O5sL7Ip860ByxFQ87TfV/lq06wCQnzPxADGqFPs="; - name = "CVE-2021-45342.patch"; - }) + buildInputs = [ + boost + muparser + qtbase + qtsvg + ]; + + nativeBuildInputs = [ + installShellFiles + pkg-config + qmake + qttools + ]; + + qmakeFlags = [ + "MUPARSER_DIR=${muparser}" + "BOOST_DIR=${boost.dev}" ]; postPatch = '' substituteInPlace scripts/postprocess-unix.sh \ --replace /bin/sh ${runtimeShell} - substituteInPlace librecad/src/lib/engine/rs_system.cpp \ - --replace /usr/share $out/share - substituteInPlace librecad/src/main/qc_applicationwindow.cpp \ --replace __DATE__ 0 ''; - qmakeFlags = [ - "MUPARSER_DIR=${muparser}" - "BOOST_DIR=${boost.dev}" - ]; installPhase = '' runHook preInstall @@ -65,20 +68,6 @@ mkDerivation rec { runHook postInstall ''; - buildInputs = [ - boost - muparser - qtbase - qtsvg - ]; - - nativeBuildInputs = [ - installShellFiles - pkg-config - qmake - qttools - ]; - meta = with lib; { description = "2D CAD package based on Qt"; homepage = "https://librecad.org"; diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix index 77f2a6cb4a93..a40b253d4ba0 100644 --- a/pkgs/applications/misc/limesctl/default.nix +++ b/pkgs/applications/misc/limesctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "limesctl"; - version = "3.0.3"; + version = "3.1.3"; src = fetchFromGitHub { owner = "sapcc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2eB+VpMrhzs0Dg+X1sf7TVW7uK/URETUuWO82jQl57k="; + sha256 = "sha256-fi36jsQr/Mn1FyOlle/WSpREQgZU6+h4IJzd3ZfItvI="; }; - vendorSha256 = "sha256-VKxwdlyQUYmxubl4Y2uKvekuHd62GcGaoPeUBC+lcJU="; + vendorSha256 = "sha256-gcIPASIk4Zq8y+KppYNRkf/9guCsYv9XskFANrqOCts="; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 7004d0dce34f..443a03c2ad22 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -19,8 +19,10 @@ stdenv.mkDerivation rec { src = ./fix-build-bash.patch; }); - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ]; + strictDeps = true; + + nativeBuildInputs = [ makeWrapper ocaml ]; + buildInputs = [ mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ]; dontStrip = true; @@ -51,6 +53,9 @@ stdenv.mkDerivation rec { homepage = "https://repo.or.cz/w/llpp.git"; description = "A MuPDF based PDF pager written in OCaml"; platforms = platforms.linux; + # Project is unmaintained and fails to build: + # link.c:987:27: error: invalid operands to binary >= (have 'fz_location' and 'int') + broken = true; maintainers = with maintainers; [ pSub ]; license = licenses.gpl3; }; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index bb879bce1572..9a9db9d70f94 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -1,12 +1,19 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, git }: +{ lib +, stdenv +, fetchurl +, appimageTools +, appimage-run +, makeWrapper +, git +}: stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.11"; + version = "0.8.16"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-c8gP7OJwnCEXnT2FQH1ttYRzZfbcJL86FX2JQezJI+s="; + sha256 = "sha256-0tIDoNQoqSn1nYm+YdgzXh34aH1e5N8wl9lqGbQoOeU="; name = "${pname}-${version}.AppImage"; }; @@ -23,35 +30,29 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/bin $out/share/${pname} $out/share/applications - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + mkdir -p $out/bin $out/share/${pname} $out/share/applications $out/share/${pname}/resources/app/icons + cp -a ${appimageContents}/resources/app/icons/logseq.png $out/share/${pname}/resources/app/icons/logseq.png cp -a ${appimageContents}/Logseq.desktop $out/share/applications/${pname}.desktop - # remove the `git` in `dugite` because we want the `git` in `nixpkgs` - chmod +w -R $out/share/${pname}/resources/app/node_modules/dugite/git - chmod +w $out/share/${pname}/resources/app/node_modules/dugite - rm -rf $out/share/${pname}/resources/app/node_modules/dugite/git - chmod -w $out/share/${pname}/resources/app/node_modules/dugite + # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs + makeWrapper ${appimage-run}/bin/appimage-run $out/bin/logseq \ + --set "LOCAL_GIT_DIRECTORY" ${git} \ + --add-flags ${src} + # Make the desktop entry run the app using appimage-run substituteInPlace $out/share/applications/${pname}.desktop \ - --replace Exec=Logseq Exec=${pname} \ + --replace Exec=Logseq "Exec=$out/bin/logseq" \ --replace Icon=Logseq Icon=$out/share/${pname}/resources/app/icons/logseq.png runHook postInstall ''; - postFixup = '' - # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --set "LOCAL_GIT_DIRECTORY" ${git} \ - --add-flags $out/share/${pname}/resources/app - ''; - passthru.updateScript = ./update.sh; meta = with lib; { description = "A local-first, non-linear, outliner notebook for organizing and sharing your personal knowledge base"; homepage = "https://github.com/logseq/logseq"; + changelog = "https://github.com/logseq/logseq/releases/tag/${version}"; license = licenses.agpl3Plus; maintainers = with maintainers; [ weihua ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/lswt/default.nix b/pkgs/applications/misc/lswt/default.nix new file mode 100644 index 000000000000..d6bdf77a8bdb --- /dev/null +++ b/pkgs/applications/misc/lswt/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromSourcehut, nixos, wayland }: + +stdenv.mkDerivation rec { + pname = "lswt"; + version = "1.0.4"; + + src = fetchFromSourcehut { + owner = "~leon_plickat"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Orwa7sV56AeznEcq/Xj5qj4PALMxq0CI+ZnXuY4JYE0="; + }; + + buildInputs = [ wayland ]; + + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "PREFIX=" + ]; + + meta = with lib; { + description = "A command that lists Wayland toplevels"; + homepage = "https://sr.ht/~leon_plickat/lswt"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ edrex ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index f60c478c6824..d476024553ba 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -22,16 +22,16 @@ , flake8 # python dependencies +, certifi , dbus-python , distro , evdev , lxml , pillow , pygobject3 +, pypresence , pyyaml , requests -, keyring -, python-magic # commands that lutris needs , xrandr @@ -48,6 +48,7 @@ , fluidsynth , xorgserver , xorg +, util-linux }: let @@ -68,29 +69,19 @@ let xorgserver xorg.setxkbmap xorg.xkbcomp + # bypass mount suid wrapper which does not work in fhsenv + util-linux ]; - - binPath = lib.makeBinPath requiredTools; - - gstDeps = with gst_all_1; [ - gst-libav - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gstreamer - ]; - in buildPythonApplication rec { - pname = "lutris-original"; - version = "0.5.11"; + pname = "lutris-unwrapped"; + version = "0.5.12"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "refs/tags/v${version}"; - sha256 = "sha256-D2qMKYmi5TC8jEAECcz2V0rUrmp5kjXJ5qyW6C4re3w="; + sha256 = "sha256-rsiXm7L/M85ot6NrTyy//lMRFlLPJYve9y6Erg9Ugxg="; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -104,20 +95,27 @@ buildPythonApplication rec { libnotify pango webkitgtk - python-magic - ] ++ gstDeps; + ] ++ (with gst_all_1; [ + gst-libav + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer + ]); + # See `install_requires` in https://github.com/lutris/lutris/blob/master/setup.py propagatedBuildInputs = [ - evdev - distro - lxml - pyyaml - pygobject3 - requests - pillow + certifi dbus-python - keyring - python-magic + distro + evdev + lxml + pillow + pygobject3 + pypresence + pyyaml + requests ]; postPatch = '' @@ -125,19 +123,20 @@ buildPythonApplication rec { --replace "'libmagic.so.1'" "'${lib.getLib file}/lib/libmagic.so.1'" ''; - - checkInputs = [ xvfb-run nose2 flake8 ] ++ requiredTools; - preCheck = "export HOME=$PWD"; + nativeCheckInputs = [ xvfb-run nose2 flake8 ] ++ requiredTools; checkPhase = '' runHook preCheck + + export HOME=$PWD xvfb-run -s '-screen 0 800x600x24' make test + runHook postCheck ''; # avoid double wrapping dontWrapGApps = true; makeWrapperArgs = [ - "--prefix PATH : ${binPath}" + "--prefix PATH : ${lib.makeBinPath requiredTools}" "\${gappsWrapperArgs[@]}" ]; # needed for glib-schemas to work correctly (will crash on dialogues otherwise) diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 5c39576ac6f3..075755bf217d 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -30,7 +30,7 @@ in buildFHSUserEnv { # DGen // TODO: libarchive is broken # Dolphin - bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm + bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls_2 lzo sfml gsm wavpack orc nettle gmp pcre vulkan-loader # DOSBox diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix index 141bdac87da7..b9a1c0fd5371 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/pkgs/applications/misc/madonctl/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "McKael"; repo = "madonctl"; rev = "v${version}"; - sha256 = "sha256-mo185EKjLkiujAKcAFM1XqkXWvcfYbnv+r3dF9ywaf8="; + hash = "sha256-mo185EKjLkiujAKcAFM1XqkXWvcfYbnv+r3dF9ywaf8="; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 342700e67821..bd197395e851 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # when running these tests inside build, based on free disk space. doCheck = false; checkTarget = "test"; - checkInputs = [ which zstd pbzip2 ]; + nativeCheckInputs = [ which zstd pbzip2 ]; installPhase = '' mkdir -p $out/{bin,share/{${pname}-${version},man/man1}} diff --git a/pkgs/applications/misc/mangal/default.nix b/pkgs/applications/misc/mangal/default.nix index 7e8ea89fe9d1..26e735039b3f 100644 --- a/pkgs/applications/misc/mangal/default.nix +++ b/pkgs/applications/misc/mangal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mangal"; - version = "4.0.4"; + version = "4.0.6"; src = fetchFromGitHub { owner = "metafates"; repo = pname; rev = "v${version}"; - hash = "sha256-U1NmJsh7OuS0/kktmMcIjEaqc1ABtWG0ilSUw0UL8aU="; + hash = "sha256-nbJdePlzZFM2ihbvFIMKyYZ9C0uKjU3TE5VLduLvtKE="; }; proxyVendor = true; diff --git a/pkgs/applications/misc/mbutil/default.nix b/pkgs/applications/misc/mbutil/default.nix index b108d1a5647e..69b61afaee55 100644 --- a/pkgs/applications/misc/mbutil/default.nix +++ b/pkgs/applications/misc/mbutil/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "06d62r89h026asaa4ryzb23m86j0cmbvy54kf4zl5f35sgiha45z"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = "nosetests"; meta = with lib; { diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index 2db12da25758..582d3186eaad 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -1,22 +1,27 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub -, qmake +, cmake , qttools +, wrapQtAppsHook , curl , ffmpeg , libmediainfo , libzen +, qt5compat ? null # qt6 only , qtbase , qtdeclarative , qtmultimedia , qtsvg +, qtwayland , quazip }: - -mkDerivation rec { +let + qtVersion = lib.versions.major qtbase.version; +in +stdenv.mkDerivation rec { pname = "mediaelch"; version = "2.8.18"; @@ -28,20 +33,36 @@ mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ qmake qttools ]; - - buildInputs = [ curl ffmpeg libmediainfo libzen qtbase qtdeclarative qtmultimedia qtsvg ]; - - qmakeFlags = [ - "USE_EXTERN_QUAZIP=${quazip}/include/quazip5" + nativeBuildInputs = [ + cmake + qttools + wrapQtAppsHook ]; - postPatch = '' - substituteInPlace MediaElch.pro --replace "/usr" "$out" - ''; + buildInputs = [ + curl + ffmpeg + libmediainfo + libzen + qtbase + qtdeclarative + qtmultimedia + qtsvg + qtwayland + quazip + ] ++ lib.optional (qtVersion == "6") [ + qt5compat + ]; + + cmakeFlags = [ + "-DDISABLE_UPDATER=ON" + "-DUSE_EXTERN_QUAZIP=ON" + "-DMEDIAELCH_FORCE_QT${qtVersion}=ON" + ]; + + # libmediainfo.so.0 is loaded dynamically qtWrapperArgs = [ - # libmediainfo.so.0 is loaded dynamically "--prefix LD_LIBRARY_PATH : ${libmediainfo}/lib" ]; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index a15733dd526c..245e0565e7c0 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,16 +1,20 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK30-gtk3 -, desktop-file-utils, libSM, imagemagick }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK32 +, desktop-file-utils, libSM, imagemagick, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation rec { - version = "22.06"; + version = "22.12"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "sha256-mGowC8wnNJij5dpOlwHX3m7uGZ7TbUInPdP+nsesi30="; + sha256 = "sha256-kyuCc59zjn22A89bsXByBzGp58YdFFwqVKq7PNC3U7w="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libmediainfo wxGTK30-gtk3 desktop-file-utils libSM imagemagick ]; + buildInputs = [ libmediainfo wxGTK32 desktop-file-utils libSM imagemagick ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; sourceRoot = "./MediaInfo/Project/GNU/GUI/"; @@ -24,7 +28,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://mediaarea.net/"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.devhell ]; }; } diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index bde522fb0832..8adfb7453ef5 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "22.06"; + version = "22.12"; pname = "mediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "sha256-mGowC8wnNJij5dpOlwHX3m7uGZ7TbUInPdP+nsesi30="; + sha256 = "sha256-kyuCc59zjn22A89bsXByBzGp58YdFFwqVKq7PNC3U7w="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/applications/misc/meerk40t/default.nix index 276cf7998837..a3b5b591f6ea 100644 --- a/pkgs/applications/misc/meerk40t/default.nix +++ b/pkgs/applications/misc/meerk40t/default.nix @@ -46,7 +46,7 @@ buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ unittestCheckHook ]; diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 35832b0dafb1..efa10faf2a0f 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.2.7"; + version = "2.4.0"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = pname; rev = "v${version}"; - hash = "sha256-Kqvnw0cPPkqgJQdc6vkP4U96AQuyFSNMQTzTdIUghWw="; + hash = "sha256-/Zi82ri61cQHt1D8DjeVHTSeEn9ubQJD931kP0ffiOs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix index 86b4bc66d296..9bf2bbab70d1 100644 --- a/pkgs/applications/misc/metamorphose2/default.nix +++ b/pkgs/applications/misc/metamorphose2/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation { --add-flags "-O $out/share/metamorphose2/metamorphose2.py -w=3" ''; - buildInput = [ gettext python3 ]; nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = with python3.pkgs; [ mutagen wxPython_4_1 pillow six ]; diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix index c33e0d6a576c..743c92407e79 100644 --- a/pkgs/applications/misc/minigalaxy/default.nix +++ b/pkgs/applications/misc/minigalaxy/default.nix @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { gtk3 ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ glibcLocales pytest tox diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index 13158d7f7257..d9b886cbe2b3 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { pname = "splitter"; - version = "652"; + version = "653"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/splitter/trunk"; rev = version; - sha256 = "sha256-yCdVOT8if3AImD4Q63gKfMep7WZsrCgV+IXfP4ZL3Qw="; + sha256 = "sha256-iw414ecnOfeG3FdlIaoVOPv9BXZ95uUHuPzCQGH4G+A="; }; patches = [ diff --git a/pkgs/applications/misc/mnamer/default.nix b/pkgs/applications/misc/mnamer/default.nix index cad389bf0b9e..e928e631c07c 100644 --- a/pkgs/applications/misc/mnamer/default.nix +++ b/pkgs/applications/misc/mnamer/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { ./update_hack.patch ]; - checkInputs = [ python3Packages.pytestCheckHook ]; + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; # disable test that fail (networking, etc) disabledTests = [ diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 1b9300ac3ddb..3081bea8633c 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "mob"; - version = "4.0.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "remotemobprogramming"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c6Feex0FGxxOWBEHxe0GqPHv65EwMMdxIeehZUGbl0Q="; + sha256 = "sha256-P3OxqJNhzO/aPC4Nj3vvBy5cxaahQv0IsjlIKya0p1w="; }; vendorSha256 = null; diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index f714b026a835..1525fb86f828 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.55.0"; + version = "1.00.1"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "sha256-up78503+YqUB2fR9B6W6plYksTJzTj5pkmFJ5eL/mLY="; + sha256 = "sha256-oENMr3d2vFisEFl7gYBQQ0XRBeogAYOfBE5th463laI="; }; outputs = [ "out" "udev" ]; diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 51e1a15b47ba..51cd4df77bfa 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "moonlight-embedded"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "sha256-YZEPm+k0YzJB8OQAiFUOPc0QR2C0AkSgpNYdoh8jX8E="; + sha256 = "sha256-TUS0eTlQA7O59EvJHrQkqDQexv84ucza6kE4t98AGPs="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/mozphab/default.nix b/pkgs/applications/misc/mozphab/default.nix index d78d880c2e1d..82cf9b3d9515 100644 --- a/pkgs/applications/misc/mozphab/default.nix +++ b/pkgs/applications/misc/mozphab/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ git mercurial patch diff --git a/pkgs/applications/misc/mps-youtube/default.nix b/pkgs/applications/misc/mps-youtube/default.nix deleted file mode 100644 index b1118cfc5977..000000000000 --- a/pkgs/applications/misc/mps-youtube/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, python3Packages, fetchFromGitHub }: - -with python3Packages; - -buildPythonApplication rec { - pname = "mps-youtube"; - version = "unstable-2020-01-28"; - - src = fetchFromGitHub { - owner = "mps-youtube"; - repo = "mps-youtube"; - rev = "b808697133ec2ad7654953232d1e841b20aa7cc3"; - sha256 = "0lqprlpc0v092xqkjc0cc395ag45lijwgd34dpg2jy6i0f2szywv"; - }; - - propagatedBuildInputs = [ pafy ]; - - # disabled due to error in loading unittest - # don't know how to make test from: - doCheck = false; - - # before check create a directory and redirect XDG_CONFIG_HOME to it - preCheck = '' - mkdir -p check-phase - export XDG_CONFIG_HOME=$(pwd)/check-phase - ''; - - meta = with lib; { - description = "Terminal based YouTube player and downloader"; - homepage = "https://github.com/mps-youtube/mps-youtube"; - license = licenses.gpl3; - maintainers = with maintainers; [ koral odi ]; - }; -} diff --git a/pkgs/applications/misc/mu-repo/default.nix b/pkgs/applications/misc/mu-repo/default.nix index 9da761c5884f..ff07856e0e8d 100644 --- a/pkgs/applications/misc/mu-repo/default.nix +++ b/pkgs/applications/misc/mu-repo/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ git ]; - checkInputs = [ pytestCheckHook git ]; + nativeCheckInputs = [ pytestCheckHook git ]; passthru.tests.version = testers.testVersion { package = mu-repo; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index ab91e1d70899..812bc9a5d76d 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -47,12 +47,12 @@ let in stdenv.mkDerivation rec { - version = "1.20.3"; + version = "1.21.1"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "sha256-a2AHD27sIOjYfStc0iz0kCAxGjzxXuEJmOPl9fmEses="; + sha256 = "sha256-sk3b4SUGzILeCNXNSUYUugg0b4F12x2YvPk4/5SSWlQ="; }; patches = [ ./0001-Use-command-v-in-favor-of-which.patch diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index bc6a4817087c..935a9582fcac 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -140,8 +140,13 @@ in stdenv.mkDerivation rec { patchShebangs tools/get_wb_version.sh ''; - # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + NIX_CFLAGS_COMPILE = toString ([ + # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated + "-Wno-error=deprecated-declarations" + ] ++ lib.optionals stdenv.isAarch64 [ + # error: narrowing conversion of '-1' from 'int' to 'char' + "-Wno-error=narrowing" + ]); cmakeFlags = [ "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index 0ae63d210e76..102991f00256 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Small weblog engine written in Bash for the command line"; - homepage = "http://nanoblogger.sourceforge.net/"; + homepage = "https://nanoblogger.sourceforge.net/"; license = lib.licenses.gpl2; mainProgram = "nb"; platforms = lib.platforms.unix; diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index 6527a4f57411..4ae3cdeebd06 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake4Hook ]; meta = { - homepage = "http://navipowm.sourceforge.net/"; + homepage = "https://navipowm.sourceforge.net/"; description = "Car navigation system"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/applications/misc/neo4j-desktop/default.nix b/pkgs/applications/misc/neo4j-desktop/default.nix index dbc57794eeec..2f0286a5c233 100644 --- a/pkgs/applications/misc/neo4j-desktop/default.nix +++ b/pkgs/applications/misc/neo4j-desktop/default.nix @@ -1,12 +1,12 @@ { appimageTools, lib, fetchurl }: let pname = "neo4j-desktop"; - version = "1.4.12"; + version = "1.5.6"; name = "${pname}-${version}"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${name}-x86_64.AppImage"; - hash = "sha256-CfdXus9Zj6Tx6wAXpV2tRdqvJqowgE+NIL04v3fwtJE="; + hash = "sha256-0/jS1LaaIam6w7RbLXSKXiXlpocZMTMuTZvFRU4qypg="; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 24877241f91e..798c15fffde9 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -41,9 +41,7 @@ stdenv.mkDerivation rec { libgee ]; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://github.com/lainsce/notejot"; diff --git a/pkgs/applications/misc/nwg-bar/default.nix b/pkgs/applications/misc/nwg-bar/default.nix index 28e736b008fb..e124671e848d 100644 --- a/pkgs/applications/misc/nwg-bar/default.nix +++ b/pkgs/applications/misc/nwg-bar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nwg-bar"; - version = "unstable-2021-09-23"; + version = "0.1.0"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; - rev = "7dd7df3cd9a9e78fe477e88e0f3cb97309d50ff5"; - sha256 = "sha256-piysF19WDjb/EGI9MBepYrOrQL9C1fsoq05AP8CYN58="; + rev = "v${version}"; + sha256 = "sha256-3uDEmIrfvUD/QGwgFYYWQUeYq35XJdpSVL9nHBl11kY="; }; patches = [ ./fix-paths.patch ]; diff --git a/pkgs/applications/misc/nwg-dock/default.nix b/pkgs/applications/misc/nwg-dock/default.nix new file mode 100644 index 000000000000..ff12f5d159ce --- /dev/null +++ b/pkgs/applications/misc/nwg-dock/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, pkg-config +, gtk3 +, gtk-layer-shell +}: + +buildGoModule rec { + pname = "nwg-dock"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-RCVG38Y8VV7qGz/CaOZ4aw4Sg3PQdrB29zZqATjvYDQ="; + }; + + vendorSha256 = "sha256-WDygnKdldZda4GadfStHWsDel1KLdzjVjw0RxmnFPRE="; + + ldflags = [ "-s" "-w" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk3 gtk-layer-shell ]; + + meta = with lib; { + description = "GTK3-based dock for sway"; + homepage = "https://github.com/nwg-piotr/nwg-dock"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix index ff0127c106e7..23edd6e2742f 100644 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "nwg-drawer"; - version = "0.3.0"; + version = "0.3.8"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o69ZCtIT0jh4QnlspiAh58aA61aFkkKu0FdmscHLMIk="; + sha256 = "sha256-34C0JmsPuDqR3QGmGf14naGOu9xPtPbpdWUvkbilkqs="; }; - vendorSha256 = "sha256-Twipdrt3XZVrzJvElEGbKaJRMnop8fIFMFnriPTSS14="; + vendorHash = "sha256-RehZ86XuFs1kbm9V3cgPz1SPG3izK7/6fHQjPTHOYZs="; buildInputs = [ cairo gobject-introspection gtk3 gtk-layer-shell ]; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix index 24deebce1781..34600bb351ec 100644 --- a/pkgs/applications/misc/nwg-launchers/default.nix +++ b/pkgs/applications/misc/nwg-launchers/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "nwg-launchers"; - version = "0.6.3"; + version = "0.7.1.1"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QWDYy0TBxoYxfRAOtAEVM8wsPUi2SnzMXsu38guAURU="; + sha256 = "sha256-+waoJHU/QrVH7o9qfwdvFTFJzTGLcV9CeYPn3XHEAkM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 85ef0c436691..f7b902cf54cb 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -2,7 +2,7 @@ , fetchurl , lib , makeWrapper -, electron_18 +, electron , makeDesktopItem , graphicsmagick , writeScript @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.0.3"; + version = "1.1.9"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "sha256-DYF9fEpZaP4tD/eeZAegDahR7UZyroqNB9bn2U7sgXs=" else "sha256-MpQk5g4184ZkCAjLU5Ug0ReWgVADskS1QuMcnPdNofs="; + sha256 = if stdenv.isDarwin then "sha256-x+9WG938YQFP/HF7B9xENOXFSdOrPFOJ1ufxXj3kXps=" else "sha256-dFR7LaDRJwpxrNyPNseGi66gIAHOKf5Au2VXl7SBGSE="; }; icon = fetchurl { @@ -50,8 +50,9 @@ let installPhase = '' runHook preInstall mkdir -p $out/bin - makeWrapper ${electron_18}/bin/electron $out/bin/obsidian \ - --add-flags $out/share/obsidian/app.asar + makeWrapper ${electron}/bin/electron $out/bin/obsidian \ + --add-flags $out/share/obsidian/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" 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/"* \ diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index e20bb4ba4241..4ca54221c2fc 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -5,6 +5,7 @@ , python3 , substituteAll , nix-update-script +, nixosTests # To include additional plugins, pass them here as an overlay. , packageOverrides ? self: super: { } }: @@ -14,6 +15,32 @@ let self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ( [ + ( + # with version 3 of flask-limiter octoprint 1.8.6 fails to start with + # TypeError: Limiter.__init__() got multiple values for argument 'key_func' + self: super: { + flask-limiter = super.flask-limiter.overridePythonAttrs (oldAttrs: rec { + version = "2.6.2"; + src = fetchFromGitHub { + owner = "alisaifee"; + repo = "flask-limiter"; + rev = version; + sha256 = "sha256-eWOdJ7m3cY08ASN/X+7ILJK99iLJJwCY8294fwJiDew="; + }; + }); + flask-babel = super.flask-babel.overridePythonAttrs (oldAttrs: rec { + version = "2.0.0"; + src = super.fetchPypi { + pname = "Flask-Babel"; + inherit version; + sha256 = "sha256-+fr0XNsuGjLqLsFEA1h9QpUQjzUBenghorGsuM/ZJX0="; + }; + nativeBuildInputs = [ ]; + format = "setuptools"; + outputs = [ "out" ]; + }); + } + ) # Built-in dependency ( self: super: { @@ -66,6 +93,10 @@ let # requires octoprint itself during tests doCheck = false; + postPatch = '' + substituteInPlace octoprint_pi_support/__init__.py \ + --replace /usr/bin/vcgencmd ${self.pkgs.libraspberrypi}/bin/vcgencmd + ''; }; } ) @@ -83,7 +114,7 @@ let hash = "sha256-DCUesPy4/g7DYN/9CDRvwAWHcv4dFsF+gsysg5UWThQ="; }; - propagatedBuildInputs = with super; [ + propagatedBuildInputs = with self; [ argon2-cffi blinker cachelib @@ -136,7 +167,7 @@ let py.pkgs.appdirs ]; - checkInputs = with super; [ + nativeCheckInputs = with self; [ ddt mock pytestCheckHook @@ -146,7 +177,7 @@ let # substitute pip and let it find out, that it can't write anywhere (substituteAll { src = ./pip-path.patch; - pip = "${super.pip}/bin/pip"; + pip = "${self.pip}/bin/pip"; }) # hardcore path to ffmpeg and hide related settings @@ -172,6 +203,7 @@ let "Flask-Login" "werkzeug" "flask" + "Flask-Limiter" ]; in '' @@ -200,7 +232,10 @@ let passthru = { python = self.python; - updateScript = nix-update-script { attrPath = "octoprint"; }; + updateScript = nix-update-script { }; + tests = { + inherit (nixosTests) octoprint; + }; }; meta = with lib; { diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 62d14957a423..14055463fa3f 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -4,6 +4,7 @@ , bison , flex , pkg-config +, libftdi1 , libuuid , cppunit , protobuf @@ -26,7 +27,17 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook bison flex pkg-config perl ]; - buildInputs = [ libuuid cppunit protobuf zlib avahi libmicrohttpd python3 ]; + buildInputs = [ + # required for ola-ftdidmx plugin (support for 'dumb' FTDI devices) + libftdi1 + libuuid + cppunit + protobuf + zlib + avahi + libmicrohttpd + python3 + ]; propagatedBuildInputs = [ python3.pkgs.protobuf python3.pkgs.numpy diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index fba1c0b0f5f8..472af0caf484 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -93,7 +93,7 @@ python3.pkgs.buildPythonApplication rec { dconf ]; - checkInputs = [ + nativeCheckInputs = [ # for Onboard.SpellChecker.aspell_cmd doctests (aspellWithDicts (dicts: with dicts; [ en ])) diff --git a/pkgs/applications/misc/openbangla-keyboard/default.nix b/pkgs/applications/misc/openbangla-keyboard/default.nix index 28b730e0b2d8..9434018ff50c 100644 --- a/pkgs/applications/misc/openbangla-keyboard/default.nix +++ b/pkgs/applications/misc/openbangla-keyboard/default.nix @@ -68,5 +68,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ hqurve ]; platforms = platforms.linux; + # never built on aarch64-linux since first introduction in nixpkgs + broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 590ca3304516..357f4fcd87e5 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -1,5 +1,7 @@ { stdenv , lib +, AppKit +, DarwinTools , alsa-utils , at-spi2-core , cmake @@ -59,12 +61,7 @@ stdenv.mkDerivation rec { ]; postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace cmake/TargetSetup.cmake \ - --replace '"sw_vers" "-productVersion"' '"echo" "1"' sed -i '/fixup_bundle/d' CMakeLists.txt - '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' - substituteInPlace CMakeLists.txt \ - --replace 'DARWIN_VERSION LESS 16' 'TRUE' ''; nativeBuildInputs = [ @@ -73,6 +70,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ lsb-release ] ++ lib.optionals stdenv.isDarwin [ + DarwinTools makeWrapper ]; @@ -81,6 +79,10 @@ stdenv.mkDerivation rec { curl dbus flac + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # gtk3 propagates AppKit from the 10.12 SDK + AppKit + ] ++ [ gtk3 jasper libGLU diff --git a/pkgs/applications/misc/openlp/lib.nix b/pkgs/applications/misc/openlp/lib.nix index 9e8440a4c806..4a61ab65376d 100644 --- a/pkgs/applications/misc/openlp/lib.nix +++ b/pkgs/applications/misc/openlp/lib.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { # # See also https://discourse.nixos.org/t/qt-plugin-path-unset-in-test-phase/ - #checkInputs = [ mock nose ]; + #nativeCheckInputs = [ mock nose ]; nativeBuildInputs = [ qt5.qttools ]; propagatedBuildInputs = [ alembic diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index 6de5736e9ac8..ea81b58a2098 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -1,35 +1,23 @@ -{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils, mbedtls }: +{ lib, stdenv, fetchFromGitLab, qmake, wrapQtAppsHook, libusb1, hidapi, pkg-config, coreutils, mbedtls_2, qtbase, qttools }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "openrgb"; - version = "0.7"; + version = "0.8"; src = fetchFromGitLab { owner = "CalcProgrammer1"; repo = "OpenRGB"; rev = "release_${version}"; - sha256 = "0xhfaz0b74nfnh7il2cz5c0338xlzay00g6hc2h3lsncarj8d5n7"; + sha256 = "sha256-46dL1D5oVlw6mNuFDCbbrUDmq42yFXV/qFJ1JnPT5/s="; }; - nativeBuildInputs = [ qmake pkg-config ]; - buildInputs = [ libusb1 hidapi mbedtls ]; + nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; + buildInputs = [ libusb1 hidapi mbedtls_2 qtbase qttools ]; - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp openrgb $out/bin - - substituteInPlace 60-openrgb.rules \ + postPatch = '' + patchShebangs scripts/build-udev-rules.sh + substituteInPlace scripts/build-udev-rules.sh \ --replace /bin/chmod "${coreutils}/bin/chmod" - - 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 ''; doInstallCheck = true; diff --git a/pkgs/applications/misc/opentrack/aruco.nix b/pkgs/applications/misc/opentrack/aruco.nix index 9a315a132073..2c28d0e8d397 100644 --- a/pkgs/applications/misc/opentrack/aruco.nix +++ b/pkgs/applications/misc/opentrack/aruco.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ opencv4 ]; - NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -march=native -O3"; + NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3"; preInstall = '' mkdir -p $out/include/aruco diff --git a/pkgs/applications/misc/opentrack/default.nix b/pkgs/applications/misc/opentrack/default.nix index 34c6b3f712b5..7be07093cd1d 100644 --- a/pkgs/applications/misc/opentrack/default.nix +++ b/pkgs/applications/misc/opentrack/default.nix @@ -42,7 +42,7 @@ in nativeBuildInputs = [cmake pkg-config ninja copyDesktopItems]; buildInputs = [qtbase qttools opencv4 procps eigen libXdmcp libevdev aruco]; - NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -march=native -O3"; + NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3"; dontWrapQtApps = true; cmakeFlags = [ diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 29cdac6b8d16..d88c4f549d31 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "43.0"; + version = "43.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "HKdaAMSoUSoJ5KJuszn615RNHtQayjL3D2lickQhglA="; + sha256 = "9ljgSc4WknO4Q0aBBCTW9QkpHwXX7MOnegPZEqo+aEA="; }; patches = [ diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 639f1d4773c1..bbd8aaaa848b 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "organicmaps"; - version = "2022.11.02-2"; + version = "2023.01.25-3"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - sha256 = "sha256-E/lJDw1QMPT0QcaTOxEyJL4hmEFkq21vQkgZbssszJg="; + sha256 = "sha256-4nlD/GFOoBOCXVWtC7i6SUquEbob5++GyagZOTznygU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix index a1f119f6834c..a7366d6136ff 100644 --- a/pkgs/applications/misc/orpie/default.nix +++ b/pkgs/applications/misc/orpie/default.nix @@ -4,7 +4,7 @@ ocamlPackages.buildDunePackage rec { pname = "orpie"; version = "1.6.1"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "pelzlpj"; @@ -19,7 +19,8 @@ ocamlPackages.buildDunePackage rec { substituteInPlace src/orpie/install.ml.in --replace '@prefix@' $out ''; - buildInputs = with ocamlPackages; [ curses camlp5 num gsl ]; + nativeBuildInputs = [ ocamlPackages.camlp5 ]; + buildInputs = with ocamlPackages; [ curses num gsl ]; meta = { inherit (src.meta) homepage; diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index f9f880050ed6..ef31ed2f033b 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libroxml, proj_7, libyamlcpp, boost } : +{ lib, stdenv, fetchFromGitHub, libroxml, proj_7, yaml-cpp_0_3, boost } : stdenv.mkDerivation rec { pname = "osm2xmap"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; - buildInputs = [ libroxml proj_7 libyamlcpp boost ]; + buildInputs = [ libroxml proj_7 yaml-cpp_0_3 boost ]; meta = with lib; { homepage = "https://github.com/sembruk/osm2xmap"; diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index a2f2a676aba1..00d157eb25fb 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.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "sha256-xedunFzar44o+b/45isXWacDcC81wWkxgGwnpLPH/n0="; + sha256 = "sha256-xV/1LFby0L/o648XEQQ9gS9/eHssWhMIG7R1E8bfIDU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix index c06713c98a66..ec1ea90cd47c 100644 --- a/pkgs/applications/misc/overmind/default.nix +++ b/pkgs/applications/misc/overmind/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "overmind"; - version = "2.3.0"; + version = "2.4.0"; nativeBuildInputs = [ makeWrapper ]; @@ -14,10 +14,10 @@ buildGoModule rec { owner = "DarthSim"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vmmSsg0JneMseFCcx/no2x/Ghppmyiod8ZAIb4JWW9I="; + sha256 = "sha256-cpsTytV1TbvdR7XUKkp4GPD1qyt1qnmY6qOsge01swE="; }; - vendorSha256 = "sha256-QIKyLknPvmt8yiUCSCIqha8h9ozDGeQnKSM9Vwus0uY="; + vendorHash = "sha256-ndgnFBGtVFc++h+EnA37aY9+zNsO5GDrTECA4TEWPN4="; meta = with lib; { homepage = "https://github.com/DarthSim/overmind"; diff --git a/pkgs/applications/misc/oversteer/default.nix b/pkgs/applications/misc/oversteer/default.nix new file mode 100644 index 000000000000..87c49c2cf7aa --- /dev/null +++ b/pkgs/applications/misc/oversteer/default.nix @@ -0,0 +1,76 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, gettext, python3, python3Packages +, meson, cmake, ninja, udev, appstream, appstream-glib, desktop-file-utils, gtk3 +, wrapGAppsHook, gobject-introspection, bash, }: +let + python = python3.withPackages (p: + with p; [ + pygobject3 + pyudev + pyxdg + evdev + matplotlib + scipy + gtk3 + pygobject3 + ]); + + version = "0.7.2"; +in stdenv.mkDerivation { + inherit version; + + pname = "oversteer"; + + src = fetchFromGitHub { + owner = "berarma"; + repo = "oversteer"; + rev = version; + sha256 = "sha256-9MWRb0NXUbB8c+pH0mjUzsz849PmEjsZMhQr4wsmlKI="; + }; + + buildInputs = [ bash gtk3 ]; + + nativeBuildInputs = [ + pkg-config + gettext + python + wrapGAppsHook + gobject-introspection + meson + udev + ninja + appstream + appstream-glib + desktop-file-utils + ]; + + dontUseCmakeConfigure = true; + + propagatedBuildInputs = [ python gtk3 python3Packages.pygobject3 ]; + + mesonFlags = [ + "--prefix" + (placeholder "out") + "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d/" + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" + ) + ''; + + postInstall = '' + substituteInPlace $out/lib/udev/rules.d/* \ + --replace /bin/sh ${bash}/bin/sh + ''; + + patches = [ ./fix-install-dir.patch ]; + + meta = with lib; { + homepage = "https://github.com/berarma/oversteer"; + description = "Steering Wheel Manager for Linux"; + license = licenses.gpl3; + maintainers = [ maintainers.srounce ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/oversteer/fix-install-dir.patch b/pkgs/applications/misc/oversteer/fix-install-dir.patch new file mode 100644 index 000000000000..0d5fdec68982 --- /dev/null +++ b/pkgs/applications/misc/oversteer/fix-install-dir.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 239acf9..6a06c83 100644 +--- a/meson.build ++++ b/meson.build +@@ -8,7 +8,7 @@ pymod = import('python') + prefix = get_option('prefix') + pkgdatadir = join_paths(prefix, get_option('datadir'), meson.project_name()) + py_installation = pymod.find_installation(get_option('python')) +-py_path = py_installation.get_path('purelib') ++py_path = py_installation.get_install_dir() + + python3_required_modules = ['gi', 'pyudev', 'xdg', 'evdev', 'gettext', 'matplotlib', 'scipy', 'numpy'] + foreach p : python3_required_modules diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index 50d0e5a012b4..56490754e172 100644 --- a/pkgs/applications/misc/oxker/default.nix +++ b/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.1.7"; + version = "0.2.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-kMomzIViN7ooBsjUfCIk0XRi4WtXtiaHWHT2pECx//k="; + sha256 = "sha256-CsfzQN7n/LsNIivJShDG02cHwPktkXl/0udBSPz0i2U="; }; - cargoSha256 = "sha256-ASBu4p8+/Donmynnyryktc6dXA3yiOb9w5XpmN4PotY="; + cargoHash = "sha256-FSuhG+ZSQzwj1YB3xs3A1uFWPhwK8FIfVfUY9V/J2Z8="; meta = with lib; { description = "A simple tui to view & control docker containers"; diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index 2da0374a67f7..bce7760759df 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -11,22 +11,27 @@ , openssl , pkg-config , zeromq +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Foundation; +in stdenv.mkDerivation rec { pname = "p2pool"; - version = "2.4"; + version = "2.7"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-En2ogxAD61w7DRTsCGIp6fEP/cC2A+pTYIbjeJ1MktY="; + sha256 = "sha256-j3SVwat/LGw/iGcyNn8acR29Ob/WXDKyeCfDTsH+gxA="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libuv zeromq libsodium gss hwloc openssl curl ]; + buildInputs = [ libuv zeromq libsodium gss hwloc openssl curl ] + ++ lib.optionals stdenv.isDarwin [ Foundation ]; installPhase = '' runHook preInstall @@ -37,9 +42,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix index 502ee9f7f016..7aae31152f7f 100644 --- a/pkgs/applications/misc/parsec/bin.nix +++ b/pkgs/applications/misc/parsec/bin.nix @@ -12,11 +12,11 @@ stdenvNoCC.mkDerivation { pname = "parsec-bin"; - version = "150_28"; + version = "150_86e"; src = fetchurl { - url = "https://web.archive.org/web/20220622215230id_/https://builds.parsecgaming.com/package/parsec-linux.deb"; - sha256 = "1hfdzjd8qiksv336m4s4ban004vhv00cv2j461gc6zrp37s0fwhc"; + url = "https://web.archive.org/web/20230124210253/https://builds.parsecgaming.com/package/parsec-linux.deb"; + sha256 = "sha256-wwBy86TdrHaH9ia40yh24yd5G84WTXREihR+9I6o6uU="; }; unpackPhase = '' @@ -67,11 +67,16 @@ stdenvNoCC.mkDerivation { --prefix LD_LIBRARY_PATH : "$runtimeDependenciesPath" \ --run "$prepareParsec" + substituteInPlace $out/share/applications/parsecd.desktop \ + --replace "/usr/bin/parsecd" "parsecd" \ + --replace "/usr/share/icons" "${placeholder "out"}/share/icons" + runHook postInstall ''; meta = with lib; { homepage = "https://parsecgaming.com/"; + changelog = "https://parsec.app/changelog"; description = "Remote streaming service client"; license = licenses.unfree; maintainers = with maintainers; [ arcnmx ]; diff --git a/pkgs/applications/misc/pass-secret-service/default.nix b/pkgs/applications/misc/pass-secret-service/default.nix index d7ac4fa21e75..1ce8511b27c7 100644 --- a/pkgs/applications/misc/pass-secret-service/default.nix +++ b/pkgs/applications/misc/pass-secret-service/default.nix @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { secretstorage ]; - checkInputs = + nativeCheckInputs = let ps = python3.pkgs; in @@ -71,6 +71,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/mdellweg/pass_secret_service/"; license = lib.licenses.gpl3Only; platforms = lib.platforms.all; + mainProgram = "pass_secret_service"; maintainers = with lib.maintainers; [ jluttine aidalgol ]; }; } diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index 4255127b3dfe..0245fadb171a 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, pkgs, python3, wrapGAppsHook}: +{ lib, fetchFromGitHub, pkgs, python3, wrapGAppsHook, gobject-introspection }: python3.pkgs.buildPythonApplication { pname = "pdf-quench"; @@ -11,10 +11,9 @@ python3.pkgs.buildPythonApplication { sha256 = "1rp9rlwr6rarcsxygv5x2c5psgwl6r69k0lsgribgyyla9cf2m7n"; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; buildInputs = with pkgs; [ gtk3 - gobject-introspection goocanvas2 poppler_gi ]; diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index 21075dcf5c56..b0268f9c18c2 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-VMFkZsFx2pN0IrWTdc9OqkdQwuk6b4Ay4zsvN9HTHug="; + sha256 = "sha256-nZSP9JBbUPG9xk/ATXUYkjyP344m+e7RQS3BiFVzQf4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 9bf5907a23be..5678cef8e1bd 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee -, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, librsvg, pcre, gobject-introspection, wrapGAppsHook -, webkitgtk, discount, json-glib }: +, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, gobject-introspection, wrapGAppsHook +, qrencode, webkitgtk, discount, json-glib }: stdenv.mkDerivation rec { pname = "pdfpc"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "0bmy51w6ypz927hxwp5g7wapqvzqmsi3w32rch6i3f94kg1152ck"; + hash = "sha256-5HFmbVsNajMwo+lBe9kJcJyQGe61N6Oy2CI/WJwmSE4="; }; nativeBuildInputs = [ @@ -22,11 +22,12 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libgee poppler - libpthreadstubs librsvg pcre + libpthreadstubs gstreamer gst-plugins-base (gst-plugins-good.override { gtkSupport = true; }) gst-libav + qrencode webkitgtk discount json-glib diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index b1985eed076a..f1ce2219ba89 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -56,10 +56,10 @@ in pdfstudio2022 = callPackage ./common.nix rec { inherit desktopName longDescription pname program year; - version = "${year}.1.1"; + version = "${year}.1.3"; src = fetchurl { url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; - sha256 = "sha256-OPmNhnkeSvHZZbh4SaMU/vDSLrDdTmMmuSGP2HyzVm4="; + sha256 = "sha256-B3RrftuKsPWUWP9hwnq4i311hgZgwZLqG1pJLdilfQI="; }; extraBuildInputs = [ libgccjit #for libstdc++.so.6 and libgomp.so.1 diff --git a/pkgs/applications/misc/pe-bear/default.nix b/pkgs/applications/misc/pe-bear/default.nix new file mode 100644 index 000000000000..5dd8fac6de8b --- /dev/null +++ b/pkgs/applications/misc/pe-bear/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qtbase +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "pe-bear"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "hasherezade"; + repo = "pe-bear"; + rev = "v${version}"; + sha256 = "jzgsjqic5rBsyuwJW9T44rKM8rKDce564VAogDvsLho="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + ]; + + meta = with lib; { + description = "Portable Executable reversing tool with a friendly GUI"; + homepage = "https://hshrzd.wordpress.com/pe-bear/"; + + license = [ + # PE-Bear + licenses.gpl2Only + + # Vendored capstone + licenses.bsd3 + + # Vendored bearparser + licenses.bsd2 + ]; + + maintainers = with maintainers; [ blitz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 3416bb348567..96cc51fceb78 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -1,28 +1,30 @@ { lib +, stdenv , fetchFromGitHub +, wrapQtAppsHook , pkg-config , qmake -, mkDerivation +, qtwayland , qtsvg , postgresql }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.0.0-beta"; + version = "1.0.0"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-1+1hKOY8unu6Z7LLv/WQ86JlwWUubQuhPP9OUjyXOrM="; + sha256 = "sha256-Lim9iQYdmulwZEIayoBGoAmQ7rysTEEof5iXy3kfKXs="; }; - nativeBuildInputs = [ pkg-config qmake ]; + nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ]; # todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here. - buildInputs = [ postgresql qtsvg ]; + buildInputs = [ postgresql qtsvg qtwayland ]; meta = with lib; { description = "A database modeling tool for PostgreSQL"; diff --git a/pkgs/applications/misc/phockup/default.nix b/pkgs/applications/misc/phockup/default.nix index f93c2b78c4a1..7db0690da891 100644 --- a/pkgs/applications/misc/phockup/default.nix +++ b/pkgs/applications/misc/phockup/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "phockup"; - version = "1.7.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "ivandokov"; repo = "phockup"; rev = version; - sha256 = "sha256-Ho9aZjBvSwFMur2NubhP4olPN31SNTEdQGCUV7nX0uE="; + sha256 = "sha256-ge34Iv/+B0xdrSNc7w3nZJw0DHBUvuh2k/I8v/RRg10="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index eadd7672bec5..3f4e82d2e4d9 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -25,7 +25,7 @@ # sed on many of the platforms Plover builds for postPatch = "sed -i /PyQt5/d setup.cfg"; - checkInputs = [ pytest mock ]; + nativeCheckInputs = [ pytest mock ]; propagatedBuildInputs = [ babel pyqt5 xlib pyserial appdirs wcwidth setuptools ]; dontWrapQtApps = true; diff --git a/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix b/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix new file mode 100644 index 000000000000..62c6ed0f4a42 --- /dev/null +++ b/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, coreutils +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "pokemon-colorscripts-mac"; + version = "stable-2021-08-10"; + + src = fetchFromGitHub { + owner = "nuke-dash"; + repo = "${pname}"; + rev = "6aa0cd93b255bee35c5716652b8b7dfecb5fcfa2"; + sha256 = "06b86qy2fpzdd81n2mscc2njkrxx0dyzxpgnm1xk6ldn17c853lc"; + }; + + buildInputs = [ coreutils ]; + + preBuild = '' + patchShebangs ./install.sh + + # Fix hardcoded prefixed coreutils + substituteInPlace pokemon-colorscripts.sh --replace greadlink readlink + substituteInPlace pokemon-colorscripts.sh --replace gshuf shuf + + substituteInPlace install.sh --replace /usr/local $out + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/opt + mkdir -p $out/bin + ./install.sh + + runHook postInstall + ''; + + meta = with lib; { + description = "Pokémon colorscripts for the terminal, compatible for mac"; + longDescription = '' + Show colored sprites of pokémons in your terminal. + Contains almost 900 pokemon from gen 1 to gen 8. + Inspired by DT's colorscripts. + ''; + homepage = "https://github.com/nuke-dash/pokemon-colorscripts-mac"; + license = licenses.mit; + maintainers = [ maintainers.wesleyjrz ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index b670f85f7a60..9ecced78440b 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -28,7 +28,6 @@ , wirelesstools , libnl , i3 -, i3-gaps , jsoncpp # override the variables ending in 'Support' to enable or disable modules @@ -39,7 +38,6 @@ , iwSupport ? false , nlSupport ? true , i3Support ? false -, i3GapsSupport ? false }: stdenv.mkDerivation rec { @@ -59,7 +57,7 @@ stdenv.mkDerivation rec { pkg-config python3Packages.sphinx removeReferencesTo - ] ++ lib.optional (i3Support || i3GapsSupport) makeWrapper; + ] ++ lib.optional i3Support makeWrapper; buildInputs = [ cairo @@ -82,9 +80,7 @@ stdenv.mkDerivation rec { ++ lib.optional pulseSupport libpulseaudio ++ lib.optional iwSupport wirelesstools ++ lib.optional nlSupport libnl - ++ lib.optional (i3Support || i3GapsSupport) jsoncpp - ++ lib.optional i3Support i3 - ++ lib.optional i3GapsSupport i3-gaps; + ++ lib.optionals i3Support [ jsoncpp i3 ]; patches = [ ./remove-hardcoded-etc.diff ]; @@ -95,16 +91,10 @@ stdenv.mkDerivation rec { ''; postInstall = - if i3Support then '' + lib.optionalString i3Support '' wrapProgram $out/bin/polybar \ --prefix PATH : "${i3}/bin" - '' - else if i3GapsSupport - then '' - wrapProgram $out/bin/polybar \ - --prefix PATH : "${i3-gaps}/bin" - '' - else ""; + ''; postFixup = '' remove-references-to -t ${stdenv.cc} $out/bin/polybar diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index fc6b6a1e2d4a..f940f5a4af80 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -10,37 +10,38 @@ , sassc , python3Packages , gobject-introspection -, gtk3 , wrapGAppsHook +, libappindicator-gtk3 +, libxcb +, qt5 +, ibus +, usbutils }: python3Packages.buildPythonApplication rec { name = "polychromatic"; - version = "0.7.3"; + version = "0.8.0"; format = "other"; src = fetchFromGitHub { owner = "polychromatic"; repo = "polychromatic"; rev = "v${version}"; - sha256 = "sha256-H++kQ3Fxw56avEsSE1ctu5p0s50s0eQ+jL5zXS3AA94="; + sha256 = "sha256-ym2pcGUWM5zCUx/lYs+WECj+wbyBtWnx04W/NRXNKlw="; }; postPatch = '' patchShebangs scripts - substituteInPlace scripts/build-styles.sh \ --replace '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \ --replace '$(which sass 2>/dev/null)' '${sassc}/bin/sass' - - substituteInPlace pylib/common.py \ + substituteInPlace polychromatic/paths.py \ --replace "/usr/share/polychromatic" "$out/share/polychromatic" ''; preConfigure = '' scripts/build-styles.sh ''; - nativeBuildInputs = with python3Packages; [ gettext gobject-introspection @@ -48,18 +49,22 @@ python3Packages.buildPythonApplication rec { ninja sassc wrapGAppsHook + qt5.wrapQtAppsHook ]; propagatedBuildInputs = with python3Packages; [ colorama colour - gtk3 openrazer - pygobject3 pyqt5 pyqtwebengine requests setproctitle + libxcb + openrazer-daemon + libappindicator-gtk3 + ibus + usbutils ]; dontWrapGapps = true; @@ -67,6 +72,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" + "\${qtWrapperArgs[@]}" ]; meta = with lib; { diff --git a/pkgs/applications/misc/pomodoro/default.nix b/pkgs/applications/misc/pomodoro/default.nix new file mode 100644 index 000000000000..d180c8e436e7 --- /dev/null +++ b/pkgs/applications/misc/pomodoro/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, Foundation }: + +rustPlatform.buildRustPackage rec { + pname = "pomodoro"; + version = "unstable-2021-06-18"; + + src = fetchFromGitHub { + owner = "SanderJSA"; + repo = "Pomodoro"; + rev = "c833b9551ed0b09e311cdb369cc8226c5b9cac6a"; + sha256 = "sha256-ZA1q1YVJcdSUF9NTikyT3vrRnqbsu5plzRI2gMu+qnQ="; + }; + + cargoSha256 = "sha256-6ZhWStZebXSwrej36DXifrsrmR1SWW3PwGUX0hqPwE4="; + buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; + + meta = with lib; { + description = "A simple CLI pomodoro timer using desktop notifications written in Rust"; + homepage = "https://github.com/SanderJSA/Pomodoro"; + license = licenses.mit; + maintainers = with maintainers; [ annaaurora ]; + # error: redefinition of module 'ObjectiveC' + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/misc/pop-launcher/default.nix b/pkgs/applications/misc/pop-launcher/default.nix new file mode 100644 index 000000000000..ca4a1742e1e1 --- /dev/null +++ b/pkgs/applications/misc/pop-launcher/default.nix @@ -0,0 +1,60 @@ +{ rustPlatform +, fetchFromGitHub +, lib +, fd +, libqalculate +}: + +rustPlatform.buildRustPackage rec { + pname = "pop-launcher"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "launcher"; + rev = version; + sha256 = "sha256-BQAO9IodZxGgV8iBmUaOF0yDbAMVDFslKCqlh3pBnb0="; + }; + + postPatch = '' + substituteInPlace src/lib.rs \ + --replace '/usr/lib/pop-launcher' "$out/share/pop-launcher" + substituteInPlace plugins/src/scripts/mod.rs \ + --replace '/usr/lib/pop-launcher' "$out/share/pop-launcher" + substituteInPlace plugins/src/calc/mod.rs \ + --replace 'Command::new("qalc")' 'Command::new("${libqalculate}/bin/qalc")' + substituteInPlace plugins/src/find/mod.rs \ + --replace 'spawn("fd")' 'spawn("${fd}/bin/fd")' + substituteInPlace plugins/src/terminal/mod.rs \ + --replace '/usr/bin/gnome-terminal' 'gnome-terminal' + ''; + + cargoSha256 = "sha256-cTvrq0fH057UIx/O9u8zHMsg+psMGg1q9klV5OMxtok="; + + cargoBuildFlags = [ "--package" "pop-launcher-bin" ]; + + postInstall = '' + mv $out/bin/pop-launcher{-bin,} + + plugins_dir=$out/share/pop-launcher/plugins + scripts_dir=$out/share/pop-launcher/scripts + mkdir -p $plugins_dir $scripts_dir + + for plugin in $(find plugins/src -mindepth 1 -maxdepth 1 -type d -printf '%f\n'); do + mkdir $plugins_dir/$plugin + cp plugins/src/$plugin/*.ron $plugins_dir/$plugin + ln -sf $out/bin/pop-launcher $plugins_dir/$plugin/$(echo $plugin | sed 's/_/-/') + done + + for script in scripts/*; do + cp -r $script $scripts_dir + done + ''; + + meta = with lib; { + description = "Modular IPC-based desktop launcher service"; + homepage = "https://github.com/pop-os/launcher"; + license = licenses.mpl20; + maintainers = with maintainers; [ samhug ]; + }; +} diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index 8ec18a874863..b45854a6d180 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -32,7 +32,7 @@ let inherit version; sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; }; - checkInputs = old.checkInputs ++ (with self; [ + nativeCheckInputs = old.nativeCheckInputs ++ (with self; [ requests ]); doCheck = false; @@ -81,7 +81,7 @@ let # however `click-7` is needed by the older flask we need here. Since it's just # for the test-suite apparently, let's skip it for now. Mako = super.Mako.overridePythonAttrs (lib.const { - checkInputs = []; + nativeCheckInputs = []; doCheck = false; }); }; @@ -119,7 +119,7 @@ python3'.pkgs.buildPythonPackage rec { passthru.tests = { inherit (nixosTests) privacyidea; }; - checkInputs = with python3'.pkgs; [ openssl mock pytestCheckHook responses testfixtures ]; + nativeCheckInputs = with python3'.pkgs; [ openssl mock pytestCheckHook responses testfixtures ]; preCheck = "export HOME=$(mktemp -d)"; postCheck = "unset HOME"; disabledTests = [ diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index c52adbc4f0be..f71841c1af9a 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -4,22 +4,46 @@ , installShellFiles }: +let config-module = "github.com/f1bonacc1/process-compose/src/config"; +in buildGoModule rec { pname = "process-compose"; - version = "0.24.1"; + version = "0.40.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - sha256 = "TKLLq6I+Mcvdz51m8nydTWcslBcQlJCJFoJ10SgfVWU="; + hash = "sha256-8gyALVW+ort76r/zevWAhZlJ/fg5DBmwUNvjZ21wWKY="; + # populate values that require us to use git. By doing this in postFetch we + # can delete .git afterwards and maintain better reproducibility of the src. + leaveDotGit = true; + postFetch = '' + cd "$out" + git rev-parse --short HEAD > $out/COMMIT + # in format of 0000-00-00T00:00:00Z + date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; }; - ldflags = [ "-X main.version=v${version}" ]; + # ldflags based on metadata from git and source + preBuild = '' + ldflags+=" -X ${config-module}.Commit=$(cat COMMIT)" + ldflags+=" -X ${config-module}.Date=$(cat SOURCE_DATE_EPOCH)" + ''; - nativeBuildInputs = [ installShellFiles ]; + ldflags = [ + "-X ${config-module}.Version=v${version}" + "-s" + "-w" + ]; - vendorSha256 = "IsO1B6z1/HoGQ8xdNKQqZ/eZd90WikDbU9XiP0z28mU="; + nativeBuildInputs = [ + installShellFiles + ]; + + vendorHash = "sha256-rbGKFZY9YEcBAFFxG6v3xaVLQxVoqIehN0LgINku3Xo="; doCheck = false; @@ -35,8 +59,8 @@ buildGoModule rec { meta = with lib; { description = "A simple and flexible scheduler and orchestrator to manage non-containerized applications"; homepage = "https://github.com/F1bonacc1/process-compose"; + changelog = "https://github.com/F1bonacc1/process-compose/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ thenonameguy ]; - mainProgram = "process-compose"; }; } diff --git a/pkgs/applications/misc/process-viewer/default.nix b/pkgs/applications/misc/process-viewer/default.nix index 442f9d0e9b50..528fe1aec0c8 100644 --- a/pkgs/applications/misc/process-viewer/default.nix +++ b/pkgs/applications/misc/process-viewer/default.nix @@ -4,28 +4,24 @@ , pkg-config , gtk4 , stdenv -, DiskArbitration -, Foundation -, IOKit +, darwin }: rustPlatform.buildRustPackage rec { pname = "process-viewer"; - version = "0.5.5"; + version = "0.5.6"; src = fetchCrate { inherit pname version; - sha256 = "sha256-MHVKjbD1/h7G94x6dpyRT/BPWQVUFurW7EvAUJ2xZeU="; + sha256 = "sha256-ELASfcXNhUCE/mhPKBHA78liFMbcT9RB/aoLt4ZRPa0="; }; - cargoSha256 = "sha256-NkJjwB4rBV4hFRwYHILMET8o4x1+95sVsFqNaVN8tMg="; + cargoSha256 = "sha256-K2kyZwKRALh9ImPngijgpoHyLS+c5sDYviN74JxhJLM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk4 ] ++ lib.optionals stdenv.isDarwin [ - DiskArbitration - Foundation - IOKit + darwin.apple_sdk_11_0.frameworks.Foundation ]; postInstall = '' diff --git a/pkgs/applications/misc/procmail/CVE-2014-3618.patch b/pkgs/applications/misc/procmail/CVE-2014-3618.patch deleted file mode 100644 index e3aa5600e40e..000000000000 --- a/pkgs/applications/misc/procmail/CVE-2014-3618.patch +++ /dev/null @@ -1,18 +0,0 @@ -From http://seclists.org/oss-sec/2014/q3/495 (with whitespace corrected). - ---- a/src/formisc.c 2013-08-04 00:13:33.000000000 -0700 -+++ b/src/formisc.c 2014-09-03 11:42:25.986002396 -0700 -@@ -84,12 +84,11 @@ - case '"':*target++=delim='"';start++; - } - ;{ int i; -- do -+ while(*start) - if((i= *target++= *start++)==delim) /* corresponding delimiter? */ - break; - else if(i=='\\'&&*start) /* skip quoted character */ - *target++= *start++; -- while(*start); /* anything? */ - } - hitspc=2; - } diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index dafc73925b54..ea299d73cbb0 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -2,22 +2,13 @@ stdenv.mkDerivation rec { pname = "procmail"; - version = "3.22"; + version = "3.24"; src = fetchurl { - url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-${version}.tar.gz"; - sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08"; + url = "https://github.com/BuGlessRB/procmail/archive/refs/tags/v${version}.tar.gz"; + sha256 = "UU6kMzOXg+ld+TIeeUdx5Ih7mCOsVf2yRpcCz2m9OYk="; }; - patches = [ - ./CVE-2014-3618.patch - (fetchurl { - url = "https://sources.debian.org/data/main/p/procmail/3.22-26/debian/patches/30"; - sha256 = "11zmz1bj0v9pay3ldmyyg7473b80h89gycrhndsgg9q50yhcqaaq"; - name = "CVE-2017-16844"; - }) - ]; - # getline is defined differently in glibc now. So rename it. # Without the .PHONY target "make install" won't install anything on Darwin. postPatch = '' @@ -33,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mail processing and filtering utility"; - homepage = "http://www.procmail.org/"; + homepage = "https://github.com/BuGlessRB/procmail/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 75c1ed16e1d1..c0a1e7e0217d 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -26,15 +26,14 @@ , openvdb , pcre , qhull -, systemd , tbb , wxGTK31 , xorg , fetchpatch -, wxGTK31-override ? null +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: let - wxGTK31-prusa = wxGTK31.overrideAttrs (old: rec { + wxGTK-prusa = wxGTK31.overrideAttrs (old: rec { pname = "wxwidgets-prusa3d-patched"; version = "3.1.4"; src = fetchFromGitHub { @@ -45,7 +44,6 @@ let fetchSubmodules = true; }; }); - wxGTK31-override' = if wxGTK31-override == null then wxGTK31-prusa else wxGTK31-override; in stdenv.mkDerivation rec { pname = "prusa-slicer"; @@ -78,11 +76,12 @@ stdenv.mkDerivation rec { opencascade-occt openvdb pcre - systemd tbb - wxGTK31-override' + wxGTK-prusa xorg.libX11 - ] ++ checkInputs; + ] ++ lib.optionals withSystemd [ + systemd + ] ++ nativeCheckInputs; patches = [ # Fix detection of TBB, see https://github.com/prusa3d/PrusaSlicer/issues/6355 @@ -103,7 +102,7 @@ stdenv.mkDerivation rec { ]; doCheck = true; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; separateDebugInfo = true; @@ -119,7 +118,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes"; # prusa-slicer uses dlopen on `libudev.so` at runtime - NIX_LDFLAGS = "-ludev"; + NIX_LDFLAGS = lib.optionalString withSystemd "-ludev"; prePatch = '' # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx @@ -139,6 +138,13 @@ stdenv.mkDerivation rec { substituteInPlace src/libslic3r/Format/STEP.cpp \ --replace 'libpath /= "OCCTWrapper.so";' 'libpath = "OCCTWrapper.so";' fi + + # Fix resources folder location on macOS + substituteInPlace src/PrusaSlicer.cpp \ + --replace "#ifdef __APPLE__" "#if 0" + '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + # Disable segfault tests + sed -i '/libslic3r/d' tests/CMakeLists.txt ''; src = fetchFromGitHub { @@ -149,6 +155,7 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ + "-DSLIC3R_STATIC=0" "-DSLIC3R_FHS=1" "-DSLIC3R_GTK=3" ]; @@ -157,7 +164,7 @@ stdenv.mkDerivation rec { ln -s "$out/bin/prusa-slicer" "$out/bin/prusa-gcodeviewer" mkdir -p "$out/lib" - mv -v $out/bin/*.so $out/lib/ + mv -v $out/bin/*.* $out/lib/ mkdir -p "$out/share/pixmaps/" ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer.png" "$out/share/pixmaps/PrusaSlicer.png" @@ -175,5 +182,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/prusa3d/PrusaSlicer"; license = licenses.agpl3; maintainers = with maintainers; [ moredread tweber ]; + } // lib.optionalAttrs (stdenv.isDarwin) { + mainProgram = "PrusaSlicer"; }; } diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index a3c8fc6cdcc6..147f3484f18f 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, prusa-slicer, wxGTK31 }: +{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, prusa-slicer }: let appname = "SuperSlicer"; pname = "super-slicer"; @@ -22,7 +22,13 @@ let # Fix compile error with boost 1.79. See https://github.com/supermerill/SuperSlicer/issues/2823 (fetchpatch { url = "https://raw.githubusercontent.com/gentoo/gentoo/81e3ca3b7c131e8345aede89e3bbcd700e1ad567/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch"; - sha256 = "sha256-xMbUjumPZ/7ulyRuBA76CwIv4BOpd+yKXCINSf58FxI="; + # Excludes Linux-only patches + excludes = [ + "src/slic3r/GUI/FreeCADDialog.cpp" + "src/slic3r/GUI/Tab.cpp" + "src/slic3r/Utils/Http.cpp" + ]; + sha256 = "sha256-v0q2MhySayij7+qBTE5q01IOq/DyUcWnjpbzB/AV34c="; }) ]; }; @@ -39,6 +45,12 @@ let fetchSubmodules = true; }; + # wxScintilla is not used on macOS + prePatch = super.prePatch + '' + substituteInPlace src/CMakeLists.txt \ + --replace "scintilla" "" + ''; + # We don't need PS overrides anymore, and gcode-viewer is embedded in the binary. postInstall = null; separateDebugInfo = true; @@ -71,7 +83,6 @@ let passthru = allVersions; }; - prusa-slicer' = prusa-slicer.override { wxGTK31-override = wxGTK31; }; - allVersions = builtins.mapAttrs (_name: version: (prusa-slicer'.overrideAttrs (override version))) versions; + allVersions = builtins.mapAttrs (_name: version: (prusa-slicer.overrideAttrs (override version))) versions; in allVersions.stable diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix index 793e5291d5b5..0220778277c1 100644 --- a/pkgs/applications/misc/pure-maps/default.nix +++ b/pkgs/applications/misc/pure-maps/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "pure-maps"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "rinigus"; repo = "pure-maps"; rev = version; - hash = "sha256-ZPW2hNnaRfv5aTXqku7hPShN0leOuVEJ3T/OOTzwgXQ="; + hash = "sha256-07Jk5ufYbBAa/UY1B0IoyuOAVt15rGCxCRXu3OeYyWU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/pw-viz/default.nix b/pkgs/applications/misc/pw-viz/default.nix new file mode 100644 index 000000000000..f32f60bac1ac --- /dev/null +++ b/pkgs/applications/misc/pw-viz/default.nix @@ -0,0 +1,61 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, expat +, fontconfig +, freetype +, libGL +, libxkbcommon +, pipewire +, wayland +, xorg +}: + +rustPlatform.buildRustPackage rec { + pname = "pw-viz"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "ax9d"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-lw4whdh8tNoS5XUlamQCq8f8z8K59uD90PSSo3skeyo="; + }; + + cargoSha256 = "sha256-XmvM5tr6ToYi0UrFnLju1wmp/0VEEP/O7T9Bx0YyFW4="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + expat + fontconfig + freetype + libGL + libxkbcommon + pipewire + rustPlatform.bindgenHook + wayland + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + ]; + + postFixup = '' + patchelf $out/bin/pw-viz \ + --add-rpath ${lib.makeLibraryPath [ libGL libxkbcommon wayland ]} + ''; + + # enables pipewire API deprecated in 0.3.64 + # fixes error caused by https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55 + NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ]; + + meta = with lib; { + description = "A simple and elegant pipewire graph editor "; + homepage = "https://github.com/ax9d/pw-viz"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index d5c1115acbf7..25b69cf15619 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -1,34 +1,76 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, pkg-config, zip, gettext, perl -, wxGTK30, libXext, libXi, libXt, libXtst, xercesc -, qrencode, libuuid, libyubikey, yubikey-personalization -, curl, openssl, file, gitUpdater +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, zip +, gettext +, perl +, wxGTK32 +, libXext +, libXi +, libXt +, libXtst +, xercesc +, qrencode +, libuuid +, libyubikey +, yubikey-personalization +, curl +, openssl +, file +, darwin +, gitUpdater }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation rec { pname = "pwsafe"; - version = "1.15.0"; # do NOT update to 3.x Windows releases + version = "1.16.0"; # do NOT update to 3.x Windows releases src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-EyyQHp2MlGgUnikClgvP7I313Bh6H3yVPXel8Z/U6gQ="; + hash = "sha256-5/TOg+hiy22vlPJHheE638abhS3B5Jrul0Umgwu+gi0="; }; + strictDeps = true; + nativeBuildInputs = [ - cmake gettext perl pkg-config zip + cmake + gettext + perl + pkg-config + zip ]; + buildInputs = [ - libXext libXi libXt libXtst wxGTK30 - curl qrencode libuuid openssl xercesc - libyubikey yubikey-personalization + wxGTK32 + curl + qrencode + openssl + xercesc file + ] ++ lib.optionals stdenv.isLinux [ + libXext + libXi + libXt + libXtst + libuuid + libyubikey + yubikey-personalization + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa ]; cmakeFlags = [ "-DNO_GTEST=ON" "-DCMAKE_CXX_FLAGS=-I${yubikey-personalization}/include/ykpers-1" + ] ++ lib.optionals stdenv.isDarwin [ + "-DNO_YUBI=ON" ]; postPatch = '' @@ -48,6 +90,8 @@ stdenv.mkDerivation rec { for f in $(grep -Rl /usr/bin/ .) ; do substituteInPlace $f --replace /usr/bin/ "" done + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace src/ui/cli/CMakeLists.txt --replace "uuid" "" ''; installFlags = [ "PREFIX=${placeholder "out"}" ]; @@ -68,7 +112,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://pwsafe.org/"; maintainers = with maintainers; [ c0bw3b pjones ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.artistic2; }; } diff --git a/pkgs/applications/misc/pyditz/cerberus.nix b/pkgs/applications/misc/pyditz/cerberus.nix index 0e473c6a1ba1..4da032bafeee 100644 --- a/pkgs/applications/misc/pyditz/cerberus.nix +++ b/pkgs/applications/misc/pyditz/cerberus.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1pxzr8sfm2hc5s96m9k044i44nwkva70n0ypr6a35v73zn891cx5"; }; - checkInputs = [ pytest-runner pytest ]; + nativeCheckInputs = [ pytest-runner pytest ]; meta = with lib; { homepage = "http://python-cerberus.org/"; diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix index d986c13b84b3..fe3bf0c52115 100644 --- a/pkgs/applications/misc/pyditz/default.nix +++ b/pkgs/applications/misc/pyditz/default.nix @@ -15,7 +15,7 @@ in buildPythonApplication rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ pyyaml six jinja2 cerberus_1_1 ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { homepage = "https://pythonhosted.org/pyditz/"; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 675df5d5ba3e..f51f53e9b72d 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -63,7 +63,7 @@ in python.pkgs.buildPythonApplication rec { "--prefix" "PATH" ":" (lib.makeBinPath [ perl gpsbabel ]) ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales perl xvfb-run diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 0fc2697848d0..dcf941cf03aa 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.27.6.11"; + version = "3.27.8.7"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-FfbHedJgzZdUpamLL2Wz2P8glaC/IVYCGZQk9EEc83k="; + sha256 = "sha256-GWDDZzFDOR96ZpmNDUuE+S9zTMVSYFNJKp8z/Cx3hec="; }; patches = [ diff --git a/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch b/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch deleted file mode 100644 index 1fbf5ec3f101..000000000000 --- a/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix compatibility with Qt 5.15. - -Patch copied from upstream source repository: - -https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104 - ---- a/sources/model.h 2017-04-19 21:01:25 +0000 -+++ b/sources/model.h 2020-06-09 06:24:11 +0000 -@@ -24,6 +24,7 @@ - #define DOCUMENTMODEL_H - - #include -+#include - #include - #include - #include - diff --git a/pkgs/applications/misc/raider/default.nix b/pkgs/applications/misc/raider/default.nix new file mode 100644 index 000000000000..cf368fbe79dc --- /dev/null +++ b/pkgs/applications/misc/raider/default.nix @@ -0,0 +1,58 @@ +{ appstream-glib +, blueprint-compiler +, desktop-file-utils +, fetchFromGitHub +, gettext +, glib +, gtk4 +, itstool +, lib +, libadwaita +, meson +, mesonEmulatorHook +, ninja +, pkg-config +, stdenv +, wrapGAppsHook4 +}: +stdenv.mkDerivation rec { + pname = "raider"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "ADBeveridge"; + repo = "raider"; + rev = "v${version}"; + hash = "sha256-fyE0CsQp2UVh+7bAQo+GHEF0k8Gwl9j4qclh04AQiVI="; + }; + + nativeBuildInputs = [ + appstream-glib + blueprint-compiler + desktop-file-utils + itstool + meson + ninja + pkg-config + wrapGAppsHook4 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; + + buildInputs = [ + gtk4 + libadwaita + ]; + + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + meta = with lib; { + description = "Securely delete your files"; + homepage = "https://apps.gnome.org/app/com.github.ADBeveridge.Raider"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ benediktbroich ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 6dbe3d840415..10bb6a782707 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -123,13 +123,13 @@ rec { gammastep = mkRedshift rec { pname = "gammastep"; - version = "2.0.8"; + version = "2.0.9"; src = fetchFromGitLab { owner = "chinstrap"; repo = pname; rev = "v${version}"; - sha256 = "071f3iqdbblb3awnx48j19kspk6l2g3658za80i2mf4gacgq9fm1"; + sha256 = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU="; }; meta = redshift.meta // { diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix index d6ec124f7451..64baaf5d1b08 100644 --- a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix +++ b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "remarkable-mouse"; - version = "7.0.3"; + version = "7.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-e6xJBZmWXAPOHNNUMOGLjbe3QmvW0SRwfMNJVZsM3gw="; + sha256 = "sha256-82P9tE3jiUlKBGZCiWDoL+9VJ06Bc+If+aMfcEEU90U="; }; propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index aa2b1af194d3..2da548619b14 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rmapi"; - version = "0.0.22.1"; + version = "0.0.25"; src = fetchFromGitHub { owner = "juruen"; repo = "rmapi"; rev = "v${version}"; - sha256 = "sha256-tYGlI7p5KAskN+Y6vvBEm4+s9rKtL4TN43N/btN27UI="; + sha256 = "sha256-7pwCd9tey7w5B8UgsMLHegPqmmY1prLM+Sk9o42X9lY="; }; - vendorSha256 = "sha256-LmKcHV0aq7NDEwaL+u8zXkbKzzdWD8zmnAGw5xShDYo="; + vendorSha256 = "sha256-Id2RaiSxthyR6egDQz2zulbSZ4STRTaA3yQIr6Mx9kg="; doCheck = false; diff --git a/pkgs/applications/misc/remarkable/rmview/default.nix b/pkgs/applications/misc/remarkable/rmview/default.nix index b0a09f4e0ebd..e3fd00d8cdc4 100644 --- a/pkgs/applications/misc/remarkable/rmview/default.nix +++ b/pkgs/applications/misc/remarkable/rmview/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "rmview"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "bordaigorl"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-lUzmOayMHftvCukXSxXr6tBzrr2vaua1ey9gsuCKOBc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-oCF37WQqNIXut2k+xr528twGxwPoH/sQ2leThagQJAU="; }; nativeBuildInputs = with python3Packages; [ pyqt5 wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix index d19d27153fa0..9616790ba7cf 100644 --- a/pkgs/applications/misc/remnote/default.nix +++ b/pkgs/applications/misc/remnote/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "remnote"; - version = "1.7.6"; + version = "1.8.52"; src = fetchurl { url = "https://download.remnote.io/RemNote-${version}.AppImage"; - sha256 = "sha256-yRUpLev/Fr3mOamkFgevArv2UoXgV4e6zlyv7FaQ4RM="; + sha256 = "sha256-0t4i/4dlZ1tv4kz8eD5cjIuhx0lT8dQbh+bpjqAfqTE="; }; meta = with lib; { diff --git a/pkgs/applications/misc/river-tag-overlay/default.nix b/pkgs/applications/misc/river-tag-overlay/default.nix new file mode 100644 index 000000000000..4aa2a3c59a97 --- /dev/null +++ b/pkgs/applications/misc/river-tag-overlay/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromSourcehut, nixos, wayland, pixman, pkg-config }: + +stdenv.mkDerivation rec { + pname = "river-tag-overlay"; + version = "1.0.0"; + + src = fetchFromSourcehut { + owner = "~leon_plickat"; + repo = pname; + rev = "v${version}"; + hash = "sha256-hLyXdLi/ldvwPJ1oQQsH5wgflQJuXu6vhYw/qdKAV9E="; + }; + + buildInputs = [ pixman wayland ]; + nativeBuildInputs = [ pkg-config ]; + + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "PREFIX=" + ]; + + meta = with lib; { + description = "A pop-up showing tag status"; + homepage = "https://sr.ht/~leon_plickat/river-tag-overlay"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ edrex ]; + platforms = platforms.linux; + broken = stdenv.isAarch64; + }; +} diff --git a/pkgs/applications/misc/rlaunch/default.nix b/pkgs/applications/misc/rlaunch/default.nix index 5622c94d427f..9b00abd14cd9 100644 --- a/pkgs/applications/misc/rlaunch/default.nix +++ b/pkgs/applications/misc/rlaunch/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , rustPlatform , xorg }: @@ -17,6 +18,15 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "00lnw48kn97gp45lylv5c6v6pil74flzpsq9k69xgvvjq9yqjzrx"; + patches = [ + # Fixes "error[E0308]: mismatched types; expected `u8`, found `i8`" on aarch64 + # Remove with next version update + (fetchpatch { + url = "https://github.com/PonasKovas/rlaunch/commit/f78f36876bba45fe4e7310f58086ddc63f27a57e.patch"; + hash = "sha256-rTS1khw1zt3i1AJ11BhAILcmaohAwVc7Qfl6Fc76Kvs="; + }) + ]; + # The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath. postFixup = '' patchelf --set-rpath ${lib.makeLibraryPath (with xorg; [ libX11 libXft libXinerama ])} $out/bin/rlaunch @@ -26,6 +36,7 @@ rustPlatform.buildRustPackage rec { description = "A lightweight application launcher for X11"; homepage = "https://github.com/PonasKovas/rlaunch"; license = licenses.mit; + platforms = platforms.linux; maintainers = with maintainers; [ danc86 ]; }; } diff --git a/pkgs/applications/misc/rm-improved/default.nix b/pkgs/applications/misc/rm-improved/default.nix index c35fa3dc887b..be5fb6344494 100644 --- a/pkgs/applications/misc/rm-improved/default.nix +++ b/pkgs/applications/misc/rm-improved/default.nix @@ -1,7 +1,5 @@ { fetchFromGitHub, rustPlatform, lib }: -with lib; - rustPlatform.buildRustPackage rec { pname = "rm-improved"; version = "0.13.0"; @@ -15,7 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0d065xia4mwdhxkiqfg7pic6scfzipzmsvvx7l6l97w62lzpiqx3"; }; - meta = { + meta = with lib; { description = "Replacement for rm with focus on safety, ergonomics and performance"; homepage = "https://github.com/nivekuil/rip"; maintainers = with maintainers; [ nils-degroot ]; diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix index 371da82e2b07..f620bb7bd832 100644 --- a/pkgs/applications/misc/rofimoji/default.nix +++ b/pkgs/applications/misc/rofimoji/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , lib , python3 +, installShellFiles , waylandSupport ? true , x11Support ? true @@ -16,18 +17,19 @@ buildPythonApplication rec { pname = "rofimoji"; - version = "5.6.0"; + version = "6.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "fdw"; repo = "rofimoji"; rev = "refs/tags/${version}"; - sha256 = "sha256-6W/59DjxrgejHSkNxpruDAws812Vjyf+GePDPbXzVbc="; + sha256 = "sha256-eyzdTMLW9nk0x74T/AhvoVSrxXugc1HgNJy8EB5BApE="; }; nativeBuildInputs = [ - python3.pkgs.setuptools + python3.pkgs.poetry-core + installShellFiles ]; # `rofi` and the `waylandSupport` and `x11Support` dependencies @@ -42,8 +44,9 @@ buildPythonApplication rec { rm -rf extractors ''; - # no tests executed - doCheck = false; + postInstall = '' + installManPage src/picker/docs/rofimoji.1 + ''; meta = with lib; { description = "A simple emoji and character picker for rofi"; diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 51ae6888b2a9..9506825a2ffa 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -15,11 +15,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "safeeyes"; - version = "2.1.3"; + version = "2.1.5"; src = fetchPypi { inherit pname version; - sha256 = "1b5w887hivmdrkm1ydbar4nmnks6grpbbpvxgf9j9s46msj03c9x"; + sha256 = "sha256-IjFDhkqtMitdcQORerRqwty3ZMP8jamPtb9oMHdre4I="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index e299ec2ac86b..69a71c6563cb 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "sc-im"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "andmarti1424"; repo = "sc-im"; rev = "v${version}"; - sha256 = "sha256-H+GQUpouiXc/w6GWdkSVvTXZ/Dtb7sUmBLGcpxG3Mts="; + sha256 = "sha256-QlnxMe0WsRX9J2xzpf2Udcf9+N3MvQWqmYl2YKsGpYM="; }; sourceRoot = "${src.name}/src"; @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + changelog = "https://github.com/andmarti1424/sc-im/blob/${src.rev}/CHANGES"; homepage = "https://github.com/andmarti1424/sc-im"; description = "An ncurses spreadsheet program for terminal"; license = licenses.bsdOriginal; diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index abd47c149ebb..d300691934b2 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "scli"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "isamert"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-YEgeeoUqDeBx3jPddTeykl+68lS8gVKD+zdo+gRTaT4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-7yyORM77oByH1gxx/TNkjJQBsig6ZxsfeI3ijg71oBs="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/seashells/default.nix b/pkgs/applications/misc/seashells/default.nix new file mode 100644 index 000000000000..bc4d3cfdbfc3 --- /dev/null +++ b/pkgs/applications/misc/seashells/default.nix @@ -0,0 +1,26 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "seashells"; + version = "0.1.2"; + format = "setuptools"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-RBs28FC7f82DrxRcmvTP9nljVpm7tjrGuvr05l32hDM="; + }; + + doCheck = false; # there are no tests + pythonImportsCheck = [ "seashells" ]; + + meta = with lib; { + homepage = "https://seashells.io/"; + description = "Pipe command-line programs to seashells.io"; + longDescription = '' + Official cient for seashells.io, which allows you to view + command-line output on the web, in real-time. + ''; + license = licenses.mit; + maintainers = with maintainers; [ deejayem ]; + }; +} diff --git a/pkgs/applications/misc/seatd/default.nix b/pkgs/applications/misc/seatd/default.nix index 22a1b9e74b78..f9a7cc928e10 100644 --- a/pkgs/applications/misc/seatd/default.nix +++ b/pkgs/applications/misc/seatd/default.nix @@ -5,7 +5,7 @@ , pkg-config , scdoc , stdenv -, systemdSupport ? stdenv.isLinux, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { changelog = "https://git.sr.ht/~kennylevinsen/seatd/refs/${version}"; homepage = "https://sr.ht/~kennylevinsen/seatd/"; license = licenses.mit; - platforms = platforms.linux; + platforms = with platforms; freebsd ++ linux ++ netbsd; maintainers = with maintainers; [ emantor ]; }; } diff --git a/pkgs/applications/misc/senv/default.nix b/pkgs/applications/misc/senv/default.nix index 86c896b12776..c2ab9ad29d87 100644 --- a/pkgs/applications/misc/senv/default.nix +++ b/pkgs/applications/misc/senv/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "senv"; @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://github.com/SpectralOps/senv"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; + broken = stdenv.isDarwin; # needs golang.org/x/sys bump }; } diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index fce268883861..49fa61270b4d 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -30,9 +30,7 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index fb0a19dbb44a..5bf957ec7c1b 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { setuptools # needs pkg_resources ]; - checkInputs = [ + nativeCheckInputs = [ ffmpeg ] ++ (with python3.pkgs; [ pytestCheckHook diff --git a/pkgs/applications/misc/sigi/default.nix b/pkgs/applications/misc/sigi/default.nix index 132b8f0ab9e4..3eb965e36f11 100644 --- a/pkgs/applications/misc/sigi/default.nix +++ b/pkgs/applications/misc/sigi/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "sigi"; - version = "3.5.0"; + version = "3.6.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-VUf5fCVOZCn0iY51eBS/fIvlxQF+BY+k75I+NY7yqzM="; + sha256 = "sha256-VhBrSepJdwJRu+AqXWUzdDO4ukJPeoZr07B/X8Jr/RA="; }; - cargoSha256 = "sha256-ivSVcpUDGK0dJDy+jY7BYQIFCXu/npV0MiNe3nlsUho="; + cargoSha256 = "sha256-R1U0ZYQMA1VFd5zEjFzl5QhwqqEMaCFb/5H509IBj60="; nativeBuildInputs = [ installShellFiles ]; # In case anything goes wrong. diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index 2dc82b55df7c..df2c7b77aee8 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sioyek"; - version = "unstable-2022-08-30"; + version = "2.0.0"; src = fetchFromGitHub { owner = "ahrm"; repo = "sioyek"; - rev = "8d0a63484334e2cb2b0571a07a3875e6ab6c8916"; - sha256 = "sha256-29Wxg/VVQPDDzzxKcvMa1+rtiP4bDkPAB/JJsj+F+WQ="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-GFZaTXJhoBB+rSe7Qk6H6FZJVXr3nO9XgM+LAbS4te4="; }; buildInputs = [ @@ -62,8 +62,9 @@ stdenv.mkDerivation (finalAttrs: { cp pdf_viewer/keys_user.config sioyek.app/Contents/MacOS/ cp tutorial.pdf sioyek.app/Contents/MacOS/ - mkdir -p $out/Applications + mkdir -p $out/Applications $out/bin cp -r sioyek.app $out/Applications + ln -s $out/Applications/sioyek.app/Contents/MacOS/sioyek $out/bin/sioyek '' else '' install -Dm644 tutorial.pdf $out/share/tutorial.pdf cp -r pdf_viewer/shaders $out/share/ @@ -74,10 +75,9 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://sioyek.info/"; description = "A PDF viewer designed for research papers and technical books"; - changelog = "https://github.com/ahrm/sioyek/releases/tag/v1.5.0"; + changelog = "https://github.com/ahrm/sioyek/releases/tag/v${finalAttrs.version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ podocarp ]; platforms = platforms.unix; - broken = stdenv.isDarwin && stdenv.isAarch64; }; }) diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/applications/misc/slides/default.nix index cedd87017313..c6c73115eb69 100644 --- a/pkgs/applications/misc/slides/default.nix +++ b/pkgs/applications/misc/slides/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "sha256-K8VsqaNUPxh3/Yddy6DFiOyjRuZ6r6bU456Pm31A1og="; }; - checkInputs = [ + nativeCheckInputs = [ bash go ]; diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index 5badb7f1b35a..9c96cb2444b1 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchgit, pkg-config, writeText, libX11, conf ? null, patches ? [] }: -with lib; - stdenv.mkDerivation rec { pname = "slstatus"; version = "unstable-2019-02-16"; @@ -12,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0kayyhpmppybhwndxgabw48wsk9v8x9xdb05xrly9szkw3jbvgw4"; }; - configFile = optionalString (conf!=null) (writeText "config.def.h" conf); - preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); + preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h"; inherit patches; @@ -24,7 +22,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with lib; { homepage = "https://tools.suckless.org/slstatus/"; description = "status monitor for window managers that use WM_NAME like dwm"; license = licenses.isc; diff --git a/pkgs/applications/misc/slweb/default.nix b/pkgs/applications/misc/slweb/default.nix new file mode 100644 index 000000000000..baa1a88e2d15 --- /dev/null +++ b/pkgs/applications/misc/slweb/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchFromSourcehut +, redo-apenwarr +}: + +stdenv.mkDerivation rec { + pname = "slweb"; + version = "0.5"; + + src = fetchFromSourcehut { + owner = "~strahinja"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-GoDumiysqIkWj2HTPQv2gheYsf4fWjtCNPFS/1R0tzc="; + }; + + nativeBuildInputs = [ redo-apenwarr ]; + + installPhase = '' + runHook preInstall + PREFIX=$out redo install + runHook postInstall + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "A static website generator which aims at being simplistic"; + homepage = "https://strahinja.srht.site/slweb/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 6a40f13034e7..de787ca669d0 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -14,13 +14,13 @@ # instead of adding this to `services.udev.packages` on NixOS, python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.1.5"; + version = "1.1.8"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = "refs/tags/${version}"; - hash = "sha256-wqSDSLzm2RYV7XZPX0GQDR+TUgj4hLJ9FpVP3DYN7To="; + hash = "sha256-2LD1vMmQvibcnAgBwjfSBJysTnUGptGzPHfi/7tZ0hg="; }; outputs = [ "out" "udev" ]; diff --git a/pkgs/applications/misc/spacenav-cube-example/default.nix b/pkgs/applications/misc/spacenav-cube-example/default.nix index 697d13c8c0e2..990aedbc71ec 100644 --- a/pkgs/applications/misc/spacenav-cube-example/default.nix +++ b/pkgs/applications/misc/spacenav-cube-example/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://spacenav.sourceforge.net/"; + homepage = "https://spacenav.sourceforge.net/"; description = "An example application to test the spacenavd driver"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 587b61d3af93..acd1337a6693 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.14.1"; + version = "2.16.1"; src = fetchFromGitHub { owner = "spicetify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-262tnSKX6M9ggm4JIs0pANeq2JSNYzKkTN8awpqLyMM="; + sha256 = "sha256-Pq8HjmWSfBgieSJejrlw+FiRdq9NxryYPcw++Pdjsuk="; }; vendorSha256 = "sha256-E2Q+mXojMb8E0zSnaCOl9xp5QLeYcuTXjhcp3Hc8gH4="; diff --git a/pkgs/applications/misc/spnavcfg/default.nix b/pkgs/applications/misc/spnavcfg/default.nix index fcd4630e8039..6424204c460a 100644 --- a/pkgs/applications/misc/spnavcfg/default.nix +++ b/pkgs/applications/misc/spnavcfg/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with lib; { - homepage = "http://spacenav.sourceforge.net/"; + homepage = "https://spacenav.sourceforge.net/"; description = "Interactive configuration GUI for space navigator input devices"; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index cab49db654e2..6b90e9689d44 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -12,14 +12,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sticky"; - version = "1.12"; + version = "1.14"; format = "other"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-kAO8Qz4bTn3+YeIXAvPZ1SpKgn+g+rBgi9+TaqL1vOY="; + hash = "sha256-7UZbCbzQ1ZrSzxTUdbA+wsH3p27qj/c/cM4GY/kzG6E="; }; postPatch = '' diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix index 1d6373592fbf..c840bbfe5b84 100644 --- a/pkgs/applications/misc/stog/default.nix +++ b/pkgs/applications/misc/stog/default.nix @@ -20,7 +20,8 @@ buildDunePackage rec { sha256 = "sha256:0krj5w4y05bcfx7hk9blmap8avl31gp7yi01lpqzs6ync23mvm0x"; }; - buildInputs = [ fmt lwt_ppx menhir ocf_ppx ppx_blob xtmpl_ppx ]; + nativeBuildInputs = [ menhir ]; + buildInputs = [ fmt lwt_ppx ocf_ppx ppx_blob xtmpl_ppx ]; propagatedBuildInputs = [ dune-build-info dune-site diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index 196e35042284..6b23e2d492c5 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -4,7 +4,7 @@ , openssl , pkg-config , stdenv -, darwin +, Security }: rustPlatform.buildRustPackage rec { @@ -23,15 +23,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ++ lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "Impossibly fast web search, made for static sites"; homepage = "https://github.com/jameslittle230/stork"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ chuahou ]; - # TODO: Remove once nixpkgs uses macOS SDK 10.14+ for x86_64-darwin - # Undefined symbols for architecture x86_64: "_SecTrustEvaluateWithError" - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/misc/streamdeck-ui/default.nix b/pkgs/applications/misc/streamdeck-ui/default.nix index be98b3713867..21ac1939f4e9 100644 --- a/pkgs/applications/misc/streamdeck-ui/default.nix +++ b/pkgs/applications/misc/streamdeck-ui/default.nix @@ -1,7 +1,7 @@ { lib , python3Packages , fetchFromGitHub -, poetry +, fetchpatch , copyDesktopItems , wrapQtAppsHook , writeText @@ -20,6 +20,19 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-5dk+5oefg5R68kv038gsZ2p5ixmpj/vBLBp/V7Sdos8="; }; + patches = [ + (fetchpatch { + name = "use-poetry-core.patch"; + url = "https://github.com/timothycrosley/streamdeck-ui/commit/e271656c1f47b1619d1b942e2ebb01ab2d6a68a9.patch"; + hash = "sha256-wqYwX6eSqMnW6OG7wSprD62Dz818ayFduVrqW9E/ays="; + }) + (fetchpatch { + name = "update-python-xlib-0.33.patch"; + url = "https://github.com/timothycrosley/streamdeck-ui/commit/07d7fdd33085b413dd26b02d8a02820edad2d568.patch"; + hash = "sha256-PylTrbfB8RJ0+kbgJlRdcvfdahGoob8LabwhuFNsUpY="; + }) + ]; + desktopItems = [ (makeDesktopItem { name = "streamdeck-ui"; desktopName = "Stream Deck UI"; @@ -50,7 +63,7 @@ python3Packages.buildPythonApplication rec { format = "pyproject"; nativeBuildInputs = [ - poetry + python3Packages.poetry-core copyDesktopItems wrapQtAppsHook ]; @@ -66,7 +79,7 @@ python3Packages.buildPythonApplication rec { xlib ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run python3Packages.pytest python3Packages.hypothesis-auto diff --git a/pkgs/applications/misc/stylish/default.nix b/pkgs/applications/misc/stylish/default.nix new file mode 100644 index 000000000000..b1fed22b7ffe --- /dev/null +++ b/pkgs/applications/misc/stylish/default.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + makeWrapper, + curl, + feh, + file, + jq, + util-linux, + wget, +}: +stdenvNoCC.mkDerivation rec { + pname = "stylish"; + version = "unstable-2022-12-05"; + + nativeBuildInputs = [ makeWrapper ]; + + src = fetchFromGitHub { + owner = "thevinter"; + repo = "styli.sh"; + rev = "d595412a949c6cdc7e151ae0cf929aa1958aa7f1"; + hash = "sha256-lFnzrYnTFWe8bvK//aC1+TapWIFNsNP60Msn7D0tk/0="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp "${src}/styli.sh" $out/bin + chmod +x $out/bin/styli.sh + runHook postInstall + ''; + + postInstall = '' + wrapProgram $out/bin/styli.sh --prefix PATH : ${lib.makeBinPath [ + curl + feh + file + jq + util-linux + wget + ]} + ''; + + meta = with lib; { + homepage = "https://github.com/thevinter/styli.sh"; + description = "A shell script to manage wallpapers"; + longDescription = '' + Styli.sh is a Bash script that aims to automate the tedious process + of finding new wallpapers, downloading and switching them via the + configs. + Styli.sh can search for specific wallpapers from unsplash or download + a random image from the specified subreddits. If you have pywal it also + can set automatically your terminal colors. + ''; + license = licenses.mit; + maintainers = with maintainers; [ tchab ]; + }; +} diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 10d4ffc77b4b..55599a87b861 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,17 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake -, curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib -, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, writeShellScriptBin +, cmake +, wrapQtAppsHook +, pkg-config +, qmake +, curl +, grantlee +, libgit2 +, libssh2 +, libxml2 +, libxslt +, libzip +, zlib +, qtbase +, qtconnectivity +, qtlocation +, qtsvg +, qttools +, qtwebengine +, libXcomposite , bluez }: let - version = "5.0.2"; + version = "5.0.10"; subsurfaceSrc = (fetchFromGitHub { owner = "Subsurface"; repo = "subsurface"; rev = "v${version}"; - sha256 = "1yay06m8p9qp2ghrg8dxavdq55y09apcgdnb7rihgs3hq86k539n"; + hash = "sha256-KzUBhFGvocaS1VrVT2stvKrj3uVxYka+dyYZUfkIoNs="; fetchSubmodules = true; }); @@ -21,7 +42,7 @@ let src = subsurfaceSrc; - prePatch = "cd libdivecomputer"; + sourceRoot = "source/libdivecomputer"; nativeBuildInputs = [ autoreconfHook ]; @@ -30,7 +51,7 @@ let enableParallelBuilding = true; meta = with lib; { - homepage = "http://www.libdivecomputer.org"; + homepage = "https://www.libdivecomputer.org"; description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; maintainers = with maintainers; [ mguentner ]; license = licenses.lgpl21; @@ -40,14 +61,13 @@ let googlemaps = stdenv.mkDerivation rec { pname = "googlemaps"; - - version = "2021-03-19"; + version = "0.0.0.2"; src = fetchFromGitHub { owner = "vladest"; repo = "googlemaps"; - rev = "8f7def10c203fd3faa5ef96c5010a7294dca0759"; - sha256 = "1irz398g45hk6xizwzd07qcx1ln8f7l6bhjh15f56yc20waqpx1x"; + rev = "v.${version}"; + hash = "sha256-PfSLFQeCeVNcCVDCZehxyNLQGT6gff5jNxMW8lAaP8c="; }; nativeBuildInputs = [ qmake ]; @@ -74,17 +94,37 @@ let }; }; -in stdenv.mkDerivation { + get-version = writeShellScriptBin "get-version" '' + echo -n ${version} + ''; + +in +stdenv.mkDerivation { pname = "subsurface"; inherit version; src = subsurfaceSrc; + postPatch = '' + install -m555 -t scripts ${lib.getExe get-version} + ''; + buildInputs = [ - libdc googlemaps - curl grantlee libgit2 libssh2 libusb-compat-0_1 libxml2 libxslt libzip - qtbase qtconnectivity qtsvg qttools qtwebkit bluez + curl + googlemaps + grantlee + libdc + libgit2 + libssh2 + libxml2 + libxslt + libzip + qtbase + qtconnectivity + qtsvg + qttools + qtwebengine ]; nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ]; diff --git a/pkgs/applications/misc/surface-control/default.nix b/pkgs/applications/misc/surface-control/default.nix index d8af8fe07c20..e4409d1ac760 100644 --- a/pkgs/applications/misc/surface-control/default.nix +++ b/pkgs/applications/misc/surface-control/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "surface-control"; - version = "0.4.3-1"; + version = "0.4.3-2"; src = fetchFromGitHub { owner = "linux-surface"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bqrp/XS4OJIRW2ChHnf9gMh/TgCPUEb9fP2soeT1Qe4="; + sha256 = "sha256-QgkUxT5Ae0agvalZl1ie+1LwxgaTzMrKpQY3KkpWwG4="; }; - cargoSha256 = "sha256-TWXK36cN8WuqfrMX7ybO2lnNiGnSKmfK6QGWMBM1y0o="; + cargoSha256 = "sha256-LPcN5xWOrl+MYVDKRIAlJoDepSSE9LTEN4fUS7bPS2U="; nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ udev ]; diff --git a/pkgs/applications/misc/swappy/default.nix b/pkgs/applications/misc/swappy/default.nix index d83cf6c8484d..9b3787dec4ae 100644 --- a/pkgs/applications/misc/swappy/default.nix +++ b/pkgs/applications/misc/swappy/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "swappy"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "jtheoof"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sINX7pJ0msis7diGFTCgD4Mamd3yGGJew1uD8de4VOg="; + sha256 = "sha256-/XPvy98Il4i8cDl9vH6f0/AZmiSqseSXnen7HfMqCDo="; }; nativeBuildInputs = [ glib meson ninja pkg-config scdoc wrapGAppsHook ]; diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix index 15d187b1e968..a3d64a25565b 100644 --- a/pkgs/applications/misc/swaynotificationcenter/default.nix +++ b/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: rec { pname = "SwayNotificationCenter"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "ErikReider"; repo = "SwayNotificationCenter"; rev = "v${version}"; - hash = "sha256-Z8CFSaH4RsZ/Qgj+l+36p7smbiGV5RRQhZBBcA3iyK8="; + hash = "sha256-RU6zzhRu7YK+zcazxj2wZ5vSwLwlilBaG9l+rEstefc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 3ea247f4b080..d505761f8076 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -105,19 +105,19 @@ let }; }; - d2u = lib.replaceChars ["."] ["_"]; + d2u = lib.replaceStrings ["."] ["_"]; in { application = mkSweetHome3D rec { pname = lib.toLower module + "-application"; - version = "6.6"; + version = "7.0.2"; module = "SweetHome3D"; description = "Design and visualize your future home"; license = lib.licenses.gpl2Plus; src = fetchurl { url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip"; - sha256 = "sha256-CnVXpmodmyoZdqmt7OgRyzuLeDhkPhrAS/CldFM8SQs="; + sha256 = "sha256-9Jv/U7afG6+LwPB6IhqLePjQA67bPKelP+UcuvizBqo="; }; desktopName = "Sweet Home 3D"; icons = { diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 9ef9fd0f7f44..6c737f469c67 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -81,7 +81,7 @@ let }; - d2u = lib.replaceChars ["."] ["_"]; + d2u = lib.replaceStrings ["."] ["_"]; in { diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index e96cbb418b40..11273fd14d8e 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -22,14 +22,14 @@ }: mkDerivation rec { - version = "1.3.0"; + version = "1.3.1"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "sha256-uhVRO9aiYJbUmwDp1+LIYF3wNBbVduVpTtVzaS0oUMU="; + sha256 = "sha256-0rmfDkPvgubVqfbIOZ+mnv/x1p2sb88zGeg/Q2JCy3I="; }; patches = [ diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 1afb5117a4bf..9738b273de29 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-keyboard-configurator"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "pop-os"; repo = "keyboard-configurator"; rev = "v${version}"; - sha256 = "sha256-N7faWyM2KExnKr6foO6KIxkFD/pGzw9RJDnADwK/fYU="; + sha256 = "sha256-/RIpnbwLoNDdts18qhYqc8lDqsPoA5GW6z7LaZc5dos="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoSha256 = "sha256-h5kqm3ZyqzJhTjBcuOvaHkwPvF1xerN2eEDFwZAah6g="; + cargoSha256 = "sha256-hxHWfxNGmpX4mWj1ozOhhOyZI9J3aQzv3yvWFst81aU="; meta = with lib; { description = "Keyboard configuration application for System76 keyboards and laptops"; diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index 767d0c768ded..a15b0a4ab7cb 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -118,7 +118,7 @@ python.pkgs.pythonPackages.buildPythonPackage rec { runHook postInstall ''; - checkInputs = with python.pkgs; [ + nativeCheckInputs = with python.pkgs; [ pytestCheckHook pytest-django pytest-factoryboy diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index a9a09d3340c4..b3d99cf69977 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -1,23 +1,31 @@ { lib , rustPlatform , fetchFromGitHub +, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.23.6"; + version = "0.23.7"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-QHaFx6NCKZKG9/pM/h9kqoCJwl74zT2rnDGh50x8OwE="; + sha256 = "sha256-D7+C02VlE42wWQSOkeTJVDS4rWnGB06RTZ7tzdpYmZw="; }; + nativeBuildInputs = [ installShellFiles ]; + # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "sha256-ccR5w563NBLDl7O61lkGpmrLgzfO/F3CnOJiLL6tog8="; + cargoSha256 = "sha256-b+bncWx7Z4GG2vwImRYeywc77THGMYVXlm4v/9YKCMI="; + + postInstall = '' + installManPage docs/taskwarrior-tui.1 + installShellCompletion completions/taskwarrior-tui.{bash,fish} --zsh completions/_taskwarrior-tui + ''; meta = with lib; { description = "A terminal user interface for taskwarrior "; diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index d1286fe7179d..af8a538a822b 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -24,14 +24,14 @@ mkDerivation rec { pname = "tellico"; - version = "3.4.4"; + version = "3.4.5"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = pname; rev = "v${version}"; - hash = "sha256-Qgan0mnDTQx+KKCAnRpgi9CCbXIRBMQtAyH/Mr20VSw="; + hash = "sha256-XWzSbtyxOkASTwT5b7+hIEwaKe2bEo6ij+CnPbYNEc0="; }; postPatch = '' diff --git a/pkgs/applications/misc/terminal-stocks/default.nix b/pkgs/applications/misc/terminal-stocks/default.nix new file mode 100644 index 000000000000..b1d4c67ac89b --- /dev/null +++ b/pkgs/applications/misc/terminal-stocks/default.nix @@ -0,0 +1,25 @@ +{ lib, buildNpmPackage, fetchFromGitHub, nix-update-script }: + +buildNpmPackage rec { + pname = "terminal-stocks"; + version = "1.0.14"; + + src = fetchFromGitHub { + owner = "shweshi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-AzLMqp5t9u1ne+xCKp0dq/3V3DKJ1Ou9riAN+KqkStg="; + }; + + npmDepsHash = "sha256-GOg6B8BWkWegxeYmlHSJjFNrb/frb6jdzjjNSGF38Zo="; + dontNpmBuild = true; + + passthru.updateScript = nix-update-script {}; + + meta = with lib; { + description = "Terminal based application that provides stock price information"; + homepage = "https://github.com/shweshi/terminal-stocks"; + maintainers = with maintainers; [ mislavzanic ]; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/misc/termpdf.py/default.nix b/pkgs/applications/misc/termpdf.py/default.nix index 4ccddcd70071..e51f7633e013 100644 --- a/pkgs/applications/misc/termpdf.py/default.nix +++ b/pkgs/applications/misc/termpdf.py/default.nix @@ -1,26 +1,15 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, bibtool -, pybtex -, pymupdf -, pynvim -, pyperclip -, roman -, pdfrw -, pagelabels -, setuptools -}: +{ lib, buildPythonApplication, fetchFromGitHub, bibtool, pybtex, pymupdf, pynvim +, pyperclip, roman, pdfrw, pagelabels, setuptools }: buildPythonApplication { pname = "termpdf.py"; - version = "2019-10-03"; + version = "2022-03-28"; src = fetchFromGitHub { owner = "dsanson"; repo = "termpdf.py"; - rev = "4f3bdf4b5a00801631f2498f2c38c81e0a588ae2"; - sha256 = "05gbj2fqzqndq1mx6g9asa7i6z8a9jdjrvilfwx8lg23cs356m6m"; + rev = "e7bd0824cb7d340b8dba7d862e696dba9cb5e5e2"; + sha256 = "HLQZBaDoZFVBs4JfJcwhrLx8pxdEI56/iTpUjT5pBhk="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index 132b205f85c1..a7a184e80037 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "thedesk"; - version = "23.0.1"; + version = "24.0.7"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-DyaJggucFOxkrpaJSmg5fTrK8O3HA0Byd5pHwcgPSIM="; + sha256 = "sha256-EG5TMhYvECXahIbB25gP40iNQpStcrgaJW3ld9x02/E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index 4d3baf3feaeb..765462d78acf 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -5,19 +5,21 @@ buildGoModule rec { pname = "ticker"; - version = "4.5.4"; + version = "4.5.5"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-2Q+5EVeF8kXO4RogQIQHafV0AKIEKBFGqt27Vkanwss="; + rev = "refs/tags/v${version}"; + hash = "sha256-7FSyW71NWmWmBNQ5QUqMJ4x9WLXpm0kvvjdjzx1yk/M="; }; - vendorSha256 = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; + vendorHash = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; ldflags = [ - "-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}" + "-s" + "-w" + "-X github.com/achannarasappa/ticker/cmd.Version=v${version}" ]; # Tests require internet @@ -26,6 +28,7 @@ buildGoModule rec { meta = with lib; { description = "Terminal stock ticker with live updates and position tracking"; homepage = "https://github.com/achannarasappa/ticker"; + changelog = "https://github.com/achannarasappa/ticker/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ siraben ]; }; diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix index 7eccdbcc8d48..eebe42890da3 100644 --- a/pkgs/applications/misc/tippecanoe/default.nix +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.13.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-YgmePs0GxygR0hvcnRngzW77QZTOygSYvRaYk6oCVls="; + hash = "sha256-FWdAMIAoj3/+SQLIan++UpmWH1o3v92FsDw//b5RorM="; }; buildInputs = [ sqlite zlib ]; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index fa77f3b52993..50e8a2ea10d8 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_15, libsecret }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_21, libsecret }: stdenv.mkDerivation rec { pname = "todoist-electron"; - version = "1.0.3"; + version = "1.0.9"; src = fetchurl { url = "https://electron-dl.todoist.com/linux/Todoist-${version}.AppImage"; - sha256 = "sha256-bHX/RWDfe+ht66U7xg4HBZxeWlNBu4gYlIVd+9OuMNU="; + sha256 = "sha256-DfNFDiGYTFGetVRlAjpV/cdWcGzRDEGZjR0Dc9aAtXc="; }; appimageContents = appimageTools.extractType2 { @@ -36,9 +36,10 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron_15}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_21}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" ''; meta = with lib; { diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix index 640cfc6e12cd..f28797b88e57 100644 --- a/pkgs/applications/misc/todoist/default.nix +++ b/pkgs/applications/misc/todoist/default.nix @@ -2,23 +2,19 @@ buildGoModule rec { pname = "todoist"; - version = "0.16.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "sachaos"; repo = "todoist"; rev = "v${version}"; - sha256 = "sha256-cfhwbL7RaeD5LWxlfqnHfPPPkC5AA3Z034p+hlFBWtg="; + sha256 = "sha256-46wNacsK2kGHaq2MgcW4ELI2TIY+4leraGQwU4V7sVo="; }; vendorSha256 = "sha256-ly+OcRo8tGeNX4FnqNVaqjPx/A1FALOnScxs04lIOiU="; doCheck = false; - postPatch = '' - substituteInPlace main.go --replace '0.15.0' '${version}' - ''; - meta = { homepage = "https://github.com/sachaos/todoist"; description = "Todoist CLI Client"; diff --git a/pkgs/applications/misc/tofi/default.nix b/pkgs/applications/misc/tofi/default.nix index 947b5c336bbf..9438201d45a8 100644 --- a/pkgs/applications/misc/tofi/default.nix +++ b/pkgs/applications/misc/tofi/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "tofi"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "philj56"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KLHZrfoQ6x3EeKWo/TMp30rEIqdq16i8YLr4zFHbnSc="; + sha256 = "sha256-HhkXypRGerWWHrR4maR3AtayWSy5qhl/LYwBHWGKboU="; }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols ]; diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 933464b62631..6f6151d1ea29 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -2,19 +2,19 @@ python3Packages.buildPythonApplication rec { pname = "toot"; - version = "0.28.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; - rev = version; - sha256 = "076r6l89gxjwxjpiklidcs8yajn5c2bnqjvbj4wc559iqdqj88lz"; + rev = "refs/tags/${version}"; + sha256 = "sha256-qZk42zGHWpeN5rZPFw7xAmDIvhPzqTePU3If+p/L98c="; }; - checkInputs = with python3Packages; [ pytest ]; + nativeCheckInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = with python3Packages; - [ requests beautifulsoup4 future wcwidth urwid ]; + [ requests beautifulsoup4 future wcwidth urwid psycopg2 ]; checkPhase = '' py.test diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 8483c787ad75..b6ab9943d398 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -84,9 +84,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index 7667b4103d48..a20e3e2650f1 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { watchdog ]; - checkInputs = [ unittestCheckHook mock freezegun pylint ]; + nativeCheckInputs = [ unittestCheckHook mock freezegun pylint ]; # Skip test that has been reported multiple times upstream without result: # bram85/topydo#271, bram85/topydo#274. diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix index 37cc10c3823c..6bf83be75703 100644 --- a/pkgs/applications/misc/tty-share/default.nix +++ b/pkgs/applications/misc/tty-share/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tty-share"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "elisescu"; repo = "tty-share"; rev = "v${version}"; - sha256 = "sha256-/oK2m2kxmF9HHYfTK6NlZxKKkDS7Oay+ed7jR/+szs0="; + sha256 = "sha256-7rNSBpiZslUGWw0P/Q1zRtNxo9MN8Vq6hG8pD6bJIsA="; }; # Upstream has a `./vendor` directory with all deps which we rely upon. diff --git a/pkgs/applications/misc/tuhi/default.nix b/pkgs/applications/misc/tuhi/default.nix index 4cc925d3bf95..641723016a8a 100644 --- a/pkgs/applications/misc/tuhi/default.nix +++ b/pkgs/applications/misc/tuhi/default.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { gtk3 gobject-introspection glib ]; - checkInputs = with python3Packages; [ flake8 pytest ]; + nativeCheckInputs = with python3Packages; [ flake8 pytest ]; propagatedBuildInputs = with python3Packages; [ svgwrite pyxdg pycairo pygobject3 setuptools-scm ]; diff --git a/pkgs/applications/misc/tuir/default.nix b/pkgs/applications/misc/tuir/default.nix index fb1a85b1e491..d4188829d40b 100644 --- a/pkgs/applications/misc/tuir/default.nix +++ b/pkgs/applications/misc/tuir/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { py.test ''; - checkInputs = [ coverage coveralls docopt mock pylint pytest vcrpy ]; + nativeCheckInputs = [ coverage coveralls docopt mock pylint pytest vcrpy ]; propagatedBuildInputs = [ beautifulsoup4 decorator kitchen requests six ]; diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 5ca1a9ea60f9..16d091aa7b1a 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tut"; - version = "1.0.17"; + version = "2.0.1"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-XuN1qpcCUX8xAE7tj21g6U3ilhQIeGWlSqMVik5Qc5Q="; + sha256 = "sha256-AtwwLRZx9O8IWPFgFI/ZK0tbeshEmaKpTQxA1PepnWM="; }; - vendorSha256 = "sha256-WdhTdF8kdjAg6ztwSwx+smaA0rrLZjE76r4oVJqMtFU="; + vendorHash = "sha256-gPF4XrUqDDJCCY1zrUr3AXDG0uoADR8LBxRP4yolcug="; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index d5d4b766e775..91ad479f450e 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -70,7 +70,7 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index c4b838beed99..527db967b974 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -55,14 +55,14 @@ python3Packages.buildPythonApplication rec { dbus-python pygobject3 pyinotify - python-Levenshtein + levenshtein pyxdg pycairo requests websocket-client ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ mock pytest pytest-mock @@ -113,9 +113,7 @@ python3Packages.buildPythonApplication rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 0b1bed678575..012285064d2d 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook +{ lib, stdenv, requireFile, dpkg, wrapGAppsHook, autoPatchelfHook , alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11, libxcb , libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender @@ -6,11 +6,12 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.6.10.13"; + version = "5.8.0.24"; - src = fetchurl { - url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_13_3c485d1dd2af4f61/${pname}_${version}_amd64.deb"; - sha256 = "c3e1ecf14c99596f434edf93a2e08f031fbaa167025d1280cf19f68b829d6b79"; + src = requireFile { + name = "${pname}_${version}_amd64.deb"; + url = "https://www.upwork.com/ab/downloads/os/linux/"; + sha256 = "sha256-9X1U/ImI8GfCiYLpLD+jICYAYsAr1NJLlOMvecXK7hc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index cc02a5d1c899..4911556086c7 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -3,30 +3,35 @@ , buildGoModule , unixODBC , icu +, nix-update-script +, testers +, usql }: buildGoModule rec { pname = "usql"; - version = "0.12.13"; + version = "0.13.8"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-F/eOD7/w8HjJBeiXagaf4yBLZcZVuy93rfVFeSESlZo="; + hash = "sha256-oNsA9VM6MN2czeZSTFGvmCWX0T3iVaAhQk1mVRyKgWw="; }; - vendorHash = "sha256-7rMCqTfUs89AX0VP689BmKsuvLJWU5ANJVki+JMVf7g="; - buildInputs = [ unixODBC icu ]; - # Exclude broken impala driver - # The driver breaks too often and is not used. + vendorHash = "sha256-LG5gTHXB1ItDZFbTBHyZGHZLaSYb8wekIHkahTMXzkk="; + proxyVendor = true; + + # Exclude broken impala & hive driver + # These drivers break too often and are not used. # # See https://github.com/xo/usql/pull/347 # excludedPackages = [ "impala" + "hive" ]; # These tags and flags are copied from build-release.sh @@ -36,6 +41,7 @@ buildGoModule rec { "sqlite_fts5" "sqlite_introspect" "sqlite_json1" + "sqlite_math_functions" "sqlite_stat4" "sqlite_userauth" "sqlite_vtable" @@ -52,9 +58,19 @@ buildGoModule rec { # All the checks currently require docker instances to run the databases. doCheck = false; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + inherit version; + package = usql; + command = "usql --version"; + }; + }; + meta = with lib; { description = "Universal command-line interface for SQL databases"; homepage = "https://github.com/xo/usql"; + changelog = "https://github.com/xo/usql/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ georgyo anthonyroussel ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 2897bb996c84..9f36d6bfa37f 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -14,14 +14,12 @@ , btrfs-progs }: -with lib; - stdenv.mkDerivation rec { pname = "veracrypt"; version = "1.25.9"; src = fetchurl { - url = "https://launchpad.net/${pname}/trunk/${toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; + url = "https://launchpad.net/${pname}/trunk/${lib.toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; sha256 = "sha256-drbhgYS8IaQdKUn/Y9ch1JBUpxbO/zpL13tcNRC3lK8="; }; @@ -54,7 +52,7 @@ stdenv.mkDerivation rec { --replace "Icon=veracrypt" "Icon=veracrypt.xpm" ''; - meta = { + meta = with lib; { description = "Free Open-Source filesystem on-the-fly encryption"; homepage = "https://www.veracrypt.fr/"; license = with licenses; [ asl20 /* and */ unfree /* TrueCrypt License version 3.0 */ ]; diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/applications/misc/vhs/default.nix index 5ea0a82c850e..fc66c908be70 100644 --- a/pkgs/applications/misc/vhs/default.nix +++ b/pkgs/applications/misc/vhs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vhs"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-wcOLUA/U+xRwo7slnACCURQO7D0F3pFP2/SHDfEHeTA="; + hash = "sha256-t6n4uID7KTu/BqsmndJOft0ifxZNfv9lfqlzFX0ApKw="; }; - vendorHash = "sha256-f8EHDxu+NWAFJx9ujzsiDhNymdEzExmdreP11gV56AI="; + vendorHash = "sha256-9nkRr5Jh1nbI+XXbPj9KB0ZbLybv5JUVovpB311fO38="; nativeBuildInputs = [ installShellFiles makeWrapper ]; buildInputs = [ ttyd ffmpeg ]; diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 336a0821df1e..6e9909d38a1d 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -20,19 +20,22 @@ , wcwidth , zstandard , setuptools +, importlib-metadata , git , withPcap ? true, dpkt, dnslib , withXclip ? stdenv.isLinux, xclip +, testers +, visidata }: buildPythonApplication rec { pname = "visidata"; - version = "2.9.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - hash = "sha256-PKj+imTSAGMpF1tkN0WmE3l/4FmWkm/ktIDzF2ku48s="; + hash = "sha256-OKCrlUWHgbaLZJPVvs9lnw4cD27pRoO7F9oel1NzT6A="; }; propagatedBuildInputs = [ @@ -64,10 +67,11 @@ buildPythonApplication rec { zstandard odfpy setuptools + importlib-metadata ] ++ lib.optionals withPcap [ dpkt dnslib ] ++ lib.optional withXclip xclip; - checkInputs = [ + nativeCheckInputs = [ git ]; @@ -75,6 +79,7 @@ buildPythonApplication rec { doCheck = stdenv.buildPlatform == stdenv.hostPlatform; checkPhase = '' + runHook preCheck # disable some tests which require access to the network rm tests/load-http.vd # http rm tests/graph-cursor-nosave.vd # http @@ -87,13 +92,21 @@ buildPythonApplication rec { substituteInPlace dev/test.sh --replace "bin/vd" "$out/bin/vd" bash dev/test.sh + runHook postCheck ''; + pythonImportsCheck = ["visidata"]; + + passthru.tests.version = testers.testVersion { + package = visidata; + version = "v${version}"; + }; + meta = { description = "Interactive terminal multitool for tabular data"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ raskin markus1189 ]; - homepage = "http://visidata.org/"; + homepage = "https://visidata.org/"; changelog = "https://github.com/saulpw/visidata/blob/v${version}/CHANGELOG.md"; }; } diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index 890a69f3b161..529c809806da 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { urwid ]; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; makeWrapperArgs = [ "--suffix" "PATH" ":" "${taskwarrior}/bin" ]; diff --git a/pkgs/applications/misc/warpd/default.nix b/pkgs/applications/misc/warpd/default.nix index 683b725ac5e1..e2d5715447f7 100644 --- a/pkgs/applications/misc/warpd/default.nix +++ b/pkgs/applications/misc/warpd/default.nix @@ -2,35 +2,29 @@ , stdenv , fetchFromGitHub , git -, libXi -, libXinerama -, libXft -, libXfixes -, libXtst -, libX11 -, libXext -, waylandSupport ? false, cairo, libxkbcommon, wayland +, withWayland ? true, cairo, libxkbcommon, wayland +, withX ? true, libXi, libXinerama, libXft, libXfixes, libXtst, libX11, libXext }: stdenv.mkDerivation rec { pname = "warpd"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "rvaiya"; repo = "warpd"; rev = "v${version}"; - sha256 = "sha256-aNv2/+tREvKlpTAsbvmFxkXzONNt73/061i4E3fPFBM="; + hash = "sha256-5B3Ec+R1vF2iI0ennYcsRlnFXJkSns0jVbyAWJA4lTU="; leaveDotGit = true; }; nativeBuildInputs = [ git ]; - buildInputs = if waylandSupport then [ + buildInputs = lib.optionals withWayland [ cairo libxkbcommon wayland - ] else [ + ] ++ lib.optionals withX [ libXi libXinerama libXft @@ -40,10 +34,12 @@ stdenv.mkDerivation rec { libXext ]; - makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals waylandSupport [ "PLATFORM=wayland" ]; + makeFlags = [ "PREFIX=$(out)" ] + ++ lib.optional (!withWayland) "DISABLE_WAYLAND=y" + ++ lib.optional (!withX) "DISABLE_X=y"; postPatch = '' - substituteInPlace Makefile \ + substituteInPlace mk/linux.mk \ --replace '-m644' '-Dm644' \ --replace '-m755' '-Dm755' \ --replace 'warpd.1.gz $(DESTDIR)' 'warpd.1.gz -t $(DESTDIR)' \ diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index be770a3021e8..d22c9a908816 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -20,6 +20,7 @@ , inputSupport ? true, libinput , jackSupport ? true, libjack2 , mpdSupport ? true, libmpdclient +, mprisSupport ? stdenv.isLinux, playerctl ? false , nlSupport ? true, libnl , pulseSupport ? true, libpulseaudio , rfkillSupport ? true @@ -29,18 +30,19 @@ , traySupport ? true, libdbusmenu-gtk3 , udevSupport ? true, udev , upowerSupport ? true, upower -, withMediaPlayer ? false, glib, gobject-introspection, python3, playerctl +, wireplumberSupport ? true, wireplumber +, withMediaPlayer ? mprisSupport && false, glib, gobject-introspection, python3 }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.15"; + version = "0.9.17"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "sha256-u2nEMS0lJ/Kf09+mWYWQLji9MVgjYAfUi5bmPEfTfFc="; + hash = "sha256-sdNenmzI/yvN9w4Z83ojDJi+2QBx2hxhJQCFkc5kCZw="; }; nativeBuildInputs = [ @@ -52,6 +54,7 @@ stdenv.mkDerivation rec { playerctl python3.pkgs.pygobject3 ]; + strictDeps = false; buildInputs = with lib; @@ -61,15 +64,17 @@ stdenv.mkDerivation rec { ++ optional inputSupport libinput ++ optional jackSupport libjack2 ++ optional mpdSupport libmpdclient + ++ optional mprisSupport playerctl ++ optional nlSupport libnl ++ optional pulseSupport libpulseaudio ++ optional sndioSupport sndio ++ optional swaySupport sway ++ optional traySupport libdbusmenu-gtk3 ++ optional udevSupport udev - ++ optional upowerSupport upower; + ++ optional upowerSupport upower + ++ optional wireplumberSupport wireplumber; - checkInputs = [ catch2_3 ]; + nativeCheckInputs = [ catch2_3 ]; doCheck = runTests; mesonFlags = (lib.mapAttrsToList @@ -81,11 +86,13 @@ stdenv.mkDerivation rec { libnl = nlSupport; libudev = udevSupport; mpd = mpdSupport; + mpris = mprisSupport; pulseaudio = pulseSupport; rfkill = rfkillSupport; sndio = sndioSupport; tests = runTests; upower_glib = upowerSupport; + wireplumber = wireplumberSupport; } ) ++ [ "-Dsystemd=disabled" @@ -101,9 +108,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + changelog = "https://github.com/alexays/waybar/releases/tag/${version}"; description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; license = licenses.mit; - maintainers = with maintainers; [ FlorianFranzen minijackson synthetica lovesegfault ]; + maintainers = with maintainers; [ FlorianFranzen minijackson synthetica lovesegfault rodrgz ]; platforms = platforms.unix; homepage = "https://github.com/alexays/waybar"; }; diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/applications/misc/waylock/default.nix index 2a29eab29730..9ae1b348e3d4 100644 --- a/pkgs/applications/misc/waylock/default.nix +++ b/pkgs/applications/misc/waylock/default.nix @@ -1,28 +1,27 @@ -{ - lib, - stdenv, - fetchFromGitHub, - zig, - wayland, - pkg-config, - scdoc, - wayland-protocols, - libxkbcommon, - pam, +{ lib +, stdenv +, fetchFromGitHub +, zig +, wayland +, pkg-config +, scdoc +, wayland-protocols +, libxkbcommon +, pam }: stdenv.mkDerivation rec { pname = "waylock"; - version = "0.4.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ifreund"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yWjWcnGa4a+Dpc82H65yr8H7v88g/tDq0FSguubhbEI="; + hash = "sha256-AujBvDy10e5HhezCQcXpBUVlktRKNseLxRKdI+gtH6w="; fetchSubmodules = true; }; - nativeBuildInputs = [zig wayland scdoc pkg-config]; + nativeBuildInputs = [ zig wayland scdoc pkg-config ]; buildInputs = [ wayland-protocols @@ -38,7 +37,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - zig build -Drelease-safe -Dman-pages --prefix $out install + zig build -Drelease-safe -Dman-pages -Dcpu=baseline --prefix $out install runHook postInstall ''; @@ -47,6 +46,6 @@ stdenv.mkDerivation rec { description = "A small screenlocker for Wayland compositors"; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [jordanisaacs]; + maintainers = with maintainers; [ jordanisaacs ]; }; } diff --git a/pkgs/applications/misc/wbg/default.nix b/pkgs/applications/misc/wbg/default.nix index 0febd846e024..d5f95961f37e 100644 --- a/pkgs/applications/misc/wbg/default.nix +++ b/pkgs/applications/misc/wbg/default.nix @@ -16,12 +16,6 @@ , libjpeg }: -let - # Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54 - mesonFeatureFlag = feature: flag: - "-D${feature}=${if flag then "enabled" else "disabled"}"; -in - stdenv.mkDerivation rec { pname = "wbg"; version = "1.0.2"; @@ -52,8 +46,8 @@ stdenv.mkDerivation rec { mesonBuildType = "release"; mesonFlags = [ - (mesonFeatureFlag "png" enablePNG) - (mesonFeatureFlag "jpeg" enableJPEG) + (lib.mesonEnable "png" enablePNG) + (lib.mesonEnable "jpeg" enableJPEG) ]; meta = with lib; { diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index 1de667f132e3..472f7ad42a50 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "whalebird"; - version = "4.6.5"; + version = "4.7.4"; src = let downloads = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { if stdenv.system == "x86_64-linux" then fetchurl { url = downloads + "/Whalebird-${version}-linux-x64.tar.bz2"; - sha256 = "sha256-WeZnWEwRbZEnYkLwWf6EC3ZbwI+Cr59czdKxxG/Lhn0="; + sha256 = "sha256-jRtlnKlrh6If9wy3FqVBtctQO3rZJRwceUWAPmieT4A="; } else if stdenv.system == "aarch64-linux" then fetchurl { url = downloads + "/Whalebird-${version}-linux-arm64.tar.bz2"; - sha256 = "sha256-5iKVP7zOci5X+EhnfJx5cZ5RiqZKz1pFLDUwZncynUc="; + sha256 = "sha256-gWCBH2zfhJdJ3XUAxvZ0+gBHye5uYCUgX1BDEoaruxY="; } else throw "Whalebird is not supported for ${stdenv.system}"; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # Necessary steps to find the tray icon asar extract opt/Whalebird/resources/app.asar "$TMP/work" substituteInPlace $TMP/work/dist/electron/main.js \ - --replace "Ao,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\"" + --replace "qt,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\"" asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" opt/Whalebird/resources/app.asar runHook postBuild diff --git a/pkgs/applications/misc/with-shell/default.nix b/pkgs/applications/misc/with-shell/default.nix index cf52d194f617..3674a23e41bd 100644 --- a/pkgs/applications/misc/with-shell/default.nix +++ b/pkgs/applications/misc/with-shell/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { $ with git git> add . - git> commit -a -m "Commited" + git> commit -a -m "Committed" git> push Can also be used for compound commands. diff --git a/pkgs/applications/misc/wordbook/default.nix b/pkgs/applications/misc/wordbook/default.nix new file mode 100644 index 000000000000..757fed5265f2 --- /dev/null +++ b/pkgs/applications/misc/wordbook/default.nix @@ -0,0 +1,69 @@ +{ lib +, fetchFromGitHub +, python3 +, meson +, ninja +, pkg-config +, glib +, gtk4 +, libadwaita +, librsvg +, espeak-ng +, gobject-introspection +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +}: + +python3.pkgs.buildPythonApplication rec { + pname = "wordbook"; + version = "unstable-2022-11-02"; + format = "other"; + + src = fetchFromGitHub { + owner = "fushinari"; + repo = "Wordbook"; + rev = "2d79e9e9ef21ba4b54d0b46c764a1481a06f0f1b"; + hash = "sha256-ktusZEQ7m8P0kiH09r3XC6q9bQCWVCn543IMLKmULDo="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + appstream-glib + desktop-file-utils + gobject-introspection + ]; + + buildInputs = [ + glib + gtk4 + librsvg + libadwaita + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + wn + ]; + + # prevent double wrapping + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + --prefix PATH ":" "${lib.makeBinPath [ espeak-ng ]}" + "''${gappsWrapperArgs[@]}" + ) + ''; + + meta = with lib; { + description = "Offline English-English dictionary application built for GNOME"; + homepage = "https://github.com/fushinari/Wordbook"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/misc/writefreely/default.nix b/pkgs/applications/misc/writefreely/default.nix index 0f9631edbfaa..1f9c048e71f4 100644 --- a/pkgs/applications/misc/writefreely/default.nix +++ b/pkgs/applications/misc/writefreely/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "writefreely"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "writeas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qYceijC/u8G9vr7uhApWWyWD9P65pLJCTjePEvh+oXA="; + sha256 = "sha256-GnuqYgiwXdKM+os5RzuUYe9ADOhZaxou5dD7GCEE1Ns="; }; - vendorSha256 = "sha256-CBPvtc3K9hr1oEmC+yUe3kPSWx20k6eMRqoxsf3NfCE="; + vendorSha256 = "sha256-IBer+8FP+IWWJPnaugr8zzQA9mSVFzP0Nofgl/PhtzQ="; nativeBuildInputs = [ go-bindata ]; @@ -29,6 +29,6 @@ buildGoModule rec { description = "Build a digital writing community"; homepage = "https://github.com/writeas/writefreely"; license = licenses.agpl3Only; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix index 1af9f8e249e5..899468fbb557 100644 --- a/pkgs/applications/misc/xastir/default.nix +++ b/pkgs/applications/misc/xastir/default.nix @@ -2,6 +2,7 @@ , curl, db, libgeotiff , xorg, motif, pcre , perl, proj, rastermagick, shapelib +, libax25 }: stdenv.mkDerivation rec { @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { curl db libgeotiff xorg.libXpm xorg.libXt motif pcre perl proj rastermagick shapelib + libax25 ]; configureFlags = [ "--with-motif-includes=${motif}/include" ]; diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index 2d90a836446e..16c6bfac7ed0 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, chmlib }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, wxGTK32 +, chmlib +}: stdenv.mkDerivation rec { pname = "xchm"; @@ -11,13 +17,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-8HQaXxZQwfBaWc22GivKri1vZEnZ23anSfriCvmLHHw="; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ wxGTK30 chmlib ]; + nativeBuildInputs = [ + autoreconfHook + ]; - configureFlags = [ "--with-wx-prefix=${wxGTK30}" ]; + buildInputs = [ + wxGTK32 + chmlib + ]; + + configureFlags = [ "--with-wx-prefix=${wxGTK32}" ]; preConfigure = '' - export LDFLAGS="$LDFLAGS $(${wxGTK30}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk2u_aui-3.0" + export LDFLAGS="$LDFLAGS $(${wxGTK32}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk3u_aui-3.2" ''; meta = with lib; { diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix index d57eb4878173..7e3a391eb5bb 100644 --- a/pkgs/applications/misc/xcruiser/default.nix +++ b/pkgs/applications/misc/xcruiser/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { It constructs a virtually 3-D formed universe from a directory tree and allows you to "cruise" within a visualized filesystem. ''; - homepage = "http://xcruiser.sourceforge.net/"; + homepage = "https://xcruiser.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index c9af439b447b..538bf3507a7b 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.18.0-mo1"; + version = "6.18.1-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-Ma5wXaQBAVWJsL2wVOHxQ2aSAG9wOywk/abtUi03JvY="; + sha256 = "sha256-ZHSDJLZ+5WTqJwSWT05VuN7VAK/aD0dimVFiZ39IWvg="; }; meta = with lib; { diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 2d8af0465a77..eab545cf0818 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,9 +1,24 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, xorg, pcre, gst_all_1, glib -, xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }: +{ stdenv +, lib +, fetchurl +, fetchpatch +, autoreconfHook +, intltool +, pkg-config +, wrapGAppsHook +, enchant +, gdk-pixbuf +, glib +, gst_all_1 +, libnotify +, pcre +, xorg +, xosd +}: stdenv.mkDerivation { - pname = "xneur"; - version = "0.20.0"; + pname = "xneur"; + version = "0.20.0"; src = fetchurl { url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/xneur_0.20.0.orig.tar.gz"; @@ -11,14 +26,26 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - pkg-config intltool wrapGAppsHook + autoreconfHook + intltool + pkg-config + wrapGAppsHook ]; buildInputs = [ - xorg.libX11 xorg.libXtst pcre gst_all_1.gstreamer glib - xosd xorg.libXext xorg.libXi libnotify - enchant gdk-pixbuf - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + enchant + gdk-pixbuf + glib + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gstreamer + libnotify + pcre + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXtst + xosd ]; patches = [ @@ -27,10 +54,15 @@ stdenv.mkDerivation { url = "https://salsa.debian.org/debian/xneur/-/raw/da38ad9c8e1bf4e349f5ed4ad909f810fdea44c9/debian/patches/gcc-10.patch"; sha256 = "0pc17a4sdrnrc4z7gz28889b9ywqsm5mzm6m41h67j2f5zh9k3fy"; }) + (fetchpatch { + name = "enchant2.patch"; + url = "https://salsa.debian.org/debian/xneur/-/raw/695b0fea56cde4ff6cf0f3988218c5cb9d7ff5ae/debian/patches/enchant2.patch"; + sha256 = "02a3kkfzdvs5f8dfm6j5x3jcn5j8qah9ykfymp6ffqsf4fijp65n"; + }) ]; postPatch = '' - sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure + sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure.ac ''; meta = with lib; { diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 772d479ff78a..0b1aa7eb9157 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.20.0"; + version = "0.20.2"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TH5ksbEVBlOPmqQOtRmoHTDBRkj/KaMsM+Xc7e2ObzY="; + sha256 = "sha256-iPcxDNtwWnvFljZw052aw/ekCahyFBNt/zbUAdaWJA8="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-RcH1J5I9FPQ/Npq4I5lcOsZHzvKyYhxmqOIEYcBXqU0="; + cargoSha256 = "sha256-Sn7ZcNdmMDQJHn99iTJX9c3uVhaGpRvEgdoJFmIUgeU="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/applications/misc/xsuspender/default.nix index d6790759bab4..b47bbef0188f 100644 --- a/pkgs/applications/misc/xsuspender/default.nix +++ b/pkgs/applications/misc/xsuspender/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config , glib, libwnck, procps }: -with lib; - stdenv.mkDerivation rec { pname = "xsuspender"; version = "1.3"; @@ -21,10 +19,10 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/xsuspender \ - --prefix PATH : "${makeBinPath [ procps ]}" + --prefix PATH : "${lib.makeBinPath [ procps ]}" ''; - meta = { + meta = with lib; { description = "Auto-suspend inactive X11 applications"; homepage = "https://kernc.github.io/xsuspender/"; license = licenses.wtfpl; diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix index 580faa360268..f3a0f25552d9 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/applications/misc/xygrib/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj_7, libpng, openjpeg }: stdenv.mkDerivation rec { - version = "1.2.6.1"; + version = "unstable-2022-05-16"; pname = "xygrib"; src = fetchFromGitHub { owner = "opengribs"; repo = "XyGrib"; - rev = "v${version}"; - sha256 = "0xzsm8pr0zjk3f8j880fg5n82jyxn8xf1330qmmq1fqv7rsrg9ia"; + rev = "88c425ca2d7f4ba5d7ab75bfa25e177bee02d310"; + sha256 = "sha256-qMMeRYIQqJpVRE3YjbXIiXHwS/CHs9l2QihszwQIr/A="; }; nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ j03 SuperSandro2000 ]; + maintainers = with maintainers; [ j03 ]; }; } diff --git a/pkgs/applications/misc/yambar/default.nix b/pkgs/applications/misc/yambar/default.nix index 88b5046d1797..f2696c36dbe6 100644 --- a/pkgs/applications/misc/yambar/default.nix +++ b/pkgs/applications/misc/yambar/default.nix @@ -2,15 +2,19 @@ , stdenv , fetchFromGitea , alsa-lib +, bison , fcft +, flex , json_c , libmpdclient , libxcb , libyaml , meson , ninja +, pipewire , pixman , pkg-config +, pulseaudio , scdoc , tllist , udev @@ -26,26 +30,27 @@ }: let - # Courtesy of sternenseemann and FRidh - mesonFeatureFlag = feature: flag: - "-D${feature}=${if flag then "enabled" else "disabled"}"; + inherit (lib) mesonEnable; in -stdenv.mkDerivation rec { +assert (x11Support || waylandSupport); +stdenv.mkDerivation (finalAttrs: { pname = "yambar"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "yambar"; - rev = version; - hash = "sha256-zXhIXT3JrVSllnYheDU2KK3NE2VYa+xuKufIXjdMFjU="; + rev = finalAttrs.version; + hash = "sha256-0bgRnZYLGWJ9PE62i04hPBcgzWyd30DK7AUuejSgta4="; }; nativeBuildInputs = [ - pkg-config + bison + flex meson ninja + pkg-config scdoc wayland-scanner ]; @@ -56,7 +61,9 @@ stdenv.mkDerivation rec { json_c libmpdclient libyaml + pipewire pixman + pulseaudio tllist udev ] ++ lib.optionals (waylandSupport) [ @@ -72,13 +79,13 @@ stdenv.mkDerivation rec { mesonBuildType = "release"; mesonFlags = [ - (mesonFeatureFlag "backend-x11" x11Support) - (mesonFeatureFlag "backend-wayland" waylandSupport) + (mesonEnable "backend-x11" x11Support) + (mesonEnable "backend-wayland" waylandSupport) ]; meta = with lib; { homepage = "https://codeberg.org/dnkl/yambar"; - changelog = "https://codeberg.org/dnkl/yambar/releases/tag/${version}"; + changelog = "https://codeberg.org/dnkl/yambar/releases/tag/${finalAttrs.version}"; description = "Modular status panel for X11 and Wayland"; longDescription = '' yambar is a lightweight and configurable status panel (bar, for short) for @@ -107,6 +114,6 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/ydict/default.nix b/pkgs/applications/misc/ydict/default.nix index 9440c2368100..078d6abccf50 100644 --- a/pkgs/applications/misc/ydict/default.nix +++ b/pkgs/applications/misc/ydict/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib +, fetchFromGitHub +, buildGoModule +, makeWrapper +, mpg123 +}: buildGoModule rec { pname = "ydict"; @@ -13,16 +18,26 @@ buildGoModule rec { vendorSha256 = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs="; - ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X=main.Version=${version}" + ]; + + nativeBuildInputs = [ makeWrapper ]; + + preFixup = '' + wrapProgram $out/bin/${pname} \ + --prefix PATH ":" "${lib.makeBinPath [ mpg123 ]}"; + ''; # has no tests doCheck = false; meta = with lib; { - description = "A command-line Chinese dictionary"; + description = "Yet another command-line Youdao Chinese dictionary"; homepage = "https://github.com/TimothyYe/ydict"; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ zendo ]; }; } diff --git a/pkgs/applications/misc/yewtube/default.nix b/pkgs/applications/misc/yewtube/default.nix new file mode 100644 index 000000000000..f217c7b0e9a5 --- /dev/null +++ b/pkgs/applications/misc/yewtube/default.nix @@ -0,0 +1,48 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "yewtube"; + version = "2.9.0"; + + src = fetchFromGitHub { + owner = "iamtalhaasghar"; + repo = "yewtube"; + rev = "v${version}"; + hash = "sha256-8GL2ZvRHtnnLZ07nQk3irJUj+XLL+pyUUA+JJPICPRA="; + }; + + postPatch = '' + # Don't try to detect the version at runtime with pip + substituteInPlace mps_youtube/__init__.py \ + --replace "from pip._vendor import pkg_resources" "" \ + --replace "__version__ =" "__version__ = '${version}' #" + # https://github.com/iamtalhaasghar/yewtube/pull/105 + sed -ie '/pyreadline/d' requirements.txt + ''; + + propagatedBuildInputs = with python3Packages; [ + pyperclip + requests + youtube-search-python + yt-dlp + ]; + + checkInputs = with python3Packages; [ + pytestCheckHook + dbus-python + pygobject3 + ]; + + preCheck = '' + export XDG_CONFIG_HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "mps_youtube" ]; + + meta = with lib; { + description = "Terminal based YouTube player and downloader, forked from mps-youtube"; + homepage = "https://github.com/iamtalhaasghar/yewtube"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz koral ]; + }; +} diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix deleted file mode 100644 index 8a1645239082..000000000000 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, stdenv -, fetchurl -, mkDerivation -, qmake -, qtbase -, qtquickcontrols2 -, qtgraphicaleffects -, qtmultimedia -, python3 -, pyotherside -, pcsclite -, yubikey-personalization -, yubikey-manager -, makeWrapper -}: - -mkDerivation rec { - pname = "yubioath-desktop"; - version = "5.1.0"; - - src = fetchurl { - url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; - hash = "sha256-Lm9F4eaG9T5brAV7XDAkoj0WClmXEYIhuUzh2rk0oc0="; - }; - - doCheck = false; - - buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects qtmultimedia python3 ]; - - nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ]; - - postPatch = '' - substituteInPlace QZXing/QZXing-components.pri \ - --replace 'target.path = $$PREFIX/lib' 'target.path = $$PREFIX/bin' - ''; - - pythonPath = [ yubikey-manager ]; - - # Need LD_PRELOAD for libykpers as the Nix cpython disables ctypes.cdll.LoadLibrary - # support that the yubicommon library uses to load libykpers - - postInstall = '' - buildPythonPath "$out $pythonPath" - wrapProgram $out/bin/yubioath-desktop \ - --prefix PYTHONPATH : "$program_PYTHONPATH" \ - --prefix QML2_IMPORT_PATH : "${pyotherside}/${qtbase.qtQmlPrefix}" \ - --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so" \ - --prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" - - mkdir -p $out/share/applications - cp resources/com.yubico.yubioath.desktop \ - $out/share/applications/com.yubico.yubioath.desktop - mkdir -p $out/share/yubioath/icons - cp resources/icons/*.{icns,ico,png,svg} $out/share/yubioath/icons - substituteInPlace $out/share/applications/com.yubico.yubioath.desktop \ - --replace 'Exec=yubioath-desktop' "Exec=$out/bin/yubioath-desktop" \ - --replace 'Icon=com.yubico.yubioath' "Icon=$out/share/yubioath/icons/com.yubico.yubioath.png" - ''; - - meta = with lib; { - description = "Yubico Authenticator"; - longDescription = '' - Application for generating Open Authentication (OATH) time-based TOTP and - event-based HOTP one-time password codes, with the help of a YubiKey that - protects the shared secrets. - ''; - - homepage = "https://developers.yubico.com/yubioath-desktop"; - downloadPage = "https://developers.yubico.com/yubioath-desktop/Releases/"; - changelog = "https://developers.yubico.com/yubioath-desktop/Release_Notes.html"; - - license = lib.licenses.bsd2; - maintainers = with maintainers; [ mic92 risson ]; - }; -} diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix new file mode 100644 index 000000000000..bac11b6899b3 --- /dev/null +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -0,0 +1,94 @@ +{ lib +, flutter +, python3 +, fetchFromGitHub +, stdenv +, pcre2 +, gnome +, makeWrapper +, removeReferencesTo +}: +let + vendorHashes = { + x86_64-linux = "sha256-BwhWA8N0S55XkljDKPNkDhsj0QSpmJJ5MwEnrPjymS8="; + aarch64-linux = "sha256-T1aGz3+2Sls+rkUVDUo39Ky2igg+dxGSUaf3qpV7ovQ="; + }; +in +flutter.mkFlutterApp rec { + pname = "yubioath-flutter"; + version = "6.0.2"; + + src = fetchFromGitHub { + owner = "Yubico"; + repo = "yubioath-flutter"; + rev = version; + sha256 = "13nh5qpq02c6azfdh4cbzhlrq0hs9is45q5z5cnxg84hrx26hd4k"; + }; + + passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; + + vendorHash = vendorHashes.${stdenv.system}; + + postPatch = '' + substituteInPlace linux/CMakeLists.txt \ + --replace "../build/linux/helper" "${passthru.helper}/libexec/helper" + ''; + + preInstall = '' + # Make sure we have permission to delete things CMake has copied in to our build directory from elsewhere. + chmod -R +w build + ''; + + postInstall = '' + # Swap the authenticator-helper symlink with the correct symlink. + ln -fs "${passthru.helper}/bin/authenticator-helper" "$out/app/helper/authenticator-helper" + + # Move the icon. + mkdir $out/share/icons + mv $out/app/linux_support/com.yubico.yubioath.png $out/share/icons + + # Cleanup. + rm -rf \ + "$out/app/README.adoc" \ + "$out/app/desktop_integration.sh" \ + "$out/app/linux_support" \ + $out/bin/* # We will repopulate this directory later. + + # Symlink binary. + ln -sf "$out/app/authenticator" "$out/bin/yubioath-flutter" + + # Needed for QR scanning to work. + wrapProgram "$out/bin/yubioath-flutter" \ + --prefix PATH : ${lib.makeBinPath [ gnome.gnome-screenshot ]} + + # Set the correct path to the binary in desktop file. + substituteInPlace "$out/share/applications/com.yubico.authenticator.desktop" \ + --replace "@EXEC_PATH/authenticator" "$out/bin/yubioath-flutter" \ + --replace "@EXEC_PATH/linux_support/com.yubico.yubioath.png" "$out/share/icons/com.yubico.yubioath.png" + + # Remove unnecessary references to Flutter. + remove-references-to -t ${flutter.unwrapped} $out/app/data/flutter_assets/shaders/ink_sparkle.frag + ''; + + nativeBuildInputs = [ + makeWrapper + removeReferencesTo + ]; + + buildInputs = [ + pcre2 + ]; + + disallowedReferences = [ + flutter + flutter.unwrapped + ]; + + meta = with lib; { + description = "Yubico Authenticator for Desktop"; + homepage = "https://github.com/Yubico/yubioath-flutter"; + license = licenses.asl20; + maintainers = with maintainers; [ lukegb ]; + platforms = builtins.attrNames vendorHashes; + }; +} diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/applications/misc/yubioath-flutter/helper.nix new file mode 100644 index 000000000000..12e5f52d6b2e --- /dev/null +++ b/pkgs/applications/misc/yubioath-flutter/helper.nix @@ -0,0 +1,44 @@ +{ buildPythonApplication +, poetry-core +, yubikey-manager +, fido2 +, mss +, zxing_cpp +, pillow +, cryptography + +, src +, version +, meta +}: + +buildPythonApplication { + pname = "yubioath-flutter-helper"; + inherit src version meta; + + sourceRoot = "source/helper"; + format = "pyproject"; + + postPatch = '' + sed -i \ + -e 's,zxing-cpp = .*,zxing-cpp = "*",g' \ + -e 's,mss = .*,mss = "*",g' \ + pyproject.toml + ''; + + postInstall = '' + install -Dm 0755 authenticator-helper.py $out/bin/authenticator-helper + install -d $out/libexec/helper + ln -fs $out/bin/authenticator-helper $out/libexec/helper/authenticator-helper + ''; + + propagatedBuildInputs = [ + poetry-core + yubikey-manager + fido2 + mss + zxing_cpp + pillow + cryptography + ]; +} diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix index 69ecb1cfd1b8..ea2c74fda370 100644 --- a/pkgs/applications/misc/zathura/cb/default.nix +++ b/pkgs/applications/misc/zathura/cb/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "zathura-cb"; - version = "0.1.8"; + version = "0.1.10"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5"; + sha256 = "1j5v32f9ki35v1jc7a067anhlgqplzrp4fqvznlixfhcm0bwmc49"; }; nativeBuildInputs = [ meson ninja pkg-config gettext ]; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 6398b88ffccd..84015ba4a3fc 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -6,15 +6,13 @@ , gtk-mac-integration }: -with lib; - stdenv.mkDerivation rec { pname = "zathura"; - version = "0.4.9"; + version = "0.5.2"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "0msy7s57mlx0wya99qpia4fpcy40pbj253kmx2y97nb0sqnc8c7w"; + sha256 = "15314m9chmh5jkrd9vk2h2gwcwkcffv2kjcxkd4v3wmckz5sfjy6"; }; outputs = [ "bin" "man" "dev" "out" ]; @@ -23,13 +21,12 @@ stdenv.mkDerivation rec { # https://github.com/pwmt/zathura/blob/master/meson_options.txt mesonFlags = [ "-Dsqlite=enabled" - "-Dmagic=enabled" "-Dmanpages=enabled" "-Dconvert-icon=enabled" "-Dsynctex=enabled" # Make sure tests are enabled for doCheck "-Dtests=enabled" - ] ++ optional (!stdenv.isLinux) "-Dseccomp=disabled"; + ] ++ lib.optional (!stdenv.isLinux) "-Dseccomp=disabled"; nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils python3.pkgs.sphinx @@ -39,12 +36,12 @@ stdenv.mkDerivation rec { buildInputs = [ gtk girara libintl sqlite glib file librsvg texlive.bin.core - ] ++ optional stdenv.isLinux libseccomp - ++ optional stdenv.isDarwin gtk-mac-integration; + ] ++ lib.optional stdenv.isLinux libseccomp + ++ lib.optional stdenv.isDarwin gtk-mac-integration; doCheck = !stdenv.isDarwin; - meta = { + meta = with lib; { homepage = "https://git.pwmt.org/pwmt/zathura"; description = "A core component for zathura PDF viewer"; license = licenses.zlib; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 3584d24f1494..25856f0e58df 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -14,16 +14,14 @@ }: stdenv.mkDerivation rec { - version = "0.3.8"; + version = "0.4.0"; pname = "zathura-pdf-mupdf"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "sha256-wgW0z1ANjP6ezqreVOX6jUzRKYzYXxem9QxkclkRYhc="; + sha256 = "0pcjxvlh4hls8mjhjghhhihyy2kza8l27wdx0yq4bkd1g1b5f74c"; }; - patches = [ ./fix-mupdf-1.20.patch ]; - nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/fix-mupdf-1.20.patch b/pkgs/applications/misc/zathura/pdf-mupdf/fix-mupdf-1.20.patch deleted file mode 100644 index 6790721a76c3..000000000000 --- a/pkgs/applications/misc/zathura/pdf-mupdf/fix-mupdf-1.20.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5a5bb2634812f4c0530f5688a06269aaa4cd11dd Mon Sep 17 00:00:00 2001 -From: Osama Rebach -Date: Fri, 19 Aug 2022 13:39:49 +0100 -Subject: [PATCH] fix fz_search_stext_page - ---- - zathura-pdf-mupdf/search.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/zathura-pdf-mupdf/search.c b/zathura-pdf-mupdf/search.c -index f84dea0..419e5f4 100644 ---- a/zathura-pdf-mupdf/search.c -+++ b/zathura-pdf-mupdf/search.c -@@ -41,7 +41,7 @@ pdf_page_search_text(zathura_page_t* page, void* data, const char* text, zathura - - fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, fz_quad); - int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text, -- text, hit_bbox, N_SEARCH_RESULTS); -+ text, NULL, hit_bbox, N_SEARCH_RESULTS); - - fz_rect r; - for (int i = 0; i < num_results; i++) { --- -2.37.1 diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index b76e72a6970c..57f33559c667 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "zathura-pdf-poppler"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"; + sha256 = "12qhkshpp1wjfpjmjccsyi6wscqyqvaa19j85prjpyf65i9jg0gf"; }; nativeBuildInputs = [ meson ninja pkg-config zathura_core ]; diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index ee63a9df53bd..151a63af33e8 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "zathura-ps"; - version = "0.2.6"; + version = "0.2.7"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y"; + sha256 = "0ilf63wxn1yzis9m3qs8mxbk316yxdzwxrrv86wpiygm9hhgk5sq"; }; nativeBuildInputs = [ meson ninja pkg-config gettext ]; diff --git a/pkgs/applications/misc/zine/default.nix b/pkgs/applications/misc/zine/default.nix index f8b1d37399b8..0cf50c96ada9 100644 --- a/pkgs/applications/misc/zine/default.nix +++ b/pkgs/applications/misc/zine/default.nix @@ -2,22 +2,22 @@ , rustPlatform , fetchCrate , pkg-config -, stdenv , openssl +, stdenv , CoreServices , Security }: rustPlatform.buildRustPackage rec { pname = "zine"; - version = "0.7.0"; + version = "0.10.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-teLx21vA4b+ft4zZqou4EiTHhh9Foq2Vukmk4z0pWUM="; + sha256 = "sha256-hkBQ9WaWJrDhGAt35yueINutc7sAMbgbr8Iw5h0Ey4I="; }; - cargoSha256 = "sha256-OaA090pvJ6rc29wcsUTiuV4/VY/oDDEOGo94Ol31OzI="; + cargoSha256 = "sha256-rY7WHgd5wyx7TUgJamzre8HjeI0BRtaM14V3doCkfVY="; nativeBuildInputs = [ pkg-config @@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A simple and opinionated tool to build your own magazine"; homepage = "https://github.com/zineland/zine"; + changelog = "https://github.com/zineland/zine/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya figsoda ]; }; diff --git a/pkgs/applications/networking/alpnpass/default.nix b/pkgs/applications/networking/alpnpass/default.nix index 5cc0ac1cf05c..1d24c8028770 100644 --- a/pkgs/applications/networking/alpnpass/default.nix +++ b/pkgs/applications/networking/alpnpass/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { hash = "sha256-hNZqGTV17rFSKLhZzNqH2E4SSb6Jhk7YQ4TN0HnE+9g="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; meta = with lib; { description = "Inspect the plaintext payload inside of proxied TLS connections"; diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index 320938eb39a6..f776c2c0388d 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -38,7 +38,7 @@ , xorg , zlib }: -with lib; + let deps = [ alsa-lib @@ -86,11 +86,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://bin.appgate-sdp.com/${versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "sha256-ut5a/tpWEQX1Jug9IZksnxbQ/rs2pGNh8zBb2a43KUE="; + url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; + sha256 = "sha256-UDyVPoQM78CKVWXgr08An77QTiFVmRNHwQPGaj1jAIM="; }; # just patch interpreter @@ -134,16 +134,16 @@ stdenv.mkDerivation rec { --replace "/etc/appgate.conf" "$out/etc/appgate.conf" wrapProgram $out/opt/appgate/service/createdump \ - --set LD_LIBRARY_PATH "${makeLibraryPath [ stdenv.cc.cc ]}" + --set LD_LIBRARY_PATH "${lib.makeLibraryPath [ stdenv.cc.cc ]}" wrapProgram $out/opt/appgate/appgate-driver \ - --prefix PATH : ${makeBinPath [ iproute2 networkmanager dnsmasq ]} \ + --prefix PATH : ${lib.makeBinPath [ iproute2 networkmanager dnsmasq ]} \ --set LD_LIBRARY_PATH $out/opt/appgate/service # make xdg-open overrideable at runtime makeWrapper $out/opt/appgate/Appgate $out/bin/appgate \ - --suffix PATH : ${makeBinPath [ xdg-utils ]} \ - --set LD_LIBRARY_PATH $out/opt/appgate:${makeLibraryPath deps} + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ + --set LD_LIBRARY_PATH $out/opt/appgate:${lib.makeLibraryPath deps} wrapProgram $out/opt/appgate/linux/set_dns --set PYTHONPATH $PYTHONPATH ''; diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix new file mode 100644 index 000000000000..9495e254b2e9 --- /dev/null +++ b/pkgs/applications/networking/avalanchego/default.nix @@ -0,0 +1,45 @@ +{ IOKit +, buildGoModule +, fetchFromGitHub +, fetchpatch +, lib +, stdenv +}: + +buildGoModule rec { + pname = "avalanchego"; + version = "1.9.8"; + + src = fetchFromGitHub { + owner = "ava-labs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-5Zyrmo74k6Pl2pyVo3oX/haFsR8mHlM05ubPllintFQ="; + }; + + vendorHash = "sha256-CpXszXmySPHQehFy6XSOJFXq8ZGixO928+zrP7/vwCQ="; + # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 + proxyVendor = true; + + buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + + subPackages = [ "main" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/ava-labs/avalanchego/version.GitCommit=${version}" + ]; + + postInstall = '' + mv $out/bin/{main,${pname}} + ''; + + meta = with lib; { + description = "Go implementation of an Avalanche node"; + homepage = "https://github.com/ava-labs/avalanchego"; + changelog = "https://github.com/ava-labs/avalanchego/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index e9c5cf66d9de..7a05c9f9b18d 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.43.89"; + version = "1.47.186"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-eqwqn4cvVzoEmh206ybG6PWWg56ct53wYyRBOQ8wN5g="; + sha256 = "sha256-47LkjcC+fEE+cn2m434+9fQ+N2yZSc1eF0gDO7jGfPI="; }; dontConfigure = true; @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { --replace /opt/brave.com $out/opt/brave.com # Correct icons location - icon_sizes=("16" "22" "24" "32" "48" "64" "128" "256") + icon_sizes=("16" "24" "32" "48" "64" "128" "256") for icon in ''${icon_sizes[*]} do @@ -180,8 +180,8 @@ stdenv.mkDerivation rec { --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" ${optionalString vulkanSupport '' --prefix XDG_DATA_DIRS : "${addOpenGLRunpath.driverLink}/share" - --add-flags ${escapeShellArg commandLineArgs} ''} + --add-flags ${escapeShellArg commandLineArgs} ) ''; diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/applications/networking/browsers/captive-browser/default.nix index 035be9585ddd..ec24158635ee 100644 --- a/pkgs/applications/networking/browsers/captive-browser/default.nix +++ b/pkgs/applications/networking/browsers/captive-browser/default.nix @@ -1,17 +1,29 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "captive-browser"; - version = "2021-08-01"; - goPackagePath = pname; + version = "unstable-2021-08-01"; src = fetchFromGitHub { - owner = "FiloSottile"; - repo = "captive-browser"; - rev = "9c707dc32afc6e4146e19b43a3406329c64b6f3c"; + owner = "FiloSottile"; + repo = "captive-browser"; + rev = "9c707dc32afc6e4146e19b43a3406329c64b6f3c"; sha256 = "sha256-65lPo5tpE0M/VyyvlzlcVSuHX4AhhVuqK0UF4BIAH/Y="; }; + vendorHash = "sha256-2MFdQ2GIDAdLPuwAiGPO9wU3mm2BDXdyTwoVA1xVlcQ="; + deleteVendor = true; + + patches = [ + # Add go modules support + (fetchpatch { + url = "https://github.com/FiloSottile/captive-browser/commit/ef50837778ef4eaf38b19887e79c8b6fa830c342.patch"; + hash = "sha256-w+jDFeO94pMu4ir+G5CzqYlXxYOm9+YfyzbU3sbTyiY="; + }) + ]; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "Dedicated Chrome instance to log into captive portals without messing with DNS settings"; homepage = "https://blog.filippo.io/captive-browser"; diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix index 5a0a7f0d215b..6a898fb0c95d 100644 --- a/pkgs/applications/networking/browsers/castor/default.nix +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -40,8 +40,7 @@ rustPlatform.buildRustPackage rec { postInstall = "make PREFIX=$out copy-data"; - # Sometimes tests fail when run in parallel - dontUseCargoParallelThreads = true; + useNextest = true; meta = with lib; { description = "A graphical client for plain-text protocols written in Rust with GTK. It currently supports the Gemini, Gopher and Finger protocols"; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index ca52cf94d8c6..2f39e82f3b24 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -3,8 +3,6 @@ , enableWideVine, ungoogled }: -with lib; - mkChromiumDerivation (base: rec { name = "chromium-browser"; packageName = "chromium"; @@ -76,7 +74,7 @@ mkChromiumDerivation (base: rec { meta = { description = "An open source web browser from Google" - + optionalString ungoogled ", with dependencies on Google web services removed"; + + lib.optionalString ungoogled ", with dependencies on Google web services removed"; longDescription = '' Chromium is an open source web browser from Google that aims to build a safer, faster, and more stable way for all Internet users to experience @@ -86,11 +84,11 @@ mkChromiumDerivation (base: rec { homepage = if ungoogled then "https://github.com/Eloston/ungoogled-chromium" else "https://www.chromium.org/"; - maintainers = with maintainers; if ungoogled + maintainers = with lib.maintainers; if ungoogled then [ squalus primeos michaeladler ] else [ primeos thefloweringash ]; - license = if enableWideVine then licenses.unfree else licenses.bsd3; - platforms = platforms.linux; + license = if enableWideVine then lib.licenses.unfree else lib.licenses.bsd3; + platforms = lib.platforms.linux; mainProgram = "chromium"; hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium") then ["aarch64-linux" "x86_64-linux"] diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 39a2f3d18369..aea178a3afc5 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -45,14 +45,12 @@ , ungoogled ? false, ungoogled-chromium # Optional dependencies: , libgcrypt ? null # cupsSupport -, systemdSupport ? stdenv.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd }: buildFun: -with lib; - let python3WithPackages = python3.withPackages(ps: with ps; [ ply jinja2 setuptools @@ -75,16 +73,16 @@ let let # Serialize Nix types into GN types according to this document: # https://source.chromium.org/gn/gn/+/master:docs/language.md - mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\""; + mkGnString = value: "\"${lib.escape ["\"" "$" "\\"] value}\""; sanitize = value: if value == true then "true" else if value == false then "false" - else if isList value then "[${concatMapStringsSep ", " sanitize value}]" - else if isInt value then toString value - else if isString value then mkGnString value + else if lib.isList value then "[${lib.concatMapStringsSep ", " sanitize value}]" + else if lib.isInt value then toString value + else if lib.isString value then mkGnString value else throw "Unsupported type for GN value `${value}'."; toFlag = key: value: "${key}=${sanitize value}"; - in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); + in attrs: lib.concatStringsSep " " (lib.attrValues (lib.mapAttrs toFlag attrs)); # https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py gnSystemLibraries = [ @@ -151,9 +149,9 @@ let libdrm wayland mesa.drivers libxkbcommon curl libepoxy - ] ++ optional systemdSupport systemd - ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio; + ] ++ lib.optional systemdSupport systemd + ++ lib.optionals cupsSupport [ libgcrypt cups ] + ++ lib.optional pulseSupport libpulseaudio; patches = [ # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): @@ -237,10 +235,10 @@ let # Allow building against system libraries in official builds sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py - '' + optionalString stdenv.isAarch64 '' + '' + lib.optionalString stdenv.isAarch64 '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' - '' + optionalString ungoogled '' + '' + lib.optionalString ungoogled '' ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors" ${ungoogler}/utils/patches.py . ${ungoogler}/patches ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz . @@ -260,8 +258,6 @@ let host_toolchain = "//build/toolchain/linux/unbundle:default"; # Don't build against a sysroot image downloaded from Cloud Storage: use_sysroot = false; - # The default value is hardcoded instead of using pkg-config: - system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; # Because we use a different toolchain / compiler version: treat_warnings_as_errors = false; # We aren't compiling with Chrome's Clang (would enable Chrome-specific @@ -295,16 +291,23 @@ let chrome_pgo_phase = 0; clang_base_path = "${llvmPackages.clang}"; use_qt = false; - use_system_libwayland_server = true; - } // optionalAttrs proprietaryCodecs { + } // lib.optionalAttrs (!chromiumVersionAtLeast "110") { + # The default has changed to false. We'll build with libwayland from + # Nixpkgs for now but might want to eventually use the bundled libwayland + # as well to avoid incompatibilities (if this continues to be a problem + # from time to time): + use_system_libwayland = true; + # The default value is hardcoded instead of using pkg-config: + system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner"; + } // lib.optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; enable_hangout_services_extension = true; ffmpeg_branding = "Chrome"; - } // optionalAttrs pulseSupport { + } // lib.optionalAttrs pulseSupport { use_pulseaudio = true; link_pulseaudio = true; - } // optionalAttrs ungoogled (importTOML ./ungoogled-flags.toml) + } // lib.optionalAttrs ungoogled (lib.importTOML ./ungoogled-flags.toml) // (extraAttrs.gnFlags or {})); configurePhase = '' @@ -313,7 +316,7 @@ let # This is to ensure expansion of $out. libExecPath="${libExecPath}" ${python3}/bin/python3 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} - ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt + ${gnChromium}/bin/gn gen --args=${lib.escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1 @@ -338,7 +341,7 @@ let ''; targets = extraAttrs.buildTargets or []; commands = map buildCommand targets; - in concatStringsSep "\n" commands; + in lib.concatStringsSep "\n" commands; postFixup = '' # Make sure that libGLESv2 is found by dlopen (if using EGL). diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 34c6f773046a..c4f2257d1b2a 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -197,6 +197,9 @@ in stdenv.mkDerivation { export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}" fi + # Make generated desktop shortcuts have a valid executable name. + export CHROME_WRAPPER='chromium' + '' + lib.optionalString (libPath != "") '' # To avoid loading .so files from cwd, LD_LIBRARY_PATH here must not # contain an empty section before or after a colon. @@ -231,6 +234,5 @@ in stdenv.mkDerivation { inherit (chromium) upstream-info browser; mkDerivation = chromium.mkChromiumDerivation; inherit chromeSrc sandboxExecutableName; - updateScript = ./update.py; }; } diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index e2911963fa7c..e12667c94f78 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": "107.0.5304.110", - "sha256": "1k7yjsb4i7m8i5mk018v7z25r4x1ypyprz4hnyrn7vk2983lhdfk", - "sha256bin64": "06rlxwbvp7rpw2rdpnjzl1cn7cr1rwlb20wz8r0cndjcjyzd3rjj", + "version": "109.0.5414.119", + "sha256": "0bdyb14v12izxkldq27jx532p0bid3wdwfpd1mwm7jqswxgfzkfb", + "sha256bin64": "0iap6i4zmflp4fsj16knwdp03gixsdkbys0scbvvzs3fzy2r5zkx", "deps": { "gn": { - "version": "2022-09-14", + "version": "2022-11-10", "url": "https://gn.googlesource.com/gn", - "rev": "fff29c1b3f9703ea449f720fe70fa73575ef24e5", - "sha256": "1c0dvpp4im1hf277bs5w7rgqxz3g2bax266i2g6smi3pl7a8jpnp" + "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41", + "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" } }, "chromedriver": { - "version": "107.0.5304.62", - "sha256_linux": "13s0kl0k8c6q6h548ay2qssv8j4bmm5b4p3h8bgby30nj9014bsh", - "sha256_darwin": "0awd59xz4cllkbd9r5hhk6sinf291ii81chi361nw67aj5vmj7is", - "sha256_darwin_aarch64": "01fr6518qycwsn6js64k7727jmp3hxmj70jcghmw1cgxam59nh7w" + "version": "109.0.5414.74", + "sha256_linux": "1mhnw4maixwfhrz3r3mhpr9bl9hn7cvr2ji6y6ai32hxa1ix9m6f", + "sha256_darwin": "0w46xd05m7irfxqsfnjwgd2v65c9vgnh8awaknqgh02wmdgx3nm0", + "sha256_darwin_aarch64": "0amb2kd4cq4clir9gqr1b1mdy46m8nwzka227xxjd2i14vwzckb0" } }, "beta": { - "version": "108.0.5359.48", - "sha256": "0nk33rv4q22kgr9197y6a4w8yazgifsm5qvmmia41nnl24sqik57", - "sha256bin64": "062anw2i8rfi4v8zl0jdqxzn24xzl3ny24cbiyk8dyyf55r914v0", + "version": "110.0.5481.52", + "sha256": "09khb67xl1b2caw0j9lmv6a9iyms9sprn2r7wsgqzjn9dzd9wwcq", + "sha256bin64": "0dv9fxwqn50hl06y7zfqby8hd9lwqwk2q3856fygbn82qppkbl4r", "deps": { "gn": { - "version": "2022-10-05", + "version": "2022-12-12", "url": "https://gn.googlesource.com/gn", - "rev": "b9c6c19be95a3863e02f00f1fe403b2502e345b6", - "sha256": "1rhadb6qk867jafr85x2m3asis3jv7x06blhmad2d296p26d5w6x" + "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8", + "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" } } }, "dev": { - "version": "109.0.5410.0", - "sha256": "00g8q0qzl8kyc9j60nsvvjkr2x9js2xvbkmwp77p8b6gg0pyymjn", - "sha256bin64": "0ljhc5lqdy01apzyj96xzl931d904i37x62257s1h35w0j78mps0", + "version": "111.0.5562.0", + "sha256": "0aviz1cjm00lya530n0wyqn85d3idzn3bbp8065ygvfawqcf163j", + "sha256bin64": "0azkcvbl645c9ph4vn4502qbgfcb7zbs4ycy3q73nj5al642absm", "deps": { "gn": { - "version": "2022-10-28", + "version": "2022-12-12", "url": "https://gn.googlesource.com/gn", - "rev": "a4d67be044b42963de801001e7146f9657c7fad4", - "sha256": "0wikkkx503ip5xr72bz6d6sh2k50h5wlz9y8vmasvnrz9kjmlv5b" + "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8", + "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" } } }, "ungoogled-chromium": { - "version": "107.0.5304.110", - "sha256": "1k7yjsb4i7m8i5mk018v7z25r4x1ypyprz4hnyrn7vk2983lhdfk", - "sha256bin64": "06rlxwbvp7rpw2rdpnjzl1cn7cr1rwlb20wz8r0cndjcjyzd3rjj", + "version": "109.0.5414.120", + "sha256": "1yvfd0a7zfz4x00f83irrs6hy15wn85mrbbm7mk5wy4gjwg5zyrj", + "sha256bin64": null, "deps": { "gn": { - "version": "2022-09-14", + "version": "2022-11-10", "url": "https://gn.googlesource.com/gn", - "rev": "fff29c1b3f9703ea449f720fe70fa73575ef24e5", - "sha256": "1c0dvpp4im1hf277bs5w7rgqxz3g2bax266i2g6smi3pl7a8jpnp" + "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41", + "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" }, "ungoogled-patches": { - "rev": "107.0.5304.110-1", - "sha256": "14z9qi9i9l7kjx7gf74lzs63bpxqyd3wbqqpsvzvqgr2v0cgqahx" + "rev": "109.0.5414.120-1", + "sha256": "0hq48lsjl7da8rdq129mc7cd0z5ykqbaf1sbhhs1d10dzm5zs4p3" } } } diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index 9c409c29818c..aff0042ded30 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -8,7 +8,7 @@ , libXinerama , libjpeg , libpng -, mbedtls +, mbedtls_2 , openssl , perl , pkg-config @@ -38,7 +38,7 @@ stdenv.mkDerivation { libXinerama libjpeg libpng - mbedtls + mbedtls_2 openssl perl ]; diff --git a/pkgs/applications/networking/browsers/dillong/default.nix b/pkgs/applications/networking/browsers/dillong/default.nix index 2d12134caadd..7fc7cc07121d 100644 --- a/pkgs/applications/networking/browsers/dillong/default.nix +++ b/pkgs/applications/networking/browsers/dillong/default.nix @@ -5,7 +5,7 @@ , pkg-config , which , fltk -, mbedtls +, mbedtls_2 }: stdenv.mkDerivation { @@ -27,7 +27,7 @@ stdenv.mkDerivation { buildInputs = [ fltk - mbedtls + mbedtls_2 ]; # The start_page and home settings refer to /usr. diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 138af6cc511c..7bf6fdfe0bcb 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -13,13 +13,13 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "rkd77"; repo = "felinks"; rev = "v${version}"; - sha256 = "sha256-9OEi4UF/4/IRtccJou3QuevQzWjA6PuU5IVlT7qqGZ0="; + sha256 = "sha256-4+V1j78sjs3/6SnVLO34jCcNuegpZan8Ykd8Gy0vc3k="; }; buildInputs = [ @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { "--enable-nntp" "--enable-256-colors" "--enable-true-color" + "--with-brotli" "--with-lzma" "--with-libev" "--with-terminfo" diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 9a8156e0cf32..89f02114f42d 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -65,9 +65,7 @@ python3.pkgs.buildPythonApplication rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; strictDeps = false; diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 7ff3b843bc22..4002d52715b3 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -56,9 +56,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index ea737bb8c03c..72767f743079 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 = "107.0b9"; + version = "110.0b8"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ach/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ach/firefox-110.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "916b0ed984631143bf212276a7156285f012fabc565ac92f5eaf67e496198be3"; + sha256 = "ed485ff5d4df09a247e5325f7119f18a60dd089561bfbba4fd0defcbc74e49d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/af/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/af/firefox-110.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "a48eeff2b0aa3331c807bc78daf073850e768f270a99d7043f90e218655cfd41"; + sha256 = "a8998faee88db140727fb4d38e00ae105afbdd5dfbf995ee840eecb77f5b4fc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/an/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/an/firefox-110.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "522103b5f8f726492f634d46cd939581da4d2583b21718c46e4e985b2811967f"; + sha256 = "04161f5668253852b91d873fec38b0a55576e0055af214e6fe452b6e58fea228"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ar/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ar/firefox-110.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "22ddbcabedd2c0a4ee19a89296bb5751c7224906b7f52e6ffaef4de2a2ef904c"; + sha256 = "a86e49d7960cb2662cae59e681338140be1296ae14691b3cdaf349166ed2189f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ast/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ast/firefox-110.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "4fabe235071114f0489350d67da45300f4dde032e6ac99f667e10b2b5d499717"; + sha256 = "942b97bd1fafe71995f3d17bcc5d651e67fdfe292b65e617bb204d119e0744d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/az/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/az/firefox-110.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "53f3d762f228cd54298389e6da77da4b1ccf59d1f79feeb86cd687bfe12c37b1"; + sha256 = "4e1054551c830ac7d14f2f6286a3eec6f054c4a7a7fd26a3860c010bf5459d98"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/be/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/be/firefox-110.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "24ac93f0c4060acd2700468ffd976688350cd25f3ee8cb412b29ddf9d4573d70"; + sha256 = "0308d8776afc25f9ce0791d406289ef8e1909f88ae0cb7c91f9e6116ae1afb6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/bg/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/bg/firefox-110.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "182e53f5d99aa47ca4654c65466eb5a176d9ab2238ad5ec49009f12f8d6be90f"; + sha256 = "3236f9eb8c7ebd860c4629b46dacbcc9f72cd4d2af3dd7930fbe79eaa6f76e65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/bn/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/bn/firefox-110.0b8.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "b7d814f3642bcf2de19945262a073fb2de75117dc7dfe6bb0bcbace4f71e0082"; + sha256 = "6dd832f1ba0119e3b2e84b34ca0a7af0aea2f3615aa4c5f10fa6d52e27ca25e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/br/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/br/firefox-110.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "06e0003e56f5e3b990330b0657c9ec6293275f51060b33b5344f97bd84587d91"; + sha256 = "39dc415cb13964a73598df7e8852c04eb68093704bc368842918c7651d469571"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/bs/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/bs/firefox-110.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "6c1baecf2e14fceec17c564e5c6427250e664701187b0d345d5923c7a4febf52"; + sha256 = "f550885ad47858803262cc56a01ff94ca98dbe70ef647d45ef07704d320aeb10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ca-valencia/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ca-valencia/firefox-110.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "c6c0f70ebb040af59fcdd3be133cc9d0b954acebe7db0931c28602544dd63c04"; + sha256 = "35bedf1be1a9666deee43f1fba4b5d929997b68626d0cd5d34f1f874bdfc145b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ca/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ca/firefox-110.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "5d6a6825f7ce0f46f298df44a86e14fc9b7504d2ac9027a233a7066487a10f00"; + sha256 = "50e3be2fc9c0ee6d81fc21e93f500007e660eb465a4efdfc1182ab3f361db9f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/cak/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/cak/firefox-110.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "140ce93005581452a2b582bd581d6f3c68c14b3b1a0ea20ca165cde601550d95"; + sha256 = "f76a35618b17552eb7ba1f4c221ac2c1b279f39a23b90a3c801a214bdb6a90ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/cs/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/cs/firefox-110.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "bcee508da6f541d6046ea6def6d0b23062eb0989238de72b1a2980aab9e98a92"; + sha256 = "dac3d9822d05821535aa87c013e64bd11fe7bfb241817bb4943fb9476794327b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/cy/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/cy/firefox-110.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4a391c8a8ebc2b1ec67a75bd2a6c3d03ed09c3885f85d002e9b193627ae571ff"; + sha256 = "2a93da71a12b78c55c125c8a71a3b5e5c9785ddbef1eb57bda0ff6c7c2f4fa90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/da/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/da/firefox-110.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b1f4de3212f794b846f704fad2b867eb23fcafe75b67acb13e7b325452023620"; + sha256 = "9b63c1ff561acf270ceba10907371f63fd3ec5104fa9fd723c41cc88d207d860"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/de/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/de/firefox-110.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "d8b573cf4a298c17b341caea41ddc730db9f104d77e6657ba1aca2032823fcfd"; + sha256 = "b85d11c9fe7af3b3913f772aeeca37bbae95bc4bcaa9d9e2e711025b861a0713"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/dsb/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/dsb/firefox-110.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "26aac8dc4fe17516bd28e09f7b130baa09096bdd13f61fbb1286face9412d6c4"; + sha256 = "9a54cd55fe019b5f902aa9f6e21dc03629c35cc7acf8112b98b77881df88c894"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/el/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/el/firefox-110.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "3559b969de8ab4c969b967e86f7366755e7818b42f58da21922f7b54aa0928b3"; + sha256 = "a659eca2a2bb201ff27e989ba748abffc1bd44ddf6c69312c8829a91887d9e3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/en-CA/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/en-CA/firefox-110.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "8fa9a78cac2213f57288b587637699f6c049908978f5208f6d94cb447195919b"; + sha256 = "45e5b039f0e2b425d1051af5bde8a447b1f738b3dcf0c2321043af28d370ff1e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/en-GB/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/en-GB/firefox-110.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c34ef625ec69b8eba31c945f683e7660367b666ca941acee9ea05a9e126783f7"; + sha256 = "f53fed0d18ece63d2e94840ae1023d261b07a3556a4fbb8d4e2c8c4fad016b86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/en-US/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/en-US/firefox-110.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "35a148113a4a60c42ebf20d9bc378111e2904a174d3d3253696847bef4bb6029"; + sha256 = "230b771a572ca8bcd9e85dda0a967bdfa504664222e9ade51839b5c22735e7c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/eo/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/eo/firefox-110.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "8e080d25d13d36897438b3d631d0837827a466463ef564643841bfa8aa232676"; + sha256 = "1d171c124c45b2c22f4d64a51366f1840f2b72117d0ef65fa33a4b44623a88cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/es-AR/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/es-AR/firefox-110.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ee8c991c71b12c31128334388793d56627354376315d23f28dd3f2fffb1c6f32"; + sha256 = "eb7d67d7cf5460d8830e9c3ec6ddc4724857d94f15e809cbf02a26d7d9fcd6d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/es-CL/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/es-CL/firefox-110.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "c5ac567848d64d05bf12319a9db3f4a2d58d37d028cbf6afc47596dd13c7317d"; + sha256 = "55a45cb18fb2f2aa61de068629a1770dd37096ddb9424fa83031354c1e3a6f46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/es-ES/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/es-ES/firefox-110.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "21d68eaa9bb61b2beeff95e0236ac8ca75e9fb862d3498f419fcb9784eb0d9f2"; + sha256 = "3dfa2760508777cb93b44650bb6f1a70de2d10c3ec43e7350e901794fcae4f4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/es-MX/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/es-MX/firefox-110.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "d05b4a8fd2fb8cf10e54bbece7219b0b30cfca417f2f23211ad7c57469404753"; + sha256 = "39875c88fce55c54aa8f323b9530472dcafbc6c1f93fb8061f61c90b866d74b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/et/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/et/firefox-110.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "ba44c1cb9c956c1f9737a1755ed8abadda83b81993af6accb7f1a76e6689fe98"; + sha256 = "e041c7c050ab3aa3360e8f7a47552ac7e9e8f74367169227d2b1985cb1f4f611"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/eu/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/eu/firefox-110.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "efdb3940c69f938886a87b64e50628655620304fb6c6b9a30fcc5ccf7859885e"; + sha256 = "60327e88db690ff8851da6979929b88a272f2bffa22b131ab47c69e7b508020a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/fa/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/fa/firefox-110.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "6f6d56a161858edda75719dcaa1f15f25e272df86fb2130f7260eda1b9502bde"; + sha256 = "91657f9b44d1ca43bcf9b11fbe3426ad352e98945936439d3db33486d664ee29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ff/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ff/firefox-110.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "d6b4e7f4580a25df9221f702e849349d30f075ce1e641b8e51fd38ece441dda5"; + sha256 = "ea713dd820cfae67ee4af92c2e5b1561e638631043790e7e11ec8ec95f7dee8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/fi/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/fi/firefox-110.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "2ccc881390f10834f56254e6d09cfb4d84c6d315b005164edc558cc84aae434b"; + sha256 = "cac98b1458dad786bc5260771ecf9c434c3458fbfc0325b528bb268736b02276"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/fr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/fr/firefox-110.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "bbd490197ecd58c1acc552b207298866e63c9eb5265faa292cb66e3f0a47ca5e"; + sha256 = "8433f80253931ddf0c76ae09536da4d4f2d6fda042228f6c2421e3dba684ec8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/fy-NL/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/fy-NL/firefox-110.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "4924145964040affbdab6dcdd0584cff6e9947d47a294856b6754de8f63ab961"; + sha256 = "e4291c6245d3f6f7d3eab0614e690eda1e6fa1880776cc7cafbc1e892ae67dea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ga-IE/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ga-IE/firefox-110.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "3ad5950439c1b75f9739b98f15cf9cfe7b3f560d14ea2f043252fed980e4a61c"; + sha256 = "db193e8f7bc6ca08d80d30c4062afd4d64063da93360a5be48b359c572733b83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/gd/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/gd/firefox-110.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "30b39cb67ddc81c9b335e071cb7ab9560bf5c3673c903827d84b6300b4b7698a"; + sha256 = "5f11dc3c2d447d4307979e1fa684847770eb7737931998523b78e96cc8750c7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/gl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/gl/firefox-110.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "a8f1fbbea0d9b33c48690b52a2a0cf916a014532edfe755364d1c359d2a18108"; + sha256 = "61d21f0c5f0c0b281f53f83833f419f3e2791dd0a642f7f91740f86d13b58c12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/gn/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/gn/firefox-110.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "1a87d7ff4ade4584990b45dfc7e5583989a71565bb6dc6352f44fbabe12cecc6"; + sha256 = "7f3eae32a8b0ebe89af9f456c90390c0ebcfab855be960c120ad65f2ac871f66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/gu-IN/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/gu-IN/firefox-110.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "7890b8d5a268951c26a57b811e3255e604e402d2a3f5a7feb642b22544862bb4"; + sha256 = "3c8b5dfb00e7395de9bd7a47122e51ac98f568d58a604079de736550bddd770d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/he/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/he/firefox-110.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "04075d098593a82465e1da0adce02e97b0fdb88cb13447b7e43a1a6944ee7515"; + sha256 = "f1d1eced9c70c17f82db231531127a76b7b9ae2d7cf7c8db6d5a367f284e56c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/hi-IN/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/hi-IN/firefox-110.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "1bf03964dfa3d9061fa24210e63a95b49ae41663a7d194fec1466e139c64ab77"; + sha256 = "240c6757b39796b47360927418b25346bdda14c68581811e61870c0e775d2a14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/hr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/hr/firefox-110.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "752873792548f2929b366d81fdf4a20c34e45e94543ec270365240203cd465a4"; + sha256 = "ef9d90acbcd8a8e6351864030078d648c4a5149646c262a03c8f6c1de19afc93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/hsb/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/hsb/firefox-110.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e337cfdcecb149177585c318fd90efe94b16855d04eadb7b9ea69e4953eb91f2"; + sha256 = "9c8c7bc9437e58984a42ce622722cf52bc23c10f3394c698c939f7bf1c6cee4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/hu/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/hu/firefox-110.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4eec8a031baafcd41fca513a6e06c4c2f238a542792c01b3cb133caced5fea51"; + sha256 = "f4a42365f10144bdfa293e064c6f2a8a93344649b0b7d1ca29b6aa1cd928d282"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/hy-AM/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/hy-AM/firefox-110.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "273a07774d20273c32162fca5450a6de62427de650e5021d95d452a0c98a2599"; + sha256 = "767e6e39c11252a7ed5604c79385e8ffd6e72ed59ee7013188b75a868c280f12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ia/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ia/firefox-110.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "004e09524e22bc7998e0029876a200d885dfaf77bff8e94b3b50bef611f08a44"; + sha256 = "4a948be5f55b0dbd64574e53fa058ac1e37c3ebd07b2c7b31bca9a4df9ec729f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/id/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/id/firefox-110.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "ff0b69a160b219116f3e16916f065571190bba24ff79f55dc987a9cddabc79f5"; + sha256 = "172d6b7f6471b30ecec9928be73e86e6cb4c700d7b0f036754675a955a07233b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/is/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/is/firefox-110.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "a891d52e60dfdec95ff2e1be785c13e602ec5c5526d6d504f44a831126b57bbe"; + sha256 = "82dfe1ea54cf9dcc0a3c3bea2538f2c7bb2c9a8120361ca718160e2cc5faabdd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/it/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/it/firefox-110.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "531db472c3722d314e1e2e0f176fb6f77a17f21a93725afed598a986b673f4ed"; + sha256 = "5ee0de017187bae620553ee7d387e0a7fbdd828007f509b2799e5b4a42529e7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ja/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ja/firefox-110.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "31bed0e7e8447d73adf4375b091efae46f5ff133521a5dcca8c716878a4ce948"; + sha256 = "e1c4d3b19caea149985ad839c5a5eefae61fe489825363a7dc600158aa393ca6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ka/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ka/firefox-110.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "446f2fcc8adf041467674a7595e135ec4199c213d4375d61b10241edc9cdbbb3"; + sha256 = "066acc56597a25502041628781ab9cb1d9ae8b28cb34d20651c7a5b37f7cbbbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/kab/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/kab/firefox-110.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "74c76171519d67eca9bf700c6236ee706811ba56e09590ec2bb646f07a02b92b"; + sha256 = "f1f851d0d5e2a4b4dc4c6e1e8cef8bf0536a0d87c149fa0a7f5634494e253e02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/kk/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/kk/firefox-110.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "cde84100055d52c9f03e39421f37a12f94fdcfb1522e8f8d7bb09a10dbf02525"; + sha256 = "e49afedbdf6e979aac6f76d25564d48fadc2a7042715edff107752da20d54951"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/km/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/km/firefox-110.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "44da869ca2d6742b1331dc8049f8ada6563a380961ab1793762d083648dcda2c"; + sha256 = "626802d920890971e7e70865dc8cf02848eac285bd11c7905c76f1b8d3d45c47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/kn/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/kn/firefox-110.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "ba88756099cb97b05a42da3e1e529345f7eb780266c3a2ebb2dde3b691ebd830"; + sha256 = "f4a3c4730fe26412fbec6280059ee60dcb14dcc120c34bc866e63f2b59337ab9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ko/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ko/firefox-110.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a8910fc2f008f298172d1a9be9f3297f991f466ec4043ec4271e3cff3e2e7947"; + sha256 = "a86e103fa646e69806c3e602a3377daefb29e0b522293b919fdd480d6cdf12b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/lij/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/lij/firefox-110.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "05557b44a7dce20997697e1222cb8afb32df54561d5c6546cea32a4aeec735db"; + sha256 = "001967897e7d43ccb814aa3da320f06ab92d7dd152b0d174fc5d7f37c49f4bbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/lt/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/lt/firefox-110.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "a1da22004ecc7c725962a1b3256855a4c6a3cac43ebe62a0dd2c6f86d35e93f5"; + sha256 = "78030269b2fe5f151a0236112e0ecd4b43b61d577171e9b0544b2ac60be5869d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/lv/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/lv/firefox-110.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "67bd5d34e361406a55bc44c858c8a238d9746fe90c7345a562e1e47e0e72be48"; + sha256 = "b944ab8296cedb7cbb405b1db330e9011064dbf4353a2f3bb1741d21cff312ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/mk/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/mk/firefox-110.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "bb0867746e5e46f80b06f3505df1a40c7df0c6797d80cbdad9dee4b64be9be3e"; + sha256 = "d28f87dd4e040dee024e384c686fda5ed1bb5bca8807581e094a9bfa7a763ddb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/mr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/mr/firefox-110.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "68891ad7635073d72947778eaec1c35bdc8e7f73a04cc00a4905edc5047c0f56"; + sha256 = "0cba8c59d778577b8ca9d2d7bec95d57dafe90470867b7ad0675bec1fecb4b90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ms/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ms/firefox-110.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "57dff2faa5b84dcdab9ef10140b479dcf6609fecb96c4608be6708966019c284"; + sha256 = "989c7785d91d2fce8a37f0e79ec1e047397b2bf3addf8859fb742426c5279038"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/my/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/my/firefox-110.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "1096e896a0a60d08b326ec1451561416e272fa87e15f4029e8633451b45f6918"; + sha256 = "730c8d4ff818e03dbfd88f2e9a8ee131dc5144ee6b753fcfde2825c8cfb309c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/nb-NO/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/nb-NO/firefox-110.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "65eabad859b06b90ecf311ee3cc7ffd27e1bade90e70f04386b3a09394b9120e"; + sha256 = "32219c5b17363f0e7cb5a6b762bef28cc8af7aff7f0f7a3558510884505077d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ne-NP/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ne-NP/firefox-110.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "09148265cf0f476a34cbd52060117ea035c7d86f5c20d9845a29cedc234ed342"; + sha256 = "e8cc257a762c8b62fd00a640104d115416f1be3841b304acc6c4dd25a3145aa0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/nl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/nl/firefox-110.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "be1b51890780447fcc3ca3e6ca2ce72c62dd10c2311f23a4d46ccee1d4656a98"; + sha256 = "b4535c4b7683ad89368c2a156d580d94ce678e858e34f56b2d2eddd4326cddc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/nn-NO/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/nn-NO/firefox-110.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "6396f634229a47213c147527d6a5061885e99dc7bd0f67ed6970a801bb4dc744"; + sha256 = "0ebad9a365e2f7da6119dd821e8cb4c26abd939c942e4bfb451ca9ce93cab68f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/oc/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/oc/firefox-110.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "01528cb2ceabf857b723ecf4201fdd8ced515a56cd866acef518b5533fb0993d"; + sha256 = "c66df579bf6b9f23a87937d544f10f5b5a165e18205b8ceceae100a01074c1e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/pa-IN/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/pa-IN/firefox-110.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "cb1226ce21df81adb28358ee08d646e133452159e0875ba1a06338bd5711e274"; + sha256 = "1a60b5aed38933f2d5898f4ce502057c8f3f5207cb133709ec10ec4f4f7016db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/pl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/pl/firefox-110.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "a132993e9a8026df16f49792b34edc7509a5c3dee243382a02b3aa5b37572358"; + sha256 = "bc52ce2b2189763296d891259dc131f7a3be3287eb4e615d13ba01083ccec7fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/pt-BR/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/pt-BR/firefox-110.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "53d656230684b94d596006518581932626f7e04b3e57551b8ad287d165f69048"; + sha256 = "257045f51d0f3b78b86b8657add634acd67a9f7eb40ee21e41c475df28ffe19c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/pt-PT/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/pt-PT/firefox-110.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ae784c090a96c118627020d48c7970c158715c69151482c22fd9624d09cf5bc6"; + sha256 = "bdfd19bbbc264bb69ee68f0c07e10fe65a0333305d9e2c22fd0015343b9b8993"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/rm/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/rm/firefox-110.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "9ddc7cddfa8074558ae400cf54717b5fe7ed993a008da1c639f9178d1549553e"; + sha256 = "0a80709da5676bc49758d0adb791c6e663dda5326600926be4059c03fa241e1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ro/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ro/firefox-110.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "a146c62fa9750210abbfb28e03b7d8d8837566dbdeabc9c7916e1dd99b69bff4"; + sha256 = "58c6b48d460c424662a82ebaa48a655af938b84f30e27e4bf8b6e4481e3eebd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ru/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ru/firefox-110.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "2c58db3ad74194e07b9628cc6f8e1685e88c56689e76d9f37a1e0b18062c4938"; + sha256 = "a85d28c3f4671380a39be21bd9c1c8eacc7677aacca05ce6951bc58dc38c1940"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/sco/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/sco/firefox-110.0b8.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "482412af1f7e93138bbf2f229fd628bf5548ca0c0489583cefa866b8fec453f0"; + sha256 = "a4157c14e1f35b6603a3abf50ae2a03c368ae37cd9e36f5b72607481523b3305"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/si/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/si/firefox-110.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "eed075b164384475015b1b8e9b1f1fca7de2822465d207779d7cc346dff48178"; + sha256 = "da52abc50cd0aaf67f3daf9f78b87415015f2133eb2879713f97d360f0ba633d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/sk/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/sk/firefox-110.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "167b15a0b675bc68274bd7e5bfdc767945215711ae28b750130f4dde852f6af1"; + sha256 = "f82fcd00aa59756ee7e11d3a003c871dad71b651b3aee51d40dee250358db070"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/sl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/sl/firefox-110.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "eb4a9f34b7dbf2c921c82e9ab3051896e6ee679b6b0b4975f116b08f0fe475c6"; + sha256 = "e682fac35628626e6d99b32c7ac08fa768b27e27e9ed6ab0ca054d6a337015c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/son/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/son/firefox-110.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "c7d3af3d5b277cd121428baa128c0690222f7a3173136f2d605cd8448019f2e0"; + sha256 = "901abf7cb8189875fc23556d0599ec56467ead6d01f7132be2cd7ad8ae0342bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/sq/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/sq/firefox-110.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "04687dabe190ac2ef0322bb7273cea2eef3f112833426dc035bad09b42726638"; + sha256 = "9a0401842eac013a5618b00fce32a048ae401dd7b02e5237207987799bc80ad2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/sr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/sr/firefox-110.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d1e758bfdb493c176096d86fb633ade11ed478051e3306e724c096fb4221239c"; + sha256 = "753ef3fdc0bb3c538c2fe65db2c3db27184e0430c8d3ef78248e68e1706cbc54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/sv-SE/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/sv-SE/firefox-110.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "4df64b31d1eda64befa266acd8297efb98eed5a558cd849959e6d8cd5dca7d0d"; + sha256 = "2977dc95a24581051f4f0234ad4cb21bb5742af5933313442d5f3f4c2f869550"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/szl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/szl/firefox-110.0b8.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "8ae13025e7acbb015ef82a10a59ea024708816c445292a32735bea25b7501f75"; + sha256 = "4c58983a77e3485edb8d2035391ea9d098196f1e19dc1ad070f7f77ddb5c0f97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ta/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ta/firefox-110.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "885852cf94df27fccbefbbdf7b91b66af5d0c1d531311f19e4a10f73b04d7bee"; + sha256 = "1204336c6feb2ef3c116a043151715f05d0498a1a85a0b008dcc3e4e378ff6ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/te/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/te/firefox-110.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "cdefcdb6d6138a586dc4bbdbf5fbacdba72c70ad6a26e404e436f3ab6c52ce81"; + sha256 = "214d936d334f0ad7d7a0a417b9c73cdfd38e6ba72dd8fd17e80eb45bb1216b06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/th/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/th/firefox-110.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "ca6ae16fd7a39b52eb4589d4697a655f8109fda50564d00d9d40990d9c2ca92f"; + sha256 = "aeee496b32287f98880594bb07ad217e6cd90184a3f8615c01f77c5321055fd9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/tl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/tl/firefox-110.0b8.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "c0bfc6a88e4a8c71e7e055d7f33215c17fb16b69ddefaa81e1c783ea8c33efb5"; + sha256 = "242b207f636b7c25e6f6b3de964ee47eedae9380b764b05324ba633c93c93a81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/tr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/tr/firefox-110.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "5396444d89d0708fa2cb7b42a0e648a6f67648dc0f4b7e4427fe16bab0db7822"; + sha256 = "bf8122a581172b5cd97160899b253bdb9f6c67a37dbe9a7285117092adf68c94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/trs/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/trs/firefox-110.0b8.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "97ac40f8291efbfe145aec8fe8aa8a103c655d31ce30d9c83f2433fc5f494b5d"; + sha256 = "7995c69237e99c42101c1ace2d9a591e099192a8b8a5c2779a1764541d279f1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/uk/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/uk/firefox-110.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "33c0e4984d1560949ce12ab2433f7f19f2cf31fd364923898883a0ec51b1c01c"; + sha256 = "65db0c950d4626ccfbd9d9129cdf7a5baaabe9f37d78eaf58dd14c459d7be4a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ur/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ur/firefox-110.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "6314d917d196b260ed41c434e438b553110bf2334f92594ef4b4b987e900b0e3"; + sha256 = "107e8e0f224a67b3bd69dd6f956dd8887fb475e02326ede21c408cb0a44f07a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/uz/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/uz/firefox-110.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "001160b117717bc45b591cc612dad798040a6252a9d1715c1308df2ef3c6e40f"; + sha256 = "fbca32000d6cdc39d447341e08d2ad587e1545e1f7dbc28dc2efa13b47a31210"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/vi/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/vi/firefox-110.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "4ffe081cfc1bb8d07041cf5a2055688d57040e12426a1aaa8ab9061a6adef65f"; + sha256 = "78364adb4b166b0ad5852b8f8eb3d7c3f0a38eb7a58866e4f12754c4e8ecc265"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/xh/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/xh/firefox-110.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "6cf15c2979db7e4e58156919e9295b6e0d2c2ddb854db7ab36bdfdc4e615d898"; + sha256 = "4e9290326419205d52a588a9f44f2d53693e6b987c01842fcda7e708d77d7984"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/zh-CN/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/zh-CN/firefox-110.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "783678510f1094701aeb2a84b91419f5bf2e1a4772f57ead3417af9a7d894eb1"; + sha256 = "4f5bba83fb22c21922680469a484a9c2a2d2bcdd070e998dbe36785a880d756f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/zh-TW/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/zh-TW/firefox-110.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "02f29c157cec3732567f903f038866d6006a99f75959ecf22f8635c63ddb4cfc"; + sha256 = "ba932bce9c5920395e154703522b0752ccd666ff111f7cb822cb27bc17941a3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ach/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ach/firefox-110.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "72954ba2b75c395f89e8d4350110c9a25f800938a85869ccf3b174e9b4567a46"; + sha256 = "ec500c8c4c8fec8635279c5423d322e621766f56772a4e5a63dc34bcbe3d61ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/af/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/af/firefox-110.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "4bb990a8fdef626262a3733afef963975085bb4d56ab284791a792169b29fcc4"; + sha256 = "8810a1cefe5545a7dafe58174421ba9d631d22ae49462544637cfe167a97d2bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/an/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/an/firefox-110.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "0a9e2fa6034ab4679032bab672a93da39ebc9cee4b97bd7b80e79f31091cd257"; + sha256 = "d8bfc06a0fc67ce4c84b339a28177ff7066f72f5cb77b37922170e073ac74e99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ar/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ar/firefox-110.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "f16b2c0913d9761d88465ca6ae0f45623600a74064eb18289414b98b2dbb1d5d"; + sha256 = "ec6674a2241852a443d0d22d34eb094c0de075e7d255f9bb026251dfa6aee85e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ast/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ast/firefox-110.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "96dd7293f9098902a4d62ad785f7cf15a265ed4f84ef8a7301abfee2f1fb7ecf"; + sha256 = "70b5050c81b7f0c1045e868c87925f1d0526cc3b133c15ef9edaade6ef7f50aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/az/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/az/firefox-110.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "3e41784eb43f22a8cc8a124746112859b4a6de51d2a82fd7bfc26c8569b0b9f6"; + sha256 = "1eba11cd825d691b0bfdc71e4e7f017d3b52992c5fc1a7db89a85cf6b8723680"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/be/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/be/firefox-110.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "8382f3b2f517a05e6c3c7476de8e7db9dd5b97e34d316a6986df0904ebbdfbd2"; + sha256 = "9e604836e097c1b5412fa4acab74b650881590c3430c1b822d5b1f7f6edb4e9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/bg/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/bg/firefox-110.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "9e826747f22128aaa1843a3f29d2e35234182a48caa36e69bc94f9f1500a3f3b"; + sha256 = "4e756271ec8af70d67ceddb75962de3d398bb183e28fbb8b18f77c92d453b6e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/bn/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/bn/firefox-110.0b8.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "9f4963935ce269960411092ffa307122fc98e01b513ec92419d36dd7d938b0ea"; + sha256 = "089315934a955fd48f4a546eeec9a74ac483a742dc1456c4bb078f927a1a990b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/br/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/br/firefox-110.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "502f4a58ea7e5d2ba9b7bfb9ca0fa8e03aacca068c2f6ed368e3b034393a76a5"; + sha256 = "0448de8755a6d48e012224db25acfe11c20b6f41e7b39935cba9501ff513037f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/bs/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/bs/firefox-110.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "c5cf972a1afd6c6ba6b339a2eb9f349d213e538cfbccac4923e3fdd439a0c9f5"; + sha256 = "2c749a81052756da521076a67fc0ae06f110e80278de0588b252354667fc85b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ca-valencia/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ca-valencia/firefox-110.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "ade546a6251b850484b060686621658228b2e0d2b3d203f5b7673b023ffbb63e"; + sha256 = "784fb8bf6a32caf67052c653924b9fa51fad94d3177f8f8f29c6c210324e6f84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ca/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ca/firefox-110.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "4e148bbb9a2818406781e89d0950d24154847dea5bb40e52e62f6360e230bf08"; + sha256 = "9133696b439986db2a1fe79359c341b9868dc44a2167e8a4f645942753f562b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/cak/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/cak/firefox-110.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "586457dd6a965293af953cd00fa20baf7aa1051dd7c4ca2025f9f864745ec113"; + sha256 = "2b7a3a15e6c2326420b3e82ab0e126370b9a88ca32e96d99b47238857cf57c4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/cs/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/cs/firefox-110.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "18b92c9f1292ec093ca97eecd0c8989343ba9d393b2b327f79d0d31ba08b749e"; + sha256 = "51bf4a01e29710079536bf4000368f1087f707a1916c20ee2d5d14644fed6e2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/cy/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/cy/firefox-110.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "72251558b568be17fcf51a61d8197861219a2d711632cc84e28eed61bb003750"; + sha256 = "5b5073c00de486045e38232f680ffbd49ed21a378b0d7ed7814e00b908e59596"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/da/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/da/firefox-110.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "dce8d3dbc492605bf708b8b2ae8909a51be7dae69557af2076f8c53274b1f54c"; + sha256 = "aa786c2c368d7d51888e85703b19cb5c12c70d55452922d3b68945366c0ad5be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/de/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/de/firefox-110.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "47864ddac3c1aed1dc4aa30247fbddb1e38073035f67115cf6f6edb06579582d"; + sha256 = "f5e3e08881fe08da2177b6906b76a0885cadae8b1d02591185f0f702ceb4d12d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/dsb/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/dsb/firefox-110.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "6e6bcfd81e4f30602af1381ea481ebb55af6f6db19b01a3b0be2c6111a0ba1cb"; + sha256 = "182669ab7334a9b5e74dd8f922a69e010f3db2a2d0ebde4c318176d4c66cdaf1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/el/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/el/firefox-110.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "71bad1277f68ff592f1c0e26e9a50feb5cc78ba8d6531c446f6182ae1837aef2"; + sha256 = "664bd97d14219f58ef767e7beb1b4795d85be49814ae56db8780829511dd4b60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/en-CA/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/en-CA/firefox-110.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "99b4cad938c80937af164fd85dfed4d0fcd5bb2890794612d9a27fef68b11862"; + sha256 = "fc6b10b31e9d8228c0fa89c226efd8d0fee9e170251369bc096e86a98a2cfffe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/en-GB/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/en-GB/firefox-110.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "592a484dd1cedb94d37f209c024a993a7c326e57913dd90de5e56dd5cd2061c0"; + sha256 = "e2b5a1fbdeef06d94f2abff9c1e9fa5e5772ba1e3cef31839d47240b1201faed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/en-US/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/en-US/firefox-110.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "36a81db851f34e6df6a52748adeed3b185f29f6f14e9cf940c106be2f3bcb624"; + sha256 = "26b6bdf7f5b184f5878622c22861b37299cf2ef720056ea452a0ab1daaacb2a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/eo/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/eo/firefox-110.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "9824ac8690edeea6d7cc00d622e1a0c203cb03f4513653c973edfa1f2c3fa1a2"; + sha256 = "307ba5a4477a1234d0bc3f73c6e8e28692212c5d7f58203e4e336100f9d0498d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/es-AR/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/es-AR/firefox-110.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "ac84773310cb538158b5d10c96170d845c9f9bd643666cd4ddb13805d21d73c6"; + sha256 = "a35b01a8569d34b627bb3a9a24e670f865fdc33d0606f1b0eab9e8c1b7f73601"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/es-CL/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/es-CL/firefox-110.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "7635cf5ac97a78f0509b983aa58d000b7d7cb5f1ebd06466f662dad9f199097e"; + sha256 = "6910b74dec7071a2b33b2bd09f5ae61bdee7b77030287d243de90b7f4e326c22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/es-ES/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/es-ES/firefox-110.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "1bcaf099b63f1f1c27b9ed32fec5f743a9c0c1cbad21cec1a725ec2fcbe3248e"; + sha256 = "be75ed4c9c6572d92bdde9dab331854eadd07fd5321792c65665a207fd3c5904"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/es-MX/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/es-MX/firefox-110.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "579f5767dfc09d7c71ff317ae46642ebc6d9159270297ba0f89fc8518c4817b5"; + sha256 = "ff98f40124d28f441215fd19199f2b99b7ed2370842af1045add334c3cf5825c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/et/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/et/firefox-110.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f03049b4107be104dfd8214ea4480851cdfee2ca09fee9ec471169fd6b4cac6a"; + sha256 = "65158799c952aeff6e72ff675f6fb69b8fd981b8315bb45d0712326ee973b543"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/eu/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/eu/firefox-110.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "52f54eea2402c7bc09f336cad4ac3b8ae613c95cba85dc03867ca565a91c9851"; + sha256 = "1d1cc6139aada38bc8c5bad570e7722165eee34081140e97cb3f726ee07b322d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/fa/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/fa/firefox-110.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "0c93ef3ed33022436c3291a43ffe8449ffdbc2b4e9d87db5d656f2e3dab4cdcf"; + sha256 = "1771265328653411950394f9688078816b1cf518a8adcdf5c086d18008af39c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ff/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ff/firefox-110.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "dcbb91da91be9ef501d0c09d962b7a91bf4a7412ea7d9e16497e3202900403ad"; + sha256 = "b0602ea788eb7804f749ca088850f4832c58b52fc3527b42db121a90a8b5e757"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/fi/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/fi/firefox-110.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "11512a690c09256d05337ca3e787b273af40e6d3a9401116af483236750baff2"; + sha256 = "3ddc1726866b9c20eaf5e59e55ffdc0f1ffe335b072637feab1e37fa75c71245"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/fr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/fr/firefox-110.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "ac757918368cd4aa1c67c734459d7bd92e62f5134417cd38fd662e1817252e9c"; + sha256 = "738c5902dcb0cdab1f8e3a12243a8276dd1a5df34c9b6014b2373bc3a5c307f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/fy-NL/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/fy-NL/firefox-110.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "2c3dab7652d03b5a6037f744a9016c934e8f971fe7e1fc8005fb27884fbab2ae"; + sha256 = "701139fed71032ba9e0f039deebd51c0b212e656c19c377f081398d29a04262f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ga-IE/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ga-IE/firefox-110.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "ae554f6e691b234ca09c8aae41ca1f5fb20059305b24527b7f06234555e44230"; + sha256 = "449b503b56a53ed10bb6d48721be494a983884e0544a80d95433cf621d31cdc4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/gd/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/gd/firefox-110.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "72481494a77e18709b36593cf5d5c733f9ef1e928898913ff7961ffbd1884234"; + sha256 = "8105073ef11ed62c347d2720d095b3a2faad65e11a50c6dd7c8b1d06c381eb7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/gl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/gl/firefox-110.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "84497a234c768ecdbb2cbf9ec1137e53c37dfe46b5be9fcb718c9aae70f87629"; + sha256 = "faf007e32a4dc925d7695754c426f3660acc08ca772597648735b0c8d92e80a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/gn/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/gn/firefox-110.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "35b00e8b881d1e134bbd92e28041d2a3a1288004c437c5f3ca9ddbb8fdaf9681"; + sha256 = "52fb45eeba6446a8fe23f976acda920a5167e8d6396c0e364dab906addff9e52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/gu-IN/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/gu-IN/firefox-110.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "d6fc5d8b83a8f8187a79701a9a453f31b2708fcf02b0a96184c8c186d6621e35"; + sha256 = "7a4e841acc56dfbc34cce46ff8dbc0e24cec260b8567486dce7480b60af60982"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/he/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/he/firefox-110.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "e8a14a44deef14d9d5a3f73ebe6e2f1a7eb2dbd64c0042ab2a32e9d0aa9e4079"; + sha256 = "da7e501b8c1593cb3dee96b10f822615cfe58351d8f058228fd9af4e861d3a5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/hi-IN/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/hi-IN/firefox-110.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "7b73748587719c0a12de11e12ae40eb788a99c9d52714ed467a64ede39b9937d"; + sha256 = "83dfe9cc2116c5fa780dcc6709a81325ff23314b726ed7b3f02fbca5621d1ba6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/hr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/hr/firefox-110.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "340b3a46a9e14b383b60d9736f13d36258fd7e89c9c9e8a4dc292eecdafb9a89"; + sha256 = "10f68c3e7672f6d021861eb4041d546663d6095ababca87e60734e9cfd09ab19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/hsb/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/hsb/firefox-110.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "87a7dc59a021dd5d411300e76c52a2d7afbf5de24fca7ecbd07671907732a5c3"; + sha256 = "18266c49bf2ef7b383e69d2f12a4866b34b592c6650c8468104d2c3274d6bbc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/hu/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/hu/firefox-110.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "74a4dca5b5419d2df68abe884e66aa8e92c6b502e5fc945e8c670c9f2e94b750"; + sha256 = "a67efddc94b7045c34e500322ae9138c60dece5df38b1c73c8a806a49c51bdc6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/hy-AM/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/hy-AM/firefox-110.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "a1ed1d83d0f79328843d86a12547cc1135f3154e0e8706baec6bee95df958298"; + sha256 = "3c3cd679598a1ee33cb85552cca8da37805e28bcbac18a1954c44479332027dd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ia/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ia/firefox-110.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "850d522bd1b3282c4861345db6f447ab17acd71ad0b94e437f27c99b6a1c0640"; + sha256 = "e3a4b3fff1ac65e6c5013b33acf92bdc9a5d73be588969ae911ee57fc156bec9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/id/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/id/firefox-110.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "33c17e400d900edbfcb1fd6c8f391d7066382511f2ceb8e58cd14001f07a3609"; + sha256 = "c21dbdd5fba0f80ec211c2d678c97c45c15d4c38c7a9ef2df3ebe419cbc159d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/is/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/is/firefox-110.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "e33daebb1b41bb479911a454225f264410d03a050428d5cda8951cfc3231fc41"; + sha256 = "c0c4999106db151910a9092959c0e1cb1792f4feb1c06e391209ba27e59e50cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/it/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/it/firefox-110.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "4290a6f73a861f2de2537cc0ff0a7096432dd6ef2b4c86a8af6cf32d6607318c"; + sha256 = "1f4f9d9f2501e024e1556a81f86dadc53a15aa87ba2afd18e24c671f097bfc28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ja/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ja/firefox-110.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ff1080c3ed3c1497ca43b0d47e077d057c6b34598e8303875fb4e35cbaef4e4c"; + sha256 = "0418505229d99088fff72c145a9dbb54f893033dfd0688e4cfdca5d166a9b1dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ka/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ka/firefox-110.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "b90ab2d94dcb6e1d0f1319180524fb3193c70fcd0f216a2755b67548b4ab4a4d"; + sha256 = "cb2799206f8ebeac345dd3cf9cec63ffaab369c191b056816f86024eace0cdab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/kab/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/kab/firefox-110.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "49a12c30417d5283487bc661ea77718e80989e4db39915dc4409e2a141a45373"; + sha256 = "8ae745f6130fd0be975662f1ca2f73693b2e6eef28495b154f1e45cfc029650a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/kk/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/kk/firefox-110.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "391751327b023ec313f8336d5517b68a5b059422fa3d469c4c9246be2b8aa767"; + sha256 = "184448dc29505c50a9e8c0bcf0974c5a02cd91fce5fae168b7bbb8743b552a8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/km/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/km/firefox-110.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "6661784587c9495c3421c4aa36fc0bf632e3a1921f2e3778b43d8f3aea215fd0"; + sha256 = "b2e8732b0f85aec1cce3c17b7a01805d7fb63852dd2940ab16557e42f11e4eb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/kn/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/kn/firefox-110.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "3a66f003201ad2f1d58e2cf677ac099d087c229b26f5205512f48052ac4e2da8"; + sha256 = "504ae6d4df7241c99f36a59fc8d9fda35afd42a73e5871968e29a8cd052a7f4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ko/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ko/firefox-110.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "5a61453eb2fdcb406dc5458148ed0b0a762662969b6298ee7866c1cdb3c43407"; + sha256 = "06d8be7f8a727115819bc49fefe0a2a362f0598cb01bed17424c9a964b305cdb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/lij/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/lij/firefox-110.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "d017377488a0eefa7cd457d6719cd9a2ddf8e1059e2bb25b4b1e12ff1c690c02"; + sha256 = "489089ee5f413ab46c69a9981625f5f07aa95ea1ba06fafcb8e9d14047255af6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/lt/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/lt/firefox-110.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "c1b27ac2b11e2a20215bb5a1a4a99ed11cbb78ac1645ddf01c3aea33ade7775b"; + sha256 = "fe86a88921f10d76c0ed8ac1c0b4ac56406b9c8c09a9c212ba8f20f0be879418"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/lv/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/lv/firefox-110.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "b16146441b287167df03e44dda8641a025cd6f17f06d568c9b63f9c119cfe042"; + sha256 = "845c7bf589cac1dd0d292d573d939fbad9462f980a9d2d8390132a8dabfef0b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/mk/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/mk/firefox-110.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "687e319a2fe451a6bb464154c385590f2634ca5e2602b0a1eb21b3f73974e13d"; + sha256 = "573f1e0fcd6053c64957a87fb9f5f5a48a3ee266eb712c9b09157ed690df0a18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/mr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/mr/firefox-110.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "956977f0e6b0190ca8718ef41837e6a3ec12a1d1912af74a9f57cfc80dee9d81"; + sha256 = "9b7ea4b5f67ca110ba1586d2abbb506a832988e6a278b83ea6620fb0e0c7dac7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ms/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ms/firefox-110.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "75e646f866149bec4b8de9a7e6d482a9310375ba7d789c88df8d776a299cf8ff"; + sha256 = "e4c035196bba510e0b0caf699c24683b44219a4d51ac9dfcfe7874afdeb4f91f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/my/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/my/firefox-110.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "82cf085e5cb4cec8a646da0b9adf362d3cde77df2480e77baa68500e84e65d7f"; + sha256 = "be04fcc80b42505922d564dcc71f59ad18977e8bcaedfdb051b0037650685abb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/nb-NO/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/nb-NO/firefox-110.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "151ee93728a1e9db0f52c09fa1ce332da85d5ecb6d3b5e173f88f633b213a0ff"; + sha256 = "4b97136ee0f64b4e0978871b8618e5a59f390a1cdf14a857d7c3d0474278e747"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ne-NP/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ne-NP/firefox-110.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "07e9c5c1d46c8ac958a4ebb0313a5542c7f8696536b7ba798be5212b70f10b1f"; + sha256 = "e1d3c4ff0d67c3f927e1846678d687f9b1fcacf2c810a228a263385d0844d151"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/nl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/nl/firefox-110.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "20faf70cf29127d4ab44648c1bc24341b6c724ac87657af978167ffcba0088d9"; + sha256 = "8532106ddc363e24b76fa2d8326f88e98da2bafe588badef3b29658526aebfc1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/nn-NO/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/nn-NO/firefox-110.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ae9334704b2dbaa04e26644ed508f14c3efa9a73d643dc30882311144b65cc8d"; + sha256 = "a2e289e59aa8ea7213b771cc1c249406b28cfbf1624efa06bd700b15f40bf9e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/oc/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/oc/firefox-110.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "c419e0344bdb524c9775e2eb0803feef1f3afdfc3a0465a143692d0b70502b19"; + sha256 = "fcad2ca73437f84d8e500e329da800bd15f5758b99ac896cfa1d7eb2525a141f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/pa-IN/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/pa-IN/firefox-110.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c5a4789d822975d8b130070c6d893589b3110c2039fc0bab97a06e48f9c6abd4"; + sha256 = "ee61ee0a16045d0919407758261f749ab6d4a612439521166dfce0e9208f6cb0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/pl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/pl/firefox-110.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "606d96c2d3688c3c863c67fd2b09c8f60cb30382d2223ed64a03545b3fab7463"; + sha256 = "7bc34d9a72a0c9197bce9730262dcb9a254a40c27641022e854a37daf9756b39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/pt-BR/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/pt-BR/firefox-110.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "022d89379f0f29aed99031f313e411eefbca10f60d9f08d3b70b50e276f062d9"; + sha256 = "7b3344c25a5ac842d565525dcf8e771da15c30fb936721c469e739b18f9dfdec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/pt-PT/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/pt-PT/firefox-110.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "a2eabe1f3f6ba9cdbe072bb0cbe86116b37cae0513c8452d4c42a16915632366"; + sha256 = "ac1024a1f0183960116b604f2d2a7abfb321f91aedcdf67d3ae9befe2b49051a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/rm/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/rm/firefox-110.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "c7f005af9408d31d6a449cc0cc2040a2f779e52cb127dadd4ea9a742a204d527"; + sha256 = "bd90d0110d0c5f1273f3d82b38e5690dfe7eec8dbfa29f9ce7627d75c495c968"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ro/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ro/firefox-110.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "eccd837ded35c487a41bf9a6b22f83515de0b48258632f805605b532ca950840"; + sha256 = "26f09bd30df370c65327728cda50206df8a0b9bb50d1273c81249cfaebae37e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ru/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ru/firefox-110.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "1bbdc593fdcf9c221de69ee7f3108251ff2a0376e2ba53253452e9c790689350"; + sha256 = "0f9b03dff8c002b7a56c6d7f125d411652a6c1b00eecf317454f936cb887e4f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/sco/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/sco/firefox-110.0b8.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "9648d5e705ae53589ed2c895615896cb1bd9419d53f8190d652bec2416ea3946"; + sha256 = "a7d2e6266a1e15a3b6e4bc851963ac7b2ccb181eb83a4fe4e83e99a56804aa3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/si/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/si/firefox-110.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "d98725d0d09ea0c47463e1539bff1585a29c61c4107e8e64d3904532ff65894e"; + sha256 = "6452b61aa8acde4d2a0bb82f8070357309a4a963a4aada36fe5460055a9bedf6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/sk/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/sk/firefox-110.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a971b5f558999be8546429af1ddf0ac02b7468b97efb2da1cf1f6fc82e145838"; + sha256 = "37f801f1c9a0f020ce9729c70788024f0e71b62ae8860c3b301d95bebb89efcb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/sl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/sl/firefox-110.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "de9976f1a2751f0ed3d337e1e2b6433d98e78039839c6e42e8a247baa2987457"; + sha256 = "0afbacd201d903aa3341477450977c1a233f2843c43e77d7a73393c34b342c62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/son/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/son/firefox-110.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "bedea926725984a8ee11f06058a154ecfcba6ebbe4a89ab653188620e409c6e4"; + sha256 = "21c132be9a28d7c18d3045182d47a541b0af37c6306f8c08b8b4d28a6d3835f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/sq/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/sq/firefox-110.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "acc68c742f27cd3c9b606f98d60dac3e6703fe7876e487e7d925d7f52d50411c"; + sha256 = "74d545cb511311c0d2648b994a79c5f63bf1ae6044638180117c38c6575dc882"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/sr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/sr/firefox-110.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "bec2eab4399112af1d224cccbc9ecda6941d7388e85c6bc64c2644a33a01383d"; + sha256 = "4e3d14eef5f10d9cc6d25c840d26445f1a26a3c558265093b76ebfe00e05f2f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/sv-SE/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/sv-SE/firefox-110.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "74eaf1472d1658c90fb35449821423eba583e9d4e380ac03c96c2e2607df23ac"; + sha256 = "f8e98568cf4f5ed59ed662b2829354ebd7e9dc40bcceae5a5992257c125819b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/szl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/szl/firefox-110.0b8.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "5c30a2c6995a0dedfdb04236961aa4302e3ddeeaecd25fdb4e963c8ea46d0f2b"; + sha256 = "a9727f8f1cca9aac9b608cfde33775fe1418ff9aab7fdc5229dca68c17314b14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ta/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ta/firefox-110.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "9ea986c362eea0e9ff375463d0c4810590bdc880b3497559dc3275f9ea1d999c"; + sha256 = "8803d98769b0b634825374db86d63ed7d12936a57c62f77cf86599f8448ccb90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/te/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/te/firefox-110.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "ffeccf829a6b2b4cebc4df52a122d1ae359b00156ec668e9134a3295b3805907"; + sha256 = "649cbbefc93e18871782a8134005b4ca6f89066ac0ac65f43e489f00535d6a5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/th/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/th/firefox-110.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "66887b5d3e3f573ce3c08d303e9d26cd0c059514fb291a346aa00d4167834ea8"; + sha256 = "6b9a1e53671ab8a67bbffe421c1304fd754edd7b8c30aa73876ac88947c3d72a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/tl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/tl/firefox-110.0b8.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "70712a82780f1d9af8a95383e6d22cc9bdc75770dd78f35b7968afaaedad074d"; + sha256 = "f79832e73b7d7cd9e34f258ba2b449e91882e0eaad368a8130d5a1e10ab0d3e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/tr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/tr/firefox-110.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "fdd6cf59ce86b5a05e51b0e9488a4b59603f7af3f6c393ab96795369e80bbf9d"; + sha256 = "b7472eb28a207448fbd3be48fa0a33fe1a495d3f10c49a90a1a53c37b5efddc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/trs/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/trs/firefox-110.0b8.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "608df7e7573c7d13ce35c98acd870c89d8f60541c056a2bdc9c8c8148c3b0e3b"; + sha256 = "a2ae5913f10775ff99cb5408a5ee06ff4e95711b7b57bbd605c1720d5111e5cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/uk/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/uk/firefox-110.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "a53cf5ee10946361206e1cd5f90ec88058832e0f1fc8213b34bff1490d453bd8"; + sha256 = "15837064ff0328a52221e64061e565999132dfa06543e21aede2fe86f74ec4f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ur/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ur/firefox-110.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "df4cd1e7e612aab4350f5abe7b42b76588285da2d8504431d9af7c7843d67828"; + sha256 = "d04154c2e0de0c36f8408cdb5c479ffaf7c19208b6c1208a0b302d915375aada"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/uz/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/uz/firefox-110.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "7e7fe38f32fc4beea2afd843f203082ae48e39ef68c69ca41026c15a0c354ec4"; + sha256 = "503ed687154d63d05a033cbe420171661d815011f7373fa32928f9c4d28e0a87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/vi/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/vi/firefox-110.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "fe8e4693e8de49be5e00077a313b008228ee96abf3e1bed23888adec2d8d15c1"; + sha256 = "ffc193551227f39463e25085cceabd6000bc4754929fa9071862339c9b8f0c97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/xh/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/xh/firefox-110.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "f659de97e9ad809efbf70ddf4c613b4e4667fb93462e6f29de3490aac69fc74b"; + sha256 = "a32c9c7ceb2c38d2151ebcf4af15a613066f2965205eec3270aa42853a7ef341"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/zh-CN/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/zh-CN/firefox-110.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "ff50ea3194f1710f89bdf33da722a8b5ea005943069d6d8ee82ae2f4c956b85e"; + sha256 = "aa3f165da56c9ee61d2c48939b07e6aa854e674571ef2dd27c83d508aadba869"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/zh-TW/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/zh-TW/firefox-110.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "8044624334c7f4ed461d64c7e63a89cef7c98d934b04dcc3a455b90383afe3f7"; + sha256 = "a697c3f1a075269589ff8c66387489c14b83fa3c4e3d773f9bedd9abb32caf59"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index a28bb26610eb..a75607870555 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 = "107.0b9"; + version = "110.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ach/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ach/firefox-110.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "9b3ea5454f07b42ff0ddbb2aa4c55787e756f433ff2c979cf78afb4fc5781aea"; + sha256 = "cc5d39722e3e98f42ff5c2ccb269b2cde56f207f2d6f53ee87cd1f1df4e0d071"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/af/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/af/firefox-110.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "e30f4905ec1ffa513ca38e145855abd4a6dee4c37e067044ab10b7bdfdea1db0"; + sha256 = "7290b02e275f45a78eab3cd4ca333b06917604336dff966db451d10dddf011e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/an/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/an/firefox-110.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "cbce06fbd3f8d7c1b2c2922ee72cbefa055703daf7982ca4b2020c76a8bbc496"; + sha256 = "a0320cc31ceb1f0bcad216dfd12953d8b7ae0356236be2223afd79a1f68e52ad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ar/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ar/firefox-110.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "40e993d257da078116e9871e86a953845f1a576f48d9eb5a2954db612ba3af64"; + sha256 = "65c8404b0160ce88ff64076d6f8716f94ad1b7bece3424e2d660049e6dfb8935"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ast/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ast/firefox-110.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "335a90d14d899e8da3ad3643ae486ae6490e9334688310e425c753afd72e9185"; + sha256 = "b535076933c0d6b0ccbc98377fede33a4dc3b177b530b77904b1359b6d4d60ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/az/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/az/firefox-110.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "ff33f9f5f3b22dd8146c751aa184d5e5fa7cd69065919422a59ade205b2e6a01"; + sha256 = "5d6d196a7d08fd59d6bde1b8e9adf8f0088011b0348c1755e47be0c5aa5bf221"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/be/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/be/firefox-110.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "f1ea2e11d445ceac47295a2eb849a2bec0e8d403bbb22b57b57c6866abcbfb01"; + sha256 = "7894ff185eac53a496bf1111e940ec53af1989c01f5cfbfb17e30f1be60ca131"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/bg/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/bg/firefox-110.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "5ea828c5618d805d9e2740f10dddf2e5fbc88f429311875cfeb6f46f9cfb56b7"; + sha256 = "46e9cb6bc007341fb69a4e428ccb531053fc35ade15e73aa859ebda27da460bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/bn/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/bn/firefox-110.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "8668200585fc6a3d4d2a6d8e5c9cf34ed825008f2092ad5db499e0de2f8738ed"; + sha256 = "8419763e7310b5f7c3ec27e6c0ffb895d5b2c36b3c2cbf5261185e412d23b8f6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/br/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/br/firefox-110.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "ef8ec147f9c109a3b1a838ffc684834e0dc1ff59772adabada1917465d400496"; + sha256 = "0995bb17dc38a80398cf4e90a0b238dfeafd5a0d6c7a48251222b9f33c7b57d0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/bs/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/bs/firefox-110.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "f7933db4933435061acbe5934e0b5f3b430a938f5f6c1eccf46dbc1f20325301"; + sha256 = "0a4f9be7ef766ea6381e4c66258ae415f45fdd05493d347e9fe602870dd74f43"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ca-valencia/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ca-valencia/firefox-110.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "b611b7fe112e60eb2439fd3b1e2581a267d0d464f05f5626ecdf85ce44e01339"; + sha256 = "3f0d4e7143d9f6f2d9f92dd886bacb7e381dd69623552f299c99668f8cc7f851"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ca/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ca/firefox-110.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6cac2d995b2670db82c6829d1e724b28a9b60a25bfeb1b83187ab3c40e4fd869"; + sha256 = "aa6fc57fc2cfe59f885bdd9fb9ac70a6b1d99f216e9ca59fdde82302a872a931"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/cak/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/cak/firefox-110.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "fe2bcd1b7b29765e6810622e36842a367a081486f6656344a191d827b63c6ed1"; + sha256 = "2e0ea9547dbbfc73da08f0b25c888ee8a05285c2e1b038facb6b60acd0735b21"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/cs/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/cs/firefox-110.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "07dd647187739958effe0f298c12b32e58afb3b00a7e0e50cf1fde72e3a54bb0"; + sha256 = "b3f8300ab4235e5452308a9e61c6f25f3b288e7abc75899c2edfde9bccb71743"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/cy/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/cy/firefox-110.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "8399af3743940809c128e841c755433ead1e2aa738d9d0b947d7b49c4e55f900"; + sha256 = "b1ff7f5b50080a0fd587b95855aa4378c77e9c7e9f297c401d7530bf62850897"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/da/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/da/firefox-110.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "ce1c6aa4fe114baca6a356a56455d234c382ed347c225dfbc27f6357f6002475"; + sha256 = "7a4b1c42e4a7868b4c7eeb2837ca23bcc98439a9082893c9b6a27aa794db1c3d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/de/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/de/firefox-110.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "f87b2fce0c37d975bcf74e39616848c77e1ef5cfde8d5d1769e9bb1076c9a5d8"; + sha256 = "ef1d6041e6f259568d0ba689774cc68c93b6657cf482617c2c9b7977aa59fa0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/dsb/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/dsb/firefox-110.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "54adf97b32e27ee6d0b5f28a96b716f02b6ae8ff27950b563bd442482175ce23"; + sha256 = "be491c63b026a99a27f1fc07113cbac53afe2cf74b0c4a14e01b391a9f78afe3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/el/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/el/firefox-110.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "c9ab3bd70a91108121b24d327db1c790fd1610fba4abc7e13dcd6838891fc777"; + sha256 = "c3a4971667eff47902451e2a4ae61f2360dafedafecbb70d0668021e0136e210"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/en-CA/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/en-CA/firefox-110.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "d161003c7807063358b0b4510f55c49810296cddb476e19c27e6f8c33e68a546"; + sha256 = "1c22322afbcf77b1042a88946313300ffbe28f2d46b9b746091bddc8ab4b9e73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/en-GB/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/en-GB/firefox-110.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "768eae513f9c1434520308b8dca8d59dfadbbc36940817d38f651de7fa9b6165"; + sha256 = "7b52499d9bef9c077411d78c746dd25f28334ba55ee116f04e655b1dfe79d933"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/en-US/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/en-US/firefox-110.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "01af75b1bc284e1b736ece65a4a21339cc04c81d15b16054736d7c16efa4c161"; + sha256 = "6f9a54afd92e9e4a7e28d9b2c98b9143c85e7756cc99814a6eec8eccc946ff0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/eo/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/eo/firefox-110.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "72b8bdac3930b69da4d45b9f313fd7c813631aa615b7ca3a7e867438bf9bb040"; + sha256 = "8d233b59c6efac13a5df6e49d75cfe1d8c583e6fd480c7f3cd14a854d93cf520"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/es-AR/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/es-AR/firefox-110.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "01a08f43e345a0f42a22dc2258b47041a55bddfbaf9bcbf28c7265ff12ec81db"; + sha256 = "96030e4be739bb7ddbf71f1849b698e78de87355506eee026318a3d9e78d5062"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/es-CL/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/es-CL/firefox-110.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "ba9056b9bb4d0cf2d650a679fbb3978584b6685d478a1c55b40db854c31d79ad"; + sha256 = "8f1347c15674769afccc4a094366c744ee2e7cd2a72c0313b7472af2256c3192"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/es-ES/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/es-ES/firefox-110.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "bf2ea8c9cfea7cfd5ad3ba2f1ee2b39c6ca62cef4ad20e573c24dd8506c6282f"; + sha256 = "0380e298dbd24b19748d1c959867e6af16203868ebb46bff1aa45c83dac9d987"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/es-MX/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/es-MX/firefox-110.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "f369e031f51cf203c5d669d48fadf997738b6d7a410f30dc0de3e5cb57b7847e"; + sha256 = "dea1d2ef28f783ab316354a3a6d92309d3906cf55a82e5a7ff7f801c3a512617"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/et/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/et/firefox-110.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "8ff0214cec29fd6dd8df1b8e6a079883cd7f7b1c24c89dc8284420f729f43626"; + sha256 = "83ed70566e1a0fb33120d9526ce3b14939077a1048054f59c301b33d07924433"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/eu/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/eu/firefox-110.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "0ab036b26d08e2760b51fbd7d30b0004f2750422046f6f16abeeb1c76918e79a"; + sha256 = "0273dbea420a77a3f3331f5e80d3302b8d488f5bb421e55d9b3675f80132ddec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/fa/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/fa/firefox-110.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "5cb07d8d7634534e741ea59f75c37bae6c7d3a8fb83f94b1de32dcd4baf845a6"; + sha256 = "0f5a0f2614dfbf226855d9f1f4ae2b239ff884b7c4bfc4b1ea9f71e5681613db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ff/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ff/firefox-110.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "b5396fad3986064f9f93aec1bc10f04983c5037c9d7dd37be29a13f9458b10bb"; + sha256 = "637152fb27f03ad574db2169ffdebdfc5bf1d7fc8f9b8573994fbd854e8c848b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/fi/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/fi/firefox-110.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "0113c8ea0ec8a1b04eef9906d70068085df44854db669497871b79fc63d45c11"; + sha256 = "538908abd12b8dfc8beb583811fb1629e496222463f9487ba3e988da2b0d1ddd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/fr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/fr/firefox-110.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c24683241f0c962ded1f590f8cc212ce19c5216e0b754cdaae28e52d9460252f"; + sha256 = "7ba6d2259d7a33a98834fe7ba3f565ab5a412af0001d83fed5c449089a423fc9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/fy-NL/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/fy-NL/firefox-110.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "c19b91a2d9d5fb56732f291e02b377ec9e2663ed8f2117b4b128672936eb7970"; + sha256 = "1ba376f24244dee62fc296ce26e82db4f2dc27a73762a773eae63b24634f7627"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ga-IE/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ga-IE/firefox-110.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "38757cd45dcef2741353e0bef04a7141d2b87b983572ace81cfe06d7713468ab"; + sha256 = "ec0d2db7e771516515014f560635b03519797cf040c9ac53fb0bead6c553dc5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/gd/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/gd/firefox-110.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c5f539dd881c31cc06f6597bbd37bffb519558a0181f8da91e24e23e08c5225b"; + sha256 = "cb20591866003e56ae1b9c99a0c124754e4a3dc2798596c2629eba16b51ccaaf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/gl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/gl/firefox-110.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "52d08dca49b83ebe8b5823a2ba9cfae324b44859cad4c753633ac508cbda1fe4"; + sha256 = "a29e76b31f75aed4df52dd3fe2f9b5d7a9649e010eee36f7bb964f988d980270"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/gn/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/gn/firefox-110.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "918ab16d347ffc8173d86f4e16d21c60ca35eb689562ddccdca3749e8f6776dc"; + sha256 = "edbdf1000de809a5bdd0350f1c49e505cb593273734d05dd3ddd46710729fc78"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/gu-IN/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/gu-IN/firefox-110.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "3a053e21a6aec9477f54d91657a18ab7fa939fee4038ffeb3ede70ecda77e4e5"; + sha256 = "570089326d80d06f013111020e6dcb87563b78cf0f5a6cd69552fb6d86255752"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/he/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/he/firefox-110.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "3515257b8df894fb881c1cc8dcf5c0221284e7532abbc71e1a46187b115ba817"; + sha256 = "ce35df979ebd3761619174de68924dff38b4ff65a150167db195f8011bd2923e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/hi-IN/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/hi-IN/firefox-110.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "6c27979e2870c6d4df0266ebec119c4eda5b5ac5b16a9fb3a46c367d57eb8edb"; + sha256 = "b0793b48235be330e2ed749e152fd4a5f8f76fea88e2b4e192cf2c2c1a3c3c08"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/hr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/hr/firefox-110.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "ac4639b888ca62a0d20b338be17838c59608fabcf6ac30de43325db5c1330f39"; + sha256 = "898793ef521956f564474d490beb0e3a77be2b6c20d790ac14b20e6279075864"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/hsb/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/hsb/firefox-110.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "8c0c095301d64fa1eb11c53cd9dacaa712433b4e03e7265fcd27e0c4dc434405"; + sha256 = "bc4dddabb277b88180afec6c956488315e95b4e31a95f0969936f85e3adab5d2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/hu/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/hu/firefox-110.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "cf72a10c7aff8630e303cf28674a9eafa7d836350e55b2cfba0ef887bccdf013"; + sha256 = "8f9e755fa8c7b9173ec6e6d19fb0195e80e9884434812ec7b4b61f26596a3e95"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/hy-AM/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/hy-AM/firefox-110.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "3c9432fd5bc0cb1af24d02044db04fdb5fb17397e9074282df7d3962615faa1a"; + sha256 = "db36bfdde0fa2b148c05d6e2ff147f1cdc3adf2bea469bb13057e157fa80c2ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ia/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ia/firefox-110.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "6db076b844d8e48fe3563784e0a754a4f2e811b758a3604ab2ea357f48cbbccf"; + sha256 = "d2cbf20c9e43d8332c1fb24958e281438be856ccfa7a4b106e2c9bd95e4dc065"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/id/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/id/firefox-110.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "699d78cb6a5342e574b3cfca0bb1e8518b09c925a3855675a6fe89e4d77e641c"; + sha256 = "14a10b4dc15d7e910570f941fd146d8e82bad752557e710c8c676f427bd289d7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/is/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/is/firefox-110.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "0e29f520b0219bf52497803248b61c4bffb7ec79b1a103e912a51a2118805c1f"; + sha256 = "fbbfb16a9525665d9c7212534cab21922f547f0992734fb96ddaa4099914b0ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/it/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/it/firefox-110.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "2131b1350f2a1e6a5fd930b5f22c7859c12ab117d5f868949775cf24f17a4aac"; + sha256 = "e8d3c681149aa041480165eafcaba09a6a05fe4f8297d068b97899eabce9c2e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ja/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ja/firefox-110.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "5dd23e5287c03d3c9a14fd2dfa880ba291c9b25385ed7eb28c496ac7ee6fc0e9"; + sha256 = "ca9ed83b48cfb7218b718af754a091d2ff7bba146f76f01181ed4be1b581a9e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ka/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ka/firefox-110.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "205df0df84d91b622099cb2e87c14b9faeecabd55463c31fbfdd3df98f3d698a"; + sha256 = "cc05de864bc532d9cd659b17b486ae6ff4ecc9f71ccd74d34c51cc35018ddb65"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/kab/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/kab/firefox-110.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "42767106aa484e7cae6e123715ac4a9e07059cd0924718b459155ceb54f72ed2"; + sha256 = "907b54cf52376a82652926ee91b12db7444e481aec18733d163eb4e9ff29f814"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/kk/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/kk/firefox-110.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "0e36661bdd87256fd7e845f62989b1fef89abada607d1e07cf166bcbf44906ff"; + sha256 = "5547347e1afcb9a65b48be27d44323d104d9bde2b47509e79c264df257cd30bb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/km/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/km/firefox-110.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "61ec390dfe07670bbe409f9ec14bdbfa1e46b3330f004e77f42cdcb110396ca8"; + sha256 = "ea079774e5f57b38e617cd2675a1d4a98bc890b02006a7632914bd91de42f2aa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/kn/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/kn/firefox-110.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "cca177d1cdab2e31771cf8f978f25a0c9e50ffca81737b8b067509cf8d10473c"; + sha256 = "32099eb48e8f1365d8a958fdc9acbf9e8f74822289aea5c180ad7cd557095ac3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ko/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ko/firefox-110.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "9ae1f47be6ab2a2b18404fa07d080f35e814ff9f64e80303ba8df34abb545a1d"; + sha256 = "8f0aa7bad3ea61a41b7be760e4d7d720f694a1480f3ed1d7006d96cda65065dd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/lij/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/lij/firefox-110.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "c49a3b55da23e8751f06a37270b07b1744ee5d3d684ac0e96c565690f2d4dcf6"; + sha256 = "21348cf4a7808eec0f42cc4afddd01b103d4f289d59b8fe36022a625db89278b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/lt/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/lt/firefox-110.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "a8076fdeb3bd6560157fd18204b86b8abff52a3cedfc25d8c8d5e3c3f2e34554"; + sha256 = "5a8d6fafd65e90ecde3000a1fb7724ddba69c3f08e86ca2a5ad841994eb4971f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/lv/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/lv/firefox-110.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "0de7732546820db139d5a85b80f7518093d0c14edc901060fae19f0a59241fe1"; + sha256 = "91758b8b14251fb17bbdfc6ee12dcd1c677c0da8e422eda05ac896e436affccc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/mk/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/mk/firefox-110.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "7e8248f5a3f2de82becd83a975aa3c347e260a7702851d323e53078965c03123"; + sha256 = "49c08e7b1a57dfa10325ee65cf155d64f9e08190bae2487431f2a91d64f97446"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/mr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/mr/firefox-110.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "435d2bb0dafb1dbe1aa62cd2041da469fe8df58013891e03ad19413bce1bc0b0"; + sha256 = "a11875fdcf2a93dba485e72b1fd908c14b43ec97096dbbe78c37ac5834f06f1e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ms/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ms/firefox-110.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "d610e52fef5e4789d8366ffb524c7c62111158bbe34c3094c298b246a3c3fe20"; + sha256 = "b4664837f25808a7e0f9a3e9570e8534f1a5e82fbe51137bcafac91fcb8ca737"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/my/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/my/firefox-110.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "f4ac639edd293fb8f34a9324d908d89a8d428c71c85380a73bddb7b495707d46"; + sha256 = "f345e87b07fdb431c4c69f96e83fcfd4aaeeabcbb0fca6e6d3a71c263d710b65"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/nb-NO/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/nb-NO/firefox-110.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "0b4919334e0de23ba64d448a62ebcc35ff040ed7bf75e868354d7f610ea31c13"; + sha256 = "006ef1aa2500a795782fa9820886ae7d201ed7380cd488618e9b5eaf3263aeee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ne-NP/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ne-NP/firefox-110.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "15a736fe6fc2d04174a0bdc87964d2d4e33c045a38ade58934e1a71cc2e1c0ae"; + sha256 = "dc9a7c502bf5395e7976e3160865fa8360b25af396976ed95c21e8bd84d8226c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/nl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/nl/firefox-110.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "cdf5f69f88f0db3e8d6a0ff8be430741a9b8df2e890862816a1cf1bd706fc81c"; + sha256 = "d9753724c425d3c9cadc20436a8995f591720c30668f0453b036fcb65b67c30c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/nn-NO/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/nn-NO/firefox-110.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "6493740642533d83c7fbd3124d817f94ea32bb2939fec72d408e3d74bf9c4cd0"; + sha256 = "6e776774da71652b62e4daa4b4e4600ce2ca2eaa68fd41acc127fec17a21e0a0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/oc/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/oc/firefox-110.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "d70abceafb8033a4c080a17bd7c15fb049e583c5c072014907a0a8b19a4da1d7"; + sha256 = "5f3405900c6b81198efc3b22ea77318e3fdd8984e0f6410adf3f66f7fb39eda1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/pa-IN/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/pa-IN/firefox-110.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "eb303ed66dce80892043b0e0af13f3733f55724b8e7f2670caac1d296179f5ef"; + sha256 = "5efaee9f9eb16fbf1b3d3d0bb4d09c0cf451dbe9dfc27d46e85d2d80c1b838ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/pl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/pl/firefox-110.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "2d110e659700ed81859fb77614353263dc6fc6d9cbe968cd968f82aaa2748c05"; + sha256 = "65b9e3e1155c4325c827871c1a236932ab210fdc0384078dd5f827b7454ec5c8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/pt-BR/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/pt-BR/firefox-110.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "b5108739a4db70d248fd3d5af10bae3d3982dbb42f6f25776b2913912af2b3ee"; + sha256 = "f23cb718e99fae10967cca330ba6bb6a28293ebdaf9b6681c3eebccbb8555281"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/pt-PT/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/pt-PT/firefox-110.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "00198a7983080a49c7e0297f31ee2ffe951446a2ce00053646d72132d64280e9"; + sha256 = "c0dcaefbe0a00e2ff8300dc6b23f25cdfcf02b80f43cafd0f5c23db91635a784"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/rm/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/rm/firefox-110.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "3178df44ec2b220864ddfd3c7efbaacd3f697c7f18c64c921af70419ab2c1279"; + sha256 = "1cfea13a5987f28820caf577927cf464950735ed7fa23c05ba59e0ce41628146"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ro/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ro/firefox-110.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "6fef9cbf2ab8b166f3c3acc0536bcaf685fae7c936c3dd16d09bca39a567b978"; + sha256 = "82c36e3645da1a77917a8ba3ae00ffbbf82094cae66d62740da6d847e3aac9b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ru/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ru/firefox-110.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "3a444732572fc6b65248b51c116bfca5d8a3171402762746208943f746393256"; + sha256 = "c48d252b64961ab476ccb8a85cf5802941cbe90448be72d8af69a31a952962ed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/sco/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/sco/firefox-110.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "092506a707ce1e6c9d0b33050b8db0beec06dda92ea12c3928a164136c08eb46"; + sha256 = "8908f00ab128111535f872463fe3a7e63e8bfa6d35af31169d927464fb5097f7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/si/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/si/firefox-110.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "83832ec02c320c8a169181460294b9e7a8b25141baedcd325953a72b096434e9"; + sha256 = "eb069f23422fbca8df06fc1382c684e74c6af5dcd01b58d9d6e190c21a8bc493"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/sk/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/sk/firefox-110.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "aad444baf5e50efbcf0b1315941b3c0cad14b454b73a8a2e6b43136285f396c0"; + sha256 = "c485954037807b81acd348083292ae4fdf779727593c9a1fe97ed094a29ddc15"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/sl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/sl/firefox-110.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "6b5054cdc35cf6350f32d8991997da8b6a95b1fd029aa100635f4f2f624b9bb9"; + sha256 = "c6f506b0d14582b2db01e766a9da73c3b9385eb60782e99aadf5807aedb02426"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/son/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/son/firefox-110.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "fd2ad8f414e61c405a630d978cee53a1d5611e8416065d68b04393cbac82d54d"; + sha256 = "50603367de317c86b042a41996fb47f35cb7758e1cf3c48149c4a892e31d6381"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/sq/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/sq/firefox-110.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "5a7d9c15f314a5a56386096cbf7d21f018735c060b0ef7756d3d3ccd1cf8c3cf"; + sha256 = "26b278dc225b3bae852b74f81e8898a2b5f30cfc242971683d4f21a345f2dcd7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/sr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/sr/firefox-110.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "b64b59f6dfc85b8b3790656d53e17379e4bb0035fb75861546ecc34d86be6047"; + sha256 = "70032ae28bdcdb00d8a2b9528d5d09dcf67316fb91ee411539c59f3b3b6a075a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/sv-SE/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/sv-SE/firefox-110.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "46d7fe9022e4b8d8fefd52936084fd2677189df6a286f05b2b6c7a92163e5909"; + sha256 = "10fb48222a2ffe31576784973c305d02aee180044e11298b2b97e772c8518933"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/szl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/szl/firefox-110.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "a5a5b6242ae86a4d3f48d3d22a71ae9c9b0b93c6010d6e345ba655e3124c8acd"; + sha256 = "13039a67c2cea4dd2c128665e25bda28a4334465311417db6ee71846c440e754"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ta/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ta/firefox-110.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "8540b9a0fb01c49bfeb44733f77dd4d0a312740043a4a52a9ae18ce12ebdd20a"; + sha256 = "66aeda2367e34915e9ab8c284ddf4f6d10d217654f0aa6663e50bdcf3f4bc2f1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/te/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/te/firefox-110.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "36bc5188c2a40ccf65aeee7a2b8bc84469a238ec499191035809da7525a8178e"; + sha256 = "f9a617f3fab610d6600a7cc8b118785ad77b9cc0447f89fd55f2f4acb4444226"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/th/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/th/firefox-110.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "f572ac21842a64d68efef460401ef2f385be8fee6c4b8561a91fd7e01529c940"; + sha256 = "4d4194bc163d7ad55cfde98cf2324a6a719b60c54f27a394c58977582c99989e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/tl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/tl/firefox-110.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "af523fe20aaba5916ff94c87d01de9bb863c6acf2e0ecd52de95d2f00055378f"; + sha256 = "fb559731bb3226c4963158b1cb8332dac7e71c0a975429e112e456f2a9f3863c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/tr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/tr/firefox-110.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "55a0d1bfcda389522cc66c5ff74e0e9b32ac6d94307f78772bed2e8dcbfc118c"; + sha256 = "0d6e05a3993673ab612319e3b287893193480a0a82bd3e1d0f9adde5b7b43c03"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/trs/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/trs/firefox-110.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "4da3eeef1c5e4ad09e8ddf9439f5197ee43e95d062080f1bd09d23a60f265f82"; + sha256 = "2bfaae0ea692e6d65787ba6751e24802dc458e0b17e1972290574d612536a0c8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/uk/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/uk/firefox-110.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "928ab3b1483ae5bf2ab07c32ca7af9fce4dfaff69ce189b45197136b4ee178d7"; + sha256 = "410016df2f79e3a14210686ca594f6994bffedf73eeb37d536a9ac206e731e50"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ur/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ur/firefox-110.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "628eb5d9b4048db3fab56923dbfead5a21d3af0ee819c2a5a810583888b33d0c"; + sha256 = "cec6bf39cf4893c6430ce679b9f3115308cc846e9008083bc97ffd731885bcb9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/uz/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/uz/firefox-110.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "712d563f7f2437e019478564153b10fb13aa9d83fde0ab6908555d045d7044f9"; + sha256 = "8a7d363a41ac5dad399a6215186affc9a4a4e4fd56c75f5ee0d43b0b08eb2739"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/vi/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/vi/firefox-110.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "7d2dbc1db78ca3ab69660da995d0b34f06471dbbd10d80d8cfae41ca7cc9e063"; + sha256 = "187e08e5f39dae028c6b0d819eb570f4881171b6432fed2cbcbc732288a98b96"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/xh/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/xh/firefox-110.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "dd83264ca6c61928f587389c79941f80f6b546aede6bb45db60338a5a3120944"; + sha256 = "1225b62db14ddd681b1aac4b40064c9987a1138551655dbc5c49f12b8e47c80d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/zh-CN/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/zh-CN/firefox-110.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "eb11a06b2a26975e101c6d7c7a4123078df43444ceaa2be32ce4ffbb5ca07803"; + sha256 = "2ae18aa0a672b35d15265e26bcd015bfa93ca8fc76911301ac1b0fb214fab1a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/zh-TW/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/zh-TW/firefox-110.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "127c49f376459d60f2fe685b1b238c9bef0f85ede30d383a41cbff760ea4dbe1"; + sha256 = "91a601746d936b09ceb20c6e71b2e66337cf6dcf73a5a8a49e120b242b9fbd09"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ach/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ach/firefox-110.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "57335b5daeaa76fa4bc6c81f6fbf2068de26534fba08f5115bcf0b217d469675"; + sha256 = "4b6c3439750c59a389a92977502b69d21823aaec8a8a369ccec947cc0ecc6e11"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/af/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/af/firefox-110.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "99d5a7d122b39b36468c6472c29ef7a813c0728764dcc1d91c57291d314fcd86"; + sha256 = "40fe16b22f74bc2b03e46df4845158b6f5da90eedee86a41a2d65e1212bc6f1c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/an/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/an/firefox-110.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "caa65ff6e9ca252c146d5a5dfd7dee69b814f9943632c8781e0d29506904aae8"; + sha256 = "efd1f055797cf33cafa891ebd6bccf159f65086daa56ef82d43b4db54f37db8b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ar/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ar/firefox-110.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "9c8c4584802b1786a6111c3b75d54a89f39d0f2c732a1a40c914d3a7ee6ca1d2"; + sha256 = "bd9b5d1e9e7e3abac4db52e0c37456dfd5a4eb56a8ac8b0505fd04c0d30df6a4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ast/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ast/firefox-110.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "5bd64adcba15438424542d9357f23805bfc408f42ea7e0cfec7b3adff194196b"; + sha256 = "12238eaa1d0b07932dd8ee5a9f80e8997f7ac53dfaac3f444935ae5a6f4642e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/az/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/az/firefox-110.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "93382d3c467d99b894f0947ca2f94b1be28bb593006b96ba444d24bcdd0e3ad6"; + sha256 = "dd97327299ca2972451a94ab969f6242e1ee80b5b5f8b4a8d3afd7a6c4df0ffb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/be/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/be/firefox-110.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "0617175ed5698ccffddbf7054b5367408e482272ea42fe703e66735a590d5093"; + sha256 = "95c5e5c5dc279301b4110d32f8f6517567986522c7fe5f7b23161a3e8d74d141"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/bg/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/bg/firefox-110.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "89ba391d03184879c8d09bcb5077a877034e84a00c738e3cda4240282f34de33"; + sha256 = "5733949bfd0a8dcbec55cbcbf2cc8cea9cb06929270559dce8ae0bf04aebb82c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/bn/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/bn/firefox-110.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "553f57b84d7fad2af979dca958753c40170cc359f6a4af4892ccfc58a439c395"; + sha256 = "9a8e143e9038dd6028a7da697d72ed9410cb839e635dbc30b0ecdb11b0759bfb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/br/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/br/firefox-110.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "ffa7443da877f1ef6dcb9ce2280b8133509cb90d5c632fd3710229a47bdc20f2"; + sha256 = "7d87af6eb4d45bb0c3db1469c000a116a5531ece9767e5d732f5fd5d44873d34"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/bs/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/bs/firefox-110.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "9e948b2775c34be6f94435cb8ce1d1a99d2eb55e83715add8f704de0cbb7c4b6"; + sha256 = "59958109f2cd19548c76a03450f77737f1e793f1d14490d501990e5243640fd8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ca-valencia/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ca-valencia/firefox-110.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "703500d1be715bc14d6c2221f45d9d31fbc73aa9aa4fe6be0ef23d08ed6f3156"; + sha256 = "e830fe6e33bf8bd5508d1f31a51b177664897719efee4bd80ad9f1874769c541"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ca/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ca/firefox-110.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "2b079bf277c96d11b9eb7bde744910ddcabdf9024236b042edf72ce0d4450f53"; + sha256 = "e5d84bfa1395fdf797f4eddeec0f99fcf6138012afd1ca9c4fbae4031b542130"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/cak/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/cak/firefox-110.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "6e8daeca403c0a928ddae33d7b78c2bee0c32febc0c1d56c5264d04811dfc34f"; + sha256 = "d9c5538b25a0c277e61b6ec5bad760c203b45ab8f607de3620de6337678824ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/cs/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/cs/firefox-110.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "e1d74e5d1b9e53107e3597e3673d129067e8e75f8fca61cc2d09535aaadee3f4"; + sha256 = "bbbe1ac4e17bc1c86cd35e990f30a167ade5d3e50b2b739a35b81ec7ba44315a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/cy/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/cy/firefox-110.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "941572c6a262141cc4359dd13d248c61b541b9a9bbaa597f187bee5b27ebc28e"; + sha256 = "b42bf9a0093006a9580a4b7be0d6211fe7d73a4cf92d73d11c8c6f310400abce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/da/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/da/firefox-110.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5cc8990bc3a9426984523ca6a49fb5f2c4fe444b42e415dfbfdb2004e9ad2eae"; + sha256 = "c8bae91a80832cda174a9156ce4f5ea8f27d1ee951ec2248c3a14e95814cc4a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/de/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/de/firefox-110.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "644474d4c128fb6eadeb22b9c89c3d6942cbe391515aeb1c046f01dc0986f390"; + sha256 = "6363710caa0789a1c09579919a4303f7738b5dd79f4a975f79c8aebcb8ff1c43"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/dsb/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/dsb/firefox-110.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "394cd9728b0e4d722e13e1776732c8fd38a6e0df331a67f365518a66c1e7bc4b"; + sha256 = "f7806c9e4f73bb9176e6f37f00ea945b246b52b13d486819298efb49af5ddde4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/el/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/el/firefox-110.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "4848172f39c90095bac18808febfeea415c073382ab5efb115a57935267d867d"; + sha256 = "a25be78d906d57d759cf8bde280f1ee813c88a2f40b5977de944b40a8a3b1cb1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/en-CA/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/en-CA/firefox-110.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "607d27b3c7df703d317264b0441840b33ad2844e7919fae6e3e6445e14693dc5"; + sha256 = "8b21e8635b1e3e747497d431e974e764ca35e662417200120669cc55b22147ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/en-GB/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/en-GB/firefox-110.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "d105230556168f5343a2830537a8041c9a6027e0e60f58ccca986257ed478379"; + sha256 = "8cbceca22e3a3d3541ac89fce5fccdc1758469258df28e0b271ecbbc162ccf9b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/en-US/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/en-US/firefox-110.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "5e341f3c5a01324f4c46ae13c42634b2d478207c4296a6557af2e42ceade75a2"; + sha256 = "380e5d288bbe0d33a144ef51059e0dbfa8586b8a17c4084a9c00b11a66aab816"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/eo/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/eo/firefox-110.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "da156a9cae2623be71434bbf0d38a0dca95cb408955a03a127d1bb3950ca9a51"; + sha256 = "d0b7e7a4a5efd7d86eff1f5e5ead40be5c878f1ea72e7ee7d23c385a38a69a64"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/es-AR/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/es-AR/firefox-110.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "dbdbe6a406b7f5e9c8fa526d776384e165154ce5abc7a0c2eb3e0d5f026551ab"; + sha256 = "2434f4d2522614f2c6e12aceb84a4148577eb0e8f86b55a8fe6b1b39ebb03743"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/es-CL/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/es-CL/firefox-110.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "16b0535460b2b64cf6cb30ca911360f2aca58cea3cef5fd982d0ee860d70f2a4"; + sha256 = "f54355926490abb8ba8499563389702dc0ba40c793f7de8da188b47a95f397ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/es-ES/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/es-ES/firefox-110.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "56ca17e71f3a4b65bbf8bde6cb66928ecef65bfa50b52b67be4ae28725dbca39"; + sha256 = "22aef078ccc04844bbb59de7b1226ed3a4435f2a46448ef0ba7e9796c69ac2f0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/es-MX/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/es-MX/firefox-110.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "66f9a809359f2a5361507bbb71b02f1d3606b13de76e6bbe5b3e324e0552bcbb"; + sha256 = "7ec6a9ebb479adff3fdd894a1992e1377cd8aa898126b7a51d7bd3e8c314a2cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/et/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/et/firefox-110.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f201c1676d3a7531c2a239c5f79278507da972c376f17653554a230c365a63f4"; + sha256 = "5c6d7c0148d66da0fd6394a38dc1052df059a620285a8277b0b166b57f96e3d4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/eu/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/eu/firefox-110.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "88393f69d7f41f6cea9ff23fad774ff14184499c132ab9daf3b1ff0fab595058"; + sha256 = "16d393fa5ca5bcf93da4d1e469a025482850b88067c0cb601e1a6e0373bfe4ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/fa/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/fa/firefox-110.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "aa0a49410695885f5d5a99650922c6b4d2637c5507d0e983332a3ed3c7f4301b"; + sha256 = "a7b2e5e4b4d3d43757e34ca07de604a94a1bb069e030e3dd5d1e8adfb5446ca1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ff/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ff/firefox-110.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "8f495bb9c14f47e2c9828dd20fa91b6cde5fec3e278ea50cd21116baff6974e2"; + sha256 = "a818607d5b9faa7f10f1b887e3d7ab31773e19ac4fe1cdd902d71d93148b9e34"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/fi/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/fi/firefox-110.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "c51c3261059a365ecd8785a48201cb59011efda24388c553cc76d7834ae08de2"; + sha256 = "c8fa7b5af6b02f9cb4076a0ae213e75d386f0740bf8f4560fcfdfe8b15ee5bd6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/fr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/fr/firefox-110.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "08a3ffa8e03ebbf8e2f814d682e7814875ac844f7bebe928049de1ae0ab5018a"; + sha256 = "8eec0ed9afc6199bdcd7ccd1ad9742c5a06ad74f04c617f828debac47f81b623"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/fy-NL/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/fy-NL/firefox-110.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "7a4cf93bec3fc86dbe2709b27c1f264a1e316e380ab04d4d66517755f0de863b"; + sha256 = "a91d8e6b007264530c829ca6d49510f7c452cdfa2cc8bb6939a5ccea1ec2ba44"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ga-IE/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ga-IE/firefox-110.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "a8101bbeb8a00ed611bf4e670c0f49b4cbd0ae46aa063210d2b39e06d1c9b1e0"; + sha256 = "2029d5533e77417d4e696872cdd3f95d06120fea1fb50d350e62d65e85e71765"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/gd/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/gd/firefox-110.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "cdf9b52e93a84594458e13661d2cde649a6b7001d3a5b31619b0e75f01ada8f5"; + sha256 = "d85048cef87445e131f0b0cdd25739cc6e792eaa3520b583fc9231182c2a00c7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/gl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/gl/firefox-110.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6f9c35bc3b0cc24c24cc35c1d3f7a9c6467cc1670aac4d06366a12e5d83e0054"; + sha256 = "3a4ff2e4f8f4bbb83db4dfedbf2584ed1db3250c725d3d834926ff8e1129f3b9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/gn/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/gn/firefox-110.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "f864072d648ba2c65527d8959529aaf669b4c7d809cddbc13466bec07d565da3"; + sha256 = "f0a92cab7f2fe2b81f92d3c17ca43d3a7598f7ed879a7ae4daeb303500a5c5c4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/gu-IN/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/gu-IN/firefox-110.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "da2b9782d72dd90ddd07b5c8bc3f236edea5de6844b500d59c46a792268fea0c"; + sha256 = "076dd689e5397f0a347db0ea50c328e097e1fc75633ddb65867ea2edd0ec8a4f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/he/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/he/firefox-110.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "c0a764c4beb2cf80b855957e60146b219f55d21f66b0d9bdd5cdb6407eb9210a"; + sha256 = "8a32c0f4b791f6036e04776229dd4676615acb5778800bc8b227bfcc19b5516b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/hi-IN/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/hi-IN/firefox-110.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "7dce018cebdc611df784c44b402a1a651ae37b6705ff586307a00c301444e680"; + sha256 = "cea795afbfc273f27cafc9e57ea2cbd2ff66fd527289a76e606d55bfef1c2c53"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/hr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/hr/firefox-110.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "9109f2de571169e3bb956799c13d7f051537de235720d06d422574cc2e190e73"; + sha256 = "c6ad7e4b6aa871ab89f6ac9d592fa624f081930f9846e1b26b8b9853161def93"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/hsb/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/hsb/firefox-110.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "90350658065ef477695de5d914dc52ba281f8c7391e4f696c88419ff1ced46c4"; + sha256 = "38bc020e7655190a60ca8b61335c5a17dde9e258a7829e675257e932fda8a98a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/hu/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/hu/firefox-110.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "24154681d63cd159b477fe8b71015f78e807ac5981434c52bb112ffd0b78befc"; + sha256 = "b09d278de29d76c2165b7c69fccd9841cd4dc8d38f41bd0321f9d19840bcd3c6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/hy-AM/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/hy-AM/firefox-110.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "8640d2546a751de4b6391f7ad82f1ce25e7be24d9d00eac1521ec138b27bcd06"; + sha256 = "3da24edb261b08399afcecb5e7dd87209655bb80e990f31954f211aa214c6682"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ia/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ia/firefox-110.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "385beb332d252bf030b2f01a28f6eef99aded89c0d12bb30fb3a7b192ebff8b4"; + sha256 = "d0c176e5ab1cda84944b708c0c82956e244b9fe8fe371976bbc00a752605eae9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/id/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/id/firefox-110.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "8e0d8a58a74752c82db369a2dc9131f420caca8f6bd895a015b22971cebac393"; + sha256 = "191547c29106ded2b7aa4ac8be95d70d6485ed934b7d8f14e92660db413eebe9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/is/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/is/firefox-110.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "4e54090a91c3aeb6ceb6379fd8c0e4482bd83973235ae6127ba9f07fff392576"; + sha256 = "d794ff4a91ecd73a199d31392601817108c3e60d7dbb23620abff361b064d2bf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/it/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/it/firefox-110.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "15537017956686f5fa7aa4d0f7e03666ddb5dd174a45c2102253c3e4f6183e2a"; + sha256 = "0f2f16a7d4a1f6ae71f403211d9448597fdb6bf179846e425d03d823eac7b995"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ja/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ja/firefox-110.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "62ccd8504e78ef520153cd6e939d129447e474d5d6082208fad19ab2caeacb4f"; + sha256 = "2ca0bc651b02daa555ca4a065454181e14096da0c375a181d2ff87fb2d2ed1f8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ka/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ka/firefox-110.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "6a1ecf4c834953bbfc135cbf7b4bbaf977ec88917d7dacb361c9a46df4253ced"; + sha256 = "4f941d02ddc7a1222418565b243bae82d0d214dbaf2040280632ef2f5c1e734d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/kab/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/kab/firefox-110.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "ee31d4db88583814e8c093b74cee46d36ab2f5595efcf0c89b096f3eb41dc2c8"; + sha256 = "6c53d1419966645bcf88ae4aec7cf858b91c1185d5041cdb04e822931dac4bbe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/kk/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/kk/firefox-110.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "3134a73eaa3ea7b63b986df9007cab41927239211d8b6ccf8559ae5cc41176bd"; + sha256 = "934e6b854b47155cdc46e189442fbf41e1d1de2ba828f3c63009c3a1d43ff29e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/km/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/km/firefox-110.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "aa2c336739c86095ac9096e41f33024750aeb22ea81a229fb72ebb2521579d9c"; + sha256 = "6809d8143e23e73861a3ac998aabc12027e91cffd8e963a55da041c3940365e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/kn/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/kn/firefox-110.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "492a094b2bd9dca63bff6e3d5a8a065fa9f69ca8bbbf72b339a5e8468d787e50"; + sha256 = "8be5a243efc4887a44a3440bd3c894f0c45a67fa510bf1648f44e5640f0d44c7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ko/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ko/firefox-110.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f028a4bd71ba04473c97e9a82889c351c88e60d5e417b3f130f42540284adb73"; + sha256 = "b965d61600c1abf44428478f4eb92f7e3e2dd276e79402be0bd4023feba935b1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/lij/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/lij/firefox-110.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "139d520bb1d60746ce182af6190d6f9a468f0c9c08d94fd4fba938cc237cc344"; + sha256 = "bdefa9af4a13b676bf7c818ac4efcb9a5f2a2d12705d7ba36571792be0695f20"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/lt/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/lt/firefox-110.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "c095a85748064f7c1b420561676b87db0c0e299083f3b91f17abaa7361af690d"; + sha256 = "c73514da05816640f9ce48e778814d257a3004e12970f57354454daa89966a73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/lv/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/lv/firefox-110.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "abef8cac24688637da6e2bf57c3d8ad84d061c9c0500d6ade9a0e447d998edd6"; + sha256 = "e7d75dc5dcd6e546e180f8652faae7f4a9185ce08988734385baecd405434751"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/mk/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/mk/firefox-110.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "ad67d4bbfc76ff7c35a2c33205c4890fff8f955e0a325aca0998666b766f84af"; + sha256 = "ce0be71233cb425fe048733efa8752a97b735f87eacc9745d6876dabb2fb86bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/mr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/mr/firefox-110.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "a8ada8b1336f809010a8765f94aa53877a8df05b0bfd5ca3bc050941269f58e1"; + sha256 = "827c6b9756972ba8d50650b561913942655a8526250729a73f2be1db2b8cce33"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ms/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ms/firefox-110.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "e9bbae9bdd930d5b623c30d0085e1572a6069650d3f695d95a4ddd136260240e"; + sha256 = "c6bb360c3c75b120d1b60eb4e0b036fb4b740482279bbbd7901c27fba5c54d4e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/my/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/my/firefox-110.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "b2a62b8c38f287135874ff7c63df66a48172b93f48085c38a7bf99ef7d788ab2"; + sha256 = "7ca65e1306d0a81cedc065e65974b891dadc8b5a253239c68b92e8356e1e803e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/nb-NO/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/nb-NO/firefox-110.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "fb9352cf1cb309538f021786132081c2219505d868e5889af138cc794d46f4c4"; + sha256 = "168e9939831e146176542fb61d3e86b05a5cfc911143e6f639563f7f0f3e6be1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ne-NP/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ne-NP/firefox-110.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "0e46622ba5f562ef8609f77754354e8614d464b8b05a8ec57d9afe4d724bc9b5"; + sha256 = "7618535a3942c7cdd9eebd7e07095e70ec8500aec641de7cbe1279cc6a65b5ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/nl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/nl/firefox-110.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "96d5af3ab9753e7fd182d94076cab889a749d5b4684cd94c46ef863403516fff"; + sha256 = "a8232e3ca17a2bc13bc16f44ccaca500005aa8a6ab26302d10af6c7d145a942d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/nn-NO/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/nn-NO/firefox-110.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "bf2bbdcf7b7b734fdfad845cd51514ea5d529a30f487d0ebc6631fa133e549dc"; + sha256 = "b0713aa09bf6329abaa77791777d4a128e20c3279d07665912fc528524e7479f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/oc/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/oc/firefox-110.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "a1dace30cfaedcaa2d3ae6b2cfadc5f646717b134bbb780ca15920d903fa49ea"; + sha256 = "830744f6015dafb560d4e9957467864d91f534c8a6646558bc6391f62f213949"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/pa-IN/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/pa-IN/firefox-110.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "3c9272845ecf03b477faa8e424e6ed91edb5972ae7d12749951bd6bc99f5f9ea"; + sha256 = "655100186a68188c159a0927bba75d6534e932dd6ce613c91ca48649eea49aa6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/pl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/pl/firefox-110.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "013875909c5d604eb7c0da6a86253b6c2144b604765a60129b12af0a2619abf8"; + sha256 = "2ddcc433c1072c76f76601c259063b3e582a690f47ebf79d49186582e6aab3f7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/pt-BR/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/pt-BR/firefox-110.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "70b0b0dd2c09cb5bbaeceeaec7a9dc3b1398ebd0fe57ac78e0cb6109320a89c3"; + sha256 = "57bc3a85b39d738d54f9326e693c99f0125f8ffe1e380023b55d372afb4c7c80"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/pt-PT/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/pt-PT/firefox-110.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "7aa222aab2459d2b760f73241fd17991cc383855dcb290aa9e5368ed8544daed"; + sha256 = "7c6169bebb351077bb7e290d4448eaa97d12c964eacb890d1ede10c2f5d76d8e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/rm/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/rm/firefox-110.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "fa757433e9126abfa094b211ef8b4389673bfe0f6fbb4709250fb0a7d3faf949"; + sha256 = "0d870b54174229b3763dcae71b2b3198a426c230d3598cf619505e1ed35d6add"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ro/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ro/firefox-110.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "a955c51bb4c2d6b0292a2a7dc5c56df0508dac685bae09e620960678fa1dcf18"; + sha256 = "5cf581dbf61a962c255fb52a1072de263c00da1be74771525649469d2a9fd3ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ru/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ru/firefox-110.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "ba84b6c4d1d3eb41da9d486d34f0d9b6286f162b9587aa572b17aeefe8a003f5"; + sha256 = "852eacf7321fef6bf9ba241028a0026370dd9fbbb0be77e82bb8068a98677aed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/sco/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/sco/firefox-110.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "e859e8de8186aba80591da6c2a47cc4ec1ff48fdc9fde6d24d4ff5304063fa6c"; + sha256 = "0069ed75e547a028f6140678d93356ed2be04e896d502a74c45b4e66e1dfa509"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/si/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/si/firefox-110.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "98d731c72494bcd5f1a52a04f8f11358bca0e66e43f6f46fc8353f1a8fe577ac"; + sha256 = "9efcd39e2194b5ad1ff94c17d948a293bbede4c8b5eb9dc3b22d79064a93c4d4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/sk/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/sk/firefox-110.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "cb1c600cd02b101eaabcca079da9f7a93d0d8c0cf22abcdf0cff0fd6ddb44e64"; + sha256 = "81f963046d3400bcc95ada2c114e0a7a8d852b10a79297d51c42cd4144499ed1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/sl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/sl/firefox-110.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "72f9c493592af61d614d13eac2b720955a6eefb2f15f8d8ae4fda7ec55d46f3f"; + sha256 = "8c18f9736f2c647286f4a594b769364e2f78fbbc60c3ea0d30bba25675f6bbf3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/son/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/son/firefox-110.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "7797f3e9614b44f95d4769dacdac0f89e04b03bd058a9029cec7a9be6c4f4e28"; + sha256 = "dc563e36867cc4b66a644b21b76b39eca8208dbef75dda5591a2cf7fd1d3fd4f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/sq/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/sq/firefox-110.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "e89f48aa57c12eea6bdc501e51081b51c32ee39328a14355a8df97113c5e66d7"; + sha256 = "7e6ecb27a4827dcbe8b69a9dd1333e18e059b93134fe09560ad36a7a3cd487cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/sr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/sr/firefox-110.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "c8c92f2ef7a95dea220347efe80b21ea614770669773e1f053b0a8f292a44447"; + sha256 = "25506c620fc67d533d67508431e451fbc966c0f51d0d95fff019e726201d151a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/sv-SE/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/sv-SE/firefox-110.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "826b14f184e1462723f838f73a1f3007f95ae662a0f0b1132d17cb75f3211803"; + sha256 = "67a96f19b8abdd776f33e7a7ea6d38325b256930da884e57286df7978868ec0a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/szl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/szl/firefox-110.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "50a0314fbcfeee232224b4660053d6380e2474c9af69238ec9496c7a0ac83bee"; + sha256 = "c1cae0cb88b9025fee9a23f1ea6a3654d9c0d81f37e34f6b693f0b79c55e03e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ta/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ta/firefox-110.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "681dc2309bda68bdc50a322f607d288d2cc1b0fa102de29298aaf0731f327888"; + sha256 = "10affe60eae4746154f4659fe0e305f2588d0baafcd898e01bd2031237623060"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/te/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/te/firefox-110.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "003542c90d840a3a58f2f54c04d6c5157cdf677fc9ba7ecebd869b468193d083"; + sha256 = "907f1beeb68fca20a2635e42cd2849f89a828e5033d64a8e6df9f9b99ab5d85b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/th/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/th/firefox-110.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "8d871cb994f172344022915214abe1392525489f0391e53356f8c8ca84fb0cf2"; + sha256 = "fc3f884d44c2df1c8e78ac21297f8e06dd8d9ae88e6346b318fb1bda8d432c23"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/tl/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/tl/firefox-110.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "694943d1109d0ddc08a3f03aac45add7f5721e11b3d2c45cd8c70ca0283273b5"; + sha256 = "ccec6a6f0e0571d0048a137d3a01f3183912740a58ad1d71903eee0b3839e4ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/tr/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/tr/firefox-110.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "646ec0f570e4e89b73d44f4e25b522ce9c0ce7528a69ceeb527bd0ee35484653"; + sha256 = "faff586ab4b72727307a0f5d94ac2adefb8e854bf9519b158fc04b61cb03aa96"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/trs/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/trs/firefox-110.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "560963c920c298374a05f59cce006ca86db605732f95e9e756626d28f2e3f716"; + sha256 = "1ee44718fbfa37b936f029174deaa809b52a79eebf721da789724cb1fc5d98f1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/uk/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/uk/firefox-110.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "f68cbd33fd7aef2a8a9a86e98dddc3400f124ccf6987ee8592815d1bad3e64c5"; + sha256 = "420ec9e9cb8f76f17c35c7fd7ffdfbad9fcd6ee6a99d576c21dbafd729967a8b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ur/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ur/firefox-110.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "3ac86fadb880a895eff24dd6514f4d63fefdf74cd728407289b403d66ae19c3d"; + sha256 = "cb9653c4a616f34cb2ae31d48f91d0e129354e0846aeaba200120f1314b13193"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/uz/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/uz/firefox-110.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "f6debc624fe80a6e513c385b3fe040e1cc800362b222476eb11b709953c413b0"; + sha256 = "2197bf705b85a4767ccea51845bb2f79b0b8a3ba6458fa49c8d70673cb9ddfe6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/vi/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/vi/firefox-110.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "a03f2738c7bd9e80940a93e44624f73ab3432a6d4ee4933cbcfb710200587533"; + sha256 = "afde552ce97783f075d400ca7703d80f6182ffe96c18ec239bc28917ddf6fb59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/xh/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/xh/firefox-110.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ca741221d67389caaefbf728a226acffaeb7812ed9c4666804a6e8f09f1100ca"; + sha256 = "42dc4fbb837bcf1d206628f8a38f78814aa9b8db992389f98b4dee7cb9e39fb7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/zh-CN/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/zh-CN/firefox-110.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b02103d3720f9bacefc7d8cab545f8dc38275f4c8c9645cb5e29eebd22de2f44"; + sha256 = "506437149ec7a6ca45b645b8635cedad6c6f540731ff3cba1de8cde944e507c9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/zh-TW/firefox-107.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/zh-TW/firefox-110.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "72f39277303b3e2e3be109b02c4b116613c71e9529efd98d2fedd52c744b3720"; + sha256 = "ef860460d4322058a70741f32c5b5935ede0e2aee84299d165210ae987e27824"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index ea6b8aa63f02..d0ea4a8b490c 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 = "107.0"; + version = "109.0.1"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ach/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ach/firefox-109.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "2a451630b033a04be5b342710881773566efa77d75bea65dad8245f9f5dfade8"; + sha256 = "08fb9040a6681d54863c2ac8c8ad48abbcfd5b410c8e404dbc20f425a69ae8d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/af/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/af/firefox-109.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "dc10746ce96cfd3bc48a98edea5575b06e4e5630acd26875182ae7f70b36ce09"; + sha256 = "20635ad665612d861c0db1f65a9b1136709e88ed689d2e2679b0560d66462df2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/an/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/an/firefox-109.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "72b88a955f2b669b45dd6ef02b8d97dc58b07b14985eb1f62b4a8c3f574fdcf2"; + sha256 = "8c9cfd7259112727f149ae26af915e6fae9e35f0946ad052c348bc491d712651"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ar/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ar/firefox-109.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "7e1e58addf79cc916701fe5a7275a07ab236f002859799bd2b9b7a7a65564077"; + sha256 = "0541aaa6c8c01ad265309d5cb2a8ff886456b9fdfe2d91c86ca7fca2eca4ad5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ast/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ast/firefox-109.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "4553f6fec247401cf9121ca053873cdeb5d14a72376030703e6d710203f6a0e8"; + sha256 = "0cf0e3dbd210aaf5c86620e71ae692ff2afe70fc4c23ff74bbad6f2543f1747f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/az/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/az/firefox-109.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "3fbc89e662ec15e98d76fd2581bf2af54abeaf7df267b2632cde5bed00743207"; + sha256 = "d241210ca9644a4bb285019b1b0df189d741330b45796b33f0ec304f2a994781"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/be/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/be/firefox-109.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "08a7df701f51020fc0739bb3a6c01b0db7192771294040d8daf770c9655f4674"; + sha256 = "1b6dee177af6899f90e37155a778db6a574aaed5bda9b17d447506d33ded9e68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/bg/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/bg/firefox-109.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "11b16ae4041d6bf7cf71a8d5ad1b907156898b236d3d1823a72d3b9670d3dfa1"; + sha256 = "312ef6862bed28d9e7f1672d9614542c977c03dee68823b879087281fa294e8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/bn/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/bn/firefox-109.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "98519a45f46c5da7eecd1d34b952a3476e97c1b60e29e1ca6d1d10f65fdd4da9"; + sha256 = "a3678a881c81a74f443796662d98f516a9c38067864d14064cc8386055d88684"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/br/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/br/firefox-109.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "599522e92731cad2df9feb1723d04720259e431df948200d0e8e4c5f2261256f"; + sha256 = "3f022392be45e43edc220c4b27c027f80a157af237e94c5ca3bc201f1e43e581"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/bs/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/bs/firefox-109.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "b6d5a9bf10e53060409fe7a0e6cb6d10c9afe44df0bd54d0b443831077927ea6"; + sha256 = "1eddb9e5fc279d5a265829ede15e09a7f254cff0a669457486f8c350a3709753"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ca-valencia/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ca-valencia/firefox-109.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "9d5dc9fc10a71eda2b84b86326113bb16cee089008c5c016cf3a50e4b8f27e8e"; + sha256 = "7ec65537c9b3a2432a5ee6b4491c36bc4735d0953c47fae62306e4701353a698"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ca/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ca/firefox-109.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "4581973d7e88a1904c9305413c0032d5dd0b0af77eac6927352100b793ff6706"; + sha256 = "e726e7df71d65170fa9fee98de05aa5b5b6d1a3192bf0aa49f76a5a8fa2fc0ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/cak/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/cak/firefox-109.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "1f71c61385e32645e17ca7f623deb142ef3e5245cb50b7099f424672ce4c5e76"; + sha256 = "2722c5eed7b3e017cd8c0a626ee41190e0b9ec44692a1cd8fda1d27cf741acde"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/cs/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/cs/firefox-109.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d37130c0fc1c53d58fbc733e6a7149fef026c9ad65a086da940d193bb0e7e3b9"; + sha256 = "fa2b9278c64974f8ed61b58ddec23c7893d6b473ebd29ae900f45076944cd484"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/cy/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/cy/firefox-109.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "317a537fb797fa452e3e2cbaf4d930ee63fafed52c778d00573baa2c8945973a"; + sha256 = "ad6b74b20d7b4ccf7bc858133fe0f35fd7239d4eb09aee310c75828c20face8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/da/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/da/firefox-109.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "76efa965c7fff30db4df8a6a675681c13c4f64fed2f79b5ba1014ae46a88c92c"; + sha256 = "e8a0fba66e139ef6632b845d6c7ede425a28ac18afd916e0ff4fd89aef313578"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/de/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/de/firefox-109.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "2d086ef022ba6f4626c6ac7be77331c3047ad48254abcf3aaa050414ce6fd791"; + sha256 = "1688dcf426f9349a0a89e010dfe73ae6e42d590695b8955a257ff1acaf5ec95c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/dsb/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/dsb/firefox-109.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "de33b08420e87d82f483f2b8f978deb9a60255b8da27c293484dbe7c57f2e20b"; + sha256 = "36c8e7c90e7e418ca96a2a09f85ab78e45ea733369c2f1125bd100179bada452"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/el/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/el/firefox-109.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b67bf498b792f31aa48fa6fb4223788590393a795dd0edcebde41858e1bf7428"; + sha256 = "5753c87b6676e2a21169ebc4748765f6a26bef8bc739a33da6421be6e0f916a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/en-CA/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/en-CA/firefox-109.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "7cd9bc900313cf4f03fba7a92826b6e346003abd1a33daa11b9a02ba8b8f42f5"; + sha256 = "5438c21484a9de673508f8d63fd61bcc58a3703fc1b1cdecdcaf30f8eac8d844"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/en-GB/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/en-GB/firefox-109.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "d8fc7d76aa7e4fc94818d13db2fa3af28d8497370f602c40b7b4038b66095c8f"; + sha256 = "bd19d96501d872f004b8226acc929e41fb4ae4120b287dc3504e1f0c6f733e8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/en-US/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/en-US/firefox-109.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6eff8b2938267bb0dc4018012764c19d25d36c2d2709582ae225a2db228c0472"; + sha256 = "487a18ecbb0b3b91e402b55424f429d2e4e6127696ee48bb0e60ce7f9879d581"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/eo/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/eo/firefox-109.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "501c1b84bfe461c5c2a5ffb1fe9075007372d50747e7c36a50b9c66e989ce4a3"; + sha256 = "a1f6f5b424d026f4e59f51a0e5669bff1bba225100673e12595ac263509ffee1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/es-AR/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/es-AR/firefox-109.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "042674ce9c62a0206a7fa41f4f07cf6b7c180dc61b9cd689d53ce82e002bc776"; + sha256 = "5aded9fbe24aaf8944fc193e507cf267e964e935ead5a628d6d8638c18caa02c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/es-CL/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/es-CL/firefox-109.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "0c47956ac70fe8c86311146c1321031de09c777d50d7b35cdac3d343259a74e6"; + sha256 = "bda21832e8f1a05266000cd730a7698f99507e536a1690b3b69387640999e3b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/es-ES/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/es-ES/firefox-109.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "7feb69963702a79e1d9f818cd337779c95685a7eaaf012313714084950ea1930"; + sha256 = "23b8e0f6fadd1523123993469c4919188166b2ecf97cd63c36fae816ee50ebe0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/es-MX/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/es-MX/firefox-109.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "eb7e8bd32223f008a733466c2d0dcad8cb17c2c98f40949d33cf30560d521115"; + sha256 = "c8ec680aace4a11ef6eb921466ca449d6f9f6cdc5f90ab35bd4d65a650f0322d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/et/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/et/firefox-109.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "8f487b5631c5e428b54e66f42114fa62a271ef0617c98390b871138de44854d9"; + sha256 = "c80e1e1b9c608c9757b25ac2482ddef919fd0a6130fc11122cd9d8d975b015f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/eu/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/eu/firefox-109.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "56aa549ef38bbaff49441243c3f1ca21b4f456626c9e03f49c20aa2033d49015"; + sha256 = "e74d5916170b90af04e27cdc1a12ad0cb4037bbf56944d41089c58fc5d731a7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/fa/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/fa/firefox-109.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "761007d74e8b4594a22f317c46a80d53369e9256c5672732fb4b6ca17896c910"; + sha256 = "4d22b6c6e8e197a431b7250f864837aff3538f094fd8c58179e92d00e3f52575"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ff/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ff/firefox-109.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "61c00df22b958ae750d04771fff7e6734def889476a4edc391c39a71b4630e50"; + sha256 = "9569f1ec1d42b743daf74d671e42cba98cdad204ab4ca1c2c69c5c20b73e3292"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/fi/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/fi/firefox-109.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "bc8b1d966a89297b3dd8577fe3bb8e133e8aa6dea8755e8b4f5d2726ad9f3da0"; + sha256 = "3b4dee8164333a13591ef238d7e33dd111f5da53975ae3cf3f70d1ad852f9eb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/fr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/fr/firefox-109.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f602101ff956ee0fb119adf897fa3f009a4b85ddf827eb3059d9978f4a7e3721"; + sha256 = "4731923d8ec31c32e9d563e991ff4cdef6b36925a482b2b0dac43aa3ca17e1ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/fy-NL/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/fy-NL/firefox-109.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "76c13619dd72a2276fd95cf103f62e4fe8b497ba846d8329f17191ef025bc74e"; + sha256 = "ed36d87989fdbab969463b439a6a82a15fbf5c986942d92bef634722127b77f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ga-IE/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ga-IE/firefox-109.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "5f39fa70a66adeeba08de27e74ab52beed8afd79accbec5095538e6e3728b782"; + sha256 = "49b9d7741cda331568cf660151173b67b09e2bb559c4c8b5398100573629bfe6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/gd/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/gd/firefox-109.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "8c1e7297499c1b138d25be3d7c1d5f9f2adf1c962ee744e1a01bd9e21c5101fd"; + sha256 = "c4523729d1a51b91322fef8b8d0d7709ffd3dbc74da6ecc019c3e19d1b5e5fa2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/gl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/gl/firefox-109.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "68fb8d612c175912c6a788ad7dc587e7604910010f484181bbdbe690fa24510b"; + sha256 = "2e989f3a162c52deaaf66e3631b33a275b906c402d2ab9025bba99ed1d76735e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/gn/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/gn/firefox-109.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "316b4c596ec8c4ef35dd1a4979f27a827908f8abb5c8273f14cd4369de676c9e"; + sha256 = "aeae4daa675292d4a578d56bfa0771b02f17166747f377e2205e07ad6e11cc87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/gu-IN/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/gu-IN/firefox-109.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "8da4544ee6ecca5553ba527ceac0a952b5ed1bad14be529f03a43ef9fdb5e3fd"; + sha256 = "215e062675cc04c904f1f91b539c1653ba5585c030446429b63913d92b3c72b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/he/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/he/firefox-109.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "28f08bc46bb7a8a610a261f8a7c4904648298b1f433bd4f35b26b6e4b12719ee"; + sha256 = "9c48fc2af47849bbaa958f839b25889159265b4575d286d28d2c67382fd7c2a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/hi-IN/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hi-IN/firefox-109.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "2fe944bddc1c92a5dcc468fb072231b4a33dfd74e7aef73f78d8d0a9c0b0116c"; + sha256 = "b57213ad87c537626022504065209f7ba561bdfd7eef621e49d47db28cbc35d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/hr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hr/firefox-109.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7a6dbb737d766338165472a462f30a03d9c42773dce1564488e43def3a9d36e1"; + sha256 = "49682e92d31ecd5c3690c30f756f719acb959440853abb3d42d6e87a98e8d9f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/hsb/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hsb/firefox-109.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "d85fc4a13990cb8cdb48a58eaa9cdbcef4c674223d3fe88cc3536e3b15102927"; + sha256 = "c1971514830d0c2ab026044cbbfcad679f82c612b2dc4d36604b9c6cdb8298bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/hu/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hu/firefox-109.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "6f9b3c7174f94ec27222a5c2a8c7ec635011ce76155d4baef902354e3cd3e4dc"; + sha256 = "a63eab963d13bde89cd6f52f5f7a35946d9a32572c6a7201ca7466a679ca1dcc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/hy-AM/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hy-AM/firefox-109.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "cfc692f42801af6999c765a31ae8dc1213f10f27e59d240127fc0e3d074a75d3"; + sha256 = "c563456845b5413fcfe160f23ad0d6c6d92c540a7896c6d6e39ebb61af0d6295"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ia/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ia/firefox-109.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "5e96e9ee72a3fa8eec48d466056c7cab613eb0934b068b54fc1bf16397ceab01"; + sha256 = "f9af71feb2085290fbe2f3de3dfc11bee0d0ac49348268675a5f7bbbbce00357"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/id/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/id/firefox-109.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "aa79f2496aabe9a7b294c405732e59dd2a60f1889cfe52c6616d88eea7f28de5"; + sha256 = "9996428d29e3705cf35e060f860660778b69e726cdc57e2734a42d449c43ed4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/is/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/is/firefox-109.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "ea72f659ad4a490fe93143459a2f81ba3bf71ca3622adc6aba93f94c23095d3d"; + sha256 = "a57421ce14cb264da4d8bed35dc3d0f742a15870d65548c7617fcad67a3f50cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/it/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/it/firefox-109.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "9eb6cc0a3825f596be5a439df88678f2fb313ab0392078b4db22cdc26166e2e1"; + sha256 = "e2f537e79f258b6ecc03715bd18565c18c10332f836ae8582e6ddbdb567e96fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ja/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ja/firefox-109.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "d5a5259613c6999ee1f71a1af4c4159fd9907962eee6ea71e3c1bcd4b2777cc6"; + sha256 = "757ae63ab1d7aef781b24fdcd779aa84722a4dc0b52c35e7938158dce2b56fa5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ka/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ka/firefox-109.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "d98f0a730782c401458e8916f18d2dd20edc5fdc6cead007ae12037e4562b2be"; + sha256 = "ab985686cf54f50b6cb69e63d121a71c2aacfc4b1c4c22d197e0b6b4d24fd404"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/kab/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/kab/firefox-109.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "1683775a306d9b2fb6f1bfa86b2807522548ca05150ca36cbfac75444e15ffa9"; + sha256 = "e423f60a7c486422a4583dea6f454c8f43ed67cc3ebada7ee614465a5dde2871"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/kk/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/kk/firefox-109.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a9b8d21b2f58dfa7c35812dd4286843f063e3ee25bee47f480057d90824bde68"; + sha256 = "d79b6d73f0c01ba881ff6ab63a243955ffc60428ab6f3ebe1d8ac2890bfd81f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/km/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/km/firefox-109.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "faceace9fbbbd5220975a930107f667aa8efb9094c1bb1959507b5ed0d843e79"; + sha256 = "afa093cbcacccf5e93b4305cf4cd6ce80b2183e11501d7fded6ed71b8dd61779"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/kn/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/kn/firefox-109.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "b2c16780e3c0d989dddbb19fbf3f5113de85016b758042a15b7be3f81844a8dc"; + sha256 = "9bda025646837a816c5374e09ee0f6b8b3fa4401adfbb4c79bd37b9b004c1388"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ko/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ko/firefox-109.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "c16799429500a083fc704a5bf9675bc179324cdbc3a6945fa987f5bca68e324c"; + sha256 = "3f56db587b78bcf927df9f7308f4eaff8087bbb6008bb7dbc63e7cdcf4727c86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/lij/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/lij/firefox-109.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "b9c5e8d8689faec2d4f2a4f5d1535cea6f9272e0cb66eac14d35d8f0f1183eb5"; + sha256 = "75da1688b606f59513e21ab86775fc8cb35ce84e09bc042c6486848489e022ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/lt/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/lt/firefox-109.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "d8e072e694eda686778169c595f0c43907c86ebf55a5a2f0431616fd985d1a5e"; + sha256 = "232bfb865f1c25c8848bd8699b91e2bce6832ea82ae2e2ae647f43a83c828232"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/lv/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/lv/firefox-109.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "5141ecf8c81a7041845fc6219b3437f846ecb316980ecf91e166d476b8e2de33"; + sha256 = "d4834008c21d312286d6b9757bc2b61497d987451245445919aefa4a1ab91be6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/mk/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/mk/firefox-109.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "c71769e96fd0ea9c001f12825d1aaa9547c7b15be87ec5e8db34ed7e25233eef"; + sha256 = "102169bdffa3fbb210d372844caff0fd010511fcafbae16b89453751ad9f7228"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/mr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/mr/firefox-109.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "9e8eb99c481fa76a71313bd99804c0ed57678a0d3879dba20961da9ccb728744"; + sha256 = "af85561d4db729c04b973f8c74bac790275913586c0cf5284e243c0ddcf45ad1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ms/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ms/firefox-109.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "881013d91d5760e6d8c2dd3d15d249e1aeda207573cab647a9712a7da50dbb3c"; + sha256 = "e98ff53a524ba73184bc395c25ce110ae915846a44e0ba8d8a6c594d5da33bd6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/my/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/my/firefox-109.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "af48084437b840ee42d5c9f09f6cd650ef782c6c34db60c7274ac6a4ed62eea4"; + sha256 = "82ef41b18753d8c2203fbaf3cceb0d1bd179004113db40079a75488b3fb7217f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/nb-NO/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/nb-NO/firefox-109.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "31a9306641cf3121cb8e5f68f25f1d82e1e4735e10e29ae3751a00e8760ad16f"; + sha256 = "daddf9f5e0e9eb654af24dc2abb210cae97e37faac8af56746f1d28f5dddffd6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ne-NP/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ne-NP/firefox-109.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "4a551c857f8fc223e1306812d375e6d9674b9b7bfd22b8a6921b46d02efe3f80"; + sha256 = "f1b97800986e546fac4c08576469651ef0c0f6e8729b34ec5b1876208c788876"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/nl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/nl/firefox-109.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "02a38c8c886ca07239b1135e3e5b008b2087d7ba5a11e1540da9efbb80f588ec"; + sha256 = "30d2badf5c909890877c35dd1a397ee7947546bc97867a1369572070c3c421db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/nn-NO/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/nn-NO/firefox-109.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "86cbd70d40fa565b548576abd9a73636dd1f4a36e1713e40dfc707cf6c831fe2"; + sha256 = "378bd3b106f63e5ed28ed150f83befb1ed0624dc6d977a56ca70d7b53999489e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/oc/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/oc/firefox-109.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "5381d573a77300452066b0ce17be33a60b516df9476a3dd3bf7a2c6598d17cee"; + sha256 = "bb6eda0d45cd29e1438034a1f62422da500ff8db12790eb140fad34fb504dc22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/pa-IN/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/pa-IN/firefox-109.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "1cc8138ad84e82ced5d0cb0eb793e1242427eea0f4dd302c6e49029b11df80c7"; + sha256 = "9537fc5b350222c8a44da6387902cd7c18ed1d9a0dd45f65ca996819cc88ef21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/pl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/pl/firefox-109.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "99ca0f34bb39d2b9c991b2d83b25f536aeace183b6e2c4fd7778e75dec587278"; + sha256 = "622adb3bafab1594166856363d317d9259050c935bc6b2aa6298b664b9a8e80f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/pt-BR/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/pt-BR/firefox-109.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "1fc6b9afdd9152846e0aa8aff840a27903b21a94394b11a807fb434381bc3215"; + sha256 = "cbcdaa340edcf86abc9997c7bbc8eac879e7ffc93d9351fb1ae2c133cbdeb56e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/pt-PT/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/pt-PT/firefox-109.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "343b3fb22481202a9dcac3174e954092847be9266a17c1d7ca5f0b164bffaaf4"; + sha256 = "d5662ca239edbeb332308465d16cab2371da282dfbc750657ef3edf80030bc4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/rm/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/rm/firefox-109.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "ea08447f73af2e851b84dc20ca880f0d8bfc90465454cedce269650670796e30"; + sha256 = "50db6ee90b2197bdd6a24a18722ec645844898ed0fc1551a22a0837a2ae98402"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ro/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ro/firefox-109.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "71f4c360fd0557b543d031c38d1748979afe84a088bd142c9cefbcd430571ef5"; + sha256 = "6a8c6b76ab243da8317d1f1ce26c4d325b8a415098028f6162dc3523e78c0f32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ru/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ru/firefox-109.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "9440aec707fcf6f9e695d1a0a7d7eae1193a244f4a30b597662bd54a1c2eaab9"; + sha256 = "7d026e34d5bf90bb68e6f14b6954f1b7f9ec132d6a11507236fe9951301d7ba2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/sco/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sco/firefox-109.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "c491ba9306f4dca1ac40a25c33f8644215641633f7b7cd2e1e0fe75027032f10"; + sha256 = "457fe129188f2abcbb6cd1fde7fed8947b5ce3367bcbde11a6308ba9f769bb81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/si/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/si/firefox-109.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "75a9a25cabdc6d62340d08ecc91badd6b133584659a3722bfbad3f1b6f399a7f"; + sha256 = "bbd6af1251c794090d01a0a07fccb648b8b4e210f9991a3d2937d1e663e99df8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/sk/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sk/firefox-109.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "a726e151493e9062da11c48bc52ea0660016fcaee5fe1b39c4808850d8fad088"; + sha256 = "ff93a35e6be55c2a05e061d3b2c8e738a1f408d2876436c168421eabbbd9d40f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/sl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sl/firefox-109.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "821c59416725224c985b677f34dd1af7ab029af8e205afd849baaa9a34fc2808"; + sha256 = "81dded9e76f3a95d5182dcd106671bf864c33221f83b90c338aa16c72b7edd7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/son/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/son/firefox-109.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "cf3a37253e16bf388677070ea8c6bbab4b27ae26ee4b22d9330e25d7ec8b0691"; + sha256 = "d70271b8199efc1507c08eaaf96b06523dc9bd6689a3884ac556b0e3a252ca60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/sq/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sq/firefox-109.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "581771fda181a9d14ef7e367b858ed49568916df40095457178f02254da6facd"; + sha256 = "4a264563aaa4cea44e54ab9ebc528dcbc241e41e0a12d3f256b2bc15a365965e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/sr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sr/firefox-109.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "505e692da01bc04e3993f2d3e4b942789fadfbbff859fe70d04c265d39aa632a"; + sha256 = "ad119b58327106fcd2154b56952d746add490f77a146c7b7beb44310eabdfa80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/sv-SE/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sv-SE/firefox-109.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "21e35632a85ad4714c0cb0003f1eb23fbf87ed8d6b81f1e70eb86088c36f6e59"; + sha256 = "34a6c91de77b89a781335c3e56326fe84fa214e7d847d6450eda76cba8479de8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/szl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/szl/firefox-109.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "68ea55cfa9cb0ee43b2a681dc41b7abc3ea46f56718b8c867fc2fe2da0326b58"; + sha256 = "ef83c2facb462e2d02f568bb4f01817715a5df53d8ce248a222d11744e863f65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ta/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ta/firefox-109.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "b008660e2b48ffb0abac1750babf2c7e73447212628be0fa1490e07a12afeb05"; + sha256 = "a01a5ac21e4089c0a7e2c4853166f6f48f7e14d4a6a28b13231bb9afda951809"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/te/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/te/firefox-109.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "d1425a2765d92b62a6673d3402644f6eaf2f829acaf73a3dbf7520179cb8ff78"; + sha256 = "a565cec206c2f692e704b7c7264147ce45452c82d541132a422e4a3224cbdcfe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/th/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/th/firefox-109.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "8728969cdd19bc163dc5617935d06890dadbc2d7fe827c5db6e13a682b06b2ab"; + sha256 = "3144b8ee44c820a09197c45c4e40918283c8a7ea98c4a77f46b827cd2ea15820"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/tl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/tl/firefox-109.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "e73184ce150e8fef78de03999f5cd2226e77827ee62bd16e3f99aee721f78fbe"; + sha256 = "dad4a9b1658f4eadf87ecf14156c19767294e7ce3fc9ec265d2d11cace33ab3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/tr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/tr/firefox-109.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "b30d471530b2458d4a9431c085cbb2c7059a0d26e95620c62c6411ebda27e33c"; + sha256 = "1659934b3db55eb38c5a40201b111ef4e86b7ef4d2dad3e9e4528ea28101ab4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/trs/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/trs/firefox-109.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "d23e84dc92f83d97e28a880c5da8df646d2af36ad6844cd9cbc3e9a9c917b3f0"; + sha256 = "9393d4ac66d6f4f23426f7432febee1498373dc6ef3b9395316a9c2fcb9b915e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/uk/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/uk/firefox-109.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "cce237fdde76bcc0762e676b2a6d014975be6cf9c00ba377bf67a7b28aacb18e"; + sha256 = "22f8886296e49d947f33f984688af663c9cf13a7afc473976e9975cdd70e67f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/ur/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ur/firefox-109.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "a056306bde59f3bd8059b00abd1d173d9efbcbc59566898a2f1b5413c597a451"; + sha256 = "883271dde81dc06893d76d65b394e639ed74bada7233ddfec015c5a9c76bb9f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/uz/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/uz/firefox-109.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "2f6a24d82a77ceaa26f294ac2b4bb96010b86cb86afaa46f4ebb31fe5a300225"; + sha256 = "bf71ae490fcd0c1e03044308e0322b993238e679d1b33f2214ccf40bf03d9075"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/vi/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/vi/firefox-109.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "f6677a27e8a69fb50163417027ec619be269f6a23a2ea4ca1658a2a53c1c1d72"; + sha256 = "07ab60fbc7a9422e37e2a606962b4f52d047a346d1560e7d88a28c58766a1cff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/xh/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xh/firefox-109.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "2fbb5974e9829cbc9e8f6d022c4f9676f454540c84c4a322680f4380cb5bb7e5"; + sha256 = "55a4700c96ff4b73643422a480546201580a0cbd8314434f3a0064f992ee29a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/zh-CN/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/zh-CN/firefox-109.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "1e41dc9579bf523adf03474e207bf40f02d2217053f339dc8b265316170c0125"; + sha256 = "645c75f0f4a39370966c959bb81bdc1f512b5c10be7d66081dfbafb978ad2851"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-x86_64/zh-TW/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/zh-TW/firefox-109.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7068be87c3f0dcab6b5892b37c5696e847260d0a04c61565fa54d1dbeb5c70bb"; + sha256 = "91f28d74e5c626b0e2f540aa2b0a0232a9f27786a296f4bd2b4d72d7faf09b22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ach/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ach/firefox-109.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "210c4ce1b2a19df8a31d7a4b5e2926e0d72dd59e6c2fb2d23080722c71833cb3"; + sha256 = "7c3b5a5fd67548a8d56faeaef023f34eb7a7853e2d9f18628c9588672b9d608f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/af/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/af/firefox-109.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "b8950e8cd9576a83b3bc5d9831ede0f7ceedb703a7abc81ef834a7742c27d652"; + sha256 = "2f3221f6718981b341655d62913f7413b75d41721ab002f3bb885dad4c40f1e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/an/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/an/firefox-109.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "14d35c3b433d3787cf12d0311e8a78fcab55b1782fba0319b69447fd9a4e9c8f"; + sha256 = "7d573fa13a00c255c5c449521162ed85c733e9648c0bf929556bb97436cc12d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ar/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ar/firefox-109.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "4a3ca5c74b2ef8d046c97f6abc16864a519cbbbdc7803b0bc3ae1ea91bc3932c"; + sha256 = "a544d38f3c4693413ff3498dd6a89766154974087f966da061a9a42785e85682"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ast/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ast/firefox-109.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "2f4691a658f960ef52b62b44d3a2e21c313c11ce202d7e8e0c1329e9d1e26943"; + sha256 = "325b3237da08fc1a637c0409bdb43161781c1fb7ebc811fc3a477372b34eba63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/az/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/az/firefox-109.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "0310d9e0ce156ca8dc6f47a3c784a9283b68570e7e6b398e98e72add304f12b0"; + sha256 = "ec6800b785fa3b8f4b7c2ec0bd4fd7d06e265408a12ed791ef6198b0c1786255"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/be/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/be/firefox-109.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ba89cd37cdd5e3103604b040bc6f421c60a32c3ec080129bd7892dec717641ee"; + sha256 = "aff9ef285a2b08bb3e516c30b85c6479d935cf40c998ce88c5410de077e42723"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/bg/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/bg/firefox-109.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "145a753d9ae540716d922ed1ba39d98eaa4bcd24ce414314a7b9e483e7e55911"; + sha256 = "a27357ac9c019efa327406f1919eaeb1fa5a8686094026935283df4dac50e96e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/bn/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/bn/firefox-109.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "5e1736927a3c8f17cff0907f07312f615ccb33beddcd043555730a82f76b37e8"; + sha256 = "1642db7e385512fbd963b48bdb38a1780cb5d4be98e30727d6d2df751fe262ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/br/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/br/firefox-109.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "8bc5b9d988e4ca045a507ebc6f69a93c708492b8cd33213b09417db8a0895907"; + sha256 = "9bd3bb35f392512f77013068b3bd61eafcc08fcc2716fcc13a996b54f8881469"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/bs/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/bs/firefox-109.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "640bc5d6502123aaded43cf3763c6f2627a8139aca27c91007b9bafceb03dbe7"; + sha256 = "8fce6f5edbe7996f8d31478b276d6e80b556a01913a158d403b8790262e26bbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ca-valencia/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ca-valencia/firefox-109.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "79ebc9b51afe4542658462df8d682ae192c26e8fc5ec703425d5bf3da81cf4d9"; + sha256 = "fd8fa093fdae77f9ed588543d7bbf00b1369ba5e469199cdaac2bea990be8d5f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ca/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ca/firefox-109.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "4ffae1ed0a335dcfc6e5893e83634b8730f6d61c3aa0fd979fd1b9a9b7c2cb5c"; + sha256 = "5e479179164485d1e4580dd9f25257067e4ee30ce00790f722f61024c5cc0e8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/cak/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/cak/firefox-109.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "a0c62e889d53a5d36afc421f9447df9a144ac81b2c4712d850441472fc3c5312"; + sha256 = "00dcc222d9bb3a2e68ecb8b61e04471f03e03df7e171b03c390487a66745bea7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/cs/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/cs/firefox-109.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "0ce1aec8f29f993208b4e19c270d43a80a8bb6215a6bf38d9cd1bbd82642be7f"; + sha256 = "62a42f71706a8f02b2165603ad9ad0f6191fa4e2278ac2a09d8337ae1ae809a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/cy/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/cy/firefox-109.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "6f97a471ab266fa37007271dd8940e48d82397578e1f7462b5702c7768ad62d3"; + sha256 = "36afec95e09e29150ac3d6f2e75e451541ae5e223d438a3c3917473ad7d3c8a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/da/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/da/firefox-109.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "611bb8c4f093966366583b32f267f631d75cd1b68f46052f05dbf070b8436d99"; + sha256 = "03f36a41a0fb306c26da2b9da19ecfaef4b78b7891dcfa23f7d95a334cb7fc39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/de/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/de/firefox-109.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "cfd7d3e0178f9fb8d4f9b29620fc43868a9b562b4b524a9d1b58e2d9f89e82b1"; + sha256 = "d9c4c368d31690be710648d41253481bb2f9e590d10bd8729a06a0c00b1427cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/dsb/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/dsb/firefox-109.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c7bd95f5ce3819f88764f7a0be9fbf23004607c569eeb5cfd848d4c7557436f8"; + sha256 = "3177bc793f513a2e6a52d8d8a5dd45f0cb41257e524da9e89e292664dbff8cc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/el/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/el/firefox-109.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "3da804cda7efdc32fd86dfd127227c486d4df1801812e81080c36a0f0cc01b03"; + sha256 = "b25dbabf9ef58de514edc92130f6ff733aa6a0d3b4b2f70e3b72c54a74a37ab2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/en-CA/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/en-CA/firefox-109.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "7ee55f76cfa2ca813f4571f7d95a2b2226a04b5106beb2648fd1dda3b3d570c2"; + sha256 = "0232243fd6bac40efd17f71295f79b172119ae58d277f3d8726df0fb7913afca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/en-GB/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/en-GB/firefox-109.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a8f6e6be6d86cd4710fd93c5ca93a7e591f473f451906685b5a48fabb115c7bb"; + sha256 = "4ecd5a129e40b9938f4c245616558e61f49c602f9257dc32417af0685d097ed3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/en-US/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/en-US/firefox-109.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "dd75d20f8e27f38c1776708ca6be9d19048c107342632a014e9781418098c27b"; + sha256 = "4a960f440dd688eace3d4ea57d80b53ab9272e22688e08d773a3f5f7b9d53af7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/eo/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/eo/firefox-109.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "367235749f0d48d0fed119a998d1376ec9404437792c83093ec0591a71d9ba9d"; + sha256 = "07f66bd4e09b5fa459a29bb5576818437bd5e7d059504e9b0ac8eade2045d263"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/es-AR/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/es-AR/firefox-109.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b7607fba672ff36aa52325fdfbfd46ae7c3be9d519802246d6c804ce74a72021"; + sha256 = "4d4cda4d1e4d189704f3ff43ccb247dd5d6b05ac4d74cf7cd957d0f25b2c8c5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/es-CL/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/es-CL/firefox-109.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "9717dd09b2e891bef898cc25e571d23157ed0b08667e35cf0f563c18f72e91e8"; + sha256 = "48a18cadb63917659697f99872c40dd77c09e62d4687e5e15cb8b791d4c0a2a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/es-ES/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/es-ES/firefox-109.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "785a8c94a101fb025483b9bd42ab5709f4d082325194c25891659961d45353ed"; + sha256 = "9e73d300963872b32ab69c42277ca0451c9e0df0ec3c7d7ad1ecc47232cd4388"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/es-MX/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/es-MX/firefox-109.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "87c9be7eeb7a3aa6a361846087cf957e513dbf8d5d2002cc2ca161e0b9e440ac"; + sha256 = "2b1a4c7a40a62801e1c5b8592186abf407c4e9c7ce868263b478bc8fb352a001"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/et/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/et/firefox-109.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "54ac1194940450206ba304126f2ac54a24b5714521164f8abcc332c1ce61972e"; + sha256 = "5d0296cfd5a62003b90a8b20baa8bed8edac5a0bcc093b7b99f96db02541bc46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/eu/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/eu/firefox-109.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "35fa2afdf502685d4f045635421852e037727335206a4aea27837e747a91f59b"; + sha256 = "0b89fb09487f3ecfeddd6cee16ba4547f0a80e4afd25028b08298507977e76e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/fa/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/fa/firefox-109.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "48fa84d473a2c7befe92f7964cc15260f1719d1c03e8628d58179c0aafc9b63a"; + sha256 = "09d98823bb9d81314668c05ef061bb2c4f576476ed74ce58f268f02f3375f58c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ff/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ff/firefox-109.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "0652b6eaecdc77a1b7d04eae1ca96186a272f16ea98ce614b03fddcb2f87f938"; + sha256 = "ef929810e9b4294e8aa7f3768adecdb79634edca060e028536e61cd4f90b2445"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/fi/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/fi/firefox-109.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "bd71abc232630a4270786eb26b89ca1e3fabe7e6788c4094bece058765866406"; + sha256 = "fd6564352704bdba7f329a70c940514f3b060d3bab75ca7e5a6198858db8c79a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/fr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/fr/firefox-109.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "f8a52bc8668a4f527c9a44e9bee248997b8b95635e7768de2503c94cb10c8b68"; + sha256 = "e1b30692bb0dd98adb3e3f057e988d88ef671bfe84316b7003e465a7d5dcb007"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/fy-NL/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/fy-NL/firefox-109.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "a3f1841786fedf9d15ea2132db037d16a3153812c000123d25ca3268ffa534b8"; + sha256 = "16bc416044cc23ec59a08216f1c18f9d027e141a96f05782eb46d96d799c2b19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ga-IE/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ga-IE/firefox-109.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "911b5cf7e92c4b50831be058f367df06bf5e1347ac554cfe9f2ddc7b6a7535e6"; + sha256 = "64a13f28131b37f84f37b82a0d07371228a20b0f9c8a1e228c47a8d5dbf0e730"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/gd/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/gd/firefox-109.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "4aff8e95be98d8883e30d9eb33c4f825b5470462c64e7b57d1bc3d58447df1fe"; + sha256 = "6fb5531c93043ea2c11b029d13e88fb8eb4f1c95263c1fc324a3d8b7f545262e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/gl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/gl/firefox-109.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "be348ab0ed669a338a86c567447d9233658ddb095a1e2ad684ff86e22d47ac99"; + sha256 = "15bb2baabedb79fd3bab8dce240ce2d0c88f6eb986ae467d1ee8e43ffd077195"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/gn/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/gn/firefox-109.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "5b52f6b247274aa880d151fd3c82a20788b0744caf9c45672b096fe0d7975e2c"; + sha256 = "48d50a8cc2bc3608c447b7744093166d4c2f740e8c519d9b6f3931e1021875d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/gu-IN/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/gu-IN/firefox-109.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "15ef4cc817f0944f1fa3803395e529402f01db315f3fb71f3c7036cd747a6350"; + sha256 = "e6e4f86dc0b65e3238f613c68432ba9b4768224bf834c471fb064213cdcffd9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/he/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/he/firefox-109.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "7ed988c182e7094d262190d1881f8da18d378560d48f59ab758fb5d8e5c6e828"; + sha256 = "e45ddc3357d75000afbf65b850531e23ad5563234e457007cfd1992fa4efc114"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/hi-IN/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hi-IN/firefox-109.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "4b0f931789ed91053776f3dc568cd4fee22b241ab8185e8193a86f6b563b8d41"; + sha256 = "2b37c00298ce599143e2639dbc245b5f558349438d7e1f282dfc299720842588"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/hr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hr/firefox-109.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "fd8715969187d533f63028ecdbd2dacfad66e9a12f869b1b6a57cbbcd0a43930"; + sha256 = "456d75b5ce6fd21c0d5177904d82d960a7258039184bf7ba8e0c71a783d4b601"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/hsb/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hsb/firefox-109.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "aa41df09dec18a120df021a95a95f6a145f5ada90abe794863279a58933c2498"; + sha256 = "c9e835676d1eab60932b2dac810c25fddb61aca134eeb1fb842fb7f3e1ebcf25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/hu/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hu/firefox-109.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "79fe852a1f9bb99b39017096c8f6c7ecdf7e6fb5e021e6ae9a1b179ccfff9d97"; + sha256 = "4706f3eaf40cf7eb4ecc6f6efcd64cd76cb1228bedd9286b4cc9235ebcec7ec6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/hy-AM/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hy-AM/firefox-109.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "1c1544a471208d08e28031f4df6e04c35aae7810c9f47e0aedfdd577cd32b0a5"; + sha256 = "bec66380c9ed8d132d84cd68c01989fcbd48afb881d8616017c603dcb7e176fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ia/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ia/firefox-109.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "983c97b0a87f7d2adacc51f7c219483ea4a6c067e00181f42ac6d967437112c7"; + sha256 = "dac076b82ed64857f048383c427776354c75bbe14a8f2ba4aa62978546cd6901"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/id/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/id/firefox-109.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b38d37af58610347d0892192f15363051cd2dd3e7841969c858222553343a607"; + sha256 = "c41633c777da109384ab97049b0058fc5783359ac414674eb929fd19bf2d625c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/is/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/is/firefox-109.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "e779cccb57ac31375563de4eb17d83ec8e1a2c0b4be8931c0390653905a7eec2"; + sha256 = "1c86162d0ed17742cb3c51c39cc6526ca4bac5f9dae9b3091d8fb4b9f62450fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/it/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/it/firefox-109.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "c5bfaee77e8db08471ebb85d71dcfd5839cadd9742dabafb96150b31f8b4ed95"; + sha256 = "88619c601a1e5cd2a63adb00f3f1383b7dfb59bbad526209fdf563c1a7c74fe1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ja/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ja/firefox-109.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "b18a393ee915e2fd90ed9f7439c8e826a6c140bbbb90de6c5a24c2134b397973"; + sha256 = "3dab393bc047ec868e18ef3088787ff3fad07979ff629b5b673f0ffad4e84bf0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ka/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ka/firefox-109.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "6590ac4b5124e552b9ff92ab9dceb2a801327e97dede4b798e93ded5b17c3019"; + sha256 = "1f646449054056c528aa04722c0945b008c72471b2b6a7000afdb54e9e14a51d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/kab/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/kab/firefox-109.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "90be62c9ab6260d630782223b4023aad102316138a99451bd76a524eed82856f"; + sha256 = "2ee51ba2291b12549cab7fde5007205927465ee592ecd15158b5cd0c5c071391"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/kk/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/kk/firefox-109.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "41e6ce96227c213c835d184a299d38e4ef761cc919d0b83a57077d44b9686c7e"; + sha256 = "bc761d52486af47d637f2a982de38481db245f98d48fbd0c3710f7282e5eb0cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/km/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/km/firefox-109.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "47584b80836e5bad13230770f01aa79cad3f8645c55e65af504d86f182fb1e55"; + sha256 = "ff584ebbf260a5907d47533d03a844b11852e2a66e1873cbb9f97488dcf26805"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/kn/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/kn/firefox-109.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "b5f7ddd26856c7e18aa6e426be337d062e2c37f4606336aa2f93d9b0e1c5d572"; + sha256 = "205c2a232c468cd00096f9b3e0e37ee6cd6cab2a89c64fc5e7090892129a2ce1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ko/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ko/firefox-109.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "20a23f3a72e67a5b3922bdfba8861ec9eaa338e822ffb1cf1187db7db25774c5"; + sha256 = "b8d262276c6f67bde4bda7dde9f44fc9d663408df85b3be836da03b9c923a551"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/lij/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/lij/firefox-109.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "e5629b3d053578bffea07b2c71e2bf7c0914d98cd61490e0607ddec7e5ff39cc"; + sha256 = "fc8c42a338cf8074d77acaa967e5c470b813da87c9790eafe7aa36bda676cba8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/lt/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/lt/firefox-109.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "dc2052684031e5ce391bb660aa79f1c877d47f2f6e92631ec067c3c6f1f315fe"; + sha256 = "2eaedf0027937f9f3de113d0f9a819a09d001c24458a4006c7d78f5581e151ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/lv/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/lv/firefox-109.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "b541de50e2395bfc49a848d0d04d6fdf99fb921ce452dea4954b35b72e7fffee"; + sha256 = "c2bfe7e376deac1df14f29a6c06c6ad80249f3b1d1e08855299ef96f3f8d9790"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/mk/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/mk/firefox-109.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "f302b5387f5f5cfdfeb95e3a52b42dcf4abee0a77def4ae296de72325427c18e"; + sha256 = "fc681082b2c0d73e2fe8c8aebe648dca6c172c31bf0319d7fcd26af6cbb67467"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/mr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/mr/firefox-109.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "10cfd2d5acd8769cd5b26048ac4870104b5c210b1ae74ccf7159cec8bc02bcb6"; + sha256 = "03703982fd431a087d1b2a4584862f9c45784d1809ea21121f495afea2b9951f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ms/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ms/firefox-109.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "ceccfe52a071f5d10b7e6fb2ad393597b9ec915184315ae8b1e48147d972ff19"; + sha256 = "fb41c14f3f8f6050a874475a4619834e91a93e18694117d97164cf8d65929f2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/my/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/my/firefox-109.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "98beb6874d31aed5b747fdaccdfebd1fda78607ab5af5ddf945660c7f15f7a8d"; + sha256 = "d28d4ab28a45abf6e430ec2ed014e73606dbe4ea54318995565efe0722725188"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/nb-NO/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/nb-NO/firefox-109.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "b0262b927cd384c9467f163d7022e957efcad733e7b5f691699995fbea0845ea"; + sha256 = "d7cda4dca1b8ed107174b1ec8486f04741161c5e95eac55f291a0d6376c83bc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ne-NP/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ne-NP/firefox-109.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "31b3c9e4b915756709fe05269683b76fc089f3250e4b1ce8ba2b1fde70d3567a"; + sha256 = "5562fee4fea2956a346bcb23c2c2340cd16a816ef3f8a874d259e1f6a6f70ff6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/nl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/nl/firefox-109.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "455f4be29f9d566dc7b00d74084695740f37c84e09e78373dae51d5cad7ca658"; + sha256 = "2c9feee4d1c3079232768c9c8ca2e841e7c26685ad4b9dd609d3eabe478d8154"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/nn-NO/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/nn-NO/firefox-109.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "816accf7fc50fc154408dbfacad2e1850728a92158b432ab57e9e4effc08a82d"; + sha256 = "9d48f0a887015ffd0c75db18e0e2e79aaad177cc114797758cec33f33f08861c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/oc/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/oc/firefox-109.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "ee2a8f89dd345282755f920d9376e273bd08495d51c75b127d7ac365450b2af7"; + sha256 = "59cea9cc6edd8d6e92741bf8201cd135d3218ba1020579f6a6325e2e1697fd92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/pa-IN/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/pa-IN/firefox-109.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "8863b188619c6305d35ad00ba6082e20a8b6aac9c0101bef6a52528c7a4e5a80"; + sha256 = "bfe9329826c927d22e3fab539e2564c72958c91330dfb036bcaa6784e2882864"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/pl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/pl/firefox-109.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "73c0d2ddcaefd7d280d54e959aaf8aea784a9361a8698af1e831bc770f8bd82b"; + sha256 = "da8f8f87f49efcd6512b28a5dcefd0e7910e704ebb79b7c88810933e135239b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/pt-BR/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/pt-BR/firefox-109.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "6ec87c3013434be5c893795e6510388ef25059dc220805001bf7a149fe95be6b"; + sha256 = "221ba38616c0a5e10d91a39e58f194aef13b5bc3afdd07e3261dc3dae168b77c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/pt-PT/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/pt-PT/firefox-109.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "dc6d7826edad501cc347a1e8442058bf41383cebb29068c2914f38122d0e272c"; + sha256 = "0fa1e27f38f32d2ce835924b9b6e2987ea506bc440c7ed5268c5010b34882d99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/rm/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/rm/firefox-109.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "285ad81097f0625c9acdf4eca34ccaf864cb17b271bc8b2aac0709ca45ca3c21"; + sha256 = "83f4a241f541b08f1340cf474128546a4a0f3962c419f227f060b30e8ec70315"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ro/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ro/firefox-109.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "e5fed78a63fb031d18fcf56b373a0917a742785401033a9c55049540dcc01114"; + sha256 = "8922ab444d2f439dc96c1cff06142171922dec180ba81aa3d286afb53c635953"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ru/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ru/firefox-109.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e0ccbf07c7bf16fbf03c885b62210990513a084cc935001a044d2890ad1ff81a"; + sha256 = "22be977b6c5e9f0ca73292fd36183412b2a98bbe44f7e5edeb9be5bf85951631"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/sco/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sco/firefox-109.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "7e0c5fd3705b111de01001674e3f8b11ae31398caae7c197a53e81250e51e202"; + sha256 = "91274de4fa273cc4ec05ae8b40be5367ed280d8e64b1cd68db604ec13360ad2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/si/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/si/firefox-109.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "8756227810d59b4531fe194520e0693400453ea3fc7ae1c46ab991cd81acac6b"; + sha256 = "489d874123773bf5f3e94746e4c7242d73742dafded32a07c20bb91c7e544328"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/sk/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sk/firefox-109.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "7a975da237adf1232f14f65b77868643d1027d7fe3bca11c09111ff49770de8e"; + sha256 = "66f1e39014a6c246572daa6f0c6a3230862e7274b5a32213c7397643caec8130"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/sl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sl/firefox-109.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "4ff972a88113e02024a91d0d42959e3a24c1a0a8ea5eef8373cf7d20f77f09c9"; + sha256 = "ad7bdce055f140497dc79bc67107d5e6f99dd292f09446304dd49d0dbb039d03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/son/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/son/firefox-109.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "0dc7501391381269f8c0481b80d2298e79f256f5159bec05a0a672383feadba0"; + sha256 = "db3da11990c0f401a72122c162cbe371c65d9b07a42e781251f082dc2b99b0d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/sq/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sq/firefox-109.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "1e462c174ae58dcb717bacbfb5511f823df34910b9294a2e4bceef6952a17155"; + sha256 = "55b73a202acbb180073e8cb583100391e63d4d41516f1f241547dd72c9d64ca4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/sr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sr/firefox-109.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "515666a6a4b649987458fb6c32474d02971ddafaeee9dda78ddbae96d7e55a71"; + sha256 = "d79e42379228bd7d8c67bfbb475e0865aede6e8cd3a5c630f961507c3ec9162a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/sv-SE/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sv-SE/firefox-109.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "68bdbd58469b9f064f1b43e82bf69db5ae09bd15877e7f599b7c239d7dda7028"; + sha256 = "83af8bc35f47c7f51872d6a50f1df6cc329418ebf4c756cf894afbe544ce2018"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/szl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/szl/firefox-109.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "c444bbe063c222fae7502f09a79e09e80c51aae9b4ece871a999e51b85232c48"; + sha256 = "09bc6aa2ec127f5ac9c04cf83b2e760b17439c8ffd3d2b904149b759e8a1c5f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ta/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ta/firefox-109.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "9d49ce0a84a974e6c91e6de54e37ddd8fa12c10f7500db21734c83138a1e48af"; + sha256 = "f1aec8972ce8baf6e0b6c88bac92651a266bcb2e2bb5b57dbf91ef88c0999681"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/te/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/te/firefox-109.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "0731b02e9d6cb81c2822be6833cf4b3aa463680dfcfbf648fefb8d3cca85d044"; + sha256 = "23cca1765464d740d409e8fbad0909b969db9028581ca8c079be7df671e25216"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/th/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/th/firefox-109.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "ccf4ed6eecf8f06ec3569b808296e195d5791737da917646bae8720bc4a22ea1"; + sha256 = "01826ca896e4e8ab9aae14c9b68532339a10c908d469e66be9dfb44f850c4ae9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/tl/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/tl/firefox-109.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "4e62341fb007d85f698df462c1e9392f07507172d5024f87d6ff235a30c57c02"; + sha256 = "aa52050e375977f6dc3c09fd91afc5f2383015990cc5c2d2891fd354b2e214c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/tr/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/tr/firefox-109.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "fb9c6e4cb10989b8c2035a82676763bde55ae316041fcb50b12884cd1989ae29"; + sha256 = "96362f9c7f919676e715ba7d4a20266e4e534c75bf5b4dec87ef49585a3e5e46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/trs/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/trs/firefox-109.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "962cb775d8183fd471e21fd827285d5fb2b1b6a114d2564338b8eda95a0a778e"; + sha256 = "00ede759629983fc674a728a3f8c39b7b42bf132398b9077b623282809321f6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/uk/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/uk/firefox-109.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "4d9891fcae30f71f443f5dc261c5c0da246bc65dab0d08300fffe20adfda6ab3"; + sha256 = "054de96778b01b75459f1e391326dadbab5eabbc1ee2f0a464bb27b34ce15619"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/ur/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ur/firefox-109.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "e9321b199e7b7be1a9fbf730add917e22d5395950d6a209751201c732655a26d"; + sha256 = "eb9d0ace110b7b5f0ba6ecf0e3d2acf90ccc0c5c8af88625f9ecf0aa4e010ffd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/uz/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/uz/firefox-109.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "d6672f1f61ae608660270208ff21e37e4ce4d10f60eb539a301b506899896c05"; + sha256 = "d8a3429895051133ed8b93e7af9294340ca23b3570729fda4dc8127715898407"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/vi/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/vi/firefox-109.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "c1cd0c716fc6f2a4f1fb37a70318a887d92a86050984cd30c7c1afb186ae60de"; + sha256 = "a1180810cd4cbd14a2de895735505c8d7f98fb167bc874816eaf0817bbc98388"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/xh/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/xh/firefox-109.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "b703bebdcc28656a6f8205ffacb691fa04dab808022e33039aceff7cb9614521"; + sha256 = "c9cc91a22984dab35e254e5b2d299df311be6a55cd4f27cd49e68f668bf673d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/zh-CN/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/zh-CN/firefox-109.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "03b77986482e86075562deda483e003cf2dce6c5512b68bafefb5b3250165244"; + sha256 = "ffdd75e46d51f3287aee918e06c5ea389ae9e5fa8b642abf66c5041f0d3b2c5f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0/linux-i686/zh-TW/firefox-107.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/zh-TW/firefox-109.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "e6363101881c6722e3b7018642c921788c0e338aa489077ec39706b779f94be6"; + sha256 = "fc8848b76084c6df1c4e4932ec8f4f0d14d2bb565bb87dc30b3b759fe90d0924"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 19e0f2e96611..948b32172489 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -142,7 +142,7 @@ assert stdenv.cc.libc or null != null; 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}")]; + inherit (lib) enableFeature; # Target the LLVM version that rustc is built with for LTO. llvmPackages0 = rustc.llvmPackages; @@ -220,7 +220,7 @@ buildStdenv.mkDerivation ({ "profilingPhase" ]; - patches = lib.optionals (lib.versionOlder version "103") [ + patches = lib.optionals (lib.versionOlder version "102.6.0") [ (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1773259 name = "rust-cbindgen-0.24.2-compat.patch"; @@ -234,7 +234,7 @@ buildStdenv.mkDerivation ({ postPatch = '' rm -rf obj-x86_64-pc-linux-gnu - patchShebangs mach + patchShebangs mach build '' + extraPostPatch; @@ -291,11 +291,9 @@ buildStdenv.mkDerivation ({ # https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 unset AS - '' + lib.optionalString (lib.versionAtLeast version "100.0") '' # Use our own python export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system - '' + 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++ @@ -357,6 +355,7 @@ buildStdenv.mkDerivation ({ "--with-system-png" # needs APNG support "--with-system-webp" "--with-system-zlib" + "--with-wasi-sysroot=${wasiSysRoot}" # for firefox, host is buildPlatform, target is hostPlatform "--host=${buildStdenv.buildPlatform.config}" "--target=${buildStdenv.hostPlatform.config}" @@ -369,28 +368,26 @@ buildStdenv.mkDerivation ({ # elf-hack is broken when using clang+lld: # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" - ++ lib.optional (lib.versionAtLeast version "95") "--with-wasi-sysroot=${wasiSysRoot}" - - ++ flag alsaSupport "alsa" - ++ flag jackSupport "jack" - ++ flag pulseaudioSupport "pulseaudio" - ++ lib.optional (lib.versionAtLeast version "100") (flag sndioSupport "sndio") - ++ flag ffmpegSupport "ffmpeg" - ++ flag jemallocSupport "jemalloc" - ++ flag geolocationSupport "necko-wifi" - ++ flag gssSupport "negotiateauth" - ++ flag webrtcSupport "webrtc" - ++ flag crashreporterSupport "crashreporter" ++ lib.optional (!drmSupport) "--disable-eme" - - ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] - else [ "--disable-debug" "--enable-optimize" ]) - # --enable-release adds -ffunction-sections & LTO that require a big amount of - # RAM and the 32-bit memory space cannot handle that linking - ++ flag (!debugBuild && !stdenv.is32bit) "release" - ++ flag enableDebugSymbols "debug-symbols" + ++ [ + (enableFeature alsaSupport "alsa") + (enableFeature crashreporterSupport "crashreporter") + (enableFeature ffmpegSupport "ffmpeg") + (enableFeature geolocationSupport "necko-wifi") + (enableFeature gssSupport "negotiateauth") + (enableFeature jackSupport "jack") + (enableFeature jemallocSupport "jemalloc") + (enableFeature pulseaudioSupport "pulseaudio") + (enableFeature sndioSupport "sndio") + (enableFeature webrtcSupport "webrtc") + (enableFeature debugBuild "debug") + (if debugBuild then "--enable-profiling" else "--enable-optimize") + # --enable-release adds -ffunction-sections & LTO that require a big amount + # of RAM, and the 32-bit memory space cannot handle that linking + (enableFeature (!debugBuild && !stdenv.is32bit) "release") + (enableFeature enableDebugSymbols "debug-symbols") + ] ++ lib.optionals enableDebugSymbols [ "--disable-strip" "--disable-install-strip" ] - ++ lib.optional enableOfficialBranding "--enable-official-branding" ++ extraConfigureFlags; @@ -435,7 +432,7 @@ buildStdenv.mkDerivation ({ ++ lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport libjack2 ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed - ++ lib.optional (sndioSupport && lib.versionAtLeast version "100") sndio + ++ lib.optional sndioSupport sndio ++ lib.optional gssSupport libkrb5 ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] ++ lib.optional jemallocSupport jemalloc @@ -474,6 +471,9 @@ buildStdenv.mkDerivation ({ separateDebugInfo = enableDebugSymbols; enableParallelBuilding = true; + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null; + # tests were disabled in configureFlags doCheck = false; @@ -525,7 +525,7 @@ buildStdenv.mkDerivation ({ fi # Extract the debug info. - header "separating debug info from $i (build ID $id)" + echo "separating debug info from $i (build ID $id)" mkdir -p "$dst/''${id:0:2}" $OBJCOPY --only-keep-debug "$i" "$dst/''${id:0:2}/''${id:2}.debug" diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 5668e58c7482..6340a0a14e0b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = buildMozillaMach rec { pname = "firefox"; - version = "107.0"; + version = "109.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "4b442631079a13e1d11223499b1d8daf622d9d84b38898f9084670ddcb5738b73e0d967a5050d5930bf862aa69e8d46ebf6d751ac6d0f075a1d75ff4738bdb6e"; + sha512 = "58b21449a16a794152888f50e7fe9488c28739a7e067729acdc1de9f2e8384e6316cffdfe89f690f0d211189668d940825b4f8a26b8100468ae120772df99d72"; }; meta = { @@ -29,11 +29,11 @@ rec { firefox-esr-102 = buildMozillaMach rec { pname = "firefox-esr-102"; - version = "102.5.0esr"; + version = "102.7.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "f4e105209c61e9537ddc90afdb05ede0a31caceb9b164d96276c811abbd646d14bc246c00caa386c0b0561055096d30b298329c69270dd085b943bdbc3a91a13"; + sha512 = "2a9d212b5d15e1bf7a6156495126cbc9161d2057aeedea8f7a5a0670a19a9b00cf35044075935c8f3c788118856ba2cc00f9b297c5ac713f094857683f7cd13b"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 378fe1f4039b..06bd49facb81 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -15,6 +15,7 @@ , pciutils , sndio , libjack2 +, speechd }: ## configurability of the wrapper itself @@ -82,6 +83,7 @@ let ++ lib.optional sndioSupport sndio ++ lib.optional jackSupport libjack2 ++ lib.optional smartcardSupport opensc + ++ lib.optional (cfg.speechSynthesisSupport or false) speechd ++ pkcs11Modules; gtk_modules = [ libcanberra-gtk3 ]; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 82d6107d119e..01cd54cf8ee2 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -47,8 +47,6 @@ , addOpenGLRunpath }: -with lib; - let opusWithCustomModes = libopus.override { withCustomModes = true; @@ -68,8 +66,8 @@ let bzip2 libcap at-spi2-atk at-spi2-core libkrb5 libdrm libglvnd mesa coreutils libxkbcommon pipewire wayland - ] ++ optional pulseSupport libpulseaudio - ++ optional libvaSupport libva + ] ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional libvaSupport libva ++ [ gtk3 ]; suffix = if channel != "stable" then "-" + channel else ""; @@ -99,8 +97,8 @@ in stdenv.mkDerivation { tar xf data.tar.xz ''; - rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps; - binpath = makeBinPath deps; + rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps; + binpath = lib.makeBinPath deps; installPhase = '' runHook preInstall @@ -149,7 +147,7 @@ in stdenv.mkDerivation { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \ --set CHROME_WRAPPER "google-chrome-$dist" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --add-flags ${escapeShellArg commandLineArgs} + --add-flags ${lib.escapeShellArg commandLineArgs} for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary},nacl_helper}; do patchelf --set-rpath $rpath $elf @@ -159,7 +157,7 @@ in stdenv.mkDerivation { runHook postInstall ''; - meta = { + meta = with lib; { description = "A freeware web browser developed by Google"; homepage = "https://www.google.com/chrome/browser/"; license = licenses.unfree; diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 0bd3cc79df25..1bba399997f4 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -1,5 +1,5 @@ { lib -, gcc11Stdenv +, stdenv , fetchFromGitHub , cmake , ninja @@ -7,7 +7,6 @@ , wrapQtAppsHook , libxcrypt , qtbase -, qttools , nixosTests }: @@ -17,8 +16,8 @@ let serenity = fetchFromGitHub { rev = "a0f3e2c9a2b82117aa7c1a3444ad0d31baa070d5"; hash = "sha256-8Xde59ZfdkTD39mYSv0lfFjBHFDWTUwfozE+Q9Yq6C8="; }; - -in gcc11Stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "ladybird"; version = "unstable-2022-09-29"; @@ -30,6 +29,11 @@ in gcc11Stdenv.mkDerivation { hash = "sha256-XQj2Bohk8F6dGCAManOmmDP5b/SqEeZXZbLDYPfvi2E="; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "MACOSX_BUNDLE TRUE" "MACOSX_BUNDLE FALSE" + ''; + nativeBuildInputs = [ cmake ninja @@ -49,6 +53,20 @@ in gcc11Stdenv.mkDerivation { "-DENABLE_UNICODE_DATABASE_DOWNLOAD=false" ]; + # error: use of undeclared identifier 'aligned_alloc' + NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") [ + "-include mm_malloc.h" + "-Daligned_alloc=_mm_malloc" + ]); + + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + + # https://github.com/SerenityOS/serenity/issues/10055 + postInstall = lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath $out/lib $out/bin/ladybird + ''; + passthru.tests = { nixosTest = nixosTests.ladybird; }; @@ -58,7 +76,6 @@ in gcc11Stdenv.mkDerivation { homepage = "https://github.com/awesomekling/ladybird"; license = licenses.bsd2; maintainers = with maintainers; [ fgaz ]; - # SerenityOS only works on x86, and can only be built on unix systems. - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index b41f95b0b0cc..0a0eb47b0a19 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -15,15 +15,15 @@ , enableTUI ? false, ncurses, sealcurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.13.8"; + version = "1.14.2"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; - rev = "v${version}"; - sha256 = "sha256-SdncFkMCAY28njw361R70h6gcK0YHSU7AUwf9wzxCRo="; + rev = "v${finalAttrs.version}"; + hash = "sha256-9onjQ7fRLlL5/1vMtNHjBBcB7Fyk1ERaHg5IwtwbJQg="; }; nativeBuildInputs = [ cmake pkg-config zip ]; @@ -50,9 +50,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { @@ -62,4 +60,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index b3bc0b85b7a4..fe510c7fb9d4 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "107.0-1", + "packageVersion": "109.0-1", "source": { - "rev": "107.0-1", - "sha256": "1fm4z3s0z9shxj8667pnz3gly7jv1kmm1arbn52hq7n52ywykrv7" + "rev": "109.0-1", + "sha256": "18nd0shx1r2y2gn42sa2jlckcymmnx3fkm4fp58c80gcppslh1fs" }, "firefox": { - "version": "107.0", - "sha512": "4b442631079a13e1d11223499b1d8daf622d9d84b38898f9084670ddcb5738b73e0d967a5050d5930bf862aa69e8d46ebf6d751ac6d0f075a1d75ff4738bdb6e" + "version": "109.0", + "sha512": "9e2b6e20353e414da3d2eb9dcd3d77757664a98a4438a8e84f19a1c7c203e40136b08bf96a458fac05ddc627347217d32f1f6337980c5ca918874993657a58e7" } } diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index 4dc06cd466b5..d1631feb879a 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.27"; + version = "2.28"; pname = "links2"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "sha256-2N3L/O3nzd6Aq+sKI2NY9X+mvrK8+S4QliTpuJb567Q="; + sha256 = "sha256-L9VJmxPe5ZRXwTLBZ7hJXEDe2nU4lInGzMtoMZP0VLQ="; }; buildInputs = with lib; diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index 4812f69f34e8..66188f174753 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "luakit"; - version = "2.3.1"; + version = "2.3.3"; src = fetchFromGitHub { owner = "luakit"; repo = pname; rev = version; - hash = "sha256-6baN3e5ZJ8hw6mhQ0AapyVIYFSdmXcfo45ReQNliIPw="; + hash = "sha256-DtoixcLq+ddbacTAo+Qq6q4k1i6thirACw1zqUeOxXo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix index 98a5b1cf50f8..bedf059f2714 100644 --- a/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/pkgs/applications/networking/browsers/offpunk/default.nix @@ -1,5 +1,5 @@ { - fetchFromGitea, + fetchFromSourcehut, less, lib, makeWrapper, @@ -31,14 +31,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "offpunk"; - version = "1.6"; + version = "1.8"; - src = fetchFromGitea { - domain = "notabug.org"; - owner = "ploum"; + src = fetchFromSourcehut { + owner = "~lioploum"; repo = "offpunk"; rev = "v${finalAttrs.version}"; - sha256 = "1pfafb96xk7vis26zhfq254waz1ic9p0zdkxwpqs84p3vsmny775"; + sha256 = "0xv7b3qkwyq55sz7c0v0pknrpikhzyqgr5y4y30cwa7jd8sn423f"; }; nativeBuildInputs = [ makeWrapper ]; @@ -60,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "An Offline-First browser for the smolnet "; - homepage = "https://notabug.org/ploum/offpunk"; + homepage = finalAttrs.src.meta.homepage; maintainers = with maintainers; [ DamienCassou ]; platforms = platforms.linux; license = licenses.bsd2; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 92afe2f4baa0..2de8192150ec 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -41,27 +41,30 @@ , at-spi2-core , autoPatchelfHook , wrapGAppsHook +, qt5 +, proprietaryCodecs ? false +, vivaldi-ffmpeg-codecs }: let - mirror = "https://get.geo.opera.com/pub/opera/desktop"; - -in stdenv.mkDerivation rec { - +in +stdenv.mkDerivation rec { pname = "opera"; - version = "90.0.4480.84"; + version = "94.0.4606.54"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "sha256-GMcBTY3Ab8lYWv1IPdCeKPZwbY19NPHYmK7ATzvq0cg="; + hash = "sha256-IMWIkJHKaE7n5Rll4ZExE6PQB9a2fz0hLx4vckbROgk="; }; - unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; + unpackPhase = "dpkg-deb -x $src ."; nativeBuildInputs = [ + dpkg autoPatchelfHook wrapGAppsHook + qt5.wrapQtAppsHook ]; buildInputs = [ @@ -115,16 +118,22 @@ in stdenv.mkDerivation rec { # "Illegal instruction (core dumped)" gtk3 gtk4 + ] ++ lib.optional proprietaryCodecs [ + vivaldi-ffmpeg-codecs ]; + dontWrapQtApps = true; + installPhase = '' - mkdir -p $out - cp -r . $out/ + mkdir -p $out/bin + cp -r usr $out + cp -r usr/share $out/share + ln -s $out/usr/bin/opera $out/bin/opera ''; meta = with lib; { homepage = "https://www.opera.com"; - description = "Web browser"; + description = "Faster, safer and smarter web browser"; platforms = [ "x86_64-linux" ]; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 3d3339d06b5e..05e40ae79054 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -40,12 +40,12 @@ assert stdenv.cc.isGNU; assert with lib.strings; ( versionAtLeast stdenv.cc.version "7.1" - && versionOlder stdenv.cc.version "12" + && versionOlder stdenv.cc.version "13" ); stdenv.mkDerivation rec { pname = "palemoon"; - version = "31.3.1"; + version = "32.0.0"; src = fetchFromGitea { domain = "repo.palemoon.org"; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { repo = "Pale-Moon"; rev = "${version}_Release"; fetchSubmodules = true; - sha256 = "sha256-oLtCS5Izdk2ImyzKx2IXkzv6pJp86mvP99P0+XIteRA="; + sha256 = "sha256-0N63Xo8cRIHwEXkT8eeot0DgZU7aPirmVq/iHJjlGRw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/palemoon/mozconfig b/pkgs/applications/networking/browsers/palemoon/mozconfig index d680dc1ab44c..c481dbc29e8e 100644 --- a/pkgs/applications/networking/browsers/palemoon/mozconfig +++ b/pkgs/applications/networking/browsers/palemoon/mozconfig @@ -19,7 +19,7 @@ ac_add_options --enable-jemalloc ac_add_options --enable-strip ac_add_options --enable-devtools ac_add_options --enable-av1 -ac_add_options --enable-phoenix-extensions +ac_add_options --enable-jxl ac_add_options --disable-eme ac_add_options --disable-webrtc diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index ad7f6e5154ad..87dc7dcb1d01 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -7,7 +7,7 @@ let src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "eujv99L5svMhDIKHFOfm7sOwNZ4xiUaIsimfOf4BBik="; + sha256 = "sha256-J0D49VESNgdBEWAf01LkiiU2I01r4PBLyWKpnE9t45Q="; }; appimageContents = appimageTools.extractType2 { 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 df10fc474257..43865f051ba2 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -53,10 +53,8 @@ , extraPrefs ? "" }: -with lib; - let - libPath = makeLibraryPath libPkgs; + libPath = lib.makeLibraryPath libPkgs; libPkgs = [ atk @@ -78,16 +76,16 @@ let stdenv.cc.libc zlib ] - ++ optionals pulseaudioSupport [ libpulseaudio ] - ++ optionals mediaSupport [ + ++ lib.optionals pulseaudioSupport [ libpulseaudio ] + ++ lib.optionals mediaSupport [ ffmpeg ]; # Library search path for the fte transport - fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; + fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.5.7"; + version = "11.5.8"; lang = "en-US"; @@ -99,7 +97,7 @@ let "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 = "sha256-K50T9Fe6tMuP1J5gfwK9f/25ZeakQ9vsJi4IOPa6fMk="; + sha256 = "sha256-/KK9oTijk5dEziAwp5966NaM2V4k1mtBjTJq88Ct7N0="; }; i686-linux = fetchurl { @@ -109,7 +107,7 @@ let "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 = "sha256-tbL/iTI3vR0gdMcLwOoWlfIDZNefIKA2hfvWKNNM9vE="; + sha256 = "sha256-TGdJ5yIeo0YQ4XSsb9lv3vuW6qEjhFe7KBmkjYO6fAc="; }; }; in @@ -156,7 +154,7 @@ stdenv.mkDerivation rec { libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor # apulse uses a non-standard library path. For now special-case it. - ${optionalString (audioSupport && !pulseaudioSupport) '' + ${lib.optionalString (audioSupport && !pulseaudioSupport) '' libPath=${apulse}/lib/apulse:$libPath ''} @@ -224,7 +222,7 @@ stdenv.mkDerivation rec { clearPref("security.sandbox.content.write_path_whitelist"); ''} - ${optionalString (extraPrefs != "") '' + ${lib.optionalString (extraPrefs != "") '' ${extraPrefs} ''} EOF @@ -251,14 +249,14 @@ stdenv.mkDerivation rec { GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6 EOF - WRAPPER_LD_PRELOAD=${optionalString useHardenedMalloc + WRAPPER_LD_PRELOAD=${lib.optionalString useHardenedMalloc "${graphene-hardened-malloc}/lib/libhardened_malloc.so"} - WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ + WRAPPER_XDG_DATA_DIRS=${lib.concatMapStringsSep ":" (x: "${x}/share") [ gnome.adwaita-icon-theme shared-mime-info ]} - WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [ + WRAPPER_XDG_DATA_DIRS+=":"${lib.concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [ glib gsettings-desktop-schemas gtk3 @@ -270,7 +268,7 @@ stdenv.mkDerivation rec { #! ${runtimeShell} set -o errexit -o nounset - PATH=${makeBinPath [ coreutils ]} + PATH=${lib.makeBinPath [ coreutils ]} export LC_ALL=C export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive @@ -317,7 +315,7 @@ stdenv.mkDerivation rec { : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}" : "\''${XDG_CONFIG_HOME:=\$REAL_HOME/.config}" - ${optionalString pulseaudioSupport '' + ${lib.optionalString pulseaudioSupport '' # Figure out some envvars for pulseaudio : "\''${PULSE_SERVER:=\$XDG_RUNTIME_DIR/pulse/native}" : "\''${PULSE_COOKIE:=\$XDG_CONFIG_HOME/pulse/cookie}" diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 29f3cbd0b13b..5441c7a58cbd 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -1,14 +1,14 @@ -{ mkYarnPackage, fetchFromGitHub, electron, makeWrapper, makeDesktopItem, lib, p7zip }: +{ mkYarnPackage, fetchFromGitHub, electron, makeWrapper, makeDesktopItem, lib }: mkYarnPackage rec { pname = "vieb"; - version = "7.2.0"; + version = "9.5.0"; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - sha256 = "sha256-4iokmUzs72aVHb95D98ZITRygn4gGAc/K+M5uMnF2NM="; + sha256 = "sha256-SWHjzrEvRlTn4HJnT81Le4KsFDypN3QH3F/z7zZ8p3E="; }; packageJSON = ./package.json; @@ -37,8 +37,6 @@ mkYarnPackage rec { unlink $out/libexec/vieb/deps/vieb/node_modules ln -s $out/libexec/vieb/node_modules $out/libexec/vieb/deps/vieb/node_modules - find $out/libexec/vieb/node_modules/7zip-bin -name 7za -exec ln -s -f ${p7zip}/bin/7za {} ';' - install -Dm0644 {${desktopItem},$out}/share/applications/vieb.desktop pushd $out/libexec/vieb/node_modules/vieb/app/img/icons @@ -48,7 +46,8 @@ mkYarnPackage rec { popd makeWrapper ${electron}/bin/electron $out/bin/vieb \ - --add-flags $out/libexec/vieb/node_modules/vieb/app + --add-flags $out/libexec/vieb/node_modules/vieb/app \ + --set npm_package_version ${version} ''; distPhase = ":"; # disable useless $out/tarballs directory diff --git a/pkgs/applications/networking/browsers/vieb/package.json b/pkgs/applications/networking/browsers/vieb/package.json index 0e518f5ef4af..d9ce8e30269c 100644 --- a/pkgs/applications/networking/browsers/vieb/package.json +++ b/pkgs/applications/networking/browsers/vieb/package.json @@ -1,20 +1,16 @@ { "name": "vieb", "productName": "Vieb", - "version": "7.1.2", + "version": "9.5.0", "description": "Vim Inspired Electron Browser", "main": "app/index.js", "scripts": { - "build": "node build.js", - "buildall": "node build.js --linux --win --mac", - "buildlinux": "node build.js --linux", - "buildmac": "node build.js --mac", - "buildwin": "node build.js --win", "dev": "electron app --datafolder=./ViebData/", "fix": "eslint --fix app .eslintrc.js build.js", "lint": "eslint app .eslintrc.js build.js", "start": "electron app", - "test": "TZ=UTC 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", + "test:all": "npm run test && npm run lint && echo 'All good :)'" }, "repository": "https://github.com/Jelmerro/Vieb", "homepage": "https://vieb.dev", @@ -26,20 +22,28 @@ ], "author": "Jelmer van Arnhem", "email": "Jelmerro@users.noreply.github.com", + "funding": "https://github.com/sponsors/Jelmerro/", "license": "GPL-3.0-or-later", "devDependencies": { - "electron": "17.0.1", - "electron-builder": "22.14.13", - "eslint": "8.9.0", + "electron": "22.0.0", + "electron-builder": "24.0.0-alpha.7", + "eslint": "8.29.0", "eslint-plugin-sort-keys": "2.3.5", - "jest": "27.5.1", - "jest-environment-jsdom": "27.5.1" + "jest": "29.3.1", + "jest-environment-jsdom": "29.3.1", + "terser-webpack-plugin": "5.3.6", + "webpack": "5.75.0", + "webpack-cli": "5.0.1", + "webpack-node-externals": "3.0.0" }, "dependencies": { - "7zip-bin": "5.1.1", - "@cliqz/adblocker-electron": "1.23.6", - "@cliqz/adblocker-electron-preload": "1.23.6", - "is-svg": "4.3.2", - "rimraf": "3.0.2" + "@cliqz/adblocker-electron": "1.25.1", + "@cliqz/adblocker-electron-preload": "1.25.1", + "@mozilla/readability": "0.4.2", + "darkreader": "4.9.58", + "highlight.js": "11.7.0", + "jsdom": "20.0.3", + "marked": "4.2.4", + "picomatch": "2.3.1" } } diff --git a/pkgs/applications/networking/browsers/vieb/yarn.lock b/pkgs/applications/networking/browsers/vieb/yarn.lock index 4f5254819b16..135587f6b47e 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.lock +++ b/pkgs/applications/networking/browsers/vieb/yarn.lock @@ -2,172 +2,169 @@ # yarn lockfile v1 -"7zip-bin@5.1.1", "7zip-bin@~5.1.1": +"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== "@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== + version "2.2.0" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" + integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== dependencies: - "@jridgewell/trace-mapping" "^0.3.0" + "@jridgewell/gen-mapping" "^0.1.0" + "@jridgewell/trace-mapping" "^0.3.9" -"@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== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" + integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== dependencies: - "@babel/highlight" "^7.16.7" + "@babel/highlight" "^7.18.6" -"@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/compat-data@^7.20.5": + version "7.20.5" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733" + integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g== -"@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== +"@babel/core@^7.11.6", "@babel/core@^7.12.3": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz#37072f951bd4d28315445f66e0ec9f6ae0c8c35f" + integrity sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw== dependencies: "@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" + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.20.7" + "@babel/helper-compilation-targets" "^7.20.7" + "@babel/helper-module-transforms" "^7.20.7" + "@babel/helpers" "^7.20.7" + "@babel/parser" "^7.20.7" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.1.2" + json5 "^2.2.1" semver "^6.3.0" -"@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== +"@babel/generator@^7.20.7", "@babel/generator@^7.7.2": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a" + integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw== dependencies: - "@babel/types" "^7.17.0" + "@babel/types" "^7.20.7" + "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" - source-map "^0.5.0" -"@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== +"@babel/helper-compilation-targets@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb" + integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ== dependencies: - "@babel/compat-data" "^7.17.7" - "@babel/helper-validator-option" "^7.16.7" - browserslist "^4.17.5" + "@babel/compat-data" "^7.20.5" + "@babel/helper-validator-option" "^7.18.6" + browserslist "^4.21.3" + lru-cache "^5.1.1" semver "^6.3.0" -"@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== +"@babel/helper-environment-visitor@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" + integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== + +"@babel/helper-function-name@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" + integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== dependencies: - "@babel/types" "^7.16.7" + "@babel/template" "^7.18.10" + "@babel/types" "^7.19.0" -"@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== +"@babel/helper-hoist-variables@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" + integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== dependencies: - "@babel/helper-get-function-arity" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.6" -"@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== +"@babel/helper-module-imports@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" + integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.6" -"@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== +"@babel/helper-module-transforms@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz#7a6c9a1155bef55e914af574153069c9d9470c43" + integrity sha512-FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA== dependencies: - "@babel/types" "^7.16.7" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-simple-access" "^7.20.2" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/helper-validator-identifier" "^7.19.1" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" -"@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== +"@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.18.6", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.8.0": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" + integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== + +"@babel/helper-simple-access@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" + integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.20.2" -"@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== +"@babel/helper-split-export-declaration@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" + integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== dependencies: - "@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/types" "^7.18.6" -"@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-string-parser@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" + integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== -"@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== +"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": + version "7.19.1" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" + integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== + +"@babel/helper-validator-option@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" + integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== + +"@babel/helpers@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz#04502ff0feecc9f20ecfaad120a18f011a8e6dce" + integrity sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA== dependencies: - "@babel/types" "^7.17.0" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" -"@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== +"@babel/highlight@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" + integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== dependencies: - "@babel/types" "^7.16.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/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/template" "^7.16.7" - "@babel/traverse" "^7.17.3" - "@babel/types" "^7.17.0" - -"@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" + "@babel/helper-validator-identifier" "^7.18.6" chalk "^2.0.0" js-tokens "^4.0.0" -"@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/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b" + integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -204,6 +201,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-jsx@^7.7.2": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0" + integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" @@ -254,43 +258,44 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript@^7.7.2": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz#39c9b55ee153151990fb038651d58d3fd03f98f8" - integrity sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A== + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz#4e9a0cfc769c85689b77a2e642d24e9f697fc8c7" + integrity sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ== dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.19.0" -"@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== +"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" + integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/parser" "^7.16.7" - "@babel/types" "^7.16.7" + "@babel/code-frame" "^7.18.6" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" -"@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== +"@babel/traverse@^7.20.7", "@babel/traverse@^7.7.2": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.7.tgz#114f992fa989a390896ea72db5220780edab509c" + integrity sha512-xueOL5+ZKX2dJbg8z8o4f4uTRTqGDRjilva9D1hiRlayJbTY8jBRL+Ph67IeRTIE439/VifHk+Z4g0SwRtQE0A== dependencies: - "@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" + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.20.7" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" debug "^4.1.0" globals "^11.1.0" -"@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== +"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f" + integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg== dependencies: - "@babel/helper-validator-identifier" "^7.16.7" + "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -298,52 +303,45 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@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== +"@cliqz/adblocker-content@^1.25.1": + version "1.25.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.25.1.tgz#da81e7838e288a6f0fdb8a97a0df8169accb74a1" + integrity sha512-7gl2VdNPBfj7aPoq34B5miwGcnda/7LCr+BqnpcSOjdLV6jjT2FrNSAKGFvcH23q0HM1IFhYDV6ydTgsdWFCnA== dependencies: - "@cliqz/adblocker-extended-selectors" "^1.23.7" + "@cliqz/adblocker-extended-selectors" "^1.25.1" -"@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== +"@cliqz/adblocker-electron-preload@1.25.1", "@cliqz/adblocker-electron-preload@^1.25.1": + version "1.25.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.25.1.tgz#83bd59d8e94436c451af3525d9902fa5fa1be3ab" + integrity sha512-edNVEqGrXqe/Qwi0D9/V8xmtyeJlhNPaelXilYa1ne7jG/OT7pee+7Vi4BWezl0NQ77WF3/mY9Bj4eJkEO0uiQ== dependencies: - "@cliqz/adblocker-content" "^1.23.6" + "@cliqz/adblocker-content" "^1.25.1" -"@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== +"@cliqz/adblocker-electron@1.25.1": + version "1.25.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.25.1.tgz#44d9034e35c78938a772b10f8096df55a4accc41" + integrity sha512-CKStwRTR2L78EjgmuUpLKkV9s/uVnwQNGr7I/hyMkEROXbGdrN7P5LhwO+kkewccZ+3JtE509PBmZAp0EP71dw== dependencies: - "@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" + "@cliqz/adblocker" "^1.25.1" + "@cliqz/adblocker-electron-preload" "^1.25.1" tldts-experimental "^5.6.21" -"@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-extended-selectors@^1.25.1": + version "1.25.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.25.1.tgz#cfac0080952311399805fe153cd9e7e1331b3c6d" + integrity sha512-4MdMe/YfIok5d8WYVcLR3Ak7vGrmeUV47frgmXEe945luY93vwlzk1NiLYW1JM5Gdm+VePweoS9cJ1/QUTmv+Q== -"@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== +"@cliqz/adblocker@^1.25.1": + version "1.25.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.25.1.tgz#4d3e8894ce48ad0d0f8b26a4a1003f0676b7f734" + integrity sha512-1C1/ELI94/XewdUj/o1+Q4ziOigMvTZQA05UERfDoKqpJ+0cbrEF/UImrzpX7n+kYsR7xTJvmf+iNM3zS0tfsg== dependencies: - "@cliqz/adblocker-content" "^1.23.7" - "@cliqz/adblocker-extended-selectors" "^1.23.7" + "@cliqz/adblocker-content" "^1.25.1" + "@cliqz/adblocker-extended-selectors" "^1.25.1" "@remusao/guess-url-type" "^1.1.2" "@remusao/small" "^1.1.2" "@remusao/smaz" "^1.7.1" - "@types/chrome" "^0.0.180" + "@types/chrome" "^0.0.197" "@types/firefox-webext-browser" "^94.0.0" tldts-experimental "^5.6.21" @@ -355,56 +353,124 @@ 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== +"@discoveryjs/json-ext@^0.5.0": + version "0.5.7" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" + integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== + +"@electron/asar@^3.2.1": + version "3.2.2" + resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.2.tgz#f6ae4eb4343ad00b994c40db3f09f71f968ff9c0" + integrity sha512-32fMU68x8a6zvxtC1IC/BhPDKTh8rQjdmwEplj3CDpnkcwBzZVN9v/8cK0LJqQ0FOQQVZW8BWZ1S6UU53TYR4w== + 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" + +"@electron/get@^2.0.0": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e" + integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g== dependencies: debug "^4.1.1" env-paths "^2.2.0" fs-extra "^8.1.0" - got "^9.6.0" + got "^11.8.5" 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.0.5": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.5.tgz#b812340e4ef21da2b3ee77b2b4d35c9b86defe37" - integrity sha512-zX9O6+jr2NMyAdSkwEUlyltiI4/EBLu2Ls/VD3pUQdi3cAYeYfdQnT2AJJ38HE4QxLccbU13LSpccw1IWlkyag== +"@electron/notarize@^1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-1.2.3.tgz#38056a629e5a0b5fd56c975c4828c0f74285b644" + integrity sha512-9oRzT56rKh5bspk3KpAVF8lPKHYQrBnRwcgiOeR0hdilVEQmszDaAu0IPCPrwwzJN0ugNs0rRboTreHMt/6mBQ== dependencies: - "@malept/cross-spawn-promise" "^1.1.0" - asar "^3.0.3" - debug "^4.3.1" - dir-compare "^2.4.0" + debug "^4.1.1" fs-extra "^9.0.1" -"@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== +"@electron/osx-sign@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.4.tgz#8e91442846471636ca0469426a82b253b9170151" + integrity sha512-xfhdEcIOfAZg7scZ9RQPya1G1lWo8/zMCwUXAulq0SfY7ONIW+b9qGyKdMyuMctNYwllrIS+vmxfijSfjeh97g== + dependencies: + compare-version "^0.1.2" + debug "^4.3.4" + fs-extra "^10.0.0" + isbinaryfile "^4.0.8" + minimist "^1.2.6" + plist "^3.0.5" + +"@electron/rebuild@^3.2.10": + version "3.2.10" + resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.2.10.tgz#adc9443179709d4e4b93a68fac6a08b9a3b9e5e6" + integrity sha512-SUBM6Mwi3yZaDFQjZzfGKpYTtOp9m60glounwX6tfGeVc/ZOl4jbquktUcyy7gYSLDWFLtKkftkY2xgMJZLQgg== + dependencies: + "@malept/cross-spawn-promise" "^2.0.0" + chalk "^4.0.0" + debug "^4.1.1" + detect-libc "^2.0.1" + fs-extra "^10.0.0" + got "^11.7.0" + lzma-native "^8.0.5" + node-abi "^3.0.0" + node-api-version "^0.1.4" + node-gyp "^9.0.0" + ora "^5.1.0" + semver "^7.3.5" + tar "^6.0.5" + yargs "^17.0.1" + +"@electron/universal@1.3.4": + version "1.3.4" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.3.4.tgz#bccd94b635d7c85eeed5eabba457eb4ed2be2777" + integrity sha512-BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg== + dependencies: + "@electron/asar" "^3.2.1" + "@malept/cross-spawn-promise" "^1.1.0" + debug "^4.3.1" + dir-compare "^3.0.0" + fs-extra "^9.0.1" + minimatch "^3.0.4" + plist "^3.0.4" + +"@eslint/eslintrc@^1.3.3": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.0.tgz#8ec64e0df3e7a1971ee1ff5158da87389f167a63" + integrity sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A== dependencies: ajv "^6.12.4" debug "^4.3.2" - espree "^9.3.1" - globals "^13.9.0" + espree "^9.4.0" + globals "^13.19.0" ignore "^5.2.0" import-fresh "^3.2.1" js-yaml "^4.1.0" - minimatch "^3.0.4" + minimatch "^3.1.2" 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== +"@gar/promisify@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" + integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== + +"@humanwhocodes/config-array@^0.11.6": + version "0.11.8" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" + integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== dependencies: "@humanwhocodes/object-schema" "^1.2.1" debug "^4.1.1" - minimatch "^3.0.4" + minimatch "^3.0.5" + +"@humanwhocodes/module-importer@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" + integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== "@humanwhocodes/object-schema@^1.2.1": version "1.2.1" @@ -427,193 +493,246 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@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== +"@jest/console@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.3.1.tgz#3e3f876e4e47616ea3b1464b9fbda981872e9583" + integrity sha512-IRE6GD47KwcqA09RIWrabKdHPiKDGgtAL31xDxbi/RjQMsr+lY+ppxmHwY0dUEV3qvvxZzoe5Hl0RXZJOjQNUg== dependencies: - "@jest/types" "^27.5.1" + "@jest/types" "^29.3.1" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^27.5.1" - jest-util "^27.5.1" + jest-message-util "^29.3.1" + jest-util "^29.3.1" slash "^3.0.0" -"@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== +"@jest/core@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.3.1.tgz#bff00f413ff0128f4debec1099ba7dcd649774a1" + integrity sha512-0ohVjjRex985w5MmO5L3u5GR1O30DexhBSpuwx2P+9ftyqHdJXnk7IUWiP80oHMvt7ubHCJHxV0a0vlKVuZirw== dependencies: - "@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" + "@jest/console" "^29.3.1" + "@jest/reporters" "^29.3.1" + "@jest/test-result" "^29.3.1" + "@jest/transform" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - emittery "^0.8.1" + ci-info "^3.2.0" exit "^0.1.2" 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" + jest-changed-files "^29.2.0" + jest-config "^29.3.1" + jest-haste-map "^29.3.1" + jest-message-util "^29.3.1" + jest-regex-util "^29.2.0" + jest-resolve "^29.3.1" + jest-resolve-dependencies "^29.3.1" + jest-runner "^29.3.1" + jest-runtime "^29.3.1" + jest-snapshot "^29.3.1" + jest-util "^29.3.1" + jest-validate "^29.3.1" + jest-watcher "^29.3.1" micromatch "^4.0.4" - rimraf "^3.0.0" + pretty-format "^29.3.1" slash "^3.0.0" strip-ansi "^6.0.0" -"@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== +"@jest/environment@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.3.1.tgz#eb039f726d5fcd14698acd072ac6576d41cfcaa6" + integrity sha512-pMmvfOPmoa1c1QpfFW0nXYtNLpofqo4BrCIk6f2kW4JFeNlHV2t3vd+3iDLf31e2ot2Mec0uqZfmI+U0K2CFag== dependencies: - "@jest/fake-timers" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/fake-timers" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" - jest-mock "^27.5.1" + jest-mock "^29.3.1" -"@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== +"@jest/expect-utils@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.3.1.tgz#531f737039e9b9e27c42449798acb5bba01935b6" + integrity sha512-wlrznINZI5sMjwvUoLVk617ll/UYfGIZNxmbU+Pa7wmkL4vYzhV9R2pwVqUh4NWWuLQWkI8+8mOkxs//prKQ3g== dependencies: - "@jest/types" "^27.5.1" - "@sinonjs/fake-timers" "^8.0.1" + jest-get-type "^29.2.0" + +"@jest/expect@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.3.1.tgz#456385b62894349c1d196f2d183e3716d4c6a6cd" + integrity sha512-QivM7GlSHSsIAWzgfyP8dgeExPRZ9BIe2LsdPyEhCGkZkoyA+kGsoIzbKAfZCvvRzfZioKwPtCZIt5SaoxYCvg== + dependencies: + expect "^29.3.1" + jest-snapshot "^29.3.1" + +"@jest/fake-timers@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.3.1.tgz#b140625095b60a44de820876d4c14da1aa963f67" + integrity sha512-iHTL/XpnDlFki9Tq0Q1GGuVeQ8BHZGIYsvCO5eN/O/oJaRzofG9Xndd9HuSDBI/0ZS79pg0iwn07OMTQ7ngF2A== + dependencies: + "@jest/types" "^29.3.1" + "@sinonjs/fake-timers" "^9.1.2" "@types/node" "*" - jest-message-util "^27.5.1" - jest-mock "^27.5.1" - jest-util "^27.5.1" + jest-message-util "^29.3.1" + jest-mock "^29.3.1" + jest-util "^29.3.1" -"@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== +"@jest/globals@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.3.1.tgz#92be078228e82d629df40c3656d45328f134a0c6" + integrity sha512-cTicd134vOcwO59OPaB6AmdHQMCtWOe+/DitpTZVxWgMJ+YvXL1HNAmPyiGbSHmF/mXVBkvlm8YYtQhyHPnV6Q== dependencies: - "@jest/environment" "^27.5.1" - "@jest/types" "^27.5.1" - expect "^27.5.1" + "@jest/environment" "^29.3.1" + "@jest/expect" "^29.3.1" + "@jest/types" "^29.3.1" + jest-mock "^29.3.1" -"@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== +"@jest/reporters@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.3.1.tgz#9a6d78c109608e677c25ddb34f907b90e07b4310" + integrity sha512-GhBu3YFuDrcAYW/UESz1JphEAbvUjaY2vShRZRoRY1mxpCMB3yGSJ4j9n0GxVlEOdCf7qjvUfBCrTUUqhVfbRA== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/transform" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/console" "^29.3.1" + "@jest/test-result" "^29.3.1" + "@jest/transform" "^29.3.1" + "@jest/types" "^29.3.1" + "@jridgewell/trace-mapping" "^0.3.15" "@types/node" "*" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" - glob "^7.1.2" + glob "^7.1.3" graceful-fs "^4.2.9" istanbul-lib-coverage "^3.0.0" istanbul-lib-instrument "^5.1.0" istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" 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" + jest-message-util "^29.3.1" + jest-util "^29.3.1" + jest-worker "^29.3.1" slash "^3.0.0" - source-map "^0.6.0" string-length "^4.0.1" - terminal-link "^2.0.0" - v8-to-istanbul "^8.1.0" + strip-ansi "^6.0.0" + v8-to-istanbul "^9.0.1" -"@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== +"@jest/schemas@^29.0.0": + version "29.0.0" + resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz#5f47f5994dd4ef067fb7b4188ceac45f77fe952a" + integrity sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA== dependencies: + "@sinclair/typebox" "^0.24.1" + +"@jest/source-map@^29.2.0": + version "29.2.0" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.2.0.tgz#ab3420c46d42508dcc3dc1c6deee0b613c235744" + integrity sha512-1NX9/7zzI0nqa6+kgpSdKPK+WU1p+SJk3TloWZf5MzPbxri9UEeXX5bWZAPCzbQcyuAzubcdUHA7hcNznmRqWQ== + dependencies: + "@jridgewell/trace-mapping" "^0.3.15" callsites "^3.0.0" graceful-fs "^4.2.9" - source-map "^0.6.0" -"@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== +"@jest/test-result@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.3.1.tgz#92cd5099aa94be947560a24610aa76606de78f50" + integrity sha512-qeLa6qc0ddB0kuOZyZIhfN5q0e2htngokyTWsGriedsDhItisW7SDYZ7ceOe57Ii03sL988/03wAcBh3TChMGw== dependencies: - "@jest/console" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/console" "^29.3.1" + "@jest/types" "^29.3.1" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@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== +"@jest/test-sequencer@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.3.1.tgz#fa24b3b050f7a59d48f7ef9e0b782ab65123090d" + integrity sha512-IqYvLbieTv20ArgKoAMyhLHNrVHJfzO6ARZAbQRlY4UGWfdDnLlZEF0BvKOMd77uIiIjSZRwq3Jb3Fa3I8+2UA== dependencies: - "@jest/test-result" "^27.5.1" + "@jest/test-result" "^29.3.1" graceful-fs "^4.2.9" - jest-haste-map "^27.5.1" - jest-runtime "^27.5.1" + jest-haste-map "^29.3.1" + slash "^3.0.0" -"@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== +"@jest/transform@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.3.1.tgz#1e6bd3da4af50b5c82a539b7b1f3770568d6e36d" + integrity sha512-8wmCFBTVGYqFNLWfcOWoVuMuKYPUBTnTMDkdvFtAYELwDOl9RGwOsvQWGPFxDJ8AWY9xM/8xCXdqmPK3+Q5Lug== dependencies: - "@babel/core" "^7.1.0" - "@jest/types" "^27.5.1" + "@babel/core" "^7.11.6" + "@jest/types" "^29.3.1" + "@jridgewell/trace-mapping" "^0.3.15" babel-plugin-istanbul "^6.1.1" chalk "^4.0.0" - convert-source-map "^1.4.0" - fast-json-stable-stringify "^2.0.0" + convert-source-map "^2.0.0" + fast-json-stable-stringify "^2.1.0" graceful-fs "^4.2.9" - jest-haste-map "^27.5.1" - jest-regex-util "^27.5.1" - jest-util "^27.5.1" + jest-haste-map "^29.3.1" + jest-regex-util "^29.2.0" + jest-util "^29.3.1" micromatch "^4.0.4" pirates "^4.0.4" slash "^3.0.0" - source-map "^0.6.1" - write-file-atomic "^3.0.0" + write-file-atomic "^4.0.1" -"@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== +"@jest/types@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.3.1.tgz#7c5a80777cb13e703aeec6788d044150341147e3" + integrity sha512-d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA== dependencies: + "@jest/schemas" "^29.0.0" "@types/istanbul-lib-coverage" "^2.0.0" "@types/istanbul-reports" "^3.0.0" "@types/node" "*" - "@types/yargs" "^16.0.0" + "@types/yargs" "^17.0.8" 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== +"@jridgewell/gen-mapping@^0.1.0": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" + integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== dependencies: - "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/set-array" "^1.0.0" "@jridgewell/sourcemap-codec" "^1.4.10" +"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" + integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== + dependencies: + "@jridgewell/set-array" "^1.0.1" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/resolve-uri@3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" + integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== + +"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" + integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== + +"@jridgewell/source-map@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" + integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== + dependencies: + "@jridgewell/gen-mapping" "^0.3.0" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.14" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" + integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== + +"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.9": + version "0.3.17" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" + integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== + dependencies: + "@jridgewell/resolve-uri" "3.1.0" + "@jridgewell/sourcemap-codec" "1.4.14" + "@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" @@ -621,6 +740,13 @@ dependencies: cross-spawn "^7.0.1" +"@malept/cross-spawn-promise@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz#d0772de1aa680a0bfb9ba2f32b4c828c7857cb9d" + integrity sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg== + 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" @@ -631,6 +757,48 @@ lodash "^4.17.15" tmp-promise "^3.0.2" +"@mozilla/readability@0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@mozilla/readability/-/readability-0.4.2.tgz#a425f3dccdbe777d45a4e791bd703ebe633ebb87" + integrity sha512-48MJXzi4Dhy2fJ3lGjmwdEJKoMmn3oiYew9n/1OW6cZy78hAzRIyDJDBCGrg4PBFDyY4xos+H4LCFn5QVRDcfw== + +"@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": + 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.8": + 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" + +"@npmcli/fs@^2.1.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865" + integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ== + dependencies: + "@gar/promisify" "^1.1.3" + semver "^7.3.5" + +"@npmcli/move-file@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4" + integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ== + dependencies: + mkdirp "^1.0.4" + rimraf "^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" @@ -666,46 +834,46 @@ resolved "https://registry.yarnpkg.com/@remusao/trie/-/trie-1.4.1.tgz#755d09f8a007476334e611f42719b2d581f00720" integrity sha512-yvwa+aCyYI/UjeD39BnpMypG8N06l86wIDW1/PAc6ihBRnodIfZDwccxQN3n1t74wduzaz74m4ZMHZnB06567Q== -"@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== +"@sinclair/typebox@^0.24.1": + version "0.24.51" + resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f" + integrity sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA== + +"@sindresorhus/is@^4.0.0": + version "4.6.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" + integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== "@sinonjs/commons@^1.7.0": - version "1.8.3" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" - integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ== + version "1.8.6" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9" + integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ== dependencies: type-detect "4.0.8" -"@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== +"@sinonjs/fake-timers@^9.1.2": + version "9.1.2" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c" + integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw== dependencies: "@sinonjs/commons" "^1.7.0" -"@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== +"@szmarczak/http-timer@^4.0.5": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807" + integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w== dependencies: - defer-to-connect "^1.0.1" - -"@tootallnate/once@1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" - integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + defer-to-connect "^2.0.0" "@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.19" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460" - integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw== +"@types/babel__core@^7.1.14": + version "7.1.20" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.20.tgz#e168cdd612c92a2d335029ed62ac94c95b362359" + integrity sha512-PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -728,17 +896,27 @@ "@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.2" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43" - integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA== +"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": + version "7.18.3" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.3.tgz#dfc508a85781e5698d5b33443416b6268c4b3e8d" + integrity sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w== dependencies: "@babel/types" "^7.3.0" -"@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== +"@types/cacheable-request@^6.0.1": + version "6.0.3" + resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183" + integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw== + dependencies: + "@types/http-cache-semantics" "*" + "@types/keyv" "^3.1.4" + "@types/node" "*" + "@types/responselike" "^1.0.0" + +"@types/chrome@^0.0.197": + version "0.0.197" + resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.197.tgz#c1b50cdb72ee40f9bc1411506031a9f8a925ab35" + integrity sha512-m1NfS5bOjaypyqQfaX6CxmJodZVcvj5+Mt/K94EBHkflYjPNmXHAzbxfifdLMa0YM3PDyOxohoTS5ug/e6p5jA== dependencies: "@types/filesystem" "*" "@types/har-format" "*" @@ -750,6 +928,32 @@ dependencies: "@types/ms" "*" +"@types/eslint-scope@^3.7.3": + version "3.7.4" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16" + integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA== + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "8.4.10" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.10.tgz#19731b9685c19ed1552da7052b6f668ed7eb64bb" + integrity sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" + integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== + +"@types/estree@^0.0.51": + version "0.0.51" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" + integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== + "@types/filesystem@*": version "0.0.32" resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.32.tgz#307df7cc084a2293c3c1a31151b178063e0a8edf" @@ -782,7 +986,7 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/graceful-fs@^4.1.2": +"@types/graceful-fs@^4.1.3": version "4.1.5" resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== @@ -790,9 +994,14 @@ "@types/node" "*" "@types/har-format@*": - 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== + version "1.2.10" + resolved "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.10.tgz#7b4e1e0ada4d17684ac3b05d601a4871cfab11fc" + integrity sha512-o0J30wqycjF5miWDKYKKzzOU1ZTLuA42HZ4HE7/zqTOc/jTLdQ5NhYWvsRQo45Nfi1KHoRdNhteSI4BAxTF1Pg== + +"@types/http-cache-semantics@*": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" + integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.4" @@ -813,10 +1022,31 @@ dependencies: "@types/istanbul-lib-report" "*" +"@types/jsdom@^20.0.0": + version "20.0.1" + resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-20.0.1.tgz#07c14bc19bd2f918c1929541cdaacae894744808" + integrity sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ== + dependencies: + "@types/node" "*" + "@types/tough-cookie" "*" + parse5 "^7.0.0" + +"@types/json-schema@*", "@types/json-schema@^7.0.8": + version "7.0.11" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" + integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== + +"@types/keyv@^3.1.4": + version "3.1.4" + resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6" + integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg== + dependencies: + "@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== + version "5.1.2" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" + integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== "@types/ms@*": version "0.7.31" @@ -824,14 +1054,14 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "17.0.22" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.22.tgz#38b6c4b9b2f3ed9f2e376cce42a298fb2375251e" - integrity sha512-8FwbVoG4fy+ykY86XCAclKZDORttqE5/s7dyWZKLXTdv3vRy5HozBEinG5IqhvPXXzIZEcTVbuHlQEI6iuwcmw== + version "18.11.17" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.17.tgz#5c009e1d9c38f4a2a9d45c0b0c493fe6cdb4bcb5" + integrity sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng== -"@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/node@^16.11.26": + version "16.18.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.10.tgz#d7415ef18c94f8d4e4a82ebcc8b8999f965d8920" + integrity sha512-XU1+v7h81p7145ddPfjv7jtWvkSilpcnON3mQ+bDi9Yuf7OI56efOglXRyXWgQ57xH3fEQgh7WOJMncRHVew5w== "@types/plist@^3.0.1": version "3.0.2" @@ -842,85 +1072,265 @@ xmlbuilder ">=11.0.1" "@types/prettier@^2.1.5": - version "2.4.4" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.4.tgz#5d9b63132df54d8909fce1c3f8ca260fdd693e17" - integrity sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA== + version "2.7.2" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz#6c2324641cc4ba050a8c710b2b251b377581fbf0" + integrity sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg== + +"@types/responselike@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" + integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== + dependencies: + "@types/node" "*" "@types/stack-utils@^2.0.0": 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/tough-cookie@*": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" + integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw== + "@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== + version "1.10.6" + resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz#3e600c62d210c5826460858f84bcbb65805460bb" + integrity sha512-NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ== "@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@^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== +"@types/yargs@^17.0.16", "@types/yargs@^17.0.8": + version "17.0.17" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.17.tgz#5672e5621f8e0fca13f433a8017aae4b7a2a03e7" + integrity sha512-72bWxFKTK6uwWJAVT+3rF6Jo6RTojiJ27FQo8Rf60AL+VZbzoVPnMFhKsUnbjR8A3BTCYQ7Mv3hnl8T0A+CX9g== 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== +"@types/yauzl@^2.9.1": + version "2.10.0" + resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" + integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw== dependencies: - "@types/yargs-parser" "*" + "@types/node" "*" -abab@^2.0.3, abab@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" - integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== - -acorn-globals@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" - integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg== +"@webassemblyjs/ast@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" + integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== dependencies: - acorn "^7.1.1" - acorn-walk "^7.1.1" + "@webassemblyjs/helper-numbers" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" -acorn-jsx@^5.3.1: +"@webassemblyjs/floating-point-hex-parser@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" + integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== + +"@webassemblyjs/helper-api-error@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" + integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== + +"@webassemblyjs/helper-buffer@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" + integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== + +"@webassemblyjs/helper-numbers@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" + integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== + dependencies: + "@webassemblyjs/floating-point-hex-parser" "1.11.1" + "@webassemblyjs/helper-api-error" "1.11.1" + "@xtuc/long" "4.2.2" + +"@webassemblyjs/helper-wasm-bytecode@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" + integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== + +"@webassemblyjs/helper-wasm-section@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" + integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + +"@webassemblyjs/ieee754@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" + integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== + dependencies: + "@xtuc/ieee754" "^1.2.0" + +"@webassemblyjs/leb128@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" + integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== + dependencies: + "@xtuc/long" "4.2.2" + +"@webassemblyjs/utf8@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" + integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== + +"@webassemblyjs/wasm-edit@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" + integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/helper-wasm-section" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + "@webassemblyjs/wasm-opt" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + "@webassemblyjs/wast-printer" "1.11.1" + +"@webassemblyjs/wasm-gen@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" + integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/ieee754" "1.11.1" + "@webassemblyjs/leb128" "1.11.1" + "@webassemblyjs/utf8" "1.11.1" + +"@webassemblyjs/wasm-opt@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" + integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + +"@webassemblyjs/wasm-parser@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" + integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-api-error" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/ieee754" "1.11.1" + "@webassemblyjs/leb128" "1.11.1" + "@webassemblyjs/utf8" "1.11.1" + +"@webassemblyjs/wast-printer@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" + integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@xtuc/long" "4.2.2" + +"@webpack-cli/configtest@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz#a69720f6c9bad6aef54a8fa6ba9c3533e7ef4c7f" + integrity sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A== + +"@webpack-cli/info@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0" + integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA== + +"@webpack-cli/serve@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz#34bdc31727a1889198855913db2f270ace6d7bf8" + integrity sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw== + +"@xtuc/ieee754@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" + integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== + +"@xtuc/long@4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" + integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== + +abab@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" + integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== + +abbrev@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + +acorn-globals@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3" + integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q== + dependencies: + acorn "^8.1.0" + acorn-walk "^8.0.2" + +acorn-import-assertions@^1.7.6: + version "1.8.0" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" + integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== + +acorn-jsx@^5.3.2: 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-walk@^8.0.2: + version "8.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" + integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== -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.1.0, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.1: + version "8.8.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" + integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== -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: +agent-base@6, agent-base@^6.0.2: 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: +agentkeepalive@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717" + integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA== + dependencies: + debug "^4.1.0" + depd "^1.1.2" + humanize-ms "^1.2.1" + +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-keywords@^3.4.1, ajv-keywords@^3.5.2: 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, ajv@^6.12.4: +ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -930,13 +1340,6 @@ ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4: 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-escapes@^4.2.1: version "4.3.2" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" @@ -969,49 +1372,65 @@ ansi-styles@^5.0.0: integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== anymatch@^3.0.3: - version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + version "3.1.3" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" + integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" -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-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@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== +app-builder-lib@24.0.0-alpha.7: + version "24.0.0-alpha.7" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.0.0-alpha.7.tgz#fe798994f89cfa7f8e6ebfce8e73a816ba32ae16" + integrity sha512-kEzDjym0AV9pO4SX8+RaJX9fmxrrKlDzHxqAN7cxSgDM8BUneMJqeWtf9+Hqv6PMXAvpnRsrSHtNaYgDkhQdFA== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" - "@electron/universal" "1.0.5" + "@electron/notarize" "^1.2.3" + "@electron/osx-sign" "^1.0.4" + "@electron/rebuild" "^3.2.10" + "@electron/universal" "1.3.4" "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.14.13" - builder-util-runtime "8.9.2" + builder-util "24.0.0-alpha.6" + builder-util-runtime "9.1.2-alpha.1" chromium-pickle-js "^0.2.0" - debug "^4.3.2" - ejs "^3.1.6" - electron-osx-sign "^0.5.0" - electron-publish "22.14.13" + debug "^4.3.4" + ejs "^3.1.8" + electron-publish "24.0.0-alpha.6" form-data "^4.0.0" - fs-extra "^10.0.0" - hosted-git-info "^4.0.2" + fs-extra "^10.1.0" + hosted-git-info "^4.1.0" is-ci "^3.0.0" - isbinaryfile "^4.0.8" + isbinaryfile "^5.0.0" js-yaml "^4.1.0" lazy-val "^1.0.5" - minimatch "^3.0.4" - read-config-file "6.2.0" + minimatch "^5.1.1" + read-config-file "6.3.2" sanitize-filename "^1.6.3" - semver "^7.3.5" + semver "^7.3.8" + tar "^6.1.12" temp-file "^3.4.0" +"aproba@^1.0.3 || ^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== + +are-we-there-yet@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd" + integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg== + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.0" + argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -1024,22 +1443,10 @@ argparse@^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.0.3: - 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= + integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== astral-regex@^2.0.0: version "2.0.0" @@ -1051,31 +1458,30 @@ async-exit-hook@^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= +async@^3.2.3: + version "3.2.4" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" + integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== 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== -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== +babel-jest@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.3.1.tgz#05c83e0d128cd48c453eea851482a38782249f44" + integrity sha512-aard+xnMoxgjwV70t0L6wkW/3HQQtV+O0PEimxKgzNqCJnbYmroPojdP2tqKSOAt8QAKV/uSZU8851M7B5+fcA== dependencies: - "@jest/transform" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/transform" "^29.3.1" "@types/babel__core" "^7.1.14" babel-plugin-istanbul "^6.1.1" - babel-preset-jest "^27.5.1" + babel-preset-jest "^29.2.0" chalk "^4.0.0" graceful-fs "^4.2.9" slash "^3.0.0" @@ -1091,14 +1497,14 @@ babel-plugin-istanbul@^6.1.1: istanbul-lib-instrument "^5.0.4" test-exclude "^6.0.0" -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== +babel-plugin-jest-hoist@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.2.0.tgz#23ee99c37390a98cfddf3ef4a78674180d823094" + integrity sha512-TnspP2WNiR3GLfCsUNHqeXw0RoQ2f9U5hQ5L3XFpwuO8htQmSrhh8qsB6vi5Yi8+kuynN1yjDjQsPfkebmB6ZA== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" - "@types/babel__core" "^7.0.0" + "@types/babel__core" "^7.1.14" "@types/babel__traverse" "^7.0.6" babel-preset-current-node-syntax@^1.0.0: @@ -1119,12 +1525,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.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== +babel-preset-jest@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.2.0.tgz#3048bea3a1af222e3505e4a767a974c95a7620dc" + integrity sha512-z9JmMJppMxNv8N7fNRHvhMg9cvIkMxQBXgFkane3yKVEvEOP+kB50lk8DFRvF9PGqbyXxlmebKWhuDORO8RgdA== dependencies: - babel-plugin-jest-hoist "^27.5.1" + babel-plugin-jest-hoist "^29.2.0" babel-preset-current-node-syntax "^1.0.0" balanced-match@^1.0.0: @@ -1137,6 +1543,15 @@ 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.1.0: + 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" @@ -1144,7 +1559,7 @@ bluebird-lst@^1.0.9: dependencies: bluebird "^3.5.5" -bluebird@^3.5.0, bluebird@^3.5.5: +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== @@ -1154,20 +1569,6 @@ boolean@^3.0.1: 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" @@ -1176,28 +1577,29 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^3.0.1: +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + +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" -browser-process-hrtime@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" - integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== - -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== +browserslist@^4.14.5, browserslist@^4.21.3: + version "4.21.4" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" + integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== dependencies: - caniuse-lite "^1.0.30001317" - electron-to-chromium "^1.4.84" - escalade "^3.1.1" - node-releases "^2.0.2" - picocolors "^1.0.0" + caniuse-lite "^1.0.30001400" + electron-to-chromium "^1.4.251" + node-releases "^2.0.6" + update-browserslist-db "^1.0.9" bser@2.1.1: version "2.1.1" @@ -1206,40 +1608,22 @@ bser@2.1.1: dependencies: node-int64 "^0.4.0" -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= + integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== -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-equal@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90" + integrity sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg== 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: +buffer@^5.1.0, buffer@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== @@ -1247,49 +1631,78 @@ buffer@^5.1.0: base64-js "^1.3.1" ieee754 "^1.1.13" -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== +builder-util-runtime@9.1.2-alpha.1: + version "9.1.2-alpha.1" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.2-alpha.1.tgz#378bf1194325a9b362ccd2c32c8af46ee95f7c94" + integrity sha512-4sbKIB0N9J/pvixX9HYUyRtMZT+cN+bgPJ5NqejyqSPxFzj7IFe1A9K14l5nnfpMVxzUSZVQMerniDeGszZ9OA== dependencies: - debug "^4.3.2" + debug "^4.3.4" sax "^1.2.4" -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== +builder-util@24.0.0-alpha.6: + version "24.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.0.0-alpha.6.tgz#777977507a6f83eb55d2ffbc560f597b5b47269b" + integrity sha512-vSnVMyuZK0RArELPk1dLUdcunZ2Gj0mpAFat73yD5djiihNosXIpIbSO/OFTi2/MV0urlH0giU4DOs9EXaCKtA== dependencies: "7zip-bin" "~5.1.1" "@types/debug" "^4.1.6" "@types/fs-extra" "^9.0.11" - app-builder-bin "3.7.1" + app-builder-bin "4.0.0" bluebird-lst "^1.0.9" - builder-util-runtime "8.9.2" - chalk "^4.1.1" + builder-util-runtime "9.1.2-alpha.1" + chalk "^4.1.2" cross-spawn "^7.0.3" - debug "^4.3.2" - fs-extra "^10.0.0" + debug "^4.3.4" + fs-extra "^10.1.0" http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.1" 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== +cacache@^16.1.0: + version "16.1.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e" + integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ== + dependencies: + "@npmcli/fs" "^2.1.0" + "@npmcli/move-file" "^2.0.0" + chownr "^2.0.0" + fs-minipass "^2.1.0" + glob "^8.0.1" + infer-owner "^1.0.4" + lru-cache "^7.7.1" + minipass "^3.1.6" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + mkdirp "^1.0.4" + p-map "^4.0.0" + promise-inflight "^1.0.1" + rimraf "^3.0.2" + ssri "^9.0.0" + tar "^6.1.11" + unique-filename "^2.0.0" + +cacheable-lookup@^5.0.3: + version "5.0.4" + resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" + integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA== + +cacheable-request@^7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27" + integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew== dependencies: clone-response "^1.0.2" get-stream "^5.1.0" http-cache-semantics "^4.0.0" - keyv "^3.0.0" + keyv "^4.0.0" lowercase-keys "^2.0.0" - normalize-url "^4.1.0" - responselike "^1.0.2" + normalize-url "^6.0.1" + responselike "^2.0.0" callsites@^3.0.0: version "3.1.0" @@ -1306,10 +1719,10 @@ camelcase@^6.2.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -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== +caniuse-lite@^1.0.30001400: + version "1.0.30001441" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz#987437b266260b640a23cd18fbddb509d7f69f3e" + integrity sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg== chalk@^2.0.0: version "2.4.2" @@ -1320,7 +1733,7 @@ chalk@^2.0.0: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1: +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.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== @@ -1333,30 +1746,47 @@ char-regex@^1.0.2: resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + +chrome-trace-event@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== + 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== + integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== 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== + version "3.7.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.0.tgz#6d01b3696c59915b6ce057e4aa4adfc2fa25f5ef" + integrity sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog== cjs-module-lexer@^1.0.0: 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== +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-spinners@^2.5.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a" + integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw== cli-truncate@^2.1.0: version "2.1.0" @@ -1366,26 +1796,40 @@ cli-truncate@^2.1.0: 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== +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== dependencies: string-width "^4.2.0" - strip-ansi "^6.0.0" + strip-ansi "^6.0.1" wrap-ansi "^7.0.0" +clone-deep@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== + dependencies: + is-plain-object "^2.0.4" + kind-of "^6.0.2" + shallow-clone "^3.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= + version "1.0.3" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3" + integrity sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA== dependencies: mimic-response "^1.0.0" +clone@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" + integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== + co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= + integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== collect-v8-coverage@^1.0.0: version "1.0.1" @@ -1409,17 +1853,22 @@ color-convert@^2.0.1: 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= + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== 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= +color-support@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== + +colorette@^2.0.14: + version "2.0.19" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" + integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== combined-stream@^1.0.8: version "1.0.8" @@ -1428,74 +1877,58 @@ combined-stream@^1.0.8: 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@^2.20.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== 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== +commander@^9.4.1: + version "9.4.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd" + integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw== + 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= + integrity sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A== 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= + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -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== +config-file-ts@^0.2.4: + version "0.2.4" + resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.4.tgz#6c0741fbe118a7cf786c65f139030f0448a2cc99" + integrity sha512-cKSW0BfrSaAUnxpgvpXPLaaW/umg4bqg4k3GO1JqlRfpx+d5W0GDXznCMkWotJQek5Mmz1MJVChQnz3IVaeMZQ== dependencies: - buffer-from "^1.0.0" - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" + glob "^7.1.6" + typescript "^4.0.2" -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" +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 sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== -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" +convert-source-map@^1.6.0, convert-source-map@^1.7.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" + integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== -convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" - integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== - dependencies: - safe-buffer "~5.1.1" +convert-source-map@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" + integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== 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== + integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== crc@^3.8.0: version "3.8.0" @@ -1513,15 +1946,10 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: 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== - -cssom@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" - integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== +cssom@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36" + integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw== cssom@~0.3.6: version "0.3.8" @@ -1535,50 +1963,43 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" -data-urls@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" - integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== - dependencies: - abab "^2.0.3" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.0.0" +darkreader@4.9.58: + version "4.9.58" + resolved "https://registry.yarnpkg.com/darkreader/-/darkreader-4.9.58.tgz#6544d6cb51fa643dc7995d128d32b357e1650e49" + integrity sha512-D/JGoJqW3m2AWBLhO+Pev+eThfs+CwRT4bcLb/1zKjql2yVwG0lx8C2XRDdSVGHw4y11n26W7syWoBpUfuhMqQ== -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: +data-urls@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143" + integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ== + dependencies: + abab "^2.0.6" + whatwg-mimetype "^3.0.0" + whatwg-url "^11.0.0" + +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: 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" +decimal.js@^10.4.2: + version "10.4.3" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" + integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== -decimal.js@^10.2.1: - version "10.3.1" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" - integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== - -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= +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 "^1.0.0" + mimic-response "^3.1.0" dedent@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" - integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= - -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== + integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA== deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.4" @@ -1590,22 +2011,45 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -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== +defaults@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a" + integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A== + dependencies: + clone "^1.0.2" + +defer-to-connect@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" + integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== 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== + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" + integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== dependencies: - object-keys "^1.0.12" + has-property-descriptors "^1.0.0" + object-keys "^1.1.1" 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= + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== + +depd@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== + +detect-libc@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" + integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== detect-newline@^3.0.0: version "3.1.0" @@ -1617,36 +2061,34 @@ 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.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== +diff-sequences@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.3.1.tgz#104b5b95fe725932421a9c6e5b4bef84c3f2249e" + integrity sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ== -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== +dir-compare@^3.0.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz#2c749f973b5c4b5d087f11edaae730db31788416" + integrity sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg== dependencies: - buffer-equal "1.0.0" - colors "1.0.3" - commander "2.9.0" - minimatch "3.0.4" + buffer-equal "^1.0.0" + minimatch "^3.0.4" -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== +dmg-builder@24.0.0-alpha.7: + version "24.0.0-alpha.7" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.0.0-alpha.7.tgz#03f701547e7e5bf09c2cee3546a87685844efe70" + integrity sha512-5aQvKHvUb3vBjwwRRaYee9kvqKt+LKWFuOh4E750hClRIaYHQBOCxN2Ws0QVUxwZ22kBP+RQ0LS1tfesBGLPsw== dependencies: - app-builder-lib "22.14.13" - builder-util "22.14.13" - builder-util-runtime "8.9.2" - fs-extra "^10.0.0" + app-builder-lib "24.0.0-alpha.7" + builder-util "24.0.0-alpha.6" + builder-util-runtime "9.1.2-alpha.1" + fs-extra "^10.1.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" optionalDependencies: - dmg-license "^1.0.9" + dmg-license "^1.0.11" -dmg-license@^1.0.9: +dmg-license@^1.0.11: 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== @@ -1667,19 +2109,12 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" -domexception@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" - integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== +domexception@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673" + integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw== dependencies: - webidl-conversions "^5.0.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" + webidl-conversions "^7.0.0" dotenv-expand@^5.1.0: version "5.1.0" @@ -1691,89 +2126,74 @@ dotenv@^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== +ejs@^3.1.8: + version "3.1.8" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" + integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ== dependencies: - jake "^10.6.1" + jake "^10.8.5" -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== +electron-builder@24.0.0-alpha.7: + version "24.0.0-alpha.7" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.0.0-alpha.7.tgz#1c897b334d3fdaac57365a81cdb899fcca7aa697" + integrity sha512-havD3dI5q9C4eWr+mJg82dKS81kYhcDUgBnRU90wxRdjT8R+cxqJxtgk/poJbMJi/qURza9wedAkgQbk48QQLQ== dependencies: - "@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.14.13" - fs-extra "^10.0.0" + "@types/yargs" "^17.0.16" + app-builder-lib "24.0.0-alpha.7" + builder-util "24.0.0-alpha.6" + builder-util-runtime "9.1.2-alpha.1" + chalk "^4.1.2" + dmg-builder "24.0.0-alpha.7" + fs-extra "^10.1.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" + read-config-file "6.3.2" + simple-update-notifier "^1.1.0" + yargs "^17.6.2" -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== +electron-publish@24.0.0-alpha.6: + version "24.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.0.0-alpha.6.tgz#df6edd7b95eec038b4f287968b9c9af6aaa74cd6" + integrity sha512-ppRriKQuLGK8eZrCveQrf1zB+fV6qcTck6cq4NEC61KyvtQlUdvDV4yGRVmkOO28CYRmhq9w093T93Qc6k/TeQ== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "22.14.13" - builder-util-runtime "8.9.2" - chalk "^4.1.1" - fs-extra "^10.0.0" + builder-util "24.0.0-alpha.6" + builder-util-runtime "9.1.2-alpha.1" + chalk "^4.1.2" + fs-extra "^10.1.0" lazy-val "^1.0.5" mime "^2.5.2" -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-to-chromium@^1.4.251: + version "1.4.284" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" + integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== -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== +electron@22.0.0: + version "22.0.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-22.0.0.tgz#ef84ab9cf23aa3f8c2f42a1e8e000ad7fd941058" + integrity sha512-cgRc4wjyM+81A0E8UGv1HNJjL1HBI5cWNh/DUIjzYvoUuiEM0SS0hAH/zaFQ18xOz2ced6Yih8SybpOiOYJhdg== dependencies: - "@electron/get" "^1.13.0" - "@types/node" "^14.6.2" - extract-zip "^1.0.3" + "@electron/get" "^2.0.0" + "@types/node" "^16.11.26" + extract-zip "^2.0.1" -emittery@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860" - integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg== +emittery@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad" + integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ== 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= +encoding@^0.1.13: + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== + dependencies: + iconv-lite "^0.6.2" end-of-stream@^1.1.0: version "1.4.4" @@ -1782,11 +2202,34 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" +enhanced-resolve@^5.10.0: + version "5.12.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634" + integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + +entities@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" + integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== + 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== +envinfo@^7.7.3: + version "7.8.1" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" + integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== + +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== + error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -1794,6 +2237,11 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" +es-module-lexer@^0.9.0: + version "0.9.3" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" + integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== + es6-error@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" @@ -1804,15 +2252,10 @@ escalade@^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= + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== escape-string-regexp@^2.0.0: version "2.0.0" @@ -1843,6 +2286,14 @@ eslint-plugin-sort-keys@2.3.5: dependencies: natural-compare "1.4.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== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + eslint-scope@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642" @@ -1868,13 +2319,15 @@ eslint-visitor-keys@^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== +eslint@8.29.0: + version "8.29.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.29.0.tgz#d74a88a20fb44d59c51851625bc4ee8d0ec43f87" + integrity sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg== dependencies: - "@eslint/eslintrc" "^1.1.0" - "@humanwhocodes/config-array" "^0.9.2" + "@eslint/eslintrc" "^1.3.3" + "@humanwhocodes/config-array" "^0.11.6" + "@humanwhocodes/module-importer" "^1.0.1" + "@nodelib/fs.walk" "^1.2.8" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -1884,38 +2337,40 @@ eslint@8.9.0: eslint-scope "^7.1.1" eslint-utils "^3.0.0" eslint-visitor-keys "^3.3.0" - espree "^9.3.1" + espree "^9.4.0" 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 "^6.0.1" - globals "^13.6.0" + find-up "^5.0.0" + glob-parent "^6.0.2" + globals "^13.15.0" + grapheme-splitter "^1.0.4" ignore "^5.2.0" import-fresh "^3.0.0" imurmurhash "^0.1.4" is-glob "^4.0.0" + is-path-inside "^3.0.3" + js-sdsl "^4.1.4" 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" + minimatch "^3.1.2" natural-compare "^1.4.0" optionator "^0.9.1" regexpp "^3.2.0" strip-ansi "^6.0.1" strip-json-comments "^3.1.0" text-table "^0.2.0" - v8-compile-cache "^2.0.3" -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== +espree@^9.4.0: + version "9.4.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd" + integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg== dependencies: - acorn "^8.7.0" - acorn-jsx "^5.3.1" + acorn "^8.8.0" + acorn-jsx "^5.3.2" eslint-visitor-keys "^3.3.0" esprima@^4.0.0, esprima@^4.0.1: @@ -1937,6 +2392,11 @@ 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.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" @@ -1947,6 +2407,11 @@ esutils@^2.0.2: resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== +events@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== + execa@^5.0.0: version "5.1.1" resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" @@ -1965,27 +2430,29 @@ execa@^5.0.0: exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" - integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= + integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ== -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== +expect@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/expect/-/expect-29.3.1.tgz#92877aad3f7deefc2e3f6430dd195b92295554a6" + integrity sha512-gGb1yTgU30Q0O/tQq+z30KBWv24ApkMgFUpvKBkyLUBL68Wv8dHdJxTBZFl/iT8K/bqDHvUYRH6IIN3rToopPA== dependencies: - "@jest/types" "^27.5.1" - jest-get-type "^27.5.1" - jest-matcher-utils "^27.5.1" - jest-message-util "^27.5.1" + "@jest/expect-utils" "^29.3.1" + jest-get-type "^29.2.0" + jest-matcher-utils "^29.3.1" + jest-message-util "^29.3.1" + jest-util "^29.3.1" -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== +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: - concat-stream "^1.6.2" - debug "^2.6.9" - mkdirp "^0.5.4" + debug "^4.1.1" + get-stream "^5.1.0" yauzl "^2.10.0" + optionalDependencies: + "@types/yauzl" "^2.9.1" extsprintf@^1.2.0: version "1.4.1" @@ -1997,7 +2464,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^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: +fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.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== @@ -2005,26 +2472,31 @@ fast-json-stable-stringify@^2.0.0: 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= + integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== -fast-xml-parser@^3.19.0: - 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== +fastest-levenshtein@^1.0.12: + version "1.0.16" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" + integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== + +fastq@^1.6.0: + version "1.14.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.14.0.tgz#107f69d7295b11e0fccc264e1fc6389f623731ce" + integrity sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg== dependencies: - strnum "^1.0.4" + reusify "^1.0.4" fb-watchman@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" - integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c" + integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA== dependencies: bser "2.1.1" 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= + integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== dependencies: pend "~1.2.0" @@ -2036,11 +2508,11 @@ file-entry-cache@^6.0.1: flat-cache "^3.0.4" filelist@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" - integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ== + version "1.0.4" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" + integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== dependencies: - minimatch "^3.0.4" + minimatch "^5.0.1" fill-range@^7.0.1: version "7.0.1" @@ -2057,6 +2529,14 @@ find-up@^4.0.0, find-up@^4.1.0: 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" + flat-cache@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" @@ -2066,18 +2546,9 @@ flat-cache@^3.0.4: 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== - -form-data@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" - integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" + version "3.2.7" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" + integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== form-data@^4.0.0: version "4.0.0" @@ -2088,10 +2559,10 @@ form-data@^4.0.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== +fs-extra@^10.0.0, fs-extra@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" + integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" @@ -2116,10 +2587,17 @@ fs-extra@^9.0.0, fs-extra@^9.0.1: jsonfile "^6.0.1" universalify "^2.0.0" +fs-minipass@^2.0.0, fs-minipass@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" + integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== + dependencies: + minipass "^3.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= + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== fsevents@^2.3.2: version "2.3.2" @@ -2131,10 +2609,19 @@ function-bind@^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@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" + integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg== + dependencies: + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.3" + console-control-strings "^1.1.0" + has-unicode "^2.0.1" + signal-exit "^3.0.7" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.5" gensync@^1.0.0-beta.2: version "1.0.0-beta.2" @@ -2146,18 +2633,20 @@ get-caller-file@^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.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" + integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.3" + get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== -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" @@ -2170,25 +2659,41 @@ 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@^6.0.1: +glob-parent@^6.0.2: 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.3" -glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== +glob-to-regexp@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== + +glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: + version "7.2.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.0.4" + minimatch "^3.1.1" once "^1.3.0" path-is-absolute "^1.0.0" +glob@^8.0.1: + version "8.0.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e" + integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + global-agent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" @@ -2201,83 +2706,78 @@ global-agent@^3.0.0: 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" - globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^13.6.0, globals@^13.9.0: - version "13.13.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz#ac32261060d8070e2719dd6998406e27d2b5727b" - integrity sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A== +globals@^13.15.0, globals@^13.19.0: + version "13.19.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.19.0.tgz#7a42de8e6ad4f7242fbcca27ea5b23aca367b5c8" + integrity sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ== dependencies: type-fest "^0.20.2" globalthis@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz#2a235d34f4d8036219f7e34929b5de9e18166b8b" - integrity sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ== + version "1.0.3" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" + integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== 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== +got@^11.7.0, got@^11.8.5: + version "11.8.6" + resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" + integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g== 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" + "@sindresorhus/is" "^4.0.0" + "@szmarczak/http-timer" "^4.0.5" + "@types/cacheable-request" "^6.0.1" + "@types/responselike" "^1.0.0" + cacheable-lookup "^5.0.3" + cacheable-request "^7.0.2" + decompress-response "^6.0.0" + http2-wrapper "^1.0.0-beta.5.2" + lowercase-keys "^2.0.0" + p-cancelable "^2.0.0" + responselike "^2.0.0" -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-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: + version "4.2.10" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" + integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -"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= +grapheme-splitter@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" + integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== 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= + integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== 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== +has-property-descriptors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" + integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== + dependencies: + get-intrinsic "^1.1.1" + +has-symbols@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== + +has-unicode@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== has@^1.0.3: version "1.0.3" @@ -2286,39 +2786,35 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -hosted-git-info@^4.0.2: +highlight.js@11.7.0: + version "11.7.0" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.7.0.tgz#3ff0165bc843f8c9bce1fd89e2fda9143d24b11e" + integrity sha512-1rRqesRFhMO/PRF+G86evnyJkCgaZFOI+Z6kdj15TA18funfoqJXvgPCLSf0SWq3SRfg1j3HlDs8o4s3EGq1oQ== + +hosted-git-info@^4.1.0: 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" -html-encoding-sniffer@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" - integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== +html-encoding-sniffer@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9" + integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA== dependencies: - whatwg-encoding "^1.0.5" + whatwg-encoding "^2.0.0" html-escaper@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -http-cache-semantics@^4.0.0: +http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.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@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" - integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== - dependencies: - "@tootallnate/once" "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" @@ -2328,10 +2824,18 @@ http-proxy-agent@^5.0.0: 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== +http2-wrapper@^1.0.0-beta.5.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" + integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg== + dependencies: + quick-lru "^5.1.1" + resolve-alpn "^1.0.0" + +https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== dependencies: agent-base "6" debug "4" @@ -2341,6 +2845,13 @@ 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== +humanize-ms@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" + integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== + dependencies: + ms "^2.0.0" + iconv-corefoundation@^1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" @@ -2349,14 +2860,7 @@ iconv-corefoundation@^1.1.7: cli-truncate "^2.1.0" node-addon-api "^1.6.3" -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" - -iconv-lite@^0.6.2: +iconv-lite@0.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== @@ -2369,9 +2873,9 @@ ieee754@^1.1.13: integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== 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== + version "5.2.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" + integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" @@ -2381,11 +2885,6 @@ import-fresh@^3.0.0, import-fresh@^3.2.1: parent-module "^1.0.0" resolve-from "^4.0.0" -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= - import-local@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" @@ -2397,42 +2896,45 @@ import-local@^3.0.2: imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== + +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== + +infer-owner@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" + integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== dependencies: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.3, inherits@~2.0.3: +inherits@2, inherits@^2.0.3, inherits@^2.0.4: 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== +interpret@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4" + integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ== -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== +ip@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== 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" - integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== - dependencies: - ci-info "^2.0.0" + integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== is-ci@^3.0.0: version "3.0.1" @@ -2441,17 +2943,17 @@ is-ci@^3.0.0: dependencies: ci-info "^3.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== +is-core-module@^2.9.0: + version "2.11.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" + integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== 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= + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== is-fullwidth-code-point@^3.0.0: version "3.0.0" @@ -2470,34 +2972,33 @@ is-glob@^4.0.0, is-glob@^4.0.3: dependencies: is-extglob "^2.1.1" -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-interactive@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" + integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== -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-lambda@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" + integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== 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@^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: +is-path-inside@^3.0.3: 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-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + is-potential-custom-element-name@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" @@ -2508,44 +3009,30 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== -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" - -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" +is-unicode-supported@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" + integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== 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== + version "4.0.10" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" + integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== + +isbinaryfile@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.0.tgz#034b7e54989dab8986598cbcea41f66663c65234" + integrity sha512-UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg== 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= + integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== + +isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: version "3.2.0" @@ -2553,9 +3040,9 @@ istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== 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== + version "5.2.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d" + integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg== dependencies: "@babel/core" "^7.12.3" "@babel/parser" "^7.14.7" @@ -2582,411 +3069,379 @@ istanbul-lib-source-maps@^4.0.0: source-map "^0.6.1" 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== + version "3.1.5" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae" + integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w== dependencies: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -jake@^10.6.1: - version "10.8.4" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.4.tgz#f6a8b7bf90c6306f768aa82bb7b98bf4ca15e84a" - integrity sha512-MtWeTkl1qGsWUtbl/Jsca/8xSoK3x0UmS82sNbjqxxG/de/M/3b1DntdjHgPMC50enlTNwXOCRqPXLLt5cCfZA== +jake@^10.8.5: + version "10.8.5" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" + integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw== dependencies: - async "0.9.x" + async "^3.2.3" chalk "^4.0.2" filelist "^1.0.1" minimatch "^3.0.4" -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== +jest-changed-files@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.2.0.tgz#b6598daa9803ea6a4dce7968e20ab380ddbee289" + integrity sha512-qPVmLLyBmvF5HJrY7krDisx6Voi8DmlV3GZYX0aFNbaQsZeoz1hfxcCMbqDGuQCxU1dJy9eYc2xscE8QrCCYaA== dependencies: - "@jest/types" "^27.5.1" execa "^5.0.0" - throat "^6.0.1" + p-limit "^3.1.0" -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== +jest-circus@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.3.1.tgz#177d07c5c0beae8ef2937a67de68f1e17bbf1b4a" + integrity sha512-wpr26sEvwb3qQQbdlmei+gzp6yoSSoSL6GsLPxnuayZSMrSd5Ka7IjAvatpIernBvT2+Ic6RLTg+jSebScmasg== dependencies: - "@jest/environment" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/environment" "^29.3.1" + "@jest/expect" "^29.3.1" + "@jest/test-result" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" - expect "^27.5.1" is-generator-fn "^2.0.0" - 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" + jest-each "^29.3.1" + jest-matcher-utils "^29.3.1" + jest-message-util "^29.3.1" + jest-runtime "^29.3.1" + jest-snapshot "^29.3.1" + jest-util "^29.3.1" + p-limit "^3.1.0" + pretty-format "^29.3.1" slash "^3.0.0" stack-utils "^2.0.3" - throat "^6.0.1" -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== +jest-cli@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.3.1.tgz#e89dff427db3b1df50cea9a393ebd8640790416d" + integrity sha512-TO/ewvwyvPOiBBuWZ0gm04z3WWP8TIK8acgPzE4IxgsLKQgb377NYGrQLc3Wl/7ndWzIH2CDNNsUjGxwLL43VQ== dependencies: - "@jest/core" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/core" "^29.3.1" + "@jest/test-result" "^29.3.1" + "@jest/types" "^29.3.1" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.9" import-local "^3.0.2" - jest-config "^27.5.1" - jest-util "^27.5.1" - jest-validate "^27.5.1" + jest-config "^29.3.1" + jest-util "^29.3.1" + jest-validate "^29.3.1" prompts "^2.0.1" - yargs "^16.2.0" + yargs "^17.3.1" -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== +jest-config@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.3.1.tgz#0bc3dcb0959ff8662957f1259947aedaefb7f3c6" + integrity sha512-y0tFHdj2WnTEhxmGUK1T7fgLen7YK4RtfvpLFBXfQkh2eMJAQq24Vx9472lvn5wg0MAO6B+iPfJfzdR9hJYalg== dependencies: - "@babel/core" "^7.8.0" - "@jest/test-sequencer" "^27.5.1" - "@jest/types" "^27.5.1" - babel-jest "^27.5.1" + "@babel/core" "^7.11.6" + "@jest/test-sequencer" "^29.3.1" + "@jest/types" "^29.3.1" + babel-jest "^29.3.1" chalk "^4.0.0" ci-info "^3.2.0" deepmerge "^4.2.2" - glob "^7.1.1" + glob "^7.1.3" 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" + jest-circus "^29.3.1" + jest-environment-node "^29.3.1" + jest-get-type "^29.2.0" + jest-regex-util "^29.2.0" + jest-resolve "^29.3.1" + jest-runner "^29.3.1" + jest-util "^29.3.1" + jest-validate "^29.3.1" micromatch "^4.0.4" parse-json "^5.2.0" - pretty-format "^27.5.1" + pretty-format "^29.3.1" slash "^3.0.0" strip-json-comments "^3.1.1" -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== +jest-diff@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.3.1.tgz#d8215b72fed8f1e647aed2cae6c752a89e757527" + integrity sha512-vU8vyiO7568tmin2lA3r2DP8oRvzhvRcD4DjpXc6uGveQodyk7CKLhQlCSiwgx3g0pFaE88/KLZ0yaTWMc4Uiw== dependencies: chalk "^4.0.0" - diff-sequences "^27.5.1" - jest-get-type "^27.5.1" - pretty-format "^27.5.1" + diff-sequences "^29.3.1" + jest-get-type "^29.2.0" + pretty-format "^29.3.1" -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== +jest-docblock@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.2.0.tgz#307203e20b637d97cee04809efc1d43afc641e82" + integrity sha512-bkxUsxTgWQGbXV5IENmfiIuqZhJcyvF7tU4zJ/7ioTutdz4ToB5Yx6JOFBpgI+TphRY4lhOyCWGNH/QFQh5T6A== dependencies: detect-newline "^3.0.0" -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== +jest-each@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.3.1.tgz#bc375c8734f1bb96625d83d1ca03ef508379e132" + integrity sha512-qrZH7PmFB9rEzCSl00BWjZYuS1BSOH8lLuC0azQE9lQrAx3PWGKHTDudQiOSwIy5dGAJh7KA0ScYlCP7JxvFYA== dependencies: - "@jest/types" "^27.5.1" + "@jest/types" "^29.3.1" chalk "^4.0.0" - jest-get-type "^27.5.1" - jest-util "^27.5.1" - pretty-format "^27.5.1" + jest-get-type "^29.2.0" + jest-util "^29.3.1" + pretty-format "^29.3.1" -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== +jest-environment-jsdom@29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.3.1.tgz#14ca63c3e0ef5c63c5bcb46033e50bc649e3b639" + integrity sha512-G46nKgiez2Gy4zvYNhayfMEAFlVHhWfncqvqS6yCd0i+a4NsSUD2WtrKSaYQrYiLQaupHXxCRi8xxVL2M9PbhA== dependencies: - "@jest/environment" "^27.5.1" - "@jest/fake-timers" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/environment" "^29.3.1" + "@jest/fake-timers" "^29.3.1" + "@jest/types" "^29.3.1" + "@types/jsdom" "^20.0.0" "@types/node" "*" - jest-mock "^27.5.1" - jest-util "^27.5.1" - jsdom "^16.6.0" + jest-mock "^29.3.1" + jest-util "^29.3.1" + jsdom "^20.0.0" -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== +jest-environment-node@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.3.1.tgz#5023b32472b3fba91db5c799a0d5624ad4803e74" + integrity sha512-xm2THL18Xf5sIHoU7OThBPtuH6Lerd+Y1NLYiZJlkE3hbE+7N7r8uvHIl/FkZ5ymKXJe/11SQuf3fv4v6rUMag== dependencies: - "@jest/environment" "^27.5.1" - "@jest/fake-timers" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/environment" "^29.3.1" + "@jest/fake-timers" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" - jest-mock "^27.5.1" - jest-util "^27.5.1" + jest-mock "^29.3.1" + jest-util "^29.3.1" -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-get-type@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz#726646f927ef61d583a3b3adb1ab13f3a5036408" + integrity sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA== -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== +jest-haste-map@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.3.1.tgz#af83b4347f1dae5ee8c2fb57368dc0bb3e5af843" + integrity sha512-/FFtvoG1xjbbPXQLFef+WSU4yrc0fc0Dds6aRPBojUid7qlPqZvxdUBA03HW0fnVHXVCnCdkuoghYItKNzc/0A== dependencies: - "@jest/types" "^27.5.1" - "@types/graceful-fs" "^4.1.2" + "@jest/types" "^29.3.1" + "@types/graceful-fs" "^4.1.3" "@types/node" "*" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.9" - jest-regex-util "^27.5.1" - jest-serializer "^27.5.1" - jest-util "^27.5.1" - jest-worker "^27.5.1" + jest-regex-util "^29.2.0" + jest-util "^29.3.1" + jest-worker "^29.3.1" micromatch "^4.0.4" - walker "^1.0.7" + walker "^1.0.8" optionalDependencies: fsevents "^2.3.2" -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== +jest-leak-detector@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.3.1.tgz#95336d020170671db0ee166b75cd8ef647265518" + integrity sha512-3DA/VVXj4zFOPagGkuqHnSQf1GZBmmlagpguxEERO6Pla2g84Q1MaVIB3YMxgUaFIaYag8ZnTyQgiZ35YEqAQA== dependencies: - "@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.5.1" - is-generator-fn "^2.0.0" - 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-get-type "^29.2.0" + pretty-format "^29.3.1" -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.5.1" - pretty-format "^27.5.1" - -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== +jest-matcher-utils@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.3.1.tgz#6e7f53512f80e817dfa148672bd2d5d04914a572" + integrity sha512-fkRMZUAScup3txIKfMe3AIZZmPEjWEdsPJFK3AIy5qRohWqQFg1qrmKfYXR9qEkNc7OdAu2N4KPHibEmy4HPeQ== dependencies: chalk "^4.0.0" - jest-diff "^27.5.1" - jest-get-type "^27.5.1" - pretty-format "^27.5.1" + jest-diff "^29.3.1" + jest-get-type "^29.2.0" + pretty-format "^29.3.1" -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== +jest-message-util@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.3.1.tgz#37bc5c468dfe5120712053dd03faf0f053bd6adb" + integrity sha512-lMJTbgNcDm5z+6KDxWtqOFWlGQxD6XaYwBqHR8kmpkP+WWWG90I35kdtQHY67Ay5CSuydkTBbJG+tH9JShFCyA== dependencies: "@babel/code-frame" "^7.12.13" - "@jest/types" "^27.5.1" + "@jest/types" "^29.3.1" "@types/stack-utils" "^2.0.0" chalk "^4.0.0" graceful-fs "^4.2.9" micromatch "^4.0.4" - pretty-format "^27.5.1" + pretty-format "^29.3.1" slash "^3.0.0" stack-utils "^2.0.3" -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== +jest-mock@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.3.1.tgz#60287d92e5010979d01f218c6b215b688e0f313e" + integrity sha512-H8/qFDtDVMFvFP4X8NuOT3XRDzOUTz+FeACjufHzsOIBAxivLqkB1PoLCaJx9iPPQ8dZThHPp/G3WRWyMgA3JA== dependencies: - "@jest/types" "^27.5.1" + "@jest/types" "^29.3.1" "@types/node" "*" + jest-util "^29.3.1" jest-pnp-resolver@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" - integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== + version "1.2.3" + resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e" + integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w== -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-regex-util@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.2.0.tgz#82ef3b587e8c303357728d0322d48bbfd2971f7b" + integrity sha512-6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA== -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== +jest-resolve-dependencies@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.3.1.tgz#a6a329708a128e68d67c49f38678a4a4a914c3bf" + integrity sha512-Vk0cYq0byRw2WluNmNWGqPeRnZ3p3hHmjJMp2dyyZeYIfiBskwq4rpiuGFR6QGAdbj58WC7HN4hQHjf2mpvrLA== dependencies: - "@jest/types" "^27.5.1" - jest-regex-util "^27.5.1" - jest-snapshot "^27.5.1" + jest-regex-util "^29.2.0" + jest-snapshot "^29.3.1" -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== +jest-resolve@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.3.1.tgz#9a4b6b65387a3141e4a40815535c7f196f1a68a7" + integrity sha512-amXJgH/Ng712w3Uz5gqzFBBjxV8WFLSmNjoreBGMqxgCz5cH7swmBZzgBaCIOsvb0NbpJ0vgaSFdJqMdT+rADw== dependencies: - "@jest/types" "^27.5.1" chalk "^4.0.0" graceful-fs "^4.2.9" - jest-haste-map "^27.5.1" + jest-haste-map "^29.3.1" jest-pnp-resolver "^1.2.2" - jest-util "^27.5.1" - jest-validate "^27.5.1" + jest-util "^29.3.1" + jest-validate "^29.3.1" resolve "^1.20.0" resolve.exports "^1.1.0" slash "^3.0.0" -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== +jest-runner@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.3.1.tgz#a92a879a47dd096fea46bb1517b0a99418ee9e2d" + integrity sha512-oFvcwRNrKMtE6u9+AQPMATxFcTySyKfLhvso7Sdk/rNpbhg4g2GAGCopiInk1OP4q6gz3n6MajW4+fnHWlU3bA== dependencies: - "@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" + "@jest/console" "^29.3.1" + "@jest/environment" "^29.3.1" + "@jest/test-result" "^29.3.1" + "@jest/transform" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" chalk "^4.0.0" - emittery "^0.8.1" + emittery "^0.13.1" 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-docblock "^29.2.0" + jest-environment-node "^29.3.1" + jest-haste-map "^29.3.1" + jest-leak-detector "^29.3.1" + jest-message-util "^29.3.1" + jest-resolve "^29.3.1" + jest-runtime "^29.3.1" + jest-util "^29.3.1" + jest-watcher "^29.3.1" + jest-worker "^29.3.1" + p-limit "^3.1.0" + source-map-support "0.5.13" -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== +jest-runtime@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.3.1.tgz#21efccb1a66911d6d8591276a6182f520b86737a" + integrity sha512-jLzkIxIqXwBEOZx7wx9OO9sxoZmgT2NhmQKzHQm1xwR1kNW/dn0OjxR424VwHHf1SPN6Qwlb5pp1oGCeFTQ62A== dependencies: - "@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" + "@jest/environment" "^29.3.1" + "@jest/fake-timers" "^29.3.1" + "@jest/globals" "^29.3.1" + "@jest/source-map" "^29.2.0" + "@jest/test-result" "^29.3.1" + "@jest/transform" "^29.3.1" + "@jest/types" "^29.3.1" + "@types/node" "*" chalk "^4.0.0" cjs-module-lexer "^1.0.0" collect-v8-coverage "^1.0.0" - execa "^5.0.0" glob "^7.1.3" graceful-fs "^4.2.9" - jest-haste-map "^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" + jest-haste-map "^29.3.1" + jest-message-util "^29.3.1" + jest-mock "^29.3.1" + jest-regex-util "^29.2.0" + jest-resolve "^29.3.1" + jest-snapshot "^29.3.1" + jest-util "^29.3.1" slash "^3.0.0" strip-bom "^4.0.0" -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== +jest-snapshot@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.3.1.tgz#17bcef71a453adc059a18a32ccbd594b8cc4e45e" + integrity sha512-+3JOc+s28upYLI2OJM4PWRGK9AgpsMs/ekNryUV0yMBClT9B1DF2u2qay8YxcQd338PPYSFNb0lsar1B49sLDA== dependencies: - "@types/node" "*" - graceful-fs "^4.2.9" - -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/core" "^7.11.6" "@babel/generator" "^7.7.2" + "@babel/plugin-syntax-jsx" "^7.7.2" "@babel/plugin-syntax-typescript" "^7.7.2" "@babel/traverse" "^7.7.2" - "@babel/types" "^7.0.0" - "@jest/transform" "^27.5.1" - "@jest/types" "^27.5.1" - "@types/babel__traverse" "^7.0.4" + "@babel/types" "^7.3.3" + "@jest/expect-utils" "^29.3.1" + "@jest/transform" "^29.3.1" + "@jest/types" "^29.3.1" + "@types/babel__traverse" "^7.0.6" "@types/prettier" "^2.1.5" babel-preset-current-node-syntax "^1.0.0" chalk "^4.0.0" - expect "^27.5.1" + expect "^29.3.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" + jest-diff "^29.3.1" + jest-get-type "^29.2.0" + jest-haste-map "^29.3.1" + jest-matcher-utils "^29.3.1" + jest-message-util "^29.3.1" + jest-util "^29.3.1" natural-compare "^1.4.0" - pretty-format "^27.5.1" - semver "^7.3.2" + pretty-format "^29.3.1" + semver "^7.3.5" -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== +jest-util@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.3.1.tgz#1dda51e378bbcb7e3bc9d8ab651445591ed373e1" + integrity sha512-7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ== dependencies: - "@jest/types" "^27.5.1" + "@jest/types" "^29.3.1" "@types/node" "*" chalk "^4.0.0" ci-info "^3.2.0" graceful-fs "^4.2.9" picomatch "^2.2.3" -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== +jest-validate@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.3.1.tgz#d56fefaa2e7d1fde3ecdc973c7f7f8f25eea704a" + integrity sha512-N9Lr3oYR2Mpzuelp1F8negJR3YE+L1ebk1rYA5qYo9TTY3f9OWdptLoNSPP9itOCBIRBqjt/S5XHlzYglLN67g== dependencies: - "@jest/types" "^27.5.1" + "@jest/types" "^29.3.1" camelcase "^6.2.0" chalk "^4.0.0" - jest-get-type "^27.5.1" + jest-get-type "^29.2.0" leven "^3.1.0" - pretty-format "^27.5.1" + pretty-format "^29.3.1" -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== +jest-watcher@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.3.1.tgz#3341547e14fe3c0f79f9c3a4c62dbc3fc977fd4a" + integrity sha512-RspXG2BQFDsZSRKGCT/NiNa8RkQ1iKAjrO0//soTMWx/QUt+OcxMqMSBxz23PYGqUuWm2+m2mNNsmj0eIoOaFg== dependencies: - "@jest/test-result" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/test-result" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - jest-util "^27.5.1" + emittery "^0.13.1" + jest-util "^29.3.1" string-length "^4.0.1" -jest-worker@^27.5.1: +jest-worker@^27.4.5: 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== @@ -2995,14 +3450,30 @@ jest-worker@^27.5.1: merge-stream "^2.0.0" supports-color "^8.0.0" -jest@27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz#dadf33ba70a779be7a6fc33015843b51494f63fc" - integrity sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ== +jest-worker@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.3.1.tgz#e9462161017a9bb176380d721cab022661da3d6b" + integrity sha512-lY4AnnmsEWeiXirAIA0c9SDPbuCBq8IYuDVL8PMm0MZ2PEs2yPvRA/J64QBXuZp7CYKrDM/rmNrc9/i3KJQncw== dependencies: - "@jest/core" "^27.5.1" + "@types/node" "*" + jest-util "^29.3.1" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +jest@29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest/-/jest-29.3.1.tgz#c130c0d551ae6b5459b8963747fed392ddbde122" + integrity sha512-6iWfL5DTT0Np6UYs/y5Niu7WIfNv/wRTtN5RSXt2DIEft3dx3zPuw/3WJQBCJfmEzvDiEKwoqMbGD9n49+qLSA== + dependencies: + "@jest/core" "^29.3.1" + "@jest/types" "^29.3.1" import-local "^3.0.2" - jest-cli "^27.5.1" + jest-cli "^29.3.1" + +js-sdsl@^4.1.4: + version "4.2.0" + resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz#278e98b7bea589b8baaf048c20aeb19eb7ad09d0" + integrity sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ== js-tokens@^4.0.0: version "4.0.0" @@ -3024,50 +3495,49 @@ js-yaml@^4.1.0: dependencies: argparse "^2.0.1" -jsdom@^16.6.0: - version "16.7.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" - integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== +jsdom@20.0.3, jsdom@^20.0.0: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db" + integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ== dependencies: - abab "^2.0.5" - acorn "^8.2.4" - acorn-globals "^6.0.0" - cssom "^0.4.4" + abab "^2.0.6" + acorn "^8.8.1" + acorn-globals "^7.0.0" + cssom "^0.5.0" cssstyle "^2.3.0" - data-urls "^2.0.0" - decimal.js "^10.2.1" - domexception "^2.0.1" + data-urls "^3.0.2" + decimal.js "^10.4.2" + domexception "^4.0.0" escodegen "^2.0.0" - form-data "^3.0.0" - html-encoding-sniffer "^2.0.1" - http-proxy-agent "^4.0.1" - https-proxy-agent "^5.0.0" + form-data "^4.0.0" + html-encoding-sniffer "^3.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.1" is-potential-custom-element-name "^1.0.1" - nwsapi "^2.2.0" - parse5 "6.0.1" - saxes "^5.0.1" + nwsapi "^2.2.2" + parse5 "^7.1.1" + saxes "^6.0.0" symbol-tree "^3.2.4" - tough-cookie "^4.0.0" - w3c-hr-time "^1.0.2" - w3c-xmlserializer "^2.0.0" - webidl-conversions "^6.1.0" - whatwg-encoding "^1.0.5" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.5.0" - ws "^7.4.6" - xml-name-validator "^3.0.0" + tough-cookie "^4.1.2" + w3c-xmlserializer "^4.0.0" + webidl-conversions "^7.0.0" + whatwg-encoding "^2.0.0" + whatwg-mimetype "^3.0.0" + whatwg-url "^11.0.0" + ws "^8.11.0" + xml-name-validator "^4.0.0" jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== -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-buffer@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" + integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== -json-parse-even-better-errors@^2.3.0: +json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: 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== @@ -3080,22 +3550,22 @@ json-schema-traverse@^0.4.1: 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= + integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== 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= + integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== -json5@^2.1.2, json5@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== +json5@^2.2.0, json5@^2.2.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab" + integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ== jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== optionalDependencies: graceful-fs "^4.1.6" @@ -3108,25 +3578,23 @@ jsonfile@^6.0.1: 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== +keyv@^4.0.0: + version "4.5.2" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56" + integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g== dependencies: - json-buffer "3.0.0" + json-buffer "3.0.1" + +kind-of@^6.0.2: + 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== kleur@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -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" @@ -3148,7 +3616,7 @@ levn@^0.4.1: levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" - integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA== dependencies: prelude-ls "~1.1.2" type-check "~0.3.2" @@ -3158,6 +3626,11 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== +loader-runner@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" + integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== + locate-path@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" @@ -3165,26 +3638,43 @@ locate-path@^5.0.0: 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.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@^4.17.10, lodash@^4.17.15, lodash@^4.7.0: +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== +log-symbols@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" + integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== + dependencies: + chalk "^4.1.0" + is-unicode-supported "^0.1.0" 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@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" + integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== + dependencies: + yallist "^3.0.2" + lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -3192,6 +3682,20 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lru-cache@^7.7.1: + version "7.14.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.1.tgz#8da8d2f5f59827edb388e63e459ac23d6d408fea" + integrity sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA== + +lzma-native@^8.0.5: + version "8.0.6" + resolved "https://registry.yarnpkg.com/lzma-native/-/lzma-native-8.0.6.tgz#3ea456209d643bafd9b5d911781bdf0b396b2665" + integrity sha512-09xfg67mkL2Lz20PrrDeNYZxzeW7ADtpYFbwSQh9U8+76RIzx5QsJBMy8qikv3hbUPfpy6hqwxt6FcGK81g9AA== + dependencies: + node-addon-api "^3.1.0" + node-gyp-build "^4.2.1" + readable-stream "^3.6.0" + make-dir@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" @@ -3199,6 +3703,28 @@ make-dir@^3.0.0: dependencies: semver "^6.0.0" +make-fetch-happen@^10.0.3: + version "10.2.1" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164" + integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w== + dependencies: + agentkeepalive "^4.2.1" + cacache "^16.1.0" + http-cache-semantics "^4.1.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" + is-lambda "^1.0.1" + lru-cache "^7.7.1" + minipass "^3.1.6" + minipass-collect "^1.0.2" + minipass-fetch "^2.0.3" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + negotiator "^0.6.3" + promise-retry "^2.0.1" + socks-proxy-agent "^7.0.0" + ssri "^9.0.0" + makeerror@1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a" @@ -3206,6 +3732,11 @@ makeerror@1.0.12: dependencies: tmpl "1.0.5" +marked@4.2.4: + version "4.2.4" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.4.tgz#5a4ce6c7a1ae0c952601fce46376ee4cf1797e1c" + integrity sha512-Wcc9ikX7Q5E4BYDPvh1C6QNSxrjC9tBgz+A/vAhp59KXUgachw++uMvMKiSW8oA85nopmPZcEvBoex/YLMsiyA== + matcher@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" @@ -3219,19 +3750,19 @@ merge-stream@^2.0.0: integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== 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== + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== dependencies: - braces "^3.0.1" - picomatch "^2.2.3" + braces "^3.0.2" + picomatch "^2.3.1" 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: +mime-types@^2.1.12, mime-types@^2.1.27: 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== @@ -3248,84 +3779,197 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mimic-response@^1.0.0, mimic-response@^1.0.1: +mimic-response@^1.0.0: 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" +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: +minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: 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.6" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" - integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== +minimatch@^5.0.1, minimatch@^5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz#0939d7d6f0898acbd1508abe534d1929368a8fff" + integrity sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg== dependencies: - minimist "^1.2.6" + brace-expansion "^2.0.1" -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= +minimist@^1.2.6: + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== + +minipass-collect@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" + integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== + dependencies: + minipass "^3.0.0" + +minipass-fetch@^2.0.3: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add" + integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA== + dependencies: + minipass "^3.1.6" + minipass-sized "^1.0.3" + minizlib "^2.1.2" + optionalDependencies: + encoding "^0.1.13" + +minipass-flush@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" + integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== + dependencies: + minipass "^3.0.0" + +minipass-pipeline@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" + integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== + dependencies: + minipass "^3.0.0" + +minipass-sized@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" + integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== + dependencies: + minipass "^3.0.0" + +minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6: + version "3.3.6" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" + integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== + dependencies: + yallist "^4.0.0" + +minipass@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.0.tgz#7cebb0f9fa7d56f0c5b17853cbe28838a8dbbd3b" + integrity sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw== + dependencies: + yallist "^4.0.0" + +minizlib@^2.1.1, minizlib@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" + integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== + dependencies: + minipass "^3.0.0" + yallist "^4.0.0" + +mkdirp@^1.0.3, mkdirp@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== 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.0.0: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + 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= + integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== + +negotiator@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== + +neo-async@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + +node-abi@^3.0.0: + version "3.30.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.30.0.tgz#d84687ad5d24ca81cdfa912a36f2c5c19b137359" + integrity sha512-qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw== + dependencies: + semver "^7.3.5" 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== +node-addon-api@^3.1.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" + integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== + +node-api-version@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz#1ed46a485e462d55d66b5aa1fe2821720dedf080" + integrity sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g== + dependencies: + semver "^7.3.5" + +node-gyp-build@^4.2.1: + version "4.5.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40" + integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg== + +node-gyp@^9.0.0: + version "9.3.1" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.1.tgz#1e19f5f290afcc9c46973d68700cbd21a96192e4" + integrity sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg== + dependencies: + env-paths "^2.2.0" + glob "^7.1.4" + graceful-fs "^4.2.6" + make-fetch-happen "^10.0.3" + nopt "^6.0.0" + npmlog "^6.0.0" + rimraf "^3.0.2" + semver "^7.3.5" + tar "^6.1.2" + which "^2.0.2" + node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" - integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= + integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== -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== +node-releases@^2.0.6: + version "2.0.8" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz#0f349cdc8fcfa39a92ac0be9bc48b7706292b9ae" + integrity sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A== + +nopt@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d" + integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g== + dependencies: + abbrev "^1.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== -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" +normalize-url@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== npm-run-path@^4.0.1: version "4.0.1" @@ -3334,12 +3978,22 @@ npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" -nwsapi@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" - integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== +npmlog@^6.0.0: + version "6.0.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" + integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg== + dependencies: + are-we-there-yet "^3.0.0" + console-control-strings "^1.1.0" + gauge "^4.0.3" + set-blocking "^2.0.0" -object-keys@^1.0.12: +nwsapi@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0" + integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw== + +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== @@ -3347,11 +4001,11 @@ object-keys@^1.0.12: 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= + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== dependencies: wrappy "1" -onetime@^5.1.2: +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== @@ -3382,10 +4036,25 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" -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== +ora@^5.1.0: + version "5.4.1" + resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" + integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== + dependencies: + bl "^4.1.0" + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-spinners "^2.5.0" + is-interactive "^1.0.0" + is-unicode-supported "^0.1.0" + log-symbols "^4.1.0" + strip-ansi "^6.0.0" + wcwidth "^1.0.1" + +p-cancelable@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" + integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg== p-limit@^2.2.0: version "2.3.0" @@ -3394,6 +4063,13 @@ p-limit@^2.2.0: dependencies: p-try "^2.0.0" +p-limit@^3.0.2, p-limit@^3.1.0: + 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" @@ -3401,21 +4077,25 @@ p-locate@^4.1.0: 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== -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" - parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -3433,10 +4113,12 @@ parse-json@^5.2.0: 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" - integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== +parse5@^7.0.0, parse5@^7.1.1: + version "7.1.2" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" + integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== + dependencies: + entities "^4.4.0" path-exists@^4.0.0: version "4.0.0" @@ -3446,7 +4128,7 @@ path-exists@^4.0.0: 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= + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" @@ -3461,23 +4143,18 @@ path-parse@^1.0.7: pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= + integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== 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: +picomatch@2.3.1, picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1: 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.4: version "4.0.5" resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" @@ -3490,13 +4167,13 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -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== +plist@^3.0.4, plist@^3.0.5: + version "3.0.6" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3" + integrity sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA== dependencies: base64-js "^1.5.1" - xmlbuilder "^9.0.7" + xmlbuilder "^15.1.1" prelude-ls@^1.2.1: version "1.2.1" @@ -3506,32 +4183,35 @@ prelude-ls@^1.2.1: 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= + integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== -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= - -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== +pretty-format@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.3.1.tgz#1841cac822b02b4da8971dacb03e8a871b4722da" + integrity sha512-FyLnmb1cYJV8biEIiRyzRFvs2lry7PPIvOqKVe1GCUEYg4YGmlx1qG9EJNMxArYm7piII4qb8UV1Pncq5dxmcg== dependencies: - ansi-regex "^5.0.1" + "@jest/schemas" "^29.0.0" ansi-styles "^5.0.0" - react-is "^17.0.1" - -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== + react-is "^18.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== +promise-inflight@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" + integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g== + +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + prompts@^2.0.1: version "2.4.2" resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" @@ -3540,15 +4220,10 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" -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= - psl@^1.1.33: - version "1.8.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" - integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== + version "1.9.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" + integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== pump@^3.0.0: version "3.0.0" @@ -3563,75 +4238,80 @@ punycode@^2.1.0, punycode@^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.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" +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== -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" +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== -react-is@^17.0.1: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" - integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== +quick-lru@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== -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== +randombytes@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== dependencies: + safe-buffer "^5.1.0" + +react-is@^18.0.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" + integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== + +read-config-file@6.3.2: + version "6.3.2" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.3.2.tgz#556891aa6ffabced916ed57457cb192e61880411" + integrity sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q== + dependencies: + config-file-ts "^0.2.4" 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== +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: - 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" + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +rechoir@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" + integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ== + dependencies: + resolve "^1.20.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== -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= + integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== + +resolve-alpn@^1.0.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" + integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== resolve-cwd@^3.0.0: version "3.0.0" @@ -3656,22 +4336,40 @@ resolve.exports@^1.1.0: integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== resolve@^1.20.0: - version "1.22.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" - integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== + version "1.22.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" + integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== dependencies: - is-core-module "^2.8.1" + is-core-module "^2.9.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -responselike@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" - integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= +responselike@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc" + integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw== dependencies: - lowercase-keys "^1.0.0" + lowercase-keys "^2.0.0" -rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: +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" + +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== + +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.0, 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== @@ -3690,12 +4388,19 @@ roarr@^2.15.3: 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== +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" -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": +safe-buffer@^5.1.0, 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.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -3712,37 +4417,44 @@ sax@^1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -saxes@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" - integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== +saxes@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5" + integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA== dependencies: xmlchars "^2.2.0" +schema-utils@^3.1.0, schema-utils@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== + dependencies: + "@types/json-schema" "^7.0.8" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + 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" + integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== 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== +semver@^7.3.2, semver@^7.3.5, semver@^7.3.8: + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== dependencies: lru-cache "^6.0.0" +semver@~7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== + serialize-error@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" @@ -3750,6 +4462,25 @@ serialize-error@^7.0.1: dependencies: type-fest "^0.13.1" +serialize-javascript@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== + dependencies: + randombytes "^2.1.0" + +set-blocking@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== + +shallow-clone@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== + dependencies: + kind-of "^6.0.2" + shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" @@ -3762,11 +4493,18 @@ shebang-regex@^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, signal-exit@^3.0.3: +signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: 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== +simple-update-notifier@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82" + integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg== + dependencies: + semver "~7.0.0" + sisteransi@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" @@ -3786,12 +4524,37 @@ slice-ansi@^3.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" -smart-buffer@^4.0.2: +smart-buffer@^4.0.2, smart-buffer@^4.2.0: 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: +socks-proxy-agent@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" + integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww== + dependencies: + agent-base "^6.0.2" + debug "^4.3.3" + socks "^2.6.2" + +socks@^2.6.2: + version "2.7.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" + integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== + dependencies: + ip "^2.0.0" + smart-buffer "^4.2.0" + +source-map-support@0.5.13: + version "0.5.13" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" + integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map-support@^0.5.19, source-map-support@~0.5.20: 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== @@ -3799,21 +4562,11 @@ source-map-support@^0.5.19, source-map-support@^0.5.6: buffer-from "^1.0.0" source-map "^0.6.0" -source-map@^0.5.0: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= - source-map@^0.6.0, source-map@^0.6.1, 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== -source-map@^0.7.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== - sprintf-js@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" @@ -3822,12 +4575,19 @@ sprintf-js@^1.1.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= + integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== + +ssri@^9.0.0: + version "9.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057" + integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q== + dependencies: + minipass "^3.1.1" stack-utils@^2.0.3: - 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== + version "2.0.6" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" + integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ== dependencies: escape-string-regexp "^2.0.0" @@ -3844,7 +4604,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -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: +"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== @@ -3853,12 +4613,12 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2 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== +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.1.0" + safe-buffer "~5.2.0" strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" @@ -3882,16 +4642,6 @@ strip-json-comments@^3.1.0, strip-json-comments@^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= - -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" @@ -3906,7 +4656,7 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" -supports-color@^7.0.0, supports-color@^7.1.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== @@ -3920,14 +4670,6 @@ supports-color@^8.0.0: dependencies: has-flag "^4.0.0" -supports-hyperlinks@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" - integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== - dependencies: - 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" @@ -3938,6 +4680,23 @@ symbol-tree@^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== +tapable@^2.1.1, tapable@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" + integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== + +tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.1.2: + version "6.1.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" + integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^4.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^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" @@ -3946,13 +4705,26 @@ temp-file@^3.4.0: async-exit-hook "^2.0.1" fs-extra "^10.0.0" -terminal-link@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" - integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== +terser-webpack-plugin@5.3.6, terser-webpack-plugin@^5.1.3: + version "5.3.6" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c" + integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ== dependencies: - ansi-escapes "^4.2.1" - supports-hyperlinks "^2.0.0" + "@jridgewell/trace-mapping" "^0.3.14" + jest-worker "^27.4.5" + schema-utils "^3.1.1" + serialize-javascript "^6.0.0" + terser "^5.14.1" + +terser@^5.14.1: + version "5.16.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.1.tgz#5af3bc3d0f24241c7fb2024199d5c461a1075880" + integrity sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw== + dependencies: + "@jridgewell/source-map" "^0.3.2" + acorn "^8.5.0" + commander "^2.20.0" + source-map-support "~0.5.20" test-exclude@^6.0.0: version "6.0.0" @@ -3966,24 +4738,19 @@ test-exclude@^6.0.0: 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= + integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== -throat@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375" - integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== - -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-core@^5.7.103: + version "5.7.103" + resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.103.tgz#462fd4b60704ddca9b71bd17c2c59504e6985ca5" + integrity sha512-MdSolgnhJwr2SH6a+5KFAYB8znpYdRLoOFTJmrWslsec9Ne/V3DBrw+BbS1YYQJKGTin6U02Y9CSYxnOpg3vwg== tldts-experimental@^5.6.21: - version "5.7.72" - resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.72.tgz#b0a9b121e542a3b31f2b0dc7b64abc720940fd6a" - integrity sha512-Qg1FOnR8jCXBySOQVSaAmRZ4UiKse60MY7eTdx6oIaQ8ve+xGi+dXybb4+RN4cu9c4M7HOoGYkWERQ5tkBAPbg== + version "5.7.103" + resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.103.tgz#a0b15a05c2cec7f0d4935de18dc9ad3fcbe0276f" + integrity sha512-oo9QI0TjXdrlZnDSJMazRJe+nnd0OwXgzRmHcsnyp4k6UxmmlaWEA1iq3RY3EDSKwYEJ+lDnwQeAaGRleU/LEQ== dependencies: - tldts-core "^5.7.72" + tldts-core "^5.7.103" tmp-promise@^3.0.2: version "3.0.3" @@ -4007,12 +4774,7 @@ tmpl@1.0.5: 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-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== + integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== to-regex-range@^5.0.1: version "5.0.1" @@ -4021,34 +4783,30 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -tough-cookie@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" - integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== +tough-cookie@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" + integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== dependencies: psl "^1.1.33" punycode "^2.1.1" - universalify "^0.1.2" + universalify "^0.2.0" + url-parse "^1.5.3" -tr46@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" - integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw== +tr46@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9" + integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA== dependencies: punycode "^2.1.1" 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= + integrity sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ== 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-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" @@ -4059,7 +4817,7 @@ type-check@^0.4.0, type-check@~0.4.0: 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= + integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg== dependencies: prelude-ls "~1.1.2" @@ -4083,54 +4841,47 @@ type-fest@^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== -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== +typescript@^4.0.2: + version "4.9.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78" + integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg== + +unique-filename@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2" + integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A== dependencies: - is-typedarray "^1.0.0" + unique-slug "^3.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= - -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== +unique-slug@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9" + integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w== dependencies: - crypto-random-string "^2.0.0" + imurmurhash "^0.1.4" -universalify@^0.1.0, universalify@^0.1.2: +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@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== + universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== -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== +update-browserslist-db@^1.0.9: + version "1.0.10" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" + integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== 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" + escalade "^3.1.1" + picocolors "^1.0.0" uri-js@^4.2.2: version "4.4.1" @@ -4139,36 +4890,32 @@ uri-js@^4.2.2: 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= +url-parse@^1.5.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== dependencies: - prepend-http "^2.0.0" + querystringify "^2.1.1" + requires-port "^1.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= + integrity sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA== -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= + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== -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== - -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== +v8-to-istanbul@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4" + integrity sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w== dependencies: + "@jridgewell/trace-mapping" "^0.3.12" "@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.1" @@ -4179,71 +4926,145 @@ verror@^1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -w3c-hr-time@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" - integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== +w3c-xmlserializer@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073" + integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw== dependencies: - browser-process-hrtime "^1.0.0" + xml-name-validator "^4.0.0" -w3c-xmlserializer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" - integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== - dependencies: - xml-name-validator "^3.0.0" - -walker@^1.0.7: +walker@^1.0.8: 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.12" -webidl-conversions@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" - integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== - -webidl-conversions@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" - integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== - -whatwg-encoding@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" - integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== +watchpack@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" + integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== dependencies: - iconv-lite "0.4.24" + glob-to-regexp "^0.4.1" + graceful-fs "^4.1.2" -whatwg-mimetype@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" - integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== - -whatwg-url@^8.0.0, whatwg-url@^8.5.0: - version "8.7.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" - integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== +wcwidth@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" + integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg== dependencies: - lodash "^4.7.0" - tr46 "^2.1.0" - webidl-conversions "^6.1.0" + defaults "^1.0.3" -which@^2.0.1: +webidl-conversions@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" + integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== + +webpack-cli@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.1.tgz#95fc0495ac4065e9423a722dec9175560b6f2d9a" + integrity sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A== + dependencies: + "@discoveryjs/json-ext" "^0.5.0" + "@webpack-cli/configtest" "^2.0.1" + "@webpack-cli/info" "^2.0.1" + "@webpack-cli/serve" "^2.0.1" + colorette "^2.0.14" + commander "^9.4.1" + cross-spawn "^7.0.3" + envinfo "^7.7.3" + fastest-levenshtein "^1.0.12" + import-local "^3.0.2" + interpret "^3.1.1" + rechoir "^0.8.0" + webpack-merge "^5.7.3" + +webpack-merge@^5.7.3: + version "5.8.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" + integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== + dependencies: + clone-deep "^4.0.1" + wildcard "^2.0.0" + +webpack-node-externals@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz#1a3407c158d547a9feb4229a9e3385b7b60c9917" + integrity sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ== + +webpack-sources@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" + integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== + +webpack@5.75.0: + version "5.75.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152" + integrity sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ== + dependencies: + "@types/eslint-scope" "^3.7.3" + "@types/estree" "^0.0.51" + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/wasm-edit" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + acorn "^8.7.1" + acorn-import-assertions "^1.7.6" + browserslist "^4.14.5" + chrome-trace-event "^1.0.2" + enhanced-resolve "^5.10.0" + es-module-lexer "^0.9.0" + eslint-scope "5.1.1" + events "^3.2.0" + glob-to-regexp "^0.4.1" + graceful-fs "^4.2.9" + json-parse-even-better-errors "^2.3.1" + loader-runner "^4.2.0" + mime-types "^2.1.27" + neo-async "^2.6.2" + schema-utils "^3.1.0" + tapable "^2.1.1" + terser-webpack-plugin "^5.1.3" + watchpack "^2.4.0" + webpack-sources "^3.2.3" + +whatwg-encoding@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53" + integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg== + dependencies: + iconv-lite "0.6.3" + +whatwg-mimetype@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" + integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== + +whatwg-url@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018" + integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ== + dependencies: + tr46 "^3.0.0" + webidl-conversions "^7.0.0" + +which@^2.0.1, which@^2.0.2: 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== +wide-align@^1.1.5: + 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 "^4.0.0" + string-width "^1.0.2 || 2 || 3 || 4" + +wildcard@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" + integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3" @@ -4262,43 +5083,31 @@ wrap-ansi@^7.0.0: wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -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== +write-file-atomic@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd" + integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg== dependencies: imurmurhash "^0.1.4" - is-typedarray "^1.0.0" - signal-exit "^3.0.2" - typedarray-to-buffer "^3.1.5" + signal-exit "^3.0.7" -ws@^7.4.6: - version "7.5.7" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" - integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== +ws@^8.11.0: + version "8.11.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" + integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== -xdg-basedir@^4.0.0: +xml-name-validator@^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== + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" + integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== -xml-name-validator@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" - integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== - -xmlbuilder@>=11.0.1: +xmlbuilder@>=11.0.1, xmlbuilder@^15.1.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= - xmlchars@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" @@ -4309,51 +5118,43 @@ y18n@^5.0.5: resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== +yallist@^3.0.2: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== + 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@^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-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -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== +yargs@^17.0.1, yargs@^17.3.1, yargs@^17.6.2: + version "17.6.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541" + integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== 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" - -yargs@^17.0.1: - 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" + cliui "^8.0.1" 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" + yargs-parser "^21.1.1" 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= + integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== 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/applications/networking/browsers/vieb/yarn.nix b/pkgs/applications/networking/browsers/vieb/yarn.nix index a8a281126a0e..413a387f14cc 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -10,163 +10,163 @@ }; } { - name = "_ampproject_remapping___remapping_2.1.2.tgz"; + name = "_ampproject_remapping___remapping_2.2.0.tgz"; path = fetchurl { - 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 = "_ampproject_remapping___remapping_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz"; + sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; }; } { - name = "_babel_code_frame___code_frame_7.16.7.tgz"; + name = "_babel_code_frame___code_frame_7.18.6.tgz"; path = fetchurl { - 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_code_frame___code_frame_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz"; + sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; } { - name = "_babel_compat_data___compat_data_7.17.7.tgz"; + name = "_babel_compat_data___compat_data_7.20.5.tgz"; path = fetchurl { - 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_compat_data___compat_data_7.20.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz"; + sha512 = "KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g=="; }; } { - name = "_babel_core___core_7.17.8.tgz"; + name = "_babel_core___core_7.20.7.tgz"; path = fetchurl { - 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_core___core_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz"; + sha512 = "t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw=="; }; } { - name = "_babel_generator___generator_7.17.7.tgz"; + name = "_babel_generator___generator_7.20.7.tgz"; path = fetchurl { - 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_generator___generator_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz"; + sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw=="; }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.17.7.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.20.7.tgz"; path = fetchurl { - 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_compilation_targets___helper_compilation_targets_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz"; + sha512 = "4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ=="; }; } { - name = "_babel_helper_environment_visitor___helper_environment_visitor_7.16.7.tgz"; + name = "_babel_helper_environment_visitor___helper_environment_visitor_7.18.9.tgz"; path = fetchurl { - 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_environment_visitor___helper_environment_visitor_7.18.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"; + sha512 = "3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="; }; } { - name = "_babel_helper_function_name___helper_function_name_7.16.7.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.19.0.tgz"; path = fetchurl { - 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_function_name___helper_function_name_7.19.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz"; + sha512 = "WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w=="; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.7.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.18.6.tgz"; path = fetchurl { - 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_hoist_variables___helper_hoist_variables_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"; + sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.7.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.18.6.tgz"; path = fetchurl { - 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.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"; + sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.16.7.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.20.7.tgz"; path = fetchurl { - 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.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz"; + sha512 = "FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA=="; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.17.7.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.20.2.tgz"; path = fetchurl { - 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_plugin_utils___helper_plugin_utils_7.20.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz"; + sha512 = "8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ=="; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.16.7.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.20.2.tgz"; path = fetchurl { - 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_simple_access___helper_simple_access_7.20.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz"; + sha512 = "+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA=="; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.17.7.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.18.6.tgz"; path = fetchurl { - 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_split_export_declaration___helper_split_export_declaration_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"; + sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.7.tgz"; + name = "_babel_helper_string_parser___helper_string_parser_7.19.4.tgz"; path = fetchurl { - 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_string_parser___helper_string_parser_7.19.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz"; + sha512 = "nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.16.7.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz"; path = fetchurl { - 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_validator_identifier___helper_validator_identifier_7.19.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"; + sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; }; } { - name = "_babel_helper_validator_option___helper_validator_option_7.16.7.tgz"; + name = "_babel_helper_validator_option___helper_validator_option_7.18.6.tgz"; path = fetchurl { - 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_option___helper_validator_option_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"; + sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; }; } { - name = "_babel_helpers___helpers_7.17.8.tgz"; + name = "_babel_helpers___helpers_7.20.7.tgz"; path = fetchurl { - 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_helpers___helpers_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz"; + sha512 = "PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA=="; }; } { - name = "_babel_highlight___highlight_7.16.10.tgz"; + name = "_babel_highlight___highlight_7.18.6.tgz"; path = fetchurl { - 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_highlight___highlight_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz"; + sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; } { - name = "_babel_parser___parser_7.17.8.tgz"; + name = "_babel_parser___parser_7.20.7.tgz"; path = fetchurl { - 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=="; + name = "_babel_parser___parser_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz"; + sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; }; } { @@ -209,6 +209,14 @@ sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; }; } + { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.18.6.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz"; + sha512 = "6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q=="; + }; + } { name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; path = fetchurl { @@ -266,35 +274,35 @@ }; } { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.16.7.tgz"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.20.0.tgz"; path = fetchurl { - 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_plugin_syntax_typescript___plugin_syntax_typescript_7.20.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz"; + sha512 = "rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ=="; }; } { - name = "_babel_template___template_7.16.7.tgz"; + name = "_babel_template___template_7.20.7.tgz"; path = fetchurl { - 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_template___template_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz"; + sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; } { - name = "_babel_traverse___traverse_7.17.3.tgz"; + name = "_babel_traverse___traverse_7.20.7.tgz"; path = fetchurl { - 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_traverse___traverse_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.7.tgz"; + sha512 = "xueOL5+ZKX2dJbg8z8o4f4uTRTqGDRjilva9D1hiRlayJbTY8jBRL+Ph67IeRTIE439/VifHk+Z4g0SwRtQE0A=="; }; } { - name = "_babel_types___types_7.17.0.tgz"; + name = "_babel_types___types_7.20.7.tgz"; path = fetchurl { - name = "_babel_types___types_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz"; - sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; + name = "_babel_types___types_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz"; + sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg=="; }; } { @@ -306,51 +314,43 @@ }; } { - name = "_cliqz_adblocker_content___adblocker_content_1.23.7.tgz"; + name = "_cliqz_adblocker_content___adblocker_content_1.25.1.tgz"; path = fetchurl { - 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_content___adblocker_content_1.25.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.25.1.tgz"; + sha512 = "7gl2VdNPBfj7aPoq34B5miwGcnda/7LCr+BqnpcSOjdLV6jjT2FrNSAKGFvcH23q0HM1IFhYDV6ydTgsdWFCnA=="; }; } { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.23.6.tgz"; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.25.1.tgz"; path = fetchurl { - 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_preload___adblocker_electron_preload_1.25.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.25.1.tgz"; + sha512 = "edNVEqGrXqe/Qwi0D9/V8xmtyeJlhNPaelXilYa1ne7jG/OT7pee+7Vi4BWezl0NQ77WF3/mY9Bj4eJkEO0uiQ=="; }; } { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.23.7.tgz"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.25.1.tgz"; path = fetchurl { - 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_electron___adblocker_electron_1.25.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.25.1.tgz"; + sha512 = "CKStwRTR2L78EjgmuUpLKkV9s/uVnwQNGr7I/hyMkEROXbGdrN7P5LhwO+kkewccZ+3JtE509PBmZAp0EP71dw=="; }; } { - name = "_cliqz_adblocker_electron___adblocker_electron_1.23.6.tgz"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.25.1.tgz"; path = fetchurl { - 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_extended_selectors___adblocker_extended_selectors_1.25.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.25.1.tgz"; + sha512 = "4MdMe/YfIok5d8WYVcLR3Ak7vGrmeUV47frgmXEe945luY93vwlzk1NiLYW1JM5Gdm+VePweoS9cJ1/QUTmv+Q=="; }; } { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.23.7.tgz"; + name = "_cliqz_adblocker___adblocker_1.25.1.tgz"; path = fetchurl { - 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=="; + name = "_cliqz_adblocker___adblocker_1.25.1.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.25.1.tgz"; + sha512 = "1C1/ELI94/XewdUj/o1+Q4ziOigMvTZQA05UERfDoKqpJ+0cbrEF/UImrzpX7n+kYsR7xTJvmf+iNM3zS0tfsg=="; }; } { @@ -362,35 +362,91 @@ }; } { - name = "_electron_get___get_1.14.1.tgz"; + name = "_discoveryjs_json_ext___json_ext_0.5.7.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 = "_discoveryjs_json_ext___json_ext_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz"; + sha512 = "dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="; }; } { - name = "_electron_universal___universal_1.0.5.tgz"; + name = "_electron_asar___asar_3.2.2.tgz"; path = fetchurl { - name = "_electron_universal___universal_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.5.tgz"; - sha512 = "zX9O6+jr2NMyAdSkwEUlyltiI4/EBLu2Ls/VD3pUQdi3cAYeYfdQnT2AJJ38HE4QxLccbU13LSpccw1IWlkyag=="; + name = "_electron_asar___asar_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.2.tgz"; + sha512 = "32fMU68x8a6zvxtC1IC/BhPDKTh8rQjdmwEplj3CDpnkcwBzZVN9v/8cK0LJqQ0FOQQVZW8BWZ1S6UU53TYR4w=="; }; } { - name = "_eslint_eslintrc___eslintrc_1.2.1.tgz"; + name = "_electron_get___get_2.0.2.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz"; - sha512 = "bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ=="; + name = "_electron_get___get_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz"; + sha512 = "eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g=="; }; } { - name = "_humanwhocodes_config_array___config_array_0.9.5.tgz"; + name = "_electron_notarize___notarize_1.2.3.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 = "_electron_notarize___notarize_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/@electron/notarize/-/notarize-1.2.3.tgz"; + sha512 = "9oRzT56rKh5bspk3KpAVF8lPKHYQrBnRwcgiOeR0hdilVEQmszDaAu0IPCPrwwzJN0ugNs0rRboTreHMt/6mBQ=="; + }; + } + { + name = "_electron_osx_sign___osx_sign_1.0.4.tgz"; + path = fetchurl { + name = "_electron_osx_sign___osx_sign_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.4.tgz"; + sha512 = "xfhdEcIOfAZg7scZ9RQPya1G1lWo8/zMCwUXAulq0SfY7ONIW+b9qGyKdMyuMctNYwllrIS+vmxfijSfjeh97g=="; + }; + } + { + name = "_electron_rebuild___rebuild_3.2.10.tgz"; + path = fetchurl { + name = "_electron_rebuild___rebuild_3.2.10.tgz"; + url = "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.2.10.tgz"; + sha512 = "SUBM6Mwi3yZaDFQjZzfGKpYTtOp9m60glounwX6tfGeVc/ZOl4jbquktUcyy7gYSLDWFLtKkftkY2xgMJZLQgg=="; + }; + } + { + name = "_electron_universal___universal_1.3.4.tgz"; + path = fetchurl { + name = "_electron_universal___universal_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.3.4.tgz"; + sha512 = "BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg=="; + }; + } + { + name = "_eslint_eslintrc___eslintrc_1.4.0.tgz"; + path = fetchurl { + name = "_eslint_eslintrc___eslintrc_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.0.tgz"; + sha512 = "7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A=="; + }; + } + { + name = "_gar_promisify___promisify_1.1.3.tgz"; + path = fetchurl { + name = "_gar_promisify___promisify_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz"; + sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; + }; + } + { + name = "_humanwhocodes_config_array___config_array_0.11.8.tgz"; + path = fetchurl { + name = "_humanwhocodes_config_array___config_array_0.11.8.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz"; + sha512 = "UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g=="; + }; + } + { + name = "_humanwhocodes_module_importer___module_importer_1.0.1.tgz"; + path = fetchurl { + name = "_humanwhocodes_module_importer___module_importer_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz"; + sha512 = "bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="; }; } { @@ -418,115 +474,171 @@ }; } { - name = "_jest_console___console_27.5.1.tgz"; + name = "_jest_console___console_29.3.1.tgz"; path = fetchurl { - 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_console___console_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/console/-/console-29.3.1.tgz"; + sha512 = "IRE6GD47KwcqA09RIWrabKdHPiKDGgtAL31xDxbi/RjQMsr+lY+ppxmHwY0dUEV3qvvxZzoe5Hl0RXZJOjQNUg=="; }; } { - name = "_jest_core___core_27.5.1.tgz"; + name = "_jest_core___core_29.3.1.tgz"; path = fetchurl { - 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_core___core_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/core/-/core-29.3.1.tgz"; + sha512 = "0ohVjjRex985w5MmO5L3u5GR1O30DexhBSpuwx2P+9ftyqHdJXnk7IUWiP80oHMvt7ubHCJHxV0a0vlKVuZirw=="; }; } { - name = "_jest_environment___environment_27.5.1.tgz"; + name = "_jest_environment___environment_29.3.1.tgz"; path = fetchurl { - 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_environment___environment_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/environment/-/environment-29.3.1.tgz"; + sha512 = "pMmvfOPmoa1c1QpfFW0nXYtNLpofqo4BrCIk6f2kW4JFeNlHV2t3vd+3iDLf31e2ot2Mec0uqZfmI+U0K2CFag=="; }; } { - name = "_jest_fake_timers___fake_timers_27.5.1.tgz"; + name = "_jest_expect_utils___expect_utils_29.3.1.tgz"; path = fetchurl { - 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_expect_utils___expect_utils_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.3.1.tgz"; + sha512 = "wlrznINZI5sMjwvUoLVk617ll/UYfGIZNxmbU+Pa7wmkL4vYzhV9R2pwVqUh4NWWuLQWkI8+8mOkxs//prKQ3g=="; }; } { - name = "_jest_globals___globals_27.5.1.tgz"; + name = "_jest_expect___expect_29.3.1.tgz"; path = fetchurl { - 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_expect___expect_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/expect/-/expect-29.3.1.tgz"; + sha512 = "QivM7GlSHSsIAWzgfyP8dgeExPRZ9BIe2LsdPyEhCGkZkoyA+kGsoIzbKAfZCvvRzfZioKwPtCZIt5SaoxYCvg=="; }; } { - name = "_jest_reporters___reporters_27.5.1.tgz"; + name = "_jest_fake_timers___fake_timers_29.3.1.tgz"; path = fetchurl { - 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_fake_timers___fake_timers_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.3.1.tgz"; + sha512 = "iHTL/XpnDlFki9Tq0Q1GGuVeQ8BHZGIYsvCO5eN/O/oJaRzofG9Xndd9HuSDBI/0ZS79pg0iwn07OMTQ7ngF2A=="; }; } { - name = "_jest_source_map___source_map_27.5.1.tgz"; + name = "_jest_globals___globals_29.3.1.tgz"; path = fetchurl { - 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_globals___globals_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/globals/-/globals-29.3.1.tgz"; + sha512 = "cTicd134vOcwO59OPaB6AmdHQMCtWOe+/DitpTZVxWgMJ+YvXL1HNAmPyiGbSHmF/mXVBkvlm8YYtQhyHPnV6Q=="; }; } { - name = "_jest_test_result___test_result_27.5.1.tgz"; + name = "_jest_reporters___reporters_29.3.1.tgz"; path = fetchurl { - 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_reporters___reporters_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.3.1.tgz"; + sha512 = "GhBu3YFuDrcAYW/UESz1JphEAbvUjaY2vShRZRoRY1mxpCMB3yGSJ4j9n0GxVlEOdCf7qjvUfBCrTUUqhVfbRA=="; }; } { - name = "_jest_test_sequencer___test_sequencer_27.5.1.tgz"; + name = "_jest_schemas___schemas_29.0.0.tgz"; path = fetchurl { - 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_schemas___schemas_29.0.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz"; + sha512 = "3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA=="; }; } { - name = "_jest_transform___transform_27.5.1.tgz"; + name = "_jest_source_map___source_map_29.2.0.tgz"; path = fetchurl { - 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_source_map___source_map_29.2.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.2.0.tgz"; + sha512 = "1NX9/7zzI0nqa6+kgpSdKPK+WU1p+SJk3TloWZf5MzPbxri9UEeXX5bWZAPCzbQcyuAzubcdUHA7hcNznmRqWQ=="; }; } { - name = "_jest_types___types_27.5.1.tgz"; + name = "_jest_test_result___test_result_29.3.1.tgz"; path = fetchurl { - 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 = "_jest_test_result___test_result_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.3.1.tgz"; + sha512 = "qeLa6qc0ddB0kuOZyZIhfN5q0e2htngokyTWsGriedsDhItisW7SDYZ7ceOe57Ii03sL988/03wAcBh3TChMGw=="; }; } { - name = "_jridgewell_resolve_uri___resolve_uri_3.0.5.tgz"; + name = "_jest_test_sequencer___test_sequencer_29.3.1.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 = "_jest_test_sequencer___test_sequencer_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.3.1.tgz"; + sha512 = "IqYvLbieTv20ArgKoAMyhLHNrVHJfzO6ARZAbQRlY4UGWfdDnLlZEF0BvKOMd77uIiIjSZRwq3Jb3Fa3I8+2UA=="; }; } { - name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.11.tgz"; + name = "_jest_transform___transform_29.3.1.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 = "_jest_transform___transform_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/transform/-/transform-29.3.1.tgz"; + sha512 = "8wmCFBTVGYqFNLWfcOWoVuMuKYPUBTnTMDkdvFtAYELwDOl9RGwOsvQWGPFxDJ8AWY9xM/8xCXdqmPK3+Q5Lug=="; }; } { - name = "_jridgewell_trace_mapping___trace_mapping_0.3.4.tgz"; + name = "_jest_types___types_29.3.1.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=="; + name = "_jest_types___types_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-29.3.1.tgz"; + sha512 = "d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA=="; + }; + } + { + name = "_jridgewell_gen_mapping___gen_mapping_0.1.1.tgz"; + path = fetchurl { + name = "_jridgewell_gen_mapping___gen_mapping_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"; + sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; + }; + } + { + name = "_jridgewell_gen_mapping___gen_mapping_0.3.2.tgz"; + path = fetchurl { + name = "_jridgewell_gen_mapping___gen_mapping_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"; + sha512 = "mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="; + }; + } + { + name = "_jridgewell_resolve_uri___resolve_uri_3.1.0.tgz"; + path = fetchurl { + name = "_jridgewell_resolve_uri___resolve_uri_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"; + sha512 = "F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="; + }; + } + { + name = "_jridgewell_set_array___set_array_1.1.2.tgz"; + path = fetchurl { + name = "_jridgewell_set_array___set_array_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz"; + sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; + }; + } + { + name = "_jridgewell_source_map___source_map_0.3.2.tgz"; + path = fetchurl { + name = "_jridgewell_source_map___source_map_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz"; + sha512 = "m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw=="; + }; + } + { + name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.14.tgz"; + path = fetchurl { + name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.14.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"; + sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; + }; + } + { + name = "_jridgewell_trace_mapping___trace_mapping_0.3.17.tgz"; + path = fetchurl { + name = "_jridgewell_trace_mapping___trace_mapping_0.3.17.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz"; + sha512 = "MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g=="; }; } { @@ -537,6 +649,14 @@ sha512 = "RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ=="; }; } + { + name = "_malept_cross_spawn_promise___cross_spawn_promise_2.0.0.tgz"; + path = fetchurl { + name = "_malept_cross_spawn_promise___cross_spawn_promise_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz"; + sha512 = "1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg=="; + }; + } { name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; path = fetchurl { @@ -545,6 +665,54 @@ sha512 = "9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q=="; }; } + { + name = "_mozilla_readability___readability_0.4.2.tgz"; + path = fetchurl { + name = "_mozilla_readability___readability_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/@mozilla/readability/-/readability-0.4.2.tgz"; + sha512 = "48MJXzi4Dhy2fJ3lGjmwdEJKoMmn3oiYew9n/1OW6cZy78hAzRIyDJDBCGrg4PBFDyY4xos+H4LCFn5QVRDcfw=="; + }; + } + { + 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 = "_npmcli_fs___fs_2.1.2.tgz"; + path = fetchurl { + name = "_npmcli_fs___fs_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz"; + sha512 = "yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ=="; + }; + } + { + name = "_npmcli_move_file___move_file_2.0.1.tgz"; + path = fetchurl { + name = "_npmcli_move_file___move_file_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz"; + sha512 = "mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ=="; + }; + } { name = "_remusao_guess_url_type___guess_url_type_1.2.1.tgz"; path = fetchurl { @@ -594,43 +762,43 @@ }; } { - name = "_sindresorhus_is___is_0.14.0.tgz"; + name = "_sinclair_typebox___typebox_0.24.51.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 = "_sinclair_typebox___typebox_0.24.51.tgz"; + url = "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz"; + sha512 = "1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA=="; }; } { - name = "_sinonjs_commons___commons_1.8.3.tgz"; + name = "_sindresorhus_is___is_4.6.0.tgz"; path = fetchurl { - name = "_sinonjs_commons___commons_1.8.3.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz"; - sha512 = "xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ=="; + name = "_sindresorhus_is___is_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz"; + sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="; }; } { - name = "_sinonjs_fake_timers___fake_timers_8.1.0.tgz"; + name = "_sinonjs_commons___commons_1.8.6.tgz"; path = fetchurl { - 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=="; + name = "_sinonjs_commons___commons_1.8.6.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz"; + sha512 = "Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ=="; }; } { - name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + name = "_sinonjs_fake_timers___fake_timers_9.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 = "_sinonjs_fake_timers___fake_timers_9.1.2.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz"; + sha512 = "BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw=="; }; } { - name = "_tootallnate_once___once_1.1.2.tgz"; + name = "_szmarczak_http_timer___http_timer_4.0.6.tgz"; path = fetchurl { - name = "_tootallnate_once___once_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz"; - sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; + name = "_szmarczak_http_timer___http_timer_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz"; + sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; } { @@ -642,11 +810,11 @@ }; } { - name = "_types_babel__core___babel__core_7.1.19.tgz"; + name = "_types_babel__core___babel__core_7.1.20.tgz"; path = fetchurl { - 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__core___babel__core_7.1.20.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.20.tgz"; + sha512 = "PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ=="; }; } { @@ -666,19 +834,27 @@ }; } { - name = "_types_babel__traverse___babel__traverse_7.14.2.tgz"; + name = "_types_babel__traverse___babel__traverse_7.18.3.tgz"; path = fetchurl { - 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_babel__traverse___babel__traverse_7.18.3.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.3.tgz"; + sha512 = "1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w=="; }; } { - name = "_types_chrome___chrome_0.0.180.tgz"; + name = "_types_cacheable_request___cacheable_request_6.0.3.tgz"; path = fetchurl { - 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_cacheable_request___cacheable_request_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz"; + sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw=="; + }; + } + { + name = "_types_chrome___chrome_0.0.197.tgz"; + path = fetchurl { + name = "_types_chrome___chrome_0.0.197.tgz"; + url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.197.tgz"; + sha512 = "m1NfS5bOjaypyqQfaX6CxmJodZVcvj5+Mt/K94EBHkflYjPNmXHAzbxfifdLMa0YM3PDyOxohoTS5ug/e6p5jA=="; }; } { @@ -689,6 +865,38 @@ sha512 = "9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg=="; }; } + { + name = "_types_eslint_scope___eslint_scope_3.7.4.tgz"; + path = fetchurl { + name = "_types_eslint_scope___eslint_scope_3.7.4.tgz"; + url = "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz"; + sha512 = "9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA=="; + }; + } + { + name = "_types_eslint___eslint_8.4.10.tgz"; + path = fetchurl { + name = "_types_eslint___eslint_8.4.10.tgz"; + url = "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.10.tgz"; + sha512 = "Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw=="; + }; + } + { + name = "_types_estree___estree_1.0.0.tgz"; + path = fetchurl { + name = "_types_estree___estree_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz"; + sha512 = "WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ=="; + }; + } + { + name = "_types_estree___estree_0.0.51.tgz"; + path = fetchurl { + name = "_types_estree___estree_0.0.51.tgz"; + url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz"; + sha512 = "CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="; + }; + } { name = "_types_filesystem___filesystem_0.0.32.tgz"; path = fetchurl { @@ -738,11 +946,19 @@ }; } { - name = "_types_har_format___har_format_1.2.8.tgz"; + name = "_types_har_format___har_format_1.2.10.tgz"; path = fetchurl { - 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_har_format___har_format_1.2.10.tgz"; + url = "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.10.tgz"; + sha512 = "o0J30wqycjF5miWDKYKKzzOU1ZTLuA42HZ4HE7/zqTOc/jTLdQ5NhYWvsRQo45Nfi1KHoRdNhteSI4BAxTF1Pg=="; + }; + } + { + name = "_types_http_cache_semantics___http_cache_semantics_4.0.1.tgz"; + path = fetchurl { + name = "_types_http_cache_semantics___http_cache_semantics_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz"; + sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; }; } { @@ -770,11 +986,35 @@ }; } { - name = "_types_minimatch___minimatch_3.0.5.tgz"; + name = "_types_jsdom___jsdom_20.0.1.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_jsdom___jsdom_20.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-20.0.1.tgz"; + sha512 = "d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ=="; + }; + } + { + name = "_types_json_schema___json_schema_7.0.11.tgz"; + path = fetchurl { + name = "_types_json_schema___json_schema_7.0.11.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz"; + sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; + }; + } + { + name = "_types_keyv___keyv_3.1.4.tgz"; + path = fetchurl { + name = "_types_keyv___keyv_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz"; + sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; + }; + } + { + name = "_types_minimatch___minimatch_5.1.2.tgz"; + path = fetchurl { + name = "_types_minimatch___minimatch_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz"; + sha512 = "K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="; }; } { @@ -786,19 +1026,19 @@ }; } { - name = "_types_node___node_17.0.22.tgz"; + name = "_types_node___node_18.11.17.tgz"; path = fetchurl { - 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_18.11.17.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.17.tgz"; + sha512 = "HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="; }; } { - name = "_types_node___node_14.18.12.tgz"; + name = "_types_node___node_16.18.10.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_node___node_16.18.10.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.10.tgz"; + sha512 = "XU1+v7h81p7145ddPfjv7jtWvkSilpcnON3mQ+bDi9Yuf7OI56efOglXRyXWgQ57xH3fEQgh7WOJMncRHVew5w=="; }; } { @@ -810,11 +1050,19 @@ }; } { - name = "_types_prettier___prettier_2.4.4.tgz"; + name = "_types_prettier___prettier_2.7.2.tgz"; path = fetchurl { - 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_prettier___prettier_2.7.2.tgz"; + url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz"; + sha512 = "KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg=="; + }; + } + { + name = "_types_responselike___responselike_1.0.0.tgz"; + path = fetchurl { + name = "_types_responselike___responselike_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz"; + sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; }; } { @@ -826,11 +1074,19 @@ }; } { - name = "_types_verror___verror_1.10.5.tgz"; + name = "_types_tough_cookie___tough_cookie_4.0.2.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_tough_cookie___tough_cookie_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz"; + sha512 = "Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw=="; + }; + } + { + name = "_types_verror___verror_1.10.6.tgz"; + path = fetchurl { + name = "_types_verror___verror_1.10.6.tgz"; + url = "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz"; + sha512 = "NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ=="; }; } { @@ -842,35 +1098,211 @@ }; } { - name = "_types_yargs___yargs_16.0.4.tgz"; + name = "_types_yargs___yargs_17.0.17.tgz"; path = fetchurl { - 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.17.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.17.tgz"; + sha512 = "72bWxFKTK6uwWJAVT+3rF6Jo6RTojiJ27FQo8Rf60AL+VZbzoVPnMFhKsUnbjR8A3BTCYQ7Mv3hnl8T0A+CX9g=="; }; } { - name = "_types_yargs___yargs_17.0.10.tgz"; + name = "_types_yauzl___yauzl_2.10.0.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 = "_types_yauzl___yauzl_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz"; + sha512 = "Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw=="; }; } { - name = "abab___abab_2.0.5.tgz"; + name = "_webassemblyjs_ast___ast_1.11.1.tgz"; path = fetchurl { - name = "abab___abab_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz"; - sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="; + name = "_webassemblyjs_ast___ast_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz"; + sha512 = "ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw=="; }; } { - name = "acorn_globals___acorn_globals_6.0.0.tgz"; + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.11.1.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"; - sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg=="; + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz"; + sha512 = "iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="; + }; + } + { + name = "_webassemblyjs_helper_api_error___helper_api_error_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_api_error___helper_api_error_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz"; + sha512 = "RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="; + }; + } + { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz"; + sha512 = "gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="; + }; + } + { + name = "_webassemblyjs_helper_numbers___helper_numbers_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_numbers___helper_numbers_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz"; + sha512 = "vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ=="; + }; + } + { + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz"; + sha512 = "PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="; + }; + } + { + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz"; + sha512 = "10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg=="; + }; + } + { + name = "_webassemblyjs_ieee754___ieee754_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_ieee754___ieee754_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz"; + sha512 = "hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ=="; + }; + } + { + name = "_webassemblyjs_leb128___leb128_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_leb128___leb128_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz"; + sha512 = "BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw=="; + }; + } + { + name = "_webassemblyjs_utf8___utf8_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_utf8___utf8_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz"; + sha512 = "9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="; + }; + } + { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz"; + sha512 = "g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA=="; + }; + } + { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz"; + sha512 = "F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA=="; + }; + } + { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz"; + sha512 = "VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw=="; + }; + } + { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz"; + sha512 = "rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA=="; + }; + } + { + name = "_webassemblyjs_wast_printer___wast_printer_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wast_printer___wast_printer_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz"; + sha512 = "IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg=="; + }; + } + { + name = "_webpack_cli_configtest___configtest_2.0.1.tgz"; + path = fetchurl { + name = "_webpack_cli_configtest___configtest_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz"; + sha512 = "njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A=="; + }; + } + { + name = "_webpack_cli_info___info_2.0.1.tgz"; + path = fetchurl { + name = "_webpack_cli_info___info_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz"; + sha512 = "fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA=="; + }; + } + { + name = "_webpack_cli_serve___serve_2.0.1.tgz"; + path = fetchurl { + name = "_webpack_cli_serve___serve_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz"; + sha512 = "0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw=="; + }; + } + { + 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"; + sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; + }; + } + { + 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"; + sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; + }; + } + { + name = "abab___abab_2.0.6.tgz"; + path = fetchurl { + name = "abab___abab_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz"; + sha512 = "j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="; + }; + } + { + name = "abbrev___abbrev_1.1.1.tgz"; + path = fetchurl { + name = "abbrev___abbrev_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + }; + } + { + name = "acorn_globals___acorn_globals_7.0.1.tgz"; + path = fetchurl { + name = "acorn_globals___acorn_globals_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz"; + sha512 = "umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q=="; + }; + } + { + name = "acorn_import_assertions___acorn_import_assertions_1.8.0.tgz"; + path = fetchurl { + name = "acorn_import_assertions___acorn_import_assertions_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz"; + sha512 = "m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw=="; }; } { @@ -882,27 +1314,19 @@ }; } { - name = "acorn_walk___acorn_walk_7.2.0.tgz"; + name = "acorn_walk___acorn_walk_8.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"; - sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; + name = "acorn_walk___acorn_walk_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz"; + sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; }; } { - name = "acorn___acorn_7.4.1.tgz"; + name = "acorn___acorn_8.8.1.tgz"; path = fetchurl { - name = "acorn___acorn_7.4.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; - sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; - }; - } - { - name = "acorn___acorn_8.7.0.tgz"; - path = fetchurl { - name = "acorn___acorn_8.7.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz"; - sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="; + name = "acorn___acorn_8.8.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz"; + sha512 = "7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="; }; } { @@ -913,6 +1337,22 @@ sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; } + { + name = "agentkeepalive___agentkeepalive_4.2.1.tgz"; + path = fetchurl { + name = "agentkeepalive___agentkeepalive_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz"; + sha512 = "Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA=="; + }; + } + { + 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"; + sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; + }; + } { name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; path = fetchurl { @@ -929,14 +1369,6 @@ 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_escapes___ansi_escapes_4.3.2.tgz"; path = fetchurl { @@ -978,27 +1410,43 @@ }; } { - name = "anymatch___anymatch_3.1.2.tgz"; + name = "anymatch___anymatch_3.1.3.tgz"; path = fetchurl { - name = "anymatch___anymatch_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; - sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; + name = "anymatch___anymatch_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz"; + sha512 = "KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="; }; } { - name = "app_builder_bin___app_builder_bin_3.7.1.tgz"; + name = "app_builder_bin___app_builder_bin_4.0.0.tgz"; path = fetchurl { - 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_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_22.14.13.tgz"; + name = "app_builder_lib___app_builder_lib_24.0.0_alpha.7.tgz"; path = fetchurl { - 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=="; + name = "app_builder_lib___app_builder_lib_24.0.0_alpha.7.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.0.0-alpha.7.tgz"; + sha512 = "kEzDjym0AV9pO4SX8+RaJX9fmxrrKlDzHxqAN7cxSgDM8BUneMJqeWtf9+Hqv6PMXAvpnRsrSHtNaYgDkhQdFA=="; + }; + } + { + name = "aproba___aproba_2.0.0.tgz"; + path = fetchurl { + name = "aproba___aproba_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz"; + sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_3.0.1.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz"; + sha512 = "QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg=="; }; } { @@ -1017,20 +1465,12 @@ 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="; + sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="; }; } { @@ -1050,11 +1490,11 @@ }; } { - name = "async___async_0.9.2.tgz"; + name = "async___async_3.2.4.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 = "async___async_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz"; + sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; }; } { @@ -1062,7 +1502,7 @@ path = fetchurl { name = "asynckit___asynckit_0.4.0.tgz"; url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "x57Zf380y48robyXkLzDZkdLS3k="; + sha512 = "Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="; }; } { @@ -1074,11 +1514,11 @@ }; } { - name = "babel_jest___babel_jest_27.5.1.tgz"; + name = "babel_jest___babel_jest_29.3.1.tgz"; path = fetchurl { - 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_jest___babel_jest_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.3.1.tgz"; + sha512 = "aard+xnMoxgjwV70t0L6wkW/3HQQtV+O0PEimxKgzNqCJnbYmroPojdP2tqKSOAt8QAKV/uSZU8851M7B5+fcA=="; }; } { @@ -1090,11 +1530,11 @@ }; } { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.5.1.tgz"; + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_29.2.0.tgz"; path = fetchurl { - 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=="; + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_29.2.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.2.0.tgz"; + sha512 = "TnspP2WNiR3GLfCsUNHqeXw0RoQ2f9U5hQ5L3XFpwuO8htQmSrhh8qsB6vi5Yi8+kuynN1yjDjQsPfkebmB6ZA=="; }; } { @@ -1106,11 +1546,11 @@ }; } { - name = "babel_preset_jest___babel_preset_jest_27.5.1.tgz"; + name = "babel_preset_jest___babel_preset_jest_29.2.0.tgz"; path = fetchurl { - 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=="; + name = "babel_preset_jest___babel_preset_jest_29.2.0.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.2.0.tgz"; + sha512 = "z9JmMJppMxNv8N7fNRHvhMg9cvIkMxQBXgFkane3yKVEvEOP+kB50lk8DFRvF9PGqbyXxlmebKWhuDORO8RgdA=="; }; } { @@ -1129,6 +1569,14 @@ sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; } + { + 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"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; + }; + } { name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; path = fetchurl { @@ -1153,14 +1601,6 @@ 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 { @@ -1169,6 +1609,14 @@ sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; } + { + name = "brace_expansion___brace_expansion_2.0.1.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz"; + sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; + }; + } { name = "braces___braces_3.0.2.tgz"; path = fetchurl { @@ -1178,19 +1626,11 @@ }; } { - name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + name = "browserslist___browserslist_4.21.4.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"; - sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="; - }; - } - { - name = "browserslist___browserslist_4.20.2.tgz"; - path = fetchurl { - name = "browserslist___browserslist_4.20.2.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz"; - sha512 = "CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA=="; + name = "browserslist___browserslist_4.21.4.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz"; + sha512 = "CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw=="; }; } { @@ -1201,44 +1641,20 @@ 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=="; - }; - } { 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="; + sha512 = "VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="; }; } { - name = "buffer_equal___buffer_equal_1.0.0.tgz"; + name = "buffer_equal___buffer_equal_1.0.1.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_equal___buffer_equal_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz"; + sha512 = "QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg=="; }; } { @@ -1258,27 +1674,43 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_8.9.2.tgz"; + name = "builder_util_runtime___builder_util_runtime_9.1.2_alpha.1.tgz"; path = fetchurl { - 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_9.1.2_alpha.1.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.2-alpha.1.tgz"; + sha512 = "4sbKIB0N9J/pvixX9HYUyRtMZT+cN+bgPJ5NqejyqSPxFzj7IFe1A9K14l5nnfpMVxzUSZVQMerniDeGszZ9OA=="; }; } { - name = "builder_util___builder_util_22.14.13.tgz"; + name = "builder_util___builder_util_24.0.0_alpha.6.tgz"; path = fetchurl { - 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=="; + name = "builder_util___builder_util_24.0.0_alpha.6.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-24.0.0-alpha.6.tgz"; + sha512 = "vSnVMyuZK0RArELPk1dLUdcunZ2Gj0mpAFat73yD5djiihNosXIpIbSO/OFTi2/MV0urlH0giU4DOs9EXaCKtA=="; }; } { - name = "cacheable_request___cacheable_request_6.1.0.tgz"; + name = "cacache___cacache_16.1.3.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 = "cacache___cacache_16.1.3.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz"; + sha512 = "/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ=="; + }; + } + { + name = "cacheable_lookup___cacheable_lookup_5.0.4.tgz"; + path = fetchurl { + name = "cacheable_lookup___cacheable_lookup_5.0.4.tgz"; + url = "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz"; + sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="; + }; + } + { + name = "cacheable_request___cacheable_request_7.0.2.tgz"; + path = fetchurl { + name = "cacheable_request___cacheable_request_7.0.2.tgz"; + url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz"; + sha512 = "pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew=="; }; } { @@ -1306,11 +1738,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001319.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001441.tgz"; path = fetchurl { - 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=="; + name = "caniuse_lite___caniuse_lite_1.0.30001441.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz"; + sha512 = "OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg=="; }; } { @@ -1337,28 +1769,36 @@ sha512 = "kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="; }; } + { + 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"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; + }; + } + { + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; + path = fetchurl { + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; + sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="; + }; + } { 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="; + sha512 = "1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw=="; }; } { - name = "ci_info___ci_info_2.0.0.tgz"; + name = "ci_info___ci_info_3.7.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 = "ci_info___ci_info_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.0.tgz"; + sha512 = "2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog=="; }; } { @@ -1370,11 +1810,27 @@ }; } { - name = "cli_boxes___cli_boxes_2.2.1.tgz"; + name = "clean_stack___clean_stack_2.2.0.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 = "clean_stack___clean_stack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; + sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; + }; + } + { + name = "cli_cursor___cli_cursor_3.1.0.tgz"; + path = fetchurl { + name = "cli_cursor___cli_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; + }; + } + { + name = "cli_spinners___cli_spinners_2.7.0.tgz"; + path = fetchurl { + name = "cli_spinners___cli_spinners_2.7.0.tgz"; + url = "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz"; + sha512 = "qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw=="; }; } { @@ -1386,19 +1842,35 @@ }; } { - name = "cliui___cliui_7.0.4.tgz"; + name = "cliui___cliui_8.0.1.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 = "cliui___cliui_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz"; + sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="; }; } { - name = "clone_response___clone_response_1.0.2.tgz"; + name = "clone_deep___clone_deep_4.0.1.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 = "clone_deep___clone_deep_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz"; + sha512 = "neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ=="; + }; + } + { + name = "clone_response___clone_response_1.0.3.tgz"; + path = fetchurl { + name = "clone_response___clone_response_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz"; + sha512 = "ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA=="; + }; + } + { + name = "clone___clone_1.0.4.tgz"; + path = fetchurl { + name = "clone___clone_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz"; + sha512 = "JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="; }; } { @@ -1406,7 +1878,7 @@ path = fetchurl { name = "co___co_4.6.0.tgz"; url = "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz"; - sha1 = "bqa989hTrlTMuOR7+gvz+QMfsYQ="; + sha512 = "QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="; }; } { @@ -1438,7 +1910,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 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; + sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; }; } { @@ -1450,11 +1922,19 @@ }; } { - name = "colors___colors_1.0.3.tgz"; + name = "color_support___color_support_1.1.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 = "color_support___color_support_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz"; + sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; + }; + } + { + name = "colorette___colorette_2.0.19.tgz"; + path = fetchurl { + name = "colorette___colorette_2.0.19.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz"; + sha512 = "3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="; }; } { @@ -1466,11 +1946,11 @@ }; } { - name = "commander___commander_2.9.0.tgz"; + name = "commander___commander_2.20.3.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_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; }; } { @@ -1481,12 +1961,20 @@ sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; } + { + name = "commander___commander_9.4.1.tgz"; + path = fetchurl { + name = "commander___commander_9.4.1.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz"; + sha512 = "5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw=="; + }; + } { 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="; + sha512 = "pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A=="; }; } { @@ -1494,39 +1982,39 @@ 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="; + sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; }; } { - name = "concat_stream___concat_stream_1.6.2.tgz"; + name = "config_file_ts___config_file_ts_0.2.4.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_file_ts___config_file_ts_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.4.tgz"; + sha512 = "cKSW0BfrSaAUnxpgvpXPLaaW/umg4bqg4k3GO1JqlRfpx+d5W0GDXznCMkWotJQek5Mmz1MJVChQnz3IVaeMZQ=="; }; } { - name = "config_chain___config_chain_1.1.13.tgz"; + name = "console_control_strings___console_control_strings_1.1.0.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 = "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"; + sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="; }; } { - name = "configstore___configstore_5.0.1.tgz"; + name = "convert_source_map___convert_source_map_1.9.0.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 = "convert_source_map___convert_source_map_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz"; + sha512 = "ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="; }; } { - name = "convert_source_map___convert_source_map_1.8.0.tgz"; + name = "convert_source_map___convert_source_map_2.0.0.tgz"; 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"; - sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; + name = "convert_source_map___convert_source_map_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz"; + sha512 = "Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="; }; } { @@ -1534,15 +2022,7 @@ 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=="; + sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="; }; } { @@ -1562,19 +2042,11 @@ }; } { - name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; + name = "cssom___cssom_0.5.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 = "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"; - sha512 = "p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="; + name = "cssom___cssom_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz"; + sha512 = "iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw=="; }; } { @@ -1594,11 +2066,19 @@ }; } { - name = "data_urls___data_urls_2.0.0.tgz"; + name = "darkreader___darkreader_4.9.58.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"; - sha512 = "X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ=="; + name = "darkreader___darkreader_4.9.58.tgz"; + url = "https://registry.yarnpkg.com/darkreader/-/darkreader-4.9.58.tgz"; + sha512 = "D/JGoJqW3m2AWBLhO+Pev+eThfs+CwRT4bcLb/1zKjql2yVwG0lx8C2XRDdSVGHw4y11n26W7syWoBpUfuhMqQ=="; + }; + } + { + name = "data_urls___data_urls_3.0.2.tgz"; + path = fetchurl { + name = "data_urls___data_urls_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz"; + sha512 = "Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ=="; }; } { @@ -1610,27 +2090,19 @@ }; } { - name = "debug___debug_2.6.9.tgz"; + name = "decimal.js___decimal.js_10.4.3.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 = "decimal.js___decimal.js_10.4.3.tgz"; + url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz"; + sha512 = "VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="; }; } { - name = "decimal.js___decimal.js_10.3.1.tgz"; + name = "decompress_response___decompress_response_6.0.0.tgz"; path = fetchurl { - name = "decimal.js___decimal.js_10.3.1.tgz"; - url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz"; - sha512 = "V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="; - }; - } - { - 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 = "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=="; }; } { @@ -1638,15 +2110,7 @@ path = fetchurl { name = "dedent___dedent_0.7.0.tgz"; url = "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz"; - sha1 = "JJXduvbrh0q7Dhvp3yLS5aVEMmw="; - }; - } - { - 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=="; + sha512 = "Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="; }; } { @@ -1666,19 +2130,27 @@ }; } { - name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + name = "defaults___defaults_1.0.4.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 = "defaults___defaults_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz"; + sha512 = "eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A=="; }; } { - name = "define_properties___define_properties_1.1.3.tgz"; + name = "defer_to_connect___defer_to_connect_2.0.1.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 = "defer_to_connect___defer_to_connect_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz"; + sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; + }; + } + { + name = "define_properties___define_properties_1.1.4.tgz"; + path = fetchurl { + name = "define_properties___define_properties_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz"; + sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; }; } { @@ -1686,7 +2158,31 @@ 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="; + sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; + }; + } + { + 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"; + sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; + }; + } + { + 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"; + sha512 = "7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="; + }; + } + { + name = "detect_libc___detect_libc_2.0.1.tgz"; + path = fetchurl { + name = "detect_libc___detect_libc_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz"; + sha512 = "463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="; }; } { @@ -1706,27 +2202,27 @@ }; } { - name = "diff_sequences___diff_sequences_27.5.1.tgz"; + name = "diff_sequences___diff_sequences_29.3.1.tgz"; path = fetchurl { - 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=="; + name = "diff_sequences___diff_sequences_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.3.1.tgz"; + sha512 = "hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ=="; }; } { - name = "dir_compare___dir_compare_2.4.0.tgz"; + name = "dir_compare___dir_compare_3.3.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 = "dir_compare___dir_compare_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz"; + sha512 = "J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg=="; }; } { - name = "dmg_builder___dmg_builder_22.14.13.tgz"; + name = "dmg_builder___dmg_builder_24.0.0_alpha.7.tgz"; path = fetchurl { - 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_builder___dmg_builder_24.0.0_alpha.7.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.0.0-alpha.7.tgz"; + sha512 = "5aQvKHvUb3vBjwwRRaYee9kvqKt+LKWFuOh4E750hClRIaYHQBOCxN2Ws0QVUxwZ22kBP+RQ0LS1tfesBGLPsw=="; }; } { @@ -1746,19 +2242,11 @@ }; } { - name = "domexception___domexception_2.0.1.tgz"; + name = "domexception___domexception_4.0.0.tgz"; path = fetchurl { - name = "domexception___domexception_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz"; - sha512 = "yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg=="; - }; - } - { - 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 = "domexception___domexception_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz"; + sha512 = "A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw=="; }; } { @@ -1778,67 +2266,51 @@ }; } { - name = "duplexer3___duplexer3_0.1.4.tgz"; + name = "ejs___ejs_3.1.8.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.8.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz"; + sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; }; } { - name = "ejs___ejs_3.1.6.tgz"; + name = "electron_builder___electron_builder_24.0.0_alpha.7.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_24.0.0_alpha.7.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.0.0-alpha.7.tgz"; + sha512 = "havD3dI5q9C4eWr+mJg82dKS81kYhcDUgBnRU90wxRdjT8R+cxqJxtgk/poJbMJi/qURza9wedAkgQbk48QQLQ=="; }; } { - name = "electron_builder___electron_builder_22.14.13.tgz"; + name = "electron_publish___electron_publish_24.0.0_alpha.6.tgz"; path = fetchurl { - 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_24.0.0_alpha.6.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.0.0-alpha.6.tgz"; + sha512 = "ppRriKQuLGK8eZrCveQrf1zB+fV6qcTck6cq4NEC61KyvtQlUdvDV4yGRVmkOO28CYRmhq9w093T93Qc6k/TeQ=="; }; } { - name = "electron_osx_sign___electron_osx_sign_0.5.0.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.4.284.tgz"; path = fetchurl { - 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.4.284.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz"; + sha512 = "M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="; }; } { - name = "electron_publish___electron_publish_22.14.13.tgz"; + name = "electron___electron_22.0.0.tgz"; path = fetchurl { - 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_22.0.0.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-22.0.0.tgz"; + sha512 = "cgRc4wjyM+81A0E8UGv1HNJjL1HBI5cWNh/DUIjzYvoUuiEM0SS0hAH/zaFQ18xOz2ced6Yih8SybpOiOYJhdg=="; }; } { - name = "electron_to_chromium___electron_to_chromium_1.4.90.tgz"; + name = "emittery___emittery_0.13.1.tgz"; path = fetchurl { - 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=="; - }; - } - { - name = "emittery___emittery_0.8.1.tgz"; - path = fetchurl { - name = "emittery___emittery_0.8.1.tgz"; - url = "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz"; - sha512 = "uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg=="; + name = "emittery___emittery_0.13.1.tgz"; + url = "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz"; + sha512 = "DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ=="; }; } { @@ -1850,11 +2322,11 @@ }; } { - name = "encodeurl___encodeurl_1.0.2.tgz"; + name = "encoding___encoding_0.1.13.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 = "encoding___encoding_0.1.13.tgz"; + url = "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz"; + sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; }; } { @@ -1865,6 +2337,22 @@ sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; } + { + name = "enhanced_resolve___enhanced_resolve_5.12.0.tgz"; + path = fetchurl { + name = "enhanced_resolve___enhanced_resolve_5.12.0.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz"; + sha512 = "QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ=="; + }; + } + { + name = "entities___entities_4.4.0.tgz"; + path = fetchurl { + name = "entities___entities_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz"; + sha512 = "oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA=="; + }; + } { name = "env_paths___env_paths_2.2.1.tgz"; path = fetchurl { @@ -1873,6 +2361,22 @@ sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; }; } + { + name = "envinfo___envinfo_7.8.1.tgz"; + path = fetchurl { + name = "envinfo___envinfo_7.8.1.tgz"; + url = "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz"; + sha512 = "/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw=="; + }; + } + { + name = "err_code___err_code_2.0.3.tgz"; + path = fetchurl { + name = "err_code___err_code_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz"; + sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; + }; + } { name = "error_ex___error_ex_1.3.2.tgz"; path = fetchurl { @@ -1881,6 +2385,14 @@ sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; } + { + name = "es_module_lexer___es_module_lexer_0.9.3.tgz"; + path = fetchurl { + name = "es_module_lexer___es_module_lexer_0.9.3.tgz"; + url = "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz"; + sha512 = "1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="; + }; + } { name = "es6_error___es6_error_4.1.1.tgz"; path = fetchurl { @@ -1897,20 +2409,12 @@ 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="; + sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; }; } { @@ -1945,6 +2449,14 @@ sha512 = "2j/XKQ9sNJwK8kIp/U0EvuF6stS6/8aIc53/NskE4C5NRNh4dt3xzbZyOdrVC11cTH6Zo59/pdzA0Kb+2fQGWg=="; }; } + { + 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"; + sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; + }; + } { name = "eslint_scope___eslint_scope_7.1.1.tgz"; path = fetchurl { @@ -1978,19 +2490,19 @@ }; } { - name = "eslint___eslint_8.9.0.tgz"; + name = "eslint___eslint_8.29.0.tgz"; path = fetchurl { - name = "eslint___eslint_8.9.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-8.9.0.tgz"; - sha512 = "PB09IGwv4F4b0/atrbcMFboF/giawbBLVC7fyDamk5Wtey4Jh2K+rYaBhCAbUyEI4QzB1ly09Uglc9iCtFaG2Q=="; + name = "eslint___eslint_8.29.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-8.29.0.tgz"; + sha512 = "isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg=="; }; } { - name = "espree___espree_9.3.1.tgz"; + name = "espree___espree_9.4.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=="; + name = "espree___espree_9.4.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz"; + sha512 = "XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg=="; }; } { @@ -2017,6 +2529,14 @@ sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; }; } + { + 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"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + } { name = "estraverse___estraverse_5.3.0.tgz"; path = fetchurl { @@ -2033,6 +2553,14 @@ sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; }; } + { + name = "events___events_3.3.0.tgz"; + path = fetchurl { + name = "events___events_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz"; + sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; + }; + } { name = "execa___execa_5.1.1.tgz"; path = fetchurl { @@ -2046,23 +2574,23 @@ path = fetchurl { name = "exit___exit_0.1.2.tgz"; url = "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz"; - sha1 = "BjJjj42HfMghB9MKD/8aF8uhzQw="; + sha512 = "Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="; }; } { - name = "expect___expect_27.5.1.tgz"; + name = "expect___expect_29.3.1.tgz"; path = fetchurl { - name = "expect___expect_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/expect/-/expect-27.5.1.tgz"; - sha512 = "E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw=="; + name = "expect___expect_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/expect/-/expect-29.3.1.tgz"; + sha512 = "gGb1yTgU30Q0O/tQq+z30KBWv24ApkMgFUpvKBkyLUBL68Wv8dHdJxTBZFl/iT8K/bqDHvUYRH6IIN3rToopPA=="; }; } { - name = "extract_zip___extract_zip_1.7.0.tgz"; + name = "extract_zip___extract_zip_2.0.1.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 = "extract_zip___extract_zip_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz"; + sha512 = "GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg=="; }; } { @@ -2094,23 +2622,31 @@ 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 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc="; + sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; }; } { - name = "fast_xml_parser___fast_xml_parser_3.21.1.tgz"; + name = "fastest_levenshtein___fastest_levenshtein_1.0.16.tgz"; path = fetchurl { - 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=="; + name = "fastest_levenshtein___fastest_levenshtein_1.0.16.tgz"; + url = "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz"; + sha512 = "eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg=="; }; } { - name = "fb_watchman___fb_watchman_2.0.1.tgz"; + name = "fastq___fastq_1.14.0.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"; - sha512 = "DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg=="; + name = "fastq___fastq_1.14.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.14.0.tgz"; + sha512 = "eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg=="; + }; + } + { + name = "fb_watchman___fb_watchman_2.0.2.tgz"; + path = fetchurl { + name = "fb_watchman___fb_watchman_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz"; + sha512 = "p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA=="; }; } { @@ -2118,7 +2654,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 = "JcfInLH5B3+IkbvmHY85Dq4lbx4="; + sha512 = "cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g=="; }; } { @@ -2130,11 +2666,11 @@ }; } { - name = "filelist___filelist_1.0.2.tgz"; + name = "filelist___filelist_1.0.4.tgz"; path = fetchurl { - name = "filelist___filelist_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz"; - sha512 = "z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ=="; + name = "filelist___filelist_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz"; + sha512 = "w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q=="; }; } { @@ -2153,6 +2689,14 @@ sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; }; } + { + name = "find_up___find_up_5.0.0.tgz"; + path = fetchurl { + name = "find_up___find_up_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz"; + sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; + }; + } { name = "flat_cache___flat_cache_3.0.4.tgz"; path = fetchurl { @@ -2162,19 +2706,11 @@ }; } { - name = "flatted___flatted_3.2.5.tgz"; + name = "flatted___flatted_3.2.7.tgz"; path = fetchurl { - name = "flatted___flatted_3.2.5.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz"; - sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; - }; - } - { - name = "form_data___form_data_3.0.1.tgz"; - path = fetchurl { - name = "form_data___form_data_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz"; - sha512 = "RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg=="; + name = "flatted___flatted_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz"; + sha512 = "5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="; }; } { @@ -2186,11 +2722,11 @@ }; } { - name = "fs_extra___fs_extra_10.0.1.tgz"; + name = "fs_extra___fs_extra_10.1.0.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_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz"; + sha512 = "oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="; }; } { @@ -2209,12 +2745,20 @@ sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; }; } + { + 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"; + sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; + }; + } { 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="; + sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; }; } { @@ -2234,11 +2778,11 @@ }; } { - name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + name = "gauge___gauge_4.0.4.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 = "GwqzvVU7Kg1jmdKcDj6gslIHgyc="; + name = "gauge___gauge_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz"; + sha512 = "f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg=="; }; } { @@ -2257,6 +2801,14 @@ sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; } + { + name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; + path = fetchurl { + name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; + sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; + }; + } { name = "get_package_type___get_package_type_0.1.0.tgz"; path = fetchurl { @@ -2265,14 +2817,6 @@ sha512 = "pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="; }; } - { - 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 { @@ -2298,11 +2842,27 @@ }; } { - name = "glob___glob_7.2.0.tgz"; + name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; path = fetchurl { - name = "glob___glob_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz"; - sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; + name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; + sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; + }; + } + { + name = "glob___glob_7.2.3.tgz"; + path = fetchurl { + name = "glob___glob_7.2.3.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz"; + sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; + }; + } + { + name = "glob___glob_8.0.3.tgz"; + path = fetchurl { + name = "glob___glob_8.0.3.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz"; + sha512 = "ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ=="; }; } { @@ -2313,22 +2873,6 @@ 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 = "globals___globals_11.12.0.tgz"; path = fetchurl { @@ -2338,43 +2882,43 @@ }; } { - name = "globals___globals_13.13.0.tgz"; + name = "globals___globals_13.19.0.tgz"; path = fetchurl { - name = "globals___globals_13.13.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz"; - sha512 = "EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A=="; + name = "globals___globals_13.19.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.19.0.tgz"; + sha512 = "dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ=="; }; } { - name = "globalthis___globalthis_1.0.2.tgz"; + name = "globalthis___globalthis_1.0.3.tgz"; path = fetchurl { - name = "globalthis___globalthis_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz"; - sha512 = "ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ=="; + name = "globalthis___globalthis_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz"; + sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; }; } { - name = "got___got_9.6.0.tgz"; + name = "got___got_11.8.6.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 = "got___got_11.8.6.tgz"; + url = "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz"; + sha512 = "6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g=="; }; } { - name = "graceful_fs___graceful_fs_4.2.9.tgz"; + name = "graceful_fs___graceful_fs_4.2.10.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_fs___graceful_fs_4.2.10.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz"; + sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; }; } { - name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; + name = "grapheme_splitter___grapheme_splitter_1.0.4.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 = "grapheme_splitter___grapheme_splitter_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz"; + sha512 = "bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="; }; } { @@ -2382,7 +2926,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 = "tdRU3CGZriJWmfNGfloH87lVuv0="; + sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; }; } { @@ -2394,11 +2938,27 @@ }; } { - name = "has_yarn___has_yarn_2.1.0.tgz"; + name = "has_property_descriptors___has_property_descriptors_1.0.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 = "has_property_descriptors___has_property_descriptors_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; + sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; + }; + } + { + name = "has_symbols___has_symbols_1.0.3.tgz"; + path = fetchurl { + name = "has_symbols___has_symbols_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz"; + sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; + }; + } + { + 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"; + sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; }; } { @@ -2409,6 +2969,14 @@ sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; } + { + name = "highlight.js___highlight.js_11.7.0.tgz"; + path = fetchurl { + name = "highlight.js___highlight.js_11.7.0.tgz"; + url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.7.0.tgz"; + sha512 = "1rRqesRFhMO/PRF+G86evnyJkCgaZFOI+Z6kdj15TA18funfoqJXvgPCLSf0SWq3SRfg1j3HlDs8o4s3EGq1oQ=="; + }; + } { name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; path = fetchurl { @@ -2418,11 +2986,11 @@ }; } { - name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; + name = "html_encoding_sniffer___html_encoding_sniffer_3.0.0.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"; - sha512 = "D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ=="; + name = "html_encoding_sniffer___html_encoding_sniffer_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz"; + sha512 = "oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA=="; }; } { @@ -2441,14 +3009,6 @@ sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; }; } - { - name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; - 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"; - sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; - }; - } { name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; path = fetchurl { @@ -2458,11 +3018,19 @@ }; } { - name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; + name = "http2_wrapper___http2_wrapper_1.0.3.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 = "http2_wrapper___http2_wrapper_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz"; + sha512 = "V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg=="; + }; + } + { + name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; + path = fetchurl { + name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; + sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; } { @@ -2473,6 +3041,14 @@ sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; }; } + { + name = "humanize_ms___humanize_ms_1.2.1.tgz"; + path = fetchurl { + name = "humanize_ms___humanize_ms_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz"; + sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; + }; + } { name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; path = fetchurl { @@ -2481,14 +3057,6 @@ sha512 = "T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ=="; }; } - { - 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"; - sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; - }; - } { name = "iconv_lite___iconv_lite_0.6.3.tgz"; path = fetchurl { @@ -2506,11 +3074,11 @@ }; } { - name = "ignore___ignore_5.2.0.tgz"; + name = "ignore___ignore_5.2.4.tgz"; path = fetchurl { - name = "ignore___ignore_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz"; - sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; + name = "ignore___ignore_5.2.4.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz"; + sha512 = "MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="; }; } { @@ -2521,14 +3089,6 @@ sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; }; } - { - 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 = "import_local___import_local_3.1.0.tgz"; path = fetchurl { @@ -2542,7 +3102,23 @@ path = fetchurl { name = "imurmurhash___imurmurhash_0.1.4.tgz"; url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "khi5srkoojixPcT7a21XbyMUU+o="; + sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; + }; + } + { + 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 = "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"; + sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; }; } { @@ -2550,7 +3126,7 @@ path = fetchurl { name = "inflight___inflight_1.0.6.tgz"; url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; + sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; }; } { @@ -2562,19 +3138,19 @@ }; } { - name = "ini___ini_2.0.0.tgz"; + name = "interpret___interpret_3.1.1.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 = "interpret___interpret_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz"; + sha512 = "6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ=="; }; } { - name = "ini___ini_1.3.8.tgz"; + name = "ip___ip_2.0.0.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 = "ip___ip_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz"; + sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; }; } { @@ -2582,15 +3158,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 = "d8mYQFJ6qOyxqLppe4BkWnqSap0="; - }; - } - { - 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=="; + sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="; }; } { @@ -2602,11 +3170,11 @@ }; } { - name = "is_core_module___is_core_module_2.8.1.tgz"; + name = "is_core_module___is_core_module_2.11.0.tgz"; path = fetchurl { - 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=="; + name = "is_core_module___is_core_module_2.11.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz"; + sha512 = "RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw=="; }; } { @@ -2614,7 +3182,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 = "qIwCU1eR8C7TfHahueqXc8gz+MI="; + sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; }; } { @@ -2642,19 +3210,19 @@ }; } { - name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; + name = "is_interactive___is_interactive_1.0.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_interactive___is_interactive_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz"; + sha512 = "2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="; }; } { - name = "is_npm___is_npm_5.0.0.tgz"; + name = "is_lambda___is_lambda_1.0.1.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_lambda___is_lambda_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz"; + sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; }; } { @@ -2665,14 +3233,6 @@ sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; } - { - 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 { @@ -2681,6 +3241,14 @@ sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; }; } + { + 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"; + sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; + }; + } { name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; path = fetchurl { @@ -2698,51 +3266,27 @@ }; } { - name = "is_svg___is_svg_4.3.2.tgz"; + name = "is_unicode_supported___is_unicode_supported_0.1.0.tgz"; path = fetchurl { - 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=="; + name = "is_unicode_supported___is_unicode_supported_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; + sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; }; } { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; + name = "isbinaryfile___isbinaryfile_4.0.10.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 = "isbinaryfile___isbinaryfile_4.0.10.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz"; + sha512 = "iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw=="; }; } { - name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; + name = "isbinaryfile___isbinaryfile_5.0.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 = "isbinaryfile___isbinaryfile_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.0.tgz"; + sha512 = "UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg=="; }; } { @@ -2750,7 +3294,15 @@ path = fetchurl { name = "isexe___isexe_2.0.0.tgz"; url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA="; + sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; + }; + } + { + 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"; + sha512 = "WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="; }; } { @@ -2762,11 +3314,11 @@ }; } { - name = "istanbul_lib_instrument___istanbul_lib_instrument_5.1.0.tgz"; + name = "istanbul_lib_instrument___istanbul_lib_instrument_5.2.1.tgz"; path = fetchurl { - 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=="; + name = "istanbul_lib_instrument___istanbul_lib_instrument_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz"; + sha512 = "pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg=="; }; } { @@ -2786,235 +3338,219 @@ }; } { - name = "istanbul_reports___istanbul_reports_3.1.4.tgz"; + name = "istanbul_reports___istanbul_reports_3.1.5.tgz"; path = fetchurl { - 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 = "istanbul_reports___istanbul_reports_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz"; + sha512 = "nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w=="; }; } { - name = "jake___jake_10.8.4.tgz"; + name = "jake___jake_10.8.5.tgz"; path = fetchurl { - 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 = "jake___jake_10.8.5.tgz"; + url = "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz"; + sha512 = "sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw=="; }; } { - name = "jest_changed_files___jest_changed_files_27.5.1.tgz"; + name = "jest_changed_files___jest_changed_files_29.2.0.tgz"; path = fetchurl { - 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_changed_files___jest_changed_files_29.2.0.tgz"; + url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.2.0.tgz"; + sha512 = "qPVmLLyBmvF5HJrY7krDisx6Voi8DmlV3GZYX0aFNbaQsZeoz1hfxcCMbqDGuQCxU1dJy9eYc2xscE8QrCCYaA=="; }; } { - name = "jest_circus___jest_circus_27.5.1.tgz"; + name = "jest_circus___jest_circus_29.3.1.tgz"; path = fetchurl { - 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_circus___jest_circus_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.3.1.tgz"; + sha512 = "wpr26sEvwb3qQQbdlmei+gzp6yoSSoSL6GsLPxnuayZSMrSd5Ka7IjAvatpIernBvT2+Ic6RLTg+jSebScmasg=="; }; } { - name = "jest_cli___jest_cli_27.5.1.tgz"; + name = "jest_cli___jest_cli_29.3.1.tgz"; path = fetchurl { - 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_cli___jest_cli_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.3.1.tgz"; + sha512 = "TO/ewvwyvPOiBBuWZ0gm04z3WWP8TIK8acgPzE4IxgsLKQgb377NYGrQLc3Wl/7ndWzIH2CDNNsUjGxwLL43VQ=="; }; } { - name = "jest_config___jest_config_27.5.1.tgz"; + name = "jest_config___jest_config_29.3.1.tgz"; path = fetchurl { - 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_config___jest_config_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-config/-/jest-config-29.3.1.tgz"; + sha512 = "y0tFHdj2WnTEhxmGUK1T7fgLen7YK4RtfvpLFBXfQkh2eMJAQq24Vx9472lvn5wg0MAO6B+iPfJfzdR9hJYalg=="; }; } { - name = "jest_diff___jest_diff_27.5.1.tgz"; + name = "jest_diff___jest_diff_29.3.1.tgz"; path = fetchurl { - 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_diff___jest_diff_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.3.1.tgz"; + sha512 = "vU8vyiO7568tmin2lA3r2DP8oRvzhvRcD4DjpXc6uGveQodyk7CKLhQlCSiwgx3g0pFaE88/KLZ0yaTWMc4Uiw=="; }; } { - name = "jest_docblock___jest_docblock_27.5.1.tgz"; + name = "jest_docblock___jest_docblock_29.2.0.tgz"; path = fetchurl { - 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_docblock___jest_docblock_29.2.0.tgz"; + url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.2.0.tgz"; + sha512 = "bkxUsxTgWQGbXV5IENmfiIuqZhJcyvF7tU4zJ/7ioTutdz4ToB5Yx6JOFBpgI+TphRY4lhOyCWGNH/QFQh5T6A=="; }; } { - name = "jest_each___jest_each_27.5.1.tgz"; + name = "jest_each___jest_each_29.3.1.tgz"; path = fetchurl { - 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_each___jest_each_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-each/-/jest-each-29.3.1.tgz"; + sha512 = "qrZH7PmFB9rEzCSl00BWjZYuS1BSOH8lLuC0azQE9lQrAx3PWGKHTDudQiOSwIy5dGAJh7KA0ScYlCP7JxvFYA=="; }; } { - name = "jest_environment_jsdom___jest_environment_jsdom_27.5.1.tgz"; + name = "jest_environment_jsdom___jest_environment_jsdom_29.3.1.tgz"; path = fetchurl { - 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_jsdom___jest_environment_jsdom_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.3.1.tgz"; + sha512 = "G46nKgiez2Gy4zvYNhayfMEAFlVHhWfncqvqS6yCd0i+a4NsSUD2WtrKSaYQrYiLQaupHXxCRi8xxVL2M9PbhA=="; }; } { - name = "jest_environment_node___jest_environment_node_27.5.1.tgz"; + name = "jest_environment_node___jest_environment_node_29.3.1.tgz"; path = fetchurl { - 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_environment_node___jest_environment_node_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.3.1.tgz"; + sha512 = "xm2THL18Xf5sIHoU7OThBPtuH6Lerd+Y1NLYiZJlkE3hbE+7N7r8uvHIl/FkZ5ymKXJe/11SQuf3fv4v6rUMag=="; }; } { - name = "jest_get_type___jest_get_type_27.5.1.tgz"; + name = "jest_get_type___jest_get_type_29.2.0.tgz"; path = fetchurl { - 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_get_type___jest_get_type_29.2.0.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz"; + sha512 = "uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA=="; }; } { - name = "jest_haste_map___jest_haste_map_27.5.1.tgz"; + name = "jest_haste_map___jest_haste_map_29.3.1.tgz"; path = fetchurl { - 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_haste_map___jest_haste_map_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.3.1.tgz"; + sha512 = "/FFtvoG1xjbbPXQLFef+WSU4yrc0fc0Dds6aRPBojUid7qlPqZvxdUBA03HW0fnVHXVCnCdkuoghYItKNzc/0A=="; }; } { - name = "jest_jasmine2___jest_jasmine2_27.5.1.tgz"; + name = "jest_leak_detector___jest_leak_detector_29.3.1.tgz"; path = fetchurl { - 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_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.3.1.tgz"; + sha512 = "3DA/VVXj4zFOPagGkuqHnSQf1GZBmmlagpguxEERO6Pla2g84Q1MaVIB3YMxgUaFIaYag8ZnTyQgiZ35YEqAQA=="; }; } { - name = "jest_leak_detector___jest_leak_detector_27.5.1.tgz"; + name = "jest_matcher_utils___jest_matcher_utils_29.3.1.tgz"; path = fetchurl { - 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_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.3.1.tgz"; + sha512 = "fkRMZUAScup3txIKfMe3AIZZmPEjWEdsPJFK3AIy5qRohWqQFg1qrmKfYXR9qEkNc7OdAu2N4KPHibEmy4HPeQ=="; }; } { - name = "jest_matcher_utils___jest_matcher_utils_27.5.1.tgz"; + name = "jest_message_util___jest_message_util_29.3.1.tgz"; path = fetchurl { - 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_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.3.1.tgz"; + sha512 = "lMJTbgNcDm5z+6KDxWtqOFWlGQxD6XaYwBqHR8kmpkP+WWWG90I35kdtQHY67Ay5CSuydkTBbJG+tH9JShFCyA=="; }; } { - name = "jest_message_util___jest_message_util_27.5.1.tgz"; + name = "jest_mock___jest_mock_29.3.1.tgz"; path = fetchurl { - 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_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.3.1.tgz"; + sha512 = "H8/qFDtDVMFvFP4X8NuOT3XRDzOUTz+FeACjufHzsOIBAxivLqkB1PoLCaJx9iPPQ8dZThHPp/G3WRWyMgA3JA=="; }; } { - name = "jest_mock___jest_mock_27.5.1.tgz"; + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.3.tgz"; path = fetchurl { - 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=="; + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz"; + sha512 = "+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w=="; }; } { - name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; + name = "jest_regex_util___jest_regex_util_29.2.0.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"; - sha512 = "olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w=="; + name = "jest_regex_util___jest_regex_util_29.2.0.tgz"; + url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.2.0.tgz"; + sha512 = "6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA=="; }; } { - name = "jest_regex_util___jest_regex_util_27.5.1.tgz"; + name = "jest_resolve_dependencies___jest_resolve_dependencies_29.3.1.tgz"; path = fetchurl { - 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_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.3.1.tgz"; + sha512 = "Vk0cYq0byRw2WluNmNWGqPeRnZ3p3hHmjJMp2dyyZeYIfiBskwq4rpiuGFR6QGAdbj58WC7HN4hQHjf2mpvrLA=="; }; } { - name = "jest_resolve_dependencies___jest_resolve_dependencies_27.5.1.tgz"; + name = "jest_resolve___jest_resolve_29.3.1.tgz"; path = fetchurl { - 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_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.3.1.tgz"; + sha512 = "amXJgH/Ng712w3Uz5gqzFBBjxV8WFLSmNjoreBGMqxgCz5cH7swmBZzgBaCIOsvb0NbpJ0vgaSFdJqMdT+rADw=="; }; } { - name = "jest_resolve___jest_resolve_27.5.1.tgz"; + name = "jest_runner___jest_runner_29.3.1.tgz"; path = fetchurl { - 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_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.3.1.tgz"; + sha512 = "oFvcwRNrKMtE6u9+AQPMATxFcTySyKfLhvso7Sdk/rNpbhg4g2GAGCopiInk1OP4q6gz3n6MajW4+fnHWlU3bA=="; }; } { - name = "jest_runner___jest_runner_27.5.1.tgz"; + name = "jest_runtime___jest_runtime_29.3.1.tgz"; path = fetchurl { - 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_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.3.1.tgz"; + sha512 = "jLzkIxIqXwBEOZx7wx9OO9sxoZmgT2NhmQKzHQm1xwR1kNW/dn0OjxR424VwHHf1SPN6Qwlb5pp1oGCeFTQ62A=="; }; } { - name = "jest_runtime___jest_runtime_27.5.1.tgz"; + name = "jest_snapshot___jest_snapshot_29.3.1.tgz"; path = fetchurl { - 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_snapshot___jest_snapshot_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.3.1.tgz"; + sha512 = "+3JOc+s28upYLI2OJM4PWRGK9AgpsMs/ekNryUV0yMBClT9B1DF2u2qay8YxcQd338PPYSFNb0lsar1B49sLDA=="; }; } { - name = "jest_serializer___jest_serializer_27.5.1.tgz"; + name = "jest_util___jest_util_29.3.1.tgz"; path = fetchurl { - 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_util___jest_util_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-util/-/jest-util-29.3.1.tgz"; + sha512 = "7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ=="; }; } { - name = "jest_snapshot___jest_snapshot_27.5.1.tgz"; + name = "jest_validate___jest_validate_29.3.1.tgz"; path = fetchurl { - 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_validate___jest_validate_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.3.1.tgz"; + sha512 = "N9Lr3oYR2Mpzuelp1F8negJR3YE+L1ebk1rYA5qYo9TTY3f9OWdptLoNSPP9itOCBIRBqjt/S5XHlzYglLN67g=="; }; } { - name = "jest_util___jest_util_27.5.1.tgz"; + name = "jest_watcher___jest_watcher_29.3.1.tgz"; path = fetchurl { - 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.5.1.tgz"; - path = fetchurl { - 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.5.1.tgz"; - path = fetchurl { - 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_watcher___jest_watcher_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.3.1.tgz"; + sha512 = "RspXG2BQFDsZSRKGCT/NiNa8RkQ1iKAjrO0//soTMWx/QUt+OcxMqMSBxz23PYGqUuWm2+m2mNNsmj0eIoOaFg=="; }; } { @@ -3026,11 +3562,27 @@ }; } { - name = "jest___jest_27.5.1.tgz"; + name = "jest_worker___jest_worker_29.3.1.tgz"; path = fetchurl { - name = "jest___jest_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz"; - sha512 = "Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ=="; + name = "jest_worker___jest_worker_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.3.1.tgz"; + sha512 = "lY4AnnmsEWeiXirAIA0c9SDPbuCBq8IYuDVL8PMm0MZ2PEs2yPvRA/J64QBXuZp7CYKrDM/rmNrc9/i3KJQncw=="; + }; + } + { + name = "jest___jest_29.3.1.tgz"; + path = fetchurl { + name = "jest___jest_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/jest/-/jest-29.3.1.tgz"; + sha512 = "6iWfL5DTT0Np6UYs/y5Niu7WIfNv/wRTtN5RSXt2DIEft3dx3zPuw/3WJQBCJfmEzvDiEKwoqMbGD9n49+qLSA=="; + }; + } + { + name = "js_sdsl___js_sdsl_4.2.0.tgz"; + path = fetchurl { + name = "js_sdsl___js_sdsl_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz"; + sha512 = "dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ=="; }; } { @@ -3058,11 +3610,11 @@ }; } { - name = "jsdom___jsdom_16.7.0.tgz"; + name = "jsdom___jsdom_20.0.3.tgz"; path = fetchurl { - 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=="; + name = "jsdom___jsdom_20.0.3.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz"; + sha512 = "SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ=="; }; } { @@ -3074,11 +3626,11 @@ }; } { - name = "json_buffer___json_buffer_3.0.0.tgz"; + name = "json_buffer___json_buffer_3.0.1.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_buffer___json_buffer_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz"; + sha512 = "4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="; }; } { @@ -3102,7 +3654,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 = "nbe1lJatPzz+8wp1FC0tkwrXJlE="; + sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; }; } { @@ -3110,15 +3662,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 = "Epai1Y/UXxmg9s4B1lcB4sc1tus="; + sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; } { - name = "json5___json5_2.2.1.tgz"; + name = "json5___json5_2.2.2.tgz"; path = fetchurl { - name = "json5___json5_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; + name = "json5___json5_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz"; + sha512 = "46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ=="; }; } { @@ -3126,7 +3678,7 @@ path = fetchurl { name = "jsonfile___jsonfile_4.0.0.tgz"; url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "h3Gq4HmbZAdrdmQPygWPnBDjPss="; + sha512 = "m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg=="; }; } { @@ -3138,11 +3690,19 @@ }; } { - name = "keyv___keyv_3.1.0.tgz"; + name = "keyv___keyv_4.5.2.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 = "keyv___keyv_4.5.2.tgz"; + url = "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz"; + sha512 = "5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g=="; + }; + } + { + 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=="; }; } { @@ -3153,14 +3713,6 @@ sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="; }; } - { - 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 { @@ -3190,7 +3742,7 @@ path = fetchurl { name = "levn___levn_0.3.0.tgz"; url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; - sha1 = "OwmSTt+fCDwEkP3UwLxEIeBHZO4="; + sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="; }; } { @@ -3201,6 +3753,14 @@ sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; }; } + { + name = "loader_runner___loader_runner_4.3.0.tgz"; + path = fetchurl { + name = "loader_runner___loader_runner_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz"; + sha512 = "3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="; + }; + } { name = "locate_path___locate_path_5.0.0.tgz"; path = fetchurl { @@ -3209,6 +3769,14 @@ sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; }; } + { + name = "locate_path___locate_path_6.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz"; + sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; + }; + } { name = "lodash.merge___lodash.merge_4.6.2.tgz"; path = fetchurl { @@ -3226,11 +3794,11 @@ }; } { - name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + name = "log_symbols___log_symbols_4.1.0.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 = "log_symbols___log_symbols_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz"; + sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; }; } { @@ -3241,6 +3809,14 @@ sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; }; } + { + 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"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; + }; + } { name = "lru_cache___lru_cache_6.0.0.tgz"; path = fetchurl { @@ -3249,6 +3825,22 @@ sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; } + { + name = "lru_cache___lru_cache_7.14.1.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.1.tgz"; + sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA=="; + }; + } + { + name = "lzma_native___lzma_native_8.0.6.tgz"; + path = fetchurl { + name = "lzma_native___lzma_native_8.0.6.tgz"; + url = "https://registry.yarnpkg.com/lzma-native/-/lzma-native-8.0.6.tgz"; + sha512 = "09xfg67mkL2Lz20PrrDeNYZxzeW7ADtpYFbwSQh9U8+76RIzx5QsJBMy8qikv3hbUPfpy6hqwxt6FcGK81g9AA=="; + }; + } { name = "make_dir___make_dir_3.1.0.tgz"; path = fetchurl { @@ -3257,6 +3849,14 @@ sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; } + { + name = "make_fetch_happen___make_fetch_happen_10.2.1.tgz"; + path = fetchurl { + name = "make_fetch_happen___make_fetch_happen_10.2.1.tgz"; + url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz"; + sha512 = "NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w=="; + }; + } { name = "makeerror___makeerror_1.0.12.tgz"; path = fetchurl { @@ -3265,6 +3865,14 @@ sha512 = "JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg=="; }; } + { + name = "marked___marked_4.2.4.tgz"; + path = fetchurl { + name = "marked___marked_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/marked/-/marked-4.2.4.tgz"; + sha512 = "Wcc9ikX7Q5E4BYDPvh1C6QNSxrjC9tBgz+A/vAhp59KXUgachw++uMvMKiSW8oA85nopmPZcEvBoex/YLMsiyA=="; + }; + } { name = "matcher___matcher_3.0.0.tgz"; path = fetchurl { @@ -3282,11 +3890,11 @@ }; } { - name = "micromatch___micromatch_4.0.4.tgz"; + name = "micromatch___micromatch_4.0.5.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 = "micromatch___micromatch_4.0.5.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz"; + sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; }; } { @@ -3330,11 +3938,11 @@ }; } { - name = "minimatch___minimatch_3.0.4.tgz"; + name = "mimic_response___mimic_response_3.1.0.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 = "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=="; }; } { @@ -3346,27 +3954,91 @@ }; } { - name = "minimist___minimist_1.2.6.tgz"; + name = "minimatch___minimatch_5.1.2.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.6.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz"; - sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; + name = "minimatch___minimatch_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz"; + sha512 = "bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg=="; }; } { - name = "mkdirp___mkdirp_0.5.6.tgz"; + name = "minimist___minimist_1.2.7.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=="; + name = "minimist___minimist_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz"; + sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; }; } { - name = "ms___ms_2.0.0.tgz"; + name = "minipass_collect___minipass_collect_1.0.2.tgz"; path = fetchurl { - name = "ms___ms_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; - sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g="; + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; + }; + } + { + name = "minipass_fetch___minipass_fetch_2.1.2.tgz"; + path = fetchurl { + name = "minipass_fetch___minipass_fetch_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz"; + sha512 = "LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA=="; + }; + } + { + 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"; + sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="; + }; + } + { + 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"; + sha512 = "xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A=="; + }; + } + { + name = "minipass_sized___minipass_sized_1.0.3.tgz"; + path = fetchurl { + name = "minipass_sized___minipass_sized_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz"; + sha512 = "MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g=="; + }; + } + { + name = "minipass___minipass_3.3.6.tgz"; + path = fetchurl { + name = "minipass___minipass_3.3.6.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz"; + sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; + }; + } + { + name = "minipass___minipass_4.0.0.tgz"; + path = fetchurl { + name = "minipass___minipass_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-4.0.0.tgz"; + sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw=="; + }; + } + { + 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"; + sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; + }; + } + { + 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"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; } { @@ -3377,12 +4049,44 @@ sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; } + { + name = "ms___ms_2.1.3.tgz"; + path = fetchurl { + name = "ms___ms_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; + }; + } { 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 = "Sr6/7tdUHywnrPspvbvRXI1bpPc="; + sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; + }; + } + { + name = "negotiator___negotiator_0.6.3.tgz"; + path = fetchurl { + name = "negotiator___negotiator_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; + }; + } + { + 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"; + sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; + }; + } + { + name = "node_abi___node_abi_3.30.0.tgz"; + path = fetchurl { + name = "node_abi___node_abi_3.30.0.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.30.0.tgz"; + sha512 = "qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw=="; }; } { @@ -3393,20 +4097,60 @@ sha512 = "ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg=="; }; } + { + name = "node_addon_api___node_addon_api_3.2.1.tgz"; + path = fetchurl { + name = "node_addon_api___node_addon_api_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz"; + sha512 = "mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="; + }; + } + { + name = "node_api_version___node_api_version_0.1.4.tgz"; + path = fetchurl { + name = "node_api_version___node_api_version_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz"; + sha512 = "KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g=="; + }; + } + { + name = "node_gyp_build___node_gyp_build_4.5.0.tgz"; + path = fetchurl { + name = "node_gyp_build___node_gyp_build_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz"; + sha512 = "2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg=="; + }; + } + { + name = "node_gyp___node_gyp_9.3.1.tgz"; + path = fetchurl { + name = "node_gyp___node_gyp_9.3.1.tgz"; + url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.1.tgz"; + sha512 = "4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg=="; + }; + } { 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 = "h6kGXNs1XTGC2PlM4RGIuCXGijs="; + sha512 = "O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="; }; } { - name = "node_releases___node_releases_2.0.2.tgz"; + name = "node_releases___node_releases_2.0.8.tgz"; path = fetchurl { - 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=="; + name = "node_releases___node_releases_2.0.8.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz"; + sha512 = "dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="; + }; + } + { + name = "nopt___nopt_6.0.0.tgz"; + path = fetchurl { + name = "nopt___nopt_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz"; + sha512 = "ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g=="; }; } { @@ -3418,19 +4162,11 @@ }; } { - name = "normalize_url___normalize_url_4.5.1.tgz"; + name = "normalize_url___normalize_url_6.1.0.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 = "normalize_url___normalize_url_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz"; + sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; }; } { @@ -3442,11 +4178,19 @@ }; } { - name = "nwsapi___nwsapi_2.2.0.tgz"; + name = "npmlog___npmlog_6.0.2.tgz"; path = fetchurl { - name = "nwsapi___nwsapi_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz"; - sha512 = "h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="; + name = "npmlog___npmlog_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz"; + sha512 = "/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg=="; + }; + } + { + name = "nwsapi___nwsapi_2.2.2.tgz"; + path = fetchurl { + name = "nwsapi___nwsapi_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz"; + sha512 = "90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="; }; } { @@ -3462,7 +4206,7 @@ path = fetchurl { name = "once___once_1.4.0.tgz"; url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; + sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; }; } { @@ -3490,11 +4234,19 @@ }; } { - name = "p_cancelable___p_cancelable_1.1.0.tgz"; + name = "ora___ora_5.4.1.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 = "ora___ora_5.4.1.tgz"; + url = "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz"; + sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; + }; + } + { + name = "p_cancelable___p_cancelable_2.1.1.tgz"; + path = fetchurl { + name = "p_cancelable___p_cancelable_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz"; + sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; }; } { @@ -3505,6 +4257,14 @@ sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; } + { + name = "p_limit___p_limit_3.1.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz"; + sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; + }; + } { name = "p_locate___p_locate_4.1.0.tgz"; path = fetchurl { @@ -3513,6 +4273,22 @@ sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; } + { + name = "p_locate___p_locate_5.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz"; + sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; + }; + } + { + 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"; + sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; + }; + } { name = "p_try___p_try_2.2.0.tgz"; path = fetchurl { @@ -3521,14 +4297,6 @@ sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; } - { - 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 = "parent_module___parent_module_1.0.1.tgz"; path = fetchurl { @@ -3546,11 +4314,11 @@ }; } { - name = "parse5___parse5_6.0.1.tgz"; + name = "parse5___parse5_7.1.2.tgz"; path = fetchurl { - name = "parse5___parse5_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz"; - sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; + name = "parse5___parse5_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz"; + sha512 = "Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw=="; }; } { @@ -3566,7 +4334,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 = "F0uSaHNVNP+8es5r9TpanhtcX18="; + sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; } { @@ -3590,7 +4358,7 @@ path = fetchurl { name = "pend___pend_1.2.0.tgz"; url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; - sha1 = "elfrVQpng/kRUzH89GY9XI4AelA="; + sha512 = "F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="; }; } { @@ -3609,14 +4377,6 @@ sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; } - { - 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 = "pirates___pirates_4.0.5.tgz"; path = fetchurl { @@ -3634,11 +4394,11 @@ }; } { - name = "plist___plist_3.0.4.tgz"; + name = "plist___plist_3.0.6.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 = "plist___plist_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz"; + sha512 = "WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA=="; }; } { @@ -3654,31 +4414,15 @@ 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 = "IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="; + sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; }; } { - name = "prepend_http___prepend_http_2.0.0.tgz"; + name = "pretty_format___pretty_format_29.3.1.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 = "pretty_format___pretty_format_27.5.1.tgz"; - path = fetchurl { - 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=="; - }; - } - { - 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 = "pretty_format___pretty_format_29.3.1.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.3.1.tgz"; + sha512 = "FyLnmb1cYJV8biEIiRyzRFvs2lry7PPIvOqKVe1GCUEYg4YGmlx1qG9EJNMxArYm7piII4qb8UV1Pncq5dxmcg=="; }; } { @@ -3689,6 +4433,22 @@ sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; } + { + 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"; + sha512 = "6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="; + }; + } + { + name = "promise_retry___promise_retry_2.0.1.tgz"; + path = fetchurl { + name = "promise_retry___promise_retry_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz"; + sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; + }; + } { name = "prompts___prompts_2.4.2.tgz"; path = fetchurl { @@ -3698,19 +4458,11 @@ }; } { - name = "proto_list___proto_list_1.2.4.tgz"; + name = "psl___psl_1.9.0.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 = "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"; - sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; + name = "psl___psl_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz"; + sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; }; } { @@ -3730,43 +4482,67 @@ }; } { - name = "pupa___pupa_2.1.1.tgz"; + name = "querystringify___querystringify_2.2.0.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 = "querystringify___querystringify_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz"; + sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="; }; } { - name = "rc___rc_1.2.8.tgz"; + name = "queue_microtask___queue_microtask_1.2.3.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 = "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 = "react_is___react_is_17.0.2.tgz"; + name = "quick_lru___quick_lru_5.1.1.tgz"; path = fetchurl { - name = "react_is___react_is_17.0.2.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz"; - sha512 = "w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="; + name = "quick_lru___quick_lru_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz"; + sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; }; } { - name = "read_config_file___read_config_file_6.2.0.tgz"; + name = "randombytes___randombytes_2.1.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 = "randombytes___randombytes_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; }; } { - name = "readable_stream___readable_stream_2.3.7.tgz"; + name = "react_is___react_is_18.2.0.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 = "react_is___react_is_18.2.0.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz"; + sha512 = "xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="; + }; + } + { + name = "read_config_file___read_config_file_6.3.2.tgz"; + path = fetchurl { + name = "read_config_file___read_config_file_6.3.2.tgz"; + url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.3.2.tgz"; + sha512 = "M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q=="; + }; + } + { + 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"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + }; + } + { + name = "rechoir___rechoir_0.8.0.tgz"; + path = fetchurl { + name = "rechoir___rechoir_0.8.0.tgz"; + url = "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz"; + sha512 = "/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ=="; }; } { @@ -3777,28 +4553,28 @@ sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; } - { - 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="; + sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; + }; + } + { + 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"; + sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; + }; + } + { + name = "resolve_alpn___resolve_alpn_1.2.1.tgz"; + path = fetchurl { + name = "resolve_alpn___resolve_alpn_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz"; + sha512 = "0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="; }; } { @@ -3834,19 +4610,43 @@ }; } { - name = "resolve___resolve_1.22.0.tgz"; + name = "resolve___resolve_1.22.1.tgz"; path = fetchurl { - name = "resolve___resolve_1.22.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz"; - sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; + name = "resolve___resolve_1.22.1.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz"; + sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; }; } { - name = "responselike___responselike_1.0.2.tgz"; + name = "responselike___responselike_2.0.1.tgz"; path = fetchurl { - name = "responselike___responselike_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; - sha1 = "kYcg7ztjHFZCvgaPFa3lpG9Loec="; + name = "responselike___responselike_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz"; + sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw=="; + }; + } + { + name = "restore_cursor___restore_cursor_3.1.0.tgz"; + path = fetchurl { + name = "restore_cursor___restore_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; + }; + } + { + 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"; + sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="; + }; + } + { + 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=="; }; } { @@ -3866,11 +4666,19 @@ }; } { - name = "safe_buffer___safe_buffer_5.1.2.tgz"; + name = "run_parallel___run_parallel_1.2.0.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 = "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 = "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"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; } { @@ -3898,11 +4706,19 @@ }; } { - name = "saxes___saxes_5.0.1.tgz"; + name = "saxes___saxes_6.0.0.tgz"; path = fetchurl { - name = "saxes___saxes_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz"; - sha512 = "5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw=="; + name = "saxes___saxes_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz"; + sha512 = "xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA=="; + }; + } + { + name = "schema_utils___schema_utils_3.1.1.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz"; + sha512 = "Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw=="; }; } { @@ -3910,15 +4726,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 = "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=="; + sha512 = "YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow=="; }; } { @@ -3930,11 +4738,19 @@ }; } { - name = "semver___semver_7.3.5.tgz"; + name = "semver___semver_7.3.8.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 = "semver___semver_7.3.8.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz"; + sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; + }; + } + { + 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"; + sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; } { @@ -3945,6 +4761,30 @@ sha512 = "8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw=="; }; } + { + name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; + sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; + }; + } + { + 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"; + sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; + }; + } + { + 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"; + sha512 = "/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA=="; + }; + } { name = "shebang_command___shebang_command_2.0.0.tgz"; path = fetchurl { @@ -3969,6 +4809,14 @@ sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; } + { + name = "simple_update_notifier___simple_update_notifier_1.1.0.tgz"; + path = fetchurl { + name = "simple_update_notifier___simple_update_notifier_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz"; + sha512 = "VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg=="; + }; + } { name = "sisteransi___sisteransi_1.0.5.tgz"; path = fetchurl { @@ -4001,6 +4849,30 @@ sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; }; } + { + name = "socks_proxy_agent___socks_proxy_agent_7.0.0.tgz"; + path = fetchurl { + name = "socks_proxy_agent___socks_proxy_agent_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz"; + sha512 = "Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww=="; + }; + } + { + name = "socks___socks_2.7.1.tgz"; + path = fetchurl { + name = "socks___socks_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz"; + sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; + }; + } + { + name = "source_map_support___source_map_support_0.5.13.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.13.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz"; + sha512 = "SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w=="; + }; + } { name = "source_map_support___source_map_support_0.5.21.tgz"; path = fetchurl { @@ -4009,14 +4881,6 @@ sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; }; } - { - 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 = "igOdLRAh0i0eoUyA2OpGi6LvP8w="; - }; - } { name = "source_map___source_map_0.6.1.tgz"; path = fetchurl { @@ -4025,14 +4889,6 @@ sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; } - { - 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"; - sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; - }; - } { name = "sprintf_js___sprintf_js_1.1.2.tgz"; path = fetchurl { @@ -4046,15 +4902,23 @@ 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 = "BOaSb2YolTVPPdAVIDYzuFcpfiw="; + sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; }; } { - name = "stack_utils___stack_utils_2.0.5.tgz"; + name = "ssri___ssri_9.0.1.tgz"; path = fetchurl { - 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=="; + name = "ssri___ssri_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz"; + sha512 = "o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q=="; + }; + } + { + name = "stack_utils___stack_utils_2.0.6.tgz"; + path = fetchurl { + name = "stack_utils___stack_utils_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz"; + sha512 = "XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ=="; }; } { @@ -4082,11 +4946,11 @@ }; } { - name = "string_decoder___string_decoder_1.1.1.tgz"; + name = "string_decoder___string_decoder_1.3.0.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 = "string_decoder___string_decoder_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; } { @@ -4121,22 +4985,6 @@ sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; }; } - { - 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 = "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=="; - }; - } { name = "sumchecker___sumchecker_3.0.1.tgz"; path = fetchurl { @@ -4169,14 +5017,6 @@ sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; }; } - { - name = "supports_hyperlinks___supports_hyperlinks_2.2.0.tgz"; - path = fetchurl { - name = "supports_hyperlinks___supports_hyperlinks_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz"; - sha512 = "6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ=="; - }; - } { name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; path = fetchurl { @@ -4193,6 +5033,22 @@ sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="; }; } + { + name = "tapable___tapable_2.2.1.tgz"; + path = fetchurl { + name = "tapable___tapable_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz"; + sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="; + }; + } + { + name = "tar___tar_6.1.13.tgz"; + path = fetchurl { + name = "tar___tar_6.1.13.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz"; + sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; + }; + } { name = "temp_file___temp_file_3.4.0.tgz"; path = fetchurl { @@ -4202,11 +5058,19 @@ }; } { - name = "terminal_link___terminal_link_2.1.1.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_5.3.6.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"; - sha512 = "un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ=="; + name = "terser_webpack_plugin___terser_webpack_plugin_5.3.6.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz"; + sha512 = "kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ=="; + }; + } + { + name = "terser___terser_5.16.1.tgz"; + path = fetchurl { + name = "terser___terser_5.16.1.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-5.16.1.tgz"; + sha512 = "xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw=="; }; } { @@ -4222,31 +5086,23 @@ 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 = "f17oI66AUgfACvLfSoTsP8+lcLQ="; + sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; }; } { - name = "throat___throat_6.0.1.tgz"; + name = "tldts_core___tldts_core_5.7.103.tgz"; path = fetchurl { - name = "throat___throat_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz"; - sha512 = "8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w=="; + name = "tldts_core___tldts_core_5.7.103.tgz"; + url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.103.tgz"; + sha512 = "MdSolgnhJwr2SH6a+5KFAYB8znpYdRLoOFTJmrWslsec9Ne/V3DBrw+BbS1YYQJKGTin6U02Y9CSYxnOpg3vwg=="; }; } { - name = "tldts_core___tldts_core_5.7.72.tgz"; + name = "tldts_experimental___tldts_experimental_5.7.103.tgz"; path = fetchurl { - 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.72.tgz"; - path = fetchurl { - 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 = "tldts_experimental___tldts_experimental_5.7.103.tgz"; + url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.103.tgz"; + sha512 = "oo9QI0TjXdrlZnDSJMazRJe+nnd0OwXgzRmHcsnyp4k6UxmmlaWEA1iq3RY3EDSKwYEJ+lDnwQeAaGRleU/LEQ=="; }; } { @@ -4278,15 +5134,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 = "3F5pjL0HkmW8c+A3doGk5Og/YW4="; - }; - } - { - 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=="; + sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="; }; } { @@ -4298,19 +5146,19 @@ }; } { - name = "tough_cookie___tough_cookie_4.0.0.tgz"; + name = "tough_cookie___tough_cookie_4.1.2.tgz"; path = fetchurl { - name = "tough_cookie___tough_cookie_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz"; - sha512 = "tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg=="; + name = "tough_cookie___tough_cookie_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz"; + sha512 = "G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ=="; }; } { - name = "tr46___tr46_2.1.0.tgz"; + name = "tr46___tr46_3.0.0.tgz"; path = fetchurl { - name = "tr46___tr46_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz"; - sha512 = "15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw=="; + name = "tr46___tr46_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz"; + sha512 = "l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA=="; }; } { @@ -4318,15 +5166,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 = "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=="; + sha512 = "95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ=="; }; } { @@ -4342,7 +5182,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 = "WITKtRLPHTVeP7eE8wgEsrUg23I="; + sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="; }; } { @@ -4378,27 +5218,27 @@ }; } { - name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + name = "typescript___typescript_4.9.4.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 = "typescript___typescript_4.9.4.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz"; + sha512 = "Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg=="; }; } { - name = "typedarray___typedarray_0.0.6.tgz"; + name = "unique_filename___unique_filename_2.0.1.tgz"; path = fetchurl { - name = "typedarray___typedarray_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "hnrHTjhkGHsdPUfZlqeOxciDB3c="; + name = "unique_filename___unique_filename_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz"; + sha512 = "ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A=="; }; } { - name = "unique_string___unique_string_2.0.0.tgz"; + name = "unique_slug___unique_slug_3.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 = "unique_slug___unique_slug_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz"; + sha512 = "8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w=="; }; } { @@ -4409,6 +5249,14 @@ sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; } + { + name = "universalify___universalify_0.2.0.tgz"; + path = fetchurl { + name = "universalify___universalify_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz"; + sha512 = "CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="; + }; + } { name = "universalify___universalify_2.0.0.tgz"; path = fetchurl { @@ -4418,11 +5266,11 @@ }; } { - name = "update_notifier___update_notifier_5.1.0.tgz"; + name = "update_browserslist_db___update_browserslist_db_1.0.10.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 = "update_browserslist_db___update_browserslist_db_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz"; + sha512 = "OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ=="; }; } { @@ -4434,11 +5282,11 @@ }; } { - name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; + name = "url_parse___url_parse_1.5.10.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 = "url_parse___url_parse_1.5.10.tgz"; + url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz"; + sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; } { @@ -4446,7 +5294,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 = "9F8VDExm7uloGGUFq5P8u4rWv2E="; + sha512 = "4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA=="; }; } { @@ -4454,23 +5302,15 @@ 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="; + sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; }; } { - name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + name = "v8_to_istanbul___v8_to_istanbul_9.0.1.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 = "v8_to_istanbul___v8_to_istanbul_8.1.1.tgz"; - path = fetchurl { - 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 = "v8_to_istanbul___v8_to_istanbul_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz"; + sha512 = "74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w=="; }; } { @@ -4482,19 +5322,11 @@ }; } { - name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; + name = "w3c_xmlserializer___w3c_xmlserializer_4.0.0.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"; - sha512 = "z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ=="; - }; - } - { - 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"; - sha512 = "4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA=="; + name = "w3c_xmlserializer___w3c_xmlserializer_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz"; + sha512 = "d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw=="; }; } { @@ -4506,43 +5338,91 @@ }; } { - name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; + name = "watchpack___watchpack_2.4.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"; - sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; + name = "watchpack___watchpack_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz"; + sha512 = "Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg=="; }; } { - name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; + name = "wcwidth___wcwidth_1.0.1.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"; - sha512 = "qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="; + name = "wcwidth___wcwidth_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz"; + sha512 = "XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg=="; }; } { - name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; + name = "webidl_conversions___webidl_conversions_7.0.0.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"; - sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; + name = "webidl_conversions___webidl_conversions_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz"; + sha512 = "VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="; }; } { - name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; + name = "webpack_cli___webpack_cli_5.0.1.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"; - sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; + name = "webpack_cli___webpack_cli_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.1.tgz"; + sha512 = "S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A=="; }; } { - name = "whatwg_url___whatwg_url_8.7.0.tgz"; + name = "webpack_merge___webpack_merge_5.8.0.tgz"; path = fetchurl { - name = "whatwg_url___whatwg_url_8.7.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz"; - sha512 = "gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg=="; + name = "webpack_merge___webpack_merge_5.8.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz"; + sha512 = "/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q=="; + }; + } + { + name = "webpack_node_externals___webpack_node_externals_3.0.0.tgz"; + path = fetchurl { + name = "webpack_node_externals___webpack_node_externals_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz"; + sha512 = "LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ=="; + }; + } + { + name = "webpack_sources___webpack_sources_3.2.3.tgz"; + path = fetchurl { + name = "webpack_sources___webpack_sources_3.2.3.tgz"; + url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz"; + sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="; + }; + } + { + name = "webpack___webpack_5.75.0.tgz"; + path = fetchurl { + name = "webpack___webpack_5.75.0.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz"; + sha512 = "piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ=="; + }; + } + { + name = "whatwg_encoding___whatwg_encoding_2.0.0.tgz"; + path = fetchurl { + name = "whatwg_encoding___whatwg_encoding_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz"; + sha512 = "p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg=="; + }; + } + { + name = "whatwg_mimetype___whatwg_mimetype_3.0.0.tgz"; + path = fetchurl { + name = "whatwg_mimetype___whatwg_mimetype_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz"; + sha512 = "nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q=="; + }; + } + { + name = "whatwg_url___whatwg_url_11.0.0.tgz"; + path = fetchurl { + name = "whatwg_url___whatwg_url_11.0.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz"; + sha512 = "RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ=="; }; } { @@ -4554,11 +5434,19 @@ }; } { - name = "widest_line___widest_line_3.1.0.tgz"; + name = "wide_align___wide_align_1.1.5.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 = "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 = "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"; + sha512 = "JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="; }; } { @@ -4582,39 +5470,31 @@ path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; + sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; } { - name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + name = "write_file_atomic___write_file_atomic_4.0.2.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 = "write_file_atomic___write_file_atomic_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz"; + sha512 = "7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg=="; }; } { - name = "ws___ws_7.5.7.tgz"; + name = "ws___ws_8.11.0.tgz"; path = fetchurl { - name = "ws___ws_7.5.7.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz"; - sha512 = "KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A=="; + name = "ws___ws_8.11.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz"; + sha512 = "HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg=="; }; } { - name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; + name = "xml_name_validator___xml_name_validator_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 = "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"; - sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="; + name = "xml_name_validator___xml_name_validator_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz"; + sha512 = "ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw=="; }; } { @@ -4625,14 +5505,6 @@ 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 = "xmlchars___xmlchars_2.2.0.tgz"; path = fetchurl { @@ -4649,6 +5521,14 @@ sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; }; } + { + 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"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + }; + } { name = "yallist___yallist_4.0.0.tgz"; path = fetchurl { @@ -4658,35 +5538,19 @@ }; } { - name = "yargs_parser___yargs_parser_20.2.9.tgz"; + name = "yargs_parser___yargs_parser_21.1.1.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=="; + name = "yargs_parser___yargs_parser_21.1.1.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz"; + sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="; }; } { - name = "yargs_parser___yargs_parser_21.0.1.tgz"; + name = "yargs___yargs_17.6.2.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_16.2.0.tgz"; - path = fetchurl { - name = "yargs___yargs_16.2.0.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz"; - sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; - }; - } - { - name = "yargs___yargs_17.4.0.tgz"; - path = fetchurl { - name = "yargs___yargs_17.4.0.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.4.0.tgz"; - sha512 = "WJudfrk81yWFSOkZYpAZx4Nt7V4xp7S/uJkX0CnxovMCt1wCE8LNftPpNuF9X/u9gN5nsD7ycYtRcDf2pL3UiA=="; + name = "yargs___yargs_17.6.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz"; + sha512 = "1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw=="; }; } { @@ -4694,7 +5558,15 @@ path = fetchurl { name = "yauzl___yauzl_2.10.0.tgz"; url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; - sha1 = "x+sXyT4RLLEIb6bY5R+wZnt5pfk="; + sha512 = "p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g=="; + }; + } + { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + path = fetchurl { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; }; } ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 53c01b977e4e..644f7e734bf7 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr -, alsa-lib, dbus, cups, libexif, ffmpeg, systemd, libva +, alsa-lib, dbus, cups, libexif, ffmpeg, systemd, libva, libGL , freetype, fontconfig, libXft, libXrender, libxcb, expat , libuuid , libxml2 @@ -8,6 +8,7 @@ , libdrm, mesa , nss, nspr , patchelf, makeWrapper +, wayland, pipewire , isSnapshot ? false , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null , enableWidevine ? false, vivaldi-widevine ? null @@ -20,11 +21,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.4.2753.47"; + version = "5.6.2867.62"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb"; - sha256 = "1p155mcrmfz395yajxa6fqjk1paac216kim26i3r56wah5329gmr"; + sha256 = "sha256-p5okCdvEBurL1UgqLMBhCd4caPbiOA1WZrI9TC5j6og="; }; unpackPhase = '' @@ -38,9 +39,10 @@ in stdenv.mkDerivation rec { stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence 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 + freetype fontconfig libXrender libuuid expat glib nss nspr libGL libxml2 pango cairo libdrm mesa + wayland pipewire ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs ++ lib.optional pulseSupport libpulseaudio; @@ -89,6 +91,7 @@ in stdenv.mkDerivation rec { done wrapProgram "$out/bin/vivaldi" \ --add-flags ${lib.escapeShellArg commandLineArgs} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \ ${lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"} '' + lib.optionalString enableWidevine '' diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 898c3febc170..1f53c184b3b0 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { LIBS = lib.optionalString x11Support "-lX11"; meta = with lib; { - homepage = "http://w3m.sourceforge.net/"; + homepage = "https://w3m.sourceforge.net/"; description = "A text-mode web browser"; maintainers = with maintainers; [ cstrahan anthonyroussel ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/browsers/webmacs/default.nix b/pkgs/applications/networking/browsers/webmacs/default.nix index 7dbb6a3c5388..de3c1cfdcdba 100644 --- a/pkgs/applications/networking/browsers/webmacs/default.nix +++ b/pkgs/applications/networking/browsers/webmacs/default.nix @@ -27,7 +27,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pygments ]; - checkInputs = [ + nativeCheckInputs = [ python3Packages.pytest #python3Packages.pytest-xvfb #python3Packages.pytest-qt diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index a0a9b10f068a..557754ac50f8 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "43.0"; + version = "43.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-fvG9N6HuuO8BMH8MJRquMSe1oEPNmX/pzsJX5yzs1CY="; + hash = "sha256-gHlhbQGtdIjKLMAkTxfc2QOjvNUPGKKL+OK8/vm0Oac="; }; outputs = [ "out" "devdoc" ]; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { sofia_sip ]; - checkInputs = [ + nativeCheckInputs = [ dbus xvfb-run ]; @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { NO_AT_BRIDGE=1 \ XDG_DATA_DIRS=${folks}/share/gsettings-schemas/${folks.name} \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs runHook postCheck ''; diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 66ec0a7c7b47..f7749946f42e 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -34,6 +34,7 @@ let src = fetchurl { url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}${platform}.tar.gz"; + curlOptsList = [ "--user-agent" "Mozilla/5.0" ]; # HTTP 104 otherwise inherit sha256; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/circumflex/default.nix b/pkgs/applications/networking/circumflex/default.nix index 71fe5b97b8bf..0afe9466b4cb 100644 --- a/pkgs/applications/networking/circumflex/default.nix +++ b/pkgs/applications/networking/circumflex/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circumflex"; - version = "2.6"; + version = "2.8"; src = fetchFromGitHub { owner = "bensadeh"; repo = "circumflex"; rev = version; - hash = "sha256-pcY2PXiOazKAi8mAAbmftXDae01fcUw/u9JPOHQVclI="; + hash = "sha256-knN+T/dmIwHLqT3MJBjQhGlSeAu0lE2ZOv6tLqkcwS0="; }; - vendorHash = "sha256-rF1Hu4Pf9AF2MTx4GAPmzSn0M38uTxPS1bsAkO23SdI="; + vendorHash = "sha256-Xwek2xlvdGO6C/T0a96RGuMcX7jCbvntEYBf10tvmAo="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cloudflare-dyndns/default.nix b/pkgs/applications/networking/cloudflare-dyndns/default.nix index c1a9309ca4f7..7f11ec257038 100644 --- a/pkgs/applications/networking/cloudflare-dyndns/default.nix +++ b/pkgs/applications/networking/cloudflare-dyndns/default.nix @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { requests ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 0ae2d3b35884..e2cc376af297 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -1,14 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub, stdenv }: +{ lib, buildGoModule, fetchFromGitHub, stdenv, callPackage }: buildGoModule rec { pname = "cloudflared"; - version = "2022.8.2"; + version = "2022.12.1"; src = fetchFromGitHub { - owner = "cloudflare"; - repo = "cloudflared"; - rev = version; - hash = "sha256-Kyt5d3KmLefTVVUmUUU23UV0lghzhLFCKLlmwTjN68I="; + owner = "cloudflare"; + repo = "cloudflared"; + rev = version; + hash = "sha256-FXN/UUlzG3+AYYZeKJ6XUG4rD3cPWIx22h3zZpvZhiM="; }; vendorSha256 = null; @@ -17,22 +17,56 @@ buildGoModule rec { preCheck = '' # Workaround for: sshgen_test.go:74: mkdir /homeless-shelter/.cloudflared: no such file or directory - export HOME="$(mktemp -d)"; + export HOME="$(mktemp -d)" # Workaround for: protocol_test.go:11: # lookup protocol-v2.argotunnel.com on [::1]:53: read udp [::1]:51876->[::1]:53: read: connection refused - substituteInPlace "edgediscovery/protocol_test.go" \ --replace "TestProtocolPercentage" "SkipProtocolPercentage" + + # Workaround for: origin_icmp_proxy_test.go:46: + # cannot create ICMPv4 proxy: socket: permission denied nor ICMPv6 proxy: socket: permission denied + substituteInPlace "ingress/origin_icmp_proxy_test.go" \ + --replace "TestICMPRouterEcho" "SkipICMPRouterEcho" + + # Workaround for: origin_icmp_proxy_test.go:110: + # cannot create ICMPv4 proxy: socket: permission denied nor ICMPv6 proxy: socket: permission denied + substituteInPlace "ingress/origin_icmp_proxy_test.go" \ + --replace "TestConcurrentRequestsToSameDst" "SkipConcurrentRequestsToSameDst" + + # Workaround for: origin_icmp_proxy_test.go:242: + # cannot create ICMPv4 proxy: socket: permission denied nor ICMPv6 proxy: socket: permission denied + substituteInPlace "ingress/origin_icmp_proxy_test.go" \ + --replace "TestICMPRouterRejectNotEcho" "SkipICMPRouterRejectNotEcho" + + # Workaround for: origin_icmp_proxy_test.go:108: + # Received unexpected error: cannot create ICMPv4 proxy: Group ID 100 is not between ping group 65534 to 65534 nor ICMPv6 proxy: socket: permission denied + substituteInPlace "ingress/origin_icmp_proxy_test.go" \ + --replace "TestTraceICMPRouterEcho" "SkipTraceICMPRouterEcho" + + # Workaround for: icmp_posix_test.go:28: socket: permission denied + substituteInPlace "ingress/icmp_posix_test.go" \ + --replace "TestFunnelIdleTimeout" "SkipFunnelIdleTimeout" + + # Workaround for: icmp_posix_test.go:88: Received unexpected error: Group ID 100 is not between ping group 65534 to 65534 + substituteInPlace "ingress/icmp_posix_test.go" \ + --replace "TestReuseFunnel" "SkipReuseFunnel" + + # Workaround for: supervisor_test.go:49: + # Expected nil, but got: Could not lookup srv records on _us-v2-origintunneld._tcp.argotunnel.com: lookup _us-v2-origintunneld._tcp.argotunnel.com on [::1]:53: read udp [::1]:49342->[::1]:53: read: connection refused + substituteInPlace "supervisor/supervisor_test.go" \ + --replace "Test_Initialize_Same_Protocol" "Skip_Initialize_Same_Protocol" ''; doCheck = !stdenv.isDarwin; + passthru.tests.simple = callPackage ./tests.nix { inherit version; }; + meta = with lib; { - 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 ]; + description = "Cloudflare Tunnel daemon, Cloudflare Access toolkit, and DNS-over-HTTPS client"; + homepage = "https://www.cloudflare.com/products/tunnel"; + license = licenses.asl20; + platforms = platforms.unix ++ platforms.windows; + maintainers = with maintainers; [ bbigras enorris thoughtpolice piperswe ]; }; } diff --git a/pkgs/applications/networking/cloudflared/tests.nix b/pkgs/applications/networking/cloudflared/tests.nix new file mode 100644 index 000000000000..8314e84075fd --- /dev/null +++ b/pkgs/applications/networking/cloudflared/tests.nix @@ -0,0 +1,44 @@ +{ version, lib, stdenv, pkgsCross, testers, cloudflared, runCommand, wine, wine64 }: + +let + inherit (stdenv) buildPlatform; +in +{ + version = testers.testVersion { + package = cloudflared; + command = "cloudflared help"; + }; + refuses-to-autoupdate = runCommand "cloudflared-${version}-refuses-to-autoupdate" + { + nativeBuildInputs = [ cloudflared ]; + } '' + set -e + cloudflared update 2>&1 | tee output.txt + if ! grep "cloudflared was installed by nixpkgs" output.txt + then + echo "cloudflared's output didn't contain the package manager name" + exit 1 + fi + mkdir $out + ''; +} // lib.optionalAttrs (buildPlatform.isLinux && (buildPlatform.isi686 || buildPlatform.isx86_64)) { + runs-through-wine = runCommand "cloudflared-${version}-runs-through-wine" + { + nativeBuildInputs = [ wine ]; + exe = "${pkgsCross.mingw32.cloudflared}/bin/cloudflared.exe"; + } '' + export HOME="$(mktemp -d)" + wine $exe help + mkdir $out + ''; +} // lib.optionalAttrs (buildPlatform.isLinux && buildPlatform.isx86_64) { + runs-through-wine64 = runCommand "cloudflared-${version}-runs-through-wine64" + { + nativeBuildInputs = [ wine64 ]; + exe = "${pkgsCross.mingwW64.cloudflared}/bin/cloudflared.exe"; + } '' + export HOME="$(mktemp -d)" + wine64 $exe help + mkdir $out + ''; +} diff --git a/pkgs/applications/networking/cluster/acorn/default.nix b/pkgs/applications/networking/cluster/acorn/default.nix new file mode 100644 index 000000000000..cc79ae5d59fe --- /dev/null +++ b/pkgs/applications/networking/cluster/acorn/default.nix @@ -0,0 +1,33 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "acorn"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "acorn-io"; + repo = pname; + rev = "v${version}"; + hash = "sha256-9+jI3GBRuX06+aN8C8C3K72kKtQVwmfAwhYLViuERxk="; + }; + + vendorHash = "sha256-t/q94B+ihcHh/XFHs1Z9yQTwoFKv/nkhIDykymGNA2w="; + + ldflags = [ + "-s" + "-w" + "-X github.com/acorn-io/acorn/pkg/version.Tag=v${version}" + "-X github.com/acorn-io/acorn/pkg/config.AcornDNSEndpointDefault=https://alpha-dns.acrn.io/v1" + ]; + + # integration tests require network and kubernetes master + doCheck = false; + + meta = with lib; { + homepage = "https://docs.acorn.io"; + changelog = "https://github.com/acorn-io/${pname}/releases/tag/v${version}"; + description = "A simple application deployment framework for Kubernetes"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/pkgs/applications/networking/cluster/argo-rollouts/default.nix index 731fe0553fc5..266ec0e6a457 100644 --- a/pkgs/applications/networking/cluster/argo-rollouts/default.nix +++ b/pkgs/applications/networking/cluster/argo-rollouts/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argo-rollouts"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${version}"; - sha256 = "sha256-qgOhiJdaxauHIoPsMfcdxwrKiv8QD/tFksCbk13Zpiw="; + sha256 = "sha256-HdYbrcz1uumwfUleDayc7obv4Grpg3TiUxKr8aF5bXM="; }; - vendorSha256 = "sha256-gm96rQdQJGsIcxVgEI7sI7BvEETU/+HsQ6PnDjFXb/0="; + vendorHash = "sha256-ZIFZCMyhpfKK/Irq2/MvkXuXX1jExDaSK/nXZgzCZgU="; # Disable tests since some test fail because of missing test data doCheck = false; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 577e4ba883d1..6d13063bd056 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -1,40 +1,60 @@ -{ lib, buildGoModule, buildGoPackage, fetchFromGitHub, installShellFiles, pkgsBuildBuild, stdenv }: +{ lib +, stdenv +, buildGoModule +, buildGoPackage +, fetchFromGitHub +, installShellFiles +, pkgsBuildBuild +}: 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 = pkgsBuildBuild.buildGoPackage rec { + staticfiles = pkgsBuildBuild.buildGoModule rec { name = "staticfiles"; + src = fetchFromGitHub { owner = "bouk"; repo = "staticfiles"; rev = "827d7f6389cd410d0aa3f3d472a4838557bf53dd"; - sha256 = "0xarhmsqypl8036w96ssdzjv3k098p2d4mkmw5f6hkp1m3j67j61"; + hash = "sha256-wchj5KjhTmhc4XVW0sRFCcyx5W9am8TNAIhej3WFWXU="; }; - goPackagePath = "bou.ke/staticfiles"; + vendorHash = null; + + excludedPackages = [ "./example" ]; + + preBuild = '' + cp ${./staticfiles.go.mod} go.mod + ''; + + ldflags = [ "-s" "-w" ]; }; in buildGoModule rec { pname = "argo"; - version = "3.4.3"; + version = "3.4.4"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; - rev = "v${version}"; - sha256 = "sha256-eVd3tH77Z3AlNpMEx+xnOQTELXFeGTLIslE++++Sdkw="; + rev = "refs/tags/v${version}"; + hash = "sha256-ZG10ruusSywXWn88UqrHVfAWrio2KoK2YoM9qdtMlhU="; }; - vendorSha256 = "sha256-n8NAxfNZ/q2gdA5N7dTNgvdB549aiRxFPJO4UsfIn2U="; + vendorHash = "sha256-Tqn5HGhRbN++yAo9JajUMTxFjVLw5QTvsis8wcfRIHw="; doCheck = false; - subPackages = [ "cmd/argo" ]; + subPackages = [ + "cmd/argo" + ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; preBuild = '' mkdir -p ui/dist/app @@ -44,7 +64,8 @@ buildGoModule rec { ''; ldflags = [ - "-s" "-w" + "-s" + "-w" "-X github.com/argoproj/argo-workflows/v3.buildDate=unknown" "-X github.com/argoproj/argo-workflows/v3.gitCommit=${src.rev}" "-X github.com/argoproj/argo-workflows/v3.gitTag=${src.rev}" @@ -65,6 +86,7 @@ buildGoModule rec { meta = with lib; { description = "Container native workflow engine for Kubernetes"; homepage = "https://github.com/argoproj/argo"; + changelog = "https://github.com/argoproj/argo-workflows/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ groodt ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/cluster/argo/staticfiles.go.mod b/pkgs/applications/networking/cluster/argo/staticfiles.go.mod new file mode 100644 index 000000000000..952de850dc72 --- /dev/null +++ b/pkgs/applications/networking/cluster/argo/staticfiles.go.mod @@ -0,0 +1,3 @@ +module bou.ke/staticfiles + +go 1.18 diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index e446773233c8..41fe5cb96094 100644 --- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argocd-autopilot"; - version = "0.4.8"; + version = "0.4.11"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-U1gvDv364x7FxuqXIeaiMZMl0324rGjiqs8vtlENAlY="; + sha256 = "sha256-0y7WP6v1DrAyK9p9cVME9RpNH1ZY0NNMtjHhmPT68kQ="; }; - vendorSha256 = "sha256-4ylOLnpvz/aQIoxVz2z69Rq/x2UG91yMmtSHyquvNq0="; + vendorHash = "sha256-KkklEcxk6pNbxSkomh3LqlK8jgpGC/pZMBkJgXMUi8E="; proxyVendor = true; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 3885db4b30a8..b028512dd7c9 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.5.2"; + version = "2.5.9"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-xiqxCYGSpsREZyylWJCIbFPPr3jISxD0wS/L/P77BF8="; + sha256 = "sha256-RZ3bcuJmUUnucD2lhfxLU8vbrorVUowF8hAW9NGSmbI="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorSha256 = "sha256-F5EY1/WWRPBN5fqp2J2mdpIzL1gNKR0ltzSdarT6dFw="; + vendorHash = "sha256-F5EY1/WWRPBN5fqp2J2mdpIzL1gNKR0ltzSdarT6dFw="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 3b45321c6f26..65d12431e988 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.50"; + version = "0.8.60"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-DPBQ+MisNgVh2DpaIF//fjIzGvfpNYRS4zpYeUVqLwg="; + sha256 = "sha256-kyWUokQl5n7ko/1pdNs15WxRAAfe8KioYpkTMcLhJjU="; }; CGO_ENABLED = 0; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-Kr6m1qhVTiXllm5xaxXKsWAtWbnsDwbwWH0iqc0sKfM="; + vendorHash = "sha256-WQsnBBx05wXKDS7h3bhipTqZTQLxRjVLObuMNUfAiTk="; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 8ce7b0dcae00..ba99106c0960 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atlantis"; - version = "0.20.1"; + version = "0.22.3"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "sha256-5zchElzEjrIgODRUvQTQwlBz5371iJU5VOpz12Xtbcg="; + sha256 = "sha256-A/FT9t5Z+Iw1mVwS3d5Cc86A9e6jVbEtmEWroVUhhtw="; }; - vendorSha256 = "sha256-n2yzqNjmPDP+8/ipiuUt6BqFYF0Oh0Y0TCdKsqCcrIQ="; + vendorHash = "sha256-KUkh5yx+v5g0N4yIpgpt3i+uCtOtR0Jvf2PFQcGWtm8="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index 16635f17600f..c1e4df0a3893 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.13.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iL8quRwW4idY880aEM2rwXRh6JXIvMzlfBDcz2TgHjw="; + sha256 = "sha256-6NUuKU8KQBfHE6fcN3a9lBcUk7p5I9SuY9g+qJxGXmU="; }; - vendorSha256 = "sha256-pr33Ya6cg3EKIVTBTY8DD0lyTMPF1FcRQK2jdyPiE44="; + vendorSha256 = "sha256-vZwADD7fi9ZvJby9Ijdeueid8jRfUyyj6Nu4kgkO5Wo="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index da3f684398e2..36666b901da0 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 = "7.0.1"; + version = "7.1.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CNicDFmWq2tgw3LEw8nOlwewY3cpzwS9ea4fxbwVJc0="; + sha256 = "sha256-wsCVeCAgZ2RPT6cle1YHB5CZdcPmKOVuUQlA5d3H7iI="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix new file mode 100644 index 000000000000..d86af2177f87 --- /dev/null +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -0,0 +1,81 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec { + inherit pname; + version = "3.25.0"; + + src = fetchFromGitHub { + owner = "projectcalico"; + repo = "calico"; + rev = "v${version}"; + hash = "sha256-sD79WiGKfwjtoiYlLow4h58skbHpuZyzMQ0VOyBKRnk="; + }; + + vendorHash = "sha256-p4Ve6qWnYyHUUyKmLfbaZIGGfleLuzz+MZgGRSsBoWM="; + + inherit doCheck subPackages; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + homepage = "https://projectcalico.docs.tigera.io"; + changelog = "https://github.com/projectcalico/calico/releases/tag/v${version}"; + description = "Cloud native networking and network security"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + inherit mainProgram; + }; +}) { + calico-apiserver = { + mainProgram = "apiserver"; + subPackages = [ + "apiserver/cmd/..." + ]; + }; + calico-app-policy = { + # integration tests require network + doCheck = false; + mainProgram = "dikastes"; + subPackages = [ + "app-policy/cmd/..." + ]; + }; + calico-cni-plugin = { + mainProgram = "calico"; + subPackages = [ + "cni-plugin/cmd/..." + ]; + }; + calico-kube-controllers = { + # integration tests require network and docker + doCheck = false; + mainProgram = "kube-controllers"; + subPackages = [ + "kube-controllers/cmd/..." + ]; + }; + calico-pod2daemon = { + mainProgram = "flexvol"; + subPackages = [ + "pod2daemon/csidriver" + "pod2daemon/flexvol" + "pod2daemon/nodeagent" + ]; + }; + calico-typha = { + subPackages = [ + "typha/cmd/..." + ]; + }; + calicoctl = { + subPackages = [ + "calicoctl/calicoctl" + ]; + }; + confd-calico = { + mainProgram = "confd"; + subPackages = [ + "confd" + ]; + }; +} diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 9399d5b7fb9b..c0711bf5fd86 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.12.7"; + version = "0.12.11"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-libZapDj6Y/tGJEXAX3iZH2+pS64dg7IUsgTxT0Z6JA="; + sha256 = "sha256-50D3iH5KAWvX7lAPHY7cUKc4d4ww47ti2QOgdrfY1BY="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index bd3672b997b1..2fbbc9ad1d24 100644 --- a/pkgs/applications/networking/cluster/civo/default.nix +++ b/pkgs/applications/networking/cluster/civo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.41"; + version = "1.0.45"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-dvbxxW+UyTA+EzBV6g9JRao8D6ZE5hhXLX4q/mmPIQg="; + sha256 = "sha256-wYZC4eEvxvHgtb0l+kpP2msQgt8InJu59lgS5cwGxRI="; }; - vendorSha256 = "sha256-gBVSpjoAfbxlJnlrFrsBupJgVQ59sh1ipOry0Mgppig="; + vendorHash = "sha256-42ZTPl4kI+dgr78s9WvLFchQU9uvkMkkio53REjvpbw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 06ca40b7d467..69862bd51559 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, clusterctl }: buildGoModule rec { pname = "clusterctl"; - version = "1.2.5"; + version = "1.3.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-Cmff3tIy60BDO3q5hzPqSLwjc6LzUSpoorJD/yxha9c="; + hash = "sha256-O/InVEWSqdcfqchVMYetZ3RCOxgEjQ9XvnKpOIjV2zE="; }; - vendorSha256 = "sha256-jvadtm8NprVwNf4+GaaANK1u4Y4ccbsTCZxQk21GW7c="; + vendorHash = "sha256-0C3tQgmu7YQgHyXh8lIYTrLFksCvFQp0uvIhQRuqbYM="; subPackages = [ "cmd/clusterctl" ]; @@ -32,6 +32,12 @@ buildGoModule rec { --zsh <($out/bin/clusterctl completion zsh) ''; + passthru.tests.version = testers.testVersion { + package = clusterctl; + command = "HOME=$TMPDIR clusterctl version"; + version = "v${version}"; + }; + meta = with lib; { description = "Kubernetes cluster API tool"; homepage = "https://cluster-api.sigs.k8s.io/"; diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index 22e23e72656d..f17904911ea4 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cmctl"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; - rev = "da3265115bfd8be5780801cc6105fa857ef71965"; - sha256 = "0s6nki61crx62v6ypmm0yjbyy71ygifffhkp5554jh4g9hvcfbmr"; + rev = "2a0ef53b06e183356d922cd58af2510d8885bef5"; + sha256 = "0cvsmc06gg8w5j2k1zj4i8qpqlvpjfa6d7wn24v0hs1a1qk8c7a8"; }; - vendorSha256 = "sha256-WPFteR3t9qQiuBcCLqvp8GterqcD2SxJi59Wb7BvDT4="; + vendorSha256 = "sha256-aLEQoNt/5ikMw+wExSUITey/68Gk4+dsRbSydsiEiEg="; subPackages = [ "cmd/ctl" ]; diff --git a/pkgs/applications/networking/cluster/cmctl/update.sh b/pkgs/applications/networking/cluster/cmctl/update.sh index 70b088a6880a..16a20edb577b 100755 --- a/pkgs/applications/networking/cluster/cmctl/update.sh +++ b/pkgs/applications/networking/cluster/cmctl/update.sh @@ -7,13 +7,13 @@ NIXPKGS_PATH="$(git rev-parse --show-toplevel)" CMCTL_PATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_PATH {}; cmctl.version or (builtins.parseDrvName cmctl.name).version" | tr -d '"')" -LATEST_TAG="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/cert-manager/cert-manager/releases" | jq '.[].tag_name' --raw-output | sed '/-/d' | sort --version-sort -r | head -n 1)" +LATEST_TAG="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/cert-manager/cert-manager/releases" | jq '.[].tag_name' --raw-output | sed '/-/d' | sort --version-sort -r | head -n 1)" LATEST_VERSION="${LATEST_TAG:1}" if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/cert-manager/cert-manager/archive/refs/tags/${LATEST_TAG}.tar.gz) - TAG_SHA=$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/cert-manager/cert-manager/git/ref/tags/${LATEST_TAG}" | jq -r '.object.sha') - TAG_COMMIT_SHA=$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/cert-manager/cert-manager/git/tags/${TAG_SHA}" | jq '.object.sha' --raw-output) + TAG_SHA=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/cert-manager/cert-manager/git/ref/tags/${LATEST_TAG}" | jq -r '.object.sha') + TAG_COMMIT_SHA=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/cert-manager/cert-manager/git/tags/${TAG_SHA}" | jq '.object.sha' --raw-output) setKV () { sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${CMCTL_PATH}/default.nix" diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index aad583c675c0..b917c6a62249 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.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "sha256-I9OmTO5obTwAj4hkecUfmRYR4Q3rdllMfbpESv66eEQ="; + sha256 = "sha256-p6gvXn8v7KZMiCPj2EQlk/2au1nZ6EJlLxcMZHzlEp8="; }; vendorSha256 = null; @@ -24,6 +24,7 @@ buildGoModule rec { "plugins/ipam/host-local" "plugins/ipam/static" "plugins/main/bridge" + "plugins/main/dummy" "plugins/main/host-device" "plugins/main/ipvlan" "plugins/main/loopback" @@ -38,7 +39,7 @@ buildGoModule rec { "plugins/meta/vrf" ]; - passthru.tests = { inherit (nixosTests) cri-o podman; }; + passthru.tests = { inherit (nixosTests) cri-o; }; meta = with lib; { description = "Some standard networking plugins, maintained by the CNI team"; diff --git a/pkgs/applications/networking/cluster/crc/default.nix b/pkgs/applications/networking/cluster/crc/default.nix index 9710156f1150..2c55802c726b 100644 --- a/pkgs/applications/networking/cluster/crc/default.nix +++ b/pkgs/applications/networking/cluster/crc/default.nix @@ -10,20 +10,22 @@ }: let - openShiftVersion = "4.10.22"; - podmanVersion = "4.1.0"; + openShiftVersion = "4.12.0"; + okdVersion = "4.11.0-0.okd-2022-11-05-030711"; + podmanVersion = "4.3.1"; writeKey = "cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp"; in buildGoModule rec { - version = "2.6.0"; + version = "2.13.1"; pname = "crc"; - gitCommit = "6b954d40ec3280ca63e825805503d4414a3ff55b"; + gitCommit = "b5b864fdd4ed047027f439db96c2658aa194d2bc"; + modRoot = "cmd/crc"; src = fetchFromGitHub { - owner = "code-ready"; + owner = "crc-org"; repo = "crc"; rev = "v${version}"; - sha256 = "sha256-4EaonL+7/zPEbuM12jQFx8wLR62iLYZ3LkHAibdGQZc="; + sha256 = "sha256-0e62mQ01pt0kClrEx4ss2T8BN1+0aQiCFPyDg5agbTU"; }; vendorSha256 = null; @@ -41,21 +43,18 @@ buildGoModule rec { tags = [ "containers_image_openpgp" ]; ldflags = [ - "-X github.com/code-ready/crc/pkg/crc/version.crcVersion=${version}" - "-X github.com/code-ready/crc/pkg/crc/version.bundleVersion=${openShiftVersion}" - "-X github.com/code-ready/crc/pkg/crc/version.podmanVersion=${podmanVersion}" - "-X github.com/code-ready/crc/pkg/crc/version.commitSha=${gitCommit}" - "-X github.com/code-ready/crc/pkg/crc/segment.WriteKey=${writeKey}" + "-X github.com/crc-org/crc/pkg/crc/version.crcVersion=${version}" + "-X github.com/crc-org/crc/pkg/crc/version.ocpVersion=${openShiftVersion}" + "-X github.com/crc-org/crc/pkg/crc/version.okdVersion=${okdVersion}" + "-X github.com/crc-org/crc/pkg/crc/version.podmanVersion=${podmanVersion}" + "-X github.com/crc-org/crc/pkg/crc/version.commitSha=${builtins.substring 0 8 gitCommit}" + "-X github.com/crc-org/crc/pkg/crc/segment.WriteKey=${writeKey}" ]; preBuild = '' export HOME=$(mktemp -d) ''; - # tests are currently broken on aarch64-darwin - # https://github.com/code-ready/crc/issues/3237 - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); - checkFlags = [ "-args --crc-binary=$out/bin/crc" ]; passthru.tests.version = testers.testVersion { package = crc; @@ -64,6 +63,7 @@ buildGoModule rec { crc version ''; }; + passthru.updateScript = ./update.sh; meta = with lib; { description = "Manages a local OpenShift 4.x cluster or a Podman VM optimized for testing and development purposes"; diff --git a/pkgs/applications/networking/cluster/crc/update.sh b/pkgs/applications/networking/cluster/crc/update.sh index 9d3fcba7d9fd..93503c6115c6 100755 --- a/pkgs/applications/networking/cluster/crc/update.sh +++ b/pkgs/applications/networking/cluster/crc/update.sh @@ -13,24 +13,27 @@ NIXPKGS_CRC_FOLDER=$( cd ${NIXPKGS_CRC_FOLDER} LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json -curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - https://api.github.com/repos/code-ready/crc/releases >${LATEST_TAG_RAWFILE} +curl --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + https://api.github.com/repos/crc-org/crc/releases >${LATEST_TAG_RAWFILE} LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | grep -v -e rc -e engine | tail -n +2 | head -n -1 | sed 's|[", ]||g' | sort -rV | head -n1) CRC_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//') -CRC_COMMIT=$(curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - https://api.github.com/repos/code-ready/crc/tags | +CRC_COMMIT=$(curl --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + https://api.github.com/repos/crc-org/crc/tags | jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha") FILE_MAKEFILE=${WORKDIR}/Makefile -curl --silent https://raw.githubusercontent.com/code-ready/crc/${CRC_COMMIT}/Makefile >$FILE_MAKEFILE +curl --silent https://raw.githubusercontent.com/crc-org/crc/${CRC_COMMIT}/Makefile >$FILE_MAKEFILE OPENSHIFT_VERSION=$(grep 'OPENSHIFT_VERSION' ${FILE_MAKEFILE} | head -n1 | awk '{print $3}') +OKD_VERSION=$(grep 'OKD_VERSION' ${FILE_MAKEFILE} | + head -n1 | awk '{print $3}') + PODMAN_VERSION=$(grep 'PODMAN_VERSION' ${FILE_MAKEFILE} | head -n1 | awk '{print $3}') @@ -46,6 +49,9 @@ sed -i "s|gitCommit = \".*\"|gitCommit = \"${CRC_COMMIT:-}\"|" \ sed -i "s|openShiftVersion = \".*\"|openShiftVersion = \"${OPENSHIFT_VERSION:-}\"|" \ ${NIXPKGS_CRC_FOLDER}/default.nix +sed -i "s|okdVersion = \".*\"|okdVersion = \"${OKD_VERSION:-}\"|" \ + ${NIXPKGS_CRC_FOLDER}/default.nix + sed -i "s|podmanVersion = \".*\"|podmanVersion = \"${PODMAN_VERSION:-}\"|" \ ${NIXPKGS_CRC_FOLDER}/default.nix diff --git a/pkgs/applications/networking/cluster/dnsname-cni/default.nix b/pkgs/applications/networking/cluster/dnsname-cni/default.nix index a0bc37f2cdb8..3a543f40dd49 100644 --- a/pkgs/applications/networking/cluster/dnsname-cni/default.nix +++ b/pkgs/applications/networking/cluster/dnsname-cni/default.nix @@ -3,7 +3,6 @@ dnsmasq, fetchFromGitHub, lib, - nixosTests, makeWrapper, }: @@ -28,10 +27,6 @@ buildGoModule rec { doCheck = false; # NOTE: requires root privileges - passthru.tests = { - inherit (nixosTests) podman-dnsname; - }; - meta = with lib; { description = "DNS name resolution for containers"; homepage = "https://github.com/containers/dnsname"; diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix index 86a7d87a0e13..4e75d66bee07 100644 --- a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix +++ b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix @@ -35,5 +35,7 @@ buildGoPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ periklis ]; platforms = platforms.darwin; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index 0c9d90cd8aac..c90c93f20624 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "driftctl"; - version = "0.38.1"; + version = "0.38.2"; src = fetchFromGitHub { owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-etH/92Nhl5ZkmBeDtgFN0pLUOzgWhd3lClW4+zXYPr4="; + sha256 = "sha256-PPzoZypTP3yrgU50Uv7yBNCc2nAa84quCTWjxyq9h/c="; }; - vendorSha256 = "sha256-tvl0VlMUD7rVlB/OjyptYyllx6brX+ycGTp4In9yEvE="; + vendorHash = "sha256-XVEXWBVqYoAlK4DP0GdWqJDcLy9WxCaUdNbVESJ9zoM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 898b7fe613f8..01f229ca24fc 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, stdenv }: let - version = "0.36.0"; - sha256 = "1rjsdisj2cib8pyfc1lx5jgx0dksh0zhiqccgvqvfja24azvhc4n"; - manifestsSha256 = "0kzbzn43i35kyl7h9kb4f21sbrz90jx9pj35002j2i1j20b2xzh8"; + version = "0.39.0"; + sha256 = "1mxzafv4p6n2r62nsr4py74z8jw42hm6ypm9kkfw3bfz5db7xhav"; + manifestsSha256 = "0wri6xzd603ll7ncn4af4xv5px1yg91m133m0dlrrzrb3izgiky0"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-2N91+anR0nD9E563MgSQPwslR9J/uvSHLs6kD4Yc3So="; + vendorSha256 = "sha256-IyWXCunOCVDV/OHf3py/g0UbIByYhnIHDlEDxIkBLZI="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests @@ -65,7 +65,7 @@ in buildGoModule rec { ''; homepage = "https://fluxcd.io"; license = licenses.asl20; - maintainers = with maintainers; [ bryanasdev000 jlesquembre ]; + maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ]; mainProgram = "flux"; }; } diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index 78eee8746c51..601f2412a0af 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.20"; + version = "0.6.23"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - sha256 = "sha256-HeyWMzxSga6T2/BRVwrmgb3utjnVTJk3zhhcVfq8/Cc="; + hash = "sha256-3g8S3cJ3RC06rvPMyQSKf8L4DkDTZ0Oe+6eh+rwyqg8="; }; vendorSha256 = null; @@ -32,6 +32,5 @@ buildGoModule rec { homepage = "https://fnproject.io"; license = licenses.asl20; maintainers = [ maintainers.c4605 ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/networking/cluster/func/default.nix b/pkgs/applications/networking/cluster/func/default.nix new file mode 100644 index 000000000000..306ce8ba25e4 --- /dev/null +++ b/pkgs/applications/networking/cluster/func/default.nix @@ -0,0 +1,46 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, func }: + +buildGoModule rec { + pname = "func"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "knative"; + repo = "func"; + rev = "knative-v${version}"; + sha256 = "sha256-LrWRY22deh+YL/cLb+ZwK93okVPgysBoMCmo2MrbqIs="; + }; + + vendorSha256 = null; + + subPackages = [ "cmd/func" ]; + + ldflags = [ + "-X main.vers=v${version}" + "-X main.date=19700101T000000Z" + "-X main.hash=${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + + postInstall = '' + installShellCompletion --cmd func \ + --bash <($out/bin/func completion bash) \ + --zsh <($out/bin/func completion zsh) + ''; + + passthru.tests.version = testers.testVersion { + package = func; + command = "func version"; + version = "v${version}"; + }; + + meta = with lib; { + description = "The Knative client library and CLI for creating, building, and deploying Knative Functions"; + homepage = "https://github.com/knative/func"; + changelog = "https://github.com/knative/func/releases/tag/knative-v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ maxwell-lt ]; + }; +} diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 0728a03e976b..5c47c602c33f 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "glooctl"; - version = "1.12.33"; + version = "1.13.4"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-T/fkQxRcwDYppGpAu1sBg8Oe8dAa4Bk/jt4jYMikPBE="; + hash = "sha256-eyfMWum1fZUq4iF77Q+0FP2Rdq2P+xK0au3ytN8MS+k="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorSha256 = "sha256-G26BfTdXMQP0U4FDRYkJNfUOGfqow714WPNBnBrXLZQ="; + vendorHash = "sha256-sQv6g0Xgs+6jgxacWJwE3dK3GimfiPHly0Z0rvdKNE4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index ebe21a2da45e..58ba8a4168e9 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -133,7 +133,7 @@ in }; jdk = jdk8_headless; # not using native libs because of broken openssl_1_0_2 dependency - # can be manually overriden + # can be manually overridden tests = nixosTests.hadoop_3_2; }; hadoop2 = common rec { diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index bfc05e38a679..60f6c3ddb5ea 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.10.2"; + version = "3.11.0"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-ly48zSsi+dV4te68LX8NtaJ9eLC46sSakExR2a+3b5U="; + sha256 = "sha256-Pes1p7rTO17Bef6qacsQWJkhb1CWilzmVYQe886EepU="; }; - vendorSha256 = "sha256-vyHT/N5lat/vqM2jK4Q+jJOtZpS52YCYGcJqfa5e0KM="; + vendorSha256 = "sha256-LRMDrBSl5EGQqQt5FUU4JJHqdwfYt5qsVpe76jUQBVI="; subPackages = [ "cmd/helm" ]; ldflags = [ @@ -37,7 +37,8 @@ buildGoModule rec { postInstall = '' $out/bin/helm completion bash > helm.bash $out/bin/helm completion zsh > helm.zsh - installShellCompletion helm.{bash,zsh} + $out/bin/helm completion fish > helm.fish + installShellCompletion helm.{bash,zsh,fish} ''; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index 4915b2766ee7..fb268db1810a 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.15.1"; + version = "3.16.1"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-LgfYcptC1fcINf80dbOZu8HD5oTrF0tTMQCWdsO3H5U="; + sha256 = "sha256-QhAmedSDBi1aRNmp4LR5Xv4HMzcextzT67g9nxN4eko="; }; - vendorSha256 = "sha256-iEsblhejczTFPL7LvEKHE/T1h2xAt7cdnoR8KIv3Wpo="; + vendorHash = "sha256-bVgYj0e/z57sIvVZXAzLkKqKLa0Pe0CT57Vc7Df1oWE="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/applications/networking/cluster/hubble/default.nix index e6e5e6c1ce6c..a78950dde0a3 100644 --- a/pkgs/applications/networking/cluster/hubble/default.nix +++ b/pkgs/applications/networking/cluster/hubble/default.nix @@ -39,7 +39,7 @@ buildGoModule rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Network, Service & Security Observability for Kubernetes using eBPF"; license = licenses.asl20; homepage = "https://github.com/cilium/hubble/"; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index b4ae402fa0c9..ec4c1b8a04b4 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.15.3"; + version = "1.16.1"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-mgf3xQIsd4j3a5pqZz2UHhsHizACjVC4St1GfsDJsfY="; + sha256 = "sha256-IYmNmrUdlp0V+gsAwivkF73VcBBMDcA5QWSnJ+6qKks="; }; - vendorSha256 = "sha256-P40VPtPxbfL0xpAMLJrqPhyyB7xFTsXMfBSCGL3S4Gg="; + vendorSha256 = "sha256-yCdCuwiAAdyeLtu4zE7d8RLbqM6FuH9sw0EqDZohQxg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index 5f19d55b5b31..986832658825 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "k0sproject"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m0BdmsqmkB3Q6JzzRPS6Tq68a33heUifY2EgTjbAm3M="; + sha256 = "sha256-i/XgEPuYNxn10eOXfF+X33oLlkO9r6daeygZcSdcicQ="; }; - vendorSha256 = "sha256-CZ8DmgYXQcpd43qm6YsVHFePuUochHgJG7/ffEK8LL8="; + vendorSha256 = "sha256-RTC2AEDzSafvJT/vuPjzs25PhuzBiPb32an/a/wpY04="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/k3s/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/chart-versions.nix new file mode 100644 index 000000000000..8c40604d0f1c --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/chart-versions.nix @@ -0,0 +1,10 @@ +{ + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-20.3.1+up20.3.0.tgz"; + sha256 = "1775vjldvqvhzdbzanxhbaqbmkih09yb91im651q8bc7z5sb9ckn"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-20.3.1+up20.3.0.tgz"; + sha256 = "1rj0f0n0vgjcbzfwzhqmsd501i2f6vw145w9plbp8gwdyzmg2nc6"; + }; +} diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 116fd7de9bab..74f54d28d594 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -25,8 +25,6 @@ , pkgsBuildBuild }: -with lib; - # k3s is a kinda weird derivation. One of the main points of k3s is the # simplicity of it being one binary that can perform several tasks. # However, when you have a good package manager (like nix), that doesn't @@ -47,37 +45,37 @@ 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.25.3+k3s1"; # k3s git tag - k3sCommit = "f2585c1671b31b4b34bddbb3bf4e7d69662b0821"; # k3s git commit at the above version - k3sRepoSha256 = "0zwf3iwjcidx14zw36s1hr0q8wmmbfc0rfqwd7fmpjq597h8zkms"; - k3sVendorSha256 = "sha256-U67tJRGqPFk5AfRe7I50zKGC9HJ2oh+iI/C7qF/76BQ="; + k3sVersion = "1.26.1+k3s1"; # k3s git tag + k3sCommit = "f10af367c3c96863c081ada4018e94e085c9404d"; # k3s git commit at the above version + k3sRepoSha256 = "13h20yb9gyrclhv2r0vv7fnsr73i06686rm6r0pcvy72hw26i848"; + k3sVendorSha256 = "sha256-WvkuXHG6NM9eScuu7qG3HDZbBPAJ6xVPz3RRuAxP994="; - # 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 = "12.0.0"; - traefikChartSha256 = "1sqmi71fi3ad5dh5fmsp9mv80x6pkgqwi4r9fr8l6i9sdnai6f1a"; + # nix generated by update.sh + # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/scripts/download#L29-L32 + # see also https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/manifests/traefik.yaml#L8 + # At the time of writing, there are two traefik charts, and that's it + charts = import ./chart-versions.nix; # 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"; + k3sRootVersion = "0.12.1"; + k3sRootSha256 = "0724yx3zk89m2239fmdgwzf9w672pik71xqrvgb7pdmknmmdn9f4"; # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45 k3sCNIVersion = "1.1.1-k3s1"; k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl"; - # 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.13-k3s2"; - containerdSha256 = "1pfr2ji4aij9js90gf4a3hqnhyw5hshcjdccm62l700j68gs5z97"; + # taken from ./scripts/version.sh VERSION_CONTAINERD + containerdVersion = "1.6.15-k3s1"; + containerdSha256 = "1bzmryqqdpmxl4471wda5q9hqjlgzcmsbwxcwd2ap34qx27my1qd"; # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag - criCtlVersion = "1.25.0-k3s1"; + criCtlVersion = "1.26.0-rc.0-k3s1"; - baseMeta = { + baseMeta = with lib; { description = "A lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; - maintainers = with maintainers; [ euank mic92 ]; + maintainers = with maintainers; [ euank mic92 superherointj ]; platforms = platforms.linux; }; @@ -99,10 +97,9 @@ let ]; # bundled into the k3s binary - traefikChart = fetchurl { - url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz"; - sha256 = traefikChartSha256; - }; + traefikChart = fetchurl charts.traefik; + traefik-crdChart = fetchurl charts.traefik-crd; + # so, k3s is a complicated thing to package # This derivation attempts to avoid including any random binaries from the # internet. k3s-root is _mostly_ binaries built to be bundled in k3s (which @@ -224,10 +221,6 @@ buildGoModule rec { src = k3sRepo; vendorSha256 = k3sVendorSha256; - patches = [ - ./patches/0001-scrips-download-strip-downloading-just-package-CRD.patch - ]; - postPatch = '' # Nix prefers dynamically linked binaries over static binary. @@ -295,11 +288,9 @@ buildGoModule rec { 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 + + cp ${traefikChart} ./build/static/charts + cp ${traefik-crdChart} ./build/static/charts export ARCH=$GOARCH export DRONE_TAG="v${k3sVersion}" 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 deleted file mode 100644 index 115fd6824772..000000000000 --- a/pkgs/applications/networking/cluster/k3s/patches/0001-scrips-download-strip-downloading-just-package-CRD.patch +++ /dev/null @@ -1,41 +0,0 @@ -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/update.sh b/pkgs/applications/networking/cluster/k3s/update.sh index ac46e7ae51e5..651d54adc1d5 100755 --- a/pkgs/applications/networking/cluster/k3s/update.sh +++ b/pkgs/applications/networking/cluster/k3s/update.sh @@ -11,7 +11,7 @@ NIXPKGS_K3S_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/ cd ${NIXPKGS_K3S_PATH} LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json -curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ +curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ https://api.github.com/repos/k3s-io/k3s/releases > ${LATEST_TAG_RAWFILE} LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | \ @@ -19,27 +19,52 @@ LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | \ K3S_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//') -K3S_COMMIT=$(curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ +K3S_COMMIT=$(curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ https://api.github.com/repos/k3s-io/k3s/tags \ | jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha") K3S_REPO_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/k3s-io/k3s/archive/refs/tags/${LATEST_TAG_NAME}.tar.gz) FILE_SCRIPTS_DOWNLOAD=${WORKDIR}/scripts-download -curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/download > $FILE_SCRIPTS_DOWNLOAD +curl --silent -f https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/download > $FILE_SCRIPTS_DOWNLOAD FILE_SCRIPTS_VERSION=${WORKDIR}/scripts-version.sh -curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/version.sh > $FILE_SCRIPTS_VERSION +curl --silent -f https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/version.sh > $FILE_SCRIPTS_VERSION -FILE_MANIFESTS_TRAEFIK=${WORKDIR}/manifests-traefik.yaml -curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/manifests/traefik.yaml > $FILE_MANIFESTS_TRAEFIK +FILE_TRAEFIK_MANIFEST=${WORKDIR}/traefik.yml +curl --silent -f -o "$FILE_TRAEFIK_MANIFEST" https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/manifests/traefik.yaml + +CHART_FILES=( $(yq eval --no-doc .spec.chart "$FILE_TRAEFIK_MANIFEST" | xargs -n1 basename) ) +# These files are: +# 1. traefik-crd-20.3.1+up20.3.0.tgz +# 2. traefik-20.3.1+up20.3.0.tgz +# at the time of writing + +if [[ "${#CHART_FILES[@]}" != "2" ]]; then + echo "New manifest charts added, the packaging scripts will need to be updated: ${CHART_FILES}" + exit 1 +fi + +CHARTS_URL=https://k3s.io/k3s-charts/assets +# Get metadata for both files +rm -f chart-versions.nix.update +cat > chart-versions.nix.update < $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 'VERSION_ROOT=' ${FILE_SCRIPTS_VERSION} \ | cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//') @@ -51,8 +76,8 @@ CNIPLUGINS_VERSION=$(grep 'VERSION_CNIPLUGINS=' ${FILE_SCRIPTS_VERSION} \ 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_VERSION=$(grep 'VERSION_CONTAINERD=' ${FILE_SCRIPTS_VERSION} \ + | cut -d'=' -f2 | 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") @@ -67,9 +92,6 @@ setKV k3sVersion ${K3S_VERSION} setKV k3sCommit ${K3S_COMMIT} setKV k3sRepoSha256 ${K3S_REPO_SHA256} -setKV traefikChartVersion ${TRAEFIK_CHART_VERSION} -setKV traefikChartSha256 ${TRAEFIK_CHART_SHA256} - setKV k3sRootVersion ${K3S_ROOT_VERSION} setKV k3sRootSha256 ${K3S_ROOT_SHA256} diff --git a/pkgs/applications/networking/cluster/k3sup/default.nix b/pkgs/applications/networking/cluster/k3sup/default.nix index ec7cdb3ecde6..555f1e69c179 100644 --- a/pkgs/applications/networking/cluster/k3sup/default.nix +++ b/pkgs/applications/networking/cluster/k3sup/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "k3sup"; - version = "0.12.10"; + version = "0.12.12"; src = fetchFromGitHub { owner = "alexellis"; repo = "k3sup"; rev = version; - sha256 = "sha256-d9YZOrMZKwkHmo7/b0BE552OLnD/ETfF4n+jE7fQ4zA="; + sha256 = "sha256-Fp52PL0oNqpvisiLLqZ+iQ4RSzLaL3UH7S/CAR5h9LA="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index de9dd27b5264..141a17e34e2f 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.26.7"; + version = "0.27.0"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-TshUQJIwGSqVP+YUJvSHSczvnvzr1kX761oIbfQzVzw="; + sha256 = "sha256-optEMGB6izGlpcq2AJOY4lTt8igYBilE0Bg8KxE8AsU="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { tags = [ "netgo" ]; - vendorSha256 = "sha256-W0yU5rMUuO2JtKRZpexsCqIUy3h+2hSDRcq/lp0UHX8="; + vendorHash = "sha256-57JrBmund2hwcgqWkLos/h1EOgZQb9HfKUf1BX0MYGQ="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); diff --git a/pkgs/applications/networking/cluster/karmor/default.nix b/pkgs/applications/networking/cluster/karmor/default.nix new file mode 100644 index 000000000000..b01dac8dc17c --- /dev/null +++ b/pkgs/applications/networking/cluster/karmor/default.nix @@ -0,0 +1,36 @@ +{ buildGoModule, fetchFromGitHub, installShellFiles, lib }: + +buildGoModule rec { + pname = "karmor"; + version = "0.11.6"; + + src = fetchFromGitHub { + owner = "kubearmor"; + repo = "kubearmor-client"; + rev = "v${version}"; + hash = "sha256-toN/pIvmmMwIARhY1i/2nmrC5ZVyTR7pttqkyXNuMaE="; + }; + + vendorHash = "sha256-TE+VPOhkTPqQTapxAcJzlQzRZfmb1J4pAWUKiTGLnZE="; + + nativeBuildInputs = [ installShellFiles ]; + + # integration tests require network access + doCheck = false; + + postInstall = '' + mv $out/bin/{kubearmor-client,karmor} + installShellCompletion --cmd karmor \ + --bash <($out/bin/karmor completion bash) \ + --fish <($out/bin/karmor completion fish) \ + --zsh <($out/bin/karmor completion zsh) + ''; + + meta = with lib; { + description = "A client tool to help manage KubeArmor"; + homepage = "https://kubearmor.io"; + changelog = "https://github.com/kubearmor/kubearmor-client/releases/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kluctl/default.nix b/pkgs/applications/networking/cluster/kluctl/default.nix index 7b04b085a20d..aefcef2baccc 100644 --- a/pkgs/applications/networking/cluster/kluctl/default.nix +++ b/pkgs/applications/networking/cluster/kluctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kluctl"; - version = "2.16.1"; + version = "2.18.4"; src = fetchFromGitHub { owner = "kluctl"; repo = "kluctl"; rev = "v${version}"; - hash = "sha256-rcwtVhtLc49rD6J3AZFumLQrZuTveE7OY+agufe/4MQ="; + hash = "sha256-nHfJ7Dt9nAY4fY+U7W46cPRwWSgtGvwdbUjQAynOQdw="; }; - vendorHash = "sha256-IC+sjctDqd0lQD5labl+UYWsRiptQKSjSHYf2SGkp14="; + vendorHash = "sha256-ADYXLcCYmlQim9KvqkXGdEXJ9cACBsRCb3emcmrL0kg="; ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 6dff7385d705..555af740b926 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -62,8 +62,8 @@ rec { }; kops_1_25 = mkKops rec { - version = "1.25.2"; - sha256 = "sha256-JJGb12uuOvZQ+bA82nrs9vKRT2hEvnPrOH8XNHfYVD8="; + version = "1.25.3"; + sha256 = "sha256-Q40d62D+H7CpLmrjweCy75U3LgnHEV2pFZs2Ze+koqo="; rev = "v${version}"; }; } diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/applications/networking/cluster/kube-capacity/default.nix index c7d14748e80f..7e7bba1d37b3 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.1"; + version = "0.7.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "robscott"; repo = pname; - sha256 = "sha256-+1qewL8N3WTS7GW6fpL2+RPbFQQ/3DDMgShtBi+lRtg="; + sha256 = "sha256-lNpUOA6O9sOBugYp9fDklKo6U2E0nKz1ORr3qO2tibg="; }; - vendorSha256 = "sha256-sMobdarMMktf34LbQnyZ6sgbfiJhWxWSQR0F+4x5J58="; + vendorHash = "sha256-qfSya42wZEmJCC7o8zJQEv0BWrxTuBT2Jzcq/AfI+OE="; meta = with lib; { description = diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index 2b88d1ddd24b..cb349e0c5634 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube-router"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J/wQyrEEdBki8bq1Qesgu4Kqj2w33zzvEEOecFdiGak="; + sha256 = "sha256-aO72wvq31kue75IKfEByhKxUwSSGGmPLzHDBSvTChTM="; }; vendorSha256 = "sha256-+3uTIaXuiwbU0fUgn2th4RNDQ5gCDi3ntPMu92S+mXc="; diff --git a/pkgs/applications/networking/cluster/kube-score/default.nix b/pkgs/applications/networking/cluster/kube-score/default.nix index c1383e8688d1..492f9bcd51f4 100644 --- a/pkgs/applications/networking/cluster/kube-score/default.nix +++ b/pkgs/applications/networking/cluster/kube-score/default.nix @@ -1,22 +1,26 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "kube-score"; - version = "1.14.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "zegl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6/+S1aj2qoUPz+6+8Z4Z5dpfyOi/DnrLLUpPgBn/OxU="; + hash = "sha256-/aCuPL0bzzoNczvSdLYS8obTu8bZzO5HhBmRZ3/ArAM="; }; - vendorSha256 = "sha256-0Zi62FmX4rFl3os2ehtussSSUPJtxLq7622CEdeKZCs="; + vendorHash = "sha256-pcNdszOfsYKiASOUNKflbr89j/wb9ILQvjMJYsiGPWo="; meta = with lib; { description = "Kubernetes object analysis with recommendations for improved reliability and security"; - homepage = "https://github.com/zegl/kube-score"; - license = licenses.mit; - maintainers = [ maintainers.j4m3s ]; + homepage = "https://github.com/zegl/kube-score"; + changelog = "https://github.com/zegl/kube-score/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ j4m3s ]; }; } diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index dd6e71a58abe..c2818505a809 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.7.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - sha256 = "sha256-nLjmz9OakBLTBWdYA6czgtJmCuP96abNwLcLZo+yZ48="; + hash = "sha256-AT7BrLVe5sSqAnQyhrkDktxVhuh1e0o5eB8oWWVbL8Q="; }; - vendorSha256 = "sha256-xljLDwubwr6rZ/ZpW9/WithClaMo88ivlBhWFb0iAvo="; + vendorHash = "sha256-wxKEywUs5ezeOlIRT2k3C4G0XaX6h1ORt9/G6+FzVic="; subPackages = ["cmd"]; @@ -61,6 +61,7 @@ buildGoModule rec { meta = with lib; { description = "SDK for building Kubernetes APIs using CRDs"; homepage = "https://github.com/kubernetes-sigs/kubebuilder"; + changelog = "https://github.com/kubernetes-sigs/kubebuilder/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ cmars ]; }; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 899519e741f8..7fd5175e1e48 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,19 +1,27 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: buildGoModule rec { pname = "kubecfg"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "sha256-Ask1Mbt/7xhfTNPmLIFtndT6qqbyotFrhoaUggzgGas="; + hash = "sha256-5IaF7q9Ue+tHkThxYgpkrnEH7xpKBx6cqKf2Zw2mjN4="; }; - vendorSha256 = "sha256-vqlANAwZTC4goeN/KsrYL9GWzkhi4WUx9Llyi863KVY="; + vendorHash = "sha256-Fh8QlXZ7I3XORjRhf5DIQmqA35LmgWVTN+iZDGaYHD8="; - ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.version=v${version}" + ]; nativeBuildInputs = [ installShellFiles ]; @@ -23,11 +31,12 @@ buildGoModule rec { --zsh <($out/bin/kubecfg completion --shell=zsh) ''; - meta = { + meta = with lib; { description = "A tool for managing Kubernetes resources as code"; homepage = "https://github.com/kubecfg/kubecfg"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ benley ]; - platforms = lib.platforms.unix; + changelog = "https://github.com/kubecfg/kubecfg/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix b/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix index 031fa0c21b77..995125d25033 100644 --- a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "kubectl-node-shell"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "kvaps"; repo = "kubectl-node-shell"; rev = "v${version}"; - sha256 = "sha256-dAsNgvHgquXdb2HhLDYLk9IALneKkOxQxKb7BD90+1E="; + sha256 = "sha256-TCd/VipsUT/h88CevqCLUUjN7wAJKYxxq63IpEF2P1Y="; }; strictDeps = true; diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index af41b7ba9dea..d1807d1c6e0b 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.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-MVvhXvf/R7Cku8S4zbs1MlH4NuEwkxCsbbc2ASCF67c="; + sha256 = "sha256-i8kv/YzEWAFQJwIkwot2huIEAZYMUGQqSak4nUMRjn4="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix b/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix index a2d646e06100..1b1dc175d3c4 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.3"; + version = "1.26.0"; src = fetchFromGitHub { owner = "int128"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2Ny3tzeFOZR63fweb+/q1kocIDboD8fJzlLOzcoR0nA="; + sha256 = "sha256-A8J381KNhQbWZ+68P8+1xj/lEEc/+YiJ80LqRQatdFQ="; }; subPackages = ["."]; - vendorSha256 = "sha256-iY4CmtWwQQwZBQM4iJXedFePL4vzSBfNWrVOxYvrhMs="; + vendorSha256 = "sha256-V+O3yFxGJTcFETD2qYOurQUbME5NvRNQTr43OkxXFFE="; # 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 92899fdacf0f..45f0ee66f61e 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.23"; + version = "0.0.25"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6aYa5C0RMCKrnBl3YNbdMUxGOJYwVZ303PLt5RRBjmw="; + sha256 = "sha256-28snlCqvQ0aF7DHjeHWyjOYuy2wHd2EqEDqmst9MQLc="; }; vendorSha256 = "sha256-mjIB0ITf296yDQJP46EI6pLYkZfyU3yzD9iwP0iIXvQ="; diff --git a/pkgs/applications/networking/cluster/kubent/default.nix b/pkgs/applications/networking/cluster/kubent/default.nix index 5302917cdfff..bba56a5b058a 100644 --- a/pkgs/applications/networking/cluster/kubent/default.nix +++ b/pkgs/applications/networking/cluster/kubent/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubent"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "doitintl"; repo = "kube-no-trouble"; rev = "${version}"; - sha256 = "sha256-aXuBYfXQfg6IQE9cFFTBCPNmDg7IZYPAAeuAxCiU0ro="; + sha256 = "sha256-QIvMhKAo30gInqJBpHvhcyjgVkdRqgBKwLQ80ng/75U="; }; - vendorSha256 = "sha256-WQwWBcwhFZxXPFO6h+5Y8VDM4urJGfZ6AOvhRoaSbpk="; + vendorSha256 = "sha256-XXf6CPPHVvCTZA4Ve5/wmlgXQ/gZZUW0W/jXA0bJgLA="; ldflags = [ "-w" "-s" diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index 44c80d8e1392..3d569d4bdca8 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -8,19 +8,20 @@ buildGoModule rec { pname = "kubeone"; - version = "1.5.3"; + version = "1.5.6"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - sha256 = "sha256-CjT6YKC6DJvs+LeKIzOl2Y6n0/yGv0nz8EfHqiSnIDo="; + hash = "sha256-u0ievi2Zj5kerTQWhNPkT3HFdLYVwHOigkvWk6Zc3go="; }; - vendorSha256 = "sha256-Y4eivDchnN2rtQWjFY3cFiJXRfj48UfVUKM/OLuWXGA="; + vendorHash = "sha256-Y4eivDchnN2rtQWjFY3cFiJXRfj48UfVUKM/OLuWXGA="; ldflags = [ - "-s -w" + "-s" + "-w" "-X k8c.io/kubeone/pkg/cmd.version=${version}" "-X k8c.io/kubeone/pkg/cmd.date=unknown" ]; @@ -40,10 +41,11 @@ buildGoModule rec { command = "kubeone version"; }; - meta = { - description = "Automate cluster operations on all your cloud, on-prem, edge, and IoT environments."; + meta = with lib; { + description = "Automate cluster operations on all your cloud, on-prem, edge, and IoT environments"; homepage = "https://kubeone.io/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ lblasc ]; + changelog = "https://github.com/kubermatic/kubeone/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ lblasc ]; }; } diff --git a/pkgs/applications/networking/cluster/kubergrunt/default.nix b/pkgs/applications/networking/cluster/kubergrunt/default.nix index f40c7e8c871e..eb098b2c6c78 100644 --- a/pkgs/applications/networking/cluster/kubergrunt/default.nix +++ b/pkgs/applications/networking/cluster/kubergrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.9.3"; + version = "0.10.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "sha256-nbpRdAkctLiG/hP6vhfEimplAzzj70d5nnaFcJ1NykY="; + sha256 = "sha256-vIqmE9U/0WGIaTpy8NfUadIkaTdN8YKqvRLQ/69NgBE="; }; - vendorSha256 = "sha256-9hWX6INN5HWXyeFQRjkqr+BsGv56lInVYacvT6Imahw="; + vendorHash = "sha256-K/Cw7Sh/2OqTbWQPEsoQbj/ejyaXcLxFT8Rg5Ore5DE="; # Disable tests since it requires network access and relies on the # presence of certain AWS infrastructure diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 1ba1fd6c1338..c1436fbefcc6 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.25.4"; + version = "1.26.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-1k0L8QUj/764X0Y7qxjFMnatTGKeRPBUroHjSMMe5M4="; + sha256 = "sha256-bC2Q4jWBh27bqLGhvG4JcuHIAQmiGz5jDt9Me9qbVpk="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 6bcde313e9ad..a97054a9071f 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.19.2"; + version = "0.19.4"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-LluWV/GWBJ+dmn94GtqPNCIDTZk2zlNhrbcM2pALUpU="; + sha256 = "sha256-okQJBZLIFujHg5Tn/AbCox8mRrump/GjYjyQzkJAtFg="; }; - vendorSha256 = "sha256-f7rznlRKEkHsU72QvRpOtvhg5rp9PuEoADhQOeD16rU="; + vendorHash = "sha256-Nzef+cfC4Fosm1e1Whpz/BrGqRlcbD0NpyST8V1iwiU="; subPackages = [ "cmd/kubeseal" ]; diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index d23669bb1f09..cae6540e39fe 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "kuttl"; - version = "0.14.0"; + version = "0.15.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256-xQS7qCUTM3X4SpUZfxKHb08poJ2W52R7+TNe4BFL5sY="; + sha256 = "sha256-u+j1ulM6B238qXvLMJZwLqglr9CGk81MsnBYiNiZVJQ="; }; - vendorSha256 = "sha256-u8Ezk78CrAhSeeMVXj09/Hiegtx+ZNKlr/Fg0O7+iOY="; + vendorHash = "sha256-taJAQPa0EA0Ph9OpCs7jzLqBV61kVstZrWyNEYc/GBk="; subPackages = [ "cmd/kubectl-kuttl" ]; diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index 6ff8edd737ff..53da8b9be29f 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.8.1"; + version = "1.8.5"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-pwT+fzFzJBkQkWmeHlqbTVSmmh7p3h7M4p5Wrrq+vJM="; + sha256 = "sha256-oEy1SNlYHDuZG2urbXEfROwzfNzdbu0Yjsq98Dw+Mws="; }; ldflags = [ @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorSha256 = "sha256-QE2OWymT/ke/5+f3Sw5MBadorcn/vXJXvwOaFNqhxWQ="; + vendorSha256 = "sha256-nqJZdMkpJEG6VFCTwGUzXcCZPshJnY2FYHDm3xMlU0g="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix index ef70e2832800..cd75bad0a0f3 100644 --- a/pkgs/applications/networking/cluster/lens/default.nix +++ b/pkgs/applications/networking/cluster/lens/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchurl, appimageTools, wrapGAppsHook }: +{ lib, fetchurl, appimageTools, wrapGAppsHook, makeWrapper }: let pname = "lens"; - version = "5.5.3"; - build = "${version}-latest.20220602.2"; + version = "6.3.0"; + build = "2022.12.221341-latest"; name = "${pname}-${version}"; src = fetchurl { url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage"; - sha256 = "sha256-lwiwyXoO+7KgDnQ2Ly0QK0oEVHR73nsMZMGOd2j48dg="; + sha256 = "sha256-IJkm2Woz362jydFph9ek+5Jh2jtDH8kKvWoLQhTZPvc="; name = "${pname}.AppImage"; }; @@ -23,11 +23,12 @@ appimageTools.wrapType2 { extraInstallCommands = '' mv $out/bin/${name} $out/bin/${pname} - + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -m 444 -D ${appimageContents}/lens.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/lens.png \ $out/share/icons/hicolor/512x512/apps/${pname}.png - substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Icon=lens' 'Icon=${pname}' \ --replace 'Exec=AppRun' 'Exec=${pname}' @@ -37,7 +38,7 @@ appimageTools.wrapType2 { description = "The Kubernetes IDE"; homepage = "https://k8slens.dev/"; license = licenses.mit; - maintainers = with maintainers; [ dbirks ]; + maintainers = with maintainers; [ dbirks RossComputerGuy ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/cluster/levant/default.nix b/pkgs/applications/networking/cluster/levant/default.nix index afee16bf8f8f..07d9c360de7e 100644 --- a/pkgs/applications/networking/cluster/levant/default.nix +++ b/pkgs/applications/networking/cluster/levant/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "levant"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "levant"; rev = "v${version}"; - sha256 = "sha256-ujybD4nSHC/w2Pfu43eSO6rNJjXFAvc81T05icWFvbs="; + sha256 = "sha256-UI8PVvTqk8D4S9kq3sgxrm8dkRokpgkLyTN6pzUXNV0="; }; - vendorSha256 = "sha256-pKxj0qz7adSuPpiXu4+2KBO3JZu8zZ8ycPF5LosF4T8="; + vendorSha256 = "sha256-MzKttGfuIg0Pp/iz68EpXuk4I+tFozhIabKlsWuvJ48="; # The tests try to connect to a Nomad cluster. doCheck = false; diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 83d75d7d189a..896c2ac5a016 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.12.0"; - sha256 = "0p8k5c0gzpmqp7qrhfcjrhbgwd2mzsn2qpsv7ym0ywjkvrkg3355"; - vendorSha256 = "sha256-qjXpzS1ctEQfXFjzyBUiIp6+oqABedpwHqDxQz0DJ8U="; + version = "2.12.3"; + sha256 = "01vnqhn5lc4pv1rgwmmzzf7ynqc4ss0jysqhjq0m5yzll2k40d8z"; + vendorSha256 = "sha256-7CkeWbgiQIKhuCrJErZrkkx0MD41qxaWAY/18VafLZE="; } diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 1ad1a56896b8..365016eb672d 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 = "22.8.2"; - sha256 = "114lfq5d5b09zg14iwnmaf0vmm183xr37q7b4bj3m8zbzhpbk7xx"; - vendorSha256 = "sha256-hKdokt5QW50oc2z8UFMq78DRWpwPlL5tSf2F0rQNEQ8="; + version = "23.1.2"; + sha256 = "1c8l5zzy5pjilp1a84084g3dgdm0rxkx7hj7lqcn0iihfvhxc1xq"; + vendorSha256 = "sha256-6dOX3SsKjpwC/dEUO2SnVna99lpav7kIEKrMUy4YfhA="; } diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix index f21ee96ecd33..a4aec900a484 100644 --- a/pkgs/applications/networking/cluster/linkerd/generic.nix +++ b/pkgs/applications/networking/cluster/linkerd/generic.nix @@ -20,6 +20,11 @@ buildGoModule rec { env GOFLAGS="" go generate ./jaeger/static env GOFLAGS="" go generate ./multicluster/static env GOFLAGS="" go generate ./viz/static + + # Necessary for building Musl + if [[ $NIX_HARDENING_ENABLE =~ "pie" ]]; then + export GOFLAGS="-buildmode=pie $GOFLAGS" + fi ''; tags = [ diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 997b52434b82..e05e7847cfd4 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -12,9 +12,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.28.0"; + version = "1.29.0"; - vendorSha256 = "sha256-CyIpzwSYHbv96UoQ/SZXOl6v3xn3pvT39ZO+RpVHU5I="; + vendorHash = "sha256-wRCSUDzz+1e4/ijwAnIM8a/AlnNNdVkiz3WO4Nhuy+M="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-Gn/RXZedID0sh5qTcBNg7GeLtI1JZYKXEWg2RZGXlDw="; + sha256 = "sha256-rdcMgL7bzdlxrelui+V1APJik0v/4YyUqj9QlMRq1nI="; }; nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index d6a29a90fd94..bc57c87b2f87 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 = "1.0.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hSuBN+yuwXfGP7gNtYR37yl+n5hj2sp6hJ5d8tyXkf0="; + hash = "sha256-6AXki9/gJVlHpA3iSS1GqkLWaUqE0c+X8alWdMyCFiU="; }; - vendorSha256 = "sha256-2pYjN904pQoliBSaCysumkMocvZDxwsTvZxgDCacVrc="; + vendorHash = "sha256-28Wt9uQ7+PEWe+RaNv4HLz7HQbO7hXlX3O7s9SooLu8="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index a3ad35a4eabe..cf306f858b65 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -82,6 +82,7 @@ let ps.nixops-hetzner ps.nixopsvbox ps.nixops-virtd + ps.nixops-hetznercloud ]) // rec { # Workaround for https://github.com/NixOS/nixpkgs/issues/119407 # TODO after #1199407: Use .overrideAttrs(pkg: old: { passthru.tests = .....; }) diff --git a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix index 7166c3ac288a..e7bd82971014 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 = "683baa66c613216a662aad3fd58b0cdc5cd41adb"; - sha256 = "00yyzsybn1fjhkar64albxqp46d1v9c6lf1gd10lh9q72xq979sf"; + rev = "5013072c5ca34247d7dce545c3a7b1954948fd4d"; + sha256 = "0417xq7s0qkh9ali8grlahpxl4sgg4dla302dda4768wbp0wagcz"; }; } ); @@ -71,6 +71,16 @@ self: super: { } ); + nixops-hetznercloud = super.nixops-hetznercloud.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/lukebfox/nixops-hetznercloud.git"; + rev = "c00533400506d40940f7c1f67bf3973db37d9dd9"; + sha256 = "1xfwhiyay7x1r3q6rxn2f3h0llgwf73vl8fxp0ww13rgny2w0dgj"; + }; + } + ); + nixops-virtd = super.nixops-virtd.overridePythonAttrs ( _: { src = pkgs.fetchgit { diff --git a/pkgs/applications/networking/cluster/nixops/poetry.lock b/pkgs/applications/networking/cluster/nixops/poetry.lock index 56405bc1460e..3f7ce6a1a49e 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry.lock +++ b/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -1,10 +1,16 @@ +# This file is automatically @generated by Poetry and should not be changed by hand. + [[package]] name = "apache-libcloud" -version = "3.6.0" +version = "3.7.0" description = "A standard Python library that abstracts away differences among multiple cloud provider APIs. For more information and documentation, please see https://libcloud.apache.org" category = "main" optional = false python-versions = ">=3.6, <4" +files = [ + {file = "apache-libcloud-3.7.0.tar.gz", hash = "sha256:148a9e50069654432a7d34997954e91434dd38ebf68832eb9c75d442b3e62fad"}, + {file = "apache_libcloud-3.7.0-py2.py3-none-any.whl", hash = "sha256:027a9aff2c01db9c8e6f9f94b6eb44b3153d82702c42bfbe7af5624dabf1f950"}, +] [package.dependencies] requests = ">=2.26.0" @@ -16,17 +22,25 @@ description = "Amazon Web Services Library" category = "main" optional = false python-versions = "*" +files = [ + {file = "boto-2.49.0-py2.py3-none-any.whl", hash = "sha256:147758d41ae7240dc989f0039f27da8ca0d53734be0eb869ef16e3adcfa462e8"}, + {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, +] [[package]] name = "boto3" -version = "1.24.88" +version = "1.26.45" description = "The AWS SDK for Python" category = "main" optional = false python-versions = ">= 3.7" +files = [ + {file = "boto3-1.26.45-py3-none-any.whl", hash = "sha256:b1bc7db503dc49bdccf5dada080077056a32af9982afdde84578a109cd741d05"}, + {file = "boto3-1.26.45.tar.gz", hash = "sha256:cc7f652df93e1ce818413fd82ffd645d4f92a64fec67c72946212d3750eaa80f"}, +] [package.dependencies] -botocore = ">=1.27.88,<1.28.0" +botocore = ">=1.29.45,<1.30.0" jmespath = ">=0.7.1,<2.0.0" s3transfer = ">=0.6.0,<0.7.0" @@ -35,11 +49,15 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.27.88" +version = "1.29.45" description = "Low-level, data-driven core of boto 3." category = "main" optional = false python-versions = ">= 3.7" +files = [ + {file = "botocore-1.29.45-py3-none-any.whl", hash = "sha256:a5c0e13f266ee9a74335a1e5d3e377f2baae27226ae23d78f023bae0d18f3161"}, + {file = "botocore-1.29.45.tar.gz", hash = "sha256:62ae03e591ff25555854aa338da35190ffe18c0b1be2ebf5cfb277164233691f"}, +] [package.dependencies] jmespath = ">=0.7.1,<2.0.0" @@ -47,15 +65,19 @@ python-dateutil = ">=2.1,<3.0.0" urllib3 = ">=1.25.4,<1.27" [package.extras] -crt = ["awscrt (==0.14.0)"] +crt = ["awscrt (==0.15.3)"] [[package]] name = "certifi" -version = "2022.9.24" +version = "2022.12.7" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false python-versions = ">=3.6" +files = [ + {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"}, + {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"}, +] [[package]] name = "cffi" @@ -64,431 +86,7 @@ description = "Foreign Function Interface for Python calling C code." category = "main" optional = false python-versions = "*" - -[package.dependencies] -pycparser = "*" - -[[package]] -name = "charset-normalizer" -version = "2.1.1" -description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." -category = "main" -optional = false -python-versions = ">=3.6.0" - -[package.extras] -unicode_backport = ["unicodedata2"] - -[[package]] -name = "cryptography" -version = "3.4.8" -description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -cffi = ">=1.12" - -[package.extras] -docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx_rtd_theme"] -docstest = ["doc8", "pyenchant (>=1.6.11)", "sphinxcontrib-spelling (>=4.0.1)", "twine (>=1.12.0)"] -pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"] -sdist = ["setuptools-rust (>=0.11.4)"] -ssh = ["bcrypt (>=3.1.5)"] -test = ["hypothesis (>=1.11.4,!=3.79.2)", "iso8601", "pretend", "pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pytz"] - -[[package]] -name = "hetzner" -version = "0.8.3" -description = "High level access to the Hetzner robot" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "idna" -version = "3.4" -description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "jmespath" -version = "1.0.1" -description = "JSON Matching Expressions" -category = "main" -optional = false -python-versions = ">=3.7" - -[[package]] -name = "jsonpickle" -version = "2.2.0" -description = "Python library for serializing any arbitrary object graph into JSON" -category = "main" -optional = false -python-versions = ">=2.7" - -[package.extras] -docs = ["jaraco.packaging (>=3.2)", "rst.linker (>=1.9)", "sphinx"] -testing = ["ecdsa", "enum34", "feedparser", "jsonlib", "numpy", "pandas", "pymongo", "pytest (>=3.5,!=3.7.3)", "pytest-black-multipy", "pytest-checkdocs (>=1.2.3)", "pytest-cov", "pytest-flake8 (<1.1.0)", "pytest-flake8 (>=1.1.1)", "scikit-learn", "sqlalchemy"] -"testing.libs" = ["simplejson", "ujson", "yajl"] - -[[package]] -name = "libvirt-python" -version = "8.8.0" -description = "The libvirt virtualization API python binding" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "nixops" -version = "2.0.0" -description = "NixOS cloud provisioning and deployment tool" -category = "main" -optional = false -python-versions = "^3.10" -develop = false - -[package.dependencies] -pluggy = "^1.0.0" -PrettyTable = "^0.7.2" -typeguard = "^2.7.1" -typing-extensions = "^3.7.4" - -[package.source] -type = "git" -url = "https://github.com/NixOS/nixops.git" -reference = "master" -resolved_reference = "683baa66c613216a662aad3fd58b0cdc5cd41adb" - -[[package]] -name = "nixops-aws" -version = "1.0" -description = "NixOps AWS plugin" -category = "main" -optional = false -python-versions = "^3.7" -develop = false - -[package.dependencies] -boto = "^2.49.0" -boto3 = "^1.13.7" -nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} -nixos-modules-contrib = {git = "https://github.com/nix-community/nixos-modules-contrib.git", rev = "master"} -typing-extensions = "^3.7.4" - -[package.source] -type = "git" -url = "https://github.com/NixOS/nixops-aws.git" -reference = "HEAD" -resolved_reference = "d8a6679c413edd1a7075b2fe08017b4c7fa3b3ce" - -[[package]] -name = "nixops-digitalocean" -version = "2.0" -description = "NixOps plugin for Digital Ocean" -category = "main" -optional = false -python-versions = "^3.7" -develop = false - -[package.dependencies] -nixops = {git = "https://github.com/NixOS/nixops.git"} -python-digitalocean = "^1.15.0" - -[package.source] -type = "git" -url = "https://github.com/nix-community/nixops-digitalocean.git" -reference = "HEAD" -resolved_reference = "e977b7f11e264a6a2bff2dcbc7b94c6a97b92fff" - -[[package]] -name = "nixops-encrypted-links" -version = "1.0" -description = "Encrypted links support for NixOps" -category = "main" -optional = false -python-versions = "^3.7" -develop = false - -[package.dependencies] -nixops = {git = "https://github.com/NixOS/nixops.git"} - -[package.source] -type = "git" -url = "https://github.com/nix-community/nixops-encrypted-links.git" -reference = "HEAD" -resolved_reference = "e2f196fce15fcfb00d18c055e1ac53aec33b8fb1" - -[[package]] -name = "nixops-gcp" -version = "1.0" -description = "NixOps backend for Google Cloud Platform" -category = "main" -optional = false -python-versions = "^3.7" -develop = false - -[package.dependencies] -apache-libcloud = "^3.2.0" -cryptography = "^3.1.1" -nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} -nixos-modules-contrib = {git = "https://github.com/nix-community/nixos-modules-contrib.git", rev = "master"} - -[package.source] -type = "git" -url = "https://github.com/nix-community/nixops-gce.git" -reference = "HEAD" -resolved_reference = "712453027486e62e087b9c91e4a8a171eebb6ddd" - -[[package]] -name = "nixops-hercules-ci" -version = "0.1.0" -description = "" -category = "main" -optional = false -python-versions = "^3.8" -develop = false - -[package.dependencies] -nixops = {git = "https://github.com/NixOS/nixops.git"} - -[package.source] -type = "git" -url = "https://github.com/hercules-ci/nixops-hercules-ci.git" -reference = "HEAD" -resolved_reference = "e601d5baffd003fd5f22deeaea0cb96444b054dc" - -[[package]] -name = "nixops-hetzner" -version = "1.0" -description = "NixOS deployment tool, but for hetzner" -category = "main" -optional = false -python-versions = "^3.7" -develop = false - -[package.dependencies] -hetzner = "0.8.3" -nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} -nixos-modules-contrib = {git = "https://github.com/nix-community/nixos-modules-contrib.git", rev = "master"} -typing-extensions = "^3.7.4" - -[package.source] -type = "git" -url = "https://github.com/NixOS/nixops-hetzner" -reference = "HEAD" -resolved_reference = "bc7a68070c7371468bcc8bf6e36baebc6bd2da35" - -[[package]] -name = "nixops-virtd" -version = "1.0" -description = "NixOps plugin for virtd" -category = "main" -optional = false -python-versions = "^3.7" -develop = false - -[package.dependencies] -libvirt-python = "^8.0" -nixops = {git = "https://github.com/NixOS/nixops.git"} - -[package.source] -type = "git" -url = "https://github.com/nix-community/nixops-libvirtd.git" -reference = "HEAD" -resolved_reference = "bc3cf1c5c774a80e05991ca040baa2b23e3ecd51" - -[[package]] -name = "nixopsvbox" -version = "1.7" -description = "NixOps backend for VirtualBox" -category = "main" -optional = false -python-versions = "^3.7" -develop = false - -[package.dependencies] -nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} - -[package.source] -type = "git" -url = "https://github.com/nix-community/nixops-vbox.git" -reference = "HEAD" -resolved_reference = "2729672865ebe2aa973c062a3fbddda8c1359da0" - -[[package]] -name = "nixos-modules-contrib" -version = "0.1.0" -description = "NixOS modules that don't quite belong in NixOS." -category = "main" -optional = false -python-versions = "^3.7" -develop = false - -[package.dependencies] -nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} - -[package.source] -type = "git" -url = "https://github.com/nix-community/nixos-modules-contrib.git" -reference = "master" -resolved_reference = "81a1c2ef424dcf596a97b2e46a58ca73a1dd1ff8" - -[[package]] -name = "pluggy" -version = "1.0.0" -description = "plugin and hook calling mechanisms for python" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.extras] -dev = ["pre-commit", "tox"] -testing = ["pytest", "pytest-benchmark"] - -[[package]] -name = "prettytable" -version = "0.7.2" -description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format." -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "pycparser" -version = "2.21" -description = "C parser in Python" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" - -[[package]] -name = "python-dateutil" -version = "2.8.2" -description = "Extensions to the standard Python datetime module" -category = "main" -optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" - -[package.dependencies] -six = ">=1.5" - -[[package]] -name = "python-digitalocean" -version = "1.17.0" -description = "digitalocean.com API to manage Droplets and Images" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -jsonpickle = "*" -requests = "*" - -[[package]] -name = "requests" -version = "2.28.1" -description = "Python HTTP for Humans." -category = "main" -optional = false -python-versions = ">=3.7, <4" - -[package.dependencies] -certifi = ">=2017.4.17" -charset-normalizer = ">=2,<3" -idna = ">=2.5,<4" -urllib3 = ">=1.21.1,<1.27" - -[package.extras] -socks = ["PySocks (>=1.5.6,!=1.5.7)"] -use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"] - -[[package]] -name = "s3transfer" -version = "0.6.0" -description = "An Amazon S3 Transfer Manager" -category = "main" -optional = false -python-versions = ">= 3.7" - -[package.dependencies] -botocore = ">=1.12.36,<2.0a.0" - -[package.extras] -crt = ["botocore[crt] (>=1.20.29,<2.0a.0)"] - -[[package]] -name = "six" -version = "1.16.0" -description = "Python 2 and 3 compatibility utilities" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" - -[[package]] -name = "typeguard" -version = "2.13.3" -description = "Run-time type checker for Python" -category = "main" -optional = false -python-versions = ">=3.5.3" - -[package.extras] -doc = ["sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"] -test = ["mypy", "pytest", "typing-extensions"] - -[[package]] -name = "typing-extensions" -version = "3.10.0.2" -description = "Backported and Experimental Type Hints for Python 3.5+" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "urllib3" -version = "1.26.12" -description = "HTTP library with thread-safe connection pooling, file post, and more." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4" - -[package.extras] -brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"] -secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"] -socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] - -[metadata] -lock-version = "1.1" -python-versions = "^3.10" -content-hash = "dd5b4dffae860fa56cf6c00bf5aea7a89d7501b2839fdd5e25c5782548092e55" - -[metadata.files] -apache-libcloud = [ - {file = "apache-libcloud-3.6.0.tar.gz", hash = "sha256:4a3b9141033798e4fb07886ff26254e635e022acbdd708375eac6f56e323506c"}, - {file = "apache_libcloud-3.6.0-py2.py3-none-any.whl", hash = "sha256:4aa8cf11caad7090753d6b19af2abfe779847df4296b15a39db3ded15a122478"}, -] -boto = [ - {file = "boto-2.49.0-py2.py3-none-any.whl", hash = "sha256:147758d41ae7240dc989f0039f27da8ca0d53734be0eb869ef16e3adcfa462e8"}, - {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, -] -boto3 = [ - {file = "boto3-1.24.88-py3-none-any.whl", hash = "sha256:6b4cf1cd0be65202c4cf0e4c69099bac3620bcd4049ca25a5e223c668401dd69"}, - {file = "boto3-1.24.88.tar.gz", hash = "sha256:93934343cac76084600a520e5be70c52152364d0c410681c2e25c2290f0e151c"}, -] -botocore = [ - {file = "botocore-1.27.88-py3-none-any.whl", hash = "sha256:de4e087b24cd3bc369eb2e27f8fe94a6499f7dea08c919fba13cefb2496bd2bb"}, - {file = "botocore-1.27.88.tar.gz", hash = "sha256:ded0a4035baf91eb358ef501c92a8512543f5ab7658f459df3077a70a555b5cd"}, -] -certifi = [ - {file = "certifi-2022.9.24-py3-none-any.whl", hash = "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"}, - {file = "certifi-2022.9.24.tar.gz", hash = "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14"}, -] -cffi = [ +files = [ {file = "cffi-1.15.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2"}, {file = "cffi-1.15.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2"}, {file = "cffi-1.15.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914"}, @@ -554,11 +152,33 @@ cffi = [ {file = "cffi-1.15.1-cp39-cp39-win_amd64.whl", hash = "sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c"}, {file = "cffi-1.15.1.tar.gz", hash = "sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9"}, ] -charset-normalizer = [ + +[package.dependencies] +pycparser = "*" + +[[package]] +name = "charset-normalizer" +version = "2.1.1" +description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." +category = "main" +optional = false +python-versions = ">=3.6.0" +files = [ {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"}, {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"}, ] -cryptography = [ + +[package.extras] +unicode-backport = ["unicodedata2"] + +[[package]] +name = "cryptography" +version = "3.4.8" +description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." +category = "main" +optional = false +python-versions = ">=3.6" +files = [ {file = "cryptography-3.4.8-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:a00cf305f07b26c351d8d4e1af84ad7501eca8a342dedf24a7acb0e7b7406e14"}, {file = "cryptography-3.4.8-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:f44d141b8c4ea5eb4dbc9b3ad992d45580c1d22bf5e24363f2fbf50c2d7ae8a7"}, {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0a7dcbcd3f1913f664aca35d47c1331fce738d44ec34b7be8b9d332151b0b01e"}, @@ -579,77 +199,509 @@ cryptography = [ {file = "cryptography-3.4.8-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:cd65b60cfe004790c795cc35f272e41a3df4631e2fb6b35aa7ac6ef2859d554e"}, {file = "cryptography-3.4.8.tar.gz", hash = "sha256:94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c"}, ] -hetzner = [ + +[package.dependencies] +cffi = ">=1.12" + +[package.extras] +docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx_rtd_theme"] +docstest = ["doc8", "pyenchant (>=1.6.11)", "sphinxcontrib-spelling (>=4.0.1)", "twine (>=1.12.0)"] +pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"] +sdist = ["setuptools-rust (>=0.11.4)"] +ssh = ["bcrypt (>=3.1.5)"] +test = ["hypothesis (>=1.11.4,!=3.79.2)", "iso8601", "pretend", "pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pytz"] + +[[package]] +name = "future" +version = "0.18.2" +description = "Clean single-source support for Python 3 and 2" +category = "main" +optional = false +python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" +files = [ + {file = "future-0.18.2.tar.gz", hash = "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"}, +] + +[[package]] +name = "hcloud" +version = "1.18.0" +description = "Official Hetzner Cloud python library" +category = "main" +optional = false +python-versions = ">3.5" +files = [ + {file = "hcloud-1.18.0-py2.py3-none-any.whl", hash = "sha256:4a999b46a9e427df499bba3c70a7ab8da1bd3a95dc8495f7512ac69f8bf8424c"}, + {file = "hcloud-1.18.0.tar.gz", hash = "sha256:a21d940cde8f0c1fd10a0581b0618eb840a6f592404faafdb6070101f4525ff6"}, +] + +[package.dependencies] +future = ">=0.17.1" +python-dateutil = ">=2.7.5" +requests = ">=2.20" + +[package.extras] +docs = ["Sphinx (==1.8.1)", "sphinx-rtd-theme (==0.4.2)"] + +[[package]] +name = "hetzner" +version = "0.8.3" +description = "High level access to the Hetzner robot" +category = "main" +optional = false +python-versions = "*" +files = [ {file = "hetzner-0.8.3.tar.gz", hash = "sha256:9a43dbbeb4a1f3efc86c5fe1c1d7039aaa635dfdb829506ec3aa34382d3a7114"}, ] -idna = [ + +[[package]] +name = "idna" +version = "3.4" +description = "Internationalized Domain Names in Applications (IDNA)" +category = "main" +optional = false +python-versions = ">=3.5" +files = [ {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"}, {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"}, ] -jmespath = [ + +[[package]] +name = "jmespath" +version = "1.0.1" +description = "JSON Matching Expressions" +category = "main" +optional = false +python-versions = ">=3.7" +files = [ {file = "jmespath-1.0.1-py3-none-any.whl", hash = "sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980"}, {file = "jmespath-1.0.1.tar.gz", hash = "sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe"}, ] -jsonpickle = [ - {file = "jsonpickle-2.2.0-py2.py3-none-any.whl", hash = "sha256:de7f2613818aa4f234138ca11243d6359ff83ae528b2185efdd474f62bcf9ae1"}, - {file = "jsonpickle-2.2.0.tar.gz", hash = "sha256:7b272918b0554182e53dc340ddd62d9b7f902fec7e7b05620c04f3ccef479a0e"}, + +[[package]] +name = "jsonpickle" +version = "3.0.1" +description = "Python library for serializing any arbitrary object graph into JSON" +category = "main" +optional = false +python-versions = ">=3.7" +files = [ + {file = "jsonpickle-3.0.1-py2.py3-none-any.whl", hash = "sha256:130d8b293ea0add3845de311aaba55e6d706d0bb17bc123bd2c8baf8a39ac77c"}, + {file = "jsonpickle-3.0.1.tar.gz", hash = "sha256:032538804795e73b94ead410800ac387fdb6de98f8882ac957fcd247e3a85200"}, ] -libvirt-python = [ - {file = "libvirt-python-8.8.0.tar.gz", hash = "sha256:3441dd34c8936393e195a1b046bc2cab1b14d35d66772e8a51fe4d9735ec6349"}, + +[package.extras] +docs = ["jaraco.packaging (>=3.2)", "rst.linker (>=1.9)", "sphinx"] +testing = ["ecdsa", "feedparser", "gmpy2", "numpy", "pandas", "pymongo", "pytest (>=3.5,!=3.7.3)", "pytest-black-multipy", "pytest-checkdocs (>=1.2.3)", "pytest-cov", "pytest-flake8 (>=1.1.1)", "scikit-learn", "sqlalchemy"] +testing-libs = ["simplejson", "ujson"] + +[[package]] +name = "libvirt-python" +version = "8.10.0" +description = "The libvirt virtualization API python binding" +category = "main" +optional = false +python-versions = "*" +files = [ + {file = "libvirt-python-8.10.0.tar.gz", hash = "sha256:fc30f136abe0b8228029a90814c8f44ac2947433c12f211363051c57df2d5401"}, ] -nixops = [] -nixops-aws = [] -nixops-digitalocean = [] -nixops-encrypted-links = [] -nixops-gcp = [] -nixops-hercules-ci = [] -nixops-hetzner = [] -nixops-virtd = [] -nixopsvbox = [] -nixos-modules-contrib = [] -pluggy = [ + +[[package]] +name = "nixops" +version = "2.0.0" +description = "NixOS cloud provisioning and deployment tool" +category = "main" +optional = false +python-versions = "^3.10" +files = [] +develop = false + +[package.dependencies] +pluggy = "^1.0.0" +PrettyTable = "^0.7.2" +typeguard = "^2.7.1" +typing-extensions = "^3.7.4" + +[package.source] +type = "git" +url = "https://github.com/NixOS/nixops.git" +reference = "master" +resolved_reference = "5013072c5ca34247d7dce545c3a7b1954948fd4d" + +[[package]] +name = "nixops-aws" +version = "1.0" +description = "NixOps AWS plugin" +category = "main" +optional = false +python-versions = "^3.7" +files = [] +develop = false + +[package.dependencies] +boto = "^2.49.0" +boto3 = "^1.13.7" +nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} +nixos-modules-contrib = {git = "https://github.com/nix-community/nixos-modules-contrib.git", rev = "master"} +typing-extensions = "^3.7.4" + +[package.source] +type = "git" +url = "https://github.com/NixOS/nixops-aws.git" +reference = "HEAD" +resolved_reference = "d8a6679c413edd1a7075b2fe08017b4c7fa3b3ce" + +[[package]] +name = "nixops-digitalocean" +version = "2.0" +description = "NixOps plugin for Digital Ocean" +category = "main" +optional = false +python-versions = "^3.7" +files = [] +develop = false + +[package.dependencies] +nixops = {git = "https://github.com/NixOS/nixops.git"} +python-digitalocean = "^1.15.0" + +[package.source] +type = "git" +url = "https://github.com/nix-community/nixops-digitalocean.git" +reference = "HEAD" +resolved_reference = "e977b7f11e264a6a2bff2dcbc7b94c6a97b92fff" + +[[package]] +name = "nixops-encrypted-links" +version = "1.0" +description = "Encrypted links support for NixOps" +category = "main" +optional = false +python-versions = "^3.7" +files = [] +develop = false + +[package.dependencies] +nixops = {git = "https://github.com/NixOS/nixops.git"} + +[package.source] +type = "git" +url = "https://github.com/nix-community/nixops-encrypted-links.git" +reference = "HEAD" +resolved_reference = "e2f196fce15fcfb00d18c055e1ac53aec33b8fb1" + +[[package]] +name = "nixops-gcp" +version = "1.0" +description = "NixOps backend for Google Cloud Platform" +category = "main" +optional = false +python-versions = "^3.7" +files = [] +develop = false + +[package.dependencies] +apache-libcloud = "^3.2.0" +cryptography = "^3.1.1" +nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} +nixos-modules-contrib = {git = "https://github.com/nix-community/nixos-modules-contrib.git", rev = "master"} + +[package.source] +type = "git" +url = "https://github.com/nix-community/nixops-gce.git" +reference = "HEAD" +resolved_reference = "712453027486e62e087b9c91e4a8a171eebb6ddd" + +[[package]] +name = "nixops-hercules-ci" +version = "0.1.0" +description = "" +category = "main" +optional = false +python-versions = "^3.8" +files = [] +develop = false + +[package.dependencies] +nixops = {git = "https://github.com/NixOS/nixops.git"} + +[package.source] +type = "git" +url = "https://github.com/hercules-ci/nixops-hercules-ci.git" +reference = "HEAD" +resolved_reference = "e601d5baffd003fd5f22deeaea0cb96444b054dc" + +[[package]] +name = "nixops-hetzner" +version = "1.0" +description = "NixOS deployment tool, but for hetzner" +category = "main" +optional = false +python-versions = "^3.7" +files = [] +develop = false + +[package.dependencies] +hetzner = "0.8.3" +nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} +nixos-modules-contrib = {git = "https://github.com/nix-community/nixos-modules-contrib.git", rev = "master"} +typing-extensions = "^3.7.4" + +[package.source] +type = "git" +url = "https://github.com/NixOS/nixops-hetzner" +reference = "HEAD" +resolved_reference = "bc7a68070c7371468bcc8bf6e36baebc6bd2da35" + +[[package]] +name = "nixops-hetznercloud" +version = "0.1.2" +description = "NixOps Hetzner Cloud plugin" +category = "main" +optional = false +python-versions = "^3.10" +files = [] +develop = false + +[package.dependencies] +hcloud = "1.18.0" +nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} +typing-extensions = "^3.7.4" + +[package.source] +type = "git" +url = "https://github.com/lukebfox/nixops-hetznercloud.git" +reference = "HEAD" +resolved_reference = "c00533400506d40940f7c1f67bf3973db37d9dd9" + +[[package]] +name = "nixops-virtd" +version = "1.0" +description = "NixOps plugin for virtd" +category = "main" +optional = false +python-versions = "^3.7" +files = [] +develop = false + +[package.dependencies] +libvirt-python = "^8.0" +nixops = {git = "https://github.com/NixOS/nixops.git"} + +[package.source] +type = "git" +url = "https://github.com/nix-community/nixops-libvirtd.git" +reference = "HEAD" +resolved_reference = "bc3cf1c5c774a80e05991ca040baa2b23e3ecd51" + +[[package]] +name = "nixopsvbox" +version = "1.7" +description = "NixOps backend for VirtualBox" +category = "main" +optional = false +python-versions = "^3.7" +files = [] +develop = false + +[package.dependencies] +nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} + +[package.source] +type = "git" +url = "https://github.com/nix-community/nixops-vbox.git" +reference = "HEAD" +resolved_reference = "2729672865ebe2aa973c062a3fbddda8c1359da0" + +[[package]] +name = "nixos-modules-contrib" +version = "0.1.0" +description = "NixOS modules that don't quite belong in NixOS." +category = "main" +optional = false +python-versions = "^3.7" +files = [] +develop = false + +[package.dependencies] +nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} + +[package.source] +type = "git" +url = "https://github.com/nix-community/nixos-modules-contrib.git" +reference = "master" +resolved_reference = "81a1c2ef424dcf596a97b2e46a58ca73a1dd1ff8" + +[[package]] +name = "pluggy" +version = "1.0.0" +description = "plugin and hook calling mechanisms for python" +category = "main" +optional = false +python-versions = ">=3.6" +files = [ {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, ] -prettytable = [ + +[package.extras] +dev = ["pre-commit", "tox"] +testing = ["pytest", "pytest-benchmark"] + +[[package]] +name = "prettytable" +version = "0.7.2" +description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format." +category = "main" +optional = false +python-versions = "*" +files = [ {file = "prettytable-0.7.2.tar.bz2", hash = "sha256:853c116513625c738dc3ce1aee148b5b5757a86727e67eff6502c7ca59d43c36"}, {file = "prettytable-0.7.2.tar.gz", hash = "sha256:2d5460dc9db74a32bcc8f9f67de68b2c4f4d2f01fa3bd518764c69156d9cacd9"}, {file = "prettytable-0.7.2.zip", hash = "sha256:a53da3b43d7a5c229b5e3ca2892ef982c46b7923b51e98f0db49956531211c4f"}, ] -pycparser = [ + +[[package]] +name = "pycparser" +version = "2.21" +description = "C parser in Python" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +files = [ {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, ] -python-dateutil = [ + +[[package]] +name = "python-dateutil" +version = "2.8.2" +description = "Extensions to the standard Python datetime module" +category = "main" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" +files = [ {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, ] -python-digitalocean = [ + +[package.dependencies] +six = ">=1.5" + +[[package]] +name = "python-digitalocean" +version = "1.17.0" +description = "digitalocean.com API to manage Droplets and Images" +category = "main" +optional = false +python-versions = "*" +files = [ {file = "python-digitalocean-1.17.0.tar.gz", hash = "sha256:107854fde1aafa21774e8053cf253b04173613c94531f75d5a039ad770562b24"}, {file = "python_digitalocean-1.17.0-py3-none-any.whl", hash = "sha256:0032168e022e85fca314eb3f8dfaabf82087f2ed40839eb28f1eeeeca5afb1fa"}, ] -requests = [ + +[package.dependencies] +jsonpickle = "*" +requests = "*" + +[[package]] +name = "requests" +version = "2.28.1" +description = "Python HTTP for Humans." +category = "main" +optional = false +python-versions = ">=3.7, <4" +files = [ {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"}, {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"}, ] -s3transfer = [ + +[package.dependencies] +certifi = ">=2017.4.17" +charset-normalizer = ">=2,<3" +idna = ">=2.5,<4" +urllib3 = ">=1.21.1,<1.27" + +[package.extras] +socks = ["PySocks (>=1.5.6,!=1.5.7)"] +use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] + +[[package]] +name = "s3transfer" +version = "0.6.0" +description = "An Amazon S3 Transfer Manager" +category = "main" +optional = false +python-versions = ">= 3.7" +files = [ {file = "s3transfer-0.6.0-py3-none-any.whl", hash = "sha256:06176b74f3a15f61f1b4f25a1fc29a4429040b7647133a463da8fa5bd28d5ecd"}, {file = "s3transfer-0.6.0.tar.gz", hash = "sha256:2ed07d3866f523cc561bf4a00fc5535827981b117dd7876f036b0c1aca42c947"}, ] -six = [ + +[package.dependencies] +botocore = ">=1.12.36,<2.0a.0" + +[package.extras] +crt = ["botocore[crt] (>=1.20.29,<2.0a.0)"] + +[[package]] +name = "six" +version = "1.16.0" +description = "Python 2 and 3 compatibility utilities" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" +files = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, ] -typeguard = [ + +[[package]] +name = "typeguard" +version = "2.13.3" +description = "Run-time type checker for Python" +category = "main" +optional = false +python-versions = ">=3.5.3" +files = [ {file = "typeguard-2.13.3-py3-none-any.whl", hash = "sha256:5e3e3be01e887e7eafae5af63d1f36c849aaa94e3a0112097312aabfa16284f1"}, {file = "typeguard-2.13.3.tar.gz", hash = "sha256:00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4"}, ] -typing-extensions = [ + +[package.extras] +doc = ["sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"] +test = ["mypy", "pytest", "typing-extensions"] + +[[package]] +name = "typing-extensions" +version = "3.10.0.2" +description = "Backported and Experimental Type Hints for Python 3.5+" +category = "main" +optional = false +python-versions = "*" +files = [ {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"}, {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, ] -urllib3 = [ - {file = "urllib3-1.26.12-py2.py3-none-any.whl", hash = "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"}, - {file = "urllib3-1.26.12.tar.gz", hash = "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e"}, + +[[package]] +name = "urllib3" +version = "1.26.13" +description = "HTTP library with thread-safe connection pooling, file post, and more." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +files = [ + {file = "urllib3-1.26.13-py2.py3-none-any.whl", hash = "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc"}, + {file = "urllib3-1.26.13.tar.gz", hash = "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"}, ] + +[package.extras] +brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"] +secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"] +socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] + +[metadata] +lock-version = "2.0" +python-versions = "^3.10" +content-hash = "e58721318221aacb55ace3d0df65d71382f20147367dfa1466b59a13bda564b4" diff --git a/pkgs/applications/networking/cluster/nixops/pyproject.toml b/pkgs/applications/networking/cluster/nixops/pyproject.toml index 2f1132a51bc9..31afcfb408c0 100644 --- a/pkgs/applications/networking/cluster/nixops/pyproject.toml +++ b/pkgs/applications/networking/cluster/nixops/pyproject.toml @@ -13,6 +13,7 @@ nixops-encrypted-links = {git = "https://github.com/nix-community/nixops-encrypt nixops-gcp = {git = "https://github.com/nix-community/nixops-gce.git"} nixops-hercules-ci = {git = "https://github.com/hercules-ci/nixops-hercules-ci.git"} nixops-hetzner = {git = "https://github.com/NixOS/nixops-hetzner"} +nixops-hetznercloud = {git = "https://github.com/lukebfox/nixops-hetznercloud.git"} nixopsvbox = {git = "https://github.com/nix-community/nixops-vbox.git"} nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"} diff --git a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix index 6329ff9ed11c..eb185f9743c1 100644 --- a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix +++ b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix @@ -45,7 +45,7 @@ let mv bin/nomad-autoscaler $bin/bin ln -s $bin/bin/nomad-autoscaler $out/bin/nomad-autoscaler - for d in $outputs; do + for d in $(getAllOutputNames); do mkdir -p ''${!d}/share done rmdir $bin/share diff --git a/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix b/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix index 7e08eee1f390..eba9a8375dcc 100644 --- a/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix +++ b/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nomad-driver-podman"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-33hyMKwU04ywXKv4JEhRvEbe2DWQEAQ0moy6zypXdpU="; + sha256 = "sha256-miarvcV+b/6kbjHru7MpBIBU/v9ldHJGeXh2ATQ3BQ0="; }; - vendorSha256 = "sha256-5PQIWSGSR5vizWEsResBLd//yWs99o/bj5DVpRMBwhA="; + vendorSha256 = "sha256-AtgxHAkNzzjMQoSqROpuNoSDum/6JR+mLpcHLFL9EIY="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/nomad/1.2.nix b/pkgs/applications/networking/cluster/nomad/1.2.nix deleted file mode 100644 index c0d0855bc17f..000000000000 --- a/pkgs/applications/networking/cluster/nomad/1.2.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage -, buildGoModule -}: - -callPackage ./generic.nix { - inherit buildGoModule; - version = "1.2.14"; - sha256 = "sha256-BEbRXakMbgE44z1NOGThUuT1FukFUc1cnPkV5PXAY+4="; - vendorSha256 = "sha256-bOJ/qlvY3NHlR9C08vwfVn4Z/bSH15EPs3vvq78JoKs="; -} diff --git a/pkgs/applications/networking/cluster/nomad/1.3.nix b/pkgs/applications/networking/cluster/nomad/1.3.nix deleted file mode 100644 index cc64d677d044..000000000000 --- a/pkgs/applications/networking/cluster/nomad/1.3.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage -, buildGoModule -}: - -callPackage ./generic.nix { - inherit buildGoModule; - version = "1.3.7"; - sha256 = "sha256-hMMR7PdCViZdePXy9aFqTFBxoiuuXqIldXyCGkkr5MA="; - vendorSha256 = "sha256-unw2/E048jzDHj7glXc61UNZIr930UpU9RrXI6DByj4="; -} diff --git a/pkgs/applications/networking/cluster/nomad/1.4.nix b/pkgs/applications/networking/cluster/nomad/1.4.nix deleted file mode 100644 index 5bdf975af92c..000000000000 --- a/pkgs/applications/networking/cluster/nomad/1.4.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage -, buildGoModule -}: - -callPackage ./generic.nix { - inherit buildGoModule; - version = "1.4.2"; - sha256 = "sha256-GGLy/6FgMTSZ701F0QGwcw1EFZSUMyPOlokThOTtdJg="; - vendorSha256 = "sha256-dd8rTGcO4GVMRuABwT4HeucZqYKxrgRUkua/bSPLNH0="; -} diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix new file mode 100644 index 000000000000..faec09480774 --- /dev/null +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildGoModule +, buildGo119Module +, fetchFromGitHub +, nixosTests +}: + +let + generic = + { buildGoModule, version, sha256, vendorSha256, ... }@attrs: + let attrs' = builtins.removeAttrs attrs [ "buildGoModule" "version" "sha256" "vendorSha256" ]; + in + buildGoModule (rec { + pname = "nomad"; + inherit version vendorSha256; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = pname; + rev = "v${version}"; + inherit sha256; + }; + + # 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" ]; + + 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 techknowlogick ]; + }; + } // attrs'); +in +rec { + # Nomad never updates major go versions within a release series and is unsupported + # on Go versions that it did not ship with. Due to historic bugs when compiled + # with different versions we pin Go for all versions. + # Upstream partially documents used Go versions here + # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md + + nomad = nomad_1_4; + + nomad_1_2 = generic { + buildGoModule = buildGo119Module; + version = "1.2.15"; + sha256 = "sha256-p9yRjSapQAhuHv+slUmYI25bUb1N1A7LBiJOdk1++iI="; + vendorSha256 = "sha256-6d3tE337zVAIkzQzAnV2Ya5xwwhuzmKgtPUJcJ9HRto="; + }; + + nomad_1_3 = generic { + buildGoModule = buildGo119Module; + version = "1.3.8"; + sha256 = "sha256-hUmDWgGV8HAXew8SpcbhaiaF9VfBN5mk1W7t5lhnZ9I="; + vendorSha256 = "sha256-IfYobyDFriOldJnNfRK0QVKBfttoZZ1iOkt4cBQxd00="; + }; + + nomad_1_4 = generic { + buildGoModule = buildGo119Module; + version = "1.4.3"; + sha256 = "sha256-GQVfrn9VlzfdIj73W3hBpHcevsXZcb6Uj808HUCZUUg="; + vendorSha256 = "sha256-JQRpsQhq5r/QcgFwtnptmvnjBEhdCFrXFrTKkJioL3A="; + passthru.tests.nomad = nixosTests.nomad; + }; +} diff --git a/pkgs/applications/networking/cluster/nomad/generic.nix b/pkgs/applications/networking/cluster/nomad/generic.nix deleted file mode 100644 index c5d92eaf1f7e..000000000000 --- a/pkgs/applications/networking/cluster/nomad/generic.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, version -, sha256 -, vendorSha256 -, nixosTests -}: - -buildGoModule rec { - pname = "nomad"; - inherit version; - - subPackages = [ "." ]; - - src = fetchFromGitHub { - owner = "hashicorp"; - repo = pname; - rev = "v${version}"; - inherit sha256; - }; - - inherit vendorSha256; - - # 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" ]; - - 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 techknowlogick ]; - }; -} diff --git a/pkgs/applications/networking/cluster/ocm/default.nix b/pkgs/applications/networking/cluster/ocm/default.nix index 46fdeef2ac83..4c4ececb71ef 100644 --- a/pkgs/applications/networking/cluster/ocm/default.nix +++ b/pkgs/applications/networking/cluster/ocm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ocm"; - version = "0.1.64"; + version = "0.1.65"; src = fetchFromGitHub { owner = "openshift-online"; repo = "ocm-cli"; rev = "v${version}"; - sha256 = "sha256-RMXiEXgf8tAdp2d97kaOzXgFCFVkaMhkJF8AHXIEJm8="; + sha256 = "sha256-UzHGVK/HZ5eH8nO4+G92NunOQi9AWnqv4vgcHjtoPDw="; }; - vendorSha256 = "sha256-4m5Ej2Ql9+wGqrzvXQkY8fL2I9tYE6Tm6s9+qcZBHQI="; + vendorSha256 = "sha256-4pqXap1WayqdXuwwLktE71D7x6Ao9MkIKSzIKtVyP84="; # Strip the final binary. ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/odo/default.nix b/pkgs/applications/networking/cluster/odo/default.nix index fb3dd4850506..ba982fd83b0c 100644 --- a/pkgs/applications/networking/cluster/odo/default.nix +++ b/pkgs/applications/networking/cluster/odo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "odo"; - version = "3.2.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "redhat-developer"; repo = "odo"; rev = "v${version}"; - sha256 = "sha256-nevwmw2d8HARRwOy8dPsjtjQj+W3psknphcmebRjrNE="; + sha256 = "sha256-UXeSerVtskEloH60vNom8H6/gEy7adUnBsc/5q7wrDM="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 9933e8056670..705b10753ca4 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,55 +1,52 @@ { lib , buildGoModule , fetchFromGitHub -, libkrb5 -, git +, gpgme , installShellFiles , testers , openshift }: - buildGoModule rec { pname = "openshift"; - version = "4.11.0"; - gitCommit = "20dd77d5"; + version = "4.12.0"; + gitCommit = "854f807"; src = fetchFromGitHub { owner = "openshift"; repo = "oc"; - rev = "20dd77d5c889f86b05e2bdd182853ae702852c63"; - sha256 = "wqLo/CKGzeMDJUoI9PUEjJER5hSPu+FmUCJLPZ9PJuw="; + rev = "854f807d8a84dde710c062a5281bca5bc07cb562"; + hash = "sha256-GH3LjAeMIHmFbJoKGoeeNteP4Ma2+kIC5rAxObdziKg="; }; - vendorSha256 = null; + vendorHash = null; - buildInputs = [ libkrb5 ]; + buildInputs = [ gpgme ]; nativeBuildInputs = [ installShellFiles ]; - patchPhase = '' - patchShebangs ./hack - ''; + ldflags = [ + "-s" + "-w" + "-X github.com/openshift/oc/pkg/version.commitFromGit=${gitCommit}" + "-X github.com/openshift/oc/pkg/version.versionFromGit=v${version}" + ]; - buildPhase = '' - # Openshift build require this variables to be set - # unless there is a .git folder which is not the case with fetchFromGitHub - export SOURCE_GIT_COMMIT=${gitCommit} - export SOURCE_GIT_TAG=v${version} - export SOURCE_GIT_TREE_STATE=clean - - make all - ''; - - installPhase = '' - mkdir -p $out/bin - cp oc $out/bin + doCheck = false; + postInstall = '' + # Install man pages. mkdir -p man - ./genman man oc + $out/bin/genman man oc installManPage man/*.1 - installShellCompletion --bash contrib/completions/bash/* - installShellCompletion --zsh contrib/completions/zsh/* + # Remove unwanted tooling. + rm $out/bin/clicheck $out/bin/gendocs $out/bin/genman + + # Install shell completions. + installShellCompletion --cmd oc \ + --bash <($out/bin/oc completion bash) \ + --fish <($out/bin/oc completion fish) \ + --zsh <($out/bin/oc completion zsh) ''; passthru.tests.version = testers.testVersion { diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index 570481f49b27..ce363080f459 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -1,25 +1,31 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "pachyderm"; - version = "1.8.5"; - rev = "v${version}"; - - goPackagePath = "github.com/pachyderm/pachyderm"; - subPackages = [ "src/server/cmd/pachctl" ]; + version = "2.4.4"; src = fetchFromGitHub { - inherit rev; owner = "pachyderm"; repo = "pachyderm"; - sha256 = "1b9x2xn0sxsjid15lnwr79lps8xzf24i7jfl0i48nabdigmi04wp"; + rev = "v${version}"; + hash = "sha256-53VUZHA+yURikVtcXXa/fZqwAqwjukBKS4NQEBBoHew="; }; + vendorHash = "sha256-k6ODl+whgeeyd8XaOjTDjxfShpOztirjq/Tg98YP8Hs="; + + subPackages = [ "src/server/cmd/pachctl" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/pachyderm/pachyderm/v${lib.versions.major version}/src/version.AppVersion=${version}" + ]; + meta = with lib; { description = "Containerized Data Analytics"; - homepage = "https://github.com/pachyderm/pachyderm"; - license = licenses.asl20; - maintainers = with maintainers; [offline]; + homepage = "https://www.pachyderm.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ offline ]; mainProgram = "pachctl"; }; } diff --git a/pkgs/applications/networking/cluster/pinniped/default.nix b/pkgs/applications/networking/cluster/pinniped/default.nix index 32ce4d74a3d9..10c9c6be689a 100644 --- a/pkgs/applications/networking/cluster/pinniped/default.nix +++ b/pkgs/applications/networking/cluster/pinniped/default.nix @@ -2,18 +2,18 @@ buildGoModule rec{ pname = "pinniped"; - version = "0.20.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "pinniped"; rev = "v${version}"; - sha256 = "sha256-JKZij9f6zlBzbYolxz03R5j95zKELVmEhX+QRTxF/cc="; + sha256 = "sha256-gi6uFJFP3hdHJqH9y7Q8tUGRJECPHxbajU5BJeBcJzo="; }; subPackages = "cmd/pinniped"; - vendorSha256 = "sha256-szv/B7LG/In0j6MT6KCnuUfaCnK7RsJOLeuOtJ/ig9w="; + vendorHash = "sha256-4N8HtBeGeu22Go63dV0WBdbheXylButu+M9vZL7qOcU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index 8fc55abe9282..c9af58b1a8a8 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.11.0"; + version = "5.12.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - sha256 = "sha256-eyJ81i9kTuojBuo/rwfgnl3BRpiTnKst0SnL+oWfSWQ="; + sha256 = "sha256-WE/XWNBy5p8PEQ11s8nmW+HoVEkQB9cKoj5ZS8Suvs8="; }; - vendorSha256 = "sha256-QH/mKq7QydYvUHZIPjoBWy015Sghh30VdEWu76KZdPE="; + vendorHash = "sha256-F5Vh9wPd53bifLStk6wEwidPZvOjN87jn4RxJbSuW4o="; ldflags = [ "-w" "-s" diff --git a/pkgs/applications/networking/cluster/rke/default.nix b/pkgs/applications/networking/cluster/rke/default.nix new file mode 100644 index 000000000000..b19b93e48f19 --- /dev/null +++ b/pkgs/applications/networking/cluster/rke/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "rke"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "rancher"; + repo = pname; + rev = "v${version}"; + hash = "sha256-4aT9SguxN7oaewnrxme1nCFfaQytSJ9Aeb0WEQACtUA="; + }; + + vendorHash = "sha256-zV1lrJhzrUAcEk6jYLCFrHcYw3CZart46qXErCTjZyQ="; + + subPackages = [ "." ]; + + ldflags = [ "-s" "-w" "-X=main.VERSION=v${version}" ]; + + meta = with lib; { + homepage = "https://github.com/rancher/rke"; + description = "An extremely simple, lightning fast Kubernetes distribution that runs entirely within containers"; + changelog = "https://github.com/rancher/rke/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index e2426fc7d56d..877dddfa1e2b 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "3.72.2"; + version = "3.73.1"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-qw45Ifp8JcJyKaKL1St0HAQGS7JiUestiPGyZcV3gx8="; + sha256 = "sha256-A/jEw29c2WbBlPZZACjI3NjM7a0JxCEob8GOoGx13Hs="; }; - vendorSha256 = "sha256-FmpnRgU3w2zthgUJuAG5AqLl2UxMb0yywN5Sk9WoWBI="; + vendorHash = "sha256-YRNOOn/Ei0rHLZrTtQxlBBn48pePDHllnI65Iil160k="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index fa6976d5a3f7..b558a7ff0b54 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 = "551bf68c694927839c3add25a2512f880902ee9b"; +let rev = "bd5465d6b2b2b92b517f4c6074008d22338ff509"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.56.10"; # Do not forget to update `rev` above + version = "0.56.14"; # 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-Hykm8h0kJzTL6XbaBe3vtoghmP4LmvPfBhrTgCmNyRE="; + sha256 = "sha256-YiVCdAdwdK9PcQ6VQQNAjLQq2X54vJmZfbHRjV2d8VQ="; }; - vendorSha256 = "sha256-jBm3t/kvijAv5KOLhDJ1kGLdzpFJiBs/Vtu2mO2lnPM="; + vendorSha256 = "sha256-Fqxkyl9AKZ7H4QSp2V/yztpeXHt57+LjpzzGtOPndX0="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index e30a1214c3ae..3312f957023a 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -12,8 +12,6 @@ , R }: -with lib; - let spark = { pname, version, sha256, extraMeta ? {} }: stdenv.mkDerivation rec { @@ -26,7 +24,7 @@ let nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jdk python3Packages.python ] ++ extraPythonPackages - ++ optional RSupport R; + ++ lib.optional RSupport R; untarDir = "${pname}-${version}"; installPhase = '' @@ -38,12 +36,12 @@ let cat > $out/lib/${untarDir}/conf/spark-env.sh <<- EOF export JAVA_HOME="${jdk}" export SPARK_HOME="$out/lib/${untarDir}" - '' + optionalString hadoopSupport '' + '' + lib.optionalString hadoopSupport '' export SPARK_DIST_CLASSPATH=$(${hadoop}/bin/hadoop classpath) '' + '' export PYSPARK_PYTHON="${python3Packages.python}/bin/${python3Packages.python.executable}" export PYTHONPATH="\$PYTHONPATH:$PYTHONPATH" - ${optionalString RSupport '' + ${lib.optionalString RSupport '' export SPARKR_R_SHELL="${R}/bin/R" export PATH="\$PATH:${R}/bin"''} EOF @@ -64,10 +62,10 @@ let meta = { description = "Apache Spark is a fast and general engine for large-scale data processing"; homepage = "https://spark.apache.org/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = lib.platforms.all; - maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ]; + maintainers = with lib.maintainers; [ thoughtpolice offline kamilchm illustris ]; } // extraMeta; }; in diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix index 86b48633c253..baf85847875c 100644 --- a/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -3,6 +3,7 @@ , buildGoPackage , makeWrapper , fetchFromGitHub +, fetchpatch , coreutils , nettools , dmidecode @@ -47,6 +48,12 @@ buildGoPackage rec { # They used constants from another package that I couldn't figure # out how to resolve, so hardcoded the constants. ./0002-version-gen-don-t-use-unnecessary-constants.patch + + (fetchpatch { + name = "CVE-2022-29527.patch"; + url = "https://github.com/aws/amazon-ssm-agent/commit/0fe8ae99b2ff25649c7b86d3bc05fc037400aca7.patch"; + sha256 = "sha256-5g14CxhsHLIgs1Vkfw8FCKEJ4AebNqZKf3ZzoAN/T9U="; + }) ]; preConfigure = '' diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index e20a5ebd1af4..3b25ecaa3101 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.15.10"; + version = "0.15.11"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SuOfRLCEASgiLsy0xeuA1z55+vSMb4VGZuk+OVLSWJA="; + sha256 = "sha256-HgMGwumLL0z3l1/UEoJleoKsErFvznddFc9mJuco9fA="; # 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; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-uTDeYzq8XyjHHXfPQzN/ipHfqsPweedKhQQ8CkvqKIM="; + vendorSha256 = "sha256-WThZpum6sEYyDkwGKo3onMLy6hpmMJ/o6+5olX5nEjk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 19184ac15ae8..7459bba1697b 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.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-+V0mRSjAwhZoiIS/OpZyqa5rvlqU9pGJwmW0QZ3H2g4="; + sha256 = "sha256-xO4I4fNf14ltiSnFnAhM8VYBw4JKB0RSQziSshZOFBo="; }; - vendorSha256 = "sha256-IPHu23/2e6406FELB1Mwegp0C16cFD65mbW5Ah32D4Q="; + vendorSha256 = "sha256-tNx1BvZBblyLavFslhqj9DCyfcgbl6HxlZ7zceK1a0w="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index f5129e6d9a5d..0d0d0ab08498 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.2.6"; + version = "1.3.3"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - sha256 = "sha256-KvwW5VJ5HDXDxaPssmVnqBWmk3Y1qbu9PcZsd+CLeXE="; + hash = "sha256-tkgWrNew0dLBPQ2G96RdFoFDyPm4nOwgkkH/3DpBnRg="; }; - vendorSha256 = "sha256-i+SUDFOffh4Ky2kawIb3M6M2Han25yYQbWI0wFjZwtU="; + vendorHash = "sha256-mFuXRMIzEf4bx9jnQlFwFBpBDVXQ99jz2OGojp1EEh0="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 010527121e57..29727e0a697d 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.23.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-exPFlcbku51Bs/YISRyjl8iwLYRVS9ltRQPpd/QpnWk="; + sha256 = "sha256-RZLmbf9ginMbFAaUKL5mK5HIYQslP8Vu8zdh1OJ1P1Y="; }; - vendorSha256 = "sha256-eo4B2p5Yo1r5jro49mSetp9AFYhcTXbyy7wGuaFwbb0="; + vendorHash = "sha256-g9e0NesI7WdaTHZ57XRlo8as3IWAFlFW4nkyf6+kd40="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 0362095bce69..1bc55b3db4ff 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.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-zLPZueKdUNauIzqXOV773SZ/RWg7UuMNeJHr7z6ZJ+E="; + sha256 = "sha256-8OW0n6aS7bDDbzbrMfJLL8Yvq3vJg47qHQB4zY0xxAw="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index abaff42f3a32..f806a1d35ae8 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal-cli"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "tctl"; rev = "v${version}"; - sha256 = "sha256-rdDtgSM2wZsHYv9tBNdcSHYXdvvEk5wqdLr1KjoPz1E="; + hash = "sha256-QID0VtARbJiTIQm2JeaejQ5VpJsAIHfZtws7i2UN8dM="; }; - vendorSha256 = "sha256-9bgovXVj+qddfDSI4DTaNYH4H8Uc4DZqeVYG5TWXTNw="; + vendorHash = "sha256-9bgovXVj+qddfDSI4DTaNYH4H8Uc4DZqeVYG5TWXTNw="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/temporalite/default.nix b/pkgs/applications/networking/cluster/temporalite/default.nix index 8a4d53797f5b..a842a896285a 100644 --- a/pkgs/applications/networking/cluster/temporalite/default.nix +++ b/pkgs/applications/networking/cluster/temporalite/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "temporalite"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "temporalio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rLEkWg5LNVb7i/2IARKGuP9ugaVJA9pwYbKLm0QLmOc="; + sha256 = "sha256-IEB9AFEt8U2zXYfbChfL/UH1rNSLPnfS396/cPE8UdE="; }; - vendorSha256 = "sha256-vjuwh/HRRYfB6J49rfJxif12nYPnbBodWF9hTiGygS8="; + vendorSha256 = "sha256-w86/XCMRGBmXM+oQ5+0qiX0fdwiKXvsmEkApuRLUOiA="; subPackages = [ "cmd/temporalite" ]; diff --git a/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/pkgs/applications/networking/cluster/terraform-compliance/default.nix index e60c4f14e306..c10b43e1f8b8 100644 --- a/pkgs/applications/networking/cluster/terraform-compliance/default.nix +++ b/pkgs/applications/networking/cluster/terraform-compliance/default.nix @@ -1,47 +1,31 @@ { lib -, GitPython -, buildPythonApplication -, emoji , fetchFromGitHub -, filetype -, ipython -, junit-xml -, lxml -, mock -, netaddr -, pytestCheckHook -, radish-bdd -, semver +, python3 }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "terraform-compliance"; - version = "1.2.11"; + version = "1.3.34"; + format = "setuptools"; - # No tests in Pypi package src = fetchFromGitHub { - owner = "eerkunt"; - repo = pname; - rev = version; - sha256 = "161mszmxqp3wypnda48ama2mmq8yjilkxahwc1mxjwzy1n19sn7v"; + owner = "terraform-compliance"; + repo = "cli"; + rev = "refs/tags/${version}"; + sha256 = "sha256-1TFLpBwkpMMdiJJfVvDXlJg4SXWQ8VV605wMFGU+InQ="; }; postPatch = '' substituteInPlace setup.py \ - --replace "IPython==7.16.1" "IPython" + --replace "IPython==7.16.1" "IPython" \ + --replace "diskcache==5.1.0" "diskcache>=5.1.0" ''; - checkInputs = [ pytestCheckHook ]; - - disabledTests = [ - "test_which_success" - "test_readable_plan_file_is_not_json" - ]; - - propagatedBuildInputs = [ - GitPython + propagatedBuildInputs = with python3.pkgs; [ + diskcache emoji filetype + gitpython ipython junit-xml lxml @@ -51,9 +35,23 @@ buildPythonApplication rec { semver ]; + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + disabledTests = [ + "test_which_success" + "test_readable_plan_file_is_not_json" + ]; + + pythonImportsCheck = [ + "terraform_compliance" + ]; + meta = with lib; { description = "BDD test framework for terraform"; - homepage = "https://github.com/eerkunt/terraform-compliance"; + homepage = "https://github.com/terraform-compliance/cli"; + changelog = "https://github.com/terraform-compliance/cli/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 9f9471627cf6..07e5b7e3787b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -17,17 +17,21 @@ let ({ owner , repo , rev - , version + , spdx ? "UNSET" + , version ? lib.removePrefix "v" rev , hash ? throw "use hash instead of sha256" # added 2202/09 , vendorHash ? throw "use vendorHash instead of vendorSha256" # added 2202/09 , deleteVendor ? false , proxyVendor ? false , mkProviderFetcher ? fetchFromGitHub , mkProviderGoModule ? buildGoModule - # Looks like "registry.terraform.io/vancluever/acme" - , provider-source-address + # "https://registry.terraform.io/providers/vancluever/acme" + , homepage ? "" + # "registry.terraform.io/vancluever/acme" + , provider-source-address ? lib.replaceStrings [ "https://registry" ".io/providers" ] [ "registry" ".io" ] homepage , ... }@attrs: + assert lib.stringLength provider-source-address > 0; mkProviderGoModule { pname = repo; inherit vendorHash version deleteVendor proxyVendor; @@ -42,6 +46,11 @@ let inherit owner repo rev hash; }; + meta = { + inherit homepage; + license = lib.getLicenseFromSpdxId spdx; + }; + # Move the provider to libexec postInstall = '' dir=$out/libexec/terraform-providers/${provider-source-address}/${version}/''${GOOS}_''${GOARCH} @@ -52,6 +61,7 @@ let # Keep the attributes around for later consumption passthru = attrs // { + inherit provider-source-address; updateScript = writeShellScript "update" '' provider="$(basename ${provider-source-address})" ./pkgs/applications/networking/cluster/terraform-providers/update-provider "$provider" @@ -67,9 +77,8 @@ let # These are the providers that don't fall in line with the default model special-providers = { - netlify = automated-providers.netlify.overrideAttrs (_: { meta.broken = stdenv.isDarwin; }); - pass = automated-providers.pass.overrideAttrs (_: { meta.broken = stdenv.isDarwin; }); - tencentcloud = automated-providers.tencentcloud.overrideAttrs (_: { meta.broken = stdenv.isDarwin; }); + # github api seems to be broken, doesn't just fail to recognize the license, it's ignored entirely. + checkly = automated-providers.checkly.override { spdx = "MIT"; }; gitlab = automated-providers.gitlab.override { mkProviderFetcher = fetchFromGitLab; owner = "gitlab-org"; }; # mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; }); @@ -79,17 +88,21 @@ let removed-providers = let archived = name: date: throw "the ${name} terraform provider has been archived by upstream on ${date}"; + license = name: date: throw "the ${name} terraform provider removed from nixpkgs on ${date} because of unclear licensing"; removed = name: date: throw "the ${name} terraform provider removed from nixpkgs on ${date}"; in lib.optionalAttrs config.allowAliases { b2 = removed "b2" "2022/06"; checkpoint = removed "checkpoint" "2022/11"; dome9 = removed "dome9" "2022/08"; + logicmonitor = license "logicmonitor" "2022/11"; ncloud = removed "ncloud" "2022/08"; + nsxt = license "nsxt" "2022/11"; opc = archived "opc" "2022/05"; oraclepaas = archived "oraclepaas" "2022/05"; panos = removed "panos" "2022/05"; template = archived "template" "2022/05"; + vercel = license "vercel" "2022/11"; }; # excluding aliases, used by terraform-full diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index bfc5e828cb27..c4e95f811896 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,1287 +1,1258 @@ { "aci": { - "deleteVendor": true, - "hash": "sha256-Y2cNp2BuPEH5wAEwaMVSBgKoHrcy6d4eOlsGPqAxmoU=", + "hash": "sha256-rgPqf8PopvzXiIOjng7DNOv920MPI81EVMUu3DaS8o4=", + "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", - "provider-source-address": "registry.terraform.io/CiscoDevNet/aci", - "proxyVendor": true, "repo": "terraform-provider-aci", - "rev": "v2.5.2", - "vendorHash": "sha256-AB+uj4hQIYMVQHhw1cISB2TotNO8rw1iU0/gP096CoE=", - "version": "2.5.2" + "rev": "v2.6.1", + "spdx": "MPL-2.0", + "vendorHash": null }, "acme": { - "hash": "sha256-H+1/Au/jCxNxrV+kk6tylUF85taZcs44uWed1QH1aRo=", + "hash": "sha256-fK34A45plTqtOYGbq8CAtFnyMYOvdOKFycY7X5ZlRRY=", + "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", - "provider-source-address": "registry.terraform.io/vancluever/acme", "proxyVendor": true, "repo": "terraform-provider-acme", - "rev": "v2.11.1", - "vendorHash": "sha256-QGZKoxiSiT78gk2vc8uE6k1LAi/S1o5W9TZN7T/1XfA=", - "version": "2.11.1" + "rev": "v2.12.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-L8d2Y4gSmqqmg24lULWrdKSI+194rRTVZyxJAEL+gqM=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", + "homepage": "https://registry.terraform.io/providers/clementblaise/age", "owner": "clementblaise", - "provider-source-address": "registry.terraform.io/clementblaise/age", "repo": "terraform-provider-age", "rev": "v0.1.1", - "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=", - "version": "0.1.1" + "spdx": "MPL-2.0", + "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-2QdpXNCnnYh75CyqeKJbYgFB63TCcMrWlUPLe/puvOw=", + "hash": "sha256-8kTT1tD88UZc/ZbunFDF+SlTYM5E3jyQgaBcRBULYlY=", + "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", - "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v3.8.1", - "vendorHash": "sha256-pFRCT0fgWOucw3jNqvSas7pl9KHayJorFmgOKGmL1jI=", - "version": "3.8.1" + "rev": "v3.11.0", + "spdx": "MIT", + "vendorHash": "sha256-pCWrJPW39J2SE1U1nQ61XI8/WtB+hqQGu9wKkRNkS1k=" }, "akamai": { - "hash": "sha256-QbCDaDII+xEA3lXjODsz8jai2mg3N/3uC4fruiLqvWc=", + "hash": "sha256-xX1SitZZoAznP4atUSrqAC8+dxKRlQ2nnZh6ropzuak=", + "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", - "provider-source-address": "registry.terraform.io/akamai/akamai", "repo": "terraform-provider-akamai", - "rev": "v3.0.0", - "vendorHash": "sha256-LYoRZIr2+NqxwZYaN1HFTSaCl0wJPVr2Wf0OjdqM5YM=", - "version": "3.0.0" + "rev": "v3.3.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-xIxQxgfOv+/i0gyRtpZaCm22rsK/4ajFNKQpGP5uy0Y=" }, "alicloud": { - "hash": "sha256-rscu2gCvf/8MJBx1coUmne+8DO8b6RFyfMAwhTUPU+w=", + "hash": "sha256-sG241dMkFL9YllVGuQ7KlZ8Ta3hz9v8VdyOOcjOKie0=", + "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", - "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.192.0", - "vendorHash": null, - "version": "1.192.0" + "rev": "v1.197.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "ansible": { "hash": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=", + "homepage": "https://registry.terraform.io/providers/nbering/ansible", "owner": "nbering", - "provider-source-address": "registry.terraform.io/nbering/ansible", "repo": "terraform-provider-ansible", "rev": "v1.0.4", - "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=", - "version": "1.0.4" + "spdx": "MPL-2.0", + "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "archive": { - "hash": "sha256-EzqsTJwjDQ6pIQxdGPOTbNom0RDurAGT0eJmuwAzO4Y=", + "hash": "sha256-GHHhIfBFlc5LlwsDLvpVhlJd5Fp4X2tU26h9PYjgz4Y=", + "homepage": "https://registry.terraform.io/providers/hashicorp/archive", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/archive", "repo": "terraform-provider-archive", - "rev": "v2.2.0", - "vendorHash": null, - "version": "2.2.0" + "rev": "v2.3.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-DqAHkNxfI1txtW9PadHzgWuRCiuV/CVqq/qba+e0O7M=" }, "argocd": { - "hash": "sha256-yWhq2WolfL7PQVuWr5P7EH0cM78wGyL2+yezh2WzL2c=", + "hash": "sha256-FDI/kmgTWVhxJcy3ss8VABntOXJAIDIcz4cB6WtJd2Y=", + "homepage": "https://registry.terraform.io/providers/oboukili/argocd", "owner": "oboukili", - "provider-source-address": "registry.terraform.io/oboukili/argocd", "repo": "terraform-provider-argocd", - "rev": "v4.1.0", - "vendorHash": "sha256-hPgZ/2AebjtovopbSEJqsm0J85LdlLWBtP15vaqgLF4=", - "version": "4.1.0" + "rev": "v4.3.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-99PwwxVHfRGC0QCQGhifRzqWFOHZ1R7Ge2ou7OjiggQ=" }, "auth0": { - "hash": "sha256-l41GOH5J0ZF+Vp/Vabhm30ZLG6/XJrI7QeCdl2WvNso=", + "hash": "sha256-3iB/Vcv6Vzs9teulhu0npl6IuIJRsKy8FkBcIPTKw8A=", + "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", - "provider-source-address": "registry.terraform.io/auth0/auth0", "repo": "terraform-provider-auth0", - "rev": "v0.40.0", - "vendorHash": "sha256-0BE+NZe4DgAU0lNuwsHiGogMJKhM2fy9CriMtKzmJcI=", - "version": "0.40.0" + "rev": "v0.43.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-pRbhgukYRn0Ej0v/ANKZ3gtkmfL8qo1E6F/fKDNf/Iw=" }, "avi": { - "hash": "sha256-0FcdVd7EGVHZ0iRonoGfjwYgXpJtUhqX5i925Ejhv54=", + "hash": "sha256-mBLdIL4mUI4zA3c9gB4DL1QY0xHW15Q1rO/v1gVYKYU=", + "homepage": "https://registry.terraform.io/providers/vmware/avi", "owner": "vmware", - "provider-source-address": "registry.terraform.io/vmware/avi", "proxyVendor": true, "repo": "terraform-provider-avi", - "rev": "v22.1.2", - "vendorHash": "sha256-yDkox74g0N8iniWHSNk6KjfM0HJa8H2HUxm6RxrdhkE=", - "version": "22.1.2" + "rev": "v22.1.3", + "spdx": "MPL-2.0", + "vendorHash": "sha256-0k1BYRQWp4iU9DRwPbluOg3S5VzL981PpFrgiQaYWNw=" }, "aviatrix": { - "hash": "sha256-1zHaSdDcGynLhgLMDRbRgRzt0IvQI25TDZrYzZwwQ34=", + "hash": "sha256-jZXTsCa1TDwdOFGJKX4xM3sB0zfix5nTBuBdBGtwOOs=", + "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", - "provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix", "repo": "terraform-provider-aviatrix", - "rev": "v2.24.1", - "vendorHash": null, - "version": "2.24.1" + "rev": "v3.0.1", + "spdx": "MPL-2.0", + "vendorHash": null }, "aws": { - "hash": "sha256-xI+hH6al6zOYzgmpoOjKNy5QgVVFhnqiGm9OIUWevSk=", + "hash": "sha256-CdG7StgMUr6FjC4YJKIfQlWqjvgnvzyGh8zKQ+DUJzU=", + "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.40.0", - "vendorHash": "sha256-OScGmmFaGq7JD9+GmX3c9t/s4BqplMt7UNa2RXq5HKE=", - "version": "4.40.0" + "rev": "v4.53.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-rnOrA3QYLZAU+VCm6OVLrnJ37Vcp6xzq0N8ohjWDl3Q=" }, "azuread": { - "hash": "sha256-mjll5ANx063JLSbqohPOhor3GNeI1MUKgUKQ/f5XFk8=", + "hash": "sha256-Byr6AJ1kP6fBxBCD8vLxQD5tz8fI3Z1fcCa0rXS9rhs=", + "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.30.0", - "vendorHash": null, - "version": "2.30.0" + "rev": "v2.33.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "azurerm": { - "hash": "sha256-zLNlT2CK2Rbvpxftsi6WlMQoHn8S11l/5ySIKsfQ8no=", + "hash": "sha256-eZwQsvIXYwpx/uLJKmYnNaOFWBue1ADeyhVbvl3fAy0=", + "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.32.0", - "vendorHash": null, - "version": "3.32.0" + "rev": "v3.42.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "azurestack": { "hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=", + "homepage": "https://registry.terraform.io/providers/hashicorp/azurestack", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/azurestack", "repo": "terraform-provider-azurestack", "rev": "v1.0.0", - "vendorHash": null, - "version": "1.0.0" + "spdx": "MPL-2.0", + "vendorHash": null }, "baiducloud": { - "deleteVendor": true, - "hash": "sha256-0L/T12jeSkdZDJknVu5JffyaniZ1RVWgMpPu3qKNmWU=", + "hash": "sha256-CYU8PI/gMVC9lMiQaPd/M1SKjvZ6vaj5iBfLDTieZR4=", + "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", - "provider-source-address": "registry.terraform.io/baidubce/baiducloud", "repo": "terraform-provider-baiducloud", - "rev": "v1.18.2", - "vendorHash": "sha256-ya2FpsLQMIu8zWYObpyPgBHVkHoNKzHgdMxukbtsje4=", - "version": "1.18.2" + "rev": "v1.19.4", + "spdx": "MPL-2.0", + "vendorHash": null }, "bigip": { - "hash": "sha256-erJeg7KF3QUi85ueOQTrab2woIC1nkMXRIj/pFm0DGY=", + "hash": "sha256-nlk3ckrLNtPQ9s8uQ2jvARinPVF+A2T0IUY2rBcUFDk=", + "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", - "provider-source-address": "registry.terraform.io/F5Networks/bigip", "repo": "terraform-provider-bigip", - "rev": "v1.16.0", - "vendorHash": null, - "version": "1.16.0" + "rev": "v1.16.2", + "spdx": "MPL-2.0", + "vendorHash": null }, "bitbucket": { - "hash": "sha256-eU8vA2fxtdsObgh2dTExGLzzBnfSc2DSGdFHrLXR3SA=", + "hash": "sha256-4uwMg2DXd7T4WqdfwcZHtsPMTTCqrwSngh01DYW5yko=", + "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", - "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket", "repo": "terraform-provider-bitbucket", - "rev": "v2.22.0", - "vendorHash": "sha256-Qkla3OEcyiMn6eqBj+4LB8JwpIwceLAASI1qvOcUBD0=", - "version": "2.22.0" + "rev": "v2.30.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-foMmZbNPLww1MN4UZwuynBDgt2w40aMqVINRw//Q0d0=" }, "brightbox": { - "hash": "sha256-l4gN7gxLMTuUMjf50Hc2Els5pJ4BId1QlRAhykseK7c=", + "hash": "sha256-ISK6cpE4DVrVzjC0N5BdyR3Z5LfF9qfg/ACTgDP+WqY=", + "homepage": "https://registry.terraform.io/providers/brightbox/brightbox", "owner": "brightbox", - "provider-source-address": "registry.terraform.io/brightbox/brightbox", "repo": "terraform-provider-brightbox", - "rev": "v3.0.5", - "vendorHash": "sha256-ZT+SOHn/8aoZLXUau9toc3NtQNaXfttM0agIw8T28tk=", - "version": "3.0.5" + "rev": "v3.2.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-IiP1LvAX8fknB56gJoI75kGGkRIIoSfpmPkoTxujVDU=" }, "buildkite": { "hash": "sha256-BpQpMAecpknI8b1q6XuZPty8I/AUTAwQWm5Y28XJ+G4=", + "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", - "provider-source-address": "registry.terraform.io/buildkite/buildkite", "proxyVendor": true, "repo": "terraform-provider-buildkite", "rev": "v0.11.0", - "vendorHash": "sha256-j56iEtoyKzB8oIMptJDbXCKXOC1L5v1+cpwWU1+uARE=", - "version": "0.11.0" + "spdx": "MIT", + "vendorHash": "sha256-j56iEtoyKzB8oIMptJDbXCKXOC1L5v1+cpwWU1+uARE=" }, "checkly": { "hash": "sha256-OKLmcy0egQ9z/eBsdXzGiswByWQ9fiOq4N7ndTW2nso=", + "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", - "provider-source-address": "registry.terraform.io/checkly/checkly", "repo": "terraform-provider-checkly", "rev": "v1.6.3", - "vendorHash": "sha256-63M0cOD5QodGMFK0GrxaJsvVFVHXDS5HdgTv4sOmaBA=", - "version": "1.6.3" + "spdx": null, + "vendorHash": "sha256-63M0cOD5QodGMFK0GrxaJsvVFVHXDS5HdgTv4sOmaBA=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", + "homepage": "https://registry.terraform.io/providers/CiscoDevNet/ciscoasa", "owner": "CiscoDevNet", - "provider-source-address": "registry.terraform.io/CiscoDevNet/ciscoasa", "repo": "terraform-provider-ciscoasa", "rev": "v1.3.0", - "vendorHash": null, - "version": "1.3.0" + "spdx": "MPL-2.0", + "vendorHash": null }, "cloudamqp": { - "hash": "sha256-EtFGqYNfyDbS4f1tjRTKcrQNFqEZmmILeuEOpwkx6/4=", + "hash": "sha256-xua8ZJjc+y6bzF/I2N752Cv22XAXvOjrH9Du1TdipM0=", + "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", - "provider-source-address": "registry.terraform.io/cloudamqp/cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.20.0", - "vendorHash": "sha256-fDYkeUOW9wuypAJR1YFEQp8KhtTfMr8NZeT7TMYXEmU=", - "version": "1.20.0" + "rev": "v1.23.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-PALZGyGZ6Ggccl4V9gG+gsEdNipYG+DCaZkqF0W1IMQ=" }, "cloudflare": { - "hash": "sha256-a0zJ1n4nKHEyjqJeey5MxPhqJU8Bq9a+hqLOCEdTfEE=", + "hash": "sha256-Y48H7P69ORr8U0yXf1HEBqh//oOmWn3Uj8GQ12PsV/M=", + "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", - "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.28.0", - "vendorHash": "sha256-Jvaud6rkaNMZZ/L/pb8JKGaAYw1MieGq7aU4Abe2VJA=", - "version": "3.28.0" + "rev": "v3.33.1", + "spdx": "MPL-2.0", + "vendorHash": "sha256-3JH+4ExREL3vtq6CiQN0G0x08ScrzOf2pTAnsWcGgq8=" }, "cloudfoundry": { - "hash": "sha256-VfGB0NkT36oYT5F1fh1N/2rlZdfhk+K76AXNh0NkO50=", + "hash": "sha256-/Zxj9cous0SjYxeDo+8/u61pqDwMGt/UsS/OC1oSR2U=", + "homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry", "owner": "cloudfoundry-community", - "provider-source-address": "registry.terraform.io/cloudfoundry-community/cloudfoundry", "repo": "terraform-provider-cloudfoundry", - "rev": "v0.15.5", - "vendorHash": "sha256-dj0XBy3dvpn9aEt+Xab6ZelvXZmt2+BX6qytdsMbIXo=", - "version": "0.15.5" + "rev": "v0.50.4", + "spdx": "MPL-2.0", + "vendorHash": "sha256-mEWhLh4E3SI7xfmal1sJ5PdAYbYJrW/YFoBjTW9w4bA=" }, "cloudinit": { "hash": "sha256-P4m2ym7p10gwHR9CdPT37OvrgkvOKLG5wxVyYD4UZXs=", + "homepage": "https://registry.terraform.io/providers/hashicorp/cloudinit", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/cloudinit", "repo": "terraform-provider-cloudinit", "rev": "v2.2.0", - "vendorHash": null, - "version": "2.2.0" + "spdx": "MPL-2.0", + "vendorHash": null }, "cloudscale": { - "hash": "sha256-Eo7zT/KiJdzo7fhAcCg6EV29ENM/XSBumAHmL9J8agU=", + "hash": "sha256-DQ7yIqA9gII0Ub1C8DEa1AMhQbzRFvsng8TMBGz+qzg=", + "homepage": "https://registry.terraform.io/providers/cloudscale-ch/cloudscale", "owner": "cloudscale-ch", - "provider-source-address": "registry.terraform.io/cloudscale-ch/cloudscale", "repo": "terraform-provider-cloudscale", - "rev": "v4.0.0", - "vendorHash": null, - "version": "4.0.0" + "rev": "v4.1.0", + "spdx": "MIT", + "vendorHash": null }, "constellix": { "deleteVendor": true, "hash": "sha256-ecwXWYrs7XJM1web+kia2ccpvTjxAVFPzav6lLal4e4=", + "homepage": "https://registry.terraform.io/providers/Constellix/constellix", "owner": "Constellix", - "provider-source-address": "registry.terraform.io/Constellix/constellix", "repo": "terraform-provider-constellix", "rev": "v0.4.5", - "vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=", - "version": "0.4.5" + "spdx": "MPL-2.0", + "vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=" }, "consul": { - "hash": "sha256-DS27LGhXDYVr+c0wIZe5PjssK8l8Aq4zzh3I+G4WCU8=", + "hash": "sha256-UaTvFxwbLf9krUdsslFP6MXzpacnj/AKXiyUe7iSRCs=", + "homepage": "https://registry.terraform.io/providers/hashicorp/consul", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/consul", "repo": "terraform-provider-consul", - "rev": "v2.16.2", - "vendorHash": "sha256-9fTmD3VFU12htHeYk64CM23g8ihT2+02DmzTXfZF2Rw=", - "version": "2.16.2" + "rev": "v2.17.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-v1RHxXYTvpyWzyph6qg3GW75OPYc5qYQ/yyDI8WkbNc=" }, "ct": { "hash": "sha256-poEyXP6VfKYKuTCxQxkiWBuc7/1S2J7RolrrPb6nvUI=", + "homepage": "https://registry.terraform.io/providers/poseidon/ct", "owner": "poseidon", - "provider-source-address": "registry.terraform.io/poseidon/ct", "repo": "terraform-provider-ct", "rev": "v0.11.0", - "vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM=", - "version": "0.11.0" + "spdx": "Apache-2.0", + "vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM=" }, "datadog": { - "hash": "sha256-QKUmbCyB9Xlr+wfEGiCR+xn8xz81FJ77pY90AzMc/Bw=", + "hash": "sha256-LZYpKwcNvkmpYfhCuZhxfid42IBhRmzfiHZVYu3XAlA=", + "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", - "provider-source-address": "registry.terraform.io/DataDog/datadog", "repo": "terraform-provider-datadog", - "rev": "v3.18.0", - "vendorHash": "sha256-t3A7ACNbIZ/i5fDhIMDWnKlswT1IHwULejzkfqT5mxQ=", - "version": "3.18.0" + "rev": "v3.20.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-IrSQEu3IDFKM9t+3pkygyrrq8KRI8E0BqTui2TR5nFM=" }, "dhall": { "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", + "homepage": "https://registry.terraform.io/providers/awakesecurity/dhall", "owner": "awakesecurity", - "provider-source-address": "registry.terraform.io/awakesecurity/dhall", "repo": "terraform-provider-dhall", "rev": "v0.0.3", - "vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=", - "version": "0.0.3" + "spdx": "BSD-3-Clause", + "vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=" }, "digitalocean": { - "hash": "sha256-JCqYTBgwcyppZ/xKPRE/SrTI0nDWw5QYqrld8YL+Blw=", + "hash": "sha256-ZTt/lfHWD9G/SbZ7mLKPjJAsva5bgRqvvX8Lh1Ci+ts=", + "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", - "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.24.0", - "vendorHash": null, - "version": "2.24.0" + "rev": "v2.26.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "dme": { "hash": "sha256-QNkr+6lKlKY+os0Pf6dqlmIn9u2LtMOo6ONahDeA9mE=", + "homepage": "https://registry.terraform.io/providers/DNSMadeEasy/dme", "owner": "DNSMadeEasy", - "provider-source-address": "registry.terraform.io/DNSMadeEasy/dme", "repo": "terraform-provider-dme", "rev": "v1.0.6", - "vendorHash": null, - "version": "1.0.6" + "spdx": "MPL-2.0", + "vendorHash": null }, "dns": { "hash": "sha256-aH9sDqlXSq2dJi0kzGreJZ5V8A0WU0UqTpxWPKn23rM=", + "homepage": "https://registry.terraform.io/providers/hashicorp/dns", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/dns", "repo": "terraform-provider-dns", "rev": "v3.2.3", - "vendorHash": "sha256-AefmrO8Zb7ICH+qGxYW9ele6kNtrAusOf+KE/iZxKLY=", - "version": "3.2.3" + "spdx": "MPL-2.0", + "vendorHash": "sha256-AefmrO8Zb7ICH+qGxYW9ele6kNtrAusOf+KE/iZxKLY=" }, "dnsimple": { - "hash": "sha256-dge7slNS1EkWwjt3+WS8tlKjFHw6LV/q1Bxrl1RflBw=", + "hash": "sha256-P1mvxRbOSmQknQxFPEyAkpK5eZQq286oceRFbrgYYqg=", + "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", - "provider-source-address": "registry.terraform.io/dnsimple/dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v0.14.1", - "vendorHash": "sha256-z0vos/tZDUClK/s2yrXZG2RU8QgA8IM6bJj6jSdCnBk=", - "version": "0.14.1" + "rev": "v0.15.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-z0vos/tZDUClK/s2yrXZG2RU8QgA8IM6bJj6jSdCnBk=" }, "docker": { - "hash": "sha256-/vz4rjENlVl9gqtxfqCV+k2SgsHZBcmA9Mz10Y2ay/E=", + "hash": "sha256-M2K4N39vtVDA/vMp/s2KYiS/uoE+STf2e6yh6q0CS28=", + "homepage": "https://registry.terraform.io/providers/kreuzwerker/docker", "owner": "kreuzwerker", - "provider-source-address": "registry.terraform.io/kreuzwerker/docker", "repo": "terraform-provider-docker", - "rev": "v2.23.0", - "vendorHash": "sha256-0JRJAwc4LbPXi6GJdrIGwuIaCzaP5MtIMuijYoOEjYA=", - "version": "2.23.0" + "rev": "v3.0.1", + "spdx": "MPL-2.0", + "vendorHash": "sha256-OdZQb81d7N1TdbDWEImq2U3kLkCPdhRk38+8T8fu+F4=" }, "elasticsearch": { - "hash": "sha256-+cktPArBOysc4V+uR3KWsVlxtxSIbuVMCmPSU21xF/U=", + "hash": "sha256-a6kHN3w0sQCP+0+ZtFwcg9erfVBYkhNo+yOrnwweGWo=", + "homepage": "https://registry.terraform.io/providers/phillbaker/elasticsearch", "owner": "phillbaker", - "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", "repo": "terraform-provider-elasticsearch", - "rev": "v2.0.6", - "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=", - "version": "2.0.6" + "rev": "v2.0.7", + "spdx": "MPL-2.0", + "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-gvI9awkKiWWnw6O/KvskFTHZfvajGfgYu8DGsT34Siw=", + "hash": "sha256-hU0mqMuB3yvLWJ6ggDvATQeSFdpsEfs/hmvLV6A2Md4=", + "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", - "provider-source-address": "registry.terraform.io/equinix/equinix", + "proxyVendor": true, "repo": "terraform-provider-equinix", - "rev": "v1.10.0", - "vendorHash": "sha256-ZGPSNz/6qwEU5EY72fIJ1x9bnsN9OZQ6MQ+XNotMGgA=", - "version": "1.10.0" + "rev": "v1.11.1", + "spdx": "MIT", + "vendorHash": "sha256-NLvw606QxUwCDViLbR5LjoWGZnk48/zG0NownEATYKM=" }, "exoscale": { - "hash": "sha256-pJ9bbI7y6iOzJ8qPIw8SUOj8yLotRig6cmDsvLfc+6U=", + "hash": "sha256-48msmXj7SFmi5TA0/QYm66oIETymWi5ayF+yExyp+hk=", + "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", - "provider-source-address": "registry.terraform.io/exoscale/exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.41.1", - "vendorHash": null, - "version": "0.41.1" + "rev": "v0.44.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "external": { "hash": "sha256-o9vCr3ayqg9Ehi39FgR6vJFZYF1iTcVD4QfYHcs+YbQ=", + "homepage": "https://registry.terraform.io/providers/hashicorp/external", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/external", "repo": "terraform-provider-external", "rev": "v2.2.3", - "vendorHash": "sha256-0t+2ixMSsgDK9zzst3s0YWdnS6p7jO0stHnaKio5lvY=", - "version": "2.2.3" + "spdx": "MPL-2.0", + "vendorHash": "sha256-0t+2ixMSsgDK9zzst3s0YWdnS6p7jO0stHnaKio5lvY=" }, "fastly": { - "hash": "sha256-Zcev9EegZ/LVRGcjn1rHbp+jdZ5x4OowCD23E/MEYQA=", + "hash": "sha256-SaihRh+DuMY9Mcx+PBAUPv0vrWeKGqx437ayLT3kdjI=", + "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", - "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v3.0.0", - "vendorHash": null, - "version": "3.0.0" + "rev": "v3.0.4", + "spdx": "MPL-2.0", + "vendorHash": null }, "flexibleengine": { - "hash": "sha256-yg3o7jsWGJ7/fJmDDbFnCpDmKRu0oEbe9wYoILbVwq8=", + "hash": "sha256-uT8BmACMMJKVPAhL/7rudCXG9AOb4kS1Lswr5ZxY6M4=", + "homepage": "https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine", "owner": "FlexibleEngineCloud", - "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine", "repo": "terraform-provider-flexibleengine", - "rev": "v1.34.0", - "vendorHash": "sha256-m0Bv/w0TZASE3n7wEyCmHRHEpjc3snP5Bxyx+2A5dQQ=", - "version": "1.34.0" + "rev": "v1.36.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-obBN7Q/gKbvERJIUVz+GgPjn7/OKjXCiFI6WuOd0hic=" }, "fortios": { "deleteVendor": true, "hash": "sha256-nvK5mbQdCB6lmdyhJbMS15eOER8eIAYv26mc1FCifXs=", + "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios", "owner": "fortinetdev", - "provider-source-address": "registry.terraform.io/fortinetdev/fortios", "proxyVendor": true, "repo": "terraform-provider-fortios", "rev": "v1.16.0", - "vendorHash": "sha256-ZgVA2+2tu17dnAc51Aw3k6v8k7QosNTmFjFhmeknxa8=", - "version": "1.16.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-ZgVA2+2tu17dnAc51Aw3k6v8k7QosNTmFjFhmeknxa8=" }, "gandi": { - "hash": "sha256-uXZcYiNsBf5XsMjOjjQeNtGwLhTgYES1E9t63fBEI6Q=", + "hash": "sha256-mQ4L2XCudyPGDw21jihF7nkSct7/KWAe/txnbtuJ8Lk=", + "homepage": "https://registry.terraform.io/providers/go-gandi/gandi", "owner": "go-gandi", - "provider-source-address": "registry.terraform.io/go-gandi/gandi", "repo": "terraform-provider-gandi", - "rev": "v2.2.0", - "vendorHash": "sha256-cStVmI58V46I3MYYYrbCY3llnOx2pyuM2Ku+rhe5DVQ=", - "version": "2.2.0" + "rev": "v2.2.2", + "spdx": "MPL-2.0", + "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-3ivfHKoj7jXQ3WsoTNSCL1zD93Pr0pjtZ9LneW9My4o=", + "hash": "sha256-QobAIpDDl5SXG9hmpdq8lDm8Sg5w2oK4A+e8WKw52Cc=", + "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", - "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v5.9.0", - "vendorHash": null, - "version": "5.9.0" + "rev": "v5.17.0", + "spdx": "MIT", + "vendorHash": null }, "gitlab": { - "hash": "sha256-1Ljf9kwpj96mzu/uHqitYCKIixNn/sZL21zOM8xQsU4=", + "hash": "sha256-bCF6BLuzjUZToZKerfsGcav4DD6AWwOrlELxQKygHv4=", + "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", - "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.19.0", - "vendorHash": "sha256-e9J4g5ZuiKcI/WSXMFY3Qglgt87qbXv7tDpxYbRRuaU=", - "version": "3.19.0" + "rev": "v15.8.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE=" }, "google": { - "hash": "sha256-qOB4UV53j0Bm0332U1YETzLfyBtGwfXs2hGDAL2BCCk=", + "hash": "sha256-yxw+LtrBhfZlTVh36o3uUdt3zGo7VLTjk5Cc8xoqhio=", + "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.43.1", - "vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=", - "version": "4.43.1" + "rev": "v4.51.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, "google-beta": { - "hash": "sha256-nNz9BgTJ8Aj3QZNpT0XK14s44+thDu4EfLvbEB8OFRc=", + "hash": "sha256-KQxIi9EF59FTcWoiE5oTZx+lVV+Pb+PH0QIz02PztN4=", + "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.43.1", - "vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=", - "version": "4.43.1" + "rev": "v4.51.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", + "homepage": "https://registry.terraform.io/providers/hashicorp/googleworkspace", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/googleworkspace", "repo": "terraform-provider-googleworkspace", "rev": "v0.7.0", - "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=", - "version": "0.7.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-HeUPa0xMQx5n1Wnv58v8Wi6VWbIWmfVwyO5badxi7Qo=", + "hash": "sha256-K1Pal5Fn6KxIlmcnOW6SNPdOzT9JExwhVRFDVTbaTug=", + "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", - "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.30.0", - "vendorHash": "sha256-Mc8BkC7ZhTmmWYKAMR+aQ9lBr7IFll7vAIWFbZc/Rqw=", - "version": "1.30.0" + "rev": "v1.34.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-fTc0cNo/ZWUo2tORzDKSDjFsXYIMz+a2+Zsx4fzd3ic=" }, "gridscale": { - "hash": "sha256-k87g+MwzKl++VfKerzRllHsKN8Y8AyEFm1yWV5xrgwI=", + "hash": "sha256-ahYCrjrJPEItGyqbHYtgkIH/RzMyxBQkebSAyd8gwYo=", + "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", - "provider-source-address": "registry.terraform.io/gridscale/gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.16.2", - "vendorHash": null, - "version": "1.16.2" + "rev": "v1.17.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "hcloud": { - "hash": "sha256-d/qLN5ev8ywiJr97rrlS9rwfvsEheBD2n8I6D9a7krQ=", + "hash": "sha256-ebkd9YbbK2nHjgpKkXgmusbaaDYk2bdtqpsu6dw0HDs=", + "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", - "provider-source-address": "registry.terraform.io/hetznercloud/hcloud", "repo": "terraform-provider-hcloud", - "rev": "v1.36.0", - "vendorHash": "sha256-HsWkHoFs/77b5+6HSV7YgLOwpE2BZyxbGNty8p+OBSM=", - "version": "1.36.0" + "rev": "v1.36.2", + "spdx": "MPL-2.0", + "vendorHash": "sha256-/dsiIxgW4BxSpRtnD77NqtkxEEAXH1Aj5hDCRSdiDYg=" }, "helm": { - "hash": "sha256-s8ZOzTG3qux+4Yh1wj3ArjB1uJ32bdGhxY9iSL5LOK8=", + "hash": "sha256-MSBCn4AriAWys2FIYJIGamcaLGx0gtO5IiB/WxcN2rg=", + "homepage": "https://registry.terraform.io/providers/hashicorp/helm", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/helm", "repo": "terraform-provider-helm", - "rev": "v2.7.1", - "vendorHash": null, - "version": "2.7.1" + "rev": "v2.8.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "heroku": { - "hash": "sha256-NabwjOTbBRlDNFBpCshxZMO9E958tfAIPPuyArvacFI=", + "hash": "sha256-UGA01N4ToEb3eSKCI2raI3ZXFeRm0MVVXVWgAc7im9g=", + "homepage": "https://registry.terraform.io/providers/heroku/heroku", "owner": "heroku", - "provider-source-address": "registry.terraform.io/heroku/heroku", "repo": "terraform-provider-heroku", - "rev": "v5.1.6", - "vendorHash": null, - "version": "5.1.6" + "rev": "v5.1.10", + "spdx": "MPL-2.0", + "vendorHash": null }, "hetznerdns": { "hash": "sha256-wmXZ6+5Ex3G2JUdw2is2VIo/X1X0V1Auw5KmYpGllug=", + "homepage": "https://registry.terraform.io/providers/timohirt/hetznerdns", "owner": "timohirt", - "provider-source-address": "registry.terraform.io/timohirt/hetznerdns", "repo": "terraform-provider-hetznerdns", "rev": "v2.2.0", - "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=", - "version": "2.2.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=" }, "htpasswd": { "hash": "sha256-3Az8iNoau+2KGkdDjR+QAfuEcEhKfRmZFb5f4kaFyoU=", + "homepage": "https://registry.terraform.io/providers/loafoe/htpasswd", "owner": "loafoe", - "provider-source-address": "registry.terraform.io/loafoe/htpasswd", "proxyVendor": true, "repo": "terraform-provider-htpasswd", "rev": "v1.0.4", - "vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA=", - "version": "1.0.4" + "spdx": "MIT", + "vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA=" }, "http": { "hash": "sha256-cxAii7doJ9mv1LQWjoPqMgOuu0COIL91llhsm/2MOms=", + "homepage": "https://registry.terraform.io/providers/hashicorp/http", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/http", "repo": "terraform-provider-http", "rev": "v3.2.1", - "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=", - "version": "3.2.1" + "spdx": "MPL-2.0", + "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=" }, "huaweicloud": { - "hash": "sha256-cr7xV7Z4UU+kRykVSOKeuXDiHQPL4CsCJVXf2uTZOms=", + "hash": "sha256-8H9DgpZukJ6K78H6YITPgWai8lPPb8O1tITRTl/azHw=", + "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", - "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.42.0", - "vendorHash": null, - "version": "1.42.0" + "rev": "v1.44.1", + "spdx": "MPL-2.0", + "vendorHash": null }, "huaweicloudstack": { "hash": "sha256-WSJDp+LFjVPquQVMgib/YZV35kktLH2vMCIZJWqakXs=", + "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloudstack", "owner": "huaweicloud", - "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloudstack", "repo": "terraform-provider-huaweicloudstack", "rev": "v1.3.0", - "vendorHash": null, - "version": "1.3.0" + "spdx": "MPL-2.0", + "vendorHash": null }, "hydra": { "hash": "sha256-A9BemEPLhvYzhksvYRfmhQXY3EEdTxQcmjE9+2+BKqg=", + "homepage": "https://registry.terraform.io/providers/DeterminateSystems/hydra", "owner": "DeterminateSystems", - "provider-source-address": "registry.terraform.io/DeterminateSystems/hydra", "repo": "terraform-provider-hydra", "rev": "v0.1.2", - "vendorHash": null, - "version": "0.1.2" + "spdx": "MPL-2.0", + "vendorHash": null }, "ibm": { - "hash": "sha256-VFJ86dMKOHzfq5W154+kmX9poRFjT+LlLRl3HNA52pc=", + "hash": "sha256-Qdb5HpamjCNGlqSf3etFv0++Skrk/jm6UVBFsKGU+jw=", + "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", - "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.47.1", - "vendorHash": "sha256-9UIM6T6ceF6WXIbjhSuDv1lNn9rphcZoePPk11X2Olo=", - "version": "1.47.1" + "rev": "v1.50.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-JkmfZ9yz3r26j1SHIwnyNA+nYWAy4DoaWEMfFUTzD3Y=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", + "homepage": "https://registry.terraform.io/providers/Icinga/icinga2", "owner": "Icinga", - "provider-source-address": "registry.terraform.io/Icinga/icinga2", "repo": "terraform-provider-icinga2", "rev": "v0.5.0", - "vendorHash": null, - "version": "0.5.0" + "spdx": "MPL-2.0", + "vendorHash": null }, "infoblox": { - "hash": "sha256-VquTyQxbVFPImZCwthwf8hJPlUxAxhmed/r1V+qm/ak=", + "hash": "sha256-bLZK2lZqnpiE5vsJAAiGw4BrBzVWGyg5VZq/Ngr8VlA=", + "homepage": "https://registry.terraform.io/providers/infobloxopen/infoblox", "owner": "infobloxopen", - "provider-source-address": "registry.terraform.io/infobloxopen/infoblox", "repo": "terraform-provider-infoblox", - "rev": "v2.1.0", - "vendorHash": null, - "version": "2.1.0" + "rev": "v2.2.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "kafka": { - "hash": "sha256-bKbY2cOIORy3D9yCBqVuKUZb650sx+87d4wtUB3dPdg=", + "hash": "sha256-p8KT6K9fcd0OFy+NoZyZzQxG13fIiyMJg2yNPKIWH60=", + "homepage": "https://registry.terraform.io/providers/Mongey/kafka", "owner": "Mongey", - "provider-source-address": "registry.terraform.io/Mongey/kafka", "repo": "terraform-provider-kafka", - "rev": "v0.5.1", - "vendorHash": "sha256-03QV6C2DEN5xwMwABwSvv5Ts6pTHQDBP2zUUqIcOtVQ=", - "version": "0.5.1" + "rev": "v0.5.2", + "spdx": "MIT", + "vendorHash": "sha256-RzC8j+Toub7kiOKW6IppjwyJ0vGEJ0YHb8YXrWFkZW4=" }, "kafka-connect": { "hash": "sha256-PiSVfzNPEXAgONb/eaVAN4yPudn5glcHL0BLqE5PWsw=", + "homepage": "https://registry.terraform.io/providers/Mongey/kafka-connect", "owner": "Mongey", - "provider-source-address": "registry.terraform.io/Mongey/kafka-connect", "repo": "terraform-provider-kafka-connect", "rev": "v0.3.0", - "vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y=", - "version": "0.3.0" + "spdx": "MIT", + "vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y=" }, "keycloak": { - "hash": "sha256-1yV3w3hhZf113XMxvpRvr3ADaRcuCl7BCIa5SIZPcCs=", + "hash": "sha256-DW80CkmeQKJ4tEBrLsdks+mXweL8K1pVu3yQKGAvZOs=", + "homepage": "https://registry.terraform.io/providers/mrparkers/keycloak", "owner": "mrparkers", - "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", - "rev": "v4.0.1", - "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8=", - "version": "4.0.1" + "rev": "v4.1.0", + "spdx": "MIT", + "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8=" }, "ksyun": { - "hash": "sha256-Rye7gKARdbrB6KDEygEJy9m7VqlGw6QeE2F1oa3n8as=", + "hash": "sha256-HtZ+uEbI+UFO51rj9P8rKWNjRZaX6QhIZ1c9TO1USvI=", + "homepage": "https://registry.terraform.io/providers/kingsoftcloud/ksyun", "owner": "kingsoftcloud", - "provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun", "repo": "terraform-provider-ksyun", - "rev": "v1.3.58", - "vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ=", - "version": "1.3.58" + "rev": "v1.3.62", + "spdx": "MPL-2.0", + "vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ=" }, "kubectl": { "hash": "sha256-UkUwWi7Z9cSMyZakD6JxMl+qdczAYfZQgwroCUjFIUM=", + "homepage": "https://registry.terraform.io/providers/gavinbunney/kubectl", "owner": "gavinbunney", - "provider-source-address": "registry.terraform.io/gavinbunney/kubectl", "repo": "terraform-provider-kubectl", "rev": "v1.14.0", - "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=", - "version": "1.14.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-hWFC8VBbM3BRGrX1Y45Znd/W3klYy/7aS7JbbKN7EUg=", + "hash": "sha256-mjxFKCUmXg9CPz/ZZWPr1F8DSUadNroEEwvJgwHYk5s=", + "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.16.0", - "vendorHash": null, - "version": "2.16.0" + "rev": "v2.17.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "launchdarkly": { "hash": "sha256-AsFtlCIGvlG8c+PilhMhaMowaea/g1+IXYzEiIIbZ44=", + "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", - "provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly", "repo": "terraform-provider-launchdarkly", "rev": "v2.9.4", - "vendorHash": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=", - "version": "2.9.4" + "spdx": "MPL-2.0", + "vendorHash": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=" }, "libvirt": { - "hash": "sha256-j5EcxmkCyHwbXzvJ9lfQBRBYa3SbrKc3kbt1KZTm0gY=", + "hash": "sha256-VO9fbRLz7mDYT8WORodnN4l3II2j+TdpV8cZ9M+NjTM=", + "homepage": "https://registry.terraform.io/providers/dmacvicar/libvirt", "owner": "dmacvicar", - "provider-source-address": "registry.terraform.io/dmacvicar/libvirt", "repo": "terraform-provider-libvirt", - "rev": "v0.7.0", - "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=", - "version": "0.7.0" + "rev": "v0.7.1", + "spdx": "Apache-2.0", + "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, "linode": { - "hash": "sha256-bwVHrgcxc2W5Lx1aheqkdgwfrFfk4YAhD5bqvHdcxtI=", + "hash": "sha256-uebz6flGALcmRpBYjEEj+X2YFDkTjuaGLdGGD1jY+ns=", + "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", - "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.29.4", - "vendorHash": "sha256-D7WZ2Ep/W8aCCFOVgsveJKAIg/j5l9fEnnXLMobICnc=", - "version": "1.29.4" + "rev": "v1.30.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-DbhHBmFuuyoWtGqZjXKFMpSP3Xlt5GVEhSvUyWerKtM=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", + "homepage": "https://registry.terraform.io/providers/numtide/linuxbox", "owner": "numtide", - "provider-source-address": "registry.terraform.io/numtide/linuxbox", "repo": "terraform-provider-linuxbox", "rev": "v0.4.3", - "vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw=", - "version": "0.4.3" + "spdx": "BSD-3-Clause", + "vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw=" }, "local": { - "hash": "sha256-l9XQpIMMar7ForZuBcGOmqrRuSnthIrilr4CHJ5SiaU=", + "hash": "sha256-7P6p23lQ/2Ko/RKETVe7oSZUDwKeGdznUSvbxPWds+Y=", + "homepage": "https://registry.terraform.io/providers/hashicorp/local", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/local", "repo": "terraform-provider-local", - "rev": "v2.2.3", - "vendorHash": "sha256-5rqn9/NE7Q0VI6SRd2VFKJl4npz9Y0Qp1pEpfj9KxrQ=", - "version": "2.2.3" - }, - "logicmonitor": { - "hash": "sha256-GQPTFf+JxJB3iO1Us0zOAAG2NonuJ/b5la6f1j2Nd4k=", - "owner": "logicmonitor", - "provider-source-address": "registry.terraform.io/logicmonitor/logicmonitor", - "repo": "terraform-provider-logicmonitor", - "rev": "v2.0.3", - "vendorHash": null, - "version": "2.0.3" + "rev": "v2.3.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-NXSquRqBaENxWX+ZukDJie/EU+wdEQSxvZQEZqjL+ug=" }, "lxd": { - "hash": "sha256-DfRhPRclg/hCmmp0V087hl66WSFbEyXHFUGeehlU290=", + "hash": "sha256-2YqziG5HZbD/Io/vKYZFZK1PFYVYHOjzHah7s3xEtR0=", + "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", - "provider-source-address": "registry.terraform.io/terraform-lxd/lxd", - "proxyVendor": true, "repo": "terraform-provider-lxd", - "rev": "v1.8.0", - "vendorHash": "sha256-omaslX89hMAdIppBfILsGO6133Q3UgihgiJcy/Gn83M=", - "version": "1.8.0" + "rev": "v1.9.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-CLr28g/uI9ZU4xIcA76v/BX6gJV91elvFIlYFoSxkfw=" }, "mailgun": { - "hash": "sha256-Yi258SIFSdD+JSi5oX74bhBFYYGYQfSAyYD07eO8MmM=", + "hash": "sha256-r1E2Y5JRu77T29ebUNTXUEypnrsfYYbBhvpKZGt5T9w=", + "homepage": "https://registry.terraform.io/providers/wgebis/mailgun", "owner": "wgebis", - "provider-source-address": "registry.terraform.io/wgebis/mailgun", "repo": "terraform-provider-mailgun", - "rev": "v0.7.2", - "vendorHash": "sha256-g1PEjNV/RE2q7olGQsdM6AbXcXP2UROHC/SwEMPDk8c=", - "version": "0.7.2" + "rev": "v0.7.4", + "spdx": "MPL-2.0", + "vendorHash": "sha256-yUXxq8NTOv8ZmWp0WiIID2cRU6AZiItIs99uGZpt9dc=" }, "matchbox": { "hash": "sha256-vWhdStfwReeD1PHTihBoj4GoKnP85nzNzIV/Tjfcz1M=", + "homepage": "https://registry.terraform.io/providers/poseidon/matchbox", "owner": "poseidon", - "provider-source-address": "registry.terraform.io/poseidon/matchbox", "repo": "terraform-provider-matchbox", "rev": "v0.5.2", - "vendorHash": "sha256-coARdDQVs38dVdUH/fsoGVlwh3wYr3aTxKp/FpUzhis=", - "version": "0.5.2" + "spdx": "Apache-2.0", + "vendorHash": "sha256-coARdDQVs38dVdUH/fsoGVlwh3wYr3aTxKp/FpUzhis=" }, "metal": { "hash": "sha256-1HTSDVMk2VhoYRLInrBK3bDuYU0SwyhBV1p5A2tlU/I=", + "homepage": "https://registry.terraform.io/providers/equinix/metal", "owner": "equinix", - "provider-source-address": "registry.terraform.io/equinix/metal", "repo": "terraform-provider-metal", "rev": "v3.3.0", - "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=", - "version": "3.3.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "minio": { - "hash": "sha256-mtguRBSa+XrpUqEXb9voDHraae9fOaayX1nQpaeAlo4=", + "hash": "sha256-dfbmjl5gqffSE1sg5QEwzzbMXoL4bEKSFxU1bEdSMPs=", + "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", - "provider-source-address": "registry.terraform.io/aminueza/minio", "repo": "terraform-provider-minio", - "rev": "v1.9.1", - "vendorHash": "sha256-VxISNcWEnBAa+8WsmqxcT+DPF74X8rLlvdSNJtx0++I=", - "version": "1.9.1" + "rev": "v1.11.0", + "spdx": "Apache-2.0", + "vendorHash": "sha256-M2MlZNS4o1/GhQYiI72JVuhgfbNwa5ERFJjhB3nTpmE=" }, "mongodbatlas": { - "hash": "sha256-rHT/x3Wpd7b4u7v1/g6DY85TwRkf5A7KaOiqoWeN05Y=", + "hash": "sha256-OR9bvtg3DoJ4hFP/iqzQ1cFwWZYrUrzykN6sycd0Z6o=", + "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", - "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.6.0", - "vendorHash": "sha256-dFlDUJGVTWQwXXGaWeG07kKyXcWWzuyqYlPm11yaCqI=", - "version": "1.6.0" + "rev": "v1.8.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-cvTIFjKYrIohRjUTxGOxgla2t/elj3Aw79kbVdaQbrY=" }, "namecheap": { "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=", + "homepage": "https://registry.terraform.io/providers/namecheap/namecheap", "owner": "namecheap", - "provider-source-address": "registry.terraform.io/namecheap/namecheap", "repo": "terraform-provider-namecheap", "rev": "v2.1.0", - "vendorHash": null, - "version": "2.1.0" + "spdx": "Apache-2.0", + "vendorHash": null }, "netlify": { "hash": "sha256-7U+hHN/6GqcbI1gX7L01YqVjlUgvdfhgpXvLF2lwbkA=", + "homepage": "https://registry.terraform.io/providers/AegirHealth/netlify", "owner": "AegirHealth", - "provider-source-address": "registry.terraform.io/AegirHealth/netlify", "repo": "terraform-provider-netlify", "rev": "v0.6.12", - "vendorHash": null, - "version": "0.6.12" + "spdx": "MPL-2.0", + "vendorHash": null }, "newrelic": { - "hash": "sha256-d5JRqxMmG7fku8+C8e700nfghz2wbL0n1TrOZb1hkpY=", + "hash": "sha256-lWjXsIeYpe07+kIHr8qS8SmChs0tnfzxWy/K1KNJ5oo=", + "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", - "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.7.1", - "vendorHash": "sha256-gKPopfkEx1YRxcsO8W2+2EqKJfYbJ/pJgpydc1YScDA=", - "version": "3.7.1" + "rev": "v3.13.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-Ptjd4A/P2pZL5wP8IGHN385jngfS56w7FN1g/EpknRw=" }, "nomad": { "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=", + "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/nomad", "repo": "terraform-provider-nomad", "rev": "v1.4.19", - "vendorHash": "sha256-3t8pUAwuVeZN5cYGs72YsdRvJunudSmKSldFWEFVA/4=", - "version": "1.4.19" + "spdx": "MPL-2.0", + "vendorHash": "sha256-3t8pUAwuVeZN5cYGs72YsdRvJunudSmKSldFWEFVA/4=" }, "ns1": { - "hash": "sha256-qHR3KJa1y10B+iQPgH6lTt/JUqTmiK/60rPCa3gQDP8=", + "hash": "sha256-2w9x/FTtieWB88CIEkP7BH5saC6dt4IxdROBucczios=", + "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", - "provider-source-address": "registry.terraform.io/ns1-terraform/ns1", "repo": "terraform-provider-ns1", - "rev": "v1.13.0", - "vendorHash": "sha256-6ePPxdULuTzLdVzzr12BjLu/lBN+5yIUq8U8FVUw/PM=", - "version": "1.13.0" - }, - "nsxt": { - "hash": "sha256-TOoRtCKdR1fBjk39dbMgBd7pDJGfjvkQAqfpJzWRwRg=", - "owner": "vmware", - "provider-source-address": "registry.terraform.io/vmware/nsxt", - "repo": "terraform-provider-nsxt", - "rev": "v3.2.9", - "vendorHash": null, - "version": "3.2.9" + "rev": "v1.13.4", + "spdx": "MPL-2.0", + "vendorHash": "sha256-/Rgerbd8c6Owo79LrYsR9O0JNBrDOODFD+k1Yd5G6cY=" }, "null": { "hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=", + "homepage": "https://registry.terraform.io/providers/hashicorp/null", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/null", "repo": "terraform-provider-null", "rev": "v3.2.1", - "vendorHash": "sha256-vXyE0/tXzFHJPNq8MZ+NZItDWS3K7ZhtY23hGjtqRh8=", - "version": "3.2.1" + "spdx": "MPL-2.0", + "vendorHash": "sha256-vXyE0/tXzFHJPNq8MZ+NZItDWS3K7ZhtY23hGjtqRh8=" }, "nutanix": { "deleteVendor": true, "hash": "sha256-UOny3UfrSrw/h9U9r1qlro4we03lOnUcZBL/bPwDESE=", + "homepage": "https://registry.terraform.io/providers/nutanix/nutanix", "owner": "nutanix", - "provider-source-address": "registry.terraform.io/nutanix/nutanix", "repo": "terraform-provider-nutanix", "rev": "v1.7.1", - "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=", - "version": "1.7.1" + "spdx": "MPL-2.0", + "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-t8GrhKnKredpbRmx/MAA4tx0kV0yZoFNnacKsp0Htro=", + "hash": "sha256-L8y00f+57hndpVevliJ2kNqpGeNR2Jv/FHbqkAUIRMI=", + "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", - "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.100.0", - "vendorHash": null, - "version": "4.100.0" + "rev": "v4.105.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "okta": { - "hash": "sha256-COGXHUjXYGB2QDY0iBG+MvNcxGy87vpGIerQU2XXEmw=", + "hash": "sha256-wKs5XRyyCda6pljtuo8ukAQl5ZZxeDSyt0CQWe8eXqY=", + "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", - "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.38.0", - "vendorHash": "sha256-iGQ3JPJ78Qhj+izR8D4H5oWGq4fF5lXuNHQCmpr7zFE=", - "version": "3.38.0" + "rev": "v3.41.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-KWSHVI51YHHF3HXpyd1WB5Za721ak+cFhwDIfvC/ax4=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", + "homepage": "https://registry.terraform.io/providers/oktadeveloper/oktaasa", "owner": "oktadeveloper", - "provider-source-address": "registry.terraform.io/oktadeveloper/oktaasa", "repo": "terraform-provider-oktaasa", "rev": "v1.0.1", - "vendorHash": null, - "version": "1.0.1" + "spdx": "MPL-2.0", + "vendorHash": null }, "opennebula": { - "hash": "sha256-jm7k0k28TSfnUA6P2RjSfF36o/nznvDWcDmJz/MAMXU=", + "hash": "sha256-r8z5rpSvjNSDuvcRLtnOUFnBFFNAlcvfCbmW6LLHP5E=", + "homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula", "owner": "OpenNebula", - "provider-source-address": "registry.terraform.io/OpenNebula/opennebula", "repo": "terraform-provider-opennebula", - "rev": "v1.0.2", - "vendorHash": "sha256-tkb+P+eTid5dgCw6bErr7i0F+E8UCt/HyFA2e3y0XT0=", - "version": "1.0.2" + "rev": "v1.1.1", + "spdx": "MPL-2.0", + "vendorHash": "sha256-zKtBDnvlQHe+q0OZUMUGu1gNsx2wIrIoArtJrt0VaBk=" }, "openstack": { "hash": "sha256-k5UyK9jmjZzHw8AwmDRtyCyJgILAcCK+nN+hklJ9VFw=", + "homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack", "owner": "terraform-provider-openstack", - "provider-source-address": "registry.terraform.io/terraform-provider-openstack/openstack", "repo": "terraform-provider-openstack", "rev": "v1.49.0", - "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=", - "version": "1.49.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=" }, "opentelekomcloud": { - "hash": "sha256-bDhtGpS8dqQdjcLqtJwae9dmUO41l4DeTRYMARBpnrM=", + "hash": "sha256-D2RPpG1RE+bM7rVvmItczpRExMXK0RaKfJsnifvXRTs=", + "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", - "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.31.8", - "vendorHash": "sha256-TnsdOX0Tt0oYavBI2fPcO+OV8VkWQEgGasqDTm5XkDU=", - "version": "1.31.8" + "rev": "v1.32.3", + "spdx": "MPL-2.0", + "vendorHash": "sha256-49ViIxICpvWgpv+uY0NTDvXGJthjH6aT38COfS+AOaQ=" }, "opsgenie": { - "hash": "sha256-OTwQ/sF4/xSyJjYy1TvLOr1guGcho+Es9/WkonfVvcg=", + "hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=", + "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", - "provider-source-address": "registry.terraform.io/opsgenie/opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.17", - "vendorHash": null, - "version": "0.6.17" + "rev": "v0.6.20", + "spdx": "MPL-2.0", + "vendorHash": null }, "ovh": { - "hash": "sha256-QaJZQU6bnjXoTCxfP1NcsPqegFyZ6JwP2QgN7zrE0z0=", + "hash": "sha256-LcSrs4FUrtp/4tp1xlBPKkfQ3J8FlZ/peL9NcC7XQy4=", + "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", - "provider-source-address": "registry.terraform.io/ovh/ovh", "repo": "terraform-provider-ovh", - "rev": "v0.22.0", - "vendorHash": null, - "version": "0.22.0" + "rev": "v0.26.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "pagerduty": { - "hash": "sha256-vkfsQxjlYSOl0VJBWvFCxVz7o+XgxDMkwFMomdl+iWQ=", + "hash": "sha256-utbV/EVSYIln0ruf4qis9rbKifx/DUct3tDOTUO22N0=", + "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", - "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty", "repo": "terraform-provider-pagerduty", - "rev": "v2.6.4", - "vendorHash": null, - "version": "2.6.4" + "rev": "v2.9.3", + "spdx": "MPL-2.0", + "vendorHash": null }, "pass": { "hash": "sha256-hFgNWw6ZmATo0bFZvJL9z/lJF506KsBewigGoFj67sM=", + "homepage": "https://registry.terraform.io/providers/camptocamp/pass", "owner": "camptocamp", - "provider-source-address": "registry.terraform.io/camptocamp/pass", "repo": "terraform-provider-pass", "rev": "v2.0.0", - "vendorHash": "sha256-sV6JPKzpA1+uoUBmdWpUSk70cl9ofQqr7USbK+4RVDs=", - "version": "2.0.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-sV6JPKzpA1+uoUBmdWpUSk70cl9ofQqr7USbK+4RVDs=" }, "postgresql": { - "hash": "sha256-pi3st4phjCRq2jlRIW2Z4jt9qp7a1ghmlkjAQSbxhI4=", + "hash": "sha256-6QqXp0riYy6pJPmESrUv3J9BDY9Sl44/U2sIB663Gfw=", + "homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql", "owner": "cyrilgdn", - "provider-source-address": "registry.terraform.io/cyrilgdn/postgresql", "repo": "terraform-provider-postgresql", - "rev": "v1.17.1", - "vendorHash": "sha256-o2+Uuz0dStf33WZuTFLkJX5rg4G7sJ23/+q+xtQ4mhE=", - "version": "1.17.1" + "rev": "v1.18.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-o2+Uuz0dStf33WZuTFLkJX5rg4G7sJ23/+q+xtQ4mhE=" }, "powerdns": { "hash": "sha256-NtJs2oNJbjUYNFsbrfo2RYhqOlKA15GJt9gi1HuTIw0=", + "homepage": "https://registry.terraform.io/providers/pan-net/powerdns", "owner": "pan-net", - "provider-source-address": "registry.terraform.io/pan-net/powerdns", "repo": "terraform-provider-powerdns", "rev": "v1.5.0", - "vendorHash": null, - "version": "1.5.0" + "spdx": "MPL-2.0", + "vendorHash": null }, "rabbitmq": { "hash": "sha256-ZhK9zwBaod+s4tGCSBUjW7ijKeucyToXVQDPlMFmIvk=", + "homepage": "https://registry.terraform.io/providers/cyrilgdn/rabbitmq", "owner": "cyrilgdn", - "provider-source-address": "registry.terraform.io/cyrilgdn/rabbitmq", "repo": "terraform-provider-rabbitmq", "rev": "v1.7.0", - "vendorHash": "sha256-JAhdryowDvb4LroKPcGrDibjSriSW6FqFbU7+DwjQEQ=", - "version": "1.7.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-JAhdryowDvb4LroKPcGrDibjSriSW6FqFbU7+DwjQEQ=" }, "rancher2": { - "hash": "sha256-TqztIk0sHevfv+BpNZJUs1XbwrbzJtcqdafGN5fTVaE=", + "hash": "sha256-DInP+DpCBOsBdlg1tiujlmN20WB5VQbeHgOiabEv9Zc=", + "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", - "provider-source-address": "registry.terraform.io/rancher/rancher2", "repo": "terraform-provider-rancher2", - "rev": "v1.24.2", - "vendorHash": "sha256-Ntq4wxXPUGbu4+6X1pBsmQsqfJ/jccTiHDJeHVpWe8Y=", - "version": "1.24.2" + "rev": "v1.25.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-Ntq4wxXPUGbu4+6X1pBsmQsqfJ/jccTiHDJeHVpWe8Y=" }, "random": { "hash": "sha256-oYtvVK0OOHyLUG6amhkvmr6zlbzy0CKoS3DxztoLbdE=", + "homepage": "https://registry.terraform.io/providers/hashicorp/random", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/random", "repo": "terraform-provider-random", "rev": "v3.4.3", - "vendorHash": "sha256-CGq2ZjyacXmHq7mPxpQj+eYXGyHGPpqR22tzaYM/Grc=", - "version": "3.4.3" + "spdx": "MPL-2.0", + "vendorHash": "sha256-CGq2ZjyacXmHq7mPxpQj+eYXGyHGPpqR22tzaYM/Grc=" }, "remote": { "hash": "sha256-up4+W2mLii7alqdcBoMBTAWI5Vwfc1QtsDK592sAcDM=", + "homepage": "https://registry.terraform.io/providers/tenstad/remote", "owner": "tenstad", - "provider-source-address": "registry.terraform.io/tenstad/remote", "repo": "terraform-provider-remote", "rev": "v0.1.1", - "vendorHash": "sha256-dMT3PEYNu9NxwLmY5SHa79yeVSB8Pi3UBEHiGvGGVmU=", - "version": "0.1.1" + "spdx": "MPL-2.0", + "vendorHash": "sha256-dMT3PEYNu9NxwLmY5SHa79yeVSB8Pi3UBEHiGvGGVmU=" }, "rundeck": { "hash": "sha256-GkX5p6hV66G45JG3aJmYD5e2LQvf6kmfa6fQK10tc68=", + "homepage": "https://registry.terraform.io/providers/rundeck/rundeck", "owner": "rundeck", - "provider-source-address": "registry.terraform.io/rundeck/rundeck", "repo": "terraform-provider-rundeck", "rev": "v0.4.3", - "vendorHash": null, - "version": "0.4.3" + "spdx": "MPL-2.0", + "vendorHash": null }, "scaleway": { - "hash": "sha256-HQljeUvK010LSWObuZmTkkB6ByrtgBRAeZPYv3d/KSs=", + "hash": "sha256-tLSTRoiqhi+CbdF8fmNLNMYN7FrDeoK/5XXyqCJnUKk=", + "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", - "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.6.0", - "vendorHash": "sha256-XlEvaXd+mAvbFeQmTOE+bFsYok/Ke1mVwIUY3VY8zDI=", - "version": "2.6.0" + "rev": "v2.10.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-cT9W2fP56TPOIoxWBWF0VXDuSKXZsJNs/GPpBq/0zZs=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", + "homepage": "https://registry.terraform.io/providers/numtide/secret", "owner": "numtide", - "provider-source-address": "registry.terraform.io/numtide/secret", "repo": "terraform-provider-secret", "rev": "v1.2.1", - "vendorHash": null, - "version": "1.2.1" + "spdx": "MPL-2.0", + "vendorHash": null }, "selectel": { "hash": "sha256-glIvlf5lWwkdZKn4rxhR+XnBqUdu9RO+loxke07i2c0=", + "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", - "provider-source-address": "registry.terraform.io/selectel/selectel", "repo": "terraform-provider-selectel", "rev": "v3.9.0", - "vendorHash": "sha256-0UOC70RWcEb/YqPrrc7k+dY7jBuTZLWvUTNxuUZIyu4=", - "version": "3.9.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-0UOC70RWcEb/YqPrrc7k+dY7jBuTZLWvUTNxuUZIyu4=" }, "sentry": { - "hash": "sha256-D6w2HfgIcNFfDXeqzuerK8msrFF7vajk80MUxbUxA+A=", + "hash": "sha256-L/aZ4/xCVZk3C6AGglzCj5T9XnoI/uiLbRASNAHwcro=", + "homepage": "https://registry.terraform.io/providers/jianyuan/sentry", "owner": "jianyuan", - "provider-source-address": "registry.terraform.io/jianyuan/sentry", "repo": "terraform-provider-sentry", - "rev": "v0.10.0", - "vendorHash": "sha256-OxapqNRE5Poz6qsFjDv5G5zzivbBldzjC7kbwG2Cswg=", - "version": "0.10.0" + "rev": "v0.11.2", + "spdx": "MIT", + "vendorHash": "sha256-5XAetSjMtRffP/xExRUXfclDutEFV0VL3drusaB4rnM=" }, "shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", + "homepage": "https://registry.terraform.io/providers/scottwinkler/shell", "owner": "scottwinkler", - "provider-source-address": "registry.terraform.io/scottwinkler/shell", "repo": "terraform-provider-shell", "rev": "v1.7.10", - "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=", - "version": "1.7.10" + "spdx": "MPL-2.0", + "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-alLC61bEaFiVtoH0Fczj7G0m70ie1RNvTBR+MgYZGkQ=", + "hash": "sha256-9cGF/uyC/sqCx7Y9aEawkKVJvHE8siGgWRWWf4ok3B0=", + "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", - "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", - "rev": "v6.18.0", - "vendorHash": "sha256-ESUNfkllwkS1NcAD30tO90VQcHR5XhdIeyXXHmU/byc=", - "version": "6.18.0" + "rev": "v6.22.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-Iue8P14x8P0lMa85goSF1D5mEeXw6dH1atJQhgbnZ6Y=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", + "homepage": "https://registry.terraform.io/providers/skytap/skytap", "owner": "skytap", - "provider-source-address": "registry.terraform.io/skytap/skytap", "repo": "terraform-provider-skytap", "rev": "v0.15.1", - "vendorHash": null, - "version": "0.15.1" + "spdx": "MPL-2.0", + "vendorHash": null }, "snowflake": { - "hash": "sha256-V2N9Lq425fdjlJ+lCVQzMAYfEiS2/Oqevz1dIve//FA=", + "hash": "sha256-uO3LgEQjeHS8kbolFZ3jb6FltMAiWNTVsjCSrsI776M=", + "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", - "provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake", "repo": "terraform-provider-snowflake", - "rev": "v0.52.0", - "vendorHash": "sha256-n6ov9eTlNF/jNDTDOZuuqyFfuv8lDZHKP/5jhFauwY8=", - "version": "0.52.0" + "rev": "v0.56.3", + "spdx": "MIT", + "vendorHash": "sha256-ulgTRY8qQ5oXONkwYtffRl1QMNnbvyn0zYiYqqvwrUU=" }, "sops": { - "hash": "sha256-6FuThi6iuuUGcMhswAk3Z6Lxth/2nuI57A02Xu2s+/U=", + "hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=", + "homepage": "https://registry.terraform.io/providers/carlpett/sops", "owner": "carlpett", - "provider-source-address": "registry.terraform.io/carlpett/sops", "repo": "terraform-provider-sops", - "rev": "v0.7.1", - "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=", - "version": "0.7.1" + "rev": "v0.7.2", + "spdx": "MPL-2.0", + "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-9i8mHWn9+ey0tHPXOjZyNixcrdgAl2Y8sJq/q4WlZzo=", + "hash": "sha256-UivENbjPajJdH9PwHznMP+cLXBJ8C38wgHS2IqyoqRk=", + "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", - "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.87.0", - "vendorHash": "sha256-INJLhHiMs/bk3Y8/shtQaW10bUnuhCXdTa8wCNZf0+U=", - "version": "1.87.0" + "rev": "v1.97.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-iQLZpSa1gJ4z2/r1Om9vFrcKP5ik7kcx+rNVZLhmSBc=" }, "stackpath": { "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", + "homepage": "https://registry.terraform.io/providers/stackpath/stackpath", "owner": "stackpath", - "provider-source-address": "registry.terraform.io/stackpath/stackpath", "repo": "terraform-provider-stackpath", "rev": "v1.4.0", - "vendorHash": "sha256-Fvku4OB1sdWuvMx/FIHfOJt9STgao0xPDao6b2SYxcQ=", - "version": "1.4.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-Fvku4OB1sdWuvMx/FIHfOJt9STgao0xPDao6b2SYxcQ=" }, "statuscake": { - "hash": "sha256-rT+NJBPA73WCctlZnu0i952fzrGCxVF2vIIvE0SzvNI=", + "hash": "sha256-PcA0t/G11w9ud+56NdiRXi82ubJ+wpL4XcexT1O2ADw=", + "homepage": "https://registry.terraform.io/providers/StatusCakeDev/statuscake", "owner": "StatusCakeDev", - "provider-source-address": "registry.terraform.io/StatusCakeDev/statuscake", "repo": "terraform-provider-statuscake", - "rev": "v2.0.5", - "vendorHash": "sha256-wPNMrHFCUn1AScxTwgRXHSGrs+6Ebm4c+cS5EwHUeUU=", - "version": "2.0.5" + "rev": "v2.0.6", + "spdx": "MPL-2.0", + "vendorHash": "sha256-0D36uboEHqw968MKqkgARib9R04JH5FlXAfPL8OEpgU=" }, "sumologic": { - "hash": "sha256-lhMPA4ub3NlaYs0pX6FkWuR3LQxytrQxu9DjAjDja2Q=", + "hash": "sha256-4M8h1blefSNNTgt7aL7ecruguEWcZUrzsXGZX3AC2Hc=", + "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", - "provider-source-address": "registry.terraform.io/SumoLogic/sumologic", "repo": "terraform-provider-sumologic", - "rev": "v2.19.2", - "vendorHash": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=", - "version": "2.19.2" + "rev": "v2.20.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=" }, "tailscale": { - "hash": "sha256-/qC8TOtoVoBTWeAFpt2TYE8tlYBCCcn/mzVQ/DN51YQ=", + "hash": "sha256-X3YV640d3pLyKm/v88oEhXfYnox+ksrEWKgiJbYl6gk=", + "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", - "provider-source-address": "registry.terraform.io/tailscale/tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.13.5", - "vendorHash": "sha256-8EIxqKkVO706oejlvN79K8aEZAF5H2vZRdr5vbQa0l4=", - "version": "0.13.5" + "rev": "v0.13.6", + "spdx": "MIT", + "vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw=" }, "tencentcloud": { - "hash": "sha256-HSZP6O9s6KkvaJK3xpy7uT3sjBlhBYEOu5k7VYW8MdU=", + "hash": "sha256-QJUxLwKG3XabACbAvLLKBG9+cmCYRQFpRTWRU6rKwfI=", + "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", - "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.78.12", - "vendorHash": null, - "version": "1.78.12" + "rev": "v1.79.7", + "spdx": "MPL-2.0", + "vendorHash": null }, "tfe": { - "hash": "sha256-ikuLRGm9Z+tt0Zsx7DYKNBrS08rW4DOvVWYpl3wvaeU=", + "hash": "sha256-eFyRa4T+CqIeOcEYj4DQP6ypR7AROYrGDYuYSqBfKr0=", + "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/tfe", "repo": "terraform-provider-tfe", - "rev": "v0.39.0", - "vendorHash": "sha256-Ws9IzlZQDDAdQ4JJ326jHXUe9oQphBXb/ZNO7Kl/A1w=", - "version": "0.39.0" + "rev": "v0.42.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-bhAoNJSbrpAzw0qCKIm84h6tFqUWT0JeBs1gJpPeJdU=" }, "thunder": { "hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=", + "homepage": "https://registry.terraform.io/providers/a10networks/thunder", "owner": "a10networks", - "provider-source-address": "registry.terraform.io/a10networks/thunder", "repo": "terraform-provider-thunder", "rev": "v1.0.0", - "vendorHash": null, - "version": "1.0.0" + "spdx": "BSD-2-Clause", + "vendorHash": null }, "time": { "hash": "sha256-FehWmIkL0o2pleafN/mlBa46cdFqCFUS+coOwFPdb9M=", + "homepage": "https://registry.terraform.io/providers/hashicorp/time", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/time", "repo": "terraform-provider-time", "rev": "v0.9.1", - "vendorHash": "sha256-MLh/we8KNrDBy2BAMZ6B/gBe0p3xJ7l/imNzTHciJjs=", - "version": "0.9.1" + "spdx": "MPL-2.0", + "vendorHash": "sha256-MLh/we8KNrDBy2BAMZ6B/gBe0p3xJ7l/imNzTHciJjs=" }, "tls": { "hash": "sha256-DBOkfvT0+mlgaWiBHggZUKvHL8jLZjQjRi0xFZKgcoM=", + "homepage": "https://registry.terraform.io/providers/hashicorp/tls", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/tls", "repo": "terraform-provider-tls", "rev": "v4.0.4", - "vendorHash": "sha256-k7aW5ZD6pAtdT6tTXy8YaJlFS5WR5FzPd9eINgPBYJM=", - "version": "4.0.4" + "spdx": "MPL-2.0", + "vendorHash": "sha256-k7aW5ZD6pAtdT6tTXy8YaJlFS5WR5FzPd9eINgPBYJM=" }, "triton": { "deleteVendor": true, "hash": "sha256-NrXK1ic5F8fBC0lvq7GxlrZe9lMbHvNhodijsC/VG0o=", + "homepage": "https://registry.terraform.io/providers/joyent/triton", "owner": "joyent", - "provider-source-address": "registry.terraform.io/joyent/triton", "repo": "terraform-provider-triton", "rev": "v0.8.2", - "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=", - "version": "0.8.2" + "spdx": "MPL-2.0", + "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=" }, "turbot": { "hash": "sha256-x27daeW4M5/7sUtFcMeJMVBO5TPRXSLuFoREdgJ2J6g=", + "homepage": "https://registry.terraform.io/providers/turbot/turbot", "owner": "turbot", - "provider-source-address": "registry.terraform.io/turbot/turbot", "repo": "terraform-provider-turbot", "rev": "v1.9.1", - "vendorHash": null, - "version": "1.9.1" + "spdx": "MPL-2.0", + "vendorHash": null }, "ucloud": { - "hash": "sha256-x3+OuRzZdS429v0JNyZkM3v1etUgURSyi9qkt7RhqlI=", + "hash": "sha256-S0pSri0NfxxaYfifUEUVAoEIRPE8y2/sCNdXCLIDGh0=", + "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", - "provider-source-address": "registry.terraform.io/ucloud/ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.32.5", - "vendorHash": null, - "version": "1.32.5" + "rev": "v1.34.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "utils": { - "hash": "sha256-6o55uGTaqf3rbqoIGiYi5F4zOkK7D0YP+LdaMmBtw24=", + "hash": "sha256-nLi6aczJdADzdYNJaZldUOFFjgf3ujDdRrhSCuphIn8=", + "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", - "provider-source-address": "registry.terraform.io/cloudposse/utils", "repo": "terraform-provider-utils", - "rev": "1.5.0", - "vendorHash": "sha256-D1QpZTh/4BgAbsoo4RRpJoIFwkHYBkN5JWfCOe5N/A0=", - "version": "1.5.0" + "rev": "1.7.1", + "spdx": "Apache-2.0", + "vendorHash": "sha256-yTcroKTdYv0O8cX80A451I1vjYclVjA8P69fsb0wY/U=" }, "vault": { - "hash": "sha256-y5pK+sZ1xWnzlhT4sFUy5Mp6sggLLtaY4Cx2OPamDIc=", + "hash": "sha256-aNyCUDV1yjpmbPNYlxuJNaiXtG3fJySxRsDLJx/hZ04=", + "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/vault", "proxyVendor": true, "repo": "terraform-provider-vault", - "rev": "v3.11.0", - "vendorHash": "sha256-EOBNoEW9GI21IgXSiEN93B3skxfCrBkNwLxGXaso1oE=", - "version": "3.11.0" + "rev": "v3.12.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-EOBNoEW9GI21IgXSiEN93B3skxfCrBkNwLxGXaso1oE=" }, "vcd": { - "hash": "sha256-qEElcMl6tCBfOTTTpTFjVYg6E6K9iTXfgmDDozrgNVg=", + "hash": "sha256-EG4WSnUZr/QfUT1qqOBOGze5Ztxp0HSB9Q1YYgLXQqk=", + "homepage": "https://registry.terraform.io/providers/vmware/vcd", "owner": "vmware", - "provider-source-address": "registry.terraform.io/vmware/vcd", "repo": "terraform-provider-vcd", - "rev": "v3.7.0", - "vendorHash": "sha256-u5W7zeOv53VAr4M5T2AAVFRDF/6PNhSm1A2WFo6pnJU=", - "version": "3.7.0" + "rev": "v3.8.2", + "spdx": "MPL-2.0", + "vendorHash": "sha256-fDMS1ne6EKAqQjfE4QT1A0ChloXKCrgZPcftxzN/JwU=" }, "venafi": { "hash": "sha256-/5X/+BilaYwi1Vce7mIvVeHjTpVX/OuYquZ+2BGfxrs=", + "homepage": "https://registry.terraform.io/providers/Venafi/venafi", "owner": "Venafi", - "provider-source-address": "registry.terraform.io/Venafi/venafi", "repo": "terraform-provider-venafi", "rev": "v0.16.1", - "vendorHash": "sha256-smeySV1kReZyF9bRCunEr89IV219f9845wcHHI1zFz8=", - "version": "0.16.1" - }, - "vercel": { - "hash": "sha256-/LHyNxal5Il/UzXdCKfVRzK/VVfSYMgoeKerWsedmho=", - "owner": "ondrejsika", - "provider-source-address": "registry.terraform.io/ondrejsika/vercel", - "repo": "terraform-provider-vercel", - "rev": "v2.1.0", - "vendorHash": "sha256-EyzYlJV+DoOjFHq7ZkyZY0zHlvciH1YdTPgEIXZwE2g=", - "version": "2.1.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-smeySV1kReZyF9bRCunEr89IV219f9845wcHHI1zFz8=" }, "vpsadmin": { "hash": "sha256-MFEerVGKros+9zubcjK8qUpYQveKuBgbfyai32Y0KLI=", + "homepage": "https://registry.terraform.io/providers/vpsfreecz/vpsadmin", "owner": "vpsfreecz", - "provider-source-address": "registry.terraform.io/vpsfreecz/vpsadmin", "repo": "terraform-provider-vpsadmin", "rev": "v1.0.0", - "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=", - "version": "1.0.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=" }, "vra7": { "hash": "sha256-lHyrBJz6954te57uKpgrqOVztDsDUSqkHtWXnlG0QUw=", + "homepage": "https://registry.terraform.io/providers/vmware/vra7", "owner": "vmware", - "provider-source-address": "registry.terraform.io/vmware/vra7", "repo": "terraform-provider-vra7", "rev": "v3.0.6", - "vendorHash": null, - "version": "3.0.6" + "spdx": "MPL-2.0", + "vendorHash": null }, "vsphere": { "hash": "sha256-UwhIGK1zQ++IuwAKH9i+Dlu2vvXkMYL+s1P03qKSe3E=", + "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/vsphere", "repo": "terraform-provider-vsphere", "rev": "v2.2.0", - "vendorHash": "sha256-160GDEQfymeCJpjYOoWP5sGQ0PJHw9kKPaefmbF5Ig4=", - "version": "2.2.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-160GDEQfymeCJpjYOoWP5sGQ0PJHw9kKPaefmbF5Ig4=" }, "vultr": { - "hash": "sha256-6NiVW6kqUCeit6Dc9GbP4mV03UJkqo+UwHsDE4xMwzQ=", + "hash": "sha256-DfiJgN1R7qW3c13hBabsMizY3mYamIq8AGms1q9kdVU=", + "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", - "provider-source-address": "registry.terraform.io/vultr/vultr", "repo": "terraform-provider-vultr", - "rev": "v2.11.4", - "vendorHash": null, - "version": "2.11.4" + "rev": "v2.12.0", + "spdx": "MPL-2.0", + "vendorHash": null }, "wavefront": { "hash": "sha256-goiYeZ2iV9KjacBr/MMkA+t2WNTJGHHmwebr/ci+Ezg=", + "homepage": "https://registry.terraform.io/providers/vmware/wavefront", "owner": "vmware", - "provider-source-address": "registry.terraform.io/vmware/wavefront", "repo": "terraform-provider-wavefront", "rev": "v3.4.0", - "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ=", - "version": "3.4.0" + "spdx": "MPL-2.0", + "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ=" }, "yandex": { - "hash": "sha256-HBGQ+WrAy+f0nK0iyd/Z+Mj5AshvHyGyBEN0E61ftn0=", + "hash": "sha256-aBWcxC6mHM/3GOjnN/Qi0DNoZjehh5i3C2+XRZ2Igdo=", + "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", - "provider-source-address": "registry.terraform.io/yandex-cloud/yandex", + "proxyVendor": true, "repo": "terraform-provider-yandex", - "rev": "v0.82.0", - "vendorHash": "sha256-Tgfgq3nrfZP2ie4KLmJq83TfzZ41lc4gwWIULLOQmBw=", - "version": "0.82.0" + "rev": "v0.85.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-eLCFnBGAvH0ZEzOb5xVCY0Yy4U5V407AhpGSFpa9t7I=" } } diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers index 288c2f345c2c..9c39282bc969 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers +++ b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers @@ -9,7 +9,7 @@ readarray -t providers < <( jq -r 'to_entries | map_values(.value + { alias: .key }) | .[] - | select(."provider-source-address"?) + | select(."homepage"?) | .alias' providers.json ) @@ -21,5 +21,5 @@ ${providers[*]} EOF for provider in "${providers[@]}"; do - ./update-provider "$@" "${provider}" + ./update-provider --no-spdx "$@" "${provider}" done diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index f9626148a37d..aaa8a44d60c0 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -28,14 +28,13 @@ Options: * --force: Force the update even if the version matches. * --no-build: Don't build provider - * --vendor-hash : Override the SHA256 or "null". DOC } +build=1 force= provider= -build=1 -vendorHash= +spdx=1 while [[ $# -gt 0 ]]; do case "$1" in @@ -51,10 +50,9 @@ while [[ $# -gt 0 ]]; do build=0 shift ;; - --vendor-hash) - force=1 - vendorHash=$2 - shift 2 + --no-spdx) + spdx=0 + shift ;; *) if [[ -n ${provider} ]]; then @@ -103,40 +101,33 @@ echo_provider() { pushd "$(dirname "$0")" >/dev/null if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then - echo_provider "init" - source_address=registry.terraform.io/${provider} + homepage="https://registry.terraform.io/providers/${provider}" provider=$(basename "${provider}") - update_attr "provider-source-address" "${source_address}" - update_attr version "0" + echo_provider "init" + update_attr homepage "${homepage}" # create empty stings so nix-prefetch works update_attr hash "" update_attr vendorHash "" -else - source_address="$(read_attr provider-source-address)" fi -old_vendor_hash=$(read_attr vendorHash) -old_version=$(read_attr version) +homepage="$(read_attr homepage)" -# The provider source address (used inside Terraform `required_providers` block) is -# used to compute the registry API endpoint -# -# registry.terraform.io/hashicorp/aws (provider source address) -# registry.terraform.io/providers/hashicorp/aws (provider URL for the website) -# registry.terraform.io/v1/providers/hashicorp/aws (provider URL for the JSON API) -registry_response=$(curl -s https://"${source_address/\///v1/providers/}") +registry_response=$(curl -s "${homepage//providers/v1/providers}") -version="$(jq -r '.version' <<<"${registry_response}")" -if [[ ${old_version} == "${version}" && ${force} != 1 && -z ${vendorHash} && ${old_vendor_hash} != "${vendorHash}" ]]; then - echo_provider "already at version ${version}" - exit +old_rev="$(read_attr rev)" +rev="$(jq -r '.tag' <<<"${registry_response}")" +if [[ ${force} != 1 ]]; then + if [[ ${old_rev} == "${rev}" ]]; then + echo_provider "already at version ${rev}" + exit + fi + if [[ ${rev//v/} =~ [[:alpha:]] ]]; then + echo_provider "not updating to unstable version ${rev}" + exit + fi fi -if [[ ${version} =~ [[:alpha:]] && ${force} != 1 ]]; then - echo_provider "not updating to unstable version ${version}" - exit -fi -echo_provider "updating from ${old_version} to ${version}" -update_attr version "${version}" +echo_provider "updating from ${old_rev} to ${rev}" +update_attr rev "${rev}" provider_source_url="$(jq -r '.source' <<<"${registry_response}")" @@ -144,23 +135,23 @@ org="$(echo "${provider_source_url}" | cut -d '/' -f 4)" update_attr owner "${org}" repo="$(echo "${provider_source_url}" | cut -d '/' -f 5)" update_attr repo "${repo}" -rev="$(jq -r '.tag' <<<"${registry_response}")" -update_attr rev "${rev}" + +if [[ ${spdx} == 1 ]]; then + spdx="$(curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} "https://api.github.com/repos/${org}/${repo}/license" | jq -r '.license.spdx_id')" + update_attr spdx "${spdx}" +fi + echo_provider "calculating hash" hash=$(generate_hash src) update_attr hash "${hash}" -if [[ -z ${vendorHash} ]]; then - if [[ ${old_vendor_hash} == null ]]; then - vendorHash=null - else - echo_provider "calculating vendorHash" - vendorHash=$(generate_hash go-modules) - fi +old_vendor_hash="$(read_attr vendorHash)" +if [[ ${old_vendor_hash} != null ]]; then + echo_provider "calculating vendorHash" + vendorHash=$(generate_hash go-modules) + update_attr vendorHash "${vendorHash}" fi -update_attr vendorHash "${vendorHash}" - # Check that the provider builds if [[ ${build} == 1 ]]; then echo_provider "building" diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index b6601bb91bfe..4865ca4901cb 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -168,8 +168,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.3.5"; - sha256 = "sha256-+jmZcIF9+vvjoA/PXWCc3F4l3YnlpZgxs0eGxchiIBE="; + version = "1.3.7"; + sha256 = "sha256-z49DXJ9oYObJQWHPeuKvQ6jJtAheYuy0+QmvZ74ZbTQ"; vendorSha256 = "sha256-fviukVGBkbxFs2fJpEp/tFMymXex7NRQdcGIIA9W88k="; patches = [ ./provider-path-0_15.patch ]; passthru = { diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 55086342d791..b36cd477a654 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -1,23 +1,31 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "terragrunt"; - version = "0.40.2"; + version = "0.43.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-wNedd6C4NPLPw8CA1tyKx2MWsKatFbN4xt3Us2SC/ME="; + rev = "refs/tags/v${version}"; + hash = "sha256-PojwY5sLfO8n1obyb9aHp0ym5RDD6SLLth4977gTc+U="; }; - vendorSha256 = "sha256-Qc0FnNxyErtieVvEj/eKPW5PpvYFwiYtv+ReJTVFAPA="; + vendorHash = "sha256-niU6DGKNhSV+nm+8jIP//AItBu5eWTasyeL/ADvY2zA="; doCheck = false; - ldflags = [ "-s" "-w" "-X main.VERSION=v${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.VERSION=v${version}" + ]; doInstallCheck = true; + installCheckPhase = '' runHook preInstallCheck $out/bin/terragrunt --help diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile b/pkgs/applications/networking/cluster/terraspace/Gemfile new file mode 100644 index 000000000000..0bf6893eeec1 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraspace/Gemfile @@ -0,0 +1,2 @@ +source "https://rubygems.org" +gem "terraspace", '~> 2.2.3' diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile.lock b/pkgs/applications/networking/cluster/terraspace/Gemfile.lock new file mode 100644 index 000000000000..1c7b39767c6e --- /dev/null +++ b/pkgs/applications/networking/cluster/terraspace/Gemfile.lock @@ -0,0 +1,129 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (7.0.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + aws-eventstream (1.2.0) + aws-partitions (1.689.0) + aws-sdk-core (3.168.4) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.61.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.117.2) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.5.2) + aws-eventstream (~> 1, >= 1.0.2) + cli-format (0.2.2) + activesupport + text-table + zeitwerk + concurrent-ruby (1.1.10) + deep_merge (1.2.2) + diff-lcs (1.5.0) + dotenv (2.8.1) + dsl_evaluator (0.3.1) + activesupport + memoist + rainbow + zeitwerk + eventmachine (1.2.7) + eventmachine-tail (0.6.5) + eventmachine + graph (2.11.0) + hcl_parser (0.2.2) + rhcl + i18n (1.12.0) + concurrent-ruby (~> 1.0) + jmespath (1.6.2) + memoist (0.16.2) + minitest (5.17.0) + mini_portile2 (2.8.0) + nokogiri (1.13.9) + racc (~> 1.4) + mini_portile2 (~> 2.8.0) + racc (1.6.2) + rainbow (3.1.1) + render_me_pretty (0.8.4) + activesupport + rainbow + tilt + rexml (3.2.5) + rhcl (0.1.0) + deep_merge + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.0) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) + rspec-terraspace (0.3.2) + activesupport + memoist + rainbow + rspec + zeitwerk + rubyzip (2.3.2) + terraspace (2.2.3) + activesupport + bundler + cli-format + deep_merge + dotenv + dsl_evaluator + eventmachine-tail + graph + hcl_parser + memoist + rainbow + render_me_pretty + rexml + rspec-terraspace (>= 0.3.1) + terraspace-bundler (>= 0.5.0) + thor + tty-tree + zeitwerk + zip_folder + terraspace-bundler (0.5.0) + activesupport + aws-sdk-s3 + dsl_evaluator + memoist + nokogiri + rainbow + rubyzip + thor + zeitwerk + text-table (1.2.4) + thor (1.2.1) + tilt (2.0.11) + tty-tree (0.4.0) + tzinfo (2.0.5) + concurrent-ruby (~> 1.0) + zeitwerk (2.6.6) + zip_folder (0.1.0) + rubyzip + +PLATFORMS + x86_64-linux + +DEPENDENCIES + terraspace (~> 2.2.3) + +BUNDLED WITH + 2.3.25 diff --git a/pkgs/applications/networking/cluster/terraspace/default.nix b/pkgs/applications/networking/cluster/terraspace/default.nix new file mode 100644 index 000000000000..af7c1025356a --- /dev/null +++ b/pkgs/applications/networking/cluster/terraspace/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, ruby }: +let + rubyEnv = bundlerEnv { + inherit ruby; + name = "terraspace"; + gemdir = ./.; + }; +in stdenv.mkDerivation { + pname = "terraspace"; + version = (import ./gemset.nix).terraspace.version; + + nativeBuildInputs = [ makeWrapper ]; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${rubyEnv}/bin/terraspace $out/bin/terraspace + wrapProgram $out/bin/terraspace \ + --prefix PATH : ${lib.makeBinPath [ rubyEnv.ruby ]} + ''; + + passthru.updateScript = bundlerUpdateScript "terraspace"; + + meta = with lib; { + description = "Terraform framework that provides an organized structure, and keeps your code DRY"; + homepage = "https://github.com/boltops-tools/terraspace"; + license = licenses.asl20; + platforms = ruby.meta.platforms; + maintainers = with maintainers; [ mislavzanic ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraspace/gemset.nix b/pkgs/applications/networking/cluster/terraspace/gemset.nix new file mode 100644 index 000000000000..cc5e64e944cf --- /dev/null +++ b/pkgs/applications/networking/cluster/terraspace/gemset.nix @@ -0,0 +1,464 @@ +{ + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0"; + type = "gem"; + }; + version = "7.0.4"; + }; + 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 = "06878pd1kxbj54dh6jp11a1460dkyxvk4mzwp480gcdqy5jaqwhw"; + type = "gem"; + }; + version = "1.689.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "131acgw2hi893n0dfbczs42bkc41afhyrmd9w8zx5y8r1k5zd6rc"; + type = "gem"; + }; + version = "3.168.4"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ajp7yvnf95d60xmg618xznfwsy8h1vrkzj33r1bsf2gsfp50vzy"; + type = "gem"; + }; + version = "1.61.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xpb8c8zw1c0grbw1rcc0ynlys1301vm9kkqy4ls3i2zqk5v6n91"; + type = "gem"; + }; + version = "1.117.2"; + }; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m"; + type = "gem"; + }; + version = "1.5.2"; + }; + cli-format = { + dependencies = ["activesupport" "text-table" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mr8vkw5zwb3flhhf8s923mi7r85g1ky0lmjz4q5xhwb48ji55qf"; + type = "gem"; + }; + version = "0.2.2"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + type = "gem"; + }; + version = "1.1.10"; + }; + deep_merge = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fjn4civid68a3zxnbgyjj6krs3l30dy8b4djpg6fpzrsyix7kl3"; + type = "gem"; + }; + version = "1.2.2"; + }; + diff-lcs = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; + type = "gem"; + }; + version = "1.5.0"; + }; + dotenv = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n0pi8x8ql5h1mijvm8lgn6bhq4xjb5a500p5r1krq4s6j9lg565"; + type = "gem"; + }; + version = "2.8.1"; + }; + dsl_evaluator = { + dependencies = ["activesupport" "memoist" "rainbow" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mck2j0gr851kj9l7pix97jmmwwazfjq83ryamx5rpdbgv5mrh51"; + type = "gem"; + }; + version = "0.3.1"; + }; + eventmachine = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; + type = "gem"; + }; + version = "1.2.7"; + }; + eventmachine-tail = { + dependencies = ["eventmachine"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x5ly7mnfr6gibjyxz6lrxb4jbf05p0r8257qcgkf8rkwg9ynw0c"; + type = "gem"; + }; + version = "0.6.5"; + }; + graph = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10l1bdqc9yzdk6kqwh9vw918lyw846gpqw2z8kfcwl53zdjdzcl9"; + type = "gem"; + }; + version = "2.11.0"; + }; + hcl_parser = { + dependencies = ["rhcl"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09d55i9y187xkw0fi0b5aq8wyzvq8w73ryi939dvzdzgss25m7jj"; + type = "gem"; + }; + version = "0.2.2"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + type = "gem"; + }; + version = "1.12.0"; + }; + jmespath = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; + type = "gem"; + }; + version = "1.6.2"; + }; + memoist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55"; + type = "gem"; + }; + version = "0.16.2"; + }; + minitest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; + type = "gem"; + }; + version = "5.17.0"; + }; + 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 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; + type = "gem"; + }; + version = "1.13.9"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; + type = "gem"; + }; + version = "1.6.2"; + }; + rainbow = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; + type = "gem"; + }; + version = "3.1.1"; + }; + render_me_pretty = { + dependencies = ["activesupport" "rainbow" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cd64d59jx6jjzhi5xngfa031sfpgs7zyq8bhc9y4smlz121l1ij"; + type = "gem"; + }; + version = "0.8.4"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; + rhcl = { + dependencies = ["deep_merge"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c7xp9y9438mnqrfrvjp1fwy2lk0b1ixz45qi2g2kbl91ilhn834"; + type = "gem"; + }; + version = "0.1.0"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; + type = "gem"; + }; + version = "3.12.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4"; + type = "gem"; + }; + version = "3.12.0"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6"; + type = "gem"; + }; + version = "3.12.2"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k64i7ax6sqvh702s0xrll2g8isxx1x4zam95ck7122flsyh7van"; + type = "gem"; + }; + version = "3.12.2"; + }; + rspec-support = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; + type = "gem"; + }; + version = "3.12.0"; + }; + rspec-terraspace = { + dependencies = ["activesupport" "memoist" "rainbow" "rspec" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16bi6x6aynnkp7yh341fmvpiasm1vg43mxf61ji57akdhx4mam5q"; + type = "gem"; + }; + version = "0.3.2"; + }; + rubyzip = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + type = "gem"; + }; + version = "2.3.2"; + }; + terraspace = { + dependencies = ["activesupport" "cli-format" "deep_merge" "dotenv" "dsl_evaluator" "eventmachine-tail" "graph" "hcl_parser" "memoist" "rainbow" "render_me_pretty" "rexml" "rspec-terraspace" "terraspace-bundler" "thor" "tty-tree" "zeitwerk" "zip_folder"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m38gj4bpcafrbrfdck2pswknm2p6mqfq8mp6k3pkjkmk9p3w9a9"; + type = "gem"; + }; + version = "2.2.3"; + }; + terraspace-bundler = { + dependencies = ["activesupport" "aws-sdk-s3" "dsl_evaluator" "memoist" "nokogiri" "rainbow" "rubyzip" "thor" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kn6is7zqlw8l4njj4pjwbdi95w651nz3qvqgc3vw07rchs08nnx"; + type = "gem"; + }; + version = "0.5.0"; + }; + text-table = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06yhlnb49fn0fhkmi6lrziyv2hd42gcm2zi3sggm2qab48qxn94j"; + type = "gem"; + }; + version = "1.2.4"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + type = "gem"; + }; + version = "1.2.1"; + }; + tilt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; + type = "gem"; + }; + version = "2.0.11"; + }; + tty-tree = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w3nh9yppb7zaswa7d9hnhf6k64z5d3jd8xvpyg2mjfrzcw9rbgs"; + type = "gem"; + }; + version = "0.4.0"; + }; + tzinfo = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; + type = "gem"; + }; + version = "2.0.5"; + }; + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv"; + type = "gem"; + }; + version = "2.6.6"; + }; + zip_folder = { + dependencies = ["rubyzip"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1884a1ixy7bzm9yp8cjikhdfcn8205p4fsjq894ilby8i1whl58k"; + type = "gem"; + }; + version = "0.1.0"; + }; +} diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 339564f52a04..19aaa36c7eb6 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.30.9"; + version = "0.30.13"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vZthFaIsgpZ2aap9kRSH//AHHnOpekPIkwpz9Tt0lI4="; + sha256 = "sha256-W67aQIXp2TOtZuccjQUGC9gNtvdyUNWuU7VM2LOFkCg="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/tubekit/default.nix b/pkgs/applications/networking/cluster/tubekit/default.nix new file mode 100644 index 000000000000..f4a051c9adb7 --- /dev/null +++ b/pkgs/applications/networking/cluster/tubekit/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "tubekit"; + version = "4"; + + src = fetchFromGitHub { + owner = "reconquest"; + repo = "tubekit"; + rev = "refs/tags/v${version}"; + hash = "sha256-sq91uR8ITMOv8hivwKQR02mMlJpjDHw6RxiwVUrpwnY="; + }; + + vendorHash = "sha256-qrGzmr1dZPn5r2WBJA7FT7RTqP2sxnrXgbrnKlnpF0Y="; + + meta = with lib; { + description = "Kubectl alternative with quick context switching"; + homepage = "https://github.com/reconquest/tubekit"; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ farcaller ]; + }; +} diff --git a/pkgs/applications/networking/cluster/tubekit/wrapper.nix b/pkgs/applications/networking/cluster/tubekit/wrapper.nix new file mode 100644 index 000000000000..7cba11c97a3a --- /dev/null +++ b/pkgs/applications/networking/cluster/tubekit/wrapper.nix @@ -0,0 +1,17 @@ +{ lib +, runCommand +, makeWrapper +, tubekit-unwrapped +, pname ? "tubekit" +, version ? tubekit-unwrapped.version +, kubectl +}: +runCommand "${pname}-${version}" +{ + inherit pname version; + inherit (tubekit-unwrapped) src meta; + nativeBuildInputs = [ makeWrapper ]; +} '' + mkdir -p $out/bin + makeWrapper ${tubekit-unwrapped}/bin/tubectl $out/bin/tubectl --set-default TUBEKIT_KUBECTL ${kubectl}/bin/kubectl +'' diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index 2d24365466b7..84edb644afde 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/pkgs/applications/networking/cluster/vcluster/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vcluster"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PkayQ1sLjnA+1Xatgs0EvZTCTfWV5uoYYtnKX8OAwYQ="; + sha256 = "sha256-7yyOpF/eIeJinTe0sHPWLLBUbKYDhphmW8qkOdYOdXM="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 8bb4dc5ad80d..bc4f1959eaac 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.9.3"; + version = "1.10.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-UN1nxzcoaUrqmFAJ6LQ+Ro6Ywn/mG7J+MEJIUbpBiK4="; + sha256 = "sha256-PBCTVws5N42q68rKcMLW7GgZvdsQgmdlsKMpJ5bCF00="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorSha256 = "sha256-QSR8nSKSKaFyFC6yik3f44mdNvSBgE4bFIGttuJ5oRM="; + vendorSha256 = "sha256-5Po8TRCE6VP+RcaIJImYjElTMHHS/2JwbrHreeWLxio="; excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; diff --git a/pkgs/applications/networking/cluster/waagent/default.nix b/pkgs/applications/networking/cluster/waagent/default.nix new file mode 100644 index 000000000000..a1a72a69885a --- /dev/null +++ b/pkgs/applications/networking/cluster/waagent/default.nix @@ -0,0 +1,67 @@ +{ fetchFromGitHub, + findutils, + gnugrep, + gnused, + iproute2, + iptables, + lib, + nettools, # for hostname + openssh, + openssl, + parted, + procps, # for pidof, + python3, + shadow, # for useradd, usermod + util-linux, # for (u)mount, fdisk, sfdisk, mkswap +}: + +let + inherit (lib) makeBinPath; + +in +python3.pkgs.buildPythonPackage rec { + pname = "waagent"; + version = "2.8.0.11"; + src = fetchFromGitHub { + owner = "Azure"; + repo = "WALinuxAgent"; + rev = "04ded9f0b708cfaf4f9b68eead1aef4cc4f32eeb"; + sha256 = "0fvjanvsz1zyzhbjr2alq5fnld43mdd776r2qid5jy5glzv0xbhf"; + }; + doCheck = false; + + buildInputs = with python3.pkgs; [ distro ]; + runtimeDeps = [ + findutils + gnugrep + gnused + iproute2 + iptables + nettools # for hostname + openssh + openssl + parted + procps # for pidof + shadow # for useradd, usermod + util-linux # for (u)mount, fdisk, sfdisk, mkswap + ]; + + fixupPhase = '' + mkdir -p $out/bin/ + WAAGENT=$(find $out -name waagent | grep sbin) + cp $WAAGENT $out/bin/waagent + wrapProgram "$out/bin/waagent" \ + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix PATH : "${makeBinPath runtimeDeps}" + patchShebangs --build "$out/bin/" + ''; + + meta = { + description = "The Microsoft Azure Linux Agent (waagent) + manages Linux provisioning and VM interaction with the Azure + Fabric Controller"; + homepage = "https://github.com/Azure/WALinuxAgent"; + license = with lib.licenses; [ asl20 ]; + }; + +} diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index 317c0d5374bc..e6f6bc151175 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "waypoint"; - version = "0.10.3"; + version = "0.10.5"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+lNeMcSlhmbs1knONnoX2RhEgxTYyCfpdD6WuDTiLx8="; + sha256 = "sha256-oUzWBFoBRwQynWubBzR9xNIyqRXTsH0R+OCyIDz0a9s="; }; - vendorSha256 = "sha256-59rJ30m6eiNIapJUNc1jRJE7IoAj0O+5G8JyKkhcyvY="; + vendorSha256 = "sha256-rmDxO1tfpCUh5TXsSmf3DMIqB0NQHuCyizZmnaoZox0="; nativeBuildInputs = [ go-bindata installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index fb19070e4591..ae56b05bd96d 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.190"; + version = "1.2.198"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-xjZVBLdDLLlfnXX87lwgIeQ6ySI9cNoE5nrRJVBS/l0="; + hash = "sha256-fJDcVqHVN+2KXoqFCTACDevFtOllEGDMcQO/oDb6GMI="; }; vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk="; @@ -64,6 +64,10 @@ buildGoModule rec { integration/suites \ pkg/true_git/*test.go \ test/e2e + '' + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' + # Remove failing tests. + rm -rf \ + cmd/werf/docs/replacers/kubectl/kubectl_test.go '' + lib.optionalString (CGO_ENABLED == 0) '' # A workaround for osusergo. export USER=nixbld diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index f13d3d321a15..2229ed38bfc4 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = !stdenv.isDarwin; # check-dnstap.sh failing on Darwin - checkInputs = [ + nativeCheckInputs = [ cbor-diag cddl diffutils diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix new file mode 100644 index 000000000000..243b0d16a25f --- /dev/null +++ b/pkgs/applications/networking/coreth/default.nix @@ -0,0 +1,49 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, stdenv +}: + +buildGoModule rec { + pname = "coreth"; + version = "0.11.6"; + + src = fetchFromGitHub { + owner = "ava-labs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Me+kmEfvSJs8EPU4D7MwkEyHQuvDmQCSIATxygXws5o="; + }; + + # go mod vendor has a bug, see: golang/go#57529 + proxyVendor = true; + + vendorHash = "sha256-jI01tdAVdJOj/ocpwCiaANdyYKSLw00bV7ZtU7HvslA="; + + ldflags = [ + "-s" + "-w" + "-X github.com/ava-labs/coreth/plugin/evm.Version=${version}" + "-X github.com/ava-labs/coreth/cmd/abigen.gitCommit=${version}" + "-X github.com/ava-labs/coreth/cmd/abigen.gitDate=1970-01-01" + ]; + + subPackages = [ + "cmd/abigen" + "plugin" + ]; + + postInstall = "mv $out/bin/{plugin,evm}"; + + meta = with lib; { + description = "Code and wrapper to extract Ethereum blockchain functionalities without network/consensus, for building custom blockchain services"; + homepage = "https://github.com/ava-labs/coreth"; + changelog = "https://github.com/ava-labs/coreth/releases/tag/v${version}"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ urandom ]; + # In file included from ../go/pkg/mod/github.com/zondax/hid@v0.9.1-0.20220302062450-5552068d2266/hid_enabled.go:38: + # ./hidapi/mac/hid.c:693:34: error: use of undeclared identifier 'kIOMainPortDefault' + # entry = IORegistryEntryFromPath(kIOMainPortDefault, path); + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index a48bd4ae44d5..a45fc62cf1f2 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -2,30 +2,31 @@ , mkDerivation , fetchurl , libxml2 -, libisds +, libdatovka , qmake , qtbase +, qtwebsockets , qtsvg , pkg-config }: mkDerivation rec { pname = "datovka"; - version = "4.15.6"; + version = "4.21.1"; src = fetchurl { - url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz"; - sha256 = "1qs1yd9qqsf56jm9w6sffkqb2l8s3i9qgi2q8vd59ss19ym6yky2"; + url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz"; + sha256 = "sha256-mzCtZE4mira/ZeyfujBh+cONq1YbCyLIypiIX0kTVJg="; }; - buildInputs = [ libisds qmake qtbase qtsvg libxml2 ]; + buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "Client application for operating Czech government-provided Databox infomation system"; homepage = "https://www.datovka.cz/"; - license = licenses.lgpl3; + license = licenses.gpl3Plus; maintainers = [ maintainers.mmahut ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index 68a14207e297..5826c94f4bb8 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers"; - homepage = "http://davmail.sourceforge.net/"; + homepage = "https://davmail.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/diswall/default.nix b/pkgs/applications/networking/diswall/default.nix new file mode 100644 index 000000000000..0a8ac4456416 --- /dev/null +++ b/pkgs/applications/networking/diswall/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, darwin }: + +let + inherit (darwin.apple_sdk.frameworks) Security; +in +rustPlatform.buildRustPackage rec { + pname = "diswall"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "dis-works"; + repo = "diswall-rs"; + rev = "v${version}"; + sha256 = "sha256-3FTqT3IL48lYmGoB9u76RQSgZPbaq7IkOyQjyxwpkWA="; + }; + + buildInputs = lib.optionals stdenv.isDarwin [ + Security + ]; + + cargoSha256 = "sha256-sb6s4Oc3W+I9DB0SGyZINxyWHCSpkakiEeQUatEpeEU="; + + doCheck = false; + + meta = with lib; { + description = "Distributed firewall"; + longDescription = '' + Diswall (distributed firewall) - a client of distributed firewall + working on many servers and using NATS for the transport level. + Its purpose - blocking IPs with a blink of the eye on all servers + in any infrastructure when some IP checks any of the closed ports + of anyone of these servers. Therefore, diswall provides good + protection of whole infrastructure (as anti-shodan) preventing + intruder to get any system information. + ''; + homepage = "https://www.diswall.stream"; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index d4f567022c2d..7adcfc8a9a57 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.22.1"; + version = "3.25.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Lv4ZX8QXRkicPH69kvUAPcgesGvhQkNiwZiNcFbReSU="; + sha256 = "sha256-XH9o1DTwG5ne5TZDgsS4HfC5WqLXc16JtjkKQtiE8z0="; }; - vendorSha256 = "sha256-gKsYy3izx8i7nOazBF4w1SPUJT9D2hbjOr6LqonVqno="; + vendorSha256 = "sha256-iVyLNPvmzkI46Cp0SgbxK6xIQspJjpYjqPf3mOMoZvU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index ad1a0c9a533c..576133e650c8 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -1,25 +1,35 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "drive"; - version = "0.3.8.1"; - - goPackagePath = "github.com/odeke-em/drive"; - subPackages = [ "cmd/drive" ]; + version = "0.4.0"; src = fetchFromGitHub { owner = "odeke-em"; repo = "drive"; rev = "v${version}"; - sha256 = "1b9cgc148rg5irg4jas10zv9i2km75x1zin25hld340dmpjcpi82"; + hash = "sha256-mNOeOB0Tn5eqULFJZuE18PvLoHtnspv4AElmgEQKXcU="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-F/ikdr7UCVlNv2yiEemyB7eIkYi3mX+rJvSfX488RFc="; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/odeke-em/drive/commit/0fb4bb2cf83a7293d9a33b00f8fc07e1c8dd8b7c.patch"; + hash = "sha256-4PxsgfufhTfmy/7N5QahIhmRa0rb2eUDXJ66pYb6jFg="; + }) + ]; + + subPackages = [ "cmd/drive" ]; + + ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://github.com/odeke-em/drive"; description = "Google Drive client for the commandline"; license = licenses.asl20; + maintainers = with maintainers; [ aaronjheng ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/drive/deps.nix b/pkgs/applications/networking/drive/deps.nix deleted file mode 100644 index ca132288bd69..000000000000 --- a/pkgs/applications/networking/drive/deps.nix +++ /dev/null @@ -1,192 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "7450882a75c8d2600748666d1ed16e0a5afa532d"; - sha256 = "1hl2lsf9m1imdszf5mww4h6qrcjfdjghwh6l2kqsy85d32vbkjgd"; - }; - } - { - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "074dffcc83e9f421e261526d297cd93f22a34080"; - sha256 = "1kkmsby74n9czqx4mvng9x1cvnm4qgjl3dp6b4mfmg2b00fwbqnv"; - }; - } - { - goPackagePath = "github.com/cheggaaa/pb"; - fetch = { - type = "git"; - url = "https://github.com/cheggaaa/pb"; - rev = "ad4efe000aa550bb54918c06ebbadc0ff17687b9"; - sha256 = "0w6dl2s0vzb64q85yfy1hd5z2fq2vzwygiwl65is6hwa4vkc7hi3"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8"; - sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5"; - }; - } - { - goPackagePath = "github.com/odeke-em/cache"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/cache"; - rev = "baf8e436bc97557118cb0bf118ab8ac6aeeda381"; - sha256 = "00nvrnp40w4m1ld89k3s3gwi9qcfjxwi8hnp62zggnvqqyc4fyz1"; - }; - } - { - goPackagePath = "github.com/odeke-em/cli-spinner"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/cli-spinner"; - rev = "610063bb4aeef25f7645b3e6080456655ec0fb33"; - sha256 = "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c"; - }; - } - { - goPackagePath = "github.com/odeke-em/command"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/command"; - rev = "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561"; - sha256 = "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62"; - }; - } - { - goPackagePath = "github.com/odeke-em/exponential-backoff"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/exponential-backoff"; - rev = "96e25d36ae36ad09ac02cbfe653b44c4043a8e09"; - sha256 = "1as21p2jj8xpahvdxqwsw2i1s3fll14dlc9j192iq7xl1ybwpqs6"; - }; - } - { - goPackagePath = "github.com/odeke-em/extractor"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/extractor"; - rev = "801861aedb854c7ac5e1329e9713023e9dc2b4d4"; - sha256 = "036zmnqxy48h6mxiwywgxix2p4fqvl4svlmcp734ri2rbq3cmxs1"; - }; - } - { - goPackagePath = "github.com/odeke-em/go-utils"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/go-utils"; - rev = "d915395a7a46a9fe73d93f4daeff5953eeac5ef2"; - sha256 = "0c1z4vmz69vxak8ldw4qjcgwia5ph969gj80az7a3824gia7zhbh"; - }; - } - { - goPackagePath = "github.com/odeke-em/go-uuid"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/go-uuid"; - rev = "b211d769a9aaba5b2b8bdbab5de3c227116f3c39"; - sha256 = "086l4xmwkjl5qcylcb5iwy9ksk9k5g43xwfbkcgvmhpz5mq3wmz2"; - }; - } - { - goPackagePath = "github.com/odeke-em/log"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/log"; - rev = "cad53c4565a0b0304577bd13f3862350bdc5f907"; - sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w"; - }; - } - { - goPackagePath = "github.com/odeke-em/meddler"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/meddler"; - rev = "d2b51d2b40e786ab5f810d85e65b96404cf33570"; - sha256 = "0m0fqrn3kxy4swyk4ja1y42dn1i35rq9j85y11wb222qppy2342x"; - }; - } - { - goPackagePath = "github.com/odeke-em/pretty-words"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/pretty-words"; - rev = "9d37a7fcb4ae6f94b288d371938482994458cecb"; - sha256 = "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl"; - }; - } - { - goPackagePath = "github.com/odeke-em/semalim"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/semalim"; - rev = "9c88bf5f9156ed06ec5110a705d41b8580fd96f7"; - sha256 = "0nq93dcl84cmlvg31rdk281ndlc2452zlh5s7i40hasi0z0kmn1k"; - }; - } - { - goPackagePath = "github.com/odeke-em/statos"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/statos"; - rev = "6f7e4db337bc11fc46d9b0456a93836cbbfe5141"; - sha256 = "1lijz3cxqxd78sl0nzfgvs675dg7q99jqwvhgisnk9n84ic4ffzj"; - }; - } - { - goPackagePath = "github.com/skratchdot/open-golang"; - fetch = { - type = "git"; - url = "https://github.com/skratchdot/open-golang"; - rev = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c"; - sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3"; - sha256 = "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "6acef71eb69611914f7a30939ea9f6e194c78172"; - sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "1e695b1c8febf17aad3bfa7bf0a819ef94b98ad5"; - sha256 = "1sfgrc63jwslczkld7bsfipw1jm1rn06228dx0vc5gggd52155ys"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "eb84d1a029af1654777e7ba65c979085305c3e38"; - sha256 = "0ldmzcx5lxa81lcr39djcvyhd0ls11jlswj5877rinq3505ayf5l"; - }; - } -] diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index e6dca02dace7..47298fb4dbc2 100644 --- a/pkgs/applications/networking/droopy/default.nix +++ b/pkgs/applications/networking/droopy/default.nix @@ -1,7 +1,5 @@ { stdenv, lib, fetchFromGitHub, wrapPython, fetchpatch }: -with lib; - stdenv.mkDerivation { pname = "droopy"; version = "20160830"; @@ -32,7 +30,7 @@ stdenv.mkDerivation { wrapPythonPrograms ''; - meta = { + meta = with lib; { description = "Mini Web server that let others upload files to your computer"; homepage = "http://stackp.online.fr/droopy"; license = licenses.bsd3; diff --git a/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/pkgs/applications/networking/dyndns/dyndnsc/default.nix index 07854f48fcc6..5ee8db44cc7c 100644 --- a/pkgs/applications/networking/dyndns/dyndnsc/default.nix +++ b/pkgs/applications/networking/dyndns/dyndnsc/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { json-logging setuptools ]; - checkInputs = with python3Packages; [ bottle mock pytest-console-scripts pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ bottle mock pytest-console-scripts pytestCheckHook ]; disabledTests = [ # dnswanip connects to an external server to discover the diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index 032238d399d1..54d0b862b891 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -44,7 +44,7 @@ in python3.pkgs.buildPythonApplication rec { webtest ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ mock pytestCheckHook ]; diff --git a/pkgs/applications/networking/feedreaders/fluent-reader/default.nix b/pkgs/applications/networking/feedreaders/fluent-reader/default.nix new file mode 100644 index 000000000000..968e8dd84a14 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/fluent-reader/default.nix @@ -0,0 +1,35 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "fluent-reader"; + version = "1.1.3"; + + src = fetchurl { + url = "https://github.com/yang991178/fluent-reader/releases/download/v${version}/Fluent.Reader.${version}.AppImage"; + hash = "sha256-CzvhOaWfZ4rt2HmL/yv6P7IxEPLoyuBhftOxcjdMInU="; + }; + + appimageContents = appimageTools.extractType2 { inherit pname version src; }; +in appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + mkdir -p $out/share/${pname} + cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + install -Dm 444 ${appimageContents}/${pname}.desktop -t $out/share/applications + cp -a ${appimageContents}/usr/share/icons $out/share/ + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "Modern desktop RSS reader built with Electron, React, and Fluent UI"; + homepage = "https://hyliu.me/fluent-reader"; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/networking/feedreaders/goeland/default.nix b/pkgs/applications/networking/feedreaders/goeland/default.nix index 946e145a5707..4c82bcdd3168 100644 --- a/pkgs/applications/networking/feedreaders/goeland/default.nix +++ b/pkgs/applications/networking/feedreaders/goeland/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "goeland"; - version = "0.12.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = "slurdge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R3ZkGTq0g90DkflLXr2MUBIv5Qspi3OM+sdDGqJYjyw="; + sha256 = "sha256-MD8wdXOZ8Kmun8AYv/zlRKwgAcGu2A349Xr8d7SVX4s="; }; - vendorSha256 = "sha256-iljGBe8c6dqEHRpMN5cz7wmminejoiXXDKuQDazDztA="; + vendorHash = "sha256-BErLmtzgVqDKLFAnKugDBwj3Vgm8rM6BfWcMOhu4SWY="; ldflags = [ "-s" @@ -23,14 +23,15 @@ buildGoModule rec { ]; meta = with lib; { - description = "An alternative to RSS2Email written in golang with many filters."; + description = "An alternative to rss2email written in golang with many filters"; longDescription = '' - Goeland excels at creating beautiful emails from RSS, - tailored for daily or weekly digest. It include a number of + Goeland excels at creating beautiful emails from RSS feeds, + tailored for daily or weekly digest. It includes a number of filters that can transform the RSS content along the way. - It can also consume other sources, such as a Imgur tag. + It can also consume other sources, such as Imgur tags. ''; homepage = "https://github.com/slurdge/goeland"; + changelog = "https://github.com/slurdge/goeland/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = [ maintainers.sweenu ]; }; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 464883ef8fca..a93391bbbb1b 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.29"; + version = "2.30.1"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - hash = "sha256-/R+ahUOgQR71kTZIpsic1gEYxJzbnY8x6AxtkzYTCDo="; + hash = "sha256-hiZN3wWknshP8MG4ThhbMLyhQkuFozzoETs3mYaMVro="; }; - cargoHash = "sha256-uHhP5XurJHM31fJqsqW9tumPzzMMOEeEWAAsllazcME="; + cargoHash = "sha256-Ap8i8hLqrUi6aSn4wKAdG3Z/5or+bF+epDaWUdWYt78"; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.isDarwin '' @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ Security Foundation libiconv gettext ]; postBuild = '' - make prefix="$out" + make -j $NIX_BUILD_CORES prefix="$out" ''; # https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set @@ -44,12 +44,11 @@ rustPlatform.buildRustPackage rec { doCheck = true; preCheck = '' - make test + make -j $NIX_BUILD_CORES test ''; postInstall = '' - make prefix="$out" install - cp -r contrib $out + make -j $NIX_BUILD_CORES prefix="$out" install '' + lib.optionalString stdenv.isDarwin '' for prog in $out/bin/*; do wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 7b53d2210feb..fafda428fe6e 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -17,23 +17,24 @@ , glib-networking , librsvg , gst_all_1 +, gitUpdater }: stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "2.2.2"; + version = "2.2.4"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = "refs/tags/v.${finalAttrs.version}"; - sha256 = "sha256-QEfbuTJ0spp0g/XPoS0ZaqudSkWZtXMd3ZTzAHiv45Q="; + sha256 = "sha256-civHj8a5LYV3XaAjSJBdn15+8sdO/yLlWBXCNW56plA="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${finalAttrs.pname}-${finalAttrs.version}"; src = finalAttrs.src; - sha256 = "sha256-AGsiB+xNSZzaG/PFgjKNKQopRUcyX27sLdyhT626Gcc="; + sha256 = "sha256-vgqyFdc1m53SYqnYE6JLp1/tK7rFrohYOT/BTO6fUI0="; }; patches = [ @@ -87,6 +88,10 @@ stdenv.mkDerivation (finalAttrs: { gst-plugins-bad ]); + passthru.updateScript = gitUpdater { + rev-prefix = "v."; + }; + meta = with lib; { description = "A modern feed reader designed for the GNOME desktop"; homepage = "https://gitlab.com/news-flash/news_flash_gtk"; diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 08dcc091b907..132fe7f627cc 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -7,7 +7,7 @@ buildPythonApplication rec { version = "3.14"; propagatedBuildInputs = [ feedparser html2text ]; - checkInputs = [ beautifulsoup4 ]; + nativeCheckInputs = [ beautifulsoup4 ]; src = fetchurl { url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index e94c981e489f..f1225f87eefb 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "4.2.4"; + version = "4.3.1"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "sha256-6JRANTUbHyMAuA7lhAQtlgJIW6l39XNUtKQMVN6FHJU="; + sha256 = "sha256-hfUtxPGPhPC2VgGLLIaYHlEMpXHAPZ5fkLL0glhyQcY="; }; buildInputs = [ qtwebengine qttools ]; diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index cd020e2bd7df..1cd83cda77a9 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = [ libmrss ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - checkInputs = [ cppcheck ]; + nativeCheckInputs = [ cppcheck ]; postPatch = '' substituteInPlace Makefile --replace -liconv_hook "" diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix index a684ac49d296..b11c3d60c908 100644 --- a/pkgs/applications/networking/firewalld/default.nix +++ b/pkgs/applications/networking/firewalld/default.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation rec { pname = "firewalld"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "firewalld"; repo = "firewalld"; rev = "v${version}"; - sha256 = "sha256-8LLhrAArqa7t9vPe9TE2F0eTfScHFtfolfcXcfboKZQ="; + sha256 = "sha256-UQ61do0f0bT3VNyZAx2ZuwQ+6SGvKUS6V5Y1B6EpJ5Q="; }; patches = [ diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 008579ea54fa..8da9a49f90a5 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { python.pkgs.pyqt5 python.pkgs.qtpy ]; - checkInputs = [ + nativeCheckInputs = [ python.pkgs.mock xvfb-run ]; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 16461e4d0c4f..f14433b6c179 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.5.5"; + version = "3.5.21"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-jyMjcFQXv9wGcvBU+Ki970HAgSQD57Zx3G9gf/mj25A="; + hash = "sha256-VVZvr0h98bWJW9FNFr3/pw7pSqF62hCnr6iv9xSzXf8="; }; postPatch = '' @@ -72,6 +72,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://flexget.com/"; + changelog = "https://github.com/Flexget/Flexget/releases/tag/v${version}"; description = "Multipurpose automation tool for all of your media"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/applications/networking/freefilesync/default.nix index f2d34b602ee3..49bc342724e0 100644 --- a/pkgs/applications/networking/freefilesync/default.nix +++ b/pkgs/applications/networking/freefilesync/default.nix @@ -9,17 +9,18 @@ , libssh2 , openssl , wxGTK32 +, gitUpdater }: gcc12Stdenv.mkDerivation rec { pname = "freefilesync"; - version = "11.27"; + version = "12.0"; src = fetchFromGitHub { owner = "hkneptune"; repo = "FreeFileSync"; rev = "v${version}"; - sha256 = "sha256-ZIWqCR5/8qaK9Qcb0Uzi/wu3Do8nZ5DGAw8sfwUhCZg="; + hash = "sha256-7vdhSEh43mpVbrzJzt005EkwoXfknYnAC+FZIAZF020="; }; # Patches from ROSA Linux @@ -88,6 +89,10 @@ gcc12Stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = with lib; { description = "Open Source File Synchronization & Backup Software"; homepage = "https://freefilesync.org"; diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 5a4585135f01..287e83ffa050 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -12,17 +12,18 @@ , sqlite , tinyxml , wrapGAppsHook -, wxGTK30-gtk3 +, wxGTK30 +, gtk3 , xdg-utils }: stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.61.0"; + version = "3.62.2"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - hash = "sha256-Cv7w5NolICaHsy7Wsf/NhELVs1vc0W308Cuy6pLimfc="; + hash = "sha256-p2cJY1yg6kdPaR9sYLGRM0rzB57xksB8NGUEuqtzjBI="; }; configureFlags = [ @@ -42,8 +43,8 @@ stdenv.mkDerivation rec { pugixml sqlite tinyxml - wxGTK30-gtk3 - wxGTK30-gtk3.gtk + wxGTK30 + gtk3 xdg-utils ]; diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index 411031f605ed..75e3b43a1a27 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -52,9 +52,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://github.com/Alecaddd/taxi"; diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix index b62bda3c469f..20ef4e682c7e 100644 --- a/pkgs/applications/networking/gdrive/default.nix +++ b/pkgs/applications/networking/gdrive/default.nix @@ -1,24 +1,34 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "gdrive"; - version = "2.1.0"; - rev = version; - - goPackagePath = "github.com/prasmussen/gdrive"; + version = "2.1.1"; src = fetchFromGitHub { - owner = "prasmussen"; - repo = "gdrive"; - sha256 = "0ywm4gdmrqzb1a99vg66a641r74p7lglavcpgkm6cc2gdwzjjfg7"; - inherit rev; + owner = "prasmussen"; + repo = "gdrive"; + rev = version; + hash = "sha256-2dJmGFHfGSroucn4WgiV2NExBs5wtMDe2kX1jDBwbRs="; }; + deleteVendor = true; + vendorHash = "sha256-sHNP1YwnZYu0UfgLx5+gxJmesY8Brt7rr9cptlyk9Bk="; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/prasmussen/gdrive/pull/585/commits/faa6fc3dc104236900caa75eb22e9ed2e5ecad42.patch"; + hash = "sha256-W8o2ZfhQFJISHfPavjx9sw5UB6xOZ7qRW4L0bHNddS8="; + }) + ]; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { - homepage = "https://github.com/prasmussen/gdrive"; + homepage = "https://github.com/prasmussen/gdrive"; description = "A command line utility for interacting with Google Drive"; - platforms = platforms.unix; - license = licenses.mit; + license = licenses.mit; + platforms = platforms.unix; maintainers = [ maintainers.rzetterberg ]; }; } diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 756cbd7c8b97..e0c45e8eede3 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -46,7 +46,8 @@ python3.pkgs.buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ --replace "psutil==" "psutil>=" \ - --replace "jsonschema>=4.17.0,<4.18" "jsonschema" + --replace "jsonschema>=4.17.0,<4.18" "jsonschema" \ + --replace "sentry-sdk==1.10.1,<1.11" "sentry-sdk" ''; meta = with lib; { diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 5eee199d6915..5bc6e9be80c2 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -24,7 +24,8 @@ python3.pkgs.buildPythonApplication { postPatch = '' substituteInPlace requirements.txt \ --replace "psutil==" "psutil>=" \ - --replace "jsonschema>=4.17.0,<4.18" "jsonschema" + --replace "jsonschema>=4.17.0,<4.18" "jsonschema" \ + --replace "sentry-sdk==1.10.1,<1.11" "sentry-sdk" ''; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/networking/go-graft/default.nix b/pkgs/applications/networking/go-graft/default.nix index 7e268e27f1a0..88319182a648 100644 --- a/pkgs/applications/networking/go-graft/default.nix +++ b/pkgs/applications/networking/go-graft/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "go-graft"; - version = "0.2.15"; + version = "0.2.16"; src = fetchFromGitHub { owner = "mzz2017"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-INoJcb6XUMvT1E56hC3BGK3Ax+v4jSRpZV12zpjYfMA="; + sha256 = "sha256-zdOcQ/+WXS7pDfnvYdb/FDjMT3yJdwnS8DoH2MIDcDs="; }; CGO_ENABLED = 0; ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ]; - vendorSha256 = "sha256-kKIekANzLY2TYFyII1/BkKkqPYgmHB9xEfAVhJyI8FI="; + vendorHash = "sha256-kx94B1XIXWJOY9Y69lNb/sHWVjsuFuOXrdtJFJrUuAs="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index a61458155d0c..2367f847d107 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,12 +1,13 @@ { lib, buildDunePackage, fetchFromGitHub , extlib, ocamlfuse, gapi-ocaml, ocaml_sqlite3 , tiny_httpd -, ounit +, ounit2 }: buildDunePackage rec { pname = "google-drive-ocamlfuse"; version = "0.7.30"; + duneVersion = "3"; src = fetchFromGitHub { owner = "astrada"; @@ -16,7 +17,7 @@ buildDunePackage rec { }; doCheck = true; - checkInputs = [ ounit ]; + checkInputs = [ ounit2 ]; buildInputs = [ extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ]; diff --git a/pkgs/applications/networking/headlines/default.nix b/pkgs/applications/networking/headlines/default.nix new file mode 100644 index 000000000000..ed26c6f60de2 --- /dev/null +++ b/pkgs/applications/networking/headlines/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, cmake +, pkg-config +, libmicrohttpd +, curl +, openssl +, jsoncpp +, libxml2 +, gst_all_1 +, boost +, websocketpp +, libadwaita +, gtkmm4 +, libsecret +, fetchFromGitLab +, makeWrapper +, xdg-utils +, youtube-dl +, ffmpeg +}: + +stdenv.mkDerivation rec { + pname = "headlines"; + version = "0.7.2"; + + src = fetchFromGitLab { + owner = "caveman250"; + repo = "Headlines"; + rev = version; + sha256 = "sha256-wamow0UozX5ecKbXWOgsWCerInL4J0gK0+Muf+eoO9k="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + ]; + + buildInputs = [ + libmicrohttpd + curl + openssl + jsoncpp + libxml2 + boost + websocketpp + libadwaita + gtkmm4 + libsecret + ] ++ (with gst_all_1; [ + gstreamer + gst-libav + gst-plugins-base + (gst-plugins-good.override { gtkSupport = true; }) + gst-plugins-bad + ]); + + postFixup = '' + wrapProgram "$out/bin/headlines" \ + --prefix PATH : "${lib.makeBinPath [ xdg-utils youtube-dl ffmpeg ]}" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + ''; + + meta = with lib; { + description = "GTK4 / Libadwaita Reddit client written in C++"; + homepage = "https://gitlab.com/caveman250/Headlines"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ chuangzhu ]; + }; +} diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index f2f850556849..a44f3f555dee 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -34,11 +34,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "6.0.6"; + version = "6.0.8"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-ABc2NPp2ruY244qQscAmFskD5CFzEH1HtBFJYLX76Dk="; + sha256 = "sha256-JTzjzA35Z62TcdbqjU7tkexZPfPtBOCCKcfPhXgMkaM="; }; nativeBuildInputs = [ @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free and open source, mature, fast and robust network threat detection engine"; - homepage = "https://suricata-ids.org"; + homepage = "https://suricata.io"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ magenbluten ]; diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix index a150014daa7c..f402faf965be 100644 --- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost166 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost }: stdenv.mkDerivation rec { pname = "SkypeExport"; @@ -11,8 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1ilkh0s3dz5cp83wwgmscnfmnyck5qcwqg1yxp9zv6s356dxnbak"; }; + patches = [ + (fetchpatch { + name = "boost167.patch"; + url = "https://github.com/Temptin/SkypeExport/commit/ef60f2e4fc9e4a5764c8d083a73b585457bc10b1.patch"; + sha256 = "sha256-t+/v7c66OULmQCD/sNt+iDJeQ/6UG0CJ8uQY2PVSFQo="; + }) + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ boost166 ]; + buildInputs = [ boost ]; preConfigure = "cd src/SkypeExport/_gccbuild/linux"; installPhase = "install -Dt $out/bin SkypeExport"; @@ -21,7 +29,7 @@ stdenv.mkDerivation rec { description = "Export Skype history to HTML"; homepage = "https://github.com/Temptin/SkypeExport"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ yana ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index 87e96f7b622f..c9b2c4a21280 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.57.0"; + version = "8.58.2"; src = fetchurl { url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb"; - sha256 = "sha256-xYHi+lOONE2cxEcuuN2bWh5kF5fcfCNq2GII792IGro="; + sha256 = "sha256-z6GjIR9K4OWFuQTGBbP05aYFNa2sD1UW4e/GW01xj78="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index c145174367f6..0c43ffbeea91 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -4,6 +4,7 @@ , autoPatchelfHook , dpkg , makeWrapper +, wrapGAppsHook , alsa-lib , at-spi2-atk , at-spi2-core @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { pname = "armcord"; - version = "3.0.8"; + version = "3.1.4"; src = let @@ -45,15 +46,17 @@ stdenv.mkDerivation rec { { x86_64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_amd64.deb"; - sha256 = "sha256-Lzkh1RDRoZSg5GNYlntROHdKLj12ogCqH+h8l5en9U0="; + sha256 = "sha256-B/zDcW43ChhnAnGL+UEAt/QChxxEpv+yMgO7WsUi84k="; }; aarch64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_arm64.deb"; - sha256 = "sha256-PuQ/zhuv+MA59Cx6QypAmg5Q6zVwfKg+1xKbazb3XM0="; + sha256 = "sha256-cFmxs7HeF+jxtmZ827bQbRyuXhQx++x5iTIefZ55928="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook ]; + + dontWrapGApps = true; buildInputs = [ alsa-lib @@ -109,6 +112,8 @@ stdenv.mkDerivation rec { # Wrap the startup command makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \ + "''${gappsWrapperArgs[@]}" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ "''${gappsWrapperArgs[@]}" diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index 4450eefa6eb0..6badb7cda760 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -1,6 +1,5 @@ { lib, fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkg-config, glib }: -with lib; stdenv.mkDerivation rec { pname = "bitlbee-discord"; version = "0.4.3"; @@ -21,7 +20,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = { + meta = with lib; { description = "Bitlbee plugin for Discord"; homepage = "https://github.com/sm00th/bitlbee-discord"; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix index abd50868e030..3e09a6aa25b8 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix @@ -1,6 +1,5 @@ { lib, fetchgit, stdenv, bitlbee, autoreconfHook, pkg-config, glib }: -with lib; stdenv.mkDerivation rec { pname = "bitlbee-mastodon"; version = "1.4.5"; @@ -19,7 +18,7 @@ stdenv.mkDerivation rec { export BITLBEE_DATADIR=$out/share/bitlbee ''; - meta = { + meta = with lib; { description = "Bitlbee plugin for Mastodon"; homepage = "https://alexschroeder.ch/cgit/bitlbee-mastodon/about"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 580af6e2e0ce..441963f57ddf 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -1,6 +1,5 @@ { lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, libgcrypt }: -with lib; stdenv.mkDerivation rec { version = "1.4.2"; pname = "bitlbee-steam"; @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = { + meta = with lib; { description = "Steam protocol plugin for BitlBee"; homepage = "https://github.com/jgeboski/bitlbee-steam"; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index de8c4dc1026e..99ce3f8811ef 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -3,7 +3,6 @@ , enablePam ? false, pam ? null }: -with lib; stdenv.mkDerivation rec { pname = "bitlbee"; version = "3.6"; @@ -13,11 +12,11 @@ stdenv.mkDerivation rec { sha256 = "0zhhcbcr59sx9h4maf8zamzv2waya7sbsl7w74gbyilvy93dw5cz"; }; - nativeBuildInputs = [ pkg-config ] ++ optional doCheck check; + nativeBuildInputs = [ pkg-config ] ++ lib.optional doCheck check; buildInputs = [ gnutls libotr python3 ] - ++ optional enableLibPurple pidgin - ++ optional enablePam pam; + ++ lib.optional enableLibPurple pidgin + ++ lib.optional enablePam pam; propagatedBuildInputs = [ glib ]; @@ -25,8 +24,8 @@ stdenv.mkDerivation rec { "--otr=1" "--ssl=gnutls" "--pidfile=/var/lib/bitlbee/bitlbee.pid" - ] ++ optional enableLibPurple "--purple=1" - ++ optional enablePam "--pam=1"; + ] ++ lib.optional enableLibPurple "--purple=1" + ++ lib.optional enablePam "--pam=1"; patches = [ # This should be dropped once the issue is fixed upstream. @@ -46,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "IRC instant messaging gateway"; longDescription = '' diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix b/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix index 997882bbc8bb..f750f7f9d602 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix @@ -1,7 +1,5 @@ { lib, runCommandLocal, bitlbee }: -with lib; - plugins: runCommandLocal "bitlbee-plugins" { inherit plugins; buildInputs = [ bitlbee plugins ]; diff --git a/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix b/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix index 1b16786649f9..8613a2585e2c 100644 --- a/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix @@ -1,7 +1,8 @@ { lib , stdenv -, fetchzip +, fetchurl , openjdk +, libnotify , makeWrapper , tor , p7zip @@ -18,14 +19,15 @@ let in stdenv.mkDerivation rec { pname = "briar-desktop"; - version = "0.2.1-beta"; + version = "0.4.0-beta"; - src = fetchzip { - url = "https://code.briarproject.org/briar/briar-desktop/-/jobs/18424/artifacts/download?file_type=archive"; - sha256 = "sha256-ivMbgo0+iZE4/Iffq9HUBErGIQMVLrRZUQ6R3V3X8II="; - extension = "zip"; + src = fetchurl { + url = "https://desktop.briarproject.org/jars/linux/${version}/briar-desktop-linux-${version}.jar"; + hash = "sha256-7zeIWsdPvROHGaf5igodlZss6Gow3kp6PX+QAzmxMnw="; }; + dontUnpack = true; + nativeBuildInputs = [ makeWrapper p7zip @@ -33,9 +35,12 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/{bin,lib} - cp ${src}/briar-desktop.jar $out/lib/ + cp ${src} $out/lib/briar-desktop.jar makeWrapper ${openjdk}/bin/java $out/bin/briar-desktop \ - --add-flags "-jar $out/lib/briar-desktop.jar" + --add-flags "-jar $out/lib/briar-desktop.jar" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + libnotify + ]}" ''; fixupPhase = '' @@ -53,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://code.briarproject.org/briar/briar-desktop"; license = licenses.gpl3; maintainers = with maintainers; [ onny ]; - platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix index 78178f0021e2..2e4dc6dbb55e 100644 --- a/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = "http://www.centerim.org/"; + homepage = "https://www.centerim.org/"; description = "Fork of CenterICQ, a curses instant messaging program"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index e637881d968c..f1fc99177084 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -1,17 +1,17 @@ -{ mkDerivation, stdenv, lib, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl, wrapQtAppsHook }: +{ stdenv, lib, cmake, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qtimageformats, qttools, boost, openssl, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "chatterino2"; - version = "2.3.5"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Chatterino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ozfLLoNUN+1SPXbMNbF1V5sdZgPZEA/J3xXzJP9D3uI="; + sha256 = "sha256-6t7Or2heyV0B5zdWZpN80iADe52faNVlIEZYtcixpZo="; fetchSubmodules = true; }; - nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; - buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + buildInputs = [ qtbase qtsvg qtmultimedia qtimageformats qttools boost openssl ]; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" mv bin/chatterino.app "$out/Applications/" diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index 541bcc72f5ac..da4e41bed585 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -29,16 +29,15 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "unstable-2022-09-20"; + version = "0.7.0_rc5"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "chatty"; - # https://source.puri.sm/Librem5/chatty/-/tree/247c53fd990f7472ddd1a92c2f9e1299ae3ef4e4 - rev = "247c53fd990f7472ddd1a92c2f9e1299ae3ef4e4"; + rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-9hgQC0vLmmJJxrBWTdTIrJbSSwLS23uVoJri2ieCj4E="; + hash = "sha256-5V0ApHxsJaQ0MBhMlv1IxnD9Vq+Yw85jFvlvghhFxNI="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix index 09e73514ab78..142bd5e38272 100644 --- a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { name = "cinny-desktop"; - version = "2.2.2"; + version = "2.2.4"; src = fetchurl { url = "https://github.com/cinnyapp/cinny-desktop/releases/download/v${version}/Cinny_desktop-x86_64.deb"; - sha256 = "sha256-TdKxVvhz6DTJ9ZST/OBc37DcH9lpoKrY5yP8skTO9eQ="; + sha256 = "sha256-ibUXNGgc23ndTqQKD0np5EH1T3xipVAmETbIy7akqkg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index d5246206e82d..807444696f08 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 = "2.2.2"; + version = "2.2.4"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "sha256-MNmU6MvDwGbFNQt7qe08klXjy1n2LiABlPkARGvjVJU="; + hash = "sha256-BqxEZgI9uxoUpl/CJ2jSWjNIpfP2N392C4h/muBlhZY="; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 3e0e0362f200..3d9fc7627b60 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -1,6 +1,7 @@ { lib +, buildNpmPackage , copyDesktopItems -, electron_18 +, electron_22 , buildGoModule , esbuild , fetchFromGitHub @@ -8,9 +9,9 @@ , libdeltachat , makeDesktopItem , makeWrapper -, nodePackages , noto-fonts-emoji , pkg-config +, python3 , roboto , rustPlatform , sqlcipher @@ -20,52 +21,48 @@ let libdeltachat' = libdeltachat.overrideAttrs (old: rec { - version = "1.86.0"; + version = "1.107.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-VLS93Ffeit2rVmXxYkXcnf8eDA3DC2/wKYZTh56QCk0="; + hash = "sha256-fjiS7GZy1BLgmxu4LFOWgucORcVx+9KleQcga+hRkSY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${old.pname}-${version}"; - hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk="; + hash = "sha256-7XhSI/C0GEmsaL0UupvufB1bfPGbzSQJH720Y4/Do3o="; }; - patches = [ - (fetchpatch { - name = "turn-off-hard-errors-for-lints.patch"; - url = "https://github.com/deltachat/deltachat-core-rust/commit/7598c50dbaa2abcbd417d96a02743269f666597b.patch"; - hash = "sha256-Xss44v6Wf6mL3FK9hH+oFYZ0fBA9rSh4wDrr7nSUibQ="; - }) - ]; }); esbuild' = esbuild.override { buildGoModule = args: buildGoModule (args // rec { - version = "0.12.29"; + version = "0.14.54"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-oU++9E3StUoyrMVRMZz8/1ntgPI62M1NoNz9sH/N5Bg="; + hash = "sha256-qCtpy69ROCspRgPKmCV0YY/EOSWiNU/xwDblU0bQp4w="; }; - vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); }; -in nodePackages.deltachat-desktop.override rec { +in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.30.1"; + version = "1.34.3"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-gZjZbXiqhFVfThZOsvL/nKkf6MX+E3KB5ldEAIuzBYA="; + hash = "sha256-6WZJD8lMsk1WNguMkXygBCTVpOzNkNuVZJ3Ygv6VBkM="; }; + npmDepsHash = "sha256-B91yQ/xi8+uyOllqYR7lZTfLBpJvZat1cIIJk9TkM/c="; + nativeBuildInputs = [ makeWrapper pkg-config + python3 ] ++ lib.optionals stdenv.isLinux [ copyDesktopItems ]; @@ -81,20 +78,25 @@ in nodePackages.deltachat-desktop.override rec { USE_SYSTEM_LIBDELTACHAT = "true"; VERSION_INFO_GIT_REF = src.rev; - postRebuild = '' + preBuild = '' rm -r node_modules/deltachat-node/node/prebuilds - - npm run build4production ''; - postInstall = '' + npmBuildScript = "build4production"; + + installPhase = '' + runHook preInstall + npm prune --production - install -D $out/lib/node_modules/deltachat-desktop/build/icon.png \ - $out/share/icons/hicolor/scalable/apps/deltachat.png + mkdir -p $out/lib/node_modules/deltachat-desktop + cp -r . $out/lib/node_modules/deltachat-desktop awk '!/^#/ && NF' build/packageignore_list \ - | xargs -I {} sh -c "rm -rf {}" || true + | xargs -I {} sh -c "rm -rf $out/lib/node_modules/deltachat-desktop/{}" || true + + install -D build/icon.png \ + $out/share/icons/hicolor/scalable/apps/deltachat.png ln -sf ${noto-fonts-emoji}/share/fonts/noto/NotoColorEmoji.ttf \ $out/lib/node_modules/deltachat-desktop/html-dist/fonts/noto/emoji @@ -103,9 +105,11 @@ in nodePackages.deltachat-desktop.override rec { $out/lib/node_modules/deltachat-desktop/html-dist/fonts done - makeWrapper ${electron_18}/bin/electron $out/bin/deltachat \ + makeWrapper ${electron_22}/bin/electron $out/bin/deltachat \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \ --add-flags $out/lib/node_modules/deltachat-desktop + + runHook postInstall ''; desktopItems = lib.singleton (makeDesktopItem { @@ -117,11 +121,14 @@ in nodePackages.deltachat-desktop.override rec { comment = meta.description; categories = [ "Network" "InstantMessaging" "Chat" ]; startupWMClass = "DeltaChat"; - mimeTypes = [ "x-scheme-handler/openpgp4fpr" "x-scheme-handler/mailto" ]; + mimeTypes = [ + "x-scheme-handler/openpgp4fpr" + "x-scheme-handler/dcaccount" + "x-scheme-handler/dclogin" + "x-scheme-handler/mailto" + ]; }); - passthru.updateScript = ./update.sh; - meta = with lib; { description = "Email-based instant messaging for Desktop"; homepage = "https://github.com/deltachat/deltachat-desktop"; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json deleted file mode 100644 index 96778eda7aa6..000000000000 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "name": "deltachat-desktop", - "version": "1.30.1", - "dependencies": { - "@blueprintjs/core": "^4.1.2", - "@deltachat/message_parser_wasm": "^0.4.0", - "@deltachat/react-qr-reader": "^4.0.0", - "@mapbox/geojson-extent": "^1.0.0", - "application-config": "^1.0.1", - "classnames": "^2.3.1", - "debounce": "^1.2.0", - "deltachat-node": "1.86.0", - "emoji-js-clean": "^4.0.0", - "emoji-mart": "^3.0.1", - "emoji-regex": "^9.2.2", - "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.29.2", - "path-browserify": "^1.0.1", - "rc": "^1.2.8", - "react": "^17.0.2", - "react-dom": "^17.0.2", - "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", - "url-parse": "^1.5.9", - "use-debounce": "^3.3.0", - "@babel/core": "^7.7.7", - "@babel/preset-env": "^7.7.7", - "@babel/preset-react": "^7.7.4", - "@types/debounce": "^1.2.0", - "@types/emoji-mart": "^3.0.9", - "@types/mapbox-gl": "^0.54.5", - "@types/mime-types": "^2.1.0", - "@types/node": "^14.14.20", - "@types/rc": "^1.1.0", - "@types/react": "^17.0.2", - "@types/react-dom": "^17.0.2", - "@types/react-window": "^1.8.4", - "@types/react-window-infinite-loader": "^1.0.4", - "@types/url-parse": "^1.4.3", - "electron": "^18.0.3", - "esbuild": "^0.12.29", - "glob-watcher": "^5.0.5", - "sass": "^1.26.5", - "typescript": "^4.4.4", - "xml-js": "^1.6.8" - } -} diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh deleted file mode 100755 index a21a97b3b83c..000000000000 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh +++ /dev/null @@ -1,45 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils curl gnused jq moreutils nix-prefetch - -set -euo pipefail -cd "$(dirname "$0")" - -owner=deltachat -repo=deltachat-desktop -nixpkgs=../../../../.. - -rev=$( - curl -s "https://api.github.com/repos/$owner/$repo/releases" | - jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output -) -ver=$(echo "$rev" | sed 's/^v//') -old_ver=$(tac default.nix | sed -n 's/.*\bversion = "\(.*\)".*/\1/p' | head -1) -if [ "$ver" = "$old_ver" ]; then - echo "Up to date: $ver" - exit -fi -echo "$old_ver -> $ver" - -hash=$(nix-prefetch -f "$nixpkgs" deltachat-desktop --rev "$rev") -tac default.nix \ - | sed -e "0,/version = \".*\"/s//version = \"$ver\"/" \ - -e "0,/hash = \".*\"/s//hash = \"${hash//\//\\/}\"/" \ - | tac \ - | sponge default.nix - -src=$(nix-build "$nixpkgs" -A deltachat-desktop.src --no-out-link) - -jq '{ name, version, dependencies: (.dependencies + (.devDependencies | del(.["@types/chai","@types/mocha","@types/node-fetch","@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","node-fetch","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 - echo "package.json not changed, skip updating nodePackages" - rm package.json.new -else - echo "package.json changed, updating nodePackages" - mv package.json{.new,} - - pushd ../../../../development/node-packages - ./generate.sh - popd -fi diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 72e546286bf5..5a65b43a8acb 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -75,6 +75,9 @@ stdenv.mkDerivation rec { cmakeFlags = ["-DBUILD_TESTS=yes"]; + # Undefined symbols for architecture arm64: "_gpg_strerror" + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lgpg-error"; + doCheck = true; checkPhase = '' runHook preCheck diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 9fd102705563..fdfb992192b3 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,9 +1,9 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.21"; - ptb = "0.0.35"; - canary = "0.0.143"; + stable = "0.0.24"; + ptb = "0.0.38"; + canary = "0.0.146"; } else { stable = "0.0.264"; ptb = "0.0.59"; @@ -14,15 +14,15 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "KDKUssPRrs/D10s5GhJ23hctatQmyqd27xS9nU7iNaM="; + sha256 = "sha256-SG+34ft0mTqtg9rFiI60N6JIONyqF8c8SlnRcn5a4Xc="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "bnp5wfcR21s7LMPxFgj5G3UsxPWlFj4t6CbeosiufHY="; + sha256 = "bPg7ZNQQxEpRSpp8j5/XLBDEJyId8mDGxS6tqkzzI1s="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-K+yyg9GTAvggfn4JQCTmq016tMyyzq+nD7aL3+bWFlo="; + sha256 = "sha256-5GiG+RGqwHUdIeSVWpbaIw3sTuZbvIQeetXSEvSqTls="; }; }; x86_64-darwin = { diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 0b246125ffe7..72a9d2d3eba4 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -1,10 +1,11 @@ { pname, version, src, openasar, meta, binaryName, desktopName, autoPatchelfHook , makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk , at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf -, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11 +, glib, gtk3, libcxx, libdrm, libglvnd, libnotify, libpulseaudio, libuuid, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss , pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand +, wayland , branch , common-updater-scripts, withOpenASAR ? false }: @@ -64,6 +65,7 @@ stdenv.mkDerivation rec { gdk-pixbuf glib gtk3 + libglvnd libnotify libX11 libXcomposite @@ -82,6 +84,7 @@ stdenv.mkDerivation rec { libXScrnSaver libappindicator-gtk3 libdbusmenu + wayland ]; installPhase = '' @@ -96,7 +99,7 @@ stdenv.mkDerivation rec { wrapProgramShell $out/opt/${binaryName}/${binaryName} \ "''${gappsWrapperArgs[@]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \ --run "${lib.getExe disableBreakingUpdates}" diff --git a/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/pkgs/applications/networking/instant-messengers/discord/openasar.nix index 2ba3cf79a618..95f1625f1af1 100644 --- a/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openasar"; - version = "unstable-2022-10-10"; + version = "unstable-2023-01-13"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "7a04cb57dff43f328de78addc234e9d21ff079a8"; - hash = "sha256-6zYXv+iAfDEFHQ4FwNVEA4+zWiDyeLvkm17f4LuaCJg="; + rev = "40b27dd1b8dd48277207db1b165c220c3441484c"; + hash = "sha256-tDJxcnbX0REu8DX+bQ7i4JzvLl6lRyB7+/dnAJI18Ss="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index e192e33c4969..55d8227f5759 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -57,6 +57,11 @@ stdenv.mkDerivation rec { runHook postConfigure ''; + # Only affects unused scripts in $out/share/element/electron/scripts. Also + # breaks because there are some `node`-scripts with a `npx`-shebang and + # this shouldn't be in the closure just for unused scripts. + dontPatchShebangs = true; + buildPhase = '' runHook preBuild diff --git a/pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix b/pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix new file mode 100644 index 000000000000..c9a143ecb49e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix @@ -0,0 +1,26 @@ +{ stdenv +, jq +, element-web-unwrapped +, conf ? { } +}: + +if (conf == { }) then element-web-unwrapped else +stdenv.mkDerivation rec { + pname = "${element-web-unwrapped.pname}-wrapped"; + inherit (element-web-unwrapped) version meta; + + dontUnpack = true; + + nativeBuildInputs = [ jq ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + ln -s ${element-web-unwrapped}/* $out + rm $out/config.json + jq -s '.[0] * $conf' "${element-web-unwrapped}/config.json" --argjson "conf" '${builtins.toJSON conf}' > "$out/config.json" + + runHook postInstall + ''; +} diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 864c70f1917b..b73fda72174a 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -9,102 +9,79 @@ , fixup_yarn_lock , nodejs , jitsi-meet -, conf ? { } }: let pinData = lib.importJSON ./pin.json; noPhoningHome = { disable_guests = true; # disable automatic guest account registration at matrix.org - piwik = false; # disable analytics - }; - - unwrapped = stdenv.mkDerivation rec { - pname = "element-web"; - inherit (pinData) version; - - src = fetchFromGitHub { - owner = "vector-im"; - repo = pname; - rev = "v${version}"; - sha256 = pinData.webSrcHash; - }; - - offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - sha256 = pinData.webYarnHash; - }; - - nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ]; - - configurePhase = '' - runHook preConfigure - - export HOME=$PWD/tmp - # with the update of openssl3, some key ciphers are not supported anymore - # this flag will allow those codecs again as a workaround - # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07 - # and https://github.com/vector-im/element-web/issues/21043 - export NODE_OPTIONS=--openssl-legacy-provider - mkdir -p $HOME - - fixup_yarn_lock yarn.lock - yarn config --offline set yarn-offline-mirror $offlineCache - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - export VERSION=${version} - yarn build:res --offline - yarn build:module_system --offline - yarn build:bundle --offline - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - cp -R webapp $out - cp ${jitsi-meet}/libs/external_api.min.js $out/jitsi_external_api.min.js - echo "${version}" > "$out/version" - jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json" - - runHook postInstall - ''; - - meta = { - description = "A glossy Matrix collaboration client for the web"; - homepage = "https://element.io/"; - changelog = "https://github.com/vector-im/element-web/blob/v${version}/CHANGELOG.md"; - maintainers = lib.teams.matrix.members; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - }; }; in -if (conf == { }) then unwrapped else stdenv.mkDerivation rec { - pname = "${unwrapped.pname}-wrapped"; - inherit (unwrapped) version meta; + pname = "element-web"; + inherit (pinData) version; - dontUnpack = true; + src = fetchFromGitHub { + owner = "vector-im"; + repo = pname; + rev = "v${version}"; + sha256 = pinData.webSrcHash; + }; - nativeBuildInputs = [ jq ]; + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + sha256 = pinData.webYarnHash; + }; + + nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$PWD/tmp + # with the update of openssl3, some key ciphers are not supported anymore + # this flag will allow those codecs again as a workaround + # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07 + # and https://github.com/vector-im/element-web/issues/21043 + export NODE_OPTIONS=--openssl-legacy-provider + mkdir -p $HOME + + fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror $offlineCache + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + export VERSION=${version} + yarn build:res --offline + yarn build:module_system --offline + yarn build:bundle --offline + + runHook postBuild + ''; installPhase = '' runHook preInstall - mkdir -p $out - ln -s ${unwrapped}/* $out - rm $out/config.json - jq -s '.[0] * $conf' "${unwrapped}/config.json" --argjson "conf" '${builtins.toJSON conf}' > "$out/config.json" + cp -R webapp $out + cp ${jitsi-meet}/libs/external_api.min.js $out/jitsi_external_api.min.js + echo "${version}" > "$out/version" + jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json" runHook postInstall ''; + + meta = { + description = "A glossy Matrix collaboration client for the web"; + homepage = "https://element.io/"; + changelog = "https://github.com/vector-im/element-web/blob/v${version}/CHANGELOG.md"; + maintainers = lib.teams.matrix.members; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + }; } diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index 436a8a8f4bf6..ccb7ecd1537f 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,7 +1,7 @@ { - "version": "1.11.14", - "desktopSrcHash": "91WCtb+ylVz9gSqOHb5GuSC1YZjDS3M8gdFIZYVls3c=", - "desktopYarnHash": "1ng9fwpwxsw91bzgd2kb2pdq927rkjv5rrrkmszvn55bj6ry7sqi", - "webSrcHash": "ss7Pmjg205EE/V/xIV7nvfZFRyyJfuB8MDM9dCnPckQ=", - "webYarnHash": "1v6qlk58msam9dglal4jzcyqcsrspa6idsdb8acjnscdkj26bkps" + "version": "1.11.22", + "desktopSrcHash": "UJesD6cshsf/NK2ZTzOtAUfH+8JcGP9oCLFhkgfM0E0=", + "desktopYarnHash": "0bq24rjf63rkq3jphv7raqaz2fnibmj41z905k5f3l4ln835ndfv", + "webSrcHash": "B2clSJgKkjvQdIXQgi3bBPaVTDKOjeNBOvkAtcPOkFI=", + "webYarnHash": "182fh1ayh1y98kbg4mn8fxqvljs19b02j4ivvjszm55dcpwfp1df" } diff --git a/pkgs/applications/networking/instant-messengers/element/update.sh b/pkgs/applications/networking/instant-messengers/element/update.sh index b02e1d022393..976b6cb0ba8f 100755 --- a/pkgs/applications/networking/instant-messengers/element/update.sh +++ b/pkgs/applications/networking/instant-messengers/element/update.sh @@ -1,9 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github -# FIXME should fix itself on the next release -> remove the warning if that's the case -echo "WARNING: on the last update, the yarn.lock had to be patched. Please be careful when updating the hashes!" - if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the element packages." echo "Usage: $0 [git release tag]" diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index 0102476954ec..740e793d6520 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -61,13 +61,13 @@ }: stdenv.mkDerivation rec { - version = "5.14.14"; + version = "5.18.11"; pname = "feishu"; - packageHash = "2844ab12b34f"; # A hash value used in the download url + packageHash = "9d89b152d581"; # A hash value used in the download url src = fetchurl { url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/${packageHash}/Feishu-linux_x64-${version}.deb"; - sha256 = "c0ca999edc10d8ada08c46b33b15d7db0ced264248abd3ebfdb895d8457e1bec"; + hash = "sha256-93LEybYePIEbmE8mjRL95haMuBuY0xH6/8fhwF7/ctM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/fractal-next/default.nix b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix index 5613fbc899b4..9203850b6388 100644 --- a/pkgs/applications/networking/instant-messengers/fractal-next/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix @@ -67,10 +67,15 @@ stdenv.mkDerivation rec { libshumate ]; + # enables pipewire API deprecated in 0.3.64 + # fixes error caused by https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55 + NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ]; + meta = with lib; { description = "Matrix group messaging app (development version)"; homepage = "https://gitlab.gnome.org/GNOME/fractal"; license = licenses.gpl3Plus; maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler ]); + mainProgram = "fractal"; }; } diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index bfc322fea6cf..b5c0db75a743 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -92,10 +92,12 @@ stdenv.mkDerivation rec { patchShebangs scripts/meson_post_install.py scripts/test.sh ''; + preConfigure = '' + export GETTEXT_DIR="${gettext}" + ''; + passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { @@ -103,5 +105,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/fractal"; license = licenses.gpl3; maintainers = teams.gnome.members ++ (with maintainers; [ dtzWill ]); + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index b23b64790710..091bbf66e3d9 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.5.3"; + version = "1.6.1"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "sha256-JSV4592s7oKJzxBghtlrvXqCoO6iCRoYNu/eaqPfuLA="; + hash = "sha256-3D87Ou/842WqbaUiJV1hRZFVkZzQ12GXCpRc8F3rKPQ="; }; buildInputs = [ @@ -56,13 +56,13 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] ++ extraPythonPackages python3.pkgs; - checkInputs = [ xvfb-run dbus.daemon ]; + nativeCheckInputs = [ xvfb-run dbus ]; checkPhase = '' xvfb-run dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - ${python3.interpreter} -m unittest discover -s test/gtk -v - ${python3.interpreter} -m unittest discover -s test/no_gui -v + --config-file=${dbus}/share/dbus-1/session.conf \ + ${python3.interpreter} -m unittest discover -s test/gui -v + ${python3.interpreter} -m unittest discover -s test/common -v ''; # necessary for wrapGAppsHook diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 695089c23e61..55b3ef6899f7 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -13,28 +13,22 @@ buildGoModule rec { pname = "gomuks"; - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "tulir"; repo = pname; rev = "v${version}"; - sha256 = "bTOfnEmJHTuniewH//SugNNDuKIFMQb1Safs0UVKH1c="; + sha256 = "sha256-gLyjqmGZudj8PmsYUGXHOjetZzi6u5CFI7Y50y2XAzk="; }; - vendorSha256 = "PuNROoxL7UmcuYDgfnsMUsGk9i1jnQyWtaUmT7vXdKE="; + vendorSha256 = "sha256-FmQJG6hv0YPyHVjZ/DvkQExrGLc1hjoiPS59MnqG2gU="; doCheck = false; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ olm ]; - # Upstream issue: https://github.com/tulir/gomuks/issues/260 - patches = lib.optional stdenv.isLinux (substituteAll { - src = ./hardcoded_path.patch; - soundTheme = sound-theme-freedesktop; - }); - postInstall = '' cp -r ${ makeDesktopItem { @@ -49,7 +43,9 @@ buildGoModule rec { }/* $out/ substituteAllInPlace $out/share/applications/* wrapProgram $out/bin/gomuks \ - --prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.isLinux [ libnotify pulseaudio ])}" + --prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.isLinux [ libnotify pulseaudio ])}" \ + --set-default GOMUKS_SOUND_NORMAL "${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/message-new-instant.oga" \ + --set-default GOMUKS_SOUND_CRITICAL "${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/complete.oga" ''; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch b/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch deleted file mode 100644 index dd89c92fd3d4..000000000000 --- a/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lib/notification/notify_xdg.go b/lib/notification/notify_xdg.go -index 7f102b8..996c15f 100644 ---- a/lib/notification/notify_xdg.go -+++ b/lib/notification/notify_xdg.go -@@ -26,8 +26,8 @@ import ( - var notifySendPath string - var audioCommand string - var tryAudioCommands = []string{"ogg123", "paplay"} --var soundNormal = "/usr/share/sounds/freedesktop/stereo/message-new-instant.oga" --var soundCritical = "/usr/share/sounds/freedesktop/stereo/complete.oga" -+var soundNormal = "@soundTheme@/share/sounds/freedesktop/stereo/message-new-instant.oga" -+var soundCritical = "@soundTheme@/share/sounds/freedesktop/stereo/complete.oga" - - func getSoundPath(env, defaultPath string) string { - if path, ok := os.LookupEnv(env); ok { diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 3c43d715c01f..5bf231ec924b 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -4,17 +4,17 @@ with ocamlPackages; buildDunePackage rec { pname = "jackline"; - version = "unstable-2021-12-28"; + version = "unstable-2022-05-27"; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "ca1012098d123c555e9fa5244466d2e009521700"; - sha256 = "1j1azskcdrp4g44rv3a4zylkzbzpcs23zzzrx94llbgssw6cd9ih"; + rev = "d8f7c504027a0dd51966b2b7304d6daad155a05b"; + hash = "sha256-6SWYl2mB0g8JNVHBeTnZEbzOaTmVbsRMMEs+3j/ewwk="; }; nativeBuildInpts = [ @@ -28,20 +28,21 @@ buildDunePackage rec { mirage-crypto-pk x509 domain-name - ocaml_lwt + lwt otr astring ptime notty sexplib hex - uutf uchar - uuseg uucp + uuseg + uutf dns-client cstruct base64 + happy-eyeballs-lwt ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/jami/client-qt.nix b/pkgs/applications/networking/instant-messengers/jami/client.nix similarity index 87% rename from pkgs/applications/networking/instant-messengers/jami/client-qt.nix rename to pkgs/applications/networking/instant-messengers/jami/client.nix index 7733b05168b6..f76d9ee9f12a 100644 --- a/pkgs/applications/networking/instant-messengers/jami/client-qt.nix +++ b/pkgs/applications/networking/instant-messengers/jami/client.nix @@ -25,13 +25,12 @@ }: stdenv.mkDerivation { - pname = "jami-client-qt"; + pname = "jami-client"; inherit version src; sourceRoot = "source/client-qt"; preConfigure = '' - python gen-resources.py echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h ''; @@ -61,8 +60,8 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DRING_BUILD_DIR=${jami-daemon}/include" - "-DRING_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces" + "-DLIBJAMI_INCLUDE_DIR=${jami-daemon}/include/jami" + "-DLIBJAMI_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces" ] ++ lib.optionals (!withWebengine) [ "-DWITH_WEBENGINE=false" ]; diff --git a/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/pkgs/applications/networking/instant-messengers/jami/daemon.nix index 131ca7b913c0..715560c6e128 100644 --- a/pkgs/applications/networking/instant-messengers/jami/daemon.nix +++ b/pkgs/applications/networking/instant-messengers/jami/daemon.nix @@ -21,7 +21,7 @@ , libnatpmp , libpulseaudio , libupnp -, libyamlcpp +, yaml-cpp , msgpack , opendht-jami , openssl @@ -62,7 +62,7 @@ stdenv.mkDerivation { libnatpmp libpulseaudio libupnp - libyamlcpp + yaml-cpp msgpack opendht-jami openssl diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index a2d53141f413..ea898c0da8c9 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -3,7 +3,8 @@ , callPackage , fetchFromGitHub , fetchzip -, ffmpeg +, fetchpatch +, ffmpeg_5 , pjsip , opendht , jack @@ -12,11 +13,11 @@ }: let - version = "20220825.0828.c10f01f"; + version = "20221220.0956.79e1207"; src = fetchzip { url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz"; - hash = "sha256-axQYU7+kOFE9SnI8fR4F6NFvD9ITZ85UJhg5OVniSlg="; + hash = "sha256-AQgz2GqueFG+yK42zJ9MzvP4BddGt0BFb+cIoA6Fif8="; stripRoot = false; postFetch = '' @@ -40,7 +41,7 @@ let readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file)); in rec { - ffmpeg-jami = (ffmpeg.override rec { + ffmpeg-jami = (ffmpeg_5.override rec { version = "5.0.1"; branch = version; sha256 = "sha256-KN8z1AChwcGyDQepkZeAmjuI73ZfXwfcH/Bn+sZMWdY="; @@ -50,7 +51,14 @@ rec { patch-src = src + "/daemon/contrib/src/ffmpeg/"; in { - patches = old.patches ++ (map (x: patch-src + x) (readLinesToList ./config/ffmpeg_patches)); + patches = old.patches ++ (map (x: patch-src + x) (readLinesToList ./config/ffmpeg_patches)) ++ + # SDL2 recently changed their versioning + [ + (fetchpatch { + url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=e5163b1d34381a3319214a902ef1df923dd2eeba"; + hash = "sha256-nLhP2+34cj5EgpnUrePZp60nYAxmbhZAEDfay4pBVk0="; + }) + ]; configureFlags = old.configureFlags ++ (readLinesToList ./config/ffmpeg_args_common) ++ lib.optionals stdenv.isLinux (readLinesToList ./config/ffmpeg_args_linux) @@ -63,16 +71,29 @@ rec { patch-src = src + "/daemon/contrib/src/pjproject/"; in rec { - version = "513a3f14c44b2c2652f9219ec20dea64b236b713"; + version = "eae25732568e600d248aa8c226271ff6b81df170"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "pjproject"; rev = version; - sha256 = "sha256-93AlJGMnlzJMrJquelpHQQKjhEgfpTFXTMqkBnm87u8="; + sha256 = "sha256-N7jn4qen+PgFiVkTFi2HSWhx2QPHwAYMtnrpE/ptDVc="; }; - patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)); + patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)) ++ [ + (fetchpatch { + name = "CVE-2022-23537.patch"; + url = "https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1.patch"; + sha256 = "sha256-7ueQCHIiJ7MLaWtR4+GmBc/oKaP+jmEajVnEYqiwLRA="; + }) + (fetchpatch { + name = "CVE-2022-23547.patch"; + url = "https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36.patch"; + sha256 = "sha256-bpc8e8VAQpfyl5PX96G++6fzkFpw3Or1PJKNPKl7N5k="; + }) + ]; + + patchFlags = [ "-p1" "-l" ]; configureFlags = (readLinesToList ./config/pjsip_args_common) ++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux); @@ -87,7 +108,7 @@ rec { inherit version src udev jack jami-meta ffmpeg-jami pjsip-jami opendht-jami; }; - jami-client-qt = qt6Packages.callPackage ./client-qt.nix { - inherit version src jami-meta ffmpeg-jami; + jami-client = qt6Packages.callPackage ./client.nix { + inherit version src ffmpeg-jami jami-meta; }; } diff --git a/pkgs/applications/networking/instant-messengers/keet/default.nix b/pkgs/applications/networking/instant-messengers/keet/default.nix new file mode 100644 index 000000000000..557078cd8b50 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/keet/default.nix @@ -0,0 +1,32 @@ +{ lib, appimageTools, fetchurl }: + +let + pname = "keet"; + version = "1.2.1"; + + src = fetchurl { + url = "https://keet.io/downloads/${version}/Keet.AppImage"; + sha256 = "1f76ccfa16719a24f6d84b88e5ca49fab1c372de309ce74393461903c5c49d98"; + }; + + appimageContents = appimageTools.extract { inherit pname version src; }; +in appimageTools.wrapType2 { + inherit src pname version; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "Peer-to-Peer Chat"; + homepage = "https://keet.io"; + license = licenses.unfree; + maintainers = with maintainers; [ extends ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 3132faeb630d..2869401b5969 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -8,7 +8,7 @@ , liblinphone , mediastreamer , mediastreamer-openh264 -, minizip2 +, minizip-ng , mkDerivation , qtgraphicaleffects , qtquickcontrols2 @@ -33,7 +33,7 @@ mkDerivation rec { pname = "linphone-desktop"; - version = "4.4.10"; + version = "5.0.8"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +41,7 @@ mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-V3vycO0kV6RTFZWi6uiCFSNfLq/09dBfyLk/5zw3kRA="; + hash = "sha256-e/0yGHtOHMgPhaF5xELodKS9/v/mbnT3ZpE12lXAocU="; }; patches = [ @@ -54,7 +54,7 @@ mkDerivation rec { postPatch = '' echo "project(linphoneqt VERSION ${version})" >linphone-app/linphoneqt_version.cmake substituteInPlace linphone-app/src/app/AppController.cpp \ - --replace "LINPHONE_QT_GIT_VERSION" "\"${version}\"" + --replace "APPLICATION_SEMVER" "\"${version}\"" ''; # TODO: After linphone-desktop and liblinphone split into separate packages, @@ -70,7 +70,7 @@ mkDerivation rec { mediastreamer mediastreamer-openh264 - minizip2 + minizip-ng qtgraphicaleffects qtquickcontrols2 qttranslations @@ -81,7 +81,7 @@ mkDerivation rec { ]; cmakeFlags = [ - "-DMINIZIP_INCLUDE_DIRS=${minizip2}/include" + "-DMINIZIP_INCLUDE_DIRS=${minizip-ng}/include" "-DMINIZIP_LIBRARIES=minizip" # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index 1535b694231e..6a1b5086bc93 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -57,7 +57,7 @@ buildPythonApplication rec { description = "Simple but convenient CLI-based Matrix client app for sending and receiving"; homepage = "https://github.com/8go/matrix-commander"; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.seb314 ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 50d68eeeba1c..e6b3d84c7b79 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -3,83 +3,89 @@ , fetchFromGitHub , cmake , asciidoc +, pkg-config +, boost17x , cmark +, coeurl +, curl +, libevent +, libsecret , lmdb , lmdbxx -, libsecret -, mkDerivation +, mtxclient +, nlohmann_json +, olm , qtbase +, qtgraphicaleffects +, qtimageformats , qtkeychain , qtmacextras , qtmultimedia -, qtimageformats -, qttools , qtquickcontrols2 -, qtgraphicaleffects -, mtxclient -, boost17x +, qttools +, re2 , spdlog -, olm -, pkg-config -, nlohmann_json -, coeurl -, libevent -, curl +, wrapQtAppsHook , voipSupport ? true , gst_all_1 , libnice }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "nheko"; - version = "0.10.2"; + version = "0.11.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "sha256-gid8XOZ1/hMDGNbse4GYfcAdqHiySWyy4isBgcpekIQ="; + hash = "sha256-2sN5lVjJ/CPH9U6NfZkAYZUTT+YDgPOy9dTVGp0svkg="; }; nativeBuildInputs = [ - lmdbxx - cmake - pkg-config asciidoc + cmake + lmdbxx + pkg-config + wrapQtAppsHook ]; buildInputs = [ - nlohmann_json - mtxclient - olm boost17x + cmark + coeurl + curl + libevent libsecret lmdb - spdlog - cmark + mtxclient + nlohmann_json + olm qtbase - qtmultimedia - qtimageformats - qttools - qtquickcontrols2 qtgraphicaleffects + qtimageformats qtkeychain - coeurl - libevent - curl + qtmultimedia + qtquickcontrols2 + qttools + re2 + spdlog ] ++ lib.optional stdenv.isDarwin qtmacextras - ++ lib.optionals voipSupport (with gst_all_1; [ - gstreamer - gst-plugins-base - (gst-plugins-good.override { qt5Support = true; }) - gst-plugins-bad - libnice - ]); + ++ lib.optionals voipSupport (with gst_all_1; [ + gstreamer + gst-plugins-base + (gst-plugins-good.override { qt5Support = true; }) + gst-plugins-bad + libnice + ]); cmakeFlags = [ "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389 ]; + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + preFixup = lib.optionalString voipSupport '' # add gstreamer plugins path to the wrapper qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") @@ -88,11 +94,11 @@ mkDerivation rec { meta = with lib; { description = "Desktop client for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/nheko"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ekleog fpletz ]; platforms = platforms.all; # Should be fixable if a higher clang version is used, see: # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 - broken = stdenv.targetPlatform.isDarwin; - license = licenses.gpl3Plus; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 49114903a59a..10d2cb87f8b5 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { pydbus ]; - checkInputs = [ + nativeCheckInputs = [ pytest faker pytest-aiohttp diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix index 7c076cb37241..388f633f3dab 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix @@ -1,20 +1,41 @@ -{ lib, stdenv, fetchurl, pidgin, intltool, python2 } : +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pidgin +}: stdenv.mkDerivation rec { pname = "purple-plugin-pack"; - version = "2.7.0"; + version = "2.8.0"; + src = fetchurl { - url = "https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/purple-plugin-pack-${version}.tar.bz2"; - sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b"; + url = "mirror://sourceforge/pidgin/purple-plugin-pack-2.8.0.tar.xz"; + hash = "sha256-gszemnJRp1t+A6P5qSkBTY4AjBtvRuWGOPX0dto+JC0="; }; - nativeBuildInputs = [ intltool ]; - buildInputs = [ pidgin python2 ]; + postPatch = '' + substituteInPlace meson.build \ + --replace "PURPLE.get_pkgconfig_variable('plugindir')" "'$out/lib/purple-2'" \ + --replace "PURPLE.get_pkgconfig_variable('datadir')" "'$out/share'" \ + --replace "PIDGIN.get_pkgconfig_variable('plugindir')" "'$out/lib/pidgin'" \ + --replace "PIDGIN.get_pkgconfig_variable('datadir')" "'$out/share'" + ''; + + nativeBuildInputs = [ + meson + ninja + ]; + + buildInputs = [ + pidgin + ]; meta = with lib; { - homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack"; - description = "Plugin pack for Pidgin 2.x"; - license = licenses.gpl2; + homepage = "https://keep.imfreedom.org/pidgin/purple-plugin-pack"; + description = "Collection of plugins for purple-based clients such as Pidgin"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ bdimcheff ]; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix index fa314e82dac8..a01477997047 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool ]; buildInputs = [ pidgin gmime libxml2 nss ]; + configureFlags = [ "--without-dbus" ]; enableParallelBuilding = true; postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index f5d2479bdaa1..2023997aa811 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -9,11 +9,11 @@ let unwrapped = stdenv.mkDerivation rec { pname = "pidgin"; - version = "2.14.10"; + version = "2.14.12"; src = fetchurl { url = "mirror://sourceforge/pidgin/pidgin-${version}.tar.bz2"; - sha256 = "sha256-RUsbkovGvLsYM1OvMPv95VlfIkWjQjoaRubJei3yKBA="; + sha256 = "sha256-KwUka+IIYF7buTrp7cB5WD1EniqXENttNI0X9ZAgpLc="; }; nativeBuildInputs = [ makeWrapper intltool ]; diff --git a/pkgs/applications/networking/instant-messengers/poezio/default.nix b/pkgs/applications/networking/instant-messengers/poezio/default.nix index bd8c492ff28f..7d83dcf2d23c 100644 --- a/pkgs/applications/networking/instant-messengers/poezio/default.nix +++ b/pkgs/applications/networking/instant-messengers/poezio/default.nix @@ -46,7 +46,7 @@ buildPythonApplication rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 138e5989d0fe..22638a4c2083 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.1642"; + version = "1.5.1644"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "sha256-voaGYYt1CZTxiumKvIVupMxdrLKACnfxvtnYfGuya1I="; + sha256 = "sha256-wSfgV0moBar27xa91ywky7Apr5QHISZ27lQlp02J1Mg="; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix new file mode 100644 index 000000000000..bc7b973c7b9b --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -0,0 +1,88 @@ +{ alsa-lib +, cups +, dpkg +, fetchurl +, gjs +, glib +, gtk3 +, lib +, libdrm +, libgcrypt +, libkrb5 +, mesa # for libgbm +, nss +, xorg +, systemd +, stdenv +, at-spi2-core +, autoPatchelfHook +, wrapGAppsHook +}: + +let + version = "3.0.0-571"; + srcs = { + x86_64-linux = fetchurl { + url = "https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_${version}_amd64.deb"; + sha256 = "sha256-8KcUhZwgeFzGyrQITWnJUzEPGZOCj0LIHLmRuKqkgmQ="; + }; + aarch64-linux = fetchurl { + url = "https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_${version}_arm64.deb"; + sha256 = "sha256-LvE+Pryq4KLu+BFYVrGiTwBdgOrBguPHQd73MMFlfiY="; + }; + }; + src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); +in +stdenv.mkDerivation { + pname = "qq"; + inherit version src; + + unpackCmd = "dpkg-deb -x $curSrc source"; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + dpkg + ]; + + buildInputs = [ + alsa-lib + at-spi2-core + cups + gtk3 + glib + libdrm + libgcrypt + libkrb5 + mesa + nss + xorg.libXdamage + ]; + + runtimeDependencies = [ + (lib.getLib systemd) + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r opt $out/opt + cp -r usr/share $out/share + substituteInPlace $out/share/applications/qq.desktop \ + --replace "/opt/QQ/qq" "$out/bin/qq" \ + --replace "/usr/share" "$out/share" + ln -s $out/opt/QQ/qq $out/bin/qq + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://im.qq.com/linuxqq/"; + description = "Messaging app"; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ fee1-dead ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 1d7888f78c81..04c2fa27e559 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,29 +1,41 @@ -{ stdenv, callPackage, fetchurl, lib }: +{ appimageTools, lib, fetchurl, makeDesktopItem }: let - mkRambox = opts: callPackage (import ./rambox.nix opts) {}; -in -mkRambox rec { pname = "rambox"; - version = "0.7.9"; + version = "2.0.10"; - src = { - x86_64-linux = fetchurl { - url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-x86_64.AppImage"; - sha256 = "19y4cmrfp79dr4hgl698imp4f3l1nhgvhh76j5laxg46ld71knil"; - }; - i686-linux = fetchurl { - url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.AppImage"; - sha256 = "13wiciyshyrabq2mvnssl2d6svia1kdvwx3dl26249iyif96xxvq"; - }; - }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + src = fetchurl { + url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; + sha256 = "sha256-NvsrWkdINrQV7V9SLfjtlN+obgQb0u8d/QgjGpZ+fpc="; + }; + + desktopItem = (makeDesktopItem { + desktopName = "Rambox"; + name = pname; + exec = "rambox"; + icon = pname; + categories = [ "Network" ]; + }); + + appimageContents = appimageTools.extractType2 { + inherit pname version src; + }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps + ln -sf rambox-${version} $out/bin/${pname} + install -Dm644 ${appimageContents}/usr/share/icons/hicolor/256x256/apps/rambox*.png $out/share/icons/hicolor/256x256/apps/${pname}.png + install -Dm644 ${desktopItem}/share/applications/* $out/share/applications + ''; meta = with lib; { - description = "Free and Open Source messaging and emailing app that combines common web applications into one"; - homepage = "https://rambox.pro"; - license = licenses.mit; - maintainers = with maintainers; []; - platforms = [ "i686-linux" "x86_64-linux" ]; - hydraPlatforms = []; + description = "Workspace Simplifier - a cross-platform application organizing web services into Workspaces similar to browser profiles"; + homepage = "https://rambox.app"; + license = licenses.unfree; + maintainers = with maintainers; [ nazarewk ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix deleted file mode 100644 index e8b48232ee33..000000000000 --- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, callPackage, fetchurl, lib }: - -let - mkRambox = opts: callPackage (import ./rambox.nix opts) { }; -in mkRambox rec { - pname = "rambox-pro"; - version = "1.5.0"; - - desktopName = "Rambox Pro"; - - src = { - x86_64-linux = fetchurl { - url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.AppImage"; - sha256 = "1g7lrjm8yxklqpc2mp8gy0g61wfilr15dl80r3sh6pa5b4k5spir"; - }; - }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - - meta = with lib; { - description = "Messaging and emailing app that combines common web applications into one"; - homepage = "https://rambox.pro"; - license = licenses.unfree; - maintainers = with maintainers; [ cawilliamson ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix deleted file mode 100644 index b9b5175d3b87..000000000000 --- a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ pname, version, src, meta, desktopName ? "Rambox" }: - -{ appimageTools, lib, fetchurl, makeDesktopItem }: - -let - name = "${pname}-${version}"; - - desktopItem = (makeDesktopItem { - inherit desktopName; - name = pname; - exec = pname; - icon = pname; - categories = [ "Network" ]; - }); - - appimageContents = appimageTools.extractType2 { - inherit name src; - }; -in appimageTools.wrapType2 rec { - inherit name src meta; - - extraInstallCommands = '' - mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps - # CE uses rambox-, Pro uses rambox - mv $out/bin/rambox* $out/bin/${pname} - install -Dm644 ${appimageContents}/usr/share/icons/hicolor/256x256/apps/rambox*.png $out/share/icons/hicolor/256x256/apps/${pname}.png - install -Dm644 ${desktopItem}/share/applications/* $out/share/applications - ''; -} diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 58cd952edbbc..5dcb22050763 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchgit, libtoxcore , conf ? null }: -with lib; - let - configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); + configFile = lib.optionalString (conf!=null) (builtins.toFile "config.h" conf); in stdenv.mkDerivation { pname = "ratox"; @@ -22,12 +20,12 @@ in stdenv.mkDerivation { substituteInPlace config.mk \ --replace '-lsodium -lopus -lvpx ' "" - ${optionalString (conf!=null) "cp ${configFile} config.def.h"} + ${lib.optionalString (conf!=null) "cp ${configFile} config.def.h"} ''; makeFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with lib; { description = "FIFO based tox client"; homepage = "http://ratox.2f30.org/"; license = licenses.isc; diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json index 3e5af22c824a..a0e94dc0f1d6 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/pin.json +++ b/pkgs/applications/networking/instant-messengers/schildichat/pin.json @@ -1,9 +1,9 @@ { - "version": "1.11.13-sc.1", - "rev": "v1.11.13-sc.1", - "srcHash": "1yvd0mzw4qz03nf6im2msi1lp1v4ca9zknvb3ls6va11nxr01h3g", - "webYarnHash": "0bmjg9qhd89bdnh398lp257mxdgdd88wj5g3fmc3cavyd6hmgzbn", - "jsSdkYarnHash": "0j0jhbfhq0zabnc4glk2kypn53mi5s09l39i41p0zv7g1riwz7al", - "reactSdkYarnHash": "195ck2k5fhzi1b8grh5c88aiq4i3baqanjx48dam76li2msfxxfn", - "desktopYarnHash": "1scp9y2lmah3n20f1kpc9paspd3qgslg129diis7g11cz4h0wyi5" + "version": "1.11.22-sc.1", + "rev": "v1.11.22-sc.1", + "srcHash": "0di80hjd0d8bsbgbnddbmdjllc7cssgaxy27kd50j4dmw8qll1hv", + "webYarnHash": "182fh1ayh1y98kbg4mn8fxqvljs19b02j4ivvjszm55dcpwfp1df", + "jsSdkYarnHash": "0a8c7y34wh8bk1v35sa1s3s4piqkzvhjrzzapack4kzl1pfn0vix", + "reactSdkYarnHash": "0nhw9vk0yk2v738b2w6jjq5pfib5j66m5maxczhm40zync8b1wmp", + "desktopYarnHash": "0bq24rjf63rkq3jphv7raqaz2fnibmj41z905k5f3l4ln835ndfv" } diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix index 0573c7231e27..cf2c44f5f2f2 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix @@ -58,13 +58,18 @@ stdenv.mkDerivation rec { runHook postConfigure ''; + # Only affects unused scripts in $out/share/element/electron/scripts. Also + # breaks because there are some `node`-scripts with a `npx`-shebang and + # this shouldn't be in the closure just for unused scripts. + dontPatchShebangs = true; + buildPhase = '' runHook preBuild pushd element-desktop - npx tsc - yarn run i18n - node ./scripts/copy-res.js + yarn --offline run build:ts + yarn --offline run i18n + yarn --offline run build:res popd runHook postBuild @@ -97,10 +102,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - # Do not attempt generating a tarball for element-web again. - # note: `doDist = false;` does not work. - distPhase = ";"; - # The desktop item properties should be kept in sync with data from upstream: # https://github.com/schildichat/element-desktop/blob/sc/package.json desktopItems = [ diff --git a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix index 6d2d79c6c7a2..bb7c49c3106a 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix @@ -8,12 +8,12 @@ }: let - version = "1.10.3"; + version = "1.10.4"; pname = "session-desktop"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "sha256-I9YyzfI8EqH8LZe5E5BnD9lGPAdQo++l3yRClfN7+pY="; + sha256 = "sha256-pSVTfZvjqWVgx3FAbIJO6e26GHZbhZBppxEptEuozQo="; }; appimage = appimageTools.wrapType2 { inherit version pname src; diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index d102e144c521..f8037e1ef47c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.11.5.1"; + version = "0.11.6"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz"; - sha256 = "sha256-VHQz7FlEugTv5gJrJr5WLdYHkoQ6lTlUP3JVy20j1mM="; + hash = "sha256-DWG67Jr2hDas1aL5Q+9MUjNKNLFpOFLsehYbJfy/rzg="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 3e0dc4695bb0..2c34523f5513 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,139 +1,12 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, makeWrapper, nixosTests -, 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, xdg-utils -}: - -stdenv.mkDerivation rec { - pname = "signal-desktop"; - version = "5.63.1"; # 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: - # $ grep -a "^{\"buildExpiration" "${signal-desktop}/lib/Signal/resources/app.asar" - # (Alternatively we could try to patch the asar archive, but that requires a - # few additional steps and might not be the best idea.) - - src = fetchurl { - url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-+zeYjWRFEY09f3o49TcJU14fM1Wks7uR0GsyU2eMJPk="; +{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { + signal-desktop = { + dir = "Signal"; + version = "6.4.1"; + hash = "sha256-/Rrph74nVr64Z6blNNn3oMM25YK92MZY/vuF1d+r6Yc="; }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - (wrapGAppsHook.override { inherit makeWrapper; }) - ]; - - buildInputs = [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - libappindicator-gtk3 - libnotify - libuuid - mesa # for libgbm - nspr - nss - pango - systemd - xorg.libxcb - xorg.libxshmfence - ]; - - runtimeDependencies = [ - (lib.getLib systemd) - libappindicator-gtk3 - libnotify - libdbusmenu - xdg-utils - ]; - - unpackPhase = "dpkg-deb -x $src ."; - - dontBuild = true; - dontConfigure = true; - dontPatchELF = true; - # We need to run autoPatchelf manually with the "no-recurse" option, see - # https://github.com/NixOS/nixpkgs/pull/78413 for the reasons. - dontAutoPatchelf = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - - mv usr/share $out/share - mv opt/Signal $out/lib/Signal - - # Note: The following path contains bundled libraries: - # $out/lib/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/ - # We run autoPatchelf with the "no-recurse" option to avoid picking those - # up, but resources/app.asar still requires them. - - # Symlink to bin - mkdir -p $out/bin - ln -s $out/lib/Signal/signal-desktop $out/bin/signal-desktop - - # Create required symlinks: - ln -s libGLESv2.so $out/lib/Signal/libGLESv2.so.2 - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} - ) - - # Fix the desktop link - substituteInPlace $out/share/applications/signal-desktop.desktop \ - --replace /opt/Signal/signal-desktop $out/bin/signal-desktop - - autoPatchelf --no-recurse -- $out/lib/Signal/ - patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc-x64.node - ''; - - # Tests if the application launches and waits for "Link your phone to Signal Desktop": - passthru.tests.application-launch = nixosTests.signal-desktop; - - meta = { - description = "Private, simple, and secure messenger"; - longDescription = '' - Signal Desktop is an Electron application that links with your - "Signal Android" or "Signal iOS" app. - ''; - homepage = "https://signal.org/"; - changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; - license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ mic92 equirosa ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + signal-desktop-beta = { + dir = "Signal Beta"; + version = "6.5.0-beta.2"; + hash = "sha256-cAX9oU3bJrTOH3RbbfUK+49OiRSLjEZLdpJNOMAa94I="; }; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix new file mode 100644 index 000000000000..e6116c9b4286 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -0,0 +1,182 @@ +{ pname +, dir +, version +, hash +, stdenv +, lib +, fetchurl +, autoPatchelfHook +, dpkg +, wrapGAppsHook +, makeWrapper +, nixosTests +, 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 +, xdg-utils +, wayland +}: + +stdenv.mkDerivation rec { + inherit pname version; # 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: + # $ grep -a "^{\"buildExpiration" "${signal-desktop}/lib/${dir}/resources/app.asar" + # (Alternatively we could try to patch the asar archive, but that requires a + # few additional steps and might not be the best idea.) + + src = fetchurl { + url = "https://updates.signal.org/desktop/apt/pool/main/s/${pname}/${pname}_${version}_amd64.deb"; + inherit hash; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + (wrapGAppsHook.override { inherit makeWrapper; }) + ]; + + buildInputs = [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libappindicator-gtk3 + libnotify + libuuid + mesa # for libgbm + nspr + nss + pango + systemd + xorg.libxcb + xorg.libxshmfence + ]; + + runtimeDependencies = [ + (lib.getLib systemd) + libappindicator-gtk3 + libnotify + libdbusmenu + xdg-utils + wayland + ]; + + unpackPhase = "dpkg-deb -x $src ."; + + dontBuild = true; + dontConfigure = true; + dontPatchELF = true; + # We need to run autoPatchelf manually with the "no-recurse" option, see + # https://github.com/NixOS/nixpkgs/pull/78413 for the reasons. + dontAutoPatchelf = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + + mv usr/share $out/share + mv "opt/${dir}" "$out/lib/${dir}" + + # Note: The following path contains bundled libraries: + # $out/lib/${dir}/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/ + # We run autoPatchelf with the "no-recurse" option to avoid picking those + # up, but resources/app.asar still requires them. + + # Symlink to bin + mkdir -p $out/bin + ln -s "$out/lib/${dir}/${pname}" $out/bin/${pname} + + # Create required symlinks: + ln -s libGLESv2.so "$out/lib/${dir}/libGLESv2.so.2" + + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + ) + + # Fix the desktop link + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace "/opt/${dir}/${pname}" $out/bin/${pname} + + autoPatchelf --no-recurse -- "$out/lib/${dir}/" + patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node" + ''; + + # Tests if the application launches and waits for "Link your phone to Signal Desktop": + passthru.tests.application-launch = nixosTests.signal-desktop; + + meta = { + description = "Private, simple, and secure messenger"; + longDescription = '' + Signal Desktop is an Electron application that links with your + "Signal Android" or "Signal iOS" app. + ''; + homepage = "https://signal.org/"; + changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ mic92 equirosa urandom ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 34514b5dcd46..904e47695d5b 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 = "20221025"; + version = "20230128-1"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-icUyuohJ+nUrmFx/q5+hvjY1My25TwIqh6W6hq1pG4k="; + sha256 = "sha256-wYhftShCL9XozK0c7OLijqzveDvEvv9stpw+6CQND/Y="; }; postPatch = '' @@ -17,15 +17,9 @@ stdenv.mkDerivation rec { buildInputs = [ openssl sqlite ]; - # Manually define `CXXFLAGS` and `LDFLAGS` on Darwin since the build scripts includes flags - # that don't work on Darwin. buildPhase = '' runHook preBuild - '' + lib.optionalString stdenv.isDarwin '' - export CXXFLAGS="-Wall -Wextra -Wshadow -Wold-style-cast -Woverloaded-virtual -pedantic -O3" - export LDFLAGS="-Wall -Wextra -O3" - '' + '' - ./BUILDSCRIPT_MULTIPROC.bash44 + ./BUILDSCRIPT_MULTIPROC.bash44${lib.optionalString stdenv.isDarwin " --config nixpkgs-darwin"} runHook postBuild ''; diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index b6c6d982fb87..a9e023cdf63a 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle_6, git, perl +{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle, git, perl , makeWrapper, fetchpatch, substituteAll, jre_minimal }: @@ -36,7 +36,7 @@ let deps = stdenv.mkDerivation { pname = "${pname}-deps"; inherit src version; - nativeBuildInputs = [ gradle_6 perl ]; + nativeBuildInputs = [ gradle perl ]; patches = [ ./0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - nativeBuildInputs = [ git gradle_6 makeWrapper ]; + nativeBuildInputs = [ git gradle makeWrapper ]; doCheck = true; diff --git a/pkgs/applications/networking/instant-messengers/signaldctl/default.nix b/pkgs/applications/networking/instant-messengers/signaldctl/default.nix new file mode 100644 index 000000000000..cb241bac8fc2 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signaldctl/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildGoModule +, fetchFromGitLab +, gitUpdater +}: + +buildGoModule rec { + pname = "signaldctl"; + version = "0.6.1"; + src = fetchFromGitLab { + owner = "signald"; + repo = "signald-go"; + rev = "v${version}"; + hash = "sha256-lMJyr4BPZ8V2f//CUkr7CVQ6o8nRyeLBHMDEyLcHSgQ="; + }; + + vendorHash = "sha256-LGIWAVhDJCg6Ox7U4ZK15K8trjsvSZm4/0jNpIDmG7I="; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + # install only the binary and not any intermediate artifacts like + # `generators` which is only used during build + cp "$GOPATH/bin/signaldctl" $out/bin + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + + meta = with lib; { + description = "A golang library for communicating with signald"; + homepage = "https://signald.org/signaldctl/"; + license = licenses.gpl3; + maintainers = with maintainers; [ colinsane ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 325d5330d62e..7bd88eaa7545 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -34,6 +34,7 @@ , pango , pipewire , systemd +, wayland , xdg-utils , xorg }: @@ -44,14 +45,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.28.182"; - x86_64-darwin-sha256 = "0x0zc45k0jh0hivgjymcxnnwc2lwyfq68rw39lbxp4i1ir2sbnxg"; + x86_64-darwin-version = "4.29.149"; + x86_64-darwin-sha256 = "sha256-E0YnOPnaWFe17gCpFywxu5uHs1pEktA1tUu4QqvKhYw="; - x86_64-linux-version = "4.28.184"; - x86_64-linux-sha256 = "sha256-qAc9rHJbM7lmqNxOcOSnqnuib5zJ0Ry3hAGri8DKIlo="; + x86_64-linux-version = "4.29.149"; + x86_64-linux-sha256 = "sha256-ulXIGLp2ql47ZS6IeaMuqye39deDtukOB1dxy5BNCwI="; - aarch64-darwin-version = "4.28.182"; - aarch64-darwin-sha256 = "0bc8lhmpm0310gh1w9xkb8i1cpldchm4b4mzsr9h0mhvljxmvlyf"; + aarch64-darwin-version = "4.29.149"; + aarch64-darwin-sha256 = "sha256-Nn+dFD3H/By+aBPLDxnPneNXuFl+tHdLhxJXeYBMORg="; version = { x86_64-darwin = x86_64-darwin-version; @@ -121,6 +122,7 @@ let pipewire stdenv.cc.cc systemd + wayland xorg.libX11 xorg.libXScrnSaver xorg.libXcomposite diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix deleted file mode 100644 index 58335bed4218..000000000000 --- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ mkDerivation, lib, fetchurl, pkg-config, qttools, sconsPackages -, GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2 -, lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib -}: - -mkDerivation rec { - pname = "swift-im"; - version = "4.0.2"; - - src = fetchurl { - url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; - sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; - }; - - patches = [ ./qt-5.11.patch ./scons.patch ]; - - nativeBuildInputs = [ pkg-config qttools sconsPackages.scons_3_1_2 ]; - - buildInputs = [ - GConf avahi boost hunspell libXScrnSaver libedit libidn libnatpmp libxml2 - lua miniupnpc openssl qtbase qtmultimedia qtsvg qtwebkit qtx11extras zlib - ]; - - propagatedUserEnvPkgs = [ GConf ]; - - NIX_CFLAGS_COMPILE = toString [ - "-I${libxml2.dev}/include/libxml2" - "-I${miniupnpc}/include/miniupnpc" - "-I${qtwebkit.dev}/include/QtWebKit" - "-I${qtwebkit.dev}/include/QtWebKitWidgets" - "-fpermissive" - ]; - - installTargets = [ (placeholder "out") ]; - installFlags = [ "SWIFT_INSTALLDIR=${placeholder "out"}" ]; - - meta = with lib; { - homepage = "https://swift.im/"; - description = "Qt XMPP client"; - license = licenses.gpl3; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch b/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch deleted file mode 100644 index 911e7570427f..000000000000 --- a/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h -+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h -@@ -8,6 +8,7 @@ - - #include - -+#include - #include - - #include diff --git a/pkgs/applications/networking/instant-messengers/swift-im/scons.patch b/pkgs/applications/networking/instant-messengers/swift-im/scons.patch deleted file mode 100644 index c63b05d7acb1..000000000000 --- a/pkgs/applications/networking/instant-messengers/swift-im/scons.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot -index 40f242513..53e1ff26a 100644 ---- a/BuildTools/SCons/SConscript.boot -+++ b/BuildTools/SCons/SConscript.boot -@@ -508,6 +508,7 @@ if env.get("distcc", False) : - if var.startswith("DISTCC_") : - env["ENV"][var] = os.environ[var] - -+env["ENV"] = os.environ - conf_env = env.Clone() - - Export("env") -diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct -index 70bffbcfe..fef281899 100644 ---- a/BuildTools/SCons/SConstruct -+++ b/BuildTools/SCons/SConstruct -@@ -272,7 +272,7 @@ if env.get("try_gconf", True) and env["PLATFORM"] != "win32" and env["PLATFORM"] - gconf_env = conf_env.Clone() - conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG}) - if conf.CheckPKG("gconf-2.0") : -- gconf_bare_env = Environment() -+ gconf_bare_env = Environment(ENV = os.environ) - gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0') - if os.path.basename(env["CXX"]).startswith(("g++", "clang++")) : - gconf_bare_env["CCFLAGS"] = [("-isystem" + ccflag) for ccflag in gconf_bare_env["CPPPATH"]] -@@ -634,9 +634,9 @@ hunspell_env.MergeFlags(hunspell_flags) - env["HAVE_HUNSPELL"] = 0; - if env.get("hunspell_enable", False) : - hunspell_conf = Configure(hunspell_env) -- if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell") : -+ if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell-1.6") : - env["HAVE_HUNSPELL"] = 1 -- hunspell_flags["LIBS"] = ["hunspell"] -+ hunspell_flags["LIBS"] = ["hunspell-1.6"] - env["HUNSPELL_FLAGS"] = hunspell_flags - hunspell_conf.Finish() - -diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py -index 89f8963dc..b8559f7a6 100644 ---- a/BuildTools/SCons/Tools/textfile.py -+++ b/BuildTools/SCons/Tools/textfile.py -@@ -113,7 +113,10 @@ def _action(target, source, env): - lsep = None - for s in source: - if lsep: fd.write(lsep) -- fd.write(_do_subst(s, subs)) -+ b = _do_subst(s, subs) -+ if isinstance(b, unicode): -+ b = b.encode('UTF-8') -+ fd.write(b) - lsep = linesep - fd.close() - diff --git a/pkgs/applications/networking/instant-messengers/tangram/default.nix b/pkgs/applications/networking/instant-messengers/tangram/default.nix index 7cb9798517db..6f9b7269bf9b 100644 --- a/pkgs/applications/networking/instant-messengers/tangram/default.nix +++ b/pkgs/applications/networking/instant-messengers/tangram/default.nix @@ -1,22 +1,40 @@ -{ stdenv, lib, fetchFromGitHub, appstream-glib, desktop-file-utils, gdk-pixbuf -, gettext, gjs, glib, gobject-introspection, gsettings-desktop-schemas, gtk3 -, hicolor-icon-theme, meson, ninja, pkg-config, python3, webkitgtk, wrapGAppsHook +{ stdenv +, lib +, fetchFromGitHub +, appstream-glib +, desktop-file-utils +, gdk-pixbuf +, gettext +, gjs +, glib +, glib-networking +, gobject-introspection +, gsettings-desktop-schemas +, gtk4 +, libadwaita +, gst_all_1 +, hicolor-icon-theme +, meson +, ninja +, pkg-config +, python3 +, webkitgtk_5_0 +, blueprint-compiler +, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "tangram"; - version = "1.3.2"; + version = "2.0"; src = fetchFromGitHub { owner = "sonnyp"; repo = "Tangram"; rev = "v${version}"; - sha256 = "sha256-WI0H3bforQ6Jc/+TWFT1zUs4KRtWwvXY2/va+Fnd+iU="; + hash = "sha256-ocHE8IztiNm9A1hbzzHXstWpPaOau/IrQ44ccxbsGb0="; fetchSubmodules = true; }; - buildInputs = [ gdk-pixbuf gjs glib gsettings-desktop-schemas gtk3 webkitgtk ]; - nativeBuildInputs = [ appstream-glib desktop-file-utils @@ -27,23 +45,39 @@ stdenv.mkDerivation rec { ninja pkg-config python3 + blueprint-compiler wrapGAppsHook ]; - dontWrapGApps = true; + buildInputs = [ + gdk-pixbuf + gjs + glib + glib-networking + gsettings-desktop-schemas + gtk4 + libadwaita + webkitgtk_5_0 + ] ++ (with gst_all_1; [ + gstreamer + gst-libav + gst-plugins-base + (gst-plugins-good.override { gtkSupport = true; }) + gst-plugins-bad + ]); + + dontPatchShebangs = true; - # Fixes https://github.com/NixOS/nixpkgs/issues/31168 postPatch = '' - chmod +x build-aux/meson/postinstall.py - patchShebangs build-aux/meson/postinstall.py + substituteInPlace src/meson.build --replace "/app/bin/blueprint-compiler" "blueprint-compiler" + substituteInPlace {src/,}re.sonny.Tangram troll/gjspack/bin/gjspack \ + --replace "#!/usr/bin/env -S gjs -m" "#!${gjs}/bin/gjs -m" ''; - postFixup = '' - for file in $out/bin/re.sonny.Tangram; do - sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ - -i $file - wrapGApp "$file" - done + # https://github.com/NixOS/nixpkgs/issues/31168#issuecomment-341793501 + preFixup = '' + sed -e '2iimports.package._findEffectiveEntryPointName = () => "re.sonny.Tangram"' \ + -i $out/bin/re.sonny.Tangram ''; meta = with lib; { @@ -51,6 +85,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/sonnyp/Tangram"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ austinbutler ]; + maintainers = with maintainers; [ austinbutler chuangzhu ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix new file mode 100644 index 000000000000..51a127446d92 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -0,0 +1,94 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, fixup_yarn_lock +, yarn +, nodejs +, fetchYarnDeps +, electron +, libpulseaudio +, pipewire +}: + +stdenv.mkDerivation rec { + pname = "teams-for-linux"; + version = "1.0.45"; + + src = fetchFromGitHub { + owner = "IsmaelMartinez"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Q6DFegFrLUW/YiRyYJI4ITVVyMC5IkazlzhdR8203cY="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + sha256 = "sha256-jaAieO5q+tNfWN7Rp6ueasl45cfp9W1QxPdqIeCnVkE="; + }; + + nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror $offlineCache + fixup_yarn_lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules/ + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline electron-builder \ + --dir --linux ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \ + -c.electronDist=${electron}/lib/electron \ + -c.electronVersion=${electron.version} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{applications,teams-for-linux} + cp dist/linux-${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/teams-for-linux/ + + pushd build/icons + for image in *png; do + mkdir -p $out/share/icons/hicolor/''${image%.png}/apps + cp -r $image $out/share/icons/hicolor/''${image%.png}/apps/teams-for-linux.png + done + popd + + makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \ + --add-flags "$out/share/teams-for-linux/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + + runHook postInstall + ''; + + desktopItems = [(makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "Microsoft Teams for Linux"; + comment = meta.description; + categories = [ "Network" "InstantMessaging" "Chat" ]; + })]; + + meta = with lib; { + description = "Unofficial Microsoft Teams client for Linux"; + homepage = "https://github.com/IsmaelMartinez/teams-for-linux"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ muscaln ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +} 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 a336e048d1e4..6e3a9e54f0db 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -65,18 +65,13 @@ , MetalKit }: -with lib; - let tg_owt = callPackage ./tg_owt.nix { - abseil-cpp = (abseil-cpp.override { + 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; @@ -100,18 +95,17 @@ stdenv.mkDerivation rec { patches = [ ./kf594.patch ./shortcuts-binary-path.patch - # let it build with nixpkgs 10.12 sdk - ./kotato-10.12-sdk.patch ]; - postPatch = optionalString stdenv.isLinux '' + postPatch = lib.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.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' + sed -i "13i#import " Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm substituteInPlace Telegram/CMakeLists.txt \ --replace 'COMMAND iconutil' 'COMMAND png2icns' \ --replace '--convert icns' "" \ @@ -126,7 +120,7 @@ stdenv.mkDerivation rec { python3 wrapQtAppsHook removeReferencesTo - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ # to build bundled libdispatch clang extra-cmake-modules @@ -147,7 +141,7 @@ stdenv.mkDerivation rec { rnnoise tg_owt microsoft_gsl - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ kwayland alsa-lib libpulseaudio @@ -155,7 +149,7 @@ stdenv.mkDerivation rec { glibmm jemalloc wayland - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ Cocoa CoreFoundation CoreServices @@ -189,9 +183,6 @@ stdenv.mkDerivation rec { libicns ]; - # https://github.com/NixOS/nixpkgs/issues/130963 - NIX_LDFLAGS = optionalString stdenv.isDarwin "-lc++abi"; - enableParallelBuilding = true; cmakeFlags = [ @@ -199,7 +190,7 @@ stdenv.mkDerivation rec { "-DDESKTOP_APP_QT6=OFF" ]; - installPhase = optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications cp -r Kotatogram.app $out/Applications ln -s $out/Applications/Kotatogram.app/Contents/MacOS $out/bin @@ -216,8 +207,7 @@ stdenv.mkDerivation rec { inherit tg_owt; }; - meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + meta = with lib; { description = "Kotatogram – experimental Telegram Desktop fork"; longDescription = '' Unofficial desktop client for the Telegram messenger, based on Telegram Desktop. @@ -229,5 +219,7 @@ stdenv.mkDerivation rec { homepage = "https://kotatogram.github.io"; changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}"; maintainers = with maintainers; [ ilya-fedin ]; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); }; } 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 deleted file mode 100644 index 8c80cafc6dad..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch +++ /dev/null @@ -1,424 +0,0 @@ -diff --git a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm -index 9e9a1744b..ae55f873f 100644 ---- a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm -+++ b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm -@@ -14,6 +14,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 1d68457bb..ac8c4e0ab 100644 ---- a/Telegram/SourceFiles/platform/mac/specific_mac.mm -+++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm -@@ -118,6 +118,7 @@ PermissionStatus GetPermissionStatus(PermissionType type) { - switch (type) { - case PermissionType::Microphone: - case PermissionType::Camera: -+#if 0 - const auto nativeType = (type == PermissionType::Microphone) - ? AVMediaTypeAudio - : AVMediaTypeVideo; -@@ -132,6 +133,7 @@ PermissionStatus GetPermissionStatus(PermissionType type) { - return PermissionStatus::Denied; - } - } -+#endif - break; - } - return PermissionStatus::Granted; -@@ -141,6 +143,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; -@@ -151,6 +154,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 b280c1b..a1ed0d2 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 9960607..f3659b3 100644 ---- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm -+++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm -@@ -89,7 +89,7 @@ - [result addObject:h265Info]; - } - } --#else // WEBRTC_IOS -+#elif 0 // WEBRTC_IOS - if (@available(macOS 10.13, *)) { - if ([[AVAssetExportSession allExportPresets] containsObject:AVAssetExportPresetHEVCHighestQuality]) { - [result addObject:h265Info]; -@@ -129,7 +129,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 bf99063..b717645 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); - } - -@@ -682,7 +681,7 @@ static tgcalls::DarwinVideoTrackSource *getObjCVideoSource(const rtc::scoped_ref - int closest = -1; - CMTime result; - for (int i = 0; i < format.videoSupportedFrameRateRanges.count; i++) { -- const auto rateRange = format.videoSupportedFrameRateRanges[i]; -+ const AVFrameRateRange *rateRange = format.videoSupportedFrameRateRanges[i]; - int gap = abs(rateRange.minFrameRate - target); - if (gap <= closest || closest == -1) { - closest = gap; -diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm -index 4ef8630..3fc753c 100644 ---- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm -+++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm -@@ -243,9 +243,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; -@@ -332,9 +334,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 f1f259a..6629eb6 100644 ---- a/Telegram/lib_base/base/platform/mac/base_info_mac.mm -+++ b/Telegram/lib_base/base/platform/mac/base_info_mac.mm -@@ -226,16 +226,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 6102705..8981239 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 -@@ -277,6 +277,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 -@@ -290,6 +291,7 @@ void SystemMediaControls::setThumbnail(const QImage &thumbnail) { - forKey:MPMediaItemPropertyArtwork]; - updateDisplay(); - } -+#endif - } - - void SystemMediaControls::setDuration(int duration) { -@@ -308,10 +310,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() { -@@ -373,9 +377,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/tg_owt-10.12-sdk.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch deleted file mode 100644 index af1d47a3b44e..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/src/rtc_base/async_resolver.cc b/src/rtc_base/async_resolver.cc -index ad1598f2..fe9c3832 100644 ---- a/src/rtc_base/async_resolver.cc -+++ b/src/rtc_base/async_resolver.cc -@@ -57,7 +57,7 @@ void GlobalGcdRunTask(void* context) { - - // Post a task into the system-defined global concurrent queue. - void PostTaskToGlobalQueue(std::unique_ptr task) { -- dispatch_queue_global_t global_queue = -+ dispatch_queue_t global_queue = - dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); - webrtc::QueuedTask* context = task.release(); - dispatch_async_f(global_queue, context, &GlobalGcdRunTask); -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 1121c921..f21926b0 100644 ---- a/src/sdk/objc/components/video_codec/nalu_rewriter.cc -+++ b/src/sdk/objc/components/video_codec/nalu_rewriter.cc -@@ -242,10 +242,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; - } -@@ -268,10 +265,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; - } -@@ -501,11 +495,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 e171622616ae..bd2f9e4b3f5e 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 @@ -6,7 +6,7 @@ , ninja , yasm , libjpeg -, openssl +, openssl_1_1 , libopus , ffmpeg_4 , protobuf @@ -56,11 +56,6 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - patches = [ - # let it build with nixpkgs 10.12 sdk - ./tg_owt-10.12-sdk.patch - ]; - postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \ --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ @@ -75,7 +70,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ libjpeg - openssl + openssl_1_1 libopus ffmpeg_4 protobuf @@ -115,9 +110,6 @@ stdenv.mkDerivation { ApplicationServices ]; - # https://github.com/NixOS/nixpkgs/issues/130963 - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lc++abi"; - enableParallelBuilding = true; meta.license = lib.licenses.bsd3; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix index 435268cdf623..73c71d294c84 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix @@ -1,7 +1,5 @@ { stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk, makeWrapper }: -with lib; - stdenv.mkDerivation { pname = "${kotatogram-desktop.pname}-with-webkit"; version = kotatogram-desktop.version; @@ -15,9 +13,9 @@ stdenv.mkDerivation { mkdir -p $out/bin makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \ --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ webkitgtk ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk ]} ''; meta = kotatogram-desktop.meta // { - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index fe386cab5ac4..ffb5fbb895eb 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -31,6 +31,7 @@ , webkitgtk_4_1 , jemalloc , rnnoise +, protobuf , abseil-cpp # Transitive dependencies: , util-linuxMinimal @@ -66,7 +67,7 @@ let tg_owt = callPackage ./tg_owt.nix { abseil-cpp = abseil-cpp.override { - cxxStandard = "17"; + cxxStandard = "20"; }; }; # Aarch64 default gcc9 will cause ICE. For reference #108305 @@ -74,7 +75,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "4.3.1"; + version = "4.6.0"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -83,7 +84,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0j05hcl5nkvcl74jl8d0inkh6ha9xh299z87br1vr1mblflh087m"; + sha256 = "1kwg286mbpf0gj57702fqddmyn5iihzny3da425psnwa10s217yf"; }; postPatch = '' @@ -135,6 +136,7 @@ env.mkDerivation rec { webkitgtk_4_1 jemalloc rnnoise + protobuf tg_owt # Transitive dependencies: util-linuxMinimal # Required for libmount thus not nativeBuildInputs. 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 ec6c1352016b..e80ccd2105aa 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2022-09-14"; + version = "unstable-2023-01-05"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "621f3da55331733bf0d1b223786b96b68c03dca1"; - sha256 = "0xh4mm8lpiyj3c62iarsld8q82a1w81x3dxdlcwq8s6sg3r04fns"; + rev = "5098730b9eb6173f0b52068fe2555b7c1015123a"; + sha256 = "0dnh0l9qb9q43cvm4wfgmgqp48grqqz9fb7f48nvys1b6pzhh3pk"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 3b1775a7ba8c..a8b762ab7eab 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python2, libxml2, dbus-glib, dbus -, sqlite, libsoup, libnice, gnutls}: +{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python3, libxml2, dbus-glib, dbus +, sqlite, libsoup, libnice, gnutls +, fetchpatch +}: stdenv.mkDerivation rec { pname = "telepathy-gabble"; @@ -10,10 +12,17 @@ stdenv.mkDerivation rec { sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i"; }; - nativeBuildInputs = [ pkg-config libxslt ]; - buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls python2 ]; + patches = [ + (fetchpatch { + url = "https://github.com/archlinux/svntogit-packages/raw/edcf78c831894000f2fbfd3e5818e363911c746a/trunk/telepathy-gabble-0.18.4-python3.patch"; + hash = "sha256-bvcZW6gbCNogqwPDaXHTbohe7c2GAYjXeHGyBEDVsB4="; + }) + ]; - checkInputs = [ dbus.daemon ]; + nativeBuildInputs = [ pkg-config libxslt python3 ]; + buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls ]; + + nativeCheckInputs = [ dbus ]; configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 27df1273c083..4b8d2f6104ab 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -1,26 +1,17 @@ -{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python2, glib, dbus-glib, pkg-config, libxslt }: +{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python3, glib, dbus-glib, pkg-config, libxslt }: stdenv.mkDerivation rec { pname = "telepathy-haze"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze${version}.tar.gz"; - sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; + url = "https://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze-${version}.tar.gz"; + hash = "sha256-cEvvpC7sIXPspLrAH/0AQBRmXyutRtyJSOVCM2TN4wo="; }; - buildInputs = [ glib telepathy-glib dbus-glib pidgin python2 ]; + buildInputs = [ glib telepathy-glib dbus-glib pidgin ]; - nativeBuildInputs = [ pkg-config libxslt ]; - - patches = [ - # Patch from Gentoo that helps telepathy-haze build with more - # recent versions of pidgin. - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/master/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch"; - sha256 = "0fa1p4n1559qd096w7ya4kvfnc1c98ykarkxzlpkwvzbczwzng3c"; - }) - ]; + nativeBuildInputs = [ pkg-config libxslt python3 ]; meta = { description = "A Telepathy connection manager based on libpurple"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index fe7ef49cd0d3..1a546ed1aef5 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, python2, libxslt, makeWrapper }: +{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, python3, libxslt, makeWrapper }: stdenv.mkDerivation rec { pname = "telepathy-idle"; - version = "0.2.0"; + version = "0.2.2"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; + hash = "sha256-g4fiXl+wtMvnAeXcCS1mbWUQuDP9Pn5GLpFw027DwV8="; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ glib telepathy-glib dbus-glib libxslt python2 (lib.getLib dconf) ]; + nativeBuildInputs = [ pkg-config python3 makeWrapper ]; + buildInputs = [ glib telepathy-glib dbus-glib libxslt (lib.getLib dconf) ]; preFixup = '' wrapProgram "$out/libexec/telepathy-idle" \ diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 1bf0e329073d..ac03ee20ff95 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python2, pkg-config -, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }: +{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python3, pkg-config +, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus +, fetchpatch +}: stdenv.mkDerivation rec { pname = "telepathy-logger"; @@ -10,12 +12,20 @@ stdenv.mkDerivation rec { sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg"; }; + patches = [ + (fetchpatch { + url = "https://github.com/archlinux/svntogit-packages/raw/2b5bdbb4739d3517f5e7300edc8dab775743b96d/trunk/0001-tools-Fix-the-build-with-Python-3.patch"; + hash = "sha256-o1lfdZIIqaxn7ntQZnoOMqquc6efTHgSIxB5dpFWRgg="; + }) + ]; + nativeBuildInputs = [ makeWrapper pkg-config intltool libxslt gobject-introspection + python3 ]; buildInputs = [ dbus-glib libxml2 sqlite telepathy-glib - dbus python2 + dbus ]; configureFlags = [ "--enable-call" ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 3a979885984a..3bc59091afab 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -49,5 +49,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Only; maintainers = with maintainers; [ ]; platforms = platforms.unix; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index c368c049daf0..cb6e8152ca2c 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { future ]; - checkInputs = with py.pkgs; [ + nativeCheckInputs = with py.pkgs; [ mock pytest coverage diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 1d9febd9a642..6c95c7557eb4 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -9,23 +9,31 @@ rustPlatform.buildRustPackage rec { pname = "twitch-tui"; - version = "1.6.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "Xithrius"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-144yn/QQPIZJOgqKFUWjB7KCmEKfNpj6XjMGhTpQdEQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-4gEE2JCYNxPOV47w/wMRvYn5YJdgvlYl+fkk6qcXLr8="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + cargoHash = "sha256-IYk01mueNZu791LPdkB79VaxsFXZbqEFDbpw1ckYTMo="; - cargoHash = "sha256-zUeI01EyXsuoKzHbpVu3jyA3H2aBk6wMY+GW3h3v8vc="; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; meta = with lib; { description = "Twitch chat in the terminal"; homepage = "https://github.com/Xithrius/twitch-tui"; + changelog = "https://github.com/Xithrius/twitch-tui/releases/tag/v${version}"; license = licenses.mit; maintainers = [ maintainers.taha ]; }; diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 4392f5879954..7fee1f5c3a83 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; meta = with lib; { description = "Lightweight Tox client"; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index cf6410def0d1..1190a35c69a1 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -3,8 +3,6 @@ , xorg }: -with lib; - let bits = "x86_64"; @@ -19,7 +17,7 @@ let categories = [ "Network" ]; }; - tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; + tarball = "Wavebox_${lib.replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; in stdenv.mkDerivation { pname = "wavebox"; @@ -40,7 +38,7 @@ in stdenv.mkDerivation { alsa-lib gtk3 nss ]; - runtimeDependencies = [ (getLib udev) libnotify ]; + runtimeDependencies = [ (lib.getLib udev) libnotify ]; installPhase = '' mkdir -p $out/bin $out/opt/wavebox diff --git a/pkgs/applications/networking/instant-messengers/webcord/default.nix b/pkgs/applications/networking/instant-messengers/webcord/default.nix new file mode 100644 index 000000000000..d03205720312 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -0,0 +1,81 @@ +{ lib, stdenv, buildNpmPackage, fetchFromGitHub, copyDesktopItems +, python3, pipewire, libpulseaudio, xdg-utils, electron_22, makeDesktopItem }: + +buildNpmPackage rec { + name = "webcord"; + version = "4.1.1"; + + src = fetchFromGitHub { + owner = "SpacingBat3"; + repo = "WebCord"; + rev = "v${version}"; + sha256 = "sha256-Buu7eKmI0UGV/9Kfj+urmDcjBtR9HSwW+mlHaYhfUa4="; + }; + + npmDepsHash = "sha256-PeoOoEljbkHynjZwocCWCTyYvIvSE1gQiABUzIiXEdM="; + + nativeBuildInputs = [ + copyDesktopItems + python3 + ]; + + libPath = lib.makeLibraryPath [ + pipewire + libpulseaudio + ]; + + binPath = lib.makeBinPath [ + xdg-utils + ]; + + # npm install will error when electron tries to download its binary + # we don't need it anyways since we wrap the program with our nixpkgs electron + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + # remove husky commit hooks, errors and aren't needed for packaging + postPatch = '' + rm -rf .husky + ''; + + # override installPhase so we can copy the only folders that matter + installPhase = '' + runHook preInstall + + # Remove dev deps that aren't necessary for running the app + npm prune --omit=dev + + mkdir -p $out/lib/node_modules/webcord + cp -r app node_modules sources package.json $out/lib/node_modules/webcord/ + + install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png + + makeWrapper '${electron_22}/bin/electron' $out/bin/webcord \ + --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \ + --prefix PATH : "${binPath}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \ + --add-flags $out/lib/node_modules/webcord/ + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "webcord"; + exec = "webcord"; + icon = "webcord"; + desktopName = "WebCord"; + comment = meta.description; + categories = [ "Network" "InstantMessaging" ]; + }) + ]; + + meta = with lib; { + description = "A Discord and Fosscord electron-based client implemented without Discord API"; + homepage = "https://github.com/SpacingBat3/WebCord"; + downloadPage = "https://github.com/SpacingBat3/WebCord/releases"; + changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ huantian ]; + platforms = electron_22.meta.platforms; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 7c4b95a06459..6fdc64adc135 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -23,13 +23,13 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.29.4477"; - x86_64-linux = "3.29.2997"; + x86_64-darwin = "3.30.4506"; + x86_64-linux = "3.30.3018"; }.${system} or throwSystem; - sha256 = { - x86_64-darwin = "19snbd53hjfcqgnz24r85a34fr120b1wps4pv4vymnkxjld2wifc"; - x86_64-linux = "0f5kkp93za4yr6ywdgph8zr6ivrbxq2gbskl8jysxawk1pz92pqf"; + hash = { + x86_64-darwin = "sha256-+htDeNIuucB4qzNBNYoSUH1DbfgouZS08G5hxPtIuzY="; + x86_64-linux = "sha256-46WjFA+E9M7RfTOM/Xoho+9ooToSgQiZaMlcZ3lJvBQ="; }.${system} or throwSystem; meta = with lib; { @@ -65,8 +65,8 @@ let src = fetchurl { url = "https://wire-app.wire.com/linux/debian/pool/main/" - + "Wire-${version}_amd64.deb"; - inherit sha256; + + "Wire-${version}_amd64.deb"; + inherit hash; }; desktopItem = makeDesktopItem { @@ -133,8 +133,8 @@ let src = fetchurl { url = "https://github.com/wireapp/wire-desktop/releases/download/" - + "macos%2F${version}/Wire.pkg"; - inherit sha256; + + "macos%2F${version}/Wire.pkg"; + inherit hash; }; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 8f78f0d9add8..d18761689ee3 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -30,6 +30,7 @@ , libxkbcommon , udev , zlib +, libkrb5 # Runtime , coreutils , pciutils @@ -47,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.12.3.11845"; - versions.x86_64-darwin = "5.12.3.11845"; - versions.x86_64-linux = "5.12.2.4816"; + versions.aarch64-darwin = "5.13.6.14918"; + versions.x86_64-darwin = "5.13.6.14918"; + versions.x86_64-linux = "5.13.5.431"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-iDLxqG7/cdo60V0mFE3tX/Msi0rRUjoM8X9yq2rlvf0="; + hash = "sha256-QY9z1bTKtL32HE4XWnBIvCNmDF+3x5N9BdfqJA+24fA="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-+YOtdoh8S50+GHRLb6TPYCqDtry7SnnNqo7USzkDc7c="; + hash = "sha256-eSPKzxDPXCbME0eTTDlfsI5KM5qRm79JTtnGJvpiS98="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-kgjooMqeZurzqIn3ADcgFjlqaC58dQNuIAHLx4M0S9I="; + hash = "sha256-R0IMV/+R7AGFy/ZvNyyvIBv10t1x1U1X6jdHoo6UHKY="; }; }; @@ -102,10 +103,13 @@ let xorg.libxshmfence xorg.xcbutilimage xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm xorg.libXfixes xorg.libXtst udev zlib + libkrb5 ] ++ lib.optional (pulseaudioSupport) libpulseaudio); in diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix index cf48ba4420e6..931f95158354 100644 --- a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { zulip ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales ] ++ (with python3.pkgs; [ pytestCheckHook diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index c56e78b9f945..241828fdfc3c 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,24 +5,23 @@ let pname = "zulip"; - version = "5.9.3"; - name = "${pname}-${version}"; + version = "5.9.4"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - hash = "sha256-Hws9vENGzCLQqav4uXtbbI0iNoS3JozC5m2DG38+3Fk="; + hash = "sha256-gbusyhMgoaQmeWm6dB6pc3kSykD4T97VQcJgcF5KbzM="; name="${pname}-${version}.AppImage"; }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} + mv "$out/bin/${pname}-${version}" "$out/bin/${pname}" install -m 444 -D ${appimageContents}/zulip.desktop $out/share/applications/zulip.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/zulip.png \ $out/share/icons/hicolor/512x512/apps/zulip.png diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index feeb87ab3fe2..0c96262fff67 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { platforms = ["x86_64-linux"]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - maintainers = [ lib.maintainers.benley ]; + maintainers = [ ]; homepage = "https://www.insynchq.com"; description = "Google Drive sync and backup with multiple account support"; longDescription = '' diff --git a/pkgs/applications/networking/insync/v3.nix b/pkgs/applications/networking/insync/v3.nix index cf68308176fa..933d2288069a 100644 --- a/pkgs/applications/networking/insync/v3.nix +++ b/pkgs/applications/networking/insync/v3.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { platforms = ["x86_64-linux"]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ ]; homepage = "https://www.insynchq.com"; description = "Google Drive sync and backup with multiple account support"; longDescription = '' diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 43bc47b17af4..996677f8a11b 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "1.0.4"; + version = "1.0.5"; - vendorSha256 = "sha256-krjTtH8C1SGhaKMCtsbA2S9ognImof6mwD+vJ/qbyrM="; + vendorHash = "sha256-sLCgPXyOiGaigcVuwUU4+Lmb7SjopWKhCReBzrZyuRs="; src = fetchFromGitHub { owner = "ipfs-cluster"; repo = "ipfs-cluster"; rev = "v${version}"; - sha256 = "sha256-LdcCGUbrS6te03y8R7XJJOcG1j6uU0v8uEMeUHLeidg="; + hash = "sha256-c0COSf4ktFxkPJwzq/0RyG1JvNUvhdWpeRlrbAirGec="; }; meta = with lib; { diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix index 30aac1cb1178..186f1a74020b 100644 --- a/pkgs/applications/networking/irc/convos/default.nix +++ b/pkgs/applications/networking/irc/convos/default.nix @@ -2,8 +2,6 @@ , nixosTests }: -with lib; - perlPackages.buildPerlPackage rec { pname = "convos"; version = "7.02"; @@ -16,7 +14,7 @@ perlPackages.buildPerlPackage rec { }; nativeBuildInputs = [ makeWrapper ] - ++ optionals stdenv.isDarwin [ shortenPerlShebang ]; + ++ lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; buildInputs = with perlPackages; [ CryptPassphrase CryptPassphraseArgon2 CryptPassphraseBcrypt @@ -29,7 +27,7 @@ perlPackages.buildPerlPackage rec { propagatedBuildInputs = [ openssl ]; - checkInputs = with perlPackages; [ TestDeep ]; + nativeCheckInputs = with perlPackages; [ TestDeep ]; postPatch = '' patchShebangs script/convos @@ -79,7 +77,7 @@ perlPackages.buildPerlPackage rec { ln -s $AUTO_SHARE_PATH/public/asset $out/asset cp -vR templates $out/templates cp cpanfile $out/cpanfile - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/convos '' + '' wrapProgram $out/bin/convos --set MOJO_HOME $out @@ -91,6 +89,6 @@ perlPackages.buildPerlPackage rec { homepage = "https://convos.chat"; description = "Convos is the simplest way to use IRC in your browser"; license = lib.licenses.artistic2; - maintainers = with maintainers; [ sgo ]; + maintainers = with lib.maintainers; [ sgo ]; }; } diff --git a/pkgs/applications/networking/irc/kirc/default.nix b/pkgs/applications/networking/irc/kirc/default.nix index 71bd96d3b70e..b0e771a80f4e 100644 --- a/pkgs/applications/networking/irc/kirc/default.nix +++ b/pkgs/applications/networking/irc/kirc/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "kirc"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "mcpcpc"; repo = pname; rev = version; - hash = "sha256-bLBrkbW/Iv1v9z5NOiMAA/dH5/9FlqusRV5rSqjdlPw="; + hash = "sha256-SXPtSFjGPLgORG9OCSCEStzNzdGZFzCx72YOrW288MU="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/irc/senpai/default.nix b/pkgs/applications/networking/irc/senpai/default.nix index 7fd54b70e9cd..e00a177b673e 100644 --- a/pkgs/applications/networking/irc/senpai/default.nix +++ b/pkgs/applications/networking/irc/senpai/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "senpai"; - version = "unstable-2022-11-04"; + version = "unstable-2023-01-03"; src = fetchFromSourcehut { owner = "~taiite"; repo = "senpai"; - rev = "3be87831281af1c91a6e406986f317936a0b98bc"; - sha256 = "sha256-v8r2q2H4I9FnsIOGv1zkC4xJ5E9cQavfILZ6mnbFbr8="; + rev = "5414edb01f30ad9480e211030db1bcd858e5f741"; + sha256 = "sha256-GsdU+IBuHhwt8n4SEMCUSUzLQezwVtZ9L/0uF5aculA="; }; - vendorSha256 = "sha256-FBpk9TpAD5i3+brsVNWHNHJtZsHmShmWlldQrMs/VGU="; + vendorSha256 = "sha256-PkoEHQEGKCiNbJsm7ieL65MtEult/wubLreJKA1gGpg="; subPackages = [ "cmd/senpai" diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 0739b6f57645..478b28190ae6 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -36,14 +36,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.7.1"; + version = "3.8"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - hash = "sha256-ZtJi1NhE1agZWnAv6FCUeO1GDtuQnLTraA5nkwWiCqs="; + hash = "sha256-objxAUGvBhTkbQl4GshDP3RsCkAW4z917L9WyaVoYj4="; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index 935c4ae571ef..22cacdd01ca1 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doInstallCheck = false; #NoClassDefFoundError: org/apache/logging/log4j/Level for tests - checkInputs = [ coreutils ]; + nativeCheckInputs = [ coreutils ]; installCheckPhase = '' $out/bin/jmeter --version 2>&1 | grep -q "${version}" diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/applications/networking/jnetmap/default.nix index 2a686fdd8b9e..8aea49decb7e 100644 --- a/pkgs/applications/networking/jnetmap/default.nix +++ b/pkgs/applications/networking/jnetmap/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { pname = "jnetmap"; - version = "0.5.4"; + version = "0.5.5"; + versionSuffix = "-703"; src = fetchurl { - url = "mirror://sourceforge/project/jnetmap/jNetMap%20${version}/jNetMap-${version}.jar"; - sha256 = "0nxsfa600jhazwbabxmr9j37mhwysp0fyrvczhv3f1smiy8rjanl"; + url = "mirror://sourceforge/project/jnetmap/jNetMap%20${version}/jNetMap-${version}${versionSuffix}.jar"; + sha256 = "sha256-e4Ssm2Sq/v1YZ7ZudAqgQ7Cz2ffwWbSmLFoKhaZvTPg="; }; nativeBuildInputs = [ makeWrapper ]; @@ -15,12 +16,16 @@ stdenv.mkDerivation rec { dontUnpack = true; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" mkdir -p "$out/lib" cp "${src}" "$out/lib/jnetmap.jar" makeWrapper "${jre}/bin/java" "$out/bin/jnetmap" \ --add-flags "-jar \"$out/lib/jnetmap.jar\"" + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index 22ea41ec4343..e280b7390035 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.35"; + version = "2.9.38"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-tRuT4freMDtFjmZuBV9WD9jQFUat8QAias5d+AN7IVo="; + sha256 = "sha256-QTO6MHiFx3nDXDaaVy7rCiR0ttBXt5oAw94/ZDTICOM="; }; - vendorSha256 = "sha256-2MevXSjjwXDjmiMhiZyv45a3OgDrliVcvHbXGRIOu1s="; + vendorHash = "sha256-QOu1azw3OUWaz7MRFGZ5CGX4bVegbFYp76/XpesnaUM="; # Disable tests because it attempts to use a mongodb instance doCheck = false; diff --git a/pkgs/applications/networking/kubo/default.nix b/pkgs/applications/networking/kubo/default.nix index 01a8dd9fffac..a02be05d6473 100644 --- a/pkgs/applications/networking/kubo/default.nix +++ b/pkgs/applications/networking/kubo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kubo"; - version = "0.16.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.17.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; passthru.repoVersion = "12"; # Also update kubo-migrator when changing the repo version @@ -10,7 +10,7 @@ buildGoModule rec { # Kubo makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-FS7lwQS7ybyoIKPkcUtPIe3srO1O/cZN+x1nzWUlF20="; + hash = "sha256-Ls46Dds8lRP2KTOkjiVWtqB8aqPW5jdQ/xwBcQYIwbQ="; }; # tarball contains multiple files/directories diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/applications/networking/libcoap/default.nix index ea4d27c6b412..673b864630d4 100644 --- a/pkgs/applications/networking/libcoap/default.nix +++ b/pkgs/applications/networking/libcoap/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { pname = "libcoap"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { repo = "libcoap"; owner = "obgm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1l031ys833gch600g9g3lvbsr4nysx6glbbj4lwvx3ywl0jr6l9k"; + sha256 = "sha256-4XcAo5StyYIfe9wD0cPHKFZalMcBAuiVV2qFZ126KT8="; }; nativeBuildInputs = [ automake diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 1be323decab4..cc19511d87cc 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.6.3"; + version = "1.6.5"; disabled = python3.pythonOlder "3.7"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Fvr5WhrhxPBeAMsrVj/frg01qgt2SeWgrRJYgBxRFHc="; + hash = "sha256-yKsCM8LZ/GR/bc2WW+Ml1vSroB4iaxh09Az/B+aIVBU="; }; format = "pyproject"; @@ -56,9 +56,11 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "GUI front-end for maestral (an open-source Dropbox client) for Linux"; + homepage = "https://maestral.app"; + changelog = "https://github.com/samschott/maestral/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg sfrijters ]; platforms = platforms.linux; - homepage = "https://maestral.app"; + mainProgram = "maestral_qt"; }; } diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index d875e39fb7a9..ddc0f4b932ad 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -7,6 +7,7 @@ , python3 , w3m , dante +, gawk }: buildGoModule rec { @@ -46,7 +47,7 @@ buildGoModule rec { python3.pkgs.colorama ]; - buildInputs = [ python3 notmuch ]; + buildInputs = [ python3 notmuch gawk ]; installPhase = '' runHook preInstall @@ -57,10 +58,13 @@ buildGoModule rec { ''; postFixup = '' - wrapProgram $out/bin/aerc --prefix PATH ":" \ - "${lib.makeBinPath [ ncurses ]}" - wrapProgram $out/share/aerc/filters/html --prefix PATH ":" \ - ${lib.makeBinPath [ w3m dante ]} + wrapProgram $out/bin/aerc \ + --prefix PATH ":" "${lib.makeBinPath [ ncurses ]}" + wrapProgram $out/share/aerc/filters/html \ + --prefix PATH ":" ${lib.makeBinPath [ w3m dante ]} + wrapProgram $out/share/aerc/filters/html-unsafe \ + --prefix PATH ":" ${lib.makeBinPath [ w3m dante ]} + patchShebangs $out/share/aerc/filters ''; meta = with lib; { diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index d0050f73759d..bc27b91a97da 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { python3Packages.setuptools python3Packages.notmuch chardet dkimpy ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ freezegun notmuch ]; diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/applications/networking/mailreaders/alot/default.nix index 889b893ea9cf..471b603f26a1 100644 --- a/pkgs/applications/networking/mailreaders/alot/default.nix +++ b/pkgs/applications/networking/mailreaders/alot/default.nix @@ -47,7 +47,7 @@ with python3.pkgs; buildPythonApplication rec { urwidtrees ]; - checkInputs = [ + nativeCheckInputs = [ future gawk gnupg diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index f896cc43867c..bc5b692501ac 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -52,8 +52,6 @@ , enablePluginVcalendar ? true, libical }: -with lib; - let pythonPkgs = with python3.pkgs; [ python3 wrapPython pygobject3 ]; @@ -130,7 +128,7 @@ in stdenv.mkDerivation rec { buildInputs = [ curl gsettings-desktop-schemas glib-networking gtk3 ] - ++ concatMap (f: optionals f.enabled f.deps) (filter (f: f ? deps) features) + ++ lib.concatMap (f: lib.optionals f.enabled f.deps) (lib.filter (f: f ? deps) features) ; configureFlags = @@ -141,7 +139,7 @@ in stdenv.mkDerivation rec { "--disable-gdata-plugin" # Complains about missing libgdata, even when provided ] ++ - (map (feature: map (flag: strings.enableFeature feature.enabled flag) feature.flags) features); + (map (feature: map (flag: lib.strings.enableFeature feature.enabled flag) feature.flags) features); enableParallelBuilding = true; @@ -155,7 +153,7 @@ in stdenv.mkDerivation rec { cp claws-mail.desktop $out/share/applications ''; - meta = { + meta = with lib; { description = "The user-friendly, lightweight, and fast email client"; homepage = "https://www.claws-mail.org/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index f454a8b43daf..3cce58258a8a 100644 --- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -2,12 +2,12 @@ let pname = "electron-mail"; - version = "5.0.1"; + version = "5.1.2"; name = "ElectronMail-${version}"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-w6ZZPIJnAlA8WhNHtM9gsjr7U6wMYT21fGFmkDDAVJU="; + sha256 = "sha256-PLDzAtH7T7QMrLavvcF3zOVTayCqEA1IghIUAAxkbEE="; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 51e1c2e52c87..8033a734b981 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -17,15 +17,16 @@ , substituteAll , _experimental-update-script-combinators , glib +, makeHardcodeGsettingsPatch }: stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.46.1"; + version = "3.46.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "p5Jp7wnoqAuo8My8ZDMl0rsFc0158G8x8lAehWfLjb0="; + sha256 = "BFnqQFY2OKWllPQt3BzHGRotOCLCEcz/+82LNtMmQCU="; }; patches = [ @@ -64,9 +65,9 @@ stdenv.mkDerivation rec { ]; passthru = { - hardcodeGsettingsPatch = glib.mkHardcodeGsettingsPatch { + hardcodeGsettingsPatch = makeHardcodeGsettingsPatch { inherit src; - glib-schema-to-var = { + schemaIdToVariableMapping = { "org.gnome.evolution.mail" = "evo"; "org.gnome.evolution.calendar" = "evo"; }; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 1e61c5ffc884..a5ed92f519e3 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.46.1"; + version = "3.46.3"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "GshFg+0sr4l7B06Z+TVCrRRG//Cs+rhtXmeeAzrgLIY="; + sha256 = "riIQdCXTDRejo0w1bNpfQKrXhG12vbYINEUYtdQpwfM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/pkgs/applications/networking/mailreaders/mailcheck/default.nix index e9e5fb5f70e9..43590c9d3361 100644 --- a/pkgs/applications/networking/mailreaders/mailcheck/default.nix +++ b/pkgs/applications/networking/mailreaders/mailcheck/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple command line tool to check for new messages"; - homepage = "http://mailcheck.sourceforge.net/"; + homepage = "https://mailcheck.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ kovirobi ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 7c3e5ea5c7f5..47c448c9b323 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -12,7 +12,7 @@ , gsettings-desktop-schemas , glib , gobject-introspection -# Available plugins (can be overriden) +# Available plugins (can be overridden) , availablePlugins # Used in the withPlugins interface at passthru, can be overrided directly, or # prefarably via e.g: `mailnag.withPlugins([mailnag.availablePlugins.goa])` diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index a5a9b3ac89b4..6e694d01b466 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -17,15 +17,16 @@ , xorg , mesa , libdrm +, libappindicator }: stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.10.5"; + version = "1.10.8"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - sha256 = "sha256-eVwb7E04DzGdqfH4T+gkvmBtvN7ja4o8u7LvHk/581I="; + sha256 = "sha256-aXpPn6tpSOwWL/34qlpJ+on/H+X7303J1jwvwcVOTNs="; }; nativeBuildInputs = [ @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { coreutils openssl (lib.getLib udev) + libappindicator ]; unpackPhase = '' diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index e3da77531a11..285fbdf35707 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch; - checkInputs = [ file ]; + nativeCheckInputs = [ file ]; buildFeatures = lib.optionals withNotmuch [ "notmuch" ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index e2dfcdc3184e..d7de9e971ea3 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3"); checkTarget = "test"; - checkInputs = [ + nativeCheckInputs = [ which dtach openssl bash gdb man emacs ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix new file mode 100644 index 000000000000..12a2437121a5 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix @@ -0,0 +1,29 @@ +{ notmuch +, lib +, stdenv +, fetchFromGitHub +, rustPlatform +}: +rustPlatform.buildRustPackage rec { + pname = "notmuch-mailmover"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "michaeladler"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-b2Q1JcXIp56Niv5kdPgQSM91e8hPPdyhWIG4f7kQn78="; + }; + + buildInputs = [ notmuch ]; + + cargoSha256 = "sha256-AW0mCdQN3WJhSErJ/MqnNIsRX+C6Pb/zHCQh7v/70MU="; + + meta = with lib; { + description = "Application to assign notmuch tagged mails to IMAP folders"; + homepage = "https://github.com/michaeladler/notmuch-mailmover/"; + license = licenses.asl20; + maintainers = with maintainers; [ michaeladler archer-65 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 32350bb5cfa7..90b7dbd28d4c 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -1,11 +1,9 @@ { lib, stdenv, fetchurl, pkg-config, gtk2, openssl ? null, gpgme ? null -, gpgSupport ? true, sslSupport ? true, fetchpatch }: +, gpgSupport ? true, sslSupport ? true, fetchpatch, Foundation }: assert gpgSupport -> gpgme != null; assert sslSupport -> openssl != null; -with lib; - stdenv.mkDerivation rec { pname = "sylpheed"; version = "3.7.0"; @@ -33,13 +31,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ] - ++ optionals gpgSupport [ gpgme ] - ++ optionals sslSupport [ openssl ]; + ++ lib.optionals gpgSupport [ gpgme ] + ++ lib.optionals sslSupport [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Foundation ]; - configureFlags = optional gpgSupport "--enable-gpgme" - ++ optional sslSupport "--enable-ssl"; + configureFlags = lib.optional gpgSupport "--enable-gpgme" + ++ lib.optional sslSupport "--enable-ssl"; - meta = { + # Undefined symbols for architecture arm64: "_OBJC_CLASS_$_NSAutoreleasePool" + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework Foundation"; + + meta = with lib; { homepage = "https://sylpheed.sraoss.jp/en/"; description = "Lightweight and user-friendly e-mail client"; maintainers = with maintainers; [ eelco ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 495764bf5ee2..d15b0d1d93a4 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "102.5.0"; + version = "102.7.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/af/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/af/thunderbird-102.7.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "80b1e18e826369d4f34449e8a90630cfa8425b43a4b113f49026a909e591916a"; + sha256 = "f9c8f7fa943232b5e89a6200587c7b5294b216f581712e55936aa7354b0397a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ar/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ar/thunderbird-102.7.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "bcc6d43b1fd182f15ad502a622a74f97fd02374ecd89168b1c165e62f12c1841"; + sha256 = "47cb5d16d4d3f4efe335a4d699e0dbd2b2e56c86d114aee36a0ef7a3187579e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ast/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ast/thunderbird-102.7.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "6fbd2e7c1f8c86c7a5aed8362ae3df99ffe7b03ad4885024983e58d9f71b137a"; + sha256 = "3b958523d341048b0a29262d767139399904d2ee7c7de05a49ddd9974af81fad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/be/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/be/thunderbird-102.7.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b353f925236872f35aded0b8b3992ce83284debf7f1c774a4600f9a67e548de6"; + sha256 = "38eb2f42f730ce040619cb71272a947820fa65a2ef8ffd24bf98c8dbf7796657"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/bg/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/bg/thunderbird-102.7.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "149c22f4f4674800320e204d287d09c6143517276e113cf7ba9e73c193ef7d77"; + sha256 = "2b73de9089e1a61145b085e49c86c59ff9dc1069b81f9636755c606132df2169"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/br/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/br/thunderbird-102.7.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "23d114474845d0d6a6f044baa59421b81f14badfdf306c154e9739b03d28995a"; + sha256 = "a9da8b7c88b7c588c1cbc3622fd02a263cd9655a46df5adb64149ef30ba8274c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ca/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ca/thunderbird-102.7.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "43bf01934dee664033adeb22ee3af77a693f7cc9ec3c6357dabff08277f94f91"; + sha256 = "51552344dd81b36d06994232e04ff15b3f06657a9acb678fe1b187521074f65f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/cak/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/cak/thunderbird-102.7.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "274a3dc9b29e9a1684cd60c5401adb180a4996aaceeaa64546101c1920007ab3"; + sha256 = "5f67ae6e0697e2142f20adc6016c1bab8f418d4ff155b4ac2bc35b5ce93b0f97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/cs/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/cs/thunderbird-102.7.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "382e85e0b46d539c9b39b9488cd1a24eb9a5e62a20e59575d094b8efb4423d02"; + sha256 = "b96b1a2dfbd4489710863fce3315b46d6a08ef94639a45b72e8304a22de93fba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/cy/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/cy/thunderbird-102.7.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "e33f9cf6a06e7e60e7238ef6f55d4f68ec348809e5be20881ac86f5414613b89"; + sha256 = "113d5a113db16cf247d313c927229bbeb905d7e234f36b023b0d5bfbb70a53bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/da/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/da/thunderbird-102.7.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "939195d3a4d184582aba103150dd220a471ba2a932bf7b78f91c17260374900c"; + sha256 = "05d4ac5b3cc699ab0b1ce05310fdc855eb6914d163ce52f0dd136abb6d3f129c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/de/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/de/thunderbird-102.7.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "aebba6f46e94b3988273def89f0381d3993054ca7f2b3eae07870447ed1f0f56"; + sha256 = "9cd6557e6b12b6697b0adc9211aee9210854a2b346d93e492b59cabecc51b072"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/dsb/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/dsb/thunderbird-102.7.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "7b9da40217aef8b8c77c97bc64ae18084142dba0e380848037a512e2b82bcd6a"; + sha256 = "d10d1d4acbd505f9432d8e3ea1710020ef7e0859f9f31a54c9cf14d7f91bc383"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/el/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/el/thunderbird-102.7.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "f992c7476b31e664755fa53c3310baa28da2d22482cb3a9804787fc53a93646c"; + sha256 = "651a6e1f5e49569ad65af74de39186629bb878d8a530286bcbe77feb55d5e89f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/en-CA/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/en-CA/thunderbird-102.7.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "6910ec50a0e227cac5e2e1abbf60bcb0c913884b31c71db8a66141939e4ed5af"; + sha256 = "ac29efcadcdbb2e90c3fd93ab1583968753861e64ad76c929635c61c60b7d862"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/en-GB/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/en-GB/thunderbird-102.7.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "fb3bc64c3b7266e1531d56ab0607e7031b6425435fc452fab1b38bea3623e73e"; + sha256 = "d312ca0e8549ab802d5e1f8ffcbaa67fefdf100745959d0eb3c28a9245386e60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/en-US/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/en-US/thunderbird-102.7.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "e803a265cc40c8a0a306939a7e9effb087bacbfaeacee0ffea291d5948c14741"; + sha256 = "a78cc228245bef172c7c75b884d4e4cc01858ff781e8c98d7f5f58c538d1dadf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/es-AR/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/es-AR/thunderbird-102.7.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "42ed5e1d668a75a04f3d2ef2c0429dabc1a64a2c03c7c946a936c160ce98f3a7"; + sha256 = "857ce86bce565f1c6c5a3191a3307d3cf4ea961eb46c8caca778adbadbf1b1ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/es-ES/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/es-ES/thunderbird-102.7.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "d9bbb9197b48231ce1b62983cf51cca7d21db8f7530fd036e5c4706564dc5ad5"; + sha256 = "acc10ed435a63062ff3087663afe013bd1b9dfd1e5b01507ffec5ae714dc66be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/es-MX/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/es-MX/thunderbird-102.7.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b6aaf5311c8f7156fea7a4c32fc7e45828edae7515776f6d2f531aadb46ced71"; + sha256 = "ddbece82bfbe3a87c5c464ae095ab85b751a8a273e959bb72673641a54379737"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/et/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/et/thunderbird-102.7.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "fda67cbf589f6c16b8b70f9a9adf4e66ced2a075cccdd7082257936f36515f26"; + sha256 = "b5daa1beeaf2bfcc752c72146b2a1825a423c3c4b77ae27dcb2f3f0a6f1f456d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/eu/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/eu/thunderbird-102.7.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "1f2b63138db4722f93479134c9496d5764d0022b98f883859ef993eb1d1a354a"; + sha256 = "0cd04b7cbfa63c6dde7d878167aaaa2910374362f30612c465d7057026588673"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/fi/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/fi/thunderbird-102.7.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "3903b745f2e630e7e9eb373fe1be824f658098427a022885e8e4b3702dd0e3ff"; + sha256 = "151af6da31e71c79c225b8b7ecd5be43bfe9ebcbac4a4f854b20d19f0b1778a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/fr/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/fr/thunderbird-102.7.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "e55f2383cf4724a2730e4c9cbea45b94e248516457422b9a4f351ec5490166f9"; + sha256 = "4f9ec3fa67bd4ae618d31f6554d921ed2488e2b0f072142e528e06c0e4aa33f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/fy-NL/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/fy-NL/thunderbird-102.7.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "662a3cccc13461e42dfac524285e1d0e632da195d962cb0e5d8464174c28cd9b"; + sha256 = "ef432088a17e039e817d3a11dcced4ed1b561145683348a7c124542be6871c4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ga-IE/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ga-IE/thunderbird-102.7.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "703ff33f3d096f5f96e447ea8753c485eea44f5c4337146e8cd8b142660891d8"; + sha256 = "dafc4777f7649bc2cf42989be7454ca40904480ff43ccca1b85b01a7fac2d5da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/gd/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/gd/thunderbird-102.7.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "94892f71e8fcae4061d37ba2b30f4a097af3472cdd9233836063616db1e71628"; + sha256 = "860895c8660f356bc4c881a6c51e79b67eeb69cba94f1fe1532af226cc8d4bda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/gl/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/gl/thunderbird-102.7.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "d7539b557ea31966780c6f6c892ac3041f3976f94869f386106c3815031e6ac6"; + sha256 = "1e5bd20d59beb8fe1ceecbd6ca51f5772ab3241a35a085af9a8c8c5dad280844"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/he/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/he/thunderbird-102.7.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "96ceac6f559f636d11d433e05bc0997f70c0dc055d04e2a378e35a69437ea93e"; + sha256 = "2d068ad6b002363499b8ba9e3c9196cba421887509f0e3c2d975b6b0f4ee6f9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/hr/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/hr/thunderbird-102.7.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "50ea1a69e96ec98fba3469ced119d70d020b061bd261267a5aaaf9a50293bf6d"; + sha256 = "f49a4449183e0c3f105ceb95e42761354f6a51a30da7b95178e78991077cc2f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/hsb/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/hsb/thunderbird-102.7.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "6df3cb2437541cb897c9bd7c65d019fa0938df54c13c513547a36ad9f6409d14"; + sha256 = "c4ecca8fdc1604488b4c0a7f3b171b16da1d32a3d1098da2de99e2010645696f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/hu/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/hu/thunderbird-102.7.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "8798d9f4deb2b1d75f38e10dcd184a0d82d1e5ca69fb171b024b636cc5366bb7"; + sha256 = "1c565300c297a3f734d02a02d0e5804eedf18ff319ddc2d831a50e9f1f8681c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/hy-AM/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/hy-AM/thunderbird-102.7.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "e5e569436fb883fce500ccbf138f2237e8d641957177b0e9323a0091713c25d1"; + sha256 = "08269187570c64b9b7f8e121e7aafdb7546b4c9a9ff127e8d2287ddd977f00b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/id/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/id/thunderbird-102.7.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "dfb81f988c1a6bfe2ba9913e5b31ec2c172dae9ade4a05961202a867e4192367"; + sha256 = "c3ac21a8843631d24e69e6f28409cb609811130ea3454f1b2d72d8fe0008f02d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/is/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/is/thunderbird-102.7.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "a3f1a999a31b02c130a74408c7fb3e910124ade35e4d8ce4274d162d4dd1e30a"; + sha256 = "959722f9ba38954ae7b6b7f746646492fb44274f1add7a15f324ddea632008fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/it/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/it/thunderbird-102.7.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "ed75d139aff75595f05c42e621a71c42316fd9b4c82f9c63b32ea2bcbafb9f97"; + sha256 = "fdea9f2b4496396211cbfb82c37e8a4ba8417df9d41a06a16d8bedfb5c004183"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ja/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ja/thunderbird-102.7.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "deff788766133ecd6d1f8d01d36f58c6d89cf9dca41005e97a3bfca1f4ac8de7"; + sha256 = "cb8e2152dc44dd0311c1fc26427be109c652edd666e50ce64228083b45aae1f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ka/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ka/thunderbird-102.7.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "5a7de96a5f4d933a420694810ab32c7ce397c1a31e539dcad42ada81c7edfdb9"; + sha256 = "5cf0d73fbf3010631d47edefd8fc61bacc0afc5dfc70b10e8f15ea1acb9d01b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/kab/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/kab/thunderbird-102.7.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "ecd5bc56051fbed9641c7adb9a4d9ba627586b50b3fc1f564fcaf8b4f891c643"; + sha256 = "a7fd302122033f17395682a938a4f4568769e78da5c65497efd9bcfe8f1ad55a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/kk/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/kk/thunderbird-102.7.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "dc46b7cb231dc71b7481796bcebcf12f50cb0b1212fc0a619747524567aef257"; + sha256 = "4904675ec60a76be7520ce049c3ed20f65aa536706197134982d7f8f06354fa8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ko/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ko/thunderbird-102.7.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "919b35ed688c7a0f6deba8e31e696ca804c62abd5cde119af2a2f4300a83c8d0"; + sha256 = "5d68318f86e9b454a7e91c3a633ceeea4622c822c16cf195a15a98e5c283b8e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/lt/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/lt/thunderbird-102.7.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "50f1a50545befdafee3c0ec1df0386d28ac041dde3e72653cd3834d8c136f705"; + sha256 = "653a51abc8d653986327971267045ec39dadb87ce2d45db07c89f7af6d071ae8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/lv/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/lv/thunderbird-102.7.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "943abb80c6c57437a62923c311fa17b28a0381da727f5d2e492cf68cce11917d"; + sha256 = "baff4993f6342633b78c91b89c6310797fc2e47ff4eb1fde42944600928c24d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ms/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ms/thunderbird-102.7.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "c6918b2df57f5ca08f6a24b1e9d0355bbda199ca8a08a950200e344c360388e6"; + sha256 = "84bc6e45f468fa2502ab724b1e83646517e2317336859ef511416cf1f816c99c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/nb-NO/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/nb-NO/thunderbird-102.7.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "44ef771b91f4310332e2cb79c81a323cef65bdbeae2dfc44eb1b4ebe81516278"; + sha256 = "f27e36fc612a6371d909d59b8b8d890d253d6377c73c688a88d3d91bb28e6fd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/nl/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/nl/thunderbird-102.7.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "43e16f65802000586493e38901de3c5acfbc2ac7fbd96964a6fc815ea9d1a2b6"; + sha256 = "08b7fd31958fb59a79805ebef8750444e9611153b51ef629f7346f093668b0cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/nn-NO/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/nn-NO/thunderbird-102.7.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "eac4fec574f33372499f94c9a1d4995ba88c41f5e7d1d9dfc2b34001857a007c"; + sha256 = "e8acc09fa7461276a4d0e0b1cffbb6a6957abc258f5cde21cd60a12b0fa4a699"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/pa-IN/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/pa-IN/thunderbird-102.7.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "fb3d7789404180960fcd59b8b16cb9e16c5c3fedabe872e330d73b944654a0ac"; + sha256 = "dbc65a49363f155806bbe224e2f53f711fdf87fa187eec0b853edb4c247142cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/pl/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/pl/thunderbird-102.7.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "e9f6c26b6956114ad0a56a9690d4f8edd96e23ca82afe68d28e990e5f0f67408"; + sha256 = "bd59abc1773c3f4d14fe01fe0e4d02e6cdf47bddfdf2fedafa379852dc73ce2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/pt-BR/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/pt-BR/thunderbird-102.7.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "675132e4f4faaeaa6b4a4853d4b47d3d09cab5842d271cd3243c49c783afa45b"; + sha256 = "7f53b244392fe8623712039afcbf5e48733eda8c30ded65dde32e4fb943dcbb3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/pt-PT/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/pt-PT/thunderbird-102.7.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "abfc6b22ea322d70973624e3b3544887adba99eda1a086d8ae67f3904d47dc06"; + sha256 = "f28fd3208ef49e51f5facd75c070c1752a3d98b7918664ea5f990f5dc691a26e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/rm/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/rm/thunderbird-102.7.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "652d391ee8e934914d158b0c9e1f8df5078290dc5ddac321a11297360b22c982"; + sha256 = "ca914636f9f8039b6b009d703874894dd1a9baa9a8ab689646a27ea5ec19335b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ro/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ro/thunderbird-102.7.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "2e2326714706b12c8123d9952da8630b02a621eeda398631614d638a9a2aeec4"; + sha256 = "6773c7b4cf3d08573b561184a4791e0d8df6ef7471e575d67ab3714471eb7d6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ru/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ru/thunderbird-102.7.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "8fdcfb3fa172755204fb9263202988fef1d70a8f0be16b59bacc05fe47a9c124"; + sha256 = "83a0fc3af145e4a8977fad8fefa8c61dea05da241968a402163390dc51783405"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/sk/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/sk/thunderbird-102.7.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "e722b0e8e80e20c169f8d691ba81bd81bc97f77e1b9a03778f8ee93850dd9c29"; + sha256 = "aa1f6583a8b67cf82020add4af9b036430d9dd4c098329ffef838aa17f438283"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/sl/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/sl/thunderbird-102.7.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "8322877e87880e76a41eeebd268858a20caf7c5c95e728f21c4ab29959e96e9a"; + sha256 = "7d56a2519b6b42b7415c5e2a08542acd4deae999b9da8d050d9d569d2090891a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/sq/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/sq/thunderbird-102.7.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "88297cb69a678af8db0dfe7584fefb518df1a9cfe0f87f1ff8cc30f52d5a3d64"; + sha256 = "de0301f1146de978731630f4a409123c3632a5f28f969343b3a9174b4682f54a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/sr/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/sr/thunderbird-102.7.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "4c8382d66320d98a3dfd9e254c8e72c371a39e49e07267ed6a9d4e0ba1a2d343"; + sha256 = "66bf3ab91904a380a489461ea8b291fee3c85a042adebdc6e444776b6421dd93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/sv-SE/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/sv-SE/thunderbird-102.7.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "1dd4ad25cf7557119588e98f31fb8875ab1cac2fba6c08be6a18eed8ed7f7008"; + sha256 = "69b274c1142959d2a8a246a37cd5ff6c6942cfff94395d19a8d01ec4a4115629"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/th/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/th/thunderbird-102.7.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "cec22b02870bdcd60e1ffdd3524a36e71bff5d32497787bf10af7e257c02aada"; + sha256 = "9fdd24e43f32722026728ab5673dc29bbce95415be580e75417e5769ad9ad154"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/tr/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/tr/thunderbird-102.7.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "68aebdfba935442388825991682280092920b1bbd6aaf14c5f8aa4b48d6fb38a"; + sha256 = "480221e013d98ba46271b1448057da4c405831fba518d8266d1502759fcace1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/uk/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/uk/thunderbird-102.7.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "f9f2f91cce1c6a41ea6783cabdcced5132174c0064bd1571ea1c425e8ee9050a"; + sha256 = "2e43643374b2ebae4b882c8fabdbffbe75351679711b8c07edb3f81bbff99e18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/uz/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/uz/thunderbird-102.7.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "bc5236d3a61b35c674694605e5ee65c7b2599cb8969eab112767f0510ba14c81"; + sha256 = "ce9f9ae3a6750863dbd88a54964d28bef949fefdd00de91ca149fc73c3780929"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/vi/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/vi/thunderbird-102.7.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "b32afcecb7c1e7b67dff0a4b07e7d9eeb9cd939d017f5a1aea594fb282222118"; + sha256 = "6913bfd4043cbeb8adc1b60b54958b4b45ea581ed32430496cc3c6e368da0432"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/zh-CN/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/zh-CN/thunderbird-102.7.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "866371f13123180e76a0be8adcde3bde1123633a18012e9f0e71a2e75f61c838"; + sha256 = "bed56c6e8c86919cea51fbb8b945cdfc8b1470a350bc30a81f090da873e0dc3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/zh-TW/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/zh-TW/thunderbird-102.7.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "fec9c01a6bc7c46a5febbd9c7f9e0fb29d9e2cfc44bd05109a3e4fe65d8f6471"; + sha256 = "e88b4af743a6a4f3351d84faa299c24398efd4e0a885744e972f48c842664231"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/af/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/af/thunderbird-102.7.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "18ac6f84834865ae4dc1db83c025a1a1f48619aa59a29e0db52f312c9e0706eb"; + sha256 = "77a1191878ba739e961c585972e09667f71fafa910d1b88e3b1d4f2cf3b57c98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ar/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ar/thunderbird-102.7.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "00903f552a47f6d206ece18a67367ba13035f962a68566700f7ed8416a88b570"; + sha256 = "fdb2b78af9e5f88dd1cc553fa49f79fbb1992ec68a39534a62a4059e3c90c8a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ast/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ast/thunderbird-102.7.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "800b55130ed716abf55dcd08644bb6df5c3588388e4d713e027dda144146bea9"; + sha256 = "49f60ad48a7cb25072f51da1f0f1d9927054a0770e68615554e3fc252b7c01a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/be/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/be/thunderbird-102.7.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "78cd3a41302afc90580327c94f0ea6c3d3d4d9444e264549767f485f18a796e8"; + sha256 = "d59942a904f325937566e776bf7f5ee0040237161bbea5c018b0e15e324e054c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/bg/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/bg/thunderbird-102.7.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "fcbc8017e9cf0de78d615b89aa844c0d2453a47e000995cd1077bb0125afb08d"; + sha256 = "cee56ce650ada3771572cbb8c5a66c9b199a09e8b5aaba4c39f50c7f625c2bc6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/br/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/br/thunderbird-102.7.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f22aa80ee04d152e8485c111b52fd8a40029c7f3b0abd558f37eca6ea1f2f3aa"; + sha256 = "75bb61c9af7eee854513c33c1691ec599a3a0f102a2d2c92f60166d29b00e518"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ca/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ca/thunderbird-102.7.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "1c98fd50645a51bfb57f0c8a5800144603230535901a0790b137a854f600df19"; + sha256 = "251f8a7c25fc836fdbe442d411b52e27a72fb959506b0024fc51998f88853888"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/cak/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/cak/thunderbird-102.7.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "f1a4711b1613bedca484ee594c5ad415fe617f5d950c47153810918afacdddf9"; + sha256 = "e35db0bdaa032eb35da0e7c5f5434cb945ee2c76f3f22f4340beca77b1dc276d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/cs/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/cs/thunderbird-102.7.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "572401b5d7fb5919e48d67c992a8bccc0f7989cfb4e4a59b703a99d93b64bd58"; + sha256 = "4bf3e15c819ef3eaeea8ee48637adcc3dea859295ed1efe48727198b8ec68286"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/cy/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/cy/thunderbird-102.7.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "023f03cd9a84547d7a427bfd4d7989b687573f591e327a15d888d2fb0baabd38"; + sha256 = "ec4b2793bac062f91abea3d861f2347d5979bd7cd82ca90d207f42275ee45924"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/da/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/da/thunderbird-102.7.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "94e11b08163e7608b6aeb772b6571174468951bb99d97e7de2f3e8623c26702c"; + sha256 = "d8c3aa1d3725fd3b916b2b011e45d269efcd41884135b77007a3ab09b32b5790"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/de/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/de/thunderbird-102.7.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "f5a85b5ab6dc1241b7d51dc2cdad97aa29eebf4d4ed5bbe8906199ae634c0598"; + sha256 = "dfe4bb2548772f2216bf8f40e0e299f72a4623f8a3515322d6fef8479160eb65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/dsb/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/dsb/thunderbird-102.7.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "9f592e41dff37d58ef081b5219026c37e1d6822116e769ccab52071e1721052a"; + sha256 = "bd6341d73b0e45f1652ae7e0edd521c6050da76ca74318a1c09c23ff578e7f64"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/el/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/el/thunderbird-102.7.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "14d8c519f366a101e0389a81f8a15e15241c69b1b523e07a71a1dce4d785eba0"; + sha256 = "519956e96b8a588bb9b7300241088b75936aa6cb867df750d755ef877ffc4113"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/en-CA/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/en-CA/thunderbird-102.7.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "22f6c1dbebaf52bd33f169229ddcaa487c5016d549e1b511af69e89f07ca862c"; + sha256 = "d5dcb62cf3afbbe51bf331f521c38c3fb42509966fab7cd3de4555cb01c8385f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/en-GB/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/en-GB/thunderbird-102.7.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "eca6df9a2ffbae931a786dfe33bc447bb4e5470afe8f21da24b4d50a1bed8deb"; + sha256 = "33ac02dd0b28c0d3b3a371fa7d18b9dad9d50ba12b5b998cd8035a509bd9d0c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/en-US/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/en-US/thunderbird-102.7.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8d7882f46d4d78626749c200688c2d9713a00a60357e745e60464ab11c1ae4a3"; + sha256 = "eba918d5d1945d5a2be98026c5cedfb8fc766bcc70e85b74a056ee6cb839e17e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/es-AR/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/es-AR/thunderbird-102.7.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "3cb2a530cac1b0b5f6c7da7bd17b62fab1a196ae554469a76636782e55f7ee4a"; + sha256 = "28d3585777d69e3923fc092a07f3792374bd94b4355e9158b412f61ba48260de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/es-ES/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/es-ES/thunderbird-102.7.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "8f19d223a4a212144d2cd88e594f746ae611d12d891fd39bfcb4c72046b2a96a"; + sha256 = "a548a4a7f1ac802dab608bec15d3102f60985d4f72d7ed3ce5b4af6019dad3bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/es-MX/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/es-MX/thunderbird-102.7.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "89f530f790c8b33b880bc67b652a1c351bec41625808c2a78664b9e521a711a0"; + sha256 = "c521d75f86ec69e520be6782b0f8ae50ee11781fbb65efde907788c0f780d13a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/et/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/et/thunderbird-102.7.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "361eedd14a241b87d38a5f0768f8bea70fb5e94ea300b17b3bf5b6b1b63f1c88"; + sha256 = "0ce40eedd20d47f10052380716afceaaeecfa1794654e0fe3d91c164369be7e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/eu/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/eu/thunderbird-102.7.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "a563c1f6e8c207d656227adafb164948cf81638bc2293a5eca3383a78da48fac"; + sha256 = "fe0bc3bef267629b43aa9a30888b776c23823bc39d3b8de1669737d050d0c6d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/fi/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/fi/thunderbird-102.7.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "e6770ae91921874ffa980daef3c9b687aff460a9658aecdcce05723fcd1a6ac6"; + sha256 = "a7df2ae00cc2d6528d68d23dc6dd87d5ab888d4ff8bc8926fa1f260f3e941249"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/fr/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/fr/thunderbird-102.7.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "2fb45cb868ac4da79ff4b2d3d664b5dd2e8e7eefcc488785da812cceed36336c"; + sha256 = "1ba6ee69c2e06b3e14257668a025949eb52427530303dea7f239b875622e2265"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/fy-NL/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/fy-NL/thunderbird-102.7.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "38282f455d0ff8096634c6bff0a953b5654a80185925712ce5a774140c06fab2"; + sha256 = "5738e2f246aa21dcd65b7793930a6fff7f1df4a6e1a961647b9e5909751631b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ga-IE/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ga-IE/thunderbird-102.7.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "45a8b6c21f7a086ce3d0ed75b4043e3cf546fa4a9bd2cdfe89f47633ea5a0337"; + sha256 = "964250c97a1657e0be2336aa2b7396d687ed1b09eff3a78491494c3f1d1f6e6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/gd/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/gd/thunderbird-102.7.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "065fc2c78c66ee04fd4343bc4247b3a24f83a6f50d0511b2555249310f3053e0"; + sha256 = "9edbd8aa70d19fb8c458cbb3150af7b493d56d9eef148e95062c98eb484b37c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/gl/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/gl/thunderbird-102.7.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "85c3ba755fc279b4ec746113f194f54f476bf60d359050c585e4d33698bbb750"; + sha256 = "7115f6a9d4ec73c67388705798fcc7fb66170327197797bb0e94ccbb8d1533df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/he/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/he/thunderbird-102.7.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "12cf7e48c98de087b0c4aa20e61bf2aa012ed4ad9e356e6e9f1a9bb9764d62e6"; + sha256 = "694b96cc2ef17776114c5dfab1dd6986ea19eb915f1e2949643c50088a41d371"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/hr/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/hr/thunderbird-102.7.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "60e56d042f45bfb6a297e4cd9bbb7dc4855a576e37adb3a630f8f2aac460d24f"; + sha256 = "cc8fbcf5f2a2140de52393a65b47c3dc3f8d0a3c5beff3c4b03146bcb3b22d01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/hsb/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/hsb/thunderbird-102.7.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "cd8f0e82622ff4617d659b7df38f6d07dbfacd0a262c56039f0667cbb474db86"; + sha256 = "dd58e25c539fe156b77bd38cc605273fed8d2eb5539c258ded6c549bd77b62b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/hu/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/hu/thunderbird-102.7.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "ab2f1fcd4fc076862ec2f2c6102712f45b7bf2e3da8577fdcc5ca6803773ab92"; + sha256 = "043699375afb74a87cc56745b7adea8a7e4277ead73fe955ec47edeba79fe376"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/hy-AM/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/hy-AM/thunderbird-102.7.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "84626379ebcc40f60ab94ec22d60b6a0a60b1af86d0d815a22b875e123d4b7fb"; + sha256 = "a3070020b912611f951627b4301b1b1731a12e9862c5abf6d84bfaec42d053f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/id/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/id/thunderbird-102.7.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "d49834cf21d985738d17306a7dff8fd158032c0b32fe6df2e2bebe722350ae6b"; + sha256 = "cce39d28bab265b125a2fb764286a6074c529c1a135a9fb8513dfe1e68610fe6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/is/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/is/thunderbird-102.7.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "50f16148a4937381824691023d0acc736fcd517ca1523a5e2113fc0611b9f599"; + sha256 = "65d698c2be8159f86b7747a595035cd48cfd8894a1219aeea7ba533c63749bb8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/it/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/it/thunderbird-102.7.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "85a75ac95e8533f7fe186e49cdf335e71332be527f801d775c85cf5a1acf9835"; + sha256 = "38c3e6dd5119036cad3747a756182509743c257ab91bc3a46c4f072f4215061f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ja/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ja/thunderbird-102.7.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "732df69293cf19d05aa081dbc815533352049f21bec37ad020fbf81764790bc4"; + sha256 = "e6f4afe7187bc11c4bc91dec7c389967b087b70d80d1b573b6b59b14a96f928a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ka/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ka/thunderbird-102.7.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "bc8a0520e86296f8cb23187bfc35420a15c21e52d915fb8c272b872694e84697"; + sha256 = "e02c55859edc5b6b71c3f04b07f6a17c3eb47020d38e77c0dc197f89cff77280"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/kab/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/kab/thunderbird-102.7.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "907055485720ac96fc4fcff5a2458cb8978d7ac1047d61c304524f20058db227"; + sha256 = "7355fe55ef05aac5d1216e5dbeaf471840f8044a94dad10ee5d243355a64e490"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/kk/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/kk/thunderbird-102.7.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a0b5629060637275083d189f33196f06b23f00dfdc96c45a08e6934ea9ba31aa"; + sha256 = "0d941de8c8b07818e6a97f5548a018f62cf054095b3f5760dbc3e6bcad265295"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ko/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ko/thunderbird-102.7.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "52a37de38cd370042f80e1d3e008850fc37de4e08dfead8cb0d1a8dce90a577a"; + sha256 = "21fbbfb40b32f916e4954c1b9bd2f5a9dfff38b040472b217f9d5890e2addc9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/lt/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/lt/thunderbird-102.7.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "77d60e886dd86a1c31c427dfcea2f74b0fd9f9b1ed6c21b6239032cc009edda9"; + sha256 = "460cb7183c5f257e2059e50e3dcf14f9acdee91be7bc80c2b135c113daa5e818"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/lv/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/lv/thunderbird-102.7.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "d8b96ce3750df74fd789c28ad13fbc4bff739e7085de1b05a898e242663e75a5"; + sha256 = "48312688f9473fc4295a3a53552f6905cd6b6976e4a0098d1efe7066de79d99a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ms/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ms/thunderbird-102.7.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "e3e8c88bb5d57ec84f2e84717a1c98be462ce0463744de5cdf2c7b74bbd0905c"; + sha256 = "af5a24aa0419353e8114cf5e680a33189991bc46ff96b1a7e29f92090698ffe8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/nb-NO/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/nb-NO/thunderbird-102.7.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "d6fe64522d534b17b0e97cd670df853a352d65b105e0fe09415a46fcdd49d0fb"; + sha256 = "3366f4fcb3f59feab347401c1d54a53baeb7e2f02983f9a673474915dc0f2f90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/nl/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/nl/thunderbird-102.7.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "e6a7b5ff2d6fcae50791a6376369c5c87021e0970f21f303a67e970eb6663d16"; + sha256 = "e1eb9ec9b93325b33870c2a748cbb0678c5a616bc2f32ec72f21bf7e4f8b1dd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/nn-NO/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/nn-NO/thunderbird-102.7.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "5861a050a47871f9c443daa363497ddc007d964be1b3a27ca6c5c1e2cacd82a7"; + sha256 = "866ca87d6a1a77ee4781e2843a9dfade6a9d5c8c41dfa378b67c19579da8ba93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/pa-IN/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/pa-IN/thunderbird-102.7.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "58ef386087cdc68fdbe58444baa13375c40ae2e9447600ece3acf88373915533"; + sha256 = "cde4426c3216a9864b8ab252c1217b82cb848f62dec9a26e05beda0326a349a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/pl/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/pl/thunderbird-102.7.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "09b33a0a5230f58b867018f74146d40e63cfb9a321eb587ac92f70b2806fbd20"; + sha256 = "391ecdc9bfa27b41c09efcc2e9609ae2824f24d7f355951eef5c2bacec0ee023"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/pt-BR/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/pt-BR/thunderbird-102.7.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "83e0a0b52d3d92e892389f308bb52a05728bfedfde0c9216ed687534aede07e1"; + sha256 = "dd8c4daaf09b28c099f66066e1c09a1b7663bb88442091f288c30bc13a681d69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/pt-PT/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/pt-PT/thunderbird-102.7.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "5c9523ecf41e306c01b884caa30fc23d02a5d9f871a39fcd186776851530ea14"; + sha256 = "99939e63236d92365732da29fff66172b32817728eac3413bd8b36b642d71f78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/rm/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/rm/thunderbird-102.7.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "54aeaf1ea767343a144f85f65618e2ee0d300d11efd520615690d1620fba47c2"; + sha256 = "cd7575f2e15668f18f47f025ebf72da6ef1a6f78cf1cae3857b378fb8f4a5bb5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ro/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ro/thunderbird-102.7.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "345f4952d17240eb03da38ec4c1b99e46b488ab058b13d258f013668d2e26651"; + sha256 = "0cc819fa94f6f24ff71a834df6377593ac9a5f3dafd5b6341f3f566e310626f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ru/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ru/thunderbird-102.7.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "67e5b2cd8ca619592d57935fcbfe128c79ee167ef535614ab7f1c5b65b091365"; + sha256 = "3d10ea1e92cb98873dc281a1299209233d378d4dcd57e1e520e70f9d110fbea9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/sk/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/sk/thunderbird-102.7.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "e6a55333fcb707f1b7f1302168799dc42efe2eec5bc371087bacba1182560870"; + sha256 = "4e08aad359fb2f50306057014c02998c277355260190da6feb80ed5dab79da48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/sl/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/sl/thunderbird-102.7.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "3995e35537d02a660231e8ef900a5912b1eab8b551a579e75cb306940ae9976b"; + sha256 = "c235916f09e170081f431ff4a9fbb65f269c6778018c48cbe723e932fa477461"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/sq/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/sq/thunderbird-102.7.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "6b742595020681bd1066de0aca867954a273e10c076f39d0df1d83e5d8504b6c"; + sha256 = "3d41b2d0069c8bda97cb517bb2edbfae9d545cff78fe72e5a211cf1b1d6a1d28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/sr/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/sr/thunderbird-102.7.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "ffa7e636f5c0d541c007f52a2e829155e95b01ad0b279580d68260f6fe9132c7"; + sha256 = "5c7e1077b4f6bacfc85c81372da06fffbf1b5a57339dda29d529fac709713e86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/sv-SE/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/sv-SE/thunderbird-102.7.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "7172e07df01e6685873b99150fc6f3da77623ff7e90edc88c37497e5114bad9e"; + sha256 = "73a71fac92a39bea72b791e4cdb376fbee5a158d985baf55c02254377392c23f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/th/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/th/thunderbird-102.7.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "47fad6489e19b7acb53bc1f1b3001ad55b933d612271d08cfec642875f0cafe9"; + sha256 = "362ace4cc7d2059c53b58b387c1ac8b19965f5bdba7e566f5b1392236567bdca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/tr/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/tr/thunderbird-102.7.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "05d2eb31e99c09350aa0ec4cba2b046ea0c9871f32e9328b3c50c27fd4219b81"; + sha256 = "0c43d20819707c2e0facfe1d79cde5ed5c77022be74bec0d250ca1426917a462"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/uk/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/uk/thunderbird-102.7.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "8475840589710c68c996ba9740308d07677edc7ccb97585b4f9bcdc17d8397a9"; + sha256 = "0c96f8bffd2e2c8c4acff92685b8a4d2d0f138950928d5795c8459c0c07e6a71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/uz/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/uz/thunderbird-102.7.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "944077ed7e95392123f5a8bc1521cf23693c8cf968ef8b9b14127d3e1bf40747"; + sha256 = "b555e4b71142757d42e72073392e8a1b6002728e08177e04793a2fba54dbd671"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/vi/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/vi/thunderbird-102.7.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "7d7188470c3e0e4056df45f0032a7e5d31229ee4f07255d074eeea58801edb1f"; + sha256 = "f47a1e2fcc3b30405a1320583a18984085a92fcbbb803a37054217d73d8bb585"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/zh-CN/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/zh-CN/thunderbird-102.7.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "a7c995a24c9f75ecf2c87e7c4651cfd5efb57b4ae5f6efabd1fc2b2458a47830"; + sha256 = "d2c9a379863ef070f40cdba997eaf3a33d78ef3be05d44785cc5a7f91e815238"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/zh-TW/thunderbird-102.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/zh-TW/thunderbird-102.7.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "6e2f90e0ccfc26cc834a97b32bd70903e51926631bb3eb7df3e1b0b4db46350c"; + sha256 = "4b355e48855b7a67ba7fd8fdd5a46ec17ab21eab1e971fb07199163966f72ea3"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 7721834fea2d..8fefcc1c3143 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -5,13 +5,13 @@ rec { thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.5.0"; + version = "102.7.1"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "b6f2828b23616db5620e0364a1ebb02a8676e184d5e361c0aa87f36b64eb6b7f4b1bc3c42675b3ae3092953fbda6b01c18c068b167d40469481b1e18af1dcaa1"; + sha512 = "6310f3f122a1a61917ec2d0efe3a031b199ac13681e9fb4035abc0f4de0dbafb12accffbd63facb23f2cebf0124a13f7538a33176a2a513d1f685bee40db50ba"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 6375e8212473..a2972f9bfb96 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.98.20"; + version = "3.106.4"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "sha256-ddRuIFmsZcyrZ/0T0Sk6pnmxuG5osZVYFw7NCmgvECc="; + sha256 = "sha256-RU2JEFtYOpxqA02YDuB/V4t/ZZ608EHGMPpwxVOzRz4="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { makeWrapper ${electron}/bin/electron \ $out/bin/tutanota-desktop \ --add-flags $out/share/tutanota-desktop/resources/app.asar \ - --run "mkdir /tmp/tutanota" \ + --run "mkdir -p /tmp/tutanota" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]} runHook postInstall diff --git a/pkgs/applications/networking/misc/zammad/update.nix b/pkgs/applications/networking/misc/zammad/update.nix index 49e676d13f39..c3e1c7e1d594 100644 --- a/pkgs/applications/networking/misc/zammad/update.nix +++ b/pkgs/applications/networking/misc/zammad/update.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patchShebangs $out/bin/update.sh wrapProgram $out/bin/update.sh --prefix PATH : ${lib.makeBinPath buildInputs} ''; - phases = [ "installPhase" ]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ diff --git a/pkgs/applications/networking/mkchromecast/default.nix b/pkgs/applications/networking/mkchromecast/default.nix index ec2857753d7e..58f381f7a4ea 100644 --- a/pkgs/applications/networking/mkchromecast/default.nix +++ b/pkgs/applications/networking/mkchromecast/default.nix @@ -12,6 +12,7 @@ , youtube-dl , opusTools , gst_all_1 +, enableSonos ? true }: let packages = [ vorbis-tools @@ -28,16 +29,16 @@ let packages = [ in python3Packages.buildPythonApplication rec { pname = "mkchromecast-unstable"; - version = "2020-10-17"; + version = "2022-10-31"; src = fetchFromGitHub rec { owner = "muammar"; repo = "mkchromecast"; - rev = "eb9da74d887acd70ed179e6e4c0cbed4ff83de04"; - sha256 = "1l565n3rmyghc4vzh80gazvdks1i97j1h94x33pkmxxlf9a9rncj"; + rev = "0de9fd78c4122dec4f184aeae2564790b45fe6dc"; + sha256 = "sha256-dxsIcBPrZaXlsfzOEXhYj2qoK5LRducJG2ggMrMMl9Y="; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3Packages; ([ PyChromecast psutil mutagen @@ -45,7 +46,7 @@ python3Packages.buildPythonApplication rec { netifaces requests pyqt5 - ]; + ] ++ lib.optionals enableSonos [ soco ]); postPatch = '' substituteInPlace setup.py \ @@ -80,5 +81,6 @@ python3Packages.buildPythonApplication rec { description = "Cast macOS and Linux Audio/Video to your Google Cast and Sonos Devices"; license = licenses.mit; maintainers = with maintainers; [ shou ]; + mainProgram = "mkchromecast"; }; } diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 8006d81c9298..479d0980919c 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -16,9 +16,9 @@ , which , Security , withKeyring ? true -, libsecret ? null -, withSystemd ? stdenv.isLinux -, systemd ? null +, libsecret +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd +, systemd }: let @@ -41,7 +41,7 @@ let platforms = platforms.unix; }; - binaries = stdenv.mkDerivation rec { + binaries = stdenv.mkDerivation { pname = "msmtp-binaries"; inherit version src meta; @@ -62,7 +62,7 @@ let ''; }; - scripts = resholve.mkDerivation rec { + scripts = resholve.mkDerivation { pname = "msmtp-scripts"; inherit version src meta; @@ -128,4 +128,5 @@ symlinkJoin { name = "msmtp-${version}"; inherit version meta; paths = [ binaries scripts ]; + passthru = { inherit binaries scripts; }; } diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 9b1a609d8325..dc8c5729ddf8 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, dpkg , alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, pango, nspr, nss, gtk3, mesa -, xorg, autoPatchelfHook, systemd, libnotify, libappindicator +, wayland, xorg, autoPatchelfHook, systemd, libnotify, libappindicator , makeWrapper }: @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { unpackPhase = "dpkg-deb -x $src ."; - runtimeDependencies = [ (lib.getLib systemd) libnotify libappindicator ]; + runtimeDependencies = [ (lib.getLib systemd) libnotify libappindicator wayland ]; installPhase = '' runHook preInstall @@ -79,6 +79,9 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/mullvad-vpn --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1 + wrapProgram $out/bin/mullvad-daemon \ + --set-default MULLVAD_RESOURCE_DIR "$out/share/mullvad/resources" + sed -i "s|Exec.*$|Exec=$out/bin/mullvad-vpn $U|" $out/share/applications/mullvad-vpn.desktop runHook postInstall diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index 03bc81c8b543..a9289e0a8a55 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -6,6 +6,7 @@ , pkg-config , protobuf , makeWrapper +, git , dbus , libnftnl , libmnl @@ -30,6 +31,7 @@ rustPlatform.buildRustPackage rec { pkg-config protobuf makeWrapper + git ]; buildInputs = [ diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index cdaf4286f93c..4592d17d348f 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -15,12 +15,16 @@ nodePackages.n8n.override { pkgs.postgresql ]; + # Patch minified source with changes from https://github.com/n8n-io/n8n/pull/5052 + preRebuild = '' + patch -p1 -i ${./fix-permissions.diff} + '' + # Oracle's official package on npm is binary only (WHY?!) and doesn't provide binaries for aarch64. # This can supposedly be fixed by building a custom copy of the module from source, but that's way # too much complexity for a setup no one would ever actually run. # # NB: If you _are_ actually running n8n on Oracle on aarch64, feel free to submit a patch. - preRebuild = lib.optionalString stdenv.isAarch64 '' + lib.optionalString stdenv.isAarch64 '' rm -rf node_modules/oracledb ''; @@ -32,7 +36,7 @@ nodePackages.n8n.override { }; meta = with lib; { - description = "Free and open fair-code licensed node based Workflow Automation Tool"; + description = "Free and source-available fair-code licensed workflow automation tool. Easily automate tasks across different services."; maintainers = with maintainers; [ freezeboy k900 ]; license = { fullName = "Sustainable Use License"; diff --git a/pkgs/applications/networking/n8n/fix-permissions.diff b/pkgs/applications/networking/n8n/fix-permissions.diff new file mode 100644 index 000000000000..81a5a4ee6465 --- /dev/null +++ b/pkgs/applications/networking/n8n/fix-permissions.diff @@ -0,0 +1,28 @@ +--- a/dist/LoadNodesAndCredentials.js ++++ b/dist/LoadNodesAndCredentials.js +@@ -216,6 +216,7 @@ + const { types } = loader; + this.types.nodes = this.types.nodes.concat(types.nodes); + this.types.credentials = this.types.credentials.concat(types.credentials); ++ let seen = new Set(); + const iconPromises = Object.entries(types).flatMap(([typeName, typesArr]) => typesArr.map((type) => { + var _a; + if (!((_a = type.icon) === null || _a === void 0 ? void 0 : _a.startsWith('file:'))) +@@ -226,7 +227,16 @@ + type.iconUrl = iconUrl; + const source = path_1.default.join(dir, icon); + const destination = path_1.default.join(constants_1.GENERATED_STATIC_DIR, iconUrl); +- return (0, promises_1.mkdir)(path_1.default.dirname(destination), { recursive: true }).then(async () => (0, promises_1.copyFile)(source, destination)); ++ if (!seen.has(destination)) { ++ seen.add(destination); ++ return (0, promises_1.mkdir)(path_1.default.dirname(destination), { recursive: true }).then(async () => { ++ await (0, promises_1.copyFile)(source, destination); ++ await (0, promises_1.chmod)(destination, 0o644); ++ }); ++ } ++ else { ++ return Promise.resolve(); ++ } + })); + await Promise.all(iconPromises); + for (const nodeTypeName in loader.nodeTypes) { diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 6836e00c7e01..01afe03fd448 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -4,6 +4,15 @@ let sources = { + "@acuminous/bitsyntax-0.1.2" = { + name = "_at_acuminous_slash_bitsyntax"; + packageName = "@acuminous/bitsyntax"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@acuminous/bitsyntax/-/bitsyntax-0.1.2.tgz"; + sha512 = "29lUK80d1muEQqiUsSo+3A0yP6CdspgC95EnKBMi22Xlwt79i/En4Vr67+cXhU+cZjbti3TgGGC5wy1stIywVQ=="; + }; + }; "@apidevtools/json-schema-ref-parser-9.0.9" = { name = "_at_apidevtools_slash_json-schema-ref-parser"; packageName = "@apidevtools/json-schema-ref-parser"; @@ -31,22 +40,22 @@ let sha512 = "HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ=="; }; }; - "@azure/core-client-1.6.1" = { + "@azure/core-client-1.7.1" = { name = "_at_azure_slash_core-client"; packageName = "@azure/core-client"; - version = "1.6.1"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.6.1.tgz"; - sha512 = "mZ1MSKhZBYoV8GAWceA+PEJFWV2VpdNSpxxcj1wjIAOi00ykRuIQChT99xlQGZWLY3/NApWhSImlFwsmCEs4vA=="; + url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.1.tgz"; + sha512 = "85igXpc5V7ns6rvMEpLmIcBDftjUgTWD+0tmYPyQEfPfkAwpPTs1X5rhCDsfqvUZGA8Ksid1hdZGu62r6XXeHg=="; }; }; - "@azure/core-http-2.2.7" = { + "@azure/core-http-2.3.1" = { name = "_at_azure_slash_core-http"; packageName = "@azure/core-http"; - version = "2.2.7"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.7.tgz"; - sha512 = "TyGMeDm90mkRS8XzSQbSMD+TqnWL1XKGCh0x0QVGMD8COH2yU0q5SaHm/IBEBkzcq0u73NhS/p57T3KVSgUFqQ=="; + url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.3.1.tgz"; + sha512 = "cur03BUwV0Tbv81bQBOLafFB02B6G++K6F2O3IMl8pSE2QlXm3cu11bfyBNlDUKi5U+xnB3GC63ae3athhkx6Q=="; }; }; "@azure/core-http-compat-1.3.0" = { @@ -58,31 +67,40 @@ let sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA=="; }; }; - "@azure/core-lro-2.4.0" = { + "@azure/core-lro-2.5.1" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; - version = "2.4.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.4.0.tgz"; - sha512 = "F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ=="; + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.1.tgz"; + sha512 = "JHQy/bA3NOz2WuzOi5zEk6n/TJdAropupxUT521JIJvW7EXV2YN2SFYZrf/2RHeD28QAClGdynYadZsbmP+nyQ=="; }; }; - "@azure/core-paging-1.3.0" = { + "@azure/core-paging-1.5.0" = { name = "_at_azure_slash_core-paging"; packageName = "@azure/core-paging"; - version = "1.3.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.3.0.tgz"; - sha512 = "H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg=="; + url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.5.0.tgz"; + sha512 = "zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw=="; }; }; - "@azure/core-rest-pipeline-1.9.2" = { + "@azure/core-rest-pipeline-1.10.1" = { name = "_at_azure_slash_core-rest-pipeline"; packageName = "@azure/core-rest-pipeline"; - version = "1.9.2"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.9.2.tgz"; - sha512 = "8rXI6ircjenaLp+PkOFpo37tQ1PQfztZkfVj97BIF3RPxHAsoVSgkJtu3IK/bUEWcb7HzXSoyBe06M7ODRkRyw=="; + url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz"; + sha512 = "Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA=="; + }; + }; + "@azure/core-tracing-1.0.0-preview.12" = { + name = "_at_azure_slash_core-tracing"; + packageName = "@azure/core-tracing"; + version = "1.0.0-preview.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.12.tgz"; + sha512 = "nvo2Wc4EKZGN6eFu9n3U7OXmASmL8VxoPIH7xaD6OlQqi44bouF0YIi9ID5rEsKLiAU59IYx6M297nqWVMWPDg=="; }; }; "@azure/core-tracing-1.0.0-preview.13" = { @@ -112,6 +130,15 @@ let sha512 = "A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog=="; }; }; + "@azure/identity-1.5.2" = { + name = "_at_azure_slash_identity"; + packageName = "@azure/identity"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/identity/-/identity-1.5.2.tgz"; + sha512 = "vqyeRbd2i0h9F4mqW5JbkP1xfabqKQ21l/81osKhpOQ2LtwaJW6nw4+0PsVYnxcbPHFCIZt6EWAk74a3OGYZJA=="; + }; + }; "@azure/identity-2.1.0" = { name = "_at_azure_slash_identity"; packageName = "@azure/identity"; @@ -148,13 +175,13 @@ let sha512 = "dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="; }; }; - "@azure/ms-rest-js-2.6.2" = { + "@azure/ms-rest-js-2.6.4" = { name = "_at_azure_slash_ms-rest-js"; packageName = "@azure/ms-rest-js"; - version = "2.6.2"; + version = "2.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.2.tgz"; - sha512 = "0/8rOxAoR9M3qKUdbGOIYtHtQkm4m5jdoDNdxTU0DkOr84KwyAdJuW/RfjJinGyig4h73DNF0rdCl6XowgCYcg=="; + url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.4.tgz"; + sha512 = "2sbOpGhlBfv9itWdF7Qlk0CmoQCARxe5unwjNOprU7OdgEgabQncZ35L5u1A+zgdkVtNYF9Eo6XAhXzTweIhag=="; }; }; "@azure/ms-rest-nodeauth-3.1.1" = { @@ -166,13 +193,22 @@ let sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA=="; }; }; - "@azure/msal-browser-2.30.0" = { + "@azure/msal-browser-2.32.2" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.30.0"; + version = "2.32.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.30.0.tgz"; - sha512 = "4Y9+rjJiTFP7KEmuq1btmIrBgk0ImNyKsXj6A6NHZALd1X0M6W7L7kxpH6F+d1tEkMv8bYnZdn7IcauXbL8Llw=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.2.tgz"; + sha512 = "1YqGzXtPG3QrZPFBKaMWr2WQdukDj+PelqUCv351+p+hlw/AhdRrb8haY73/iqkhT6Cdrbnh7sL4gikVsF4O1g=="; + }; + }; + "@azure/msal-common-4.5.1" = { + name = "_at_azure_slash_msal-common"; + packageName = "@azure/msal-common"; + version = "4.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-4.5.1.tgz"; + sha512 = "/i5dXM+QAtO+6atYd5oHGBAx48EGSISkXNXViheliOQe+SIFMDo3gSq3lL54W0suOSAsVPws3XnTaIHlla0PIQ=="; }; }; "@azure/msal-common-7.6.0" = { @@ -184,13 +220,31 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-node-1.14.2" = { + "@azure/msal-common-9.1.1" = { + name = "_at_azure_slash_msal-common"; + packageName = "@azure/msal-common"; + version = "9.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.1.1.tgz"; + sha512 = "we9xR8lvu47fF0h+J8KyXoRy9+G/fPzm3QEa2TrdR3jaVS3LKAyE2qyMuUkNdbVkvzl8Zr9f7l+IUSP22HeqXw=="; + }; + }; + "@azure/msal-node-1.0.0-beta.6" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.14.2"; + version = "1.0.0-beta.6"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.2.tgz"; - sha512 = "t3whVhhLdZVVeDEtUPD2Wqfa8BDi3EDMnpWp8dbuRW0GhUpikBfs4AQU0Fe6P9zS87n9LpmUTLrIcPEEuzkvfA=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.0.0-beta.6.tgz"; + sha512 = "ZQI11Uz1j0HJohb9JZLRD8z0moVcPks1AFW4Q/Gcl67+QvH4aKEJti7fjCcipEEZYb/qzLSO8U6IZgPYytsiJQ=="; + }; + }; + "@azure/msal-node-1.14.6" = { + name = "_at_azure_slash_msal-node"; + packageName = "@azure/msal-node"; + version = "1.14.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.6.tgz"; + sha512 = "em/qqFL5tLMxMPl9vormAs13OgZpmQoJbiQ/GlWr+BA77eCLoL+Ehr5xRHowYo+LFe5b+p+PJVkRvT+mLvOkwA=="; }; }; "@azure/storage-blob-12.12.0" = { @@ -202,85 +256,94 @@ let sha512 = "o/Mf6lkyYG/eBW4/hXB9864RxVNmAkcKHjsGR6Inlp5hupa3exjSyH2KjO3tLO//YGA+tS+17hM2bxRl9Sn16g=="; }; }; - "@babel/parser-7.20.0" = { + "@babel/parser-7.20.15" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.20.0"; + version = "7.20.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.0.tgz"; - sha512 = "G9VgAhEaICnz8iiJeGJQyVl6J2nTjbW0xeisva0PK6XcKsga7BIaqm4ZF8Rg1Wbaqmy6znspNqhPaPkyukujzg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz"; + sha512 = "DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg=="; }; }; - "@babel/runtime-7.20.0" = { + "@babel/runtime-7.20.13" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.20.0"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.0.tgz"; - sha512 = "NDYdls71fTXoU8TZHfbBWg7DiZfNzClcKui/+kyi6ppD2L1qnWW3VV6CjtaBXSUGGhiTWJ6ereOIkUvenif66Q=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz"; + sha512 = "gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA=="; }; }; - "@codemirror/autocomplete-6.3.0" = { + "@codemirror/autocomplete-6.4.0" = { name = "_at_codemirror_slash_autocomplete"; packageName = "@codemirror/autocomplete"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.3.0.tgz"; - sha512 = "4jEvh3AjJZTDKazd10J6ZsCIqaYxDMCeua5ouQxY8hlFIml+nr7le0SgBhT3SIytFBmdzPK3AUhXGuW3T79nVg=="; - }; - }; - "@codemirror/commands-6.1.2" = { - name = "_at_codemirror_slash_commands"; - packageName = "@codemirror/commands"; - version = "6.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/commands/-/commands-6.1.2.tgz"; - sha512 = "sO3jdX1s0pam6lIdeSJLMN3DQ6mPEbM4yLvyKkdqtmd/UDwhXA5+AwFJ89rRXm6vTeOXBsE5cAmlos/t7MJdgg=="; - }; - }; - "@codemirror/lang-javascript-6.1.1" = { - name = "_at_codemirror_slash_lang-javascript"; - packageName = "@codemirror/lang-javascript"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.1.tgz"; - sha512 = "F4+kiuC5d5dUSJmff96tJQwpEXs/tX/4bapMRnZWW6bHKK1Fx6MunTzopkCUWRa9bF87GPmb9m7Qtg7Yv8f3uQ=="; - }; - }; - "@codemirror/language-6.3.0" = { - name = "_at_codemirror_slash_language"; - packageName = "@codemirror/language"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/language/-/language-6.3.0.tgz"; - sha512 = "6jOE5DEt6sKD46SXhn3xPbBehn+l48ACcA6Uxs2k+E2YNH9XGF5WdGMTYr2DlggfK4h0QZBK6zEb5S7lkTriWA=="; - }; - }; - "@codemirror/lint-6.0.0" = { - name = "_at_codemirror_slash_lint"; - packageName = "@codemirror/lint"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lint/-/lint-6.0.0.tgz"; - sha512 = "nUUXcJW1Xp54kNs+a1ToPLK8MadO0rMTnJB8Zk4Z8gBdrN0kqV7uvUraU/T2yqg+grDNR38Vmy/MrhQN/RgwiA=="; - }; - }; - "@codemirror/state-6.1.2" = { - name = "_at_codemirror_slash_state"; - packageName = "@codemirror/state"; - version = "6.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/state/-/state-6.1.2.tgz"; - sha512 = "Mxff85Hp5va+zuj+H748KbubXjrinX/k28lj43H14T2D0+4kuvEFIEIO7hCEcvBT8ubZyIelt9yGOjj2MWOEQA=="; - }; - }; - "@codemirror/view-6.4.0" = { - name = "_at_codemirror_slash_view"; - packageName = "@codemirror/view"; version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/view/-/view-6.4.0.tgz"; - sha512 = "Kv32b6Tn7QVwFbj/EDswTLSocjk5kgggF6zzBFAL4o4hZ/vmtFD155+EjH1pVlbfoDyVC2M6SedPsMrwYscgNg=="; + url = "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.4.0.tgz"; + sha512 = "HLF2PnZAm1s4kGs30EiqKMgD7XsYaQ0XJnMR0rofEWQ5t5D60SfqpDIkIh1ze5tiEbyUWm8+VJ6W1/erVvBMIA=="; + }; + }; + "@codemirror/commands-6.2.0" = { + name = "_at_codemirror_slash_commands"; + packageName = "@codemirror/commands"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.0.tgz"; + sha512 = "+00smmZBradoGFEkRjliN7BjqPh/Hx0KCHWOEibUmflUqZz2RwBTU0MrVovEEHozhx3AUSGcO/rl3/5f9e9Biw=="; + }; + }; + "@codemirror/lang-css-6.0.2" = { + name = "_at_codemirror_slash_lang-css"; + packageName = "@codemirror/lang-css"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.0.2.tgz"; + sha512 = "4V4zmUOl2Glx0GWw0HiO1oGD4zvMlIQ3zx5hXOE6ipCjhohig2bhWRAasrZylH9pRNTcl1VMa59Lsl8lZWlTzw=="; + }; + }; + "@codemirror/lang-javascript-6.1.3" = { + name = "_at_codemirror_slash_lang-javascript"; + packageName = "@codemirror/lang-javascript"; + version = "6.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.3.tgz"; + sha512 = "u3JgK9AwfNpyGwRhtzIVxVfH9yOK5ZNswmaN6W+XFuUXzW9o8CGgnSBEcaUgZ0hdLvHQHyM+3+22HKgbItki/w=="; + }; + }; + "@codemirror/language-6.4.0" = { + name = "_at_codemirror_slash_language"; + packageName = "@codemirror/language"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@codemirror/language/-/language-6.4.0.tgz"; + sha512 = "Wzb7GnNj8vnEtbPWiOy9H0m1fBtE28kepQNGLXekU2EEZv43BF865VKITUn+NoV8OpW6gRtvm29YEhqm46927Q=="; + }; + }; + "@codemirror/lint-6.1.0" = { + name = "_at_codemirror_slash_lint"; + packageName = "@codemirror/lint"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@codemirror/lint/-/lint-6.1.0.tgz"; + sha512 = "mdvDQrjRmYPvQ3WrzF6Ewaao+NWERYtpthJvoQ3tK3t/44Ynhk8ZGjTSL9jMEv8CgSMogmt75X8ceOZRDSXHtQ=="; + }; + }; + "@codemirror/state-6.2.0" = { + name = "_at_codemirror_slash_state"; + packageName = "@codemirror/state"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@codemirror/state/-/state-6.2.0.tgz"; + sha512 = "69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA=="; + }; + }; + "@codemirror/view-6.7.3" = { + name = "_at_codemirror_slash_view"; + packageName = "@codemirror/view"; + version = "6.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@codemirror/view/-/view-6.7.3.tgz"; + sha512 = "Lt+4POnhXrZFfHOdPzXEHxrzwdy7cjqYlMkOWvoFGi6/bAsjzlFfr0NY3B15B/PGx+cDFgM1hlc12wvYeZbGLw=="; }; }; "@colors/colors-1.5.0" = { @@ -292,6 +355,15 @@ let sha512 = "ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="; }; }; + "@cspotcode/source-map-support-0.8.1" = { + name = "_at_cspotcode_slash_source-map-support"; + packageName = "@cspotcode/source-map-support"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz"; + sha512 = "IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="; + }; + }; "@curlconverter/yargs-0.0.2" = { name = "_at_curlconverter_slash_yargs"; packageName = "@curlconverter/yargs"; @@ -319,13 +391,13 @@ let sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="; }; }; - "@fontsource/open-sans-4.5.13" = { + "@fontsource/open-sans-4.5.14" = { name = "_at_fontsource_slash_open-sans"; packageName = "@fontsource/open-sans"; - version = "4.5.13"; + version = "4.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.13.tgz"; - sha512 = "/UzqP7ZFk145XAq8KG4pvFPP7UQhtreDGXgqXZjagCDreKxcrhwn/x7DYz9rPcycWkLUVApIybcoczGZiM0cRg=="; + url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.14.tgz"; + sha512 = "mBXIIETBlW8q/ocuUN0hyGow2iuf75hQEHQt8R/RJ/HcphVbLg8KB7pHYGbFGDqs75W+SWvTC7JkVeAjT65BuQ=="; }; }; "@fortawesome/fontawesome-common-types-0.2.36" = { @@ -346,13 +418,13 @@ let sha512 = "CA3MAZBTxVsF6SkfkHXDerkhcQs0QPofy43eFdbWJJkZiq3SfiaH1msOkac59rQaqto5EqWnASboY1dBuKen5w=="; }; }; - "@fortawesome/fontawesome-common-types-6.2.0" = { + "@fortawesome/fontawesome-common-types-6.2.1" = { name = "_at_fortawesome_slash_fontawesome-common-types"; packageName = "@fortawesome/fontawesome-common-types"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz"; - sha512 = "rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg=="; + url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz"; + sha512 = "Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ=="; }; }; "@fortawesome/fontawesome-svg-core-1.3.0" = { @@ -364,13 +436,13 @@ let sha512 = "UIL6crBWhjTNQcONt96ExjUnKt1D68foe3xjEensLDclqQ6YagwCRYVQdrp/hW0ALRp/5Fv/VKw+MqTUWYYvPg=="; }; }; - "@fortawesome/free-regular-svg-icons-6.2.0" = { + "@fortawesome/free-regular-svg-icons-6.2.1" = { name = "_at_fortawesome_slash_free-regular-svg-icons"; packageName = "@fortawesome/free-regular-svg-icons"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.0.tgz"; - sha512 = "M1dG+PAmkYMTL9BSUHFXY5oaHwBYfHCPhbJ8qj8JELsc9XCrUJ6eEHWip4q0tE+h9C0DVyFkwIM9t7QYyCpprQ=="; + url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.1.tgz"; + sha512 = "wiqcNDNom75x+pe88FclpKz7aOSqS2lOivZeicMV5KRwOAeypxEYWAK/0v+7r+LrEY30+qzh8r2XDaEHvoLsMA=="; }; }; "@fortawesome/free-solid-svg-icons-5.15.4" = { @@ -382,13 +454,13 @@ let sha512 = "JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w=="; }; }; - "@fortawesome/vue-fontawesome-2.0.8" = { + "@fortawesome/vue-fontawesome-2.0.10" = { name = "_at_fortawesome_slash_vue-fontawesome"; packageName = "@fortawesome/vue-fontawesome"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.8.tgz"; - sha512 = "SRmP0q9Ox4zq8ydDR/hrH+23TVU1bdwYVnugLVaAIwklOHbf56gx6JUGlwES7zjuNYqzKgl8e39iYf6ph8qSQw=="; + url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.10.tgz"; + sha512 = "OTETSXz+3ygD2OK2/vy82cmUBpuJqeOAg4gfnnv+f2Rir1tDIhQg026Q3NQxznq83ZLz8iNqGG9XJm26inpDeg=="; }; }; "@gar/promisify-1.1.3" = { @@ -400,6 +472,78 @@ let sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; }; }; + "@google-cloud/common-3.10.0" = { + name = "_at_google-cloud_slash_common"; + packageName = "@google-cloud/common"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/common/-/common-3.10.0.tgz"; + sha512 = "XMbJYMh/ZSaZnbnrrOFfR/oQrb0SxG4qh6hDisWCoEbFcBHV0qHQo4uXfeMCzolx2Mfkh6VDaOGg+hyJsmxrlw=="; + }; + }; + "@google-cloud/precise-date-2.0.4" = { + name = "_at_google-cloud_slash_precise-date"; + packageName = "@google-cloud/precise-date"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/precise-date/-/precise-date-2.0.4.tgz"; + sha512 = "nOB+mZdevI/1Si0QAfxWfzzIqFdc7wrO+DYePFvgbOoMtvX+XfFTINNt7e9Zg66AbDbWCPRnikU+6f5LTm9Wyg=="; + }; + }; + "@google-cloud/projectify-2.1.1" = { + name = "_at_google-cloud_slash_projectify"; + packageName = "@google-cloud/projectify"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.1.1.tgz"; + sha512 = "+rssMZHnlh0twl122gXY4/aCrk0G1acBqkHFfYddtsqpYXGxA29nj9V5V9SfC+GyOG00l650f6lG9KL+EpFEWQ=="; + }; + }; + "@google-cloud/promisify-2.0.4" = { + name = "_at_google-cloud_slash_promisify"; + packageName = "@google-cloud/promisify"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.4.tgz"; + sha512 = "j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="; + }; + }; + "@google-cloud/spanner-5.18.0" = { + name = "_at_google-cloud_slash_spanner"; + packageName = "@google-cloud/spanner"; + version = "5.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/spanner/-/spanner-5.18.0.tgz"; + sha512 = "KcfepoEuGsjqjeI8cVWfJ9yPdYJFPnpMzdZg3FX2W4MzNOzeNrJEB/EfD/epOOZ/fNhRlUTl+tLFN3WjVxcWlw=="; + }; + }; + "@grpc/grpc-js-1.6.12" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.6.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.6.12.tgz"; + sha512 = "JmvQ03OTSpVd9JTlj/K3IWHSz4Gk/JMLUTtW7Zb0KvO1LcOYGATh5cNuRYzCAeDR3O8wq+q8FZe97eO9MBrkUw=="; + }; + }; + "@grpc/proto-loader-0.6.13" = { + name = "_at_grpc_slash_proto-loader"; + packageName = "@grpc/proto-loader"; + version = "0.6.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.13.tgz"; + sha512 = "FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g=="; + }; + }; + "@grpc/proto-loader-0.7.4" = { + name = "_at_grpc_slash_proto-loader"; + packageName = "@grpc/proto-loader"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.4.tgz"; + sha512 = "MnWjkGwqQ3W8fx94/c1CwqLsNmHHv2t0CFn+9++6+cDphC1lolpg9M2OU0iebIjK//pBNX9e94ho+gjx6vz39w=="; + }; + }; "@icetee/ftp-0.3.15" = { name = "_at_icetee_slash_ftp"; packageName = "@icetee/ftp"; @@ -409,13 +553,58 @@ let sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg=="; }; }; - "@js-joda/core-5.4.2" = { + "@ioredis/commands-1.2.0" = { + name = "_at_ioredis_slash_commands"; + packageName = "@ioredis/commands"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz"; + sha512 = "Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg=="; + }; + }; + "@jridgewell/resolve-uri-3.1.0" = { + name = "_at_jridgewell_slash_resolve-uri"; + packageName = "@jridgewell/resolve-uri"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"; + sha512 = "F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="; + }; + }; + "@jridgewell/sourcemap-codec-1.4.14" = { + name = "_at_jridgewell_slash_sourcemap-codec"; + packageName = "@jridgewell/sourcemap-codec"; + version = "1.4.14"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"; + sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; + }; + }; + "@jridgewell/trace-mapping-0.3.9" = { + name = "_at_jridgewell_slash_trace-mapping"; + packageName = "@jridgewell/trace-mapping"; + version = "0.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz"; + sha512 = "3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="; + }; + }; + "@js-joda/core-3.2.0" = { name = "_at_js-joda_slash_core"; packageName = "@js-joda/core"; - version = "5.4.2"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@js-joda/core/-/core-5.4.2.tgz"; - sha512 = "QIDIZ9a0NfDStgD47VaTgwiPjlw1p4QPLwjOB/9+/DqIztoQopPNNAd+HdtQMHgE+ibP3dJacd8/TVL/A1RaaA=="; + url = "https://registry.npmjs.org/@js-joda/core/-/core-3.2.0.tgz"; + sha512 = "PMqgJ0sw5B7FKb2d5bWYIoxjri+QlW/Pys7+Rw82jSH0QN3rB05jZ/VrrsUdh1w4+i2kw9JOejXGq/KhDOX7Kg=="; + }; + }; + "@js-joda/core-5.5.2" = { + name = "_at_js-joda_slash_core"; + packageName = "@js-joda/core"; + version = "5.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@js-joda/core/-/core-5.5.2.tgz"; + sha512 = "retLUN4TwCJ0QJDi9OCJwYVaXAz93NeOkEtEQL98M2bykBOxmURlP0YlfsuE46kItOOVZIWRYC3KsSLhQ1R2Qw=="; }; }; "@jsdevtools/ono-7.1.3" = { @@ -427,6 +616,51 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; + "@jsplumb/browser-ui-5.13.2" = { + name = "_at_jsplumb_slash_browser-ui"; + packageName = "@jsplumb/browser-ui"; + version = "5.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsplumb/browser-ui/-/browser-ui-5.13.2.tgz"; + sha512 = "BZ76kPtxESMIdhcCtWXPdICMudJyBVzDxaKY4jlne93Zq1T2ErfpNQ3E6f3JZfvoyvlNbKgh0udYkZ7Yg7BmIQ=="; + }; + }; + "@jsplumb/common-5.13.2" = { + name = "_at_jsplumb_slash_common"; + packageName = "@jsplumb/common"; + version = "5.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsplumb/common/-/common-5.13.2.tgz"; + sha512 = "ZX/EvvYi4HBkRVtsuSSAa/AuAz4p2wr3RrRz6l+r8yeElzX3lrrBx/fkERY2qwZPkKcOoLCr5ezZ7sslVMnl0Q=="; + }; + }; + "@jsplumb/connector-bezier-5.13.2" = { + name = "_at_jsplumb_slash_connector-bezier"; + packageName = "@jsplumb/connector-bezier"; + version = "5.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsplumb/connector-bezier/-/connector-bezier-5.13.2.tgz"; + sha512 = "AALmOvkiP3ouGag6TGkBcd7SbCewPNwsKu9gku9AZqIq+fFu321zJ2IpfoyCFgkoFFSQjJ9jo1sWBbD3gnEXrg=="; + }; + }; + "@jsplumb/core-5.13.2" = { + name = "_at_jsplumb_slash_core"; + packageName = "@jsplumb/core"; + version = "5.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsplumb/core/-/core-5.13.2.tgz"; + sha512 = "IODXQzhpq9QEzGKhPir6+ea8m4KeU3gzJsYjIu8oqSQ4jDhvEYF7TvSfeaNgy9sUAMt3OoKCqxCS4ga9J7LS5A=="; + }; + }; + "@jsplumb/util-5.13.2" = { + name = "_at_jsplumb_slash_util"; + packageName = "@jsplumb/util"; + version = "5.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsplumb/util/-/util-5.13.2.tgz"; + sha512 = "POrqlZMOo821oa49Xbxb+pNmnxu0z2oS7FOeklRxKuYXR+7nsP0j9PpXjo8E8Ily4TaP+pdUnatb53vAaONO3g=="; + }; + }; "@kafkajs/confluent-schema-registry-1.0.6" = { name = "_at_kafkajs_slash_confluent-schema-registry"; packageName = "@kafkajs/confluent-schema-registry"; @@ -454,40 +688,58 @@ let sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; }; }; - "@lezer/common-1.0.1" = { + "@lezer/common-1.0.2" = { name = "_at_lezer_slash_common"; packageName = "@lezer/common"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lezer/common/-/common-1.0.1.tgz"; - sha512 = "8TR5++Q/F//tpDsLd5zkrvEX5xxeemafEaek7mUp7Y+bI8cKQXdSqhzTOBaOogETcMOVr0pT3BBPXp13477ciw=="; - }; - }; - "@lezer/highlight-1.1.2" = { - name = "_at_lezer_slash_highlight"; - packageName = "@lezer/highlight"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.2.tgz"; - sha512 = "CAun1WR1glxG9ZdOokTZwXbcwB7PXkIEyZRUMFBVwSrhTcogWq634/ByNImrkUnQhjju6xsIaOBIxvcRJtplXQ=="; - }; - }; - "@lezer/javascript-1.0.2" = { - name = "_at_lezer_slash_javascript"; - packageName = "@lezer/javascript"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.0.2.tgz"; - sha512 = "IjOVeIRhM8IuafWNnk+UzRz7p4/JSOKBNINLYLsdSGuJS9Ju7vFdc82AlTt0jgtV5D8eBZf4g0vK4d3ttBNz7A=="; + url = "https://registry.npmjs.org/@lezer/common/-/common-1.0.2.tgz"; + sha512 = "SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng=="; }; }; - "@lezer/lr-1.2.3" = { + "@lezer/css-1.1.1" = { + name = "_at_lezer_slash_css"; + packageName = "@lezer/css"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lezer/css/-/css-1.1.1.tgz"; + sha512 = "mSjx+unLLapEqdOYDejnGBokB5+AiJKZVclmud0MKQOKx3DLJ5b5VTCstgDDknR6iIV4gVrN6euzsCnj0A2gQA=="; + }; + }; + "@lezer/highlight-1.1.3" = { + name = "_at_lezer_slash_highlight"; + packageName = "@lezer/highlight"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.3.tgz"; + sha512 = "3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw=="; + }; + }; + "@lezer/html-1.3.0" = { + name = "_at_lezer_slash_html"; + packageName = "@lezer/html"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lezer/html/-/html-1.3.0.tgz"; + sha512 = "jU/ah8DEoiECLTMouU/X/ujIg6k9WQMIOFMaCLebzaXfrguyGaR3DpTgmk0tbljiuIJ7hlmVJPcJcxGzmCd0Mg=="; + }; + }; + "@lezer/javascript-1.4.1" = { + name = "_at_lezer_slash_javascript"; + packageName = "@lezer/javascript"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.1.tgz"; + sha512 = "Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA=="; + }; + }; + "@lezer/lr-1.3.3" = { name = "_at_lezer_slash_lr"; packageName = "@lezer/lr"; - version = "1.2.3"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.2.3.tgz"; - sha512 = "qpB7rBzH8f6Mzjv2AVZRahcm+2Cf7nbIH++uXbvVOL1yIRvVWQ3HAM/saeBLCyz/togB7LGo76qdJYL1uKQlqA=="; + url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.3.tgz"; + sha512 = "JPQe3mwJlzEVqy67iQiiGozhcngbO8QBgpqZM6oL1Wj/dXckrEexpBLeFkq0edtW5IqnPRFxA24BHJni8Js69w=="; }; }; "@mapbox/node-pre-gyp-1.0.10" = { @@ -499,13 +751,22 @@ let sha512 = "4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA=="; }; }; - "@n8n_io/riot-tmpl-1.0.1" = { + "@n8n_io/license-sdk-1.8.0" = { + name = "_at_n8n_io_slash_license-sdk"; + packageName = "@n8n_io/license-sdk"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@n8n_io/license-sdk/-/license-sdk-1.8.0.tgz"; + sha512 = "dSBD6EHTu6kWWz1ILxtCcaQqVZu+p/8J0eQ2ntx7Jk8BYSvn5Hh4Oz5M81ut9Pz+2uak+GnIuI6KeYUe1QBXIQ=="; + }; + }; + "@n8n_io/riot-tmpl-2.0.0" = { name = "_at_n8n_io_slash_riot-tmpl"; packageName = "@n8n_io/riot-tmpl"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@n8n_io/riot-tmpl/-/riot-tmpl-1.0.1.tgz"; - sha512 = "+ig7/rafN3LGthGEi8fs1N5XxPndmRq5YAX92DWOar9mrMDrYyIjK5XAQaTnTMDQgmKKllrAl+bVRmQXKcLFuw=="; + url = "https://registry.npmjs.org/@n8n_io/riot-tmpl/-/riot-tmpl-2.0.0.tgz"; + sha512 = "gQNJYlek30YIWLru2CdyFgU/0uvPAbbQwt2G5EN0PDxXD1rGAYWZsd2c94bW3YlvXT6V2GEd7Bt/gT6QUwhzfQ=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -553,31 +814,40 @@ let sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; }; }; - "@oclif/command-1.8.18" = { + "@oclif/command-1.8.22" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; - version = "1.8.18"; + version = "1.8.22"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.18.tgz"; - sha512 = "qTad+jtiriMMbkw6ArtcUY89cwLwmwDnD4KSGT+OQiZKYtegp3NUCM9JN8lfj/aKC+0kvSitJM4ULzbgiVTKQQ=="; + url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.22.tgz"; + sha512 = "lystv7IKsWRmCv6K68jSvHrO/DILUPBDb5GZ3absTA5XTnNXTaMrcwVzTcMPfTf+gCrgIaPPD1bmbRStwfQxFw=="; }; }; - "@oclif/config-1.18.5" = { + "@oclif/config-1.18.6" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; - version = "1.18.5"; + version = "1.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.5.tgz"; - sha512 = "R6dBedaUVn5jtAh79aaRm7jezx4l3V7Im9NORlLmudz5BL1foMeuXEvnqm+bMiejyexVA+oi9mto6YKZPzo/5Q=="; + url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.6.tgz"; + sha512 = "OWhCpdu4QqggOPX1YPZ4XVmLLRX+lhGjXV6RNA7sogOwLqlEmSslnN/lhR5dkhcWZbKWBQH29YCrB3LDPRu/IA=="; }; }; - "@oclif/core-1.19.2" = { + "@oclif/config-1.18.8" = { + name = "_at_oclif_slash_config"; + packageName = "@oclif/config"; + version = "1.18.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.8.tgz"; + sha512 = "FetS52+emaZQui0roFSdbBP8ddBkIezEoH2NcjLJRjqkMGdE9Z1V+jsISVqTYXk2KJ1gAI0CHDXFjJlNBYbJBg=="; + }; + }; + "@oclif/core-1.26.1" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "1.19.2"; + version = "1.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-1.19.2.tgz"; - sha512 = "n5ni/NNR6+I0IQXVGoLKdrdw6IS3WH/R/hw6WX8ERfLMZACrNSuJFD9EmBZkztyRkmiQ2L06ULazW5bJn5Shog=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-1.26.1.tgz"; + sha512 = "g+OWJcM7JOVI53caTEtq0BB1nPotWctRLUyFODPgvDqXhVR7QED+Qz3LwFAMD8dt7/Ar2ZNq15U3bnpnOv453A=="; }; }; "@oclif/errors-1.3.6" = { @@ -589,13 +859,13 @@ let sha512 = "fYaU4aDceETd89KXP+3cLyg9EHZsLD3RxF2IU9yxahhBpspWjkWi3Dy3bTgcwZ3V47BgxQaGapzJWDM33XIVDQ=="; }; }; - "@oclif/help-1.0.3" = { + "@oclif/help-1.0.5" = { name = "_at_oclif_slash_help"; packageName = "@oclif/help"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/help/-/help-1.0.3.tgz"; - sha512 = "AjjhSWFQkRb9rChEH+IRUmp0CxEacYpUbh+kQqtdCR9CDSsj2a3ibWjtMtJb4lFGAle6kVKfaal/juYe+6P5TQ=="; + url = "https://registry.npmjs.org/@oclif/help/-/help-1.0.5.tgz"; + sha512 = "77ZXqVXcd+bQ6EafN56KbL4PbNtZM/Lq4GQElekNav+CPIgPNKT3AtMTQrc0fWke6bb/BTLB+1Fu1gWgx643jQ=="; }; }; "@oclif/linewrap-1.0.0" = { @@ -607,31 +877,121 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.8" = { + "@oclif/parser-3.8.10" = { name = "_at_oclif_slash_parser"; packageName = "@oclif/parser"; - version = "3.8.8"; + version = "3.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.8.tgz"; - sha512 = "OgqQAtpyq1XFJG3dvLl9aqiO+F5pubkzt7AivUDkNoa6/hNgVZ79vvTO8sqo5XAAhOm/fcTSerZ35OTnTJb1ng=="; + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.10.tgz"; + sha512 = "J4l/NcnfbIU84+NNdy6bxq9yJt4joFWNvpk59hq+uaQPUNtjmNJDVGuRvf6GUOxHNgRsVK1JRmd/Ez+v7Z9GqQ=="; }; }; - "@oclif/screen-3.0.2" = { + "@oclif/screen-3.0.4" = { name = "_at_oclif_slash_screen"; packageName = "@oclif/screen"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.2.tgz"; - sha512 = "S/SF/XYJeevwIgHFmVDAFRUvM3m+OjhvCAYMk78ZJQCYCQ5wS7j+LTt1ZEv2jpEEGg2tx/F6TYYWxddNAYHrFQ=="; + url = "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.4.tgz"; + sha512 = "IMsTN1dXEXaOSre27j/ywGbBjrzx0FNd1XmuhCWCB9NTPrhWI1Ifbz+YLSEcstfQfocYsrbrIessxXb2oon4lA=="; }; }; - "@opentelemetry/api-1.2.0" = { + "@opentelemetry/api-1.4.0" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "1.2.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.2.0.tgz"; - sha512 = "0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.0.tgz"; + sha512 = "IgMK9i3sFGNUqPMbjABm0G26g0QCKCUBfglhQ7rQq6WcxbKfEHRcmwsoER4hZcuYqJgkYn2OeuoJIv7Jsftp7g=="; + }; + }; + "@protobufjs/aspromise-1.1.2" = { + name = "_at_protobufjs_slash_aspromise"; + packageName = "@protobufjs/aspromise"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz"; + sha512 = "j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="; + }; + }; + "@protobufjs/base64-1.1.2" = { + name = "_at_protobufjs_slash_base64"; + packageName = "@protobufjs/base64"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz"; + sha512 = "AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="; + }; + }; + "@protobufjs/codegen-2.0.4" = { + name = "_at_protobufjs_slash_codegen"; + packageName = "@protobufjs/codegen"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz"; + sha512 = "YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="; + }; + }; + "@protobufjs/eventemitter-1.1.0" = { + name = "_at_protobufjs_slash_eventemitter"; + packageName = "@protobufjs/eventemitter"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz"; + sha512 = "j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="; + }; + }; + "@protobufjs/fetch-1.1.0" = { + name = "_at_protobufjs_slash_fetch"; + packageName = "@protobufjs/fetch"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz"; + sha512 = "lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ=="; + }; + }; + "@protobufjs/float-1.0.2" = { + name = "_at_protobufjs_slash_float"; + packageName = "@protobufjs/float"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz"; + sha512 = "Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="; + }; + }; + "@protobufjs/inquire-1.1.0" = { + name = "_at_protobufjs_slash_inquire"; + packageName = "@protobufjs/inquire"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz"; + sha512 = "kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="; + }; + }; + "@protobufjs/path-1.1.2" = { + name = "_at_protobufjs_slash_path"; + packageName = "@protobufjs/path"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz"; + sha512 = "6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="; + }; + }; + "@protobufjs/pool-1.1.0" = { + name = "_at_protobufjs_slash_pool"; + packageName = "@protobufjs/pool"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz"; + sha512 = "0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="; + }; + }; + "@protobufjs/utf8-1.1.0" = { + name = "_at_protobufjs_slash_utf8"; + packageName = "@protobufjs/utf8"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz"; + sha512 = "Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="; }; }; "@rudderstack/rudder-sdk-node-1.0.6" = { @@ -643,13 +1003,13 @@ let sha512 = "kJYCXv6fRFbQrAp3hMsgRCnAa7RUBdbiGLBT9PcpQURi0VwHmD7mk3Ja7U4HDnL0EHXYJpPyx3oSonkklmPJ9Q=="; }; }; - "@sap/hana-client-2.14.22" = { + "@sap/hana-client-2.15.19" = { name = "_at_sap_slash_hana-client"; packageName = "@sap/hana-client"; - version = "2.14.22"; + version = "2.15.19"; src = fetchurl { - url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.14.22.tgz"; - sha512 = "Do1VnybxssI5kAg/ti4GoEOhgU7p7R9T9/v9amzDNZMg7rC7C4LVno+x++ERTWv81pzSaSrYKkr2O/MP7OE1hA=="; + url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.15.19.tgz"; + sha512 = "DJKkAvJf8ZpkTIZlxi29d/jRvraweA2I2KIqa7eSNhXuDnau8bIQBkOhSpnhVUckR8i/W8SNYdqwiHlUm5t9Lw=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -661,13 +1021,58 @@ let sha512 = "ZMCSfztDBqwotkl848ODgVcAmN4OItEWDCkshcKz0/W6gGSQayuuCtWV/MlodFivAZD793d6UgANd6wCXUfrIw=="; }; }; - "@selderee/plugin-htmlparser2-0.6.0" = { + "@selderee/plugin-htmlparser2-0.10.0" = { name = "_at_selderee_slash_plugin-htmlparser2"; packageName = "@selderee/plugin-htmlparser2"; - version = "0.6.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.6.0.tgz"; - sha512 = "J3jpy002TyBjd4N/p6s+s90eX42H2eRhK3SbsZuvTDv977/E8p2U3zikdiehyJja66do7FlxLomZLPlvl2/xaA=="; + url = "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.10.0.tgz"; + sha512 = "gW69MEamZ4wk1OsOq1nG1jcyhXIQcnrsX5JwixVw/9xaiav8TCyjESAruu1Rz9yyInhgBXxkNwMeygKnN2uxNA=="; + }; + }; + "@sentry/core-7.36.0" = { + name = "_at_sentry_slash_core"; + packageName = "@sentry/core"; + version = "7.36.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry/core/-/core-7.36.0.tgz"; + sha512 = "lq1MlcMhvm7QIwUOknFeufkg4M6QREY3s61y6pm1o+o3vSqB7Hz0D19xlyEpP62qMn8OyuttVKOVK1UfGc2EyQ=="; + }; + }; + "@sentry/integrations-7.36.0" = { + name = "_at_sentry_slash_integrations"; + packageName = "@sentry/integrations"; + version = "7.36.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.36.0.tgz"; + sha512 = "wrRoUqdeGi64NNimGVk8U8DBiXamxTYPBux0/faFDyau8EJyQFcv8zOyB78Za4W2Ss3ZXNaE/WtFF8UxalHzBQ=="; + }; + }; + "@sentry/node-7.36.0" = { + name = "_at_sentry_slash_node"; + packageName = "@sentry/node"; + version = "7.36.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry/node/-/node-7.36.0.tgz"; + sha512 = "nAHAY+Rbn5OlTpNX/i6wYrmw3hT/BtwPZ/vNU52cKgw7CpeE1UrCeFjnPn18rQPB7lIh7x0vNvoaPrfemRzpSQ=="; + }; + }; + "@sentry/types-7.36.0" = { + name = "_at_sentry_slash_types"; + packageName = "@sentry/types"; + version = "7.36.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry/types/-/types-7.36.0.tgz"; + sha512 = "uvfwUn3okAWSZ948D/xqBrkc3Sn6TeHUgi3+p/dTTNGAXXskzavgfgQ4rSW7f3YD4LL+boZojpoIARVLodMGuA=="; + }; + }; + "@sentry/utils-7.36.0" = { + name = "_at_sentry_slash_utils"; + packageName = "@sentry/utils"; + version = "7.36.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.36.0.tgz"; + sha512 = "mgDi5X5Bm0sydCzXpnyKD/sD98yc2qnKXyRdNX4HRRwruhC/P53LT0hGhZXsyqsB/l8OAMl0zWXJLg0xONQsEw=="; }; }; "@servie/events-1.0.0" = { @@ -688,6 +1093,24 @@ let sha512 = "Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw=="; }; }; + "@swc/core-1.3.32" = { + name = "_at_swc_slash_core"; + packageName = "@swc/core"; + version = "1.3.32"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.32.tgz"; + sha512 = "Yx/n1j+uUkcqlJAW8IRg8Qymgkdow6NHJZPFShiR0YiaYq2sXY+JHmvh16O6GkL91Y+gTlDUS7uVgDz50czJUQ=="; + }; + }; + "@swc/wasm-1.3.32" = { + name = "_at_swc_slash_wasm"; + packageName = "@swc/wasm"; + version = "1.3.32"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.32.tgz"; + sha512 = "u27gmXtbe/y4M5fo38NCBKUFeFIWRCmppABxPvM9TsZ8KhO4EdZOI1L9sPHSZvVyAXRpnwC8cjYej/zOAZjAQA=="; + }; + }; "@techteamer/ocsp-1.0.0" = { name = "_at_techteamer_slash_ocsp"; packageName = "@techteamer/ocsp"; @@ -733,6 +1156,60 @@ let sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; }; }; + "@tsconfig/node10-1.0.9" = { + name = "_at_tsconfig_slash_node10"; + packageName = "@tsconfig/node10"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz"; + sha512 = "jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA=="; + }; + }; + "@tsconfig/node12-1.0.11" = { + name = "_at_tsconfig_slash_node12"; + packageName = "@tsconfig/node12"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz"; + sha512 = "cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag=="; + }; + }; + "@tsconfig/node14-1.0.3" = { + name = "_at_tsconfig_slash_node14"; + packageName = "@tsconfig/node14"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz"; + sha512 = "ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow=="; + }; + }; + "@tsconfig/node16-1.0.3" = { + name = "_at_tsconfig_slash_node16"; + packageName = "@tsconfig/node16"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz"; + sha512 = "yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ=="; + }; + }; + "@types/asn1-0.2.0" = { + name = "_at_types_slash_asn1"; + packageName = "@types/asn1"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/asn1/-/asn1-0.2.0.tgz"; + sha512 = "5TMxIpYbIA9c1J0hYQjQDX3wr+rTgQEAXaW2BI8ECM8FO53wSW4HFZplTalrKSHuZUc76NtXcePRhwuOHqGD5g=="; + }; + }; + "@types/big.js-6.1.6" = { + name = "_at_types_slash_big.js"; + packageName = "@types/big.js"; + version = "6.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/big.js/-/big.js-6.1.6.tgz"; + sha512 = "0r9J+Zz9rYm2hOTwiMAVkm3XFQ4u5uTK37xrQMhc9bysn/sf/okzovWMYYIBMFTn/yrEZ11pusgLEaoarTlQbA=="; + }; + }; "@types/body-parser-1.19.2" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -751,6 +1228,15 @@ let sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; }; }; + "@types/duplexify-3.6.1" = { + name = "_at_types_slash_duplexify"; + packageName = "@types/duplexify"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/duplexify/-/duplexify-3.6.1.tgz"; + sha512 = "n0zoEj/fMdMOvqbHxmqnza/kXyoGgJmEpsXjpP+gEqE1Ye4yNqc7xWipKnUoMpWhMuzJQSfK2gMrwlElly7OGQ=="; + }; + }; "@types/es-aggregate-error-1.0.2" = { name = "_at_types_slash_es-aggregate-error"; packageName = "@types/es-aggregate-error"; @@ -760,13 +1246,13 @@ let sha512 = "erqUpFXksaeR2kejKnhnjZjbFxUpGZx4Z7ydNL9ie8tEhXPiZTsLeUDJ6aR1F8j5wWUAtOAQWUqkc7givBJbBA=="; }; }; - "@types/express-4.17.14" = { + "@types/express-4.17.16" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.14"; + version = "4.17.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz"; - sha512 = "TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.16.tgz"; + sha512 = "LkKpqRZ7zqXJuvoELakaFYuETHjZkSol8EV6cNnyishutDBCCdv6+dsKPbKkCcIk57qRphOLY5sEgClw1bO3gA=="; }; }; "@types/express-jwt-0.0.42" = { @@ -778,13 +1264,13 @@ let sha512 = "WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag=="; }; }; - "@types/express-serve-static-core-4.17.31" = { + "@types/express-serve-static-core-4.17.33" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.31"; + version = "4.17.33"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz"; - sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz"; + sha512 = "TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA=="; }; }; "@types/express-unless-2.0.1" = { @@ -814,13 +1300,22 @@ let sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; }; }; - "@types/lodash-4.14.186" = { + "@types/lodash-4.14.191" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.186"; + version = "4.14.191"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.186.tgz"; - sha512 = "eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz"; + sha512 = "BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ=="; + }; + }; + "@types/long-4.0.2" = { + name = "_at_types_slash_long"; + packageName = "@types/long"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz"; + sha512 = "MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="; }; }; "@types/mime-3.0.1" = { @@ -841,22 +1336,13 @@ let sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-12.20.55" = { + "@types/node-18.11.18" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.55"; + version = "18.11.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz"; - sha512 = "J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ=="; - }; - }; - "@types/node-18.11.7" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "18.11.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.7.tgz"; - sha512 = "LhFTglglr63mNXUSRYD8A+ZAIu5sFqNJ4Y2fPuY7UlrySJH87rRRlhtVmMHplmfk5WkoJGmDjE9oiTfyX94CpQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz"; + sha512 = "DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA=="; }; }; "@types/node-fetch-2.6.2" = { @@ -868,6 +1354,15 @@ let sha512 = "DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A=="; }; }; + "@types/pumpify-1.4.1" = { + name = "_at_types_slash_pumpify"; + packageName = "@types/pumpify"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/pumpify/-/pumpify-1.4.1.tgz"; + sha512 = "l7u/Dnh1OG9T7VH6TvulR0g8oE8hgIW5409mSUKi8Vxw2+JV18aTa06Sv5bvNjrD0zbsB/cuZ/iTFQgFNfzIuw=="; + }; + }; "@types/qs-6.9.7" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; @@ -886,15 +1381,6 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/readable-stream-2.3.14" = { - name = "_at_types_slash_readable-stream"; - packageName = "@types/readable-stream"; - version = "2.3.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-2.3.14.tgz"; - sha512 = "8jQ5Mp7bsDJEnW/69i6nAaQMoLwAVJVc7ZRAVTrdh/o6XueQsX38TEvKuYyoQj76/mg7WdlRfMrtl9pDLCJWsg=="; - }; - }; "@types/serve-static-1.15.0" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; @@ -904,6 +1390,24 @@ let sha512 = "z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg=="; }; }; + "@types/stack-trace-0.0.29" = { + name = "_at_types_slash_stack-trace"; + packageName = "@types/stack-trace"; + version = "0.0.29"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/stack-trace/-/stack-trace-0.0.29.tgz"; + sha512 = "TgfOX+mGY/NyNxJLIbDWrO9DjGoVSW9+aB8H2yy1fy32jsvxijhmyJI9fDFgvz3YP4lvJaq9DzdR/M1bOgVc9g=="; + }; + }; + "@types/stoppable-1.1.1" = { + name = "_at_types_slash_stoppable"; + packageName = "@types/stoppable"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/stoppable/-/stoppable-1.1.1.tgz"; + sha512 = "b8N+fCADRIYYrGZOcmOR8ZNBOqhktWTB/bMUl5LvGtT201QKJZOOH5UsFyI3qtteM6ZAJbJqZoBcLqqxKIwjhw=="; + }; + }; "@types/tough-cookie-2.3.8" = { name = "_at_types_slash_tough-cookie"; packageName = "@types/tough-cookie"; @@ -922,6 +1426,24 @@ let sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA=="; }; }; + "@types/uuid-9.0.0" = { + name = "_at_types_slash_uuid"; + packageName = "@types/uuid"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.0.tgz"; + sha512 = "kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q=="; + }; + }; + "@types/validator-13.7.11" = { + name = "_at_types_slash_validator"; + packageName = "@types/validator"; + version = "13.7.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/validator/-/validator-13.7.11.tgz"; + sha512 = "WqTos+CnAKN64YwyBMhgUYhb5VsTNKwUY6AuzG5qu9/pFZJar/RJFMZBXwX7VS+uzYi+lIAr3WkvuWqEI9F2eg=="; + }; + }; "@types/webidl-conversions-7.0.0" = { name = "_at_types_slash_webidl-conversions"; packageName = "@types/webidl-conversions"; @@ -940,22 +1462,40 @@ let sha512 = "FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA=="; }; }; - "@vue/compiler-sfc-2.7.13" = { + "@vue/compiler-sfc-2.7.14" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "2.7.13"; + version = "2.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.13.tgz"; - sha512 = "zzu2rLRZlgIU+OT3Atbr7Y6PG+LW4wVQpPfNRrGDH3dM9PsrcVfa+1pKb8bW467bGM3aDOvAnsYLWVpYIv3GRg=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz"; + sha512 = "aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA=="; }; }; - "@xmldom/xmldom-0.7.6" = { + "@vue/composition-api-1.7.1" = { + name = "_at_vue_slash_composition-api"; + packageName = "@vue/composition-api"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/composition-api/-/composition-api-1.7.1.tgz"; + sha512 = "xDWoEtxGXhH9Ku3ROYX/rzhcpt4v31hpPU5zF3UeVC/qxA3dChmqU8zvTUYoKh3j7rzpNsoFOwqsWG7XPMlaFA=="; + }; + }; + "@vue/devtools-api-6.5.0" = { + name = "_at_vue_slash_devtools-api"; + packageName = "@vue/devtools-api"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.0.tgz"; + sha512 = "o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q=="; + }; + }; + "@xmldom/xmldom-0.8.6" = { name = "_at_xmldom_slash_xmldom"; packageName = "@xmldom/xmldom"; - version = "0.7.6"; + version = "0.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.6.tgz"; - sha512 = "HHXP9hskkFQHy8QxxUXkS7946FFIhYVfGqsk0WLwllmexN9x/+R4UBLvurHEuyXRfVEObVR8APuQehykLviwSQ=="; + url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.6.tgz"; + sha512 = "uRjjusqpoqfmRkTaNuLJ2VohVr67Q5YwDATW3VU7PfzTj6IRaihGrYI7zckGZjxQPBIp63nfvJbM+Yu5ICh0Bg=="; }; }; "a-sync-waterfall-1.0.1" = { @@ -994,22 +1534,13 @@ let sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; }; }; - "access-control-1.0.1" = { - name = "access-control"; - packageName = "access-control"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/access-control/-/access-control-1.0.1.tgz"; - sha512 = "H5aqjkogmFxfaOrfn/e42vyspHVXuJ8er63KuljJXpOyJ1ZO/U5CrHfO8BLKIy2w7mBM02L5quL0vbfQqrGQbA=="; - }; - }; - "acorn-8.8.1" = { + "acorn-8.8.2" = { name = "acorn"; packageName = "acorn"; - version = "8.8.1"; + version = "8.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz"; - sha512 = "7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"; + sha512 = "xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw=="; }; }; "acorn-walk-8.2.0" = { @@ -1021,13 +1552,13 @@ let sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; }; }; - "adal-node-0.2.3" = { + "adal-node-0.2.4" = { name = "adal-node"; packageName = "adal-node"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/adal-node/-/adal-node-0.2.3.tgz"; - sha512 = "gMKr8RuYEYvsj7jyfCv/4BfKToQThz20SP71N3AtFn3ia3yAR8Qt2T3aVQhuJzunWs2b38ZsQV0qsZPdwZr7VQ=="; + url = "https://registry.npmjs.org/adal-node/-/adal-node-0.2.4.tgz"; + sha512 = "zIcvbwQFKMUtKxxj8YMHeTT1o/TPXfVNsTXVgXD8sxwV6h4AFQgK77dRciGhuEF9/Sdm3UQPJVPc/6XxrccSeA=="; }; }; "adler-32-1.2.0" = { @@ -1084,13 +1615,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "amqplib-0.8.0" = { + "amqplib-0.10.3" = { name = "amqplib"; packageName = "amqplib"; - version = "0.8.0"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/amqplib/-/amqplib-0.8.0.tgz"; - sha512 = "icU+a4kkq4Y1PS4NNi+YPDMwdlbFcZ1EZTQT2nigW3fvOb6AOgUQ9+Mk4ue0Zu5cBg/XpDzB40oH10ysrk2dmA=="; + url = "https://registry.npmjs.org/amqplib/-/amqplib-0.10.3.tgz"; + sha512 = "UHmuSa7n8vVW/a5HGh2nFPqAEr8+cD4dEZ6u9GjP91nHfr1a54RyAKyra7Sb5NH7NBKOUlyQSMXIp0qAixKexw=="; }; }; "ansi-escapes-3.2.0" = { @@ -1147,13 +1678,13 @@ let sha512 = "7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="; }; }; - "anymatch-3.1.2" = { + "anymatch-3.1.3" = { name = "anymatch"; packageName = "anymatch"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"; - sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz"; + sha512 = "KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="; }; }; "app-root-path-3.1.0" = { @@ -1201,6 +1732,15 @@ let sha512 = "QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg=="; }; }; + "arg-4.1.3" = { + name = "arg"; + packageName = "arg"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz"; + sha512 = "58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="; + }; + }; "argparse-1.0.10" = { name = "argparse"; packageName = "argparse"; @@ -1255,13 +1795,22 @@ let sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; }; - "array.prototype.reduce-1.0.4" = { + "array.prototype.reduce-1.0.5" = { name = "array.prototype.reduce"; packageName = "array.prototype.reduce"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz"; - sha512 = "WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw=="; + url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz"; + sha512 = "kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q=="; + }; + }; + "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=="; }; }; "asap-2.0.6" = { @@ -1309,13 +1858,13 @@ let sha512 = "Y2LZPOWeZ6qehv698ZgOGGCZXBQShObWnGthTrIFlIQjuV1gg2B8QOhWFRExq/MR1VnPpIIe7P9vX2vElxv+Pg=="; }; }; - "assert-options-0.7.0" = { + "assert-options-0.8.0" = { name = "assert-options"; packageName = "assert-options"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/assert-options/-/assert-options-0.7.0.tgz"; - sha512 = "7q9uNH/Dh8gFgpIIb9ja8PJEWA5AQy3xnBC8jtKs8K/gNVCr1K6kIvlm59HUyYgvM7oEDoLzGgPcGd9FqhtXEQ=="; + url = "https://registry.npmjs.org/assert-options/-/assert-options-0.8.0.tgz"; + sha512 = "qSELrEaEz4sGwTs4Qh+swQkjiHAysC4rot21+jzXU86dJzNG+FDqBzyS3ohSoTRf4ZLA3FSwxQdiuNl5NXUtvA=="; }; }; "assert-plus-1.0.0" = { @@ -1336,6 +1885,15 @@ let sha512 = "x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w=="; }; }; + "ast-types-0.15.2" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.15.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.15.2.tgz"; + sha512 = "c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg=="; + }; + }; "async-2.6.4" = { name = "async"; packageName = "async"; @@ -1399,22 +1957,22 @@ let sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; }; }; - "avsc-5.7.6" = { + "avsc-5.7.7" = { name = "avsc"; packageName = "avsc"; - version = "5.7.6"; + version = "5.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/avsc/-/avsc-5.7.6.tgz"; - sha512 = "jyn9tfd9J3h7pgJSk4qQ/1c1Tk5qiXrvmdCDON2UjcFplqRu/KpmKmpi+Ess8ZKmmqK12U4Y3VHrfwQs1xSMZA=="; + url = "https://registry.npmjs.org/avsc/-/avsc-5.7.7.tgz"; + sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ=="; }; }; - "aws-sdk-2.1242.0" = { + "aws-sdk-2.1308.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1242.0"; + version = "2.1308.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1242.0.tgz"; - sha512 = "qVpaMafIHw3Mn3Mo7zTY4Xq8lHkTxIRQJFV5ronsi4lTLqhqF1rANoPKSlVWxUPRyG5so/we+ZUIog5wpjSgiw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1308.0.tgz"; + sha512 = "tm4UXah8dCqt1geyxrtoyp6dN5QhuLjNeACUZEsffww5oZPMx24EX9dAtvtSu3UfIHwmbR74QomYi1c1u8Jndg=="; }; }; "aws-sign2-0.7.0" = { @@ -1426,13 +1984,13 @@ let sha512 = "08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="; }; }; - "aws4-1.11.0" = { + "aws4-1.12.0" = { name = "aws4"; packageName = "aws4"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; - sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz"; + sha512 = "NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="; }; }; "axios-0.21.4" = { @@ -1444,15 +2002,6 @@ let sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; }; - "axios-0.24.0" = { - name = "axios"; - packageName = "axios"; - version = "0.24.0"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz"; - sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; - }; - }; "axios-0.27.2" = { name = "axios"; packageName = "axios"; @@ -1462,13 +2011,22 @@ let sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; }; }; - "axios-retry-3.3.1" = { + "axios-1.1.3" = { + name = "axios"; + packageName = "axios"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-1.1.3.tgz"; + sha512 = "00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA=="; + }; + }; + "axios-retry-3.4.0" = { name = "axios-retry"; packageName = "axios-retry"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.3.1.tgz"; - sha512 = "RohAUQTDxBSWLFEnoIG/6bvmy8l3TfpkclgStjl5MDCMBDgapAWCmr1r/9harQfWC8bzLC8job6UcL1A1Yc+/Q=="; + url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.4.0.tgz"; + sha512 = "VdgaP+gHH4iQYCCNUWF2pcqeciVOdGrBBAYUfTY+wPcO5Ltvp/37MLFNCmJKo7Gj3SHvCSdL8ouI1qLYJN3liA=="; }; }; "babel-helper-vue-jsx-merge-props-2.0.3" = { @@ -1534,13 +2092,13 @@ let sha512 = "V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="; }; }; - "better-sqlite3-7.6.2" = { + "better-sqlite3-8.0.1" = { name = "better-sqlite3"; packageName = "better-sqlite3"; - version = "7.6.2"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.6.2.tgz"; - sha512 = "S5zIU1Hink2AH4xPsN0W43T1/AJ5jrPh7Oy07ocuW/AKYYY02GWzz9NH0nbSMn/gw6fDZ5jZ1QsHt1BXAwJ6Lg=="; + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.0.1.tgz"; + sha512 = "JhTZjpyapA1icCEjIZB4TSSgkGdFgpWZA2Wszg7Cf4JwJwKQmbvuNnJBeR+EYG/Z29OXvR4G//Rbg31BW/Z7Yg=="; }; }; "big-integer-1.6.51" = { @@ -1552,6 +2110,15 @@ let sha512 = "GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg=="; }; }; + "big.js-6.2.1" = { + name = "big.js"; + packageName = "big.js"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/big.js/-/big.js-6.2.1.tgz"; + sha512 = "bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ=="; + }; + }; "bignumber.js-2.4.0" = { name = "bignumber.js"; packageName = "bignumber.js"; @@ -1561,6 +2128,15 @@ let sha512 = "uw4ra6Cv483Op/ebM0GBKKfxZlSmn6NgFRby5L3yGTlunLj53KQgndDlqy2WVFOwgvurocApYkSud0aO+mvrpQ=="; }; }; + "bignumber.js-9.1.1" = { + name = "bignumber.js"; + packageName = "bignumber.js"; + version = "9.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz"; + sha512 = "pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="; + }; + }; "binary-extensions-2.2.0" = { name = "binary-extensions"; packageName = "binary-extensions"; @@ -1597,15 +2173,6 @@ let sha512 = "VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw=="; }; }; - "bitsyntax-0.1.0" = { - name = "bitsyntax"; - packageName = "bitsyntax"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bitsyntax/-/bitsyntax-0.1.0.tgz"; - sha512 = "ikAdCnrloKmFOugAfxWws89/fPc+nw0OOG1IzIE72uSOg/A3cYptKCjSUhDTuj7fhsJtzkzlv7l3b8PzRHLN0Q=="; - }; - }; "bl-2.2.1" = { name = "bl"; packageName = "bl"; @@ -1615,15 +2182,6 @@ let sha512 = "6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g=="; }; }; - "bl-3.0.1" = { - name = "bl"; - packageName = "bl"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-3.0.1.tgz"; - sha512 = "jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ=="; - }; - }; "bl-4.1.0" = { name = "bl"; packageName = "bl"; @@ -1651,15 +2209,6 @@ let sha512 = "UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ=="; }; }; - "bluebird-3.7.2" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"; - sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; - }; - }; "bn.js-4.12.0" = { name = "bn.js"; packageName = "bn.js"; @@ -1741,13 +2290,13 @@ let sha512 = "EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg=="; }; }; - "bson-4.7.0" = { + "bson-4.7.2" = { name = "bson"; packageName = "bson"; - version = "4.7.0"; + version = "4.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-4.7.0.tgz"; - sha512 = "VrlEE4vuiO1WTpfof4VmaVolCVYkYTgB9iWgYNOrVlnifpME/06fhFRmONgBhClD5pFC1t9ZWqFUQEQAzY43bA=="; + url = "https://registry.npmjs.org/bson/-/bson-4.7.2.tgz"; + sha512 = "Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ=="; }; }; "buffer-4.9.2" = { @@ -1831,6 +2380,15 @@ let sha512 = "MOqV1dKLy1YQgP9m3lFolyMxaU+1+o4afzYYf0H4wNM+x/S0I1QPQfkgGlLiH00EyFrvSmeubeCYFP47rTfpjg=="; }; }; + "bull-4.10.3" = { + name = "bull"; + packageName = "bull"; + version = "4.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bull/-/bull-4.10.3.tgz"; + sha512 = "pp403srpkn9tYi7Z3Mu0sozehZ7rEEFGNJnN+nLxQwml6MySzefC9bPeCYedZoCkXdZ6VbIB8uNkMZg+hN/dAg=="; + }; + }; "busboy-1.6.0" = { name = "busboy"; packageName = "busboy"; @@ -1885,13 +2443,13 @@ let sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; }; }; - "call-me-maybe-1.0.1" = { + "call-me-maybe-1.0.2" = { name = "call-me-maybe"; packageName = "call-me-maybe"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz"; - sha512 = "wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw=="; + url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz"; + sha512 = "HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ=="; }; }; "callback-stream-1.1.0" = { @@ -1993,6 +2551,15 @@ let sha512 = "yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA=="; }; }; + "checkpoint-stream-0.1.2" = { + name = "checkpoint-stream"; + packageName = "checkpoint-stream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/checkpoint-stream/-/checkpoint-stream-0.1.2.tgz"; + sha512 = "eYXIcydL3mPjjEVLxHdi1ISgTwmxGJZ8vyJ3lYVvFTDRyTOZMTbKZdRJqiA7Gi1rPcwOyyzcrZmGLL8ff7e69w=="; + }; + }; "cheerio-1.0.0-rc.6" = { name = "cheerio"; packageName = "cheerio"; @@ -2056,13 +2623,13 @@ let sha512 = "kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA=="; }; }; - "class-validator-0.13.2" = { + "class-validator-0.14.0" = { name = "class-validator"; packageName = "class-validator"; - version = "0.13.2"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/class-validator/-/class-validator-0.13.2.tgz"; - sha512 = "yBUcQy07FPlGzUjoLuUfIOXzgynnQPPruyK1Ge2B74k9ROwnle1E+NxLWnUv5OLU8hA/qL5leAE9XnXq3byaBw=="; + url = "https://registry.npmjs.org/class-validator/-/class-validator-0.14.0.tgz"; + sha512 = "ct3ltplN8I9fOwUd8GrP8UQixwff129BkEtuWDKL5W45cQuLd19xqmTLu5ge78YDm/fdje6FMt0hGOhl0lii3A=="; }; }; "clean-stack-2.2.0" = { @@ -2146,22 +2713,40 @@ let sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; }; }; - "clone-2.1.2" = { - name = "clone"; - packageName = "clone"; - version = "2.1.2"; + "cliui-8.0.1" = { + name = "cliui"; + packageName = "cliui"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"; - sha512 = "3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="; + url = "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz"; + sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="; }; }; - "cluster-key-slot-1.1.1" = { + "cluster-key-slot-1.1.2" = { name = "cluster-key-slot"; packageName = "cluster-key-slot"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.1.tgz"; - sha512 = "rwHwUfXL40Chm1r08yrhU3qpUvdVlgkKNeyeGPOxnW8/SyVDvgRaed/Uz54AqWNaTCAThlj6QAs3TZcKI0xDEw=="; + url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz"; + sha512 = "RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA=="; + }; + }; + "codemirror-lang-html-n8n-1.0.0" = { + name = "codemirror-lang-html-n8n"; + packageName = "codemirror-lang-html-n8n"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/codemirror-lang-html-n8n/-/codemirror-lang-html-n8n-1.0.0.tgz"; + sha512 = "ofNP6VTDGJ5rue+kTCZlDZdF1PnE0sl2cAkfrsCAd5MlBgDmqTwuFJIkTI6KXOJXs0ucdTYH6QLhy9BSW7EaOQ=="; + }; + }; + "codemirror-lang-n8n-expression-0.2.0" = { + name = "codemirror-lang-n8n-expression"; + packageName = "codemirror-lang-n8n-expression"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/codemirror-lang-n8n-expression/-/codemirror-lang-n8n-expression-0.2.0.tgz"; + sha512 = "kdlpzevdCpWcpbNcwES9YZy+rDFwWOdO6Z78SWxT6jMhCPmdHQmO+gJ39aXAXlUI7OGLfOBtg1/ONxPjRpEIYQ=="; }; }; "codepage-1.15.0" = { @@ -2236,15 +2821,6 @@ let sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; }; }; - "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"; - sha512 = "/pyV40IrsdulWv+wFPmERh9k/mjsPZ64yUMDmWrtj/k1nmgrzzIENWKdaVKyBbvFdQWqkcaRxr+polCo3VMe7A=="; - }; - }; "colorspace-1.1.4" = { name = "colorspace"; packageName = "colorspace"; @@ -2281,13 +2857,13 @@ let sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; - "commander-9.4.1" = { + "commander-9.5.0" = { name = "commander"; packageName = "commander"; - version = "9.4.1"; + version = "9.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz"; - sha512 = "5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw=="; + url = "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz"; + sha512 = "KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ=="; }; }; "commist-1.1.0" = { @@ -2407,22 +2983,22 @@ let sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; }; }; - "content-type-1.0.4" = { + "content-type-1.0.5" = { name = "content-type"; packageName = "content-type"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz"; + sha512 = "nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="; }; }; - "convict-6.2.3" = { + "convict-6.2.4" = { name = "convict"; packageName = "convict"; - version = "6.2.3"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/convict/-/convict-6.2.3.tgz"; - sha512 = "mTY04Qr7WrqiXifdeUYXr4/+Te4hPFWDvz6J2FVIKCLc2XBhq63VOSSYAKJ+unhZAYOAjmEdNswTOeHt7s++pQ=="; + url = "https://registry.npmjs.org/convict/-/convict-6.2.4.tgz"; + sha512 = "qN60BAwdMVdofckX7AlohVJ2x9UvjTNoKVXCL2LxFk1l7757EJqf1nySdMkPQer0bt8kQ5lQiyZ9/2NvrFBuwQ=="; }; }; "cookie-0.4.1" = { @@ -2434,6 +3010,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-0.5.0" = { name = "cookie"; packageName = "cookie"; @@ -2479,13 +3064,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.26.0" = { + "core-js-3.27.2" = { name = "core-js"; packageName = "core-js"; - version = "3.26.0"; + version = "3.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.26.0.tgz"; - sha512 = "+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.27.2.tgz"; + sha512 = "9ashVQskuh5AZEZ1JdQWp1GqSoC1e1G87MzRqg2gIfVAQ7Qn9K+uFj8EcniUFA4P2NLZfV+TOlX1SzoKfo+s7w=="; }; }; "core-util-is-1.0.2" = { @@ -2515,6 +3100,15 @@ let sha512 = "ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="; }; }; + "create-require-1.1.1" = { + name = "create-require"; + packageName = "create-require"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz"; + sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="; + }; + }; "crelt-1.0.5" = { name = "crelt"; packageName = "crelt"; @@ -2542,6 +3136,15 @@ let sha512 = "s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg=="; }; }; + "cron-parser-4.7.1" = { + name = "cron-parser"; + packageName = "cron-parser"; + version = "4.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.1.tgz"; + sha512 = "WguFaoQ0hQ61SgsCZLHUcNbAvlK0lypKXu62ARguefYmjzaOXIVRNrAmyXzabTwUn4sQvQLkk6bjH+ipGfw8bA=="; + }; + }; "cross-spawn-4.0.2" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -2677,6 +3280,15 @@ let sha512 = "WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og=="; }; }; + "date-fns-2.29.3" = { + name = "date-fns"; + packageName = "date-fns"; + version = "2.29.3"; + src = fetchurl { + url = "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz"; + sha512 = "dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA=="; + }; + }; "date-utils-1.2.21" = { name = "date-utils"; packageName = "date-utils"; @@ -2758,13 +3370,13 @@ let sha512 = "syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw=="; }; }; - "decode-uri-component-0.2.0" = { + "decode-uri-component-0.2.2" = { name = "decode-uri-component"; packageName = "decode-uri-component"; - version = "0.2.0"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha512 = "hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og=="; + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz"; + sha512 = "FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="; }; }; "decompress-response-6.0.0" = { @@ -2776,24 +3388,6 @@ let sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; }; }; - "deep-equal-1.1.1" = { - name = "deep-equal"; - packageName = "deep-equal"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz"; - sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; - }; - }; - "deep-equal-2.0.5" = { - name = "deep-equal"; - packageName = "deep-equal"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz"; - sha512 = "nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw=="; - }; - }; "deep-extend-0.6.0" = { name = "deep-extend"; packageName = "deep-extend"; @@ -2821,13 +3415,13 @@ let sha512 = "95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="; }; }; - "deepmerge-4.2.2" = { + "deepmerge-4.3.0" = { name = "deepmerge"; packageName = "deepmerge"; - version = "4.2.2"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"; - sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz"; + sha512 = "z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og=="; }; }; "default-user-agent-1.0.0" = { @@ -2938,13 +3532,13 @@ let sha512 = "463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="; }; }; - "diagnostics-1.1.1" = { - name = "diagnostics"; - packageName = "diagnostics"; - version = "1.1.1"; + "diff-4.0.2" = { + name = "diff"; + packageName = "diff"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz"; - sha512 = "8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ=="; + url = "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"; + sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; }; }; "difflib-0.2.4" = { @@ -2974,15 +3568,6 @@ let sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; }; }; - "discontinuous-range-1.0.0" = { - name = "discontinuous-range"; - packageName = "discontinuous-range"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz"; - sha512 = "c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ=="; - }; - }; "dom-iterator-1.0.0" = { name = "dom-iterator"; packageName = "dom-iterator"; @@ -3064,6 +3649,15 @@ let sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="; }; }; + "dotenv-16.0.3" = { + name = "dotenv"; + packageName = "dotenv"; + version = "16.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz"; + sha512 = "7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ=="; + }; + }; "dotenv-8.6.0" = { name = "dotenv"; packageName = "dotenv"; @@ -3091,6 +3685,15 @@ let sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; }; }; + "duplexify-4.1.2" = { + name = "duplexify"; + packageName = "duplexify"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz"; + sha512 = "fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw=="; + }; + }; "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; @@ -3127,13 +3730,13 @@ let sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; }; }; - "element-ui-2.15.10" = { + "element-ui-2.15.12" = { name = "element-ui"; packageName = "element-ui"; - version = "2.15.10"; + version = "2.15.12"; src = fetchurl { - url = "https://registry.npmjs.org/element-ui/-/element-ui-2.15.10.tgz"; - sha512 = "jmD++mU2wKXbisvx4fxOl2mHaU+HWHTAq/3Wf8x9Bwyu4GdDZPLABb+CGi3DWN6fPqdgRcd74aX39DO+YHObLw=="; + url = "https://registry.npmjs.org/element-ui/-/element-ui-2.15.12.tgz"; + sha512 = "Y5FMT2BPOindU2GkDEQ5ZKUVxDawKONRNMh2eL3uBx1FOtvUJ+L6IxXLVsNxq4WnaX/UnVNgWXebl7DobygZMg=="; }; }; "emoji-regex-8.0.0" = { @@ -3145,15 +3748,6 @@ let sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; }; - "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"; - sha512 = "nnzgVSpB35qKrUN8358SjO1bYAmxoThECTWw9s3J0x5G8A9hokKHVDFzBjVpCoSryo6MhN8woVyascN5jheaNA=="; - }; - }; "enabled-2.0.0" = { name = "enabled"; packageName = "enabled"; @@ -3199,13 +3793,22 @@ let sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; - "entities-2.2.0" = { - name = "entities"; - packageName = "entities"; + "ent-2.2.0" = { + name = "ent"; + packageName = "ent"; version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; - sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; + url = "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz"; + sha512 = "GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA=="; + }; + }; + "entities-2.1.0" = { + name = "entities"; + packageName = "entities"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz"; + sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; }; }; "entities-4.4.0" = { @@ -3226,15 +3829,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=="; - }; - }; "err-code-2.0.3" = { name = "err-code"; packageName = "err-code"; @@ -3244,22 +3838,22 @@ let sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; }; }; - "es-abstract-1.20.4" = { + "es-abstract-1.21.1" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.20.4"; + version = "1.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz"; - sha512 = "0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz"; + sha512 = "QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg=="; }; }; - "es-aggregate-error-1.0.8" = { + "es-aggregate-error-1.0.9" = { name = "es-aggregate-error"; packageName = "es-aggregate-error"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/es-aggregate-error/-/es-aggregate-error-1.0.8.tgz"; - sha512 = "AKUb5MKLWMozPlFRHOKqWD7yta5uaEhH21qwtnf6FlKjNjTJOoqFi0/G14+FfSkIQhhu6X68Af4xgRC6y8qG4A=="; + url = "https://registry.npmjs.org/es-aggregate-error/-/es-aggregate-error-1.0.9.tgz"; + sha512 = "fvnX40sb538wdU6r4s35cq4EY6Lr09Upj40BEVem4LEsuW8XgQep9yD5Q1U2KftokNp1rWODFJ2qwZSsAjFpbg=="; }; }; "es-array-method-boxes-properly-1.0.0" = { @@ -3271,13 +3865,13 @@ let sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; }; }; - "es-get-iterator-1.1.2" = { - name = "es-get-iterator"; - packageName = "es-get-iterator"; - version = "1.1.2"; + "es-set-tostringtag-2.0.1" = { + name = "es-set-tostringtag"; + packageName = "es-set-tostringtag"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz"; - sha512 = "+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ=="; + url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz"; + sha512 = "g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg=="; }; }; "es-to-primitive-1.2.1" = { @@ -3370,6 +3964,15 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; + "esprima-next-5.8.4" = { + name = "esprima-next"; + packageName = "esprima-next"; + version = "5.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima-next/-/esprima-next-5.8.4.tgz"; + sha512 = "8nYVZ4ioIH4Msjb/XmhnBdz5WRRBaYqevKa1cv9nGJdCehMbzZCPNEEnqfLCZVetUVrUPEcb5IYyu1GG4hFqgg=="; + }; + }; "estraverse-4.3.0" = { name = "estraverse"; packageName = "estraverse"; @@ -3433,6 +4036,15 @@ let sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; }; }; + "events-intercept-2.0.0" = { + name = "events-intercept"; + packageName = "events-intercept"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/events-intercept/-/events-intercept-2.0.0.tgz"; + sha512 = "blk1va0zol9QOrdZt0rFXo5KMkNPVSp92Eju/Qz8THwKWKRKeE0T8Br/1aW6+Edkyq9xHYgYxn2QtOnUKPUp+Q=="; + }; + }; "eventsource-2.0.2" = { name = "eventsource"; packageName = "eventsource"; @@ -3478,6 +4090,15 @@ let sha512 = "5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="; }; }; + "express-async-errors-3.1.1" = { + name = "express-async-errors"; + packageName = "express-async-errors"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express-async-errors/-/express-async-errors-3.1.1.tgz"; + sha512 = "h6aK1da4tpqWSbyCa3FxB/V6Ehd4EEB15zyQq9qe75OZBp0krinNKuH4rAY+S/U/2I36vdLAUFSjQJ+TFmODng=="; + }; + }; "express-openapi-validator-4.13.8" = { name = "express-openapi-validator"; packageName = "express-openapi-validator"; @@ -3487,6 +4108,15 @@ let sha512 = "89/sdkq+BKBuIyykaMl/vR9grFc3WFUPTjFo0THHbu+5g+q8rA7fKeoMfz+h84yOQIBcztmJ5ZJdk5uhEls31A=="; }; }; + "express-prom-bundle-6.6.0" = { + name = "express-prom-bundle"; + packageName = "express-prom-bundle"; + version = "6.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-prom-bundle/-/express-prom-bundle-6.6.0.tgz"; + sha512 = "tZh2P2p5a8/yxQ5VbRav011Poa4R0mHqdFwn9Swe/obXDe5F0jY9wtRAfNYnqk4LXY7akyvR/nrvAHxQPWUjsQ=="; + }; + }; "express-unless-2.1.3" = { name = "express-unless"; packageName = "express-unless"; @@ -3541,15 +4171,6 @@ let sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; - "fast-diff-1.2.0" = { - name = "fast-diff"; - packageName = "fast-diff"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz"; - sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; - }; - }; "fast-glob-3.2.12" = { name = "fast-glob"; packageName = "fast-glob"; @@ -3577,13 +4198,22 @@ let sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; }; }; - "fastq-1.13.0" = { + "fast-text-encoding-1.0.6" = { + name = "fast-text-encoding"; + packageName = "fast-text-encoding"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz"; + sha512 = "VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w=="; + }; + }; + "fastq-1.15.0" = { name = "fastq"; packageName = "fastq"; - version = "1.13.0"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"; - sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz"; + sha512 = "wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw=="; }; }; "fecha-4.2.3" = { @@ -3919,6 +4549,24 @@ let sha512 = "f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg=="; }; }; + "gaxios-4.3.3" = { + name = "gaxios"; + packageName = "gaxios"; + version = "4.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/gaxios/-/gaxios-4.3.3.tgz"; + sha512 = "gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA=="; + }; + }; + "gcp-metadata-4.3.1" = { + name = "gcp-metadata"; + packageName = "gcp-metadata"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.3.1.tgz"; + sha512 = "x850LS5N7V1F3UcV7PoupzGsyD6iVwTVvsh3tbXfkctZnBnjW5yu5z1/3k3SehF7TyoTIe78rJs02GMMy+LF+A=="; + }; + }; "generate-function-2.3.1" = { name = "generate-function"; packageName = "generate-function"; @@ -3955,13 +4603,13 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; - "get-intrinsic-1.1.3" = { + "get-intrinsic-1.2.0" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; - sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz"; + sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="; }; }; "get-package-type-0.1.0" = { @@ -4090,6 +4738,33 @@ let sha512 = "4kKdWXTtgQ4biIo7hZA396HT062nDVVHPjQcurNZ3o/voYN+o5FUC5kOwuORbpExp3XbTJ3SU7iRipiIhQtovw=="; }; }; + "google-auth-library-7.14.1" = { + name = "google-auth-library"; + packageName = "google-auth-library"; + version = "7.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.14.1.tgz"; + sha512 = "5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA=="; + }; + }; + "google-gax-2.30.5" = { + name = "google-gax"; + packageName = "google-gax"; + version = "2.30.5"; + src = fetchurl { + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.30.5.tgz"; + sha512 = "Jey13YrAN2hfpozHzbtrwEfEHdStJh1GwaQ2+Akh1k0Tv/EuNVSuBtHZoKSBm5wBMvNsxTsEIZ/152NrYyZgxQ=="; + }; + }; + "google-p12-pem-3.1.4" = { + name = "google-p12-pem"; + packageName = "google-p12-pem"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.4.tgz"; + sha512 = "HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg=="; + }; + }; "google-timezones-json-1.0.2" = { name = "google-timezones-json"; packageName = "google-timezones-json"; @@ -4099,6 +4774,15 @@ let sha512 = "UWXQ7BpSCW8erDespU2I4cri22xsKgwOCyhsJal0OJhi2tFpwJpsYNJt4vCiFPL1p2HzCGiS713LKpNR25n9Kg=="; }; }; + "gopd-1.0.1" = { + name = "gopd"; + packageName = "gopd"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz"; + sha512 = "d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="; + }; + }; "graceful-fs-4.2.10" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -4108,6 +4792,24 @@ let sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; }; }; + "grpc-gcp-0.3.3" = { + name = "grpc-gcp"; + packageName = "grpc-gcp"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/grpc-gcp/-/grpc-gcp-0.3.3.tgz"; + sha512 = "GuIoDnxuSDZoB5DEuuNh8SNB2vk+ZGPoY0+tXQ53TcLTyeY3X0xmkF2v6f9+HAS70TzJ6biyug8Eq9t4HIqpbQ=="; + }; + }; + "gtoken-5.3.2" = { + name = "gtoken"; + packageName = "gtoken"; + version = "5.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/gtoken/-/gtoken-5.3.2.tgz"; + sha512 = "gkvEKREW7dXWF8NV8pVrKfW7WqReAmjjkMBh6lNCCGOM4ucS0r0YyXXl0r/9Yj8wcW/32ISkfc8h5mPTDbtifQ=="; + }; + }; "handlebars-4.7.7" = { name = "handlebars"; packageName = "handlebars"; @@ -4171,6 +4873,15 @@ let sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; }; }; + "has-proto-1.0.1" = { + name = "has-proto"; + packageName = "has-proto"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz"; + sha512 = "7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="; + }; + }; "has-symbols-1.0.3" = { name = "has-symbols"; packageName = "has-symbols"; @@ -4261,13 +4972,13 @@ let sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; - "html-to-text-8.2.0" = { + "html-to-text-9.0.3" = { name = "html-to-text"; packageName = "html-to-text"; - version = "8.2.0"; + version = "9.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/html-to-text/-/html-to-text-8.2.0.tgz"; - sha512 = "CLXExYn1b++Lgri+ZyVvbUEFwzkLZppjjZOwB7X1qv2jIi8MrMEvxWX5KQ7zATAzTvcqgmtO00M2kCRMtEdOKQ=="; + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-9.0.3.tgz"; + sha512 = "hxDF1kVCF2uw4VUJ3vr2doc91pXf2D5ngKcNviSitNkhP9OMOaJkDrFIFL6RMvko7NisWTEiqGpQ9LAxcVok1w=="; }; }; "htmlparser2-6.1.0" = { @@ -4279,13 +4990,22 @@ let sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; }; - "http-cache-semantics-4.1.0" = { + "htmlparser2-8.0.1" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz"; + sha512 = "4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA=="; + }; + }; + "http-cache-semantics-4.1.1" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"; + sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="; }; }; "http-errors-2.0.0" = { @@ -4333,6 +5053,15 @@ let sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; }; + "humanize-duration-3.28.0" = { + name = "humanize-duration"; + packageName = "humanize-duration"; + version = "3.28.0"; + src = fetchurl { + url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.28.0.tgz"; + sha512 = "jMAxraOOmHuPbffLVDKkEKi/NeG8dMqP8lGRd6Tbf7JgAeG33jjgPWDbXXU7ypCI0o+oNKJFgbSB9FKVdWNI2A=="; + }; + }; "humanize-ms-1.2.1" = { name = "humanize-ms"; packageName = "humanize-ms"; @@ -4360,15 +5089,6 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; - "iconv-lite-0.5.2" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz"; - sha512 = "kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag=="; - }; - }; "iconv-lite-0.6.3" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -4405,13 +5125,13 @@ let sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; }; - "ignore-5.2.0" = { + "ignore-5.2.4" = { name = "ignore"; packageName = "ignore"; - version = "5.2.0"; + version = "5.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"; - sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz"; + sha512 = "MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="; }; }; "imap-0.8.19" = { @@ -4432,6 +5152,15 @@ let sha512 = "SW3LtfEJFjlJKS/h2CmpX2IKpya2RXobR3ENJJW4iMQ3QYPxWxf5oeaz1K3P4eGUwfGEndkqt7uVDKnEyG9zeQ=="; }; }; + "immediate-3.0.6" = { + name = "immediate"; + packageName = "immediate"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz"; + sha512 = "XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="; + }; + }; "imurmurhash-0.1.4" = { name = "imurmurhash"; packageName = "imurmurhash"; @@ -4495,13 +5224,13 @@ let sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; }; }; - "internal-slot-1.0.3" = { + "internal-slot-1.0.4" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; - sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz"; + sha512 = "tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ=="; }; }; "interpret-1.4.0" = { @@ -4522,6 +5251,15 @@ let sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A=="; }; }; + "ioredis-5.3.0" = { + name = "ioredis"; + packageName = "ioredis"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ioredis/-/ioredis-5.3.0.tgz"; + sha512 = "Id9jKHhsILuIZpHc61QkagfVdUj2Rag5GzG1TGEvRNeM7dtTOjICgjC+tvqYxi//PuX2wjQ+Xjva2ONBuf92Pw=="; + }; + }; "ip-1.1.8" = { name = "ip"; packageName = "ip"; @@ -4558,6 +5296,15 @@ let sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; }; + "is-3.3.0" = { + name = "is"; + packageName = "is"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is/-/is-3.3.0.tgz"; + sha512 = "nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg=="; + }; + }; "is-absolute-1.0.0" = { name = "is-absolute"; packageName = "is-absolute"; @@ -4576,6 +5323,15 @@ let sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; }; }; + "is-array-buffer-3.0.1" = { + name = "is-array-buffer"; + packageName = "is-array-buffer"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz"; + sha512 = "ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ=="; + }; + }; "is-arrayish-0.3.2" = { name = "is-arrayish"; packageName = "is-arrayish"; @@ -4720,15 +5476,6 @@ let sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; }; }; - "is-map-2.0.2" = { - name = "is-map"; - packageName = "is-map"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz"; - sha512 = "cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg=="; - }; - }; "is-nan-1.3.2" = { name = "is-nan"; packageName = "is-nan"; @@ -4828,15 +5575,6 @@ let sha512 = "XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg=="; }; }; - "is-set-2.0.2" = { - name = "is-set"; - packageName = "is-set"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz"; - sha512 = "+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g=="; - }; - }; "is-shared-array-buffer-1.0.2" = { name = "is-shared-array-buffer"; packageName = "is-shared-array-buffer"; @@ -4855,6 +5593,15 @@ let sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; }; }; + "is-stream-ended-0.1.4" = { + name = "is-stream-ended"; + packageName = "is-stream-ended"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz"; + sha512 = "xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw=="; + }; + }; "is-string-1.0.7" = { name = "is-string"; packageName = "is-string"; @@ -4873,13 +5620,13 @@ let sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; }; - "is-typed-array-1.1.9" = { + "is-typed-array-1.1.10" = { name = "is-typed-array"; packageName = "is-typed-array"; - version = "1.1.9"; + version = "1.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz"; - sha512 = "kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A=="; + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz"; + sha512 = "PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A=="; }; }; "is-typedarray-1.0.0" = { @@ -4900,15 +5647,6 @@ let sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="; }; }; - "is-weakmap-2.0.1" = { - name = "is-weakmap"; - packageName = "is-weakmap"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz"; - sha512 = "NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA=="; - }; - }; "is-weakref-1.0.2" = { name = "is-weakref"; packageName = "is-weakref"; @@ -4918,15 +5656,6 @@ let sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; }; }; - "is-weakset-2.0.2" = { - name = "is-weakset"; - packageName = "is-weakset"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz"; - sha512 = "t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg=="; - }; - }; "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; @@ -4963,22 +5692,13 @@ let sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; }; - "isarray-2.0.5" = { - name = "isarray"; - packageName = "isarray"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz"; - sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="; - }; - }; - "isbot-3.6.2" = { + "isbot-3.6.5" = { name = "isbot"; packageName = "isbot"; - version = "3.6.2"; + version = "3.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.6.2.tgz"; - sha512 = "jk8IRbrvyTJC2f4VpxXQ4ff+xVJgsXHygtpc5Sl6m9PWuF8oXVcpEmcZKR88j5WOoqpHTxrOKccCpxdAgW7Afw=="; + url = "https://registry.npmjs.org/isbot/-/isbot-3.6.5.tgz"; + sha512 = "BchONELXt6yMad++BwGpa0oQxo/uD0keL7N15cYVf0A1oMIoNQ79OqeYdPMFWDrNhCqCbRuw9Y9F3QBjvAxZ5g=="; }; }; "isexe-2.0.0" = { @@ -5035,13 +5755,22 @@ let sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; }; }; - "jquery-3.6.1" = { + "jquery-3.6.3" = { name = "jquery"; packageName = "jquery"; - version = "3.6.1"; + version = "3.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz"; - sha512 = "opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw=="; + url = "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz"; + sha512 = "bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="; + }; + }; + "js-base64-3.7.4" = { + name = "js-base64"; + packageName = "js-base64"; + version = "3.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.4.tgz"; + sha512 = "wpM/wi20Tl+3ifTyi0RdDckS4YTD4Lf953mBRrpG8547T7hInHNPEj8+ck4gB8VDcGyeAWFK++Wb/fU1BeavKQ=="; }; }; "js-md4-0.3.2" = { @@ -5116,6 +5845,15 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; + "json-bigint-1.0.0" = { + name = "json-bigint"; + packageName = "json-bigint"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz"; + sha512 = "SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ=="; + }; + }; "json-diff-0.5.5" = { name = "json-diff"; packageName = "json-diff"; @@ -5215,13 +5953,13 @@ let sha512 = "XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w=="; }; }; - "jsplumb-2.15.4" = { - name = "jsplumb"; - packageName = "jsplumb"; - version = "2.15.4"; + "jsonwebtoken-9.0.0" = { + name = "jsonwebtoken"; + packageName = "jsonwebtoken"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsplumb/-/jsplumb-2.15.4.tgz"; - sha512 = "QssfhXe0YRxY4V2WHPmKwsE3bPHNj4Vts9oinys66ci+4m9lJvFDcEMDygqueiSFL8Jb8CnFyQC9fvL+YHJS7g=="; + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz"; + sha512 = "tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw=="; }; }; "jsprim-1.4.2" = { @@ -5287,15 +6025,6 @@ let sha512 = "+Rcfu2hyQ/jv5skqRY8xA7Ra+mmRkDAzCaLDYbkGtgsNKpzxPWiLbk8ub0dgr4EbWrN1Zb4BCXHUkD6+zYfdWg=="; }; }; - "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"; @@ -5305,6 +6034,24 @@ let sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; }; }; + "ldapts-4.2.2" = { + name = "ldapts"; + packageName = "ldapts"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ldapts/-/ldapts-4.2.2.tgz"; + sha512 = "UHe7BtEhPUFHZZ6XHnRvLHWQrftTap3PgGU0nOLtrFeigZvfpXSsqJ8C9uXNouDV+iDHqoWwplS0eHoDu/GIEQ=="; + }; + }; + "leac-0.6.0" = { + name = "leac"; + packageName = "leac"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/leac/-/leac-0.6.0.tgz"; + sha512 = "y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg=="; + }; + }; "leven-2.1.0" = { name = "leven"; packageName = "leven"; @@ -5332,22 +6079,22 @@ let sha512 = "l+nePcPbIG1fNlqMzrh68MLkX/gTxk/+vdvAb388Ssi7UuUN31MI44w4Yf33mM3Cm4xDfw48mdf3rkdHszLNew=="; }; }; - "libmime-5.1.0" = { + "libmime-5.2.0" = { name = "libmime"; packageName = "libmime"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-5.1.0.tgz"; - sha512 = "xOqorG21Va+3CjpFOfFTU7SWohHH2uIX9ZY4Byz6J+lvpfvc486tOAT/G9GfbrKtJ9O7NCX9o0aC2lxqbnZ9EA=="; + url = "https://registry.npmjs.org/libmime/-/libmime-5.2.0.tgz"; + sha512 = "X2U5Wx0YmK0rXFbk67ASMeqYIkZ6E5vY7pNWRKtnNzqjvdYYG8xtPDpCnuUEnPU9vlgNev+JoSrcaKSUaNvfsw=="; }; }; - "libphonenumber-js-1.10.14" = { + "libphonenumber-js-1.10.19" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.10.14"; + version = "1.10.19"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.14.tgz"; - sha512 = "McGS7GV/WjJ2KjfOGhJU1oJn29RYeo7Q+RpANRbUNMQ9gj5XArpbjurSuyYPTejFwbaUojstQ4XyWCrAzGOUXw=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.19.tgz"; + sha512 = "MDZ1zLIkfSDZV5xBta3nuvbEOlsnKCPe4z5r3hyup/AXveevkl9A1eSWmLhd2FX4k7pJDe4MrLeQsux0HI/VWg=="; }; }; "libpq-1.8.12" = { @@ -5359,13 +6106,22 @@ let sha512 = "4lUY9BD9suz76mVS0kH4rRgRy620g/c9YZH5GYC3smfIpjtj6KiPuQ4IwQSHSZMMMhMM3tBFrYUrw8mHOOZVeg=="; }; }; - "libqp-1.1.0" = { + "libqp-2.0.1" = { name = "libqp"; packageName = "libqp"; - version = "1.1.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz"; - sha512 = "4Rgfa0hZpG++t1Vi2IiqXG9Ad1ig4QTmtuZF946QJP4bPqOYC78ixUXgz5TW/wE7lNaNKlplSYTxQ+fR2KZ0EA=="; + url = "https://registry.npmjs.org/libqp/-/libqp-2.0.1.tgz"; + sha512 = "Ka0eC5LkF3IPNQHJmYBWljJsw0UvM6j+QdKRbWyCdTmYwvIDE6a7bCm0UkTAL/K+3KXK5qXT/ClcInU01OpdLg=="; + }; + }; + "lie-3.1.1" = { + name = "lie"; + packageName = "lie"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz"; + sha512 = "RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw=="; }; }; "limiter-1.1.5" = { @@ -5377,13 +6133,31 @@ let sha512 = "FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA=="; }; }; - "linkify-it-4.0.0" = { + "linkify-it-3.0.3" = { name = "linkify-it"; packageName = "linkify-it"; - version = "4.0.0"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.0.tgz"; - sha512 = "QAxkXyzT/TXgwGyY4rTgC95Ex6/lZ5/lYTV9nug6eJt93BCBQGOE47D/g2+/m5J1MrVLr2ot97OXkBZ9bBpR4A=="; + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz"; + sha512 = "ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ=="; + }; + }; + "linkify-it-4.0.1" = { + name = "linkify-it"; + packageName = "linkify-it"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz"; + sha512 = "C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw=="; + }; + }; + "localforage-1.10.0" = { + name = "localforage"; + packageName = "localforage"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz"; + sha512 = "14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg=="; }; }; "localtunnel-2.0.2" = { @@ -5548,6 +6322,15 @@ let sha512 = "0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="; }; }; + "lodash.iteratee-4.7.0" = { + name = "lodash.iteratee"; + packageName = "lodash.iteratee"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.iteratee/-/lodash.iteratee-4.7.0.tgz"; + sha512 = "yv3cSQZmfpbIKo4Yo45B1taEvxjNvcpF1CEOc0Y6dEyvhPIfEJE3twDwPgWTPQubcSgXyBwBKG6wpQvWMDOf6Q=="; + }; + }; "lodash.merge-4.6.2" = { name = "lodash.merge"; packageName = "lodash.merge"; @@ -5593,6 +6376,15 @@ let sha512 = "hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q=="; }; }; + "lodash.remove-4.7.0" = { + name = "lodash.remove"; + packageName = "lodash.remove"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.remove/-/lodash.remove-4.7.0.tgz"; + sha512 = "GnwkSsEXGXirSxh3YI+jc/qvptE2DV8ZjA4liK0NT1MJ3mNDMFhX3bY+4Wr8onlNItYuPp7/4u19Fi55mvzkTw=="; + }; + }; "lodash.set-4.3.2" = { name = "lodash.set"; packageName = "lodash.set"; @@ -5602,6 +6394,15 @@ let sha512 = "4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg=="; }; }; + "lodash.snakecase-4.1.1" = { + name = "lodash.snakecase"; + packageName = "lodash.snakecase"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz"; + sha512 = "QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw=="; + }; + }; "lodash.split-4.4.2" = { name = "lodash.split"; packageName = "lodash.split"; @@ -5620,6 +6421,15 @@ let sha512 = "wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="; }; }; + "lodash.unionby-4.8.0" = { + name = "lodash.unionby"; + packageName = "lodash.unionby"; + version = "4.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.unionby/-/lodash.unionby-4.8.0.tgz"; + sha512 = "e60kn4GJIunNkw6v9MxRnUuLYI/Tyuanch7ozoCtk/1irJTYBj+qNTxr5B3qVflmJhwStJBv387Cb+9VOfABMg=="; + }; + }; "lodash.uniq-4.5.0" = { name = "lodash.uniq"; packageName = "lodash.uniq"; @@ -5674,6 +6484,15 @@ let sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; }; }; + "long-5.2.1" = { + name = "long"; + packageName = "long"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/long/-/long-5.2.1.tgz"; + sha512 = "GKSNGeNAtw8IryjjkhZxuKB3JzlcLTwjtiQCHKvqQet81I93kXslhDQruGI/QsddO83mcDToBVy7GqGS/zYf/A=="; + }; + }; "lossless-json-1.0.5" = { name = "lossless-json"; packageName = "lossless-json"; @@ -5701,15 +6520,6 @@ let sha512 = "uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw=="; }; }; - "lru-cache-4.1.5" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "4.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; - sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; - }; - }; "lru-cache-5.1.1" = { name = "lru-cache"; packageName = "lru-cache"; @@ -5728,6 +6538,15 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; + "lru-cache-7.14.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "7.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz"; + sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA=="; + }; + }; "lru-memoizer-2.1.4" = { name = "lru-memoizer"; packageName = "lru-memoizer"; @@ -5737,31 +6556,40 @@ let sha512 = "IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ=="; }; }; - "luxon-2.3.2" = { + "lru_map-0.3.3" = { + name = "lru_map"; + packageName = "lru_map"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz"; + sha512 = "Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ=="; + }; + }; + "luxon-3.2.1" = { name = "luxon"; packageName = "luxon"; - version = "2.3.2"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-2.3.2.tgz"; - sha512 = "MlAQQVMFhGk4WUA6gpfsy0QycnKP0+NlCBJRVRNPxxSIbjrCbQ65nrpJD3FVyJNZLuJ0uoqL57ye6BmDYgHaSw=="; + url = "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz"; + sha512 = "QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg=="; }; }; - "mailparser-3.5.0" = { + "mailparser-3.6.3" = { name = "mailparser"; packageName = "mailparser"; - version = "3.5.0"; + version = "3.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/mailparser/-/mailparser-3.5.0.tgz"; - sha512 = "mdr2DFgz8LKC0/Q6io6znA0HVnzaPFT0a4TTnLeZ7mWHlkfnm227Wxlq7mHh7AgeP32h7gOUpXvyhSfJJIEeyg=="; + url = "https://registry.npmjs.org/mailparser/-/mailparser-3.6.3.tgz"; + sha512 = "Yi6poKSsZsmjEcUexv3H4w4+TIeyN9u3+TCdC43VK7fe4rUOGDJ3wL4kMhNLiTOScCA1Rpzldv1hcf6g1MLtZQ=="; }; }; - "mailsplit-5.3.2" = { + "mailsplit-5.4.0" = { name = "mailsplit"; packageName = "mailsplit"; - version = "5.3.2"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/mailsplit/-/mailsplit-5.3.2.tgz"; - sha512 = "coES12hhKqagkuBTJoqERX+y9bXNpxbxw3Esd07auuwKYmcagouVlgucyIVRp48fnswMKxcUtLoFn/L1a75ynQ=="; + url = "https://registry.npmjs.org/mailsplit/-/mailsplit-5.4.0.tgz"; + sha512 = "wnYxX5D5qymGIPYLwnp6h8n1+6P6vz/MJn5AzGjZ8pwICWssL+CCQjWBIToOVHASmATot4ktvlLo6CyLfOXWYA=="; }; }; "make-dir-3.1.0" = { @@ -5800,13 +6628,58 @@ let sha512 = "+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg=="; }; }; - "mappersmith-2.40.0" = { + "mappersmith-2.41.0" = { name = "mappersmith"; packageName = "mappersmith"; - version = "2.40.0"; + version = "2.41.0"; src = fetchurl { - url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.40.0.tgz"; - sha512 = "Es99fy0E52fxmhRvCyed7WVlSyuz6ME/wOsRpSmi0GcbMEZ6y5D2GL4+qNGPCc2P270J5yw8L2zg+K4BWACcHg=="; + url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.41.0.tgz"; + sha512 = "kg2PXCFiM0WBMKZSgkvVBhF6SV7vdDEUsql5+DGdEHYZx9cwK+2QCSnsZ2EI4oyIWHMdIN/l+4yiyXJTsH7PcQ=="; + }; + }; + "markdown-it-12.3.2" = { + name = "markdown-it"; + packageName = "markdown-it"; + version = "12.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz"; + sha512 = "TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg=="; + }; + }; + "markdown-it-13.0.1" = { + name = "markdown-it"; + packageName = "markdown-it"; + version = "13.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.1.tgz"; + sha512 = "lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q=="; + }; + }; + "markdown-it-emoji-2.0.2" = { + name = "markdown-it-emoji"; + packageName = "markdown-it-emoji"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-2.0.2.tgz"; + sha512 = "zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ=="; + }; + }; + "markdown-it-link-attributes-4.0.1" = { + name = "markdown-it-link-attributes"; + packageName = "markdown-it-link-attributes"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it-link-attributes/-/markdown-it-link-attributes-4.0.1.tgz"; + sha512 = "pg5OK0jPLg62H4k7M9mRJLT61gUp9nvG0XveKYHMOOluASo9OEF13WlXrpAp2aj35LbedAy3QOCgQCw0tkLKAQ=="; + }; + }; + "markdown-it-task-lists-2.1.1" = { + name = "markdown-it-task-lists"; + packageName = "markdown-it-task-lists"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it-task-lists/-/markdown-it-task-lists-2.1.1.tgz"; + sha512 = "TxFAc76Jnhb2OUu+n3yz9RMu4CwGfaT788br6HhEDlvWfdeJcLUsxk1Hgw2yJio0OXsxv7pyIPmvECY7bMbluA=="; }; }; "material-colors-1.2.6" = { @@ -5827,6 +6700,15 @@ let sha512 = "T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g=="; }; }; + "mdurl-1.0.1" = { + name = "mdurl"; + packageName = "mdurl"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"; + sha512 = "/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="; + }; + }; "media-typer-0.3.0" = { name = "media-typer"; packageName = "media-typer"; @@ -5854,6 +6736,15 @@ let sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; }; }; + "merge-stream-2.0.0" = { + name = "merge-stream"; + packageName = "merge-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"; + sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; + }; + }; "merge2-1.4.1" = { name = "merge2"; packageName = "merge2"; @@ -5881,15 +6772,6 @@ let sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; }; }; - "millisecond-0.1.2" = { - name = "millisecond"; - packageName = "millisecond"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/millisecond/-/millisecond-0.1.2.tgz"; - sha512 = "BJ8XtxY+woL+5TkP6uS6XvOArm0JVrX2otkgtWZseHpIax0oOOPW3cnwhOjRqbEJg7YRO/BDF7fO/PTWNT3T9Q=="; - }; - }; "mime-1.6.0" = { name = "mime"; packageName = "mime"; @@ -5962,13 +6844,13 @@ let sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; - "minimatch-5.1.0" = { + "minimatch-5.1.6" = { name = "minimatch"; packageName = "minimatch"; - version = "5.1.0"; + version = "5.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz"; - sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"; + sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; }; "minimist-1.2.7" = { @@ -5980,13 +6862,22 @@ let sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; }; }; - "minipass-3.3.5" = { + "minipass-3.3.6" = { name = "minipass"; packageName = "minipass"; - version = "3.3.5"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.3.5.tgz"; - sha512 = "rQ/p+KfKBkeNwo04U15i+hOwoVBVmekmm/HcfTkTN2t9pbQKCMm4eN5gFeqgrrSp/kH/7BYYhTIHOxGqzbBPaA=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz"; + sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; + }; + }; + "minipass-4.0.1" = { + name = "minipass"; + packageName = "minipass"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-4.0.1.tgz"; + sha512 = "V9esFpNbK0arbN3fm2sxDKqMYgIp7XtVdE4Esj+PE4Qaaxdg1wIw48ITQIOn1sc8xXSmUviVL3cyjMqPlrVkiA=="; }; }; "minipass-collect-1.0.2" = { @@ -6088,22 +6979,22 @@ let sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="; }; }; - "moment-timezone-0.5.38" = { + "moment-timezone-0.5.40" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.38"; + version = "0.5.40"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.38.tgz"; - sha512 = "nMIrzGah4+oYZPflDvLZUgoVUO4fvAqHstvG3xAUnMolWncuAiLDWNnJZj6EwJGMGfb1ZcuTFE6GI3hNOVWI/Q=="; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.40.tgz"; + sha512 = "tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg=="; }; }; - "monaco-editor-0.30.1" = { + "monaco-editor-0.33.0" = { name = "monaco-editor"; packageName = "monaco-editor"; - version = "0.30.1"; + version = "0.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.30.1.tgz"; - sha512 = "B/y4+b2O5G2gjuxIFtCE2EkM17R2NM7/3F8x0qcPsqy4V83bitJTIO4TIeZpYlzu/xy6INiY/+84BEm6+7Cmzg=="; + url = "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.33.0.tgz"; + sha512 = "VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw=="; }; }; "mongodb-3.7.3" = { @@ -6115,31 +7006,22 @@ let sha512 = "Psm+g3/wHXhjBEktkxXsFMZvd3nemI0r3IPsE0bU+4//PnvNWKkzhZcEsbPcYiWqe8XqXJJEg4Tgtr7Raw67Yw=="; }; }; - "mongodb-4.11.0" = { + "mongodb-4.13.0" = { name = "mongodb"; packageName = "mongodb"; - version = "4.11.0"; + version = "4.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-4.11.0.tgz"; - sha512 = "9l9n4Nk2BYZzljW3vHah3Z0rfS5npKw6ktnkmFgTcnzaXH1DRm3pDl6VMHu84EVb1lzmSaJC4OzWZqTkB5i2wg=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.13.0.tgz"; + sha512 = "+taZ/bV8d1pYuHL4U+gSwkhmDrwkWbH1l4aah4YpmpscMwgFBkufIKxgP/G7m87/NUuQzc2Z75ZTI7ZOyqZLbw=="; }; }; - "mongodb-connection-string-url-2.5.4" = { + "mongodb-connection-string-url-2.6.0" = { name = "mongodb-connection-string-url"; packageName = "mongodb-connection-string-url"; - version = "2.5.4"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.4.tgz"; - sha512 = "SeAxuWs0ez3iI3vvmLk/j2y+zHwigTDKQhtdxTgt5ZCOQQS5+HW4g45/Xw5vzzbn7oQXCNQ24Z40AkJsizEy7w=="; - }; - }; - "moo-0.5.2" = { - name = "moo"; - packageName = "moo"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz"; - sha512 = "iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q=="; + url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz"; + sha512 = "WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ=="; }; }; "mqtt-4.2.6" = { @@ -6187,13 +7069,31 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "mssql-6.4.1" = { + "msal-1.4.17" = { + name = "msal"; + packageName = "msal"; + version = "1.4.17"; + src = fetchurl { + url = "https://registry.npmjs.org/msal/-/msal-1.4.17.tgz"; + sha512 = "RjHwP2cCIWQ9iUIk1SziUMb9+jj5mC4OqG2w16E5yig8jySi/TwiFvKlwcjNrPsndph0HtgCtbENnk5julf3yQ=="; + }; + }; + "msgpackr-1.8.3" = { + name = "msgpackr"; + packageName = "msgpackr"; + version = "1.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.3.tgz"; + sha512 = "m2JefwcKNzoHYXkH/5jzHRxAw7XLWsAdvu0FOJ+OLwwozwOV/J6UA62iLkfIMbg7G8+dIuRwgg6oz+QoQ4YkoA=="; + }; + }; + "mssql-7.3.5" = { name = "mssql"; packageName = "mssql"; - version = "6.4.1"; + version = "7.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-6.4.1.tgz"; - sha512 = "G1I7mM0gfxcH5TGSNoVmxq13Mve5YnQgRAlonqaMlHEjHjMn1g04bsrIQbVHFRdI6++dw/FGWlh8GoItJMoUDw=="; + url = "https://registry.npmjs.org/mssql/-/mssql-7.3.5.tgz"; + sha512 = "LTOSQ3k8yZTBfO/5XwH7zC6fDPBx1sYgMXZyP/k+ErWrhZN8faAvDq+/gMlm9DaFG9yaOipHedF5JSPV17EHNw=="; }; }; "mssql-8.1.4" = { @@ -6241,58 +7141,58 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.140.1" = { + "n8n-core-0.153.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.140.1"; + version = "0.153.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.140.1.tgz"; - sha512 = "a0fNyYhL8VsxQPUz0Jya0OOFy0eIFkiK40405XkAkonah+wBBBA01g46QSDdBCn3UMeDZ/LkfY+pzypkrmjMQQ=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.153.0.tgz"; + sha512 = "m5yikbWxe2IgA2P1ryUzlE4alNWPDha1vF3zoIgHfdZObR7UyoYohlJpT6l5LUcduCQVE87t1rspnJd4MY0hrQ=="; }; }; - "n8n-design-system-0.40.0" = { + "n8n-design-system-0.52.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.40.0"; + version = "0.52.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.40.0.tgz"; - sha512 = "P9ZubxZzNNMiXC58L2fyAAm4R4L3dJPZ+NMjKEZbu9+11XMX9SVX1+5t2NEWz1MsgVHGRLfc3mjPr7mnn05BQQ=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.52.0.tgz"; + sha512 = "Dd6SdWYDjlhgrpPbof4DFPP4hPdpH9cA+3YkFSCgQLNyCi0RdqiQJqPQ5xQFlNVaxd6a7R69RHy/oNwt6/+cLw=="; }; }; - "n8n-editor-ui-0.166.1" = { + "n8n-editor-ui-0.180.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.166.1"; + version = "0.180.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.166.1.tgz"; - sha512 = "AxGb+Rkq/TTytKjef60Q7Tmtyu+I4l0639aMrxg7ObqurqCjGL0WkJXaoGrb1H6pBHRSL3jU7ZuD/QfiGN93IQ=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.180.0.tgz"; + sha512 = "Xbjumqnc9chwVWDulXsIhXZ8r9i1nYUzJGBepC6xNM8kTaCRwCokfxUALfFPGNRUBg/A47ez89TNgDY9Mu/X3w=="; }; }; - "n8n-nodes-base-0.198.1" = { + "n8n-nodes-base-0.212.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.198.1"; + version = "0.212.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.198.1.tgz"; - sha512 = "kM5L/zib1Db5LG1qIYQeEDUM05kd/pQXvxxClCs+qs8RuCMVLnjWDua48NbpiINcnpEY0GI5Hzd0mDHCMjirpA=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.212.0.tgz"; + sha512 = "OENgQkAU70krTAoElQkQTX61Bh/rz2cpip+WDFea+KTXTBqU1gQDNlt3IZdhkS1l0F4e1VfblQawqMeJVFxwbA=="; }; }; - "n8n-workflow-0.122.1" = { + "n8n-workflow-0.135.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.122.1"; + version = "0.135.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.122.1.tgz"; - sha512 = "8lJuN5AFBEhIBcS8MRt0XuwZ4KXbRGwOA9InlnBoYWFloBdDh+1zDOIxiKJH94xjtihLU9tk3c9mnYPEJqnvDQ=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.135.0.tgz"; + sha512 = "4KTWgul6DHk7rOP2Pj2XsEw4wWfJo29CCLXImgMHkOqR0SWxZT2lRvlqggxlDD1KkmnEddHghLzxOCGxgRHxFg=="; }; }; - "named-placeholders-1.1.2" = { + "named-placeholders-1.1.3" = { name = "named-placeholders"; packageName = "named-placeholders"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.2.tgz"; - sha512 = "wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA=="; + url = "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.3.tgz"; + sha512 = "eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w=="; }; }; "nan-2.17.0" = { @@ -6349,15 +7249,6 @@ let sha512 = "p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q=="; }; }; - "nearley-2.20.1" = { - name = "nearley"; - packageName = "nearley"; - version = "2.20.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz"; - sha512 = "+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ=="; - }; - }; "negotiator-0.6.3" = { name = "negotiator"; packageName = "negotiator"; @@ -6403,22 +7294,31 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; - "node-abi-3.28.0" = { + "node-abi-3.31.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.28.0"; + version = "3.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.28.0.tgz"; - sha512 = "fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.31.0.tgz"; + sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ=="; }; }; - "node-abort-controller-3.0.1" = { + "node-abort-controller-2.0.0" = { name = "node-abort-controller"; packageName = "node-abort-controller"; - version = "3.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.0.1.tgz"; - sha512 = "/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw=="; + url = "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-2.0.0.tgz"; + sha512 = "L8RfEgjBTHAISTuagw51PprVAqNZoG6KSB6LQ6H1bskMVkFs5E71IyjauLBv3XbuomJlguWF/VnRHdJ1gqiAqA=="; + }; + }; + "node-abort-controller-3.1.1" = { + name = "node-abort-controller"; + packageName = "node-abort-controller"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz"; + sha512 = "AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ=="; }; }; "node-addon-api-4.3.0" = { @@ -6439,13 +7339,22 @@ let sha512 = "DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw=="; }; }; - "node-fetch-2.6.7" = { + "node-fetch-2.6.9" = { name = "node-fetch"; packageName = "node-fetch"; - version = "2.6.7"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz"; - sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz"; + sha512 = "DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg=="; + }; + }; + "node-forge-1.3.1" = { + name = "node-forge"; + packageName = "node-forge"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz"; + sha512 = "dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="; }; }; "node-gyp-8.4.1" = { @@ -6457,31 +7366,49 @@ let sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; }; }; - "node-gyp-build-4.5.0" = { + "node-gyp-build-4.6.0" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz"; - sha512 = "2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz"; + sha512 = "NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="; }; }; - "node-html-markdown-1.2.2" = { + "node-html-markdown-1.3.0" = { name = "node-html-markdown"; packageName = "node-html-markdown"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-html-markdown/-/node-html-markdown-1.2.2.tgz"; - sha512 = "VkiTJ2Y9BWscRY0yLm9OYTREvXobmlK7YehdDwIYfDj9VW6MefaFNaQkMTk94U0zyAuCsfLdBsOld54fsNhP9A=="; + url = "https://registry.npmjs.org/node-html-markdown/-/node-html-markdown-1.3.0.tgz"; + sha512 = "OeFi3QwC/cPjvVKZ114tzzu+YoR+v9UXW5RwSXGUqGb0qCl0DvP406tzdL7SFn8pZrMyzXoisfG2zcuF9+zw4g=="; }; }; - "node-html-parser-6.1.1" = { + "node-html-parser-6.1.4" = { name = "node-html-parser"; packageName = "node-html-parser"; - version = "6.1.1"; + version = "6.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.1.tgz"; - sha512 = "eYYblUeoMg0nR6cYGM4GRb1XncNa9FXEftuKAU1qyMIr6rXVtNyUKduvzZtkqFqSHVByq2lLjC7WO8tz7VDmnA=="; + url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.4.tgz"; + sha512 = "3muP9Uy/Pz7bQa9TNYVQzWJhNZMqyCx7xJle8kz2/y1UgzAUyXXShc1IcPaJy6u07CE3K5rQcRwlvHzmlySRjg=="; + }; + }; + "node-machine-id-1.1.12" = { + name = "node-machine-id"; + packageName = "node-machine-id"; + version = "1.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz"; + sha512 = "QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ=="; + }; + }; + "node-rsa-1.1.1" = { + name = "node-rsa"; + packageName = "node-rsa"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-rsa/-/node-rsa-1.1.1.tgz"; + sha512 = "Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw=="; }; }; "node-ssh-12.0.5" = { @@ -6502,15 +7429,6 @@ let sha512 = "n7C2NyEze8GCo/z73KdbjRsBiLbv6eBn1FxwYKQ23IqGo7pQY3mhQan61Sv7eEDJCiyUjTVrVkXTzJCo1dW7Aw=="; }; }; - "nodemailer-6.7.3" = { - name = "nodemailer"; - packageName = "nodemailer"; - version = "6.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.3.tgz"; - sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g=="; - }; - }; "nodemailer-6.8.0" = { name = "nodemailer"; packageName = "nodemailer"; @@ -6520,6 +7438,15 @@ let sha512 = "EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ=="; }; }; + "nodemailer-6.9.1" = { + name = "nodemailer"; + packageName = "nodemailer"; + version = "6.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.1.tgz"; + sha512 = "qHw7dOiU5UKNnQpXktdgQ1d3OFgRAekuvbJLcdG5dnEo/GtcTHRYM7+UfJARdOFU9WUQO8OiIamgWPmiSFHYAA=="; + }; + }; "nopt-5.0.0" = { name = "nopt"; packageName = "nopt"; @@ -6628,22 +7555,22 @@ let sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; }; }; - "object-inspect-1.12.2" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.12.2"; + "object-hash-3.0.0" = { + name = "object-hash"; + packageName = "object-hash"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz"; - sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; + url = "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz"; + sha512 = "RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="; }; }; - "object-is-1.1.5" = { - name = "object-is"; - packageName = "object-is"; - version = "1.1.5"; + "object-inspect-1.12.3" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"; - sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz"; + sha512 = "geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="; }; }; "object-keys-1.1.1" = { @@ -6673,13 +7600,13 @@ let sha512 = "1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="; }; }; - "object.getownpropertydescriptors-2.1.4" = { + "object.getownpropertydescriptors-2.1.5" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz"; - sha512 = "sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ=="; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.5.tgz"; + sha512 = "yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw=="; }; }; "on-finished-2.4.1" = { @@ -6871,6 +7798,15 @@ let sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; }; }; + "p-queue-6.6.2" = { + name = "p-queue"; + packageName = "p-queue"; + version = "6.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz"; + sha512 = "RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ=="; + }; + }; "p-timeout-3.2.0" = { name = "p-timeout"; packageName = "p-timeout"; @@ -6916,15 +7852,6 @@ let sha512 = "RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A=="; }; }; - "parchment-2.0.0-dev.2" = { - name = "parchment"; - packageName = "parchment"; - version = "2.0.0-dev.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parchment/-/parchment-2.0.0-dev.2.tgz"; - sha512 = "4fgRny4pPISoML08Zp7poi52Dff3E2G1ORTi2D/acJ/RiROdDAMDB6VcQNfBcmehrX5Wixp6dxh6JjLyE5yUNQ=="; - }; - }; "parse-github-url-1.0.2" = { name = "parse-github-url"; packageName = "parse-github-url"; @@ -6979,13 +7906,13 @@ let sha512 = "qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA=="; }; }; - "parseley-0.7.0" = { + "parseley-0.11.0" = { name = "parseley"; packageName = "parseley"; - version = "0.7.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/parseley/-/parseley-0.7.0.tgz"; - sha512 = "xyOytsdDu077M3/46Am+2cGXEKM9U9QclBDv7fimY7e+BBlxh2JcBp2mgNsmkyA9uvgyTjVzDi7cP1v4hcFxbw=="; + url = "https://registry.npmjs.org/parseley/-/parseley-0.11.0.tgz"; + sha512 = "VfcwXlBWgTF+unPcr7yu3HSSA6QUdDaDnrHcytVfj5Z8azAyKBDrYnSIfeSxlrEayndNcLmrXzg+Vxbo6DWRXQ=="; }; }; "parseurl-1.3.3" = { @@ -7024,13 +7951,13 @@ let sha512 = "8a6foX2bbGoJzup0RAiNcC2tTqzYS46RQEK3Z4u8p86wesPUjgDaji3C7+5j4TGyCq4ZoOV+3YLw1Hy6cV6kyw=="; }; }; - "passport-jwt-4.0.0" = { + "passport-jwt-4.0.1" = { name = "passport-jwt"; packageName = "passport-jwt"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/passport-jwt/-/passport-jwt-4.0.0.tgz"; - sha512 = "BwC0n2GP/1hMVjR4QpnvqA61TxenUMlmfNjYNgK0ZAs0HK4SOQkHcSv4L328blNTLtHq7DbmvyNJiH+bn6C5Mg=="; + url = "https://registry.npmjs.org/passport-jwt/-/passport-jwt-4.0.1.tgz"; + sha512 = "UCKMDYhNuGOBE9/9Ycuoyh7vP6jpeTp/+sfMJl7nLff/t6dps+iaeE0hhNkKN8/HZHcJ7lCdOyDxHdDoxoSvdQ=="; }; }; "passport-strategy-1.0.0" = { @@ -7150,6 +8077,15 @@ let sha512 = "v6ZJ/efsBpGrGGknjtq9J/oC8tZWq0KWL5vQrk2GlzLEQPUDB1ex+13Rmidl1neNN358Jn9EHZw5y07FFtaC7A=="; }; }; + "peberminta-0.8.0" = { + name = "peberminta"; + packageName = "peberminta"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/peberminta/-/peberminta-0.8.0.tgz"; + sha512 = "YYEs+eauIjDH5nUEGi18EohWE0nV2QbGTqmxQcqgZ/0g+laPCQmuIqq7EBLVi9uim9zMgfJv0QBZEnQ3uHw/Tw=="; + }; + }; "peek-readable-4.1.0" = { name = "peek-readable"; packageName = "peek-readable"; @@ -7177,6 +8113,15 @@ let sha512 = "UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw=="; }; }; + "pg-8.9.0" = { + name = "pg"; + packageName = "pg"; + version = "8.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pg/-/pg-8.9.0.tgz"; + sha512 = "ZJM+qkEbtOHRuXjmvBtOgNOXOtLSbxiMiUVMgE4rV6Zwocy03RicCVvDXgx8l4Biwo8/qORUnEqn2fdQzV7KCg=="; + }; + }; "pg-connection-string-2.5.0" = { name = "pg-connection-string"; packageName = "pg-connection-string"; @@ -7186,13 +8131,13 @@ let sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; }; }; - "pg-cursor-2.7.4" = { + "pg-cursor-2.8.0" = { name = "pg-cursor"; packageName = "pg-cursor"; - version = "2.7.4"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.7.4.tgz"; - sha512 = "CNWwOzTTZ9QvphoOL+Wg/7pmVr9GnAWBjPbuK2FRclrB4A/WRO/ssCJ9BlkzIGmmofK2M/LyokNHgsLSn+fMHA=="; + url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.8.0.tgz"; + sha512 = "LrOaEHK+R1C40e+xeri3FTRY/VKp9uTOCVsKtGB7LJ57qbeaphYvWjbVly8AesdT1GfHXYcAnVdExKhW7DKOvA=="; }; }; "pg-int8-1.0.1" = { @@ -7231,31 +8176,31 @@ let sha512 = "His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w=="; }; }; - "pg-promise-10.12.1" = { + "pg-promise-10.15.4" = { name = "pg-promise"; packageName = "pg-promise"; - version = "10.12.1"; + version = "10.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.12.1.tgz"; - sha512 = "SiJkBUDGq7PNfJFJbWferodsSH+vLrhte0Q0kVgQbwlNYeKmp9Hhkr+357+5DWEuBGOHhSu1UQffSSf5HVqRtA=="; + url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.15.4.tgz"; + sha512 = "BKlHCMCdNUmF6gagVbehRWSEiVcZzPVltEx14OJExR9Iz9/1R6KETDWLLGv2l6yRqYFnEZZy1VDjRhArzeIGrw=="; }; }; - "pg-protocol-1.5.0" = { + "pg-protocol-1.6.0" = { name = "pg-protocol"; packageName = "pg-protocol"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz"; - sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.0.tgz"; + sha512 = "M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q=="; }; }; - "pg-query-stream-4.2.4" = { + "pg-query-stream-4.3.0" = { name = "pg-query-stream"; packageName = "pg-query-stream"; - version = "4.2.4"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.2.4.tgz"; - sha512 = "Et3gTrWn4C2rj4LVioNq1QDd7aH/3mSJcBm79jZALv3wopvx9bWENtbOYZbHQ6KM+IkfFxs0JF1ZLjMDJ9/N6Q=="; + url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.3.0.tgz"; + sha512 = "+Eer4Y1e43rAaphFNu9/VJKn9nKTApFKCSwVtDjXYnuO4QYqWHOEkApmGJv8gvaU5T6fcuEtjsN24gk+Rx7X9A=="; }; }; "pg-types-1.13.0" = { @@ -7303,6 +8248,15 @@ let sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; + "pinia-2.0.30" = { + name = "pinia"; + packageName = "pinia"; + version = "2.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/pinia/-/pinia-2.0.30.tgz"; + sha512 = "q6DUmxWwe/mQgg+55QQjykpKC+aGeGdaJV3niminl19V08dE+LRTvSEuqi6/NLSGCKHI49KGL6tMNEOssFiMyA=="; + }; + }; "popsicle-12.1.0" = { name = "popsicle"; packageName = "popsicle"; @@ -7366,13 +8320,13 @@ let sha512 = "epKaq3TTfTzXcxBxjpoKYMcTTcAX8Rykus6QZu77XNhJuRHSRxMd+JJrbX/3PFI0opFGSN0BabbAYCbGxbu0mA=="; }; }; - "postcss-8.4.18" = { + "postcss-8.4.21" = { name = "postcss"; packageName = "postcss"; - version = "8.4.18"; + version = "8.4.21"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz"; - sha512 = "Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz"; + sha512 = "tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg=="; }; }; "postgres-array-1.0.3" = { @@ -7420,13 +8374,13 @@ let sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; - "posthog-node-1.3.0" = { + "posthog-node-2.4.0" = { name = "posthog-node"; packageName = "posthog-node"; - version = "1.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/posthog-node/-/posthog-node-1.3.0.tgz"; - sha512 = "2+VhqiY/rKIqKIXyvemBFHbeijHE25sP7eKltnqcFqAssUE6+sX6vusN9A4luzToOqHQkUZexiCKxvuGagh7JA=="; + url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.4.0.tgz"; + sha512 = "ijenljLS49AzMskyrDsmEbuPUI641I/qUEUfsVTFZYzNcmmiwWCyJu4v51DjzcH/vAda4p44CIhzL2LkROCl2Q=="; }; }; "prebuild-install-7.1.1" = { @@ -7447,6 +8401,24 @@ let sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; }; }; + "prettier-2.8.3" = { + name = "prettier"; + packageName = "prettier"; + version = "2.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz"; + sha512 = "tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw=="; + }; + }; + "pretty-bytes-5.6.0" = { + name = "pretty-bytes"; + packageName = "pretty-bytes"; + version = "5.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"; + sha512 = "FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg=="; + }; + }; "printj-1.1.2" = { name = "printj"; packageName = "printj"; @@ -7537,13 +8509,13 @@ let sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; }; }; - "promise.prototype.finally-3.1.3" = { + "promise.prototype.finally-3.1.4" = { name = "promise.prototype.finally"; packageName = "promise.prototype.finally"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.3.tgz"; - sha512 = "EXRF3fC9/0gz4qkt/f5EP5iW4kj9oFpBICNpCNOb/52+8nlHIX07FPLbi/q4qYBQ1xZqivMzTpNQSnArVASolQ=="; + url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.4.tgz"; + sha512 = "nNc3YbgMfLzqtqvO/q5DP6RR0SiHI9pUPGzyDf1q+usTwCN2kjvAnJkBb7bHe3o+fFSBPpsGMoYtaSi+LTNqng=="; }; }; "property-expr-2.0.5" = { @@ -7555,6 +8527,33 @@ let sha512 = "IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA=="; }; }; + "proto3-json-serializer-0.1.9" = { + name = "proto3-json-serializer"; + packageName = "proto3-json-serializer"; + version = "0.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.9.tgz"; + sha512 = "A60IisqvnuI45qNRygJjrnNjX2TMdQGMY+57tR3nul3ZgO2zXkR9OGR8AXxJhkqx84g0FTnrfi3D5fWMSdANdQ=="; + }; + }; + "protobufjs-6.11.3" = { + name = "protobufjs"; + packageName = "protobufjs"; + version = "6.11.3"; + src = fetchurl { + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz"; + sha512 = "xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg=="; + }; + }; + "protobufjs-7.2.1" = { + name = "protobufjs"; + packageName = "protobufjs"; + version = "7.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.1.tgz"; + sha512 = "L3pCItypTnPK27+CS8nuhZMYtsY+i8dqdq2vZsYHlG17CnWp1DWPQ/sos0vOKrj1fHEAzo3GBqSHLaeZyKUCDA=="; + }; + }; "proxy-addr-2.0.7" = { name = "proxy-addr"; packageName = "proxy-addr"; @@ -7636,13 +8635,13 @@ let sha512 = "RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="; }; }; - "punycode-2.1.1" = { + "punycode-2.3.0" = { name = "punycode"; packageName = "punycode"; - version = "2.1.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + url = "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"; + sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; }; }; "python-struct-1.1.3" = { @@ -7672,13 +8671,13 @@ let sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; }; }; - "query-string-7.1.1" = { + "query-string-7.1.3" = { name = "query-string"; packageName = "query-string"; - version = "7.1.1"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-7.1.1.tgz"; - sha512 = "MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w=="; + url = "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz"; + sha512 = "hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg=="; }; }; "querystring-0.2.0" = { @@ -7708,33 +8707,6 @@ let sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; }; - "quill-2.0.0-dev.4" = { - name = "quill"; - packageName = "quill"; - version = "2.0.0-dev.4"; - src = fetchurl { - url = "https://registry.npmjs.org/quill/-/quill-2.0.0-dev.4.tgz"; - sha512 = "9WmMVCEIhf3lDdhzl+i+GBDeDl0BFi65waC4Im8Y4HudEJ9kEEb1lciAz9A8pcDmLMjiMbvz84lNt/U5OBS8Vg=="; - }; - }; - "quill-autoformat-0.1.2" = { - name = "quill-autoformat"; - packageName = "quill-autoformat"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/quill-autoformat/-/quill-autoformat-0.1.2.tgz"; - sha512 = "kRe2rTSmcBDg/oCxhzbjmXXOpQUl0Gak6ZCQshxek/RLvdR8o715qC0WcBRUozqaYbR6PJ+0Z/piINqlYStxWw=="; - }; - }; - "quill-delta-4.2.1" = { - name = "quill-delta"; - packageName = "quill-delta"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/quill-delta/-/quill-delta-4.2.1.tgz"; - sha512 = "Y2nksOj6Q+4hizre8n0dml76vLNGK4/y86EoI1d7rv6EL1bx7DPDYRmqQMPu1UqFQO/uQuVHQ3fOmm4ZSzWrfA=="; - }; - }; "quoted-printable-1.0.1" = { name = "quoted-printable"; packageName = "quoted-printable"; @@ -7744,24 +8716,6 @@ let sha512 = "cihC68OcGiQOjGiXuo5Jk6XHANTHl1K4JLk/xlEJRTIXfy19Sg6XzB95XonYgr+1rB88bCpr7WZE7D7AlZow4g=="; }; }; - "railroad-diagrams-1.0.0" = { - name = "railroad-diagrams"; - packageName = "railroad-diagrams"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz"; - sha512 = "cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A=="; - }; - }; - "randexp-0.4.6" = { - name = "randexp"; - packageName = "randexp"; - version = "0.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz"; - sha512 = "80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ=="; - }; - }; "random-bytes-1.0.0" = { name = "random-bytes"; packageName = "random-bytes"; @@ -7861,6 +8815,15 @@ let sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; + "recast-0.21.5" = { + name = "recast"; + packageName = "recast"; + version = "0.21.5"; + src = fetchurl { + url = "https://registry.npmjs.org/recast/-/recast-0.21.5.tgz"; + sha512 = "hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg=="; + }; + }; "rechoir-0.6.2" = { name = "rechoir"; packageName = "rechoir"; @@ -7933,13 +8896,13 @@ let sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; - "regenerator-runtime-0.13.10" = { + "regenerator-runtime-0.13.11" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.13.10"; + version = "0.13.11"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz"; - sha512 = "KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz"; + sha512 = "kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="; }; }; "regexp.prototype.flags-1.4.3" = { @@ -7978,6 +8941,15 @@ let sha512 = "o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA=="; }; }; + "replacestream-4.0.3" = { + name = "replacestream"; + packageName = "replacestream"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz"; + sha512 = "AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA=="; + }; + }; "request-2.88.2" = { name = "request"; packageName = "request"; @@ -8059,15 +9031,6 @@ let sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; }; }; - "ret-0.1.15" = { - name = "ret"; - packageName = "ret"; - version = "0.1.15"; - src = fetchurl { - url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; - sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; - }; - }; "retry-0.12.0" = { name = "retry"; packageName = "retry"; @@ -8077,6 +9040,15 @@ let sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="; }; }; + "retry-request-4.2.2" = { + name = "retry-request"; + packageName = "retry-request"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/retry-request/-/retry-request-4.2.2.tgz"; + sha512 = "xA93uxUD/rogV7BV59agW/JHPGXeREMWiZc9jhcwY4YdZ7QOtC7qbomYg0n4wyk2lJhggjvKvhNX8wln/Aldhg=="; + }; + }; "reusify-1.0.4" = { name = "reusify"; packageName = "reusify"; @@ -8185,13 +9157,13 @@ let sha512 = "JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA=="; }; }; - "safe-stable-stringify-2.4.1" = { + "safe-stable-stringify-2.4.2" = { name = "safe-stable-stringify"; packageName = "safe-stable-stringify"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.1.tgz"; - sha512 = "dVHE6bMtS/bnL2mwualjc6IxEv1F+OCUpA46pKUj6F8uDbUM0jCCulPqRNPSnWwGNKx5etqMjZYdXtrm5KJZGA=="; + url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz"; + sha512 = "gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA=="; }; }; "safer-buffer-2.1.2" = { @@ -8203,13 +9175,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sanitize-html-2.7.0" = { + "sanitize-html-2.7.3" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "2.7.0"; + version = "2.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.0.tgz"; - sha512 = "jfQelabOn5voO7FAfnQF7v+jsA6z9zC/O4ec0z3E35XPEtHYJT/OdUziVWlKW4irCr2kXaQAyXTXDHWAibg1tA=="; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.3.tgz"; + sha512 = "jMaHG29ak4miiJ8wgqA1849iInqORgNv7SLfSw9LtfOhEUQ1C0YHKH73R+hgyufBW9ZFeJrb057k9hjlfBCVlw=="; }; }; "sax-1.2.1" = { @@ -8248,13 +9220,13 @@ let sha512 = "70BVm2xz9jn94zSQdpvYrEG101/UV9TVGcfWr9T5iob3QhCK4lYXeculfBqPGFv3XTeKgx4dpWyYIDeZUqo4kg=="; }; }; - "selderee-0.6.0" = { + "selderee-0.10.0" = { name = "selderee"; packageName = "selderee"; - version = "0.6.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/selderee/-/selderee-0.6.0.tgz"; - sha512 = "ibqWGV5aChDvfVdqNYuaJP/HnVBhlRGSRrlbttmlMpHcLuTqqbMH36QkSs9GEgj5M88JDYLI8eyP94JaQ8xRlg=="; + url = "https://registry.npmjs.org/selderee/-/selderee-0.10.0.tgz"; + sha512 = "DEL/RW/f4qLw/NrVg97xKaEBC8IpzIG2fvxnzCp3Z4yk4jQ3MXom+Imav9wApjxX2dfS3eW7x0DXafJr85i39A=="; }; }; "semver-5.3.0" = { @@ -8356,15 +9328,6 @@ let sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; - "setheader-1.0.2" = { - name = "setheader"; - packageName = "setheader"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/setheader/-/setheader-1.0.2.tgz"; - sha512 = "A704nIwzqGed0CnJZIqDE+0udMPS839ocgf1R9OJ8aq8vw4U980HWeNaD9ec8VnmBni9lyGEWDedOWXT/C5kxA=="; - }; - }; "setprototypeof-1.2.0" = { name = "setprototypeof"; packageName = "setprototypeof"; @@ -8464,13 +9427,13 @@ let sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; }; }; - "simple-git-3.14.1" = { + "simple-git-3.16.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.14.1"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.14.1.tgz"; - sha512 = "1ThF4PamK9wBORVGMK9HK5si4zoGS2GpRO7tkAFObA4FZv6dKaCVHLQT+8zlgiBm6K2h+wEU9yOaFCu/SR3OyA=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.16.0.tgz"; + sha512 = "zuWYsOLEhbJRWVxpjdiXl6eyAyGo/KzVW+KFhhw9MqEEJttcq+32jTWSGyxTdf9e/YCohxRE+9xpWFj9FdiJNw=="; }; }; "simple-lru-cache-0.0.2" = { @@ -8518,13 +9481,13 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; - "snowflake-sdk-1.6.14" = { + "snowflake-sdk-1.6.18" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.6.14"; + version = "1.6.18"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.14.tgz"; - sha512 = "sKg17Yz1/aydKxlA4unlprH+uw9ZsvRezdUmamLjNlvsXQsw+pok4PoMeCKtWs2OSVFnX0VO3eSacCPglQrAQA=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.18.tgz"; + sha512 = "QhG1aW1VLOUf4ylwPBMsQaIsKXV0Qp2/3Da5sEq6AK8pUcXnlwZ9d2wa+4+FOtMPrpdyfe8g9/tXH+BIyze3tQ=="; }; }; "socks-2.7.1" = { @@ -8572,6 +9535,15 @@ let sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="; }; }; + "source-map-support-0.5.21" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.21"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"; + sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; + }; + }; "spex-3.2.0" = { name = "spex"; packageName = "spex"; @@ -8581,6 +9553,24 @@ let sha512 = "9srjJM7NaymrpwMHvSmpDeIK5GoRMX/Tq0E8aOlDPS54dDnDUIp30DrP9SphMPEETDLzEM9+4qo+KipmbtPecg=="; }; }; + "split-array-stream-1.0.3" = { + name = "split-array-stream"; + packageName = "split-array-stream"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz"; + sha512 = "yGY35QmZFzZkWZ0eHE06RPBi63umym8m+pdtuC/dlO1ADhdKSfCj0uNn87BYCXBBDFxyTq4oTw0BgLYT0K5z/A=="; + }; + }; + "split-array-stream-2.0.0" = { + name = "split-array-stream"; + packageName = "split-array-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-array-stream/-/split-array-stream-2.0.0.tgz"; + sha512 = "hmMswlVY91WvGMxs0k8MRgq8zb2mSen4FmDNc5AFiTWtrBpdZN6nwD6kROVe4vNL+ywrvbCKsWVCnEd4riELIg=="; + }; + }; "split-on-first-1.1.0" = { name = "split-on-first"; packageName = "split-on-first"; @@ -8635,13 +9625,13 @@ let sha512 = "3HD8pSkZL+5YvYUI8nlvNILs61ALqq34xgmF+BHpqxe68yZIJ1H+sIVIODvni25+CcxHUxDyrTJUL0lE/m7afw=="; }; }; - "sqlite3-5.1.2" = { + "sqlite3-5.1.4" = { name = "sqlite3"; packageName = "sqlite3"; - version = "5.1.2"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.2.tgz"; - sha512 = "D0Reg6pRWAFXFUnZKsszCI67tthFD8fGPewRddDCX6w4cYwz3MbvuwRICbL+YQjBAh9zbw+lJ/V9oC8nG5j6eg=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.4.tgz"; + sha512 = "i0UlWAzPlzX3B5XP2cYuhWQJsTtlMD6obOa1PgeEQ4DHEXUuyJkgv50I3isqZAP5oFc2T8OFvakmDh2W6I+YpA=="; }; }; "sqlstring-2.3.3" = { @@ -8653,13 +9643,13 @@ let sha512 = "qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg=="; }; }; - "sse-channel-3.1.1" = { + "sse-channel-4.0.0" = { name = "sse-channel"; packageName = "sse-channel"; - version = "3.1.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/sse-channel/-/sse-channel-3.1.1.tgz"; - sha512 = "vgf4QFh60vlAMX0vGJpn6S+7gTO3ckRn7xq4DOgQGcgDs7ULBkaQFQxy4b3vj/umyk0ydhGu7i4A1nHQc5HcYw=="; + url = "https://registry.npmjs.org/sse-channel/-/sse-channel-4.0.0.tgz"; + sha512 = "I539Tc0gyDTQ2QCSg4v78Flxo/UbqR9x7JoyPcqaPtwo+qzeOw/fF+aPSbk0xTvBQAAAZk7Dlkc8K1bum5GUnw=="; }; }; "ssf-0.11.2" = { @@ -8770,6 +9760,24 @@ let sha512 = "KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw=="; }; }; + "stream-browserify-3.0.0" = { + name = "stream-browserify"; + packageName = "stream-browserify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz"; + sha512 = "H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA=="; + }; + }; + "stream-events-1.0.5" = { + name = "stream-events"; + packageName = "stream-events"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz"; + sha512 = "E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg=="; + }; + }; "stream-shift-1.0.1" = { name = "stream-shift"; packageName = "stream-shift"; @@ -8788,6 +9796,15 @@ let sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; }; }; + "strict-event-emitter-types-2.0.0" = { + name = "strict-event-emitter-types"; + packageName = "strict-event-emitter-types"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strict-event-emitter-types/-/strict-event-emitter-types-2.0.0.tgz"; + sha512 = "Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA=="; + }; + }; "strict-uri-encode-2.0.0" = { name = "strict-uri-encode"; packageName = "strict-uri-encode"; @@ -8824,22 +9841,22 @@ let sha512 = "VHhsDkuf8gsw4JNRK9cIZjYe6r7PsVUutVohaBhqYAoPaRADoQH+mMgUg7Cs/TgQeDGEvI+PzPEMOdvdsCMvpg=="; }; }; - "string.prototype.trimend-1.0.5" = { + "string.prototype.trimend-1.0.6" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"; - sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz"; + sha512 = "JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ=="; }; }; - "string.prototype.trimstart-1.0.5" = { + "string.prototype.trimstart-1.0.6" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"; - sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz"; + sha512 = "omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA=="; }; }; "string_decoder-0.10.31" = { @@ -8887,6 +9904,15 @@ let sha512 = "fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw=="; }; }; + "stubs-3.0.0" = { + name = "stubs"; + packageName = "stubs"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz"; + sha512 = "PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw=="; + }; + }; "style-mod-4.0.0" = { name = "style-mod"; packageName = "style-mod"; @@ -8932,31 +9958,40 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "swagger-ui-dist-4.15.2" = { + "swagger-ui-dist-4.15.5" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "4.15.2"; + version = "4.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.15.2.tgz"; - sha512 = "sanLAioshpa+Q0PpPxD86uo4labSqeIxtjLoC7xoce3HTnECPoQwY7PUVOiGMZ4dnEnROZPLUTloCEM86jZc1Q=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.15.5.tgz"; + sha512 = "V3eIa28lwB6gg7/wfNvAbjwJYmDXy1Jo1POjyTzlB6wPcHiGlRxq39TSjYGVjQrUSAzpv+a7nzp7mDxgNy57xA=="; }; }; - "swagger-ui-express-4.5.0" = { + "swagger-ui-express-4.6.0" = { name = "swagger-ui-express"; packageName = "swagger-ui-express"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.5.0.tgz"; - sha512 = "DHk3zFvsxrkcnurGvQlAcLuTDacAVN1JHKDgcba/gr2NFRE4HGwP1YeHIXMiGznkWR4AeS7X5vEblNn4QljuNA=="; + url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.6.0.tgz"; + sha512 = "ZxpQFp1JR2RF8Ar++CyJzEDdvufa08ujNUJgMVTMWPi86CuQeVdBtvaeO/ysrz6dJAYXf9kbVNhWD7JWocwqsA=="; }; }; - "tar-6.1.11" = { + "syslog-client-1.1.1" = { + name = "syslog-client"; + packageName = "syslog-client"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/syslog-client/-/syslog-client-1.1.1.tgz"; + sha512 = "c3qKw8JzCuHt0mwrzKQr8eqOc3RB28HgOpFuwGMO3GLscVpfR+0ECevWLZq/yIJTbx3WTb3QXBFVpTFtKAPDrw=="; + }; + }; + "tar-6.1.13" = { name = "tar"; packageName = "tar"; - version = "6.1.11"; + version = "6.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz"; - sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; + url = "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz"; + sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; }; }; "tar-fs-2.1.1" = { @@ -8977,15 +10012,6 @@ let sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; }; }; - "tarn-1.1.5" = { - name = "tarn"; - packageName = "tarn"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tarn/-/tarn-1.1.5.tgz"; - sha512 = "PMtJ3HCLAZeedWjJPgGnCvcphbCOMbtZpjKgLq3qM5Qq9aQud+XHrL0WlrlgnTyS8U+jrjGbEXprFcQrxPy52g=="; - }; - }; "tarn-3.0.2" = { name = "tarn"; packageName = "tarn"; @@ -9004,6 +10030,15 @@ let sha512 = "+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA=="; }; }; + "tedious-11.8.0" = { + name = "tedious"; + packageName = "tedious"; + version = "11.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tedious/-/tedious-11.8.0.tgz"; + sha512 = "GtFrO694x/7CRiUBt0AI4jrMtrkXV+ywifiOrDy4K0ufJLeKB4rgmPjy5Ws366fCaBaKlqQ9RnJ+sCJ1Jbd1lw=="; + }; + }; "tedious-14.7.0" = { name = "tedious"; packageName = "tedious"; @@ -9013,13 +10048,13 @@ let sha512 = "d3qlmZcvZyt7akyPHiOdR+knfzObWZH3mW+gouQTSb7YTSwtpHuYHcvsQabfbY7oOvgbs51xRb7CwOahWK/t9w=="; }; }; - "tedious-6.7.1" = { - name = "tedious"; - packageName = "tedious"; - version = "6.7.1"; + "teeny-request-7.2.0" = { + name = "teeny-request"; + packageName = "teeny-request"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/tedious/-/tedious-6.7.1.tgz"; - sha512 = "61eg/mvUa5vIqZcRizcqw/82dY65kR2uTll1TaUFh0aJ45XOrgbc8axiVR48dva8BahIAlJByaHNfAJ/KmPV0g=="; + url = "https://registry.npmjs.org/teeny-request/-/teeny-request-7.2.0.tgz"; + sha512 = "SyY0pek1zWsi0LRVAALem+avzMLc33MKW/JLLakdP4s9+D7+jHcy5x6P+h94g2QNZsAqQNfX5lsbd3WSeJXrrw=="; }; }; "test-console-2.0.0" = { @@ -9085,6 +10120,15 @@ let sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; + "through2-4.0.2" = { + name = "through2"; + packageName = "through2"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz"; + sha512 = "iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw=="; + }; + }; "through2-filter-3.0.0" = { name = "through2-filter"; packageName = "through2-filter"; @@ -9112,22 +10156,31 @@ let sha512 = "a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w=="; }; }; - "tinycolor2-1.4.2" = { + "tinycolor2-1.5.2" = { name = "tinycolor2"; packageName = "tinycolor2"; - version = "1.4.2"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz"; - sha512 = "vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA=="; + url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.5.2.tgz"; + sha512 = "h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg=="; }; }; - "tlds-1.231.0" = { + "title-case-3.0.3" = { + name = "title-case"; + packageName = "title-case"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/title-case/-/title-case-3.0.3.tgz"; + sha512 = "e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA=="; + }; + }; + "tlds-1.236.0" = { name = "tlds"; packageName = "tlds"; - version = "1.231.0"; + version = "1.236.0"; src = fetchurl { - url = "https://registry.npmjs.org/tlds/-/tlds-1.231.0.tgz"; - sha512 = "L7UQwueHSkGxZHQBXHVmXW64oi+uqNtzFt2x6Ssk7NVnpIbw16CRs4eb/jmKOZ9t2JnqZ/b3Cfvo97lnXqKrhw=="; + url = "https://registry.npmjs.org/tlds/-/tlds-1.236.0.tgz"; + sha512 = "oP2PZ3KeGlgpHgsEfrtva3/K9kzsJUNliQSbCfrJ7JMCWFoCdtG+9YMq/g2AnADQ1v5tVlbtvKJZ4KLpy/P6MA=="; }; }; "tmp-0.0.33" = { @@ -9247,6 +10300,15 @@ let sha512 = "l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA=="; }; }; + "transliteration-2.3.5" = { + name = "transliteration"; + packageName = "transliteration"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/transliteration/-/transliteration-2.3.5.tgz"; + sha512 = "HAGI4Lq4Q9dZ3Utu2phaWgtm3vB6PkLUFqWAScg/UW+1eZ/Tg6Exo4oC0/3VUol/w4BlefLhUUSVBr/9/ZGQOw=="; + }; + }; "triple-beam-1.3.0" = { name = "triple-beam"; packageName = "triple-beam"; @@ -9265,6 +10327,15 @@ let sha512 = "e4g0EJtAjk64xgnFPD6kTBUtpnMVzDrMb12N1YZV0VvSlhnVT3SGxiYTLdGy8Q5cYHOIC/FAHmZ10eGrAguicQ=="; }; }; + "ts-node-10.9.1" = { + name = "ts-node"; + packageName = "ts-node"; + version = "10.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz"; + sha512 = "NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw=="; + }; + }; "tslib-1.14.1" = { name = "tslib"; packageName = "tslib"; @@ -9274,13 +10345,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.4.0" = { + "tslib-2.5.0" = { name = "tslib"; packageName = "tslib"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"; - sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz"; + sha512 = "336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="; }; }; "tsscmp-1.0.6" = { @@ -9346,6 +10417,15 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; + "typed-array-length-1.0.4" = { + name = "typed-array-length"; + packageName = "typed-array-length"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz"; + sha512 = "KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng=="; + }; + }; "typedarray-0.0.6" = { name = "typedarray"; packageName = "typedarray"; @@ -9355,13 +10435,13 @@ let sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; }; }; - "typeorm-0.2.45" = { + "typeorm-0.3.11" = { name = "typeorm"; packageName = "typeorm"; - version = "0.2.45"; + version = "0.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/typeorm/-/typeorm-0.2.45.tgz"; - sha512 = "c0rCO8VMJ3ER7JQ73xfk0zDnVv0WDjpsP6Q1m6CVKul7DB9iVdWLRjPzc8v2eaeBuomsbZ2+gTaYr8k1gm3bYA=="; + url = "https://registry.npmjs.org/typeorm/-/typeorm-0.3.11.tgz"; + sha512 = "pzdOyWbVuz/z8Ww6gqvBW4nylsM0KLdUCDExr2gR20/x1khGSVxQkjNV/3YqliG90jrWzrknYbYscpk8yxFJVg=="; }; }; "typeorm-aurora-data-api-driver-2.4.4" = { @@ -9373,6 +10453,15 @@ let sha512 = "EqrdoXr0FbUrAMmkNQQuPwlhUGM7SJnpwUlWTWNlK2mOhOUyM+33fhm1f1hz3nnJJV8fTxzS3kTDq6pkVASLAw=="; }; }; + "typescript-4.9.5" = { + name = "typescript"; + packageName = "typescript"; + version = "4.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"; + sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="; + }; + }; "uc.micro-1.0.6" = { name = "uc.micro"; packageName = "uc.micro"; @@ -9535,6 +10624,15 @@ let sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; }; + "url-value-parser-2.2.0" = { + name = "url-value-parser"; + packageName = "url-value-parser"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-value-parser/-/url-value-parser-2.2.0.tgz"; + sha512 = "yIQdxJpgkPamPPAPuGdS7Q548rLhny42tg8d4vyTNzFqvOnwqrgHXvgehT09U7fwrzxi3RxCiXjoNUNnNOlQ8A=="; + }; + }; "urllib-2.40.0" = { name = "urllib"; packageName = "urllib"; @@ -9652,6 +10750,15 @@ let sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; }; }; + "uuid-9.0.0" = { + name = "uuid"; + packageName = "uuid"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz"; + sha512 = "MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="; + }; + }; "v-click-outside-3.2.0" = { name = "v-click-outside"; packageName = "v-click-outside"; @@ -9661,6 +10768,15 @@ let sha512 = "QD0bDy38SHJXQBjgnllmkI/rbdiwmq9RC+/+pvrFjYJKTn8dtp7Penf9q1lLBta280fYG2q53mgLhQ+3l3z74w=="; }; }; + "v8-compile-cache-lib-3.0.1" = { + name = "v8-compile-cache-lib"; + packageName = "v8-compile-cache-lib"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz"; + sha512 = "wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg=="; + }; + }; "validator-13.7.0" = { name = "validator"; packageName = "validator"; @@ -9688,22 +10804,31 @@ let sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; - "vm2-3.9.11" = { + "vm2-3.9.13" = { name = "vm2"; packageName = "vm2"; - version = "3.9.11"; + version = "3.9.13"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.11.tgz"; - sha512 = "PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.13.tgz"; + sha512 = "0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q=="; }; }; - "vue-2.7.13" = { + "vue-2.6.14" = { name = "vue"; packageName = "vue"; - version = "2.7.13"; + version = "2.6.14"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.7.13.tgz"; - sha512 = "QnM6ULTNnPmn71eUO+4hdjfBIA3H0GLsBnchnI/kS678tjI45GOUZhXd0oP/gX9isikXz1PAzSnkPspp9EUNfQ=="; + url = "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz"; + sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; + }; + }; + "vue-2.7.14" = { + name = "vue"; + packageName = "vue"; + version = "2.7.14"; + src = fetchurl { + url = "https://registry.npmjs.org/vue/-/vue-2.7.14.tgz"; + sha512 = "b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ=="; }; }; "vue-agile-2.0.0" = { @@ -9724,6 +10849,15 @@ let sha512 = "BoLCEHisXi2QgwlhZBg9UepvzZZmi4176vbr+31Shen5WWZwSLVgdScEPcB+yrAtuHAz42309C0A4+WiL9lNBw=="; }; }; + "vue-demi-0.13.11" = { + name = "vue-demi"; + packageName = "vue-demi"; + version = "0.13.11"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz"; + sha512 = "IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A=="; + }; + }; "vue-fragment-1.5.1" = { name = "vue-fragment"; packageName = "vue-fragment"; @@ -9733,22 +10867,31 @@ let sha512 = "ig6eES6TcMBbANW71ylB+AJgRN+Zksb3f50AxjGpAk6hMzqmeuD80qeh4LJP0jVw2dMBMjgRUfIkrvxygoRgtQ=="; }; }; - "vue-i18n-8.27.2" = { + "vue-i18n-8.28.2" = { name = "vue-i18n"; packageName = "vue-i18n"; - version = "8.27.2"; + version = "8.28.2"; src = fetchurl { - url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.27.2.tgz"; - sha512 = "QVzn7u2WVH8F7eSKIM00lujC7x1mnuGPaTnDTmB01Hd709jDtB9kYtBqM+MWmp5AJRx3gnqAdZbee9MelqwFBg=="; + url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.28.2.tgz"; + sha512 = "C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA=="; }; }; - "vue-json-pretty-1.9.2" = { + "vue-infinite-loading-2.4.5" = { + name = "vue-infinite-loading"; + packageName = "vue-infinite-loading"; + version = "2.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-infinite-loading/-/vue-infinite-loading-2.4.5.tgz"; + sha512 = "xhq95Mxun060bRnsOoLE2Be6BR7jYwuC89kDe18+GmCLVrRA/dU0jrGb12Xu6NjmKs+iTW0AA6saSEmEW4cR7g=="; + }; + }; + "vue-json-pretty-1.9.3" = { name = "vue-json-pretty"; packageName = "vue-json-pretty"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/vue-json-pretty/-/vue-json-pretty-1.9.2.tgz"; - sha512 = "FHAYmZAazhVC6Wi+Zi9DVYha+oZb9uylJPGkl/yTYLxlqLMxmnaVC2R8ZwaYzt6TBGvkLe3Y2D2vgyJCDBJy1w=="; + url = "https://registry.npmjs.org/vue-json-pretty/-/vue-json-pretty-1.9.3.tgz"; + sha512 = "b13DP1WGQ+ACUU2K5hmwFfHrHnydCFSTerE7fppeYMojSWN/5EOPODQECfIIRaJ7zzHtPW9OifkThFGPyY0xRg=="; }; }; "vue-prism-editor-0.3.0" = { @@ -9769,13 +10912,13 @@ let sha512 = "VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ=="; }; }; - "vue-template-compiler-2.7.13" = { + "vue-template-compiler-2.7.14" = { name = "vue-template-compiler"; packageName = "vue-template-compiler"; - version = "2.7.13"; + version = "2.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.13.tgz"; - sha512 = "jYM6TClwDS9YqP48gYrtAtaOhRKkbYmbzE+Q51gX5YDr777n7tNI/IZk4QV4l/PjQPNh/FVa/E92sh/RqKMrog=="; + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz"; + sha512 = "zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ=="; }; }; "vue-typed-mixins-0.2.0" = { @@ -9796,6 +10939,15 @@ let sha512 = "N3FYX9Z6rZdTeP3BOBz2LMxlWo9WRmPF6SOsYzz+tEuUH0QjX8UD7c1X95J8pZ7cFvbh9QflVujYQRqRiiwoAg=="; }; }; + "vue2-boring-avatars-0.3.8" = { + name = "vue2-boring-avatars"; + packageName = "vue2-boring-avatars"; + version = "0.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vue2-boring-avatars/-/vue2-boring-avatars-0.3.8.tgz"; + sha512 = "8vNN+zhCIiIMnSQDu0DwhJ11e9r3t4t12dromXmXDtRryBhV58NPn4XgMb4JKrBlfNK92KFrY/cxRy3nzhQfpQ=="; + }; + }; "vue2-teleport-1.0.1" = { name = "vue2-teleport"; packageName = "vue2-teleport"; @@ -9814,15 +10966,6 @@ let sha512 = "rGV8jxgOQEJYkJCp7uOBe3hjvmG1arThrq1wGtJHwJTgi65+P2a+0l4CYcQO/U1ZFqTq2/TT2+oTE6H7Y+6Eog=="; }; }; - "vuex-3.6.2" = { - name = "vuex"; - packageName = "vuex"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz"; - sha512 = "ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="; - }; - }; "w3c-keyname-2.2.6" = { name = "w3c-keyname"; packageName = "w3c-keyname"; @@ -9895,22 +11038,13 @@ let sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; }; - "which-collection-1.0.1" = { - name = "which-collection"; - packageName = "which-collection"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz"; - sha512 = "W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A=="; - }; - }; - "which-typed-array-1.1.8" = { + "which-typed-array-1.1.9" = { name = "which-typed-array"; packageName = "which-typed-array"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz"; - sha512 = "Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw=="; + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz"; + sha512 = "w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA=="; }; }; "wide-align-1.1.5" = { @@ -10174,6 +11308,15 @@ let sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; }; }; + "yargs-17.6.2" = { + name = "yargs"; + packageName = "yargs"; + version = "17.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz"; + sha512 = "1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw=="; + }; + }; "yargs-parser-20.2.9" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -10183,6 +11326,24 @@ let sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; }; }; + "yargs-parser-21.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "21.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"; + sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="; + }; + }; + "yn-3.1.1" = { + name = "yn"; + packageName = "yn"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz"; + sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="; + }; + }; "yup-0.32.11" = { name = "yup"; packageName = "yup"; @@ -10192,36 +11353,23 @@ let sha512 = "Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg=="; }; }; - "zen-observable-0.8.15" = { - name = "zen-observable"; - packageName = "zen-observable"; - version = "0.8.15"; - src = fetchurl { - url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz"; - sha512 = "PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ=="; - }; - }; - "zen-observable-ts-1.2.5" = { - name = "zen-observable-ts"; - packageName = "zen-observable-ts"; - version = "1.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-1.2.5.tgz"; - sha512 = "QZWQekv6iB72Naeake9hS1KxHlotfRpe+WGNbNx5/ta+R3DNjVO2bswf63gXlWDcs+EMd7XY8HfVQyP1X6T4Zg=="; - }; - }; }; in { n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.200.1"; + version = "0.214.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.200.1.tgz"; - sha512 = "g6RFonJAuvaNyQ6t3DfDHnV4T5NT4obfkRzELJ4S0DnT5jq68n1UsYmbPII8rhmdZJsK+d67prGlKUsnyZ3VxQ=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.214.0.tgz"; + sha512 = "nCwdAvgweOtKOg1ZAMLNoc9PgKBFPHAob3+2mw1UAqV0O+pBFcearssVMczcqiH9yr+PYkL4FKqvrPkB292Iwg=="; }; dependencies = [ + (sources."@acuminous/bitsyntax-0.1.2" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { dependencies = [ sources."argparse-2.0.1" @@ -10230,53 +11378,53 @@ in }) (sources."@azure/abort-controller-1.1.0" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-auth-1.4.0" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) - (sources."@azure/core-client-1.6.1" // { + (sources."@azure/core-client-1.7.1" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) - (sources."@azure/core-http-2.2.7" // { + (sources."@azure/core-http-2.3.1" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" sources."tough-cookie-4.1.2" - sources."tslib-2.4.0" + sources."tslib-2.5.0" sources."universalify-0.2.0" ]; }) sources."@azure/core-http-compat-1.3.0" - (sources."@azure/core-lro-2.4.0" // { + (sources."@azure/core-lro-2.5.1" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) - (sources."@azure/core-paging-1.3.0" // { + (sources."@azure/core-paging-1.5.0" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) - (sources."@azure/core-rest-pipeline-1.9.2" // { + (sources."@azure/core-rest-pipeline-1.10.1" // { dependencies = [ sources."@tootallnate/once-2.0.0" sources."http-proxy-agent-5.0.0" - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-tracing-1.0.1" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-util-1.1.1" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) (sources."@azure/identity-2.1.0" // { @@ -10284,59 +11432,64 @@ in sources."jwa-2.0.0" sources."jws-4.0.0" sources."open-8.4.0" - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) (sources."@azure/keyvault-keys-4.6.0" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) (sources."@azure/logger-1.0.3" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) sources."@azure/ms-rest-azure-env-2.0.0" - (sources."@azure/ms-rest-js-2.6.2" // { + (sources."@azure/ms-rest-js-2.6.4" // { dependencies = [ sources."form-data-2.5.1" ]; }) sources."@azure/ms-rest-nodeauth-3.1.1" - sources."@azure/msal-browser-2.30.0" + (sources."@azure/msal-browser-2.32.2" // { + dependencies = [ + sources."@azure/msal-common-9.1.1" + ]; + }) sources."@azure/msal-common-7.6.0" - sources."@azure/msal-node-1.14.2" + (sources."@azure/msal-node-1.14.6" // { + dependencies = [ + sources."@azure/msal-common-9.1.1" + ]; + }) (sources."@azure/storage-blob-12.12.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) - sources."@babel/parser-7.20.0" - sources."@babel/runtime-7.20.0" - sources."@codemirror/autocomplete-6.3.0" - sources."@codemirror/commands-6.1.2" - sources."@codemirror/lang-javascript-6.1.1" - sources."@codemirror/language-6.3.0" - sources."@codemirror/lint-6.0.0" - sources."@codemirror/state-6.1.2" - sources."@codemirror/view-6.4.0" + sources."@babel/parser-7.20.15" + sources."@babel/runtime-7.20.13" + sources."@codemirror/autocomplete-6.4.0" + sources."@codemirror/commands-6.2.0" + sources."@codemirror/lang-css-6.0.2" + sources."@codemirror/lang-javascript-6.1.3" + sources."@codemirror/language-6.4.0" + sources."@codemirror/lint-6.1.0" + sources."@codemirror/state-6.2.0" + sources."@codemirror/view-6.7.3" sources."@colors/colors-1.5.0" + sources."@cspotcode/source-map-support-0.8.1" sources."@curlconverter/yargs-0.0.2" sources."@curlconverter/yargs-parser-0.0.1" - (sources."@dabh/diagnostics-2.0.3" // { - dependencies = [ - sources."enabled-2.0.0" - sources."kuler-2.0.0" - ]; - }) - sources."@fontsource/open-sans-4.5.13" + sources."@dabh/diagnostics-2.0.3" + sources."@fontsource/open-sans-4.5.14" sources."@fortawesome/fontawesome-common-types-0.3.0" sources."@fortawesome/fontawesome-svg-core-1.3.0" - (sources."@fortawesome/free-regular-svg-icons-6.2.0" // { + (sources."@fortawesome/free-regular-svg-icons-6.2.1" // { dependencies = [ - sources."@fortawesome/fontawesome-common-types-6.2.0" + sources."@fortawesome/fontawesome-common-types-6.2.1" ]; }) (sources."@fortawesome/free-solid-svg-icons-5.15.4" // { @@ -10344,8 +11497,36 @@ in sources."@fortawesome/fontawesome-common-types-0.2.36" ]; }) - sources."@fortawesome/vue-fontawesome-2.0.8" + sources."@fortawesome/vue-fontawesome-2.0.10" sources."@gar/promisify-1.1.3" + (sources."@google-cloud/common-3.10.0" // { + dependencies = [ + sources."duplexify-4.1.2" + sources."readable-stream-3.6.0" + ]; + }) + 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/spanner-5.18.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."through2-4.0.2" + ]; + }) + (sources."@grpc/grpc-js-1.6.12" // { + dependencies = [ + sources."@grpc/proto-loader-0.7.4" + sources."long-5.2.1" + sources."protobufjs-7.2.1" + sources."yargs-16.2.0" + ]; + }) + (sources."@grpc/proto-loader-0.6.13" // { + dependencies = [ + sources."yargs-16.2.0" + ]; + }) (sources."@icetee/ftp-0.3.15" // { dependencies = [ sources."isarray-0.0.1" @@ -10353,17 +11534,33 @@ in sources."string_decoder-0.10.31" ]; }) - sources."@js-joda/core-5.4.2" + sources."@ioredis/commands-1.2.0" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.9" + sources."@js-joda/core-5.5.2" sources."@jsdevtools/ono-7.1.3" + sources."@jsplumb/browser-ui-5.13.2" + sources."@jsplumb/common-5.13.2" + sources."@jsplumb/connector-bezier-5.13.2" + sources."@jsplumb/core-5.13.2" + sources."@jsplumb/util-5.13.2" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" - sources."@lezer/common-1.0.1" - sources."@lezer/highlight-1.1.2" - sources."@lezer/javascript-1.0.2" - sources."@lezer/lr-1.2.3" + sources."@lezer/common-1.0.2" + sources."@lezer/css-1.1.1" + sources."@lezer/highlight-1.1.3" + sources."@lezer/html-1.3.0" + sources."@lezer/javascript-1.4.1" + sources."@lezer/lr-1.3.3" sources."@mapbox/node-pre-gyp-1.0.10" - sources."@n8n_io/riot-tmpl-1.0.1" + (sources."@n8n_io/license-sdk-1.8.0" // { + dependencies = [ + sources."axios-1.1.3" + ]; + }) + sources."@n8n_io/riot-tmpl-2.0.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -10373,16 +11570,16 @@ in sources."mkdirp-1.0.4" ]; }) - sources."@oclif/command-1.8.18" - (sources."@oclif/config-1.18.5" // { + sources."@oclif/command-1.8.22" + (sources."@oclif/config-1.18.8" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) - (sources."@oclif/core-1.19.2" // { + (sources."@oclif/core-1.26.1" // { dependencies = [ sources."supports-color-8.1.1" - sources."tslib-2.4.0" + sources."tslib-2.5.0" sources."wrap-ansi-7.0.0" ]; }) @@ -10394,66 +11591,114 @@ in sources."wrap-ansi-7.0.0" ]; }) - sources."@oclif/help-1.0.3" - sources."@oclif/linewrap-1.0.0" - (sources."@oclif/parser-3.8.8" // { + (sources."@oclif/help-1.0.5" // { dependencies = [ - sources."tslib-2.4.0" + sources."@oclif/config-1.18.6" + sources."tslib-2.5.0" ]; }) - sources."@oclif/screen-3.0.2" - sources."@opentelemetry/api-1.2.0" - sources."@rudderstack/rudder-sdk-node-1.0.6" - (sources."@sap/hana-client-2.14.22" // { + sources."@oclif/linewrap-1.0.0" + (sources."@oclif/parser-3.8.10" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) + sources."@oclif/screen-3.0.4" + sources."@opentelemetry/api-1.4.0" + 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."@rudderstack/rudder-sdk-node-1.0.6" // { + dependencies = [ + sources."bull-3.29.3" + sources."ioredis-4.28.5" + ]; + }) + (sources."@sap/hana-client-2.15.19" // { dependencies = [ sources."debug-3.1.0" sources."ms-2.0.0" ]; }) sources."@segment/loosely-validate-event-2.0.0" - sources."@selderee/plugin-htmlparser2-0.6.0" + (sources."@selderee/plugin-htmlparser2-0.10.0" // { + dependencies = [ + sources."domhandler-5.0.3" + ]; + }) + sources."@sentry/core-7.36.0" + sources."@sentry/integrations-7.36.0" + sources."@sentry/node-7.36.0" + sources."@sentry/types-7.36.0" + sources."@sentry/utils-7.36.0" sources."@servie/events-1.0.0" sources."@sqltools/formatter-1.2.5" + sources."@swc/core-1.3.32" + sources."@swc/wasm-1.3.32" sources."@techteamer/ocsp-1.0.0" sources."@tediousjs/connection-string-0.3.0" sources."@tokenizer/token-0.3.0" sources."@tootallnate/once-1.1.2" + sources."@tsconfig/node10-1.0.9" + sources."@tsconfig/node12-1.0.11" + sources."@tsconfig/node14-1.0.3" + sources."@tsconfig/node16-1.0.3" + sources."@types/asn1-0.2.0" + sources."@types/big.js-6.1.6" sources."@types/body-parser-1.19.2" sources."@types/connect-3.4.35" + sources."@types/duplexify-3.6.1" sources."@types/es-aggregate-error-1.0.2" - sources."@types/express-4.17.14" + sources."@types/express-4.17.16" sources."@types/express-jwt-0.0.42" - sources."@types/express-serve-static-core-4.17.31" + sources."@types/express-serve-static-core-4.17.33" sources."@types/express-unless-2.0.1" sources."@types/js-nacl-1.3.1" sources."@types/json-schema-7.0.11" - sources."@types/lodash-4.14.186" + sources."@types/lodash-4.14.191" + sources."@types/long-4.0.2" sources."@types/mime-3.0.1" sources."@types/multer-1.4.7" - sources."@types/node-18.11.7" + sources."@types/node-18.11.18" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" ]; }) + sources."@types/pumpify-1.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - sources."@types/readable-stream-2.3.14" sources."@types/serve-static-1.15.0" + sources."@types/stack-trace-0.0.29" + sources."@types/stoppable-1.1.1" sources."@types/tough-cookie-2.3.8" sources."@types/tunnel-0.0.3" + sources."@types/uuid-9.0.0" + sources."@types/validator-13.7.11" sources."@types/webidl-conversions-7.0.0" sources."@types/whatwg-url-8.2.2" - sources."@vue/compiler-sfc-2.7.13" - sources."@xmldom/xmldom-0.7.6" + sources."@vue/compiler-sfc-2.7.14" + (sources."@vue/composition-api-1.7.1" // { + dependencies = [ + sources."vue-2.6.14" + ]; + }) + sources."@vue/devtools-api-6.5.0" + sources."@xmldom/xmldom-0.8.6" sources."a-sync-waterfall-1.0.1" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.8" - sources."access-control-1.0.1" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" - (sources."adal-node-0.2.3" // { + (sources."adal-node-0.2.4" // { dependencies = [ sources."async-2.6.4" sources."uuid-3.4.0" @@ -10472,7 +11717,7 @@ in ]; }) sources."ajv-6.12.6" - (sources."amqplib-0.8.0" // { + (sources."amqplib-0.10.3" // { dependencies = [ sources."isarray-0.0.1" sources."readable-stream-1.1.14" @@ -10484,7 +11729,7 @@ in sources."ansi-styles-4.3.0" sources."ansicolors-0.3.2" sources."any-promise-1.3.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."app-root-path-3.1.0" sources."append-field-1.0.0" sources."aproba-2.0.0" @@ -10493,22 +11738,24 @@ in sources."readable-stream-3.6.0" ]; }) + sources."arg-4.1.3" sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."array-parallel-0.1.3" sources."array-series-0.1.5" sources."array-union-2.1.0" - sources."array.prototype.reduce-1.0.4" + sources."array.prototype.reduce-1.0.5" + sources."arrify-2.0.1" sources."asap-2.0.6" sources."asn1-0.2.6" sources."asn1.js-5.4.1" sources."asn1.js-rfc2560-5.0.1" sources."asn1.js-rfc5280-3.0.0" - sources."assert-options-0.7.0" + sources."assert-options-0.8.0" sources."assert-plus-1.0.0" (sources."ast-types-0.13.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) sources."async-3.2.4" @@ -10521,8 +11768,8 @@ in ]; }) sources."available-typed-arrays-1.0.5" - sources."avsc-5.7.6" - (sources."aws-sdk-2.1242.0" // { + sources."avsc-5.7.7" + (sources."aws-sdk-2.1308.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -10534,9 +11781,9 @@ in ]; }) sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."axios-0.21.4" - sources."axios-retry-3.3.1" + sources."axios-retry-3.4.0" sources."babel-helper-vue-jsx-merge-props-2.0.3" (sources."babel-runtime-6.26.0" // { dependencies = [ @@ -10553,30 +11800,20 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" - sources."better-sqlite3-7.6.2" + sources."better-sqlite3-8.0.1" sources."big-integer-1.6.51" + sources."big.js-6.2.1" sources."bignumber.js-2.4.0" sources."binary-extensions-2.2.0" sources."binascii-0.0.2" - (sources."bindings-1.5.0" // { - dependencies = [ - sources."file-uri-to-path-1.0.0" - ]; - }) + sources."bindings-1.5.0" sources."bintrees-1.0.2" - (sources."bitsyntax-0.1.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."safe-buffer-5.1.2" - ]; - }) (sources."bl-4.1.0" // { dependencies = [ sources."readable-stream-3.6.0" ]; }) - sources."bluebird-3.7.2" + sources."bluebird-2.11.0" sources."bn.js-4.12.0" (sources."body-parser-1.20.1" // { dependencies = [ @@ -10590,35 +11827,42 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."browser-request-0.3.3" - sources."bson-4.7.0" + sources."bson-4.7.2" sources."buffer-5.7.1" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.2" sources."buffer-more-ints-1.0.0" sources."buffer-writer-2.0.0" sources."bufferutil-4.0.7" - sources."bull-3.29.3" + (sources."bull-4.10.3" // { + dependencies = [ + sources."cron-parser-4.7.1" + ]; + }) sources."busboy-1.6.0" sources."byte-length-1.0.2" sources."bytes-3.1.2" (sources."cacache-15.3.0" // { dependencies = [ + sources."lru-cache-6.0.0" + sources."minipass-3.3.6" sources."mkdirp-1.0.4" sources."p-map-4.0.0" + sources."yallist-4.0.0" ]; }) sources."call-bind-1.0.2" - sources."call-me-maybe-1.0.1" + sources."call-me-maybe-1.0.2" sources."callback-stream-1.1.0" sources."callsites-3.1.0" (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) (sources."capital-case-1.0.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) sources."cardinal-2.1.1" @@ -10631,17 +11875,23 @@ in sources."chalk-4.1.2" (sources."change-case-4.1.2" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) sources."chardet-0.7.0" sources."charenc-0.0.2" + (sources."checkpoint-stream-0.1.2" // { + dependencies = [ + sources."async-2.6.4" + sources."split-array-stream-1.0.3" + ]; + }) sources."cheerio-1.0.0-rc.6" sources."cheerio-select-1.6.0" sources."chokidar-3.5.3" sources."chownr-2.0.0" sources."clamp-1.0.1" - sources."class-validator-0.13.2" + sources."class-validator-0.14.0" sources."clean-stack-3.0.1" sources."cli-color-0.1.7" sources."cli-cursor-3.1.0" @@ -10659,8 +11909,9 @@ in sources."wrap-ansi-7.0.0" ]; }) - sources."clone-2.1.2" - sources."cluster-key-slot-1.1.1" + sources."cluster-key-slot-1.1.2" + sources."codemirror-lang-html-n8n-1.0.0" + sources."codemirror-lang-n8n-expression-0.2.0" sources."codepage-1.15.0" (sources."color-3.2.1" // { dependencies = [ @@ -10672,7 +11923,6 @@ in sources."color-name-1.1.4" sources."color-string-1.9.1" sources."color-support-1.1.3" - sources."colornames-1.1.1" sources."colorspace-1.1.4" sources."combined-stream-1.0.8" sources."commander-5.1.0" @@ -10695,19 +11945,24 @@ in sources."console-control-strings-1.1.0" (sources."constant-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) sources."content-disposition-0.5.4" - sources."content-type-1.0.4" - sources."convict-6.2.3" - sources."cookie-0.4.1" - sources."cookie-parser-1.4.6" + sources."content-type-1.0.5" + sources."convict-6.2.4" + sources."cookie-0.4.2" + (sources."cookie-parser-1.4.6" // { + dependencies = [ + sources."cookie-0.4.1" + ]; + }) sources."cookie-signature-1.0.6" sources."copy-to-2.0.1" - sources."core-js-3.26.0" + sources."core-js-3.27.2" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" + sources."create-require-1.1.1" sources."crelt-1.0.5" sources."cron-1.7.2" sources."cron-parser-2.18.0" @@ -10728,18 +11983,14 @@ in sources."dashdash-1.14.1" sources."data-api-client-1.3.0" sources."data-uri-to-buffer-3.0.1" + sources."date-fns-2.29.3" sources."date-utils-1.2.21" sources."dateformat-3.0.3" sources."de-indent-1.0.2" sources."debug-4.3.4" sources."debuglog-1.0.1" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."decompress-response-6.0.0" - (sources."deep-equal-2.0.5" // { - dependencies = [ - sources."isarray-2.0.5" - ]; - }) sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."deepmerge-1.5.2" @@ -10753,11 +12004,10 @@ in sources."depd-2.0.0" sources."destroy-1.2.0" sources."detect-libc-2.0.1" - sources."diagnostics-1.1.1" + sources."diff-4.0.2" sources."difflib-0.2.4" sources."digest-header-1.0.0" sources."dir-glob-3.0.1" - sources."discontinuous-range-1.0.0" sources."dom-iterator-1.0.0" sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" @@ -10765,7 +12015,7 @@ in sources."domutils-2.8.0" (sources."dot-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) sources."dotenv-8.6.0" @@ -10775,25 +12025,21 @@ in sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" sources."ejs-3.1.8" - sources."element-ui-2.15.10" + sources."element-ui-2.15.12" sources."emoji-regex-8.0.0" - sources."enabled-1.0.2" + sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" sources."encoding-japanese-2.0.0" sources."end-of-stream-1.4.4" - sources."entities-2.2.0" + sources."ent-2.2.0" + sources."entities-2.1.0" sources."env-paths-2.2.1" - sources."env-variable-0.0.6" sources."err-code-2.0.3" - sources."es-abstract-1.20.4" - sources."es-aggregate-error-1.0.8" + sources."es-abstract-1.21.1" + sources."es-aggregate-error-1.0.9" sources."es-array-method-boxes-properly-1.0.0" - (sources."es-get-iterator-1.1.2" // { - dependencies = [ - sources."isarray-2.0.5" - ]; - }) + sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."es5-ext-0.8.2" sources."escalade-3.1.1" @@ -10802,12 +12048,14 @@ in sources."escodegen-1.14.3" sources."eslint-config-riot-1.0.0" sources."esprima-4.0.1" + sources."esprima-next-5.8.4" sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."etag-1.8.1" sources."event-target-shim-5.0.1" sources."eventemitter3-4.0.7" sources."events-3.3.0" + sources."events-intercept-2.0.0" sources."eventsource-2.0.2" sources."exit-on-epipe-1.0.1" sources."expand-template-2.0.3" @@ -10819,12 +12067,14 @@ in sources."ms-2.0.0" ]; }) + sources."express-async-errors-3.1.1" (sources."express-openapi-validator-4.13.8" // { dependencies = [ sources."media-typer-1.1.0" sources."path-to-regexp-6.2.1" ]; }) + sources."express-prom-bundle-6.6.0" sources."express-unless-2.1.3" sources."extend-3.0.2" sources."extend-shallow-2.0.1" @@ -10835,11 +12085,11 @@ in }) sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-diff-1.2.0" sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.13.0" + sources."fast-text-encoding-1.0.6" + sources."fastq-1.15.0" sources."fecha-4.2.3" sources."fflate-0.7.4" (sources."figures-3.2.0" // { @@ -10849,10 +12099,10 @@ in }) sources."file-saver-2.0.5" sources."file-type-16.5.4" - sources."file-uri-to-path-2.0.0" + sources."file-uri-to-path-1.0.0" (sources."filelist-1.0.4" // { dependencies = [ - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" ]; }) sources."fill-range-7.0.1" @@ -10881,7 +12131,12 @@ in sources."fresh-0.5.2" sources."fs-constants-1.0.0" sources."fs-extra-9.1.0" - sources."fs-minipass-2.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."fs.realpath-1.0.0" (sources."ftp-0.3.10" // { dependencies = [ @@ -10894,16 +12149,19 @@ in sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" sources."gauge-3.0.2" + sources."gaxios-4.3.3" + sources."gcp-metadata-4.3.1" sources."generate-function-2.3.1" sources."generic-pool-3.9.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-package-type-0.1.0" sources."get-port-5.1.1" sources."get-symbol-description-1.0.0" sources."get-system-fonts-2.0.2" (sources."get-uri-3.0.2" // { dependencies = [ + sources."file-uri-to-path-2.0.0" sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" sources."universalify-0.1.2" @@ -10925,12 +12183,33 @@ in dependencies = [ sources."cross-spawn-4.0.2" sources."debug-3.2.7" - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" ]; }) + (sources."google-auth-library-7.14.1" // { + dependencies = [ + sources."jwa-2.0.0" + sources."jws-4.0.0" + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" + ]; + }) + (sources."google-gax-2.30.5" // { + dependencies = [ + sources."duplexify-4.1.2" + sources."readable-stream-3.6.0" + ]; + }) + sources."google-p12-pem-3.1.4" sources."google-timezones-json-1.0.2" + sources."gopd-1.0.1" sources."graceful-fs-4.2.10" + sources."grpc-gcp-0.3.3" + (sources."gtoken-5.3.2" // { + dependencies = [ + sources."jwa-2.0.0" + sources."jws-4.0.0" + ]; + }) sources."handlebars-4.7.7" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -10938,6 +12217,7 @@ in sources."has-bigints-1.0.2" sources."has-flag-4.0.0" sources."has-property-descriptors-1.0.0" + sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" @@ -10945,30 +12225,36 @@ in sources."he-1.2.0" (sources."header-case-2.0.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) sources."heap-0.2.7" sources."help-me-1.1.0" sources."highlight.js-10.7.3" sources."homedir-polyfill-1.0.3" - (sources."html-to-text-8.2.0" // { + (sources."html-to-text-9.0.3" // { dependencies = [ - sources."deepmerge-4.2.2" + sources."deepmerge-4.3.0" + sources."dom-serializer-2.0.0" + sources."domhandler-5.0.3" + sources."domutils-3.0.1" + sources."entities-4.4.0" + sources."htmlparser2-8.0.1" ]; }) sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" + sources."humanize-duration-3.28.0" sources."humanize-ms-1.2.1" sources."hyperlinker-1.0.0" sources."iconv-lite-0.6.3" sources."ics-2.41.0" sources."ieee754-1.2.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" (sources."imap-0.8.19" // { dependencies = [ sources."isarray-0.0.1" @@ -10981,6 +12267,7 @@ in sources."iconv-lite-0.4.24" ]; }) + sources."immediate-3.0.6" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."infer-owner-1.0.4" @@ -10988,14 +12275,20 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."inquirer-7.3.3" - sources."internal-slot-1.0.3" + sources."internal-slot-1.0.4" sources."interpret-1.4.0" - sources."ioredis-4.28.5" + (sources."ioredis-5.3.0" // { + dependencies = [ + sources."denque-2.1.0" + ]; + }) sources."ip-2.0.0" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" + sources."is-3.3.0" sources."is-absolute-1.0.0" sources."is-arguments-1.1.1" + sources."is-array-buffer-3.0.1" sources."is-arrayish-0.3.2" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" @@ -11011,7 +12304,6 @@ in sources."is-generator-function-1.0.10" sources."is-glob-4.0.3" sources."is-lambda-1.0.1" - sources."is-map-2.0.2" sources."is-nan-1.3.2" sources."is-negated-glob-1.0.0" sources."is-negative-zero-2.0.2" @@ -11023,34 +12315,38 @@ in sources."is-regex-1.1.4" sources."is-relative-1.0.0" sources."is-retry-allowed-2.2.0" - sources."is-set-2.0.2" sources."is-shared-array-buffer-1.0.2" sources."is-stream-2.0.1" + sources."is-stream-ended-0.1.4" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.9" + sources."is-typed-array-1.1.10" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" - sources."is-weakmap-2.0.1" sources."is-weakref-1.0.2" - sources."is-weakset-2.0.2" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" - sources."isbot-3.6.2" + sources."isbot-3.6.5" sources."isexe-2.0.0" sources."iso-639-1-2.1.15" sources."isstream-0.1.2" sources."jake-10.8.5" sources."jmespath-0.16.0" sources."join-component-1.1.0" - sources."jquery-3.6.1" + sources."jquery-3.6.3" + sources."js-base64-3.7.4" sources."js-md4-0.3.2" sources."js-nacl-1.4.0" sources."js-yaml-3.14.1" sources."jsbi-4.3.0" sources."jsbn-0.1.1" sources."jsesc-3.0.2" + (sources."json-bigint-1.0.0" // { + dependencies = [ + sources."bignumber.js-9.1.1" + ]; + }) sources."json-diff-0.5.5" sources."json-schema-0.4.0" sources."json-schema-ref-parser-9.0.9" @@ -11064,27 +12360,35 @@ in ]; }) sources."jsonschema-1.4.1" - (sources."jsonwebtoken-8.5.1" // { + sources."jsonwebtoken-9.0.0" + sources."jsprim-1.4.2" + sources."jwa-1.4.1" + (sources."jwks-rsa-1.12.3" // { dependencies = [ + sources."jsonwebtoken-8.5.1" sources."semver-5.7.1" ]; }) - sources."jsplumb-2.15.4" - sources."jsprim-1.4.2" - sources."jwa-1.4.1" - sources."jwks-rsa-1.12.3" sources."jws-3.2.2" sources."kafkajs-1.16.0" - sources."kuler-1.0.1" + sources."kuler-2.0.0" + (sources."ldapts-4.2.2" // { + dependencies = [ + sources."uuid-9.0.0" + ]; + }) + sources."leac-0.6.0" sources."leven-2.1.0" sources."levn-0.3.0" sources."libbase64-1.2.1" - sources."libmime-5.1.0" - sources."libphonenumber-js-1.10.14" + sources."libmime-5.2.0" + sources."libphonenumber-js-1.10.19" sources."libpq-1.8.12" - sources."libqp-1.1.0" + sources."libqp-2.0.1" + sources."lie-3.1.1" sources."limiter-1.1.5" - sources."linkify-it-4.0.0" + sources."linkify-it-3.0.3" + sources."localforage-1.10.0" (sources."localtunnel-2.0.2" // { dependencies = [ sources."debug-4.3.2" @@ -11107,14 +12411,18 @@ in sources."lodash.isnumber-3.0.3" sources."lodash.isplainobject-4.0.6" sources."lodash.isstring-4.0.1" + sources."lodash.iteratee-4.7.0" sources."lodash.merge-4.6.2" sources."lodash.omit-4.5.0" sources."lodash.once-4.1.1" sources."lodash.orderby-4.6.0" sources."lodash.pick-4.4.0" + sources."lodash.remove-4.7.0" sources."lodash.set-4.3.2" + sources."lodash.snakecase-4.1.1" sources."lodash.split-4.4.2" sources."lodash.throttle-4.1.1" + sources."lodash.unionby-4.8.0" sources."lodash.uniq-4.5.0" sources."lodash.uniqby-4.7.0" sources."lodash.unset-4.5.2" @@ -11124,23 +12432,20 @@ in sources."lossless-json-1.0.5" (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) - sources."lru-cache-6.0.0" - (sources."lru-memoizer-2.1.4" // { + sources."lru-cache-4.0.2" + sources."lru-memoizer-2.1.4" + sources."lru_map-0.3.3" + sources."luxon-3.2.1" + (sources."mailparser-3.6.3" // { dependencies = [ - sources."lru-cache-4.0.2" - sources."yallist-2.1.2" + sources."linkify-it-4.0.1" + sources."nodemailer-6.8.0" ]; }) - sources."luxon-2.3.2" - (sources."mailparser-3.5.0" // { - dependencies = [ - sources."nodemailer-6.7.3" - ]; - }) - sources."mailsplit-5.3.2" + sources."mailsplit-5.4.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -11150,18 +12455,26 @@ in sources."make-error-cause-2.3.0" (sources."make-fetch-happen-9.1.0" // { dependencies = [ + sources."lru-cache-6.0.0" + sources."minipass-3.3.6" sources."socks-proxy-agent-6.2.1" + sources."yallist-4.0.0" ]; }) - sources."mappersmith-2.40.0" + sources."mappersmith-2.41.0" + sources."markdown-it-13.0.1" + sources."markdown-it-emoji-2.0.2" + sources."markdown-it-link-attributes-4.0.1" + sources."markdown-it-task-lists-2.1.1" sources."material-colors-1.2.6" sources."md5-2.3.0" + sources."mdurl-1.0.1" sources."media-typer-0.3.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.5" - sources."millisecond-0.1.2" sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" @@ -11174,13 +12487,43 @@ in ]; }) sources."minimist-1.2.7" - sources."minipass-3.3.5" - sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.4.1" - sources."minipass-flush-1.0.5" - sources."minipass-pipeline-1.2.4" - sources."minipass-sized-1.0.3" - sources."minizlib-2.1.2" + sources."minipass-4.0.1" + (sources."minipass-collect-1.0.2" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) + (sources."minipass-fetch-1.4.1" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) + (sources."minipass-flush-1.0.5" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) + (sources."minipass-pipeline-1.2.4" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) + (sources."minipass-sized-1.0.3" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."mkdirp-0.5.6" sources."mkdirp-classic-0.5.3" (sources."mock-require-3.0.3" // { @@ -11190,21 +12533,16 @@ in ]; }) sources."moment-2.29.4" - sources."moment-timezone-0.5.38" - sources."monaco-editor-0.30.1" - (sources."mongodb-4.11.0" // { - dependencies = [ - sources."denque-2.1.0" - ]; - }) - (sources."mongodb-connection-string-url-2.5.4" // { + sources."moment-timezone-0.5.40" + sources."monaco-editor-0.33.0" + sources."mongodb-4.13.0" + (sources."mongodb-connection-string-url-2.6.0" // { dependencies = [ sources."tr46-3.0.0" sources."webidl-conversions-7.0.0" sources."whatwg-url-11.0.0" ]; }) - sources."moo-0.5.2" (sources."mqtt-4.2.6" // { dependencies = [ sources."concat-stream-2.0.0" @@ -11213,9 +12551,11 @@ in }) sources."mqtt-packet-6.10.0" sources."ms-2.1.2" + sources."msal-1.4.17" + sources."msgpackr-1.8.3" (sources."mssql-8.1.4" // { dependencies = [ - sources."commander-9.4.1" + sources."commander-9.5.0" ]; }) sources."multer-1.4.5-lts.1" @@ -11223,22 +12563,34 @@ in (sources."mysql2-2.3.3" // { dependencies = [ sources."denque-2.1.0" + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" ]; }) sources."mz-2.7.0" - sources."n8n-core-0.140.1" - sources."n8n-design-system-0.40.0" - sources."n8n-editor-ui-0.166.1" - (sources."n8n-nodes-base-0.198.1" // { + (sources."n8n-core-0.153.0" // { + dependencies = [ + sources."concat-stream-2.0.0" + sources."readable-stream-3.6.0" + ]; + }) + (sources."n8n-design-system-0.52.0" // { + dependencies = [ + sources."argparse-2.0.1" + sources."markdown-it-12.3.2" + sources."vue2-boring-avatars-0.3.8" + ]; + }) + sources."n8n-editor-ui-0.180.0" + (sources."n8n-nodes-base-0.212.0" // { dependencies = [ sources."chokidar-3.5.2" ]; }) - sources."n8n-workflow-0.122.1" - (sources."named-placeholders-1.1.2" // { + sources."n8n-workflow-0.135.0" + (sources."named-placeholders-1.1.3" // { dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" + sources."lru-cache-7.14.1" ]; }) sources."nan-2.17.0" @@ -11247,25 +12599,21 @@ in sources."napi-build-utils-1.0.2" sources."native-duplexpair-1.0.0" sources."natural-orderby-2.0.3" - (sources."nearley-2.20.1" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."netmask-2.0.2" sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) - sources."node-abi-3.28.0" - sources."node-abort-controller-3.0.1" + sources."node-abi-3.31.0" + sources."node-abort-controller-3.1.1" sources."node-addon-api-4.3.0" sources."node-ensure-0.0.0" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.9" + sources."node-forge-1.3.1" (sources."node-gyp-8.4.1" // { dependencies = [ sources."are-we-there-yet-3.0.1" @@ -11275,9 +12623,9 @@ in sources."which-2.0.2" ]; }) - sources."node-gyp-build-4.5.0" - sources."node-html-markdown-1.2.2" - (sources."node-html-parser-6.1.1" // { + sources."node-gyp-build-4.6.0" + sources."node-html-markdown-1.3.0" + (sources."node-html-parser-6.1.4" // { dependencies = [ sources."css-select-5.1.0" sources."dom-serializer-2.0.0" @@ -11286,9 +12634,11 @@ in sources."entities-4.4.0" ]; }) + sources."node-machine-id-1.1.12" + sources."node-rsa-1.1.1" sources."node-ssh-12.0.5" sources."nodeify-1.0.1" - sources."nodemailer-6.8.0" + sources."nodemailer-6.9.1" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-wheel-1.0.1" @@ -11299,12 +12649,12 @@ in sources."oauth-1.0a-2.2.6" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" - sources."object-is-1.1.5" + sources."object-hash-3.0.0" + sources."object-inspect-1.12.3" sources."object-keys-1.1.1" sources."object-treeify-1.1.33" sources."object.assign-4.1.4" - sources."object.getownpropertydescriptors-2.1.4" + sources."object.getownpropertydescriptors-2.1.5" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -11324,6 +12674,7 @@ in sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" sources."p-map-2.1.0" + sources."p-queue-6.6.2" sources."p-timeout-3.2.0" sources."pac-proxy-agent-5.0.0" (sources."pac-resolver-5.0.1" // { @@ -11334,25 +12685,24 @@ in sources."packet-reader-1.0.0" (sources."param-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) - sources."parchment-2.0.0-dev.2" sources."parse-github-url-1.0.2" sources."parse-passwd-1.0.0" sources."parse-srcset-1.0.2" sources."parse5-6.0.1" sources."parse5-htmlparser2-tree-adapter-6.0.1" - sources."parseley-0.7.0" + sources."parseley-0.11.0" sources."parseurl-1.3.3" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) sources."passport-0.6.0" sources."passport-cookie-1.0.9" - sources."passport-jwt-4.0.0" + sources."passport-jwt-4.0.1" sources."passport-strategy-1.0.0" (sources."password-prompt-1.1.2" // { dependencies = [ @@ -11361,7 +12711,7 @@ in }) (sources."path-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) sources."path-dirname-1.0.2" @@ -11377,11 +12727,12 @@ in sources."debug-3.2.7" ]; }) + sources."peberminta-0.8.0" sources."peek-readable-4.1.0" sources."performance-now-2.1.0" - sources."pg-8.8.0" + sources."pg-8.9.0" sources."pg-connection-string-2.5.0" - sources."pg-cursor-2.7.4" + sources."pg-cursor-2.8.0" sources."pg-int8-1.0.1" sources."pg-minify-1.6.2" (sources."pg-native-3.0.1" // { @@ -11394,9 +12745,13 @@ in ]; }) sources."pg-pool-3.5.2" - sources."pg-promise-10.12.1" - sources."pg-protocol-1.5.0" - sources."pg-query-stream-4.2.4" + (sources."pg-promise-10.15.4" // { + dependencies = [ + sources."pg-8.8.0" + ]; + }) + sources."pg-protocol-1.6.0" + sources."pg-query-stream-4.3.0" sources."pg-types-2.2.0" (sources."pgpass-1.0.5" // { dependencies = [ @@ -11405,6 +12760,7 @@ in }) sources."picocolors-1.0.0" sources."picomatch-2.3.1" + sources."pinia-2.0.30" sources."popsicle-12.1.0" sources."popsicle-content-encoding-1.0.0" sources."popsicle-cookie-jar-1.0.0" @@ -11412,35 +12768,34 @@ in sources."popsicle-transport-http-1.2.1" sources."popsicle-transport-xhr-2.0.0" sources."popsicle-user-agent-1.0.0" - sources."postcss-8.4.18" + sources."postcss-8.4.21" 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."posthog-node-1.3.0" // { + (sources."posthog-node-2.4.0" // { dependencies = [ - sources."axios-0.24.0" - sources."ms-2.1.3" + sources."axios-0.27.2" ]; }) sources."prebuild-install-7.1.1" sources."prelude-ls-1.1.2" + sources."prettier-2.8.3" + sources."pretty-bytes-5.6.0" sources."printj-1.1.2" sources."prismjs-1.29.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."prom-client-13.2.0" sources."promise-1.3.0" - (sources."promise-ftp-1.3.5" // { - dependencies = [ - sources."bluebird-2.11.0" - ]; - }) + sources."promise-ftp-1.3.5" sources."promise-ftp-common-1.1.5" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."promise.prototype.finally-3.1.3" + sources."promise.prototype.finally-3.1.4" sources."property-expr-2.0.5" + sources."proto3-json-serializer-0.1.9" + sources."protobufjs-6.11.3" sources."proxy-addr-2.0.7" (sources."proxy-agent-5.0.0" // { dependencies = [ @@ -11457,23 +12812,14 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."python-struct-1.1.3" sources."qs-6.11.0" - sources."query-string-7.1.1" + sources."query-string-7.1.3" sources."querystring-0.2.0" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" - sources."quill-2.0.0-dev.4" - sources."quill-autoformat-0.1.2" - (sources."quill-delta-4.2.1" // { - dependencies = [ - sources."deep-equal-1.1.1" - ]; - }) sources."quoted-printable-1.0.1" - sources."railroad-diagrams-1.0.0" - sources."randexp-0.4.6" sources."random-bytes-1.0.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" @@ -11494,6 +12840,12 @@ in ]; }) sources."readdirp-3.6.0" + (sources."recast-0.21.5" // { + dependencies = [ + sources."ast-types-0.15.2" + sources."tslib-2.5.0" + ]; + }) sources."rechoir-0.6.2" sources."redeyed-2.1.1" sources."redis-3.1.2" @@ -11501,11 +12853,16 @@ in sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" sources."reflect-metadata-0.1.13" - sources."regenerator-runtime-0.13.10" + sources."regenerator-runtime-0.13.11" sources."regexp.prototype.flags-1.4.3" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" sources."remove-trailing-slash-0.1.1" + (sources."replacestream-4.0.3" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" @@ -11526,8 +12883,8 @@ in sources."resize-observer-polyfill-1.5.1" sources."resolve-1.22.1" sources."restore-cursor-3.1.0" - sources."ret-0.1.15" sources."retry-0.12.0" + sources."retry-request-4.2.2" sources."reusify-1.0.4" sources."rfdc-1.3.0" (sources."rhea-1.0.24" // { @@ -11543,18 +12900,23 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safe-regex-test-1.0.0" - sources."safe-stable-stringify-2.4.1" + sources."safe-stable-stringify-2.4.2" sources."safer-buffer-2.1.2" - (sources."sanitize-html-2.7.0" // { + (sources."sanitize-html-2.7.3" // { dependencies = [ - sources."deepmerge-4.2.2" + sources."deepmerge-4.3.0" ]; }) sources."sax-1.2.4" sources."sb-promise-queue-2.1.0" sources."sb-scandir-3.1.0" - sources."selderee-0.6.0" - sources."semver-7.3.8" + sources."selderee-0.10.0" + (sources."semver-7.3.8" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" + ]; + }) (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { @@ -11567,7 +12929,7 @@ in }) (sources."sentence-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) sources."seq-queue-0.0.5" @@ -11575,7 +12937,6 @@ in sources."serve-static-1.15.0" sources."servie-4.3.3" sources."set-blocking-2.0.0" - sources."setheader-1.0.2" sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" sources."shebang-command-1.2.0" @@ -11584,24 +12945,24 @@ in sources."shelljs-0.8.5" (sources."showdown-2.1.0" // { dependencies = [ - sources."commander-9.4.1" + sources."commander-9.5.0" ]; }) sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" sources."simple-get-4.0.1" - sources."simple-git-3.14.1" + sources."simple-git-3.16.0" sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" sources."slash-3.0.0" sources."smart-buffer-4.2.0" (sources."snake-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) - (sources."snowflake-sdk-1.6.14" // { + (sources."snowflake-sdk-1.6.18" // { dependencies = [ sources."axios-0.27.2" sources."debug-3.2.7" @@ -11614,7 +12975,9 @@ in sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."source-map-js-1.0.2" + sources."source-map-support-0.5.21" sources."spex-3.2.0" + sources."split-array-stream-2.0.0" sources."split-on-first-1.1.0" (sources."split2-3.2.2" // { dependencies = [ @@ -11623,9 +12986,9 @@ in }) sources."sprintf-js-1.0.3" sources."sql.js-1.8.0" - sources."sqlite3-5.1.2" + sources."sqlite3-5.1.4" sources."sqlstring-2.3.3" - sources."sse-channel-3.1.1" + sources."sse-channel-4.0.0" sources."ssf-0.11.2" sources."ssh2-1.11.0" (sources."ssh2-sftp-client-7.2.3" // { @@ -11635,21 +12998,33 @@ in ]; }) sources."sshpk-1.17.0" - sources."ssri-8.0.1" + (sources."ssri-8.0.1" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."stack-trace-0.0.10" sources."standard-as-callback-2.1.0" sources."static-eval-2.0.2" sources."statuses-2.0.1" sources."stealthy-require-1.1.1" sources."stoppable-1.1.0" + (sources."stream-browserify-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."stream-events-1.0.5" sources."stream-shift-1.0.1" sources."streamsearch-1.1.0" + sources."strict-event-emitter-types-2.0.0" sources."strict-uri-encode-2.0.0" sources."string-similarity-4.0.4" sources."string-width-4.2.3" sources."string.prototype.startswith-1.0.0" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" + sources."string.prototype.trimend-1.0.6" + sources."string.prototype.trimstart-1.0.6" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -11658,15 +13033,18 @@ in sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" sources."strtok3-6.3.0" + sources."stubs-3.0.0" sources."style-mod-4.0.0" sources."supports-color-7.2.0" sources."supports-hyperlinks-2.3.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."swagger-ui-dist-4.15.2" - sources."swagger-ui-express-4.5.0" - (sources."tar-6.1.11" // { + sources."swagger-ui-dist-4.15.5" + sources."swagger-ui-express-4.6.0" + sources."syslog-client-1.1.1" + (sources."tar-6.1.13" // { dependencies = [ sources."mkdirp-1.0.4" + sources."yallist-4.0.0" ]; }) (sources."tar-fs-2.1.1" // { @@ -11689,6 +13067,12 @@ in sources."sprintf-js-1.1.2" ]; }) + (sources."teeny-request-7.2.0" // { + dependencies = [ + sources."@tootallnate/once-2.0.0" + sources."http-proxy-agent-5.0.0" + ]; + }) sources."test-console-2.0.0" sources."text-hex-1.0.0" sources."thenify-3.3.1" @@ -11699,8 +13083,13 @@ 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.231.0" + sources."tinycolor2-1.5.2" + (sources."title-case-3.0.3" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) + sources."tlds-1.236.0" sources."tmp-0.0.33" (sources."tmp-promise-3.0.3" // { dependencies = [ @@ -11714,8 +13103,17 @@ in sources."toposort-2.0.2" sources."tough-cookie-3.0.1" sources."tr46-0.0.3" + (sources."transliteration-2.3.5" // { + dependencies = [ + sources."cliui-8.0.1" + sources."wrap-ansi-7.0.0" + sources."yargs-17.6.2" + sources."yargs-parser-21.1.1" + ]; + }) sources."triple-beam-1.3.0" sources."ts-expect-1.3.0" + sources."ts-node-10.9.1" sources."tslib-1.14.1" sources."tsscmp-1.0.6" sources."tunnel-0.0.6" @@ -11724,32 +13122,50 @@ in sources."type-check-0.3.2" sources."type-fest-0.21.3" sources."type-is-1.6.18" + sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" - (sources."typeorm-0.2.45" // { + (sources."typeorm-0.3.11" // { dependencies = [ - sources."@types/node-12.20.55" + sources."@azure/core-tracing-1.0.0-preview.12" + sources."@azure/identity-1.5.2" + sources."@azure/msal-common-4.5.1" + sources."@azure/msal-node-1.0.0-beta.6" + sources."@js-joda/core-3.2.0" sources."argparse-2.0.1" sources."bl-2.2.1" sources."bson-1.1.6" sources."buffer-6.0.3" - sources."iconv-lite-0.5.2" + sources."cliui-8.0.1" + sources."dotenv-16.0.3" sources."js-yaml-4.1.0" sources."jsbi-3.2.5" - sources."mkdirp-1.0.4" - sources."mongodb-3.7.3" - sources."mssql-6.4.1" - sources."readable-stream-3.6.0" - sources."sprintf-js-1.1.2" - sources."tarn-1.1.5" - (sources."tedious-6.7.1" // { + (sources."jsonwebtoken-8.5.1" // { dependencies = [ - sources."bl-3.0.1" + sources."jws-3.2.2" ]; }) - sources."tslib-2.4.0" + sources."jwa-2.0.0" + sources."jws-4.0.0" + sources."mkdirp-1.0.4" + sources."mongodb-3.7.3" + sources."mssql-7.3.5" + sources."node-abort-controller-2.0.0" + sources."readable-stream-3.6.0" + sources."semver-5.7.1" + sources."sprintf-js-1.1.2" + (sources."tedious-11.8.0" // { + dependencies = [ + sources."bl-5.1.0" + ]; + }) + sources."tslib-2.5.0" + sources."wrap-ansi-7.0.0" + sources."yargs-17.6.2" + sources."yargs-parser-21.1.1" ]; }) sources."typeorm-aurora-data-api-driver-2.4.4" + sources."typescript-4.9.5" sources."uc.micro-1.0.6" sources."uid-safe-2.1.5" sources."unbox-primitive-1.0.2" @@ -11763,12 +13179,12 @@ in sources."unpipe-1.0.0" (sources."upper-case-2.0.2" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) (sources."upper-case-first-2.0.2" // { dependencies = [ - sources."tslib-2.4.0" + sources."tslib-2.5.0" ]; }) sources."uri-js-4.4.1" @@ -11778,6 +13194,7 @@ in ]; }) sources."url-parse-1.5.10" + sources."url-value-parser-2.2.0" (sources."urllib-2.40.0" // { dependencies = [ sources."debug-2.6.9" @@ -11802,6 +13219,7 @@ in sources."uuencode-0.0.4" sources."uuid-8.3.2" sources."v-click-outside-3.2.0" + sources."v8-compile-cache-lib-3.0.1" sources."validator-13.7.0" sources."vary-1.1.2" (sources."verror-1.10.0" // { @@ -11809,28 +13227,28 @@ in sources."core-util-is-1.0.2" ]; }) - sources."vm2-3.9.11" - sources."vue-2.7.13" + sources."vm2-3.9.13" + sources."vue-2.7.14" sources."vue-agile-2.0.0" sources."vue-color-2.8.1" + sources."vue-demi-0.13.11" sources."vue-fragment-1.5.1" - sources."vue-i18n-8.27.2" - sources."vue-json-pretty-1.9.2" + sources."vue-i18n-8.28.2" + sources."vue-infinite-loading-2.4.5" + sources."vue-json-pretty-1.9.3" sources."vue-prism-editor-0.3.0" sources."vue-router-3.6.5" - sources."vue-template-compiler-2.7.13" + sources."vue-template-compiler-2.7.14" sources."vue-typed-mixins-0.2.0" sources."vue2-boring-avatars-0.3.4" sources."vue2-teleport-1.0.1" sources."vue2-touch-events-3.2.2" - sources."vuex-3.6.2" sources."w3c-keyname-2.2.6" 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."which-collection-1.0.1" - sources."which-typed-array-1.1.8" + sources."which-typed-array-1.1.9" sources."wide-align-1.1.5" sources."widest-line-3.1.0" (sources."win-release-1.1.1" // { @@ -11867,13 +13285,12 @@ in }) sources."xtend-4.0.2" sources."y18n-5.0.8" - sources."yallist-4.0.0" + sources."yallist-2.1.2" sources."yamljs-0.3.0" sources."yargs-17.1.1" sources."yargs-parser-20.2.9" + sources."yn-3.1.1" sources."yup-0.32.11" - sources."zen-observable-0.8.15" - sources."zen-observable-ts-1.2.5" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index ccaf3e0bbbb8..df3bc9f9f236 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -11,12 +11,14 @@ stdenv.mkDerivation rec { sha256 = "0niri5q9qyyyw5lmjpxk19pv3v4srjvmvyd5k6ks99mvqczjx9c0"; }; + nativeBuildInputs = [ gzip ]; + makeFlags = [ "PREFIX=$(out)" ]; preConfigure = '' - substituteInPlace Makefile --replace /bin/gzip ${gzip}/bin/gzip + substituteInPlace Makefile --replace /bin/gzip gzip ''; postInstall = '' diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix new file mode 100644 index 000000000000..4268191b42ff --- /dev/null +++ b/pkgs/applications/networking/netmaker/default.nix @@ -0,0 +1,44 @@ +{ buildGoModule +, fetchFromGitHub +, installShellFiles +, lib +, libglvnd +, pkg-config +, subPackages ? ["." "netclient"] +, xorg +}: + +buildGoModule rec { + pname = "netmaker"; + version = "0.17.1"; + + src = fetchFromGitHub { + owner = "gravitl"; + repo = pname; + rev = "v${version}"; + hash = "sha256-8uxPPhy1/FqPGouqzUxY2lGnO/giqH9bJbAqQ9rZI0g="; + }; + + vendorHash = "sha256-4LaGwwDu3pKd6I6r/F3isCi9CuFqPGvc5SdVTV34qOI="; + + inherit subPackages; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libglvnd + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXinerama + xorg.libXrandr + ]; + + meta = with lib; { + description = "WireGuard automation from homelab to enterprise"; + homepage = "https://netmaker.io"; + changelog = "https://github.com/gravitl/netmaker/-/releases/v${version}"; + license = licenses.sspl; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index b96d906fc96b..24500423829f 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.14-RC2"; + version = "1.14.0"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "UTK82s+7bzL+SyT40qDsqX8KTkITTpWtR/0VY/+OpcA="; + sha256 = "uC3ksJ4nNXBjQYqNOS4qK6aCK6/Wzf27YXHbM73TpdU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/newsreaders/raven-reader/default.nix b/pkgs/applications/networking/newsreaders/raven-reader/default.nix index 360a93b5eddd..4cfcfabe3d8f 100644 --- a/pkgs/applications/networking/newsreaders/raven-reader/default.nix +++ b/pkgs/applications/networking/newsreaders/raven-reader/default.nix @@ -2,10 +2,10 @@ let pname = "raven-reader"; - version = "1.0.74"; + version = "1.0.78"; src = fetchurl { url = "https://github.com/hello-efficiency-inc/raven-reader/releases/download/v${version}/Raven-Reader-${version}.AppImage"; - sha256 = "sha256-BwJK0V19aLpTRa/7wzlWdALiJrOhfejCkKCGrZyA5EQ="; + sha256 = "sha256-H9V2zTD80fBuIuNZnGDR21IYAAl/b6iYrde5rfsMECQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index e49ffe15ee28..b29d9f494b04 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -20,13 +20,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-slang=${slang.dev}" "--with-ssl=${openssl.dev}" + "--with-slrnpull" ]; buildInputs = [ slang ncurses openssl ]; meta = with lib; { description = "The slrn (S-Lang read news) newsreader"; - homepage = "http://slrn.sourceforge.net/index.html"; + homepage = "https://slrn.sourceforge.net/index.html"; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 30376e57da79..e409551f1232 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.6.2"; + version = "3.6.6"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-eTcQrbYYY+V87i6PuIEWCFczIqL8oxtdojPY/mZpJBU="; + sha256 = "sha256-P3LSgrcMZZM0OY3yQz8t3Cf5spJJTB+JTIpoT9U3+xc="; }; patches = [ @@ -82,6 +82,7 @@ mkDerivation rec { ]; cmakeFlags = [ + "-DBUILD_UPDATER=off" "-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH "-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit ]; diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index d3d6d5aa8069..c17c65e14fe2 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.11"; + version = "1.39.4"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-BOmu4OjDq1IwsPjbqzV2OtvKpaYFqP/XdYL2Ug28TbU="; + sha256 = "sha256-7inMloKU/AL4s/p171xCzs4p4+AcLsvsbVsELK9vhFc="; }; - vendorSha256 = "sha256-M2PlvUsEG3Um+NqbpHdtu9g+Gj6jSXZ9YZ7t1MwjjdI="; + vendorHash = "sha256-pCta8FzGVpl9fvnnjQ7/e2x/HolXAuxnz0vwKejGk98="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/applications/networking/novnc/default.nix b/pkgs/applications/networking/novnc/default.nix index 818e8764dd99..17d32b84a78f 100644 --- a/pkgs/applications/networking/novnc/default.nix +++ b/pkgs/applications/networking/novnc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "novnc"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "novnc"; repo = "noVNC"; rev = "v${version}"; - sha256 = "sha256-Z+bks7kcwj+Z3uf/t0u25DnGOM60QhSH6uuoIi59jqU="; + sha256 = "sha256-G7Rtv7pQFR9UrzhYXDyBf+FRqtjo5NAXU7m/HeXhI1k="; }; patches = with python3.pkgs; [ diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index 2d23ece5e45c..49193a384a63 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -94,7 +94,7 @@ rec { obfs4 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index b5bb12da0ec5..507d2a282e4b 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -57,7 +57,7 @@ let wrapGAppsHook ]; - checkInputs = with pypkgs; [ + nativeCheckInputs = with pypkgs; [ pytestCheckHook pytest-twisted pytest-cov diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index a08ea4b8bbc2..05cc0466264f 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -1,72 +1,58 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, ant, jdk, bash, coreutils, substituteAll }: +{ lib, stdenv, fetchurl, jdk, bash, coreutils, substituteAll, nixosTests, jna }: let + version = "build01494"; freenet_ext = fetchurl { - url = "https://downloads.freenetproject.org/latest/freenet-ext.jar"; - sha256 = "17ypljdvazgx2z6hhswny1lxfrknysz3x6igx8vl3xgdpvbb7wij"; + url = "https://github.com/freenet/fred/releases/download/${version}/freenet-ext.jar"; + sha256 = "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158="; }; - - bcprov_version = "jdk15on-154"; bcprov = fetchurl { - url = "https://www.bouncycastle.org/download/bcprov-ext-${bcprov_version}.jar"; - sha256 = "0abmhg2h44g8c5p7skzqwfxj8xwcjh9vs84mc0hr78k1am0633jk"; + url = "https://github.com/freenet/fred/releases/download/${version}/bcprov-jdk15on-1.59.jar"; + sha256 = "sha256-HDHkTjMdJeRtKTs+juLQcCimfbAR50yyRDKFrtHVnIU="; }; seednodes = fetchurl { url = "https://downloads.freenetproject.org/alpha/opennet/seednodes.fref"; sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv"; }; - version = "build01480"; freenet-jars = stdenv.mkDerivation { pname = "freenet-jars"; inherit version; - src = fetchFromGitHub { - owner = "freenet"; - repo = "fred"; - rev = version; - sha256 = "0wddkfyhsgs7bcq9svicz6l0a35yv82yqzmji3c345hg4hbch3kb"; + src = fetchurl { + url = "https://github.com/freenet/fred/releases/download/${version}/freenet.jar"; + sha256 = "sha256-1Pjc8Ob4EN7N05QkGTMKBn7z3myTDaQ98N48nNSLstg="; }; - patchPhase = '' - cp ${freenet_ext} lib/freenet/freenet-ext.jar - cp ${bcprov} lib/bcprov-${bcprov_version}.jar - - sed '/antcall.*-ext/d' -i build.xml - sed 's/@unknown@/${version}/g' -i build-clean.xml - ''; - - buildInputs = [ ant jdk ]; - - buildPhase = "ant package-only"; + dontUnpack = true; installPhase = '' mkdir -p $out/share/freenet - cp lib/bcprov-${bcprov_version}.jar $out/share/freenet - cp lib/freenet/freenet-ext.jar $out/share/freenet - cp dist/freenet.jar $out/share/freenet + ln -s ${bcprov} $out/share/freenet/bcprov.jar + ln -s ${freenet_ext} $out/share/freenet/freenet-ext.jar + ln -s ${jna}/share/java/jna-platform.jar $out/share/freenet/jna_platform.jar + ln -s ${jna}/share/java/jna.jar $out/share/freenet/jna.jar + ln -s $src $out/share/freenet/freenet.jar ''; }; in stdenv.mkDerivation { - name = "freenet-${version}"; + pname = "freenet"; inherit version; src = substituteAll { src = ./freenetWrapper; - inherit bash coreutils seednodes bcprov_version; + inherit bash coreutils jdk seednodes; freenet = freenet-jars; - jre = jdk.jre; }; - jars = freenet-jars; - dontUnpack = true; + passthru.tests = { inherit (nixosTests) freenet; }; + installPhase = '' mkdir -p $out/bin - cp $src $out/bin/freenet - chmod +x $out/bin/freenet + install -Dm555 $src $out/bin/freenet ln -s ${freenet-jars}/share $out/share ''; @@ -75,7 +61,8 @@ in stdenv.mkDerivation { homepage = "https://freenetproject.org/"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ nagy ]; platforms = with lib.platforms; linux; + changelog = "https://github.com/freenet/fred/blob/build${version}/NEWS.md"; }; } diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/applications/networking/p2p/freenet/freenetWrapper index f3106265801f..76faf601e69c 100755 --- a/pkgs/applications/networking/p2p/freenet/freenetWrapper +++ b/pkgs/applications/networking/p2p/freenet/freenetWrapper @@ -1,18 +1,17 @@ #! @bash@/bin/bash - +set -eo pipefail PATH=@coreutils@/bin:$PATH +export CLASSPATH=@freenet@/share/freenet/bcprov.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/jna_platform.jar:@freenet@/share/freenet/jna.jar:@freenet@/share/freenet/freenet.jar export FREENET_HOME="$HOME/.local/share/freenet" -if [ -n "$XDG_DATA_HOME" ] - then export FREENET_HOME="$XDG_DATA_HOME/freenet" +if [ -n "$XDG_DATA_HOME" ] ; then + FREENET_HOME="$XDG_DATA_HOME/freenet" fi -if [ ! -d $FREENET_HOME ]; then - mkdir -p $FREENET_HOME -fi +mkdir -p -- $FREENET_HOME -cp -u @seednodes@ $FREENET_HOME/seednodes.fref -chmod u+rw $FREENET_HOME/seednodes.fref +cp -u -- @seednodes@ $FREENET_HOME/seednodes.fref +chmod u+rw -- $FREENET_HOME/seednodes.fref -cd $FREENET_HOME -@jre@/bin/java -cp @freenet@/share/freenet/bcprov-@bcprov_version@.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/freenet.jar -Xmx1024M freenet.node.NodeStarter +cd -- $FREENET_HOME +exec @jdk@/bin/java -Xmx1024M freenet.node.NodeStarter "$@" diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix index df314b6591c2..91a078590bf2 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ gtest ]; diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix index ac7e15b6a2e5..7acfee3671da 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD ''; - checkInputs = [ + nativeCheckInputs = [ gtest ]; diff --git a/pkgs/applications/networking/p2p/lokinet/default.nix b/pkgs/applications/networking/p2p/lokinet/default.nix index 9b1421efa88a..574380ed697d 100644 --- a/pkgs/applications/networking/p2p/lokinet/default.nix +++ b/pkgs/applications/networking/p2p/lokinet/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "lokinet"; - version = "0.9.10"; + version = "0.9.11"; src = fetchFromGitHub { owner = "oxen-io"; repo = "lokinet"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; - sha256 = "sha256-dLkIFp1yz5MgUDxYQHN4zv2mexEb4GfkxlTOZyECsew="; + hash = "sha256-aVFLDGTbRUOw2XWDpl+ojwHBG7c0miGeoKMLwMpqVtg="; }; nativeBuildInputs = [ @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Anonymous, decentralized and IP based overlay network for the internet"; homepage = "https://lokinet.org/"; + changelog = "https://github.com/oxen-io/lokinet/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ wyndon ]; }; diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 6c5ebdb91335..1291caa088ff 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { url = "https://github.com/ygrek/mldonkey/pull/66/commits/20ff84c185396f3d759cf4ef46b9f0bd33a51060.patch"; hash = "sha256-MCqx0jVfOaLkZhhv0b1cTdO6BK2/f6TxTWmx+NZjXME="; }) + # Fixes OCaml 4.12 compat + (fetchpatch { + url = "https://github.com/ygrek/mldonkey/commit/a153f0f7a4826d86d51d4bacedc0330b70fcbc34.patch"; + hash = "sha256-/Muk3mPFjQJ48FqaozGa7o8YSPhDLXRz9K1EyfxlzC8="; + }) ]; preConfigure = '' @@ -22,13 +27,9 @@ stdenv.mkDerivation rec { '${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4' ''; - buildInputs = (with ocamlPackages; [ - ocaml - camlp4 - num - ]) ++ [ - zlib - ]; + strictDeps = true; + nativeBuildInputs = with ocamlPackages; [ ocaml camlp4]; + buildInputs = (with ocamlPackages; [ num ]) ++ [ zlib ]; meta = { broken = stdenv.isDarwin; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 1b4f12874dbd..319a5e7f0dc8 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkg-config +{ mkDerivation, lib, stdenv, fetchFromGitHub, pkg-config , boost, libtorrent-rasterbar, qtbase, qttools, qtsvg , debugSupport ? false , guiSupport ? true, dbus ? null # GUI (disable to run headless) @@ -9,7 +9,6 @@ assert guiSupport -> (dbus != null); assert trackerSearch -> (python3 != null); -with lib; mkDerivation rec { pname = "qbittorrent"; version = "4.4.5"; @@ -27,8 +26,8 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ] - ++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support - ++ optional trackerSearch python3; + ++ lib.optional guiSupport dbus # D(esktop)-Bus depends on GUI support + ++ lib.optional trackerSearch python3; # Otherwise qm_gen.pri assumes lrelease-qt5, which does not exist. QMAKE_LRELEASE = "lrelease"; @@ -36,18 +35,24 @@ mkDerivation rec { configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--with-boost=${boost.dev}" ] - ++ optionals (!guiSupport) [ "--disable-gui" "--enable-systemd" ] # Also place qbittorrent-nox systemd service files - ++ optional (!webuiSupport) "--disable-webui" - ++ optional debugSupport "--enable-debug"; + ++ lib.optionals (!guiSupport) [ "--disable-gui" "--enable-systemd" ] # Also place qbittorrent-nox systemd service files + ++ lib.optional (!webuiSupport) "--disable-webui" + ++ lib.optional debugSupport "--enable-debug"; - qtWrapperArgs = optional trackerSearch "--prefix PATH : ${makeBinPath [ python3 ]}"; + qtWrapperArgs = lib.optional trackerSearch "--prefix PATH : ${lib.makeBinPath [ python3 ]}"; - meta = { + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin} + cp -R src/qbittorrent.app $out/Applications + makeWrapper $out/{Applications/qbittorrent.app/Contents/MacOS,bin}/qbittorrent + ''; + + meta = with lib; { description = "Featureful free software BitTorrent client"; homepage = "https://www.qbittorrent.org/"; changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${version}/Changelog"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ Anton-Latukha ]; }; } diff --git a/pkgs/applications/networking/p2p/rqbit/default.nix b/pkgs/applications/networking/p2p/rqbit/default.nix index 40f6f1ed4edb..1364acc16cce 100644 --- a/pkgs/applications/networking/p2p/rqbit/default.nix +++ b/pkgs/applications/networking/p2p/rqbit/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rqbit"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "ikatson"; repo = "rqbit"; rev = "v${version}"; - sha256 = "sha256-PkU3QJvAK2b1KQC1o5md35iucjq+SYoKAGxqiojf4rw="; + sha256 = "sha256-AzlYeHPCDri/FxAh5R5AES+OAfzhwqB8/ewRwDU1nnU="; }; - cargoSha256 = "sha256-Jj2CK3nwktv2MU+EHXzQ/lKDUlC+4HkaItMTtoGF1Pw="; + cargoSha256 = "sha256-CqEnQNbwiB6+zM8gWhplvFPblKp+mPMAtnHP8JZiKv4="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index dce6baa438fb..21c59e84a445 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { setproctitle ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ asynctest pytestCheckHook ]; diff --git a/pkgs/applications/networking/p2p/storrent/default.nix b/pkgs/applications/networking/p2p/storrent/default.nix index 4c96200cc686..a21a9fef3855 100644 --- a/pkgs/applications/networking/p2p/storrent/default.nix +++ b/pkgs/applications/networking/p2p/storrent/default.nix @@ -1,22 +1,25 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - pname = "storrent-unstable"; - version = "2021-10-10"; + pname = "storrent"; + version = "unstable-2023-01-14"; src = fetchFromGitHub { owner = "jech"; repo = "storrent"; - rev = "681733cf74de08bea251ada672ea8c666eb1b679"; - sha256 = "0grrqgawswb44fahf40060jl691rlyccwlqkljvgy8mzzw1kjzj4"; + rev = "86270ee777a19a521f8898a179485e0347f90ce0"; + hash = "sha256-JYNtuyk4hhe1jZgY/5Bz91Ropdw/U7n1VKHYkdUjZ0I="; }; - vendorSha256 = "0sz2fz7bqgwd5i7sacyxs7bmb8ly6xrxrakqi9c446vzlkh898hj"; + vendorHash = "sha256-iPKZPXsa6ya29N/u9QYd5LAm42+FtHZLGStRDxsAxe4="; + + ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://github.com/jech/storrent"; description = "An implementation of the BitTorrent protocol that is optimised for streaming media"; license = licenses.mit; + platforms = platforms.linux; maintainers = [ maintainers.marsam ]; }; } diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/applications/networking/p2p/torrential/default.nix index 50dd38d8d246..4cf4e1becf05 100644 --- a/pkgs/applications/networking/p2p/torrential/default.nix +++ b/pkgs/applications/networking/p2p/torrential/default.nix @@ -66,9 +66,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 3cf59928ca90..8d605877a62e 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchurl , cmake , pkg-config , openssl @@ -16,6 +15,7 @@ , miniupnpc , dht , libnatpmp +, libiconv # Build options , enableGTK3 ? false , gtk3 @@ -24,7 +24,7 @@ , enableQt ? false , qt5 , nixosTests -, enableSystemd ? stdenv.isLinux +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , enableDaemon ? true , enableCli ? true , installLib ? false @@ -46,14 +46,6 @@ in stdenv.mkDerivation { fetchSubmodules = true; }; - patches = [ - # fix build with openssl 3.0 - (fetchurl { - url = "https://salsa.debian.org/debian/transmission/-/raw/debian/3.00-2.1/debian/patches/openssl3-compat.patch"; - hash = "sha256-v+SDTW/lCtc8B3TuhQB1pmjW/QRAGLtYncaImNNwpes="; - }) - ]; - outputs = [ "out" "apparmor" ]; cmakeFlags = @@ -93,7 +85,7 @@ in stdenv.mkDerivation { ++ lib.optionals enableGTK3 [ gtk3 xorg.libpthreadstubs ] ++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals stdenv.isLinux [ inotify-tools ] - ; + ++ lib.optionals stdenv.isDarwin [ libiconv ]; postInstall = '' mkdir $apparmor diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index e74db03b5332..5bc1cb726443 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -8,8 +8,7 @@ }: let - libtorrent = (python3.pkgs.toPythonModule ( - libtorrent-rasterbar-1_2_x.override { python = python3; })).python; + libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python; in stdenv.mkDerivation rec { pname = "tribler"; diff --git a/pkgs/applications/networking/p2p/xd/default.nix b/pkgs/applications/networking/p2p/xd/default.nix index 779de53d3c5d..b73c962240fc 100644 --- a/pkgs/applications/networking/p2p/xd/default.nix +++ b/pkgs/applications/networking/p2p/xd/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-mJZRk3p+D3tCKIYggD5jVBXcKqJotEexljDzLKpn4/E="; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; postInstall = '' ln -s $out/bin/XD $out/bin/XD-CLI diff --git a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix index f04a3e07a052..75e7981af5b2 100644 --- a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix +++ b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "zeronet-conservancy"; - version = "0.7.7"; + version = "0.7.8.1"; format = "other"; src = fetchFromGitHub { owner = "zeronet-conservancy"; repo = "zeronet-conservancy"; rev = "v${version}"; - sha256 = "sha256-6qBdq6DoIKZUUGflz7kWu3S3pMJB4vkGUytpU5EatP0="; + sha256 = "sha256-+wZiwUy5bmW8+3h4SuvNN8I6mCIPOlOeFmiXlMu12OU="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 21b75cfe8846..13175aaca671 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -15,23 +15,35 @@ # ^1 https://github.com/NixOS/nixpkgs/issues/69338 { - # Build dependencies - appimageTools, autoPatchelfHook, fetchzip, lib, stdenv + # Build dependencies + appimageTools +, autoPatchelfHook +, fetchzip +, lib +, stdenv - # Runtime dependencies; - # A few additional ones (e.g. Node) are already shipped together with the - # AppImage, so we don't have to duplicate them here. -, alsa-lib, dbus-glib, fuse, gsettings-desktop-schemas, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev + # Runtime dependencies; + # A few additional ones (e.g. Node) are already shipped together with the + # AppImage, so we don't have to duplicate them here. +, alsa-lib +, dbus-glib +, fuse +, gsettings-desktop-schemas +, gtk3 +, libdbusmenu-gtk2 +, libXdamage +, nss +, udev }: let pname = "pcloud"; - version = "1.9.9"; - code = "XZWTVkVZQM0GNXA4hrFGPkefzUUWVLKOpPIX"; + version = "1.10.0"; + code = "XZCy4sVZGb7r8VpDE4SCv2QI3OYx1HYChIvy"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip"; - hash = "sha256-8566vKrE3/QCm4qW9KxEAO+r+YfMRYOhV2Da7qic48M="; + hash = "sha256-kzID1y/jVuqFfD/PIUR2TFa0AvxKVcfNQ4ZXiHx0gRk="; }; appimageContents = appimageTools.extractType2 { @@ -39,7 +51,8 @@ let src = "${src}/pcloud"; }; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { inherit pname version; src = appimageContents; diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index f134474006ec..eae9a8a3d87a 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,27 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, openssl +, libsamplerate +, alsa-lib +, AppKit +}: stdenv.mkDerivation rec { pname = "pjsip"; - version = "2.12.1"; + version = "2.13"; src = fetchFromGitHub { owner = pname; repo = "pjproject"; rev = version; - sha256 = "sha256-HIDL4xzzTu3irzrIOf8qSNCAvHGOMpi8EDeqZb8mMnc="; + sha256 = "sha256-yzszmm3uIyXtYFgZtUP3iswLx4u/8UbFt80Ln25ToFE="; }; patches = [ ./fix-aarch64.patch (fetchpatch { - name = "CVE-2022-39269.patch"; - url = "https://github.com/pjsip/pjproject/commit/d2acb9af4e27b5ba75d658690406cec9c274c5cc.patch"; - sha256 = "sha256-bKE/MrRAqN1FqD2ubhxIOOf5MgvZluHHeVXPjbR12iQ="; + name = "CVE-2022-23537.patch"; + url = "https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1.patch"; + sha256 = "sha256-7ueQCHIiJ7MLaWtR4+GmBc/oKaP+jmEajVnEYqiwLRA="; }) (fetchpatch { - name = "CVE-2022-39244.patch"; - url = "https://github.com/pjsip/pjproject/commit/c4d34984ec92b3d5252a7d5cddd85a1d3a8001ae.patch"; - sha256 = "sha256-hTUMh6bYAizn6GF+sRV1vjKVxSf9pnI+eQdPOqsdJI4="; + name = "CVE-2022-23547.patch"; + url = "https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36.patch"; + sha256 = "sha256-bpc8e8VAQpfyl5PX96G++6fzkFpw3Or1PJKNPKl7N5k="; }) ]; diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix index 1fc698fe1900..fe0112a4aaef 100644 --- a/pkgs/applications/networking/powerdns-admin/default.nix +++ b/pkgs/applications/networking/powerdns-admin/default.nix @@ -9,13 +9,7 @@ let hash = "sha256-e11u0jdJr+2TDXvBAPlDfnuuDwSfBq+JtvnDUTNKp/c="; }; - python = python3.override { - packageOverrides = self: super: { - # The bravado-core dependency is incompatible with jschonschema 4.0: - # https://github.com/Yelp/bravado-core/pull/385 - jsonschema = super.jsonschema_3; - }; - }; + python = python3; pythonDeps = with python.pkgs; [ flask flask_assets flask-login flask-sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index a7954bcc575e..bdf75f6440e2 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 = "2.1.3"; + version = "2.3.0"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "br-${version}"; - sha256 = "sha256-+XeNhjwtH1T5p8iydMQk22nXztyamSn6yY56/qqvkmk="; + sha256 = "sha256-7p+Q6/BphE/dxNQe+gfcIty6TAWHUcPpvSJWfmf4OQg="; }; - vendorSha256 = "sha256-YTGjiteYfuRkDC4M9c/JKqURq4WiC5n9pFRqRVYhyxU="; + vendorSha256 = "sha256-dhrn6xQ0IJzBYeO6ko2PUCO+idopC2An0ylqCnx5jKg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix index 3e6dfb1a7d22..af55fef18c73 100644 --- a/pkgs/applications/networking/qv2ray/default.nix +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -2,7 +2,7 @@ , stdenv , mkDerivation , fetchFromGitHub -, qmake +, symlinkJoin , qttools , cmake , clang_8 @@ -14,29 +14,40 @@ , libGL , zlib , curl +, v2ray +, v2ray-geoip, v2ray-domain-list-community +, assets ? [ v2ray-geoip v2ray-domain-list-community ] }: mkDerivation rec { pname = "qv2ray"; - version = "2.7.0"; + version = "unstable-2022-09-25"; src = fetchFromGitHub { owner = "Qv2ray"; repo = "Qv2ray"; - rev = "v${version}"; - sha256 = "sha256-afFTGX/zrnwq/p5p1kj+ANU4WeN7jNq3ieeW+c+GO5M="; + rev = "fb44fb1421941ab192229ff133bc28feeb4a8ce5"; + sha256 = "sha256-TngDgLXKyAoQFnXpBNaz4QjfkVwfZyuQwatdhEiI57U="; fetchSubmodules = true; }; - patchPhase = lib.optionals stdenv.isDarwin '' + postPatch = lib.optionals stdenv.isDarwin '' substituteInPlace cmake/platforms/macos.cmake \ --replace \''${QV2RAY_QtX_DIR}/../../../bin/macdeployqt macdeployqt ''; + assetsDrv = symlinkJoin { + name = "v2ray-assets"; + paths = assets; + }; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DQV2RAY_DISABLE_AUTO_UPDATE=on" + "-DQV2RAY_USE_V5_CORE=on" "-DQV2RAY_TRANSLATION_PATH=${placeholder "out"}/share/qv2ray/lang" + "-DQV2RAY_DEFAULT_VASSETS_PATH='${assetsDrv}/share/v2ray'" + "-DQV2RAY_DEFAULT_VCORE_PATH='${v2ray}/bin/v2ray'" ]; preConfigure = '' @@ -55,21 +66,19 @@ mkDerivation rec { nativeBuildInputs = [ cmake - - # The default clang_7 will result in reproducible ICE. - clang_8 - pkg-config - qmake qttools curl - ]; + # The default clang_7 will result in reproducible ICE. + ] ++ lib.optional (stdenv.isDarwin) clang_8; meta = with lib; { description = "An GUI frontend to v2ray"; - homepage = "https://qv2ray.github.io/en/"; - license = licenses.gpl3; - maintainers = with maintainers; [ poscat ]; + homepage = "https://github.com/Qv2ray/Qv2ray"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ poscat rewine ]; platforms = platforms.all; + # never built on aarch64-darwin, x86_64-darwin since update to unstable-2022-09-25 + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 9f4fa9ce751a..4acc2c57f19f 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -13,49 +13,6 @@ let # # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/ supportedVersions = lib.mapAttrs mkVersionInfo { - "21.01.0" = { - major = "21"; - minor = "1"; - patch = "0"; - x64hash = "01m9g1bs6iiqbd778gjps2zznvqijlyn3mfw38aa0w1rr6ms326a"; - x86hash = "1mmx5r3wi9i6bwh4kdlpw446m8kijkaar8shi0q1n21fv0ygg3r5"; - x64suffix = "14"; - x86suffix = "14"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2101.html"; - }; - - "21.03.0" = { - major = "21"; - minor = "3"; - patch = "0"; - x64hash = "004pgvxl81l99sqvrs5xzvjivjlc21rrlm2gky9hmbsm53nsl3zc"; - x86hash = "11nn9734a515dm1q880z9wmhvx8ikyh3riayyn42z22q4kd852n3"; - x64suffix = "38"; - x86suffix = "38"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2103.html"; - }; - - "21.06.0" = { - major = "21"; - minor = "6"; - patch = "0"; - x64hash = "f3f98c60b0aaac31eb44dc98f22ee7ae7df229c960d5d29785eb5e9554f85f68"; - x86hash = "c2d9652ad9488a9ff171e62df8455ebe6890bcfade1cc289893ee35322d9d812"; - x64suffix = "28"; - x86suffix = "28"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2106.html"; - }; - - "21.08.0" = { - major = "21"; - minor = "8"; - patch = "0"; - x64hash = "69ddae29cc8b4b68341c3d9503a54ee70ab58a5795fd83e79573f013eda5518c"; - x86hash = "b6d1bde5a8533f22374e1f5bbb3f5949e5b89773d0703e021fbe784b455aad3f"; - x64suffix = "40"; - x86suffix = "40"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2108.html"; - }; "21.09.0" = { major = "21"; @@ -94,10 +51,21 @@ let major = "22"; minor = "7"; patch = "0"; - x64hash = "a17e4478ad3eac4b0cbc9fb7be0dba2758393ba2d3b6a82b3074ff053586c5f5"; - x86hash = "f08d9c83a1af7873cbb864b26ec24d731fdc2e5045adee982eeef4083982c5bc"; - x64suffix = "20"; - x86suffix = "20"; + x64hash = "ba88490e457e0fe6c610778396e40293067173c182f2343c8c1fda5e2444985c"; + x86hash = "ed9ff8b3be968cacaf6121c783326091899b987e53fac1aafae68ea3e5883403"; + x64suffix = "14"; + x86suffix = "14"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-OLD1.html"; + }; + + "22.12.0" = { + major = "22"; + minor = "12"; + patch = "0"; + x64hash = "3ec5a3d5526a6bac17bb977b173542f5bdd535a53baa6dca80c83a0d61229d74"; + x86hash = "b73f90fe51bbb7391c188a394ea614b67f128ed0d9481bd7824cbcadc0338dae"; + x64suffix = "12"; + x86suffix = "12"; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index d072a03c0b47..a35e5b03f4a9 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -2,23 +2,29 @@ , lib , fetchFromGitHub , cmake +, docbook-xsl-nons +, libxslt , pkg-config , alsa-lib +, faac +, faad2 , ffmpeg , glib +, openh264 , openssl -, pcre +, pcre2 , zlib , libX11 , libXcursor , libXdamage +, libXdmcp , libXext , libXi , libXinerama , libXrandr , libXrender -, libXv , libXtst +, libXv , libxkbcommon , libxkbfile , wayland @@ -27,7 +33,6 @@ , gst-plugins-good , libunwind , orc -, libxslt , cairo , libusb1 , libpulseaudio @@ -42,6 +47,7 @@ , Carbon , Cocoa , CoreMedia +, withUnfree ? false }: let @@ -59,6 +65,8 @@ let } ]; + inherit (lib) optionals; + in stdenv.mkDerivation rec { pname = "freerdp"; @@ -97,6 +105,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo cups + faad2 ffmpeg glib gst-plugins-base @@ -105,6 +114,7 @@ stdenv.mkDerivation rec { libX11 libXcursor libXdamage + libXdmcp libXext libXi libXinerama @@ -118,45 +128,54 @@ stdenv.mkDerivation rec { libusb1 libxkbcommon libxkbfile - libxslt + openh264 openssl orc - pcre + pcre2 pcsclite zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ optionals stdenv.isLinux [ alsa-lib systemd wayland - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ optionals stdenv.isDarwin [ AudioToolbox AVFoundation Carbon Cocoa CoreMedia + ] + ++ optionals withUnfree [ + faac ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake libxslt docbook-xsl-nons pkg-config ]; doCheck = true; - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ] - ++ lib.mapAttrsToList (k: v: "-D${k}=${if v then "ON" else "OFF"}") { - BUILD_TESTING = doCheck; - WITH_CUNIT = doCheck; + # https://github.com/FreeRDP/FreeRDP/issues/8526#issuecomment-1357134746 + cmakeFlags = [ + "-Wno-dev" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook" + ] + ++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") { + BUILD_TESTING = false; # false is recommended by upstream + WITH_CAIRO = (cairo != null); WITH_CUPS = (cups != null); + WITH_FAAC = (withUnfree && faac != null); + WITH_FAAD2 = (faad2 != null); + WITH_JPEG = (libjpeg_turbo != null); + WITH_OPENH264 = (openh264 != null); WITH_OSS = false; WITH_PCSC = (pcsclite != null); WITH_PULSE = (libpulseaudio != null); WITH_SERVER = buildServer; - WITH_SSE2 = stdenv.isx86_64; - WITH_VAAPI = true; - WITH_JPEG = (libjpeg_turbo != null); - WITH_CAIRO = (cairo != null); + WITH_VAAPI = false; # false is recommended by upstream WITH_X11 = true; }; - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" "-include AudioToolbox/AudioToolbox.h" diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 8a39e31aa9c6..f1abf5834837 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -3,47 +3,48 @@ , freerdp, libssh, libgcrypt, gnutls, vte , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon -, libsecret, libsoup, spice-protocol, spice-gtk_libsoup2, libepoxy, at-spi2-core -, openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz +, libsecret, libsoup_3, spice-protocol, spice-gtk, libepoxy, at-spi2-core +, openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk_4_1, harfbuzz # The themes here are soft dependencies; only icons are missing without them. , gnome +, withKf5Wallet ? true, libsForQt5 , withLibsecret ? true , withVte ? true }: -with lib; - stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.27"; + version = "1.4.29"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "sha256-WIppHK4ucvKqgXB8VPy9ldbw22ZuDaEn1gNaLpyb4jA="; + sha256 = "sha256-8B19rqbOYY+lS3Q/vh3Eu696KW03SOvlP9dgXPYYDiU="; }; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; + buildInputs = [ gsettings-desktop-schemas glib gtk3 gettext libxkbfile libX11 freerdp libssh libgcrypt gnutls pcre2 libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon - libsoup spice-protocol - # https://gitlab.com/Remmina/Remmina/-/issues/2754 - spice-gtk_libsoup2 + libsoup_3 spice-protocol + spice-gtk libepoxy at-spi2-core - openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk + openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk_4_1 harfbuzz python3 - ] ++ optionals withLibsecret [ libsecret ] - ++ optionals withVte [ vte ]; + ] ++ lib.optionals withLibsecret [ libsecret ] + ++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ] + ++ lib.optionals withVte [ vte ]; cmakeFlags = [ "-DWITH_VTE=${if withVte then "ON" else "OFF"}" "-DWITH_TELEPATHY=OFF" "-DWITH_AVAHI=OFF" + "-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}" "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" "-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2.so" "-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2.so" @@ -51,13 +52,15 @@ stdenv.mkDerivation rec { "-DWINPR_INCLUDE_DIR=${freerdp}/include/winpr2" ]; + dontWrapQtApps = true; + preFixup = '' gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" ) ''; - meta = { + meta = with lib; { license = licenses.gpl2Plus; homepage = "https://gitlab.com/Remmina/Remmina"; description = "Remote desktop client written in GTK"; diff --git a/pkgs/applications/networking/remote/rustdesk/default.nix b/pkgs/applications/networking/remote/rustdesk/default.nix index 341cc22976a9..fbbef2dc6193 100644 --- a/pkgs/applications/networking/remote/rustdesk/default.nix +++ b/pkgs/applications/networking/remote/rustdesk/default.nix @@ -38,6 +38,11 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-IlrfqwNyaSHE9Ct0mn7MUxEg7p1Ku34eOMYelEAYFW8="; }; + patches = [ + # based on https://github.com/rustdesk/rustdesk/pull/1900 + ./fix-for-rust-1.65.diff + ]; + cargoSha256 = "sha256-1OMWEk+DerltF7kwdo4d04rbgIFLHBRq3vZaL7jtrdE="; LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"; diff --git a/pkgs/applications/networking/remote/rustdesk/fix-for-rust-1.65.diff b/pkgs/applications/networking/remote/rustdesk/fix-for-rust-1.65.diff new file mode 100644 index 000000000000..a70f51e0a76a --- /dev/null +++ b/pkgs/applications/networking/remote/rustdesk/fix-for-rust-1.65.diff @@ -0,0 +1,31 @@ +diff --git a/libs/hbb_common/src/config.rs b/libs/hbb_common/src/config.rs +index 74982de5..308bcf80 100644 +--- a/libs/hbb_common/src/config.rs ++++ b/libs/hbb_common/src/config.rs +@@ -656,7 +656,7 @@ const PEERS: &str = "peers"; + + impl PeerConfig { + pub fn load(id: &str) -> PeerConfig { +- let _ = CONFIG.read().unwrap(); // for lock ++ let _lock = CONFIG.read().unwrap(); + match confy::load_path(&Self::path(id)) { + Ok(config) => config, + Err(err) => { +@@ -667,7 +667,7 @@ impl PeerConfig { + } + + pub fn store(&self, id: &str) { +- let _ = CONFIG.read().unwrap(); // for lock ++ let _lock = CONFIG.read().unwrap(); + if let Err(err) = confy::store_path(Self::path(id), self) { + log::error!("Failed to store config: {}", err); + } +@@ -808,7 +808,7 @@ pub struct LanPeers { + + impl LanPeers { + pub fn load() -> LanPeers { +- let _ = CONFIG.read().unwrap(); // for lock ++ let _lock = CONFIG.read().unwrap(); + match confy::load_path(&Config::file_("_lan_peers")) { + Ok(peers) => peers, + Err(err) => { diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 44ce12aeeb48..f127d7c53d32 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -1,18 +1,36 @@ -{ mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg-utils, dbus -, qtbase, qtwebkit, qtwebengine, qtx11extras, qtquickcontrols, getconf, glibc -, libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes, coreutils +{ mkDerivation +, lib +, fetchurl +, autoPatchelfHook +, makeWrapper +, xdg-utils +, dbus +, qtbase +, qtwebengine +, qtx11extras +, getconf +, glibc +, libXrandr +, libX11 +, libXext +, libXdamage +, libXtst +, libSM +, libXfixes +, coreutils , wrapQtAppsHook +, icu63 }: mkDerivation rec { pname = "teamviewer"; # teamviewer itself has not development files but the dev output removes propagated other dev outputs from runtime outputs = [ "out" "dev" ]; - version = "15.29.4"; + version = "15.35.7"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "sha256-jkFqOtU+D62S7QmNPvz58Z8wJ79lkN11pWQrtNdD+Uk="; + sha256 = "sha256-KNUhe0c6Th2pW7+Lmo62FYdOv+8t7Z5/eQkYPN8eusc="; }; unpackPhase = '' @@ -21,8 +39,7 @@ mkDerivation rec { ''; nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ]; - buildInputs = [ dbus getconf qtbase qtwebkit qtwebengine qtx11extras libX11 ]; - propagatedBuildInputs = [ qtquickcontrols ]; + buildInputs = [ qtbase qtwebengine qtx11extras icu63 ]; installPhase = '' mkdir -p $out/share/teamviewer $out/bin $out/share/applications @@ -30,10 +47,28 @@ mkDerivation rec { rm -R \ $out/share/teamviewer/logfiles \ $out/share/teamviewer/config \ - $out/share/teamviewer/tv_bin/RTlib \ $out/share/teamviewer/tv_bin/xdg-utils \ $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,tv-delayed-start.sh} + # Teamviewer packages its own qt library files. + # Most of them can be replaced by nixpkgs libraries, but the following need to be used beginning at version 15.35.7 + # because teamviewer will not start without them, either stalling at startup or even segfaulting. In the logfiles, some missing qt libraries + # can be observed, although they are present from nixpkgs. AutoPatchelfHook will automatically choose the included libraries, if present. + # See https://github.com/NixOS/nixpkgs/pull/202024 + + # delete all library files except "qt" folder + find $out/share/teamviewer/tv_bin/RTlib -depth -maxdepth 1 ! -type d -execdir rm -rf {} + + + # remove all other folders except "qml" and "plugins" from the qml directory + find $out/share/teamviewer/tv_bin/RTlib/qt -depth -maxdepth 1 -mindepth 1 -type d ! \( -name "qml" -o -name "plugins" \) -execdir rm -rf {} + + + # keep "QtQuick" and "QtQuick.2" directory + find $out/share/teamviewer/tv_bin/RTlib/qt/qml -depth -maxdepth 1 -mindepth 1 -type d ! \( -name "QtQuick" -o -name "QtQuick.2" \) -execdir rm -rf {} + + + # delete all folders except "platforms" from the plugins directory + # it contains libqxcb.so from qtbase which seems to be incompatible with our nixpkgs version + find $out/share/teamviewer/tv_bin/RTlib/qt/plugins -depth -maxdepth 1 -mindepth 1 -type d ! -name "platforms" -execdir rm -rf {} + + ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin ln -s $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop $out/share/applications @@ -79,7 +114,7 @@ mkDerivation rec { makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ getconf coreutils ]}" - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libXrandr libX11 libXext libXdamage libXtst libSM libXfixes dbus ]}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libXrandr libX11 libXext libXdamage libXtst libSM libXfixes dbus icu63 ]}" ]; postFixup = '' @@ -100,6 +135,6 @@ mkDerivation rec { license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jagajaga jraygauthier ]; + maintainers = with maintainers; [ jagajaga jraygauthier gador ]; }; } diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix index 12087ed108bb..c5095d8fd43e 100644 --- a/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -1,21 +1,62 @@ -{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc, wayland-scanner -, pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml, pam, mesa +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, scdoc +, wayland-scanner +, aml +, jansson +, libxkbcommon +, mesa +, neatvnc +, pam +, pixman +, wayland }: stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.5.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/OKkQKt43lR0UCmQeSDMl1hXh03k+dX3UweigMWEUx4="; + sha256 = "sha256-yNWTTjlmMCMTed1SiRep3iUxchQya1GnTVoub1cpR14="; }; - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson pkg-config ninja scdoc wayland-scanner ]; - buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam mesa ]; + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wayland-scanner + ]; + + buildInputs = [ + aml + jansson + libxkbcommon + mesa + neatvnc + pam + pixman + wayland + ]; + + mesonFlags = [ + (lib.mesonBool "tests" true) + ]; + + doCheck = true; meta = with lib; { description = "A VNC server for wlroots based Wayland compositors"; diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index feb8252c7eda..b7c51d70dfec 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -3,13 +3,13 @@ let xorgxrdp = stdenv.mkDerivation rec { pname = "xorgxrdp"; - version = "0.2.9"; + version = "0.9.19"; src = fetchFromGitHub { owner = "neutrinolabs"; repo = "xorgxrdp"; rev = "v${version}"; - sha256 = "1bhp5x47hajhinvglmc4vxxnpjvfjm6369njb3ghqfr7c5xypvzr"; + hash = "sha256-WI1KyJDQkmNHwweZMbNd2KUfawaieoGMDMQfeD12cZs="; }; nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ]; @@ -34,21 +34,23 @@ let }; xrdp = stdenv.mkDerivation rec { - version = "0.9.9"; + version = "0.9.21.1"; pname = "xrdp"; src = fetchFromGitHub { - owner = "volth"; + owner = "neutrinolabs"; repo = "xrdp"; - rev = "refs/tags/runtime-cfg-path-${version}"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be patched already + rev = "v${version}"; fetchSubmodules = true; - sha256 = "0ynj6pml4f38y8571ryhifza57wfqg4frdrjcwzw3fmryiznfm1z"; + hash = "sha256-/o052ij+Tpcw5/k1UyP6OGOzrtBwh3jRkftStIEhUF0="; }; - nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ]; + nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm perl ]; buildInputs = [ openssl systemd pam fuse libjpeg libopus xorg.libX11 xorg.libXfixes xorg.libXrandr ]; + patches = [ ./dynamic_config.patch ]; + postPatch = '' substituteInPlace sesman/xauth.c --replace "xauth -q" "${xorg.xauth}/bin/xauth -q" ''; @@ -58,23 +60,23 @@ let ./bootstrap ''; dontDisableStatic = true; - configureFlags = [ "--with-systemdsystemunitdir=/var/empty" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" ]; + configureFlags = [ "--with-systemdsystemunitdir=/var/empty" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" "--enable-pam-config=unix" ]; installFlags = [ "DESTDIR=$(out)" "prefix=" ]; postInstall = '' - # remove generated keys (as non-determenistic) and upstart script - rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem,xrdp.sh} + # remove generated keys (as non-deterministic) + rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem} cp $src/keygen/openssl.conf $out/share/xrdp/openssl.conf substituteInPlace $out/etc/xrdp/sesman.ini --replace /etc/xrdp/pulse $out/etc/xrdp/pulse # remove all session types except Xorg (they are not supported by this setup) - ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|console|vnc-any|sesman-any|rdp-any|neutrinordp-any)\]/ .. /^$/' $out/etc/xrdp/xrdp.ini + perl -i -ne 'print unless /\[(X11rdp|Xvnc|console|vnc-any|sesman-any|rdp-any|neutrinordp-any)\]/ .. /^$/' $out/etc/xrdp/xrdp.ini # remove all session types and then add Xorg - ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|Xorg)\]/ .. /^$/' $out/etc/xrdp/sesman.ini + perl -i -ne 'print unless /\[(X11rdp|Xvnc|Xorg)\]/ .. /^$/' $out/etc/xrdp/sesman.ini cat >> $out/etc/xrdp/sesman.ini < + + #if defined(XRDP_NEUTRINORDP) + #include +@@ -46,10 +47,21 @@ xrdp_rdp_read_config(const char *xrdp_ini, struct xrdp_client_info *client_info) + struct list *values = (struct list *)NULL; + char *item = NULL; + char *value = NULL; ++ char cfg_dir[256]; + int pos; + char *tmp = NULL; + int tmp_length = 0; + ++ g_strncpy(cfg_dir, xrdp_ini, 255); ++ *(strrchr(cfg_dir, '/')) = 0; ++ ++ /* default location is next to xrdp.ini */ ++ g_snprintf(client_info->certificate, 1023, "%s/cert.pem", cfg_dir); ++ g_snprintf(client_info->key_file, 1023, "%s/key.pem", cfg_dir); ++ g_snprintf(client_info->xrdp_keyboard_ini_file, 255, "%s/xrdp_keyboard.ini", cfg_dir); ++ g_snprintf(client_info->rsakeys_ini_file, 255, "%s/rsakeys.ini", cfg_dir); ++ g_snprintf(client_info->keymaps_path, 255, "%s", cfg_dir); ++ + client_info->xrdp_keyboard_overrides.type = -1; + client_info->xrdp_keyboard_overrides.subtype = -1; + client_info->xrdp_keyboard_overrides.layout = -1; +@@ -253,14 +265,14 @@ xrdp_rdp_read_config(const char *xrdp_ini, struct xrdp_client_info *client_info) + if (g_strlen(value) == 0) + { + /* default key_file path */ +- g_snprintf(client_info->key_file, 1023, "%s/key.pem", XRDP_CFG_PATH); ++ g_snprintf(client_info->key_file, 1023, "%s/key.pem", cfg_dir); + LOG(LOG_LEVEL_INFO, "Using default X.509 key file: %s", + client_info->key_file); + } + else if (value[0] != '/') + { + /* default key_file path */ +- g_snprintf(client_info->key_file, 1023, "%s/key.pem", XRDP_CFG_PATH); ++ g_snprintf(client_info->key_file, 1023, "%s/key.pem", cfg_dir); + LOG(LOG_LEVEL_WARNING, + "X.509 key file should use absolute path, using " + "default instead: %s", client_info->key_file); +@@ -277,6 +289,51 @@ xrdp_rdp_read_config(const char *xrdp_ini, struct xrdp_client_info *client_info) + client_info->key_file, g_get_strerror()); + } + } ++ else if (g_strcasecmp(item, "rsakeys_ini") == 0) ++ { ++ if (value[0] != '/') ++ { ++ g_snprintf(client_info->rsakeys_ini_file, 255, "%s/rsakeys.ini", cfg_dir); ++ log_message(LOG_LEVEL_WARNING, ++ "rsakeys.ini file should use absolute path, using " ++ "default instead: %s", client_info->rsakeys_ini_file); ++ } ++ else ++ { ++ /* use user defined rsakeys.ini */ ++ g_strncpy(client_info->rsakeys_ini_file, value, 255); ++ } ++ } ++ else if (g_strcasecmp(item, "xrdp_keyboard_ini") == 0) ++ { ++ if (value[0] != '/') ++ { ++ g_snprintf(client_info->xrdp_keyboard_ini_file, 255, "%s/xrdp_keyboard.ini", cfg_dir); ++ log_message(LOG_LEVEL_WARNING, ++ "xrdp_keyboard.ini file should use absolute path, using " ++ "default instead: %s", client_info->xrdp_keyboard_ini_file); ++ } ++ else ++ { ++ /* use user defined xrdp_keyboard.ini */ ++ g_strncpy(client_info->xrdp_keyboard_ini_file, value, 255); ++ } ++ } ++ else if (g_strcasecmp(item, "keymaps_path") == 0) ++ { ++ if (value[0] != '/') ++ { ++ g_snprintf(client_info->keymaps_path, 255, "%s", cfg_dir); ++ log_message(LOG_LEVEL_WARNING, ++ "keymaps_path should use absolute path, using " ++ "default instead: %s", client_info->keymaps_path); ++ } ++ else ++ { ++ /* use user defined xrdp_keyboard.ini */ ++ g_strncpy(client_info->keymaps_path, value, 255); ++ } ++ } + else if (g_strcasecmp(item, "domain_user_separator") == 0 + && g_strlen(value) > 0) + { +diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c +index 8fa34aea..da94cf95 100644 +--- a/libxrdp/xrdp_sec.c ++++ b/libxrdp/xrdp_sec.c +@@ -371,7 +371,6 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info) + char *item = (char *)NULL; + char *value = (char *)NULL; + char *q = (char *)NULL; +- char keyboard_cfg_file[256] = { 0 }; + char rdp_layout[256] = { 0 }; + + const struct xrdp_keyboard_overrides *ko = +@@ -419,10 +418,9 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info) + client_info->keyboard_subtype = 1; + } + +- g_snprintf(keyboard_cfg_file, 255, "%s/xrdp_keyboard.ini", XRDP_CFG_PATH); +- LOG(LOG_LEVEL_DEBUG, "keyboard_cfg_file %s", keyboard_cfg_file); ++ LOG(LOG_LEVEL_DEBUG, "keyboard_cfg_file %s", client_info->xrdp_keyboard_ini_file); + +- fd = g_file_open(keyboard_cfg_file); ++ fd = g_file_open(client_info->xrdp_keyboard_ini_file); + + if (fd >= 0) + { +@@ -594,7 +592,7 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info) + else + { + LOG(LOG_LEVEL_ERROR, "xrdp_load_keyboard_layout: error opening %s", +- keyboard_cfg_file); ++ client_info->xrdp_keyboard_ini_file); + } + } + +@@ -2759,7 +2757,6 @@ xrdp_sec_incoming(struct xrdp_sec *self) + int index = 0; + char *item = NULL; + char *value = NULL; +- char key_file[256]; + + iso = self->mcs_layer->iso_layer; + +@@ -2805,19 +2802,17 @@ xrdp_sec_incoming(struct xrdp_sec *self) + LOG(LOG_LEVEL_DEBUG, "Using RDP security, and " + "reading the server configuration"); + +- g_memset(key_file, 0, sizeof(char) * 256); + g_random(self->server_random, 32); + items = list_create(); + items->auto_free = 1; + values = list_create(); + values->auto_free = 1; +- g_snprintf(key_file, 255, "%s/rsakeys.ini", XRDP_CFG_PATH); + +- if (file_by_name_read_section(key_file, "keys", items, values) != 0) ++ if (file_by_name_read_section(self->rdp_layer->client_info.rsakeys_ini_file, "keys", items, values) != 0) + { + /* this is a show stopper */ + LOG(LOG_LEVEL_ERROR, "XRDP cannot read file: %s " +- "(check permissions)", key_file); ++ "(check permissions)", self->rdp_layer->client_info.rsakeys_ini_file); + list_delete(items); + list_delete(values); + return 1; +diff --git a/sesman/config.c b/sesman/config.c +index 61e9e403..0466f61a 100644 +--- a/sesman/config.c ++++ b/sesman/config.c +@@ -34,6 +34,7 @@ + #include "sesman.h" + #include "log.h" + #include "string_calls.h" ++#include + #include "chansrv/chansrv_common.h" + + /***************************************************************************//** +@@ -47,11 +48,10 @@ + * + */ + static int +-config_read_globals(int file, struct config_sesman *cf, struct list *param_n, ++config_read_globals(const char *base_dir, int file, struct config_sesman *cf, struct list *param_n, + struct list *param_v) + { + int i; +- int length; + char *buf; + + list_clear(param_v); +@@ -127,13 +127,12 @@ config_read_globals(int file, struct config_sesman *cf, struct list *param_n, + g_free(cf->default_wm); + cf->default_wm = g_strdup("startwm.sh"); + } +- /* if default_wm doesn't begin with '/', it's a relative path to XRDP_CFG_PATH */ ++ /* if default_wm doesn't begin with '/', it's a relative path to base_dir */ + if (cf->default_wm[0] != '/') + { + /* sizeof operator returns string length including null terminator */ +- length = sizeof(XRDP_CFG_PATH) + g_strlen(cf->default_wm) + 1; /* '/' */ +- buf = (char *)g_malloc(length, 0); +- g_sprintf(buf, "%s/%s", XRDP_CFG_PATH, cf->default_wm); ++ buf = (char *)g_malloc(g_strlen(base_dir) + 1 + g_strlen(cf->default_wm) + 1, 0); ++ g_sprintf(buf, "%s/%s", base_dir, cf->default_wm); + g_free(cf->default_wm); + cf->default_wm = g_strdup(buf); + g_free(buf); +@@ -151,10 +150,8 @@ config_read_globals(int file, struct config_sesman *cf, struct list *param_n, + /* if reconnect_sh doesn't begin with '/', it's a relative path to XRDP_CFG_PATH */ + if (cf->reconnect_sh[0] != '/') + { +- /* sizeof operator returns string length including null terminator */ +- length = sizeof(XRDP_CFG_PATH) + g_strlen(cf->reconnect_sh) + 1; /* '/' */ +- buf = (char *)g_malloc(length, 0); +- g_sprintf(buf, "%s/%s", XRDP_CFG_PATH, cf->reconnect_sh); ++ buf = (char *)g_malloc(g_strlen(base_dir) + 1 + g_strlen(cf->reconnect_sh) + 1, 0); ++ g_sprintf(buf, "%s/%s", base_dir, cf->reconnect_sh); + g_free(cf->reconnect_sh); + cf->reconnect_sh = g_strdup(buf); + g_free(buf); +@@ -511,6 +508,7 @@ struct config_sesman * + config_read(const char *sesman_ini) + { + struct config_sesman *cfg; ++ char cfg_dir[256]; + int all_ok = 0; + + if ((cfg = g_new0(struct config_sesman, 1)) != NULL) +@@ -532,8 +530,10 @@ config_read(const char *sesman_ini) + param_v->auto_free = 1; + + /* read global config */ +- config_read_globals(fd, cfg, param_n, param_v); +- ++ g_strcpy(cfg_dir, sesman_ini); ++ *(strrchr(cfg_dir, '/')) = 0; // cfg_file validated to contain '/' ++ ++ config_read_globals(cfg_dir, fd, cfg, param_n, param_v); + /* read Xvnc/X11rdp/Xorg parameter list */ + config_read_vnc_params(fd, cfg, param_n, param_v); + config_read_rdp_params(fd, cfg, param_n, param_v); +diff --git a/xrdp/lang.c b/xrdp/lang.c +index e4c18077..06f92997 100644 +--- a/xrdp/lang.c ++++ b/xrdp/lang.c +@@ -229,7 +229,7 @@ km_read_section(int fd, const char *section_name, struct xrdp_key_info *keymap) + + /*****************************************************************************/ + int +-get_keymaps(int keylayout, struct xrdp_keymap *keymap) ++get_keymaps(const char* keymaps_path, int keylayout, struct xrdp_keymap *keymap) + { + int fd; + int basic_key_layout = keylayout & 0x0000ffff; +@@ -239,21 +239,21 @@ get_keymaps(int keylayout, struct xrdp_keymap *keymap) + filename = (char *)g_malloc(256, 0); + + /* check if there is a keymap file e.g. km-e00100411.ini */ +- g_snprintf(filename, 255, "%s/km-%08x.ini", XRDP_CFG_PATH, keylayout); ++ g_snprintf(filename, 255, "%s/km-%08x.ini", keymaps_path, keylayout); + + /* if the file does not exist, use only lower 16 bits instead */ + if (!g_file_exist(filename)) + { + LOG(LOG_LEVEL_WARNING, "Cannot find keymap file %s", filename); + /* e.g. km-00000411.ini */ +- g_snprintf(filename, 255, "%s/km-%08x.ini", XRDP_CFG_PATH, basic_key_layout); ++ g_snprintf(filename, 255, "%s/km-%08x.ini", keymaps_path, basic_key_layout); + } + + /* finally, use 'en-us' */ + if (!g_file_exist(filename)) + { + LOG(LOG_LEVEL_WARNING, "Cannot find keymap file %s", filename); +- g_snprintf(filename, 255, "%s/km-00000409.ini", XRDP_CFG_PATH); ++ g_snprintf(filename, 255, "%s/km-00000409.ini", keymaps_path); + } + + if (g_file_exist(filename)) +diff --git a/xrdp/xrdp.c b/xrdp/xrdp.c +index e91672fb..37cef0c0 100644 +--- a/xrdp/xrdp.c ++++ b/xrdp/xrdp.c +@@ -384,7 +384,6 @@ xrdp_sanity_check(void) + { + int intval = 1; + int host_be; +- const char *key_file = XRDP_CFG_PATH "/rsakeys.ini"; + + /* check compiled endian with actual endian */ + host_be = !((int)(*(unsigned char *)(&intval))); +@@ -429,12 +428,6 @@ xrdp_sanity_check(void) + return 1; + } + +- if (!g_file_exist(key_file)) +- { +- g_writeln("File %s is missing, create it using xrdp-keygen", key_file); +- return 1; +- } +- + return 0; + } + +diff --git a/xrdp/xrdp.h b/xrdp/xrdp.h +index 36d8f87a..687b9dd5 100644 +--- a/xrdp/xrdp.h ++++ b/xrdp/xrdp.h +@@ -380,7 +380,7 @@ get_char_from_scan_code(int device_flags, int scan_code, int *keys, + int caps_lock, int num_lock, int scroll_lock, + struct xrdp_keymap *keymap); + int +-get_keymaps(int keylayout, struct xrdp_keymap *keymap); ++get_keymaps(const char* keymaps_path, int keylayout, struct xrdp_keymap *keymap); + + /* xrdp_login_wnd.c */ + int +diff --git a/xrdp/xrdp.ini.in b/xrdp/xrdp.ini.in +index 3b6340f8..c05e2930 100644 +--- a/xrdp/xrdp.ini.in ++++ b/xrdp/xrdp.ini.in +@@ -52,6 +52,12 @@ crypt_level=high + ; openssl req -x509 -newkey rsa:2048 -nodes -keyout key.pem -out cert.pem -days 365 + certificate= + key_file= ++;directory with km-*.ini files; default is the directory of xrdp.ini ++#keymaps_path= ++;location of xrdp_keyboard_ini; default next to xrdp.ini ++#xrdp_keyboard_ini= ++;location of rsakeys.ini; default next to xrdp.ini ++#rsakeys_ini= + + ; set SSL protocols + ; can be comma separated list of 'SSLv3', 'TLSv1', 'TLSv1.1', 'TLSv1.2', 'TLSv1.3' +diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c +index 94691582..602b3ca6 100644 +--- a/xrdp/xrdp_wm.c ++++ b/xrdp/xrdp_wm.c +@@ -64,7 +64,7 @@ xrdp_wm_create(struct xrdp_process *owner, + self->mm = xrdp_mm_create(self); + self->default_font = xrdp_font_create(self); + /* this will use built in keymap or load from file */ +- get_keymaps(self->session->client_info->keylayout, &(self->keymap)); ++ get_keymaps(client_info->keymaps_path, self->session->client_info->keylayout, &(self->keymap)); + xrdp_wm_set_login_state(self, WMLS_RESET); + self->target_surface = self->screen; + self->current_surface_index = 0xffff; /* screen */ +diff --git a/xup/xup.c b/xup/xup.c +index e67d9477..8bc718a0 100644 +--- a/xup/xup.c ++++ b/xup/xup.c +@@ -318,7 +318,7 @@ lib_mod_event(struct mod *mod, int msg, tbus param1, tbus param2, + msg param1 param2 param3 param4 + 15 0 65507 29 0 + 16 0 65507 29 49152 */ +- init_stream(s, 8192); ++ init_stream(s, (int)sizeof(mod->client_info) < 8192 ? 8192 : (int)sizeof(mod->client_info)); + s_push_layer(s, iso_hdr, 4); + out_uint16_le(s, 103); + out_uint32_le(s, 16); /* key up */ diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 3d12b11b5141..c52e96066f8c 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar thoughtpolice cwoac ]; + maintainers = with maintainers; [ domenkozar thoughtpolice cwoac jwoudenberg ]; }; } diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix index a35f918ff5a0..e2b6e86c6cbd 100644 --- a/pkgs/applications/networking/rymdport/default.nix +++ b/pkgs/applications/networking/rymdport/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "rymdport"; - version = "3.2.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "Jacalz"; repo = "rymdport"; rev = "v${version}"; - hash = "sha256-kAEkeRAS+gMjdriop4tQcqc+GldldxOn+QwgWTl8XB0="; + hash = "sha256-8Iul8YSxrfP7uG/uSmV+Qro+B1r+mhkOxCICHf204Lg="; }; - vendorHash = "sha256-rZHM0HwiTNbUuJmlNOHg/XoYxqrKt59l5BL/vjm4Hfk="; + vendorHash = "sha256-9Z++E4Lb1+VBvOx5GJ4yQuj7fpwUhlsMhavTifKxVw4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix index 70cb96ed1364..31af7b140f2c 100644 --- a/pkgs/applications/networking/seahub/default.nix +++ b/pkgs/applications/networking/seahub/default.nix @@ -12,7 +12,7 @@ let version = "0.7.0"; src = old.src.override { inherit version; - sha256 = "0izl6bibhz3v538ad5hl13lfr6kvprf62rcl77wq2i5538h8hg3s"; + hash = "sha256-ejyIIBqlRIH5OZRlYVy+e5rs6AgUlqbQKHt8uOIy9Ec="; }; }); }; diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index cf23d2208739..f51c8d051a51 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.34"; + version = "3.40"; src = fetchFromGitHub { - owner = "chrislusf"; + owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-lOCZHkLJCDvaT3CcHUBbsybdy0H6BfKKGpd/73cxcWA="; + hash = "sha256-eU1RnLjPSAdtv+EqVnIpOLsDfBjx4WHFnHHkGZfr130="; }; - vendorHash = "sha256-1RUWONkXArXYg8gQogKUhMSGdIYyT3lq5qWuUQBsFig="; + vendorHash = "sha256-tKq5QEd7f4q7q2EDNjNrlatQ7+lXF9ya9L0iTP/AXSo="; subPackages = [ "weed" ]; @@ -49,7 +49,7 @@ buildGoModule rec { meta = with lib; { description = "Simple and highly scalable distributed file system"; homepage = "https://github.com/chrislusf/seaweedfs"; - maintainers = with maintainers; [ azahi cmacrae ]; + maintainers = with maintainers; [ azahi cmacrae wozeparrot ]; mainProgram = "weed"; license = licenses.asl20; }; diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 4016ca04b454..8d404d4ebd25 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.10.4"; + version = "0.10.8"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "ov1hA+3sKh9Ms5D3/+ubwcAp+skuIfB3pvsvNSUKiSE="; + sha256 = "BtD22Ss5PuVx2RVLQIsUeGBJBl5lh1XHJ0vcM2bOEwk="; }; modRoot = "./agent"; - vendorSha256 = "sha256-IYDy3teo+hm+yEfZa9V9MFNGmO2tqeh3lAq+Eh4Ek+A="; + vendorSha256 = "sha256-tvKiTQioj999oIUDHUSXTMXOh/LKoykzu8JEUnrelws="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix index d752dab1567e..46fc2a7ae170 100644 --- a/pkgs/applications/networking/sieve-connect/default.nix +++ b/pkgs/applications/networking/sieve-connect/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/sieve-connect \ --prefix PERL5LIB : "${with perlPackages; makePerlPath [ - AuthenSASL Socket6 IOSocketInet6 IOSocketSSL NetSSLeay NetDNS + AuthenSASL Socket6 IOSocketINET6 IOSocketSSL NetSSLeay NetDNS TermReadKey TermReadLineGnu ]}" ''; diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 1e4bb853742e..b0feaf38ecc4 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -71,25 +71,27 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withNetworkManager [ networkmanager glib - ] ++ lib.optional withSensors [ + ] ++ lib.optionals withSensors [ lm_sensors ]; propagatedBuildInputs = [ - ] ++ lib.optional withPython (python3.withPackages (ps: [ - ps.numpy - ps.protobuf - ps.pyserial - ps.setuptools - ps.websockets - ])); + ] ++ lib.optionals withPython [ + (python3.withPackages (ps: [ + ps.numpy + ps.protobuf + ps.pyserial + ps.setuptools + ps.websockets + ])) + ]; configureFlags = [ - ] ++ lib.optional (!withNetworkManager) [ + ] ++ lib.optionals (!withNetworkManager) [ "--disable-libnm" - ] ++ lib.optional (!withPython) [ + ] ++ lib.optionals (!withPython) [ "--disable-python-tools" - ] ++ lib.optional (!withSensors) [ + ] ++ lib.optionals (!withSensors) [ "--disable-lmsensors" ]; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 08f9bc0b8af2..1dabe93728c0 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -8,10 +8,8 @@ assert withQt -> qt5 != null; -with lib; - let - version = "4.0.1"; + version = "4.0.3"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -21,7 +19,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "sha256-s7AC+Z0Tu/R/ntO+frNyywwkVL0PrqKadWgZzgGf/cI="; + sha256 = "sha256-bFHhW8wK+5NzTmhtv/NU/9FZ9XC9KQS8u61vP+t+lRE="; }; cmakeFlags = [ @@ -39,17 +37,17 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config python3 perl ] - ++ optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ]; + ++ lib.optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ gettext pcre2 libpcap lua5 libssh nghttp2 openssl libgcrypt libgpg-error gnutls geoip c-ares glib zlib - ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) - ++ optionals stdenv.isLinux [ libcap libnl ] - ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] - ++ optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); + ] ++ lib.optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) + ++ lib.optionals stdenv.isLinux [ libcap libnl ] + ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] + ++ lib.optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); strictDeps = true; @@ -72,7 +70,7 @@ in stdenv.mkDerivation { install_name_tool -change "$dylib" "$out/lib/$dylib" "$f" done done - '' else optionalString withQt '' + '' else lib.optionalString withQt '' pwd install -Dm644 -t $out/share/applications ../resources/freedesktop/org.wireshark.Wireshark.desktop diff --git a/pkgs/applications/networking/sniffnet/default.nix b/pkgs/applications/networking/sniffnet/default.nix new file mode 100644 index 000000000000..6dc59e1432ab --- /dev/null +++ b/pkgs/applications/networking/sniffnet/default.nix @@ -0,0 +1,51 @@ +{ lib +, rustPlatform +, fetchCrate +, pkg-config +, libpcap +, stdenv +, fontconfig +, libGL +, xorg +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "sniffnet"; + version = "1.0.1"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-8K774j04BOEuJjnFYjaSctPwBrKYYKqjFS2+PyxJ2FM="; + }; + + cargoSha256 = "sha256-096i4wDdoJCICd0L2QNY+7cKHQnijK22zj4XaQNuko8="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libpcap + ] ++ lib.optionals stdenv.isLinux [ + fontconfig + libGL + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + ]; + + postFixup = lib.optionalString stdenv.isLinux '' + patchelf $out/bin/sniffnet \ + --add-rpath ${lib.makeLibraryPath [ libGL xorg.libX11 ]} + ''; + + meta = with lib; { + description = "Cross-platform application to monitor your network traffic with ease"; + homepage = "https://github.com/gyulyvgc/sniffnet"; + changelog = "https://github.com/gyulyvgc/sniffnet/blob/main/CHANGELOG.md"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix index f3c8301a69b6..fc515590f37a 100644 --- a/pkgs/applications/networking/soapui/default.nix +++ b/pkgs/applications/networking/soapui/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "soapui"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { url = "https://s3.amazonaws.com/downloads.eviware/soapuios/${version}/SoapUI-${version}-linux-bin.tar.gz"; - sha256 = "0vmj11fswja0ddnbc4vb7gj1al8km7ilma9bv1waaj8h5c8qpayi"; + sha256 = "sha256-qzhy4yHmOk13dFUd2KEZhXtWY86QwyjJgYxx9GGoN80="; }; nativeBuildInputs = [ makeWrapper ]; @@ -28,16 +28,16 @@ stdenv.mkDerivation rec { (writeText "soapui-${version}.patch" '' --- a/bin/soapui.sh +++ b/bin/soapui.sh - @@ -34,7 +34,7 @@ SOAPUI_CLASSPATH=$SOAPUI_HOME/bin/soapui-${version}.jar:$SOAPUI_HOME/lib/* - export SOAPUI_CLASSPATH + @@ -50,7 +50,7 @@ + #JAVA 16 + JAVA_OPTS="$JAVA_OPTS --illegal-access=permit" - JAVA_OPTS="-Xms128m -Xmx1024m -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -Dsoapui.properties=soapui.properties -Dsoapui.home=$SOAPUI_HOME/bin -splash:SoapUI-Spashscreen.png" -JFXRTPATH=`java -cp $SOAPUI_CLASSPATH com.eviware.soapui.tools.JfxrtLocator` +JFXRTPATH=`${jdk}/bin/java -cp $SOAPUI_CLASSPATH com.eviware.soapui.tools.JfxrtLocator` SOAPUI_CLASSPATH=$JFXRTPATH:$SOAPUI_CLASSPATH if $darwin - @@ -69,4 +69,4 @@ echo = SOAPUI_HOME = $SOAPUI_HOME + @@ -85,4 +85,4 @@ echo = echo ================================ diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix index 2f0ee430b4f9..531873df8c40 100644 --- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix +++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -11,13 +11,13 @@ python3Packages.buildPythonApplication rec { pname = "nicotine-plus"; - version = "3.2.6"; + version = "3.2.8"; src = fetchFromGitHub { owner = "nicotine-plus"; repo = "nicotine-plus"; rev = "refs/tags/${version}"; - sha256 = "sha256-ELpM5hnyHsqTqB0R1JPcbxkw9XR19CnasIYXJCbKBho="; + sha256 = "sha256-/l31w7ohBgjeE+Ywuo7aaDZBzVNLFD3dqMRr/P3ge+s="; }; nativeBuildInputs = [ gettext wrapGAppsHook gobject-introspection ]; diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 0b02b87a1b2f..71eece9e3bac 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -7,13 +7,13 @@ let apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; in stdenv.mkDerivation rec { pname = "backintime-common"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "bit-team"; repo = "backintime"; rev = "v${version}"; - sha256 = "sha256-7iTQZ7SiESsKK8F8BpLrRNkj8JhHo64kliaOvMvYGvw="; + sha256 = "sha256-cKmzq155/dCl5wZA2SE3XjfCocHxTh4Wa2IdfzSfQHg="; }; nativeBuildInputs = [ makeWrapper gettext ]; diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index 5bc29832c5f3..7a1252f806fb 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ++ lib.optionals (selinuxSupport) [ libselinux ] ++ lib.optionals (udevSupport) [ udev ]; nativeBuildInputs = [ meson ninja pkg-config python3 sphinx ]; - checkInputs = [ glibcLocales rsync ]; + nativeCheckInputs = [ glibcLocales rsync ]; postPatch = '' for f in test/test-*.sh.in; do diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index ed4de44049d3..cc9663dd6fc2 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -1,25 +1,17 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkg-config, rsync, - asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }: + asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt, xnu }: stdenv.mkDerivation rec { pname = "lsyncd"; - version = "2.2.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "axkibe"; repo = "lsyncd"; rev = "release-${version}"; - sha256 = "1hbsih5hfq9lhgnxm0wb5mrj6xmlk2l0i9a79wzd5f6cnjil9l3x"; + hash = "sha256-QBmvS1HGF3VWS+5aLgDr9AmUfEsuSz+DTFIeql2XHH4="; }; - patches = [ - (fetchpatch { - sha256 = "0b0h2qxh73l502p7phf6qgl8576nf6fvqqp2x5wy3nz7sc9qb1z8"; - name = "fix-non-versioned-lua-not-search-in-cmake.patch"; - url = "https://github.com/axkibe/lsyncd/pull/500/commits/0af99d8d5ba35118e8799684a2d4a8ea4b0c6957.patch"; - }) - ]; - postPatch = '' substituteInPlace default-rsync.lua \ --replace "/usr/bin/rsync" "${rsync}/bin/rsync" @@ -27,7 +19,7 @@ stdenv.mkDerivation rec { # Special flags needed on Darwin: # https://github.com/axkibe/lsyncd/blob/42413cabbedca429d55a5378f6e830f191f3cc86/INSTALL#L51 - cmakeFlags = lib.optionals stdenv.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" ]; + cmakeFlags = lib.optionals stdenv.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" "-DXNU_DIR=${xnu}/include" ]; dontUseCmakeBuildDir = true; diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index 0945de2011b0..6c64b755be0a 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -8,19 +8,19 @@ , curl , sqlite , libnotify -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd }: stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.21"; + version = "2.4.23"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - hash = "sha256-KZVRLXXaJYMqHzjxTfQaD0u7n3ACBEk3fLOmqwybNhM="; + hash = "sha256-yHpjutZV2u1VhnLxsQIu0NtKnqwtoRn4TM+8tXJ4RNo="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; diff --git a/pkgs/applications/networking/sync/openrsync/default.nix b/pkgs/applications/networking/sync/openrsync/default.nix new file mode 100644 index 000000000000..0398ccd96094 --- /dev/null +++ b/pkgs/applications/networking/sync/openrsync/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "openrsync"; + version = "unstable-2022-05-08"; + + src = fetchFromGitHub { + owner = "kristapsdz"; + repo = "openrsync"; + rev = "f50d0f8204ea18306a0c29c6ae850292ea826995"; + hash = "sha256-4tygoCQGIM0wqLfdWp55/oOPhD3lPUuTd9/LXQAASXU="; + }; + + # Uses oconfigure + prefixKey = "PREFIX="; + + meta = with lib; { + homepage = "https://www.openrsync.org/"; + description = "BSD-licensed implementation of rsync"; + license = licenses.isc; + maintainers = with maintainers; [ fgaz ]; + # https://github.com/kristapsdz/openrsync#portability + # https://github.com/kristapsdz/oconfigure#readme + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 7568f45d6811..6cdeaaf09e03 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.60.1"; + version = "1.61.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-ss4GTXnvWMwin1jn5yzmclS7SGh7NmPvdcDFa1ygwzg="; + sha256 = "sha256-mBnpmCzuMCXZPM3Tq2SsOPwEfTUn1StahkB5U/6Fe+A="; }; - vendorSha256 = "sha256-si5fzyPQUUTKkm/UVt8xfpJGK/4F6GM4HuAg1R0hzqQ="; + vendorSha256 = "sha256-EGNRKSlpdH/NNfLzSDL3lQzArVsVM6oRkyZm31V8cgM="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index f172a7fc420b..d1a304f44001 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { pname = "rsync"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; - sha256 = "sha256-+zNlurJ4N9Qf6vQulnxXvTpHvI8Qdlo2ce/Wo4NUVNM="; + sha256 = "sha256-Tn2dP27RCHjFjF+3JKZ9rPS2qsc0CxPkiPstxBNG8rs="; }; nativeBuildInputs = [ perl ]; @@ -43,6 +43,9 @@ stdenv.mkDerivation rec { # disable the included zlib explicitly as it otherwise still compiles and # links them even. "--with-included-zlib=no" + ] ++ lib.optionals (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64) [ + # fix `multiversioning needs 'ifunc' which is not supported on this target` error + "--disable-roll-simd" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 97ee3ed58625..c6ce7c8f593a 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -23,9 +23,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-taA8eZ/wOe9uMccXVYfe34/XzWgqYKA3tLZnIOahOrQ="; }; - nativeBuildInputs = [ makeWrapper ] + strictDeps = true; + + nativeBuildInputs = [ makeWrapper ocamlPackages.ocaml ] ++ lib.optional enableX11 copyDesktopItems; - buildInputs = [ ocamlPackages.ocaml ncurses ]; + buildInputs = [ ncurses ]; preBuild = lib.optionalString enableX11 '' sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 4bfe3efec121..e74084e14c52 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.22.1"; + version = "1.23.0"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-XndTMPO1lN6bsjeHbvrZ+i4VwaKoUOcWOfbVQ2E7/eo="; + hash = "sha256-Z4YVU45na4BgIbN/IlORpTCuf2EuSuOyppDRzswn3EI="; }; - vendorSha256 = "sha256-ZxA05K5zKmQIm2R525DNXpGXqwM33j3PCuPN5d2qcj8="; + vendorHash = "sha256-q63iaRxJRvPY0Np20O6JmdMEjSg/kxRneBfs8fRTwXk="; doCheck = false; diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index f86be07dfecc..dea70ffacdce 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -2,7 +2,7 @@ let pname = "synology-drive-client"; baseUrl = "https://global.download.synology.com/download/Utility/SynologyDriveClient"; - version = "3.1.0-12923"; + version = "3.2.0-13258"; buildNumber = with lib; last (splitString "-" version); meta = with lib; { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server."; @@ -29,7 +29,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb"; - sha256 = "sha256-gL08uJbA2S+SuP1afMBmcJMIcu7QRzdiXgIMxSZQl/I="; + sha256 = "sha256-jnMwhirZphguW+hluhzD9aXDTQ9RuJgAtjh+Iy23c3w="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; @@ -59,7 +59,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; - sha256 = "0pwm2xi1b9p9zmhy4dhix3aas49i183wxslyidfwvlaphic9qkxm"; + sha256 = "0hv0vgbvgqhzayc4przqhnkyvsykhw40hrwk6imvla00nix853wy"; }; nativeBuildInputs = [ cpio xar undmg ]; diff --git a/pkgs/applications/networking/taler/default.nix b/pkgs/applications/networking/taler/default.nix index 7dd8978dc216..d91ba790610e 100644 --- a/pkgs/applications/networking/taler/default.nix +++ b/pkgs/applications/networking/taler/default.nix @@ -49,7 +49,7 @@ in rec { enableParallelBuilding = true; - checkInputs = [ wget curl ]; + nativeCheckInputs = [ wget curl ]; doInstallCheck = true; checkTarget = "check"; @@ -100,7 +100,7 @@ in rec { enableParallelBuilding = true; - checkInputs = [ jq ]; + nativeCheckInputs = [ jq ]; doInstallCheck = true; checkTarget = "check"; diff --git a/pkgs/applications/networking/twingate/default.nix b/pkgs/applications/networking/twingate/default.nix new file mode 100644 index 000000000000..33e0820bec9f --- /dev/null +++ b/pkgs/applications/networking/twingate/default.nix @@ -0,0 +1,51 @@ +{ autoPatchelfHook +, curl +, dpkg +, dbus +, fetchurl +, lib +, libnl +, udev +, cryptsetup +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "twingate"; + version = "1.0.60"; + + src = fetchurl { + url = "https://binaries.twingate.com/client/linux/DEB/${version}/twingate-amd64.deb"; + sha256 = "b308c422af8a33ecd58e21a10a72c353351a189df67006e38d1ec029a93d5678"; + }; + + buildInputs = [ dbus curl libnl udev cryptsetup ]; + nativeBuildInputs = [ dpkg autoPatchelfHook ]; + + unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root"; + + postPatch = '' + while read file; do + substituteInPlace "$file" \ + --replace "/usr/bin" "$out/bin" \ + --replace "/usr/sbin" "$out/bin" + done < <(find etc usr/lib usr/share -type f) + ''; + + installPhase = '' + mkdir $out + mv etc $out/ + mv usr/bin $out/bin + mv usr/sbin/* $out/bin + mv usr/lib $out/lib + mv usr/share $out/share + ''; + + meta = with lib; { + description = "Twingate Client"; + homepage = "https://twingate.com"; + license = licenses.unfree; + maintainers = with maintainers; [ tonyshkurenko ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/twtxt/default.nix b/pkgs/applications/networking/twtxt/default.nix index 574540862562..7d703d2db4ff 100644 --- a/pkgs/applications/networking/twtxt/default.nix +++ b/pkgs/applications/networking/twtxt/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ aiohttp python-dateutil humanize click ]; - checkInputs = [ pytestCheckHook tox ]; + nativeCheckInputs = [ pytestCheckHook tox ]; disabledTests = [ # Disable test using relative date and time diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index d1378598876d..9af0fb7b73ca 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openssl protobufc libconfig ]; + # https://github.com/umurmur/umurmur/issues/176 + postPatch = '' + sed -i '/CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);/d' src/ssli_openssl.c + ''; + configureFlags = [ "--with-ssl=openssl" "--enable-shmapi" @@ -24,5 +29,7 @@ stdenv.mkDerivation rec { license = licenses.bsd3; homepage = "https://github.com/umurmur/umurmur"; platforms = platforms.all; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 8e9cfb5aee95..56a609e3de4d 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gd ncurses sqlite ]; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; doCheck = true; diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/applications/networking/warp/default.nix index 5a1a59d7c6e1..0c47fc323a64 100644 --- a/pkgs/applications/networking/warp/default.nix +++ b/pkgs/applications/networking/warp/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "warp"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = "v${version}"; - hash = "sha256-0zjtaF0RwI7Sj2D5vRaiBJI+Bp/F17VO9ywMRqZyqxI="; + hash = "sha256-oKkZC9fi5xPnLTI00MnG2gMjzMZHMNFI77ztbR4KQo4="; }; postPatch = '' @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-HotArxXfmT6Gw6ZZZQ4X6bTx0EFb6vZLbXxhddmGID8="; + hash = "sha256-sbyAyjxpol2SBxoLUsiPGfkP2diBPgJW0vEDHYWgmLU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 8acd862053ad..c9f194a5a864 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -55,9 +55,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/networking/wgnord/default.nix b/pkgs/applications/networking/wgnord/default.nix new file mode 100644 index 000000000000..b338cab2b3c4 --- /dev/null +++ b/pkgs/applications/networking/wgnord/default.nix @@ -0,0 +1,65 @@ +{ bash +, coreutils +, curl +, fetchFromGitHub +, gnugrep +, gnused +, iproute2 +, jq +, lib +, resholve +, wireguard-tools +}: + +resholve.mkDerivation rec { + pname = "wgnord"; + version = "0.1.10"; + + src = fetchFromGitHub { + owner = "phirecc"; + repo = pname; + rev = version; + hash = "sha256-T7dAEgi4tGvrzBABGLzKHhpCx0bxSCtTVI5iJJqJGlE="; + }; + + postPatch = '' + substituteInPlace wgnord \ + --replace '$conf_dir/countries.txt' "$out/share/countries.txt" \ + --replace '$conf_dir/countries_iso31662.txt' "$out/share/countries_iso31662.txt" + ''; + + dontBuild = true; + + installPhase = '' + install -Dm 755 wgnord -t $out/bin/ + install -Dm 644 countries.txt -t $out/share/ + install -Dm 644 countries_iso31662.txt -t $out/share/ + ''; + + solutions.default = { + scripts = [ "bin/wgnord" ]; + interpreter = "${bash}/bin/sh"; + inputs = [ + coreutils + curl + gnugrep + gnused + iproute2 + jq + wireguard-tools + ]; + fix.aliases = true; # curl command in an alias + execer = [ + "cannot:${iproute2}/bin/ip" + "cannot:${wireguard-tools}/bin/wg-quick" + ]; + }; + + meta = with lib; { + description = "A NordVPN Wireguard (NordLynx) client in POSIX shell"; + homepage = "https://github.com/phirecc/wgnord"; + changelog = "https://github.com/phirecc/wgnord/releases/tag/v${version}"; + maintainers = with lib.maintainers; [ urandom ]; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/networking/yaup/default.nix b/pkgs/applications/networking/yaup/default.nix new file mode 100644 index 000000000000..5894e758e9d9 --- /dev/null +++ b/pkgs/applications/networking/yaup/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, intltool +, pkg-config +, wrapGAppsHook +, gtk3 +, miniupnpc +}: + +stdenv.mkDerivation rec { + pname = "yaup"; + version = "unstable-2019-10-16"; + + src = fetchFromGitHub { + owner = "Holarse-Linuxgaming"; + repo = "yaup"; + rev = "7ee3fdbd8c1ecf0a0e6469c47560e26082808250"; + hash = "sha256-RWnNjpgXRYncz9ID8zirENffy1UsfHD1H6Mmd8DKN4k="; + }; + + nativeBuildInputs = [ + intltool + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + miniupnpc + ]; + + meta = with lib; { + homepage = "https://github.com/Holarse-Linuxgaming/yaup"; + description = "Yet Another UPnP Portmapper"; + longDescription = '' + Portmapping made easy. + Portforward your incoming traffic to a specified local ip. + Mostly used for IPv4. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + # ld: unknown option: --export-dynamic + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index f73bb1c4bf73..667533871993 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -9,8 +9,6 @@ , withDebug ? false }: -with lib; - stdenv.mkDerivation rec { pname = "znc"; version = "1.8.2"; @@ -23,12 +21,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ optional withPerl perl - ++ optional withPython python3 - ++ optional withTcl tcl - ++ optional withCyrus cyrus_sasl - ++ optional withUnicode icu - ++ optional withZlib zlib; + ++ lib.optional withPerl perl + ++ lib.optional withPython python3 + ++ lib.optional withTcl tcl + ++ lib.optional withCyrus cyrus_sasl + ++ lib.optional withUnicode icu + ++ lib.optional withZlib zlib; configureFlags = [ (lib.enableFeature withPerl "perl") @@ -36,8 +34,8 @@ stdenv.mkDerivation rec { (lib.enableFeature withTcl "tcl") (lib.withFeatureAs withTcl "tcl" "${tcl}/lib") (lib.enableFeature withCyrus "cyrus") - ] ++ optionals (!withIPv6) [ "--disable-ipv6" ] - ++ optionals withDebug [ "--enable-debug" ]; + ] ++ lib.optionals (!withIPv6) [ "--disable-ipv6" ] + ++ lib.optionals withDebug [ "--enable-debug" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/office/PageEdit/default.nix b/pkgs/applications/office/PageEdit/default.nix index 02a69a0fe15c..4d52782c857a 100644 --- a/pkgs/applications/office/PageEdit/default.nix +++ b/pkgs/applications/office/PageEdit/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "PageEdit"; - version = "1.9.10"; + version = "1.9.20"; src = fetchFromGitHub { owner = "Sigil-Ebook"; repo = pname; rev = version; - hash = "sha256-y2Z5enEptiOrwEGBKlo4H4I9ojIPG9KP3BlvTCj4PVY="; + hash = "sha256-naoflFANeMwabbdrNL3+ndvEXYT4Yqf+Mo77HcCexHE="; }; nativeBuildInputs = [ cmake qttranslations ]; diff --git a/pkgs/applications/office/agenda/default.nix b/pkgs/applications/office/agenda/default.nix index 25f394e33f32..bcffa8ebf788 100644 --- a/pkgs/applications/office/agenda/default.nix +++ b/pkgs/applications/office/agenda/default.nix @@ -51,9 +51,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 1b09de85bb36..d0b71ee92cf8 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -1,35 +1,35 @@ -{ stdenv, - lib, - fetchzip, - autoPatchelfHook, - makeWrapper, - copyDesktopItems, - makeDesktopItem, - gtk3, - openssl, - xdg-user-dirs, - keybinder3 +{ stdenv +, lib +, fetchzip +, autoPatchelfHook +, makeWrapper +, copyDesktopItems +, makeDesktopItem +, gtk3 +, openssl +, xdg-user-dirs +, keybinder3 }: stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.0.6.2"; + version = "0.0.9"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz"; - sha256 = "sha256-LOrXGFctAaiz2z9M8ghrXsQ+qygwNPyYragmL/EjlDQ="; + sha256 = "sha256-E75ZqenCs5zWBERYoIrWc2v5CyjGKLrfsae1RCi/qNQ="; }; nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - copyDesktopItems + autoPatchelfHook + makeWrapper + copyDesktopItems ]; buildInputs = [ - gtk3 - openssl - keybinder3 + gtk3 + openssl + keybinder3 ]; dontBuild = true; @@ -47,15 +47,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - preFixup = let - binPath = lib.makeBinPath [ - xdg-user-dirs - ]; - in '' + preFixup = '' # 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/" \ - --prefix PATH : "${binPath}" + --set LD_LIBRARY_PATH "$out/opt/lib/" \ + --prefix PATH : "${lib.makeBinPath [ xdg-user-dirs ]}" ''; desktopItems = [ diff --git a/pkgs/applications/office/banking/default.nix b/pkgs/applications/office/banking/default.nix index d0a08b9373ab..1874521cb0cc 100644 --- a/pkgs/applications/office/banking/default.nix +++ b/pkgs/applications/office/banking/default.nix @@ -18,14 +18,14 @@ python3.pkgs.buildPythonApplication rec { pname = "banking"; - version = "0.5.1"; + version = "0.6.0"; format = "other"; src = fetchFromGitLab { owner = "tabos"; repo = "banking"; rev = version; - sha256 = "sha256-tZlBpDcwQ/aWroP2sFQBZcvmBD26PiY7q/8xFA8GnVc="; + hash = "sha256-x/um40sRD58d5LuuJlyietCV1Rw4H5VSO0I3ZwD5kO8="; }; postPatch = '' @@ -54,8 +54,8 @@ python3.pkgs.buildPythonApplication rec { cryptography fints mt-940 + onetimepad pygobject3 - pysqlitecipher schwifty ]; diff --git a/pkgs/applications/office/beancount/beancount-ing-diba.nix b/pkgs/applications/office/beancount/beancount-ing-diba.nix index 67c76f738119..e1f3cb55fd8a 100644 --- a/pkgs/applications/office/beancount/beancount-ing-diba.nix +++ b/pkgs/applications/office/beancount/beancount-ing-diba.nix @@ -1,11 +1,10 @@ { lib -, stdenv +, python3 , fetchFromGitHub -, buildPythonApplication -, poetry +, fetchpatch }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "beancount-ing-diba"; version = "0.6.0"; @@ -16,10 +15,18 @@ buildPythonApplication rec { sha256 = "sha256-1cdXqdeTz38n0g13EXJ1/IF/gJJCe1uL/Z5NJz4DL+E="; }; + patches = [ + (fetchpatch { + name = "use-poetry-core.patch"; + url = "https://github.com/siddhantgoel/beancount-ing/commit/2d030330eed313a32c3968a2c8ce9400c6d18a41.patch"; + hash = "sha256-6v7eQhgj6d4x9uWSyuO3IxXrSWkJZRS/M4N3j0H3R/U="; + }) + ]; + format = "pyproject"; - nativeBuildInputs = [ - poetry + nativeBuildInputs = with python3.pkgs; [ + poetry-core ]; meta = with lib; { diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index b0a0fded80ae..331e6a7c3a26 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11 }: +{ lib, stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "cb2bib"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0gv7cnxi84lr6d5y71pd67h0ilmf5c88j1jxgyn9dvj19smrv99h"; }; buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake wrapQtAppsHook ]; configurePhase = '' runHook preConfigure @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { runHook postConfigure ''; - dontWrapQtApps = true; - meta = with lib; { description = "Rapidly extract unformatted, or unstandardized bibliographic references from email alerts, journal Web pages and PDF files"; homepage = "http://www.molspaces.com/d_cb2bib-overview.php"; diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index fce5bb149641..ce6988e6e61b 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -10,7 +10,16 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-Uw8UIJa+Dtsy+o31I1ynLyhZrFNX42NFRXu1O2ISbzU="; }; - nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; + patches = [ + ./flask-babel.patch + ]; + + pythonRelaxDeps = [ + "cheroot" + "Flask-Babel" + ]; + + nativeBuildInputs = with python3.pkgs; [ setuptools-scm pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ babel @@ -18,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { cheroot click flask - flaskbabel + flask-babel jaraco_functools jinja2 markdown2 @@ -27,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { werkzeug ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/applications/office/fava/flask-babel.patch b/pkgs/applications/office/fava/flask-babel.patch new file mode 100644 index 000000000000..739be6327ca8 --- /dev/null +++ b/pkgs/applications/office/fava/flask-babel.patch @@ -0,0 +1,14 @@ +diff --git a/src/fava/application.py b/src/fava/application.py +index 811c1de4..19de051a 100644 +--- a/src/fava/application.py ++++ b/src/fava/application.py +@@ -148,8 +148,7 @@ def get_locale() -> str | None: + return request.accept_languages.best_match(["en"] + LANGUAGES) + + +-BABEL = Babel(app) +-BABEL.localeselector(get_locale) ++BABEL = Babel(app, locale_selector=get_locale) + + + for function in template_filters.FILTERS: diff --git a/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch b/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch new file mode 100644 index 000000000000..289822365490 --- /dev/null +++ b/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch @@ -0,0 +1,23 @@ +diff --git a/gnucash/price-quotes.scm b/gnucash/price-quotes.scm +index 8e3ff255f..a6b805fa5 100644 +--- a/gnucash/price-quotes.scm ++++ b/gnucash/price-quotes.scm +@@ -44,7 +44,7 @@ + (define (start-program) + (set! program + (gnc-spawn-process-async +- (list "perl" "-w" gnc:*finance-quote-check*) #t))) ++ (list gnc:*finance-quote-check*) #t))) + + (define (get-sources) + (when program +@@ -119,7 +119,7 @@ + + (define (start-quoter) + (set! quoter +- (gnc-spawn-process-async (list "perl" "-w" gnc:*finance-quote-helper*) #t))) ++ (gnc-spawn-process-async (list gnc:*finance-quote-helper*) #t))) + + (define (get-quotes) + (when quoter + diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 9e5294c4b00d..700a94429964 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -72,6 +72,8 @@ stdenv.mkDerivation rec { ./0002-disable-gnc-fq-update.patch # this patch prevents the building of gnucash-valgrind ./0003-remove-valgrind.patch + # this patch makes gnucash exec the Finance::Quote helpers directly + ./0004-exec-fq-helpers.patch ]; # this needs to be an environment variable and not a cmake flag to suppress diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index e93be60741bb..1fbb9b7cbd97 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.53"; + version = "1.12.54"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "VWjkyNzqu5Ao8TYdEEVSL5Xwpx2qWelzy90tObrdTwI="; + sha256 = "RpBAYv0cSkyTWW0mv2eTLNcvwPjSxaZ8F5GFJ/7oK3Q="; }; configureFlags = [ "--disable-component" ]; diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 16a498afcac0..8165cc381c11 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec { caldav ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ nose mock xvfb-run diff --git a/pkgs/applications/office/hledger-check-fancyassertions/default.nix b/pkgs/applications/office/hledger-check-fancyassertions/default.nix index 6edef5b621bd..9ffac0f31291 100644 --- a/pkgs/applications/office/hledger-check-fancyassertions/default.nix +++ b/pkgs/applications/office/hledger-check-fancyassertions/default.nix @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation rec { src = fetchurl { name = "hledger-check-fancyassertion-${version}.hs"; url = "https://raw.githubusercontent.com/simonmichael/hledger/hledger-lib-${version}/bin/hledger-check-fancyassertions.hs"; - sha256 = "1xy3ssxnwybq40nlffz95w7m9xbzf8ysb13svg0i8g5sfgrw11vk"; + sha256 = "0lyyz8dqkknd9d073l613kdkaqd9r6ymdw94d7mwp17pxvfr17wf"; }; dontUnpack = true; diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index a7b5a39d72f6..4f6ef33caec5 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -141,7 +141,7 @@ stdenv.mkDerivation rec { binaryBytecode # source bundles dependencies as jars binaryNativeCode # source bundles dependencies as jars ]; - license = licenses.gpl2; + license = licenses.mit; platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ gebner linsui ]; }; diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index d4a3028b8943..8fe04cf43ed9 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -5,10 +5,12 @@ let _build = "484"; version = "${_version}-${_build}"; - swtSystem = if stdenv.hostPlatform.system == "i686-linux" then "linux" - else if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" - else if stdenv.hostPlatform.system == "x86_64-darwin" then "macos64" - else throw "Unsupported system: ${stdenv.hostPlatform.system}"; + swtSystem = + if stdenv.hostPlatform.system == "i686-linux" then "linux" + else if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" + else if stdenv.hostPlatform.system == "aarch64-linux" then "linux-arm64" + else if stdenv.hostPlatform.system == "x86_64-darwin" then "macos64" + else throw "Unsupported system: ${stdenv.hostPlatform.system}"; desktopItem = makeDesktopItem { name = "jameica"; @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ant jdk wrapGAppsHook makeWrapper ]; buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ] - ++ lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.isDarwin Cocoa; src = fetchFromGitHub { owner = "willuhn"; @@ -79,7 +81,7 @@ stdenv.mkDerivation rec { binaryBytecode # source bundles dependencies as jars ]; license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; maintainers = with maintainers; [ flokli r3dl3g ]; }; } diff --git a/pkgs/applications/office/karlender/default.nix b/pkgs/applications/office/karlender/default.nix index 6917e2ab94b1..ebbb0bbd9f93 100644 --- a/pkgs/applications/office/karlender/default.nix +++ b/pkgs/applications/office/karlender/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "karlender"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitLab { owner = "floers"; repo = pname; rev = "v${version}"; - hash = "sha256-WuTxsnYXudciTBH1RFHsIYNIHeoeZ+rI2JhYBYPUziw="; + hash = "sha256-lmNG9B2uO/zitOY/cNjnLRjCn6mSJ3CIpXIXpChDi9A="; }; - cargoHash = "sha256-eHEISCHh1jWCy3LwVuCx4LXfNLe1A4drHusyayoS+Ho="; + cargoHash = "sha256-foxl8pqRqEbVwUWUGHmaTGazrwLQxcDJ/RvJE9wIszg="; nativeBuildInputs = [ pkg-config @@ -35,6 +35,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' substituteInPlace src/domain/time.rs --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + substituteInPlace build.rs --replace "// gra::build" "gra::build" ''; postInstall = '' diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index 4900dafb08e5..37240b8ac569 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -49,7 +49,7 @@ mkDerivation rec { All database objects - tables, queries and forms - are stored in the database, making it easy to share data and design. ''; - homepage = "http://kexi-project.org/"; + homepage = "https://kexi-project.org/"; maintainers = with maintainers; [ zraexy ]; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix index 55c672a1dc0d..26a435203582 100644 --- a/pkgs/applications/office/khronos/default.nix +++ b/pkgs/applications/office/khronos/default.nix @@ -44,9 +44,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 64167b84247c..dfab08ace2d9 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ''; doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; - installCheckInputs = [ xvfb-run ]; + nativeInstallCheckInputs = [ xvfb-run ]; installCheckPhase = lib.optionalString doInstallCheck '' xvfb-run -s '-screen 0 1024x768x24' make test \ diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix index 4f992c3ebe95..55b89f195e69 100644 --- a/pkgs/applications/office/ledger-autosync/default.nix +++ b/pkgs/applications/office/ledger-autosync/default.nix @@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec { # Checks require ledger as a python package, # ledger does not support python3 while ledger-autosync requires it. - checkInputs = with python3Packages; [ ledger hledger nose mock pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ ledger hledger nose mock pytestCheckHook ]; # Disable some non-passing tests: # https://github.com/egh/ledger-autosync/issues/127 diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index d4b4bde7b10b..e885e03c1cd2 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -41,6 +41,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-vwVQnY9EUCXPzhDJ4PSOmQStb9eF6H0yAOiEmL6sAlk="; excludes = [ "doc/NEWS.md" ]; }) + + # Fix included bug with boost >= 1.76. Remove with the next release + (fetchpatch { + url = "https://github.com/ledger/ledger/commit/1cb9b84fdecc5604bd1172cdd781859ff3871a52.patch"; + sha256 = "sha256-ipVkRcTmnEvpfyPgMzLVJ9Sz8QxHeCURQI5dX8xh758="; + excludes = [ "test/regress/*" ]; + }) ]; installTargets = [ "doc" "install" ]; diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index ddfaf584021c..eb5097a1b0e3 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -9,21 +9,21 @@ let appName = "LibreOffice.app"; scriptName = "soffice"; - version = "7.3.3"; + version = "7.4.3"; dist = { aarch64-darwin = rec { arch = "aarch64"; archSuffix = arch; url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg"; - sha256 = "50ed3deb8d9c987516e2687ebb865bca15486c69da79f1b6d74381e43f2ec863"; + sha256 = "cf95f9ecd4451d27e8304cea3ba116675267bdf75f08fbb60e0d8917f86edc04"; }; x86_64-darwin = rec { arch = "x86_64"; archSuffix = "x86-64"; url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg"; - sha256 = "fb2f9bb90eee34a22af3a2bf2854ef5b76098302b3c41d13d4f543f0d72b994f"; + sha256 = "fe569ba23bb74eb3e86974537dd80e504debe5fd8526a00edbad6be4da18986a"; }; }; in diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a562548242b6..fdf76152a652 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -32,12 +32,12 @@ , which , icu , boost -, jdk +, jdk17 , ant , cups , xorg , fontforge -, jre_minimal +, jre17_minimal , openssl , gperf , cppunit @@ -96,7 +96,7 @@ , gpgme , libwebp , abseil-cpp -, langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "tr" "uk" "zh-CN" ] +, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "tr" "uk" "zh-CN" ] , withHelp ? true , kdeIntegration ? false , mkDerivation ? null @@ -119,9 +119,9 @@ let flatten flip concatMapStrings concatStringsSep getDev getLib - optional optionals optionalString; + optionals optionalString; - jre' = jre_minimal.override { + jre' = jre17_minimal.override { modules = [ "java.base" "java.desktop" "java.logging" "java.sql" ]; }; @@ -195,7 +195,7 @@ in tar -xf ${srcs.translations} ''; - patches = optional (variant == "still") [ ./skip-failed-test-with-icu70.patch ./gpgme-1.18.patch ] + patches = optionals (variant == "still") [ ./skip-failed-test-with-icu70.patch ./gpgme-1.18.patch ] ; ### QT/KDE @@ -460,7 +460,7 @@ in bison fontforge gdb - jdk + jdk17 libtool pkg-config ] diff --git a/pkgs/applications/office/libreoffice/download-list-builder.sh b/pkgs/applications/office/libreoffice/download-list-builder.sh index c054e2c72cbe..31cab28fd82e 100644 --- a/pkgs/applications/office/libreoffice/download-list-builder.sh +++ b/pkgs/applications/office/libreoffice/download-list-builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup tar --extract --file=$src libreoffice-$version/download.lst -O > $out diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index e204e04008ca..fc3b7216b7a2 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -1,148 +1,44 @@ -{ fetchurl, lib, stdenv, mkDerivation, dpkg, which -, makeWrapper -, alsa-lib -, desktop-file-utils -, dbus -, libcap -, fontconfig -, freetype -, gcc +{ lib +, fetchurl +, appimageTools , gconf -, glib -, icu -, libxml2 -, libxslt -, orc -, nss -, nspr -, qtbase -, qtsvg -, qtdeclarative -, qtwebchannel -, qtquickcontrols -, qtwebkit -, qtwebengine -, sqlite -, xorg -, zlib -# The provided wrapper does this, but since we don't use it -# we emulate the behavior. The downside is that this -# will leave entries on your system after uninstalling mendeley. -# (they can be removed by running '$out/bin/install-mendeley-link-handler.sh -u') -, autorunLinkHandler ? true -# Update script -, writeScript -, runtimeShell +, imagemagick }: let - arch32 = "i686-linux"; + name = "mendeley"; + version = "2.80.1"; - arch = if stdenv.hostPlatform.system == arch32 - then "i386" - else "amd64"; - - shortVersion = "1.19.5-stable"; - - version = "${shortVersion}_${arch}"; - - url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb"; - sha256 = if stdenv.hostPlatform.system == arch32 - then "01x83a44qlxi937b128y8y0px0q4w37g72z652lc42kv50dhyy3f" - else "1cagqq0xziznaj97z30bqfhrwjv3a4h83ckhwigq35nhk1ggq1ry"; - - deps = [ - qtbase - qtsvg - qtdeclarative - qtwebchannel - qtquickcontrols - qtwebkit - qtwebengine - alsa-lib - dbus - freetype - fontconfig - gcc.cc - gconf - glib - icu - libcap - libxml2 - libxslt - nspr - nss - orc - sqlite - xorg.libX11 - xorg.xcbutilkeysyms - xorg.libxcb - xorg.libXcomposite - xorg.libXext - xorg.libXrender - xorg.libXi - xorg.libXcursor - xorg.libXtst - xorg.libXrandr - xorg.xcbutilimage - zlib - ]; - -in - -mkDerivation { - pname = "mendeley"; - inherit version; + executableName = "${name}-reference-manager"; src = fetchurl { - url = url; - sha256 = sha256; + url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-2.80.1-x86_64.AppImage"; + sha256 = "sha256-uqmu7Yf4tXDlNGkeEZut4m339S6ZNKhAmej+epKLB/8="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ dpkg which ] ++ deps; + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in appimageTools.wrapType2 rec { + inherit name src; - propagatedUserEnvPkgs = [ gconf ]; + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${executableName} + install -m 444 -D ${appimageContents}/${executableName}.desktop $out/share/applications/${executableName}.desktop + ${imagemagick}/bin/convert ${appimageContents}/${executableName}.png -resize 512x512 ${name}_512.png + install -m 444 -D ${name}_512.png $out/share/icons/hicolor/512x512/apps/${executableName}.png - dontUnpack = true; - - dontWrapQtApps = true; - - installPhase = '' - dpkg-deb -x $src $out - mv $out/opt/mendeleydesktop/{bin,lib,share} $out - - interpreter=$(patchelf --print-interpreter $(readlink -f $(which patchelf))) - patchelf --set-interpreter $interpreter \ - --set-rpath ${lib.makeLibraryPath deps}:$out/lib \ - $out/bin/mendeleydesktop - - wrapQtApp $out/bin/mendeleydesktop \ - --add-flags "--unix-distro-build" \ - ${lib.optionalString autorunLinkHandler # ignore errors installing the link handler - ''--run "$out/bin/install-mendeley-link-handler.sh $out/bin/mendeleydesktop ||:"''} - - # Remove bundled qt bits - rm -rf $out/lib/qt - rm $out/bin/qt* $out/bin/Qt* - - # Patch up link handler script - wrapProgram $out/bin/install-mendeley-link-handler.sh \ - --prefix PATH ':' ${lib.makeBinPath [ which gconf desktop-file-utils ] } + substituteInPlace $out/share/applications/${executableName}.desktop \ + --replace 'Exec=AppRun' 'Exec=${executableName}' ''; - dontStrip = true; - dontPatchELF = true; - - updateScript = import ./update.nix { inherit writeScript runtimeShell; }; - meta = with lib; { homepage = "https://www.mendeley.com"; description = "A reference manager and academic social network"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ dtzWill ]; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ dtzWill atila ]; }; } diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 53d4dc4261ef..b84502170bf1 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "money-manager-ex"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "moneymanagerex"; repo = "moneymanagerex"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-ADhTz6OMntgDg3TcAlf3lGBFb+fdZ0Lw7+UYYY1RD8M="; + sha256 = "sha256-0zUZBkdFLvc32gkGqu0pYlVsHuwjhaVZzu9acSmNfu8="; }; postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 7065343378f1..d06d4d776a11 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.5.16"; + version = "2.6.4"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-U77yOgQNSj1p3WZbwkyq0Ui2UrXeuAv5sD7L+ZI2x24="; + sha256 = "sha256-2Cze8R22Wrvp+FJq/7Kp36i7Areo5e9fdBo3DQ+rvZY="; }; nativeBuildInputs = [ @@ -19,9 +19,6 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; - dontBuild = true; - dontConfigure = true; - unpackCmd = '' dpkg-deb -x ${src} ./morgen-${pname} ''; @@ -37,7 +34,7 @@ stdenv.mkDerivation rec { # 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" + --replace "Exec=\".concat(process.execPath," "Exec=\".concat(\"$out/bin/morgen\"," asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" $out/opt/Morgen/resources/app.asar substituteInPlace $out/share/applications/morgen.desktop \ diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 2f1bcab0649d..ca1f1c15952a 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -59,9 +59,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/office/p3x-onenote/default.nix b/pkgs/applications/office/p3x-onenote/default.nix index 1653e9ec8223..43b511c74a6b 100644 --- a/pkgs/applications/office/p3x-onenote/default.nix +++ b/pkgs/applications/office/p3x-onenote/default.nix @@ -1,23 +1,19 @@ { lib, stdenv, appimageTools, desktop-file-utils, fetchurl }: let - version = "2020.10.111"; + version = "2022.10.117"; name = "p3x-onenote-${version}"; plat = { aarch64-linux = "-arm64"; armv7l-linux = "-armv7l"; - i386-linux = "-i386"; - i686-linux = "-i386"; x86_64-linux = ""; }.${stdenv.hostPlatform.system}; sha256 = { - aarch64-linux = "0a3c0w1312l6k2jvn7cn8priibnh8wg0184zjcli29f9ds1afl5s"; - armv7l-linux = "172m2d94zzm8q61pvnjy01cl5fg11ad9hfh1han0gycnv3difniy"; - i386-linux = "12m0i5sb15sbysp5fvhbj4k36950m7kpjr12n88r5fpkyh13ihsp"; - i686-linux = "12m0i5sb15sbysp5fvhbj4k36950m7kpjr12n88r5fpkyh13ihsp"; - x86_64-linux = "0bn48r55l5dh8zcf8ijh3z6hlyp3s6fvfyqc1csvnslm63dfkzcq"; + aarch64-linux = "0plpwymm1bgzbzwk2689lw1fadxdwxzzn5dmayk1ayxz1k3pj9wi"; + armv7l-linux = "1pvr8f1ccl4nyfmshn3v3jfaa5x519rsy57g4pdapffj10vpbkb8"; + x86_64-linux = "12j2py8yb81ngahbkbi7269izpc5aydd432cbv0sw45ighhyqhmr"; }.${stdenv.hostPlatform.system}; src = fetchurl { diff --git a/pkgs/applications/office/paper-note/default.nix b/pkgs/applications/office/paper-note/default.nix index 18ab6250d028..e400c88df5dd 100644 --- a/pkgs/applications/office/paper-note/default.nix +++ b/pkgs/applications/office/paper-note/default.nix @@ -44,6 +44,11 @@ stdenv.mkDerivation rec { gtksourceview5 ]; + postPatch = '' + substituteInPlace src/meson.build \ + --replace "1.2.0" "${libadwaita.version}" + ''; + postInstall = '' ln -s $out/bin/io.posidon.Paper $out/bin/paper ''; diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 403e3d0d88a6..61c607c422e8 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -1,6 +1,8 @@ { lib -, fetchurl +, fetchFromGitHub +, buildNpmPackage , nixosTests +, gettext , python3 , ghostscript , imagemagickBig @@ -10,30 +12,25 @@ , qpdf , tesseract5 , unpaper +, poppler_utils , liberation_ttf -, fetchFromGitHub }: let + version = "1.12.2"; + + src = fetchFromGitHub { + owner = "paperless-ngx"; + repo = "paperless-ngx"; + rev = "refs/tags/v${version}"; + hash = "sha256-1QufnRD2Nbc4twRZ4Yrf3ae1BRGves8tJ/M7coWnRPI="; + }; + # Use specific package versions required by paperless-ngx python = python3.override { packageOverrides = self: super: { django = super.django_4; - # use paperless-ngx version of django-q - # see https://github.com/paperless-ngx/paperless-ngx/pull/1014 - django-q = super.django-q.overridePythonAttrs (oldAttrs: { - src = fetchFromGitHub { - owner = "paperless-ngx"; - repo = "django-q"; - hash = "sha256-alu7tZwUn77xhUF9c/aGmwRwO//mR/FucXjvXUl/6ek="; - rev = "8b5289d8caf36f67fb99448e76ead20d5b498c1b"; - }; - # due to paperless-ngx modification of the pyproject.toml file - # the patch is not needed any more - patches = [ ]; - }); - aioredis = super.aioredis.overridePythonAttrs (oldAttrs: rec { version = "1.3.1"; src = oldAttrs.src.override { @@ -89,55 +86,88 @@ let qpdf tesseract5 unpaper + poppler_utils ]; -in -python.pkgs.pythonPackages.buildPythonApplication rec { - pname = "paperless-ngx"; - version = "1.9.2"; - # Fetch the release tarball instead of a git ref because it contains the prebuilt fontend - src = fetchurl { - url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz"; - hash = "sha256-fafjVXRfzFrINzI/Ivfm1VY4YpemHkHwThBP54XoXM4="; + frontend = buildNpmPackage { + pname = "paperless-ngx-frontend"; + inherit version src; + + npmDepsHash = "sha256-fp0Gy3018u2y6jaUM9bmXU0SVjyEJdsvkBqbmb8S10Y="; + + nativeBuildInputs = [ + python3 + ]; + + postPatch = '' + cd src-ui + ''; + + CYPRESS_INSTALL_BINARY = "0"; + NG_CLI_ANALYTICS = "false"; + + npmBuildFlags = [ + "--" "--configuration" "production" + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib/paperless-ui + mv ../src/documents/static/frontend $out/lib/paperless-ui/ + runHook postInstall + ''; }; - +in +python.pkgs.buildPythonApplication rec { + pname = "paperless-ngx"; format = "other"; - propagatedBuildInputs = with python.pkgs.pythonPackages; [ + inherit version src; + + nativeBuildInputs = [ + gettext + ]; + + propagatedBuildInputs = with python.pkgs; [ aioredis - arrow + amqp + anyio asgiref async-timeout attrs autobahn automat - blessed + billiard + bleach + celery certifi cffi channels-redis channels - chardet + charset-normalizer click + click-didyoumean + click-plugins + click-repl coloredlogs concurrent-log-handler constantly cryptography daphne dateparser + django-celery-results django-cors-headers django-extensions django-filter - django-picklefield - django-q django djangorestframework filelock - fuzzywuzzy gunicorn h11 hiredis httptools humanfriendly + humanize hyperlink idna imap-tools @@ -149,8 +179,11 @@ python.pkgs.pythonPackages.buildPythonApplication rec { langdetect lxml msgpack + mysqlclient + nltk numpy ocrmypdf + packaging pathvalidate pdf2image pdfminer-six @@ -158,6 +191,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { pillow pluggy portalocker + prompt-toolkit psycopg2 pyasn1-modules pyasn1 @@ -166,11 +200,11 @@ python.pkgs.pythonPackages.buildPythonApplication rec { python-dateutil python-dotenv python-gnupg - python-Levenshtein python-magic pytz pyyaml pyzbar + rapidfuzz redis regex reportlab @@ -178,55 +212,71 @@ python.pkgs.pythonPackages.buildPythonApplication rec { scikit-learn scipy service-identity - six - sortedcontainers + setproctitle + sniffio sqlparse threadpoolctl tika + tornado tqdm - twisted.optional-dependencies.tls + twisted txaio + tzdata tzlocal urllib3 uvicorn uvloop + vine watchdog - watchgod + watchfiles wcwidth + webencodings websockets whitenoise whoosh + zipp zope_interface - ]; + ] + ++ redis.optional-dependencies.hiredis + ++ twisted.optional-dependencies.tls + ++ uvicorn.optional-dependencies.standard; - # paperless-ngx includes the bundled django-q version. This will - # conflict with the tests and is not needed since we overrode the - # django-q version with the paperless-ngx version - postPatch = '' - rm -rf src/django-q - ''; - - # Compile manually because `pythonRecompileBytecodeHook` only works for - # files in `python.sitePackages` postBuild = '' + # Compile manually because `pythonRecompileBytecodeHook` only works + # for files in `python.sitePackages` ${python.interpreter} -OO -m compileall src + + # Collect static files + ${python.interpreter} src/manage.py collectstatic --clear --no-input + + # Compile string translations using gettext + ${python.interpreter} src/manage.py compilemessages ''; installPhase = '' - mkdir -p $out/lib - cp -r . $out/lib/paperless-ngx + mkdir -p $out/lib/paperless-ngx + cp -r {src,static,LICENSE,gunicorn.conf.py} $out/lib/paperless-ngx + ln -s ${frontend}/lib/paperless-ui/frontend $out/lib/paperless-ngx/static/ chmod +x $out/lib/paperless-ngx/src/manage.py makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix PATH : "${path}" + makeWrapper ${python.pkgs.celery}/bin/celery $out/bin/celery \ + --prefix PYTHONPATH : "$PYTHONPATH:$out/lib/paperless-ngx/src" \ + --prefix PATH : "${path}" ''; - checkInputs = with python.pkgs.pythonPackages; [ + postFixup = '' + # Remove tests with samples (~14M) + find $out/lib/paperless-ngx -type d -name tests -exec rm -rv {} + + ''; + + nativeCheckInputs = with python.pkgs; [ + factory_boy + imagehash pytest-django pytest-env - pytest-sugar pytest-xdist - factory_boy pytestCheckHook ]; @@ -246,17 +296,29 @@ python.pkgs.pythonPackages.buildPythonApplication rec { # Disable unneeded code coverage test substituteInPlace src/setup.cfg \ --replace "--cov --cov-report=html" "" + # OCR on NixOS recognizes the space in the picture, upstream CI doesn't. + # See https://github.com/paperless-ngx/paperless-ngx/pull/2216 + substituteInPlace src/paperless_tesseract/tests/test_parser.py \ + --replace "this is awebp document" "this is a webp document" ''; + disabledTests = [ + # FileNotFoundError(2, 'No such file or directory'): /build/tmp... + "test_script_with_output" + # AssertionError: 10 != 4 (timezone/time issue) + # Due to getting local time from modification date in test_consumer.py + "testNormalOperation" + ]; passthru = { - inherit python path; + inherit python path frontend; tests = { inherit (nixosTests) paperless; }; }; meta = with lib; { description = "Tool to scan, index, and archive all of your physical documents"; homepage = "https://paperless-ngx.readthedocs.io/"; + changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ lukegb gador erikarvstedt ]; }; diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix index b9e78246609b..b67dfe436fa2 100644 --- a/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -7,7 +7,7 @@ , pycountry , whoosh , termcolor -, python-Levenshtein +, levenshtein , pygobject3 , pyocr , natsort @@ -39,6 +39,9 @@ buildPythonPackage rec { patchFlags = [ "-p2" ]; postPatch = '' + substituteInPlace setup.py \ + --replace python-Levenshtein Levenshtein + echo 'version = "${version}"' > src/paperwork_backend/_version.py chmod a+w -R .. patchShebangs ../tools @@ -55,7 +58,7 @@ buildPythonPackage rec { pygobject3 pyocr pypillowfight - python-Levenshtein + levenshtein poppler_gi scikit-learn termcolor @@ -72,7 +75,7 @@ buildPythonPackage rec { make l10n_compile ''; - checkInputs = [ + nativeCheckInputs = [ libreoffice openpaperwork-gtk psutil diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 81fc8c075f1c..6c09681137e7 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -22,7 +22,7 @@ let documentation_deps = [ (texlive.combine { - inherit (texlive) scheme-small wrapfig was; + inherit (texlive) scheme-small wrapfig gensymb; }) xvfb-run imagemagick @@ -45,6 +45,9 @@ python3Packages.buildPythonApplication rec { # Patch out a few paths that assume that we're using the FHS: postPatch = '' + substituteInPlace setup.py \ + --replace python-Levenshtein Levenshtein + chmod a+w -R .. patchShebangs ../tools @@ -83,7 +86,7 @@ python3Packages.buildPythonApplication rec { done ''; - checkInputs = [ dbus.daemon ]; + nativeCheckInputs = [ dbus ]; nativeBuildInputs = [ wrapGAppsHook @@ -114,7 +117,7 @@ python3Packages.buildPythonApplication rec { # only need to run a virtual X server + dbus but also have a large enough # resolution, because the Cairo test tries to draw a 200x200 window. xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ $out/bin/paperwork-gtk chkdeps # content of make test, without the dep on make install diff --git a/pkgs/applications/office/paperwork/paperwork-shell.nix b/pkgs/applications/office/paperwork/paperwork-shell.nix index 7e633f54f9e1..ee621df4d837 100644 --- a/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ openpaperwork-gtk ]; diff --git a/pkgs/applications/office/pdfmm/default.nix b/pkgs/applications/office/pdfmm/default.nix new file mode 100644 index 000000000000..1a61f786de2f --- /dev/null +++ b/pkgs/applications/office/pdfmm/default.nix @@ -0,0 +1,57 @@ +{ bash +, coreutils +, fetchFromGitHub +, ghostscript +, glibc +, gnome +, gnused +, lib +, resholve +, xorg +}: + +resholve.mkDerivation rec { + pname = "pdfmm"; + version = "unstable-2019-01-24"; + + src = fetchFromGitHub { + owner = "jpfleury"; + repo = pname; + rev = "45ee7796659d23bb030bf06647f1af85e1d2b52d"; + hash = "sha256-TOISD/2g7MwnLrtpMnfr2Ln0IiwlJVNavWl4eh/uwN0="; + }; + + dontBuild = true; + + installPhase = '' + install -Dm 0755 pdfmm $out/bin/pdfmm + ''; + + solutions.default = { + scripts = [ + "bin/pdfmm" + ]; + interpreter = "${bash}/bin/bash"; + inputs = [ + coreutils + ghostscript + glibc + gnome.zenity + gnused + xorg.xmessage + ]; + execer = [ + "cannot:${glibc.bin}/bin/locale" + "cannot:${gnome.zenity}/bin/zenity" + "cannot:${xorg.xmessage}/bin/xmessage" + ]; + keep."$toutLu" = true; + }; + + meta = with lib; { + description = "Graphical assistant to reduce the size of a PDF file"; + homepage = "https://github.com/jpfleury/pdfmm"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 9f98e4eb0abf..e0bfa57b1e8d 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -11,6 +11,7 @@ , makeDesktopItem , webkitgtk , wrapGAppsHook +, writeScript }: let desktopItem = makeDesktopItem { @@ -26,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.59.3"; + version = "0.60.2"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-HYzDenWicKbYTEWGaTtoEoruLrqPCxx64eLJBEHC+A0="; + hash = "sha256-jSRZZufGi1wmdT7LeNutkO74bqln8uJ5TSEDCJyfPB4="; }; nativeBuildInputs = [ @@ -60,12 +61,20 @@ stdenv.mkDerivation rec { ln -s $out/portfolio/icon.xpm $out/share/pixmaps/portfolio.xpm ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/buchen/portfolio/tags" | jq '.[0].name' --raw-output)" + update-source-version portfolio "$version" + ''; + meta = with lib; { description = "A simple tool to calculate the overall performance of an investment portfolio"; homepage = "https://www.portfolio-performance.info/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.epl10; maintainers = with maintainers; [ elohmeier oyren shawn8901 ]; + mainProgram = "portfolio"; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index e13cdc9c71c0..fbfe11a2c947 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Quick access to Zotero references"; - homepage = "http://www.cogsci.nl/software/qnotero"; + homepage = "https://www.cogsci.nl/software/qnotero"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.nico202 ]; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index c176248d1f4d..9fe6221d494d 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -1,29 +1,66 @@ -{ mkDerivation, lib, stdenv, fetchurl -, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwebsockets -, qtx11extras, qtwayland +{ lib +, stdenv +, fetchurl +, qmake +, qttools +, qtbase +, qtdeclarative +, qtsvg +, qtwayland +, qtwebsockets +, qtx11extras +, qtxmlpatterns +, makeWrapper +, wrapQtAppsHook }: -mkDerivation rec { +let pname = "qownnotes"; - version = "22.11.5"; + appname = "QOwnNotes"; + version = "23.1.2"; +in +stdenv.mkDerivation { + inherit pname appname version; 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 = "451c7bed728710d1ff7ddc5bcc5a32b829dfac3ed2bbfdb6f7c2c328e6676a8c"; + sha256 = "sha256-yfsptsatmi0A+qLKHxchaLuu0WkJnUk7sjs1Pb/D6NU="; }; - nativeBuildInputs = [ qmake qttools ]; + nativeBuildInputs = [ + qmake + qttools + wrapQtAppsHook + ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ]; - buildInputs = [ qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets qtx11extras ] - ++ lib.optionals stdenv.isLinux [ qtwayland ]; + buildInputs = [ + qtbase + qtdeclarative + qtsvg + qtwebsockets + qtx11extras + qtxmlpatterns + ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; + + postInstall = + # Create a lowercase symlink for Linux + lib.optionalString stdenv.isLinux '' + ln -s $out/bin/${appname} $out/bin/${pname} + '' + # Wrap application for macOS as lowercase binary + + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv $out/bin/${appname}.app $out/Applications + makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname} + ''; meta = with lib; { description = "Plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration"; homepage = "https://www.qownnotes.org/"; + changelog = "https://www.qownnotes.org/changelog.html"; + downloadPage = "https://github.com/pbek/QOwnNotes/releases/tag/v${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ totoroot ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/office/qpdfview/default.nix similarity index 77% rename from pkgs/applications/misc/qpdfview/default.nix rename to pkgs/applications/office/qpdfview/default.nix index db5995149c08..6cc26c95a05b 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/office/qpdfview/default.nix @@ -12,19 +12,21 @@ , file , ghostscript }: + mkDerivation rec { pname = "qpdfview"; - version = "0.4.18"; + version = "0.5.0"; src = fetchurl { - url = "https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; - sha256 = "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c"; + url = "https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-0.5.tar.gz"; + hash = "sha256-RO/EQKRhy911eps5bxRh7novQ2ToHfVb0CIfkQIZvpk="; }; - # apply upstream fix for qt5.15 https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104 - patches = [ ./qpdfview-qt515-compat.patch ]; + nativeBuildInputs = [ + qmake + pkg-config + ]; - nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase qtsvg @@ -35,6 +37,7 @@ mkDerivation rec { file ghostscript ]; + preConfigure = '' qmakeFlags+=(*.pro) ''; diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix index b1b24c3e6cb5..4e731de72d18 100644 --- a/pkgs/applications/office/softmaker/freeoffice.nix +++ b/pkgs/applications/office/softmaker/freeoffice.nix @@ -5,9 +5,9 @@ # overridable. This is useful when the upstream archive was replaced # and nixpkgs is not in sync yet. , officeVersion ? { - version = "982"; - edition = "2018"; - hash = "sha256-euoZfAaDDTXzoaNLc/YdTngreTiYOBi7sGU161GP83w="; + version = "1054"; + edition = "2021"; + hash = "sha256-dqmJUm0Qi1/GzGrI4OCHo1LwQ5KxMwZZw5EsYTMF6XU="; } , ... } @ args: @@ -20,7 +20,7 @@ callPackage ./generic.nix (args // rec { src = fetchurl { inherit (officeVersion) hash; - url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz"; + url = "https://www.softmaker.net/down/softmaker-freeoffice-${edition}-${version}-amd64.tgz"; }; archive = "freeoffice${edition}.tar.lzma"; diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index 9c716dfd9a43..93376ed2922b 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -55,9 +55,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index 18091b82afaf..fc1087ab2d93 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.12.0"; + version = "7.12.1"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-Ms7wt79iZz0xnrp+yrFs/FzVqINe6BSOEmYG9Oiz5JU="; + sha256 = "sha256-zMw6C7kyO8yDLF2vrRlBqcgzcfM4TR7/fJPHPaixw6Y="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index 0c913cd7df20..7e171f7d702c 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -1,11 +1,11 @@ { lib, mkDerivation, fetchzip, qtbase, qttools, cmake, sqlite }: mkDerivation rec { pname = "tagainijisho"; - version = "1.2.1"; + version = "1.2.2"; src = fetchzip { url = "https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz"; - hash = "sha256-NYmvkjGl+lgFh4PPWGxitupYJ2DOyCBAYlITGb3FMj8="; + hash = "sha256-CTDMoYGbVE4W0SDerW//aAdUVsySWFQycSy0I3a9+94="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/office/timeline/default.nix b/pkgs/applications/office/timeline/default.nix index 7cf777ae13f1..2295071b09c6 100644 --- a/pkgs/applications/office/timeline/default.nix +++ b/pkgs/applications/office/timeline/default.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { markdown ]; - checkInputs = [ + nativeCheckInputs = [ gettext python3.pkgs.mock ]; @@ -76,8 +76,8 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with lib; { - homepage = "http://thetimelineproj.sourceforge.net/"; - changelog = "http://thetimelineproj.sourceforge.net/changelog.html"; + homepage = "https://thetimelineproj.sourceforge.net/"; + changelog = "https://thetimelineproj.sourceforge.net/changelog.html"; description = "Display and navigate information on a timeline"; license = with licenses; [ gpl3Only cc-by-sa-30 ]; platforms = with platforms; unix; diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 68ec08e156e1..50db368073d1 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { urwid ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ flake8 flake8-import-order freezegun diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 33ac5b8b5e39..5566906919a8 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2022-11-11"; + version = "unstable-2023-01-23"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "94881402b4730f598a536d8cddb3314eaf16defc"; - sha256 = "+fv05KqfhpFeufUduOikXJuQmZfOq+i97B8kP//hsk0="; + rev = "f676cba7f9749825744ec705ee58b9fbea47db51"; + sha256 = "Zx1fGicCuX+HJm2QFSYQhcd9Ibg3qj5h9NPlSNNVLag="; }; nativeBuildInputs = [ 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 7b2635cfe121..7acf353bea1b 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,5 +1,5 @@ diff --git a/src/services/log.js b/src/services/log.js -index 0fcd9812..dcbff070 100644 +index a141eae14..094b9381b 100644 --- a/src/services/log.js +++ b/src/services/log.js @@ -1,15 +1,7 @@ @@ -35,7 +35,7 @@ index 0fcd9812..dcbff070 100644 -function initLogFile() { - todaysMidnight = getTodaysMidnight(); - -- const path = dataDir.LOG_DIR + '/trilium-' + formatDate() + '.log'; +- const path = `${dataDir.LOG_DIR}/trilium-${formatDate()}.log`; - - if (logFile) { - logFile.end(); @@ -65,8 +65,8 @@ index 0fcd9812..dcbff070 100644 - - millisSinceMidnight = checkDate(millisSinceMidnight); - -- logFile.write(formatTime(millisSinceMidnight) + ' ' + str + NEW_LINE); +- logFile.write(`${formatTime(millisSinceMidnight)} ${str}${NEW_LINE}`); - console.log(str); } - + \ No newline at end of file diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 0ac2f4eac134..35b9b694c091 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, copyDesktopItems, libxshmfence, wrapGAppsHook }: +{ lib, callPackage, ... }: let metaCommon = with lib; { @@ -7,112 +7,11 @@ let license = licenses.agpl3Plus; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ fliegendewurst ]; + maintainers = with maintainers; [ fliegendewurst eliandoran ]; }; - - version = "0.56.2"; - - desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - desktopSource.sha256 = "1rqfkbxgcd32kpi6xfd590nivd1ga0d0kf5zvffyypyy28q95pyz"; - - serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "1pyi2b649n2rihr4dcz8brfkqrbvssbzhr3dnmyrhrp3qdyxamb6"; - in { - trilium-desktop = stdenv.mkDerivation rec { - pname = "trilium-desktop"; - inherit version; - meta = metaCommon // { - mainProgram = "trilium"; - }; + trilium-desktop = callPackage ./desktop.nix { metaCommon = metaCommon; }; + trilium-server = callPackage ./server.nix { metaCommon = metaCommon; }; - src = fetchurl desktopSource; - - nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - wrapGAppsHook - copyDesktopItems - ]; - - buildInputs = atomEnv.packages ++ [ libxshmfence ]; - - desktopItems = [ - (makeDesktopItem { - name = "Trilium"; - exec = "trilium"; - icon = "trilium"; - comment = meta.description; - desktopName = "Trilium Notes"; - categories = [ "Office" ]; - }) - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mkdir -p $out/share/trilium - mkdir -p $out/share/icons/hicolor/128x128/apps - - cp -r ./* $out/share/trilium - ln -s $out/share/trilium/trilium $out/bin/trilium - - ln -s $out/share/trilium/icon.png $out/share/icons/hicolor/128x128/apps/trilium.png - runHook postInstall - ''; - - # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) - preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) - ''; - - dontStrip = true; - - passthru.updateScript = ./update.sh; - }; - - - trilium-server = stdenv.mkDerivation rec { - pname = "trilium-server"; - inherit version; - meta = metaCommon; - - src = fetchurl serverSource; - - nativeBuildInputs = [ - autoPatchelfHook - ]; - - buildInputs = [ - stdenv.cc.cc.lib - ]; - - patches = [ - # patch logger to use console instead of rolling files - ./0001-Use-console-logger-instead-of-rolling-files.patch - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mkdir -p $out/share/trilium-server - - cp -r ./* $out/share/trilium-server - runHook postInstall - ''; - - postFixup = '' - cat > $out/bin/trilium-server < $out/bin/trilium-server < +Date: Wed, 30 Nov 2022 21:07:56 -0500 +Subject: [PATCH] Add placeholders for runtime dependencies + +--- + src/videomodel.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/videomodel.cpp b/src/videomodel.cpp +index 4bb3451..b558f31 100644 +--- a/src/videomodel.cpp ++++ b/src/videomodel.cpp +@@ -121,7 +121,7 @@ QString VideoModel::remoteUrl() + return {}; + } + +- QString youtubeDl = QStringLiteral("yt-dlp"); ++ QString youtubeDl = QStringLiteral("@yt-dlp@"); + QStringList arguments; + arguments << QLatin1String("--dump-json") + << m_videoId; +-- +2.38.0 + diff --git a/pkgs/applications/plasma-mobile/plasmatube.nix b/pkgs/applications/plasma-mobile/plasmatube/default.nix similarity index 67% rename from pkgs/applications/plasma-mobile/plasmatube.nix rename to pkgs/applications/plasma-mobile/plasmatube/default.nix index 894af98b6d18..81041b22931d 100644 --- a/pkgs/applications/plasma-mobile/plasmatube.nix +++ b/pkgs/applications/plasma-mobile/plasmatube/default.nix @@ -2,6 +2,7 @@ , mkDerivation , cmake , extra-cmake-modules +, wrapGAppsHook , gst_all_1 , kcoreaddons , kdeclarative @@ -9,6 +10,7 @@ , kirigami2 , qtmultimedia , qtquickcontrols2 +, yt-dlp }: mkDerivation { @@ -16,6 +18,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules + wrapGAppsHook ]; buildInputs = [ @@ -32,6 +35,20 @@ mkDerivation { gstreamer ]); + patches = [ + ./0001-Add-placeholders-for-runtime-dependencies.patch + ]; + + postPatch = '' + substituteInPlace src/videomodel.cpp \ + --replace "@yt-dlp@" "${yt-dlp}/bin/yt-dlp" + ''; + + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + dontWrapGApps = true; + meta = { description = "Youtube player powered by an invidious server"; homepage = "https://invent.kde.org/plasma-mobile/plasmatube"; diff --git a/pkgs/applications/plasma-mobile/srcs.nix b/pkgs/applications/plasma-mobile/srcs.nix index 5bc824c44196..a30966847a59 100644 --- a/pkgs/applications/plasma-mobile/srcs.nix +++ b/pkgs/applications/plasma-mobile/srcs.nix @@ -4,195 +4,195 @@ { alligator = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/alligator-22.09.tar.xz"; - sha256 = "0krys21df6mlyi2zxdxgqx02k1q7njliz0nsxcygxrd89ajxlslb"; - name = "alligator-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/alligator-22.11.tar.xz"; + sha256 = "02hg42mmvykq71my6wbgc3yri4c3mr4bp73b7p21j1b8m3x0ycsl"; + name = "alligator-22.11.tar.xz"; }; }; angelfish = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/angelfish-22.09.tar.xz"; - sha256 = "1blhn84xka11zjwqimr30qv94jp5slfcmc44xcjxginl3n6hicwx"; - name = "angelfish-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/angelfish-22.11.tar.xz"; + sha256 = "07gp6468c7rhf3hzzk6qyz4kcah0s1wnn5r3mx7qmg777xaans9y"; + name = "angelfish-22.11.tar.xz"; }; }; audiotube = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/audiotube-22.09.tar.xz"; - sha256 = "1ay3qrg8lnw209kwmgm2ll5k1gbp2q694g6w837xl2wjy792vqw8"; - name = "audiotube-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/audiotube-22.11.tar.xz"; + sha256 = "0ga7ag8v9l91j5rrn02kk73zl29lwigcql1xfh7yw5cnky3xd13q"; + name = "audiotube-22.11.tar.xz"; }; }; calindori = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/calindori-22.09.tar.xz"; - sha256 = "1pwgdqznp76mhk0ikzjhy3c67qgk91kgv69ygqwzlh5hwiw5sl4n"; - name = "calindori-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/calindori-22.11.tar.xz"; + sha256 = "1mgdd61zmnjbpcwkaq2aiawksf1s86b05sq502by6gpdrwndhb5c"; + name = "calindori-22.11.tar.xz"; }; }; kalk = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/kalk-22.09.tar.xz"; - sha256 = "0sci3jv3asjxahcdz2vkmh90fbffx8lfj1cy5kqnpijdxcm10gfq"; - name = "kalk-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/kalk-22.11.tar.xz"; + sha256 = "0ri39455341nw6bn0lphky6n2b4ib9g4i24f6gzc0adnbhbpxdiq"; + name = "kalk-22.11.tar.xz"; }; }; kasts = { - version = "22.09.2"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/kasts-22.09.2.tar.xz"; - sha256 = "10i0b8k1k0ki8pq8hsj979y7np75iaq49bxkyj95zzci9g73vd59"; - name = "kasts-22.09.2.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/kasts-22.11.tar.xz"; + sha256 = "049700i15cw07c6053iml1q3h5mni24kdf8nvkdafdafhslb84i9"; + name = "kasts-22.11.tar.xz"; }; }; kclock = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/kclock-22.09.tar.xz"; - sha256 = "18b5lncgh9vc94bgrdmzigi853j4l7hqrvggk4hfcklj4pnv1bav"; - name = "kclock-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/kclock-22.11.tar.xz"; + sha256 = "02v64zfbv1g3q4w79d0r8rxqiqsnxms7dgkjv09bp1gl1asqx354"; + name = "kclock-22.11.tar.xz"; }; }; keysmith = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/keysmith-22.09.tar.xz"; - sha256 = "0w3vvmp9rn6ahly2fm9n6f4glfr7d84bfvj33mrs5pn7n99h7jgy"; - name = "keysmith-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/keysmith-22.11.tar.xz"; + sha256 = "1aimsgwk80yvncbsjnaxvr6aj8y4g40dpwfv0qi0k7b3xkrmqdk5"; + name = "keysmith-22.11.tar.xz"; }; }; khealthcertificate = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/khealthcertificate-22.09.tar.xz"; - sha256 = "16vkjpyxwx34pvdpnci0l6mx2bdjialiscjvbdx53xbsq9ff701k"; - name = "khealthcertificate-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/khealthcertificate-22.11.tar.xz"; + sha256 = "0gw6j70k0nvbfb1vfj8b64vfipdckzd8hqqmp9vrmsg7y8g8n0hi"; + name = "khealthcertificate-22.11.tar.xz"; }; }; koko = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/koko-22.09.tar.xz"; - sha256 = "1z3ysc2f1agbkmm2cxa87x5rk2nx9fjv3czlvcsn8s5ssfdws3gl"; - name = "koko-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/koko-22.11.tar.xz"; + sha256 = "1jqjjd9spyppdbijdnvci742wj80p10pfbjp1hyc0y4zdjic67bv"; + name = "koko-22.11.tar.xz"; }; }; kongress = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/kongress-22.09.tar.xz"; - sha256 = "0pjp2s774sgw2dklqib8alm1a9fkixy3s92i2v8v00znx08zf2jz"; - name = "kongress-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/kongress-22.11.tar.xz"; + sha256 = "03r8xck9vxl3al3f5v6g0yzqzs3yxl3lg7zg73ik22q6z2rb1adb"; + name = "kongress-22.11.tar.xz"; }; }; krecorder = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/krecorder-22.09.tar.xz"; - sha256 = "0kcgw7bsyw3bhai2djcq3qjn5ims7i4qbvpm7nwpjkm1p3m7fjii"; - name = "krecorder-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/krecorder-22.11.tar.xz"; + sha256 = "1wiihcp1c0wc7ssj9hj18rnzf8synaxmq6b0m2m286x4zibl50wb"; + name = "krecorder-22.11.tar.xz"; }; }; ktrip = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/ktrip-22.09.tar.xz"; - sha256 = "0x9s4yh2nvy7zmg3ds9bn8ir6wx10i8d0mvfaylbzb39rcabpmrl"; - name = "ktrip-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/ktrip-22.11.tar.xz"; + sha256 = "07mjf9jpj20ixhswy4byqy3m4sr1qylwlvq2prabn11j42ahpsy7"; + name = "ktrip-22.11.tar.xz"; }; }; kweather = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/kweather-22.09.tar.xz"; - sha256 = "0z3z659y1r1jry02w0hxwcpghkgxgqiwj1kqck07vlg8ks7lz1jz"; - name = "kweather-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/kweather-22.11.tar.xz"; + sha256 = "0sqc74yp5hvrjagax6nj0gm4qvbxqr66706yh12abcn9gpl33ndl"; + name = "kweather-22.11.tar.xz"; }; }; neochat = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/neochat-22.09.tar.xz"; - sha256 = "1j8p6mv89q1krjjbc9n26r83csqpxwd03zzhvzxxm53334qwqdci"; - name = "neochat-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/neochat-22.11.tar.xz"; + sha256 = "1gnhk9hww05bc4y8jd4sg3146c6m96ds2saajrnzyc6963j2ndi5"; + name = "neochat-22.11.tar.xz"; }; }; plasma-dialer = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/plasma-dialer-22.09.tar.xz"; - sha256 = "1wk8q5lc15d53viqyknsww1hgci1rxmnra4hj887fabnj0id29rs"; - name = "plasma-dialer-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/plasma-dialer-22.11.tar.xz"; + sha256 = "1qx7xmvfszpsrb2jylnwfs8rhr09kxvy5vnyzzcds248ljh5l6dy"; + name = "plasma-dialer-22.11.tar.xz"; }; }; plasma-phonebook = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/plasma-phonebook-22.09.tar.xz"; - sha256 = "1wsv330sfjh78fg98kd2g6a4bsmdyf7gn9r3aqazci7p7i5n2ln0"; - name = "plasma-phonebook-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/plasma-phonebook-22.11.tar.xz"; + sha256 = "02sj6v18w63ixy0c93fm4j9n4q98497qrb509q84618gry4cazly"; + name = "plasma-phonebook-22.11.tar.xz"; }; }; plasma-settings = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/plasma-settings-22.09.tar.xz"; - sha256 = "0jq2r7ckz27a8r41n4jn61wlrpcx0qwlasipig4jz7rc9i0ayfka"; - name = "plasma-settings-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/plasma-settings-22.11.tar.xz"; + sha256 = "0pg71plcbn4zkwxwcvay9swaa5xn3mnljdpnh4i8f86x2pa1pq5j"; + name = "plasma-settings-22.11.tar.xz"; }; }; plasmatube = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/plasmatube-22.09.tar.xz"; - sha256 = "00w9p5fcpv4s406lmcdcbrxf19sgkvf9yy8pfjmf1asvvvi8bpnk"; - name = "plasmatube-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/plasmatube-22.11.tar.xz"; + sha256 = "0vgxvyw4yl91kaj9cnjf455mpj4a5rh5f1z0in8k9p2jbs8wmjil"; + name = "plasmatube-22.11.tar.xz"; }; }; qmlkonsole = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/qmlkonsole-22.09.tar.xz"; - sha256 = "19bf9f4vxa8arnl1zjappg6kh21br131cbsx902qnpv6y0r3swz1"; - name = "qmlkonsole-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/qmlkonsole-22.11.tar.xz"; + sha256 = "03hwyrl6rb7yidw0nadis6csb6snpfv137j46rbpl35vrqrnrh5i"; + name = "qmlkonsole-22.11.tar.xz"; }; }; spacebar = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/spacebar-22.09.tar.xz"; - sha256 = "0fmk7fa7i67l8ff0amn80yxhf05vf0j9c42zj6qg5p30d1j31pbl"; - name = "spacebar-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/spacebar-22.11.tar.xz"; + sha256 = "1q0nyfvssiz5i19wyk4pvazax3vvk945cmknw4l51mpcc3hnc1v5"; + name = "spacebar-22.11.tar.xz"; }; }; telly-skout = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/telly-skout-22.09.tar.xz"; - sha256 = "1byakylbjjxyz6bh59dydqnvh8c627jpx39ih1ylrdl8jlkd0scy"; - name = "telly-skout-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/telly-skout-22.11.tar.xz"; + sha256 = "0sfdia4jwcv24z5d3qykqv7ncr2c5v7ywq471nggwpcr22bwzn6x"; + name = "telly-skout-22.11.tar.xz"; }; }; tokodon = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/tokodon-22.09.tar.xz"; - sha256 = "123vyq9vfl48l7ssrymvkhxlkwihplnssal0wvz4n2dk59byl46p"; - name = "tokodon-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/tokodon-22.11.tar.xz"; + sha256 = "0afrqih1bkgg0xqr81sq9q3glyhy8347p8vzddl42zsxax9wki59"; + name = "tokodon-22.11.tar.xz"; }; }; vakzination = { - version = "22.09"; + version = "22.11"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.09/vakzination-22.09.tar.xz"; - sha256 = "01xzc1di57j0fgzkqwa39jng0fd90laya0rj85vjda7mbh2lxxk6"; - name = "vakzination-22.09.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.11/vakzination-22.11.tar.xz"; + sha256 = "0587p5q9v0lh3nz00dfa8kym36xcgcg8n4alnchk6kr8c479kmk6"; + name = "vakzination-22.11.tar.xz"; }; }; } diff --git a/pkgs/applications/plasma-mobile/tokodon.nix b/pkgs/applications/plasma-mobile/tokodon.nix new file mode 100644 index 000000000000..a412835c8ccd --- /dev/null +++ b/pkgs/applications/plasma-mobile/tokodon.nix @@ -0,0 +1,78 @@ +{ lib +, mkDerivation + +, cmake +, extra-cmake-modules +, pkg-config + +, kconfig +, kdbusaddons +, ki18n +, kirigami2 +, kirigami-addons +, knotifications +, libwebsockets +, qqc2-desktop-style +, qtbase +, qtkeychain +, qtmultimedia +, qtquickcontrols2 +, qttools +, qtwebsockets +, kitemmodels +, pimcommon + +# Workarounds for the point release being missing. +, libsForQt5 +, fetchFromGitLab +}: + +# NOTE: we cannot use `mkDerivation` injected by the Plasma Mobile package +# set for the point release, as the point release was not uploaded to +# the Plasma Mobile gear repo, and the injected `mkDerivation` only can +# use the src (and version) from the `srcs` set. +libsForQt5.mkDerivation rec { + pname = "tokodon"; + + version = "22.11.2"; + # NOTE: the tokodon point release was not uploaded to the Plasma Mobile gear repo. + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "network"; + repo = pname; + rev = "v${version}"; + hash = "sha256-uE9iHZDfpn1NTCeJPgsp2WBe0curdguTUbMTrkrmJ6M="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + ]; + + buildInputs = [ + kconfig + kdbusaddons + ki18n + kirigami2 + kirigami-addons + knotifications + qqc2-desktop-style + qtbase + qtkeychain + qtmultimedia + qtquickcontrols2 + qttools + qtwebsockets + kitemmodels + pimcommon + ]; + + meta = with lib; { + description = "A Mastodon client for Plasma and Plasma Mobile"; + homepage = "https://invent.kde.org/network/tokodon"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} diff --git a/pkgs/applications/radio/ax25-apps/default.nix b/pkgs/applications/radio/ax25-apps/default.nix new file mode 100644 index 000000000000..4f9ecd3580f8 --- /dev/null +++ b/pkgs/applications/radio/ax25-apps/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchurl +, libax25 +, ncurses +}: + +stdenv.mkDerivation rec { + pname = "ax25-apps"; + version = "0.0.8-rc5"; + + buildInputs = [ libax25 ncurses ]; + + # Due to recent unsolvable administrative domain problems with linux-ax25.org, + # the new domain is linux-ax25.in-berlin.de + src = fetchurl { + url = "https://linux-ax25.in-berlin.de/pub/ax25-apps/ax25-apps-${version}.tar.gz"; + sha256 = "sha256-MzQOIyy5tbJKmojMrgtOcsaQTFJvs3rqt2hUgholz5Y="; + }; + + configureFlags = [ + "--sysconfdir=/etc" + "--program-transform-name=s@^call$@ax&@;s@^listen$@ax&@" + ]; + + meta = with lib; { + description = "AX.25 ham radio applications"; + homepage = "https://linux-ax25.in-berlin.de/wiki/Main_Page"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ sarcasticadmin ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/radio/ax25-tools/default.nix b/pkgs/applications/radio/ax25-tools/default.nix new file mode 100644 index 000000000000..0e806c1107e5 --- /dev/null +++ b/pkgs/applications/radio/ax25-tools/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchurl +, libax25 +}: + +stdenv.mkDerivation rec { + pname = "ax25-tools"; + version = "0.0.10-rc5"; + + buildInputs = [ libax25 ]; + + # Due to recent unsolvable administrative domain problems with linux-ax25.org, + # the new domain is linux-ax25.in-berlin.de + src = fetchurl { + url = "https://linux-ax25.in-berlin.de/pub/ax25-tools/ax25-tools-${version}.tar.gz"; + sha256 = "sha256-kqnLi1iobcufVWMPxUyaRsWKIPyTvtUkuMERGQs2qgY="; + }; + + configureFlags = [ "--sysconfdir=/etc" ]; + + meta = with lib; { + description = "Non-GUI tools used to configure an AX.25 enabled computer"; + homepage = "https://linux-ax25.in-berlin.de/wiki/Main_Page"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ sarcasticadmin ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 95d33d6f1eec..e73f438f76b8 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -1,24 +1,39 @@ { lib -, fetchurl -, python2 +, fetchFromGitHub +, python3 +, unstableGitUpdater }: -python2.pkgs.buildPythonApplication rec { - pname = "chirp-daily"; - version = "20220823"; - src = fetchurl { - url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-V+8HQAYU2XjOYeku0XEHqkY4m0XjiUBxM61QcupnlVM="; +python3.pkgs.buildPythonApplication rec { + pname = "chirp"; + version = "unstable-2022-12-07"; + + src = fetchFromGitHub { + owner = "kk7ds"; + repo = "chirp"; + rev = "dc0c98d22423b496faf0a86296a6ec0bb3b3e11a"; + hash = "sha256-z0xD11CB7Vt8k0dPXE+E5ZD9XAFwWNxjnUs25/Gd7zI="; }; - propagatedBuildInputs = with python2.pkgs; [ - pygtk pyserial libxml2 future + propagatedBuildInputs = with python3.pkgs; [ + future + pyserial + requests + six + wxPython_4_2 ]; + # "running build_ext" fails with no output + doCheck = false; + + passthru.updateScript = unstableGitUpdater { + branch = "py3"; + }; + meta = with lib; { description = "A free, open-source tool for programming your amateur radio"; homepage = "https://chirp.danplanet.com/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix new file mode 100644 index 000000000000..ceb0f7661c8e --- /dev/null +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, nixosTests +, php}: + +stdenvNoCC.mkDerivation rec { + name = "cloudlog"; + version = "2.3.3"; + + src = fetchFromGitHub { + owner = "magicbug"; + repo = "Cloudlog"; + rev = version; + sha256 = "sha256-9m7BuUNdGeKqi8pzeW2J9zpxShulpynCwJJGkRFkBa4="; + }; + + postPath = '' + substituteInPlace index.php \ + --replace "define('ENVIRONMENT', 'development');" "define('ENVIRONMENT', 'production');" + ''; + + installPhase = '' + mkdir $out/ + cp -R ./* $out + ''; + + passthru.tests = { + inherit (nixosTests) cloudlog; + }; + + meta = with lib; { + description = '' + Web based amateur radio logging application built using PHP & MySQL + supports general station logging tasks from HF to Microwave with + supporting applications to support CAT control. + ''; + license = licenses.mit; + homepage = "https://www.magicbug.co.uk/cloudlog"; + platforms = php.meta.platforms; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/pkgs/applications/radio/csdr/default.nix b/pkgs/applications/radio/csdr/default.nix index 5fc3f900da66..b26e8ae7225f 100644 --- a/pkgs/applications/radio/csdr/default.nix +++ b/pkgs/applications/radio/csdr/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { libsamplerate ]; + hardeningDisable = lib.optional stdenv.isAarch64 "format"; + postFixup = '' substituteInPlace "$out"/lib/pkgconfig/csdr.pc \ --replace '=''${prefix}//' '=/' \ @@ -30,11 +32,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://github.com/jketterl/csdr"; description = "A simple DSP library and command-line tool for Software Defined Radio"; license = licenses.gpl3Only; platforms = platforms.unix; + broken = stdenv.isDarwin; maintainers = teams.c3d2.members; }; } diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index 7f42ddcf012b..a67b48c840be 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 = "7.1"; + version = "8.2"; src = fetchFromGitHub { owner = "flightaware"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1fD8ZMkTS/r+p1rrOfJhH2sz3sJCapQcvk8f8crGApw="; + sha256 = "sha256-SUvK9XTXIDimEMEnORnp/Af/F030TZTxLI43Jzz31Js="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/radio/flex-ncat/default.nix b/pkgs/applications/radio/flex-ncat/default.nix index e06b241905d3..5425c6b73ac8 100644 --- a/pkgs/applications/radio/flex-ncat/default.nix +++ b/pkgs/applications/radio/flex-ncat/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flex-ncat"; - version = "0.1-20221007.1"; + version = "0.2-20230126.0"; src = fetchFromGitHub { owner = "kc2g-flex-tools"; repo = "nCAT"; rev = "v${version}"; - hash = "sha256-9rxI3wsqjhaH7DD1Go/8s0r6jXaE15Z9PPtbsnsfrM0="; + hash = "sha256-2taQQVTgAFyqtS06zZ+4Qmr/JIqU6mxNQYvxt+L/Mtc="; }; - vendorSha256 = "sha256-lnJtFixgv4ke4Knavb+XKFPzHCiAPhNtfZS3SRVvY2g="; + vendorHash = "sha256-Tv6sbfWNOHYwA7v1SpNeM9aHs+3DSFv4V4qxllxrzJc="; meta = with lib; { homepage = "https://github.com/kc2g-flex-tools/nCAT"; diff --git a/pkgs/applications/radio/flex-ndax/default.nix b/pkgs/applications/radio/flex-ndax/default.nix index 477953ab26fd..b1bda9fadce3 100644 --- a/pkgs/applications/radio/flex-ndax/default.nix +++ b/pkgs/applications/radio/flex-ndax/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "flex-ndax"; - version = "0.2-20221007.1"; + version = "0.3-20230126.0"; src = fetchFromGitHub { owner = "kc2g-flex-tools"; repo = "nDAX"; rev = "v${version}"; - hash = "sha256-QldbiJnCjWrlXEPvyAqV5Xwz9YvsnVobVy/E/OB0A1k="; + hash = "sha256-co2S3DrdGeoNneqNyifd+Z1z5TshyD+FgHkiSRqK3SQ="; }; buildInputs = [ libpulseaudio ]; - vendorSha256 = "sha256-eHy8oFYicVONQr31LQQ9b5auzeBoIzbszw2buKaBQbQ="; + vendorHash = "sha256-eHy8oFYicVONQr31LQQ9b5auzeBoIzbszw2buKaBQbQ="; meta = with lib; { broken = stdenv.isDarwin; diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index b648c04577e0..06cb2776a0b3 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -3,6 +3,9 @@ , stdenv , fetchFromGitHub , cmake +, macdylibbundler +, makeWrapper +, darwin , codec2 , libpulseaudio , libsamplerate @@ -21,23 +24,28 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.8.4"; + version = "1.8.7"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-X/jL6q2yLNtRq7Xg9JeXu1zXD0KCs59D1poA9hM3Ndo="; + hash = "sha256-N9LZCf2YAhVgxnQWgCB9TqGNpUGP1ZqpLmbYIaQsn08="; }; postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/CMakeLists.txt \ - --replace "if(APPLE)" "if(0)" \ - --replace "\''${FREEDV_LINK_LIBS})" "\''${FREEDV_LINK_LIBS} \''${FREEDV_LINK_LIBS_OSX})" \ - --replace "\''${RES_FILES})" "\''${RES_FILES} \''${FREEDV_SOURCES_OSX})" + --replace "\''${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler" "dylibbundler" + sed -i "/hdiutil/d" src/CMakeLists.txt ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals stdenv.isDarwin [ + macdylibbundler + makeWrapper + darwin.autoSignDarwinBinariesHook + ]; buildInputs = [ codec2 @@ -67,6 +75,12 @@ stdenv.mkDerivation rec { doCheck = true; + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv $out/bin/FreeDV.app $out/Applications + makeWrapper $out/Applications/FreeDV.app/Contents/MacOS/FreeDV $out/bin/freedv + ''; + meta = with lib; { homepage = "https://freedv.org/"; description = "Digital voice for HF radio"; diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 6aac0112f961..e6461c924489 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -44,7 +44,7 @@ gnuradio.pkgs.mkDerivation rec { gnuradio.unwrapped.python.pkgs.Mako gnuradio.unwrapped.python.pkgs.six ]; - checkInputs = [ + nativeCheckInputs = [ gtest ]; diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 301193a65785..1dbdbaa7225f 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -250,7 +250,7 @@ stdenv.mkDerivation rec { }) ]; passthru = shared.passthru // { - # Deps that are potentially overriden and are used inside GR plugins - the same version must + # Deps that are potentially overridden and are used inside GR plugins - the same version must inherit boost volk diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index e54c502060a2..baf86ca43427 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -280,7 +280,7 @@ stdenv.mkDerivation rec { ./modtool-newmod-permissions.patch ]; passthru = shared.passthru // { - # Deps that are potentially overriden and are used inside GR plugins - the same version must + # Deps that are potentially overridden and are used inside GR plugins - the same version must inherit boost volk diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 39aa9336aec9..e06e3437281c 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 = "4"; - patch = "0"; + minor = "5"; + patch = "1"; } }: let - sourceSha256 = "sha256-Ov2NGiEj3mhqYwDYXWd6wcCAv78Ux2/LWyGjQ/ukQNk="; + sourceSha256 = "sha256-D5Bsj70IHFOLPZQbaxkGdx7Lz94bXhCfnNfhZb3dDp4="; featuresInfo = { # Needed always basic = { @@ -299,7 +299,7 @@ stdenv.mkDerivation rec { ./modtool-newmod-permissions.patch ]; passthru = shared.passthru // { - # Deps that are potentially overriden and are used inside GR plugins - the same version must + # Deps that are potentially overridden and are used inside GR plugins - the same version must inherit boost volk diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index a5ae83eb3513..ff6aaf35bea0 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -7,7 +7,7 @@ , features , versionAttr , sourceSha256 -# If overriden. No need to set default values, as they are given defaults in +# If overridden. No need to set default values, as they are given defaults in # the main expressions , overrideSrc , fetchFromGitHub diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 8dcc9ca65d45..2ccc2c73771f 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -2,7 +2,9 @@ , fetchFromGitHub , cmake , pkg-config -, qt5 +, qtbase +, qtsvg +, qtwayland , gnuradio3_8Minimal , thrift , mpir @@ -10,6 +12,7 @@ , alsa-lib , libjack2 , wrapGAppsHook +, wrapQtAppsHook # drivers (optional): , rtl-sdr , hackrf @@ -30,13 +33,13 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { owner = "gqrx-sdr"; repo = "gqrx"; rev = "v${version}"; - sha256 = "sha256-KQBtYVEfOXpzfxNMgTu6Hup7XpjubrpvZazcFlml4Kg="; + hash = "sha256-KQBtYVEfOXpzfxNMgTu6Hup7XpjubrpvZazcFlml4Kg="; }; nativeBuildInputs = [ cmake pkg-config - qt5.wrapQtAppsHook + wrapQtAppsHook wrapGAppsHook ]; buildInputs = [ @@ -46,8 +49,9 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { alsa-lib libjack2 gnuradio3_8Minimal.unwrapped.boost - qt5.qtbase - qt5.qtsvg + qtbase + qtsvg + qtwayland gnuradio3_8Minimal.pkgs.osmosdr rtl-sdr hackrf diff --git a/pkgs/applications/radio/gridtracker/default.nix b/pkgs/applications/radio/gridtracker/default.nix new file mode 100644 index 000000000000..cfb1f367ad80 --- /dev/null +++ b/pkgs/applications/radio/gridtracker/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitLab +, nwjs +}: + +stdenv.mkDerivation rec { + pname = "gridtracker"; + version = "1.23.0110"; + + src = fetchFromGitLab { + owner = "gridtracker.org"; + repo = "gridtracker"; + rev = "v${version}"; + sha256 = "sha256-yQWdBNt7maYTzroB+P1hsGIeivkP+soR3/b847HLYZY="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace '$(DESTDIR)/usr' '$(DESTDIR)/' + substituteInPlace gridtracker.sh \ + --replace "exec nw" "exec ${nwjs}/bin/nw" \ + --replace "/usr/share/gridtracker" "$out/share/gridtracker" + substituteInPlace gridtracker.desktop \ + --replace "/usr/share/gridtracker/gridview.png" "$out/share/gridtracker/gridview.png" + ''; + + makeFlags = [ "DESTDIR=$(out)" "NO_DIST_INSTALL=1" ]; + + meta = with lib; { + description = "An amateur radio companion to WSJT-X or JTDX"; + longDescription = '' + GridTracker listens to traffic from WSJT-X/JTDX, displays it on a map, + and has a sophisticated alerting and filtering system for finding and + working interesting stations. It also will upload QSO records to multiple + logging frameworks including Logbook of the World. + ''; + homepage = "https://gridtracker.org"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/pkgs/applications/radio/grig/default.nix b/pkgs/applications/radio/grig/default.nix new file mode 100644 index 000000000000..33ae8b8ff88b --- /dev/null +++ b/pkgs/applications/radio/grig/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, wrapGAppsHook +, gtk2 +, hamlib_4 }: + +stdenv.mkDerivation rec { + pname = "grig"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "fillods"; + repo = "grig"; + rev = "GRIG-${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "sha256-OgIgHW9NMW/xSSti3naIR8AQWUtNSv5bYdOcObStBlM="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + buildInputs = [ hamlib_4 gtk2 ]; + + meta = with lib; { + description = "A simple Ham Radio control (CAT) program based on Hamlib"; + longDescription = '' + Grig is a graphical user interface for the Ham Radio Control Libraries. + It is intended to be simple and generic, presenting the user with the + same interface regardless of which radio they use. + ''; + homepage = "https://groundstation.sourceforge.net/grig/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/pkgs/applications/radio/kappanhang/default.nix b/pkgs/applications/radio/kappanhang/default.nix index a236de8d9468..9146bfd781c9 100644 --- a/pkgs/applications/radio/kappanhang/default.nix +++ b/pkgs/applications/radio/kappanhang/default.nix @@ -20,6 +20,7 @@ buildGoModule rec { homepage = "https://github.com/nonoo/kappanhang"; description = "Remote control for Icom radio transceivers"; license = licenses.mit; + platforms = platforms.linux; maintainers = with maintainers; [ mvs ]; }; } diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index 3eafadce114a..ed4c797fac47 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -2,7 +2,8 @@ , sqlite, wxGTK32, libusb1, soapysdr , mesa_glu, libX11, gnuplot, fltk , GLUT -} : +, withGui ? true +}: stdenv.mkDerivation rec { pname = "limesuite"; @@ -19,20 +20,21 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DOpenGL_GL_PREFERENCE=GLVND" - ]; + ] ++ lib.optional (!withGui) "-DENABLE_GUI=OFF"; buildInputs = [ libusb1 sqlite - wxGTK32 - fltk gnuplot libusb1 soapysdr - mesa_glu - libX11 ] ++ lib.optionals stdenv.isDarwin [ GLUT + ] ++ lib.optionals withGui [ + fltk + libX11 + mesa_glu + wxGTK32 ]; postInstall = '' diff --git a/pkgs/applications/radio/m17-cxx-demod/default.nix b/pkgs/applications/radio/m17-cxx-demod/default.nix index 86c30686c706..884ebe7a91b5 100644 --- a/pkgs/applications/radio/m17-cxx-demod/default.nix +++ b/pkgs/applications/radio/m17-cxx-demod/default.nix @@ -20,5 +20,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; platforms = platforms.unix; maintainers = teams.c3d2.members; + # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix new file mode 100644 index 000000000000..79a9fdb51ced --- /dev/null +++ b/pkgs/applications/radio/qdmr/default.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitHub, + installShellFiles, + writeText, + cmake, + libxslt, + docbook_xsl_ns, + wrapQtAppsHook, + libusb1, + libyamlcpp, + qtlocation, + qtserialport, + qttools, + qtbase, +}: + +let + inherit (stdenv) isLinux; +in + +stdenv.mkDerivation rec { + pname = "qdmr"; + version = "0.11.2"; + + src = fetchFromGitHub { + owner = "hmatuschek"; + repo = "qdmr"; + rev = "v${version}"; + sha256 = "sha256-zT31tzsm5OM99vz8DzGCdPmnemiwiJpKccYwECnUgOQ="; + }; + + nativeBuildInputs = [ + cmake + libxslt + wrapQtAppsHook + installShellFiles + ]; + + buildInputs = [ + libyamlcpp + libusb1 + qtlocation + qtserialport + qttools + qtbase + ]; + + postPatch = lib.optionalString isLinux '' + substituteInPlace doc/docbook_man.debian.xsl \ + --replace /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook\.xsl ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl + ''; + + cmakeFlags = [ "-DBUILD_MAN=ON" ]; + + postInstall = '' + installManPage doc/dmrconf.1 doc/qdmr.1 + mkdir -p "$out/etc/udev/rules.d" + cp ${src}/dist/99-qdmr.rules $out/etc/udev/rules.d/ + ''; + + meta = { + description = "A codeplug programming tool for DMR radios"; + homepage = "https://dm3mat.darc.de/qdmr/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ janik _0x4A6F ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index 88cff17bc3b8..a0b7dd8c7821 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -14,6 +14,7 @@ , libsndfile , libftdi , limesuite +, soapysdr-with-plugins , protobuf , speex , speexdsp @@ -23,13 +24,13 @@ gnuradio3_8.pkgs.mkDerivation rec { pname = "qradiolink"; - version = "0.8.7-1"; + version = "0.8.8-1"; src = fetchFromGitHub { owner = "qradiolink"; repo = "qradiolink"; rev = version; - sha256 = "sha256-4WkAEJvWu1+ZYDeipRl1oJWn5IR1nTXJ8We0trhbkQE="; + sha256 = "sha256-2M5TSTNbbH188GiKqjP+IfBqks379Fw0fiGLBNiaxEg="; }; preBuild = '' @@ -58,6 +59,7 @@ gnuradio3_8.pkgs.mkDerivation rec { libopus libjpeg limesuite + soapysdr-with-plugins speex speexdsp gnuradio3_8.qt.qtbase diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 45f609c08f23..fa3f566b3f0c 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -42,14 +42,13 @@ mkDerivation rec { pname = "sdrangel"; - version = "7.8.3"; + version = "7.8.6"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "sha256-zP3Ic0mru0FcX7ZuE/IKGmHA596lq5Y1cWdBESzzU0U="; - fetchSubmodules = false; + sha256 = "sha256-tLU2OHFf1PPNRr1t3MWWCKnvILp1DW0k4TAxrXWI2X4="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/radio/srsran/default.nix b/pkgs/applications/radio/srsran/default.nix index 257de8b4c204..5bd408e25566 100644 --- a/pkgs/applications/radio/srsran/default.nix +++ b/pkgs/applications/radio/srsran/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "srsran"; - version = "22.04.1"; + version = "22.10"; src = fetchFromGitHub { owner = "srsran"; repo = "srsran"; rev = "release_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-jqaGlMhy6L6lRknl6Ezi0n+vNjMb7C+FN9a+QeOy/RY="; + sha256 = "sha256-O43MXJ6EyKXg7hA1WjW8TqLmAWC+h5RLBGzBO6f/0zo="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 93836cee2819..3dd7a5422537 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.3"; + version = "2.9.4"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-TrvyPcpSMACrbKPVOjxHsVsC28LmruiVO/CyCPh0KZ8="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Hi0VqBtGeaXMsibxbHk+2FN8mzfpmkuDr37JRW4Fp+s="; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/science/astronomy/gprojector/default.nix b/pkgs/applications/science/astronomy/gprojector/default.nix index f5fa5f1d1e4b..5fd698788cc9 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.4"; + version = "3.0.6"; src = fetchzip { url = "https://www.giss.nasa.gov/tools/gprojector/download/G.ProjectorJ-${version}.tgz"; - sha256 = "sha256-6EixVNRgYnuY9INb7gAyBzo125DhPEUPD+pGxjzmhy8="; + sha256 = "sha256-aw/p6mbTJl023d46NUZV3pnP4WVdYqZTFmgGlHEKfq0="; }; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/applications/science/astronomy/phd2/default.nix b/pkgs/applications/science/astronomy/phd2/default.nix index 52049302a27b..2eef054d5ff5 100644 --- a/pkgs/applications/science/astronomy/phd2/default.nix +++ b/pkgs/applications/science/astronomy/phd2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK30-gtk3 +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK32 , curl, gettext, glib, indi-full, libnova, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - wxGTK30-gtk3 + wxGTK32 curl gettext glib diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix index 7e59c2865e56..db0411f1337a 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 = "1.0.5"; + version = "1.0.6"; src = fetchFromGitLab { owner = "free-astro"; repo = pname; rev = version; - sha256 = "sha256-1NPMTHPbYKPmaG+xRyKFU4/4Iio2ptn+HOvnsg4hoFE="; + sha256 = "sha256-KFCA3fUMVFHmh1BdKed5/dkq0EeYcmoWec97WX9ZHUc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 1b0f5abdf98b..89ba8bf0e9d9 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "stellarium"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "sha256-ellfBZWOkvlRauuwug96C7P/WjQ6dXiDnT0b3KH5zRM="; + sha256 = "sha256-0/ZSe6QfM2zVsqcbyqefl9hiuex72KPxJvVMRNCnpZg="; }; nativeBuildInputs = [ @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { homepage = "https://stellarium.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index debd69733aa7..4c5f3162febd 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk-unstable, vtk_8, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk, Cocoa }: stdenv.mkDerivation rec { - pname = "ANTs"; - version = "2.4.2"; + pname = "ANTs"; + version = "2.4.3"; src = fetchFromGitHub { owner = "ANTsX"; repo = "ANTs"; - rev = "v${version}"; - sha256 = "sha256-edkvTkgBNaC87Q0N/Fsebr9nRLMhDo4mrSGoMICdnwU="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-S4HYhsqof27UXEYjKvbod8N7PkZDmwLdwcEAvJD0W5g="; }; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ itk-unstable vtk_8 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ itk vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index 1702079e017f..954b704be0c6 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.5"; + version = "2.5.1"; src = fetchFromGitHub { owner = "BenLangmead"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xCsTkQXrZS+Njn0YfidhPln+OwVfTXOqbtB0dCfTP2U="; + sha256 = "sha256-HaiZmWU6akHXJVWBmCvkG2E61NDrAP7UIxx9DNCEZqE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix index 801ad00876bf..d9ae226027a0 100644 --- a/pkgs/applications/science/biology/bwa/default.nix +++ b/pkgs/applications/science/biology/bwa/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A software package for mapping low-divergent sequences against a large reference genome, such as the human genome"; license = licenses.gpl3; - homepage = "http://bio-bwa.sourceforge.net/"; + homepage = "https://bio-bwa.sourceforge.net/"; maintainers = with maintainers; [ luispedro ]; platforms = platforms.x86_64; }; diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index 90eef027a842..cbde1647db9b 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -4,7 +4,7 @@ , substituteAll , cmake , openjpeg -, libyamlcpp +, yaml-cpp , batchVersion ? false , withJpegLs ? true , withOpenJpeg ? true @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals batchVersion [ libyamlcpp ] + buildInputs = lib.optionals batchVersion [ yaml-cpp ] ++ lib.optionals withOpenJpeg [ openjpeg openjpeg.dev ]; cmakeFlags = lib.optionals batchVersion [ "-DBATCH_VERSION=ON" - "-DYAML-CPP_DIR=${libyamlcpp}/lib/cmake/yaml-cpp" + "-DYAML-CPP_DIR=${yaml-cpp}/lib/cmake/yaml-cpp" ] ++ lib.optionals withJpegLs [ "-DUSE_JPEGLS=ON" ] ++ lib.optionals withOpenJpeg [ diff --git a/pkgs/applications/science/biology/deeptools/default.nix b/pkgs/applications/science/biology/deeptools/default.nix index 1739a4c999a4..eaf0b5932726 100644 --- a/pkgs/applications/science/biology/deeptools/default.nix +++ b/pkgs/applications/science/biology/deeptools/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { deeptoolsintervals ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = with lib; { homepage = "https://deeptools.readthedocs.io/en/develop"; diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index 8073b1bea163..6cdae4cb53a2 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diamond"; - version = "2.0.15"; + version = "2.1.0"; src = fetchFromGitHub { owner = "bbuchfink"; repo = "diamond"; rev = "v${version}"; - sha256 = "17z9vwj58i1zc22gv4qscx0dk3nxf5ix443gxsibh3a5zsnc6dkg"; + sha256 = "sha256-tcUVWfb/EtJ6heJjQ3989uNjkWa6FocReJ5gjE35AMY="; }; diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/pkgs/applications/science/biology/ecopcr/default.nix index 4a6b093e1d0b..c5ab32a68838 100644 --- a/pkgs/applications/science/biology/ecopcr/default.nix +++ b/pkgs/applications/science/biology/ecopcr/default.nix @@ -1,17 +1,19 @@ -{ lib, stdenv, fetchurl, gcc, zlib, python27 }: +{ lib, stdenv, fetchurl, gcc, zlib, python3 }: stdenv.mkDerivation rec { pname = "ecopcr"; - version = "0.8.0"; + version = "1.0.1"; src = fetchurl { - url = "https://git.metabarcoding.org/obitools/ecopcr/uploads/6f37991b325c8c171df7e79e6ae8d080/ecopcr-${version}.tar.gz"; - sha256 = "10c58hj25z78jh0g3zcbx4890yd2qrvaaanyx8mn9p49mmyf5pk6"; + url = "https://git.metabarcoding.org/obitools/ecopcr/-/archive/ecopcr_v${version}/ecopcr-ecopcr_v${version}.tar.gz"; + hash = "sha256-ssvWpi7HuuRRAkpqqrX3ijLuBqM3QsrmrG+t7/m6fZA="; }; - sourceRoot = "ecoPCR/src"; + buildInputs = [ gcc python3 zlib ]; - buildInputs = [ gcc python27 zlib ]; + preConfigure = '' + cd src + ''; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index 29669d027303..d590a5da8a67 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { data in a variety of formats and even allows transparent retrieval of sequence data from the web.''; license = lib.licenses.gpl2; - homepage = "http://emboss.sourceforge.net/"; + homepage = "https://emboss.sourceforge.net/"; }; } diff --git a/pkgs/applications/science/biology/genmap/default.nix b/pkgs/applications/science/biology/genmap/default.nix index c2d1b8da7af1..c6f9cf1fb193 100644 --- a/pkgs/applications/science/biology/genmap/default.nix +++ b/pkgs/applications/science/biology/genmap/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; patches = [ ./gtest.patch ]; - checkInputs = [ gtest which ]; + nativeCheckInputs = [ gtest which ]; preCheck = "make genmap_algo_test"; # disable benchmarks diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 826271425663..f6d767235b7f 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "igv"; - version = "2.15.1"; + version = "2.15.5"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; - sha256 = "sha256-hwZ6Pl6BxoVbJI5e3b0s7jhQ/AADhVJVqM9Q8ppERuk="; + sha256 = "sha256-AKKMtR0hU2O84mRJxxsXNCYHeW8d6t3XJpzOKKaxAWw="; }; installPhase = '' diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 0b5b8bb5059d..7a101e6e19dc 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -1,20 +1,35 @@ -{ lib, stdenv, fetchFromGitLab, unzip, zlib, python3, parallel }: +{ lib +, stdenv +, fetchFromGitLab +, unzip +, zlib +, python3 +, parallel +}: stdenv.mkDerivation rec { pname = "last"; - version = "1411"; + version = "1445"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; - rev = version; - sha256 = "sha256-CO3tlFx9NxGplErENG6iFikgE246swPITsVR+nHzsYw="; + rev = "refs/tags/${version}"; + hash = "sha256-E3D9KmCIVcwXblwJ0wePk0wKoXwKA2UsSGqfMmRsw2A="; }; - nativeBuildInputs = [ unzip ]; - buildInputs = [ zlib python3 ]; + nativeBuildInputs = [ + unzip + ]; - makeFlags = [ "prefix=${placeholder "out"}" ]; + buildInputs = [ + zlib + python3 + ]; + + makeFlags = [ + "prefix=${placeholder "out"}" + ]; postFixup = '' for f in $out/bin/parallel-* ; do diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix index 99b6269737d1..4cb130296aec 100644 --- a/pkgs/applications/science/biology/mrtrix/default.nix +++ b/pkgs/applications/science/biology/mrtrix/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { qt5.qtsvg ]; - installCheckInputs = [ bc ]; + nativeInstallCheckInputs = [ bc ]; postPatch = '' patchShebangs ./build ./configure ./run_tests ./bin/* diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix index 54ff58cce717..99d13d1ab895 100644 --- a/pkgs/applications/science/biology/muscle/default.nix +++ b/pkgs/applications/science/biology/muscle/default.nix @@ -1,36 +1,27 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - _name = "muscle"; - name = "${_name}-${version}"; - version = "3.8.31"; + name = "muscle"; + version = "5.1.0"; - src = fetchurl { - url = "https://www.drive5.com/muscle/downloads${version}/${_name}${version}_src.tar.gz"; - sha256 = "1b89z0x7h098g99g00nqadgjnb2r5wpi9s11b7ddffqkh9m9dia3"; + + src = fetchFromGitHub { + owner = "rcedgar"; + repo = "${name}"; + rev = "${version}"; + hash = "sha256-NpnJziZXga/T5OavUt3nQ5np8kJ9CFcSmwyg4m6IJsk="; }; - patches = [ - ./muscle-3.8.31-no-static.patch - ]; - - preBuild = '' - cd ./src/ - patchShebangs mk - ''; + sourceRoot = "source/src"; installPhase = '' - install -vD muscle $out/bin/muscle + install -m755 -D Linux/muscle $out/bin/muscle ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); - description = "A multiple sequence alignment method with reduced time and space complexity"; - license = licenses.publicDomain; + description = "Multiple sequence alignment with top benchmark scores scalable to thousands of sequences"; + license = licenses.gpl3Plus; homepage = "https://www.drive5.com/muscle/"; - maintainers = [ maintainers.unode ]; - # NOTE: Supposed to be compatible with darwin/intel & PPC but currently fails. - # Anyone with access to these platforms is welcome to give it a try - platforms = lib.platforms.linux; + maintainers = with maintainers; [ unode thyol ]; }; } diff --git a/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch b/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch deleted file mode 100644 index 7f4b2129518d..000000000000 --- a/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/src/mk 2010-05-02 01:15:42.000000000 +0200 -+++ b/src/mk 2018-01-27 17:07:23.539092748 +0100 -@@ -5,14 +5,14 @@ - rm -f *.o muscle.make.stdout.txt muscle.make.stderr.txt - for CPPName in $CPPNames - do -- echo $CPPName >> /dev/tty -+ echo $CPPName - g++ $ENV_GCC_OPTS -c -O3 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $CPPName.cpp -o $CPPName.o >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt - done - - LINK_OPTS= --if [ `uname -s` == Linux ] ; then -- LINK_OPTS=-static --fi -+#if [ `uname -s` == Linux ] ; then -+# LINK_OPTS=-static -+#fi - g++ $LINK_OPTS $ENV_LINK_OPTS -g -o muscle $ObjNames >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt - tail muscle.make.stderr.txt - diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 4696b63d7a17..f6f2f3c43bb2 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.27.4"; + version = "2.27.5"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-H52iduXuZXkH7i+1qGq05DTPgLGZD2ke6US5nTzmvDg="; + sha256 = "sha256-Exyj4GJqPvEug5l5XnpJ+Cm7ToXXG0ib9PIx0hpsMZk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/sambamba/default.nix b/pkgs/applications/science/biology/sambamba/default.nix index c6e78a134e60..38333cbc9988 100644 --- a/pkgs/applications/science/biology/sambamba/default.nix +++ b/pkgs/applications/science/biology/sambamba/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "sambamba"; - version = "0.8.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "biod"; repo = "sambamba"; rev = "v${version}"; - sha256 = "sha256-FEa9QjQoGNUOAtMNMZcqpTKMKVtXoBuOomTy0mpos/0="; + sha256 = "sha256-HwAzsbT71Q35Io6H7Hzs4RTatpRpdHqV0cwPYAlsf6c="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 41129a667e91..c72dd1b19077 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; # tests require `bgzip` from the htslib package - checkInputs = [ htslib ]; + nativeCheckInputs = [ htslib ]; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix index 590f10dd87a1..2472e4976cad 100644 --- a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix +++ b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools for manipulating SAM/BAM/CRAM format"; license = licenses.mit; - homepage = "http://samtools.sourceforge.net/"; + homepage = "https://samtools.sourceforge.net/"; platforms = platforms.unix; maintainers = [ maintainers.unode ]; }; diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix index a47a107349da..269d6e307f1d 100644 --- a/pkgs/applications/science/biology/snpeff/default.nix +++ b/pkgs/applications/science/biology/snpeff/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Genetic variant annotation and effect prediction toolbox"; license = licenses.lgpl3; - homepage = "http://snpeff.sourceforge.net/"; + homepage = "https://snpeff.sourceforge.net/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ jbedo ]; platforms = platforms.all; diff --git a/pkgs/applications/science/biology/sratoolkit/default.nix b/pkgs/applications/science/biology/sratoolkit/default.nix new file mode 100644 index 000000000000..8a1bb5376eaf --- /dev/null +++ b/pkgs/applications/science/biology/sratoolkit/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, libidn +, zlib +, bzip2 +}: + + +let + libidn11 = libidn.overrideAttrs (old: { + pname = "libidn"; + version = "1.34"; + src = fetchurl { + url = "mirror://gnu/libidn/libidn-1.34.tar.gz"; + sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p"; + }; + }); + +in + +stdenv.mkDerivation rec { + pname = "sratoolkit"; + version = "2.11.3"; + + src = fetchurl { + url = "https://ftp-trace.ncbi.nlm.nih.gov/sra/sdk/${version}/sratoolkit.${version}-ubuntu64.tar.gz"; + sha256 = "1590lc4cplxr3lhjqci8fjncy67imn2h14qd2l87chmhjh243qvx"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + libidn11 + zlib + bzip2 + stdenv.cc.cc.lib + ]; + + sourceRoot = "./sratoolkit.${version}-ubuntu64/bin"; + + installPhase = '' + find -L . -executable -type f -! -name "*remote-fuser*" -exec install -m755 -D {} $out/bin/{} \; + ''; + + meta = with lib; { + homepage = "https://github.com/ncbi/sra-tools"; + description = "The SRA Toolkit and SDK from NCBI is a collection of tools and libraries for using data in the INSDC Sequence Read Archives."; + license = licenses.publicDomain; + maintainers = with maintainers; [ thyol ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index 3555929a33ea..e1a21cba0da2 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "star"; - version = "2.7.10a"; + version = "2.7.10b"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "sha256-qwddCGMOKWgx76qGwRQXwvv9fCSeVsZbWHmlBwEqGKE="; + sha256 = "sha256-58Y4lzqXwBhRlXcionUg2IhAg5znNUuyr/FsuNZd+5Q="; }; sourceRoot = "source/source"; diff --git a/pkgs/applications/science/biology/subread/default.nix b/pkgs/applications/science/biology/subread/default.nix index 987433a3a6d5..9206c4fbed7b 100644 --- a/pkgs/applications/science/biology/subread/default.nix +++ b/pkgs/applications/science/biology/subread/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ jbedo ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; - homepage = "http://subread.sourceforge.net/"; + homepage = "https://subread.sourceforge.net/"; }; } diff --git a/pkgs/applications/science/biology/tandem-aligner/default.nix b/pkgs/applications/science/biology/tandem-aligner/default.nix new file mode 100644 index 000000000000..f74ba9d2e443 --- /dev/null +++ b/pkgs/applications/science/biology/tandem-aligner/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, zlib +}: + +stdenv.mkDerivation { + pname = "TandemAligner"; + version = "unstable-2022-09-17"; + + src = fetchFromGitHub { + owner = "seryrzu"; + repo = "tandem_aligner"; + rev = "ac6004f108ad20477045f4d0b037d96051a9df70"; + hash = "sha256-iMDj1HZ8LzmZckuAM3lbG3eSJSd/5JGVA6SBs7+AgX8="; + }; + + sourceRoot = "source/tandem_aligner"; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ zlib ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp src/projects/tandem_aligner/tandem_aligner $out/bin + runHook postInstall + ''; + + doCheck = true; + + # adapted from target test_launch in Makefile + checkPhase = '' + runHook preCheck + mkdir -p $TMPDIR/test_launch + src/projects/tandem_aligner/tandem_aligner \ + --first $src/tandem_aligner/test_dataset/first.fasta \ + --second $src/tandem_aligner/test_dataset/second.fasta \ + -o $TMPDIR/test_launch \ + --debug + grep -q "Thank you for using TandemAligner!" $TMPDIR/test_launch/tandem_aligner.log + diff $TMPDIR/test_launch/cigar.txt $src/tandem_aligner/test_dataset/true_cigar.txt + runHook postCheck + ''; + + meta = { + description = "A parameter-free algorithm for sequence alignment"; + homepage = "https://github.com/seryrzu/tandem_aligner"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ amesgen ]; + platforms = lib.platforms.linux; + mainProgram = "tandem_aligner"; + }; +} diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/applications/science/biology/truvari/default.nix index 31c1fc50ee3e..412642f523f2 100644 --- a/pkgs/applications/science/biology/truvari/default.nix +++ b/pkgs/applications/science/biology/truvari/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pyvcf - python-Levenshtein + levenshtein progressbar2 pysam pyfaidx diff --git a/pkgs/applications/science/biology/veryfasttree/default.nix b/pkgs/applications/science/biology/veryfasttree/default.nix new file mode 100644 index 000000000000..d5d4c6231e69 --- /dev/null +++ b/pkgs/applications/science/biology/veryfasttree/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "veryfasttree"; + version = "3.1.1"; + + src = fetchFromGitHub { + owner = "citiususc"; + repo = "${name}"; + rev = "v${version}"; + hash = "sha256-AOzbxUnrn1qgscjdOKf4dordnSKtIg3nSVaYWK1jbuc="; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + install -m755 -D VeryFastTree $out/bin/VeryFastTree + ''; + + meta = with lib; { + description = "Speeding up the estimation of phylogenetic trees for large alignments through parallelization and vectorization strategies"; + license = licenses.gpl3Plus; + homepage = "https://github.com/citiususc/veryfasttree"; + maintainers = with maintainers; [ thyol ]; + }; +} diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix index 01fbfb1ccf9c..81849f675af3 100644 --- a/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/pkgs/applications/science/chemistry/cp2k/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "cp2k"; - version = "2022.2"; + version = "2023.1"; src = fetchFromGitHub { owner = "cp2k"; repo = "cp2k"; rev = "v${version}"; - hash = "sha256-zDIsgPcLnA0ATJEN1vQClpkToqvIyW7KuXhyGiXJXDw="; + hash = "sha256-SG5Gz0cDiSfbSZ8m4K+eARMLU4iMk/xK3esN5yt05RE="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/chemistry/d-seams/default.nix b/pkgs/applications/science/chemistry/d-seams/default.nix index dc41019d364b..260b1e24a082 100644 --- a/pkgs/applications/science/chemistry/d-seams/default.nix +++ b/pkgs/applications/science/chemistry/d-seams/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, fetchFromGitHub, fetchpatch, catch2, rang, fmt, libyamlcpp, cmake +{ clangStdenv, fetchFromGitHub, fetchpatch, catch2, rang, fmt, yaml-cpp, cmake , eigen, lua, luaPackages, liblapack, blas, lib, boost, gsl }: clangStdenv.mkDerivation rec { @@ -20,7 +20,7 @@ clangStdenv.mkDerivation rec { }) ]; nativeBuildInputs = [ cmake lua luaPackages.luafilesystem ]; - buildInputs = [ fmt rang libyamlcpp eigen catch2 boost gsl liblapack blas ]; + buildInputs = [ fmt rang yaml-cpp eigen catch2 boost gsl liblapack blas ]; meta = with lib; { description = diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 1ebf3a1ec468..e5807c6c108b 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -68,5 +68,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = with lib.platforms; linux ++ darwin; maintainers = [ lib.maintainers.cge ]; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index c72a4ace2480..b5b5be84c8ec 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.32.76"; + version = "14.32.83"; 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-KdQZKiAJFKE2PW0/DdZGIOC8QQ1icQR+TY4hoXCQdxg="; + sha256 = "sha256-otvaDPdGRmtUfWfy7m+CJOyDOFuW/AExbskYnYEikY8="; }; patchPhase = '' diff --git a/pkgs/applications/science/computer-architecture/accelergy/default.nix b/pkgs/applications/science/computer-architecture/accelergy/default.nix new file mode 100644 index 000000000000..ec702d2b2906 --- /dev/null +++ b/pkgs/applications/science/computer-architecture/accelergy/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, python3Packages, pkgs }: + +python3Packages.buildPythonApplication rec { + pname = "accelergy"; + version = "unstable-2022-05-03"; + + src = fetchFromGitHub { + owner = "Accelergy-Project"; + repo = "accelergy"; + rev = "34df8e87a889ae55cecba58992d4573466b40565"; + hash = "sha256-SRtt1EocHy5fKszpoumC+mOK/qhreoA2/Ff1wcu5WKo="; + }; + + propagatedBuildInputs = with python3Packages; [ + pyyaml + yamlordereddictloader + pyfiglet + setuptools + ]; + + meta = with lib; { + description = "An architecture-level energy/area estimator for accelerator designs"; + license = licenses.mit; + homepage = "https://accelergy.mit.edu/"; + maintainers = with maintainers; [ gdinh ]; + }; +} diff --git a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix index c4bb788798d6..9b15ef8939c3 100644 --- a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix +++ b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "QtRVSim"; - version = "0.9.3"; + version = "0.9.5"; src = fetchFromGitHub { owner = "cvut"; repo = "qtrvsim"; rev = "refs/tags/v${version}"; - sha256 = "BV/nHRvimPaBtY1nfK1PZ2yJ9xWZpNlwiTRfI/9KQec="; + sha256 = "sha256-TKF7nkhnp+JXTD2J/FyVxQoVZgOSKX1IQ/RPqRBOI/4="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/science/computer-architecture/timeloop/default.nix b/pkgs/applications/science/computer-architecture/timeloop/default.nix new file mode 100644 index 000000000000..9b277ac650b7 --- /dev/null +++ b/pkgs/applications/science/computer-architecture/timeloop/default.nix @@ -0,0 +1,99 @@ +{ lib +, stdenv +, fetchFromGitHub +, scons +, libconfig +, boost +, libyaml +, yaml-cpp +, ncurses +, gpm +, enableAccelergy ? true +, enableISL ? false +, accelergy +}: + +stdenv.mkDerivation rec { + pname = "timeloop"; + version = "unstable-2022-11-29"; + + src = fetchFromGitHub { + owner = "NVlabs"; + repo = "timeloop"; + rev = "905ba953432c812772de935d57fd0a674a89d3c1"; + hash = "sha256-EXiWXf8hdX4vFRNk9wbFSOsix/zVkwrafGUtFrsoAN0="; + }; + + nativeBuildInputs = [ scons ]; + + buildInputs = [ + libconfig + boost + libyaml + yaml-cpp + ncurses + accelergy + ] ++ lib.optionals stdenv.isLinux [ gpm ]; + + preConfigure = '' + cp -r ./pat-public/src/pat ./src/pat + ''; + + enableParallelBuilding = true; + + #link-time optimization fails on darwin + #see https://github.com/NixOS/nixpkgs/issues/19098 + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-fno-lto"; + + postPatch = '' + # use nix ar/ranlib + substituteInPlace ./SConstruct \ + --replace "env.Replace(AR = \"gcc-ar\")" "" \ + --replace "env.Replace(RANLIB = \"gcc-ranlib\")" "" + '' + lib.optionalString stdenv.isDarwin '' + # prevent clang from dying on errors that gcc is fine with + substituteInPlace ./src/SConscript --replace "-Werror" "-Wno-inconsistent-missing-override" + + # disable LTO on macos + substituteInPlace ./src/SConscript --replace ", '-flto'" "" + + # static builds on mac fail as no static libcrt is provided by apple + # see https://stackoverflow.com/questions/3801011/ld-library-not-found-for-lcrt0-o-on-osx-10-6-with-gcc-clang-static-flag + substituteInPlace ./src/SConscript \ + --replace "'-static-libgcc', " "" \ + --replace "'-static-libstdc++', " "" \ + --replace "'-Wl,--whole-archive', '-static', " "" \ + --replace ", '-Wl,--no-whole-archive'" "" + + #remove hardcoding of gcc + sed -i '40i env.Replace(CC = "${stdenv.cc.targetPrefix}cc")' ./SConstruct + sed -i '40i env.Replace(CXX = "${stdenv.cc.targetPrefix}c++")' ./SConstruct + + #gpm doesn't exist on darwin + substituteInPlace ./src/SConscript --replace ", 'gpm'" "" + ''; + + sconsFlags = + # will fail on clang/darwin on link without --static due to undefined extern + # however, will fail with static on linux as nixpkgs deps aren't static + lib.optional stdenv.isDarwin "--static" + ++ lib.optional enableAccelergy "--accelergy" + ++ lib.optional enableISL "--with-isl"; + + + installPhase = '' + cp -r ./bin ./lib $out + mkdir -p $out/share + cp -r ./doc $out/share + mkdir -p $out/data + cp -r ./problem-shapes ./configs $out/data + ''; + + meta = with lib; { + description = "Chip modeling/mapping benchmarking framework"; + homepage = "https://timeloop.csail.mit.edu"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ gdinh ]; + }; +} diff --git a/pkgs/applications/science/electronics/appcsxcad/default.nix b/pkgs/applications/science/electronics/appcsxcad/default.nix index 9645e5426ab1..b02082e5b6cd 100644 --- a/pkgs/applications/science/electronics/appcsxcad/default.nix +++ b/pkgs/applications/science/electronics/appcsxcad/default.nix @@ -5,7 +5,7 @@ , csxcad , qcsxcad , hdf5 -, vtkWithQt5 +, vtk_8_withQt5 , qtbase , fparser , tinyxml @@ -32,7 +32,7 @@ mkDerivation { csxcad qcsxcad hdf5 - vtkWithQt5 + vtk_8_withQt5 qtbase fparser tinyxml diff --git a/pkgs/applications/science/electronics/csxcad/default.nix b/pkgs/applications/science/electronics/csxcad/default.nix index d9953a785739..10bae3c0fdf4 100644 --- a/pkgs/applications/science/electronics/csxcad/default.nix +++ b/pkgs/applications/science/electronics/csxcad/default.nix @@ -5,7 +5,7 @@ , tinyxml , hdf5 , cgal_5 -, vtk +, vtk_8 , boost , gmp , mpfr @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { boost gmp mpfr - vtk + vtk_8 fparser tinyxml hdf5 diff --git a/pkgs/applications/science/electronics/dataexplorer/default.nix b/pkgs/applications/science/electronics/dataexplorer/default.nix index 5745a43df26c..535871e4edba 100644 --- a/pkgs/applications/science/electronics/dataexplorer/default.nix +++ b/pkgs/applications/science/electronics/dataexplorer/default.nix @@ -2,18 +2,17 @@ , stdenv , fetchurl , jdk -, jre , ant , makeWrapper }: stdenv.mkDerivation rec { pname = "dataexplorer"; - version = "3.6.2"; + version = "3.7.4"; src = fetchurl { url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz"; - sha256 = "sha256-2e8qeoJh7z/RIowMtAd8PGcMPck5H8iHqel6bW7EQ0E="; + sha256 = "sha256-bghI7Hun7ZKUVEj7T58K0oaclnhUGd4z+eIqZF3eXHQ="; }; nativeBuildInputs = [ ant makeWrapper ]; @@ -37,12 +36,12 @@ stdenv.mkDerivation rec { # but it hardcodes bash shebang and does not pin the java path. # So we create our own wrapper, using similar cmdline args as upstream. mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/DataExplorer \ - --add-flags "-Dfile.encoding=UTF-8 -Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \ + makeWrapper ${jdk}/bin/java $out/bin/DataExplorer \ + --add-flags "-Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \ --set SWT_GTK3 0 - makeWrapper ${jre}/bin/java $out/bin/DevicePropertiesEditor \ - --add-flags "-Dfile.encoding=UTF-8 -Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \ + makeWrapper ${jdk}/bin/java $out/bin/DevicePropertiesEditor \ + --add-flags "-Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \ --set SWT_GTK3 0 \ --set LIBOVERLAY_SCROLLBAR 0 @@ -57,7 +56,7 @@ stdenv.mkDerivation rec { homepage = "https://www.nongnu.org/dataexplorer/index.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ panicgh ]; - platforms = jdk.meta.platforms; + platforms = [ "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ fromSource binaryNativeCode # contains RXTXcomm (JNI library with *.so files) diff --git a/pkgs/applications/science/electronics/digital/default.nix b/pkgs/applications/science/electronics/digital/default.nix new file mode 100644 index 000000000000..0515809dffeb --- /dev/null +++ b/pkgs/applications/science/electronics/digital/default.nix @@ -0,0 +1,99 @@ +{ lib, stdenv, fetchFromGitHub, makeDesktopItem, copyDesktopItems, makeWrapper +, jre, maven, git +}: + +let + pkgDescription = "A digital logic designer and circuit simulator."; + version = "0.29"; + buildDate = "2022-02-11T18:10:34+01:00"; # v0.29 commit date + + desktopItem = makeDesktopItem { + type = "Application"; + name = "Digital"; + desktopName = pkgDescription; + comment = "Easy-to-use digital logic designer and circuit simulator"; + exec = "digital"; + icon = "digital"; + categories = [ "Education" "Electronics" ]; + mimeTypes = [ "text/x-digital" ]; + terminal = false; + keywords = [ "simulator" "digital" "circuits" ]; + }; + + # Use the "no-git-rev" maven profile, which deactivates the plugin that + # inspect the .git folder to find the version number we are building, we then + # provide that version number manually as a property. + # (see https://github.com/hneemann/Digital/issues/289#issuecomment-513721481) + mvnOptions = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate}"; +in +stdenv.mkDerivation rec { + pname = "digital"; + inherit version jre; + + src = fetchFromGitHub { + owner = "hneemann"; + repo = "Digital"; + rev = "287dd939d6f2d4d02c0d883c6178c3425c28d39c"; + sha256 = "o5gaExUTTbk6WgQVw7/IeXhpNkj1BLkwD752snQqjIg="; + }; + + # Use fixed dates in the pom.xml and upgrade the jar and assembly plugins to + # a version where they support reproducible builds + patches = [ ./pom.xml.patch ]; + + # Fetching maven dependencies from "central" needs the network at build phase, + # we do that in this extra derivation that explicitely specifies its + # outputHash to ensure determinism. + mavenDeps = stdenv.mkDerivation { + name = "${pname}-${version}-maven-deps"; + inherit src nativeBuildInputs version patches postPatch; + dontFixup = true; + buildPhase = '' + mvn package ${mvnOptions} -Dmaven.repo.local=$out + ''; + # 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 + ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "X5ppGUVwNQrMnjzD4Kin1Xmt4O3x+qr7jK4jr6E8tCI="; + }; + + nativeBuildInputs = [ copyDesktopItems maven makeWrapper ]; + + postPatch = '' + substituteInPlace pom.xml --subst-var-by buildDate "${buildDate}" + ''; + + buildPhase = '' + mvn package --offline ${mvnOptions} -Dmaven.repo.local=${mavenDeps} + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/java + + classpath=$(find ${mavenDeps} -name "*.jar" -printf ':%h/%f'); + install -Dm644 target/Digital.jar $out/share/java + + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --add-flags "-classpath $out/share/java/${pname}-${version}.jar:''${classpath#:}" \ + --add-flags "-jar $out/share/java/Digital.jar" + ''; + + desktopItems = [ desktopItem ]; + + meta = with lib; { + homepage = "https://github.com/hneemann/Digital"; + description = pkgDescription; + license = licenses.gpl3Only; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ Dettorer ]; + }; +} diff --git a/pkgs/applications/science/electronics/digital/pom.xml.patch b/pkgs/applications/science/electronics/digital/pom.xml.patch new file mode 100644 index 000000000000..cdc5a777c49d --- /dev/null +++ b/pkgs/applications/science/electronics/digital/pom.xml.patch @@ -0,0 +1,30 @@ +diff --git a/pom.xml b/pom.xml +index d5f8330b4..58ed18b63 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -129,7 +130,7 @@ + + org.apache.maven.plugins + maven-jar-plugin +- 2.5 ++ 3.2.0 + + + +@@ -188,6 +189,7 @@ + + org.apache.maven.plugins + maven-assembly-plugin ++ 3.2.0 + + Digital + false +@@ -202,7 +204,7 @@ + + + ${git.commit.id.describe} +- ${maven.build.timestamp} ++ @buildDate@ + icons/splash.png + + diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index c8d5fc5dde74..f016b53d553c 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "dsview"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "DreamSourceLab"; repo = "DSView"; rev = "v${version}"; - sha256 = "sha256-TE2yfzv2h77GLMkmoVGXmzs7J0l/N+n1eYxyrtnrnGU="; + sha256 = "sha256-QaCVu/n9PDbAiJgPDVN6SJMILeUO/KRkKcHYAstm86Q="; }; patches = [ diff --git a/pkgs/applications/science/electronics/flopoco/default.nix b/pkgs/applications/science/electronics/flopoco/default.nix new file mode 100644 index 000000000000..7ce1087209e2 --- /dev/null +++ b/pkgs/applications/science/electronics/flopoco/default.nix @@ -0,0 +1,93 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, cmake +, installShellFiles +, bison +, boost +, flex +, gmp +, libxml2 +, mpfi +, mpfr +, scalp +, sollya +, wcpg +}: + +stdenv.mkDerivation rec { + pname = "flopoco"; + version = "4.1.3"; + + src = fetchFromGitLab { + owner = pname; + repo = pname; + # flopoco-4.1.3 is not tagged on GitLab + rev = "67598298207c9f3261c35679c8a5966480c4343c"; + sha256 = "sha256-0jRjg4/qciqBcjsi6BTbKO4VJkcoEzpC98wFkUOIGbI="; + }; + + patches = [ + (fetchpatch { + name = "fix-clang-error-sin-cos.patch"; + url = "https://gitlab.com/flopoco/flopoco/-/commit/de3aa60ad19333952c176c2a2e51f12653ca736b.patch"; + postFetch = '' + substituteInPlace $out \ + --replace 'FixSinCosCORDIC.hpp' 'CordicSinCos.hpp' + ''; + sha256 = "sha256-BlamA/MZuuqqvGYto+jPeQPop6gwva0y394Odw8pdwg="; + }) + (fetchpatch { + name = "fix-clang-error-atan2.patch"; + url = "https://gitlab.com/flopoco/flopoco/-/commit/a3ffe2436c1b59ee0809b3772b74f2d43c6edb99.patch"; + sha256 = "sha256-dSYcufLHDL0p1V1ghmy6X6xse5f6mjUqckaVqLZnTaA="; + }) + ]; + + postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + sed -i "s/-pg//g" {,src/Apps/TaMaDi/}CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + bison + cmake + installShellFiles + ]; + + buildInputs = [ + boost + flex + gmp + libxml2 + mpfi + mpfr + scalp + sollya + wcpg + ]; + + postBuild = '' + ./flopoco BuildAutocomplete + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 flopoco $out/bin/flopoco + cp bin* fp* ieee* longacc* $out/bin/ + installShellCompletion --bash flopoco_autocomplete + + runHook postInstall + ''; + + meta = with lib; { + description = "The FloPoCo arithmetic core generator"; + homepage = "https://flopoco.org/"; + license = licenses.unfree; + platforms = platforms.unix; + maintainers = with maintainers; [ wegank ]; + }; +} diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index ca2b2e5175b0..22b65f2da313 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { cp -a ${parts}/* parts/ ''; - NIX_CFLAGS_COMPILE = "-I${quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip"; + NIX_CFLAGS_COMPILE = "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip"; qmakeFlags = [ "phoenix.pro" diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 57104cb045ee..57a832fed242 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.113"; + version = "3.3.114"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "sha256-bv81puBSiFVkO2hNk63rMchbTSN3KtSnyHnL0/apQe0="; + sha256 = "sha256-zzpfyrs3qWckzeLkp0A73ye1HpFGzmenlNvkcBfPhKw="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index f81710cfb911..d7250db07b49 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -33,6 +33,7 @@ , dbus , at-spi2-core , libXtst +, pcre2 , swig4 , python @@ -67,6 +68,11 @@ stdenv.mkDerivation rec { src = kicadSrc; + patches = [ + # upstream issue 12941 (attempted to upstream, but appreciably unacceptable) + ./writable.patch + ]; + # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here @@ -114,6 +120,9 @@ stdenv.mkDerivation rec { ] ++ optionals (!withPCM && stable) [ "-DKICAD_PCM=OFF" + ] + ++ optionals (!stable) [ # upstream issue 12491 + "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" ]; nativeBuildInputs = [ @@ -133,9 +142,10 @@ stdenv.mkDerivation rec { libdatrie libxkbcommon libepoxy - dbus.daemon + dbus at-spi2-core libXtst + pcre2 ]; buildInputs = [ @@ -162,14 +172,10 @@ stdenv.mkDerivation rec { ++ optional (withScripting) wxPython ++ optional (withNgspice) libngspice ++ optional (withOCC) opencascade-occt - ++ optional (debug) valgrind - ; - - # started becoming necessary halfway into 2022, not sure what changed to break a test... - preInstallCheck = optionals (withNgspice) [ "export LD_LIBRARY_PATH=${libngspice}/lib" ]; + ++ optional (debug) valgrind; # debug builds fail all but the python test - doInstallCheck = !debug; + doInstallCheck = !(debug); installCheckTarget = "test"; dontStrip = debug; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 1540e3bdb696..9765d2fcc1e4 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -15,7 +15,7 @@ , pname ? "kicad" , stable ? true , withOCC ? true -, withNgspice ? true +, withNgspice ? !stdenv.isDarwin , libngspice , withScripting ? true , python3 @@ -138,8 +138,7 @@ stdenv.mkDerivation rec { ++ optionals (withScripting) [ python.pkgs.wrapPython ]; - # We are emulating wrapGAppsHook, along with other variables to the - # wrapper + # We are emulating wrapGAppsHook, along with other variables to the wrapper makeWrapperArgs = with passthru.libraries; [ "--prefix XDG_DATA_DIRS : ${base}/share" "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" @@ -171,6 +170,7 @@ stdenv.mkDerivation rec { # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set? installPhase = let + bin = if stdenv.isDarwin then "*.app/Contents/MacOS" else "bin"; tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ]; utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" ]; in @@ -182,13 +182,13 @@ stdenv.mkDerivation rec { # wrap each of the directly usable tools (map - (tool: "makeWrapper ${base}/bin/${tool} $out/bin/${tool} $makeWrapperArgs" + (tool: "makeWrapper ${base}/${bin}/${tool} $out/bin/${tool} $makeWrapperArgs" + optionalString (withScripting) " --set PYTHONPATH \"$program_PYTHONPATH\"" ) tools) # link in the CLI utils - (map (util: "ln -s ${base}/bin/${util} $out/bin/${util}") utils) + (map (util: "ln -s ${base}/${bin}/${util} $out/bin/${util}") utils) "runHook postInstall" ]) @@ -224,6 +224,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ evils kiwi ]; # kicad is cross platform platforms = lib.platforms.all; + broken = stdenv.isDarwin; hydraPlatforms = if (with3d) then [ ] else platforms; # We can't download the 3d models on Hydra, @@ -231,5 +232,7 @@ stdenv.mkDerivation rec { # as long as the base and libraries (minus 3d) are build, # this wrapper does not need to get built # the kicad-*small "packages" cause this to happen + + mainProgram = "kicad"; }; } diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 737a819e8477..cc567ae7114d 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.9"; + version = "6.0.11"; src = { - rev = "8da3e8f7071484853b31c61cbd5045903b5c6dd3"; - sha256 = "1fr02jcy09v14d3k8ril0zhwnzhcqcf77wfj5b3bkrh6r8xraqhs"; + rev = "2627ca5db025d40933329af642df28c4a2193dbf"; + sha256 = "1bhzmgs921wv1pc0mpyigmpp630086kmpifc3a91cbkv4xf0akkq"; }; }; libVersion = { - version = "6.0.9"; + version = "6.0.11"; libSources = { - symbols.rev = "0d9559dfddd51110e5c5223901ada2445285ce80"; - symbols.sha256 = "0y5mjjmmln37hkp9wmydinlfgrn8im8rn20145g9xgdpj8j38d48"; - templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1"; + symbols.rev = "c2277d1e39c5e9ba5e04ca5ef3eb252a74291375"; + symbols.sha256 = "1fwnr8x345jbifk71rhyd4b88c4ijp2rcw3pmivnwfb444hbr1lp"; + templates.rev = "049baf307d2fdf5e6138ebab40a8be720b4ae62e"; templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; - footprints.rev = "6705da57c29e9896556c7cdbe719ede3f96e9121"; - footprints.sha256 = "02j445i0kcf87fhj9y6pwfcwq3arppxbrv77lbizm8kcpkpcfldl"; - packages3d.rev = "45df600c5e3dd5113d62e6445115e7c37bdf362f"; - packages3d.sha256 = "0cnrg7mr3khpglviid1adk2ihs1qwj0r7l32z2vqsl8aidzbg9kr"; + footprints.rev = "72fb90dda096bd59295ccc2c8c0881ee02a1221c"; + footprints.sha256 = "1rs05n1wjb2w3x7xqkkijbdxyw3fj0fph8znvnsxp9bgwaaipd4h"; + packages3d.rev = "3fc9daed3ca80a1b6f3bbb1ef505f0dc79972d44"; + packages3d.sha256 = "0nmvfchp25i4bkx6yf7fz1rwy7w6whj2w7mlp02ag3w5v4f137vz"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2022-09-18"; + version = "2022-12-19"; src = { - rev = "0efc1149afed2af5b81e4555de4623217ece650f"; - sha256 = "19fqy8yvvl45izg5ynhch9r4gl4ncx0bz9s6n1x98bgzxkdyc14q"; + rev = "a3a2e2e5b1981ebfbb60f1e8e40bd02625d33692"; + sha256 = "1584n2gn68vdyzlm9805ln1bdgzf831j5l4v29z08dkbi2sl3rg0"; }; }; libVersion = { - version = "2022-09-18"; + version = "2022-12-19"; libSources = { - symbols.rev = "879023fba005d23f285b6d052d9e6bcba1d754aa"; - symbols.sha256 = "1nxz8r3h3j62fs3s77lj27333fsj5c4i01n05lv0gqx36h28hqxk"; + symbols.rev = "2fa69d6d1dce065f8d0998733f66d2cd7db31b9e"; + symbols.sha256 = "1kp8v0q1pirpi4v485j5bg72jpnxglbpgxjxda6kvq8d2124pwlb"; templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1"; templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; - footprints.rev = "b1dfe894de90b0063befc02b914dc9e2b47e3a62"; - footprints.sha256 = "06kn6c00wlnr33mks582xhadvkbbgmqhb4qc1wjfw264pavz7v7y"; - packages3d.rev = "45df600c5e3dd5113d62e6445115e7c37bdf362f"; - packages3d.sha256 = "0cnrg7mr3khpglviid1adk2ihs1qwj0r7l32z2vqsl8aidzbg9kr"; + footprints.rev = "24671f7754c74dfa528e6b62ebef33b161aa4ab6"; + footprints.sha256 = "1rs05n1wjb2w3x7xqkkijbdxyw3fj0fph8znvnsxp9bgwaaipd4h"; + packages3d.rev = "7aeaa02a2e7438fbbe94a00ca321366a39dc1267"; + packages3d.sha256 = "13wfcm7fgsgl3a0g00ra3v35c8wqw9yzgdiai54f1m77r2cr7bhp"; }; }; }; diff --git a/pkgs/applications/science/electronics/kicad/writable.patch b/pkgs/applications/science/electronics/kicad/writable.patch new file mode 100644 index 000000000000..a2969f26f43b --- /dev/null +++ b/pkgs/applications/science/electronics/kicad/writable.patch @@ -0,0 +1,49 @@ +commit 6a72fd032405515e468797be91b5a6ebcbbb5fd8 +Author: Evils +Date: Wed Nov 23 19:49:13 2022 +0100 + + ensure new projects are writable + +diff --git a/kicad/kicad_manager_frame.cpp b/kicad/kicad_manager_frame.cpp +index 7ee8090858..391514519c 100644 +--- a/kicad/kicad_manager_frame.cpp ++++ b/kicad/kicad_manager_frame.cpp +@@ -638,6 +638,12 @@ void KICAD_MANAGER_FRAME::CreateNewProject( const wxFileName& aProjectFileName, + + // wxFFile dtor will close the file + } ++ ++ if( destFileName.IsOk() && !destFileName.IsFileWritable() ) ++ { ++ destFileName.SetPermissions(0644); ++ } ++ + } + } + +diff --git a/kicad/project_template.cpp b/kicad/project_template.cpp +index bf951fcddb..2bef94326b 100644 +--- a/kicad/project_template.cpp ++++ b/kicad/project_template.cpp +@@ -282,6 +282,21 @@ bool PROJECT_TEMPLATE::CreateProject( wxFileName& aNewProjectPath, wxString* aEr + + result = false; + } ++ else if( !destFile.IsFileWritable() && !destFile.SetPermissions(0644) ) ++ { ++ if( aErrorMsg ) ++ { ++ if( !aErrorMsg->empty() ) ++ *aErrorMsg += "\n"; ++ ++ wxString msg; ++ ++ msg.Printf( _( "Cannot make file writable: '%s'." ), destFile.GetFullPath() ); ++ *aErrorMsg += msg; ++ } ++ ++ result = false; ++ } + } + + return result; diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index 22950326e867..84551eeb6311 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -2,19 +2,30 @@ lib, python3, fetchFromGitHub, + fetchpatch, wrapQtAppsHook, }: python3.pkgs.buildPythonApplication rec { pname = "nanovna-saver"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "NanoVNA-Saver"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-wKKjMcOx7NS2VAIk3OTAj7KWE1+CeAzctdgdidT+HMA="; + rev = "v${version}"; + sha256 = "sha256-CLfgDQt2rOXtWwvEhlXEstPp28nFhuhiAPYL6EjZVu4="; }; + # Fix for https://github.com/NanoVNA-Saver/nanovna-saver/issues/579 + # Try dropping the patch in the next release after v0.5.4 + patches = [ + (fetchpatch { + name = "remote-changelog-from-setup-py.patch"; + url = "https://github.com/NanoVNA-Saver/${pname}/commit/d654ea0441939e4e1c599d1333b587a185394fbe.diff"; + sha256 = "sha256-ifOhiWD0EYyQZRKp2W3G6crmWslca+/21APmhpfP/xE="; + }) + ]; + nativeBuildInputs = [ wrapQtAppsHook ]; propagatedBuildInputs = with python3.pkgs; [ @@ -47,6 +58,6 @@ python3.pkgs.buildPythonApplication rec { generally display and analyze the resulting data. ''; license = licenses.gpl3Only; - maintainers = with maintainers; [ zaninime ]; + maintainers = with maintainers; [ zaninime tmarkus ]; }; } diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix index 97571eeb36b4..638c07b8d692 100644 --- a/pkgs/applications/science/electronics/nvc/default.nix +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -8,19 +8,20 @@ , which , elfutils , libelf +, libffi , llvm , zlib }: stdenv.mkDerivation rec { pname = "nvc"; - version = "1.7.2"; + version = "1.8.1"; src = fetchFromGitHub { owner = "nickg"; repo = pname; rev = "r${version}"; - sha256 = "sha256-7N11S7OiAogyuNqrf7R5NZyVbiXgXxJ5t6lwBzL0YAU="; + hash = "sha256-9ziGNAZgUYnBofx7YwSzAgL4zIAwoPYMsGWBYs+xtg0="; }; nativeBuildInputs = [ @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + libffi llvm zlib ] ++ [ diff --git a/pkgs/applications/science/electronics/openboardview/default.nix b/pkgs/applications/science/electronics/openboardview/default.nix index d4aa6e6dfc0b..9fd9d56295d8 100644 --- a/pkgs/applications/science/electronics/openboardview/default.nix +++ b/pkgs/applications/science/electronics/openboardview/default.nix @@ -9,8 +9,12 @@ , fontconfig , gtk3 , wrapGAppsHook +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation rec { pname = "openboardview"; version = "9.0.3"; @@ -24,11 +28,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config python3 wrapGAppsHook ]; - buildInputs = [ SDL2 fontconfig gtk3 ]; + buildInputs = [ SDL2 fontconfig gtk3 ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + ]; postPatch = '' substituteInPlace src/openboardview/CMakeLists.txt \ --replace "SDL2::SDL2main" "" + substituteInPlace CMakeLists.txt --replace "fixup_bundle" "#fixup_bundle" ''; cmakeFlags = [ @@ -37,9 +44,12 @@ stdenv.mkDerivation rec { ]; dontWrapGApps = true; - postFixup = '' - wrapGApp "$out/bin/${pname}" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 ]} + postFixup = lib.optionalString stdenv.isDarwin '' + mkdir -p "$out/Applications" + mv "$out/openboardview.app" "$out/Applications/OpenBoardView.app" + '' + lib.optionalString (!stdenv.isDarwin) '' + wrapGApp "$out/bin/${pname}" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 ]} ''; passthru.updateScript = gitUpdater { @@ -50,7 +60,7 @@ stdenv.mkDerivation rec { description = "Linux SDL/ImGui edition software for viewing .brd files"; homepage = "https://github.com/OpenBoardView/OpenBoardView"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ k3a ]; }; } diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix index 083f01a42881..53768588c3fa 100644 --- a/pkgs/applications/science/electronics/openems/default.nix +++ b/pkgs/applications/science/electronics/openems/default.nix @@ -5,7 +5,7 @@ , fparser , tinyxml , hdf5 -, vtk +, vtk_8 , boost , zlib , cmake @@ -39,7 +39,7 @@ stdenv.mkDerivation { fparser tinyxml hdf5 - vtk + vtk_8 boost zlib csxcad diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix index da75983e40f6..d64f5547e71b 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.3.1"; + version = "3.3.2.1"; src = fetchFromGitHub { owner = "OpenHantek"; repo = "OpenHantek6022"; rev = version; - sha256 = "sha256-8QXFTQQZ5Q1SRQI4jWzRek+3BTuWfGHJIbgvwbZulg8="; + sha256 = "sha256-ysluU3UmWtrTAstnCbSy4TdzbjcnSUeE+d8mpC7Ocvk="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index 68d4f8034837..7f001e73cf7b 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -27,6 +27,11 @@ mkDerivation rec { url = "https://github.com/sigrokproject/pulseview/commit/fb89dd11f2a4a08b73c498869789e38677181a8d.patch"; sha256 = "07ifsis9jlc0jjp2d11f7hvw9kaxcbk0a57h2m4xsv1d7vzl9yfh"; }) + # Fixes replaced/obsolete Qt methods + (fetchpatch { + url = "https://github.com/sigrokproject/pulseview/commit/ae726b70a7ada9a4be5808e00f0c951318479684.patch"; + sha256 = "sha256-6bFXFAnTO+MBUmslw55gWWSCCPwnejqKGpHeJOoH0e8="; + }) ]; meta = with lib; { diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index b2e3704cba70..e22138997bea 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Graphical editor for finite state machines"; - homepage = "http://qfsm.sourceforge.net/"; + homepage = "https://qfsm.sourceforge.net/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 0a190a1c9029..33d145c00756 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ perl ]; nativeBuildInputs = [ flex bison python3 autoconf ]; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; doCheck = stdenv.isLinux; # darwin tests are broken for now... checkTarget = "test"; diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index 0aa9091a86d2..994ecb8c1314 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -12,11 +12,14 @@ }: let + # iverilog-test has been merged to the main iverilog main source tree + # in January 2022, so it won't be longer necessary. + # For now let's fetch it from the separate repo, since 11.0 was released in 2020. iverilog-test = fetchFromGitHub { owner = "steveicarus"; repo = "ivtest"; - rev = "253609b89576355b3bef2f91e90db62223ecf2be"; - sha256 = "18i7jlr2csp7mplcrwjhllwvb6w3v7x7mnx7vdw48nd3g5scrydx"; + rev = "a19e629a1879801ffcc6f2e6256ca435c20570f3"; + sha256 = "sha256-3EkmrAXU0/mRxrxp5Hy7C3yWTVK16L+tPqqeEryY/r8="; }; in stdenv.mkDerivation rec { @@ -38,11 +41,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # tests try to access /proc/ which does not exist on darwin - # Cannot locate IVL modules : couldn't get command path from OS. - doCheck = !stdenv.isDarwin; - - installCheckInputs = [ perl ]; + nativeInstallCheckInputs = [ perl ]; installCheckPhase = '' # copy tests to allow writing results diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/applications/science/electronics/vhd2vl/default.nix index 9fc65b739273..0ec14d282b4a 100644 --- a/pkgs/applications/science/electronics/vhd2vl/default.nix +++ b/pkgs/applications/science/electronics/vhd2vl/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , bison @@ -9,24 +10,15 @@ stdenv.mkDerivation rec { pname = "vhd2vl"; - version = "unstable-2018-09-01"; + version = "unstable-2022-12-26"; src = fetchFromGitHub { owner = "ldoolitt"; repo = pname; - rev = "37e3143395ce4e7d2f2e301e12a538caf52b983c"; - sha256 = "17va2pil4938j8c93anhy45zzgnvq3k71a7glj02synfrsv6fs8n"; + rev = "869d442987dff6b9730bc90563ede89c1abfd28f"; + sha256 = "sha256-Hz2XkT5m4ri5wVR2ciL9Gx73zr+RdW5snjWnUg300c8="; }; - patches = lib.optionals (!stdenv.isAarch64) [ - # fix build with verilog 11.0 - https://github.com/ldoolitt/vhd2vl/pull/15 - # for some strange reason, this is not needed for aarch64 - (fetchpatch { - url = "https://github.com/ldoolitt/vhd2vl/commit/ce9b8343ffd004dfe8779a309f4b5a594dbec45e.patch"; - sha256 = "1qaqhm2mk66spb2dir9n91b385rarglc067js1g6pcg8mg5v3hhf"; - }) - ]; - nativeBuildInputs = [ bison flex diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/applications/science/electronics/xcircuit/default.nix index eb2a29382e60..61b63ff1d7a4 100644 --- a/pkgs/applications/science/electronics/xcircuit/default.nix +++ b/pkgs/applications/science/electronics/xcircuit/default.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchurl, autoreconfHook, automake, pkg-config +{ lib, stdenv, fetchFromGitHub, autoreconfHook, automake, pkg-config , cairo, ghostscript, ngspice, tcl, tk, xorg, zlib }: stdenv.mkDerivation rec { - version = "3.10.12"; + version = "3.10.37"; pname = "xcircuit"; - src = fetchurl { - url = "http://opencircuitdesign.com/xcircuit/archive/xcircuit-${version}.tgz"; - sha256 = "1h1ywc3mr7plvwnhdii2zgnnv5ih2nhyl4qbdjpi83dq0aq1s2mn"; + src = fetchFromGitHub { + owner = "RTimothyEdwards"; + repo = "XCircuit"; + rev = "0056213308c92bec909e8469a0fa1515b72fc3d2"; + sha256 = "sha256-LXU5VEkLF1aKYz9ynI1qQjJUwt/zKFMPYj153OgJOOI="; }; nativeBuildInputs = [ autoreconfHook automake pkg-config ]; @@ -26,6 +28,6 @@ stdenv.mkDerivation rec { homepage = "http://opencircuitdesign.com/xcircuit"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ spacefrogg thoughtpolice ]; + maintainers = with maintainers; [ john-shaffer spacefrogg thoughtpolice ]; }; } diff --git a/pkgs/applications/science/electronics/xyce/default.nix b/pkgs/applications/science/electronics/xyce/default.nix index 2c52916bd905..06872eae740f 100644 --- a/pkgs/applications/science/electronics/xyce/default.nix +++ b/pkgs/applications/science/electronics/xyce/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { popd ''; - checkInputs = [ + nativeCheckInputs = [ bc perl (python3.withPackages (ps: with ps; [ numpy scipy ])) diff --git a/pkgs/applications/science/engineering/strictdoc/default.nix b/pkgs/applications/science/engineering/strictdoc/default.nix index 3fc61b845156..c81652c5ae7e 100644 --- a/pkgs/applications/science/engineering/strictdoc/default.nix +++ b/pkgs/applications/science/engineering/strictdoc/default.nix @@ -3,14 +3,12 @@ , buildPythonApplication , fetchFromGitHub , python3 -, pythonOlder , html5lib , invoke , openpyxl , poetry-core , tidylib , beautifulsoup4 -, dataclasses , datauri , docutils , jinja2 @@ -73,11 +71,9 @@ buildPythonApplication rec { textx xlrd XlsxWriter - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/applications/science/geometry/gama/default.nix b/pkgs/applications/science/geometry/gama/default.nix index 9ca7cc10c77f..121d9bf2e20b 100644 --- a/pkgs/applications/science/geometry/gama/default.nix +++ b/pkgs/applications/science/geometry/gama/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }: stdenv.mkDerivation rec { pname = "gama"; - version = "2.22"; + version = "2.23"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-jOyoWPcZvHWuddLasjIjHSn8MOV3viIgmBrsuzY7P6U="; + sha256 = "sha256-OKVAgmHdhQoS3kCwclE9ljON3H2NVCCvpR2hgwfqnA0="; }; buildInputs = [ expat ]; nativeBuildInputs = [ texinfo zip ]; - checkInputs = [ octave libxml2 ]; + nativeCheckInputs = [ octave libxml2 ]; doCheck = true; meta = with lib ; { diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index bf7bffd11591..6a20a68324f1 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 = "unstable-2022-09-08"; + version = "unstable-2022-11-09"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "ab5b16ede2ff3a4ab5209df24db2c76700899684"; - hash = "sha256-G4MnBViwIosFDiPfUimGqf6fq1KJlxj+LozmgoKaH3A="; + rev = "be9a35c0363174a7cef21d55ed80d92a9ef95ab1"; + hash = "sha256-IN9YgJONcC55N89OXMrMuNuznTdjXNWxR0IngH8OWC8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index 3d752b7d7b93..1d0c72359cfc 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/applications/science/logic/abella/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-/eOiebMFHgrurtrSHPlgZO3xmmxBOUmyAzswXZLd3Yc="; }; - buildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]); + strictDeps = true; + + nativeBuildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]); installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index d4f0ac3e5044..c627b8a3c8f5 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -13,11 +13,19 @@ stdenv.mkDerivation { sha256 = "sha256-W/BDhbng5iYuiB7desMKvRtDFdhoaxiJNvNvtbLlA6E="; }; - buildInputs = [ dune_2 ] ++ (with ocamlPackages; [ - ocaml findlib ansiterminal cairo2 cmdliner fmt logs menhir menhirLib mtime sedlex yojson - ]); + strictDeps = true; - buildPhase = "dune build --profile=release"; + nativeBuildInputs = with ocamlPackages; [ menhir ocaml findlib dune_2 ]; + + buildInputs = with ocamlPackages; [ + ansiterminal cairo2 cmdliner fmt logs menhirLib mtime sedlex yojson + ]; + + buildPhase = '' + runHook preBuild + dune build --profile=release ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} + runHook postBuild + ''; installPhase = '' dune install --prefix $out --libdir $OCAMLFIND_DESTDIR diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index d7396d5d9a61..75288b5ff80b 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -9,8 +9,8 @@ let src = fetchFromGitHub { owner = "OCamlPro"; repo = pname; - rev = version; - sha256 = "sha256-8pJ/1UAbheQaLFs5Uubmmf5D0oFJiPxF6e2WTZgRyAc="; + rev = "refs/tags/${version}"; + hash = "sha256-8pJ/1UAbheQaLFs5Uubmmf5D0oFJiPxF6e2WTZgRyAc="; }; in @@ -21,6 +21,9 @@ let alt-ergo-lib = ocamlPackages.buildDunePackage rec { nativeBuildInputs = [ which ]; buildInputs = with ocamlPackages; [ dune-configurator ]; propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex seq stdlib-shims zarith ]; + preBuild = '' + substituteInPlace src/lib/util/version.ml --replace 'version="dev"' 'version="${version}"' + ''; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { diff --git a/pkgs/applications/science/logic/anders/default.nix b/pkgs/applications/science/logic/anders/default.nix index bb60b2b8321a..ccb81686cb32 100644 --- a/pkgs/applications/science/logic/anders/default.nix +++ b/pkgs/applications/science/logic/anders/default.nix @@ -4,7 +4,7 @@ ocamlPackages.buildDunePackage rec { pname = "anders"; version = "1.1.1"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "groupoid"; diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index a9e39b3daf33..6b0e75de8066 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -23,8 +23,10 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace Makefile \ --replace "GCC = g++" "GCC = c++" - - patchShebangs . + substituteInPlace src/main.cc \ + --replace "defined(__linux__)" "defined(__linux__) && defined(__x86_64__)" + substituteInPlace src/MaxSatSolver.cc \ + --replace "occ[i][sign(softLiterals[j])] > 0" "occ[i][sign(softLiterals[j])] != 0" ''; preBuild = '' @@ -45,9 +47,5 @@ stdenv.mkDerivation { platforms = platforms.unix; license = licenses.asl20; homepage = "https://alviano.net/software/maxino/"; - # See pkgs/applications/science/logic/glucose/default.nix - badPlatforms = [ "aarch64-linux" ]; - # src/MaxSatSolver.cc:280:62: error: ordered comparison between pointer and zero ('unsigned int *' and 'int') - broken = (stdenv.isDarwin && stdenv.isx86_64); # broken since 2019-05-07 on hydra }; } diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index fe2f30a55a33..f6f43f1b0bb3 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -43,8 +43,5 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = lib.platforms.linux; - # See pkgs/applications/science/logic/glucose/default.nix - # (The error is different due to glucose-fenv.patch, but the same) - badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/applications/science/logic/avy/glucose-fenv.patch b/pkgs/applications/science/logic/avy/glucose-fenv.patch index dd19f7ec80e7..eb0b196966b8 100644 --- a/pkgs/applications/science/logic/avy/glucose-fenv.patch +++ b/pkgs/applications/science/logic/avy/glucose-fenv.patch @@ -1,24 +1,15 @@ -From d6e0cb60270e8653bda3f339e3a07ce2cd2d6eb0 Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Tue, 17 Oct 2017 23:01:36 -0500 -Subject: [PATCH] glucose: use fenv to set double precision - ---- - core/Main.cc | 8 ++++++-- - simp/Main.cc | 8 ++++++-- - utils/System.h | 2 +- - 3 files changed, 13 insertions(+), 5 deletions(-) - diff --git a/core/Main.cc b/core/Main.cc -index c96aadd..994132b 100644 +index fd8fca1..37d2ed5 100644 --- a/core/Main.cc +++ b/core/Main.cc -@@ -96,8 +96,12 @@ int main(int argc, char** argv) +@@ -95,9 +95,13 @@ int main(int argc, char** argv) + setUsageHelp("c USAGE: %s [options] \n\n where input may be either in plain or gzipped DIMACS.\n"); // printf("This is MiniSat 2.0 beta\n"); - - #if defined(__linux__) + +-#if defined(__linux__) - fpu_control_t oldcw, newcw; - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++#if defined(__linux__) && defined(__x86_64__) + fenv_t fenv; + + fegetenv(&fenv); @@ -29,15 +20,17 @@ index c96aadd..994132b 100644 #endif // Extra options: diff --git a/simp/Main.cc b/simp/Main.cc -index 4f4772d..70c2e4b 100644 +index 4f4772d..c605f6e 100644 --- a/simp/Main.cc +++ b/simp/Main.cc -@@ -97,8 +97,12 @@ int main(int argc, char** argv) +@@ -96,9 +96,13 @@ int main(int argc, char** argv) + setUsageHelp("c USAGE: %s [options] \n\n where input may be either in plain or gzipped DIMACS.\n"); - #if defined(__linux__) +-#if defined(__linux__) - fpu_control_t oldcw, newcw; - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++#if defined(__linux__) && defined(__x86_64__) + fenv_t fenv; + + fegetenv(&fenv); @@ -48,18 +41,17 @@ index 4f4772d..70c2e4b 100644 #endif // Extra options: diff --git a/utils/System.h b/utils/System.h -index 004d498..a768e99 100644 +index 004d498..2f6d922 100644 --- a/utils/System.h +++ b/utils/System.h -@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA +@@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA + #ifndef Glucose_System_h #define Glucose_System_h - #if defined(__linux__) +-#if defined(__linux__) -#include ++#if defined(__linux__) && defined(__x86_64__) +#include #endif #include "glucose/mtl/IntTypes.h" --- -2.14.2 - diff --git a/pkgs/applications/science/logic/avy/minisat-fenv.patch b/pkgs/applications/science/logic/avy/minisat-fenv.patch index 686d5a1c5b49..31e481bd6696 100644 --- a/pkgs/applications/science/logic/avy/minisat-fenv.patch +++ b/pkgs/applications/science/logic/avy/minisat-fenv.patch @@ -1,24 +1,15 @@ -From 7f1016ceab9b0f57a935bd51ca6df3d18439b472 Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Tue, 17 Oct 2017 22:57:02 -0500 -Subject: [PATCH] use fenv instead of non-standard fpu_control - ---- - core/Main.cc | 8 ++++++-- - simp/Main.cc | 8 ++++++-- - utils/System.h | 2 +- - 3 files changed, 13 insertions(+), 5 deletions(-) - diff --git a/core/Main.cc b/core/Main.cc -index 2b0d97b..8ad95fb 100644 +index 2b0d97b..9ba985d 100644 --- a/core/Main.cc +++ b/core/Main.cc -@@ -78,8 +78,12 @@ int main(int argc, char** argv) +@@ -77,9 +77,13 @@ int main(int argc, char** argv) + setUsageHelp("USAGE: %s [options] \n\n where input may be either in plain or gzipped DIMACS.\n"); // printf("This is MiniSat 2.0 beta\n"); - #if defined(__linux__) +-#if defined(__linux__) - fpu_control_t oldcw, newcw; - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++#if defined(__linux__) && defined(__x86_64__) + fenv_t fenv; + + fegetenv(&fenv); @@ -29,15 +20,17 @@ index 2b0d97b..8ad95fb 100644 #endif // Extra options: diff --git a/simp/Main.cc b/simp/Main.cc -index 2804d7f..39bfb71 100644 +index 2804d7f..7fbdb33 100644 --- a/simp/Main.cc +++ b/simp/Main.cc -@@ -79,8 +79,12 @@ int main(int argc, char** argv) +@@ -78,9 +78,13 @@ int main(int argc, char** argv) + setUsageHelp("USAGE: %s [options] \n\n where input may be either in plain or gzipped DIMACS.\n"); // printf("This is MiniSat 2.0 beta\n"); - #if defined(__linux__) +-#if defined(__linux__) - fpu_control_t oldcw, newcw; - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++#if defined(__linux__) && defined(__x86_64__) + fenv_t fenv; + + fegetenv(&fenv); @@ -48,18 +41,17 @@ index 2804d7f..39bfb71 100644 #endif // Extra options: diff --git a/utils/System.h b/utils/System.h -index 1758192..c0ad13a 100644 +index 1758192..840bee5 100644 --- a/utils/System.h +++ b/utils/System.h -@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA +@@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA + #ifndef Minisat_System_h #define Minisat_System_h - #if defined(__linux__) +-#if defined(__linux__) -#include ++#if defined(__linux__) && defined(__x86_64__) +#include #endif #include "mtl/IntTypes.h" --- -2.14.2 - diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix index 6a94d3f639e2..19d296269f98 100644 --- a/pkgs/applications/science/logic/beluga/default.nix +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -11,7 +11,7 @@ ocamlPackages.buildDunePackage rec { sha256 = "1ziqjfv8jwidl8lj2mid2shhgqhv31dfh5wad2zxjpvf6038ahsw"; }; - useDune2 = true; + duneVersion = "3"; buildInputs = with ocamlPackages; [ gen sedlex extlib dune-build-info linenoise @@ -22,7 +22,7 @@ ocamlPackages.buildDunePackage rec { ''; checkPhase = "./TEST"; - checkInputs = [ rsync ]; + nativeCheckInputs = [ rsync ]; doCheck = true; postInstall = '' diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/applications/science/logic/bitwuzla/default.nix index cc8651f69cfa..4af4058339d9 100644 --- a/pkgs/applications/science/logic/bitwuzla/default.nix +++ b/pkgs/applications/science/logic/bitwuzla/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { "-DBtor2Tools_LIBRARIES=${lib.getLib btor2tools}/lib/libbtor2parser${stdenv.hostPlatform.extensions.sharedLibrary}" ] ++ lib.optional doCheck "-DTESTING=YES"; - checkInputs = [ python3 gtest ]; + nativeCheckInputs = [ python3 gtest ]; # two tests fail on darwin and 3 on aarch64-linux doCheck = stdenv.hostPlatform.isLinux && (!stdenv.hostPlatform.isAarch64); preCheck = let diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 74927dd434d0..1d7e01c553b6 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "-DUSE_LINGELING=YES" ] ++ (lib.optional (gmp != null) "-DUSE_GMP=YES"); - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = true; preCheck = let var = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index 0c2b497e9cc4..4009761e8dc3 100644 --- a/pkgs/applications/science/logic/cbmc/default.nix +++ b/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "5.70.0"; + version = "5.74.0"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-fzc/WrHo+B9oscnTqN8nETcKc34aq4fUX8VLpYJUvRY="; + sha256 = "sha256-n4a/0Ak2psHDCXykVSPYavuIl22uq2ZP7LUcdSzg1ow="; }; nativeBuildInputs = [ @@ -78,5 +78,7 @@ stdenv.mkDerivation rec { license = licenses.bsdOriginal; maintainers = with maintainers; [ jiegec ]; platforms = platforms.unix; + # https://github.com/diffblue/cbmc/issues/7423 + broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix index 611bbbe979f8..4d026a2d9c7a 100644 --- a/pkgs/applications/science/logic/cedille/default.nix +++ b/pkgs/applications/science/logic/cedille/default.nix @@ -4,7 +4,6 @@ , alex , happy , Agda -, buildPlatform , buildPackages , ghcWithPackages }: @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = - lib.optionalString (buildPlatform.libc == "glibc") + lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; postPatch = '' diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index a258c4f5cea7..8a40216c3ecb 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -52,6 +52,8 @@ let "8.15.1".sha256 = "sha256:1janvmnk3czimp0j5qmnfwx6509vhpjc2q7lcza1bc6dm6kn8n42"; "8.15.2".sha256 = "sha256:0qibbvzrhsvs6w3zpkhyclndp29jnr6bs9i5skjlpp431jdjjfqd"; "8.16.0".sha256 = "sha256-3V6kL9j2rn5FHBxq1mtmWWTZS9X5cAyvtUsS6DaM+is="; + "8.16.1".sha256 = "sha256-n7830+zfZeyYHEOGdUo57bH6bb2/SZs8zv8xJhV+iAc="; + "8.17+rc1".sha256 = "sha256-BsVgYa2fAYqRmQNSaY/YSiZhqkmwM+xbE5T4FHOEqkc="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix @@ -88,7 +90,7 @@ self = stdenv.mkDerivation { passthru = { inherit coq-version; - inherit ocamlPackages ocamlNativeNuildInputs; + inherit ocamlPackages ocamlNativeBuildInputs; inherit ocamlPropagatedBuildInputs ocamlPropagatedNativeBuildInputs; # For compatibility inherit (ocamlPackages) ocaml camlp5 findlib num ; diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index 195dd98aa3b4..f056b3e433fb 100644 --- a/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/pkgs/applications/science/logic/cryptoverif/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-F5eVN5ATYo9Ivpi2eYh96ktuTWUeoqgWMR4BqHu8EFs="; }; - buildInputs = [ ocaml ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml ]; /* Fix up the frontend to load the 'default' cryptoverif library ** from under $out/libexec. By default, it expects to find the files diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix index aa3fba635ffc..67f70e7165d4 100644 --- a/pkgs/applications/science/logic/cubicle/default.nix +++ b/pkgs/applications/science/logic/cubicle/default.nix @@ -1,22 +1,44 @@ -{ lib, stdenv, fetchurl, ocamlPackages }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, which +, ocamlPackages +}: stdenv.mkDerivation rec { pname = "cubicle"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "http://cubicle.lri.fr/cubicle-${version}.tar.gz"; - sha256 = "10kk80jdmpdvql88sdjsh7vqzlpaphd8vip2lp47aarxjkwjlz1q"; + url = "https://github.com/cubicle-model-checker/cubicle/archive/refs/tags/${version}.tar.gz"; + hash = "sha256-/EtbXpyXqRm0jGcMfGLAEwdr92061edjFys1V7/w6/Y="; }; + # https://github.com/cubicle-model-checker/cubicle/issues/1 postPatch = '' - substituteInPlace Makefile.in --replace "\\n" "" + substituteInPlace Makefile.in \ + --replace "@OCAMLC@" "ocamlfind ocamlc -package num" \ + --replace "@OCAMLOPT@" "ocamlfind ocamlopt -package num" ''; - buildInputs = with ocamlPackages; [ ocaml findlib functory ]; + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + which + ] ++ (with ocamlPackages; [ + findlib + ocaml + ]); + + buildInputs = with ocamlPackages; [ + functory + num + ]; meta = with lib; { description = "An open source model checker for verifying safety properties of array-based systems"; - homepage = "http://cubicle.lri.fr/"; + homepage = "https://cubicle.lri.fr/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dwarfmaster ]; diff --git a/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/applications/science/logic/cvc5/default.nix index 1bd1c1c52bc2..5bce776771d3 100644 --- a/pkgs/applications/science/logic/cvc5/default.nix +++ b/pkgs/applications/science/logic/cvc5/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cvc5"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "cvc5"; repo = "cvc5"; rev = "cvc5-${version}"; - sha256 = "sha256-RDslPz9b0R9NXaXoixSCenHEh+F3wg/8p4Ksrzh41PI="; + sha256 = "sha256-CVXK6yehfUrSbo8R1Dk1oc/siCtmV9DjEp6q+aLuVQA="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/applications/science/logic/ekrhyper/default.nix b/pkgs/applications/science/logic/ekrhyper/default.nix index d6d9bb11a9a0..187cbc9a92ae 100644 --- a/pkgs/applications/science/logic/ekrhyper/default.nix +++ b/pkgs/applications/science/logic/ekrhyper/default.nix @@ -9,10 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-fEe0DIMGj7wO+79/BZf45kykgyTXpbZJsyFSt31XqpM="; }; - buildInputs = [ - ocaml - perl - ]; + strictDeps = true; + nativeBuildInputs = [ ocaml perl ]; setSourceRoot = "export sourceRoot=$(echo */ekrh/src/)"; preInstall = "export INSTALLDIR=$out"; postInstall = ''for i in "$out/casc"/*; do ln -s "$i" "$out/bin/ekrh-casc-$(basename $i)"; done ''; diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix index ba0f3ee2e255..98db5682e7e7 100644 --- a/pkgs/applications/science/logic/fast-downward/default.nix +++ b/pkgs/applications/science/logic/fast-downward/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "fast-downward"; - version = "22.06.1"; + version = "22.12.0"; src = fetchFromGitHub { owner = "aibasel"; repo = "downward"; rev = "release-${version}"; - sha256 = "sha256-SBksyZoLR1MtyJUbGigGIbT72qVpN+nznU/bmJGYRz8="; + sha256 = "sha256-GwZ5BGzLRMgWNBaA7M2D2p9OxvdyWqm+sTwxGpcI/qY="; }; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; diff --git a/pkgs/applications/science/logic/formula/default.nix b/pkgs/applications/science/logic/formula/default.nix index 5b39e9153192..20267e6071c5 100644 --- a/pkgs/applications/science/logic/formula/default.nix +++ b/pkgs/applications/science/logic/formula/default.nix @@ -25,7 +25,6 @@ buildDotnetModule rec { passthru.updateScript = unstableGitUpdater { url = meta.homepage; }; meta = with lib; { - broken = stdenv.isLinux && stdenv.isAarch64; description = "Formal Specifications for Verification and Synthesis"; homepage = "https://github.com/VUISIS/formula-dotnet"; license = licenses.mspl; diff --git a/pkgs/applications/science/logic/formula/nuget.nix b/pkgs/applications/science/logic/formula/nuget.nix index 40b9abe7fad9..e3b0fe67446b 100644 --- a/pkgs/applications/science/logic/formula/nuget.nix +++ b/pkgs/applications/science/logic/formula/nuget.nix @@ -1,23 +1,30 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ (fetchNuGet { pname = "Antlr4.Runtime.Standard"; version = "4.7.2"; sha256 = "1pmrpsgqjfj0nzr1zqzk1m2fm0ynd4nklwq3dhvww08yjg5s0586"; }) - (fetchNuGet { pname = "coverlet.collector"; version = "3.0.2"; sha256 = "1xf6z6izmsl4g8w3z1wbp4pa8f8qsf6sil4mf1c9fb22hq8c5hkg"; }) - (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "16.3.0"; sha256 = "1fdgymp11qpv4h152km2wmbykq1rb4b05cyy6d06naw01l61gdz8"; }) - (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "16.3.0"; sha256 = "17hqjzxqnx2hhp276kdlc6wnhd33dilk0bd41px37and2icl9shn"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.9.4"; sha256 = "11wiyy3ykgk1sa9amy3lgcsg2v7d1sz59ggw647vx8ibpjxijjpp"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; }) - (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.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.4"; sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.4"; sha256 = "14110qzmypr72ywvx3npq7mf4n0gvdr4536v91z1xbapms65am6x"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) (fetchNuGet { pname = "Microsoft.Z3.x64"; version = "4.8.7"; sha256 = "1wxlw29xm5x8vwji2s7gwk39wb88dkbpg76l9s9gq0hqpghwlmdz"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) (fetchNuGet { pname = "runtime.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"; }) @@ -34,69 +41,54 @@ (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 = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (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.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (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.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (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.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) (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"; }) - (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"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (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"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.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"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) (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"; }) @@ -104,31 +96,16 @@ (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"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.0.1"; sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (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"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "xunit"; version = "2.4.1"; sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; }) - (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) - (fetchNuGet { pname = "xunit.analyzers"; version = "0.10.0"; sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.4.1"; sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; }) - (fetchNuGet { pname = "xunit.core"; version = "2.4.1"; sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.1"; sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.1"; sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; }) - (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.3"; sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; }) ] diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/applications/science/logic/glucose/default.nix index 5ba8208d6e18..b9ca741a3477 100644 --- a/pkgs/applications/science/logic/glucose/default.nix +++ b/pkgs/applications/science/logic/glucose/default.nix @@ -8,6 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0aahrkaq7n0z986fpqz66yz946nxardfi6dh8calzcfjpvqiraji"; }; + postPatch = '' + substituteInPlace Main.cc \ + --replace "defined(__linux__)" "defined(__linux__) && defined(__x86_64__)" + ''; + buildInputs = [ zlib ]; sourceRoot = "glucose-syrup-${version}/simp"; @@ -23,7 +28,5 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ gebner ]; - # Build uses _FPU_EXTENDED macro - badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index e66fe992e189..4c105a40e20d 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -38,7 +38,9 @@ stdenv.mkDerivation { }) ]; - buildInputs = [ ocaml camlp5 ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml camlp5 ]; propagatedBuildInputs = [ num ]; installPhase = '' diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index ff88586e0353..6485681e3313 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0lik8p7ayhjwpkln1iwf0ri84ramhch74j5nj6z7ph6wfi92pgg8"; }; - buildInputs = [ ocaml eprover zlib ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml eprover ]; + buildInputs = [ zlib ]; preConfigure = "patchShebangs ."; diff --git a/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix b/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix index 7fca547f67c8..565537cf439c 100644 --- a/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix +++ b/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix @@ -2,16 +2,28 @@ stdenv.mkDerivation rec { pname = "isabelle-linter"; - version = "Isabelle2021-1-v1.0.0"; + version = "unstable-2022-09-05"; src = fetchFromGitHub { owner = "isabelle-prover"; repo = "isabelle-linter"; - rev = version; - sha256 = "0v6scc2rhj6bjv530gzz6i57czzcgpkw7a9iqnfdnm5gvs5qjk7a"; + rev = "0424fc05426d5f7a23adf19ad08c690c17184e86"; + sha256 = "02afbgmi195ibichjkpni2wjgjkszv7i6qkmmprwrmb4jd2wdvd5"; }; - installPhase = import ./mkBuild.nix { inherit isabelle; path = "${pname}-${version}"; }; + nativeBuildInputs = [ isabelle ]; + + buildPhase = '' + export HOME=$TMP + isabelle components -u $(pwd) + isabelle scala_build + ''; + + installPhase = '' + dir=$out/Isabelle${isabelle.version}/contrib/${pname}-${version} + mkdir -p $dir + cp -r * $dir/ + ''; meta = with lib; { description = "Linter component for Isabelle."; diff --git a/pkgs/applications/science/logic/isabelle/components/mkBuild.nix b/pkgs/applications/science/logic/isabelle/components/mkBuild.nix deleted file mode 100644 index a05b5196b007..000000000000 --- a/pkgs/applications/science/logic/isabelle/components/mkBuild.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ 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 009af3463a25..d2326d2d4d0e 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -1,5 +1,22 @@ -{ lib, stdenv, fetchurl, coreutils, nettools, java, scala, polyml, z3, veriT, vampire, eprover-ho, naproche, rlwrap, perl, makeDesktopItem, isabelle-components, isabelle, symlinkJoin, fetchhg }: -# nettools needed for hostname +{ lib +, stdenv +, fetchurl +, coreutils +, nettools +, java +, scala_3 +, polyml +, veriT +, vampire +, eprover-ho +, naproche +, rlwrap +, perl +, makeDesktopItem +, isabelle-components +, symlinkJoin +, fetchhg +}: let sha1 = stdenv.mkDerivation { @@ -27,9 +44,9 @@ let cp libsha1.so $out/lib/ ''; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: rec { pname = "isabelle"; - version = "2021-1"; + version = "2022"; dirname = "Isabelle${version}"; @@ -39,33 +56,31 @@ in stdenv.mkDerivation rec { fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz"; - sha256 = "0n1ls9vwf0ps1x8zpb7c1xz1wkasgvc34h5bz280hy2z6iqwmwbc"; + sha256 = "0b84rx9b7b5y8m1sg7xdp17j6yngd2dkx6v5bkd8h7ly102lai18"; } else fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; - sha256 = "0jfaqckhg388jh9b4msrpkv6wrd6xzlw18m0bngbby8k8ywalp9i"; + sha256 = "1ih4gykkp1an43qdgc5xzyvf30fhs0dah3y0a5ksbmvmjsfnxyp7"; }; - buildInputs = [ polyml z3 veriT vampire eprover-ho nettools ] + nativeBuildInputs = [ java ]; + + buildInputs = [ polyml veriT vampire eprover-ho nettools ] ++ lib.optionals (!stdenv.isDarwin) [ java ]; sourceRoot = "${dirname}${lib.optionalString stdenv.isDarwin ".app"}"; - postUnpack = if stdenv.isDarwin then '' + doCheck = true; + checkPhase = "bin/isabelle build -v HOL-SMT_Examples"; + + postUnpack = lib.optionalString stdenv.isDarwin '' mv $sourceRoot ${dirname} sourceRoot=${dirname} - '' else null; + ''; postPatch = '' - patchShebangs . - - cat >contrib/z3*/etc/settings <contrib/verit-*/etc/settings <>etc/settings - for comp in contrib/jdk* contrib/polyml-* contrib/z3-* contrib/verit-* contrib/vampire-* contrib/e-*; do + for comp in contrib/jdk* contrib/polyml-* contrib/verit-* contrib/vampire-* contrib/e-*; do rm -rf $comp/x86* done @@ -111,7 +126,8 @@ in stdenv.mkDerivation rec { substituteInPlace src/Tools/Setup/src/Environment.java \ --replace 'cmd.add("/usr/bin/env");' "" \ - --replace 'cmd.add("bash");' "cmd.add(\"$SHELL\");" + --replace 'cmd.add("bash");' "cmd.add(\"$SHELL\");" \ + --replace 'private static read_file(path: Path): String =' 'private static String read_file(Path path) throws IOException' substituteInPlace src/Pure/General/sha1.ML \ --replace '"$ML_HOME/" ^ (if ML_System.platform_is_windows then "sha1.dll" else "libsha1.so")' '"${sha1}/lib/libsha1.so"' @@ -120,15 +136,17 @@ in stdenv.mkDerivation rec { '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") '' substituteInPlace lib/scripts/isabelle-platform \ --replace 'ISABELLE_APPLE_PLATFORM64=arm64-darwin' "" - '' + (if ! stdenv.isLinux then "" else '' + '' + lib.optionalString stdenv.isLinux '' 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 + for f in contrib/*/$arch/{z3,epclextract,nunchaku,SPASS,zipperposition}; do patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" done + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) contrib/bash_process-*/platform_$arch/bash_process for d in contrib/kodkodi-*/jni/$arch; do patchelf --set-rpath "${lib.concatStringsSep ":" [ "${java}/lib/openjdk/lib/server" "${stdenv.cc.cc.lib}/lib" ]}" $d/*.so done - ''); + patchelf --set-rpath "${stdenv.cc.cc.lib}/lib" contrib/z3-*/$arch/z3 + ''; buildPhase = '' export HOME=$TMP # The build fails if home is not set @@ -145,11 +163,12 @@ in stdenv.mkDerivation rec { 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 + echo "Building isabelle setup" + javac -d "$TARGET_DIR" -classpath "${scala_3.bare}/lib/scala3-interfaces-${scala_3.version}.jar:${scala_3.bare}/lib/scala3-compiler_3-${scala_3.version}.jar" "''${ARGS[@]}" + jar -c -f "$TARGET_DIR/isabelle_setup.jar" -e "isabelle.setup.Setup" -C "$TARGET_DIR" isabelle rm -rf "$TARGET_DIR/isabelle" - # Prebuild HOL Session + echo "Building HOL heap" bin/isabelle build -v -o system_heaps -b HOL ''; @@ -194,14 +213,15 @@ in stdenv.mkDerivation rec { maintainers = [ maintainers.jwiegley maintainers.jvanbruegge ]; platforms = platforms.unix; }; -} // { - withComponents = f: + + passthru.withComponents = f: let + isabelle = finalAttrs.finalPackage; base = "$out/${isabelle.dirname}"; components = f isabelle-components; in symlinkJoin { name = "isabelle-with-components-${isabelle.version}"; - paths = [ isabelle ] ++ components; + paths = [ isabelle ] ++ (builtins.map (c: c.override { inherit isabelle; }) components); postBuild = '' rm $out/bin/* @@ -219,4 +239,4 @@ in stdenv.mkDerivation rec { echo contrib/${c.pname}-${c.version} >> ${base}/etc/components '') components; }; -} +}) diff --git a/pkgs/applications/science/logic/kissat/default.nix b/pkgs/applications/science/logic/kissat/default.nix index 772e9c22a59a..48d986cd5f6d 100644 --- a/pkgs/applications/science/logic/kissat/default.nix +++ b/pkgs/applications/science/logic/kissat/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" ]; - checkInputs = [ drat-trim p7zip ]; + nativeCheckInputs = [ drat-trim p7zip ]; doCheck = true; # 'make test' assumes that /etc/passwd is not writable. diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix index e492daaced37..024e6e526c4e 100644 --- a/pkgs/applications/science/logic/klee/default.nix +++ b/pkgs/applications/science/logic/klee/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { cmake ]; - checkInputs = [ + nativeCheckInputs = [ gtest # Should appear BEFORE lit, since lit passes through python rather diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 81a5afbc2bac..d3d87be38748 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.49.0"; + version = "3.50.3"; 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 = "acf633e01a8783a12060b0a1b7b5b5e15fd73e77"; - sha256 = "sha256-KF13DlGEl6aICSp/haczo54gjLZaOxyzFRdzvyyiu5M="; + rev = "855e5b74e3a52a40552e8f067169d747d48743fd"; + sha256 = "sha256-RH4w7PpzC+fhqCHikXQO2pUUvWD2qrA0mVMUGxpauwE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index cbc85c5544cc..4087763aa0c5 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "sha256:1b2q7vsz6s9ighypsigqjm1mzjiq3xgnz5id5ssb4rh9zm190r82"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ eprover ocaml camlp4 perl zlib ]; + strictDeps = true; + + nativeBuildInputs = [ makeWrapper eprover ocaml camlp4 perl ]; + buildInputs = [ zlib ]; patches = [ (fetchpatch { url = "https://github.com/niklasso/minisat/commit/7eb6015313561a2586032574788fcb133eeaa19f.patch"; diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/applications/science/logic/logisim-evolution/default.nix index 9650d97814bf..affbfc170b90 100644 --- a/pkgs/applications/science/logic/logisim-evolution/default.nix +++ b/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logisim-evolution"; - version = "3.7.2"; + version = "3.8.0"; src = fetchurl { url = "https://github.com/logisim-evolution/logisim-evolution/releases/download/v${version}/logisim-evolution-${version}-all.jar"; - sha256 = "sha256-RI+ioOHj13UAGuPzseAAy3oQBQYkja/ucjj4QMeRZhw="; + sha256 = "sha256-TFm+fa3CMp0OMhnKBc6cLIWGQbIG/OpOOCG7ea7wbCw="; }; dontUnpack = true; diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix index fca3c20cd853..5b17403dc7f4 100644 --- a/pkgs/applications/science/logic/metis-prover/default.nix +++ b/pkgs/applications/science/logic/metis-prover/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Automatic theorem prover for first-order logic with equality"; - homepage = "http://www.gilith.com/research/metis/"; + homepage = "https://www.gilith.com/research/metis/"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 2709b16c5770..5b894d2c9376 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchpatch, fetchFromGitHub, cmake, zlib, gmp, jdk8, - # The JDK we use on Darwin currenly makes extensive use of rpaths which are + # The JDK we use on Darwin currently makes extensive use of rpaths which are # annoying and break the python library, so let's not bother for now includeJava ? !stdenv.hostPlatform.isDarwin, includeGplCode ? true }: @@ -89,7 +89,7 @@ let --replace 'library_dir = "../../../../"' 'library_dir = "${core}/lib/"' ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ "test_assertAtMostOne" diff --git a/pkgs/applications/science/logic/naproche/default.nix b/pkgs/applications/science/logic/naproche/default.nix index 047ed73262ee..ecc347080081 100644 --- a/pkgs/applications/science/logic/naproche/default.nix +++ b/pkgs/applications/science/logic/naproche/default.nix @@ -2,13 +2,13 @@ with haskellPackages; mkDerivation { pname = "Naproche-SAD"; - version = "2022-04-19"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "naproche"; repo = "naproche"; - rev = "2514c04e715395b7a839e11b63046eafb9c6a1da"; - sha256 = "1bdgyk4fk65xi7n778rbgddpg4zhggj8wjslxbizrzi81my9a3vm"; + rev = "c8c4ca2d5fdb92bf17e0e54c99bd2a9691255d80"; + sha256 = "0xvh6kkl5k5ygp2nrbq3k0snvzczbmcp1yrwdkah3fzhf9i3yykx"; }; isExecutable = true; diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 9fe60db79a37..ade194cc6cb8 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.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "usi-verification-and-security"; repo = "opensmt"; rev = "v${version}"; - sha256 = "sha256-BvENPCrQ9XWg4NgFIcOP04BysBGBmCRakA6NCFccKWE="; + sha256 = "sha256-v0CyVMi7Hb4Kdw8v/ZcKXpVHabq4m2cOhsNGXXVI4dw="; }; nativeBuildInputs = [ cmake bison flex ]; diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 4b7166ad9986..a00c565fb4e0 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -1,18 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, ocaml, opaline }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ocamlPackages, opaline }: stdenv.mkDerivation rec { pname = "ott"; - version = "0.32"; + version = "0.33"; src = fetchFromGitHub { owner = "ott-lang"; repo = "ott"; rev = version; - sha256 = "sha256-vdDsfsIi1gRW1Sowf29VyQ4C5UKyQZaVgS2uTb8VeW4="; + hash = "sha256-GzeEiok5kigcmfqf/K/UxvlKkl55zy0vOyiRZ2HyMiE="; }; - nativeBuildInputs = [ pkg-config opaline ]; - buildInputs = [ ocaml ]; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config opaline ] ++ (with ocamlPackages; [ findlib ocaml ]); + buildInputs = with ocamlPackages; [ ocamlgraph ]; installTargets = "ott.install"; diff --git a/pkgs/applications/science/logic/petrinizer/default.nix b/pkgs/applications/science/logic/petrinizer/default.nix index 62d259f83187..9fd20e3ed4af 100644 --- a/pkgs/applications/science/logic/petrinizer/default.nix +++ b/pkgs/applications/science/logic/petrinizer/default.nix @@ -24,4 +24,8 @@ mkDerivation rec { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ raskin ]; inherit (sbv_7_13.meta) platforms; + + # dependency sbv no longer builds + hydraPlatforms = lib.platforms.none; + broken = true; } diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index 2606b94f4bbb..4e65c018d1a2 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -9,9 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0z1z4wqbqwgppkh2bm89fgy07a0y2m6g4lvcyzs09sm1ysklk2dh"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses ] ++ (with ocamlPackages; [ - ocaml findlib camlp5 lablgtk ]); + strictDeps = true; + + nativeBuildInputs = [ pkg-config ] ++ (with ocamlPackages; [ ocaml findlib camlp5 ]); + buildInputs = [ ncurses ] ++ (with ocamlPackages; [ lablgtk ]); dontAddPrefix = true; configureFlags = [ "--prefix" "$(out)" ]; diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/applications/science/logic/proverif/default.nix index b6d15162fec3..57220aa523cf 100644 --- a/pkgs/applications/science/logic/proverif/default.nix +++ b/pkgs/applications/science/logic/proverif/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "sha256:0xgwnp59779xc40sb7ck8rmfn620pilxyq79l3bymj9m7z0mwvm9"; }; - buildInputs = with ocamlPackages; [ ocaml findlib ]; + strictDeps = true; + + nativeBuildInputs = with ocamlPackages; [ ocaml findlib ]; buildPhase = "./build -nointeract"; installPhase = '' diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 7a523bbf24ef..5e5fe9925376 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -1,10 +1,13 @@ -{lib, stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq}: +{ lib, stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq }: stdenv.mkDerivation rec { pname = "satallax"; version = "2.7"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ocaml zlib which eprover coq]; + strictDeps = true; + + nativeBuildInputs = [ makeWrapper ocaml which eprover coq ]; + buildInputs = [ zlib ]; + src = fetchurl { url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${pname}-${version}.tar.gz"; sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib"; @@ -15,6 +18,10 @@ stdenv.mkDerivation rec { ./fix-declaration-gcc9.patch ]; + prePatch = '' + patch -p1 -i ${../avy/minisat-fenv.patch} -d minisat + ''; + preConfigure = '' mkdir fake-tools echo "echo 'Nix-build-host.localdomain'" > fake-tools/hostname @@ -41,7 +48,8 @@ stdenv.mkDerivation rec { ) ''; - postBuild = "echo testing; ! (bash ./test | grep ERROR)"; + # error: invalid suffix on literal; C++11 requires a space between literal and identifier + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-reserved-user-defined-literal"; installPhase = '' mkdir -p "$out/share/doc/satallax" "$out/bin" "$out/lib" "$out/lib/satallax" @@ -59,11 +67,22 @@ stdenv.mkDerivation rec { cp -r coq* "$out/lib/satallax/" ''; + doCheck = stdenv.isLinux; + + checkPhase = '' + runHook preCheck + if bash ./test | grep ERROR; then + echo "Tests failed" + exit 1 + fi + runHook postCheck + ''; + meta = { description = "Automated theorem prover for higher-order logic"; - license = lib.licenses.mit ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.unix; downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads.php"; homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/index.php"; }; diff --git a/pkgs/applications/science/logic/statverif/default.nix b/pkgs/applications/science/logic/statverif/default.nix index 07365eef33fa..1f6238977551 100644 --- a/pkgs/applications/science/logic/statverif/default.nix +++ b/pkgs/applications/science/logic/statverif/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { sha256 = "113jjhi1qkcggbsmbw8fa9ln8vs7vy2r288szks7rn0jjn0wxmbw"; }; - buildInputs = [ ocaml ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml ]; patchPhase = "patch -p1 < ${pf-patch}"; buildPhase = "./build"; diff --git a/pkgs/applications/science/logic/surelog/default.nix b/pkgs/applications/science/logic/surelog/default.nix index c3e127282cb9..00a5b13598ce 100644 --- a/pkgs/applications/science/logic/surelog/default.nix +++ b/pkgs/applications/science/logic/surelog/default.nix @@ -5,7 +5,7 @@ , python3 , pkg-config , libuuid -, openjdk11 +, openjdk , gperftools , flatbuffers , fetchpatch @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - openjdk11 + openjdk (python3.withPackages (p: with p; [ psutil orderedmultidict diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index ffc61ed1d03b..19c021684b3f 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { ''; doCheck = false; # not all provers are yet packaged... - checkInputs = [ python3 yosys boolector yices z3 aiger ]; + nativeCheckInputs = [ python3 yosys boolector yices z3 aiger ]; checkPhase = "make test"; meta = { diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix index 14b3055ab36b..59afbc094e40 100644 --- a/pkgs/applications/science/logic/tlaplus/tlaps.nix +++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "c296998acd14d5b93a8d5be7ee178007ef179957465966576bda26944b1b7fca"; }; - buildInputs = [ ocaml isabelle cvc3 perl wget which ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml isabelle cvc3 perl wget which ]; installPhase = '' mkdir -pv "$out" diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 160d67094f4c..55b59ff2e3b0 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -10,8 +10,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-vNR7WeiSvg+763GcovoZBFDfncekJMeqNegP4fVw06I="; }; + strictDeps = true; + + nativeBuildInputs = with ocamlPackages; [ + ocaml findlib menhir + # Coq Support + coqPackages.coq + ]; + buildInputs = with ocamlPackages; [ - ocaml findlib ocamlgraph zarith menhir + ocamlgraph zarith # Emacs compilation of why3.el emacs # Documentation @@ -39,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A platform for deductive program verification"; - homepage = "http://why3.lri.fr/"; + homepage = "https://why3.lri.fr/"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vbgl ]; diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index 5671317e30ef..173d1d5a2130 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.8"; + version = "3.3.9"; src = fetchurl { url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; - sha256 = "sha256-T2rUEZsO8g/nk10LZvC+mXEC6IzutbjncERlmqg814g="; + sha256 = "sha256-Z3QtOGyOjmiM+qfB0FO4UDg8O99Ru/Qy2WNoBpXd1So="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/logic/z3/4.4.0.nix b/pkgs/applications/science/logic/z3/4.4.0.nix deleted file mode 100644 index 857bbbdee5d0..000000000000 --- a/pkgs/applications/science/logic/z3/4.4.0.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python }: - -stdenv.mkDerivation rec { - pname = "z3"; - version = "4.4.0"; - - src = fetchFromGitHub { - owner = "Z3Prover"; - repo = "z3"; - rev = "7f6ef0b6c0813f2e9e8f993d45722c0e5b99e152"; - sha256 = "1xllvq9fcj4cz34biq2a9dn2sj33bdgrzyzkj26hqw70wkzv1kzx"; - }; - - buildInputs = [ python ]; - enableParallelBuilding = true; - - CXXFLAGS = if stdenv.isDarwin then "-std=gnu++98" else null; - - configurePhase = "python scripts/mk_make.py --prefix=$out && cd build"; - - # z3's install phase is stupid because it tries to calculate the - # python package store location itself, meaning it'll attempt to - # write files into the nix store, and fail. - soext = stdenv.hostPlatform.extensions.sharedLibrary; - installPhase = '' - mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $out/include - cp ../src/api/z3*.h $out/include - cp ../src/api/c++/z3*.h $out/include - cp z3 $out/bin - cp libz3${soext} $out/lib - cp libz3${soext} $out/lib/${python.libPrefix}/site-packages - cp z3*.pyc $out/lib/${python.libPrefix}/site-packages - cp ../src/api/python/*.py $out/lib/${python.libPrefix}/site-packages - ''; - - meta = { - description = "A high-performance theorem prover and SMT solver"; - homepage = "https://github.com/Z3Prover/z3"; - license = lib.licenses.mit; - platforms = lib.platforms.x86_64; - maintainers = with lib.maintainers; [ thoughtpolice ttuegel ]; - }; -} diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 4d92f4f2ea34..928c0b6abebc 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -29,12 +29,15 @@ let common = { version, sha256, patches ? [ ] }: sha256 = sha256; }; - nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ python ] + strictDeps = true; + + nativeBuildInputs = [ python ] + ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames ++ optional javaBindings jdk - ++ optionals ocamlBindings [ ocaml findlib zarith ] + ++ optionals ocamlBindings [ ocaml findlib ] ; - propagatedBuildInputs = [ python.pkgs.setuptools ]; + propagatedBuildInputs = [ python.pkgs.setuptools ] + ++ optionals ocamlBindings [ zarith ]; enableParallelBuilding = true; postPatch = optionalString ocamlBindings '' @@ -92,8 +95,4 @@ in version = "4.8.15"; sha256 = "0xkwqz0y5d1lfb6kfqy8wn8n2dqalzf4c8ghmjsajc1bpdl70yc5"; }; - z3_4_7 = common { - version = "4.7.1"; - sha256 = "1s850r6qifwl83zzgvrb5l0jigvmymzpv18ph71hg2bcpk7kjw3d"; - }; } diff --git a/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/pkgs/applications/science/machine-learning/finalfrontier/default.nix index 1644ca3d1433..6b76eea33cef 100644 --- a/pkgs/applications/science/machine-learning/finalfrontier/default.nix +++ b/pkgs/applications/science/machine-learning/finalfrontier/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "finalfrontier"; - version = "0.9.4"; + version = "unstable-2022-01-06"; src = fetchFromGitHub { owner = "finalfusion"; repo = pname; - rev = version; - sha256 = "1lvwv238p8hrl4sc5pmnvaargl2dd25p44gxl3kibq5ng03afd0n"; + rev = "2461fb1dde13b73039926aa66606e470907a1b59"; + sha256 = "sha256-bnRzXIYairlBjv2JxU16UXYc5BB3VeKZNiJ4+XDzub4="; }; - cargoSha256 = "0lhcazcih48gc23q484h344bzz7p3lh189ljhswdyph2i11caarp"; + cargoSha256 = "sha256-C/D9EPfifyajrCyXE8w/qRuzWEoyJJIcj4xii94/9l4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/science/machine-learning/starspace/default.nix b/pkgs/applications/science/machine-learning/starspace/default.nix index 81e0ccc71d66..ab0c10efebce 100644 --- a/pkgs/applications/science/machine-learning/starspace/default.nix +++ b/pkgs/applications/science/machine-learning/starspace/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, boost165, zlib }: +{ lib, stdenv, fetchFromGitHub, boost, zlib }: stdenv.mkDerivation rec { pname = "starspace"; - version = "unstable-2021-01-17"; + version = "unstable-2019-12-13"; src = fetchFromGitHub { owner = "facebookresearch"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0sc7a37z1skb9377a1qs8ggwrkz0nmpybx7sms38xj05b702kbvj"; }; - buildInputs = [ boost165 zlib ]; + buildInputs = [ boost zlib ]; makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" - "BOOST_DIR=${boost165.dev}/include" + "BOOST_DIR=${boost.dev}/include" ]; preBuild = '' diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/applications/science/machine-learning/streamlit/default.nix index 03db1cf3cf85..9479011d5f14 100755 --- a/pkgs/applications/science/machine-learning/streamlit/default.nix +++ b/pkgs/applications/science/machine-learning/streamlit/default.nix @@ -1,41 +1,37 @@ -{ - # Nix - lib, - buildPythonApplication, - fetchPypi, - - # Build inputs - altair, - blinker, - click, - cachetools, - GitPython, - importlib-metadata, - jinja2, - pillow, - pyarrow, - pydeck, - pympler, - protobuf, - requests, - rich, - semver, - setuptools, - toml, - tornado, - tzlocal, - validators, - watchdog, +{ lib +, altair +, blinker +, buildPythonApplication +, cachetools +, click +, fetchPypi +, gitpython +, importlib-metadata +, jinja2 +, pillow +, protobuf3 +, pyarrow +, pydeck +, pympler +, requests +, rich +, semver +, setuptools +, toml +, tornado +, tzlocal +, validators +, watchdog }: buildPythonApplication rec { pname = "streamlit"; - version = "1.13.0"; - format = "wheel"; # source currently requires pipenv + version = "1.16.0"; + format = "wheel"; # source currently requires pipenv src = fetchPypi { inherit pname version format; - hash = "sha256-MjGm9CT4p/Nl3J5G1Pu2ajY0/VcMdHabimn3ktkoXTo="; + hash = "sha256-TBNWIe3m646dbnOMxUltkNZr23g0Dqsestvxl4zHr4A="; }; propagatedBuildInputs = [ @@ -43,11 +39,11 @@ buildPythonApplication rec { blinker cachetools click - GitPython + gitpython importlib-metadata jinja2 pillow - protobuf + protobuf3 pyarrow pydeck pympler @@ -63,7 +59,7 @@ buildPythonApplication rec { ]; postInstall = '' - rm $out/bin/streamlit.cmd # remove windows helper + rm $out/bin/streamlit.cmd # remove windows helper ''; meta = with lib; { diff --git a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix index 8dd55efaeb52..88330a579015 100644 --- a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix +++ b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix @@ -1,42 +1,44 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, rapidjson, spdlog, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, eigen, rapidjson, spdlog, zlib }: stdenv.mkDerivation rec { pname = "vowpal-wabbit"; - version = "9.0.1"; + version = "9.6.0"; src = fetchFromGitHub { owner = "VowpalWabbit"; repo = "vowpal_wabbit"; rev = version; - sha256 = "sha256-ZUurY2bmTKKIW4GR4oiIpLxb6DSRUNJI/EyNSOu9D9c="; + sha256 = "sha256-iSsxpeTRZjIhZaYBeoKLHl9j1aBIXWjONmAInmKvU/I="; }; + patches = [ + # Fix x86_64-linux build by adding missing include + # https://github.com/VowpalWabbit/vowpal_wabbit/pull/4275 + (fetchpatch { + url = "https://github.com/VowpalWabbit/vowpal_wabbit/commit/0cb410dfc885ca1ecafd1f8a962b481574fb3b82.patch"; + sha256 = "sha256-bX3eJ+vMTEMAo3EiESQTDryBP0h2GtnMa/Fz0rTeaNY="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost - flatbuffers + eigen rapidjson spdlog zlib ]; - # -DBUILD_TESTS=OFF is set as both it saves time in the build and the default - # cmake flags appended by the builder include -DBUILD_TESTING=OFF for which - # this is the equivalent flag. - # Flatbuffers are an optional feature. - # BUILD_FLATBUFFERS=ON turns it on. This will still consume Flatbuffers as a - # system dependency cmakeFlags = [ "-DVW_INSTALL=ON" - "-DBUILD_TESTS=OFF" "-DBUILD_JAVA=OFF" "-DBUILD_PYTHON=OFF" - "-DUSE_LATEST_STD=ON" "-DRAPIDJSON_SYS_DEP=ON" "-DFMT_SYS_DEP=ON" "-DSPDLOG_SYS_DEP=ON" - "-DBUILD_FLATBUFFERS=ON" + "-DVW_BOOST_MATH_SYS_DEP=ON" + "-DVW_EIGEN_SYS_DEP=ON" ]; meta = with lib; { diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/applications/science/math/LiE/default.nix index 9b16fc1d67f6..d05cc90ca44c 100644 --- a/pkgs/applications/science/math/LiE/default.nix +++ b/pkgs/applications/science/math/LiE/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { longDescription = '' LiE is a computer algebra system that is specialised in computations involving (reductive) Lie groups and their representations. It is - publically available for free in source code. For a description of its + publicly available for free in source code. For a description of its characteristics, we refer to the following sources of information. ''; # take from the website diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 1c8c565528e9..83acfcfe9c37 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.2.1"; + version = "4.2.2"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-TVLbSG0nhI5UYT1O6XetlS7AjOF4B+G1JbEM1ENsZD8="; + sha256 = "sha256-D/YrQuxRr6VxPK7nxP3noMRZQLo5vvjFyUh/7wyVPfU="; }; dontUseImakeConfigure = true; @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { patches = [ ./no-usr-local-search-paths.patch - ./test-reg-packages.patch ]; # Test of the examples for package 'tcltk' fails in Darwin sandbox. See: diff --git a/pkgs/applications/science/math/R/test-reg-packages.patch b/pkgs/applications/science/math/R/test-reg-packages.patch deleted file mode 100644 index 0125565a7997..000000000000 --- a/pkgs/applications/science/math/R/test-reg-packages.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upper bounds shifts due to extra warnings re. internet connectivity. - -diff --git a/tests/reg-packages.R b/tests/reg-packages.R -index c9962ce..a40b0fa 100644 ---- a/tests/reg-packages.R -+++ b/tests/reg-packages.R -@@ -260,7 +260,7 @@ stopifnot(exprs = { - (lenN <- length(print(iN <- grep("^[1-9][0-9]:", tlines)))) >= 2 - iN - iw == seq_len(lenN) # these (3) lines come immediately after 'Warning', - ## and "related" to the some 'missing .. paren' above: -- 8 <= print(iw - i) & iw - i <= 20 # see ~14 -+ 8 <= print(iw - i) & iw - i <= 22 # see ~14 - }) ## failed in R <= 4.1.1 - - diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index b23b433becd3..fedb219a0c19 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ bc python3Packages.pytestCheckHook ]; + nativeCheckInputs = [ bc python3Packages.pytestCheckHook ]; pytestFlagsArray = [ "test.py" ]; diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 41adb1cfbe6c..d521da2f114c 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "calc"; - version = "2.14.1.0"; + version = "2.14.1.2"; src = fetchurl { urls = [ - "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" + "https://github.com/lcn2/calc/releases/download/v${version}/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-C1YWZS4x7htUWF3MhRLQIYChL4rdwJxASdPQjttUr0A="; + sha256 = "sha256-3o8jKmEYxNQtExOkjqTVU24mtSok+T/RnRw6goNzThM="; }; postPatch = '' diff --git a/pkgs/applications/science/math/form/default.nix b/pkgs/applications/science/math/form/default.nix index 00f7d7e45365..73fe0cfb5dc3 100644 --- a/pkgs/applications/science/math/form/default.nix +++ b/pkgs/applications/science/math/form/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, gmp, zlib }: stdenv.mkDerivation { - version = "4.2.1"; + version = "4.3.0"; pname = "form"; # This tarball is released by author, it is not downloaded from tag, so can't use fetchFromGitHub src = fetchurl { - url = "https://github.com/vermaseren/form/releases/download/v4.2.1/form-4.2.1.tar.gz"; - sha256 = "0a0smc10gm85vxd85942n5azy88w5qs5avbqrw0lw0yb9injswpj"; + url = "https://github.com/vermaseren/form/releases/download/v4.3.0/form-4.3.0.tar.gz"; + sha256 = "sha256-sjTg0JX3PssJBM3DsNjYMjqfp/RncKUvsiJnxiSq+/Y="; }; buildInputs = [ gmp zlib ]; diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index af1be978459c..48c36b6677f5 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = { - homepage = "http://fricas.sourceforge.net/"; + homepage = "https://fricas.sourceforge.net/"; description = "An advanced computer algebra system"; license = lib.licenses.bsd3; diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index c65507228f82..677e7d9a0d96 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -66,11 +66,11 @@ in stdenv.mkDerivation rec { pname = "gap"; # https://www.gap-system.org/Releases/ - version = "4.12.1"; + version = "4.12.2"; src = fetchurl { url = "https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz"; - sha256 = "sha256-+evvEe4xshDONuPHCWB0K04lMoK71ScK3JMkJzySsBY="; + sha256 = "sha256-ZyMIdF63iiIklO6N1nhu3VvDMUVvzGRWrAZL2yjVh6g="; }; # remove all non-essential packages (which take up a lot of space) diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index fef154f03e94..cde4ed20c2d8 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: let pname = "geogebra"; - version = "5-0-723-0"; + version = "5-0-745-0"; srcIcon = fetchurl { url = "http://static.geogebra.org/images/geogebra-logo.svg"; - sha256 = "01sy7ggfvck350hwv0cla9ynrvghvssqm3c59x4q5lwsxjsxdpjm"; + hash = "sha256-Vd7Wteya04JJT4WNirXe8O1sfVKUgc0hKGOy7d47Xgc="; }; desktopItem = makeDesktopItem { @@ -45,9 +45,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" - "https://web.archive.org/web/20220807021654/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" + "https://web.archive.org/web/20221126102702/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" ]; - sha256 = "fc05e2ae35b91f2d30650df08da0c20e060f559ef1fac1375cb70093c1d20507"; + hash = "sha256-DhZ9inK/6Cc/vunYNHhyP4tI/9/toUOgV4lZWmFIj3c="; }; nativeBuildInputs = [ makeWrapper ]; @@ -76,9 +76,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip" - "https://web.archive.org/web/20220807021931/https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip" + "https://web.archive.org/web/20221126102602/https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip" ]; - sha256 = "83aa702625c88be00ee005b40bdac0822af37dc1bba7dbf0ba6c4f547d7387d7"; + hash = "sha256-La7NzEoao4ExUw3mBGstvSHm94/JM5LHlhOE9ewJePY="; }; dontUnpack = true; diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index de75e558dc67..22978347f4c0 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -1,15 +1,27 @@ { lib, stdenv, unzip, fetchurl, electron, makeWrapper, geogebra }: let pname = "geogebra"; - version = "6-0-723-0"; + version = "6-0-745-0"; srcIcon = geogebra.srcIcon; desktopItem = geogebra.desktopItem; - meta = with lib; geogebra.meta // { - license = licenses.geogebra; + meta = with lib; { + description = "Dynamic mathematics software with graphics, algebra and spreadsheets"; + longDescription = '' + Dynamic mathematics software for all levels of education that brings + together geometry, algebra, spreadsheets, graphing, statistics and + calculus in one easy-to-use package. + ''; + homepage = "https://www.geogebra.org/"; maintainers = with maintainers; [ voidless sikmir ]; + license = licenses.geogebra; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode # some jars include native binaries + ]; platforms = with platforms; linux ++ darwin; + hydraPlatforms = []; }; linuxPkg = stdenv.mkDerivation { @@ -18,9 +30,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" - "https://web.archive.org/web/20220807022226/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + "https://web.archive.org/web/20221126110648/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" ]; - sha256 = "f0b8a5bdadd3599489872ffe8e0bfd9e42ce3d28b1f6072001cc74f7d3e9e647"; + hash = "sha256-UksHZt7bEs/aRzFiJrT1Quz/SFSvA88sdhoi1IEVdBc="; }; dontConfigure = true; @@ -53,9 +65,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" - "https://web.archive.org/web/20220807022337/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" + "https://web.archive.org/web/20221126111123/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" ]; - sha256 = "463ca067c5187e0b639b72bef577b2f1bf73c394c9a1a88071c547e3e1c1888c"; + hash = "sha256-Qn2MD3W5icX45Tfs19oRV8J3lYmL8T+hp7A+crRb9tQ="; }; dontUnpack = true; diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index 434291861d67..df7639dc6c21 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -9,11 +9,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "giac${lib.optionalString enableGUI "-with-xcas"}"; - version = "1.9.0-5"; # TODO try to remove preCheck phase on upgrade + version = "1.9.0-29"; # TODO try to remove preCheck phase on upgrade src = fetchurl { url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz"; - sha256 = "sha256-EP8wRi8QZPrr1lfKN6da87s1FCy8AuDYbzcvsJCWyLE="; + sha256 = "sha256-9jUVcsrV8jMfqrmnymZ4vIaWlabF9ppCuq7VDlZ5Cw4="; }; patches = [ @@ -22,13 +22,28 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/pari_2_11.patch?id=21ba7540d385a9864b44850d6987893dfa16bfc0"; sha256 = "sha256-vEo/5MNzMdYRPWgLFPsDcMT1W80Qzj4EPBjx/B8j68k="; }) + + # giac calls scanf/printf with non-constant first arguments, which + # the compiler rightfully warns about (with an error nowadays). + (fetchpatch { + name = "fix-string-compiler-error.patch"; + url = "https://salsa.debian.org/science-team/giac/-/raw/08cb807ef41f5216b712928886ebf74f69d5ddf6/debian/patches/fix-string-compiler-error.patch"; + sha256 = "sha256-K4KAJY1F9Y4DTZFmVEOCXTnxBmHo4//3A10UR3Wlliw="; + }) + + # increase pari stack size for test chk_fhan4 + (fetchpatch { + name = "increase-pari-stack-size.patch"; + url = "https://salsa.debian.org/science-team/giac/-/raw/08cb807ef41f5216b712928886ebf74f69d5ddf6/debian/patches/increase-pari-size.patch"; + sha256 = "sha256-764P0IJ7ndURap7hotOmYJK0wAhYdqMbQNOnhJxVNt0="; + }) ] ++ lib.optionals (!enableGUI) [ # when enableGui is false, giac is compiled without fltk. That # means some outputs differ in the make check. Patch around this: (fetchpatch { name = "nofltk-check.patch"; url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26"; - sha256 = "0xkmfc028vg5w6va04gp2x2iv31n8v4shd6vbyvk4blzgfmpj2cw"; + sha256 = "sha256-nAl5q3ufLjK3X9s0qMlGNowdRRf3EaC24eVtJABzdXY="; }) ]; @@ -85,7 +100,11 @@ stdenv.mkDerivation rec { "--enable-ao" "--enable-ecm" "--enable-glpk" ] ++ lib.optionals enableGUI [ "--enable-gui" "--with-x" - ] ++ lib.optional (!enableMicroPy) "--disable-micropy"; + ] ++ lib.optionals (!enableGUI) [ + "--disable-fltk" + ] ++ lib.optionals (!enableMicroPy) [ + "--disable-micropy" + ]; postInstall = '' # example Makefiles contain the full path to some commands @@ -114,6 +133,7 @@ stdenv.mkDerivation rec { homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"; license = licenses.gpl3Plus; platforms = platforms.linux ++ (optionals (!enableGUI) platforms.darwin); + broken = stdenv.isDarwin && stdenv.isAarch64; maintainers = [ maintainers.symphorien ]; }; } diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 7357f024c90d..1b5a0622f4e2 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.4"; + version = "1.8.5"; src = fetchurl { url = "https://www.ginac.de/ginac-${version}.tar.bz2"; - sha256 = "sha256-J84Wrt/nRlGyI725JGwAWWt/+b9yeg06Rz9GcADaxJI="; + sha256 = "sha256-wks3oecJ9mDQl4eH6GszSAPNKOwXaJzzbd/zgAc+omE="; }; propagatedBuildInputs = [ cln ]; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 22eee8b305a5..4d9b3afe31ca 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,15 +1,17 @@ { lib, stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg -, zlib, libGL, libGLU, xorg, opencascade-occt }: +, zlib, libGL, libGLU, xorg, opencascade-occt +, python ? null, enablePython ? false }: assert (!blas.isILP64) && (!lapack.isILP64); +assert enablePython -> (python != null); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.11.0"; + version = "4.11.1"; src = fetchurl { url = "https://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "sha256-PPLyRFXuCSUsmeZNTmRilW5o8P8fN7rKC3jICdbMVXo="; + sha256 = "sha256-xf4bfL1AOIioFJKfL9D11p4nYAIioYx4bbW3boAFs2U="; }; buildInputs = [ @@ -18,10 +20,31 @@ stdenv.mkDerivation rec { libGL libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE + ] ++ lib.optional enablePython python; + + enableParallelBuilding = true; + + patches = [ ./fix-python.patch ]; + + postPatch = '' + substituteInPlace api/gmsh.py --subst-var-by LIBPATH ${placeholder "out"}/lib/libgmsh.so + ''; + + # N.B. the shared object is used by bindings + cmakeFlags = [ + "-DENABLE_BUILD_SHARED=ON" + "-DENABLE_BUILD_DYNAMIC=ON" + "-DENABLE_OPENMP=ON" ]; nativeBuildInputs = [ cmake gfortran ]; + postFixup = lib.optionalString enablePython '' + mkdir -p $out/lib/python${python.pythonVersion}/site-packages + mv $out/lib/gmsh.py $out/lib/python${python.pythonVersion}/site-packages + mv $out/lib/*.dist-info $out/lib/python${python.pythonVersion}/site-packages + ''; + doCheck = true; meta = { diff --git a/pkgs/applications/science/math/gmsh/fix-python.patch b/pkgs/applications/science/math/gmsh/fix-python.patch new file mode 100644 index 000000000000..ac07c169c99b --- /dev/null +++ b/pkgs/applications/science/math/gmsh/fix-python.patch @@ -0,0 +1,50 @@ +diff --git a/api/gmsh.py b/api/gmsh.py +index 747acb203..02004da5d 100644 +--- a/api/gmsh.py ++++ b/api/gmsh.py +@@ -44,44 +44,7 @@ moduledir = os.path.dirname(os.path.realpath(__file__)) + parentdir1 = os.path.dirname(moduledir) + parentdir2 = os.path.dirname(parentdir1) + +-if platform.system() == "Windows": +- libname = "gmsh-4.11.dll" +-elif platform.system() == "Darwin": +- libname = "libgmsh.4.11.dylib" +-else: +- libname = "libgmsh.so.4.11" +- +-# check if the library is in the same directory as the module... +-libpath = os.path.join(moduledir, libname) +- +-# ... or in the parent directory or its lib or Lib subdirectory +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir1, libname) +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir1, "lib", libname) +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir1, "Lib", libname) +- +-# ... or in the parent of the parent directory or its lib or Lib subdirectory +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir2, libname) +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir2, "lib", libname) +-if not os.path.exists(libpath): +- libpath = os.path.join(parentdir2, "Lib", libname) +- +-# if we couldn't find it, use ctype's find_library utility... +-if not os.path.exists(libpath): +- if platform.system() == "Windows": +- libpath = find_library("gmsh-4.11") +- if not libpath: +- libpath = find_library("gmsh") +- else: +- libpath = find_library("gmsh") +- +-# ... and print a warning if everything failed +-if not os.path.exists(libpath): +- print("Warning: could not find Gmsh shared library " + libname) ++libpath = "@LIBPATH@" + + lib = CDLL(libpath) + diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix index 5e1ac5d17733..a2624c29662e 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 = "2022b"; + version = "2022c"; src = fetchurl { url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; - sha256 = "sha256-A+LyWPSUBBvnnyBrVSAUCiny24UAztUwy1nmRoDaGjI="; + sha256 = "sha256-4QAQTNqbfIX6K3CdtKcVONtCWrkTRvGl2ZXGR1eyQdA="; }; buildInputs = [ diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index a3f6a83efab1..c0f370d88457 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -4,7 +4,26 @@ , cudaPackages , cudaSupport ? config.cudaSupport or false , lang ? "en" +, webdoc ? false , version ? null +/* +If you wish to completely override the src, use: +my_mathematica = mathematica.override { + source = pkgs.requireFile { + name = "Mathematica_XX.X.X_BNDL_LINUX.sh"; + # Get this hash via a command similar to this: + # nix-store --query --hash \ + # $(nix store add-path Mathematica_XX.X.X_BNDL_LINUX.sh --name 'Mathematica_XX.X.X_BNDL_LINUX.sh') + sha256 = "0000000000000000000000000000000000000000000000000000"; + message = '' + Your override for Mathematica includes a different src for the installer, + and it is missing. + ''; + hashMode = "recursive"; + }; +} +*/ +, source ? null }: let versions = callPackage ./versions.nix { }; @@ -12,16 +31,20 @@ let versions = callPackage ./versions.nix { }; matching-versions = lib.sort (v1: v2: lib.versionAtLeast v1.version v2.version) (lib.filter (v: v.lang == lang - && (if version == null then true else isMatching v.version version)) + && (version == null || isMatching v.version version) + && matchesDoc v) versions); found-version = if matching-versions == [] then throw ("No registered Mathematica version found to match" - + " version=${version} and language=${lang}") + + " version=${toString version} and language=${lang}," + + " ${if webdoc + then "using web documentation" + else "and with local documentation"}") else lib.head matching-versions; - specific-drv = ./. + "/(lib.versions.major found-version.version).nix"; + specific-drv = ./. + "/${lib.versions.major found-version.version}.nix"; real-drv = if lib.pathExists specific-drv then specific-drv @@ -34,11 +57,17 @@ let versions = callPackage ./versions.nix { }; sublist = l: lib.sublist 0 n l; in lib.compareLists lib.compare (sublist as) (sublist bs) == 0; + matchesDoc = v: + builtins.match (if webdoc + then ".*[0-9]_LINUX.sh" + else ".*[0-9]_BNDL_LINUX.sh") v.src.name != null; + in callPackage real-drv { inherit cudaSupport cudaPackages; - inherit (found-version) version lang src; + inherit (found-version) version lang; + src = if source == null then found-version.src else source; name = ("mathematica" + lib.optionalString cudaSupport "-cuda" + "-${found-version.version}" diff --git a/pkgs/applications/science/math/mathematica/versions.nix b/pkgs/applications/science/math/mathematica/versions.nix index 225ceb6e3b2d..09df9e13977e 100644 --- a/pkgs/applications/science/math/mathematica/versions.nix +++ b/pkgs/applications/science/math/mathematica/versions.nix @@ -1,6 +1,33 @@ { lib, requireFile }: +/* + * To calculate the hash of an installer, use a command like this: + * + * nix --extra-experimental-features nix-command hash file + */ + let versions = [ + { + version = "13.2.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-T9XOXA6jpgN6bcO/do9sw1L73ABtyxuZCLzftv4Cl6o="; + installer = "Mathematica_13.2.0_LINUX.sh"; + } + { + version = "13.2.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-YRUvl2H9SwpwDZx04ugd7ZnK5G+t88bzAObXsGGVhk0="; + installer = "Mathematica_13.2.0_BNDL_LINUX.sh"; + } + { + version = "13.1.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-GZyUYslx/M4aFI3Pj9Osw3/w79/Jp/4T3mRE277pNuM="; + installer = "Mathematica_13.1.0_LINUX.sh"; + } { version = "13.1.0"; lang = "en"; diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 8bad09f17880..dffc212176b3 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { strictDeps = true; - checkInputs = [ + nativeCheckInputs = [ gnuplot ]; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 9a1b550d882d..dcba888ce2fb 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -2,11 +2,10 @@ , opencv3, gtest, blas, gomp, llvmPackages, perl , cudaSupport ? config.cudaSupport or false, cudaPackages ? {}, nvidia_x11 , cudnnSupport ? cudaSupport -, cudaCapabilities ? [ "3.7" "5.0" "6.0" "7.0" "7.5" "8.0" "8.6" ] }: let - inherit (cudaPackages) cudatoolkit cudnn; + inherit (cudaPackages) cudatoolkit cudaFlags cudnn; in assert cudnnSupport -> cudaSupport; @@ -51,7 +50,7 @@ stdenv.mkDerivation rec { "-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743 "-DCUDA_ARCH_NAME=All" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" - "-DMXNET_CUDA_ARCH=${lib.concatStringsSep ";" cudaCapabilities}" + "-DMXNET_CUDA_ARCH=${cudaFlags.cudaCapabilitiesSemiColonString}" ] else [ "-DUSE_CUDA=OFF" ]) ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 927a71b9ef13..f420c940f35c 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -63,9 +63,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/science/math/pagsuite/default.nix b/pkgs/applications/science/math/pagsuite/default.nix index e8ae3318eeba..6994712e18fd 100644 --- a/pkgs/applications/science/math/pagsuite/default.nix +++ b/pkgs/applications/science/math/pagsuite/default.nix @@ -1,7 +1,8 @@ { lib , stdenv -, fetchzip +, fetchurl , cmake +, unzip , gmp , scalp }: @@ -10,17 +11,16 @@ stdenv.mkDerivation rec { pname = "pagsuite"; version = "1.80"; - src = fetchzip { + src = fetchurl { url = "https://gitlab.com/kumm/pagsuite/-/raw/master/releases/pagsuite_${lib.replaceStrings ["."] ["_"] version}.zip"; - sha256 = "sha256-JuRuDPhKKBGz8jUBkZcZW5s2berOewjsPNR/n7kuofY="; - stripRoot = false; - postFetch = '' - mv $out/pagsuite*/* $out - ''; + hash = "sha256-TYd+dleVPWEWU9Cb3XExd7ixJZyiUAp9QLtorYJSIbQ="; }; + sourceRoot = "pagsuite_${lib.replaceStrings ["."] ["_"] version}"; + nativeBuildInputs = [ cmake + unzip ]; buildInputs = [ diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 933ad45fd519..91cf4ae4f389 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -14,7 +14,7 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { pname = "pari"; - version = "2.13.4"; + version = "2.15.1"; src = fetchurl { urls = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # old versions are at the url below "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz" ]; - hash = "sha256-vN6ezq4VkoFDgcFpfNtwY1Z7ZQQgGxvke7WJIPO84YU="; + hash = "sha256-RUGdt3xmhb7mfkLg7LeOGe9WK+eq/GN8ikGXDy6Qnj0="; }; buildInputs = [ @@ -40,17 +40,12 @@ stdenv.mkDerivation rec { "--with-gmp=${lib.getDev gmp}" "--with-readline=${lib.getDev readline}" ] - ++ lib.optional stdenv.isDarwin "--host=x86_64-darwin" ++ lib.optional withThread "--mt=pthread"; preConfigure = '' export LD=$CC ''; - postConfigure = lib.optionalString stdenv.isDarwin '' - echo 'echo x86_64-darwin' > config/arch-osname - ''; - makeFlags = [ "all" ]; meta = with lib; { @@ -83,7 +78,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ ertes ] ++ teams.sage.members; platforms = platforms.linux ++ platforms.darwin; - broken = stdenv.isDarwin && stdenv.isAarch64; mainProgram = "gp"; }; } diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix index 073275e410b7..0eecff0a1798 100644 --- a/pkgs/applications/science/math/polymake/default.nix +++ b/pkgs/applications/science/math/polymake/default.nix @@ -1,7 +1,20 @@ -{ lib, stdenv, fetchurl -, perl, gmp, mpfr, flint, boost -, bliss, ppl, singular, cddlib, lrs, nauty -, ninja, ant, openjdk +{ lib +, stdenv +, fetchurl +, perl +, gmp +, mpfr +, flint +, boost +, bliss +, ppl +, singular +, cddlib +, lrs +, nauty +, ninja +, ant +, openjdk , perlPackages , makeWrapper }: @@ -12,27 +25,42 @@ stdenv.mkDerivation rec { pname = "polymake"; - version = "4.7"; + version = "4.8"; 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-1qv+3gIsbM1xHh02S3ybkcvVkKS3OZDNNWfJt2nybmE="; + sha256 = "sha256-GfsAypJBpHwpvoEl/IzJ1gQfeMcYwB7oNe01xWJ+86w="; }; + nativeBuildInputs = [ + makeWrapper + ninja + ant + perl + ]; + buildInputs = [ - perl gmp mpfr flint boost - bliss ppl singular cddlib lrs nauty + perl + gmp + mpfr + flint + boost + bliss + ppl + singular + cddlib + lrs + nauty openjdk ] ++ (with perlPackages; [ - JSON TermReadLineGnu TermReadKey XMLSAX + JSON + TermReadLineGnu + TermReadKey + XMLSAX ]); - nativeBuildInputs = [ - makeWrapper ninja ant perl - ]; - ninjaFlags = [ "-C" "build/Opt" ]; postInstall = '' @@ -43,9 +71,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software for research in polyhedral geometry"; + homepage = "https://www.polymake.org/doku.php"; + changelog = "https://github.com/polymake/polymake/blob/V${version}/ChangeLog"; license = licenses.gpl2Plus; maintainers = teams.sage.members; platforms = platforms.linux; - homepage = "https://www.polymake.org/doku.php"; }; } diff --git a/pkgs/applications/science/math/primecount/default.nix b/pkgs/applications/science/math/primecount/default.nix index a5ecd42a8e49..8fd2644ba110 100644 --- a/pkgs/applications/science/math/primecount/default.nix +++ b/pkgs/applications/science/math/primecount/default.nix @@ -7,18 +7,22 @@ stdenv.mkDerivation rec { pname = "primecount"; - version = "7.4"; + version = "7.6"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primecount"; rev = "v${version}"; - hash = "sha256-ZKrTeeDJgVy+6Q0twFW9+bQulUmOL1dxznYK9nWd07Y="; + hash = "sha256-x9sXLuHd3nfVM6sL/5yAzIoTVkf1LIUnbhx2WlD/OS8="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; - buildInputs = [ primesieve ]; + buildInputs = [ + primesieve + ]; cmakeFlags = [ "-DBUILD_LIBPRIMESIEVE=ON" @@ -30,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/kimwalisch/primecount"; + changelog = "https://github.com/kimwalisch/primecount/blob/v${version}/ChangeLog"; description = "Fast prime counting function implementations"; longDescription = '' primecount is a command-line program and C/C++ library that counts the diff --git a/pkgs/applications/science/math/primesieve/default.nix b/pkgs/applications/science/math/primesieve/default.nix index e43538e9babc..3aab036fb02a 100644 --- a/pkgs/applications/science/math/primesieve/default.nix +++ b/pkgs/applications/science/math/primesieve/default.nix @@ -6,19 +6,20 @@ stdenv.mkDerivation rec { pname = "primesieve"; - version = "8.0"; + version = "11.0"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primesieve"; rev = "v${version}"; - hash = "sha256-sqHNQXWeo+Iktq3gyiDLblBq/9QNlUQDvi1oHcZ2XYM="; + hash = "sha256-mYekOfjeGwQzWi3pBXnmRMTV7nghEvHsD+tR7vrTFRY="; }; nativeBuildInputs = [ cmake ]; meta = with lib; { homepage = "https://primesieve.org/"; + changelog = "https://github.com/kimwalisch/primesieve/blob/v${version}/ChangeLog"; description = "Fast C/C++ prime number generator"; longDescription = '' primesieve is a command-line program and C/C++ library for quickly diff --git a/pkgs/applications/science/math/programmer-calculator/default.nix b/pkgs/applications/science/math/programmer-calculator/default.nix index e9c7cb985cb9..ee48a1d0f1a3 100644 --- a/pkgs/applications/science/math/programmer-calculator/default.nix +++ b/pkgs/applications/science/math/programmer-calculator/default.nix @@ -2,13 +2,13 @@ gccStdenv.mkDerivation rec { pname = "programmer-calculator"; - version = "2.2"; + version = "3.0"; src = fetchFromGitHub { owner = "alt-romes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JQcYCYKdjdy8U2XMFzqTH9kAQ7CFv0r+sC1YfuAm7p8="; + sha256 = "sha256-9mv8Jac6j3fKWLLCu1Bd/T5dbegUB8rRgsj9MaQhFDw="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 204b3b7ba5fe..dd1b7c301ae2 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 = "4.4.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-gXzGjELVcZ7LIOCu+Nub6K+zx8b6InkZk2NTfDHw8/E="; + sha256 = "sha256-ilPz2W9pcbK5dnYl7Tuxf9p7ag/KmEufckooXBUcCk0="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index 099f0ec6067c..dbcacb36be6b 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -1,24 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, intltool, pkg-config, qmake, wrapQtAppsHook, libqalculate, qtbase, qttools }: +{ lib, stdenv, fetchFromGitHub, intltool, pkg-config, qmake, wrapQtAppsHook, libqalculate, qtbase, qttools, qtsvg, qtwayland }: stdenv.mkDerivation rec { pname = "qalculate-qt"; - version = "4.4.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${version}"; - sha256 = "sha256-C3alvl8hLxUy+soSjfxlNQ++QTcU9Gong1ydVpu8xGs="; + hash = "sha256-1MU/Wici+NQWbjoNpE9q6jKx8aKt85OAfb+ZsN/oK5w="; }; nativeBuildInputs = [ qmake intltool pkg-config wrapQtAppsHook ]; - buildInputs = [ libqalculate qtbase qttools ]; + buildInputs = [ libqalculate qtbase qttools qtsvg qtwayland ]; + + postPatch = '' + substituteInPlace qalculate-qt.pro\ + --replace "LRELEASE" "${qttools.dev}/bin/lrelease" + ''; meta = with lib; { description = "The ultimate desktop calculator"; homepage = "http://qalculate.github.io"; maintainers = with maintainers; [ _4825764518 ]; license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/math/readstat/default.nix b/pkgs/applications/science/math/readstat/default.nix index 7621c2dfdff7..bb945b06ba13 100644 --- a/pkgs/applications/science/math/readstat/default.nix +++ b/pkgs/applications/science/math/readstat/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ libiconv ]; + buildInputs = [ libiconv ]; + + enableParallelBuilding = true; meta = { homepage = "https://github.com/WizardMac/ReadStat"; diff --git a/pkgs/applications/science/math/sage/patches/ipywidgets-on_submit-deprecationwarning.patch b/pkgs/applications/science/math/sage/patches/ipywidgets-on_submit-deprecationwarning.patch new file mode 100644 index 000000000000..b0f3634340f5 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/ipywidgets-on_submit-deprecationwarning.patch @@ -0,0 +1,13 @@ +diff --git a/src/sage/interacts/library.py b/src/sage/interacts/library.py +index 06d680109a..139b00bfd1 100644 +--- a/src/sage/interacts/library.py ++++ b/src/sage/interacts/library.py +@@ -1434,6 +1434,8 @@ def riemann_sum( + creates the mathlet:: + + sage: interacts.calculus.riemann_sum() ++ ... ++ DeprecationWarning: on_submit is deprecated. Instead, set the .continuous_update attribute to False and observe the value changing with: mywidget.observe(callback, 'value'). + Manual interactive function with 9 widgets + title: HTMLText(value='

Riemann integral with random sampling

') + f: EvalText(value='x^2+1', description='$f(x)=$', layout=Layout(max_width='41em')) diff --git a/pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch b/pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch new file mode 100644 index 000000000000..40bbbe23f1a3 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch @@ -0,0 +1,26 @@ +diff --git a/src/sage/geometry/polyhedron/backend_normaliz.py b/src/sage/geometry/polyhedron/backend_normaliz.py +index 86b89632a5..ca8a43b248 100644 +--- a/src/sage/geometry/polyhedron/backend_normaliz.py ++++ b/src/sage/geometry/polyhedron/backend_normaliz.py +@@ -53,7 +53,7 @@ def _number_field_elements_from_algebraics_list_of_lists_of_lists(listss, **kwds + 1.732050807568878? + sage: from sage.geometry.polyhedron.backend_normaliz import _number_field_elements_from_algebraics_list_of_lists_of_lists + sage: K, results, hom = _number_field_elements_from_algebraics_list_of_lists_of_lists([[[rt2], [1]], [[rt3]], [[1], []]]); results # optional - sage.rings.number_field +- [[[-a^3 + 3*a], [1]], [[-a^2 + 2]], [[1], []]] ++ [[[-a^3 + 3*a], [1]], [[a^2 - 2]], [[1], []]] + """ + from sage.rings.qqbar import number_field_elements_from_algebraics + numbers = [] +diff --git a/src/sage/lfunctions/pari.py b/src/sage/lfunctions/pari.py +index d2b20f1891..6c31efe239 100644 +--- a/src/sage/lfunctions/pari.py ++++ b/src/sage/lfunctions/pari.py +@@ -339,7 +339,7 @@ def lfun_eta_quotient(scalings, exponents): + 0.0374412812685155 + + sage: lfun_eta_quotient([6],[4]) +- [[Vecsmall([7]), [Vecsmall([6]), Vecsmall([4])]], 0, [0, 1], 2, 36, 1] ++ [[Vecsmall([7]), [Vecsmall([6]), Vecsmall([4]), 0]], 0, [0, 1], 2, 36, 1] + + sage: lfun_eta_quotient([2,1,4], [5,-2,-2]) + Traceback (most recent call last): diff --git a/pkgs/applications/science/math/sage/patches/sphinx-fix-matplotlib-css-perms.patch b/pkgs/applications/science/math/sage/patches/sphinx-fix-matplotlib-css-perms.patch deleted file mode 100644 index 764ecffa2377..000000000000 --- a/pkgs/applications/science/math/sage/patches/sphinx-fix-matplotlib-css-perms.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/sage_docbuild/ext/multidocs.py b/src/sage_docbuild/ext/multidocs.py -index f91c7753ca..edeb81ff2e 100644 ---- a/src/sage_docbuild/ext/multidocs.py -+++ b/src/sage_docbuild/ext/multidocs.py -@@ -284,6 +284,16 @@ def init_subdoc(app): - if not app.config.multidoc_first_pass: - app.connect('env-updated', fetch_citation) - -+ def fix_matplotlib_css_permissions(app: Sphinx, env): -+ css_file = os.path.join(app.builder.outdir, '_static', 'plot_directive.css') -+ try: -+ os.chmod(css_file, 0o644) -+ except: -+ pass -+ -+ # executed after matplotlib's _copy_css_file -+ app.connect('build-finished', fix_matplotlib_css_permissions, priority=600) -+ - # Monkey patch copy_static_files to make a symlink to "../" - def link_static_files(): - """ diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index c0a92454ac19..d68a2c8a107a 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -80,10 +80,6 @@ stdenv.mkDerivation rec { # Parallelize docubuild using subprocesses, fixing an isolation issue. See # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE ./patches/sphinx-docbuild-subprocesses.patch - - # Docbuilding copies files from the Nix store and expects them to be writable. - # Remove when https://github.com/matplotlib/matplotlib/pull/23805 lands. - ./patches/sphinx-fix-matplotlib-css-perms.patch ]; # Since sage unfortunately does not release bugfix releases, packagers must @@ -93,6 +89,14 @@ stdenv.mkDerivation rec { # To help debug the transient error in # https://trac.sagemath.org/ticket/23087 when it next occurs. ./patches/configurationpy-error-verbose.patch + + # https://trac.sagemath.org/ticket/33907 + (fetchSageDiff { + name = "interfaces-expectpy-intermittent.patch"; + base = "9.8.beta6"; + rev = "6f5c1c2fc8bcfb5e6555716d05ce70511795ffa1"; + sha256 = "sha256-z8FQxtrk62MHzPjrUTad+fMAE6XV8GTsLWKgGOM3zBg="; + }) ]; # Patches needed because of package updates. We could just pin the versions of @@ -147,6 +151,49 @@ stdenv.mkDerivation rec { sha256 = "sha256-9BhQLFB3wUhiXRQsK9L+I62lSjvTfrqMNi7QUIQvH4U="; }) + # https://trac.sagemath.org/ticket/34537 + (fetchSageDiff { + name = "pari-2.15.1-upgrade.patch"; + squashed = true; + base = "54cd6fe6de52aee5a433e0569e8c370618cb2047"; # 9.8.beta1 + rev = "1e86aa26790d84bf066eca67f98a60a8aa3d4d3a"; + sha256 = "sha256-LUgcMqrKXWb72Kxl0n6MV5unLXlQSeG8ncN41F7TRSc="; + excludes = ["build/*" + "src/sage/geometry/polyhedron/base_number_field.py" + "src/sage/geometry/polyhedron/backend_normaliz.py" + "src/sage/lfunctions/pari.py"]; + }) + # Some files were excluded from the above patch due to + # conflicts. The patch below contains rebased versions. + ./patches/pari-2.15.1-upgrade-rebased.patch + + # https://trac.sagemath.org/ticket/34668 + (fetchSageDiff { + name = "matplotlib-3.6-upgrade.patch"; + base = "9.8.beta2"; + rev = "5501e0de0dca1cff0355326dd42bd8c7e5749568"; + sha256 = "sha256-ceJkVaecIsZewN8v/3gPQXFbFjv5Akz6zEFg/ToXdek="; + }) + + # https://trac.sagemath.org/ticket/34693 + (fetchSageDiff { + name = "matplotlib-3.6-docbuilding.patch"; + base = "9.8.beta4"; + rev = "64589686c261d33e6b5aff2589bcae8af004bcc6"; + sha256 = "sha256-j5AMY1TmhP+HBBBYaFZSkABJ5vtwe6iP2LRfGEgSm8Q="; + }) + + # https://trac.sagemath.org/ticket/34615 + (fetchSageDiff { + name = "sphinx-5.2-upgrade.patch"; + base = "9.8.beta1"; + rev = "8f8af65e54d3a9962cfab40f15dc23f4e955b43f"; + sha256 = "sha256-yhDdyxnXSSkqLcuOPBWSEBc26rk1Od3gLcWW8S2p8bY="; + }) + + # temporarily paper over https://github.com/jupyter-widgets/ipywidgets/issues/3669 + ./patches/ipywidgets-on_submit-deprecationwarning.patch + # Sage uses mixed integer programs (MIPs) to find edge disjoint # spanning trees. For some reason, aarch64 glpk takes much longer # than x86_64 glpk to solve such MIPs. Since the MIP formulation diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 8f864d136928..143e5a2a22b3 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -49,7 +49,7 @@ , boost , singular , pip -, jupyter_core +, jupyter-core , sage-setup , libhomfly , libbraiding @@ -87,7 +87,7 @@ buildPythonPackage rec { nativeBuildInputs = [ iml perl - jupyter_core + jupyter-core pkg-config sage-setup pip # needed to query installed packages diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 9d18763aa32d..004060f832c2 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "weka"; - version = "3.9.2"; + version = "3.9.6"; src = fetchurl { - url = "mirror://sourceforge/weka/${lib.replaceChars ["."]["-"] "${pname}-${version}"}.zip"; - sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31"; + url = "mirror://sourceforge/weka/${lib.replaceStrings ["."]["-"] "${pname}-${version}"}.zip"; + sha256 = "sha256-8fVN4MXYqXNEmyVtXh1IrauHTBZWgWG8AvsGI5Y9Aj0="; }; nativeBuildInputs = [ makeWrapper unzip ]; # The -Xmx1000M comes suggested from their download page: - # http://www.cs.waikato.ac.nz/ml/weka/downloading.html + # https://www.cs.waikato.ac.nz/ml/weka/downloading.html installPhase = '' mkdir -pv $out/share/weka cp -Rv * $out/share/weka @@ -21,11 +21,12 @@ stdenv.mkDerivation rec { --add-flags "-Xmx1000M -jar $out/share/weka/weka.jar" ''; - meta = { - homepage = "http://www.cs.waikato.ac.nz/ml/weka/"; + meta = with lib; { + homepage = "https://www.cs.waikato.ac.nz/ml/weka/"; description = "Collection of machine learning algorithms for data mining tasks"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.mimame ]; - platforms = lib.platforms.unix; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.gpl2Plus; + maintainers = [ maintainers.mimame ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index aea24b84d1d4..205fe3ebed5d 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -7,17 +7,18 @@ , maxima , wxGTK , gnome +, glib }: stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "22.05.0"; + version = "22.12.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "sha256-pcKnEjJmvMXCBpjtOSLyl4I0x3fjh0os9Sdp39I2Re0="; + sha256 = "sha256-RT6y4M6LQD1fXJcjtdSXnDmoJvv160g2asdV4WtTcok="; }; buildInputs = [ @@ -25,6 +26,8 @@ stdenv.mkDerivation rec { maxima # So it won't embed svg files into headers. gnome.adwaita-icon-theme + # So it won't crash under Sway. + glib ]; nativeBuildInputs = [ @@ -33,6 +36,10 @@ stdenv.mkDerivation rec { gettext ]; + cmakeFlags = [ + "-DwxWidgets_LIBRARIES=${wxGTK}/lib" + ]; + preConfigure = '' gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin) ''; diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix index f7dc2a344e18..7fa2fe1a6075 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/applications/science/math/yacas/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { preCheck = '' patchShebangs ../tests/test-yacas ''; - checkInputs = [ + nativeCheckInputs = [ gtest ]; doCheck = true; diff --git a/pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch b/pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch new file mode 100644 index 000000000000..053edac85b21 --- /dev/null +++ b/pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch @@ -0,0 +1,12 @@ +diff --git a/CMake/dcmtk.pc.in b/CMake/dcmtk.pc.in +index 13c79c0d5..b1edf725c 100644 +--- a/CMake/dcmtk.pc.in ++++ b/CMake/dcmtk.pc.in +@@ -1,6 +1,6 @@ + prefix="@CMAKE_INSTALL_PREFIX@" + exec_prefix="${prefix}" +- libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@" ++ libdir=@CMAKE_INSTALL_FULL_LIBDIR@" + includedir="${prefix}/include/" + + Name: DCMTK diff --git a/pkgs/applications/science/medicine/dcmtk/default.nix b/pkgs/applications/science/medicine/dcmtk/default.nix index a1f4b455ce79..878f62c666e2 100644 --- a/pkgs/applications/science/medicine/dcmtk/default.nix +++ b/pkgs/applications/science/medicine/dcmtk/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, zlib, libtiff, libxml2, openssl, libiconv, libpng, cmake }: +{ lib, stdenv, fetchFromGitHub, zlib, libtiff, libxml2, openssl, libiconv +, libpng, cmake, fetchpatch }: with lib; stdenv.mkDerivation rec { @@ -14,8 +15,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libpng zlib libtiff libxml2 openssl libiconv ]; + # This is only needed until https://github.com/DCMTK/dcmtk/pull/75/files is merged + patches = [ ./0001-Fix-cmake.patch ]; + + doCheck = true; + meta = { - description = "Collection of libraries and applications implementing large parts of the DICOM standard"; + description = + "Collection of libraries and applications implementing large parts of the DICOM standard"; longDescription = '' DCMTK is a collection of libraries and applications implementing large parts of the DICOM standard. It includes software for examining, constructing and converting DICOM image files, handling offline media, diff --git a/pkgs/applications/science/medicine/xmedcon/default.nix b/pkgs/applications/science/medicine/xmedcon/default.nix index 2050517894b9..5a0f3877cdbf 100644 --- a/pkgs/applications/science/medicine/xmedcon/default.nix +++ b/pkgs/applications/science/medicine/xmedcon/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "xmedcon"; - version = "0.22.0"; + version = "0.23.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Ui7XoLSzTMPIFW/3nARCmvlGF+1l7pmcnKsnvn3NFJE="; + sha256 = "sha256-g1CRJDokLDzB+1YIuVQNByBLx01CI47EwGeluqVDujk="; }; buildInputs = [ diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index 2304e9f77f4c..76495f5cae15 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { pname = "bada-bib"; - version = "0.7.2"; + version = "0.8.0"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { owner = "RogerCrocker"; repo = "BadaBib"; rev = "refs/tags/v${version}"; - sha256 = "sha256-+b4Ko2srWZUs8zsH9jU+aiKQYZti3z2Bil8PogfpPlc="; + sha256 = "sha256-mdAoJh3qOwtPX8cMCYw7MDDNy10GdhynnS8gtszJROI="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec { libadwaita ]; - checkInputs = [ + nativeCheckInputs = [ appstream-glib desktop-file-utils ]; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index aa7431504add..05ff1f09533f 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,29 +1,60 @@ -{ fetchFromGitHub, lib, stdenv, autoconf, automake, pkg-config, m4, curl, -libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil, -sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: - -let - majorVersion = "7.20"; - minorVersion = "2"; -in +{ fetchFromGitHub +, lib +, stdenv +, autoconf +, automake +, pkg-config +, m4 +, curl +, libGLU +, libGL +, libXmu +, libXi +, freeglut +, libjpeg +, libtool +, wxGTK32 +, xcbutil +, sqlite +, gtk3 +, patchelf +, libXScrnSaver +, libnotify +, libX11 +, libxcb +}: stdenv.mkDerivation rec { - version = "${majorVersion}.${minorVersion}"; pname = "boinc"; + version = "7.22.0"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; - rev = "client_release/${majorVersion}/${version}"; - sha256 = "sha256-vMb5Vq/6I6lniG396wd7+FfslsByedMRPIpiItp1d1s="; + rev = "client_release/${lib.versions.majorMinor version}/${version}"; + hash = "sha256-AVWgFsxeuHADEat83XQLLeQkzw3kaUdPL0rp8b6Rxyk="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; buildInputs = [ - curl libGLU libGL libXmu libXi freeglut libjpeg wxGTK30 sqlite gtk2 libXScrnSaver - libnotify patchelf libX11 libxcb xcbutil + curl + libGLU + libGL + libXmu + libXi + freeglut + libjpeg + wxGTK32 + sqlite + gtk3 + libXScrnSaver + libnotify + patchelf + libX11 + libxcb + xcbutil ]; NIX_LDFLAGS = "-lX11"; @@ -45,11 +76,7 @@ stdenv.mkDerivation rec { description = "Free software for distributed and grid computing"; homepage = "https://boinc.berkeley.edu/"; license = licenses.lgpl2Plus; - platforms = platforms.linux; # arbitrary choice - # checking for gcc options needed to detect all undeclared functions... cannot detect - # configure: error: in `/build/boinc-7.18.1-src': - # configure: error: cannot make gcc report undeclared builtins - broken = stdenv.isAarch64; + platforms = platforms.linux; maintainers = with maintainers; [ Luflosi ]; }; } diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix index 6a1bdc3de160..665a2924af42 100644 --- a/pkgs/applications/science/misc/cwltool/default.nix +++ b/pkgs/applications/science/misc/cwltool/default.nix @@ -7,19 +7,19 @@ python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20220224085855"; + version = "3.1.20230127121939"; format = "setuptools"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = pname; - rev = version; - sha256 = "sha256-7+1xOV5Lodqtku0wX1urAEHsCcYKM3Vcd5RDg4DdVow="; + rev = "refs/tags/${version}"; + hash = "sha256-pEow2vEpQ2+c3fXkB8q7R4pud1xLzE74+HEqcBzg0D8="; }; postPatch = '' substituteInPlace setup.py \ - --replace "ruamel.yaml >= 0.15, < 0.17.18" "ruamel.yaml" \ + --replace "ruamel.yaml >= 0.15, < 0.17.22" "ruamel.yaml" \ --replace "prov == 1.5.1" "prov" \ --replace "setup_requires=PYTEST_RUNNER," "" ''; @@ -32,6 +32,7 @@ python3.pkgs.buildPythonApplication rec { argcomplete bagit coloredlogs + cwl-utils mypy-extensions prov psutil @@ -44,10 +45,11 @@ python3.pkgs.buildPythonApplication rec { typing-extensions ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ mock nodejs pytest-mock + pytest-httpserver pytest-xdist pytestCheckHook ]; @@ -56,6 +58,7 @@ python3.pkgs.buildPythonApplication rec { "test_content_types" "test_env_filtering" "test_http_path_mapping" + "test_modification_date" ]; disabledTestPaths = [ @@ -70,6 +73,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Common Workflow Language reference implementation"; homepage = "https://www.commonwl.org"; + changelog = "https://github.com/common-workflow-language/cwltool/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index f25494706080..a4aa6457d608 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, boost, lua, zlib, bzip2 -, xylib, readline, gnuplot, swig3 }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, wxGTK32 +, boost +, lua +, zlib +, bzip2 +, xylib +, readline +, gnuplot +, swig3 +}: stdenv.mkDerivation rec { pname = "fityk"; @@ -13,8 +25,17 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ wxGTK30 boost lua zlib bzip2 xylib readline - gnuplot swig3 ]; + buildInputs = [ + wxGTK32 + boost + lua + zlib + bzip2 + xylib + readline + gnuplot + swig3 + ]; NIX_CFLAGS_COMPILE = [ "-std=c++11" diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/applications/science/misc/graphia/default.nix index ce712ef182b0..b06cfaae66b5 100644 --- a/pkgs/applications/science/misc/graphia/default.nix +++ b/pkgs/applications/science/misc/graphia/default.nix @@ -2,6 +2,7 @@ , lib , cmake , fetchFromGitHub +, fetchpatch , wrapQtAppsHook , qtbase , qtquickcontrols2 @@ -10,13 +11,13 @@ stdenv.mkDerivation rec { pname = "graphia"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "graphia-app"; repo = "graphia"; rev = version; - sha256 = "sha256-mqoK5y2h0JSiE9VtwawCgc1+qETzuefLVUpgFPcNFnk="; + sha256 = "sha256-9kohXLXF4F/qoHm8qmvPM1y9ak0Thb4xvgKJlVuOPTg="; }; patches = [ @@ -24,6 +25,12 @@ stdenv.mkDerivation rec { # https://github.com/pytorch/pytorch/issues/70297 # https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e ./breakpad-sigstksz.patch + + # FIXME: backport patch fixing build with Qt 5.15, remove for next release + (fetchpatch { + url = "https://github.com/graphia-app/graphia/commit/4b51bb8d465afa7ed0b2b30cb1c5e1c6af95976f.patch"; + hash = "sha256-GDJAFLxQlRWKvcOgqqPYV/aVTRM7+KDjW7Zp9l7SuyM="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index 6c55027d3c6f..e71c232be8f0 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -12,11 +12,24 @@ stdenv.mkDerivation { patches = [ ./ocaml-includes.patch ./ocaml-3.12.patch ]; - buildInputs = [ ocaml ncurses ]; + postPatch = '' + # Deprecated in ocaml 3.10 https://github.com/ocaml/ocaml/commit/f6190f3d0c49c5220d443ee8d03ca5072d68aa87 + # Deprecated in ocaml 3.08 https://github.com/ocaml/ocaml/commit/0c7aecb88dc696f66f49f3bed54a037361a26b8d + substituteInPlace fastdot_c.c --replace copy_double caml_copy_double --replace Bigarray_val Caml_ba_array_val --replace caml_bigarray caml_ba_array + # They were already deprecated in 3.12 https://v2.ocaml.org/releases/3.12/htmlman/libref/Array.html + substituteInPlace abffs.ml main.ml --replace create_matrix make_matrix + substituteInPlace intHashtbl.ml --replace Array.create Array.make + ''; + strictDeps = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ocaml ]; - makeFlags = [ "CAML_INCLUDES=${ocaml}/lib/ocaml/caml" ]; + buildInputs = [ ncurses ]; + + makeFlags = [ + "CAML_INCLUDES=${ocaml}/lib/ocaml/caml" + ("WITHBIGARRAY=" + lib.optionalString (lib.versionOlder ocaml.version "4.08.0") "bigarray.cma") + ]; # see https://bugzilla.redhat.com/show_bug.cgi?id=435559 dontStrip = true; @@ -42,6 +55,6 @@ stdenv.mkDerivation { license = "non-commercial"; maintainers = [ ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/misc/megam/ocaml-includes.patch b/pkgs/applications/science/misc/megam/ocaml-includes.patch index b3a56643448c..d4f38949b4d3 100644 --- a/pkgs/applications/science/misc/megam/ocaml-includes.patch +++ b/pkgs/applications/science/misc/megam/ocaml-includes.patch @@ -15,7 +15,7 @@ diff -ru megam_0.92/Makefile megam_0.92-b/Makefile #WITHCLIBS =-I /usr/lib/ocaml/3.09.2/caml -WITHCLIBS =-I /usr/lib/ocaml/caml -+WITHCLIBS =-I $(CAML_INCLUDES) ++WITHCLIBS =-I $(CAML_INCLUDES) -I +unix -I +str ################ End of user's variables ##################### diff --git a/pkgs/applications/science/misc/nextinspace/default.nix b/pkgs/applications/science/misc/nextinspace/default.nix index 8f168ab83839..78e21dcd8788 100644 --- a/pkgs/applications/science/misc/nextinspace/default.nix +++ b/pkgs/applications/science/misc/nextinspace/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { colorama ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-lazy-fixture pytestCheckHook requests-mock diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix index fdbc79aae599..cad21c2a6e44 100644 --- a/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix +++ b/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix @@ -13,7 +13,7 @@ let hashname = r: let - rpl = lib.replaceChars [ ":" "/" ] [ "_" "_" ]; + rpl = lib.replaceStrings [ ":" "/" ] [ "_" "_" ]; in (rpl r.url) + "-" + (rpl r.rev); diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index 81c377a91c78..9bd4cf12db03 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -1,25 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, cereal, openmp , libjpeg ? null , zlib ? null , libpng ? null , eigen ? null , libtiff ? null +, enableShared ? !stdenv.hostPlatform.isStatic , enableExamples ? false , enableDocs ? false }: stdenv.mkDerivation rec { - version = "2.0"; + version = "unstable-2022-12-30"; pname = "openmvg"; src = fetchFromGitHub { owner = "openmvg"; repo = "openmvg"; - rev = "v${version}"; - sha256 = "sha256-6F/xUgZpqY+v6CpwTBhIXI4JdT8HVB0P5JzOL66AVd8="; + rev = "e1bbfe801986cd7171f36443a1573b0f69f3702d"; + sha256 = "sha256-DngfmejNFw5pogTo7Ec5aUey2LUQIojvJybLmtCfvVY="; fetchSubmodules = true; }; - buildInputs = [ libjpeg zlib libpng eigen libtiff ]; + buildInputs = [ libjpeg zlib libpng eigen libtiff cereal openmp ]; nativeBuildInputs = [ cmake pkg-config ]; @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { "-DCMAKE_CXX_FLAGS=-std=c++11" "-DOpenMVG_BUILD_EXAMPLES=${if enableExamples then "ON" else "OFF"}" "-DOpenMVG_BUILD_DOC=${if enableDocs then "ON" else "OFF"}" - ]; + ] ++ lib.optional enableShared "-DOpenMVG_BUILD_SHARED=ON"; cmakeDir = "./src"; @@ -40,11 +41,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "all" ]; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = stdenv.isDarwin && stdenv.isx86_64; description = "A library for computer-vision scientists and targeted for the Multiple View Geometry community"; homepage = "https://openmvg.readthedocs.io/en/latest/"; license = lib.licenses.mpl20; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ mdaiter ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ mdaiter bouk ]; }; } diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix new file mode 100644 index 000000000000..fde756181cca --- /dev/null +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -0,0 +1,82 @@ +{ lib +, boost +, breakpad +, ceres-solver +, cgal +, cmake +, eigen +, fetchFromGitHub +, glfw +, gmp +, libjpeg +, libpng +, libtiff +, mpfr +, opencv +, openmp +, pkg-config +, stdenv +, vcg +, zstd +}: + +let + boostWithZstd = boost.overrideAttrs (old: { + buildInputs = old.buildInputs ++ [ zstd ]; + }); +in +stdenv.mkDerivation rec { + version = "2.1.0"; + pname = "openmvs"; + + src = fetchFromGitHub { + owner = "cdcseacave"; + repo = "openmvs"; + rev = "v${version}"; + sha256 = "sha256-eqNprBgR0hZnbLKLZLJqjemKxHhDtGblmaSxYlmegsc="; + fetchSubmodules = true; + }; + + # SSE is enabled by default + cmakeFlags = lib.optional (!stdenv.isx86_64) "-DOpenMVS_USE_SSE=OFF"; + + buildInputs = [ + boostWithZstd + breakpad + ceres-solver + cgal + eigen + glfw + gmp + libjpeg + libpng + libtiff + mpfr + opencv + openmp + vcg + ]; + + nativeBuildInputs = [ cmake pkg-config ]; + + postInstall = '' + mv $out/bin/OpenMVS/* $out/bin + rmdir $out/bin/OpenMVS + rm $out/bin/Tests + ''; + + doCheck = true; + checkPhase = '' + runHook preCheck + ctest + runHook postCheck + ''; + + meta = { + description = "Open Multi-View Stereo reconstruction library"; + homepage = "https://github.com/cdcseacave/openMVS"; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ bouk ]; + }; +} diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 14a7d33af786..ef7037eea3ad 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -5,7 +5,7 @@ , cmake , pcre , pkg-config -, python2 +, python3 , libX11 , libXpm , libXft @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ pcre python2 zlib libxml2 lz4 xz gsl xxHash libxcrypt ] + buildInputs = [ pcre python3 zlib libxml2 lz4 xz gsl xxHash libxcrypt ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; @@ -59,6 +59,11 @@ stdenv.mkDerivation rec { url = "https://github.com/root-project/root/commit/3c243b18768d3c3501faf3ca4e4acfc071021350.diff"; sha256 = "1hjmgnp4zx6im8ps78673x0rrhmfyy1nffhgxjlfl1r2z8cq210z"; }) + (fetchpatch { + name = "root5-python37-fix.patch"; + url = "https://github.com/root-project/root/commit/c75458024082de0cc35b45505c652b8460a9e71b.patch"; + sha256 = "sha256-A5zEjQE9OGPFp/L1HUs4NIdxQMRiwbwCRNWOLN2ENrM="; + }) ]; preConfigure = '' diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 30ff02c1f2ca..cfda819a42ca 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , callPackage -, fetchFromGitHub +, fetchurl , fetchpatch , makeWrapper , cmake @@ -48,6 +48,7 @@ , patchRcPathFish , patchRcPathPosix , tbb +, xrootd , Cocoa , CoreSymbolication , OpenGL @@ -70,20 +71,21 @@ in stdenv.mkDerivation rec { pname = "root"; - version = "6.26.08"; + version = "6.26.10"; passthru = { tests = import ./tests { inherit callPackage; }; }; - src = fetchFromGitHub { - owner = "root-project"; - repo = "root"; - rev = "v${builtins.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "sha256-cNd1GvEbO/a+WdDe8EHYGmdlw3TrOT2fWaSk+s7fw7U="; + src = fetchurl { + url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; + hash = "sha256-jla+w5cQQBeqVPnrVU3noaE0R0/gs7sPQ6cPxPq9Yl8="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; + propagatedBuildInputs = [ + nlohmann_json + ]; buildInputs = [ davix ftgl @@ -107,12 +109,12 @@ stdenv.mkDerivation rec { libjpeg libtiff libpng - nlohmann_json patchRcPathCsh patchRcPathFish patchRcPathPosix python.pkgs.numpy tbb + xrootd ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ] @@ -155,9 +157,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Drpath=ON" - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" "-Dbuiltin_llvm=OFF" "-Dbuiltin_nlohmannjson=OFF" "-Dbuiltin_openui5=OFF" @@ -172,6 +171,7 @@ stdenv.mkDerivation rec { "-Dfftw3=OFF" "-Dfitsio=OFF" "-Dfortran=OFF" + "-Dgnuinstall=ON" "-Dimt=ON" "-Dgfal=OFF" "-Dgviz=OFF" @@ -195,7 +195,7 @@ stdenv.mkDerivation rec { "-Dvdt=OFF" "-Dwebgui=OFF" "-Dxml=ON" - "-Dxrootd=OFF" + "-Dxrootd=ON" ] ++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include" ++ lib.optionals stdenv.isDarwin [ @@ -207,19 +207,26 @@ stdenv.mkDerivation rec { "-Druntime_cxxmodules=OFF" ]; + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + + # Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}. + # TODO: Remove the [DY]LDLIBRARY_PATH prefix for xrootd when #200830 get merged. postInstall = '' for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do wrapProgram "$out/bin/$prog" \ --set PYTHONPATH "$out/lib" \ - --set ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH "$out/lib" + --set ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH "$out/lib:${lib.makeLibraryPath [ xrootd ]}" done - # Make ldd and sed available to the ROOT executable - wrapProgram "$out/bin/root" --prefix PATH : "${lib.makeBinPath [ - gnused # sed - stdenv.cc # c++ ld etc. - stdenv.cc.libc # ldd - ]}" + # Make ldd and sed available to the ROOT executable by prefixing PATH. + wrapProgram "$out/bin/root" \ + --prefix PATH : "${lib.makeBinPath [ + gnused # sed + stdenv.cc # c++ ld etc. + stdenv.cc.libc # ldd + ]}" \ + --prefix ${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xrootd ]}" # Patch thisroot.{sh,csh,fish} @@ -262,9 +269,5 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.veprbl ]; license = licenses.lgpl21; - - # See https://github.com/NixOS/nixpkgs/pull/192581#issuecomment-1256860426 - # for some context on issues on aarch64. - broken = stdenv.isAarch64 && stdenv.isLinux; }; } diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix index 34ad91235e33..ca94be96d64e 100644 --- a/pkgs/applications/science/misc/sasview/default.nix +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { "\${qtWrapperArgs[@]}" ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook unittest-xml-reporting ]; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 956b98ffd5f1..f162e2329a74 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { datrie docutils filelock - GitPython + gitpython jinja2 jsonschema nbformat @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { # for the current basic test suite. Tibanna and Tes require extra # setup. - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pandas pytestCheckHook requests-mock diff --git a/pkgs/applications/science/misc/toil/default.nix b/pkgs/applications/science/misc/toil/default.nix index 43cb6bbbc7ee..7fc070f4f9f7 100644 --- a/pkgs/applications/science/misc/toil/default.nix +++ b/pkgs/applications/science/misc/toil/default.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ rsync ] ++ (with python3.pkgs; [ boto diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 576c5745b35c..5093a586a85a 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { reference or manual for details), but there are also quite a few features that make it stand out from the competition. - See: http://www.gromacs.org/About_Gromacs for details. + See: https://www.gromacs.org/About_Gromacs for details. ''; platforms = platforms.unix; maintainers = with maintainers; [ sheepforce markuskowa ]; diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index c377d961820e..51280840a781 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { for pack in ${lib.concatStringsSep " " packages}; do make "yes-$pack" SHELL=$SHELL; done ''; - # Must do manual build due to LAMMPS requiring a seperate build for + # Must do manual build due to LAMMPS requiring a separate build for # the libraries and executable. Also non-typical make script buildPhase = '' make mode=exe ${if withMPI then "mpi" else "serial"} SHELL=$SHELL LMP_INC="${lammps_includes}" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng diff --git a/pkgs/applications/science/molecular-dynamics/viennarna/default.nix b/pkgs/applications/science/molecular-dynamics/viennarna/default.nix index 1629a6bba268..3d20eeabe268 100644 --- a/pkgs/applications/science/molecular-dynamics/viennarna/default.nix +++ b/pkgs/applications/science/molecular-dynamics/viennarna/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "ViennaRNA"; - version = "2.4.18"; + version = "2.5.1"; src = fetchurl { - url = "https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_4_x/${pname}-${version}.tar.gz"; - sha256 = "17b0mcfkms0gn1a3faa4cakig65k9nk282x6mdh1mmjwbqzp5akw"; + url = "https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_5_x/${pname}-${version}.tar.gz"; + sha256 = "sha256-BUAEN88VWV4QsaJd9snEiFbzVhMPnR44D6iGa20n9Fc="; }; buildInputs = [ @@ -34,7 +34,5 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ prusnak ]; platforms = platforms.unix; - # Perl bindings fail on aarch64-darwin with "Undefined symbols for architecture arm64" - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix index 7c5794eb8e83..92f64fbfb916 100644 --- a/pkgs/applications/science/networking/sumo/default.nix +++ b/pkgs/applications/science/networking/sumo/default.nix @@ -1,7 +1,7 @@ { lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal, git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg, libpng, libtiff, libxcrypt, openscenegraph , proj, python3, - python37Packages, stdenv, swig, xercesc, xorg, zlib }: + python3Packages, stdenv, swig, xercesc, xorg, zlib }: stdenv.mkDerivation rec { pname = "sumo"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libxcrypt openscenegraph proj - python37Packages.setuptools + python3Packages.setuptools xercesc zlib python3 diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix index 81c1fdd6b054..74cc677963e3 100644 --- a/pkgs/applications/science/physics/crystfel/default.nix +++ b/pkgs/applications/science/physics/crystfel/default.nix @@ -54,7 +54,7 @@ let # We hard-code this by providing a little patch and then passing the absolute path to syminfo.lib as a # preprocessor flag. preBuild = '' - makeFlagsArray+=(CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"$out/share/syminfo.lib\"') + makeFlagsArray+=(CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"${placeholder "out"}/share/syminfo.lib\"') export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS"; ''; makeFlags = [ "CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"${placeholder "out"}/share/syminfo.lib\"" ]; diff --git a/pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch b/pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch index 9c5e1365492b..1806d9b2b9da 100644 --- a/pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch +++ b/pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch @@ -1,11 +1,12 @@ diff --git a/ccp4/csymlib.c b/ccp4/csymlib.c -index 76bc70b..7a0c5dc 100644 +index 76bc70b..3616121 100644 --- a/ccp4/csymlib.c +++ b/ccp4/csymlib.c -@@ -137,24 +137,7 @@ CCP4SPG *ccp4spg_load_spacegroup(const int numspg, const int ccp4numspg, +@@ -136,25 +136,7 @@ CCP4SPG *ccp4spg_load_spacegroup(const int numspg, const int ccp4numspg, + } } - /* Open the symop file: */ +- /* Open the symop file: */ - if (!(symopfile = getenv("SYMINFO"))) { - if (debug) - printf("Environment variable SYMINFO not set ... guessing location of symmetry file. \n"); @@ -28,3 +29,12 @@ index 76bc70b..7a0c5dc 100644 filein = fopen(symopfile,"r"); if (!filein) { +@@ -162,8 +144,6 @@ CCP4SPG *ccp4spg_load_spacegroup(const int numspg, const int ccp4numspg, + return NULL; + } + +- if (!(getenv("SYMINFO"))) free(symopfile); +- + parser = ccp4_parse_start(20); + if (parser == NULL) + ccp4_signal(CSYM_ERRNO(CSYMERR_ParserFail),"ccp4spg_load_spacegroup",NULL); diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index a203db1204cb..9221f4bcdbdd 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, vtkWithQt5}: +{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, vtk_8_withQt5}: stdenv.mkDerivation rec { pname = "elmerfem"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libGL libGLU opencascade - vtkWithQt5 + vtk_8_withQt5 ]; preConfigure = '' diff --git a/pkgs/applications/science/physics/nnpdf/default.nix b/pkgs/applications/science/physics/nnpdf/default.nix index f71216278297..c3ac1f6e0a8d 100644 --- a/pkgs/applications/science/physics/nnpdf/default.nix +++ b/pkgs/applications/science/physics/nnpdf/default.nix @@ -8,7 +8,7 @@ , gsl , lhapdf , libarchive -, libyamlcpp +, yaml-cpp , python3 , sqlite , swig @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { gsl lhapdf libarchive - libyamlcpp + yaml-cpp python3 python3.pkgs.numpy sqlite @@ -62,11 +62,12 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "An open-source machine learning framework for global analyses of parton distributions"; homepage = "https://docs.nnpdf.science/"; license = licenses.gpl3Only; maintainers = [ maintainers.veprbl ]; platforms = platforms.unix; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index 34e4d989e959..ec0620d3d8ed 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -44,5 +44,7 @@ stdenv.mkDerivation { homepage = "https://agile.hepforge.org/trac/wiki/Sacrifice"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ veprbl ]; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 29c72b7f11c0..c9911c5b9993 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sherpa"; - version = "2.2.12"; + version = "2.2.13"; src = fetchurl { url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; - sha256 = "sha256-UpRkd1yoKLncllEQUm80DedDtgA8Hm+Kvi/BRVCu0AE="; + sha256 = "sha256-FIozm2AmxaELIDiLBNx8RtUCy1fIjTGtnpFiAcKcZXE="; }; postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' @@ -34,5 +34,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/sherpa-team/sherpa"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 4e6f6626602f..31df19b539a3 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -13,7 +13,7 @@ , lhapdf , libtirpc , libyaml -, libyamlcpp +, yaml-cpp , pkg-config , qcdnum , root @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gfortran pkg-config ]; buildInputs = - [ apfel blas ceres-solver lhapdf lapack libyaml root qcdnum gsl libyamlcpp zlib ] + [ apfel blas ceres-solver lhapdf lapack libyaml root qcdnum gsl yaml-cpp zlib ] ++ lib.optionals ("5" == lib.versions.major root.version) [ apfelgrid applgrid ] ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ] ++ lib.optional (stdenv.hostPlatform.libc == "glibc") libtirpc diff --git a/pkgs/applications/science/physics/xnec2c/default.nix b/pkgs/applications/science/physics/xnec2c/default.nix new file mode 100644 index 000000000000..47fb7cf61df9 --- /dev/null +++ b/pkgs/applications/science/physics/xnec2c/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchurl +, autoreconfHook +, pkg-config +, which +, gtk3 +, blas +, lapack +}: + +assert (!blas.isILP64) && (!lapack.isILP64); + +stdenv.mkDerivation rec { + pname = "xnec2c"; + version = "4.4.12"; + + src = fetchurl { + url = "https://www.xnec2c.org/releases/${pname}-v${version}.tar.gz"; + hash = "sha256-6Yrx6LkJjfnMA/kJUDWLhGzGopZeecARSrcR++UScsU="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config which ]; + buildInputs = [ gtk3 blas lapack ]; + + meta = with lib; { + homepage = "https://www.xnec2c.org/"; + description = "Graphical antenna simulation"; + license = licenses.gpl3; + maintainers = with maintainers; [ mvs ]; + platforms = platforms.unix; + + # Darwin support likely to be fixed upstream in the next release + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 271274126b75..a76327b854b0 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { inherit pname; - version = "10.8.0"; + version = "10.9.0"; src = fetchurl { url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64-portable.zip"; - sha256 = "sha256-Xn0ga2Z1UKd++TriL47ulV6idVTNBR8uiSW7FnL7r1g="; + sha256 = "sha256-9FzMyBIR2u1zXHtTWJABM6RF1+OyjYdEPlRwtig9blI="; }; nativeBuildInputs = [ wrapGAppsHook unzip ]; diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 712374ef7520..c7a7315f70de 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.57"; + version = "1.8.59"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tsx3oVXPIa3OtbLWj3QWrW9leL9/jsdbbLG+Wd3nxn4="; + sha256 = "sha256-XY0d9q4nSuPflN4ZX+nT4RKFy6i4Cd2lNWvWaJQzWW8="; }; postPatch = '' diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/applications/search/grepm/default.nix index 7a3210459d1b..14ac6ed69ce8 100644 --- a/pkgs/applications/search/grepm/default.nix +++ b/pkgs/applications/search/grepm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Wrapper for grepmail utilizing mutt"; - homepage = "http://www.barsnick.net/sw/grepm.html"; + homepage = "https://www.barsnick.net/sw/grepm.html"; license = licenses.free; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 4117c8ac78a9..c037e41d74c6 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -35,16 +35,25 @@ mkDerivation rec { pname = "recoll"; - version = "1.32.7"; + version = "1.33.4"; src = fetchurl { url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-ygim9LsLUZv5FaBiqbeq3E80NHPMHweJVwggjWYzfbo="; + sha256 = "sha256-ffD49sGYWYEWAFPRtpyDU/CYFvkrEDL21Ddq3QsXCvc="; }; - configureFlags = [ "--enable-recollq" "--disable-webkit" "--without-systemd" ] - ++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ] - ++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); + configureFlags = [ + "--enable-recollq" + "--disable-webkit" + "--without-systemd" + ] ++ lib.optionals (!withGui) [ + "--disable-qtgui" + "--disable-x11mon" + ] ++ (if stdenv.isLinux then [ + "--with-inotify" + ] else [ + "--without-inotify" + ]); NIX_CFLAGS_COMPILE = [ "-DNIXPKGS" ]; @@ -54,13 +63,23 @@ mkDerivation rec { ]; nativeBuildInputs = [ - file pkg-config python3Packages.setuptools which + file + pkg-config + python3Packages.setuptools + which ]; buildInputs = [ - bison chmlib python3Packages.python xapian zlib - ] ++ lib.optional withGui qtbase - ++ lib.optional stdenv.isDarwin libiconv; + bison + chmlib + python3Packages.python + xapian + zlib + ] ++ lib.optional withGui [ + qtbase + ] ++ lib.optional stdenv.isDarwin [ + libiconv + ]; # the filters search through ${PATH} using a sh proc 'checkcmds' for the # filtering utils. Short circuit this by replacing the filtering command with @@ -108,7 +127,8 @@ mkDerivation rec { members, email attachments. ''; homepage = "https://www.lesbonscomptes.com/recoll/"; - license = licenses.gpl2; + changelog = "https://www.lesbonscomptes.com/recoll/pages/release-${version}.html"; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ jcumming ]; }; diff --git a/pkgs/applications/search/recoll/fix-datadir.patch b/pkgs/applications/search/recoll/fix-datadir.patch index 3b316f4d90c6..7d5471b636e8 100644 --- a/pkgs/applications/search/recoll/fix-datadir.patch +++ b/pkgs/applications/search/recoll/fix-datadir.patch @@ -1,13 +1,13 @@ diff --git a/utils/rclutil.cpp b/utils/rclutil.cpp -index 60ff5fb..4a59ccc 100644 +index 6bafc119..d997cd17 100644 --- a/utils/rclutil.cpp +++ b/utils/rclutil.cpp @@ -279,7 +279,7 @@ const string& path_pkgdatadir() "a subfolder of the installation directory. \n" "Please set the RECOLL_DATADIR environment variable to point to it\n" "(e.g. setx RECOLL_DATADIR \"C:/Program Files (X86)/Recoll/Share)\"\n"; --#elif defined(__APPLE__) && !defined(MACPORTS) && !defined(HOMEBREW) -+#elif defined(__APPLE__) && !defined(MACPORTS) && !defined(HOMEBREW) && !defined(NIXPKGS) - uint32_t size = 0; - _NSGetExecutablePath(nullptr, &size); - char *path= (char*)malloc(size+1); +-#elif defined(__APPLE__) && defined(RECOLL_AS_MAC_BUNDLE) ++#elif defined(__APPLE__) && defined(RECOLL_AS_MAC_BUNDLE) && defined(NIXPKGS) + // The package manager builds (Macports, Homebrew, Nixpkgs ...) all arrange to set a proper + // compiled value for RECOLL_DATADIR. We can't do this when building a native bundle with + // QCreator, in which case we use the executable location. diff --git a/pkgs/applications/system/asusctl/default.nix b/pkgs/applications/system/asusctl/default.nix new file mode 100644 index 000000000000..2e1e999e9937 --- /dev/null +++ b/pkgs/applications/system/asusctl/default.nix @@ -0,0 +1,89 @@ +{ lib +, rustPlatform +, fetchFromGitLab +, e2fsprogs +, systemd +, coreutils +, pkg-config +, cmake +, fontconfig +, gtk3 +, libappindicator +}: + +rustPlatform.buildRustPackage rec { + pname = "asusctl"; + version = "4.5.6"; + + src = fetchFromGitLab { + owner = "asus-linux"; + repo = "asusctl"; + rev = version; + hash = "sha256-9WEP+/BI5fh3IhVsLSPrnkiZ3DmXwTFaPXyzBNs7cNM="; + }; + + cargoSha256 = "sha256-iXMor2hI8Q/tpdSCaUjiEsvVfmWKXI6Az0J6aqMwE2E="; + + postPatch = '' + files=" + daemon/src/config.rs + daemon/src/ctrl_anime/config.rs + daemon-user/src/daemon.rs + daemon-user/src/ctrl_anime.rs + daemon-user/src/user_config.rs + rog-control-center/src/main.rs + " + for file in $files; do + substituteInPlace $file --replace /usr/share $out/share + done + + substituteInPlace daemon/src/ctrl_platform.rs --replace /usr/bin/chattr ${e2fsprogs}/bin/chattr + + substituteInPlace data/asusd.rules --replace systemctl ${systemd}/bin/systemctl + substituteInPlace data/asusd.service \ + --replace /usr/bin/asusd $out/bin/asusd \ + --replace /bin/sleep ${coreutils}/bin/sleep + substituteInPlace data/asusd-user.service \ + --replace /usr/bin/asusd-user $out/bin/asusd-user \ + --replace /usr/bin/sleep ${coreutils}/bin/sleep + ''; + + nativeBuildInputs = [ pkg-config cmake ]; + + buildInputs = [ systemd fontconfig gtk3 ]; + + # upstream has minimal tests, so don't rebuild twice + doCheck = false; + + postInstall = '' + install -Dm444 -t $out/share/dbus-1/system.d/ data/asusd.conf + install -Dm444 -t $out/share/rog-gui/layouts/ rog-aura/data/layouts/* + + install -Dm444 -t $out/share/applications/ rog-control-center/data/rog-control-center.desktop + install -Dm444 -t $out/share/icons/hicolor/512x512/apps/ rog-control-center/data/rog-control-center.png data/icons/asus_notif_* + install -Dm444 -t $out/share/icons/hicolor/scalable/status/ data/icons/scalable/* + + install -Dm444 -t $out/share/asusd/anime/asus/rog/ rog-anime/data/anime/asus/rog/Sunset.gif + install -Dm444 -t $out/share/asusd/anime/asus/gaming/ rog-anime/data/anime/asus/gaming/Controller.gif + install -Dm444 -t $out/share/asusd/anime/custom/ rog-anime/data/anime/custom/* + + install -Dm444 -t $out/share/asusd/data/ data/asusd-ledmodes.toml + + install -Dm444 data/asusd.rules $out/lib/udev/rules.d/99-asusd.rules + install -Dm444 -t $out/share/dbus-1/system.d/ data/asusd.conf + install -Dm444 -t $out/lib/systemd/system/ data/asusd.service + install -Dm444 -t $out/lib/systemd/user/ data/asusd-user.service + ''; + + postFixup = '' + patchelf --add-rpath "${libappindicator}/lib" "$out/bin/rog-control-center" + ''; + + meta = with lib; { + description = "A control daemon, CLI tools, and a collection of crates for interacting with ASUS ROG laptops"; + homepage = "https://gitlab.com/asus-linux/asusctl"; + license = licenses.mpl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ k900 aacebedo ]; + }; +} diff --git a/pkgs/applications/system/booster/default.nix b/pkgs/applications/system/booster/default.nix new file mode 100644 index 000000000000..dda41f24531b --- /dev/null +++ b/pkgs/applications/system/booster/default.nix @@ -0,0 +1,58 @@ +{ bash +, binutils +, buildGoModule +, fetchFromGitHub +, kbd +, lib +, libfido2 +, lvm2 +, lz4 +, makeWrapper +, mdadm +, unixtools +, xz +, zfs +}: + +buildGoModule rec { + pname = "booster"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "anatol"; + repo = pname; + rev = version; + hash = "sha256-kalVFVBb+ngoUpm+iiIHGS6vBVLEvTVyKuSMSMbp7Qc="; + }; + + vendorHash = "sha256-GD+nsT4/Y2mTF+ztOC3N560BY5+QSfsPrXZ+dJYtzAw="; + + postPatch = '' + substituteInPlace init/main.go --replace "/usr/bin/fsck" "${unixtools.fsck}/bin/fsck" + ''; + + # integration tests are run against the current kernel + doCheck = false; + + nativeBuildInputs = [ + kbd + lz4 + makeWrapper + xz + ]; + + postInstall = let + runtimeInputs = [ bash binutils kbd libfido2 lvm2 mdadm zfs ]; + in '' + wrapProgram $out/bin/generator --prefix PATH : ${lib.makeBinPath runtimeInputs} + wrapProgram $out/bin/init --prefix PATH : ${lib.makeBinPath runtimeInputs} + ''; + + meta = with lib; { + description = "Fast and secure initramfs generator "; + homepage = "https://github.com/anatol/booster"; + license = licenses.mit; + maintainers = with maintainers; [ urandom ]; + mainProgram = "init"; + }; +} diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index f4ec3126976e..cf9e8ec05fd4 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib -, defusedxml, future, packaging, psutil, setuptools +, defusedxml, future, ujson, packaging, psutil, setuptools # Optional dependencies: , bottle, pysnmp , hddtemp @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.3.0"; + version = "3.3.1"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "refs/tags/v${version}"; - sha256 = "sha256-4EZjr8oW5759U20YS6eWVZ0pelTCDj75FBc7IkAzd3M="; + sha256 = "sha256-93fghrNktcz+YyPkRl6ZiSZC+3a5TDql6eFZMy6veJc="; }; # On Darwin this package segfaults due to mismatch of pure and impure @@ -36,6 +36,7 @@ buildPythonApplication rec { bottle defusedxml future + ujson netifaces packaging psutil diff --git a/pkgs/applications/system/mgmt/default.nix b/pkgs/applications/system/mgmt/default.nix new file mode 100644 index 000000000000..0bc65dc95052 --- /dev/null +++ b/pkgs/applications/system/mgmt/default.nix @@ -0,0 +1,67 @@ +{ augeas +, buildGoModule +, fetchFromGitHub +, gotools +, lib +, libvirt +, libxml2 +, nex +, pkg-config +, ragel +}: +buildGoModule rec { + pname = "mgmt"; + version = "unstable-2022-10-24"; + + src = fetchFromGitHub { + owner = "purpleidea"; + repo = pname; + rev = "d8820fa1855668d9e0f7a7829d9dd0d122b2c5a9"; + hash = "sha256-jurZvEtiaTjWeDkmCJDIFlTzR5EVglfoDxkFgOilo8s="; + }; + + # patching must be done in prebuild, so it is shared with go-modules + # see https://github.com/NixOS/nixpkgs/issues/208036 + preBuild = '' + for file in `find -name Makefile -type f`; do + substituteInPlace $file --replace "/usr/bin/env " "" + done + + substituteInPlace lang/types/Makefile \ + --replace "unset GOCACHE && " "" + patchShebangs misc/header.sh + make lang funcgen + ''; + + buildInputs = [ + augeas + libvirt + libxml2 + ]; + + nativeBuildInputs = [ + gotools + nex + pkg-config + ragel + ]; + + + ldflags = [ + "-s" + "-w" + "-X main.program=${pname}" + "-X main.version=${version}" + ]; + + subPackages = [ "." ]; + + vendorHash = "sha256-Dtqy4TILN+7JXiHKHDdjzRTsT8jZYG5sPudxhd8znXY="; + + meta = with lib; { + description = "Next generation distributed, event-driven, parallel config management!"; + homepage = "https://mgmtconfig.com"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 84596f6d9382..f247b1292c4c 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -8,9 +8,11 @@ , pkg-config , pantheon , python3 +, curl , gettext , glib , gtk3 +, json-glib , libwnck , libgee , libgtop @@ -25,13 +27,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.14.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "sha256-dw1FR9nU8MY6LBL3sF942azeSgKmCntXCk4+nhMb4Wo="; + sha256 = "sha256-3Kgpb0gOVpsufevz4ZIsIngl/Djckft8nJW+wBgfp4A="; fetchSubmodules = true; }; @@ -46,8 +48,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + curl glib gtk3 + json-glib pantheon.granite pantheon.wingpanel libgee @@ -72,6 +76,11 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py + + # Alternatively, using pkg-config here should just work. + substituteInPlace meson.build --replace \ + "meson.get_compiler('c').find_library('libcurl', dirs: vapidir)" \ + "meson.get_compiler('c').find_library('libcurl', dirs: '${curl.out}/lib')" ''; passthru = { diff --git a/pkgs/applications/system/supergfxctl/default.nix b/pkgs/applications/system/supergfxctl/default.nix new file mode 100644 index 000000000000..f1a88e39e4e7 --- /dev/null +++ b/pkgs/applications/system/supergfxctl/default.nix @@ -0,0 +1,45 @@ +{ lib +, rustPlatform +, fetchFromGitLab +, pkg-config +, systemd +}: + +rustPlatform.buildRustPackage rec { + pname = "supergfxctl"; + version = "5.0.1"; + + src = fetchFromGitLab { + owner = "asus-linux"; + repo = "supergfxctl"; + rev = version; + hash = "sha256-4q+7F8s6y+oDkBUKIBBsXZ2EtADcChdnjmABjBUnH9k="; + }; + + cargoSha256 = "sha256-nfs9sUq9569qXsC7JYMzrRPdQQm/l4HZANlG7827K8o="; + + postPatch = '' + substituteInPlace data/supergfxd.service --replace /usr/bin/supergfxd $out/bin/supergfxd + substituteInPlace data/99-nvidia-ac.rules --replace /usr/bin/systemctl ${systemd}/bin/systemctl + ''; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ systemd ]; + + # upstream doesn't have tests, don't build twice just to find that out + doCheck = false; + + postInstall = '' + install -Dm444 -t $out/lib/udev/rules.d/ data/*.rules + install -Dm444 -t $out/share/dbus-1/system.d/ data/org.supergfxctl.Daemon.conf + install -Dm444 -t $out/lib/systemd/system/ data/supergfxd.service + ''; + + meta = with lib; { + description = "A GPU switching utility, mostly for ASUS laptops"; + homepage = "https://gitlab.com/asus-linux/supergfxctl"; + license = licenses.mpl20; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.k900 ]; + }; +} diff --git a/pkgs/applications/system/thumbdrives/default.nix b/pkgs/applications/system/thumbdrives/default.nix new file mode 100644 index 000000000000..d70ea9580629 --- /dev/null +++ b/pkgs/applications/system/thumbdrives/default.nix @@ -0,0 +1,62 @@ +{ lib +, python3 +, fetchFromSourcehut +, gtk3 +, libhandy_0 +, gobject-introspection +, meson +, pkg-config +, ninja +, gettext +, glib +, desktop-file-utils +, wrapGAppsHook +}: + +python3.pkgs.buildPythonApplication rec { + pname = "thumbdrives"; + version = "0.3.1"; + + format = "other"; + + src = fetchFromSourcehut { + owner = "~martijnbraam"; + repo = pname; + rev = version; + sha256 = "sha256-CPZKswbvsG61A6J512FOCKAntoJ0sUb2s+MKb0rO+Xw="; + }; + + postPatch = '' + patchShebangs build-aux/meson + ''; + + nativeBuildInputs = [ + meson + pkg-config + ninja + gettext + glib + gtk3 + desktop-file-utils + wrapGAppsHook + gobject-introspection + ]; + + buildInputs = [ + gtk3 + libhandy_0 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + pyxdg + ]; + + meta = with lib; { + description = "USB mass storage emulator for Linux handhelds"; + homepage = "https://sr.ht/~martijnbraam/thumbdrives/"; + license = licenses.mit; + maintainers = with maintainers; [ chuangzhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/system/zxfer/default.nix b/pkgs/applications/system/zxfer/default.nix new file mode 100644 index 000000000000..b62c1262430c --- /dev/null +++ b/pkgs/applications/system/zxfer/default.nix @@ -0,0 +1,86 @@ +{ lib +, bash +, fetchFromGitHub +, installShellFiles +, coreutils +, gawk +, gnugrep +, gnused +, openssh +, resholve +, rsync +, which +, zfs +}: + +resholve.mkDerivation rec { + pname = "zxfer"; + version = "1.1.7"; + + src = fetchFromGitHub { + owner = "allanjude"; + repo = pname; + rev = "v${version}"; + hash = "sha256-11SQJcD3GqPYBIgaycyKkc62/diVKPuuj2Or97j+NZY="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + # these may point to paths on remote systems, calculated at runtime, thus we cannot fix them + # we can only set their initial values, and let them remain dynamic + postPatch = '' + substituteInPlace zxfer \ + --replace 'LCAT=""' 'LCAT=${coreutils}/bin/cat' \ + --replace 'LZFS=$( which zfs )' 'LZFS=${zfs}/bin/zfs' + ''; + + installPhase = '' + runHook preInstall + + installManPage zxfer.1m zxfer.8 + install -Dm755 zxfer -t $out/bin/ + + runHook postInstall + ''; + + solutions.default = { + scripts = [ "bin/zxfer" ]; + interpreter = "${bash}/bin/sh"; + inputs = [ + coreutils + gawk + gnugrep + gnused + openssh + rsync + which + ]; + fake.external = [ + "kldload" # bsd builtin + "kldstat" # bsd builtin + "svcadm" # solaris builtin + ]; + keep = { + "$LCAT" = true; + "$LZFS" = true; + "$PROGRESS_DIALOG" = true; + "$RZFS" = true; + "$input_optionts" = true; + "$option_O" = true; + "$option_T" = true; + }; + fix = { + "$AWK" = [ "awk" ]; + "$RSYNC" = [ "rsync" ]; + }; + execer = [ "cannot:${rsync}/bin/rsync" ]; + }; + + meta = with lib; { + description = "A popular script for managing ZFS snapshot replication"; + homepage = "https://github.com/allanjude/zxfer"; + changelog = "https://github.com/allanjude/zxfer/releases/tag/v${version}"; + license = licenses.bsd2; + maintainers = with lib.maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 7c0bd8b6410a..272b875cd7a8 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -60,6 +60,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-t6ckX0PYI8UHfXhGRpcX8ly3DzE9A6i9P6f3Ny3DBzw="; + auditable = true; # TODO: remove when this is the default + nativeBuildInputs = [ cmake installShellFiles diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix index 9d2d1751ad79..72ecca4ea488 100644 --- a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -14,6 +14,7 @@ , pcre2 , libxml2 , librsvg +, libgee , callPackage , python3 , gtk3 @@ -26,14 +27,14 @@ let in stdenv.mkDerivation rec { pname = "blackbox"; - version = "0.12.1"; + version = "0.13.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "raggesilver"; repo = "blackbox"; rev = "v${version}"; - sha256 = "sha256-BJtRzjNmJzabI30mySTjWXfN81xj+AWpKhIberXf6Io="; + hash = "sha256-WeR7zdYdRWBR+kmxLjRFE6QII9RdBig7wrbVoCPA5go="; }; postPatch = '' @@ -60,6 +61,7 @@ stdenv.mkDerivation rec { pcre2 libxml2 librsvg + libgee ]; meta = with lib; { diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index a736e836cb62..0e74c2046c05 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -13,7 +13,7 @@ , fmt , microsoft_gsl , range-v3 -, libyamlcpp +, yaml-cpp , ncurses , file , darwin @@ -64,7 +64,7 @@ mkDerivation rec { fmt microsoft_gsl range-v3 - libyamlcpp + yaml-cpp ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.libs.utmp ]; preConfigure = '' diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix index 85ee654a989a..95c4f0f71541 100644 --- a/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -1,72 +1,50 @@ { lib , stdenv , fetchurl -, fetchpatch , gettext , gnome , libgtop -, gtk3 -, libhandy +, gtk4 +, libadwaita , pcre2 -, vte -, appstream-glib +, vte-gtk4 , desktop-file-utils -, git , meson , ninja , pkg-config -, python3 -, sassc -, wrapGAppsHook +, wrapGAppsHook4 , nixosTests }: stdenv.mkDerivation rec { pname = "gnome-console"; - # Do not upgrade until https://gitlab.gnome.org/GNOME/vte/-/issues/2584 is resolved! - version = "42.2"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "fSbmwYdExXWnhykyY/YM7/YwEHCY6eWKd2WwCsdDcEk="; + sha256 = "uWQkhaN6cOgswQVTsOJoF1a6Nh/15MvzGC8VAjH+qZ4="; }; - patches = [ - (fetchpatch { - name = "fix-clang-build-issues.patch"; - url = "https://gitlab.gnome.org/GNOME/console/-/commit/0e29a417d52e27da62f5cac461400be6a764dc65.patch"; - sha256 = "sha256-5ORNZOxjC5dMk9VKaBcJu5OV1SEZo9SNUbN4Ob5hVJs="; - }) - ]; - - buildInputs = [ - gettext - libgtop - gtk3 - libhandy - pcre2 - vte - ]; - nativeBuildInputs = [ - appstream-glib desktop-file-utils - git + gettext meson ninja pkg-config - python3 - sassc - wrapGAppsHook + wrapGAppsHook4 ]; - mesonFlags = [ - "-Dnautilus=disabled" + buildInputs = [ + libgtop + gtk4 + libadwaita + pcre2 + vte-gtk4 ]; passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gnome-console"; }; }; diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index 06c819d4bb1b..6873558830be 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "hyper"; - version = "3.3.0"; + version = "3.4.1"; src = fetchurl { url = "https://github.com/vercel/hyper/releases/download/v${version}/hyper_${version}_amd64.deb"; - sha256 = "sha256-VJAFa4I5nHuS/aXhiiXztUh2MjCq5zdwCtK0oSsOrGQ="; + sha256 = "sha256-jEzZ6MWFaNXBS8CAzfn/ufMPpWcua9HhBFzetWMlH1Y="; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix index bce0f731add5..c547e3d0d769 100644 --- a/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/pkgs/applications/terminal-emulators/iterm2/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation rec { pname = "iterm2"; - version = "3.4.17"; + version = "3.4.19"; src = fetchzip { url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip"; - sha256 = "sha256-t7DWK1KqHChKR+ru0wYvdDOuJDBQBaOgyol1lMjMeTU="; + hash = "sha256-UioKFhlwVdrkHtoS1ixXE2rykVO5aQeNQ8TnC5kNSUc="; }; dontFixup = true; diff --git a/pkgs/applications/terminal-emulators/iterm2/disable_updates.patch b/pkgs/applications/terminal-emulators/iterm2/disable_updates.patch deleted file mode 100644 index e717c58f30f1..000000000000 --- a/pkgs/applications/terminal-emulators/iterm2/disable_updates.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- iTerm2/sources/iTermPreferences.m 2016-06-23 16:55:28.000000000 +0200 -+++ iTerm2/sources/iTermPreferences.m 2016-06-23 16:55:42.000000000 +0200 -@@ -189,7 +189,7 @@ - kPreferenceKeyInstantReplayMemoryMegabytes: @4, - kPreferenceKeySavePasteAndCommandHistory: @NO, - kPreferenceKeyAddBonjourHostsToProfiles: @NO, -- kPreferenceKeyCheckForUpdatesAutomatically: @YES, -+ kPreferenceKeyCheckForUpdatesAutomatically: @NO, - kPreferenceKeyCheckForTestReleases: @NO, - kPreferenceKeyLoadPrefsFromCustomFolder: @NO, - kPreferenceKeyNeverRemindPrefsChangesLostForFileHaveSelection: @NO, diff --git a/pkgs/applications/terminal-emulators/kermit-terminal/default.nix b/pkgs/applications/terminal-emulators/kermit-terminal/default.nix index da5342aa683f..4bcd3191af7d 100644 --- a/pkgs/applications/terminal-emulators/kermit-terminal/default.nix +++ b/pkgs/applications/terminal-emulators/kermit-terminal/default.nix @@ -9,16 +9,15 @@ , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kermit"; - version = "3.7"; + version = "3.8"; src = fetchFromGitHub { - name = "${pname}-${version}-src"; owner = "orhun"; - repo = pname; - rev = version; - hash = "sha256-O5jpiQ+aaOTPst4/Z+H5e7ylA8CNBevqNoH50p4uEA4="; + repo = finalAttrs.pname; + rev = finalAttrs.version; + hash = "sha256-XPHF33Nu+H8OcQFwsuUOhDBDWKm8sh5B36sfROeSWPg="; }; nativeBuildInputs = [ @@ -37,8 +36,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/orhun/kermit"; description = "A VTE-based, simple and froggy terminal emulator"; + changelog = "https://github.com/orhun/kermit/releases/tag/${finalAttrs.version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; }; -} +}) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index b6a6ca7780fb..aad2c367b91f 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring +{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libunistring , harfbuzz, fontconfig, pkg-config, ncurses, imagemagick , libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor , libxkbcommon, libXi, libXext, wayland-protocols, wayland @@ -7,13 +7,11 @@ , openssl , installShellFiles , dbus -, darwin +, Libsystem , Cocoa -, CoreGraphics -, Foundation -, IOKit , Kernel -, OpenGL +, UniformTypeIdentifiers +, UserNotifications , libcanberra , libicns , libpng @@ -28,14 +26,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.26.2"; + version = "0.26.5"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; - rev = "v${version}"; - sha256 = "sha256-IqXRkKzOfqWolH/534nmM2R/69olhFOk6wbbF4ifRd0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-UloBlV26HnkvbzP/NynlPI77z09MBEVgtrg5SeTmwB4="; }; buildInputs = [ @@ -46,16 +44,14 @@ buildPythonApplication rec { openssl.dev ] ++ lib.optionals stdenv.isDarwin [ Cocoa - CoreGraphics - Foundation - IOKit Kernel - OpenGL + UniformTypeIdentifiers + UserNotifications libpng python3 zlib - ] ++ lib.optionals (stdenv.isDarwin && (builtins.hasAttr "UserNotifications" darwin.apple_sdk.frameworks)) [ - darwin.apple_sdk.frameworks.UserNotifications + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + Libsystem ] ++ lib.optionals stdenv.isLinux [ fontconfig libunistring libcanberra libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext @@ -79,6 +75,13 @@ buildPythonApplication rec { outputs = [ "out" "terminfo" "shell_integration" ]; patches = [ + # Fix clone-in-kitty not working on bash >= 5.2 + # TODO: Removed on kitty release > 0.26.5 + (fetchpatch { + url = "https://github.com/kovidgoyal/kitty/commit/51bba9110e9920afbefeb981e43d0c1728051b5e.patch"; + sha256 = "sha256-1aSU4aU6j1/om0LsceGfhH1Hdzp+pPaNeWAi7U6VcP4="; + }) + # Gets `test_ssh_env_vars` to pass when `bzip2` is in the output of `env`. ./fix-test_ssh_env_vars.patch @@ -109,6 +112,7 @@ buildPythonApplication rec { ''; in '' runHook preBuild + ${ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" } ${if stdenv.isDarwin then '' ${python.interpreter} setup.py build ${darwinOptions} make docs @@ -125,7 +129,7 @@ buildPythonApplication rec { runHook postBuild ''; - checkInputs = [ + nativeCheckInputs = [ pillow # Shells needed for shell integration tests @@ -218,6 +222,6 @@ buildPythonApplication rec { license = licenses.gpl3Only; changelog = "https://sw.kovidgoyal.net/kitty/changelog/"; platforms = platforms.darwin ++ platforms.linux; - maintainers = with maintainers; [ tex rvolosatovs Luflosi ]; + maintainers = with maintainers; [ tex rvolosatovs Luflosi adamcstephens ]; }; } diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 2783795f3e53..817042a7bcf0 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multi Lingual TERMinal emulator"; - homepage = "http://mlterm.sourceforge.net/"; + homepage = "https://mlterm.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ vrthra ramkromberg atemu ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix index 9fe78e30ae3d..639c7b5dda50 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix @@ -52,6 +52,8 @@ let --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" ''; + inherit (rxvt-unicode-unwrapped) meta; + passthru = { plugins = plugins; tests.test = nixosTests.terminal-emulators.urxvt; diff --git a/pkgs/applications/terminal-emulators/rxvt/default.nix b/pkgs/applications/terminal-emulators/rxvt/default.nix index a6f4ab1321c3..9894a8cdb05a 100644 --- a/pkgs/applications/terminal-emulators/rxvt/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://rxvt.sourceforge.net/"; + homepage = "https://rxvt.sourceforge.net/"; description = "Colour vt102 terminal emulator with less features and lower memory consumption"; longDescription = '' rxvt (acronym for our extended virtual terminal) is a terminal diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index 0f1dd5ddd064..7cc1b23a60ac 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -14,13 +14,13 @@ python3.pkgs.buildPythonApplication rec { pname = "terminator"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "gnome-terminator"; repo = "terminator"; rev = "v${version}"; - sha256 = "1pfrzna30xv9yri6dsny1j5k35417m4hsg97c455vssywyl9w4jr"; + hash = "sha256-dN9+6VGIdIyY52nm2BMONeb+WV7UGL68frjnHRxRzTU="; }; nativeBuildInputs = [ @@ -70,6 +70,7 @@ python3.pkgs.buildPythonApplication rec { quadkonsole, etc. in that the main focus is arranging terminals in grids (tabs is the most common default method, which Terminator also supports). ''; + changelog = "https://github.com/gnome-terminator/terminator/releases/tag/v${version}"; homepage = "https://github.com/gnome-terminator/terminator"; license = licenses.gpl2; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/applications/terminal-emulators/tym/default.nix b/pkgs/applications/terminal-emulators/tym/default.nix index b85133e7aecb..925de9382a65 100644 --- a/pkgs/applications/terminal-emulators/tym/default.nix +++ b/pkgs/applications/terminal-emulators/tym/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tym"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "endaaman"; repo = "${pname}"; rev = "${version}"; - sha256 = "sha256-ufIYJgbHmSJJbnx4hyDx0DmIjaGCxKXtiekcXcyka14="; + sha256 = "sha256-BYWfrvodmrOw2so64Y+bzTWwXosR1NjgrimULTuQu94="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index c63c3e6bf492..cece7cb8a01e 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -30,16 +30,24 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20220905-102802-7d4b8249"; + version = "20221119-145034-49b9839f"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-Xvi0bluLM4F3BFefIPhkhTF3dmRvP8u+qV70Rz4CGKI="; + sha256 = "sha256-1gnP2Dn4nkhxelUsXMay2VGvgvMjkdEKhFK5AAST++s="; }; + # Rust 1.65 does better at enum packing (according to + # 40e08fafe2f6e5b0c70d55996a0814d6813442ef), but Nixpkgs doesn't have 1.65 + # yet (still in staging), so skip these tests for now. + checkFlags = [ + "--skip=escape::action_size" + "--skip=surface::line::storage::test::memory_usage" + ]; + postPatch = '' echo ${version} > .tag @@ -47,7 +55,7 @@ rustPlatform.buildRustPackage rec { rm -r wezterm-ssh/tests ''; - cargoSha256 = "sha256-XJAeMDwtLtBzHMU/cb3lZgmcw5F3ifjKzKVmuP85/RY="; + cargoSha256 = "sha256-D6/biuLsXaCr0KSiopo9BuAVmniF8opAfDH71C3dtt0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index ff0856734628..a5c98cb7df81 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -1,17 +1,17 @@ { lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig -, pkg-config, makeWrapper, nixosTests, writeScript, common-updater-scripts, git +, pkg-config, makeWrapper, nixosTests, gitUpdater , nixfmt, nix, gnused, coreutils, enableDecLocator ? true }: stdenv.mkDerivation rec { pname = "xterm"; - version = "375"; + version = "378"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "sha256-MCxZor+B55xqcBUl13gWGiGNEjnyFWjYnivdMcAVIX8="; + hash = "sha256-ZJ37/V7dDtnkfPjk2VO0sNPDC8KAFm38T/0Ulz/sPpI="; }; strictDeps = true; @@ -81,37 +81,13 @@ stdenv.mkDerivation rec { standardTest = nixosTests.terminal-emulators.xterm; }; - updateScript = let + updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://github.com/ThomasDickey/xterm-snapshots.git"; + rev-prefix = "xterm-"; # Tags that end in letters are unstable - suffixes = lib.concatStringsSep " " - (map (c: "-c versionsort.suffix='${c}'") - (lib.stringToCharacters "abcdefghijklmnopqrstuvwxyz")); - in writeScript "update.sh" '' - #!${stdenv.shell} - set -o errexit - PATH=${ - lib.makeBinPath [ - common-updater-scripts - git - nixfmt - nix - coreutils - gnused - ] - } - - oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" - latestTag="$(git ${suffixes} ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:ThomasDickey/xterm-snapshots.git 'xterm-*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^xterm-||g')" - - if [ ! "$oldVersion" = "$latestTag" ]; then - update-source-version ${pname} "$latestTag" --version-key=version --print-changes - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix" - nixfmt "$default_nix" - else - echo "${pname} is already up-to-date" - fi - ''; + ignoredVersions = "[a-z]$"; + }; }; meta = { diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/bfg-repo-cleaner/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix rename to pkgs/applications/version-management/bfg-repo-cleaner/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/bit/default.nix b/pkgs/applications/version-management/bit/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/bit/default.nix rename to pkgs/applications/version-management/bit/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile b/pkgs/applications/version-management/bitbucket-server-cli/Gemfile similarity index 100% rename from pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile rename to pkgs/applications/version-management/bitbucket-server-cli/Gemfile diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock b/pkgs/applications/version-management/bitbucket-server-cli/Gemfile.lock similarity index 100% rename from pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock rename to pkgs/applications/version-management/bitbucket-server-cli/Gemfile.lock diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix b/pkgs/applications/version-management/bitbucket-server-cli/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix rename to pkgs/applications/version-management/bitbucket-server-cli/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix b/pkgs/applications/version-management/bitbucket-server-cli/gemset.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix rename to pkgs/applications/version-management/bitbucket-server-cli/gemset.nix diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix index 06a941de7b46..2b4b09fd2500 100644 --- a/pkgs/applications/version-management/blackbox/default.nix +++ b/pkgs/applications/version-management/blackbox/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/134445 doCheck = !stdenv.isDarwin && stdenv.isx86_64; - checkInputs = [ + nativeCheckInputs = [ expect which coreutils diff --git a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix b/pkgs/applications/version-management/bump2version/default.nix similarity index 97% rename from pkgs/applications/version-management/git-and-tools/bump2version/default.nix rename to pkgs/applications/version-management/bump2version/default.nix index ffb9455bd19f..86d1618cc48d 100644 --- a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix +++ b/pkgs/applications/version-management/bump2version/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { sha256 = "sha256-j6HKi3jTwSgGBrA8PCJJNg+yQqRMo1aqaLgPGf4KAKU="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook testfixtures ]; diff --git a/pkgs/applications/version-management/bumpver/default.nix b/pkgs/applications/version-management/bumpver/default.nix index 756a031ae1e7..d32e0154c8ae 100644 --- a/pkgs/applications/version-management/bumpver/default.nix +++ b/pkgs/applications/version-management/bumpver/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pathlib2 click toml lexid colorama setuptools ]; - checkInputs = [ python3.pkgs.pytestCheckHook git mercurial]; + nativeCheckInputs = [ python3.pkgs.pytestCheckHook git mercurial]; meta = with lib; { description = "Bump version numbers in project files"; diff --git a/pkgs/applications/version-management/git-and-tools/cgit/common.nix b/pkgs/applications/version-management/cgit/common.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/cgit/common.nix rename to pkgs/applications/version-management/cgit/common.nix diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/cgit/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/cgit/default.nix rename to pkgs/applications/version-management/cgit/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/cgit/pink.nix b/pkgs/applications/version-management/cgit/pink.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/cgit/pink.nix rename to pkgs/applications/version-management/cgit/pink.nix diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index 274eb3a0070f..f7ba075114b7 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -1,40 +1,49 @@ { buildPythonApplication , colorama +, commitizen , decli , fetchFromGitHub , git , jinja2 , lib , packaging -, poetry -, pytest-freezegun +, poetry-core +, py +, pytest-freezer , pytest-mock , pytest-regressions , pytestCheckHook , pyyaml , questionary , termcolor +, testers , tomlkit , typing-extensions , argcomplete , nix-update-script +, pre-commit }: buildPythonApplication rec { pname = "commitizen"; - version = "2.37.0"; + version = "2.39.1"; src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; rev = "v${version}"; - hash = "sha256-wo1I6QDWLxByHISmkPdass+BcKh0oxR5hD31UN/5+WQ="; + hash = "sha256-QQIYyg2zwV7cfFxGHVsLiTRBgTGs3O7OJcmURvfY3LQ="; deepClone = true; }; format = "pyproject"; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ poetry-core ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'charset-normalizer = "^2.1.0"' 'charset-normalizer = "*"' + ''; propagatedBuildInputs = [ termcolor @@ -51,9 +60,11 @@ buildPythonApplication rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ + pre-commit + py pytestCheckHook - pytest-freezegun + pytest-freezer pytest-mock pytest-regressions argcomplete @@ -79,10 +90,16 @@ buildPythonApplication rec { "test_bump_pre_commit_changelog" "test_bump_pre_commit_changelog_fails_always" "test_get_commits_with_signature" + # fatal: not a git repository (or any of the parent directories): .git + "test_commitizen_debug_excepthook" ]; - passthru.updateScript = nix-update-script { - attrPath = pname; + passthru = { + tests.version = testers.testVersion { + package = commitizen; + command = "cz version"; + }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/conform/default.nix b/pkgs/applications/version-management/conform/default.nix similarity index 95% rename from pkgs/applications/version-management/git-and-tools/conform/default.nix rename to pkgs/applications/version-management/conform/default.nix index 67741d55ceb2..5905b6e4d1ba 100644 --- a/pkgs/applications/version-management/git-and-tools/conform/default.nix +++ b/pkgs/applications/version-management/conform/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/siderolabs/conform/internal/version.Tag=v${version}" ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; meta = with lib; { description = "Policy enforcement for your pipelines"; diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index a5903b7266e4..fe429fdb7afc 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -15,7 +15,7 @@ pypy2Packages.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; - checkInputs = [ subversion git breezy ]; + nativeCheckInputs = [ subversion git breezy ]; checkPhase = "${pypy2Packages.python.interpreter} run-tests.py"; diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/darcs-to-git/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix rename to pkgs/applications/version-management/darcs-to-git/default.nix diff --git a/pkgs/applications/version-management/deepgit/default.nix b/pkgs/applications/version-management/deepgit/default.nix new file mode 100644 index 000000000000..312dc523710e --- /dev/null +++ b/pkgs/applications/version-management/deepgit/default.nix @@ -0,0 +1,86 @@ +{ copyDesktopItems +, fetchurl +, glib +, gnome +, gtk3 +, jre +, lib +, makeDesktopItem +, stdenv +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "deepgit"; + version = "4.3"; + + src = fetchurl { + url = "https://www.syntevo.com/downloads/deepgit/deepgit-linux-${lib.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; + hash = "sha256-bA/EySZjuSDYaZplwHcpeP1VakcnG5K1hYTk7cSVbz0="; + }; + + nativeBuildInputs = [ + copyDesktopItems + wrapGAppsHook + ]; + + buildInputs = [ + gnome.adwaita-icon-theme + gtk3 + jre + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk3 ]} + --set DEEPGIT_JAVA_HOME ${jre} + ) + patchShebangs bin/deepgit.sh + ''; + + desktopItems = [(makeDesktopItem rec { + name = pname; + desktopName = "DeepGit"; + keywords = [ "git" ]; + comment = "Git-Client"; + categories = [ + "Development" + "RevisionControl" + ]; + terminal = false; + startupNotify = true; + startupWMClass = desktopName; + exec = pname; + mimeTypes = [ + "x-scheme-handler/${pname}" + "x-scheme-handler/sourcetree" + ]; + icon = pname; + })]; + + installPhase = '' + runHook preInstall + + mkdir -pv $out/{bin,share/icons/hicolor/scalable/apps/} + cp -a lib license.html $out + mv bin/deepgit.sh $out/bin/deepgit + + for icon_size in 32 48 64 128 256; do + path=$icon_size'x'$icon_size + icon=bin/deepgit-$icon_size.png + mkdir -p $out/share/icons/hicolor/$path/apps + cp $icon $out/share/icons/hicolor/$path/apps/deepgit.png + done + + runHook postInstall + ''; + + meta = with lib; { + description = "A tool to investigate the history of source code"; + homepage = "https://www.syntevo.com/deepgit"; + changelog = "https://www.syntevo.com/deepgit/changelog.txt"; + license = licenses.unfree; + maintainers = with maintainers; [ urandom ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/delta/default.nix similarity index 77% rename from pkgs/applications/version-management/git-and-tools/delta/default.nix rename to pkgs/applications/version-management/delta/default.nix index 0bd1e2a51217..c02a9af2538e 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/delta/default.nix @@ -7,31 +7,38 @@ , Foundation , libiconv , Security +, git }: rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.14.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-hB8qpVXsAVJvtrdTnbPYcL9K4gL2nkZLo6vunjOP/7o="; + sha256 = "sha256-rPtLvO6raBY6BfrP0erBaXD86W1JL8g4XC4VbkR4Pww="; }; - cargoSha256 = "sha256-19ZGWM8vPbIEYaCxrAZ2HWgSqbeLu3hEb8eLL4a7fAI="; + cargoSha256 = "sha256-raT8a8K05ZpiGuZdM1hNikGxqY6w0g8G1DohfybXD9s="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation libiconv Security ]; + nativeCheckInputs = [ git ]; + postInstall = '' installShellCompletion --bash --name delta.bash etc/completion/completion.bash installShellCompletion --zsh --name _delta etc/completion/completion.zsh installShellCompletion --fish --name delta.fish etc/completion/completion.fish ''; + checkFlags = lib.optionals stdenv.isDarwin [ + "--skip=test_diff_same_non_empty_file" + ]; + meta = with lib; { homepage = "https://github.com/dandavison/delta"; description = "A syntax-highlighting pager for git"; diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/diff-so-fancy/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix rename to pkgs/applications/version-management/diff-so-fancy/default.nix diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index 40b550cb9e38..f76f413ea661 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -97,6 +97,6 @@ python3.pkgs.buildPythonApplication rec { description = "Version Control System for Machine Learning Projects"; homepage = "https://dvc.org"; license = licenses.asl20; - maintainers = with maintainers; [ cmcdragonkai fab anthonyroussel ]; + maintainers = with maintainers; [ cmcdragonkai fab ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/fast-export/default.nix similarity index 91% rename from pkgs/applications/version-management/git-and-tools/fast-export/default.nix rename to pkgs/applications/version-management/fast-export/default.nix index 29f52ce9fa4b..a4d9c030c9b4 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/fast-export/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fast-export"; - version = "220921"; + version = "221024"; src = fetchFromGitHub { owner = "frej"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8tAh17Cp1L0kyV5+HoFnh9mINCBNCNBv1gqsMd6U3FQ="; + sha256 = "sha256-re8iXM8s+TD35UGKalq2kVn8fx68fsnUC7Yo+/DQ9SM="; }; nativeBuildInputs = [ makeWrapper ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; doInstallCheck = true; - # deliberately not adding git or hg into installCheckInputs - package should + # deliberately not adding git or hg into nativeInstallCheckInputs - package should # be able to work without them in runtime env installCheckPhase = '' mkdir repo-hg diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index 564bcdc5897b..a60aa27a8439 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fnc"; - version = "0.12"; + version = "0.13"; src = fetchurl { url = "https://fnc.bsdbox.org/tarball/${version}/fnc-${version}.tar.gz"; - sha256 = "05cg8id4d1ia8y60y3x23167bl1rn2fdpkf1jfj3aklhlihvkbxd"; + sha256 = "126aklsjfqmrj0f9p1g6sdlqhwnbfhyn0lq2c9pidfnhppa7sz95"; }; buildInputs = [ libiconv ncurses zlib ]; diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix new file mode 100644 index 000000000000..91b3b0cd9cd1 --- /dev/null +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, buildGoModule +, fetchurl +, makeWrapper +, git +, bash +, openssh +, gzip +, pam +, pamSupport ? true +, sqliteSupport ? true +}: + +buildGoModule rec { + pname = "forgejo"; + version = "1.18.2-1"; + + src = fetchurl { + name = "${pname}-src-${version}.tar.gz"; + # see https://codeberg.org/forgejo/forgejo/releases + url = "https://codeberg.org/attachments/44ff6fcb-1515-4bba-85bf-3d3795ced2f7"; + hash = "sha256-XSh17AwPtC+Y24lgjjXJzT/uBHg+0hWZ2RZ/eNF4mCY="; + }; + + vendorHash = null; + + subPackages = [ "." ]; + + outputs = [ "out" "data" ]; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = lib.optional pamSupport pam; + + patches = [ + ./../gitea/static-root-path.patch + ]; + + postPatch = '' + substituteInPlace modules/setting/setting.go --subst-var data + ''; + + tags = lib.optional pamSupport "pam" + ++ lib.optionals sqliteSupport [ "sqlite" "sqlite_unlock_notify" ]; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + "-X 'main.Tags=${lib.concatStringsSep " " tags}'" + ]; + + postInstall = '' + mkdir $data + cp -R ./{public,templates,options} $data + mkdir -p $out + cp -R ./options/locale $out/locale + wrapProgram $out/bin/gitea \ + --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} + ''; + + meta = with lib; { + description = "A self-hosted lightweight software forge"; + homepage = "https://forgejo.org"; + changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ urandom ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/version-management/fornalder/Cargo.lock b/pkgs/applications/version-management/fornalder/Cargo.lock deleted file mode 100644 index 5f1cafc9096a..000000000000 --- a/pkgs/applications/version-management/fornalder/Cargo.lock +++ /dev/null @@ -1,597 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" - -[[package]] -name = "aho-corasick" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -dependencies = [ - "memchr", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[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 = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" -dependencies = [ - "libc", - "num-integer", - "num-traits", - "time", - "winapi", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "either" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" - -[[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "backtrace", - "version_check", -] - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "fastrand" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] - -[[package]] -name = "fornalder" -version = "0.1.0" -dependencies = [ - "chrono", - "error-chain", - "io", - "itertools", - "regex", - "rusqlite", - "serde", - "serde_json", - "structopt", - "tempfile", -] - -[[package]] -name = "gimli" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" - -[[package]] -name = "hashbrown" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashlink" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d99cf782f0dc4372d26846bec3de7804ceb5df083c2d4462c0b8d2330e894fa8" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c839d30624bc6b3dced6a4652823d1967fb7939d4848ad002d509b1fc916b2" - -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" - -[[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.126" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" - -[[package]] -name = "libsqlite3-sys" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d31059f22935e6c31830db5249ba2b7ecd54fd73a9909286f0a67aa55c2fbd" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "miniz_oxide" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" -dependencies = [ - "adler", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "object" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" -dependencies = [ - "memchr", -] - -[[package]] -name = "pkg-config" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534cfe58d6a18cc17120fbf4635d53d14691c1fe4d951064df9bd326178d7d5a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" - -[[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 = "rusqlite" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38ee71cbab2c827ec0ac24e76f82eca723cee92c509a65f67dee393c25112" -dependencies = [ - "bitflags", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "memchr", - "smallvec", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - -[[package]] -name = "ryu" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" - -[[package]] -name = "serde" -version = "1.0.140" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.140" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "smallvec" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "structopt" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -dependencies = [ - "clap", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "syn" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi", - "winapi", -] - -[[package]] -name = "unicode-ident" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" - -[[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 = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/applications/version-management/fornalder/default.nix b/pkgs/applications/version-management/fornalder/default.nix index 9dd25cf12e3c..85f1ad6e6ba2 100644 --- a/pkgs/applications/version-management/fornalder/default.nix +++ b/pkgs/applications/version-management/fornalder/default.nix @@ -1,29 +1,29 @@ -{ fetchFromGitHub, rustPlatform, lib }: +{ lib, rustPlatform, fetchFromGitHub, makeWrapper, gnuplot }: rustPlatform.buildRustPackage rec { pname = "fornalder"; - version = "unstable-2022-07-23"; + version = "unstable-2022-12-25"; src = fetchFromGitHub { owner = "hpjansson"; repo = pname; - rev = "44129f01910a9f16d97d0a3d8b1b376bf3338ea6"; - sha256 = "sha256-YODgR98SnpL6SM2nKrnzhpsEzYQFqduqigua/SXhazk="; + rev = "3248128fe320d88183d17a65e936092e07d6529b"; + sha256 = "sha256-IPSxVWJs4EhyBdA1NXpD8v3fusewt1ELpn/kbZt7c5Q="; }; - cargoLock.lockFile = ./Cargo.lock; + cargoSha256 = "sha256-eK+oQbOQj8pKiOTXzIgRjzVB7Js8MMa9V6cF9D98Ftc="; - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/fornalder \ + --suffix PATH : ${lib.makeBinPath [ gnuplot ]} ''; - # tests don't typecheck - doCheck = false; - meta = with lib; { description = "Visualize long-term trends in collections of Git repositories"; homepage = "https://github.com/hpjansson/fornalder"; license = licenses.gpl3Only; - maintainers = with maintainers; [ astro ]; + maintainers = with maintainers; [ astro figsoda ]; }; } diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index ea06107ed7ca..174094dedea4 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -3,6 +3,7 @@ , tcl , libiconv , fetchurl +, buildPackages , zlib , openssl , readline @@ -23,6 +24,9 @@ stdenv.mkDerivation rec { sha256 = "1knff50rr8f39myxj50fprb9ya87cslmwz7zzfya56l33r7i7jh3"; }; + # required for build time tool `./tools/translate.c` + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ installShellFiles tcl tcllib ]; buildInputs = [ zlib openssl readline which ed ] diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 335a899b4da1..f505ebdfeb86 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.6.2"; + version = "3.7.0"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "sha256-/OckQD6r9WSMx9Vt44eFpzsacH6VMa6NJX6sj2HBQSs="; + sha256 = "sha256-pbOe7ZN0IM4PTdRywGCyGJ7GIyPudbVJ3QokVP1bazo="; }; buildCommand = '' diff --git a/pkgs/applications/version-management/git-and-tools/gex/default.nix b/pkgs/applications/version-management/gex/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gex/default.nix rename to pkgs/applications/version-management/gex/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix similarity index 83% rename from pkgs/applications/version-management/git-and-tools/gfold/default.nix rename to pkgs/applications/version-management/gfold/default.nix index 88fa12ae12ad..dcce6f7f3c00 100644 --- a/pkgs/applications/version-management/git-and-tools/gfold/default.nix +++ b/pkgs/applications/version-management/gfold/default.nix @@ -12,7 +12,7 @@ let pname = "gfold"; - version = "4.0.1"; + version = "4.2.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage { owner = "nickgerace"; repo = pname; rev = version; - sha256 = "sha256-XOUXDuKLr8tESG2GJMl1kYsk2JRtQXzQyaO7d44Ajt8="; + sha256 = "sha256-cH4FhXrdT0ejpyt8G2rSGw9WE9sfOXRkSA9+FVwRmtQ="; }; - cargoSha256 = "sha256-jkktXVgHtqQeMU+rPiT4fz0kTIHW07RukxCnFABlzgw="; + cargoSha256 = "sha256-NmVmqBzRUdumWQ9MzolZTo0VQW9JTjIyYRwUTzGiQZ4="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/applications/version-management/git-and-tools/gg/default.nix b/pkgs/applications/version-management/gg/default.nix similarity index 97% rename from pkgs/applications/version-management/git-and-tools/gg/default.nix rename to pkgs/applications/version-management/gg/default.nix index 032c461a74ce..b94fea8da858 100644 --- a/pkgs/applications/version-management/git-and-tools/gg/default.nix +++ b/pkgs/applications/version-management/gg/default.nix @@ -36,7 +36,7 @@ in buildGoModule { vendorSha256 = "214dc073dad7b323ea449acf24c5b578d573432eeaa1506cf5761a2d7f5ce405"; nativeBuildInputs = [ pandoc installShellFiles makeWrapper ]; - checkInputs = [ bash coreutils git ]; + nativeCheckInputs = [ bash coreutils git ]; buildInputs = [ bash git ]; postInstall = '' diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/gh/default.nix similarity index 79% rename from pkgs/applications/version-management/git-and-tools/gh/default.nix rename to pkgs/applications/version-management/gh/default.nix index 7d5a9cc6d608..9018635ad9b8 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -1,17 +1,17 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles, testers, gh }: buildGoModule rec { pname = "gh"; - version = "2.20.2"; + version = "2.22.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-atUC6vb/tOO2GapMjTqFi4qjDAdSf2F8v3gZuzyt+9Q="; + hash = "sha256-TREy2pzVAHClwbryfEgX2WqtQ8+RmJtCNrESeaHDHMs="; }; - vendorSha256 = "sha256-FSniCYr3emV9W/BuEkWe0a4aZ5RCoZJc7+K+f2q49ys="; + vendorHash = "sha256-OjTl43UQGGHqCrw0kMBShuS8aonjWczfzQGmGJLhdrU="; nativeBuildInputs = [ installShellFiles ]; @@ -42,6 +42,10 @@ buildGoModule rec { # most tests require network access doCheck = false; + passthru.tests.version = testers.testVersion { + package = gh; + }; + meta = with lib; { description = "GitHub CLI tool"; homepage = "https://cli.github.com/"; diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/ghorg/default.nix similarity index 91% rename from pkgs/applications/version-management/git-and-tools/ghorg/default.nix rename to pkgs/applications/version-management/ghorg/default.nix index 2c8d36a4df6b..22d9ada544c8 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-P9LwgEUz8QgUVQYISIx3Sa8ibFxNTGNNO5Vn014UB88="; + sha256 = "sha256-1wtpbwTO8MdEvcdo5ImNuiNOtyPfaKFpr2Rezac4ofU="; }; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/ghq/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/ghq/default.nix rename to pkgs/applications/version-management/ghq/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/ghr/default.nix b/pkgs/applications/version-management/ghr/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/ghr/default.nix rename to pkgs/applications/version-management/ghr/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-absorb/default.nix rename to pkgs/applications/version-management/git-absorb/default.nix diff --git a/pkgs/development/tools/git-aggregator/default.nix b/pkgs/applications/version-management/git-aggregator/default.nix similarity index 97% rename from pkgs/development/tools/git-aggregator/default.nix rename to pkgs/applications/version-management/git-aggregator/default.nix index 9b2465366f67..3009edcb90a3 100644 --- a/pkgs/development/tools/git-aggregator/default.nix +++ b/pkgs/applications/version-management/git-aggregator/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix deleted file mode 100644 index c08e68cc28a1..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "git-bug"; - version = "0.7.2"; # the `rev` below pins the version of the source to get - rev = "cc4a93c8ce931b1390c61035b888ad17110b7bd6"; - - src = fetchFromGitHub { - inherit rev; - owner = "MichaelMure"; - repo = "git-bug"; - sha256 = "0r6wh0y1fj3d3fbbrzq5n9k6z94xvwqww3xfbslkgyrin5bmziiq"; - }; - - vendorSha256 = "15hhsrwwjc4krfc2d0r15lys3vr9rb9xk62pan4jr9ycbv0dny90"; - - doCheck = false; - - ldflags = [ - "-X github.com/MichaelMure/git-bug/commands.GitCommit=${rev}" - "-X github.com/MichaelMure/git-bug/commands.GitLastTag=${version}" - "-X github.com/MichaelMure/git-bug/commands.GitExactTag=${version}" - ]; - - postInstall = '' - install -D -m 0644 misc/bash_completion/git-bug "$out/share/bash-completion/completions/git-bug" - install -D -m 0644 misc/zsh_completion/git-bug "$out/share/zsh/site-functions/git-bug" - install -D -m 0644 -t "$out/share/man/man1" doc/man/* - ''; - - meta = with lib; { - description = "Distributed bug tracker embedded in Git"; - homepage = "https://github.com/MichaelMure/git-bug"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ royneary ]; - }; -} diff --git a/pkgs/applications/version-management/git-and-tools/git-subset/default.nix b/pkgs/applications/version-management/git-and-tools/git-subset/default.nix deleted file mode 100644 index 53db1c01eefb..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git-subset/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, curl, libiconv, Security }: - -rustPlatform.buildRustPackage rec { - pname = "git-subset"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "jasonwhite"; - repo = pname; - rev = "v${version}"; - sha256 = "02z2r0kcd0nnn1zjslp6xxam5ddbhrmzn67qzxhlamsw0p9vvkbb"; - }; - - cargoSha256 = "0lc9m9prmhr4ipjh95cfczvlmpp9scryksvqd49h4acyr904n7ry"; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl libiconv Security ]; - - meta = with lib; { - description = "Super fast Git tree filtering"; - homepage = "https://github.com/jasonwhite/git-subset"; - license = licenses.mit; - maintainers = [ maintainers.marsam ]; - }; -} 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 deleted file mode 100644 index 6ec4589f570e..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git-team/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, fetchpatch -, installShellFiles -}: - -buildGoModule rec { - pname = "git-team"; - version = "1.7.0"; - - src = fetchFromGitHub { - owner = "hekmekk"; - repo = "git-team"; - rev = "v${version}"; - hash = "sha256-pHKfehPyy01uVN6kjjPGtdkltw7FJ+HmIlwGs4iRhVo="; - }; - - patches = [ - (fetchpatch { - name = "1-update-dependencies-for-go-1.18.patch"; - url = "https://github.com/hekmekk/git-team/commit/d8632d9938379293521f9b3f2a93df680dd13a31.patch"; - hash = "sha256-hlmjPf3qp8WPNSH+GgkqATDiKIRzo+t81Npkptw8vgI="; - }) - (fetchpatch { - name = "2-update-dependencies-for-go-1.18.patch"; - url = "https://github.com/hekmekk/git-team/commit/f6acc96c2ffe76c527f2f2897b368cbb631d738c.patch"; - hash = "sha256-Pe+UAK9N1NpXhFGYv9l1iZ1/fCCqnT8OSgKdt/vUqO4="; - }) - (fetchpatch { - name = "3-update-dependencies-for-go-1.18.patch"; - url = "https://github.com/hekmekk/git-team/commit/2f38137298e4749a8dfe37e085015360949e73ad.patch"; - hash = "sha256-+6C8jp/qwYVmbL+SpV9FJIVyBRvX4tXBcoHMB//nNTk="; - }) - ]; - - vendorSha256 = "sha256-GdwksPmYEGTq/FkG/rvn3o0zMKU1cSkpgZ+GrfVgLWM="; - - 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-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-annex-metadata-gui/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix rename to pkgs/applications/version-management/git-annex-metadata-gui/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix b/pkgs/applications/version-management/git-annex-remote-dbx/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix rename to pkgs/applications/version-management/git-annex-remote-dbx/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix b/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix similarity index 78% rename from pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix rename to pkgs/applications/version-management/git-annex-remote-googledrive/default.nix index 66dc5ece90a8..16c5b49406f6 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix +++ b/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix @@ -1,29 +1,38 @@ { lib -, buildPythonApplication -, fetchPypi , annexremote +, buildPythonApplication , drivelib -, GitPython -, tenacity +, fetchPypi +, gitpython , humanfriendly +, tenacity }: buildPythonApplication rec { pname = "git-annex-remote-googledrive"; version = "1.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "0rwjcdvfgzdlfgrn1rrqwwwiqqzyh114qddrbfwd46ld5spry6r1"; }; - propagatedBuildInputs = [ annexremote drivelib GitPython tenacity humanfriendly ]; + propagatedBuildInputs = [ + annexremote + drivelib + gitpython + tenacity + humanfriendly + ]; # while git-annex does come with a testremote command that *could* be used, # testing this special remote obviously depends on authenticating with google doCheck = false; - pythonImportsCheck = [ "git_annex_remote_googledrive" ]; + pythonImportsCheck = [ + "git_annex_remote_googledrive" + ]; meta = with lib; { description = "A git-annex special remote for Google Drive"; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-annex-remote-rclone/default.nix similarity index 62% rename from pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix rename to pkgs/applications/version-management/git-annex-remote-rclone/default.nix index cc916baec94d..e05bed928889 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix +++ b/pkgs/applications/version-management/git-annex-remote-rclone/default.nix @@ -1,22 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, rclone, makeWrapper }: +{ lib, stdenvNoCC, fetchFromGitHub, rclone, makeWrapper }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "git-annex-remote-rclone"; - version = "0.6"; - rev = "v${version}"; + version = "0.7"; src = fetchFromGitHub { - inherit rev; owner = "DanielDent"; repo = "git-annex-remote-rclone"; - sha256 = "0j0hlxji8d974fq7zd4xc02n0jpi31ylhxc7z4zp8iiwad5mkpxp"; + rev = "v${version}"; + sha256 = "sha256-H2C4zjM+kbC9qPl1F+bSnepuqANjZd1sz6XxOTkVVkU="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/bin - cp git-annex-remote-rclone $out/bin + install -Dm755 -t $out/bin git-annex-remote-rclone wrapProgram "$out/bin/git-annex-remote-rclone" \ --prefix PATH ":" "${lib.makeBinPath [ rclone ]}" ''; @@ -24,7 +22,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/DanielDent/git-annex-remote-rclone"; description = "Use rclone supported cloud storage providers with git-annex"; - license = licenses.gpl3; + license = licenses.gpl3Only; + platforms = platforms.all; maintainers = [ maintainers.montag451 ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix b/pkgs/applications/version-management/git-annex-utils/default.nix similarity index 92% rename from pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix rename to pkgs/applications/version-management/git-annex-utils/default.nix index 07af33951dfb..2b63192ea3b0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix +++ b/pkgs/applications/version-management/git-annex-utils/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { This is a set of utilities that are handy to use with git-annex repositories. Currently there is only one utility gadu, a du like utility for annexed files. ''; - homepage = "http://git-annex.mysteryvortex.com/git-annex-utils.html"; + homepage = "https://git-annex.mysteryvortex.com/git-annex-utils.html"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ woffs ]; mainProgram = "gadu"; diff --git a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/pkgs/applications/version-management/git-appraise/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-appraise/default.nix rename to pkgs/applications/version-management/git-appraise/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-big-picture/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix rename to pkgs/applications/version-management/git-big-picture/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/pkgs/applications/version-management/git-branchless/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-branchless/default.nix rename to pkgs/applications/version-management/git-branchless/default.nix diff --git a/pkgs/applications/version-management/git-branchstack/default.nix b/pkgs/applications/version-management/git-branchstack/default.nix new file mode 100644 index 000000000000..b536642cbf55 --- /dev/null +++ b/pkgs/applications/version-management/git-branchstack/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchPypi +, buildPythonApplication +, git-revise +}: + +buildPythonApplication rec { + pname = "git-branchstack"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gja93LOcVCQ6l+Cygvsm+3uomvxtvUl6t23GIb/tKyQ="; + }; + + buildInputs = [ + git-revise + ]; + + meta = with lib; { + homepage = "https://github.com/krobelus/git-branchstack"; + description = "Efficiently manage Git branches without leaving your local branch"; + license = licenses.mit; + maintainers = [ maintainers.AndersonTorres ]; + }; +} diff --git a/pkgs/applications/version-management/git-bug-migration/default.nix b/pkgs/applications/version-management/git-bug-migration/default.nix new file mode 100644 index 000000000000..36ddc93d839c --- /dev/null +++ b/pkgs/applications/version-management/git-bug-migration/default.nix @@ -0,0 +1,34 @@ +{ lib, buildGoModule, fetchFromGitHub, git }: +buildGoModule rec { + pname = "git-bug-migration"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "MichaelMure"; + repo = "git-bug-migration"; + rev = "v${version}"; + hash = "sha256-IOBgrU3C0ZHD2wx9LRVgKEJzDlUj6z2UXlHGU3tdTdQ="; + }; + + vendorSha256 = "sha256-Hid9OK91LNjLmDHam0ZlrVQopVOsqbZ+BH2rfQi5lS0="; + + nativeCheckInputs = [ git ]; + + ldflags = [ + "-X main.GitExactTag=${version}" + "-X main.GitLastTag=${version}" + ]; + + preCheck = '' + export HOME=$(mktemp -d) + git config --global user.name 'Nixpkgs Test User' + git config --global user.email 'nobody@localhost' + ''; + + meta = with lib; { + description = "Tool for upgrading repositories using git-bug to new versions"; + homepage = "https://github.com/MichaelMure/git-bug-migration"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ DeeUnderscore ]; + }; +} diff --git a/pkgs/applications/version-management/git-bug/default.nix b/pkgs/applications/version-management/git-bug/default.nix new file mode 100644 index 000000000000..45c0557c30ad --- /dev/null +++ b/pkgs/applications/version-management/git-bug/default.nix @@ -0,0 +1,43 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "git-bug"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "MichaelMure"; + repo = "git-bug"; + rev = "v${version}"; + sha256 = "12byf6nsamwz0ssigan1z299s01cyh8bhgj86bibl90agd4zs9n8"; + }; + + vendorSha256 = "sha256-32kNDoBE50Jx1Ef9YwhDk7nd3CaTSnHPlu7PgWPUGfE="; + + nativeBuildInputs = [ installShellFiles ]; + + doCheck = false; + + excludedPackages = [ "doc" "misc" ]; + + ldflags = [ + "-X github.com/MichaelMure/git-bug/commands.GitCommit=v${version}" + "-X github.com/MichaelMure/git-bug/commands.GitLastTag=${version}" + "-X github.com/MichaelMure/git-bug/commands.GitExactTag=${version}" + ]; + + postInstall = '' + installShellCompletion \ + --bash misc/completion/bash/git-bug \ + --zsh misc/completion/zsh/git-bug \ + --fish misc/completion/fish/git-bug + + installManPage doc/man/* + ''; + + meta = with lib; { + description = "Distributed bug tracker embedded in Git"; + homepage = "https://github.com/MichaelMure/git-bug"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ royneary DeeUnderscore ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix b/pkgs/applications/version-management/git-chglog/default.nix similarity index 77% rename from pkgs/applications/version-management/git-and-tools/git-chglog/default.nix rename to pkgs/applications/version-management/git-chglog/default.nix index b427acf960ec..6259bad88063 100644 --- a/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix +++ b/pkgs/applications/version-management/git-chglog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "git-chglog"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "git-chglog"; repo = "git-chglog"; rev = "v${version}"; - sha256 = "sha256-UlhJ004ceXpdB/9296cL2sbBYsjV8D+3YS1vmFgnko8="; + sha256 = "sha256-VB3JYXz50B/SkA/q1iET7p5uhArrF8JyhAWhcxLVsg8="; }; - vendorSha256 = "sha256-FLFPcmkrhZ+/UX1xpexsDv3cgC/Ocj4qTFJOX+rmdyQ="; + vendorHash = "sha256-/5s9Dvce0JWu8DaUlrtnkN6N5esEmkFvOgq0tVLZGnM="; ldflags = [ "-s" "-w" "-X=main.Version=v${version}" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix b/pkgs/applications/version-management/git-cinnabar/default.nix similarity index 96% rename from pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix rename to pkgs/applications/version-management/git-cinnabar/default.nix index a48fd5f20c37..42a22f486623 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix +++ b/pkgs/applications/version-management/git-cinnabar/default.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { for pythonBin in git-cinnabar git-remote-hg; do makeWrapper $out/libexec/$pythonBin $out/bin/$pythonBin \ --prefix PATH : ${lib.getBin python3}/bin \ - --prefix GIT_CINNABAR_EXPERIMENTS , python3 \ --set PYTHONPATH ${mercurial}/${python3.sitePackages} done diff --git a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix similarity index 59% rename from pkgs/applications/version-management/git-and-tools/git-cliff/default.nix rename to pkgs/applications/version-management/git-cliff/default.nix index 8e765824b223..be92ac0a29d4 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -1,26 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, Security +}: rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "0.9.2"; + version = "1.1.2"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-6OxYIr2ElyB4QHiPV/KAELmKC+qFGpgerhlDPjLvsio="; + hash = "sha256-QYldwxQYod5qkNC3soiKoCLDFR4UaLxdGkVufn1JIeE="; }; - cargoSha256 = "sha256-+C7MXmn3FrhD9UVdRmRZbH/rzleATBT0bdlQUSOae5Y="; + cargoHash = "sha256-jwDJb9Hl0PegCufmaj1Q3h5itgt26E4dwmcyCxZ+4FM="; # attempts to run the program on .git in src which is not deterministic doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ + Security + ]; meta = with lib; { description = "A highly customizable Changelog Generator that follows Conventional Commit specifications"; homepage = "https://github.com/orhun/git-cliff"; + changelog = "https://github.com/orhun/git-cliff/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ siraben ]; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-codeowners/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix rename to pkgs/applications/version-management/git-codeowners/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix b/pkgs/applications/version-management/git-codereview/default.nix similarity index 72% rename from pkgs/applications/version-management/git-and-tools/git-codereview/default.nix rename to pkgs/applications/version-management/git-codereview/default.nix index 43de62876858..90dcbdb0dddc 100644 --- a/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix +++ b/pkgs/applications/version-management/git-codereview/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "git-codereview"; - version = "1.0.3"; + version = "1.2.0"; src = fetchFromGitHub { owner = "golang"; repo = "review"; rev = "v${version}"; - sha256 = "sha256-Hyo2UWGlxxeSz3E73DeA0VoOnBJ1VedvpshnATJGbFo="; + sha256 = "sha256-vh2XFzvGEMutlaHKNhpuYdlnNl49zoNPkLYNUA1lWwc="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; ldflags = [ "-s" "-w" ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; meta = with lib; { description = "Manage the code review process for Git changes using a Gerrit server"; diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-cola/default.nix similarity index 90% rename from pkgs/applications/version-management/git-and-tools/git-cola/default.nix rename to pkgs/applications/version-management/git-cola/default.nix index fdfd722e8fb0..fb4ebea2480f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-cola/default.nix @@ -5,13 +5,13 @@ let in buildPythonApplication rec { pname = "git-cola"; - version = "4.0.3"; + version = "4.1.0"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "refs/tags/v${version}"; - hash = "sha256-w3SbuquHuWTYg1N3kcix4S5vrsmclVSrHf6uv8CYU6w="; + hash = "sha256-s+acQo9b+ZQ31qXBf0m8ajXYuYEQzNybmX9nw+c0DQY="; }; buildInputs = [ git gettext ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-credential-1password/default.nix b/pkgs/applications/version-management/git-credential-1password/default.nix similarity index 77% rename from pkgs/applications/version-management/git-and-tools/git-credential-1password/default.nix rename to pkgs/applications/version-management/git-credential-1password/default.nix index 8d180f5176a2..65afd5f1c387 100644 --- a/pkgs/applications/version-management/git-and-tools/git-credential-1password/default.nix +++ b/pkgs/applications/version-management/git-credential-1password/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "git-credential-1password"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "develerik"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Bz/EW+K4XtDap3cu3/+9nJePcdxMXakj8HDPsbCx1FU="; + sha256 = "sha256-8qdUOJ0MOk/xVvp3kDuxNRo3lMEJhLeI3Fle0tuZez0="; }; - vendorSha256 = "sha256-cPHA6rVUQg41sS79UBFf85OfLn53C8/OZVGT5xVdBdw="; + vendorHash = "sha256-B6BlVnUX4XLT+9EpL63Ht4S8Wo84RsmY99CL+srQfpw="; meta = with lib; { description = "A git credential helper for 1Password"; diff --git a/pkgs/applications/version-management/git-and-tools/git-credential-keepassxc/default.nix b/pkgs/applications/version-management/git-credential-keepassxc/default.nix similarity index 85% rename from pkgs/applications/version-management/git-and-tools/git-credential-keepassxc/default.nix rename to pkgs/applications/version-management/git-credential-keepassxc/default.nix index 0e5ba28eebaa..27998f1c9c15 100644 --- a/pkgs/applications/version-management/git-and-tools/git-credential-keepassxc/default.nix +++ b/pkgs/applications/version-management/git-credential-keepassxc/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-credential-keepassxc"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "Frederick888"; repo = "git-credential-keepassxc"; rev = "v${version}"; - hash = "sha256-zVE3RQlh0SEV4iavz40YhR+MP31oLCvG54H8gqXwL/k="; + hash = "sha256-ZpysJ+xs3IenqAdoswG0OkzxzuNPSKkqlutGxn4VRw8="; }; - cargoHash = "sha256-H75SGbT//02I+umttnPM5BwtFkDVNxEYLf84oULEuEk="; + cargoHash = "sha256-IPsMlVfgwoFEQlXmW4gnt16WNF5W6akobUVct/iF42E="; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-crypt/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-crypt/default.nix rename to pkgs/applications/version-management/git-crypt/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix b/pkgs/applications/version-management/git-delete-merged-branches/default.nix similarity index 84% rename from pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix rename to pkgs/applications/version-management/git-delete-merged-branches/default.nix index 19e3a58baf40..08d93bcf69e7 100644 --- a/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix +++ b/pkgs/applications/version-management/git-delete-merged-branches/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "git-delete-merged-branches"; - version = "7.2.0"; + version = "7.4.0"; src = fetchFromGitHub { owner = "hartwork"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-pdP+DDJOSqr/fUQPtb84l/8J4EA81nlk/U8h24X8n+I="; + sha256 = "sha256-17uFV3pjklqVW5ofeR54mgMh+q3uUCdqZG00Cc+4zFQ="; }; propagatedBuildInputs = with python3Packages; [ @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { prompt-toolkit ]; - checkInputs = [ git ] + nativeCheckInputs = [ git ] ++ (with python3Packages; [ parameterized ]); meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-extras/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-extras/default.nix rename to pkgs/applications/version-management/git-extras/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile b/pkgs/applications/version-management/git-fame/Gemfile similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-fame/Gemfile rename to pkgs/applications/version-management/git-fame/Gemfile diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock b/pkgs/applications/version-management/git-fame/Gemfile.lock similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock rename to pkgs/applications/version-management/git-fame/Gemfile.lock diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/pkgs/applications/version-management/git-fame/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-fame/default.nix rename to pkgs/applications/version-management/git-fame/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix b/pkgs/applications/version-management/git-fame/gemset.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix rename to pkgs/applications/version-management/git-fame/gemset.nix diff --git a/pkgs/tools/misc/git-fire/default.nix b/pkgs/applications/version-management/git-fire/default.nix similarity index 100% rename from pkgs/tools/misc/git-fire/default.nix rename to pkgs/applications/version-management/git-fire/default.nix diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/applications/version-management/git-ftp/default.nix similarity index 100% rename from pkgs/development/tools/git-ftp/default.nix rename to pkgs/applications/version-management/git-ftp/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-gone/default.nix similarity index 82% rename from pkgs/applications/version-management/git-and-tools/git-gone/default.nix rename to pkgs/applications/version-management/git-gone/default.nix index 5bdab4b081ee..fd93c337eac0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-gone/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "git-gone"; rev = "v${version}"; - sha256 = "sha256-aKBNi797aMPawxD+BLpk0sazXz2g0XTzmDpR/mk07no="; + sha256 = "sha256-pHtFLJGZYlxvQxqG/LWoWeQDxa8i3ws0olAtuoyHXTM="; }; - cargoSha256 = "sha256-vO1ePqDIy5HEBauO3OkMCovrgtIVB9biJExw/q89ivE="; + cargoSha256 = "sha256-BfUR/9WBgyUlKZ80qtqX6+AK7hRBCCsEG/IWjbcDU3c="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/git-hound/default.nix b/pkgs/applications/version-management/git-hound/default.nix similarity index 100% rename from pkgs/tools/security/git-hound/default.nix rename to pkgs/applications/version-management/git-hound/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-hub/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-hub/default.nix rename to pkgs/applications/version-management/git-hub/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-ignore/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-ignore/default.nix rename to pkgs/applications/version-management/git-ignore/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-imerge/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-imerge/default.nix rename to pkgs/applications/version-management/git-imerge/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix rename to pkgs/applications/version-management/git-interactive-rebase-tool/default.nix diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 45a5234accb1..4285c5be8a38 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -1,19 +1,19 @@ -{ lib, buildGoModule, fetchFromGitHub, ronn, installShellFiles, git, testers, git-lfs }: +{ lib, buildGoModule, fetchFromGitHub, asciidoctor, installShellFiles, git, testers, git-lfs }: buildGoModule rec { pname = "git-lfs"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "git-lfs"; repo = "git-lfs"; rev = "v${version}"; - sha256 = "sha256-3gVUPfZs5GViEA3D7Zm5NdxhuEz9DhwPLoQqHFdGCrI="; + hash = "sha256-r1z97sgqo1IyR0oW5b3bMGTUHGE8U+hrWgQ0Su9FRrw="; }; - vendorSha256 = null; + vendorHash = "sha256-did6qAUawmQ/juLzJWIXGzmErj9tBKgM7HROTezX+tw="; - nativeBuildInputs = [ ronn installShellFiles ]; + nativeBuildInputs = [ asciidoctor installShellFiles ]; ldflags = [ "-s" @@ -31,7 +31,7 @@ buildGoModule rec { make man ''; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; preCheck = '' unset subPackages diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix similarity index 77% rename from pkgs/applications/version-management/git-and-tools/git-machete/default.nix rename to pkgs/applications/version-management/git-machete/default.nix index a41380380bcc..24fc850b31b0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,18 +12,22 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.13.0"; + version = "3.14.3"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ku142NjiDTxiZ50Sm6vZs5ZHJ25oALnLQw8ThWqQ2rE="; + hash = "sha256-VOny8r00JYUT4Z7LukvWTH9ZTn86vn2Dc1YhPmtdE5s="; }; nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ git pytest-mock pytestCheckHook ]; + nativeCheckInputs = [ + git + pytest-mock + pytestCheckHook + ]; postInstall = '' installShellCompletion --bash --name git-machete completion/git-machete.completion.bash @@ -36,14 +40,13 @@ buildPythonApplication rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { homepage = "https://github.com/VirtusLab/git-machete"; description = "Git repository organizer and rebase/merge workflow automation tool"; + changelog = "https://github.com/VirtusLab/git-machete/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ blitz ]; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-my/default.nix b/pkgs/applications/version-management/git-my/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-my/default.nix rename to pkgs/applications/version-management/git-my/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-nomad/default.nix b/pkgs/applications/version-management/git-nomad/default.nix similarity index 66% rename from pkgs/applications/version-management/git-and-tools/git-nomad/default.nix rename to pkgs/applications/version-management/git-nomad/default.nix index 04ba2ca849a6..15534fc01bb3 100644 --- a/pkgs/applications/version-management/git-and-tools/git-nomad/default.nix +++ b/pkgs/applications/version-management/git-nomad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, SystemConfiguration }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, git }: rustPlatform.buildRustPackage rec { pname = "git-nomad"; @@ -11,13 +11,20 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-1PXAdXafkPOIVzaWjW/RlWHwYhMqPoj0Hj5JmOMUj8A="; }; - buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration ]; - cargoHash = "sha256-ULcdJRla1JwI0y6ngW9xQXjNw2wO48HuAczsNIsJJK0="; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + nativeCheckInputs = [ + git + ]; + meta = with lib; { description = "Synchronize work-in-progress git branches in a light weight fashion"; homepage = "https://github.com/rraval/git-nomad"; + changelog = "https://github.com/rraval/git-nomad/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ rraval ]; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/pkgs/applications/version-management/git-octopus/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-octopus/default.nix rename to pkgs/applications/version-management/git-octopus/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-open/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-open/default.nix rename to pkgs/applications/version-management/git-open/default.nix diff --git a/pkgs/development/tools/git-privacy/default.nix b/pkgs/applications/version-management/git-privacy/default.nix similarity index 90% rename from pkgs/development/tools/git-privacy/default.nix rename to pkgs/applications/version-management/git-privacy/default.nix index c17654174382..0a87793639d8 100644 --- a/pkgs/development/tools/git-privacy/default.nix +++ b/pkgs/applications/version-management/git-privacy/default.nix @@ -9,8 +9,6 @@ python3.pkgs.buildPythonApplication rec { version = "2.1.0"; format = "setuptools"; - disabled = python3.pythonOlder "3.6"; - src = fetchFromGitHub { owner = "EMPRI-DEVOPS"; repo = pname; @@ -21,12 +19,12 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ click git-filter-repo - GitPython + gitpython pynacl setuptools ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ git pytestCheckHook ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-publish/default.nix b/pkgs/applications/version-management/git-publish/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-publish/default.nix rename to pkgs/applications/version-management/git-publish/default.nix diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/applications/version-management/git-quick-stats/default.nix similarity index 100% rename from pkgs/development/tools/git-quick-stats/default.nix rename to pkgs/applications/version-management/git-quick-stats/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix b/pkgs/applications/version-management/git-quickfix/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix rename to pkgs/applications/version-management/git-quickfix/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-radar/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-radar/default.nix rename to pkgs/applications/version-management/git-radar/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-recent/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-recent/default.nix rename to pkgs/applications/version-management/git-recent/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix b/pkgs/applications/version-management/git-remote-codecommit/default.nix similarity index 94% rename from pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix rename to pkgs/applications/version-management/git-remote-codecommit/default.nix index 8ada5cc42f54..f2b47af2e382 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix +++ b/pkgs/applications/version-management/git-remote-codecommit/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ botocore ]; - checkInputs = [ pytest mock flake8 tox awscli ]; + nativeCheckInputs = [ pytest mock flake8 tox awscli ]; checkPhase = '' pytest diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-remote-gcrypt/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix rename to pkgs/applications/version-management/git-remote-gcrypt/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-remote-hg/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix rename to pkgs/applications/version-management/git-remote-hg/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/pkgs/applications/version-management/git-reparent/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-reparent/default.nix rename to pkgs/applications/version-management/git-reparent/default.nix diff --git a/pkgs/development/tools/git-repo-updater/default.nix b/pkgs/applications/version-management/git-repo-updater/default.nix similarity index 68% rename from pkgs/development/tools/git-repo-updater/default.nix rename to pkgs/applications/version-management/git-repo-updater/default.nix index d78972aa07bd..ebea57c1552a 100644 --- a/pkgs/development/tools/git-repo-updater/default.nix +++ b/pkgs/applications/version-management/git-repo-updater/default.nix @@ -1,5 +1,9 @@ -{ lib, buildPythonApplication, fetchPypi -, colorama, GitPython }: +{ lib +, buildPythonApplication +, colorama +, fetchPypi +, gitpython +}: buildPythonApplication rec { pname = "gitup"; @@ -10,7 +14,10 @@ buildPythonApplication rec { sha256 = "1pa612rcc94nc461zs9sag9p46sycc214622b06gdn35rmwp0y2g"; }; - propagatedBuildInputs = [ colorama GitPython ]; + propagatedBuildInputs = [ + colorama + gitpython + ]; # no tests doCheck = false; @@ -19,7 +26,6 @@ buildPythonApplication rec { description = "Easily update multiple Git repositories at once"; homepage = "https://github.com/earwig/git-repo-updater"; license = licenses.mit; - maintainers = [ maintainers.bdesham ]; - platforms = platforms.all; + maintainers = with maintainers; [bdesham ]; }; } diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index e47ea6b12dbe..8bd9d315d005 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.30"; + version = "2.31"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-Ck+Q7sHhMqUWu6WeA3DhY+svMxH2sU0WvmyvZ5qsW+E="; + sha256 = "sha256-Xr5VH7iMboh2F2iBqjIo+PNmWcC/GCYJp3PrPbeyefQ="; }; # Fix 'NameError: name 'ssl' is not defined' @@ -41,9 +41,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "gitRepo"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-secret/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-secret/default.nix rename to pkgs/applications/version-management/git-secret/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-secrets/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-secrets/default.nix rename to pkgs/applications/version-management/git-secrets/default.nix diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/applications/version-management/git-series/default.nix similarity index 100% rename from pkgs/development/tools/git-series/default.nix rename to pkgs/applications/version-management/git-series/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix b/pkgs/applications/version-management/git-standup/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-standup/default.nix rename to pkgs/applications/version-management/git-standup/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/pkgs/applications/version-management/git-stree/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-stree/default.nix rename to pkgs/applications/version-management/git-stree/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix b/pkgs/applications/version-management/git-subrepo/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix rename to pkgs/applications/version-management/git-subrepo/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/pkgs/applications/version-management/git-subtrac/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix rename to pkgs/applications/version-management/git-subtrac/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-sync/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-sync/default.nix rename to pkgs/applications/version-management/git-sync/default.nix diff --git a/pkgs/applications/version-management/git-team/default.nix b/pkgs/applications/version-management/git-team/default.nix new file mode 100644 index 000000000000..afce41e15d19 --- /dev/null +++ b/pkgs/applications/version-management/git-team/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, go-mockery +, installShellFiles +}: + +buildGoModule rec { + pname = "git-team"; + version = "1.8.1"; + + src = fetchFromGitHub { + owner = "hekmekk"; + repo = "git-team"; + rev = "v${version}"; + hash = "sha256-+j5d1tImVHaTx63uzLdh2YNCFa1ErAVv4OMwxOutBQ4="; + }; + + vendorHash = "sha256-NTOUL1oE2IhgLyYYHwRCMW5yCxIRxUwqkfuhSSBXf6A="; + + nativeBuildInputs = [ + go-mockery + installShellFiles + ]; + + preBuild = '' + mockery --dir=src/ --all --keeptree + ''; + + postInstall = '' + go run main.go --generate-man-page > git-team.1 + installManPage git-team.1 + + installShellCompletion --cmd git-team \ + --bash <($out/bin/git-team completion bash) \ + --zsh <($out/bin/git-team completion zsh) + ''; + + 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-test/default.nix b/pkgs/applications/version-management/git-test/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-test/default.nix rename to pkgs/applications/version-management/git-test/default.nix diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/applications/version-management/git-town/default.nix similarity index 98% rename from pkgs/tools/misc/git-town/default.nix rename to pkgs/applications/version-management/git-town/default.nix index abca61358d99..8a59fad46431 100644 --- a/pkgs/tools/misc/git-town/default.nix +++ b/pkgs/applications/version-management/git-town/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { "-X ${modulePath}/src/cmd.buildDate=nix" ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; preCheck = let skippedTests = [ diff --git a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix b/pkgs/applications/version-management/git-trim/default.nix similarity index 82% rename from pkgs/applications/version-management/git-and-tools/git-trim/default.nix rename to pkgs/applications/version-management/git-trim/default.nix index a20c750ade10..0ef5a678ee8e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix +++ b/pkgs/applications/version-management/git-trim/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-trim"; - version = "0.4.2"; + version = "0.4.4"; src = fetchFromGitHub { owner = "foriequal0"; repo = pname; rev = "v${version}"; - sha256 = "1rb9dhj7b7mjrhsvm9vw5gzjfxj10idnzv488jkfdz7sfhd3fcvz"; + sha256 = "sha256-XAO3Qg5I2lYZVNx4+Z5jKHRIFdNwBJsUQwJXFb4CbvM="; }; - cargoSha256 = "1gy77c1cnm2qpgf0fr03alvxi3936x36c032865a6ch8bzns7k5v"; + cargoHash = "sha256-KCLMb8NXxjscrmKXkP/RbV+LsJqOG7zaClJGFiQ4o9k="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index 0a366827e40d..308c04b05d60 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -1,4 +1,7 @@ -{ lib, pythonPackages, git }: +{ lib +, pythonPackages +, git +}: pythonPackages.buildPythonApplication rec { pname = "git-up"; @@ -10,9 +13,18 @@ pythonPackages.buildPythonApplication rec { }; # git should be on path for tool to work correctly - propagatedBuildInputs = [ git ] ++ (with pythonPackages; [ click colorama docopt GitPython six termcolor ]); + propagatedBuildInputs = [ + git + ] ++ (with pythonPackages; [ + click + colorama + docopt + gitpython + six + termcolor + ]); - checkInputs = [ git pythonPackages.nose ]; # git needs to be on path + nativeCheckInputs = [ git pythonPackages.nose ]; # git needs to be on path # 1. git fails to run as it cannot detect the email address, so we set it # 2. $HOME is by default not a valid dir, so we have to set that too # https://github.com/NixOS/nixpkgs/issues/12591 diff --git a/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix b/pkgs/applications/version-management/git-vanity-hash/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix rename to pkgs/applications/version-management/git-vanity-hash/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix b/pkgs/applications/version-management/git-vendor/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-vendor/default.nix rename to pkgs/applications/version-management/git-vendor/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-when-merged/default.nix b/pkgs/applications/version-management/git-when-merged/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git-when-merged/default.nix rename to pkgs/applications/version-management/git-when-merged/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-workspace/default.nix similarity index 64% rename from pkgs/applications/version-management/git-and-tools/git-workspace/default.nix rename to pkgs/applications/version-management/git-workspace/default.nix index a0136ba5e4d0..6ccfafeb70ee 100644 --- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-workspace/default.nix @@ -1,27 +1,35 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , rustPlatform -, libiconv, Security -, pkg-config, openssl +, libiconv +, Security +, pkg-config +, openssl +, testers +, git-workspace }: rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sPvb8EKrr9ZUMV1yMTXkFYgjW+LRJwJAXoc7lrWykaI="; + sha256 = "sha256-rCy6+cjjFgcMqYn48Gfw+tTIMmsTD9lz8h14EfXWatI="; }; - cargoSha256 = "sha256-WAoYFCJCWKFvWN8XyRBZdzjCrcR6jMp8ZztSLHDP+r0="; + cargoSha256 = "sha256-aO9DYD20KQL2cLWy3uIQLJ1oR4PHNbgZLYi/Y8O6UHk="; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + passthru.tests.version = testers.testVersion { package = git-workspace; }; + meta = with lib; { description = "Sync personal and work git repositories from multiple providers"; homepage = "https://github.com/orf/git-workspace"; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git/default.nix similarity index 99% rename from pkgs/applications/version-management/git-and-tools/git/default.nix rename to pkgs/applications/version-management/git/default.nix index 2d63ae403791..317db2924ab3 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -12,7 +12,7 @@ , withManual ? true , pythonSupport ? true , withpcre2 ? true -, sendEmailSupport ? false +, sendEmailSupport ? perlSupport , Security, CoreServices , nixosTests , withLibsecret ? false @@ -28,7 +28,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.38.1"; + version = "2.39.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "sha256-l9346liiueD7wlCOJFAoynWRG9ONFVFhaxSMGqV0Ctk="; + sha256 = "sha256-QKOKCEezDDcbNYc7OvzxI4hd1B6j7Lv1EO+pfzzlwWE="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch b/pkgs/applications/version-management/git/docbook2texi.patch similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch rename to pkgs/applications/version-management/git/docbook2texi.patch diff --git a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch b/pkgs/applications/version-management/git/git-send-email-honor-PATH.patch similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch rename to pkgs/applications/version-management/git/git-send-email-honor-PATH.patch diff --git a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch b/pkgs/applications/version-management/git/git-sh-i18n.patch similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch rename to pkgs/applications/version-management/git/git-sh-i18n.patch diff --git a/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch b/pkgs/applications/version-management/git/installCheck-path.patch similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch rename to pkgs/applications/version-management/git/installCheck-path.patch diff --git a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch b/pkgs/applications/version-management/git/ssh-path.patch similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git/ssh-path.patch rename to pkgs/applications/version-management/git/ssh-path.patch diff --git a/pkgs/applications/version-management/git-and-tools/git/update.sh b/pkgs/applications/version-management/git/update.sh similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git/update.sh rename to pkgs/applications/version-management/git/update.sh diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git2cl/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/git2cl/default.nix rename to pkgs/applications/version-management/git2cl/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/gita/default.nix similarity index 97% rename from pkgs/applications/version-management/git-and-tools/gita/default.nix rename to pkgs/applications/version-management/gita/default.nix index 6f20e4a44c6f..f2d9d2a9f66d 100644 --- a/pkgs/applications/version-management/git-and-tools/gita/default.nix +++ b/pkgs/applications/version-management/gita/default.nix @@ -33,7 +33,7 @@ buildPythonApplication rec { done ''; - checkInputs = [ + nativeCheckInputs = [ git pytest ]; diff --git a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix b/pkgs/applications/version-management/gitbatch/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitbatch/default.nix rename to pkgs/applications/version-management/gitbatch/default.nix diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index c0ce50d70dff..1b4734027b7d 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,5 +1,6 @@ { lib -, buildGoPackage +, stdenv +, buildGoModule , fetchurl , makeWrapper , git @@ -12,16 +13,18 @@ , nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "gitea"; - version = "1.17.3"; + version = "1.18.3"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-NUkEgKt5OETo751UHcocPH7lEIgyBf6Rl/Nz0nbNH3g="; + hash = "sha256-jqjpbDgcmwZoc/ovgburFeeta9mAJOmz7yrvmUKAwRU="; }; + vendorHash = null; + patches = [ ./static-root-path.patch ]; @@ -30,37 +33,34 @@ buildGoPackage rec { substituteInPlace modules/setting/setting.go --subst-var data ''; + subPackages = [ "." ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optional pamSupport pam; - preBuild = - let - tags = lib.optional pamSupport "pam" - ++ lib.optional sqliteSupport "sqlite sqlite_unlock_notify"; - tagsString = lib.concatStringsSep " " tags; - in - '' - export buildFlagsArray=( - -tags="${tagsString}" - -ldflags='-X "main.Version=${version}" -X "main.Tags=${tagsString}"' - ) - ''; + tags = lib.optional pamSupport "pam" + ++ lib.optionals sqliteSupport [ "sqlite" "sqlite_unlock_notify" ]; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + "-X 'main.Tags=${lib.concatStringsSep " " tags}'" + ]; outputs = [ "out" "data" ]; postInstall = '' mkdir $data - cp -R ./go/src/${goPackagePath}/{public,templates,options} $data + cp -R ./{public,templates,options} $data mkdir -p $out - cp -R ./go/src/${goPackagePath}/options/locale $out/locale + cp -R ./options/locale $out/locale wrapProgram $out/bin/gitea \ --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} ''; - goPackagePath = "code.gitea.io/gitea"; - passthru.tests = nixosTests.gitea; meta = with lib; { @@ -68,5 +68,6 @@ buildGoPackage rec { homepage = "https://gitea.io"; license = licenses.mit; maintainers = with maintainers; [ disassembler kolaente ma27 techknowlogick ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/gitflow/default.nix similarity index 78% rename from pkgs/applications/version-management/git-and-tools/gitflow/default.nix rename to pkgs/applications/version-management/gitflow/default.nix index ce612fcd52d3..09ab7031bd23 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/gitflow/default.nix @@ -1,6 +1,4 @@ -{ pkgs, lib, stdenv, fetchFromGitHub }: - -with pkgs.lib; +{ lib, stdenv, fetchFromGitHub, makeWrapper, getopt, git, coreutils }: stdenv.mkDerivation rec { pname = "gitflow"; @@ -13,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-kHirHG/bfsU6tKyQ0khNSTyChhzHfzib+HyA3LOtBI8="; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; preBuild = '' makeFlagsArray+=(prefix="$out") @@ -21,9 +19,9 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/git-flow \ - --set FLAGS_GETOPT_CMD ${pkgs.getopt}/bin/getopt \ - --suffix PATH : ${pkgs.git}/bin \ - --prefix PATH : ${pkgs.coreutils}/bin + --set FLAGS_GETOPT_CMD ${getopt}/bin/getopt \ + --suffix PATH : ${git}/bin \ + --prefix PATH : ${coreutils}/bin ''; meta = with lib; { diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index 5ed726e2bf60..745934ae3877 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -15,15 +15,16 @@ , cups , mesa , systemd +, openssl }: stdenv.mkDerivation rec { pname = "github-desktop"; - version = "3.0.6"; + version = "3.1.1"; src = fetchurl { url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb"; - hash = "sha256-UQsMT4/D571xgrU8C4HBoRO+qf08GCGerA4Y5gHcjRc="; + hash = "sha256-R8t0y7b2upMOsWebIBr9+qT2GqQ/ahzWLcFIWwK4JTs="; }; nativeBuildInputs = [ @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { alsa-lib cups mesa + openssl ]; unpackPhase = '' diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index bce2d3b7cf70..2b6018dfe446 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -10,24 +10,24 @@ with lib; let pname = "gitkraken"; - version = "8.9.1"; + version = "9.0.0"; 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-taz610BIAZm8TB2GQSHLjcDLVjfvtcyLqJ2XBaD6NRE="; + sha256 = "sha256-I6iIg+RBTz5HyommAvDuQBBURjMm04t31o5OZNCrYGc="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "sha256-TMcXtRO9ANQlmHPULgC/05qrqQC6oN58G3ytokRr/Z8="; + sha256 = "1dhswjzyjrfz4psjji53fjpvb8845lv44qqc6ncfv1ljx9ky828r"; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - sha256 = "sha256-vuk0nfl+Ga5yiZWNwDd9o8qOjmiTLe5tQjGhia0bIk0="; + sha256 = "0jzcwx1z240rr08qc6vbasn51bcadz2jl3vm3jwgjpfdwypnsvk1"; }; }; @@ -122,7 +122,9 @@ let postFixup = '' pushd $out/share/${pname} - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ${pname} + for file in ${pname} chrome-sandbox chrome_crashpad_handler; do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $file + done for file in $(find . -type f \( -name \*.node -o -name ${pname} -o -name \*.so\* \) ); do patchelf --set-rpath ${libPath}:$out/share/${pname} $file || true diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 693b7adf46b8..06eb8d78f06e 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,28 +1,14 @@ { - "version": "15.4.4", - "repo_hash": "sha256-iIgN1j02Lr/RtNeopqs6ndFqw8YIU2F6c49RGWvpmgc=", - "yarn_hash": "1r33qrvwf2wmq5c1d2awk9qhk9nzvafqn3drdvnczfv43sda4lg8", + "version": "15.8.1", + "repo_hash": "sha256-AdgebB7IY18u/J1F67oNnwVYmmeYJPNCI/yll2eZEiQ=", + "yarn_hash": "1famdjvsbhvnkg5sp2vnc3jzaixww41833pb0427s3qpig0fc7az", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.4.4-ee", + "rev": "v15.8.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.4.4", - "GITLAB_PAGES_VERSION": "1.62.0", - "GITLAB_SHELL_VERSION": "14.10.0", - "GITLAB_WORKHORSE_VERSION": "15.4.4" - }, - "vendored_gems": [ - "bundler-checksum", - "devise-pbkdf2-encryptable", - "omniauth-azure-oauth2", - "omniauth-cas3", - "omniauth-gitlab", - "omniauth-google-oauth2", - "omniauth_crowd", - "omniauth-salesforce", - "mail-smtp_pool", - "microsoft_graph_mailer", - "ipynbdiff", - "error_tracking_open_api" - ] + "GITALY_SERVER_VERSION": "15.8.1", + "GITLAB_PAGES_VERSION": "15.8.1", + "GITLAB_SHELL_VERSION": "14.15.0", + "GITLAB_WORKHORSE_VERSION": "15.8.1" + } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 88f2a5f4cd0e..e6cd605a51ea 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, makeWrapper +, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config }: let @@ -20,8 +20,11 @@ let inherit ruby; gemdir = ./rubyEnv; gemset = - let x = import (gemdir + "/gemset.nix"); + let x = import (gemdir + "/gemset.nix") src; in x // { + gpgme = x.gpgme // { + nativeBuildInputs = [ pkg-config ]; + }; # the openssl needs the openssl include files openssl = x.openssl // { buildInputs = [ openssl ]; @@ -47,7 +50,7 @@ let # `console` executable. ignoreCollisions = true; - extraConfigPaths = lib.forEach data.vendored_gems (gem: "${src}/vendor/gems/${gem}"); + extraConfigPaths = [ "${src}/vendor" ]; }; assets = stdenv.mkDerivation { @@ -99,6 +102,7 @@ let yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ + patchShebangs scripts/frontend/ runHook postConfigure ''; @@ -108,7 +112,7 @@ let bundle exec rake gettext:po_to_json RAILS_ENV=production NODE_ENV=production bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production - bundle exec rake gitlab:assets:compile_webpack_if_needed RAILS_ENV=production NODE_ENV=production + bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production bundle exec rake gitlab:assets:check_page_bundle_mixins_css_for_sideeffects RAILS_ENV=production NODE_ENV=production @@ -137,9 +141,6 @@ stdenv.mkDerivation { patches = [ # Change hardcoded paths to the NixOS equivalent ./remove-hardcoded-locations.patch - - # Bump pg to 1.4.3 (see https://github.com/NixOS/nixpkgs/pull/187946) - ./update-pg.patch ]; postPatch = '' diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 7fa9b5b307bb..9c561119f118 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -1,25 +1,29 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.2' -gem 'github-linguist', '~> 7.20.0', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' gem 'activesupport', '~> 6.1.6.1' -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 gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools gem 'sentry-raven', '~> 3.0', require: false -gem 'faraday', '~> 1.0' gem 'rbtrace', require: false +# The Gitaly Gem contains the Protobuf and gRPC definitions required by the +# Ruby sidecar. +gem 'gitaly', '~> 15.5.0' + # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.24' +gem 'gitlab-labkit', '~> 0.29' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 9.15' -gem 'google-protobuf', '~> 3.21.0' +gem 'google-protobuf', '~> 3.21.12' + +# Rails is currently blocked on the upgrade to the new major version for Redis, +# so we don't upgrade either until the issue is resolved. This is an indirect +# dependency and can thus be removed when the version constraint is gone. +gem 'redis', '~> 4.8.0' group :development, :test do gem 'rubocop', '~> 0.69', require: false @@ -28,8 +32,6 @@ group :development, :test do gem 'timecop', require: false gem 'factory_bot', require: false gem 'pry', '~> 0.12.2', require: false - - gem 'grpc-tools', '~> 1.42.0' end # Gems required in omnibus-gitlab pipeline diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 616dabbe088a..2b90a2e0cdaf 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -29,7 +29,6 @@ GEM ast (2.4.2) binding_ninja (0.2.3) builder (3.2.4) - charlock_holmes (0.7.7) coderay (1.1.2) concord (0.1.5) adamantium (~> 0.2.0) @@ -40,39 +39,21 @@ GEM dotenv (2.7.6) equalizer (0.0.11) erubi (1.11.0) - escape_utils (1.2.2) factory_bot (5.0.2) activesupport (>= 4.2.0) faraday (1.0.1) multipart-post (>= 1.2, < 3) ffi (1.15.5) - gemojione (3.3.0) - json - github-linguist (7.20.0) - charlock_holmes (~> 0.7.7) - escape_utils (~> 1.2.0) - mini_mime (~> 1.0) - rugged (~> 1.0) - github-markup (1.7.0) - gitlab-gollum-lib (4.2.7.10.gitlab.2) - gemojione (~> 3.2) - github-markup (~> 1.6) - gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) - nokogiri (>= 1.6.1, < 2.0) - rouge (~> 3.1) - sanitize (~> 6.0) - stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1) - mime-types (>= 1.15) - rugged (~> 1.0) - gitlab-labkit (0.24.0) + gitaly (15.5.0) + grpc (~> 1.0) + gitlab-labkit (0.29.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) jaeger-client (~> 1.1.0) opentracing (~> 0.4) pg_query (~> 2.1) - redis (> 3.0.0, < 5.0.0) + redis (> 3.0.0, < 6.0.0) gitlab-license_finder (6.14.2.1) bundler rubyzip (>= 1, < 3) @@ -81,41 +62,35 @@ GEM with_env (= 1.1.0) xml-simple (~> 1.1.5) gitlab-markup (1.7.1) - google-protobuf (3.21.5) + google-protobuf (3.21.12) googleapis-common-protos-types (1.4.0) google-protobuf (~> 3.14) grpc (1.42.0) google-protobuf (~> 3.18) googleapis-common-protos-types (~> 1.0) - grpc-tools (1.42.0) i18n (1.12.0) concurrent-ruby (~> 1.0) ice_nine (0.11.2) jaeger-client (1.1.0) opentracing (~> 0.3) thrift - json (2.5.1) licensee (9.15.2) dotenv (~> 2.0) octokit (~> 4.20) reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - loofah (2.18.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.9.2) - mime-types (3.3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2020.1104) - mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.16.3) msgpack (1.3.3) multipart-post (2.1.1) - nokogiri (1.13.8) + nokogiri (1.13.10) mini_portile2 (~> 2.8.0) racc (~> 1.4) octokit (4.20.0) @@ -126,7 +101,7 @@ GEM parallel (1.19.2) parser (3.0.3.2) ast (~> 2.4.1) - pg_query (2.1.3) + pg_query (2.2.0) google-protobuf (>= 3.19.2) proc_to_ast (0.1.0) coderay @@ -137,27 +112,25 @@ GEM coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (4.0.7) - racc (1.6.0) + racc (1.6.1) rack (2.2.4) rack-test (2.0.2) rack (>= 1.3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) + rails-html-sanitizer (1.4.4) + loofah (~> 2.19, >= 2.19.1) rainbow (3.0.0) rbtrace (0.4.14) ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) - rdoc (6.3.2) redis (4.8.0) regexp_parser (1.8.1) reverse_markdown (1.4.0) nokogiri rexml (3.2.5) - rouge (3.30.0) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -191,18 +164,14 @@ GEM ruby-progressbar (1.10.1) rubyzip (2.3.2) rugged (1.2.0) - sanitize (6.0.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) sentry-raven (3.0.4) faraday (>= 1.0) - stringex (2.8.5) thor (1.1.0) thread_safe (0.3.6) - thrift (0.16.0) + thrift (0.17.0) timecop (0.9.1) tomlrb (2.0.1) tzinfo (2.0.5) @@ -227,20 +196,16 @@ PLATFORMS DEPENDENCIES activesupport (~> 6.1.6.1) factory_bot - faraday (~> 1.0) - github-linguist (~> 7.20.0) - gitlab-gollum-lib (~> 4.2.7.10.gitlab.2) - gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) - gitlab-labkit (~> 0.24) + gitaly (~> 15.5.0) + gitlab-labkit (~> 0.29) gitlab-license_finder gitlab-markup (~> 1.7.1) - google-protobuf (~> 3.21.0) + google-protobuf (~> 3.21.12) grpc (~> 1.42.0) - grpc-tools (~> 1.42.0) licensee (~> 9.15) pry (~> 0.12.2) rbtrace - rdoc (~> 6.0) + redis (~> 4.8.0) rspec rspec-parameterized rubocop (~> 0.69) @@ -249,4 +214,4 @@ DEPENDENCIES timecop BUNDLED WITH - 2.3.15 + 2.3.26 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 44a8218e1fbc..28452edbfe46 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby , bundlerEnv, pkg-config # libgit2 + dependencies -, libgit2_1_3_0, openssl, zlib, pcre, http-parser }: +, libgit2, openssl, zlib, pcre, http-parser }: let rubyEnv = bundlerEnv rec { @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.4.4"; + version = "15.8.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,17 +22,17 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-b8ChQYaj+7snlrLP4P9FIUSIq/SNMh9hFlFajOPcBEU="; + sha256 = "sha256-TolduUm8OhpubHXMCyy0vQhj65lauh5eST5UDvdWNVE="; }; - vendorSha256 = "sha256-CUFYHjmOfosM3mfw0qEY+AQcR8U3J/1lU2Ml6wSZ/QM="; + vendorSha256 = "sha256-8P5X/bqeI1hY45IGsvEWOg3GuetEQF/XtZzUMdX22pA="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; tags = [ "static,system_libgit2" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ rubyEnv.wrappedRuby libgit2_1_3_0 openssl zlib pcre http-parser ]; + buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; doCheck = false; }; @@ -59,7 +59,7 @@ buildGoModule ({ postInstall = '' mkdir -p $ruby - cp -rv $src/ruby/{bin,lib,proto} $ruby + cp -rv $src/ruby/{bin,lib} $ruby ''; outputs = [ "out" "ruby" ]; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 9051ad74bf1d..f3a4a082f205 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -90,16 +90,6 @@ }; version = "3.2.4"; }; - charlock_holmes = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p"; - type = "gem"; - }; - version = "0.7.7"; - }; coderay = { source = { remotes = ["https://rubygems.org"]; @@ -173,16 +163,6 @@ }; version = "1.11.0"; }; - escape_utils = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "182ha3nmsc6ny4384233pav58a5x2spjn838w9nciwb29lxah1x3"; - type = "gem"; - }; - version = "1.2.2"; - }; factory_bot = { dependencies = ["activesupport"]; groups = ["development" "test"]; @@ -215,55 +195,16 @@ }; version = "1.15.5"; }; - gemojione = { - dependencies = ["json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj"; - type = "gem"; - }; - version = "3.3.0"; - }; - github-linguist = { - dependencies = ["charlock_holmes" "escape_utils" "mini_mime" "rugged"]; + gitaly = { + dependencies = ["grpc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10biwhh50fdssqs3ai651qgv079bn6h06g5cv00jc5s73iszfns9"; + sha256 = "0hpgljz05rhik15z081ghxw9pw83vz78p12wjdgxj3qz1a4x8pfq"; type = "gem"; }; - version = "7.20.0"; - }; - github-markup = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp"; - type = "gem"; - }; - version = "1.7.0"; - }; - gitlab-gollum-lib = { - dependencies = ["gemojione" "github-markup" "gitlab-gollum-rugged_adapter" "nokogiri" "rouge" "sanitize" "stringex"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vs6frgnhhfnyicsjck39xibmn7xc6ji7wvznvfmr53f4smqjk40"; - type = "gem"; - }; - version = "4.2.7.10.gitlab.2"; - }; - gitlab-gollum-rugged_adapter = { - dependencies = ["mime-types" "rugged"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gvgqfn05swsazfxdwmlqcq8v2pjyy7dmyl3bd8b8jrrxbpmpxxg"; - type = "gem"; - }; - version = "0.4.4.4.gitlab.1"; + version = "15.5.0"; }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; @@ -271,10 +212,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j0598m9445msa0rksl1l1cvd11wsnyq1s4gjmcbw18a9smfa5lg"; + sha256 = "09xlv72nbys9a5iqvhxfzdr7vy3s3m2a6ixqb9vq71k925faq6gb"; type = "gem"; }; - version = "0.24.0"; + version = "0.29.0"; }; gitlab-license_finder = { dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"]; @@ -302,10 +243,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ysvm5mxx1knjp3sbhi18nswaml625vbgm3gbh7is14h4d8fwjy9"; + sha256 = "1dcgkhjiaxha3yznyxxzm8a4n4jf61rk7kgbxy4sdkb865zbn2ab"; type = "gem"; }; - version = "3.21.5"; + version = "3.21.12"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -329,16 +270,6 @@ }; version = "1.42.0"; }; - grpc-tools = { - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xipvw8zcm1c3pna6fgmy83x0yvffii8d7wafwcxmszxa647brw1"; - type = "gem"; - }; - version = "1.42.0"; - }; i18n = { dependencies = ["concurrent-ruby"]; groups = ["default" "development" "test"]; @@ -369,16 +300,6 @@ }; version = "1.1.0"; }; - json = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; - type = "gem"; - }; - version = "2.5.1"; - }; licensee = { dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"]; groups = ["default"]; @@ -396,10 +317,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; + sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; type = "gem"; }; - version = "2.18.0"; + version = "2.19.1"; }; memoizable = { dependencies = ["thread_safe"]; @@ -418,37 +339,6 @@ }; version = "0.9.2"; }; - mime-types = { - dependencies = ["mime-types-data"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; - type = "gem"; - }; - version = "3.3.1"; - }; - mime-types-data = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; - type = "gem"; - }; - version = "3.2020.1104"; - }; - mini_mime = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; - type = "gem"; - }; - version = "1.1.2"; - }; mini_portile2 = { groups = ["default"]; platforms = []; @@ -495,10 +385,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; + sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; type = "gem"; }; - version = "1.13.8"; + version = "1.13.10"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -558,10 +448,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00bhwkhjy6bkp04313m5il7vd165i3fz0x4jissflf66i164ppgk"; + sha256 = "0l79y41nwwacabj61jkbh4r7haajaf8y4bn5pihh0m1g8547b8w4"; type = "gem"; }; - version = "2.1.3"; + version = "2.2.0"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; @@ -604,10 +494,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "0p685i23lr8pl7l09g9l2mcj615fr7g33w3mkcr472lcg34nq8n8"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; rack = { groups = ["default"]; @@ -647,10 +537,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf"; + sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.4"; }; rainbow = { source = { @@ -671,16 +561,6 @@ }; version = "0.4.14"; }; - rdoc = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19h5g3g7k7wggy9amfx8b3m09ss7wrakbrva2xnda9sw4chagx6y"; - type = "gem"; - }; - version = "6.3.2"; - }; redis = { groups = ["default"]; platforms = []; @@ -722,16 +602,6 @@ }; version = "3.2.5"; }; - rouge = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1dnfkrk8xx2m8r3r9m2p5xcq57viznyc09k7r3i4jbm758i57lx3"; - type = "gem"; - }; - version = "3.30.0"; - }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; groups = ["development" "test"]; @@ -849,17 +719,6 @@ }; version = "1.2.0"; }; - sanitize = { - dependencies = ["crass" "nokogiri"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zq8pxmsd1abw18zz6mazsm2jfpwmbgdxbpawb7bmwvkb2c5yyc1"; - type = "gem"; - }; - version = "6.0.0"; - }; sawyer = { dependencies = ["addressable" "faraday"]; groups = ["default"]; @@ -882,16 +741,6 @@ }; version = "3.0.4"; }; - stringex = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15ns7j5smw04w6w7bqd5mm2qcl7w9lhwykyb974i4isgg9yc23ys"; - type = "gem"; - }; - version = "2.8.5"; - }; thor = { groups = ["default"]; platforms = []; @@ -915,10 +764,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1knw2xa3pkfql4np9qazz2mdi1vz21vdsa0wkx648c4ym1p2h8yh"; + sha256 = "12p856z7inf47azpvh9qswsfx8035r5hbzlg2x5n8z2sjqzjkk80"; type = "gem"; }; - version = "0.16.0"; + version = "0.17.0"; }; timecop = { source = { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 2694be2f65b3..25e2a0642423 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 = "14.10.0"; + version = "14.15.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-7uy7F4wK/4xz0PK9ZadaMjy3c+xUK9+YKaaEm5iFqUs="; + sha256 = "sha256-GDhYBL5LT3r6UIjDDY3LV5VgcBch190hYLPb6uMWETs="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-urS0FED636APQe5uNvhDvWsnZtHCW60VtRE1B7IzGZQ="; + vendorSha256 = "sha256-2DpQNJw67ipIW3ctHDJthuDrKNZCYvjXGlDxzBEMGWs="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 2042b6c2bcef..7a808ee2ff64 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 = "15.4.4"; + version = "15.8.1"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-dN3DfkAJkqkmGyahsBDsPQBog52RGECV+SESSR6W3fg="; + vendorSha256 = "sha256-0FWR6cIV/0R2OrOAKhvuVnIY3Hkw4CIjyBUeF/paumw="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 0426bd840201..96517b56ff91 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -2,64 +2,81 @@ source 'https://rubygems.org' -gem 'bundler-checksum', '~> 0.1.0', path: 'bundler-checksum', require: false +if ENV['BUNDLER_CHECKSUM_VERIFICATION_OPT_IN'] # this verification is still experimental + $LOAD_PATH.unshift(File.expand_path("vendor/gems/bundler-checksum/lib", __dir__)) + require 'bundler-checksum' + BundlerChecksum.patch! +end +gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false + +# NOTE: When incrementing the major or minor version here, also increment activerecord_version +# in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve +# https://gitlab.com/gitlab-org/gitlab/-/issues/375713 gem 'rails', '~> 6.1.6.1' -gem 'bootsnap', '~> 1.13.0', require: false +gem 'bootsnap', '~> 1.15.0', require: false + +# Pin openssl to match the version bundled with our supported Rubies. +# See https://stdgems.org/openssl/#gem-version. +gem 'openssl', '2.2.2' +# This gem was originally bundled with Ruby 2.7, but is unbundled as of Ruby 3. +# Since the latest version caused problems with GitLab, we pin this to an older +# version for now. +# See https://gitlab.com/gitlab-org/gitlab/-/issues/376417 +gem 'ipaddr', '1.2.2' # Responders respond_to and respond_with gem 'responders', '~> 3.0' gem 'sprockets', '~> 3.7.0' -gem 'view_component', '~> 2.71.0' +gem 'view_component', '~> 2.74.1' # Default values for AR models gem 'default_value_for', '~> 3.4.0' # Supported DBs -gem 'pg', '~> 1.4.0' +gem 'pg', '~> 1.4.5' gem 'rugged', '~> 1.2' gem 'grape-path-helpers', '~> 1.7.1' gem 'faraday', '~> 1.0' -gem 'marginalia', '~> 1.10.0' +gem 'marginalia', '~> 1.11.1' # Authorization gem 'declarative_policy', '~> 1.1.0' # Authentication libraries gem 'devise', '~> 4.8.1' -gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'devise-pbkdf2-encryptable' +gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' gem 'bcrypt', '~> 3.1', '>= 3.1.14' -gem 'doorkeeper', '~> 5.5.0.rc2' -gem 'doorkeeper-openid_connect', '~> 1.7.5' +gem 'doorkeeper', '~> 5.5' +gem 'doorkeeper-openid_connect', '~> 1.8' gem 'rexml', '~> 3.2.5' gem 'ruby-saml', '~> 1.13.0' -gem 'omniauth-rails_csrf_protection' gem 'omniauth', '~> 2.1.0' gem 'omniauth-auth0', '~> 2.0.0' -gem 'omniauth-azure-activedirectory-v2', '~> 1.0' -gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'omniauth-azure-oauth2' # See gem README.md -gem 'omniauth-cas3', '~> 1.1.4', path: 'omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md +gem 'omniauth-azure-activedirectory-v2', '~> 2.0' +gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md +gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md gem 'omniauth-dingtalk-oauth2', '~> 1.0' -gem 'omniauth-alicloud', '~> 1.0.1' +gem 'omniauth-alicloud', '~> 2.0.0' gem 'omniauth-facebook', '~> 4.0.0' -gem 'omniauth-github', '2.0.0' -gem 'omniauth-gitlab', '~> 4.0.0', path: 'omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md -gem 'omniauth-google-oauth2', '~> 1.0.1', path: 'omniauth-google-oauth2' # See gem README.md +gem 'omniauth-github', '2.0.1' +gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md +gem 'omniauth-google-oauth2', '~> 1.1' gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 2.0.0' gem 'omniauth-shibboleth', '~> 1.3.0' gem 'omniauth-twitter', '~> 1.4' -gem 'omniauth_crowd', '~> 2.4.0', path: 'omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md +gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md gem 'omniauth-authentiq', '~> 0.3.3' gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', require: 'omniauth_openid_connect' -gem 'omniauth-salesforce', '~> 1.0.5', path: 'omniauth-salesforce' # See gem README.md +gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md gem 'omniauth-atlassian-oauth2', '~> 0.2.0' -gem 'rack-oauth2', '~> 1.21.2' +gem 'rack-oauth2', '~> 1.21.3' gem 'jwt', '~> 2.1.0' # Kerberos authentication. EE-only @@ -67,14 +84,14 @@ gem 'gssapi', group: :kerberos gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos # Spam and anti-bot protection -gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' +gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails' gem 'akismet', '~> 3.0' -gem 'invisible_captcha', '~> 1.1.0' +gem 'invisible_captcha', '~> 2.0.0' # Two-factor authentication gem 'devise-two-factor', '~> 4.0.2' gem 'rqrcode-rails3', '~> 0.1.7' -gem 'attr_encrypted', '~> 3.1.0' +gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' gem 'u2f', '~> 0.2.1' # GitLab Pages @@ -84,24 +101,26 @@ gem 'rubyzip', '~> 2.3.2', require: 'zip' gem 'acme-client', '~> 2.0' # Browser detection -gem 'browser', '~> 4.2' +gem 'browser', '~> 5.3.1' # OS detection for usage ping gem 'ohai', '~> 16.10' # GPG -gem 'gpgme', '~> 2.0.19' +gem 'gpgme', '~> 2.0.22' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap' -gem 'net-ldap', '~> 0.16.3' +gem 'net-ldap', '~> 0.17.1' # API gem 'grape', '~> 1.5.2' gem 'grape-entity', '~> 0.10.0' -gem 'rack-cors', '~> 1.1.0', require: 'rack/cors' +gem 'rack-cors', '~> 1.1.1', require: 'rack/cors' +gem 'grape-swagger', '~>1.5.0', group: [:development, :test] +gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test] # GraphQL API gem 'graphql', '~> 1.13.12' @@ -110,12 +129,10 @@ gem 'apollo_upload_server', '~> 2.1.0' gem 'graphql-docs', '~> 2.1.0', group: [:development, :test] gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import) -gem 'hashie' -# Disable strong_params so that Mash does not respond to :permitted? -gem 'hashie-forbidden_attributes' +gem 'hashie', '~> 5.0.0' # Pagination -gem 'kaminari', '~> 1.0' +gem 'kaminari', '~> 1.2.2' # HAML gem 'hamlit', '~> 2.15.0' @@ -125,16 +142,16 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick', '~> 4.10.1' # for backups -gem 'fog-aws', '~> 3.14' +gem 'fog-aws', '~> 3.15' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' -gem 'fog-google', '~> 1.15', require: 'fog/google' -gem 'fog-local', '~> 0.6' +gem 'fog-google', '~> 1.19', require: 'fog/google' +gem 'fog-local', '~> 0.8' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.3' -gem 'gitlab-fog-azure-rm', '~> 1.3.0', require: 'fog/azurerm' +gem 'gitlab-fog-azure-rm', '~> 1.4.0', require: 'fog/azurerm' # for Google storage gem 'google-api-client', '~> 0.33' @@ -149,18 +166,17 @@ gem 'seed-fu', '~> 2.3.7' gem 'elasticsearch-model', '~> 7.2' gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-api', '7.13.3' -gem 'aws-sdk-core', '~> 3.131.0' +gem 'aws-sdk-core', '~> 3.168.4' gem 'aws-sdk-cloudformation', '~> 1' -gem 'aws-sdk-s3', '~> 1.114.0' +gem 'aws-sdk-s3', '~> 1.117.2' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # Markdown and HTML processing -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.4' +gem 'html-pipeline', '~> 2.14.3' +gem 'deckar01-task_list', '2.3.2' +gem 'gitlab-markup', '~> 1.8.0', require: 'github/markup' +gem 'commonmarker', '~> 0.23.6' gem 'kramdown', '~> 2.3.1' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.3.2' @@ -170,12 +186,11 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.17' gem 'asciidoctor-include-ext', '~> 0.4.0', require: false gem 'asciidoctor-plantuml', '~> 0.0.16' -gem 'asciidoctor-kroki', '~> 0.5.0', require: false +gem 'asciidoctor-kroki', '~> 0.7.0', require: false gem 'rouge', '~> 3.30.0' gem 'truncato', '~> 0.7.12' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.13.8' -gem 'escape_utils', '~> 1.1' +gem 'nokogiri', '~> 1.13.10' # Calendar rendering gem 'icalendar' @@ -185,9 +200,9 @@ gem 'diffy', '~> 3.4' gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.2.4' +gem 'rack', '~> 2.2.6', '>= 2.2.6.2' # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually -gem 'rack-timeout', '~> 0.6.0', require: 'rack/timeout/base' +gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' group :puma do gem 'puma', '~> 5.6.5', require: false @@ -202,16 +217,16 @@ gem 'state_machines-activerecord', '~> 0.8.0' gem 'acts-as-taggable-on', '~> 9.0' # Background jobs -gem 'sidekiq', '~> 6.4.0' -gem 'sidekiq-cron', '~> 1.4.0' -gem 'redis-namespace', '~> 1.8.1' -gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch' +gem 'sidekiq', '~> 6.5.7' +gem 'sidekiq-cron', '~> 1.8.0' +gem 'redis-namespace', '~> 1.9.0' +gem 'gitlab-sidekiq-fetcher', '0.9.0', require: 'sidekiq-reliable-fetch' # Cron Parser gem 'fugit', '~> 1.2.1' # HTTP requests -gem 'httparty', '~> 0.16.4' +gem 'httparty', '~> 0.20.0' # Colored output to console gem 'rainbow', '~> 3.0' @@ -223,20 +238,20 @@ gem 'ruby-progressbar', '~> 1.10' gem 'settingslogic', '~> 2.0.9' # Linear-time regex library for untrusted regular expressions -gem 're2', '~> 1.4.0' +gem 're2', '~> 1.6.0' # Misc -gem 'version_sorter', '~> 2.2.4' +gem 'version_sorter', '~> 2.3' # Export Ruby Regex to Javascript -gem 'js_regex', '~> 3.7' +gem 'js_regex', '~> 3.8' # User agent parsing gem 'device_detector' # Redis -gem 'redis', '~> 4.7.0' +gem 'redis', '~> 4.8.0' gem 'connection_pool', '~> 2.0' # Redis session store @@ -249,9 +264,6 @@ gem 'discordrb-webhooks', '~> 3.4', require: false gem 'jira-ruby', '~> 2.1.4' gem 'atlassian-jwt', '~> 0.2.0' -# Flowdock integration -gem 'flowdock', '~> 0.7' - # Slack integration gem 'slack-messenger', '~> 2.3.4' @@ -262,17 +274,17 @@ gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat' gem 'asana', '~> 0.10.13' # FogBugz integration -gem 'ruby-fogbugz', '~> 0.2.1' +gem 'ruby-fogbugz', '~> 0.3.0' # Kubernetes integration -gem 'kubeclient', '~> 4.9.3' +gem 'kubeclient', '~> 4.9.3', path: 'vendor/gems/kubeclient' # Sanitize user input gem 'sanitize', '~> 6.0' gem 'babosa', '~> 1.0.4' # Sanitizes SVG input -gem 'loofah', '~> 2.18.0' +gem 'loofah', '~> 2.19.1' # Working with license # Detects the open source license the repository includes @@ -292,7 +304,7 @@ gem 'fast_blank' gem 'gitlab-chronic', '~> 0.10.5' gem 'gitlab_chronic_duration', '~> 0.10.6.2' -gem 'rack-proxy', '~> 0.7.2' +gem 'rack-proxy', '~> 0.7.6' gem 'sassc-rails', '~> 2.1.0' gem 'autoprefixer-rails', '10.2.5.1' @@ -301,13 +313,13 @@ gem 'terser', '1.0.2' gem 'addressable', '~> 2.8' gem 'tanuki_emoji', '~> 0.6' gem 'gon', '~> 6.4.0' -gem 'request_store', '~> 1.5' +gem 'request_store', '~> 1.5.1' gem 'base32', '~> 0.3.0' gem 'gitlab-license', '~> 2.2.1' # Protect against bruteforcing -gem 'rack-attack', '~> 6.6.0' +gem 'rack-attack', '~> 6.6.1' # Sentry integration gem 'sentry-raven', '~> 3.1' @@ -317,12 +329,11 @@ gem 'sentry-sidekiq', '~> 5.1.1' # PostgreSQL query parsing # -gem 'pg_query', '~> 2.1.0' +gem 'pg_query', '~> 2.2' gem 'premailer-rails', '~> 1.10.3' -# LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.24.0' +gem 'gitlab-labkit', '~> 0.29.0' gem 'thrift', '>= 0.16.0' # I18n @@ -338,26 +349,28 @@ gem 'batch-loader', '~> 2.0.1' gem 'peek', '~> 1.1' # Snowplow events tracking -gem 'snowplow-tracker', '~> 0.6.1' +gem 'snowplow-tracker', '~> 0.8.0' # Metrics gem 'webrick', '~> 1.6.1', require: false -gem 'prometheus-client-mmap', '~> 0.16', require: 'prometheus/client' +gem 'prometheus-client-mmap', '~> 0.17', require: 'prometheus/client' gem 'warning', '~> 1.3.0' group :development do - gem 'lefthook', '~> 1.1.1', require: false + gem 'lefthook', '~> 1.2.7', require: false gem 'rubocop' - gem 'solargraph', '~> 0.46.0', require: false + gem 'solargraph', '~> 0.47.2', require: false gem 'letter_opener_web', '~> 2.0.0' - gem 'lookbook', '~> 1.0' + gem 'lookbook', '~> 1.4', '>= 1.4.5' # Better errors handler gem 'better_errors', '~> 2.9.1' gem 'sprite-factory', '~> 1.7' + + gem "listen", "~> 3.7" end group :development, :test do @@ -379,10 +392,10 @@ group :development, :test do # Generate Fake data gem 'ffaker', '~> 2.10' - gem 'spring', '~> 2.1.0' + gem 'spring', '~> 4.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 8.0.0', require: false + gem 'gitlab-styles', '~> 9.2.0', require: false gem 'haml_lint', '~> 0.40.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -396,8 +409,6 @@ group :development, :test do gem 'simple_po_parser', '~> 1.1.6', require: false - gem 'timecop', '~> 0.9.1' - gem 'png_quantizator', '~> 0.2.1', require: false gem 'parallel', '~> 1.19', require: false @@ -406,11 +417,11 @@ group :development, :test do gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' - gem 'pact', '~> 1.12' + gem 'pact', '~> 1.63' end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.5.2', require: false + gem 'gitlab-dangerfiles', '~> 3.6.4', require: false end group :development, :test, :coverage do @@ -460,10 +471,9 @@ gem 'gitlab-mail_room', '~> 0.0.9', require: 'mail_room' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' -gem 'ruby-prof', '~> 1.3.0' gem 'stackprof', '~> 0.2.21', require: false gem 'rbtrace', '~> 0.4', require: false -gem 'memory_profiler', '~> 0.9', require: false +gem 'memory_profiler', '~> 1.0', require: false gem 'activerecord-explain-analyze', '~> 0.1', require: false # OAuth @@ -486,16 +496,16 @@ gem 'ssh_data', '~> 1.3' gem 'spamcheck', '~> 1.0.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 15.4.0-rc2' +gem 'gitaly', '~> 15.5.2' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' gem 'grpc', '~> 1.42.0' -gem 'google-protobuf', '~> 3.21' +gem 'google-protobuf', '~> 3.21', '>= 3.21.12' -gem 'toml-rb', '~> 2.0' +gem 'toml-rb', '~> 2.2.0' # Feature toggles gem 'flipper', '~> 0.25.0' @@ -512,25 +522,23 @@ gem 'grape_logging', '~> 1.8' gem 'gitlab-net-dns', '~> 0.9.1' # Countries list -gem 'countries', '~> 3.0' +gem 'countries', '~> 4.0.0' gem 'retriable', '~> 3.1.2' # LRU cache gem 'lru_redux' -gem 'erubi', '~> 1.9.0' - # Locked as long as quoted-printable encoding issues are not resolved # Monkey-patched in `config/initializers/mail_encoding_patch.rb` # See https://gitlab.com/gitlab-org/gitlab/issues/197386 gem 'mail', '= 2.7.1' -gem 'mail-smtp_pool', '~> 0.1.0', path: 'mail-smtp_pool', require: false +gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false -gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'microsoft_graph_mailer' +gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer' # File encryption -gem 'lockbox', '~> 0.6.2' +gem 'lockbox', '~> 1.1.1' # Email validation gem 'valid_email', '~> 0.1' @@ -539,6 +547,7 @@ gem 'valid_email', '~> 0.1' gem 'json', '~> 2.5.1' gem 'json_schemer', '~> 0.2.18' gem 'oj', '~> 3.13.21' +gem 'oj-introspect', '~> 0.7' gem 'multi_json', '~> 1.14.1' gem 'yajl-ruby', '~> 1.4.3', require: 'yajl' @@ -549,10 +558,23 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' -gem 'ipynbdiff', path: 'ipynbdiff' +gem 'ipynbdiff', path: 'vendor/gems/ipynbdiff' gem 'ed25519', '~> 1.3.0' # Error Tracking OpenAPI client # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature -gem 'error_tracking_open_api', path: 'error_tracking_open_api' +gem 'error_tracking_open_api', path: 'vendor/gems/error_tracking_open_api' + +# Vulnerability advisories +gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' + +# Work with RPM packages +gem 'arr-pm', '~> 0.0.12' + +# Apple plist parsing +gem 'CFPropertyList' +gem 'app_store_connect' + +# For phone verification +gem 'telesignenterprise', '~> 2.2' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index f1b1f615a094..ea1771e5af3b 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1,44 +1,60 @@ PATH - remote: bundler-checksum + remote: vendor/gems/attr_encrypted + specs: + attr_encrypted (3.2.4) + encryptor (~> 3.0.0) + +PATH + remote: vendor/gems/bundler-checksum specs: bundler-checksum (0.1.0) bundler PATH - remote: devise-pbkdf2-encryptable + remote: vendor/gems/devise-pbkdf2-encryptable specs: devise-pbkdf2-encryptable (0.0.0) devise (~> 4.0) + devise-two-factor (~> 4.0) PATH - remote: error_tracking_open_api + remote: vendor/gems/error_tracking_open_api specs: error_tracking_open_api (1.0.0) typhoeus (~> 1.0, >= 1.0.1) PATH - remote: ipynbdiff + remote: vendor/gems/ipynbdiff specs: ipynbdiff (0.4.7) diffy (~> 3.4) oj (~> 3.13.16) PATH - remote: mail-smtp_pool + remote: vendor/gems/kubeclient + specs: + kubeclient (4.9.4.pre.gitlab1) + http (>= 3.0, < 6.0) + jsonpath (~> 1.0) + recursive-open-struct (~> 1.1, >= 1.1.1) + rest-client (~> 2.0) + +PATH + remote: vendor/gems/mail-smtp_pool specs: mail-smtp_pool (0.1.0) connection_pool (~> 2.0) mail (~> 2.7) PATH - remote: microsoft_graph_mailer + remote: vendor/gems/microsoft_graph_mailer specs: microsoft_graph_mailer (0.1.0) mail (~> 2.7) oauth2 (>= 1.4.4, < 3) PATH - remote: omniauth-azure-oauth2 + remote: vendor/gems/omniauth-azure-oauth2 specs: omniauth-azure-oauth2 (0.0.10) jwt (>= 1.0, < 3.0) @@ -46,7 +62,7 @@ PATH omniauth-oauth2 (~> 1.4) PATH - remote: omniauth-cas3 + remote: vendor/gems/omniauth-cas3 specs: omniauth-cas3 (1.1.4) addressable (~> 2.3) @@ -54,30 +70,21 @@ PATH omniauth (~> 2.0) PATH - remote: omniauth-gitlab + remote: vendor/gems/omniauth-gitlab specs: omniauth-gitlab (4.0.0) omniauth (~> 2.0) - omniauth-oauth2 (~> 1.7.1) + omniauth-oauth2 (~> 1.8) PATH - remote: omniauth-google-oauth2 - specs: - omniauth-google-oauth2 (1.0.1) - jwt (>= 2.0) - oauth2 (~> 2.0) - omniauth (~> 2.0) - omniauth-oauth2 (~> 1.7.1) - -PATH - remote: omniauth-salesforce + remote: vendor/gems/omniauth-salesforce specs: omniauth-salesforce (1.0.5) omniauth (~> 2.0) omniauth-oauth2 (~> 1.0) PATH - remote: omniauth_crowd + remote: vendor/gems/omniauth_crowd specs: omniauth_crowd (2.4.0) activesupport @@ -87,6 +94,8 @@ PATH GEM remote: https://rubygems.org/ specs: + CFPropertyList (3.0.5) + rexml RedCloth (4.3.2) acme-client (2.0.11) faraday (>= 1.0, < 3.0.0) @@ -155,14 +164,18 @@ GEM zeitwerk (~> 2.3) acts-as-taggable-on (9.0.0) activerecord (>= 6.0, < 7.1) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) aes_key_wrap (1.1.0) akismet (3.0.0) android_key_attestation (0.3.0) apollo_upload_server (2.1.0) actionpack (>= 4.2) graphql (>= 1.8) + app_store_connect (0.29.0) + activesupport (>= 6.0.0) + jwt (>= 1.4, <= 2.5.0) + arr-pm (0.0.12) asana (0.10.13) faraday (~> 1.0) faraday_middleware (~> 1.0) @@ -171,38 +184,36 @@ GEM asciidoctor (2.0.17) asciidoctor-include-ext (0.4.0) asciidoctor (>= 1.5.6, < 3.0.0) - asciidoctor-kroki (0.5.0) + asciidoctor-kroki (0.7.0) asciidoctor (~> 2.0) asciidoctor-plantuml (0.0.16) asciidoctor (>= 2.0.17, < 3.0.0) ast (2.4.2) atlassian-jwt (0.2.0) jwt (~> 2.1.0) - attr_encrypted (3.1.0) - encryptor (~> 3.0.0) attr_required (1.0.1) autoprefixer-rails (10.2.5.1) execjs (> 0) awesome_print (1.9.2) awrence (1.1.1) aws-eventstream (1.2.0) - aws-partitions (1.600.0) + aws-partitions (1.674.0) aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.131.1) + aws-sdk-core (3.168.4) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.57.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-kms (1.61.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.114.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-s3 (1.117.2) + aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.0) + aws-sigv4 (1.5.1) aws-eventstream (~> 1, >= 1.0.2) azure-storage-blob (2.0.3) azure-storage-common (~> 2.0) @@ -220,22 +231,22 @@ GEM benchmark (0.2.0) benchmark-ips (2.3.0) benchmark-malloc (0.2.0) - benchmark-memory (0.1.2) - memory_profiler (~> 0.9) + benchmark-memory (0.2.0) + memory_profiler (~> 1) benchmark-perf (0.6.0) benchmark-trend (0.4.0) better_errors (2.9.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - bindata (2.4.10) + bindata (2.4.11) binding_ninja (0.2.3) - bootsnap (1.13.0) + bootsnap (1.15.0) msgpack (~> 1.2) bootstrap_form (4.2.0) actionpack (>= 5.0) activemodel (>= 5.0) - browser (4.2.0) + browser (5.3.1) builder (3.2.4) bullet (7.0.2) activesupport (>= 3.0.0) @@ -282,27 +293,26 @@ GEM open4 (~> 1.3) coderay (1.1.3) colored2 (3.1.2) - commonmarker (0.23.4) + commonmarker (0.23.6) concurrent-ruby (1.1.10) - connection_pool (2.2.5) - contracts (0.11.0) + connection_pool (2.3.0) cork (0.3.0) colored2 (~> 3.1) cose (1.0.0) cbor (~> 0.5.9) openssl-signature_algorithm (~> 0.4.0) - countries (3.0.0) - i18n_data (~> 0.8.0) + countries (4.0.1) + i18n_data (~> 0.13.0) sixarm_ruby_unaccent (~> 1.1) - unicode_utils (~> 1.4) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.6) creole (0.5.0) crystalball (0.7.0) git - css_parser (1.11.0) + css_parser (1.12.0) addressable + cvss-suite (3.0.1) danger (8.6.1) claide (~> 1.0) claide-plugins (>= 0.9.2) @@ -321,7 +331,7 @@ GEM gitlab (~> 4.2, >= 4.2.0) database_cleaner (1.7.0) dead_end (3.1.1) - deckar01-task_list (2.3.1) + deckar01-task_list (2.3.2) html-pipeline declarative (0.0.20) declarative-option (0.1.0) @@ -330,7 +340,7 @@ GEM activerecord (>= 3.2.0, < 7.0) deprecation_toolkit (1.5.1) activesupport (>= 4.2) - derailed_benchmarks (2.1.1) + derailed_benchmarks (2.1.2) benchmark-ips (~> 2) dead_end get_process_mem (~> 0) @@ -363,11 +373,11 @@ GEM docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.5.0.rc2) + doorkeeper (5.5.4) railties (>= 5) - doorkeeper-openid_connect (1.7.5) - doorkeeper (>= 5.2, < 5.5) - json-jwt (>= 1.11.0) + doorkeeper-openid_connect (1.8.3) + doorkeeper (>= 5.5, < 5.7) + json-jwt (>= 1.15.0) dotenv (2.7.6) dry-configurable (0.12.0) concurrent-ruby (~> 1.0) @@ -412,7 +422,7 @@ GEM launchy (~> 2.1) mail (~> 2.7) encryptor (3.0.0) - erubi (1.9.0) + erubi (1.11.0) escape_utils (1.2.1) et-orbi (1.2.7) tzinfo @@ -420,6 +430,8 @@ GEM ffi (>= 1.15.0) excon (0.90.0) execjs (2.8.1) + expgen (0.1.1) + parslet expression_parser (0.9.0) extended-markdown-filter (0.6.0) html-pipeline (~> 2.0) @@ -446,7 +458,7 @@ GEM faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) - faraday-http-cache (2.4.0) + faraday-http-cache (2.4.1) faraday (>= 0.8) faraday-httpclient (1.0.1) faraday-multipart (1.0.4) @@ -482,15 +494,12 @@ GEM flipper-active_support_cache_store (0.25.0) activesupport (>= 4.2, < 8) flipper (~> 0.25.0) - flowdock (0.7.1) - httparty (~> 0.7) - multi_json fog-aliyun (0.3.3) fog-core fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.14.0) + fog-aws (3.15.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -499,16 +508,22 @@ GEM excon (~> 0.58) formatador (~> 0.2) mime-types - fog-google (1.15.0) - fog-core (<= 2.1.0) + fog-google (1.19.0) + fog-core (< 2.3) fog-json (~> 1.2) fog-xml (~> 0.1.0) - google-api-client (>= 0.44.2, < 0.51) + google-apis-compute_v1 (~> 0.14) + google-apis-dns_v1 (~> 0.12) + google-apis-iamcredentials_v1 (~> 0.6) + google-apis-monitoring_v3 (~> 0.12) + google-apis-pubsub_v1 (~> 0.7) + google-apis-sqladmin_v1beta4 (~> 0.13) + google-apis-storage_v1 (~> 0.6) google-cloud-env (~> 1.2) fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-local (0.6.0) + fog-local (0.8.0) fog-core (>= 1.27, < 3.0) fog-openstack (1.0.8) fog-core (~> 2.1) @@ -531,6 +546,7 @@ GEM ruby-progressbar (~> 1.4) fuzzyurl (0.9.0) gemoji (3.0.1) + gems (1.2.0) get_process_mem (0.2.7) ffi (~> 1.0) gettext (3.3.6) @@ -545,36 +561,35 @@ GEM rails (>= 3.2.0) git (1.11.0) rchardet (~> 1.8) - gitaly (15.4.0.pre.rc2) + gitaly (15.5.2) grpc (~> 1.0) - github-markup (1.7.0) - gitlab (4.16.1) - httparty (~> 0.14, >= 0.14.0) - terminal-table (~> 1.5, >= 1.5.1) + gitlab (4.19.0) + httparty (~> 0.20) + terminal-table (>= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.5.2) + gitlab-dangerfiles (3.6.4) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) rake gitlab-experiment (0.7.1) activesupport (>= 3.0) request_store (>= 1.0) - gitlab-fog-azure-rm (1.3.0) + gitlab-fog-azure-rm (1.4.0) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) fog-core (= 2.1.0) fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.24.0) + gitlab-labkit (0.29.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) jaeger-client (~> 1.1.0) opentracing (~> 0.4) pg_query (~> 2.1) - redis (> 3.0.0, < 5.0.0) + redis (> 3.0.0, < 6.0.0) gitlab-license (2.2.1) gitlab-mail_room (0.0.9) gitlab-markup (1.8.1) @@ -583,15 +598,16 @@ GEM addressable (~> 2.7) omniauth (>= 1.9, < 3) openid_connect (~> 1.2) - gitlab-sidekiq-fetcher (0.8.0) + gitlab-sidekiq-fetcher (0.9.0) + json (>= 2.5) sidekiq (~> 6.1) - gitlab-styles (8.0.0) - rubocop (~> 0.91, >= 0.91.1) + gitlab-styles (9.2.0) + rubocop (~> 1.38.0) rubocop-gitlab-security (~> 0.1.1) - rubocop-graphql (~> 0.10) - rubocop-performance (~> 1.9.2) - rubocop-rails (~> 2.9) - rubocop-rspec (~> 1.44) + rubocop-graphql (~> 0.14) + rubocop-performance (~> 1.14) + rubocop-rails (~> 2.15) + rubocop-rspec (~> 2.15) gitlab_chronic_duration (0.10.6.2) numerizer (~> 0.2) gitlab_omniauth-ldap (2.2.0) @@ -606,29 +622,54 @@ GEM i18n (>= 0.7) multi_json request_store (>= 1.0) - google-api-client (0.50.0) + google-api-client (0.53.0) + google-apis-core (~> 0.1) + google-apis-generator (~> 0.1) + google-apis-compute_v1 (0.53.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-core (0.9.1) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.9) - httpclient (>= 2.8.1, < 3.0) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) mini_mime (~> 1.0) representable (~> 3.0) - retriable (>= 2.0, < 4.0) + retriable (>= 2.0, < 4.a) rexml - signet (~> 0.12) + webrick + google-apis-discovery_v1 (0.12.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-dns_v1 (0.28.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-generator (0.11.0) + activesupport (>= 5.0) + gems (~> 1.2) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-discovery_v1 (~> 0.5) + thor (>= 0.20, < 2.a) + google-apis-iamcredentials_v1 (0.15.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-monitoring_v3 (0.37.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-pubsub_v1 (0.30.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-sqladmin_v1beta4 (0.38.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-storage_v1 (0.20.0) + google-apis-core (>= 0.9.1, < 2.a) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-protobuf (3.21.5) + google-protobuf (3.21.12) googleapis-common-protos-types (1.3.0) google-protobuf (~> 3.14) - googleauth (0.14.0) - faraday (>= 0.17.3, < 2.0) + googleauth (1.3.0) + faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.14) - gpgme (2.0.20) - mini_portile2 (~> 2.3) + signet (>= 0.16, < 2.a) + gpgme (2.0.22) + mini_portile2 (~> 2.7) grape (1.5.2) activesupport builder @@ -644,6 +685,11 @@ GEM grape (~> 1.3) rake (> 12) ruby2_keywords (~> 0.0.2) + grape-swagger (1.5.0) + grape (~> 1.3) + grape-swagger-entity (0.5.1) + grape-entity (>= 0.6.0) + grape-swagger (>= 1.2.0) grape_logging (1.8.4) grape rack @@ -702,43 +748,42 @@ GEM hana (1.3.7) hangouts-chat (0.0.5) hashdiff (1.0.1) - hashie (4.1.0) - hashie-forbidden_attributes (0.1.1) - hashie (>= 3.0) - health_check (3.0.0) + hashie (5.0.0) + health_check (3.1.0) railties (>= 5.0) heapy (0.2.0) thor - html-pipeline (2.13.2) + html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) html2text (0.2.0) nokogiri (~> 1.6) htmlbeautifier (1.4.2) htmlentities (4.3.4) - http (4.4.1) - addressable (~> 2.3) + http (5.1.0) + addressable (~> 2.8) http-cookie (~> 1.0) http-form_data (~> 2.2) - http-parser (~> 1.2.0) + llhttp-ffi (~> 0.4.0) http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - http-parser (1.2.3) - ffi-compiler (>= 1.0, < 2.0) - httparty (0.16.4) + httparty (0.20.0) mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) i18n (1.12.0) concurrent-ruby (~> 1.0) - i18n_data (0.8.0) - icalendar (2.4.1) + i18n_data (0.13.1) + icalendar (2.8.0) + ice_cube (~> 0.16) + ice_cube (0.16.4) imagen (0.1.8) parser (>= 2.5, != 2.5.1.1) - invisible_captcha (1.1.0) - rails (>= 4.2) + invisible_captcha (2.0.0) + rails (>= 5.0) + ipaddr (1.2.2) ipaddress (0.8.3) jaeger-client (1.1.0) opentracing (~> 0.3) @@ -749,16 +794,17 @@ GEM atlassian-jwt multipart-post oauth (~> 0.5, >= 0.5.0) - jmespath (1.6.1) - js_regex (3.7.0) + jmespath (1.6.2) + js_regex (3.8.0) character_set (~> 1.4) - regexp_parser (~> 2.1) + regexp_parser (~> 2.5) regexp_property_values (~> 1.0) json (2.5.1) - json-jwt (1.13.0) + json-jwt (1.15.3) activesupport (>= 4.2) aes_key_wrap bindata + httpclient json_schemer (0.2.18) ecma-re-validator (~> 0.3) hana (~> 1.3) @@ -767,18 +813,18 @@ GEM jsonpath (1.1.2) multi_json jwt (2.1.0) - kaminari (1.2.1) + kaminari (1.2.2) activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.1) - kaminari-activerecord (= 1.2.1) - kaminari-core (= 1.2.1) - kaminari-actionview (1.2.1) + kaminari-actionview (= 1.2.2) + kaminari-activerecord (= 1.2.2) + kaminari-core (= 1.2.2) + kaminari-actionview (1.2.2) actionview - kaminari-core (= 1.2.1) - kaminari-activerecord (1.2.1) + kaminari-core (= 1.2.2) + kaminari-activerecord (1.2.2) activerecord - kaminari-core (= 1.2.1) - kaminari-core (1.2.1) + kaminari-core (= 1.2.2) + kaminari-core (1.2.2) kas-grpc (0.0.2) grpc (~> 1.0) knapsack (1.21.1) @@ -787,14 +833,9 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - kubeclient (4.9.3) - http (>= 3.0, < 5.0) - jsonpath (~> 1.0) - recursive-open-struct (~> 1.1, >= 1.1.1) - rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.1.1) + lefthook (1.2.7) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -819,37 +860,42 @@ GEM listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + llhttp-ffi (0.4.0) + ffi-compiler (~> 1.0) + rake (~> 13.0) locale (2.1.3) - lockbox (0.6.2) + lockbox (1.1.1) lograge (0.11.2) actionpack (>= 4) activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.18.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - lookbook (1.0.3) + lookbook (1.4.5) actioncable + activemodel css_parser htmlbeautifier (~> 1.3) htmlentities (~> 4.3.4) listen (~> 3.0) railties (>= 5.0) redcarpet (~> 3.5) - rouge (~> 3.26) + rouge (>= 3.26, < 5.0) view_component (~> 2.0) yard (~> 0.9.25) + zeitwerk (~> 2.5) lru_redux (1.1.0) lumberjack (1.2.7) mail (2.7.1) mini_mime (>= 0.1.1) marcel (1.0.2) - marginalia (1.10.0) - actionpack (>= 2.3) - activerecord (>= 2.3) + marginalia (1.11.1) + actionpack (>= 5.2) + activerecord (>= 5.2) memoist (0.16.2) - memory_profiler (0.9.14) + memory_profiler (1.0.1) method_source (1.0.0) mime-types (3.4.1) mime-types-data (~> 3.2015) @@ -887,7 +933,7 @@ GEM nenv (0.3.0) net-http-persistent (4.0.1) connection_pool (~> 2.2) - net-ldap (0.16.3) + net-ldap (0.17.1) net-ntp (2.1.3) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) @@ -895,7 +941,7 @@ GEM netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.13.8) + nokogiri (1.13.10) mini_portile2 (~> 2.8.0) racc (~> 1.4) notiffany (0.1.3) @@ -903,13 +949,13 @@ GEM shellany (~> 0.0) numerizer (0.2.0) oauth (0.5.6) - oauth2 (2.0.3) + oauth2 (2.0.9) faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) multi_xml (~> 0.5) - rack (>= 1.2, < 3) - rash_alt (>= 0.4, < 1) - version_gem (~> 1.0) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0) + version_gem (~> 1.1) octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) @@ -926,13 +972,15 @@ GEM plist (~> 3.1) train-core wmi-lite (~> 1.0) - oj (3.13.21) + oj (3.13.23) + oj-introspect (0.7.1) + oj (>= 3.13.23) omniauth (2.1.0) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection - omniauth-alicloud (1.0.1) - omniauth-oauth2 (~> 1.7.1) + omniauth-alicloud (2.0.0) + omniauth-oauth2 (~> 1.8) omniauth-atlassian-oauth2 (0.2.0) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.5) @@ -941,26 +989,29 @@ GEM omniauth-authentiq (0.3.3) jwt (>= 1.5) omniauth-oauth2 (>= 1.5) - omniauth-azure-activedirectory-v2 (1.0.0) - omniauth-oauth2 (~> 1.7) + omniauth-azure-activedirectory-v2 (2.0.0) + omniauth-oauth2 (~> 1.8) omniauth-dingtalk-oauth2 (1.0.1) omniauth-oauth2 (~> 1.7) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) - omniauth-github (2.0.0) + omniauth-github (2.0.1) omniauth (~> 2.0) - omniauth-oauth2 (~> 1.7.1) + omniauth-oauth2 (~> 1.8) + omniauth-google-oauth2 (1.1.1) + jwt (>= 2.0) + oauth2 (~> 2.0.6) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.8.0) omniauth-oauth (1.2.0) oauth omniauth (>= 1.0, < 3) - omniauth-oauth2 (1.7.3) + omniauth-oauth2 (1.8.0) oauth2 (>= 1.4, < 3) - omniauth (>= 1.9, < 3) - omniauth-oauth2-generic (0.2.2) - omniauth-oauth2 (~> 1.0) - omniauth-rails_csrf_protection (1.0.1) - actionpack (>= 4.2) omniauth (~> 2.0) + omniauth-oauth2-generic (0.2.8) + omniauth-oauth2 (~> 1.0) + rake omniauth-saml (2.0.0) omniauth (~> 2.0) ruby-saml (~> 1.9) @@ -980,7 +1031,8 @@ GEM validate_email validate_url webfinger (>= 1.0.1) - openssl (2.2.0) + openssl (2.2.2) + ipaddr openssl-signature_algorithm (0.4.0) opentracing (0.5.0) optimist (3.0.1) @@ -988,39 +1040,39 @@ GEM rubypants (~> 0.2) orm_adapter (0.5.0) os (1.1.1) - pact (1.59.0) + pact (1.63.0) pact-mock_service (~> 3.0, >= 3.3.1) - pact-support (~> 1.15) - rack-test (>= 0.6.3, < 2.0.0) + pact-support (~> 1.16, >= 1.16.9) + rack-test (>= 0.6.3, < 3.0.0) rspec (~> 3.0) term-ansicolor (~> 1.0) thor (>= 0.20, < 2.0) webrick (~> 1.3) - pact-mock_service (3.6.2) + pact-mock_service (3.10.0) filelock (~> 1.1) find_a_port (~> 1.0.1) json - pact-support (~> 1.12, >= 1.12.0) + pact-support (~> 1.16, >= 1.16.4) rack (~> 2.0) rspec (>= 2.14) term-ansicolor (~> 1.0) thor (>= 0.19, < 2.0) webrick (~> 1.3) - pact-support (1.15.1) - awesome_print (~> 1.1) - randexp (~> 0.1.7) - rspec (>= 2.14) - term-ansicolor (~> 1.0) + pact-support (1.18.1) + awesome_print (~> 1.9) + diff-lcs (~> 1.4) + expgen (~> 0.1) + rainbow (~> 3.1.1) parallel (1.22.1) - parser (3.1.2.1) + parser (3.1.3.0) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) - pg (1.4.3) - pg_query (2.1.4) + pg (1.4.5) + pg_query (2.2.0) google-protobuf (>= 3.19.2) plist (3.6.0) png_quantizator (0.2.1) @@ -1037,7 +1089,7 @@ GEM coderay parser unparser - prometheus-client-mmap (0.16.2) + prometheus-client-mmap (0.17.0) pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) @@ -1050,7 +1102,7 @@ GEM pry (~> 0.13.0) tty-markdown tty-prompt - public_suffix (4.0.7) + public_suffix (5.0.0) puma (5.6.5) nio4r (~> 2.0) puma_worker_killer (0.3.1) @@ -1058,15 +1110,15 @@ GEM puma (>= 2.7) pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) - racc (1.6.0) - rack (2.2.4) + racc (1.6.1) + rack (2.2.6.2) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.6.1) rack (>= 1.0, < 3) rack-cors (1.1.1) rack (>= 2.0.0) - rack-oauth2 (1.21.2) + rack-oauth2 (1.21.3) activesupport attr_required httpclient @@ -1074,11 +1126,11 @@ GEM rack (>= 2.1.0) rack-protection (2.2.2) rack - rack-proxy (0.7.2) + rack-proxy (0.7.6) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) - rack-timeout (0.6.0) + rack-test (2.0.2) + rack (>= 1.3) + rack-timeout (0.6.3) rails (6.1.6.1) actioncable (= 6.1.6.1) actionmailbox (= 6.1.6.1) @@ -1101,8 +1153,8 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) + rails-html-sanitizer (1.4.4) + loofah (~> 2.19, >= 2.19.1) rails-i18n (7.0.3) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) @@ -1114,9 +1166,6 @@ GEM thor (~> 1.0) rainbow (3.1.1) rake (13.0.6) - randexp (0.1.7) - rash_alt (0.4.12) - hashie (>= 3.4) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) @@ -1127,24 +1176,24 @@ GEM rbtree (0.4.4) rchardet (1.8.0) rdoc (6.3.2) - re2 (1.4.0) - recaptcha (4.13.1) + re2 (1.6.0) + recaptcha (5.12.3) json recursive-open-struct (1.1.3) redcarpet (3.5.1) - redis (4.7.1) + redis (4.8.0) redis-actionpack (5.3.0) actionpack (>= 5, < 8) redis-rack (>= 2.1.0, < 3) redis-store (>= 1.1.0, < 2) - redis-namespace (1.8.1) - redis (>= 3.0.4) + redis-namespace (1.9.0) + redis (>= 4) redis-rack (2.1.4) rack (>= 2.0.8, < 3) redis-store (>= 1.2, < 2) redis-store (1.9.1) redis (>= 4, < 5) - regexp_parser (2.5.0) + regexp_parser (2.6.0) regexp_property_values (1.0.0) representable (3.0.4) declarative (< 0.1.0) @@ -1180,7 +1229,7 @@ GEM benchmark-perf (~> 0.6) benchmark-trend (~> 0.4) rspec (>= 3.0) - rspec-core (3.10.1) + rspec-core (3.10.2) rspec-support (~> 3.10.0) rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) @@ -1204,44 +1253,44 @@ GEM rspec-support (~> 3.10) rspec-retry (0.6.1) rspec-core (> 3.3) - rspec-support (3.10.2) - rspec_junit_formatter (0.4.1) + rspec-support (3.10.3) + rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rspec_profiling (0.0.6) activerecord pg rails sqlite3 - rubocop (0.93.1) + rubocop (1.38.0) + json (~> 2.3) parallel (~> 1.10) - parser (>= 2.7.1.5) + parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8) - rexml - rubocop-ast (>= 0.6.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.23.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.21.0) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.23.0) parser (>= 3.1.1.0) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-graphql (0.14.6) + rubocop-graphql (0.18.0) rubocop (>= 0.87, < 2) - rubocop-performance (1.9.2) - rubocop (>= 0.90.0, < 2.0) + rubocop-performance (1.15.1) + rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.9.1) + rubocop-rails (2.17.3) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.90.0, < 2.0) - rubocop-rspec (1.44.1) - rubocop (~> 0.87) - rubocop-ast (>= 0.7.1) - ruby-fogbugz (0.2.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-rspec (2.16.0) + rubocop (~> 1.33) + ruby-fogbugz (0.3.0) crack (~> 0.4) + multipart-post (~> 2.0) 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) @@ -1276,7 +1325,7 @@ GEM sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - sd_notify (0.1.0) + sd_notify (0.1.1) securecompare (1.0.0) seed-fu (2.3.7) activerecord (>= 3.1) @@ -1303,11 +1352,11 @@ GEM shellany (0.0.1) shoulda-matchers (5.1.0) activesupport (>= 5.2.0) - sidekiq (6.4.2) - connection_pool (>= 2.2.2) + sidekiq (6.5.7) + connection_pool (>= 2.2.5) rack (~> 2.0) - redis (>= 4.2.0) - sidekiq-cron (1.4.0) + redis (>= 4.5.0, < 5) + sidekiq-cron (1.8.0) fugit (~> 1) sidekiq (>= 4.2.1) sigdump (0.2.4) @@ -1328,9 +1377,11 @@ GEM simplecov_json_formatter (0.1.4) sixarm_ruby_unaccent (1.2.0) slack-messenger (2.3.4) - snowplow-tracker (0.6.1) - contracts (~> 0.7, <= 0.11) - solargraph (0.46.0) + snaky_hash (2.0.0) + hashie + version_gem (~> 1.1) + snowplow-tracker (0.8.0) + solargraph (0.47.2) backport (~> 1.2) benchmark bundler (>= 1.17.2) @@ -1350,7 +1401,7 @@ GEM set (~> 1.0) spamcheck (1.0.0) grpc (~> 1.0) - spring (2.1.1) + spring (4.1.0) spring-commands-rspec (1.0.4) spring (>= 0.9.1) sprite-factory (1.7.1) @@ -1386,11 +1437,15 @@ GEM ffi (~> 1.1) sysexits (1.2.0) tanuki_emoji (0.6.0) + telesign (2.2.4) + net-http-persistent (>= 3.0.0, < 5.0) + telesignenterprise (2.2.2) + telesign (~> 2.2.3) temple (0.8.2) term-ansicolor (1.7.1) tins (~> 1.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) terser (1.0.2) execjs (>= 0.3.0, < 3) test-prof (1.0.7) @@ -1399,13 +1454,12 @@ GEM text (1.3.1) thor (1.2.1) thrift (0.16.0) - tilt (2.0.10) - timecop (0.9.1) + tilt (2.0.11) timeliness (0.3.10) timfel-krb5-auth (0.8.3) - tins (1.31.0) + tins (1.31.1) sync - toml-rb (2.0.1) + toml-rb (2.2.0) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) tpm-key_attestation (0.9.0) @@ -1472,9 +1526,9 @@ GEM validates_hostname (1.0.11) activerecord (>= 3.0) activesupport (>= 3.0) - version_gem (1.0.0) - version_sorter (2.2.4) - view_component (2.71.0) + version_gem (1.1.0) + version_sorter (2.3.0) + view_component (2.74.1) activesupport (>= 5.0.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1516,12 +1570,13 @@ GEM nokogiri (~> 1.8) yajl-ruby (1.4.3) yard (0.9.26) - zeitwerk (2.6.0) + zeitwerk (2.6.6) PLATFORMS ruby DEPENDENCIES + CFPropertyList RedCloth (~> 4.3.2) acme-client (~> 2.0) activerecord-explain-analyze (~> 0.1) @@ -1529,18 +1584,20 @@ DEPENDENCIES addressable (~> 2.8) akismet (~> 3.0) apollo_upload_server (~> 2.1.0) + app_store_connect + arr-pm (~> 0.0.12) asana (~> 0.10.13) asciidoctor (~> 2.0.17) asciidoctor-include-ext (~> 0.4.0) - asciidoctor-kroki (~> 0.5.0) + asciidoctor-kroki (~> 0.7.0) asciidoctor-plantuml (~> 0.0.16) atlassian-jwt (~> 0.2.0) - attr_encrypted (~> 3.1.0) + attr_encrypted (~> 3.2.4)! autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.131.0) - aws-sdk-s3 (~> 1.114.0) + aws-sdk-core (~> 3.168.4) + aws-sdk-s3 (~> 1.117.2) babosa (~> 1.0.4) base32 (~> 0.3.0) batch-loader (~> 2.0.1) @@ -1548,9 +1605,9 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) better_errors (~> 2.9.1) - bootsnap (~> 1.13.0) + bootsnap (~> 1.15.0) bootstrap_form (~> 4.2.0) - browser (~> 4.2) + browser (~> 5.3.1) bullet (~> 7.0.2) bundler-audit (~> 0.7.0.1) bundler-checksum (~> 0.1.0)! @@ -1558,14 +1615,15 @@ DEPENDENCIES capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) - commonmarker (~> 0.23.4) + commonmarker (~> 0.23.6) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) - countries (~> 3.0) + countries (~> 4.0.0) creole (~> 0.5.0) crystalball (~> 0.7.0) + cvss-suite (~> 3.0.1) database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.3.1) + deckar01-task_list (= 2.3.2) declarative_policy (~> 1.1.0) default_value_for (~> 3.4.0) deprecation_toolkit (~> 1.5.1) @@ -1577,8 +1635,8 @@ DEPENDENCIES diff_match_patch (~> 0.1.0) diffy (~> 3.4) discordrb-webhooks (~> 3.4) - doorkeeper (~> 5.5.0.rc2) - doorkeeper-openid_connect (~> 1.7.5) + doorkeeper (~> 5.5) + doorkeeper-openid_connect (~> 1.8) ed25519 (~> 1.3.0) elasticsearch-api (= 7.13.3) elasticsearch-model (~> 7.2) @@ -1586,8 +1644,6 @@ DEPENDENCIES email_reply_trimmer (~> 0.1) email_spec (~> 2.2.0) error_tracking_open_api! - erubi (~> 1.9.0) - escape_utils (~> 1.1) factory_bot_rails (~> 6.2.0) faraday (~> 1.0) faraday_middleware-aws-sigv4 (~> 0.3.0) @@ -1596,12 +1652,11 @@ DEPENDENCIES flipper (~> 0.25.0) flipper-active_record (~> 0.25.0) flipper-active_support_cache_store (~> 0.25.0) - flowdock (~> 0.7) fog-aliyun (~> 0.3) - fog-aws (~> 3.14) + fog-aws (~> 3.15) fog-core (= 2.1.0) - fog-google (~> 1.15) - fog-local (~> 0.6) + fog-google (~> 1.19) + fog-local (~> 0.8) fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) fugit (~> 1.2.1) @@ -1609,29 +1664,30 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 15.4.0.pre.rc2) - github-markup (~> 1.7.0) + gitaly (~> 15.5.2) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.5.2) + gitlab-dangerfiles (~> 3.6.4) gitlab-experiment (~> 0.7.1) - gitlab-fog-azure-rm (~> 1.3.0) - gitlab-labkit (~> 0.24.0) + gitlab-fog-azure-rm (~> 1.4.0) + gitlab-labkit (~> 0.29.0) gitlab-license (~> 2.2.1) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.8.0) gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.10.0) - gitlab-sidekiq-fetcher (= 0.8.0) - gitlab-styles (~> 8.0.0) + gitlab-sidekiq-fetcher (= 0.9.0) + gitlab-styles (~> 9.2.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.2.0) gon (~> 6.4.0) google-api-client (~> 0.33) - google-protobuf (~> 3.21) - gpgme (~> 2.0.19) + google-protobuf (~> 3.21, >= 3.21.12) + gpgme (~> 2.0.22) grape (~> 1.5.2) grape-entity (~> 0.10.0) grape-path-helpers (~> 1.7.1) + grape-swagger (~> 1.5.0) + grape-swagger-entity (~> 0.5.1) grape_logging (~> 1.8) graphiql-rails (~> 1.8) graphlient (~> 0.5.0) @@ -1644,103 +1700,105 @@ DEPENDENCIES haml_lint (~> 0.40.0) hamlit (~> 2.15.0) hangouts-chat (~> 0.0.5) - hashie - hashie-forbidden_attributes + hashie (~> 5.0.0) health_check (~> 3.0) - html-pipeline (~> 2.13.2) + html-pipeline (~> 2.14.3) html2text - httparty (~> 0.16.4) + httparty (~> 0.20.0) icalendar - invisible_captcha (~> 1.1.0) + invisible_captcha (~> 2.0.0) + ipaddr (= 1.2.2) ipaddress (~> 0.8.3) ipynbdiff! jira-ruby (~> 2.1.4) - js_regex (~> 3.7) + js_regex (~> 3.8) json (~> 2.5.1) json_schemer (~> 0.2.18) jwt (~> 2.1.0) - kaminari (~> 1.0) + kaminari (~> 1.2.2) kas-grpc (~> 0.0.2) knapsack (~> 1.21.1) kramdown (~> 2.3.1) - kubeclient (~> 4.9.3) - lefthook (~> 1.1.1) + kubeclient (~> 4.9.3)! + lefthook (~> 1.2.7) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.15) - lockbox (~> 0.6.2) + listen (~> 3.7) + lockbox (~> 1.1.1) lograge (~> 0.5) - loofah (~> 2.18.0) - lookbook (~> 1.0) + loofah (~> 2.19.1) + lookbook (~> 1.4, >= 1.4.5) lru_redux mail (= 2.7.1) mail-smtp_pool (~> 0.1.0)! - marginalia (~> 1.10.0) - memory_profiler (~> 0.9) + marginalia (~> 1.11.1) + memory_profiler (~> 1.0) microsoft_graph_mailer (~> 0.1.0)! mini_magick (~> 4.10.1) minitest (~> 5.11.0) multi_json (~> 1.14.1) - net-ldap (~> 0.16.3) + net-ldap (~> 0.17.1) net-ntp - nokogiri (~> 1.13.8) + nokogiri (~> 1.13.10) oauth2 (~> 2.0) octokit (~> 4.15) ohai (~> 16.10) oj (~> 3.13.21) + oj-introspect (~> 0.7) omniauth (~> 2.1.0) - omniauth-alicloud (~> 1.0.1) + omniauth-alicloud (~> 2.0.0) omniauth-atlassian-oauth2 (~> 0.2.0) omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.3) - omniauth-azure-activedirectory-v2 (~> 1.0) + omniauth-azure-activedirectory-v2 (~> 2.0) omniauth-azure-oauth2 (~> 0.0.9)! omniauth-cas3 (~> 1.1.4)! omniauth-dingtalk-oauth2 (~> 1.0) omniauth-facebook (~> 4.0.0) - omniauth-github (= 2.0.0) + omniauth-github (= 2.0.1) omniauth-gitlab (~> 4.0.0)! - omniauth-google-oauth2 (~> 1.0.1)! + omniauth-google-oauth2 (~> 1.1) omniauth-oauth2-generic (~> 0.2.2) - omniauth-rails_csrf_protection omniauth-salesforce (~> 1.0.5)! omniauth-saml (~> 2.0.0) omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0)! + openssl (= 2.2.2) org-ruby (~> 0.9.12) - pact (~> 1.12) + pact (~> 1.63) parallel (~> 1.19) parslet (~> 1.8) peek (~> 1.1) - pg (~> 1.4.0) - pg_query (~> 2.1.0) + pg (~> 1.4.5) + pg_query (~> 2.2) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) - prometheus-client-mmap (~> 0.16) + prometheus-client-mmap (~> 0.17) pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.5.1) puma (~> 5.6.5) puma_worker_killer (~> 0.3.1) - rack (~> 2.2.4) - rack-attack (~> 6.6.0) - rack-cors (~> 1.1.0) - rack-oauth2 (~> 1.21.2) - rack-proxy (~> 0.7.2) - rack-timeout (~> 0.6.0) + rack (~> 2.2.6, >= 2.2.6.2) + rack-attack (~> 6.6.1) + rack-cors (~> 1.1.1) + rack-oauth2 (~> 1.21.3) + rack-proxy (~> 0.7.6) + rack-timeout (~> 0.6.3) rails (~> 6.1.6.1) rails-controller-testing rails-i18n (~> 7.0) rainbow (~> 3.0) rbtrace (~> 0.4) rdoc (~> 6.3.2) - re2 (~> 1.4.0) - recaptcha (~> 4.11) - redis (~> 4.7.0) + re2 (~> 1.6.0) + recaptcha (~> 5.12) + redis (~> 4.8.0) redis-actionpack (~> 5.3.0) - redis-namespace (~> 1.8.1) - request_store (~> 1.5) + redis-namespace (~> 1.9.0) + request_store (~> 1.5.1) responders (~> 3.0) retriable (~> 3.1.2) rexml (~> 3.2.5) @@ -1753,9 +1811,8 @@ DEPENDENCIES rspec_junit_formatter rspec_profiling (~> 0.0.6) rubocop - ruby-fogbugz (~> 0.2.1) + ruby-fogbugz (~> 0.3.0) ruby-magic (~> 0.5) - ruby-prof (~> 1.3.0) ruby-progressbar (~> 1.10) ruby-saml (~> 1.13.0) ruby_parser (~> 3.15) @@ -1772,18 +1829,18 @@ DEPENDENCIES sentry-sidekiq (~> 5.1.1) settingslogic (~> 2.0.9) shoulda-matchers (~> 5.1.0) - sidekiq (~> 6.4.0) - sidekiq-cron (~> 1.4.0) + sidekiq (~> 6.5.7) + sidekiq-cron (~> 1.8.0) sigdump (~> 0.2.4) simple_po_parser (~> 1.1.6) simplecov (~> 0.21) simplecov-cobertura (~> 1.3.1) simplecov-lcov (~> 0.8.0) slack-messenger (~> 2.3.4) - snowplow-tracker (~> 0.6.1) - solargraph (~> 0.46.0) + snowplow-tracker (~> 0.8.0) + solargraph (~> 0.47.2) spamcheck (~> 1.0.0) - spring (~> 2.1.0) + spring (~> 4.1.0) spring-commands-rspec (~> 1.0.4) sprite-factory (~> 1.7) sprockets (~> 3.7.0) @@ -1792,13 +1849,13 @@ DEPENDENCIES state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.4.3) tanuki_emoji (~> 0.6) + telesignenterprise (~> 2.2) terser (= 1.0.2) test-prof (~> 1.0.7) test_file_finder (~> 0.1.3) thrift (>= 0.16.0) - timecop (~> 0.9.1) timfel-krb5-auth (~> 0.8) - toml-rb (~> 2.0) + toml-rb (~> 2.2.0) truncato (~> 0.7.12) typhoeus (~> 1.4.0) u2f (~> 0.2.1) @@ -1807,8 +1864,8 @@ DEPENDENCIES unleash (~> 3.2.2) valid_email (~> 0.1) validates_hostname (~> 1.0.11) - version_sorter (~> 2.2.4) - view_component (~> 2.71.0) + version_sorter (~> 2.3) + view_component (~> 2.74.1) vmstat (~> 2.3.0) warning (~> 1.3.0) webauthn (~> 2.3) @@ -1818,4 +1875,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.3.15 + 2.3.26 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 6e34481ef6de..269318a0961d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -1,3 +1,4 @@ +src: { acme-client = { dependencies = ["faraday" "faraday-retry"]; @@ -159,10 +160,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; aes_key_wrap = { groups = ["default"]; @@ -205,6 +206,27 @@ }; version = "2.1.0"; }; + app_store_connect = { + dependencies = ["activesupport" "jwt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03s3x8b6ifjrqk9ian59i9yyxxl65ykvbb4r424j2hjsh8iskmq1"; + type = "gem"; + }; + version = "0.29.0"; + }; + arr-pm = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fddw0vwdrr7v3a0lfqbmnd664j48a9psrjd3wh3k4i3flplizzx"; + type = "gem"; + }; + version = "0.0.12"; + }; asana = { dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"]; groups = ["default"]; @@ -243,10 +265,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04jzsicaynwyy4l3w69x1qqww4av57army5xiapvv2b6g5s8nb32"; + sha256 = "08diy3wpmmaw9kabpr2wm908bgv71jj9l7z9fs6fj45fkkjf92jj"; type = "gem"; }; - version = "0.5.0"; + version = "0.7.0"; }; asciidoctor-plantuml = { dependencies = ["asciidoctor"]; @@ -285,11 +307,10 @@ groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ncv2az1zlj33bsllr6q1qdvbw42gv91lxq0ryclbv8l8xh841jg"; - type = "gem"; + path = "${src}/vendor/gems/attr_encrypted"; + type = "path"; }; - version = "3.1.0"; + version = "3.2.4"; }; attr_required = { groups = ["default"]; @@ -347,10 +368,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cx73zazv4jsh51b08jgf7pzn62wmfqlwwg2z8w4rcqbvn326n93"; + sha256 = "0a4inr58vqzqb6g4j09pch55xyhj4kbbl4drsk1apfwhakc70vpr"; type = "gem"; }; - version = "1.600.0"; + version = "1.674.0"; }; aws-sdk-cloudformation = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -369,10 +390,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yiz3aaik62rxhxipwznb2bv8ywha13vdxg9nk6anq9bd0nn0728"; + sha256 = "131acgw2hi893n0dfbczs42bkc41afhyrmd9w8zx5y8r1k5zd6rc"; type = "gem"; }; - version = "3.131.1"; + version = "3.168.4"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -380,10 +401,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m8vwm4cakfv3i4f723a6id07myx18fpdbq8ypa2j7r5njwxpmzz"; + sha256 = "0ajp7yvnf95d60xmg618xznfwsy8h1vrkzj33r1bsf2gsfp50vzy"; type = "gem"; }; - version = "1.57.0"; + version = "1.61.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -391,10 +412,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r6dxz3llgxbbm66jq5mkzk0i6qsxwv0d9s0ipwb23vv3bgp23yf"; + sha256 = "1xpb8c8zw1c0grbw1rcc0ynlys1301vm9kkqy4ls3i2zqk5v6n91"; type = "gem"; }; - version = "1.114.0"; + version = "1.117.2"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -402,10 +423,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z"; + sha256 = "1d4bifmll4hrf4gihr5hdvn59wjpz4qpyg5jj95kp17fykzqg36n"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; azure-storage-blob = { dependencies = ["azure-storage-common" "nokogiri"]; @@ -511,14 +532,14 @@ }; benchmark-memory = { dependencies = ["memory_profiler"]; - groups = ["default"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11qw8k6rl79ri00njrf1x9v6vzwgv12rkcvgzvg0sk8pfrkzwyxa"; + sha256 = "0p5bwqc828yai7h71b7ny77hgd7dll00dy34izp3b5dh6dj467na"; type = "gem"; }; - version = "0.1.2"; + version = "0.2.0"; }; benchmark-perf = { groups = ["default" "test"]; @@ -556,10 +577,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06lqi4svq5qls9f7nnvd2zmjdqmi2sf82sq78ci5d78fq0z5x2vr"; + sha256 = "0shg48ilaxn8ps8arvyb8pr6pqigdmccirks185c306dzychr3n3"; type = "gem"; }; - version = "2.4.10"; + version = "2.4.11"; }; binding_ninja = { groups = ["default" "development" "test"]; @@ -577,10 +598,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y1ycmvyd7swp6gy85m7znwilvb61zzcx6najgq0d1glq0p2hwy6"; + sha256 = "1ln89f9ypzincd5hqgmzd5vvfgf7fgir56v1spsri40ma88vnipj"; type = "gem"; }; - version = "1.13.0"; + version = "1.15.0"; }; bootstrap_form = { dependencies = ["actionpack" "activemodel"]; @@ -598,10 +619,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q1yzvbqp0mykswipq3w00ljw9fgkhjfrij3hkwi7cx85r14n6gw"; + sha256 = "0g4bcpax07kqqr9cp7cjc7i0pcij4nqpn1rdsg2wdwhzf00m6x32"; type = "gem"; }; - version = "4.2.0"; + version = "5.3.1"; }; builder = { groups = ["default" "development" "test"]; @@ -635,6 +656,16 @@ }; version = "0.7.0.1"; }; + bundler-checksum = { + dependencies = []; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/bundler-checksum"; + type = "path"; + }; + version = "0.1.0"; + }; byebug = { groups = ["default" "development" "test"]; platforms = [{ @@ -692,6 +723,17 @@ }; version = "0.5.9.6"; }; + CFPropertyList = { + dependencies = ["rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "193l8r1ycd3dcxa7lsb4pqcghbk56dzc5244m6y8xmv88z6m31d7"; + type = "gem"; + }; + version = "3.0.5"; + }; character_set = { dependencies = ["sorted_set"]; groups = ["default"]; @@ -814,10 +856,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kn7x7smqsk0x2iq17dbbaay0qimmgza8wbdlrs66dvn0l2wpncm"; + sha256 = "0f3v6ffikj694h925zvfzgx995q6l1ixnqpph3qpnjdsyjpsmbn8"; type = "gem"; }; - version = "0.23.4"; + version = "0.23.6"; }; concurrent-ruby = { groups = ["default" "development" "test"]; @@ -834,20 +876,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ffdxhgirgc86qb42yvmfj6v1v0x4lvi0pxn9zhghkff44wzra0k"; + sha256 = "1nj4r58m5cpfdsijj6gjfs3yzcnxq2halagjk07wjcrgj6z8ayb7"; type = "gem"; }; - version = "2.2.5"; - }; - contracts = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11kj7hdr94hxgxad9wazncvaxzaxlbvw6laq179ivhw9za746vnz"; - type = "gem"; - }; - version = "0.11.0"; + version = "2.3.0"; }; cork = { dependencies = ["colored2"]; @@ -872,15 +904,15 @@ version = "1.0.0"; }; countries = { - dependencies = ["i18n_data" "sixarm_ruby_unaccent" "unicode_utils"]; + dependencies = ["i18n_data" "sixarm_ruby_unaccent"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w278pjhwkbin7jpr7m47wac7gj5n4l2him9k2q4ngzq6rs2id7c"; + sha256 = "1ic1zbzqbrvb3myhgzpq4vigr3qnyl2r0vga84d9z5121cy8lbnk"; type = "gem"; }; - version = "3.0.0"; + version = "4.0.1"; }; crack = { dependencies = ["safe_yaml"]; @@ -926,14 +958,24 @@ }; css_parser = { dependencies = ["addressable"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b"; + type = "gem"; + }; + version = "1.12.0"; + }; + cvss-suite = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; + sha256 = "1yfkibv7c7aazh8p3v9mksa2rdkqacq1x3621pyl4ah3jjg9xjmm"; type = "gem"; }; - version = "1.11.0"; + version = "3.0.1"; }; danger = { dependencies = ["claide" "claide-plugins" "colored2" "cork" "faraday" "faraday-http-cache" "git" "kramdown" "kramdown-parser-gfm" "no_proxy_fix" "octokit" "terminal-table"]; @@ -983,10 +1025,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18bwkvxjr7khxj95xrg1vj7va522vbm2li9wsiiw01cg5b10hni0"; + sha256 = "01c8vv0xwbhlyhiagj93b1hlm2n0rmj4sw62nbc0jhyj90jhj6as"; type = "gem"; }; - version = "2.3.1"; + version = "2.3.2"; }; declarative = { groups = ["default"]; @@ -1046,10 +1088,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cxaqvfhm8xpv3hvpwn7y4g5315zzf5gsdffdkm1bisjviwvmc15"; + sha256 = "0kx1i7qsb5gvc24kxwq4bpcvsknm4c04mq7mz27m7dgfdhhcdbga"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.2"; }; device_detector = { groups = ["default"]; @@ -1072,6 +1114,16 @@ }; version = "4.8.1"; }; + devise-pbkdf2-encryptable = { + dependencies = ["devise" "devise-two-factor"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/devise-pbkdf2-encryptable"; + type = "path"; + }; + version = "0.0.0"; + }; devise-two-factor = { dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; groups = ["default"]; @@ -1151,10 +1203,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mdjnw5n2r3hclg4gmzx19w750sdcxw9y6dhcawbzb9wrbzj58wk"; + sha256 = "188ybg2cgghcp5r1jpfnbx3anf0z8fzlla72jra0vgwkdylk7qkz"; type = "gem"; }; - version = "5.5.0.rc2"; + version = "5.5.4"; }; doorkeeper-openid_connect = { dependencies = ["doorkeeper" "json-jwt"]; @@ -1162,10 +1214,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cj7b45lxiifi6pw8gnylfzlhji572v0pj896rbyqjwyzlgj1sid"; + sha256 = "0vhbw2la2hx9dm0jg14hfah6blwhifrrg7k6nkyl67wga0afgwhd"; type = "gem"; }; - version = "1.7.5"; + version = "1.8.3"; }; dotenv = { groups = ["default"]; @@ -1368,15 +1420,25 @@ }; version = "3.0.0"; }; + error_tracking_open_api = { + dependencies = ["typhoeus"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/error_tracking_open_api"; + type = "path"; + }; + version = "1.0.0"; + }; erubi = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; + sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; type = "gem"; }; - version = "1.9.0"; + version = "1.11.0"; }; escape_utils = { groups = ["default" "development" "test"]; @@ -1430,6 +1492,17 @@ }; version = "2.8.1"; }; + expgen = { + dependencies = ["parslet"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fd2sdh3lc3x0qds30czli8k5qr45bkb7ssx0kb038hhn9jhysjf"; + type = "gem"; + }; + version = "0.1.1"; + }; expression_parser = { groups = ["default"]; platforms = []; @@ -1531,10 +1604,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "143cpzdrnyqyfv1jasr0qjqgm57dhv46nsf5f2s06ndxccfr13rq"; + sha256 = "1qsycf92z2797m9v6calp4yhz565vdsfazi7rj0rxy3jxvlv4lgv"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; }; faraday-httpclient = { groups = ["danger" "default" "development" "test"]; @@ -1754,17 +1827,6 @@ }; version = "0.25.0"; }; - flowdock = { - dependencies = ["httparty" "multi_json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04nrvg4gzgabf5mnnhccl8bwrkvn3y4pm7a1dqzqhpvfr4m5pafg"; - type = "gem"; - }; - version = "0.7.1"; - }; fog-aliyun = { dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"]; groups = ["default"]; @@ -1782,10 +1844,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gsb26a1jp0k7hclry0dai2a9m77a9h6ybc17x0i98z2ivzjsi07"; + sha256 = "130y73isnky4kgqwr1jhci3b51ld4i9r5a7132q6aq8cx8qjjx89"; type = "gem"; }; - version = "3.14.0"; + version = "3.15.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1799,15 +1861,15 @@ version = "2.1.0"; }; fog-google = { - dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client" "google-cloud-env"]; + dependencies = ["fog-core" "fog-json" "fog-xml" "google-apis-compute_v1" "google-apis-dns_v1" "google-apis-iamcredentials_v1" "google-apis-monitoring_v3" "google-apis-pubsub_v1" "google-apis-sqladmin_v1beta4" "google-apis-storage_v1" "google-cloud-env"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01mky1gqgg8vijr2avyspc9l4asjzkr5xc31x4c4ff7jzf00g11g"; + sha256 = "127l22c7lhg166sylfhxys41p0i3nlkxkpzzgw8q9zip10irm41w"; type = "gem"; }; - version = "1.15.0"; + version = "1.19.0"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -1826,10 +1888,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21"; + sha256 = "0yggsxd7c58p5i8zgvfw9rkqlg75l6hkbwnpgawd2sacwl4jsfr6"; type = "gem"; }; - version = "0.6.0"; + version = "0.8.0"; }; fog-openstack = { dependencies = ["fog-core" "fog-json" "ipaddress"]; @@ -1916,6 +1978,16 @@ }; version = "3.0.1"; }; + gems = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w26k4db8yj6x1gpxvh1rma4p36hz61xkk7kjf0z61nrajyp8g9l"; + type = "gem"; + }; + version = "1.2.0"; + }; get_process_mem = { dependencies = ["ffi"]; groups = ["default" "puma" "test"]; @@ -1977,20 +2049,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzqyglw7akval4rxjyqygs2abdrziy6ry0cy135lq1hlwl4axj8"; + sha256 = "10bq1l9445b9ff921kyayrn5w1b0f7qm1sjia3wmnl54jq2vxfk2"; type = "gem"; }; - version = "15.4.0.pre.rc2"; - }; - github-markup = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp"; - type = "gem"; - }; - version = "1.7.0"; + version = "15.5.2"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -1998,10 +2060,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kq77304vn733xc8iipq4wpdk5qb0zwjryhm3fia3mfsrdcp1z8k"; + sha256 = "0ycnjjk1im5a82k02avix7c5c87vrkl87gsghgq29g2x34z5wr1z"; type = "gem"; }; - version = "4.16.1"; + version = "4.19.0"; }; gitlab-chronic = { dependencies = ["numerizer"]; @@ -2020,10 +2082,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07zhs9mz9gi6hgarm0px55kn6wxfah1xkcdrk217yv1vp1aqmqps"; + sha256 = "0v3m056hpds46byqsacvf4y4xgikgm9ngmz0xlrz57il812a4kl6"; type = "gem"; }; - version = "3.5.2"; + version = "3.6.4"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2042,10 +2104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d8plrl69q5mcsgz8ywhw7k9q0g31y3gm6h90gw9apsisqbm7vrg"; + sha256 = "0zpbw2i1igv6ywqikip64w2xa5sqb9vg98qli0hab2h25g1n6hdg"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; @@ -2053,10 +2115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j0598m9445msa0rksl1l1cvd11wsnyq1s4gjmcbw18a9smfa5lg"; + sha256 = "09xlv72nbys9a5iqvhxfzdr7vy3s3m2a6ixqb9vq71k925faq6gb"; type = "gem"; }; - version = "0.24.0"; + version = "0.29.0"; }; gitlab-license = { groups = ["default"]; @@ -2110,15 +2172,15 @@ version = "0.10.0"; }; gitlab-sidekiq-fetcher = { - dependencies = ["sidekiq"]; + dependencies = ["json" "sidekiq"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qkkwd2sj9l6nmvipd1308ni01m2n8ixqwl6syl493cm5am4qmlw"; + sha256 = "15rqw4rx7fwall9ajbgkrv3skh70c0dlwfffvzkch84z0pn1l12l"; type = "gem"; }; - version = "0.8.0"; + version = "0.9.0"; }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-graphql" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; @@ -2126,10 +2188,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nk6gdgjs920kfzyj35im2m3rp79vhmamg8f8f3y74vh7dadhxzz"; + sha256 = "196fhlbhhanpbn5iriccp7m04xgkq7swyk07im50q7z05pxyf1ki"; type = "gem"; }; - version = "8.0.0"; + version = "9.2.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2176,15 +2238,125 @@ version = "6.4.0"; }; google-api-client = { - dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet"]; + dependencies = ["google-apis-core" "google-apis-generator"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05ynbapd26wppcqa81kw6kb8a39mzp0fql1rwmk3lgr95ybmxr1s"; + sha256 = "1zypv7qz37ql5fqnlmk39krbazzshjzsw44syg7p0ap03zr6w021"; type = "gem"; }; - version = "0.50.0"; + version = "0.53.0"; + }; + google-apis-compute_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jsz21m0mkjhn6yik2rshgg8i17sdwm8rmq0pfhfs6pwkv7kg5b2"; + type = "gem"; + }; + version = "0.53.0"; + }; + google-apis-core = { + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0d5h7sm8asxg252dnkk91sq51ynk1m06i15an6s04ihsi5ja64n0"; + type = "gem"; + }; + version = "0.9.1"; + }; + google-apis-discovery_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05as93y4c613dg70xpyzs18a18vqm0bkl2slv3myb1382bzcqnif"; + type = "gem"; + }; + version = "0.12.0"; + }; + google-apis-dns_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k7k1nanm4wqyx19m5x9xzzm3nvf89gg5vr1dq4nfyvkl8g668zm"; + type = "gem"; + }; + version = "0.28.0"; + }; + google-apis-generator = { + dependencies = ["activesupport" "gems" "google-apis-core" "google-apis-discovery_v1" "thor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y8j6bxgl1sxq2n3hslvld09xv6bcympk30if681xci1s6zgwmj6"; + type = "gem"; + }; + version = "0.11.0"; + }; + google-apis-iamcredentials_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06smnmn2s460xl9x9rh07a3fkqdrjjy6azmx8iywggqgv2k5d8p9"; + type = "gem"; + }; + version = "0.15.0"; + }; + google-apis-monitoring_v3 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0skk42y2y81jlj0qfk790wqz3sdaxrykrc4mp1ysr0zsinp654id"; + type = "gem"; + }; + version = "0.37.0"; + }; + google-apis-pubsub_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gg1br0pj16iag3xax942g101zk4rk48isdpz5abyhc070amk45q"; + type = "gem"; + }; + version = "0.30.0"; + }; + google-apis-sqladmin_v1beta4 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r8npqk6hsvj31dcfn8y0449gds2v75jkk209r7vyj2mrk6pj0nh"; + type = "gem"; + }; + version = "0.38.0"; + }; + google-apis-storage_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l6qhspmpgafj7wgwad6j7fxv1kxvim7sxvfyzb6d6chzh3ww6la"; + type = "gem"; + }; + version = "0.20.0"; }; google-cloud-env = { dependencies = ["faraday"]; @@ -2202,10 +2374,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ysvm5mxx1knjp3sbhi18nswaml625vbgm3gbh7is14h4d8fwjy9"; + sha256 = "1dcgkhjiaxha3yznyxxzm8a4n4jf61rk7kgbxy4sdkb865zbn2ab"; type = "gem"; }; - version = "3.21.5"; + version = "3.21.12"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -2224,10 +2396,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cm60nbmwzf83fzy06f3iyn5a6sw91siw8x9bdvpwwmjsmivana6"; + sha256 = "1hpwgwhk0lmnknkw8kbdfxn95qqs6aagpq815l5fkw9w6mi77pai"; type = "gem"; }; - version = "0.14.0"; + version = "1.3.0"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -2235,10 +2407,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xbgh9d8nbvsvyzqnd0mzhz0nr9hx4qn025kmz6d837lry4lc6gw"; + sha256 = "0qn87vxdsaq1szcvq39rnz38cgqllncdxmiyghnbzl7x5aah8sbw"; type = "gem"; }; - version = "2.0.20"; + version = "2.0.22"; }; grape = { dependencies = ["activesupport" "builder" "dry-types" "mustermann-grape" "rack" "rack-accept"]; @@ -2273,6 +2445,28 @@ }; version = "1.7.1"; }; + grape-swagger = { + dependencies = ["grape"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zy84lxrnnslray9rmfgb7ri295wda3cxx3xryz4lr5hd8r5p24w"; + type = "gem"; + }; + version = "1.5.0"; + }; + grape-swagger-entity = { + dependencies = ["grape-entity" "grape-swagger"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08smc3c2li1xa2nmgjkn742sp1xj9qzppy28v68cz5mc00nkf7pm"; + type = "gem"; + }; + version = "0.5.1"; + }; grape_logging = { dependencies = ["grape" "rack"]; groups = ["default"]; @@ -2466,25 +2660,14 @@ version = "1.0.1"; }; hashie = { - groups = ["default" "kerberos"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02bsx12ihl78x0vdm37byp78jjw2ff6035y7rrmbd90qxjwxr43q"; - type = "gem"; - }; - version = "4.1.0"; - }; - hashie-forbidden_attributes = { - dependencies = ["hashie"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1chgg5d2iddja6ww02x34g8avg11fzmzcb8yvnqlykii79zx6vis"; + sha256 = "1nh3arcrbz1rc1cr59qm53sdhqm137b258y8rcb4cvd3y98lwv4x"; type = "gem"; }; - version = "0.1.1"; + version = "5.0.0"; }; health_check = { dependencies = ["railties"]; @@ -2492,10 +2675,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07wrbfsfsprfmykc0qbkkgxpf8vlx4a8sp77acqrjsh395f6qcqv"; + sha256 = "0mrv2323hx4lbcr6xii6ry89b3zvly5jsaacwbblxibx4c46a50h"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.0"; }; heapy = { dependencies = ["thor"]; @@ -2514,10 +2697,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00xqmlny1b4ixff8sk0rkl4wcgwqc6v93qv8l3rn8d1dppvq7pm1"; + sha256 = "180kjksi0sdlqb0aq0bhal96ifwqm25hzb3w709ij55j51qls7ca"; type = "gem"; }; - version = "2.13.2"; + version = "2.14.3"; }; html2text = { dependencies = ["nokogiri"]; @@ -2551,15 +2734,15 @@ version = "4.3.4"; }; http = { - dependencies = ["addressable" "http-cookie" "http-form_data" "http-parser"]; + dependencies = ["addressable" "http-cookie" "http-form_data" "llhttp-ffi"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z8vmvnkrllkpzsxi94284di9r63g9v561a16an35izwak8g245y"; + sha256 = "0jn1y6sfxpfaq0hcblv8hhyxzam8n39kvypi07q2vxaimh6ly7mj"; type = "gem"; }; - version = "4.4.1"; + version = "5.1.0"; }; http-accept = { groups = ["default"]; @@ -2592,27 +2775,16 @@ }; 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"; - }; httparty = { dependencies = ["mime-types" "multi_xml"]; - groups = ["default"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "109xvhl35dsk9zp65n5pdkhiijhqxdyvajbs74nkp4z8yl09vj32"; + sha256 = "0rs8c5wga6f1acyaj90d2hlv307gh2flfpb8y48wdk2si812l3a9"; type = "gem"; }; - version = "0.16.4"; + version = "0.20.0"; }; httpclient = { groups = ["default"]; @@ -2640,20 +2812,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v0cdwxiaqdwhaljd7z0fbx29q3r5kjl93xnjm5abi1x37645ncj"; + sha256 = "0rizqqss1bvb668mw72ls7rlj6im82aizz230jxn7d39kaq9kap5"; type = "gem"; }; - version = "0.8.0"; + version = "0.13.1"; }; icalendar = { + dependencies = ["ice_cube"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xsydpp2xph00awi25axv2mwjd5p2rlgd4qb3kh05lvq795kirxd"; + sha256 = "11zfs0l8y2a6gpf0krm91d0ap2mnf04qky89dyzxwaspqxqgj174"; type = "gem"; }; - version = "2.4.1"; + version = "2.8.0"; + }; + ice_cube = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dri4mcya1fwzrr9nzic8hj1jr28a2szjag63f9k7p2bw9fpw4fs"; + type = "gem"; + }; + version = "0.16.4"; }; imagen = { dependencies = ["parser"]; @@ -2672,10 +2855,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lmlx3g4z894vwsgbpxhpmkn63n74mynklbwy07l7ccak552jw1n"; + sha256 = "0hn06njrwbxhxs2myr04fq3spqn38b8wm3irvkll91qv3p5yv0d3"; type = "gem"; }; - version = "1.1.0"; + version = "2.0.0"; + }; + ipaddr = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ycz5z25dykxy4sqdifgw6xszpgiy4hc0nv7sd89hm3x6vk6x497"; + type = "gem"; + }; + version = "1.2.2"; }; ipaddress = { groups = ["default"]; @@ -2687,6 +2880,16 @@ }; version = "0.8.3"; }; + ipynbdiff = { + dependencies = ["diffy" "oj"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/ipynbdiff"; + type = "path"; + }; + version = "0.4.7"; + }; jaeger-client = { dependencies = ["opentracing" "thrift"]; groups = ["default"]; @@ -2724,10 +2927,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; js_regex = { dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; @@ -2735,10 +2938,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xarq1fqjaz6v139zzy4nwjg8c253fkvifn345gilva1qilaqgxi"; + sha256 = "1da4ccsq5bycg28iv0smmrra80jad3a8ya10lps5lv8fbbfvqd3r"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.0"; }; json = { groups = ["default"]; @@ -2751,15 +2954,15 @@ version = "2.5.1"; }; json-jwt = { - dependencies = ["activesupport" "aes_key_wrap" "bindata"]; + dependencies = ["activesupport" "aes_key_wrap" "bindata" "httpclient"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nzbk1mrbf9mnvjpn3bxy8a85rjf94qmfdnvk78mjzk8pa0fvgdr"; + sha256 = "04315mf4p9qa97grdfqv922paghzdfrbb982ap0p99rqwla4znv6"; type = "gem"; }; - version = "1.13.0"; + version = "1.15.3"; }; json_schemer = { dependencies = ["ecma-re-validator" "hana" "regexp_parser" "uri_template"]; @@ -2799,10 +3002,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vxkqciny5v4jgmjxl8qrgbmig2cij2iskqbwh4bfcmpxf467ch3"; + sha256 = "0gia8irryvfhcr6bsr64kpisbgdbqjsqfgrk12a11incmpwny1y4"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; kaminari-actionview = { dependencies = ["actionview" "kaminari-core"]; @@ -2810,10 +3013,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w0p1hyv6lgf6h036cmn2kbkdv4x7g0g9q9kc5gzkpz7amlxr8ri"; + sha256 = "02f9ghl3a9b5q7l079d3yzmqjwkr4jigi7sldbps992rigygcc0k"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; kaminari-activerecord = { dependencies = ["activerecord" "kaminari-core"]; @@ -2821,20 +3024,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02n5xxv6ilh39q2m6vcz7qrdai7ghk3s178dw6f0b3lavwyq49w3"; + sha256 = "0c148z97s1cqivzbwrak149z7kl1rdmj7dxk6rpkasimmdxsdlqd"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; kaminari-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h04cr4y1jfn81gxy439vmczifghc2cvsyw47aa32is5bbxg1wlz"; + sha256 = "1zw3pg6kj39y7jxakbx7if59pl28lhk98fx71ks5lr3hfgn6zliv"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; kas-grpc = { dependencies = ["grpc"]; @@ -2885,11 +3088,10 @@ groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ih04d0vgj91rl66iaqh8jmpskwz3g6mgajid0wlzi5skxqqxlym"; - type = "gem"; + path = "${src}/vendor/gems/kubeclient"; + type = "path"; }; - version = "4.9.3"; + version = "4.9.4.pre.gitlab1"; }; launchy = { dependencies = ["addressable"]; @@ -2907,10 +3109,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nyhh3h96c118xcyfmn2595fhavi9r0g2v7rckqzc56walncszgs"; + sha256 = "18vcakjkb5fhavq9s6j7zwjc14c652361qws5g1slqb300anfww2"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.7"; }; letter_opener = { dependencies = ["launchy"]; @@ -2977,6 +3179,17 @@ }; version = "3.7.1"; }; + llhttp-ffi = { + dependencies = ["ffi-compiler" "rake"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00dh6zmqdj59rhcya0l4b9aaxq6n8xizfbil93k0g06gndyk5xz5"; + type = "gem"; + }; + version = "0.4.0"; + }; locale = { groups = ["default" "development"]; platforms = []; @@ -2992,10 +3205,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g6w327y8d7dr0d7zw6p7hmlwh0hcvb7pkc7xxyf5mn3fmw6fdh1"; + sha256 = "1h1a3h3rfv3094pn5zn7d3c066dmhx9i380mhqa1qyagqla6pw8a"; type = "gem"; }; - version = "0.6.2"; + version = "1.1.1"; }; lograge = { dependencies = ["actionpack" "activesupport" "railties" "request_store"]; @@ -3014,21 +3227,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; + sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; type = "gem"; }; - version = "2.18.0"; + version = "2.19.1"; }; lookbook = { - dependencies = ["actioncable" "css_parser" "htmlbeautifier" "htmlentities" "listen" "railties" "redcarpet" "rouge" "view_component" "yard"]; + dependencies = ["actioncable" "activemodel" "css_parser" "htmlbeautifier" "htmlentities" "listen" "railties" "redcarpet" "rouge" "view_component" "yard" "zeitwerk"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mmw3jklhhrvvmp2fswld7pipdgw3s5l3fg3dgv353jq6w516gn5"; + sha256 = "1nww5h9frmbjfpfy2nb296vn78xnq1qg0lq3lsn52ky8s8rb65dw"; type = "gem"; }; - version = "1.0.3"; + version = "1.4.5"; }; lru_redux = { groups = ["default"]; @@ -3061,6 +3274,16 @@ }; version = "2.7.1"; }; + mail-smtp_pool = { + dependencies = ["connection_pool" "mail"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/mail-smtp_pool"; + type = "path"; + }; + version = "0.1.0"; + }; marcel = { groups = ["default" "test"]; platforms = []; @@ -3077,10 +3300,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1003hf828anbd3pxwzs9ir9sclh64mgj971n4a7ilgj9xs8r0a38"; + sha256 = "1kw9l9gw9dqmbpjxs3ndifia2204n8n92pjr4xp78hiynqm22qyb"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.1"; }; memoist = { groups = ["default"]; @@ -3093,14 +3316,14 @@ version = "0.16.2"; }; memory_profiler = { - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04ivhv1bilwqm33jv28gar2vwzsichb5nipaq395d3axabv8qmfy"; + sha256 = "1c81d68r4wx0ckbmqxlfqc2qpd94jwcmqdm0xgr0s46r48pv9k9q"; type = "gem"; }; - version = "0.9.14"; + version = "1.0.1"; }; method_source = { groups = ["default" "development" "metrics" "test"]; @@ -3116,6 +3339,16 @@ }; version = "1.0.0"; }; + microsoft_graph_mailer = { + dependencies = ["mail" "oauth2"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/microsoft_graph_mailer"; + type = "path"; + }; + version = "0.1.0"; + }; mime-types = { dependencies = ["mime-types-data"]; groups = ["danger" "default" "development" "test"]; @@ -3359,10 +3592,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv"; + sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; type = "gem"; }; - version = "0.16.3"; + version = "0.17.1"; }; net-ntp = { groups = ["default"]; @@ -3431,10 +3664,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; + sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; type = "gem"; }; - version = "1.13.8"; + version = "1.13.10"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -3468,15 +3701,15 @@ version = "0.5.6"; }; oauth2 = { - dependencies = ["faraday" "jwt" "multi_xml" "rack" "rash_alt" "version_gem"]; + dependencies = ["faraday" "jwt" "multi_xml" "rack" "snaky_hash" "version_gem"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06y4wnsc1flbgv8vhh650x7f2k0k8238zcrmncil4swkb9kdhhxk"; + sha256 = "1yzpaghh8kwzgmvmrlbzf36ks5s2hf34rayzw081dp2jrzprs7xj"; type = "gem"; }; - version = "2.0.3"; + version = "2.0.9"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -3505,10 +3738,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ihfnl0maszdq821h6mivr8xickjab6ccyncnm5rn2vgrj6imwxf"; + sha256 = "0lggrhlihxyfgiqqr9b2fqdxc4d2zff2czq30m3rgn8a0b2gsv90"; type = "gem"; }; - version = "3.13.21"; + version = "3.13.23"; + }; + oj-introspect = { + dependencies = ["oj"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h2hw0cxs8z6g3bkrsrxmlixcmalnlmj9rzcd8sxaqjs95w4wn7a"; + type = "gem"; + }; + version = "0.7.1"; }; omniauth = { dependencies = ["hashie" "rack" "rack-protection"]; @@ -3527,10 +3771,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yk9vlqm7warm83l5vy44z7q4rg4mismqmb4bmgapllqiw5yr09g"; + sha256 = "1qsx4ri5rbr68djyqd5523rcyxhzi5v05f66wz0iflyda6fkdkwf"; type = "gem"; }; - version = "1.0.1"; + version = "2.0.0"; }; omniauth-atlassian-oauth2 = { dependencies = ["omniauth" "omniauth-oauth2"]; @@ -3571,10 +3815,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pv9pxff3g4cva76zzsx8fibb08c9av51lxksh73mbl9rrxdgkgd"; + sha256 = "0wnhibz903ssnq9scl65a47d41zcczb3wjvc44y3w8ydabfwx164"; type = "gem"; }; - version = "1.0.0"; + version = "2.0.0"; + }; + omniauth-azure-oauth2 = { + dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/omniauth-azure-oauth2"; + type = "path"; + }; + version = "0.0.10"; + }; + omniauth-cas3 = { + dependencies = ["addressable" "nokogiri" "omniauth"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/omniauth-cas3"; + type = "path"; + }; + version = "1.1.4"; }; omniauth-dingtalk-oauth2 = { dependencies = ["omniauth-oauth2"]; @@ -3604,10 +3868,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jc66zp4bhwy7c6s817ws0nkimski3crrhwd7xyy55ss29v6b8hw"; + sha256 = "1m6a7kg3lxz2nm96prln2ja8r4wlm37m5vsy9199vnynqq5fgy4g"; type = "gem"; }; - version = "2.0.0"; + version = "2.0.1"; + }; + omniauth-gitlab = { + dependencies = ["omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/omniauth-gitlab"; + type = "path"; + }; + version = "4.0.0"; + }; + omniauth-google-oauth2 = { + dependencies = ["jwt" "oauth2" "omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fahkghfa2iczmwss9bz5l4rh7siwzjnjp3akh7pdbsfx0kg35j4"; + type = "gem"; + }; + version = "1.1.1"; }; omniauth-oauth = { dependencies = ["oauth" "omniauth"]; @@ -3626,32 +3911,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ia73zcbmhf02krlkq2rxmksx93jp777ax5x58fzkq3jzacqyniz"; + sha256 = "0y4y122xm8zgrxn5nnzwg6w39dnjss8pcq2ppbpx9qn7kiayky5j"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.0"; }; omniauth-oauth2-generic = { - dependencies = ["omniauth-oauth2"]; + dependencies = ["omniauth-oauth2" "rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m6vpip3rm1spx1x9y1kjczzailsph1xqgaakqylzq3jqkv18273"; + sha256 = "04vnmszmm1jmwvg6cwdy9jxliwa8yawp4w4690pvyplx04wqavnf"; type = "gem"; }; - version = "0.2.2"; + version = "0.2.8"; }; - omniauth-rails_csrf_protection = { - dependencies = ["actionpack" "omniauth"]; + omniauth-salesforce = { + dependencies = ["omniauth" "omniauth-oauth2"]; groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kwswnkyl8ym6i4wv65qh3qchqbf2n0c6lbhfgbvkds3gpmnlm7w"; - type = "gem"; + path = "${src}/vendor/gems/omniauth-salesforce"; + type = "path"; }; - version = "1.0.1"; + version = "1.0.5"; }; omniauth-saml = { dependencies = ["omniauth" "ruby-saml"]; @@ -3686,6 +3970,16 @@ }; version = "1.4.0"; }; + omniauth_crowd = { + dependencies = ["activesupport" "nokogiri" "omniauth"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/omniauth_crowd"; + type = "path"; + }; + version = "2.4.0"; + }; open4 = { groups = ["default" "development"]; platforms = []; @@ -3708,14 +4002,15 @@ version = "1.3.0"; }; openssl = { + dependencies = ["ipaddr"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03wbynzkhay7l1x76srjkg91q48mxl575vrxb3blfxlpqwsvvp0w"; + sha256 = "0xx01in25q31rpxmq2qlimi44zarsp4px7046xnc6in0pa127xsk"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.2"; }; openssl-signature_algorithm = { groups = ["default"]; @@ -3784,10 +4079,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ngwc4zrp6jxpb8s0y07xxic492a1n0akjxd7x4hks2fbsiwwwk2"; + sha256 = "0ldi3j95dh3c29w4bliykfdd08r95d4zvbdblk385w9b4knr2afc"; type = "gem"; }; - version = "1.59.0"; + version = "1.63.0"; }; pact-mock_service = { dependencies = ["filelock" "find_a_port" "json" "pact-support" "rack" "rspec" "term-ansicolor" "thor" "webrick"]; @@ -3795,21 +4090,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0izmf5h0n1mcrfk6qlz61rhzdjs6h0bkqrx6ndp8nhmfhja254fc"; + sha256 = "09syv4y0g0pvjshxj8i0yg7mrvszgp503is1b78k86bgv6wc73l9"; type = "gem"; }; - version = "3.6.2"; + version = "3.10.0"; }; pact-support = { - dependencies = ["awesome_print" "randexp" "rspec" "term-ansicolor"]; + dependencies = ["awesome_print" "diff-lcs" "expgen" "rainbow"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07qxvxy48im9vlswqspsh2k6fy6rsmi3409863ww8y7yx5pmjr63"; + sha256 = "0xh4idg0m1mr0pkywj5f79nlr4g6n4waism86gj34h8wicf9c9aa"; type = "gem"; }; - version = "1.15.1"; + version = "1.18.1"; }; parallel = { groups = ["development" "test"]; @@ -3827,10 +4122,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; + sha256 = "17qfhjvnr9q2gp1gfdl6kndy2mb6qdwsls3vnjhb1h8ddimdm4s5"; type = "gem"; }; - version = "3.1.2.1"; + version = "3.1.3.0"; }; parslet = { groups = ["default" "development" "test"]; @@ -3869,10 +4164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypj64nhq3grs9zh40vmyfyhmxlhljjsbg5q0jxhlxg5v76ij0mb"; + sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.5"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -3880,10 +4175,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fyhhb5f2y5mqk5vg5ykicxp58wwhc7invfp27x8d7fgi0zkdwa8"; + sha256 = "0l79y41nwwacabj61jkbh4r7haajaf8y4bn5pihh0m1g8547b8w4"; type = "gem"; }; - version = "2.1.4"; + version = "2.2.0"; }; plist = { groups = ["default"]; @@ -3954,10 +4249,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r8iaviqw0bjp83364k04n5kyzvr0hawf3h5xlgjsg30vmpykrrn"; + sha256 = "095gq9sr6pab1jzbvn3pjs7i1p5hnlasnhvq2xdfsvxjyw33fvbn"; type = "gem"; }; - version = "0.16.2"; + version = "0.17.0"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -4012,10 +4307,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; + sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.0"; }; puma = { dependencies = ["nio4r"]; @@ -4064,20 +4359,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "0p685i23lr8pl7l09g9l2mcj615fr7g33w3mkcr472lcg34nq8n8"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; rack = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; + sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; type = "gem"; }; - version = "2.2.4"; + version = "2.2.6.2"; }; rack-accept = { dependencies = ["rack"]; @@ -4118,10 +4413,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wiz38c155g236sgrw0qnn33ysjmqhwq3hc1hqfw2fi4mmy1bz06"; + sha256 = "1fknwsxz4429w1hndl6y30cmm2n34wmmaaj2hhp6jrm8ssfsfwjf"; type = "gem"; }; - version = "1.21.2"; + version = "1.21.3"; }; rack-protection = { dependencies = ["rack"]; @@ -4140,10 +4435,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dpl6vi9yiv6k8gnr3zrsq7kd1dwbn8vkn70sw7dp975sgb4ziw9"; + sha256 = "1a62439xwn5v6hsl9s11hdk4wj58czhcbg7lminv23mnkc0ca147"; type = "gem"; }; - version = "0.7.2"; + version = "0.7.6"; }; rack-test = { dependencies = ["rack"]; @@ -4151,20 +4446,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; + sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; type = "gem"; }; - version = "1.1.0"; + version = "2.0.2"; }; rack-timeout = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16ahj3qz3xhfrwvqb4nf6cfzvliigg0idfsp5jyr8qwk676d2f30"; + sha256 = "1cqa9lh2rdqqvhfxbrdys7mj2x4vxhqmf57iww2x8961mhp8jm0p"; type = "gem"; }; - version = "0.6.0"; + version = "0.6.3"; }; rails = { dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; @@ -4205,10 +4500,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf"; + sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.4"; }; rails-i18n = { dependencies = ["i18n" "railties"]; @@ -4252,27 +4547,6 @@ }; version = "13.0.6"; }; - randexp = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1j742j7g107jgkvpsfq2b10d5xhsni5s8vxrp518d3karw7529ih"; - type = "gem"; - }; - version = "0.1.7"; - }; - rash_alt = { - dependencies = ["hashie"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01qn9qrbi79mr4nyf1fqv3fjbh9ipx6r42vwfxmwrkpxp3ansjhx"; - type = "gem"; - }; - version = "0.4.12"; - }; rb-fsevent = { groups = ["default" "development" "test"]; platforms = []; @@ -4340,10 +4614,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13za43xb5xfg1xb1vwlvwx14jlmnk7jal5dqw8q9a5g13csx41sw"; + sha256 = "1habsrf67d3m5p12wc2bydsa7bj87r7w1266x8in59znf5wz4drf"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.0"; }; recaptcha = { dependencies = ["json"]; @@ -4351,10 +4625,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "121pkq8kwqjh4l751xzx15bjp5vmf5pirfmpb11h71zsiavjqv6w"; + sha256 = "1vmpppgdy64qa16bvkss0xyzmyyzxv5hwzvc1i6saw4yvm58kl9p"; type = "gem"; }; - version = "4.13.1"; + version = "5.12.3"; }; recursive-open-struct = { groups = ["default"]; @@ -4391,10 +4665,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xid9av3apfz5mszwqgl6v0n58g6038lsfdz0p53xb9ywpa5dcpc"; + sha256 = "0i4a8hxxcxci3n8hhlm9a8wa7a9m58r6sjvh4749v7362i8cy010"; type = "gem"; }; - version = "4.7.1"; + version = "4.8.0"; }; redis-actionpack = { dependencies = ["actionpack" "redis-rack" "redis-store"]; @@ -4413,10 +4687,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k65fr7f8ciq7d9nwc5ziw1d32zsxilgmqdlj3359rz5jgb0f5y8"; + sha256 = "04l61lpb3s2xkwj36l7b543lhciv19z514kxnmnbh5fg70grc8q9"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.0"; }; redis-rack = { dependencies = ["rack" "redis-store"]; @@ -4445,10 +4719,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0"; + sha256 = "0mm5sykyblc61a82zz3dag6yy3mvflj2z47060kjzjj5793blqzi"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; regexp_property_values = { groups = ["default"]; @@ -4615,10 +4889,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wwnfhxxvrlxlk1a3yxlb82k2f9lm0yn0598x7lk8fksaz4vv6mc"; + sha256 = "06wmcjsslx9vmw0bair46551ya8mb76csjyb59fxsmnkkp75jmh0"; type = "gem"; }; - version = "3.10.1"; + version = "3.10.2"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -4680,10 +4954,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15j52parvb8cgvl6s0pbxi2ywxrv6x0764g222kz5flz0s4mycbl"; + sha256 = "0pjckrh8q6sqxy38xw7f4ziylq1983k84xh927s6352pps68zj35"; type = "gem"; }; - version = "3.10.2"; + version = "3.10.3"; }; rspec_junit_formatter = { dependencies = ["rspec-core"]; @@ -4691,10 +4965,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aynmrgnv26pkprrajvp7advb8nbh0x4pkwk6jwq8qmwzarzk21p"; + sha256 = "059bnq1gcwl9g93cqf13zpz38zk7jxaa43anzz06qkmfwrsfdpa0"; type = "gem"; }; - version = "0.4.1"; + version = "0.6.0"; }; rspec_profiling = { dependencies = ["activerecord" "pg" "rails" "sqlite3"]; @@ -4708,15 +4982,15 @@ version = "0.0.6"; }; rubocop = { - dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; - groups = ["default" "development" "test"]; + dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0phrig25dykgi42z6mf1abllh3ws6sv7awa82hzvvvbjx2xlzd3k"; + sha256 = "1fhyia6fw438ld83vz7vx37zynmzv042saf04ir43ga6sxk4m9k4"; type = "gem"; }; - version = "0.93.1"; + version = "1.38.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -4724,10 +4998,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4m9h9hzrpfmsnswvfimafmjwfa79cbqh9dvq18cja32dhrhpcg"; + sha256 = "1qiq3q66w57im0ryrvnd1yq0g2s2safhywpv94441kvc1amayjzy"; type = "gem"; }; - version = "1.21.0"; + version = "1.23.0"; }; rubocop-gitlab-security = { dependencies = ["rubocop"]; @@ -4746,10 +5020,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bdxal5n0q6aq457jz60jzhs3z04mv2wbvl5xd2cw3lrr6x2q3xl"; + sha256 = "1669dfwhnfkmz7yz7fl5bhhsdwxivnh2zkp260my7w4yzfckki7i"; type = "gem"; }; - version = "0.14.6"; + version = "0.18.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -4757,10 +5031,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01aahh54r9mwhdj7v2s6kmkdm1k1n1z27dlknlbgm281ny1aswrk"; + sha256 = "00ld0hfm2x5hzms9xhkyjfxs8afsmlg1kf0mklk68cq4wwwihkwd"; type = "gem"; }; - version = "1.9.2"; + version = "1.15.1"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -4768,32 +5042,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h656la1g644g54g3gidz45p6v8i1156nw6bi66cfx7078y1339d"; + sha256 = "1bv51vwcg5m4v35n7653xclw9vv3ifvgbhvc2l79wz2p76ipm1bx"; type = "gem"; }; - version = "2.9.1"; + version = "2.17.3"; }; rubocop-rspec = { - dependencies = ["rubocop" "rubocop-ast"]; + dependencies = ["rubocop"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0albi9zn8zrz1bb105xkcn5xdv6q7i7r34h9m4jsj5ygsvkkh8kv"; + sha256 = "1rpcww107xq6aj5wkypzjj346jaxhqal33wmhlwb9gc2h425yg5k"; type = "gem"; }; - version = "1.44.1"; + version = "2.16.0"; }; ruby-fogbugz = { - dependencies = ["crack"]; + dependencies = ["crack" "multipart-post"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jj0gpkycbrivkh2q3429vj6mbgx6axxisg69slj3c4mgvzfgchm"; + sha256 = "0mznsnhsgh1yg57j5gighr9vjricnix1l7ngf654k3v4fkjcs12y"; type = "gem"; }; - version = "0.2.1"; + version = "0.3.0"; }; ruby-magic = { dependencies = ["mini_portile2"]; @@ -4806,16 +5080,6 @@ }; version = "0.5.4"; }; - ruby-prof = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0g1j37fy53ly6351asfcnik033gwkp4kjma7lji1yklmj86d4dg7"; - type = "gem"; - }; - version = "1.3.1"; - }; ruby-progressbar = { groups = ["default" "development" "test"]; platforms = []; @@ -5000,10 +5264,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qx6hwi10s0ir46l3aq4lspkxlcs1x4cjhvdhpdxyxaicciqddi2"; + sha256 = "0c9imnjbakx25r2n7widfp00s19ndzmmwax761mx5vbwm9nariyb"; type = "gem"; }; - version = "0.1.0"; + version = "0.1.1"; }; securecompare = { groups = ["default"]; @@ -5149,10 +5413,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b06kw7frd8hrb7373pvfd39qap00ykkvipgymgwxfjzrgz0ag0d"; + sha256 = "0p2mj2jj5b9wqmpvkngx87lfr2qgwhqvwx38bmhl5aa29pc6z5kx"; type = "gem"; }; - version = "6.4.2"; + version = "6.5.7"; }; sidekiq-cron = { dependencies = ["fugit" "sidekiq"]; @@ -5160,10 +5424,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v9psfprq1x03b51mnpidfzilnm8b6spzkgap3pb8yga4pg2lq91"; + sha256 = "1jmh5vc2gdy0a161hgq0vlbwaviqj51pqzmgda4p2nyffg575nj7"; type = "gem"; }; - version = "1.4.0"; + version = "1.8.0"; }; sigdump = { groups = ["development" "test"]; @@ -5268,16 +5532,26 @@ }; version = "2.3.4"; }; - snowplow-tracker = { - dependencies = ["contracts"]; + snaky_hash = { + dependencies = ["hashie" "version_gem"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05136477ifa567aym9k8nqqmwv3plbczgh9x9fbz86860vym5v4w"; + sha256 = "1pl70rh92wsn15q4lwzikzi7j5a00vm77bqjg07k4sgzx0wjx2zy"; type = "gem"; }; - version = "0.6.1"; + version = "2.0.0"; + }; + snowplow-tracker = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f2afcmwbfxfrkf0scc5yi3x5lyrfbd3xri8zm2ri0is8kqz99kv"; + type = "gem"; + }; + version = "0.8.0"; }; solargraph = { dependencies = ["backport" "benchmark" "diff-lcs" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; @@ -5285,10 +5559,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r8lr7gldwp57xqik4kims6w72q9ww34bral0j5z20a56s6gva8x"; + sha256 = "0smcpi3x87chkdqdclhgh36xlbwm7r44r58m3k1w4mcikdwlpjl7"; type = "gem"; }; - version = "0.46.0"; + version = "0.47.2"; }; sorted_set = { dependencies = ["rbtree" "set"]; @@ -5317,10 +5591,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x2wz1y2b0kp7mlk9k8zkl39rddk2l3x34b7dar3bh3axd1cs30d"; + sha256 = "1jx3y1krmx7flrp8fldb354cap1xxlln4yl97ik8smfzn07hhzzi"; type = "gem"; }; - version = "2.1.1"; + version = "4.1.0"; }; spring-commands-rspec = { dependencies = ["spring"]; @@ -5510,6 +5784,28 @@ }; version = "0.6.0"; }; + telesign = { + dependencies = ["net-http-persistent"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hjcaiy58zg7vpy5vsaaz6ss8w6nlkkvz1p758gdmd5wlxpfkinw"; + type = "gem"; + }; + version = "2.2.4"; + }; + telesignenterprise = { + dependencies = ["telesign"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cziz60q1pav635fln5xiag7vqvf992sk9xi1l5gxhm8ccra0izi"; + type = "gem"; + }; + version = "2.2.2"; + }; temple = { groups = ["default" "development" "test"]; platforms = []; @@ -5533,14 +5829,14 @@ }; terminal-table = { dependencies = ["unicode-display_width"]; - groups = ["default" "development"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr"; type = "gem"; }; - version = "1.8.0"; + version = "3.0.2"; }; terser = { dependencies = ["execjs"]; @@ -5609,20 +5905,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; type = "gem"; }; - version = "2.0.10"; - }; - timecop = { - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0d7mm786180v4kzvn1f77rhfppsg5n0sq2bdx63x9nv114zm8jrp"; - type = "gem"; - }; - version = "0.9.1"; + version = "2.0.11"; }; timeliness = { groups = ["default"]; @@ -5650,10 +5936,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153q7j2nj7y43iscbfcihmwlcydx6sbd65azs27kain0gncymd90"; + sha256 = "1kxykx7ywc0i3y4dwakz4b46dql4zc7h8b5w1hqhsqswq93s7i2i"; type = "gem"; }; - version = "1.31.0"; + version = "1.31.1"; }; toml-rb = { dependencies = ["citrus"]; @@ -5661,10 +5947,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x5j95w28vj85bzw98g1dyd4gm7xpli2fdvwwrgwlay7gb3wc5jh"; + sha256 = "19nr4wr5accc6l2y3avn7b02lqmk9035zxq42234k7fcqd5cbqm1"; type = "gem"; }; - version = "2.0.1"; + version = "2.2.0"; }; tomlrb = { groups = ["default"]; @@ -5957,20 +6243,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bwgbw56z2mhh2j044lgahrsiddibxx0r62r0cxvp0k4sjj9774j"; + sha256 = "104s7p4zp5yvf0bvbwd9mqmnkgz2z89h4hbvxi8pzd8d08c9a03b"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; version_sorter = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s"; + sha256 = "1np1xy15xq5lcp0y5zr7sxnpwwgcq7bvfs6jc27vnkw0lfhz4ir1"; type = "gem"; }; - version = "2.2.4"; + version = "2.3.0"; }; view_component = { dependencies = ["activesupport" "concurrent-ruby" "method_source"]; @@ -5978,10 +6264,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0av6ngrfb1pyxwvy2lsp7m5lljk2vc9j7aabzw1zp70dh13hd261"; + sha256 = "1h4jhcp4h98lj5f7bn54313na25p9mhal0fw8d8a8m8lq6llgg8b"; type = "gem"; }; - version = "2.71.0"; + version = "2.74.1"; }; vmstat = { groups = ["default"]; @@ -6166,9 +6452,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; + sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv"; type = "gem"; }; - version = "2.6.0"; + version = "2.6.6"; }; } diff --git a/pkgs/applications/version-management/gitlab/update-pg.patch b/pkgs/applications/version-management/gitlab/update-pg.patch deleted file mode 100644 index be8cd639df59..000000000000 --- a/pkgs/applications/version-management/gitlab/update-pg.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Gemfile.lock b/Gemfile.lock -index 9074b48c56b..57a1c924897 100644 ---- a/Gemfile.lock -+++ b/Gemfile.lock -@@ -1019,7 +1019,7 @@ GEM - tty-color (~> 0.5) - peek (1.1.0) - railties (>= 4.0.0) -- pg (1.4.1) -+ pg (1.4.3) - pg_query (2.1.4) - google-protobuf (>= 3.19.2) - plist (3.6.0) diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 65c152a347e5..266ca3e4cebd 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -15,22 +15,6 @@ from typing import Iterable import requests -# Always keep this in sync with the GitLaab version you're updating to. -# If you see any errors about vendored dependencies during an update, check the Gemfile. -VENDORED_GEMS = [ - "bundler-checksum", - "devise-pbkdf2-encryptable", - "omniauth-azure-oauth2", - "omniauth-cas3", - "omniauth-gitlab", - "omniauth-google-oauth2", - "omniauth_crowd", - "omniauth-salesforce", - "mail-smtp_pool", - "microsoft_graph_mailer", - "ipynbdiff", - "error_tracking_open_api", -] logger = logging.getLogger(__name__) @@ -101,8 +85,7 @@ class GitLabRepo: owner=self.owner, repo=self.repo, rev=rev, - passthru=passthru, - vendored_gems=VENDORED_GEMS) + passthru=passthru) def _get_data_json(): @@ -155,35 +138,25 @@ def update_rubyenv(): # load rev from data.json data = _get_data_json() rev = data['rev'] + version = data['version'] - gemfile = repo.get_file('Gemfile', rev) - gemfile_lock = repo.get_file('Gemfile.lock', rev) + for fn in ['Gemfile.lock', 'Gemfile']: + with open(rubyenv_dir / fn, 'w') as f: + f.write(repo.get_file(fn, rev)) - if "pg (1.4.1)" in gemfile_lock: - gemfile_lock = gemfile_lock.replace("pg (1.4.1)", "pg (1.4.3)") - else: - logger.info("Looks like pg was updated! Please remove update-pg.patch, as this will cause a build failure") + # Fetch vendored dependencies temporarily in order to build the gemset.nix + subprocess.check_output(['mkdir', '-p', 'vendor/gems'], cwd=rubyenv_dir) + subprocess.check_output(['sh', '-c', f'curl -L https://gitlab.com/gitlab-org/gitlab/-/archive/v{version}-ee/gitlab-v{version}-ee.tar.bz2?path=vendor/gems | tar -xj --strip-components=3'], cwd=f'{rubyenv_dir}/vendor/gems') - with open(rubyenv_dir / 'Gemfile', 'w') as f: - f.write(re.sub(f'.*({"|".join(VENDORED_GEMS)}).*', "", gemfile)) - - with open(rubyenv_dir / 'Gemfile.lock', 'w') as f: - f.write(gemfile_lock) + # Undo our gemset.nix patches so that bundix runs through + subprocess.check_output(['sed', '-i', '-e', '1d', '-e', 's:\\${src}/::g' , 'gemset.nix'], cwd=rubyenv_dir) subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir) - with open(rubyenv_dir / 'Gemfile', 'w') as f: - for gem in VENDORED_GEMS: - gemfile = gemfile.replace(f'path: \'vendor/gems/{gem}\'', f'path: \'{gem}\'') + subprocess.check_output(['sed', '-i', '-e', '1i\\src:', '-e', 's:path = \\(vendor/[^;]*\\);:path = "${src}/\\1";:g', 'gemset.nix'], cwd=rubyenv_dir) + subprocess.check_output(['rm', '-rf', 'vendor'], cwd=rubyenv_dir) - f.write(gemfile) - - with open(rubyenv_dir / 'Gemfile.lock', 'w') as f: - for gem in VENDORED_GEMS: - gemfile_lock = gemfile_lock.replace(f'remote: vendor/gems/{gem}', f'remote: {gem}') - - f.write(gemfile_lock) @cli.command('update-gitaly') diff --git a/pkgs/tools/misc/gitlint/default.nix b/pkgs/applications/version-management/gitlint/default.nix similarity index 95% rename from pkgs/tools/misc/gitlint/default.nix rename to pkgs/applications/version-management/gitlint/default.nix index 626739864c71..6adb5bdc7a3f 100644 --- a/pkgs/tools/misc/gitlint/default.nix +++ b/pkgs/applications/version-management/gitlint/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { sh ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ gitMinimal pytestCheckHook ]; diff --git a/pkgs/tools/security/gitls/default.nix b/pkgs/applications/version-management/gitls/default.nix similarity index 100% rename from pkgs/tools/security/gitls/default.nix rename to pkgs/applications/version-management/gitls/default.nix diff --git a/pkgs/applications/version-management/gitmux/default.nix b/pkgs/applications/version-management/gitmux/default.nix new file mode 100644 index 000000000000..7e66985bb886 --- /dev/null +++ b/pkgs/applications/version-management/gitmux/default.nix @@ -0,0 +1,35 @@ +{ fetchFromGitHub, buildGoModule, lib, testers, gitmux }: + +buildGoModule rec { + pname = "gitmux"; + version = "0.7.10"; + + src = fetchFromGitHub { + owner = "arl"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-kBrE3jU7N8+kdT4tqC6gIGPz3soagStzLy5Iz4vNFI0="; + }; + + vendorSha256 = "sha256-V6xe+19NiHYIIN4rgkyzdP4eGnRXo0aW4fVbdlIcvig="; + + # GitHub source does contain a regression test for the module + # but it requires networking as it git clones a repo from github + doCheck = false; + + ldflags = [ "-X main.version=${version}" ]; + + passthru.tests.version = testers.testVersion { + package = gitmux; + command = "gitmux -V"; + }; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Git in your tmux status bar"; + homepage = "https://github.com/arl/gitmux"; + license = licenses.mit; + maintainers = with maintainers; [ nialov ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix b/pkgs/applications/version-management/gitnuro/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitnuro/default.nix rename to pkgs/applications/version-management/gitnuro/default.nix diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 2f207e8ee474..d2a51c94727a 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "sha256-VB7v51YW4aA5WHVD5ZWFzv9hQskjQeqMzm+pQ9glODg="; + sha256 = "sha256-GGXujTn5Xb63vKIycj5o9+PCsMN1Kp3RCSg1wiM31qA="; }; - cargoSha256 = "sha256-uII6o/cJktpUFxROuu11dNSXx0p6phVVqszmbYK9Rd0="; + cargoSha256 = "sha256-MAZhrd9CtFOIAaUUbXplBo+eo6Zaws2LIRkPoX4HztE="; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = if stdenv.isDarwin diff --git a/pkgs/applications/version-management/gitprompt-rs/default.nix b/pkgs/applications/version-management/gitprompt-rs/default.nix new file mode 100644 index 000000000000..6980c8f22576 --- /dev/null +++ b/pkgs/applications/version-management/gitprompt-rs/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, rustPlatform, git }: + +rustPlatform.buildRustPackage rec { + pname = "gitprompt-rs"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "9ary"; + repo = pname; + rev = version; + sha256 = "00xxz7awk01981daabp8m3kwq127y733ynijiwqgs8xvn4nkg8h6"; + }; + + cargoSha256 = "0avs833vb6q1avjbfygm55s83iy942xgqsx6qdzksry44n35s418"; + + postPatch = '' + substituteInPlace src/main.rs \ + --replace 'Command::new("git")' 'Command::new("${git}/bin/git")' + ''; + + meta = with lib; { + description = "Simple Git prompt"; + homepage = "https://github.com/9ary/gitprompt-rs"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ novenary ]; + }; +} diff --git a/pkgs/tools/security/gitsign/default.nix b/pkgs/applications/version-management/gitsign/default.nix similarity index 83% rename from pkgs/tools/security/gitsign/default.nix rename to pkgs/applications/version-management/gitsign/default.nix index f6d61ce25e09..11a8394a63c4 100644 --- a/pkgs/tools/security/gitsign/default.nix +++ b/pkgs/applications/version-management/gitsign/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "gitsign"; - version = "0.3.2"; + version = "0.4.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hDVn7ZiZoY0FSgIsApZliMIq1xjuNdg+DMvKzP5kET0="; + sha256 = "sha256-lSE4BLwtxicngvnDCcMa6F6c3+Okn9NKAOnT2FGi7kU="; }; - vendorSha256 = "sha256-5hVcul5DlHZ0Gtw1LdBmxGpsmuD2bTtwPGysOUwe2k0="; + vendorSha256 = "sha256-WrVunAxOXXGSbs9OyKydeg4N/s871mt2O3t2e5DxXQo="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/applications/version-management/gitstats/default.nix index 6cfcb0077427..a795f0f6f6dd 100644 --- a/pkgs/applications/version-management/gitstats/default.nix +++ b/pkgs/applications/version-management/gitstats/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, perl, python2, gnuplot, coreutils, gnugrep }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, installShellFiles +, perl +, python3 +, gnuplot +, coreutils +, gnugrep +}: stdenv.mkDerivation rec { pname = "gitstats"; @@ -12,9 +22,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-qUQB3aCRbPkbMoMf39kPQ0vil8RjXL8RqjdTryfkzK0="; }; - nativeBuildInputs = [ perl ]; + patches = [ + # make gitstats compatible with python3 + # https://github.com/hoxu/gitstats/pull/105 + (fetchpatch { + name = "convert-gitstats-to-use-python3.patch"; + url = "https://github.com/hoxu/gitstats/commit/ca415668ce6b739ca9fefba6acd29c63b89f4211.patch"; + hash = "sha256-sgjoj8eQ5CxQBffmhqymsmXb8peuaSbfFoWciLK3LOo="; + }) + ]; - buildInputs = [ python2 ]; + nativeBuildInputs = [ installShellFiles perl ]; + + buildInputs = [ python3 ]; strictDeps = true; @@ -25,20 +45,22 @@ stdenv.mkDerivation rec { -i gitstats ''; - buildPhase = '' - make man VERSION="${version}" - ''; + makeFlags = [ + "PREFIX=$(out)" + "VERSION=${version}" + ]; - installPhase = '' - make install PREFIX="$out" VERSION="${version}" - install -Dm644 doc/gitstats.1 "$out"/share/man/man1/gitstats.1 + buildFlags = [ "man" ]; + + postInstall = '' + installManPage doc/gitstats.1 ''; meta = with lib; { - homepage = "http://gitstats.sourceforge.net/"; + homepage = "https://gitstats.sourceforge.net/"; description = "Git history statistics generator"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/gitstatus/default.nix similarity index 98% rename from pkgs/applications/version-management/git-and-tools/gitstatus/default.nix rename to pkgs/applications/version-management/gitstatus/default.nix index 4b669c27252e..21e8bafcd0b3 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/gitstatus/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # that the script was sourced successfully and that the "gitstatus_query" # command ran successfully. This tests the binary itself and the zsh # integration. - installCheckInputs = [ git zsh ]; + nativeInstallCheckInputs = [ git zsh ]; doInstallCheck = true; installCheckPhase = '' TEMP=$(mktemp -d) diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/gitstatus/romkatv_libgit2.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix rename to pkgs/applications/version-management/gitstatus/romkatv_libgit2.nix diff --git a/pkgs/applications/version-management/git-and-tools/gitty/default.nix b/pkgs/applications/version-management/gitty/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitty/default.nix rename to pkgs/applications/version-management/gitty/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/gitui/default.nix similarity index 86% rename from pkgs/applications/version-management/git-and-tools/gitui/default.nix rename to pkgs/applications/version-management/gitui/default.nix index 3b383647c2c9..a161fb2c6b1b 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/gitui/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZLGA0LHdGPqIoNG2k4nunVWYlOnwRT8nqTSwUWGkfCU="; + sha256 = "sha256-K6xWTPu2a5NKYAYBt/sCWQOmuw9TCoKPA4ZxkoLWmeY="; }; - cargoSha256 = "sha256-ArJerq3gLzPm66RWDCvkpPFyh7ZyaoqLO/3zSjFTL04="; + cargoSha256 = "sha256-MZrx72poA6uOIulWIQkfOr9gy5qr5f61UtLITfES/rk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/gitweb/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gitweb/default.nix rename to pkgs/applications/version-management/gitweb/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/glab/default.nix similarity index 62% rename from pkgs/applications/version-management/git-and-tools/glab/default.nix rename to pkgs/applications/version-management/glab/default.nix index 70d82410997c..9d6bbbd13f67 100644 --- a/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/pkgs/applications/version-management/glab/default.nix @@ -1,19 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, stdenv }: +{ lib, buildGoModule, fetchFromGitLab, installShellFiles, stdenv }: buildGoModule rec { pname = "glab"; - version = "1.22.0"; + version = "1.24.1"; - src = fetchFromGitHub { - owner = "profclems"; - repo = pname; + src = fetchFromGitLab { + owner = "gitlab-org"; + repo = "cli"; rev = "v${version}"; - sha256 = "sha256-7w6cbeZYhmV0EXXcWlXFq2pQGGxc5Ok4bba0g3fcgmE="; + sha256 = "sha256-CUchYPMBTINkMJg8TC8rKMVkrcj/Gy+ZxV7jbtMFvpg="; }; - vendorSha256 = "sha256-hGpJXCs5lZ6QQHr6LW1fCT+CVtOaUpYXJPchDPDdbaM="; + vendorSha256 = "sha256-NuK63ibb1t+HnSR/gCFS7HWVtfGLazVx2M+qxRNCR1I="; ldflags = [ + "-s" + "-w" "-X main.version=${version}" ]; @@ -34,9 +36,9 @@ buildGoModule rec { ''; meta = with lib; { - description = "An open-source GitLab command line tool"; + description = "GitLab CLI tool bringing GitLab to your command line"; license = licenses.mit; - homepage = "https://glab.readthedocs.io/"; + homepage = "https://gitlab.com/gitlab-org/cli"; maintainers = with maintainers; [ freezeboy ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/glitter/default.nix b/pkgs/applications/version-management/glitter/default.nix similarity index 82% rename from pkgs/applications/version-management/git-and-tools/glitter/default.nix rename to pkgs/applications/version-management/glitter/default.nix index e51791042b99..5786ebc8a650 100644 --- a/pkgs/applications/version-management/git-and-tools/glitter/default.nix +++ b/pkgs/applications/version-management/glitter/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, git }: rustPlatform.buildRustPackage rec { pname = "glitter"; @@ -13,6 +13,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-GQ7Bns+FPj4jl2dBXnMrmcKIYcZTLZc1WvaHgKGj/gU="; + nativeCheckInputs = [ + git + ]; + # tests require it to be in a git repository preCheck = '' git init @@ -24,6 +28,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A git wrapper that allows you to compress multiple commands into one"; homepage = "https://github.com/milo123459/glitter"; + changelog = "https://github.com/Milo123459/glitter/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index 00b49f2957ad..e601b1165f5d 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.79"; + version = "0.83"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "sha256-eL4cCpBRhO0ctQZGg1n6+H5O6GhRKRsWcEOcRr+z2Hw="; + sha256 = "sha256-kNhU6OR9IUNPL72D90nhq2X5vmVW7YUmpnq/EOUvG/8="; }; nativeBuildInputs = [ pkg-config bison ]; diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 584dd97d3e22..d0175251e6ec 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gource"; - version = "0.53"; + version = "0.54"; src = fetchurl { url = "https://github.com/acaudwell/Gource/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - hash = "sha256-PV9kwcaBL2RMMgy8mphY35e8YDb8Hl9gPKRrFbjdcjc="; + hash = "sha256-HcvO32XSz01p/gtjPlTCApJsCLgpvK0Lc+r54pzW+uU="; }; postPatch = '' diff --git a/pkgs/applications/version-management/git-and-tools/gst/default.nix b/pkgs/applications/version-management/gst/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/gst/default.nix rename to pkgs/applications/version-management/gst/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/hub/default.nix similarity index 98% rename from pkgs/applications/version-management/git-and-tools/hub/default.nix rename to pkgs/applications/version-management/hub/default.nix index cb75ec826464..307bf0e6f408 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/hub/default.nix @@ -50,7 +50,7 @@ buildGoModule rec { --suffix PATH : ${lib.makeBinPath [ git ]} ''; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/pkgs/applications/version-management/git-and-tools/hut/default.nix b/pkgs/applications/version-management/hut/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/hut/default.nix rename to pkgs/applications/version-management/hut/default.nix diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix index e9b9d02ca6c3..d198b528f2ad 100644 --- a/pkgs/applications/version-management/jujutsu/default.nix +++ b/pkgs/applications/version-management/jujutsu/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "jujutsu"; - version = "0.5.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - sha256 = "sha256-ITYpdCUh+WzP2RrAkSep3DsQ7dztvOMuwESKimn8JBQ="; + sha256 = "sha256-ajBL2o5i4UmclL/s9eEVtn/p51/F4gsClmcYBrAZ+1o="; }; - cargoSha256 = "sha256-eH8/R4dwQ08Q7Dyw8CnE+DGjneAmtTdsRben2cxpG8Q="; + cargoSha256 = "sha256-RgF2StIMfFzbp0azG4yRPvzrZ4kczWtOWVd+KTTPbRw="; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/lab/default.nix similarity index 87% rename from pkgs/applications/version-management/git-and-tools/lab/default.nix rename to pkgs/applications/version-management/lab/default.nix index 754fa778fed9..38531775b99e 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/lab/default.nix @@ -22,14 +22,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.version=${version}" ]; postInstall = '' - # make xdg-open overrideable at runtime - wrapProgram $out/bin/lab \ - --prefix PATH ":" "${lib.makeBinPath [ git ]}" \ - --suffix PATH ":" "${lib.makeBinPath [ xdg-utils ]}" + # create shell completions before wrapProgram so that lab detects the right path for itself installShellCompletion --cmd lab \ --bash <($out/bin/lab completion bash) \ --fish <($out/bin/lab completion fish) \ --zsh <($out/bin/lab completion zsh) + # make xdg-open overrideable at runtime + wrapProgram $out/bin/lab \ + --suffix PATH ":" "${lib.makeBinPath [ git xdg-utils ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/lefthook/default.nix similarity index 84% rename from pkgs/applications/version-management/git-and-tools/lefthook/default.nix rename to pkgs/applications/version-management/lefthook/default.nix index def387980d63..7973b8ff1c04 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/lefthook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lefthook"; - version = "1.2.1"; + version = "1.2.8"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-ZMqqiPSNNJw9t3p5h/GUHa9cvl9LcJ4u0HMf1ag8qCc="; + sha256 = "sha256-hW3zKco0c90eIwWefHLABAZGUc2fGHsGnyPaSa/zGuQ="; }; - vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ="; + vendorHash = "sha256-Dx9OL1D4VNfVQ0NUJr9aq54PXHecgMMtLg7GMFnQFCI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/legit/default.nix b/pkgs/applications/version-management/legit/default.nix similarity index 93% rename from pkgs/applications/version-management/git-and-tools/legit/default.nix rename to pkgs/applications/version-management/legit/default.nix index df2866527115..33efad77f908 100644 --- a/pkgs/applications/version-management/git-and-tools/legit/default.nix +++ b/pkgs/applications/version-management/legit/default.nix @@ -1,8 +1,11 @@ -{ lib, python3Packages }: +{ lib +, python3Packages +}: python3Packages.buildPythonApplication rec { pname = "legit"; version = "1.2.0"; + src = python3Packages.fetchPypi { inherit pname version; sha256 = "0ngh3ar6v15516f52j21k6qz7hykmxfjadhb2rakvl27b5xvjy1c"; @@ -12,7 +15,7 @@ python3Packages.buildPythonApplication rec { click clint crayons - GitPython + gitpython six ]; diff --git a/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix b/pkgs/applications/version-management/lucky-commit/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix rename to pkgs/applications/version-management/lucky-commit/default.nix diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index b3af90c2a38e..467359d9c901 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.3.0"; + version = "6.3.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-iAOZtVSh3mQQFs5fNbiEDXXxjWh7mrHDWNrAWK1m5pg="; + sha256 = "sha256-z+butd2JOrMsC3nBUxqsQgdz4PyDejXbPU2ScD30Wpg="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-VfIZ1bV8bhjjBL4KNjToPuu8gg9TkChziH2rRKhdRXE="; + sha256 = "sha256-pJNX0j/Rg3cQanveD7z2x5wixo/jLvHai8Ib2Akmmgk"; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; @@ -157,9 +157,9 @@ let # https://bz.mercurial-scm.org/show_bug.cgi?id=6727 test-patchbomb-tls.t - # Test broken with recent versions of git due to default policy change - # https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/302 - test-convert-git.t + # Test wanting TLS 1.0 and 1.1, not available with OpenSSL v3. + # https://bz.mercurial-scm.org/show_bug.cgi?id=6760 + test-https.t EOF export HGTEST_REAL_HG="${mercurial}/bin/hg" diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index 3c92a93851bf..2e71206aff23 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, ocamlPackages, gnome2, pkg-config, makeWrapper, glib -, libtool, libpng, bison, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw +, libtool, libpng, bison, expat, fontconfig, gd, pango, libjpeg, libwebp, libX11, libXaw }: # We need an old version of Graphviz for format compatibility reasons. # This version is vulnerable, but monotone-viz will never feed it bad input. let graphviz_2_0 = import ./graphviz-2.0.nix { - inherit lib stdenv fetchurl pkg-config xlibsWrapper libpng libjpeg expat libXaw + inherit lib stdenv fetchurl pkg-config libX11 libpng libjpeg expat libXaw bison libtool fontconfig pango gd libwebp; }; in let inherit (gnome2) libgnomecanvas; in @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { version = "1.0.2"; pname = "monotone-viz"; - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 camlp4]; + nativeBuildInputs = [ pkg-config makeWrapper ocaml camlp4 ]; + buildInputs = [ lablgtk libgnomecanvas glib graphviz_2_0 ]; src = fetchurl { url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz"; sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk"; diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix index e3c48c5724f7..05a0abe93c52 100644 --- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix +++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , pkg-config -, xlibsWrapper +, libX11 , libpng , libjpeg , expat @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xlibsWrapper + libX11 libpng libjpeg expat @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "--with-ltdl-include=${libtool}/include" "--with-ltdl-lib=${libtool.lib}/lib" ] - ++ lib.optional (xlibsWrapper == null) "--without-x"; + ++ lib.optional (libX11 == null) "--without-x"; meta = { description = "A program for visualising graphs"; diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 77540deb909f..e88f21a85cb1 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -1,20 +1,17 @@ -{lib, python, git, mercurial, coreutils}: +{ lib +, python3 +, coreutils +, git +, mercurial +}: -with python.pkgs; -buildPythonApplication rec { - version = "0.6.0"; +python3.pkgs.buildPythonApplication rec { + version = "0.6.1"; pname = "nbstripout"; - # Mercurial should be added as a build input but because it's a Python - # application, it would mess up the Python environment. Thus, don't add it - # here, instead add it to PATH when running unit tests - checkInputs = [ pytest pytest-flake8 git ]; - nativeBuildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ ipython nbformat ]; - - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-TWxDAhVqskaMyOcgLvKPNN2RhFFOIeRDQLzShpaMgss="; + hash = "sha256-kGW83RSIs4bk88CB/8HUj0UTovjYv00NmiggjF2v6dM="; }; # for some reason, darwin uses /bin/sh echo native instead of echo binary, so @@ -23,9 +20,24 @@ buildPythonApplication rec { substituteInPlace tests/test-git.t --replace "echo" "${coreutils}/bin/echo" ''; - # ignore flake8 tests for the nix wrapped setup.py - checkPhase = '' - PATH=$PATH:$out/bin:${mercurial}/bin pytest . + propagatedBuildInputs = with python3.pkgs; [ + ipython + nbformat + ]; + + nativeCheckInputs = [ + coreutils + git + mercurial + ] ++ (with python3.pkgs; [ + pytest-cram + pytestCheckHook + ]); + + preCheck = '' + export HOME=$(mktemp -d) + export PATH=$out/bin:$PATH + git config --global init.defaultBranch main ''; meta = { diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/pass-git-helper/default.nix similarity index 93% rename from pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix rename to pkgs/applications/version-management/pass-git-helper/default.nix index 63f7a459a70a..7085e0c48f25 100644 --- a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix +++ b/pkgs/applications/version-management/pass-git-helper/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ pyxdg ]; - checkInputs = [ pytest pytest-mock ]; + nativeCheckInputs = [ pytest pytest-mock ]; preCheck = '' export HOME=$(mktemp -d) ''; diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/qgit/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/qgit/default.nix rename to pkgs/applications/version-management/qgit/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/radicle-cli/default.nix b/pkgs/applications/version-management/radicle-cli/default.nix similarity index 97% rename from pkgs/applications/version-management/git-and-tools/radicle-cli/default.nix rename to pkgs/applications/version-management/radicle-cli/default.nix index a8df056774a2..f74ae1cf37a3 100644 --- a/pkgs/applications/version-management/git-and-tools/radicle-cli/default.nix +++ b/pkgs/applications/version-management/radicle-cli/default.nix @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { done ''; - checkInputs = [ openssh ]; + nativeCheckInputs = [ openssh ]; preCheck = '' eval $(ssh-agent) ''; diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/radicle-upstream/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix rename to pkgs/applications/version-management/radicle-upstream/default.nix diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 4bede0ac82b6..0027af3defe9 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, wxGTK30-gtk3, subversion, apr, aprutil, python3, fetchpatch }: +{ lib, stdenv, fetchurl, wxGTK30, subversion, apr, aprutil, python3, fetchpatch }: stdenv.mkDerivation rec { pname = "rapidsvn"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p"; }; - buildInputs = [ wxGTK30-gtk3 subversion apr aprutil python3 ]; + buildInputs = [ wxGTK30 subversion apr aprutil python3 ]; NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; diff --git a/pkgs/applications/version-management/rcshist/default.nix b/pkgs/applications/version-management/rcshist/default.nix index a9c7bbefc131..f7cdceaa1b4c 100644 --- a/pkgs/applications/version-management/rcshist/default.nix +++ b/pkgs/applications/version-management/rcshist/default.nix @@ -1,12 +1,17 @@ { lib , stdenv , fetchurl +, musl-fts }: stdenv.mkDerivation { pname = "rcshist"; version = "1.04"; + configureFlags = lib.optional stdenv.hostPlatform.isMusl "LIBS=-lfts"; + + buildInputs = lib.optional stdenv.hostPlatform.isMusl musl-fts; + src = fetchurl { url = "https://web.archive.org/web/20220508220019/https://invisible-island.net/datafiles/release/rcshist.tar.gz"; sha256 = "01ab3xwgm934lxr8bm758am3vxwx4hxx7cc9prbgqj5nh30vdg1n"; diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index 7e5cf752bc88..30bb8cc171a3 100644 --- a/pkgs/applications/version-management/redmine/Gemfile +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -65,13 +65,14 @@ end group :test do gem "rails-dom-testing" - gem 'mocha', '>= 1.4.0' + gem 'mocha', (Gem.ruby_version < Gem::Version.new('2.7.0') ? ['>= 1.4.0', '< 2.0.0'] : '>= 1.4.0') gem 'simplecov', '~> 0.18.5', :require => false gem "ffi", platforms: [:mingw, :x64_mingw, :mswin] # For running system tests - gem 'puma' + # TODO: Remove version specification once Capybara supports Puma 6 + gem 'puma', '< 6.0.0' gem 'capybara', '~> 3.31.0' - gem "selenium-webdriver" + gem "selenium-webdriver", "~> 3.142.7" gem 'webdrivers', '~> 4.4', require: false # RuboCop gem 'rubocop', '~> 1.12.0' diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index c57844b49a28..722205e17dbe 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -58,7 +58,7 @@ GEM rack-test (>= 0.6.3) regexp_parser (~> 1.5) xpath (~> 3.2) - childprocess (4.1.0) + childprocess (3.0.0) chunky_png (1.4.0) concurrent-ruby (1.1.10) crass (1.0.6) @@ -72,7 +72,7 @@ GEM htmlentities (4.3.4) i18n (1.8.11) concurrent-ruby (~> 1.0) - loofah (2.19.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -83,21 +83,24 @@ GEM mini_mime (1.0.3) mini_portile2 (2.8.0) minitest (5.16.3) - mocha (1.15.0) + mocha (2.0.2) + ruby2_keywords (>= 0.0.5) mysql2 (0.5.4) net-ldap (0.17.1) nio4r (2.5.8) - nokogiri (1.13.8) + nokogiri (1.13.10) mini_portile2 (~> 2.8.0) racc (~> 1.4) + nokogiri (1.13.10-x86_64-linux) + racc (~> 1.4) parallel (1.22.1) - parser (3.1.2.1) + parser (3.1.3.0) ast (~> 2.4.1) pg (1.2.3) - public_suffix (5.0.0) + public_suffix (5.0.1) puma (5.6.5) nio4r (~> 2.0) - racc (1.6.0) + racc (1.6.1) rack (2.2.4) rack-openid (1.4.2) rack (>= 1.1.0) @@ -120,8 +123,8 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) + rails-html-sanitizer (1.4.4) + loofah (~> 2.19, >= 2.19.1) railties (5.2.8.1) actionpack (= 5.2.8.1) activesupport (= 5.2.8.1) @@ -145,7 +148,7 @@ GEM roadie-rails (2.2.0) railties (>= 5.1, < 6.2) roadie (>= 3.1, < 5.0) - rotp (6.2.0) + rotp (6.2.2) rouge (3.26.1) rqrcode (2.1.2) chunky_png (~> 1.0) @@ -160,7 +163,7 @@ GEM rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) + rubocop-ast (1.24.0) parser (>= 3.1.1.0) rubocop-performance (1.10.2) rubocop (>= 0.90.0, < 2.0) @@ -171,12 +174,11 @@ GEM rubocop (>= 0.90.0, < 2.0) ruby-openid (2.9.2) ruby-progressbar (1.11.0) + ruby2_keywords (0.0.5) rubyzip (2.3.2) - selenium-webdriver (4.5.0) - childprocess (>= 0.5, < 5.0) - rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2, < 3.0) - websocket (~> 1.0) + selenium-webdriver (3.142.7) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) simplecov (0.18.5) docile (~> 1.1) simplecov-html (~> 0.11) @@ -198,7 +200,6 @@ GEM rubyzip (>= 1.3.0) selenium-webdriver (> 3.141, < 5.0) webrick (1.7.0) - websocket (1.2.9) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -227,7 +228,7 @@ DEPENDENCIES net-ldap (~> 0.17.0) nokogiri (~> 1.13.6) pg (~> 1.2.2) - puma + puma (< 6.0.0) rack-openid rails (= 5.2.8.1) rails-dom-testing @@ -243,7 +244,7 @@ DEPENDENCIES rubocop-rails (~> 2.9.0) ruby-openid (~> 2.9.2) rubyzip (~> 2.3.0) - selenium-webdriver + selenium-webdriver (~> 3.142.7) simplecov (~> 0.18.5) tzinfo-data webdrivers (~> 4.4) @@ -253,4 +254,4 @@ RUBY VERSION ruby 2.7.6p219 BUNDLED WITH - 2.3.9 + 2.3.26 diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 9da39ba4b1c9..d71b570b7dfe 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, nixosTests }: let - version = "4.2.8"; + version = "4.2.9"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-C0McBS2P02uTIB2vrzYVzbjQNGDvzyQA59MmYrKrYnI="; + sha256 = "sha256-04dBNF9u/RDAeYmAk7JZ2NxNzY5B38T2RkloWueoyx4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index 5248ff369830..fa34afaa4d60 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -166,10 +166,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lvcp8bsd35g57f7wz4jigcw2sryzzwrpcgjwwf3chmjrjcww5in"; + sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; type = "gem"; }; - version = "4.1.0"; + version = "3.0.0"; }; chunky_png = { groups = ["default"]; @@ -280,10 +280,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; + sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; type = "gem"; }; - version = "2.19.0"; + version = "2.19.1"; }; mail = { dependencies = ["mini_mime"]; @@ -357,14 +357,15 @@ version = "5.16.3"; }; mocha = { + dependencies = ["ruby2_keywords"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z2nzk106b6af6n0d9xqf2sphaff4gpjgxvwqcmvy6k719hqhkh9"; + sha256 = "03bgnshh84hrw6f1sdj5srxnz0z50m0a7i93fa28fkbm52c2a1lg"; type = "gem"; }; - version = "1.15.0"; + version = "2.0.2"; }; mysql2 = { groups = ["default"]; @@ -410,10 +411,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; + sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; type = "gem"; }; - version = "1.13.8"; + version = "1.13.10"; }; parallel = { groups = ["default" "test"]; @@ -431,10 +432,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; + sha256 = "17qfhjvnr9q2gp1gfdl6kndy2mb6qdwsls3vnjhb1h8ddimdm4s5"; type = "gem"; }; - version = "3.1.2.1"; + version = "3.1.3.0"; }; pg = { groups = ["default"]; @@ -459,10 +460,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; + sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; type = "gem"; }; - version = "5.0.0"; + version = "5.0.1"; }; puma = { dependencies = ["nio4r"]; @@ -480,10 +481,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "0p685i23lr8pl7l09g9l2mcj615fr7g33w3mkcr472lcg34nq8n8"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; rack = { groups = ["default" "openid" "test"]; @@ -545,10 +546,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf"; + sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.4"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; @@ -670,10 +671,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11q7rkjx40yi6lpylgl2jkpy162mjw7mswrcgcax86vgpbpjx6i3"; + sha256 = "10mmzc85y7andsich586ndykw678qn1ns2wpjxrg0sc0gr4w3pig"; type = "gem"; }; - version = "6.2.0"; + version = "6.2.2"; }; rouge = { groups = ["default"]; @@ -723,10 +724,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4m9h9hzrpfmsnswvfimafmjwfa79cbqh9dvq18cja32dhrhpcg"; + sha256 = "0sqkg84npyq9z4d3z46w59zyr1r1rbd1mrrlglws9ksw04wdq5x9"; type = "gem"; }; - version = "1.21.0"; + version = "1.24.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -770,6 +771,16 @@ }; version = "1.11.0"; }; + ruby2_keywords = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; + }; rubyzip = { groups = ["default" "test"]; platforms = []; @@ -781,15 +792,15 @@ version = "2.3.2"; }; selenium-webdriver = { - dependencies = ["childprocess" "rexml" "rubyzip" "websocket"]; + dependencies = ["childprocess" "rubyzip"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fp7h5bnlqp649imgpnshgf3mxl8zwnpsl1ak1giii81r0cd6in3"; + sha256 = "0adcvp86dinaqq3nhf8p3m0rl2g6q0a4h52k0i7kdnsg1qz9k86y"; type = "gem"; }; - version = "4.5.0"; + version = "3.142.7"; }; simplecov = { dependencies = ["docile" "simplecov-html"]; @@ -896,16 +907,6 @@ }; version = "1.7.0"; }; - websocket = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; - type = "gem"; - }; - version = "1.2.9"; - }; websocket-driver = { dependencies = ["websocket-extensions"]; groups = ["default"]; diff --git a/pkgs/applications/version-management/git-and-tools/rs-git-fsmonitor/default.nix b/pkgs/applications/version-management/rs-git-fsmonitor/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/rs-git-fsmonitor/default.nix rename to pkgs/applications/version-management/rs-git-fsmonitor/default.nix diff --git a/pkgs/applications/version-management/sapling/Cargo.lock b/pkgs/applications/version-management/sapling/Cargo.lock new file mode 100644 index 000000000000..cd4fee219455 --- /dev/null +++ b/pkgs/applications/version-management/sapling/Cargo.lock @@ -0,0 +1,7690 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "abomonation" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e72913c99b1f927aa7bd59a41518fdd9995f63ffc8760f211609e0241c4fb2" + +[[package]] +name = "abomonation_derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e50e2a046af56a864c62d97b7153fda72c596e646be1b0c7963736821f6e1efa" +dependencies = [ + "proc-macro2", + "quote", + "synstructure", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom 0.2.8", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "anyhow" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[package]] +name = "assert-json-diff" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4259cbe96513d2f1073027a259fc2ca917feb3026a5a8d984e3628e490255cc0" +dependencies = [ + "extend", + "serde", + "serde_json", +] + +[[package]] +name = "assert_matches" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" + +[[package]] +name = "async-compression" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +dependencies = [ + "brotli", + "bzip2", + "flate2", + "futures-core", + "futures-io", + "memchr", + "pin-project-lite", + "tokio", + "zstd", + "zstd-safe", +] + +[[package]] +name = "async-io" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" +dependencies = [ + "async-lock", + "autocfg", + "concurrent-queue", + "futures-lite", + "libc", + "log", + "parking", + "polling", + "slab", + "socket2", + "waker-fn", + "windows-sys", +] + +[[package]] +name = "async-lock" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" +dependencies = [ + "event-listener", + "futures-lite", +] + +[[package]] +name = "async-runtime" +version = "0.1.0" +dependencies = [ + "futures 0.3.25", + "num_cpus", + "once_cell", + "tokio", +] + +[[package]] +name = "async-trait" +version = "0.1.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "atomicfile" +version = "0.1.0" +dependencies = [ + "tempfile", + "tracing", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "auth" +version = "0.1.0" +dependencies = [ + "anyhow", + "chrono", + "configmodel", + "indexmap", + "once_cell", + "pem", + "simple_asn1", + "staticconfig", + "thiserror", + "tracing", + "url", + "util", +] + +[[package]] +name = "auto_impl" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42cbf586c80ada5e5ccdecae80d3ef0854f224e2dd74435f8d87e6831b8d0a38" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backingstore" +version = "0.1.0" +dependencies = [ + "anyhow", + "configloader", + "eagerepo", + "edenapi", + "env_logger 0.7.1", + "identity", + "libc", + "log", + "manifest", + "parking_lot 0.11.2", + "revisionstore", + "tracing", + "tracing-collector", + "tracing-subscriber", + "types", +] + +[[package]] +name = "base64" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +dependencies = [ + "byteorder", +] + +[[package]] +name = "base64" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindag" +version = "0.1.0" +dependencies = [ + "dag", + "drawdag", + "nonblocking", + "tempfile", + "vlqencoding", +] + +[[package]] +name = "bindings" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "paste", + "pyauth", + "pyblackbox", + "pybytes", + "pycats", + "pycheckout", + "pyclientinfo", + "pycliparser", + "pyconfigloader", + "pydag", + "pydiffhelpers", + "pydirs", + "pydoctor", + "pydrawdag", + "pyeagerepo", + "pyedenapi", + "pyerror", + "pyexchange", + "pyfail", + "pyfs", + "pygitstore", + "pyhgmetrics", + "pyhgtime", + "pyidentity", + "pyindexedlog", + "pyio", + "pylock", + "pylz4", + "pymanifest", + "pymetalog", + "pymutationstore", + "pynodemap", + "pypathhistory", + "pypathmatcher", + "pypprint", + "pyprocess", + "pyprogress", + "pyrefencode", + "pyregex", + "pyrenderdag", + "pyrepo", + "pyrevisionstore", + "pyrevlogindex", + "pysptui", + "pystatus", + "pythreading", + "pytracing", + "pytreestate", + "pyvlq", + "pyworker", + "pyworkingcopy", + "pyzstd", + "pyzstore", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "blackbox" +version = "0.1.0" +dependencies = [ + "anyhow", + "byteorder", + "indexedlog", + "lazy_static", + "libc", + "minibench", + "parking_lot 0.11.2", + "serde", + "serde_alt", + "serde_cbor", + "serde_derive", + "serde_json", + "tempfile", +] + +[[package]] +name = "blake2" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" +dependencies = [ + "crypto-mac", + "digest 0.9.0", + "opaque-debug", +] + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "brotli" +version = "3.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bstr" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +dependencies = [ + "lazy_static", + "memchr", + "regex-automata", + "serde", +] + +[[package]] +name = "bstr" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bufsize" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ccc76d50a81d3a49665c71444ecefed1d1386477cb700c6fb7db517454fe1ff" +dependencies = [ + "bytes 1.3.0", +] + +[[package]] +name = "bumpalo" +version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" +dependencies = [ + "byteorder", + "iovec", +] + +[[package]] +name = "bytes" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +dependencies = [ + "serde", +] + +[[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + +[[package]] +name = "cast" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cats" +version = "0.1.0" +dependencies = [ + "anyhow", + "configmodel", + "indexmap", + "serde", + "serde_json", + "thiserror", + "tracing", + "util", +] + +[[package]] +name = "cc" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "checkout" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "async-trait", + "configmodel", + "fail", + "futures 0.3.25", + "io", + "manifest", + "manifest-tree", + "minibytes", + "parking_lot 0.11.2", + "pathmatcher", + "progress-model", + "quickcheck", + "repo", + "repolock", + "serde_json", + "status", + "storemodel", + "tempfile", + "thiserror", + "tokio", + "tracing", + "treestate", + "types", + "util", + "vfs", + "walkdir", + "workingcopy", +] + +[[package]] +name = "chrono" +version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-integer", + "num-traits", + "serde", + "time 0.1.45", + "wasm-bindgen", + "winapi 0.3.9", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim 0.8.0", + "term_size", + "textwrap 0.11.0", + "unicode-width", + "vec_map", +] + +[[package]] +name = "clap" +version = "3.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +dependencies = [ + "atty", + "bitflags", + "clap_derive", + "clap_lex", + "indexmap", + "once_cell", + "regex", + "strsim 0.10.0", + "termcolor", + "terminal_size 0.2.3", + "textwrap 0.16.0", + "unicase", +] + +[[package]] +name = "clap_derive" +version = "3.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +dependencies = [ + "heck 0.4.0", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "clidispatch" +version = "0.1.0" +dependencies = [ + "anyhow", + "blackbox", + "cliparser", + "configloader", + "configmodel", + "hgplain", + "identity", + "indexedlog", + "io", + "network-doctor", + "repo", + "termlogger", + "thiserror", + "thrift-types", + "tracing", + "types", + "util", + "workingcopy", +] + +[[package]] +name = "clientinfo" +version = "0.1.0" +dependencies = [ + "anyhow", + "configmodel", + "hostname 0.1.0", + "serde", + "serde_json", +] + +[[package]] +name = "cliparser" +version = "0.1.0" +dependencies = [ + "anyhow", + "cpython", + "cpython_ext", + "shlex", + "thiserror", +] + +[[package]] +name = "clone" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "checkout", + "configmodel", + "manifest-tree", + "repo", + "tempfile", + "termlogger", + "thiserror", + "tracing", + "treestate", + "types", + "util", + "vfs", +] + +[[package]] +name = "cloned" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" + +[[package]] +name = "codegen_includer_proc_macro" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +dependencies = [ + "quote", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "colored" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" +dependencies = [ + "atty", + "lazy_static", + "winapi 0.3.9", +] + +[[package]] +name = "comfy-table" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11e95a3e867422fd8d04049041f5671f94d53c32a9dcd82e2be268714942f3f3" +dependencies = [ + "crossterm", + "strum", + "strum_macros", + "unicode-width", +] + +[[package]] +name = "commitcloudsubscriber" +version = "0.1.0" +dependencies = [ + "anyhow", + "filetime", + "hostcaps", + "identity", + "lazy_static", + "log", + "mime", + "regex", + "reqwest", + "rust-ini", + "serde", + "serde_json", + "tempfile", + "thiserror", +] + +[[package]] +name = "conch-parser" +version = "0.1.1" +dependencies = [ + "serde", + "void", +] + +[[package]] +name = "conch_parser" +version = "0.1.0" +dependencies = [ + "conch-parser", + "cpython", +] + +[[package]] +name = "concurrent-queue" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +dependencies = [ + "crossbeam-utils 0.8.14", +] + +[[package]] +name = "config" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "codegen_includer_proc_macro", + "const-cstr", + "fbthrift", + "futures 0.3.25", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "thiserror", + "thrift_compiler", + "tracing", + "tracing-futures", +] + +[[package]] +name = "config_thrift" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "codegen_includer_proc_macro", + "const-cstr", + "fbthrift", + "futures 0.3.25", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "thiserror", + "thrift_compiler", + "tracing", + "tracing-futures", +] + +[[package]] +name = "configloader" +version = "0.1.0" +dependencies = [ + "anyhow", + "configmodel", + "configset", + "dirs 2.0.2", + "filetime", + "hgplain", + "hgtime", + "hostcaps", + "hostname 0.3.1", + "http-client", + "identity", + "lazy_static", + "minibench", + "minibytes", + "once_cell", + "parking_lot 0.11.2", + "regex", + "serde", + "serde_json", + "serde_urlencoded 0.7.1", + "sha2 0.10.6", + "staticconfig", + "tempdir", + "tempfile", + "tracing", + "types", + "unionconfig", + "url", + "util", + "version", + "zstd", +] + +[[package]] +name = "configmodel" +version = "0.1.0" +dependencies = [ + "anyhow", + "auto_impl", + "minibytes", + "thiserror", + "util", +] + +[[package]] +name = "configset" +version = "0.1.0" +dependencies = [ + "configmodel", + "hgrc-parser", + "indexmap", + "minibytes", + "tempdir", + "tracing", + "util", +] + +[[package]] +name = "console" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9b6515d269224923b26b5febea2ed42b2d5f2ce37284a4dd670fedd6cb8347a" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "windows-sys", +] + +[[package]] +name = "const-cstr" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6" + +[[package]] +name = "control-point" +version = "0.1.0" +dependencies = [ + "anyhow", + "lazy_static", + "parking_lot 0.11.2", + "serde_json", + "tempdir", + "tracing", + "util", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "cpython" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3052106c29da7390237bc2310c1928335733b286287754ea85e6093d2495280e" +dependencies = [ + "libc", + "num-traits", + "paste", + "python3-sys", + "serde", +] + +[[package]] +name = "cpython_async" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "cpython", + "cpython_ext", + "futures 0.3.25", + "itertools 0.10.5", + "tokio", +] + +[[package]] +name = "cpython_ext" +version = "0.1.0" +dependencies = [ + "anyhow", + "cpython", + "io", + "libc", + "once_cell", + "parking_lot 0.11.2", + "python3-sys", + "serde", + "serde_bytes", + "serde_cbor", + "thiserror", + "types", +] + +[[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 = "criterion" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc755679c12bda8e5523a71e4d654b6bf2e14bd838dfc48cde6559a05caf7d1" +dependencies = [ + "atty", + "cast 0.2.7", + "clap 2.34.0", + "criterion-plot", + "csv", + "itertools 0.8.2", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" +dependencies = [ + "cast 0.3.0", + "itertools 0.10.5", +] + +[[package]] +name = "crossbeam" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" +dependencies = [ + "cfg-if 0.1.10", + "crossbeam-channel 0.4.4", + "crossbeam-deque 0.7.4", + "crossbeam-epoch 0.8.2", + "crossbeam-queue 0.2.3", + "crossbeam-utils 0.7.2", +] + +[[package]] +name = "crossbeam" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-channel 0.5.6", + "crossbeam-deque 0.8.2", + "crossbeam-epoch 0.9.13", + "crossbeam-queue 0.3.8", + "crossbeam-utils 0.8.14", +] + +[[package]] +name = "crossbeam-channel" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" +dependencies = [ + "crossbeam-utils 0.6.6", +] + +[[package]] +name = "crossbeam-channel" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +dependencies = [ + "crossbeam-utils 0.7.2", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.14", +] + +[[package]] +name = "crossbeam-deque" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" +dependencies = [ + "crossbeam-epoch 0.8.2", + "crossbeam-utils 0.7.2", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch 0.9.13", + "crossbeam-utils 0.8.14", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +dependencies = [ + "autocfg", + "cfg-if 0.1.10", + "crossbeam-utils 0.7.2", + "lazy_static", + "maybe-uninit", + "memoffset 0.5.6", + "scopeguard", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +dependencies = [ + "autocfg", + "cfg-if 1.0.0", + "crossbeam-utils 0.8.14", + "memoffset 0.7.1", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" +dependencies = [ + "cfg-if 0.1.10", + "crossbeam-utils 0.7.2", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.14", +] + +[[package]] +name = "crossbeam-utils" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" +dependencies = [ + "cfg-if 0.1.10", + "lazy_static", +] + +[[package]] +name = "crossbeam-utils" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +dependencies = [ + "autocfg", + "cfg-if 0.1.10", + "lazy_static", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crossterm" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ebde6a9dd5e331cd6c6f48253254d117642c31653baa475e394657c59c1f7d" +dependencies = [ + "bitflags", + "crossterm_winapi", + "libc", + "mio 0.7.14", + "parking_lot 0.11.2", + "signal-hook 0.3.14", + "signal-hook-mio", + "winapi 0.3.9", +] + +[[package]] +name = "crossterm_winapi" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6966607622438301997d3dac0d2f6e9a90c68bb6bc1785ea98456ab93c0507" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "crypto-mac" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "lab", + "phf 0.11.1", +] + +[[package]] +name = "csv" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +dependencies = [ + "bstr 0.2.17", + "csv-core", + "itoa 0.4.8", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +dependencies = [ + "memchr", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "curl" +version = "0.4.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" +dependencies = [ + "curl-sys", + "libc", + "openssl-probe", + "openssl-sys", + "schannel", + "socket2", + "winapi 0.3.9", +] + +[[package]] +name = "curl-sys" +version = "0.4.59+curl-7.86.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cfce34829f448b08f55b7db6d0009e23e2e86a34e8c2b366269bf5799b4a407" +dependencies = [ + "cc", + "libc", + "libnghttp2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", + "winapi 0.3.9", +] + +[[package]] +name = "cxx" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "dag" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "bitflags", + "byteorder", + "dag-types", + "dev-logger", + "drawdag", + "fail", + "fs2", + "futures 0.3.25", + "indexedlog", + "indexmap", + "itertools 0.10.5", + "mincode", + "minibytes", + "nonblocking", + "once_cell", + "quickcheck", + "rand 0.8.5", + "serde", + "tempfile", + "thiserror", + "tokio", + "tracing", + "unicode-width", + "vlqencoding", +] + +[[package]] +name = "dag-benches" +version = "0.1.0" +dependencies = [ + "bindag", + "dag", + "mincode", + "minibench", + "nonblocking", + "tempfile", +] + +[[package]] +name = "dag-types" +version = "0.1.0" +dependencies = [ + "abomonation", + "abomonation_derive", + "minibytes", + "quickcheck", + "quickcheck_arbitrary_derive", + "serde", +] + +[[package]] +name = "dashmap" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +dependencies = [ + "cfg-if 1.0.0", + "hashbrown 0.12.3", + "lock_api", + "once_cell", + "parking_lot_core 0.9.6", + "rayon", + "serde", +] + +[[package]] +name = "data-encoding" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" + +[[package]] +name = "debugtop" +version = "0.1.0" +dependencies = [ + "anyhow", + "chrono", + "runlog", +] + +[[package]] +name = "deltae" +version = "0.3.0" +source = "git+https://github.com/markbt/deltae?rev=1c6e9c7c9184751bd17795d78896d522e77a2ce4#1c6e9c7c9184751bd17795d78896d522e77a2ce4" + +[[package]] +name = "dev-logger" +version = "0.1.0" +dependencies = [ + "ctor", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "difference" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer 0.10.3", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +dependencies = [ + "cfg-if 0.1.10", + "dirs-sys", +] + +[[package]] +name = "dirs" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi 0.3.9", +] + +[[package]] +name = "dlv-list" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68df3f2b690c1b86e65ef7830956aededf3cb0a16f898f79b9a6f421a7b6211b" +dependencies = [ + "rand 0.8.5", +] + +[[package]] +name = "drawdag" +version = "0.1.0" + +[[package]] +name = "dtoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" + +[[package]] +name = "eagerepo" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "dag", + "edenapi_trait", + "fail", + "futures 0.3.25", + "http", + "identity", + "manifest-tree", + "metalog", + "minibytes", + "nonblocking", + "parking_lot 0.11.2", + "storemodel", + "tempfile", + "thiserror", + "tokio", + "tracing", + "zstore", +] + +[[package]] +name = "eden_apfs_mount_helper" +version = "0.1.0" +dependencies = [ + "anyhow", + "libc", + "once_cell", + "plist", + "pretty_assertions", + "serde", + "serde_json", + "sha2 0.10.6", + "structopt", +] + +[[package]] +name = "edenapi" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "async-trait", + "auth", + "bytes 1.3.0", + "chrono", + "configmodel", + "edenapi_trait", + "edenapi_types", + "futures 0.3.25", + "hg-http", + "http-client", + "itertools 0.10.5", + "lazy_static", + "metrics", + "minibytes", + "once_cell", + "parking_lot 0.11.2", + "pprint", + "progress-model", + "rand 0.8.5", + "repo_name", + "serde", + "serde_cbor", + "serde_json", + "tokio", + "tracing", + "types", + "url", + "version", +] + +[[package]] +name = "edenapi_ext" +version = "0.1.0" +dependencies = [ + "anyhow", + "blake2", + "cloned", + "crossbeam 0.8.2", + "edenapi", + "edenapi_types", + "futures 0.3.25", + "itertools 0.10.5", + "minibytes", + "tokio", + "types", + "vfs", +] + +[[package]] +name = "edenapi_trait" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "configmodel", + "edenapi_types", + "futures 0.3.25", + "http", + "http-client", + "minibytes", + "serde_cbor", + "thiserror", + "types", + "url", +] + +[[package]] +name = "edenapi_types" +version = "0.1.0" +dependencies = [ + "anyhow", + "bytes 1.3.0", + "dag-types", + "insta_ext", + "paste", + "quickcheck", + "quickcheck_arbitrary_derive", + "quickcheck_macros", + "revisionstore_types", + "serde", + "serde_bytes", + "serde_derive", + "serde_json", + "thiserror", + "type_macros", + "types", +] + +[[package]] +name = "edenfs_client" +version = "0.1.0" +dependencies = [ + "anyhow", + "byteorder", + "chrono", + "fbthrift_socket", + "identity", + "io", + "serde", + "sha2 0.10.6", + "status", + "thiserror", + "thrift-types", + "tokio", + "tokio-uds-compat", + "toml", + "types", + "util", +] + +[[package]] +name = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding" +version = "0.1.0" +dependencies = [ + "local-encoding", + "types", + "winapi 0.3.9", +] + +[[package]] +name = "encoding_rs" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "enum-as-inner" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" +dependencies = [ + "heck 0.4.0", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "enum_dispatch" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" +dependencies = [ + "once_cell", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "env_logger" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ + "atty", + "humantime 1.3.0", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "exchange" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "dag", + "edenapi", + "hgcommits", + "metalog", + "refencode", + "tracing", + "types", +] + +[[package]] +name = "extend" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47da3a72ec598d9c8937a7ebca8962a5c7a1f28444e38c2b33c771ba3f55f05" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "fail" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be3c61c59fdc91f5dbc3ea31ee8623122ce80057058be560654c5d410d181a6" +dependencies = [ + "lazy_static", + "log", + "rand 0.7.3", +] + +[[package]] +name = "faster-hex" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e2ce894d53b295cf97b05685aa077950ff3e8541af83217fc720a6437169f8" + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "fb303_core" +version = "0.0.0" +source = "git+https://github.com/facebook/fb303.git?branch=main#0b9b58848f96c78f65513457c15292b81dc6b91e" +dependencies = [ + "anyhow", + "async-trait", + "codegen_includer_proc_macro", + "const-cstr", + "fbthrift", + "futures 0.3.25", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "thiserror", + "thrift_compiler", + "tracing", + "tracing-futures", +] + +[[package]] +name = "fbinit" +version = "0.1.2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +dependencies = [ + "fbinit_macros", + "quickcheck", +] + +[[package]] +name = "fbinit_macros" +version = "0.1.2" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "fbthrift" +version = "0.0.1+unstable" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#46238c81c2c30ec8e9907203922218e4ecfd4cbb" +dependencies = [ + "anyhow", + "async-trait", + "base64 0.11.0", + "bufsize", + "bytes 1.3.0", + "futures 0.3.25", + "ghost", + "num-derive", + "num-traits", + "ordered-float 1.1.1", + "panic-message", + "serde_json", + "thiserror", +] + +[[package]] +name = "fbthrift_framed" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +dependencies = [ + "byteorder", + "bytes 1.3.0", + "tokio-util 0.6.10", +] + +[[package]] +name = "fbthrift_socket" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +dependencies = [ + "anyhow", + "bytes 1.3.0", + "fbthrift", + "fbthrift_framed", + "fbthrift_util", + "futures 0.3.25", + "tokio", + "tokio-tower", + "tokio-util 0.6.10", + "tower-service", +] + +[[package]] +name = "fbthrift_util" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +dependencies = [ + "tokio", +] + +[[package]] +name = "filedescriptor" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e" +dependencies = [ + "libc", + "thiserror", + "winapi 0.3.9", +] + +[[package]] +name = "filetime" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "windows-sys", +] + +[[package]] +name = "finl_unicode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +dependencies = [ + "cfg-if 1.0.0", + "crc32fast", + "futures 0.1.31", + "libc", + "miniz_oxide", + "tokio-io", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "formatter" +version = "0.1.0" +dependencies = [ + "anyhow", + "configmodel", + "serde", + "serde_json", + "termstyle", + "thiserror", +] + +[[package]] +name = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "fsevent" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" +dependencies = [ + "bitflags", + "fsevent-sys", +] + +[[package]] +name = "fsevent-sys" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" +dependencies = [ + "libc", +] + +[[package]] +name = "fsinfo" +version = "0.1.0" +dependencies = [ + "anyhow", + "identity", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "fsprobe" +version = "0.1.0" +dependencies = [ + "anyhow", + "structopt", +] + +[[package]] +name = "fsyncglob" +version = "0.1.0" +dependencies = [ + "glob", + "tempfile", + "tracing", +] + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + +[[package]] +name = "futures" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" + +[[package]] +name = "futures" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-batch" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f444c45a1cb86f2a7e301469fd50a82084a60dadc25d94529a8312276ecb71a" +dependencies = [ + "futures 0.3.25", + "futures-timer", + "pin-utils", +] + +[[package]] +name = "futures-channel" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" + +[[package]] +name = "futures-executor" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" + +[[package]] +name = "futures-lite" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-macro" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" + +[[package]] +name = "futures-task" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" + +[[package]] +name = "futures-timer" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" + +[[package]] +name = "futures-util" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +dependencies = [ + "futures 0.1.31", + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "ghost" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41973d4c45f7a35af8753ba3457cc99d406d863941fd7f52663cff54a5ab99b3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "git2" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0155506aab710a86160ddb504a480d2964d7ab5b9e62419be69e0032bc5931c" +dependencies = [ + "bitflags", + "libc", + "libgit2-sys", + "log", + "openssl-probe", + "openssl-sys", + "url", +] + +[[package]] +name = "gitdag" +version = "0.1.0" +dependencies = [ + "anyhow", + "dag", + "git2", + "nonblocking", + "parking_lot 0.11.2", + "tracing", +] + +[[package]] +name = "gitstore" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "futures 0.3.25", + "git2", + "minibytes", + "storemodel", + "types", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +dependencies = [ + "aho-corasick", + "bstr 1.1.0", + "fnv", + "log", + "regex", +] + +[[package]] +name = "h2" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +dependencies = [ + "bytes 1.3.0", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util 0.7.4", + "tracing", +] + +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "hashbrown" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +dependencies = [ + "ahash 0.4.7", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.6", +] + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hg-http" +version = "0.1.0" +dependencies = [ + "async-runtime", + "auth", + "clientinfo", + "configmodel", + "hg-metrics", + "http-client", + "once_cell", + "progress-model", +] + +[[package]] +name = "hg-metrics" +version = "0.1.0" +dependencies = [ + "once_cell", + "parking_lot 0.11.2", +] + +[[package]] +name = "hgcommands" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "bindings", + "blackbox", + "checkout", + "chrono", + "clidispatch", + "cliparser", + "clone", + "comfy-table", + "configloader", + "configmodel", + "cpython", + "cpython_ext", + "dag", + "debugtop", + "eagerepo", + "edenapi", + "edenfs_client", + "exchange", + "fail", + "flate2", + "formatter", + "fsyncglob", + "hg-http", + "hgplain", + "hgtime", + "hostname 0.3.1", + "identity", + "indexedlog", + "libc", + "metrics-render", + "migration", + "mincode", + "minibytes", + "network-doctor", + "once_cell", + "parking_lot 0.11.2", + "pathmatcher", + "procinfo", + "progress-model", + "progress-render", + "pyconfigloader", + "python3-sys", + "pytracing", + "rand 0.8.5", + "repo", + "revisionstore", + "revsets", + "runlog", + "serde", + "serde_json", + "status", + "termstyle", + "tracing", + "tracing-collector", + "tracing-reload", + "tracing-sampler", + "tracing-subscriber", + "treestate", + "types", + "url", + "util", + "version", + "workingcopy", + "zstd", +] + +[[package]] +name = "hgcommits" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "dag", + "edenapi", + "futures 0.3.25", + "gitdag", + "metalog", + "minibytes", + "parking_lot 0.11.2", + "refencode", + "revlogindex", + "serde", + "storemodel", + "streams", + "thiserror", + "tracing", + "types", + "zstore", +] + +[[package]] +name = "hgmain" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "configloader", + "dirs 2.0.2", + "encoding", + "hgcommands", + "identity", + "libc", + "pyblackbox", + "winapi 0.3.9", +] + +[[package]] +name = "hgplain" +version = "0.1.0" +dependencies = [ + "identity", +] + +[[package]] +name = "hgrc-parser" +version = "0.1.0" + +[[package]] +name = "hgtime" +version = "0.1.0" +dependencies = [ + "chrono", + "humantime 2.1.0", +] + +[[package]] +name = "hostcaps" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "hostname" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +dependencies = [ + "anyhow", + "hostname 0.3.1", +] + +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi 0.3.9", +] + +[[package]] +name = "http" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ + "bytes 1.3.0", + "fnv", + "itoa 1.0.5", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes 1.3.0", + "http", + "pin-project-lite", +] + +[[package]] +name = "http-client" +version = "0.1.0" +dependencies = [ + "anyhow", + "assert_matches", + "async-compression", + "atty", + "crossbeam 0.8.2", + "curl", + "curl-sys", + "env_logger 0.7.1", + "futures 0.3.25", + "http", + "lru-cache", + "maplit", + "mockito", + "once_cell", + "openssl", + "parking_lot 0.11.2", + "paste", + "pin-project 0.4.30", + "regex", + "serde", + "serde_cbor", + "serde_json", + "structopt", + "thiserror", + "tokio", + "tokio-util 0.6.10", + "tracing", + "url", + "zstd", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +dependencies = [ + "quick-error", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +dependencies = [ + "bytes 1.3.0", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa 1.0.5", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +dependencies = [ + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes 1.3.0", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi 0.3.9", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "identity" +version = "0.1.0" +dependencies = [ + "anyhow", + "dirs 2.0.2", + "once_cell", + "parking_lot 0.11.2", + "tempfile", + "tracing", +] + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "ignore" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a05705bc64e0b66a806c3740bd6578ea66051b157ec42dc219c785cbf185aef3" +dependencies = [ + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", +] + +[[package]] +name = "indexedlog" +version = "0.1.0" +dependencies = [ + "atomicfile", + "byteorder", + "dev-logger", + "fs2", + "hex", + "libc", + "memmap", + "minibench", + "minibytes", + "once_cell", + "quickcheck", + "rand 0.8.5", + "rand_chacha 0.3.1", + "tempfile", + "tracing", + "twox-hash", + "vlqencoding", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "rayon", + "serde", +] + +[[package]] +name = "inotify" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" +dependencies = [ + "bitflags", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "insta" +version = "1.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f0f08b46e4379744de2ab67aa8f7de3ffd1da3e275adc41fcc82053ede46ff" +dependencies = [ + "console", + "lazy_static", + "linked-hash-map", + "serde", + "similar", + "yaml-rust", +] + +[[package]] +name = "insta_ext" +version = "0.1.0" +dependencies = [ + "insta", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "io" +version = "0.1.0" +dependencies = [ + "atty", + "configmodel", + "hgplain", + "once_cell", + "parking_lot 0.11.2", + "pipe", + "streampager", + "terminal_size 0.1.17", + "termwiz", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "ipconfig" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be" +dependencies = [ + "socket2", + "widestring", + "winapi 0.3.9", + "winreg", +] + +[[package]] +name = "ipnet" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" + +[[package]] +name = "itertools" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[package]] +name = "jobserver" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "lab" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf36173d4167ed999940f804952e6b08197cae5ad5d572eb4db150ce8ad5d58f" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lazystr" +version = "0.1.0" + +[[package]] +name = "lfs_protocol" +version = "0.1.0" +dependencies = [ + "anyhow", + "faster-hex", + "http", + "mime", + "once_cell", + "quickcheck", + "serde", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "libgit2-sys" +version = "0.13.4+1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0fa6563431ede25f5cc7f6d803c6afbc1c5d3ad3d4925d12c882bf2b526f5d1" +dependencies = [ + "cc", + "libc", + "libssh2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", +] + +[[package]] +name = "libnghttp2-sys" +version = "0.1.7+1.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "libssh2-sys" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca" +dependencies = [ + "cc", + "libc", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-sys" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "line-wrap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "local-encoding" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1ceb20f39ff7ae42f3ff9795f3986b1daad821caaa1e1732a0944103a5a1a66" +dependencies = [ + "kernel32-sys", + "skeptic", + "winapi 0.2.8", +] + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if 1.0.0", + "value-bag", +] + +[[package]] +name = "lru" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" +dependencies = [ + "hashbrown 0.12.3", +] + +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "lz4-pyframe" +version = "0.1.0" +dependencies = [ + "byteorder", + "libc", + "lz4-sys", + "quickcheck", + "thiserror", +] + +[[package]] +name = "lz4-sys" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "manifest" +version = "0.1.0" +dependencies = [ + "anyhow", + "pathmatcher", + "quickcheck", + "quickcheck_arbitrary_derive", + "types", +] + +[[package]] +name = "manifest-tree" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "futures 0.3.25", + "futures-batch", + "manifest", + "minibench", + "minibytes", + "once_cell", + "parking_lot 0.11.2", + "pathmatcher", + "progress-model", + "quickcheck", + "rand 0.8.5", + "rand_chacha 0.3.1", + "sha-1", + "storemodel", + "thiserror", + "tracing", + "types", +] + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memmap" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "memmap2" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" +dependencies = [ + "libc", +] + +[[package]] +name = "memmem" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" + +[[package]] +name = "memoffset" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metalog" +version = "0.1.0" +dependencies = [ + "anyhow", + "hex", + "indexedlog", + "lazy_static", + "mincode", + "minibytes", + "parking_lot 0.11.2", + "quickcheck", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "serde", + "serde_json", + "tempfile", + "tracing", + "types", + "zstore", +] + +[[package]] +name = "metrics" +version = "0.1.0" +dependencies = [ + "futures 0.3.25", + "once_cell", +] + +[[package]] +name = "metrics-render" +version = "0.1.0" +dependencies = [ + "async-runtime", + "metrics", + "once_cell", + "progress-model", + "tracing", +] + +[[package]] +name = "migration" +version = "0.1.0" +dependencies = [ + "configmodel", + "thiserror", +] + +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "mincode" +version = "0.1.0" +dependencies = [ + "byteorder", + "quickcheck", + "serde", + "vlqencoding", +] + +[[package]] +name = "minibench" +version = "0.1.0" + +[[package]] +name = "minibytes" +version = "0.1.0" +dependencies = [ + "bytes 1.3.0", + "memmap", + "quickcheck", + "serde", +] + +[[package]] +name = "miniz_oxide" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +dependencies = [ + "adler", + "autocfg", +] + +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow 0.2.2", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "mio" +version = "0.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +dependencies = [ + "libc", + "log", + "miow 0.3.7", + "ntapi", + "winapi 0.3.9", +] + +[[package]] +name = "mio" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", +] + +[[package]] +name = "mio-extras" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" +dependencies = [ + "lazycell", + "log", + "mio 0.6.23", + "slab", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + +[[package]] +name = "miow" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "mkscratch" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap 3.2.23", + "dirs 2.0.2", + "identity", + "libc", + "serde", + "toml", +] + +[[package]] +name = "mockito" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3ae325bcceb48a24302ac57e1055f9173f5fd53be535603ea0ed41dea92db5" +dependencies = [ + "assert-json-diff", + "colored", + "difference", + "httparse", + "lazy_static", + "log", + "rand 0.7.3", + "regex", + "serde_json", + "serde_urlencoded 0.6.1", +] + +[[package]] +name = "mpatch" +version = "0.1.0" +dependencies = [ + "libc", + "mpatch-sys", +] + +[[package]] +name = "mpatch-sys" +version = "0.1.0" +dependencies = [ + "cc", +] + +[[package]] +name = "mutationstore" +version = "0.1.0" +dependencies = [ + "anyhow", + "bitflags", + "dag", + "drawdag", + "futures 0.3.25", + "indexedlog", + "rand 0.8.5", + "rand_chacha 0.3.1", + "renderdag", + "tempdir", + "types", + "vlqencoding", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "net2" +version = "0.2.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "network-doctor" +version = "0.1.0" +dependencies = [ + "auth", + "configmodel", + "curl", + "hg-http", + "http", + "http-client", + "tempfile", + "thiserror", + "tracing", + "url", +] + +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nodemap" +version = "0.1.0" +dependencies = [ + "anyhow", + "indexedlog", + "quickcheck", + "tempfile", + "thiserror", + "types", +] + +[[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 = "nonblocking" +version = "0.1.0" +dependencies = [ + "futures 0.3.25", +] + +[[package]] +name = "notify" +version = "4.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" +dependencies = [ + "bitflags", + "filetime", + "fsevent", + "fsevent-sys", + "inotify", + "libc", + "mio 0.6.23", + "mio-extras", + "walkdir", + "winapi 0.3.9", +] + +[[package]] +name = "ntapi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi 0.3.9", +] + +[[package]] +name = "num-bigint" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi 0.2.6", + "libc", +] + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "openssl" +version = "0.10.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +dependencies = [ + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "ordered-float" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" +dependencies = [ + "num-traits", + "serde", +] + +[[package]] +name = "ordered-float" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d84eb1409416d254e4a9c8fa56cc24701755025b458f0fcd8e59e1f5f40c23bf" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ordered-multimap" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c672c7ad9ec066e428c00eb917124a06f08db19e2584de982cc34b1f4c12485" +dependencies = [ + "dlv-list", + "hashbrown 0.9.1", +] + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "output_vt100" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "panic-message" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384e52fd8fbd4cbe3c317e8216260c21a0f9134de108cea8a4dd4e7e152c472d" + +[[package]] +name = "parking" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.6", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if 1.0.0", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi 0.3.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + +[[package]] +name = "paste" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" + +[[package]] +name = "pathhistory" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "async-trait", + "dag", + "dev-logger", + "manifest", + "manifest-tree", + "storemodel", + "tokio", + "tracing", + "types", +] + +[[package]] +name = "pathmatcher" +version = "0.1.0" +dependencies = [ + "anyhow", + "bitflags", + "globset", + "ignore", + "parking_lot 0.11.2", + "regex-automata", + "regex-syntax", + "tempfile", + "thiserror", + "types", + "util", +] + +[[package]] +name = "pem" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" +dependencies = [ + "base64 0.13.1", + "once_cell", + "regex", +] + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pest" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4257b4a04d91f7e9e6290be5d3da4804dd5784fafde3a497d73eb2b4a158c30a" +dependencies = [ + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "241cda393b0cdd65e62e07e12454f1f25d57017dcc514b1514cd3c4645e3a0a6" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46b53634d8c8196302953c74d5352f33d0c512a9499bd2ce468fc9f4128fa27c" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pest_meta" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef4f1332a8d4678b41966bb4cc1d0676880e84183a1ecc3f4b69f03e99c7a51" +dependencies = [ + "once_cell", + "pest", + "sha2 0.10.6", +] + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_shared 0.8.0", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", +] + +[[package]] +name = "phf" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +dependencies = [ + "phf_macros", + "phf_shared 0.11.1", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +dependencies = [ + "phf_shared 0.11.1", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" +dependencies = [ + "phf_generator 0.11.1", + "phf_shared 0.11.1", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ef0f924a5ee7ea9cbcea77529dba45f8a9ba9f622419fe3386ca581a3ae9d5a" +dependencies = [ + "pin-project-internal 0.4.30", +] + +[[package]] +name = "pin-project" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +dependencies = [ + "pin-project-internal 1.0.12", +] + +[[package]] +name = "pin-project-internal" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pipe" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f763a706963c2af5e4e7f5b29a93a42809568b857d73ab8c0c4ecf8edf7f8f" +dependencies = [ + "crossbeam-channel 0.3.9", +] + +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "plist" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b59eb8d91dfa89208ec74a920e3b55f840476cf46568026c18dbaa2999e0d48" +dependencies = [ + "base64 0.10.1", + "chrono", + "indexmap", + "line-wrap", + "serde", + "xml-rs", +] + +[[package]] +name = "plotters" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d1685fbe7beba33de0330629da9d955ac75bd54f33d7b79f9a895590124f6bb" +dependencies = [ + "js-sys", + "num-traits", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "polling" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" +dependencies = [ + "autocfg", + "cfg-if 1.0.0", + "libc", + "log", + "wepoll-ffi", + "windows-sys", +] + +[[package]] +name = "pprint" +version = "0.1.0" +dependencies = [ + "serde", + "serde_cbor", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "pretty_assertions" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +dependencies = [ + "ctor", + "diff", + "output_vt100", + "yansi", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "procinfo" +version = "0.1.0" +dependencies = [ + "cc", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "progress-model" +version = "0.1.0" +dependencies = [ + "arc-swap", + "once_cell", + "parking_lot 0.11.2", + "paste", + "tokio", + "tracing", +] + +[[package]] +name = "progress-render" +version = "0.1.0" +dependencies = [ + "progress-model", + "termwiz", + "unicode-width", +] + +[[package]] +name = "pulldown-cmark" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8361e81576d2e02643b04950e487ec172b687180da65c731c03cf336784e6c07" +dependencies = [ + "getopts", +] + +[[package]] +name = "pyauth" +version = "0.1.0" +dependencies = [ + "anyhow", + "auth", + "cpython", + "cpython_ext", + "pyconfigloader", + "url", +] + +[[package]] +name = "pyblackbox" +version = "0.1.0" +dependencies = [ + "blackbox", + "cpython", + "cpython_ext", +] + +[[package]] +name = "pybytes" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "minibytes", + "python3-sys", +] + +[[package]] +name = "pycats" +version = "0.1.0" +dependencies = [ + "anyhow", + "cats", + "cpython", + "cpython_ext", + "pyconfigloader", + "url", +] + +[[package]] +name = "pycheckout" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "checkout", + "cpython", + "cpython_ext", + "manifest-tree", + "pathmatcher", + "progress-model", + "pyconfigloader", + "pymanifest", + "pypathmatcher", + "pystatus", + "pytreestate", + "storemodel", + "treestate", + "types", + "vfs", +] + +[[package]] +name = "pyclientinfo" +version = "0.1.0" +dependencies = [ + "clientinfo", + "cpython", + "cpython_ext", + "pyconfigloader", +] + +[[package]] +name = "pycliparser" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cliparser", + "configmodel", + "cpython", + "cpython_ext", + "pyconfigloader", +] + +[[package]] +name = "pyconfigloader" +version = "0.1.0" +dependencies = [ + "anyhow", + "configloader", + "cpython", + "cpython_ext", + "util", + "version", +] + +[[package]] +name = "pydag" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "cpython", + "cpython_ext", + "dag", + "futures 0.3.25", + "hgcommits", + "minibytes", + "parking_lot 0.11.2", + "pyedenapi", + "pymetalog", + "renderdag", + "storemodel", +] + +[[package]] +name = "pydiffhelpers" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", +] + +[[package]] +name = "pydirs" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "encoding", +] + +[[package]] +name = "pydoctor" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "network-doctor", + "pyconfigloader", +] + +[[package]] +name = "pydrawdag" +version = "0.1.0" +dependencies = [ + "cpython", + "drawdag", +] + +[[package]] +name = "pyeagerepo" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "cpython", + "cpython_ext", + "dag", + "eagerepo", + "edenapi_types", + "pydag", + "pyedenapi", + "storemodel", +] + +[[package]] +name = "pyedenapi" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "blake2", + "cpython", + "cpython_async", + "cpython_ext", + "dag-types", + "edenapi", + "edenapi_ext", + "edenapi_types", + "futures 0.3.25", + "minibytes", + "progress-model", + "pyconfigloader", + "pyprogress", + "pyrevisionstore", + "revisionstore", + "types", +] + +[[package]] +name = "pyerror" +version = "0.1.0" +dependencies = [ + "auth", + "cpython", + "cpython_ext", + "dag", + "edenapi", + "hgcommits", + "http-client", + "indexedlog", + "metalog", + "repo", + "repolock", + "revisionstore", + "revlogindex", + "treestate", + "types", +] + +[[package]] +name = "pyexchange" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "exchange", + "pydag", + "pyedenapi", + "pymetalog", +] + +[[package]] +name = "pyfail" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "fail", +] + +[[package]] +name = "pyfs" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "fsinfo", +] + +[[package]] +name = "pygitstore" +version = "0.1.0" +dependencies = [ + "anyhow", + "cpython", + "cpython_ext", + "gitstore", + "storemodel", +] + +[[package]] +name = "pyhgmetrics" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "hg-metrics", +] + +[[package]] +name = "pyhgtime" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "hgtime", +] + +[[package]] +name = "pyidentity" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "identity", +] + +[[package]] +name = "pyindexedlog" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "indexedlog", + "pybytes", +] + +[[package]] +name = "pyio" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cpython", + "cpython_ext", + "pyconfigloader", + "termstyle", +] + +[[package]] +name = "pylock" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "repolock", +] + +[[package]] +name = "pylz4" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "lz4-pyframe", +] + +[[package]] +name = "pymanifest" +version = "0.1.0" +dependencies = [ + "anyhow", + "cpython", + "cpython_ext", + "manifest", + "manifest-tree", + "parking_lot 0.11.2", + "pathmatcher", + "pypathmatcher", + "types", +] + +[[package]] +name = "pymetalog" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "metalog", + "parking_lot 0.11.2", +] + +[[package]] +name = "pymutationstore" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "byteorder", + "cpython", + "cpython_ext", + "mutationstore", + "pydag", + "thiserror", + "types", + "vlqencoding", +] + +[[package]] +name = "pynodemap" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "nodemap", + "types", +] + +[[package]] +name = "pypathhistory" +version = "0.1.0" +dependencies = [ + "async-runtime", + "cpython", + "cpython_ext", + "dag", + "pathhistory", + "storemodel", + "types", +] + +[[package]] +name = "pypathmatcher" +version = "0.1.0" +dependencies = [ + "anyhow", + "cpython", + "cpython_ext", + "pathmatcher", + "types", +] + +[[package]] +name = "pypprint" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "pprint", +] + +[[package]] +name = "pyprocess" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "spawn-ext", +] + +[[package]] +name = "pyprogress" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "progress-model", + "progress-render", +] + +[[package]] +name = "pyrefencode" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "refencode", +] + +[[package]] +name = "pyregex" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "regex", +] + +[[package]] +name = "pyrenderdag" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "minibytes", + "parking_lot 0.11.2", + "renderdag", +] + +[[package]] +name = "pyrepo" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "parking_lot 0.11.2", + "pyconfigloader", + "pydag", + "pyedenapi", + "pymetalog", + "pyworkingcopy", + "repo", + "util", + "workingcopy", +] + +[[package]] +name = "pyrevisionstore" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "async-trait", + "configmodel", + "cpython", + "cpython_ext", + "futures 0.3.25", + "io", + "minibytes", + "parking_lot 0.11.2", + "pyconfigloader", + "revisionstore", + "storemodel", + "types", +] + +[[package]] +name = "pyrevlogindex" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "dag", + "pybytes", + "pydag", + "revlogindex", +] + +[[package]] +name = "pysptui" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cpython", + "cpython_ext", + "pipe", + "streampager", +] + +[[package]] +name = "pystatus" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "status", + "types", +] + +[[package]] +name = "python3-sys" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f8b50d72fb3015735aa403eebf19bbd72c093bfeeae24ee798be5f2f1aab52" +dependencies = [ + "libc", + "regex", +] + +[[package]] +name = "pythreading" +version = "0.1.0" +dependencies = [ + "cpython", +] + +[[package]] +name = "pytracing" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "lazy_static", + "mincode", + "parking_lot 0.11.2", + "python3-sys", + "serde_json", + "tracing", + "tracing-collector", + "tracing-reload", + "tracing-runtime-callsite", +] + +[[package]] +name = "pytreestate" +version = "0.1.0" +dependencies = [ + "anyhow", + "cpython", + "cpython_ext", + "parking_lot 0.11.2", + "pathmatcher", + "pypathmatcher", + "treestate", + "types", + "vfs", +] + +[[package]] +name = "pyvlq" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "vlqencoding", +] + +[[package]] +name = "pyworker" +version = "0.1.0" +dependencies = [ + "anyhow", + "cpython", + "cpython_ext", + "crossbeam 0.7.3", + "memmap", + "minibytes", + "pyrevisionstore", + "quickcheck", + "revisionstore", + "tempfile", + "tracing", + "types", + "vfs", +] + +[[package]] +name = "pyworkingcopy" +version = "0.1.0" +dependencies = [ + "anyhow", + "cpython", + "cpython_ext", + "io", + "parking_lot 0.11.2", + "pathmatcher", + "pyconfigloader", + "pymanifest", + "pypathmatcher", + "pystatus", + "pytreestate", + "storemodel", + "workingcopy", +] + +[[package]] +name = "pyzstd" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "zstd", + "zstd-safe", + "zstdelta", +] + +[[package]] +name = "pyzstore" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "zstore", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quickcheck" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +dependencies = [ + "env_logger 0.8.4", + "log", + "rand 0.8.5", +] + +[[package]] +name = "quickcheck_arbitrary_derive" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +dependencies = [ + "proc-macro2", + "quickcheck", + "quote", + "syn", +] + +[[package]] +name = "quickcheck_macros" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radixbuf" +version = "0.1.0" +dependencies = [ + "minibench", + "quickcheck", + "rand 0.8.5", + "thiserror", + "vlqencoding", +] + +[[package]] +name = "rand" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +dependencies = [ + "fuchsia-cprng", + "libc", + "rand_core 0.3.1", + "rdrand", + "winapi 0.3.9", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.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_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.8", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rayon" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +dependencies = [ + "crossbeam-channel 0.5.6", + "crossbeam-deque 0.8.2", + "crossbeam-utils 0.8.14", + "num_cpus", +] + +[[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.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom 0.2.8", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "ref-cast" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "refencode" +version = "0.1.0" +dependencies = [ + "types", +] + +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "renderdag" +version = "0.1.0" +dependencies = [ + "dag", +] + +[[package]] +name = "repo" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "configloader", + "configmodel", + "edenapi", + "fail", + "hgcommits", + "identity", + "manifest-tree", + "metalog", + "parking_lot 0.11.2", + "refencode", + "repolock", + "revisionstore", + "revsets", + "storemodel", + "tempfile", + "thiserror", + "tracing", + "treestate", + "types", + "util", + "vfs", + "workingcopy", +] + +[[package]] +name = "repo_name" +version = "0.1.0" +dependencies = [ + "anyhow", + "percent-encoding", +] + +[[package]] +name = "repolock" +version = "0.1.0" +dependencies = [ + "anyhow", + "configmodel", + "fs2", + "parking_lot 0.11.2", + "tempfile", + "thiserror", + "tracing", + "util", +] + +[[package]] +name = "reqwest" +version = "0.11.11" +source = "git+https://github.com/vmagro/reqwest?rev=f9490c06756a9d35ab874c44657db790a87af80b#f9490c06756a9d35ab874c44657db790a87af80b" +dependencies = [ + "base64 0.13.1", + "bytes 1.3.0", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "hyper-tls", + "ipnet", + "js-sys", + "lazy_static", + "log", + "mime", + "mime_guess", + "native-tls", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-native-certs", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded 0.7.1", + "tokio", + "tokio-native-tls", + "tokio-rustls", + "tokio-util 0.7.4", + "tower-service", + "trust-dns-resolver", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg", +] + +[[package]] +name = "resolv-conf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +dependencies = [ + "hostname 0.3.1", + "quick-error", +] + +[[package]] +name = "revisionstore" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "async-trait", + "auth", + "bincode", + "blake2", + "byteorder", + "configmodel", + "crossbeam 0.8.2", + "edenapi", + "edenapi_types", + "fbinit", + "futures 0.3.25", + "hex", + "hg-http", + "hg-metrics", + "hgtime", + "http", + "http-client", + "indexedlog", + "lazy_static", + "lfs_protocol", + "lz4-pyframe", + "manifest-tree", + "maplit", + "memmap", + "mincode", + "minibytes", + "mockito", + "mpatch", + "once_cell", + "parking_lot 0.11.2", + "progress-model", + "quickcheck", + "quickcheck_arbitrary_derive", + "rand 0.8.5", + "rand_chacha 0.3.1", + "regex", + "revisionstore_types", + "serde", + "serde_derive", + "serde_json", + "sha-1", + "sha2 0.10.6", + "storemodel", + "tempfile", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "types", + "url", + "util", + "version", + "vlqencoding", +] + +[[package]] +name = "revisionstore_types" +version = "0.1.0" +dependencies = [ + "anyhow", + "byteorder", + "quickcheck", + "quickcheck_arbitrary_derive", + "serde", + "serde_derive", +] + +[[package]] +name = "revlogindex" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "bit-vec", + "byteorder", + "dag", + "indexedlog", + "lz4-pyframe", + "minibytes", + "nonblocking", + "parking_lot 0.11.2", + "radixbuf", + "tempfile", + "thiserror", + "util", +] + +[[package]] +name = "revsets" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "dag", + "metalog", + "refencode", + "thiserror", + "treestate", + "types", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi 0.3.9", +] + +[[package]] +name = "runlog" +version = "0.1.0" +dependencies = [ + "anyhow", + "chrono", + "configmodel", + "fs2", + "hg-http", + "libc", + "parking_lot 0.11.2", + "progress-model", + "rand 0.8.5", + "repo", + "serde", + "serde_json", + "tempfile", + "util", +] + +[[package]] +name = "rust-ini" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63471c4aa97a1cf8332a5f97709a79a4234698de6a1f5087faf66f2dae810e22" +dependencies = [ + "cfg-if 1.0.0", + "ordered-multimap", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.16", +] + +[[package]] +name = "rustix" +version = "0.36.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "rustls" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +dependencies = [ + "base64 0.21.0", +] + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "scm_daemon" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap 2.34.0", + "commitcloudsubscriber", + "env_logger 0.7.1", + "libc", + "log", + "serde", + "thiserror", + "toml", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "scratch" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "security-framework" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" + +[[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.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_alt" +version = "0.1.0" + +[[package]] +name = "serde_bser" +version = "0.3.1" +source = "git+https://github.com/facebook/watchman.git?branch=main#d21cc8bb48e1e03e7f0327b6ddbf28d76523ad1b" +dependencies = [ + "anyhow", + "byteorder", + "bytes 1.3.0", + "serde", + "thiserror", +] + +[[package]] +name = "serde_bytes" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +dependencies = [ + "itoa 1.0.5", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" +dependencies = [ + "dtoa", + "itoa 0.4.8", + "serde", + "url", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa 1.0.5", + "ryu", + "serde", +] + +[[package]] +name = "sha-1" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.6", +] + +[[package]] +name = "sha1" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +dependencies = [ + "sha1_smol", +] + +[[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +dependencies = [ + "block-buffer 0.9.0", + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.9.0", + "opaque-debug", +] + +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.6", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shellexpand" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" +dependencies = [ + "dirs 4.0.0", +] + +[[package]] +name = "shlex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + +[[package]] +name = "signal-hook" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio 0.7.14", + "signal-hook 0.3.14", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + +[[package]] +name = "similar" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" + +[[package]] +name = "simple_asn1" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692ca13de57ce0613a363c8c2f1de925adebc81b04c923ac60c5488bb44abe4b" +dependencies = [ + "chrono", + "num-bigint", + "num-traits", +] + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "skeptic" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24ebf8a06f5f8bae61ae5bbc7af7aac4ef6907ae975130faba1199e5fe82256a" +dependencies = [ + "pulldown-cmark", + "tempdir", +] + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "sorted_vector_map" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +dependencies = [ + "itertools 0.10.5", + "quickcheck", +] + +[[package]] +name = "sparse" +version = "0.1.0" +dependencies = [ + "anyhow", + "futures 0.3.25", + "globset", + "once_cell", + "pathmatcher", + "regex", + "thiserror", + "tokio", + "tracing", + "types", +] + +[[package]] +name = "spawn-ext" +version = "0.1.0" +dependencies = [ + "libc", + "tempfile", + "winapi 0.3.9", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "staticconfig" +version = "0.1.0" +dependencies = [ + "configmodel", + "phf 0.11.1", + "staticconfig_macros", +] + +[[package]] +name = "staticconfig_macros" +version = "0.1.0" +dependencies = [ + "hgrc-parser", + "indexmap", +] + +[[package]] +name = "status" +version = "0.1.0" +dependencies = [ + "types", +] + +[[package]] +name = "storemodel" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "auto_impl", + "futures 0.3.25", + "minibytes", + "types", +] + +[[package]] +name = "streampager" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d43e4988f446d8d15c370527d38cdd35b470139775edeeca4c03921486c9b65a" +dependencies = [ + "anyhow", + "bit-set", + "clap 2.34.0", + "dirs 3.0.2", + "enum_dispatch", + "indexmap", + "lazy_static", + "lru", + "memmap2", + "notify", + "pest", + "pest_derive", + "regex", + "scopeguard", + "serde", + "smallvec", + "tempfile", + "terminfo", + "termwiz", + "thiserror", + "toml", + "unicode-segmentation", + "unicode-width", + "vec_map", +] + +[[package]] +name = "streams" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "futures 0.3.25", + "pin-project 0.4.30", + "tokio", +] + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "structopt" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" +dependencies = [ + "clap 2.34.0", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" +dependencies = [ + "heck 0.3.3", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "strum" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" + +[[package]] +name = "strum_macros" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" +dependencies = [ + "heck 0.3.3", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "sval" +version = "1.0.0-alpha.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45f6ee7c7b87caf59549e9fe45d6a69c75c8019e79e212a835c5da0e92f0ba08" + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + +[[package]] +name = "tempdir" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" +dependencies = [ + "rand 0.4.6", + "remove_dir_all", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if 1.0.0", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi 0.3.9", +] + +[[package]] +name = "term_size" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "terminal_size" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "terminal_size" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" +dependencies = [ + "rustix", + "windows-sys", +] + +[[package]] +name = "terminfo" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76971977e6121664ec1b960d1313aacfa75642adc93b9d4d53b247bd4cb1747e" +dependencies = [ + "dirs 2.0.2", + "fnv", + "nom", + "phf 0.8.0", + "phf_codegen", +] + +[[package]] +name = "termios" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" +dependencies = [ + "libc", +] + +[[package]] +name = "termlogger" +version = "0.1.0" +dependencies = [ + "identity", + "io", + "lazystr", + "tracing", +] + +[[package]] +name = "termstyle" +version = "0.1.0" +dependencies = [ + "configmodel", + "hgplain", + "io", + "termwiz", + "tracing", +] + +[[package]] +name = "termwiz" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25e302bfaa2555ca7fb55eee19051ad43e510153b19cb880d6da5acb65a72ab9" +dependencies = [ + "anyhow", + "base64 0.13.1", + "bitflags", + "cassowary", + "cfg-if 1.0.0", + "filedescriptor", + "finl_unicode", + "fixedbitset", + "fnv", + "hex", + "lazy_static", + "libc", + "log", + "memmem", + "nix", + "num-derive", + "num-traits", + "ordered-float 3.4.0", + "pest", + "pest_derive", + "phf 0.10.1", + "regex", + "semver 0.11.0", + "sha2 0.9.9", + "signal-hook 0.1.17", + "siphasher", + "terminfo", + "termios", + "thiserror", + "ucd-trie", + "unicode-segmentation", + "vtparse", + "wezterm-bidi", + "wezterm-color-types", + "wezterm-dynamic", + "winapi 0.3.9", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "term_size", + "unicode-width", +] + +[[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +dependencies = [ + "terminal_size 0.2.3", + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +dependencies = [ + "once_cell", +] + +[[package]] +name = "thrift" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "codegen_includer_proc_macro", + "config_thrift", + "const-cstr", + "fb303_core", + "fbthrift", + "futures 0.3.25", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "sorted_vector_map", + "thiserror", + "thrift_compiler", + "tracing", + "tracing-futures", +] + +[[package]] +name = "thrift-types" +version = "0.1.0" +dependencies = [ + "anyhow", + "config", + "config_thrift", + "fb303_core", + "fbthrift", + "futures 0.3.25", + "thiserror", + "thrift", +] + +[[package]] +name = "thrift_compiler" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +dependencies = [ + "anyhow", + "clap 2.34.0", + "which", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi 0.3.9", +] + +[[package]] +name = "time" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +dependencies = [ + "itoa 1.0.5", + "libc", + "num_threads", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" +dependencies = [ + "autocfg", + "bytes 1.3.0", + "libc", + "memchr", + "mio 0.8.5", + "num_cpus", + "parking_lot 0.12.1", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "tracing", + "windows-sys", +] + +[[package]] +name = "tokio-io" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" +dependencies = [ + "bytes 0.4.12", + "futures 0.1.31", + "log", +] + +[[package]] +name = "tokio-macros" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +dependencies = [ + "rustls", + "tokio", + "webpki", +] + +[[package]] +name = "tokio-stream" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", + "tokio-util 0.7.4", +] + +[[package]] +name = "tokio-tower" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4322b6e2ebfd3be4082c16df4341505ef333683158b55f22afaf3f61565d728" +dependencies = [ + "crossbeam 0.8.2", + "futures-core", + "futures-sink", + "futures-util", + "pin-project 1.0.12", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "tokio-uds-compat" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +dependencies = [ + "async-io", + "futures 0.3.25", + "tokio", + "tracing", + "uds_windows", +] + +[[package]] +name = "tokio-util" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +dependencies = [ + "bytes 1.3.0", + "futures-core", + "futures-io", + "futures-sink", + "log", + "pin-project-lite", + "slab", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +dependencies = [ + "bytes 1.3.0", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if 1.0.0", + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-analyzer" +version = "0.1.0" +dependencies = [ + "serde_json", + "tracing-collector", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-collector" +version = "0.1.0" +dependencies = [ + "indexmap", + "libc", + "parking_lot 0.11.2", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", + "winapi 0.3.9", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project 1.0.12", + "tracing", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-reload" +version = "0.1.0" +dependencies = [ + "anyhow", + "once_cell", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-runtime-callsite" +version = "0.1.0" +dependencies = [ + "once_cell", + "parking_lot 0.11.2", + "regex", + "tracing", +] + +[[package]] +name = "tracing-sampler" +version = "0.1.0" +dependencies = [ + "configmodel", + "once_cell", + "parking_lot 0.11.2", + "serde", + "serde_json", + "tempfile", + "tracing", + "tracing-serde", + "tracing-subscriber", +] + +[[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "parking_lot 0.12.1", + "regex", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "time 0.3.17", + "tracing", + "tracing-core", + "tracing-log", + "tracing-serde", +] + +[[package]] +name = "treestate" +version = "0.1.0" +dependencies = [ + "anyhow", + "bitflags", + "byteorder", + "identity", + "itertools 0.10.5", + "pretty_assertions", + "quickcheck", + "rand 0.8.5", + "rand_chacha 0.3.1", + "repolock", + "sha2 0.10.6", + "tempdir", + "thiserror", + "tracing", + "twox-hash", + "types", + "util", + "uuid", + "vlqencoding", +] + +[[package]] +name = "trust-dns-proto" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" +dependencies = [ + "async-trait", + "cfg-if 1.0.0", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.2.3", + "ipnet", + "lazy_static", + "log", + "rand 0.8.5", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "url", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" +dependencies = [ + "cfg-if 1.0.0", + "futures-util", + "ipconfig", + "lazy_static", + "log", + "lru-cache", + "parking_lot 0.12.1", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "trust-dns-proto", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if 1.0.0", + "rand 0.8.5", + "static_assertions", +] + +[[package]] +name = "type_macros" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "types" +version = "0.1.0" +dependencies = [ + "anyhow", + "byteorder", + "criterion", + "faster-hex", + "hex", + "lazy_static", + "quickcheck", + "quickcheck_arbitrary_derive", + "rand 0.8.5", + "ref-cast", + "serde", + "serde_bytes", + "serde_cbor", + "serde_derive", + "serde_json", + "sha-1", + "thiserror", + "util", + "vlqencoding", +] + +[[package]] +name = "ucd-trie" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" + +[[package]] +name = "uds_windows" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi 0.3.9", +] + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unionconfig" +version = "0.1.0" +dependencies = [ + "configmodel", + "indexmap", + "staticconfig", +] + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna 0.3.0", + "percent-encoding", +] + +[[package]] +name = "utf8parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" + +[[package]] +name = "util" +version = "0.1.0" +dependencies = [ + "anyhow", + "atomicfile", + "dirs 2.0.2", + "fs2", + "hostname 0.3.1", + "lazystr", + "libc", + "memmap", + "once_cell", + "rand 0.8.5", + "shellexpand", + "tempdir", + "tempfile", + "thiserror", + "winapi 0.3.9", +] + +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +dependencies = [ + "getrandom 0.2.8", + "serde", + "sha1", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "value-bag" +version = "1.0.0-alpha.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" +dependencies = [ + "ctor", + "sval", + "version_check", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version" +version = "0.1.0" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vfs" +version = "0.1.0" +dependencies = [ + "anyhow", + "crossbeam 0.8.2", + "dashmap", + "fsinfo", + "identity", + "libc", + "minibytes", + "once_cell", + "tempfile", + "tokio", + "types", + "util", +] + +[[package]] +name = "vlqencoding" +version = "0.1.0" +dependencies = [ + "quickcheck", +] + +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] +name = "vtparse" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9b2acfb050df409c972a37d3b8e08cdea3bddb0c09db9d53137e504cfabed0" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi 0.3.9", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "watchman_client" +version = "0.8.0" +source = "git+https://github.com/facebook/watchman.git?branch=main#d21cc8bb48e1e03e7f0327b6ddbf28d76523ad1b" +dependencies = [ + "anyhow", + "bytes 1.3.0", + "futures 0.3.25", + "maplit", + "serde", + "serde_bser", + "thiserror", + "tokio", + "tokio-util 0.6.10", + "winapi 0.3.9", +] + +[[package]] +name = "web-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki", +] + +[[package]] +name = "wepoll-ffi" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" +dependencies = [ + "cc", +] + +[[package]] +name = "wezterm-bidi" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1560382cf39b0fa92473eae4d5b3772f88c63202cbf5a72c35db72ba99e66c36" +dependencies = [ + "log", + "wezterm-dynamic", +] + +[[package]] +name = "wezterm-color-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6e7a483dd2785ba72705c51e8b1be18300302db2a78368dac9bc8773857777" +dependencies = [ + "csscolorparser", + "deltae", + "lazy_static", + "wezterm-dynamic", +] + +[[package]] +name = "wezterm-dynamic" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75e78c0cc60a76de5d93f9dad05651105351e151b6446ab305514945d7588aa" +dependencies = [ + "log", + "ordered-float 3.4.0", + "strsim 0.10.0", + "thiserror", + "wezterm-dynamic-derive", +] + +[[package]] +name = "wezterm-dynamic-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9f5ef318442d07b3d071f9f43ea40b80992f87faee14bb4d017b6991c307f0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "which" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +dependencies = [ + "either", + "libc", + "once_cell", +] + +[[package]] +name = "widestring" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "workingcopy" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "async-trait", + "configmodel", + "crossbeam 0.8.2", + "edenfs_client", + "futures 0.3.25", + "identity", + "io", + "manifest", + "manifest-tree", + "parking_lot 0.11.2", + "pathmatcher", + "progress-model", + "repolock", + "serde", + "serde_json", + "sparse", + "status", + "storemodel", + "tempdir", + "tempfile", + "thiserror", + "thrift-types", + "tokio", + "tracing", + "treestate", + "types", + "util", + "vfs", + "watchman_client", +] + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "xdiff" +version = "0.1.0" +dependencies = [ + "structopt", + "xdiff-sys", +] + +[[package]] +name = "xdiff-sys" +version = "0.1.0" +dependencies = [ + "cc", +] + +[[package]] +name = "xml-rs" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "zstd" +version = "0.11.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "5.0.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.5+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "zstdelta" +version = "0.1.0" +dependencies = [ + "libc", + "quickcheck", + "rand 0.8.5", + "rand_chacha 0.3.1", + "zstd-sys", +] + +[[package]] +name = "zstore" +version = "0.1.0" +dependencies = [ + "indexedlog", + "lazy_static", + "lru-cache", + "mincode", + "minibytes", + "parking_lot 0.11.2", + "quickcheck", + "serde", + "sha-1", + "tempfile", + "tracing", + "types", + "zstdelta", +] diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix new file mode 100644 index 000000000000..8873e8c4718e --- /dev/null +++ b/pkgs/applications/version-management/sapling/default.nix @@ -0,0 +1,207 @@ +{ lib +, stdenv +, python3Packages +, fetchFromGitHub +, fetchurl +, sd +, curl +, pkg-config +, openssl +, rustPlatform +, fetchYarnDeps +, yarn +, nodejs +, fixup_yarn_lock +, glibcLocales +, libiconv +, CoreFoundation +, CoreServices +, Security + +, enableMinimal ? false +}: + +let + inherit (lib.importJSON ./deps.json) links version versionHash; + # Sapling sets a Cargo config containing lines like so: + # [target.aarch64-apple-darwin] + # rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"] + # + # The default cargo config that's set by the build hook will set + # unstable.host-config and unstable.target-applies-to-host which seems to + # result in the link arguments above being ignored and thus link failures. + # All it is there to do anyway is just to do stuff with musl and cross + # compilation, which doesn't work on macOS anyway so we can just stub it + # on macOS. + # + # See https://github.com/NixOS/nixpkgs/pull/198311#issuecomment-1326894295 + myCargoSetupHook = rustPlatform.cargoSetupHook.overrideAttrs (old: { + cargoConfig = if stdenv.isDarwin then "" else old.cargoConfig; + }); + + src = fetchFromGitHub { + owner = "facebook"; + repo = "sapling"; + rev = version; + hash = "sha256-zlvb+qn9SSBPZmlF8KwKTWyKj94FGOafSMRMNLsccOU"; + }; + + addonsSrc = "${src}/addons"; + + # Fetches the Yarn modules in Nix to to be used as an offline cache + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${addonsSrc}/yarn.lock"; + sha256 = "sha256-+29WAgSXVciHhLMN04yfKiWCpjM3Vo54nUdTP6owSLs"; + }; + + # Builds the NodeJS server that runs with `sl web` + isl = stdenv.mkDerivation { + pname = "sapling-isl"; + src = addonsSrc; + inherit version; + + nativeBuildInputs = [ + fixup_yarn_lock + nodejs + yarn + ]; + + buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) + 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 + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cd isl + node release.js $out + + runHook postInstall + ''; + }; + + # Builds the main `sl` binary and its Python extensions + sapling = python3Packages.buildPythonPackage { + pname = "sapling-main"; + inherit src version; + + sourceRoot = "source/eden/scm"; + + # Upstream does not commit Cargo.lock + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "cloned-0.1.0" = "sha256-DYQTK722wgeDUJtOVXHLt42G6gpe6A62rET+JH+bPKU="; + "deltae-0.3.0" = "sha256-a9Skaqs+tVTw8x83jga+INBr+TdaMmo35Bf2wbfR6zs="; + "fb303_core-0.0.0" = "sha256-YEFNTYvtgp8nc/1O7AbdyxCD3Xx2xCjbS17fTTEsUL0="; + "fbthrift-0.0.1+unstable" = "sha256-mDoYhXOzQIDqP7XdmiBbmq5VmAKAgggTNH/kW2kHv4k="; + "reqwest-0.11.11" = "sha256-uhc8XhkGW22XDNo0qreWdXeFF2cslOOZHfTRQ30IBcE="; + "serde_bser-0.3.1" = "sha256-/zn1NfXWytXvnalkgPsg9BdujVV97PGkXwmPtQGVeCc="; + }; + }; + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + # Since the derivation builder doesn't have network access to remain pure, + # fetch the artifacts manually and link them. Then replace the hardcoded URLs + # with filesystem paths for the curl calls. + postUnpack = '' + mkdir $sourceRoot/hack_pydeps + ${lib.concatStrings (map (li: "ln -s ${fetchurl li} $sourceRoot/hack_pydeps/${baseNameOf li.url}\n") links)} + sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py + ''; + + # Now, copy the "sl web" (aka edenscm-isl) results into the output of this + # package, so that the command can actually work. NOTES: + # + # 1) This applies on all systems (so no conditional a la postFixup) + # 2) This doesn't require any kind of fixup itself, so we leave it out + # of postFixup for that reason, too + # 3) If asked, we optionally patch in a hardcoded path to the 'nodejs' package, + # so that 'sl web' always works + # 4) 'sl web' will still work if 'nodejs' is in $PATH, just not OOTB + preFixup = '' + sitepackages=$out/lib/${python3Packages.python.libPrefix}/site-packages + chmod +w $sitepackages + cp -r ${isl} $sitepackages/edenscm-isl + '' + lib.optionalString (!enableMinimal) '' + chmod +w $sitepackages/edenscm-isl/run-isl + substituteInPlace $sitepackages/edenscm-isl/run-isl \ + --replace 'NODE=node' 'NODE=${nodejs}/bin/node' + ''; + + postFixup = lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/sl \ + --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" + ''; + + nativeBuildInputs = [ + curl + pkg-config + ] ++ (with rustPlatform; [ + myCargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + curl + libiconv + CoreFoundation + CoreServices + Security + ]; + + doCheck = false; + + HGNAME = "sl"; + SAPLING_OSS_BUILD = "true"; + SAPLING_VERSION = version; + SAPLING_VERSION_HASH = versionHash; + }; +in +stdenv.mkDerivation { + pname = "sapling"; + inherit version; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r ${sapling}/* $out + + runHook postInstall + ''; + + # just a simple check phase, until we have a running test suite. this should + # help catch issues like lack of a LOCALE_ARCHIVE setting (see GH PR #202760) + doCheck = true; + checkPhase = '' + echo -n "testing sapling version; should be \"${version}\"... " + ${sapling}/bin/sl version | grep -qw "${version}" + echo "OK!" + ''; + + meta = with lib; { + description = "A Scalable, User-Friendly Source Control System"; + homepage = "https://sapling-scm.com"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ pbar thoughtpolice ]; + platforms = platforms.unix; + mainProgram = "sl"; + }; +} diff --git a/pkgs/applications/version-management/sapling/deps.json b/pkgs/applications/version-management/sapling/deps.json new file mode 100644 index 000000000000..9cbcd71cbcf7 --- /dev/null +++ b/pkgs/applications/version-management/sapling/deps.json @@ -0,0 +1,78 @@ +{ + "links": [ + { + "sha256": "0dgg5x4nvdpfiz552diy11xg72y14s38hjz9qxygafnfgybg6hab", + "url": "https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl" + }, + { + "sha256": "0dq9f7irmml1nm9a2rx8dd6m2dqmzjj1x40mk0rg619wrdfsaj0b", + "url": "https://files.pythonhosted.org/packages/39/7b/88dbb785881c28a102619d46423cb853b46dbccc70d3ac362d99773a78ce/pexpect-4.8.0-py2.py3-none-any.whl" + }, + { + "sha256": "0r4xy2sqwyhwlwj81zvhzbnx7a7r4xdz9xyzzkjczlx7gk1cig1d", + "url": "https://files.pythonhosted.org/packages/23/6a/210816c943c9aeeb29e4e18a298f14bf0e118fe222a23e13bfcc2d41b0a4/ipython-7.16.1-py3-none-any.whl" + }, + { + "sha256": "0wwi1c6md4vkbcsfsf8dklf3vr4mcdj4mpxkanwgb6jb1432x5yw", + "url": "https://files.pythonhosted.org/packages/3d/57/4d9c9e3ae9a255cd4e1106bb57e24056d3d0709fc01b2e3e345898e49d5b/simplegeneric-0.8.1.zip" + }, + { + "sha256": "16sgpg57kxx5jh467d9qwc2hwshfvdbl0xkafdp3qspvbfp46qc0", + "url": "https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl" + }, + { + "sha256": "1qn3bnyd7gdwkyk8nvlhiy3c6zbwjd49fjxj0gp8xxi9faiysiwz", + "url": "https://files.pythonhosted.org/packages/44/98/5b86278fbbf250d239ae0ecb724f8572af1c91f4a11edf4d36a206189440/colorama-0.4.4-py2.py3-none-any.whl" + }, + { + "sha256": "0mfj5d1bgpy1clfgwrkmjqm2pv70pm01jp4iyyhphc96kyifdg7v", + "url": "https://files.pythonhosted.org/packages/4c/1c/ff6546b6c12603d8dd1070aa3c3d273ad4c07f5771689a7b69a550e8c951/backcall-0.2.0-py2.py3-none-any.whl" + }, + { + "sha256": "0yxz45fzjsq6zh5f9cjl0gf4vfg1l7rd79zyb3ih544layjg3ff8", + "url": "https://files.pythonhosted.org/packages/4e/78/56aa1b5f4d8ac548755ae767d84f0be54fdd9d404197a3d9e4659d272348/setuptools-57.0.0-py3-none-any.whl" + }, + { + "sha256": "1177pfa343r378020a85l3b16ak479qgyvh8k5719fgbkhm81d5y", + "url": "https://files.pythonhosted.org/packages/59/7c/e39aca596badaf1b78e8f547c807b04dae603a433d3e7a7e04d67f2ef3e5/wcwidth-0.2.5-py2.py3-none-any.whl" + }, + { + "sha256": "1r55ffffaq4q3dpvha7iipgxlqwvjg5cklf9izr42xj5rr226r26", + "url": "https://files.pythonhosted.org/packages/87/61/2dfea88583d5454e3a64f9308a686071d58d59a55db638268a6413e1eb6d/prompt_toolkit-2.0.10-py3-none-any.whl" + }, + { + "sha256": "08v36wa0kckc892bk4nypl6sszbysarm8jhslviz1agp2sf1jp3f", + "url": "https://files.pythonhosted.org/packages/6a/36/b1b9bfdf28690ae01d9ca0aa5b0d07cb4448ac65fb91dc7e2d094e3d992f/decorator-5.0.9-py3-none-any.whl" + }, + { + "sha256": "0mnzcb714ynl1qlv9dwnh50rv75mmj18ywaxbl8xzm3l9m0syjcn", + "url": "https://files.pythonhosted.org/packages/9a/41/220f49aaea88bc6fa6cba8d05ecf24676326156c23b991e80b3f2fc24c77/pickleshare-0.7.5-py2.py3-none-any.whl" + }, + { + "sha256": "13iv73575lilrm01ffhr8y8sxn8kxhvfqsgwckbr919725280vnn", + "url": "https://files.pythonhosted.org/packages/a6/c9/be11fce9810793676017f79ffab3c6cb18575844a6c7b8d4ed92f95de604/Pygments-2.9.0-py3-none-any.whl" + }, + { + "sha256": "0i7ycyjad9kq6lgq5ih7j8xsm639z24250s6d17pp781v6hwdd3h", + "url": "https://files.pythonhosted.org/packages/ca/ab/872a23e29cec3cf2594af7e857f18b687ad21039c1f9b922fac5b9b142d5/traitlets-4.3.3-py2.py3-none-any.whl" + }, + { + "sha256": "0m02dsi8lvrjf4bi20ab6lm7rr6krz7pg6lzk3xjs2l9hqfjzfwa", + "url": "https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl" + }, + { + "sha256": "1f7sc4ydjj33gadcgfz8fcx02d1wm2frlqwzdik1krlr6wikgpbj", + "url": "https://files.pythonhosted.org/packages/fa/bc/9bd3b5c2b4774d5f33b2d544f1460be9df7df2fe42f352135381c347c69a/ipython_genutils-0.2.0-py2.py3-none-any.whl" + }, + { + "sha256": "1ibql99agjf2gj7y0svzd5m0h81hailf4p3sj3yl9i1i8ykdj6wm", + "url": "https://files.pythonhosted.org/packages/fc/56/9f67dcd4a4b9960373173a31be1b8c47fe351a1c9385677a7bdd82810e57/ipdb-0.13.9.tar.gz" + }, + { + "sha256": "1xqsihpqnfal29nb5kmw8z71nd4jbsnbz7p3lkr094xpb13wycw7", + "url": "https://files.pythonhosted.org/packages/4c/76/1e41fbb365ad20b6efab2e61b0f4751518444c953b390f9b2d36cf97eea0/Cython-0.29.32.tar.gz" + } + ], + "version": "0.2.20221222-152408-ha6a66d09", + "versionHash": "14601963598499040874" +} diff --git a/pkgs/applications/version-management/sapling/gen-deps.py b/pkgs/applications/version-management/sapling/gen-deps.py new file mode 100755 index 000000000000..e3fe56f73221 --- /dev/null +++ b/pkgs/applications/version-management/sapling/gen-deps.py @@ -0,0 +1,42 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ requests ])" +import json +import re +from hashlib import sha1 +from struct import unpack +from subprocess import run + +from requests import get + +# Fetch the latest stable release metadata from GitHub +latestTag = get("https://api.github.com/repos/facebook/sapling/releases/latest").json()[ + "tag_name" +] + + +def nixPrefetchUrl(url): + return run( + ["nix-prefetch-url", "--type", "sha256", url], + check=True, + text=True, + capture_output=True, + ).stdout.rstrip() + + +# Fetch the `setup.py` source and look for instances of assets being downloaded +# from files.pythonhosted.org. +setupPy = get( + f"https://github.com/facebook/sapling/raw/{latestTag}/eden/scm/setup.py" +).text +foundUrls = re.findall(r'(https://files\.pythonhosted\.org/packages/[^\s]+)"', setupPy) + +dataDeps = { + "links": [{"url": url, "sha256": nixPrefetchUrl(url)} for url in foundUrls], + "version": latestTag, + # Find latest's git tag which corresponds to the Sapling version. Also + # needed is a hash of the version, so calculate that here. Taken from + # Sapling source `$root/eden/scm/setup_with_version.py`. + "versionHash": str(unpack(">Q", sha1(latestTag.encode("ascii")).digest()[:8])[0]), +} + +open("deps.json", "w").write(json.dumps(dataDeps, indent=2, sort_keys=True) + "\n") diff --git a/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix b/pkgs/applications/version-management/scmpuff/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/scmpuff/default.nix rename to pkgs/applications/version-management/scmpuff/default.nix diff --git a/pkgs/applications/version-management/scriv/default.nix b/pkgs/applications/version-management/scriv/default.nix new file mode 100644 index 000000000000..b49969317ef3 --- /dev/null +++ b/pkgs/applications/version-management/scriv/default.nix @@ -0,0 +1,57 @@ +{ lib +, python3 +, fetchPypi +, pandoc +, git +, scriv +, testers +}: + +python3.pkgs.buildPythonApplication rec { + pname = "scriv"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-u2HDD+pzFYpNGMKLu1eCHDCCRWg++w2Je9ReSnhWtHI="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + attrs + click + click-log + jinja2 + requests + ] ++ lib.optionals (python3.pythonOlder "3.11") [ + tomli + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + coverage + freezegun + pudb + pytest-mock + responses + pyyaml + + pandoc + git + ]; + disabledTests = [ + # assumes we have checked out the full repo (including remotes) + "test_real_get_github_repos" + ]; + + passthru.tests = { + version = testers.testVersion { package = scriv; }; + }; + + meta = { + description = "Command-line tool for helping developers maintain useful changelogs."; + homepage = "https://github.com/nedbat/scriv"; + changelog = "https://github.com/nedbat/scriv/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ amesgen ]; + }; +} diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index dab74a8ec5cb..a9aabd7a87da 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , makeDesktopItem , jre @@ -12,11 +13,11 @@ stdenv.mkDerivation rec { pname = "smartgithg"; - version = "21.2.2"; + version = "22.1.3"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - sha256 = "10v6sg0lmjby3v8g3sk2rzzvdx5p69ia4zz2c0hbf30rk0p6gqn3"; + sha256 = "sha256-TnpjRFInqmlY02fGi7oxoS4P1DzahryFvNLitJ5NjM4="; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -86,6 +87,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GUI for Git, Mercurial, Subversion"; homepage = "https://www.syntevo.com/smartgit/"; + changelog = "https://www.syntevo.com/smartgit/changelog.txt"; license = licenses.unfree; platforms = platforms.linux; maintainers = with lib.maintainers; [ jraygauthier ]; diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index 2189e54ce3ca..7faca39e2fe4 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -15,7 +15,6 @@ let srht = self.callPackage ./core.nix { inherit fetchNodeModules; }; buildsrht = self.callPackage ./builds.nix { }; - dispatchsrht = self.callPackage ./dispatch.nix { }; gitsrht = self.callPackage ./git.nix { }; hgsrht = self.callPackage ./hg.nix { }; hubsrht = self.callPackage ./hub.nix { }; @@ -33,7 +32,8 @@ with python.pkgs; recurseIntoAttrs { inherit python; coresrht = toPythonApplication srht; buildsrht = toPythonApplication buildsrht; - dispatchsrht = toPythonApplication dispatchsrht; + # Added 2022-10-29 + dispatchsrht = throw "dispatch is deprecated. See https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/ for more information."; gitsrht = toPythonApplication gitsrht; hgsrht = toPythonApplication hgsrht; hubsrht = toPythonApplication hubsrht; diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix deleted file mode 100644 index 05ed0450e000..000000000000 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, fetchFromSourcehut -, buildPythonPackage -, srht -, pyyaml -, PyGithub -, python -}: - -buildPythonPackage rec { - pname = "dispatchsrht"; - version = "0.15.34"; - - src = fetchFromSourcehut { - owner = "~sircmpwn"; - repo = "dispatch.sr.ht"; - rev = version; - sha256 = "sha256-bZ4ZKohMozZIyP0TUgxETOECib4XGUv29+Mg8ZsoMf8="; - }; - - propagatedBuildInputs = [ - srht - pyyaml - PyGithub - ]; - - preBuild = '' - export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht - ''; - - pythonImportsCheck = [ "dispatchsrht" ]; - - meta = with lib; { - 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/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index b6e4f8c33110..95ef43775ec2 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { ''; # pytest tests fail - checkInputs = [ + nativeCheckInputs = [ pytest factory_boy ]; diff --git a/pkgs/applications/version-management/sourcehut/update.sh b/pkgs/applications/version-management/sourcehut/update.sh index e13ce09da4c7..239d767ed9b4 100755 --- a/pkgs/applications/version-management/sourcehut/update.sh +++ b/pkgs/applications/version-management/sourcehut/update.sh @@ -67,7 +67,7 @@ else # because the reported $oldHash to be changed # may not actually be in $default_nix # but in the file of one of its dependencies. - services=( "srht" "scmsrht" "buildsrht" "dispatchsrht" "gitsrht" "hgsrht" "hubsrht" "listssrht" "mansrht" + services=( "srht" "scmsrht" "buildsrht" "gitsrht" "hgsrht" "hubsrht" "listssrht" "mansrht" "metasrht" "pagessrht" "pastesrht" "todosrht" ) fi diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index 7547d6d4051e..cba7be953173 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -1,28 +1,31 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, Security, git }: rustPlatform.buildRustPackage rec { pname = "srvc"; - version = "0.8.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "insilica"; repo = "rs-srvc"; rev = "v${version}"; - sha256 = "sha256-2eEuKAMxxTwjDInpYcOlFJha5DTe0IrxT5rI6ymN0hc="; + sha256 = "sha256-m4mN+vDEKPHRavtI9CbszOOdJcLYa+XqlzEyPvPXE0g="; }; - cargoSha256 = "sha256-nJM7/w4awbCZQysUOSTO6bfsBXO3agJRdp1RyRZhtUY="; - - # remove timeouts in tests to make them less flaky - patches = [ ./tests-no-timeout.patch ]; + cargoHash = "sha256-USOYXb6/hEE9HVz5YcNZPY5yuvDxbrH4YyZxY7XNAto="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + nativeCheckInputs = [ git ]; + + # remove timeouts in tests to make them less flaky + TEST_SRVC_DISABLE_TIMEOUT = 1; + meta = with lib; { description = "Sysrev version control"; homepage = "https://github.com/insilica/rs-srvc"; + changelog = "https://github.com/insilica/rs-srvc/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ john-shaffer ]; mainProgram = "sr"; diff --git a/pkgs/applications/version-management/srvc/tests-no-timeout.patch b/pkgs/applications/version-management/srvc/tests-no-timeout.patch deleted file mode 100644 index d353b9e5f44b..000000000000 --- a/pkgs/applications/version-management/srvc/tests-no-timeout.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/tests/common/mod.rs -+++ b/tests/common/mod.rs -@@ -1,15 +1,13 @@ - #![allow(dead_code)] - - use std::path::PathBuf; --use std::time::Duration; - - use assert_cmd::Command; - #[cfg(unix)] - use rexpect::session::PtySession; - --pub fn cmd(timeout_millis: u64) -> Command { -+pub fn cmd(_: u64) -> Command { - let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap(); -- cmd.timeout(Duration::from_millis(timeout_millis)); - cmd.env_remove("RUST_BACKTRACE"); - cmd - } -@@ -19,14 +17,14 @@ pub fn spawn( - dir: &str, - args: Vec<&str>, - timestamp_override: u64, -- timeout_millis: u64, -+ _: u64, - ) -> Result { - let mut cmd = std::process::Command::new(env!("CARGO_BIN_EXE_sr")); - cmd.args(args); - cmd.current_dir(dir); - cmd.env("SR_TIMESTAMP_OVERRIDE", timestamp_override.to_string()); - cmd.env_remove("RUST_BACKTRACE"); -- Ok(rexpect::session::spawn_command(cmd, Some(timeout_millis))?) -+ rexpect::session::spawn_command(cmd, None) - } - - pub fn remove_sink(dir: &str) -> Result<(), std::io::Error> { diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/stgit/default.nix similarity index 98% rename from pkgs/applications/version-management/git-and-tools/stgit/default.nix rename to pkgs/applications/version-management/stgit/default.nix index b5bdecd85ad1..535edeeff152 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/stgit/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { format = "other"; - checkInputs = [ git perl ]; + nativeCheckInputs = [ git perl ]; postPatch = '' for f in Documentation/*.xsl; do diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/subgit/default.nix similarity index 89% rename from pkgs/applications/version-management/git-and-tools/subgit/default.nix rename to pkgs/applications/version-management/subgit/default.nix index 0ec06aeaaa68..a7288aa24e6e 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/subgit/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "subgit"; - version = "3.3.15"; + version = "3.3.16"; 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-2/J/d4GrlLXR/7QBxgIMepzP+xxkeLvrCBwLl7Ke8wI="; + sha256 = "sha256-p7uBEG43N4Hed+8HYf3I9lQEvmYLV61oIyRrPHuGmUA="; }; } diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 87ad6a287667..62122bc35b15 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -9,8 +9,8 @@ in { } {}; sublime-merge-dev = common { - buildVersion = "2078"; - x64sha256 = "33oJOnsOUr9W+OGMetafaGtXUa+CHxxLjmtDoZliw0k="; + buildVersion = "2082"; + x64sha256 = "Gl1BrLTSDLRTgrYQW/99o0XRjSIxvnNYRIViZEidcsM="; dev = true; } {}; } diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 69a2bce49060..613872721d20 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -101,7 +101,7 @@ let enableParallelBuilding = true; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = false; # fails 10 out of ~2300 tests meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/svn-all-fast-export/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix rename to pkgs/applications/version-management/svn-all-fast-export/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/svn2git/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/svn2git/default.nix rename to pkgs/applications/version-management/svn2git/default.nix diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix index e3b5891720fb..bd824a71633c 100644 --- a/pkgs/applications/version-management/tailor/default.nix +++ b/pkgs/applications/version-management/tailor/default.nix @@ -1,19 +1,37 @@ -{ fetchurl, pypy2Packages }: +{ lib +, python3 +, fetchurl +}: -pypy2Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "tailor"; - version = "0.9.35"; + version = "0.9.37"; src = fetchurl { - urls = [ - "http://darcs.arstecnica.it/tailor/tailor-${version}.tar.gz" - "https://src.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz" - ]; - sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh"; + url = "https://gitlab.com/ports1/tailor/-/archive/0.937/tailor-0.937.tar.gz"; + hash = "sha256-Bdf8ZCRsbCsFz1GRxyQxxndXSsm8oOL2738m9UxOTVc="; }; - meta = { - description = "Version control tools integration tool"; + propagatedBuildInputs = with python3.pkgs; [ + future + ]; + + # AssertionError: Tailor Darcs repository not found! + doCheck = false; + + meta = with lib; { + description = "A tool to migrate changesets between various kinds of version control system."; + longDescription = '' + With its ability to "translate the history" from one VCS kind to another, + this tool makes it easier to keep the upstream changes merged in + a own branch of a product. + + Tailor is able to fetch the history from Arch, Bazaar, CVS, Darcs, Monotone, + Perforce or Subversion and rewrite it over Aegis, Bazaar, CVS, Darcs, Git, + Mercurial, Monotone and Subversion. + ''; + homepage = "https://gitlab.com/ports1/tailor"; + license = licenses.gpl1Plus; + platforms = platforms.unix; }; } - diff --git a/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/pkgs/applications/version-management/thicket/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/thicket/default.nix rename to pkgs/applications/version-management/thicket/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/tig/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/tig/default.nix rename to pkgs/applications/version-management/tig/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/topgit/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/topgit/default.nix rename to pkgs/applications/version-management/topgit/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/transcrypt/default.nix similarity index 100% rename from pkgs/applications/version-management/git-and-tools/transcrypt/default.nix rename to pkgs/applications/version-management/transcrypt/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch b/pkgs/applications/version-management/transcrypt/helper-scripts_depspathprefix.patch similarity index 100% rename from pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch rename to pkgs/applications/version-management/transcrypt/helper-scripts_depspathprefix.patch diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index 1fa100591832..0625d0a684e0 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ git ]; - checkInputs = [] + nativeCheckInputs = [] ++ (with perlPackages; [ perl ShellCommand TestMost ]); outputs = [ "out" "doc" "man" ]; diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index e77fe067670f..079fb1792e18 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -25,16 +25,10 @@ , pcre , pkg-config , which +, wrapGAppsHook , wxGTK , zlib -, CoreText -, CoreFoundation -, AppKit -, Carbon -, IOKit -, Cocoa - , spellcheckSupport ? true , hunspell ? null @@ -51,6 +45,7 @@ , portaudio ? null , useBundledLuaJIT ? false +, darwin }: assert spellcheckSupport -> (hunspell != null); @@ -62,6 +57,7 @@ assert portaudioSupport -> (portaudio != null); let luajit52 = luajit.override { enable52Compat = true; }; inherit (lib) optional; + inherit (darwin.apple_sdk.frameworks) CoreText CoreFoundation AppKit Carbon IOKit Cocoa; in stdenv.mkDerivation rec { pname = "aegisub"; @@ -80,6 +76,7 @@ stdenv.mkDerivation rec { pkg-config which cmake + wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix index 07a0a5803ca0..03e9996a1004 100644 --- a/pkgs/applications/video/ani-cli/default.nix +++ b/pkgs/applications/video/ani-cli/default.nix @@ -4,21 +4,21 @@ , lib , gnugrep , gnused -, curl -, openssl +, wget +, fzf , mpv , aria2 }: stdenvNoCC.mkDerivation rec { pname = "ani-cli"; - version = "3.4"; + version = "4.0"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; rev = "v${version}"; - sha256 = "sha256-Xb7MNL7YKbvyRR5ZppUfCYeYpjNAiJWNOjIFk5fUvpY="; + hash = "sha256-1yhBlQ/abT+/BKEIskgnAh+cmKCzXuS9hu6apaangVk="; }; nativeBuildInputs = [ makeWrapper ]; @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec { install -Dm755 ani-cli $out/bin/ani-cli wrapProgram $out/bin/ani-cli \ - --prefix PATH : ${lib.makeBinPath [ gnugrep gnused curl openssl mpv aria2 ]} + --prefix PATH : ${lib.makeBinPath [ gnugrep gnused wget fzf mpv aria2 ]} runHook postInstall ''; diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index 4a19121f34ad..7e1157fc4a67 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -13,7 +13,7 @@ let owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj"; + hash = "sha256-8pYbIkPsg16VelwqpYSzqfAJaCU37lun+XZ/crzCDZU="; }; }); @@ -29,7 +29,7 @@ let version = "9.2.0"; src = oldAttrs.src.override { inherit version; - sha256 = "02ig2wf2yyrnnl88r2n13s1naskwsifwgx3syifmcxygflsmjd3d"; + hash = "sha256-bTRZNXXPd1Zd9Hr0x13UfGplgx7BiowQtTZ7LxwXLwo="; }; }); }; diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index fd9ef652dbea..90993a91e45f 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -51,9 +51,7 @@ stdenv.mkDerivation rec { doCheck = true; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://github.com/celluloid-player/celluloid"; diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 0ce0623ec9d9..972a68e04f03 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation { pname = "cinelerra-cv"; - version = "unstable-2021-02-14"; + version = "unstable-2023-01-29"; src = fetchFromGitHub { owner = "cinelerra-cv-team"; repo = "cinelerra-cv"; - rev = "7d0e8ede557d0cdf3606e0a8d97166a22f88d89e"; - sha256 = "0n84y2wp47y89drc48cm1609gads5c6saw6c6bqcf5c5wcg1yfbj"; + rev = "bb00ac6b70fcf3cf419348b56f9b264bc01c1a89"; + sha256 = "11965kb3d7xcvlcf8p7jlzk9swk5i78x7wja4s3043wlzmqmwv0q"; }; preConfigure = '' diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index f931e905127f..39af3876bf6f 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -3,7 +3,6 @@ , cacert , curl , runCommandLocal -, targetPlatform , unzip , appimage-run , addOpenGLRunpath @@ -49,7 +48,7 @@ let SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}"; USERAGENT = builtins.concatStringsSep " " [ - "User-Agent: Mozilla/5.0 (X11; Linux ${targetPlatform.linuxArch})" + "User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.targetPlatform.linuxArch})" "AppleWebKit/537.36 (KHTML, like Gecko)" "Chrome/77.0.3865.75" "Safari/537.36" @@ -166,6 +165,7 @@ buildFHSUserEnv { writeText "davinci-wrapper" '' export QT_XKB_CONFIG_ROOT="${xkeyboard_config}/share/X11/xkb" + export QT_PLUGIN_PATH="${davinci}/libs/plugins:$QT_PLUGIN_PATH" export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${davinci}/libs ${davinci}/bin/resolve '' diff --git a/pkgs/applications/video/dmlive/default.nix b/pkgs/applications/video/dmlive/default.nix index 49c542b459fb..c21c29ff583a 100644 --- a/pkgs/applications/video/dmlive/default.nix +++ b/pkgs/applications/video/dmlive/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "dmlive"; - version = "unstable-2022-08-22"; + version = "unstable-2022-11-19"; src = fetchFromGitHub { owner = "THMonster"; repo = pname; - rev = "fd4fa1859f05350658db598a50d29f59d22b55a1"; - hash = "sha256-NVabHLxPHi7hWoztthPmVC5VRKQKglpytuUQOY1Hzrw="; + rev = "711319043dca3c1fee44cd60841ef51605b42bce"; + hash = "sha256-weWl9voqTP/1ZBSLuMFzfWE5NskHNPJnFYy9n9IgcZk="; }; - cargoHash = "sha256-TziP7n9Xgi/wHaiF/NI6noMp1iR6vRuAXxvKJwQHbTw="; + cargoHash = "sha256-9bonyOCQfO5Eq8T2GVCri+INCe4RUOK28nw4cnmmAWs="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index 165cb4ab4d63..6499b6153c8d 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { meta = { description = "Suite of command line programs that creates a slideshow-style video from groups of pictures"; - homepage = "http://dvd-slideshow.sourceforge.net/wiki/Main_Page"; + homepage = "https://dvd-slideshow.sourceforge.net/wiki/Main_Page"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.robbinch ]; diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 941b0808886e..daf785b7139f 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools for generating DVD files to be played on standalone DVD players"; - homepage = "http://dvdauthor.sourceforge.net/"; + homepage = "https://dvdauthor.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/applications/video/dvdbackup/default.nix index 89995ab8cba7..3e998d0c4a17 100644 --- a/pkgs/applications/video/dvdbackup/default.nix +++ b/pkgs/applications/video/dvdbackup/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool to rip video DVDs from the command line"; - homepage = "http://dvdbackup.sourceforge.net/"; + homepage = "https://dvdbackup.sourceforge.net/"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.bradediger ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index 8d42c2b2bfd6..ba0d4945385e 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -17,7 +17,7 @@ , libjpeg , pkg-config , wrapGAppsHook -, wxGTK30-gtk3 # crash with wxGTK30 with GTK2 compat +, wxGTK32 , wxSVG , xine-ui , xmlto @@ -33,13 +33,18 @@ let inherit (lib) optionals makeBinPath; in stdenv.mkDerivation rec { pname = "dvdstyler"; - version = "3.1.2"; + version = "3.2.1"; src = fetchurl { url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/DVDStyler-${version}.tar.bz2"; - sha256 = "03lsblqficcadlzkbyk8agh5rqcfz6y6dqvy9y866wqng3163zq4"; + sha256 = "sha256-C7M0hzn0yTCXRUuBTss6WPa6zo8DD0Fhmp/ur7R0dVg="; }; + patches = [ + # https://sourceforge.net/p/dvdstyler/DVDStyler/ci/679fa8dc6ac7657775eda9d7b0ed9da9d069aeec/ + ./wxgtk32.patch + ]; + nativeBuildInputs = [ bison docbook_xml_dtd_412 @@ -62,7 +67,7 @@ in stdenv.mkDerivation rec { libexif libjpeg wxSVG - wxGTK30-gtk3 + wxGTK32 xine-ui ] ++ optionals dvdisasterSupport [ dvdisaster ] diff --git a/pkgs/applications/video/dvdstyler/wxgtk32.patch b/pkgs/applications/video/dvdstyler/wxgtk32.patch new file mode 100644 index 000000000000..92b3c3fbe3ba --- /dev/null +++ b/pkgs/applications/video/dvdstyler/wxgtk32.patch @@ -0,0 +1,12 @@ +--- a/wxVillaLib/PropDlg.cpp ++++ b/wxVillaLib/PropDlg.cpp +@@ -12,7 +12,9 @@ + #include "utils.h" + #include + #include ++#ifdef __WXMSW__ + #include ++#endif + #include + #include + #include diff --git a/pkgs/applications/video/epgstation/update.nix b/pkgs/applications/video/epgstation/update.nix index 41b7b9ab1e17..4b9907384e58 100644 --- a/pkgs/applications/video/epgstation/update.nix +++ b/pkgs/applications/video/epgstation/update.nix @@ -39,7 +39,7 @@ let # Fix issue with old sqlite3 version pinned that depends on very old node-gyp 3.x ${gnused}/bin/sed -i -e 's/"sqlite3":\s*"5.0.[0-9]\+"/"sqlite3": "5.0.11"/' package.json - # Regenerate node packages to update the pre-overriden epgstation derivation. + # Regenerate node packages to update the pre-overridden epgstation derivation. # This must come *after* package.json has been regenerated. pushd ../../../development/node-packages ./generate.sh diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index 7ca99c066ea1..75a7a9b46bb7 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.25.3"; + version = "1.26.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sEA6faoxuFA355ftI5xL3AXZD+6UYSDxRdQXA9nH5wY="; + sha256 = "sha256-OwREpfWaP0tdAjMGjGpVIAQn8rlTTjSfT+0t5g/2yjQ="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix new file mode 100644 index 000000000000..a688e0476256 --- /dev/null +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -0,0 +1,81 @@ +{ lib +, stdenv +, fetchFromGitLab +, cmake +, zlib +, potrace +, ffmpeg +, libarchive +, python3 +, qtbase +, qttools +, wrapQtAppsHook +, testers +, qtsvg +, qtimageformats + # For the tests +, glaxnimate # Call itself, for the tests +, xvfb-run +}: +let + # TODO: try to add a python library, see toPythonModule in doc/languages-frameworks/python.section.md + python3WithLibs = python3.withPackages (ps: with ps; [ + # In data/lib/python-lottie/requirements.txt + numpy + pillow + cairosvg + fonttools + grapheme + opencv4 + pyqt5 + qscintilla + # Not sure if needed, but appears in some files + pyyaml + requests + pybind11 + ]); +in +stdenv.mkDerivation rec { + pname = "glaxnimate"; + version = "0.5.1"; + + src = fetchFromGitLab { + owner = "mattbas"; + repo = "${pname}"; + rev = "${version}"; + sha256 = "G4ykcOvXXnVIQZUYpRIrALtDSsGqxMvDtcmobjjtlKw="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + + buildInputs = [ + zlib + potrace + # Upstream asks for libav dependency, which is fulfilled by ffmpeg + ffmpeg + libarchive + qtbase + qttools + qtsvg + qtimageformats + python3WithLibs + ]; + + qtWrapperArgs = [ ''--prefix PATH : ${python3WithLibs}/bin'' ]; + + passthru.tests.version = lib.optionalAttrs stdenv.isLinux (testers.testVersion { + package = glaxnimate; + command = "${xvfb-run}/bin/xvfb-run glaxnimate --version"; + }); + + meta = with lib; { + homepage = "https://gitlab.com/mattbas/glaxnimate"; + description = "Simple vector animation program."; + license = licenses.gpl3; + maintainers = with maintainers; [ tobiasBora ]; + }; +} diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 6390558013f5..afc97cd7e1a9 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, zlib }: stdenv.mkDerivation rec { - version = "2.0.0"; + version = "2.2.0"; pname = "gpac"; src = fetchFromGitHub { owner = "gpac"; repo = "gpac"; rev = "v${version}"; - sha256 = "sha256-MIX32lSqf/lrz9240h4wMIQp/heUmwvDJz8WN08yf6c="; + sha256 = "sha256-m2qXTXLGgAyU9y6GEk4Hp/7Al57IPRSqImJatIcwswQ="; }; - postPatch = '' - substituteInPlace Makefile --replace 'dh_link' 'ln -s' - ''; + patches = [ + (fetchpatch { + name = "CVE-2023-0358.patch"; + url = "https://github.com/gpac/gpac/commit/9971fb125cf91cefd081a080c417b90bbe4a467b.patch"; + sha256 = "sha256-0PDQXahbJCOo1JJAC0T0N1u2mqmwAkdm87wXMJnBicM="; + }) + ]; # this is the bare minimum configuration, as I'm only interested in MP4Box # For most other functionality, this should probably be extended @@ -41,14 +45,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = with maintainers; [ bluescreen303 mgdelacroix ]; platforms = platforms.linux; - knownVulnerabilities = [ - "CVE-2022-1035" - "CVE-2022-1172" - "CVE-2022-1222" - "CVE-2022-1795" - "CVE-2022-2453" - "CVE-2022-2454" - "CVE-2022-2549" - ]; }; } diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 0d063e707185..3849acda9473 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -26,13 +26,13 @@ mkDerivation rec { pname = "haruna"; - version = "0.9.3"; + version = "0.10.2"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-JINvLmiS6EnkAmxbqPJI+J9Wk4+ZXwZZm1x5Ew7FCBg="; + hash = "sha256-hhHWxmr2EzW9QqfV1bpJCiWOWsmGJmvxvtQcuXlMTc4="; domain = "invent.kde.org"; }; diff --git a/pkgs/applications/video/hdhomerun-config-gui/default.nix b/pkgs/applications/video/hdhomerun-config-gui/default.nix index 32f4267d9fcc..58516191fa35 100644 --- a/pkgs/applications/video/hdhomerun-config-gui/default.nix +++ b/pkgs/applications/video/hdhomerun-config-gui/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hdhomerun-config-gui"; - version = "20210224"; + version = "20221031"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/hdhomerun_config_gui_${version}.tgz"; - sha256 = "sha256-vzrSk742Ca2I8Uk0uGo44SxpEoVY1QBn62Ahwz8E7p8="; + sha256 = "17zf0hzw68b0xdkh1maqhl96jb7171mbhd29y64as29nps9x4fmz"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index 3d5f8d4957ab..ee62a711398b 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "hypnotix"; - version = "2.9"; + version = "3.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; rev = version; - hash = "sha256-jjCyO6lyhqH4xeNp5uy/KqNr5Mvv+45pJGHFOXNi0rk="; + hash = "sha256-R9bp1RQHHCrIE/3rIAHzWHXpXBUDUpJTkO53n+xZw3Q="; }; patches = [ diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index 69248dc75301..02c58925558e 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -1,12 +1,15 @@ { lib , buildPythonApplication +, copyDesktopItems , fetchPypi , gobject-introspection , jellyfin-apiclient-python , jinja2 +, makeDesktopItem , mpv , pillow , pystray +, python , python-mpv-jsonipc , pywebview , tkinter @@ -23,6 +26,7 @@ buildPythonApplication rec { }; nativeBuildInputs = [ + copyDesktopItems wrapGAppsHook gobject-introspection ]; @@ -59,6 +63,15 @@ buildPythonApplication rec { --replace "notify_updates: bool = True" "notify_updates: bool = False" ''; + # Install all the icons for the desktop item + postInstall = '' + for s in 16 32 48 64 128 256; do + mkdir -p $out/share/icons/hicolor/''${s}x''${s}/apps + ln -s $out/${python.sitePackages}/jellyfin_mpv_shim/integration/jellyfin-''${s}.png \ + $out/share/icons/hicolor/''${s}x''${s}/apps/${pname}.png + done + ''; + # needed for pystray to access appindicator using GI preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") @@ -69,6 +82,16 @@ buildPythonApplication rec { doCheck = false; pythonImportsCheck = [ "jellyfin_mpv_shim" ]; + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "Jellyfin MPV Shim"; + categories = [ "Video" "AudioVideo" "TV" "Player" ]; + }) + ]; + meta = with lib; { homepage = "https://github.com/jellyfin/jellyfin-mpv-shim"; description = "Allows casting of videos to MPV via the jellyfin mobile and web app"; diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix index ec98a811e078..938d2311779c 100644 --- a/pkgs/applications/video/jftui/default.nix +++ b/pkgs/applications/video/jftui/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "jftui"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "Aanok"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UwR4IboLSjD/XXvSw1AhJubSxettvL/URhZ/Je6TWPQ="; + sha256 = "sha256-4j0ypzszNWjHbb4RkMIoqvgz624zoKCKiIpidQUPIF4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/a4ksubtitles/default.nix b/pkgs/applications/video/kodi/addons/a4ksubtitles/default.nix index 9c62198cb0f3..ae32fb7c5a77 100644 --- a/pkgs/applications/video/kodi/addons/a4ksubtitles/default.nix +++ b/pkgs/applications/video/kodi/addons/a4ksubtitles/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "a4ksubtitles"; namespace = "service.subtitles.a4ksubtitles"; - version = "2.8.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "a4k-openproject"; repo = "a4kSubtitles"; rev = "${namespace}/${namespace}-${version}"; - sha256 = "0fg5mcvxdc3hqybp1spy7d1nnqirwhcvrblbwksikym9m3qgw2m5"; + sha256 = "sha256-t6oclFAOsUC+hFtw6wjRh1zl2vQfc7RKblVJpBPfE9w="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/certifi/default.nix b/pkgs/applications/video/kodi/addons/certifi/default.nix index 210429c77706..7becbd2252de 100644 --- a/pkgs/applications/video/kodi/addons/certifi/default.nix +++ b/pkgs/applications/video/kodi/addons/certifi/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "certifi"; namespace = "script.module.certifi"; - version = "2022.5.18+matrix.1"; + version = "2022.9.24"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "tk4Ven35sicLxrT7SO2yx5kQORjFP6niRuS9SMocJKY="; + sha256 = "kIPGEjmnHlgVb11W2RKBlrMy3/+kUOcQZiLCcnHCcno="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix index 2607ee64f70a..30b54c2adae2 100644 --- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix +++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix @@ -2,13 +2,13 @@ let drv = stdenv.mkDerivation { pname = "controller-topology-project"; - version = "unstable-2022-01-22"; + version = "unstable-2022-11-19"; src = fetchFromGitHub { owner = "kodi-game"; repo = "controller-topology-project"; - rev = "e2a9bac903f21b2acfeee374070cfc97d03aba2d"; - sha256 = "sha256-o6uKxOjEYNAK27drvNOokOFPdjkOEnr49mBre9ycM0w="; + rev = "d96894ca68678000f26f56d14aa3ceea47b1a3a8"; + sha256 = "sha256-KfDr2bSJFey/aNO5WzoOQ8Mz0v4uitKkOesymIMZH1o="; }; postPatch = '' diff --git a/pkgs/applications/video/kodi/addons/iagl/default.nix b/pkgs/applications/video/kodi/addons/iagl/default.nix index a7dc758696c1..92a877fe8400 100644 --- a/pkgs/applications/video/kodi/addons/iagl/default.nix +++ b/pkgs/applications/video/kodi/addons/iagl/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "iagl"; namespace = "plugin.program.iagl"; - version = "3.0.5"; + version = "3.0.6"; src = fetchFromGitHub { owner = "zach-morris"; repo = "plugin.program.iagl"; rev = version; - sha256 = "sha256-Ha9wUHURPql6xew5bUd33DpgRt+8vwIHocxPopmXj4c="; + sha256 = "sha256-fwPrNDsEGoysHbl9k9cRYKlr3MxDRiUmJhSsWVT2HHQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/idna/default.nix b/pkgs/applications/video/kodi/addons/idna/default.nix index e21613dce615..44bda1278bbd 100644 --- a/pkgs/applications/video/kodi/addons/idna/default.nix +++ b/pkgs/applications/video/kodi/addons/idna/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "idna"; namespace = "script.module.idna"; - version = "3.3.0+matrix.1"; + version = "3.4.0"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "gXW1BvM3CLKshVPaemjmzEoZekU0QjuxJY9zGbGwK18="; + sha256 = "wS1d1L18v4+RGwxDh7OpKRHB2A4qYwiq6b5mAz7l8Pk="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix index 59aaa2e8b261..36e8aa4a0225 100644 --- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix +++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix @@ -5,13 +5,13 @@ in buildKodiAddon rec { pname = "jellyfin"; namespace = "plugin.video.jellyfin"; - version = "0.7.7"; + version = "0.7.10"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-kodi"; rev = "v${version}"; - sha256 = "06glhnpayldficvvhlkbxg7zizl2wqms66fnc3p63nm3y7mqa9dd"; + sha256 = "sha256-hR4cJEpP/RZH24M4Ma33ZUe9oydRg7CyP1hHncvDW8Y="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/joystick/default.nix b/pkgs/applications/video/kodi/addons/joystick/default.nix index a1b9c3eeeefd..310cd4d08345 100644 --- a/pkgs/applications/video/kodi/addons/joystick/default.nix +++ b/pkgs/applications/video/kodi/addons/joystick/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = namespace; namespace = "peripheral.joystick"; - version = "1.7.1"; + version = "19.0.1"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - sha256 = "1dhj4afr9kj938xx70fq5r409mz6lbw4n581ljvdjj9lq7akc914"; + sha256 = "sha256-jSz0AgxhbCIbbZJxm4oq22y/hqew949UsqEAPoqEnHA="; }; extraBuildInputs = [ tinyxml udev ]; diff --git a/pkgs/applications/video/kodi/addons/keymap/default.nix b/pkgs/applications/video/kodi/addons/keymap/default.nix index aaaed78d4147..6c42bd78f45c 100644 --- a/pkgs/applications/video/kodi/addons/keymap/default.nix +++ b/pkgs/applications/video/kodi/addons/keymap/default.nix @@ -1,13 +1,13 @@ -{ lib, buildKodiAddon, fetchzip, defusedxml, kodi-six }: +{ lib, buildKodiAddon, fetchzip, addonUpdateScript, defusedxml, kodi-six }: buildKodiAddon rec { pname = "keymap"; namespace = "script.keymap"; - version = "1.1.3+matrix.1"; + version = "1.1.4"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "1icrailzpf60nw62xd0khqdp66dnr473m2aa9wzpmkk3qj1ay6jv"; + sha256 = "eWzMqsE8H0wUvPyd3wvjiaXEg4+sgkQ3CQYjE0VS+9g="; }; propagatedBuildInputs = [ @@ -15,6 +15,12 @@ buildKodiAddon rec { kodi-six ]; + passthru = { + updateScript = addonUpdateScript { + attrPath = "kodi.packages.keymap"; + }; + }; + meta = with lib; { homepage = "https://github.com/tamland/xbmc-keymap-editor"; description = "A GUI for configuring mappings for remotes, keyboard and other inputs supported by Kodi"; diff --git a/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix b/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix index 064375107e26..4e2a70010106 100644 --- a/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix +++ b/pkgs/applications/video/kodi/addons/libretro-genplus/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "kodi-libretro-genplus"; namespace = "game.libretro.genplus"; - version = "1.7.4.31"; + version = "1.7.4.35"; src = fetchFromGitHub { owner = "kodi-game"; repo = "game.libretro.genplus"; rev = "${version}-${rel}"; - sha256 = "0lcii32wzpswjjkwhv250l238g31akr66dhkbv8gj4v1i4z7hry8"; + sha256 = "sha256-F3bt129lBZKlDtp7X0S0q10T9k9C2zNeHG+yIP3818Q="; }; extraCMakeFlags = [ diff --git a/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix b/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix index a58f1c51b295..f669e24f8bd4 100644 --- a/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix +++ b/pkgs/applications/video/kodi/addons/libretro-mgba/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "kodi-libretro-mgba"; namespace = "game.libretro.mgba"; - version = "0.9.2.31"; + version = "0.10.0.35"; src = fetchFromGitHub { owner = "kodi-game"; repo = "game.libretro.mgba"; rev = "${version}-${rel}"; - sha256 = "sha256-eZLuNhLwMTtzpLGkymc9cLC83FQJWZ2ZT0iyz4sY4EA="; + sha256 = "sha256-lxpj6Y34apYcE22q4W3Anhigp79r4RgiJ36DbES1kzU="; }; extraCMakeFlags = [ diff --git a/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix b/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix index 640aec3d4971..7994016b6cd5 100644 --- a/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix +++ b/pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "kodi-libretro-snes9x"; namespace = "game.libretro.snes9x"; - version = "1.60.0.29"; + version = "1.61.0.34"; src = fetchFromGitHub { owner = "kodi-game"; repo = "game.libretro.snes9x"; rev = "${version}-${rel}"; - sha256 = "1wyfkg4fncc604alnbaqk92fi1h80n7bwiqfkb8479x5517byab1"; + sha256 = "sha256-LniZf8Gae4+4Rgc9OGhMCkOI3IA7CPjVrN/gbz9te38="; }; extraCMakeFlags = [ diff --git a/pkgs/applications/video/kodi/addons/netflix/default.nix b/pkgs/applications/video/kodi/addons/netflix/default.nix index 86f5dfb7545c..ab034c13755e 100644 --- a/pkgs/applications/video/kodi/addons/netflix/default.nix +++ b/pkgs/applications/video/kodi/addons/netflix/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.18.2"; + version = "1.20.2"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - sha256 = "sha256-nunjcVapWWTxYtILEcrkfJiWvSz71zyxSCbWQ4aCfLM="; + sha256 = "sha256-k2O8a0P+TzQVoFQJkzmdqmkKh3Aj7OlsnuhJfUwxOmI="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/orftvthek/default.nix b/pkgs/applications/video/kodi/addons/orftvthek/default.nix index c1abb00d0a30..634347be4826 100644 --- a/pkgs/applications/video/kodi/addons/orftvthek/default.nix +++ b/pkgs/applications/video/kodi/addons/orftvthek/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "orftvthek"; namespace = "plugin.video.orftvthek"; - version = "0.12.3+matrix.1"; + version = "0.12.6"; src = fetchFromGitHub { owner = "s0faking"; repo = namespace; rev = version; - sha256 = "sha256-GB9VkC9Vbi7TJXl/vF3ViF/tAcHGH0KxYQ0zkfMLZCY="; + sha256 = "sha256-r18vQ+2TSeflwByEAX33vIZG5qIGneraf5rLBugl5BU="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix index 2e20043c162d..736ea03843bb 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.1.1"; + version = "19.2.2"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "sha256-ZkB+Va9w/AHLZ+LSOJpJ93nVOw33tcNqjScbLt77zJw="; + sha256 = "sha256-snW6sgbdyGqdZtd7HU5FTf4Kx5/Zjk2fLLi0MS+9tTU="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/urllib3/default.nix b/pkgs/applications/video/kodi/addons/urllib3/default.nix index 1becee357bee..90900f306073 100644 --- a/pkgs/applications/video/kodi/addons/urllib3/default.nix +++ b/pkgs/applications/video/kodi/addons/urllib3/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "urllib3"; namespace = "script.module.urllib3"; - version = "1.26.9+matrix.1"; + version = "1.26.13+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "w2HXepAHLE4NAWTXOQgY3ifr3mlI/QYF6KAKqpAmO/g="; + sha256 = "pymhHS1TqRv9o/3zBtmP8QSLMXSgFYno0VaR+YqhJqY="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix b/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix index 2db17f17abad..4288d4e039a3 100644 --- a/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix +++ b/pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = namespace; namespace = "vfs.libarchive"; - version = "2.0.0"; + version = "19.0.1"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5"; + sha256 = "sha256-4sERFC/XBEE46n+iq6YJg/5Wz0+223tq4+O5cIf6X6E="; }; extraBuildInputs = [ libarchive xz bzip2 zlib lz4 lzo openssl ]; diff --git a/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix b/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix index e41f008281ad..a9c37cc30a5c 100644 --- a/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix +++ b/pkgs/applications/video/kodi/addons/vfs-sftp/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = namespace; namespace = "vfs.sftp"; - version = "2.0.0"; + version = "19.0.1"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - sha256 = "06w74sh8yagrrp7a7rjaz3xrh1j3wdqald9c4b72c33gpk5997dk"; + sha256 = "sha256-UXycPqPEn3W5X3SQs1fxgkdV5PSkzs3pjYyuhAVngt8="; }; extraBuildInputs = [ openssl libssh zlib ]; diff --git a/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix b/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix index 851289bc06d4..a4036be735d0 100644 --- a/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "visualization-waveform"; namespace = "visualization.waveform"; - version = "19.0.2"; + version = "19.0.3"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - hash = "sha256-IQLW4CDNtt/ptE679hnoXbharq61Ru9S2m7QbJLtNSI="; + hash = "sha256-3mTfL1UjPLDKardJy4IDNyzvHnkF//4nmWInOxP/XhQ="; }; extraBuildInputs = [ pkg-config libGL ]; diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index 632b421ccfab..8dab69bb56ac 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -1,13 +1,13 @@ -{ lib, buildKodiAddon, fetchpatch, fetchzip, addonUpdateScript, six, requests, inputstreamhelper }: +{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six, requests, inputstreamhelper }: buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "6.8.18+matrix.1"; + version = "6.8.24+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "F950rnE/YxwWI0ieHC2TdGNSfrQDHlStnxLbA6UjEaM="; + sha256 = "/yQML2iK5jcIhN6RJC+WJ8EnH640qFJFdaaVeGPEg9U="; }; propagatedBuildInputs = [ @@ -23,15 +23,6 @@ buildKodiAddon rec { }; }; - patches = [ - # This patch can be removed once https://github.com/anxdpanic/plugin.video.youtube/pull/260 has been merged. - (fetchpatch { - name = "fix-addon-path"; - url = "https://patch-diff.githubusercontent.com/raw/anxdpanic/plugin.video.youtube/pull/260.patch"; - sha256 = "11c9sfwl5kvfll2jws5b4i46s60v6gkfns4al13p4m5ch9rk06hs"; - }) - ]; - meta = with lib; { homepage = "https://github.com/anxdpanic/plugin.video.youtube"; description = "YouTube is one of the biggest video-sharing websites of the world"; diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 6eadd06af0fb..05e594d80aa2 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, makeWrapper , pkg-config, cmake, yasm, python3Packages , libxcrypt, libgcrypt, libgpg-error, libunistring , boost, avahi, lame @@ -34,19 +34,19 @@ , buildPackages }: -assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is avaliable +assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is available assert gbmSupport || waylandSupport || x11Support; let - kodiReleaseDate = "20220303"; - kodiVersion = "19.4"; + kodiReleaseDate = "20221204"; + kodiVersion = "19.5"; rel = "Matrix"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "sha256-XDtmY3KthiD91kvueQRSamBcdM7fBpRntmZX6KRsCzE="; + sha256 = "sha256-vprhEPxYpY3/AsUgvPNnhBlh0Dl73ekALAblHaUKzd0="; }; ffmpeg = stdenv.mkDerivation rec { @@ -107,13 +107,20 @@ in stdenv.mkDerivation { src = kodi_src; - # This is a backport of - # https://github.com/xbmc/xbmc/commit/a6dedce7ba1f03bdd83b019941d1e369a06f7888 - # to Kodi 19.4 Matrix. - # This can be removed once a new release of Kodi comes out and we upgrade - # to it. patches = [ + # This is a backport of + # https://github.com/xbmc/xbmc/commit/a6dedce7ba1f03bdd83b019941d1e369a06f7888 + # to Kodi 19.4 Matrix. + # This can be removed once a new major release of Kodi comes out and we upgrade + # to it. ./add-KODI_WEBSERVER_EXTRA_WHITELIST.patch + + # A patch to fix build until the next major release of Kodi comes out and we upgrade + # https://github.com/xbmc/xbmc/pull/22291 + (fetchpatch { + url = "https://github.com/xbmc/xbmc/commit/5449652abf0bb9dddd0d796de4120e60f19f89a5.patch"; + sha256 = "sha256-vqX08dTSPhIur4aVu2BzXEpAxMOjaadwRNI43GSV9Og="; + }) ]; buildInputs = [ @@ -226,7 +233,8 @@ in stdenv.mkDerivation { ''; postInstall = '' - for p in $(ls $out/bin/) ; do + # TODO: figure out which binaries should be wrapped this way and which shouldn't + for p in $(ls --ignore=kodi-send $out/bin/) ; do wrapProgram $out/bin/$p \ --prefix PATH ":" "${lib.makeBinPath ([ python3Packages.python glxinfo ] ++ lib.optional x11Support xdpyinfo ++ lib.optional sambaSupport samba)}" \ @@ -236,6 +244,9 @@ in stdenv.mkDerivation { ++ lib.optional rtmpSupport rtmpdump)}" done + wrapProgram $out/bin/kodi-send \ + --prefix PYTHONPATH : $out/${python3Packages.python.sitePackages} + substituteInPlace $out/share/xsessions/kodi.desktop \ --replace kodi-standalone $out/bin/kodi-standalone ''; diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/applications/video/kooha/default.nix index ba959ec5717e..91ead29833b1 100644 --- a/pkgs/applications/video/kooha/default.nix +++ b/pkgs/applications/video/kooha/default.nix @@ -20,19 +20,19 @@ stdenv.mkDerivation rec { pname = "kooha"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Kooha"; rev = "v${version}"; - hash = "sha256-HgouIMbwpmR/K1hPU7QDzeEtyi5hC66huvInkJFLS2w="; + hash = "sha256-vLgBuP0DncBIb05R3484WozS+Nl+S7YBJUYek2CkJkQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-rdxD9pys11QcUtufcZ/zCrviytyc8hIXJfsXg2JoaKE="; + hash = "sha256-NPh603/5yZDUdTegAzFvjRn5tuzyrcNzbbKQr6NxXso="; }; nativeBuildInputs = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Simple screen recorder"; + description = "Elegantly record your screen"; homepage = "https://github.com/SeaDve/Kooha"; license = licenses.gpl3Only; platforms = platforms.linux; diff --git a/pkgs/applications/video/losslesscut-bin/appimage.nix b/pkgs/applications/video/losslesscut-bin/appimage.nix deleted file mode 100644 index 8e84406c60eb..000000000000 --- a/pkgs/applications/video/losslesscut-bin/appimage.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ appimageTools, lib, fetchurl, version, sha256 }: - -let - pname = "losslesscut"; - nameRepo = "lossless-cut"; - nameCamel = "LosslessCut"; - name = "${pname}-${version}"; - nameSource = "${nameCamel}-linux-x86_64.AppImage"; - nameExecutable = "losslesscut"; - owner = "mifi"; - src = fetchurl { - url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}"; - name = nameSource; - inherit sha256; - }; - extracted = appimageTools.extractType2 { - inherit name src; - }; -in appimageTools.wrapType2 { - inherit name src; - - profile = '' - export LC_ALL=C.UTF-8 - ''; - - extraPkgs = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps; - - extraInstallCommands = '' - mv $out/bin/{${name},${nameExecutable}} - ( - mkdir -p $out/share - cd ${extracted}/usr - find share -mindepth 1 -type d -exec mkdir -p $out/{} \; - find share -mindepth 1 -type f,l -exec ln -s $PWD/{} $out/{} \; - ) - ln -s ${extracted}/${nameExecutable}.png $out/share/icons/${nameExecutable}.png - mkdir $out/share/applications - cp ${extracted}/${nameExecutable}.desktop $out/share/applications - substituteInPlace $out/share/applications/${nameExecutable}.desktop \ - --replace AppRun ${nameExecutable} - ''; - - meta.platforms = with lib.platforms; [ "x86_64-linux" ]; -} diff --git a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix new file mode 100644 index 000000000000..d75adb88f359 --- /dev/null +++ b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix @@ -0,0 +1,58 @@ +{ lib +, appimageTools +, fetchurl +, makeWrapper +, gtk3 +, gsettings-desktop-schemas +, pname +, version +, hash +, metaCommon ? { } +}: + +let + pname = "losslesscut"; + + src = fetchurl { + url = "https://github.com/mifi/lossless-cut/releases/download/v${version}/LosslessCut-linux-x86_64.AppImage"; + inherit hash; + }; + + extracted = appimageTools.extractType2 { + inherit pname version src; + }; +in +(appimageTools.wrapType2 { + inherit pname version src; + + profile = '' + export LC_ALL=C.UTF-8 + ''; + + extraPkgs = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps; + + extraInstallCommands = '' + mv $out/bin/{${pname}-${version},losslesscut} + ( + mkdir -p $out/share + cd ${extracted}/usr + find share -mindepth 1 -type d -exec mkdir -p $out/{} \; + find share -mindepth 1 -type f,l -exec ln -s $PWD/{} $out/{} \; + ) + ln -s ${extracted}/losslesscut.png $out/share/icons/losslesscut.png + mkdir $out/share/applications + cp ${extracted}/losslesscut.desktop $out/share/applications + substituteInPlace $out/share/applications/losslesscut.desktop \ + --replace AppRun losslesscut + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram "$out/bin/losslesscut" \ + --add-flags "--disable-seccomp-filter-sandbox" + ''; + + meta = metaCommon // { + platforms = [ "x86_64-linux" ]; + mainProgram = "losslesscut"; + }; +}) // { + inherit pname version; +} diff --git a/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix b/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix new file mode 100644 index 000000000000..b9913867b198 --- /dev/null +++ b/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix @@ -0,0 +1,37 @@ +{ lib +, stdenvNoCC +, fetchurl +, undmg +, pname +, version +, hash +, isAarch64 +, metaCommon ? { } +}: + +let + pname = "losslesscut"; + src = fetchurl { + url = "https://github.com/mifi/lossless-cut/releases/download/v${version}/LosslessCut-mac-${if isAarch64 then "arm64" else "x64"}.dmg"; + inherit hash; + }; +in +stdenvNoCC.mkDerivation { + inherit pname version src; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "LosslessCut.app"; + + installPhase = '' + mkdir -p "$out/Applications/LosslessCut.app" + cp -R . "$out/Applications/LosslessCut.app" + mkdir -p "$out/bin" + ln -s "$out/Applications/LosslessCut.app/Contents/MacOS/LosslessCut" "$out/bin/losslesscut" + ''; + + meta = metaCommon // (with lib; { + platforms = singleton (if isAarch64 then "aarch64-darwin" else "x86_64-darwin"); + mainProgram = "losslesscut"; + }); +} diff --git a/pkgs/applications/video/losslesscut-bin/build-from-windows.nix b/pkgs/applications/video/losslesscut-bin/build-from-windows.nix new file mode 100644 index 000000000000..ddaf87380644 --- /dev/null +++ b/pkgs/applications/video/losslesscut-bin/build-from-windows.nix @@ -0,0 +1,37 @@ +{ lib +, stdenvNoCC +, fetchurl +, p7zip +, pname +, version +, hash +, metaCommon ? { } +}: + +stdenvNoCC.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://github.com/mifi/lossless-cut/releases/download/v${version}/LosslessCut-win-x64.7z"; + inherit hash; + }; + + nativeBuildInputs = [ p7zip ]; + + unpackPhase = '' + 7z x $src -oLosslessCut-win-x64 + ''; + + sourceRoot = "LosslessCut-win-x64"; + + installPhase = '' + mkdir -p $out/bin $out/libexec + (cd .. && mv LosslessCut-win-x64 $out/libexec) + ln -s "$out/libexec/LosslessCut-win-x64/LosslessCut.exe" "$out/bin/LosslessCut.exe" + ''; + + meta = metaCommon // (with lib; { + platforms = platforms.windows; + mainProgram = "LosslessCut.exe"; + }); +} diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/applications/video/losslesscut-bin/default.nix index 77dd6e0c35fa..02f71a94db5c 100644 --- a/pkgs/applications/video/losslesscut-bin/default.nix +++ b/pkgs/applications/video/losslesscut-bin/default.nix @@ -1,24 +1,54 @@ -{ callPackage, stdenvNoCC, lib }: +{ lib +, stdenv +, callPackage +, buildPackages +}: + let - version = "3.46.2"; - appimage = callPackage ./appimage.nix { inherit version; sha256 = "sha256-p+HscYsChR90JHdYjurY4OOHgveGXbJomz1klBCsF2Q="; }; - dmg = callPackage ./dmg.nix { inherit version; sha256 = "sha256-350MHWwyjCdvIv6W6lX6Hr6PLDiAwO/e+KW0yKi/Yoc="; }; - windows = callPackage ./windows.nix { inherit version; sha256 = "sha256-48ifhvIWSPmmnBnW8tP7NeWPIWJYWNqGP925O50CAwQ="; }; -in ( - if stdenvNoCC.isDarwin then dmg - else if stdenvNoCC.isCygwin then windows - else appimage -).overrideAttrs -(oldAttrs: { - meta = with lib; { + pname = "losslesscut"; + version = "3.48.2"; + metaCommon = with lib; { description = "The swiss army knife of lossless video/audio editing"; homepage = "https://mifi.no/losslesscut/"; license = licenses.gpl2Only; maintainers = with maintainers; [ ShamrockLee ]; - } // oldAttrs.meta // { - platforms = - appimage.meta.platforms - ++ dmg.meta.platforms - ++ windows.meta.platforms; }; -}) + x86_64-appimage = callPackage ./build-from-appimage.nix { + inherit pname version metaCommon; + hash = "sha256-5T5+eBVbyOI89YA9NMLWweHagD09RB3P03HFvaDAOZ8="; + inherit (buildPackages) makeWrapper; + }; + x86_64-dmg = callPackage ./build-from-dmg.nix { + inherit pname version metaCommon; + hash = "sha256-PzjE0oJOuPG0S+mA7pgNU3MRgaE2jAPxWEN9J4PfqMQ="; + isAarch64 = false; + }; + aarch64-dmg = callPackage ./build-from-dmg.nix { + inherit pname version metaCommon; + hash = "sha256-927CSczgFJcbBJm2cYXucFRidkGAtcowoLMlm2GTafc="; + isAarch64 = true; + }; + x86_64-windows = callPackage ./build-from-windows.nix { + inherit pname version metaCommon; + hash = "sha256-+isxkGKxW7H+IjuA5G4yXuvDmX+4UlsD8sXwoHxgLM8="; + }; +in +( + if stdenv.hostPlatform.system == "aarch64-darwin" then aarch64-dmg + else if stdenv.hostPlatform.isDarwin then x86_64-dmg + else if stdenv.hostPlatform.isCygwin then x86_64-windows + else x86_64-appimage +).overrideAttrs + (oldAttrs: { + passthru = (oldAttrs.passthru or { }) // { + inherit x86_64-appimage x86_64-dmg aarch64-dmg x86_64-windows; + }; + meta = oldAttrs.meta // { + platforms = lib.unique ( + x86_64-appimage.meta.platforms + ++ x86_64-dmg.meta.platforms + ++ aarch64-dmg.meta.platforms + ++ x86_64-windows.meta.platforms + ); + }; + }) diff --git a/pkgs/applications/video/losslesscut-bin/dmg.nix b/pkgs/applications/video/losslesscut-bin/dmg.nix deleted file mode 100644 index e334c0a58b9a..000000000000 --- a/pkgs/applications/video/losslesscut-bin/dmg.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenvNoCC, lib, fetchurl, undmg, version , sha256 }: - -let - pname = "losslesscut"; - nameRepo = "lossless-cut"; - nameCamel = "LosslessCut"; - nameSource = "${nameCamel}-mac-x64.dmg"; - nameApp = nameCamel + ".app"; - owner = "mifi"; - src = fetchurl { - url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}"; - name = nameSource; - inherit sha256; - }; -in stdenvNoCC.mkDerivation { - inherit pname version src; - - nativeBuildInputs = [ undmg ]; - - unpackPhase = '' - undmg ${src} - ''; - sourceRoot = nameApp; - - installPhase = '' - mkdir -p $out/Applications/${nameApp} - cp -R . $out/Applications/${nameApp} - ''; - - meta.platforms = lib.platforms.darwin; -} diff --git a/pkgs/applications/video/losslesscut-bin/windows.nix b/pkgs/applications/video/losslesscut-bin/windows.nix deleted file mode 100644 index 89ccbca48323..000000000000 --- a/pkgs/applications/video/losslesscut-bin/windows.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenvNoCC -, lib -, fetchurl -, p7zip -, version -, sha256 -, useMklink ? false -, customSymlinkCommand ? null -}: -let - pname = "losslesscut"; - nameRepo = "lossless-cut"; - nameCamel = "LosslessCut"; - nameSourceBase = "${nameCamel}-win-x64"; - nameSource = "${nameSourceBase}.7z"; - nameExecutable = "${nameCamel}.exe"; - owner = "mifi"; - getSymlinkCommand = if (customSymlinkCommand != null) then customSymlinkCommand - else if useMklink then (targetPath: linkPath: "mklink ${targetPath} ${linkPath}") - else (targetPath: linkPath: "ln -s ${targetPath} ${linkPath}"); -in stdenvNoCC.mkDerivation { - inherit pname version sha256; - - src = fetchurl { - name = nameSource; - url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}"; - inherit sha256; - }; - - nativeBuildInputs = [ p7zip ]; - - unpackPhase = '' - 7z x $src -o${nameSourceBase} - ''; - - sourceRoot = nameSourceBase; - - installPhase = '' - mkdir -p $out/bin $out/libexec - cd .. - mv ${nameSourceBase} $out/libexec - - '' + (getSymlinkCommand "${nameSourceBase}/${nameExecutable}" "$out/bin/${nameExecutable}"); - - meta.platforms = lib.platforms.windows; -} diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 9fd289f6fae6..d083f1eda20a 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -14,21 +14,21 @@ }: let - version = "1.17.1"; + version = "1.17.2"; # 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 = "sha256-B4SQiwf5/Icweg+VgQW34tN/XxDA7xoSgIVOfXwGsfM="; + sha256 = "sha256-gACMzJ7oZCk/INSeJaV7GnF9hy/6F9d0QDLp5jPiF4k="; }; 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 = "sha256-DVcrG5N9lydct11xoUKz1VVCiuvVOmQWGlAP2nrnZv4="; + sha256 = "sha256-qD+Kuz8j3vDch4PlNQYqdbffL3YSKRqKg6IfkLk/LaQ="; }; in mkDerivation { @@ -55,7 +55,7 @@ in mkDerivation { installPhase = '' runHook preInstall - install -Dm555 -t $out/bin out/makemkv out/mmccextr ../makemkv-bin-${version}/bin/amd64/makemkvcon + install -Dm555 -t $out/bin out/makemkv out/mmccextr out/mmgplsrv ../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 diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index 3f1d5ecb81b9..bcb6eca16321 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/pkgs/applications/video/manim/default.nix @@ -107,7 +107,7 @@ in python3.pkgs.buildPythonApplication rec { ]; - checkInputs = [ + nativeCheckInputs = [ python3.pkgs.pytest-xdist python3.pkgs.pytestCheckHook diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index 76e26ba01766..1b62c89c6ae8 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "media-downloader"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = pname; rev = "${version}"; - sha256 = "sha256-uu/4S7cVWHOhBq52NF0AargE0nbPwjF0txSWL0DquQo="; + sha256 = "sha256-RMZG+rPbwJFL2AzEZlTrc8/bQCx8CWCWppEBjCj5hnU="; }; nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index eda58349bd86..06bed9211318 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, phonon, phonon-backend-vlc, qtbase, qmake +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, phonon, phonon-backend-vlc, qtbase, qmake , qtdeclarative, qttools, qtx11extras, mpv # "Free" key generated by pasqui23 @@ -16,6 +16,12 @@ mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Taken from FreeBSD; already merged upstream in the media submodule + # (https://github.com/flaviotordini/media/commit/f6b7020f273e1fc06e6e204fab37a7c8edaa857a) + ./lib_media_src_mpv_mpvwidget.patch + ]; + nativeBuildInputs = [ qmake qttools ]; buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qtx11extras mpv ]; diff --git a/pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch b/pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch new file mode 100644 index 000000000000..9beff68a0ec4 --- /dev/null +++ b/pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch @@ -0,0 +1,16 @@ +diff -Nur a/lib/media/src/mpv/mpvwidget.cpp b/lib/media/src/mpv/mpvwidget.cpp +--- a/lib/media/src/mpv/mpvwidget.cpp ++++ b/lib/media/src/mpv/mpvwidget.cpp +@@ -30,7 +30,11 @@ + qDebug() << "initializeGL" << nativeParent; + if (nativeParent == nullptr) qFatal("No native parent"); + +- mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr}; ++ #if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(2,0) ++ mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr}; ++ #else ++ mpv_opengl_init_params gl_init_params{get_proc_address, this}; ++ #endif + mpv_render_param params[]{{MPV_RENDER_PARAM_API_TYPE, (void *)MPV_RENDER_API_TYPE_OPENGL}, + {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params}, + {MPV_RENDER_PARAM_INVALID, nullptr}, diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 05aaa8fe646e..bce50b43a07c 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 = "71.1.0"; + version = "73.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "sha256-JHbnjcXOctB6HQeHXykWbykdn35S2fCYegMkc3GLmAI="; + sha256 = "HGoT3t/ooRMiyjUkHnvVGOB04IU5U8VEKDixhE57kR8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mlv-app/aarch64-flags.patch b/pkgs/applications/video/mlv-app/aarch64-flags.patch index b8c025b3b3fc..affd85d2b732 100644 --- a/pkgs/applications/video/mlv-app/aarch64-flags.patch +++ b/pkgs/applications/video/mlv-app/aarch64-flags.patch @@ -7,7 +7,7 @@ index ebdc552..3e37573 100644 # Linux linux-g++*{ - QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99 -+ QMAKE_CFLAGS += -O3 -fopenmp -march=native -std=c99 ++ QMAKE_CFLAGS += -O3 -fopenmp -std=c99 QMAKE_CXXFLAGS += -fopenmp LIBS += -lgomp } diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index 1f0f8ace21ba..ddec8efb6a41 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "motion"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "Motion-Project"; repo = "motion"; rev = "release-${version}"; - sha256 = "sha256-uKEgTQhpslOCfNj8z95/DK4M1Gx4SMRjl1/KPh5KHuc="; + sha256 = "sha256-3TmmLAU/muiI90hrYrctzgVbWS4rXjxzAa0ctVYKSSY="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -22,5 +22,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ puffnfresh veprbl ]; platforms = platforms.unix; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 05ec95d006bd..28e0d1d469a0 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -4,12 +4,11 @@ , fetchFromGitHub , addOpenGLRunpath , docutils -, perl +, meson +, ninja , pkg-config , python3 -, wafHook -, which -, ffmpeg +, ffmpeg_5 , freefont_ttf , freetype , libass @@ -18,7 +17,7 @@ , lua , libuchardet , libiconv -, CoreFoundation, Cocoa, CoreAudio, MediaPlayer +, xcbuild , waylandSupport ? stdenv.isLinux , wayland @@ -75,67 +74,62 @@ , xineramaSupport ? stdenv.isLinux, libXinerama , xvSupport ? stdenv.isLinux, libXv , zimgSupport ? true, zimg +, darwin }: let + inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; luaEnv = lua.withPackages (ps: with ps; [ luasocket ]); - -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (self: { pname = "mpv"; - version = "0.35.0"; + version = "0.35.1"; outputs = [ "out" "dev" "man" ]; src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; - rev = "v${version}"; - sha256 = "sha256-U3NDSxlX4/WkoHFkOvpcwPMwfwTnSpCw0QI5yLMK08o="; + rev = "v${self.version}"; + sha256 = "sha256-CoYTX9hgxLo72YdMoa0sEywg4kybHbFsypHk1rCM6tM="; }; postPatch = '' patchShebangs version.* ./TOOLS/ ''; - NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext " - + lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; + NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext "; - # These flags are not supported and cause the build - # to fail, even when cross compilation itself works. - dontAddWafCrossFlags = true; + mesonFlags = [ + (lib.mesonOption "default_library" "shared") + (lib.mesonBool "libmpv" true) + (lib.mesonEnable "libarchive" archiveSupport) + (lib.mesonEnable "manpage-build" true) + (lib.mesonEnable "cdda" cddaSupport) + (lib.mesonEnable "dvbin" dvbinSupport) + (lib.mesonEnable "dvdnav" dvdnavSupport) + (lib.mesonEnable "openal" openalSupport) + (lib.mesonEnable "sdl2" sdl2Support) + # Disable whilst Swift isn't supported + (lib.mesonEnable "swift-build" swiftSupport) + (lib.mesonEnable "macos-cocoa-cb" swiftSupport) + ]; - wafConfigureFlags = [ - "--enable-libmpv-shared" - "--enable-manpage-build" - "--disable-libmpv-static" - "--disable-static-build" - "--disable-build-date" # Purity - (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") - (lib.enableFeature vaapiSupport "vaapi") - (lib.enableFeature waylandSupport "wayland") - (lib.enableFeature dvbinSupport "dvbin") - ] # Disable whilst Swift isn't supported - ++ lib.optional (!swiftSupport) "--disable-macos-cocoa-cb"; + mesonAutoFeatures = "auto"; nativeBuildInputs = [ addOpenGLRunpath docutils # for rst2man - perl + meson + ninja pkg-config python3 - wafHook - which - ] ++ lib.optionals swiftSupport [ swift ] - ++ lib.optionals waylandSupport [ wayland-scanner ]; + ] + ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ] + ++ lib.optionals swiftSupport [ swift ] + ++ lib.optionals waylandSupport [ wayland-scanner ]; buildInputs = [ - ffmpeg + ffmpeg_5 freetype libass libpthreadstubs @@ -175,10 +169,10 @@ in stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ libiconv ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ]; - enableParallelBuilding = true; - postBuild = lib.optionalString stdenv.isDarwin '' + pushd .. # Must be run from the source dir because it uses relative paths python3 TOOLS/osxbundle.py -s build/mpv + popd ''; postInstall = '' @@ -186,16 +180,13 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/mpv ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf - cp TOOLS/mpv_identify.sh $out/bin - cp TOOLS/umpv $out/bin + cp ../TOOLS/mpv_identify.sh $out/bin + cp ../TOOLS/umpv $out/bin cp $out/share/applications/mpv.desktop $out/share/applications/umpv.desktop sed -i '/Icon=/ ! s/mpv/umpv/g' $out/share/applications/umpv.desktop - - substituteInPlace $out/lib/pkgconfig/mpv.pc \ - --replace "$out/include" "$dev/include" '' + lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications - cp -r build/mpv.app $out/Applications + cp -r mpv.app $out/Applications ''; # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. @@ -225,8 +216,9 @@ in stdenv.mkDerivation rec { mpv is a free and open-source general-purpose video player, based on the MPlayer and mplayer2 projects, with great improvements above both. ''; + changelog = "https://github.com/mpv-player/mpv/releases/tag/v${self.version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ]; - platforms = platforms.darwin ++ platforms.linux; + platforms = platforms.unix; }; -} +}) diff --git a/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix b/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix new file mode 100644 index 000000000000..2955dfb7c0c8 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, dbus, mpv-unwrapped }: + +stdenv.mkDerivation rec { + pname = "mpv-inhibit-gnome"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "Guldoman"; + repo = "mpv_inhibit_gnome"; + rev = "v${version}"; + hash = "sha256-LSGg5gAQE2JpepBqhz6D6d3NlqYaU4bjvYf1F+oLphQ="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ dbus mpv-unwrapped ]; + + passthru.scriptName = "mpv_inhibit_gnome.so"; + + installPhase = '' + install -D ./lib/mpv_inhibit_gnome.so $out/share/mpv/scripts/mpv_inhibit_gnome.so + ''; + + meta = with lib; { + description = "This mpv plugin prevents screen blanking in GNOME"; + homepage = "https://github.com/Guldoman/mpv_inhibit_gnome"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ myaats ]; + }; +} diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index 4052c968d2ba..af033781ac2c 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mpvacious"; - version = "0.18"; + version = "0.20"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "sha256-FiYEpZVaeJQVSXa9obFYSKNVASJolOBm5D3faOlCzNY="; + sha256 = "sha256-9Lf7MVaJ5eC5Gb1PdGBvtENU8AAVq2jsUkY3wJfztt8="; }; postPatch = '' diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 2db4cf53d004..35f5fcb549f1 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -1,15 +1,15 @@ -{ lib, stdenvNoCC, fetchFromGitHub, fetchpatch, python3 }: +{ lib, stdenvNoCC, fetchFromGitHub, fetchpatch, python3, nix-update-script }: # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }` stdenvNoCC.mkDerivation { pname = "mpv_sponsorblock"; - version = "unstable-2022-09-24"; + version = "unstable-2023-01-30"; src = fetchFromGitHub { owner = "po5"; repo = "mpv_sponsorblock"; - rev = "248d108c1280e05de551c42867aebb72cf0c83b9"; - sha256 = "1aacchyci34xyx7rcyd2r02i4rlqq8q61l6dcci8yd4g4hjiqqld"; + rev = "7785c1477103f2fafabfd65fdcf28ef26e6d7f0d"; + sha256 = "sha256-iUXaTWWFEdxhxClu2NYbQcThlvYty3A2dEYGooeAVAQ="; }; dontBuild = true; @@ -41,7 +41,9 @@ stdenvNoCC.mkDerivation { passthru = { scriptName = "sponsorblock.lua"; - updateScript = ./update-sponsorblock.sh; + updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/mpv/scripts/thumbnail.nix b/pkgs/applications/video/mpv/scripts/thumbnail.nix index a08bce6699fa..60b392a6aa27 100644 --- a/pkgs/applications/video/mpv/scripts/thumbnail.nix +++ b/pkgs/applications/video/mpv/scripts/thumbnail.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "mpv-thumbnail-script"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "marzzzello"; repo = "mpv_thumbnail_script"; rev = version; - sha256 = "sha256-0nqV8vY3cBOJkLRoQ33Cc+4+vSK45i9yWbhKiQIuVSw="; + sha256 = "sha256-6J1eeuSYyUJmWLIl9WsQ4NzQOBJNO3Cnl5jcPEal4vM="; }; nativeBuildInputs = [ python3 ]; @@ -29,6 +29,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "A lua script to show preview thumbnails in mpv's OSC seekbar"; homepage = "https://github.com/marzzzello/mpv_thumbnail_script"; + changelog = "https://github.com/marzzzello/mpv_thumbnail_script/releases/tag/${version}"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ figsoda ]; diff --git a/pkgs/applications/video/mpv/scripts/update-sponsorblock.sh b/pkgs/applications/video/mpv/scripts/update-sponsorblock.sh deleted file mode 100755 index b4888365a6f3..000000000000 --- a/pkgs/applications/video/mpv/scripts/update-sponsorblock.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p common-updater-scripts git jq nix nix-prefetch-git -git_url='https://github.com/po5/mpv_sponsorblock.git' -git_branch='master' -git_dir='/var/tmp/mpv_sponsorblock.git' -nix_file="$(dirname "${BASH_SOURCE[0]}")/sponsorblock.nix" -pkg='mpvScripts.sponsorblock' - -set -euo pipefail - -info() { - if [ -t 2 ]; then - set -- '\033[32m%s\033[39m\n' "$@" - else - set -- '%s\n' "$@" - fi - printf "$@" >&2 -} - -old_rev=$(nix-instantiate --eval --strict --json -A "$pkg.src.rev" | jq -r) -old_version=$(nix-instantiate --eval --strict --json -A "$pkg.version" | jq -r) -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 - -new_sha256=$(nix-prefetch-git --rev "$new_rev" "$git_dir" | jq -r .sha256) -update-source-version "$pkg" \ - "$new_version" \ - "$new_sha256" \ - --rev="$new_rev" -git add "$nix_file" -git commit --verbose --message "$pkg: $old_version -> $new_version" diff --git a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix new file mode 100644 index 000000000000..811b49e8714b --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix @@ -0,0 +1,36 @@ +{ lib , buildNpmPackage , fetchFromGitHub, nodejs }: + +buildNpmPackage rec { + pname = "webtorrent-mpv-hook"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "mrxdst"; + repo = pname; + rev = "v${version}"; + hash = "sha256-AFKX31kriacXygZy0Mw+QwO+SwFEu13687mJ/WeAoKY="; + }; + + postPatch = '' + substituteInPlace src/webtorrent.ts --replace "node_path: 'node'" "node_path: '${nodejs}/bin/node'" + # This executable is just for telling non-Nix users how to install + substituteInPlace package.json --replace '"bin": "build/bin.js",' "" + rm -rf src/bin.ts + ''; + + npmDepsHash = "sha256-GpNUJ5ZCgMjSYLqsIE/RwkTSFT3uAhxrHPe7XvGDRHE="; + makeCacheWritable = true; + + postInstall = '' + mkdir -p $out/share/mpv/scripts/ + ln -s $out/lib/node_modules/webtorrent-mpv-hook/build/webtorrent.js $out/share/mpv/scripts/ + ''; + passthru.scriptName = "webtorrent.js"; + + meta = { + description = "Adds a hook that allows mpv to stream torrents"; + homepage = "https://github.com/mrxdst/webtorrent-mpv-hook"; + maintainers = [ lib.maintainers.chuangzhu ]; + license = lib.licenses.isc; + }; +} diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index cf307f0da34e..7ea9a532a725 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,32 +1,43 @@ -{ lib, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, which, qtbase, qtwebkit, qtscript , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsa-lib, freetype , perl, pkg-config , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders +, soundtouch, libzip, libhdhomerun +, withWebKit ? false }: mkDerivation rec { pname = "mythtv"; - version = "31.0"; + version = "32.0"; src = fetchFromGitHub { owner = "MythTV"; repo = "mythtv"; rev = "v${version}"; - sha256 = "092w5kvc1gjz6jd2lk2jhcazasz2h3xh0i5iq80k8x3znyp4i6v5"; + sha256 = "0i4fs3rbk1jggh62wflpa2l03na9i1ihpz2vsdic9vfahqqjxff1"; }; patches = [ - # Disables OS detection used while checking if enforce_wshadow should be disabled. - ./disable-os-detection.patch + # Disable sourcing /etc/os-release + ./dont-source-os-release.patch + + # Fix QMake variable substitution syntax - MythTV/mythtv#550 + (fetchpatch { + name = "fix-qmake-var-syntax.patch"; + url = "https://github.com/MythTV/mythtv/commit/a8da7f7e7ec069164adbef65a8104adc9bb52e36.patch"; + stripLen = 1; + hash = "sha256-JfRME00YNNjl6SKs1HBa0wBa/lR/Rt3zbQtWhsC36JM="; + }) ]; setSourceRoot = "sourceRoot=$(echo */mythtv)"; buildInputs = [ - freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU libGL + freetype qtbase qtscript lame zlib libGLU libGL perl libsamplerate libbluray lzo alsa-lib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC - libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 - ]; + libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 soundtouch libzip + libhdhomerun + ] ++ lib.optional withWebKit qtwebkit; nativeBuildInputs = [ pkg-config which yasm libtool autoconf automake file ]; configureFlags = diff --git a/pkgs/applications/video/mythtv/disable-os-detection.patch b/pkgs/applications/video/mythtv/disable-os-detection.patch deleted file mode 100644 index 09ce6f6ca4f8..000000000000 --- a/pkgs/applications/video/mythtv/disable-os-detection.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/configure 2020-07-21 20:50:58.653989766 +0200 -+++ b/configure 2020-07-21 20:52:21.236610586 +0200 -@@ -6537,17 +6537,17 @@ - } - - enable enforce_wshadow --case $target_os in -- android) -- disable enforce_wshadow -- ;; -- linux) -- . /etc/os-release -- if test $ID = "centos"; then -- disable enforce_wshadow -- fi -- ;; --esac -+#case $target_os in -+# android) -+# disable enforce_wshadow -+# ;; -+# linux) -+# . /etc/os-release -+# if test $ID = "centos"; then -+# disable enforce_wshadow -+# fi -+# ;; -+#esac - - if $(pkg-config --exists Qt5WebKit) || $(pkg-config --exists QtWebKit) ; then - enable qtwebkit diff --git a/pkgs/applications/video/mythtv/dont-source-os-release.patch b/pkgs/applications/video/mythtv/dont-source-os-release.patch new file mode 100644 index 000000000000..fb4dc686af6a --- /dev/null +++ b/pkgs/applications/video/mythtv/dont-source-os-release.patch @@ -0,0 +1,15 @@ +--- a/configure ++++ b/configure +@@ -5894,9 +5894,9 @@ else + die "ERROR: cannot find soundtouch 1.8.0 or later." + fi + +-if [ $target_os = "linux" ] ; then +- . /etc/os-release +-fi ++# if [ $target_os = "linux" ] ; then ++# . /etc/os-release ++# fi + + # libudfread + if enabled system_libudfread ; then diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 82eaa30bba3e..b41503b73597 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, opencolorio_1, openimageio, + poppler, imagemagick, openexr, ffmpeg, opencolorio_1, openimageio_1, qmake4Hook, libpng, libGL, lndir, libraw, openjpeg, libwebp, fetchFromGitHub }: let @@ -74,7 +74,7 @@ let sha256 = "OQg6a5wNy9TFFySjmgd1subvXRxY/ZnSOCkaoUo+ZaA="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libpng ffmpeg openexr opencolorio_1 openimageio boost libGL + libpng ffmpeg openexr opencolorio_1 openimageio_1 boost libGL seexpr libraw openjpeg libwebp ]; }) diff --git a/pkgs/applications/video/netflix/default.nix b/pkgs/applications/video/netflix/default.nix new file mode 100644 index 000000000000..8c50e027c0e2 --- /dev/null +++ b/pkgs/applications/video/netflix/default.nix @@ -0,0 +1,62 @@ +{ fetchurl +, google-chrome +, lib +, makeDesktopItem +, runtimeShell +, symlinkJoin +, writeScriptBin + + # command line arguments which are always set e.g "--disable-gpu" +, commandLineArgs ? [ ] +}: + +let + name = "netflix-via-google-chrome"; + + meta = { + description = "Open Netflix in Google Chrome app mode"; + longDescription = '' + Netflix is a video streaming service providing films, TV series and exclusive content. See https://www.netflix.com. + + This package installs an application launcher item that opens Netflix in a dedicated Google Chrome window. If your preferred browser doesn't support Netflix's DRM, this package provides a quick and easy way to launch Netflix on a supported browser, without polluting your application list with a redundant, single-purpose browser. + ''; + homepage = google-chrome.meta.homepage or null; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.roberth ]; + platforms = google-chrome.meta.platforms or lib.platforms.all; + }; + + desktopItem = makeDesktopItem { + inherit name; + # Executing by name as opposed to store path is conventional and prevents + # copies of the desktop file from bitrotting too much. + # (e.g. a copy in ~/.config/autostart, you lazy lazy bastard ;) ) + exec = name; + icon = fetchurl { + name = "netflix-icon-2016.png"; + url = "https://assets.nflxext.com/us/ffe/siteui/common/icons/nficon2016.png"; + sha256 = "sha256-c0H3uLCuPA2krqVZ78MfC1PZ253SkWZP3PfWGP2V7Yo="; + meta.license = lib.licenses.unfree; + }; + desktopName = "Netflix via Google Chrome"; + genericName = "A video streaming service providing films and exclusive TV series"; + categories = [ "TV" "AudioVideo" "Network" ]; + startupNotify = true; + }; + + script = writeScriptBin name '' + #!${runtimeShell} + exec ${google-chrome}/bin/${google-chrome.meta.mainProgram} ${lib.escapeShellArgs commandLineArgs} \ + --app=https://netflix.com \ + --no-first-run \ + --no-default-browser-check \ + --no-crash-upload \ + "$@" + ''; + +in + +symlinkJoin { + inherit name meta; + paths = [ script desktopItem ]; +} diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index fb4ffe93a9e8..fa6167b9c118 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -38,10 +38,10 @@ , libdrm , libajantv2 , librist +, libva , srt , qtwayland , wrapQtAppsHook -, ... }: let @@ -50,13 +50,13 @@ let in stdenv.mkDerivation rec { pname = "obs-studio"; - version = "28.1.2"; + version = "29.0.0"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "sha256-M5UEOtdzXBVY0UGfwWx3MsM28bJ1EcVPl8acWXWV0lg="; + sha256 = "sha256-c+G02k4AACaYfa5Zhsanr6AU3vNbopDMcYtuny/d25Y="; fetchSubmodules = true; }; @@ -96,6 +96,7 @@ stdenv.mkDerivation rec { pciutils libajantv2 librist + libva srt qtwayland ] diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index d1a3cc988a50..c796b2d84fa0 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -6,21 +6,23 @@ # - Add plugin to it's own directory (because of future patches). { + droidcam-obs = callPackage ./droidcam-obs { }; + input-overlay = qt6Packages.callPackage ./input-overlay.nix { }; looking-glass-obs = callPackage ./looking-glass-obs.nix { }; - obs-backgroundremoval = callPackage ./obs-backgroundremoval { }; - obs-gstreamer = callPackage ./obs-gstreamer.nix { }; obs-hyperion = qt6Packages.callPackage ./obs-hyperion/default.nix { }; + obs-livesplit-one = callPackage ./obs-livesplit-one { }; + obs-move-transition = callPackage ./obs-move-transition.nix { }; obs-multi-rtmp = qt6Packages.callPackage ./obs-multi-rtmp { }; - obs-ndi = qt6Packages.callPackage ./obs-ndi.nix { }; + obs-ndi = qt6Packages.callPackage ./obs-ndi { }; obs-nvfbc = callPackage ./obs-nvfbc.nix { }; @@ -28,11 +30,15 @@ obs-source-record = callPackage ./obs-source-record.nix { }; + obs-vaapi = callPackage ./obs-vaapi { }; + obs-vkcapture = callPackage ./obs-vkcapture.nix { obs-vkcapture32 = pkgsi686Linux.obs-studio-plugins.obs-vkcapture; }; obs-websocket = throw "obs-websocket has been removed: Functionality has been integrated into obs-studio itself."; + obs-backgroundremoval = throw "obs-backgroundremoval has been removed: It does not work anymore and is unmaintained."; + wlrobs = callPackage ./wlrobs.nix { }; } diff --git a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix new file mode 100644 index 000000000000..131817a2589f --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, fetchFromGitHub +, obs-studio +, ffmpeg +, libjpeg +, libimobiledevice +, libusbmuxd +, libplist +}: + +stdenv.mkDerivation rec { + pname = "droidcam-obs"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "dev47apps"; + repo = "droidcam-obs-plugin"; + rev = version; + sha256 = "sha256-oaw/mq4WCQMlf3sv9WtNlv9J9rm79xnqDwKzHtyFW50="; + }; + + postPatch = '' + substituteInPlace ./linux/linux.mk \ + --replace "-limobiledevice" "-limobiledevice-1.0" \ + --replace "-I/usr/include/obs" "-I${obs-studio}/include/obs" \ + --replace "-I/usr/include/ffmpeg" "-I${ffmpeg}/include" + ''; + + preBuild = '' + mkdir ./build + ''; + + buildInputs = [ + libjpeg + libimobiledevice + libusbmuxd + libplist + obs-studio + ffmpeg + ]; + + makeFlags = [ + "ALLOW_STATIC=no" + "JPEG_DIR=${lib.getDev libjpeg}" + "JPEG_LIB=${lib.getLib libjpeg}/lib" + "IMOBILEDEV_DIR=${libimobiledevice}" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/obs/obs-plugins/droidcam-obs + mkdir -p $out/lib/obs-plugins + cp build/droidcam-obs.so $out/lib/obs-plugins + cp -R ./data/locale $out/share/obs/obs-plugins/droidcam-obs/locale + + runHook postInstall + ''; + + doCheck = false; + + meta = with lib; { + description = "DroidCam OBS"; + homepage = "https://github.com/dev47apps/droidcam-obs-plugin"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ulrikstrid ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix index a1c77349a855..419f470fccb1 100644 --- a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix +++ b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix @@ -43,5 +43,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ glittershark ]; license = licenses.gpl2; platforms = platforms.linux; + # never built on aarch64-linux since first introduction in nixpkgs + broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix index 1696a2d9493b..cd7548846fa2 100644 --- a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix +++ b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { src = looking-glass-client.src; - sourceRoot = "source/obs"; + sourceRoot = "${looking-glass-client.src.name}/obs"; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio libbfd SDL2 ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix deleted file mode 100644 index 79a3f82fec87..000000000000 --- a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, obs-studio -, onnxruntime -, opencv -}: - -stdenv.mkDerivation rec { - pname = "obs-backgroundremoval"; - version = "unstable-2022-05-02"; - - src = fetchFromGitHub { - owner = "royshil"; - repo = "obs-backgroundremoval"; - rev = "cc9d4a5711f9388ed110230f9f793bb071577a23"; - hash = "sha256-xkVZ4cB642p4DvZAPwI2EVhkfVl5lJhgOQobjNMqpec="; - }; - - patches = [ - # Fix c++ include directives - ./includes.patch - - # Use CPU backend instead of CUDA/DirectML - ./use-cpu-backend.patch - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ obs-studio onnxruntime opencv ]; - - dontWrapQtApps = true; - - cmakeFlags = [ - "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" - "-DOnnxruntime_INCLUDE_DIRS=${onnxruntime.dev}/include/onnxruntime/core/session" - ]; - - - prePatch = '' - sed -i 's/version_from_git()/set(VERSION "0.4.0")/' CMakeLists.txt - ''; - - meta = with lib; { - description = "OBS plugin to replace the background in portrait images and video"; - homepage = "https://github.com/royshil/obs-backgroundremoval"; - maintainers = with maintainers; [ puffnfresh ]; - license = licenses.mit; - platforms = [ "x86_64-linux" "i686-linux" ]; - }; -} diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/includes.patch b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/includes.patch deleted file mode 100644 index b99fc1181881..000000000000 --- a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/includes.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/Model.h b/src/Model.h -index 6a73745..6bb8a7d 100644 ---- a/src/Model.h -+++ b/src/Model.h -@@ -1,13 +1,8 @@ - #ifndef MODEL_H - #define MODEL_H - --#if defined(__APPLE__) - #include - #include --#else --#include --#include --#endif - - #ifdef WITH_CUDA - #include -diff --git a/src/background-filter.cpp b/src/background-filter.cpp -index 0853818..32c6483 100644 ---- a/src/background-filter.cpp -+++ b/src/background-filter.cpp -@@ -1,13 +1,8 @@ - #include - #include - --#if defined(__APPLE__) - #include - #include --#else --#include --#include --#endif - #ifdef WITH_CUDA - #include - #endif diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/use-cpu-backend.patch b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/use-cpu-backend.patch deleted file mode 100644 index 0db5592e5cdb..000000000000 --- a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/use-cpu-backend.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d04e167f9081a3ec8c49f0967b5b0cec79e40e4d Mon Sep 17 00:00:00 2001 -From: Raphael Robatsch -Date: Fri, 14 Oct 2022 16:55:36 +0200 -Subject: [PATCH] unix: use CPU backend instead of DirectML - ---- - src/background-filter.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/background-filter.cpp b/src/background-filter.cpp -index 32c6483..55e838f 100644 ---- a/src/background-filter.cpp -+++ b/src/background-filter.cpp -@@ -205,10 +205,14 @@ static void createOrtSession(struct background_removal_filter *tf) { - if (tf->useGPU == USEGPU_CUDA) { - Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_CUDA(sessionOptions, 0)); - } --#else -+#elseif _WIN32 - if (tf->useGPU == USEGPU_DML) { - Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_DML(sessionOptions, 0)); - } -+#else -+ if (tf->useGPU == USEGPU_CPU) { -+ Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_CPU(sessionOptions, 0)); -+ } - #endif - tf->session.reset(new Ort::Session(*tf->env, tf->modelFilepath, sessionOptions)); - } catch (const std::exception& e) { --- -2.37.3 - diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix index 70b6790a58a8..e58220bce7e8 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "obs-gstreamer"; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitHub { owner = "fzwoch"; - repo = "obs-gstreamer"; + repo = pname; rev = "v${version}"; - hash = "sha256-zP1MMoXLp+gp0fjVbWi/Wse6I8u9/K2IeSew3OjkCkE="; + hash = "sha256-C4yee7hzkSOjIeaacLaTGPzZ1qYdYtHK5a3m9gz2pPI="; }; nativeBuildInputs = [ pkg-config meson ninja ]; @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { # - We need "getLib" instead of default derivation, otherwise it brings gstreamer-bin; # - without gst-plugins-base it won't even show proper errors in logs; # - Without gst-plugins-bad it won't find element "h264parse"; - # - gst-vaapi adds "VA-API" to "Encoder type"; # - gst-plugins-ugly adds "x264" to "Encoder type"; # Tip: "could not link appsrc to videoconvert1" can mean a lot of things, enable GST_DEBUG=2 for help. passthru.obsWrapperArguments = @@ -36,11 +35,15 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-bad - gst-plugins-ugly - gst-vaapi ]; + # Fix output directory + postInstall = '' + mkdir $out/lib/obs-plugins + mv $out/lib/obs-gstreamer.so $out/lib/obs-plugins/ + ''; + meta = with lib; { description = "An OBS Studio source, encoder and video filter plugin to use GStreamer elements/pipelines in OBS Studio"; homepage = "https://github.com/fzwoch/obs-gstreamer"; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix new file mode 100644 index 000000000000..1f4665bf9ef0 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, cmake +, fontconfig +, obs-studio +, pkg-config +}: + +rustPlatform.buildRustPackage rec { + pname = "obs-livesplit-one"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "CryZe"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-C1u4z7iQUETM84kf6S6obw+C0ox8J9gMJoVP3/3ZoYw="; + }; + + cargoHash = "sha256-mQ0TR4DL4bA5u4IL3RY9aLxU5G6qQ5W5xuNadiXGeB0="; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fontconfig obs-studio ]; + + postInstall = '' + mkdir $out/lib/obs-plugins/ + mv $out/lib/libobs_livesplit_one.so $out/lib/obs-plugins/obs-livesplit-one.so + ''; + + meta = with lib; { + description = "OBS Studio plugin for adding LiveSplit One as a source"; + homepage = "https://github.com/CryZe/obs-livesplit-one"; + license = with licenses; [ asl20 mit ]; + maintainers = [ maintainers.Bauke ]; + platforms = obs-studio.meta.platforms; + }; +} diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index 7af053e5c18f..0f8eddaebd17 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-zWHQ01iNTlqSAKcmsDCUZPXmmBIpqY/ZDftD5J6kp80="; + sha256 = "sha256-v4mAv4dqurM2S4/vM1APge0xoMLnOaigGU15vjNxxSo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix b/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix similarity index 100% rename from pkgs/applications/video/obs-studio/plugins/obs-ndi.nix rename to pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix diff --git a/pkgs/applications/video/obs-studio/plugins/hardcode-ndi-path.patch b/pkgs/applications/video/obs-studio/plugins/obs-ndi/hardcode-ndi-path.patch similarity index 100% rename from pkgs/applications/video/obs-studio/plugins/hardcode-ndi-path.patch rename to pkgs/applications/video/obs-studio/plugins/obs-ndi/hardcode-ndi-path.patch diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix new file mode 100644 index 000000000000..7a8e19325090 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, gst_all_1 +, pciutils +, pkg-config +, meson +, ninja +, obs-studio +}: + +stdenv.mkDerivation rec { + pname = "obs-vaapi"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "fzwoch"; + repo = pname; + rev = version; + hash = "sha256-qA4xVVShkp40QHp2HmmRzVxQaBwskRpUNEULKetVMu8="; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = with gst_all_1; [ gstreamer gst-plugins-base obs-studio pciutils ]; + + # - We need "getLib" instead of default derivation, otherwise it brings gstreamer-bin; + # - without gst-plugins-base it won't even show proper errors in logs; + # - Without gst-plugins-bad it won't find element "vapostproc"; + # - gst-vaapi adds "VA-API" to "Encoder type"; + # Tip: "could not link appsrc to videoconvert1" can mean a lot of things, enable GST_DEBUG=2 for help. + passthru.obsWrapperArguments = + let + gstreamerHook = package: "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${lib.getLib package}/lib/gstreamer-1.0"; + in + with gst_all_1; builtins.map gstreamerHook [ + gstreamer + gst-plugins-base + gst-plugins-bad + gst-vaapi + ]; + + meta = with lib; { + description = "OBS Studio VAAPI support via GStreamer"; + homepage = "https://github.com/fzwoch/obs-vaapi"; + maintainers = with maintainers; [ ahuzik pedrohlc ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index a1abc952fc73..ba0e8a818263 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "obs-vkcapture"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "nowrep"; repo = pname; rev = "v${version}"; - hash = "sha256-FOyUgsHQlsjVGCct+ky189alVImoG+paqDKmGvnHoXo="; + hash = "sha256-xtIcIT9lWw73Et9WgyEUznwy1X947Rv5nTiM+t0qYaM="; }; cmakeFlags = lib.optionals stdenv.isi686 [ diff --git a/pkgs/applications/video/obs-studio/wrapper.nix b/pkgs/applications/video/obs-studio/wrapper.nix index 5303991f1fb9..62bc80d26df3 100644 --- a/pkgs/applications/video/obs-studio/wrapper.nix +++ b/pkgs/applications/video/obs-studio/wrapper.nix @@ -24,7 +24,7 @@ symlinkJoin { "$out/bin/obs" ''--set OBS_PLUGINS_PATH "${pluginsJoined}/lib/obs-plugins"'' ''--set OBS_PLUGINS_DATA_PATH "${pluginsJoined}/share/obs/obs-plugins"'' - ] ++ pluginArguments; + ] ++ lists.unique pluginArguments; in '' ${concatStringsSep " " wrapCommandLine} diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index c9e1c8343c29..87056a1598d7 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { sha256 = "151g6jwhipgbq4llwib92sq23p1s9hm6avr7j4qq3bvykzrm8z1a"; }; + patches = [ + ./q-painter-path.patch + ]; + nativeBuildInputs = [ pkg-config which @@ -34,5 +38,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.balsoft ]; platforms = platforms.unix; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/video/olive-editor/q-painter-path.patch b/pkgs/applications/video/olive-editor/q-painter-path.patch new file mode 100644 index 000000000000..232f157e7cdd --- /dev/null +++ b/pkgs/applications/video/olive-editor/q-painter-path.patch @@ -0,0 +1,48 @@ +diff --git a/effects/internal/texteffect.cpp b/effects/internal/texteffect.cpp +index 279f406d9..7fe9e8e72 100644 +--- a/effects/internal/texteffect.cpp ++++ b/effects/internal/texteffect.cpp +@@ -20,6 +20,7 @@ + + #include "texteffect.h" + ++#include + #include + #include + #include +diff --git a/effects/internal/timecodeeffect.cpp b/effects/internal/timecodeeffect.cpp +index 4de3e3497..fd0fa6224 100644 +--- a/effects/internal/timecodeeffect.cpp ++++ b/effects/internal/timecodeeffect.cpp +@@ -20,6 +20,7 @@ + + #include "timecodeeffect.h" + ++#include + #include + #include + #include +diff --git a/ui/graphview.cpp b/ui/graphview.cpp +index 3e13075cd..c441133a8 100644 +--- a/ui/graphview.cpp ++++ b/ui/graphview.cpp +@@ -20,6 +20,7 @@ + + #include "graphview.h" + ++#include + #include + #include + #include +diff --git a/ui/timelineheader.cpp b/ui/timelineheader.cpp +index f39065b4f..aa7fd638d 100644 +--- a/ui/timelineheader.cpp ++++ b/ui/timelineheader.cpp +@@ -20,6 +20,7 @@ + + #include "timelineheader.h" + ++#include + #include + #include + #include diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 5d8b68200ded..02270cd75e06 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -13,13 +13,13 @@ mkDerivationWith python3.pkgs.buildPythonApplication rec { pname = "openshot-qt"; - version = "2.6.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - hash = "sha256-29fAg4SDoAFzv6q43Dcs2HdaeKZfPEzlGqCcICiPSF0="; + hash = "sha256-h4R2txi038m6tzdKYiXIB8CiqWt2MFFRNerp1CFP5as="; }; nativeBuildInputs = [ @@ -45,22 +45,6 @@ mkDerivationWith python3.pkgs.buildPythonApplication rec { export HOME=$(mktemp -d) ''; - # Following Arch PKGBUILD for Python 3.10 compatibility - # https://github.com/OpenShot/openshot-qt/issues/4608 - # https://github.com/archlinux/svntogit-community/commits/packages/openshot/trunk - patches = [ - (fetchpatch { - name = "video-widget.patch"; - url = "https://github.com/OpenShot/openshot-qt/commit/9748a13268d66a5949aebc970637b5903756d018.patch"; - hash = "sha256-QwLtcooDJeYWDp80a1dUFo2so/zEWqqsq5IgkXWX324="; - }) - (fetchpatch { - name = "python-3.10-int.patch"; - url = "https://github.com/OpenShot/openshot-qt/commit/fff785eb1e3e0c30ed6ca57e2d1933aaa807ae22.patch"; - hash = "sha256-ee/s7rhF71ot5oPkGK+j59mL1B3e72xoH27KFoDL8s8="; - }) - ]; - doCheck = false; dontWrapGApps = true; diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index c5a33af44377..0c028a4a046f 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , alsa-lib , cmake , doxygen @@ -19,15 +20,20 @@ stdenv.mkDerivation rec { pname = "libopenshot-audio"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot-audio"; rev = "v${version}"; - sha256 = "sha256-XtwTZsj/L/sw/28E7Qr5UyghGlBFFXvbmZLGXBB8vg0="; + sha256 = "sha256-b3BZ275oJTxWfBWtdZetUQw0t7QznL0Q0lP7cKy/avg="; }; + patches = [ + # https://forum.juce.com/t/juce-and-macos-11-arm/40285/24 + ./undef-fpret-on-aarch64-darwin.patch + ]; + nativeBuildInputs = [ cmake doxygen diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 8a98010ef642..4214bed7167f 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libopenshot"; - version = "0.2.7"; + version = "0.3.0"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "sha256-aF8wrPxFIjCy5gw72e/WyL/Wcx9tUGDkrqHS+ZDVK0U="; + sha256 = "sha256-qe866gFhcbd7yCNXDiZ9Aj0TAiWoJ+r7C5BjtWBKSGA="; }; postPatch = '' @@ -35,8 +35,9 @@ stdenv.mkDerivation rec { export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out) ''; - nativeBuildInputs = [ + nativeBuildInputs = lib.optionals stdenv.isLinux [ alsa-lib + ] ++ [ cmake doxygen pkg-config diff --git a/pkgs/applications/video/openshot-qt/undef-fpret-on-aarch64-darwin.patch b/pkgs/applications/video/openshot-qt/undef-fpret-on-aarch64-darwin.patch new file mode 100644 index 000000000000..c391f77dda8b --- /dev/null +++ b/pkgs/applications/video/openshot-qt/undef-fpret-on-aarch64-darwin.patch @@ -0,0 +1,13 @@ +diff --git a/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h b/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h +index 2593790..0b5983d 100644 +--- a/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h ++++ b/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h +@@ -209,7 +209,7 @@ static inline ReturnValue ObjCMsgSendSuper (struct objc_super* s, SEL sel, Param + typedef id (*MsgSendSuperFn) (struct objc_super*, SEL, ...); + static inline MsgSendSuperFn getMsgSendSuperFn() noexcept { return (MsgSendSuperFn) (void*) objc_msgSendSuper; } + +-#if ! JUCE_IOS ++#if JUCE_INTEL && ! JUCE_IOS + typedef double (*MsgSendFPRetFn) (id, SEL op, ...); + static inline MsgSendFPRetFn getMsgSendFPRetFn() noexcept { return (MsgSendFPRetFn) (void*) objc_msgSend_fpret; } + #endif diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index c39363ee3635..f2b5f6c504ab 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -79,9 +79,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; diff --git a/pkgs/applications/video/pipe-viewer/default.nix b/pkgs/applications/video/pipe-viewer/default.nix index 620cedb6c1b2..18e38122f27c 100644 --- a/pkgs/applications/video/pipe-viewer/default.nix +++ b/pkgs/applications/video/pipe-viewer/default.nix @@ -62,7 +62,7 @@ buildPerlModule rec { substituteInPlace Build.PL --replace 'my $gtk ' 'my $gtk = 1;#' ''; - checkInputs = [ + nativeCheckInputs = [ TestPod ]; diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index 60e5924b5f34..30c364578eb0 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/applications/video/rtabmap/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen , wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect -, libdc1394, librealsense, libGL, libGLU, vtkWithQt5, wrapGAppsHook, liblapack +, libdc1394, librealsense, libGL, libGLU, vtk_8_withQt5, wrapGAppsHook, liblapack , xorg }: stdenv.mkDerivation rec { @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { qtbase libGL libGLU - vtkWithQt5 + vtk_8_withQt5 ]; # Disable warnings that are irrelevant to us as packagers diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix index f854054b3b64..83ebf1db9b4e 100644 --- a/pkgs/applications/video/screenkey/default.nix +++ b/pkgs/applications/video/screenkey/default.nix @@ -1,23 +1,23 @@ { lib , fetchFromGitLab -# native , wrapGAppsHook -# not native , xorg , gobject-introspection , gtk3 +, libappindicator-gtk3 +, slop , python3 }: python3.pkgs.buildPythonApplication rec { pname = "screenkey"; - version = "1.4"; + version = "1.5"; src = fetchFromGitLab { - owner = "screenkey"; - repo = "screenkey"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "1rfngmkh01g5192pi04r1fm7vsz6hg9k3qd313sn9rl9xkjgp11l"; + hash = "sha256-kWktKzRyWHGd1lmdKhPwrJoSzAIN2E5TKyg30uhM4Ug="; }; nativeBuildInputs = [ @@ -28,20 +28,24 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk3 + libappindicator-gtk3 ]; propagatedBuildInputs = with python3.pkgs; [ babel pycairo pygobject3 + dbus-python ]; # Prevent double wrapping because of wrapGAppsHook dontWrapGApps = true; - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; + preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + makeWrapperArgs+=( + --prefix PATH ":" "${lib.makeBinPath [ slop ]}" + "''${gappsWrapperArgs[@]}" + ) ''; # screenkey does not have any tests diff --git a/pkgs/applications/video/showmethekey/default.nix b/pkgs/applications/video/showmethekey/default.nix index d50b7ababfa7..b02d6e6e31fc 100644 --- a/pkgs/applications/video/showmethekey/default.nix +++ b/pkgs/applications/video/showmethekey/default.nix @@ -1,56 +1,40 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch -, glib , meson , ninja , libevdev , json-glib -, cairo -, pango , libinput , gtk4 , wrapGAppsHook4 , libxkbcommon , pkg-config }: - stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "AlynxZhou"; - repo = "showmethekey"; + repo = pname; rev = "v${version}"; - sha256 = "sha256-hq4X4dG25YauMjsNXC6Flco9pEpVj3EM2JiFWbRrPaA="; + hash = "sha256-iWZjOhugGD7GikcIKaJimfLrTDaGQeYgmp17N03Meb8="; }; - patches = [ - (fetchpatch { - name = "use-gtk4-update-icon-cache.patch"; - url = "https://github.com/alynxzhou/showmethekey/commit/c73102dc2825d00cbaf323fcfc96736381dc67ae.patch"; - sha256 = "sha256-6QDY5eQ9A8q3LZeD7v6WI/4vYXc/XXVY/WENA1nvIKo="; - }) - ]; - nativeBuildInputs = [ - glib meson ninja - cairo - pango json-glib pkg-config - libevdev - libinput - libxkbcommon wrapGAppsHook4 ]; buildInputs = [ gtk4 + libevdev + libinput + libxkbcommon ]; meta = with lib; { diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 34842b38743b..7778e7c22240 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -13,7 +13,10 @@ mkDerivation rec { sha256 = "0mrx8wprs8bi42fwwvk6rh634ic9jnn0gkfpd6q9pcawnnbz3vq8"; }; - cmakeFlags = [ "-DWITH_QT5=TRUE" ]; + cmakeFlags = [ + "-DWITH_QT5=TRUE" + "-DWITH_GLINJECT=${if stdenv.hostPlatform.isx86 then "TRUE" else "FALSE"}" + ]; patches = [ ./fix-paths.patch ]; @@ -35,7 +38,7 @@ mkDerivation rec { description = "A screen recorder for Linux"; homepage = "https://www.maartenbaert.be/simplescreenrecorder"; license = licenses.gpl3Plus; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/applications/video/srtrelay/default.nix b/pkgs/applications/video/srtrelay/default.nix index 898f728d3eec..b0dc49d7610d 100644 --- a/pkgs/applications/video/srtrelay/default.nix +++ b/pkgs/applications/video/srtrelay/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorSha256 = "sha256-xTYlfdijSo99ei+ZMX6N9gl+yw0DrPQ2wOhn6SS9S/E="; buildInputs = [ srt ]; - checkInputs = [ ffmpeg ]; + nativeCheckInputs = [ ffmpeg ]; meta = with lib; { description = "Streaming-Relay for the SRT-protocol"; diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 38b0301bbc92..706a41e0a505 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { autoPatchelfHook cairo cups.lib - dbus.daemon.lib + dbus.lib expat gcc-unwrapped gdk-pixbuf diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 9f2487734f02..d10fd2e21a79 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -6,19 +6,20 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "5.0.1"; + version = "5.2.1"; format = "pyproject"; src = python3Packages.fetchPypi { inherit pname version; - hash = "sha256-PKRioPBhTV6i3ckQgcKuhQFmpBvUQE4o3FLej8qx4mM="; + hash = "sha256-/YcFH5t9x9EsmK7oPvSECmhL2ypHYgPvsMdL1IupEfw="; }; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook mock requests-mock freezegun + pytest-asyncio ]; nativeBuildInputs = with python3Packages; [ @@ -33,6 +34,8 @@ python3Packages.buildPythonApplication rec { pysocks requests websocket-client + urllib3 + certifi ]) ++ [ ffmpeg ]; diff --git a/pkgs/applications/video/stremio/default.nix b/pkgs/applications/video/stremio/default.nix index 0316318534dc..f1b469006a70 100644 --- a/pkgs/applications/video/stremio/default.nix +++ b/pkgs/applications/video/stremio/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,share/applications} ln -s $out/opt/stremio/stremio $out/bin/stremio mv $out/opt/stremio/smartcode-stremio.desktop $out/share/applications + install -Dm 644 images/stremio_window.png $out/share/pixmaps/smartcode-stremio.png ln -s ${nodejs}/bin/node $out/opt/stremio/node ln -s $server $out/opt/stremio/server.js ''; diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/applications/video/sub-batch/default.nix index 1603bdcbb940..9455f6d1a1e4 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 = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "kl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N+3KyBlLG90C3D5ivgj6qedtKsUBoBHr89gmxyAIfVI="; + sha256 = "sha256-TOcK+l65iKON1kgBE4DYV/BXACnvqPCshavnVdpnGH4="; }; - cargoSha256 = "sha256-rjhSosiLIgcSw6OHpFmGNHXGUdf2QsiIXFVgtO9qNY0="; + cargoSha256 = "sha256-tOY3aLpU08Tg/IT+usS2DNO0Q1aD0bvURmNJmHcJkgI="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index e6cf8fef4d4e..859cd8e8cc36 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.4.093"; + version = "2.4.221"; src = fetchFromGitHub { owner = "axcore"; repo = "tartube"; rev = "refs/tags/v${version}"; - sha256 = "sha256-l8jB+3vY9jOlCaLDHAvDm1Ko7viHbnRBIMEXLb/k2z0="; + sha256 = "sha256-A5p4olnXak22410DOKIPpZ6MQGR5aS2ARWO+083bSuQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/ustreamer/default.nix b/pkgs/applications/video/ustreamer/default.nix index 023f37de287d..70e335192d9d 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 = "5.20"; + version = "5.36"; src = fetchFromGitHub { owner = "pikvm"; repo = "ustreamer"; rev = "v${version}"; - sha256 = "sha256-ZJebLsmoaIxfM8Eenv/r351Kr8XM+wyZUc2TI+oGDxU="; + sha256 = "sha256-VnqCiEPaBzGN2TL7oXO4T7dcNdGneac/5nFPwRPiJ9c="; }; buildInputs = [ libbsd libevent libjpeg ]; diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 68750ac918cb..352b35cc1e9c 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.1"; + version = "2.6.3"; src = fetchgit { url = "git://git.tvdr.de/vdr.git"; rev = version; - sha256 = "sha256-jKuvh1OruPXTBlgLwlwcJdqC8u0WBDr/Un5JUL3U0hw="; + sha256 = "sha256-SDaNk8tDaO70+V7sozMGTCzpnOqa52xdEQPURkyuTt8="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 41c14d6e439a..d67bd55f505d 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -83,11 +83,11 @@ let in stdenv.mkDerivation rec { pname = "${optionalString onlyLibVLC "lib"}vlc"; - version = "3.0.17.3"; + version = "3.0.18"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz"; - sha256 = "sha256-b36Q74lz0x2W3mTbgXFz40UVCClxepQISxu4MhzeIBQ="; + sha256 = "sha256-VwlEOcNl2KqLm0H6MIDMDu8r7+YCW7XO9yKszGJa7ew="; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of @@ -190,12 +190,8 @@ stdenv.mkDerivation rec { BUILDCC = "${stdenv.cc}/bin/gcc"; patches = [ - # patches to build with recent live555 + # patch to build with recent live555 # upstream issue: https://code.videolan.org/videolan/vlc/-/issues/25473 - (fetchpatch { - 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/w_scan2/default.nix b/pkgs/applications/video/w_scan2/default.nix new file mode 100644 index 000000000000..56000407fce6 --- /dev/null +++ b/pkgs/applications/video/w_scan2/default.nix @@ -0,0 +1,25 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation rec { + pname = "w_scan2"; + version = "1.0.14"; + + src = fetchFromGitHub { + owner = "stefantalpalaru"; + repo = "w_scan2"; + rev = version; + sha256 = "sha256-fDFAJ4EMwu4X1Go3jkRjwA66xDY4tJ5wCKlEdZUT4qQ="; + }; + + meta = { + description = "A small channel scan tool which generates ATSC, DVB-C, DVB-S/S2 and DVB-T/T2 channels.conf files"; + homepage = "https://github.com/stefantalpalaru/w_scan2"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ _0x4A6F ] ; + license = lib.licenses.gpl2Only; + }; +} diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 7fd00ec66d03..8becf629d153 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://xine.sourceforge.net/"; + homepage = "https://xine.sourceforge.net/"; description = "Xlib-based frontend for Xine video player"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 1e2e8c764a9e..837e86082f95 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -13,7 +13,7 @@ let "OvmfPkg/OvmfPkgIa32.dsc" else if stdenv.isx86_64 then "OvmfPkg/OvmfPkgX64.dsc" - else if stdenv.isAarch64 then + else if stdenv.hostPlatform.isAarch then "ArmVirtPkg/ArmVirtQemu.dsc" else throw "Unsupported architecture"; @@ -21,6 +21,7 @@ let version = lib.getVersion edk2; suffixes = { + i686 = "FV/OVMF"; x86_64 = "FV/OVMF"; aarch64 = "FV/AAVMF"; }; @@ -51,7 +52,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin ''; - postFixup = if stdenv.isAarch64 then '' + postFixup = if stdenv.hostPlatform.isAarch then '' mkdir -vp $fd/FV mkdir -vp $fd/AAVMF mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV @@ -87,7 +88,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { description = "Sample UEFI firmware for QEMU and KVM"; homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF"; license = lib.licenses.bsd2; - platforms = ["x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin"]; + inherit (edk2.meta) platforms; maintainers = [ lib.maintainers.raitobezarius ]; }; }) diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index b14ae35f5fa5..e6f5be057371 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "28.0"; + version = "29.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gl8LgR2Sz0DxPAYeyfTvLJg4Esotg/eBfCjbdgEUfRI="; + sha256 = "sha256-UH5HGXTRYcCBGhswHpGAn8a7rfl5j7gF8GgdpGj5Cb8="; }; separateDebugInfo = true; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "sha256-qPlk8MHuXnfmtQSqIiFBYQK7TgHun1CxLqVOz/DDvrs="; + cargoSha256 = "sha256-30pUKZgGjjXP7UFY4y7XRXlHPF09mnyGWAhx7rPgs+o="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index d19a764e4eb1..d13cfbd7f177 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "colima"; - version = "0.4.6"; + version = "0.5.2"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mVEp/4iL23rrw6HSl/7qMGK4YCJ6I+9gcSIhyPsAWzc="; + sha256 = "sha256-xw+Yy9KejVkunOLJdmfXstP7aDrl3j0OZjCaf6pyL1U="; # We need the git revision leaveDotGit = true; postFetch = '' @@ -28,7 +28,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles makeWrapper ]; - vendorSha256 = "sha256-tsMQMWEkTE1NhevcqBETGWiboqL6QTepgnIo4B5Y4wQ="; + vendorSha256 = "sha256-Iz1LYL25NpkztTM86zrLwehub8FzO1IlwZqCPW7wDN4="; CGO_ENABLED = 1; diff --git a/pkgs/applications/virtualization/conmon-rs/default.nix b/pkgs/applications/virtualization/conmon-rs/default.nix index 59a2de96e9dd..ef25427c4a23 100644 --- a/pkgs/applications/virtualization/conmon-rs/default.nix +++ b/pkgs/applications/virtualization/conmon-rs/default.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "conmon-rs"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VwVJWf9tKZ5rVF8tXDf35zsS2PipqC8FPbXUpOzsw/Y="; + sha256 = "sha256-mngs5ivRyMJ927VV00mFNIG+nD9EuE3qLyN+OHMMkHQ="; }; nativeBuildInputs = [ capnproto protobuf ]; doCheck = false; - cargoSha256 = "sha256-zY9fsZK1C3HnCxeNA5dCbQQHYx3IVDMHCHYwFh5ev2k="; + cargoSha256 = "sha256-ruChRz2rnPalBiXcpco/WS/eDgg52ckPBLBuoQa9us4="; meta = with lib; { description = "An OCI container runtime monitor written in Rust"; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 7a99bfd0ecc5..d95b37ef1d30 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.10"; + version = "1.6.16"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-kz2UuWzVK5lu/d6K0LHauu2yhBF6Hl83P/a/HCCSObc="; + hash = "sha256-p2I188MGoxnd7dBAMQ0bM5+GT8z3y9S4cZW2Q99DyzY="; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ go-md2man installShellFiles util-linux ]; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 4f54b4044cd0..9031f941ab34 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.25.1"; + version = "1.26.1"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-MFqCRHsIpc8ianyNW+PsDINQavbTZs2rZ2k6q/6wTkY="; + sha256 = "sha256-7tbnnERV+dYtEXzloHgWeSFpe8Dl18tiNWoAhIALWjE="; }; vendorSha256 = null; @@ -54,6 +54,9 @@ buildGoModule rec { installShellCompletion --$shell completions/$shell/* done + install contrib/cni/*.conflist -Dt $out/etc/cni/net.d + install crictl.yaml -Dt $out/etc + installManPage docs/*.[1-9] runHook postInstall ''; diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix index b220c8e29cbf..5d15847d9c3e 100644 --- a/pkgs/applications/virtualization/cri-o/wrapper.nix +++ b/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -40,6 +40,7 @@ in runCommand cri-o-unwrapped.name { ln -s ${cri-o-unwrapped.man} $man mkdir -p $out/bin + ln -s ${cri-o-unwrapped}/etc $out/etc ln -s ${cri-o-unwrapped}/share $out/share for p in ${cri-o-unwrapped}/bin/*; do diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 810fefa2863f..b37937e7461c 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-Ly6GBR7nF7J5Dwe1jrQxR4XYsao7KxBAxGn8fsJwmMs="; + hash = "sha256-8R9cja8Blk+7Sp25bJ9t9e0TvazD41livK+KKAwRpLg="; fetchSubmodules = true; }; @@ -55,6 +55,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; strictDeps = true; + NIX_LDFLAGS = "-lcriu"; + # we need this before autoreconfHook does its thing in order to initialize # config.h with the correct values postPatch = '' @@ -72,9 +74,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A fast and lightweight fully featured OCI runtime and C library for running containers"; + homepage = "https://github.com/containers/crun"; license = licenses.gpl2Plus; platforms = platforms.linux; - inherit (src.meta) homepage; maintainers = with maintainers; [ ] ++ teams.podman.members; }; } diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index aca97a811fb3..fda676ca0043 100644 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "distrobox"; - version = "1.4.1"; + version = "1.4.2.1"; src = fetchFromGitHub { owner = "89luca89"; repo = pname; rev = version; - sha256 = "sha256-WIpl3eSdResAmWFc8OG8Jm0uLTGaovkItGAZTOEzhuE="; + sha256 = "sha256-s3lq1Xr2y29cmyT1nY5/amiDA9dNfyGaMtjTvUINSD8="; }; dontConfigure = true; diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index c116a581103b..bbefed66fae3 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -1,21 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub, makeBinaryWrapper }: buildGoModule rec { pname = "docker-slim"; - version = "1.39.0"; + version = "1.40.0"; src = fetchFromGitHub { - owner = "docker-slim"; - repo = "docker-slim"; + owner = "slimtoolkit"; + repo = "slim"; rev = version; - sha256 = "sha256-CN3mvXjI6c10yvXM2owWASngsU2PjgLhd1N55vxubw0="; + sha256 = "sha256-KbwkZIGkAdzPPo5CrWKnKzFsD8OUONk6JWo1wzwti3s="; }; vendorSha256 = null; - subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; + subPackages = [ "cmd/slim" "cmd/slim-sensor" ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; ldflags = [ "-s" @@ -27,13 +27,13 @@ buildGoModule rec { # docker-slim tries to create its state dir next to the binary (inside the nix # store), so we set it to use the working directory at the time of invocation postInstall = '' - wrapProgram "$out/bin/docker-slim" --add-flags '--state-path "$(pwd)"' + wrapProgram "$out/bin/slim" --add-flags '--state-path "$(pwd)"' ''; meta = with lib; { description = "Minify and secure Docker containers"; - homepage = "https://dockersl.im/"; - changelog = "https://github.com/docker-slim/docker-slim/raw/${version}/CHANGELOG.md"; + homepage = "https://slimtoolkit.org/"; + changelog = "https://github.com/slimtoolkit/slim/raw/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ Br1ght0ne marsam mbrgm ]; }; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 412f55402276..1646c0517514 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.12.2"; + version = "2.15.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-QyxWoq3hGFLm27tba5BL3xcnNCOAmY+rbGBtwREZPJA="; + sha256 = "sha256-CDkewlZFvjp6kb6UoMDUv9iAUfm0akMD9RpI9/H7Sz8="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorSha256 = "sha256-QlzneikTMBUpKJiyVrN+A6CctsVvdoTOOMDjJqIF3a8="; + vendorSha256 = "sha256-sv4lK6MRwmp/1CSGBoYMpcGunVCuE8p1vB4VKaRuwQc="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/docker/compose_1.nix b/pkgs/applications/virtualization/docker/compose_1.nix index 1299d6f69ec7..4e692eb51b11 100644 --- a/pkgs/applications/virtualization/docker/compose_1.nix +++ b/pkgs/applications/virtualization/docker/compose_1.nix @@ -1,7 +1,7 @@ { lib, buildPythonApplication, fetchPypi, pythonOlder , installShellFiles , mock, pytest, nose -, pyyaml, backports_ssl_match_hostname, colorama, docopt +, pyyaml, colorama, docopt , dockerpty, docker, jsonschema, requests , six, texttable, websocket-client, cached-property , enum34, functools32, paramiko, distro, python-dotenv @@ -19,12 +19,12 @@ buildPythonApplication rec { # lots of networking and other fails doCheck = false; nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ mock pytest nose ]; + nativeCheckInputs = [ mock pytest nose ]; propagatedBuildInputs = [ pyyaml colorama dockerpty docker jsonschema requests six texttable websocket-client docopt cached-property paramiko distro python-dotenv - ] ++ lib.optional (pythonOlder "3.7") backports_ssl_match_hostname + ] ++ lib.optional (pythonOlder "3.4") enum34 ++ lib.optional (pythonOlder "3.2") functools32; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 83824b6cb943..1aa5071938a8 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,23 +1,25 @@ { lib, callPackage, fetchFromGitHub }: -with lib; - rec { dockerGen = { - version, rev, sha256 - , moby-src - , runcRev, runcSha256 - , containerdRev, containerdSha256 - , tiniRev, tiniSha256, buildxSupport ? true, composeSupport ? true + version + , cliRev, cliHash + , mobyRev, mobyHash + , runcRev, runcHash + , containerdRev, containerdHash + , tiniRev, tiniHash, buildxSupport ? true, composeSupport ? true # package dependencies , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc , go-md2man, go, containerd, runc, docker-proxy, tini, libtool - , sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose - , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git - , procps, libseccomp, rootlesskit, slirp4netns, fuse-overlayfs - , nixosTests + , sqlite, iproute2, docker-buildx, docker-compose + , iptables, e2fsprogs, xz, util-linux, xfsprogs, git + , procps, rootlesskit, slirp4netns, fuse-overlayfs, nixosTests , clientOnly ? !stdenv.isLinux, symlinkJoin + , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd + , withBtrfs ? stdenv.isLinux, btrfs-progs + , withLvm ? stdenv.isLinux, lvm2 + , withSeccomp ? stdenv.isLinux, libseccomp }: let docker-runc = runc.overrideAttrs (oldAttrs: { @@ -28,7 +30,7 @@ rec { owner = "opencontainers"; repo = "runc"; rev = runcRev; - sha256 = runcSha256; + hash = runcHash; }; # docker/runc already include these patches / are not applicable @@ -43,10 +45,11 @@ rec { owner = "containerd"; repo = "containerd"; rev = containerdRev; - sha256 = containerdSha256; + hash = containerdHash; }; - buildInputs = oldAttrs.buildInputs ++ [ libseccomp ]; + buildInputs = oldAttrs.buildInputs + ++ lib.optionals withSeccomp [ libseccomp ]; }); docker-tini = tini.overrideAttrs (oldAttrs: { @@ -57,7 +60,7 @@ rec { owner = "krallin"; repo = "tini"; rev = tiniRev; - sha256 = tiniSha256; + hash = tiniHash; }; # Do not remove static from make files as we want a static binary @@ -68,7 +71,14 @@ rec { NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; }); - moby = buildGoPackage (optionalAttrs stdenv.isLinux rec { + moby-src = fetchFromGitHub { + owner = "moby"; + repo = "moby"; + rev = mobyRev; + hash = mobyHash; + }; + + moby = buildGoPackage (lib.optionalAttrs stdenv.isLinux rec { pname = "moby"; inherit version; @@ -77,11 +87,15 @@ rec { goPackagePath = "github.com/docker/docker"; nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ]; - buildInputs = [ sqlite lvm2 btrfs-progs systemd libseccomp ]; + buildInputs = [ sqlite ] + ++ lib.optional withLvm lvm2 + ++ lib.optional withBtrfs btrfs-progs + ++ lib.optional withSystemd systemd + ++ lib.optional withSeccomp libseccomp; - extraPath = optionals stdenv.isLinux (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]); + extraPath = lib.optionals stdenv.isLinux (lib.makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]); - extraUserPath = optionals (stdenv.isLinux && !clientOnly) (makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]); + extraUserPath = lib.optionals (stdenv.isLinux && !clientOnly) (lib.makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]); patches = [ # This patch incorporates code from a PR fixing using buildkit with the ZFS graph driver. @@ -89,7 +103,7 @@ rec { (fetchpatch { name = "buildkit-zfs.patch"; url = "https://github.com/moby/moby/pull/43136.patch"; - sha256 = "1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8="; + hash = "sha256-1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8="; }) ]; @@ -102,7 +116,7 @@ rec { # build engine cd ./go/src/${goPackagePath} export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="${rev}" + export DOCKER_GITCOMMIT="${cliRev}" export VERSION="${version}" ./hack/make.sh dynbinary cd - @@ -132,23 +146,29 @@ rec { --prefix PATH : "$out/libexec/docker:$extraPath:$extraUserPath" ''; - DOCKER_BUILDTAGS = [ "journald" "seccomp" ]; + DOCKER_BUILDTAGS = lib.optional withSystemd "journald" + ++ lib.optional (!withBtrfs) "exclude_graphdriver_btrfs" + ++ lib.optional (!withLvm) "exclude_graphdriver_devicemapper" + ++ lib.optional withSeccomp "seccomp"; }); - plugins = optionals buildxSupport [ docker-buildx ] - ++ optionals composeSupport [ docker-compose ]; + plugins = lib.optional buildxSupport docker-buildx + ++ lib.optional composeSupport docker-compose; pluginsRef = symlinkJoin { name = "docker-plugins"; paths = plugins; }; in - buildGoPackage (optionalAttrs (!clientOnly) { - } // rec { + buildGoPackage (lib.optionalAttrs (!clientOnly) { + # allow overrides of docker components + # TODO: move packages out of the let...in into top-level to allow proper overrides + inherit docker-runc docker-containerd docker-proxy docker-tini moby; + } // rec { pname = "docker"; inherit version; src = fetchFromGitHub { owner = "docker"; repo = "cli"; - rev = "v${version}"; - sha256 = sha256; + rev = cliRev; + hash = cliHash; }; goPackagePath = "github.com/docker/cli"; @@ -156,14 +176,17 @@ rec { nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ]; - buildInputs = optionals (!clientOnly) [ - sqlite lvm2 btrfs-progs systemd libseccomp - ] ++ plugins; + buildInputs = lib.optional (!clientOnly) sqlite + ++ lib.optional withLvm lvm2 + ++ lib.optional withBtrfs btrfs-progs + ++ lib.optional withSystemd systemd + ++ lib.optional withSeccomp libseccomp + ++ plugins; postPatch = '' patchShebangs man scripts/build/ substituteInPlace ./scripts/build/.variables --replace "set -eu" "" - '' + optionalString (plugins != []) '' + '' + lib.optionalString (plugins != []) '' substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ "${pluginsRef}/libexec/docker/cli-plugins" ''; @@ -177,7 +200,7 @@ rec { mkdir -p .gopath/src/github.com/docker/ ln -sf $PWD .gopath/src/github.com/docker/cli export GOPATH="$PWD/.gopath:$GOPATH" - export GITCOMMIT="${rev}" + export GITCOMMIT="${cliRev}" export VERSION="${version}" export BUILDTIME="1970-01-01T00:00:00Z" source ./scripts/build/.variables @@ -194,7 +217,7 @@ rec { makeWrapper $out/libexec/docker/docker $out/bin/docker \ --prefix PATH : "$out/libexec/docker:$extraPath" - '' + optionalString (!clientOnly) '' + '' + lib.optionalString (!clientOnly) '' # symlink docker daemon to docker cli derivation ln -s ${moby}/bin/dockerd $out/bin/dockerd ln -s ${moby}/bin/dockerd-rootless $out/bin/dockerd-rootless @@ -222,36 +245,33 @@ rec { installManPage man/*/*.[1-9] ''; - passthru.tests = lib.optionals (!clientOnly) { inherit (nixosTests) docker; }; + passthru = { + # Exposed for tarsum build on non-linux systems (build-support/docker/default.nix) + inherit moby-src; + tests = lib.optionals (!clientOnly) { inherit (nixosTests) docker; }; + }; - meta = { + meta = with lib; { homepage = "https://www.docker.com/"; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; maintainers = with maintainers; [ offline tailhook vdemeester periklis mikroskeem maxeaubrey ]; }; - - # Exposed for tarsum build on non-linux systems (build-support/docker/default.nix) - inherit moby-src; }); # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.21"; - rev = "v${version}"; - sha256 = "sha256-hPQ1t7L2fqoFWoinqIrDwFQ1bo9TzMb4l3HmAotIUS8="; - moby-src = fetchFromGitHub { - owner = "moby"; - repo = "moby"; - rev = "v${version}"; - sha256 = "sha256-BcYDh/UEmmURt7hWLWdPTKVu/Nzoeq/shE+HnUoh8b4="; - }; + version = "20.10.23"; + cliRev = "v${version}"; + cliHash = "sha256-fNaRpstyG90Jzq3+U2A42Jj+ixb+m7tXLioIcsegPbQ="; + mobyRev = "v${version}"; + mobyHash = "sha256-nBPw/M4VC9XeZ9S33HWdWSjY2J2mYpI/TPOzvLjSmJM="; runcRev = "v1.1.4"; - runcSha256 = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA="; - containerdRev = "v1.6.9"; - containerdSha256 = "sha256-KvQdYQLzgt/MKPsA/mO5un6nE3/xcvVYwIveNn/uDnU="; + runcHash = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA="; + containerdRev = "v1.6.15"; + containerdHash = "sha256-Vlftq//mLYZPoT2R/lHJA6wLnqiuC+Cpy4lGQC8jCPA="; tiniRev = "v0.19.0"; - tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; } diff --git a/pkgs/applications/virtualization/dumb-init/default.nix b/pkgs/applications/virtualization/dumb-init/default.nix index bb265dc5488a..ee61a1bafacc 100644 --- a/pkgs/applications/virtualization/dumb-init/default.nix +++ b/pkgs/applications/virtualization/dumb-init/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-aRh0xfmp+ToXIYjYaducTpZUHndZ5HlFZpFhzJ3yKgs="; }; - buildInputs = [ glibc.static ]; + postPatch = lib.optionalString (!stdenv.hostPlatform.isStatic) '' + substituteInPlace Makefile --replace "-static" "" + ''; + + buildInputs = lib.optional (stdenv.hostPlatform.isGnu && stdenv.hostPlatform.isStatic) glibc.static; installPhase = '' runHook preInstall diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 88c5f3779df6..58c303a46c40 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.66.2"; + version = "1.67.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-mZzDvD+40YiC8cBpLlYd7K1p5UBYpso9OMCDijopuik="; + hash = "sha256-iSL5ogS8BLcxge3eo+kCqtsGmj7P1wbi+/84nA9fO2Q="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 66932260886d..7662c57d7a1c 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,8 @@ { fetchurl, lib, stdenv }: let - version = "1.1.2"; + version = "1.1.3"; + # nixpkgs-update: no auto update suffix = { x86_64-linux = "x86_64"; @@ -22,8 +23,8 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-RkFlc+atTB9zHRAjQSqe4nJ9N7I9FE/RBeEcXoCk0T8="; - aarch64-linux = "sha256-AqVFqUbMtjPmOsSgAaJ2AFNc0McC708fAD36qLz0VAc="; + x86_64-linux = "sha256-3+CqVBOb2haknQIMzE9kl99pDWm9wZPUX92FlVov3No="; + aarch64-linux = "sha256-ii+x4YEZIZJuM+1Njvxe1dz6WOvAK1SWqfuodC7a4yo="; }; dontConfigure = true; diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix index 8ee3d478497e..bbf20c6039f5 100644 --- a/pkgs/applications/virtualization/krunvm/default.nix +++ b/pkgs/applications/virtualization/krunvm/default.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation rec { pname = "krunvm"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rR762L8P+7ebE0u4MVCJoXc5mmqXlDFfSas+lFBMVFQ="; + hash = "sha256-IXofYsOmbrjq8Zq9+a6pvBYsvZFcKzN5IvCuHaxwazI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-3WiXm90XiQHpCbhlkigg/ZATQeDdUKTstN7hwcsKm4o="; + hash = "sha256-Y0FNi/+HuN5SqexHTKjcW6lEaeis7xZDYc2/FOAANIA="; }; nativeBuildInputs = with rustPlatform; [ @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/containers/krunvm"; license = licenses.asl20; maintainers = with maintainers; [ nickcao ]; + platforms = libkrun.meta.platforms; }; } diff --git a/pkgs/applications/virtualization/lima/bin.nix b/pkgs/applications/virtualization/lima/bin.nix new file mode 100644 index 000000000000..86b49c5a1eb6 --- /dev/null +++ b/pkgs/applications/virtualization/lima/bin.nix @@ -0,0 +1,112 @@ +{ stdenvNoCC +, lib +, fetchurl +, writeScript +, installShellFiles +, qemu +, makeBinaryWrapper +, autoPatchelfHook +}: + +let + version = "0.14.2"; + + dist = { + aarch64-darwin = rec { + archSuffix = "Darwin-arm64"; + url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; + sha256 = "8334d83ca9555271b9843040066057dd8462a774f60dfaedbe97fae3834c3894"; + }; + + x86_64-darwin = rec { + archSuffix = "Darwin-x86_64"; + url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; + sha256 = "3866113c92619f0041ff6fc68fef2bf16e751058b9237289b2bea8fb960bdab0"; + }; + + aarch64-linux = rec { + archSuffix = "Linux-aarch64"; + url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; + sha256 = "373be7ebcf5932570c384c6bfb159cd418011b98a18c26ba0467827dad302230"; + }; + + x86_64-linux = rec { + archSuffix = "Linux-x86_64"; + url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; + sha256 = "44cae71eae65673afcc22c557f6385aa98792aecbb43195de48217581ae39143"; + }; + }; +in +stdenvNoCC.mkDerivation { + inherit version; + pname = "lima"; + src = fetchurl { + inherit (dist.${stdenvNoCC.hostPlatform.system} or + (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}")) url sha256; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ makeBinaryWrapper installShellFiles ] + ++ lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ]; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r bin share $out + chmod +x $out/bin/limactl + wrapProgram $out/bin/limactl \ + --prefix PATH : ${lib.makeBinPath [ qemu ]} + installShellCompletion --cmd limactl \ + --bash <($out/bin/limactl completion bash) \ + --fish <($out/bin/limactl completion fish) \ + --zsh <($out/bin/limactl completion zsh) + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + USER=nix $out/bin/limactl validate $out/share/lima/examples/default.yaml + USER=nix $out/bin/limactl validate $out/share/lima/examples/experimental/vz.yaml + ''; + + # Stripping removes entitlements of the binary on Darwin making it non-operational. + # Therefore, disable stripping on Darwin. + dontStrip = stdenvNoCC.isDarwin; + + passthru.updateScript = + let + lima-bin = builtins.toString ./bin.nix; + in + writeScript "update-lima-bin.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts curl jq gawk + + set -eou pipefail + + LATEST_VERSION=$(curl -H "Accept: application/vnd.github+json" -Ls https://api.github.com/repos/lima-vm/lima/releases/latest | jq -r .tag_name | cut -c 2-) + curl -Ls -o SHA256SUMS https://github.com/lima-vm/lima/releases/download/v$LATEST_VERSION/SHA256SUMS + AARCH64_DARWIN_SHA256=$(cat SHA256SUMS | awk '/Darwin-arm64/{print $1}') + X86_64_DARWIN_SHA256=$(cat SHA256SUMS | awk '/Darwin-x86_64/{print $1}') + AARCH64_LINUX_SHA256=$(cat SHA256SUMS | awk '/Linux-aarch64/{print $1}') + X86_64_LINUX_SHA256=$(cat SHA256SUMS | awk '/Linux-x86_64/{print $1}') + + # reset version first so that all platforms are always updated and in sync + update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=aarch64-darwin + update-source-version lima-bin $LATEST_VERSION $AARCH64_DARWIN_SHA256 --file=${lima-bin} --system=aarch64-darwin + update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=x86_64-darwin + update-source-version lima-bin $LATEST_VERSION $X86_64_DARWIN_SHA256 --file=${lima-bin} --system=x86_64-darwin + update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=aarch64-linux + update-source-version lima-bin $LATEST_VERSION $AARCH64_LINUX_SHA256 --file=${lima-bin} --system=aarch64-linux + update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=x86_64-linux + update-source-version lima-bin $LATEST_VERSION $X86_64_LINUX_SHA256 --file=${lima-bin} --system=x86_64-linux + rm SHA256SUMS + ''; + + meta = with lib; { + homepage = "https://github.com/lima-vm/lima"; + description = "Linux virtual machines (on macOS, in most cases)"; + license = licenses.asl20; + maintainers = with maintainers; [ tricktron ]; + }; +} diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 03d049477b5d..29dd9b27232e 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -1,31 +1,41 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles , qemu +, xcbuild +, sigtool , makeWrapper }: buildGoModule rec { pname = "lima"; - version = "0.13.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-alE7fUVxJRkLMtdia5ruHxh9nlWIubM0J6iIrmpreRM="; + sha256 = "sha256-g4FvkjBviI1m8zlc+GK/09dIqVkTQ2MqqK1Wkyu4qBc="; }; - vendorSha256 = "sha256-Kb2R8USWOWRFMjQO3tjdl5UHOzzb2B3ld+5vO2gF3KY="; + vendorSha256 = "sha256-l53MTxLY/uid+0U/eY96l0aBWKImST1gN2BARilh2K0="; - nativeBuildInputs = [ makeWrapper installShellFiles ]; + nativeBuildInputs = [ makeWrapper installShellFiles ] + ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; # clean fails with read only vendor dir postPatch = '' - substituteInPlace Makefile --replace 'binaries: clean' 'binaries:' + substituteInPlace Makefile \ + --replace 'binaries: clean' 'binaries:' \ + --replace 'codesign --entitlements vz.entitlements -s -' 'codesign --force --entitlements vz.entitlements -s -' ''; + # It attaches entitlements with codesign and strip removes those, + # voiding the entitlements and making it non-operational. + dontStrip = stdenv.isDarwin; + buildPhase = '' runHook preBuild make "VERSION=v${version}" binaries diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 198a2a0b71a5..c41779459454 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "0.14.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-az4DllTkGP80Jf0NeaKrBI0zz56chPizJGu97cqXrJ4="; + sha256 = "sha256-SrNYvkJy97GwneA7UClNLaO0fd+ZiMSxCCSgqwESw5Y="; }; - cargoSha256 = "sha256-ghbJBhoU41yJ3qZBaKzEybNuCLdSqoL30+1h9d56b4A="; + cargoHash = "sha256-S/V2PVkL9T/USXAzorDpo0nhRm9DOkNtfw5CADg4oKM="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 66c6086aed03..b060c6290493 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "12.1.0"; + version = "12.1.5"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - hash = "sha256-PgrLu0Bm9Vom5WNl43312QFWKojdXDAGn3Nvj4hzPrQ="; + hash = "sha256-CffJg29qM9ex1RAq5t2dE/GX8ud9TylQbYiwBkh8nxE="; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -137,6 +137,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/vmware/open-vm-tools"; + changelog = "https://github.com/vmware/open-vm-tools/releases/tag/stable-${version}"; description = "Set of tools for VMWare guests to improve host-guest interaction"; longDescription = '' A set of services and modules that enable several features in VMware products for diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index dabf52ca88af..f6cc83fde17c 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -27,6 +27,11 @@ buildGoModule rec { sha256 = "sha256-UOAQtGDoZe+Av4+9RQCJiV3//B/pdF0pEsca4FonGxY="; }; + patches = [ + # we intentionally don't build and install the helper so we shouldn't display messages to users about it + ./rm-podman-mac-helper-msg.patch + ]; + vendorSha256 = null; doCheck = false; @@ -63,7 +68,6 @@ buildGoModule rec { ${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 @@ -87,7 +91,6 @@ buildGoModule rec { # related modules inherit (nixosTests) podman-tls-ghostunnel - podman-dnsname ; oci-containers-podman = nixosTests.oci-containers.podman; }; diff --git a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch new file mode 100644 index 000000000000..902a50e4ce24 --- /dev/null +++ b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch @@ -0,0 +1,16 @@ +diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go +index a6907c0df..717d82ff3 100644 +--- a/pkg/machine/qemu/machine.go ++++ b/pkg/machine/qemu/machine.go +@@ -1483,11 +1483,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState apiForwardingState, forward + case notInstalled: + fmt.Printf("\nThe system helper service is not installed; the default Docker API socket\n") + fmt.Printf("address can't be used by podman. ") +- if helper := findClaimHelper(); len(helper) > 0 { +- fmt.Printf("If you would like to install it run the\nfollowing commands:\n") +- fmt.Printf("\n\tsudo %s install\n", helper) +- fmt.Printf("\tpodman machine stop%s; podman machine start%s\n\n", suffix, suffix) +- } + case machineLocal: + fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n") + case claimUnsupported: diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index d0131eacdd37..7fe483a7079e 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -15,12 +15,12 @@ , iproute2 , catatonit , gvproxy +, aardvark-dns +, netavark }: # 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 binPath = lib.makeBinPath ([ ] ++ lib.optionals stdenv.isLinux [ @@ -41,7 +41,9 @@ let paths = [ gvproxy ] ++ lib.optionals stdenv.isLinux [ + aardvark-dns catatonit # added here for the pause image and also set in `containersConf` for `init_path` + netavark podman-unwrapped.rootlessport ]; }; diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix index eba18a76b149..604000434be5 100644 --- a/pkgs/applications/virtualization/pods/default.nix +++ b/pkgs/applications/virtualization/pods/default.nix @@ -11,23 +11,25 @@ , wrapGAppsHook4 , gtksourceview5 , libadwaita +, libpanel +, vte-gtk4 }: stdenv.mkDerivation rec { pname = "pods"; - version = "1.0.0-beta.7"; + version = "1.0.4"; src = fetchFromGitHub { owner = "marhkb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b44x+VyoiDafsPqfCTPm70zZJfNYQ31/UXsrXP6K29E="; + sha256 = "sha256-bBFy8yyEbMlVyJYOlWdffIlnZyVdRLPGebTN6bZmnBI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-kgXt5enZ0VJr6hmEVcCREna4Y53q1jEFzUMsGtV2zvY="; + sha256 = "sha256-DV/XJgWRPK+7q7EVltiNRcRGjS9fvHrDKw+w3wNYitQ="; }; nativeBuildInputs = [ @@ -47,11 +49,14 @@ stdenv.mkDerivation rec { gtk4 gtksourceview5 libadwaita + libpanel + vte-gtk4 ]; meta = with lib; { description = "A podman desktop application"; homepage = "https://github.com/marhkb/pods"; + changelog = "https://github.com/marhkb/pods/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ figsoda ]; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/qemu/9pfs-use-GHashTable-for-fid-table.patch b/pkgs/applications/virtualization/qemu/9pfs-use-GHashTable-for-fid-table.patch deleted file mode 100644 index 2e6f1699637b..000000000000 --- a/pkgs/applications/virtualization/qemu/9pfs-use-GHashTable-for-fid-table.patch +++ /dev/null @@ -1,371 +0,0 @@ -From 8ab70b8958a8f9cb9bd316eecd3ccbcf05c06614 Mon Sep 17 00:00:00 2001 -From: Linus Heckemann -Date: Tue, 4 Oct 2022 12:41:21 +0200 -Subject: [PATCH] 9pfs: use GHashTable for fid table -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The previous implementation would iterate over the fid table for -lookup operations, resulting in an operation with O(n) complexity on -the number of open files and poor cache locality -- for every open, -stat, read, write, etc operation. - -This change uses a hashtable for this instead, significantly improving -the performance of the 9p filesystem. The runtime of NixOS's simple -installer test, which copies ~122k files totalling ~1.8GiB from 9p, -decreased by a factor of about 10. - -Signed-off-by: Linus Heckemann -Reviewed-by: Philippe Mathieu-Daudé -Reviewed-by: Greg Kurz -[CS: - Retain BUG_ON(f->clunked) in get_fid(). - - Add TODO comment in clunk_fid(). ] -Message-Id: <20221004104121.713689-1-git@sphalerite.org> -[CS: - Drop unnecessary goto and out: label. ] -Signed-off-by: Christian Schoenebeck ---- - hw/9pfs/9p.c | 194 +++++++++++++++++++++++++++++---------------------- - hw/9pfs/9p.h | 2 +- - 2 files changed, 112 insertions(+), 84 deletions(-) - -diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c -index aebadeaa03..9bf13133e5 100644 ---- a/hw/9pfs/9p.c -+++ b/hw/9pfs/9p.c -@@ -256,7 +256,8 @@ static size_t v9fs_string_size(V9fsString *str) - } - - /* -- * returns 0 if fid got re-opened, 1 if not, < 0 on error */ -+ * returns 0 if fid got re-opened, 1 if not, < 0 on error -+ */ - static int coroutine_fn v9fs_reopen_fid(V9fsPDU *pdu, V9fsFidState *f) - { - int err = 1; -@@ -282,33 +283,32 @@ static V9fsFidState *coroutine_fn get_fid(V9fsPDU *pdu, int32_t fid) - V9fsFidState *f; - V9fsState *s = pdu->s; - -- QSIMPLEQ_FOREACH(f, &s->fid_list, next) { -+ f = g_hash_table_lookup(s->fids, GINT_TO_POINTER(fid)); -+ if (f) { - BUG_ON(f->clunked); -- if (f->fid == fid) { -- /* -- * Update the fid ref upfront so that -- * we don't get reclaimed when we yield -- * in open later. -- */ -- f->ref++; -- /* -- * check whether we need to reopen the -- * file. We might have closed the fd -- * while trying to free up some file -- * descriptors. -- */ -- err = v9fs_reopen_fid(pdu, f); -- if (err < 0) { -- f->ref--; -- return NULL; -- } -- /* -- * Mark the fid as referenced so that the LRU -- * reclaim won't close the file descriptor -- */ -- f->flags |= FID_REFERENCED; -- return f; -+ /* -+ * Update the fid ref upfront so that -+ * we don't get reclaimed when we yield -+ * in open later. -+ */ -+ f->ref++; -+ /* -+ * check whether we need to reopen the -+ * file. We might have closed the fd -+ * while trying to free up some file -+ * descriptors. -+ */ -+ err = v9fs_reopen_fid(pdu, f); -+ if (err < 0) { -+ f->ref--; -+ return NULL; - } -+ /* -+ * Mark the fid as referenced so that the LRU -+ * reclaim won't close the file descriptor -+ */ -+ f->flags |= FID_REFERENCED; -+ return f; - } - return NULL; - } -@@ -317,12 +317,11 @@ static V9fsFidState *alloc_fid(V9fsState *s, int32_t fid) - { - V9fsFidState *f; - -- QSIMPLEQ_FOREACH(f, &s->fid_list, next) { -+ f = g_hash_table_lookup(s->fids, GINT_TO_POINTER(fid)); -+ if (f) { - /* If fid is already there return NULL */ - BUG_ON(f->clunked); -- if (f->fid == fid) { -- return NULL; -- } -+ return NULL; - } - f = g_new0(V9fsFidState, 1); - f->fid = fid; -@@ -333,7 +332,7 @@ static V9fsFidState *alloc_fid(V9fsState *s, int32_t fid) - * reclaim won't close the file descriptor - */ - f->flags |= FID_REFERENCED; -- QSIMPLEQ_INSERT_TAIL(&s->fid_list, f, next); -+ g_hash_table_insert(s->fids, GINT_TO_POINTER(fid), f); - - v9fs_readdir_init(s->proto_version, &f->fs.dir); - v9fs_readdir_init(s->proto_version, &f->fs_reclaim.dir); -@@ -424,12 +423,12 @@ static V9fsFidState *clunk_fid(V9fsState *s, int32_t fid) - { - V9fsFidState *fidp; - -- QSIMPLEQ_FOREACH(fidp, &s->fid_list, next) { -- if (fidp->fid == fid) { -- QSIMPLEQ_REMOVE(&s->fid_list, fidp, V9fsFidState, next); -- fidp->clunked = true; -- return fidp; -- } -+ /* TODO: Use g_hash_table_steal_extended() instead? */ -+ fidp = g_hash_table_lookup(s->fids, GINT_TO_POINTER(fid)); -+ if (fidp) { -+ g_hash_table_remove(s->fids, GINT_TO_POINTER(fid)); -+ fidp->clunked = true; -+ return fidp; - } - return NULL; - } -@@ -439,10 +438,15 @@ void coroutine_fn v9fs_reclaim_fd(V9fsPDU *pdu) - int reclaim_count = 0; - V9fsState *s = pdu->s; - V9fsFidState *f; -+ GHashTableIter iter; -+ gpointer fid; -+ -+ g_hash_table_iter_init(&iter, s->fids); -+ - QSLIST_HEAD(, V9fsFidState) reclaim_list = - QSLIST_HEAD_INITIALIZER(reclaim_list); - -- QSIMPLEQ_FOREACH(f, &s->fid_list, next) { -+ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &f)) { - /* - * Unlink fids cannot be reclaimed. Check - * for them and skip them. Also skip fids -@@ -514,72 +518,85 @@ void coroutine_fn v9fs_reclaim_fd(V9fsPDU *pdu) - } - } - -+/* -+ * This is used when a path is removed from the directory tree. Any -+ * fids that still reference it must not be closed from then on, since -+ * they cannot be reopened. -+ */ - static int coroutine_fn v9fs_mark_fids_unreclaim(V9fsPDU *pdu, V9fsPath *path) - { -- int err; -+ int err = 0; - V9fsState *s = pdu->s; -- V9fsFidState *fidp, *fidp_next; -+ V9fsFidState *fidp; -+ gpointer fid; -+ GHashTableIter iter; -+ /* -+ * The most common case is probably that we have exactly one -+ * fid for the given path, so preallocate exactly one. -+ */ -+ g_autoptr(GArray) to_reopen = g_array_sized_new(FALSE, FALSE, -+ sizeof(V9fsFidState *), 1); -+ gint i; - -- fidp = QSIMPLEQ_FIRST(&s->fid_list); -- if (!fidp) { -- return 0; -- } -+ g_hash_table_iter_init(&iter, s->fids); - - /* -- * v9fs_reopen_fid() can yield : a reference on the fid must be held -- * to ensure its pointer remains valid and we can safely pass it to -- * QSIMPLEQ_NEXT(). The corresponding put_fid() can also yield so -- * we must keep a reference on the next fid as well. So the logic here -- * is to get a reference on a fid and only put it back during the next -- * iteration after we could get a reference on the next fid. Start with -- * the first one. -+ * We iterate over the fid table looking for the entries we need -+ * to reopen, and store them in to_reopen. This is because -+ * v9fs_reopen_fid() and put_fid() yield. This allows the fid table -+ * to be modified in the meantime, invalidating our iterator. - */ -- for (fidp->ref++; fidp; fidp = fidp_next) { -+ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &fidp)) { - if (fidp->path.size == path->size && - !memcmp(fidp->path.data, path->data, path->size)) { -- /* Mark the fid non reclaimable. */ -- fidp->flags |= FID_NON_RECLAIMABLE; -- -- /* reopen the file/dir if already closed */ -- err = v9fs_reopen_fid(pdu, fidp); -- if (err < 0) { -- put_fid(pdu, fidp); -- return err; -- } -- } -- -- fidp_next = QSIMPLEQ_NEXT(fidp, next); -- -- if (fidp_next) { - /* -- * Ensure the next fid survives a potential clunk request during -- * put_fid() below and v9fs_reopen_fid() in the next iteration. -+ * Ensure the fid survives a potential clunk request during -+ * v9fs_reopen_fid or put_fid. - */ -- fidp_next->ref++; -+ fidp->ref++; -+ fidp->flags |= FID_NON_RECLAIMABLE; -+ g_array_append_val(to_reopen, fidp); - } -+ } - -- /* We're done with this fid */ -- put_fid(pdu, fidp); -+ for (i = 0; i < to_reopen->len; i++) { -+ fidp = g_array_index(to_reopen, V9fsFidState*, i); -+ /* reopen the file/dir if already closed */ -+ err = v9fs_reopen_fid(pdu, fidp); -+ if (err < 0) { -+ break; -+ } - } - -- return 0; -+ for (i = 0; i < to_reopen->len; i++) { -+ put_fid(pdu, g_array_index(to_reopen, V9fsFidState*, i)); -+ } -+ return err; - } - - static void coroutine_fn virtfs_reset(V9fsPDU *pdu) - { - V9fsState *s = pdu->s; - V9fsFidState *fidp; -+ GList *freeing; -+ /* -+ * Get a list of all the values (fid states) in the table, which -+ * we then... -+ */ -+ g_autoptr(GList) fids = g_hash_table_get_values(s->fids); - -- /* Free all fids */ -- while (!QSIMPLEQ_EMPTY(&s->fid_list)) { -- /* Get fid */ -- fidp = QSIMPLEQ_FIRST(&s->fid_list); -- fidp->ref++; -+ /* ... remove from the table, taking over ownership. */ -+ g_hash_table_steal_all(s->fids); - -- /* Clunk fid */ -- QSIMPLEQ_REMOVE(&s->fid_list, fidp, V9fsFidState, next); -+ /* -+ * This allows us to release our references to them asynchronously without -+ * iterating over the hash table and risking iterator invalidation -+ * through concurrent modifications. -+ */ -+ for (freeing = fids; freeing; freeing = freeing->next) { -+ fidp = freeing->data; -+ fidp->ref++; - fidp->clunked = true; -- - put_fid(pdu, fidp); - } - } -@@ -3205,6 +3222,8 @@ static int coroutine_fn v9fs_complete_rename(V9fsPDU *pdu, V9fsFidState *fidp, - V9fsFidState *tfidp; - V9fsState *s = pdu->s; - V9fsFidState *dirfidp = NULL; -+ GHashTableIter iter; -+ gpointer fid; - - v9fs_path_init(&new_path); - if (newdirfid != -1) { -@@ -3238,11 +3257,13 @@ static int coroutine_fn v9fs_complete_rename(V9fsPDU *pdu, V9fsFidState *fidp, - if (err < 0) { - goto out; - } -+ - /* - * Fixup fid's pointing to the old name to - * start pointing to the new name - */ -- QSIMPLEQ_FOREACH(tfidp, &s->fid_list, next) { -+ g_hash_table_iter_init(&iter, s->fids); -+ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &tfidp)) { - if (v9fs_path_is_ancestor(&fidp->path, &tfidp->path)) { - /* replace the name */ - v9fs_fix_path(&tfidp->path, &new_path, strlen(fidp->path.data)); -@@ -3320,6 +3341,8 @@ static int coroutine_fn v9fs_fix_fid_paths(V9fsPDU *pdu, V9fsPath *olddir, - V9fsPath oldpath, newpath; - V9fsState *s = pdu->s; - int err; -+ GHashTableIter iter; -+ gpointer fid; - - v9fs_path_init(&oldpath); - v9fs_path_init(&newpath); -@@ -3336,7 +3359,8 @@ static int coroutine_fn v9fs_fix_fid_paths(V9fsPDU *pdu, V9fsPath *olddir, - * Fixup fid's pointing to the old name to - * start pointing to the new name - */ -- QSIMPLEQ_FOREACH(tfidp, &s->fid_list, next) { -+ g_hash_table_iter_init(&iter, s->fids); -+ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &tfidp)) { - if (v9fs_path_is_ancestor(&oldpath, &tfidp->path)) { - /* replace the name */ - v9fs_fix_path(&tfidp->path, &newpath, strlen(oldpath.data)); -@@ -4226,7 +4250,7 @@ int v9fs_device_realize_common(V9fsState *s, const V9fsTransport *t, - s->ctx.fmode = fse->fmode; - s->ctx.dmode = fse->dmode; - -- QSIMPLEQ_INIT(&s->fid_list); -+ s->fids = g_hash_table_new(NULL, NULL); - qemu_co_rwlock_init(&s->rename_lock); - - if (s->ops->init(&s->ctx, errp) < 0) { -@@ -4286,6 +4310,10 @@ void v9fs_device_unrealize_common(V9fsState *s) - if (s->ctx.fst) { - fsdev_throttle_cleanup(s->ctx.fst); - } -+ if (s->fids) { -+ g_hash_table_destroy(s->fids); -+ s->fids = NULL; -+ } - g_free(s->tag); - qp_table_destroy(&s->qpd_table); - qp_table_destroy(&s->qpp_table); -diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h -index 994f952600..10fd2076c2 100644 ---- a/hw/9pfs/9p.h -+++ b/hw/9pfs/9p.h -@@ -339,7 +339,7 @@ typedef struct { - struct V9fsState { - QLIST_HEAD(, V9fsPDU) free_list; - QLIST_HEAD(, V9fsPDU) active_list; -- QSIMPLEQ_HEAD(, V9fsFidState) fid_list; -+ GHashTable *fids; - FileOperations *ops; - FsContext ctx; - char *tag; --- -2.36.2 - diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 46bbc3b914b9..e68cf7048b56 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -2,7 +2,7 @@ , perl, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool , makeWrapper, runtimeShell, removeReferencesTo -, attr, libcap, libcap_ng, socat +, attr, libcap, libcap_ng, socat, libslirp , CoreServices, Cocoa, Hypervisor, rez, setfile, vmnet , guestAgentSupport ? with stdenv.hostPlatform; isLinux || isSunOS || isWindows , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { + lib.optionalString xenSupport "-xen" + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests"; - version = "7.1.0"; + version = "7.2.0"; src = fetchurl { url = "https://download.qemu.org/qemu-${version}.tar.xz"; - sha256 = "1rmvrgqjhrvcmchnz170dxvrrf14n6nm39y8ivrprmfydd9lwqx0"; + sha256 = "sha256-W0nOJod0Ta1JSukKiYxSIEo0BuhNBySCoeG+hU7rIVc="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib glib perl pixman vde2 texinfo lzo snappy libtasn1 - gnutls nettle curl + gnutls nettle curl libslirp ] ++ lib.optionals ncursesSupport [ ncurses ] ++ lib.optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile vmnet ] @@ -111,18 +111,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-oC+bRjEHixv1QEFO9XAm4HHOwoiT+NkhknKGPydnZ5E="; revert = true; }) - ./9pfs-use-GHashTable-for-fid-table.patch - (fetchpatch { - name = "CVE-2022-3165.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/d307040b18bfcb1393b910f1bae753d5c12a4dc7.patch"; - sha256 = "sha256-YPhm580lBNuAv7G1snYccKZ2V5ycdV8Ri8mTw5jjFBc="; - }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; postPatch = '' # Otherwise tries to ensure /var/run exists. - sed -i "/install_subdir('run', install_dir: get_option('localstatedir'))/d" \ + sed -i "/install_emptydir(get_option('localstatedir') \/ 'run')/d" \ qga/meson.build ''; @@ -198,7 +192,7 @@ stdenv.mkDerivation rec { # tests can still timeout on slower systems inherit doCheck; - checkInputs = [ socat ]; + nativeCheckInputs = [ socat ]; preCheck = '' # time limits are a little meagre for a build machine that's # potentially under load. diff --git a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch b/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch index 2faab7acd873..d0e511c0403d 100644 --- a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch +++ b/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch @@ -1,14 +1,5 @@ -From 756021d1e433925cf9a732d7ea67b01b0beb061c Mon Sep 17 00:00:00 2001 -From: Will Cohen -Date: Tue, 29 Mar 2022 14:00:56 -0400 -Subject: [PATCH] Revert "ui/cocoa: Add clipboard support" - -This reverts commit 7e3e20d89129614f4a7b2451fe321cc6ccca3b76. ---- - include/ui/clipboard.h | 2 +- - ui/clipboard.c | 2 +- - ui/cocoa.m | 123 ----------------------------------------- - 3 files changed, 2 insertions(+), 125 deletions(-) +Based on a reversion of upstream 7e3e20d89129614f4a7b2451fe321cc6ccca3b76, +adapted for 7.2.0 diff --git a/include/ui/clipboard.h b/include/ui/clipboard.h index ce76aa451f..c4e1dc4ff4 100644 @@ -24,10 +15,10 @@ index ce76aa451f..c4e1dc4ff4 100644 G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuClipboardInfo, qemu_clipboard_info_unref) diff --git a/ui/clipboard.c b/ui/clipboard.c -index 9079ef829b..6b9ed59e1b 100644 +index 3d14bffaf8..2c3f4c3ba0 100644 --- a/ui/clipboard.c +++ b/ui/clipboard.c -@@ -140,7 +140,7 @@ void qemu_clipboard_set_data(QemuClipboardPeer *peer, +@@ -154,7 +154,7 @@ void qemu_clipboard_set_data(QemuClipboardPeer *peer, QemuClipboardInfo *info, QemuClipboardType type, uint32_t size, @@ -37,7 +28,7 @@ index 9079ef829b..6b9ed59e1b 100644 { if (!info || diff --git a/ui/cocoa.m b/ui/cocoa.m -index 5a8bd5dd84..79ed6d043f 100644 +index 660d3e0935..0e6760c360 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -29,7 +29,6 @@ @@ -48,8 +39,8 @@ index 5a8bd5dd84..79ed6d043f 100644 #include "ui/console.h" #include "ui/input.h" #include "ui/kbd-state.h" -@@ -109,10 +108,6 @@ static void cocoa_switch(DisplayChangeListener *dcl, - static QemuSemaphore app_started_sem; +@@ -105,10 +104,6 @@ static void cocoa_switch(DisplayChangeListener *dcl, + static bool allow_events; -static NSInteger cbchangecount = -1; @@ -59,7 +50,7 @@ index 5a8bd5dd84..79ed6d043f 100644 // Utility functions to run specified code block with iothread lock held typedef void (^CodeBlock)(void); typedef bool (^BoolCodeBlock)(void); -@@ -1815,107 +1810,6 @@ static void addRemovableDevicesMenuItems(void) +@@ -1799,107 +1794,6 @@ static void addRemovableDevicesMenuItems(void) qapi_free_BlockInfoList(pointerToFree); } @@ -167,15 +158,15 @@ index 5a8bd5dd84..79ed6d043f 100644 /* * The startup process for the OSX/Cocoa UI is complicated, because * OSX insists that the UI runs on the initial main thread, and so we -@@ -1950,7 +1844,6 @@ static void cocoa_clipboard_request(QemuClipboardInfo *info, - COCOA_DEBUG("Second thread: calling qemu_main()\n"); - status = qemu_main(gArgc, gArgv, *_NSGetEnviron()); - COCOA_DEBUG("Second thread: qemu_main() returned, exiting\n"); +@@ -1922,7 +1816,6 @@ static void cocoa_clipboard_request(QemuClipboardInfo *info, + status = qemu_default_main(); + qemu_mutex_unlock_iothread(); + COCOA_DEBUG("Second thread: qemu_default_main() returned, exiting\n"); - [cbowner release]; exit(status); } -@@ -2066,18 +1959,6 @@ static void cocoa_refresh(DisplayChangeListener *dcl) +@@ -2003,18 +1896,6 @@ static void cocoa_refresh(DisplayChangeListener *dcl) [cocoaView setAbsoluteEnabled:YES]; }); } @@ -194,7 +185,7 @@ index 5a8bd5dd84..79ed6d043f 100644 [pool release]; } -@@ -2117,10 +1998,6 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts) +@@ -2071,12 +1952,6 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts) // register vga output callbacks register_displaychangelistener(&dcl); @@ -202,9 +193,8 @@ index 5a8bd5dd84..79ed6d043f 100644 - qemu_event_init(&cbevent, false); - cbowner = [[QemuCocoaPasteboardTypeOwner alloc] init]; - qemu_clipboard_peer_register(&cbpeer); +- +- [pool release]; } static QemuDisplay qemu_display_cocoa = { --- -2.35.1 - diff --git a/pkgs/applications/virtualization/rvvm/default.nix b/pkgs/applications/virtualization/rvvm/default.nix new file mode 100644 index 000000000000..54f3cf7700be --- /dev/null +++ b/pkgs/applications/virtualization/rvvm/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitHub, SDL_compat }: + +stdenv.mkDerivation rec { + pname = "rvvm"; + version = "unstable-2023-01-25"; + + src = fetchFromGitHub { + owner = "LekKit"; + repo = "RVVM"; + rev = "4de27d7083db34bd074b4f056d6eb3871ccf5c10"; + sha256 = "sha256-FjEcXfweL6FzA6iLxl9XnKaD4Fh/wZuRTJzZzHkc/B4="; + }; + + buildInputs = [ SDL_compat ]; + + makeFlags = + [ "BUILDDIR=out" "BINARY=rvvm" "USE_SDL=1" "GIT_COMMIT=${src.rev}" "all" "lib" ] + # work around https://github.com/NixOS/nixpkgs/issues/19098 + ++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "CFLAGS=-fno-lto"; + + installPhase = '' + runHook preInstall + + install -d $out/{bin,lib,include/devices} + install -m755 out/rvvm -t $out/bin + install -m755 out/librvvm.{a,so} -t $out/lib + install -m644 src/rvvmlib.h -t $out/include + install -m644 src/devices/*.h -t $out/include/devices + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/LekKit/RVVM"; + description = "The RISC-V Virtual Machine"; + license = with licenses; [ gpl3 /* or */ mpl20 ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ nebulka ]; + }; +} diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index c870abc30282..502a04c260fc 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "seabios"; - version = "1.16.0"; + version = "1.16.1"; src = fetchgit { url = "https://git.seabios.org/seabios.git"; rev = "rel-${version}"; - sha256 = "0acal1rr7sya86wlhw2mgimabwhjnr0y1pl5zxwb79j8k1w1r8sh"; + sha256 = "sha256-oIl2ZbhgSiVJPMBGbVt6N074vOifAoZL6VdKcBwM8D4="; }; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/applications/virtualization/toolbox/default.nix b/pkgs/applications/virtualization/toolbox/default.nix new file mode 100644 index 000000000000..94928ff35733 --- /dev/null +++ b/pkgs/applications/virtualization/toolbox/default.nix @@ -0,0 +1,51 @@ +{ lib, buildGoModule, fetchFromGitHub, glibc, go-md2man, installShellFiles }: + +buildGoModule rec { + pname = "toolbox"; + version = "0.0.99.3"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = version; + hash = "sha256-9HiWgEtaMypLOwXJ6Xg3grLSZOQ4NInZtcvLPV51YO8="; + }; + + patches = [ ./glibc.patch ]; + + vendorHash = "sha256-k79TcC9voQROpJnyZ0RsqxJnBT83W5Z+D+D3HnuQGsI="; + + postPatch = '' + substituteInPlace src/cmd/create.go --subst-var-by glibc ${glibc} + ''; + + modRoot = "src"; + + nativeBuildInputs = [ go-md2man installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/containers/toolbox/pkg/version.currentVersion=${version}" + ]; + + preCheck = "export PATH=$GOPATH/bin:$PATH"; + + postInstall = '' + cd .. + for d in doc/*.md; do + go-md2man -in $d -out ''${d%.md} + done + installManPage doc/*.[1-9] + installShellCompletion --bash completion/bash/toolbox + install profile.d/toolbox.sh -Dt $out/share/profile.d + ''; + + meta = with lib; { + homepage = "https://containertoolbx.org"; + changelog = "https://github.com/containers/toolbox/releases/tag/${version}"; + description = "Tool for containerized command line environments on Linux"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/virtualization/toolbox/glibc.patch b/pkgs/applications/virtualization/toolbox/glibc.patch new file mode 100644 index 000000000000..1055dc965a0b --- /dev/null +++ b/pkgs/applications/virtualization/toolbox/glibc.patch @@ -0,0 +1,12 @@ +diff --git a/src/cmd/create.go b/src/cmd/create.go +index 74e90b1..113ef80 100644 +--- a/src/cmd/create.go ++++ b/src/cmd/create.go +@@ -423,6 +425,7 @@ func createContainer(container, image, release string, showCommandToEnter bool) + "--volume", toolboxPathMountArg, + "--volume", usrMountArg, + "--volume", runtimeDirectoryMountArg, ++ "--volume", "@glibc@:@glibc@:ro", + }...) + + createArgs = append(createArgs, avahiSocketMount...) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 03aba1c41218..e5d5a1fbfe7c 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { --replace "'--owner=root:root'" "'--owner=0:0'" ''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook cpio cdrtools diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix index 1c648b25ddb0..dc6f79d6a7e5 100644 --- a/pkgs/applications/virtualization/virt-top/default.nix +++ b/pkgs/applications/virtualization/virt-top/default.nix @@ -10,18 +10,20 @@ stdenv.mkDerivation rec { hash = "sha256-IKIkqzx7YWki0L6D5WbwQiVWJfDFGdI2nsGgg212CcE="; }; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook pkg-config getopt + ocamlPackages.ocaml + ocamlPackages.findlib ]; - buildInputs = with ocamlPackages; [ + ocamlPackages.ocaml calendar curses - findlib gettext-stub - ocaml ocaml_libvirt ] ++ [ libxml2 ]; diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/applications/virtualization/vmware-workstation/default.nix index 0863eae3bb04..6bcd15dc52ff 100755 --- a/pkgs/applications/virtualization/vmware-workstation/default.nix +++ b/pkgs/applications/virtualization/vmware-workstation/default.nix @@ -26,13 +26,29 @@ , makeWrapper , sqlite , enableInstaller ? false +, enableMacOSGuests ? false, fetchFromGitHub, gnutar, unzip }: let - vmware-unpack-env = buildFHSUserEnv rec { - name = "vmware-unpack-env"; - targetPkgs = pkgs: [ zlib ]; + # macOS - versions + fusionVersion = "13.0.0"; + fusionBuild = "20802013"; + unlockerVersion = "3.0.4"; + + # macOS - ISOs + darwinIsoSrc = fetchurl { + url = "https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${fusionVersion}/${fusionBuild}/x86/core/com.vmware.fusion.zip.tar"; + sha256 = "sha256-cSboek+nhkVj8rjdic6yzWQfjXiiLlch6gBWn73BzRU="; }; + + # macOS - Unlocker + unlockerSrc = fetchFromGitHub { + owner = "paolo-projects"; + repo = "unlocker"; + rev = "${unlockerVersion}"; + sha256 = "sha256-kpvrRiiygfjQni8z+ju9mPBVqy2gs08Wj4cHxE9eorQ="; + }; + gdbm3 = gdbm.overrideAttrs (old: rec { version = "1.8.3"; @@ -46,11 +62,16 @@ let cp .libs/libgdbm*.so* $out/lib/ ''; }); + + vmware-unpack-env = buildFHSUserEnv rec { + name = "vmware-unpack-env"; + targetPkgs = pkgs: [ zlib ]; + }; in stdenv.mkDerivation rec { pname = "vmware-workstation"; - version = "16.2.3"; - build = "19376536"; + version = "17.0.0"; + build = "20800274"; buildInputs = [ libxslt @@ -73,15 +94,35 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ python3 vmware-unpack-env autoPatchelfHook makeWrapper ] - ++ lib.optionals enableInstaller [ sqlite bzip2 ]; + ++ lib.optionals enableInstaller [ sqlite bzip2 ] + ++ lib.optionals enableMacOSGuests [ gnutar unzip ]; src = fetchurl { - url = "https://download3.vmware.com/software/WKST-1623-LX-New/VMware-Workstation-Full-${version}-${build}.x86_64.bundle"; - sha256 = "sha256-+JE1KnRfawcaBannIyEr1TNZTF7YXRYYaFMVq0/erbM="; + url = "https://download3.vmware.com/software/WKST-1700-LX/VMware-Workstation-Full-${version}-${build}.x86_64.bundle"; + sha256 = "sha256-kBTocGb1tg5i+dvWmOaPfPUHxrWcX8/obeKqRGR+mRA="; }; unpackPhase = '' ${vmware-unpack-env}/bin/vmware-unpack-env -c "sh ${src} --extract unpacked" + + ${lib.optionalString enableMacOSGuests '' + mkdir -p fusion/ + tar -xvpf "${darwinIsoSrc}" -C fusion/ + unzip "fusion/com.vmware.fusion.zip" \ + "payload/VMware Fusion.app/Contents/Library/isoimages/x86_x64/darwin.iso" \ + "payload/VMware Fusion.app/Contents/Library/isoimages/x86_x64/darwinPre15.iso" \ + -d fusion/ + ''} + ''; + + patchPhase = lib.optionalString enableMacOSGuests '' + cp -R "${unlockerSrc}" unlocker/ + + substituteInPlace unlocker/unlocker.py --replace \ + "/usr/lib/vmware/bin/" "$out/lib/vmware/bin" + + substituteInPlace unlocker/unlocker.py --replace \ + "/usr/lib/vmware/lib/libvmwarebase.so/libvmwarebase.so" "$out/lib/vmware/lib/libvmwarebase.so/libvmwarebase.so" ''; installPhase = '' @@ -226,6 +267,14 @@ stdenv.mkDerivation rec { unpacked/vmware-tools-solaris/solaris.iso \ $out/lib/vmware/isoimages/ + ${lib.optionalString enableMacOSGuests '' + echo "Installing VMWare Tools for MacOS" + cp -v \ + "fusion/payload/VMware Fusion.app/Contents/Library/isoimages/x86_x64/darwin.iso" \ + "fusion/payload/VMware Fusion.app/Contents/Library/isoimages/x86_x64/darwinPre15.iso" \ + $out/lib/vmware/isoimages/ + ''} + ## VMware Player Application echo "Installing VMware Player Application" unpacked="unpacked/vmware-player-app" @@ -290,9 +339,9 @@ stdenv.mkDerivation rec { mkdir -p $out/include/ cp -r $unpacked/include/* $out/include/ - ## VMware VIX Workstation-16.0.0 Library - echo "Installing VMware VIX Workstation-16.0.0 Library" - unpacked="unpacked/vmware-vix-lib-Workstation1600" + ## VMware VIX Workstation-17.0.0 Library + echo "Installing VMware VIX Workstation-17.0.0 Library" + unpacked="unpacked/vmware-vix-lib-Workstation1700" cp -r $unpacked/lib/* $out/lib/vmware-vix/ ## VMware VProbes component for Linux @@ -327,6 +376,11 @@ stdenv.mkDerivation rec { sed -i -e "s,/usr/local/sbin,/run/vmware/bin," "$out/$lib" done + ${lib.optionalString enableMacOSGuests '' + echo "Running VMWare Unlocker to enable macOS Guests" + python3 unlocker/unlocker.py + ''} + # SUID hack wrapProgram $out/lib/vmware/bin/vmware-vmx rm $out/lib/vmware/bin/vmware-vmx @@ -339,6 +393,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ deinferno ]; + maintainers = with maintainers; [ cawilliamson deinferno ]; }; } diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index 7837bd3751a4..f6612f3d9aea 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 = "7.4.2"; + version = "7.6.0"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "sha256-oyxD6VCut7OfFYozdP0D2+ocOvidTrtaYrh0oCfZzBY="; + sha256 = "sha256-DehAWrEvoE/zWbfjQmF5Z7HTaQL5WMA/279Ee1Xm47g="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index f093e94696cf..2d66f8351411 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -33,5 +33,7 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.lnl7 ]; license = licenses.bsd2; platforms = platforms.darwin; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/virtualization/youki/default.nix b/pkgs/applications/virtualization/youki/default.nix new file mode 100644 index 000000000000..54a88a334f8a --- /dev/null +++ b/pkgs/applications/virtualization/youki/default.nix @@ -0,0 +1,48 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, installShellFiles +, dbus +, libseccomp +, systemd +}: + +rustPlatform.buildRustPackage rec { + pname = "youki"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XwapCfu6Me0xSe+qFz9BFRYpQvG+ztb6QyhGejYRPb4="; + }; + + nativeBuildInputs = [ pkg-config installShellFiles ]; + + buildInputs = [ dbus libseccomp systemd ]; + + postInstall = '' + installShellCompletion --cmd youki \ + --bash <($out/bin/youki completion -s bash) \ + --fish <($out/bin/youki completion -s fish) \ + --zsh <($out/bin/youki completion -s zsh) + ''; + + cargoBuildFlags = [ "-p" "youki" ]; + cargoTestFlags = [ "-p" "youki" ]; + + cargoSha256 = "sha256-PT1kVo4gQFH9sIprEoAioNvDL/soMHcA2utEiQJPS/0="; + + doCheck = false; # test failed + + meta = with lib; { + description = "A container runtime written in Rust"; + homepage = "https://containers.github.io/youki/"; + changelog = "https://github.com/containers/youki/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ candyc1oud ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/bevelbar/default.nix b/pkgs/applications/window-managers/bevelbar/default.nix deleted file mode 100644 index 74da42f88c94..000000000000 --- a/pkgs/applications/window-managers/bevelbar/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libX11, libXrandr, libXft }: - -stdenv.mkDerivation rec { - pname = "bevelbar"; - version = "16.11"; - - src = fetchFromGitHub { - owner = "vain"; - repo = "bevelbar"; - rev = "v${version}"; - sha256 = "1hbwg3vdxw9fyshy85skv476p0zr4ynvhcz2xkijydpzm2j3rmjm"; - }; - - buildInputs = [ libX11 libXrandr libXft ]; - - installFlags = [ "prefix=$(out)" ]; - - meta = with lib; { - description = "An X11 status bar with fancy schmancy 1985-ish beveled borders"; - inherit (src.meta) homepage; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ maintainers.neeasade ]; - }; -} diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix index 93f5b788c7ce..63a5e8613e18 100644 --- a/pkgs/applications/window-managers/cagebreak/default.nix +++ b/pkgs/applications/window-managers/cagebreak/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "cagebreak"; - version = "1.8.1"; + version = "1.9.1"; src = fetchFromGitHub { owner = "project-repo"; repo = pname; rev = version; - hash = "sha256-YaLGRlvppTUCSHFlt3sEfHgN3pYHuc5oGt3dt0DDw3I="; + hash = "sha256-pU1QHYOqnkb3L4iSKbZY9Vo60Z6EaX9mp2Nw48NSPic="; }; nativeBuildInputs = [ @@ -82,6 +82,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ berbiche ]; platforms = platforms.linux; + changelog = "https://github.com/project-repo/cagebreak/blob/${version}/Changelog.md"; }; passthru.tests.basic = nixosTests.cagebreak; diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 95170b79326d..251092049c9a 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -1,36 +1,42 @@ { lib , stdenv , fetchFromGitHub +, installShellFiles +, libX11 , libinput , libxcb , libxkbcommon , pixman , pkg-config +, substituteAll , wayland , wayland-protocols -, wlroots +, wlroots_0_16 , writeText -, enable-xwayland ? true, xwayland, libX11 +, xcbutilwm +, xwayland +, enableXWayland ? true , conf ? null -, patches ? [ ] }: let - totalPatches = patches ++ [ ]; + wlroots = wlroots_0_16; in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "dwl"; - version = "0.3.1"; + version = "0.4"; src = fetchFromGitHub { owner = "djpohly"; - repo = pname; - rev = "v${version}"; - hash = "sha256-VHxBjjnzJNmtJxrm3ywJzvt2bNHGk/Cx8TICw6SaoiQ="; + repo = "dwl"; + rev = "v${self.version}"; + hash = "sha256-OW7K7yMYSzqZWpQ9Vmpy8EgdWvyv3q1uh8A40f6AQF4="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; buildInputs = [ libinput @@ -40,18 +46,13 @@ stdenv.mkDerivation rec { wayland wayland-protocols wlroots - ] ++ lib.optionals enable-xwayland [ + ] ++ lib.optionals enableXWayland [ libX11 + xcbutilwm xwayland ]; - # Allow users to set their own list of patches - patches = totalPatches; - - # Last line of config.mk enables XWayland - prePatch = lib.optionalString enable-xwayland '' - sed -i -e '$ s|^#||' config.mk - ''; + outputs = [ "out" "man" ]; # Allow users to set an alternative config.def.h postPatch = let @@ -60,21 +61,19 @@ 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 = '' - runHook preInstall - install -d $out/bin - install -m755 dwl $out/bin - runHook postInstall + preBuild = '' + makeFlagsArray+=( + XWAYLAND=${if enableXWayland then "-DXWAYLAND" else ""} + XLIBS=${if enableXWayland then "xcb\\ xcb-icccm" else ""} + ) ''; - meta = with lib; { + installFlags = [ + "PREFIX=$(out)" + "MANDIR=$(man)/share/man/man1" + ]; + + meta = { homepage = "https://github.com/djpohly/dwl/"; description = "Dynamic window manager for Wayland"; longDescription = '' @@ -88,9 +87,10 @@ stdenv.mkDerivation rec { - Limited to 2000 SLOC to promote hackability - Tied to as few external dependencies as possible ''; - license = licenses.gpl3Only; - maintainers = with maintainers; [ AndersonTorres ]; + changelog = "https://github.com/djpohly/dwl/releases/tag/v${self.version}"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.AndersonTorres ]; inherit (wayland.meta) platforms; }; -} +}) # TODO: custom patches from upstream website diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index a1b790b33da8..424528e9c1aa 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.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "Gerschtli"; repo = pname; rev = version; - sha256 = "sha256-BCnEnBB0OCUwvhh4XEI2eOzfy34VHNFzbqqW26X6If0="; + sha256 = "sha256-GkTPEmsnHFLUvbasAOXOQjFKs1Y9aaG87uyPvnQaT8Y="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "sha256-ylB0XGmIPW7Dbc6eDS8FZsq1AOOqntx1byaH3XIal0I="; + cargoSha256 = "sha256-eRfXUnyzOfVSEiwjLCaNbETUPXVU2Ed2VUNM9FjS5YE="; postInstall = lib.optionalString (bins != []) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}" @@ -30,6 +30,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Highly performant and configurable DWM status service"; homepage = "https://github.com/Gerschtli/dwm-status"; + changelog = "https://github.com/Gerschtli/dwm-status/blob/master/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ gerschtli ]; mainProgram = pname; diff --git a/pkgs/applications/window-managers/e16/default.nix b/pkgs/applications/window-managers/e16/default.nix index 6e2fd639ddef..063798881912 100644 --- a/pkgs/applications/window-managers/e16/default.nix +++ b/pkgs/applications/window-managers/e16/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "e16"; - version = "1.0.26"; + version = "1.0.27"; src = fetchurl { url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz"; - hash = "sha256-1FJFE4z8UT5VYv0Ef9pqi5sYq8iIbrDPKaqcUFf9dwE="; + hash = "sha256-Lr5OC14N6KTZNU3Ei4O9taYGL+1NZd5JmejYBmmELUE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/fvwm/3.nix b/pkgs/applications/window-managers/fvwm/3.nix index 5c2cc999f45e..a0cddeff23ac 100644 --- a/pkgs/applications/window-managers/fvwm/3.nix +++ b/pkgs/applications/window-managers/fvwm/3.nix @@ -7,7 +7,6 @@ , fontconfig , freetype , fribidi -, imlib , libSM , libX11 , libXcursor @@ -32,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fvwm3"; - version = "1.0.5"; + version = "1.0.6a"; src = fetchFromGitHub { owner = "fvwmorg"; repo = "fvwm3"; rev = finalAttrs.version; - hash = "sha256-/2Ssl/sgKCXbUCtKj2WIcvEC3B16h5/1Jp87AggKxJo="; + hash = "sha256-uYkIuMzhaWeCZm5aJF4oBYD72OLgwCBuUhDqpg6HQUM="; }; nativeBuildInputs = [ @@ -53,7 +52,6 @@ stdenv.mkDerivation (finalAttrs: { fontconfig freetype fribidi - imlib libSM libX11 libXcursor diff --git a/pkgs/applications/window-managers/hackedbox/default.nix b/pkgs/applications/window-managers/hackedbox/default.nix index 0f608b83a70a..f38d0d6beb9b 100644 --- a/pkgs/applications/window-managers/hackedbox/default.nix +++ b/pkgs/applications/window-managers/hackedbox/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A bastard hacked offspring of Blackbox"; - homepage = "http://github.com/museoa/hackedbox/"; + homepage = "https://github.com/museoa/hackedbox/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; inherit (libX11.meta) platforms; diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index b46179599cd3..f1d7c585c443 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ (python3.withPackages (ps: with ps; [ ewmh pytest xlib ])) xdotool xorgserver @@ -70,17 +70,16 @@ stdenv.mkDerivation rec { python3.pkgs.pytestCheckHook ]; - # make the package's module avalaible + # make the package's module available preCheck = '' export PYTHONPATH="$PYTHONPATH:../python" ''; pytestFlagsArray = [ "../tests" ]; disabledTests = [ - "test_title_different_letters_are_drawn" # font problems - "test_completable_commands" # font problems "test_autostart" # $PATH problems "test_wmexec_to_other" # timeouts in sandbox + "test_rules" # timeouts ]; passthru = { diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix index 673fa90c5005..2485552fce6e 100644 --- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cairo , cmake , glib @@ -15,6 +16,7 @@ , xcbutilcursor , xcbutilkeysyms , xcbutilwm +, xcbutil , xmodmap }: @@ -31,6 +33,15 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./000-dont-set-compiler.diff + # TODO: remove on next release + (fetchpatch { + url = "https://github.com/hyprwm/Hypr/commit/08d6af2caf882247943f0e8518ad782f35d1aba4.patch"; + sha256 = "sha256-WjR12ZH8CE+l9xSeQUAPYW5r5HzoPpod5YqDPJTdTY8="; + }) + (fetchpatch { + url = "https://github.com/hyprwm/Hypr/commit/7512a3ab91865b1e11b8c4a9dfdffb25c2b153de.patch"; + sha256 = "sha256-0Hq5n115z0U44op7A1FO9tUOeMEPV0QgD5E5zcmend0="; + }) ]; nativeBuildInputs = [ @@ -51,8 +62,12 @@ stdenv.mkDerivation (finalAttrs: { xcbutilcursor xcbutilkeysyms xcbutilwm + xcbutil ]; + # src/ewmh/ewmh.cpp:67:28: error: non-constant-expression cannot be narrowed from type 'int' to 'uint32_t' (aka 'unsigned int') in initializer list + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-c++11-narrowing"; + installPhase = '' runHook preInstall @@ -71,7 +86,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ AndersonTorres ]; inherit (libX11.meta) platforms; - broken = stdenv.isDarwin; # xcb/xcb_atom.h not found mainProgram = "Hypr"; }; }) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index c5733ffa68fb..ca9565d915a2 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -90,7 +90,5 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ wozeparrot ]; inherit (wayland.meta) platforms; mainProgram = "Hyprland"; - # ofborg failure: g++ does not recognize '-std=c++23' - broken = stdenv.isAarch64; }; }) diff --git a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix index 8362097ddf9e..f7c28ff35d22 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix @@ -59,7 +59,5 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ wozeparrot ]; inherit (wayland.meta) platforms; - # ofborg failure: g++ does not recognize '-std=c++23' - broken = stdenv.isAarch64; }; }) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 4ffa04d73bf5..b9079c882814 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.21.1"; + version = "4.22"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-7f14EoXGVKBdxtsnLOAwDEQo5vvYddmZZOV94ltBvB4="; + sha256 = "sha256-KGOZEeWdlWOfCSZCqYL14d6lkiUMK1zpjtoQCDNRPks="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix deleted file mode 100644 index 35a58bd25f00..000000000000 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ fetchFromGitHub, lib, i3 }: - -i3.overrideAttrs (oldAttrs : rec { - pname = "i3-gaps"; - version = "4.21.1"; - - src = fetchFromGitHub { - owner = "Airblader"; - repo = "i3"; - rev = version; - sha256 = "sha256-+JxJjvzEuAA4CH+gufzAzIqd5BSvHtPvLm2zTfXc/xk="; - }; - - meta = with lib; { - description = "A fork of the i3 tiling window manager with some additional features"; - homepage = "https://github.com/Airblader/i3"; - maintainers = with maintainers; [ fmthoma ]; - license = licenses.bsd3; - platforms = platforms.linux ++ platforms.netbsd ++ platforms.openbsd; - - longDescription = '' - Fork of i3wm, a tiling window manager primarily targeted at advanced users - and developers. Based on a tree as data structure, supports tiling, - stacking, and tabbing layouts, handled dynamically, as well as floating - windows. This fork adds a few features such as gaps between windows. - Configured via plain text file. Multi-monitor. UTF-8 clean. - ''; - }; -}) diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 7f08891385b1..4460c5f90b76 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=\${out}" "SYSCONFDIR=\${out}/etc" "MANDIR=\${out}/share/man" ]; postInstall = '' mv $out/bin/i3lock $out/bin/i3lock-color + ln -s $out/bin/i3lock-color $out/bin/i3lock mv $out/share/man/man1/i3lock.1 $out/share/man/man1/i3lock-color.1 sed -i 's/\(^\|\s\|"\)i3lock\(\s\|$\)/\1i3lock-color\2/g' $out/share/man/man1/i3lock-color.1 ''; diff --git a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix b/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix index 8884b1d5100c..29bd81fe872c 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { installPhase = '' install -D i3lock-fancy-rapid $out/bin/i3lock-fancy-rapid + ln -s $out/bin/i3lock-fancy-rapid $out/bin/i3lock ''; meta = with lib; { diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index 9a1b959690a2..f3963b43b54a 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/share/i3lock-fancy/icons cp i3lock-fancy $out/bin/i3lock-fancy + ln -s $out/bin/i3lock-fancy $out/bin/i3lock cp icons/lock*.png $out/share/i3lock-fancy/icons ''; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index ddc4383fbd73..d36ac492f985 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { description = "Very resource-friendly and feature-rich replacement for i3status"; homepage = "https://github.com/greshake/i3status-rust"; license = licenses.gpl3Only; - maintainers = with maintainers; [ backuitist globin ma27 ]; + maintainers = with maintainers; [ backuitist globin ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index ec2e03de0f8e..1c06fc2ae28d 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "wmfocus"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HrS+C/6KDG2Rn/3u/mMmp4vzQ5YAHUFL4HFecteuzsc="; + sha256 = "sha256-zXqPZORwi7X1wBTecPg9nOCvRHWNTtloCpgbPwtFhzo="; }; - cargoSha256 = "sha256-EzgYnfUgwK2ldzrlqe9N9jeGgK+RzQPjbOjJCGEkcwE="; + cargoHash = "sha256-4eoV/viI7Q7I7mIqcHVAyPf/y2RWaWX0B+mLZWMEbcI="; nativeBuildInputs = [ python3 pkg-config ]; buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ]; diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 07c45bbcc693..52a213cda86f 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.2.2"; + version = "3.3.1"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; rev = finalAttrs.version; - hash = "sha256-tVbBV3eaZ9MUXlzriiOeEuzojI3GHNaXRBjdsQjXrzw="; + hash = "sha256-2gEZRkym21X4rvj6kzZh9WChZUkfqgS1wiWh7LBioZM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/jay/default.nix b/pkgs/applications/window-managers/jay/default.nix new file mode 100644 index 000000000000..0e233dd86ac4 --- /dev/null +++ b/pkgs/applications/window-managers/jay/default.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, libinput +, libxkbcommon +, mesa +, pango +, udev +}: + +rustPlatform.buildRustPackage rec { + pname = "jay"; + version = "unstable-2022-11-20"; + + src = fetchFromGitHub { + owner = "mahkoh"; + repo = pname; + rev = "09b4668a5363a6e93dfb8ba35b244835f4edb0f2"; + sha256 = "sha256-0IIzXY7AFTGEe0TzJVKOtTPUZee0Wz40yKgEWLeIYJw="; + }; + + cargoSha256 = "sha256-zSq6YBlm6gJXGlF9xZ8gWSTMewdNqrJzwP58a0x8QIU="; + + buildInputs = [ + libxkbcommon + mesa + pango + udev + libinput + ]; + + RUSTC_BOOTSTRAP = 1; + + meta = with lib; { + description = "A Wayland compositor written in Rust"; + homepage = "https://github.com/mahkoh/jay"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/applications/window-managers/katriawm/default.nix b/pkgs/applications/window-managers/katriawm/default.nix new file mode 100644 index 000000000000..61a82f526d9e --- /dev/null +++ b/pkgs/applications/window-managers/katriawm/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchzip +, libX11 +, libXft +, libXrandr +, pkg-config +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "katriawm"; + version = "21.09"; + + src = fetchzip { + name = finalAttrs.pname + "-" + finalAttrs.version; + url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${finalAttrs.version}.tar.gz"; + hash = "sha256-xt0sWEwTcCs5cwoB3wVbYcyAKL0jx7KyeCefEBVFhH8="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libX11 + libXft + libXrandr + ]; + + preBuild = '' + cd src + ''; + + installFlags = [ "prefix=$(out)" ]; + + meta = with lib; { + homepage = "https://www.uninformativ.de/git/katriawm/file/README.html"; + description = "A non-reparenting, dynamic window manager with decorations"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + inherit (libX11.meta) platforms; + }; +}) diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/applications/window-managers/labwc/default.nix index ba145b85286f..adf3facb99b2 100644 --- a/pkgs/applications/window-managers/labwc/default.nix +++ b/pkgs/applications/window-managers/labwc/default.nix @@ -15,19 +15,23 @@ , scdoc , wayland , wayland-protocols -, wlroots +, wlroots_0_16 +, xcbutilwm , xwayland }: -stdenv.mkDerivation rec { +let + wlroots = wlroots_0_16; +in +stdenv.mkDerivation (self: { pname = "labwc"; - version = "0.5.3"; + version = "0.6.1"; src = fetchFromGitHub { owner = "labwc"; - repo = pname; - rev = version; - hash = "sha256-YD2bGxa7uss6KRvOGM0kn8dM+277ubaYeOB7ugRZCcY="; + repo = "labwc"; + rev = self.version; + hash = "sha256-PfvtNbSAz1vt0+ko4zRPyRRN+lhQoA2kJ2xoJy5o4So="; }; nativeBuildInputs = [ @@ -49,16 +53,20 @@ stdenv.mkDerivation rec { wayland wayland-protocols wlroots + xcbutilwm xwayland ]; - mesonFlags = [ "-Dxwayland=enabled" ]; + mesonFlags = [ + (lib.mesonEnable "xwayland" true) + ]; meta = with lib; { homepage = "https://github.com/labwc/labwc"; description = "A Wayland stacking compositor, similar to Openbox"; + changelog = "https://raw.githubusercontent.com/labwc/labwc/${self.version}/NEWS.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; }; -} +}) diff --git a/pkgs/applications/window-managers/leftwm/0001-patch-version.patch b/pkgs/applications/window-managers/leftwm/0001-patch-version.patch new file mode 100644 index 000000000000..8c28f0c22abe --- /dev/null +++ b/pkgs/applications/window-managers/leftwm/0001-patch-version.patch @@ -0,0 +1,22 @@ +diff --git a/Cargo.lock b/Cargo.lock +index ac3125a..c02b11d 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -431,7 +431,7 @@ dependencies = [ + + [[package]] + name = "leftwm" +-version = "0.4.0" ++version = "0.4.1" + dependencies = [ + "anyhow", + "clap", +@@ -467,7 +467,7 @@ dependencies = [ + + [[package]] + name = "leftwm-core" +-version = "0.4.0" ++version = "0.4.1" + dependencies = [ + "dirs-next", + "futures", diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index fe3e46f7b47a..70d7476432a2 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -6,16 +6,20 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; rev = version; - sha256 = "sha256-4f9YOVkOXn7+TzTUZS2Lultgj9WhiOPUa/fHUeyLBUU="; + sha256 = "sha256-ZAlX8Vu4JAwQlwBOHT435Bz3g3qqK5ePm9v0cDqP8Q4="; }; - cargoSha256 = "sha256-D00IFTELRlqeKQ7zheJKTvu5FBgYQXsZ+OnPnVzweC4="; + cargoSha256 = "sha256-nn/P9ZZNf1Zts4JiJ2kXWAAG/HT1GnlYHXcPijYiBlU="; + + cargoPatches = [ + ./0001-patch-version.patch + ]; buildInputs = rpathLibs; @@ -33,7 +37,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/leftwm/leftwm"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ yanganto ]; changelog = "https://github.com/leftwm/leftwm/blob/${version}/CHANGELOG"; }; } diff --git a/pkgs/applications/window-managers/maui-shell/default.nix b/pkgs/applications/window-managers/maui-shell/default.nix new file mode 100644 index 000000000000..e1abf6676b50 --- /dev/null +++ b/pkgs/applications/window-managers/maui-shell/default.nix @@ -0,0 +1,87 @@ +{ lib +, pkgs +, mkDerivation +, fetchFromGitHub +, qtquickcontrols2 +, cmake +, extra-cmake-modules +, kio +, krunner +, prison +, knotifyconfig +, kidletime +, kpeople +, kdesu +, kactivities-stats +, ktexteditor +, kinit +, kunitconversion +, kitemmodels +, phonon +, polkit-qt +, polkit +, mauikit +, mauikit-filebrowsing +, bluedevil +, plasma-nm +, plasma-pa +, bluez-qt +, maui-core +, cask-server +, mauiman +, mauikit-calendar +, qtmultimedia +}: + +mkDerivation rec { + pname = "maui-shell"; + version = "0.5.6"; + + src = fetchFromGitHub { + owner = "Nitrux"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-lhTtIHE+FUgZFaPYoIRgLPrBUPISeXHCg3rn0FlQg7w="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + bluedevil + bluez-qt + cask-server + kactivities-stats + kdesu + kidletime + kinit + kitemmodels + knotifyconfig + krunner + kunitconversion + kpeople + ktexteditor + mauikit + mauikit-calendar + mauikit-filebrowsing + mauiman + maui-core + phonon + plasma-nm + plasma-pa + polkit + polkit-qt + prison + qtmultimedia + qtquickcontrols2 + ]; + + meta = with lib; { + description = "A convergent shell for desktops, tablets, and phones"; + homepage = "https://github.com/Nitrux/maui-shell"; + license = licenses.lgpl3; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix new file mode 100644 index 000000000000..a7048e83dae0 --- /dev/null +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -0,0 +1,80 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, nixosTests +, cmake +, pkg-config +, mir +, libxkbcommon +}: + +stdenv.mkDerivation rec { + pname = "miriway"; + version = "unstable-2022-12-18"; + + src = fetchFromGitHub { + owner = "Miriway"; + repo = "Miriway"; + rev = "d294c303cb99b7becb0d6686be9a09f0a1f57596"; + hash = "sha256-H+IZgI1IQxNl5yAygbDKXkyXajGHV/mp9gEqZcp0TeE="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "\''${CMAKE_INSTALL_PREFIX}/bin" "\''${CMAKE_INSTALL_BINDIR}" \ + --replace "/usr/share" "\''${CMAKE_INSTALL_DATADIR}" \ + --replace "/etc" "\''${CMAKE_INSTALL_SYSCONFDIR}" + + sed -i -e '/project(/a include(GNUInstallDirs)' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + mir + libxkbcommon + ]; + + passthru = { + updateScript = unstableGitUpdater { }; + providedSessions = [ "miriway" ]; + tests = { + inherit (nixosTests) miriway; + }; + }; + + meta = with lib; { + description = "Mir based Wayland compositor"; + longDescription = '' + Miriway is a starting point for creating a Wayland based desktop environment using Mir. + + At the core of Miriway is miriway-shell, a Mir based Wayland compositor that provides: + + - A "floating windows" window managament policy; + - Support for Wayland (and via Xwayland) X11 applications; + - Dynamic workspaces; + - Additional Wayland support for "shell components" such as panels and docs; and, + - Configurable shortcuts for launching standard apps such as launcher and terminal emulator. + + In addition to miriway-shell, Miriway has: + + - A "terminal emulator finder" script miriway-terminal, that works with most terminal emulators; + - A launch script miriway to simplify starting Miriway; + - A default configuration file miriway-shell.config; and, + - A greeter configuration miriway.desktop so Miriway can be selected at login + + Miriway has been tested with shell components from several desktop environments and there are notes on + enabling these in miriway-shell.config. + ''; + homepage = "https://github.com/Miriway/Miriway"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ OPNA2608 ]; + }; +} diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index 4e546c067155..d4ae41134ebc 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { sha256 = "14swd0yqci8lxn259fkd9w92bgyf4rmjwgvgyqp78wlfix6ai4mv"; }; + # error: 'PATH_MAX' undeclared + postPatch = '' + sed 1i'#include ' -i mod_notionflux/notionflux/notionflux.c + ''; + nativeBuildInputs = [ pkg-config makeWrapper groff ]; buildInputs = [ lua gettext which readline fontconfig libX11 libXext libSM libXinerama libXrandr libXft ]; diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix index 6f1a37f9379a..f2d0e1d484d7 100644 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ b/pkgs/applications/window-managers/pekwm/default.nix @@ -16,15 +16,15 @@ , pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "pekwm"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "pekdon"; repo = "pekwm"; - rev = "release-${version}"; - hash= "sha256-voHPstdcd4CHnAdD3PMxca0A6MyMYJi8Ik0UlFB0vG0="; + rev = "release-${self.version}"; + hash= "sha256-hA+TBAs9NMcc5DKIkzyUHWck3Xht+yeCO54xJ6oXXuQ="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libpng ]; - meta = with lib; { + meta = { homepage = "https://www.pekwm.se/"; description = "A lightweight window manager"; longDescription = '' @@ -65,8 +65,9 @@ stdenv.mkDerivation rec { they should when starting applications. - Chainable Keygrabber, usability for everyone. ''; - license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + changelog = "https://raw.githubusercontent.com/pekwm/pekwm/release-${self.version}/NEWS.md"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index d71ff01362d2..5b4480499d95 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -1,18 +1,21 @@ { lib , stdenv , fetchFromGitLab +, gitUpdater , meson , ninja , pkg-config , python3 , wrapGAppsHook +, libadwaita , libhandy , libxkbcommon , libgudev , callaudiod , pulseaudio +, evince , glib -, gtk3 +, gtk4 , gnome , gnome-desktop , gcr @@ -33,7 +36,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.21.1"; + version = "0.23.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -42,10 +45,11 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-I0BWwEKvOYQ1s2IpvV70GWxhARdX6AZ+B4ypnTlLlDw="; + sha256 = "sha256-EMPqBKrtlwI9SJlqZjyAN5CtV4/BNwc5LapfeCEIYxc="; }; nativeBuildInputs = [ + libadwaita meson ninja pkg-config @@ -54,6 +58,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + evince phoc libhandy libsecret @@ -69,7 +74,7 @@ stdenv.mkDerivation rec { gnome.gnome-control-center gnome-desktop gnome.gnome-session - gtk3 + gtk4 pam systemd upower @@ -77,7 +82,7 @@ stdenv.mkDerivation rec { feedbackd ]; - checkInputs = [ + nativeCheckInputs = [ dbus xvfb-run ]; @@ -101,7 +106,7 @@ stdenv.mkDerivation rec { runHook preCheck export NO_AT_BRIDGE=1 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs runHook postCheck ''; @@ -125,11 +130,16 @@ stdenv.mkDerivation rec { ]; tests.phosh = nixosTests.phosh; + + updateScript = gitUpdater { + rev-prefix = "v"; + }; }; meta = with lib; { description = "A pure Wayland shell prototype for GNOME on mobile devices"; homepage = "https://gitlab.gnome.org/World/Phosh/phosh"; + changelog = "https://gitlab.gnome.org/World/Phosh/phosh/-/blob/v${version}/debian/changelog"; license = licenses.gpl3Plus; maintainers = with maintainers; [ masipcat zhaofengli ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix new file mode 100644 index 000000000000..c09df0065ef4 --- /dev/null +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchFromGitLab +, gitUpdater +, meson +, ninja +, pkg-config +, wrapGAppsHook +, desktop-file-utils +, feedbackd +, gtk4 +, libadwaita +, lm_sensors +, phoc +, phosh +, wayland-protocols +}: + +stdenv.mkDerivation rec { + pname = "phosh-mobile-settings"; + version = "0.23.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "guidog"; + repo = "phosh-mobile-settings"; + rev = "v${version}"; + sha256 = "sha256-D605efn25Dl3Bj92DZiagcx+MMcRz0GRaWxplBRcZhA="; + }; + + nativeBuildInputs = [ + meson + ninja + phosh + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + desktop-file-utils + feedbackd + gtk4 + libadwaita + lm_sensors + phoc + wayland-protocols + ]; + + postInstall = '' + # this is optional, but without it phosh-mobile-settings won't know about lock screen plugins + ln -s '${phosh}/lib/phosh' "$out/lib/phosh" + + # .desktop files marked `OnlyShowIn=Phosh;` aren't displayed even in our phosh, so remove that. + # also make the Exec path absolute. + substituteInPlace "$out/share/applications/org.sigxcpu.MobileSettings.desktop" \ + --replace 'OnlyShowIn=Phosh;' "" \ + --replace 'Exec=phosh-mobile-settings' "Exec=$out/bin/phosh-mobile-settings" + ''; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + + meta = with lib; { + description = "A settings app for mobile specific things"; + homepage = "https://gitlab.gnome.org/guidog/phosh-mobile-settings"; + changelog = "https://gitlab.gnome.org/guidog/phosh-mobile-settings/-/blob/v${version}/debian/changelog"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ colinsane ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index 86329782255d..ddcab1095719 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 = "10"; + version = "10.2"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${version}"; - sha256 = "sha256-ACQBgAYtJ4OOQIismNYJB3z426GmlyUtXXbH06eRsgg="; + hash = "sha256-C+icJXTkE+XMaU7N6JupsP8xhmRVggX9hY1P7za0pO0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/window-managers/picom/picom-jonaburg.nix b/pkgs/applications/window-managers/picom/picom-jonaburg.nix index 9b018a281377..2c08a355dde8 100644 --- a/pkgs/applications/window-managers/picom/picom-jonaburg.nix +++ b/pkgs/applications/window-managers/picom/picom-jonaburg.nix @@ -13,6 +13,6 @@ picom.overrideAttrs (oldAttrs: rec { meta = with lib; { description = "A fork of picom featuring animations and improved rounded corners."; homepage = "https://github.com/jonaburg/picom"; - maintainers = with maintainers; oldAttrs.meta.maintainers ++ [ quasigod-io ]; + maintainers = with maintainers; oldAttrs.meta.maintainers ++ [ michaelBelsanti ]; }; }) diff --git a/pkgs/applications/window-managers/picom/picom-next.nix b/pkgs/applications/window-managers/picom/picom-next.nix index c89eb9e7cab3..378897435548 100644 --- a/pkgs/applications/window-managers/picom/picom-next.nix +++ b/pkgs/applications/window-managers/picom/picom-next.nix @@ -1,13 +1,14 @@ -{ picom, lib, fetchFromGitHub }: +{ pcre, pcre2, picom, lib, fetchFromGitHub }: picom.overrideAttrs (oldAttrs: rec { pname = "picom-next"; - version = "unstable-2022-09-29"; + version = "unstable-2022-12-23"; + buildInputs = [ pcre2 ] ++ lib.remove pcre oldAttrs.buildInputs; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; - rev = "0fe4e0a1d4e2c77efac632b15f9a911e47fbadf3"; - sha256 = "1slcmayja8cszapxzs83xl1i9n9q0dz79cn5gzzf4mfcwvnxp8km"; + rev = "60ac2b64db78363fe04189cc734daea3d721d87e"; + sha256 = "09s8kgczks01xbvg3qxqi2rz3lkzgdfyvhrj30mg6n11b6xfgi0d"; }; meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ]; }) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index b1f80d102d2a..e86af9dad573 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -7,7 +7,7 @@ , scdoc , xwayland , wayland-protocols -, wlroots +, wlroots_0_16 , libxkbcommon , pixman , udev @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "river"; - version = "0.1.3"; + version = "0.2.3"; src = fetchFromGitHub { owner = "riverwm"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-bHfHhyDx/Wzhvhr7mAeVzJf0TBJgMTGb/ClGjWMLlQ8="; + rev = "refs/tags/v${version}"; + hash = "sha256-noZ2vo4J0cG3PN2k+2LzMc5WMtj0FEmMttE9obFH/tM="; fetchSubmodules = true; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland-protocols - wlroots + wlroots_0_16 libxkbcommon pixman udev @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall zig build -Drelease-safe -Dcpu=baseline ${lib.optionalString xwaylandSupport "-Dxwayland"} -Dman-pages --prefix $out install + install contrib/river.desktop -Dt $out/share/wayland-sessions runHook postInstall ''; @@ -61,11 +62,14 @@ stdenv.mkDerivation rec { */ installFlags = [ "DESTDIR=$(out)" ]; + passthru.providedSessions = ["river"]; + meta = with lib; { + changelog = "https://github.com/ifreund/river/releases/tag/v${version}"; homepage = "https://github.com/ifreund/river"; description = "A dynamic tiling wayland compositor"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ fortuneteller2k adamcstephens rodrgz ]; }; } diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index ef001787a596..51f3b0012a40 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -5,7 +5,6 @@ , gdk-pixbuf-xlib , gettext , gtk2 -, imlib , libICE , libSM , libxcrypt @@ -42,7 +41,6 @@ stdenv.mkDerivation rec { buildInputs = [ gdk-pixbuf-xlib gtk2 - imlib libICE libSM libxcrypt diff --git a/pkgs/applications/window-managers/sommelier/default.nix b/pkgs/applications/window-managers/sommelier/default.nix index 0528553b1894..4df306eec9c0 100644 --- a/pkgs/applications/window-managers/sommelier/default.nix +++ b/pkgs/applications/window-managers/sommelier/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ libxkbcommon mesa pixman wayland xorg.libxcb ]; doCheck = true; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; postInstall = '' rm $out/bin/sommelier_test # why does it install the test binary? o_O diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix index 218b2a4fefd2..5cd0f7569caa 100644 --- a/pkgs/applications/window-managers/stalonetray/default.nix +++ b/pkgs/applications/window-managers/stalonetray/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "stalonetray"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "kolbusa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-grxPqSYPLUstLIOKqzMActaSQ2ftYrjbalfR4HcPDRY="; + sha256 = "sha256-/55oP6xA1LeLawOBkhh9acaDcObO4L4ojcy7e3vwnBw="; }; preConfigure = diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix index 7ef4a7d1f6ad..fe63f661c29b 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.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaybg"; rev = "v${version}"; - hash = "sha256-Lt/hn/K+CjcmU3Bs5wChiZq0VGNcraH4tSVYsmYnKjc="; + hash = "sha256-Qk5iGALlSVSzgBJzYzyLdLHhj/Zq1R4nFseACBmIBuA="; }; strictDeps = true; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 61925e4ed0be..6cfc55240222 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,14 +1,13 @@ { lib, stdenv, fetchFromGitHub, substituteAll, swaybg , meson, ninja, pkg-config, wayland-scanner, scdoc -, wayland, libxkbcommon, pcre, json_c, libevdev +, wayland, libxkbcommon, pcre2, json_c, libevdev , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg -, wlroots, wayland-protocols, libdrm +, wlroots_0_16, wayland-protocols, libdrm , nixosTests # Used by the NixOS module: , isNixOS ? false - -, enableXWayland ? true -, systemdSupport ? stdenv.isLinux +, enableXWayland ? true, xorg +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , dbusSupport ? true , dbus , trayEnabled ? systemdSupport && dbusSupport @@ -23,13 +22,13 @@ let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in stdenv.mkDerivation rec { pname = "sway-unwrapped"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "0ss3l258blyf2d0lwd7pi7ga1fxfj8pxhag058k7cmjhs3y30y5l"; + hash = "sha256-r5qf50YK0Wl0gFiFdSE/J6ZU+D/Cz32u1mKzOqnIuJ0="; }; patches = [ @@ -59,12 +58,14 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - wayland libxkbcommon pcre json_c libevdev + wayland libxkbcommon pcre2 json_c libevdev pango cairo libinput libcap pam gdk-pixbuf librsvg wayland-protocols libdrm - (wlroots.override { inherit enableXWayland; }) + (wlroots_0_16.override { inherit enableXWayland; }) ] ++ lib.optionals dbusSupport [ dbus + ] ++ lib.optionals enableXWayland [ + xorg.xcbutilwm ]; mesonFlags = diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index 97e3febc7b94..b410919022f1 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -1,18 +1,18 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, scdoc, wayland-scanner , wayland, wayland-protocols, runtimeShell -, systemdSupport ? stdenv.isLinux, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: stdenv.mkDerivation rec { pname = "swayidle"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "swayidle"; rev = version; - sha256 = "06iq12p4438d6bv3jlqsf01wjaxrzlnj1bnicn41kad563aq41xl"; + sha256 = "sha256-/U6Y9H5ZqIJph3TZVcwr9+Qfd6NZNYComXuC1D9uGHg="; }; strictDeps = true; @@ -22,11 +22,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=${if systemdSupport then "enabled" else "disabled"}" ]; - # Remove the `%zu` patch for the next release after 1.7.1. - # https://github.com/swaywm/swayidle/commit/e81d40fca7533f73319e76e42fa9694b21cc9e6e postPatch = '' substituteInPlace main.c \ - --replace '%lu' '%zu' \ --replace '"sh"' '"${runtimeShell}"' ''; diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix index b3bb8f772f7a..c3058294ca55 100644 --- a/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/pkgs/applications/window-managers/sway/lock-effects.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "swaylock-effects"; - version = "unstable-2021-10-21"; + version = "1.6.11"; src = fetchFromGitHub { - owner = "mortie"; + owner = "jirutka"; repo = "swaylock-effects"; - rev = "a8fc557b86e70f2f7a30ca9ff9b3124f89e7f204"; - sha256 = "sha256-GN+cxzC11Dk1nN9wVWIyv+rCrg4yaHnCePRYS1c4JTk="; + rev = "v${version}"; + sha256 = "sha256-MKmWVYssO9HAcP5uqwpy9kDa6/kfZyV2NI7ibozt7Ug="; }; postPatch = '' @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ gnxlxnxx ma27 ]; + maintainers = with maintainers; [ gnxlxnxx ]; }; } diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 970fdfe371fe..30e43fa0c902 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -5,24 +5,15 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; rev = version; - sha256 = "sha256-VVGgidmSQWKxZNx9Cd6z52apxpxVfmX3Ut/G9kzfDcY="; + hash = "sha256-xbcVsnE0DecC+g49NOBNpqPl5JTtuxUUc7KinKhi5TE="; }; - patches = [ - # remove once when updating to 1.7 - # https://github.com/swaywm/swaylock/pull/235 - (fetchpatch { - url = "https://github.com/swaywm/swaylock/commit/5a1e6ad79aa7d79b32d36cda39400f3e889b8f8f.diff"; - sha256 = "sha256-ZcZVImUzvng7sluC6q2B5UL8sVunLe4PIfc+tyw48RQ="; - }) - ]; - strictDeps = true; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; diff --git a/pkgs/applications/window-managers/sway/swaycons.nix b/pkgs/applications/window-managers/sway/swaycons.nix new file mode 100644 index 000000000000..c990a2bb5186 --- /dev/null +++ b/pkgs/applications/window-managers/sway/swaycons.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "swaycons"; + version = "unstable-2023-01-05"; + + src = fetchFromGitHub { + owner = "ActuallyAllie"; + repo = "swaycons"; + rev = "e863599fb56177fc9747d60db661be2d7c2d290b"; + hash = "sha256-zkCpZ3TehFKNePtSyFaEk+MA4mi1+la9yFjRPFy+eq8="; + }; + + cargoSha256 = "sha256-GcoRx52dwL/ehJ1Xg6xQHVzPIKXWqBrG7IjzxRjfgqA="; + + meta = with lib; { + description = "Window Icons in Sway with Nerd Fonts!"; + homepage = "https://github.com/ActuallyAllie/swaycons"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ aacebedo ]; + }; +} diff --git a/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix b/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix index 1aa3dace7852..36cfdcfaed33 100644 --- a/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix +++ b/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "swayest-workstyle"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "Lyr-7D1h"; repo = "swayest_workstyle"; rev = version; - sha256 = "sha256-LciTrYbmJV0y0H6QH88vTBXbDdDSx6FQtO4J/CFLjtY="; + sha256 = "sha256-C2Nz6fBwaj+cOxIfoBu+9T+CoJ5Spc1TAJcQWdIF/+I="; }; - cargoSha256 = "sha256-34Ij3Hd1JI6d1vhv1XomFc9SFoB/6pbS39upLk+NeQM="; + cargoHash = "sha256-6pAlJmpyv2a1XCZQLOYilxJAGPbPmkEz1ynTLa0RjE0="; doCheck = false; # No tests diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix deleted file mode 100644 index 427f4c92f7bd..000000000000 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, asciidoc, libxcb, xcbutil, xcbutilkeysyms -, xcbutilwm -}: - -stdenv.mkDerivation rec { - pname = "sxhkd"; - version = "0.6.2"; - - src = fetchFromGitHub { - owner = "baskerville"; - repo = "sxhkd"; - rev = version; - sha256 = "1winwzdy9yxvxnrv8gqpigl9y0c2px27mnms62bdilp4x6llrs9r"; - }; - - buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = with lib; { - description = "Simple X hotkey daemon"; - homepage = "https://github.com/baskerville/sxhkd"; - license = licenses.bsd2; - maintainers = with maintainers; [ vyp ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index e1a8c8f3dd24..b0b40afc9e4c 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses glib libviper libpseudo gpm libvterm ]; meta = with lib; { - homepage = "http://vwm.sourceforge.net/"; + homepage = "https://vwm.sourceforge.net/"; description = "Dynamic window manager for the console"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 177e185d8273..fb57c0a73c2a 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -2,7 +2,7 @@ , meson, ninja, pkg-config, python3, wayland-scanner , cairo, colord, dbus, lcms2, libGL, libXcursor, libdrm, libevdev, libinput , libjpeg, seatd, libxcb, libxkbcommon, mesa, mtdev, pam, udev, wayland -, wayland-protocols, xlibsWrapper +, wayland-protocols , pipewire ? null, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null , libva ? null, libwebp ? null, xwayland ? null # beware of null defaults, as the parameters *are* supplied by callPackage by default @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo colord dbus freerdp lcms2 libGL libXcursor libdrm libevdev libinput libjpeg seatd libunwind libva libwebp libxcb libxkbcommon mesa mtdev pam - pango pipewire udev vaapi wayland wayland-protocols xlibsWrapper + pango pipewire udev vaapi wayland wayland-protocols ]; mesonFlags= [ diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 9fe9aa457987..fed0f6cb3441 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -22,13 +22,14 @@ let unwrapped = Agda; tests = { inherit (nixosTests) agda; }; }; + inherit (Agda) meta; } '' mkdir -p $out/bin makeWrapper ${Agda}/bin/agda $out/bin/agda \ --add-flags "--with-compiler=${ghc}/bin/ghc" \ --add-flags "--library-file=${library-file}" \ --add-flags "--local-interfaces" - makeWrapper ${Agda}/bin/agda-mode $out/bin/agda-mode + ln -s ${Agda}/bin/agda-mode $out/bin/agda-mode ''; # Local interfaces has been added for now: See https://github.com/agda/agda/issues/4526 withPackages = arg: if builtins.isAttrs arg then withPackages' arg else withPackages' { pkgs = arg; }; diff --git a/pkgs/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh index 4ff6802e6453..b91d13c4a235 100755 --- a/pkgs/build-support/appimage/appimage-exec.sh +++ b/pkgs/build-support/appimage/appimage-exec.sh @@ -7,6 +7,9 @@ fi PATH="@path@:$PATH" apprun_opt=true +OWD=$(readlink -f .) +# can be read by appimages: https://docs.appimage.org/packaging-guide/environment-variables.html +export OWD # src : AppImage # dest : let's unpack() create the directory diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 6d4dbfbe421b..bcda40c800fa 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -61,6 +61,14 @@ rec { (args // { inherit name extraPkgs; src = extract { inherit name src; }; + + # passthru src to make nix-update work + # hack to keep the origin position (unsafeGetAttrPos) + passthru = lib.pipe args [ + lib.attrNames + (lib.remove "src") + (removeAttrs args) + ] // args.passthru or { }; }); defaultFhsEnvArgs = { @@ -71,7 +79,6 @@ rec { gtk3 bashInteractive gnome.zenity - python2 xorg.xrandr which perl diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index b54983986dbe..45ae3eba9b44 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -25,9 +25,11 @@ , nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , propagateDoc ? bintools != null && bintools ? man , extraPackages ? [], extraBuildCommands ? "" +, isGNU ? bintools.isGNU or false, isLLVM ? bintools.isLLVM or false , buildPackages ? {} , targetPackages ? {} , useMacosReexportHack ? false +, wrapGas ? false # Darwin code signing support utilities , postLinkSignHook ? null, signingUtils ? null @@ -55,9 +57,9 @@ let bintoolsVersion = lib.getVersion bintools; bintoolsName = lib.removePrefix targetPrefix (lib.getName bintools); - libc_bin = if libc == null then null else getBin libc; - libc_dev = if libc == null then null else getDev libc; - libc_lib = if libc == null then null else getLib libc; + libc_bin = if libc == null then "" else getBin libc; + libc_dev = if libc == null then "" else getDev libc; + libc_lib = if libc == null then "" else getLib libc; bintools_bin = if nativeTools then "" else getBin bintools; # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = if nativeTools then "" else getBin coreutils; @@ -68,7 +70,7 @@ let # The dynamic linker has different names on different platforms. This is a # shell glob that ought to match it. dynamicLinker = - /**/ if sharedLibraryLoader == null then null + /**/ if sharedLibraryLoader == null then "" else if targetPlatform.libc == "musl" then "${sharedLibraryLoader}/lib/ld-musl-*" else if targetPlatform.libc == "uclibc" then "${sharedLibraryLoader}/lib/ld*-uClibc.so.1" else if (targetPlatform.libc == "bionic" && targetPlatform.is32bit) then "/system/bin/linker" @@ -87,7 +89,7 @@ let else if targetPlatform.isDarwin then "/usr/lib/dyld" else if targetPlatform.isFreeBSD then "/libexec/ld-elf.so.1" else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" - else null; + else ""; expand-response-params = if buildPackages ? stdenv && buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null" @@ -103,16 +105,11 @@ stdenv.mkDerivation { preferLocalBuild = true; - inherit bintools_bin libc_bin libc_dev libc_lib coreutils_bin; - shell = getBin shell + shell.shellPath or ""; - gnugrep_bin = if nativeTools then "" else gnugrep; - - inherit targetPrefix suffixSalt; - outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (bintools ? info) "info"); passthru = { - inherit bintools libc nativeTools nativeLibc nativePrefix; + inherit targetPrefix suffixSalt; + inherit bintools libc nativeTools nativeLibc nativePrefix isGNU isLLVM; emacsBufferSetup = pkgs: '' ; We should handle propagation here too @@ -165,9 +162,22 @@ stdenv.mkDerivation { wrap ld-solaris ${./ld-solaris-wrapper.sh} '') + # If we are asked to wrap `gas` and this bintools has it, + # then symlink it (`as` will be symlinked next). + # This is mainly for the wrapped gnatboot on x86-64 Darwin, + # as it must have both the GNU assembler from cctools (installed as `gas`) + # and the Clang integrated assembler (installed as `as`). + # See pkgs/os-specific/darwin/binutils/default.nix for details. + + lib.optionalString wrapGas '' + if [ -e $ldPath/${targetPrefix}gas ]; then + ln -s $ldPath/${targetPrefix}gas $out/bin/${targetPrefix}gas + fi + '' + # Create symlinks for rest of the binaries. + '' - for binary in objdump objcopy size strings as ar nm gprof dwp c++filt addr2line ranlib readelf elfedit; do + for binary in objdump objcopy size strings as ar nm gprof dwp c++filt addr2line \ + ranlib readelf elfedit dlltool dllwrap windmc windres; do if [ -e $ldPath/${targetPrefix}''${binary} ]; then ln -s $ldPath/${targetPrefix}''${binary} $out/bin/${targetPrefix}''${binary} fi @@ -192,8 +202,6 @@ stdenv.mkDerivation { strictDeps = true; depsTargetTargetPropagated = extraPackages; - wrapperName = "BINTOOLS_WRAPPER"; - setupHooks = [ ../setup-hooks/role.bash ./setup-hook.sh @@ -365,10 +373,15 @@ stdenv.mkDerivation { ## + extraBuildCommands; - inherit dynamicLinker; - - # for substitution in utils.bash - expandResponseParams = "${expand-response-params}/bin/expand-response-params"; + env = { + # for substitution in utils.bash + expandResponseParams = "${expand-response-params}/bin/expand-response-params"; + shell = getBin shell + shell.shellPath or ""; + gnugrep_bin = if nativeTools then "" else gnugrep; + wrapperName = "BINTOOLS_WRAPPER"; + inherit dynamicLinker targetPrefix suffixSalt coreutils_bin; + inherit bintools_bin libc_bin libc_dev libc_lib; + }; meta = let bintools_ = if bintools != null then bintools else {}; in diff --git a/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash index 71b9471cbc83..255071adf681 100644 --- a/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash +++ b/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash @@ -136,7 +136,7 @@ while (( "${#norm[@]}" )); do norm=("${norm[@]:1}") else echo "ld-wrapper: Internal Error: Invalid normalized argument" >&2 - exit -1 + exit 255 fi ;; esac diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 14f7ac38d3ff..d1cd502e7e4b 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -1,16 +1,11 @@ { stdenv -, bazel , cacert , lib }: -let - bazelPkg = bazel; -in - args@{ name ? "${args.pname}-${args.version}" -, bazel ? bazelPkg +, bazel , bazelFlags ? [] , bazelBuildFlags ? [] , bazelTestFlags ? [] diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index d30a073d2fb9..389447e066fa 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, php, autoreconfHook, fetchurl, re2c }: +{ stdenv, lib, php, autoreconfHook, fetchurl, re2c, nix-update-script }: { pname , version @@ -12,6 +12,7 @@ url = "https://pecl.php.net/get/${pname}-${version}.tgz"; inherit (args) sha256; } +, passthru ? { } , ... }@args: @@ -34,4 +35,12 @@ stdenv.mkDerivation (args // { internalDeps} ''; checkPhase = "NO_INTERACTON=yes make test"; + + passthru = passthru // { + # Thes flags were introduced for `nix-update` so that it can update + # PHP extensions correctly. + # See the corresponding PR: https://github.com/Mic92/nix-update/pull/123 + isPhpExtension = true; + updateScript = nix-update-script {}; + }; }) diff --git a/pkgs/build-support/cc-wrapper/add-gnat-extra-flags.sh b/pkgs/build-support/cc-wrapper/add-gnat-extra-flags.sh new file mode 100644 index 000000000000..ceff1e4a4c4a --- /dev/null +++ b/pkgs/build-support/cc-wrapper/add-gnat-extra-flags.sh @@ -0,0 +1,23 @@ +# See add-flags.sh in cc-wrapper for comments. +var_templates_list=( + NIX_GNATMAKE_CARGS +) + +accumulateRoles + +for var in "${var_templates_list[@]}"; do + mangleVarList "$var" ${role_suffixes[@]+"${role_suffixes[@]}"} +done + +# `-B@out@/bin' forces cc to use wrapped as instead of the system one. +NIX_GNATMAKE_CARGS_@suffixSalt@="$NIX_GNATMAKE_CARGS_@suffixSalt@ -B@out@/bin/" + +# Only add darwin min version flag if a default darwin min version is set, +# which is a signal that we're targetting darwin. +if [ "@darwinMinVersion@" ]; then + mangleVarSingle @darwinMinVersionVariable@ ${role_suffixes[@]+"${role_suffixes[@]}"} + + NIX_GNATMAKE_CARGS_@suffixSalt@="-m@darwinPlatformForCC@-version-min=${@darwinMinVersionVariable@_@suffixSalt@:-@darwinMinVersion@} $NIX_GNATMAKE_CARGS_@suffixSalt@" +fi + +export NIX_GNAT_WRAPPER_EXTRA_FLAGS_SET_@suffixSalt@=1 diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 14cd1d431391..33df804d5efe 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -42,9 +42,9 @@ let ccVersion = lib.getVersion cc; ccName = lib.removePrefix targetPrefix (lib.getName cc); - libc_bin = if libc == null then null else getBin libc; - libc_dev = if libc == null then null else getDev libc; - libc_lib = if libc == null then null else getLib libc; + libc_bin = if libc == null then "" else getBin libc; + libc_dev = if libc == null then "" else getDev libc; + libc_lib = if libc == null then "" else getLib libc; cc_solib = getLib cc + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"; @@ -73,6 +73,7 @@ let # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu isGccArchSupported = arch: + if targetPlatform.isPower then false else # powerpc does not allow -march= if isGNU then { # Intel skylake = versionAtLeast ccVersion "6.0"; @@ -131,22 +132,16 @@ stdenv.mkDerivation { preferLocalBuild = true; - inherit cc libc_bin libc_dev libc_lib bintools coreutils_bin; - shell = getBin shell + shell.shellPath or ""; - gnugrep_bin = if nativeTools then "" else gnugrep; - - inherit targetPrefix suffixSalt; - inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable; - outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ]; passthru = { + inherit targetPrefix suffixSalt; # "cc" is the generic name for a C compiler, but there is no one for package # providing the linker and related tools. The two we use now are GNU # Binutils, and Apple's "cctools"; "bintools" as an attempt to find an # unused middle-ground name that evokes both. inherit bintools; - inherit libc nativeTools nativeLibc nativePrefix isGNU isClang; + inherit cc libc nativeTools nativeLibc nativePrefix isGNU isClang; emacsBufferSetup = pkgs: '' ; We should handle propagation here too @@ -236,10 +231,15 @@ stdenv.mkDerivation { fi '' + # No need to wrap gnat, gnatkr, gnatname or gnatprep; we can just symlink them in + optionalString cc.langAda or false '' - wrap ${targetPrefix}gnatmake ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatmake - wrap ${targetPrefix}gnatbind ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatbind - wrap ${targetPrefix}gnatlink ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatlink + for cmd in gnatbind gnatchop gnatclean gnatlink gnatls gnatmake; do + wrap ${targetPrefix}$cmd ${./gnat-wrapper.sh} $ccPath/${targetPrefix}$cmd + done + + for cmd in gnat gnatkr gnatname gnatprep; do + ln -s $ccPath/${targetPrefix}$cmd $out/bin/${targetPrefix}$cmd + done # this symlink points to the unwrapped gnat's output "out". It is used by # our custom gprconfig compiler description to find GNAT's ada runtime. See @@ -264,14 +264,13 @@ stdenv.mkDerivation { + optionalString cc.langGo or false '' wrap ${targetPrefix}gccgo $wrapper $ccPath/${targetPrefix}gccgo + wrap ${targetPrefix}go ${./go-wrapper.sh} $ccPath/${targetPrefix}go ''; strictDeps = true; propagatedBuildInputs = [ bintools ] ++ extraTools ++ optionals cc.langD or false [ zlib ]; depsTargetTargetPropagated = optional (libcxx != null) libcxx ++ extraPackages; - wrapperName = "CC_WRAPPER"; - setupHooks = [ ../setup-hooks/role.bash ] ++ lib.optional (cc.langC or true) ./setup-hook.sh @@ -322,6 +321,11 @@ stdenv.mkDerivation { && !(stdenv.targetPlatform.useLLVM or false) && gccForLibs != null) '' echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags + + # Pull in 'cc.out' target to get 'libstdc++fs.a'. It should be in + # 'cc.lib'. But it's a gcc package bug. + # TODO(trofi): remove once gcc is fixed to move libraries to .lib output. + echo "-L${gccForLibs}/${optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"}/lib" >> $out/nix-support/cc-ldflags '' ## @@ -339,11 +343,18 @@ stdenv.mkDerivation { # compile, because it uses "#include_next " to find the # limits.h file in ../includes-fixed. To remedy the problem, # another -idirafter is necessary to add that directory again. + # + # We use --sysroot=/nix/store/does/not/exist to drop embedded default + # path to glibc headers gcc was built against. Without it -idirafter + # only appends to the list and outdated glibc headers end up being + # used. 'cc-cflags-before' is used to allow user's --sysroot= option + # to override our default. + optionalString (libc != null) ('' touch "$out/nix-support/libc-cflags" touch "$out/nix-support/libc-ldflags" echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-crt1-cflags '' + optionalString (!(cc.langD or false)) '' + echo "--sysroot=/nix/store/does/not/exist" >> $out/nix-support/cc-cflags-before echo "-idirafter ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags '' + optionalString (isGNU && (!(cc.langD or false))) '' for dir in "${cc}"/lib/gcc/*/*/include-fixed; do @@ -366,18 +377,18 @@ stdenv.mkDerivation { touch "$out/nix-support/libcxx-ldflags" '' + optionalString (libcxx == null && (useGccForLibs && gccForLibs.langCC or false)) '' - for dir in ${gccForLibs}/include/c++/*; do + for dir in ${gccForLibs}${lib.optionalString (hostPlatform != targetPlatform) "/${targetPlatform.config}"}/include/c++/*; do echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags done - for dir in ${gccForLibs}/include/c++/*/${targetPlatform.config}; do + for dir in ${gccForLibs}${lib.optionalString (hostPlatform != targetPlatform) "/${targetPlatform.config}"}/include/c++/*/${targetPlatform.config}; do echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags done '' - + optionalString (libcxx.isLLVM or false) ('' + + optionalString (libcxx.isLLVM or false) '' echo "-isystem ${lib.getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags - echo "-lc++abi" >> $out/nix-support/libcxx-ldflags - '') + echo "-l${libcxx.cxxabi.libName}" >> $out/nix-support/libcxx-ldflags + '' ## ## Initial CFLAGS @@ -441,8 +452,9 @@ stdenv.mkDerivation { echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before '' - # -mcpu is not very useful. You should use mtune and march - # instead. It’s provided here for backwards compatibility. + # -mcpu is not very useful, except on PowerPC where it is used + # instead of march. On all other platforms you should use mtune + # and march instead. # TODO: aarch64-darwin has mcpu incompatible with gcc + optionalString ((targetPlatform ? gcc.cpu) && (isClang || !(stdenv.isDarwin && stdenv.isAarch64))) '' echo "-mcpu=${targetPlatform.gcc.cpu}" >> $out/nix-support/cc-cflags-before @@ -519,6 +531,10 @@ stdenv.mkDerivation { substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash '' + + optionalString cc.langAda or false '' + substituteAll ${./add-gnat-extra-flags.sh} $out/nix-support/add-gnat-extra-flags.sh + '' + ## ## General Clang support ## Needs to go after ^ because the for loop eats \n and makes this file an invalid script @@ -538,8 +554,16 @@ stdenv.mkDerivation { nixSupport); - # for substitution in utils.bash - expandResponseParams = "${expand-response-params}/bin/expand-response-params"; + env = { + # for substitution in utils.bash + expandResponseParams = "${expand-response-params}/bin/expand-response-params"; + shell = getBin shell + shell.shellPath or ""; + gnugrep_bin = if nativeTools then "" else gnugrep; + wrapperName = "CC_WRAPPER"; + inherit suffixSalt coreutils_bin bintools cc; + inherit libc_bin libc_dev libc_lib; + inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable; + }; meta = let cc_ = if cc != null then cc else {}; in diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index 5714b228c595..e75eb3eb1ebf 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -29,6 +29,9 @@ if [ -z "${NIX_CC_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source @out@/nix-support/add-flags.sh fi +if [ -z "${NIX_GNAT_WRAPPER_EXTRA_FLAGS_SET_@suffixSalt@:-}" ]; then + source @out@/nix-support/add-gnat-extra-flags.sh +fi # Parse command line options and set several variables. # For instance, figure out if linker flags should be passed. @@ -124,20 +127,32 @@ if [ "$NIX_ENFORCE_NO_NATIVE_@suffixSalt@" = 1 ]; then params=(${rest+"${rest[@]}"}) fi -if [ "$(basename $0)x" = "gnatmakex" ]; then - extraBefore=("--GNATBIND=@out@/bin/gnatbind" "--GNATLINK=@out@/bin/gnatlink") - extraAfter=($NIX_GNATFLAGS_COMPILE_@suffixSalt@) -fi - -if [ "$(basename $0)x" = "gnatbindx" ]; then - extraBefore=() - extraAfter=($NIX_GNATFLAGS_COMPILE_@suffixSalt@) -fi - -if [ "$(basename $0)x" = "gnatlinkx" ]; then - extraBefore=() - extraAfter=("--GCC=@out@/bin/gcc") -fi +case "$(basename $0)x" in + "gnatbindx") + extraBefore=() + extraAfter=($NIX_GNATFLAGS_COMPILE_@suffixSalt@) + ;; + "gnatchopx") + extraBefore=("--GCC=@out@/bin/gcc") + extraAfter=() + ;; + "gnatcleanx") + extraBefore=($NIX_GNATFLAGS_COMPILE_@suffixSalt@) + extraAfter=() + ;; + "gnatlinkx") + extraBefore=() + extraAfter=("--GCC=@out@/bin/gcc") + ;; + "gnatlsx") + extraBefore=() + extraAfter=($NIX_GNATFLAGS_COMPILE_@suffixSalt@) + ;; + "gnatmakex") + extraBefore=("--GNATBIND=@out@/bin/gnatbind" "--GNATLINK=@out@/bin/gnatlink") + extraAfter=($NIX_GNATFLAGS_COMPILE_@suffixSalt@ -cargs $NIX_GNATMAKE_CARGS_@suffixSalt@) + ;; +esac # As a very special hack, if the arguments are just `-v', then don't # add anything. This is to prevent `gcc -v' (which normally prints diff --git a/pkgs/build-support/cc-wrapper/go-wrapper.sh b/pkgs/build-support/cc-wrapper/go-wrapper.sh new file mode 100644 index 000000000000..5dfc5d2b73fc --- /dev/null +++ b/pkgs/build-support/cc-wrapper/go-wrapper.sh @@ -0,0 +1,11 @@ +#! @shell@ +set -eu -o pipefail +o posix +shopt -s nullglob + +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + +export GCCGO="@out@/bin/gccgo" + +exec @prog@ "$@" diff --git a/pkgs/build-support/deterministic-uname/default.nix b/pkgs/build-support/deterministic-uname/default.nix new file mode 100644 index 000000000000..164136c937b9 --- /dev/null +++ b/pkgs/build-support/deterministic-uname/default.nix @@ -0,0 +1,54 @@ +# expr and script based on our lsb_release +{ stdenv +, lib +, substituteAll +, coreutils +, getopt +, modDirVersion ? "" +}: + +substituteAll { + name = "uname"; + + src = ./deterministic-uname.sh; + + dir = "bin"; + isExecutable = true; + + inherit coreutils getopt; + + uSystem = if stdenv.buildPlatform.uname.system != null then stdenv.buildPlatform.uname.system else "unknown"; + inherit (stdenv.buildPlatform.uname) processor; + + # uname -o + # maybe add to lib/systems/default.nix uname attrset + # https://github.com/coreutils/coreutils/blob/7fc84d1c0f6b35231b0b4577b70aaa26bf548a7c/src/uname.c#L373-L374 + # https://stackoverflow.com/questions/61711186/where-does-host-operating-system-in-uname-c-comes-from + # https://github.com/coreutils/gnulib/blob/master/m4/host-os.m4 + operatingSystem = + if stdenv.buildPlatform.isLinux + then "GNU/Linux" + else if stdenv.buildPlatform.isDarwin + then "Darwin" # darwin isn't in host-os.m4 so where does this come from? + else "unknown"; + + # in os-specific/linux module packages + # --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ + # is a common thing to do. + modDirVersion = if modDirVersion != "" then modDirVersion else "unknown"; + + meta = with lib; { + description = "Print certain system information (hardcoded with lib/system values)"; + longDescription = '' + This package provides a replacement for `uname` whose output depends only + on `stdenv.buildPlatform`. It is meant to be used from within derivations. + Many packages' build processes run `uname` at compile time and embed its + output into the result of the build. Since `uname` calls into the kernel, + and the Nix sandbox currently does not intercept these calls, builds made + on different kernels will produce different results. + ''; + license = [ licenses.mit ]; + maintainers = with maintainers; [ artturin ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/build-support/deterministic-uname/deterministic-uname.sh b/pkgs/build-support/deterministic-uname/deterministic-uname.sh new file mode 100644 index 000000000000..5272bb5b3fe1 --- /dev/null +++ b/pkgs/build-support/deterministic-uname/deterministic-uname.sh @@ -0,0 +1,175 @@ +#! @shell@ + +set -o errexit +set -o nounset + +show_help() { + @coreutils@/bin/cat << EOF +Usage: uname [OPTION]... +Print certain system information. With no OPTION, same as -s. + + -a, --all print all information, in the following order, + except omit -p and -i if unknown: + -s, --kernel-name print the kernel name + -n, --nodename print the network node hostname + -r, --kernel-release print the kernel release + -v, --kernel-version print the kernel version + -m, --machine print the machine hardware name + -p, --processor print the processor type (non-portable) + -i, --hardware-platform print the hardware platform (non-portable) + -o, --operating-system print the operating system + --help display this help and exit + --version output version information and exit +EOF + exit 0 +} + +# Potential command-line options. +version=0 +all=0 + + +kernel_name=0 +nodename=0 +kernel_release=0 +kernel_version=0 +machine=0 +processor=0 +hardware_platform=0 +operating_system=0 + + +@getopt@/bin/getopt --test > /dev/null && rc=$? || rc=$? +if [[ $rc -ne 4 ]]; then + # This shouldn't happen. + echo "Warning: Enhanced getopt not supported, please open an issue in nixpkgs." >&2 +else + # Define all short and long options. + SHORT=hvsnrvmpioa + LONG=help,version,kernel-name,nodename,kernel-release,kernel-version,machine,processor,hardware-platform,operating-system,all + + # Parse all options. + PARSED=`@getopt@/bin/getopt --options $SHORT --longoptions $LONG --name "$0" -- "$@"` + + eval set -- "$PARSED" +fi + +# With no OPTION, same as -s. +if [[ $# -eq 0 ]]; then + kernel_name=1 +fi + +# Process each argument, and set the appropriate flag if we recognize it. +while [[ $# -ge 1 ]]; do + case "$1" in + --version) + version=1 + ;; + -s|--kernel-name) + kernel_name=1 + ;; + -n|--nodename) + nodename=1 + ;; + -r|--kernel-release) + kernel_release=1 + ;; + -v|--kernel-version) + kernel_version=1 + ;; + -m|--machine) + machine=1 + ;; + -p|--processor) + processor=1 + ;; + -i|--hardware-platform) + hardware_platform=1 + ;; + -o|--operating-system) + operating_system=1 + ;; + -a|--all) + all=1 + ;; + --help) + show_help + ;; + --) + shift + break + ;; + *) + echo "uname: unrecognized option '$1'" + echo "Type 'uname --help' for a list of available options." + exit 1 + ;; + esac + shift +done + + +KERNEL_NAME_VAL=@uSystem@ +NODENAME_VAL=nixpkgs +KERNEL_RELEASE_VAL=@modDirVersion@ +# #1-NixOS SMP PREEMPT_DYNAMIC Wed Dec 14 10:41:06 UTC 2022 +KERNEL_VERSION_VAL="#1-NixOS Tue Jan 1 00:00:00 UTC 1980" +MACHINE_VAL=@processor@ +PROCESSOR_VAL=unknown +HARDWARE_PLATFORM_VAL=unknown +OPERATING_SYSTEM_VAL=@operatingSystem@ + + +if [[ "$version" = "1" ]]; then + # in case some script greps for GNU coreutils. + echo "uname (GNU coreutils) 9.1" + echo "Nixpkgs deterministic-uname" + exit +fi + +# output of the real uname from GNU coreutils +# Darwin: +# Darwin *nodename* 22.1.0 Darwin Kernel Version 22.1.0: Sun Oct 9 20:14:30 PDT 2022; root:xnu-8792.41.9~2/RELEASE_ARM64_T8103 arm64 arm Darwin +# NixOS: +# Linux *nodename* 6.0.13 #1-NixOS SMP PREEMPT_DYNAMIC Wed Dec 14 10:41:06 UTC 2022 x86_64 GNU/Linux +if [[ "$all" = "1" ]]; then + echo -n "$KERNEL_NAME_VAL $NODENAME_VAL $KERNEL_RELEASE_VAL $KERNEL_VERSION_VAL $MACHINE_VAL " + # in help: except omit -p and -i if unknown. + #echo -n "$PROCESSOR_VAL $HARDWARE_PLATFORM_VAL\n" + echo -n "$OPERATING_SYSTEM_VAL" +fi + +if [[ "$kernel_name" = "1" ]]; then + echo -n "$KERNEL_NAME_VAL" +fi + +if [[ "$nodename" = "1" ]]; then + echo -n "$NODENAME_VAL" +fi + +if [[ "$kernel_release" = "1" ]]; then + echo -n "$KERNEL_RELEASE_VAL" +fi + +if [[ "$kernel_version" = "1" ]]; then + echo -n "$KERNEL_VERSION_VAL" +fi + +if [[ "$machine" = "1" ]]; then + echo -n "$MACHINE_VAL" +fi + +if [[ "$processor" = "1" ]]; then + echo -n "$PROCESSOR_VAL" +fi + +if [[ "$hardware_platform" = "1" ]]; then + echo -n "$HARDWARE_PLATFORM_VAL" +fi + +if [[ "$operating_system" = "1" ]]; then + echo -n "$OPERATING_SYSTEM_VAL" +fi + +# for newline. +echo diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 6b07865928e6..bdc93f3643f1 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -30,6 +30,7 @@ , vmTools , writeReferencesToFile , writeScript +, writeShellScriptBin , writeText , writeTextDir , writePython3 @@ -73,12 +74,12 @@ let # Reference: https://github.com/opencontainers/image-spec/blob/master/config.md#properties # For the mapping from Nixpkgs system parameters to GOARCH, we can reuse the # mapping from the go package. - defaultArch = go.GOARCH; + defaultArchitecture = go.GOARCH; in rec { examples = callPackage ./examples.nix { - inherit buildImage buildLayeredImage fakeNss pullImage shadowSetup buildImageWithNixDb; + inherit buildImage buildLayeredImage fakeNss pullImage shadowSetup buildImageWithNixDb streamNixShellImage; }; tests = { @@ -100,8 +101,8 @@ rec { , imageDigest , sha256 , os ? "linux" - , arch ? defaultArch - + , # Image architecture, defaults to the architecture of the `hostPlatform` when unset + arch ? defaultArchitecture # This is used to set name to the pulled image , finalImageName ? imageName # This used to set a tag to the pulled image @@ -485,7 +486,7 @@ rec { inherit (stream) imageName; passthru = { inherit (stream) imageTag; }; nativeBuildInputs = [ pigz ]; - } "${stream} | pigz -nT > $out"; + } "${stream} | pigz -nTR > $out"; # 1. extract the base image # 2. create the layer @@ -513,6 +514,8 @@ rec { keepContentsDirlinks ? false , # Docker config; e.g. what command to run on the container. config ? null + , # Image architecture, defaults to the architecture of the `hostPlatform` when unset + architecture ? defaultArchitecture , # Optional bash script to run on the files prior to fixturizing the layer. extraCommands ? "" , uid ? 0 @@ -545,8 +548,7 @@ rec { baseJson = let pure = writeText "${baseName}-config.json" (builtins.toJSON { - inherit created config; - architecture = defaultArch; + inherit created config architecture; preferLocalBuild = true; os = "linux"; }); @@ -733,7 +735,7 @@ rec { chmod -R a-w image echo "Cooking the image..." - tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'^./':: -c . | pigz -nT > $out + tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'^./':: -c . | pigz -nTR > $out echo "Finished." ''; @@ -773,7 +775,7 @@ rec { mv repositories image/repositories mv manifest.json image/manifest.json # Create tarball and gzip - tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'^./':: -c . | pigz -nT > $out + tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'^./':: -c . | pigz -nTR > $out ''; @@ -837,6 +839,8 @@ rec { contents ? [ ] , # Docker config; e.g. what command to run on the container. config ? { } + , # Image architecture, defaults to the architecture of the `hostPlatform` when unset + architecture ? defaultArchitecture , # Time of creation of the image. Passing "now" will make the # created date be the time of building. created ? "1970-01-01T00:00:01Z" @@ -868,15 +872,14 @@ rec { streamScript = writePython3 "stream" { } ./stream_layered_image.py; baseJson = writeText "${baseName}-base.json" (builtins.toJSON { - inherit config; - architecture = defaultArch; + inherit config architecture; os = "linux"; }); contentsList = if builtins.isList contents then contents else [ contents ]; # We store the customisation layer as a tarball, to make sure that - # things like permissions set on 'extraCommands' are not overriden + # things like permissions set on 'extraCommands' are not overridden # by Nix. Then we precompute the sha256 for performance. customisationLayer = symlinkJoin { name = "${baseName}-customisation-layer"; @@ -1034,4 +1037,188 @@ rec { ''; in result; + + # This function streams a docker image that behaves like a nix-shell for a derivation + streamNixShellImage = + { # The derivation whose environment this docker image should be based on + drv + , # Image Name + name ? drv.name + "-env" + , # Image tag, the Nix's output hash will be used if null + tag ? null + , # User id to run the container as. Defaults to 1000, because many + # binaries don't like to be run as root + uid ? 1000 + , # Group id to run the container as, see also uid + gid ? 1000 + , # The home directory of the user + homeDirectory ? "/build" + , # The path to the bash binary to use as the shell. See `NIX_BUILD_SHELL` in `man nix-shell` + shell ? bashInteractive + "/bin/bash" + , # Run this command in the environment of the derivation, in an interactive shell. See `--command` in `man nix-shell` + command ? null + , # Same as `command`, but runs the command in a non-interactive shell instead. See `--run` in `man nix-shell` + run ? null + }: + assert lib.assertMsg (! (drv.drvAttrs.__structuredAttrs or false)) + "streamNixShellImage: Does not work with the derivation ${drv.name} because it uses __structuredAttrs"; + assert lib.assertMsg (command == null || run == null) + "streamNixShellImage: Can't specify both command and run"; + let + + # A binary that calls the command to build the derivation + builder = writeShellScriptBin "buildDerivation" '' + exec ${lib.escapeShellArg (stringValue drv.drvAttrs.builder)} ${lib.escapeShellArgs (map stringValue drv.drvAttrs.args)} + ''; + + staticPath = "${dirOf shell}:${lib.makeBinPath [ builder ]}"; + + # https://github.com/NixOS/nix/blob/2.8.0/src/nix-build/nix-build.cc#L493-L526 + rcfile = writeText "nix-shell-rc" '' + unset PATH + dontAddDisableDepTrack=1 + # TODO: https://github.com/NixOS/nix/blob/2.8.0/src/nix-build/nix-build.cc#L506 + [ -e $stdenv/setup ] && source $stdenv/setup + PATH=${staticPath}:"$PATH" + SHELL=${lib.escapeShellArg shell} + BASH=${lib.escapeShellArg shell} + set +e + [ -n "$PS1" -a -z "$NIX_SHELL_PRESERVE_PROMPT" ] && PS1='\n\[\033[1;32m\][nix-shell:\w]\$\[\033[0m\] ' + if [ "$(type -t runHook)" = function ]; then + runHook shellHook + fi + unset NIX_ENFORCE_PURITY + shopt -u nullglob + shopt -s execfail + ${optionalString (command != null || run != null) '' + ${optionalString (command != null) command} + ${optionalString (run != null) run} + exit + ''} + ''; + + # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/globals.hh#L464-L465 + sandboxBuildDir = "/build"; + + # This function closely mirrors what this Nix code does: + # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/primops.cc#L1102 + # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/eval.cc#L1981-L2036 + stringValue = value: + # We can't just use `toString` on all derivation attributes because that + # would not put path literals in the closure. So we explicitly copy + # those into the store here + if builtins.typeOf value == "path" then "${value}" + else if builtins.typeOf value == "list" then toString (map stringValue value) + else toString value; + + # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L992-L1004 + drvEnv = lib.mapAttrs' (name: value: + let str = stringValue value; + in if lib.elem name (drv.drvAttrs.passAsFile or []) + then lib.nameValuePair "${name}Path" (writeText "pass-as-text-${name}" str) + else lib.nameValuePair name str + ) drv.drvAttrs // + # A mapping from output name to the nix store path where they should end up + # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/primops.cc#L1253 + lib.genAttrs drv.outputs (output: builtins.unsafeDiscardStringContext drv.${output}.outPath); + + # Environment variables set in the image + envVars = { + + # Root certificates for internet access + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1027-L1030 + # PATH = "/path-not-set"; + # Allows calling bash and `buildDerivation` as the Cmd + PATH = staticPath; + + # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1032-L1038 + HOME = homeDirectory; + + # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1040-L1044 + NIX_STORE = storeDir; + + # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1046-L1047 + # TODO: Make configurable? + NIX_BUILD_CORES = "1"; + + } // drvEnv // { + + # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1008-L1010 + NIX_BUILD_TOP = sandboxBuildDir; + + # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1012-L1013 + TMPDIR = sandboxBuildDir; + TEMPDIR = sandboxBuildDir; + TMP = sandboxBuildDir; + TEMP = sandboxBuildDir; + + # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1015-L1019 + PWD = sandboxBuildDir; + + # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1071-L1074 + # We don't set it here because the output here isn't handled in any special way + # NIX_LOG_FD = "2"; + + # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1076-L1077 + TERM = "xterm-256color"; + }; + + + in streamLayeredImage { + inherit name tag; + contents = [ + binSh + usrBinEnv + (fakeNss.override { + # Allows programs to look up the build user's home directory + # https://github.com/NixOS/nix/blob/ffe155abd36366a870482625543f9bf924a58281/src/libstore/build/local-derivation-goal.cc#L906-L910 + # Slightly differs however: We use the passed-in homeDirectory instead of sandboxBuildDir. + # We're doing this because it's arguably a bug in Nix that sandboxBuildDir is used here: https://github.com/NixOS/nix/issues/6379 + extraPasswdLines = [ + "nixbld:x:${toString uid}:${toString gid}:Build user:${homeDirectory}:/noshell" + ]; + extraGroupLines = [ + "nixbld:!:${toString gid}:" + ]; + }) + ]; + + fakeRootCommands = '' + # Effectively a single-user installation of Nix, giving the user full + # control over the Nix store. Needed for building the derivation this + # shell is for, but also in case one wants to use Nix inside the + # image + mkdir -p ./nix/{store,var/nix} ./etc/nix + chown -R ${toString uid}:${toString gid} ./nix ./etc/nix + + # Gives the user control over the build directory + mkdir -p .${sandboxBuildDir} + chown -R ${toString uid}:${toString gid} .${sandboxBuildDir} + ''; + + # Run this image as the given uid/gid + config.User = "${toString uid}:${toString gid}"; + config.Cmd = + # https://github.com/NixOS/nix/blob/2.8.0/src/nix-build/nix-build.cc#L185-L186 + # https://github.com/NixOS/nix/blob/2.8.0/src/nix-build/nix-build.cc#L534-L536 + if run == null + then [ shell "--rcfile" rcfile ] + else [ shell rcfile ]; + config.WorkingDir = sandboxBuildDir; + config.Env = lib.mapAttrsToList (name: value: "${name}=${value}") envVars; + }; + + # Wrapper around streamNixShellImage to build an image from the result + buildNixShellImage = { drv, ... }@args: + let + stream = streamNixShellImage args; + in + runCommand "${drv.name}-env.tar.gz" + { + inherit (stream) imageName; + passthru = { inherit (stream) imageTag; }; + nativeBuildInputs = [ pigz ]; + } "${stream} | pigz -nTR > $out"; } diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 1e9f07045e37..5784e650dc2e 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -7,7 +7,7 @@ # $ nix-build '' -A dockerTools.examples.redis # $ docker load < result -{ pkgs, buildImage, buildLayeredImage, fakeNss, pullImage, shadowSetup, buildImageWithNixDb, pkgsCross }: +{ pkgs, buildImage, buildLayeredImage, fakeNss, pullImage, shadowSetup, buildImageWithNixDb, pkgsCross, streamNixShellImage }: let nixosLib = import ../../../nixos/lib { @@ -92,10 +92,11 @@ rec { ]; extraCommands = '' + mkdir -p tmp/nginx_client_body + # nginx still tries to read this directory even if error_log # directive is specifying another file :/ mkdir -p var/log/nginx - mkdir -p var/cache/nginx ''; config = { @@ -699,6 +700,21 @@ rec { contents = [ pkgs.bashInteractive ./test-dummy ]; }; + build-image-with-architecture = buildImage { + name = "build-image-with-architecture"; + tag = "latest"; + architecture = "arm64"; + # Not recommended. Use `buildEnv` between copy and packages to avoid file duplication. + copyToRoot = [ pkgs.bashInteractive ./test-dummy ]; + }; + + layered-image-with-architecture = pkgs.dockerTools.streamLayeredImage { + name = "layered-image-with-architecture"; + tag = "latest"; + architecture = "arm64"; + contents = [ pkgs.bashInteractive ./test-dummy ]; + }; + # ensure that caCertificates builds image-with-certs = buildImage { name = "image-with-certs"; @@ -715,4 +731,118 @@ rec { config = { }; }; + + nix-shell-basic = streamNixShellImage { + name = "nix-shell-basic"; + tag = "latest"; + drv = pkgs.hello; + }; + + nix-shell-hook = streamNixShellImage { + name = "nix-shell-hook"; + tag = "latest"; + drv = pkgs.mkShell { + shellHook = '' + echo "This is the shell hook!" + exit + ''; + }; + }; + + nix-shell-inputs = streamNixShellImage { + name = "nix-shell-inputs"; + tag = "latest"; + drv = pkgs.mkShell { + nativeBuildInputs = [ + pkgs.hello + ]; + }; + command = '' + hello + ''; + }; + + nix-shell-pass-as-file = streamNixShellImage { + name = "nix-shell-pass-as-file"; + tag = "latest"; + drv = pkgs.mkShell { + str = "this is a string"; + passAsFile = [ "str" ]; + }; + command = '' + cat "$strPath" + ''; + }; + + nix-shell-run = streamNixShellImage { + name = "nix-shell-run"; + tag = "latest"; + drv = pkgs.mkShell {}; + run = '' + case "$-" in + *i*) echo This shell is interactive ;; + *) echo This shell is not interactive ;; + esac + ''; + }; + + nix-shell-command = streamNixShellImage { + name = "nix-shell-command"; + tag = "latest"; + drv = pkgs.mkShell {}; + command = '' + case "$-" in + *i*) echo This shell is interactive ;; + *) echo This shell is not interactive ;; + esac + ''; + }; + + nix-shell-writable-home = streamNixShellImage { + name = "nix-shell-writable-home"; + tag = "latest"; + drv = pkgs.mkShell {}; + run = '' + if [[ "$HOME" != "$(eval "echo ~$(whoami)")" ]]; then + echo "\$HOME ($HOME) is not the same as ~\$(whoami) ($(eval "echo ~$(whoami)"))" + exit 1 + fi + + if ! touch $HOME/test-file; then + echo "home directory is not writable" + exit 1 + fi + echo "home directory is writable" + ''; + }; + + nix-shell-nonexistent-home = streamNixShellImage { + name = "nix-shell-nonexistent-home"; + tag = "latest"; + drv = pkgs.mkShell {}; + homeDirectory = "/homeless-shelter"; + run = '' + if [[ "$HOME" != "$(eval "echo ~$(whoami)")" ]]; then + echo "\$HOME ($HOME) is not the same as ~\$(whoami) ($(eval "echo ~$(whoami)"))" + exit 1 + fi + + if -e $HOME; then + echo "home directory exists" + exit 1 + fi + echo "home directory doesn't exist" + ''; + }; + + nix-shell-build-derivation = streamNixShellImage { + name = "nix-shell-build-derivation"; + tag = "latest"; + drv = pkgs.hello; + run = '' + buildDerivation + $out/bin/hello + ''; + }; + } diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 5e8d76defe76..514255f324ac 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -2,13 +2,11 @@ , stdenvNoCC , callPackage , writeShellScript -, writeText , srcOnly , linkFarmFromDrvs , symlinkJoin , makeWrapper , dotnetCorePackages -, dotnetPackages , mkNugetSource , mkNugetDeps , nuget-to-nix @@ -61,6 +59,9 @@ # Libraries that need to be available at runtime should be passed through this. # These get wrapped into `LD_LIBRARY_PATH`. , runtimeDeps ? [ ] + # The dotnet runtime ID. If null, fetch-deps will gather dependencies for all + # platforms in meta.platforms which are supported by the sdk. +, runtimeId ? null # 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. @@ -73,6 +74,8 @@ , buildType ? "Release" # If set to true, builds the application as a self-contained - removing the runtime dependency on dotnet , selfContainedBuild ? false + # Whether to explicitly enable UseAppHost when building +, useAppHost ? true # The dotnet SDK to use. , dotnet-sdk ? dotnetCorePackages.sdk_6_0 # The dotnet runtime to use. @@ -90,6 +93,10 @@ let inherit (callPackage ./hooks { inherit dotnet-sdk dotnet-test-sdk disabledTests nuget-source dotnet-runtime runtimeDeps buildType; + runtimeId = + if runtimeId != null + then runtimeId + else dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system; }) dotnetConfigureHook dotnetBuildHook dotnetCheckHook dotnetInstallHook dotnetFixupHook; localDeps = @@ -111,13 +118,10 @@ let deps = [ _nugetDeps ] ++ lib.optional (localDeps != null) localDeps; }; - # this contains all the nuget packages that are implictly referenced by the dotnet + # this contains all the nuget packages that are implicitly referenced by the dotnet # build system. having them as separate deps allows us to avoid having to regenerate # a packages dependencies when the dotnet-sdk version changes - sdkDeps = mkNugetDeps { - name = "dotnet-sdk-${dotnet-sdk.version}-deps"; - nugetDeps = dotnet-sdk.passthru.packages; - }; + sdkDeps = dotnet-sdk.packages; sdkSource = mkNugetSource { name = "dotnet-sdk-${dotnet-sdk.version}-source"; @@ -152,22 +156,18 @@ stdenvNoCC.mkDerivation (args // { # gappsWrapperArgs gets included when wrapping for dotnet, as to avoid double wrapping dontWrapGApps = args.dontWrapGApps or true; + inherit selfContainedBuild useAppHost; + passthru = { inherit nuget-source; fetch-deps = let - # Derivations may set flags such as `--runtime ` based on the host platform to avoid restoring/building nuget dependencies they dont have or dont need. - # This introduces an issue; In this script we loop over all platforms from `meta` and add the RID flag for it, as to fetch all required dependencies. - # The script would inherit the RID flag from the derivation based on the platform building the script, and set the flag for any iteration we do over the RIDs. - # That causes conflicts. To circumvent it we remove all occurances of the flag. - flags = - let - hasRid = flag: lib.any (v: v) (map (rid: lib.hasInfix rid flag) (lib.attrValues dotnet-sdk.runtimeIdentifierMap)); - in - builtins.filter (flag: !(hasRid flag)) (dotnetFlags ++ dotnetRestoreFlags); - - runtimeIds = map (system: dotnet-sdk.systemToDotnetRid system) platforms; + flags = dotnetFlags ++ dotnetRestoreFlags; + runtimeIds = + if runtimeId != null + then [ runtimeId ] + else map (system: dotnetCorePackages.systemToDotnetRid system) platforms; in writeShellScript "fetch-${pname}-deps" '' set -euo pipefail @@ -190,7 +190,13 @@ stdenvNoCC.mkDerivation (args // { esac done - export tmp=$(mktemp -td "${pname}-tmp-XXXXXX") + if [[ ''${TMPDIR:-} == /run/user/* ]]; then + # /run/user is usually a tmpfs in RAM, which may be too small + # to store all downloaded dotnet packages + TMPDIR= + fi + + export tmp=$(mktemp -td "deps-${pname}-XXXXXX") HOME=$tmp/home exitTrap() { diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix index 1cc88602ff4c..bce3d799fbb1 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix @@ -9,7 +9,9 @@ , dotnet-runtime , runtimeDeps , buildType +, runtimeId }: +assert (builtins.isString runtimeId); let libraryPath = lib.makeLibraryPath runtimeDeps; @@ -21,6 +23,7 @@ in deps = [ dotnet-sdk nuget-source ]; substitutions = { nugetSource = nuget-source; + inherit runtimeId; }; } ./dotnet-configure-hook.sh) { }; @@ -29,7 +32,7 @@ in name = "dotnet-build-hook"; deps = [ dotnet-sdk ]; substitutions = { - inherit buildType; + inherit buildType runtimeId; }; } ./dotnet-build-hook.sh) { }; @@ -40,7 +43,11 @@ in substitutions = { inherit buildType libraryPath; disabledTests = lib.optionalString (disabledTests != []) - (lib.concatStringsSep "&FullyQualifiedName!=" disabledTests); + (let + escapedNames = lib.lists.map (n: lib.replaceStrings [","] ["%2C"] n) disabledTests; + filters = lib.lists.map (n: "FullyQualifiedName!=${n}") escapedNames; + in + "${lib.concatStringsSep "&" filters}"); }; } ./dotnet-check-hook.sh) { }; @@ -49,7 +56,7 @@ in name = "dotnet-install-hook"; deps = [ dotnet-sdk ]; substitutions = { - inherit buildType; + inherit buildType runtimeId; }; } ./dotnet-install-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 index 9199b8d02a81..8f7f77339357 100644 --- 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 @@ -15,11 +15,15 @@ dotnetBuildHook() { fi if [ "${selfContainedBuild-}" ]; then - dotnetBuildFlags+=("-p:SelfContained=true") + dotnetBuildFlags+=(--runtime "@runtimeId@" "-p:SelfContained=true") else dotnetBuildFlags+=("-p:SelfContained=false") fi + if [ "${useAppHost-}" ]; then + dotnetBuildFlags+=("-p:UseAppHost=true") + fi + if [ "${version-}" ]; then local -r versionFlag="-p:Version=${version-}" fi @@ -31,7 +35,6 @@ dotnetBuildHook() { -p:BuildInParallel=$parallelBuildFlag \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ - -p:UseAppHost=true \ --configuration "@buildType@" \ --no-restore \ ${versionFlag-} \ 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 index 0c0e5d310eab..fdcf8d54be46 100644 --- 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 @@ -7,7 +7,7 @@ dotnetCheckHook() { runHook preCheck if [ "${disabledTests-}" ]; then - local -r disabledTestsFlag="--filter FullyQualifiedName!=@disabledTests@" + local -r disabledTestsFlag="--filter @disabledTests@" fi if [ "${enableParallelBuilding-}" ]; then @@ -16,7 +16,7 @@ dotnetCheckHook() { local -r maxCpuFlag="1" fi - for project in ${testProjectFile[@]-}; do + for project in ${testProjectFile[@]-${projectFile[@]}}; do env "LD_LIBRARY_PATH=@libraryPath@" \ dotnet test "$project" \ -maxcpucount:$maxCpuFlag \ 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 index 10067cf08824..1e33ebbaef71 100644 --- 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 @@ -18,6 +18,7 @@ dotnetConfigureHook() { env dotnet restore ${project-} \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ + --runtime "@runtimeId@" \ --source "@nugetSource@/lib" \ ${parallelFlag-} \ ${dotnetRestoreFlags[@]} \ @@ -26,6 +27,18 @@ dotnetConfigureHook() { (( "${#projectFile[@]}" == 0 )) && dotnetRestore + # Generate a NuGet.config file to make sure everything, + # including things like dependencies, is restored from the proper source +cat < "./NuGet.config" + + + + + + + +EOF + for project in ${projectFile[@]} ${testProjectFile[@]-}; do dotnetRestore "$project" done 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 index 217e79e41b46..831059f941ca 100644 --- 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 @@ -7,17 +7,20 @@ dotnetInstallHook() { runHook preInstall if [ "${selfContainedBuild-}" ]; then - dotnetInstallFlags+=("--self-contained") + dotnetInstallFlags+=(--runtime "@runtimeId@" "--self-contained") else dotnetInstallFlags+=("--no-self-contained") fi + if [ "${useAppHost-}" ]; then + dotnetInstallFlags+=("-p:UseAppHost=true") + fi + dotnetPublish() { local -r project="${1-}" env dotnet publish ${project-} \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ - -p:UseAppHost=true \ --output "$out/lib/${pname}" \ --configuration "@buildType@" \ --no-build \ diff --git a/pkgs/build-support/fake-nss/default.nix b/pkgs/build-support/fake-nss/default.nix index 9e0b60133e00..7d85ec5fc0a5 100644 --- a/pkgs/build-support/fake-nss/default.nix +++ b/pkgs/build-support/fake-nss/default.nix @@ -2,17 +2,17 @@ # Useful when packaging binaries that insist on using nss to look up # username/groups (like nginx). # /bin/sh is fine to not exist, and provided by another shim. -{ symlinkJoin, writeTextDir, runCommand }: +{ lib, symlinkJoin, writeTextDir, runCommand, extraPasswdLines ? [], extraGroupLines ? [] }: symlinkJoin { name = "fake-nss"; paths = [ (writeTextDir "etc/passwd" '' root:x:0:0:root user:/var/empty:/bin/sh - nobody:x:65534:65534:nobody:/var/empty:/bin/sh + ${lib.concatStrings (map (line: line + "\n") extraPasswdLines)}nobody:x:65534:65534:nobody:/var/empty:/bin/sh '') (writeTextDir "etc/group" '' root:x:0: - nobody:x:65534: + ${lib.concatStrings (map (line: line + "\n") extraGroupLines)}nobody:x:65534: '') (writeTextDir "etc/nsswitch.conf" '' hosts: files dns diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh index e424fd92d51e..380642a5e681 100644 --- a/pkgs/build-support/fetchbzr/builder.sh +++ b/pkgs/build-support/fetchbzr/builder.sh @@ -1,9 +1,8 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source "$stdenv/setup" -header "exporting \`$url' (revision $rev) into \`$out'" +echo "exporting \`$url' (revision $rev) into \`$out'" # Perform a lightweight checkout so that we don't end up importing # all the repository's history. BZR_LOG=/dev/null bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url" - -stopNest diff --git a/pkgs/build-support/fetchcvs/builder.sh b/pkgs/build-support/fetchcvs/builder.sh index fe1019aafc2f..4b49e9676ec0 100644 --- a/pkgs/build-support/fetchcvs/builder.sh +++ b/pkgs/build-support/fetchcvs/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup (echo "#!$SHELL"; \ @@ -23,5 +24,3 @@ else fi (cd export && cvs -f -z0 -d "$cvsRoot" export $tag "$module") mv export/* $out - -stopNest diff --git a/pkgs/build-support/fetchdarcs/builder.sh b/pkgs/build-support/fetchdarcs/builder.sh index 301deb98307f..ce5537f46f40 100644 --- a/pkgs/build-support/fetchdarcs/builder.sh +++ b/pkgs/build-support/fetchdarcs/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup tagtext="" @@ -10,10 +11,8 @@ elif test -n "$context"; then tagflags="--context=$context" fi -header "getting $url $partial ${tagtext} into $out" +echo "getting $url $partial ${tagtext} into $out" darcs get --lazy $tagflags "$url" "$out" # remove metadata, because it can change rm -rf "$out/_darcs" - -stopNest diff --git a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh index 7443591e6569..4eb70f672d48 100644 --- a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh +++ b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh @@ -1,5 +1,6 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source "${stdenv}/setup" -header "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}" +echo "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}" mkdir -p "${out}" cat < "${out}/compositeImage.sh" @@ -8,7 +9,7 @@ cat < "${out}/compositeImage.sh" # Create a tar archive of a docker image's layers, docker image config # json, manifest.json, and repositories json; this streams directly to # stdout and is intended to be used in concert with docker load, i.e: -# +# # ${out}/compositeImage.sh | docker load # The first character follow the 's' command for sed becomes the @@ -25,4 +26,3 @@ ${gnutar}/bin/tar \ -c "${manifest}" "${repositories}" -T "${imageFileStorePaths}" EOF chmod +x "${out}/compositeImage.sh" -stopNest diff --git a/pkgs/build-support/fetchdocker/generic-fetcher.nix b/pkgs/build-support/fetchdocker/generic-fetcher.nix index 3b0c33770467..6a7b977db29f 100644 --- a/pkgs/build-support/fetchdocker/generic-fetcher.nix +++ b/pkgs/build-support/fetchdocker/generic-fetcher.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { inherit name; builder = writeText "${fetcher}-builder.sh" '' source "$stdenv/setup" - header "${fetcher} exporting to $out" + echo "${fetcher} exporting to $out" declare -A creds @@ -49,7 +49,7 @@ stdenv.mkDerivation { fi if [ -f "$dockerCredentialsFile" ]; then - header "using credentials from $dockerCredentialsFile" + echo "using credentials from $dockerCredentialsFile" CREDSFILE=$(cat "$dockerCredentialsFile") creds[token]=$(${awk} -F'=' '/DOCKER_TOKEN/ {print $2}' <<< "$CREDSFILE" | head -n1) @@ -77,8 +77,6 @@ stdenv.mkDerivation { ${layerDigestFlag} \ "${repository}/${imageName}" \ "${tag}" - - stopNest ''; buildInputs = [ haskellPackages.hocker ]; diff --git a/pkgs/build-support/fetchfirefoxaddon/default.nix b/pkgs/build-support/fetchfirefoxaddon/default.nix index 0fa51e69840c..fe9ff5c469ba 100644 --- a/pkgs/build-support/fetchfirefoxaddon/default.nix +++ b/pkgs/build-support/fetchfirefoxaddon/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { builder = writeScript "xpibuilder" '' source $stdenv/setup - header "firefox addon $name into $out" + echo "firefox addon $name into $out" UUID="${extid}" mkdir -p "$out/$UUID" diff --git a/pkgs/build-support/fetchfirefoxaddon/tests.nix b/pkgs/build-support/fetchfirefoxaddon/tests.nix index fd70d0f82ac0..a29f65c542ad 100644 --- a/pkgs/build-support/fetchfirefoxaddon/tests.nix +++ b/pkgs/build-support/fetchfirefoxaddon/tests.nix @@ -7,7 +7,7 @@ url = "https://addons.mozilla.org/firefox/downloads/file/3059971/image_search_options-3.0.12-fx.xpi"; sha256 = "sha256-H73YWX/DKxvhEwKpWOo7orAQ7c/rQywpljeyxYxv0Gg="; }; - overidden-source = + overridden-source = let image-search-options = fetchurl { url = "https://addons.mozilla.org/firefox/downloads/file/3059971/image_search_options-3.0.12-fx.xpi"; diff --git a/pkgs/build-support/fetchfossil/builder.sh b/pkgs/build-support/fetchfossil/builder.sh index 5f08aca424fe..36b758ab574e 100644 --- a/pkgs/build-support/fetchfossil/builder.sh +++ b/pkgs/build-support/fetchfossil/builder.sh @@ -1,5 +1,6 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "Cloning Fossil $url [$rev] into $out" +echo "Cloning Fossil $url [$rev] into $out" # Fossil, bless its adorable little heart, wants to write global configuration # to $HOME/.fossil. AFAICT, there is no way to disable this functionality. @@ -18,5 +19,3 @@ popd # Just nuke the checkout file. rm $out/.fslckout - -stopNest diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 66b6c168e41d..77f6381b09ab 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -2,9 +2,11 @@ # - no revision specified and remote has a HEAD which is used # - revision specified and remote has a HEAD # - revision specified and remote without HEAD +# +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "exporting $url (rev $rev) into $out" +echo "exporting $url (rev $rev) into $out" $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ ${leaveDotGit:+--leave-dotGit} \ @@ -16,4 +18,3 @@ $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ ${branchName:+--branch-name "$branchName"} runHook postFetch -stopNest diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 1fec0c887474..2d0b4b20ef8b 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -34,7 +34,7 @@ in /* NOTE: fetchgit has one problem: git fetch only works for refs. - This is because fetching arbitrary (maybe dangling) commits may be a security risk + This is because fetching arbitrary (maybe dangling) commits creates garbage collection risks and checking whether a commit belongs to a ref is expensive. This may change in the future when some caching is added to git (?) Usually refs are either tags (refs/tags/*) or branches (refs/heads/*) diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index fcde7447cbd3..b1a85e9f691b 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -59,4 +59,4 @@ let ) // privateAttrs // passthruAttrs // { inherit name; }; in -fetcher fetcherArgs // { meta = newMeta; inherit rev; } +fetcher fetcherArgs // { meta = newMeta; inherit rev owner repo; } diff --git a/pkgs/build-support/fetchhg/builder.sh b/pkgs/build-support/fetchhg/builder.sh index 847f18fa5975..1ce294757713 100644 --- a/pkgs/build-support/fetchhg/builder.sh +++ b/pkgs/build-support/fetchhg/builder.sh @@ -1,9 +1,8 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "getting $url${rev:+ ($rev)} into $out" +echo "getting $url${rev:+ ($rev)} into $out" hg clone --insecure "$url" hg-clone hg archive -q$subrepoClause -y ${rev:+-r "$rev"} --cwd hg-clone $out rm -f $out/.hg_archival.txt - -stopNest diff --git a/pkgs/build-support/fetchipfs/builder.sh b/pkgs/build-support/fetchipfs/builder.sh index 7a6a517566f5..ca77962b5384 100644 --- a/pkgs/build-support/fetchipfs/builder.sh +++ b/pkgs/build-support/fetchipfs/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup # Curl flags to handle redirects, not use EPSV, handle cookies for diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix index 4274b4b52bfa..efdbd0decf95 100644 --- a/pkgs/build-support/fetchmavenartifact/default.nix +++ b/pkgs/build-support/fetchmavenartifact/default.nix @@ -39,14 +39,14 @@ assert (repos != []) || (url != "") || (urls != []); let name_ = lib.concatStrings [ - (lib.replaceChars ["."] ["_"] groupId) "_" - (lib.replaceChars ["."] ["_"] artifactId) "-" + (lib.replaceStrings ["."] ["_"] groupId) "_" + (lib.replaceStrings ["."] ["_"] artifactId) "-" version ]; mkJarUrl = repoUrl: lib.concatStringsSep "/" [ (lib.removeSuffix "/" repoUrl) - (lib.replaceChars ["."] ["/"] groupId) + (lib.replaceStrings ["."] ["/"] groupId) artifactId version "${artifactId}-${version}${lib.optionalString (!isNull classifier) "-${classifier}"}.jar" diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh index 73eff9c27252..1aabd7949ee1 100644 --- a/pkgs/build-support/fetchmtn/builder.sh +++ b/pkgs/build-support/fetchmtn/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup set -x @@ -7,7 +8,7 @@ if ! [ -f "$cacheDB" ]; then mtn --db "$cacheDB" db init fi -header "getting revision $selector"; +echo "getting revision $selector"; done=; for source in $dbs; do @@ -31,9 +32,7 @@ for source in $dbs; do fi; done; -stopNest; - -header "checking out the revision $revision"; +echo "checking out the revision $revision"; if test -n "$done"; then mtn checkout --db "$cacheDB" -r "$revision" "$out" -b "${branch}" @@ -42,10 +41,6 @@ else exit 1; fi; -stopNest - -header "clearing _MTN in the output" +echo "clearing _MTN in the output" rm -rf "$out/_MTN" - -stopNest diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index d46162c97ff4..3ebe797f736d 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -4,11 +4,8 @@ # often change with updating of git or cgit. # stripLen acts as the -p parameter when applying a patch. -{ lib, fetchurl, buildPackages }: -let - # 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154 - patchutils = buildPackages.patchutils_0_3_3; -in +{ lib, fetchurl, patchutils }: + { relative ? null , stripLen ? 0 , extraPrefix ? null diff --git a/pkgs/build-support/fetchpatch/tests.nix b/pkgs/build-support/fetchpatch/tests.nix index a42b7cd7d14b..38bbb8ba69d2 100644 --- a/pkgs/build-support/fetchpatch/tests.nix +++ b/pkgs/build-support/fetchpatch/tests.nix @@ -1,15 +1,19 @@ { testers, fetchpatch, ... }: +let + isFetchpatch2 = fetchpatch.version == 2; +in + { simple = testers.invalidateFetcherByDrvHash fetchpatch { url = "https://github.com/facebook/zstd/pull/2724/commits/e1f85dbca3a0ed5ef06c8396912a0914db8dea6a.patch"; - sha256 = "sha256-PuYAqnJWAE+L9bsroOnnBGJhERW8LHrGSLtIEkKU9vg="; + sha256 = if isFetchpatch2 then "sha256-01BrkHLye4KOdqCw3tv7AJzIF6578pl2fl270TJFTmw=" else "sha256-PuYAqnJWAE+L9bsroOnnBGJhERW8LHrGSLtIEkKU9vg="; }; relative = testers.invalidateFetcherByDrvHash fetchpatch { url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; relative = "include"; - sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; + sha256 = if isFetchpatch2 then "sha256-1TtmuKeNIl/Yp+sfzBMR8Ue78tPIgjqGgjasa5IN52o=" else "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; }; full = testers.invalidateFetcherByDrvHash fetchpatch { @@ -19,6 +23,6 @@ extraPrefix = "foo/bar/"; excludes = [ "foo/bar/bernoulli_no_atomic_mp.cpp" ]; revert = true; - sha256 = "sha256-+UKmEbr2rIAweCav/hR/7d4ZrYV84ht/domTrHtm8sM="; + sha256 = if isFetchpatch2 then "sha256-+UKmEbr2rIAweCav/hR/7d4ZrYV84ht/domTrHtm8sM=" else "sha256-+UKmEbr2rIAweCav/hR/7d4ZrYV84ht/domTrHtm8sM="; }; } diff --git a/pkgs/development/interpreters/python/fetchpypi.nix b/pkgs/build-support/fetchpypi/default.nix similarity index 100% rename from pkgs/development/interpreters/python/fetchpypi.nix rename to pkgs/build-support/fetchpypi/default.nix diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index ed3e65f07695..aa4d049aba43 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -1,6 +1,7 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "exporting $url (r$rev) into $out" +echo "exporting $url (r$rev) into $out" if test -n "$http_proxy"; then # Configure proxy @@ -21,5 +22,3 @@ fi; svn export --trust-server-cert --non-interactive \ ${ignoreExternals:+--ignore-externals} ${ignoreKeywords:+--ignore-keywords} \ -r "$rev" "$url" "$out" - -stopNest diff --git a/pkgs/build-support/fetchsvnssh/builder.sh b/pkgs/build-support/fetchsvnssh/builder.sh index d9c6dc7da31a..5782151524f7 100644 --- a/pkgs/build-support/fetchsvnssh/builder.sh +++ b/pkgs/build-support/fetchsvnssh/builder.sh @@ -1,6 +1,7 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "exporting $url (r$rev) into $out" +echo "exporting $url (r$rev) into $out" if test "$sshSupport"; then export SVN_SSH="$openssh/bin/ssh" @@ -11,5 +12,3 @@ fi # whether the server is being spoofed --- only the cryptographic # hash of the output matters. expect -f $sshSubversion "$username" "$password" "$rev" "$url" $out - -stopNest diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index 5ca09b6fc77d..e8eaba934858 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup source $mirrorsFile @@ -36,7 +37,7 @@ if [ -n "$downloadToTemp" ]; then downloadedFile="$TMPDIR/file"; fi tryDownload() { local url="$1" echo - header "trying $url" + echo "trying $url" local curlexit=18; success= diff --git a/pkgs/build-support/fetchurl/tests.nix b/pkgs/build-support/fetchurl/tests.nix index fc7fb25e158f..e348d77db0bd 100644 --- a/pkgs/build-support/fetchurl/tests.nix +++ b/pkgs/build-support/fetchurl/tests.nix @@ -1,8 +1,8 @@ -{ invalidateFetcherByDrvHash, fetchurl, jq, moreutils, ... }: { +{ testers, fetchurl, jq, moreutils, ... }: { # Tests that we can send custom headers with spaces in them header = let headerValue = "Test '\" <- These are some quotes"; - in invalidateFetcherByDrvHash fetchurl { + in testers.invalidateFetcherByDrvHash fetchurl { url = "https://httpbin.org/headers"; sha256 = builtins.hashString "sha256" (headerValue + "\n"); curlOptsList = [ "-H" "Hello: ${headerValue}" ]; diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index 9c08276cdb9b..e980f9d65214 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -36,7 +36,7 @@ in fetchurl (( if (pname != "" && version != "") then { - name = "${name}-${version}"; + name = "${pname}-${version}"; inherit pname version; } else @@ -63,12 +63,12 @@ fetchurl (( chmod -R +w "$unpackDir" '' + (if stripRoot then '' - if [ $(ls "$unpackDir" | wc -l) != 1 ]; then + if [ $(ls -A "$unpackDir" | wc -l) != 1 ]; then echo "error: zip file must contain a single file or directory." echo "hint: Pass stripRoot=false; to fetchzip to assume flat list of files." exit 1 fi - fn=$(cd "$unpackDir" && echo *) + fn=$(cd "$unpackDir" && ls -A) if [ -f "$unpackDir/$fn" ]; then mkdir $out fi diff --git a/pkgs/build-support/fetchzip/tests.nix b/pkgs/build-support/fetchzip/tests.nix index f1a1ed65817b..13175d5ce921 100644 --- a/pkgs/build-support/fetchzip/tests.nix +++ b/pkgs/build-support/fetchzip/tests.nix @@ -1,4 +1,4 @@ -{ testers, fetchzip, ... }: +{ testers, fetchzip, runCommand, ... }: let url = "https://gist.github.com/glandium/01d54cefdb70561b5f6675e08f2990f2/archive/2f430f0c136a69b0886281d0c76708997d8878af.zip"; @@ -12,6 +12,14 @@ in postFetch = testers.invalidateFetcherByDrvHash fetchzip { inherit url; sha256 = "sha256-7sAOzKa+9vYx5XyndHxeY2ffWAjOsgCkXC9anK6cuV0="; - postFetch = ''touch $out/filee''; + postFetch = "touch $out/filee"; + }; + + hiddenDir = testers.invalidateFetcherByDrvHash fetchzip { + url = "file://${runCommand "hiddendir.tar" {} '' + mkdir .foo + tar -cf $out .foo + ''}"; + sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; }; } diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 691b2c5c6e60..a5d6108513ce 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -26,7 +26,6 @@ , git , dart , nukeReferences -, targetPlatform , bash , curl , unzip @@ -57,7 +56,7 @@ let 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"; + name = "${self.name}-deps-flutter-v${flutter.unwrapped.version}-${stdenvNoCC.targetPlatform.system}.tar.gz"; nativeBuildInputs = flutterDeps ++ [ nukeReferences @@ -88,7 +87,8 @@ let # 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" + [[ -e .packages ]] && mv .packages "$RES/f" + mv .dart_tool .flutter-plugins .flutter-plugins-dependencies "$RES/f" # replace paths with placeholders find "$RES" -type f -exec sed -i \ @@ -119,7 +119,7 @@ let 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" + [[ -e "$RES/f/.packages" ]] && remove_line_matching "$RES/f/.packages" "Generated by pub" # nuke refs find "$RES" -type f -exec nuke-refs {} + diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index 84d9023209d3..448143f76908 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -83,9 +83,12 @@ let inherit (args) src; inherit (go) GOOS GOARCH; + prePatch = args.prePatch or ""; patches = args.patches or []; patchFlags = args.patchFlags or []; + postPatch = args.postPatch or ""; preBuild = args.preBuild or ""; + postBuild = args.postBuild or ""; sourceRoot = args.sourceRoot or ""; GO111MODULE = "on"; @@ -209,7 +212,7 @@ let flags+=($buildFlags "''${buildFlagsArray[@]}") flags+=(''${tags:+-tags=${lib.concatStringsSep "," tags}}) flags+=(''${ldflags:+-ldflags="$ldflags"}) - flags+=("-v" "-p" "$NIX_BUILD_CORES") + flags+=("-p" "$NIX_BUILD_CORES") if [ "$cmd" = "test" ]; then flags+=(-vet=off) diff --git a/pkgs/build-support/go/package.nix b/pkgs/build-support/go/package.nix index 957a65572b85..ba1ab37a0c0e 100644 --- a/pkgs/build-support/go/package.nix +++ b/pkgs/build-support/go/package.nix @@ -168,7 +168,7 @@ let flags+=($buildFlags "''${buildFlagsArray[@]}") flags+=(''${tags:+-tags=${lib.concatStringsSep "," tags}}) flags+=(''${ldflags:+-ldflags="$ldflags"}) - flags+=("-v" "-p" "$NIX_BUILD_CORES") + flags+=("-p" "$NIX_BUILD_CORES") if [ "$cmd" = "test" ]; then flags+=(-vet=off) diff --git a/pkgs/build-support/make-hardcode-gsettings-patch/default.nix b/pkgs/build-support/make-hardcode-gsettings-patch/default.nix new file mode 100644 index 000000000000..a1d2de21c4cb --- /dev/null +++ b/pkgs/build-support/make-hardcode-gsettings-patch/default.nix @@ -0,0 +1,60 @@ +{ + runCommand, + git, + coccinelle, + python3, +}: + +/* + Can be used as part of an update script to automatically create a patch + hardcoding the path of all GSettings schemas in C code. + For example: + passthru = { + hardcodeGsettingsPatch = makeHardcodeGsettingsPatch { + inherit src; + schemaIdToVariableMapping = { + ... + }; + }; + + updateScript = + let + updateSource = ...; + updatePatch = _experimental-update-script-combinators.copyAttrOutputToFile "evolution-ews.hardcodeGsettingsPatch" ./hardcode-gsettings.patch; + in + _experimental-update-script-combinators.sequence [ + updateSource + updatePatch + ]; + }; + } + takes as input a mapping from schema path to variable name. + For example `{ "org.gnome.evolution" = "EVOLUTION_SCHEMA_PATH"; }` + hardcodes looking for `org.gnome.evolution` into `@EVOLUTION_SCHEMA_PATH@`. + All schemas must be listed. +*/ +{ + src, + schemaIdToVariableMapping, +}: + +runCommand + "hardcode-gsettings.patch" + { + inherit src; + nativeBuildInputs = [ + git + coccinelle + python3 # For patch script + ]; + } + '' + unpackPhase + cd "''${sourceRoot:-.}" + set -x + cp ${builtins.toFile "glib-schema-to-var.json" (builtins.toJSON schemaIdToVariableMapping)} ./glib-schema-to-var.json + git init + git add -A + spatch --sp-file "${./hardcode-gsettings.cocci}" --dir . --in-place + git diff > "$out" + '' diff --git a/pkgs/build-support/make-hardcode-gsettings-patch/hardcode-gsettings.cocci b/pkgs/build-support/make-hardcode-gsettings-patch/hardcode-gsettings.cocci new file mode 100644 index 000000000000..a265f5fac384 --- /dev/null +++ b/pkgs/build-support/make-hardcode-gsettings-patch/hardcode-gsettings.cocci @@ -0,0 +1,142 @@ +/** + * Since Nix does not have a standard location like /usr/share, + * where GSettings system could look for schemas, we need to point the software to a correct location somehow. + * For executables, we handle this using wrappers but this is not an option for libraries like e-d-s. + * Instead, we hardcode the schema path when creating the settings. + * A schema path (ie org.gnome.evolution) can be replaced by @EVOLUTION_SCHEMA_ID@ + * which is then replaced at build time by substituteAll. + * The mapping is provided in a json file ./glib-schema-to-var.json + */ + +@initialize:python@ +@@ +import json + +cpp_constants = {} + +def register_cpp_constant(const_name, val): + cpp_constants[const_name] = val.strip() + +def resolve_cpp_constant(const_name): + return cpp_constants.get(const_name, const_name) + +with open("./glib-schema-to-var.json") as mapping_file: + schema_to_var = json.load(mapping_file); + +def get_schema_directory(schema_id): + # Sometimes the schema id is referenced using C preprocessor #define constant in the same file + # let’s try to resolve it first. + schema_id = resolve_cpp_constant(schema_id.strip()).strip('"') + if schema_id in schema_to_var: + return f'"@{schema_to_var[schema_id]}@"' + raise Exception(f"Unknown schema path {schema_id!r}, please add it to ./glib-schema-to-var.json") + +@find_cpp_constants@ +identifier const_name; +expression val; +@@ + +#define const_name val + +@script:python record_cpp_constants depends on find_cpp_constants@ +const_name << find_cpp_constants.const_name; +val << find_cpp_constants.val; +@@ + +register_cpp_constant(const_name, val) + + +@depends on ever record_cpp_constants || never record_cpp_constants@ +// We want to run after #define constants have been collected but even if there are no #defines. +expression SCHEMA_ID; +expression settings; +// Coccinelle does not like autocleanup macros in + sections, +// let’s use fresh id with concatenation to produce the code as a string. +fresh identifier schema_source_decl = "g_autoptr(GSettingsSchemaSource) " ## "schema_source"; +fresh identifier schema_decl = "g_autoptr(GSettingsSchema) " ## "schema"; +fresh identifier SCHEMA_DIRECTORY = script:python(SCHEMA_ID) { get_schema_directory(SCHEMA_ID) }; +@@ +-settings = g_settings_new(SCHEMA_ID); ++{ ++ schema_source_decl; ++ schema_decl; ++ schema_source = g_settings_schema_source_new_from_directory(SCHEMA_DIRECTORY, ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, SCHEMA_ID, FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++} + + +@depends on ever record_cpp_constants || never record_cpp_constants@ +// We want to run after #define constants have been collected but even if there are no #defines. +expression SCHEMA_ID; +expression settings; +expression BACKEND; +// Coccinelle does not like autocleanup macros in + sections, +// let’s use fresh id with concatenation to produce the code as a string. +fresh identifier schema_source_decl = "g_autoptr(GSettingsSchemaSource) " ## "schema_source"; +fresh identifier schema_decl = "g_autoptr(GSettingsSchema) " ## "schema"; +fresh identifier SCHEMA_DIRECTORY = script:python(SCHEMA_ID) { get_schema_directory(SCHEMA_ID) }; +@@ +-settings = g_settings_new_with_backend(SCHEMA_ID, BACKEND); ++{ ++ schema_source_decl; ++ schema_decl; ++ schema_source = g_settings_schema_source_new_from_directory(SCHEMA_DIRECTORY, ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, SCHEMA_ID, FALSE); ++ settings = g_settings_new_full(schema, BACKEND, NULL); ++} + + +@depends on ever record_cpp_constants || never record_cpp_constants@ +// We want to run after #define constants have been collected but even if there are no #defines. +expression SCHEMA_ID; +expression settings; +expression BACKEND; +expression PATH; +// Coccinelle does not like autocleanup macros in + sections, +// let’s use fresh id with concatenation to produce the code as a string. +fresh identifier schema_source_decl = "g_autoptr(GSettingsSchemaSource) " ## "schema_source"; +fresh identifier schema_decl = "g_autoptr(GSettingsSchema) " ## "schema"; +fresh identifier SCHEMA_DIRECTORY = script:python(SCHEMA_ID) { get_schema_directory(SCHEMA_ID) }; +@@ +-settings = g_settings_new_with_backend_and_path(SCHEMA_ID, BACKEND, PATH); ++{ ++ schema_source_decl; ++ schema_decl; ++ schema_source = g_settings_schema_source_new_from_directory(SCHEMA_DIRECTORY, ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, SCHEMA_ID, FALSE); ++ settings = g_settings_new_full(schema, BACKEND, PATH); ++} + + +@depends on ever record_cpp_constants || never record_cpp_constants@ +// We want to run after #define constants have been collected but even if there are no #defines. +expression SCHEMA_ID; +expression settings; +expression PATH; +// Coccinelle does not like autocleanup macros in + sections, +// let’s use fresh id with concatenation to produce the code as a string. +fresh identifier schema_source_decl = "g_autoptr(GSettingsSchemaSource) " ## "schema_source"; +fresh identifier schema_decl = "g_autoptr(GSettingsSchema) " ## "schema"; +fresh identifier SCHEMA_DIRECTORY = script:python(SCHEMA_ID) { get_schema_directory(SCHEMA_ID) }; +@@ +-settings = g_settings_new_with_path(SCHEMA_ID, PATH); ++{ ++ schema_source_decl; ++ schema_decl; ++ schema_source = g_settings_schema_source_new_from_directory(SCHEMA_DIRECTORY, ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, SCHEMA_ID, FALSE); ++ settings = g_settings_new_full(schema, NULL, PATH); ++} diff --git a/pkgs/build-support/make-impure-test.nix b/pkgs/build-support/make-impure-test.nix new file mode 100644 index 000000000000..84d0b30f426a --- /dev/null +++ b/pkgs/build-support/make-impure-test.nix @@ -0,0 +1,96 @@ +/* Create tests that run in the nix sandbox with additional access to selected host paths + + This is for example useful for testing hardware where a tests needs access to + /sys and optionally more. + + The following example shows a test that accesses the GPU: + + Example: + makeImpureTest { + name = "opencl"; + testedPackage = "mypackage"; # Or testPath = "mypackage.impureTests.opencl.testDerivation" + + sandboxPaths = [ "/sys" "/dev/dri" ]; # Defaults to ["/sys"] + prepareRunCommands = ""; # (Optional) Setup for the runScript + nixFlags = []; # (Optional) nix-build options for the runScript + + testScript = "..."; + } + + Save as `test.nix` next to a package and reference it from the package: + passthru.impureTests = { opencl = callPackage ./test.nix {}; }; + + `makeImpureTest` will return here a script that contains the actual nix-build command including all necessary sandbox flags. + + It can be executed like this: + $(nix-build -A mypackage.impureTests) + + Rerun an already cached test: + $(nix-build -A mypackage.impureTests) --check +*/ +{ lib +, stdenv +, writeShellScript + +, name +, testedPackage ? null +, testPath ? "${testedPackage}.impureTests.${name}.testDerivation" +, sandboxPaths ? [ "/sys" ] +, prepareRunCommands ? "" +, nixFlags ? [ ] +, testScript +, ... +} @ args: + +let + sandboxPathsTests = builtins.map (path: "[[ ! -e '${path}' ]]") sandboxPaths; + sandboxPathsTest = lib.concatStringsSep " || " sandboxPathsTests; + sandboxPathsList = lib.concatStringsSep " " sandboxPaths; + + testDerivation = stdenv.mkDerivation (lib.recursiveUpdate + { + name = "test-run-${name}"; + + requiredSystemFeatures = [ "nixos-test" ]; + + buildCommand = '' + mkdir -p $out + + if ${sandboxPathsTest}; then + echo 'Run this test as *root* with `--option extra-sandbox-paths '"'${sandboxPathsList}'"'`' + exit 1 + fi + + # Run test + ${testScript} + ''; + + passthru.runScript = runScript; + } + (builtins.removeAttrs args [ + "lib" + "stdenv" + "writeShellScript" + + "name" + "testedPackage" + "testPath" + "sandboxPaths" + "prepareRunCommands" + "nixFlags" + "testScript" + ]) + ); + + runScript = writeShellScript "run-script-${name}" '' + set -euo pipefail + + ${prepareRunCommands} + + sudo nix-build --option extra-sandbox-paths '${sandboxPathsList}' ${lib.escapeShellArgs nixFlags} -A ${testPath} "$@" + ''; +in +# The main output is the run script, inject the derivation for the actual test +runScript.overrideAttrs (old: { + passthru = { inherit testDerivation; }; +}) diff --git a/pkgs/build-support/make-pkgconfigitem/default.nix b/pkgs/build-support/make-pkgconfigitem/default.nix index 288ca3810eb8..d3bcabbb940f 100644 --- a/pkgs/build-support/make-pkgconfigitem/default.nix +++ b/pkgs/build-support/make-pkgconfigitem/default.nix @@ -65,5 +65,5 @@ writeTextFile { name = "${name}.pc"; destination = "/lib/pkgconfig/${name}.pc"; text = builtins.concatStringsSep "\n" content; - checkPhase = ''${buildPackages.pkg-config}/bin/pkg-config --validate "$target"''; + checkPhase = ''${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config --validate "$target"''; } diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/build-support/mkshell/default.nix index e7552f434848..39b02a47141a 100644 --- a/pkgs/build-support/mkshell/default.nix +++ b/pkgs/build-support/mkshell/default.nix @@ -44,12 +44,13 @@ stdenv.mkDerivation ({ phases = [ "buildPhase" ]; buildPhase = '' - echo "------------------------------------------------------------" >>$out - echo " WARNING: the existence of this path is not guaranteed." >>$out - echo " It is an internal implementation detail for pkgs.mkShell." >>$out - echo "------------------------------------------------------------" >>$out - echo >> $out - # Record all build inputs as runtime dependencies - export >> $out + { echo "------------------------------------------------------------"; + echo " WARNING: the existence of this path is not guaranteed."; + echo " It is an internal implementation detail for pkgs.mkShell."; + echo "------------------------------------------------------------"; + echo; + # Record all build inputs as runtime dependencies + export; + } >> "$out" ''; } // rest) diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix index 5ab86996e56b..26cc678c571e 100644 --- a/pkgs/build-support/node/build-npm-package/default.nix +++ b/pkgs/build-support/node/build-npm-package/default.nix @@ -4,7 +4,9 @@ , src ? null , srcs ? null , sourceRoot ? null +, prePatch ? "" , patches ? [ ] +, postPatch ? "" , nativeBuildInputs ? [ ] , buildInputs ? [ ] # The output hash of the dependencies for this project. @@ -30,7 +32,7 @@ let npmDeps = fetchNpmDeps { - inherit src srcs sourceRoot patches; + inherit src srcs sourceRoot prePatch patches postPatch; name = "${name}-npm-deps"; hash = npmDepsHash; }; diff --git a/pkgs/build-support/node/build-npm-package/hooks/default.nix b/pkgs/build-support/node/build-npm-package/hooks/default.nix index ff0930426d4e..65ac661cea51 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/default.nix +++ b/pkgs/build-support/node/build-npm-package/hooks/default.nix @@ -26,7 +26,7 @@ npmInstallHook = makeSetupHook { name = "npm-install-hook"; - deps = [ makeWrapper ]; + deps = [ buildPackages.makeWrapper ]; substitutions = { hostNode = "${nodejs}/bin/node"; jq = "${buildPackages.jq}/bin/jq"; diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-build-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-build-hook.sh index 7f601512c7e7..b712e3a0543a 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-build-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-build-hook.sh @@ -20,7 +20,7 @@ npmBuildHook() { echo echo "Here are a few things you can try, depending on the error:" echo "1. Make sure your build script ($npmBuildScript) exists" - echo " If there is none, set `dontNpmBuild = true`." + echo ' If there is none, set `dontNpmBuild = true`.' echo '2. If the error being thrown is something similar to "error:0308010C:digital envelope routines::unsupported", add `NODE_OPTIONS = "--openssl-legacy-provider"` to your derivation' echo " See https://github.com/webpack/webpack/issues/14532 for more information." echo diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh index 6fa6a0f940b1..a31118626877 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh @@ -28,7 +28,7 @@ npmConfigHook() { if ! [ -e "$srcLockfile" ]; then echo echo "ERROR: Missing package-lock.json from src. Expected to find it at: $srcLockfile" - echo "Hint: You can use the patches attribute to add a package-lock.json manually to the build." + echo "Hint: You can copy a vendored package-lock.json file via postPatch." echo exit 1 diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh index c3983e289568..59ea2da993d8 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh @@ -27,7 +27,7 @@ npmInstallHook() { local -r nodeModulesPath="$packageOut/node_modules" if [ ! -d "$nodeModulesPath" ]; then - npm prune --omit dev $npmInstallFlags "${npmInstallFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}" + npm prune --omit dev --no-save $npmInstallFlags "${npmInstallFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}" find node_modules -maxdepth 1 -type d -empty -delete cp -r node_modules "$nodeModulesPath" diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index 7d5ea7cbfbe8..7d6277df987f 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -84,7 +84,7 @@ hash = "sha256-X9mCwPqV5yP0S2GonNvpYnLSLJMd/SUIked+hMRxDpA="; }; - hash = "sha256-5Mg7KDJLMM5e/7BCHGinGAnBRft2ySQzvKW06p3u/0o="; + hash = "sha256-tEdElWJ+KBTxBobzXBpPopQSwK2usGW/it1+yfbVzBw="; }; linkDependencies = makeTest { @@ -107,7 +107,7 @@ hash = "sha256-1fGNxYJi1I4cXK/jinNG+Y6tPEOhP3QAqWOBEQttS9E="; }; - hash = "sha256-8xF8F74nHwL9KPN2QLsxnfvsk0rNCKOZniYJQCD5u/I="; + hash = "sha256-+KA8/orSBJ4EhuSyQO8IKSxsN/FAsYU3lOzq+awuxNQ="; }; }; @@ -140,14 +140,14 @@ buildPhase = '' runHook preBuild - if [[ ! -f package-lock.json ]]; then + if [[ ! -e package-lock.json ]]; then echo echo "ERROR: The package-lock.json file does not exist!" echo echo "package-lock.json is required to make sure that npmDepsHash doesn't change" echo "when packages are updated on npm." echo - echo "Hint: You can use the patches attribute to add a package-lock.json manually to the build." + echo "Hint: You can copy a vendored package-lock.json file via postPatch." echo exit 1 diff --git a/pkgs/build-support/node/fetch-npm-deps/src/main.rs b/pkgs/build-support/node/fetch-npm-deps/src/main.rs index cf9651d42d64..3d2204071a66 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/main.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/main.rs @@ -421,7 +421,7 @@ fn main() -> anyhow::Result<()> { data = Command::new("tar") .args([ "--sort=name", - "--mtime=0", + "--mtime=@0", "--owner=0", "--group=0", "--numeric-owner", diff --git a/pkgs/build-support/nuke-references/default.nix b/pkgs/build-support/nuke-references/default.nix index 8dd9704aa4b4..c2dfe27b2c60 100644 --- a/pkgs/build-support/nuke-references/default.nix +++ b/pkgs/build-support/nuke-references/default.nix @@ -32,8 +32,10 @@ stdenvNoCC.mkDerivation { ''; # FIXME: get rid of perl dependency. - inherit perl; - inherit (builtins) storeDir; - shell = lib.getBin shell + (shell.shellPath or ""); - signingUtils = if darwinCodeSign then signingUtils else null; + env = { + inherit perl; + inherit (builtins) storeDir; + shell = lib.getBin shell + (shell.shellPath or ""); + signingUtils = if darwinCodeSign then signingUtils else ""; + }; } diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index 2ded76d3cd4a..ce3b389b9cee 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -34,7 +34,9 @@ stdenv.mkDerivation ({ runHook postInstall ''; -} // (builtins.removeAttrs args [ "minimalOCamlVersion" "duneVersion" ]) // { + strictDeps = true; + +} // (builtins.removeAttrs args [ "minimalOCamlVersion" "duneVersion" ]) // { name = "ocaml${ocaml.version}-${pname}-${version}"; diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index 312d2fe02610..f68597662608 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -36,27 +36,21 @@ stdenv.mkDerivation { preferLocalBuild = true; - shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or ""; - - inherit targetPrefix suffixSalt baseBinName; - outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (pkg-config ? doc) "doc"); passthru = { + inherit targetPrefix suffixSalt; inherit pkg-config; }; strictDeps = true; dontBuild = true; dontConfigure = true; + dontUnpack = true; # Additional flags passed to pkg-config. addFlags = lib.optional stdenv.targetPlatform.isStatic "--static"; - unpackPhase = '' - src=$PWD - ''; - installPhase = '' mkdir -p $out/bin $out/nix-support @@ -83,8 +77,6 @@ stdenv.mkDerivation { ln -s ${pkg-config}/share $out/share ''; - wrapperName = "PKG_CONFIG_WRAPPER"; - setupHooks = [ ../setup-hooks/role.bash ./setup-hook.sh @@ -120,6 +112,12 @@ stdenv.mkDerivation { ## + extraBuildCommands; + env = { + shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or ""; + wrapperName = "PKG_CONFIG_WRAPPER"; + inherit targetPrefix suffixSalt baseBinName; + }; + meta = let pkg-config_ = if pkg-config != null then pkg-config else {}; in (if pkg-config_ ? meta then removeAttrs pkg-config.meta ["priority"] else {}) // diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 9104bf2dce5c..679adad827da 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -43,9 +43,8 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( [ ! -f /etc/lsb-release ] || (source /etc/lsb-release; echo "OS release: $DISTRIB_DESCRIPTION") echo "System/kernel: $(uname -a)" if test -e /etc/debian_version; then echo "Debian release: $(cat /etc/debian_version)"; fi - header "installed Debian packages" + echo "installed Debian packages" dpkg-query --list - stopNest ''; installPhase = '' @@ -73,11 +72,10 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( [ "$(echo $out/debs/*.deb)" != "" ] for i in $out/debs/*.deb; do - header "Generated DEB package: $i" + echo "Generated DEB package: $i" dpkg-deb --info "$i" pkgName=$(dpkg-deb -W "$i" | awk '{print $1}') echo "file deb $i" >> $out/nix-support/hydra-build-products - stopNest done dpkg -i $out/debs/*.deb diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index ac51b90e0163..9578fbf482f2 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -74,10 +74,9 @@ stdenv.mkDerivation ( if test -n "$succeedOnFailure"; then if test -n "$keepBuildDirectory"; then KEEPBUILDDIR="$out/`basename $TMPDIR`" - header "Copying build directory to $KEEPBUILDDIR" + echo "Copying build directory to $KEEPBUILDDIR" mkdir -p $KEEPBUILDDIR cp -R "$TMPDIR/"* $KEEPBUILDDIR - stopNest fi fi ''; @@ -124,7 +123,7 @@ stdenv.mkDerivation ( echo "$system" > $out/nix-support/system if [ -z "${toString doingAnalysis}" ]; then - for i in $outputs; do + for i in $(getAllOutputNames); do if [ "$i" = out ]; then j=none; else j="$i"; fi mkdir -p ''${!i}/nix-support echo "nix-build $j ''${!i}" >> ''${!i}/nix-support/hydra-build-products diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index c7129ae83f92..d624d071cc21 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation ( - # First, attributes that can be overriden by the caller (via args): + # First, attributes that can be overridden by the caller (via args): { # By default, only configure and build a source distribution. # Some packages can only build a distribution after a general @@ -64,10 +64,9 @@ stdenv.mkDerivation ( if test -n "$succeedOnFailure"; then if test -n "$keepBuildDirectory"; then KEEPBUILDDIR="$out/`basename $TMPDIR`" - header "Copying build directory to $KEEPBUILDDIR" + echo "Copying build directory to $KEEPBUILDDIR" mkdir -p $KEEPBUILDDIR cp -R "$TMPDIR/"* $KEEPBUILDDIR - stopNest fi fi ''; diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 473a91f9ce07..5168eb6ab759 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -32,7 +32,7 @@ let version_ = lib.splitString "-" crateVersion; completeDepsDir = lib.concatStringsSep " " completeDeps; completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps; envFeatures = lib.concatStringsSep " " ( - map (f: lib.replaceChars ["-"] ["_"] (lib.toUpper f)) crateFeatures + map (f: lib.replaceStrings ["-"] ["_"] (lib.toUpper f)) crateFeatures ); in '' ${echo_colored colors} @@ -130,7 +130,7 @@ in '' export CARGO_CFG_UNIX=1 export CARGO_CFG_TARGET_ENV="gnu" export CARGO_CFG_TARGET_ENDIAN=${if stdenv.hostPlatform.parsed.cpu.significantByte.name == "littleEndian" then "little" else "big"} - export CARGO_CFG_TARGET_POINTER_WIDTH=${toString stdenv.hostPlatform.parsed.cpu.bits} + export CARGO_CFG_TARGET_POINTER_WIDTH=${with stdenv.hostPlatform; toString (if isILP32 then 32 else parsed.cpu.bits)} export CARGO_CFG_TARGET_VENDOR=${stdenv.hostPlatform.parsed.vendor.name} export CARGO_MANIFEST_DIR=$(pwd) @@ -186,7 +186,10 @@ in '' set +e EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) EXTRA_FEATURES=$(sed -n "s/^cargo:rustc-cfg=\(.*\)/--cfg \1/p" target/build/${crateName}.opt | tr '\n' ' ') - EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_LINK_ARGS=$(sed -n "s/^cargo:rustc-link-arg=\(.*\)/-C link-arg=\1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_LINK_ARGS_BINS=$(sed -n "s/^cargo:rustc-link-arg-bins=\(.*\)/-C link-arg=\1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_LINK_ARGS_LIB=$(sed -n "s/^cargo:rustc-link-arg-lib=\(.*\)/-C link-arg=\1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_LINK_LIBS=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) # We want to read part of every line that has cargo:rustc-env= prefix and diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh index 39f7d53f6f75..0181ae432c85 100644 --- a/pkgs/build-support/rust/build-rust-crate/lib.sh +++ b/pkgs/build-support/rust/build-rust-crate/lib.sh @@ -17,6 +17,8 @@ build_lib() { -L dependency=target/deps \ --cap-lints allow \ $LINK \ + $EXTRA_LINK_ARGS \ + $EXTRA_LINK_ARGS_LIB \ $LIB_RUSTC_OPTS \ $BUILD_OUT_DIR \ $EXTRA_BUILD \ @@ -47,6 +49,8 @@ build_bin() { --out-dir target/bin \ -L dependency=target/deps \ $LINK \ + $EXTRA_LINK_ARGS \ + $EXTRA_LINK_ARGS_BINS \ $EXTRA_LIB \ --cap-lints allow \ $BUILD_OUT_DIR \ @@ -74,6 +78,10 @@ build_bin_test() { build_bin_test_file() { local file="$1" local derived_crate_name="${file//\//_}" + # Make sure to strip the top level `tests` directory: see #204051. Note that + # a forward slash has now become an underscore due to the substitution + # above. + derived_crate_name=${derived_crate_name#"tests_"} derived_crate_name="${derived_crate_name%.rs}" build_bin_test "$derived_crate_name" "$file" } @@ -94,7 +102,7 @@ setup_link_paths() { done fi done - echo "$EXTRA_LINK" | while read i; do + echo "$EXTRA_LINK_LIBS" | while read i; do if [[ ! -z "$i" ]]; then for library in $i; do echo "-l $library" >> target/link diff --git a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix index ab9b0a13ae77..4831c1062715 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix @@ -1,6 +1,6 @@ -{ lib, buildPlatform, buildRustCrate, fetchgit }: -let kernel = buildPlatform.parsed.kernel.name; - abi = buildPlatform.parsed.abi.name; +{ lib, stdenv, buildRustCrate, fetchgit }: +let kernel = stdenv.buildPlatform.parsed.kernel.name; + abi = stdenv.buildPlatform.parsed.abi.name; include = includedFiles: src: builtins.filterSource (path: type: lib.lists.any (f: let p = toString (src + ("/" + f)); in diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index a4536a1751c8..1ecef4c8e327 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -576,7 +576,7 @@ let expectedFiles = [ "./bin/test_binary1" ] ++ lib.optionals stdenv.isDarwin [ - # On Darwin, the debug symbols are in a seperate directory. + # On Darwin, the debug symbols are in a separate directory. "./bin/test_binary1.dSYM/Contents/Info.plist" "./bin/test_binary1.dSYM/Contents/Resources/DWARF/test_binary1" ]; diff --git a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix index 0f97c9b724bd..e15390c3ffa8 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix @@ -2931,7 +2931,7 @@ rec { /* Returns a crate which depends on successful test execution of crate given as the second argument. - testCrateFlags: list of flags to pass to the test exectuable + testCrateFlags: list of flags to pass to the test executable testInputs: list of packages that should be available during test execution */ crateWithTest = { crate, testCrate, testCrateFlags, testInputs, testPreRun, testPostRun }: diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 812831c2959c..69ee4f56b98f 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -5,11 +5,14 @@ , stdenv , callPackage , cacert -, git , cargoBuildHook , cargoCheckHook , cargoInstallHook +, cargoNextestHook , cargoSetupHook +, cargo +, cargo-auditable +, cargo-auditable-cargo-wrapper , rustc , libiconv , windows @@ -40,6 +43,9 @@ , checkNoDefaultFeatures ? buildNoDefaultFeatures , buildFeatures ? [ ] , checkFeatures ? buildFeatures +, useNextest ? false +, auditable ? false # TODO: change to true + , depsExtraArgs ? {} # Toggles whether a custom sysroot is created when the target is a .json file. @@ -113,17 +119,21 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg patchRegistryDeps = ./patch-registry-deps; - nativeBuildInputs = nativeBuildInputs ++ [ + nativeBuildInputs = nativeBuildInputs ++ lib.optionals auditable [ + (cargo-auditable-cargo-wrapper.override { + inherit cargo cargo-auditable; + }) + ] ++ [ cacert - git cargoBuildHook - cargoCheckHook + (if useNextest then cargoNextestHook else cargoCheckHook) cargoInstallHook cargoSetupHook rustc ]; buildInputs = buildInputs + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ windows.pthreads ]; patches = cargoPatches ++ patches; diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix deleted file mode 100644 index 46bbff92a9cc..000000000000 --- a/pkgs/build-support/rust/carnix.nix +++ /dev/null @@ -1,259 +0,0 @@ -# Generated by carnix 0.9.10: carnix generate-nix -{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }: -with buildRustCrateHelpers; -let inherit (lib.lists) fold; - inherit (lib.attrsets) recursiveUpdate; -in -rec { - crates = cratesIO; - carnix = crates.crates.carnix."0.10.0" deps; - __all = [ (carnix {}) ]; - deps.aho_corasick."0.6.10" = { - memchr = "2.2.0"; - }; - deps.ansi_term."0.11.0" = { - winapi = "0.3.6"; - }; - deps.argon2rs."0.2.5" = { - blake2_rfc = "0.2.18"; - scoped_threadpool = "0.1.9"; - }; - deps.arrayvec."0.4.10" = { - nodrop = "0.1.13"; - }; - deps.atty."0.2.11" = { - termion = "1.5.1"; - libc = "0.2.50"; - winapi = "0.3.6"; - }; - deps.autocfg."0.1.2" = {}; - deps.backtrace."0.3.14" = { - cfg_if = "0.1.7"; - rustc_demangle = "0.1.13"; - autocfg = "0.1.2"; - backtrace_sys = "0.1.28"; - libc = "0.2.50"; - winapi = "0.3.6"; - }; - deps.backtrace_sys."0.1.28" = { - libc = "0.2.50"; - cc = "1.0.32"; - }; - deps.bitflags."1.0.4" = {}; - deps.blake2_rfc."0.2.18" = { - arrayvec = "0.4.10"; - constant_time_eq = "0.1.3"; - }; - deps.carnix."0.10.0" = { - clap = "2.32.0"; - dirs = "1.0.5"; - env_logger = "0.6.1"; - failure = "0.1.5"; - failure_derive = "0.1.5"; - itertools = "0.8.0"; - log = "0.4.6"; - nom = "3.2.1"; - regex = "1.1.2"; - serde = "1.0.89"; - serde_derive = "1.0.89"; - serde_json = "1.0.39"; - tempdir = "0.3.7"; - toml = "0.5.0"; - url = "1.7.2"; - }; - deps.cc."1.0.32" = {}; - deps.cfg_if."0.1.7" = {}; - deps.clap."2.32.0" = { - atty = "0.2.11"; - bitflags = "1.0.4"; - strsim = "0.7.0"; - textwrap = "0.10.0"; - unicode_width = "0.1.5"; - vec_map = "0.8.1"; - ansi_term = "0.11.0"; - }; - deps.cloudabi."0.0.3" = { - bitflags = "1.0.4"; - }; - deps.constant_time_eq."0.1.3" = {}; - deps.dirs."1.0.5" = { - redox_users = "0.3.0"; - libc = "0.2.50"; - winapi = "0.3.6"; - }; - deps.either."1.5.1" = {}; - deps.env_logger."0.6.1" = { - atty = "0.2.11"; - humantime = "1.2.0"; - log = "0.4.6"; - regex = "1.1.2"; - termcolor = "1.0.4"; - }; - deps.failure."0.1.5" = { - backtrace = "0.3.14"; - failure_derive = "0.1.5"; - }; - deps.failure_derive."0.1.5" = { - proc_macro2 = "0.4.27"; - quote = "0.6.11"; - syn = "0.15.29"; - synstructure = "0.10.1"; - }; - deps.fuchsia_cprng."0.1.1" = {}; - deps.humantime."1.2.0" = { - quick_error = "1.2.2"; - }; - deps.idna."0.1.5" = { - matches = "0.1.8"; - unicode_bidi = "0.3.4"; - unicode_normalization = "0.1.8"; - }; - deps.itertools."0.8.0" = { - either = "1.5.1"; - }; - deps.itoa."0.4.3" = {}; - deps.lazy_static."1.3.0" = {}; - deps.libc."0.2.50" = {}; - deps.log."0.4.6" = { - cfg_if = "0.1.7"; - }; - deps.matches."0.1.8" = {}; - deps.memchr."1.0.2" = { - libc = "0.2.50"; - }; - deps.memchr."2.2.0" = {}; - deps.nodrop."0.1.13" = {}; - deps.nom."3.2.1" = { - memchr = "1.0.2"; - }; - deps.percent_encoding."1.0.1" = {}; - deps.proc_macro2."0.4.27" = { - unicode_xid = "0.1.0"; - }; - deps.quick_error."1.2.2" = {}; - deps.quote."0.6.11" = { - proc_macro2 = "0.4.27"; - }; - deps.rand."0.4.6" = { - rand_core = "0.3.1"; - rdrand = "0.4.0"; - fuchsia_cprng = "0.1.1"; - libc = "0.2.50"; - winapi = "0.3.6"; - }; - deps.rand_core."0.3.1" = { - rand_core = "0.4.0"; - }; - deps.rand_core."0.4.0" = {}; - deps.rand_os."0.1.3" = { - rand_core = "0.4.0"; - rdrand = "0.4.0"; - cloudabi = "0.0.3"; - fuchsia_cprng = "0.1.1"; - libc = "0.2.50"; - winapi = "0.3.6"; - }; - deps.rdrand."0.4.0" = { - rand_core = "0.3.1"; - }; - deps.redox_syscall."0.1.51" = {}; - deps.redox_termios."0.1.1" = { - redox_syscall = "0.1.51"; - }; - deps.redox_users."0.3.0" = { - argon2rs = "0.2.5"; - failure = "0.1.5"; - rand_os = "0.1.3"; - redox_syscall = "0.1.51"; - }; - deps.regex."1.1.2" = { - aho_corasick = "0.6.10"; - memchr = "2.2.0"; - regex_syntax = "0.6.5"; - thread_local = "0.3.6"; - utf8_ranges = "1.0.2"; - }; - deps.regex_syntax."0.6.5" = { - ucd_util = "0.1.3"; - }; - deps.remove_dir_all."0.5.1" = { - winapi = "0.3.6"; - }; - deps.rustc_demangle."0.1.13" = {}; - deps.ryu."0.2.7" = {}; - deps.scoped_threadpool."0.1.9" = {}; - deps.serde."1.0.89" = {}; - deps.serde_derive."1.0.89" = { - proc_macro2 = "0.4.27"; - quote = "0.6.11"; - syn = "0.15.29"; - }; - deps.serde_json."1.0.39" = { - itoa = "0.4.3"; - ryu = "0.2.7"; - serde = "1.0.89"; - }; - deps.smallvec."0.6.9" = {}; - deps.strsim."0.7.0" = {}; - deps.syn."0.15.29" = { - proc_macro2 = "0.4.27"; - quote = "0.6.11"; - unicode_xid = "0.1.0"; - }; - deps.synstructure."0.10.1" = { - proc_macro2 = "0.4.27"; - quote = "0.6.11"; - syn = "0.15.29"; - unicode_xid = "0.1.0"; - }; - deps.tempdir."0.3.7" = { - rand = "0.4.6"; - remove_dir_all = "0.5.1"; - }; - deps.termcolor."1.0.4" = { - wincolor = "1.0.1"; - }; - deps.termion."1.5.1" = { - libc = "0.2.50"; - redox_syscall = "0.1.51"; - redox_termios = "0.1.1"; - }; - deps.textwrap."0.10.0" = { - unicode_width = "0.1.5"; - }; - deps.thread_local."0.3.6" = { - lazy_static = "1.3.0"; - }; - deps.toml."0.5.0" = { - serde = "1.0.89"; - }; - deps.ucd_util."0.1.3" = {}; - deps.unicode_bidi."0.3.4" = { - matches = "0.1.8"; - }; - deps.unicode_normalization."0.1.8" = { - smallvec = "0.6.9"; - }; - deps.unicode_width."0.1.5" = {}; - deps.unicode_xid."0.1.0" = {}; - deps.url."1.7.2" = { - idna = "0.1.5"; - matches = "0.1.8"; - percent_encoding = "1.0.1"; - }; - deps.utf8_ranges."1.0.2" = {}; - deps.vec_map."0.8.1" = {}; - deps.winapi."0.3.6" = { - winapi_i686_pc_windows_gnu = "0.4.0"; - winapi_x86_64_pc_windows_gnu = "0.4.0"; - }; - deps.winapi_i686_pc_windows_gnu."0.4.0" = {}; - deps.winapi_util."0.1.2" = { - winapi = "0.3.6"; - }; - deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {}; - deps.wincolor."1.0.1" = { - winapi = "0.3.6"; - winapi_util = "0.1.2"; - }; -} diff --git a/pkgs/build-support/rust/crates-io.nix b/pkgs/build-support/rust/crates-io.nix deleted file mode 100644 index 66f98cd99121..000000000000 --- a/pkgs/build-support/rust/crates-io.nix +++ /dev/null @@ -1,7756 +0,0 @@ -{ lib, buildRustCrate, buildRustCrateHelpers }: -with buildRustCrateHelpers; -let inherit (lib.lists) fold; - inherit (lib.attrsets) recursiveUpdate; -in -rec { -# aho-corasick-0.6.10 - - crates.aho_corasick."0.6.10" = deps: { features?(features_.aho_corasick."0.6.10" deps {}) }: buildRustCrate { - crateName = "aho-corasick"; - version = "0.6.10"; - description = "Fast multiple substring searching with finite state machines."; - authors = [ "Andrew Gallant " ]; - sha256 = "0bhasxfpmfmz1460chwsx59vdld05axvmk1nbp3sd48xav3d108p"; - libName = "aho_corasick"; - crateBin = - [{ name = "aho-corasick-dot"; path = "src/main.rs"; }]; - dependencies = mapFeatures features ([ - (crates."memchr"."${deps."aho_corasick"."0.6.10"."memchr"}" deps) - ]); - }; - features_.aho_corasick."0.6.10" = deps: f: updateFeatures f ({ - aho_corasick."0.6.10".default = (f.aho_corasick."0.6.10".default or true); - memchr."${deps.aho_corasick."0.6.10".memchr}".default = true; - }) [ - (features_.memchr."${deps."aho_corasick"."0.6.10"."memchr"}" deps) - ]; - - -# end -# aho-corasick-0.6.8 - - crates.aho_corasick."0.6.8" = deps: { features?(features_.aho_corasick."0.6.8" deps {}) }: buildRustCrate { - crateName = "aho-corasick"; - version = "0.6.8"; - authors = [ "Andrew Gallant " ]; - sha256 = "04bz5m32ykyn946iwxgbrl8nwca7ssxsqma140hgmkchaay80nfr"; - libName = "aho_corasick"; - crateBin = - [{ name = "aho-corasick-dot"; path = "src/main.rs"; }]; - dependencies = mapFeatures features ([ - (crates."memchr"."${deps."aho_corasick"."0.6.8"."memchr"}" deps) - ]); - }; - features_.aho_corasick."0.6.8" = deps: f: updateFeatures f ({ - aho_corasick."0.6.8".default = (f.aho_corasick."0.6.8".default or true); - memchr."${deps.aho_corasick."0.6.8".memchr}".default = true; - }) [ - (features_.memchr."${deps."aho_corasick"."0.6.8"."memchr"}" deps) - ]; - - -# end -# ansi_term-0.11.0 - - crates.ansi_term."0.11.0" = deps: { features?(features_.ansi_term."0.11.0" deps {}) }: buildRustCrate { - crateName = "ansi_term"; - version = "0.11.0"; - authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " "Josh Triplett " ]; - sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v"; - dependencies = (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."ansi_term"."0.11.0"."winapi"}" deps) - ]) else []); - }; - features_.ansi_term."0.11.0" = deps: f: updateFeatures f ({ - ansi_term."0.11.0".default = (f.ansi_term."0.11.0".default or true); - winapi = fold recursiveUpdate {} [ - { "${deps.ansi_term."0.11.0".winapi}"."consoleapi" = true; } - { "${deps.ansi_term."0.11.0".winapi}"."errhandlingapi" = true; } - { "${deps.ansi_term."0.11.0".winapi}"."processenv" = true; } - { "${deps.ansi_term."0.11.0".winapi}".default = true; } - ]; - }) [ - (features_.winapi."${deps."ansi_term"."0.11.0"."winapi"}" deps) - ]; - - -# end -# argon2rs-0.2.5 - - crates.argon2rs."0.2.5" = deps: { features?(features_.argon2rs."0.2.5" deps {}) }: buildRustCrate { - crateName = "argon2rs"; - version = "0.2.5"; - authors = [ "bryant " ]; - sha256 = "1byl9b3wwyrarn8qack21v5fi2qsnn3y5clvikk2apskhmnih1rw"; - dependencies = mapFeatures features ([ - (crates."blake2_rfc"."${deps."argon2rs"."0.2.5"."blake2_rfc"}" deps) - (crates."scoped_threadpool"."${deps."argon2rs"."0.2.5"."scoped_threadpool"}" deps) - ]); - features = mkFeatures (features."argon2rs"."0.2.5" or {}); - }; - features_.argon2rs."0.2.5" = deps: f: updateFeatures f (rec { - argon2rs."0.2.5".default = (f.argon2rs."0.2.5".default or true); - blake2_rfc = fold recursiveUpdate {} [ - { "${deps.argon2rs."0.2.5".blake2_rfc}"."simd_asm" = - (f.blake2_rfc."${deps.argon2rs."0.2.5".blake2_rfc}"."simd_asm" or false) || - (argon2rs."0.2.5"."simd" or false) || - (f."argon2rs"."0.2.5"."simd" or false); } - { "${deps.argon2rs."0.2.5".blake2_rfc}".default = true; } - ]; - scoped_threadpool."${deps.argon2rs."0.2.5".scoped_threadpool}".default = true; - }) [ - (features_.blake2_rfc."${deps."argon2rs"."0.2.5"."blake2_rfc"}" deps) - (features_.scoped_threadpool."${deps."argon2rs"."0.2.5"."scoped_threadpool"}" deps) - ]; - - -# end -# arrayvec-0.4.10 - - crates.arrayvec."0.4.10" = deps: { features?(features_.arrayvec."0.4.10" deps {}) }: buildRustCrate { - crateName = "arrayvec"; - version = "0.4.10"; - description = "A vector with fixed capacity, backed by an array (it can be stored on the stack too). Implements fixed capacity ArrayVec and ArrayString."; - authors = [ "bluss" ]; - sha256 = "0qbh825i59w5wfdysqdkiwbwkrsy7lgbd4pwbyb8pxx8wc36iny8"; - dependencies = mapFeatures features ([ - (crates."nodrop"."${deps."arrayvec"."0.4.10"."nodrop"}" deps) - ]); - features = mkFeatures (features."arrayvec"."0.4.10" or {}); - }; - features_.arrayvec."0.4.10" = deps: f: updateFeatures f (rec { - arrayvec = fold recursiveUpdate {} [ - { "0.4.10"."serde" = - (f.arrayvec."0.4.10"."serde" or false) || - (f.arrayvec."0.4.10".serde-1 or false) || - (arrayvec."0.4.10"."serde-1" or false); } - { "0.4.10"."std" = - (f.arrayvec."0.4.10"."std" or false) || - (f.arrayvec."0.4.10".default or false) || - (arrayvec."0.4.10"."default" or false); } - { "0.4.10".default = (f.arrayvec."0.4.10".default or true); } - ]; - nodrop."${deps.arrayvec."0.4.10".nodrop}".default = (f.nodrop."${deps.arrayvec."0.4.10".nodrop}".default or false); - }) [ - (features_.nodrop."${deps."arrayvec"."0.4.10"."nodrop"}" deps) - ]; - - -# end -# arrayvec-0.4.7 - - crates.arrayvec."0.4.7" = deps: { features?(features_.arrayvec."0.4.7" deps {}) }: buildRustCrate { - crateName = "arrayvec"; - version = "0.4.7"; - authors = [ "bluss" ]; - sha256 = "0fzgv7z1x1qnyd7j32vdcadk4k9wfx897y06mr3bw1yi52iqf4z4"; - dependencies = mapFeatures features ([ - (crates."nodrop"."${deps."arrayvec"."0.4.7"."nodrop"}" deps) - ]); - features = mkFeatures (features."arrayvec"."0.4.7" or {}); - }; - features_.arrayvec."0.4.7" = deps: f: updateFeatures f (rec { - arrayvec = fold recursiveUpdate {} [ - { "0.4.7".default = (f.arrayvec."0.4.7".default or true); } - { "0.4.7".serde = - (f.arrayvec."0.4.7".serde or false) || - (f.arrayvec."0.4.7".serde-1 or false) || - (arrayvec."0.4.7"."serde-1" or false); } - { "0.4.7".std = - (f.arrayvec."0.4.7".std or false) || - (f.arrayvec."0.4.7".default or false) || - (arrayvec."0.4.7"."default" or false); } - ]; - nodrop."${deps.arrayvec."0.4.7".nodrop}".default = (f.nodrop."${deps.arrayvec."0.4.7".nodrop}".default or false); - }) [ - (features_.nodrop."${deps."arrayvec"."0.4.7"."nodrop"}" deps) - ]; - - -# end -# atty-0.2.11 - - crates.atty."0.2.11" = deps: { features?(features_.atty."0.2.11" deps {}) }: buildRustCrate { - crateName = "atty"; - version = "0.2.11"; - authors = [ "softprops " ]; - sha256 = "0by1bj2km9jxi4i4g76zzi76fc2rcm9934jpnyrqd95zw344pb20"; - dependencies = (if kernel == "redox" then mapFeatures features ([ - (crates."termion"."${deps."atty"."0.2.11"."termion"}" deps) - ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."atty"."0.2.11"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."atty"."0.2.11"."winapi"}" deps) - ]) else []); - }; - features_.atty."0.2.11" = deps: f: updateFeatures f ({ - atty."0.2.11".default = (f.atty."0.2.11".default or true); - libc."${deps.atty."0.2.11".libc}".default = (f.libc."${deps.atty."0.2.11".libc}".default or false); - termion."${deps.atty."0.2.11".termion}".default = true; - winapi = fold recursiveUpdate {} [ - { "${deps.atty."0.2.11".winapi}"."consoleapi" = true; } - { "${deps.atty."0.2.11".winapi}"."minwinbase" = true; } - { "${deps.atty."0.2.11".winapi}"."minwindef" = true; } - { "${deps.atty."0.2.11".winapi}"."processenv" = true; } - { "${deps.atty."0.2.11".winapi}"."winbase" = true; } - { "${deps.atty."0.2.11".winapi}".default = true; } - ]; - }) [ - (features_.termion."${deps."atty"."0.2.11"."termion"}" deps) - (features_.libc."${deps."atty"."0.2.11"."libc"}" deps) - (features_.winapi."${deps."atty"."0.2.11"."winapi"}" deps) - ]; - - -# end -# autocfg-0.1.2 - - crates.autocfg."0.1.2" = deps: { features?(features_.autocfg."0.1.2" deps {}) }: buildRustCrate { - crateName = "autocfg"; - version = "0.1.2"; - description = "Automatic cfg for Rust compiler features"; - authors = [ "Josh Stone " ]; - sha256 = "0dv81dwnp1al3j4ffz007yrjv4w1c7hw09gnf0xs3icxiw6qqfs3"; - }; - features_.autocfg."0.1.2" = deps: f: updateFeatures f ({ - autocfg."0.1.2".default = (f.autocfg."0.1.2".default or true); - }) []; - - -# end -# backtrace-0.3.14 - - crates.backtrace."0.3.14" = deps: { features?(features_.backtrace."0.3.14" deps {}) }: buildRustCrate { - crateName = "backtrace"; - version = "0.3.14"; - description = "A library to acquire a stack trace (backtrace) at runtime in a Rust program.\n"; - authors = [ "Alex Crichton " "The Rust Project Developers" ]; - sha256 = "0sp0ib8r5w9sv1g2nkm9yclp16j46yjglw0yhkmh0snf355633mz"; - dependencies = mapFeatures features ([ - (crates."cfg_if"."${deps."backtrace"."0.3.14"."cfg_if"}" deps) - (crates."rustc_demangle"."${deps."backtrace"."0.3.14"."rustc_demangle"}" deps) - ]) - ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ - ] - ++ (if features.backtrace."0.3.14".backtrace-sys or false then [ (crates.backtrace_sys."${deps."backtrace"."0.3.14".backtrace_sys}" deps) ] else [])) else []) - ++ (if (kernel == "linux" || kernel == "darwin") || abi == "sgx" then mapFeatures features ([ - (crates."libc"."${deps."backtrace"."0.3.14"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."backtrace"."0.3.14"."winapi"}" deps) - ]) else []); - - buildDependencies = mapFeatures features ([ - (crates."autocfg"."${deps."backtrace"."0.3.14"."autocfg"}" deps) - ]); - features = mkFeatures (features."backtrace"."0.3.14" or {}); - }; - features_.backtrace."0.3.14" = deps: f: updateFeatures f (rec { - autocfg."${deps.backtrace."0.3.14".autocfg}".default = true; - backtrace = fold recursiveUpdate {} [ - { "0.3.14"."addr2line" = - (f.backtrace."0.3.14"."addr2line" or false) || - (f.backtrace."0.3.14".gimli-symbolize or false) || - (backtrace."0.3.14"."gimli-symbolize" or false); } - { "0.3.14"."backtrace-sys" = - (f.backtrace."0.3.14"."backtrace-sys" or false) || - (f.backtrace."0.3.14".libbacktrace or false) || - (backtrace."0.3.14"."libbacktrace" or false); } - { "0.3.14"."coresymbolication" = - (f.backtrace."0.3.14"."coresymbolication" or false) || - (f.backtrace."0.3.14".default or false) || - (backtrace."0.3.14"."default" or false); } - { "0.3.14"."dbghelp" = - (f.backtrace."0.3.14"."dbghelp" or false) || - (f.backtrace."0.3.14".default or false) || - (backtrace."0.3.14"."default" or false); } - { "0.3.14"."dladdr" = - (f.backtrace."0.3.14"."dladdr" or false) || - (f.backtrace."0.3.14".default or false) || - (backtrace."0.3.14"."default" or false); } - { "0.3.14"."findshlibs" = - (f.backtrace."0.3.14"."findshlibs" or false) || - (f.backtrace."0.3.14".gimli-symbolize or false) || - (backtrace."0.3.14"."gimli-symbolize" or false); } - { "0.3.14"."gimli" = - (f.backtrace."0.3.14"."gimli" or false) || - (f.backtrace."0.3.14".gimli-symbolize or false) || - (backtrace."0.3.14"."gimli-symbolize" or false); } - { "0.3.14"."libbacktrace" = - (f.backtrace."0.3.14"."libbacktrace" or false) || - (f.backtrace."0.3.14".default or false) || - (backtrace."0.3.14"."default" or false); } - { "0.3.14"."libunwind" = - (f.backtrace."0.3.14"."libunwind" or false) || - (f.backtrace."0.3.14".default or false) || - (backtrace."0.3.14"."default" or false); } - { "0.3.14"."memmap" = - (f.backtrace."0.3.14"."memmap" or false) || - (f.backtrace."0.3.14".gimli-symbolize or false) || - (backtrace."0.3.14"."gimli-symbolize" or false); } - { "0.3.14"."object" = - (f.backtrace."0.3.14"."object" or false) || - (f.backtrace."0.3.14".gimli-symbolize or false) || - (backtrace."0.3.14"."gimli-symbolize" or false); } - { "0.3.14"."rustc-serialize" = - (f.backtrace."0.3.14"."rustc-serialize" or false) || - (f.backtrace."0.3.14".serialize-rustc or false) || - (backtrace."0.3.14"."serialize-rustc" or false); } - { "0.3.14"."serde" = - (f.backtrace."0.3.14"."serde" or false) || - (f.backtrace."0.3.14".serialize-serde or false) || - (backtrace."0.3.14"."serialize-serde" or false); } - { "0.3.14"."serde_derive" = - (f.backtrace."0.3.14"."serde_derive" or false) || - (f.backtrace."0.3.14".serialize-serde or false) || - (backtrace."0.3.14"."serialize-serde" or false); } - { "0.3.14"."std" = - (f.backtrace."0.3.14"."std" or false) || - (f.backtrace."0.3.14".default or false) || - (backtrace."0.3.14"."default" or false) || - (f.backtrace."0.3.14".libbacktrace or false) || - (backtrace."0.3.14"."libbacktrace" or false); } - { "0.3.14".default = (f.backtrace."0.3.14".default or true); } - ]; - backtrace_sys."${deps.backtrace."0.3.14".backtrace_sys}".default = true; - cfg_if."${deps.backtrace."0.3.14".cfg_if}".default = true; - libc."${deps.backtrace."0.3.14".libc}".default = (f.libc."${deps.backtrace."0.3.14".libc}".default or false); - rustc_demangle."${deps.backtrace."0.3.14".rustc_demangle}".default = true; - winapi = fold recursiveUpdate {} [ - { "${deps.backtrace."0.3.14".winapi}"."dbghelp" = true; } - { "${deps.backtrace."0.3.14".winapi}"."minwindef" = true; } - { "${deps.backtrace."0.3.14".winapi}"."processthreadsapi" = true; } - { "${deps.backtrace."0.3.14".winapi}"."winnt" = true; } - { "${deps.backtrace."0.3.14".winapi}".default = true; } - ]; - }) [ - (features_.cfg_if."${deps."backtrace"."0.3.14"."cfg_if"}" deps) - (features_.rustc_demangle."${deps."backtrace"."0.3.14"."rustc_demangle"}" deps) - (features_.autocfg."${deps."backtrace"."0.3.14"."autocfg"}" deps) - (features_.backtrace_sys."${deps."backtrace"."0.3.14"."backtrace_sys"}" deps) - (features_.libc."${deps."backtrace"."0.3.14"."libc"}" deps) - (features_.winapi."${deps."backtrace"."0.3.14"."winapi"}" deps) - ]; - - -# end -# backtrace-0.3.9 - - crates.backtrace."0.3.9" = deps: { features?(features_.backtrace."0.3.9" deps {}) }: buildRustCrate { - crateName = "backtrace"; - version = "0.3.9"; - authors = [ "Alex Crichton " "The Rust Project Developers" ]; - sha256 = "137pjkcn89b7fqk78w65ggj92pynmf1hkr1sjz53aga4b50lkmwm"; - dependencies = mapFeatures features ([ - (crates."cfg_if"."${deps."backtrace"."0.3.9"."cfg_if"}" deps) - (crates."rustc_demangle"."${deps."backtrace"."0.3.9"."rustc_demangle"}" deps) - ]) - ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ - ] - ++ (if features.backtrace."0.3.9".backtrace-sys or false then [ (crates.backtrace_sys."${deps."backtrace"."0.3.9".backtrace_sys}" deps) ] else [])) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."backtrace"."0.3.9"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - ] - ++ (if features.backtrace."0.3.9".winapi or false then [ (crates.winapi."${deps."backtrace"."0.3.9".winapi}" deps) ] else [])) else []); - features = mkFeatures (features."backtrace"."0.3.9" or {}); - }; - features_.backtrace."0.3.9" = deps: f: updateFeatures f (rec { - backtrace = fold recursiveUpdate {} [ - { "0.3.9".addr2line = - (f.backtrace."0.3.9".addr2line or false) || - (f.backtrace."0.3.9".gimli-symbolize or false) || - (backtrace."0.3.9"."gimli-symbolize" or false); } - { "0.3.9".backtrace-sys = - (f.backtrace."0.3.9".backtrace-sys or false) || - (f.backtrace."0.3.9".libbacktrace or false) || - (backtrace."0.3.9"."libbacktrace" or false); } - { "0.3.9".coresymbolication = - (f.backtrace."0.3.9".coresymbolication or false) || - (f.backtrace."0.3.9".default or false) || - (backtrace."0.3.9"."default" or false); } - { "0.3.9".dbghelp = - (f.backtrace."0.3.9".dbghelp or false) || - (f.backtrace."0.3.9".default or false) || - (backtrace."0.3.9"."default" or false); } - { "0.3.9".default = (f.backtrace."0.3.9".default or true); } - { "0.3.9".dladdr = - (f.backtrace."0.3.9".dladdr or false) || - (f.backtrace."0.3.9".default or false) || - (backtrace."0.3.9"."default" or false); } - { "0.3.9".findshlibs = - (f.backtrace."0.3.9".findshlibs or false) || - (f.backtrace."0.3.9".gimli-symbolize or false) || - (backtrace."0.3.9"."gimli-symbolize" or false); } - { "0.3.9".gimli = - (f.backtrace."0.3.9".gimli or false) || - (f.backtrace."0.3.9".gimli-symbolize or false) || - (backtrace."0.3.9"."gimli-symbolize" or false); } - { "0.3.9".libbacktrace = - (f.backtrace."0.3.9".libbacktrace or false) || - (f.backtrace."0.3.9".default or false) || - (backtrace."0.3.9"."default" or false); } - { "0.3.9".libunwind = - (f.backtrace."0.3.9".libunwind or false) || - (f.backtrace."0.3.9".default or false) || - (backtrace."0.3.9"."default" or false); } - { "0.3.9".memmap = - (f.backtrace."0.3.9".memmap or false) || - (f.backtrace."0.3.9".gimli-symbolize or false) || - (backtrace."0.3.9"."gimli-symbolize" or false); } - { "0.3.9".object = - (f.backtrace."0.3.9".object or false) || - (f.backtrace."0.3.9".gimli-symbolize or false) || - (backtrace."0.3.9"."gimli-symbolize" or false); } - { "0.3.9".rustc-serialize = - (f.backtrace."0.3.9".rustc-serialize or false) || - (f.backtrace."0.3.9".serialize-rustc or false) || - (backtrace."0.3.9"."serialize-rustc" or false); } - { "0.3.9".serde = - (f.backtrace."0.3.9".serde or false) || - (f.backtrace."0.3.9".serialize-serde or false) || - (backtrace."0.3.9"."serialize-serde" or false); } - { "0.3.9".serde_derive = - (f.backtrace."0.3.9".serde_derive or false) || - (f.backtrace."0.3.9".serialize-serde or false) || - (backtrace."0.3.9"."serialize-serde" or false); } - { "0.3.9".winapi = - (f.backtrace."0.3.9".winapi or false) || - (f.backtrace."0.3.9".dbghelp or false) || - (backtrace."0.3.9"."dbghelp" or false); } - ]; - backtrace_sys."${deps.backtrace."0.3.9".backtrace_sys}".default = true; - cfg_if."${deps.backtrace."0.3.9".cfg_if}".default = true; - libc."${deps.backtrace."0.3.9".libc}".default = true; - rustc_demangle."${deps.backtrace."0.3.9".rustc_demangle}".default = true; - winapi = fold recursiveUpdate {} [ - { "${deps.backtrace."0.3.9".winapi}"."dbghelp" = true; } - { "${deps.backtrace."0.3.9".winapi}"."minwindef" = true; } - { "${deps.backtrace."0.3.9".winapi}"."processthreadsapi" = true; } - { "${deps.backtrace."0.3.9".winapi}"."std" = true; } - { "${deps.backtrace."0.3.9".winapi}"."winnt" = true; } - { "${deps.backtrace."0.3.9".winapi}".default = true; } - ]; - }) [ - (features_.cfg_if."${deps."backtrace"."0.3.9"."cfg_if"}" deps) - (features_.rustc_demangle."${deps."backtrace"."0.3.9"."rustc_demangle"}" deps) - (features_.backtrace_sys."${deps."backtrace"."0.3.9"."backtrace_sys"}" deps) - (features_.libc."${deps."backtrace"."0.3.9"."libc"}" deps) - (features_.winapi."${deps."backtrace"."0.3.9"."winapi"}" deps) - ]; - - -# end -# backtrace-sys-0.1.24 - - crates.backtrace_sys."0.1.24" = deps: { features?(features_.backtrace_sys."0.1.24" deps {}) }: buildRustCrate { - crateName = "backtrace-sys"; - version = "0.1.24"; - authors = [ "Alex Crichton " ]; - sha256 = "15d6jlknykiijcin3vqbx33760w24ss5qw3l1xd3hms5k4vc8305"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."backtrace_sys"."0.1.24"."libc"}" deps) - ]); - - buildDependencies = mapFeatures features ([ - (crates."cc"."${deps."backtrace_sys"."0.1.24"."cc"}" deps) - ]); - }; - features_.backtrace_sys."0.1.24" = deps: f: updateFeatures f ({ - backtrace_sys."0.1.24".default = (f.backtrace_sys."0.1.24".default or true); - cc."${deps.backtrace_sys."0.1.24".cc}".default = true; - libc."${deps.backtrace_sys."0.1.24".libc}".default = true; - }) [ - (features_.libc."${deps."backtrace_sys"."0.1.24"."libc"}" deps) - (features_.cc."${deps."backtrace_sys"."0.1.24"."cc"}" deps) - ]; - - -# end -# backtrace-sys-0.1.28 - - crates.backtrace_sys."0.1.28" = deps: { features?(features_.backtrace_sys."0.1.28" deps {}) }: buildRustCrate { - crateName = "backtrace-sys"; - version = "0.1.28"; - description = "Bindings to the libbacktrace gcc library\n"; - authors = [ "Alex Crichton " ]; - sha256 = "1bbw8chs0wskxwzz7f3yy7mjqhyqj8lslq8pcjw1rbd2g23c34xl"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."backtrace_sys"."0.1.28"."libc"}" deps) - ]); - - buildDependencies = mapFeatures features ([ - (crates."cc"."${deps."backtrace_sys"."0.1.28"."cc"}" deps) - ]); - }; - features_.backtrace_sys."0.1.28" = deps: f: updateFeatures f ({ - backtrace_sys."0.1.28".default = (f.backtrace_sys."0.1.28".default or true); - cc."${deps.backtrace_sys."0.1.28".cc}".default = true; - libc."${deps.backtrace_sys."0.1.28".libc}".default = (f.libc."${deps.backtrace_sys."0.1.28".libc}".default or false); - }) [ - (features_.libc."${deps."backtrace_sys"."0.1.28"."libc"}" deps) - (features_.cc."${deps."backtrace_sys"."0.1.28"."cc"}" deps) - ]; - - -# end -# bitflags-1.0.4 - - crates.bitflags."1.0.4" = deps: { features?(features_.bitflags."1.0.4" deps {}) }: buildRustCrate { - crateName = "bitflags"; - version = "1.0.4"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08"; - features = mkFeatures (features."bitflags"."1.0.4" or {}); - }; - features_.bitflags."1.0.4" = deps: f: updateFeatures f ({ - bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true); - }) []; - - -# end -# blake2-rfc-0.2.18 - - crates.blake2_rfc."0.2.18" = deps: { features?(features_.blake2_rfc."0.2.18" deps {}) }: buildRustCrate { - crateName = "blake2-rfc"; - version = "0.2.18"; - authors = [ "Cesar Eduardo Barros " ]; - sha256 = "0pyqrik4471ljk16prs0iwb2sam39z0z6axyyjxlqxdmf4wprf0l"; - dependencies = mapFeatures features ([ - (crates."arrayvec"."${deps."blake2_rfc"."0.2.18"."arrayvec"}" deps) - (crates."constant_time_eq"."${deps."blake2_rfc"."0.2.18"."constant_time_eq"}" deps) - ]); - features = mkFeatures (features."blake2_rfc"."0.2.18" or {}); - }; - features_.blake2_rfc."0.2.18" = deps: f: updateFeatures f (rec { - arrayvec."${deps.blake2_rfc."0.2.18".arrayvec}".default = (f.arrayvec."${deps.blake2_rfc."0.2.18".arrayvec}".default or false); - blake2_rfc = fold recursiveUpdate {} [ - { "0.2.18".default = (f.blake2_rfc."0.2.18".default or true); } - { "0.2.18".simd = - (f.blake2_rfc."0.2.18".simd or false) || - (f.blake2_rfc."0.2.18".simd_opt or false) || - (blake2_rfc."0.2.18"."simd_opt" or false); } - { "0.2.18".simd_opt = - (f.blake2_rfc."0.2.18".simd_opt or false) || - (f.blake2_rfc."0.2.18".simd_asm or false) || - (blake2_rfc."0.2.18"."simd_asm" or false); } - { "0.2.18".std = - (f.blake2_rfc."0.2.18".std or false) || - (f.blake2_rfc."0.2.18".default or false) || - (blake2_rfc."0.2.18"."default" or false); } - ]; - constant_time_eq."${deps.blake2_rfc."0.2.18".constant_time_eq}".default = true; - }) [ - (features_.arrayvec."${deps."blake2_rfc"."0.2.18"."arrayvec"}" deps) - (features_.constant_time_eq."${deps."blake2_rfc"."0.2.18"."constant_time_eq"}" deps) - ]; - - -# end -# carnix-0.10.0 - - crates.carnix."0.10.0" = deps: { features?(features_.carnix."0.10.0" deps {}) }: buildRustCrate { - crateName = "carnix"; - version = "0.10.0"; - description = "Generate Nix expressions from Cargo.lock files (in order to use Nix as a build system for crates)."; - authors = [ "pe@pijul.org " ]; - sha256 = "0hrp22yvrqnhaanr0ckrwihx9j3irhzd2cmb19sp49ksdi25d8ri"; - crateBin = - [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++ - [{ name = "carnix"; path = "src/main.rs"; }]; - dependencies = mapFeatures features ([ - (crates."clap"."${deps."carnix"."0.10.0"."clap"}" deps) - (crates."dirs"."${deps."carnix"."0.10.0"."dirs"}" deps) - (crates."env_logger"."${deps."carnix"."0.10.0"."env_logger"}" deps) - (crates."failure"."${deps."carnix"."0.10.0"."failure"}" deps) - (crates."failure_derive"."${deps."carnix"."0.10.0"."failure_derive"}" deps) - (crates."itertools"."${deps."carnix"."0.10.0"."itertools"}" deps) - (crates."log"."${deps."carnix"."0.10.0"."log"}" deps) - (crates."nom"."${deps."carnix"."0.10.0"."nom"}" deps) - (crates."regex"."${deps."carnix"."0.10.0"."regex"}" deps) - (crates."serde"."${deps."carnix"."0.10.0"."serde"}" deps) - (crates."serde_derive"."${deps."carnix"."0.10.0"."serde_derive"}" deps) - (crates."serde_json"."${deps."carnix"."0.10.0"."serde_json"}" deps) - (crates."tempdir"."${deps."carnix"."0.10.0"."tempdir"}" deps) - (crates."toml"."${deps."carnix"."0.10.0"."toml"}" deps) - (crates."url"."${deps."carnix"."0.10.0"."url"}" deps) - ]); - }; - features_.carnix."0.10.0" = deps: f: updateFeatures f ({ - carnix."0.10.0".default = (f.carnix."0.10.0".default or true); - clap."${deps.carnix."0.10.0".clap}".default = true; - dirs."${deps.carnix."0.10.0".dirs}".default = true; - env_logger."${deps.carnix."0.10.0".env_logger}".default = true; - failure."${deps.carnix."0.10.0".failure}".default = true; - failure_derive."${deps.carnix."0.10.0".failure_derive}".default = true; - itertools."${deps.carnix."0.10.0".itertools}".default = true; - log."${deps.carnix."0.10.0".log}".default = true; - nom."${deps.carnix."0.10.0".nom}".default = true; - regex."${deps.carnix."0.10.0".regex}".default = true; - serde."${deps.carnix."0.10.0".serde}".default = true; - serde_derive."${deps.carnix."0.10.0".serde_derive}".default = true; - serde_json."${deps.carnix."0.10.0".serde_json}".default = true; - tempdir."${deps.carnix."0.10.0".tempdir}".default = true; - toml."${deps.carnix."0.10.0".toml}".default = true; - url."${deps.carnix."0.10.0".url}".default = true; - }) [ - (features_.clap."${deps."carnix"."0.10.0"."clap"}" deps) - (features_.dirs."${deps."carnix"."0.10.0"."dirs"}" deps) - (features_.env_logger."${deps."carnix"."0.10.0"."env_logger"}" deps) - (features_.failure."${deps."carnix"."0.10.0"."failure"}" deps) - (features_.failure_derive."${deps."carnix"."0.10.0"."failure_derive"}" deps) - (features_.itertools."${deps."carnix"."0.10.0"."itertools"}" deps) - (features_.log."${deps."carnix"."0.10.0"."log"}" deps) - (features_.nom."${deps."carnix"."0.10.0"."nom"}" deps) - (features_.regex."${deps."carnix"."0.10.0"."regex"}" deps) - (features_.serde."${deps."carnix"."0.10.0"."serde"}" deps) - (features_.serde_derive."${deps."carnix"."0.10.0"."serde_derive"}" deps) - (features_.serde_json."${deps."carnix"."0.10.0"."serde_json"}" deps) - (features_.tempdir."${deps."carnix"."0.10.0"."tempdir"}" deps) - (features_.toml."${deps."carnix"."0.10.0"."toml"}" deps) - (features_.url."${deps."carnix"."0.10.0"."url"}" deps) - ]; - - -# end -# carnix-0.9.1 - - crates.carnix."0.9.1" = deps: { features?(features_.carnix."0.9.1" deps {}) }: buildRustCrate { - crateName = "carnix"; - version = "0.9.1"; - authors = [ "pe@pijul.org " ]; - sha256 = "0dn292d4mjlxif0kclrljzff8rm35cd9d92vycjbzklyhz5d62wi"; - crateBin = - [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++ - [{ name = "carnix"; path = "src/main.rs"; }]; - dependencies = mapFeatures features ([ - (crates."clap"."${deps."carnix"."0.9.1"."clap"}" deps) - (crates."dirs"."${deps."carnix"."0.9.1"."dirs"}" deps) - (crates."env_logger"."${deps."carnix"."0.9.1"."env_logger"}" deps) - (crates."error_chain"."${deps."carnix"."0.9.1"."error_chain"}" deps) - (crates."itertools"."${deps."carnix"."0.9.1"."itertools"}" deps) - (crates."log"."${deps."carnix"."0.9.1"."log"}" deps) - (crates."nom"."${deps."carnix"."0.9.1"."nom"}" deps) - (crates."regex"."${deps."carnix"."0.9.1"."regex"}" deps) - (crates."serde"."${deps."carnix"."0.9.1"."serde"}" deps) - (crates."serde_derive"."${deps."carnix"."0.9.1"."serde_derive"}" deps) - (crates."serde_json"."${deps."carnix"."0.9.1"."serde_json"}" deps) - (crates."tempdir"."${deps."carnix"."0.9.1"."tempdir"}" deps) - (crates."toml"."${deps."carnix"."0.9.1"."toml"}" deps) - ]); - }; - features_.carnix."0.9.1" = deps: f: updateFeatures f ({ - carnix."0.9.1".default = (f.carnix."0.9.1".default or true); - clap."${deps.carnix."0.9.1".clap}".default = true; - dirs."${deps.carnix."0.9.1".dirs}".default = true; - env_logger."${deps.carnix."0.9.1".env_logger}".default = true; - error_chain."${deps.carnix."0.9.1".error_chain}".default = true; - itertools."${deps.carnix."0.9.1".itertools}".default = true; - log."${deps.carnix."0.9.1".log}".default = true; - nom."${deps.carnix."0.9.1".nom}".default = true; - regex."${deps.carnix."0.9.1".regex}".default = true; - serde."${deps.carnix."0.9.1".serde}".default = true; - serde_derive."${deps.carnix."0.9.1".serde_derive}".default = true; - serde_json."${deps.carnix."0.9.1".serde_json}".default = true; - tempdir."${deps.carnix."0.9.1".tempdir}".default = true; - toml."${deps.carnix."0.9.1".toml}".default = true; - }) [ - (features_.clap."${deps."carnix"."0.9.1"."clap"}" deps) - (features_.dirs."${deps."carnix"."0.9.1"."dirs"}" deps) - (features_.env_logger."${deps."carnix"."0.9.1"."env_logger"}" deps) - (features_.error_chain."${deps."carnix"."0.9.1"."error_chain"}" deps) - (features_.itertools."${deps."carnix"."0.9.1"."itertools"}" deps) - (features_.log."${deps."carnix"."0.9.1"."log"}" deps) - (features_.nom."${deps."carnix"."0.9.1"."nom"}" deps) - (features_.regex."${deps."carnix"."0.9.1"."regex"}" deps) - (features_.serde."${deps."carnix"."0.9.1"."serde"}" deps) - (features_.serde_derive."${deps."carnix"."0.9.1"."serde_derive"}" deps) - (features_.serde_json."${deps."carnix"."0.9.1"."serde_json"}" deps) - (features_.tempdir."${deps."carnix"."0.9.1"."tempdir"}" deps) - (features_.toml."${deps."carnix"."0.9.1"."toml"}" deps) - ]; - - -# end -# carnix-0.9.2 - - crates.carnix."0.9.2" = deps: { features?(features_.carnix."0.9.2" deps {}) }: buildRustCrate { - crateName = "carnix"; - version = "0.9.2"; - authors = [ "pe@pijul.org " ]; - sha256 = "1r668rjqcwsxjpz2hrr7j3k099c1xsb8vfq1w7y1ps9hap9af42z"; - crateBin = - [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++ - [{ name = "carnix"; path = "src/main.rs"; }]; - dependencies = mapFeatures features ([ - (crates."clap"."${deps."carnix"."0.9.2"."clap"}" deps) - (crates."dirs"."${deps."carnix"."0.9.2"."dirs"}" deps) - (crates."env_logger"."${deps."carnix"."0.9.2"."env_logger"}" deps) - (crates."error_chain"."${deps."carnix"."0.9.2"."error_chain"}" deps) - (crates."itertools"."${deps."carnix"."0.9.2"."itertools"}" deps) - (crates."log"."${deps."carnix"."0.9.2"."log"}" deps) - (crates."nom"."${deps."carnix"."0.9.2"."nom"}" deps) - (crates."regex"."${deps."carnix"."0.9.2"."regex"}" deps) - (crates."serde"."${deps."carnix"."0.9.2"."serde"}" deps) - (crates."serde_derive"."${deps."carnix"."0.9.2"."serde_derive"}" deps) - (crates."serde_json"."${deps."carnix"."0.9.2"."serde_json"}" deps) - (crates."tempdir"."${deps."carnix"."0.9.2"."tempdir"}" deps) - (crates."toml"."${deps."carnix"."0.9.2"."toml"}" deps) - ]); - }; - features_.carnix."0.9.2" = deps: f: updateFeatures f ({ - carnix."0.9.2".default = (f.carnix."0.9.2".default or true); - clap."${deps.carnix."0.9.2".clap}".default = true; - dirs."${deps.carnix."0.9.2".dirs}".default = true; - env_logger."${deps.carnix."0.9.2".env_logger}".default = true; - error_chain."${deps.carnix."0.9.2".error_chain}".default = true; - itertools."${deps.carnix."0.9.2".itertools}".default = true; - log."${deps.carnix."0.9.2".log}".default = true; - nom."${deps.carnix."0.9.2".nom}".default = true; - regex."${deps.carnix."0.9.2".regex}".default = true; - serde."${deps.carnix."0.9.2".serde}".default = true; - serde_derive."${deps.carnix."0.9.2".serde_derive}".default = true; - serde_json."${deps.carnix."0.9.2".serde_json}".default = true; - tempdir."${deps.carnix."0.9.2".tempdir}".default = true; - toml."${deps.carnix."0.9.2".toml}".default = true; - }) [ - (features_.clap."${deps."carnix"."0.9.2"."clap"}" deps) - (features_.dirs."${deps."carnix"."0.9.2"."dirs"}" deps) - (features_.env_logger."${deps."carnix"."0.9.2"."env_logger"}" deps) - (features_.error_chain."${deps."carnix"."0.9.2"."error_chain"}" deps) - (features_.itertools."${deps."carnix"."0.9.2"."itertools"}" deps) - (features_.log."${deps."carnix"."0.9.2"."log"}" deps) - (features_.nom."${deps."carnix"."0.9.2"."nom"}" deps) - (features_.regex."${deps."carnix"."0.9.2"."regex"}" deps) - (features_.serde."${deps."carnix"."0.9.2"."serde"}" deps) - (features_.serde_derive."${deps."carnix"."0.9.2"."serde_derive"}" deps) - (features_.serde_json."${deps."carnix"."0.9.2"."serde_json"}" deps) - (features_.tempdir."${deps."carnix"."0.9.2"."tempdir"}" deps) - (features_.toml."${deps."carnix"."0.9.2"."toml"}" deps) - ]; - - -# end -# carnix-0.9.8 - - crates.carnix."0.9.8" = deps: { features?(features_.carnix."0.9.8" deps {}) }: buildRustCrate { - crateName = "carnix"; - version = "0.9.8"; - authors = [ "pe@pijul.org " ]; - sha256 = "0c2k98qjm1yyx5wl0wqs0rrjczp6h62ri1x8a99442clxsyvp4n9"; - crateBin = - [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++ - [{ name = "carnix"; path = "src/main.rs"; }]; - dependencies = mapFeatures features ([ - (crates."clap"."${deps."carnix"."0.9.8"."clap"}" deps) - (crates."dirs"."${deps."carnix"."0.9.8"."dirs"}" deps) - (crates."env_logger"."${deps."carnix"."0.9.8"."env_logger"}" deps) - (crates."error_chain"."${deps."carnix"."0.9.8"."error_chain"}" deps) - (crates."itertools"."${deps."carnix"."0.9.8"."itertools"}" deps) - (crates."log"."${deps."carnix"."0.9.8"."log"}" deps) - (crates."nom"."${deps."carnix"."0.9.8"."nom"}" deps) - (crates."regex"."${deps."carnix"."0.9.8"."regex"}" deps) - (crates."serde"."${deps."carnix"."0.9.8"."serde"}" deps) - (crates."serde_derive"."${deps."carnix"."0.9.8"."serde_derive"}" deps) - (crates."serde_json"."${deps."carnix"."0.9.8"."serde_json"}" deps) - (crates."tempdir"."${deps."carnix"."0.9.8"."tempdir"}" deps) - (crates."toml"."${deps."carnix"."0.9.8"."toml"}" deps) - (crates."url"."${deps."carnix"."0.9.8"."url"}" deps) - ]); - }; - features_.carnix."0.9.8" = deps: f: updateFeatures f ({ - carnix."0.9.8".default = (f.carnix."0.9.8".default or true); - clap."${deps.carnix."0.9.8".clap}".default = true; - dirs."${deps.carnix."0.9.8".dirs}".default = true; - env_logger."${deps.carnix."0.9.8".env_logger}".default = true; - error_chain."${deps.carnix."0.9.8".error_chain}".default = true; - itertools."${deps.carnix."0.9.8".itertools}".default = true; - log."${deps.carnix."0.9.8".log}".default = true; - nom."${deps.carnix."0.9.8".nom}".default = true; - regex."${deps.carnix."0.9.8".regex}".default = true; - serde."${deps.carnix."0.9.8".serde}".default = true; - serde_derive."${deps.carnix."0.9.8".serde_derive}".default = true; - serde_json."${deps.carnix."0.9.8".serde_json}".default = true; - tempdir."${deps.carnix."0.9.8".tempdir}".default = true; - toml."${deps.carnix."0.9.8".toml}".default = true; - url."${deps.carnix."0.9.8".url}".default = true; - }) [ - (features_.clap."${deps."carnix"."0.9.8"."clap"}" deps) - (features_.dirs."${deps."carnix"."0.9.8"."dirs"}" deps) - (features_.env_logger."${deps."carnix"."0.9.8"."env_logger"}" deps) - (features_.error_chain."${deps."carnix"."0.9.8"."error_chain"}" deps) - (features_.itertools."${deps."carnix"."0.9.8"."itertools"}" deps) - (features_.log."${deps."carnix"."0.9.8"."log"}" deps) - (features_.nom."${deps."carnix"."0.9.8"."nom"}" deps) - (features_.regex."${deps."carnix"."0.9.8"."regex"}" deps) - (features_.serde."${deps."carnix"."0.9.8"."serde"}" deps) - (features_.serde_derive."${deps."carnix"."0.9.8"."serde_derive"}" deps) - (features_.serde_json."${deps."carnix"."0.9.8"."serde_json"}" deps) - (features_.tempdir."${deps."carnix"."0.9.8"."tempdir"}" deps) - (features_.toml."${deps."carnix"."0.9.8"."toml"}" deps) - (features_.url."${deps."carnix"."0.9.8"."url"}" deps) - ]; - - -# end -# cc-1.0.25 - - crates.cc."1.0.25" = deps: { features?(features_.cc."1.0.25" deps {}) }: buildRustCrate { - crateName = "cc"; - version = "1.0.25"; - authors = [ "Alex Crichton " ]; - sha256 = "0pd8fhjlpr5qan984frkf1c8nxrqp6827wmmfzhm2840229z2hq0"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."cc"."1.0.25" or {}); - }; - features_.cc."1.0.25" = deps: f: updateFeatures f (rec { - cc = fold recursiveUpdate {} [ - { "1.0.25".default = (f.cc."1.0.25".default or true); } - { "1.0.25".rayon = - (f.cc."1.0.25".rayon or false) || - (f.cc."1.0.25".parallel or false) || - (cc."1.0.25"."parallel" or false); } - ]; - }) []; - - -# end -# cc-1.0.32 - - crates.cc."1.0.32" = deps: { features?(features_.cc."1.0.32" deps {}) }: buildRustCrate { - crateName = "cc"; - version = "1.0.32"; - description = "A build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n"; - authors = [ "Alex Crichton " ]; - sha256 = "0mq4ma94yis74dnn98w2wkaad195dr6qwlma4fs590xiv0j15ldx"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."cc"."1.0.32" or {}); - }; - features_.cc."1.0.32" = deps: f: updateFeatures f (rec { - cc = fold recursiveUpdate {} [ - { "1.0.32"."rayon" = - (f.cc."1.0.32"."rayon" or false) || - (f.cc."1.0.32".parallel or false) || - (cc."1.0.32"."parallel" or false); } - { "1.0.32".default = (f.cc."1.0.32".default or true); } - ]; - }) []; - - -# end -# cfg-if-0.1.6 - - crates.cfg_if."0.1.6" = deps: { features?(features_.cfg_if."0.1.6" deps {}) }: buildRustCrate { - crateName = "cfg-if"; - version = "0.1.6"; - authors = [ "Alex Crichton " ]; - sha256 = "11qrix06wagkplyk908i3423ps9m9np6c4vbcq81s9fyl244xv3n"; - }; - features_.cfg_if."0.1.6" = deps: f: updateFeatures f ({ - cfg_if."0.1.6".default = (f.cfg_if."0.1.6".default or true); - }) []; - - -# end -# cfg-if-0.1.7 - - crates.cfg_if."0.1.7" = deps: { features?(features_.cfg_if."0.1.7" deps {}) }: buildRustCrate { - crateName = "cfg-if"; - version = "0.1.7"; - description = "A macro to ergonomically define an item depending on a large number of #[cfg]\nparameters. Structured like an if-else chain, the first matching branch is the\nitem that gets emitted.\n"; - authors = [ "Alex Crichton " ]; - sha256 = "13gvcx1dxjq4mpmpj26hpg3yc97qffkx2zi58ykr1dwr8q2biiig"; - }; - features_.cfg_if."0.1.7" = deps: f: updateFeatures f ({ - cfg_if."0.1.7".default = (f.cfg_if."0.1.7".default or true); - }) []; - - -# end -# clap-2.32.0 - - crates.clap."2.32.0" = deps: { features?(features_.clap."2.32.0" deps {}) }: buildRustCrate { - crateName = "clap"; - version = "2.32.0"; - authors = [ "Kevin K. " ]; - sha256 = "1hdjf0janvpjkwrjdjx1mm2aayzr54k72w6mriyr0n5anjkcj1lx"; - dependencies = mapFeatures features ([ - (crates."bitflags"."${deps."clap"."2.32.0"."bitflags"}" deps) - (crates."textwrap"."${deps."clap"."2.32.0"."textwrap"}" deps) - (crates."unicode_width"."${deps."clap"."2.32.0"."unicode_width"}" deps) - ] - ++ (if features.clap."2.32.0".atty or false then [ (crates.atty."${deps."clap"."2.32.0".atty}" deps) ] else []) - ++ (if features.clap."2.32.0".strsim or false then [ (crates.strsim."${deps."clap"."2.32.0".strsim}" deps) ] else []) - ++ (if features.clap."2.32.0".vec_map or false then [ (crates.vec_map."${deps."clap"."2.32.0".vec_map}" deps) ] else [])) - ++ (if !(kernel == "windows") then mapFeatures features ([ - ] - ++ (if features.clap."2.32.0".ansi_term or false then [ (crates.ansi_term."${deps."clap"."2.32.0".ansi_term}" deps) ] else [])) else []); - features = mkFeatures (features."clap"."2.32.0" or {}); - }; - features_.clap."2.32.0" = deps: f: updateFeatures f (rec { - ansi_term."${deps.clap."2.32.0".ansi_term}".default = true; - atty."${deps.clap."2.32.0".atty}".default = true; - bitflags."${deps.clap."2.32.0".bitflags}".default = true; - clap = fold recursiveUpdate {} [ - { "2.32.0".ansi_term = - (f.clap."2.32.0".ansi_term or false) || - (f.clap."2.32.0".color or false) || - (clap."2.32.0"."color" or false); } - { "2.32.0".atty = - (f.clap."2.32.0".atty or false) || - (f.clap."2.32.0".color or false) || - (clap."2.32.0"."color" or false); } - { "2.32.0".clippy = - (f.clap."2.32.0".clippy or false) || - (f.clap."2.32.0".lints or false) || - (clap."2.32.0"."lints" or false); } - { "2.32.0".color = - (f.clap."2.32.0".color or false) || - (f.clap."2.32.0".default or false) || - (clap."2.32.0"."default" or false); } - { "2.32.0".default = (f.clap."2.32.0".default or true); } - { "2.32.0".strsim = - (f.clap."2.32.0".strsim or false) || - (f.clap."2.32.0".suggestions or false) || - (clap."2.32.0"."suggestions" or false); } - { "2.32.0".suggestions = - (f.clap."2.32.0".suggestions or false) || - (f.clap."2.32.0".default or false) || - (clap."2.32.0"."default" or false); } - { "2.32.0".term_size = - (f.clap."2.32.0".term_size or false) || - (f.clap."2.32.0".wrap_help or false) || - (clap."2.32.0"."wrap_help" or false); } - { "2.32.0".vec_map = - (f.clap."2.32.0".vec_map or false) || - (f.clap."2.32.0".default or false) || - (clap."2.32.0"."default" or false); } - { "2.32.0".yaml = - (f.clap."2.32.0".yaml or false) || - (f.clap."2.32.0".doc or false) || - (clap."2.32.0"."doc" or false); } - { "2.32.0".yaml-rust = - (f.clap."2.32.0".yaml-rust or false) || - (f.clap."2.32.0".yaml or false) || - (clap."2.32.0"."yaml" or false); } - ]; - strsim."${deps.clap."2.32.0".strsim}".default = true; - textwrap = fold recursiveUpdate {} [ - { "${deps.clap."2.32.0".textwrap}"."term_size" = - (f.textwrap."${deps.clap."2.32.0".textwrap}"."term_size" or false) || - (clap."2.32.0"."wrap_help" or false) || - (f."clap"."2.32.0"."wrap_help" or false); } - { "${deps.clap."2.32.0".textwrap}".default = true; } - ]; - unicode_width."${deps.clap."2.32.0".unicode_width}".default = true; - vec_map."${deps.clap."2.32.0".vec_map}".default = true; - }) [ - (features_.atty."${deps."clap"."2.32.0"."atty"}" deps) - (features_.bitflags."${deps."clap"."2.32.0"."bitflags"}" deps) - (features_.strsim."${deps."clap"."2.32.0"."strsim"}" deps) - (features_.textwrap."${deps."clap"."2.32.0"."textwrap"}" deps) - (features_.unicode_width."${deps."clap"."2.32.0"."unicode_width"}" deps) - (features_.vec_map."${deps."clap"."2.32.0"."vec_map"}" deps) - (features_.ansi_term."${deps."clap"."2.32.0"."ansi_term"}" deps) - ]; - - -# end -# cloudabi-0.0.3 - - crates.cloudabi."0.0.3" = deps: { features?(features_.cloudabi."0.0.3" deps {}) }: buildRustCrate { - crateName = "cloudabi"; - version = "0.0.3"; - description = "Low level interface to CloudABI. Contains all syscalls and related types."; - authors = [ "Nuxi (https://nuxi.nl/) and contributors" ]; - sha256 = "1z9lby5sr6vslfd14d6igk03s7awf91mxpsfmsp3prxbxlk0x7h5"; - libPath = "cloudabi.rs"; - dependencies = mapFeatures features ([ - ] - ++ (if features.cloudabi."0.0.3".bitflags or false then [ (crates.bitflags."${deps."cloudabi"."0.0.3".bitflags}" deps) ] else [])); - features = mkFeatures (features."cloudabi"."0.0.3" or {}); - }; - features_.cloudabi."0.0.3" = deps: f: updateFeatures f (rec { - bitflags."${deps.cloudabi."0.0.3".bitflags}".default = true; - cloudabi = fold recursiveUpdate {} [ - { "0.0.3"."bitflags" = - (f.cloudabi."0.0.3"."bitflags" or false) || - (f.cloudabi."0.0.3".default or false) || - (cloudabi."0.0.3"."default" or false); } - { "0.0.3".default = (f.cloudabi."0.0.3".default or true); } - ]; - }) [ - (features_.bitflags."${deps."cloudabi"."0.0.3"."bitflags"}" deps) - ]; - - -# end -# constant_time_eq-0.1.3 - - crates.constant_time_eq."0.1.3" = deps: { features?(features_.constant_time_eq."0.1.3" deps {}) }: buildRustCrate { - crateName = "constant_time_eq"; - version = "0.1.3"; - authors = [ "Cesar Eduardo Barros " ]; - sha256 = "03qri9hjf049gwqg9q527lybpg918q6y5q4g9a5lma753nff49wd"; - }; - features_.constant_time_eq."0.1.3" = deps: f: updateFeatures f ({ - constant_time_eq."0.1.3".default = (f.constant_time_eq."0.1.3".default or true); - }) []; - - -# end -# dirs-1.0.4 - - crates.dirs."1.0.4" = deps: { features?(features_.dirs."1.0.4" deps {}) }: buildRustCrate { - crateName = "dirs"; - version = "1.0.4"; - authors = [ "Simon Ochsenreither " ]; - sha256 = "1hp3nz0350b0gpavb3w5ajqc9l1k59cfrcsr3hcavwlkizdnpv1y"; - dependencies = (if kernel == "redox" then mapFeatures features ([ - (crates."redox_users"."${deps."dirs"."1.0.4"."redox_users"}" deps) - ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."dirs"."1.0.4"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."dirs"."1.0.4"."winapi"}" deps) - ]) else []); - }; - features_.dirs."1.0.4" = deps: f: updateFeatures f ({ - dirs."1.0.4".default = (f.dirs."1.0.4".default or true); - libc."${deps.dirs."1.0.4".libc}".default = true; - redox_users."${deps.dirs."1.0.4".redox_users}".default = true; - winapi = fold recursiveUpdate {} [ - { "${deps.dirs."1.0.4".winapi}"."knownfolders" = true; } - { "${deps.dirs."1.0.4".winapi}"."objbase" = true; } - { "${deps.dirs."1.0.4".winapi}"."shlobj" = true; } - { "${deps.dirs."1.0.4".winapi}"."winbase" = true; } - { "${deps.dirs."1.0.4".winapi}"."winerror" = true; } - { "${deps.dirs."1.0.4".winapi}".default = true; } - ]; - }) [ - (features_.redox_users."${deps."dirs"."1.0.4"."redox_users"}" deps) - (features_.libc."${deps."dirs"."1.0.4"."libc"}" deps) - (features_.winapi."${deps."dirs"."1.0.4"."winapi"}" deps) - ]; - - -# end -# dirs-1.0.5 - - crates.dirs."1.0.5" = deps: { features?(features_.dirs."1.0.5" deps {}) }: buildRustCrate { - crateName = "dirs"; - version = "1.0.5"; - description = "A tiny low-level library that provides platform-specific standard locations of directories for config, cache and other data on Linux, Windows, macOS and Redox by leveraging the mechanisms defined by the XDG base/user directory specifications on Linux, the Known Folder API on Windows, and the Standard Directory guidelines on macOS."; - authors = [ "Simon Ochsenreither " ]; - sha256 = "1py68zwwrhlj5vbz9f9ansjmhc8y4gs5bpamw9ycmqz030pprwf3"; - dependencies = (if kernel == "redox" then mapFeatures features ([ - (crates."redox_users"."${deps."dirs"."1.0.5"."redox_users"}" deps) - ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."dirs"."1.0.5"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."dirs"."1.0.5"."winapi"}" deps) - ]) else []); - }; - features_.dirs."1.0.5" = deps: f: updateFeatures f ({ - dirs."1.0.5".default = (f.dirs."1.0.5".default or true); - libc."${deps.dirs."1.0.5".libc}".default = true; - redox_users."${deps.dirs."1.0.5".redox_users}".default = true; - winapi = fold recursiveUpdate {} [ - { "${deps.dirs."1.0.5".winapi}"."knownfolders" = true; } - { "${deps.dirs."1.0.5".winapi}"."objbase" = true; } - { "${deps.dirs."1.0.5".winapi}"."shlobj" = true; } - { "${deps.dirs."1.0.5".winapi}"."winbase" = true; } - { "${deps.dirs."1.0.5".winapi}"."winerror" = true; } - { "${deps.dirs."1.0.5".winapi}".default = true; } - ]; - }) [ - (features_.redox_users."${deps."dirs"."1.0.5"."redox_users"}" deps) - (features_.libc."${deps."dirs"."1.0.5"."libc"}" deps) - (features_.winapi."${deps."dirs"."1.0.5"."winapi"}" deps) - ]; - - -# end -# either-1.5.0 - - crates.either."1.5.0" = deps: { features?(features_.either."1.5.0" deps {}) }: buildRustCrate { - crateName = "either"; - version = "1.5.0"; - authors = [ "bluss" ]; - sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."either"."1.5.0" or {}); - }; - features_.either."1.5.0" = deps: f: updateFeatures f (rec { - either = fold recursiveUpdate {} [ - { "1.5.0".default = (f.either."1.5.0".default or true); } - { "1.5.0".use_std = - (f.either."1.5.0".use_std or false) || - (f.either."1.5.0".default or false) || - (either."1.5.0"."default" or false); } - ]; - }) []; - - -# end -# either-1.5.1 - - crates.either."1.5.1" = deps: { features?(features_.either."1.5.1" deps {}) }: buildRustCrate { - crateName = "either"; - version = "1.5.1"; - description = "The enum `Either` with variants `Left` and `Right` is a general purpose sum type with two cases.\n"; - authors = [ "bluss" ]; - sha256 = "049dmvnyrrhf0fw955jrfazdapdl84x32grwwxllh8in39yv3783"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."either"."1.5.1" or {}); - }; - features_.either."1.5.1" = deps: f: updateFeatures f (rec { - either = fold recursiveUpdate {} [ - { "1.5.1"."use_std" = - (f.either."1.5.1"."use_std" or false) || - (f.either."1.5.1".default or false) || - (either."1.5.1"."default" or false); } - { "1.5.1".default = (f.either."1.5.1".default or true); } - ]; - }) []; - - -# end -# env_logger-0.5.13 - - crates.env_logger."0.5.13" = deps: { features?(features_.env_logger."0.5.13" deps {}) }: buildRustCrate { - crateName = "env_logger"; - version = "0.5.13"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1q6vylngcz4bn088b4hvsl879l8yz1k2bma75waljb5p4h4kbb72"; - dependencies = mapFeatures features ([ - (crates."atty"."${deps."env_logger"."0.5.13"."atty"}" deps) - (crates."humantime"."${deps."env_logger"."0.5.13"."humantime"}" deps) - (crates."log"."${deps."env_logger"."0.5.13"."log"}" deps) - (crates."termcolor"."${deps."env_logger"."0.5.13"."termcolor"}" deps) - ] - ++ (if features.env_logger."0.5.13".regex or false then [ (crates.regex."${deps."env_logger"."0.5.13".regex}" deps) ] else [])); - features = mkFeatures (features."env_logger"."0.5.13" or {}); - }; - features_.env_logger."0.5.13" = deps: f: updateFeatures f (rec { - atty."${deps.env_logger."0.5.13".atty}".default = true; - env_logger = fold recursiveUpdate {} [ - { "0.5.13".default = (f.env_logger."0.5.13".default or true); } - { "0.5.13".regex = - (f.env_logger."0.5.13".regex or false) || - (f.env_logger."0.5.13".default or false) || - (env_logger."0.5.13"."default" or false); } - ]; - humantime."${deps.env_logger."0.5.13".humantime}".default = true; - log = fold recursiveUpdate {} [ - { "${deps.env_logger."0.5.13".log}"."std" = true; } - { "${deps.env_logger."0.5.13".log}".default = true; } - ]; - regex."${deps.env_logger."0.5.13".regex}".default = true; - termcolor."${deps.env_logger."0.5.13".termcolor}".default = true; - }) [ - (features_.atty."${deps."env_logger"."0.5.13"."atty"}" deps) - (features_.humantime."${deps."env_logger"."0.5.13"."humantime"}" deps) - (features_.log."${deps."env_logger"."0.5.13"."log"}" deps) - (features_.regex."${deps."env_logger"."0.5.13"."regex"}" deps) - (features_.termcolor."${deps."env_logger"."0.5.13"."termcolor"}" deps) - ]; - - -# end -# env_logger-0.6.1 - - crates.env_logger."0.6.1" = deps: { features?(features_.env_logger."0.6.1" deps {}) }: buildRustCrate { - crateName = "env_logger"; - version = "0.6.1"; - description = "A logging implementation for `log` which is configured via an environment\nvariable.\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1d02i2yaqpnmbgw42pf0hd56ddd9jr4zq5yypbmfvc8rs13x0jql"; - dependencies = mapFeatures features ([ - (crates."log"."${deps."env_logger"."0.6.1"."log"}" deps) - ] - ++ (if features.env_logger."0.6.1".atty or false then [ (crates.atty."${deps."env_logger"."0.6.1".atty}" deps) ] else []) - ++ (if features.env_logger."0.6.1".humantime or false then [ (crates.humantime."${deps."env_logger"."0.6.1".humantime}" deps) ] else []) - ++ (if features.env_logger."0.6.1".regex or false then [ (crates.regex."${deps."env_logger"."0.6.1".regex}" deps) ] else []) - ++ (if features.env_logger."0.6.1".termcolor or false then [ (crates.termcolor."${deps."env_logger"."0.6.1".termcolor}" deps) ] else [])); - features = mkFeatures (features."env_logger"."0.6.1" or {}); - }; - features_.env_logger."0.6.1" = deps: f: updateFeatures f (rec { - atty."${deps.env_logger."0.6.1".atty}".default = true; - env_logger = fold recursiveUpdate {} [ - { "0.6.1"."atty" = - (f.env_logger."0.6.1"."atty" or false) || - (f.env_logger."0.6.1".default or false) || - (env_logger."0.6.1"."default" or false); } - { "0.6.1"."humantime" = - (f.env_logger."0.6.1"."humantime" or false) || - (f.env_logger."0.6.1".default or false) || - (env_logger."0.6.1"."default" or false); } - { "0.6.1"."regex" = - (f.env_logger."0.6.1"."regex" or false) || - (f.env_logger."0.6.1".default or false) || - (env_logger."0.6.1"."default" or false); } - { "0.6.1"."termcolor" = - (f.env_logger."0.6.1"."termcolor" or false) || - (f.env_logger."0.6.1".default or false) || - (env_logger."0.6.1"."default" or false); } - { "0.6.1".default = (f.env_logger."0.6.1".default or true); } - ]; - humantime."${deps.env_logger."0.6.1".humantime}".default = true; - log = fold recursiveUpdate {} [ - { "${deps.env_logger."0.6.1".log}"."std" = true; } - { "${deps.env_logger."0.6.1".log}".default = true; } - ]; - regex."${deps.env_logger."0.6.1".regex}".default = true; - termcolor."${deps.env_logger."0.6.1".termcolor}".default = true; - }) [ - (features_.atty."${deps."env_logger"."0.6.1"."atty"}" deps) - (features_.humantime."${deps."env_logger"."0.6.1"."humantime"}" deps) - (features_.log."${deps."env_logger"."0.6.1"."log"}" deps) - (features_.regex."${deps."env_logger"."0.6.1"."regex"}" deps) - (features_.termcolor."${deps."env_logger"."0.6.1"."termcolor"}" deps) - ]; - - -# end -# error-chain-0.12.0 - - crates.error_chain."0.12.0" = deps: { features?(features_.error_chain."0.12.0" deps {}) }: buildRustCrate { - crateName = "error-chain"; - version = "0.12.0"; - authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; - sha256 = "1m6wk1r6wqg1mn69bxxvk5k081cb4xy6bfhsxb99rv408x9wjcnl"; - dependencies = mapFeatures features ([ - ] - ++ (if features.error_chain."0.12.0".backtrace or false then [ (crates.backtrace."${deps."error_chain"."0.12.0".backtrace}" deps) ] else [])); - features = mkFeatures (features."error_chain"."0.12.0" or {}); - }; - features_.error_chain."0.12.0" = deps: f: updateFeatures f (rec { - backtrace."${deps.error_chain."0.12.0".backtrace}".default = true; - error_chain = fold recursiveUpdate {} [ - { "0.12.0".backtrace = - (f.error_chain."0.12.0".backtrace or false) || - (f.error_chain."0.12.0".default or false) || - (error_chain."0.12.0"."default" or false); } - { "0.12.0".default = (f.error_chain."0.12.0".default or true); } - { "0.12.0".example_generated = - (f.error_chain."0.12.0".example_generated or false) || - (f.error_chain."0.12.0".default or false) || - (error_chain."0.12.0"."default" or false); } - ]; - }) [ - (features_.backtrace."${deps."error_chain"."0.12.0"."backtrace"}" deps) - ]; - - -# end -# failure-0.1.3 - - crates.failure."0.1.3" = deps: { features?(features_.failure."0.1.3" deps {}) }: buildRustCrate { - crateName = "failure"; - version = "0.1.3"; - authors = [ "Without Boats " ]; - sha256 = "0cibp01z0clyxrvkl7v7kq6jszsgcg9vwv6d9l6d1drk9jqdss4s"; - dependencies = mapFeatures features ([ - ] - ++ (if features.failure."0.1.3".backtrace or false then [ (crates.backtrace."${deps."failure"."0.1.3".backtrace}" deps) ] else []) - ++ (if features.failure."0.1.3".failure_derive or false then [ (crates.failure_derive."${deps."failure"."0.1.3".failure_derive}" deps) ] else [])); - features = mkFeatures (features."failure"."0.1.3" or {}); - }; - features_.failure."0.1.3" = deps: f: updateFeatures f (rec { - backtrace."${deps.failure."0.1.3".backtrace}".default = true; - failure = fold recursiveUpdate {} [ - { "0.1.3".backtrace = - (f.failure."0.1.3".backtrace or false) || - (f.failure."0.1.3".std or false) || - (failure."0.1.3"."std" or false); } - { "0.1.3".default = (f.failure."0.1.3".default or true); } - { "0.1.3".derive = - (f.failure."0.1.3".derive or false) || - (f.failure."0.1.3".default or false) || - (failure."0.1.3"."default" or false); } - { "0.1.3".failure_derive = - (f.failure."0.1.3".failure_derive or false) || - (f.failure."0.1.3".derive or false) || - (failure."0.1.3"."derive" or false); } - { "0.1.3".std = - (f.failure."0.1.3".std or false) || - (f.failure."0.1.3".default or false) || - (failure."0.1.3"."default" or false); } - ]; - failure_derive."${deps.failure."0.1.3".failure_derive}".default = true; - }) [ - (features_.backtrace."${deps."failure"."0.1.3"."backtrace"}" deps) - (features_.failure_derive."${deps."failure"."0.1.3"."failure_derive"}" deps) - ]; - - -# end -# failure-0.1.5 - - crates.failure."0.1.5" = deps: { features?(features_.failure."0.1.5" deps {}) }: buildRustCrate { - crateName = "failure"; - version = "0.1.5"; - description = "Experimental error handling abstraction."; - authors = [ "Without Boats " ]; - sha256 = "1msaj1c0fg12dzyf4fhxqlx1gfx41lj2smdjmkc9hkrgajk2g3kx"; - dependencies = mapFeatures features ([ - ] - ++ (if features.failure."0.1.5".backtrace or false then [ (crates.backtrace."${deps."failure"."0.1.5".backtrace}" deps) ] else []) - ++ (if features.failure."0.1.5".failure_derive or false then [ (crates.failure_derive."${deps."failure"."0.1.5".failure_derive}" deps) ] else [])); - features = mkFeatures (features."failure"."0.1.5" or {}); - }; - features_.failure."0.1.5" = deps: f: updateFeatures f (rec { - backtrace."${deps.failure."0.1.5".backtrace}".default = true; - failure = fold recursiveUpdate {} [ - { "0.1.5"."backtrace" = - (f.failure."0.1.5"."backtrace" or false) || - (f.failure."0.1.5".std or false) || - (failure."0.1.5"."std" or false); } - { "0.1.5"."derive" = - (f.failure."0.1.5"."derive" or false) || - (f.failure."0.1.5".default or false) || - (failure."0.1.5"."default" or false); } - { "0.1.5"."failure_derive" = - (f.failure."0.1.5"."failure_derive" or false) || - (f.failure."0.1.5".derive or false) || - (failure."0.1.5"."derive" or false); } - { "0.1.5"."std" = - (f.failure."0.1.5"."std" or false) || - (f.failure."0.1.5".default or false) || - (failure."0.1.5"."default" or false); } - { "0.1.5".default = (f.failure."0.1.5".default or true); } - ]; - failure_derive."${deps.failure."0.1.5".failure_derive}".default = true; - }) [ - (features_.backtrace."${deps."failure"."0.1.5"."backtrace"}" deps) - (features_.failure_derive."${deps."failure"."0.1.5"."failure_derive"}" deps) - ]; - - -# end -# failure_derive-0.1.3 - - crates.failure_derive."0.1.3" = deps: { features?(features_.failure_derive."0.1.3" deps {}) }: buildRustCrate { - crateName = "failure_derive"; - version = "0.1.3"; - authors = [ "Without Boats " ]; - sha256 = "1mh7ad2d17f13g0k29bskp0f9faws0w1q4a5yfzlzi75bw9kidgm"; - procMacro = true; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."proc_macro2"."${deps."failure_derive"."0.1.3"."proc_macro2"}" deps) - (crates."quote"."${deps."failure_derive"."0.1.3"."quote"}" deps) - (crates."syn"."${deps."failure_derive"."0.1.3"."syn"}" deps) - (crates."synstructure"."${deps."failure_derive"."0.1.3"."synstructure"}" deps) - ]); - features = mkFeatures (features."failure_derive"."0.1.3" or {}); - }; - features_.failure_derive."0.1.3" = deps: f: updateFeatures f ({ - failure_derive."0.1.3".default = (f.failure_derive."0.1.3".default or true); - proc_macro2."${deps.failure_derive."0.1.3".proc_macro2}".default = true; - quote."${deps.failure_derive."0.1.3".quote}".default = true; - syn."${deps.failure_derive."0.1.3".syn}".default = true; - synstructure."${deps.failure_derive."0.1.3".synstructure}".default = true; - }) [ - (features_.proc_macro2."${deps."failure_derive"."0.1.3"."proc_macro2"}" deps) - (features_.quote."${deps."failure_derive"."0.1.3"."quote"}" deps) - (features_.syn."${deps."failure_derive"."0.1.3"."syn"}" deps) - (features_.synstructure."${deps."failure_derive"."0.1.3"."synstructure"}" deps) - ]; - - -# end -# failure_derive-0.1.5 - - crates.failure_derive."0.1.5" = deps: { features?(features_.failure_derive."0.1.5" deps {}) }: buildRustCrate { - crateName = "failure_derive"; - version = "0.1.5"; - description = "derives for the failure crate"; - authors = [ "Without Boats " ]; - sha256 = "1wzk484b87r4qszcvdl2bkniv5ls4r2f2dshz7hmgiv6z4ln12g0"; - procMacro = true; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."proc_macro2"."${deps."failure_derive"."0.1.5"."proc_macro2"}" deps) - (crates."quote"."${deps."failure_derive"."0.1.5"."quote"}" deps) - (crates."syn"."${deps."failure_derive"."0.1.5"."syn"}" deps) - (crates."synstructure"."${deps."failure_derive"."0.1.5"."synstructure"}" deps) - ]); - features = mkFeatures (features."failure_derive"."0.1.5" or {}); - }; - features_.failure_derive."0.1.5" = deps: f: updateFeatures f ({ - failure_derive."0.1.5".default = (f.failure_derive."0.1.5".default or true); - proc_macro2."${deps.failure_derive."0.1.5".proc_macro2}".default = true; - quote."${deps.failure_derive."0.1.5".quote}".default = true; - syn."${deps.failure_derive."0.1.5".syn}".default = true; - synstructure."${deps.failure_derive."0.1.5".synstructure}".default = true; - }) [ - (features_.proc_macro2."${deps."failure_derive"."0.1.5"."proc_macro2"}" deps) - (features_.quote."${deps."failure_derive"."0.1.5"."quote"}" deps) - (features_.syn."${deps."failure_derive"."0.1.5"."syn"}" deps) - (features_.synstructure."${deps."failure_derive"."0.1.5"."synstructure"}" deps) - ]; - - -# end -# fuchsia-cprng-0.1.1 - - crates.fuchsia_cprng."0.1.1" = deps: { features?(features_.fuchsia_cprng."0.1.1" deps {}) }: buildRustCrate { - crateName = "fuchsia-cprng"; - version = "0.1.1"; - description = "Rust crate for the Fuchsia cryptographically secure pseudorandom number generator"; - authors = [ "Erick Tryzelaar " ]; - edition = "2018"; - sha256 = "07apwv9dj716yjlcj29p94vkqn5zmfh7hlrqvrjx3wzshphc95h9"; - }; - features_.fuchsia_cprng."0.1.1" = deps: f: updateFeatures f ({ - fuchsia_cprng."0.1.1".default = (f.fuchsia_cprng."0.1.1".default or true); - }) []; - - -# end -# fuchsia-zircon-0.3.3 - - crates.fuchsia_zircon."0.3.3" = deps: { features?(features_.fuchsia_zircon."0.3.3" deps {}) }: buildRustCrate { - crateName = "fuchsia-zircon"; - version = "0.3.3"; - authors = [ "Raph Levien " ]; - sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; - dependencies = mapFeatures features ([ - (crates."bitflags"."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps) - (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) - ]); - }; - features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f ({ - bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true; - fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true); - fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true; - }) [ - (features_.bitflags."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps) - (features_.fuchsia_zircon_sys."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) - ]; - - -# end -# fuchsia-zircon-sys-0.3.3 - - crates.fuchsia_zircon_sys."0.3.3" = deps: { features?(features_.fuchsia_zircon_sys."0.3.3" deps {}) }: buildRustCrate { - crateName = "fuchsia-zircon-sys"; - version = "0.3.3"; - authors = [ "Raph Levien " ]; - sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; - }; - features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f ({ - fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true); - }) []; - - -# end -# humantime-1.1.1 - - crates.humantime."1.1.1" = deps: { features?(features_.humantime."1.1.1" deps {}) }: buildRustCrate { - crateName = "humantime"; - version = "1.1.1"; - authors = [ "Paul Colomiets " ]; - sha256 = "1lzdfsfzdikcp1qb6wcdvnsdv16pmzr7p7cv171vnbnyz2lrwbgn"; - libPath = "src/lib.rs"; - dependencies = mapFeatures features ([ - (crates."quick_error"."${deps."humantime"."1.1.1"."quick_error"}" deps) - ]); - }; - features_.humantime."1.1.1" = deps: f: updateFeatures f ({ - humantime."1.1.1".default = (f.humantime."1.1.1".default or true); - quick_error."${deps.humantime."1.1.1".quick_error}".default = true; - }) [ - (features_.quick_error."${deps."humantime"."1.1.1"."quick_error"}" deps) - ]; - - -# end -# humantime-1.2.0 - - crates.humantime."1.2.0" = deps: { features?(features_.humantime."1.2.0" deps {}) }: buildRustCrate { - crateName = "humantime"; - version = "1.2.0"; - description = " A parser and formatter for std::time::{Duration, SystemTime}\n"; - authors = [ "Paul Colomiets " ]; - sha256 = "0wlcxzz2mhq0brkfbjb12hc6jm17bgm8m6pdgblw4qjwmf26aw28"; - libPath = "src/lib.rs"; - dependencies = mapFeatures features ([ - (crates."quick_error"."${deps."humantime"."1.2.0"."quick_error"}" deps) - ]); - }; - features_.humantime."1.2.0" = deps: f: updateFeatures f ({ - humantime."1.2.0".default = (f.humantime."1.2.0".default or true); - quick_error."${deps.humantime."1.2.0".quick_error}".default = true; - }) [ - (features_.quick_error."${deps."humantime"."1.2.0"."quick_error"}" deps) - ]; - - -# end -# idna-0.1.5 - - crates.idna."0.1.5" = deps: { features?(features_.idna."0.1.5" deps {}) }: buildRustCrate { - crateName = "idna"; - version = "0.1.5"; - authors = [ "The rust-url developers" ]; - sha256 = "1gwgl19rz5vzi67rrhamczhxy050f5ynx4ybabfapyalv7z1qmjy"; - dependencies = mapFeatures features ([ - (crates."matches"."${deps."idna"."0.1.5"."matches"}" deps) - (crates."unicode_bidi"."${deps."idna"."0.1.5"."unicode_bidi"}" deps) - (crates."unicode_normalization"."${deps."idna"."0.1.5"."unicode_normalization"}" deps) - ]); - }; - features_.idna."0.1.5" = deps: f: updateFeatures f ({ - idna."0.1.5".default = (f.idna."0.1.5".default or true); - matches."${deps.idna."0.1.5".matches}".default = true; - unicode_bidi."${deps.idna."0.1.5".unicode_bidi}".default = true; - unicode_normalization."${deps.idna."0.1.5".unicode_normalization}".default = true; - }) [ - (features_.matches."${deps."idna"."0.1.5"."matches"}" deps) - (features_.unicode_bidi."${deps."idna"."0.1.5"."unicode_bidi"}" deps) - (features_.unicode_normalization."${deps."idna"."0.1.5"."unicode_normalization"}" deps) - ]; - - -# end -# itertools-0.7.8 - - crates.itertools."0.7.8" = deps: { features?(features_.itertools."0.7.8" deps {}) }: buildRustCrate { - crateName = "itertools"; - version = "0.7.8"; - authors = [ "bluss" ]; - sha256 = "0ib30cd7d1icjxsa13mji1gry3grp72kx8p33yd84mphdbc3d357"; - dependencies = mapFeatures features ([ - (crates."either"."${deps."itertools"."0.7.8"."either"}" deps) - ]); - features = mkFeatures (features."itertools"."0.7.8" or {}); - }; - features_.itertools."0.7.8" = deps: f: updateFeatures f (rec { - either."${deps.itertools."0.7.8".either}".default = (f.either."${deps.itertools."0.7.8".either}".default or false); - itertools = fold recursiveUpdate {} [ - { "0.7.8".default = (f.itertools."0.7.8".default or true); } - { "0.7.8".use_std = - (f.itertools."0.7.8".use_std or false) || - (f.itertools."0.7.8".default or false) || - (itertools."0.7.8"."default" or false); } - ]; - }) [ - (features_.either."${deps."itertools"."0.7.8"."either"}" deps) - ]; - - -# end -# itertools-0.8.0 - - crates.itertools."0.8.0" = deps: { features?(features_.itertools."0.8.0" deps {}) }: buildRustCrate { - crateName = "itertools"; - version = "0.8.0"; - description = "Extra iterator adaptors, iterator methods, free functions, and macros."; - authors = [ "bluss" ]; - sha256 = "0xpz59yf03vyj540i7sqypn2aqfid08c4vzyg0l6rqm08da77n7n"; - dependencies = mapFeatures features ([ - (crates."either"."${deps."itertools"."0.8.0"."either"}" deps) - ]); - features = mkFeatures (features."itertools"."0.8.0" or {}); - }; - features_.itertools."0.8.0" = deps: f: updateFeatures f (rec { - either."${deps.itertools."0.8.0".either}".default = (f.either."${deps.itertools."0.8.0".either}".default or false); - itertools = fold recursiveUpdate {} [ - { "0.8.0"."use_std" = - (f.itertools."0.8.0"."use_std" or false) || - (f.itertools."0.8.0".default or false) || - (itertools."0.8.0"."default" or false); } - { "0.8.0".default = (f.itertools."0.8.0".default or true); } - ]; - }) [ - (features_.either."${deps."itertools"."0.8.0"."either"}" deps) - ]; - - -# end -# itoa-0.4.3 - - crates.itoa."0.4.3" = deps: { features?(features_.itoa."0.4.3" deps {}) }: buildRustCrate { - crateName = "itoa"; - version = "0.4.3"; - authors = [ "David Tolnay " ]; - sha256 = "0zadimmdgvili3gdwxqg7ljv3r4wcdg1kkdfp9nl15vnm23vrhy1"; - features = mkFeatures (features."itoa"."0.4.3" or {}); - }; - features_.itoa."0.4.3" = deps: f: updateFeatures f (rec { - itoa = fold recursiveUpdate {} [ - { "0.4.3".default = (f.itoa."0.4.3".default or true); } - { "0.4.3".std = - (f.itoa."0.4.3".std or false) || - (f.itoa."0.4.3".default or false) || - (itoa."0.4.3"."default" or false); } - ]; - }) []; - - -# end -# lazy_static-1.1.0 - - crates.lazy_static."1.1.0" = deps: { features?(features_.lazy_static."1.1.0" deps {}) }: buildRustCrate { - crateName = "lazy_static"; - version = "1.1.0"; - authors = [ "Marvin Löbel " ]; - sha256 = "1da2b6nxfc2l547qgl9kd1pn9sh1af96a6qx6xw8xdnv6hh5fag0"; - build = "build.rs"; - dependencies = mapFeatures features ([ -]); - - buildDependencies = mapFeatures features ([ - (crates."version_check"."${deps."lazy_static"."1.1.0"."version_check"}" deps) - ]); - features = mkFeatures (features."lazy_static"."1.1.0" or {}); - }; - features_.lazy_static."1.1.0" = deps: f: updateFeatures f (rec { - lazy_static = fold recursiveUpdate {} [ - { "1.1.0".default = (f.lazy_static."1.1.0".default or true); } - { "1.1.0".nightly = - (f.lazy_static."1.1.0".nightly or false) || - (f.lazy_static."1.1.0".spin_no_std or false) || - (lazy_static."1.1.0"."spin_no_std" or false); } - { "1.1.0".spin = - (f.lazy_static."1.1.0".spin or false) || - (f.lazy_static."1.1.0".spin_no_std or false) || - (lazy_static."1.1.0"."spin_no_std" or false); } - ]; - version_check."${deps.lazy_static."1.1.0".version_check}".default = true; - }) [ - (features_.version_check."${deps."lazy_static"."1.1.0"."version_check"}" deps) - ]; - - -# end -# lazy_static-1.3.0 - - crates.lazy_static."1.3.0" = deps: { features?(features_.lazy_static."1.3.0" deps {}) }: buildRustCrate { - crateName = "lazy_static"; - version = "1.3.0"; - description = "A macro for declaring lazily evaluated statics in Rust."; - authors = [ "Marvin Löbel " ]; - sha256 = "1vv47va18ydk7dx5paz88g3jy1d3lwbx6qpxkbj8gyfv770i4b1y"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."lazy_static"."1.3.0" or {}); - }; - features_.lazy_static."1.3.0" = deps: f: updateFeatures f (rec { - lazy_static = fold recursiveUpdate {} [ - { "1.3.0"."spin" = - (f.lazy_static."1.3.0"."spin" or false) || - (f.lazy_static."1.3.0".spin_no_std or false) || - (lazy_static."1.3.0"."spin_no_std" or false); } - { "1.3.0".default = (f.lazy_static."1.3.0".default or true); } - ]; - }) []; - - -# end -# libc-0.2.43 - - crates.libc."0.2.43" = deps: { features?(features_.libc."0.2.43" deps {}) }: buildRustCrate { - crateName = "libc"; - version = "0.2.43"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0pshydmsq71kl9276zc2928ld50sp524ixcqkcqsgq410dx6c50b"; - features = mkFeatures (features."libc"."0.2.43" or {}); - }; - features_.libc."0.2.43" = deps: f: updateFeatures f (rec { - libc = fold recursiveUpdate {} [ - { "0.2.43".default = (f.libc."0.2.43".default or true); } - { "0.2.43".use_std = - (f.libc."0.2.43".use_std or false) || - (f.libc."0.2.43".default or false) || - (libc."0.2.43"."default" or false); } - ]; - }) []; - - -# end -# libc-0.2.50 - - crates.libc."0.2.50" = deps: { features?(features_.libc."0.2.50" deps {}) }: buildRustCrate { - crateName = "libc"; - version = "0.2.50"; - description = "Raw FFI bindings to platform libraries like libc.\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "14y4zm0xp2xbj3l1kxqf2wpl58xb7hglxdbfx5dcxjlchbvk5dzs"; - build = "build.rs"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."libc"."0.2.50" or {}); - }; - features_.libc."0.2.50" = deps: f: updateFeatures f (rec { - libc = fold recursiveUpdate {} [ - { "0.2.50"."align" = - (f.libc."0.2.50"."align" or false) || - (f.libc."0.2.50".rustc-dep-of-std or false) || - (libc."0.2.50"."rustc-dep-of-std" or false); } - { "0.2.50"."rustc-std-workspace-core" = - (f.libc."0.2.50"."rustc-std-workspace-core" or false) || - (f.libc."0.2.50".rustc-dep-of-std or false) || - (libc."0.2.50"."rustc-dep-of-std" or false); } - { "0.2.50"."use_std" = - (f.libc."0.2.50"."use_std" or false) || - (f.libc."0.2.50".default or false) || - (libc."0.2.50"."default" or false); } - { "0.2.50".default = (f.libc."0.2.50".default or true); } - ]; - }) []; - - -# end -# log-0.4.5 - - crates.log."0.4.5" = deps: { features?(features_.log."0.4.5" deps {}) }: buildRustCrate { - crateName = "log"; - version = "0.4.5"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1hdcj17al94ga90q7jx2y1rmxi68n3akra1awv3hr3s9b9zipgq6"; - dependencies = mapFeatures features ([ - (crates."cfg_if"."${deps."log"."0.4.5"."cfg_if"}" deps) - ]); - features = mkFeatures (features."log"."0.4.5" or {}); - }; - features_.log."0.4.5" = deps: f: updateFeatures f ({ - cfg_if."${deps.log."0.4.5".cfg_if}".default = true; - log."0.4.5".default = (f.log."0.4.5".default or true); - }) [ - (features_.cfg_if."${deps."log"."0.4.5"."cfg_if"}" deps) - ]; - - -# end -# log-0.4.6 - - crates.log."0.4.6" = deps: { features?(features_.log."0.4.6" deps {}) }: buildRustCrate { - crateName = "log"; - version = "0.4.6"; - description = "A lightweight logging facade for Rust\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1nd8dl9mvc9vd6fks5d4gsxaz990xi6rzlb8ymllshmwi153vngr"; - dependencies = mapFeatures features ([ - (crates."cfg_if"."${deps."log"."0.4.6"."cfg_if"}" deps) - ]); - features = mkFeatures (features."log"."0.4.6" or {}); - }; - features_.log."0.4.6" = deps: f: updateFeatures f ({ - cfg_if."${deps.log."0.4.6".cfg_if}".default = true; - log."0.4.6".default = (f.log."0.4.6".default or true); - }) [ - (features_.cfg_if."${deps."log"."0.4.6"."cfg_if"}" deps) - ]; - - -# end -# matches-0.1.8 - - crates.matches."0.1.8" = deps: { features?(features_.matches."0.1.8" deps {}) }: buildRustCrate { - crateName = "matches"; - version = "0.1.8"; - authors = [ "Simon Sapin " ]; - sha256 = "03hl636fg6xggy0a26200xs74amk3k9n0908rga2szn68agyz3cv"; - libPath = "lib.rs"; - }; - features_.matches."0.1.8" = deps: f: updateFeatures f ({ - matches."0.1.8".default = (f.matches."0.1.8".default or true); - }) []; - - -# end -# memchr-1.0.2 - - crates.memchr."1.0.2" = deps: { features?(features_.memchr."1.0.2" deps {}) }: buildRustCrate { - crateName = "memchr"; - version = "1.0.2"; - authors = [ "Andrew Gallant " "bluss" ]; - sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7"; - dependencies = mapFeatures features ([ - ] - ++ (if features.memchr."1.0.2".libc or false then [ (crates.libc."${deps."memchr"."1.0.2".libc}" deps) ] else [])); - features = mkFeatures (features."memchr"."1.0.2" or {}); - }; - features_.memchr."1.0.2" = deps: f: updateFeatures f (rec { - libc = fold recursiveUpdate {} [ - { "${deps.memchr."1.0.2".libc}"."use_std" = - (f.libc."${deps.memchr."1.0.2".libc}"."use_std" or false) || - (memchr."1.0.2"."use_std" or false) || - (f."memchr"."1.0.2"."use_std" or false); } - { "${deps.memchr."1.0.2".libc}".default = (f.libc."${deps.memchr."1.0.2".libc}".default or false); } - ]; - memchr = fold recursiveUpdate {} [ - { "1.0.2".default = (f.memchr."1.0.2".default or true); } - { "1.0.2".libc = - (f.memchr."1.0.2".libc or false) || - (f.memchr."1.0.2".default or false) || - (memchr."1.0.2"."default" or false) || - (f.memchr."1.0.2".use_std or false) || - (memchr."1.0.2"."use_std" or false); } - { "1.0.2".use_std = - (f.memchr."1.0.2".use_std or false) || - (f.memchr."1.0.2".default or false) || - (memchr."1.0.2"."default" or false); } - ]; - }) [ - (features_.libc."${deps."memchr"."1.0.2"."libc"}" deps) - ]; - - -# end -# memchr-2.1.0 - - crates.memchr."2.1.0" = deps: { features?(features_.memchr."2.1.0" deps {}) }: buildRustCrate { - crateName = "memchr"; - version = "2.1.0"; - authors = [ "Andrew Gallant " "bluss" ]; - sha256 = "02w1fc5z1ccx8fbzgcr0mpk0xf2i9g4vbx9q5c2g8pjddbaqvjjq"; - dependencies = mapFeatures features ([ - (crates."cfg_if"."${deps."memchr"."2.1.0"."cfg_if"}" deps) - ] - ++ (if features.memchr."2.1.0".libc or false then [ (crates.libc."${deps."memchr"."2.1.0".libc}" deps) ] else [])); - - buildDependencies = mapFeatures features ([ - (crates."version_check"."${deps."memchr"."2.1.0"."version_check"}" deps) - ]); - features = mkFeatures (features."memchr"."2.1.0" or {}); - }; - features_.memchr."2.1.0" = deps: f: updateFeatures f (rec { - cfg_if."${deps.memchr."2.1.0".cfg_if}".default = true; - libc = fold recursiveUpdate {} [ - { "${deps.memchr."2.1.0".libc}"."use_std" = - (f.libc."${deps.memchr."2.1.0".libc}"."use_std" or false) || - (memchr."2.1.0"."use_std" or false) || - (f."memchr"."2.1.0"."use_std" or false); } - { "${deps.memchr."2.1.0".libc}".default = (f.libc."${deps.memchr."2.1.0".libc}".default or false); } - ]; - memchr = fold recursiveUpdate {} [ - { "2.1.0".default = (f.memchr."2.1.0".default or true); } - { "2.1.0".libc = - (f.memchr."2.1.0".libc or false) || - (f.memchr."2.1.0".default or false) || - (memchr."2.1.0"."default" or false) || - (f.memchr."2.1.0".use_std or false) || - (memchr."2.1.0"."use_std" or false); } - { "2.1.0".use_std = - (f.memchr."2.1.0".use_std or false) || - (f.memchr."2.1.0".default or false) || - (memchr."2.1.0"."default" or false); } - ]; - version_check."${deps.memchr."2.1.0".version_check}".default = true; - }) [ - (features_.cfg_if."${deps."memchr"."2.1.0"."cfg_if"}" deps) - (features_.libc."${deps."memchr"."2.1.0"."libc"}" deps) - (features_.version_check."${deps."memchr"."2.1.0"."version_check"}" deps) - ]; - - -# end -# memchr-2.2.0 - - crates.memchr."2.2.0" = deps: { features?(features_.memchr."2.2.0" deps {}) }: buildRustCrate { - crateName = "memchr"; - version = "2.2.0"; - description = "Safe interface to memchr."; - authors = [ "Andrew Gallant " "bluss" ]; - sha256 = "11vwg8iig9jyjxq3n1cq15g29ikzw5l7ar87md54k1aisjs0997p"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."memchr"."2.2.0" or {}); - }; - features_.memchr."2.2.0" = deps: f: updateFeatures f (rec { - memchr = fold recursiveUpdate {} [ - { "2.2.0"."use_std" = - (f.memchr."2.2.0"."use_std" or false) || - (f.memchr."2.2.0".default or false) || - (memchr."2.2.0"."default" or false); } - { "2.2.0".default = (f.memchr."2.2.0".default or true); } - ]; - }) []; - - -# end -# nodrop-0.1.12 - - crates.nodrop."0.1.12" = deps: { features?(features_.nodrop."0.1.12" deps {}) }: buildRustCrate { - crateName = "nodrop"; - version = "0.1.12"; - authors = [ "bluss" ]; - sha256 = "1b9rxvdg8061gxjc239l9slndf0ds3m6fy2sf3gs8f9kknqgl49d"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."nodrop"."0.1.12" or {}); - }; - features_.nodrop."0.1.12" = deps: f: updateFeatures f (rec { - nodrop = fold recursiveUpdate {} [ - { "0.1.12".default = (f.nodrop."0.1.12".default or true); } - { "0.1.12".nodrop-union = - (f.nodrop."0.1.12".nodrop-union or false) || - (f.nodrop."0.1.12".use_union or false) || - (nodrop."0.1.12"."use_union" or false); } - { "0.1.12".std = - (f.nodrop."0.1.12".std or false) || - (f.nodrop."0.1.12".default or false) || - (nodrop."0.1.12"."default" or false); } - ]; - }) []; - - -# end -# nodrop-0.1.13 - - crates.nodrop."0.1.13" = deps: { features?(features_.nodrop."0.1.13" deps {}) }: buildRustCrate { - crateName = "nodrop"; - version = "0.1.13"; - description = "A wrapper type to inhibit drop (destructor). Use std::mem::ManuallyDrop instead!"; - authors = [ "bluss" ]; - sha256 = "0gkfx6wihr9z0m8nbdhma5pyvbipznjpkzny2d4zkc05b0vnhinb"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."nodrop"."0.1.13" or {}); - }; - features_.nodrop."0.1.13" = deps: f: updateFeatures f (rec { - nodrop = fold recursiveUpdate {} [ - { "0.1.13"."nodrop-union" = - (f.nodrop."0.1.13"."nodrop-union" or false) || - (f.nodrop."0.1.13".use_union or false) || - (nodrop."0.1.13"."use_union" or false); } - { "0.1.13"."std" = - (f.nodrop."0.1.13"."std" or false) || - (f.nodrop."0.1.13".default or false) || - (nodrop."0.1.13"."default" or false); } - { "0.1.13".default = (f.nodrop."0.1.13".default or true); } - ]; - }) []; - - -# end -# nom-3.2.1 - - crates.nom."3.2.1" = deps: { features?(features_.nom."3.2.1" deps {}) }: buildRustCrate { - crateName = "nom"; - version = "3.2.1"; - authors = [ "contact@geoffroycouprie.com" ]; - sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07"; - dependencies = mapFeatures features ([ - (crates."memchr"."${deps."nom"."3.2.1"."memchr"}" deps) - ]); - features = mkFeatures (features."nom"."3.2.1" or {}); - }; - features_.nom."3.2.1" = deps: f: updateFeatures f (rec { - memchr = fold recursiveUpdate {} [ - { "${deps.nom."3.2.1".memchr}"."use_std" = - (f.memchr."${deps.nom."3.2.1".memchr}"."use_std" or false) || - (nom."3.2.1"."std" or false) || - (f."nom"."3.2.1"."std" or false); } - { "${deps.nom."3.2.1".memchr}".default = (f.memchr."${deps.nom."3.2.1".memchr}".default or false); } - ]; - nom = fold recursiveUpdate {} [ - { "3.2.1".compiler_error = - (f.nom."3.2.1".compiler_error or false) || - (f.nom."3.2.1".nightly or false) || - (nom."3.2.1"."nightly" or false); } - { "3.2.1".default = (f.nom."3.2.1".default or true); } - { "3.2.1".lazy_static = - (f.nom."3.2.1".lazy_static or false) || - (f.nom."3.2.1".regexp_macros or false) || - (nom."3.2.1"."regexp_macros" or false); } - { "3.2.1".regex = - (f.nom."3.2.1".regex or false) || - (f.nom."3.2.1".regexp or false) || - (nom."3.2.1"."regexp" or false); } - { "3.2.1".regexp = - (f.nom."3.2.1".regexp or false) || - (f.nom."3.2.1".regexp_macros or false) || - (nom."3.2.1"."regexp_macros" or false); } - { "3.2.1".std = - (f.nom."3.2.1".std or false) || - (f.nom."3.2.1".default or false) || - (nom."3.2.1"."default" or false); } - { "3.2.1".stream = - (f.nom."3.2.1".stream or false) || - (f.nom."3.2.1".default or false) || - (nom."3.2.1"."default" or false); } - ]; - }) [ - (features_.memchr."${deps."nom"."3.2.1"."memchr"}" deps) - ]; - - -# end -# percent-encoding-1.0.1 - - crates.percent_encoding."1.0.1" = deps: { features?(features_.percent_encoding."1.0.1" deps {}) }: buildRustCrate { - crateName = "percent-encoding"; - version = "1.0.1"; - authors = [ "The rust-url developers" ]; - sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i"; - libPath = "lib.rs"; - }; - features_.percent_encoding."1.0.1" = deps: f: updateFeatures f ({ - percent_encoding."1.0.1".default = (f.percent_encoding."1.0.1".default or true); - }) []; - - -# end -# proc-macro2-0.4.20 - - crates.proc_macro2."0.4.20" = deps: { features?(features_.proc_macro2."0.4.20" deps {}) }: buildRustCrate { - crateName = "proc-macro2"; - version = "0.4.20"; - authors = [ "Alex Crichton " ]; - sha256 = "0yr74b00d3wzg21kjvfln7vzzvf9aghbaff4c747i3grbd997ys2"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."unicode_xid"."${deps."proc_macro2"."0.4.20"."unicode_xid"}" deps) - ]); - features = mkFeatures (features."proc_macro2"."0.4.20" or {}); - }; - features_.proc_macro2."0.4.20" = deps: f: updateFeatures f (rec { - proc_macro2 = fold recursiveUpdate {} [ - { "0.4.20".default = (f.proc_macro2."0.4.20".default or true); } - { "0.4.20".proc-macro = - (f.proc_macro2."0.4.20".proc-macro or false) || - (f.proc_macro2."0.4.20".default or false) || - (proc_macro2."0.4.20"."default" or false) || - (f.proc_macro2."0.4.20".nightly or false) || - (proc_macro2."0.4.20"."nightly" or false); } - ]; - unicode_xid."${deps.proc_macro2."0.4.20".unicode_xid}".default = true; - }) [ - (features_.unicode_xid."${deps."proc_macro2"."0.4.20"."unicode_xid"}" deps) - ]; - - -# end -# proc-macro2-0.4.27 - - crates.proc_macro2."0.4.27" = deps: { features?(features_.proc_macro2."0.4.27" deps {}) }: buildRustCrate { - crateName = "proc-macro2"; - version = "0.4.27"; - description = "A stable implementation of the upcoming new `proc_macro` API. Comes with an\noption, off by default, to also reimplement itself in terms of the upstream\nunstable API.\n"; - authors = [ "Alex Crichton " ]; - sha256 = "1cp4c40p3hwn2sz72ssqa62gp5n8w4gbamdqvvadzp5l7gxnq95i"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."unicode_xid"."${deps."proc_macro2"."0.4.27"."unicode_xid"}" deps) - ]); - features = mkFeatures (features."proc_macro2"."0.4.27" or {}); - }; - features_.proc_macro2."0.4.27" = deps: f: updateFeatures f (rec { - proc_macro2 = fold recursiveUpdate {} [ - { "0.4.27"."proc-macro" = - (f.proc_macro2."0.4.27"."proc-macro" or false) || - (f.proc_macro2."0.4.27".default or false) || - (proc_macro2."0.4.27"."default" or false); } - { "0.4.27".default = (f.proc_macro2."0.4.27".default or true); } - ]; - unicode_xid."${deps.proc_macro2."0.4.27".unicode_xid}".default = true; - }) [ - (features_.unicode_xid."${deps."proc_macro2"."0.4.27"."unicode_xid"}" deps) - ]; - - -# end -# quick-error-1.2.2 - - crates.quick_error."1.2.2" = deps: { features?(features_.quick_error."1.2.2" deps {}) }: buildRustCrate { - crateName = "quick-error"; - version = "1.2.2"; - authors = [ "Paul Colomiets " "Colin Kiegel " ]; - sha256 = "192a3adc5phgpibgqblsdx1b421l5yg9bjbmv552qqq9f37h60k5"; - }; - features_.quick_error."1.2.2" = deps: f: updateFeatures f ({ - quick_error."1.2.2".default = (f.quick_error."1.2.2".default or true); - }) []; - - -# end -# quote-0.6.11 - - crates.quote."0.6.11" = deps: { features?(features_.quote."0.6.11" deps {}) }: buildRustCrate { - crateName = "quote"; - version = "0.6.11"; - description = "Quasi-quoting macro quote!(...)"; - authors = [ "David Tolnay " ]; - sha256 = "0agska77z58cypcq4knayzwx7r7n6m756z1cz9cp2z4sv0b846ga"; - dependencies = mapFeatures features ([ - (crates."proc_macro2"."${deps."quote"."0.6.11"."proc_macro2"}" deps) - ]); - features = mkFeatures (features."quote"."0.6.11" or {}); - }; - features_.quote."0.6.11" = deps: f: updateFeatures f (rec { - proc_macro2 = fold recursiveUpdate {} [ - { "${deps.quote."0.6.11".proc_macro2}"."proc-macro" = - (f.proc_macro2."${deps.quote."0.6.11".proc_macro2}"."proc-macro" or false) || - (quote."0.6.11"."proc-macro" or false) || - (f."quote"."0.6.11"."proc-macro" or false); } - { "${deps.quote."0.6.11".proc_macro2}".default = (f.proc_macro2."${deps.quote."0.6.11".proc_macro2}".default or false); } - ]; - quote = fold recursiveUpdate {} [ - { "0.6.11"."proc-macro" = - (f.quote."0.6.11"."proc-macro" or false) || - (f.quote."0.6.11".default or false) || - (quote."0.6.11"."default" or false); } - { "0.6.11".default = (f.quote."0.6.11".default or true); } - ]; - }) [ - (features_.proc_macro2."${deps."quote"."0.6.11"."proc_macro2"}" deps) - ]; - - -# end -# quote-0.6.8 - - crates.quote."0.6.8" = deps: { features?(features_.quote."0.6.8" deps {}) }: buildRustCrate { - crateName = "quote"; - version = "0.6.8"; - authors = [ "David Tolnay " ]; - sha256 = "0dq6j23w6pmc4l6v490arixdwypy0b82z76nrzaingqhqri4p3mh"; - dependencies = mapFeatures features ([ - (crates."proc_macro2"."${deps."quote"."0.6.8"."proc_macro2"}" deps) - ]); - features = mkFeatures (features."quote"."0.6.8" or {}); - }; - features_.quote."0.6.8" = deps: f: updateFeatures f (rec { - proc_macro2 = fold recursiveUpdate {} [ - { "${deps.quote."0.6.8".proc_macro2}"."proc-macro" = - (f.proc_macro2."${deps.quote."0.6.8".proc_macro2}"."proc-macro" or false) || - (quote."0.6.8"."proc-macro" or false) || - (f."quote"."0.6.8"."proc-macro" or false); } - { "${deps.quote."0.6.8".proc_macro2}".default = (f.proc_macro2."${deps.quote."0.6.8".proc_macro2}".default or false); } - ]; - quote = fold recursiveUpdate {} [ - { "0.6.8".default = (f.quote."0.6.8".default or true); } - { "0.6.8".proc-macro = - (f.quote."0.6.8".proc-macro or false) || - (f.quote."0.6.8".default or false) || - (quote."0.6.8"."default" or false); } - ]; - }) [ - (features_.proc_macro2."${deps."quote"."0.6.8"."proc_macro2"}" deps) - ]; - - -# end -# rand-0.4.3 - - crates.rand."0.4.3" = deps: { features?(features_.rand."0.4.3" deps {}) }: buildRustCrate { - crateName = "rand"; - version = "0.4.3"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1644wri45l147822xy7dgdm4k7myxzs66cb795ga0x7dan11ci4f"; - dependencies = (if kernel == "fuchsia" then mapFeatures features ([ - (crates."fuchsia_zircon"."${deps."rand"."0.4.3"."fuchsia_zircon"}" deps) - ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - ] - ++ (if features.rand."0.4.3".libc or false then [ (crates.libc."${deps."rand"."0.4.3".libc}" deps) ] else [])) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."rand"."0.4.3"."winapi"}" deps) - ]) else []); - features = mkFeatures (features."rand"."0.4.3" or {}); - }; - features_.rand."0.4.3" = deps: f: updateFeatures f (rec { - fuchsia_zircon."${deps.rand."0.4.3".fuchsia_zircon}".default = true; - libc."${deps.rand."0.4.3".libc}".default = true; - rand = fold recursiveUpdate {} [ - { "0.4.3".default = (f.rand."0.4.3".default or true); } - { "0.4.3".i128_support = - (f.rand."0.4.3".i128_support or false) || - (f.rand."0.4.3".nightly or false) || - (rand."0.4.3"."nightly" or false); } - { "0.4.3".libc = - (f.rand."0.4.3".libc or false) || - (f.rand."0.4.3".std or false) || - (rand."0.4.3"."std" or false); } - { "0.4.3".std = - (f.rand."0.4.3".std or false) || - (f.rand."0.4.3".default or false) || - (rand."0.4.3"."default" or false); } - ]; - winapi = fold recursiveUpdate {} [ - { "${deps.rand."0.4.3".winapi}"."minwindef" = true; } - { "${deps.rand."0.4.3".winapi}"."ntsecapi" = true; } - { "${deps.rand."0.4.3".winapi}"."profileapi" = true; } - { "${deps.rand."0.4.3".winapi}"."winnt" = true; } - { "${deps.rand."0.4.3".winapi}".default = true; } - ]; - }) [ - (features_.fuchsia_zircon."${deps."rand"."0.4.3"."fuchsia_zircon"}" deps) - (features_.libc."${deps."rand"."0.4.3"."libc"}" deps) - (features_.winapi."${deps."rand"."0.4.3"."winapi"}" deps) - ]; - - -# end -# rand-0.4.6 - - crates.rand."0.4.6" = deps: { features?(features_.rand."0.4.6" deps {}) }: buildRustCrate { - crateName = "rand"; - version = "0.4.6"; - description = "Random number generators and other randomness functionality.\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0c3rmg5q7d6qdi7cbmg5py9alm70wd3xsg0mmcawrnl35qv37zfs"; - dependencies = (if abi == "sgx" then mapFeatures features ([ - (crates."rand_core"."${deps."rand"."0.4.6"."rand_core"}" deps) - (crates."rdrand"."${deps."rand"."0.4.6"."rdrand"}" deps) - ]) else []) - ++ (if kernel == "fuchsia" then mapFeatures features ([ - (crates."fuchsia_cprng"."${deps."rand"."0.4.6"."fuchsia_cprng"}" deps) - ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - ] - ++ (if features.rand."0.4.6".libc or false then [ (crates.libc."${deps."rand"."0.4.6".libc}" deps) ] else [])) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."rand"."0.4.6"."winapi"}" deps) - ]) else []); - features = mkFeatures (features."rand"."0.4.6" or {}); - }; - features_.rand."0.4.6" = deps: f: updateFeatures f (rec { - fuchsia_cprng."${deps.rand."0.4.6".fuchsia_cprng}".default = true; - libc."${deps.rand."0.4.6".libc}".default = true; - rand = fold recursiveUpdate {} [ - { "0.4.6"."i128_support" = - (f.rand."0.4.6"."i128_support" or false) || - (f.rand."0.4.6".nightly or false) || - (rand."0.4.6"."nightly" or false); } - { "0.4.6"."libc" = - (f.rand."0.4.6"."libc" or false) || - (f.rand."0.4.6".std or false) || - (rand."0.4.6"."std" or false); } - { "0.4.6"."std" = - (f.rand."0.4.6"."std" or false) || - (f.rand."0.4.6".default or false) || - (rand."0.4.6"."default" or false); } - { "0.4.6".default = (f.rand."0.4.6".default or true); } - ]; - rand_core."${deps.rand."0.4.6".rand_core}".default = (f.rand_core."${deps.rand."0.4.6".rand_core}".default or false); - rdrand."${deps.rand."0.4.6".rdrand}".default = true; - winapi = fold recursiveUpdate {} [ - { "${deps.rand."0.4.6".winapi}"."minwindef" = true; } - { "${deps.rand."0.4.6".winapi}"."ntsecapi" = true; } - { "${deps.rand."0.4.6".winapi}"."profileapi" = true; } - { "${deps.rand."0.4.6".winapi}"."winnt" = true; } - { "${deps.rand."0.4.6".winapi}".default = true; } - ]; - }) [ - (features_.rand_core."${deps."rand"."0.4.6"."rand_core"}" deps) - (features_.rdrand."${deps."rand"."0.4.6"."rdrand"}" deps) - (features_.fuchsia_cprng."${deps."rand"."0.4.6"."fuchsia_cprng"}" deps) - (features_.libc."${deps."rand"."0.4.6"."libc"}" deps) - (features_.winapi."${deps."rand"."0.4.6"."winapi"}" deps) - ]; - - -# end -# rand_core-0.3.1 - - crates.rand_core."0.3.1" = deps: { features?(features_.rand_core."0.3.1" deps {}) }: buildRustCrate { - crateName = "rand_core"; - version = "0.3.1"; - description = "Core random number generator traits and tools for implementation.\n"; - authors = [ "The Rand Project Developers" "The Rust Project Developers" ]; - sha256 = "0q0ssgpj9x5a6fda83nhmfydy7a6c0wvxm0jhncsmjx8qp8gw91m"; - dependencies = mapFeatures features ([ - (crates."rand_core"."${deps."rand_core"."0.3.1"."rand_core"}" deps) - ]); - features = mkFeatures (features."rand_core"."0.3.1" or {}); - }; - features_.rand_core."0.3.1" = deps: f: updateFeatures f (rec { - rand_core = fold recursiveUpdate {} [ - { "${deps.rand_core."0.3.1".rand_core}"."alloc" = - (f.rand_core."${deps.rand_core."0.3.1".rand_core}"."alloc" or false) || - (rand_core."0.3.1"."alloc" or false) || - (f."rand_core"."0.3.1"."alloc" or false); } - { "${deps.rand_core."0.3.1".rand_core}"."serde1" = - (f.rand_core."${deps.rand_core."0.3.1".rand_core}"."serde1" or false) || - (rand_core."0.3.1"."serde1" or false) || - (f."rand_core"."0.3.1"."serde1" or false); } - { "${deps.rand_core."0.3.1".rand_core}"."std" = - (f.rand_core."${deps.rand_core."0.3.1".rand_core}"."std" or false) || - (rand_core."0.3.1"."std" or false) || - (f."rand_core"."0.3.1"."std" or false); } - { "${deps.rand_core."0.3.1".rand_core}".default = true; } - { "0.3.1"."std" = - (f.rand_core."0.3.1"."std" or false) || - (f.rand_core."0.3.1".default or false) || - (rand_core."0.3.1"."default" or false); } - { "0.3.1".default = (f.rand_core."0.3.1".default or true); } - ]; - }) [ - (features_.rand_core."${deps."rand_core"."0.3.1"."rand_core"}" deps) - ]; - - -# end -# rand_core-0.4.0 - - crates.rand_core."0.4.0" = deps: { features?(features_.rand_core."0.4.0" deps {}) }: buildRustCrate { - crateName = "rand_core"; - version = "0.4.0"; - description = "Core random number generator traits and tools for implementation.\n"; - authors = [ "The Rand Project Developers" "The Rust Project Developers" ]; - sha256 = "0wb5iwhffibj0pnpznhv1g3i7h1fnhz64s3nz74fz6vsm3q6q3br"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."rand_core"."0.4.0" or {}); - }; - features_.rand_core."0.4.0" = deps: f: updateFeatures f (rec { - rand_core = fold recursiveUpdate {} [ - { "0.4.0"."alloc" = - (f.rand_core."0.4.0"."alloc" or false) || - (f.rand_core."0.4.0".std or false) || - (rand_core."0.4.0"."std" or false); } - { "0.4.0"."serde" = - (f.rand_core."0.4.0"."serde" or false) || - (f.rand_core."0.4.0".serde1 or false) || - (rand_core."0.4.0"."serde1" or false); } - { "0.4.0"."serde_derive" = - (f.rand_core."0.4.0"."serde_derive" or false) || - (f.rand_core."0.4.0".serde1 or false) || - (rand_core."0.4.0"."serde1" or false); } - { "0.4.0".default = (f.rand_core."0.4.0".default or true); } - ]; - }) []; - - -# end -# rand_os-0.1.3 - - crates.rand_os."0.1.3" = deps: { features?(features_.rand_os."0.1.3" deps {}) }: buildRustCrate { - crateName = "rand_os"; - version = "0.1.3"; - description = "OS backed Random Number Generator"; - authors = [ "The Rand Project Developers" ]; - sha256 = "0ywwspizgs9g8vzn6m5ix9yg36n15119d6n792h7mk4r5vs0ww4j"; - dependencies = mapFeatures features ([ - (crates."rand_core"."${deps."rand_os"."0.1.3"."rand_core"}" deps) - ]) - ++ (if abi == "sgx" then mapFeatures features ([ - (crates."rdrand"."${deps."rand_os"."0.1.3"."rdrand"}" deps) - ]) else []) - ++ (if kernel == "cloudabi" then mapFeatures features ([ - (crates."cloudabi"."${deps."rand_os"."0.1.3"."cloudabi"}" deps) - ]) else []) - ++ (if kernel == "fuchsia" then mapFeatures features ([ - (crates."fuchsia_cprng"."${deps."rand_os"."0.1.3"."fuchsia_cprng"}" deps) - ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."rand_os"."0.1.3"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."rand_os"."0.1.3"."winapi"}" deps) - ]) else []) - ++ (if kernel == "wasm32-unknown-unknown" then mapFeatures features ([ -]) else []); - }; - features_.rand_os."0.1.3" = deps: f: updateFeatures f ({ - cloudabi."${deps.rand_os."0.1.3".cloudabi}".default = true; - fuchsia_cprng."${deps.rand_os."0.1.3".fuchsia_cprng}".default = true; - libc."${deps.rand_os."0.1.3".libc}".default = true; - rand_core = fold recursiveUpdate {} [ - { "${deps.rand_os."0.1.3".rand_core}"."std" = true; } - { "${deps.rand_os."0.1.3".rand_core}".default = true; } - ]; - rand_os."0.1.3".default = (f.rand_os."0.1.3".default or true); - rdrand."${deps.rand_os."0.1.3".rdrand}".default = true; - winapi = fold recursiveUpdate {} [ - { "${deps.rand_os."0.1.3".winapi}"."minwindef" = true; } - { "${deps.rand_os."0.1.3".winapi}"."ntsecapi" = true; } - { "${deps.rand_os."0.1.3".winapi}"."winnt" = true; } - { "${deps.rand_os."0.1.3".winapi}".default = true; } - ]; - }) [ - (features_.rand_core."${deps."rand_os"."0.1.3"."rand_core"}" deps) - (features_.rdrand."${deps."rand_os"."0.1.3"."rdrand"}" deps) - (features_.cloudabi."${deps."rand_os"."0.1.3"."cloudabi"}" deps) - (features_.fuchsia_cprng."${deps."rand_os"."0.1.3"."fuchsia_cprng"}" deps) - (features_.libc."${deps."rand_os"."0.1.3"."libc"}" deps) - (features_.winapi."${deps."rand_os"."0.1.3"."winapi"}" deps) - ]; - - -# end -# rdrand-0.4.0 - - crates.rdrand."0.4.0" = deps: { features?(features_.rdrand."0.4.0" deps {}) }: buildRustCrate { - crateName = "rdrand"; - version = "0.4.0"; - description = "An implementation of random number generator based on rdrand and rdseed instructions"; - authors = [ "Simonas Kazlauskas " ]; - sha256 = "15hrcasn0v876wpkwab1dwbk9kvqwrb3iv4y4dibb6yxnfvzwajk"; - dependencies = mapFeatures features ([ - (crates."rand_core"."${deps."rdrand"."0.4.0"."rand_core"}" deps) - ]); - features = mkFeatures (features."rdrand"."0.4.0" or {}); - }; - features_.rdrand."0.4.0" = deps: f: updateFeatures f (rec { - rand_core."${deps.rdrand."0.4.0".rand_core}".default = (f.rand_core."${deps.rdrand."0.4.0".rand_core}".default or false); - rdrand = fold recursiveUpdate {} [ - { "0.4.0"."std" = - (f.rdrand."0.4.0"."std" or false) || - (f.rdrand."0.4.0".default or false) || - (rdrand."0.4.0"."default" or false); } - { "0.4.0".default = (f.rdrand."0.4.0".default or true); } - ]; - }) [ - (features_.rand_core."${deps."rdrand"."0.4.0"."rand_core"}" deps) - ]; - - -# end -# redox_syscall-0.1.40 - - crates.redox_syscall."0.1.40" = deps: { features?(features_.redox_syscall."0.1.40" deps {}) }: buildRustCrate { - crateName = "redox_syscall"; - version = "0.1.40"; - authors = [ "Jeremy Soller " ]; - sha256 = "132rnhrq49l3z7gjrwj2zfadgw6q0355s6a7id7x7c0d7sk72611"; - libName = "syscall"; - }; - features_.redox_syscall."0.1.40" = deps: f: updateFeatures f ({ - redox_syscall."0.1.40".default = (f.redox_syscall."0.1.40".default or true); - }) []; - - -# end -# redox_syscall-0.1.51 - - crates.redox_syscall."0.1.51" = deps: { features?(features_.redox_syscall."0.1.51" deps {}) }: buildRustCrate { - crateName = "redox_syscall"; - version = "0.1.51"; - description = "A Rust library to access raw Redox system calls"; - authors = [ "Jeremy Soller " ]; - sha256 = "1a61cv7yydx64vpyvzr0z0hwzdvy4gcvcnfc6k70zpkngj5sz3ip"; - libName = "syscall"; - }; - features_.redox_syscall."0.1.51" = deps: f: updateFeatures f ({ - redox_syscall."0.1.51".default = (f.redox_syscall."0.1.51".default or true); - }) []; - - -# end -# redox_termios-0.1.1 - - crates.redox_termios."0.1.1" = deps: { features?(features_.redox_termios."0.1.1" deps {}) }: buildRustCrate { - crateName = "redox_termios"; - version = "0.1.1"; - authors = [ "Jeremy Soller " ]; - sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; - libPath = "src/lib.rs"; - dependencies = mapFeatures features ([ - (crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) - ]); - }; - features_.redox_termios."0.1.1" = deps: f: updateFeatures f ({ - redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true; - redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true); - }) [ - (features_.redox_syscall."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) - ]; - - -# end -# redox_users-0.2.0 - - crates.redox_users."0.2.0" = deps: { features?(features_.redox_users."0.2.0" deps {}) }: buildRustCrate { - crateName = "redox_users"; - version = "0.2.0"; - authors = [ "Jose Narvaez " "Wesley Hershberger " ]; - sha256 = "0s9jrh378jk8rfi1xfwxvh2r1gv6rn3bq6n7sbajkrqqq0xzijvf"; - dependencies = mapFeatures features ([ - (crates."argon2rs"."${deps."redox_users"."0.2.0"."argon2rs"}" deps) - (crates."failure"."${deps."redox_users"."0.2.0"."failure"}" deps) - (crates."rand"."${deps."redox_users"."0.2.0"."rand"}" deps) - (crates."redox_syscall"."${deps."redox_users"."0.2.0"."redox_syscall"}" deps) - ]); - }; - features_.redox_users."0.2.0" = deps: f: updateFeatures f ({ - argon2rs."${deps.redox_users."0.2.0".argon2rs}".default = (f.argon2rs."${deps.redox_users."0.2.0".argon2rs}".default or false); - failure."${deps.redox_users."0.2.0".failure}".default = true; - rand."${deps.redox_users."0.2.0".rand}".default = true; - redox_syscall."${deps.redox_users."0.2.0".redox_syscall}".default = true; - redox_users."0.2.0".default = (f.redox_users."0.2.0".default or true); - }) [ - (features_.argon2rs."${deps."redox_users"."0.2.0"."argon2rs"}" deps) - (features_.failure."${deps."redox_users"."0.2.0"."failure"}" deps) - (features_.rand."${deps."redox_users"."0.2.0"."rand"}" deps) - (features_.redox_syscall."${deps."redox_users"."0.2.0"."redox_syscall"}" deps) - ]; - - -# end -# redox_users-0.3.0 - - crates.redox_users."0.3.0" = deps: { features?(features_.redox_users."0.3.0" deps {}) }: buildRustCrate { - crateName = "redox_users"; - version = "0.3.0"; - description = "A Rust library to access Redox users and groups functionality"; - authors = [ "Jose Narvaez " "Wesley Hershberger " ]; - sha256 = "051rzqgk5hn7rf24nwgbb32zfdn8qp2kwqvdp0772ia85p737p4j"; - dependencies = mapFeatures features ([ - (crates."argon2rs"."${deps."redox_users"."0.3.0"."argon2rs"}" deps) - (crates."failure"."${deps."redox_users"."0.3.0"."failure"}" deps) - (crates."rand_os"."${deps."redox_users"."0.3.0"."rand_os"}" deps) - (crates."redox_syscall"."${deps."redox_users"."0.3.0"."redox_syscall"}" deps) - ]); - }; - features_.redox_users."0.3.0" = deps: f: updateFeatures f ({ - argon2rs."${deps.redox_users."0.3.0".argon2rs}".default = (f.argon2rs."${deps.redox_users."0.3.0".argon2rs}".default or false); - failure."${deps.redox_users."0.3.0".failure}".default = true; - rand_os."${deps.redox_users."0.3.0".rand_os}".default = true; - redox_syscall."${deps.redox_users."0.3.0".redox_syscall}".default = true; - redox_users."0.3.0".default = (f.redox_users."0.3.0".default or true); - }) [ - (features_.argon2rs."${deps."redox_users"."0.3.0"."argon2rs"}" deps) - (features_.failure."${deps."redox_users"."0.3.0"."failure"}" deps) - (features_.rand_os."${deps."redox_users"."0.3.0"."rand_os"}" deps) - (features_.redox_syscall."${deps."redox_users"."0.3.0"."redox_syscall"}" deps) - ]; - - -# end -# regex-1.0.5 - - crates.regex."1.0.5" = deps: { features?(features_.regex."1.0.5" deps {}) }: buildRustCrate { - crateName = "regex"; - version = "1.0.5"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1nb4dva9lhb3v76bdds9qcxldb2xy998sdraqnqaqdr6axfsfp02"; - dependencies = mapFeatures features ([ - (crates."aho_corasick"."${deps."regex"."1.0.5"."aho_corasick"}" deps) - (crates."memchr"."${deps."regex"."1.0.5"."memchr"}" deps) - (crates."regex_syntax"."${deps."regex"."1.0.5"."regex_syntax"}" deps) - (crates."thread_local"."${deps."regex"."1.0.5"."thread_local"}" deps) - (crates."utf8_ranges"."${deps."regex"."1.0.5"."utf8_ranges"}" deps) - ]); - features = mkFeatures (features."regex"."1.0.5" or {}); - }; - features_.regex."1.0.5" = deps: f: updateFeatures f (rec { - aho_corasick."${deps.regex."1.0.5".aho_corasick}".default = true; - memchr."${deps.regex."1.0.5".memchr}".default = true; - regex = fold recursiveUpdate {} [ - { "1.0.5".default = (f.regex."1.0.5".default or true); } - { "1.0.5".pattern = - (f.regex."1.0.5".pattern or false) || - (f.regex."1.0.5".unstable or false) || - (regex."1.0.5"."unstable" or false); } - { "1.0.5".use_std = - (f.regex."1.0.5".use_std or false) || - (f.regex."1.0.5".default or false) || - (regex."1.0.5"."default" or false); } - ]; - regex_syntax."${deps.regex."1.0.5".regex_syntax}".default = true; - thread_local."${deps.regex."1.0.5".thread_local}".default = true; - utf8_ranges."${deps.regex."1.0.5".utf8_ranges}".default = true; - }) [ - (features_.aho_corasick."${deps."regex"."1.0.5"."aho_corasick"}" deps) - (features_.memchr."${deps."regex"."1.0.5"."memchr"}" deps) - (features_.regex_syntax."${deps."regex"."1.0.5"."regex_syntax"}" deps) - (features_.thread_local."${deps."regex"."1.0.5"."thread_local"}" deps) - (features_.utf8_ranges."${deps."regex"."1.0.5"."utf8_ranges"}" deps) - ]; - - -# end -# regex-1.1.2 - - crates.regex."1.1.2" = deps: { features?(features_.regex."1.1.2" deps {}) }: buildRustCrate { - crateName = "regex"; - version = "1.1.2"; - description = "An implementation of regular expressions for Rust. This implementation uses\nfinite automata and guarantees linear time matching on all inputs.\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1c9nb031z1vw5l6lzfkfra2mah9hb2s1wgq9f1lmgcbkiiprj9xd"; - dependencies = mapFeatures features ([ - (crates."aho_corasick"."${deps."regex"."1.1.2"."aho_corasick"}" deps) - (crates."memchr"."${deps."regex"."1.1.2"."memchr"}" deps) - (crates."regex_syntax"."${deps."regex"."1.1.2"."regex_syntax"}" deps) - (crates."thread_local"."${deps."regex"."1.1.2"."thread_local"}" deps) - (crates."utf8_ranges"."${deps."regex"."1.1.2"."utf8_ranges"}" deps) - ]); - features = mkFeatures (features."regex"."1.1.2" or {}); - }; - features_.regex."1.1.2" = deps: f: updateFeatures f (rec { - aho_corasick."${deps.regex."1.1.2".aho_corasick}".default = true; - memchr."${deps.regex."1.1.2".memchr}".default = true; - regex = fold recursiveUpdate {} [ - { "1.1.2"."pattern" = - (f.regex."1.1.2"."pattern" or false) || - (f.regex."1.1.2".unstable or false) || - (regex."1.1.2"."unstable" or false); } - { "1.1.2"."use_std" = - (f.regex."1.1.2"."use_std" or false) || - (f.regex."1.1.2".default or false) || - (regex."1.1.2"."default" or false); } - { "1.1.2".default = (f.regex."1.1.2".default or true); } - ]; - regex_syntax."${deps.regex."1.1.2".regex_syntax}".default = true; - thread_local."${deps.regex."1.1.2".thread_local}".default = true; - utf8_ranges."${deps.regex."1.1.2".utf8_ranges}".default = true; - }) [ - (features_.aho_corasick."${deps."regex"."1.1.2"."aho_corasick"}" deps) - (features_.memchr."${deps."regex"."1.1.2"."memchr"}" deps) - (features_.regex_syntax."${deps."regex"."1.1.2"."regex_syntax"}" deps) - (features_.thread_local."${deps."regex"."1.1.2"."thread_local"}" deps) - (features_.utf8_ranges."${deps."regex"."1.1.2"."utf8_ranges"}" deps) - ]; - - -# end -# regex-syntax-0.6.2 - - crates.regex_syntax."0.6.2" = deps: { features?(features_.regex_syntax."0.6.2" deps {}) }: buildRustCrate { - crateName = "regex-syntax"; - version = "0.6.2"; - authors = [ "The Rust Project Developers" ]; - sha256 = "109426mj7nhwr6szdzbcvn1a8g5zy52f9maqxjd9agm8wg87ylyw"; - dependencies = mapFeatures features ([ - (crates."ucd_util"."${deps."regex_syntax"."0.6.2"."ucd_util"}" deps) - ]); - }; - features_.regex_syntax."0.6.2" = deps: f: updateFeatures f ({ - regex_syntax."0.6.2".default = (f.regex_syntax."0.6.2".default or true); - ucd_util."${deps.regex_syntax."0.6.2".ucd_util}".default = true; - }) [ - (features_.ucd_util."${deps."regex_syntax"."0.6.2"."ucd_util"}" deps) - ]; - - -# end -# regex-syntax-0.6.5 - - crates.regex_syntax."0.6.5" = deps: { features?(features_.regex_syntax."0.6.5" deps {}) }: buildRustCrate { - crateName = "regex-syntax"; - version = "0.6.5"; - description = "A regular expression parser."; - authors = [ "The Rust Project Developers" ]; - sha256 = "0aaaba1fan2qfyc31wzdmgmbmyirc27zgcbz41ba5wm1lb2d8kli"; - dependencies = mapFeatures features ([ - (crates."ucd_util"."${deps."regex_syntax"."0.6.5"."ucd_util"}" deps) - ]); - }; - features_.regex_syntax."0.6.5" = deps: f: updateFeatures f ({ - regex_syntax."0.6.5".default = (f.regex_syntax."0.6.5".default or true); - ucd_util."${deps.regex_syntax."0.6.5".ucd_util}".default = true; - }) [ - (features_.ucd_util."${deps."regex_syntax"."0.6.5"."ucd_util"}" deps) - ]; - - -# end -# remove_dir_all-0.5.1 - - crates.remove_dir_all."0.5.1" = deps: { features?(features_.remove_dir_all."0.5.1" deps {}) }: buildRustCrate { - crateName = "remove_dir_all"; - version = "0.5.1"; - authors = [ "Aaronepower " ]; - sha256 = "1chx3yvfbj46xjz4bzsvps208l46hfbcy0sm98gpiya454n4rrl7"; - dependencies = (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."remove_dir_all"."0.5.1"."winapi"}" deps) - ]) else []); - }; - features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f ({ - remove_dir_all."0.5.1".default = (f.remove_dir_all."0.5.1".default or true); - winapi = fold recursiveUpdate {} [ - { "${deps.remove_dir_all."0.5.1".winapi}"."errhandlingapi" = true; } - { "${deps.remove_dir_all."0.5.1".winapi}"."fileapi" = true; } - { "${deps.remove_dir_all."0.5.1".winapi}"."std" = true; } - { "${deps.remove_dir_all."0.5.1".winapi}"."winbase" = true; } - { "${deps.remove_dir_all."0.5.1".winapi}"."winerror" = true; } - { "${deps.remove_dir_all."0.5.1".winapi}".default = true; } - ]; - }) [ - (features_.winapi."${deps."remove_dir_all"."0.5.1"."winapi"}" deps) - ]; - - -# end -# rustc-demangle-0.1.13 - - crates.rustc_demangle."0.1.13" = deps: { features?(features_.rustc_demangle."0.1.13" deps {}) }: buildRustCrate { - crateName = "rustc-demangle"; - version = "0.1.13"; - description = "Rust compiler symbol demangling.\n"; - authors = [ "Alex Crichton " ]; - sha256 = "0sr6cr02araqnlqwc5ghvnafjmkw11vzjswqaz757lvyrcl8xcy6"; - }; - features_.rustc_demangle."0.1.13" = deps: f: updateFeatures f ({ - rustc_demangle."0.1.13".default = (f.rustc_demangle."0.1.13".default or true); - }) []; - - -# end -# rustc-demangle-0.1.9 - - crates.rustc_demangle."0.1.9" = deps: { features?(features_.rustc_demangle."0.1.9" deps {}) }: buildRustCrate { - crateName = "rustc-demangle"; - version = "0.1.9"; - authors = [ "Alex Crichton " ]; - sha256 = "00ma4r9haq0zv5krps617mym6y74056pfcivyld0kpci156vfaax"; - }; - features_.rustc_demangle."0.1.9" = deps: f: updateFeatures f ({ - rustc_demangle."0.1.9".default = (f.rustc_demangle."0.1.9".default or true); - }) []; - - -# end -# ryu-0.2.6 - - crates.ryu."0.2.6" = deps: { features?(features_.ryu."0.2.6" deps {}) }: buildRustCrate { - crateName = "ryu"; - version = "0.2.6"; - authors = [ "David Tolnay " ]; - sha256 = "1vdh6z4aysc9kiiqhl7vxkqz3fykcnp24kgfizshlwfsz2j0p9dr"; - build = "build.rs"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."ryu"."0.2.6" or {}); - }; - features_.ryu."0.2.6" = deps: f: updateFeatures f ({ - ryu."0.2.6".default = (f.ryu."0.2.6".default or true); - }) []; - - -# end -# ryu-0.2.7 - - crates.ryu."0.2.7" = deps: { features?(features_.ryu."0.2.7" deps {}) }: buildRustCrate { - crateName = "ryu"; - version = "0.2.7"; - description = "Fast floating point to string conversion"; - authors = [ "David Tolnay " ]; - sha256 = "0m8szf1m87wfqkwh1f9zp9bn2mb0m9nav028xxnd0hlig90b44bd"; - build = "build.rs"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."ryu"."0.2.7" or {}); - }; - features_.ryu."0.2.7" = deps: f: updateFeatures f ({ - ryu."0.2.7".default = (f.ryu."0.2.7".default or true); - }) []; - - -# end -# scoped_threadpool-0.1.9 - - crates.scoped_threadpool."0.1.9" = deps: { features?(features_.scoped_threadpool."0.1.9" deps {}) }: buildRustCrate { - crateName = "scoped_threadpool"; - version = "0.1.9"; - authors = [ "Marvin Löbel " ]; - sha256 = "1arqj2skcfr46s1lcyvnlmfr5456kg5nhn8k90xyfjnxkp5yga2v"; - features = mkFeatures (features."scoped_threadpool"."0.1.9" or {}); - }; - features_.scoped_threadpool."0.1.9" = deps: f: updateFeatures f ({ - scoped_threadpool."0.1.9".default = (f.scoped_threadpool."0.1.9".default or true); - }) []; - - -# end -# serde-1.0.80 - - crates.serde."1.0.80" = deps: { features?(features_.serde."1.0.80" deps {}) }: buildRustCrate { - crateName = "serde"; - version = "1.0.80"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "0vyciw2qhrws4hz87pfnsjdfzzdw2sclxqxq394g3a219a2rdcxz"; - build = "build.rs"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."serde"."1.0.80" or {}); - }; - features_.serde."1.0.80" = deps: f: updateFeatures f (rec { - serde = fold recursiveUpdate {} [ - { "1.0.80".default = (f.serde."1.0.80".default or true); } - { "1.0.80".serde_derive = - (f.serde."1.0.80".serde_derive or false) || - (f.serde."1.0.80".derive or false) || - (serde."1.0.80"."derive" or false); } - { "1.0.80".std = - (f.serde."1.0.80".std or false) || - (f.serde."1.0.80".default or false) || - (serde."1.0.80"."default" or false); } - { "1.0.80".unstable = - (f.serde."1.0.80".unstable or false) || - (f.serde."1.0.80".alloc or false) || - (serde."1.0.80"."alloc" or false); } - ]; - }) []; - - -# end -# serde-1.0.84 - - crates.serde."1.0.84" = deps: { features?(features_.serde."1.0.84" deps {}) }: buildRustCrate { - crateName = "serde"; - version = "1.0.84"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "1x40cvvkbkz592jflwbfbxhim3wxdqp9dy0qxjw13ra7q57b29gy"; - build = "build.rs"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."serde"."1.0.84" or {}); - }; - features_.serde."1.0.84" = deps: f: updateFeatures f (rec { - serde = fold recursiveUpdate {} [ - { "1.0.84".default = (f.serde."1.0.84".default or true); } - { "1.0.84".serde_derive = - (f.serde."1.0.84".serde_derive or false) || - (f.serde."1.0.84".derive or false) || - (serde."1.0.84"."derive" or false); } - { "1.0.84".std = - (f.serde."1.0.84".std or false) || - (f.serde."1.0.84".default or false) || - (serde."1.0.84"."default" or false); } - { "1.0.84".unstable = - (f.serde."1.0.84".unstable or false) || - (f.serde."1.0.84".alloc or false) || - (serde."1.0.84"."alloc" or false); } - ]; - }) []; - - -# end -# serde-1.0.89 - - crates.serde."1.0.89" = deps: { features?(features_.serde."1.0.89" deps {}) }: buildRustCrate { - crateName = "serde"; - version = "1.0.89"; - description = "A generic serialization/deserialization framework"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "14pidc6skkm92vhp431wi1aam5vv5g6rmsimik38wzb0qy72c71g"; - build = "build.rs"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."serde"."1.0.89" or {}); - }; - features_.serde."1.0.89" = deps: f: updateFeatures f (rec { - serde = fold recursiveUpdate {} [ - { "1.0.89"."serde_derive" = - (f.serde."1.0.89"."serde_derive" or false) || - (f.serde."1.0.89".derive or false) || - (serde."1.0.89"."derive" or false); } - { "1.0.89"."std" = - (f.serde."1.0.89"."std" or false) || - (f.serde."1.0.89".default or false) || - (serde."1.0.89"."default" or false); } - { "1.0.89"."unstable" = - (f.serde."1.0.89"."unstable" or false) || - (f.serde."1.0.89".alloc or false) || - (serde."1.0.89"."alloc" or false); } - { "1.0.89".default = (f.serde."1.0.89".default or true); } - ]; - }) []; - - -# end -# serde_derive-1.0.80 - - crates.serde_derive."1.0.80" = deps: { features?(features_.serde_derive."1.0.80" deps {}) }: buildRustCrate { - crateName = "serde_derive"; - version = "1.0.80"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "1akvzhbnnqhd92lfj7vp43scs1vdml7x27c82l5yh0kz7xf7jaky"; - procMacro = true; - dependencies = mapFeatures features ([ - (crates."proc_macro2"."${deps."serde_derive"."1.0.80"."proc_macro2"}" deps) - (crates."quote"."${deps."serde_derive"."1.0.80"."quote"}" deps) - (crates."syn"."${deps."serde_derive"."1.0.80"."syn"}" deps) - ]); - features = mkFeatures (features."serde_derive"."1.0.80" or {}); - }; - features_.serde_derive."1.0.80" = deps: f: updateFeatures f ({ - proc_macro2."${deps.serde_derive."1.0.80".proc_macro2}".default = true; - quote."${deps.serde_derive."1.0.80".quote}".default = true; - serde_derive."1.0.80".default = (f.serde_derive."1.0.80".default or true); - syn = fold recursiveUpdate {} [ - { "${deps.serde_derive."1.0.80".syn}"."visit" = true; } - { "${deps.serde_derive."1.0.80".syn}".default = true; } - ]; - }) [ - (features_.proc_macro2."${deps."serde_derive"."1.0.80"."proc_macro2"}" deps) - (features_.quote."${deps."serde_derive"."1.0.80"."quote"}" deps) - (features_.syn."${deps."serde_derive"."1.0.80"."syn"}" deps) - ]; - - -# end -# serde_derive-1.0.89 - - crates.serde_derive."1.0.89" = deps: { features?(features_.serde_derive."1.0.89" deps {}) }: buildRustCrate { - crateName = "serde_derive"; - version = "1.0.89"; - description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "0wxbxq9sccrd939pfnrgfzykkwl9gag2yf7vxhg2c2p9kx36d3wm"; - procMacro = true; - dependencies = mapFeatures features ([ - (crates."proc_macro2"."${deps."serde_derive"."1.0.89"."proc_macro2"}" deps) - (crates."quote"."${deps."serde_derive"."1.0.89"."quote"}" deps) - (crates."syn"."${deps."serde_derive"."1.0.89"."syn"}" deps) - ]); - features = mkFeatures (features."serde_derive"."1.0.89" or {}); - }; - features_.serde_derive."1.0.89" = deps: f: updateFeatures f ({ - proc_macro2."${deps.serde_derive."1.0.89".proc_macro2}".default = true; - quote."${deps.serde_derive."1.0.89".quote}".default = true; - serde_derive."1.0.89".default = (f.serde_derive."1.0.89".default or true); - syn = fold recursiveUpdate {} [ - { "${deps.serde_derive."1.0.89".syn}"."visit" = true; } - { "${deps.serde_derive."1.0.89".syn}".default = true; } - ]; - }) [ - (features_.proc_macro2."${deps."serde_derive"."1.0.89"."proc_macro2"}" deps) - (features_.quote."${deps."serde_derive"."1.0.89"."quote"}" deps) - (features_.syn."${deps."serde_derive"."1.0.89"."syn"}" deps) - ]; - - -# end -# serde_json-1.0.32 - - crates.serde_json."1.0.32" = deps: { features?(features_.serde_json."1.0.32" deps {}) }: buildRustCrate { - crateName = "serde_json"; - version = "1.0.32"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "1dqkvizi02j1bs5c21kw20idf4aa5399g29ndwl6vkmmrqkr1gr0"; - dependencies = mapFeatures features ([ - (crates."itoa"."${deps."serde_json"."1.0.32"."itoa"}" deps) - (crates."ryu"."${deps."serde_json"."1.0.32"."ryu"}" deps) - (crates."serde"."${deps."serde_json"."1.0.32"."serde"}" deps) - ]); - features = mkFeatures (features."serde_json"."1.0.32" or {}); - }; - features_.serde_json."1.0.32" = deps: f: updateFeatures f (rec { - itoa."${deps.serde_json."1.0.32".itoa}".default = true; - ryu."${deps.serde_json."1.0.32".ryu}".default = true; - serde."${deps.serde_json."1.0.32".serde}".default = true; - serde_json = fold recursiveUpdate {} [ - { "1.0.32".default = (f.serde_json."1.0.32".default or true); } - { "1.0.32".indexmap = - (f.serde_json."1.0.32".indexmap or false) || - (f.serde_json."1.0.32".preserve_order or false) || - (serde_json."1.0.32"."preserve_order" or false); } - ]; - }) [ - (features_.itoa."${deps."serde_json"."1.0.32"."itoa"}" deps) - (features_.ryu."${deps."serde_json"."1.0.32"."ryu"}" deps) - (features_.serde."${deps."serde_json"."1.0.32"."serde"}" deps) - ]; - - -# end -# serde_json-1.0.39 - - crates.serde_json."1.0.39" = deps: { features?(features_.serde_json."1.0.39" deps {}) }: buildRustCrate { - crateName = "serde_json"; - version = "1.0.39"; - description = "A JSON serialization file format"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "07ydv06hn8x0yl0rc94l2wl9r2xz1fqd97n1s6j3bgdc6gw406a8"; - dependencies = mapFeatures features ([ - (crates."itoa"."${deps."serde_json"."1.0.39"."itoa"}" deps) - (crates."ryu"."${deps."serde_json"."1.0.39"."ryu"}" deps) - (crates."serde"."${deps."serde_json"."1.0.39"."serde"}" deps) - ]); - features = mkFeatures (features."serde_json"."1.0.39" or {}); - }; - features_.serde_json."1.0.39" = deps: f: updateFeatures f (rec { - itoa."${deps.serde_json."1.0.39".itoa}".default = true; - ryu."${deps.serde_json."1.0.39".ryu}".default = true; - serde."${deps.serde_json."1.0.39".serde}".default = true; - serde_json = fold recursiveUpdate {} [ - { "1.0.39"."indexmap" = - (f.serde_json."1.0.39"."indexmap" or false) || - (f.serde_json."1.0.39".preserve_order or false) || - (serde_json."1.0.39"."preserve_order" or false); } - { "1.0.39".default = (f.serde_json."1.0.39".default or true); } - ]; - }) [ - (features_.itoa."${deps."serde_json"."1.0.39"."itoa"}" deps) - (features_.ryu."${deps."serde_json"."1.0.39"."ryu"}" deps) - (features_.serde."${deps."serde_json"."1.0.39"."serde"}" deps) - ]; - - -# end -# smallvec-0.6.9 - - crates.smallvec."0.6.9" = deps: { features?(features_.smallvec."0.6.9" deps {}) }: buildRustCrate { - crateName = "smallvec"; - version = "0.6.9"; - description = "'Small vector' optimization: store up to a small number of items on the stack"; - authors = [ "Simon Sapin " ]; - sha256 = "0p96l51a2pq5y0vn48nhbm6qslbc6k8h28cxm0pmzkqmj7xynz6w"; - libPath = "lib.rs"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."smallvec"."0.6.9" or {}); - }; - features_.smallvec."0.6.9" = deps: f: updateFeatures f (rec { - smallvec = fold recursiveUpdate {} [ - { "0.6.9"."std" = - (f.smallvec."0.6.9"."std" or false) || - (f.smallvec."0.6.9".default or false) || - (smallvec."0.6.9"."default" or false); } - { "0.6.9".default = (f.smallvec."0.6.9".default or true); } - ]; - }) []; - - -# end -# strsim-0.7.0 - - crates.strsim."0.7.0" = deps: { features?(features_.strsim."0.7.0" deps {}) }: buildRustCrate { - crateName = "strsim"; - version = "0.7.0"; - authors = [ "Danny Guo " ]; - sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; - }; - features_.strsim."0.7.0" = deps: f: updateFeatures f ({ - strsim."0.7.0".default = (f.strsim."0.7.0".default or true); - }) []; - - -# end -# syn-0.15.13 - - crates.syn."0.15.13" = deps: { features?(features_.syn."0.15.13" deps {}) }: buildRustCrate { - crateName = "syn"; - version = "0.15.13"; - authors = [ "David Tolnay " ]; - sha256 = "1zvnppl08f2njpkl3m10h221sdl4vsm7v6vyq63dxk16nn37b1bh"; - dependencies = mapFeatures features ([ - (crates."proc_macro2"."${deps."syn"."0.15.13"."proc_macro2"}" deps) - (crates."unicode_xid"."${deps."syn"."0.15.13"."unicode_xid"}" deps) - ] - ++ (if features.syn."0.15.13".quote or false then [ (crates.quote."${deps."syn"."0.15.13".quote}" deps) ] else [])); - features = mkFeatures (features."syn"."0.15.13" or {}); - }; - features_.syn."0.15.13" = deps: f: updateFeatures f (rec { - proc_macro2 = fold recursiveUpdate {} [ - { "${deps.syn."0.15.13".proc_macro2}"."proc-macro" = - (f.proc_macro2."${deps.syn."0.15.13".proc_macro2}"."proc-macro" or false) || - (syn."0.15.13"."proc-macro" or false) || - (f."syn"."0.15.13"."proc-macro" or false); } - { "${deps.syn."0.15.13".proc_macro2}".default = (f.proc_macro2."${deps.syn."0.15.13".proc_macro2}".default or false); } - ]; - quote = fold recursiveUpdate {} [ - { "${deps.syn."0.15.13".quote}"."proc-macro" = - (f.quote."${deps.syn."0.15.13".quote}"."proc-macro" or false) || - (syn."0.15.13"."proc-macro" or false) || - (f."syn"."0.15.13"."proc-macro" or false); } - { "${deps.syn."0.15.13".quote}".default = (f.quote."${deps.syn."0.15.13".quote}".default or false); } - ]; - syn = fold recursiveUpdate {} [ - { "0.15.13".clone-impls = - (f.syn."0.15.13".clone-impls or false) || - (f.syn."0.15.13".default or false) || - (syn."0.15.13"."default" or false); } - { "0.15.13".default = (f.syn."0.15.13".default or true); } - { "0.15.13".derive = - (f.syn."0.15.13".derive or false) || - (f.syn."0.15.13".default or false) || - (syn."0.15.13"."default" or false); } - { "0.15.13".parsing = - (f.syn."0.15.13".parsing or false) || - (f.syn."0.15.13".default or false) || - (syn."0.15.13"."default" or false); } - { "0.15.13".printing = - (f.syn."0.15.13".printing or false) || - (f.syn."0.15.13".default or false) || - (syn."0.15.13"."default" or false); } - { "0.15.13".proc-macro = - (f.syn."0.15.13".proc-macro or false) || - (f.syn."0.15.13".default or false) || - (syn."0.15.13"."default" or false); } - { "0.15.13".quote = - (f.syn."0.15.13".quote or false) || - (f.syn."0.15.13".printing or false) || - (syn."0.15.13"."printing" or false); } - ]; - unicode_xid."${deps.syn."0.15.13".unicode_xid}".default = true; - }) [ - (features_.proc_macro2."${deps."syn"."0.15.13"."proc_macro2"}" deps) - (features_.quote."${deps."syn"."0.15.13"."quote"}" deps) - (features_.unicode_xid."${deps."syn"."0.15.13"."unicode_xid"}" deps) - ]; - - -# end -# syn-0.15.29 - - crates.syn."0.15.29" = deps: { features?(features_.syn."0.15.29" deps {}) }: buildRustCrate { - crateName = "syn"; - version = "0.15.29"; - description = "Parser for Rust source code"; - authors = [ "David Tolnay " ]; - sha256 = "0wrd6awgc6f1iwfn2v9fvwyd2yddgxdjv9s106kvwg1ljbw3fajw"; - dependencies = mapFeatures features ([ - (crates."proc_macro2"."${deps."syn"."0.15.29"."proc_macro2"}" deps) - (crates."unicode_xid"."${deps."syn"."0.15.29"."unicode_xid"}" deps) - ] - ++ (if features.syn."0.15.29".quote or false then [ (crates.quote."${deps."syn"."0.15.29".quote}" deps) ] else [])); - features = mkFeatures (features."syn"."0.15.29" or {}); - }; - features_.syn."0.15.29" = deps: f: updateFeatures f (rec { - proc_macro2 = fold recursiveUpdate {} [ - { "${deps.syn."0.15.29".proc_macro2}"."proc-macro" = - (f.proc_macro2."${deps.syn."0.15.29".proc_macro2}"."proc-macro" or false) || - (syn."0.15.29"."proc-macro" or false) || - (f."syn"."0.15.29"."proc-macro" or false); } - { "${deps.syn."0.15.29".proc_macro2}".default = (f.proc_macro2."${deps.syn."0.15.29".proc_macro2}".default or false); } - ]; - quote = fold recursiveUpdate {} [ - { "${deps.syn."0.15.29".quote}"."proc-macro" = - (f.quote."${deps.syn."0.15.29".quote}"."proc-macro" or false) || - (syn."0.15.29"."proc-macro" or false) || - (f."syn"."0.15.29"."proc-macro" or false); } - { "${deps.syn."0.15.29".quote}".default = (f.quote."${deps.syn."0.15.29".quote}".default or false); } - ]; - syn = fold recursiveUpdate {} [ - { "0.15.29"."clone-impls" = - (f.syn."0.15.29"."clone-impls" or false) || - (f.syn."0.15.29".default or false) || - (syn."0.15.29"."default" or false); } - { "0.15.29"."derive" = - (f.syn."0.15.29"."derive" or false) || - (f.syn."0.15.29".default or false) || - (syn."0.15.29"."default" or false); } - { "0.15.29"."parsing" = - (f.syn."0.15.29"."parsing" or false) || - (f.syn."0.15.29".default or false) || - (syn."0.15.29"."default" or false); } - { "0.15.29"."printing" = - (f.syn."0.15.29"."printing" or false) || - (f.syn."0.15.29".default or false) || - (syn."0.15.29"."default" or false); } - { "0.15.29"."proc-macro" = - (f.syn."0.15.29"."proc-macro" or false) || - (f.syn."0.15.29".default or false) || - (syn."0.15.29"."default" or false); } - { "0.15.29"."quote" = - (f.syn."0.15.29"."quote" or false) || - (f.syn."0.15.29".printing or false) || - (syn."0.15.29"."printing" or false); } - { "0.15.29".default = (f.syn."0.15.29".default or true); } - ]; - unicode_xid."${deps.syn."0.15.29".unicode_xid}".default = true; - }) [ - (features_.proc_macro2."${deps."syn"."0.15.29"."proc_macro2"}" deps) - (features_.quote."${deps."syn"."0.15.29"."quote"}" deps) - (features_.unicode_xid."${deps."syn"."0.15.29"."unicode_xid"}" deps) - ]; - - -# end -# synstructure-0.10.0 - - crates.synstructure."0.10.0" = deps: { features?(features_.synstructure."0.10.0" deps {}) }: buildRustCrate { - crateName = "synstructure"; - version = "0.10.0"; - authors = [ "Nika Layzell " ]; - sha256 = "1alb4hsbm5qf4jy7nmdkqrh3jagqk1xj88w0pmz67f16dvgpf0qf"; - dependencies = mapFeatures features ([ - (crates."proc_macro2"."${deps."synstructure"."0.10.0"."proc_macro2"}" deps) - (crates."quote"."${deps."synstructure"."0.10.0"."quote"}" deps) - (crates."syn"."${deps."synstructure"."0.10.0"."syn"}" deps) - (crates."unicode_xid"."${deps."synstructure"."0.10.0"."unicode_xid"}" deps) - ]); - features = mkFeatures (features."synstructure"."0.10.0" or {}); - }; - features_.synstructure."0.10.0" = deps: f: updateFeatures f ({ - proc_macro2."${deps.synstructure."0.10.0".proc_macro2}".default = true; - quote."${deps.synstructure."0.10.0".quote}".default = true; - syn = fold recursiveUpdate {} [ - { "${deps.synstructure."0.10.0".syn}"."extra-traits" = true; } - { "${deps.synstructure."0.10.0".syn}"."visit" = true; } - { "${deps.synstructure."0.10.0".syn}".default = true; } - ]; - synstructure."0.10.0".default = (f.synstructure."0.10.0".default or true); - unicode_xid."${deps.synstructure."0.10.0".unicode_xid}".default = true; - }) [ - (features_.proc_macro2."${deps."synstructure"."0.10.0"."proc_macro2"}" deps) - (features_.quote."${deps."synstructure"."0.10.0"."quote"}" deps) - (features_.syn."${deps."synstructure"."0.10.0"."syn"}" deps) - (features_.unicode_xid."${deps."synstructure"."0.10.0"."unicode_xid"}" deps) - ]; - - -# end -# synstructure-0.10.1 - - crates.synstructure."0.10.1" = deps: { features?(features_.synstructure."0.10.1" deps {}) }: buildRustCrate { - crateName = "synstructure"; - version = "0.10.1"; - description = "Helper methods and macros for custom derives"; - authors = [ "Nika Layzell " ]; - sha256 = "0mx2vwd0d0f7hanz15nkp0ikkfjsx9rfkph7pynxyfbj45ank4g3"; - dependencies = mapFeatures features ([ - (crates."proc_macro2"."${deps."synstructure"."0.10.1"."proc_macro2"}" deps) - (crates."quote"."${deps."synstructure"."0.10.1"."quote"}" deps) - (crates."syn"."${deps."synstructure"."0.10.1"."syn"}" deps) - (crates."unicode_xid"."${deps."synstructure"."0.10.1"."unicode_xid"}" deps) - ]); - features = mkFeatures (features."synstructure"."0.10.1" or {}); - }; - features_.synstructure."0.10.1" = deps: f: updateFeatures f ({ - proc_macro2."${deps.synstructure."0.10.1".proc_macro2}".default = true; - quote."${deps.synstructure."0.10.1".quote}".default = true; - syn = fold recursiveUpdate {} [ - { "${deps.synstructure."0.10.1".syn}"."extra-traits" = true; } - { "${deps.synstructure."0.10.1".syn}"."visit" = true; } - { "${deps.synstructure."0.10.1".syn}".default = true; } - ]; - synstructure."0.10.1".default = (f.synstructure."0.10.1".default or true); - unicode_xid."${deps.synstructure."0.10.1".unicode_xid}".default = true; - }) [ - (features_.proc_macro2."${deps."synstructure"."0.10.1"."proc_macro2"}" deps) - (features_.quote."${deps."synstructure"."0.10.1"."quote"}" deps) - (features_.syn."${deps."synstructure"."0.10.1"."syn"}" deps) - (features_.unicode_xid."${deps."synstructure"."0.10.1"."unicode_xid"}" deps) - ]; - - -# end -# tempdir-0.3.7 - - crates.tempdir."0.3.7" = deps: { features?(features_.tempdir."0.3.7" deps {}) }: buildRustCrate { - crateName = "tempdir"; - version = "0.3.7"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy"; - dependencies = mapFeatures features ([ - (crates."rand"."${deps."tempdir"."0.3.7"."rand"}" deps) - (crates."remove_dir_all"."${deps."tempdir"."0.3.7"."remove_dir_all"}" deps) - ]); - }; - features_.tempdir."0.3.7" = deps: f: updateFeatures f ({ - rand."${deps.tempdir."0.3.7".rand}".default = true; - remove_dir_all."${deps.tempdir."0.3.7".remove_dir_all}".default = true; - tempdir."0.3.7".default = (f.tempdir."0.3.7".default or true); - }) [ - (features_.rand."${deps."tempdir"."0.3.7"."rand"}" deps) - (features_.remove_dir_all."${deps."tempdir"."0.3.7"."remove_dir_all"}" deps) - ]; - - -# end -# termcolor-1.0.4 - - crates.termcolor."1.0.4" = deps: { features?(features_.termcolor."1.0.4" deps {}) }: buildRustCrate { - crateName = "termcolor"; - version = "1.0.4"; - authors = [ "Andrew Gallant " ]; - sha256 = "0xydrjc0bxg08llcbcmkka29szdrfklk4vh6l6mdd67ajifqw1mv"; - dependencies = (if kernel == "windows" then mapFeatures features ([ - (crates."wincolor"."${deps."termcolor"."1.0.4"."wincolor"}" deps) - ]) else []); - }; - features_.termcolor."1.0.4" = deps: f: updateFeatures f ({ - termcolor."1.0.4".default = (f.termcolor."1.0.4".default or true); - wincolor."${deps.termcolor."1.0.4".wincolor}".default = true; - }) [ - (features_.wincolor."${deps."termcolor"."1.0.4"."wincolor"}" deps) - ]; - - -# end -# termion-1.5.1 - - crates.termion."1.5.1" = deps: { features?(features_.termion."1.5.1" deps {}) }: buildRustCrate { - crateName = "termion"; - version = "1.5.1"; - authors = [ "ticki " "gycos " "IGI-111 " ]; - sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; - dependencies = (if !(kernel == "redox") then mapFeatures features ([ - (crates."libc"."${deps."termion"."1.5.1"."libc"}" deps) - ]) else []) - ++ (if kernel == "redox" then mapFeatures features ([ - (crates."redox_syscall"."${deps."termion"."1.5.1"."redox_syscall"}" deps) - (crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps) - ]) else []); - }; - features_.termion."1.5.1" = deps: f: updateFeatures f ({ - libc."${deps.termion."1.5.1".libc}".default = true; - redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true; - redox_termios."${deps.termion."1.5.1".redox_termios}".default = true; - termion."1.5.1".default = (f.termion."1.5.1".default or true); - }) [ - (features_.libc."${deps."termion"."1.5.1"."libc"}" deps) - (features_.redox_syscall."${deps."termion"."1.5.1"."redox_syscall"}" deps) - (features_.redox_termios."${deps."termion"."1.5.1"."redox_termios"}" deps) - ]; - - -# end -# textwrap-0.10.0 - - crates.textwrap."0.10.0" = deps: { features?(features_.textwrap."0.10.0" deps {}) }: buildRustCrate { - crateName = "textwrap"; - version = "0.10.0"; - authors = [ "Martin Geisler " ]; - sha256 = "1s8d5cna12smhgj0x2y1xphklyk2an1yzbadnj89p1vy5vnjpsas"; - dependencies = mapFeatures features ([ - (crates."unicode_width"."${deps."textwrap"."0.10.0"."unicode_width"}" deps) - ]); - }; - features_.textwrap."0.10.0" = deps: f: updateFeatures f ({ - textwrap."0.10.0".default = (f.textwrap."0.10.0".default or true); - unicode_width."${deps.textwrap."0.10.0".unicode_width}".default = true; - }) [ - (features_.unicode_width."${deps."textwrap"."0.10.0"."unicode_width"}" deps) - ]; - - -# end -# thread_local-0.3.6 - - crates.thread_local."0.3.6" = deps: { features?(features_.thread_local."0.3.6" deps {}) }: buildRustCrate { - crateName = "thread_local"; - version = "0.3.6"; - authors = [ "Amanieu d'Antras " ]; - sha256 = "02rksdwjmz2pw9bmgbb4c0bgkbq5z6nvg510sq1s6y2j1gam0c7i"; - dependencies = mapFeatures features ([ - (crates."lazy_static"."${deps."thread_local"."0.3.6"."lazy_static"}" deps) - ]); - }; - features_.thread_local."0.3.6" = deps: f: updateFeatures f ({ - lazy_static."${deps.thread_local."0.3.6".lazy_static}".default = true; - thread_local."0.3.6".default = (f.thread_local."0.3.6".default or true); - }) [ - (features_.lazy_static."${deps."thread_local"."0.3.6"."lazy_static"}" deps) - ]; - - -# end -# toml-0.4.10 - - crates.toml."0.4.10" = deps: { features?(features_.toml."0.4.10" deps {}) }: buildRustCrate { - crateName = "toml"; - version = "0.4.10"; - authors = [ "Alex Crichton " ]; - sha256 = "0fs4kxl86w3kmgwcgcv23nk79zagayz1spg281r83w0ywf88d6f1"; - dependencies = mapFeatures features ([ - (crates."serde"."${deps."toml"."0.4.10"."serde"}" deps) - ]); - }; - features_.toml."0.4.10" = deps: f: updateFeatures f ({ - serde."${deps.toml."0.4.10".serde}".default = true; - toml."0.4.10".default = (f.toml."0.4.10".default or true); - }) [ - (features_.serde."${deps."toml"."0.4.10"."serde"}" deps) - ]; - - -# end -# toml-0.4.8 - - crates.toml."0.4.8" = deps: { features?(features_.toml."0.4.8" deps {}) }: buildRustCrate { - crateName = "toml"; - version = "0.4.8"; - authors = [ "Alex Crichton " ]; - sha256 = "1xm3chgsvi3qqi7vj8sb5xvnbfpkqyl4fiwh7y2cl6r4brwlmif1"; - dependencies = mapFeatures features ([ - (crates."serde"."${deps."toml"."0.4.8"."serde"}" deps) - ]); - }; - features_.toml."0.4.8" = deps: f: updateFeatures f ({ - serde."${deps.toml."0.4.8".serde}".default = true; - toml."0.4.8".default = (f.toml."0.4.8".default or true); - }) [ - (features_.serde."${deps."toml"."0.4.8"."serde"}" deps) - ]; - - -# end -# toml-0.5.0 - - crates.toml."0.5.0" = deps: { features?(features_.toml."0.5.0" deps {}) }: buildRustCrate { - crateName = "toml"; - version = "0.5.0"; - description = "A native Rust encoder and decoder of TOML-formatted files and streams. Provides\nimplementations of the standard Serialize/Deserialize traits for TOML data to\nfacilitate deserializing and serializing Rust structures.\n"; - authors = [ "Alex Crichton " ]; - sha256 = "0l2lqzbn5g9l376k01isq1nhb14inkr4c50qbjbdzh5qysz7dyk5"; - dependencies = mapFeatures features ([ - (crates."serde"."${deps."toml"."0.5.0"."serde"}" deps) - ]); - features = mkFeatures (features."toml"."0.5.0" or {}); - }; - features_.toml."0.5.0" = deps: f: updateFeatures f (rec { - serde."${deps.toml."0.5.0".serde}".default = true; - toml = fold recursiveUpdate {} [ - { "0.5.0"."linked-hash-map" = - (f.toml."0.5.0"."linked-hash-map" or false) || - (f.toml."0.5.0".preserve_order or false) || - (toml."0.5.0"."preserve_order" or false); } - { "0.5.0".default = (f.toml."0.5.0".default or true); } - ]; - }) [ - (features_.serde."${deps."toml"."0.5.0"."serde"}" deps) - ]; - - -# end -# toml2nix-0.1.1 - - crates.toml2nix."0.1.1" = deps: { features?(features_.toml2nix."0.1.1" deps {}) }: buildRustCrate { - crateName = "toml2nix"; - version = "0.1.1"; - authors = [ "Pierre-Étienne Meunier " ]; - sha256 = "167qyylp0s76h7r0n99as3jwry5mrn5q1wxh2sdwh51d5qnnw6b2"; - dependencies = mapFeatures features ([ - (crates."toml"."${deps."toml2nix"."0.1.1"."toml"}" deps) - ]); - }; - features_.toml2nix."0.1.1" = deps: f: updateFeatures f ({ - toml."${deps.toml2nix."0.1.1".toml}".default = true; - toml2nix."0.1.1".default = (f.toml2nix."0.1.1".default or true); - }) [ - (features_.toml."${deps."toml2nix"."0.1.1"."toml"}" deps) - ]; - - -# end -# ucd-util-0.1.1 - - crates.ucd_util."0.1.1" = deps: { features?(features_.ucd_util."0.1.1" deps {}) }: buildRustCrate { - crateName = "ucd-util"; - version = "0.1.1"; - authors = [ "Andrew Gallant " ]; - sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0"; - }; - features_.ucd_util."0.1.1" = deps: f: updateFeatures f ({ - ucd_util."0.1.1".default = (f.ucd_util."0.1.1".default or true); - }) []; - - -# end -# ucd-util-0.1.3 - - crates.ucd_util."0.1.3" = deps: { features?(features_.ucd_util."0.1.3" deps {}) }: buildRustCrate { - crateName = "ucd-util"; - version = "0.1.3"; - description = "A small utility library for working with the Unicode character database.\n"; - authors = [ "Andrew Gallant " ]; - sha256 = "1n1qi3jywq5syq90z9qd8qzbn58pcjgv1sx4sdmipm4jf9zanz15"; - }; - features_.ucd_util."0.1.3" = deps: f: updateFeatures f ({ - ucd_util."0.1.3".default = (f.ucd_util."0.1.3".default or true); - }) []; - - -# end -# unicode-bidi-0.3.4 - - crates.unicode_bidi."0.3.4" = deps: { features?(features_.unicode_bidi."0.3.4" deps {}) }: buildRustCrate { - crateName = "unicode-bidi"; - version = "0.3.4"; - authors = [ "The Servo Project Developers" ]; - sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q"; - libName = "unicode_bidi"; - dependencies = mapFeatures features ([ - (crates."matches"."${deps."unicode_bidi"."0.3.4"."matches"}" deps) - ]); - features = mkFeatures (features."unicode_bidi"."0.3.4" or {}); - }; - features_.unicode_bidi."0.3.4" = deps: f: updateFeatures f (rec { - matches."${deps.unicode_bidi."0.3.4".matches}".default = true; - unicode_bidi = fold recursiveUpdate {} [ - { "0.3.4".default = (f.unicode_bidi."0.3.4".default or true); } - { "0.3.4".flame = - (f.unicode_bidi."0.3.4".flame or false) || - (f.unicode_bidi."0.3.4".flame_it or false) || - (unicode_bidi."0.3.4"."flame_it" or false); } - { "0.3.4".flamer = - (f.unicode_bidi."0.3.4".flamer or false) || - (f.unicode_bidi."0.3.4".flame_it or false) || - (unicode_bidi."0.3.4"."flame_it" or false); } - { "0.3.4".serde = - (f.unicode_bidi."0.3.4".serde or false) || - (f.unicode_bidi."0.3.4".with_serde or false) || - (unicode_bidi."0.3.4"."with_serde" or false); } - ]; - }) [ - (features_.matches."${deps."unicode_bidi"."0.3.4"."matches"}" deps) - ]; - - -# end -# unicode-normalization-0.1.7 - - crates.unicode_normalization."0.1.7" = deps: { features?(features_.unicode_normalization."0.1.7" deps {}) }: buildRustCrate { - crateName = "unicode-normalization"; - version = "0.1.7"; - authors = [ "kwantam " ]; - sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs"; - }; - features_.unicode_normalization."0.1.7" = deps: f: updateFeatures f ({ - unicode_normalization."0.1.7".default = (f.unicode_normalization."0.1.7".default or true); - }) []; - - -# end -# unicode-normalization-0.1.8 - - crates.unicode_normalization."0.1.8" = deps: { features?(features_.unicode_normalization."0.1.8" deps {}) }: buildRustCrate { - crateName = "unicode-normalization"; - version = "0.1.8"; - description = "This crate provides functions for normalization of\nUnicode strings, including Canonical and Compatible\nDecomposition and Recomposition, as described in\nUnicode Standard Annex #15.\n"; - authors = [ "kwantam " ]; - sha256 = "1pb26i2xd5zz0icabyqahikpca0iwj2jd4145pczc4bb7p641dsz"; - dependencies = mapFeatures features ([ - (crates."smallvec"."${deps."unicode_normalization"."0.1.8"."smallvec"}" deps) - ]); - }; - features_.unicode_normalization."0.1.8" = deps: f: updateFeatures f ({ - smallvec."${deps.unicode_normalization."0.1.8".smallvec}".default = true; - unicode_normalization."0.1.8".default = (f.unicode_normalization."0.1.8".default or true); - }) [ - (features_.smallvec."${deps."unicode_normalization"."0.1.8"."smallvec"}" deps) - ]; - - -# end -# unicode-width-0.1.5 - - crates.unicode_width."0.1.5" = deps: { features?(features_.unicode_width."0.1.5" deps {}) }: buildRustCrate { - crateName = "unicode-width"; - version = "0.1.5"; - authors = [ "kwantam " ]; - sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w"; - features = mkFeatures (features."unicode_width"."0.1.5" or {}); - }; - features_.unicode_width."0.1.5" = deps: f: updateFeatures f ({ - unicode_width."0.1.5".default = (f.unicode_width."0.1.5".default or true); - }) []; - - -# end -# unicode-xid-0.1.0 - - crates.unicode_xid."0.1.0" = deps: { features?(features_.unicode_xid."0.1.0" deps {}) }: buildRustCrate { - crateName = "unicode-xid"; - version = "0.1.0"; - authors = [ "erick.tryzelaar " "kwantam " ]; - sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj"; - features = mkFeatures (features."unicode_xid"."0.1.0" or {}); - }; - features_.unicode_xid."0.1.0" = deps: f: updateFeatures f ({ - unicode_xid."0.1.0".default = (f.unicode_xid."0.1.0".default or true); - }) []; - - -# end -# url-1.7.2 - - crates.url."1.7.2" = deps: { features?(features_.url."1.7.2" deps {}) }: buildRustCrate { - crateName = "url"; - version = "1.7.2"; - authors = [ "The rust-url developers" ]; - sha256 = "0qzrjzd9r1niv7037x4cgnv98fs1vj0k18lpxx890ipc47x5gc09"; - dependencies = mapFeatures features ([ - (crates."idna"."${deps."url"."1.7.2"."idna"}" deps) - (crates."matches"."${deps."url"."1.7.2"."matches"}" deps) - (crates."percent_encoding"."${deps."url"."1.7.2"."percent_encoding"}" deps) - ]); - features = mkFeatures (features."url"."1.7.2" or {}); - }; - features_.url."1.7.2" = deps: f: updateFeatures f (rec { - idna."${deps.url."1.7.2".idna}".default = true; - matches."${deps.url."1.7.2".matches}".default = true; - percent_encoding."${deps.url."1.7.2".percent_encoding}".default = true; - url = fold recursiveUpdate {} [ - { "1.7.2".default = (f.url."1.7.2".default or true); } - { "1.7.2".encoding = - (f.url."1.7.2".encoding or false) || - (f.url."1.7.2".query_encoding or false) || - (url."1.7.2"."query_encoding" or false); } - { "1.7.2".heapsize = - (f.url."1.7.2".heapsize or false) || - (f.url."1.7.2".heap_size or false) || - (url."1.7.2"."heap_size" or false); } - ]; - }) [ - (features_.idna."${deps."url"."1.7.2"."idna"}" deps) - (features_.matches."${deps."url"."1.7.2"."matches"}" deps) - (features_.percent_encoding."${deps."url"."1.7.2"."percent_encoding"}" deps) - ]; - - -# end -# utf8-ranges-1.0.1 - - crates.utf8_ranges."1.0.1" = deps: { features?(features_.utf8_ranges."1.0.1" deps {}) }: buildRustCrate { - crateName = "utf8-ranges"; - version = "1.0.1"; - authors = [ "Andrew Gallant " ]; - sha256 = "1s56ihd2c8ba6191078wivvv59247szaiszrh8x2rxqfsxlfrnpp"; - }; - features_.utf8_ranges."1.0.1" = deps: f: updateFeatures f ({ - utf8_ranges."1.0.1".default = (f.utf8_ranges."1.0.1".default or true); - }) []; - - -# end -# utf8-ranges-1.0.2 - - crates.utf8_ranges."1.0.2" = deps: { features?(features_.utf8_ranges."1.0.2" deps {}) }: buildRustCrate { - crateName = "utf8-ranges"; - version = "1.0.2"; - description = "Convert ranges of Unicode codepoints to UTF-8 byte ranges."; - authors = [ "Andrew Gallant " ]; - sha256 = "1my02laqsgnd8ib4dvjgd4rilprqjad6pb9jj9vi67csi5qs2281"; - }; - features_.utf8_ranges."1.0.2" = deps: f: updateFeatures f ({ - utf8_ranges."1.0.2".default = (f.utf8_ranges."1.0.2".default or true); - }) []; - - -# end -# vec_map-0.8.1 - - crates.vec_map."0.8.1" = deps: { features?(features_.vec_map."0.8.1" deps {}) }: buildRustCrate { - crateName = "vec_map"; - version = "0.8.1"; - authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; - sha256 = "1jj2nrg8h3l53d43rwkpkikq5a5x15ms4rf1rw92hp5lrqhi8mpi"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."vec_map"."0.8.1" or {}); - }; - features_.vec_map."0.8.1" = deps: f: updateFeatures f (rec { - vec_map = fold recursiveUpdate {} [ - { "0.8.1".default = (f.vec_map."0.8.1".default or true); } - { "0.8.1".serde = - (f.vec_map."0.8.1".serde or false) || - (f.vec_map."0.8.1".eders or false) || - (vec_map."0.8.1"."eders" or false); } - ]; - }) []; - - -# end -# version_check-0.1.5 - - crates.version_check."0.1.5" = deps: { features?(features_.version_check."0.1.5" deps {}) }: buildRustCrate { - crateName = "version_check"; - version = "0.1.5"; - authors = [ "Sergio Benitez " ]; - sha256 = "1yrx9xblmwbafw2firxyqbj8f771kkzfd24n3q7xgwiqyhi0y8qd"; - }; - features_.version_check."0.1.5" = deps: f: updateFeatures f ({ - version_check."0.1.5".default = (f.version_check."0.1.5".default or true); - }) []; - - -# end -# winapi-0.3.6 - - crates.winapi."0.3.6" = deps: { features?(features_.winapi."0.3.6" deps {}) }: buildRustCrate { - crateName = "winapi"; - version = "0.3.6"; - authors = [ "Peter Atashian " ]; - sha256 = "1d9jfp4cjd82sr1q4dgdlrkvm33zhhav9d7ihr0nivqbncr059m4"; - build = "build.rs"; - dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ - (crates."winapi_i686_pc_windows_gnu"."${deps."winapi"."0.3.6"."winapi_i686_pc_windows_gnu"}" deps) - ]) else []) - ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ - (crates."winapi_x86_64_pc_windows_gnu"."${deps."winapi"."0.3.6"."winapi_x86_64_pc_windows_gnu"}" deps) - ]) else []); - features = mkFeatures (features."winapi"."0.3.6" or {}); - }; - features_.winapi."0.3.6" = deps: f: updateFeatures f ({ - winapi."0.3.6".default = (f.winapi."0.3.6".default or true); - winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true; - winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true; - }) [ - (features_.winapi_i686_pc_windows_gnu."${deps."winapi"."0.3.6"."winapi_i686_pc_windows_gnu"}" deps) - (features_.winapi_x86_64_pc_windows_gnu."${deps."winapi"."0.3.6"."winapi_x86_64_pc_windows_gnu"}" deps) - ]; - - -# end -# winapi-i686-pc-windows-gnu-0.4.0 - - crates.winapi_i686_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_i686_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate { - crateName = "winapi-i686-pc-windows-gnu"; - version = "0.4.0"; - authors = [ "Peter Atashian " ]; - sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; - build = "build.rs"; - }; - features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({ - winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true); - }) []; - - -# end -# winapi-util-0.1.1 - - crates.winapi_util."0.1.1" = deps: { features?(features_.winapi_util."0.1.1" deps {}) }: buildRustCrate { - crateName = "winapi-util"; - version = "0.1.1"; - authors = [ "Andrew Gallant " ]; - sha256 = "10madanla73aagbklx6y73r2g2vwq9w8a0qcghbbbpn9vfr6a95f"; - dependencies = (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."winapi_util"."0.1.1"."winapi"}" deps) - ]) else []); - }; - features_.winapi_util."0.1.1" = deps: f: updateFeatures f ({ - winapi = fold recursiveUpdate {} [ - { "${deps.winapi_util."0.1.1".winapi}"."consoleapi" = true; } - { "${deps.winapi_util."0.1.1".winapi}"."errhandlingapi" = true; } - { "${deps.winapi_util."0.1.1".winapi}"."fileapi" = true; } - { "${deps.winapi_util."0.1.1".winapi}"."minwindef" = true; } - { "${deps.winapi_util."0.1.1".winapi}"."processenv" = true; } - { "${deps.winapi_util."0.1.1".winapi}"."std" = true; } - { "${deps.winapi_util."0.1.1".winapi}"."winbase" = true; } - { "${deps.winapi_util."0.1.1".winapi}"."wincon" = true; } - { "${deps.winapi_util."0.1.1".winapi}"."winerror" = true; } - { "${deps.winapi_util."0.1.1".winapi}".default = true; } - ]; - winapi_util."0.1.1".default = (f.winapi_util."0.1.1".default or true); - }) [ - (features_.winapi."${deps."winapi_util"."0.1.1"."winapi"}" deps) - ]; - - -# end -# winapi-util-0.1.2 - - crates.winapi_util."0.1.2" = deps: { features?(features_.winapi_util."0.1.2" deps {}) }: buildRustCrate { - crateName = "winapi-util"; - version = "0.1.2"; - description = "A dumping ground for high level safe wrappers over winapi."; - authors = [ "Andrew Gallant " ]; - sha256 = "07jj7rg7nndd7bqhjin1xphbv8kb5clvhzpqpxkvm3wl84r3mj1h"; - dependencies = (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."winapi_util"."0.1.2"."winapi"}" deps) - ]) else []); - }; - features_.winapi_util."0.1.2" = deps: f: updateFeatures f ({ - winapi = fold recursiveUpdate {} [ - { "${deps.winapi_util."0.1.2".winapi}"."consoleapi" = true; } - { "${deps.winapi_util."0.1.2".winapi}"."errhandlingapi" = true; } - { "${deps.winapi_util."0.1.2".winapi}"."fileapi" = true; } - { "${deps.winapi_util."0.1.2".winapi}"."minwindef" = true; } - { "${deps.winapi_util."0.1.2".winapi}"."processenv" = true; } - { "${deps.winapi_util."0.1.2".winapi}"."std" = true; } - { "${deps.winapi_util."0.1.2".winapi}"."winbase" = true; } - { "${deps.winapi_util."0.1.2".winapi}"."wincon" = true; } - { "${deps.winapi_util."0.1.2".winapi}"."winerror" = true; } - { "${deps.winapi_util."0.1.2".winapi}"."winnt" = true; } - { "${deps.winapi_util."0.1.2".winapi}".default = true; } - ]; - winapi_util."0.1.2".default = (f.winapi_util."0.1.2".default or true); - }) [ - (features_.winapi."${deps."winapi_util"."0.1.2"."winapi"}" deps) - ]; - - -# end -# winapi-x86_64-pc-windows-gnu-0.4.0 - - crates.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_x86_64_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate { - crateName = "winapi-x86_64-pc-windows-gnu"; - version = "0.4.0"; - authors = [ "Peter Atashian " ]; - sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; - build = "build.rs"; - }; - features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({ - winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true); - }) []; - - -# end -# wincolor-1.0.1 - - crates.wincolor."1.0.1" = deps: { features?(features_.wincolor."1.0.1" deps {}) }: buildRustCrate { - crateName = "wincolor"; - version = "1.0.1"; - authors = [ "Andrew Gallant " ]; - sha256 = "0gr7v4krmjba7yq16071rfacz42qbapas7mxk5nphjwb042a8gvz"; - dependencies = mapFeatures features ([ - (crates."winapi"."${deps."wincolor"."1.0.1"."winapi"}" deps) - (crates."winapi_util"."${deps."wincolor"."1.0.1"."winapi_util"}" deps) - ]); - }; - features_.wincolor."1.0.1" = deps: f: updateFeatures f ({ - winapi = fold recursiveUpdate {} [ - { "${deps.wincolor."1.0.1".winapi}"."minwindef" = true; } - { "${deps.wincolor."1.0.1".winapi}"."wincon" = true; } - { "${deps.wincolor."1.0.1".winapi}".default = true; } - ]; - winapi_util."${deps.wincolor."1.0.1".winapi_util}".default = true; - wincolor."1.0.1".default = (f.wincolor."1.0.1".default or true); - }) [ - (features_.winapi."${deps."wincolor"."1.0.1"."winapi"}" deps) - (features_.winapi_util."${deps."wincolor"."1.0.1"."winapi_util"}" deps) - ]; - - -# end -# aho-corasick-0.7.3 - - crates.aho_corasick."0.7.3" = deps: { features?(features_.aho_corasick."0.7.3" deps {}) }: buildRustCrate { - crateName = "aho-corasick"; - version = "0.7.3"; - description = "Fast multiple substring searching."; - authors = [ "Andrew Gallant " ]; - sha256 = "0dn42fbdms4brigqphxrvzbjd1s4knyjlzky30kgvpnrcl4sqqdv"; - libName = "aho_corasick"; - dependencies = mapFeatures features ([ - (crates."memchr"."${deps."aho_corasick"."0.7.3"."memchr"}" deps) - ]); - features = mkFeatures (features."aho_corasick"."0.7.3" or {}); - }; - features_.aho_corasick."0.7.3" = deps: f: updateFeatures f (rec { - aho_corasick = fold recursiveUpdate {} [ - { "0.7.3"."std" = - (f.aho_corasick."0.7.3"."std" or false) || - (f.aho_corasick."0.7.3".default or false) || - (aho_corasick."0.7.3"."default" or false); } - { "0.7.3".default = (f.aho_corasick."0.7.3".default or true); } - ]; - memchr = fold recursiveUpdate {} [ - { "${deps.aho_corasick."0.7.3".memchr}"."use_std" = - (f.memchr."${deps.aho_corasick."0.7.3".memchr}"."use_std" or false) || - (aho_corasick."0.7.3"."std" or false) || - (f."aho_corasick"."0.7.3"."std" or false); } - { "${deps.aho_corasick."0.7.3".memchr}".default = (f.memchr."${deps.aho_corasick."0.7.3".memchr}".default or false); } - ]; - }) [ - (features_.memchr."${deps."aho_corasick"."0.7.3"."memchr"}" deps) - ]; - - -# end -# backtrace-0.3.15 - - crates.backtrace."0.3.15" = deps: { features?(features_.backtrace."0.3.15" deps {}) }: buildRustCrate { - crateName = "backtrace"; - version = "0.3.15"; - description = "A library to acquire a stack trace (backtrace) at runtime in a Rust program.\n"; - authors = [ "Alex Crichton " "The Rust Project Developers" ]; - sha256 = "0qgbc07aq9kfixv29s60xx666lmdpgmf27a78fwjlhnfzhqvkn0p"; - dependencies = mapFeatures features ([ - (crates."cfg_if"."${deps."backtrace"."0.3.15"."cfg_if"}" deps) - (crates."rustc_demangle"."${deps."backtrace"."0.3.15"."rustc_demangle"}" deps) - ]) - ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ - ] - ++ (if features.backtrace."0.3.15".backtrace-sys or false then [ (crates.backtrace_sys."${deps."backtrace"."0.3.15".backtrace_sys}" deps) ] else [])) else []) - ++ (if (kernel == "linux" || kernel == "darwin") || abi == "sgx" then mapFeatures features ([ - (crates."libc"."${deps."backtrace"."0.3.15"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."backtrace"."0.3.15"."winapi"}" deps) - ]) else []); - - buildDependencies = mapFeatures features ([ - (crates."autocfg"."${deps."backtrace"."0.3.15"."autocfg"}" deps) - ]); - features = mkFeatures (features."backtrace"."0.3.15" or {}); - }; - features_.backtrace."0.3.15" = deps: f: updateFeatures f (rec { - autocfg."${deps.backtrace."0.3.15".autocfg}".default = true; - backtrace = fold recursiveUpdate {} [ - { "0.3.15"."addr2line" = - (f.backtrace."0.3.15"."addr2line" or false) || - (f.backtrace."0.3.15".gimli-symbolize or false) || - (backtrace."0.3.15"."gimli-symbolize" or false); } - { "0.3.15"."backtrace-sys" = - (f.backtrace."0.3.15"."backtrace-sys" or false) || - (f.backtrace."0.3.15".libbacktrace or false) || - (backtrace."0.3.15"."libbacktrace" or false); } - { "0.3.15"."coresymbolication" = - (f.backtrace."0.3.15"."coresymbolication" or false) || - (f.backtrace."0.3.15".default or false) || - (backtrace."0.3.15"."default" or false); } - { "0.3.15"."dbghelp" = - (f.backtrace."0.3.15"."dbghelp" or false) || - (f.backtrace."0.3.15".default or false) || - (backtrace."0.3.15"."default" or false); } - { "0.3.15"."dladdr" = - (f.backtrace."0.3.15"."dladdr" or false) || - (f.backtrace."0.3.15".default or false) || - (backtrace."0.3.15"."default" or false); } - { "0.3.15"."findshlibs" = - (f.backtrace."0.3.15"."findshlibs" or false) || - (f.backtrace."0.3.15".gimli-symbolize or false) || - (backtrace."0.3.15"."gimli-symbolize" or false); } - { "0.3.15"."gimli" = - (f.backtrace."0.3.15"."gimli" or false) || - (f.backtrace."0.3.15".gimli-symbolize or false) || - (backtrace."0.3.15"."gimli-symbolize" or false); } - { "0.3.15"."libbacktrace" = - (f.backtrace."0.3.15"."libbacktrace" or false) || - (f.backtrace."0.3.15".default or false) || - (backtrace."0.3.15"."default" or false); } - { "0.3.15"."libunwind" = - (f.backtrace."0.3.15"."libunwind" or false) || - (f.backtrace."0.3.15".default or false) || - (backtrace."0.3.15"."default" or false); } - { "0.3.15"."memmap" = - (f.backtrace."0.3.15"."memmap" or false) || - (f.backtrace."0.3.15".gimli-symbolize or false) || - (backtrace."0.3.15"."gimli-symbolize" or false); } - { "0.3.15"."object" = - (f.backtrace."0.3.15"."object" or false) || - (f.backtrace."0.3.15".gimli-symbolize or false) || - (backtrace."0.3.15"."gimli-symbolize" or false); } - { "0.3.15"."rustc-serialize" = - (f.backtrace."0.3.15"."rustc-serialize" or false) || - (f.backtrace."0.3.15".serialize-rustc or false) || - (backtrace."0.3.15"."serialize-rustc" or false); } - { "0.3.15"."serde" = - (f.backtrace."0.3.15"."serde" or false) || - (f.backtrace."0.3.15".serialize-serde or false) || - (backtrace."0.3.15"."serialize-serde" or false); } - { "0.3.15"."serde_derive" = - (f.backtrace."0.3.15"."serde_derive" or false) || - (f.backtrace."0.3.15".serialize-serde or false) || - (backtrace."0.3.15"."serialize-serde" or false); } - { "0.3.15"."std" = - (f.backtrace."0.3.15"."std" or false) || - (f.backtrace."0.3.15".default or false) || - (backtrace."0.3.15"."default" or false) || - (f.backtrace."0.3.15".libbacktrace or false) || - (backtrace."0.3.15"."libbacktrace" or false); } - { "0.3.15".default = (f.backtrace."0.3.15".default or true); } - ]; - backtrace_sys."${deps.backtrace."0.3.15".backtrace_sys}".default = true; - cfg_if."${deps.backtrace."0.3.15".cfg_if}".default = true; - libc."${deps.backtrace."0.3.15".libc}".default = (f.libc."${deps.backtrace."0.3.15".libc}".default or false); - rustc_demangle."${deps.backtrace."0.3.15".rustc_demangle}".default = true; - winapi = fold recursiveUpdate {} [ - { "${deps.backtrace."0.3.15".winapi}"."dbghelp" = true; } - { "${deps.backtrace."0.3.15".winapi}"."minwindef" = true; } - { "${deps.backtrace."0.3.15".winapi}"."processthreadsapi" = true; } - { "${deps.backtrace."0.3.15".winapi}"."winnt" = true; } - { "${deps.backtrace."0.3.15".winapi}".default = true; } - ]; - }) [ - (features_.cfg_if."${deps."backtrace"."0.3.15"."cfg_if"}" deps) - (features_.rustc_demangle."${deps."backtrace"."0.3.15"."rustc_demangle"}" deps) - (features_.autocfg."${deps."backtrace"."0.3.15"."autocfg"}" deps) - (features_.backtrace_sys."${deps."backtrace"."0.3.15"."backtrace_sys"}" deps) - (features_.libc."${deps."backtrace"."0.3.15"."libc"}" deps) - (features_.winapi."${deps."backtrace"."0.3.15"."winapi"}" deps) - ]; - - -# end -# bstr-0.1.2 - - crates.bstr."0.1.2" = deps: { features?(features_.bstr."0.1.2" deps {}) }: buildRustCrate { - crateName = "bstr"; - version = "0.1.2"; - description = "A string type that is not required to be valid UTF-8."; - authors = [ "Andrew Gallant " ]; - sha256 = "1m30sssr8qghgf5fg17vvlrcr5mbbnv8fixzzfvzk3nan4bxyckf"; - dependencies = mapFeatures features ([ - (crates."memchr"."${deps."bstr"."0.1.2"."memchr"}" deps) - ]); - features = mkFeatures (features."bstr"."0.1.2" or {}); - }; - features_.bstr."0.1.2" = deps: f: updateFeatures f (rec { - bstr = fold recursiveUpdate {} [ - { "0.1.2"."lazy_static" = - (f.bstr."0.1.2"."lazy_static" or false) || - (f.bstr."0.1.2".unicode or false) || - (bstr."0.1.2"."unicode" or false); } - { "0.1.2"."regex-automata" = - (f.bstr."0.1.2"."regex-automata" or false) || - (f.bstr."0.1.2".unicode or false) || - (bstr."0.1.2"."unicode" or false); } - { "0.1.2"."serde" = - (f.bstr."0.1.2"."serde" or false) || - (f.bstr."0.1.2".serde1-nostd or false) || - (bstr."0.1.2"."serde1-nostd" or false); } - { "0.1.2"."serde1-nostd" = - (f.bstr."0.1.2"."serde1-nostd" or false) || - (f.bstr."0.1.2".serde1 or false) || - (bstr."0.1.2"."serde1" or false); } - { "0.1.2"."std" = - (f.bstr."0.1.2"."std" or false) || - (f.bstr."0.1.2".default or false) || - (bstr."0.1.2"."default" or false) || - (f.bstr."0.1.2".serde1 or false) || - (bstr."0.1.2"."serde1" or false); } - { "0.1.2"."unicode" = - (f.bstr."0.1.2"."unicode" or false) || - (f.bstr."0.1.2".default or false) || - (bstr."0.1.2"."default" or false); } - { "0.1.2".default = (f.bstr."0.1.2".default or true); } - ]; - memchr = fold recursiveUpdate {} [ - { "${deps.bstr."0.1.2".memchr}"."use_std" = - (f.memchr."${deps.bstr."0.1.2".memchr}"."use_std" or false) || - (bstr."0.1.2"."std" or false) || - (f."bstr"."0.1.2"."std" or false); } - { "${deps.bstr."0.1.2".memchr}".default = (f.memchr."${deps.bstr."0.1.2".memchr}".default or false); } - ]; - }) [ - (features_.memchr."${deps."bstr"."0.1.2"."memchr"}" deps) - ]; - - -# end -# build_const-0.2.1 - - crates.build_const."0.2.1" = deps: { features?(features_.build_const."0.2.1" deps {}) }: buildRustCrate { - crateName = "build_const"; - version = "0.2.1"; - description = "library for creating importable constants from build.rs or a script"; - authors = [ "Garrett Berg " ]; - sha256 = "15249xzi3qlm72p4glxgavwyq70fx2sp4df6ii0sdlrixrrp77pl"; - features = mkFeatures (features."build_const"."0.2.1" or {}); - }; - features_.build_const."0.2.1" = deps: f: updateFeatures f (rec { - build_const = fold recursiveUpdate {} [ - { "0.2.1"."std" = - (f.build_const."0.2.1"."std" or false) || - (f.build_const."0.2.1".default or false) || - (build_const."0.2.1"."default" or false); } - { "0.2.1".default = (f.build_const."0.2.1".default or true); } - ]; - }) []; - - -# end -# byteorder-1.3.1 - - crates.byteorder."1.3.1" = deps: { features?(features_.byteorder."1.3.1" deps {}) }: buildRustCrate { - crateName = "byteorder"; - version = "1.3.1"; - description = "Library for reading/writing numbers in big-endian and little-endian."; - authors = [ "Andrew Gallant " ]; - sha256 = "1dd46l7fvmxfq90kh6ip1ghsxzzcdybac8f0mh2jivsdv9vy8k4w"; - build = "build.rs"; - features = mkFeatures (features."byteorder"."1.3.1" or {}); - }; - features_.byteorder."1.3.1" = deps: f: updateFeatures f (rec { - byteorder = fold recursiveUpdate {} [ - { "1.3.1"."std" = - (f.byteorder."1.3.1"."std" or false) || - (f.byteorder."1.3.1".default or false) || - (byteorder."1.3.1"."default" or false); } - { "1.3.1".default = (f.byteorder."1.3.1".default or true); } - ]; - }) []; - - -# end -# bytes-0.4.12 - - crates.bytes."0.4.12" = deps: { features?(features_.bytes."0.4.12" deps {}) }: buildRustCrate { - crateName = "bytes"; - version = "0.4.12"; - description = "Types and traits for working with bytes"; - authors = [ "Carl Lerche " ]; - sha256 = "0cw577vll9qp0h3l1sy24anr5mcnd5j26q9q7nw4f0mddssvfphf"; - dependencies = mapFeatures features ([ - (crates."byteorder"."${deps."bytes"."0.4.12"."byteorder"}" deps) - (crates."iovec"."${deps."bytes"."0.4.12"."iovec"}" deps) - ]); - features = mkFeatures (features."bytes"."0.4.12" or {}); - }; - features_.bytes."0.4.12" = deps: f: updateFeatures f (rec { - byteorder = fold recursiveUpdate {} [ - { "${deps.bytes."0.4.12".byteorder}"."i128" = - (f.byteorder."${deps.bytes."0.4.12".byteorder}"."i128" or false) || - (bytes."0.4.12"."i128" or false) || - (f."bytes"."0.4.12"."i128" or false); } - { "${deps.bytes."0.4.12".byteorder}".default = true; } - ]; - bytes."0.4.12".default = (f.bytes."0.4.12".default or true); - iovec."${deps.bytes."0.4.12".iovec}".default = true; - }) [ - (features_.byteorder."${deps."bytes"."0.4.12"."byteorder"}" deps) - (features_.iovec."${deps."bytes"."0.4.12"."iovec"}" deps) - ]; - - -# end -# bytesize-1.0.0 - - crates.bytesize."1.0.0" = deps: { features?(features_.bytesize."1.0.0" deps {}) }: buildRustCrate { - crateName = "bytesize"; - version = "1.0.0"; - description = "an utility for human-readable bytes representations"; - authors = [ "Hyunsik Choi " ]; - sha256 = "04j5hibh1sskjbifrm5d10vmd1fycfgm10cdfa9hpyir7lbkhbg9"; - dependencies = mapFeatures features ([ -]); - }; - features_.bytesize."1.0.0" = deps: f: updateFeatures f ({ - bytesize."1.0.0".default = (f.bytesize."1.0.0".default or true); - }) []; - - -# end -# cargo-0.35.0 - - crates.cargo."0.35.0" = deps: { features?(features_.cargo."0.35.0" deps {}) }: buildRustCrate { - crateName = "cargo"; - version = "0.35.0"; - description = "Cargo, a package manager for Rust.\n"; - authors = [ "Yehuda Katz " "Carl Lerche " "Alex Crichton " ]; - edition = "2018"; - sha256 = "17nqb1cr70igaaahk1lr859jaa57p05i1q4smqhqpq1jswwpdsnn"; - libPath = "src/cargo/lib.rs"; - crateBin = - [{ name = "cargo"; }]; - dependencies = mapFeatures features ([ - (crates."atty"."${deps."cargo"."0.35.0"."atty"}" deps) - (crates."byteorder"."${deps."cargo"."0.35.0"."byteorder"}" deps) - (crates."bytesize"."${deps."cargo"."0.35.0"."bytesize"}" deps) - (crates."clap"."${deps."cargo"."0.35.0"."clap"}" deps) - (crates."crates_io"."${deps."cargo"."0.35.0"."crates_io"}" deps) - (crates."crossbeam_utils"."${deps."cargo"."0.35.0"."crossbeam_utils"}" deps) - (crates."crypto_hash"."${deps."cargo"."0.35.0"."crypto_hash"}" deps) - (crates."curl"."${deps."cargo"."0.35.0"."curl"}" deps) - (crates."curl_sys"."${deps."cargo"."0.35.0"."curl_sys"}" deps) - (crates."env_logger"."${deps."cargo"."0.35.0"."env_logger"}" deps) - (crates."failure"."${deps."cargo"."0.35.0"."failure"}" deps) - (crates."filetime"."${deps."cargo"."0.35.0"."filetime"}" deps) - (crates."flate2"."${deps."cargo"."0.35.0"."flate2"}" deps) - (crates."fs2"."${deps."cargo"."0.35.0"."fs2"}" deps) - (crates."git2"."${deps."cargo"."0.35.0"."git2"}" deps) - (crates."git2_curl"."${deps."cargo"."0.35.0"."git2_curl"}" deps) - (crates."glob"."${deps."cargo"."0.35.0"."glob"}" deps) - (crates."hex"."${deps."cargo"."0.35.0"."hex"}" deps) - (crates."home"."${deps."cargo"."0.35.0"."home"}" deps) - (crates."ignore"."${deps."cargo"."0.35.0"."ignore"}" deps) - (crates."im_rc"."${deps."cargo"."0.35.0"."im_rc"}" deps) - (crates."jobserver"."${deps."cargo"."0.35.0"."jobserver"}" deps) - (crates."lazy_static"."${deps."cargo"."0.35.0"."lazy_static"}" deps) - (crates."lazycell"."${deps."cargo"."0.35.0"."lazycell"}" deps) - (crates."libc"."${deps."cargo"."0.35.0"."libc"}" deps) - (crates."libgit2_sys"."${deps."cargo"."0.35.0"."libgit2_sys"}" deps) - (crates."log"."${deps."cargo"."0.35.0"."log"}" deps) - (crates."num_cpus"."${deps."cargo"."0.35.0"."num_cpus"}" deps) - (crates."opener"."${deps."cargo"."0.35.0"."opener"}" deps) - (crates."rustc_workspace_hack"."${deps."cargo"."0.35.0"."rustc_workspace_hack"}" deps) - (crates."rustfix"."${deps."cargo"."0.35.0"."rustfix"}" deps) - (crates."same_file"."${deps."cargo"."0.35.0"."same_file"}" deps) - (crates."semver"."${deps."cargo"."0.35.0"."semver"}" deps) - (crates."serde"."${deps."cargo"."0.35.0"."serde"}" deps) - (crates."serde_ignored"."${deps."cargo"."0.35.0"."serde_ignored"}" deps) - (crates."serde_json"."${deps."cargo"."0.35.0"."serde_json"}" deps) - (crates."shell_escape"."${deps."cargo"."0.35.0"."shell_escape"}" deps) - (crates."tar"."${deps."cargo"."0.35.0"."tar"}" deps) - (crates."tempfile"."${deps."cargo"."0.35.0"."tempfile"}" deps) - (crates."termcolor"."${deps."cargo"."0.35.0"."termcolor"}" deps) - (crates."toml"."${deps."cargo"."0.35.0"."toml"}" deps) - (crates."unicode_width"."${deps."cargo"."0.35.0"."unicode_width"}" deps) - (crates."url"."${deps."cargo"."0.35.0"."url"}" deps) - (crates."url_serde"."${deps."cargo"."0.35.0"."url_serde"}" deps) - ]) - ++ (if kernel == "darwin" then mapFeatures features ([ - (crates."core_foundation"."${deps."cargo"."0.35.0"."core_foundation"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."fwdansi"."${deps."cargo"."0.35.0"."fwdansi"}" deps) - (crates."miow"."${deps."cargo"."0.35.0"."miow"}" deps) - (crates."winapi"."${deps."cargo"."0.35.0"."winapi"}" deps) - ]) else []); - features = mkFeatures (features."cargo"."0.35.0" or {}); - }; - features_.cargo."0.35.0" = deps: f: updateFeatures f (rec { - atty."${deps.cargo."0.35.0".atty}".default = true; - byteorder."${deps.cargo."0.35.0".byteorder}".default = true; - bytesize."${deps.cargo."0.35.0".bytesize}".default = true; - cargo = fold recursiveUpdate {} [ - { "0.35.0"."pretty_env_logger" = - (f.cargo."0.35.0"."pretty_env_logger" or false) || - (f.cargo."0.35.0".pretty-env-logger or false) || - (cargo."0.35.0"."pretty-env-logger" or false); } - { "0.35.0".default = (f.cargo."0.35.0".default or true); } - ]; - clap."${deps.cargo."0.35.0".clap}".default = true; - core_foundation = fold recursiveUpdate {} [ - { "${deps.cargo."0.35.0".core_foundation}"."mac_os_10_7_support" = true; } - { "${deps.cargo."0.35.0".core_foundation}".default = true; } - ]; - crates_io."${deps.cargo."0.35.0".crates_io}".default = true; - crossbeam_utils."${deps.cargo."0.35.0".crossbeam_utils}".default = true; - crypto_hash."${deps.cargo."0.35.0".crypto_hash}".default = true; - curl = fold recursiveUpdate {} [ - { "${deps.cargo."0.35.0".curl}"."http2" = true; } - { "${deps.cargo."0.35.0".curl}".default = true; } - ]; - curl_sys."${deps.cargo."0.35.0".curl_sys}".default = true; - env_logger."${deps.cargo."0.35.0".env_logger}".default = true; - failure."${deps.cargo."0.35.0".failure}".default = true; - filetime."${deps.cargo."0.35.0".filetime}".default = true; - flate2 = fold recursiveUpdate {} [ - { "${deps.cargo."0.35.0".flate2}"."zlib" = true; } - { "${deps.cargo."0.35.0".flate2}".default = true; } - ]; - fs2."${deps.cargo."0.35.0".fs2}".default = true; - fwdansi."${deps.cargo."0.35.0".fwdansi}".default = true; - git2."${deps.cargo."0.35.0".git2}".default = true; - git2_curl."${deps.cargo."0.35.0".git2_curl}".default = true; - glob."${deps.cargo."0.35.0".glob}".default = true; - hex."${deps.cargo."0.35.0".hex}".default = true; - home."${deps.cargo."0.35.0".home}".default = true; - ignore."${deps.cargo."0.35.0".ignore}".default = true; - im_rc."${deps.cargo."0.35.0".im_rc}".default = true; - jobserver."${deps.cargo."0.35.0".jobserver}".default = true; - lazy_static."${deps.cargo."0.35.0".lazy_static}".default = true; - lazycell."${deps.cargo."0.35.0".lazycell}".default = true; - libc."${deps.cargo."0.35.0".libc}".default = true; - libgit2_sys."${deps.cargo."0.35.0".libgit2_sys}".default = true; - log."${deps.cargo."0.35.0".log}".default = true; - miow."${deps.cargo."0.35.0".miow}".default = true; - num_cpus."${deps.cargo."0.35.0".num_cpus}".default = true; - opener."${deps.cargo."0.35.0".opener}".default = true; - rustc_workspace_hack."${deps.cargo."0.35.0".rustc_workspace_hack}".default = true; - rustfix."${deps.cargo."0.35.0".rustfix}".default = true; - same_file."${deps.cargo."0.35.0".same_file}".default = true; - semver = fold recursiveUpdate {} [ - { "${deps.cargo."0.35.0".semver}"."serde" = true; } - { "${deps.cargo."0.35.0".semver}".default = true; } - ]; - serde = fold recursiveUpdate {} [ - { "${deps.cargo."0.35.0".serde}"."derive" = true; } - { "${deps.cargo."0.35.0".serde}".default = true; } - ]; - serde_ignored."${deps.cargo."0.35.0".serde_ignored}".default = true; - serde_json = fold recursiveUpdate {} [ - { "${deps.cargo."0.35.0".serde_json}"."raw_value" = true; } - { "${deps.cargo."0.35.0".serde_json}".default = true; } - ]; - shell_escape."${deps.cargo."0.35.0".shell_escape}".default = true; - tar."${deps.cargo."0.35.0".tar}".default = (f.tar."${deps.cargo."0.35.0".tar}".default or false); - tempfile."${deps.cargo."0.35.0".tempfile}".default = true; - termcolor."${deps.cargo."0.35.0".termcolor}".default = true; - toml."${deps.cargo."0.35.0".toml}".default = true; - unicode_width."${deps.cargo."0.35.0".unicode_width}".default = true; - url."${deps.cargo."0.35.0".url}".default = true; - url_serde."${deps.cargo."0.35.0".url_serde}".default = true; - winapi = fold recursiveUpdate {} [ - { "${deps.cargo."0.35.0".winapi}"."basetsd" = true; } - { "${deps.cargo."0.35.0".winapi}"."handleapi" = true; } - { "${deps.cargo."0.35.0".winapi}"."jobapi" = true; } - { "${deps.cargo."0.35.0".winapi}"."jobapi2" = true; } - { "${deps.cargo."0.35.0".winapi}"."memoryapi" = true; } - { "${deps.cargo."0.35.0".winapi}"."minwindef" = true; } - { "${deps.cargo."0.35.0".winapi}"."ntdef" = true; } - { "${deps.cargo."0.35.0".winapi}"."ntstatus" = true; } - { "${deps.cargo."0.35.0".winapi}"."processenv" = true; } - { "${deps.cargo."0.35.0".winapi}"."processthreadsapi" = true; } - { "${deps.cargo."0.35.0".winapi}"."psapi" = true; } - { "${deps.cargo."0.35.0".winapi}"."synchapi" = true; } - { "${deps.cargo."0.35.0".winapi}"."winbase" = true; } - { "${deps.cargo."0.35.0".winapi}"."wincon" = true; } - { "${deps.cargo."0.35.0".winapi}"."winerror" = true; } - { "${deps.cargo."0.35.0".winapi}"."winnt" = true; } - { "${deps.cargo."0.35.0".winapi}".default = true; } - ]; - }) [ - (features_.atty."${deps."cargo"."0.35.0"."atty"}" deps) - (features_.byteorder."${deps."cargo"."0.35.0"."byteorder"}" deps) - (features_.bytesize."${deps."cargo"."0.35.0"."bytesize"}" deps) - (features_.clap."${deps."cargo"."0.35.0"."clap"}" deps) - (features_.crates_io."${deps."cargo"."0.35.0"."crates_io"}" deps) - (features_.crossbeam_utils."${deps."cargo"."0.35.0"."crossbeam_utils"}" deps) - (features_.crypto_hash."${deps."cargo"."0.35.0"."crypto_hash"}" deps) - (features_.curl."${deps."cargo"."0.35.0"."curl"}" deps) - (features_.curl_sys."${deps."cargo"."0.35.0"."curl_sys"}" deps) - (features_.env_logger."${deps."cargo"."0.35.0"."env_logger"}" deps) - (features_.failure."${deps."cargo"."0.35.0"."failure"}" deps) - (features_.filetime."${deps."cargo"."0.35.0"."filetime"}" deps) - (features_.flate2."${deps."cargo"."0.35.0"."flate2"}" deps) - (features_.fs2."${deps."cargo"."0.35.0"."fs2"}" deps) - (features_.git2."${deps."cargo"."0.35.0"."git2"}" deps) - (features_.git2_curl."${deps."cargo"."0.35.0"."git2_curl"}" deps) - (features_.glob."${deps."cargo"."0.35.0"."glob"}" deps) - (features_.hex."${deps."cargo"."0.35.0"."hex"}" deps) - (features_.home."${deps."cargo"."0.35.0"."home"}" deps) - (features_.ignore."${deps."cargo"."0.35.0"."ignore"}" deps) - (features_.im_rc."${deps."cargo"."0.35.0"."im_rc"}" deps) - (features_.jobserver."${deps."cargo"."0.35.0"."jobserver"}" deps) - (features_.lazy_static."${deps."cargo"."0.35.0"."lazy_static"}" deps) - (features_.lazycell."${deps."cargo"."0.35.0"."lazycell"}" deps) - (features_.libc."${deps."cargo"."0.35.0"."libc"}" deps) - (features_.libgit2_sys."${deps."cargo"."0.35.0"."libgit2_sys"}" deps) - (features_.log."${deps."cargo"."0.35.0"."log"}" deps) - (features_.num_cpus."${deps."cargo"."0.35.0"."num_cpus"}" deps) - (features_.opener."${deps."cargo"."0.35.0"."opener"}" deps) - (features_.rustc_workspace_hack."${deps."cargo"."0.35.0"."rustc_workspace_hack"}" deps) - (features_.rustfix."${deps."cargo"."0.35.0"."rustfix"}" deps) - (features_.same_file."${deps."cargo"."0.35.0"."same_file"}" deps) - (features_.semver."${deps."cargo"."0.35.0"."semver"}" deps) - (features_.serde."${deps."cargo"."0.35.0"."serde"}" deps) - (features_.serde_ignored."${deps."cargo"."0.35.0"."serde_ignored"}" deps) - (features_.serde_json."${deps."cargo"."0.35.0"."serde_json"}" deps) - (features_.shell_escape."${deps."cargo"."0.35.0"."shell_escape"}" deps) - (features_.tar."${deps."cargo"."0.35.0"."tar"}" deps) - (features_.tempfile."${deps."cargo"."0.35.0"."tempfile"}" deps) - (features_.termcolor."${deps."cargo"."0.35.0"."termcolor"}" deps) - (features_.toml."${deps."cargo"."0.35.0"."toml"}" deps) - (features_.unicode_width."${deps."cargo"."0.35.0"."unicode_width"}" deps) - (features_.url."${deps."cargo"."0.35.0"."url"}" deps) - (features_.url_serde."${deps."cargo"."0.35.0"."url_serde"}" deps) - (features_.core_foundation."${deps."cargo"."0.35.0"."core_foundation"}" deps) - (features_.fwdansi."${deps."cargo"."0.35.0"."fwdansi"}" deps) - (features_.miow."${deps."cargo"."0.35.0"."miow"}" deps) - (features_.winapi."${deps."cargo"."0.35.0"."winapi"}" deps) - ]; - - -# end -# cc-1.0.35 - - crates.cc."1.0.35" = deps: { features?(features_.cc."1.0.35" deps {}) }: buildRustCrate { - crateName = "cc"; - version = "1.0.35"; - description = "A build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n"; - authors = [ "Alex Crichton " ]; - sha256 = "0dq3d2hgc5r14lk97ajj4mw30fibznjzrl9w745fqhwnq51jp7dj"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."cc"."1.0.35" or {}); - }; - features_.cc."1.0.35" = deps: f: updateFeatures f (rec { - cc = fold recursiveUpdate {} [ - { "1.0.35"."rayon" = - (f.cc."1.0.35"."rayon" or false) || - (f.cc."1.0.35".parallel or false) || - (cc."1.0.35"."parallel" or false); } - { "1.0.35".default = (f.cc."1.0.35".default or true); } - ]; - }) []; - - -# end -# clap-2.33.0 - - crates.clap."2.33.0" = deps: { features?(features_.clap."2.33.0" deps {}) }: buildRustCrate { - crateName = "clap"; - version = "2.33.0"; - description = "A simple to use, efficient, and full-featured Command Line Argument Parser\n"; - authors = [ "Kevin K. " ]; - sha256 = "054n9ngh6pkknpmd4acgdsp40iw6f5jzq8a4h2b76gnbvk6p5xjh"; - dependencies = mapFeatures features ([ - (crates."bitflags"."${deps."clap"."2.33.0"."bitflags"}" deps) - (crates."textwrap"."${deps."clap"."2.33.0"."textwrap"}" deps) - (crates."unicode_width"."${deps."clap"."2.33.0"."unicode_width"}" deps) - ] - ++ (if features.clap."2.33.0".atty or false then [ (crates.atty."${deps."clap"."2.33.0".atty}" deps) ] else []) - ++ (if features.clap."2.33.0".strsim or false then [ (crates.strsim."${deps."clap"."2.33.0".strsim}" deps) ] else []) - ++ (if features.clap."2.33.0".vec_map or false then [ (crates.vec_map."${deps."clap"."2.33.0".vec_map}" deps) ] else [])) - ++ (if !(kernel == "windows") then mapFeatures features ([ - ] - ++ (if features.clap."2.33.0".ansi_term or false then [ (crates.ansi_term."${deps."clap"."2.33.0".ansi_term}" deps) ] else [])) else []); - features = mkFeatures (features."clap"."2.33.0" or {}); - }; - features_.clap."2.33.0" = deps: f: updateFeatures f (rec { - ansi_term."${deps.clap."2.33.0".ansi_term}".default = true; - atty."${deps.clap."2.33.0".atty}".default = true; - bitflags."${deps.clap."2.33.0".bitflags}".default = true; - clap = fold recursiveUpdate {} [ - { "2.33.0"."ansi_term" = - (f.clap."2.33.0"."ansi_term" or false) || - (f.clap."2.33.0".color or false) || - (clap."2.33.0"."color" or false); } - { "2.33.0"."atty" = - (f.clap."2.33.0"."atty" or false) || - (f.clap."2.33.0".color or false) || - (clap."2.33.0"."color" or false); } - { "2.33.0"."clippy" = - (f.clap."2.33.0"."clippy" or false) || - (f.clap."2.33.0".lints or false) || - (clap."2.33.0"."lints" or false); } - { "2.33.0"."color" = - (f.clap."2.33.0"."color" or false) || - (f.clap."2.33.0".default or false) || - (clap."2.33.0"."default" or false); } - { "2.33.0"."strsim" = - (f.clap."2.33.0"."strsim" or false) || - (f.clap."2.33.0".suggestions or false) || - (clap."2.33.0"."suggestions" or false); } - { "2.33.0"."suggestions" = - (f.clap."2.33.0"."suggestions" or false) || - (f.clap."2.33.0".default or false) || - (clap."2.33.0"."default" or false); } - { "2.33.0"."term_size" = - (f.clap."2.33.0"."term_size" or false) || - (f.clap."2.33.0".wrap_help or false) || - (clap."2.33.0"."wrap_help" or false); } - { "2.33.0"."vec_map" = - (f.clap."2.33.0"."vec_map" or false) || - (f.clap."2.33.0".default or false) || - (clap."2.33.0"."default" or false); } - { "2.33.0"."yaml" = - (f.clap."2.33.0"."yaml" or false) || - (f.clap."2.33.0".doc or false) || - (clap."2.33.0"."doc" or false); } - { "2.33.0"."yaml-rust" = - (f.clap."2.33.0"."yaml-rust" or false) || - (f.clap."2.33.0".yaml or false) || - (clap."2.33.0"."yaml" or false); } - { "2.33.0".default = (f.clap."2.33.0".default or true); } - ]; - strsim."${deps.clap."2.33.0".strsim}".default = true; - textwrap = fold recursiveUpdate {} [ - { "${deps.clap."2.33.0".textwrap}"."term_size" = - (f.textwrap."${deps.clap."2.33.0".textwrap}"."term_size" or false) || - (clap."2.33.0"."wrap_help" or false) || - (f."clap"."2.33.0"."wrap_help" or false); } - { "${deps.clap."2.33.0".textwrap}".default = true; } - ]; - unicode_width."${deps.clap."2.33.0".unicode_width}".default = true; - vec_map."${deps.clap."2.33.0".vec_map}".default = true; - }) [ - (features_.atty."${deps."clap"."2.33.0"."atty"}" deps) - (features_.bitflags."${deps."clap"."2.33.0"."bitflags"}" deps) - (features_.strsim."${deps."clap"."2.33.0"."strsim"}" deps) - (features_.textwrap."${deps."clap"."2.33.0"."textwrap"}" deps) - (features_.unicode_width."${deps."clap"."2.33.0"."unicode_width"}" deps) - (features_.vec_map."${deps."clap"."2.33.0"."vec_map"}" deps) - (features_.ansi_term."${deps."clap"."2.33.0"."ansi_term"}" deps) - ]; - - -# end -# commoncrypto-0.2.0 - - crates.commoncrypto."0.2.0" = deps: { features?(features_.commoncrypto."0.2.0" deps {}) }: buildRustCrate { - crateName = "commoncrypto"; - version = "0.2.0"; - description = "Idiomatic Rust wrappers for Mac OS X's CommonCrypto library"; - authors = [ "Mark Lee" ]; - sha256 = "1ywgmv5ai4f6yskr3wv3j1wzfsdm9km8j8lm4x4j5ccln5362xdf"; - dependencies = mapFeatures features ([ - (crates."commoncrypto_sys"."${deps."commoncrypto"."0.2.0"."commoncrypto_sys"}" deps) - ]); - features = mkFeatures (features."commoncrypto"."0.2.0" or {}); - }; - features_.commoncrypto."0.2.0" = deps: f: updateFeatures f (rec { - commoncrypto = fold recursiveUpdate {} [ - { "0.2.0"."clippy" = - (f.commoncrypto."0.2.0"."clippy" or false) || - (f.commoncrypto."0.2.0".lint or false) || - (commoncrypto."0.2.0"."lint" or false); } - { "0.2.0".default = (f.commoncrypto."0.2.0".default or true); } - ]; - commoncrypto_sys."${deps.commoncrypto."0.2.0".commoncrypto_sys}".default = true; - }) [ - (features_.commoncrypto_sys."${deps."commoncrypto"."0.2.0"."commoncrypto_sys"}" deps) - ]; - - -# end -# commoncrypto-sys-0.2.0 - - crates.commoncrypto_sys."0.2.0" = deps: { features?(features_.commoncrypto_sys."0.2.0" deps {}) }: buildRustCrate { - crateName = "commoncrypto-sys"; - version = "0.2.0"; - description = "FFI bindings to Mac OS X's CommonCrypto library"; - authors = [ "Mark Lee" ]; - sha256 = "001i2g7xbfi48r2xjgxwrgjjjf00x9c24vfrs3g6p2q2djhwww4i"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."commoncrypto_sys"."0.2.0"."libc"}" deps) - ]); - features = mkFeatures (features."commoncrypto_sys"."0.2.0" or {}); - }; - features_.commoncrypto_sys."0.2.0" = deps: f: updateFeatures f (rec { - commoncrypto_sys = fold recursiveUpdate {} [ - { "0.2.0"."clippy" = - (f.commoncrypto_sys."0.2.0"."clippy" or false) || - (f.commoncrypto_sys."0.2.0".lint or false) || - (commoncrypto_sys."0.2.0"."lint" or false); } - { "0.2.0".default = (f.commoncrypto_sys."0.2.0".default or true); } - ]; - libc."${deps.commoncrypto_sys."0.2.0".libc}".default = true; - }) [ - (features_.libc."${deps."commoncrypto_sys"."0.2.0"."libc"}" deps) - ]; - - -# end -# core-foundation-0.6.4 - - crates.core_foundation."0.6.4" = deps: { features?(features_.core_foundation."0.6.4" deps {}) }: buildRustCrate { - crateName = "core-foundation"; - version = "0.6.4"; - description = "Bindings to Core Foundation for macOS"; - authors = [ "The Servo Project Developers" ]; - sha256 = "1kabsqxh01m6l2b1gz8wgn0d1k6fyczww9kaks0sbmsz5g78ngzx"; - dependencies = mapFeatures features ([ - (crates."core_foundation_sys"."${deps."core_foundation"."0.6.4"."core_foundation_sys"}" deps) - (crates."libc"."${deps."core_foundation"."0.6.4"."libc"}" deps) - ]); - features = mkFeatures (features."core_foundation"."0.6.4" or {}); - }; - features_.core_foundation."0.6.4" = deps: f: updateFeatures f (rec { - core_foundation = fold recursiveUpdate {} [ - { "0.6.4"."chrono" = - (f.core_foundation."0.6.4"."chrono" or false) || - (f.core_foundation."0.6.4".with-chrono or false) || - (core_foundation."0.6.4"."with-chrono" or false); } - { "0.6.4"."uuid" = - (f.core_foundation."0.6.4"."uuid" or false) || - (f.core_foundation."0.6.4".with-uuid or false) || - (core_foundation."0.6.4"."with-uuid" or false); } - { "0.6.4".default = (f.core_foundation."0.6.4".default or true); } - ]; - core_foundation_sys = fold recursiveUpdate {} [ - { "${deps.core_foundation."0.6.4".core_foundation_sys}"."mac_os_10_7_support" = - (f.core_foundation_sys."${deps.core_foundation."0.6.4".core_foundation_sys}"."mac_os_10_7_support" or false) || - (core_foundation."0.6.4"."mac_os_10_7_support" or false) || - (f."core_foundation"."0.6.4"."mac_os_10_7_support" or false); } - { "${deps.core_foundation."0.6.4".core_foundation_sys}"."mac_os_10_8_features" = - (f.core_foundation_sys."${deps.core_foundation."0.6.4".core_foundation_sys}"."mac_os_10_8_features" or false) || - (core_foundation."0.6.4"."mac_os_10_8_features" or false) || - (f."core_foundation"."0.6.4"."mac_os_10_8_features" or false); } - { "${deps.core_foundation."0.6.4".core_foundation_sys}".default = true; } - ]; - libc."${deps.core_foundation."0.6.4".libc}".default = true; - }) [ - (features_.core_foundation_sys."${deps."core_foundation"."0.6.4"."core_foundation_sys"}" deps) - (features_.libc."${deps."core_foundation"."0.6.4"."libc"}" deps) - ]; - - -# end -# core-foundation-sys-0.6.2 - - crates.core_foundation_sys."0.6.2" = deps: { features?(features_.core_foundation_sys."0.6.2" deps {}) }: buildRustCrate { - crateName = "core-foundation-sys"; - version = "0.6.2"; - description = "Bindings to Core Foundation for OS X"; - authors = [ "The Servo Project Developers" ]; - sha256 = "1n2v6wlqkmqwhl7k6y50irx51p37xb0fcm3njbman82gnyq8di2c"; - build = "build.rs"; - features = mkFeatures (features."core_foundation_sys"."0.6.2" or {}); - }; - features_.core_foundation_sys."0.6.2" = deps: f: updateFeatures f ({ - core_foundation_sys."0.6.2".default = (f.core_foundation_sys."0.6.2".default or true); - }) []; - - -# end -# crates-io-0.23.0 - - crates.crates_io."0.23.0" = deps: { features?(features_.crates_io."0.23.0" deps {}) }: buildRustCrate { - crateName = "crates-io"; - version = "0.23.0"; - description = "Helpers for interacting with crates.io\n"; - authors = [ "Alex Crichton " ]; - edition = "2018"; - sha256 = "0yf7zhlqnyci12rl9x6xrwlcp8slf8ldfn3d72ad6j2hyp2cb59y"; - libPath = "lib.rs"; - libName = "crates_io"; - dependencies = mapFeatures features ([ - (crates."curl"."${deps."crates_io"."0.23.0"."curl"}" deps) - (crates."failure"."${deps."crates_io"."0.23.0"."failure"}" deps) - (crates."http"."${deps."crates_io"."0.23.0"."http"}" deps) - (crates."serde"."${deps."crates_io"."0.23.0"."serde"}" deps) - (crates."serde_derive"."${deps."crates_io"."0.23.0"."serde_derive"}" deps) - (crates."serde_json"."${deps."crates_io"."0.23.0"."serde_json"}" deps) - (crates."url"."${deps."crates_io"."0.23.0"."url"}" deps) - ]); - }; - features_.crates_io."0.23.0" = deps: f: updateFeatures f ({ - crates_io."0.23.0".default = (f.crates_io."0.23.0".default or true); - curl."${deps.crates_io."0.23.0".curl}".default = true; - failure."${deps.crates_io."0.23.0".failure}".default = true; - http."${deps.crates_io."0.23.0".http}".default = true; - serde = fold recursiveUpdate {} [ - { "${deps.crates_io."0.23.0".serde}"."derive" = true; } - { "${deps.crates_io."0.23.0".serde}".default = true; } - ]; - serde_derive."${deps.crates_io."0.23.0".serde_derive}".default = true; - serde_json."${deps.crates_io."0.23.0".serde_json}".default = true; - url."${deps.crates_io."0.23.0".url}".default = true; - }) [ - (features_.curl."${deps."crates_io"."0.23.0"."curl"}" deps) - (features_.failure."${deps."crates_io"."0.23.0"."failure"}" deps) - (features_.http."${deps."crates_io"."0.23.0"."http"}" deps) - (features_.serde."${deps."crates_io"."0.23.0"."serde"}" deps) - (features_.serde_derive."${deps."crates_io"."0.23.0"."serde_derive"}" deps) - (features_.serde_json."${deps."crates_io"."0.23.0"."serde_json"}" deps) - (features_.url."${deps."crates_io"."0.23.0"."url"}" deps) - ]; - - -# end -# crc-1.8.1 - - crates.crc."1.8.1" = deps: { features?(features_.crc."1.8.1" deps {}) }: buildRustCrate { - crateName = "crc"; - version = "1.8.1"; - description = "Rust implementation of CRC(16, 32, 64) with support of various standards"; - authors = [ "Rui Hu " ]; - sha256 = "00m9jjqrddp3bqyanvyxv0hf6s56bx1wy51vcdcxg4n2jdhg109s"; - - buildDependencies = mapFeatures features ([ - (crates."build_const"."${deps."crc"."1.8.1"."build_const"}" deps) - ]); - features = mkFeatures (features."crc"."1.8.1" or {}); - }; - features_.crc."1.8.1" = deps: f: updateFeatures f (rec { - build_const."${deps.crc."1.8.1".build_const}".default = true; - crc = fold recursiveUpdate {} [ - { "1.8.1"."std" = - (f.crc."1.8.1"."std" or false) || - (f.crc."1.8.1".default or false) || - (crc."1.8.1"."default" or false); } - { "1.8.1".default = (f.crc."1.8.1".default or true); } - ]; - }) [ - (features_.build_const."${deps."crc"."1.8.1"."build_const"}" deps) - ]; - - -# end -# crc32fast-1.2.0 - - crates.crc32fast."1.2.0" = deps: { features?(features_.crc32fast."1.2.0" deps {}) }: buildRustCrate { - crateName = "crc32fast"; - version = "1.2.0"; - description = "Fast, SIMD-accelerated CRC32 (IEEE) checksum computation"; - authors = [ "Sam Rijs " "Alex Crichton " ]; - sha256 = "1mx88ndqln6vzg7hjhjp8b7g0qggpqggsjrlsdqrfsrbpdzffcn8"; - dependencies = mapFeatures features ([ - (crates."cfg_if"."${deps."crc32fast"."1.2.0"."cfg_if"}" deps) - ]); - features = mkFeatures (features."crc32fast"."1.2.0" or {}); - }; - features_.crc32fast."1.2.0" = deps: f: updateFeatures f (rec { - cfg_if."${deps.crc32fast."1.2.0".cfg_if}".default = true; - crc32fast = fold recursiveUpdate {} [ - { "1.2.0"."std" = - (f.crc32fast."1.2.0"."std" or false) || - (f.crc32fast."1.2.0".default or false) || - (crc32fast."1.2.0"."default" or false); } - { "1.2.0".default = (f.crc32fast."1.2.0".default or true); } - ]; - }) [ - (features_.cfg_if."${deps."crc32fast"."1.2.0"."cfg_if"}" deps) - ]; - - -# end -# crossbeam-channel-0.3.8 - - crates.crossbeam_channel."0.3.8" = deps: { features?(features_.crossbeam_channel."0.3.8" deps {}) }: buildRustCrate { - crateName = "crossbeam-channel"; - version = "0.3.8"; - description = "Multi-producer multi-consumer channels for message passing"; - authors = [ "The Crossbeam Project Developers" ]; - sha256 = "0apm8why2qsgr8ykh9x677kc9ml7qp71mvirfkdzdn4c1jyqyyzm"; - dependencies = mapFeatures features ([ - (crates."crossbeam_utils"."${deps."crossbeam_channel"."0.3.8"."crossbeam_utils"}" deps) - (crates."smallvec"."${deps."crossbeam_channel"."0.3.8"."smallvec"}" deps) - ]); - }; - features_.crossbeam_channel."0.3.8" = deps: f: updateFeatures f ({ - crossbeam_channel."0.3.8".default = (f.crossbeam_channel."0.3.8".default or true); - crossbeam_utils."${deps.crossbeam_channel."0.3.8".crossbeam_utils}".default = true; - smallvec."${deps.crossbeam_channel."0.3.8".smallvec}".default = true; - }) [ - (features_.crossbeam_utils."${deps."crossbeam_channel"."0.3.8"."crossbeam_utils"}" deps) - (features_.smallvec."${deps."crossbeam_channel"."0.3.8"."smallvec"}" deps) - ]; - - -# end -# crossbeam-utils-0.6.5 - - crates.crossbeam_utils."0.6.5" = deps: { features?(features_.crossbeam_utils."0.6.5" deps {}) }: buildRustCrate { - crateName = "crossbeam-utils"; - version = "0.6.5"; - description = "Utilities for concurrent programming"; - authors = [ "The Crossbeam Project Developers" ]; - sha256 = "1z7wgcl9d22r2x6769r5945rnwf3jqfrrmb16q7kzk292r1d4rdg"; - dependencies = mapFeatures features ([ - (crates."cfg_if"."${deps."crossbeam_utils"."0.6.5"."cfg_if"}" deps) - ] - ++ (if features.crossbeam_utils."0.6.5".lazy_static or false then [ (crates.lazy_static."${deps."crossbeam_utils"."0.6.5".lazy_static}" deps) ] else [])); - features = mkFeatures (features."crossbeam_utils"."0.6.5" or {}); - }; - features_.crossbeam_utils."0.6.5" = deps: f: updateFeatures f (rec { - cfg_if."${deps.crossbeam_utils."0.6.5".cfg_if}".default = true; - crossbeam_utils = fold recursiveUpdate {} [ - { "0.6.5"."lazy_static" = - (f.crossbeam_utils."0.6.5"."lazy_static" or false) || - (f.crossbeam_utils."0.6.5".std or false) || - (crossbeam_utils."0.6.5"."std" or false); } - { "0.6.5"."std" = - (f.crossbeam_utils."0.6.5"."std" or false) || - (f.crossbeam_utils."0.6.5".default or false) || - (crossbeam_utils."0.6.5"."default" or false); } - { "0.6.5".default = (f.crossbeam_utils."0.6.5".default or true); } - ]; - lazy_static."${deps.crossbeam_utils."0.6.5".lazy_static}".default = true; - }) [ - (features_.cfg_if."${deps."crossbeam_utils"."0.6.5"."cfg_if"}" deps) - (features_.lazy_static."${deps."crossbeam_utils"."0.6.5"."lazy_static"}" deps) - ]; - - -# end -# crypto-hash-0.3.3 - - crates.crypto_hash."0.3.3" = deps: { features?(features_.crypto_hash."0.3.3" deps {}) }: buildRustCrate { - crateName = "crypto-hash"; - version = "0.3.3"; - description = "A wrapper for OS-level cryptographic hash functions"; - authors = [ "Mark Lee" ]; - sha256 = "0ybl3q06snf0p0w5c743yipf1gyhim2z0yqczgdhclfmzgj4gxqy"; - dependencies = mapFeatures features ([ - (crates."hex"."${deps."crypto_hash"."0.3.3"."hex"}" deps) - ]) - ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([ - (crates."commoncrypto"."${deps."crypto_hash"."0.3.3"."commoncrypto"}" deps) - ]) else []) - ++ (if !(kernel == "windows" || kernel == "darwin" || kernel == "ios") then mapFeatures features ([ - (crates."openssl"."${deps."crypto_hash"."0.3.3"."openssl"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."crypto_hash"."0.3.3"."winapi"}" deps) - ]) else []); - }; - features_.crypto_hash."0.3.3" = deps: f: updateFeatures f ({ - commoncrypto."${deps.crypto_hash."0.3.3".commoncrypto}".default = true; - crypto_hash."0.3.3".default = (f.crypto_hash."0.3.3".default or true); - hex."${deps.crypto_hash."0.3.3".hex}".default = true; - openssl."${deps.crypto_hash."0.3.3".openssl}".default = true; - winapi = fold recursiveUpdate {} [ - { "${deps.crypto_hash."0.3.3".winapi}"."minwindef" = true; } - { "${deps.crypto_hash."0.3.3".winapi}"."wincrypt" = true; } - { "${deps.crypto_hash."0.3.3".winapi}".default = true; } - ]; - }) [ - (features_.hex."${deps."crypto_hash"."0.3.3"."hex"}" deps) - (features_.commoncrypto."${deps."crypto_hash"."0.3.3"."commoncrypto"}" deps) - (features_.openssl."${deps."crypto_hash"."0.3.3"."openssl"}" deps) - (features_.winapi."${deps."crypto_hash"."0.3.3"."winapi"}" deps) - ]; - - -# end -# curl-0.4.21 - - crates.curl."0.4.21" = deps: { features?(features_.curl."0.4.21" deps {}) }: buildRustCrate { - crateName = "curl"; - version = "0.4.21"; - description = "Rust bindings to libcurl for making HTTP requests"; - authors = [ "Alex Crichton " ]; - sha256 = "1n13h0scc4s77ryf3w19n3myh4k1ls4bfxrx6y6ffvayjfnh13qy"; - dependencies = mapFeatures features ([ - (crates."curl_sys"."${deps."curl"."0.4.21"."curl_sys"}" deps) - (crates."libc"."${deps."curl"."0.4.21"."libc"}" deps) - (crates."socket2"."${deps."curl"."0.4.21"."socket2"}" deps) - ]) - ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "darwin") then mapFeatures features ([ - ] - ++ (if features.curl."0.4.21".openssl-probe or false then [ (crates.openssl_probe."${deps."curl"."0.4.21".openssl_probe}" deps) ] else []) - ++ (if features.curl."0.4.21".openssl-sys or false then [ (crates.openssl_sys."${deps."curl"."0.4.21".openssl_sys}" deps) ] else [])) else []) - ++ (if abi == "msvc" then mapFeatures features ([ - (crates."kernel32_sys"."${deps."curl"."0.4.21"."kernel32_sys"}" deps) - (crates."schannel"."${deps."curl"."0.4.21"."schannel"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."curl"."0.4.21"."winapi"}" deps) - ]) else []); - features = mkFeatures (features."curl"."0.4.21" or {}); - }; - features_.curl."0.4.21" = deps: f: updateFeatures f (rec { - curl = fold recursiveUpdate {} [ - { "0.4.21"."openssl-probe" = - (f.curl."0.4.21"."openssl-probe" or false) || - (f.curl."0.4.21".ssl or false) || - (curl."0.4.21"."ssl" or false); } - { "0.4.21"."openssl-sys" = - (f.curl."0.4.21"."openssl-sys" or false) || - (f.curl."0.4.21".ssl or false) || - (curl."0.4.21"."ssl" or false); } - { "0.4.21"."ssl" = - (f.curl."0.4.21"."ssl" or false) || - (f.curl."0.4.21".default or false) || - (curl."0.4.21"."default" or false); } - { "0.4.21".default = (f.curl."0.4.21".default or true); } - ]; - curl_sys = fold recursiveUpdate {} [ - { "${deps.curl."0.4.21".curl_sys}"."force-system-lib-on-osx" = - (f.curl_sys."${deps.curl."0.4.21".curl_sys}"."force-system-lib-on-osx" or false) || - (curl."0.4.21"."force-system-lib-on-osx" or false) || - (f."curl"."0.4.21"."force-system-lib-on-osx" or false); } - { "${deps.curl."0.4.21".curl_sys}"."http2" = - (f.curl_sys."${deps.curl."0.4.21".curl_sys}"."http2" or false) || - (curl."0.4.21"."http2" or false) || - (f."curl"."0.4.21"."http2" or false); } - { "${deps.curl."0.4.21".curl_sys}"."ssl" = - (f.curl_sys."${deps.curl."0.4.21".curl_sys}"."ssl" or false) || - (curl."0.4.21"."ssl" or false) || - (f."curl"."0.4.21"."ssl" or false); } - { "${deps.curl."0.4.21".curl_sys}"."static-curl" = - (f.curl_sys."${deps.curl."0.4.21".curl_sys}"."static-curl" or false) || - (curl."0.4.21"."static-curl" or false) || - (f."curl"."0.4.21"."static-curl" or false); } - { "${deps.curl."0.4.21".curl_sys}"."static-ssl" = - (f.curl_sys."${deps.curl."0.4.21".curl_sys}"."static-ssl" or false) || - (curl."0.4.21"."static-ssl" or false) || - (f."curl"."0.4.21"."static-ssl" or false); } - { "${deps.curl."0.4.21".curl_sys}".default = (f.curl_sys."${deps.curl."0.4.21".curl_sys}".default or false); } - ]; - kernel32_sys."${deps.curl."0.4.21".kernel32_sys}".default = true; - libc."${deps.curl."0.4.21".libc}".default = true; - openssl_probe."${deps.curl."0.4.21".openssl_probe}".default = true; - openssl_sys."${deps.curl."0.4.21".openssl_sys}".default = true; - schannel."${deps.curl."0.4.21".schannel}".default = true; - socket2."${deps.curl."0.4.21".socket2}".default = true; - winapi."${deps.curl."0.4.21".winapi}".default = true; - }) [ - (features_.curl_sys."${deps."curl"."0.4.21"."curl_sys"}" deps) - (features_.libc."${deps."curl"."0.4.21"."libc"}" deps) - (features_.socket2."${deps."curl"."0.4.21"."socket2"}" deps) - (features_.openssl_probe."${deps."curl"."0.4.21"."openssl_probe"}" deps) - (features_.openssl_sys."${deps."curl"."0.4.21"."openssl_sys"}" deps) - (features_.kernel32_sys."${deps."curl"."0.4.21"."kernel32_sys"}" deps) - (features_.schannel."${deps."curl"."0.4.21"."schannel"}" deps) - (features_.winapi."${deps."curl"."0.4.21"."winapi"}" deps) - ]; - - -# end -# curl-sys-0.4.18 - - crates.curl_sys."0.4.18" = deps: { features?(features_.curl_sys."0.4.18" deps {}) }: buildRustCrate { - crateName = "curl-sys"; - version = "0.4.18"; - description = "Native bindings to the libcurl library"; - authors = [ "Alex Crichton " ]; - sha256 = "1y9qglyirlxhp62gh5vlzpq67jw7cyccvsajvmj30dv1sn7cn3vk"; - libPath = "lib.rs"; - libName = "curl_sys"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."curl_sys"."0.4.18"."libc"}" deps) - (crates."libz_sys"."${deps."curl_sys"."0.4.18"."libz_sys"}" deps) - ] - ++ (if features.curl_sys."0.4.18".libnghttp2-sys or false then [ (crates.libnghttp2_sys."${deps."curl_sys"."0.4.18".libnghttp2_sys}" deps) ] else [])) - ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "darwin") then mapFeatures features ([ - ] - ++ (if features.curl_sys."0.4.18".openssl-sys or false then [ (crates.openssl_sys."${deps."curl_sys"."0.4.18".openssl_sys}" deps) ] else [])) else []) - ++ (if abi == "msvc" then mapFeatures features ([ -]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."curl_sys"."0.4.18"."winapi"}" deps) - ]) else []); - - buildDependencies = mapFeatures features ([ - (crates."cc"."${deps."curl_sys"."0.4.18"."cc"}" deps) - (crates."pkg_config"."${deps."curl_sys"."0.4.18"."pkg_config"}" deps) - ]); - features = mkFeatures (features."curl_sys"."0.4.18" or {}); - }; - features_.curl_sys."0.4.18" = deps: f: updateFeatures f (rec { - cc."${deps.curl_sys."0.4.18".cc}".default = true; - curl_sys = fold recursiveUpdate {} [ - { "0.4.18"."libnghttp2-sys" = - (f.curl_sys."0.4.18"."libnghttp2-sys" or false) || - (f.curl_sys."0.4.18".http2 or false) || - (curl_sys."0.4.18"."http2" or false); } - { "0.4.18"."openssl-sys" = - (f.curl_sys."0.4.18"."openssl-sys" or false) || - (f.curl_sys."0.4.18".ssl or false) || - (curl_sys."0.4.18"."ssl" or false); } - { "0.4.18"."ssl" = - (f.curl_sys."0.4.18"."ssl" or false) || - (f.curl_sys."0.4.18".default or false) || - (curl_sys."0.4.18"."default" or false); } - { "0.4.18".default = (f.curl_sys."0.4.18".default or true); } - ]; - libc."${deps.curl_sys."0.4.18".libc}".default = true; - libnghttp2_sys."${deps.curl_sys."0.4.18".libnghttp2_sys}".default = true; - libz_sys."${deps.curl_sys."0.4.18".libz_sys}".default = true; - openssl_sys."${deps.curl_sys."0.4.18".openssl_sys}".default = true; - pkg_config."${deps.curl_sys."0.4.18".pkg_config}".default = true; - winapi = fold recursiveUpdate {} [ - { "${deps.curl_sys."0.4.18".winapi}"."winsock2" = true; } - { "${deps.curl_sys."0.4.18".winapi}"."ws2def" = true; } - { "${deps.curl_sys."0.4.18".winapi}".default = true; } - ]; - }) [ - (features_.libc."${deps."curl_sys"."0.4.18"."libc"}" deps) - (features_.libnghttp2_sys."${deps."curl_sys"."0.4.18"."libnghttp2_sys"}" deps) - (features_.libz_sys."${deps."curl_sys"."0.4.18"."libz_sys"}" deps) - (features_.cc."${deps."curl_sys"."0.4.18"."cc"}" deps) - (features_.pkg_config."${deps."curl_sys"."0.4.18"."pkg_config"}" deps) - (features_.openssl_sys."${deps."curl_sys"."0.4.18"."openssl_sys"}" deps) - (features_.winapi."${deps."curl_sys"."0.4.18"."winapi"}" deps) - ]; - - -# end -# docopt-1.1.0 - - crates.docopt."1.1.0" = deps: { features?(features_.docopt."1.1.0" deps {}) }: buildRustCrate { - crateName = "docopt"; - version = "1.1.0"; - description = "Command line argument parsing."; - authors = [ "Andrew Gallant " ]; - edition = "2018"; - sha256 = "1xjvfw8398qcxwhdmak1bw2j6zn125ch24dmrmghv50vnlbb997x"; - crateBin = - [{ name = "docopt-wordlist"; path = "src/wordlist.rs"; }]; - dependencies = mapFeatures features ([ - (crates."lazy_static"."${deps."docopt"."1.1.0"."lazy_static"}" deps) - (crates."regex"."${deps."docopt"."1.1.0"."regex"}" deps) - (crates."serde"."${deps."docopt"."1.1.0"."serde"}" deps) - (crates."strsim"."${deps."docopt"."1.1.0"."strsim"}" deps) - ]); - }; - features_.docopt."1.1.0" = deps: f: updateFeatures f ({ - docopt."1.1.0".default = (f.docopt."1.1.0".default or true); - lazy_static."${deps.docopt."1.1.0".lazy_static}".default = true; - regex."${deps.docopt."1.1.0".regex}".default = true; - serde = fold recursiveUpdate {} [ - { "${deps.docopt."1.1.0".serde}"."derive" = true; } - { "${deps.docopt."1.1.0".serde}".default = true; } - ]; - strsim."${deps.docopt."1.1.0".strsim}".default = true; - }) [ - (features_.lazy_static."${deps."docopt"."1.1.0"."lazy_static"}" deps) - (features_.regex."${deps."docopt"."1.1.0"."regex"}" deps) - (features_.serde."${deps."docopt"."1.1.0"."serde"}" deps) - (features_.strsim."${deps."docopt"."1.1.0"."strsim"}" deps) - ]; - - -# end -# either-1.5.2 - - crates.either."1.5.2" = deps: { features?(features_.either."1.5.2" deps {}) }: buildRustCrate { - crateName = "either"; - version = "1.5.2"; - description = "The enum `Either` with variants `Left` and `Right` is a general purpose sum type with two cases.\n"; - authors = [ "bluss" ]; - sha256 = "1zqq1057c51f53ga4p9l4dd8ax6md27h1xjrjp2plkvml5iymks5"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."either"."1.5.2" or {}); - }; - features_.either."1.5.2" = deps: f: updateFeatures f (rec { - either = fold recursiveUpdate {} [ - { "1.5.2"."use_std" = - (f.either."1.5.2"."use_std" or false) || - (f.either."1.5.2".default or false) || - (either."1.5.2"."default" or false); } - { "1.5.2".default = (f.either."1.5.2".default or true); } - ]; - }) []; - - -# end -# filetime-0.2.4 - - crates.filetime."0.2.4" = deps: { features?(features_.filetime."0.2.4" deps {}) }: buildRustCrate { - crateName = "filetime"; - version = "0.2.4"; - description = "Platform-agnostic accessors of timestamps in File metadata\n"; - authors = [ "Alex Crichton " ]; - sha256 = "1lsc0qjihr8y56rlzdcldzr0nbljm8qqi691msgwhy6wrkawwx5d"; - dependencies = mapFeatures features ([ - (crates."cfg_if"."${deps."filetime"."0.2.4"."cfg_if"}" deps) - ]) - ++ (if kernel == "redox" then mapFeatures features ([ - (crates."redox_syscall"."${deps."filetime"."0.2.4"."redox_syscall"}" deps) - ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."filetime"."0.2.4"."libc"}" deps) - ]) else []); - }; - features_.filetime."0.2.4" = deps: f: updateFeatures f ({ - cfg_if."${deps.filetime."0.2.4".cfg_if}".default = true; - filetime."0.2.4".default = (f.filetime."0.2.4".default or true); - libc."${deps.filetime."0.2.4".libc}".default = true; - redox_syscall."${deps.filetime."0.2.4".redox_syscall}".default = true; - }) [ - (features_.cfg_if."${deps."filetime"."0.2.4"."cfg_if"}" deps) - (features_.redox_syscall."${deps."filetime"."0.2.4"."redox_syscall"}" deps) - (features_.libc."${deps."filetime"."0.2.4"."libc"}" deps) - ]; - - -# end -# flate2-1.0.7 - - crates.flate2."1.0.7" = deps: { features?(features_.flate2."1.0.7" deps {}) }: buildRustCrate { - crateName = "flate2"; - version = "1.0.7"; - description = "Bindings to miniz.c for DEFLATE compression and decompression exposed as\nReader/Writer streams. Contains bindings for zlib, deflate, and gzip-based\nstreams.\n"; - authors = [ "Alex Crichton " ]; - sha256 = "012vi948sap09hm1nmd228fqn7i5kp6wfb9zlz0m8ysq5if1s9mc"; - dependencies = mapFeatures features ([ - (crates."crc32fast"."${deps."flate2"."1.0.7"."crc32fast"}" deps) - (crates."libc"."${deps."flate2"."1.0.7"."libc"}" deps) - ] - ++ (if features.flate2."1.0.7".libz-sys or false then [ (crates.libz_sys."${deps."flate2"."1.0.7".libz_sys}" deps) ] else []) - ++ (if features.flate2."1.0.7".miniz-sys or false then [ (crates.miniz_sys."${deps."flate2"."1.0.7".miniz_sys}" deps) ] else []) - ++ (if features.flate2."1.0.7".miniz_oxide_c_api or false then [ (crates.miniz_oxide_c_api."${deps."flate2"."1.0.7".miniz_oxide_c_api}" deps) ] else [])) - ++ (if cpu == "wasm32" && !(kernel == "emscripten") then mapFeatures features ([ - (crates."miniz_oxide_c_api"."${deps."flate2"."1.0.7"."miniz_oxide_c_api"}" deps) - ]) else []); - features = mkFeatures (features."flate2"."1.0.7" or {}); - }; - features_.flate2."1.0.7" = deps: f: updateFeatures f (rec { - crc32fast."${deps.flate2."1.0.7".crc32fast}".default = true; - flate2 = fold recursiveUpdate {} [ - { "1.0.7"."futures" = - (f.flate2."1.0.7"."futures" or false) || - (f.flate2."1.0.7".tokio or false) || - (flate2."1.0.7"."tokio" or false); } - { "1.0.7"."libz-sys" = - (f.flate2."1.0.7"."libz-sys" or false) || - (f.flate2."1.0.7".zlib or false) || - (flate2."1.0.7"."zlib" or false); } - { "1.0.7"."miniz-sys" = - (f.flate2."1.0.7"."miniz-sys" or false) || - (f.flate2."1.0.7".default or false) || - (flate2."1.0.7"."default" or false); } - { "1.0.7"."miniz_oxide_c_api" = - (f.flate2."1.0.7"."miniz_oxide_c_api" or false) || - (f.flate2."1.0.7".rust_backend or false) || - (flate2."1.0.7"."rust_backend" or false); } - { "1.0.7"."tokio-io" = - (f.flate2."1.0.7"."tokio-io" or false) || - (f.flate2."1.0.7".tokio or false) || - (flate2."1.0.7"."tokio" or false); } - { "1.0.7".default = (f.flate2."1.0.7".default or true); } - ]; - libc."${deps.flate2."1.0.7".libc}".default = true; - libz_sys."${deps.flate2."1.0.7".libz_sys}".default = true; - miniz_oxide_c_api = fold recursiveUpdate {} [ - { "${deps.flate2."1.0.7".miniz_oxide_c_api}"."no_c_export" = - (f.miniz_oxide_c_api."${deps.flate2."1.0.7".miniz_oxide_c_api}"."no_c_export" or false) || - true || - true; } - { "${deps.flate2."1.0.7".miniz_oxide_c_api}".default = true; } - ]; - miniz_sys."${deps.flate2."1.0.7".miniz_sys}".default = true; - }) [ - (features_.crc32fast."${deps."flate2"."1.0.7"."crc32fast"}" deps) - (features_.libc."${deps."flate2"."1.0.7"."libc"}" deps) - (features_.libz_sys."${deps."flate2"."1.0.7"."libz_sys"}" deps) - (features_.miniz_sys."${deps."flate2"."1.0.7"."miniz_sys"}" deps) - (features_.miniz_oxide_c_api."${deps."flate2"."1.0.7"."miniz_oxide_c_api"}" deps) - (features_.miniz_oxide_c_api."${deps."flate2"."1.0.7"."miniz_oxide_c_api"}" deps) - ]; - - -# end -# fnv-1.0.6 - - crates.fnv."1.0.6" = deps: { features?(features_.fnv."1.0.6" deps {}) }: buildRustCrate { - crateName = "fnv"; - version = "1.0.6"; - description = "Fowler–Noll–Vo hash function"; - authors = [ "Alex Crichton " ]; - sha256 = "128mlh23y3gg6ag5h8iiqlcbl59smisdzraqy88ldrf75kbw27ip"; - libPath = "lib.rs"; - }; - features_.fnv."1.0.6" = deps: f: updateFeatures f ({ - fnv."1.0.6".default = (f.fnv."1.0.6".default or true); - }) []; - - -# end -# foreign-types-0.3.2 - - crates.foreign_types."0.3.2" = deps: { features?(features_.foreign_types."0.3.2" deps {}) }: buildRustCrate { - crateName = "foreign-types"; - version = "0.3.2"; - description = "A framework for Rust wrappers over C APIs"; - authors = [ "Steven Fackler " ]; - sha256 = "105n8sp2djb1s5lzrw04p7ss3dchr5qa3canmynx396nh3vwm2p8"; - dependencies = mapFeatures features ([ - (crates."foreign_types_shared"."${deps."foreign_types"."0.3.2"."foreign_types_shared"}" deps) - ]); - }; - features_.foreign_types."0.3.2" = deps: f: updateFeatures f ({ - foreign_types."0.3.2".default = (f.foreign_types."0.3.2".default or true); - foreign_types_shared."${deps.foreign_types."0.3.2".foreign_types_shared}".default = true; - }) [ - (features_.foreign_types_shared."${deps."foreign_types"."0.3.2"."foreign_types_shared"}" deps) - ]; - - -# end -# foreign-types-shared-0.1.1 - - crates.foreign_types_shared."0.1.1" = deps: { features?(features_.foreign_types_shared."0.1.1" deps {}) }: buildRustCrate { - crateName = "foreign-types-shared"; - version = "0.1.1"; - description = "An internal crate used by foreign-types"; - authors = [ "Steven Fackler " ]; - sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5"; - }; - features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f ({ - foreign_types_shared."0.1.1".default = (f.foreign_types_shared."0.1.1".default or true); - }) []; - - -# end -# fs2-0.4.3 - - crates.fs2."0.4.3" = deps: { features?(features_.fs2."0.4.3" deps {}) }: buildRustCrate { - crateName = "fs2"; - version = "0.4.3"; - description = "Cross-platform file locks and file duplication."; - authors = [ "Dan Burkert " ]; - sha256 = "1crj36rhhpk3qby9yj7r77w7sld0mzab2yicmphbdkfymbmp3ldp"; - dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."fs2"."0.4.3"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."fs2"."0.4.3"."winapi"}" deps) - ]) else []); - }; - features_.fs2."0.4.3" = deps: f: updateFeatures f ({ - fs2."0.4.3".default = (f.fs2."0.4.3".default or true); - libc."${deps.fs2."0.4.3".libc}".default = true; - winapi = fold recursiveUpdate {} [ - { "${deps.fs2."0.4.3".winapi}"."fileapi" = true; } - { "${deps.fs2."0.4.3".winapi}"."handleapi" = true; } - { "${deps.fs2."0.4.3".winapi}"."processthreadsapi" = true; } - { "${deps.fs2."0.4.3".winapi}"."std" = true; } - { "${deps.fs2."0.4.3".winapi}"."winbase" = true; } - { "${deps.fs2."0.4.3".winapi}"."winerror" = true; } - { "${deps.fs2."0.4.3".winapi}".default = true; } - ]; - }) [ - (features_.libc."${deps."fs2"."0.4.3"."libc"}" deps) - (features_.winapi."${deps."fs2"."0.4.3"."winapi"}" deps) - ]; - - -# end -# fwdansi-1.0.1 - - crates.fwdansi."1.0.1" = deps: { features?(features_.fwdansi."1.0.1" deps {}) }: buildRustCrate { - crateName = "fwdansi"; - version = "1.0.1"; - description = "Forwards a byte string with ANSI escape code to a termcolor terminal"; - authors = [ "kennytm " ]; - sha256 = "00mzclq1wx55p6x5xx4yhpj70vsrivk2w1wbzq8bnf6xnl2km0xn"; - dependencies = mapFeatures features ([ - (crates."memchr"."${deps."fwdansi"."1.0.1"."memchr"}" deps) - (crates."termcolor"."${deps."fwdansi"."1.0.1"."termcolor"}" deps) - ]); - }; - features_.fwdansi."1.0.1" = deps: f: updateFeatures f ({ - fwdansi."1.0.1".default = (f.fwdansi."1.0.1".default or true); - memchr."${deps.fwdansi."1.0.1".memchr}".default = true; - termcolor."${deps.fwdansi."1.0.1".termcolor}".default = true; - }) [ - (features_.memchr."${deps."fwdansi"."1.0.1"."memchr"}" deps) - (features_.termcolor."${deps."fwdansi"."1.0.1"."termcolor"}" deps) - ]; - - -# end -# git2-0.8.0 - - crates.git2."0.8.0" = deps: { features?(features_.git2."0.8.0" deps {}) }: buildRustCrate { - crateName = "git2"; - version = "0.8.0"; - description = "Bindings to libgit2 for interoperating with git repositories. This library is\nboth threadsafe and memory safe and allows both reading and writing git\nrepositories.\n"; - authors = [ "Alex Crichton " ]; - sha256 = "0nkzglhq7lrdzv23jakygv6h5kks2mdr7xh73chnr7bqdc36mi43"; - dependencies = mapFeatures features ([ - (crates."bitflags"."${deps."git2"."0.8.0"."bitflags"}" deps) - (crates."libc"."${deps."git2"."0.8.0"."libc"}" deps) - (crates."libgit2_sys"."${deps."git2"."0.8.0"."libgit2_sys"}" deps) - (crates."log"."${deps."git2"."0.8.0"."log"}" deps) - (crates."url"."${deps."git2"."0.8.0"."url"}" deps) - ]) - ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "darwin") then mapFeatures features ([ - ] - ++ (if features.git2."0.8.0".openssl-probe or false then [ (crates.openssl_probe."${deps."git2"."0.8.0".openssl_probe}" deps) ] else []) - ++ (if features.git2."0.8.0".openssl-sys or false then [ (crates.openssl_sys."${deps."git2"."0.8.0".openssl_sys}" deps) ] else [])) else []); - features = mkFeatures (features."git2"."0.8.0" or {}); - }; - features_.git2."0.8.0" = deps: f: updateFeatures f (rec { - bitflags."${deps.git2."0.8.0".bitflags}".default = true; - git2 = fold recursiveUpdate {} [ - { "0.8.0"."curl" = - (f.git2."0.8.0"."curl" or false) || - (f.git2."0.8.0".default or false) || - (git2."0.8.0"."default" or false); } - { "0.8.0"."https" = - (f.git2."0.8.0"."https" or false) || - (f.git2."0.8.0".default or false) || - (git2."0.8.0"."default" or false); } - { "0.8.0"."openssl-probe" = - (f.git2."0.8.0"."openssl-probe" or false) || - (f.git2."0.8.0".https or false) || - (git2."0.8.0"."https" or false); } - { "0.8.0"."openssl-sys" = - (f.git2."0.8.0"."openssl-sys" or false) || - (f.git2."0.8.0".https or false) || - (git2."0.8.0"."https" or false); } - { "0.8.0"."ssh" = - (f.git2."0.8.0"."ssh" or false) || - (f.git2."0.8.0".default or false) || - (git2."0.8.0"."default" or false); } - { "0.8.0"."ssh_key_from_memory" = - (f.git2."0.8.0"."ssh_key_from_memory" or false) || - (f.git2."0.8.0".default or false) || - (git2."0.8.0"."default" or false); } - { "0.8.0".default = (f.git2."0.8.0".default or true); } - ]; - libc."${deps.git2."0.8.0".libc}".default = true; - libgit2_sys = fold recursiveUpdate {} [ - { "${deps.git2."0.8.0".libgit2_sys}"."curl" = - (f.libgit2_sys."${deps.git2."0.8.0".libgit2_sys}"."curl" or false) || - (git2."0.8.0"."curl" or false) || - (f."git2"."0.8.0"."curl" or false); } - { "${deps.git2."0.8.0".libgit2_sys}"."https" = - (f.libgit2_sys."${deps.git2."0.8.0".libgit2_sys}"."https" or false) || - (git2."0.8.0"."https" or false) || - (f."git2"."0.8.0"."https" or false); } - { "${deps.git2."0.8.0".libgit2_sys}"."ssh" = - (f.libgit2_sys."${deps.git2."0.8.0".libgit2_sys}"."ssh" or false) || - (git2."0.8.0"."ssh" or false) || - (f."git2"."0.8.0"."ssh" or false); } - { "${deps.git2."0.8.0".libgit2_sys}"."ssh_key_from_memory" = - (f.libgit2_sys."${deps.git2."0.8.0".libgit2_sys}"."ssh_key_from_memory" or false) || - (git2."0.8.0"."ssh_key_from_memory" or false) || - (f."git2"."0.8.0"."ssh_key_from_memory" or false); } - { "${deps.git2."0.8.0".libgit2_sys}".default = true; } - ]; - log."${deps.git2."0.8.0".log}".default = true; - openssl_probe."${deps.git2."0.8.0".openssl_probe}".default = true; - openssl_sys."${deps.git2."0.8.0".openssl_sys}".default = true; - url."${deps.git2."0.8.0".url}".default = true; - }) [ - (features_.bitflags."${deps."git2"."0.8.0"."bitflags"}" deps) - (features_.libc."${deps."git2"."0.8.0"."libc"}" deps) - (features_.libgit2_sys."${deps."git2"."0.8.0"."libgit2_sys"}" deps) - (features_.log."${deps."git2"."0.8.0"."log"}" deps) - (features_.url."${deps."git2"."0.8.0"."url"}" deps) - (features_.openssl_probe."${deps."git2"."0.8.0"."openssl_probe"}" deps) - (features_.openssl_sys."${deps."git2"."0.8.0"."openssl_sys"}" deps) - ]; - - -# end -# git2-curl-0.9.0 - - crates.git2_curl."0.9.0" = deps: { features?(features_.git2_curl."0.9.0" deps {}) }: buildRustCrate { - crateName = "git2-curl"; - version = "0.9.0"; - description = "Backend for an HTTP transport in libgit2 powered by libcurl.\n\nIntended to be used with the git2 crate.\n"; - authors = [ "Alex Crichton " ]; - sha256 = "0m7bjx7pbrd7hiwwbazgigv9anici9jfwgzhp3q47smbwszdv2hh"; - dependencies = mapFeatures features ([ - (crates."curl"."${deps."git2_curl"."0.9.0"."curl"}" deps) - (crates."git2"."${deps."git2_curl"."0.9.0"."git2"}" deps) - (crates."log"."${deps."git2_curl"."0.9.0"."log"}" deps) - (crates."url"."${deps."git2_curl"."0.9.0"."url"}" deps) - ]); - }; - features_.git2_curl."0.9.0" = deps: f: updateFeatures f ({ - curl."${deps.git2_curl."0.9.0".curl}".default = true; - git2."${deps.git2_curl."0.9.0".git2}".default = (f.git2."${deps.git2_curl."0.9.0".git2}".default or false); - git2_curl."0.9.0".default = (f.git2_curl."0.9.0".default or true); - log."${deps.git2_curl."0.9.0".log}".default = true; - url."${deps.git2_curl."0.9.0".url}".default = true; - }) [ - (features_.curl."${deps."git2_curl"."0.9.0"."curl"}" deps) - (features_.git2."${deps."git2_curl"."0.9.0"."git2"}" deps) - (features_.log."${deps."git2_curl"."0.9.0"."log"}" deps) - (features_.url."${deps."git2_curl"."0.9.0"."url"}" deps) - ]; - - -# end -# glob-0.2.11 - - crates.glob."0.2.11" = deps: { features?(features_.glob."0.2.11" deps {}) }: buildRustCrate { - crateName = "glob"; - version = "0.2.11"; - description = "Support for matching file paths against Unix shell style patterns.\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf"; - }; - features_.glob."0.2.11" = deps: f: updateFeatures f ({ - glob."0.2.11".default = (f.glob."0.2.11".default or true); - }) []; - - -# end -# globset-0.4.3 - - crates.globset."0.4.3" = deps: { features?(features_.globset."0.4.3" deps {}) }: buildRustCrate { - crateName = "globset"; - version = "0.4.3"; - description = "Cross platform single glob and glob set matching. Glob set matching is the\nprocess of matching one or more glob patterns against a single candidate path\nsimultaneously, and returning all of the globs that matched.\n"; - authors = [ "Andrew Gallant " ]; - sha256 = "0vj99vw55mp7w44p1157f9c44q5lms6sn0mllhavwrwdn3iyfrij"; - dependencies = mapFeatures features ([ - (crates."aho_corasick"."${deps."globset"."0.4.3"."aho_corasick"}" deps) - (crates."bstr"."${deps."globset"."0.4.3"."bstr"}" deps) - (crates."fnv"."${deps."globset"."0.4.3"."fnv"}" deps) - (crates."log"."${deps."globset"."0.4.3"."log"}" deps) - (crates."regex"."${deps."globset"."0.4.3"."regex"}" deps) - ]); - features = mkFeatures (features."globset"."0.4.3" or {}); - }; - features_.globset."0.4.3" = deps: f: updateFeatures f ({ - aho_corasick."${deps.globset."0.4.3".aho_corasick}".default = true; - bstr = fold recursiveUpdate {} [ - { "${deps.globset."0.4.3".bstr}"."std" = true; } - { "${deps.globset."0.4.3".bstr}".default = (f.bstr."${deps.globset."0.4.3".bstr}".default or false); } - ]; - fnv."${deps.globset."0.4.3".fnv}".default = true; - globset."0.4.3".default = (f.globset."0.4.3".default or true); - log."${deps.globset."0.4.3".log}".default = true; - regex."${deps.globset."0.4.3".regex}".default = true; - }) [ - (features_.aho_corasick."${deps."globset"."0.4.3"."aho_corasick"}" deps) - (features_.bstr."${deps."globset"."0.4.3"."bstr"}" deps) - (features_.fnv."${deps."globset"."0.4.3"."fnv"}" deps) - (features_.log."${deps."globset"."0.4.3"."log"}" deps) - (features_.regex."${deps."globset"."0.4.3"."regex"}" deps) - ]; - - -# end -# hashbrown-0.1.8 - - crates.hashbrown."0.1.8" = deps: { features?(features_.hashbrown."0.1.8" deps {}) }: buildRustCrate { - crateName = "hashbrown"; - version = "0.1.8"; - description = "A Rust port of Google's SwissTable hash map"; - authors = [ "Amanieu d'Antras " ]; - sha256 = "047fk80pg59cdn5lz4h2a514fmgmya896dvy3dqqviia52a27fzh"; - dependencies = mapFeatures features ([ - (crates."byteorder"."${deps."hashbrown"."0.1.8"."byteorder"}" deps) - (crates."scopeguard"."${deps."hashbrown"."0.1.8"."scopeguard"}" deps) - ]); - features = mkFeatures (features."hashbrown"."0.1.8" or {}); - }; - features_.hashbrown."0.1.8" = deps: f: updateFeatures f ({ - byteorder."${deps.hashbrown."0.1.8".byteorder}".default = (f.byteorder."${deps.hashbrown."0.1.8".byteorder}".default or false); - hashbrown."0.1.8".default = (f.hashbrown."0.1.8".default or true); - scopeguard."${deps.hashbrown."0.1.8".scopeguard}".default = (f.scopeguard."${deps.hashbrown."0.1.8".scopeguard}".default or false); - }) [ - (features_.byteorder."${deps."hashbrown"."0.1.8"."byteorder"}" deps) - (features_.scopeguard."${deps."hashbrown"."0.1.8"."scopeguard"}" deps) - ]; - - -# end -# hex-0.3.2 - - crates.hex."0.3.2" = deps: { features?(features_.hex."0.3.2" deps {}) }: buildRustCrate { - crateName = "hex"; - version = "0.3.2"; - description = "Encoding and decoding data into/from hexadecimal representation."; - authors = [ "KokaKiwi " ]; - sha256 = "0hs0xfb4x67y4ss9mmbjmibkwakbn3xf23i21m409bw2zqk9b6kz"; - features = mkFeatures (features."hex"."0.3.2" or {}); - }; - features_.hex."0.3.2" = deps: f: updateFeatures f ({ - hex."0.3.2".default = (f.hex."0.3.2".default or true); - }) []; - - -# end -# home-0.3.4 - - crates.home."0.3.4" = deps: { features?(features_.home."0.3.4" deps {}) }: buildRustCrate { - crateName = "home"; - version = "0.3.4"; - description = "Shared definitions of home directories"; - authors = [ "Brian Anderson " ]; - sha256 = "19fbzvv74wqxqpdlz6ri1p270i8hp17h8njjj68k98sgrabkcr0n"; - dependencies = (if kernel == "windows" then mapFeatures features ([ - (crates."scopeguard"."${deps."home"."0.3.4"."scopeguard"}" deps) - (crates."winapi"."${deps."home"."0.3.4"."winapi"}" deps) - ]) else []); - }; - features_.home."0.3.4" = deps: f: updateFeatures f ({ - home."0.3.4".default = (f.home."0.3.4".default or true); - scopeguard."${deps.home."0.3.4".scopeguard}".default = true; - winapi = fold recursiveUpdate {} [ - { "${deps.home."0.3.4".winapi}"."errhandlingapi" = true; } - { "${deps.home."0.3.4".winapi}"."handleapi" = true; } - { "${deps.home."0.3.4".winapi}"."processthreadsapi" = true; } - { "${deps.home."0.3.4".winapi}"."std" = true; } - { "${deps.home."0.3.4".winapi}"."userenv" = true; } - { "${deps.home."0.3.4".winapi}"."winerror" = true; } - { "${deps.home."0.3.4".winapi}"."winnt" = true; } - { "${deps.home."0.3.4".winapi}".default = true; } - ]; - }) [ - (features_.scopeguard."${deps."home"."0.3.4"."scopeguard"}" deps) - (features_.winapi."${deps."home"."0.3.4"."winapi"}" deps) - ]; - - -# end -# http-0.1.17 - - crates.http."0.1.17" = deps: { features?(features_.http."0.1.17" deps {}) }: buildRustCrate { - crateName = "http"; - version = "0.1.17"; - description = "A set of types for representing HTTP requests and responses.\n"; - authors = [ "Alex Crichton " "Carl Lerche " "Sean McArthur " ]; - sha256 = "0q71wgggg1h5kjyg1gb4m70g3ian9qwrkx2b9wwvfyafrkmjpg9c"; - dependencies = mapFeatures features ([ - (crates."bytes"."${deps."http"."0.1.17"."bytes"}" deps) - (crates."fnv"."${deps."http"."0.1.17"."fnv"}" deps) - (crates."itoa"."${deps."http"."0.1.17"."itoa"}" deps) - ]); - }; - features_.http."0.1.17" = deps: f: updateFeatures f ({ - bytes."${deps.http."0.1.17".bytes}".default = true; - fnv."${deps.http."0.1.17".fnv}".default = true; - http."0.1.17".default = (f.http."0.1.17".default or true); - itoa."${deps.http."0.1.17".itoa}".default = true; - }) [ - (features_.bytes."${deps."http"."0.1.17"."bytes"}" deps) - (features_.fnv."${deps."http"."0.1.17"."fnv"}" deps) - (features_.itoa."${deps."http"."0.1.17"."itoa"}" deps) - ]; - - -# end -# ignore-0.4.7 - - crates.ignore."0.4.7" = deps: { features?(features_.ignore."0.4.7" deps {}) }: buildRustCrate { - crateName = "ignore"; - version = "0.4.7"; - description = "A fast library for efficiently matching ignore files such as `.gitignore`\nagainst file paths.\n"; - authors = [ "Andrew Gallant " ]; - sha256 = "10ky0pnkzk6spa416sxvhcpc1nxq56n6mxkmhzy3ws57x9v75nkj"; - dependencies = mapFeatures features ([ - (crates."crossbeam_channel"."${deps."ignore"."0.4.7"."crossbeam_channel"}" deps) - (crates."globset"."${deps."ignore"."0.4.7"."globset"}" deps) - (crates."lazy_static"."${deps."ignore"."0.4.7"."lazy_static"}" deps) - (crates."log"."${deps."ignore"."0.4.7"."log"}" deps) - (crates."memchr"."${deps."ignore"."0.4.7"."memchr"}" deps) - (crates."regex"."${deps."ignore"."0.4.7"."regex"}" deps) - (crates."same_file"."${deps."ignore"."0.4.7"."same_file"}" deps) - (crates."thread_local"."${deps."ignore"."0.4.7"."thread_local"}" deps) - (crates."walkdir"."${deps."ignore"."0.4.7"."walkdir"}" deps) - ]) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi_util"."${deps."ignore"."0.4.7"."winapi_util"}" deps) - ]) else []); - features = mkFeatures (features."ignore"."0.4.7" or {}); - }; - features_.ignore."0.4.7" = deps: f: updateFeatures f (rec { - crossbeam_channel."${deps.ignore."0.4.7".crossbeam_channel}".default = true; - globset = fold recursiveUpdate {} [ - { "${deps.ignore."0.4.7".globset}"."simd-accel" = - (f.globset."${deps.ignore."0.4.7".globset}"."simd-accel" or false) || - (ignore."0.4.7"."simd-accel" or false) || - (f."ignore"."0.4.7"."simd-accel" or false); } - { "${deps.ignore."0.4.7".globset}".default = true; } - ]; - ignore."0.4.7".default = (f.ignore."0.4.7".default or true); - lazy_static."${deps.ignore."0.4.7".lazy_static}".default = true; - log."${deps.ignore."0.4.7".log}".default = true; - memchr."${deps.ignore."0.4.7".memchr}".default = true; - regex."${deps.ignore."0.4.7".regex}".default = true; - same_file."${deps.ignore."0.4.7".same_file}".default = true; - thread_local."${deps.ignore."0.4.7".thread_local}".default = true; - walkdir."${deps.ignore."0.4.7".walkdir}".default = true; - winapi_util."${deps.ignore."0.4.7".winapi_util}".default = true; - }) [ - (features_.crossbeam_channel."${deps."ignore"."0.4.7"."crossbeam_channel"}" deps) - (features_.globset."${deps."ignore"."0.4.7"."globset"}" deps) - (features_.lazy_static."${deps."ignore"."0.4.7"."lazy_static"}" deps) - (features_.log."${deps."ignore"."0.4.7"."log"}" deps) - (features_.memchr."${deps."ignore"."0.4.7"."memchr"}" deps) - (features_.regex."${deps."ignore"."0.4.7"."regex"}" deps) - (features_.same_file."${deps."ignore"."0.4.7"."same_file"}" deps) - (features_.thread_local."${deps."ignore"."0.4.7"."thread_local"}" deps) - (features_.walkdir."${deps."ignore"."0.4.7"."walkdir"}" deps) - (features_.winapi_util."${deps."ignore"."0.4.7"."winapi_util"}" deps) - ]; - - -# end -# im-rc-12.3.4 - - crates.im_rc."12.3.4" = deps: { features?(features_.im_rc."12.3.4" deps {}) }: buildRustCrate { - crateName = "im-rc"; - version = "12.3.4"; - description = "Immutable collection datatypes (the fast but not thread safe version)"; - authors = [ "Bodil Stokke " ]; - edition = "2018"; - sha256 = "0l53vjm7ycccb0lxj1zpgvlik5rpngnf9gggvgb3jbdv2jxjkdhz"; - libPath = "./src/lib.rs"; - build = "./build.rs"; - dependencies = mapFeatures features ([ - (crates."sized_chunks"."${deps."im_rc"."12.3.4"."sized_chunks"}" deps) - (crates."typenum"."${deps."im_rc"."12.3.4"."typenum"}" deps) - ]); - - buildDependencies = mapFeatures features ([ - (crates."rustc_version"."${deps."im_rc"."12.3.4"."rustc_version"}" deps) - ]); - }; - features_.im_rc."12.3.4" = deps: f: updateFeatures f ({ - im_rc."12.3.4".default = (f.im_rc."12.3.4".default or true); - rustc_version."${deps.im_rc."12.3.4".rustc_version}".default = true; - sized_chunks."${deps.im_rc."12.3.4".sized_chunks}".default = true; - typenum."${deps.im_rc."12.3.4".typenum}".default = true; - }) [ - (features_.sized_chunks."${deps."im_rc"."12.3.4"."sized_chunks"}" deps) - (features_.typenum."${deps."im_rc"."12.3.4"."typenum"}" deps) - (features_.rustc_version."${deps."im_rc"."12.3.4"."rustc_version"}" deps) - ]; - - -# end -# iovec-0.1.2 - - crates.iovec."0.1.2" = deps: { features?(features_.iovec."0.1.2" deps {}) }: buildRustCrate { - crateName = "iovec"; - version = "0.1.2"; - description = "Portable buffer type for scatter/gather I/O operations\n"; - authors = [ "Carl Lerche " ]; - sha256 = "0vjymmb7wj4v4kza5jjn48fcdb85j3k37y7msjl3ifz0p9yiyp2r"; - dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."iovec"."0.1.2"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."iovec"."0.1.2"."winapi"}" deps) - ]) else []); - }; - features_.iovec."0.1.2" = deps: f: updateFeatures f ({ - iovec."0.1.2".default = (f.iovec."0.1.2".default or true); - libc."${deps.iovec."0.1.2".libc}".default = true; - winapi."${deps.iovec."0.1.2".winapi}".default = true; - }) [ - (features_.libc."${deps."iovec"."0.1.2"."libc"}" deps) - (features_.winapi."${deps."iovec"."0.1.2"."winapi"}" deps) - ]; - - -# end -# itertools-0.7.11 - - crates.itertools."0.7.11" = deps: { features?(features_.itertools."0.7.11" deps {}) }: buildRustCrate { - crateName = "itertools"; - version = "0.7.11"; - description = "Extra iterator adaptors, iterator methods, free functions, and macros."; - authors = [ "bluss" ]; - sha256 = "0gavmkvn2c3cwfwk5zl5p7saiqn4ww227am5ykn6pgfm7c6ppz56"; - dependencies = mapFeatures features ([ - (crates."either"."${deps."itertools"."0.7.11"."either"}" deps) - ]); - features = mkFeatures (features."itertools"."0.7.11" or {}); - }; - features_.itertools."0.7.11" = deps: f: updateFeatures f (rec { - either."${deps.itertools."0.7.11".either}".default = (f.either."${deps.itertools."0.7.11".either}".default or false); - itertools = fold recursiveUpdate {} [ - { "0.7.11"."use_std" = - (f.itertools."0.7.11"."use_std" or false) || - (f.itertools."0.7.11".default or false) || - (itertools."0.7.11"."default" or false); } - { "0.7.11".default = (f.itertools."0.7.11".default or true); } - ]; - }) [ - (features_.either."${deps."itertools"."0.7.11"."either"}" deps) - ]; - - -# end -# jobserver-0.1.13 - - crates.jobserver."0.1.13" = deps: { features?(features_.jobserver."0.1.13" deps {}) }: buildRustCrate { - crateName = "jobserver"; - version = "0.1.13"; - description = "An implementation of the GNU make jobserver for Rust\n"; - authors = [ "Alex Crichton " ]; - sha256 = "01h08h0k9i7cvlnlw53jf398d03k5kxrs7m30xl7h9s5dlw0vi9i"; - dependencies = mapFeatures features ([ - (crates."log"."${deps."jobserver"."0.1.13"."log"}" deps) - ]) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."jobserver"."0.1.13"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."rand"."${deps."jobserver"."0.1.13"."rand"}" deps) - ]) else []); - }; - features_.jobserver."0.1.13" = deps: f: updateFeatures f ({ - jobserver."0.1.13".default = (f.jobserver."0.1.13".default or true); - libc."${deps.jobserver."0.1.13".libc}".default = true; - log."${deps.jobserver."0.1.13".log}".default = true; - rand."${deps.jobserver."0.1.13".rand}".default = true; - }) [ - (features_.log."${deps."jobserver"."0.1.13"."log"}" deps) - (features_.libc."${deps."jobserver"."0.1.13"."libc"}" deps) - (features_.rand."${deps."jobserver"."0.1.13"."rand"}" deps) - ]; - - -# end -# kernel32-sys-0.2.2 - - crates.kernel32_sys."0.2.2" = deps: { features?(features_.kernel32_sys."0.2.2" deps {}) }: buildRustCrate { - crateName = "kernel32-sys"; - version = "0.2.2"; - description = "Contains function definitions for the Windows API library kernel32. See winapi for types and constants."; - authors = [ "Peter Atashian " ]; - sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; - libName = "kernel32"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."winapi"."${deps."kernel32_sys"."0.2.2"."winapi"}" deps) - ]); - - buildDependencies = mapFeatures features ([ - (crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps) - ]); - }; - features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f ({ - kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true); - winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true; - winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true; - }) [ - (features_.winapi."${deps."kernel32_sys"."0.2.2"."winapi"}" deps) - (features_.winapi_build."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps) - ]; - - -# end -# lazycell-1.2.1 - - crates.lazycell."1.2.1" = deps: { features?(features_.lazycell."1.2.1" deps {}) }: buildRustCrate { - crateName = "lazycell"; - version = "1.2.1"; - description = "A library providing a lazily filled Cell struct"; - authors = [ "Alex Crichton " "Nikita Pekin " ]; - sha256 = "1m4h2q9rgxrgc7xjnws1x81lrb68jll8w3pykx1a9bhr29q2mcwm"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."lazycell"."1.2.1" or {}); - }; - features_.lazycell."1.2.1" = deps: f: updateFeatures f (rec { - lazycell = fold recursiveUpdate {} [ - { "1.2.1"."clippy" = - (f.lazycell."1.2.1"."clippy" or false) || - (f.lazycell."1.2.1".nightly-testing or false) || - (lazycell."1.2.1"."nightly-testing" or false); } - { "1.2.1"."nightly" = - (f.lazycell."1.2.1"."nightly" or false) || - (f.lazycell."1.2.1".nightly-testing or false) || - (lazycell."1.2.1"."nightly-testing" or false); } - { "1.2.1".default = (f.lazycell."1.2.1".default or true); } - ]; - }) []; - - -# end -# libc-0.2.51 - - crates.libc."0.2.51" = deps: { features?(features_.libc."0.2.51" deps {}) }: buildRustCrate { - crateName = "libc"; - version = "0.2.51"; - description = "Raw FFI bindings to platform libraries like libc.\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1lzavxj1ymm7vghs6nmzq9shprdlqby73py9k30gwvv0dwy365cv"; - build = "build.rs"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."libc"."0.2.51" or {}); - }; - features_.libc."0.2.51" = deps: f: updateFeatures f (rec { - libc = fold recursiveUpdate {} [ - { "0.2.51"."align" = - (f.libc."0.2.51"."align" or false) || - (f.libc."0.2.51".rustc-dep-of-std or false) || - (libc."0.2.51"."rustc-dep-of-std" or false); } - { "0.2.51"."rustc-std-workspace-core" = - (f.libc."0.2.51"."rustc-std-workspace-core" or false) || - (f.libc."0.2.51".rustc-dep-of-std or false) || - (libc."0.2.51"."rustc-dep-of-std" or false); } - { "0.2.51"."use_std" = - (f.libc."0.2.51"."use_std" or false) || - (f.libc."0.2.51".default or false) || - (libc."0.2.51"."default" or false); } - { "0.2.51".default = (f.libc."0.2.51".default or true); } - ]; - }) []; - - -# end -# libgit2-sys-0.7.11 - - crates.libgit2_sys."0.7.11" = deps: { features?(features_.libgit2_sys."0.7.11" deps {}) }: buildRustCrate { - crateName = "libgit2-sys"; - version = "0.7.11"; - description = "Native bindings to the libgit2 library"; - authors = [ "Alex Crichton " ]; - sha256 = "12wyfl7xl7lpz65s17j5rf9xfkn461792f67jqsz0ign3daaac9h"; - libPath = "lib.rs"; - libName = "libgit2_sys"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."libgit2_sys"."0.7.11"."libc"}" deps) - (crates."libz_sys"."${deps."libgit2_sys"."0.7.11"."libz_sys"}" deps) - ] - ++ (if features.libgit2_sys."0.7.11".curl-sys or false then [ (crates.curl_sys."${deps."libgit2_sys"."0.7.11".curl_sys}" deps) ] else []) - ++ (if features.libgit2_sys."0.7.11".libssh2-sys or false then [ (crates.libssh2_sys."${deps."libgit2_sys"."0.7.11".libssh2_sys}" deps) ] else [])) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - ] - ++ (if features.libgit2_sys."0.7.11".openssl-sys or false then [ (crates.openssl_sys."${deps."libgit2_sys"."0.7.11".openssl_sys}" deps) ] else [])) else []); - - buildDependencies = mapFeatures features ([ - (crates."cc"."${deps."libgit2_sys"."0.7.11"."cc"}" deps) - (crates."pkg_config"."${deps."libgit2_sys"."0.7.11"."pkg_config"}" deps) - ]); - features = mkFeatures (features."libgit2_sys"."0.7.11" or {}); - }; - features_.libgit2_sys."0.7.11" = deps: f: updateFeatures f (rec { - cc."${deps.libgit2_sys."0.7.11".cc}".default = true; - curl_sys."${deps.libgit2_sys."0.7.11".curl_sys}".default = true; - libc."${deps.libgit2_sys."0.7.11".libc}".default = true; - libgit2_sys = fold recursiveUpdate {} [ - { "0.7.11"."curl-sys" = - (f.libgit2_sys."0.7.11"."curl-sys" or false) || - (f.libgit2_sys."0.7.11".curl or false) || - (libgit2_sys."0.7.11"."curl" or false); } - { "0.7.11"."libssh2-sys" = - (f.libgit2_sys."0.7.11"."libssh2-sys" or false) || - (f.libgit2_sys."0.7.11".ssh or false) || - (libgit2_sys."0.7.11"."ssh" or false); } - { "0.7.11"."openssl-sys" = - (f.libgit2_sys."0.7.11"."openssl-sys" or false) || - (f.libgit2_sys."0.7.11".https or false) || - (libgit2_sys."0.7.11"."https" or false); } - { "0.7.11".default = (f.libgit2_sys."0.7.11".default or true); } - ]; - libssh2_sys."${deps.libgit2_sys."0.7.11".libssh2_sys}".default = true; - libz_sys."${deps.libgit2_sys."0.7.11".libz_sys}".default = true; - openssl_sys."${deps.libgit2_sys."0.7.11".openssl_sys}".default = true; - pkg_config."${deps.libgit2_sys."0.7.11".pkg_config}".default = true; - }) [ - (features_.curl_sys."${deps."libgit2_sys"."0.7.11"."curl_sys"}" deps) - (features_.libc."${deps."libgit2_sys"."0.7.11"."libc"}" deps) - (features_.libssh2_sys."${deps."libgit2_sys"."0.7.11"."libssh2_sys"}" deps) - (features_.libz_sys."${deps."libgit2_sys"."0.7.11"."libz_sys"}" deps) - (features_.cc."${deps."libgit2_sys"."0.7.11"."cc"}" deps) - (features_.pkg_config."${deps."libgit2_sys"."0.7.11"."pkg_config"}" deps) - (features_.openssl_sys."${deps."libgit2_sys"."0.7.11"."openssl_sys"}" deps) - ]; - - -# end -# libnghttp2-sys-0.1.1 - - crates.libnghttp2_sys."0.1.1" = deps: { features?(features_.libnghttp2_sys."0.1.1" deps {}) }: buildRustCrate { - crateName = "libnghttp2-sys"; - version = "0.1.1"; - description = "FFI bindings for libnghttp2 (nghttp2)\n"; - authors = [ "Alex Crichton " ]; - sha256 = "08z41i7d8pm0jzv6p77kp22hh0a4psdy109n6nxr8x2k1ibjxk8w"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."libnghttp2_sys"."0.1.1"."libc"}" deps) - ]); - - buildDependencies = mapFeatures features ([ - (crates."cc"."${deps."libnghttp2_sys"."0.1.1"."cc"}" deps) - ]); - }; - features_.libnghttp2_sys."0.1.1" = deps: f: updateFeatures f ({ - cc."${deps.libnghttp2_sys."0.1.1".cc}".default = true; - libc."${deps.libnghttp2_sys."0.1.1".libc}".default = true; - libnghttp2_sys."0.1.1".default = (f.libnghttp2_sys."0.1.1".default or true); - }) [ - (features_.libc."${deps."libnghttp2_sys"."0.1.1"."libc"}" deps) - (features_.cc."${deps."libnghttp2_sys"."0.1.1"."cc"}" deps) - ]; - - -# end -# libssh2-sys-0.2.11 - - crates.libssh2_sys."0.2.11" = deps: { features?(features_.libssh2_sys."0.2.11" deps {}) }: buildRustCrate { - crateName = "libssh2-sys"; - version = "0.2.11"; - description = "Native bindings to the libssh2 library"; - authors = [ "Alex Crichton " ]; - sha256 = "1mjily9qjjjf31pzvlxyqnp1midjc77s6sd303j46d14igna7nhi"; - libPath = "lib.rs"; - libName = "libssh2_sys"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."libssh2_sys"."0.2.11"."libc"}" deps) - (crates."libz_sys"."${deps."libssh2_sys"."0.2.11"."libz_sys"}" deps) - ]) - ++ (if abi == "msvc" then mapFeatures features ([ -]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."openssl_sys"."${deps."libssh2_sys"."0.2.11"."openssl_sys"}" deps) - ]) else []); - - buildDependencies = mapFeatures features ([ - (crates."cc"."${deps."libssh2_sys"."0.2.11"."cc"}" deps) - (crates."pkg_config"."${deps."libssh2_sys"."0.2.11"."pkg_config"}" deps) - ]); - }; - features_.libssh2_sys."0.2.11" = deps: f: updateFeatures f ({ - cc."${deps.libssh2_sys."0.2.11".cc}".default = true; - libc."${deps.libssh2_sys."0.2.11".libc}".default = true; - libssh2_sys."0.2.11".default = (f.libssh2_sys."0.2.11".default or true); - libz_sys."${deps.libssh2_sys."0.2.11".libz_sys}".default = true; - openssl_sys."${deps.libssh2_sys."0.2.11".openssl_sys}".default = true; - pkg_config."${deps.libssh2_sys."0.2.11".pkg_config}".default = true; - }) [ - (features_.libc."${deps."libssh2_sys"."0.2.11"."libc"}" deps) - (features_.libz_sys."${deps."libssh2_sys"."0.2.11"."libz_sys"}" deps) - (features_.cc."${deps."libssh2_sys"."0.2.11"."cc"}" deps) - (features_.pkg_config."${deps."libssh2_sys"."0.2.11"."pkg_config"}" deps) - (features_.openssl_sys."${deps."libssh2_sys"."0.2.11"."openssl_sys"}" deps) - ]; - - -# end -# libz-sys-1.0.25 - - crates.libz_sys."1.0.25" = deps: { features?(features_.libz_sys."1.0.25" deps {}) }: buildRustCrate { - crateName = "libz-sys"; - version = "1.0.25"; - description = "Bindings to the system libz library (also known as zlib).\n"; - authors = [ "Alex Crichton " ]; - sha256 = "195jzg8mgjbvmkbpx1rzkzrqm0g2fdivk79v44c9lzl64r3f9fym"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."libz_sys"."1.0.25"."libc"}" deps) - ]) - ++ (if abi == "msvc" then mapFeatures features ([ -]) else []); - - buildDependencies = mapFeatures features ([ - (crates."cc"."${deps."libz_sys"."1.0.25"."cc"}" deps) - (crates."pkg_config"."${deps."libz_sys"."1.0.25"."pkg_config"}" deps) - ]); - features = mkFeatures (features."libz_sys"."1.0.25" or {}); - }; - features_.libz_sys."1.0.25" = deps: f: updateFeatures f ({ - cc."${deps.libz_sys."1.0.25".cc}".default = true; - libc."${deps.libz_sys."1.0.25".libc}".default = true; - libz_sys."1.0.25".default = (f.libz_sys."1.0.25".default or true); - pkg_config."${deps.libz_sys."1.0.25".pkg_config}".default = true; - }) [ - (features_.libc."${deps."libz_sys"."1.0.25"."libc"}" deps) - (features_.cc."${deps."libz_sys"."1.0.25"."cc"}" deps) - (features_.pkg_config."${deps."libz_sys"."1.0.25"."pkg_config"}" deps) - ]; - - -# end -# lock_api-0.1.5 - - crates.lock_api."0.1.5" = deps: { features?(features_.lock_api."0.1.5" deps {}) }: buildRustCrate { - crateName = "lock_api"; - version = "0.1.5"; - description = "Wrappers to create fully-featured Mutex and RwLock types. Compatible with no_std."; - authors = [ "Amanieu d'Antras " ]; - sha256 = "132sidr5hvjfkaqm3l95zpcpi8yk5ddd0g79zf1ad4v65sxirqqm"; - dependencies = mapFeatures features ([ - (crates."scopeguard"."${deps."lock_api"."0.1.5"."scopeguard"}" deps) - ]); - features = mkFeatures (features."lock_api"."0.1.5" or {}); - }; - features_.lock_api."0.1.5" = deps: f: updateFeatures f ({ - lock_api."0.1.5".default = (f.lock_api."0.1.5".default or true); - scopeguard."${deps.lock_api."0.1.5".scopeguard}".default = (f.scopeguard."${deps.lock_api."0.1.5".scopeguard}".default or false); - }) [ - (features_.scopeguard."${deps."lock_api"."0.1.5"."scopeguard"}" deps) - ]; - - -# end -# matrixmultiply-0.1.15 - - crates.matrixmultiply."0.1.15" = deps: { features?(features_.matrixmultiply."0.1.15" deps {}) }: buildRustCrate { - crateName = "matrixmultiply"; - version = "0.1.15"; - description = "General matrix multiplication of f32 and f64 matrices in Rust. Supports matrices with general strides. Uses a microkernel strategy, so that the implementation is easy to parallelize and optimize. `RUSTFLAGS=\"-C target-cpu=native\"` is your friend here."; - authors = [ "bluss" ]; - sha256 = "0ix1i4lnkfqnzv8f9wr34bf0mlr1sx5hr7yr70k4npxmwxscvdj5"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."rawpointer"."${deps."matrixmultiply"."0.1.15"."rawpointer"}" deps) - ]); - }; - features_.matrixmultiply."0.1.15" = deps: f: updateFeatures f ({ - matrixmultiply."0.1.15".default = (f.matrixmultiply."0.1.15".default or true); - rawpointer."${deps.matrixmultiply."0.1.15".rawpointer}".default = true; - }) [ - (features_.rawpointer."${deps."matrixmultiply"."0.1.15"."rawpointer"}" deps) - ]; - - -# end -# miniz-sys-0.1.11 - - crates.miniz_sys."0.1.11" = deps: { features?(features_.miniz_sys."0.1.11" deps {}) }: buildRustCrate { - crateName = "miniz-sys"; - version = "0.1.11"; - description = "Bindings to the miniz.c library.\n"; - authors = [ "Alex Crichton " ]; - sha256 = "0l2wsakqjj7kc06dwxlpz4h8wih0f9d1idrz5gb1svipvh81khsm"; - libPath = "lib.rs"; - libName = "miniz_sys"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."miniz_sys"."0.1.11"."libc"}" deps) - ]); - - buildDependencies = mapFeatures features ([ - (crates."cc"."${deps."miniz_sys"."0.1.11"."cc"}" deps) - ]); - }; - features_.miniz_sys."0.1.11" = deps: f: updateFeatures f ({ - cc."${deps.miniz_sys."0.1.11".cc}".default = true; - libc."${deps.miniz_sys."0.1.11".libc}".default = true; - miniz_sys."0.1.11".default = (f.miniz_sys."0.1.11".default or true); - }) [ - (features_.libc."${deps."miniz_sys"."0.1.11"."libc"}" deps) - (features_.cc."${deps."miniz_sys"."0.1.11"."cc"}" deps) - ]; - - -# end -# miniz_oxide-0.2.1 - - crates.miniz_oxide."0.2.1" = deps: { features?(features_.miniz_oxide."0.2.1" deps {}) }: buildRustCrate { - crateName = "miniz_oxide"; - version = "0.2.1"; - description = "DEFLATE compression and decompression library rewritten in Rust based on miniz"; - authors = [ "Frommi " ]; - sha256 = "1ly14vlk0gq7czi1323l2dsy5y8dpvdwld4h9083i0y3hx9iyfdz"; - dependencies = mapFeatures features ([ - (crates."adler32"."${deps."miniz_oxide"."0.2.1"."adler32"}" deps) - ]); - }; - features_.miniz_oxide."0.2.1" = deps: f: updateFeatures f ({ - adler32."${deps.miniz_oxide."0.2.1".adler32}".default = true; - miniz_oxide."0.2.1".default = (f.miniz_oxide."0.2.1".default or true); - }) [ - (features_.adler32."${deps."miniz_oxide"."0.2.1"."adler32"}" deps) - ]; - - -# end -# miniz_oxide_c_api-0.2.1 - - crates.miniz_oxide_c_api."0.2.1" = deps: { features?(features_.miniz_oxide_c_api."0.2.1" deps {}) }: buildRustCrate { - crateName = "miniz_oxide_c_api"; - version = "0.2.1"; - description = "DEFLATE compression and decompression API designed to be Rust drop-in replacement for miniz"; - authors = [ "Frommi " ]; - sha256 = "1zsk334nhy2rvyhbr0815l0gp6w40al6rxxafkycaafx3m9j8cj2"; - build = "src/build.rs"; - dependencies = mapFeatures features ([ - (crates."crc"."${deps."miniz_oxide_c_api"."0.2.1"."crc"}" deps) - (crates."libc"."${deps."miniz_oxide_c_api"."0.2.1"."libc"}" deps) - (crates."miniz_oxide"."${deps."miniz_oxide_c_api"."0.2.1"."miniz_oxide"}" deps) - ]); - - buildDependencies = mapFeatures features ([ - (crates."cc"."${deps."miniz_oxide_c_api"."0.2.1"."cc"}" deps) - ]); - features = mkFeatures (features."miniz_oxide_c_api"."0.2.1" or {}); - }; - features_.miniz_oxide_c_api."0.2.1" = deps: f: updateFeatures f (rec { - cc."${deps.miniz_oxide_c_api."0.2.1".cc}".default = true; - crc."${deps.miniz_oxide_c_api."0.2.1".crc}".default = true; - libc."${deps.miniz_oxide_c_api."0.2.1".libc}".default = true; - miniz_oxide."${deps.miniz_oxide_c_api."0.2.1".miniz_oxide}".default = true; - miniz_oxide_c_api = fold recursiveUpdate {} [ - { "0.2.1"."build_orig_miniz" = - (f.miniz_oxide_c_api."0.2.1"."build_orig_miniz" or false) || - (f.miniz_oxide_c_api."0.2.1".benching or false) || - (miniz_oxide_c_api."0.2.1"."benching" or false) || - (f.miniz_oxide_c_api."0.2.1".fuzzing or false) || - (miniz_oxide_c_api."0.2.1"."fuzzing" or false); } - { "0.2.1"."build_stub_miniz" = - (f.miniz_oxide_c_api."0.2.1"."build_stub_miniz" or false) || - (f.miniz_oxide_c_api."0.2.1".miniz_zip or false) || - (miniz_oxide_c_api."0.2.1"."miniz_zip" or false); } - { "0.2.1"."no_c_export" = - (f.miniz_oxide_c_api."0.2.1"."no_c_export" or false) || - (f.miniz_oxide_c_api."0.2.1".benching or false) || - (miniz_oxide_c_api."0.2.1"."benching" or false) || - (f.miniz_oxide_c_api."0.2.1".fuzzing or false) || - (miniz_oxide_c_api."0.2.1"."fuzzing" or false); } - { "0.2.1".default = (f.miniz_oxide_c_api."0.2.1".default or true); } - ]; - }) [ - (features_.crc."${deps."miniz_oxide_c_api"."0.2.1"."crc"}" deps) - (features_.libc."${deps."miniz_oxide_c_api"."0.2.1"."libc"}" deps) - (features_.miniz_oxide."${deps."miniz_oxide_c_api"."0.2.1"."miniz_oxide"}" deps) - (features_.cc."${deps."miniz_oxide_c_api"."0.2.1"."cc"}" deps) - ]; - - -# end -# miow-0.3.3 - - crates.miow."0.3.3" = deps: { features?(features_.miow."0.3.3" deps {}) }: buildRustCrate { - crateName = "miow"; - version = "0.3.3"; - description = "A zero overhead I/O library for Windows, focusing on IOCP and Async I/O\nabstractions.\n"; - authors = [ "Alex Crichton " ]; - sha256 = "1mlk5mn00cl6bmf8qlpc6r85dxf4l45vbkbzshsr1mrkb3hn1j57"; - dependencies = mapFeatures features ([ - (crates."socket2"."${deps."miow"."0.3.3"."socket2"}" deps) - (crates."winapi"."${deps."miow"."0.3.3"."winapi"}" deps) - ]); - }; - features_.miow."0.3.3" = deps: f: updateFeatures f ({ - miow."0.3.3".default = (f.miow."0.3.3".default or true); - socket2."${deps.miow."0.3.3".socket2}".default = true; - winapi = fold recursiveUpdate {} [ - { "${deps.miow."0.3.3".winapi}"."fileapi" = true; } - { "${deps.miow."0.3.3".winapi}"."handleapi" = true; } - { "${deps.miow."0.3.3".winapi}"."ioapiset" = true; } - { "${deps.miow."0.3.3".winapi}"."minwindef" = true; } - { "${deps.miow."0.3.3".winapi}"."namedpipeapi" = true; } - { "${deps.miow."0.3.3".winapi}"."ntdef" = true; } - { "${deps.miow."0.3.3".winapi}"."std" = true; } - { "${deps.miow."0.3.3".winapi}"."synchapi" = true; } - { "${deps.miow."0.3.3".winapi}"."winerror" = true; } - { "${deps.miow."0.3.3".winapi}"."winsock2" = true; } - { "${deps.miow."0.3.3".winapi}"."ws2def" = true; } - { "${deps.miow."0.3.3".winapi}"."ws2ipdef" = true; } - { "${deps.miow."0.3.3".winapi}".default = true; } - ]; - }) [ - (features_.socket2."${deps."miow"."0.3.3"."socket2"}" deps) - (features_.winapi."${deps."miow"."0.3.3"."winapi"}" deps) - ]; - - -# end -# ndarray-0.12.1 - - crates.ndarray."0.12.1" = deps: { features?(features_.ndarray."0.12.1" deps {}) }: buildRustCrate { - crateName = "ndarray"; - version = "0.12.1"; - description = "An n-dimensional array for general elements and for numerics. Lightweight array views and slicing; views support chunking and splitting."; - authors = [ "bluss" "Jim Turner" ]; - sha256 = "13708k97kdjfj6g4z1yapjln0v4m7zj0114h8snw44fj79l00346"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."itertools"."${deps."ndarray"."0.12.1"."itertools"}" deps) - (crates."matrixmultiply"."${deps."ndarray"."0.12.1"."matrixmultiply"}" deps) - (crates."num_complex"."${deps."ndarray"."0.12.1"."num_complex"}" deps) - (crates."num_traits"."${deps."ndarray"."0.12.1"."num_traits"}" deps) - ]); - features = mkFeatures (features."ndarray"."0.12.1" or {}); - }; - features_.ndarray."0.12.1" = deps: f: updateFeatures f (rec { - itertools."${deps.ndarray."0.12.1".itertools}".default = (f.itertools."${deps.ndarray."0.12.1".itertools}".default or false); - matrixmultiply."${deps.ndarray."0.12.1".matrixmultiply}".default = true; - ndarray = fold recursiveUpdate {} [ - { "0.12.1"."blas" = - (f.ndarray."0.12.1"."blas" or false) || - (f.ndarray."0.12.1".test-blas-openblas-sys or false) || - (ndarray."0.12.1"."test-blas-openblas-sys" or false); } - { "0.12.1"."blas-src" = - (f.ndarray."0.12.1"."blas-src" or false) || - (f.ndarray."0.12.1".blas or false) || - (ndarray."0.12.1"."blas" or false); } - { "0.12.1"."cblas-sys" = - (f.ndarray."0.12.1"."cblas-sys" or false) || - (f.ndarray."0.12.1".blas or false) || - (ndarray."0.12.1"."blas" or false); } - { "0.12.1"."rustc-serialize" = - (f.ndarray."0.12.1"."rustc-serialize" or false) || - (f.ndarray."0.12.1".docs or false) || - (ndarray."0.12.1"."docs" or false); } - { "0.12.1"."serde" = - (f.ndarray."0.12.1"."serde" or false) || - (f.ndarray."0.12.1".serde-1 or false) || - (ndarray."0.12.1"."serde-1" or false); } - { "0.12.1"."serde-1" = - (f.ndarray."0.12.1"."serde-1" or false) || - (f.ndarray."0.12.1".docs or false) || - (ndarray."0.12.1"."docs" or false); } - { "0.12.1"."test-blas-openblas-sys" = - (f.ndarray."0.12.1"."test-blas-openblas-sys" or false) || - (f.ndarray."0.12.1".test or false) || - (ndarray."0.12.1"."test" or false); } - { "0.12.1".default = (f.ndarray."0.12.1".default or true); } - ]; - num_complex."${deps.ndarray."0.12.1".num_complex}".default = true; - num_traits."${deps.ndarray."0.12.1".num_traits}".default = true; - }) [ - (features_.itertools."${deps."ndarray"."0.12.1"."itertools"}" deps) - (features_.matrixmultiply."${deps."ndarray"."0.12.1"."matrixmultiply"}" deps) - (features_.num_complex."${deps."ndarray"."0.12.1"."num_complex"}" deps) - (features_.num_traits."${deps."ndarray"."0.12.1"."num_traits"}" deps) - ]; - - -# end -# num-complex-0.2.1 - - crates.num_complex."0.2.1" = deps: { features?(features_.num_complex."0.2.1" deps {}) }: buildRustCrate { - crateName = "num-complex"; - version = "0.2.1"; - description = "Complex numbers implementation for Rust"; - authors = [ "The Rust Project Developers" ]; - sha256 = "12lpp62ahc80p33cpw2771l8bwl0q13rl5vq0jzkqib1l5z8q80z"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."num_traits"."${deps."num_complex"."0.2.1"."num_traits"}" deps) - ]); - features = mkFeatures (features."num_complex"."0.2.1" or {}); - }; - features_.num_complex."0.2.1" = deps: f: updateFeatures f (rec { - num_complex = fold recursiveUpdate {} [ - { "0.2.1"."std" = - (f.num_complex."0.2.1"."std" or false) || - (f.num_complex."0.2.1".default or false) || - (num_complex."0.2.1"."default" or false); } - { "0.2.1".default = (f.num_complex."0.2.1".default or true); } - ]; - num_traits = fold recursiveUpdate {} [ - { "${deps.num_complex."0.2.1".num_traits}"."i128" = - (f.num_traits."${deps.num_complex."0.2.1".num_traits}"."i128" or false) || - (num_complex."0.2.1"."i128" or false) || - (f."num_complex"."0.2.1"."i128" or false); } - { "${deps.num_complex."0.2.1".num_traits}"."std" = - (f.num_traits."${deps.num_complex."0.2.1".num_traits}"."std" or false) || - (num_complex."0.2.1"."std" or false) || - (f."num_complex"."0.2.1"."std" or false); } - { "${deps.num_complex."0.2.1".num_traits}".default = (f.num_traits."${deps.num_complex."0.2.1".num_traits}".default or false); } - ]; - }) [ - (features_.num_traits."${deps."num_complex"."0.2.1"."num_traits"}" deps) - ]; - - -# end -# num-traits-0.2.6 - - crates.num_traits."0.2.6" = deps: { features?(features_.num_traits."0.2.6" deps {}) }: buildRustCrate { - crateName = "num-traits"; - version = "0.2.6"; - description = "Numeric traits for generic mathematics"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1d20sil9n0wgznd1nycm3yjfj1mzyl41ambb7by1apxlyiil1azk"; - build = "build.rs"; - features = mkFeatures (features."num_traits"."0.2.6" or {}); - }; - features_.num_traits."0.2.6" = deps: f: updateFeatures f (rec { - num_traits = fold recursiveUpdate {} [ - { "0.2.6"."std" = - (f.num_traits."0.2.6"."std" or false) || - (f.num_traits."0.2.6".default or false) || - (num_traits."0.2.6"."default" or false); } - { "0.2.6".default = (f.num_traits."0.2.6".default or true); } - ]; - }) []; - - -# end -# num_cpus-1.10.0 - - crates.num_cpus."1.10.0" = deps: { features?(features_.num_cpus."1.10.0" deps {}) }: buildRustCrate { - crateName = "num_cpus"; - version = "1.10.0"; - description = "Get the number of CPUs on a machine."; - authors = [ "Sean McArthur " ]; - sha256 = "1411jyxy1wd8d59mv7cf6ynkvvar92czmwhb9l2c1brdkxbbiqn7"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."num_cpus"."1.10.0"."libc"}" deps) - ]); - }; - features_.num_cpus."1.10.0" = deps: f: updateFeatures f ({ - libc."${deps.num_cpus."1.10.0".libc}".default = true; - num_cpus."1.10.0".default = (f.num_cpus."1.10.0".default or true); - }) [ - (features_.libc."${deps."num_cpus"."1.10.0"."libc"}" deps) - ]; - - -# end -# once_cell-0.1.8 - - crates.once_cell."0.1.8" = deps: { features?(features_.once_cell."0.1.8" deps {}) }: buildRustCrate { - crateName = "once_cell"; - version = "0.1.8"; - description = "Single assignment cells and lazy static values without macros."; - authors = [ "Aleksey Kladov " ]; - sha256 = "1n1da1x3cf3qbq9a925pimy6i0r12gcicwqjxc63nfb2bnzkg074"; - dependencies = mapFeatures features ([ - ] - ++ (if features.once_cell."0.1.8".parking_lot or false then [ (crates.parking_lot."${deps."once_cell"."0.1.8".parking_lot}" deps) ] else [])); - features = mkFeatures (features."once_cell"."0.1.8" or {}); - }; - features_.once_cell."0.1.8" = deps: f: updateFeatures f (rec { - once_cell = fold recursiveUpdate {} [ - { "0.1.8"."parking_lot" = - (f.once_cell."0.1.8"."parking_lot" or false) || - (f.once_cell."0.1.8".default or false) || - (once_cell."0.1.8"."default" or false); } - { "0.1.8".default = (f.once_cell."0.1.8".default or true); } - ]; - parking_lot."${deps.once_cell."0.1.8".parking_lot}".default = true; - }) [ - (features_.parking_lot."${deps."once_cell"."0.1.8"."parking_lot"}" deps) - ]; - - -# end -# opener-0.3.2 - - crates.opener."0.3.2" = deps: { features?(features_.opener."0.3.2" deps {}) }: buildRustCrate { - crateName = "opener"; - version = "0.3.2"; - description = "Open a file or link using the system default program."; - authors = [ "Brian Bowman " ]; - sha256 = "1ql2snax07n3xxn4nz9r6d95rhrri66qy5s5zl9jfsdbs193hzcm"; - dependencies = mapFeatures features ([ - (crates."failure"."${deps."opener"."0.3.2"."failure"}" deps) - (crates."failure_derive"."${deps."opener"."0.3.2"."failure_derive"}" deps) - ]) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."opener"."0.3.2"."winapi"}" deps) - ]) else []); - }; - features_.opener."0.3.2" = deps: f: updateFeatures f ({ - failure."${deps.opener."0.3.2".failure}".default = true; - failure_derive."${deps.opener."0.3.2".failure_derive}".default = true; - opener."0.3.2".default = (f.opener."0.3.2".default or true); - winapi = fold recursiveUpdate {} [ - { "${deps.opener."0.3.2".winapi}"."shellapi" = true; } - { "${deps.opener."0.3.2".winapi}".default = true; } - ]; - }) [ - (features_.failure."${deps."opener"."0.3.2"."failure"}" deps) - (features_.failure_derive."${deps."opener"."0.3.2"."failure_derive"}" deps) - (features_.winapi."${deps."opener"."0.3.2"."winapi"}" deps) - ]; - - -# end -# openssl-0.10.20 - - crates.openssl."0.10.20" = deps: { features?(features_.openssl."0.10.20" deps {}) }: buildRustCrate { - crateName = "openssl"; - version = "0.10.20"; - description = "OpenSSL bindings"; - authors = [ "Steven Fackler " ]; - sha256 = "1y3zkq988vx48a4j0i23mr7vm1wy5w71yws2v6hyf4vb5iw3r5s5"; - dependencies = mapFeatures features ([ - (crates."bitflags"."${deps."openssl"."0.10.20"."bitflags"}" deps) - (crates."cfg_if"."${deps."openssl"."0.10.20"."cfg_if"}" deps) - (crates."foreign_types"."${deps."openssl"."0.10.20"."foreign_types"}" deps) - (crates."lazy_static"."${deps."openssl"."0.10.20"."lazy_static"}" deps) - (crates."libc"."${deps."openssl"."0.10.20"."libc"}" deps) - (crates."openssl_sys"."${deps."openssl"."0.10.20"."openssl_sys"}" deps) - ]); - features = mkFeatures (features."openssl"."0.10.20" or {}); - }; - features_.openssl."0.10.20" = deps: f: updateFeatures f (rec { - bitflags."${deps.openssl."0.10.20".bitflags}".default = true; - cfg_if."${deps.openssl."0.10.20".cfg_if}".default = true; - foreign_types."${deps.openssl."0.10.20".foreign_types}".default = true; - lazy_static."${deps.openssl."0.10.20".lazy_static}".default = true; - libc."${deps.openssl."0.10.20".libc}".default = true; - openssl."0.10.20".default = (f.openssl."0.10.20".default or true); - openssl_sys = fold recursiveUpdate {} [ - { "${deps.openssl."0.10.20".openssl_sys}"."vendored" = - (f.openssl_sys."${deps.openssl."0.10.20".openssl_sys}"."vendored" or false) || - (openssl."0.10.20"."vendored" or false) || - (f."openssl"."0.10.20"."vendored" or false); } - { "${deps.openssl."0.10.20".openssl_sys}".default = true; } - ]; - }) [ - (features_.bitflags."${deps."openssl"."0.10.20"."bitflags"}" deps) - (features_.cfg_if."${deps."openssl"."0.10.20"."cfg_if"}" deps) - (features_.foreign_types."${deps."openssl"."0.10.20"."foreign_types"}" deps) - (features_.lazy_static."${deps."openssl"."0.10.20"."lazy_static"}" deps) - (features_.libc."${deps."openssl"."0.10.20"."libc"}" deps) - (features_.openssl_sys."${deps."openssl"."0.10.20"."openssl_sys"}" deps) - ]; - - -# end -# openssl-probe-0.1.2 - - crates.openssl_probe."0.1.2" = deps: { features?(features_.openssl_probe."0.1.2" deps {}) }: buildRustCrate { - crateName = "openssl-probe"; - version = "0.1.2"; - description = "Tool for helping to find SSL certificate locations on the system for OpenSSL\n"; - authors = [ "Alex Crichton " ]; - sha256 = "1a89fznx26vvaxyrxdvgf6iwai5xvs6xjvpjin68fgvrslv6n15a"; - }; - features_.openssl_probe."0.1.2" = deps: f: updateFeatures f ({ - openssl_probe."0.1.2".default = (f.openssl_probe."0.1.2".default or true); - }) []; - - -# end -# openssl-src-111.2.1+1.1.1b - - crates.openssl_src."111.2.1+1.1.1b" = deps: { features?(features_.openssl_src."111.2.1+1.1.1b" deps {}) }: buildRustCrate { - crateName = "openssl-src"; - version = "111.2.1+1.1.1b"; - description = "Source of OpenSSL and logic to build it.\n"; - authors = [ "Alex Crichton " ]; - sha256 = "0gfa29r16ds88a3sjcgkc2q5dkhgnxk58gly313r05xqj4zi2pxc"; - dependencies = mapFeatures features ([ - (crates."cc"."${deps."openssl_src"."111.2.1+1.1.1b"."cc"}" deps) - ]); - }; - features_.openssl_src."111.2.1+1.1.1b" = deps: f: updateFeatures f ({ - cc."${deps.openssl_src."111.2.1+1.1.1b".cc}".default = true; - openssl_src."111.2.1+1.1.1b".default = (f.openssl_src."111.2.1+1.1.1b".default or true); - }) [ - (features_.cc."${deps."openssl_src"."111.2.1+1.1.1b"."cc"}" deps) - ]; - - -# end -# openssl-sys-0.9.43 - - crates.openssl_sys."0.9.43" = deps: { features?(features_.openssl_sys."0.9.43" deps {}) }: buildRustCrate { - crateName = "openssl-sys"; - version = "0.9.43"; - description = "FFI bindings to OpenSSL"; - authors = [ "Alex Crichton " "Steven Fackler " ]; - sha256 = "1ip0f94jakr85pxjhrkg9w9lgiiy1yga3ckm6c8xb13klsr7ky9y"; - build = "build/main.rs"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."openssl_sys"."0.9.43"."libc"}" deps) - ]) - ++ (if abi == "msvc" then mapFeatures features ([ -]) else []); - - buildDependencies = mapFeatures features ([ - (crates."cc"."${deps."openssl_sys"."0.9.43"."cc"}" deps) - (crates."pkg_config"."${deps."openssl_sys"."0.9.43"."pkg_config"}" deps) - (crates."rustc_version"."${deps."openssl_sys"."0.9.43"."rustc_version"}" deps) - ] - ++ (if features.openssl_sys."0.9.43".openssl-src or false then [ (crates.openssl_src."${deps."openssl_sys"."0.9.43".openssl_src}" deps) ] else [])); - features = mkFeatures (features."openssl_sys"."0.9.43" or {}); - }; - features_.openssl_sys."0.9.43" = deps: f: updateFeatures f (rec { - cc."${deps.openssl_sys."0.9.43".cc}".default = true; - libc."${deps.openssl_sys."0.9.43".libc}".default = true; - openssl_src."${deps.openssl_sys."0.9.43".openssl_src}".default = true; - openssl_sys = fold recursiveUpdate {} [ - { "0.9.43"."openssl-src" = - (f.openssl_sys."0.9.43"."openssl-src" or false) || - (f.openssl_sys."0.9.43".vendored or false) || - (openssl_sys."0.9.43"."vendored" or false); } - { "0.9.43".default = (f.openssl_sys."0.9.43".default or true); } - ]; - pkg_config."${deps.openssl_sys."0.9.43".pkg_config}".default = true; - rustc_version."${deps.openssl_sys."0.9.43".rustc_version}".default = true; - }) [ - (features_.libc."${deps."openssl_sys"."0.9.43"."libc"}" deps) - (features_.cc."${deps."openssl_sys"."0.9.43"."cc"}" deps) - (features_.openssl_src."${deps."openssl_sys"."0.9.43"."openssl_src"}" deps) - (features_.pkg_config."${deps."openssl_sys"."0.9.43"."pkg_config"}" deps) - (features_.rustc_version."${deps."openssl_sys"."0.9.43"."rustc_version"}" deps) - ]; - - -# end -# parking_lot-0.7.1 - - crates.parking_lot."0.7.1" = deps: { features?(features_.parking_lot."0.7.1" deps {}) }: buildRustCrate { - crateName = "parking_lot"; - version = "0.7.1"; - description = "More compact and efficient implementations of the standard synchronization primitives."; - authors = [ "Amanieu d'Antras " ]; - sha256 = "1qpb49xd176hqqabxdb48f1hvylfbf68rpz8yfrhw0x68ys0lkq1"; - dependencies = mapFeatures features ([ - (crates."lock_api"."${deps."parking_lot"."0.7.1"."lock_api"}" deps) - (crates."parking_lot_core"."${deps."parking_lot"."0.7.1"."parking_lot_core"}" deps) - ]); - features = mkFeatures (features."parking_lot"."0.7.1" or {}); - }; - features_.parking_lot."0.7.1" = deps: f: updateFeatures f (rec { - lock_api = fold recursiveUpdate {} [ - { "${deps.parking_lot."0.7.1".lock_api}"."nightly" = - (f.lock_api."${deps.parking_lot."0.7.1".lock_api}"."nightly" or false) || - (parking_lot."0.7.1"."nightly" or false) || - (f."parking_lot"."0.7.1"."nightly" or false); } - { "${deps.parking_lot."0.7.1".lock_api}"."owning_ref" = - (f.lock_api."${deps.parking_lot."0.7.1".lock_api}"."owning_ref" or false) || - (parking_lot."0.7.1"."owning_ref" or false) || - (f."parking_lot"."0.7.1"."owning_ref" or false); } - { "${deps.parking_lot."0.7.1".lock_api}".default = true; } - ]; - parking_lot = fold recursiveUpdate {} [ - { "0.7.1"."owning_ref" = - (f.parking_lot."0.7.1"."owning_ref" or false) || - (f.parking_lot."0.7.1".default or false) || - (parking_lot."0.7.1"."default" or false); } - { "0.7.1".default = (f.parking_lot."0.7.1".default or true); } - ]; - parking_lot_core = fold recursiveUpdate {} [ - { "${deps.parking_lot."0.7.1".parking_lot_core}"."deadlock_detection" = - (f.parking_lot_core."${deps.parking_lot."0.7.1".parking_lot_core}"."deadlock_detection" or false) || - (parking_lot."0.7.1"."deadlock_detection" or false) || - (f."parking_lot"."0.7.1"."deadlock_detection" or false); } - { "${deps.parking_lot."0.7.1".parking_lot_core}"."nightly" = - (f.parking_lot_core."${deps.parking_lot."0.7.1".parking_lot_core}"."nightly" or false) || - (parking_lot."0.7.1"."nightly" or false) || - (f."parking_lot"."0.7.1"."nightly" or false); } - { "${deps.parking_lot."0.7.1".parking_lot_core}".default = true; } - ]; - }) [ - (features_.lock_api."${deps."parking_lot"."0.7.1"."lock_api"}" deps) - (features_.parking_lot_core."${deps."parking_lot"."0.7.1"."parking_lot_core"}" deps) - ]; - - -# end -# parking_lot_core-0.4.0 - - crates.parking_lot_core."0.4.0" = deps: { features?(features_.parking_lot_core."0.4.0" deps {}) }: buildRustCrate { - crateName = "parking_lot_core"; - version = "0.4.0"; - description = "An advanced API for creating custom synchronization primitives."; - authors = [ "Amanieu d'Antras " ]; - sha256 = "1mzk5i240ddvhwnz65hhjk4cq61z235g1n8bd7al4mg6vx437c16"; - dependencies = mapFeatures features ([ - (crates."rand"."${deps."parking_lot_core"."0.4.0"."rand"}" deps) - (crates."smallvec"."${deps."parking_lot_core"."0.4.0"."smallvec"}" deps) - ]) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."parking_lot_core"."0.4.0"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."parking_lot_core"."0.4.0"."winapi"}" deps) - ]) else []); - - buildDependencies = mapFeatures features ([ - (crates."rustc_version"."${deps."parking_lot_core"."0.4.0"."rustc_version"}" deps) - ]); - features = mkFeatures (features."parking_lot_core"."0.4.0" or {}); - }; - features_.parking_lot_core."0.4.0" = deps: f: updateFeatures f (rec { - libc."${deps.parking_lot_core."0.4.0".libc}".default = true; - parking_lot_core = fold recursiveUpdate {} [ - { "0.4.0"."backtrace" = - (f.parking_lot_core."0.4.0"."backtrace" or false) || - (f.parking_lot_core."0.4.0".deadlock_detection or false) || - (parking_lot_core."0.4.0"."deadlock_detection" or false); } - { "0.4.0"."petgraph" = - (f.parking_lot_core."0.4.0"."petgraph" or false) || - (f.parking_lot_core."0.4.0".deadlock_detection or false) || - (parking_lot_core."0.4.0"."deadlock_detection" or false); } - { "0.4.0"."thread-id" = - (f.parking_lot_core."0.4.0"."thread-id" or false) || - (f.parking_lot_core."0.4.0".deadlock_detection or false) || - (parking_lot_core."0.4.0"."deadlock_detection" or false); } - { "0.4.0".default = (f.parking_lot_core."0.4.0".default or true); } - ]; - rand."${deps.parking_lot_core."0.4.0".rand}".default = true; - rustc_version."${deps.parking_lot_core."0.4.0".rustc_version}".default = true; - smallvec."${deps.parking_lot_core."0.4.0".smallvec}".default = true; - winapi = fold recursiveUpdate {} [ - { "${deps.parking_lot_core."0.4.0".winapi}"."errhandlingapi" = true; } - { "${deps.parking_lot_core."0.4.0".winapi}"."handleapi" = true; } - { "${deps.parking_lot_core."0.4.0".winapi}"."minwindef" = true; } - { "${deps.parking_lot_core."0.4.0".winapi}"."ntstatus" = true; } - { "${deps.parking_lot_core."0.4.0".winapi}"."winbase" = true; } - { "${deps.parking_lot_core."0.4.0".winapi}"."winerror" = true; } - { "${deps.parking_lot_core."0.4.0".winapi}"."winnt" = true; } - { "${deps.parking_lot_core."0.4.0".winapi}".default = true; } - ]; - }) [ - (features_.rand."${deps."parking_lot_core"."0.4.0"."rand"}" deps) - (features_.smallvec."${deps."parking_lot_core"."0.4.0"."smallvec"}" deps) - (features_.rustc_version."${deps."parking_lot_core"."0.4.0"."rustc_version"}" deps) - (features_.libc."${deps."parking_lot_core"."0.4.0"."libc"}" deps) - (features_.winapi."${deps."parking_lot_core"."0.4.0"."winapi"}" deps) - ]; - - -# end -# pkg-config-0.3.14 - - crates.pkg_config."0.3.14" = deps: { features?(features_.pkg_config."0.3.14" deps {}) }: buildRustCrate { - crateName = "pkg-config"; - version = "0.3.14"; - description = "A library to run the pkg-config system tool at build time in order to be used in\nCargo build scripts.\n"; - authors = [ "Alex Crichton " ]; - sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6"; - }; - features_.pkg_config."0.3.14" = deps: f: updateFeatures f ({ - pkg_config."0.3.14".default = (f.pkg_config."0.3.14".default or true); - }) []; - - -# end -# quote-0.6.12 - - crates.quote."0.6.12" = deps: { features?(features_.quote."0.6.12" deps {}) }: buildRustCrate { - crateName = "quote"; - version = "0.6.12"; - description = "Quasi-quoting macro quote!(...)"; - authors = [ "David Tolnay " ]; - sha256 = "1ckd2d2sy0hrwrqcr47dn0n3hyh7ygpc026l8xaycccyg27mihv9"; - dependencies = mapFeatures features ([ - (crates."proc_macro2"."${deps."quote"."0.6.12"."proc_macro2"}" deps) - ]); - features = mkFeatures (features."quote"."0.6.12" or {}); - }; - features_.quote."0.6.12" = deps: f: updateFeatures f (rec { - proc_macro2 = fold recursiveUpdate {} [ - { "${deps.quote."0.6.12".proc_macro2}"."proc-macro" = - (f.proc_macro2."${deps.quote."0.6.12".proc_macro2}"."proc-macro" or false) || - (quote."0.6.12"."proc-macro" or false) || - (f."quote"."0.6.12"."proc-macro" or false); } - { "${deps.quote."0.6.12".proc_macro2}".default = (f.proc_macro2."${deps.quote."0.6.12".proc_macro2}".default or false); } - ]; - quote = fold recursiveUpdate {} [ - { "0.6.12"."proc-macro" = - (f.quote."0.6.12"."proc-macro" or false) || - (f.quote."0.6.12".default or false) || - (quote."0.6.12"."default" or false); } - { "0.6.12".default = (f.quote."0.6.12".default or true); } - ]; - }) [ - (features_.proc_macro2."${deps."quote"."0.6.12"."proc_macro2"}" deps) - ]; - - -# end -# rand-0.6.5 - - crates.rand."0.6.5" = deps: { features?(features_.rand."0.6.5" deps {}) }: buildRustCrate { - crateName = "rand"; - version = "0.6.5"; - description = "Random number generators and other randomness functionality.\n"; - authors = [ "The Rand Project Developers" "The Rust Project Developers" ]; - sha256 = "0zbck48159aj8zrwzf80sd9xxh96w4f4968nshwjpysjvflimvgb"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."rand_chacha"."${deps."rand"."0.6.5"."rand_chacha"}" deps) - (crates."rand_core"."${deps."rand"."0.6.5"."rand_core"}" deps) - (crates."rand_hc"."${deps."rand"."0.6.5"."rand_hc"}" deps) - (crates."rand_isaac"."${deps."rand"."0.6.5"."rand_isaac"}" deps) - (crates."rand_jitter"."${deps."rand"."0.6.5"."rand_jitter"}" deps) - (crates."rand_pcg"."${deps."rand"."0.6.5"."rand_pcg"}" deps) - (crates."rand_xorshift"."${deps."rand"."0.6.5"."rand_xorshift"}" deps) - ] - ++ (if features.rand."0.6.5".rand_os or false then [ (crates.rand_os."${deps."rand"."0.6.5".rand_os}" deps) ] else [])) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."rand"."0.6.5"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."rand"."0.6.5"."winapi"}" deps) - ]) else []); - - buildDependencies = mapFeatures features ([ - (crates."autocfg"."${deps."rand"."0.6.5"."autocfg"}" deps) - ]); - features = mkFeatures (features."rand"."0.6.5" or {}); - }; - features_.rand."0.6.5" = deps: f: updateFeatures f (rec { - autocfg."${deps.rand."0.6.5".autocfg}".default = true; - libc."${deps.rand."0.6.5".libc}".default = (f.libc."${deps.rand."0.6.5".libc}".default or false); - rand = fold recursiveUpdate {} [ - { "0.6.5"."alloc" = - (f.rand."0.6.5"."alloc" or false) || - (f.rand."0.6.5".std or false) || - (rand."0.6.5"."std" or false); } - { "0.6.5"."packed_simd" = - (f.rand."0.6.5"."packed_simd" or false) || - (f.rand."0.6.5".simd_support or false) || - (rand."0.6.5"."simd_support" or false); } - { "0.6.5"."rand_os" = - (f.rand."0.6.5"."rand_os" or false) || - (f.rand."0.6.5".std or false) || - (rand."0.6.5"."std" or false); } - { "0.6.5"."simd_support" = - (f.rand."0.6.5"."simd_support" or false) || - (f.rand."0.6.5".nightly or false) || - (rand."0.6.5"."nightly" or false); } - { "0.6.5"."std" = - (f.rand."0.6.5"."std" or false) || - (f.rand."0.6.5".default or false) || - (rand."0.6.5"."default" or false); } - { "0.6.5".default = (f.rand."0.6.5".default or true); } - ]; - rand_chacha."${deps.rand."0.6.5".rand_chacha}".default = true; - rand_core = fold recursiveUpdate {} [ - { "${deps.rand."0.6.5".rand_core}"."alloc" = - (f.rand_core."${deps.rand."0.6.5".rand_core}"."alloc" or false) || - (rand."0.6.5"."alloc" or false) || - (f."rand"."0.6.5"."alloc" or false); } - { "${deps.rand."0.6.5".rand_core}"."serde1" = - (f.rand_core."${deps.rand."0.6.5".rand_core}"."serde1" or false) || - (rand."0.6.5"."serde1" or false) || - (f."rand"."0.6.5"."serde1" or false); } - { "${deps.rand."0.6.5".rand_core}"."std" = - (f.rand_core."${deps.rand."0.6.5".rand_core}"."std" or false) || - (rand."0.6.5"."std" or false) || - (f."rand"."0.6.5"."std" or false); } - { "${deps.rand."0.6.5".rand_core}".default = true; } - ]; - rand_hc."${deps.rand."0.6.5".rand_hc}".default = true; - rand_isaac = fold recursiveUpdate {} [ - { "${deps.rand."0.6.5".rand_isaac}"."serde1" = - (f.rand_isaac."${deps.rand."0.6.5".rand_isaac}"."serde1" or false) || - (rand."0.6.5"."serde1" or false) || - (f."rand"."0.6.5"."serde1" or false); } - { "${deps.rand."0.6.5".rand_isaac}".default = true; } - ]; - rand_jitter = fold recursiveUpdate {} [ - { "${deps.rand."0.6.5".rand_jitter}"."std" = - (f.rand_jitter."${deps.rand."0.6.5".rand_jitter}"."std" or false) || - (rand."0.6.5"."std" or false) || - (f."rand"."0.6.5"."std" or false); } - { "${deps.rand."0.6.5".rand_jitter}".default = true; } - ]; - rand_os = fold recursiveUpdate {} [ - { "${deps.rand."0.6.5".rand_os}"."stdweb" = - (f.rand_os."${deps.rand."0.6.5".rand_os}"."stdweb" or false) || - (rand."0.6.5"."stdweb" or false) || - (f."rand"."0.6.5"."stdweb" or false); } - { "${deps.rand."0.6.5".rand_os}"."wasm-bindgen" = - (f.rand_os."${deps.rand."0.6.5".rand_os}"."wasm-bindgen" or false) || - (rand."0.6.5"."wasm-bindgen" or false) || - (f."rand"."0.6.5"."wasm-bindgen" or false); } - { "${deps.rand."0.6.5".rand_os}".default = true; } - ]; - rand_pcg."${deps.rand."0.6.5".rand_pcg}".default = true; - rand_xorshift = fold recursiveUpdate {} [ - { "${deps.rand."0.6.5".rand_xorshift}"."serde1" = - (f.rand_xorshift."${deps.rand."0.6.5".rand_xorshift}"."serde1" or false) || - (rand."0.6.5"."serde1" or false) || - (f."rand"."0.6.5"."serde1" or false); } - { "${deps.rand."0.6.5".rand_xorshift}".default = true; } - ]; - winapi = fold recursiveUpdate {} [ - { "${deps.rand."0.6.5".winapi}"."minwindef" = true; } - { "${deps.rand."0.6.5".winapi}"."ntsecapi" = true; } - { "${deps.rand."0.6.5".winapi}"."profileapi" = true; } - { "${deps.rand."0.6.5".winapi}"."winnt" = true; } - { "${deps.rand."0.6.5".winapi}".default = true; } - ]; - }) [ - (features_.rand_chacha."${deps."rand"."0.6.5"."rand_chacha"}" deps) - (features_.rand_core."${deps."rand"."0.6.5"."rand_core"}" deps) - (features_.rand_hc."${deps."rand"."0.6.5"."rand_hc"}" deps) - (features_.rand_isaac."${deps."rand"."0.6.5"."rand_isaac"}" deps) - (features_.rand_jitter."${deps."rand"."0.6.5"."rand_jitter"}" deps) - (features_.rand_os."${deps."rand"."0.6.5"."rand_os"}" deps) - (features_.rand_pcg."${deps."rand"."0.6.5"."rand_pcg"}" deps) - (features_.rand_xorshift."${deps."rand"."0.6.5"."rand_xorshift"}" deps) - (features_.autocfg."${deps."rand"."0.6.5"."autocfg"}" deps) - (features_.libc."${deps."rand"."0.6.5"."libc"}" deps) - (features_.winapi."${deps."rand"."0.6.5"."winapi"}" deps) - ]; - - -# end -# rand_chacha-0.1.1 - - crates.rand_chacha."0.1.1" = deps: { features?(features_.rand_chacha."0.1.1" deps {}) }: buildRustCrate { - crateName = "rand_chacha"; - version = "0.1.1"; - description = "ChaCha random number generator\n"; - authors = [ "The Rand Project Developers" "The Rust Project Developers" ]; - sha256 = "0xnxm4mjd7wjnh18zxc1yickw58axbycp35ciraplqdfwn1gffwi"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."rand_core"."${deps."rand_chacha"."0.1.1"."rand_core"}" deps) - ]); - - buildDependencies = mapFeatures features ([ - (crates."autocfg"."${deps."rand_chacha"."0.1.1"."autocfg"}" deps) - ]); - }; - features_.rand_chacha."0.1.1" = deps: f: updateFeatures f ({ - autocfg."${deps.rand_chacha."0.1.1".autocfg}".default = true; - rand_chacha."0.1.1".default = (f.rand_chacha."0.1.1".default or true); - rand_core."${deps.rand_chacha."0.1.1".rand_core}".default = (f.rand_core."${deps.rand_chacha."0.1.1".rand_core}".default or false); - }) [ - (features_.rand_core."${deps."rand_chacha"."0.1.1"."rand_core"}" deps) - (features_.autocfg."${deps."rand_chacha"."0.1.1"."autocfg"}" deps) - ]; - - -# end -# rand_hc-0.1.0 - - crates.rand_hc."0.1.0" = deps: { features?(features_.rand_hc."0.1.0" deps {}) }: buildRustCrate { - crateName = "rand_hc"; - version = "0.1.0"; - description = "HC128 random number generator\n"; - authors = [ "The Rand Project Developers" ]; - sha256 = "05agb75j87yp7y1zk8yf7bpm66hc0673r3dlypn0kazynr6fdgkz"; - dependencies = mapFeatures features ([ - (crates."rand_core"."${deps."rand_hc"."0.1.0"."rand_core"}" deps) - ]); - }; - features_.rand_hc."0.1.0" = deps: f: updateFeatures f ({ - rand_core."${deps.rand_hc."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_hc."0.1.0".rand_core}".default or false); - rand_hc."0.1.0".default = (f.rand_hc."0.1.0".default or true); - }) [ - (features_.rand_core."${deps."rand_hc"."0.1.0"."rand_core"}" deps) - ]; - - -# end -# rand_isaac-0.1.1 - - crates.rand_isaac."0.1.1" = deps: { features?(features_.rand_isaac."0.1.1" deps {}) }: buildRustCrate { - crateName = "rand_isaac"; - version = "0.1.1"; - description = "ISAAC random number generator\n"; - authors = [ "The Rand Project Developers" "The Rust Project Developers" ]; - sha256 = "10hhdh5b5sa03s6b63y9bafm956jwilx41s71jbrzl63ccx8lxdq"; - dependencies = mapFeatures features ([ - (crates."rand_core"."${deps."rand_isaac"."0.1.1"."rand_core"}" deps) - ]); - features = mkFeatures (features."rand_isaac"."0.1.1" or {}); - }; - features_.rand_isaac."0.1.1" = deps: f: updateFeatures f (rec { - rand_core = fold recursiveUpdate {} [ - { "${deps.rand_isaac."0.1.1".rand_core}"."serde1" = - (f.rand_core."${deps.rand_isaac."0.1.1".rand_core}"."serde1" or false) || - (rand_isaac."0.1.1"."serde1" or false) || - (f."rand_isaac"."0.1.1"."serde1" or false); } - { "${deps.rand_isaac."0.1.1".rand_core}".default = (f.rand_core."${deps.rand_isaac."0.1.1".rand_core}".default or false); } - ]; - rand_isaac = fold recursiveUpdate {} [ - { "0.1.1"."serde" = - (f.rand_isaac."0.1.1"."serde" or false) || - (f.rand_isaac."0.1.1".serde1 or false) || - (rand_isaac."0.1.1"."serde1" or false); } - { "0.1.1"."serde_derive" = - (f.rand_isaac."0.1.1"."serde_derive" or false) || - (f.rand_isaac."0.1.1".serde1 or false) || - (rand_isaac."0.1.1"."serde1" or false); } - { "0.1.1".default = (f.rand_isaac."0.1.1".default or true); } - ]; - }) [ - (features_.rand_core."${deps."rand_isaac"."0.1.1"."rand_core"}" deps) - ]; - - -# end -# rand_jitter-0.1.3 - - crates.rand_jitter."0.1.3" = deps: { features?(features_.rand_jitter."0.1.3" deps {}) }: buildRustCrate { - crateName = "rand_jitter"; - version = "0.1.3"; - description = "Random number generator based on timing jitter"; - authors = [ "The Rand Project Developers" ]; - sha256 = "1cb4q73rmh1inlx3liy6rabapcqh6p6c1plsd2lxw6dmi67d1qc3"; - dependencies = mapFeatures features ([ - (crates."rand_core"."${deps."rand_jitter"."0.1.3"."rand_core"}" deps) - ]) - ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([ - (crates."libc"."${deps."rand_jitter"."0.1.3"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."rand_jitter"."0.1.3"."winapi"}" deps) - ]) else []); - features = mkFeatures (features."rand_jitter"."0.1.3" or {}); - }; - features_.rand_jitter."0.1.3" = deps: f: updateFeatures f (rec { - libc."${deps.rand_jitter."0.1.3".libc}".default = true; - rand_core = fold recursiveUpdate {} [ - { "${deps.rand_jitter."0.1.3".rand_core}"."std" = - (f.rand_core."${deps.rand_jitter."0.1.3".rand_core}"."std" or false) || - (rand_jitter."0.1.3"."std" or false) || - (f."rand_jitter"."0.1.3"."std" or false); } - { "${deps.rand_jitter."0.1.3".rand_core}".default = true; } - ]; - rand_jitter."0.1.3".default = (f.rand_jitter."0.1.3".default or true); - winapi = fold recursiveUpdate {} [ - { "${deps.rand_jitter."0.1.3".winapi}"."profileapi" = true; } - { "${deps.rand_jitter."0.1.3".winapi}".default = true; } - ]; - }) [ - (features_.rand_core."${deps."rand_jitter"."0.1.3"."rand_core"}" deps) - (features_.libc."${deps."rand_jitter"."0.1.3"."libc"}" deps) - (features_.winapi."${deps."rand_jitter"."0.1.3"."winapi"}" deps) - ]; - - -# end -# rand_pcg-0.1.2 - - crates.rand_pcg."0.1.2" = deps: { features?(features_.rand_pcg."0.1.2" deps {}) }: buildRustCrate { - crateName = "rand_pcg"; - version = "0.1.2"; - description = "Selected PCG random number generators\n"; - authors = [ "The Rand Project Developers" ]; - sha256 = "04qgi2ai2z42li5h4aawvxbpnlqyjfnipz9d6k73mdnl6p1xq938"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."rand_core"."${deps."rand_pcg"."0.1.2"."rand_core"}" deps) - ]); - - buildDependencies = mapFeatures features ([ - (crates."autocfg"."${deps."rand_pcg"."0.1.2"."autocfg"}" deps) - ]); - features = mkFeatures (features."rand_pcg"."0.1.2" or {}); - }; - features_.rand_pcg."0.1.2" = deps: f: updateFeatures f (rec { - autocfg."${deps.rand_pcg."0.1.2".autocfg}".default = true; - rand_core."${deps.rand_pcg."0.1.2".rand_core}".default = true; - rand_pcg = fold recursiveUpdate {} [ - { "0.1.2"."serde" = - (f.rand_pcg."0.1.2"."serde" or false) || - (f.rand_pcg."0.1.2".serde1 or false) || - (rand_pcg."0.1.2"."serde1" or false); } - { "0.1.2"."serde_derive" = - (f.rand_pcg."0.1.2"."serde_derive" or false) || - (f.rand_pcg."0.1.2".serde1 or false) || - (rand_pcg."0.1.2"."serde1" or false); } - { "0.1.2".default = (f.rand_pcg."0.1.2".default or true); } - ]; - }) [ - (features_.rand_core."${deps."rand_pcg"."0.1.2"."rand_core"}" deps) - (features_.autocfg."${deps."rand_pcg"."0.1.2"."autocfg"}" deps) - ]; - - -# end -# rand_xorshift-0.1.1 - - crates.rand_xorshift."0.1.1" = deps: { features?(features_.rand_xorshift."0.1.1" deps {}) }: buildRustCrate { - crateName = "rand_xorshift"; - version = "0.1.1"; - description = "Xorshift random number generator\n"; - authors = [ "The Rand Project Developers" "The Rust Project Developers" ]; - sha256 = "0v365c4h4lzxwz5k5kp9m0661s0sss7ylv74if0xb4svis9sswnn"; - dependencies = mapFeatures features ([ - (crates."rand_core"."${deps."rand_xorshift"."0.1.1"."rand_core"}" deps) - ]); - features = mkFeatures (features."rand_xorshift"."0.1.1" or {}); - }; - features_.rand_xorshift."0.1.1" = deps: f: updateFeatures f (rec { - rand_core."${deps.rand_xorshift."0.1.1".rand_core}".default = (f.rand_core."${deps.rand_xorshift."0.1.1".rand_core}".default or false); - rand_xorshift = fold recursiveUpdate {} [ - { "0.1.1"."serde" = - (f.rand_xorshift."0.1.1"."serde" or false) || - (f.rand_xorshift."0.1.1".serde1 or false) || - (rand_xorshift."0.1.1"."serde1" or false); } - { "0.1.1"."serde_derive" = - (f.rand_xorshift."0.1.1"."serde_derive" or false) || - (f.rand_xorshift."0.1.1".serde1 or false) || - (rand_xorshift."0.1.1"."serde1" or false); } - { "0.1.1".default = (f.rand_xorshift."0.1.1".default or true); } - ]; - }) [ - (features_.rand_core."${deps."rand_xorshift"."0.1.1"."rand_core"}" deps) - ]; - - -# end -# rawpointer-0.1.0 - - crates.rawpointer."0.1.0" = deps: { features?(features_.rawpointer."0.1.0" deps {}) }: buildRustCrate { - crateName = "rawpointer"; - version = "0.1.0"; - description = "Extra methods for raw pointers.\n\nFor example `.post_inc()` and `.pre_dec()` (c.f. `ptr++` and `--ptr`) and\n`ptrdistance`.\n"; - authors = [ "bluss" ]; - sha256 = "0hblv2cv310ixf5f1jw4nk9w5pb95wh4dwqyjv07g2xrshbw6j04"; - }; - features_.rawpointer."0.1.0" = deps: f: updateFeatures f ({ - rawpointer."0.1.0".default = (f.rawpointer."0.1.0".default or true); - }) []; - - -# end -# redox_syscall-0.1.54 - - crates.redox_syscall."0.1.54" = deps: { features?(features_.redox_syscall."0.1.54" deps {}) }: buildRustCrate { - crateName = "redox_syscall"; - version = "0.1.54"; - description = "A Rust library to access raw Redox system calls"; - authors = [ "Jeremy Soller " ]; - sha256 = "1ndcp7brnvii87ndcd34fk846498r07iznphkslcy0shic9cp4rr"; - libName = "syscall"; - }; - features_.redox_syscall."0.1.54" = deps: f: updateFeatures f ({ - redox_syscall."0.1.54".default = (f.redox_syscall."0.1.54".default or true); - }) []; - - -# end -# regex-1.1.6 - - crates.regex."1.1.6" = deps: { features?(features_.regex."1.1.6" deps {}) }: buildRustCrate { - crateName = "regex"; - version = "1.1.6"; - description = "An implementation of regular expressions for Rust. This implementation uses\nfinite automata and guarantees linear time matching on all inputs.\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1yynvabg03m5f65qxcw70qckkfjwi9xyfpjdp6yq7pk0xf0ydc0b"; - dependencies = mapFeatures features ([ - (crates."aho_corasick"."${deps."regex"."1.1.6"."aho_corasick"}" deps) - (crates."memchr"."${deps."regex"."1.1.6"."memchr"}" deps) - (crates."regex_syntax"."${deps."regex"."1.1.6"."regex_syntax"}" deps) - (crates."thread_local"."${deps."regex"."1.1.6"."thread_local"}" deps) - (crates."utf8_ranges"."${deps."regex"."1.1.6"."utf8_ranges"}" deps) - ]); - features = mkFeatures (features."regex"."1.1.6" or {}); - }; - features_.regex."1.1.6" = deps: f: updateFeatures f (rec { - aho_corasick."${deps.regex."1.1.6".aho_corasick}".default = true; - memchr."${deps.regex."1.1.6".memchr}".default = true; - regex = fold recursiveUpdate {} [ - { "1.1.6"."pattern" = - (f.regex."1.1.6"."pattern" or false) || - (f.regex."1.1.6".unstable or false) || - (regex."1.1.6"."unstable" or false); } - { "1.1.6"."use_std" = - (f.regex."1.1.6"."use_std" or false) || - (f.regex."1.1.6".default or false) || - (regex."1.1.6"."default" or false); } - { "1.1.6".default = (f.regex."1.1.6".default or true); } - ]; - regex_syntax."${deps.regex."1.1.6".regex_syntax}".default = true; - thread_local."${deps.regex."1.1.6".thread_local}".default = true; - utf8_ranges."${deps.regex."1.1.6".utf8_ranges}".default = true; - }) [ - (features_.aho_corasick."${deps."regex"."1.1.6"."aho_corasick"}" deps) - (features_.memchr."${deps."regex"."1.1.6"."memchr"}" deps) - (features_.regex_syntax."${deps."regex"."1.1.6"."regex_syntax"}" deps) - (features_.thread_local."${deps."regex"."1.1.6"."thread_local"}" deps) - (features_.utf8_ranges."${deps."regex"."1.1.6"."utf8_ranges"}" deps) - ]; - - -# end -# regex-syntax-0.6.6 - - crates.regex_syntax."0.6.6" = deps: { features?(features_.regex_syntax."0.6.6" deps {}) }: buildRustCrate { - crateName = "regex-syntax"; - version = "0.6.6"; - description = "A regular expression parser."; - authors = [ "The Rust Project Developers" ]; - sha256 = "1cjrdc3affa3rjfaxkp91xnf9k0fsqn9z4xqc280vv39nvrl8p8b"; - dependencies = mapFeatures features ([ - (crates."ucd_util"."${deps."regex_syntax"."0.6.6"."ucd_util"}" deps) - ]); - }; - features_.regex_syntax."0.6.6" = deps: f: updateFeatures f ({ - regex_syntax."0.6.6".default = (f.regex_syntax."0.6.6".default or true); - ucd_util."${deps.regex_syntax."0.6.6".ucd_util}".default = true; - }) [ - (features_.ucd_util."${deps."regex_syntax"."0.6.6"."ucd_util"}" deps) - ]; - - -# end -# rustc-demangle-0.1.14 - - crates.rustc_demangle."0.1.14" = deps: { features?(features_.rustc_demangle."0.1.14" deps {}) }: buildRustCrate { - crateName = "rustc-demangle"; - version = "0.1.14"; - description = "Rust compiler symbol demangling.\n"; - authors = [ "Alex Crichton " ]; - sha256 = "07vl0ms3a27fpry9kh9piv08w7d51i5m7bgphk7pw4jygwzdy31f"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."rustc_demangle"."0.1.14" or {}); - }; - features_.rustc_demangle."0.1.14" = deps: f: updateFeatures f (rec { - rustc_demangle = fold recursiveUpdate {} [ - { "0.1.14"."compiler_builtins" = - (f.rustc_demangle."0.1.14"."compiler_builtins" or false) || - (f.rustc_demangle."0.1.14".rustc-dep-of-std or false) || - (rustc_demangle."0.1.14"."rustc-dep-of-std" or false); } - { "0.1.14"."core" = - (f.rustc_demangle."0.1.14"."core" or false) || - (f.rustc_demangle."0.1.14".rustc-dep-of-std or false) || - (rustc_demangle."0.1.14"."rustc-dep-of-std" or false); } - { "0.1.14".default = (f.rustc_demangle."0.1.14".default or true); } - ]; - }) []; - - -# end -# rustc-workspace-hack-1.0.0 - - crates.rustc_workspace_hack."1.0.0" = deps: { features?(features_.rustc_workspace_hack."1.0.0" deps {}) }: buildRustCrate { - crateName = "rustc-workspace-hack"; - version = "1.0.0"; - description = "Hack for the compiler's own build system\n"; - authors = [ "Alex Crichton " ]; - sha256 = "0arpdp472j4lrwxbmf4z21d8kh95rbbphnzccf605pqq2rvczv3p"; - }; - features_.rustc_workspace_hack."1.0.0" = deps: f: updateFeatures f ({ - rustc_workspace_hack."1.0.0".default = (f.rustc_workspace_hack."1.0.0".default or true); - }) []; - - -# end -# rustc_version-0.2.3 - - crates.rustc_version."0.2.3" = deps: { features?(features_.rustc_version."0.2.3" deps {}) }: buildRustCrate { - crateName = "rustc_version"; - version = "0.2.3"; - description = "A library for querying the version of a installed rustc compiler"; - authors = [ "Marvin Löbel " ]; - sha256 = "0rgwzbgs3i9fqjm1p4ra3n7frafmpwl29c8lw85kv1rxn7n2zaa7"; - dependencies = mapFeatures features ([ - (crates."semver"."${deps."rustc_version"."0.2.3"."semver"}" deps) - ]); - }; - features_.rustc_version."0.2.3" = deps: f: updateFeatures f ({ - rustc_version."0.2.3".default = (f.rustc_version."0.2.3".default or true); - semver."${deps.rustc_version."0.2.3".semver}".default = true; - }) [ - (features_.semver."${deps."rustc_version"."0.2.3"."semver"}" deps) - ]; - - -# end -# rustfix-0.4.5 - - crates.rustfix."0.4.5" = deps: { features?(features_.rustfix."0.4.5" deps {}) }: buildRustCrate { - crateName = "rustfix"; - version = "0.4.5"; - description = "Automatically apply the suggestions made by rustc"; - authors = [ "Pascal Hertleif " "Oliver Schneider " ]; - sha256 = "16nz3wbxspl6awwy3k3ym8yqiyq1jad82m2cf8mrz5h3arfp208l"; - dependencies = mapFeatures features ([ - (crates."failure"."${deps."rustfix"."0.4.5"."failure"}" deps) - (crates."log"."${deps."rustfix"."0.4.5"."log"}" deps) - (crates."serde"."${deps."rustfix"."0.4.5"."serde"}" deps) - (crates."serde_derive"."${deps."rustfix"."0.4.5"."serde_derive"}" deps) - (crates."serde_json"."${deps."rustfix"."0.4.5"."serde_json"}" deps) - ]); - }; - features_.rustfix."0.4.5" = deps: f: updateFeatures f ({ - failure."${deps.rustfix."0.4.5".failure}".default = true; - log."${deps.rustfix."0.4.5".log}".default = true; - rustfix."0.4.5".default = (f.rustfix."0.4.5".default or true); - serde."${deps.rustfix."0.4.5".serde}".default = true; - serde_derive."${deps.rustfix."0.4.5".serde_derive}".default = true; - serde_json."${deps.rustfix."0.4.5".serde_json}".default = true; - }) [ - (features_.failure."${deps."rustfix"."0.4.5"."failure"}" deps) - (features_.log."${deps."rustfix"."0.4.5"."log"}" deps) - (features_.serde."${deps."rustfix"."0.4.5"."serde"}" deps) - (features_.serde_derive."${deps."rustfix"."0.4.5"."serde_derive"}" deps) - (features_.serde_json."${deps."rustfix"."0.4.5"."serde_json"}" deps) - ]; - - -# end -# same-file-1.0.4 - - crates.same_file."1.0.4" = deps: { features?(features_.same_file."1.0.4" deps {}) }: buildRustCrate { - crateName = "same-file"; - version = "1.0.4"; - description = "A simple crate for determining whether two file paths point to the same file.\n"; - authors = [ "Andrew Gallant " ]; - sha256 = "1zs244ssl381cqlnh2g42g3i60qip4z72i26z44d6kas3y3gy77q"; - dependencies = (if kernel == "windows" then mapFeatures features ([ - (crates."winapi_util"."${deps."same_file"."1.0.4"."winapi_util"}" deps) - ]) else []); - }; - features_.same_file."1.0.4" = deps: f: updateFeatures f ({ - same_file."1.0.4".default = (f.same_file."1.0.4".default or true); - winapi_util."${deps.same_file."1.0.4".winapi_util}".default = true; - }) [ - (features_.winapi_util."${deps."same_file"."1.0.4"."winapi_util"}" deps) - ]; - - -# end -# schannel-0.1.15 - - crates.schannel."0.1.15" = deps: { features?(features_.schannel."0.1.15" deps {}) }: buildRustCrate { - crateName = "schannel"; - version = "0.1.15"; - description = "Schannel bindings for rust, allowing SSL/TLS (e.g. https) without openssl"; - authors = [ "Steven Fackler " "Steffen Butzer " ]; - sha256 = "1x9i0z9y8n5cg23ppyglgqdlz6rwcv2a489m5qpfk6l2ib8a1jdv"; - dependencies = mapFeatures features ([ - (crates."lazy_static"."${deps."schannel"."0.1.15"."lazy_static"}" deps) - (crates."winapi"."${deps."schannel"."0.1.15"."winapi"}" deps) - ]); - }; - features_.schannel."0.1.15" = deps: f: updateFeatures f ({ - lazy_static."${deps.schannel."0.1.15".lazy_static}".default = true; - schannel."0.1.15".default = (f.schannel."0.1.15".default or true); - winapi = fold recursiveUpdate {} [ - { "${deps.schannel."0.1.15".winapi}"."lmcons" = true; } - { "${deps.schannel."0.1.15".winapi}"."minschannel" = true; } - { "${deps.schannel."0.1.15".winapi}"."schannel" = true; } - { "${deps.schannel."0.1.15".winapi}"."securitybaseapi" = true; } - { "${deps.schannel."0.1.15".winapi}"."sspi" = true; } - { "${deps.schannel."0.1.15".winapi}"."sysinfoapi" = true; } - { "${deps.schannel."0.1.15".winapi}"."timezoneapi" = true; } - { "${deps.schannel."0.1.15".winapi}"."winbase" = true; } - { "${deps.schannel."0.1.15".winapi}"."wincrypt" = true; } - { "${deps.schannel."0.1.15".winapi}"."winerror" = true; } - { "${deps.schannel."0.1.15".winapi}".default = true; } - ]; - }) [ - (features_.lazy_static."${deps."schannel"."0.1.15"."lazy_static"}" deps) - (features_.winapi."${deps."schannel"."0.1.15"."winapi"}" deps) - ]; - - -# end -# scopeguard-0.3.3 - - crates.scopeguard."0.3.3" = deps: { features?(features_.scopeguard."0.3.3" deps {}) }: buildRustCrate { - crateName = "scopeguard"; - version = "0.3.3"; - description = "A RAII scope guard that will run a given closure when it goes out of scope,\neven if the code between panics (assuming unwinding panic).\n\nDefines the macros `defer!` and `defer_on_unwind!`; the latter only runs\nif the scope is extited through unwinding on panic.\n"; - authors = [ "bluss" ]; - sha256 = "0i1l013csrqzfz6c68pr5pi01hg5v5yahq8fsdmaxy6p8ygsjf3r"; - features = mkFeatures (features."scopeguard"."0.3.3" or {}); - }; - features_.scopeguard."0.3.3" = deps: f: updateFeatures f (rec { - scopeguard = fold recursiveUpdate {} [ - { "0.3.3"."use_std" = - (f.scopeguard."0.3.3"."use_std" or false) || - (f.scopeguard."0.3.3".default or false) || - (scopeguard."0.3.3"."default" or false); } - { "0.3.3".default = (f.scopeguard."0.3.3".default or true); } - ]; - }) []; - - -# end -# semver-0.9.0 - - crates.semver."0.9.0" = deps: { features?(features_.semver."0.9.0" deps {}) }: buildRustCrate { - crateName = "semver"; - version = "0.9.0"; - description = "Semantic version parsing and comparison.\n"; - authors = [ "Steve Klabnik " "The Rust Project Developers" ]; - sha256 = "0azak2lb2wc36s3x15az886kck7rpnksrw14lalm157rg9sc9z63"; - dependencies = mapFeatures features ([ - (crates."semver_parser"."${deps."semver"."0.9.0"."semver_parser"}" deps) - ] - ++ (if features.semver."0.9.0".serde or false then [ (crates.serde."${deps."semver"."0.9.0".serde}" deps) ] else [])); - features = mkFeatures (features."semver"."0.9.0" or {}); - }; - features_.semver."0.9.0" = deps: f: updateFeatures f (rec { - semver = fold recursiveUpdate {} [ - { "0.9.0"."serde" = - (f.semver."0.9.0"."serde" or false) || - (f.semver."0.9.0".ci or false) || - (semver."0.9.0"."ci" or false); } - { "0.9.0".default = (f.semver."0.9.0".default or true); } - ]; - semver_parser."${deps.semver."0.9.0".semver_parser}".default = true; - serde."${deps.semver."0.9.0".serde}".default = true; - }) [ - (features_.semver_parser."${deps."semver"."0.9.0"."semver_parser"}" deps) - (features_.serde."${deps."semver"."0.9.0"."serde"}" deps) - ]; - - -# end -# semver-parser-0.7.0 - - crates.semver_parser."0.7.0" = deps: { features?(features_.semver_parser."0.7.0" deps {}) }: buildRustCrate { - crateName = "semver-parser"; - version = "0.7.0"; - description = "Parsing of the semver spec.\n"; - authors = [ "Steve Klabnik " ]; - sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h"; - }; - features_.semver_parser."0.7.0" = deps: f: updateFeatures f ({ - semver_parser."0.7.0".default = (f.semver_parser."0.7.0".default or true); - }) []; - - -# end -# serde-1.0.90 - - crates.serde."1.0.90" = deps: { features?(features_.serde."1.0.90" deps {}) }: buildRustCrate { - crateName = "serde"; - version = "1.0.90"; - description = "A generic serialization/deserialization framework"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "10b6n74m1dvb667vrn1db47ncb4h0mkqbg1dsamqjvv5vl5b5j56"; - build = "build.rs"; - dependencies = mapFeatures features ([ - ] - ++ (if features.serde."1.0.90".serde_derive or false then [ (crates.serde_derive."${deps."serde"."1.0.90".serde_derive}" deps) ] else [])); - features = mkFeatures (features."serde"."1.0.90" or {}); - }; - features_.serde."1.0.90" = deps: f: updateFeatures f (rec { - serde = fold recursiveUpdate {} [ - { "1.0.90"."serde_derive" = - (f.serde."1.0.90"."serde_derive" or false) || - (f.serde."1.0.90".derive or false) || - (serde."1.0.90"."derive" or false); } - { "1.0.90"."std" = - (f.serde."1.0.90"."std" or false) || - (f.serde."1.0.90".default or false) || - (serde."1.0.90"."default" or false); } - { "1.0.90"."unstable" = - (f.serde."1.0.90"."unstable" or false) || - (f.serde."1.0.90".alloc or false) || - (serde."1.0.90"."alloc" or false); } - { "1.0.90".default = (f.serde."1.0.90".default or true); } - ]; - serde_derive."${deps.serde."1.0.90".serde_derive}".default = true; - }) [ - (features_.serde_derive."${deps."serde"."1.0.90"."serde_derive"}" deps) - ]; - - -# end -# serde_derive-1.0.90 - - crates.serde_derive."1.0.90" = deps: { features?(features_.serde_derive."1.0.90" deps {}) }: buildRustCrate { - crateName = "serde_derive"; - version = "1.0.90"; - description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "1m4xgyl8jj3mxj0wszminzc1qf2gbkj9dpl17vi95nwl6m7i157y"; - procMacro = true; - dependencies = mapFeatures features ([ - (crates."proc_macro2"."${deps."serde_derive"."1.0.90"."proc_macro2"}" deps) - (crates."quote"."${deps."serde_derive"."1.0.90"."quote"}" deps) - (crates."syn"."${deps."serde_derive"."1.0.90"."syn"}" deps) - ]); - features = mkFeatures (features."serde_derive"."1.0.90" or {}); - }; - features_.serde_derive."1.0.90" = deps: f: updateFeatures f ({ - proc_macro2."${deps.serde_derive."1.0.90".proc_macro2}".default = true; - quote."${deps.serde_derive."1.0.90".quote}".default = true; - serde_derive."1.0.90".default = (f.serde_derive."1.0.90".default or true); - syn = fold recursiveUpdate {} [ - { "${deps.serde_derive."1.0.90".syn}"."visit" = true; } - { "${deps.serde_derive."1.0.90".syn}".default = true; } - ]; - }) [ - (features_.proc_macro2."${deps."serde_derive"."1.0.90"."proc_macro2"}" deps) - (features_.quote."${deps."serde_derive"."1.0.90"."quote"}" deps) - (features_.syn."${deps."serde_derive"."1.0.90"."syn"}" deps) - ]; - - -# end -# serde_ignored-0.0.4 - - crates.serde_ignored."0.0.4" = deps: { features?(features_.serde_ignored."0.0.4" deps {}) }: buildRustCrate { - crateName = "serde_ignored"; - version = "0.0.4"; - description = "Find out about keys that are ignored when deserializing data"; - authors = [ "David Tolnay " ]; - sha256 = "1ljsywm58p1s645rg2l9mchc5xa6mzxjpm8ag8nc2b74yp09h4jh"; - dependencies = mapFeatures features ([ - (crates."serde"."${deps."serde_ignored"."0.0.4"."serde"}" deps) - ]); - }; - features_.serde_ignored."0.0.4" = deps: f: updateFeatures f ({ - serde."${deps.serde_ignored."0.0.4".serde}".default = true; - serde_ignored."0.0.4".default = (f.serde_ignored."0.0.4".default or true); - }) [ - (features_.serde."${deps."serde_ignored"."0.0.4"."serde"}" deps) - ]; - - -# end -# shell-escape-0.1.4 - - crates.shell_escape."0.1.4" = deps: { features?(features_.shell_escape."0.1.4" deps {}) }: buildRustCrate { - crateName = "shell-escape"; - version = "0.1.4"; - description = "Escape characters that may have a special meaning in a shell"; - authors = [ "Steven Fackler " ]; - sha256 = "02ik28la039b8anx0sx8mbdp2yx66m64mjrjyy6x0dgpbmfxmc24"; - }; - features_.shell_escape."0.1.4" = deps: f: updateFeatures f ({ - shell_escape."0.1.4".default = (f.shell_escape."0.1.4".default or true); - }) []; - - -# end -# sized-chunks-0.1.3 - - crates.sized_chunks."0.1.3" = deps: { features?(features_.sized_chunks."0.1.3" deps {}) }: buildRustCrate { - crateName = "sized-chunks"; - version = "0.1.3"; - description = "Efficient sized chunk datatypes"; - authors = [ "Bodil Stokke " ]; - edition = "2018"; - sha256 = "0qp5yvy2kqpk5qhiq3ybwynv740j3wv97ar1kjx96hmmbman142i"; - dependencies = mapFeatures features ([ - (crates."typenum"."${deps."sized_chunks"."0.1.3"."typenum"}" deps) - ]); - }; - features_.sized_chunks."0.1.3" = deps: f: updateFeatures f ({ - sized_chunks."0.1.3".default = (f.sized_chunks."0.1.3".default or true); - typenum."${deps.sized_chunks."0.1.3".typenum}".default = true; - }) [ - (features_.typenum."${deps."sized_chunks"."0.1.3"."typenum"}" deps) - ]; - - -# end -# socket2-0.3.8 - - crates.socket2."0.3.8" = deps: { features?(features_.socket2."0.3.8" deps {}) }: buildRustCrate { - crateName = "socket2"; - version = "0.3.8"; - description = "Utilities for handling networking sockets with a maximal amount of configuration\npossible intended.\n"; - authors = [ "Alex Crichton " ]; - sha256 = "1a71m20jxmf9kqqinksphc7wj1j7q672q29cpza7p9siyzyfx598"; - dependencies = (if (kernel == "linux" || kernel == "darwin") || kernel == "redox" then mapFeatures features ([ - (crates."cfg_if"."${deps."socket2"."0.3.8"."cfg_if"}" deps) - (crates."libc"."${deps."socket2"."0.3.8"."libc"}" deps) - ]) else []) - ++ (if kernel == "redox" then mapFeatures features ([ - (crates."redox_syscall"."${deps."socket2"."0.3.8"."redox_syscall"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."socket2"."0.3.8"."winapi"}" deps) - ]) else []); - features = mkFeatures (features."socket2"."0.3.8" or {}); - }; - features_.socket2."0.3.8" = deps: f: updateFeatures f ({ - cfg_if."${deps.socket2."0.3.8".cfg_if}".default = true; - libc."${deps.socket2."0.3.8".libc}".default = true; - redox_syscall."${deps.socket2."0.3.8".redox_syscall}".default = true; - socket2."0.3.8".default = (f.socket2."0.3.8".default or true); - winapi = fold recursiveUpdate {} [ - { "${deps.socket2."0.3.8".winapi}"."handleapi" = true; } - { "${deps.socket2."0.3.8".winapi}"."minwindef" = true; } - { "${deps.socket2."0.3.8".winapi}"."ws2def" = true; } - { "${deps.socket2."0.3.8".winapi}"."ws2ipdef" = true; } - { "${deps.socket2."0.3.8".winapi}"."ws2tcpip" = true; } - { "${deps.socket2."0.3.8".winapi}".default = true; } - ]; - }) [ - (features_.cfg_if."${deps."socket2"."0.3.8"."cfg_if"}" deps) - (features_.libc."${deps."socket2"."0.3.8"."libc"}" deps) - (features_.redox_syscall."${deps."socket2"."0.3.8"."redox_syscall"}" deps) - (features_.winapi."${deps."socket2"."0.3.8"."winapi"}" deps) - ]; - - -# end -# strsim-0.8.0 - - crates.strsim."0.8.0" = deps: { features?(features_.strsim."0.8.0" deps {}) }: buildRustCrate { - crateName = "strsim"; - version = "0.8.0"; - description = "Implementations of string similarity metrics.\nIncludes Hamming, Levenshtein, OSA, Damerau-Levenshtein, Jaro, and Jaro-Winkler.\n"; - authors = [ "Danny Guo " ]; - sha256 = "0d3jsdz22wgjyxdakqnvdgmwjdvkximz50d9zfk4qlalw635qcvy"; - }; - features_.strsim."0.8.0" = deps: f: updateFeatures f ({ - strsim."0.8.0".default = (f.strsim."0.8.0".default or true); - }) []; - - -# end -# strsim-0.9.1 - - crates.strsim."0.9.1" = deps: { features?(features_.strsim."0.9.1" deps {}) }: buildRustCrate { - crateName = "strsim"; - version = "0.9.1"; - description = "Implementations of string similarity metrics.\nIncludes Hamming, Levenshtein, OSA, Damerau-Levenshtein, Jaro, and Jaro-Winkler.\n"; - authors = [ "Danny Guo " ]; - sha256 = "0lpi3lrq6z5slay72ir1sg1ki0bvr3qia82lzx937gpc999i6bah"; - dependencies = mapFeatures features ([ - (crates."hashbrown"."${deps."strsim"."0.9.1"."hashbrown"}" deps) - (crates."ndarray"."${deps."strsim"."0.9.1"."ndarray"}" deps) - ]); - }; - features_.strsim."0.9.1" = deps: f: updateFeatures f ({ - hashbrown."${deps.strsim."0.9.1".hashbrown}".default = true; - ndarray."${deps.strsim."0.9.1".ndarray}".default = true; - strsim."0.9.1".default = (f.strsim."0.9.1".default or true); - }) [ - (features_.hashbrown."${deps."strsim"."0.9.1"."hashbrown"}" deps) - (features_.ndarray."${deps."strsim"."0.9.1"."ndarray"}" deps) - ]; - - -# end -# syn-0.15.32 - - crates.syn."0.15.32" = deps: { features?(features_.syn."0.15.32" deps {}) }: buildRustCrate { - crateName = "syn"; - version = "0.15.32"; - description = "Parser for Rust source code"; - authors = [ "David Tolnay " ]; - sha256 = "1xq1mbns8zyg2ls5927wqi7i7hn2y933czbqqds648gcdqccsqb0"; - dependencies = mapFeatures features ([ - (crates."proc_macro2"."${deps."syn"."0.15.32"."proc_macro2"}" deps) - (crates."unicode_xid"."${deps."syn"."0.15.32"."unicode_xid"}" deps) - ] - ++ (if features.syn."0.15.32".quote or false then [ (crates.quote."${deps."syn"."0.15.32".quote}" deps) ] else [])); - features = mkFeatures (features."syn"."0.15.32" or {}); - }; - features_.syn."0.15.32" = deps: f: updateFeatures f (rec { - proc_macro2 = fold recursiveUpdate {} [ - { "${deps.syn."0.15.32".proc_macro2}"."proc-macro" = - (f.proc_macro2."${deps.syn."0.15.32".proc_macro2}"."proc-macro" or false) || - (syn."0.15.32"."proc-macro" or false) || - (f."syn"."0.15.32"."proc-macro" or false); } - { "${deps.syn."0.15.32".proc_macro2}".default = (f.proc_macro2."${deps.syn."0.15.32".proc_macro2}".default or false); } - ]; - quote = fold recursiveUpdate {} [ - { "${deps.syn."0.15.32".quote}"."proc-macro" = - (f.quote."${deps.syn."0.15.32".quote}"."proc-macro" or false) || - (syn."0.15.32"."proc-macro" or false) || - (f."syn"."0.15.32"."proc-macro" or false); } - { "${deps.syn."0.15.32".quote}".default = (f.quote."${deps.syn."0.15.32".quote}".default or false); } - ]; - syn = fold recursiveUpdate {} [ - { "0.15.32"."clone-impls" = - (f.syn."0.15.32"."clone-impls" or false) || - (f.syn."0.15.32".default or false) || - (syn."0.15.32"."default" or false); } - { "0.15.32"."derive" = - (f.syn."0.15.32"."derive" or false) || - (f.syn."0.15.32".default or false) || - (syn."0.15.32"."default" or false); } - { "0.15.32"."parsing" = - (f.syn."0.15.32"."parsing" or false) || - (f.syn."0.15.32".default or false) || - (syn."0.15.32"."default" or false); } - { "0.15.32"."printing" = - (f.syn."0.15.32"."printing" or false) || - (f.syn."0.15.32".default or false) || - (syn."0.15.32"."default" or false); } - { "0.15.32"."proc-macro" = - (f.syn."0.15.32"."proc-macro" or false) || - (f.syn."0.15.32".default or false) || - (syn."0.15.32"."default" or false); } - { "0.15.32"."quote" = - (f.syn."0.15.32"."quote" or false) || - (f.syn."0.15.32".printing or false) || - (syn."0.15.32"."printing" or false); } - { "0.15.32".default = (f.syn."0.15.32".default or true); } - ]; - unicode_xid."${deps.syn."0.15.32".unicode_xid}".default = true; - }) [ - (features_.proc_macro2."${deps."syn"."0.15.32"."proc_macro2"}" deps) - (features_.quote."${deps."syn"."0.15.32"."quote"}" deps) - (features_.unicode_xid."${deps."syn"."0.15.32"."unicode_xid"}" deps) - ]; - - -# end -# tar-0.4.22 - - crates.tar."0.4.22" = deps: { features?(features_.tar."0.4.22" deps {}) }: buildRustCrate { - crateName = "tar"; - version = "0.4.22"; - description = "A Rust implementation of a TAR file reader and writer. This library does not\ncurrently handle compression, but it is abstract over all I/O readers and\nwriters. Additionally, great lengths are taken to ensure that the entire\ncontents are never required to be entirely resident in memory all at once.\n"; - authors = [ "Alex Crichton " ]; - sha256 = "1y2b5av1ckf7v7rw1p59fjddn2jwzv0xr69lgdd4l41g43c3zq9j"; - dependencies = mapFeatures features ([ - (crates."filetime"."${deps."tar"."0.4.22"."filetime"}" deps) - ]) - ++ (if kernel == "redox" then mapFeatures features ([ - (crates."redox_syscall"."${deps."tar"."0.4.22"."redox_syscall"}" deps) - ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."tar"."0.4.22"."libc"}" deps) - ]) else []); - }; - features_.tar."0.4.22" = deps: f: updateFeatures f (rec { - filetime."${deps.tar."0.4.22".filetime}".default = true; - libc."${deps.tar."0.4.22".libc}".default = true; - redox_syscall."${deps.tar."0.4.22".redox_syscall}".default = true; - tar = fold recursiveUpdate {} [ - { "0.4.22"."xattr" = - (f.tar."0.4.22"."xattr" or false) || - (f.tar."0.4.22".default or false) || - (tar."0.4.22"."default" or false); } - { "0.4.22".default = (f.tar."0.4.22".default or true); } - ]; - }) [ - (features_.filetime."${deps."tar"."0.4.22"."filetime"}" deps) - (features_.redox_syscall."${deps."tar"."0.4.22"."redox_syscall"}" deps) - (features_.libc."${deps."tar"."0.4.22"."libc"}" deps) - ]; - - -# end -# tempfile-3.0.7 - - crates.tempfile."3.0.7" = deps: { features?(features_.tempfile."3.0.7" deps {}) }: buildRustCrate { - crateName = "tempfile"; - version = "3.0.7"; - description = "A library for managing temporary files and directories.\n"; - authors = [ "Steven Allen " "The Rust Project Developers" "Ashley Mannix " "Jason White " ]; - sha256 = "19h7ch8fvisxrrmabcnhlfj6b8vg34zaw8491x141p0n0727niaf"; - dependencies = mapFeatures features ([ - (crates."cfg_if"."${deps."tempfile"."3.0.7"."cfg_if"}" deps) - (crates."rand"."${deps."tempfile"."3.0.7"."rand"}" deps) - (crates."remove_dir_all"."${deps."tempfile"."3.0.7"."remove_dir_all"}" deps) - ]) - ++ (if kernel == "redox" then mapFeatures features ([ - (crates."redox_syscall"."${deps."tempfile"."3.0.7"."redox_syscall"}" deps) - ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."tempfile"."3.0.7"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."tempfile"."3.0.7"."winapi"}" deps) - ]) else []); - }; - features_.tempfile."3.0.7" = deps: f: updateFeatures f ({ - cfg_if."${deps.tempfile."3.0.7".cfg_if}".default = true; - libc."${deps.tempfile."3.0.7".libc}".default = true; - rand."${deps.tempfile."3.0.7".rand}".default = true; - redox_syscall."${deps.tempfile."3.0.7".redox_syscall}".default = true; - remove_dir_all."${deps.tempfile."3.0.7".remove_dir_all}".default = true; - tempfile."3.0.7".default = (f.tempfile."3.0.7".default or true); - winapi = fold recursiveUpdate {} [ - { "${deps.tempfile."3.0.7".winapi}"."fileapi" = true; } - { "${deps.tempfile."3.0.7".winapi}"."handleapi" = true; } - { "${deps.tempfile."3.0.7".winapi}"."winbase" = true; } - { "${deps.tempfile."3.0.7".winapi}".default = true; } - ]; - }) [ - (features_.cfg_if."${deps."tempfile"."3.0.7"."cfg_if"}" deps) - (features_.rand."${deps."tempfile"."3.0.7"."rand"}" deps) - (features_.remove_dir_all."${deps."tempfile"."3.0.7"."remove_dir_all"}" deps) - (features_.redox_syscall."${deps."tempfile"."3.0.7"."redox_syscall"}" deps) - (features_.libc."${deps."tempfile"."3.0.7"."libc"}" deps) - (features_.winapi."${deps."tempfile"."3.0.7"."winapi"}" deps) - ]; - - -# end -# textwrap-0.11.0 - - crates.textwrap."0.11.0" = deps: { features?(features_.textwrap."0.11.0" deps {}) }: buildRustCrate { - crateName = "textwrap"; - version = "0.11.0"; - description = "Textwrap is a small library for word wrapping, indenting, and\ndedenting strings.\n\nYou can use it to format strings (such as help and error messages) for\ndisplay in commandline applications. It is designed to be efficient\nand handle Unicode characters correctly.\n"; - authors = [ "Martin Geisler " ]; - sha256 = "0s25qh49n7kjayrdj4q3v0jk0jc6vy88rdw0bvgfxqlscpqpxi7d"; - dependencies = mapFeatures features ([ - (crates."unicode_width"."${deps."textwrap"."0.11.0"."unicode_width"}" deps) - ]); - }; - features_.textwrap."0.11.0" = deps: f: updateFeatures f ({ - textwrap."0.11.0".default = (f.textwrap."0.11.0".default or true); - unicode_width."${deps.textwrap."0.11.0".unicode_width}".default = true; - }) [ - (features_.unicode_width."${deps."textwrap"."0.11.0"."unicode_width"}" deps) - ]; - - -# end -# typenum-1.10.0 - - crates.typenum."1.10.0" = deps: { features?(features_.typenum."1.10.0" deps {}) }: buildRustCrate { - crateName = "typenum"; - version = "1.10.0"; - description = "Typenum is a Rust library for type-level numbers evaluated at compile time. It currently supports bits, unsigned integers, and signed integers. It also provides a type-level array of type-level numbers, but its implementation is incomplete."; - authors = [ "Paho Lurie-Gregg " "Andre Bogus " ]; - sha256 = "1v2cgg0mlzkg5prs7swysckgk2ay6bpda8m83c2sn3z77dcsx3bc"; - build = "build/main.rs"; - features = mkFeatures (features."typenum"."1.10.0" or {}); - }; - features_.typenum."1.10.0" = deps: f: updateFeatures f ({ - typenum."1.10.0".default = (f.typenum."1.10.0".default or true); - }) []; - - -# end -# url_serde-0.2.0 - - crates.url_serde."0.2.0" = deps: { features?(features_.url_serde."0.2.0" deps {}) }: buildRustCrate { - crateName = "url_serde"; - version = "0.2.0"; - description = "Serde support for URL types"; - authors = [ "The rust-url developers" ]; - sha256 = "07ry87rw0pi1da6b53f7s3f52wx3ihxbcgjd4ldspfv5xh6wipsg"; - dependencies = mapFeatures features ([ - (crates."serde"."${deps."url_serde"."0.2.0"."serde"}" deps) - (crates."url"."${deps."url_serde"."0.2.0"."url"}" deps) - ]); - }; - features_.url_serde."0.2.0" = deps: f: updateFeatures f ({ - serde."${deps.url_serde."0.2.0".serde}".default = true; - url."${deps.url_serde."0.2.0".url}".default = true; - url_serde."0.2.0".default = (f.url_serde."0.2.0".default or true); - }) [ - (features_.serde."${deps."url_serde"."0.2.0"."serde"}" deps) - (features_.url."${deps."url_serde"."0.2.0"."url"}" deps) - ]; - - -# end -# vcpkg-0.2.6 - - crates.vcpkg."0.2.6" = deps: { features?(features_.vcpkg."0.2.6" deps {}) }: buildRustCrate { - crateName = "vcpkg"; - version = "0.2.6"; - description = "A library to find native dependencies in a vcpkg tree at build\ntime in order to be used in Cargo build scripts.\n"; - authors = [ "Jim McGrath " ]; - sha256 = "1ig6jqpzzl1z9vk4qywgpfr4hfbd8ny8frqsgm3r449wkc4n1i5x"; - }; - features_.vcpkg."0.2.6" = deps: f: updateFeatures f ({ - vcpkg."0.2.6".default = (f.vcpkg."0.2.6".default or true); - }) []; - - -# end -# walkdir-2.2.7 - - crates.walkdir."2.2.7" = deps: { features?(features_.walkdir."2.2.7" deps {}) }: buildRustCrate { - crateName = "walkdir"; - version = "2.2.7"; - description = "Recursively walk a directory."; - authors = [ "Andrew Gallant " ]; - sha256 = "0wq3v28916kkla29yyi0g0xfc16apwx24py68049kriz3gjlig03"; - dependencies = mapFeatures features ([ - (crates."same_file"."${deps."walkdir"."2.2.7"."same_file"}" deps) - ]) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."walkdir"."2.2.7"."winapi"}" deps) - (crates."winapi_util"."${deps."walkdir"."2.2.7"."winapi_util"}" deps) - ]) else []); - }; - features_.walkdir."2.2.7" = deps: f: updateFeatures f ({ - same_file."${deps.walkdir."2.2.7".same_file}".default = true; - walkdir."2.2.7".default = (f.walkdir."2.2.7".default or true); - winapi = fold recursiveUpdate {} [ - { "${deps.walkdir."2.2.7".winapi}"."std" = true; } - { "${deps.walkdir."2.2.7".winapi}"."winnt" = true; } - { "${deps.walkdir."2.2.7".winapi}".default = true; } - ]; - winapi_util."${deps.walkdir."2.2.7".winapi_util}".default = true; - }) [ - (features_.same_file."${deps."walkdir"."2.2.7"."same_file"}" deps) - (features_.winapi."${deps."walkdir"."2.2.7"."winapi"}" deps) - (features_.winapi_util."${deps."walkdir"."2.2.7"."winapi_util"}" deps) - ]; - - -# end -# winapi-0.2.8 - - crates.winapi."0.2.8" = deps: { features?(features_.winapi."0.2.8" deps {}) }: buildRustCrate { - crateName = "winapi"; - version = "0.2.8"; - description = "Types and constants for WinAPI bindings. See README for list of crates providing function bindings."; - authors = [ "Peter Atashian " ]; - sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; - }; - features_.winapi."0.2.8" = deps: f: updateFeatures f ({ - winapi."0.2.8".default = (f.winapi."0.2.8".default or true); - }) []; - - -# end -# winapi-0.3.7 - - crates.winapi."0.3.7" = deps: { features?(features_.winapi."0.3.7" deps {}) }: buildRustCrate { - crateName = "winapi"; - version = "0.3.7"; - description = "Raw FFI bindings for all of Windows API."; - authors = [ "Peter Atashian " ]; - sha256 = "1k51gfkp0zqw7nj07y443mscs46icmdhld442s2073niap0kkdr8"; - build = "build.rs"; - dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ - (crates."winapi_i686_pc_windows_gnu"."${deps."winapi"."0.3.7"."winapi_i686_pc_windows_gnu"}" deps) - ]) else []) - ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ - (crates."winapi_x86_64_pc_windows_gnu"."${deps."winapi"."0.3.7"."winapi_x86_64_pc_windows_gnu"}" deps) - ]) else []); - features = mkFeatures (features."winapi"."0.3.7" or {}); - }; - features_.winapi."0.3.7" = deps: f: updateFeatures f (rec { - winapi = fold recursiveUpdate {} [ - { "0.3.7"."impl-debug" = - (f.winapi."0.3.7"."impl-debug" or false) || - (f.winapi."0.3.7".debug or false) || - (winapi."0.3.7"."debug" or false); } - { "0.3.7".default = (f.winapi."0.3.7".default or true); } - ]; - winapi_i686_pc_windows_gnu."${deps.winapi."0.3.7".winapi_i686_pc_windows_gnu}".default = true; - winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.7".winapi_x86_64_pc_windows_gnu}".default = true; - }) [ - (features_.winapi_i686_pc_windows_gnu."${deps."winapi"."0.3.7"."winapi_i686_pc_windows_gnu"}" deps) - (features_.winapi_x86_64_pc_windows_gnu."${deps."winapi"."0.3.7"."winapi_x86_64_pc_windows_gnu"}" deps) - ]; - - -# end -# winapi-build-0.1.1 - - crates.winapi_build."0.1.1" = deps: { features?(features_.winapi_build."0.1.1" deps {}) }: buildRustCrate { - crateName = "winapi-build"; - version = "0.1.1"; - description = "Common code for build.rs in WinAPI -sys crates."; - authors = [ "Peter Atashian " ]; - sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; - libName = "build"; - }; - features_.winapi_build."0.1.1" = deps: f: updateFeatures f ({ - winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true); - }) []; - - -# end -# adler32-1.0.3 - - crates.adler32."1.0.3" = deps: { features?(features_.adler32."1.0.3" deps {}) }: buildRustCrate { - crateName = "adler32"; - version = "1.0.3"; - description = "Minimal Adler32 implementation for Rust."; - authors = [ "Remi Rampin " ]; - sha256 = "1z3mvjgw02mbqk98kizzibrca01d5wfkpazsrp3vkkv3i56pn6fb"; - }; - features_.adler32."1.0.3" = deps: f: updateFeatures f ({ - adler32."1.0.3".default = (f.adler32."1.0.3".default or true); - }) []; - - -# end -} diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index f6383af44e82..60b0cfc31c67 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,5 +1,6 @@ { lib , stdenv +, atk , pkg-config , curl , darwin @@ -16,18 +17,24 @@ , libsodium , postgresql , gmp +, gobject-introspection , foundationdb , capnproto , nettle +, gtk4 , clang , llvmPackages , linux-pam +, pango , cmake , glib , freetype +, fontconfig , rdkafka , udev , libevdev +, alsa-lib +, graphene , ... }: @@ -35,10 +42,20 @@ let inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; in { + alsa-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsa-lib ]; + }; + cairo-rs = attrs: { buildInputs = [ cairo ]; }; + cairo-sys-rs = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ cairo ]; + }; + capnp-rpc = attrs: { nativeBuildInputs = [ capnproto ]; }; @@ -67,7 +84,6 @@ in }; evdev-sys = attrs: { - LIBGIT2_SYS_USE_PKG_CONFIG = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libevdev ]; }; @@ -116,6 +132,21 @@ in buildInputs = [ gdk-pixbuf ]; }; + gtk4-sys = attrs: { + buildInputs = [ gtk4 ]; + nativeBuildInputs = [ pkg-config ]; + }; + + gdk4-sys = attrs: { + buildInputs = [ gtk4 ]; + nativeBuildInputs = [ pkg-config ]; + }; + + gsk4-sys = attrs: { + buildInputs = [ gtk4 ]; + nativeBuildInputs = [ pkg-config ]; + }; + libgit2-sys = attrs: { LIBGIT2_SYS_USE_PKG_CONFIG = true; nativeBuildInputs = [ pkg-config ]; @@ -142,6 +173,11 @@ in buildInputs = [ udev ]; }; + graphene-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ graphene gobject-introspection ]; + }; + nettle-sys = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle clang ]; @@ -161,6 +197,11 @@ in buildInputs = [ linux-pam ]; }; + pango-sys = attr: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ pango ]; + }; + pq-sys = attr: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ postgresql ]; @@ -196,6 +237,11 @@ in buildInputs = [ gmp ]; }; + pangocairo-sys = attr: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ pango ]; + }; + sequoia-store = attrs: { nativeBuildInputs = [ capnproto ]; buildInputs = [ sqlite gmp ]; @@ -216,7 +262,7 @@ in servo-fontconfig-sys = attrs: { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ freetype ]; + buildInputs = [ freetype fontconfig ]; }; thrussh-libsodium = attrs: { @@ -227,4 +273,10 @@ in xcb = attrs: { buildInputs = [ python3 ]; }; + + atk-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ atk ]; + }; + } diff --git a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix index 6d6219078bac..7ca306b613bc 100644 --- a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix +++ b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix @@ -28,7 +28,11 @@ in } @ args: let hash_ = - if args ? hash then { outputHashAlgo = null; outputHash = args.hash; } + if args ? hash then + { + outputHashAlgo = if args.hash == "" then "sha256" else null; + outputHash = args.hash; + } else if args ? sha256 then { outputHashAlgo = "sha256"; outputHash = args.sha256; } else throw "fetchCargoTarball requires a hash for ${name}"; in stdenv.mkDerivation ({ diff --git a/pkgs/build-support/rust/fetchcrate.nix b/pkgs/build-support/rust/fetchcrate.nix index 4e6c38b032ce..53219b2d0629 100644 --- a/pkgs/build-support/rust/fetchcrate.nix +++ b/pkgs/build-support/rust/fetchcrate.nix @@ -1,38 +1,15 @@ -{ lib, fetchurl, unzip }: +{ lib, fetchzip }: { crateName ? args.pname , pname ? null , version -, sha256 -, ... } @ args: +, ... +} @ args: assert pname == null || pname == crateName; -lib.overrideDerivation (fetchurl ({ - +fetchzip ({ name = "${crateName}-${version}.tar.gz"; url = "https://crates.io/api/v1/crates/${crateName}/${version}/download"; - recursiveHash = true; - - downloadToTemp = true; - - postFetch = - '' - export PATH=${unzip}/bin:$PATH - - unpackDir="$TMPDIR/unpack" - mkdir "$unpackDir" - cd "$unpackDir" - - renamed="$TMPDIR/${crateName}-${version}.tar.gz" - mv "$downloadedFile" "$renamed" - unpackFile "$renamed" - fn=$(cd "$unpackDir" && echo *) - if [ -f "$unpackDir/$fn" ]; then - mkdir $out - fi - mv "$unpackDir/$fn" "$out" - ''; -} // removeAttrs args [ "crateName" "pname" "version" ])) -# Hackety-hack: we actually need unzip hooks, too -(x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];}) + extension = "tar.gz"; +} // removeAttrs args [ "crateName" "pname" "version" ]) diff --git a/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh b/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh new file mode 100644 index 000000000000..de85683ead2a --- /dev/null +++ b/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh @@ -0,0 +1,54 @@ +declare -a checkFlags +declare -a cargoTestFlags + +cargoNextestHook() { + echo "Executing cargoNextestHook" + + runHook preCheck + + if [[ -n "${buildAndTestSubdir-}" ]]; then + pushd "${buildAndTestSubdir}" + fi + + if [[ -z ${dontUseCargoParallelTests-} ]]; then + threads=$NIX_BUILD_CORES + else + threads=1 + fi + + if [ "${cargoCheckType}" != "debug" ]; then + cargoCheckProfileFlag="--${cargoCheckType}" + fi + + if [ -n "${cargoCheckNoDefaultFeatures-}" ]; then + cargoCheckNoDefaultFeaturesFlag=--no-default-features + fi + + if [ -n "${cargoCheckFeatures-}" ]; then + cargoCheckFeaturesFlag="--features=${cargoCheckFeatures// /,}" + fi + + argstr="${cargoCheckProfileFlag} ${cargoCheckNoDefaultFeaturesFlag} ${cargoCheckFeaturesFlag} + --target @rustTargetPlatformSpec@ --frozen ${cargoTestFlags}" + + ( + set -x + cargo nextest run \ + -j ${threads} \ + ${argstr} -- \ + ${checkFlags} \ + ${checkFlagsArray+"${checkFlagsArray[@]}"} + ) + + if [[ -n "${buildAndTestSubdir-}" ]]; then + popd + fi + + echo "Finished cargoNextestHook" + + runHook postCheck +} + +if [ -z "${dontCargoCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=cargoNextestHook +fi diff --git a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh index aeddeef29d92..8146573e79db 100644 --- a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh @@ -1,6 +1,8 @@ cargoSetupPostUnpackHook() { echo "Executing cargoSetupPostUnpackHook" + export NIX_LDFLAGS+=" @aarch64LinuxGccWorkaround@" + # Some cargo builds include build hooks that modify their own vendor # dependencies. This copies the vendor directory into the build tree and makes # it writable. If we're using a tarball, the unpackFile hook already handles diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 6ee122adb52a..13562acd5492 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -1,7 +1,7 @@ { buildPackages , callPackage , cargo -, clang +, cargo-nextest , lib , makeSetupHook , maturin @@ -55,6 +55,15 @@ in { }; } ./cargo-install-hook.sh) {}; + cargoNextestHook = callPackage ({ }: + makeSetupHook { + name = "cargo-nextest-hook.sh"; + deps = [ cargo cargo-nextest ]; + substitutions = { + inherit rustTargetPlatformSpec; + }; + } ./cargo-nextest-hook.sh) {}; + cargoSetupHook = callPackage ({ }: makeSetupHook { name = "cargo-setup-hook.sh"; @@ -98,6 +107,9 @@ in { host-config = true target-applies-to-host = true ''; + + # https://github.com/NixOS/nixpkgs/issues/201254 + aarch64LinuxGccWorkaround = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; }; } ./cargo-setup-hook.sh) {}; @@ -114,8 +126,8 @@ in { bindgenHook = callPackage ({}: makeSetupHook { name = "rust-bindgen-hook"; substitutions = { - libclang = clang.cc.lib; - inherit clang; + libclang = rustc.llvmPackages.clang.cc.lib; + clang = rustc.llvmPackages.clang; }; } ./rust-bindgen-hook.sh) {}; diff --git a/pkgs/build-support/rust/import-cargo-lock.nix b/pkgs/build-support/rust/import-cargo-lock.nix index e571c01f95c5..42e448b8246f 100644 --- a/pkgs/build-support/rust/import-cargo-lock.nix +++ b/pkgs/build-support/rust/import-cargo-lock.nix @@ -7,6 +7,9 @@ # Cargo lock file contents as string , lockFileContents ? null + # Allow `builtins.fetchGit` to be used to not require hashes for git dependencies +, allowBuiltinFetchGit ? false + # Hashes for git dependencies. , outputHashes ? {} } @ args: @@ -38,14 +41,14 @@ let # There is no source attribute for the source package itself. But # since we do not want to vendor the source package anyway, we can # safely skip it. - depPackages = (builtins.filter (p: p ? "source") packages); + depPackages = builtins.filter (p: p ? "source") packages; # Create dependent crates from packages. # # Force evaluation of the git SHA -> hash mapping, so that an error is # thrown if there are stale hashes. We cannot rely on gitShaOutputHash # being evaluated otherwise, since there could be no git dependencies. - depCrates = builtins.deepSeq (gitShaOutputHash) (builtins.map mkCrate depPackages); + depCrates = builtins.deepSeq gitShaOutputHash (builtins.map mkCrate depPackages); # Map package name + version to git commit SHA for packages with a git source. namesGitShas = builtins.listToAttrs ( @@ -117,12 +120,21 @@ let If you use `buildRustPackage`, you can add this attribute to the `cargoLock` attribute set. ''; - sha256 = gitShaOutputHash.${gitParts.sha} or missingHash; - tree = fetchgit { - inherit sha256; - inherit (gitParts) url; - rev = gitParts.sha; # The commit SHA is always available. - }; + tree = + if gitShaOutputHash ? ${gitParts.sha} then + fetchgit { + inherit (gitParts) url; + rev = gitParts.sha; # The commit SHA is always available. + sha256 = gitShaOutputHash.${gitParts.sha}; + } + else if allowBuiltinFetchGit then + builtins.fetchGit { + inherit (gitParts) url; + rev = gitParts.sha; + allRefs = true; + } + else + missingHash; in runCommand "${pkg.name}-${pkg.version}" {} '' tree=${tree} diff --git a/pkgs/build-support/setup-hooks/audit-tmpdir.sh b/pkgs/build-support/setup-hooks/audit-tmpdir.sh index c9dd32d1dd22..36714178156b 100644 --- a/pkgs/build-support/setup-hooks/audit-tmpdir.sh +++ b/pkgs/build-support/setup-hooks/audit-tmpdir.sh @@ -13,10 +13,10 @@ auditTmpdir() { local dir="$1" [ -e "$dir" ] || return 0 - header "checking for references to $TMPDIR/ in $dir..." + echo "checking for references to $TMPDIR/ in $dir..." local i - while IFS= read -r -d $'\0' i; do + find "$dir" -type f -print0 | while IFS= read -r -d $'\0' i; do if [[ "$i" =~ .build-id ]]; then continue; fi if isELF "$i"; then @@ -35,7 +35,5 @@ auditTmpdir() { fi fi - done < <(find "$dir" -type f -print0) - - stopNest + done } diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.py b/pkgs/build-support/setup-hooks/auto-patchelf.py index efb65a809962..e731feb1b125 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.py +++ b/pkgs/build-support/setup-hooks/auto-patchelf.py @@ -131,7 +131,14 @@ def populate_cache(initial: List[Path], recursive: bool =False) -> None: if not path.is_file(): continue + # As an optimisation, resolve the symlinks here, as the target is unique + # XXX: (layus, 2022-07-25) is this really an optimisation in all cases ? + # It could make the rpath bigger or break the fragile precedence of $out. resolved = path.resolve() + # Do not use resolved paths when names do not match + if resolved.name != path.name: + resolved = path + try: with open_elf(path) as elf: osabi = get_osabi(elf) diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 7f5ff146e30b..55467b9ec7b8 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +# shellcheck shell=bash declare -a autoPatchelfLibs declare -a extraAutoPatchelfLibs @@ -84,7 +84,7 @@ autoPatchelf() { # (Expressions don't expand in single quotes, use double quotes for that.) postFixupHooks+=(' if [ -z "${dontAutoPatchelf-}" ]; then - autoPatchelf -- $(for output in $outputs; do + autoPatchelf -- $(for output in $(getAllOutputNames); do [ -e "${!output}" ] || continue echo "${!output}" done) diff --git a/pkgs/build-support/setup-hooks/canonicalize-jars.sh b/pkgs/build-support/setup-hooks/canonicalize-jars.sh index 8c55810748ea..5137bfc94b01 100644 --- a/pkgs/build-support/setup-hooks/canonicalize-jars.sh +++ b/pkgs/build-support/setup-hooks/canonicalize-jars.sh @@ -6,12 +6,11 @@ fixupOutputHooks+=('if [ -z "$dontCanonicalizeJars" -a -e "$prefix" ]; then cano canonicalizeJarsIn() { local dir="$1" - header "canonicalizing jars in $dir" + echo "canonicalizing jars in $dir" dir="$(realpath -sm -- "$dir")" while IFS= read -rd '' f; do canonicalizeJar "$f" done < <(find -- "$dir" -type f -name '*.jar' -print0) - stopNest } source @canonicalize_jar@ diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index 74c8f6d0b333..83ea7de3ee21 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +# shellcheck shell=bash fixupOutputHooks+=('convertDesktopFiles $prefix') # Get a param out of a desktop file. First parameter is the file and the second diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix b/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix index c9b03b75cd03..c81a253b0de8 100644 --- a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix +++ b/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix @@ -10,6 +10,8 @@ }: makeSetupHook { + name = "make-binary-wrapper-hook"; + deps = [ dieHook ] # https://github.com/NixOS/nixpkgs/issues/148189 ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) cc; diff --git a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh index 0608d3ca81c4..f34353a7617b 100644 --- a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh +++ b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh @@ -1,4 +1,4 @@ -fixupOutputHooks+=(_makeSymlinksRelative) +postFixupHooks+=(_makeSymlinksRelative) # For every symlink in $output that refers to another file in $output # ensure that the symlink is relative. This removes references to the output @@ -6,8 +6,8 @@ fixupOutputHooks+=(_makeSymlinksRelative) _makeSymlinksRelative() { local symlinkTarget - if [ -n "${dontRewriteSymlinks-}" ]; then - return 0 + if [ "${dontRewriteSymlinks-}" ] || [ ! -e "$prefix" ]; then + return fi while IFS= read -r -d $'\0' f; do diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh index e4460f98816d..3f961155d201 100644 --- a/pkgs/build-support/setup-hooks/move-docs.sh +++ b/pkgs/build-support/setup-hooks/move-docs.sh @@ -1,14 +1,19 @@ -# This setup hook moves $out/{man,doc,info} to $out/share; moves -# $out/share/man to $man/share/man; and moves $out/share/doc to -# $man/share/doc. +# This setup hook moves $out/{man,doc,info} to $out/share. preFixupHooks+=(_moveToShare) _moveToShare() { - forceShare=${forceShare:=man doc info} + if [ -n "$__structuredAttrs" ]; then + if [ -z "${forceShare-}" ]; then + forceShare=( man doc info ) + fi + else + forceShare=( ${forceShare:-man doc info} ) + fi + if [[ -z "$out" ]]; then return; fi - for d in $forceShare; do + for d in "${forceShare[@]}"; do if [ -d "$out/$d" ]; then if [ -d "$out/share/$d" ]; then echo "both $d/ and share/$d/ exist!" @@ -20,4 +25,3 @@ _moveToShare() { fi done } - diff --git a/pkgs/build-support/setup-hooks/move-systemd-user-units.sh b/pkgs/build-support/setup-hooks/move-systemd-user-units.sh index 5963d87c7515..33e89898262f 100755 --- a/pkgs/build-support/setup-hooks/move-systemd-user-units.sh +++ b/pkgs/build-support/setup-hooks/move-systemd-user-units.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +# shellcheck shell=bash # This setup hook, for each output, moves everything in # $output/lib/systemd/user to $output/share/systemd/user, and replaces diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index bfa47e3b20e1..3a318933f138 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -4,16 +4,32 @@ preFixupHooks+=(_multioutDocs) preFixupHooks+=(_multioutDevs) postFixupHooks+=(_multioutPropagateDev) -# Assign the first string containing nonempty variable to the variable named $1 +# _assignFirst varName otherVarNames* +# +# Set the value of the variable named $varName to the first of otherVarNames +# that refers to a non-empty variable name. +# +# If none of otherVarNames refers to a non-empty variable, the error message is +# specific to this function's use case, which is setting up the output variables. _assignFirst() { local varName="$1" local REMOVE=REMOVE # slightly hacky - we allow REMOVE (i.e. not a variable name) shift - while (( $# )); do - if [ -n "${!1-}" ]; then eval "${varName}"="$1"; return; fi - shift + for var in "$@"; do + if [ -n "${!var-}" ]; then eval "${varName}"="${var}"; return; fi done - echo "Error: _assignFirst found no valid variant!" + echo + echo "error: _assignFirst: could not find a non-empty variable to assign to ${varName}." + echo " The following variables were all unset or empty:" + echo " $*" + if [ -z "${out:-}" ]; then + echo ' If you do not want an "out" output in your derivation, make sure to define' + echo ' the other specific required outputs. This can be achieved by picking one' + echo " of the above as an output." + echo ' You do not have to remove "out" if you want to have a different default' + echo ' output, because the first output is taken as a default.' + echo + fi return 1 # none found } @@ -47,7 +63,7 @@ _overrideFirst outputInfo "info" "$outputBin" # Add standard flags to put files into the desired outputs. _multioutConfig() { - if [ "$outputs" = "out" ] || [ -z "${setOutputFlags-1}" ]; then return; fi; + if [ "$(getAllOutputNames)" = "out" ] || [ -z "${setOutputFlags-1}" ]; then return; fi; # try to detect share/doc/${shareDocName} # Note: sadly, $configureScript detection comes later in configurePhase, @@ -66,19 +82,17 @@ _multioutConfig() { fi fi - configureFlags="\ - --bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \ - --includedir=${!outputInclude}/include --oldincludedir=${!outputInclude}/include \ - --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \ - --docdir=${!outputDoc}/share/doc/${shareDocName} \ - --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \ - --localedir=${!outputLib}/share/locale \ - $configureFlags" + prependToVar configureFlags \ + --bindir="${!outputBin}"/bin --sbindir="${!outputBin}"/sbin \ + --includedir="${!outputInclude}"/include --oldincludedir="${!outputInclude}"/include \ + --mandir="${!outputMan}"/share/man --infodir="${!outputInfo}"/share/info \ + --docdir="${!outputDoc}"/share/doc/"${shareDocName}" \ + --libdir="${!outputLib}"/lib --libexecdir="${!outputLib}"/libexec \ + --localedir="${!outputLib}"/share/locale - installFlags="\ - pkgconfigdir=${!outputDev}/lib/pkgconfig \ - m4datadir=${!outputDev}/share/aclocal aclocaldir=${!outputDev}/share/aclocal \ - $installFlags" + prependToVar installFlags \ + pkgconfigdir="${!outputDev}"/lib/pkgconfig \ + m4datadir="${!outputDev}"/share/aclocal aclocaldir="${!outputDev}"/share/aclocal } @@ -88,13 +102,13 @@ NIX_NO_SELF_RPATH=1 # Move subpaths that match pattern $1 from under any output/ to the $2 output/ -# Beware: only globbing patterns are accepted, e.g.: * ? {foo,bar} +# Beware: only globbing patterns are accepted, e.g.: * ? [abc] # A special target "REMOVE" is allowed: moveToOutput foo REMOVE moveToOutput() { local patt="$1" local dstOut="$2" local output - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "${!output}" = "$dstOut" ]; then continue; fi local srcPath for srcPath in "${!output}"/$patt; do @@ -149,7 +163,7 @@ _multioutDocs() { # Move development-only stuff to the desired outputs. _multioutDevs() { - if [ "$outputs" = "out" ] || [ -z "${moveToDev-1}" ]; then return; fi; + if [ "$(getAllOutputNames)" = "out" ] || [ -z "${moveToDev-1}" ]; then return; fi; moveToOutput include "${!outputInclude}" # these files are sometimes provided even without using the corresponding tool moveToOutput lib/pkgconfig "${!outputDev}" @@ -166,10 +180,10 @@ _multioutDevs() { # Make the "dev" propagate other outputs needed for development. _multioutPropagateDev() { - if [ "$outputs" = "out" ]; then return; fi; + if [ "$(getAllOutputNames)" = "out" ]; then return; fi; local outputFirst - for outputFirst in $outputs; do + for outputFirst in $(getAllOutputNames); do break done local propagaterOutput="$outputDev" diff --git a/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh b/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh index a450ecd7f963..77322b245b27 100644 --- a/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh +++ b/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh @@ -70,7 +70,7 @@ patchPpdFileCommands () { # * outputs of current build before buildInputs # * `/lib/cups/filter' before `/bin` # * add HOST_PATH at end, so we don't miss anything - for path in $outputs; do + for path in $(getAllOutputNames); do addToSearchPath cupspath "${!path}/lib/cups/filter" addToSearchPath cupspath "${!path}/bin" done diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index 04ebcd2cc64e..a26113abea88 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -100,8 +100,6 @@ patchShebangs() { fi fi done < <(find "$@" -type f -perm -0100 -print0) - - stopNest } patchShebangsAuto () { diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh b/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh index 041a3f565332..3eec67d60feb 100644 --- a/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh +++ b/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh @@ -50,10 +50,10 @@ EOF fi if ! type initdb >/dev/null; then - echo >&2 'initdb not found. Did you add postgresql to the checkInputs?' + echo >&2 'initdb not found. Did you add postgresql to the nativeCheckInputs?' false fi - header 'initializing postgresql' + echo 'initializing postgresql' initdb -U postgres # Move the socket @@ -65,15 +65,17 @@ EOF echo "listen_addresses = ''" >>"$PGDATA/postgresql.conf" fi - header 'starting postgresql' + echo 'starting postgresql' eval "${postgresqlStartCommands:-pg_ctl start}" - header 'setting up postgresql' + echo 'setting up postgresql' eval "$postgresqlTestSetupCommands" + runHook postgresqlTestSetupPost + } postgresqlStop() { - header 'stopping postgresql' + echo 'stopping postgresql' pg_ctl stop } diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix b/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix index 6d8ad6c8c7e3..9881ed1016cc 100644 --- a/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix +++ b/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "postgresql-test-hook-test"; buildInputs = [ postgresqlTestHook ]; - checkInputs = [ postgresql ]; + nativeCheckInputs = [ postgresql ]; dontUnpack = true; doCheck = true; passAsFile = ["sql"]; @@ -14,6 +14,9 @@ stdenv.mkDerivation { INSERT INTO hello VALUES ('it '||'worked'); SELECT * FROM hello; ''; + postgresqlTestSetupPost = '' + TEST_POST_HOOK_RAN=1 + ''; checkPhase = '' runHook preCheck psql <$sqlPath | grep 'it worked' @@ -21,7 +24,7 @@ stdenv.mkDerivation { runHook postCheck ''; installPhase = '' - [[ $TEST_RAN == 1 ]] + [[ $TEST_RAN == 1 && $TEST_POST_HOOK_RAN == 1 ]] touch $out ''; } diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index be94af545be1..3c8c9c294c3e 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -26,7 +26,7 @@ _separateDebugInfo() { fi # Extract the debug info. - header "separating debug info from $i (build ID $id)" + echo "separating debug info from $i (build ID $id)" mkdir -p "$dst/${id:0:2}" # This may fail, e.g. if the binary is for a different diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh index 9bd7b24cab54..f5e3bdced699 100644 --- a/pkgs/build-support/setup-hooks/strip.sh +++ b/pkgs/build-support/setup-hooks/strip.sh @@ -12,11 +12,20 @@ _doStrip() { local -ra stripCmds=(STRIP STRIP_FOR_TARGET) local -ra ranlibCmds=(RANLIB RANLIB_FOR_TARGET) + # TODO(structured-attrs): This doesn't work correctly if one of + # the items in strip*List or strip*Flags contains a space, + # even with structured attrs enabled. This is OK for now + # because very few packages set any of these, and it doesn't + # affect any of them. + # + # After __structuredAttrs = true is universal, come back and + # push arrays all the way through this logic. + # Strip only host paths by default. Leave targets as is. - stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin} - stripDebugListTarget=${stripDebugListTarget:-} - stripAllList=${stripAllList:-} - stripAllListTarget=${stripAllListTarget:-} + stripDebugList=${stripDebugList[*]:-lib lib32 lib64 libexec bin sbin} + stripDebugListTarget=${stripDebugListTarget[*]:-} + stripAllList=${stripAllList[*]:-} + stripAllListTarget=${stripAllListTarget[*]:-} local i for i in ${!stripCmds[@]}; do @@ -27,11 +36,11 @@ _doStrip() { local -n ranlibCmd="${ranlibCmds[$i]}" # `dontStrip` disables them all - if [[ "${dontStrip-}" || "${flag-}" ]] || ! type -f "${stripCmd-}" 2>/dev/null + if [[ "${dontStrip-}" || "${flag-}" ]] || ! type -f "${stripCmd-}" 2>/dev/null 1>&2 then continue; fi - stripDirs "$stripCmd" "$ranlibCmd" "$debugDirList" "${stripDebugFlags:--S}" - stripDirs "$stripCmd" "$ranlibCmd" "$allDirList" "${stripAllFlags:--s}" + stripDirs "$stripCmd" "$ranlibCmd" "$debugDirList" "${stripDebugFlags[*]:--S}" + stripDirs "$stripCmd" "$ranlibCmd" "$allDirList" "${stripAllFlags[*]:--s}" done } diff --git a/pkgs/build-support/setup-hooks/win-dll-link.sh b/pkgs/build-support/setup-hooks/win-dll-link.sh index 6130f32bef86..ca4cbb349b6c 100644 --- a/pkgs/build-support/setup-hooks/win-dll-link.sh +++ b/pkgs/build-support/setup-hooks/win-dll-link.sh @@ -15,7 +15,7 @@ _linkDLLs() { # prefix $PATH by currently-built outputs local DLLPATH="" local outName - for outName in $outputs; do + for outName in $(getAllOutputNames); do addToSearchPath DLLPATH "${!outName}/bin" done DLLPATH="$DLLPATH:$PATH" diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/build-support/src-only/default.nix index 520753e37460..6cf5c2ad482b 100644 --- a/pkgs/build-support/src-only/default.nix +++ b/pkgs/build-support/src-only/default.nix @@ -17,5 +17,7 @@ stdenv.mkDerivation (args // { installPhase = "cp -r . $out"; outputs = [ "out" ]; separateDebugInfo = false; + dontUnpack = false; + dontInstall = false; phases = ["unpackPhase" "patchPhase" "installPhase"]; }) diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix index 6ab0ee843cb0..15694162edde 100644 --- a/pkgs/build-support/testers/default.nix +++ b/pkgs/build-support/testers/default.nix @@ -121,4 +121,6 @@ in nixosTesting.simpleTest calledTest; + hasPkgConfigModule = callPackage ./hasPkgConfigModule/tester.nix { }; + } diff --git a/pkgs/build-support/testers/expect-failure.sh b/pkgs/build-support/testers/expect-failure.sh index 23e8698cf479..9c725d48bf34 100644 --- a/pkgs/build-support/testers/expect-failure.sh +++ b/pkgs/build-support/testers/expect-failure.sh @@ -21,7 +21,7 @@ set -eu echo "testBuildFailure: Expecting non-zero exit from builder and args: ${*@Q}" ("$@" 2>&1) | @coreutils@/bin/tee $TMPDIR/testBuildFailure.log \ - | while read ln; do + | while IFS= read -r ln; do echo "original builder: $ln" done @@ -34,8 +34,17 @@ echo "testBuildFailure: Original builder produced exit code: $r" # ----------------------------------------- # Write the build log to the default output +# +# # from stdenv setup.sh +getAllOutputNames() { + if [ -n "$__structuredAttrs" ]; then + echo "${!outputs[*]}" + else + echo "$outputs" + fi +} -outs=( $outputs ) +outs=( $(getAllOutputNames) ) defOut=${outs[0]} defOutPath=${!defOut} diff --git a/pkgs/build-support/testers/hasPkgConfigModule/tester.nix b/pkgs/build-support/testers/hasPkgConfigModule/tester.nix new file mode 100644 index 000000000000..c8342cdd5c3b --- /dev/null +++ b/pkgs/build-support/testers/hasPkgConfigModule/tester.nix @@ -0,0 +1,47 @@ +# Static arguments +{ runCommand, pkg-config }: + +# Tester arguments +{ package, + moduleName, + testName ? "check-pkg-config-${moduleName}", +}: + +runCommand testName { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ package ]; + inherit moduleName; + meta = { + description = "Test whether ${package.name} exposes pkg-config module ${moduleName}"; + } + # Make sure licensing info etc is preserved, as this is a concern for e.g. cache.nixos.org, + # as hydra can't check this meta info in dependencies. + # The test itself is just Nixpkgs, with MIT license. + // builtins.intersectAttrs + { + available = throw "unused"; + broken = throw "unused"; + insecure = throw "unused"; + license = throw "unused"; + maintainers = throw "unused"; + platforms = throw "unused"; + unfree = throw "unused"; + unsupported = throw "unused"; + } + package.meta; + } '' + echo "checking pkg-config module $moduleName in $buildInputs" + set +e + version="$(pkg-config --modversion $moduleName)" + r=$? + set -e + if [[ $r = 0 ]]; then + echo "✅ pkg-config module $moduleName exists and has version $version" + echo "$version" > $out + else + echo "These modules were available in the input propagation closure:" + pkg-config --list-all + echo "❌ pkg-config module $moduleName was not found" + false + fi + '' diff --git a/pkgs/build-support/testers/hasPkgConfigModule/tests.nix b/pkgs/build-support/testers/hasPkgConfigModule/tests.nix new file mode 100644 index 000000000000..8005c3f93709 --- /dev/null +++ b/pkgs/build-support/testers/hasPkgConfigModule/tests.nix @@ -0,0 +1,36 @@ +# cd nixpkgs +# nix-build -A tests.testers.hasPkgConfigModule +{ lib, testers, zlib, runCommand }: + +lib.recurseIntoAttrs { + + zlib-has-zlib = testers.hasPkgConfigModule { + package = zlib; + moduleName = "zlib"; + }; + + zlib-does-not-have-ylib = runCommand "zlib-does-not-have-ylib" { + failed = testers.testBuildFailure ( + testers.hasPkgConfigModule { + package = zlib; + moduleName = "ylib"; + } + ); + } '' + echo 'it logs a relevant error message' + { + grep -F "pkg-config module ylib was not found" $failed/testBuildFailure.log + } + + echo 'it logs which pkg-config modules are available, to be helpful' + { + # grep -v: the string zlib does also occur in a store path in an earlier message, which isn't particularly helpful + grep -v "checking pkg-config module" < $failed/testBuildFailure.log \ + | grep -F "zlib" + } + + # done + touch $out + ''; + +} diff --git a/pkgs/build-support/testers/test/default.nix b/pkgs/build-support/testers/test/default.nix index d6dfbe34fd21..313c556737fb 100644 --- a/pkgs/build-support/testers/test/default.nix +++ b/pkgs/build-support/testers/test/default.nix @@ -12,6 +12,8 @@ let in lib.recurseIntoAttrs { + hasPkgConfigModule = pkgs.callPackage ../hasPkgConfigModule/tests.nix { }; + # Check that the wiring of nixosTest is correct. # Correct operation of the NixOS test driver should be asserted elsewhere. nixosTest-example = pkgs-with-overlay.testers.nixosTest ({ lib, pkgs, figlet, ... }: { @@ -29,15 +31,24 @@ lib.recurseIntoAttrs { happy = runCommand "testBuildFailure-happy" { failed = testers.testBuildFailure (runCommand "fail" {} '' echo ok-ish >$out + echo failing though echo also stderr 1>&2 + echo 'line\nwith-\bbackslashes' + printf "incomplete line - no newline" + exit 3 ''); } '' + grep -F 'ok-ish' $failed/result + grep -F 'failing though' $failed/testBuildFailure.log grep -F 'also stderr' $failed/testBuildFailure.log - grep -F 'ok-ish' $failed/result + grep -F 'line\nwith-\bbackslashes' $failed/testBuildFailure.log + grep -F 'incomplete line - no newline' $failed/testBuildFailure.log + [[ 3 = $(cat $failed/testBuildFailure.exit) ]] + touch $out ''; @@ -49,9 +60,10 @@ lib.recurseIntoAttrs { inherit hello; } '' echo "Checking $failed/testBuildFailure.log" - grep -F 'testBuildFailure: The builder did not fail, but a failure was expected' $failed/testBuildFailure.log + grep -F 'testBuildFailure: The builder did not fail, but a failure was expected' $failed/testBuildFailure.log >/dev/null [[ 1 = $(cat $failed/testBuildFailure.exit) ]] touch $out + echo 'All good.' ''; multiOutput = runCommand "testBuildFailure-multiOutput" { diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 39c5787e3823..d8aa6c232444 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -10,25 +10,30 @@ in rec { /* Run the shell command `buildCommand' to produce a store path named - * `name'. The attributes in `env' are added to the environment - * prior to running the command. By default `runCommand` runs in a - * stdenv with no compiler environment. `runCommandCC` uses the default - * stdenv, `pkgs.stdenv`. - * - * Examples: - * runCommand "name" {envVariable = true;} ''echo hello > $out'' - * runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out''; - * - * The `*Local` variants force a derivation to be built locally, - * it is not substituted. - * - * This is intended for very cheap commands (<1s execution time). - * It saves on the network roundrip and can speed up a build. - * - * It is the same as adding the special fields - * `preferLocalBuild = true;` - * `allowSubstitutes = false;` - * to a derivation’s attributes. + `name'. The attributes in `env' are added to the environment + prior to running the command. By default `runCommand` runs in a + stdenv with no compiler environment. `runCommandCC` uses the default + stdenv, `pkgs.stdenv`. + + Example: + + + runCommand "name" {envVariable = true;} ''echo hello > $out'' + runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out''; + + + The `*Local` variants force a derivation to be built locally, + it is not substituted. + + This is intended for very cheap commands (<1s execution time). + It saves on the network roundrip and can speed up a build. + + It is the same as adding the special fields + + `preferLocalBuild = true;` + `allowSubstitutes = false;` + + to a derivation’s attributes. */ runCommand = name: env: runCommandWith { stdenv = stdenvNoCC; @@ -53,27 +58,28 @@ rec { # We shouldn’t force the user to have a cc in scope. /* Generalized version of the `runCommand`-variants - * which does customized behavior via a single - * attribute set passed as the first argument - * instead of having a lot of variants like - * `runCommand*`. Additionally it allows changing - * the used `stdenv` freely and has a more explicit - * approach to changing the arguments passed to - * `stdenv.mkDerivation`. + which does customized behavior via a single + attribute set passed as the first argument + instead of having a lot of variants like + `runCommand*`. Additionally it allows changing + the used `stdenv` freely and has a more explicit + approach to changing the arguments passed to + `stdenv.mkDerivation`. */ runCommandWith = let # prevent infinite recursion for the default stdenv value defaultStdenv = stdenv; in - { stdenv ? defaultStdenv + { # which stdenv to use, defaults to a stdenv with a C compiler, pkgs.stdenv - , runLocal ? false + stdenv ? defaultStdenv # whether to build this derivation locally instead of substituting - , derivationArgs ? {} + , runLocal ? false # extra arguments to pass to stdenv.mkDerivation - , name + , derivationArgs ? {} # name of the resulting derivation + , name # TODO(@Artturin): enable strictDeps always }: buildCommand: stdenv.mkDerivation ({ @@ -90,27 +96,34 @@ rec { /* Writes a text file to the nix store. - * The contents of text is added to the file in the store. - * - * Examples: - * # Writes my-file to /nix/store/ - * writeTextFile { - * name = "my-file"; - * text = '' - * Contents of File - * ''; - * } - * # See also the `writeText` helper function below. - * - * # Writes executable my-file to /nix/store//bin/my-file - * writeTextFile { - * name = "my-file"; - * text = '' - * Contents of File - * ''; - * executable = true; - * destination = "/bin/my-file"; - * } + The contents of text is added to the file in the store. + + Example: + + + # Writes my-file to /nix/store/ + writeTextFile { + name = "my-file"; + text = '' + Contents of File + ''; + } + + + See also the `writeText` helper function below. + + + # Writes executable my-file to /nix/store//bin/my-file + writeTextFile { + name = "my-file"; + text = '' + Contents of File + ''; + executable = true; + destination = "/bin/my-file"; + } + + */ writeTextFile = { name # the name of the derivation @@ -143,29 +156,35 @@ rec { ''; /* - * Writes a text file to nix store with no optional parameters available. - * - * Example: - * # Writes contents of file to /nix/store/ - * writeText "my-file" - * '' - * Contents of File - * ''; - * + Writes a text file to nix store with no optional parameters available. + + Example: + + + # Writes contents of file to /nix/store/ + writeText "my-file" + '' + Contents of File + ''; + + */ writeText = name: text: writeTextFile {inherit name text;}; /* - * Writes a text file to nix store in a specific directory with no - * optional parameters available. - * - * Example: - * # Writes contents of file to /nix/store//share/my-file - * writeTextDir "share/my-file" - * '' - * Contents of File - * ''; - * + Writes a text file to nix store in a specific directory with no + optional parameters available. + + Example: + + + # Writes contents of file to /nix/store//share/my-file + writeTextDir "share/my-file" + '' + Contents of File + ''; + + */ writeTextDir = path: text: writeTextFile { inherit text; @@ -174,48 +193,58 @@ rec { }; /* - * Writes a text file to /nix/store/ and marks the file as - * executable. - * - * If passed as a build input, will be used as a setup hook. This makes setup - * hooks more efficient to create: you don't need a derivation that copies - * them to $out/nix-support/setup-hook, instead you can use the file as is. - * - * Example: - * # Writes my-file to /nix/store/ and makes executable - * writeScript "my-file" - * '' - * Contents of File - * ''; - * + Writes a text file to /nix/store/ and marks the file as + executable. + + If passed as a build input, will be used as a setup hook. This makes setup + hooks more efficient to create: you don't need a derivation that copies + them to $out/nix-support/setup-hook, instead you can use the file as is. + + Example: + + + # Writes my-file to /nix/store/ and makes executable + writeScript "my-file" + '' + Contents of File + ''; + + */ writeScript = name: text: writeTextFile {inherit name text; executable = true;}; /* - * Writes a text file to /nix/store//bin/ and - * marks the file as executable. - * - * Example: - * # Writes my-file to /nix/store//bin/my-file and makes executable. - * writeScriptBin "my-file" - * '' - * Contents of File - * ''; - * + Writes a text file to /nix/store//bin/ and + marks the file as executable. + + Example: + + + + # Writes my-file to /nix/store//bin/my-file and makes executable. + writeScriptBin "my-file" + '' + Contents of File + ''; + + */ writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";}; /* - * Similar to writeScript. Writes a Shell script and checks its syntax. - * Automatically includes interpreter above the contents passed. - * - * Example: - * # Writes my-file to /nix/store/ and makes executable. - * writeShellScript "my-file" - * '' - * Contents of File - * ''; - * + Similar to writeScript. Writes a Shell script and checks its syntax. + Automatically includes interpreter above the contents passed. + + Example: + + + # Writes my-file to /nix/store/ and makes executable. + writeShellScript "my-file" + '' + Contents of File + ''; + + */ writeShellScript = name: text: writeTextFile { @@ -231,17 +260,20 @@ rec { }; /* - * Similar to writeShellScript and writeScriptBin. - * Writes an executable Shell script to /nix/store//bin/ and checks its syntax. - * Automatically includes interpreter above the contents passed. - * - * Example: - * # Writes my-file to /nix/store//bin/my-file and makes executable. - * writeShellScriptBin "my-file" - * '' - * Contents of File - * ''; - * + Similar to writeShellScript and writeScriptBin. + Writes an executable Shell script to /nix/store//bin/ and checks its syntax. + Automatically includes interpreter above the contents passed. + + Example: + + + # Writes my-file to /nix/store//bin/my-file and makes executable. + writeShellScriptBin "my-file" + '' + Contents of File + ''; + + */ writeShellScriptBin = name : text : writeTextFile { @@ -258,25 +290,29 @@ rec { }; /* - * Similar to writeShellScriptBin and writeScriptBin. - * Writes an executable Shell script to /nix/store//bin/ and - * checks its syntax with shellcheck and the shell's -n option. - * Automatically includes sane set of shellopts (errexit, nounset, pipefail) - * and handles creation of PATH based on runtimeInputs - * - * Note that the checkPhase uses stdenv.shell for the test run of the script, - * while the generated shebang uses runtimeShell. If, for whatever reason, - * those were to mismatch you might lose fidelity in the default checks. - * - * Example: - * # Writes my-file to /nix/store//bin/my-file and makes executable. - * writeShellApplication { - * name = "my-file"; - * runtimeInputs = [ curl w3m ]; - * text = '' - * curl -s 'https://nixos.org' | w3m -dump -T text/html - * ''; - * } + Similar to writeShellScriptBin and writeScriptBin. + Writes an executable Shell script to /nix/store//bin/ and + checks its syntax with shellcheck and the shell's -n option. + Automatically includes sane set of shellopts (errexit, nounset, pipefail) + and handles creation of PATH based on runtimeInputs + + Note that the checkPhase uses stdenv.shell for the test run of the script, + while the generated shebang uses runtimeShell. If, for whatever reason, + those were to mismatch you might lose fidelity in the default checks. + + Example: + + Writes my-file to /nix/store//bin/my-file and makes executable. + + + writeShellApplication { + name = "my-file"; + runtimeInputs = [ curl w3m ]; + text = '' + curl -s 'https://nixos.org' | w3m -dump -T text/html + ''; + } + */ writeShellApplication = { name @@ -305,7 +341,7 @@ rec { if checkPhase == null then '' runHook preCheck ${stdenv.shellDryRun} "$target" - ${shellcheck}/bin/shellcheck "$target" + ${shellcheck.unwrapped}/bin/shellcheck "$target" runHook postCheck '' else checkPhase; @@ -333,23 +369,30 @@ rec { /* concat a list of files to the nix store. - * The contents of files are added to the file in the store. - * - * Examples: - * # Writes my-file to /nix/store/ - * concatTextFile { - * name = "my-file"; - * files = [ drv1 "${drv2}/path/to/file" ]; - * } - * # See also the `concatText` helper function below. - * - * # Writes executable my-file to /nix/store//bin/my-file - * concatTextFile { - * name = "my-file"; - * files = [ drv1 "${drv2}/path/to/file" ]; - * executable = true; - * destination = "/bin/my-file"; - * } + The contents of files are added to the file in the store. + + Example: + + + # Writes my-file to /nix/store/ + concatTextFile { + name = "my-file"; + files = [ drv1 "${drv2}/path/to/file" ]; + } + + + See also the `concatText` helper function below. + + + # Writes executable my-file to /nix/store//bin/my-file + concatTextFile { + name = "my-file"; + files = [ drv1 "${drv2}/path/to/file" ]; + executable = true; + destination = "/bin/my-file"; + } + + */ concatTextFile = { name # the name of the derivation @@ -372,70 +415,81 @@ rec { /* - * Writes a text file to nix store with no optional parameters available. - * - * Example: - * # Writes contents of files to /nix/store/ - * concatText "my-file" [ file1 file2 ] - * + Writes a text file to nix store with no optional parameters available. + + Example: + + + # Writes contents of files to /nix/store/ + concatText "my-file" [ file1 file2 ] + + */ concatText = name: files: concatTextFile { inherit name files; }; - /* - * Writes a text file to nix store with and mark it as executable. - * - * Example: - * # Writes contents of files to /nix/store/ - * concatScript "my-file" [ file1 file2 ] - * + /* + Writes a text file to nix store with and mark it as executable. + + Example: + # Writes contents of files to /nix/store/ + concatScript "my-file" [ file1 file2 ] + */ concatScript = name: files: concatTextFile { inherit name files; executable = true; }; /* - * Create a forest of symlinks to the files in `paths'. - * - * This creates a single derivation that replicates the directory structure - * of all the input paths. - * - * BEWARE: it may not "work right" when the passed paths contain symlinks to directories. - * - * Examples: - * # adds symlinks of hello to current build. - * symlinkJoin { name = "myhello"; paths = [ pkgs.hello ]; } - * - * # adds symlinks of hello and stack to current build and prints "links added" - * symlinkJoin { name = "myexample"; paths = [ pkgs.hello pkgs.stack ]; postBuild = "echo links added"; } - * - * This creates a derivation with a directory structure like the following: - * - * /nix/store/sglsr5g079a5235hy29da3mq3hv8sjmm-myexample - * |-- bin - * | |-- hello -> /nix/store/qy93dp4a3rqyn2mz63fbxjg228hffwyw-hello-2.10/bin/hello - * | `-- stack -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/bin/stack - * `-- share - * |-- bash-completion - * | `-- completions - * | `-- stack -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/share/bash-completion/completions/stack - * |-- fish - * | `-- vendor_completions.d - * | `-- stack.fish -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/share/fish/vendor_completions.d/stack.fish - * ... - * - * symlinkJoin and linkFarm are similar functions, but they output - * derivations with different structure. - * - * symlinkJoin is used to create a derivation with a familiar directory - * structure (top-level bin/, share/, etc), but with all actual files being symlinks to - * the files in the input derivations. - * - * symlinkJoin is used many places in nixpkgs to create a single derivation - * that appears to contain binaries, libraries, documentation, etc from - * multiple input derivations. - * - * linkFarm is instead used to create a simple derivation with symlinks to - * other derivations. A derivation created with linkFarm is often used in CI - * as a easy way to build multiple derivations at once. + Create a forest of symlinks to the files in `paths'. + + This creates a single derivation that replicates the directory structure + of all the input paths. + + BEWARE: it may not "work right" when the passed paths contain symlinks to directories. + + Example: + + + # adds symlinks of hello to current build. + symlinkJoin { name = "myhello"; paths = [ pkgs.hello ]; } + + + + + # adds symlinks of hello and stack to current build and prints "links added" + symlinkJoin { name = "myexample"; paths = [ pkgs.hello pkgs.stack ]; postBuild = "echo links added"; } + + + This creates a derivation with a directory structure like the following: + + + /nix/store/sglsr5g079a5235hy29da3mq3hv8sjmm-myexample + |-- bin + | |-- hello -> /nix/store/qy93dp4a3rqyn2mz63fbxjg228hffwyw-hello-2.10/bin/hello + | `-- stack -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/bin/stack + `-- share + |-- bash-completion + | `-- completions + | `-- stack -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/share/bash-completion/completions/stack + |-- fish + | `-- vendor_completions.d + | `-- stack.fish -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/share/fish/vendor_completions.d/stack.fish + ... + + + symlinkJoin and linkFarm are similar functions, but they output + derivations with different structure. + + symlinkJoin is used to create a derivation with a familiar directory + structure (top-level bin/, share/, etc), but with all actual files being symlinks to + the files in the input derivations. + + symlinkJoin is used many places in nixpkgs to create a single derivation + that appears to contain binaries, libraries, documentation, etc from + multiple input derivations. + + linkFarm is instead used to create a simple derivation with symlinks to + other derivations. A derivation created with linkFarm is often used in CI + as a easy way to build multiple derivations at once. */ symlinkJoin = args_@{ name @@ -461,29 +515,34 @@ rec { ''; /* - * Quickly create a set of symlinks to derivations. - * - * This creates a simple derivation with symlinks to all inputs. - * - * entries can be a list of attribute sets like - * [ { name = "name" ; path = "/nix/store/..."; } ] - * - * or an attribute set name -> path like: - * { name = "/nix/store/..."; other = "/nix/store/..."; } - * - * Example: - * - * # Symlinks hello and stack paths in store to current $out/hello-test and - * # $out/foobar. - * linkFarm "myexample" [ { name = "hello-test"; path = pkgs.hello; } { name = "foobar"; path = pkgs.stack; } ] - * - * This creates a derivation with a directory structure like the following: - * - * /nix/store/qc5728m4sa344mbks99r3q05mymwm4rw-myexample - * |-- foobar -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1 - * `-- hello-test -> /nix/store/qy93dp4a3rqyn2mz63fbxjg228hffwyw-hello-2.10 - * - * See the note on symlinkJoin for the difference between linkFarm and symlinkJoin. + Quickly create a set of symlinks to derivations. + + This creates a simple derivation with symlinks to all inputs. + + entries can be a list of attribute sets like + + [ { name = "name" ; path = "/nix/store/..."; } ] + + + or an attribute set name -> path like: + + { name = "/nix/store/..."; other = "/nix/store/..."; } + + + Example: + + # Symlinks hello and stack paths in store to current $out/hello-test and + # $out/foobar. + linkFarm "myexample" [ { name = "hello-test"; path = pkgs.hello; } { name = "foobar"; path = pkgs.stack; } ] + + This creates a derivation with a directory structure like the following: + + /nix/store/qc5728m4sa344mbks99r3q05mymwm4rw-myexample + |-- foobar -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1 + `-- hello-test -> /nix/store/qy93dp4a3rqyn2mz63fbxjg228hffwyw-hello-2.10 + + + See the note on symlinkJoin for the difference between linkFarm and symlinkJoin. */ linkFarm = name: entries: let @@ -509,56 +568,67 @@ rec { ''; /* - * Easily create a linkFarm from a set of derivations. - * - * This calls linkFarm with a list of entries created from the list of input - * derivations. It turns each input derivation into an attribute set - * like { name = drv.name ; path = drv }, and passes this to linkFarm. - * - * Example: - * - * # Symlinks the hello, gcc, and ghc derivations in $out - * linkFarmFromDrvs "myexample" [ pkgs.hello pkgs.gcc pkgs.ghc ] - * - * This creates a derivation with a directory structure like the following: - * - * /nix/store/m3s6wkjy9c3wy830201bqsb91nk2yj8c-myexample - * |-- gcc-wrapper-9.2.0 -> /nix/store/fqhjxf9ii4w4gqcsx59fyw2vvj91486a-gcc-wrapper-9.2.0 - * |-- ghc-8.6.5 -> /nix/store/gnf3s07bglhbbk4y6m76sbh42siym0s6-ghc-8.6.5 - * `-- hello-2.10 -> /nix/store/k0ll91c4npk4lg8lqhx00glg2m735g74-hello-2.10 - */ + Easily create a linkFarm from a set of derivations. + + This calls linkFarm with a list of entries created from the list of input + derivations. It turns each input derivation into an attribute set + like { name = drv.name ; path = drv }, and passes this to linkFarm. + + Example: + + # Symlinks the hello, gcc, and ghc derivations in $out + linkFarmFromDrvs "myexample" [ pkgs.hello pkgs.gcc pkgs.ghc ] + + This creates a derivation with a directory structure like the following: + + + /nix/store/m3s6wkjy9c3wy830201bqsb91nk2yj8c-myexample + |-- gcc-wrapper-9.2.0 -> /nix/store/fqhjxf9ii4w4gqcsx59fyw2vvj91486a-gcc-wrapper-9.2.0 + |-- ghc-8.6.5 -> /nix/store/gnf3s07bglhbbk4y6m76sbh42siym0s6-ghc-8.6.5 + `-- hello-2.10 -> /nix/store/k0ll91c4npk4lg8lqhx00glg2m735g74-hello-2.10 + + */ linkFarmFromDrvs = name: drvs: let mkEntryFromDrv = drv: { name = drv.name; path = drv; }; in linkFarm name (map mkEntryFromDrv drvs); /* - * Make a package that just contains a setup hook with the given contents. - * This setup hook will be invoked by any package that includes this package - * as a buildInput. Optionally takes a list of substitutions that should be - * applied to the resulting script. - * - * Examples: - * # setup hook that depends on the hello package and runs ./myscript.sh - * myhellohook = makeSetupHook { deps = [ hello ]; } ./myscript.sh; - * - * # writes a Linux-exclusive setup hook where @bash@ myscript.sh is substituted for the - * # bash interpreter. - * myhellohookSub = makeSetupHook { - * deps = [ hello ]; - * substitutions = { bash = "${pkgs.bash}/bin/bash"; }; - * meta.platforms = lib.platforms.linux; - * } ./myscript.sh; - * - * # setup hook with a package test - * myhellohookTested = makeSetupHook { - * deps = [ hello ]; - * substitutions = { bash = "${pkgs.bash}/bin/bash"; }; - * meta.platforms = lib.platforms.linux; - * passthru.tests.greeting = callPackage ./test { }; - * } ./myscript.sh; + Make a package that just contains a setup hook with the given contents. + This setup hook will be invoked by any package that includes this package + as a buildInput. Optionally takes a list of substitutions that should be + applied to the resulting script. + + Examples: + # setup hook that depends on the hello package and runs ./myscript.sh + myhellohook = makeSetupHook { deps = [ hello ]; } ./myscript.sh; + + # writes a Linux-exclusive setup hook where @bash@ myscript.sh is substituted for the + # bash interpreter. + myhellohookSub = makeSetupHook { + name = "myscript-hook"; + deps = [ hello ]; + substitutions = { bash = "${pkgs.bash}/bin/bash"; }; + meta.platforms = lib.platforms.linux; + } ./myscript.sh; + + # setup hook with a package test + myhellohookTested = makeSetupHook { + name = "myscript-hook"; + deps = [ hello ]; + substitutions = { bash = "${pkgs.bash}/bin/bash"; }; + meta.platforms = lib.platforms.linux; + passthru.tests.greeting = callPackage ./test { }; + } ./myscript.sh; */ - makeSetupHook = { name ? "hook", deps ? [], substitutions ? {}, meta ? {}, passthru ? {} }: script: + makeSetupHook = + { name ? lib.warn "calling makeSetupHook without passing a name is deprecated." "hook" + , deps ? [] + , substitutions ? {} + , meta ? {} + , passthru ? {} + }: + script: runCommand name (substitutions // { inherit meta; @@ -626,27 +696,27 @@ rec { /* - * Extract a string's references to derivations and paths (its - * context) and write them to a text file, removing the input string - * itself from the dependency graph. This is useful when you want to - * make a derivation depend on the string's references, but not its - * contents (to avoid unnecessary rebuilds, for example). - * - * Note that this only works as intended on Nix >= 2.3. + Extract a string's references to derivations and paths (its + context) and write them to a text file, removing the input string + itself from the dependency graph. This is useful when you want to + make a derivation depend on the string's references, but not its + contents (to avoid unnecessary rebuilds, for example). + + Note that this only works as intended on Nix >= 2.3. */ writeStringReferencesToFile = string: /* - * The basic operation this performs is to copy the string context - * from `string' to a second string and wrap that string in a - * derivation. However, that alone is not enough, since nothing in the - * string refers to the output paths of the derivations/paths in its - * context, meaning they'll be considered build-time dependencies and - * removed from the wrapper derivation's closure. Putting the - * necessary output paths in the new string is however not very - * straightforward - the attrset returned by `getContext' contains - * only references to derivations' .drv-paths, not their output - * paths. In order to "convert" them, we try to extract the - * corresponding paths from the original string using regex. + The basic operation this performs is to copy the string context + from `string' to a second string and wrap that string in a + derivation. However, that alone is not enough, since nothing in the + string refers to the output paths of the derivations/paths in its + context, meaning they'll be considered build-time dependencies and + removed from the wrapper derivation's closure. Putting the + necessary output paths in the new string is however not very + straightforward - the attrset returned by `getContext' contains + only references to derivations' .drv-paths, not their output + paths. In order to "convert" them, we try to extract the + corresponding paths from the original string using regex. */ let # Taken from https://github.com/NixOS/nix/blob/130284b8508dad3c70e8160b15f3d62042fc730a/src/libutil/hash.cc#L84 @@ -708,18 +778,19 @@ rec { /* Print an error message if the file with the specified name and - * hash doesn't exist in the Nix store. This function should only - * be used by non-redistributable software with an unfree license - * that we need to require the user to download manually. It produces - * packages that cannot be built automatically. - * - * Examples: - * - * requireFile { - * name = "my-file"; - * url = "http://example.com/download/"; - * sha256 = "ffffffffffffffffffffffffffffffffffffffffffffffffffff"; - * } + hash doesn't exist in the Nix store. This function should only + be used by non-redistributable software with an unfree license + that we need to require the user to download manually. It produces + packages that cannot be built automatically. + + Example: + + requireFile { + name = "my-file"; + url = "http://example.com/download/"; + sha256 = "ffffffffffffffffffffffffffffffffffffffffffffffffffff"; + } + */ requireFile = { name ? null , sha256 ? null @@ -766,30 +837,36 @@ rec { }; - # Copy a path to the Nix store. - # Nix automatically copies files to the store before stringifying paths. - # If you need the store path of a file, ${copyPathToStore } can be - # shortened to ${}. + /* + Copy a path to the Nix store. + Nix automatically copies files to the store before stringifying paths. + If you need the store path of a file, ${copyPathToStore } can be + shortened to ${}. + */ copyPathToStore = builtins.filterSource (p: t: true); - # Copy a list of paths to the Nix store. + /* + Copy a list of paths to the Nix store. + */ copyPathsToStore = builtins.map copyPathToStore; /* Applies a list of patches to a source directory. - * - * Examples: - * - * # Patching nixpkgs: - * applyPatches { - * src = pkgs.path; - * patches = [ - * (pkgs.fetchpatch { - * url = "https://github.com/NixOS/nixpkgs/commit/1f770d20550a413e508e081ddc08464e9d08ba3d.patch"; - * sha256 = "1nlzx171y3r3jbk0qhvnl711kmdk57jlq4na8f8bs8wz2pbffymr"; - * }) - * ]; - * } + + Example: + + # Patching nixpkgs: + + applyPatches { + src = pkgs.path; + patches = [ + (pkgs.fetchpatch { + url = "https://github.com/NixOS/nixpkgs/commit/1f770d20550a413e508e081ddc08464e9d08ba3d.patch"; + sha256 = "1nlzx171y3r3jbk0qhvnl711kmdk57jlq4na8f8bs8wz2pbffymr"; + }) + ]; + } + */ applyPatches = { src diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 06e1deb47845..84754e580302 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -527,9 +527,8 @@ rec { echo "System/kernel: $(uname -a)" if test -e /etc/fedora-release; then echo "Fedora release: $(cat /etc/fedora-release)"; fi if test -e /etc/SuSE-release; then echo "SUSE release: $(cat /etc/SuSE-release)"; fi - header "installed RPM packages" + echo "installed RPM packages" rpm -qa --qf "%{Name}-%{Version}-%{Release} (%{Arch}; %{Distribution}; %{Vendor})\n" - stopNest ''; buildPhase = '' @@ -559,9 +558,8 @@ rec { find $rpmout -name "*.rpm" -exec cp {} $out/$outDir \; for i in $out/$outDir/*.rpm; do - header "Generated RPM/SRPM: $i" + echo "Generated RPM/SRPM: $i" rpm -qip $i - stopNest done eval "$postInstall" @@ -977,45 +975,79 @@ rec { packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - debian9i386 = { - name = "debian-9.13-stretch-i386"; - fullName = "Debian 9.13 Stretch (i386)"; - packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/stretch/main/binary-i386/Packages.xz"; - sha256 = "sha256-fFRumd20wuVaYxzw0VPkAw5mQo8kIg+eXII15VSz9wA="; - }; - urlPrefix = "mirror://debian"; - packages = commonDebianPackages; + ubuntu2204i386 = { + name = "ubuntu-22.04-jammy-i386"; + fullName = "Ubuntu 22.04 Jammy (i386)"; + packagesLists = + [ (fetchurl { + url = "mirror://ubuntu/dists/jammy/main/binary-i386/Packages.xz"; + sha256 = "sha256-iZBmwT0ep4v+V3sayybbOgZBOFFZwPGpOKtmuLMMVPQ="; + }) + (fetchurl { + url = "mirror://ubuntu/dists/jammy/universe/binary-i386/Packages.xz"; + sha256 = "sha256-DO2LdpZ9rDDBhWj2gvDWd0TJJVZHxKsYTKTi6GXjm1E="; + }) + ]; + urlPrefix = "mirror://ubuntu"; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - debian9x86_64 = { - name = "debian-9.13-stretch-amd64"; - fullName = "Debian 9.13 Stretch (amd64)"; - packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/stretch/main/binary-amd64/Packages.xz"; - sha256 = "sha256-1p4DEVpTGlBE3PtbQ90kYw4QNHkW0F4rna/Xz+ncMhw="; - }; - urlPrefix = "mirror://debian"; - packages = commonDebianPackages; + ubuntu2204x86_64 = { + name = "ubuntu-22.04-jammy-amd64"; + fullName = "Ubuntu 22.04 Jammy (amd64)"; + packagesLists = + [ (fetchurl { + url = "mirror://ubuntu/dists/jammy/main/binary-amd64/Packages.xz"; + sha256 = "sha256-N8tX8VVMv6ccWinun/7hipqMF4K7BWjgh0t/9M6PnBE="; + }) + (fetchurl { + url = "mirror://ubuntu/dists/jammy/universe/binary-amd64/Packages.xz"; + sha256 = "sha256-0pyyTJP+xfQyVXBrzn60bUd5lSA52MaKwbsUpvNlXOI="; + }) + ]; + urlPrefix = "mirror://ubuntu"; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; debian10i386 = { - name = "debian-10.9-buster-i386"; - fullName = "Debian 10.9 Buster (i386)"; + name = "debian-10.13-buster-i386"; + fullName = "Debian 10.13 Buster (i386)"; packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/buster/main/binary-i386/Packages.xz"; - sha256 = "sha256-zlkbKV+IGBCyWKD4v4LFM/EUA4TYS9fkLBPuF6MgUDo="; + url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/buster/main/binary-i386/Packages.xz"; + hash = "sha256-n9JquhtZgxw3qr9BX0MQoY3ZTIHN0dit+iru3DC31UY="; }; urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; debian10x86_64 = { - name = "debian-10.9-buster-amd64"; - fullName = "Debian 10.9 Buster (amd64)"; + name = "debian-10.13-buster-amd64"; + fullName = "Debian 10.13 Buster (amd64)"; packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/buster/main/binary-amd64/Packages.xz"; - sha256 = "sha256-k13toY1b3CX7GBPQ7Jm24OMqCEsgPlGK8M99x57o69o="; + url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/buster/main/binary-amd64/Packages.xz"; + hash = "sha256-YukIIB3u87jgp9oudwklsxyKVKjSL618wFgDSXiFmjU="; + }; + urlPrefix = "mirror://debian"; + packages = commonDebianPackages; + }; + + debian11i386 = { + name = "debian-11.5-bullseye-i386"; + fullName = "Debian 11.5 Bullseye (i386)"; + packagesList = fetchurl { + url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/bullseye/main/binary-i386/Packages.xz"; + hash = "sha256-tHrWSd4K5TCwIaLTPqK/Rcon0O0r+Jsxb7OcchOo8Vo="; + }; + urlPrefix = "mirror://debian"; + packages = commonDebianPackages; + }; + + debian11x86_64 = { + name = "debian-11.5-bullseye-amd64"; + fullName = "Debian 11.5 Bullseye (amd64)"; + packagesList = fetchurl { + url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/bullseye/main/binary-amd64/Packages.xz"; + hash = "sha256-whpBERKOPyhrWguVQ2QchrwRHU4tCkGwu42x6khF/2g="; }; urlPrefix = "mirror://debian"; packages = commonDebianPackages; @@ -1156,7 +1188,7 @@ rec { of the default image parameters can be given. In particular, `extraPackages' specifies the names of additional packages from the distribution that should be included in the image; `packages' - allows the entire set of packages to be overriden; and `size' + allows the entire set of packages to be overridden; and `size' sets the size of the disk in megabytes. E.g., `diskImageFuns.ubuntu1004x86_64 { extraPackages = ["firefox"]; size = 8192; }' builds an 8 GiB image containing Firefox in diff --git a/pkgs/build-support/wrapper-common/utils.bash b/pkgs/build-support/wrapper-common/utils.bash index 0afccadf3384..44b44818c8ed 100644 --- a/pkgs/build-support/wrapper-common/utils.bash +++ b/pkgs/build-support/wrapper-common/utils.bash @@ -104,13 +104,13 @@ badPath() { # directory (including the build directory). test \ "$p" != "/dev/null" -a \ - "${p#${NIX_STORE}}" = "$p" -a \ - "${p#${NIX_BUILD_TOP}}" = "$p" -a \ - "${p#/tmp}" = "$p" -a \ - "${p#${TMP:-/tmp}}" = "$p" -a \ - "${p#${TMPDIR:-/tmp}}" = "$p" -a \ - "${p#${TEMP:-/tmp}}" = "$p" -a \ - "${p#${TEMPDIR:-/tmp}}" = "$p" + "${p#"${NIX_STORE}"}" = "$p" -a \ + "${p#"${NIX_BUILD_TOP}"}" = "$p" -a \ + "${p#/tmp}" = "$p" -a \ + "${p#"${TMP:-/tmp}"}" = "$p" -a \ + "${p#"${TMPDIR:-/tmp}"}" = "$p" -a \ + "${p#"${TEMP:-/tmp}"}" = "$p" -a \ + "${p#"${TEMPDIR:-/tmp}"}" = "$p" } expandResponseParams() { diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index e964ca6b19c0..88da1ca54a97 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -101,7 +101,7 @@ let interpreter = "${pkgs.bash}/bin/bash"; }; - # Like writeScriptBIn but the first line is a shebang to bash + # Like writeScriptBin but the first line is a shebang to bash writeBashBin = name: writeBash "/bin/${name}"; diff --git a/pkgs/common-updater/directory-listing-updater.nix b/pkgs/common-updater/directory-listing-updater.nix index fb7491ab879a..bd0b5b1df30d 100644 --- a/pkgs/common-updater/directory-listing-updater.nix +++ b/pkgs/common-updater/directory-listing-updater.nix @@ -11,9 +11,10 @@ , odd-unstable ? false , patchlevel-unstable ? false , url ? null +, extraRegex ? null }: genericUpdater { inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable; - versionLister = "${common-updater-scripts}/bin/list-directory-versions ${lib.optionalString (url != null) "--url=${lib.escapeShellArg url}"}"; + versionLister = "${common-updater-scripts}/bin/list-directory-versions ${lib.optionalString (url != null) "--url=${lib.escapeShellArg url}"} ${lib.optionalString (extraRegex != null) "--extra-regex=${lib.escapeShellArg extraRegex}"}"; } diff --git a/pkgs/common-updater/nix-update.nix b/pkgs/common-updater/nix-update.nix index 13b85bf52fff..269e1b6e6455 100644 --- a/pkgs/common-updater/nix-update.nix +++ b/pkgs/common-updater/nix-update.nix @@ -1,5 +1,7 @@ -{ nix-update }: +{ lib, nix-update }: -{ attrPath }: +{ attrPath ? null +, extraArgs ? [ ] +}: -[ "${nix-update}/bin/nix-update" attrPath ] +[ "${nix-update}/bin/nix-update" ] ++ extraArgs ++ lib.optional (attrPath != null) attrPath diff --git a/pkgs/common-updater/scripts/list-directory-versions b/pkgs/common-updater/scripts/list-directory-versions index 46c9e9d30a5d..c713578beefb 100755 --- a/pkgs/common-updater/scripts/list-directory-versions +++ b/pkgs/common-updater/scripts/list-directory-versions @@ -26,6 +26,8 @@ parser.add_argument( parser.add_argument("--url", help="url of the page that lists the package versions") parser.add_argument("--file", help="file name for writing debugging information") +parser.add_argument("--extra-regex", help="additional regex to filter versions with") + if __name__ == "__main__": args = parser.parse_args() @@ -59,7 +61,9 @@ if __name__ == "__main__": link_url = link.get("href", None) if link_url is not None: match = re.fullmatch( - rf"{args.pname}-([\d.]+?(-[\d\w.-]+?)?)(\.tar)?(\.[^.]*)", link_url + rf"(.*/)?{args.pname}-([\d.]+?(-[\d\w.-]+?)?)(\.tar)?(\.[^.]*)", link_url ) if match: - print(match.group(1)) + version = match.group(2) + if (not args.extra_regex) or re.fullmatch(args.extra_regex, version): + print(version) diff --git a/pkgs/common-updater/scripts/mark-broken b/pkgs/common-updater/scripts/mark-broken index f132c86c5e8b..7035bee18604 100755 --- a/pkgs/common-updater/scripts/mark-broken +++ b/pkgs/common-updater/scripts/mark-broken @@ -48,8 +48,6 @@ denyFileList=( # to be conditionally disabled denyAttrList=( python27Packages - python37Packages - libsForQt512 linuxPackages_ rubyPackages_ ) diff --git a/pkgs/data/fonts/3270font/default.nix b/pkgs/data/fonts/3270font/default.nix index 914583d97eec..68bdd7e70d40 100644 --- a/pkgs/data/fonts/3270font/default.nix +++ b/pkgs/data/fonts/3270font/default.nix @@ -1,19 +1,28 @@ -{ lib, fetchzip }: -let - version = "2.3.1"; -in -fetchzip { - name = "3270font-${version}"; +{ lib, stdenvNoCC, fetchzip }: - url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_3b8f2fb.zip"; +stdenvNoCC.mkDerivation rec { + pname = "3270font"; + version = "3.0.1"; - sha256 = "06n87ydn2ayfhpg8318chmnwmdk3d4mmy65fcgf8frbiv2kpqncs"; + src = fetchzip { + url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_d916271.zip"; + sha256 = "sha256-Zi6Lp5+sqfjIaHmnaaemaw3i+hXq9mqIsK/81lTkwfM="; + stripRoot = false; + }; - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.afm -d $out/share/fonts/type1 + dontPatch = true; + dontConfigure = true; + dontBuild = true; + doCheck = false; + dontFixup = true; + + installPhase = '' + runHook preInstall + + install -Dm644 -t $out/share/fonts/opentype/ *.otf + install -Dm644 -t $out/share/fonts/truetype/ *.ttf + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/aileron/default.nix b/pkgs/data/fonts/aileron/default.nix index 4961a5e7449d..5ae83519278b 100644 --- a/pkgs/data/fonts/aileron/default.nix +++ b/pkgs/data/fonts/aileron/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "102"; - pname = "aileron"; in +stdenvNoCC.mkDerivation (self: { + pname = "aileron"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-Ht48gwJZrn0djo1yl6jHZ4+0b710FVwStiC1Zk5YXME="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}.zip"; - sha256 = "04xnzdy9plzd2p02yq367h37m5ygx0w8cpkdv39cc3754ljlsxim"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "A helvetica font in nine weights"; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.cc0; }; -} +}) diff --git a/pkgs/data/fonts/alkalami/default.nix b/pkgs/data/fonts/alkalami/default.nix index b0b2876f5a6a..60e31e88c2df 100644 --- a/pkgs/data/fonts/alkalami/default.nix +++ b/pkgs/data/fonts/alkalami/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "alkalami"; version = "2.000"; - url = "https://software.sil.org/downloads/r/alkalami/Alkalami-${version}.zip"; + src = fetchzip { + url = "https://software.sil.org/downloads/r/alkalami/Alkalami-${version}.zip"; + hash = "sha256-rT0HzTFbooHr+l5BQ9GVYKxxNk7TESdkOQfWBeVpwYI="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - rm -rf $out/web $out/manifest.json mkdir -p $out/share/{doc/${pname},fonts/truetype} - mv $out/*.ttf $out/share/fonts/truetype/ - mv $out/*.txt $out/documentation $out/share/doc/${pname}/ - ''; + mv *.ttf $out/share/fonts/truetype/ + mv *.txt documentation $out/share/doc/${pname}/ - sha256 = "sha256-GjX3YOItLKSMlRjUbBgGp2D7QS/pOJQYuQJzW+iqBNo="; + runHook postInstall + ''; meta = with lib; { homepage = "https://software.sil.org/alkalami/"; diff --git a/pkgs/data/fonts/amiri/default.nix b/pkgs/data/fonts/amiri/default.nix index 2c9acc391711..bfd7c60bf531 100644 --- a/pkgs/data/fonts/amiri/default.nix +++ b/pkgs/data/fonts/amiri/default.nix @@ -1,21 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "0.900"; +stdenvNoCC.mkDerivation rec { + pname = "amiri"; + version = "1.000"; -in fetchzip rec { - name = "Amiri-${version}"; + src = fetchzip { + url = "https://github.com/alif-type/amiri/releases/download/${version}/Amiri-${version}.zip"; + hash = "sha256-WXxKLYIIKe01WWZrI1aLOv65wRgn7aqHl6Codf4foVw="; + }; - url = "https://github.com/alif-type/amiri/releases/download/${version}/${name}.zip"; + installPhase = '' + runHook preInstall - sha256 = "sha256-FjuzWW9xVWDOxHBwYL4pmopQVc9KYHGHhye5tPdw68s="; - - postFetch = '' - rm -rf $out/otf mkdir -p $out/share/fonts/truetype - mv $out/*.ttf $out/share/fonts/truetype/ - mkdir -p $out/share/doc/${name} - mv $out/{*.html,*.txt,*.md} $out/share/doc/${name}/ + mv *.ttf $out/share/fonts/truetype/ + mkdir -p $out/share/doc/${pname}-${version} + mv {*.html,*.txt,*.md} $out/share/doc/${pname}-${version}/ + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix index 6d0b5f483ec4..22b686684f98 100644 --- a/pkgs/data/fonts/andagii/default.nix +++ b/pkgs/data/fonts/andagii/default.nix @@ -1,18 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "andagii"; version = "1.0.2"; -in fetchzip { - name = "andagii-${version}"; - url = "http://www.i18nguy.com/unicode/andagii.zip"; - curlOpts = "--user-agent 'Mozilla/5.0'"; - postFetch = '' - unzip $downloadedFile + src = fetchzip { + url = "http://www.i18nguy.com/unicode/andagii.zip"; + curlOpts = "--user-agent 'Mozilla/5.0'"; + hash = "sha256-U7wC55G8jIvMMyPcEiJQ700A7nkWdgWK1LM0F/wgDCg="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf + + runHook postInstall ''; - sha256 = "0j5kf2fmyqgnf5ji6h0h79lq9n9d85hkfrr4ya8hqj4gwvc0smb2"; # There are multiple claims that the font is GPL, so I include the # package; but I cannot find the original source, so use it on your diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/data/fonts/andika/default.nix index 02ee29a382ed..92757d303cec 100644 --- a/pkgs/data/fonts/andika/default.nix +++ b/pkgs/data/fonts/andika/default.nix @@ -1,31 +1,33 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "andika"; version = "6.101"; -in - fetchzip rec { - name = "andika-${version}"; + src = fetchzip { url = "https://software.sil.org/downloads/r/andika/Andika-${version}.zip"; + hash = "sha256-LghkGd/cjuXghzsU9X/YneNIdBeDEnu0ARszipANm8w="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" - ''; + installPhase = '' + runHook preInstall - sha256 = "sha256-J/Ad+fmCMOxLoo+691LE6Bgi/l3ovIfWScwwVWtqACI="; + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} - meta = with lib; { - homepage = "https://software.sil.org/andika"; - description = "A family designed especially for literacy use taking into account the needs of beginning readers"; - longDescription = '' + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://software.sil.org/andika"; + description = "A family designed especially for literacy use taking into account the needs of beginning readers"; + longDescription = '' Andika is a sans serif, Unicode-compliant font designed especially for literacy use, taking into account the needs of beginning readers. The focus is on clear, easy-to-perceive letterforms that will not be readily confused with one another. A sans serif font is preferred by some literacy personnel for teaching people to read. Its forms are simpler and less cluttered than those of most serif fonts. For years, literacy workers have had to make do with fonts that were not really suitable for beginning readers and writers. In some cases, literacy specialists have had to tediously assemble letters from a variety of fonts in order to get all of the characters they need for their particular language project, resulting in confusing and unattractive publications. Andika addresses those issues. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.f--t ]; - }; - } + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.f--t ]; + }; +} diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/pkgs/data/fonts/ankacoder/condensed.nix index 655c780129d8..676c3cf85602 100644 --- a/pkgs/data/fonts/ankacoder/condensed.nix +++ b/pkgs/data/fonts/ankacoder/condensed.nix @@ -1,17 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let version = "1.100"; in -fetchzip { - name = "ankacoder-condensed-${version}"; - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoderCondensed.${version}.zip"; +stdenvNoCC.mkDerivation rec { + pname = "ankacoder-condensed"; + version = "1.100"; + + src = fetchzip { + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoderCondensed.${version}.zip"; + stripRoot = false; + hash = "sha256-NHrkV4Sb7i+DC4e4lToEYzah3pI+sKyYf2rGbhWj7iY="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - unzip $downloadedFile mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype - ''; - sha256 = "0i80zpr2y9368rg2i6x8jv0g7d03kdyr5h7w9yz7pjd7i9xd8439"; + runHook postInstall + ''; meta = with lib; { description = "Anka/Coder Condensed font"; diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/data/fonts/ankacoder/default.nix index fbf587c7c6ca..c363f025bfd2 100644 --- a/pkgs/data/fonts/ankacoder/default.nix +++ b/pkgs/data/fonts/ankacoder/default.nix @@ -1,17 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let version = "1.100"; in -fetchzip { - name = "ankacoder-${version}"; - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoder.${version}.zip"; +stdenvNoCC.mkDerivation rec { + pname = "ankacoder"; + version = "1.100"; + + src = fetchzip { + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoder.${version}.zip"; + stripRoot = false; + hash = "sha256-14ItaSQ/fO/WDq0O4SXGWnZgiM0kayJrWQgsKb7bsyY="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - unzip $downloadedFile mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype - ''; - sha256 = "1jqx9micfmiarqh9xp330gl96v3vxbwzz9cmg2vi845n9md4im85"; + runHook postInstall + ''; meta = with lib; { description = "Anka/Coder fonts"; diff --git a/pkgs/data/fonts/annapurna-sil/default.nix b/pkgs/data/fonts/annapurna-sil/default.nix index f14602eccf24..59957bb7005d 100644 --- a/pkgs/data/fonts/annapurna-sil/default.nix +++ b/pkgs/data/fonts/annapurna-sil/default.nix @@ -1,29 +1,31 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "annapurna-sil"; version = "1.204"; -in - fetchzip rec { - name = "annapurna-sil-${version}"; + src = fetchzip { url = "https://software.sil.org/downloads/r/annapurna/AnnapurnaSIL-${version}.zip"; + hash = "sha256-4ya3Iydrz5Pvol9sTDIe9ZW5k3+XQp8GB2LAnRpeiXs="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://software.sil.org/annapurna"; + description = "Unicode-based font family with broad support for writing systems that use the Devanagari script"; + longDescription = '' + Annapurna SIL is a Unicode-based font family with broad support for writing systems that use the Devanagari script. Inspired by traditional calligraphic forms, the design is intended to be highly readable, reasonably compact, and visually attractive. ''; - - sha256 = "sha256-kVeP9ZX8H+Wn6jzmH1UQvUKY6vJjadMTdEusS7LodFM="; - - meta = with lib; { - homepage = "https://software.sil.org/annapurna"; - description = "Unicode-based font family with broad support for writing systems that use the Devanagari script"; - longDescription = '' - Annapurna SIL is a Unicode-based font family with broad support for writing systems that use the Devanagari script. Inspired by traditional calligraphic forms, the design is intended to be highly readable, reasonably compact, and visually attractive. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.kmein ]; - }; - } + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.kmein ]; + }; +} diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix index cb6ec6d89445..f498e2780b3c 100644 --- a/pkgs/data/fonts/anonymous-pro/default.nix +++ b/pkgs/data/fonts/anonymous-pro/default.nix @@ -1,17 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "anonymouspro"; version = "1.002"; -in fetchzip rec { - name = "anonymousPro-${version}"; - url = "http://www.marksimonson.com/assets/content/fonts/AnonymousPro-${version}.zip"; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d "$out/share/doc/${name}" + src = fetchzip { + url = "https://www.marksimonson.com/assets/content/fonts/AnonymousPro-${lib.replaceStrings ["."] ["_"] version}.zip"; + hash = "sha256-FhyzV4By8XKN9EyukAknzml/7lUuV6Evnt6Ht3H6TUU="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall ''; - sha256 = "05rgzag38qc77b31sm5i2vwwrxbrvwzfsqh3slv11skx36pz337f"; meta = with lib; { homepage = "https://www.marksimonson.com/fonts/view/anonymous-pro"; diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix index 259ac0141b2b..81a175b944b8 100644 --- a/pkgs/data/fonts/arkpandora/default.nix +++ b/pkgs/data/fonts/arkpandora/default.nix @@ -1,23 +1,26 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "arkpandora"; version = "2.04"; -in fetchurl { - name = "arkpandora-${version}"; - urls = [ - "http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz" - "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz" - "http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz" - ]; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - tar -xzvf $downloadedFile --strip-components=1 + src = fetchurl { + urls = [ + "http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz" + "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz" + "http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz" + ]; + hash = "sha256-ofyVPJjQD8w+8WgETF2UcJlfbSsKQgBsH3ob+yjvrpo="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "177k0fbs0787al0snkl8w68d2qkg7snnnq6qp28j9s98vaabs04k"; meta = { description = "Font, metrically identical to Arial and Times New Roman"; diff --git a/pkgs/data/fonts/arphic/default.nix b/pkgs/data/fonts/arphic/default.nix index 02e2a2de417b..ed55855e4347 100644 --- a/pkgs/data/fonts/arphic/default.nix +++ b/pkgs/data/fonts/arphic/default.nix @@ -1,22 +1,33 @@ -{ lib, fetchzip, mkfontscale, mkfontdir }: +{ lib, stdenvNoCC, fetchurl, mkfontdir, mkfontscale }: let version = "0.2.20080216.2"; -in { - arphic-ukai = fetchzip { - name = "arphic-ukai-${version}"; +in +{ + arphic-ukai = stdenvNoCC.mkDerivation rec { + pname = "arphic-ukai"; + inherit version; - url = "mirror://ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2"; + src = fetchurl { + url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; + hash = "sha256-tJaNc1GfT4dH6FVI+4XSG2Zdob8bqQCnxJmXbmqK49I="; + }; + + nativeBuildInputs = [ + mkfontscale + mkfontdir + ]; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xjvf $downloadedFile --strip-components=1 install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc cd $out/share/fonts - ${mkfontdir}/bin/mkfontdir - ${mkfontscale}/bin/mkfontscale - ''; + mkfontdir + mkfontscale - sha256 = "0xi5ycm7ydzpn7cqxv1kcj9vd70nr9wn8v27hmibyjc25y2qdmzl"; + runHook postInstall + ''; meta = with lib; { description = "CJK Unicode font Kai style"; @@ -28,20 +39,30 @@ in { }; }; - arphic-uming = fetchzip { - name = "arphic-uming-${version}"; + arphic-uming = stdenvNoCC.mkDerivation rec { + pname = "arphic-uming"; + inherit version; - url = "mirror://ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2"; + src = fetchurl { + url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; + hash = "sha256-48GeBOp6VltKz/bx5CSAhNLhB1LjBb991sdugIYNwds="; + }; + + nativeBuildInputs = [ + mkfontscale + mkfontdir + ]; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xjvf $downloadedFile --strip-components=1 install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc cd $out/share/fonts - ${mkfontdir}/bin/mkfontdir - ${mkfontscale}/bin/mkfontscale - ''; + mkfontdir + mkfontscale - sha256 = "16jybvj1cxamm682caj6nsm6l5c60x9mgchp1l2izrw2rvc8x38d"; + runHook postInstall + ''; meta = with lib; { description = "CJK Unicode font Ming style"; diff --git a/pkgs/data/fonts/atkinson-hyperlegible/default.nix b/pkgs/data/fonts/atkinson-hyperlegible/default.nix index 8b2b04553726..e8b09cfb637c 100644 --- a/pkgs/data/fonts/atkinson-hyperlegible/default.nix +++ b/pkgs/data/fonts/atkinson-hyperlegible/default.nix @@ -1,21 +1,22 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "atkinson-hyperlegible"; version = "unstable-2021-04-29"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "googlefonts"; - repo = "atkinson-hyperlegible"; - rev = "1cb311624b2ddf88e9e37873999d165a8cd28b46"; - sha256 = "sha256-urSTqC3rfDRM8IMG+edwKEe7NPiTuDZph3heGHzLDks="; + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "atkinson-hyperlegible"; + rev = "1cb311624b2ddf88e9e37873999d165a8cd28b46"; + hash = "sha256-RN4m5gyY2OiPzRXgFVQ3pq6JdkPcMxV4fRlX2EK+gOM="; + }; - postFetch = '' - install -Dm644 -t $out/share/fonts/opentype $out/fonts/otf/* - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + installPhase = '' + runHook preInstall + + install -Dm644 -t $out/share/fonts/opentype fonts/otf/* + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix index 50f456373c69..f1ee19b3b157 100644 --- a/pkgs/data/fonts/aurulent-sans/default.nix +++ b/pkgs/data/fonts/aurulent-sans/default.nix @@ -1,15 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "aurulent-sans-0.1"; - owner = "deepfire"; - repo = "hartke-aurulent-sans"; - rev = name; - postFetch = '' - mkdir -p $out/share/fonts - tar xf $downloadedFile -C $out/share/fonts --strip=1 +stdenvNoCC.mkDerivation rec { + pname = "aurulent-sans"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "deepfire"; + repo = "hartke-aurulent-sans"; + rev = "${pname}-${version}"; + hash = "sha256-M/duhgqxXZJq5su9FrsGjZdm+wtO5B5meoDomde+GwY="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.otf -t $out/share/fonts + + runHook postInstall ''; - sha256 = "1l60psfv9x0x9qx9vp1qnhmck7a7kks385m5ycrd3d91irz1j5li"; meta = { description = "Aurulent Sans"; diff --git a/pkgs/data/fonts/b612/default.nix b/pkgs/data/fonts/b612/default.nix index c38329227f02..b78f3a9e85bf 100644 --- a/pkgs/data/fonts/b612/default.nix +++ b/pkgs/data/fonts/b612/default.nix @@ -1,25 +1,25 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { +stdenvNoCC.mkDerivation rec { pname = "b612"; version = "1.008"; - owner = "polarsys"; - repo = "b612"; - rev = version; + src = fetchFromGitHub { + owner = "polarsys"; + repo = "b612"; + rev = version; + hash = "sha256-uyBC8UNOwztCHXhR9XZuWDwrty0eClbo0E+gI1PmjEg="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype + mv fonts/ttf/*.ttf $out/share/fonts/truetype - mv $out/fonts/ttf/*.ttf $out/share/fonts/truetype - - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + runHook postInstall ''; - hash = "sha256-aJ3XzWQauPsWwEDAHT2rD9a8RvLv1kqU3krFXprmypk="; - meta = with lib; { homepage = "https://b612-font.com/"; description = "Highly legible font family for use on aircraft cockpit screens"; @@ -36,8 +36,8 @@ fetchFromGitHub rec { variants of the font. This one, baptized B612 in reference to the imaginary asteroid of the aviator Saint‑Exupéry, benefited from a complete hinting on all the characters. - ''; - license = with licenses; [ ofl epl10 bsd3 ] ; + ''; + license = with licenses; [ ofl epl10 bsd3 ]; maintainers = with maintainers; [ leenaars ]; platforms = platforms.all; }; diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index e78f00a49756..9839295653d1 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -1,17 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { + pname = "babelstone-han"; version = "13.0.3"; -in fetchzip { - name = "babelstone-han-${version}"; - # upstream download links are unversioned, so hash changes - url = "https://web.archive.org/web/20200210125314/https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip"; - postFetch = '' + src = fetchzip { + # upstream download links are unversioned, so hash changes + url = "https://web.archive.org/web/20200210125314/https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip"; + hash = "sha256-LLhNtHu2hh5DY2XVSrLuVzzR6OtMdSSHetyA0k1IFs0="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype - unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "018isk3hbzsihzrxavgjbn485ngzvlm96npqx9y7zpkxsssslc4w"; meta = with lib; { description = "Unicode CJK font with over 36000 Han characters"; diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix index 92f7401b32da..3777f69fa567 100644 --- a/pkgs/data/fonts/baekmuk-ttf/default.nix +++ b/pkgs/data/fonts/baekmuk-ttf/default.nix @@ -1,15 +1,22 @@ -{ fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip rec { - name = "baekmuk-ttf-2.2"; +stdenvNoCC.mkDerivation rec { + pname = "baekmuk-ttf"; + version = "2.2"; + + src = fetchurl { + url = "http://kldp.net/baekmuk/release/865-${pname}-${version}.tar.gz"; + hash = "sha256-CKt9/7VdWIfMlCzjcPXjO3VqVfu06vC5DyRAcOjVGII="; + }; + + installPhase = '' + runHook preInstall - url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz"; - postFetch = '' - tar -xzvf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts ttf/*.ttf - install -m444 -Dt $out/share/doc/${name} COPYRIGHT* + install -m444 -Dt $out/share/doc/${pname}-${version} COPYRIGHT* + + runHook postInstall ''; - sha256 = "1jgsvack1l14q8lbcv4qhgbswi30mf045k37rl772hzcmx0r206g"; meta = { description = "Korean font"; @@ -17,4 +24,3 @@ fetchzip rec { license = "BSD-like"; }; } - diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix index a8c01b41e676..1d305674e6aa 100644 --- a/pkgs/data/fonts/bakoma-ttf/default.nix +++ b/pkgs/data/fonts/bakoma-ttf/default.nix @@ -1,17 +1,23 @@ -{ fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip { - name = "bakoma-ttf"; +stdenvNoCC.mkDerivation rec { + pname = "bakoma-ttf"; + version = "2.2"; - url = "http://tarballs.nixos.org/sha256/1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km"; + src = fetchurl { + name = "${pname}.tar.bz2"; + url = "http://tarballs.nixos.org/sha256/1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km"; + hash = "sha256-dYaUMneFn1yC5lIMSLQSNmFRW16AdUXGqWBobzAbPsg="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xjvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp ttf/*.ttf $out/share/fonts/truetype - ''; - sha256 = "0g7i723n00cqx2va05z1h6v3a2ar69gqw4hy6pjj7m0ml906rngc"; + runHook postInstall + ''; meta = { description = "TrueType versions of the Computer Modern and AMS TeX Fonts"; diff --git a/pkgs/data/fonts/barlow/default.nix b/pkgs/data/fonts/barlow/default.nix index e9257260ea2c..e9bfa4dee375 100644 --- a/pkgs/data/fonts/barlow/default.nix +++ b/pkgs/data/fonts/barlow/default.nix @@ -1,21 +1,25 @@ -{ lib, fetchzip }: -let +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "barlow"; version = "1.422"; -in -fetchzip rec { - name = "barlow-${version}"; - url = "https://tribby.com/fonts/barlow/download/barlow-${version}.zip"; + src = fetchzip { + url = "https://tribby.com/fonts/barlow/download/barlow-${version}.zip"; + stripRoot = false; + hash = "sha256-aHAGPEgBkH41r7HR0D74OGCa7ta7Uo8Mgq4YVtYOwU8="; + }; - sha256 = "08ld4c3zq4d1px07lc64i7l8848zsc61ddy3654w2sh0hx5sm5ld"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.eot -d $out/share/fonts/eot - unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff - unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 + install -Dm644 fonts/otf/*.otf -t $out/share/fonts/opentype + install -Dm644 fonts/ttf/*.ttf fonts/gx/*.ttf -t $out/share/fonts/truetype + install -Dm644 fonts/eot/*.eot -t $out/share/fonts/eot + install -Dm644 fonts/woff/*.woff -t $out/share/fonts/woff + install -Dm644 fonts/woff2/*.woff2 -t $out/share/fonts/woff2 + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/behdad-fonts/default.nix b/pkgs/data/fonts/behdad-fonts/default.nix index be6ed005b166..143975f28db7 100644 --- a/pkgs/data/fonts/behdad-fonts/default.nix +++ b/pkgs/data/fonts/behdad-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "behdad-fonts"; version = "0.0.3"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "font-store"; - repo = "BehdadFont"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "font-store"; + repo = "BehdadFont"; + rev = "v${version}"; + hash = "sha256-gKfzxo3/bCMKXl2d6SP07ahIiNrUyrk/SN5XLND2lWY="; + }; + + installPhase = '' + runHook preInstall + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/behrad-fonts {} \; + + runHook postInstall ''; - sha256 = "0c57232462cv1jrfn0m2bl7jzcfkacirrdd2qimrc8iqhkz0ajfz"; meta = with lib; { homepage = "https://github.com/font-store/BehdadFont"; diff --git a/pkgs/data/fonts/borg-sans-mono/default.nix b/pkgs/data/fonts/borg-sans-mono/default.nix index 57b0a23bf7bc..8037e5dc645f 100644 --- a/pkgs/data/fonts/borg-sans-mono/default.nix +++ b/pkgs/data/fonts/borg-sans-mono/default.nix @@ -1,19 +1,21 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { 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"; + src = fetchzip { + # https://github.com/marnen/borg-sans-mono/issues/19 + url = "https://github.com/marnen/borg-sans-mono/files/107663/BorgSansMono.ttf.zip"; + hash = "sha256-nn7TGeVm45t7QI8+eEREBTFg9aShYYKtdEYEwQwO2fQ="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/cabin/default.nix b/pkgs/data/fonts/cabin/default.nix index e68d429db2e8..186a5359c44f 100644 --- a/pkgs/data/fonts/cabin/default.nix +++ b/pkgs/data/fonts/cabin/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "cabin-1.005"; +stdenvNoCC.mkDerivation rec { + pname = "cabin"; + version = "1.005"; - owner = "impallari"; - repo = "Cabin"; - rev = "982839c790e9dc57c343972aa34c51ed3b3677fd"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Cabin"; + rev = "982839c790e9dc57c343972aa34c51ed3b3677fd"; + hash = "sha256-9l4QcwCot340Bq41ER68HSZGQ9h0opyzgG3DG/fVZ5s="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/opentype fonts/OTF/*.otf - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "1bl7h217m695jn4rbniialfk573aa44fslp2rjxnhkicakpcm44h"; + runHook postInstall + ''; meta = with lib; { description = "A humanist sans with 4 weights and true italics"; diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/data/fonts/caladea/default.nix index 14a8de1b0d9e..bd00e807309a 100644 --- a/pkgs/data/fonts/caladea/default.nix +++ b/pkgs/data/fonts/caladea/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "caladea"; version = "20130214"; -in fetchzip { - name = "caladea-${version}"; - url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz"; - postFetch = '' - tar -xzvf $downloadedFile --strip-components=1 + src = fetchurl { + url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz"; + hash = "sha256-xI0cL9YTycBslZw02nuDiAWeJAjSuxmEXcPtNfduTQk="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/etc/fonts/conf.d mkdir -p $out/share/fonts/truetype cp -v *.ttf $out/share/fonts/truetype cp -v ${./cambria-alias.conf} $out/etc/fonts/conf.d/30-cambria.conf + + runHook postInstall ''; - sha256 = "0kwm42ggr8kvcn3554cpmv90xzam1sdncx7x3zs3bzp88mxrnv1z"; meta = with lib; { # This font doesn't appear to have any official web site but this @@ -27,7 +32,7 @@ in fetchzip { ''; license = licenses.asl20; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; # Reduce the priority of this package. The intent is that if you # also install the `vista-fonts` package, then you probably will diff --git a/pkgs/data/fonts/camingo-code/default.nix b/pkgs/data/fonts/camingo-code/default.nix index 626ff9f1c0a2..c852303021d0 100644 --- a/pkgs/data/fonts/camingo-code/default.nix +++ b/pkgs/data/fonts/camingo-code/default.nix @@ -1,19 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "camingo-code"; version = "1.0"; -in fetchzip rec { - name = "camingo-code-${version}"; - url = "https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip"; - postFetch = '' - install -Dm644 $out/camingo-code/*.ttf -t $out/share/fonts/truetype - install -Dm644 $out/camingo-code/*.txt -t $out/share/doc/${name} - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + src = fetchzip { + url = "https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip"; + hash = "sha256-oo5pWDq6h0bmyGvfF9Bkh7WyjKX4dG8uclfIsWLhDw8="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 camingo-code/*.ttf -t $out/share/fonts/truetype + install -Dm644 camingo-code/*.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall ''; - sha256 = "sha256-/vDNuR034stmiCZ9jUH5DlTQJn0WccLY5treoziXOJo="; meta = with lib; { homepage = "https://www.myfonts.com/fonts/jan-fromm/camingo-code/"; diff --git a/pkgs/data/fonts/cardo/default.nix b/pkgs/data/fonts/cardo/default.nix index 21763365de30..c862ea7ce889 100644 --- a/pkgs/data/fonts/cardo/default.nix +++ b/pkgs/data/fonts/cardo/default.nix @@ -1,20 +1,22 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { + pname = "cardo"; version = "1.04"; -in -fetchzip { - name = "cardo-${version}"; - url = "http://scholarsfonts.net/cardo104.zip"; + src = fetchzip { + url = "https://scholarsfonts.net/cardo104.zip"; + stripRoot = false; + hash = "sha256-NU6/H5f0JBlVo3L3uUcl7IvNxPMXD8UQY9k5o2YA5Vo="; + }; - hash = "sha256-eBK6+VQpreWA7jIneNXOcKFcT+cJzhoQ9XXyq93SZ8M="; - stripRoot = false; + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - mv $out/*.ttf $out/share/fonts/truetype - rm $out/*.pdf + mv *.ttf $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/data/fonts/carlito/default.nix index 1de2e9afc0f9..283eb21a175f 100644 --- a/pkgs/data/fonts/carlito/default.nix +++ b/pkgs/data/fonts/carlito/default.nix @@ -1,22 +1,21 @@ -{ lib, fetchzip }: +{ lib, fetchurl, stdenvNoCC }: -let +stdenvNoCC.mkDerivation rec { + pname = "carlito"; version = "20130920"; -in fetchzip { - name = "carlito-${version}"; - url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz"; + src = fetchurl { + url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz"; + sha256 = "sha256-S9ErbLwyHBzxbaduLFhcklzpVqCAZ65vbGTv9sz9r1o="; + }; - postFetch = '' - tar -xzvf $downloadedFile --strip-components=1 + installPhase = '' mkdir -p $out/etc/fonts/conf.d mkdir -p $out/share/fonts/truetype cp -v *.ttf $out/share/fonts/truetype cp -v ${./calibri-alias.conf} $out/etc/fonts/conf.d/30-calibri.conf ''; - sha256 = "0d72zy6kdmxgpi63r3yvi3jh1hb7lvlgv8hgd4ag0x10dz18mbzv"; - meta = with lib; { # This font doesn't appear to have any official web site but this # one provides some good information and samples. @@ -25,11 +24,11 @@ in fetchzip { longDescription = '' Carlito is a free font that is metric-compatible with the Microsoft Calibri font. The font is designed by Łukasz Dziedzic - of the tyPoland foundry and based his Lato font. + of the tyPoland foundry and based upon his Lato font. ''; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; # Reduce the priority of this package. The intent is that if you # also install the `vista-fonts` package, then you probably will diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix index 67ad8682a8e8..df1af86d5ce0 100644 --- a/pkgs/data/fonts/cascadia-code/default.nix +++ b/pkgs/data/fonts/cascadia-code/default.nix @@ -1,18 +1,22 @@ -{ lib, fetchzip }: -let +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "cascadia-code"; version = "2111.01"; -in -fetchzip { - name = "cascadia-code-${version}"; - url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; + src = fetchzip { + url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; + stripRoot = false; + hash = "sha256-v9Vm5X80wEvorMhIlRw3MnyuSOdBpTl9ibBPpmm1vig="; + }; - sha256 = "sha256-kUVTQ/oMZztNf22sDbQBpQW0luSc5nr5sxWU5etLDec="; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + install -Dm644 otf/static/*.otf -t $out/share/fonts/opentype + install -Dm644 ttf/static/*.ttf -t $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/ccsymbols/default.nix b/pkgs/data/fonts/ccsymbols/default.nix index a32d35a08852..f31dc65a8a56 100644 --- a/pkgs/data/fonts/ccsymbols/default.nix +++ b/pkgs/data/fonts/ccsymbols/default.nix @@ -1,23 +1,24 @@ -{ lib, fetchurl, unzip }: +{ lib, stdenvNoCC, fetchurl, unzip }: -let +stdenvNoCC.mkDerivation rec { pname = "ccsymbols"; version = "2020-04-19"; -in -fetchurl rec { - name = "${pname}-${version}"; + src = fetchurl { + url = "https://www.ctrl.blog/file/${version}_cc-symbols.zip"; + hash = "sha256-hkARhb8T6VgGAybYkVuPuebjhuk1dwiBJ1bZMwvYpMY="; + }; - url = "https://www.ctrl.blog/file/${version}_cc-symbols.zip"; - sha256 = "sha256-mrNgTS6BAVJrIz9fHOjf8pkSbZtZ55UjyoL9tQ1fiA8="; - recursiveHash = true; + sourceRoot = "."; nativeBuildInputs = [ unzip ]; - downloadToTemp = true; - postFetch = '' - mkdir -p "$out/share/fonts/ccsymbols" - unzip -d "$out/share/fonts/ccsymbols" "$downloadedFile" + installPhase = '' + runHook preInstall + + install -Dm644 CCSymbols.* -t $out/share/fonts/ccsymbols + + runHook postInstall ''; passthru = { inherit pname version; }; diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/data/fonts/charis-sil/default.nix index 3294cb711052..52c32fcc3d80 100644 --- a/pkgs/data/fonts/charis-sil/default.nix +++ b/pkgs/data/fonts/charis-sil/default.nix @@ -1,31 +1,33 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "charis-sil"; version = "6.101"; -in - fetchzip rec { - name = "charis-sil-${version}"; + src = fetchzip { url = "https://software.sil.org/downloads/r/charis/CharisSIL-${version}.zip"; + hash = "sha256-Rf5eKQVZw7zgTv6KkJUdNdd4sSJPdvjy/GDLusvlgzE="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" - ''; + installPhase = '' + runHook preInstall - sha256 = "sha256-b1ms9hJ6IPe7W6O9KgzHZvwT4/nAoLOhdydcUrwNfnU="; + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} - meta = with lib; { - homepage = "https://software.sil.org/charis"; - description = "A family of highly readable fonts for broad multilingual use"; - longDescription = '' + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://software.sil.org/charis"; + description = "A family of highly readable fonts for broad multilingual use"; + longDescription = '' This Charis SIL font is essentially the same design as the SIL Charis font first released by SIL in 1997. Charis is similar to Bitstream Charter, one of the first fonts designed specifically for laser printers. It is highly readable and holds up well in less-than-ideal reproduction environments. It also has a full set of styles – regular, italic, bold, bold italic. Charis is a serif, proportionally-spaced font optimized for readability in long printed documents. The goal for this product was to provide a single Unicode-based font family that would contain a comprehensive inventory of glyphs needed for almost any Roman- or Cyrillic-based writing system, whether used for phonetic or orthographic needs. In addition, there is provision for other characters and symbols useful to linguists. This font makes use of state-of-the-art font technologies to support complex typographic issues, such as the need to position arbitrary combinations of base glyphs and diacritics optimally. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.f--t ]; - }; - } + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.f--t ]; + }; +} diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix index 3248813c3cb0..fc59baa5f9d2 100644 --- a/pkgs/data/fonts/cm-unicode/default.nix +++ b/pkgs/data/fonts/cm-unicode/default.nix @@ -1,19 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "cm-unicode"; version = "0.7.0"; -in fetchzip rec { - name = "cm-unicode-${version}"; - url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${name}-otf.tar.xz"; + src = fetchurl { + url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${pname}-${version}-otf.tar.xz"; + hash = "sha256-VIp+vk1IYbEHW15wMrfGVOPqg1zBZDpgFx+jlypOHCg="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xJvf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/opentype *.otf - install -m444 -Dt $out/share/doc/${name} README FontLog.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README FontLog.txt - sha256 = "1rzz7yhqq3lljyqxbg46jfzfd09qgpgx865lijr4sgc94riy1ypn"; + runHook postInstall + ''; meta = with lib; { homepage = "https://cm-unicode.sourceforge.io/"; diff --git a/pkgs/data/fonts/cnstrokeorder/default.nix b/pkgs/data/fonts/cnstrokeorder/default.nix index 965bf119f6e7..66803b1b63ff 100644 --- a/pkgs/data/fonts/cnstrokeorder/default.nix +++ b/pkgs/data/fonts/cnstrokeorder/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "cnstrokeorder"; version = "0.0.4.7"; -in fetchurl { - name = "cnstrokeorder-${version}"; - url = "http://rtega.be/chmn/CNstrokeorder-${version}.ttf"; + src = fetchurl { + url = "http://rtega.be/chmn/CNstrokeorder-${version}.ttf"; + hash = "sha256-YYtOcUvt1V0DwAs/vf9KltcmYCFJNirvwjGyOK4JpIY="; + }; - recursiveHash = true; - downloadToTemp = true; + dontUnpack = true; - postFetch = '' - install -D $downloadedFile $out/share/fonts/truetype/CNstrokeorder-${version}.ttf + installPhase = '' + runHook preInstall + + install -D $src $out/share/fonts/truetype/CNstrokeorder-${version}.ttf + + runHook postInstall ''; - sha256 = "0cizgfdgbq9av5c8234mysr2q54iw9pkxrmq5ga8gv32hxhl5bx4"; - meta = with lib; { description = "Chinese font that shows stroke order for HSK 1-4"; homepage = "http://rtega.be/chmn/index.php?subpage=68"; diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/data/fonts/comfortaa/default.nix index fc7ce56f7965..f47da9fc5306 100644 --- a/pkgs/data/fonts/comfortaa/default.nix +++ b/pkgs/data/fonts/comfortaa/default.nix @@ -1,28 +1,37 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let - version = "2021-07-29"; -in fetchFromGitHub rec { - name = "comfortaa-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "comfortaa"; + version = "unstable-2021-07-29"; - owner = "googlefonts"; - repo = "comfortaa"; - rev = "2a87ac6f6ea3495150bfa00d0c0fb53dd0a2f11b"; + src = fetchFromGitHub { + owner = "googlefonts"; + repo = pname; + rev = "2a87ac6f6ea3495150bfa00d0c0fb53dd0a2f11b"; + postFetch = '' + # Remove the OTF fonts as they are not needed and cause a hash mismatch + rm -rf $out/fonts/{OTF,otf} + ''; + hash = "sha256-4ZBRaQyYlnt9l4NgBHezuCnR3rKTJ37L41RTbGAhd0M="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype $out/share/doc/comfortaa cp fonts/TTF/*.ttf $out/share/fonts/truetype cp FONTLOG.txt README.md $out/share/doc/comfortaa - ''; - sha256 = "12ad7qy11q49iv9h3l2d7x7y7kf0hxbqhclb92bzwig8dzly9n2k"; + runHook postInstall + ''; meta = with lib; { homepage = "http://aajohan.deviantart.com/art/Comfortaa-font-105395949"; description = "A clean and modern font suitable for headings and logos"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/data/fonts/comic-mono/default.nix b/pkgs/data/fonts/comic-mono/default.nix index 0c915f21c132..fc3b8d6085be 100644 --- a/pkgs/data/fonts/comic-mono/default.nix +++ b/pkgs/data/fonts/comic-mono/default.nix @@ -1,23 +1,27 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { + pname = "comic-mono-font"; version = "2020-12-28"; -in fetchFromGitHub { - name = "comic-mono-font-${version}"; - owner = "dtinth"; - repo = "comic-mono-font"; - rev = "9a96d04cdd2919964169192e7d9de5012ef66de4"; + src = fetchFromGitHub { + owner = "dtinth"; + repo = "comic-mono-font"; + rev = "9a96d04cdd2919964169192e7d9de5012ef66de4"; + hash = "sha256-q8NxrluWuH23FfRlntIS0MDdl3TkkGE7umcU2plS6eU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts - tar -z -f $downloadedFile --wildcards -x \*.ttf --one-top-level=$out/share/fonts + cp *.ttf $out/share/fonts mkdir -p $out/etc/fonts/conf.d ln -s ${./comic-mono-weight.conf} $out/etc/fonts/conf.d/30-comic-mono.conf - ''; - hash = "sha256-poMU+WfDZcsyWyFiiXKJ284X22CJlxQIzcJtApnIdAY="; + runHook postInstall + ''; meta = with lib; { description = "A legible monospace font that looks like Comic Sans"; diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix index b5a7e8878876..c4c7648acd29 100644 --- a/pkgs/data/fonts/comic-relief/default.nix +++ b/pkgs/data/fonts/comic-relief/default.nix @@ -1,22 +1,27 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "comic-relief"; version = "1.1"; -in fetchzip rec { - name = "comic-relief-${version}"; - url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip"; + src = fetchzip { + url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip"; + stripRoot = false; + hash = "sha256-lvkMfaQvLMZ8F0Q5JnpmMsIAkR+XfihoHIoS4z5QEvA="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/etc/fonts/conf.d - mkdir -p $out/share/doc/${name} + mkdir -p $out/share/doc/${pname}-${version} mkdir -p $out/share/fonts/truetype cp -v ${./comic-sans-ms-alias.conf} $out/etc/fonts/conf.d/30-comic-sans-ms.conf - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile FONTLOG.txt -d $out/share/doc/${name} - ''; + cp *.ttf -d $out/share/fonts/truetype + cp FONTLOG.txt -d $out/share/doc/${pname}-${version} - sha256 = "0dz0y7w6mq4hcmmxv6fn4mp6jkln9mzr4s96vsg68wrl5b7k9yff"; + runHook postInstall + ''; meta = with lib; { homepage = "https://fontlibrary.org/en/font/comic-relief"; @@ -30,7 +35,7 @@ in fetchzip rec { ''; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; # Reduce the priority of this package. The intent is that if you # also install the `corefonts` package, then you probably will not diff --git a/pkgs/data/fonts/cooper-hewitt/default.nix b/pkgs/data/fonts/cooper-hewitt/default.nix index 48c7bc873428..5a3bb59c2519 100644 --- a/pkgs/data/fonts/cooper-hewitt/default.nix +++ b/pkgs/data/fonts/cooper-hewitt/default.nix @@ -1,18 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "cooper-hewitt"; version = "unstable-2014-06-09"; - url = "https://web.archive.org/web/20221004145117/https://www.cooperhewitt.org/wp-content/uploads/fonts/CooperHewitt-OTF-public.zip"; + src = fetchzip { + url = "https://web.archive.org/web/20221004145117/https://www.cooperhewitt.org/wp-content/uploads/fonts/CooperHewitt-OTF-public.zip"; + hash = "sha256-bTlEXQeYNNspvnNdvQhJn6CNBrcSKYWuNWF/N6+3Vb0="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/opentype - mv $out/*.otf $out/share/fonts/opentype - find $out -maxdepth 1 ! -type d -exec rm {} + - ''; + mv *.otf $out/share/fonts/opentype - sha256 = "01iwqmjvqkc6fmc2r0486vk06s6f51n9wxzl1pf9z48n0igj4gqd"; + runHook postInstall + ''; meta = with lib; { homepage = "https://www.cooperhewitt.org/open-source-at-cooper-hewitt/cooper-hewitt-the-typeface-by-chester-jenkins/"; diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index db6ac715829f..f8ffc6a2b8e6 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -17,7 +17,7 @@ let ]; eula = fetchurl { - url = "http://corefonts.sourceforge.net/eula.htm"; + url = "https://corefonts.sourceforge.net/eula.htm"; sha256 = "1aqbcnl032g2hd7iy56cs022g47scb0jxxp3mm206x1yqc90vs1c"; }; in @@ -87,7 +87,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://corefonts.sourceforge.net/"; + homepage = "https://corefonts.sourceforge.net/"; description = "Microsoft's TrueType core fonts for the Web"; platforms = platforms.all; license = licenses.unfreeRedistributable; diff --git a/pkgs/data/fonts/courier-prime/default.nix b/pkgs/data/fonts/courier-prime/default.nix index 81788b322cfb..1226966d5e6c 100644 --- a/pkgs/data/fonts/courier-prime/default.nix +++ b/pkgs/data/fonts/courier-prime/default.nix @@ -1,17 +1,20 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "courier-prime"; version = "unstable-2019-12-05"; - repo = "CourierPrime"; - rev = "7f6d46a766acd9391d899090de467c53fd9c9cb0"; -in fetchzip rec { - name = "courier-prime-${version}"; - url = "https://github.com/quoteunquoteapps/${repo}/archive/${rev}/${name}.zip"; - sha256 = "1xh4pkksm6zrafhb69q4lq093q6pl245zi9qhqw3x6c1ab718704"; - postFetch = '' - unzip $downloadedFile - install -m444 -Dt $out/share/fonts/truetype ${repo}-${rev}/fonts/ttf/*.ttf + src = fetchzip { + url = "https://github.com/quoteunquoteapps/CourierPrime/archive/7f6d46a766acd9391d899090de467c53fd9c9cb0/${pname}-${version}.zip"; + hash = "sha256-pMFZpytNtgoZrBj2Gj8SgJ0Lab8uVY5aQtcO2lFbHj4="; + }; + + installPhase = '' + runHook preInstall + + install -m444 -Dt $out/share/fonts/truetype fonts/ttf/*.ttf + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index 1b0b03383664..35d24db563d1 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -1,21 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "1.13.0"; -in -fetchzip rec { - name = "Cozette-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "cozette"; + version = "1.19.0"; - url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"; + src = fetchzip { + url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"; + hash = "sha256-nlEnQjQJAFRvZgdGMiloMs4afugmSFnITTIHD+Qkggg="; + }; - sha256 = "sha256-xp3BCYfNUxCNewg4FfzmJnKp0PARvvnViMVwT25nWdM="; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.bdf -d $out/share/fonts/misc - unzip -j $downloadedFile \*.otb -d $out/share/fonts/misc + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.otf -t $out/share/fonts/opentype + install -Dm644 *.bdf -t $out/share/fonts/misc + install -Dm644 *.otb -t $out/share/fonts/misc + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/crimson-pro/default.nix b/pkgs/data/fonts/crimson-pro/default.nix index d07f5c94937a..29066b5ec3c3 100644 --- a/pkgs/data/fonts/crimson-pro/default.nix +++ b/pkgs/data/fonts/crimson-pro/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation { hash = "sha256-3zFB1AMcC7eNEVA2Mx1OE8rLN9zPzexZ3FtER9wH5ss="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/crimson/default.nix b/pkgs/data/fonts/crimson/default.nix index 9400ef06cf9a..1868c897bd53 100644 --- a/pkgs/data/fonts/crimson/default.nix +++ b/pkgs/data/fonts/crimson/default.nix @@ -1,25 +1,30 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { + pname = "crimson"; version = "2014.10"; -in fetchzip rec { - name = "crimson-${version}"; - url = "https://github.com/skosch/Crimson/archive/fonts-october2014.tar.gz"; + src = fetchFromGitHub { + owner = "skosch"; + repo = "Crimson"; + rev = "fonts-october2014"; + hash = "sha256-Wp9L77q93TRmrAr0P4iH9gm0tqFY0X/xSsuFcd19aAE="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xzvf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/opentype "Desktop Fonts/OTF/"*.otf - install -m444 -Dt $out/share/doc/${name} README.md - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md - sha256 = "0mg65f0ydyfmb43jqr1f34njpd10w8npw15cbb7z0nxmy4nkl842"; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/skosch/Crimson"; description = "A font family inspired by beautiful oldstyle typefaces"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/data/fonts/culmus/default.nix b/pkgs/data/fonts/culmus/default.nix index 00c472d7fe34..28a7f4385a01 100644 --- a/pkgs/data/fonts/culmus/default.nix +++ b/pkgs/data/fonts/culmus/default.nix @@ -1,12 +1,17 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "culmus"; version = "0.133"; -in fetchzip { - name = "culmus-${version}"; - url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz"; - postFetch = '' - tar xf $downloadedFile --strip=1 + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; + hash = "sha256-wMaHN0LQdUT2us8q1S65yzkpdNVkJ5ONwd+8g5nGTQU="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/{truetype,type1} cp -v *.pfa $out/share/fonts/type1/ cp -v *.afm $out/share/fonts/type1/ @@ -14,8 +19,9 @@ in fetchzip { cp -v *.ttf $out/share/fonts/truetype/ cp -v *.otf $out/share/fonts/truetype/ cp -v fonts.scale-ttf $out/share/fonts/truetype/fonts.scale + + runHook postInstall ''; - sha256 = "0zqqjcrqmbd4389hqz2dwymkkcxjrq9ylyriiv3gbmzl6l1ffk3g"; meta = { description = "Culmus Hebrew fonts"; diff --git a/pkgs/data/fonts/curie/default.nix b/pkgs/data/fonts/curie/default.nix index fd21d1964a21..4f3ab7eb013a 100644 --- a/pkgs/data/fonts/curie/default.nix +++ b/pkgs/data/fonts/curie/default.nix @@ -1,22 +1,23 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "curie"; version = "1.0"; -in fetchurl rec { - name = "curie-${version}"; - url = "https://github.com/NerdyPepper/curie/releases/download/v${version}/curie-v${version}.tar.gz"; + src = fetchurl { + url = "https://github.com/NerdyPepper/curie/releases/download/v${version}/curie-v${version}.tar.gz"; + hash = "sha256-B89GNbOmm3lY/cRWQJEFu/5morCM/WrRQb/m6covbt8="; + }; - downloadToTemp = true; + sourceRoot = "."; - recursiveHash = true; + installPhase = '' + runHook preInstall - sha256 = "sha256-twPAzsbTveYW0rQd7FYZz5AMZgvPbNmn5c7Nfzn7B0A="; - - postFetch = '' - tar xzf $downloadedFile mkdir -p $out/share/fonts/misc install *.otb $out/share/fonts/misc + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/d2coding/default.nix b/pkgs/data/fonts/d2coding/default.nix index 25d92fc0f9ee..84af3d18bfe4 100644 --- a/pkgs/data/fonts/d2coding/default.nix +++ b/pkgs/data/fonts/d2coding/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "1.3.2"; +stdenvNoCC.mkDerivation rec { pname = "d2codingfont"; + version = "1.3.2"; -in fetchzip { - name = "${pname}-${version}"; - url = "https://github.com/naver/${pname}/releases/download/VER${version}/D2Coding-Ver${version}-20180524.zip"; + src = fetchzip { + url = "https://github.com/naver/${pname}/releases/download/VER${version}/D2Coding-Ver${version}-20180524.zip"; + stripRoot = false; + hash = "sha256-iC6iaUSVg4zt3wVFJUU4HEeswuKDOTFsAxq/0gRiOCA="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*-all.ttc -d $out/share/fonts/truetype/ + installPhase = '' + runHook preInstall + + install -Dm644 */*-all.ttc -t $out/share/fonts/truetype/ + + runHook postInstall ''; - sha256 = "1812r82530wzfki7k9cm35fy6k2lvis7j6w0w8svc784949m1wwj"; - meta = with lib; { description = "Monospace font with support for Korean and latin characters"; longDescription = '' diff --git a/pkgs/data/fonts/dancing-script/default.nix b/pkgs/data/fonts/dancing-script/default.nix index 5129f4bc5a5e..796069195990 100644 --- a/pkgs/data/fonts/dancing-script/default.nix +++ b/pkgs/data/fonts/dancing-script/default.nix @@ -1,19 +1,22 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "dancing-script"; version = "2.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "impallari"; - repo = "DancingScript"; - rev = "f7f54bc1b8836601dae8696666bfacd306f77e34"; - sha256 = "dfFvh8h+oMhAQL9XKMrNr07VUkdQdxAsA8+q27KWWCA="; + src = fetchFromGitHub { + owner = "impallari"; + repo = "DancingScript"; + rev = "f7f54bc1b8836601dae8696666bfacd306f77e34"; + hash = "sha256-B9oAZFPH3dG/Nt5FfKfFVJYtfUKGK0AXNkQHRC7IgdU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/truetype fonts/ttf/*.ttf + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index 509a37556cec..4a0612efd3e5 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip +{ lib, stdenv, fetchzip, fontforge , bdftopcf, xorg }: @@ -8,32 +8,41 @@ stdenv.mkDerivation { outputs = [ "out" "bdf" ]; - src = fetchurl { - url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip"; - sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z"; + src = fetchzip { + url = "https://www.dcmembers.com/jibsen/download/61/?wpdmdl=61"; + hash = "sha256-JK+vnOyhAbwT825S+WKbQuWgRrfZZHfyhaMQ/6ljO8s="; + extension = "zip"; + stripRoot = false; }; nativeBuildInputs = - [ unzip bdftopcf xorg.mkfontscale xorg.fonttosfnt ]; - - postPatch = '' - sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf - ''; + [ fontforge bdftopcf xorg.mkfontscale xorg.fonttosfnt ]; buildPhase = '' runHook preBuild newName() { - test "''${1:5:1}" = i && _it=Italic || _it= - case ''${1:6:3} in - 400) test -z $it && _weight=Medium ;; - 700) _weight=Bold ;; - esac - _pt=''${1%.bdf} - _pt=''${_pt#*-} - echo "Dina$_weight$_it$_pt" + local name=''${1##*/} + test "''${name:5:1}" = i && _it=Italic || _it= + case ''${name:6:3} in + 400) _weight=Medium ;; + 700) _weight=Bold ;; + esac + _pt=''${1%.bdf} + _pt=''${_pt#*-} + echo "Dina$_weight$_it$_pt" } + # Re-encode the provided BDF files from CP1252 to Unicode as fonttosfnt does + # not support the former. + # We could generate the PCF and OTB files with fontforge directly, but that + # results in incorrect spacing in various places. + for f in BDF/*.bdf; do + basename=''${f##*/} basename=''${basename%.*} + fontforge -lang=ff -c "Open(\"$f\"); Reencode(\"win\", 1); Reencode(\"unicode\"); Generate(\"$basename.bdf\")" + mv "$basename"-*.bdf "$basename".bdf # remove the superfluous added size suffix + done + for f in *.bdf; do name=$(newName "$f") bdftopcf -t -o "$name.pcf" "$f" @@ -62,9 +71,8 @@ stdenv.mkDerivation { relatively compact to allow a lot of code on screen, while (hopefully) clear enough to remain readable even at high resolutions. ''; - homepage = "https://www.donationcoder.com/Software/Jibz/Dina/"; - downloadPage = "https://www.donationcoder.com/Software/Jibz/Dina/"; + homepage = "https://www.dcmembers.com/jibsen/download/61/"; license = licenses.free; - maintainers = [ maintainers.prikhi ]; + maintainers = with maintainers; [ prikhi ncfavier ]; }; } diff --git a/pkgs/data/fonts/dm-sans/default.nix b/pkgs/data/fonts/dm-sans/default.nix new file mode 100644 index 000000000000..c2d8f33eff69 --- /dev/null +++ b/pkgs/data/fonts/dm-sans/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "dm-sans"; + version = "1.002"; + + src = fetchzip { + url = "https://github.com/googlefonts/dm-fonts/releases/download/v${version}/DeepMindSans_v${version}.zip"; + stripRoot = false; + hash = "sha256-RSHHxiCac18qqF+hW5M3BbBcra4AQpNLLlUmhiWj9f8="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + mv *.ttf $out/share/fonts/truetype + + runHook postInstall + ''; + + meta = { + description = "A geometric sans-serif typeface"; + homepage = "https://github.com/googlefonts/dm-fonts"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ gilice ]; + }; +} diff --git a/pkgs/data/fonts/dosis/default.nix b/pkgs/data/fonts/dosis/default.nix index 918996c5f644..a33f086c9bbe 100644 --- a/pkgs/data/fonts/dosis/default.nix +++ b/pkgs/data/fonts/dosis/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "dosis-1.007"; +stdenvNoCC.mkDerivation rec { + pname = "dosis"; + version = "1.007"; - owner = "impallari"; - repo = "Dosis"; - rev = "12df1e13e58768f20e0d48ff15651b703f9dd9dc"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Dosis"; + rev = "12df1e13e58768f20e0d48ff15651b703f9dd9dc"; + hash = "sha256-rZ49uNBlI+NWkiZykpyXzOonXlbVB6Vf6a/8A56Plj4="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.otf' -exec install -m444 -Dt $out/share/fonts/opentype {} \; - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "0vz25w45i8flfvppymr5h83pa2n1r37da20v7691p44018fdsdny"; + runHook postInstall + ''; meta = with lib; { description = "A very simple, rounded, sans serif family"; diff --git a/pkgs/data/fonts/dotcolon-fonts/default.nix b/pkgs/data/fonts/dotcolon-fonts/default.nix new file mode 100644 index 000000000000..fcd439ce30c7 --- /dev/null +++ b/pkgs/data/fonts/dotcolon-fonts/default.nix @@ -0,0 +1,49 @@ +{ lib +, symlinkJoin +, aileron +, vegur +, f5_6 +, tenderness +, medio +, ferrum +, seshat +, penna +, eunomia +, route159 +, f1_8 +, nacelle +, melete +, fa_1 +}: + +symlinkJoin { + name = "dotcolon-fonts"; + + paths = [ + aileron + vegur + f5_6 + tenderness + medio + ferrum + seshat + penna + eunomia + route159 + f1_8 + nacelle + melete + fa_1 + ]; + + meta = { + description = "Font Collection by Sora Sagano"; + + homepage = "https://dotcolon.net/"; + + license = with lib.licenses; [ cc0 ofl ]; + + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ minijackson ]; + }; +} diff --git a/pkgs/data/fonts/doulos-sil/default.nix b/pkgs/data/fonts/doulos-sil/default.nix index f720c2cac7dc..5ffd9da5e03d 100644 --- a/pkgs/data/fonts/doulos-sil/default.nix +++ b/pkgs/data/fonts/doulos-sil/default.nix @@ -1,31 +1,33 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "doulos-sil"; version = "6.101"; -in - fetchzip rec { - name = "doulos-sil-${version}"; + src = fetchzip { url = "https://software.sil.org/downloads/r/doulos/DoulosSIL-${version}.zip"; + hash = "sha256-CPjk6SLgsDYjachZZ1hanp6Q+cxTxfHOkoeU59Om5b8="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" - ''; + installPhase = '' + runHook preInstall - sha256 = "sha256-vYdnudMkkWz6r8pwq98fyO0zcfFBRPmrqlmWxHCOIcc="; + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} - meta = with lib; { - homepage = "https://software.sil.org/doulos"; - description = "A font that provides complete support for the International Phonetic Alphabet"; - longDescription = '' + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://software.sil.org/doulos"; + description = "A font that provides complete support for the International Phonetic Alphabet"; + longDescription = '' This Doulos SIL font is essentially the same design as the SIL Doulos font first released by SIL in 1992. The design has been changed from the original in that it has been scaled down to be a better match with contemporary digital fonts, such as Times New Roman®. This current release is a regular typeface, with no bold or italic version available or planned. It is intended for use alongside other Times-like fonts where a range of styles (italic, bold) are not needed. Therefore, just one font is included in the Doulos SIL release: Doulos SIL Regular. The goal for this product was to provide a single Unicode-based font family that would contain a comprehensive inventory of glyphs needed for almost any Roman- or Cyrillic-based writing system, whether used for phonetic or orthographic needs. In addition, there is provision for other characters and symbols useful to linguists. This font makes use of state-of-the-art font technologies to support complex typographic issues, such as the need to position arbitrary combinations of base glyphs and diacritics optimally. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.f--t ]; - }; - } + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.f--t ]; + }; +} diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/pkgs/data/fonts/eb-garamond/default.nix index 869d889ef3cc..7a57d9308cf9 100644 --- a/pkgs/data/fonts/eb-garamond/default.nix +++ b/pkgs/data/fonts/eb-garamond/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "eb-garamond"; version = "0.016"; -in fetchzip rec { - name = "eb-garamond-${version}"; - url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip"; + src = fetchzip { + url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip"; + hash = "sha256-P2VCLcqcMBBoTDJyRLP9vlHI+jE0EqPjPziN2MJbgEg="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*Changes \*README.markdown \*README.xelualatex -d "$out/share/doc/${name}" + installPhase = '' + runHook preInstall + + install -Dm644 otf/*.otf -t $out/share/fonts/opentype + install -Dm644 Changes README.markdown README.xelualatex -t $out/share/doc/${pname}-${version} + + runHook postInstall ''; - sha256 = "04jq4mpln85zzbla8ybsjw7vn9qr3r0snmk5zykrm24imq7ripv3"; - meta = with lib; { homepage = "http://www.georgduffner.at/ebgaramond/"; description = "Digitization of the Garamond shown on the Egenolff-Berner specimen"; diff --git a/pkgs/data/fonts/edwin/default.nix b/pkgs/data/fonts/edwin/default.nix index 4b1688dbc55e..41926ac1b679 100644 --- a/pkgs/data/fonts/edwin/default.nix +++ b/pkgs/data/fonts/edwin/default.nix @@ -1,22 +1,21 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let - version = "0.52"; -in fetchurl { - name = "edwin-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "edwin"; + version = "0.54"; - url = "https://github.com/MuseScoreFonts/Edwin/archive/refs/tags/v${version}.tar.gz"; + src = fetchurl { + url = "https://github.com/MuseScoreFonts/Edwin/archive/refs/tags/v${version}.tar.gz"; + hash = "sha256-F6BzwnrsaELegdo6Bdju1OG+RI9zKnn4tIASR3q6zYk="; + }; - downloadToTemp = true; + installPhase = '' + runHook preInstall - recursiveHash = true; - - sha256 = "sha256-e0ADK72ECl+QMvLWtFJfeHBmuEwzr9M+Kqvkd5Z2mmo="; - - postFetch = '' - tar xzf $downloadedFile mkdir -p $out/share/fonts/opentype - install Edwin-${version}/*.otf $out/share/fonts/opentype + install *.otf $out/share/fonts/opentype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/efont-unicode/default.nix b/pkgs/data/fonts/efont-unicode/default.nix index f4ea61cbc9eb..e45bdab7a4d8 100644 --- a/pkgs/data/fonts/efont-unicode/default.nix +++ b/pkgs/data/fonts/efont-unicode/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchzip, libfaketime, xorg }: +{ lib, stdenv, fetchurl, libfaketime, xorg }: stdenv.mkDerivation rec { pname = "efont-unicode"; version = "0.4.2"; - src = fetchzip { + src = fetchurl { url = "http://openlab.ring.gr.jp/efont/dist/unicode-bdf/${pname}-bdf-${version}.tar.bz2"; - sha256 = "0bib3jgikq8s1m96imw4mlgbl5cbq1bs5sqig74s2l2cdfx3jaqc"; + sha256 = "sha256-fT7SsYlV3dCQrf0IZfiNI1grj3ngDgr8IkWdg+f9m3M="; }; nativeBuildInputs = with xorg; diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix index 2f7a804ad08d..256084a320fc 100644 --- a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix +++ b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix @@ -1,19 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "emacs-all-the-icons-fonts"; version = "5.0.0"; -in fetchzip { - name = "emacs-all-the-icons-fonts-${version}"; - url = "https://github.com/domtronn/all-the-icons.el/archive/${version}.zip"; + src = fetchzip { + url = "https://github.com/domtronn/all-the-icons.el/archive/${version}.zip"; + hash = "sha256-70ysVxOey6NLlCwhEYhxpxO6uuarMFDpg3Efh+3bj1M="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/all-the-icons + installPhase = '' + runHook preInstall + + install -Dm644 fonts/*.ttf -t $out/share/fonts/all-the-icons + + runHook postInstall ''; - sha256 = "0vc9bkm4pcc05llcd2c9zr3d88h3zmci0izla5wnw8hg1n0rsrii"; - meta = with lib; { description = "Icon fonts for emacs all-the-icons"; longDescription = '' @@ -24,9 +27,9 @@ in fetchzip { homepage = "https://github.com/domtronn/all-the-icons.el"; /* - The fonts come under a mixture of licenses - the MIT license, - SIL OFL license, and Apache license v2.0. See the GitHub page - for further information. + The fonts come under a mixture of licenses - the MIT license, + SIL OFL license, and Apache license v2.0. See the GitHub page + for further information. */ license = licenses.free; platforms = platforms.all; diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/data/fonts/encode-sans/default.nix index 3fd0115ddb48..1c9fc453c7d3 100644 --- a/pkgs/data/fonts/encode-sans/default.nix +++ b/pkgs/data/fonts/encode-sans/default.nix @@ -1,18 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { - name = "encode-sans-1.002"; +stdenvNoCC.mkDerivation rec { + pname = "encode-sans"; + version = "1.002"; - url = "https://github.com/impallari/Encode-Sans/archive/11162b46892d20f55bd42a00b48cbf06b5871f75.zip"; + src = fetchzip { + url = "https://github.com/impallari/Encode-Sans/archive/11162b46892d20f55bd42a00b48cbf06b5871f75.zip"; + hash = "sha256-TPAUc5msAUgJZHibjgYaS2TOuzKFy0rje9ZQTXE6s+w="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 README.md FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall ''; - sha256 = "16mx894zqlwrhnp4rflgayxhxppmsj6k7haxdngajhb30rlwf08p"; - meta = with lib; { description = "A versatile sans serif font family"; longDescription = '' diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/data/fonts/et-book/default.nix index c410826b2fb5..d1b59e2cdc0f 100644 --- a/pkgs/data/fonts/et-book/default.nix +++ b/pkgs/data/fonts/et-book/default.nix @@ -1,16 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031"; - name = "et-book-${builtins.substring 0 6 rev}"; - owner = "edwardtufte"; - repo = "et-book"; - sha256 = "1bfb1l8k7fzgk2l8cikiyfn5x9m0fiwrnsbc1483p8w3qp58s5n2"; +stdenvNoCC.mkDerivation rec { + pname = "et-book"; + version = "unstable-2015-10-05"; + + src = fetchFromGitHub { + owner = "edwardtufte"; + repo = pname; + rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031"; + hash = "sha256-B6ryC9ibNop08TJC/w9LSHHwqV/81EezXsTUJFq8xpo="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xzf $downloadedFile mkdir -p $out/share/fonts/truetype - cp -t $out/share/fonts/truetype et-book-${rev}/source/4-ttf/*.ttf + cp -t $out/share/fonts/truetype source/4-ttf/*.ttf + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/eunomia/default.nix b/pkgs/data/fonts/eunomia/default.nix index 272649582c35..a09a0ad0d782 100644 --- a/pkgs/data/fonts/eunomia/default.nix +++ b/pkgs/data/fonts/eunomia/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "200"; - pname = "eunomia"; in +stdenvNoCC.mkDerivation (self: { + pname = "eunomia"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-Rd2EakaTWjzoEV00tHTgg/bXgJUFfPjCyQUWi7QhFG4="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; - sha256 = "0lpmczs1d4p9dy4s0dnvv7bl5cd0f6yzyasfrkxij5s86glps38b"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { homepage = "http://dotcolon.net/font/eunomia/"; description = "A futuristic decorative font"; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.ofl; }; -} +}) diff --git a/pkgs/data/fonts/ezra-sil/default.nix b/pkgs/data/fonts/ezra-sil/default.nix index 8489ab03562b..7b628bd4bbc0 100644 --- a/pkgs/data/fonts/ezra-sil/default.nix +++ b/pkgs/data/fonts/ezra-sil/default.nix @@ -1,26 +1,28 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "ezra-sil"; version = "2.51"; -in - fetchzip rec { - name = "ezra-sil-${version}"; + src = fetchzip { url = "https://software.sil.org/downloads/r/ezra/EzraSIL-${version}.zip"; + hash = "sha256-hGOHjvFVFLwyVkcoUz+7rQekCdn4oEOB+L16XRpthJM="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" - ''; + installPhase = '' + runHook preInstall - sha256 = "sha256-1LGw/RPFeNtEvcBWFWZf8+dABvWye2RfZ/jt8rwQewM="; + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} - meta = with lib; { - homepage = "https://software.sil.org/ezra"; - description = "Typeface fashioned after the square letter forms of the typography of the Biblia Hebraica Stuttgartensia (BHS)"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.kmein ]; - }; - } + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://software.sil.org/ezra"; + description = "Typeface fashioned after the square letter forms of the typography of the Biblia Hebraica Stuttgartensia (BHS)"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.kmein ]; + }; +} diff --git a/pkgs/data/fonts/f1_8/default.nix b/pkgs/data/fonts/f1_8/default.nix new file mode 100644 index 000000000000..5898fe1eabaf --- /dev/null +++ b/pkgs/data/fonts/f1_8/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenvNoCC, fetchzip }: + +let + majorVersion = "1"; + minorVersion = "101"; +in +stdenvNoCC.mkDerivation (self: { + pname = "f1_8"; + version = "${majorVersion}.${minorVersion}"; + + src = fetchzip { + url = "https://note.com/api/v2/attachments/download/d83b2c4ec63d7826acaa76725d261ff4"; + hash = "sha256-pe1G8WeFAo+KYjjsNwn0JmtXFn9QugE1SeGwaqnl1F0="; + stripRoot = false; + extension = "zip"; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://dotcolon.net/font/${self.pname}/"; + description = "A weighted decorative font"; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + license = licenses.ofl; + }; +}) diff --git a/pkgs/data/fonts/f5_6/default.nix b/pkgs/data/fonts/f5_6/default.nix index 112111faa3d7..a37ee591ef48 100644 --- a/pkgs/data/fonts/f5_6/default.nix +++ b/pkgs/data/fonts/f5_6/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "110"; - pname = "f5_6"; in +stdenvNoCC.mkDerivation (self: { + pname = "f5_6"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-FeCU+mzR0iO5tixI72XUnhvpGj+WRfKyT3mhBtud3uE="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; - sha256 = "04p6lccd26rhjbpq3ddxi5vkk3lk8lqbpnk8lakjzixp3fgdqpp4"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "A weighted decorative font"; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.ofl; }; -} +}) diff --git a/pkgs/data/fonts/fa_1/default.nix b/pkgs/data/fonts/fa_1/default.nix new file mode 100644 index 000000000000..4e8ab3cbaa83 --- /dev/null +++ b/pkgs/data/fonts/fa_1/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenvNoCC, fetchzip }: + +let + majorVersion = "0"; + minorVersion = "100"; +in +stdenvNoCC.mkDerivation (self: { + pname = "fa_1"; + version = "${majorVersion}.${minorVersion}"; + + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-BPJ+wZMYXY/yg5oEgBc5YnswA6A7w6V0gdv+cac0qdc="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://dotcolon.net/font/${self.pname}/"; + description = "A weighted decorative font"; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + license = licenses.ofl; + }; +}) diff --git a/pkgs/data/fonts/fantasque-sans-mono/default.nix b/pkgs/data/fonts/fantasque-sans-mono/default.nix index e8068d7faead..d4d60d95bc94 100644 --- a/pkgs/data/fonts/fantasque-sans-mono/default.nix +++ b/pkgs/data/fonts/fantasque-sans-mono/default.nix @@ -1,22 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "fantasque-sans-mono"; version = "1.8.0"; -in -fetchzip rec { - name = "fantasque-sans-mono-${version}"; + src = fetchzip { + url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono-Normal.zip"; + stripRoot = false; + hash = "sha256-MNXZoDPi24xXHXGVADH16a3vZmFhwX0Htz02+46hWFc="; + }; - url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono-Normal.zip"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile README.md -d $out/share/doc/${name} + install -Dm644 OTF/*.otf -t $out/share/fonts/opentype + install -Dm644 README.md -t $out/share/doc/${pname}-${version} + + runHook postInstall ''; - sha256 = "07y2w6xzkbaj6vr95fvvnmwq1pw9jib4z02xf8937dx812yic9ni"; - meta = with lib; { homepage = "https://github.com/belluzj/fantasque-sans"; description = "A font family with a great monospaced variant for programmers"; diff --git a/pkgs/data/fonts/ferrum/default.nix b/pkgs/data/fonts/ferrum/default.nix index 3f122d22daf5..33b3813cca38 100644 --- a/pkgs/data/fonts/ferrum/default.nix +++ b/pkgs/data/fonts/ferrum/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "200"; - pname = "ferrum"; in +stdenvNoCC.mkDerivation (self: { + pname = "ferrum"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-NDJwgFWZgyhMkGRWlY55l2omEw6ju3e3dHCEsWNzQIc="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}.zip"; - sha256 = "1w1b3ch7ik4264f05lxms01ls0aargvlx770a9szm682dfmizn8w"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "A decorative font"; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.cc0; }; -} +}) diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 8bdc411a7eb3..b0e63835156a 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "fira-code"; version = "6.2"; -in fetchzip { - name = "fira-code-${version}"; - url = "https://github.com/tonsky/FiraCode/releases/download/${version}/Fira_Code_v${version}.zip"; + src = fetchzip { + url = "https://github.com/tonsky/FiraCode/releases/download/${version}/Fira_Code_v${version}.zip"; + stripRoot = false; + hash = "sha256-UHOwZL9WpCHk6vZaqI/XfkZogKgycs5lWg1p0XdQt0A="; + }; # only extract the variable font because everything else is a duplicate - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile '*-VF.ttf' -d $out/share/fonts/truetype - ''; + installPhase = '' + runHook preInstall - sha256 = "0l02ivxz3jbk0rhgaq83cqarqxr07xgp7n27l0fh8fbgxwi52djl"; + install -Dm644 variable_ttf/*-VF.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/tonsky/FiraCode"; diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix index e226c351a333..35d51bb340c9 100644 --- a/pkgs/data/fonts/fira-code/symbols.nix +++ b/pkgs/data/fonts/fira-code/symbols.nix @@ -1,17 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip { - name = "fira-code-symbols-20160811"; +stdenvNoCC.mkDerivation { + pname = "fira-code-symbols"; + version = "20160811"; - url = "https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"; + src = fetchzip { + url = "https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"; + hash = "sha256-7y51blEn0Osf8azytK08zJgtfVX/CIWQkiOoRzYKIa4="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile -d $out/share/fonts/opentype + installPhase = '' + runHook preInstall + + install -Dm644 *.otf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "19krsp22rin74ix0i19v4bh1c965g18xkmz1n55h6n6qimisnbkm"; - meta = with lib; { description = "FiraCode unicode ligature glyphs in private use area"; longDescription = '' diff --git a/pkgs/data/fonts/fira-go/default.nix b/pkgs/data/fonts/fira-go/default.nix index 2d5952523a60..a850d7d2e97c 100644 --- a/pkgs/data/fonts/fira-go/default.nix +++ b/pkgs/data/fonts/fira-go/default.nix @@ -1,25 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { pname = "fira-go"; version = "1.001"; - user = "bBoxType"; - repo = "FiraGo"; - rev = "9882ba0851f88ab904dc237f250db1d45641f45d"; -in -fetchzip { - name = "${pname}-${version}"; - url = "https://github.com/${user}/${repo}/archive/${rev}.zip"; + src = fetchzip { + url = "https://github.com/bBoxType/FiraGo/archive/9882ba0851f88ab904dc237f250db1d45641f45d.zip"; + hash = "sha256-WwgPg7OLrXBjR6oHG5061RO3HeNkj2Izs6ktwIxVw9o="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/opentype - mv $out/Fonts/FiraGO_OTF_1001/{Roman,Italic}/*.otf \ + mv Fonts/FiraGO_OTF_1001/{Roman,Italic}/*.otf \ $out/share/fonts/opentype - rm -r $out/{Fonts,'Technical Report PDF',OFL.txt,README.md,*.pdf} - ''; - sha256 = "sha256-MDGRba1eao/yVzSuncJ/nvCG8cpdrI4roVPI1G9qCbU="; + runHook postInstall + ''; meta = with lib; { homepage = "https://bboxtype.com/typefaces/FiraGO"; diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix index 2cf1e7addbf6..5d059dbf88e0 100644 --- a/pkgs/data/fonts/fira-mono/default.nix +++ b/pkgs/data/fonts/fira-mono/default.nix @@ -1,18 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let version = "4.202"; -in fetchzip { - name = "fira-mono-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "fira-mono"; + version = "4.202"; - url = "https://github.com/mozilla/Fira/archive/${version}.zip"; + src = fetchzip { + url = "https://github.com/mozilla/Fira/archive/${version}.zip"; + hash = "sha256-HLReqgL0PXF5vOpwLN0GiRwnzkjGkEVEyOEV2Z4R0oQ="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile Fira-${version}/otf/FiraMono\*.otf -d $out/share/fonts/opentype + installPhase = '' + runHook preInstall + + install -Dm644 otf/FiraMono*.otf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "1ci3fxhdwabvfj4nl16pwcgqnh7s2slp8vblribk8zkpx8cbp1dj"; - meta = with lib; { homepage = "https://mozilla.github.io/Fira/"; description = "Monospace font for Firefox OS"; diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index 039c5099b56e..89af9fb7b7c3 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { + pname = "fira"; version = "4.202"; -in fetchFromGitHub { - name = "fira-${version}"; - owner = "mozilla"; - repo = "Fira"; - rev = version; + src = fetchFromGitHub { + owner = "mozilla"; + repo = "Fira"; + rev = version; + hash = "sha256-HLReqgL0PXF5vOpwLN0GiRwnzkjGkEVEyOEV2Z4R0oQ="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/opentype cp otf/*.otf $out/share/fonts/opentype - ''; - sha256 = "1iwxbp7kw5kghh5nbycb05zby7p2ib61mywva3h6giv2wd4lpxnz"; + runHook postInstall + ''; meta = with lib; { homepage = "https://mozilla.github.io/Fira/"; diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/pkgs/data/fonts/fixedsys-excelsior/default.nix index cb9d5e73ed2a..53592152a333 100644 --- a/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchurl } : +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "fixedsys-excelsior"; version = "3.00"; -in fetchurl rec { - name = "fixedsys-excelsior-${version}"; - url = "https://raw.githubusercontent.com/chrissimpkins/codeface/master/fonts/fixed-sys-excelsior/FSEX300.ttf"; + src = fetchurl { + url = "https://raw.githubusercontent.com/chrissimpkins/codeface/master/fonts/fixed-sys-excelsior/FSEX300.ttf"; + hash = "sha256-buDzVzvF4z6TthbvYoL0m8DiJ6Map1Osdu0uPz0CBW0="; + }; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - install -m444 -D $downloadedFile $out/share/fonts/truetype/${name}.ttf + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -m444 -D $src $out/share/fonts/truetype/${pname}-${version}.ttf + + runHook postInstall ''; - sha256 = "32d6f07f1ff08c764357f8478892b2ba5ade23427af99759f34a0ba24bcd2e37"; - meta = { homepage = "http://www.fixedsysexcelsior.com/"; description = "Pan-unicode version of Fixedsys, a classic DOS font"; diff --git a/pkgs/data/fonts/font-awesome/default.nix b/pkgs/data/fonts/font-awesome/default.nix index 973df59e408b..a6f748f2f07f 100644 --- a/pkgs/data/fonts/font-awesome/default.nix +++ b/pkgs/data/fonts/font-awesome/default.nix @@ -1,22 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: let - font-awesome = { version, sha256, rev ? version }: fetchFromGitHub { - name = "font-awesome-${version}"; + font-awesome = { version, hash, rev ? version }: stdenvNoCC.mkDerivation { + pname = "font-awesome"; + inherit version; + src = fetchFromGitHub { + owner = "FortAwesome"; + repo = "Font-Awesome"; + inherit rev hash; + }; - owner = "FortAwesome"; - repo = "Font-Awesome"; - inherit rev; + installPhase = '' + runHook preInstall - postFetch = '' - install -m444 -Dt $out/share/fonts/opentype $out/{fonts,otfs}/*.otf - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf + + runHook postInstall ''; - inherit sha256; - meta = with lib; { description = "Font Awesome - OTF font"; longDescription = '' @@ -40,14 +41,14 @@ in v4 = font-awesome { version = "4.7.0"; rev = "v4.7.0"; - sha256 = "sha256-qdrIwxAB+z+4PXrKrj6bBuiJY0DYQuHm2DRng5sYEck="; + hash = "sha256-LL9zWFC+76wH74nqKszPQf2ZDfXq8BiH6tuiK43wYHA="; }; v5 = font-awesome { version = "5.15.3"; - sha256 = "sha256-EDxk/yO3nMmtM/ytrAEgPYSBbep3rA3NrKkiqf3OsU0="; + hash = "sha256-CFXGsl70o/gXUCEKu8Wkv4EBRhrrcMIq8NpfWzcxEus="; }; v6 = font-awesome { version = "6.1.1"; - sha256 = "sha256-BjK1PJQFWtKDvfQ2Vh7BoOPqYucyvOG+2Pu/Kh+JpAA="; + hash = "sha256-rujqhKI33Pi2xugMKGoTJDkPkCDK407+Da6yNJP2yAc="; }; } diff --git a/pkgs/data/fonts/fraunces/default.nix b/pkgs/data/fonts/fraunces/default.nix index d5879d6c2bc4..21bab9002bcf 100644 --- a/pkgs/data/fonts/fraunces/default.nix +++ b/pkgs/data/fonts/fraunces/default.nix @@ -1,18 +1,21 @@ -{ lib, fetchzip }: -let +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "fraunces"; version = "1.000"; -in -fetchzip { - name = "fraunces-${version}"; - url = "https://github.com/undercasetype/Fraunces/releases/download/${version}/UnderCaseType_Fraunces_${version}.zip"; + src = fetchzip { + url = "https://github.com/undercasetype/Fraunces/releases/download/${version}/UnderCaseType_Fraunces_${version}.zip"; + hash = "sha256-hu2G4Fs2I3TMEy/EBFnc88Pv3c8Mpc5rm3OwVvol7gQ="; + }; - sha256 = "0qgl140qkn9p87x7pk60fd3lj206y5h0fq2xkcj2qiv3sxbqxwqb"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + install -Dm644 */static/otf/*.otf -t $out/share/fonts/opentype + install -Dm644 */static/ttf/*.ttf */*.ttf -t $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/galatia-sil/default.nix b/pkgs/data/fonts/galatia-sil/default.nix index 99ae58020053..70881399d593 100644 --- a/pkgs/data/fonts/galatia-sil/default.nix +++ b/pkgs/data/fonts/galatia-sil/default.nix @@ -1,29 +1,31 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "galatia-sil"; version = "2.1"; -in - fetchzip rec { - name = "galatia-sil-${version}"; + src = fetchzip { url = "https://software.sil.org/downloads/r/galatia/GalatiaSIL-${version}.zip"; + hash = "sha256-7kXnTC5vpUOjcT40oNW6e32zFGejlWJq1J+p+5DiAos="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*FONTLOG.txt -d "$out/share/doc/${name}" + installPhase = '' + runHook preInstall + + install -Dm644 $downloadedFile *.ttf -t $out/share/fonts/truetype + install -Dm644 $downloadedFile OFL.txt OFL-FAQ.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://software.sil.org/galatia"; + description = "Font designed to support Biblical Polytonic Greek"; + longDescription = '' + Galatia SIL, designed to support Biblical Polytonic Greek, is a Unicode 3.1 font released under the SIL Open Font License. The font supports precomposed characters rather than decomposed characters. Thus, you must use a keyboard that outputs NFC encoding (precomposed). ''; - - sha256 = "sha256-zLL/7LMcJul2LilhEafpvm+tiYlgv1y1jj85VvG+wiI="; - - meta = with lib; { - homepage = "https://software.sil.org/galatia"; - description = "Font designed to support Biblical Polytonic Greek"; - longDescription = '' - Galatia SIL, designed to support Biblical Polytonic Greek, is a Unicode 3.1 font released under the SIL Open Font License. The font supports precomposed characters rather than decomposed characters. Thus, you must use a keyboard that outputs NFC encoding (precomposed). - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.kmein ]; - }; - } + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.kmein ]; + }; +} diff --git a/pkgs/data/fonts/gandom-fonts/default.nix b/pkgs/data/fonts/gandom-fonts/default.nix index 1b8b3307eb35..53ea5558c1f1 100644 --- a/pkgs/data/fonts/gandom-fonts/default.nix +++ b/pkgs/data/fonts/gandom-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "gandom-fonts"; version = "0.8"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "gandom-font"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "gandom-font"; + rev = "v${version}"; + hash = "sha256-nez8T0TtRLyXxIIR69LrVGde5ThCvA0fLXkYLyYQRV8="; + }; + + installPhase = '' + runHook preInstall + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/gandom-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-EDS3wwKwe2BIcOCxu7DxkVLCoEoTPP31k5ID51lqn3M="; meta = with lib; { homepage = "https://github.com/rastikerdar/gandom-font"; diff --git a/pkgs/data/fonts/garamond-libre/default.nix b/pkgs/data/fonts/garamond-libre/default.nix new file mode 100644 index 000000000000..bd16afaf1895 --- /dev/null +++ b/pkgs/data/fonts/garamond-libre/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "garamond-libre"; + version = "1.4"; + + src = fetchzip { + url = "https://github.com/dbenjaminmiller/garamond-libre/releases/download/${version}/garamond-libre_${version}.zip"; + stripRoot = false; + hash = "sha256-cD/JMICtb6MPIUcWs2VOTHnb/05ma0/KKtPyR4oJlIc="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/dbenjaminmiller/garamond-libre"; + description = "Garamond Libre font family"; + maintainers = with maintainers; [ drupol ]; + license = licenses.x11; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix index 171520e3d12f..c12e3f8e9fd3 100644 --- a/pkgs/data/fonts/gdouros/default.nix +++ b/pkgs/data/fonts/gdouros/default.nix @@ -1,32 +1,36 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchzip }: let fonts = { - aegan = { version = "13.00"; file = "Aegean.zip"; sha256 = "sha256-1DnbfL6bKn8Upht/ZYfKIp9kuDHq7y9E+jkt2Yhr38A="; description = "Aegean"; }; - aegyptus = { version = "13.00"; file = "Aegyptus.zip"; sha256 = "sha256-tObgHlhaquq6Akn/HdYKNfnKHHJP42yAT7lIn5qdCzY="; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; }; - akkadian = { version = "13.00"; file = "Akkadian.zip"; sha256 = "sha256-iHiXfxMS9FIlrRgT23MfxzCqYJMQrKuKYDShrqB74vU="; description = "Sumero-Akkadian Cuneiform"; }; - assyrian = { version = "13.00"; file = "Assyrian.zip"; sha256 = "sha256-YjTQjv1Vybr14Sn9pUdbGYVf4ZIjGT+cpB1qCIg1NNQ="; description = "Neo-Assyrian in Unicode with OpenType"; }; - eemusic = { version = "13.00"; file = "EEMusic.zip"; sha256 = "sha256-PaYBJOV+dmRV1ehY7TwDNL9dz1jPo58I3N8lWX1Vmy8="; description = "Byzantine Musical Notation in Unicode with OpenType"; }; - maya = { version = "13.00"; file = "Maya%20Hieroglyphs.zip"; sha256 = "sha256-9uqGo4hweV1ydI+pEp76IqmHslWvxr87rTvziQs35bQ="; description = "Maya Hieroglyphs"; }; - symbola = { version = "13.00"; file = "Symbola.zip"; sha256 = "sha256-C9HmforXr/Hqopb3go+bzqRFcWPv+0rz0JZsXc3mcxw="; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; }; - textfonts = { version = "13.00"; file = "Textfonts.zip"; sha256 = "sha256-1bDi5mwrT2I8gx6QdhnWjXATFdNAU9nt77BiFIci6C8="; description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; }; - unidings = { version = "13.00"; file = "Unidings.zip"; sha256 = "sha256-6lSkDb603XIrBGy4fZhY7xYDd3x0qA0PRQOlQ9Roig0="; description = "Glyphs and Icons for blocks of The Unicode Standard"; }; + aegan = { version = "13.00"; file = "Aegean.zip"; hash = "sha256-3HmCqCMZLN6zF1N/EirQOPnHKTGHoc4aHKoZxFYTB34="; description = "Aegean"; }; + aegyptus = { version = "13.00"; file = "Aegyptus.zip"; hash = "sha256-SSAK707xhpsUTq8tSBcrzNGunCYad58amtCqAWuevnY="; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; }; + akkadian = { version = "13.00"; file = "Akkadian.zip"; hash = "sha256-wXiDYyfujAs6fklOCqXq7Ms7wP5RbPlpNVwkUy7CV4k="; description = "Sumero-Akkadian Cuneiform"; }; + assyrian = { version = "13.00"; file = "Assyrian.zip"; hash = "sha256-CZj1sc89OexQ0INb7pbEu5GfE/w2E5JmhjT8cosoLSg="; description = "Neo-Assyrian in Unicode with OpenType"; }; + eemusic = { version = "13.00"; file = "EEMusic.zip"; hash = "sha256-LxOcQOPEImw0wosxJotbOJRbe0qlK5dR+kazuhm99Kg="; description = "Byzantine Musical Notation in Unicode with OpenType"; }; + maya = { version = "13.00"; file = "Maya%20Hieroglyphs.zip"; hash = "sha256-PAwF1lGqm6XVf4NQCA8AFLGU40N0Xsn5Q8x9ikHJDhY="; description = "Maya Hieroglyphs"; }; + symbola = { version = "13.00"; file = "Symbola.zip"; hash = "sha256-TsHWmzkEyMa8JOZDyjvk7PDhm239oH/FNllizNFf398="; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; }; + textfonts = { version = "13.00"; file = "Textfonts.zip"; hash = "sha256-7S3NiiyDvyYoDrLPt2z3P9bEEFOEZACv2sIHG1Tn6yI="; description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; }; + unidings = { version = "13.00"; file = "Unidings.zip"; hash = "sha256-WUY+Ylphep6WuzqLQ3Owv+vK5Yuu/aAkn4GOFXL0uQY="; description = "Glyphs and Icons for blocks of The Unicode Standard"; }; }; - mkpkg = name_: {version, file, sha256, description}: fetchzip rec { - name = "${name_}-${version}"; - url = "https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}"; - stripRoot = false; - postFetch = '' - mkdir -p $out/share/{fonts/opentype,doc/${name_}} - mv $out/*.otf -t "$out/share/fonts/opentype" - mv $out/*.{odt,ods,pdf,xlsx} -t "$out/share/doc/${name_}" || true # install docs if any - find $out -type d -empty -delete - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + mkpkg = pname: { version, file, hash, description }: stdenvNoCC.mkDerivation rec { + inherit pname version; + + src = fetchzip { + url = "https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}"; + stripRoot = false; + inherit hash; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{fonts/opentype,doc/${pname}} + mv *.otf -t "$out/share/fonts/opentype" + mv *.{odt,ods,pdf,xlsx} -t "$out/share/doc/${pname}" || true # install docs if any + + runHook postInstall ''; - inherit sha256; meta = { inherit description; @@ -39,4 +43,4 @@ let }; }; in - lib.mapAttrs mkpkg fonts +lib.mapAttrs mkpkg fonts diff --git a/pkgs/data/fonts/gelasio/default.nix b/pkgs/data/fonts/gelasio/default.nix index c8cf655a18cf..cea8e439d36b 100644 --- a/pkgs/data/fonts/gelasio/default.nix +++ b/pkgs/data/fonts/gelasio/default.nix @@ -1,18 +1,25 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let - version = "unstable-2018-08-12"; -in fetchFromGitHub { - name = "gelasio-${version}"; - owner = "SorkinType"; - repo = "Gelasio"; - rev = "5bced461d54bcf8e900bb3ba69455af35b0d2ff1"; - sha256 = "0dfskz2vpwsmd88rxqsxf0f01g4f2hm6073afcm424x5gc297n39"; +stdenvNoCC.mkDerivation { + pname = "gelasio"; + version = "unstable-2022-06-09"; + + src = fetchFromGitHub { + owner = "SorkinType"; + repo = "Gelasio"; + rev = "a75c6d30a35f74cdbaea1813bdbcdb64bb11d3d5"; + hash = "sha256-ncm0lSDPPPREdxTx3dGl6OGBn4FGAjFTlQpA6oDCdMI="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype/ + cp fonts/ttf/*.ttf $out/share/fonts/truetype/ + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix index 2e14795ebd14..5cbc31accf07 100644 --- a/pkgs/data/fonts/gentium-book-basic/default.nix +++ b/pkgs/data/fonts/gentium-book-basic/default.nix @@ -1,22 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - major = "1"; - minor = "102"; - version = "${major}.${minor}"; -in fetchzip rec { - name = "gentium-book-basic-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "gentium-book-basic"; + version = "1.102"; - url = "http://software.sil.org/downloads/r/gentium/GentiumBasic_${major}${minor}.zip"; + src = fetchzip { + url = "http://software.sil.org/downloads/r/gentium/GentiumBasic_${lib.versions.major version}${lib.versions.minor version}.zip"; + hash = "sha256-oCmpl95MJRfCV25cg/4cf8AwQWnoymXasSss1ziOPoE="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt -d $out/share/doc/${name} + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 FONTLOG.txt GENTIUM-FAQ.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall ''; - sha256 = "0598zr5f7d6ll48pbfbmmkrybhhdks9b2g3m2g67wm40070ffzmd"; - meta = with lib; { homepage = "https://software.sil.org/gentium/"; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index f64f7b341440..5c3f7dfab23f 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -1,30 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "gentium"; version = "6.101"; -in fetchzip rec { - name = "gentium-${version}"; - url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${version}.zip"; + src = fetchzip { + url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${version}.zip"; + hash = "sha256-iKD1Q7/lsbZCuJQoJqySQHwplrHv8yzmph+QwKpYgMU="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -l $downloadedFile - unzip -j $downloadedFile \*.ttf \ - -d $out/share/fonts/truetype - unzip -j $downloadedFile \ - \*/FONTLOG.txt \ - \*/README.txt \ - -d $out/share/doc/${name} - unzip -j $downloadedFile \ - \*/documentation/\*.html \ - \*/documentation/\*.txt \ - -x \*/documentation/source/\* \ - -d $out/share/doc/${name}/documentation + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${pname}-${version} + cp -r documentation $out/share/doc/${pname}-${version} + + runHook postInstall ''; - sha256 = "sha256-+T5aUlqQYDWRp4/4AZzsREHgjAnOeUB6qn1GAI0A5hE="; - meta = with lib; { homepage = "https://software.sil.org/gentium/"; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix index 45041bb805d9..63d62ec2e82e 100644 --- a/pkgs/data/fonts/go-font/default.nix +++ b/pkgs/data/fonts/go-font/default.nix @@ -1,22 +1,26 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "go-font"; version = "2.010"; - rev = "41969df76e82aeec85fa3821b1e24955ea993001"; -in (fetchzip { - name = "go-font-${version}"; - url = "https://go.googlesource.com/image/+archive/${rev}/font/gofont/ttfs.tar.gz"; - stripRoot = false; - postFetch = '' + src = fetchzip { + url = "https://go.googlesource.com/image/+archive/41969df76e82aeec85fa3821b1e24955ea993001/font/gofont/ttfs.tar.gz"; + stripRoot = false; + hash = "sha256-rdzt51wY4b7HEr7W/0Ar/FB0zMyf+nKLsOT+CRSEP3o="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype mkdir -p $out/share/doc/go-font - mv $out/*.ttf $out/share/fonts/truetype - mv $out/README $out/share/doc/go-font/LICENSE + mv *.ttf $out/share/fonts/truetype + mv README $out/share/doc/go-font/LICENSE + + runHook postInstall ''; - sha256 = "175jwq16qjnd2k923n9gcbjizchy7yv4n41dm691sjwrhbl0b13x"; -}) // { meta = with lib; { homepage = "https://blog.golang.org/go-fonts"; description = "The Go font family"; @@ -24,6 +28,5 @@ in (fetchzip { license = licenses.bsd3; maintainers = with maintainers; [ sternenseemann ]; platforms = lib.platforms.all; - hydraPlatforms = []; }; } diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index b1abb26f9f20..4503b09354a9 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -8,7 +8,7 @@ stdenvNoCC.mkDerivation { pname = "google-fonts"; version = "unstable-2022-11-14"; - # Adobe Blank is split out in a seperate output, + # Adobe Blank is split out in a separate output, # because it causes crashes with `libfontconfig`. # It has an absurd number of symbols outputs = [ "out" "adobeBlank" ]; diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/data/fonts/gyre/default.nix index 91a8aaf3c301..254766d1de28 100644 --- a/pkgs/data/fonts/gyre/default.nix +++ b/pkgs/data/fonts/gyre/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - baseName = "gyre-fonts"; +stdenvNoCC.mkDerivation rec { + pname = "gyre-fonts"; version = "2.005"; -in fetchzip { - name="${baseName}-${version}"; - url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-${version}otf.zip"; + src = fetchzip { + url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-${version}otf.zip"; + stripRoot = false; + hash = "sha256-+6IufuFf+IoLXoZEPlfHUNgRhKrQNBEZ1OwPD9/uOjg="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/truetype + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + cp *.otf $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "17amdpahs6kn7hk3dqxpff1s095cg1caxzij3mxjbbxp8zy0l111"; - meta = { description = "OpenType fonts from the Gyre project, suitable for use with (La)TeX"; longDescription = '' diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index 0427cf36429f..6c6bd1918dbf 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -1,19 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "hack-font"; version = "3.003"; -in fetchzip { - name = "hack-font-${version}"; - url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version}-ttf.zip"; + src = fetchzip { + url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version}-ttf.zip"; + hash = "sha256-SxF4kYp9aL/9L9EUniquFadzWt/+PcvhUQOIOvCrFRM="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hack + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/hack + + runHook postInstall ''; - sha256 = "1l6ih6v7dqali5c7zh6z2xnbf9h2wz0ag6fdgszmqd5lnhw39v6s"; - meta = with lib; { description = "A typeface designed for source code"; longDescription = '' @@ -26,7 +29,7 @@ in fetchzip { homepage = "https://sourcefoundry.org/hack/"; /* - "The font binaries are released under a license that permits unlimited + "The font binaries are released under a license that permits unlimited print, desktop, and web use for commercial and non-commercial applications. It may be embedded and distributed in documents and applications. The source is released in the widely supported UFO format diff --git a/pkgs/data/fonts/hackgen/default.nix b/pkgs/data/fonts/hackgen/default.nix index 5d87131c1028..24c3b7af374f 100644 --- a/pkgs/data/fonts/hackgen/default.nix +++ b/pkgs/data/fonts/hackgen/default.nix @@ -1,18 +1,20 @@ -{ lib -, fetchzip -}: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "hackgen-font"; - version = "2.7.1"; + version = "2.8.0"; - url = "https://github.com/yuru7/HackGen/releases/download/v${version}/HackGen_v${version}.zip"; - sha256 = "sha256-UL6U/q2u1UUP31lp0tEnFjzkn6dn8AY6hk5hJhPsOAE="; - postFetch = '' - install -Dm644 $out/*.ttf -t $out/share/fonts/hackgen - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + src = fetchzip { + url = "https://github.com/yuru7/HackGen/releases/download/v${version}/HackGen_v${version}.zip"; + hash = "sha256-vKbiM3QUryey0m6oilO0lT6+efkCTLCwdtPF7PinkmU="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/hackgen + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/hackgen/nerdfont.nix b/pkgs/data/fonts/hackgen/nerdfont.nix index effa2bc45ad4..54bec95c59ce 100644 --- a/pkgs/data/fonts/hackgen/nerdfont.nix +++ b/pkgs/data/fonts/hackgen/nerdfont.nix @@ -1,18 +1,20 @@ -{ lib -, fetchzip -}: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "hackgen-nf-font"; - version = "2.7.1"; + version = "2.8.0"; - url = "https://github.com/yuru7/HackGen/releases/download/v${version}/HackGen_NF_v${version}.zip"; - sha256 = "sha256-9sylGr37kKIGWgThZFqL2y6oI3t2z4kbXYk5DBMIb/g="; - postFetch = '' - install -Dm644 $out/*.ttf -t $out/share/fonts/hackgen-nf - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + src = fetchzip { + url = "https://github.com/yuru7/HackGen/releases/download/v${version}/HackGen_NF_v${version}.zip"; + hash = "sha256-RLEq5IoA3gk/IzabV8wdJYj8yMpbWQVz+Qunef6oNOs="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/hackgen-nf + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/hanazono/default.nix b/pkgs/data/fonts/hanazono/default.nix index 29c982ed8aea..f6dd5baa60c2 100644 --- a/pkgs/data/fonts/hanazono/default.nix +++ b/pkgs/data/fonts/hanazono/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "hanazono"; version = "20170904"; -in fetchzip { - name = "hanazono-${version}"; - url = "mirror://osdn/hanazono-font/68253/hanazono-${version}.zip"; + src = fetchzip { + url = "mirror://osdn/hanazono-font/68253/hanazono-${version}.zip"; + stripRoot = false; + hash = "sha256-qd0q4wQnHBGLT7C+UQIiOHnxCnRCscMZcj3P5RRxD1U="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d $out/share/doc/hanazono + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/hanazono + + runHook postInstall ''; - sha256 = "0qiyd1vk3w8kqmwc6xi5d390wdr4ln8xhfbx3n8r1hhad9iz14p6"; - meta = with lib; { description = "Japanese Mincho-typeface TrueType font"; homepage = "https://fonts.jp/hanazono/"; diff --git a/pkgs/data/fonts/hannom/default.nix b/pkgs/data/fonts/hannom/default.nix index fa586caa79cc..d91de86c532b 100644 --- a/pkgs/data/fonts/hannom/default.nix +++ b/pkgs/data/fonts/hannom/default.nix @@ -1,27 +1,26 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "hannom"; version = "2005"; -in fetchzip { - name = "hannom-${version}"; - url = "mirror://sourceforge/vietunicode/hannom/hannom%20v${version}/hannomH.zip"; + src = fetchzip { + url = "mirror://sourceforge/vietunicode/hannom/hannom%20v${version}/hannomH.zip"; + stripRoot = false; + hash = "sha256-Oh8V72tYvVA6Sk0f9UTIkRQYjdUbEB/fmCSaRYfyoP8="; + }; - stripRoot = false; + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - mv $out/*.ttf -t $out/share/fonts/truetype - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob - ''; + mv *.ttf -t $out/share/fonts/truetype - sha256 = "sha256-zOYJxEHl4KM0ncVQDBs9+e3z8DxzF2ef3pRj0OVSuUo="; + runHook postInstall + ''; meta = with lib; { description = "UNICODE Han Nom Font Set"; - homepage = "http://vietunicode.sourceforge.net/fonts/fonts_hannom.html"; longDescription = '' The true type fonts HAN NOM A and HAN NOM B have been developed by Chan Nguyen Do Quoc Bao (Germany), To Minh Tam (USA) and Ni sinh Thien Vien Vien @@ -31,6 +30,7 @@ in fetchzip { code points by the Unicode Standard. Two sets of true type fonts are available with high and low resolutions. ''; + homepage = "https://vietunicode.sourceforge.net/fonts/fonts_hannom.html"; license = licenses.unfree; maintainers = with maintainers; [ wegank ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix index d9deef80c0d7..a69f8f743cbe 100644 --- a/pkgs/data/fonts/hasklig/default.nix +++ b/pkgs/data/fonts/hasklig/default.nix @@ -1,18 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "hasklig"; version = "1.1"; -in fetchzip { - name = "hasklig-${version}"; - url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip"; + src = fetchzip { + url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip"; + stripRoot = false; + hash = "sha256-jsPQtjuegMePt4tB1dZ9mq15LSxXBYwtakbq4od/sko="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - unzip $downloadedFile install -m444 -Dt $out/share/fonts/opentype *.otf - ''; - sha256 = "0xxyx0nkapviqaqmf3b610nq17k20afirvc72l32pfspsbxz8ybq"; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/i-tu/Hasklig"; diff --git a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix index 7e69ff70d625..61dc6ba14e29 100644 --- a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix +++ b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix @@ -1,24 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { + name = "helvetica-neue-lt-std"; version = "2014.08.16"; # date of most recent file in distribution -in fetchzip { - name = "helvetica-neue-lt-std-${version}"; - url = "https://web.archive.org/web/20190823153624/http://ephifonts.com/downloads/helvetica-neue-lt-std.zip"; + src = fetchzip { + url = "https://web.archive.org/web/20190823153624/http://ephifonts.com/downloads/helvetica-neue-lt-std.zip"; + stripRoot = false; + hash = "sha256-ytoTTrnwN1lMw/gTxS4DRAq+tV5WzB2xHP4vVxLZ1ZI="; + }; - stripRoot = false; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts - install -Dm644 $out/'Helvetica Neue LT Std'/*.otf -t $out/share/fonts/opentype - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + install -Dm644 'Helvetica Neue LT Std'/*.otf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "sha256-gM/QXrKI2xrrCBYt4R+Fk5Tj0AIkrnCP/pwgh0A/MyI="; - meta = with lib; { homepage = "https://web.archive.org/web/20190926040940/http://www.ephifonts.com/free-helvetica-font-helvetica-neue-lt-std.html"; description = "Helvetica Neue LT Std font"; diff --git a/pkgs/data/fonts/hermit/default.nix b/pkgs/data/fonts/hermit/default.nix index 999a8995b46e..3ff770522d9e 100644 --- a/pkgs/data/fonts/hermit/default.nix +++ b/pkgs/data/fonts/hermit/default.nix @@ -1,21 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { pname = "hermit"; version = "2.0"; -in fetchzip rec { - name = "${pname}-${version}"; - url = "https://pcaro.es/d/otf-${name}.tar.gz"; + src = fetchzip { + url = "https://pcaro.es/d/otf-${pname}-${version}.tar.gz"; + stripRoot = false; + hash = "sha256-RYXZ2yJ8BIxsgeEwhXz7g0NnWG3kMPZoJaOLMUQyWWQ="; + }; - stripRoot = false; - postFetch = '' - install -m444 -Dt $out/share/fonts/opentype $out/*.otf - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + installPhase = '' + runHook preInstall + + install -m444 -Dt $out/share/fonts/opentype *.otf + + runHook postInstall ''; - sha256 = "127hnpxicqya7v1wmzxxqafq3aj1n33i4j5ncflbw6gj5g3bizwl"; meta = with lib; { description = "monospace font designed to be clear, pragmatic and very readable"; @@ -25,4 +26,3 @@ in fetchzip rec { platforms = platforms.all; }; } - diff --git a/pkgs/data/fonts/hyperscrypt/default.nix b/pkgs/data/fonts/hyperscrypt/default.nix index 09bcc2464ba4..c72e4b9e19a0 100644 --- a/pkgs/data/fonts/hyperscrypt/default.nix +++ b/pkgs/data/fonts/hyperscrypt/default.nix @@ -1,22 +1,25 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "hyperscrypt"; version = "1.1"; - pname = "HyperScrypt"; -in -fetchzip { - name = "${lib.toLower pname}-font-${version}"; - url = "https://gitlab.com/StudioTriple/Hyper-Scrypt/-/archive/${version}/Hyper-Scrypt-${version}.zip"; - sha256 = "01pf5p2scmw02s0gxnibiwxbpzczphaaapv0v4s7svk9aw2gmc0m"; - postFetch = '' - mkdir -p $out/share/fonts/{truetype,opentype} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/${pname}.ttf - unzip -j $downloadedFile \*${pname}.otf -d $out/share/fonts/opentype/${pname}.otf + src = fetchzip { + url = "https://gitlab.com/StudioTriple/Hyper-Scrypt/-/archive/${version}/Hyper-Scrypt-${version}.zip"; + hash = "sha256-ONlAB9C/GYK6KmOaiHCYErkS6OlQ3TUnoumNDHGZnes="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 fonts/HyperScrypt_Web/*.ttf -t $out/share/fonts/truetype/ + install -Dm644 fonts/HyperScrypt_Web/*.otf fonts/*.otf -t $out/share/fonts/opentype/ + + runHook postInstall ''; meta = with lib; { - homepage = "http://velvetyne.fr/fonts/hyper-scrypt/"; + homepage = "https://velvetyne.fr/fonts/hyper-scrypt/"; description = "A modern stencil typeface inspired by stained glass technique"; longDescription = '' The Hyper Scrypt typeface was designed for the Hyper Chapelle @@ -32,7 +35,7 @@ fetchzip { molted metal, Hyper Scrypt is based upon a rigorous grid, allowing some neat alignements between shapes in multi lines layouts. - ''; + ''; license = licenses.ofl; maintainers = with maintainers; [ leenaars ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/i-dot-ming/default.nix b/pkgs/data/fonts/i-dot-ming/default.nix index d15d7bcc245e..fb2679b2eba2 100644 --- a/pkgs/data/fonts/i-dot-ming/default.nix +++ b/pkgs/data/fonts/i-dot-ming/default.nix @@ -1,17 +1,22 @@ -{ lib, fetchurl, writeScript }: +{ lib, stdenvNoCC, fetchurl, writeScript }: -let +stdenvNoCC.mkDerivation rec { + pname = "i.ming"; version = "8.00"; -in -fetchurl { - name = "i.ming-${version}"; - url = "https://raw.githubusercontent.com/ichitenfont/I.Ming/${version}/${version}/I.Ming-${version}.ttf"; - hash = "sha256-JGu9H0+IdJL6QQtLwvqlFLEaJdq1JVRiqLm5zptwjyE="; - recursiveHash = true; - downloadToTemp = true; - postFetch = '' - install -DT -m444 $downloadedFile $out/share/fonts/truetype/I.Ming/I.Ming.ttf + src = fetchurl { + url = "https://raw.githubusercontent.com/ichitenfont/I.Ming/${version}/${version}/I.Ming-${version}.ttf"; + hash = "sha256-6345629OdKz6lTnD3Vjtp6DzsYy0ojaL0naXGrtdZvw="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -DT -m444 $src $out/share/fonts/truetype/I.Ming/I.Ming.ttf + + runHook postInstall ''; passthru = { diff --git a/pkgs/data/fonts/ia-writer-duospace/default.nix b/pkgs/data/fonts/ia-writer-duospace/default.nix index 6da80a1bf830..483ed98737d0 100644 --- a/pkgs/data/fonts/ia-writer-duospace/default.nix +++ b/pkgs/data/fonts/ia-writer-duospace/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let - version = "20180721"; -in fetchFromGitHub { - name = "ia-writer-duospace-${version}"; +stdenvNoCC.mkDerivation { + pname = "ia-writer-duospace"; + version = "unstable-2018-07-21"; - owner = "iaolo"; - repo = "iA-Fonts"; - rev = "55edf60f544078ab1e14987bc67e9029a200e0eb"; - sha256 = "0932lcxf861vb3hz52z1xj8r99ag9sdyqsnq9brv7gc4kp2l339c"; + src = fetchFromGitHub { + owner = "iaolo"; + repo = "iA-Fonts"; + rev = "55edf60f544078ab1e14987bc67e9029a200e0eb"; + hash = "sha256-/ifzOScILLuFkjFIgpy0ArCcelgealbpypKvZ46xApU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar --strip-components=1 -xzvf $downloadedFile mkdir -p $out/share/fonts/opentype cp "iA Writer Duospace/OTF (Mac)/"*.otf $out/share/fonts/opentype/ + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index f04050664925..0de1f38a0ff8 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -1,20 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "6.0.1"; +stdenvNoCC.mkDerivation rec { + pname = "ibm-plex"; + version = "6.1.1"; -in fetchzip { - name = "ibm-plex-${version}"; + src = fetchzip { + url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; + hash = "sha256-PZ7KPtaXZFVD5uMc7i+GQMA4DU5PsspeAodiU/FrTpY="; + }; - url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile "OpenType/*/*.otf" -x "OpenType/IBM-Plex-Sans-JP/unhinted/*" -d $out/share/fonts/opentype + install -Dm644 */*.otf IBM-Plex-Sans-JP/unhinted/* -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "sha256-HxO0L5Q6WJQBqtg64cczzuRcSYi4jEqbOzEWxDmqFp8="; - meta = with lib; { description = "IBM Plex Typeface"; homepage = "https://www.ibm.com/plex/"; diff --git a/pkgs/data/fonts/inriafonts/default.nix b/pkgs/data/fonts/inriafonts/default.nix index d8127b851274..1ca1ce2f9098 100644 --- a/pkgs/data/fonts/inriafonts/default.nix +++ b/pkgs/data/fonts/inriafonts/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "inriafonts"; version = "1.200"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "BlackFoundry"; - repo = "InriaFonts"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "BlackFoundry"; + repo = "InriaFonts"; + rev = "v${version}"; + hash = "sha256-CMKkwGuUEVYavnFi15FCk7Xloyk97w+LhAZ6mpIv5xg="; + }; + + installPhase = '' + runHook preInstall + install -m444 -Dt $out/share/fonts/truetype fonts/*/TTF/*.ttf install -m444 -Dt $out/share/fonts/opentype fonts/*/OTF/*.otf + + runHook postInstall ''; - sha256 = "0wrwcyycyzvgvgnlmwi1ncdvwb8f6bbclynd1105rsyxgrz5dd70"; meta = with lib; { homepage = "https://black-foundry.com/work/inria"; diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix index ca01acd0c54b..46ab699fd398 100644 --- a/pkgs/data/fonts/inter/default.nix +++ b/pkgs/data/fonts/inter/default.nix @@ -1,18 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "inter"; version = "3.19"; -in fetchzip { - name = "inter-${version}"; - url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-${version}.zip"; + src = fetchzip { + url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-${version}.zip"; + stripRoot = false; + hash = "sha256-6kUQUTFtxiJEU6sYC6HzMwm1H4wvaKIoxoY3F6GJJa8="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; + cp */*.otf $out/share/fonts/opentype - sha256 = "sha256-8p15thg3xyvCA/8dH2jGQoc54nzESFDyv5m47FgWrSI="; + runHook postInstall + ''; meta = with lib; { homepage = "https://rsms.me/inter/"; @@ -22,4 +27,3 @@ in fetchzip { maintainers = with maintainers; [ demize dtzWill ]; }; } - diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index d7f107b78428..590163fc05fd 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 = "16.3.6"; + version = "17.1.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; @@ -34,6 +34,7 @@ in stdenv.mkDerivation rec { inherit (iosevka.meta) homepage downloadPage description license platforms; maintainers = with lib.maintainers; [ cstrahan + montchr ]; }; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index d9efb0eedcd7..53a54f346db1 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, pkgs, fetchFromGitHub, nodejs, remarshal +{ stdenv +, lib +, pkgs +, buildNpmPackage +, fetchFromGitHub +, nodejs +, remarshal , ttfautohint-nox # Custom font set options. # See https://typeof.net/Iosevka/customizer @@ -42,70 +48,57 @@ # ''; , extraParameters ? null # Custom font set name. Required if any custom settings above. -, set ? null }: +, set ? null +}: assert (privateBuildPlan != null) -> set != null; assert (extraParameters != null) -> set != null; -let - # We don't know the attribute name for the Iosevka package as it - # changes not when our update script is run (which in turn updates - # node-packages.json, but when node-packages/generate.sh is run - # (which updates node-packages.nix). - # - # Doing it this way ensures that the package can always be built, - # although possibly an older version than ioseva-bin. - nodeIosevka = (import ./node-composition.nix { - inherit pkgs nodejs; - inherit (stdenv.hostPlatform) system; - }).package.override { - src = fetchFromGitHub { - owner = "be5invis"; - repo = "Iosevka"; - rev = "v15.6.3"; - hash = "sha256-wsFx5sD1CjQTcmwpLSt97OYFI8GtVH54uvKQLU1fWTg="; - }; +buildNpmPackage rec { + pname = if set != null then "iosevka-${set}" else "iosevka"; + version = "17.1.0"; + + src = fetchFromGitHub { + owner = "be5invis"; + repo = "iosevka"; + rev = "v${version}"; + hash = "sha256-xGRymDhkNP9b2JYTEu4M/CrRINmMGY2S5ZuM3Ot1wGg="; }; -in -stdenv.mkDerivation rec { - pname = if set != null then "iosevka-${set}" else "iosevka"; - inherit (nodeIosevka) version src; + npmDepsHash = "sha256-Ncf07ggyOnz/2SpgdmaYS2X/8Bad+J2sz8Yyx9Iri3E="; - nativeBuildInputs = [ - nodejs - remarshal - ttfautohint-nox - ]; + nativeBuildInputs = [ nodejs remarshal ttfautohint-nox ]; buildPlan = - if builtins.isAttrs privateBuildPlan - then builtins.toJSON { buildPlans.${pname} = privateBuildPlan; } - else privateBuildPlan; + if builtins.isAttrs privateBuildPlan then + builtins.toJSON { buildPlans.${pname} = privateBuildPlan; } + else + privateBuildPlan; inherit extraParameters; - passAsFile = [ - "extraParameters" - ] ++ lib.optionals (! (builtins.isString privateBuildPlan && lib.hasPrefix builtins.storeDir privateBuildPlan)) [ - "buildPlan" - ]; + passAsFile = [ "extraParameters" ] ++ lib.optionals + ( + !(builtins.isString privateBuildPlan + && lib.hasPrefix builtins.storeDir privateBuildPlan) + ) [ "buildPlan" ]; configurePhase = '' runHook preConfigure ${lib.optionalString (builtins.isAttrs privateBuildPlan) '' remarshal -i "$buildPlanPath" -o private-build-plans.toml -if json -of toml ''} - ${lib.optionalString (builtins.isString privateBuildPlan && (!lib.hasPrefix builtins.storeDir privateBuildPlan)) '' - cp "$buildPlanPath" private-build-plans.toml - ''} - ${lib.optionalString (builtins.isString privateBuildPlan && (lib.hasPrefix builtins.storeDir privateBuildPlan)) '' - cp "$buildPlan" private-build-plans.toml - ''} + ${lib.optionalString (builtins.isString privateBuildPlan + && (!lib.hasPrefix builtins.storeDir privateBuildPlan)) '' + cp "$buildPlanPath" private-build-plans.toml + ''} + ${lib.optionalString (builtins.isString privateBuildPlan + && (lib.hasPrefix builtins.storeDir privateBuildPlan)) '' + cp "$buildPlan" private-build-plans.toml + ''} ${lib.optionalString (extraParameters != null) '' echo -e "\n" >> params/parameters.toml cat "$extraParametersPath" >> params/parameters.toml ''} - ln -s ${nodeIosevka}/lib/node_modules/iosevka/node_modules . runHook postConfigure ''; @@ -126,16 +119,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru = { - updateScript = ./update-default.sh; - }; - meta = with lib; { - homepage = "https://be5invis.github.io/Iosevka"; + homepage = "https://typeof.net/Iosevka/"; downloadPage = "https://github.com/be5invis/Iosevka/releases"; description = '' - Slender monospace sans-serif and slab-serif typeface inspired by Pragmata - Pro, M+ and PF DIN Mono, designed to be the ideal font for programming. + Iosevka is an open-source, sans-serif + slab-serif, monospace + + quasi‑proportional typeface family, designed for writing code, using in + terminals, and preparing technical documents. ''; license = licenses.ofl; platforms = platforms.all; @@ -146,6 +136,7 @@ stdenv.mkDerivation rec { babariviere rileyinman AluisioASG + lunik1 ]; }; } diff --git a/pkgs/data/fonts/iosevka/node-composition.nix b/pkgs/data/fonts/iosevka/node-composition.nix deleted file mode 100644 index 2e810490ca8d..000000000000 --- a/pkgs/data/fonts/iosevka/node-composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: - -let - nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - 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/data/fonts/iosevka/node-packages.nix b/pkgs/data/fonts/iosevka/node-packages.nix deleted file mode 100644 index cff861ddfbf6..000000000000 --- a/pkgs/data/fonts/iosevka/node-packages.nix +++ /dev/null @@ -1,2697 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: - -let - sources = { - "@eslint/eslintrc-1.3.0" = { - name = "_at_eslint_slash_eslintrc"; - packageName = "@eslint/eslintrc"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz"; - sha512 = "UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw=="; - }; - }; - "@humanwhocodes/config-array-0.9.5" = { - name = "_at_humanwhocodes_slash_config-array"; - packageName = "@humanwhocodes/config-array"; - version = "0.9.5"; - src = fetchurl { - 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" = { - name = "_at_humanwhocodes_slash_object-schema"; - packageName = "@humanwhocodes/object-schema"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; - sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; - }; - }; - "@iarna/toml-2.2.5" = { - name = "_at_iarna_slash_toml"; - packageName = "@iarna/toml"; - version = "2.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz"; - sha512 = "trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="; - }; - }; - "@msgpack/msgpack-2.7.2" = { - name = "_at_msgpack_slash_msgpack"; - packageName = "@msgpack/msgpack"; - version = "2.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.7.2.tgz"; - sha512 = "rYEi46+gIzufyYUAoHDnRzkWGxajpD9vVXFQ3g1vbjrBm6P7MBmm+s/fqPa46sxa+8FOUdEuRQKaugo5a4JWpw=="; - }; - }; - "@ot-builder/bin-composite-types-1.5.3" = { - name = "_at_ot-builder_slash_bin-composite-types"; - packageName = "@ot-builder/bin-composite-types"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.5.3.tgz"; - sha512 = "5yZAaqs2/zJjtELtSNjbOlFuvs0bCuadanLjaEQwX6MS88Q3lO8p0y8AbLaXbKlV7ODiHRqqR42F1rpJ9r0KqQ=="; - }; - }; - "@ot-builder/bin-util-1.5.3" = { - name = "_at_ot-builder_slash_bin-util"; - packageName = "@ot-builder/bin-util"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.5.3.tgz"; - sha512 = "wbWc6T40IUvNEvyXVpdLY9ntwI3Sj1Lf/qxb3U8Xhe3PEM42xgBEYecE64eU1Y30faxfY3MSb+M5eVgF+s+Prg=="; - }; - }; - "@ot-builder/cli-help-shower-1.5.3" = { - name = "_at_ot-builder_slash_cli-help-shower"; - packageName = "@ot-builder/cli-help-shower"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.5.3.tgz"; - sha512 = "LFmbbsXvJm9E2swvOq/EHIegP+tJ10bP63+VxFjjN5+q9938WPyT0XtPd1dR2wN2HyRRAExYaNUiyRV6z160tw=="; - }; - }; - "@ot-builder/cli-proc-1.5.3" = { - name = "_at_ot-builder_slash_cli-proc"; - packageName = "@ot-builder/cli-proc"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.5.3.tgz"; - sha512 = "8tovAA4NyPONsJYUdfeWZlI9w1JEeFOW5D3oE+VydbGZw3wIWuK4gz7XgwS4eOM2xM6e/cMpIuzZ4qBmPJCmaA=="; - }; - }; - "@ot-builder/cli-shared-1.5.3" = { - name = "_at_ot-builder_slash_cli-shared"; - packageName = "@ot-builder/cli-shared"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.5.3.tgz"; - sha512 = "6sVkJd1fg5lOEEW2p2GfVUclAFjcnfaTfDaGETAk3tsxW4mYDj5cQP5B7nU7uK09a1545CS5sZHNcdd7mf9RiA=="; - }; - }; - "@ot-builder/common-impl-1.5.3" = { - name = "_at_ot-builder_slash_common-impl"; - packageName = "@ot-builder/common-impl"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.5.3.tgz"; - sha512 = "JSOt5yF/GjtMCQH+0xYUHUB4aGPfN/qo4ocvDd0V5W5AEa4vjwmqHyYSSNkXxXM1zdDe8k5FoQSijpzYzZ3pFw=="; - }; - }; - "@ot-builder/errors-1.5.3" = { - name = "_at_ot-builder_slash_errors"; - packageName = "@ot-builder/errors"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.5.3.tgz"; - sha512 = "NDsKCXNSdDiLyS6/vPDY3qWh/jAP1v3Eol/FtqDqSXOBUPPgg4XGlZR2zl3gSc99YbbSC5KecvRSh99YUMpKPQ=="; - }; - }; - "@ot-builder/io-bin-cff-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-cff"; - packageName = "@ot-builder/io-bin-cff"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.5.3.tgz"; - sha512 = "/oSc2k6hIh1WLpWBwjsoj1dp1KMnsKHM8JnI+undRasuDSi5QnNtbeqKWl+OlYYo5ES8RSopsLg0sCMAP2gnyw=="; - }; - }; - "@ot-builder/io-bin-encoding-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-encoding"; - packageName = "@ot-builder/io-bin-encoding"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.5.3.tgz"; - sha512 = "xG1dBbVHhboHCQ6n5nxnScaevCTShQ5rvFusRrC5MKKHFLL/1Vj2qk28ZWzHYP8nZfO7+ktU2HGsKkydnlWDeg=="; - }; - }; - "@ot-builder/io-bin-ext-private-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-ext-private"; - packageName = "@ot-builder/io-bin-ext-private"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.5.3.tgz"; - sha512 = "zwG4xDd1sAfbdQ4W/u86CMhBYtCK1/Eg04qDUVmBxcM4RBNjqKt55yN+nPTtQ+aeXBYN79DXM7gFZU4rFAmOIA=="; - }; - }; - "@ot-builder/io-bin-font-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-font"; - packageName = "@ot-builder/io-bin-font"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.5.3.tgz"; - sha512 = "fvccA/kbnVwIxNs/qgtTla9vj2www94HKKndF4EvkMINqksyaSoSBlaoddTrzb+caw/kANVGprfBmtjWZBEh+Q=="; - }; - }; - "@ot-builder/io-bin-glyph-store-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-glyph-store"; - packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.5.3.tgz"; - sha512 = "CsSy45gxKjH6Ivl00uprhsuwBWjy9GTfSD39qrXJK+WzIkU8ucM7RRRucwTXR4YKb7sVZUB/wwS+ViQMtu+xKg=="; - }; - }; - "@ot-builder/io-bin-layout-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-layout"; - packageName = "@ot-builder/io-bin-layout"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.5.3.tgz"; - sha512 = "rwAqkyJf+LSj8UFglas9hopsrOKNF4wwm32w/JJwwX/12LCMw68dzdu2qXvVgLHrnkrqjs5xmGDUY1JVkKwYpA=="; - }; - }; - "@ot-builder/io-bin-metadata-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-metadata"; - packageName = "@ot-builder/io-bin-metadata"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.5.3.tgz"; - sha512 = "+wSCWKRJ0HfA2oTXQda7uWmm9CAWhLnIQIz7s/hY92Nd7DXbJQG0c2RE2uXazqe9et8HYF6rqJUhOHHH5AsfbQ=="; - }; - }; - "@ot-builder/io-bin-metric-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-metric"; - packageName = "@ot-builder/io-bin-metric"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.5.3.tgz"; - sha512 = "Og2erTx12QmbguvdFk+5KFyoNOME0QMH2OaCih3G2/P/EJPrHGZEHkw38QsWQPa0LbPfatyhyvrURtZXQo4S9g=="; - }; - }; - "@ot-builder/io-bin-name-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-name"; - packageName = "@ot-builder/io-bin-name"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.5.3.tgz"; - sha512 = "BfJUVaZUrI372f4dHjEED3En0Ve4oItaZcqXPUySUpq9s+MgBIi+3Kq9WrDWlpDKRYLR+CsTrwW69TXBIGIa7w=="; - }; - }; - "@ot-builder/io-bin-sfnt-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-sfnt"; - packageName = "@ot-builder/io-bin-sfnt"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.5.3.tgz"; - sha512 = "tr6EHaV9aWf20veLLa22PSRZwJek/Sgsc6aPghKlSUPdpkL3SIwyVfwDxjzWCQLpcZJXa3YZ+wptuTdMlP7jJw=="; - }; - }; - "@ot-builder/io-bin-ttf-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-ttf"; - packageName = "@ot-builder/io-bin-ttf"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.5.3.tgz"; - sha512 = "A5IAzoqdCTznsqmZ+bSlF6rNuZ1KQXjX5ZqrYtOk2oCj2hdIgCCvZFhnE9dMPQ3oFRzeYGTl1SvxqX+eDZR18Q=="; - }; - }; - "@ot-builder/io-bin-vtt-private-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-vtt-private"; - packageName = "@ot-builder/io-bin-vtt-private"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.5.3.tgz"; - sha512 = "vMkjn5WbpEFyy3PkU65AhIX6E0YrPbhZV5Wti9O+m/TDmtgcX+fbe3/LJnVtP2JUHDmCQtxnnb+A2Ymp1mwRdw=="; - }; - }; - "@ot-builder/ot-1.5.3" = { - name = "_at_ot-builder_slash_ot"; - packageName = "@ot-builder/ot"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.5.3.tgz"; - sha512 = "6ZlRH54FjVAf7Vtxlby5+25/fIZC/IIRt8HCE903dKtw6UYG9XJvW7SkPOu18LNNNKHyCzj3LwMawu+LDHtwHw=="; - }; - }; - "@ot-builder/ot-encoding-1.5.3" = { - name = "_at_ot-builder_slash_ot-encoding"; - packageName = "@ot-builder/ot-encoding"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.5.3.tgz"; - sha512 = "jz6Zg1fwYdlliwPWBghzYIOmqgN5S1xTjX/P8/dk0Jn0cpwyGN409uVkUJb3GuVa/sECQUcvnjTx39DlZSM/Qw=="; - }; - }; - "@ot-builder/ot-ext-private-1.5.3" = { - name = "_at_ot-builder_slash_ot-ext-private"; - packageName = "@ot-builder/ot-ext-private"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.5.3.tgz"; - sha512 = "Y233Lrk9Fv4g6k5A/9afPG8E0O28JWKjl7Gv2AW65bL9A7NCyHI6F7SgCLVcbPWj8jyEJ0urm43hsSNeBDqZdQ=="; - }; - }; - "@ot-builder/ot-glyphs-1.5.3" = { - name = "_at_ot-builder_slash_ot-glyphs"; - packageName = "@ot-builder/ot-glyphs"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.5.3.tgz"; - sha512 = "AIvIui15gNip1Zz3WLWFj/lYOLJWMNF1KDZ/sm3Ig+sTLM70C31AKNzA5HCDKQkKlWjE6IDsJ6gBCE2dwZNApg=="; - }; - }; - "@ot-builder/ot-layout-1.5.3" = { - name = "_at_ot-builder_slash_ot-layout"; - packageName = "@ot-builder/ot-layout"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.5.3.tgz"; - sha512 = "3yHkyFYAHZJRUtBO9XCOnVTEsOPpUZEOcxjZ9yznID7CGW3LnFe1CmEByJcWf4YPXNQ7fmu0A4qvKGiB7v5oQw=="; - }; - }; - "@ot-builder/ot-metadata-1.5.3" = { - name = "_at_ot-builder_slash_ot-metadata"; - packageName = "@ot-builder/ot-metadata"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.5.3.tgz"; - sha512 = "0wgd74aZEeBsCRgVTxXQV+0hrgbgRPIM8LVcaJCoS5G5ADGamlriyFCd0DEJkMOvvEcm7fDw5G/BBNIj0nhsag=="; - }; - }; - "@ot-builder/ot-name-1.5.3" = { - name = "_at_ot-builder_slash_ot-name"; - packageName = "@ot-builder/ot-name"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.5.3.tgz"; - sha512 = "OyLlvvUKulBmwpv6OPipUyN/EWVxyjx2a4LohoYyh5NQKjWuyVcpcknd90LDdCTEEw5WNvkIyo7cqkf3MOehxQ=="; - }; - }; - "@ot-builder/ot-sfnt-1.5.3" = { - name = "_at_ot-builder_slash_ot-sfnt"; - packageName = "@ot-builder/ot-sfnt"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.5.3.tgz"; - sha512 = "YnDHrVTd48LPe7Zhjveije8f04okb/Le55PurHFKmJlWJSG2b6DGXkZd7Dov/jZoiPUeFO6suaRqkw0Em/4mVg=="; - }; - }; - "@ot-builder/ot-standard-glyph-namer-1.5.3" = { - name = "_at_ot-builder_slash_ot-standard-glyph-namer"; - packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.5.3.tgz"; - sha512 = "j1n938jXFVgHl+QnZVZG/nfKIAD/UgbPHB4kzAl9RKWfQXDBZn9kL8GZ3HpBydIUTAD2YYzYRYMvopfr0p7tww=="; - }; - }; - "@ot-builder/ot-vtt-private-1.5.3" = { - name = "_at_ot-builder_slash_ot-vtt-private"; - packageName = "@ot-builder/ot-vtt-private"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.5.3.tgz"; - sha512 = "qz2Rw5ixqCtWj3dWdkVo4rRHfi8vHY42/52IV/Wrs+s1MITCTJEus2GTMCj9Z3W/SkwBvDeC0OGWA3CbdVj3Zw=="; - }; - }; - "@ot-builder/prelude-1.5.3" = { - name = "_at_ot-builder_slash_prelude"; - packageName = "@ot-builder/prelude"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.5.3.tgz"; - sha512 = "eevWMoYnh4pdQutfCsoSjFUMkGawnBtUllnFxjj/tpfWMSAQFb8vOufQJYP/GS8jn6VKum4+RR88FVgEZ0xPvg=="; - }; - }; - "@ot-builder/primitive-1.5.3" = { - name = "_at_ot-builder_slash_primitive"; - packageName = "@ot-builder/primitive"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.5.3.tgz"; - sha512 = "iOy+WoWOWFW3dvqTVmh9/qpYHXiqq8cscnWM5IWkOTKJqUICSyacW/qCXIcZejtvTltAHKbIYvNPpNtQl1me/A=="; - }; - }; - "@ot-builder/rectify-1.5.3" = { - name = "_at_ot-builder_slash_rectify"; - packageName = "@ot-builder/rectify"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.5.3.tgz"; - sha512 = "VSXtw20D1bKZcT7mlMMvn7TW4f3tsObyfJeOcemoIh6HkrbJZYEIhsGO5l260tWOI+XsXVSJeGPGMj0ZlVnuAQ=="; - }; - }; - "@ot-builder/stat-glyphs-1.5.3" = { - name = "_at_ot-builder_slash_stat-glyphs"; - packageName = "@ot-builder/stat-glyphs"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.5.3.tgz"; - sha512 = "4wXLbCM1oKhVoMVRR1YLXM7ncQWI/pYmPd7TKH9TbBEnGAX83+rWcoTUkD5egMftpCVmbpNy6grsAF3/BFQpOg=="; - }; - }; - "@ot-builder/trace-1.5.3" = { - name = "_at_ot-builder_slash_trace"; - packageName = "@ot-builder/trace"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.5.3.tgz"; - sha512 = "P1DQOtIDX8as9UGFM9GuUlxXgH3/3Qrizv+HMtFM2FASbn2q7IbIW/MKAO7uIV+UeqW2XAAGV7wRR6/KScGX2w=="; - }; - }; - "@ot-builder/var-store-1.5.3" = { - name = "_at_ot-builder_slash_var-store"; - packageName = "@ot-builder/var-store"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.5.3.tgz"; - sha512 = "+cMMLYkwgPXx9uaq7aw/8yuXG9/OuULM89GcRJRYJJ/unsPWNefDbTH69J9oKVyRjxc6mfl7jKxwQKbU51Zb2A=="; - }; - }; - "@ot-builder/variance-1.5.3" = { - name = "_at_ot-builder_slash_variance"; - packageName = "@ot-builder/variance"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.5.3.tgz"; - sha512 = "H19XizofoeoyJaaH2PjygykKJ7BhTRPWgQk4S+qpzIj/6LUN267tbCyQWomq8OW8EVUwGHuxBqKzQf6iAt7pag=="; - }; - }; - "@types/json5-0.0.29" = { - name = "_at_types_slash_json5"; - packageName = "@types/json5"; - version = "0.0.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"; - sha512 = "dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="; - }; - }; - "@unicode/unicode-14.0.0-1.2.2" = { - name = "_at_unicode_slash_unicode-14.0.0"; - packageName = "@unicode/unicode-14.0.0"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@unicode/unicode-14.0.0/-/unicode-14.0.0-1.2.2.tgz"; - sha512 = "NMs5JhYXGojBQJNJ7DumqktgRqs95Qt1cj6JMPz8lKBfHYRTRn7Am4CdyX/hS1zTn1lKwsWXBpMP9Hp0nelINg=="; - }; - }; - "@xmldom/xmldom-0.8.2" = { - name = "_at_xmldom_slash_xmldom"; - packageName = "@xmldom/xmldom"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.2.tgz"; - sha512 = "+R0juSseERyoPvnBQ/cZih6bpF7IpCXlWbHRoCRzYzqpz6gWHOgf8o4MOEf6KBVuOyqU+gCNLkCWVIJAro8XyQ=="; - }; - }; - "acorn-8.7.1" = { - name = "acorn"; - packageName = "acorn"; - version = "8.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz"; - sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; - }; - }; - "acorn-jsx-5.3.2" = { - name = "acorn-jsx"; - packageName = "acorn-jsx"; - version = "5.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; - sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; - }; - }; - "aglfn-1.0.2" = { - name = "aglfn"; - packageName = "aglfn"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/aglfn/-/aglfn-1.0.2.tgz"; - sha512 = "HUvXd7sNFa1aHtYgJnln2jPwzq7UAAOXhYH/+AY6BMdfXxprMxG8IrczlZn6MjjIWpYhpKR5mHwDWTgehZKO4g=="; - }; - }; - "ajv-6.12.6" = { - name = "ajv"; - packageName = "ajv"; - version = "6.12.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; - sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; - }; - }; - "amdefine-1.0.1" = { - name = "amdefine"; - packageName = "amdefine"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; - sha512 = "S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg=="; - }; - }; - "ansi-regex-5.0.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; - }; - }; - "ansi-styles-4.3.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; - }; - }; - "argparse-2.0.1" = { - name = "argparse"; - packageName = "argparse"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"; - sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; - }; - }; - "array-includes-3.1.5" = { - name = "array-includes"; - packageName = "array-includes"; - version = "3.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz"; - sha512 = "iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ=="; - }; - }; - "array.prototype.flat-1.3.0" = { - name = "array.prototype.flat"; - packageName = "array.prototype.flat"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz"; - sha512 = "12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw=="; - }; - }; - "balanced-match-1.0.2" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; - sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; - }; - }; - "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=="; - }; - }; - "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=="; - }; - }; - "callsites-3.1.0" = { - name = "callsites"; - packageName = "callsites"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; - sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; - }; - }; - "chainsaw-0.0.9" = { - name = "chainsaw"; - packageName = "chainsaw"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/chainsaw/-/chainsaw-0.0.9.tgz"; - sha512 = "nG8PYH+/4xB+8zkV4G844EtfvZ5tTiLFoX3dZ4nhF4t3OCKIb9UvaFyNmeZO2zOSmRWzBoTD+napN6hiL+EgcA=="; - }; - }; - "chalk-4.1.2" = { - name = "chalk"; - packageName = "chalk"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; - sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; - }; - }; - "cldr-7.2.0" = { - name = "cldr"; - packageName = "cldr"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cldr/-/cldr-7.2.0.tgz"; - sha512 = "NJB6wpFlIVrS4BhA/Q1a6UuS6MuFr5o2XhfosM6a+W+rad/Rt0HLLX3kuXdRrwHQZvla25iuzTkRnxOKjS+VhQ=="; - }; - }; - "cli-cursor-3.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"; - sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; - }; - }; - "clipper-lib-6.4.2" = { - name = "clipper-lib"; - packageName = "clipper-lib"; - version = "6.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/clipper-lib/-/clipper-lib-6.4.2.tgz"; - sha512 = "knglhjQX5ihNj/XCIs6zCHrTemdvHY3LPZP9XB2nq2/3igyYMFueFXtfp84baJvEE+f8pO1ZS4UVeEgmLnAprQ=="; - }; - }; - "cliui-7.0.4" = { - name = "cliui"; - packageName = "cliui"; - version = "7.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"; - sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; - }; - }; - "color-convert-2.0.1" = { - name = "color-convert"; - packageName = "color-convert"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; - sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; - }; - }; - "color-name-1.1.4" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; - sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; - }; - }; - "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"; - sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; - }; - }; - "cross-spawn-7.0.3" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; - }; - }; - "debug-2.6.9" = { - name = "debug"; - packageName = "debug"; - version = "2.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; - }; - }; - "debug-3.2.7" = { - name = "debug"; - packageName = "debug"; - version = "3.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; - sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; - }; - }; - "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=="; - }; - }; - "deep-is-0.1.4" = { - name = "deep-is"; - packageName = "deep-is"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"; - sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; - }; - }; - "define-properties-1.1.4" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"; - sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; - }; - }; - "doctrine-2.1.0" = { - name = "doctrine"; - packageName = "doctrine"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz"; - sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="; - }; - }; - "doctrine-3.0.0" = { - name = "doctrine"; - packageName = "doctrine"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"; - sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; - }; - }; - "emoji-regex-8.0.0" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; - }; - }; - "es-abstract-1.20.1" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.20.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz"; - sha512 = "WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA=="; - }; - }; - "es-shim-unscopables-1.0.0" = { - name = "es-shim-unscopables"; - packageName = "es-shim-unscopables"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz"; - sha512 = "Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w=="; - }; - }; - "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=="; - }; - }; - "escalade-3.1.1" = { - name = "escalade"; - packageName = "escalade"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; - sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; - }; - }; - "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=="; - }; - }; - "escodegen-1.3.3" = { - name = "escodegen"; - packageName = "escodegen"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz"; - sha512 = "z9FWgKc48wjMlpzF5ymKS1AF8OIgnKLp9VyN7KbdtyrP/9lndwUFqCtMm+TAJmJf7KJFFYc4cFJfVTTGkKEwsA=="; - }; - }; - "escodegen-2.0.0" = { - name = "escodegen"; - packageName = "escodegen"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz"; - sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; - }; - }; - "escope-1.0.3" = { - name = "escope"; - packageName = "escope"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escope/-/escope-1.0.3.tgz"; - sha512 = "PgST3E92KAnuUX/4PXwpE9RI8jubyyTGIN73mfhl0XP4H+hiA7JqvhXNfffs+naSk41Eipq/klcmoGsCrjxPlQ=="; - }; - }; - "eslint-8.18.0" = { - name = "eslint"; - packageName = "eslint"; - version = "8.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.18.0.tgz"; - sha512 = "As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA=="; - }; - }; - "eslint-config-prettier-8.5.0" = { - name = "eslint-config-prettier"; - packageName = "eslint-config-prettier"; - version = "8.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz"; - sha512 = "obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q=="; - }; - }; - "eslint-import-resolver-node-0.3.6" = { - name = "eslint-import-resolver-node"; - packageName = "eslint-import-resolver-node"; - version = "0.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz"; - sha512 = "0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw=="; - }; - }; - "eslint-module-utils-2.7.3" = { - name = "eslint-module-utils"; - packageName = "eslint-module-utils"; - version = "2.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz"; - sha512 = "088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ=="; - }; - }; - "eslint-plugin-import-2.26.0" = { - name = "eslint-plugin-import"; - packageName = "eslint-plugin-import"; - version = "2.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz"; - sha512 = "hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA=="; - }; - }; - "eslint-scope-7.1.1" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz"; - sha512 = "QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw=="; - }; - }; - "eslint-utils-3.0.0" = { - name = "eslint-utils"; - packageName = "eslint-utils"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"; - sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; - }; - }; - "eslint-visitor-keys-2.1.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; - sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; - }; - }; - "eslint-visitor-keys-3.3.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "3.3.0"; - src = fetchurl { - 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" = { - name = "esmangle"; - packageName = "esmangle"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esmangle/-/esmangle-1.0.1.tgz"; - sha512 = "+vgj0CirCf7fiZ5Cy1VH7ZovC1qh42mB6GBVN3cxLwZgY1CqIvu9xOdDW8il8Y8ym+fiFLCM3crZFku8rBNLOA=="; - }; - }; - "espree-9.3.2" = { - name = "espree"; - packageName = "espree"; - version = "9.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz"; - sha512 = "D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA=="; - }; - }; - "esprima-1.1.1" = { - name = "esprima"; - packageName = "esprima"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; - sha512 = "qxxB994/7NtERxgXdFgLHIs9M6bhLXc6qtUmWZ3L8+gTQ9qaoyki2887P2IqAYsoENyr8SUbTutStDniOHSDHg=="; - }; - }; - "esprima-4.0.1" = { - name = "esprima"; - packageName = "esprima"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; - sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; - }; - }; - "esquery-1.4.0" = { - name = "esquery"; - packageName = "esquery"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"; - sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; - }; - }; - "esrecurse-4.3.0" = { - name = "esrecurse"; - packageName = "esrecurse"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; - sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; - }; - }; - "esshorten-1.1.1" = { - name = "esshorten"; - packageName = "esshorten"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esshorten/-/esshorten-1.1.1.tgz"; - sha512 = "jvHUQncAuUI/HOzw1a94cGDdgyRUUcVDABU24X2TRb+y4G3ohSllMKjG+ROQVjj5OEVhXYwwsV+OpLOJ63snEA=="; - }; - }; - "estraverse-1.5.1" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; - sha512 = "FpCjJDfmo3vsc/1zKSeqR5k42tcIhxFIlvq+h9j0fO2q/h2uLKyweq7rYJ+0CoVvrGQOxIS5wyBrW/+vF58BUQ=="; - }; - }; - "estraverse-2.0.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-2.0.0.tgz"; - sha512 = "3liNs3aDBUmf9Hl3YRLqz7Zop0iiTxWaa/ayuxoVS441zjjTPowZJ/uH3y5yhPcXmrLj2rS6Pvu7tfOC7kT61A=="; - }; - }; - "estraverse-4.1.1" = { - name = "estraverse"; - packageName = "estraverse"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz"; - sha512 = "r3gEa6vc6lGQdrXfo834EaaqnOzYmik8JPg8VB95acIMZRjqaHI0/WMZFoMBGPtS+HCgylwTLoc4Y5yl0owOHQ=="; - }; - }; - "estraverse-5.3.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"; - sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; - }; - }; - "esutils-1.0.0" = { - name = "esutils"; - packageName = "esutils"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; - sha512 = "x/iYH53X3quDwfHRz4y8rn4XcEwwCJeWsul9pF1zldMbGtgOtMNBEOuYWwB1EQlK2LRa1fev3YAgym/RElp5Cg=="; - }; - }; - "esutils-2.0.3" = { - name = "esutils"; - packageName = "esutils"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; - sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; - }; - }; - "fast-deep-equal-3.1.3" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; - sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; - }; - }; - "fast-json-stable-stringify-2.1.0" = { - name = "fast-json-stable-stringify"; - packageName = "fast-json-stable-stringify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; - }; - }; - "fast-levenshtein-1.0.7" = { - name = "fast-levenshtein"; - packageName = "fast-levenshtein"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz"; - sha512 = "hYsfI0s4lfQ2rHVFKXwAr/L/ZSbq9TZwgXtZqW7ANcn9o9GKvcbWxOnxx7jykXf/Ezv1V8TvaBEKcGK7DWKX5A=="; - }; - }; - "fast-levenshtein-2.0.6" = { - name = "fast-levenshtein"; - packageName = "fast-levenshtein"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; - }; - }; - "file-entry-cache-6.0.1" = { - name = "file-entry-cache"; - packageName = "file-entry-cache"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; - sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; - }; - }; - "find-up-2.1.0" = { - name = "find-up"; - packageName = "find-up"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; - sha512 = "NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ=="; - }; - }; - "flat-cache-3.0.4" = { - name = "flat-cache"; - packageName = "flat-cache"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"; - sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; - }; - }; - "flatted-3.2.5" = { - name = "flatted"; - packageName = "flatted"; - version = "3.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"; - sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; - }; - }; - "fs-extra-10.1.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "10.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz"; - sha512 = "oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="; - }; - }; - "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"; - sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; - }; - }; - "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=="; - }; - }; - "function.prototype.name-1.1.5" = { - name = "function.prototype.name"; - packageName = "function.prototype.name"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"; - sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="; - }; - }; - "functional-red-black-tree-1.0.1" = { - name = "functional-red-black-tree"; - packageName = "functional-red-black-tree"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha512 = "dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="; - }; - }; - "functions-have-names-1.2.3" = { - name = "functions-have-names"; - packageName = "functions-have-names"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"; - sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; - }; - }; - "get-caller-file-2.0.5" = { - name = "get-caller-file"; - packageName = "get-caller-file"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; - }; - }; - "get-intrinsic-1.1.2" = { - name = "get-intrinsic"; - packageName = "get-intrinsic"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz"; - sha512 = "Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA=="; - }; - }; - "get-symbol-description-1.0.0" = { - name = "get-symbol-description"; - packageName = "get-symbol-description"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; - sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; - }; - }; - "glob-7.2.3" = { - name = "glob"; - packageName = "glob"; - version = "7.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"; - sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; - }; - }; - "glob-parent-6.0.2" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz"; - sha512 = "XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="; - }; - }; - "globals-13.15.0" = { - name = "globals"; - packageName = "globals"; - version = "13.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz"; - sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; - }; - }; - "graceful-fs-4.2.10" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; - sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; - }; - }; - "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-bigints-1.0.2" = { - name = "has-bigints"; - packageName = "has-bigints"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"; - sha512 = "tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="; - }; - }; - "has-flag-4.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; - sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; - }; - }; - "has-property-descriptors-1.0.0" = { - name = "has-property-descriptors"; - packageName = "has-property-descriptors"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; - sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; - }; - }; - "has-symbols-1.0.3" = { - name = "has-symbols"; - packageName = "has-symbols"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; - sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; - }; - }; - "has-tostringtag-1.0.0" = { - name = "has-tostringtag"; - packageName = "has-tostringtag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; - }; - }; - "hashish-0.0.4" = { - name = "hashish"; - packageName = "hashish"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/hashish/-/hashish-0.0.4.tgz"; - sha512 = "xyD4XgslstNAs72ENaoFvgMwtv8xhiDtC2AtzCG+8yF7W/Knxxm9BX+e2s25mm+HxMKh0rBmXVOEGF3zNImXvA=="; - }; - }; - "iconv-lite-0.6.3" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"; - sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; - }; - }; - "ignore-5.2.0" = { - name = "ignore"; - packageName = "ignore"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"; - sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; - }; - }; - "import-fresh-3.3.0" = { - name = "import-fresh"; - packageName = "import-fresh"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"; - sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; - }; - }; - "imurmurhash-0.1.4" = { - name = "imurmurhash"; - packageName = "imurmurhash"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; - }; - }; - "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"; - sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; - }; - }; - "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=="; - }; - }; - "internal-slot-1.0.3" = { - name = "internal-slot"; - packageName = "internal-slot"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; - sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; - }; - }; - "is-bigint-1.0.4" = { - name = "is-bigint"; - packageName = "is-bigint"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz"; - sha512 = "zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="; - }; - }; - "is-boolean-object-1.1.2" = { - name = "is-boolean-object"; - packageName = "is-boolean-object"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; - sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; - }; - }; - "is-callable-1.2.4" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"; - sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; - }; - }; - "is-core-module-2.9.0" = { - name = "is-core-module"; - packageName = "is-core-module"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz"; - sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A=="; - }; - }; - "is-date-object-1.0.5" = { - name = "is-date-object"; - packageName = "is-date-object"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"; - sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; - }; - }; - "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"; - sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; - }; - }; - "is-fullwidth-code-point-3.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; - }; - }; - "is-glob-4.0.3" = { - name = "is-glob"; - packageName = "is-glob"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"; - sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; - }; - }; - "is-negative-zero-2.0.2" = { - name = "is-negative-zero"; - packageName = "is-negative-zero"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; - sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; - }; - }; - "is-number-object-1.0.7" = { - name = "is-number-object"; - packageName = "is-number-object"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz"; - sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ=="; - }; - }; - "is-regex-1.1.4" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"; - sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; - }; - }; - "is-shared-array-buffer-1.0.2" = { - name = "is-shared-array-buffer"; - packageName = "is-shared-array-buffer"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"; - sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA=="; - }; - }; - "is-string-1.0.7" = { - name = "is-string"; - packageName = "is-string"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"; - sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; - }; - }; - "is-symbol-1.0.4" = { - name = "is-symbol"; - packageName = "is-symbol"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz"; - sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; - }; - }; - "is-weakref-1.0.2" = { - name = "is-weakref"; - packageName = "is-weakref"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz"; - sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; - }; - }; - "isexe-2.0.0" = { - name = "isexe"; - packageName = "isexe"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; - }; - }; - "js-yaml-4.1.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"; - sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; - }; - }; - "json-schema-traverse-0.4.1" = { - name = "json-schema-traverse"; - packageName = "json-schema-traverse"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; - }; - }; - "json-stable-stringify-without-jsonify-1.0.1" = { - name = "json-stable-stringify-without-jsonify"; - packageName = "json-stable-stringify-without-jsonify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; - }; - }; - "json5-1.0.1" = { - name = "json5"; - packageName = "json5"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; - sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; - }; - }; - "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=="; - }; - }; - "levn-0.2.5" = { - name = "levn"; - packageName = "levn"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz"; - sha512 = "mvp+NO++YH0B+e8cC/SvJxk6k5Z9Ngd3iXuz7tmT8vZCyQZj/5SI1GkFOiZGGPkm5wWGI9SUrqiAfPq7BJH+0w=="; - }; - }; - "levn-0.3.0" = { - name = "levn"; - packageName = "levn"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; - sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="; - }; - }; - "levn-0.4.1" = { - name = "levn"; - packageName = "levn"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"; - sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; - }; - }; - "locate-path-2.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; - sha512 = "NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA=="; - }; - }; - "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=="; - }; - }; - "lru-cache-2.5.0" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; - sha512 = "dVmQmXPBlTgFw77hm60ud//l2bCuDKkqC2on1EBoM7s9Urm9IQDrnujwZ93NFnAq0dVZ0HBXTS7PwEG+YE7+EQ=="; - }; - }; - "lru-cache-6.0.0" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; - sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; - }; - }; - "memoizeasync-1.1.0" = { - name = "memoizeasync"; - packageName = "memoizeasync"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/memoizeasync/-/memoizeasync-1.1.0.tgz"; - sha512 = "HMfzdLqClZo8HMyuM9B6TqnXCNhw82iVWRLqd2cAdXi063v2iJB4mQfWFeKVByN8VUwhmDZ8NMhryBwKrPRf8Q=="; - }; - }; - "mimic-fn-2.1.0" = { - name = "mimic-fn"; - packageName = "mimic-fn"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; - sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; - }; - }; - "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=="; - }; - }; - "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=="; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; - }; - }; - "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=="; - }; - }; - "natural-compare-1.4.0" = { - name = "natural-compare"; - packageName = "natural-compare"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; - sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; - }; - }; - "object-inspect-1.12.2" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.12.2"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz"; - sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; - }; - }; - "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=="; - }; - }; - "object.values-1.1.5" = { - name = "object.values"; - packageName = "object.values"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz"; - sha512 = "QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg=="; - }; - }; - "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"; - sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; - }; - }; - "onetime-5.1.2" = { - name = "onetime"; - packageName = "onetime"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"; - sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; - }; - }; - "optionator-0.3.0" = { - name = "optionator"; - packageName = "optionator"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.3.0.tgz"; - sha512 = "qM6AKy0HNNRczFIFciGVSkh6H5yu8kC2hdgqElG8pM6IvQwFYVBd3aUrqjsgZtauuGZr2u/Nf+wLzlZgeCqpSQ=="; - }; - }; - "optionator-0.8.3" = { - name = "optionator"; - packageName = "optionator"; - version = "0.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"; - sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; - }; - }; - "optionator-0.9.1" = { - name = "optionator"; - packageName = "optionator"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"; - sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; - }; - }; - "ot-builder-1.5.3" = { - name = "ot-builder"; - packageName = "ot-builder"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.5.3.tgz"; - sha512 = "SLKp4TM/4ZUVLUMKHOVoZajocaC5WmcY9H3r7PIfCbHUQXLfcsRvo3OIo5vcRZLG3dvZ71eoQr9GqSICvaZEcw=="; - }; - }; - "otb-ttc-bundle-1.5.3" = { - name = "otb-ttc-bundle"; - packageName = "otb-ttc-bundle"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.5.3.tgz"; - sha512 = "Uq2trJQEGM1a8z1C0sNgVS6FxsNP6YLWJD2+bH5K53ARnxXNzEINf0lckmgLLClW/uScALn8OlNXhD7vnbdZ6w=="; - }; - }; - "p-limit-1.3.0" = { - name = "p-limit"; - packageName = "p-limit"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; - sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; - }; - }; - "p-locate-2.0.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; - sha512 = "nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg=="; - }; - }; - "p-try-1.0.0" = { - name = "p-try"; - packageName = "p-try"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; - sha512 = "U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww=="; - }; - }; - "parent-module-1.0.1" = { - name = "parent-module"; - packageName = "parent-module"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; - sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; - }; - }; - "passerror-1.1.1" = { - name = "passerror"; - packageName = "passerror"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/passerror/-/passerror-1.1.1.tgz"; - sha512 = "PwrEQJBkJMxnxG+tdraz95vTstYnCRqiURNbGtg/vZHLgcAODc9hbiD5ZumGUoh3bpw0F0qKLje7Vd2Fd5Lx3g=="; - }; - }; - "patel-0.38.0" = { - name = "patel"; - packageName = "patel"; - version = "0.38.0"; - src = fetchurl { - url = "https://registry.npmjs.org/patel/-/patel-0.38.0.tgz"; - sha512 = "Bzhgo3HTG1phko50ULaBEi7wBZxJLgt0BZDJDjdIhSz+ZlhsY6+yDvXAJcXAtTwcqSR4F5j2Yc2Gqkornk9D5A=="; - }; - }; - "path-exists-3.0.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; - sha512 = "bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="; - }; - }; - "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"; - sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; - }; - }; - "path-key-3.1.1" = { - name = "path-key"; - packageName = "path-key"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; - sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; - }; - }; - "path-parse-1.0.7" = { - name = "path-parse"; - packageName = "path-parse"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; - sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; - }; - }; - "patrisika-0.25.0" = { - name = "patrisika"; - packageName = "patrisika"; - version = "0.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/patrisika/-/patrisika-0.25.0.tgz"; - sha512 = "Kevy01SFkhzON30J1nKVzHPdoJmkmRY2HG+OIFeI/IT4eBveQwbrE3Q2beEx9t02HhMyAlnYFXt0z5wNY6mePA=="; - }; - }; - "patrisika-scopes-0.12.0" = { - name = "patrisika-scopes"; - packageName = "patrisika-scopes"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.12.0.tgz"; - sha512 = "rj428KYq5leS75PCDl6iyl91n6/d63yw1ikHYwd1z9UXwWk11Vj2gpTu0CxjLZJJOiFNA01LiX+WMpC5icCKng=="; - }; - }; - "pegjs-0.10.0" = { - name = "pegjs"; - packageName = "pegjs"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz"; - sha512 = "qI5+oFNEGi3L5HAxDwN2LA4Gg7irF70Zs25edhjld9QemOgp0CbvMtbFcMvFtEo1OityPrcCzkQFB8JP/hxgow=="; - }; - }; - "prelude-ls-1.1.2" = { - name = "prelude-ls"; - packageName = "prelude-ls"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; - }; - }; - "prelude-ls-1.2.1" = { - name = "prelude-ls"; - packageName = "prelude-ls"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"; - sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; - }; - }; - "prettier-2.7.1" = { - name = "prettier"; - packageName = "prettier"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz"; - sha512 = "ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g=="; - }; - }; - "punycode-2.1.1" = { - name = "punycode"; - packageName = "punycode"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; - }; - }; - "regexp.prototype.flags-1.4.3" = { - name = "regexp.prototype.flags"; - packageName = "regexp.prototype.flags"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"; - sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; - }; - }; - "regexpp-3.2.0" = { - name = "regexpp"; - packageName = "regexpp"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"; - sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; - }; - }; - "require-directory-2.1.1" = { - name = "require-directory"; - packageName = "require-directory"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; - }; - }; - "resolve-1.22.1" = { - name = "resolve"; - packageName = "resolve"; - version = "1.22.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"; - sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; - }; - }; - "resolve-from-4.0.0" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; - sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; - }; - }; - "restore-cursor-3.1.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"; - sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; - }; - }; - "resumer-0.0.0" = { - name = "resumer"; - packageName = "resumer"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"; - sha512 = "Fn9X8rX8yYF4m81rZCK/5VmrmsSbqS/i3rDLl6ZZHAXgC2nTAx3dhwG8q8odP/RmdLa2YrybDJaAMg+X1ajY3w=="; - }; - }; - "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=="; - }; - }; - "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=="; - }; - }; - "semaphore-async-await-1.5.1" = { - name = "semaphore-async-await"; - packageName = "semaphore-async-await"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz"; - sha512 = "b/ptP11hETwYWpeilHXXQiV5UJNJl7ZWWooKRE5eBIYWoom6dZ0SluCIdCtKycsMtZgKWE01/qAw6jblw1YVhg=="; - }; - }; - "semver-7.3.7" = { - name = "semver"; - packageName = "semver"; - version = "7.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; - sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; - }; - }; - "seq-0.3.5" = { - name = "seq"; - packageName = "seq"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/seq/-/seq-0.3.5.tgz"; - sha512 = "sisY2Ln1fj43KBkRtXkesnRHYNdswIkIibvNe/0UKm2GZxjMbqmccpiatoKr/k2qX5VKiLU8xm+tz/74LAho4g=="; - }; - }; - "shebang-command-2.0.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; - sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; - }; - }; - "shebang-regex-3.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; - }; - }; - "side-channel-1.0.4" = { - name = "side-channel"; - packageName = "side-channel"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; - sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; - }; - }; - "signal-exit-3.0.7" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; - sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; - }; - }; - "source-map-0.1.43" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.43"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; - sha512 = "VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ=="; - }; - }; - "source-map-0.6.1" = { - name = "source-map"; - packageName = "source-map"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; - }; - }; - "spiro-3.0.0" = { - name = "spiro"; - packageName = "spiro"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/spiro/-/spiro-3.0.0.tgz"; - sha512 = "UEhtLWA8fDQuExOKpT3FLa7Rk238G5Bm3wGAxbvnah3H2X6yEL4blIkAsc38wNwMXBwQFRYE6l0Q9X0t1izOxA=="; - }; - }; - "string-width-4.2.3" = { - name = "string-width"; - packageName = "string-width"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; - sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; - }; - }; - "string.prototype.trimend-1.0.5" = { - name = "string.prototype.trimend"; - packageName = "string.prototype.trimend"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"; - sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog=="; - }; - }; - "string.prototype.trimstart-1.0.5" = { - name = "string.prototype.trimstart"; - packageName = "string.prototype.trimstart"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"; - sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg=="; - }; - }; - "strip-ansi-6.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; - }; - }; - "strip-bom-3.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; - sha512 = "vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="; - }; - }; - "strip-json-comments-3.1.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; - sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; - }; - }; - "supports-color-7.2.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; - sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; - }; - }; - "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=="; - }; - }; - "text-table-0.2.0" = { - name = "text-table"; - packageName = "text-table"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; - sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; - }; - }; - "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"; - sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="; - }; - }; - "toposort-2.0.2" = { - name = "toposort"; - packageName = "toposort"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz"; - sha512 = "0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg=="; - }; - }; - "traverse-0.3.9" = { - name = "traverse"; - packageName = "traverse"; - version = "0.3.9"; - src = fetchurl { - url = "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"; - sha512 = "iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ=="; - }; - }; - "tsconfig-paths-3.14.1" = { - name = "tsconfig-paths"; - packageName = "tsconfig-paths"; - version = "3.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz"; - sha512 = "fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ=="; - }; - }; - "tslib-2.4.0" = { - name = "tslib"; - packageName = "tslib"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"; - sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; - }; - }; - "type-check-0.3.2" = { - name = "type-check"; - packageName = "type-check"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; - sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="; - }; - }; - "type-check-0.4.0" = { - name = "type-check"; - packageName = "type-check"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"; - sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; - }; - }; - "type-fest-0.20.2" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.20.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"; - sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; - }; - }; - "typo-geom-0.12.1" = { - name = "typo-geom"; - packageName = "typo-geom"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.12.1.tgz"; - sha512 = "W20RYp2OCEGMhEYayR0cAP67AUWiGRUufMs6Clul7MAmu5SpLuOG/RWk7+LkL65wsugcfhPQlFEJ231C2xHNQg=="; - }; - }; - "unbox-primitive-1.0.2" = { - name = "unbox-primitive"; - packageName = "unbox-primitive"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"; - sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; - }; - }; - "unicoderegexp-0.4.1" = { - name = "unicoderegexp"; - packageName = "unicoderegexp"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unicoderegexp/-/unicoderegexp-0.4.1.tgz"; - sha512 = "ydh8D5mdd2ldTS25GtZJEgLciuF0Qf2n3rwPhonELk3HioX201ClYGvZMc1bCmx6nblZiADQwbMWekeIqs51qw=="; - }; - }; - "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=="; - }; - }; - "uri-js-4.4.1" = { - name = "uri-js"; - packageName = "uri-js"; - version = "4.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; - sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; - }; - }; - "uuid-8.3.2" = { - name = "uuid"; - packageName = "uuid"; - version = "8.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; - sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; - }; - }; - "v8-compile-cache-2.3.0" = { - name = "v8-compile-cache"; - packageName = "v8-compile-cache"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; - sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; - }; - }; - "verda-1.10.0" = { - name = "verda"; - packageName = "verda"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/verda/-/verda-1.10.0.tgz"; - sha512 = "euo21L72IMCzrQ9GrYGEI1kmQT6bgKcfJaa0zr4a+FpODsOrszDk55SYsvAqKUMzgXJHAGh4LvE9ytu45E79OA=="; - }; - }; - "wawoff2-2.0.1" = { - name = "wawoff2"; - packageName = "wawoff2"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wawoff2/-/wawoff2-2.0.1.tgz"; - sha512 = "r0CEmvpH63r4T15ebFqeOjGqU4+EgTx4I510NtK35EMciSdcTxCw3Byy3JnBonz7iyIFZ0AbVo0bbFpEVuhCYA=="; - }; - }; - "which-2.0.2" = { - name = "which"; - packageName = "which"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; - sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; - }; - }; - "which-boxed-primitive-1.0.2" = { - name = "which-boxed-primitive"; - packageName = "which-boxed-primitive"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; - sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; - }; - }; - "word-wrap-1.2.3" = { - name = "word-wrap"; - packageName = "word-wrap"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"; - sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; - }; - }; - "wordwrap-0.0.3" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - sha512 = "1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw=="; - }; - }; - "wrap-ansi-7.0.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; - }; - }; - "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"; - sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; - }; - }; - "xpath-0.0.32" = { - name = "xpath"; - packageName = "xpath"; - version = "0.0.32"; - src = fetchurl { - url = "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz"; - sha512 = "rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw=="; - }; - }; - "y18n-5.0.8" = { - name = "y18n"; - packageName = "y18n"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"; - sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; - }; - }; - "yallist-4.0.0" = { - name = "yallist"; - packageName = "yallist"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; - sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; - }; - }; - "yargs-16.2.0" = { - name = "yargs"; - packageName = "yargs"; - version = "16.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"; - sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; - }; - }; - "yargs-17.5.1" = { - name = "yargs"; - packageName = "yargs"; - version = "17.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz"; - sha512 = "t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA=="; - }; - }; - "yargs-parser-20.2.9" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "20.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"; - sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; - }; - }; - "yargs-parser-21.0.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "21.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz"; - sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="; - }; - }; - }; - args = { - name = "iosevka"; - packageName = "iosevka"; - version = "15.6.3"; - src = ./.; - dependencies = [ - sources."@eslint/eslintrc-1.3.0" - sources."@humanwhocodes/config-array-0.9.5" - sources."@humanwhocodes/object-schema-1.2.1" - sources."@iarna/toml-2.2.5" - sources."@msgpack/msgpack-2.7.2" - sources."@ot-builder/bin-composite-types-1.5.3" - sources."@ot-builder/bin-util-1.5.3" - sources."@ot-builder/cli-help-shower-1.5.3" - sources."@ot-builder/cli-proc-1.5.3" - sources."@ot-builder/cli-shared-1.5.3" - sources."@ot-builder/common-impl-1.5.3" - sources."@ot-builder/errors-1.5.3" - sources."@ot-builder/io-bin-cff-1.5.3" - sources."@ot-builder/io-bin-encoding-1.5.3" - sources."@ot-builder/io-bin-ext-private-1.5.3" - sources."@ot-builder/io-bin-font-1.5.3" - sources."@ot-builder/io-bin-glyph-store-1.5.3" - sources."@ot-builder/io-bin-layout-1.5.3" - sources."@ot-builder/io-bin-metadata-1.5.3" - sources."@ot-builder/io-bin-metric-1.5.3" - sources."@ot-builder/io-bin-name-1.5.3" - sources."@ot-builder/io-bin-sfnt-1.5.3" - sources."@ot-builder/io-bin-ttf-1.5.3" - sources."@ot-builder/io-bin-vtt-private-1.5.3" - sources."@ot-builder/ot-1.5.3" - sources."@ot-builder/ot-encoding-1.5.3" - sources."@ot-builder/ot-ext-private-1.5.3" - sources."@ot-builder/ot-glyphs-1.5.3" - sources."@ot-builder/ot-layout-1.5.3" - sources."@ot-builder/ot-metadata-1.5.3" - sources."@ot-builder/ot-name-1.5.3" - sources."@ot-builder/ot-sfnt-1.5.3" - sources."@ot-builder/ot-standard-glyph-namer-1.5.3" - sources."@ot-builder/ot-vtt-private-1.5.3" - sources."@ot-builder/prelude-1.5.3" - sources."@ot-builder/primitive-1.5.3" - sources."@ot-builder/rectify-1.5.3" - sources."@ot-builder/stat-glyphs-1.5.3" - sources."@ot-builder/trace-1.5.3" - sources."@ot-builder/var-store-1.5.3" - sources."@ot-builder/variance-1.5.3" - sources."@types/json5-0.0.29" - sources."@unicode/unicode-14.0.0-1.2.2" - sources."@xmldom/xmldom-0.8.2" - sources."acorn-8.7.1" - sources."acorn-jsx-5.3.2" - sources."aglfn-1.0.2" - sources."ajv-6.12.6" - sources."amdefine-1.0.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" - sources."array-includes-3.1.5" - sources."array.prototype.flat-1.3.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."call-bind-1.0.2" - sources."callsites-3.1.0" - sources."chainsaw-0.0.9" - sources."chalk-4.1.2" - sources."cldr-7.2.0" - sources."cli-cursor-3.1.0" - sources."clipper-lib-6.4.2" - sources."cliui-7.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."concat-map-0.0.1" - sources."cross-spawn-7.0.3" - sources."debug-4.3.4" - sources."deep-is-0.1.4" - sources."define-properties-1.1.4" - sources."doctrine-3.0.0" - sources."emoji-regex-8.0.0" - sources."es-abstract-1.20.1" - sources."es-shim-unscopables-1.0.0" - sources."es-to-primitive-1.2.1" - sources."escalade-3.1.1" - sources."escape-string-regexp-4.0.0" - sources."escodegen-2.0.0" - (sources."escope-1.0.3" // { - dependencies = [ - sources."estraverse-2.0.0" - ]; - }) - (sources."eslint-8.18.0" // { - dependencies = [ - sources."optionator-0.9.1" - ]; - }) - sources."eslint-config-prettier-8.5.0" - (sources."eslint-import-resolver-node-0.3.6" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - (sources."eslint-module-utils-2.7.3" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - (sources."eslint-plugin-import-2.26.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."doctrine-2.1.0" - sources."ms-2.0.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.3.0" - (sources."esmangle-1.0.1" // { - dependencies = [ - sources."escodegen-1.3.3" - sources."esprima-1.1.1" - sources."estraverse-1.5.1" - sources."esutils-1.0.0" - sources."fast-levenshtein-1.0.7" - sources."levn-0.2.5" - sources."optionator-0.3.0" - sources."prelude-ls-1.1.2" - sources."source-map-0.1.43" - sources."type-check-0.3.2" - ]; - }) - sources."espree-9.3.2" - sources."esprima-4.0.1" - sources."esquery-1.4.0" - sources."esrecurse-4.3.0" - (sources."esshorten-1.1.1" // { - dependencies = [ - sources."estraverse-4.1.1" - ]; - }) - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."file-entry-cache-6.0.1" - sources."find-up-2.1.0" - sources."flat-cache-3.0.4" - sources."flatted-3.2.5" - sources."fs-extra-10.1.0" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.5" - sources."functional-red-black-tree-1.0.1" - sources."functions-have-names-1.2.3" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.2" - sources."get-symbol-description-1.0.0" - sources."glob-7.2.3" - sources."glob-parent-6.0.2" - sources."globals-13.15.0" - sources."graceful-fs-4.2.10" - sources."has-1.0.3" - sources."has-bigints-1.0.2" - sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hashish-0.0.4" - sources."iconv-lite-0.6.3" - sources."ignore-5.2.0" - sources."import-fresh-3.3.0" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."internal-slot-1.0.3" - sources."is-bigint-1.0.4" - sources."is-boolean-object-1.1.2" - sources."is-callable-1.2.4" - sources."is-core-module-2.9.0" - 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-negative-zero-2.0.2" - sources."is-number-object-1.0.7" - sources."is-regex-1.1.4" - sources."is-shared-array-buffer-1.0.2" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-weakref-1.0.2" - sources."isexe-2.0.0" - sources."js-yaml-4.1.0" - sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-1.0.1" - sources."jsonfile-6.1.0" - sources."levn-0.4.1" - sources."locate-path-2.0.0" - sources."lodash.merge-4.6.2" - sources."lru-cache-2.5.0" - sources."memoizeasync-1.1.0" - sources."mimic-fn-2.1.0" - sources."minimatch-3.1.2" - sources."minimist-1.2.6" - sources."ms-2.1.2" - sources."natural-compare-1.4.0" - sources."object-inspect-1.12.2" - sources."object-keys-1.1.1" - sources."object.assign-4.1.2" - sources."object.values-1.1.5" - sources."once-1.4.0" - sources."onetime-5.1.2" - (sources."optionator-0.8.3" // { - dependencies = [ - sources."levn-0.3.0" - sources."prelude-ls-1.1.2" - sources."type-check-0.3.2" - ]; - }) - sources."ot-builder-1.5.3" - sources."otb-ttc-bundle-1.5.3" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - sources."parent-module-1.0.1" - sources."passerror-1.1.1" - sources."patel-0.38.0" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."patrisika-0.25.0" - sources."patrisika-scopes-0.12.0" - sources."pegjs-0.10.0" - sources."prelude-ls-1.2.1" - sources."prettier-2.7.1" - sources."punycode-2.1.1" - sources."regexp.prototype.flags-1.4.3" - sources."regexpp-3.2.0" - sources."require-directory-2.1.1" - sources."resolve-1.22.1" - sources."resolve-from-4.0.0" - sources."restore-cursor-3.1.0" - sources."resumer-0.0.0" - sources."rimraf-3.0.2" - sources."safer-buffer-2.1.2" - sources."semaphore-async-await-1.5.1" - (sources."semver-7.3.7" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - sources."seq-0.3.5" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."side-channel-1.0.4" - sources."signal-exit-3.0.7" - sources."source-map-0.6.1" - sources."spiro-3.0.0" - sources."string-width-4.2.3" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" - sources."strip-ansi-6.0.1" - 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."text-table-0.2.0" - sources."through-2.3.8" - sources."toposort-2.0.2" - sources."traverse-0.3.9" - sources."tsconfig-paths-3.14.1" - sources."tslib-2.4.0" - sources."type-check-0.4.0" - sources."type-fest-0.20.2" - sources."typo-geom-0.12.1" - sources."unbox-primitive-1.0.2" - sources."unicoderegexp-0.4.1" - sources."universalify-2.0.0" - sources."uri-js-4.4.1" - sources."uuid-8.3.2" - sources."v8-compile-cache-2.3.0" - (sources."verda-1.10.0" // { - dependencies = [ - sources."yargs-17.5.1" - sources."yargs-parser-21.0.1" - ]; - }) - sources."wawoff2-2.0.1" - sources."which-2.0.2" - sources."which-boxed-primitive-1.0.2" - sources."word-wrap-1.2.3" - sources."wordwrap-0.0.3" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."xpath-0.0.32" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - ]; - buildInputs = globalBuildInputs; - meta = { - }; - production = false; - bypassCache = true; - reconstructLock = false; - }; -in -{ - args = args; - sources = sources; - tarball = nodeEnv.buildNodeSourceDist args; - package = nodeEnv.buildNodePackage args; - shell = nodeEnv.buildNodeShell args; - nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args { - src = stdenv.mkDerivation { - name = args.name + "-package-json"; - src = nix-gitignore.gitignoreSourcePure [ - "*" - "!package.json" - "!package-lock.json" - ] args.src; - dontBuild = true; - installPhase = "mkdir -p $out; cp -r ./* $out;"; - }; - }); -} diff --git a/pkgs/data/fonts/iosevka/update-default.sh b/pkgs/data/fonts/iosevka/update-default.sh deleted file mode 100755 index 8d918058988a..000000000000 --- a/pkgs/data/fonts/iosevka/update-default.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p common-updater-scripts coreutils gawk replace -set -euo pipefail -cd "$(dirname "${BASH_SOURCE[0]}")" - -nixpkgs=../../../.. -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 --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 -fi - -# Update the source package in nodePackages. -current_source="$repo/archive/v$current_version.tar.gz" -new_source="$repo/archive/v$new_version.tar.gz" -replace-literal -ef "$current_source" "$new_source" ../../../development/node-packages/node-packages.json -echo "iosevka: $current_version -> $new_version (after nodePackages update)" diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index e5d7447ed59a..6699023498cb 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 = "1xjpzif2v3p78abny74wwrrcq05hahvk4rf0swhbjhsv7j1ycmnf"; - iosevka-aile = "1m1naxhf6ksasd3fq5npikgm8yv60salnhvb9b50rmyw6as2hmyb"; - iosevka-curly = "0xdb8ymcg0kmdcj7jhr3pqfyv6cw9ab1f1rgs0cvn6g97n4ag2yq"; - iosevka-curly-slab = "0396zjh043qv1j10f7m2pbibfyfkc6361rzjjgdqyvjhj0qh3wsi"; - iosevka-etoile = "0d89q4d8fvcl2130v45v873g31vvcd051wk461lid1mdmydvfs9d"; - iosevka-slab = "0jgsg1rnkx8mrcp74qbkc7dazlkh9wzyb6gn51yvwzv2gs2sj69m"; - iosevka-ss01 = "16c3kh3ynmwm0r83gv1swv2z4bhdm78a91hkdczzkngbzaa0mxhg"; - iosevka-ss02 = "1xmylqgh0972p1cz2vshlgnjpfg20k7x5alirjhpsvyj8n1v7jsx"; - iosevka-ss03 = "1qw2rwwhw4yd2s0876xp3z5kxxgf5x125vwy83wbcgca9hx7b1cw"; - iosevka-ss04 = "1nlw7na37rx9lk9g3b01v2wipglcj0lszyyk0s6j2g8cdmvcdqap"; - iosevka-ss05 = "1b3ckxpw28ail62x8g06rs6fn4gba7xfpnk2qaf8fl0lhvjyv0kf"; - iosevka-ss06 = "0ifrzd1kxhflf2kxbfsshp9chpiidx6nvvblws11276qz7qir9lq"; - iosevka-ss07 = "0bm2n688i8f40awi8k1jj8p6pz45p230pp7brlps99ljjq7ipqcb"; - iosevka-ss08 = "0qqhfcr9xmfr24rp4xq3xy8zld5l2pnqwbd801ljv6qy3zza9xhk"; - iosevka-ss09 = "0dgpzjnab2fwp2jns5fvgzh4n8w0qhxzx1fhxw4b5c99n5bnim07"; - iosevka-ss10 = "1nz8an3ar3lw3zfdyck1xh17hdkqdpg8rmwih4wxz93hpp5xhrbv"; - iosevka-ss11 = "1wmxs075ymvyzl9r687xh32iqp3xsaakdfh01m1iwpyglspyr8y0"; - iosevka-ss12 = "0c7abkq0ylzqv8ssizby5g6lnibqyiw2pfmyk8cccx9pq1ihr1jq"; - iosevka-ss13 = "0xalbmkgyj30a9y4wzqpcc8ix64jdll1sm972fc35ln8134m7fzl"; - iosevka-ss14 = "1638n30hhqv0rm2q1gqvj36knjn2n6jry6dz1xfczlaqm956395v"; - iosevka-ss15 = "05blb6va180fk4iw3ldgq17w11gqi0jflmcdgzjzxw5pxs8j1qwp"; - iosevka-ss16 = "1qgfrc5kj0x7yc77aqswy5668ymnxw9gw5rp71r4j5778wmslr5s"; - iosevka-ss17 = "03226nda56dhbia3nf5p603zz04avh5j1x24qz9z3irhqg4rn0js"; - iosevka-ss18 = "17vyf3msafgdhqhhby4qrn8p5pxdmvxwfgf44vx41iy860q89avh"; - sgr-iosevka = "0vxfkhx77b9hf63an7wzpgldlj6pbs27i65qsq45n869cyvzd9ga"; - sgr-iosevka-aile = "1iqxc42hc6398a61k84ibmjkl328sza9q3l81s04iav4kkrjd0g6"; - sgr-iosevka-curly = "0ww4h12xfpa8yxjxhgs3m819024vz6isw8gq88spj07p2w4jx4mp"; - sgr-iosevka-curly-slab = "1my79s02hhi803rakwia61c2rkpgzf6zw6xhzw6n1jkmjj1r77a7"; - sgr-iosevka-etoile = "0rp1fk156s2mxibyak8pzw871p33pjdizi2ix9ppxqdb2zyn64xd"; - sgr-iosevka-fixed = "0rldw2gq22hf2hy0brf03g12vw4rh8h5ascccsc6mljzzgwy6wir"; - sgr-iosevka-fixed-curly = "1sal7i1kybfgxfhr1c90rmjal8zhh4cbf6xqzs6zrz3zxhp1zj30"; - sgr-iosevka-fixed-curly-slab = "0spkivcqg4nzkd7r3gvym1v87d8r7cd353sw8sbllq9a93axcffs"; - sgr-iosevka-fixed-slab = "1kpzcsjdk74fbr16iqz7xm10arg8kmcnpv54xxn23h4xbxx6qy5z"; - sgr-iosevka-fixed-ss01 = "0j7kzcy7rwjqhl9hlhpbm4495b5ifl0kl9jh58nc0r17c3vfhhxq"; - sgr-iosevka-fixed-ss02 = "1lx6gx2qr82nzphxyd38xj50mrhn9y2c0lq2c1n6iq7zig7yybn6"; - sgr-iosevka-fixed-ss03 = "0clpiaa12mxksvbyrxahq56nh0dmn3y5x0dclx8clh7v39z652s6"; - sgr-iosevka-fixed-ss04 = "1lvr6vs6qbmkrgkzw5jvp3a3ib681y9784mwv25il5z7q6imlnng"; - sgr-iosevka-fixed-ss05 = "0bxqcd18657pvf6j64rhwvgpq6frqdhp65r8rb90bwfv12yqxrw7"; - sgr-iosevka-fixed-ss06 = "1fz1zvbvkyj04c8qh2xwshcnwswnzldvi6y7c1qzbfm357xsjblg"; - sgr-iosevka-fixed-ss07 = "01ndbbchf4azc4n8w26snd1l6078zxc8xzxy2vbw7vby3lify2i1"; - sgr-iosevka-fixed-ss08 = "1rv1rywpk53nf6kyc5wjsjf9j2aj1bzlr4gwk5s6m63klr7q10wx"; - sgr-iosevka-fixed-ss09 = "10rv346mjg12rihix0rr97vi5y63j4ia0q24rbs0546g4g309k6w"; - sgr-iosevka-fixed-ss10 = "0ry6abyjaq6dy39mkvzqglzrrpbgwfcq2lxy5j9kncjcwx72mpin"; - sgr-iosevka-fixed-ss11 = "0nq997c81pxjkgsr1gvkbaapv4qkqpf5w5pixhdkc22g2fp68w6s"; - sgr-iosevka-fixed-ss12 = "1v7irhjrf31mlj3h0v1bxnl1x187555zdrrv2fhycn7700im5pj2"; - sgr-iosevka-fixed-ss13 = "17m1fjlvh279wc1n2m7fhmrn3a8b2rqrnj34vps67f1m7bafh1yz"; - sgr-iosevka-fixed-ss14 = "1sm9z1zad7war4066rj5mdmc0qhl03bjq7wir01na42bw464yz2a"; - sgr-iosevka-fixed-ss15 = "0xsgjz0225vdzw5b9x8333anmshpva1w5kw7g6m0m2m21n3kvpc8"; - sgr-iosevka-fixed-ss16 = "1z5h9s9vqmmdjzkv6jzd2rxzkrdbchcbbdxilgvh0nkicpz7h1f6"; - sgr-iosevka-fixed-ss17 = "06va44pbrbp3yrpb6k58c5vkyrfjbl1sm2jhbpih0vxcpmqa209k"; - sgr-iosevka-fixed-ss18 = "03plkqbjmpbz200k062s5j9a42717fzi37c6d0jjmhqlyr62j478"; - sgr-iosevka-slab = "0xf2wzd5679j3csd5br4yfyh1m8vmijf42871szxbq85mw8k1q6f"; - sgr-iosevka-ss01 = "1v4cifbn4icgsnzvxqyg2sqza5m2378bmcqmw511cbkhrgzr15ff"; - sgr-iosevka-ss02 = "1d91qzbzlkwj0f9nfd4jvvy2lq0dy70w6dzkgggb75xm6rwn0251"; - sgr-iosevka-ss03 = "0praj6n5i1ahxnp3zji3jffvvzhpb1382inzihlgrbysjna4cqkv"; - sgr-iosevka-ss04 = "1lxifnvb61ad8v53cnj4zi4m1jnlh4gk1w6kk5w04yd0z749hyx1"; - sgr-iosevka-ss05 = "1a446rhyn69ss20ybf9mqy55i4ajq2jpwppmn6srfnrjx63706w6"; - sgr-iosevka-ss06 = "112k2gyv6r9ircw2rnrgsijw9v1fs64p5737ww6540kg8xrpz1kx"; - sgr-iosevka-ss07 = "0alc313vgf9649xgynq8h6d006phw9mbijn2m4qjzgjkw4v28xh8"; - sgr-iosevka-ss08 = "1c1xfj3jryfcgzmqyfmcz7nafhh5jzj7glcdaifviddbbdj5xi88"; - sgr-iosevka-ss09 = "1fw4qnn22fvz42mfbl1gwr4bwv53xjy0dqd7c6sy7886gxmkr04y"; - sgr-iosevka-ss10 = "1m62m1xb6xb9vwpgicag8vw817r8qf6gq6mv7kr18fs0mqv4h8sh"; - sgr-iosevka-ss11 = "0xa5wy6qnk9fgkm3yb0scwkhfxg59hchimzfzrbgvfylsdpq527y"; - sgr-iosevka-ss12 = "0c49wjypsxjgkm9s1py58lx8rybb3kzm6z3xysvmffqhyx4h03xa"; - sgr-iosevka-ss13 = "1hr0fbmhjq5ngp4hdm7zjxk3wggbk2yhx50byvbm39056v3pxbym"; - sgr-iosevka-ss14 = "0ibqdh2ddz9rv8icbfvba6jj5pcpi7l7kjkwsqx0081wqv1c3jxk"; - sgr-iosevka-ss15 = "004ibn5hrgcby93h2kz248x5qmz4xbirih1k3ic0xqda23yyqq7j"; - sgr-iosevka-ss16 = "1mad0yiwknl9f7z6c52fv12ngdgwr1yic74ssbzk529vrqmafwy1"; - sgr-iosevka-ss17 = "1igrbzw63jailzgqlv72h1iv3lz33qd3z9s0hv92w2kh2ig7q6kf"; - sgr-iosevka-ss18 = "0nsq4hg8mmnzi8dgdn0km03x72ja1vk7g7kbzr7m148kb1p4x5vv"; - sgr-iosevka-term = "1ax6i21cf4w8gwhml0rwvb3yk9hlhkjfn1pyjyglajnsbh8z4r3w"; - sgr-iosevka-term-curly = "0y7jkqddqkc2cnmgfsrq29c7id070y8gxj664q81k6alivpj62rs"; - sgr-iosevka-term-curly-slab = "021m8lmxss1qms0slsc83l78njvnjjyniarrkx95x9vpqs2dym0h"; - sgr-iosevka-term-slab = "0qkxy91hvxa36bz8q1wwf31qn18b2zvyabkpsjnv6yhpzimz4wm0"; - sgr-iosevka-term-ss01 = "0sxm07qr1l64n0p5f7dnssgi545i73gdahm18iyvijwqcvxg83rn"; - sgr-iosevka-term-ss02 = "0zlzvxbf2p27g7p5g19ixa5vf77fxd0b7bqky9pfzf72wpwd89jd"; - sgr-iosevka-term-ss03 = "09qd2np8z224h2z7yyqfz7csxdbr11kc4v9p8z4qnb8k8wg5akz9"; - sgr-iosevka-term-ss04 = "0jr5bk9x3nb9841nxlsl3wjwdy5si8g4rwh5axm5g5hwjxr29x8z"; - sgr-iosevka-term-ss05 = "1w41g52b2b5qzkhai3wk3fvsa5qi8h70wmbq0shq954gqzrlchnp"; - sgr-iosevka-term-ss06 = "0hmsq5jpnb9605scvh89wqdvyxsypm74aqwz8zsyn7siwfkhh3hc"; - sgr-iosevka-term-ss07 = "06spijbyw6dzwc73gzi9r14af9g47js0p94ddn54aq3sw2d1c9jq"; - sgr-iosevka-term-ss08 = "1yrr7lknz0h126gr6srxzfs4npl7vv8v32b2hzkixqzf1pfjv3mr"; - sgr-iosevka-term-ss09 = "1lf04m0f3l2pw1rm3klfynainxma8fs5x2zv9vgjd1vr07si0c5n"; - sgr-iosevka-term-ss10 = "1p9p3gpfd353jq1aab5dh16ppzx2qjii8x8hvaqnmhy1a1ip15jg"; - sgr-iosevka-term-ss11 = "1x1n5fjya6a01m0cwcdcf6xlynzgk2413axkr4p5glmqad7w82h8"; - sgr-iosevka-term-ss12 = "07bxpw4bsxbwsrjvbw3n6kj1bkvr9a730zp509zjzg72dy6i96ca"; - sgr-iosevka-term-ss13 = "1mw0nfknzk4qcf9nsg9904389li6sbpvgn48iydrk4bzyr41qza1"; - sgr-iosevka-term-ss14 = "13pvn4kkl4yz1hkrl04ifqbk9x7lym1i7w3d6nh8l3ch3783sjha"; - sgr-iosevka-term-ss15 = "1hqrn050qx5iljfbflzpzl4nl21jnnlih53kj9ik3scwb76pkfal"; - sgr-iosevka-term-ss16 = "1svj0wq7j0kzn4pnyn5lkd5sni3k6vv78r943zc6dlxrs7vbkljp"; - sgr-iosevka-term-ss17 = "0qmzpxgsibf8c0k6hzq7ps1gd0mb050z3dsjmjjammh0cwflax6p"; - sgr-iosevka-term-ss18 = "0qss7kz6mwzaxlff4m1lylf0a8sy65l7z6my7k6kif9iiy2595wx"; + iosevka = "0lxcyg93max17fqm6yvxwvr79jz9bggxcmv6qx8sknvjmq89l0pf"; + iosevka-aile = "0pljy65m5zaxbajfmhc3gayz73rbp8vzaqzqcrlm2ir9yxaz21qc"; + iosevka-curly = "0svf6hm0cspydgzjg39f5rp7mrcabb0vc2088r1msipaw8naajqf"; + iosevka-curly-slab = "1afk0ijfciwh9pjy2qsawxw7gq7jxr52li2nwggcq04c9ybh62pg"; + iosevka-etoile = "07zihk9q1ff93ms9gj92hbf2fzw7h4fl28szhrfll3p96y9f81q7"; + iosevka-slab = "18hrv0kc82hfb6ivbdg5k9179k37anjigm8ddh5waiq2is6gmh8l"; + iosevka-ss01 = "127zki1wcd2wjpqr1n2zf57iq44pwcrg2vlrspi3b9lhmxw0rlz9"; + iosevka-ss02 = "0ig7y86c2d9y4bg5cqibbn0wqwwzm5d5qxd8vwhvd323mg3gh6bg"; + iosevka-ss03 = "0zp2nkrl39pvidn846706dp8l12ac66kd9wsyh4cnn08mmm6gl4i"; + iosevka-ss04 = "0r0ylsxj2j9akpxchnldwyddm7vrlpn82sxkgmjhr81hn3q08bgc"; + iosevka-ss05 = "0r9mdhdjndxgm68fg59dbd810ggrpmpkvgcypyqf92l8sf1h55hj"; + iosevka-ss06 = "1c6ga4jaglfp5mx980qy1alkifr1d1lq4qj69xfq6sx4146xn20f"; + iosevka-ss07 = "0h1x2p9finl4482vx6lvs45x5258bpw5avkpgmg66wn16kd95zfq"; + iosevka-ss08 = "1n5m11dlv49jj63s771ny77qpiz178iyvn7pfnhv2mzqwimz5sl2"; + iosevka-ss09 = "1rbs15xsk7fajrm81nacixf18jjx08bpg26fw7pmxjv727zafv05"; + iosevka-ss10 = "1rdpiq5pyzrnxhnsvf08zg0vjhln25vqkyknnv4xf34wr8r9xcc0"; + iosevka-ss11 = "0l9454vx90pj0yva864qfj06ggplia0qdkv3nr14s3wmv5khh9gw"; + iosevka-ss12 = "0cafszj0c7nkcxpbqsrqy5l2v0nzfph6i22w1iayg8bqvpip3x5m"; + iosevka-ss13 = "1mlxh6qikrl0g82difr85lpkxdr83z5iymf0brmgdxkmyig3psr7"; + iosevka-ss14 = "1330p52h94fgr76gll396hb0qalamm8z79hw73ci4ph22dpsd4ni"; + iosevka-ss15 = "0cc5a1187i9idgvz7zhs0byya8c69f0g4pkqlivh37ffj07yv47v"; + iosevka-ss16 = "052nypjppbrbkhjq85nwmx8469prfsbc9f05kw0vi30c8mpcjqwf"; + iosevka-ss17 = "0k5p1qvx8vi8ic7yayky7zdi1hrkwli698ydlfhnk4yx10l0xq8j"; + iosevka-ss18 = "16diyrfpz1kp9vcyq61pbdrrv4pl96kzn8ckv7wb5cnwxwa336c7"; + sgr-iosevka = "0b92jmai9cgxdah74jmks7fwbyb1m722ablf3qaiizc597y031wv"; + sgr-iosevka-aile = "1z5jg74aspkvhw41ihwzbfs4f075gs8ny76m30adp0n3v877nhjz"; + sgr-iosevka-curly = "06bm6jg16sgvxnqbayqa92lvr0bc5vdjybbi467yx57hi83w860q"; + sgr-iosevka-curly-slab = "08kg8imp29sww57mdpfmi86046vqwd4a2ayijcvs511v8nhl478r"; + sgr-iosevka-etoile = "0gybfn95n2b8kn3bvi8pjkps5bmndnbbq9jbfbm81fims0s0496b"; + sgr-iosevka-fixed = "15q4y8cm8cwxcbmjzknc19gyqmd4nb928b26nswm8m17p85zlcq0"; + sgr-iosevka-fixed-curly = "1faci2m7w8cf65mjkigqlyh838r5mqvg7ai4nfdidms6ilhhsf37"; + sgr-iosevka-fixed-curly-slab = "019m3nvsy6vwgf6f0z2l0wxxkqbl30y55jfgi2bsmxhizwzl3csc"; + sgr-iosevka-fixed-slab = "1ps1xi334h7by3nihn3n6d76sbzcvv03dwy4iy5wixlz0lr8id5i"; + sgr-iosevka-fixed-ss01 = "18qdd6qbk8dy6z36lsy89a7g6l1asdzqvlc82j9vk437yjm59vwi"; + sgr-iosevka-fixed-ss02 = "0xm1k1f5hbhjbksshlv7bcdigdrxxhfpc8pgv7dvz7zpy7cx2y4y"; + sgr-iosevka-fixed-ss03 = "1741k3p2mncq9kp1wshpl6dkwqvvg2bpakl91k6ssvj1z63r2zhq"; + sgr-iosevka-fixed-ss04 = "0sw65088yihk2sk2mcdr4cd8rl9l954l2sc3y7dil3jkgw6kf0wq"; + sgr-iosevka-fixed-ss05 = "1cc71vidcljh6k6pw6z5yygi0kir7n235l19as8y1qazmc8kh0ip"; + sgr-iosevka-fixed-ss06 = "0s2f0j0z4dyd23z5mldih03cg8vqwvpqrmagbpx02v2krzn2vb27"; + sgr-iosevka-fixed-ss07 = "07nfdx7bdbsxrmylsja8bvr1n2a116qyfg8pk1wpcax3vf56jamh"; + sgr-iosevka-fixed-ss08 = "0ys6gw2p7vpdv8csxzxjx09m8k0h4s28w7i98iq27ak47xcm8xd7"; + sgr-iosevka-fixed-ss09 = "0vn6vc0byakggyrd6d9mv1l9d4h5g7wcbkkmxzqfjr6xp3k96r88"; + sgr-iosevka-fixed-ss10 = "0llqjvv7m1imvqw41xvmcw9y9c9wsnv2i8swnszr9r5khx3kbp6h"; + sgr-iosevka-fixed-ss11 = "1wwjp1fgl2gxhjkmsz6k0a59kjcapby9y8j5m763ap4ig5djbv8r"; + sgr-iosevka-fixed-ss12 = "1k9ak5dc3s024iz6rp4yz9b73752v93n0kldcnwi0lvbh4hp358k"; + sgr-iosevka-fixed-ss13 = "0rgj38jkj6d7g44wn02k6ycixkwq6lwy756vp9w01aqqn5flw6s1"; + sgr-iosevka-fixed-ss14 = "0lbpwnc40lswlmfwqziz7n3kn95kc5rn4fbq5nxa1z8cxz9dkhvh"; + sgr-iosevka-fixed-ss15 = "034h7af7876q0ni8idj5dhkq1cpl91gvxhwxyw17pgnz8i51a261"; + sgr-iosevka-fixed-ss16 = "0i00nxj0j7yr57b4ccd2yc4x7k8zw1xxpdwfwlm0n38c05iqbvj9"; + sgr-iosevka-fixed-ss17 = "1z21han7l7nwz0qfi6fzvwdiadd9brpna51p24drdi8y3915b8n9"; + sgr-iosevka-fixed-ss18 = "0fjdsx66al0h3spgdivryiw5d871s93s2lbmh7nxwf19lylrkv19"; + sgr-iosevka-slab = "0j42hxgcwy5abf5jv5aqjri6h21k2nkgjj7527f68rgcnl9d980b"; + sgr-iosevka-ss01 = "1m7c8zb3rhxnf9h4v55jv7ns6x74bwfsl6f4sl2b1gkfl50ibwqg"; + sgr-iosevka-ss02 = "05cc3p8lkxl1s27wmgspk93fz8f51daqcfid8vpsvnqw75abivc9"; + sgr-iosevka-ss03 = "0bmh1ijdalss96lkji0dcyl00wc2yw7a3lx0nqbbjl4m0l2mz4yp"; + sgr-iosevka-ss04 = "1jc1y9rgw8hnd7zqrn98b35r01kmr2nykqip63h6qal7l456m4s2"; + sgr-iosevka-ss05 = "06acxqhzfxlhqd083s57b15sx2vgq0r6pl9myp8syh1d9azbk899"; + sgr-iosevka-ss06 = "0g3zaxy9363p28kcv6a52dqb1swnrn3rwl6pfvanz92vrrjspr7n"; + sgr-iosevka-ss07 = "1bmdparw1hg3i8lnx8vwd467pwf4q94q80a62fcy87hppy3afryg"; + sgr-iosevka-ss08 = "16kgj158nhmlql0gkkfya04dy1gp9an4gk691f28n0mqhi7hygcr"; + sgr-iosevka-ss09 = "144x84qmh9pycn9v36q4z074vmnngn0chlyb8a8hyhgsyfqf7q7h"; + sgr-iosevka-ss10 = "0i9hsmw78yg75a3m80jlmdn2rn72snz69m0abvz7z94b7c99ffsb"; + sgr-iosevka-ss11 = "05a9azf7f64jdr5wwiy7djlmarl01mg6rfmzvrdd8a1a0nfcz1iz"; + sgr-iosevka-ss12 = "1nqa88csh170gs3bggs6v5ssaqljvpw1zxaclhmzdvyhcphrwd19"; + sgr-iosevka-ss13 = "1klhp2w99znj9qyz95z8jq3g23fs8jznya9dfzfy2i4hivw2gxv0"; + sgr-iosevka-ss14 = "1w84mqg0x46fbr8v72ccxc9a7sp52g4qb0x6l84wr8cm1fn7n21f"; + sgr-iosevka-ss15 = "05kdxmghhdyvlnc3wxzc5yyp00ybrq63fzh2kz3s4rwh11hhf0lq"; + sgr-iosevka-ss16 = "0a9i7plsfy8fawip70p5w3dkmjh4sy61iwi9pnl0ara7z23783dq"; + sgr-iosevka-ss17 = "1xmaqs54jhag7s18gfll94g0ixjqp2z5s69kwk48nznzpbfbpdsb"; + sgr-iosevka-ss18 = "09nq0a7b4hkiyi1prxpf6vwms9cnmby2dzn9k4y0xcax7m464531"; + sgr-iosevka-term = "1zr8cyq6578n8f3y9yyc0phs26hda1bf0bsd417wqcwsn88wfmx8"; + sgr-iosevka-term-curly = "0xlwljc2gmwh119x83p2pic5zwjqdymg7pbl2ginzilsrgjl2k0q"; + sgr-iosevka-term-curly-slab = "1vmpdws71sf1pf8nz3w7y0a64a5c3mp8f9w57bqmcn9vr22ymcl7"; + sgr-iosevka-term-slab = "1wkqdgy9nd4mvy4rsssvpis1r17ikpbl8mfx6bp80fh0lai97mxw"; + sgr-iosevka-term-ss01 = "1ly5ic5ihj00apb87am3kl38mywns8jizc7f4hniyrd9xhy1186z"; + sgr-iosevka-term-ss02 = "09lisy461dvppfv6sdk4i6vfrqhxyx558zdaflv9vskmfq8iq66d"; + sgr-iosevka-term-ss03 = "0nm84l4xk53l1q96hx8q63nbflgmivj3cq7z5mysv1z8jdp7isx3"; + sgr-iosevka-term-ss04 = "1y9kkasxmpm4n1vs5plsa25cgwvdi4jahn3ggdlxpl35yi4kxnr3"; + sgr-iosevka-term-ss05 = "1drngqgcibv6kfwjn3s2bik286ypj613q4p3fz0b7incniaz372j"; + sgr-iosevka-term-ss06 = "1rkqnj59hv1lzsplss3jk0jgz6q68qkg4a3200hv10rs9i2w2qxk"; + sgr-iosevka-term-ss07 = "1z6jh8qmc2063zgwbd00xi258grdillkc1nja69awdxiamv6hgf9"; + sgr-iosevka-term-ss08 = "022qw6frmmmpwbq6af8rysm8pbq713fiw92hkqi5k3j4v8dwl9v2"; + sgr-iosevka-term-ss09 = "1c32p4d46q3izif68ka6gr1hmq10snrlga5d7ypphmm8yxvavd9c"; + sgr-iosevka-term-ss10 = "1p497kqa386q5rvsfigzxdr0009agiw4bv4xxmb83pg3sl8bf7z9"; + sgr-iosevka-term-ss11 = "19kfvmwijd1kyw4bln0m5z7wpch9h44ny13ccxx0qmiv5y7wwm94"; + sgr-iosevka-term-ss12 = "1pnr7yd431xnym12vnlww6rxm1vfd9x24kqpx0323q3n61yjqzd6"; + sgr-iosevka-term-ss13 = "04nhps95s360vv4qr1pbzs1aj8zdalzv4ajdkawdssxaz1xs57c7"; + sgr-iosevka-term-ss14 = "1xvdpx8sa4ifgy9a3y65qcxj8cavisw4h7hjfivq4y0il79sl7nw"; + sgr-iosevka-term-ss15 = "03rs8b8yb7n1f7cp6zffgr7x20vx6hiag7a22ysx0zr2i4zp37i6"; + sgr-iosevka-term-ss16 = "1s86hmr7a6qwyf5m9q0npzzd25nvh9k1nlja1b8fnnlgchycwfbw"; + sgr-iosevka-term-ss17 = "0y5i99iy7r3z4cv87s3v3mxbadp3np16a3c65w41pjv86llkc30g"; + sgr-iosevka-term-ss18 = "0s5hdh61y5v17jrdpajgkzzrg0cqgcad6gvs9m8v55xi2zlqfxip"; } diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/data/fonts/ipaexfont/default.nix index 5223bc499d5c..986eab13a257 100644 --- a/pkgs/data/fonts/ipaexfont/default.nix +++ b/pkgs/data/fonts/ipaexfont/default.nix @@ -1,17 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip { - name = "ipaexfont-004.01"; +stdenvNoCC.mkDerivation { + pname = "ipaexfont"; + version = "004.01"; - url = "https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip"; + src = fetchzip { + url = "https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip"; + hash = "sha256-/87qJIb+v4qrtDy+ApfXxh59reOk+6RhGqFN98mc+8Q="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "0wp369kri33kb1mmiq4lpl9i4xnacw9fj63ycmkmlkq64s8qnjnx"; - meta = with lib; { description = "Japanese font package with Mincho and Gothic fonts"; longDescription = '' diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix index 9bc9b82db0e6..8a1f91da34fb 100644 --- a/pkgs/data/fonts/ipafont/default.nix +++ b/pkgs/data/fonts/ipafont/default.nix @@ -1,17 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip { - name = "ipafont-003.03"; +stdenvNoCC.mkDerivation { + pname = "ipafont"; + version = "003.03"; - url = "https://moji.or.jp/wp-content/ipafont/IPAfont/IPAfont00303.zip"; + src = fetchzip { + url = "https://moji.or.jp/wp-content/ipafont/IPAfont/IPAfont00303.zip"; + hash = "sha256-EzUNKuDNHr0NIXiqX09w99wtz1r2pZurR/izdgzTcAs="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "0lrjd0bfy36f9j85m12afg5nvr5id3sig2nmzs5qifskbd7mqv9h"; - meta = { description = "Japanese font package with Mincho and Gothic fonts"; longDescription = '' diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/pkgs/data/fonts/ir-standard-fonts/default.nix index 2e535255cc6b..d59c111c96b7 100644 --- a/pkgs/data/fonts/ir-standard-fonts/default.nix +++ b/pkgs/data/fonts/ir-standard-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "ir-standard-fonts"; - version = "unstable-2017-01-21"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "morealaz"; - repo = pname; - rev = "d36727d6c38c23c01b3074565667a2fe231fe18f"; + version = "20170121"; + + src = fetchFromGitHub { + owner = "molaeiali"; + repo = pname; + rev = version; + hash = "sha256-o1d8SBX3nf7g6Gh4OP+JRS+LNrHTQOIiHhW3VNCkDV0="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/ir-standard-fonts {} \; + + runHook postInstall ''; - sha256 = "0i2vzhwk77pm6fx5z5gxl026z9f35rhh3cvl003mry2lcg1x5rhp"; meta = with lib; { homepage = "https://github.com/morealaz/ir-standard-fonts"; diff --git a/pkgs/data/fonts/iwona/default.nix b/pkgs/data/fonts/iwona/default.nix index 85cf06df11fb..0d3944b2da10 100644 --- a/pkgs/data/fonts/iwona/default.nix +++ b/pkgs/data/fonts/iwona/default.nix @@ -1,16 +1,18 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, texlive }: -let - version = "0_995"; -in fetchzip { - name = "iwona-${version}"; - url = "http://jmn.pl/pliki/Iwona-otf-${version}.zip"; +stdenvNoCC.mkDerivation { + pname = "iwona"; + version = "0.995b"; - postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile *.otf -d $out/share/fonts/opentype + src = lib.head (builtins.filter (p: p.tlType == "run") texlive.iwona.pkgs); + + installPhase = '' + runHook preInstall + + install -Dm644 fonts/opentype/nowacki/iwona/*.otf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "1dcpn13bd31dw7ir0s722bv3nk136dy6qsab0kznjbzfqd7agswa"; meta = with lib; { description = "A two-element sans-serif typeface, created by Małgorzata Budyta"; diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix index 7bc6e5aad39a..bdc732ef1ab1 100644 --- a/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,18 +1,26 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "2.242"; -in -fetchzip { - name = "JetBrainsMono-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "jetbrains-mono"; + version = "2.304"; - url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; + src = fetchzip { + url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; + sha256 = "sha256-rv5A3F1zdcUJkmw09st1YxmEIkIoYJaMYGyZjic8jfc="; + stripRoot = false; + }; - sha256 = "sha256-flaUqpHmgebUzwPq0d+I3p9yqPmsV0kap04eApOQxdI="; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + doCheck = false; + dontFixup = true; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + installPhase = '' + runHook preInstall + install -Dm644 -t $out/share/fonts/truetype/ fonts/ttf/*.ttf + install -Dm644 -t $out/share/fonts/truetype/ fonts/variable/*.ttf + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/data/fonts/jost/default.nix index 457cb0d03c99..f5d3a1e48b5a 100644 --- a/pkgs/data/fonts/jost/default.nix +++ b/pkgs/data/fonts/jost/default.nix @@ -1,18 +1,22 @@ -{lib, fetchzip}: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "jost"; version = "3.5"; -in fetchzip { - name = "jost-${version}"; - url = "https://github.com/indestructible-type/Jost/releases/download/${version}/Jost.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + src = fetchzip { + url = "https://github.com/indestructible-type/Jost/releases/download/${version}/Jost.zip"; + hash = "sha256-ne81bMhmTzNZ/GGIzb7nCYh19vNLK+hJ3cP/zDxtiGM="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 fonts/otf/*.otf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256="0l78vhmbsyfmrva5wc76pskhxqryyg8q5xddpj9g5wqsddy525dq"; - meta = with lib; { homepage = "https://github.com/indestructible-type/Jost"; description = "A sans serif font by Indestructible Type"; diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index 136a3218761c..e99dfde411dc 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -1,17 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "0.044"; +stdenvNoCC.mkDerivation rec { + pname = "JuliaMono-ttf"; + version = "0.047"; -in -fetchzip { - name = "JuliaMono-ttf-${version}"; - url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz"; - sha256 = "sha256-KCU1eOSEWjYh6kPda/iCtZUIWIq5lK79uUCLl2w7SEg="; + src = fetchzip { + url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; + stripRoot = false; + hash = "sha256-tCZo48SBGdhcsP1wgaWkfWr3L3Yz+p/iqesLmarSWbk="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - tar xf $downloadedFile -C $out/share/fonts/truetype + mv *.ttf $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 5f5ce1048c5e..4e42cf1c4174 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -1,23 +1,25 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "junicode"; version = "1.003"; -in -fetchFromGitHub { - name = "${pname}-${version}"; - owner = "psb1558"; - repo = "Junicode-font"; - rev = "55d816d91a5e19795d9b66edec478379ee2b9ddb"; + src = fetchFromGitHub { + owner = "psb1558"; + repo = "Junicode-font"; + rev = "55d816d91a5e19795d9b66edec478379ee2b9ddb"; + hash = "sha256-eTiMgI8prnpR4H6sqKRaB3Gcnt4C5QWZalRajWW49G4="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' local out_ttf=$out/share/fonts/junicode-ttf mkdir -p $out_ttf - tar -f $downloadedFile -C $out_ttf --wildcards -x '*.ttf' --strip=2 - ''; + cp legacy/*.ttf $out_ttf - sha256 = "1v334gljmidh58kmrarz5pf348b0ac7vh25f1xs3gyvn78khh5nw"; + runHook postInstall + ''; meta = { homepage = "https://github.com/psb1558/Junicode-font"; diff --git a/pkgs/data/fonts/kacst/default.nix b/pkgs/data/fonts/kacst/default.nix index 38f85d2ad0fc..aa5ed8b547da 100644 --- a/pkgs/data/fonts/kacst/default.nix +++ b/pkgs/data/fonts/kacst/default.nix @@ -1,16 +1,21 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "kacst"; version = "2.01"; -in -fetchzip { - name = "kacst-${version}"; - url = "mirror://debian/pool/main/f/fonts-kacst/fonts-kacst_${version}+mry.orig.tar.bz2"; - sha256 = "sha256-pIO58CXfmKYRKYJ1oI+tjTwlKBRnkZ/CpIM2Xa0CDA4="; - postFetch = '' + src = fetchurl { + url = "mirror://debian/pool/main/f/fonts-${pname}/fonts-${pname}_${version}+mry.orig.tar.bz2"; + hash = "sha256-byiZzpYiMU6kJs+NSISfHPFzAnJtc8toNIbV/fKiMzg="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts - tar xjf $downloadedFile --strip-components=1 -C $out/share/fonts + cp -R kacst $out/share/fonts + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix index 1e07123badc3..1a2f51a6d625 100644 --- a/pkgs/data/fonts/kawkab-mono/default.nix +++ b/pkgs/data/fonts/kawkab-mono/default.nix @@ -1,22 +1,26 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip { - name = "kawkab-mono-20151015"; +stdenvNoCC.mkDerivation { + pname = "kawkab-mono"; + version = "20151015"; - url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip"; + src = fetchzip { + url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip"; + stripRoot = false; + hash = "sha256-arZTzXj7Ba5G4WF3eZVGNaONhOsYVPih9iBgsN/lg14="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "1vfrb7xs817najplncg7zl9j5yxj8qnwb7aqm2v9p9xwafa4d2yd"; - meta = { description = "An arab fixed-width font"; homepage = "https://makkuk.com/kawkab-mono/"; license = lib.licenses.ofl; }; } - - diff --git a/pkgs/data/fonts/khmeros/default.nix b/pkgs/data/fonts/khmeros/default.nix index 28db0d00981d..5df7c3637be8 100644 --- a/pkgs/data/fonts/khmeros/default.nix +++ b/pkgs/data/fonts/khmeros/default.nix @@ -1,20 +1,21 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "khmeros"; version = "5.0"; -in -fetchzip { - name = "khmeros-${version}"; - url = "mirror://debian/pool/main/f/fonts-khmeros/fonts-khmeros_${version}.orig.tar.xz"; - sha256 = "sha256-pS+7RQbGwlBxdCfSVxHmARCAkZrZttwYNlV/CrxqI+w="; - postFetch = '' - unpackDir="$TMPDIR/unpack" - mkdir "$unpackDir" - cd "$unpackDir" - tar xf "$downloadedFile" --strip-components=1 + src = fetchurl { + url = "mirror://debian/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.xz"; + hash = "sha256-gBcM9YHSuhbxvwfQTvywH/5kN921GOyvGtkROcmcBiw="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts cp *.ttf $out/share/fonts + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/pkgs/data/fonts/kochi-substitute-naga10/default.nix index 63ca3cf3e432..ae216a789707 100644 --- a/pkgs/data/fonts/kochi-substitute-naga10/default.nix +++ b/pkgs/data/fonts/kochi-substitute-naga10/default.nix @@ -1,24 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let version = "20030809"; -in -fetchzip { - name = "kochi-substitute-naga10-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "kochi-substitute-naga10"; + version = "20030809"; - url = "mirror://osdn/efont/5411/kochi-substitute-${version}.tar.bz2"; + src = fetchzip { + url = "mirror://osdn/efont/5411/kochi-substitute-${version}.tar.bz2"; + stripRoot = false; + hash = "sha256-dRJAxeVGYcNjLWqJJ+9Z2FW3BHrgyGRzlgM2x5YG3AM="; + }; - stripRoot = false; + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - mv $out/*/kochi-gothic-subst.ttf $out/share/fonts/truetype/kochi-gothic-subst-naga10.ttf - mv $out/*/kochi-mincho-subst.ttf $out/share/fonts/truetype/kochi-mincho-subst-naga10.ttf - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob - ''; + mv */kochi-gothic-subst.ttf $out/share/fonts/truetype/kochi-gothic-subst-naga10.ttf + mv */kochi-mincho-subst.ttf $out/share/fonts/truetype/kochi-mincho-subst-naga10.ttf - sha256 = "sha256-SZ7ZJYuCYU0NxWHlEszbvFmyZxWeBtmPL204PjIrS64="; + runHook postInstall + ''; meta = { description = "Japanese font, non-free replacement for MS Gothic and MS Mincho"; diff --git a/pkgs/data/fonts/kreative-square-fonts/default.nix b/pkgs/data/fonts/kreative-square-fonts/default.nix index c9e51319733f..f6a0023bd11f 100644 --- a/pkgs/data/fonts/kreative-square-fonts/default.nix +++ b/pkgs/data/fonts/kreative-square-fonts/default.nix @@ -1,22 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "kreative-square-fonts"; version = "unstable-2021-01-29"; -in -fetchFromGitHub { - name = "${pname}-${version}"; - owner = "kreativekorp"; - repo = "open-relay"; - rev = "084f05af3602307499981651eca56851bec01fca"; + src = fetchFromGitHub { + owner = "kreativekorp"; + repo = "open-relay"; + rev = "084f05af3602307499981651eca56851bec01fca"; + hash = "sha256-+ihosENczaGal3BGDIaJ/de0pf8txdtelSYMxPok6ww="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -Dm444 -t $out/share/fonts/truetype/ KreativeSquare/KreativeSquare.ttf install -Dm444 -t $out/share/fonts/truetype/ KreativeSquare/KreativeSquareSM.ttf + + runHook postInstall ''; - sha256 = "15vvbbzv6b3jh7lxg77viycdd7yf3y8lxy54vs3rsrsxwncg0pak"; meta = with lib; { description = "Fullwidth scalable monospace font designed specifically to support pseudographics, semigraphics, and private use characters"; diff --git a/pkgs/data/fonts/lalezar-fonts/default.nix b/pkgs/data/fonts/lalezar-fonts/default.nix index 31a857bfda05..f54c17b51f3d 100644 --- a/pkgs/data/fonts/lalezar-fonts/default.nix +++ b/pkgs/data/fonts/lalezar-fonts/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "lalezar-fonts"; version = "unstable-2017-02-28"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "BornaIz"; - repo = "Lalezar"; - rev = "238701c4241f207e92515f845a199be9131c1109"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "BornaIz"; + repo = "Lalezar"; + rev = "238701c4241f207e92515f845a199be9131c1109"; + hash = "sha256-95z58ABTx53aREXRpj9xgclX9kuGiQiiKBwqwnF6f8g="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/lalezar-fonts cp -v $( find . -name '*.ttf') $out/share/fonts/lalezar-fonts + + runHook postInstall ''; - sha256 = "0jmwhr2dqgj3vn0v26jh6c0id6n3wd6as3bq39xa870zlk7v307b"; meta = with lib; { homepage = "https://github.com/BornaIz/Lalezar"; diff --git a/pkgs/data/fonts/lao/default.nix b/pkgs/data/fonts/lao/default.nix index abe359410b3a..d7d5d3ddd4b1 100644 --- a/pkgs/data/fonts/lao/default.nix +++ b/pkgs/data/fonts/lao/default.nix @@ -1,16 +1,21 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "lao"; version = "0.0.20060226"; -in -fetchzip { - name = "lao-${version}"; - url = "mirror://debian/pool/main/f/fonts-lao/fonts-lao_${version}.orig.tar.xz"; - sha256 = "sha256-Ti3DNOgLR5VBJ1mSe8M+qs4UYbCR7qOPgqxRfmHa+jY="; - postFetch = '' + src = fetchurl { + url = "mirror://debian/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.xz"; + hash = "sha256-DlgdyfhxxzVkNIL+NGsQ+PRlNkCuG3v2OahkIEYx60o="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts - tar xf $downloadedFile --strip-components=1 -C $out/share/fonts fonts-lao-${version}/Phetsarath_OT.ttf + cp Phetsarath_OT.ttf $out/share/fonts + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/last-resort/default.nix b/pkgs/data/fonts/last-resort/default.nix index 8cad990ac973..1932fd6da8a9 100644 --- a/pkgs/data/fonts/last-resort/default.nix +++ b/pkgs/data/fonts/last-resort/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let - version = "14.000"; -in fetchurl { - name = "last-resort-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "last-resort"; + version = "15.000"; - url = "https://github.com/unicode-org/last-resort-font/releases/download/${version}/LastResortHE-Regular.ttf"; - downloadToTemp = true; + src = fetchurl { + url = "https://github.com/unicode-org/last-resort-font/releases/download/${version}/LastResortHE-Regular.ttf"; + hash = "sha256-Qyo/tuBvBHnG/LW8sUAy62xpeqlXfyfwjUCbr4vJEag="; + }; - postFetch = '' - install -D -m 0644 $downloadedFile $out/share/fonts/truetype/LastResortHE-Regular.ttf + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -D -m 0644 $src $out/share/fonts/truetype/LastResortHE-Regular.ttf + + runHook postInstall ''; - recursiveHash = true; - sha256 = "sha256-rb69V4oExSFx4GpedpyVvGuS6o+MxmxTCSZhoe9kUhI="; - meta = with lib; { description = "Fallback font of last resort"; homepage = "https://github.com/unicode-org/last-resort-font"; diff --git a/pkgs/data/fonts/lato/default.nix b/pkgs/data/fonts/lato/default.nix index 76effcf97cd0..ff1cc62bee0e 100644 --- a/pkgs/data/fonts/lato/default.nix +++ b/pkgs/data/fonts/lato/default.nix @@ -1,17 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip { - name = "lato-2.0"; +stdenvNoCC.mkDerivation { + pname = "lato"; + version = "2.0"; - url = "https://www.latofonts.com/download/Lato2OFL.zip"; + src = fetchzip { + url = "https://www.latofonts.com/download/Lato2OFL.zip"; + stripRoot = false; + hash = "sha256-n1TsqigCQIGqyGLGTjLtjHuBf/iCwRlnqh21IHfAuXI="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/lato + installPhase = '' + runHook preInstall + + install -Dm644 Lato2OFL/*.ttf -t $out/share/fonts/lato + + runHook postInstall ''; - sha256 = "1amwn6vcaggxrd2s4zw21s2pr47zmzdf2xfy4x9lxa2cd9bkhvg5"; - meta = with lib; { homepage = "https://www.latofonts.com/"; diff --git a/pkgs/data/fonts/lexend/default.nix b/pkgs/data/fonts/lexend/default.nix index 3efb1886b171..9bb00bf10595 100644 --- a/pkgs/data/fonts/lexend/default.nix +++ b/pkgs/data/fonts/lexend/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "lexend"; - version = "0.pre+date=2022-01-27"; + version = "0.pre+date=2022-09-22"; src = fetchFromGitHub { owner = "googlefonts"; repo = pname; - rev = "57e6c14e2a9b457e8376044a31525c2100297e9c"; - sha256 = "sha256-+tPggQIO50a8kOSnOVN/MR9ZwX5xZqYVNZO79eog9QA="; + rev = "cd26b9c2538d758138c20c3d2f10362ed613854b"; + sha256 = "ZKogntyJ/44GBZmFwbtw5Ujw5Gnvv0tVB59ciKqR4c8="; }; installPhase = '' @@ -19,8 +19,8 @@ stdenvNoCC.mkDerivation rec { cd fonts for f in *; do - mkdir -p $out/share/fonts/truetype/lexend/$f - install $f/ttf/* $out/share/fonts/truetype/lexend/$f/ + install -D -t $out/share/fonts/truetype/lexend/$f $f/ttf/* + install -D -t $out/share/fonts/variable/lexend/$f $f/variable/* done runHook postInstall diff --git a/pkgs/data/fonts/liberastika/default.nix b/pkgs/data/fonts/liberastika/default.nix index 5435a601d147..7c716c1a354b 100644 --- a/pkgs/data/fonts/liberastika/default.nix +++ b/pkgs/data/fonts/liberastika/default.nix @@ -1,31 +1,29 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "liberastika"; version = "1.1.5"; -in fetchzip rec { - name = "liberastika-${version}"; - url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip"; + src = fetchzip { + url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip"; + stripRoot = false; + hash = "sha256-woUpOmxhj6eEw7PKJ8EyRcs3ORj0gCZhxHP5a5dy5z0="; + }; - stripRoot = false; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts - install -Dm644 $out/*.ttf -t $out/share/fonts/truetype - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "sha256-1hoETOjPRUIzzM+NUR+g/Ph16jXmH2ARSlZHjgEwoeM="; - meta = with lib; { description = "Liberation Sans fork with improved cyrillic support"; homepage = "https://sourceforge.net/projects/lib-ka/"; license = licenses.gpl2; platforms = platforms.all; - hydraPlatforms = []; maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix index 8f58cb92baa4..cc60f8096531 100644 --- a/pkgs/data/fonts/libertinus/default.nix +++ b/pkgs/data/fonts/libertinus/default.nix @@ -1,18 +1,20 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "libertinus"; version = "7.040"; -in fetchurl rec { - name = "libertinus-${version}"; - url = "https://github.com/alerque/libertinus/releases/download/v${version}/Libertinus-${version}.tar.xz"; - sha256 = "0z658r88p52dyrcslv0wlccw0sw7m5jz8nbqizv95nf7bfw96iyk"; - downloadToTemp = true; - recursiveHash = true; + src = fetchurl { + url = "https://github.com/alerque/libertinus/releases/download/v${version}/Libertinus-${version}.tar.xz"; + hash = "sha256-f+nwInItHBzGfcLCihELO7VbrjV1GWFg0kIsiTM7OFA="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m644 -Dt $out/share/fonts/opentype static/OTF/*.otf + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/libre-baskerville/default.nix b/pkgs/data/fonts/libre-baskerville/default.nix index a4be7b5b3e6b..56d83554e9ca 100644 --- a/pkgs/data/fonts/libre-baskerville/default.nix +++ b/pkgs/data/fonts/libre-baskerville/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "libre-baskerville-1.000"; +stdenvNoCC.mkDerivation rec { + pname = "libre-baskerville"; + version = "1.000"; - owner = "impallari"; - repo = "Libre-Baskerville"; - rev = "2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Baskerville"; + rev = "2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f"; + hash = "sha256-1EXi1hxFpc7pFsLbEj1xs9LqjeIf3XBol/8HdKNROUU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/truetype *.ttf - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "1kpji85d1mgwq8b4fh1isznrhsrv32la3wf058rwjmhx5a3l7yaj"; + runHook postInstall + ''; meta = with lib; { description = "A webfont family optimized for body text"; diff --git a/pkgs/data/fonts/libre-bodoni/default.nix b/pkgs/data/fonts/libre-bodoni/default.nix index 63bbf8eba724..cd55c10d2e64 100644 --- a/pkgs/data/fonts/libre-bodoni/default.nix +++ b/pkgs/data/fonts/libre-bodoni/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "libre-bodoni-2.000"; +stdenvNoCC.mkDerivation rec { + pname = "libre-bodoni"; + version = "2.000"; - owner = "impallari"; - repo = "Libre-Bodoni"; - rev = "995a40e8d6b95411d660cbc5bb3f726ffd080c7d"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Bodoni"; + rev = "995a40e8d6b95411d660cbc5bb3f726ffd080c7d"; + hash = "sha256-yfqVeT/JiAT+fsqkXUxqlz4sEEFwEJUdvFTAzuqejtk="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/opentype */v2000\ -\ initial\ glyphs\ migration/OTF/*.otf - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "0my0i5a7f0d27m6dcdirjmlcnswqqfp8gl3ccxa5f2wkn3qlzkvz"; + runHook postInstall + ''; meta = with lib; { description = "Bodoni fonts adapted for today's web requirements"; diff --git a/pkgs/data/fonts/libre-franklin/default.nix b/pkgs/data/fonts/libre-franklin/default.nix index b41ae8878cc2..f6fe791743cd 100644 --- a/pkgs/data/fonts/libre-franklin/default.nix +++ b/pkgs/data/fonts/libre-franklin/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "libre-franklin-1.014"; +stdenvNoCC.mkDerivation rec { + pname = "libre-franklin"; + version = "1.014"; - owner = "impallari"; - repo = "Libre-Franklin"; - rev = "006293f34c47bd752fdcf91807510bc3f91a0bd3"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Franklin"; + rev = "006293f34c47bd752fdcf91807510bc3f91a0bd3"; + hash = "sha256-GR1KHiQ1lTOmU8eAPR2pxUlMpWiW2EDMG78VDjELxDU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/opentype */OTF/*.otf - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "0aq280m01pbirkzga432340aknf2m5ggalw0yddf40sqz7falykf"; + runHook postInstall + ''; meta = with lib; { description = "A reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic."; diff --git a/pkgs/data/fonts/linja-pi-pu-lukin/default.nix b/pkgs/data/fonts/linja-pi-pu-lukin/default.nix index 426acd2668d7..40f330cec7c4 100644 --- a/pkgs/data/fonts/linja-pi-pu-lukin/default.nix +++ b/pkgs/data/fonts/linja-pi-pu-lukin/default.nix @@ -1,16 +1,22 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -fetchurl { +stdenvNoCC.mkDerivation { pname = "linja-pi-pu-lukin"; version = "unstable-2021-10-29"; - url = "https://web.archive.org/web/20211029000000/https://jansa-tp.github.io/linja-pi-pu-lukin/PuLukin.otf"; - hash = "sha256-VPdrMHWpiokFYON4S8zT+pSs4TsB17S8TZRtkjqIqU8="; + src = fetchurl { + url = "https://web.archive.org/web/20211029000000/https://jansa-tp.github.io/linja-pi-pu-lukin/PuLukin.otf"; + hash = "sha256-Mf7P9fLGiG7L555Q3wRaI/PRv/TIs0njLq2IzIbc5Wo="; + }; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - install -D $downloadedFile $out/share/fonts/opentype/linja-pi-pu-lukin.otf + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -D $src $out/share/fonts/opentype/linja-pi-pu-lukin.otf + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/lklug-sinhala/default.nix b/pkgs/data/fonts/lklug-sinhala/default.nix index 45f907f1cf07..817dbbb25312 100644 --- a/pkgs/data/fonts/lklug-sinhala/default.nix +++ b/pkgs/data/fonts/lklug-sinhala/default.nix @@ -1,16 +1,21 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "lklug-sinhala"; version = "0.6"; -in -fetchzip { - name = "lklug-sinhala-${version}"; - url = "mirror://debian/pool/main/f/fonts-lklug-sinhala/fonts-lklug-sinhala_${version}.orig.tar.xz"; - sha256 = "sha256-Fy+QnAajA4yLf/I1vOQll5pRd0ZLfLe8UXq4XMC9qNc="; - postFetch = '' - mkdir -p $out/share/fonts - tar xf $downloadedFile --strip-components=1 -C $out/share/fonts fonts-lklug-sinhala-${version}/lklug.ttf + src = fetchurl { + url = "mirror://debian/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.xz"; + hash = "sha256-oPCCa01PMQcCK5fEILgXjrGzoDg+UvxkqK6AgeQaKio="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/lmmath/default.nix b/pkgs/data/fonts/lmmath/default.nix index 0530141317b8..3881f0f0f4e7 100644 --- a/pkgs/data/fonts/lmmath/default.nix +++ b/pkgs/data/fonts/lmmath/default.nix @@ -1,18 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "lmmath"; version = "1.959"; -in fetchzip rec { - name = "lmmath-${version}"; - url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip"; - postFetch = '' + src = fetchzip { + url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip"; + hash = "sha256-et/WMhfZZYgP0S7ZmI6MZK5owv9bSoMBXFX6yGSng5Y="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/opentype/ mkdir -p $out/share/doc/latinmodern-math-${version}/ - unzip -j $downloadedFile "*/otf/*.otf" -d $out/share/fonts/opentype/ - unzip -j $downloadedFile "*/doc/*.txt" -d $out/share/doc/latinmodern-math-${version}/ + cp otf/*.otf $out/share/fonts/opentype/ + cp doc/*.txt $out/share/doc/latinmodern-math-${version}/ + + runHook postInstall ''; - sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn"; meta = with lib; { description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth"; diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index af0e70331351..85aa7060ea05 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -1,26 +1,27 @@ -{ fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip { - name = "lmodern-2.005"; +stdenvNoCC.mkDerivation rec { + pname = "lmodern"; + version = "2.005"; - url = "mirror://debian/pool/main/l/lmodern/lmodern_2.005.orig.tar.gz"; + src = fetchurl { + url = "mirror://debian/pool/main/l/${pname}/${pname}_${version}.orig.tar.gz"; + hash = "sha256-xlUuZt6rjW0pX4t6PKWAHkkv3PisGCj7ZwatZPAUNxk="; + }; - postFetch = '' - tar xzvf $downloadedFile + installPhase = '' + runHook preInstall mkdir -p $out/texmf-dist/ mkdir -p $out/share/fonts/ - cp -r lmodern-2.005/* $out/texmf-dist/ - cp -r lmodern-2.005/fonts/{opentype,type1} $out/share/fonts/ + cp -r * $out/texmf-dist/ + cp -r fonts/{opentype,type1} $out/share/fonts/ - ln -s -r $out/texmf* $out/share/ + runHook postInstall ''; - sha256 = "sha256-ySdKUt8o5FqmpdnYSzbGJ1f9t8VmKYXqPt53e1/E/FA="; - meta = { description = "Latin Modern font"; }; } - diff --git a/pkgs/data/fonts/lohit-fonts/default.nix b/pkgs/data/fonts/lohit-fonts/default.nix index 64ae831767bb..53bccc4a40a7 100644 --- a/pkgs/data/fonts/lohit-fonts/default.nix +++ b/pkgs/data/fonts/lohit-fonts/default.nix @@ -1,35 +1,38 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: let fonts = { - assamese = { label = "Assamese"; version = "2.91.5"; sha256 = "06cw416kgw0m6883n5ixmpniinsd747rdmacf06z83w1hqwj2js6"; }; - bengali = { label = "Bengali"; version = "2.91.5"; sha256 = "1j7gfmkzzyk9mivy09a9yfqxpidw52hw48dyh4qkci304mspcbvr"; }; - devanagari = { label = "Devanagari script"; version = "2.95.4"; sha256 = "1c17xirzx5rf7xpmkrm94jf9xrzckyagwnqn3pyag28lyj8x67m5"; }; - gujarati = { label = "Gujarati"; version = "2.92.4"; sha256 = "0xdgmkikz532zxj239wr73l24qnzxhra88f52146x7fsb7gpvfb1"; }; - gurmukhi = { label = "Gurmukhi script"; version = "2.91.2"; sha256 = "1xk1qvc0xwcmjcavj9zmy4bbphffdlv7sldmqlk30ch5fy5r0ypb"; }; # renamed from Punjabi - kannada = { label = "Kannada"; version = "2.5.4" ; sha256 = "0sax56xg98p2nf0nsvba42hhz946cs7q0gidiz9zfpb6pbgwxdgg"; }; - malayalam = { label = "Malayalam"; version = "2.92.2"; sha256 = "18sca59fj9zvqhagbix35i4ld2n4mwv57q04pijl5gvpyfb1abs8"; }; - marathi = { label = "Marathi"; version = "2.94.2"; sha256 = "0cjjxxlhqmdmhr35s4ak0ma89456daik5rqrn6pdzj39098lmci7"; }; - nepali = { label = "Nepali"; version = "2.94.2"; sha256 = "1p7lif136xakfqkbv6p1lb56rs391b25vn4bxrjdfvsk0r0h0ry3"; }; - odia = { label = "Odia"; version = "2.91.2"; sha256 = "0z5rc4f9vfrfm8h2flzf5yx44x50jqdmmzifkmjwczib3hpg2ila"; }; # renamed from Oriya - tamil-classical = { label = "Classical Tamil"; version = "2.5.4" ; sha256 = "0svmj3dhk0195mhdwjhi3qgwa83223irb32fp12782sj9njdvyi2"; }; - tamil = { label = "Tamil"; version = "2.91.3"; sha256 = "0qyw9p8alyvjryyw8a25q3gfyrhby49mjb0ydgggf5ckd07kblcm"; }; - telugu = { label = "Telugu"; version = "2.5.5" ; sha256 = "07p41686ypmclj9d3njp01lvrgssqxa4s5hsbrqfjrnwd3rjspzr"; }; + assamese = { label = "Assamese"; version = "2.91.5"; hash = "sha256-Oo/hHHFg/Nu3eaZLMdBclY90lKU2AMFUclyXHxGaAgg="; }; + bengali = { label = "Bengali"; version = "2.91.5"; hash = "sha256-QGf94TdQS2c9+wSSDK4Mknw5ubCGTuvg0xoNaJdirBc="; }; + devanagari = { label = "Devanagari script"; version = "2.95.4"; hash = "sha256-6CbOCqOei5eO1zwNQZvB+fFDkqxvJnK82z+zmClhRAE="; }; + gujarati = { label = "Gujarati"; version = "2.92.4"; hash = "sha256-BpwibF0/HXDvXpDEek0fj73cxo2QC1hSfQ49Q/ZOZg8="; }; + gurmukhi = { label = "Gurmukhi script"; version = "2.91.2"; hash = "sha256-5iLFW2FEE5LBqoALi+3sUjwC0ADntsp259TP+bYwR9g="; }; # renamed from Punjabi + kannada = { label = "Kannada"; version = "2.5.4" ; hash = "sha256-7y2u0tBdNYCeY7Y+aqhxXP7Qv6GglJeVO1wvM9CzyIQ="; }; + malayalam = { label = "Malayalam"; version = "2.92.2"; hash = "sha256-SzM38vuAlP9OMC8kUuHQylmH8TUjCeg1y/Zcu2I2bjA="; }; + marathi = { label = "Marathi"; version = "2.94.2"; hash = "sha256-jK1Gwcr5gqzRNkbIxs4V/OYgUlUEpU0OYzKDTkiMlqM="; }; + nepali = { label = "Nepali"; version = "2.94.2"; hash = "sha256-OX1ekxeSbVGOrdbZ3Jvu4nii0zkgbuij10JIzqRcFx4="; }; + odia = { label = "Odia"; version = "2.91.2"; hash = "sha256-3/eczBGGZj4QPs7KY0as9zk5HaBfhgz6YgU0qmwpVcA="; }; # renamed from Oriya + tamil-classical = { label = "Classical Tamil"; version = "2.5.4" ; hash = "sha256-6SsddTCEUHMoF7X4+i7eXimmMuktfFAl8uz95RwM+yg="; }; + tamil = { label = "Tamil"; version = "2.91.3"; hash = "sha256-8lcNw87o9lhQsKwCqwBSfx7rhcrH/eEqac7EsA9/w/E="; }; + telugu = { label = "Telugu"; version = "2.5.5" ; hash = "sha256-cZh93NfEB+5S1JeEowtBMJ0nbZsFGpbEp2WAtzxrA8A="; }; }; gplfonts = { # GPL fonts removed from later releases - kashmiri = { label = "Kashmiri"; version = "2.4.3" ; sha256 = "0c6whklad9bscymrlcbxj4fdvh4cdf40vb61ykbp6mapg6dqxwhn"; }; - konkani = { label = "Konkani"; version = "2.4.3" ; sha256 = "0pcb5089dabac1k6ymqnbnlyk7svy2wnb5glvhsd8glycjhrcp70"; }; - maithili = { label = "Maithili"; version = "2.4.3" ; sha256 = "1yfwv7pcj7k4jryz0s6mb56bq7fs15g56y7pi5yd89q1f8idk6bc"; }; - sindhi = { label = "Sindhi"; version = "2.4.3" ; sha256 = "1iywzyy185bvfsfi5pp11c8bzrp40kni2cpwcmxqwha7c9v8brlc"; }; + kashmiri = { label = "Kashmiri"; version = "2.4.3" ; hash = "sha256-6T2QaWnt3+e5nr4vbk44FouqmeWKzia1lSf8S/bvqCs="; }; + konkani = { label = "Konkani"; version = "2.4.3" ; hash = "sha256-hVy2rxrUTPDeNnugi3Bk7z0JqGmk4/yeUsAoI/4R7A8="; }; + maithili = { label = "Maithili"; version = "2.4.3" ; hash = "sha256-ikDcpJqdizAYRpgoebzqxOEeodJ6C3fO2rsqGzC0HCs="; }; + sindhi = { label = "Sindhi"; version = "2.4.3" ; hash = "sha256-wU3B9fh+8E1bFBMnakzmajY7eNKzed9+eYL5AOxyNQI="; }; }; - mkpkg = license: name: {label, version, sha256}: fetchzip { - name = "lohit-${name}-${version}"; + mkpkg = license: pname: {label, version, hash}: stdenvNoCC.mkDerivation { + inherit pname version; - url = "https://releases.pagure.org/lohit/lohit-${name}-ttf-${version}.tar.gz"; + src = fetchurl { + url = "https://releases.pagure.org/lohit/lohit-${pname}-ttf-${version}.tar.gz"; + inherit hash; + }; - postFetch = '' - tar -xzf $downloadedFile --strip-components=1 + installPhase = '' + runHook preInstall mkdir -p $out/share/fonts/truetype cp -v *.ttf $out/share/fonts/truetype/ @@ -37,11 +40,11 @@ let mkdir -p $out/etc/fonts/conf.d cp -v *.conf $out/etc/fonts/conf.d - mkdir -p "$out/share/doc/lohit-${name}" - cp -v ChangeLog* COPYRIGHT* "$out/share/doc/lohit-${name}/" - ''; + mkdir -p "$out/share/doc/lohit-${pname}" + cp -v ChangeLog* COPYRIGHT* "$out/share/doc/lohit-${pname}/" - inherit sha256; + runHook postInstall + ''; meta = { inherit license; diff --git a/pkgs/data/fonts/luculent/default.nix b/pkgs/data/fonts/luculent/default.nix index 9d61931db365..1347af957e46 100644 --- a/pkgs/data/fonts/luculent/default.nix +++ b/pkgs/data/fonts/luculent/default.nix @@ -1,17 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let version = "2.0.0"; in -fetchzip { - name = "luculent-${version}"; - url = "http://www.eastfarthing.com/luculent/luculent.tar.xz"; +stdenvNoCC.mkDerivation rec { + pname = "luculent"; + version = "2.0.0"; + + src = fetchurl { + url = "http://www.eastfarthing.com/${pname}/${pname}.tar.xz"; + hash = "sha256-6NxLnTBnvHmTUTFa2wW0AuKPEbCqzaWQyiFVnF0sBqU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xJf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype - ''; - sha256 = "1m3g64galwna1xjxb1fczmfplm6c1fn3ra1ln7f0vkm0ah5m4lbv"; + runHook postInstall + ''; meta = with lib; { description = "luculent font"; diff --git a/pkgs/data/fonts/lxgw-neoxihei/default.nix b/pkgs/data/fonts/lxgw-neoxihei/default.nix new file mode 100644 index 000000000000..9d05689657e0 --- /dev/null +++ b/pkgs/data/fonts/lxgw-neoxihei/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchurl +, stdenvNoCC +}: + +stdenvNoCC.mkDerivation rec { + pname = "lxgw-neoxihei"; + version = "1.005"; + + src = fetchurl { + url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; + hash = "sha256-IvbbeBjpFz9zHt3mHu5vY8sLETKnvOMv7eHjANQ2GlA="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fonts/truetype/LXGWNeoXiHei.ttf + + runHook postInstall + ''; + + meta = with lib; { + description = "A Simplified Chinese sans-serif font derived from IPAex Gothic"; + homepage = "https://github.com/lxgw/LxgwNeoXiHei"; + license = licenses.ipa; + platforms = platforms.all; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/data/fonts/lxgw-wenkai/default.nix b/pkgs/data/fonts/lxgw-wenkai/default.nix index bb36d9a920a5..c16a5f774922 100644 --- a/pkgs/data/fonts/lxgw-wenkai/default.nix +++ b/pkgs/data/fonts/lxgw-wenkai/default.nix @@ -1,22 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai"; - version = "1.245.1"; + version = "1.250"; - url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/lxgw-wenkai-v${version}.tar.gz"; + src = fetchurl { + url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz"; + hash = "sha256-Nkd0xXYCnR0NZAk/JCxy+zOlxIxD52Px4F9o2L9mgRE="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - mv $out/*.ttf $out/share/fonts/truetype + mv *.ttf $out/share/fonts/truetype - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + runHook postInstall ''; - hash = "sha256-4RQ+aqAZPQH3t6v2KvrNWgYT3J3uMuY34XTuvyLEOeI="; - meta = with lib; { homepage = "https://lxgw.github.io/"; description = "An open-source Chinese font derived from Fontworks' Klee One"; diff --git a/pkgs/data/fonts/manrope/default.nix b/pkgs/data/fonts/manrope/default.nix index 9bf4f32caeb2..7c9ab17a79d1 100644 --- a/pkgs/data/fonts/manrope/default.nix +++ b/pkgs/data/fonts/manrope/default.nix @@ -1,18 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "manrope"; version = "3"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "sharanda"; - repo = pname; - rev = "3bd68c0c325861e32704470a90dfc1868a5c37e9"; - sha256 = "1h4chkfbp75hrrqqarf28ld4yb7hfrr7q4w5yz96ivg94lbwlnld"; - postFetch = '' - tar xf $downloadedFile --strip=1 + + src = fetchFromGitHub { + owner = "sharanda"; + repo = pname; + rev = "3bd68c0c325861e32704470a90dfc1868a5c37e9"; + hash = "sha256-Gm7mUD/Ud2Rf8mA3jwUL7RE8clCmb6SETOskuj6r1sw="; + }; + + installPhase = '' + runHook preInstall + install -Dm644 -t $out/share/fonts/opentype "desktop font"/* + + runHook postInstall ''; + meta = with lib; { description = "Open-source modern sans-serif font family"; homepage = "https://github.com/sharanda/manrope"; diff --git a/pkgs/data/fonts/maple-font/default.nix b/pkgs/data/fonts/maple-font/default.nix index 30e0c1a8b67a..2cf22746e3c1 100644 --- a/pkgs/data/fonts/maple-font/default.nix +++ b/pkgs/data/fonts/maple-font/default.nix @@ -35,19 +35,27 @@ let }; in { - Mono-v5 = maple-font { + Mono = maple-font { pname = "MapleMono"; - version = "5.5"; - sha256 = "sha256-xkZ9NefjWHPjWNW8LGM8CgT2Zrg4j1evvx1K56sUzR8="; + version = "6.1"; + sha256 = "sha256-JWyZH2F9lwWt9ROhuOtVf8HIjUAWkhCbXium0iNQry8="; desc = "monospace"; }; - Mono-NF-v5 = maple-font { + + NF = maple-font { pname = "MapleMono-NF"; - version = "5.5"; - sha256 = "sha256-cPVGuH1CSfnRvQ4ehBvOVno7CT6Popc1Nnpcn5uJoQY="; + version = "6.1"; + sha256 = "sha256-z0qoPMvowasHRK1IUMnx+lufUXqZkT3WBLtpEkP4V4I="; desc = "Nerd Font"; }; + SC-NF = maple-font { + pname = "MapleMono-SC-NF"; + version = "6.1"; + sha256 = "sha256-cp7pASXEiP8Td8yR+5hKpZyTST0o0pxgck4llHps4go="; + desc = "Nerd Font SC"; + }; + } diff --git a/pkgs/data/fonts/marathi-cursive/default.nix b/pkgs/data/fonts/marathi-cursive/default.nix index 8c228fd91a75..7f6bedc75e8b 100644 --- a/pkgs/data/fonts/marathi-cursive/default.nix +++ b/pkgs/data/fonts/marathi-cursive/default.nix @@ -1,19 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let - version = "2.0"; -in fetchzip rec { - name = "marathi-cursive-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "marathi-cursive"; + version = "2.1"; - url = "https://github.com/MihailJP/MarathiCursive/releases/download/v${version}/MarathiCursive-${version}.tar.xz"; + src = fetchurl { + url = "https://github.com/MihailJP/MarathiCursive/releases/download/v${version}/MarathiCursive-${version}.tar.xz"; + hash = "sha256-C/z8ALV9bht0SaYqACO5ulSVCk1d6wBwvpVC4ZLgtek="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xJf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/marathi-cursive *.otf *.ttf - install -m444 -Dt $out/share/doc/${name} README *.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README *.txt - sha256 = "17pj60ajnjghxhxka8a046mz6vfwr79wnby7xd6pg5hgncin2hgg"; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/MihailJP/MarathiCursive"; diff --git a/pkgs/data/fonts/martian-mono/default.nix b/pkgs/data/fonts/martian-mono/default.nix index 98f20082be98..ca15d938d95f 100644 --- a/pkgs/data/fonts/martian-mono/default.nix +++ b/pkgs/data/fonts/martian-mono/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "martian-mono"; - version = "0.9.2"; + version = "1.0.0"; src = fetchzip { url = "https://github.com/evilmartians/mono/releases/download/v${version}/martian-mono-${version}-otf.zip"; - sha256 = "sha256-whIR7BaEflm/VsF60Xck6ZJDLzTugaTOogHzcEtwCsM="; + sha256 = "sha256-hC08IHWqg+x3qoEf4EL98ZbGeqdwjnMpDovEiWrWPpI="; stripRoot = false; }; diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix index 80c887f58913..49d52ebb7799 100644 --- a/pkgs/data/fonts/material-design-icons/default.nix +++ b/pkgs/data/fonts/material-design-icons/default.nix @@ -1,25 +1,31 @@ -{ lib, fetchFromGitHub }: +{ lib, fetchFromGitHub, stdenvNoCC }: -let - version = "6.6.96"; -in fetchFromGitHub { - name = "material-design-icons-${version}"; - owner = "Templarian"; - repo = "MaterialDesign-Webfont"; - rev = "v${version}"; +stdenvNoCC.mkDerivation rec { + pname = "material-design-icons"; + version = "7.1.96"; - postFetch = '' - tar xf $downloadedFile --strip=1 - mkdir -p $out/share/fonts/{eot,truetype,woff,woff2} - cp fonts/*.eot $out/share/fonts/eot/ - cp fonts/*.ttf $out/share/fonts/truetype/ - cp fonts/*.woff $out/share/fonts/woff/ - cp fonts/*.woff2 $out/share/fonts/woff2/ + src = fetchFromGitHub { + owner = "Templarian"; + repo = "MaterialDesign-Webfont"; + rev = "v${version}"; + sha256 = "sha256-qS7zJQkd0Q5wYLgYXa63fD3Qi2T5JWD6vXW2FoFzZxo="; + sparseCheckout = [ "fonts" ]; + }; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/fonts/"{eot,truetype,woff,woff2} + cp fonts/*.eot "$out/share/fonts/eot/" + cp fonts/*.ttf "$out/share/fonts/truetype/" + cp fonts/*.woff "$out/share/fonts/woff/" + cp fonts/*.woff2 "$out/share/fonts/woff2/" + + runHook postInstall ''; - sha256 = "sha256-rfDb9meTF0Y0kiCQd11SgnntQnw34Ti/IXn35xaPO1M="; meta = with lib; { - description = "4600+ Material Design Icons from the Community"; + description = "7000+ Material Design Icons from the Community"; longDescription = '' Material Design Icons' growing icon collection allows designers and developers targeting various platforms to download icons in the format, @@ -28,6 +34,6 @@ in fetchFromGitHub { homepage = "https://materialdesignicons.com"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ vlaci ]; + maintainers = with maintainers; [ vlaci PlayerNameHere ]; }; } diff --git a/pkgs/data/fonts/material-icons/default.nix b/pkgs/data/fonts/material-icons/default.nix index 656be1b153eb..f03e8683e509 100644 --- a/pkgs/data/fonts/material-icons/default.nix +++ b/pkgs/data/fonts/material-icons/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { + pname = "material-icons"; version = "3.0.1"; -in fetchFromGitHub { - name = "material-icons-${version}"; - owner = "google"; - repo = "material-design-icons"; - rev = version; + src = fetchFromGitHub { + owner = "google"; + repo = "material-design-icons"; + rev = version; + hash = "sha256-4FphNJCsaLWzlVR4TmXnDBid0EVj39fkeoh5j1leBZ8="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype cp iconfont/*.ttf $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "1syy6v941lb8nqxhdf7mfx28v05lwrfnq53r3c1ym13x05l9kchp"; meta = with lib; { description = "System status icons by Google, featuring material design"; diff --git a/pkgs/data/fonts/material-symbols/default.nix b/pkgs/data/fonts/material-symbols/default.nix new file mode 100644 index 000000000000..5cd79834b3ca --- /dev/null +++ b/pkgs/data/fonts/material-symbols/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, rename +}: + +stdenvNoCC.mkDerivation { + pname = "material-symbols"; + version = "unstable-2023-01-07"; + + src = fetchFromGitHub { + owner = "google"; + repo = "material-design-icons"; + rev = "511eea577b20d2b02ad77477750da1e44c66a52c"; + sha256 = "sha256-ENoWeyV9Dw26pgjy0Xst+qpxJ/mjgfqrY2Du2VwzwCE="; + sparseCheckout = [ "variablefont" ]; + }; + + nativeBuildInputs = [ rename ]; + + installPhase = '' + runHook preInstall + + rename 's/\[FILL,GRAD,opsz,wght\]//g' variablefont/* + install -Dm755 variablefont/*.ttf -t $out/share/fonts/TTF + install -Dm755 variablefont/*.woff2 -t $out/share/fonts/woff2 + + runHook postInstall + ''; + + meta = with lib; { + description = "Material Symbols icons by Google"; + homepage = "https://fonts.google.com/icons"; + downloadPage = "https://github.com/google/material-design-icons"; + license = lib.licenses.asl20; + maintainers = with maintainers; [ fufexan ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/data/fonts/medio/default.nix index c94046f085f9..240b6fbeead8 100644 --- a/pkgs/data/fonts/medio/default.nix +++ b/pkgs/data/fonts/medio/default.nix @@ -1,24 +1,29 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "200"; - pname = "medio"; in +stdenvNoCC.mkDerivation (self: { + pname = "medio"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-S+CcwD4zGVk7cIFD6K4NnpE/0mrJq4RnDJC576rhcLQ="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}.zip"; - sha256 = "0gxcmhjlsh2pzsmj78vw4v935ax7hfk533ddlhfhfma52zyxyh7x"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "Serif font designed by Sora Sagano"; longDescription = '' Medio is a serif font designed by Sora Sagano, based roughly @@ -26,7 +31,7 @@ fetchzip { but with hairline serifs in the style of a Didone. ''; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.cc0; }; -} +}) diff --git a/pkgs/data/fonts/melete/default.nix b/pkgs/data/fonts/melete/default.nix new file mode 100644 index 000000000000..cae6bcaf4eaf --- /dev/null +++ b/pkgs/data/fonts/melete/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenvNoCC, fetchzip }: + +let + majorVersion = "0"; + minorVersion = "200"; +in +stdenvNoCC.mkDerivation (self: { + pname = "melete"; + version = "${majorVersion}.${minorVersion}"; + + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-y1xtNM1Oy92gOvbr9J71XNxb1JeTzOgxKms3G2YHK00="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://dotcolon.net/font/${self.pname}/"; + description = "A headline typeface that could be used as a movie title"; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + license = licenses.ofl; + }; +}) diff --git a/pkgs/data/fonts/mno16/default.nix b/pkgs/data/fonts/mno16/default.nix index eeb53904fe11..59597120c100 100644 --- a/pkgs/data/fonts/mno16/default.nix +++ b/pkgs/data/fonts/mno16/default.nix @@ -1,16 +1,18 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { pname = "mno16"; version = "1.0"; -in fetchzip rec { - name = "${pname}-${version}"; - url = "https://github.com/sevmeyer/${pname}/releases/download/${version}/${name}.zip"; - sha256 = "1x06nl281fcjk6g1p4cgrgxakmwcci6vvasskaygsqlzxd8ig87w"; - postFetch = '' + src = fetchzip { + url = "https://github.com/sevmeyer/${pname}/releases/download/${version}/${pname}-${version}.zip"; + stripRoot = false; + hash = "sha256-xJQ9V7GlGUTEeYhqYFl/SemS6iqV0eW85YOn/tLgA+M="; + }; + + installPhase = '' mkdir -p $out/share/fonts/truetype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/ + cp fonts/*.ttf $out/share/fonts/truetype/ ''; meta = with lib; { diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/data/fonts/mononoki/default.nix index d48332b4a27f..7f7c2876694f 100644 --- a/pkgs/data/fonts/mononoki/default.nix +++ b/pkgs/data/fonts/mononoki/default.nix @@ -1,18 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "mononoki"; version = "1.3"; -in fetchzip { - name = "mononoki-${version}"; - url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip"; + src = fetchzip { + url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip"; + stripRoot = false; + hash = "sha256-bZYBRdmbQVs4i6UzMIHwJnoLWggX4CW8ZogNFYiX/9w="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/mononoki - unzip -j $downloadedFile -d $out/share/fonts/mononoki - ''; + cp webfont/* $out/share/fonts/mononoki - sha256 = "sha256-K2uOpJRmQ1NcDZfh6rorCF0MvGHFCsSW8J7Ue9OC/OY="; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/madmalik/mononoki"; diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/data/fonts/montserrat/default.nix index cb396080e49f..6074018f5545 100644 --- a/pkgs/data/fonts/montserrat/default.nix +++ b/pkgs/data/fonts/montserrat/default.nix @@ -1,25 +1,27 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { +stdenvNoCC.mkDerivation rec { pname = "montserrat"; version = "7.222"; - owner = "JulietaUla"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-MeNnc1e5X5f0JyaLY6fX22rytHkvL++eM2ygsdlGMv0="; + src = fetchFromGitHub { + owner = "JulietaUla"; + repo = pname; + rev = "v${version}"; + hash = "sha256-eVCRn2OtNI5NuYZBQy06HKnMMXhPPnFxI8m8kguZjg0="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/{otf,ttf,woff,woff2} - mv $out/fonts/otf/*.otf $out/share/fonts/otf - mv $out/fonts/ttf/*.ttf $out/share/fonts/ttf - mv $out/fonts/webfonts/*.woff $out/share/fonts/woff - mv $out/fonts/webfonts/*.woff2 $out/share/fonts/woff2 + mv fonts/otf/*.otf $out/share/fonts/otf + mv fonts/ttf/*.ttf $out/share/fonts/ttf + mv fonts/webfonts/*.woff $out/share/fonts/woff + mv fonts/webfonts/*.woff2 $out/share/fonts/woff2 - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix index 10a8dc38d954..d5623d907bee 100644 --- a/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/pkgs/data/fonts/mph-2b-damase/default.nix @@ -1,17 +1,21 @@ -{ fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip { - name = "MPH-2B-Damase-2"; +stdenvNoCC.mkDerivation rec { + pname = "mph-2b-damase"; + version = "2"; - url = "http://www.wazu.jp/downloads/damase_v.2.zip"; + src = fetchzip { + url = "https://web.archive.org/web/20160322114946/http://www.wazu.jp/downloads/damase_v.2.zip"; + hash = "sha256-4x78D+c3ZBxfhTQQ4+gyxvrsuztHF2ItXLh4uA0PxvU="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "0yzf12z6fpbgycqwiz88f39iawdhjabadfa14wxar3nhl9n434ql"; - - meta = { - }; + meta = { }; } diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index c3def549aa43..93e508ecd43c 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -1,16 +1,23 @@ -{ lib, fetchzip, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchurl, fetchFromGitHub }: let pname = "mplus-outline-fonts"; -in { - osdnRelease = fetchzip { - name = "${pname}-osdn"; - url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-063a.tar.xz"; - sha256 = "sha256-+VN+aFx5hMlWwtk+FM+vL6G07+yEi9kYYsoQLSfMUZo="; - postFetch = '' - install -m444 -Dt $out/share/fonts/truetype/${pname} $out/*.ttf - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob +in +{ + osdnRelease = stdenvNoCC.mkDerivation { + pname = "${pname}-osdn"; + version = "063a"; + + src = fetchurl { + url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-063a.tar.xz"; + hash = "sha256-ROuXO0tq/1dN5FTbEF3cI+Z0nCKUc0vZyx4Nc05M3Xk="; + }; + + installPhase = '' + runHook preInstall + + install -m444 -Dt $out/share/fonts/truetype/${pname} *.ttf + + runHook postInstall ''; meta = with lib; { @@ -22,19 +29,25 @@ in { }; }; - githubRelease = fetchFromGitHub { - name = "${pname}-github"; - owner = "coz-m"; - repo = "MPLUS_FONTS"; - rev = "336fec4e9e7c1e61bd22b82e6364686121cf3932"; - sha256 = "sha256-LSIyrstJOszll72mxXIC7EW4KEMTFCaQwWs59j0UScE="; - postFetch = '' + githubRelease = stdenvNoCC.mkDerivation { + pname = "${pname}-github"; + version = "unstable-2022-05-19"; + + src = fetchFromGitHub { + owner = "coz-m"; + repo = "MPLUS_FONTS"; + rev = "336fec4e9e7c1e61bd22b82e6364686121cf3932"; + hash = "sha256-jzDDUs1dKjqNjsMeTA2/4vm+akIisnOuE2mPQS7IDSA="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/{truetype,opentype}/${pname} - mv $out/fonts/ttf/* $out/share/fonts/truetype/${pname} - mv $out/fonts/otf/* $out/share/fonts/opentype/${pname} - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + mv fonts/ttf/* $out/share/fonts/truetype/${pname} + mv fonts/otf/* $out/share/fonts/opentype/${pname} + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/mro-unicode/default.nix b/pkgs/data/fonts/mro-unicode/default.nix index 9f4eda63d0fa..9a522c1c2a36 100644 --- a/pkgs/data/fonts/mro-unicode/default.nix +++ b/pkgs/data/fonts/mro-unicode/default.nix @@ -1,13 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip { - name = "mro-unicode-2013-05-25"; +stdenvNoCC.mkDerivation { + pname = "mro-unicode"; + version = "unstable-2013-05-25"; - url = "https://github.com/phjamr/MroUnicode/raw/f297de070f7eba721a47c850e08efc119d3bfbe8/MroUnicode-Regular.ttf"; + src = fetchurl { + url = "https://github.com/phjamr/MroUnicode/raw/f297de070f7eba721a47c850e08efc119d3bfbe8/MroUnicode-Regular.ttf"; + hash = "sha256-hcQmTuRWxaU5KEMXg/O0b1olE8YxXWz0PAlqAJknR/0="; + }; - postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/MroUnicode-Regular.ttf"; + dontUnpack = true; - sha256 = "1i71bjd9gdyn8ladfncbfhz6xz1h8xx8yf876j1z8lh719410c8g"; + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fonts/truetype/MroUnicode-Regular.ttf + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/phjamr/MroUnicode"; diff --git a/pkgs/data/fonts/myrica/default.nix b/pkgs/data/fonts/myrica/default.nix index c36292eb0014..5d8aa43a5b21 100644 --- a/pkgs/data/fonts/myrica/default.nix +++ b/pkgs/data/fonts/myrica/default.nix @@ -1,18 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub { - name = "myrica-2.011.20160403"; +stdenvNoCC.mkDerivation { + pname = "myrica"; + version = "2.011.20160403"; - owner = "tomokuni"; - repo = "Myrica"; - # commit does not exist on any branch on the target repository - rev = "b737107723bfddd917210f979ccc32ab3eb6dc20"; - sha256 = "187rklcibbkai6m08173ca99qn8v7xpdfdv0izpymmavj85axm12"; + src = fetchFromGitHub { + owner = "tomokuni"; + repo = "Myrica"; + # commit does not exist on any branch on the target repository + rev = "b737107723bfddd917210f979ccc32ab3eb6dc20"; + hash = "sha256-kx+adbN2DsO81KJFt+FGAPZN+1NpE9xiagKZ4KyaJV0="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar --strip-components=1 -xzvf $downloadedFile mkdir -p $out/share/fonts/truetype cp product/*.TTC $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/nacelle/default.nix b/pkgs/data/fonts/nacelle/default.nix new file mode 100644 index 000000000000..007de90b75ac --- /dev/null +++ b/pkgs/data/fonts/nacelle/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenvNoCC, fetchzip }: + +let + majorVersion = "1"; + minorVersion = "00"; +in +stdenvNoCC.mkDerivation (self: { + pname = "nacelle"; + version = "${majorVersion}.${minorVersion}"; + + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-e4QsPiyfWEAYHWdwR3CkGc2UzuA3hZPYYlWtIubY0Oo="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://dotcolon.net/font/${self.pname}/"; + description = "A improved version of the Aileron font"; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + license = licenses.ofl; + }; +}) diff --git a/pkgs/data/fonts/nahid-fonts/default.nix b/pkgs/data/fonts/nahid-fonts/default.nix index fbceb3c927dc..d036eed35c96 100644 --- a/pkgs/data/fonts/nahid-fonts/default.nix +++ b/pkgs/data/fonts/nahid-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "nahid-fonts"; version = "0.3.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "nahid-font"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "nahid-font"; + rev = "v${version}"; + hash = "sha256-r8/W0/pJV6OX954spIITvW7M6lIbZRpbsvEHErnXglg="; + }; + + installPhase = '' + runHook preInstall + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/nahid-fonts {} \; + + runHook postInstall ''; - sha256 = "0df169sibq14j2mj727sq86c00jm1nz8565v85hkvh4zgz2plb7c"; meta = with lib; { homepage = "https://github.com/rastikerdar/nahid-font"; diff --git a/pkgs/data/fonts/nanum-gothic-coding/default.nix b/pkgs/data/fonts/nanum-gothic-coding/default.nix index 5066a2aef4dc..3798a33b66c6 100644 --- a/pkgs/data/fonts/nanum-gothic-coding/default.nix +++ b/pkgs/data/fonts/nanum-gothic-coding/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "VER2.5"; - fullName = "NanumGothicCoding-2.5"; +stdenvNoCC.mkDerivation rec { + pname = "nanum-gothic-coding"; + version = "2.5"; -in fetchzip { - name = "nanum-gothic-coding"; - url = "https://github.com/naver/nanumfont/releases/download/${version}/${fullName}.zip"; + src = fetchzip { + url = "https://github.com/naver/nanumfont/releases/download/VER${version}/NanumGothicCoding-${version}.zip"; + stripRoot = false; + hash = "sha256-jHbbCMUxn54iQMKdAWI3r8CDxi+5LLJh8ucQzq2Ukdc="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/NanumGothicCoding - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/NanumGothicCoding - ''; + cp *.ttf $out/share/fonts/NanumGothicCoding - sha256 = "0b3pkhd6xn6393zi0dhj3ah08w1y1ji9fl6584bi0c8lanamf2pc"; + runHook postInstall + ''; meta = with lib; { description = "A contemporary monospaced sans-serif typeface with a warm touch"; diff --git a/pkgs/data/fonts/nanum/default.nix b/pkgs/data/fonts/nanum/default.nix index 1aac2c53d821..8f432edf4196 100644 --- a/pkgs/data/fonts/nanum/default.nix +++ b/pkgs/data/fonts/nanum/default.nix @@ -1,20 +1,21 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "nanum"; version = "20170925"; -in -fetchzip { - name = "nanum-${version}"; - url = "mirror://ubuntu/pool/universe/f/fonts-nanum/fonts-nanum_${version}.orig.tar.xz"; - sha256 = "sha256-lSTeQEuMmlQxiQqrx9tNScifE8nMOUDJF3lCfoAFIJk="; - postFetch = '' - unpackDir="$TMPDIR/unpack" - mkdir "$unpackDir" - cd "$unpackDir" - tar xf "$downloadedFile" --strip-components=1 + src = fetchurl { + url = "mirror://ubuntu/pool/universe/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.xz"; + hash = "sha256-GlVXH9YUU3wHMkNoz5miBv7N2oUEbwUXlcVoElQ9++4="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts cp *.ttf $out/share/fonts + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/national-park/default.nix b/pkgs/data/fonts/national-park/default.nix index 8ed251de53d5..4970e0d5920f 100644 --- a/pkgs/data/fonts/national-park/default.nix +++ b/pkgs/data/fonts/national-park/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { pname = "national-park-typeface"; version = "206464"; -in fetchzip { - name = "${pname}-${version}"; - url = "https://files.cargocollective.com/c${version}/NationalPark.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile National\*.otf -d $out/share/fonts/opentype/ + src = fetchzip { + url = "https://files.cargocollective.com/c${version}/NationalPark.zip"; + stripRoot = false; + hash = "sha256-VUboZZVJfKupnoHXo3RxetEEYimrr1DxghVZaaWnnw4="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.otf -t $out/share/fonts/opentype/ + + runHook postInstall ''; - sha256 = "044gh4xcasp8i9ny6z4nmns1am2pk5krc4ann2afq35v9bnl2q5d"; - meta = with lib; { description = ''Typeface designed to mimic the national park service signs that are carved using a router bit''; diff --git a/pkgs/data/fonts/nerdfonts/shas.nix b/pkgs/data/fonts/nerdfonts/shas.nix index ef4e42a5a729..b8b5f490e3d6 100644 --- a/pkgs/data/fonts/nerdfonts/shas.nix +++ b/pkgs/data/fonts/nerdfonts/shas.nix @@ -1,55 +1,55 @@ { - "3270" = "0k33cnwbsi9wkrmfm4ps455gg81ihlldmk5mk4k9p7bkvxzcgpb9"; - "Agave" = "1xnhl8idwx1ivj8k1dnz1ca4k1cx2irbazavr1b2zlixxbjq2vhq"; - "AnonymousPro" = "01ab38j5wnkjjfh91van4p7s3qb0rmdbcah9njmxj7swqr30q66r"; - "Arimo" = "0p3dh1sgpq1gjlz0blav8j5jf9gsrg4pg63qk0raw3kyzpwp9liq"; - "AurulentSansMono" = "06hi0xravvpmzww2i233jzf3nrqwkxmmybbpcamwswbgxg2sakc8"; - "BigBlueTerminal" = "0pizwa8mf2mlzh85zxfy0ns7rk1792fvjgj2ldvz4kryjj3sdi4f"; - "BitstreamVeraSansMono" = "1664srkg1i1n7w1iv93a25bg588qxqgpdnw1prf3gryl5zxj5wcd"; - "CascadiaCode" = "01q4kdmb6wz3rjph3i12i7rhiipj9vfzmlbxmvcmvxdvnq5g5x5l"; - "CodeNewRoman" = "0sw4hnr36l2yb3yhgxkmrn98ch6ywkxfqybv7vdqh1g44l81fx6z"; - "Cousine" = "1w2m7sgm0f9kzhbkd7hfb63n3y7kv4m3j97a52imp5sk6w4gc3w4"; - "DaddyTimeMono" = "1vs0cvdhyrn7dhd1q58bnpz5vk1i0bnx31ijydkpdl09y9nfg60q"; - "DejaVuSansMono" = "0hl4ajgqlx3vlgbdzm6817n3hq1xnyjj2gazv5xl7w3n98cvnpph"; - "DroidSansMono" = "14i1ssd2c67dnkg67lbv4dxsnidbg9fqnn4jn4bz7ll9yz3g1zmn"; - "FantasqueSansMono" = "1sfw2x9g30qbivn6ixlafazp2bcxndjy27wfc8xz8da7df14qdww"; - "FiraCode" = "1653r5bcsgkrxfncv02fpp4iw9k608hg6fnqg6s8mks2gip2w610"; - "FiraMono" = "1hrac6asm7rppm4nslfcr9vx53xhhyanqknqzcixf2zy19ggizr9"; - "FontPatcher" = "1s9mrm3bfs1s3syx4jbqgcc7f5dx7xand3cxdcqr8p002aba9ds9"; - "Go-Mono" = "00lcl89f3730mg4vvm4kj96v9q15wkpqqdhy5lhsxbrhzg4f3qxa"; - "Gohu" = "1nv2s3x40rdj5bc8w65y0gbjwdxwa2fvkbxvqqaqn3slylcx95w7"; - "Hack" = "1csr6gfkfc1zq7r6kq851apd9yy7vlyqa06dx8q4h7ym11nin0qz"; - "Hasklig" = "00jm7dfh66ip8cmrxq9fq60hhncivijjvyayx5yc63y1vzfgp08s"; - "HeavyData" = "12pm75w65mgjmmkfxbqv5k78k7jnvpmphywpc6k852wj72f09dl1"; - "Hermit" = "0mqy6c94smi900zhc1liml8z4h1a5if9n0fvd0afiidpmpb7x02l"; - "iA-Writer" = "173wdcqw7aqwnsrg1af902fa4jvyix35n0a4cwabbj4x28516liq"; - "IBMPlexMono" = "0fadrcjiribzk3vcc3k80bddffr63b28ikrv9qrppbkwc846xiq5"; - "Inconsolata" = "18sndnds39j7af8hj1v20jky79mln50l6rab60fgq8a5v01kbkls"; - "InconsolataGo" = "1gbbbgyka597ygmdxd65hphsvhx1rp0g13hsr2r88rw08iavqg16"; - "InconsolataLGC" = "1izxzlsgdiz10rbf0kbrcjc8cy7nvsnkcb4fpcq4k95n7kl6mpck"; - "Iosevka" = "0cb9qpnnr5n0h628xv7b2ir76j1mcz9rscx9prqavasnhz963in9"; - "JetBrainsMono" = "0yzfha4i7di90631axyqcqgbc95x3lhnp6l3a36rw5qx11c6r6wb"; - "Lekton" = "04sgkdds9cgw60z0a2gb13sfm0vkiv172j9biv9f0a70bn0bxkda"; - "LiberationMono" = "0aq2bjkxic78d59zn9wqnjb9yqmpr1w19lm73wh5xssaqbxr590n"; - "Lilex" = "0b56dq7nfmx8l47cgx6p39vbhnhf0w0kh06s6zavrgv0v6g2h0rg"; - "Meslo" = "0wjfd1kf442cw1c1zqjydf8pg2ajl2h0is3ilnvbyi1d8jr3pp59"; - "Monofur" = "1lmkaz72yc6azk32qbcv34bwj3fwkdh2dy4ik0zaxbld186gmwyi"; - "Monoid" = "0kay83hwbl5k2kl8ms34m5bidigclrf3cppxh73w6y82y8vgi2wz"; - "Mononoki" = "01cxiimrsk8bznv7jbnvl1klyva6f91s7rn1sl0wzj0sjxli9lnn"; - "MPlus" = "1z1r7i1fpbglkplpllljakms5080vzqz2yjx5f3xyggixj9c1gnw"; - "NerdFontsSymbolsOnly" = "1nb9bhl16lwvr58phcj0hyrzdxqv45gycj6a1nl95pcqy76a06zz"; - "Noto" = "1wjz60pjs6h1wkwrblw3afs6bafj8zmdy3fan9xlrmh9wp15l0qg"; - "OpenDyslexic" = "07q50mdg6axs5957h0ggn6krk9hcxiyr2fh9cfw1ybnh979425fx"; - "Overpass" = "0kxw9qqp9a9nh5ir0ll34965k15nyrs708ffry6bvccy6sl723n4"; - "ProFont" = "04dy3rngh4c4a2yy8b6pyh0ck6xmiwxwhbbgm77bdspp40b5m9bc"; - "ProggyClean" = "0jzs0qiav8fqiz69djl14sa06j5q3mcnprwl52gki3wbbp0inshr"; - "RobotoMono" = "1grszlqbwdb27d02g4gcyiqbz2sigzqhs0m3fvapq7by9pp2cwq6"; - "ShareTechMono" = "1m3hy87wbxdf2zljygns9876m30xkvf81vcv2fvd0kg79lll84vp"; - "SourceCodePro" = "0cf7a1v5hi7wg50wh886d84fql4jbm504v1mzkzdwfy70j7l8dm7"; - "SpaceMono" = "1a3srh177r80190sa4jswp2paqasv0fsx09i2vkzqms07pd69j7p"; - "Terminus" = "1qa9hjjjw3xn4qk5sqifxd87q5xgawwd9d2yh62b9n1rpgi37cip"; - "Tinos" = "14kpcimzrx1zzv4y0w78n2kdl83hm33vmprikg1cmbbypn0k2d9y"; - "Ubuntu" = "0hc71ybi7bnbblzzn86p4l8waagzgqsa5q1pfgm534j1bhn3gr02"; - "UbuntuMono" = "0mjcyriww7j0gc2lsmxn266x2jlly2hzzl2l70ywj83wxkv0qnva"; - "VictorMono" = "0n46glk3036i9cjz8gnlmlyx4p7ynk10i647q1zdjlsnk6yiy9i1"; + "3270" = "03rf3prn4c9q5mggbdzpp3la7in1dq12anqxjpinxwla7ngdh4rv"; + "Agave" = "177b2yljw4fxbsmjp8yrwvjzj9186f8g0s59xnz56nrl9ndx84qm"; + "AnonymousPro" = "0qn5xa37g9y47ski5hc2vxhvfbfpl58ranpziiw733kv83pkbkq6"; + "Arimo" = "0b69gh5qgl0v6b1cirma7l32yxj2d53w305gpfr6flral3ljq6if"; + "AurulentSansMono" = "165hfg67061zqbs28fl66ldi910n5pnzb6n6d39wh70pclgy2g4n"; + "BigBlueTerminal" = "1adindb4lvihya3mphmshk4vigragskyrx6ixydrp8i1f7s9sp20"; + "BitstreamVeraSansMono" = "0mi9j69f8s48fygwb7fz9m81871nvajh895mpch7qj69xmpp9acs"; + "CascadiaCode" = "13vlfbagjx033j97li6ypvr0zhxbm96lcz8xcn715225mslr2ib4"; + "CodeNewRoman" = "1r4q48p315x021m0qrd1xmfgqw4xif3snlc764hq5iy10vxdv9ni"; + "Cousine" = "18m2dlcg6dymi0xwrky4q7ynjx4bqnr5lnvbgr9cdnyf3zz9b6rj"; + "DaddyTimeMono" = "0qq5lb4xpqggaz0bml8c2awlgwal6xvyx9nydxqgs672jq7hn1cd"; + "DejaVuSansMono" = "1qnl6gyfyq4cyx0nyl7f39cm3mz33rfngv9kq2g7b187n4dmawaa"; + "DroidSansMono" = "1l2cl2ryv9p7wlg6q5zsmg5wmfp27s3h47lq75d07chydyr08vii"; + "FantasqueSansMono" = "1m2xkr7dhfa9bn9vha0s1x7sl1n8l1kdl8f4c876cwjh1mvrwkar"; + "FiraCode" = "02gnxi9rs25i7mpzkir62w6khvijpma0j0sm3a7gfm0kfdkqzi8j"; + "FiraMono" = "1kn5vl90xi6ba7msfgwvv9frpfr33xv8q93r62lnqs3avfk743j9"; + "FontPatcher" = "039yiz7clkghyc6djf4zcaq6k83w2jhxcy66z4i9zmqh3km81wlr"; + "Go-Mono" = "0bmd7r38ss754gpkndlag0gxap5ga473y778fyrrr3ccccg6d8iv"; + "Gohu" = "0cvfdli8kzrd9n2h152432f8zr9ffvp29vsfcf98nla3ax2p0v05"; + "Hack" = "1q3xdlpxps41pi724697mb5bc98mmql8s2lc4xh9zwddjvchd3zl"; + "Hasklig" = "0xmg0h5bjjiqj00pv51q2babfm7j6bl1b8r1w26z95jvrpnifi1z"; + "HeavyData" = "1rppgk2lj95kv67c9s97wkqkbrmyp5y7qm1b0a1sk49sg7l4mljp"; + "Hermit" = "1cw8ia9b5adb7z63cag6l25sahp82gr6bsz9qqc3p12nzi5lxsk8"; + "iA-Writer" = "01bx8j6hqpl5zmx96d6zrwn3n6ckic5zxr53wls6zdmp01wnkg72"; + "IBMPlexMono" = "1m1qzxls16cfsxwly5r4vlwpfv477sf3gi6yj9krvkxp0d5ymz74"; + "Inconsolata" = "1vavavjdiwrlxy9klp0cm6pvmr0nkl7dpls7ja79zgkw7yjhsifq"; + "InconsolataGo" = "0cp76c6s2r3q8vgild0jpc94b13ypzbyvmas9gwhq1mvf24k4jp5"; + "InconsolataLGC" = "16a59y1idqp1zgkw9wxcdgcjg6bjlxwbj3a3a00h4gwkczlp2r42"; + "Iosevka" = "0qg88d2rqbm1x0vfyyr495dznnviga8979dg0ik5yw27fc43hrjj"; + "JetBrainsMono" = "19ja9dksxq2dl2hi8nyflvl7skyi2wd65s4z14jcilbynxmk2z0q"; + "Lekton" = "03378znmbss5qq75jmc0r51qwpxsiy2ng8gi164s2mjykr83gr2n"; + "LiberationMono" = "13r13drx8r1mkbndfw6ip48sjyhf6qw0wgrwyqlgz5dcm3z9c3gx"; + "Lilex" = "1w2iw9ksnkmwa37a30vrlwg6sxh6l19wc95f8s5mx06sa3ywfs11"; + "Meslo" = "0fli7njkhq89ykdmdch313mzswlb23b716d0656qw8q3fbyh9dzh"; + "Monofur" = "0lhfm5dxh4nsq0whwvpqbr2grb27pl03wi7l7vdjbf5x1iacrpfp"; + "Monoid" = "1jrknl6yz6k6a8l9iiw2s74xkfqckn9y9vjdk49cyf2iy3fzbi30"; + "Mononoki" = "0jw1kx7ryakx1wdgk9jf2ygrcq65wjaar5w1bggv5zlsxpxdllis"; + "MPlus" = "1lvmv4vcs36137fv1vbw3vnyxxar8klgngn77202lhgvgi44x60a"; + "NerdFontsSymbolsOnly" = "0sizriiwa7xh2dscz96gyr4sg04dxxi4f3sv27qk3g46vq0ciw4w"; + "Noto" = "0dwjj3l7ryx7ysbnp5hh81n3qqqn3yf4h8jypm4ri96vf360myad"; + "OpenDyslexic" = "1gpmzcgp6bpidi8h1l5a0n3q912swqk04mdhqwpqskj1jn77d2hb"; + "Overpass" = "1ywp6fphy6akdfd96a37jqcjqry9w15zr0r609vf5a11n1aq3s0w"; + "ProFont" = "0g3qa8lcp199mln5myn3yn4hdgyx3n16ajdm8a7anjfi9im2i6ns"; + "ProggyClean" = "0q4m7kq3k0ga6i2kr6a4k59na8b7m6zvvj9zyp61375lm6wb3bv2"; + "RobotoMono" = "0j055qjm0x4ksy19snplykm9dm9jkmn9swsis49k96mfw7wx9mfq"; + "ShareTechMono" = "055hg15ghd1ca8wxq3sfjpck8w4x6qnzjyn3r8rslyrbhl51v9aj"; + "SourceCodePro" = "05fs5ralnz9m6zdck9bvzf1rjgr4f5m1fr9m51cmr60wzhag9qsz"; + "SpaceMono" = "1m3x85qzykxg5mb56d1zgl367q55ndndxzzmsrlibmybqvc1ffq9"; + "Terminus" = "0fkqd85qfp8dk8sbyjfxirfiwlfl9a40z8jhybzzd7ys4yrzlq1c"; + "Tinos" = "11bbg7ssf7wndxrm6kklggsfhmyaijfg4xi6cw743kcwzfvi8kd1"; + "Ubuntu" = "14w55vh42mz5lvbpl4p1vx31hba957c5345qfpmym5majz83hx3q"; + "UbuntuMono" = "1xybn0q1xx5sidhllna5y7584fl75qw6v5alb2p1b6933a5czg0m"; + "VictorMono" = "02c5c9ljnmkf4awfhbjna6g86220ckv977rrc1sh6qr7q8zci6vr"; } diff --git a/pkgs/data/fonts/nerdfonts/version.nix b/pkgs/data/fonts/nerdfonts/version.nix index 560487804678..1719346d0931 100644 --- a/pkgs/data/fonts/nerdfonts/version.nix +++ b/pkgs/data/fonts/nerdfonts/version.nix @@ -1 +1 @@ -"2.2.2" +"2.3.3" diff --git a/pkgs/data/fonts/nika-fonts/default.nix b/pkgs/data/fonts/nika-fonts/default.nix index f497a184be01..f5076f3c93cb 100644 --- a/pkgs/data/fonts/nika-fonts/default.nix +++ b/pkgs/data/fonts/nika-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "nika-fonts"; version = "1.0.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "font-store"; - repo = "NikaFont"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "font-store"; + repo = "NikaFont"; + rev = "v${version}"; + hash = "sha256-jDemm8IyjhoCOg4Bfsp0tzUR7m+JaswL5d7Kug+asJk="; + }; + + installPhase = '' + runHook preInstall + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/nika-fonts {} \; + + runHook postInstall ''; - sha256 = "1x34b2dqn1dymi1vmj5vrjcy2z8s0f3rr6cniyrz85plvid6x40i"; meta = with lib; { homepage = "https://github.com/font-store/NikaFont/"; diff --git a/pkgs/data/fonts/norwester/default.nix b/pkgs/data/fonts/norwester/default.nix index d4e4cf1ee0fe..f1236d5c05c1 100644 --- a/pkgs/data/fonts/norwester/default.nix +++ b/pkgs/data/fonts/norwester/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "1.2"; +stdenvNoCC.mkDerivation rec { pname = "norwester"; -in fetchzip { - name = "${pname}-${version}"; + version = "1.2"; - url = "http://jamiewilson.io/norwester/assets/norwester.zip"; + src = fetchzip { + url = "http://jamiewilson.io/norwester/assets/norwester.zip"; + stripRoot = false; + hash = "sha256-Ak/nobrQE/XYGWs/IhlZlTp74ff+s4adUR6Sht5Yf8g="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/opentype - unzip -D -j $downloadedFile ${pname}-v${version}/${pname}.otf -d $out/share/fonts/opentype/ - ''; + cp ${pname}-v${version}/${pname}.otf $out/share/fonts/opentype/ - sha256 = "1npsaiiz9g5z6315lnmynwcnrfl37fyxc7w1mhkw1xbzcnv74z4r"; + runHook postInstall + ''; meta = with lib; { homepage = "http://jamiewilson.io/norwester"; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index da3b0f81d431..b3e4d7d67bce 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -11,21 +11,43 @@ , imagemagick , zopfli , buildPackages +, variants ? [ ] }: - let - mkNoto = { pname, weights }: - stdenvNoCC.mkDerivation { + notoLongDescription = '' + When text is rendered by a computer, sometimes characters are + displayed as “tofu”. They are little boxes to indicate your device + doesn’t have a font to display the text. + + Google has been developing a font family called Noto, which aims to + support all languages with a harmonious look and feel. Noto is + Google’s answer to tofu. The name noto is to convey the idea that + Google’s goal is to see “no more tofu”. Noto has multiple styles and + weights, and freely available to all. + + This package also includes the Arimo, Cousine, and Tinos fonts. + ''; +in +rec { + mkNoto = + { pname + , weights + , variants ? [ ] + , longDescription ? notoLongDescription + }: + stdenvNoCC.mkDerivation rec { inherit pname; - version = "2020-01-23"; + version = "20201206-phase3"; src = fetchFromGitHub { owner = "googlefonts"; repo = "noto-fonts"; - rev = "f4726a2ec36169abd02a6d8abe67c8ff0236f6d8"; - sha256 = "0zc1r7zph62qmvzxqfflsprazjf6x1qnwc2ma27kyzh6v36gaykw"; + rev = "v${version}"; + hash = "sha256-x60RvCRFLoGe0CNvswROnDkIsUFbWH+/laN8q2qkUPk="; }; + _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants; + installPhase = '' # We copy in reverse preference order -- unhinted first, then # hinted -- to get the "best" version of each font while @@ -33,29 +55,24 @@ let # # TODO: install OpenType, variable versions? local out_ttf=$out/share/fonts/truetype/noto - install -m444 -Dt $out_ttf phaseIII_only/unhinted/ttf/*/*-${weights}.ttf - install -m444 -Dt $out_ttf phaseIII_only/hinted/ttf/*/*-${weights}.ttf - install -m444 -Dt $out_ttf unhinted/*/*-${weights}.ttf - install -m444 -Dt $out_ttf hinted/*/*-${weights}.ttf - ''; + '' + (if _variants == [ ] then '' + install -m444 -Dt $out_ttf archive/unhinted/*/*-${weights}.ttf + install -m444 -Dt $out_ttf archive/hinted/*/*-${weights}.ttf + install -m444 -Dt $out_ttf unhinted/*/*/*-${weights}.ttf + install -m444 -Dt $out_ttf hinted/*/*/*-${weights}.ttf + '' else '' + for variant in $_variants; do + install -m444 -Dt $out_ttf archive/unhinted/$variant/*-${weights}.ttf + install -m444 -Dt $out_ttf archive/hinted/$variant/*-${weights}.ttf + install -m444 -Dt $out_ttf unhinted/*/$variant/*-${weights}.ttf + install -m444 -Dt $out_ttf hinted/*/$variant/*-${weights}.ttf + done + ''); meta = with lib; { description = "Beautiful and free fonts for many languages"; homepage = "https://www.google.com/get/noto/"; - longDescription = - '' - When text is rendered by a computer, sometimes characters are - displayed as “tofu”. They are little boxes to indicate your device - doesn’t have a font to display the text. - - Google has been developing a font family called Noto, which aims to - support all languages with a harmonious look and feel. Noto is - Google’s answer to tofu. The name noto is to convey the idea that - Google’s goal is to see “no more tofu”. Noto has multiple styles and - weights, and freely available to all. - - This package also includes the Arimo, Cousine, and Tinos fonts. - ''; + inherit longDescription; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ mathnerd314 emily ]; @@ -100,14 +117,34 @@ let maintainers = with maintainers; [ mathnerd314 emily ]; }; }; -in -{ noto-fonts = mkNoto { pname = "noto-fonts"; weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}"; }; + noto-fonts-lgc-plus = mkNoto { + pname = "noto-fonts-lgc-plus"; + weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}"; + variants = [ + "Noto Sans" + "Noto Serif" + "Noto Sans Display" + "Noto Serif Display" + "Noto Sans Mono" + "Noto Music" + "Noto Sans Symbols" + "Noto Sans Symbols 2" + "Noto Sans Math" + ]; + longDescription = '' + This package provides the Noto Fonts, but only for latin, greek + and cyrillic scripts, as well as some extra fonts. To create a + custom Noto package with custom variants, see the `mkNoto` + helper function. + ''; + }; + noto-fonts-extra = mkNoto { pname = "noto-fonts-extra"; weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*"; @@ -127,79 +164,88 @@ in sha256 = "sha256-1w66Ge7DZjbONGhxSz69uFhfsjMsDiDkrGl6NsoB7dY="; }; - noto-fonts-emoji = let - version = "2.038"; - emojiPythonEnv = - buildPackages.python3.withPackages (p: with p; [ fonttools nototools ]); - in stdenvNoCC.mkDerivation { - pname = "noto-fonts-emoji"; - inherit version; + noto-fonts-emoji = + let + version = "2.038"; + emojiPythonEnv = + buildPackages.python3.withPackages (p: with p; [ fonttools nototools ]); + in + stdenvNoCC.mkDerivation { + pname = "noto-fonts-emoji"; + inherit version; - src = fetchFromGitHub { - owner = "googlefonts"; - repo = "noto-emoji"; - rev = "v${version}"; - sha256 = "1rgmcc6nqq805iqr8kvxxlk5cf50q714xaxk3ld6rjrd69kb8ix9"; + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "noto-emoji"; + rev = "v${version}"; + sha256 = "1rgmcc6nqq805iqr8kvxxlk5cf50q714xaxk3ld6rjrd69kb8ix9"; + }; + + depsBuildBuild = [ + buildPackages.stdenv.cc + pkg-config + cairo + ]; + + nativeBuildInputs = [ + imagemagick + zopfli + pngquant + which + emojiPythonEnv + ]; + + postPatch = '' + patchShebangs *.py + patchShebangs third_party/color_emoji/*.py + # remove check for virtualenv, since we handle + # python requirements using python.withPackages + sed -i '/ifndef VIRTUAL_ENV/,+2d' 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 + ''; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/noto + cp NotoColorEmoji.ttf $out/share/fonts/noto + runHook postInstall + ''; + + meta = with lib; { + description = "Color and Black-and-White emoji fonts"; + homepage = "https://github.com/googlefonts/noto-emoji"; + license = with licenses; [ ofl asl20 ]; + platforms = platforms.all; + maintainers = with maintainers; [ mathnerd314 sternenseemann ]; + }; }; - depsBuildBuild = [ - buildPackages.stdenv.cc - pkg-config - cairo - ]; - - nativeBuildInputs = [ - imagemagick - zopfli - pngquant - which - emojiPythonEnv - ]; - - postPatch = '' - patchShebangs *.py - patchShebangs third_party/color_emoji/*.py - # remove check for virtualenv, since we handle - # python requirements using python.withPackages - sed -i '/ifndef VIRTUAL_ENV/,+2d' 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 - ''; - - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/fonts/noto - cp NotoColorEmoji.ttf $out/share/fonts/noto - runHook postInstall - ''; - - meta = with lib; { - description = "Color and Black-and-White emoji fonts"; - homepage = "https://github.com/googlefonts/noto-emoji"; - license = with licenses; [ ofl asl20 ]; - platforms = platforms.all; - maintainers = with maintainers; [ mathnerd314 sternenseemann ]; - }; - }; - noto-fonts-emoji-blob-bin = let pname = "noto-fonts-emoji-blob-bin"; version = "14.0.1"; in - fetchurl { - name = "${pname}-${version}"; - url = "https://github.com/C1710/blobmoji/releases/download/v${version}/Blobmoji.ttf"; - sha256 = "sha256-wSH9kRJ8y2i5ZDqzeT96dJcEJnHDSpU8bOhmxaT+UCg="; + stdenvNoCC.mkDerivation { + inherit pname version; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - install -Dm 444 $downloadedFile $out/share/fonts/blobmoji/Blobmoji.ttf + src = fetchurl { + url = "https://github.com/C1710/blobmoji/releases/download/v${version}/Blobmoji.ttf"; + hash = "sha256-w9s7uF6E6nomdDmeKB4ATcGB/5A4sTwDvwHT3YGXz8g="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm 444 $src $out/share/fonts/blobmoji/Blobmoji.ttf + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index 82b56b9effff..1b515b486f5f 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { zopfli ]; - checkInputs = [ + nativeCheckInputs = [ pillow six bash diff --git a/pkgs/data/fonts/office-code-pro/default.nix b/pkgs/data/fonts/office-code-pro/default.nix index 0513baf48680..f05a7ddd319c 100644 --- a/pkgs/data/fonts/office-code-pro/default.nix +++ b/pkgs/data/fonts/office-code-pro/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "office-code-pro"; version = "1.004"; -in fetchFromGitHub rec { - name = "${pname}-${version}"; - owner = "nathco"; - repo = "Office-Code-Pro"; - rev = version; + src = fetchFromGitHub { + owner = "nathco"; + repo = "Office-Code-Pro"; + rev = version; + hash = "sha256-qzKTXYswkithZUJT0a3IifCq4RJFeKciZAPhYr2U1X4="; + }; - postFetch = '' - tar xf $downloadedFile --strip=1 - install -m644 -Dt $out/share/doc/${name} README.md + installPhase = '' + runHook preInstall + + install -m644 -Dt $out/share/doc/${pname}-${version} README.md install -m444 -Dt $out/share/fonts/opentype 'Fonts/Office Code Pro/OTF/'*.otf 'Fonts/Office Code Pro D/OTF/'*.otf + + runHook postInstall ''; - sha256 = "1bagwcaicn6q8qkqazz6wb3x30y4apmkga0mkv8fh6890hfhywr9"; meta = with lib; { description = "A customized version of Source Code Pro"; diff --git a/pkgs/data/fonts/oldsindhi/default.nix b/pkgs/data/fonts/oldsindhi/default.nix index e0e783fd80a5..88692d914564 100644 --- a/pkgs/data/fonts/oldsindhi/default.nix +++ b/pkgs/data/fonts/oldsindhi/default.nix @@ -1,25 +1,28 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "oldsindhi"; version = "1.0"; -in fetchzip rec { - name = "oldsindhi-${version}"; - url = "https://github.com/MihailJP/oldsindhi/releases/download/v${version}/OldSindhi-${version}.tar.xz"; + src = fetchurl { + url = "https://github.com/MihailJP/${pname}/releases/download/v${version}/OldSindhi-${version}.tar.xz"; + hash = "sha256-jOcl+mo6CJ9Lnn3nAUiXXHCJssovVgLoPrbGxj4uzQs="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xJf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/truetype *.ttf - install -m444 -Dt $out/share/doc/${name} README *.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README *.txt - sha256 = "03c483vbrwz2fpdfbys42fmik9788zxfmjmc4fgq4s2d0mraa0j1"; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/MihailJP/oldsindhi"; description = "Free Sindhi Khudabadi font"; maintainers = with maintainers; [ mathnerd314 ]; - license = with licenses; [mit ofl]; + license = with licenses; [ mit ofl ]; platforms = platforms.all; }; } diff --git a/pkgs/data/fonts/oldstandard/default.nix b/pkgs/data/fonts/oldstandard/default.nix index ddff3666b0b4..33bf37c18bae 100644 --- a/pkgs/data/fonts/oldstandard/default.nix +++ b/pkgs/data/fonts/oldstandard/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "oldstandard"; version = "2.2"; -in fetchzip rec { - name = "oldstandard-${version}"; - url = "https://github.com/akryukov/oldstand/releases/download/v${version}/${name}.otf.zip"; + src = fetchzip { + url = "https://github.com/akryukov/oldstand/releases/download/v${version}/${pname}-${version}.otf.zip"; + stripRoot = false; + hash = "sha256-cDB5KJm87DK+GczZ3Nmn4l5ejqViswVbwrJ9XbhEh8I="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - unzip $downloadedFile install -m444 -Dt $out/share/fonts/opentype *.otf - install -m444 -Dt $out/share/doc/${name} FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} FONTLOG.txt - sha256 = "1qwfsyp51grr56jcnkkmnrnl3r20pmhp9zh9g88kp64m026cah6n"; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/akryukov/oldstand"; diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix index f22ce9f882f8..8a6b01b1d6d7 100644 --- a/pkgs/data/fonts/open-dyslexic/default.nix +++ b/pkgs/data/fonts/open-dyslexic/default.nix @@ -1,25 +1,28 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { + pname = "open-dyslexic"; version = "2016-06-23"; -in fetchzip { - name = "open-dyslexic-${version}"; - url = "https://github.com/antijingoist/open-dyslexic/archive/20160623-Stable.zip"; + src = fetchzip { + url = "https://github.com/antijingoist/open-dyslexic/archive/20160623-Stable.zip"; + hash = "sha256-f/uavR3n0qHyqumZDw7r8Zy0om2RlJAKyWuGaUXSJ1s="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*/README.md -d $out/share/doc/open-dyslexic + installPhase = '' + runHook preInstall + + install -Dm644 otf/*.otf -t $out/share/fonts/opentype + install -Dm644 README.md -t $out/share/doc/open-dyslexic + + runHook postInstall ''; - sha256 = "1vl8z5rknh2hpr2f0v4b2qgs5kclx5pzyk8al7243k5db82a2cyi"; - meta = with lib; { homepage = "https://opendyslexic.org/"; description = "Font created to increase readability for readers with dyslexia"; license = "Bitstream Vera License (https://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)"; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/data/fonts/open-fonts/default.nix b/pkgs/data/fonts/open-fonts/default.nix index e503b1143033..6a628174f2e4 100644 --- a/pkgs/data/fonts/open-fonts/default.nix +++ b/pkgs/data/fonts/open-fonts/default.nix @@ -1,21 +1,21 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { pname = "open-fonts"; version = "0.7.0"; -in -fetchurl { - name = "${pname}-${version}"; - url = "https://github.com/kiwi0fruit/open-fonts/releases/download/${version}/open-fonts.tar.xz"; - downloadToTemp = true; - recursiveHash = true; - sha256 = "sha256-bSP9Flotoo3E5vRU3eKOUAPD2fmkWseWYWG4y0S07+4="; + src = fetchurl { + url = "https://github.com/kiwi0fruit/open-fonts/releases/download/${version}/open-fonts.tar.xz"; + hash = "sha256-NJKbdrvgZz9G7mjAJYzN7rU/fo2xRFZA2BbQ+A56iPw="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile mkdir -p $out/share/fonts/truetype - install open-fonts/*.ttf $out/share/fonts/truetype + install *.ttf $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/data/fonts/open-sans/default.nix index 0c7f8dce57a3..4883cd818b1c 100644 --- a/pkgs/data/fonts/open-sans/default.nix +++ b/pkgs/data/fonts/open-sans/default.nix @@ -1,21 +1,25 @@ -{ lib, fetchFromGitLab }: +{ lib, stdenvNoCC, fetchFromGitLab }: -let +stdenvNoCC.mkDerivation { pname = "open-sans"; version = "1.11"; -in fetchFromGitLab { - name = "${pname}-${version}"; - domain = "salsa.debian.org"; - owner = "fonts-team"; - repo = "fonts-open-sans"; - rev = "debian/1.11-1"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "fonts-team"; + repo = "fonts-open-sans"; + rev = "debian/1.11-1"; + hash = "sha256-gkq5RPa83dND91q1hiA9Qokq1iA8gLQ8XvCNWe+e8Bw="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "146ginwx18z624z582lrnhil8jvi9bjg6843265bgxxrfmf75vhp"; meta = with lib; { description = "Open Sans fonts"; diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/data/fonts/orbitron/default.nix index f4a0a9600a15..973c79f667a3 100644 --- a/pkgs/data/fonts/orbitron/default.nix +++ b/pkgs/data/fonts/orbitron/default.nix @@ -1,42 +1,45 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { + pname = "orbitron"; version = "20110526"; -in fetchFromGitHub { - name = "orbitron-${version}"; - owner = "theleagueof"; - repo = "orbitron"; - rev = "13e6a52"; + src = fetchFromGitHub { + owner = "theleagueof"; + repo = "orbitron"; + rev = "13e6a52"; + hash = "sha256-zjNPVrDUxcQbrsg1/8fFa6Wenu1yuG/XDfKA7NVZ0rA="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/opentype/orbitron *.otf install -m444 -Dt $out/share/fonts/ttf/orbitron *.ttf - ''; - sha256 = "1y9yzvpqs2v3ssnqk2iiglrh8amgsscnk8vmfgnqgqi9f4dhdvnv"; + runHook postInstall + ''; meta = with lib; { homepage = "https://www.theleagueofmoveabletype.com/orbitron"; downloadPage = "https://www.theleagueofmoveabletype.com/orbitron/download"; description = "Geometric sans-serif for display purposes by Matt McInerney"; longDescription = '' - Orbitron is a geometric sans-serif typeface intended for display - purposes. It features four weights (light, medium, bold, and - black), a stylistic alternative, small caps, and a ton of - alternate glyphs. + Orbitron is a geometric sans-serif typeface intended for display + purposes. It features four weights (light, medium, bold, and + black), a stylistic alternative, small caps, and a ton of + alternate glyphs. - Orbitron was designed so that graphic designers in the future - will have some alternative to typefaces like Eurostile or Bank - Gothic. If you’ve ever seen a futuristic sci-fi movie, you have - may noticed that all other fonts have been lost or destroyed in - the apocalypse that led humans to flee earth. Only those very few - geometric typefaces have survived to be used on spaceship - exteriors, space station signage, monopolistic corporate - branding, uniforms featuring aerodynamic shoulder pads, etc. Of - course Orbitron could also be used on the posters for the movies - portraying this inevitable future. + Orbitron was designed so that graphic designers in the future + will have some alternative to typefaces like Eurostile or Bank + Gothic. If you’ve ever seen a futuristic sci-fi movie, you have + may noticed that all other fonts have been lost or destroyed in + the apocalypse that led humans to flee earth. Only those very few + geometric typefaces have survived to be used on spaceship + exteriors, space station signage, monopolistic corporate + branding, uniforms featuring aerodynamic shoulder pads, etc. Of + course Orbitron could also be used on the posters for the movies + portraying this inevitable future. ''; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix index 120098fd67f0..521c08c85cea 100644 --- a/pkgs/data/fonts/overpass/default.nix +++ b/pkgs/data/fonts/overpass/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "overpass"; version = "3.0.5"; -in fetchzip rec { - name = "overpass-${version}"; - url = "https://github.com/RedHatOfficial/Overpass/releases/download/v${version}/overpass-${version}.zip"; + src = fetchzip { + url = "https://github.com/RedHatOfficial/Overpass/releases/download/v${version}/overpass-${version}.zip"; + hash = "sha256-8AWT0/DELfNWXtZOejC90DbUSOtyGt9tSkcSuO7HP2o="; + }; - postFetch = '' - mkdir -p $out/share/fonts $out/share/doc - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.md -d $out/share/doc/${name} + installPhase = '' + runHook preInstall + + install -Dm644 */*/*.otf -t $out/share/fonts/opentype + install -Dm644 */*/*.ttf -t $out/share/fonts/truetype + install -Dm644 *.md -t $out/share/doc/${pname}-${version} + + runHook postInstall ''; - sha256 = "1fpyhd6x3i3g0xxjmyfnjsri1kkvci15fv7jp1bnza7k0hz0bnha"; - meta = with lib; { homepage = "https://overpassfont.org/"; description = "Font heavily inspired by Highway Gothic"; diff --git a/pkgs/data/fonts/oxygenfonts/default.nix b/pkgs/data/fonts/oxygenfonts/default.nix index e34e49d98147..32d9273d6390 100644 --- a/pkgs/data/fonts/oxygenfonts/default.nix +++ b/pkgs/data/fonts/oxygenfonts/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub { - name = "oxygenfonts-20160824"; +stdenvNoCC.mkDerivation rec { + pname = "oxygenfonts"; + version = "20160824"; - owner = "vernnobile"; - repo = "oxygenFont"; - rev = "62db0ebe3488c936406685485071a54e3d18473b"; + src = fetchFromGitHub { + owner = "vernnobile"; + repo = "oxygenFont"; + rev = "62db0ebe3488c936406685485071a54e3d18473b"; + hash = "sha256-0LKq8nChkDAb6U1sOUyga/DvzpDmIjoRn+2PB9rok4w="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype cp */Oxygen-Sans.ttf */Oxygen-Sans-Bold.ttf */OxygenMono-Regular.ttf $out/share/fonts/truetype - ''; - sha256 = "17m86p1s7a7d90zqjsr46h5bpmas4vxsgj7kd0j5c8cb7lw92jyf"; + runHook postInstall + ''; meta = with lib; { description = "Desktop/gui font for integrated use with the KDE desktop"; diff --git a/pkgs/data/fonts/parastoo-fonts/default.nix b/pkgs/data/fonts/parastoo-fonts/default.nix index a3d273bb8ae1..a91596a66e51 100644 --- a/pkgs/data/fonts/parastoo-fonts/default.nix +++ b/pkgs/data/fonts/parastoo-fonts/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "parastoo-fonts"; version = "2.0.1"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "parastoo-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "parastoo-font"; + rev = "v${version}"; + hash = "sha256-E94B9R2h227D49dscCBsprmb7w0GrQ+2tWOWRf8FH30="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/parastoo-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-4smobLS43DB7ISmbWDWX0IrtaeiyXpi1QpAiL8NyXoQ="; meta = with lib; { homepage = "https://github.com/rastikerdar/parastoo-font"; diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix index 4dd6093922cc..86646ae0ac5d 100644 --- a/pkgs/data/fonts/paratype-pt/mono.nix +++ b/pkgs/data/fonts/paratype-pt/mono.nix @@ -1,21 +1,27 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip { - name = "paratype-pt-mono"; +stdenvNoCC.mkDerivation rec { + pname = "paratype-pt-mono"; + version = "2.005"; - urls = [ - "https://company.paratype.com/system/attachments/631/original/ptmono.zip" - "http://rus.paratype.ru/system/attachments/631/original/ptmono.zip" - ]; + src = fetchzip { + urls = [ + "https://company.paratype.com/system/attachments/631/original/ptmono.zip" + "http://rus.paratype.ru/system/attachments/631/original/ptmono.zip" + ]; + stripRoot = false; + hash = "sha256-mfDAu/KGelC6wZpUCrUrLVZKo+XiKNBqcpMI8tH2tMw="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/paratype + + runHook postInstall ''; - sha256 = "07kl82ngby55khvzsvn831ddpc0q8djgz2y6gsjixkyjfdk2xjjm"; - meta = with lib; { homepage = "http://www.paratype.ru/public/"; description = "An open Paratype font"; @@ -29,4 +35,3 @@ fetchzip { maintainers = with maintainers; [ raskin ]; }; } - diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix index 8b47dd9ee1fb..dffd25c23aa5 100644 --- a/pkgs/data/fonts/paratype-pt/sans.nix +++ b/pkgs/data/fonts/paratype-pt/sans.nix @@ -1,21 +1,27 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip { - name = "paratype-pt-sans"; +stdenvNoCC.mkDerivation rec { + pname = "paratype-pt-sans"; + version = "2.005"; - urls = [ - "https://company.paratype.com/system/attachments/629/original/ptsans.zip" - "http://rus.paratype.ru/system/attachments/629/original/ptsans.zip" - ]; + src = fetchzip { + urls = [ + "https://company.paratype.com/system/attachments/629/original/ptsans.zip" + "http://rus.paratype.ru/system/attachments/629/original/ptsans.zip" + ]; + stripRoot = false; + hash = "sha256-34TqYXtWzkAstaGQBhJy+/hVk5tg6ZvHZ/kvUroWVLs="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/paratype + + runHook postInstall ''; - sha256 = "01fkd417gv98jf3a6zyfi9w2dkqsbddy1vacga2672yf0kh1z1r0"; - meta = with lib; { homepage = "http://www.paratype.ru/public/"; description = "An open Paratype font"; @@ -29,4 +35,3 @@ fetchzip { maintainers = with maintainers; [ raskin ]; }; } - diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix index a4142f757fcc..f346382d1f73 100644 --- a/pkgs/data/fonts/paratype-pt/serif.nix +++ b/pkgs/data/fonts/paratype-pt/serif.nix @@ -1,21 +1,27 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip { - name = "paratype-pt-serif"; +stdenvNoCC.mkDerivation rec { + pname = "paratype-pt-serif"; + version = "2.005"; - urls = [ - "https://company.paratype.com/system/attachments/634/original/ptserif.zip" - "http://rus.paratype.ru/system/attachments/634/original/ptserif.zip" - ]; + src = fetchzip { + urls = [ + "https://company.paratype.com/system/attachments/634/original/ptserif.zip" + "http://rus.paratype.ru/system/attachments/634/original/ptserif.zip" + ]; + stripRoot = false; + hash = "sha256-4L3t5NEHmj975fn8eBAkRUO1OL0xseNp9g7k7tt/O2c="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/paratype + + runHook postInstall ''; - sha256 = "1iw5qi4ag3yp1lwmi91lb18gr768bqwl46xskaqnkhr9i9qp0v6d"; - meta = with lib; { homepage = "http://www.paratype.ru/public/"; description = "An open Paratype font"; @@ -29,4 +35,3 @@ fetchzip { maintainers = with maintainers; [ raskin ]; }; } - diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index f0bdbc3ea004..568363889ff2 100644 --- a/pkgs/data/fonts/pecita/default.nix +++ b/pkgs/data/fonts/pecita/default.nix @@ -1,29 +1,30 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation { + pname = "pecita"; version = "5.4"; -in -fetchurl { - name = "pecita-${version}"; + src = fetchurl { + url = "http://pecita.eu/b/Pecita.otf"; + hash = "sha256-D9IZ+p4UFHUNt9me7D4vv0x6rMK9IaViKPliCEyX6t4="; + }; - url = "http://pecita.eu/b/Pecita.otf"; + dontUnpack = true; - downloadToTemp = true; + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/opentype - cp -v $downloadedFile $out/share/fonts/opentype/Pecita.otf - ''; + cp -v $src $out/share/fonts/opentype/Pecita.otf - recursiveHash = true; - sha256 = "0pwm20f38lcbfkdqkpa2ydpc9kvmdg0ifc4h2dmipsnwbcb5rfwm"; + runHook postInstall + ''; meta = with lib; { homepage = "http://pecita.eu/police-en.php"; description = "Handwritten font with connected glyphs"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/data/fonts/penna/default.nix index 784f9d2573ef..893262f66e56 100644 --- a/pkgs/data/fonts/penna/default.nix +++ b/pkgs/data/fonts/penna/default.nix @@ -1,24 +1,29 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; - minorVersion = "10"; - pname = "penna"; + minorVersion = "100"; in +stdenvNoCC.mkDerivation (self: { + pname = "penna"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-fmCJnEaoUGdW9JK3J7JSm5D4qOMRW7qVKPgVE7uCH5w="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}.zip"; - sha256 = "0hk15yndm56l6rbdykpkry2flffx0567mgjcqcnsx1iyzwwla5km"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "Geometric sans serif designed by Sora Sagano"; longDescription = '' Penna is a geometric sans serif designed by Sora Sagano, @@ -26,7 +31,7 @@ fetchzip { with a small x-height. ''; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.cc0; }; -} +}) diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index 3a2ae92c1e5a..ea2da0fe2ecf 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -1,22 +1,27 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub { - name = "powerline-fonts-2018-11-11"; +stdenvNoCC.mkDerivation { + pname = "powerline-fonts"; + version = "unstable-2018-11-11"; - owner = "powerline"; - repo = "fonts"; - rev = "e80e3eba9091dac0655a0a77472e10f53e754bb0"; + src = fetchFromGitHub { + owner = "powerline"; + repo = "fonts"; + rev = "e80e3eba9091dac0655a0a77472e10f53e754bb0"; + hash = "sha256-GGfON6Z/0czCUAGxnqtndgDnaZGONFTU9/Hu4BGDHlk="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.otf' -exec install -Dt $out/share/fonts/opentype {} \; find . -name '*.ttf' -exec install -Dt $out/share/fonts/truetype {} \; find . -name '*.bdf' -exec install -Dt $out/share/fonts/bdf {} \; find . -name '*.pcf.gz' -exec install -Dt $out/share/fonts/pcf {} \; find . -name '*.psf.gz' -exec install -Dt $out/share/consolefonts {} \; - ''; - sha256 = "0r8p4z3db17f5p8jr7sv80nglmjxhg83ncfvwg1dszldswr0dhvr"; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/powerline/fonts"; diff --git a/pkgs/data/fonts/pretendard/default.nix b/pkgs/data/fonts/pretendard/default.nix index 40175dc54056..60ecc61c7ec3 100644 --- a/pkgs/data/fonts/pretendard/default.nix +++ b/pkgs/data/fonts/pretendard/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let version = "1.3.3"; - mkPretendard = { pname, typeface, sha256 }: - fetchzip { - name = "${pname}-${version}"; + mkPretendard = { pname, typeface, hash }: + stdenvNoCC.mkDerivation { + inherit pname version; - url = "https://github.com/orioncactus/pretendard/releases/download/v${version}/${typeface}-${version}.zip"; - inherit sha256; + src = fetchzip { + url = "https://github.com/orioncactus/pretendard/releases/download/v${version}/${typeface}-${version}.zip"; + stripRoot = false; + inherit hash; + }; - stripRoot = false; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/ - install -Dm644 $out/public/static/*.otf -t $out/share/fonts/opentype - rm -rf $out/{public,web,LICENSE.txt} + install -Dm644 public/static/*.otf -t $out/share/fonts/opentype + + runHook postInstall ''; meta = with lib; { @@ -32,18 +35,18 @@ in pretendard = mkPretendard { pname = "pretendard"; typeface = "Pretendard"; - sha256 = "sha256-lRHRdCAg3i3+3Y6j0dCXUgwLdeS/VeI6KNkbDKchNEY="; + hash = "sha256-xCEZlwTPhrNIO6WODl55wo2oin+iMYOL/rVaEybpzr0="; }; pretendard-jp = mkPretendard { pname = "pretendard-jp"; typeface = "PretendardJP"; - sha256 = "sha256-VgGt/WoaaJJDAzw+gUQVgTQ+q34bdAaKUB4cA9eU0dQ="; + hash = "sha256-x0G7ULzkIJqZlK995+wWKHXZdWryUTRouGTa5LsJQzk="; }; pretendard-std = mkPretendard { pname = "pretendard-std"; typeface = "PretendardStd"; - sha256 = "sha256-FOlZrr6CHPfUm9Q+Yoi0HLQUI7cAhQYq6P6sJGXBIWg="; + hash = "sha256-/I8LZhFB86/+o+IzUP+bSIq7scKPOL7k/6/Bom0ZSqg="; }; } diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix index da12347af062..e201d643afac 100644 --- a/pkgs/data/fonts/profont/default.nix +++ b/pkgs/data/fonts/profont/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "2019-11"; # Note: stripRoot doesn't work because the archive - # constains the metadata directory `__MACOSX`. + # contains the metadata directory `__MACOSX`. src = fetchzip { url = "https://tobiasjung.name/downloadfile.php?file=profont-x11.zip"; sha256 = "12dbm87wvcpmn7nzgzwlk45cybp091diara8blqm6129ps27z6kb"; diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix index be75da9e6654..068238897831 100644 --- a/pkgs/data/fonts/public-sans/default.nix +++ b/pkgs/data/fonts/public-sans/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "public-sans"; version = "2.001"; -in fetchzip { - name = "public-sans-${version}"; - url = "https://github.com/uswds/public-sans/releases/download/v${version}/public-sans-v${version}.zip"; + src = fetchzip { + url = "https://github.com/uswds/public-sans/releases/download/v${version}/public-sans-v${version}.zip"; + stripRoot = false; + hash = "sha256-XFs/UMXI/kdrW+53t8Mj26+Rn5p+LQ6KW2K2/ShoIag="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + installPhase = '' + runHook preInstall + + install -Dm644 */*/*.otf -t $out/share/fonts/opentype + install -Dm644 */*/*.ttf -t $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "sha256-Ba7D4J72GZQsGn0KINRib9BmHsAnoEsAwAOC+M3CkMU="; - meta = with lib; { description = "A strong, neutral, principles-driven, open source typeface for text or display"; homepage = "https://public-sans.digital.gov/"; diff --git a/pkgs/data/fonts/quattrocento-sans/default.nix b/pkgs/data/fonts/quattrocento-sans/default.nix index 0d62a866e0f0..765959884232 100644 --- a/pkgs/data/fonts/quattrocento-sans/default.nix +++ b/pkgs/data/fonts/quattrocento-sans/default.nix @@ -1,25 +1,29 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "quattrocento-sans"; version = "2.0"; -in fetchzip rec { - name = "quattrocento-sans-${version}"; - url = "https://web.archive.org/web/20170709124317/http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip"; + src = fetchzip { + url = "https://web.archive.org/web/20170709124317/http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip"; + stripRoot = false; + hash = "sha256-L3aFZmaA94B9APxsp8bSBpocIlK3Ehvj/RFXVcW2nso="; + }; - postFetch = '' - mkdir -p $out/share/{fonts,doc} - unzip -j $downloadedFile '*/QuattrocentoSans*.otf' -d $out/share/fonts/opentype - unzip -j $downloadedFile '*/FONTLOG.txt' -d $out/share/doc/${name} + installPhase = '' + runHook preInstall + + install -Dm644 */*/QuattrocentoSans*.otf -t $out/share/fonts/opentype + install -Dm644 */FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall ''; - sha256 = "0g8hnn92ks4y0jbizwj7yfa097lk887wqkqpqjdmc09sd2n44343"; - meta = with lib; { homepage = "http://www.impallari.com/quattrocentosans/"; description = "A classic, elegant and sober sans-serif typeface"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/data/fonts/quattrocento/default.nix b/pkgs/data/fonts/quattrocento/default.nix index aa23175a04d4..a70396437ec1 100644 --- a/pkgs/data/fonts/quattrocento/default.nix +++ b/pkgs/data/fonts/quattrocento/default.nix @@ -1,25 +1,28 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "quattrocento"; version = "1.1"; -in fetchzip rec { - name = "quattrocento-${version}"; - url = "https://web.archive.org/web/20170707001804/http://www.impallari.com/media/releases/quattrocento-v${version}.zip"; + src = fetchzip { + url = "https://web.archive.org/web/20170707001804/http://www.impallari.com/media/releases/quattrocento-v${version}.zip"; + hash = "sha256-ntY6Wl6TI8F7SShMyD8mdOxVg4oz9kvJ7vKTyGdPLtE="; + }; - postFetch = '' - mkdir -p $out/share/{fonts,doc} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*FONTLOG.txt -d $out/share/doc/${name} + installPhase = '' + runHook preInstall + + install -Dm644 */*.otf -t $out/share/fonts/opentype + install -Dm644 FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall ''; - sha256 = "0f8l19y61y20sszn8ni8h9kgl0zy1gyzychg22z5k93ip4h7kfd0"; - meta = with lib; { homepage = "http://www.impallari.com/quattrocento/"; description = "A classic, elegant, sober and strong serif typeface"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix index ddded71a6fa2..935fde722ed9 100644 --- a/pkgs/data/fonts/raleway/default.nix +++ b/pkgs/data/fonts/raleway/default.nix @@ -1,21 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { + pname = "raleway"; version = "2016-08-30"; -in fetchFromGitHub { - name = "raleway-${version}"; - owner = "impallari"; - repo = "Raleway"; - rev = "fa27f47b087fc093c6ae11cfdeb3999ac602929a"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Raleway"; + rev = "fa27f47b087fc093c6ae11cfdeb3999ac602929a"; + hash = "sha256-mcIpE+iqG6M43I5TT95oV+5kNgphunmyxC+Jaj0JysQ="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name "*-Original.otf" -exec install -Dt $out/share/fonts/opentype {} \; - cp *.txt *.md -d $out - ''; - sha256 = "16jr7drqg2wib2q48ajlsa7rh1jxjibl1wd4rjndi49vfl463j60"; + runHook postInstall + ''; meta = { description = "Raleway is an elegant sans-serif typeface family"; diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index 142f84ba7d9e..f634a8c5343a 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,20 +1,19 @@ -{ lib, fetchzip }: +{ lib, fetchzip, stdenvNoCC }: -let - version = "1.084"; -in -fetchzip { - name = "recursive-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "recursive"; + version = "1.085"; - url = "https://github.com/arrowtype/recursive/releases/download/v${version}/ArrowType-Recursive-${version}.zip"; + src = fetchzip { + url = "https://github.com/arrowtype/recursive/releases/download/v${version}/ArrowType-Recursive-${version}.zip"; + sha256 = "sha256-hnGnKnRoQN8vFStW8TjLrrTL1dWsthUEWxfaGF0b0vM="; + }; - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + installPhase = '' + install -D -t $out/share/fonts/opentype/ $(find $src -type f -name '*.otf') + install -D -t $out/share/fonts/truetype/ $(find $src -type f -name '*.ttf') ''; - sha256 = "sha256-YL09RVU9pgP0/aGRKECHzd5t1VmNDPtOFcRygWqIisg="; meta = with lib; { homepage = "https://recursive.design/"; diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix index 9daaffd0b4ba..fd732b401bea 100644 --- a/pkgs/data/fonts/redhat-official/default.nix +++ b/pkgs/data/fonts/redhat-official/default.nix @@ -1,23 +1,26 @@ -{ lib, fetchFromGitHub }: -let +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "redhat-official"; version = "4.0.2"; -in -fetchFromGitHub { - name = "redhat-official-${version}"; - owner = "RedHatOfficial"; - repo = "RedHatFont"; - rev = version; + src = fetchFromGitHub { + owner = "RedHatOfficial"; + repo = "RedHatFont"; + rev = version; + hash = "sha256-p5RS/57CDApwnRDwMi0gIEJYTDAtibIyyU2w/pnbHJI="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 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 = "sha256-904uQtbAdLx9MJudLk/vVk/+uK0nsPbWbAeXrWxTHm8="; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/RedHatOfficial/RedHatFont"; diff --git a/pkgs/data/fonts/rhodium-libre/default.nix b/pkgs/data/fonts/rhodium-libre/default.nix index fc89d6525922..1c36f41b4839 100644 --- a/pkgs/data/fonts/rhodium-libre/default.nix +++ b/pkgs/data/fonts/rhodium-libre/default.nix @@ -1,22 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "RhodiumLibre"; version = "1.2.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "DunwichType"; - repo = pname; - rev = version; + src = fetchFromGitHub { + owner = "DunwichType"; + repo = pname; + rev = version; + hash = "sha256-YCQvUdjEAj4G71WCRCM0+NwiqRqwt1Ggeg9jb/oWEsY="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -Dm444 -t $out/share/fonts/opentype/ RhodiumLibre-Regular.otf install -Dm444 -t $out/share/fonts/truetype/ RhodiumLibre-Regular.ttf - ''; - sha256 = "04ax6bri5vsji465806p8d7zbdf12r5bpvcm9nb8isfqm81ggj0r"; + runHook postInstall + ''; meta = with lib; { description = "F/OSS/Libre font for Latin and Devanagari"; diff --git a/pkgs/data/fonts/roboto-serif/default.nix b/pkgs/data/fonts/roboto-serif/default.nix new file mode 100644 index 000000000000..d6cc1019ccd4 --- /dev/null +++ b/pkgs/data/fonts/roboto-serif/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenvNoCC +, fetchurl +, unzip +}: + +stdenvNoCC.mkDerivation rec { + pname = "roboto-serif"; + version = "1.007"; + + src = fetchurl { + url = "https://github.com/googlefonts/roboto-serif/releases/download/v${version}/RobotoSerifFonts-v${version}.zip"; + hash = "sha256-A14GztkTvaLBvcm1i3A0Vi9vaz77nFYYoSNggqbffFo="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ + unzip + ]; + + installPhase = '' + runHook preInstall + + install -Dm644 variable/*.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; + + meta = with lib; { + description = "The Roboto family of fonts"; + longDescription = '' + Google’s signature family of fonts, the default font on Android and + Chrome OS, and the recommended font for Google’s visual language, + Material Design. + ''; + homepage = "https://github.com/googlefonts/roboto-serif"; + license = licenses.ofl; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix index fe13fdf89d1e..02ca82edf10f 100644 --- a/pkgs/data/fonts/roboto/default.nix +++ b/pkgs/data/fonts/roboto/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "roboto"; version = "2.138"; -in fetchzip { - name = "roboto-${version}"; - url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip"; + src = fetchzip { + url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip"; + stripRoot = false; + hash = "sha256-ue3PUZinBpcYgSho1Zrw1KHl7gc/GlN1GhWFk6g5QXE="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -x __MACOSX/\* -d $out/share/fonts/truetype + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "1s3c48wwvvwd3p4w3hfkri5v2c54j2bdxmd3bjv54klc5mrlh6z3"; - meta = { homepage = "https://github.com/google/roboto"; description = "The Roboto family of fonts"; diff --git a/pkgs/data/fonts/rounded-mgenplus/default.nix b/pkgs/data/fonts/rounded-mgenplus/default.nix index eccbddd1851d..688518150fc7 100644 --- a/pkgs/data/fonts/rounded-mgenplus/default.nix +++ b/pkgs/data/fonts/rounded-mgenplus/default.nix @@ -1,17 +1,25 @@ -{ lib, fetchzip, p7zip }: +{ lib, stdenvNoCC, fetchurl, p7zip }: -let +stdenvNoCC.mkDerivation rec { pname = "rounded-mgenplus"; version = "20150602"; -in fetchzip rec { - name = "${pname}-${version}"; - url = "https://osdn.jp/downloads/users/8/8598/${name}.7z"; - postFetch = '' - ${p7zip}/bin/7z x $downloadedFile + src = fetchurl { + url = "https://osdn.jp/downloads/users/8/8598/${pname}-${version}.7z"; + hash = "sha256-7OpnZJc9k5NiOPHAbtJGMQvsMg9j81DCvbfo0f7uJcw="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ p7zip ]; + + installPhase = '' + runHook preInstall + install -m 444 -D -t $out/share/fonts/${pname} ${pname}-*.ttf + + runHook postInstall ''; - sha256 = "0vwdknagdrl5dqwpb1x5lxkbfgvbx8dpg7cb6yamgz71831l05v1"; meta = with lib; { description = "A Japanese font based on Rounded M+ and Noto Sans Japanese"; diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/data/fonts/route159/default.nix index cbc89c550b3c..4d0bf9941b44 100644 --- a/pkgs/data/fonts/route159/default.nix +++ b/pkgs/data/fonts/route159/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "1"; minorVersion = "10"; - pname = "route159"; in +stdenvNoCC.mkDerivation (self: { + pname = "route159"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-1InyBW1LGbp/IU/ql9mvT14W3MTxJdWThFwRH6VHpTU="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; - sha256 = "1nv5csg73arvvwpac7ylh4j9n0s3qp79rbv2s4jvs2bf6gqhsq7h"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "A weighted sans serif font"; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.ofl; }; -} +}) diff --git a/pkgs/data/fonts/ruwudu/default.nix b/pkgs/data/fonts/ruwudu/default.nix index 2002f4b67203..61f306c71024 100644 --- a/pkgs/data/fonts/ruwudu/default.nix +++ b/pkgs/data/fonts/ruwudu/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "ruwudu"; version = "2.000"; - url = "https://software.sil.org/downloads/r/ruwudu/Ruwudu-${version}.zip"; + src = fetchzip { + url = "https://software.sil.org/downloads/r/ruwudu/Ruwudu-${version}.zip"; + hash = "sha256-FP+ZHm1fKlozAAI2PbJ4r4v5OwRxBtYMRLmRwPbqx2I="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - rm -rf $out/web $out/manifest.json mkdir -p $out/share/{doc/${pname},fonts/truetype} - mv $out/*.ttf $out/share/fonts/truetype/ - mv $out/*.txt $out/documentation $out/share/doc/${pname}/ - ''; + mv *.ttf $out/share/fonts/truetype/ + mv *.txt documentation $out/share/doc/${pname}/ - sha256 = "sha256-JCvVPbAFBWHL2eEnEUSgdTZ+Vkw3wkS3aS85xQZKNQs="; + runHook postInstall + ''; meta = with lib; { homepage = "https://software.sil.org/ruwudu/"; diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/pkgs/data/fonts/sahel-fonts/default.nix index 9079ba7fada0..860a0066270d 100644 --- a/pkgs/data/fonts/sahel-fonts/default.nix +++ b/pkgs/data/fonts/sahel-fonts/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "sahel-fonts"; version = "3.4.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "sahel-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "sahel-font"; + rev = "v${version}"; + hash = "sha256-U4tIICXZFK9pk7zdzRwBPIPYFUlYXPSebnItUJUgGJY="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/sahel-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-MrKSgz9WpVgLS37uH/7S0LPBD/n3GLXeUCMBD7x5CG8="; meta = with lib; { homepage = "https://github.com/rastikerdar/sahel-font"; diff --git a/pkgs/data/fonts/samim-fonts/default.nix b/pkgs/data/fonts/samim-fonts/default.nix index b29114e6b1c4..a1785e1b9373 100644 --- a/pkgs/data/fonts/samim-fonts/default.nix +++ b/pkgs/data/fonts/samim-fonts/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "samim-fonts"; - version = "4.0.4"; -in fetchFromGitHub { - name = "${pname}-${version}"; + version = "4.0.5"; - owner = "rastikerdar"; - repo = "samim-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "samim-font"; + rev = "v${version}"; + hash = "sha256-DVBMsNOVAVwzlZ3cDus/3CSsC05bLZalQ2KeueEvwXs="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/samim-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-WYSJ2mAzAe5H0EaMYU3qNVcQ0lRuHsjZ11YmLnZ2FCo="; meta = with lib; { homepage = "https://github.com/rastikerdar/samim-font"; diff --git a/pkgs/data/fonts/sampradaya/default.nix b/pkgs/data/fonts/sampradaya/default.nix index 749abb71dbd4..8c0545d2c7fe 100644 --- a/pkgs/data/fonts/sampradaya/default.nix +++ b/pkgs/data/fonts/sampradaya/default.nix @@ -1,16 +1,26 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip { - name = "sampradaya-2015-05-26"; +stdenvNoCC.mkDerivation rec { + pname = "sampradaya"; + version = "0.5.0"; - url = "https://bitbucket.org/OorNaattaan/sampradaya/raw/afa9f7c6ab17e14bd7dd74d0acaec2f75454dfda/Sampradaya.ttf"; + src = fetchurl { + url = "https://github.com/deepestblue/sampradaya/releases/download/v${version}/Sampradaya.ttf"; + hash = "sha256-ygKMNzHvbLR2A5HHrfY2C9ZUg0yng+JL3cyg6sBKqeQ="; + }; - postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/Sampradaya.ttf"; + dontUnpack = true; - sha256 = "1pqyj5r5jc7dk8yyzl7i6qq2m9zvahcjj49a66wwzdby5zyw8dqv"; + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fonts/truetype/Sampradaya.ttf + + runHook postInstall + ''; meta = with lib; { - homepage = "https://bitbucket.org/OorNaattaan/sampradaya/"; + homepage = "https://github.com/deepestblue/sampradaya"; description = "Unicode-compliant Grantha font"; maintainers = with maintainers; [ mathnerd314 ]; license = licenses.ofl; # See font metadata diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 24ebfe40d58b..c874afde34ac 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,21 +1,27 @@ -{ lib, fetchurl, libarchive }: +{ lib, stdenvNoCC, fetchurl, p7zip }: -let - version = "0.37.4"; -in fetchurl { - name = "sarasa-gothic-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "sarasa-gothic"; + version = "0.38.0"; - # 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-fbZN4+SHb2Qelnp122M2I0enbcEl+Qh1oSMiDLAYwSs="; + src = fetchurl { + # Use the 'ttc' files here for a smaller closure size. + # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) + url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; + hash = "sha256-UXWstk1vIoaFqa8nVxfJcAtN7BzWevzgfMx1gyXu0k8="; + }; - recursiveHash = true; - downloadToTemp = true; + sourceRoot = "."; + + nativeBuildInputs = [ p7zip ]; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - ${libarchive}/bin/bsdtar -xf $downloadedFile -C $out/share/fonts/truetype + cp *.ttc $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/scheherazade/default.nix b/pkgs/data/fonts/scheherazade/default.nix index e91d108ade8e..9960248b0d75 100644 --- a/pkgs/data/fonts/scheherazade/default.nix +++ b/pkgs/data/fonts/scheherazade/default.nix @@ -1,28 +1,31 @@ -{ lib, fetchzip, version ? "3.300" }: +{ lib, stdenvNoCC, fetchzip, version ? "3.300" }: let new = lib.versionAtLeast version "3.000"; - sha256 = { - "2.100" = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z"; - "3.300" = "1bja1ma1mnna0qlk3dis31cvq5z1kgcqj7wjp8ml03zc5mpa2wb2"; + hash = { + "2.100" = "sha256-d2UyOOOnmE1afCwyIrM1bL3lQC7XRwh03hzetk/4V30="; + "3.300" = "sha256-LaaA6DWAE2dcwVVX4go9cJaiuwI6efYbPk82ym3W3IY="; }."${version}"; + pname = "scheherazade${lib.optionalString new "-new"}"; +in +stdenvNoCC.mkDerivation rec { + inherit pname version; -in fetchzip rec { - name = "scheherazade${lib.optionalString new "-new"}-${version}"; + src = fetchzip { + url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade${lib.optionalString new "New"}-${version}.zip"; + inherit hash; + }; - url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade${lib.optionalString new "New"}-${version}.zip"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -l $downloadedFile - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip $downloadedFile \*/documentation/\* -d $out/share/doc/ - mv $out/share/doc/* $out/share/doc/${name} - unzip -j $downloadedFile \*/FONTLOG.txt \*/README.txt -d $out/share/doc/${name} + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 FONTLOG.txt README.txt -t $out/share/doc + cp -r documentation $out/share/doc/ + + runHook postInstall ''; - inherit sha256; - meta = with lib; { homepage = "https://software.sil.org/scheherazade/"; description = "A font designed in a similar style to traditional Naskh typefaces"; diff --git a/pkgs/data/fonts/scientifica/default.nix b/pkgs/data/fonts/scientifica/default.nix index bf5b887cc771..1f946ecb17af 100644 --- a/pkgs/data/fonts/scientifica/default.nix +++ b/pkgs/data/fonts/scientifica/default.nix @@ -1,25 +1,24 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "scientifica"; version = "2.3"; -in fetchurl rec { - name = "scientifica-${version}"; - url = "https://github.com/NerdyPepper/scientifica/releases/download/v${version}/scientifica.tar"; + src = fetchurl { + url = "https://github.com/NerdyPepper/scientifica/releases/download/v${version}/scientifica.tar"; + hash = "sha256-8IV4aaDoRsbxddy4U90fEZ6henUhjmO38HNtWo4ein8="; + }; - downloadToTemp = true; + installPhase = '' + runHook preInstall - recursiveHash = true; - - sha256 = "sha256-pVWkj/2lFpmWk0PPDrIMU4Gey7/m/9tzUsuD3ZDUAdc="; - - postFetch = '' - tar xf $downloadedFile mkdir -p $out/share/fonts/truetype mkdir -p $out/share/fonts/misc - install scientifica/ttf/*.ttf $out/share/fonts/truetype - install scientifica/otb/*.otb $out/share/fonts/misc - install scientifica/bdf/*.bdf $out/share/fonts/misc + install ttf/*.ttf $out/share/fonts/truetype + install otb/*.otb $out/share/fonts/misc + install bdf/*.bdf $out/share/fonts/misc + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/data/fonts/seshat/default.nix index 71483a04cbb7..7ed7abd5fb17 100644 --- a/pkgs/data/fonts/seshat/default.nix +++ b/pkgs/data/fonts/seshat/default.nix @@ -1,24 +1,29 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "100"; - pname = "seshat"; in +stdenvNoCC.mkDerivation (self: { + pname = "seshat"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-XgprDhzAbcTzZw2QOwpCnzusYheYmSlM+ApU+Y0wO2Q="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}.zip"; - sha256 = "1zzgc2d0jrris92p3irmxjhdq8aj99alz0z7dlz25qf37lcilrir"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "Roman body font designed for main text by Sora Sagano"; longDescription = '' Seshat is a Roman body font designed for the main text. By @@ -31,7 +36,7 @@ fetchzip { It incorporates symbols and ligatures used in the European region. ''; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.cc0; }; -} +}) diff --git a/pkgs/data/fonts/shabnam-fonts/default.nix b/pkgs/data/fonts/shabnam-fonts/default.nix index d5e7e2b243c3..c5f5e00e023a 100644 --- a/pkgs/data/fonts/shabnam-fonts/default.nix +++ b/pkgs/data/fonts/shabnam-fonts/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "shabnam-fonts"; version = "5.0.1"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "shabnam-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "shabnam-font"; + rev = "v${version}"; + hash = "sha256-H03GTKRVPiwU4edkr4x5upW4JCy6320Lo+cKK9FRMQs="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/shabnam-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-m4G4UtW/0S9CsvaSF7QfthfIxGQ02E7SucdDm5s3G7A="; meta = with lib; { homepage = "https://github.com/rastikerdar/shabnam-font"; diff --git a/pkgs/data/fonts/shrikhand/default.nix b/pkgs/data/fonts/shrikhand/default.nix index 684f3d0395e9..0db94ebd4ecb 100644 --- a/pkgs/data/fonts/shrikhand/default.nix +++ b/pkgs/data/fonts/shrikhand/default.nix @@ -1,15 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let - version = "2016-03-03"; -in fetchzip { - name = "shrikhand-${version}"; +stdenvNoCC.mkDerivation { + pname = "shrikhand"; + version = "unstable-2016-03-03"; - url = "https://github.com/jonpinhorn/shrikhand/raw/c11c9b0720fba977fad7cb4f339ebacdba1d1394/build/Shrikhand-Regular.ttf"; + src = fetchurl { + url = "https://github.com/jonpinhorn/shrikhand/raw/c11c9b0720fba977fad7cb4f339ebacdba1d1394/build/Shrikhand-Regular.ttf"; + hash = "sha256-wHP1Bwu5Yw3a+RwDOHrmthsnuvwyCV4l6ma5EjA6EMA="; + }; - postFetch = "install -D -m644 $downloadedFile $out/share/fonts/truetype/Shrikhand-Regular.ttf"; + dontUnpack = true; - sha256 = "0s54k9cs1g2yz6lwg5gakqb12vg5qkfdz3pc8mh7mib2s6q926hs"; + installPhase = '' + runHook preInstall + + install -D -m644 $src $out/share/fonts/truetype/Shrikhand-Regular.ttf + + runHook postInstall + ''; meta = with lib; { homepage = "https://jonpinhorn.github.io/shrikhand/"; diff --git a/pkgs/data/fonts/sil-abyssinica/default.nix b/pkgs/data/fonts/sil-abyssinica/default.nix index 7cefdf077610..f01c50b42608 100644 --- a/pkgs/data/fonts/sil-abyssinica/default.nix +++ b/pkgs/data/fonts/sil-abyssinica/default.nix @@ -1,18 +1,22 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "2.100"; -in -fetchzip rec { - name = "sil-abyssinica-${version}"; - url = "https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-${version}.zip"; - sha256 = "sha256-06olbIdSlhJ4hgblzzabqIs57FpsyWIdPDFXb9vK31A="; +stdenvNoCC.mkDerivation rec { + pname = "sil-abyssinica"; + version = "2.200"; - postFetch = '' - rm -rf $out/web - mkdir -p $out/share/{fonts/truetype,doc/${name}} - mv $out/*.ttf $out/share/fonts/truetype/ - mv $out/*.txt $out/documentation $out/share/doc/${name}/ + src = fetchzip { + url = "https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-${version}.zip"; + hash = "sha256-IdWMZHm9VoLVDO0//ISujxlXUxe0O6+aEcdP63YRmPg="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{fonts/truetype,doc/${pname}-${version}} + mv *.ttf $out/share/fonts/truetype/ + mv *.txt documentation $out/share/doc/${pname}-${version}/ + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/sil-padauk/default.nix b/pkgs/data/fonts/sil-padauk/default.nix index b993ef5ae6b6..fe45da131738 100644 --- a/pkgs/data/fonts/sil-padauk/default.nix +++ b/pkgs/data/fonts/sil-padauk/default.nix @@ -1,19 +1,23 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "sil-padauk"; version = "5.001"; -in -fetchzip rec { - name = "sil-padauk-${version}"; - url = "https://software.sil.org/downloads/r/padauk/Padauk-${version}.zip"; - sha256 = "sha256-6H9EDmXr1Ox2fgLw9sG5JrCAllK3tbjvMfLi8DTF1f0="; - postFetch = '' + src = fetchzip { + url = "https://software.sil.org/downloads/r/padauk/Padauk-${version}.zip"; + hash = "sha256-rLzuDUd+idjTN0xQxblXQ9V2rQtJPN2EtWGmTRY1R7U="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype - rm -rf $out/{manifest.json,web/} - mv $out/*.ttf $out/share/fonts/truetype/ - mkdir -p $out/share/doc/${name} - mv $out/*.txt $out/documentation/ $out/share/doc/${name}/ + mv *.ttf $out/share/fonts/truetype/ + mkdir -p $out/share/doc/${pname}-${version} + mv *.txt documentation/ $out/share/doc/${pname}-${version}/ + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/sitelen-seli-kiwen/default.nix b/pkgs/data/fonts/sitelen-seli-kiwen/default.nix index 60f5c3e36e76..de0fec7b6f3e 100644 --- a/pkgs/data/fonts/sitelen-seli-kiwen/default.nix +++ b/pkgs/data/fonts/sitelen-seli-kiwen/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - rev = "69132c99873894746c9710707aaeb2cea2609709"; -in -fetchzip { +stdenvNoCC.mkDerivation { pname = "sitelen-seli-kiwen"; version = "unstable-2022-06-28"; - url = "https://raw.githubusercontent.com/kreativekorp/sitelen-seli-kiwen/${rev}/sitelenselikiwen.zip"; - hash = "sha256-63sl/Ha2QAe8pVKCpLNs//DB0kjLdW01u6tVMrGquIU="; - stripRoot = false; + src = fetchzip { + url = "https://raw.githubusercontent.com/kreativekorp/sitelen-seli-kiwen/69132c99873894746c9710707aaeb2cea2609709/sitelenselikiwen.zip"; + stripRoot = false; + hash = "sha256-viOLAj9Rn60bcQkkDHVuKHCE8KPnIz/L0hIJhum1SSQ="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/{opentype,truetype} - mv $out/*.eot $out/share/fonts/opentype/ - mv $out/*.ttf $out/share/fonts/truetype/ + mv *.eot $out/share/fonts/opentype/ + mv *.ttf $out/share/fonts/truetype/ + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/smiley-sans/default.nix b/pkgs/data/fonts/smiley-sans/default.nix new file mode 100644 index 000000000000..ecc87dbfef00 --- /dev/null +++ b/pkgs/data/fonts/smiley-sans/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenvNoCC, fetchzip, nix-update-script }: + +stdenvNoCC.mkDerivation rec { + pname = "smiley-sans"; + version = "1.1.1"; + + src = fetchzip { + url = "https://github.com/atelier-anchor/smiley-sans/releases/download/v${version}/smiley-sans-v${version}.zip"; + sha256 = "sha256-/lsAZRHgmx1TMjm2O5Z0IOiHQM8LKJPXcBKZrlXt3RA="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + install -Dm644 -t $out/share/fonts/opentype *.otf + install -Dm644 -t $out/share/fonts/truetype *.ttf + install -Dm644 -t $out/share/fonts/woff2 *.woff2 + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "A condensed and oblique Chinese typeface seeking a visual balance between the humanist and the geometric"; + homepage = "https://atelier-anchor.com/typefaces/smiley-sans/"; + changelog = "https://github.com/atelier-anchor/smiley-sans/blob/main/CHANGELOG.md"; + license = licenses.ofl; + maintainers = with maintainers; [ candyc1oud ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix index eaf82d412a1d..c94e9aaca480 100644 --- a/pkgs/data/fonts/source-code-pro/default.nix +++ b/pkgs/data/fonts/source-code-pro/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "source-code-pro"; version = "2.038"; -in fetchzip { - name = "source-code-pro-${version}"; - url = "https://github.com/adobe-fonts/source-code-pro/releases/download/${version}R-ro%2F1.058R-it%2F1.018R-VAR/OTF-source-code-pro-${version}R-ro-1.058R-it.zip"; + src = fetchzip { + url = "https://github.com/adobe-fonts/source-code-pro/releases/download/${version}R-ro%2F1.058R-it%2F1.018R-VAR/OTF-source-code-pro-${version}R-ro-1.058R-it.zip"; + stripRoot = false; + hash = "sha256-ijeTLka131jf6B9xj/eNWK1T5r7r3aBXBgnVyRAxmuY="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + installPhase = '' + runHook preInstall + + install -Dm644 *.otf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "027cf62zj27q7l3d4sqzdfgz423lzysihdg8cvmkk6z910a1v368"; - meta = { description = "Monospaced font family for user interface and coding environments"; maintainers = with lib.maintainers; [ relrod ]; diff --git a/pkgs/data/fonts/source-han-code-jp/default.nix b/pkgs/data/fonts/source-han-code-jp/default.nix index 7f12fee5067b..2a64680ee19b 100644 --- a/pkgs/data/fonts/source-han-code-jp/default.nix +++ b/pkgs/data/fonts/source-han-code-jp/default.nix @@ -1,20 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { pname = "source-han-code-jp"; - version = "2.012R"; -in fetchzip { - name = "${pname}-${version}"; + version = "2.012"; - url = "https://github.com/adobe-fonts/${pname}/archive/${version}.zip"; + src = fetchzip { + url = "https://github.com/adobe-fonts/${pname}/archive/${version}R.zip"; + hash = "sha256-ljO/1/CaE9Yj+AN5xxlIr30/nV/axGQPO0fGACAZGCQ="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + installPhase = '' + runHook preInstall + + install -Dm444 OTF/*.otf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "16y5as1k864ghy3vzp8svr3q0sw57rv53za3f48700ksvxz5pwry"; - meta = { description = "A monospaced Latin font suitable for coding"; maintainers = with lib.maintainers; [ mt-caret ]; diff --git a/pkgs/data/fonts/source-han/default.nix b/pkgs/data/fonts/source-han/default.nix index 1672af411c04..2f9111865455 100644 --- a/pkgs/data/fonts/source-han/default.nix +++ b/pkgs/data/fonts/source-han/default.nix @@ -1,6 +1,7 @@ -{ stdenvNoCC -, lib -, fetchzip +{ lib +, stdenvNoCC +, fetchurl +, unzip }: let @@ -8,21 +9,37 @@ let { family , description , rev - , sha256 - , postFetch ? '' - install -m444 -Dt $out/share/fonts/opentype/source-han-${family} $downloadedFile - '' + , hash , zip ? "" }: let Family = lib.toUpper (lib.substring 0 1 family) + lib.substring 1 (lib.stringLength family) family; in - fetchzip { - name = "source-han-${family}-${lib.removeSuffix "R" rev}"; + stdenvNoCC.mkDerivation rec { + pname = "source-han-${family}"; + version = lib.removeSuffix "R" rev; - url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/SourceHan${Family}.ttc${zip}"; - inherit sha256 postFetch; + src = fetchurl { + url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/SourceHan${Family}.ttc${zip}"; + inherit hash; + }; + + nativeBuildInputs = lib.optionals (zip == ".zip") [ unzip ]; + + unpackPhase = lib.optionalString (zip == "") '' + cp $src SourceHan${Family}.ttc${zip} + '' + lib.optionalString (zip == ".zip") '' + unzip $src + ''; + + installPhase = '' + runHook preInstall + + install -Dm444 *.ttc -t $out/share/fonts/opentype/${pname} + + runHook postInstall + ''; meta = { description = "An open source Pan-CJK ${description} typeface"; @@ -37,11 +54,7 @@ in family = "sans"; description = "sans-serif"; rev = "2.004R"; - sha256 = "052d17hvz435zc4r2y1p9cgkkgn0ps8g74mfbvnbm1pv8ykj40m9"; - postFetch = '' - mkdir -p $out/share/fonts/opentype/source-han-sans - unzip $downloadedFile -d $out/share/fonts/opentype/source-han-sans - ''; + hash = "sha256-b1kRiprdpaf+Tp5rtTgwn34dPFQR+anTKvMqeVAbfk8="; zip = ".zip"; }; @@ -49,11 +62,7 @@ in family = "serif"; description = "serif"; rev = "2.000R"; - sha256 = "0x3n6s4khdd6l0crwd7g9sjaqp8lkvksglhc7kj3cv80hldab9wp"; - postFetch = '' - mkdir -p $out/share/fonts/opentype/source-han-serif - unzip $downloadedFile -d $out/share/fonts/opentype/source-han-serif - ''; + hash = "sha256-RDgywab7gwT+YBO7F1KJvKOv0E/3+7Zi/pQl+UDsGcM="; zip = ".zip"; }; @@ -61,6 +70,6 @@ in family = "mono"; description = "monospaced"; rev = "1.002"; - sha256 = "010h1y469c21bjavwdmkpbwk3ny686inz8i062wh1dhcv8cnqk3c"; + hash = "sha256-DBkkSN6QhI8R64M2h2iDqaNtxluJZeSJYAz8x6ZzWME="; }; } diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix index 879f5083e235..2a2d2c70f289 100644 --- a/pkgs/data/fonts/source-sans-pro/default.nix +++ b/pkgs/data/fonts/source-sans-pro/default.nix @@ -1,25 +1,29 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, 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 { + +stdenvNoCC.mkDerivation rec { name = "source-sans-pro-${version}"; + version = "3.006"; - url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; + src = fetchzip { + url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; + hash = "sha256-1Savijgq3INuUN89MR0t748HOuGseXVw5Kd4hYwuVas="; + }; - 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 + installPhase = '' + runHook preInstall + + install -Dm444 OTF/*.otf -t $out/share/fonts/opentype + install -Dm444 TTF/*.ttf -t $out/share/fonts/truetype + install -Dm444 VAR/*.otf -t $out/share/fonts/variable + + runHook postInstall ''; - 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"; diff --git a/pkgs/data/fonts/source-sans/default.nix b/pkgs/data/fonts/source-sans/default.nix index c16d0d2b8b4f..1433804ce71d 100644 --- a/pkgs/data/fonts/source-sans/default.nix +++ b/pkgs/data/fonts/source-sans/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "source-sans"; version = "3.046"; -in fetchzip { - name = "source-sans-${version}"; - url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; + src = fetchzip { + url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; + hash = "sha256-nBLEK+T5n1CdZK2zvCWIhF2MxPmiAwL9l55a55yHtgU="; + }; - 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 + installPhase = '' + runHook preInstall + + install -Dm444 OTF/*.otf -t $out/share/fonts/opentype + install -Dm444 TTF/*.ttf -t $out/share/fonts/truetype + install -Dm444 VAR/*.otf -t $out/share/fonts/variable + + runHook postInstall ''; - sha256 = "1wxdinnliq0xqbjrs0sqykwaggkmyqawfq862d9xn05g1pnxda94"; - meta = with lib; { homepage = "https://adobe-fonts.github.io/source-sans/"; description = "Sans serif font family for user interface environments"; diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix index a4d472d60856..698694faf507 100644 --- a/pkgs/data/fonts/source-serif-pro/default.nix +++ b/pkgs/data/fonts/source-serif-pro/default.nix @@ -1,25 +1,29 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, 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 + +stdenvNoCC.mkDerivation rec { + pname = "source-serif-pro"; 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"; + src = fetchzip { + url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-pro-${version}R.zip"; + hash = "sha256-chXoaPOACtQ7wz/etElXuIJH/yvUsP03WlxeCfqWF/w="; + }; - 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 + installPhase = '' + runHook preInstall + + install -Dm444 OTF/*.otf -t $out/share/fonts/opentype + install -Dm444 TTF/*.ttf -t $out/share/fonts/truetype + install -Dm444 VAR/*.otf -t $out/share/fonts/variable + + runHook postInstall ''; - 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"; diff --git a/pkgs/data/fonts/source-serif/default.nix b/pkgs/data/fonts/source-serif/default.nix index 855fe7e6e9e9..626b36f2705b 100644 --- a/pkgs/data/fonts/source-serif/default.nix +++ b/pkgs/data/fonts/source-serif/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "source-serif"; version = "4.004"; -in fetchzip { - name = "source-serif-${version}"; - url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-${version}.zip"; + src = fetchzip { + url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-${version}.zip"; + hash = "sha256-tGSMOwYBEZat7MI78wkPr6lgJdsOdOaIZb+IAOoOlq4="; + }; - 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 + installPhase = '' + runHook preInstall + + install -Dm444 OTF/*.otf -t $out/share/fonts/opentype + install -Dm444 TTF/*.ttf -t $out/share/fonts/truetype + install -Dm444 VAR/*.otf -t $out/share/fonts/variable + + runHook postInstall ''; - sha256 = "06814hcp20abca6p0ii61f23g6h1ibqyhq30lsva59wbwx5iha0h"; - 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"; diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index 737a799438fc..ec2a1da08489 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -1,25 +1,31 @@ -{ lib, fetchurl, xorg }: +{ lib, stdenvNoCC, fetchurl, xorg }: -let +stdenvNoCC.mkDerivation rec { pname = "spleen"; version = "1.9.1"; -in fetchurl { - name = "${pname}-${version}"; - url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - tar xvf $downloadedFile --strip=1 + src = fetchurl { + url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; + hash = "sha256-fvWcTgKkXp3e1ryhi1Oc3w8OtJ5svLJXhY2lasXapiI="; + }; + + nativeBuildInputs = [ xorg.mkfontscale ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + d="$out/share/fonts/misc" install -D -m 644 *.{pcf,bdf,otf} -t "$d" install -D -m 644 *.psfu -t "$out/share/consolefonts" install -m644 fonts.alias-spleen $d/fonts.alias # create fonts.dir so NixOS xorg module adds to fp - ${xorg.mkfontscale}/bin/mkfontdir "$d" + mkfontdir "$d" + + runHook postInstall ''; - sha256 = "sha256-6Imsa0ku8On63di0DOo0QxBa0t+tbtPRxM531EIiG94="; meta = with lib; { description = "Monospaced bitmap fonts"; diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/data/fonts/stix-otf/default.nix index 894fd22c36f9..c5505b7a7948 100644 --- a/pkgs/data/fonts/stix-otf/default.nix +++ b/pkgs/data/fonts/stix-otf/default.nix @@ -1,24 +1,28 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "stix-otf"; version = "1.1.1"; -in fetchzip { - name = "stix-otf-${version}"; - url = "http://ftp.fi.muni.cz/pub/linux/gentoo/distfiles/STIXv${version}-word.zip"; + src = fetchzip { + url = "https://sources.debian.org/src/fonts-stix/1.1.1-4.1/STIXv${version}-word.zip"; + stripRoot = false; + hash = "sha256-M3STue+RPHi8JgZZupV0dVLZYKBiFutbBOlanuKkD08="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + installPhase = '' + runHook preInstall + + install -Dm644 Fonts/STIX-Word/*.otf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "04d4qxq3i9fyapsmxk6d9v1xirjam8c74fyxs6n24d3gf2945zmw"; - meta = with lib; { homepage = "http://www.stixfonts.org/"; description = "Fonts for Scientific and Technical Information eXchange"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/data/fonts/stix-two/default.nix index c05c1273a48e..86ceb388f86a 100644 --- a/pkgs/data/fonts/stix-two/default.nix +++ b/pkgs/data/fonts/stix-two/default.nix @@ -1,18 +1,22 @@ -{ lib, fetchzip }: -let +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "stix-two"; version = "2.13"; -in -fetchzip { - name = "stix-two-${version}"; - url = "https://github.com/stipub/stixfonts/raw/v${version}/zipfiles/STIX${builtins.replaceStrings [ "." ] [ "_" ] version}-all.zip"; + src = fetchzip { + url = "https://github.com/stipub/stixfonts/raw/v${version}/zipfiles/STIX${builtins.replaceStrings [ "." ] [ "_" ] version}-all.zip"; + stripRoot = false; + hash = "sha256-hfQmrw7HjlhQSA0rVTs84i3j3iMVR0k7tCRBcB6hEpU="; + }; - sha256 = "sha256-cBtZe/oq4bQCscSAhJ4YuTSghDleD9O/+3MHOJyI50o="; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + install -Dm644 */*.otf -t $out/share/fonts/opentype + install -Dm644 */*.ttf -t $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index e1b43e39c605..26870d8003b9 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -1,16 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "0.64"; -in fetchzip { - name = "sudo-font-${version}"; - url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - sha256 = "sha256-ewLTeIVY76eq5mHTnjIsJ5Q2CMuBqXJzxvjZTONPsr8="; +stdenvNoCC.mkDerivation rec { + pname = "sudo-font"; + version = "0.69"; - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/ + src = fetchzip { + url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; + hash = "sha256-GXlQh9JRAzbwWKTJw/y003ywjaWtiQayHxiWPTPvIO0="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype/ + + runHook postInstall ''; + meta = with lib; { description = "Font for programmers and command line users"; homepage = "https://www.kutilek.de/sudo-font/"; diff --git a/pkgs/data/fonts/tai-languages/default.nix b/pkgs/data/fonts/tai-languages/default.nix index 71ca170afb1d..4e4c689b6ac6 100644 --- a/pkgs/data/fonts/tai-languages/default.nix +++ b/pkgs/data/fonts/tai-languages/default.nix @@ -1,24 +1,34 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: { -tai-ahom = fetchzip { - name = "tai-ahom-2015-07-06"; + tai-ahom = stdenvNoCC.mkDerivation rec { + pname = "tai-ahom"; + version = "unstable-2015-07-06"; - url = "https://github.com/enabling-languages/tai-languages/blob/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf?raw=true"; + src = fetchurl { + url = "https://github.com/enabling-languages/tai-languages/raw/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf"; + hash = "sha256-U1vcVf/VgXhvK1f2Iw2JKkd2EzJgz7KbHAwnUanX8n4="; + }; - postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/AhomUnicode.ttf"; + dontUnpack = true; - sha256 = "03h8ql9d5bzq4j521j0cz08ddf717bzim1nszh2aar6kn0xqnp9q"; + installPhase = '' + runHook preInstall - meta = with lib; { - homepage = "https://github.com/enabling-languages/tai-languages"; - description = "Unicode-compliant Tai Ahom font"; - maintainers = with maintainers; [ mathnerd314 ]; - license = licenses.ofl; # See font metadata - platforms = platforms.all; + install -Dm644 $src $out/share/fonts/truetype/AhomUnicode.ttf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/enabling-languages/tai-languages"; + description = "Unicode-compliant Tai Ahom font"; + maintainers = with maintainers; [ mathnerd314 ]; + license = licenses.ofl; # See font metadata + platforms = platforms.all; + }; }; -}; -# TODO: package others (Khamti Shan, Tai Aiton, Tai Phake, and/or Assam Tai) + # TODO: package others (Khamti Shan, Tai Aiton, Tai Phake, and/or Assam Tai) } diff --git a/pkgs/data/fonts/takao/default.nix b/pkgs/data/fonts/takao/default.nix index dcbce858e011..353287d4d77b 100644 --- a/pkgs/data/fonts/takao/default.nix +++ b/pkgs/data/fonts/takao/default.nix @@ -1,20 +1,21 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "takao"; version = "00303.01"; -in -fetchzip { - name = "takao-${version}"; - url = "mirror://ubuntu/pool/universe/f/fonts-takao/fonts-takao_${version}.orig.tar.gz"; - sha256 = "sha256-TlPq3iIv8vHlxYu5dkX/Lf6ediYKQaQ5uMbFvypQM/w="; - postFetch = '' - unpackDir="$TMPDIR/unpack" - mkdir "$unpackDir" - cd "$unpackDir" - tar xf "$downloadedFile" --strip-components=1 + src = fetchurl { + url = "mirror://ubuntu/pool/universe/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.gz"; + hash = "sha256-0wjHNv1yStp0q9D0WfwjgUYoUKcCrXA5jFO8PEVgq5k="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts cp *.ttf $out/share/fonts + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/tamzen/default.nix b/pkgs/data/fonts/tamzen/default.nix index 8fcfe694299a..f589455e9811 100644 --- a/pkgs/data/fonts/tamzen/default.nix +++ b/pkgs/data/fonts/tamzen/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Bitmapped programming font based on Tamsyn"; longDescription = '' - Tamzen is a monospace bitmap font. It is programatically forked + Tamzen is a monospace bitmap font. It is programmatically forked from Tamsyn version 1.11, which backports glyphs from older versions while deleting deliberately empty glyphs to allow secondary/fallback fonts to provide real glyphs at those codepoints. diff --git a/pkgs/data/fonts/tenderness/default.nix b/pkgs/data/fonts/tenderness/default.nix index 09ea566e7382..40b284c2549f 100644 --- a/pkgs/data/fonts/tenderness/default.nix +++ b/pkgs/data/fonts/tenderness/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "601"; - pname = "tenderness"; in +stdenvNoCC.mkDerivation (self: { + pname = "tenderness"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-bwJKW+rY7/r2pBCSA6HYlaRMsI/U8UdW2vV4tmYuJww="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; - sha256 = "0d88l5mzq0k63zsmb8d5w3hfqxy04vpv4j0j8nmj1xv6kikhhybh"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "Serif font designed by Sora Sagano with old-style figures"; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.ofl; }; -} +}) diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index 3eca29882d80..6231d0e0c1dc 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -1,14 +1,16 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "terminus-font-ttf"; version = "4.49.1"; -in fetchzip { - name = "terminus-font-ttf-${version}"; - url = "https://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; + src = fetchzip { + url = "https://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; + hash = "sha256-NKswkZR05V21mszT56S2x85k//qhfzRShhepYaAybDc="; + }; - postFetch = '' - unzip -j $downloadedFile + installPhase = '' + runHook preInstall for i in *.ttf; do local destname="$(echo "$i" | sed -E 's|-[[:digit:].]+\.ttf$|.ttf|')" @@ -16,9 +18,9 @@ in fetchzip { done install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING" - ''; - sha256 = "sha256-UaTnCamIRN/3xZsYt5nYzvykXQ3ri94a047sWOJ2RfU="; + runHook postInstall + ''; meta = with lib; { description = "A clean fixed width TTF font"; diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index 348f341cea50..cbda0cc100c3 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { 16x32. The styles are normal and bold (except for 6x12), plus EGA/VGA-bold for 8x14 and 8x16. ''; - homepage = "http://terminus-font.sourceforge.net/"; + homepage = "https://terminus-font.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ astsmtl ]; }; diff --git a/pkgs/data/fonts/theano/default.nix b/pkgs/data/fonts/theano/default.nix index 360d32f3e625..3a3107e13666 100644 --- a/pkgs/data/fonts/theano/default.nix +++ b/pkgs/data/fonts/theano/default.nix @@ -1,20 +1,25 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "theano"; version = "2.0"; -in fetchzip rec { - name = "theano-${version}"; - url = "https://github.com/akryukov/theano/releases/download/v${version}/theano-${version}.otf.zip"; + src = fetchzip { + url = "https://github.com/akryukov/theano/releases/download/v${version}/theano-${version}.otf.zip"; + stripRoot = false; + hash = "sha256-9wnwHcRHB+AToOvGwZSXvHkQ8hqMd7Sdl26Ty/IwbPw="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.txt -d "$out/share/doc/${name}" - ''; + mkdir -p $out/share/doc/${pname}-${version} + cp *.otf $out/share/fonts/opentype + cp *.txt $out/share/doc/${pname}-${version} - sha256 = "1my1symb7k80ys33iphsxvmf6432wx6vjdnxhzhkgrang1rhx1h8"; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/akryukov/theano"; diff --git a/pkgs/data/fonts/tibetan-machine/default.nix b/pkgs/data/fonts/tibetan-machine/default.nix index 67393a9c4ab9..4731bfcd365d 100644 --- a/pkgs/data/fonts/tibetan-machine/default.nix +++ b/pkgs/data/fonts/tibetan-machine/default.nix @@ -1,16 +1,21 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "tibetan-machine"; version = "1.901b"; -in -fetchzip { - name = "tibetan-machine-${version}"; - url = "mirror://debian/pool/main/f/fonts-tibetan-machine/fonts-tibetan-machine_${version}.orig.tar.bz2"; - sha256 = "sha256-A+RgpFLsP4iTzl0PMRHaNzWGbDR5Qa38lRegNJ96ULo="; - postFetch = '' + src = fetchurl { + url = "mirror://debian/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; + hash = "sha256-c/1Sgv7xKHpsJGjY9ZY2qOJHShGHL1robvphFNJOt5w="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts - tar xf $downloadedFile --strip-components=1 -C $out/share/fonts ttf-tmuni-${version}/TibMachUni-${version}.ttf + cp *.ttf $out/share/fonts + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/times-newer-roman/default.nix b/pkgs/data/fonts/times-newer-roman/default.nix index 4bfe358d13ed..840e75c710b3 100644 --- a/pkgs/data/fonts/times-newer-roman/default.nix +++ b/pkgs/data/fonts/times-newer-roman/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { + pname = "times-newer-roman"; version = "unstable-2018-09-11"; -in -fetchzip { - name = "times-newer-roman-${version}"; - url = "https://web.archive.org/web/20210609022835/https://timesnewerroman.com/assets/TimesNewerRoman.zip"; + src = fetchzip { + url = "https://web.archive.org/web/20210609022835/https://timesnewerroman.com/assets/TimesNewerRoman.zip"; + stripRoot = false; + hash = "sha256-wO4rxyJNQyhRLpswCYKXdeiXy5G+iWyxulYCHZb60QM="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; + cp *.otf $out/share/fonts/opentype - hash = "sha256-Hx59RYLLwfimEQjEEes0lCpg6iql46DFwhQ7kVGiEzc="; + runHook postInstall + ''; meta = with lib; { description = "A font that looks just like Times New Roman, except each character is 5-10% wider"; diff --git a/pkgs/data/fonts/tlwg/default.nix b/pkgs/data/fonts/tlwg/default.nix index 9c03bbb162f5..4b0f780a38b5 100644 --- a/pkgs/data/fonts/tlwg/default.nix +++ b/pkgs/data/fonts/tlwg/default.nix @@ -1,22 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, fontforge }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, fontforge }: stdenv.mkDerivation rec { pname = "tlwg"; - version = "0.6.4"; + version = "0.7.3"; src = fetchFromGitHub { owner = "tlwg"; repo = "fonts-tlwg"; rev = "v${version}"; - sha256 = "13bx98ygyyizb15ybdv3856lkxhx1fss8f7aiqmp0lk9zgw4mqyk"; + sha256 = "hWiH5KJnYTdcrm+Kzn9HUQry8ry3SKzjA6/0536kCLQ="; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook autoconf-archive ]; buildInputs = [ fontforge ]; - preAutoreconf = "echo ${version} > VERSION"; - meta = with lib; { description = "A collection of Thai scalable fonts available under free licenses"; homepage = "https://linux.thai.net/projects/fonts-tlwg"; diff --git a/pkgs/data/fonts/tt2020/default.nix b/pkgs/data/fonts/tt2020/default.nix index c92e86032733..63b4e1834a3b 100644 --- a/pkgs/data/fonts/tt2020/default.nix +++ b/pkgs/data/fonts/tt2020/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "TT2020"; - version = "2020-01-05"; -in -fetchFromGitHub { - name = "${pname}-${version}"; - owner = "ctrlcctrlv"; - repo = pname; - rev = "2b418fab5f99f72a18b3b2e7e2745ac4e03aa612"; - sha256 = "1z0nizvs0gp0xl7pn6xcjvsysxhnfm7aqfamplkyvya3fxvhncds"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "ctrlcctrlv"; + repo = pname; + rev = "v${version}"; + hash = "sha256-eAJzaookHcQ/7QNq/HUKA/O2liyKynJNdo6QuZ1Bv6k="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -Dm644 -t $out/share/fonts/truetype dist/*.ttf install -Dm644 -t $out/share/fonts/woff2 dist/*.woff2 + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix index 95e4ce2a52ab..e71888969f61 100644 --- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -1,20 +1,21 @@ -{ lib, fetchzip }: -let +{ lib, stdenvNoCC, fetchurl }: + +stdenvNoCC.mkDerivation rec { pname = "ttf-bitstream-vera"; version = "1.10"; -in -fetchzip rec { - name = "${pname}-${version}"; - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.bz2"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + hash = "sha256-21sn33u7MYA269t1rNPpjxvW62YI+3CmfUeM0kPReNw="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xjf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/truetype *.ttf + + runHook postInstall ''; - sha256 = "179hal4yi3367jg8rsvqx6h2w4s0kn9zzrv8c47sslyg28g39s4m"; - - meta = { - }; + meta = { }; } diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/data/fonts/ttf-envy-code-r/default.nix index 871bfb0099b2..673d946a1e9a 100644 --- a/pkgs/data/fonts/ttf-envy-code-r/default.nix +++ b/pkgs/data/fonts/ttf-envy-code-r/default.nix @@ -1,21 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { pname = "ttf-envy-code-r"; version = "PR7"; -in fetchzip { - name = "${pname}-0.${version}"; - url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip"; + src = fetchzip { + url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip"; + hash = "sha256-pJqC/sbNjxEwbVf2CVoXMBI5zvT3DqzRlKSqFT8I2sM="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d "$out/share/doc/${pname}" + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/${pname} + + runHook postInstall ''; - sha256 = "0x0r07nax68cmz7490x2crzzgdg4j8fg63wppcmjqm0230bggq2z"; - meta = with lib; { homepage = "https://damieng.com/blog/tag/envy-code-r"; description = "Free scalable coding font by DamienG"; diff --git a/pkgs/data/fonts/ttf-tw-moe/default.nix b/pkgs/data/fonts/ttf-tw-moe/default.nix index bf52d07c52e9..85b2ec1ce787 100644 --- a/pkgs/data/fonts/ttf-tw-moe/default.nix +++ b/pkgs/data/fonts/ttf-tw-moe/default.nix @@ -1,19 +1,22 @@ -{ lib, fetchzip }: -let +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "ttf-tw-moe"; version = "2020-11-14"; -in -fetchzip { - name = "ttf-tw-moe"; - url = "https://github.com/Jiehong/TW-fonts/archive/${version}.zip"; + src = fetchzip { + url = "https://github.com/Jiehong/TW-fonts/archive/${version}.zip"; + hash = "sha256-9gy8xO93ViIPmpg1du0DbXVCR2FowourLH8nP9d6HK0="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile TW-fonts-${version}/\*.ttf -d $out/share/fonts/truetype + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "1jd3gjjfa4vadp6d499n0irz5b22z611kd7q5qgqf6s2fwbxfhiz"; - meta = with lib; { homepage = "http://www.moe.gov.tw/"; description = "Set of KAI and SONG fonts from the Ministry of Education of Taiwan"; diff --git a/pkgs/data/fonts/u001/default.nix b/pkgs/data/fonts/u001/default.nix index fc2f3a486369..c50e972a4d69 100644 --- a/pkgs/data/fonts/u001/default.nix +++ b/pkgs/data/fonts/u001/default.nix @@ -10,8 +10,6 @@ stdenvNoCC.mkDerivation rec { stripRoot = false; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 0458abf91d4f..331e34690a5e 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -1,18 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "ubuntu-font-family"; version = "0.83"; - url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-${version}.zip"; + src = fetchzip { + url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-${version}.zip"; + hash = "sha256-FAg1xn8Gcbwmuvqtg9SquSet4oTT9nqE+Izeq7ZMVcA="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/ubuntu - mv $out/*.ttf $out/share/fonts/ubuntu - find $out -maxdepth 1 ! -type d -exec rm {} + - ''; + mv *.ttf $out/share/fonts/ubuntu - sha256 = "090y665h4kf2bi623532l6wiwkwnpd0xds0jr7560xwfwys1hiqh"; + runHook postInstall + ''; meta = with lib; { description = "Ubuntu Font Family"; diff --git a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix index 4733bcf04e72..27933b5b139d 100644 --- a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix +++ b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix @@ -1,16 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "ultimate-oldschool-pc-font-pack"; version = "2.2"; -in -fetchzip { - name = "ultimate-oldschool-pc-font-pack-${version}"; - url = "https://int10h.org/oldschool-pc-fonts/download/oldschool_pc_font_pack_v${version}_linux.zip"; - sha256 = "sha256-BOA2fMa2KT3Bkpvj/0DzrzuZbl3RARvNn4qbI/+dApU="; - postFetch= '' + src = fetchzip { + url = "https://int10h.org/oldschool-pc-fonts/download/oldschool_pc_font_pack_v${version}_linux.zip"; + stripRoot = false; + hash = "sha256-54U8tZzvivTSOgmGesj9QbIgkSTm9w4quMhsuEc0Xy4="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + cp */*.ttf $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/data/fonts/undefined-medium/default.nix index 5773aa94d5b5..3e3087c6abc8 100644 --- a/pkgs/data/fonts/undefined-medium/default.nix +++ b/pkgs/data/fonts/undefined-medium/default.nix @@ -1,17 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { - name = "undefined-medium-1.0"; +stdenvNoCC.mkDerivation rec { + pname = "undefined-medium"; + version = "1.1"; - url = "https://github.com/andirueckel/undefined-medium/archive/v1.0.zip"; + src = fetchzip { + url = "https://github.com/andirueckel/undefined-medium/archive/v1.1.zip"; + hash = "sha256-iquxt7lo92y4AQZf23Ij5Qzg2U7buL3kGLksQSR6vac="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile ${name}/fonts/otf/\*.otf -d $out/share/fonts/opentype + installPhase = '' + runHook preInstall + + install -Dm644 fonts/otf/*.otf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "1wa04jzbffshwcxm705yb5wja8wakn8j7fvim1mlih2z1sqw0njk"; - meta = with lib; { homepage = "https://undefined-medium.com/"; description = "A pixel grid-based monospace typeface"; diff --git a/pkgs/data/fonts/unfonts-core/default.nix b/pkgs/data/fonts/unfonts-core/default.nix index 7f01d5531e15..5756a948f698 100644 --- a/pkgs/data/fonts/unfonts-core/default.nix +++ b/pkgs/data/fonts/unfonts-core/default.nix @@ -1,16 +1,20 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { pname = "unfonts-core"; version = "1.0.2-080608"; -in fetchzip { - name = "${pname}-${version}"; - url = "https://kldp.net/unfonts/release/2607-un-fonts-core-${version}.tar.gz"; - hash = "sha256-k9C7d/SbVLWFzRnDWpOIMtY6cAEIcaLcbxQAqjwuWds="; - postFetch = '' - tar -xzf $downloadedFile --strip-components=1 + src = fetchurl { + url = "https://kldp.net/unfonts/release/2607-un-fonts-core-${version}.tar.gz"; + hash = "sha256-OwpydPmqt+jw8ZOMAacOFYF2bVG0lLoUVoPzesVXkY4="; + }; + + installPhase = '' + runHook preInstall + install -m444 -Dt $out/share/fonts/truetype *.ttf + + runHook postInstall ''; meta = with lib; { @@ -20,7 +24,7 @@ in fetchzip { The Un-fonts come from the HLaTeX as type1 fonts in 1998 by Koaunghi Un, he made type1 fonts to use with Korean TeX (HLaTeX) in the late 1990's and released it under the GPL license. They were converted to TrueType with the FontForge (PfaEdit) by Won-kyu Park in 2003. - ''; + ''; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.ehmry ]; diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 026a262a8455..aa8720683025 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "unifont_upper"; version = "15.0.01"; -in fetchurl rec { - name = "unifont_upper-${version}"; - url = "mirror://gnu/unifont/unifont-${version}/${name}.ttf"; + src = fetchurl { + url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.ttf"; + hash = "sha256-o6ItW9fME+f4t2cvhj96r3ZG9nKLAUznn/pdukFYnxw="; + }; - downloadToTemp = true; + dontUnpack = true; - recursiveHash = true; + installPhase = '' + runHook preInstall - postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; + install -Dm644 $src $out/share/fonts/truetype/unifont_upper.ttf - hash = "sha256-cGX9umTGRfrQT3gwPgNqxPHB7Un3ZT3b7hPy4IP45Fk="; + runHook postInstall + ''; meta = with lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; diff --git a/pkgs/data/fonts/vazir-code-font/default.nix b/pkgs/data/fonts/vazir-code-font/default.nix index 6702fd1b0220..6ba69b57feaf 100644 --- a/pkgs/data/fonts/vazir-code-font/default.nix +++ b/pkgs/data/fonts/vazir-code-font/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "vazir-code-font"; version = "1.1.2"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "vazir-code-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "vazir-code-font"; + rev = "v${version}"; + hash = "sha256-iBojse3eHr4ucZtPfpkN+mmO6sEExY8WcAallyPgMsI="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; + + runHook postInstall ''; - sha256 = "0ivwpn9xm2zwhwgg9mghyiy5v66cn4786w9j6rkff5cmzshv279r"; meta = with lib; { homepage = "https://github.com/rastikerdar/vazir-code-font"; diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix index b8885298c084..787d250068b7 100755 --- a/pkgs/data/fonts/vazir-fonts/default.nix +++ b/pkgs/data/fonts/vazir-fonts/default.nix @@ -1,20 +1,25 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "vazir-fonts"; version = "32.0.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "vazir-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "vazir-font"; + rev = "v${version}"; + hash = "sha256-lkjlSW3Sfr1bJ9/IOsZl9yOVh9mYKhoV5XcLkqcQ71g="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; + + runHook postInstall ''; - sha256 = "sha256-Uy8hgBtCcTLwXu9FkLN1WavUfP74Jf53ChxVGS3UBVM="; meta = with lib; { homepage = "https://github.com/rastikerdar/vazir-font"; diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/pkgs/data/fonts/vdrsymbols/default.nix index 4b280df56441..5df82b31cfe5 100644 --- a/pkgs/data/fonts/vdrsymbols/default.nix +++ b/pkgs/data/fonts/vdrsymbols/default.nix @@ -1,15 +1,20 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip { - name = "vdrsymbols-20100612"; +stdenvNoCC.mkDerivation rec { + pname = "vdrsymbols"; + version = "20100612"; - url = "http://andreas.vdr-developer.org/fonts/download/vdrsymbols-ttf-20100612.tgz"; + src = fetchurl { + url = "http://andreas.vdr-developer.org/fonts/download/${pname}-ttf-${version}.tgz"; + hash = "sha256-YxB+JcDkta5are+OQyP/WKDL0vllgn0m26bU9mQ3C/Q="; + }; - sha256 = "0wpxns8zqic98c84j18dr4zmj092v07yq07vwwgzblr0rw9n6gzr"; + installPhase = '' + runHook preInstall - postFetch = '' - tar xvzf "$downloadedFile" - install -Dm444 -t "$out/share/fonts/truetype" */*.ttf + install -Dm444 -t "$out/share/fonts/truetype" *.ttf + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/vegur/default.nix b/pkgs/data/fonts/vegur/default.nix index 2f03dac3914b..effaf74be7db 100644 --- a/pkgs/data/fonts/vegur/default.nix +++ b/pkgs/data/fonts/vegur/default.nix @@ -1,26 +1,32 @@ -{ lib, buildPackages, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let - version = "0.701"; -in fetchzip { - name = "vegur-font-${version}"; + majorVersion = "0"; + minorVersion = "701"; +in +stdenvNoCC.mkDerivation (self: { + pname = "vegur"; + version = "${majorVersion}.${minorVersion}"; - # Upstream doesn't version their URLs. - # http://dotcolon.net/font/vegur/ → http://dotcolon.net/DL/font/vegur.zip - url = "http://download.opensuse.org/repositories/M17N:/fonts/SLE_12_SP3/src/dotcolon-vegur-fonts-0.701-1.4.src.rpm"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-sGb3mEb3g15ZiVCxEfAanly8zMUopLOOjw8W4qbXLPA="; + stripRoot = false; + }; - postFetch = '' - ${buildPackages.rpmextract}/bin/rpmextract $downloadedFile - unzip vegur.zip - install -m444 -Dt $out/share/fonts/Vegur *.otf + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; - sha256 = "0iisi2scq72lyj7pc1f36fhfjnm676n5byl4zaavhbxpdrbc6d1v"; meta = with lib; { homepage = "http://dotcolon.net/font/vegur/"; description = "A humanist sans serif font"; platforms = platforms.all; - maintainers = [ maintainers.samueldr ]; + maintainers = with maintainers; [ minijackson samueldr ]; license = licenses.cc0; }; -} +}) diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix index f34baa8a8314..1708a43b8056 100644 --- a/pkgs/data/fonts/victor-mono/default.nix +++ b/pkgs/data/fonts/victor-mono/default.nix @@ -1,11 +1,8 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "victor-mono"; version = "1.5.4"; -in -fetchzip { - name = "victor-mono-${version}"; - stripRoot = false; # Upstream prefers we download from the website, # but we really insist on a more versioned resource. @@ -14,19 +11,23 @@ fetchzip { # so we extract it from the tagged release. # Both methods produce the same file, but this way # we can safely reason about what version it is. - url = "https://github.com/rubjo/victor-mono/raw/v${version}/public/VictorMonoAll.zip"; + src = fetchzip { + url = "https://github.com/rubjo/victor-mono/raw/v${version}/public/VictorMonoAll.zip"; + stripRoot = false; + hash = "sha256-E8j1bfYrM8yRtasiwgTvyE4EYx2LyAbmw3MXH1l+owk="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p "$out/share/fonts/" - mv $out/OTF $out/share/fonts/opentype - mv $out/TTF $out/share/fonts/truetype + mv OTF $out/share/fonts/opentype + mv TTF $out/share/fonts/truetype - rm -r $out/{EOT,WOFF,WOFF2,LICENSE.txt} + runHook postInstall ''; - sha256 = "sha256-1si0d2lpuXaDcSc3giVMMMbZc/eKbHKU3wmwfYHZ8o0="; - meta = with lib; { description = "Free programming font with cursive italics and ligatures"; homepage = "https://rubjo.github.io/victor-mono"; diff --git a/pkgs/data/fonts/vollkorn/default.nix b/pkgs/data/fonts/vollkorn/default.nix index 6c5836da5b05..deeeac19c939 100644 --- a/pkgs/data/fonts/vollkorn/default.nix +++ b/pkgs/data/fonts/vollkorn/default.nix @@ -1,22 +1,26 @@ -{ lib, stdenv, fetchzip }: -let +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { pname = "vollkorn"; version = "4.105"; -in -fetchzip { - name = "${pname}-${version}"; - url = "http://vollkorn-typeface.com/download/vollkorn-${builtins.replaceStrings ["."] ["-"] version}.zip"; - sha256 = "0srff2nqs7353mqcpmvaq156lamfh621py4h1771n0l9ix2c8mss"; - stripRoot = false; - postFetch = '' + src = fetchzip { + url = "http://vollkorn-typeface.com/download/vollkorn-${builtins.replaceStrings ["."] ["-"] version}.zip"; + stripRoot = false; + hash = "sha256-oG79GgCwCavbMFAPakza08IPmt13Gwujrkc/NKTai7g="; + }; + + installPhase = '' + runHook preInstall + mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2}} - unzip $downloadedFile cp -v {Fontlog,OFL-FAQ,OFL}.txt $out/share/doc/${pname}-${version}/ cp -v PS-OTF/*.otf $out/share/fonts/opentype cp -v TTF/*.ttf $out/share/fonts/truetype cp -v WOFF/*.woff $out/share/fonts/WOFF cp -v WOFF2/*.woff2 $out/share/fonts/WOFF2 + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/weather-icons/default.nix b/pkgs/data/fonts/weather-icons/default.nix index a979dca44774..00f9cebac121 100644 --- a/pkgs/data/fonts/weather-icons/default.nix +++ b/pkgs/data/fonts/weather-icons/default.nix @@ -1,19 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "weather-icons"; version = "2.0.12"; -in fetchzip { - name = "weather-icons-${version}"; - url = "https://github.com/erikflowers/weather-icons/archive/refs/tags/${version}.zip"; - sha256 = "sha256-NGPzAloeZa1nCazb+mjAbYw7ZYYDoKpLwcvzg1Ly9oM="; + src = fetchzip { + url = "https://github.com/erikflowers/weather-icons/archive/refs/tags/${version}.zip"; + hash = "sha256-0ZFH2awUo4BkTpK1OsWZ4YKczJHo+HHM6ezGBJAmT+U="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile weather-icons-${version}/_docs/font-source/weathericons-regular.otf -d $out/share/fonts/opentype + installPhase = '' + runHook preInstall + + install -Dm644 _docs/font-source/weathericons-regular.otf -t $out/share/fonts/opentype + + runHook postInstall ''; - meta = with lib; { description = "Weather Icons"; longDescription = '' diff --git a/pkgs/data/fonts/work-sans/default.nix b/pkgs/data/fonts/work-sans/default.nix index 49722fc3e01a..07c5704b5171 100644 --- a/pkgs/data/fonts/work-sans/default.nix +++ b/pkgs/data/fonts/work-sans/default.nix @@ -1,20 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "work-sans"; version = "2.010"; -in -fetchzip { - name = "work-sans-${version}"; - url = "https://github.com/weiweihuanghuang/Work-Sans/archive/refs/tags/v${version}.zip"; + src = fetchzip { + url = "https://github.com/weiweihuanghuang/Work-Sans/archive/refs/tags/v${version}.zip"; + hash = "sha256-cedcx3CpcPZk3jxxIs5Bz78dxZNtOemvXnUBO6zl2dw="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile "*/fonts/*.ttf" -d $out/share/fonts/opentype + installPhase = '' + runHook preInstall + + install -Dm644 fonts/variable/*.ttf fonts/static/TTF/*.ttf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "sha256-S4O5EoKY4w/p+MHeHRCmPyQRAOUfEwNiETxMgNcsrws="; - meta = with lib; { description = "A grotesque sans"; homepage = "https://weiweihuanghuang.github.io/Work-Sans/"; diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix index f7d3b0333c5e..7c410e7d00e7 100644 --- a/pkgs/data/fonts/wqy-microhei/default.nix +++ b/pkgs/data/fonts/wqy-microhei/default.nix @@ -1,16 +1,21 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip rec { - name = "wqy-microhei-0.2.0-beta"; +stdenvNoCC.mkDerivation rec { + pname = "wqy-microhei"; + version = "0.2.0"; - url = "mirror://sourceforge/wqy/${name}.tar.gz"; + src = fetchurl { + url = "mirror://sourceforge/wqy/${pname}-${version}-beta.tar.gz"; + hash = "sha256-KAKsgCOqNqZupudEWFTjoHjTd///QhaTQb0jeHH3IT4="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xzf $downloadedFile --strip-components=1 install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc - ''; - sha256 = "0i5jh7mkp371fxqmsvn7say075r641yl4hq26isjyrqvb8cv92a9"; + runHook postInstall + ''; meta = { description = "A (mainly) Chinese Unicode font"; @@ -20,4 +25,3 @@ fetchzip rec { platforms = lib.platforms.all; }; } - diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix index 5d461d0f5b00..c59f74d45474 100644 --- a/pkgs/data/fonts/wqy-zenhei/default.nix +++ b/pkgs/data/fonts/wqy-zenhei/default.nix @@ -1,20 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "wqy-zenhei"; version = "0.9.45"; -in fetchzip rec { - name = "wqy-zenhei-${version}"; - url = "mirror://sourceforge/wqy/${name}.tar.gz"; + src = fetchurl { + url = "mirror://sourceforge/wqy/${pname}-${version}.tar.gz"; + hash = "sha256-5LfjBkdb+UJ9F1dXjw5FKJMMhMROqj8WfUxC8RDuddY="; + }; - postFetch = '' - tar -xzf $downloadedFile --strip-components=1 - mkdir -p $out/share/fonts - install -m644 *.ttc $out/share/fonts/ + installPhase = '' + runHook preInstall + + install -Dm644 *.ttc -t $out/share/fonts/ + + runHook postInstall ''; - sha256 = "0hbjq6afcd63nsyjzrjf8fmm7pn70jcly7fjzjw23v36ffi0g255"; - meta = { description = "A (mainly) Chinese Unicode font"; homepage = "http://wenq.org"; diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/data/fonts/xkcd-font/default.nix index cfdd3c0eae0b..c1ddbe9fae6c 100644 --- a/pkgs/data/fonts/xkcd-font/default.nix +++ b/pkgs/data/fonts/xkcd-font/default.nix @@ -1,24 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "xkcd-font"; version = "unstable-2017-08-24"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "ipython"; - repo = pname; - rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d"; + src = fetchFromGitHub { + owner = "ipython"; + repo = pname; + rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d"; + hash = "sha256-1DgSx2L+OpXuPVSXbbl/hcZUyBK9ikPyGWuk6wNzlwc="; + }; - postFetch = '' - install -Dm444 -t $out/share/fonts/opentype/ $out/xkcd/build/xkcd.otf - install -Dm444 -t $out/share/fonts/truetype/ $out/xkcd-script/font/xkcd-script.ttf + installPhase = '' + runHook preInstall - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf + install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf + + runHook postInstall ''; - sha256 = "sha256-ITsJPs+ZXwUWYe2AmwyVZib8RV7bpiWHOUD8qEZRHHY="; meta = with lib; { description = "The xkcd font"; diff --git a/pkgs/data/fonts/yanone-kaffeesatz/default.nix b/pkgs/data/fonts/yanone-kaffeesatz/default.nix index bd610938154d..99cd30f3dfa7 100644 --- a/pkgs/data/fonts/yanone-kaffeesatz/default.nix +++ b/pkgs/data/fonts/yanone-kaffeesatz/default.nix @@ -1,17 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip { - name = "yanone-kaffeesatz-2004"; +stdenvNoCC.mkDerivation rec { + pname = "yanone-kaffeesatz"; + version = "2004"; - url = "https://yanone.de/2015/data/UIdownloads/Yanone%20Kaffeesatz.zip"; + src = fetchzip { + url = "https://yanone.de/2015/data/UIdownloads/Yanone%20Kaffeesatz.zip"; + stripRoot = false; + hash = "sha256-8yAB73UJ77/c8/VLqiFeT1KtoBQzOh+vWrI+JA2dCoY="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + installPhase = '' + runHook preInstall + + install -Dm644 *.otf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "190c4wx7avy3kp98lsyml7kc0jw7csf5n79af2ypbkhsadfsy8di"; - meta = { description = "The free font classic"; maintainers = with lib.maintainers; [ mt-caret ]; diff --git a/pkgs/data/fonts/zilla-slab/default.nix b/pkgs/data/fonts/zilla-slab/default.nix index a244c04a65cd..886362d78e99 100644 --- a/pkgs/data/fonts/zilla-slab/default.nix +++ b/pkgs/data/fonts/zilla-slab/default.nix @@ -1,17 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "zilla-slab"; version = "1.002"; -in fetchzip { - name = "zilla-slab-${version}"; - url = "https://github.com/mozilla/zilla-slab/releases/download/v${version}/Zilla-Slab-Fonts-v${version}.zip"; - postFetch = '' - unzip $downloadedFile + src = fetchzip { + url = "https://github.com/mozilla/zilla-slab/releases/download/v${version}/Zilla-Slab-Fonts-v${version}.zip"; + stripRoot = false; + hash = "sha256-yOHu+dSWlyI7w1N1teED9R1Fphso2bKAlYDC1KdqBCc="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype cp -v zilla-slab/ttf/*.ttf $out/share/fonts/truetype/ + + runHook postInstall ''; - sha256 = "1b1ys28hyjcl4qwbnsyi6527nj01g3d6id9jl23fv6f8fjm4ph0f"; meta = with lib; { homepage = "https://github.com/mozilla/zilla-slab"; diff --git a/pkgs/data/icons/apple-cursor/default.nix b/pkgs/data/icons/apple-cursor/default.nix new file mode 100644 index 000000000000..90898333b45c --- /dev/null +++ b/pkgs/data/icons/apple-cursor/default.nix @@ -0,0 +1,43 @@ +{ lib +, fetchzip +, stdenv +}: + +let + _src = variant: suffix: hash: fetchzip ({ + name = variant; + url = "https://github.com/ful1e5/apple_cursor/releases/download/v${version}/${variant}.${suffix}"; + hash = hash; + } // (if suffix == "zip" then { stripRoot = false; } else {})); + + version = "2.0.0"; + srcs = [ + (_src "macOS-BigSur-White" "tar.gz" "sha256-3Ax2hMfkEL4cyJtGQpK3PqC/L5wtmgO0LsY4gkTQ2Bg=") + (_src "macOS-BigSur-White-Windows" "zip" "sha256-V6J2Ddgq46BkgxCWVReZrvE7CsOczzV7slOpilKFG9E=") + (_src "macOS-BigSur" "tar.gz" "sha256-VZWFf1AHum2xDJPMZrBmcyVrrmYGKwCdXOPATw7myOA=") + (_src "macOS-BigSur-Windows" "zip" "sha256-lp28ACsK8BXe6rSDELL4GdXb1QEdOVC8Y6eLofctkR4=") + (_src "macOS-Monterey-White" "tar.gz" "sha256-IfFYUbDW6mBe209iU1sBhFzolZd6YDVdJf+DPe9AQDM=") + (_src "macOS-Monterey-White-Windows" "zip" "sha256-gUuBFOi0nDBoX9TWPg4eQhCAhwYeEhfDEbYpc+XsQNE=") + (_src "macOS-Monterey" "tar.gz" "sha256-MHmaZs56Q1NbjkecvfcG1zAW85BCZDn5kXmxqVzPc7M=") + (_src "macOS-Monterey-Windows" "zip" "sha256-ajxEgq7besaRajLn0gTPpp4euOWVqbzc78u720PWlyE=") + ]; +in stdenv.mkDerivation rec { + pname = "apple_cursor"; + inherit version; + inherit srcs; + + sourceRoot = "."; + + installPhase = '' + install -dm 0755 $out/share/icons + cp -r macOS* $out/share/icons/ + ''; + + meta = with lib; { + description = "Opensource macOS Cursors."; + homepage = "https://github.com/ful1e5/apple_cursor"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ colemickens ]; + }; +} diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix index b27b96cb5efb..06c8becd64e5 100644 --- a/pkgs/data/icons/bibata-cursors/default.nix +++ b/pkgs/data/icons/bibata-cursors/default.nix @@ -3,47 +3,37 @@ , fetchFromGitHub , fetchurl , clickgen -, unzip +, attrs }: stdenvNoCC.mkDerivation rec { pname = "bibata-cursors"; - version = "1.1.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "ful1e5"; repo = "Bibata_Cursor"; rev = "v${version}"; - sha256 = "1q2wdbrmdnr9mwiilm5cc9im3zwbl7yaj1zpy5wwn44ypq3hcngy"; + sha256 = "zCk7qgPeae0BfzhxxU2Dk1SOWJQOxiWyJuzH/ri+Gq4="; }; - bitmaps = fetchurl { - url = "https://github.com/ful1e5/Bibata_Cursor/releases/download/v${version}/bitmaps.zip"; - sha256 = "1pcn6par0f0syyhzpzmqr3c6b9ri4lprkdd2ncwzdas01p2d9v1i"; - }; - - nativeBuildInputs = [ unzip ]; - - buildInputs = [ clickgen ]; + buildInputs = [ clickgen attrs ]; buildPhase = '' - mkdir bitmaps - unzip $bitmaps -d bitmaps - rm -rf themes - cd builder && make build_unix + ctgen build.toml -p x11 -d 'bitmaps/Bibata-Modern-Amber' -n 'Bibata-Modern-Amber' -c 'Yellowish and rounded edge bibata cursors.' + ctgen build.toml -p x11 -d 'bitmaps/Bibata-Modern-Classic' -n 'Bibata-Modern-Classic' -c 'Black and rounded edge Bibata cursors.' + ctgen build.toml -p x11 -d 'bitmaps/Bibata-Modern-Ice' -n 'Bibata-Modern-Ice' -c 'White and rounded edge Bibata cursors.' + + ctgen build.toml -p x11 -d 'bitmaps/Bibata-Original-Amber' -n 'Bibata-Original-Amber' -c 'Yellowish and sharp edge Bibata cursors.' + ctgen build.toml -p x11 -d 'bitmaps/Bibata-Original-Classic' -n 'Bibata-Original-Classic' -c 'Black and sharp edge Bibata cursors.' + ctgen build.toml -p x11 -d 'bitmaps/Bibata-Original-Ice' -n 'Bibata-Original-Ice' -c 'White and sharp edge Bibata cursors.' ''; installPhase = '' install -dm 0755 $out/share/icons - cd ../ cp -rf themes/* $out/share/icons/ ''; - postPatch = '' - substituteInPlace "builder/Makefile" \ - --replace "/bin/bash" "bash" - ''; - meta = with lib; { description = "Material Based Cursor Theme"; homepage = "https://github.com/ful1e5/Bibata_Cursor"; diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/pkgs/data/icons/bibata-cursors/extra.nix index 15a746eabffb..ed9a70a6d321 100644 --- a/pkgs/data/icons/bibata-cursors/extra.nix +++ b/pkgs/data/icons/bibata-cursors/extra.nix @@ -50,5 +50,7 @@ stdenvNoCC.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ dtzWill AdsonCicilioti ]; + # unmaintained as of Nov 9, 2022. unable to be build with clickgen version 2.x + broken = true; }; } diff --git a/pkgs/data/icons/capitaine-cursors-themed/default.nix b/pkgs/data/icons/capitaine-cursors-themed/default.nix new file mode 100644 index 000000000000..d86ce3f8161a --- /dev/null +++ b/pkgs/data/icons/capitaine-cursors-themed/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchzip }: +fetchzip rec { + pname = "capitaine-cursors-themed"; + version = "5"; + stripRoot = false; + url = "https://github.com/sainnhe/capitaine-cursors/releases/download/r${version}/Linux.zip"; + sha256 = "jQNAXuR/OtvohWziGYgb5Ni2/tEIGaY9HIyUUW793EY="; + + postFetch = '' + mkdir -p $out/share/icons + cp -r ./ $out/share/icons + ''; + + meta = with lib; { + description = "A fork of the capitaine cursor theme, with some additional variants (Gruvbox, Nord, Palenight) and support for HiDPI"; + homepage = "https://github.com/sainnhe/capitaine-cursors"; + license = licenses.lgpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.math-42 ]; + }; +} diff --git a/pkgs/data/icons/catppuccin-cursors/default.nix b/pkgs/data/icons/catppuccin-cursors/default.nix index d9eccc96a029..450484b46327 100644 --- a/pkgs/data/icons/catppuccin-cursors/default.nix +++ b/pkgs/data/icons/catppuccin-cursors/default.nix @@ -1,9 +1,7 @@ { lib , stdenvNoCC , fetchFromGitHub -, inkscape -, xcursorgen -, makeFontsConf +, unzip }: let @@ -15,42 +13,29 @@ let variantName = { palette, color }: (lib.strings.toLower palette) + color; variants = map variantName product; in -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation rec { pname = "catppuccin-cursors"; - version = "unstable-2022-08-23"; + version = "0.2.0"; + dontBuild = true; src = fetchFromGitHub { owner = "catppuccin"; repo = "cursors"; - rev = "3d3023606939471c45cff7b643bffc5d5d4ff29c"; - sha256 = "1z9cjxxsj3vrmhsw1k05b31zmncz1ksaswc4r1k3vd2mmpigq1nk"; + rev = "v${version}"; + sha256 = "sha256-TgV5f8+YWR+h61m6WiBMg3aBFnhqShocZBdzZHSyU2c="; + sparseCheckout = [ "cursors" ]; }; + nativeBuildInputs = [ unzip ]; + outputs = variants ++ [ "out" ]; # dummy "out" output to prevent breakage outputsToInstall = []; - nativeBuildInputs = [ - inkscape - xcursorgen - ]; - - postPatch = '' - patchShebangs ./build.sh - ''; - - # Make fontconfig stop warning about being unable to load config - FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; - - # Make inkscape stop warning about being unable to create profile directory - preBuild = '' - export HOME="$NIX_BUILD_ROOT" - ''; - installPhase = '' runHook preInstall - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" != "out" ]; then local outputDir="''${!output}" local iconsDir="$outputDir"/share/icons @@ -61,7 +46,7 @@ stdenvNoCC.mkDerivation { local variant=$(sed 's/\([A-Z]\)/-\1/g' <<< "$output") local variant=''${variant^} - cp -r dist/Catppuccin-"$variant"-Cursors "$iconsDir" + unzip "cursors/Catppuccin-$variant-Cursors.zip" -d "$iconsDir" fi done diff --git a/pkgs/data/icons/colloid-icon-theme/default.nix b/pkgs/data/icons/colloid-icon-theme/default.nix index 744db4f3d162..5c0a3817f32f 100644 --- a/pkgs/data/icons/colloid-icon-theme/default.nix +++ b/pkgs/data/icons/colloid-icon-theme/default.nix @@ -18,13 +18,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red" stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-10-26"; + version = "2023-01-08"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-eHLfWrtY69S37OPvQdLwI/PRvoKCheF2MRsHG5+5BR0="; + hash = "sha256-n4kMOIp7AD5Ue4qY4G3ja/VTyYF7cqhdI0uuk9b6o5c="; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/comixcursors/default.nix b/pkgs/data/icons/comixcursors/default.nix index b63877b28209..1c4fdc195180 100644 --- a/pkgs/data/icons/comixcursors/default.nix +++ b/pkgs/data/icons/comixcursors/default.nix @@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation rec { ''; installPhase = '' - for outputName in $outputs ; do + for outputName in $(getAllOutputNames) ; do if [ $outputName != out ]; then local outputDir=''${!outputName}; local iconsDir=$outputDir/share/icons diff --git a/pkgs/data/icons/fluent-icon-theme/default.nix b/pkgs/data/icons/fluent-icon-theme/default.nix index d4206ed58b48..e7553b4b74d4 100644 --- a/pkgs/data/icons/fluent-icon-theme/default.nix +++ b/pkgs/data/icons/fluent-icon-theme/default.nix @@ -6,23 +6,23 @@ , jdupes , roundedIcons ? false , blackPanelIcons ? false +, allColorVariants ? false , colorVariants ? [ ] , }: -let - pname = "Fluent-icon-theme"; +let pname = "Fluent-icon-theme"; in -lib.checkListOfEnum "${pname}: available color variants" [ "standard" "green" "grey" "orange" "pink" "purple" "red" "yellow" "teal" "all" ] colorVariants +lib.checkListOfEnum "${pname}: available color variants" [ "standard" "green" "grey" "orange" "pink" "purple" "red" "yellow" "teal" ] colorVariants stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-11-05"; + version = "2022-11-30"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "kKl/E2L1NL1U7PHbva+wUqQGbcHFbPgZBVhU/OgEuAE="; + hash = "sha256-sxs2GrPuUoitZtiIU7SWFSLGXOTitS41MGt17TeuICE="; }; nativeBuildInputs = [ gtk3 jdupes ]; @@ -44,10 +44,11 @@ stdenvNoCC.mkDerivation rec { ./install.sh --dest $out/share/icons \ --name Fluent \ ${builtins.toString colorVariants} \ + ${lib.optionalString allColorVariants "--all"} \ ${lib.optionalString roundedIcons "--round"} \ ${lib.optionalString blackPanelIcons "--black"} - jdupes --link-soft --recurse $out/share + jdupes --quiet --link-soft --recurse $out/share runHook postInstall ''; diff --git a/pkgs/data/icons/nordzy-cursor-theme/default.nix b/pkgs/data/icons/nordzy-cursor-theme/default.nix index ee18fe287727..394626cec337 100644 --- a/pkgs/data/icons/nordzy-cursor-theme/default.nix +++ b/pkgs/data/icons/nordzy-cursor-theme/default.nix @@ -5,24 +5,18 @@ stdenvNoCC.mkDerivation rec { pname = "nordzy-cursor-theme"; - version = "0.1.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "alvatip"; repo = "Nordzy-cursors"; rev = "v${version}"; - sha256 = "XabfKFyeII7Xl+ozzpPnc4xFH4B7GzCTLq4M1QPSZPw="; + sha256 = "sha256-q9PEEyxejRQ8UCwbqsfOCL7M70pLCOLyCx8gEFmZkWA="; }; installPhase = '' mkdir -p $out/share/icons - - cp -r nordzy-dark/ $out/share/icons/Nordzy-cursors - mv $out/share/icons/Nordzy-cursors/index.theme $out/share/icons/Nordzy-cursors/cursor.theme - mv $out/share/icons/Nordzy-cursors/Nordzy-cursors $out/share/icons/Nordzy-cursors/cursors - cp -r nordzy-white/ $out/share/icons/Nordzy-white-cursors - mv $out/share/icons/Nordzy-white-cursors/index.theme $out/share/icons/Nordzy-white-cursors/cursor.theme - mv $out/share/icons/Nordzy-white-cursors/Nordzy-white-cursors $out/share/icons/Nordzy-white-cursors/cursors + cp -r Nordzy-cursors{,-white,-lefthand} $out/share/icons ''; meta = with lib; { diff --git a/pkgs/data/icons/nordzy-icon-theme/default.nix b/pkgs/data/icons/nordzy-icon-theme/default.nix index 74e3ac872583..bc9d20342ef0 100644 --- a/pkgs/data/icons/nordzy-icon-theme/default.nix +++ b/pkgs/data/icons/nordzy-icon-theme/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "nordzy-icon-theme"; - version = "1.7.6"; + version = "1.8.1"; src = fetchFromGitHub { owner = "alvatip"; repo = "Nordzy-icon"; rev = version; - sha256 = "sha256-VKcbQ6DeQ0zGOPJgfmZMNsHjsMwoCk7jUT2Oc8xuwGc="; + sha256 = "sha256-JfVcznGoL/HmNbjZk6RUUp/RZIXYIAoOMA3HBpqlUcE="; }; # In the post patch phase we should first make sure to patch shebangs. diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 204a904bcf38..f966f22b8285 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 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "22.11.05"; + version = "23.01.29"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-1SeXPkqBakqJMys5GQXdcSkI2I/VpnEWD1BZAHFWfCs="; + sha256 = "sha256-VmVzU8ACBE4Rx0uVScdQVbygDLE9MmD7ssD1j4ri74g="; }; 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 4d9b67aec388..b7074b814239 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 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "22.11.05"; + version = "23.01.29"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-XHf9YzZ9VY63Jv7HXSL2NAfft1VYeMzcqd9+vz1CBhg="; + sha256 = "sha256-uHy1HXCRlPQh9t9bsvClTmP4FW/sP91hYKUXxtdBmdw="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 97afe4950554..d0af110dba24 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20221101"; + version = "20230104"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-MSH7yd5fizBtmkTNG3gMFxNpjVDKWsHM8wogPhBMkk8="; + sha256 = "sha256-BejsAlHnq2oxVQIFA4/ZOTFxz7vZmssrlJNqRZHBGuI="; }; nativeBuildInputs = [ gtk3 papirus-folders ]; diff --git a/pkgs/data/icons/rose-pine/default.nix b/pkgs/data/icons/rose-pine/default.nix new file mode 100644 index 000000000000..051294c5d3a8 --- /dev/null +++ b/pkgs/data/icons/rose-pine/default.nix @@ -0,0 +1,47 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, gtk3 +}: + +stdenvNoCC.mkDerivation rec { + pname = "rose-pine-icon-theme"; + version = "unstable-2022-09-01"; + + src = fetchFromGitHub { + owner = "rose-pine"; + repo = "gtk"; + rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304"; + sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67"; + }; + + nativeBuildInputs = [ + gtk3 + ]; + + # avoid the makefile which is only for the theme maintainers + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + mv icons/rose-pine-icons $out/share/icons/rose-pine + mv icons/rose-pine-dawn-icons $out/share/icons/rose-pine-dawn + mv icons/rose-pine-moon-icons $out/share/icons/rose-pine-moon + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + + runHook postInstall + ''; + + meta = with lib; { + description = "Rosé Pine icon theme for GTK"; + homepage = "https://github.com/rose-pine/gtk"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [romildo the-argus]; + }; +} diff --git a/pkgs/data/icons/simp1e-cursors/default.nix b/pkgs/data/icons/simp1e-cursors/default.nix new file mode 100644 index 000000000000..962f4ea2618a --- /dev/null +++ b/pkgs/data/icons/simp1e-cursors/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenvNoCC, fetchFromGitLab, python3, librsvg, xcursorgen }: + +stdenvNoCC.mkDerivation rec { + pname = "simp1e-cursors"; + version = "20221103.2"; + + src = fetchFromGitLab { + owner = "cursors"; + repo = "simp1e"; + rev = version; + sha256 = "sha256-3DCF6TwxWwYK5pF2Ykr3OwF76H7J03vLNZch/XoZZZk="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + (python3.withPackages (ps: with ps; [ pillow ])) + librsvg + xcursorgen + ]; + + buildPhase = '' + runHook preBuild + patchShebangs ./build.sh ./cursor-generator + HOME=$TMP ./build.sh + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -dm 755 $out/share/icons + cp -r built_themes/* $out/share/icons/ + runHook postInstall + ''; + + meta = with lib; { + description = "An aesthetic cursor theme for Linux desktops"; + homepage = "https://gitlab.com/cursors/simp1e"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ natto1784 ]; + }; +} diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix index 7f7dc0d043f3..eee3a425b709 100644 --- a/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -2,7 +2,7 @@ , stdenvNoCC , fetchFromGitHub , adwaita-icon-theme -, breeze-icons +, libsForQt5 , gtk3 , hicolor-icon-theme , jdupes @@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-11-06"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "ybp+r0Ru2lJg1WipFHIowvRO5XjppI0cUxKc6kPn0lM="; + sha256 = "J3opK+5xGmV81ubA60BZw9+9IifylrRYo+5cRLWd6Xs="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation rec { propagatedBuildInputs = [ adwaita-icon-theme - breeze-icons + libsForQt5.breeze-icons hicolor-icon-theme ]; diff --git a/pkgs/data/icons/tela-icon-theme/default.nix b/pkgs/data/icons/tela-icon-theme/default.nix index da37b5887e02..2b98e09eca29 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 = "2022-08-28"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-SW4MNvtrHpJm6yiS9k11XzzzGSMXdZ71cnvASK1dzno="; + sha256 = "sha256-W3gGn4ioTg/iOWTa5hfwx6FWzpFilpG8IXwaO5/YAvk="; }; nativeBuildInputs = [ gtk3 jdupes ]; diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/data/icons/vanilla-dmz/default.nix index 0d3f273d5bb2..22b66b1c65dc 100644 --- a/pkgs/data/icons/vanilla-dmz/default.nix +++ b/pkgs/data/icons/vanilla-dmz/default.nix @@ -25,18 +25,30 @@ stdenvNoCC.mkDerivation rec { dontDropIconThemeCache = true; buildPhase = '' - cd DMZ-White/pngs; ./make.sh; cd - - cd DMZ-Black/pngs; ./make.sh; cd - + runHook preBuild + + for theme in DMZ-{White,Black}; do + pushd $theme/pngs + ./make.sh + popd + done + + runHook postBuild ''; installPhase = '' - install -d $out/share/icons/Vanilla-DMZ/cursors - cp -a DMZ-White/xcursors/* $out/share/icons/Vanilla-DMZ/cursors - install -Dm644 DMZ-White/index.theme $out/share/icons/Vanilla-DMZ/index.theme + runHook preInstall - install -d $out/share/icons/Vanilla-DMZ-AA/cursors - cp -a DMZ-Black/xcursors/* $out/share/icons/Vanilla-DMZ-AA/cursors - install -Dm644 DMZ-Black/index.theme $out/share/icons/Vanilla-DMZ-AA/index.theme + for theme in DMZ-{White,Black}; do + mkdir -p $out/share/icons/$theme/cursors + cp -a $theme/xcursors/* $out/share/icons/$theme/cursors/ + install -m644 $theme/index.theme $out/share/icons/$theme/index.theme + done + + ln -s $out/share/icons/{DMZ-White,Vanilla-DMZ} + ln -s $out/share/icons/{DMZ-Black,Vanilla-DMZ-AA} + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/icons/vimix-icon-theme/default.nix b/pkgs/data/icons/vimix-icon-theme/default.nix index 7ef0abb85c22..d402c6d5ffce 100644 --- a/pkgs/data/icons/vimix-icon-theme/default.nix +++ b/pkgs/data/icons/vimix-icon-theme/default.nix @@ -1,6 +1,7 @@ { lib , stdenvNoCC , fetchFromGitHub +, gitUpdater , gtk3 , hicolor-icon-theme , jdupes @@ -11,22 +12,27 @@ let pname = "vimix-icon-theme"; in -lib.checkListOfEnum "${pname}: color variants" [ "standard" "Amethyst" "Beryl" "Doder" "Ruby" "Black" "White" ] colorVariants +lib.checkListOfEnum "${pname}: color variants" [ "standard" "Amethyst" "Beryl" "Doder" "Ruby" "Jade" "Black" "White" ] colorVariants stdenvNoCC.mkDerivation rec { inherit pname; - version = "2021-11-09"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1ali128027yw5kllip7p32c92pby5gaqs0i393m3bp69547np1d4"; + sha256 = "5EgTWF6qu12VYVi7w5BOp7IleN4IevLZR0hH9x/qbGo="; }; - nativeBuildInputs = [ gtk3 jdupes ]; + nativeBuildInputs = [ + gtk3 + jdupes + ]; - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ + hicolor-icon-theme + ]; dontDropIconThemeCache = true; @@ -34,21 +40,25 @@ stdenvNoCC.mkDerivation rec { dontPatchELF = true; dontRewriteSymlinks = true; + postPatch = '' + patchShebangs install.sh + ''; + installPhase = '' runHook preInstall - patchShebangs install.sh - ./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 --quiet --link-soft --recurse $out/share runHook postInstall ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "A Material Design icon theme based on Paper icon theme"; homepage = "https://github.com/vinceliuice/vimix-icon-theme"; diff --git a/pkgs/data/icons/whitesur-icon-theme/default.nix b/pkgs/data/icons/whitesur-icon-theme/default.nix index 80f6b5ce24ae..8733d20e9fab 100644 --- a/pkgs/data/icons/whitesur-icon-theme/default.nix +++ b/pkgs/data/icons/whitesur-icon-theme/default.nix @@ -6,6 +6,7 @@ , jdupes , boldPanelIcons ? false , blackPanelIcons ? false +, alternativeIcons ? false , themeVariants ? [] }: @@ -26,13 +27,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-11-17"; + version = "2023-01-08"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-crZ6JQeXeSjTHGIBptioNiFZas7MksJcjaKGlMP4fo0="; + hash = "sha256-xqKGZPlGl8kNZ4AQYZWAywL+6UxwGzYOZ9WvB85JKZk="; }; nativeBuildInputs = [ gtk3 jdupes ]; @@ -54,6 +55,7 @@ stdenvNoCC.mkDerivation rec { ./install.sh --dest $out/share/icons \ --name WhiteSur \ --theme ${builtins.toString themeVariants} \ + ${lib.optionalString alternativeIcons "--alternative"} \ ${lib.optionalString boldPanelIcons "--bold"} \ ${lib.optionalString blackPanelIcons "--black"} diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index a4739edea12f..2ae33c049bd2 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -17,10 +17,20 @@ }: let - blocklist = writeText "cacert-blocklist.txt" (lib.concatStringsSep "\n" blacklist); + blocklist = writeText "cacert-blocklist.txt" (lib.concatStringsSep "\n" (blacklist ++ [ + # Mozilla does not trust new certificates issued by these CAs after 2022/11/30¹ + # in their products, but unfortunately we don't have such a fine-grained + # solution for most system packages², so we decided to eject these. + # + # [1] https://groups.google.com/a/mozilla.org/g/dev-security-policy/c/oxX69KFvsm4/m/yLohoVqtCgAJ + # [2] https://utcc.utoronto.ca/~cks/space/blog/linux/CARootStoreTrustProblem + "TrustCor ECA-1" + "TrustCor RootCert CA-1" + "TrustCor RootCert CA-2" + ])); extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings); - srcVersion = "3.83"; + srcVersion = "3.86"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -35,7 +45,7 @@ let src = if nssOverride != null then nssOverride.src else fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/nss-${version}.tar.gz"; - sha256 = "sha256-qyPqZ/lkCQuLc8gKZ0CCVxw25fTrqSBXrGSMnB3vASg="; + sha256 = "sha256-PzhfxoZHa7uoEQNfpoIbVCR11VdHsYwgwiHU1mVzuXU="; }; dontBuild = true; diff --git a/pkgs/data/misc/cacert/update.sh b/pkgs/data/misc/cacert/update.sh index 9ad5ede0f7ef..d578102ad56b 100755 --- a/pkgs/data/misc/cacert/update.sh +++ b/pkgs/data/misc/cacert/update.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix common-updater-scripts jq -# Build both the cacert package and an overriden version where we use the source attribute of NSS. +# Build both the cacert package and an overridden version where we use the source attribute of NSS. # Cacert and NSS are both from the same upstream sources. They are decoupled as # the cacert output only cares about a few infrequently changing files in the # sources while the NSS source code changes frequently. diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index 31d7384976d6..c138ac710d57 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -1,23 +1,27 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenvNoCC, fetchurl, nix-update-script }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20220912"; + version = "20230112"; - src = ./.; - - data = fetchurl { + src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-YIQjuWbizheEE9kgL+hBS1GAGf2PbpaW5mu/lim9Q9A"; + sha256 = "sha256-mMu+U3gtoZmi6LrTMTqsNZKZ+w4J6LZ16Aorneyy7P8="; }; + dontUnpack = true; + installPhase = '' runHook preInstall mkdir -p $out/etc/clash - install -Dm 0644 $data -D $out/etc/clash/Country.mmdb + install -Dm 0644 $src -D $out/etc/clash/Country.mmdb runHook postInstall ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "A GeoLite2 data created by MaxMind"; homepage = "https://github.com/Dreamacro/maxmind-geoip"; diff --git a/pkgs/data/misc/colemak-dh/default.nix b/pkgs/data/misc/colemak-dh/default.nix index 261a7741f16f..0ce188bdc906 100644 --- a/pkgs/data/misc/colemak-dh/default.nix +++ b/pkgs/data/misc/colemak-dh/default.nix @@ -9,14 +9,12 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "ColemakMods"; - repo = "mod-dh"; + repo = "mod-dh"; rev = "e846a5bd24d59ed15ba70b3a9d5363a38ca51d09"; - sha256 = "sha256-RFOpN+tIMfakb7AZN0ock9eq2mytvL0DWedvQV67+ks="; + sha256 = "sha256-RFOpN+tIMfakb7AZN0ock9eq2mytvL0DWedvQV67+ks="; sparseCheckout = [ "console" ]; }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' runHook preInstall diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 3d91a4e7e727..c351778eb1c3 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -1,31 +1,21 @@ { lib, stdenv -, autoconf -, automake -, libtool +, autoreconfHook , intltool , fetchFromGitHub }: stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20220903"; + version = "20230124"; src = fetchFromGitHub { owner = "ddccontrol"; - repo = "ddccontrol-db"; + repo = pname; rev = version; - sha256 = "sha256-OmroJ2AEQdELE2Wuk1qPXzp+/9RUUULrEAdEpmXrJxw="; + sha256 = "sha256-coKdlV2DCZ0S3hg9bQEfE9/FaUbFX5w6IMj/kAqERic="; }; - preConfigure = '' - ./autogen.sh - ''; - - nativeBuildInputs = [ autoconf automake intltool ]; - buildInputs = - [ - libtool - ]; + nativeBuildInputs = [ autoreconfHook intltool ]; meta = with lib; { description = "Monitor database for DDCcontrol"; diff --git a/pkgs/data/misc/dtv-scan-tables/linuxtv.nix b/pkgs/data/misc/dtv-scan-tables/linuxtv.nix new file mode 100644 index 000000000000..dcbf20c38e8d --- /dev/null +++ b/pkgs/data/misc/dtv-scan-tables/linuxtv.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchurl +, v4l-utils +}: + +let + + version_ = "2022-04-30-57ed29822750"; + +in + +stdenv.mkDerivation rec { + pname = "dtv-scan-tables"; + version = "${version_}-linuxtv"; + + src = fetchurl { + url = "https://linuxtv.org/downloads/${pname}/${pname}-${version_}.tar.bz2"; + hash = "sha256-amJoqjkkWTePo6E5IvwBWj+mP/gi9LDWTTPXE1Cm7J4="; + }; + + nativeBuildInputs = [ + v4l-utils + ]; + + sourceRoot = "usr/share/dvb"; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + allowedReferences = [ ]; + + meta = with lib; { + # git repo with current revision is here: + #downloadPage = "https://git.linuxtv.org/dtv-scan-tables.git"; + # Weekly releases are supposed to be here + downloadPage = "https://linuxtv.org/downloads/dtv-scan-tables/"; + # but sometimes they lag behind several weeks or even months. + description = "Digital TV (DVB) channel/transponder scan tables"; + homepage = "https://www.linuxtv.org/wiki/index.php/Dtv-scan-tables"; + license = with licenses; [ gpl2Only lgpl21Only ]; + longDescription = '' + When scanning for dvb channels, + most applications require an initial set of + transponder coordinates (frequencies etc.). + These coordinates differ, depending of the + receiver's location or on the satellite. + The package delivers a collection of transponder + tables ready to be used by software like "dvbv5-scan". + ''; + maintainers = with maintainers; [ yarny ]; + }; +} diff --git a/pkgs/data/misc/dtv-scan-tables/tvheadend.nix b/pkgs/data/misc/dtv-scan-tables/tvheadend.nix new file mode 100644 index 000000000000..b2edc34e5ea1 --- /dev/null +++ b/pkgs/data/misc/dtv-scan-tables/tvheadend.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, v4l-utils +}: + +stdenv.mkDerivation rec { + pname = "dtv-scan-tables"; + version = "20221027-tvheadend"; + + src = fetchFromGitHub { + owner = "tvheadend"; + repo = "dtv-scan-tables"; + rev = "2a3dbfbab129c00d3f131c9c2f06b2be4c06fec6"; + hash = "sha256-bJ+naUs3TDFul4PmpnWYld3j1Se+1X6U9jnECe3sno0="; + }; + + nativeBuildInputs = [ + v4l-utils + ]; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + allowedReferences = [ ]; + + meta = with lib; { + description = "Digital TV (DVB) channel/transponder scan tables"; + homepage = "https://github.com/tvheadend/dtv-scan-tables"; + license = with licenses; [ gpl2Only lgpl21Only ]; + longDescription = '' + When scanning for dvb channels, + most applications require an initial set of + transponder coordinates (frequencies etc.). + These coordinates differ, depending of the + receiver's location or on the satellite. + The package delivers a collection of transponder + tables ready to be used by software like "dvbv5-scan". + The package at hand is maintained and used by tvheadend, + it is a fork of the original one hosted by linuxtv.org. + ''; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 5b654ec8ad0d..3cb903245f89 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "e2ccf8a8796c9192280f796ce0f5d98ec783f856", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e2ccf8a8796c9192280f796ce0f5d98ec783f856.tar.gz", - "sha256": "092g4pbxyhkw1isbib967v5aw16iqs3w5iqcicv1irr4rphsr06z", - "msg": "Update from Hackage at 2022-11-11T17:48:48Z" + "commit": "75d1bbbd68d9ae36d527666e2f140343323b02fa", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/75d1bbbd68d9ae36d527666e2f140343323b02fa.tar.gz", + "sha256": "018lz90f12bw8n8g4rbwfbnpmw6g3vblc12pd4qzq727h1d27p5l", + "msg": "Update from Hackage at 2023-01-12T12:18:29Z" } diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index 19331f458def..a5c5fd88a0a2 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "iana-etc"; - version = "20220915"; + version = "20221107"; src = fetchzip { url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "sha256-gBaM5YEK2XA42S7ELwjQChie/wYgo6n8dt2WEg3Pdns="; + sha256 = "sha256-vucC9MfpCCPyST21n09QDrj3z3MzKdBGo/ONUQvuxxQ="; }; installPhase = '' diff --git a/pkgs/data/misc/libkkc-data/default.nix b/pkgs/data/misc/libkkc-data/default.nix index 7fcd2fbf516f..516dd61c60f3 100644 --- a/pkgs/data/misc/libkkc-data/default.nix +++ b/pkgs/data/misc/libkkc-data/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2, libkkc }: +{ lib, stdenv, fetchurl, fetchpatch, python3, libkkc }: stdenv.mkDerivation rec { pname = "libkkc-data"; @@ -9,7 +9,16 @@ stdenv.mkDerivation rec { sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy"; }; - nativeBuildInputs = [ python2.pkgs.marisa ]; + patches = [ + (fetchpatch { + name = "build-python3.patch"; + url = "https://github.com/ueno/libkkc/commit/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch"; + relative = "data/templates/libkkc-data"; + hash = "sha256-q4zUclJtDQ1E5v2PW00zRZz6GXllLUcp2h3tugufrRU="; + }) + ]; + + nativeBuildInputs = [ python3.pkgs.marisa ]; strictDeps = true; diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 85f45ec516df..104ec58f718f 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 = "20220725"; + version = "20221107"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-SEWuAcKH8t+wIrxi1ZoUiHP/xKZz9RAgViZXQm1jKs0="; + sha256 = "sha256-2TOSVmw0epbu2V2oxmpdoN2U9BFc+zowX/JoLGTP2BA="; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 0f11459a1702..67c3dc7a3c12 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20220830"; + version = "20221130"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "sha256-gRFkPZDeq4ONt/IT8VS+8uBXNQqcg0JF7gHdZEM7qvs="; + sha256 = "sha256-opVMrXob7yZ5lJmHxjiI8eCBsJ4R+3JQVDcvA37HcX8="; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix index fd797d8d63f0..fdbd2991cdee 100644 --- a/pkgs/data/misc/shared-desktop-ontologies/default.nix +++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with lib; { - homepage = "http://oscaf.sourceforge.net/"; + homepage = "https://oscaf.sourceforge.net/"; description = "Ontologies necessary for the Nepomuk semantic desktop"; longDescription = '' The shared-desktop-ontologies package brings the semantic web to the diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix index 20778f1e5e91..93405fb788ef 100644 --- a/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/pkgs/data/misc/spdx-license-list-data/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.18"; + version = "3.19"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - hash = "sha256-iXuGJzURcRyiq2rVP5jabOmFByF0YuiZg4HPCM6mk3A="; + hash = "sha256-qT9Q6Mntnt9lOhYmGFJlkDyAHQ0CGQpWr1rLF08FGeg="; }; # List of file formats to package. diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 1453b3899ef7..81f23c9a828f 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchurl, fetchpatch, buildPackages }: +{ lib, stdenv, fetchurl, buildPackages }: stdenv.mkDerivation rec { pname = "tzdata"; - version = "2022f"; + version = "2022g"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - hash = "sha256-mZDXH2ddISVnuTH+iq4cq3An+J/vuKedgIppM6Z68AA="; + hash = "sha256-RJHbgoGulKhNk55Ce92D3DifJnZNJ9mlxS14LBZ2RHg="; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - hash = "sha256-5FQ+kPhPkfqCgJ6piTAFL9vBOIDIpiPuOk6qQvimTBU="; + hash = "sha256-lhC7C5ZW/0BMNhpB8yhtpTBktUadhPAMnLIxTIYU2nQ="; }) ]; @@ -19,17 +19,6 @@ stdenv.mkDerivation rec { patches = lib.optionals stdenv.hostPlatform.isWindows [ ./0001-Add-exe-extension-for-MS-Windows-binaries.patch - ] ++ [ - (fetchpatch { - name = "fix-get-random-on-osx-1.patch"; - url = "https://github.com/eggert/tz/commit/5db8b3ba4816ccb8f4ffeb84f05b99e87d3b1be6.patch"; - hash = "sha256-FevGjiSahYwEjRUTvRY0Y6/jUO4YHiTlAAPixzEy5hw="; - }) - (fetchpatch { - name = "fix-get-random-on-osx-2.patch"; - url = "https://github.com/eggert/tz/commit/841183210311b1d4ffb4084bfde8fa8bdf3e6757.patch"; - hash = "sha256-1tUTZBMT7V463P7eygpFS6/k5gTeeXumk5+V4gdKpEI="; - }) ]; outputs = [ "out" "bin" "man" "dev" ]; diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index e80aef513ac3..14299bdc522a 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 = "20220921050909"; + version = "20230106031328"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-ujslsVqUQ16LFdCwwKmY2SnoqNTRenI5cEreupt/6c4="; + sha256 = "sha256-17yAIJQdxZAsNZ8W3HaW+EVKcPYy9fBOsSxU/0GEJuU="; }; vendorSha256 = "sha256-CCY3CgjA1w4svzmkaI2Jt272Rrt5UOt5sbVDAWRRfzk="; meta = with lib; { diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 66eb722ad91a..be7466674259 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 = "202211170054"; + version = "202302020047"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "e01c82114de0b2f3a2e8c80c78fc22e8fb71f68a"; - sha256 = "sha256-T94G1s3vTkh0pd2ByOpOwJDPn7geaHbnBB7w1K9qwps="; + rev = "9ab244ed78fea88a1ce5bf789fb31bbcd81e8d17"; + sha256 = "sha256-2NYuvzOU0W3qZqWZMr3rTNqX+0rH3fhIr1zCD5dSdWc="; }; installPhase = '' diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix index f05788076a69..9a81fbb6e1b4 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; # */ meta = { - homepage = "http://www.w3.org/TR/xhtml1/"; + homepage = "https://www.w3.org/TR/xhtml1/"; description = "DTDs for XHTML 1.0, the Extensible HyperText Markup Language"; platforms = lib.platforms.unix; }; diff --git a/pkgs/data/themes/adw-gtk3/default.nix b/pkgs/data/themes/adw-gtk3/default.nix index c9159d505e36..0685e5d5b6a0 100644 --- a/pkgs/data/themes/adw-gtk3/default.nix +++ b/pkgs/data/themes/adw-gtk3/default.nix @@ -30,9 +30,7 @@ stdenvNoCC.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index 869c9beb9b7c..2a5d768b1ae3 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -1,16 +1,17 @@ -{ mkDerivation -, stdenv +{ stdenv , lib , fetchFromGitHub , nix-update-script , cmake , ninja , qtbase +, qtwayland , qt5 , xorg +, useQt6 ? false }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "adwaita-qt"; version = "1.4.1"; @@ -30,9 +31,19 @@ mkDerivation rec { buildInputs = [ qtbase - qt5.qtx11extras ] ++ lib.optionals stdenv.isLinux [ xorg.libxcb + ] ++ lib.optionals (!useQt6) [ + qt5.qtx11extras + ] ++ lib.optionals useQt6 [ + qtwayland + ]; + + # Qt setup hook complains about missing `wrapQtAppsHook` otherwise. + dontWrapQtApps = true; + + cmakeFlags = lib.optionals useQt6 [ + "-DUSE_QT6=true" ]; postPatch = '' @@ -42,9 +53,7 @@ mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index ef05338cf5ae..17089285f276 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20220405"; + version = "20221218"; src = fetchFromGitHub { owner = "jnsh"; repo = pname; rev = version; - sha256 = "sha256-CBj/SpBWH5xdNCQSJquqIntcmfARI7Cud76Tp8txXL4="; + sha256 = "sha256-7VmqsUCeG5GwmrVdt9BJj0eZ/1v+no/05KwGFb7E9ns="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/catppuccin-gtk/default.nix b/pkgs/data/themes/catppuccin-gtk/default.nix index 4158d4384d47..47cdc6e8ce9c 100644 --- a/pkgs/data/themes/catppuccin-gtk/default.nix +++ b/pkgs/data/themes/catppuccin-gtk/default.nix @@ -2,67 +2,71 @@ , stdenvNoCC , fetchFromGitHub , gtk3 +, colloid-gtk-theme , gnome-themes-extra , gtk-engine-murrine +, python3 , sassc -, tweaks ? [ ] +, accents ? [ "blue" ] , size ? "standard" +, tweaks ? [ ] +, variant ? "frappe" }: let + validAccents = [ "blue" "flamingo" "green" "lavender" "maroon" "mauve" "peach" "pink" "red" "rosewater" "sapphire" "sky" "teal" "yellow" ]; validSizes = [ "standard" "compact" ]; - validTweaks = [ "nord" "dracula" "black" "rimless" "normal" ]; + validTweaks = [ "black" "rimless" "normal" ]; + validVariants = [ "latte" "frappe" "macchiato" "mocha" ]; - unknownTweaks = lib.subtractLists validTweaks tweaks; - illegalMix = (lib.elem "nord" tweaks) && (lib.elem "dracula" tweaks); - - assertIllegal = lib.assertMsg (!illegalMix) '' - Tweaks "nord" and "dracula" cannot be mixed. Tweaks: ${toString tweaks} - ''; - - assertSize = lib.assertMsg (lib.elem size validSizes) '' - You entered a wrong size: ${size} - Valid sizes are: ${toString validSizes} - ''; - - assertUnknown = lib.assertMsg (unknownTweaks == [ ]) '' - You entered wrong tweaks: ${toString unknownTweaks} - Valid tweaks are: ${toString validTweaks} - ''; + pname = "catppuccin-gtk"; in -assert assertIllegal; -assert assertSize; -assert assertUnknown; +lib.checkListOfEnum "${pname}: theme accent" validAccents accents +lib.checkListOfEnum "${pname}: color variant" validVariants [variant] +lib.checkListOfEnum "${pname}: size variant" validSizes [size] +lib.checkListOfEnum "${pname}: tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { - pname = "catppuccin-gtk"; - version = "0.2.7"; + inherit pname; + version = "0.4.1"; src = fetchFromGitHub { - repo = "gtk"; owner = "catppuccin"; - rev = "v-${version}"; - sha256 = "sha256-oTAfURHMWqlKHk4CNz5cn6vO/7GmQJM2rXXGDz2e+0w="; + repo = "gtk"; + rev = "v${version}"; + sha256 = "sha256-dzRXt9/OdPyiy3mu9pmPYeu69OXCnR+zEqbD1C5BKqM="; }; nativeBuildInputs = [ gtk3 sassc ]; - buildInputs = [ gnome-themes-extra ]; + buildInputs = [ + gnome-themes-extra + (python3.withPackages (ps: [ ps.catppuccin ])) + ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + postUnpack = '' + rm -rf source/colloid + cp -r ${colloid-gtk-theme.src} source/colloid + chmod -R +w source/colloid + ''; + postPatch = '' - patchShebangs --build clean-old-theme.sh install.sh + patchShebangs --build colloid/clean-old-theme.sh colloid/install.sh ''; installPhase = '' runHook preInstall + mkdir -p $out/share/themes export HOME=$(mktemp -d) - bash install.sh -d $out/share/themes -t all \ - ${lib.optionalString (size != "") "-s ${size}"} \ - ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} + python3 install.py ${variant} \ + ${lib.optionalString (accents != []) "--accent " + builtins.toString accents} \ + ${lib.optionalString (size != []) "--size " + size} \ + ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \ + --dest $out/share/themes runHook postInstall ''; diff --git a/pkgs/data/themes/catppuccin-kde/default.nix b/pkgs/data/themes/catppuccin-kde/default.nix new file mode 100644 index 000000000000..b31b075a8fca --- /dev/null +++ b/pkgs/data/themes/catppuccin-kde/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "kde"; + version = "unstable-2022-11-26"; + + src = fetchFromGitHub { + owner = "catppuccin"; + repo = pname; + rev = "249df3ec0cdae79af379f4a10b802c50feac89ba"; + hash = "sha256-CH9GJnFqqdyIzW7VfGb3oB1YPULEZsfK3d1eyFALwKc="; + }; + + installPhase = '' + mkdir -p $out/share/{plasma/look-and-feel,color-schemes} + find . -type f -name "Catppuccin*.colors" -exec cp "{}" $out/share/color-schemes \; + find . -type f -name "*.tar.gz" -exec tar -xzf "{}" \; + cp -R Catppuccin-* $out/share/plasma/look-and-feel + ''; + + meta = with lib; { + description = "Soothing pastel theme for KDE"; + homepage = "https://github.com/catppuccin/kde"; + license = licenses.mit; + maintainers = with maintainers; [ michaelBelsanti ]; + }; +} diff --git a/pkgs/data/themes/fluent-gtk-theme/default.nix b/pkgs/data/themes/fluent-gtk-theme/default.nix new file mode 100644 index 000000000000..3359e6e1b128 --- /dev/null +++ b/pkgs/data/themes/fluent-gtk-theme/default.nix @@ -0,0 +1,76 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gitUpdater +, gnome-themes-extra +, gtk-engine-murrine +, jdupes +, sassc +, themeVariants ? [] # default: blue +, colorVariants ? [] # default: all +, sizeVariants ? [] # default: standard +, tweaks ? [] +}: + +let + pname = "fluent-gtk-theme"; + +in +lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeVariants +lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants +lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants +lib.checkListOfEnum "${pname}: tweaks" [ "solid" "float" "round" "blur" "noborder" "square" ] tweaks + +stdenvNoCC.mkDerivation rec { + inherit pname; + version = "2022-12-15"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + hash = "sha256-lGT6MIpc7cdAznZlbSJJ7aBzZPHucyfR8ZNMdJI0LP8="; + }; + + nativeBuildInputs = [ + jdupes + sassc + ]; + + buildInputs = [ + gnome-themes-extra + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + postPatch = '' + patchShebangs install.sh + ''; + + installPhase = '' + runHook preInstall + + name= HOME="$TMPDIR" ./install.sh \ + ${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \ + ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \ + ${lib.optionalString (sizeVariants != []) "--size " + builtins.toString sizeVariants} \ + ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \ + --dest $out/share/themes + + jdupes --quiet --link-soft --recurse $out/share + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "Fluent design gtk theme"; + homepage = "https://github.com/vinceliuice/Fluent-gtk-theme"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/themes/gruvbox-gtk-theme/default.nix b/pkgs/data/themes/gruvbox-gtk-theme/default.nix new file mode 100644 index 000000000000..a221918ad10d --- /dev/null +++ b/pkgs/data/themes/gruvbox-gtk-theme/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gnome-themes-extra +, gtk-engine-murrine +}: +stdenvNoCC.mkDerivation rec { + pname = "gruvbox-gtk-theme"; + version = "unstable-2022-12-09"; + + src = fetchFromGitHub { + owner = "Fausto-Korpsvart"; + repo = "Gruvbox-GTK-Theme"; + rev = "c3172d8dcba66f4125a014d280d41e23f0b95cad"; + sha256 = "1411mjlcj1d6kw3d3h1w9zsr0a08bzl5nddkkbv7w7lf67jy9b22"; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + buildInputs = [ + gnome-themes-extra + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a themes/* $out/share/themes + runHook postInstall + ''; + + meta = with lib; { + description = "A Gtk theme based on the Gruvbox colour pallete"; + homepage = "https://www.pling.com/p/1681313/"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.math-42 ]; + }; +} diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix index 213bd7134acb..57da762b9d64 100644 --- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix +++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -6,19 +6,19 @@ , kwin , kdelibs4support , libepoxy -, libXdmcp +, libxcb , lib }: stdenv.mkDerivation rec { pname = "kde-rounded-corners"; - version = "unstable-2022-09-17"; + version = "0.3.0"; src = fetchFromGitHub { owner = "matinlotfali"; repo = "KDE-Rounded-Corners"; - rev = "cdf7460d957e82dfd571cf0f2a20fd9553ac4c2e"; - hash = "sha256-ubocO0Vr3g5kIuGNV6vH+ySP42gFps9gPi5d3EpQVFY="; + rev = "v${version}"; + hash = "sha256-5b23QCyjPMC6iba84Y2WEar5uXzxg2GonRv3e4mLQlQ="; }; postConfigure = '' @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; - buildInputs = [ kwin kdelibs4support libepoxy libXdmcp ]; + buildInputs = [ kwin kdelibs4support libepoxy libxcb ]; meta = with lib; { description = "Rounds the corners of your windows"; diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index 189ef5277eb2..42be4e53027e 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "15.0"; + version = "16.2"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "sha256-GjBIAir4xTWnc1VXe5CF+FPcZJTSyJpi8MqlJUpkyy4="; + sha256 = "sha256-jhcmFrTZgWChNvZofLSQzGvOj/U2UqaQ0Cq5sv4UAxE="; }; buildInputs = [ diff --git a/pkgs/data/themes/material-kwin-decoration/default.nix b/pkgs/data/themes/material-kwin-decoration/default.nix index 463f86111ee9..9cfe5e76d02e 100644 --- a/pkgs/data/themes/material-kwin-decoration/default.nix +++ b/pkgs/data/themes/material-kwin-decoration/default.nix @@ -26,6 +26,12 @@ mkDerivation rec { sha256 = "sha256-n+yUmBUrkS+06qLnzl2P6CTQZZbDtJLy+2mDPCcQz9M="; }; + # Remove -Werror since it uses deprecated methods + postPatch = '' + substituteInPlace ./CMakeLists.txt \ + --replace "add_definitions (-Wall -Werror)" "add_definitions (-Wall)" + ''; + nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/data/themes/rose-pine-gtk/default.nix index d139876e1429..4211864139df 100644 --- a/pkgs/data/themes/rose-pine-gtk/default.nix +++ b/pkgs/data/themes/rose-pine-gtk/default.nix @@ -1,20 +1,20 @@ -{ stdenv -, fetchFromGitHub +{ stdenvNoCC , lib +, fetchFromGitHub , gnome-themes-extra , gtk-engine-murrine , gtk_engines }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "rose-pine-gtk-theme"; - version = "unstable-2021-02-22"; + version = "unstable-2022-09-01"; src = fetchFromGitHub { owner = "rose-pine"; repo = "gtk"; - rev = "9cd2dd449f911973ec549231a57a070d256da9fd"; - sha256 = "0lqx8dmv754ix3xbg7h440x964n0bg4lb06vbzvsydnbx79h7lvy"; + rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304"; + sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67"; }; buildInputs = [ @@ -26,11 +26,18 @@ stdenv.mkDerivation rec { gtk-engine-murrine # murrine engine for Gtk2 ]; + # avoid the makefile which is only for theme maintainers + dontBuild = true; + installPhase = '' runHook preInstall + mkdir -p $out/share/themes - cp -a Rose-Pine $out/share/themes - rm $out/share/themes/*/LICENSE + mv gtk3/rose-pine-gtk $out/share/themes/rose-pine + mv gtk3/rose-pine-moon-gtk $out/share/themes/rose-pine-moon + mv gtk3/rose-pine-dawn-gtk $out/share/themes/rose-pine-dawn + mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine-moon + runHook postInstall ''; @@ -39,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rose-pine/gtk"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; + maintainers = with maintainers; [romildo the-argus]; }; } diff --git a/pkgs/data/themes/vimix/default.nix b/pkgs/data/themes/vimix/default.nix index 85dc0788bfba..f9dbf73b3a99 100644 --- a/pkgs/data/themes/vimix/default.nix +++ b/pkgs/data/themes/vimix/default.nix @@ -17,20 +17,20 @@ let pname = "vimix-gtk-themes"; in -lib.checkListOfEnum "${pname}: theme variants" [ "doder" "beryl" "ruby" "amethyst" "grey" ] themeVariants +lib.checkListOfEnum "${pname}: theme variants" [ "doder" "beryl" "ruby" "amethyst" "jade" "grey" "all" ] themeVariants lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants -lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants +lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" "all" ] sizeVariants lib.checkListOfEnum "${pname}: tweaks" [ "flat" "grey" "mix" "translucent" ] tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-10-30"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "QGKh2Md25VNVqy58w/LBzNnEM+g4gBMUjj0W0IuVZ1U="; + sha256 = "4IJMLSUsZvtPfuMS+NYkKo8K3laec2YJk20d5tL0vKI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/budgie/budgie-screensaver/default.nix b/pkgs/desktops/budgie/budgie-screensaver/default.nix new file mode 100644 index 000000000000..cee9cecfa47d --- /dev/null +++ b/pkgs/desktops/budgie/budgie-screensaver/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, dbus-glib +, glib +, gnome-desktop +, gtk3 +, intltool +, libgnomekbd +, libX11 +, linux-pam +, meson +, ninja +, pkg-config +, systemd +, wrapGAppsHook +, xorg +}: + +stdenv.mkDerivation rec { + pname = "budgie-screensaver"; + version = "5.1.0"; + + src = fetchFromGitHub { + owner = "BuddiesOfBudgie"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-N8x9hdbaMDisTbQPJedNO4UMLnCn+Q2hhm4udJZgQlc="; + }; + + nativeBuildInputs = [ + intltool + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + dbus-glib + glib + gnome-desktop + gtk3 + libgnomekbd + libX11 + linux-pam + systemd + xorg.libXxf86vm + ]; + + NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE"; + + meta = with lib; { + description = "A fork of old GNOME Screensaver for purposes of providing an authentication prompt on wake"; + homepage = "https://github.com/BuddiesOfBudgie/budgie-screensaver"; + mainProgram = "budgie-screensaver"; + platforms = platforms.linux; + maintainers = [ maintainers.federicoschonborn ]; + license = licenses.gpl2Only; + }; +} diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix new file mode 100644 index 000000000000..491db246187b --- /dev/null +++ b/pkgs/desktops/budgie/default.nix @@ -0,0 +1,5 @@ +{ lib, pkgs }: + +lib.makeScope pkgs.newScope (self: with self; { + budgie-screensaver = callPackage ./budgie-screensaver { }; +}) diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 45008a0b7bd0..822c40694217 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "2.5"; + version = "2.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - hash = "sha256-WgpB/oMA3w7KO7KmkGXsl92siFGQo3Y4mLvMLTi54k8="; + hash = "sha256-Ps7ql6EAdoljQ6S8D2JxNSh0+jtEVZpnQv3fpvWkQSk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 15dd7a9cec1c..ef3013f2e404 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -7,7 +7,7 @@ , cinnamon-session , cinnamon-translations , cjs -, clutter +, evolution-data-server , fetchFromGitHub , gdk-pixbuf , gettext @@ -23,6 +23,7 @@ , libstartup_notification , libXtst , libXdamage +, mesa , muffin , networkmanager , pkg-config @@ -52,15 +53,32 @@ , perl }: +let + pythonEnv = python3.withPackages (pp: with pp; [ + dbus-python + setproctitle + pygobject3 + pycairo + pp.xapp # don't omit `pp.`, see #213561 + pillow + pyinotify # for looking-glass + pytz + tinycss2 + python-pam + pexpect + distro + requests + ]); +in stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.4.12"; + version = "5.6.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-uyQZXri3V3dKnowB97QlPWboZz1neblyvCuSacsPROg="; + hash = "sha256-oBD9jpZSOB7R3bbMv1qOQkkQyFTKkNnNagJ1INeA0s4="; }; patches = [ @@ -69,28 +87,14 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - (python3.withPackages (pp: with pp; [ - dbus-python - setproctitle - pygobject3 - pycairo - python3.pkgs.xapp # The scope prefix is required - pillow - pytz - tinycss2 - python-pam - pexpect - distro - requests - ])) atk cacert cinnamon-control-center cinnamon-desktop cinnamon-menus cjs - clutter dbus + evolution-data-server # for calendar-server gdk-pixbuf glib gsound @@ -100,9 +104,11 @@ stdenv.mkDerivation rec { libstartup_notification libXtst libXdamage + mesa muffin networkmanager polkit + pythonEnv libxml2 libgnomekbd gst_all_1.gstreamer @@ -136,7 +142,9 @@ stdenv.mkDerivation rec { pkg-config ]; - # use locales from cinnamon-translations (not using --localedir because datadir is used) + # Use locales from cinnamon-translations. + # FIXME: Upstream does not respect localedir option from Meson currently. + # https://github.com/linuxmint/cinnamon/pull/11244#issuecomment-1305855783 postInstall = '' ln -s ${cinnamon-translations}/share/locale $out/share/locale ''; @@ -149,26 +157,18 @@ stdenv.mkDerivation rec { sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py - sed "s|/usr/bin/upload-system-info|${xapp}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py - sed "s|\"upload-system-info\"|\"${xapp}/bin/upload-system-info\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py + sed "s|'python3'|'${pythonEnv.interpreter}'|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.py - sed "s|/usr/bin/cinnamon-control-center|${cinnamon-control-center}/bin/cinnamon-control-center|g" -i ./files/usr/bin/cinnamon-settings + sed "s|/usr/share/%s|/run/current-system/sw/share/%s|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py sed "s|/usr/bin/cinnamon-screensaver-command|/run/current-system/sw/bin/cinnamon-screensaver-command|g" \ -i ./files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js -i ./files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js - # this one really IS optional - sed "s|/usr/bin/gnome-control-center|/run/current-system/sw/bin/gnome-control-center|g" -i ./files/usr/bin/cinnamon-settings - sed "s|\"/usr/lib\"|\"${cinnamon-control-center}/lib\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/capi.py - # another bunch of optional stuff - sed "s|/usr/bin|/run/current-system/sw/bin|g" -i ./files/usr/bin/cinnamon-launcher - sed 's|"lspci"|"${pciutils}/bin/lspci"|g' -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-cinnamon -i ./files/usr/bin/cinnamon-session-cinnamon2d - sed "s|/usr/bin|$out/bin|g" -i ./files/usr/share/xsessions/cinnamon.desktop ./files/usr/share/xsessions/cinnamon2d.desktop ./files/usr/share/applications/cinnamon2d.desktop sed "s|msgfmt|${gettext}/bin/msgfmt|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index c0a34fc093dc..b3a16ed3fc35 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -9,7 +9,6 @@ , libnotify , libxml2 , gnome-online-accounts -, cinnamon-settings-daemon , colord , polkit , libxkbfile @@ -36,13 +35,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "5.4.7"; + version = "5.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-38n1QCygkBq+wOLwui1oF6MtDWxAFWxp5U1omSVtbro="; + hash = "sha256-rp3K7SqGw8da2U61VjKiqUyT5vCUVk4XZdRYtLwRtfQ="; }; buildInputs = [ @@ -56,7 +55,6 @@ stdenv.mkDerivation rec { libgnomekbd libxklavier colord - cinnamon-settings-daemon libgudev libwacom gnome-online-accounts @@ -75,10 +73,6 @@ stdenv.mkDerivation rec { ./panels/datetime/tz.h:34:# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" */ postPatch = '' - find . -type f -exec sed -i \ - -e s,/usr/share/locale,/run/current-system/sw/share/locale,g \ - {} + - sed 's|TZ_DIR "/usr/share/zoneinfo/"|TZ_DIR "${tzdata}/share/zoneinfo/"|g' -i ./panels/datetime/test-timezone.c sed 's|TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"|TZ_DATA_FILE "${tzdata}/share/zoneinfo/zone.tab"|g' -i ./panels/datetime/tz.h sed 's|"/usr/share/i18n/locales/"|"${glibc}/share/i18n/locales/"|g' -i panels/datetime/test-endianess.c @@ -86,27 +80,11 @@ stdenv.mkDerivation rec { patchShebangs meson_install_schemas.py ''; - # it needs to have access to that file, otherwise we can't run tests after build - - preBuild = '' - mkdir -p $out/share/cinnamon-control-center/ - ln -s $PWD/panels/datetime $out/share/cinnamon-control-center/ - ''; - mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" ]; - preInstall = '' - rm -r $out - ''; - - # the only test is wacom-calibrator and it seems to need an xserver and prob more services aswell - doCheck = false; - nativeBuildInputs = [ pkg-config meson diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 0b9e10e74027..c9c718fb7da9 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "5.4.2"; + version = "5.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-U05JiW6PaRAEEQ/uq3wmZSQGohMz4M86Ji9pBl2Azg8="; + hash = "sha256-h2Jl/4SreniZtxziDwM0iwHXgGBrnHu8NLkIX7VGP18="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index c3a60d684781..599e580a5bab 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-menus"; - version = "5.4.0"; + version = "5.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Q4bgaX8nGSWHKHR3+hFTlHtNhSmZW8ZEHi8DaXKQ+fM="; + hash = "sha256-6IOlXQhAy6YrSqybfGFUyn3Q2COvzwpj67y/k/YLNhU="; }; buildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 9575255d5791..e6a615bb12af 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "5.4.4"; + version = "5.6.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-D+SpAO4i4KGFWJI94LalTMB3j1YPvV63cKb34FDDprk="; + hash = "sha256-S4+9ZTpDwwvYTc3gz0YQBYjgygp8KP94azkiJcH6xCk="; }; nativeBuildInputs = [ @@ -93,6 +93,13 @@ stdenv.mkDerivation rec { sed "s|/usr/share/locale|/run/current-system/sw/share/locale|g" -i ./src/cinnamon-screensaver-main.py ''; + preFixup = '' + # https://github.com/NixOS/nixpkgs/issues/101881 + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome.caribou}/share" + ) + ''; + meta = with lib; { homepage = "https://github.com/linuxmint/cinnamon-screensaver"; description = "The Cinnamon screen locker and screensaver program"; diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 261433e65872..90f760051bd5 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "5.4.0"; + version = "5.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-m16nf3eC15ZT8eDvRTylBfxsnShkU1Sm8J9qcRGeGQo="; + hash = "sha256-lyASp0jFwaPLPQ3Jnow6eTpUBybwhSEmQUK/20fsh7I="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index ed947ee2b508..1fcc9fb6a29a 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-settings-daemon"; - version = "5.4.5"; + version = "5.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-qjI1z1MuaI5JFqjHap/+aYDQ0YuP9VNnnY6vy/AaKqs="; + hash = "sha256-QR77O3rFfY0+6cKoS75xoFRplNo4nvTMtR2rNKZERYE="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index 195d0268f3b1..09bf133a92a3 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "5.4.2"; + version = "5.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-vt60qarNfTX9R5kGOeUBCskKK2zLdEE+ACT0EGvUeao="; + hash = "sha256-567xkQGLLhZtjAWXzW/MRiD14rrWeg0yvx97jtukRvc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 63be8c0d569b..167924fe6d15 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "cjs"; - version = "5.4.1"; + version = "5.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cjs"; rev = version; - hash = "sha256-8LIVM9+Wt9V7iKUwqTBUTf8LiQ16NE3CYtCJknjl56o="; + hash = "sha256-f9esbQi5WWSMAGlEs9HJFToOvmOrbP2lDW1gGh/48gw="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 5a803c6d487c..f991c970bfca 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -12,6 +12,13 @@ lib.makeScope pkgs.newScope (self: with self; { installPhase = "mv svg $out/share/iso-flags-svg"; }); + # Extensions added here will be shipped by default + nemoExtensions = [ + folder-color-switcher + nemo-fileroller + nemo-python + ]; + # blueberry -> pkgs/tools/bluetooth/blueberry/default.nix bulky = callPackage ./bulky { }; cinnamon-common = callPackage ./cinnamon-common { }; @@ -24,8 +31,13 @@ lib.makeScope pkgs.newScope (self: with self; { cinnamon-session = callPackage ./cinnamon-session { }; cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { }; cjs = callPackage ./cjs { }; + folder-color-switcher = callPackage ./folder-color-switcher { }; nemo = callPackage ./nemo { }; + nemo-fileroller = callPackage ./nemo-extensions/nemo-fileroller { }; + nemo-python = callPackage ./nemo-extensions/nemo-python { }; + nemo-with-extensions = callPackage ./nemo/wrapper.nix { }; mint-artwork = callPackage ./mint-artwork { }; + mint-cursor-themes = callPackage ./mint-cursor-themes { }; mint-themes = callPackage ./mint-themes { }; mint-x-icons = callPackage ./mint-x-icons { }; mint-y-icons = callPackage ./mint-y-icons { }; diff --git a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix new file mode 100644 index 000000000000..a3909b820ba9 --- /dev/null +++ b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix @@ -0,0 +1,44 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, gettext +}: + +stdenvNoCC.mkDerivation rec { + pname = "folder-color-switcher"; + version = "1.5.5"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + # They don't really do tags, this is just a named commit. + rev = "5e0b768b3a5bf88a828a2489b9428997b797c1ed"; + sha256 = "sha256-DU75LM5v2/E/ZmqQgyiPsOOEUw9QQ/NXNtGDFzzYvyY="; + }; + + nativeBuildInputs = [ + gettext + ]; + + postPatch = '' + substituteInPlace usr/share/nemo-python/extensions/nemo-folder-color-switcher.py \ + --replace "/usr/share" "$out/share" + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv usr/share $out + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/linuxmint/folder-color-switcher"; + description = "Change folder colors for Nemo and Caja"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = teams.cinnamon.members; + }; +} diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix index 833a28967b4d..490c4fa068f3 100644 --- a/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,11 +7,14 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.6.0"; + version = "1.7.3"; src = fetchurl { - url = "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"; - hash = "sha256-un5T56zzN2vRVp42RHczDEKwrweSeygASkFJU5LXCDo="; + urls = [ + "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + "https://web.archive.org/web/20221206154838/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + ]; + hash = "sha256-lusYlmTL71VTGSJFssuIZVu7xJMuZQ7wj2rMtO1lhZ8="; }; nativeBuildInputs = [ @@ -25,9 +28,7 @@ stdenv.mkDerivation rec { find . -type f -exec sed -i \ -e s,/usr/share/backgrounds/linuxmint/default_background.jpg,${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png,g \ -e s,/usr/share,$out/share,g \ - -e s,DMZ-White,Vanilla-DMZ,g \ - -e s,DMZ-Black,Vanilla-DMZ-AA,g \ - -e s,linuxmint-logo-5,cinnamon-symbolic,g \ + -e s,linuxmint-logo-ring-symbolic,cinnamon-symbolic,g \ {} + # fixup broken symlink @@ -40,7 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/linuxmint/mint-artwork"; description = "Artwork for the cinnamon desktop"; - license = licenses.gpl3; # from debian/copyright + license = with licenses; [ gpl3Plus cc-by-40 ]; # from debian/copyright platforms = platforms.linux; maintainers = teams.cinnamon.members; }; diff --git a/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix b/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix new file mode 100644 index 000000000000..31b453b0bea9 --- /dev/null +++ b/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix @@ -0,0 +1,34 @@ +{ stdenvNoCC +, fetchFromGitHub +, lib +}: + +stdenvNoCC.mkDerivation rec { + pname = "mint-cursor-themes"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + # They don't really do tags, this is just a named commit. + rev = "e17f8a4620827235dabbe5221bd0ee8c44dad0d5"; + hash = "sha256-yLUmIVh884uDVkNil7qxf6t/gykipzBvPgzwmY3zvQk="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv usr/share $out + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/linuxmint/mint-cursor-themes/"; + description = "Linux Mint cursor themes"; + license = licenses.gpl3Plus; + maintainers = teams.cinnamon.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index 809ffac849b8..4fa869a5ef31 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -1,21 +1,20 @@ { fetchFromGitHub , lib -, stdenv +, stdenvNoCC , python3 , sassc , sass }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "mint-themes"; - version = "2.0.5"; + version = "2.0.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - # they don't exactly do tags, it's just a named commit - rev = "3a202e401abca98623cd1dbc412221682081244c"; - hash = "sha256-OgyLNc6gwMn7dG5/T67Toiqsij1rJYV6k6Un2cgr2oQ="; + rev = version; + hash = "sha256-FvX4r7AZgSq52T9CKE9RagsKgQXExTYPptQBXadA3eI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix index 2a57e0571ed2..ada385afcea2 100644 --- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub , lib -, stdenv +, stdenvNoCC , gnome , gnome-icon-theme , hicolor-icon-theme @@ -9,15 +9,14 @@ , ubuntu-themes }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "mint-x-icons"; version = "1.6.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - # they don't exactly do tags, it's just a named commit - rev = "4ab3c314db1b3751d87d5769629b28ac0ca3c671"; + rev = version; hash = "sha256-cPRae3EjzVtAL1Ei2LB4UNUU/m87mFT94xY/NnNR6JM="; }; diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index 212de9646223..b9d18280783e 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -1,22 +1,21 @@ { fetchFromGitHub , lib -, stdenv +, stdenvNoCC , gnome , gnome-icon-theme , hicolor-icon-theme , gtk3 }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "mint-y-icons"; - version = "1.6.1"; + version = "1.6.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - # they don't exactly do tags, it's just a named commit - rev = "57d16eb85f2af40be17e2232d279bb65b689f5b7"; - hash = "sha256-voFYz0MiuqyNSngi4QZUJKDIjggQWOAV5B30zMP8iTk="; + rev = version; + hash = "sha256-XnQcVlN4xtZQDjijNV09m2m0ODYfFbrQaNd8ZQVToIw="; }; propagatedBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index a2e7811b3d85..58a9008e3387 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -35,10 +35,17 @@ stdenv.mkDerivation rec { pname = "muffin"; - version = "5.4.7"; + version = "5.6.3"; outputs = [ "out" "dev" "man" ]; + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + hash = "sha256-qcm1CRUMKFx4KDXBnaIVLHuZTzSMEWEBFTWMe85pJDE="; + }; + patches = [ (substituteAll { src = ./fix-paths.patch; @@ -46,13 +53,6 @@ stdenv.mkDerivation rec { }) ]; - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - hash = "sha256-Zx6au1FXLgK8PRmkh8jaGJ3Zh0YYFj2zmbxhgXAFgDg="; - }; - nativeBuildInputs = [ desktop-file-utils mesa # needed for gbm diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix new file mode 100644 index 000000000000..7153ec0865c5 --- /dev/null +++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchFromGitHub +, meson +, pkg-config +, ninja +, glib +, gtk3 +, nemo +, gnome +}: + +stdenv.mkDerivation rec { + pname = "nemo-fileroller"; + version = "5.6.1"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = "nemo-extensions"; + rev = "nemo-fileroller-${version}"; + sha256 = "sha256-dPmAHuJ0ZRTAwhnMMZEu1e9+qZRYCnlaaoCdUP45W+s="; + }; + + sourceRoot = "${src.name}/nemo-fileroller"; + + nativeBuildInputs = [ + meson + pkg-config + ninja + ]; + + buildInputs = [ + glib + gtk3 + nemo + ]; + + postPatch = '' + substituteInPlace src/nemo-fileroller.c \ + --replace "file-roller" "${lib.getExe gnome.file-roller}" + ''; + + PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}"; + + meta = with lib; { + homepage = "https://github.com/linuxmint/nemo-extensions/tree/master/nemo-fileroller"; + description = "Nemo file roller extension"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = teams.cinnamon.members; + }; +} diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix new file mode 100644 index 000000000000..bc43f2aa0848 --- /dev/null +++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, lib +, fetchFromGitHub +, meson +, pkg-config +, ninja +, glib +, gtk3 +, nemo +, python3 +, substituteAll +}: + +stdenv.mkDerivation rec { + pname = "nemo-python"; + version = "5.6.0"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = "nemo-extensions"; + rev = version; + sha256 = "sha256-cxutiz5bc/dZ9D7XzvMWodWNYvNJPj+5IhJDPJwnb5I="; + }; + + sourceRoot = "${src.name}/nemo-python"; + + patches = [ + # Load extensions from NEMO_PYTHON_EXTENSION_DIR environment variable + # https://github.com/NixOS/nixpkgs/issues/78327 + ./load-extensions-from-env.patch + + # Required for pygobject_init (). + (substituteAll { + src = ./python-path.patch; + env = "${python3.pkgs.pygobject3}/${python3.sitePackages}"; + }) + ]; + + nativeBuildInputs = [ + meson + pkg-config + ninja + ]; + + buildInputs = [ + glib + gtk3 + nemo + python3 + python3.pkgs.pygobject3 + ]; + + postPatch = '' + # Tries to load libpython3.so via g_module_open (). + substituteInPlace meson.build \ + --replace "get_option('prefix'), get_option('libdir')" "'${python3}/lib'" + ''; + + PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}"; + + meta = with lib; { + homepage = "https://github.com/linuxmint/nemo-extensions/tree/master/nemo-python"; + description = "Python bindings for the Nemo extension library"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = teams.cinnamon.members; + }; +} diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/load-extensions-from-env.patch b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/load-extensions-from-env.patch new file mode 100644 index 000000000000..ad9a4abdc387 --- /dev/null +++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/load-extensions-from-env.patch @@ -0,0 +1,27 @@ +diff --git a/src/nemo-python.c b/src/nemo-python.c +index 8d2acdb..900811b 100644 +--- a/src/nemo-python.c ++++ b/src/nemo-python.c +@@ -255,6 +255,7 @@ nemo_module_initialize(GTypeModule *module) + { + gchar *user_extensions_dir; + const gchar *env_string; ++ const gchar *python_extensiondir; + + env_string = g_getenv("NEMO_PYTHON_DEBUG"); + if (env_string != NULL) +@@ -269,8 +270,12 @@ nemo_module_initialize(GTypeModule *module) + + all_types = g_array_new(FALSE, FALSE, sizeof(GType)); + +- // Look in the new global path, $DATADIR/nemo-python/extensions +- nemo_python_load_dir(module, PYTHON_EXTENSION_DIR); ++ // Look in NEMO_PYTHON_EXTENSION_DIR ++ python_extensiondir = g_getenv("NEMO_PYTHON_EXTENSION_DIR"); ++ if (python_extensiondir == NULL) { ++ python_extensiondir = PYTHON_EXTENSION_DIR; ++ } ++ nemo_python_load_dir(module, python_extensiondir); + + // Look in XDG_DATA_DIR, ~/.local/share/nemo-python/extensions + user_extensions_dir = g_build_filename(g_get_user_data_dir(), diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch new file mode 100644 index 000000000000..bf6db93385c8 --- /dev/null +++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/nemo-python.c b/src/nemo-python.c +index 8d2acdb..ee24143 100644 +--- a/src/nemo-python.c ++++ b/src/nemo-python.c +@@ -197,7 +197,7 @@ nemo_python_init_python (void) + } + + debug("Sanitize the python search path"); +- PyRun_SimpleString("import sys; sys.path = [path for path in sys.path if path]"); ++ PyRun_SimpleString("import sys; sys.path = [path for path in sys.path if path]; sys.path.append('@env@')"); + if (PyErr_Occurred()) + { + PyErr_Print(); diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 0490b2b47c7a..e25db028fa86 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -23,17 +23,21 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.4.3"; - - # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327) + version = "5.6.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-f3rO0lpOcwpSpIpKrslf6/6nqFbbGTwnKbHpWO+Uf+Q="; + sha256 = "sha256-CuG0s2gtuYwuIvti5xGiGJa5C5IcruFtNhv6s1vcuUA="; }; + patches = [ + # Load extensions from NEMO_EXTENSION_DIR environment variable + # https://github.com/NixOS/nixpkgs/issues/78327 + ./load-extensions-from-env.patch + ]; + outputs = [ "out" "dev" ]; buildInputs = [ @@ -63,12 +67,16 @@ stdenv.mkDerivation rec { "--localedir=${cinnamon-translations}/share/locale" ]; + # Taken from libnemo-extension.pc. + passthru.extensiondir = "lib/nemo/extensions-3.0"; + meta = with lib; { homepage = "https://github.com/linuxmint/nemo"; description = "File browser for Cinnamon"; license = [ licenses.gpl2 licenses.lgpl2 ]; platforms = platforms.linux; maintainers = teams.cinnamon.members; + mainProgram = "nemo"; }; } diff --git a/pkgs/desktops/cinnamon/nemo/load-extensions-from-env.patch b/pkgs/desktops/cinnamon/nemo/load-extensions-from-env.patch new file mode 100644 index 000000000000..610b3490cac3 --- /dev/null +++ b/pkgs/desktops/cinnamon/nemo/load-extensions-from-env.patch @@ -0,0 +1,40 @@ +diff --git a/libnemo-private/nemo-module.c b/libnemo-private/nemo-module.c +index 92bcff5..ecadcd8 100644 +--- a/libnemo-private/nemo-module.c ++++ b/libnemo-private/nemo-module.c +@@ -209,11 +209,16 @@ void + nemo_module_setup (void) + { + static gboolean initialized = FALSE; ++ const gchar *extensiondir = NULL; + + if (!initialized) { + initialized = TRUE; + +- load_module_dir (NEMO_EXTENSIONDIR); ++ extensiondir = g_getenv ("NEMO_EXTENSION_DIR"); ++ if (extensiondir == NULL) { ++ extensiondir = NEMO_EXTENSIONDIR; ++ } ++ load_module_dir (extensiondir); + + eel_debug_call_at_shutdown (free_module_objects); + } +diff --git a/src/nemo-extensions-list.c b/src/nemo-extensions-list.c +index 944fc5f..983c396 100644 +--- a/src/nemo-extensions-list.c ++++ b/src/nemo-extensions-list.c +@@ -129,7 +129,12 @@ module_get_extensions_for_type (GType type) + int + main (int argc, char *argv[]) + { +- populate_from_directory (NEMO_EXTENSIONDIR); ++ const gchar *extensiondir = NULL; ++ extensiondir = g_getenv ("NEMO_EXTENSION_DIR"); ++ if (extensiondir == NULL) { ++ extensiondir = NEMO_EXTENSIONDIR; ++ } ++ populate_from_directory (extensiondir); + + GList *nd_providers; + GList *l; diff --git a/pkgs/desktops/cinnamon/nemo/wrapper.nix b/pkgs/desktops/cinnamon/nemo/wrapper.nix new file mode 100644 index 000000000000..604247566b84 --- /dev/null +++ b/pkgs/desktops/cinnamon/nemo/wrapper.nix @@ -0,0 +1,42 @@ +{ symlinkJoin +, lib +, makeWrapper +, nemo +, nemoExtensions +, extensions ? [ ] +, useDefaultExtensions ? true +}: + +let + selectedExtensions = extensions ++ (lib.optionals useDefaultExtensions nemoExtensions); +in +symlinkJoin { + name = "nemo-with-extensions-${nemo.version}"; + + paths = [ nemo ] ++ selectedExtensions; + + nativeBuildInputs = [ makeWrapper ]; + + postBuild = '' + for f in $(find $out/bin/ $out/libexec/ -type l -not -path "*/.*"); do + wrapProgram "$f" \ + --set "NEMO_EXTENSION_DIR" "$out/${nemo.extensiondir}" \ + --set "NEMO_PYTHON_EXTENSION_DIR" "$out/share/nemo-python/extensions" + done + + # Don't populate the same nemo actions twice when having this globally installed + # https://github.com/NixOS/nixpkgs/issues/190781#issuecomment-1365601853 + rm -r $out/share/nemo/actions + + # Point to wrapped binary in all service files + for file in "share/dbus-1/services/nemo.FileManager1.service" \ + "share/dbus-1/services/nemo.service" + do + rm "$out/$file" + substitute "${nemo}/$file" "$out/$file" \ + --replace "${nemo}" "$out" + done + ''; + + inherit (nemo) meta; +} diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index ebd116882a8c..0b02806e0579 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "pix"; - version = "2.8.7"; + version = "2.8.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-aID0jxOMFegkcAflTY0VevZyN1HFivkTFi3has8MOY0="; + sha256 = "sha256-7g0j1cWgNtWlqKWzBnngUA2WNr8Zh8YO/jJ8OdTII7Y="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 81892e7c0d6d..7bdfb469c346 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { pname = "warpinator"; - version = "1.2.14"; + version = "1.4.4"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-0OmrviDti843c+nvpt7ennSrso0PD7eZOJ94JiWJT58="; + hash = "sha256-oHJOwdCvHnPalTHb5E3mNDYBaR9ZvlV1F6ux7nejBlc="; }; nativeBuildInputs = [ @@ -68,9 +68,13 @@ python3.pkgs.buildPythonApplication rec { {} + ''; + dontWrapGApps = true; # Prevent double wrapping + preFixup = '' # these get loaded via import from bin, so don't need wrapping chmod -x+X $out/libexec/warpinator/*.py + + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; passthru.updateScript = gitUpdater { diff --git a/pkgs/desktops/cinnamon/xapp/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix index 5408c9c50cfd..07b557d65c0d 100644 --- a/pkgs/desktops/cinnamon/xapp/default.nix +++ b/pkgs/desktops/cinnamon/xapp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "xapp"; - version = "2.2.15"; + version = "2.4.2"; outputs = [ "out" "dev" ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-X/exXQY/v+TU8HnnquleP21tCYR9h7t43AIw4tTKVOY="; + hash = "sha256-etB+q7FIwbApTUk8RohAy3kHX8Vb4cSY/qkvhj94yTM="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index ebb57ae9a757..eea8ead9ac76 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.4.5"; + version = "3.6.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-lRtBxqD45/3Wjp0Sq8A0L3Zmg33Pq6iIsA8jeywnDBc="; + sha256 = "sha256-KuCcOnhM8AzKC8hfBpdcnC/ubDVsElKMZuxEnTcJLn0="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index 2c55f6140244..9002c10e6120 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "xviewer"; - version = "3.2.10"; + version = "3.2.12"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-c3K9yjeaAlyXqgxzHgnLXgqwaB5Fdw+mS9jricy8QA8="; + sha256 = "sha256-tiZeC862gHbZt76sbxseUu9vWN+1huftXpE7lQLkGKU="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix new file mode 100644 index 000000000000..e565eabe1821 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, lib +, fetchFromGitHub +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory +, cmake +, qtbase +, qttools +, pkg-config +, wrapQtAppsHook +, gtest +}: + +stdenv.mkDerivation rec { + pname = "deepin-calculator"; + version = "5.8.23"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-MczQWYIQfpSkyA3144y3zly66N0vgcVvTYR6B7Hq1aw="; + }; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + dde-qt-dbus-factory + gtest + ]; + + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + "--prefix QT_QPA_PLATFORM_PLUGIN_PATH : ${qt5platform-plugins}/${qtbase.qtPluginPrefix}" + ]; + + cmakeFlags = [ "-DVERSION=${version}" ]; + + meta = with lib; { + description = "An easy to use calculator for ordinary users"; + homepage = "https://github.com/linuxdeepin/deepin-calculator"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix new file mode 100644 index 000000000000..01a26d58f289 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix @@ -0,0 +1,83 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory +, cmake +, pkg-config +, qttools +, qtbase +, qtsvg +, wrapQtAppsHook +, kcodecs +, syntax-highlighting +, libchardet +, libuchardet +, libiconv +, gtest +}: + +stdenv.mkDerivation rec { + pname = "deepin-editor"; + version = "5.10.35"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-X3tsmtqMUSpYQZqCmgtCLCSGwzSmCZagF7TUWQYJsqU="; + }; + + patches = [ + (fetchpatch { + name = "chore: use GNUInstallDirs in CmakeLists"; + url = "https://github.com/linuxdeepin/deepin-editor/commit/7f4314f386a3c8f5cdea3618591b8eb027d034c3.patch"; + sha256 = "sha256-/aSBa2nILc/YrFchUyhBHHs2c7Mv6N1juwD5Sdc39Uo="; + }) + ]; + + postPatch = '' + substituteInPlace src/common/utils.h --replace "/usr/share" "$out/share" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + qtsvg + dtkwidget + qt5platform-plugins + dde-qt-dbus-factory + kcodecs + syntax-highlighting + libchardet + libuchardet + libiconv + gtest + ]; + + strictDeps = true; + + cmakeFlags = [ "-DVERSION=${version}" ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + meta = with lib; { + description = "A desktop text editor that supports common text editing features"; + homepage = "https://github.com/linuxdeepin/deepin-editor"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix new file mode 100644 index 000000000000..657b69e6d95a --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory +, cmake +, qtbase +, qttools +, qtx11extras +, pkg-config +, wrapQtAppsHook +, at-spi2-core +, libsecret +, chrpath +, lxqt +, gtest +}: + +stdenv.mkDerivation rec { + pname = "deepin-terminal"; + version = "5.4.34"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-CpI7dyQwrYOYzqVZ6aa+/OAUC3xRyY4ZwzH1mqURTfY="; + }; + + patches = [ + (fetchpatch { + name = "chore: use GNUInstallDirs in CmakeLists"; + url = "https://github.com/linuxdeepin/deepin-terminal/commit/b18a2ca8411f09f5573aa2a8403a484b693ec975.patch"; + sha256 = "sha256-Qy8Jg+7BfZr8tQEsCAzhMEwf6rU96gkgup5f9bMMELY="; + }) + ]; + + cmakeFlags = [ "-DVERSION=${version}" ]; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + lxqt.lxqt-build-tools + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + dde-qt-dbus-factory + qtx11extras + at-spi2-core + libsecret + chrpath + gtest + ]; + + strictDeps = true; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + meta = with lib; { + description = "Terminal emulator with workspace, multiple windows, remote management, quake mode and other features"; + homepage = "https://github.com/linuxdeepin/deepin-terminal"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix b/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix new file mode 100644 index 000000000000..91438a043c0a --- /dev/null +++ b/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix @@ -0,0 +1,26 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "dde-account-faces"; + version = "1.0.12.1"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-NWjR8qxWi2IrcP0cSF+lLxBJ/GrVpk1BfTjVH0ytinY="; + }; + + makeFlags = [ "PREFIX=${placeholder "out"}/var" ]; + + meta = with lib; { + description = "Account faces of deepin desktop environment"; + homepage = "https://github.com/linuxdeepin/dde-account-faces"; + license = with licenses; [ gpl3Plus cc0 ]; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix new file mode 100644 index 000000000000..3864989196f3 --- /dev/null +++ b/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix @@ -0,0 +1,31 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, gtk-engine-murrine +}: + +stdenvNoCC.mkDerivation rec { + pname = "deepin-gtk-theme"; + version = "unstable-2022-07-26"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "deepin-gtk-theme"; + rev = "5ac53cbdfba4e6804451605db726876a3be9fb07"; + sha256 = "sha256-NJ5URKYs4rVzddXxkwJK9ih40f8McVEbj3G1tPFAiMs"; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with lib; { + description = "Deepin GTK Theme"; + homepage = "https://github.com/linuxdeepin/deepin-gtk-theme"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix new file mode 100644 index 000000000000..0cda82fdfcf2 --- /dev/null +++ b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix @@ -0,0 +1,46 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, gtk3 +, xcursorgen +, papirus-icon-theme +}: + +stdenvNoCC.mkDerivation rec { + pname = "deepin-icon-theme"; + version = "2021.11.24"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-UC3PbqolcCbVrIEDqMovfJ4oeofMUGJag1A6u7X3Ml8="; + }; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + nativeBuildInputs = [ + gtk3 + xcursorgen + ]; + + propagatedBuildInputs = [ + papirus-icon-theme + ]; + + dontDropIconThemeCache = true; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + + meta = with lib; { + description = "Deepin Icon Theme provides the base icon themes on Deepin"; + homepage = "https://github.com/linuxdeepin/deepin-icon-theme"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix new file mode 100644 index 000000000000..f311339b6be0 --- /dev/null +++ b/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix @@ -0,0 +1,26 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "deepin-sound-theme"; + version = "15.10.6"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-BvG/ygZfM6sDuDSzAqwCzDXGT/bbA6Srlpg3br117OU="; + }; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with lib; { + description = "The freedesktop sound theme for Deepin"; + homepage = "https://github.com/linuxdeepin/deepin-sound-theme"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix new file mode 100644 index 000000000000..ec3302908a05 --- /dev/null +++ b/pkgs/desktops/deepin/default.nix @@ -0,0 +1,35 @@ +{ lib, pkgs, libsForQt5 }: +let + packages = self: + let + inherit (self) callPackage; + in { + #### LIBRARIES + dtkcommon = callPackage ./library/dtkcommon { }; + dtkcore = callPackage ./library/dtkcore { }; + dtkgui = callPackage ./library/dtkgui { }; + dtkwidget = callPackage ./library/dtkwidget { }; + qt5platform-plugins = callPackage ./library/qt5platform-plugins { }; + qt5integration = callPackage ./library/qt5integration { }; + deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { }; + dwayland = callPackage ./library/dwayland { }; + dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { }; + disomaster = callPackage ./library/disomaster { }; + docparser = callPackage ./library/docparser { }; + gio-qt = callPackage ./library/gio-qt { }; + image-editor = callPackage ./library/image-editor { }; + udisks2-qt5 = callPackage ./library/udisks2-qt5 { }; + + #### Dtk Application + deepin-calculator = callPackage ./apps/deepin-calculator { }; + deepin-editor = callPackage ./apps/deepin-editor { }; + deepin-terminal = callPackage ./apps/deepin-terminal { }; + + #### ARTWORK + dde-account-faces = callPackage ./artwork/dde-account-faces { }; + deepin-icon-theme = callPackage ./artwork/deepin-icon-theme { }; + deepin-gtk-theme = callPackage ./artwork/deepin-gtk-theme { }; + deepin-sound-theme = callPackage ./artwork/deepin-sound-theme { }; + }; +in +lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix new file mode 100644 index 000000000000..ef302c5b7222 --- /dev/null +++ b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, lib +, fetchFromGitHub +, qmake +, qtbase +, wrapQtAppsHook +, python3 +, dtkcore +}: + +stdenv.mkDerivation rec { + pname = "dde-qt-dbus-factory"; + version = "5.5.22"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-jqk04S+i3py3rVJcHmkPKHsU+eNEN1yoUBBlfXBbcwM="; + }; + + nativeBuildInputs = [ + qmake + wrapQtAppsHook + python3 + ]; + + buildInputs = [ + qtbase + dtkcore + ]; + + qmakeFlags = [ + "INSTALL_ROOT=${placeholder "out"}" + "LIB_INSTALL_DIR=${placeholder "out"}/lib" + ]; + + postPatch = '' + substituteInPlace libdframeworkdbus/libdframeworkdbus.pro \ + --replace "/usr" "" + + substituteInPlace libdframeworkdbus/DFrameworkdbusConfig.in \ + --replace "/usr/include" "$out/include" + ''; + + meta = with lib; { + description = "Repo of auto-generated D-Bus source code which DDE used"; + homepage = "https://github.com/linuxdeepin/dde-qt-dbus-factory"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix new file mode 100644 index 000000000000..ad3dce815c91 --- /dev/null +++ b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, extra-cmake-modules +}: + +stdenv.mkDerivation rec { + pname = "deepin-wayland-protocols"; + version = "1.6.0-deepin.1.2"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-8Im3CueC8sYA5mwRU/Z7z8HA4mPQvVSqcTD813QCYxo="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + meta = with lib; { + description = "XML files of the non-standard wayland protocols use in deepin"; + homepage = "https://github.com/linuxdeepin/deepin-wayland-protocols"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/library/disomaster/default.nix b/pkgs/desktops/deepin/library/disomaster/default.nix new file mode 100644 index 000000000000..3f65505e0af5 --- /dev/null +++ b/pkgs/desktops/deepin/library/disomaster/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, qmake +, qttools +, wrapQtAppsHook +, libisoburn +}: + +stdenv.mkDerivation rec { + pname = "disomaster"; + version = "5.0.8"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-wN8mhddqqzYXkT6rRWsHVCWzaG2uRcF2iiFHlZx2LfY="; + }; + + nativeBuildInputs = [ + qmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ libisoburn ]; + + qmakeFlags = [ "VERSION=${version}" ]; + + meta = with lib; { + description = "A libisoburn wrapper class for Qt"; + homepage = "https://github.com/linuxdeepin/disomaster"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/library/docparser/default.nix b/pkgs/desktops/deepin/library/docparser/default.nix new file mode 100644 index 000000000000..8605a0d214b7 --- /dev/null +++ b/pkgs/desktops/deepin/library/docparser/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, qmake +, qttools +, wrapQtAppsHook +, poppler +}: + +stdenv.mkDerivation rec { + pname = "docparser"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-iWRWSu8fALTTLLWdQGbpunN/1tpvKxuN/ZWJg34x0mU="; + }; + + nativeBuildInputs = [ + qmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ poppler ]; + + qmakeFlags = [ "VERSION=${version}" ]; + + meta = with lib; { + description = "A document parser library ported from document2html"; + homepage = "https://github.com/linuxdeepin/docparser"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/library/dtkcommon/default.nix b/pkgs/desktops/deepin/library/dtkcommon/default.nix new file mode 100644 index 000000000000..24e22e99c502 --- /dev/null +++ b/pkgs/desktops/deepin/library/dtkcommon/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, cmake +, qtbase +, qttools +, wrapQtAppsHook +, glib +}: + +stdenv.mkDerivation rec { + pname = "dtkcommon"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-9gFJ0Uun0q/XVaegxTUu4Kkc+/GE09eAV68VZgWurrM="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ qtbase ]; + + qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; + + preFixup = '' + glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} + ''; + + meta = with lib; { + description = "A public project for building DTK Library"; + homepage = "https://github.com/linuxdeepin/dtkcommon"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/library/dtkcore/default.nix b/pkgs/desktops/deepin/library/dtkcore/default.nix new file mode 100644 index 000000000000..282d079570d3 --- /dev/null +++ b/pkgs/desktops/deepin/library/dtkcore/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, cmake +, gsettings-qt +, wrapQtAppsHook +, lshw +, dtkcommon +}: + +stdenv.mkDerivation rec { + pname = "dtkcore"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-DEpo/eKMjtTVGEkq5JofkRNSHtTOZ1t2QNjrdulUtPQ="; + }; + + postPatch = '' + substituteInPlace src/dsysinfo.cpp \ + --replace "/usr/share/deepin/distribution.info" "/etc/distribution.info" \ + ''; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + gsettings-qt + lshw + ]; + + propagatedBuildInputs = [ dtkcommon ]; + + cmakeFlags = [ + "-DDVERSION=${version}" + "-DBUILD_DOCS=OFF" + "-DDSG_PREFIX_PATH='/run/current-system/sw'" + "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + ]; + + meta = with lib; { + description = "Deepin tool kit core library"; + homepage = "https://github.com/linuxdeepin/dtkcore"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix new file mode 100644 index 000000000000..0cc40768285a --- /dev/null +++ b/pkgs/desktops/deepin/library/dtkgui/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, cmake +, qttools +, wrapQtAppsHook +, librsvg +, lxqt +, dtkcore +, qtimageformats +, freeimage +}: + +stdenv.mkDerivation rec { + pname = "dtkgui"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-r6ZwGPiK6CcKEg8RoHV07wJbQI3idJFV3WFtuKim8n4="; + }; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + lxqt.libqtxdg + ]; + + propagatedBuildInputs = [ + dtkcore + librsvg + qtimageformats + freeimage + ]; + + cmakeFlags = [ + "-DDVERSION=${version}" + "-DBUILD_DOCS=OFF" + "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + ]; + + meta = with lib; { + description = "Deepin Toolkit, gui module for DDE look and feel"; + homepage = "https://github.com/linuxdeepin/dtkgui"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix new file mode 100644 index 000000000000..170ae821eba2 --- /dev/null +++ b/pkgs/desktops/deepin/library/dtkwidget/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, lib +, fetchFromGitHub +, dtkgui +, pkg-config +, cmake +, qttools +, qtmultimedia +, qtsvg +, qtx11extras +, wrapQtAppsHook +, cups +, gsettings-qt +, libstartup_notification +, xorg +}: + +stdenv.mkDerivation rec { + pname = "dtkwidget"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-APk2p8pdLsaKvPp95HtEI1F1LM4ySUL+fhGsC5vHasU="; + }; + + postPatch = '' + substituteInPlace src/widgets/dapplication.cpp \ + --replace "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);" \ + "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation) << \"$out/share\";" + ''; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + qtmultimedia + qtsvg + qtx11extras + cups + gsettings-qt + libstartup_notification + xorg.libXdmcp + ]; + + propagatedBuildInputs = [ dtkgui ]; + + cmakeFlags = [ + "-DDVERSION=${version}" + "-DBUILD_DOCS=OFF" + "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + ]; + + meta = with lib; { + description = "Deepin graphical user interface library"; + homepage = "https://github.com/linuxdeepin/dtkwidget"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/library/dwayland/default.nix b/pkgs/desktops/deepin/library/dwayland/default.nix new file mode 100644 index 000000000000..a1797344a0b0 --- /dev/null +++ b/pkgs/desktops/deepin/library/dwayland/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, qtbase +, qtwayland +, wayland +, wayland-protocols +, extra-cmake-modules +, deepin-wayland-protocols +, qttools +}: + +stdenv.mkDerivation rec { + pname = "dwayland"; + version = "5.24.3-deepin.1.4"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-/aWS4uvhxi9azxJWjRE+Bw+veURFO+mC8l9yypseclU="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + qttools + ]; + + buildInputs = [ + qtbase + qtwayland + wayland + wayland-protocols + deepin-wayland-protocols + ]; + + dontWrapQtApps = true; + + meta = with lib; { + description = "Qt-style API to interact with the wayland-client and wayland-server"; + homepage = "https://github.com/linuxdeepin/dwayland"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/library/gio-qt/default.nix b/pkgs/desktops/deepin/library/gio-qt/default.nix new file mode 100644 index 000000000000..5c27afe7e4c0 --- /dev/null +++ b/pkgs/desktops/deepin/library/gio-qt/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, wrapQtAppsHook +, glibmm +, doxygen +, qttools +, qtbase +, buildDocs ? true +}: + +stdenv.mkDerivation rec { + pname = "gio-qt"; + version = "0.0.11"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-dlY1CTlXywgGZUonBBe3cDwx8h2xXrPY6Ft/D59nlug="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ] ++ lib.optional buildDocs [ doxygen qttools.dev ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DPROJECT_VERSION=${version}" + ] ++ lib.optional (!buildDocs) [ "-DBUILD_DOCS=OFF" ]; + + propagatedBuildInputs = [ glibmm ]; + + preConfigure = '' + # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" + # A workaround is to set QT_PLUGIN_PATH explicitly + export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} + ''; + + meta = with lib; { + description = "Gio wrapper for Qt applications"; + homepage = "https://github.com/linuxdeepin/gio-qt"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/library/image-editor/default.nix b/pkgs/desktops/deepin/library/image-editor/default.nix new file mode 100644 index 000000000000..ec5f3568fbd6 --- /dev/null +++ b/pkgs/desktops/deepin/library/image-editor/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, dtkwidget +, cmake +, qttools +, pkg-config +, wrapQtAppsHook +, opencv +, freeimage +, libmediainfo +, ffmpegthumbnailer +, pcre +}: + +stdenv.mkDerivation rec { + pname = "image-editor"; + version = "1.0.24"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-0p/aicuBfaEyvfZomnz49IJLospWIdl23ZreDe+Bzqc="; + }; + + patches = [ + (fetchpatch { + name = "feat_check_PREFIX_value_before_set"; + url = "https://github.com/linuxdeepin/image-editor/commit/dae86e848cf53ba0ece879d81e8d5335d61a7473.patch"; + sha256 = "sha256-lxmR+nIrMWVyhl1jpA17x2yqJ40h5vnpqKKcjd8j9RY="; + }) + (fetchpatch { + name = "feat_use_FULL_install_path"; + url = "https://github.com/linuxdeepin/image-editor/commit/855ae53a0444ac628aa0fe893932df6263b82e2e.patch"; + sha256 = "sha256-3Dynlwl/l/b6k6hOHjTdoDQ/VGBDfyRz9b8QY8FEsCc="; + }) + ]; + + postPatch = '' + substituteInPlace libimageviewer/service/ffmpegvideothumbnailer.cpp \ + --replace 'libPath("libffmpegthumbnailer.so")' 'QString("${ffmpegthumbnailer.out}/lib/libffmpegthumbnailer.so")' + + substituteInPlace libimageviewer/CMakeLists.txt --replace '/usr' '$out' + substituteInPlace libimagevisualresult/CMakeLists.txt --replace '/usr' '$out' + ''; + + nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; + + buildInputs = [ + dtkwidget + opencv + freeimage + libmediainfo + ffmpegthumbnailer + pcre + ]; + + cmakeFlags = [ "-DVERSION=${version}" ]; + + meta = with lib; { + description = "Image editor lib for dtk"; + homepage = "https://github.com/linuxdeepin/image-editor"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/library/qt5integration/default.nix b/pkgs/desktops/deepin/library/qt5integration/default.nix new file mode 100644 index 000000000000..b3e5a189135c --- /dev/null +++ b/pkgs/desktops/deepin/library/qt5integration/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, lib +, fetchFromGitHub +, dtkwidget +, qmake +, qtbase +, qtsvg +, pkg-config +, wrapQtAppsHook +, qtx11extras +, qt5platform-plugins +, lxqt +, mtdev +, xorg +, gtest +}: + +stdenv.mkDerivation rec { + pname = "qt5integration"; + version = "5.6.4"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-MZkhTvjTyBrlntgFq2F3iGK7WvfmnGJQLk5B1OM5kQo="; + }; + + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qtx11extras + qt5platform-plugins + mtdev + lxqt.libqtxdg + xorg.xcbutilrenderutil + gtest + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/${qtbase.qtPluginPrefix} + cp -r bin/plugins/* $out/${qtbase.qtPluginPrefix}/ + runHook postInstall + ''; + + meta = with lib; { + description = "Qt platform theme integration plugins for DDE"; + homepage = "https://github.com/linuxdeepin/qt5integration"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix new file mode 100644 index 000000000000..6ebe542398b7 --- /dev/null +++ b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchFromGitHub +, qmake +, pkg-config +, qtbase +, qtx11extras +, wrapQtAppsHook +, mtdev +, cairo +, xorg +, waylandSupport ? false +}: + +stdenv.mkDerivation rec { + pname = "qt5platform-plugins"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-AySltMI9x5mfquy532h1QfGpfwSfI9+h6BtIHPyNWGk="; + }; + + ## https://github.com/linuxdeepin/qt5platform-plugins/pull/119 + postPatch = '' + rm -r xcb/libqt5xcbqpa-dev/ + mkdir -p xcb/libqt5xcbqpa-dev/${qtbase.version} + cp -r ${qtbase.src}/src/plugins/platforms/xcb/*.h xcb/libqt5xcbqpa-dev/${qtbase.version}/ + ''; + + nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; + + buildInputs = [ + mtdev + cairo + qtbase + qtx11extras + xorg.libSM + ]; + + qmakeFlags = [ + "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms" + ] + ++ lib.optional (!waylandSupport) [ "CONFIG+=DISABLE_WAYLAND" ]; + + meta = with lib; { + description = "Qt platform plugins for DDE"; + homepage = "https://github.com/linuxdeepin/qt5platform-plugins"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix new file mode 100644 index 000000000000..84321809ebeb --- /dev/null +++ b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, lib +, fetchFromGitHub +, qmake +, pkg-config +, wrapQtAppsHook +, udisks +}: + +stdenv.mkDerivation rec { + pname = "udisks2-qt5"; + version = "5.0.6"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-WS4fmqEYXi5dkn8RvyJBzy3+r+UgFcGDFFpQlbblLu4="; + }; + + nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; + + buildInputs = [ udisks ]; + + qmakeFlags = [ "VERSION=${version}" ]; + + meta = with lib; { + description = "UDisks2 D-Bus interfaces binding for Qt5"; + homepage = "https://github.com/linuxdeepin/udisks2-qt5"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index fca2c591a77d..a15975872df4 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "--buildtype=release" "-D build-tests=false" # disable build tests, which are not working - "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disabled by default, scim is not availabe in nixpkgs + "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disabled by default, scim is not available in nixpkgs "-D embedded-lz4=false" "-D fb=true" "-D network-backend=connman" diff --git a/pkgs/desktops/enlightenment/terminology/default.nix b/pkgs/desktops/enlightenment/terminology/default.nix index 12289f2fb2ad..9c2cabe7e8f0 100644 --- a/pkgs/desktops/enlightenment/terminology/default.nix +++ b/pkgs/desktops/enlightenment/terminology/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "terminology"; - version = "1.12.1"; + version = "1.13.0"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1aasddf2343qj798b5s8qwif3lxj4pyjax6fa9sfi6if9icdkkpq"; + sha256 = "FqN/7Ne71j7J3j7GwK8zHO531t/ag4obFXPW8phHTaU="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix deleted file mode 100644 index a350c224e8a6..000000000000 --- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, gnome_python, librsvg, libwnck2, libgtop, pkg-config, python2, gtk2 }: - -let - inherit (python2.pkgs) python pygtk; -in stdenv.mkDerivation rec { - ver_maj = "2.32"; - ver_min = "0"; - version = "${ver_maj}.${ver_min}"; - pname = "gnome-python-desktop"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-python-desktop/${ver_maj}/gnome-python-desktop-${version}.tar.bz2"; - sha256 = "1s8f9rns9v7qlwjv9qh9lr8crp88dpzfm45hj47zc3ivpy0dbnq9"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 librsvg libwnck2 libgtop python ]; - propagatedBuildInputs = [ gnome_python pygtk ]; - - # gnome-python-desktop expects that .pth file is already installed by PyGTK - # in the same directory. This is not the case for Nix. - postInstall = '' - echo "gtk-2.0" > $out/${python2.sitePackages}/${pname}-${version}.pth - ''; - - meta = with lib; { - homepage = "http://www.pygtk.org"; - description = "Python bindings for GNOME desktop packages"; - license = licenses.lgpl21; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix deleted file mode 100644 index 0c636ffa5417..000000000000 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, python2, pkg-config, libgnome, GConf, glib, gtk2, gnome_vfs }: - -with lib; - -let - inherit (python2.pkgs) python pygobject2 pygtk dbus-python; -in stdenv.mkDerivation rec { - pname = "gnome-python"; - version = "2.28.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-python/${lib.versions.majorMinor version}/gnome-python-${version}.tar.bz2"; - sha256 = "759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ python glib gtk2 GConf libgnome gnome_vfs ]; - propagatedBuildInputs = [ pygobject2 pygtk dbus-python ]; - - # gnome-python expects that .pth file is already installed by PyGTK in the - # same directory. This is not the case for Nix. - postInstall = '' - echo "gtk-2.0" > $out/${python2.sitePackages}/gnome-python-${version}.pth - ''; - - meta = with lib; { - homepage = "http://pygtk.org/"; - description = "Python wrapper for GNOME libraries"; - platforms = platforms.linux; - license = licenses.lgpl2; - maintainers = with maintainers; [ qknight ]; - }; -} diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 2082caf7f9d1..b360924dc9ef 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -14,29 +14,15 @@ lib.makeScope pkgs.newScope (self: with self; { libglade = callPackage ./platform/libglade { }; - libgnomeprint = callPackage ./platform/libgnomeprint { }; - - libgnomeprintui = callPackage ./platform/libgnomeprintui { }; - - libgnomecups = callPackage ./platform/libgnomecups { }; - - libgtkhtml = callPackage ./platform/libgtkhtml { }; - GConf = callPackage ./platform/GConf { }; libgnomecanvas = callPackage ./platform/libgnomecanvas { }; - libgnomecanvasmm = callPackage ./platform/libgnomecanvasmm { }; - # for git-head builds gnome-common = callPackage platform/gnome-common { }; gnome_mime_data = callPackage ./platform/gnome-mime-data { }; - gnome_python = callPackage ./bindings/gnome-python { }; - - gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { }; - gnome_vfs = callPackage ./platform/gnome-vfs { }; libgnome = callPackage ./platform/libgnome { }; @@ -47,10 +33,6 @@ lib.makeScope pkgs.newScope (self: with self; { libbonoboui = callPackage ./platform/libbonoboui { }; - gtkhtml = callPackage ./platform/gtkhtml { enchant = pkgs.enchant1; }; - - gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { enchant = pkgs.enchant2; }; - gtkglext = callPackage ./platform/gtkglext { }; #### DESKTOP @@ -72,7 +54,6 @@ lib.makeScope pkgs.newScope (self: with self; { gtk = pkgs.gtk2; gtkmm = pkgs.gtkmm2; - python_rsvg = self.gnome_python_desktop; gtkdoc = pkgs.gtk-doc; startup_notification = pkgs.libstartup_notification; @@ -82,5 +63,15 @@ 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 + gnome_python = throw "gnome2.gnome_python has been removed"; # 2023-01-14 + gnome_python_desktop = throw "gnome2.gnome_python_desktop has been removed"; # 2023-01-14 + gtkhtml = throw "gnome2.gtkhtml has been removed"; # 2023-01-15 + gtkhtml4 = throw "gnome2.gtkhtml4 has been removed"; # 2023-01-15 + libglademm = throw "gnome2.libglademm has been removed"; # 2022-01-15 + libgnomecanvasmm = "gnome2.libgnomecanvasmm has been removed"; # 2022-01-15 + libgnomecups = throw "gnome2.libgnomecups has been removed"; # 2023-01-15 + libgnomeprint = throw "gnome2.libgnomeprint has been removed"; # 2023-01-15 + libgnomeprintui = throw "gnome2.libgnomeprintui has been removed"; # 2023-01-15 + libgtkhtml = throw "gnome2.libgtkhtml has been removed"; # 2023-01-15 + python_rsvg = throw "gnome2.python_rsvg has been removed"; # 2023-01-14 }) diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch deleted file mode 100644 index e246a8cc9389..000000000000 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- jbsrc/jb.c.orig 2014-01-19 20:06:48.525462981 +0100 -+++ jbsrc/jb.c 2014-01-19 20:07:36.087934897 +0100 -@@ -425,7 +425,6 @@ - */ - jb_compile_options_add_cflags(object->compile_options, "-std=c99"); - jb_compile_options_add_cppflags(object->compile_options, "-D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L"); -- jb_compile_options_add_libs(object->compile_options, "-lbsd-compat"); - } - - jb_compile_options_add_string_defines(object->compile_options, diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch b/pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch deleted file mode 100644 index 1d9a179d236b..000000000000 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur gtkhtml-3.32.2-orig/configure gtkhtml-3.32.2/configure ---- gtkhtml-3.32.2-orig/configure 2011-02-05 23:12:31.000000000 -0500 -+++ gtkhtml-3.32.2/configure 2011-04-22 13:03:18.228874636 -0400 -@@ -5761,12 +5761,7 @@ - - if test "x${enable_deprecated_flags}" = "xyes"; then - -- list="-DG_DISABLE_DEPRECATED -- -DPANGO_DISABLE_DEPRECATED -- -DGDK_DISABLE_DEPRECATED -- -DGDK_PIXBUF_DISABLE_DEPRECATED -- -DGTK_DISABLE_DEPRECATED -- -DGNOME_DISABLE_DEPRECATED" -+ list="" - flags_supported="" - flags_unsupported="" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported compiler flags" >&5 diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix deleted file mode 100644 index 72422cf41c35..000000000000 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitLab, pkg-config, gtk3, intltool, autoreconfHook, fetchpatch -, GConf, enchant, isocodes, gnome-icon-theme, gsettings-desktop-schemas }: - -stdenv.mkDerivation rec { - version = "4.10.0"; - pname = "gtkhtml"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "Archive"; - repo = "gtkhtml"; - rev = "master"; - sha256 = "sha256-jL8YADvhW0o6I/2Uo5FNARMAnSbvtmFp+zWH1yCVvQk="; - }; - - patches = [ - # Enables enchant2 support. - # Upstream is dead, no further releases are coming. - (fetchpatch { - name ="enchant-2.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/enchant-2.patch?h=gtkhtml4&id=0218303a63d64c04d6483a6fe9bb55063fcfaa43"; - sha256 = "f0OToWGHZwxvqf+0qosfA9FfwJ/IXfjIPP5/WrcvArI="; - extraPrefix = ""; - }) - ]; - - propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ]; - nativeBuildInputs = [ pkg-config autoreconfHook intltool ]; - buildInputs = [ enchant isocodes ]; -} diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix deleted file mode 100644 index 206494e70224..000000000000 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, -GConf, enchant, isocodes, gnome-icon-theme }: - -stdenv.mkDerivation rec { - pname = "gtkhtml"; - version = "3.32.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/${lib.versions.majorMinor version}/gtkhtml-${version}.tar.bz2"; - sha256 = "17z3jwvpn8waz7bhwrk7a6vs9pad6sqmlxxcqwvxxq89ywy0ail7"; - }; - - #From Debian, fixes build issue described here: - #http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg250091.html - patches = [ ./01_remove-disable-deprecated.patch ]; - - nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ gtk2 GConf enchant isocodes gnome-icon-theme ]; - - NIX_LDFLAGS = "-lgthread-2.0"; -} diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix deleted file mode 100644 index 9cc2d169b7c3..000000000000 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libgnomecanvas, gtkmm2 }: - -stdenv.mkDerivation rec { - pname = "libgnomecanvasmm"; - version = "2.26.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libgnomecanvasmm/${lib.versions.majorMinor version}/libgnomecanvasmm-${version}.tar.bz2"; - sha256 = "996577f97f459a574919e15ba7fee6af8cda38a87a98289e9a4f54752d83e918"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgnomecanvas gtkmm2 ]; -} diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/cups_1.6.patch b/pkgs/desktops/gnome-2/platform/libgnomecups/cups_1.6.patch deleted file mode 100644 index 68f379c25109..000000000000 --- a/pkgs/desktops/gnome-2/platform/libgnomecups/cups_1.6.patch +++ /dev/null @@ -1,285 +0,0 @@ -From ae783efde4fa69578651994505462f02b8639220 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Tue, 7 Aug 2012 06:53:09 -0400 -Subject: [PATCH] Use CUPS-1.6 IPP API getter/setter functions - -CUPS 1.6 makes various structures private and introduces these ippGet -and ippSet functions for all of the fields in these structures. -http://www.cups.org/str.php?L3928 - -We define our own accessors when building against CUPS < 1.6. - -Based on work by Jiri Popelka at -https://bugzilla.gnome.org/show_bug.cgi?id=679759 ---- - libgnomecups/gnome-cups-printer.c | 48 +++++++++++++++++++++++++++++------- - libgnomecups/gnome-cups-queue.c | 43 +++++++++++++++++++++++++++------ - libgnomecups/gnome-cups-request.c | 44 ++++++++++++++++++++++++++++----- - 3 files changed, 110 insertions(+), 25 deletions(-) - -diff --git a/libgnomecups/gnome-cups-printer.c b/libgnomecups/gnome-cups-printer.c -index c924af0..f5e1ef7 100644 ---- a/libgnomecups/gnome-cups-printer.c -+++ b/libgnomecups/gnome-cups-printer.c -@@ -37,6 +37,34 @@ - - #define UPDATE_TIMEOUT 5000 - -+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) -+#define HAVE_CUPS_1_6 1 -+#endif -+ -+#ifndef HAVE_CUPS_1_6 -+#define ippGetCount(attr) attr->num_values -+#define ippGetName(attr) attr->name -+#define ippGetInteger(attr, element) attr->values[element].integer -+#define ippGetString(attr, element, language) attr->values[element].string.text -+ -+static ipp_attribute_t * -+ippFirstAttribute(ipp_t *ipp) -+{ -+ if (!ipp) -+ return (NULL); -+ return (ipp->current = ipp->attrs); -+} -+ -+static ipp_attribute_t * -+ippNextAttribute(ipp_t *ipp) -+{ -+ if (!ipp || !ipp->current) -+ return (NULL); -+ return (ipp->current = ipp->current->next); -+} -+#endif -+ -+ - struct _GnomeCupsPPDFile { - char name[1]; - }; -@@ -173,9 +201,9 @@ map_reasons (GnomeCupsPrinter *printer, - printer->details->state_reasons = NULL; - - /* cf. RFC2911 4.4.12 */ -- for (i = 0; i < attr->num_values; i++) { -+ for (i = 0; i < ippGetCount (attr); i++) { - const char *p; -- const char *keyword = attr->values [i].string.text; -+ const char *keyword = ippGetString (attr, i, NULL); - - reason = g_new (GnomeCupsPrinterReason, 1); - -@@ -224,8 +252,8 @@ gnome_cups_printer_get_info (GnomeCupsPrinter *printer) - return printer->details->info; - } - --#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if ((v) != attr->values[0].integer) { changed = TRUE; } (v) = attr->values[0].integer; }} --#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if (!v || strcmp (v, attr->values[0].string.text)) { g_free (v); changed = TRUE; (v) = g_strdup (attr->values[0].string.text); }}} -+#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if ((v) != ippGetInteger (attr, 0)) { changed = TRUE; } (v) = ippGetInteger (attr, 0); }} -+#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if (!v || strcmp (v, ippGetString (attr, 0, NULL))) { g_free (v); changed = TRUE; (v) = g_strdup (ippGetString (attr, 0, NULL)); }}} - - static void - attributes_update_cb (guint id, -@@ -243,14 +271,14 @@ attributes_update_cb (guint id, - changed = FALSE; - - if (!error && response) { -- for (attr = response->attrs; attr != NULL; attr = attr->next) { -- if (!attr->name) { -+ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) { -+ if (!ippGetName (attr)) { - continue; - } -- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !strcmp (attr->name, "attributes-charset")) { -+ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !strcmp (ippGetName (attr), "attributes-charset")) { - continue; - } -- if (!g_ascii_strcasecmp (attr->name, "printer-state-reasons")) { -+ if (!g_ascii_strcasecmp (ippGetName (attr), "printer-state-reasons")) { - map_reasons (printer, attr); - } - MAP_INT (printer->details->state, "printer-state"); -@@ -570,7 +598,7 @@ get_default (void) - - attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME); - if (attr) { -- name = g_strdup (attr->values[0].string.text); -+ name = g_strdup (ippGetString (attr, 0, NULL)); - } else { - name = NULL; - } -@@ -698,7 +726,7 @@ get_printer_names (void) - attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME); - while (attr) { - ret = g_list_prepend (ret, -- g_strdup (attr->values[0].string.text)); -+ g_strdup (ippGetString (attr, 0, NULL))); - - attr = ippFindNextAttribute (response, - "printer-name", -diff --git a/libgnomecups/gnome-cups-queue.c b/libgnomecups/gnome-cups-queue.c -index 9f98ed9..298db42 100644 ---- a/libgnomecups/gnome-cups-queue.c -+++ b/libgnomecups/gnome-cups-queue.c -@@ -15,6 +15,33 @@ - - #define UPDATE_TIMEOUT 3000 - -+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) -+#define HAVE_CUPS_1_6 1 -+#endif -+ -+#ifndef HAVE_CUPS_1_6 -+#define ippGetName(attr) attr->name -+#define ippGetInteger(attr, element) attr->values[element].integer -+#define ippGetString(attr, element, language) attr->values[element].string.text -+ -+static ipp_attribute_t * -+ippFirstAttribute(ipp_t *ipp) -+{ -+ if (!ipp) -+ return (NULL); -+ return (ipp->current = ipp->attrs); -+} -+ -+static ipp_attribute_t * -+ippNextAttribute(ipp_t *ipp) -+{ -+ if (!ipp || !ipp->current) -+ return (NULL); -+ return (ipp->current = ipp->current->next); -+} -+#endif -+ -+ - struct _GnomeCupsQueueDetails { - char *queue_name; - GList *jobs; -@@ -199,8 +226,8 @@ finish_job (GnomeCupsJob *job) - job->size = job->size * 1024; - } - --#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (attr->values[0].string.text);}} --#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { (dest) = attr->values[0].integer; } } -+#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (ippGetString (attr, 0, NULL));}} -+#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { (dest) = ippGetInteger (attr, 0); } } - - static void - get_jobs_cb (guint id, -@@ -231,8 +258,8 @@ get_jobs_cb (guint id, - - if (response) { - job = g_new0 (GnomeCupsJob, 1); -- for (attr = response->attrs; attr != NULL; attr = attr->next) { -- if (attr->name == NULL) { -+ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) { -+ if (ippGetName (attr) == NULL) { - if (job->name) { - finish_job (job); - jobs = g_list_prepend (jobs, job); -@@ -244,7 +271,7 @@ get_jobs_cb (guint id, - continue; - } - -- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) { -+ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) { - continue; - - } -@@ -355,8 +382,8 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue, - - if (response) { - job = g_new0 (GnomeCupsJob, 1); -- for (attr = response->attrs; attr != NULL; attr = attr->next) { -- if (attr->name == NULL) { -+ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) { -+ if (ippGetName (attr) == NULL) { - if (job->name) { - finish_job (job); - } else { -@@ -366,7 +393,7 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue, - break; - } - -- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) { -+ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) { - continue; - } - -diff --git a/libgnomecups/gnome-cups-request.c b/libgnomecups/gnome-cups-request.c -index c94f623..13f0948 100644 ---- a/libgnomecups/gnome-cups-request.c -+++ b/libgnomecups/gnome-cups-request.c -@@ -19,6 +19,36 @@ - #define STOP_UNUSED_THREADS_TIMEOUT 60 - #define CLOSE_UNUSED_CONNECTIONS_TIMEOUT 30 - -+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) -+#define HAVE_CUPS_1_6 1 -+#endif -+ -+#ifndef HAVE_CUPS_1_6 -+#define ippGetCount(attr) attr->num_values -+#define ippGetValueTag(attr) attr->value_tag -+#define ippGetName(attr) attr->name -+#define ippGetBoolean(attr, element) attr->values[element].boolean -+#define ippGetInteger(attr, element) attr->values[element].integer -+#define ippGetString(attr, element, language) attr->values[element].string.text -+ -+static ipp_attribute_t * -+ippFirstAttribute(ipp_t *ipp) -+{ -+ if (!ipp) -+ return (NULL); -+ return (ipp->current = ipp->attrs); -+} -+ -+static ipp_attribute_t * -+ippNextAttribute(ipp_t *ipp) -+{ -+ if (!ipp || !ipp->current) -+ return (NULL); -+ return (ipp->current = ipp->current->next); -+} -+#endif -+ -+ - typedef struct - { - GMutex *mutex; -@@ -276,14 +306,14 @@ dump_request (ipp_t const *req) - unsigned i; - ipp_attribute_t *attr; - -- for (attr = req->attrs; attr != NULL; attr = attr->next) { -- g_print ("%s", attr->name); -- for (i = 0 ; i < attr->num_values ; i++) { -+ for (attr = ippFirstAttribute (req); attr != NULL; attr = ippNextAttribute (req)) { -+ g_print ("%s", ippGetName (attr)); -+ for (i = 0 ; i < ippGetCount (attr) ; i++) { - g_print ("\t[%d] = ", i); -- switch (attr->value_tag & ~IPP_TAG_COPY) { -+ switch (ippGetValueTag (attr) & ~IPP_TAG_COPY) { - case IPP_TAG_INTEGER: - case IPP_TAG_ENUM: -- g_print ("%d\n", attr->values[i].integer); -+ g_print ("%d\n", ippGetInteger (attr, i)); - break; - - case IPP_TAG_STRING: -@@ -294,11 +324,11 @@ dump_request (ipp_t const *req) - case IPP_TAG_CHARSET: - case IPP_TAG_LANGUAGE: - case IPP_TAG_MIMETYPE: -- g_print ("'%s'\n", attr->values[i].string.text); -+ g_print ("'%s'\n", ippGetString (attr, i, NULL)); - break; - - case IPP_TAG_BOOLEAN: -- g_print ("%s\n", (int)attr->values[i].boolean ? "true" : "false"); -+ g_print ("%s\n", (int)ippGetBoolean (attr, i) ? "true" : "false"); - break; - - default: --- -1.7.8.6 - diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix deleted file mode 100644 index 8d6bcce60205..000000000000 --- a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2, intltool, libart_lgpl }: - -stdenv.mkDerivation rec { - pname = "libgnomecups"; - version = "0.2.3"; - - src = fetchurl { - url = "mirror://gnome/sources/libgnomecups/${lib.versions.majorMinor version}/libgnomecups-${version}.tar.bz2"; - sha256 = "0a8xdaxzz2wc0n1fjcav65093gixzyac3948l8cxx1mk884yhc71"; - }; - - hardeningDisable = [ "format" ]; - - patches = [ ./glib.patch ./cups_1.6.patch ]; - - nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ gtk2 gettext libart_lgpl ]; - - propagatedBuildInputs = [ libxml2 ]; -} diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/glib.patch b/pkgs/desktops/gnome-2/platform/libgnomecups/glib.patch deleted file mode 100644 index 3f73af861c04..000000000000 --- a/pkgs/desktops/gnome-2/platform/libgnomecups/glib.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d84eee9450b3b6f6155074915efc61bedcc8d446 Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Sun, 27 Nov 2011 21:36:41 +0100 -Subject: [PATCH] Fix: Only glib.h can be included - ---- - libgnomecups/gnome-cups-i18n.c | 2 +- - libgnomecups/gnome-cups-init.h | 3 +-- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/libgnomecups/gnome-cups-i18n.c b/libgnomecups/gnome-cups-i18n.c -index 8987c5c..127756d 100644 ---- a/libgnomecups/gnome-cups-i18n.c -+++ b/libgnomecups/gnome-cups-i18n.c -@@ -1,5 +1,5 @@ - #include --#include -+#include - #include "gnome-cups-i18n.h" - - #ifdef ENABLE_NLS -diff --git a/libgnomecups/gnome-cups-init.h b/libgnomecups/gnome-cups-init.h -index 22b682a..c4600fc 100644 ---- a/libgnomecups/gnome-cups-init.h -+++ b/libgnomecups/gnome-cups-init.h -@@ -1,8 +1,7 @@ - #ifndef GNOME_CUPS_INIT - #define GNOME_CUPS_INIT - --#include --#include -+#include - - G_BEGIN_DECLS - --- -1.7.7 - diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/bug653388.patch b/pkgs/desktops/gnome-2/platform/libgnomeprint/bug653388.patch deleted file mode 100644 index 468f8e287a7c..000000000000 --- a/pkgs/desktops/gnome-2/platform/libgnomeprint/bug653388.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 9b82b7e75b83395e7c5692085e1934202cf7f65f Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston -Date: Wed, 12 Oct 2011 15:08:59 +0000 -Subject: Add missing include - -https://bugzilla.gnome.org/show_bug.cgi?id=653388 ---- -diff --git a/libgnomeprint/modules/cups/gnome-print-cups-transport.c b/libgnomeprint/modules/cups/gnome-print-cups-transport.c -index aeb7111..85de91b 100644 ---- a/libgnomeprint/modules/cups/gnome-print-cups-transport.c -+++ b/libgnomeprint/modules/cups/gnome-print-cups-transport.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - #include - #include - --- -cgit v0.9.0.2 diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix deleted file mode 100644 index 5f7a254c8fbd..000000000000 --- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk2, gettext, libxml2, intltool, libart_lgpl -, libgnomecups, bison, flex }: - -stdenv.mkDerivation rec { - pname = "libgnomeprint"; - version = "2.18.8"; - - src = fetchurl { - url = "mirror://gnome/sources/libgnomeprint/${lib.versions.majorMinor version}/libgnomeprint-${version}.tar.bz2"; - sha256 = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691"; - }; - - patches = [ - ./bug653388.patch - # Fix compatibility with bison 3 - (fetchpatch { - url = "https://github.com/pld-linux/libgnomeprint/raw/54c0f9c3675b86c53f6d77a5bc526ce9ef0e38cd/bison3.patch"; - sha256 = "1sp04jbv34i1gcwf377hhmwdsmqzig70dd06rjz1isb6zwh4y01l"; - }) - ]; - - nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ gtk2 gettext libart_lgpl libgnomecups bison flex ]; - - propagatedBuildInputs = [ libxml2 ]; - - meta = with lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix deleted file mode 100644 index f8a647a5b5a5..000000000000 --- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome-icon-theme }: - -stdenv.mkDerivation rec { - pname = "libgnomeprintui"; - version = "2.18.6"; - - src = fetchurl { - url = "mirror://gnome/sources/libgnomeprintui/${lib.versions.majorMinor version}/libgnomeprintui-${version}.tar.bz2"; - sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm"; - }; - - nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ gtk2 gettext libgnomecanvas libgnomeprint gnome-icon-theme]; -} diff --git a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix deleted file mode 100644 index 9c7189c117ac..000000000000 --- a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2 }: - -stdenv.mkDerivation rec { - pname = "libgtkhtml"; - version = "2.11.1"; - - src = fetchurl { - url = "mirror://gnome/sources/libgtkhtml/${lib.versions.majorMinor version}/libgtkhtml-${version}.tar.bz2"; - sha256 = "0msajafd42545dxzyr5zqka990cjrxw2yz09ajv4zs8m1w6pm9rw"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 gettext ]; - propagatedBuildInputs = [ libxml2 ]; - - hardeningDisable = [ "format" ]; -} diff --git a/pkgs/desktops/gnome/apps/cheese/default.nix b/pkgs/desktops/gnome/apps/cheese/default.nix index 4001e358e851..68d94abb33b6 100644 --- a/pkgs/desktops/gnome/apps/cheese/default.nix +++ b/pkgs/desktops/gnome/apps/cheese/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "cheese"; - version = "43.alpha"; + version = "43.0"; outputs = [ "out" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/cheese/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "utrp972m+lch2regi4I3p15TJcDJpmlJj/VPdyFG5M8="; + sha256 = "dFdMSjwycyfxotbQs/k3vir7B6YVm21425wZLeZmfws="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix index 7ab30f8aafea..3d79656d2582 100644 --- a/pkgs/desktops/gnome/apps/gedit/default.nix +++ b/pkgs/desktops/gnome/apps/gedit/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "43.1"; + version = "44.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz"; - sha256 = "mDg7Sv0/0eoYzcdP7G4SjneFgvOyP1NgGRQT//jw5qY="; + sha256 = "O7sbN3XUwnfa9UqqtEsOuDpOsfCfA5GAAEHJ5WiT7BE="; }; patches = [ diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index f1072dde8db3..c79d3d731ea9 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { glib ]; - checkInputs = [ + nativeCheckInputs = [ appstream-glib desktop-file-utils ]; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Ghex"; description = "Hex editor for GNOME desktop environment"; - platforms = platforms.unix; + platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = teams.gnome.members; }; diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index dfc7cb3a1cab..78f5f059d156 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "43.1"; + version = "43.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NB5qXO1RrVAPwd00ZZ1YhsP3YEViS1POZBv/Y8WwimE="; + sha256 = "nD4OlDPBhTqZ7VLt7BMmP0Q/hW28o7IWXC46cLhjKzA="; }; patches = [ diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index f2c0a3aaee35..5782bb861da9 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { description = "Simple and beautiful calendar application for GNOME"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix index 9dc7d113571d..5617272acc33 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "43.0"; + version = "43.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "poW5y/k1Re05EWjEHJ2L+DeFq7+0iWdYJ+5zQkcbqsg="; + sha256 = "sj4V2VCXizY8gaRyYe4aO0fbPGaX7haf8hPuplcqeEE="; }; patches = [ diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index 488922f29100..98a623b9a06b 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation rec { description = "Clock application designed for GNOME 3"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 99d4d27ef660..ba83f42fce60 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "43.1"; + version = "43.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-H3UaNb1YmteT9bFBNfKT5OxtSywwcz/sdgxofY8UMSY="; + sha256 = "sha256-zlLVW6T2fYlu8tmZczc6iYZql7t0pLQCS23iZzx/8e8="; }; doCheck = true; diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index 19db2cdf9f03..445d667b8388 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -107,6 +107,6 @@ python3.pkgs.buildPythonApplication rec { description = "Music player and management application for the GNOME desktop environment"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix index 2e813fc10de7..ff2141030faa 100644 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "43.1"; + version = "43.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-lzpLDeto+fkaVKTdQVtq/em1rj7mhLx2FHH5QpD59ss="; + sha256 = "sha256-MwRcehI/qife5+ubqabybxsXGMWg52M30Hmg1MkA4UY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/apps/vinagre/default.nix b/pkgs/desktops/gnome/apps/vinagre/default.nix index 9445a5683da9..ea2b1de43653 100644 --- a/pkgs/desktops/gnome/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome/apps/vinagre/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Vinagre"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix index 8419aa17ea70..c7ff70d26070 100644 --- a/pkgs/desktops/gnome/core/baobab/default.nix +++ b/pkgs/desktops/gnome/core/baobab/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/DiskUsageAnalyzer"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/core/dconf-editor/default.nix b/pkgs/desktops/gnome/core/dconf-editor/default.nix index 7cf366b7dc06..d6da42ab5508 100644 --- a/pkgs/desktops/gnome/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome/core/dconf-editor/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/DconfEditor"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/core/empathy/default.nix b/pkgs/desktops/gnome/core/empathy/default.nix deleted file mode 100644 index fbfee37cd13e..000000000000 --- a/pkgs/desktops/gnome/core/empathy/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ lib, stdenv -, intltool -, fetchurl -, webkitgtk -, pkg-config -, gtk3 -, glib -, file -, librsvg -, gnome -, gdk-pixbuf -, python3 -, telepathy-glib -, telepathy-farstream -, clutter-gtk -, clutter-gst -, gst_all_1 -, cogl -, gnome-online-accounts -, gcr -, libsecret -, folks -, libpulseaudio -, telepathy-mission-control -, telepathy-logger -, libnotify -, clutter -, libsoup -, gnutls -, evolution-data-server -, yelp-xsl -, libcanberra-gtk3 -, p11-kit -, farstream -, libtool -, shared-mime-info -, wrapGAppsHook -, itstool -, libxml2 -, libxslt -, icu -, libgee -, gsettings-desktop-schemas -, isocodes -, enchant -, libchamplain -, geoclue2 -, geocode-glib -, cheese -, libgudev -}: - -stdenv.mkDerivation rec { - pname = "empathy"; - version = "3.25.90"; - - src = fetchurl { - url = "mirror://gnome/sources/empathy/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc"; - }; - - propagatedBuildInputs = [ - (folks.override { telepathySupport = true; }) - telepathy-logger - evolution-data-server - telepathy-mission-control - ]; - - nativeBuildInputs = [ - pkg-config - libtool - intltool - itstool - file - wrapGAppsHook - libxml2 - libxslt - yelp-xsl - python3 - ]; - - buildInputs = [ - gtk3 - glib - webkitgtk - icu - gnome-online-accounts - telepathy-glib - clutter-gtk - clutter-gst - cogl - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gcr - libsecret - libpulseaudio - gdk-pixbuf - libnotify - clutter - libsoup - gnutls - libgee - p11-kit - libcanberra-gtk3 - telepathy-farstream - farstream - gnome.adwaita-icon-theme - gsettings-desktop-schemas - librsvg - - # Spell-checking - enchant - isocodes - - # Display maps, location awareness, geocode support - libchamplain - geoclue2 - geocode-glib - - # Cheese webcam support, camera monitoring - cheese - libgudev - ]; - - enableParallelBuilding = true; - - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - ) - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = "empathy"; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Empathy"; - description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; - maintainers = teams.gnome.members; - license = [ licenses.gpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index fb7ea8404a36..2459c3535e97 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -23,6 +23,7 @@ , wrapGAppsHook , librsvg , webp-pixbuf-loader +, libheif , libexif , gobject-introspection , gi-docgen @@ -30,13 +31,13 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "43.1"; + version = "43.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-/tef88oZusYvJxVcm91p7vh1hwuXHm3LCqOMCT0TGXE="; + sha256 = "sha256-nc/c5VhakOK7HPV+N3yx6xLUG9m8ubus31BrwbE1Tvk="; }; patches = [ @@ -86,6 +87,7 @@ stdenv.mkDerivation rec { extraLoaders = [ librsvg webp-pixbuf-loader + libheif.out ]; }}" ''; @@ -117,5 +119,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.unix; + # requires + broken = stdenv.isDarwin; }; } diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 726333d1f747..082483b1c247 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -45,17 +45,18 @@ , boost , protobuf , libiconv +, makeHardcodeGsettingsPatch }: stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.46.1"; + version = "3.46.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "xV5yz/QZC0LmPdbqvG3OSKGh95BAUx8a9tUcHvpKpus="; + sha256 = "CTjiJ55c+8IgR2bKnT/qVwkRaZsHwQy+AaymKn6LK+4="; }; patches = [ @@ -150,8 +151,8 @@ stdenv.mkDerivation rec { ''; passthru = { - hardcodeGsettingsPatch = glib.mkHardcodeGsettingsPatch { - glib-schema-to-var = { + hardcodeGsettingsPatch = makeHardcodeGsettingsPatch { + schemaIdToVariableMapping = { "org.gnome.Evolution.DefaultSources" = "EDS"; "org.gnome.evolution.shell.network-config" = "EDS"; "org.gnome.evolution-data-server.addressbook" = "EDS"; diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch index 20a94cc70791..dfe109f57bda 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch @@ -298,10 +298,10 @@ index e61160c..b6553a4 100644 G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); G_UNLOCK (mi_user_headers); diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c -index e5645e2..96a1ce3 100644 +index 611d5c8..4790fca 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c -@@ -5573,7 +5573,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store) +@@ -5593,7 +5593,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store) if (!skip_old_flags_update) { GSettings *eds_settings; @@ -442,10 +442,10 @@ index 8e4ee81..cc94026 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c -index 7783781..6a2db01 100644 +index b0c2410..ca915e0 100644 --- a/src/libedataserver/e-oauth2-service.c +++ b/src/libedataserver/e-oauth2-service.c -@@ -90,7 +90,18 @@ eos_default_guess_can_process (EOAuth2Service *service, +@@ -94,7 +94,18 @@ eos_default_guess_can_process (EOAuth2Service *service, name_len = strlen (name); hostname_len = strlen (hostname); @@ -466,10 +466,10 @@ index 7783781..6a2db01 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c -index 6701a3a..f497263 100644 +index 4a9b398..e7cb404 100644 --- a/src/libedataserver/e-source-registry.c +++ b/src/libedataserver/e-source-registry.c -@@ -1764,7 +1764,19 @@ e_source_registry_init (ESourceRegistry *registry) +@@ -1773,7 +1773,19 @@ e_source_registry_init (ESourceRegistry *registry) g_mutex_init (®istry->priv->sources_lock); diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index f1fbe7e49d30..a2265387e1ef 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { # We use rsync to merge the directories. rsync --archive "${DESTDIR}/etc" "$out" rm --recursive "${DESTDIR}/etc" - for o in $outputs; do + for o in $(getAllOutputNames); do if [[ "$o" = "debug" ]]; then continue; fi rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")" rm --recursive "${DESTDIR}/''${!o}" diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix index 9596f6d84cd5..6eddefc7c452 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gnome-bluetooth"; - version = "42.4"; + version = "42.5"; # TODO: split out "lib" outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "HW/PHNtsyZI6szSiwLw3osG7qdGN4VPUhO7cBPPAvNw="; + sha256 = "pPXxrC27e3uS99bStCwDD2Ku2bVCa53BFpRgQfPLqPc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index 59aafb530d79..f84c9ab65a88 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -76,6 +76,6 @@ stdenv.mkDerivation rec { description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 4161598634f9..c018b4ea4a34 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -64,11 +64,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "43.1"; + version = "43.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-6YvGt4Sv0E8pfbXo5sWZEOLNCQMycQd08m3I3omvT8c="; + sha256 = "sha256-1/JWq6gKkscnsyn9AchgLaS3jw/drsk/zZEJaWRwBWM="; }; patches = [ @@ -165,6 +165,8 @@ stdenv.mkDerivation rec { done ''; + separateDebugInfo = true; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome/core/gnome-dictionary/default.nix index 6cdb8831c48f..ebd9b58fd96a 100644 --- a/pkgs/desktops/gnome/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome/core/gnome-dictionary/default.nix @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { description = "Dictionary is the GNOME application to look up definitions"; maintainers = teams.gnome.members; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index 5ebf4903cbd3..9a684cdaeaa6 100644 --- a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/gnome-font-viewer"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index f1d63a78df16..0bfa9226e0d4 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "43.1"; + version = "43.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "gQTnBD75uY4rULKrOP2gX9BDf4xVVp+haDC3vle+DfY="; + sha256 = "I9eWOlTUlZRQTQ6s2FCWyvtfhvHnSljgQGdbbnmK5pg="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix index 22a94de5e84d..877b99748ec5 100644 --- a/pkgs/desktops/gnome/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/gnome-keyring/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { p11-kit ]; - checkInputs = [ dbus python3 ]; + nativeCheckInputs = [ dbus python3 ]; configureFlags = [ "--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { checkPhase = '' export HOME=$(mktemp -d) dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ make check ''; diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index daf0e8f4fcdc..a853a2457d15 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "43.1"; + version = "43.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-vYR8PKdzYJlTNEYs1GnkWhJHnxHAxI6WUCjtXLgHpbI="; + hash = "sha256-EdRR0f3kTxgJ6/Ya/0vqX570/cAjWaiWR/bp59RUKaw="; }; nativeBuildInputs = [ @@ -62,9 +62,9 @@ stdenv.mkDerivation rec { libxkbcommon pipewire systemd - ] ++ checkInputs; + ] ++ nativeCheckInputs; - checkInputs = [ + nativeCheckInputs = [ mesa # for gbm libgudev xvfb-run diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index b71b9c02d909..c13ed844c28d 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -68,13 +68,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "43.1"; + version = "43.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "3wREdl3vG9Cv7pYX0rWRm8ebTbhufnV6wOH3N0jsG9w="; + sha256 = "52/UvpNCQQ7p+9zday2Bxv8GDnyMxaDxyuanq6JdGGA="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index e971d5ce9293..450da49cf980 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "43.1"; + version = "43.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "wmdWie53vhHY/waq+kFsTK/EjTgRVTpz7PdkvWr/RHA="; + sha256 = "k+6AdHl4rSzALlrnPQo9Psgu6hNPx3niqpFpAbu1gJA="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index d344eec3c64a..7ce5c4a67b85 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -91,9 +91,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "gnome.gnome-terminal"; - }; + updateScript = nix-update-script { }; tests = { test = nixosTests.terminal-emulators.gnome-terminal; diff --git a/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix index c7f70c76b2b3..efc5318fb59b 100644 --- a/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - platforms = platforms.linux; + platforms = platforms.unix; maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome/core/gucharmap/default.nix b/pkgs/desktops/gnome/core/gucharmap/default.nix index a98d9f2ceea7..c822605cf3e6 100644 --- a/pkgs/desktops/gnome/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -45,7 +45,7 @@ let }; in stdenv.mkDerivation rec { pname = "gucharmap"; - version = "15.0.1"; + version = "15.0.2"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { owner = "GNOME"; repo = "gucharmap"; rev = version; - sha256 = "sha256-uVXWgnNpPcky9N3FXkDu5oaqaEALECooFnf43Ed+zTY="; + sha256 = "sha256-QoHLMq3U/BvpCFKttxLo0qs2xmZ/pCqPjsgq/MMWNbo="; }; nativeBuildInputs = [ @@ -90,7 +90,9 @@ in stdenv.mkDerivation rec { doCheck = true; postPatch = '' - patchShebangs data/meson_desktopfile.py gucharmap/gen-guch-unicode-tables.pl gucharmap/meson_compileschemas.py + patchShebangs \ + data/meson_desktopfile.py \ + gucharmap/gen-guch-unicode-tables.pl ''; passthru = { diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index e5bb71d394ee..ed7bb388d85e 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -47,15 +47,15 @@ , wayland-protocols }: -let self = stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "43.1"; + version = "43.2"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "8vCLJSeDlIpezILwDp6TWmHrv4VkhEvdkniKtEqngmQ="; + url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; + sha256 = "/S63B63DM8wnevhoXlzzkTXhxNeYofnQXojkU9w+u4Q="; }; patches = [ @@ -150,12 +150,12 @@ let self = stdenv.mkDerivation rec { separateDebugInfo = true; passthru = { - libdir = "${self}/lib/mutter-11"; + libdir = "${finalAttrs.finalPackage}/lib/mutter-11"; tests = { libdirExists = runCommand "mutter-libdir-exists" {} '' - if [[ ! -d ${self.libdir} ]]; then - echo "passthru.libdir should contain a directory, “${self.libdir}” is not one." + if [[ ! -d ${finalAttrs.finalPackage.libdir} ]]; then + echo "passthru.libdir should contain a directory, “${finalAttrs.finalPackage.libdir}” is not one." exit 1 fi touch $out @@ -163,8 +163,8 @@ let self = stdenv.mkDerivation rec { }; updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "mutter"; + attrPath = "gnome.mutter"; }; }; @@ -175,5 +175,4 @@ let self = stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.linux; }; -}; -in self +}) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 48cc47b5d8e2..5addc8311c96 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch , fetchurl , meson , ninja @@ -39,27 +38,16 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "43.0"; + version = "43.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PPVPrAqKvuCQ4VVBf3sW9j6grAwmTvT1RXSvNFgBqRE="; + sha256 = "qGqap6RVURsCnOSaHYtGWcPDVbXYHXNgu00N5jev7eA="; }; patches = [ - # Switch to GTK 4 settings schema to avoid crash when GTK 3 did not manage to contaminate environment. - # https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/1013 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/nautilus/-/commit/96d542a0d84da4ad6915a7727642490a5c433d4a.patch"; - sha256 = "BO/0ifRwSTDe7RV+DI3CPZg+UQezk0tbM+UidgoJRQM="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/nautilus/-/commit/52b4daf4396fd3b21755b3a0d1fbf85c3831c6b1.patch"; - sha256 = "+8KCw2HZUi9UgOEUBNp4kbwqOI1qz6i0Q/wvzqTb8OA="; - }) - # Allow changing extension directory using environment variable. ./extension_dir.patch diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix index e7e3e225fa6d..24c637909a32 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { python3Packages.dbus-python ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run ]; diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix index cd6a9c59c740..f5eb4c5e80df 100644 --- a/pkgs/desktops/gnome/core/zenity/default.nix +++ b/pkgs/desktops/gnome/core/zenity/default.nix @@ -15,13 +15,17 @@ stdenv.mkDerivation rec { pname = "zenity"; - version = "3.43.0"; + version = "3.44.0"; src = fetchurl { url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sNfKHgwYaPoY8FwhAmDYp74fCO4Tt/XP26ubYfoW+DM="; + sha256 = "wVWCMB7ZC51CzlIdvM+ZqYnyLxIEG91SecZjbamev2U="; }; + patches = [ + ./fix-icon-install.patch + ]; + nativeBuildInputs = [ meson ninja @@ -47,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool to display dialogs from the commandline and shell scripts"; homepage = "https://wiki.gnome.org/Projects/Zenity"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome/core/zenity/fix-icon-install.patch b/pkgs/desktops/gnome/core/zenity/fix-icon-install.patch new file mode 100644 index 000000000000..d412cc4a5bf0 --- /dev/null +++ b/pkgs/desktops/gnome/core/zenity/fix-icon-install.patch @@ -0,0 +1,12 @@ +diff --git a/data/meson.build b/data/meson.build +index 339b3cff..aca65efd 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -9,5 +9,6 @@ install_data( + 'zenity-text.png', + 'zenity-scale.png', + 'zenity-entry.png', +- 'zenity-notification.png'] ++ 'zenity-notification.png'], ++ install_dir: zenity_prefix / get_option('datadir') / 'icons/hicolor/48x48/apps', + ) diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 52e37c05b39f..ae8bc2bc1302 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -23,8 +23,6 @@ lib.makeScope pkgs.newScope (self: with self; { dconf-editor = callPackage ./core/dconf-editor { }; - empathy = callPackage ./core/empathy { }; - epiphany = callPackage ./core/epiphany { }; evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests @@ -254,7 +252,7 @@ lib.makeScope pkgs.newScope (self: with self; { nautilus-python = callPackage ./misc/nautilus-python { }; - gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant1; }; + gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant2; }; pomodoro = callPackage ./misc/pomodoro { }; @@ -264,6 +262,7 @@ lib.makeScope pkgs.newScope (self: with self; { }) // lib.optionalAttrs config.allowAliases { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. + empathy = throw "The ‘gnome.empathy’ package was removed as it is unmaintained and no longer launches due to libsoup3 migration."; # added 2023-01-20 gnome-desktop = throw "The ‘gnome.gnome-desktop’ alias was removed. Please use ‘pkgs.gnome-desktop’ directly."; # converted to throw on 2022-10-26 gnome-todo = pkgs.endeavour; # added 2022-07-30 libgnome-games-support = throw "The ‘gnome.libgnome-games-support’ alias was removed. Please use ‘pkgs.libgnome-games-support’ directly."; # converted to throw on 2022-10-26 diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index c95a36b8380e..b14e48d62dfe 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 = "37"; + version = "43"; src = fetchFromGitLab { owner = "arcmenu"; repo = "ArcMenu"; rev = "v${version}"; - sha256 = "sha256-dXGcdDq6RbvE8ICd2VhnyMlfOH+x2jqlG3Jerll9EE8="; + sha256 = "sha256-Mb3C2H7jq+zVcLjb0iaiIdO6zmU54vhuYxhN6oBCyP8="; }; patches = [ diff --git a/pkgs/desktops/gnome/extensions/collisions.json b/pkgs/desktops/gnome/extensions/collisions.json index 654161305bd4..47580d7f53c7 100644 --- a/pkgs/desktops/gnome/extensions/collisions.json +++ b/pkgs/desktops/gnome/extensions/collisions.json @@ -118,6 +118,10 @@ "volume-scroller": [ "volume_scroller@trflynn89.pm.me", "volume_scroller@noskoski" + ], + "floating-panel": [ + "floating-panel@aylur", + "floating-panel-usedbymyself@wpism" ] }, "41": { @@ -137,6 +141,10 @@ "ShutdownTimer@neumann", "ShutdownTimer@deminder" ], + "noannoyance": [ + "noannoyance@sindex.com", + "noannoyance@daase.net" + ], "fuzzy-clock": [ "fuzzy-clock@keepawayfromfire.co.uk", "FuzzyClock@johngoetz" @@ -160,6 +168,10 @@ "volume-scroller": [ "volume_scroller@trflynn89.pm.me", "volume_scroller@noskoski" + ], + "floating-panel": [ + "floating-panel@aylur", + "floating-panel-usedbymyself@wpism" ] }, "42": { @@ -175,6 +187,10 @@ "lockkeys@vaina.lt", "lockkeys@fawtytoo" ], + "noannoyance": [ + "noannoyance@sindex.com", + "noannoyance@daase.net" + ], "panel-date-format": [ "panel-date-format@keiii.github.com", "panel-date-format@atareao.es" @@ -190,6 +206,10 @@ "auto-activities": [ "auto-activities@acedron.github.io", "auto-activities@CleoMenezesJr.github.io" + ], + "floating-panel": [ + "floating-panel@aylur", + "floating-panel-usedbymyself@wpism" ] }, "43": { @@ -200,6 +220,14 @@ "workspace-indicator": [ "workspace-indicator@gnome-shell-extensions.gcampax.github.com", "horizontal-workspace-indicator@tty2.io" + ], + "noannoyance": [ + "noannoyance@sindex.com", + "noannoyance@daase.net" + ], + "floating-panel": [ + "floating-panel@aylur", + "floating-panel-usedbymyself@wpism" ] } } diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index b1c762a018f4..81622db59c1e 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -3,7 +3,9 @@ , gjs , gnome , gobject-introspection +, gsound , hddtemp +, libgda , liquidctl , lm_sensors , netcat-gnu @@ -79,6 +81,15 @@ super: lib.trivial.pipe super [ ''; })) + (patchExtension "pano@elhan.io" (old: { + patches = [ + (substituteAll { + src = ./extensionOverridesPatches/pano_at_elhan.io.patch; + inherit gsound libgda; + }) + ]; + })) + (patchExtension "screen-autorotate@kosmospredanie.yandex.ru" (old: { # Requires gjs # https://github.com/NixOS/nixpkgs/issues/164865 diff --git a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/pano_at_elhan.io.patch b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/pano_at_elhan.io.patch new file mode 100644 index 000000000000..448418d573ca --- /dev/null +++ b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/pano_at_elhan.io.patch @@ -0,0 +1,10 @@ +diff --git a/extension.js b/extension.js +index 26561f2..01209e7 100644 +--- a/extension.js ++++ b/extension.js +@@ -1,3 +1,5 @@ ++imports.gi.GIRepository.Repository.prepend_search_path('@gsound@/lib/girepository-1.0') ++imports.gi.GIRepository.Repository.prepend_search_path('@libgda@/lib/girepository-1.0') + + try { + diff --git a/pkgs/desktops/gnome/extensions/extensionRenames.nix b/pkgs/desktops/gnome/extensions/extensionRenames.nix index 840a2b907629..189a84d335f2 100644 --- a/pkgs/desktops/gnome/extensions/extensionRenames.nix +++ b/pkgs/desktops/gnome/extensions/extensionRenames.nix @@ -12,10 +12,17 @@ "workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator"; "horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2"; + # no source repository can be found for this extension + "floating-panel@aylur" = "floating-panel"; + "floating-panel-usedbymyself@wpism" = null; + # forks of each other, azan@faissal.bensefia.id is more recent "azan@faissal.bensefia.id" = "azan-islamic-prayer-times"; "azan@hatem.masmoudi.org" = null; + "noannoyance@sindex.com" = "noannoyance"; + "noannoyance@daase.net" = "noannoyance-2"; + # ############################################################################ # These are conflicts for older extensions (i.e. they don't support the latest GNOME version). # Make sure to move them up once they are updated @@ -63,9 +70,6 @@ "Hide_Activities@shay.shayel.org" = "hide-activities-button"; "hide-activities-button@nmingori.gnome-shell-extensions.org" = "hide-activities-button-2"; - "noannoyance@sindex.com" = "noannoyance"; - "noannoyance@daase.net" = "noannoyance-2"; - "SomaFm-Radio@alireza6677.gmail.com" = "somafm-internet-radio"; "SomaFm-Radio@cajhne.gmail.com" = "somafm-internet-radio-2"; diff --git a/pkgs/desktops/gnome/extensions/extensions.json b/pkgs/desktops/gnome/extensions/extensions.json index 37f376dbb280..4fd053d76d86 100644 --- a/pkgs/desktops/gnome/extensions/extensions.json +++ b/pkgs/desktops/gnome/extensions/extensions.json @@ -11,15 +11,15 @@ , {"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"}, "43": {"version": "50", "sha256": "0jyd2rn2nlvcmx8xn2azhbaqf5k0kgyx8ciy6bj1iq35s7k5sp7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"}}} , {"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="}, "43": {"version": "53", "sha256": "0idl8n6205ymh1z3w15sxv98940q8qch2pp5wk9gzd594i2aya2p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUzCn0="}}} , {"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": "51", "sha256": "1kc0zqjslz444v5ywmijyhja18nghdpbz5sab3sjbswj0hyzggd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dUaWxlIiwKICAidXVpZCI6ICJnVGlsZUB2aWJvdSIsCiAgInZlcnNpb24iOiA1MQp9"}, "40": {"version": "51", "sha256": "1kc0zqjslz444v5ywmijyhja18nghdpbz5sab3sjbswj0hyzggd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dUaWxlIiwKICAidXVpZCI6ICJnVGlsZUB2aWJvdSIsCiAgInZlcnNpb24iOiA1MQp9"}, "41": {"version": "51", "sha256": "1kc0zqjslz444v5ywmijyhja18nghdpbz5sab3sjbswj0hyzggd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dUaWxlIiwKICAidXVpZCI6ICJnVGlsZUB2aWJvdSIsCiAgInZlcnNpb24iOiA1MQp9"}, "42": {"version": "51", "sha256": "1kc0zqjslz444v5ywmijyhja18nghdpbz5sab3sjbswj0hyzggd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dUaWxlIiwKICAidXVpZCI6ICJnVGlsZUB2aWJvdSIsCiAgInZlcnNpb24iOiA1MQp9"}, "43": {"version": "51", "sha256": "1kc0zqjslz444v5ywmijyhja18nghdpbz5sab3sjbswj0hyzggd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dUaWxlIiwKICAidXVpZCI6ICJnVGlsZUB2aWJvdSIsCiAgInZlcnNpb24iOiA1MQp9"}}} -, {"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": "48", "sha256": "16lvhl6d9ygmmcjyi633aacd9gsp8pmvpliawfihm23nl1w3pzp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sb2Nra2V5cyIsCiAgInV1aWQiOiAibG9ja2tleXNAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNDgKfQ=="}, "40": {"version": "48", "sha256": "16lvhl6d9ygmmcjyi633aacd9gsp8pmvpliawfihm23nl1w3pzp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sb2Nra2V5cyIsCiAgInV1aWQiOiAibG9ja2tleXNAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNDgKfQ=="}, "41": {"version": "48", "sha256": "16lvhl6d9ygmmcjyi633aacd9gsp8pmvpliawfihm23nl1w3pzp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sb2Nra2V5cyIsCiAgInV1aWQiOiAibG9ja2tleXNAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNDgKfQ=="}, "42": {"version": "48", "sha256": "16lvhl6d9ygmmcjyi633aacd9gsp8pmvpliawfihm23nl1w3pzp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sb2Nra2V5cyIsCiAgInV1aWQiOiAibG9ja2tleXNAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNDgKfQ=="}, "43": {"version": "48", "sha256": "16lvhl6d9ygmmcjyi633aacd9gsp8pmvpliawfihm23nl1w3pzp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sb2Nra2V5cyIsCiAgInV1aWQiOiAibG9ja2tleXNAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNDgKfQ=="}}} +, {"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": "49", "sha256": "0bfx49c4fk8zmbjrp7rajkhh29wapi0xfp881dbb65p21ddlapkp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sb2Nra2V5cyIsCiAgInV1aWQiOiAibG9ja2tleXNAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNDkKfQ=="}, "40": {"version": "49", "sha256": "0bfx49c4fk8zmbjrp7rajkhh29wapi0xfp881dbb65p21ddlapkp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sb2Nra2V5cyIsCiAgInV1aWQiOiAibG9ja2tleXNAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNDkKfQ=="}, "41": {"version": "49", "sha256": "0bfx49c4fk8zmbjrp7rajkhh29wapi0xfp881dbb65p21ddlapkp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sb2Nra2V5cyIsCiAgInV1aWQiOiAibG9ja2tleXNAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNDkKfQ=="}, "42": {"version": "49", "sha256": "0bfx49c4fk8zmbjrp7rajkhh29wapi0xfp881dbb65p21ddlapkp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sb2Nra2V5cyIsCiAgInV1aWQiOiAibG9ja2tleXNAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNDkKfQ=="}, "43": {"version": "49", "sha256": "0bfx49c4fk8zmbjrp7rajkhh29wapi0xfp881dbb65p21ddlapkp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sb2Nra2V5cyIsCiAgInV1aWQiOiAibG9ja2tleXNAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNDkKfQ=="}}} , {"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": "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": "22", "sha256": "00sph5bz2q77shsqh6yf9lmb3bp6ryx6crrz0gi7s70i4byji991", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVHJhc2ggYnV0dG9uIGZvciB0aGUgR05PTUUgc2hlbGwgcGFuZWwiLAogICJsb2NhbGVkaXIiOiAibG9jYWxlIiwKICAibmFtZSI6ICJUcmFzaCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiQXhlbCB2b24gQmVydG9sZGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iZXJ0b2xkaWEvZ25vbWUtc2hlbGwtdHJhc2gtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC10cmFzaC1leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "41": {"version": "22", "sha256": "00sph5bz2q77shsqh6yf9lmb3bp6ryx6crrz0gi7s70i4byji991", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVHJhc2ggYnV0dG9uIGZvciB0aGUgR05PTUUgc2hlbGwgcGFuZWwiLAogICJsb2NhbGVkaXIiOiAibG9jYWxlIiwKICAibmFtZSI6ICJUcmFzaCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiQXhlbCB2b24gQmVydG9sZGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iZXJ0b2xkaWEvZ25vbWUtc2hlbGwtdHJhc2gtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC10cmFzaC1leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "00sph5bz2q77shsqh6yf9lmb3bp6ryx6crrz0gi7s70i4byji991", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVHJhc2ggYnV0dG9uIGZvciB0aGUgR05PTUUgc2hlbGwgcGFuZWwiLAogICJsb2NhbGVkaXIiOiAibG9jYWxlIiwKICAibmFtZSI6ICJUcmFzaCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiQXhlbCB2b24gQmVydG9sZGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iZXJ0b2xkaWEvZ25vbWUtc2hlbGwtdHJhc2gtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC10cmFzaC1leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "22", "sha256": "00sph5bz2q77shsqh6yf9lmb3bp6ryx6crrz0gi7s70i4byji991", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVHJhc2ggYnV0dG9uIGZvciB0aGUgR05PTUUgc2hlbGwgcGFuZWwiLAogICJsb2NhbGVkaXIiOiAibG9jYWxlIiwKICAibmFtZSI6ICJUcmFzaCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiQXhlbCB2b24gQmVydG9sZGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iZXJ0b2xkaWEvZ25vbWUtc2hlbGwtdHJhc2gtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC10cmFzaC1leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} , {"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": "22", "sha256": "17xgw3iqcznlsfqjfs99bb5s1h7wlg37xjn9rar1hqpl7dsy84nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiBmb3IgcmVjZW50bHkgdXNlZCBpdGVtcyBhdCB0aGUgdG9wIHBhbmVsOyBjbGVhciBsaXN0IGJ5IGNsaWNrOyBsZWZ0IGNsaWNrOiBvcGVuIGZpbGUsIHJpZ2h0IGNsaWNrOiBvcGVuIGNvbnRhaW5pbmcgZm9sZGVyOyBTZXR0aW5ncyBmb3I6IG51bWJlciBvZiBpdGVtcywgbnVtYmVyIG9mIGl0ZW1zIHVuZGVyIFwibW9yZVwiIGFuZCBibGFja2xpc3Rpbmcgb3B0aW9ucyBhcmUgZGVmaW5lZCBhdCB0aGUgdG9wIG9mIGV4dGVuc2lvbi5qcyAoc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9iYW5hbmVuZmlzY2gvUmVjZW50SXRlbXMgZm9yIG1vcmUgaW5mb3MpLiIsCiAgIm5hbWUiOiAiUmVjZW50IEl0ZW1zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JhbmFuZW5maXNjaC9SZWNlbnRJdGVtcyIsCiAgInV1aWQiOiAiUmVjZW50SXRlbXNAYmFuYW5lbmZpc2NoLm5ldCIsCiAgInZlcnNpb24iOiAyMgp9"}, "41": {"version": "22", "sha256": "17xgw3iqcznlsfqjfs99bb5s1h7wlg37xjn9rar1hqpl7dsy84nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiBmb3IgcmVjZW50bHkgdXNlZCBpdGVtcyBhdCB0aGUgdG9wIHBhbmVsOyBjbGVhciBsaXN0IGJ5IGNsaWNrOyBsZWZ0IGNsaWNrOiBvcGVuIGZpbGUsIHJpZ2h0IGNsaWNrOiBvcGVuIGNvbnRhaW5pbmcgZm9sZGVyOyBTZXR0aW5ncyBmb3I6IG51bWJlciBvZiBpdGVtcywgbnVtYmVyIG9mIGl0ZW1zIHVuZGVyIFwibW9yZVwiIGFuZCBibGFja2xpc3Rpbmcgb3B0aW9ucyBhcmUgZGVmaW5lZCBhdCB0aGUgdG9wIG9mIGV4dGVuc2lvbi5qcyAoc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9iYW5hbmVuZmlzY2gvUmVjZW50SXRlbXMgZm9yIG1vcmUgaW5mb3MpLiIsCiAgIm5hbWUiOiAiUmVjZW50IEl0ZW1zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JhbmFuZW5maXNjaC9SZWNlbnRJdGVtcyIsCiAgInV1aWQiOiAiUmVjZW50SXRlbXNAYmFuYW5lbmZpc2NoLm5ldCIsCiAgInZlcnNpb24iOiAyMgp9"}, "42": {"version": "22", "sha256": "17xgw3iqcznlsfqjfs99bb5s1h7wlg37xjn9rar1hqpl7dsy84nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiBmb3IgcmVjZW50bHkgdXNlZCBpdGVtcyBhdCB0aGUgdG9wIHBhbmVsOyBjbGVhciBsaXN0IGJ5IGNsaWNrOyBsZWZ0IGNsaWNrOiBvcGVuIGZpbGUsIHJpZ2h0IGNsaWNrOiBvcGVuIGNvbnRhaW5pbmcgZm9sZGVyOyBTZXR0aW5ncyBmb3I6IG51bWJlciBvZiBpdGVtcywgbnVtYmVyIG9mIGl0ZW1zIHVuZGVyIFwibW9yZVwiIGFuZCBibGFja2xpc3Rpbmcgb3B0aW9ucyBhcmUgZGVmaW5lZCBhdCB0aGUgdG9wIG9mIGV4dGVuc2lvbi5qcyAoc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9iYW5hbmVuZmlzY2gvUmVjZW50SXRlbXMgZm9yIG1vcmUgaW5mb3MpLiIsCiAgIm5hbWUiOiAiUmVjZW50IEl0ZW1zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JhbmFuZW5maXNjaC9SZWNlbnRJdGVtcyIsCiAgInV1aWQiOiAiUmVjZW50SXRlbXNAYmFuYW5lbmZpc2NoLm5ldCIsCiAgInZlcnNpb24iOiAyMgp9"}, "43": {"version": "22", "sha256": "17xgw3iqcznlsfqjfs99bb5s1h7wlg37xjn9rar1hqpl7dsy84nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiBmb3IgcmVjZW50bHkgdXNlZCBpdGVtcyBhdCB0aGUgdG9wIHBhbmVsOyBjbGVhciBsaXN0IGJ5IGNsaWNrOyBsZWZ0IGNsaWNrOiBvcGVuIGZpbGUsIHJpZ2h0IGNsaWNrOiBvcGVuIGNvbnRhaW5pbmcgZm9sZGVyOyBTZXR0aW5ncyBmb3I6IG51bWJlciBvZiBpdGVtcywgbnVtYmVyIG9mIGl0ZW1zIHVuZGVyIFwibW9yZVwiIGFuZCBibGFja2xpc3Rpbmcgb3B0aW9ucyBhcmUgZGVmaW5lZCBhdCB0aGUgdG9wIG9mIGV4dGVuc2lvbi5qcyAoc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9iYW5hbmVuZmlzY2gvUmVjZW50SXRlbXMgZm9yIG1vcmUgaW5mb3MpLiIsCiAgIm5hbWUiOiAiUmVjZW50IEl0ZW1zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JhbmFuZW5maXNjaC9SZWNlbnRJdGVtcyIsCiAgInV1aWQiOiAiUmVjZW50SXRlbXNAYmFuYW5lbmZpc2NoLm5ldCIsCiAgInZlcnNpb24iOiAyMgp9"}}} , {"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": "14", "sha256": "1dh02rbq7pfvpjpgjq7rlx7lld2qhq602apn1g17hbxbcpdzz004", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBsb2NrIGljb24gdG8gdGhlIHBhbmVsIGFuZCBsb2NrIHRoZSBzY3JlZW4gaW5zdGVhZCBvZiB1c2luZyBjdHJsLWFsdC1sIiwKICAibmFtZSI6ICJMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiNDAuMCIsCiAgICAiNDIuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NyYW1rcmlzaG5hL2dub21lMy1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsb2Nrc2NyZWVuQHNyaS5yYW1rcmlzaG5hLm1lIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "14", "sha256": "1dh02rbq7pfvpjpgjq7rlx7lld2qhq602apn1g17hbxbcpdzz004", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBsb2NrIGljb24gdG8gdGhlIHBhbmVsIGFuZCBsb2NrIHRoZSBzY3JlZW4gaW5zdGVhZCBvZiB1c2luZyBjdHJsLWFsdC1sIiwKICAibmFtZSI6ICJMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiNDAuMCIsCiAgICAiNDIuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NyYW1rcmlzaG5hL2dub21lMy1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsb2Nrc2NyZWVuQHNyaS5yYW1rcmlzaG5hLm1lIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} -, {"uuid": "CoverflowAltTab@palatis.blogspot.com", "name": "Coverflow Alt-Tab", "pname": "coverflow-alt-tab", "description": "Replacement of Alt-Tab, iterates through windows in a cover-flow manner.", "link": "https://extensions.gnome.org/extension/97/coverflow-alt-tab/", "shell_version_map": {"38": {"version": "44", "sha256": "18qpriqi0h6la45bl584hglnni0ka2d5q4qv61wdcan28a7kywq4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNpbm5hbW9uLXZlcnNpb24iOiBbCiAgICAiMS4yIiwKICAgICIxLjQiLAogICAgIjEuNiIsCiAgICAiMS44IiwKICAgICIxLjkiLAogICAgIjIuMCIsCiAgICAiMi4xIiwKICAgICIyLjIiLAogICAgIjIuMyIsCiAgICAiMi40IiwKICAgICIyLjgiLAogICAgIjMuMCIKICBdLAogICJkZXNjcmlwdGlvbiI6ICJSZXBsYWNlbWVudCBvZiBBbHQtVGFiLCBpdGVyYXRlcyB0aHJvdWdoIHdpbmRvd3MgaW4gYSBjb3Zlci1mbG93IG1hbm5lci4iLAogICJuYW1lIjogIkNvdmVyZmxvdyBBbHQtVGFiIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG1vNjAvQ292ZXJmbG93QWx0VGFiIiwKICAidXVpZCI6ICJDb3ZlcmZsb3dBbHRUYWJAcGFsYXRpcy5ibG9nc3BvdC5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "40": {"version": "49", "sha256": "0mmz5qrlx2gjfahpyy6c050wcif3pwwfff7i8wxf7xcmj21nqlwx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtbzYwL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}, "41": {"version": "49", "sha256": "0mmz5qrlx2gjfahpyy6c050wcif3pwwfff7i8wxf7xcmj21nqlwx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtbzYwL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}, "42": {"version": "55", "sha256": "16ff2fbv8vf9cgzrxy85vis9a5bgbkn1lb21brpxsf9gs5kk4v8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtbzYwL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDU1Cn0="}, "43": {"version": "55", "sha256": "16ff2fbv8vf9cgzrxy85vis9a5bgbkn1lb21brpxsf9gs5kk4v8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtbzYwL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDU1Cn0="}}} +, {"uuid": "CoverflowAltTab@palatis.blogspot.com", "name": "Coverflow Alt-Tab", "pname": "coverflow-alt-tab", "description": "Replacement of Alt-Tab, iterates through windows in a cover-flow manner.", "link": "https://extensions.gnome.org/extension/97/coverflow-alt-tab/", "shell_version_map": {"38": {"version": "44", "sha256": "18qpriqi0h6la45bl584hglnni0ka2d5q4qv61wdcan28a7kywq4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNpbm5hbW9uLXZlcnNpb24iOiBbCiAgICAiMS4yIiwKICAgICIxLjQiLAogICAgIjEuNiIsCiAgICAiMS44IiwKICAgICIxLjkiLAogICAgIjIuMCIsCiAgICAiMi4xIiwKICAgICIyLjIiLAogICAgIjIuMyIsCiAgICAiMi40IiwKICAgICIyLjgiLAogICAgIjMuMCIKICBdLAogICJkZXNjcmlwdGlvbiI6ICJSZXBsYWNlbWVudCBvZiBBbHQtVGFiLCBpdGVyYXRlcyB0aHJvdWdoIHdpbmRvd3MgaW4gYSBjb3Zlci1mbG93IG1hbm5lci4iLAogICJuYW1lIjogIkNvdmVyZmxvdyBBbHQtVGFiIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG1vNjAvQ292ZXJmbG93QWx0VGFiIiwKICAidXVpZCI6ICJDb3ZlcmZsb3dBbHRUYWJAcGFsYXRpcy5ibG9nc3BvdC5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "40": {"version": "49", "sha256": "0mmz5qrlx2gjfahpyy6c050wcif3pwwfff7i8wxf7xcmj21nqlwx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtbzYwL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}, "41": {"version": "49", "sha256": "0mmz5qrlx2gjfahpyy6c050wcif3pwwfff7i8wxf7xcmj21nqlwx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtbzYwL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}, "42": {"version": "55", "sha256": "16ff2fbv8vf9cgzrxy85vis9a5bgbkn1lb21brpxsf9gs5kk4v8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtbzYwL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDU1Cn0="}, "43": {"version": "58", "sha256": "0n9g1gg9ngqj8b5gpq8vmhl7y9zi0hyl15cvk5ypjhi6fx55q4dg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG1vNjAvQ292ZXJmbG93QWx0VGFiIiwKICAidXVpZCI6ICJDb3ZlcmZsb3dBbHRUYWJAcGFsYXRpcy5ibG9nc3BvdC5jb20iLAogICJ2ZXJzaW9uIjogNTgKfQ=="}}} , {"uuid": "netspeed@hedayaty.gmail.com", "name": "NetSpeed", "pname": "netspeed", "description": "Displays Internet Speed", "link": "https://extensions.gnome.org/extension/104/netspeed/", "shell_version_map": {"40": {"version": "34", "sha256": "04137rwnnf2mbp228wl9qjcix6i7757cqsdamabdrjwclg147vql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIEludGVybmV0IFNwZWVkIiwKICAibmFtZSI6ICJOZXRTcGVlZCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoZWRheWF0eUBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlZGF5YXR5L05ldFNwZWVkIiwKICAidXVpZCI6ICJuZXRzcGVlZEBoZWRheWF0eS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "41": {"version": "34", "sha256": "04137rwnnf2mbp228wl9qjcix6i7757cqsdamabdrjwclg147vql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIEludGVybmV0IFNwZWVkIiwKICAibmFtZSI6ICJOZXRTcGVlZCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoZWRheWF0eUBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlZGF5YXR5L05ldFNwZWVkIiwKICAidXVpZCI6ICJuZXRzcGVlZEBoZWRheWF0eS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}}} -, {"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": "18", "sha256": "1ibamk57121qdd0g0mlbg569sk2qqpap1914vfg1ip3nh1n4fym5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgcGFuZWwgbWVudSBmb3IgZmF2b3JpdGVzIiwKICAibmFtZSI6ICJGYXZvcml0ZXMgTWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwOi8vd3d3LmN2aW5lLnBsdXMuY29tL2Zhdm9yaXRlcy9pbmRleC5odG1sIiwKICAidXVpZCI6ICJmYXZvcml0ZXNAY3ZpbmUub3JnIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "42": {"version": "18", "sha256": "1ibamk57121qdd0g0mlbg569sk2qqpap1914vfg1ip3nh1n4fym5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgcGFuZWwgbWVudSBmb3IgZmF2b3JpdGVzIiwKICAibmFtZSI6ICJGYXZvcml0ZXMgTWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwOi8vd3d3LmN2aW5lLnBsdXMuY29tL2Zhdm9yaXRlcy9pbmRleC5odG1sIiwKICAidXVpZCI6ICJmYXZvcml0ZXNAY3ZpbmUub3JnIiwKICAidmVyc2lvbiI6IDE4Cn0="}}} +, {"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": "19", "sha256": "18kqda8kbc43i6qyx2fj5wjpb8b5ijazynbvvqvx7xhfi3a6x6w5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgcGFuZWwgbWVudSBmb3IgZmF2b3JpdGVzIiwKICAibmFtZSI6ICJGYXZvcml0ZXMgTWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cDovL3d3dy5jdmluZS5wbHVzLmNvbS9mYXZvcml0ZXMvaW5kZXguaHRtbCIsCiAgInV1aWQiOiAiZmF2b3JpdGVzQGN2aW5lLm9yZyIsCiAgInZlcnNpb24iOiAxOQp9"}, "42": {"version": "19", "sha256": "18kqda8kbc43i6qyx2fj5wjpb8b5ijazynbvvqvx7xhfi3a6x6w5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgcGFuZWwgbWVudSBmb3IgZmF2b3JpdGVzIiwKICAibmFtZSI6ICJGYXZvcml0ZXMgTWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cDovL3d3dy5jdmluZS5wbHVzLmNvbS9mYXZvcml0ZXMvaW5kZXguaHRtbCIsCiAgInV1aWQiOiAiZmF2b3JpdGVzQGN2aW5lLm9yZyIsCiAgInZlcnNpb24iOiAxOQp9"}, "43": {"version": "19", "sha256": "18kqda8kbc43i6qyx2fj5wjpb8b5ijazynbvvqvx7xhfi3a6x6w5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgcGFuZWwgbWVudSBmb3IgZmF2b3JpdGVzIiwKICAibmFtZSI6ICJGYXZvcml0ZXMgTWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cDovL3d3dy5jdmluZS5wbHVzLmNvbS9mYXZvcml0ZXMvaW5kZXguaHRtbCIsCiAgInV1aWQiOiAiZmF2b3JpdGVzQGN2aW5lLm9yZyIsCiAgInZlcnNpb24iOiAxOQp9"}}} , {"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": "touchpad-indicator@orangeshirt", "name": "Touchpad Indicator", "pname": "touchpad-indicator", "description": "Automatically disable other pointing devices when an external mouse is plugged in.", "link": "https://extensions.gnome.org/extension/131/touchpad-indicator/", "shell_version_map": {"38": {"version": "37", "sha256": "19rjxnawwnxx30j1i91vkg39q9ky5h64lhvsiq08ngvfck590ghh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGlzYWJsZSBvdGhlciBwb2ludGluZyBkZXZpY2VzIHdoZW4gYW4gZXh0ZXJuYWwgbW91c2UgaXMgcGx1Z2dlZCBpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0b3VjaHBhZC1pbmRpY2F0b3IiLAogICJuYW1lIjogIlRvdWNocGFkIEluZGljYXRvciIsCiAgInJlcG9zaXRvcnkiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VzZXI1MDEyNTQvVG91Y2hwYWRJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXNrbXJzaW5oL3RvdWNocGFkLWluZGljYXRvciIsCiAgInV1aWQiOiAidG91Y2hwYWQtaW5kaWNhdG9yQG9yYW5nZXNoaXJ0IiwKICAidmVyc2lvbiI6IDM3Cn0="}, "40": {"version": "37", "sha256": "19rjxnawwnxx30j1i91vkg39q9ky5h64lhvsiq08ngvfck590ghh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGlzYWJsZSBvdGhlciBwb2ludGluZyBkZXZpY2VzIHdoZW4gYW4gZXh0ZXJuYWwgbW91c2UgaXMgcGx1Z2dlZCBpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0b3VjaHBhZC1pbmRpY2F0b3IiLAogICJuYW1lIjogIlRvdWNocGFkIEluZGljYXRvciIsCiAgInJlcG9zaXRvcnkiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VzZXI1MDEyNTQvVG91Y2hwYWRJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXNrbXJzaW5oL3RvdWNocGFkLWluZGljYXRvciIsCiAgInV1aWQiOiAidG91Y2hwYWQtaW5kaWNhdG9yQG9yYW5nZXNoaXJ0IiwKICAidmVyc2lvbiI6IDM3Cn0="}}} , {"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=="}}} @@ -30,19 +30,19 @@ , {"uuid": "dash-to-dock@micxgx.gmail.com", "name": "Dash to Dock", "pname": "dash-to-dock", "description": "A dock for the Gnome Shell. This extension moves the dash out of the overview transforming it in a dock for an easier launching of applications and a faster switching between windows and desktops. Side and bottom placement options are available.", "link": "https://extensions.gnome.org/extension/307/dash-to-dock/", "shell_version_map": {"38": {"version": "69", "sha256": "1nmqg875lxbxn8plwgmsrkhq126hcv56yl6iyq5wc4ljp98niaw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbWljaGVsZWcuZ2l0aHViLmlvL2Rhc2gtdG8tZG9jay8iLAogICJ1dWlkIjogImRhc2gtdG8tZG9ja0BtaWN4Z3guZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDY5Cn0="}, "40": {"version": "75", "sha256": "0y0il2c97xjfga5nn5xh0h86aljwdnbbjqnkx7c1iykpi4x47y4d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL21pY2hlbGVnLmdpdGh1Yi5pby9kYXNoLXRvLWRvY2svIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2tAbWljeGd4LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3NQp9"}, "41": {"version": "75", "sha256": "0y0il2c97xjfga5nn5xh0h86aljwdnbbjqnkx7c1iykpi4x47y4d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL21pY2hlbGVnLmdpdGh1Yi5pby9kYXNoLXRvLWRvY2svIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2tAbWljeGd4LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3NQp9"}, "42": {"version": "75", "sha256": "0y0il2c97xjfga5nn5xh0h86aljwdnbbjqnkx7c1iykpi4x47y4d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL21pY2hlbGVnLmdpdGh1Yi5pby9kYXNoLXRvLWRvY2svIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2tAbWljeGd4LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3NQp9"}, "43": {"version": "75", "sha256": "0y0il2c97xjfga5nn5xh0h86aljwdnbbjqnkx7c1iykpi4x47y4d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL21pY2hlbGVnLmdpdGh1Yi5pby9kYXNoLXRvLWRvY2svIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2tAbWljeGd4LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3NQp9"}}} , {"uuid": "mythtv-fnx@fnxweb.com", "name": "MythTV", "pname": "mythtv", "description": "Displays MythTV status (free space and upcoming recordings)", "link": "https://extensions.gnome.org/extension/321/mythtv/", "shell_version_map": {"38": {"version": "10", "sha256": "070h11gk5zpxn5xbc71skdz174hbb72l0isia2vp7d9wy4ackl0k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIE15dGhUViBzdGF0dXMgKGZyZWUgc3BhY2UgYW5kIHVwY29taW5nIHJlY29yZGluZ3MpIiwKICAibmFtZSI6ICJNeXRoVFYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mbnh3ZWIvZ25vbWUtc2hlbGwtbXl0aHR2IiwKICAidXVpZCI6ICJteXRodHYtZm54QGZueHdlYi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "13", "sha256": "1zacmlidmkf1jys1cvwpx4yqkjj6hp0bdpw83gnmg7rmgnyls39d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIE15dGhUViBzdGF0dXMgKGZyZWUgc3BhY2UgYW5kIHVwY29taW5nIHJlY29yZGluZ3MpIiwKICAibmFtZSI6ICJNeXRoVFYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZueHdlYi9nbm9tZS1zaGVsbC1teXRodHYiLAogICJ1dWlkIjogIm15dGh0di1mbnhAZm54d2ViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "42": {"version": "13", "sha256": "1zacmlidmkf1jys1cvwpx4yqkjj6hp0bdpw83gnmg7rmgnyls39d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIE15dGhUViBzdGF0dXMgKGZyZWUgc3BhY2UgYW5kIHVwY29taW5nIHJlY29yZGluZ3MpIiwKICAibmFtZSI6ICJNeXRoVFYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZueHdlYi9nbm9tZS1zaGVsbC1teXRodHYiLAogICJ1dWlkIjogIm15dGh0di1mbnhAZm54d2ViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} , {"uuid": "middleclickclose@paolo.tranquilli.gmail.com", "name": "Quick Close in Overview", "pname": "middle-click-to-close-in-overview", "description": "Close windows with a button click (the middle one by default) when in overview mode", "link": "https://extensions.gnome.org/extension/352/middle-click-to-close-in-overview/", "shell_version_map": {"38": {"version": "17", "sha256": "1nv6cjyiz1i7fddh21h0zmrvzfi3y70y1f0xsv2zd0rfg6rf0r77", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJRdWljayBDbG9zZSBpbiBPdmVydmlldyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiUGFvbG8gVHJhbnF1aWxsaSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3A5MXBhdWwvbWlkZGxlY2xpY2tjbG9zZSIsCiAgInV1aWQiOiAibWlkZGxlY2xpY2tjbG9zZUBwYW9sby50cmFucXVpbGxpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "40": {"version": "23", "sha256": "1zbnizandqdsakncs3q7p6ylagdf49v5wz658vx47mh4mzbmisfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgImxvY2FsZSI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlBhb2xvIFRyYW5xdWlsbGkiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pZGRsZWNsaWNrY2xvc2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3A5MXBhdWwvbWlkZGxlY2xpY2tjbG9zZSIsCiAgInV1aWQiOiAibWlkZGxlY2xpY2tjbG9zZUBwYW9sby50cmFucXVpbGxpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "41": {"version": "23", "sha256": "1zbnizandqdsakncs3q7p6ylagdf49v5wz658vx47mh4mzbmisfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgImxvY2FsZSI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlBhb2xvIFRyYW5xdWlsbGkiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pZGRsZWNsaWNrY2xvc2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3A5MXBhdWwvbWlkZGxlY2xpY2tjbG9zZSIsCiAgInV1aWQiOiAibWlkZGxlY2xpY2tjbG9zZUBwYW9sby50cmFucXVpbGxpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "42": {"version": "26", "sha256": "1wapknvsvwpbbrlm7v4i4vvnhrp3x7xp8fh312rzh3pvmil9vmb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgImxvY2FsZSI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlBhb2xvIFRyYW5xdWlsbGkiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pZGRsZWNsaWNrY2xvc2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3A5MXBhdWwvbWlkZGxlY2xpY2tjbG9zZSIsCiAgInV1aWQiOiAibWlkZGxlY2xpY2tjbG9zZUBwYW9sby50cmFucXVpbGxpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "43": {"version": "26", "sha256": "1wapknvsvwpbbrlm7v4i4vvnhrp3x7xp8fh312rzh3pvmil9vmb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgImxvY2FsZSI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlBhb2xvIFRyYW5xdWlsbGkiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pZGRsZWNsaWNrY2xvc2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3A5MXBhdWwvbWlkZGxlY2xpY2tjbG9zZSIsCiAgInV1aWQiOiAibWlkZGxlY2xpY2tjbG9zZUBwYW9sby50cmFucXVpbGxpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}}} -, {"uuid": "status-area-horizontal-spacing@mathematical.coffee.gmail.com", "name": "Status Area Horizontal Spacing", "pname": "status-area-horizontal-spacing", "description": "Reduce the horizontal spacing between icons in the top-right status area", "link": "https://extensions.gnome.org/extension/355/status-area-horizontal-spacing/", "shell_version_map": {"38": {"version": "16", "sha256": "05hhj10hlcpbgd9sbvq89vxzqj6ndf21syas8zidy6yfy613b6l3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjQiLAogICAgIjMuNiIsCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "40": {"version": "21", "sha256": "1szpxz6ybvq76di2a6bkyv234v0afw2bn12xjcgdzpzvxzr9y3da", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "41": {"version": "21", "sha256": "1szpxz6ybvq76di2a6bkyv234v0afw2bn12xjcgdzpzvxzr9y3da", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "42": {"version": "22", "sha256": "02a68p0j8w434bvgq2s1q4hkj7pvs9b9kgsyfkbncqp44j8aqnwh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wOTFwYXVsL3N0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZy1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZ0BtYXRoZW1hdGljYWwuY29mZmVlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}}} +, {"uuid": "status-area-horizontal-spacing@mathematical.coffee.gmail.com", "name": "Status Area Horizontal Spacing", "pname": "status-area-horizontal-spacing", "description": "Reduce the horizontal spacing between icons in the top-right status area", "link": "https://extensions.gnome.org/extension/355/status-area-horizontal-spacing/", "shell_version_map": {"38": {"version": "16", "sha256": "05hhj10hlcpbgd9sbvq89vxzqj6ndf21syas8zidy6yfy613b6l3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjQiLAogICAgIjMuNiIsCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "40": {"version": "21", "sha256": "1szpxz6ybvq76di2a6bkyv234v0afw2bn12xjcgdzpzvxzr9y3da", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "41": {"version": "21", "sha256": "1szpxz6ybvq76di2a6bkyv234v0afw2bn12xjcgdzpzvxzr9y3da", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "42": {"version": "23", "sha256": "00lypvnl99131qf76wcacrygrrg8alar0gsma8il3c6bvspqp76d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "43": {"version": "23", "sha256": "00lypvnl99131qf76wcacrygrrg8alar0gsma8il3c6bvspqp76d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} , {"uuid": "activities-config@nls1729", "name": "Activities Configurator", "pname": "activities-configurator", "description": "Activities Configurator, activities-config@nls1729 - Effective March 29, 2021 the extension is NOT MAINTAINED. I give my permission to anyone who may want to become the maintainer. I do not have the free time or energy necessary to maintain the extension.\n\nConfigure the Activities Button and Top Panel. Select an icon. Change the text. Disable Hot Corner or set the Hot Corner Threshold. Set Panel Background color and transparency plus much more to enhance your desktop. Click the icon or text with the secondary mouse button to launch the GS Extension Prefs.", "link": "https://extensions.gnome.org/extension/358/activities-configurator/", "shell_version_map": {"38": {"version": "89", "sha256": "1z00smimg5fj6ri35g80bvfzzy5xxxrgwy4idsakphszdwryi8ny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2aXRpZXMgQ29uZmlndXJhdG9yLCBhY3Rpdml0aWVzLWNvbmZpZ0BubHMxNzI5IC0gIEVmZmVjdGl2ZSBNYXJjaCAyOSwgMjAyMSB0aGUgZXh0ZW5zaW9uIGlzIE5PVCBNQUlOVEFJTkVELiAgSSBnaXZlIG15IHBlcm1pc3Npb24gdG8gYW55b25lIHdobyBtYXkgd2FudCB0byBiZWNvbWUgdGhlIG1haW50YWluZXIuICBJIGRvIG5vdCBoYXZlIHRoZSBmcmVlIHRpbWUgb3IgZW5lcmd5IG5lY2Vzc2FyeSB0byBtYWludGFpbiB0aGUgZXh0ZW5zaW9uLlxuXG5Db25maWd1cmUgdGhlIEFjdGl2aXRpZXMgQnV0dG9uIGFuZCBUb3AgUGFuZWwuIFNlbGVjdCBhbiBpY29uLiBDaGFuZ2UgdGhlIHRleHQuIERpc2FibGUgSG90IENvcm5lciBvciBzZXQgdGhlIEhvdCBDb3JuZXIgVGhyZXNob2xkLiBTZXQgUGFuZWwgQmFja2dyb3VuZCBjb2xvciBhbmQgdHJhbnNwYXJlbmN5IHBsdXMgbXVjaCBtb3JlIHRvIGVuaGFuY2UgeW91ciBkZXNrdG9wLiAgQ2xpY2sgdGhlIGljb24gb3IgdGV4dCB3aXRoIHRoZSBzZWNvbmRhcnkgbW91c2UgYnV0dG9uIHRvIGxhdW5jaCB0aGUgR1MgRXh0ZW5zaW9uIFByZWZzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhY3Rpdml0aWVzLWNvbmZpZyIsCiAgImdldHRleHQtZG9tYWluIjogImFjdGl2aXRpZXMtY29uZmlnLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBDb25maWd1cmF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWN0aXZpdGllcy1jb25maWciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmxzMTcyOS5naXRodWIuaW8vYWN0aXZpdGllc19jb25maWcuaHRtbCIsCiAgInV1aWQiOiAiYWN0aXZpdGllcy1jb25maWdAbmxzMTcyOSIsCiAgInZlcnNpb24iOiA4OQp9"}}} , {"uuid": "calc@danigm.wadobo.com", "name": "calc", "pname": "calc", "description": "Simple run dialog calculation", "link": "https://extensions.gnome.org/extension/388/calc/", "shell_version_map": {"40": {"version": "11", "sha256": "1mpy3vvmisidy2czhlz18jvgvp2rd3sd7pgm7ky28kw9zxmihxxr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjYWxjQGRhbmlnbS53YWRvYm8uY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "1mpy3vvmisidy2czhlz18jvgvp2rd3sd7pgm7ky28kw9zxmihxxr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjYWxjQGRhbmlnbS53YWRvYm8uY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "1mpy3vvmisidy2czhlz18jvgvp2rd3sd7pgm7ky28kw9zxmihxxr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjYWxjQGRhbmlnbS53YWRvYm8uY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "11", "sha256": "1mpy3vvmisidy2czhlz18jvgvp2rd3sd7pgm7ky28kw9zxmihxxr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjYWxjQGRhbmlnbS53YWRvYm8uY29tIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"uuid": "remmina-search-provider@alexmurray.github.com", "name": "Remmina Search Provider", "pname": "remmina-search-provider", "description": "Search for Remmina Remote Desktop Connections\n\nEasily search for and launch connections to remote machines by name and protocol.", "link": "https://extensions.gnome.org/extension/473/remmina-search-provider/", "shell_version_map": {"40": {"version": "15", "sha256": "1z1myqwj9wmz3li7y6zlb3ma1icmj2gpna4qb8nzm6girrkajwda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgUmVtbWluYSBSZW1vdGUgRGVza3RvcCBDb25uZWN0aW9uc1xuXG5FYXNpbHkgc2VhcmNoIGZvciBhbmQgbGF1bmNoIGNvbm5lY3Rpb25zIHRvIHJlbW90ZSBtYWNoaW5lcyBieSBuYW1lIGFuZCBwcm90b2NvbC4iLAogICJuYW1lIjogIlJlbW1pbmEgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleG11cnJheS9yZW1taW5hLXNlYXJjaC1wcm92aWRlci8iLAogICJ1dWlkIjogInJlbW1pbmEtc2VhcmNoLXByb3ZpZGVyQGFsZXhtdXJyYXkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "41": {"version": "15", "sha256": "1z1myqwj9wmz3li7y6zlb3ma1icmj2gpna4qb8nzm6girrkajwda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgUmVtbWluYSBSZW1vdGUgRGVza3RvcCBDb25uZWN0aW9uc1xuXG5FYXNpbHkgc2VhcmNoIGZvciBhbmQgbGF1bmNoIGNvbm5lY3Rpb25zIHRvIHJlbW90ZSBtYWNoaW5lcyBieSBuYW1lIGFuZCBwcm90b2NvbC4iLAogICJuYW1lIjogIlJlbW1pbmEgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleG11cnJheS9yZW1taW5hLXNlYXJjaC1wcm92aWRlci8iLAogICJ1dWlkIjogInJlbW1pbmEtc2VhcmNoLXByb3ZpZGVyQGFsZXhtdXJyYXkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "42": {"version": "15", "sha256": "1z1myqwj9wmz3li7y6zlb3ma1icmj2gpna4qb8nzm6girrkajwda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgUmVtbWluYSBSZW1vdGUgRGVza3RvcCBDb25uZWN0aW9uc1xuXG5FYXNpbHkgc2VhcmNoIGZvciBhbmQgbGF1bmNoIGNvbm5lY3Rpb25zIHRvIHJlbW90ZSBtYWNoaW5lcyBieSBuYW1lIGFuZCBwcm90b2NvbC4iLAogICJuYW1lIjogIlJlbW1pbmEgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleG11cnJheS9yZW1taW5hLXNlYXJjaC1wcm92aWRlci8iLAogICJ1dWlkIjogInJlbW1pbmEtc2VhcmNoLXByb3ZpZGVyQGFsZXhtdXJyYXkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "43": {"version": "16", "sha256": "0mlbda3rln4fr4i9hzy36xkfw8xnr3y5q6rc3zvv1nz24zavzlhc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgUmVtbWluYSBSZW1vdGUgRGVza3RvcCBDb25uZWN0aW9uc1xuXG5FYXNpbHkgc2VhcmNoIGZvciBhbmQgbGF1bmNoIGNvbm5lY3Rpb25zIHRvIHJlbW90ZSBtYWNoaW5lcyBieSBuYW1lIGFuZCBwcm90b2NvbC4iLAogICJuYW1lIjogIlJlbW1pbmEgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsZXhtdXJyYXkvcmVtbWluYS1zZWFyY2gtcHJvdmlkZXIvIiwKICAidXVpZCI6ICJyZW1taW5hLXNlYXJjaC1wcm92aWRlckBhbGV4bXVycmF5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} , {"uuid": "uptime-indicator@gniourfgniourf.gmail.com", "name": "Uptime Indicator", "pname": "uptime-indicator", "description": "Indicates uptime in status area. When clicked, a popup menu indicates the date when the system was started.", "link": "https://extensions.gnome.org/extension/508/uptime-indicator/", "shell_version_map": {"38": {"version": "20", "sha256": "0hw8z7l0d8p2fmd8sv8bdgvhwzj9asackcjav0hx9hjfkvqs625k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRlcyB1cHRpbWUgaW4gc3RhdHVzIGFyZWEuIFdoZW4gY2xpY2tlZCwgYSBwb3B1cCBtZW51IGluZGljYXRlcyB0aGUgZGF0ZSB3aGVuIHRoZSBzeXN0ZW0gd2FzIHN0YXJ0ZWQuIiwKICAibmFtZSI6ICJVcHRpbWUgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR25pb3VyZi9VcHRpbWUtSW5kaWNhdG9yIiwKICAidXVpZCI6ICJ1cHRpbWUtaW5kaWNhdG9yQGduaW91cmZnbmlvdXJmLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "20", "sha256": "0hw8z7l0d8p2fmd8sv8bdgvhwzj9asackcjav0hx9hjfkvqs625k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRlcyB1cHRpbWUgaW4gc3RhdHVzIGFyZWEuIFdoZW4gY2xpY2tlZCwgYSBwb3B1cCBtZW51IGluZGljYXRlcyB0aGUgZGF0ZSB3aGVuIHRoZSBzeXN0ZW0gd2FzIHN0YXJ0ZWQuIiwKICAibmFtZSI6ICJVcHRpbWUgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR25pb3VyZi9VcHRpbWUtSW5kaWNhdG9yIiwKICAidXVpZCI6ICJ1cHRpbWUtaW5kaWNhdG9yQGduaW91cmZnbmlvdXJmLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "42": {"version": "20", "sha256": "0hw8z7l0d8p2fmd8sv8bdgvhwzj9asackcjav0hx9hjfkvqs625k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRlcyB1cHRpbWUgaW4gc3RhdHVzIGFyZWEuIFdoZW4gY2xpY2tlZCwgYSBwb3B1cCBtZW51IGluZGljYXRlcyB0aGUgZGF0ZSB3aGVuIHRoZSBzeXN0ZW0gd2FzIHN0YXJ0ZWQuIiwKICAibmFtZSI6ICJVcHRpbWUgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR25pb3VyZi9VcHRpbWUtSW5kaWNhdG9yIiwKICAidXVpZCI6ICJ1cHRpbWUtaW5kaWNhdG9yQGduaW91cmZnbmlvdXJmLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "43": {"version": "20", "sha256": "0hw8z7l0d8p2fmd8sv8bdgvhwzj9asackcjav0hx9hjfkvqs625k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRlcyB1cHRpbWUgaW4gc3RhdHVzIGFyZWEuIFdoZW4gY2xpY2tlZCwgYSBwb3B1cCBtZW51IGluZGljYXRlcyB0aGUgZGF0ZSB3aGVuIHRoZSBzeXN0ZW0gd2FzIHN0YXJ0ZWQuIiwKICAibmFtZSI6ICJVcHRpbWUgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR25pb3VyZi9VcHRpbWUtSW5kaWNhdG9yIiwKICAidXVpZCI6ICJ1cHRpbWUtaW5kaWNhdG9yQGduaW91cmZnbmlvdXJmLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}}} , {"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": "42", "sha256": "1bg5kvkf6kic1cp8r3h2h1qzyhnk0625b1gln6jxjfnygna9n197", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VvbnBhdGFwb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNhZmZlaW5lIiwKICAidXVpZCI6ICJjYWZmZWluZUBwYXRhcG9uLmluZm8iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, "41": {"version": "42", "sha256": "1bg5kvkf6kic1cp8r3h2h1qzyhnk0625b1gln6jxjfnygna9n197", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VvbnBhdGFwb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNhZmZlaW5lIiwKICAidXVpZCI6ICJjYWZmZWluZUBwYXRhcG9uLmluZm8iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, "42": {"version": "42", "sha256": "1bg5kvkf6kic1cp8r3h2h1qzyhnk0625b1gln6jxjfnygna9n197", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VvbnBhdGFwb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNhZmZlaW5lIiwKICAidXVpZCI6ICJjYWZmZWluZUBwYXRhcG9uLmluZm8iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, "43": {"version": "42", "sha256": "1bg5kvkf6kic1cp8r3h2h1qzyhnk0625b1gln6jxjfnygna9n197", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VvbnBhdGFwb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNhZmZlaW5lIiwKICAidXVpZCI6ICJjYWZmZWluZUBwYXRhcG9uLmluZm8iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}}} -, {"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"}, "42": {"version": "26", "sha256": "0yiw8il1n49pr97gp0xfkq450w2hk6x5r4860388nmpy07p73p8l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vYml0YnVja2V0Lm9yZy9MdWthc0tudXRoL2JhY2tzbGlkZSIsCiAgInV1aWQiOiAiYmFja3NsaWRlQGNvZGVpc2xhbmQub3JnIiwKICAidmVyc2lvbiI6IDI2Cn0="}}} +, {"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": "155fpm71cfy23xj9pz0n7299vc4rdfkd5mjgg55vkz8wh76xbc7d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3A5MXBhdWwvQmFja1NsaWRlIiwKICAidXVpZCI6ICJiYWNrc2xpZGVAY29kZWlzbGFuZC5vcmciLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "40": {"version": "24", "sha256": "0an1w35sbv5w7826xa3k8nl8hc3krxkzc8nhvgcp48z75n2wdksl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvTHVrYXNLbnV0aC9iYWNrc2xpZGUiLAogICJ1dWlkIjogImJhY2tzbGlkZUBjb2RlaXNsYW5kLm9yZyIsCiAgInZlcnNpb24iOiAyNAp9"}, "41": {"version": "24", "sha256": "0an1w35sbv5w7826xa3k8nl8hc3krxkzc8nhvgcp48z75n2wdksl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvTHVrYXNLbnV0aC9iYWNrc2xpZGUiLAogICJ1dWlkIjogImJhY2tzbGlkZUBjb2RlaXNsYW5kLm9yZyIsCiAgInZlcnNpb24iOiAyNAp9"}, "42": {"version": "26", "sha256": "0yiw8il1n49pr97gp0xfkq450w2hk6x5r4860388nmpy07p73p8l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vYml0YnVja2V0Lm9yZy9MdWthc0tudXRoL2JhY2tzbGlkZSIsCiAgInV1aWQiOiAiYmFja3NsaWRlQGNvZGVpc2xhbmQub3JnIiwKICAidmVyc2lvbiI6IDI2Cn0="}, "43": {"version": "27", "sha256": "00lyf80h6g9p3c79k50b5vhv176k7d2snhyb5q2vlp0mg2rp8n6w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wOTFwYXVsL0JhY2tTbGlkZSIsCiAgInV1aWQiOiAiYmFja3NsaWRlQGNvZGVpc2xhbmQub3JnIiwKICAidmVyc2lvbiI6IDI3Cn0="}}} , {"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": "109", "sha256": "1zbgbrsp8wrwl2slgh52qaqmalzzk2bzlzcdjdya24wgjc1bf0ps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDEwOQp9"}, "40": {"version": "109", "sha256": "1zbgbrsp8wrwl2slgh52qaqmalzzk2bzlzcdjdya24wgjc1bf0ps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDEwOQp9"}, "41": {"version": "109", "sha256": "1zbgbrsp8wrwl2slgh52qaqmalzzk2bzlzcdjdya24wgjc1bf0ps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDEwOQp9"}, "42": {"version": "109", "sha256": "1zbgbrsp8wrwl2slgh52qaqmalzzk2bzlzcdjdya24wgjc1bf0ps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDEwOQp9"}, "43": {"version": "109", "sha256": "1zbgbrsp8wrwl2slgh52qaqmalzzk2bzlzcdjdya24wgjc1bf0ps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDEwOQp9"}}} +, {"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": "111", "sha256": "0gxg9sk3zpl7azhyyp5xb9hmlh604mpaf7hv6va2c5zpmbvhmrwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMQp9"}, "40": {"version": "111", "sha256": "0gxg9sk3zpl7azhyyp5xb9hmlh604mpaf7hv6va2c5zpmbvhmrwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMQp9"}, "41": {"version": "111", "sha256": "0gxg9sk3zpl7azhyyp5xb9hmlh604mpaf7hv6va2c5zpmbvhmrwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMQp9"}, "42": {"version": "111", "sha256": "0gxg9sk3zpl7azhyyp5xb9hmlh604mpaf7hv6va2c5zpmbvhmrwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMQp9"}, "43": {"version": "111", "sha256": "0gxg9sk3zpl7azhyyp5xb9hmlh604mpaf7hv6va2c5zpmbvhmrwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMQp9"}}} , {"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": "25", "sha256": "0nxn93jxagzld6x0rxi56q1y8lcjzh2p82jhxli90cg940w38jj9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSGVicmV3IERhdGUgaW4gdGhlIFBhbmVsLlxuUmVxdWlyZXMgbGliaGRhdGUtZ2xpYiIsCiAgIm5hbWUiOiAiR25vbWUgSERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWlhZC9nbm9tZS1oZGF0ZSIsCiAgInV1aWQiOiAiaGRhdGVAaGF0dWwuaW5mbyIsCiAgInZlcnNpb24iOiAyNQp9"}, "41": {"version": "25", "sha256": "0nxn93jxagzld6x0rxi56q1y8lcjzh2p82jhxli90cg940w38jj9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSGVicmV3IERhdGUgaW4gdGhlIFBhbmVsLlxuUmVxdWlyZXMgbGliaGRhdGUtZ2xpYiIsCiAgIm5hbWUiOiAiR25vbWUgSERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWlhZC9nbm9tZS1oZGF0ZSIsCiAgInV1aWQiOiAiaGRhdGVAaGF0dWwuaW5mbyIsCiAgInZlcnNpb24iOiAyNQp9"}, "42": {"version": "25", "sha256": "0nxn93jxagzld6x0rxi56q1y8lcjzh2p82jhxli90cg940w38jj9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSGVicmV3IERhdGUgaW4gdGhlIFBhbmVsLlxuUmVxdWlyZXMgbGliaGRhdGUtZ2xpYiIsCiAgIm5hbWUiOiAiR25vbWUgSERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWlhZC9nbm9tZS1oZGF0ZSIsCiAgInV1aWQiOiAiaGRhdGVAaGF0dWwuaW5mbyIsCiAgInZlcnNpb24iOiAyNQp9"}, "43": {"version": "25", "sha256": "0nxn93jxagzld6x0rxi56q1y8lcjzh2p82jhxli90cg940w38jj9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSGVicmV3IERhdGUgaW4gdGhlIFBhbmVsLlxuUmVxdWlyZXMgbGliaGRhdGUtZ2xpYiIsCiAgIm5hbWUiOiAiR25vbWUgSERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWlhZC9nbm9tZS1oZGF0ZSIsCiAgInV1aWQiOiAiaGRhdGVAaGF0dWwuaW5mbyIsCiAgInZlcnNpb24iOiAyNQp9"}}} -, {"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/todo.txt-gnome-shell-extension/todo-txt-gnome-shell-extension/-/blob/master/CHANGELOG.md", "link": "https://extensions.gnome.org/extension/570/todotxt/", "shell_version_map": {"38": {"version": "33", "sha256": "1b0482ibbsvi4bhkl6a8gr0kv63cnbgaim02ysi0plqg4bcirxk2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgIm5hbWUiOiAiVG9kby50eHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS90b2RvLnR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24vdG9kby10eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0b2RvLnR4dEBiYXJ0LmxpYmVydC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "40": {"version": "35", "sha256": "1f6gbsh6gs1kv0clgw9is7wg9cb8dr960ll7mk07s9jd2gxymsdq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgIm5hbWUiOiAiVG9kby50eHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidG9kby50eHRAYmFydC5saWJlcnQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM1Cn0="}, "41": {"version": "37", "sha256": "19n83bachj4b6lvfsp6j4gpgm9wahxlz1is2954hw4d45m5yzfbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgIm5hbWUiOiAiVG9kby50eHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"}, "42": {"version": "37", "sha256": "19n83bachj4b6lvfsp6j4gpgm9wahxlz1is2954hw4d45m5yzfbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgIm5hbWUiOiAiVG9kby50eHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"}, "43": {"version": "38", "sha256": "1wm73prlixvy835985rnjaclvdc3v9lcy70pnr3l6cm0mx10d36h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgImdldHRleHQtZG9tYWluIjogInRvZG90eHQiLAogICJuYW1lIjogIlRvZG8udHh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"}}} +, {"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/todo.txt-gnome-shell-extension/todo-txt-gnome-shell-extension/-/blob/master/CHANGELOG.md", "link": "https://extensions.gnome.org/extension/570/todotxt/", "shell_version_map": {"38": {"version": "33", "sha256": "1b0482ibbsvi4bhkl6a8gr0kv63cnbgaim02ysi0plqg4bcirxk2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgIm5hbWUiOiAiVG9kby50eHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS90b2RvLnR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24vdG9kby10eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0b2RvLnR4dEBiYXJ0LmxpYmVydC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "40": {"version": "35", "sha256": "1f6gbsh6gs1kv0clgw9is7wg9cb8dr960ll7mk07s9jd2gxymsdq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgIm5hbWUiOiAiVG9kby50eHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidG9kby50eHRAYmFydC5saWJlcnQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM1Cn0="}, "41": {"version": "37", "sha256": "19n83bachj4b6lvfsp6j4gpgm9wahxlz1is2954hw4d45m5yzfbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgIm5hbWUiOiAiVG9kby50eHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"}, "42": {"version": "37", "sha256": "19n83bachj4b6lvfsp6j4gpgm9wahxlz1is2954hw4d45m5yzfbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgIm5hbWUiOiAiVG9kby50eHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"}, "43": {"version": "39", "sha256": "1kys4rhjzz42z6mz20a2sxzzrndgvl8r2ff1zwf0wanbc6af8ln0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgImdldHRleHQtZG9tYWluIjogInRvZG90eHQiLAogICJuYW1lIjogIlRvZG8udHh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"}}} , {"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": "33", "sha256": "0xk1gawp9rkvfzbnmkw9z0s7cgaaghdrjxsx5hfjqm6bkmi0ngyd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhdXRvaGlkZS1iYXR0ZXJ5IiwKICAibmFtZSI6ICJBdXRvaGlkZSBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2F1dG9oaWRlLWJhdHRlcnkiLAogICJ1dWlkIjogImF1dG9oaWRlLWJhdHRlcnlAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDMzCn0="}, "41": {"version": "33", "sha256": "0xk1gawp9rkvfzbnmkw9z0s7cgaaghdrjxsx5hfjqm6bkmi0ngyd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhdXRvaGlkZS1iYXR0ZXJ5IiwKICAibmFtZSI6ICJBdXRvaGlkZSBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2F1dG9oaWRlLWJhdHRlcnkiLAogICJ1dWlkIjogImF1dG9oaWRlLWJhdHRlcnlAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDMzCn0="}, "42": {"version": "33", "sha256": "0xk1gawp9rkvfzbnmkw9z0s7cgaaghdrjxsx5hfjqm6bkmi0ngyd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhdXRvaGlkZS1iYXR0ZXJ5IiwKICAibmFtZSI6ICJBdXRvaGlkZSBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2F1dG9oaWRlLWJhdHRlcnkiLAogICJ1dWlkIjogImF1dG9oaWRlLWJhdHRlcnlAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDMzCn0="}, "43": {"version": "33", "sha256": "0xk1gawp9rkvfzbnmkw9z0s7cgaaghdrjxsx5hfjqm6bkmi0ngyd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhdXRvaGlkZS1iYXR0ZXJ5IiwKICAibmFtZSI6ICJBdXRvaGlkZSBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2F1dG9oaWRlLWJhdHRlcnkiLAogICJ1dWlkIjogImF1dG9oaWRlLWJhdHRlcnlAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDMzCn0="}}} +, {"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": "35", "sha256": "13r59ncyq05v0z6497g21pawgyky9yfgf9i94khcifr2zspnls8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhdXRvaGlkZS1iYXR0ZXJ5IiwKICAibmFtZSI6ICJBdXRvaGlkZSBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2F1dG9oaWRlLWJhdHRlcnkiLAogICJ1dWlkIjogImF1dG9oaWRlLWJhdHRlcnlAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDM1Cn0="}, "41": {"version": "35", "sha256": "13r59ncyq05v0z6497g21pawgyky9yfgf9i94khcifr2zspnls8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhdXRvaGlkZS1iYXR0ZXJ5IiwKICAibmFtZSI6ICJBdXRvaGlkZSBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2F1dG9oaWRlLWJhdHRlcnkiLAogICJ1dWlkIjogImF1dG9oaWRlLWJhdHRlcnlAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDM1Cn0="}, "42": {"version": "35", "sha256": "13r59ncyq05v0z6497g21pawgyky9yfgf9i94khcifr2zspnls8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhdXRvaGlkZS1iYXR0ZXJ5IiwKICAibmFtZSI6ICJBdXRvaGlkZSBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2F1dG9oaWRlLWJhdHRlcnkiLAogICJ1dWlkIjogImF1dG9oaWRlLWJhdHRlcnlAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDM1Cn0="}, "43": {"version": "35", "sha256": "13r59ncyq05v0z6497g21pawgyky9yfgf9i94khcifr2zspnls8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhdXRvaGlkZS1iYXR0ZXJ5IiwKICAibmFtZSI6ICJBdXRvaGlkZSBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2F1dG9oaWRlLWJhdHRlcnkiLAogICJ1dWlkIjogImF1dG9oaWRlLWJhdHRlcnlAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDM1Cn0="}}} , {"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=="}, "43": {"version": "35", "sha256": "1i96p4jzi3yfkccbzv7r7x059xr834wispzg1n2888im51zz6x4h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}}} , {"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": "46", "sha256": "12h8601f1hl4cfr3gh9pykibb9lh7l0v01s80cjz0lc72c64j9qz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDYKfQ=="}, "43": {"version": "47", "sha256": "1nzdl0zb8i7wipsnnrixkpj6rrsv3vz4c1snqspb23h494232wmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDcKfQ=="}}} , {"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="}}} @@ -51,10 +51,10 @@ , {"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": "69", "sha256": "1kpsqaq2fcj1z3jcbvgh23c8k6bv9l6vyl05kpw0fclzsmy60mh1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdGlsaW5nIHdpbmRvdyBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBKdXN0IG1vdmUgYSB3aW5kb3cgdG8gdGhlIGVkZ2VzIG9mIHRoZSBzY3JlZW4gdG8gY3JlYXRlIGEgdGlsaW5nLCBvdGhlcndpc2UgbW92ZSBhIHdpbmRvdyBvdmVyIGFub3RoZXIgb25lLCBob2xkaW5nIGRvd24gdGhlIENvbnRyb2wga2V5LiBHcm91cGVkIHdpbmRvd3MgbWluaW1pemUsIHJlc2l6ZSwgcmFpc2UgYW5kIGNoYW5nZSB3b3Jrc3BhY2UgdG9nZXRoZXIuIE1vdmUgb3IgbWF4aW1pemUgYSB3aW5kb3cgdG8gcmVtb3ZlIGl0IGZyb20gdGhlIGdyb3VwLiIsCiAgImdldHRleHQtZG9tYWluIjogInNoZWxsdGlsZSIsCiAgIm5hbWUiOiAiU2hlbGxUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNoZWxsdGlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZW1hc2FiL3NoZWxsdGlsZSIsCiAgInV1aWQiOiAiU2hlbGxUaWxlQGVtYXNhYi5pdCIsCiAgInZlcnNpb24iOiA2OQp9"}}} , {"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": "30", "sha256": "0k8740vjail6ld8vgq3ilbkz2kzjfzwaaah8l3dzn5spvfsmgmb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDMwCn0="}, "41": {"version": "30", "sha256": "0k8740vjail6ld8vgq3ilbkz2kzjfzwaaah8l3dzn5spvfsmgmb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDMwCn0="}, "42": {"version": "30", "sha256": "0k8740vjail6ld8vgq3ilbkz2kzjfzwaaah8l3dzn5spvfsmgmb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDMwCn0="}, "43": {"version": "30", "sha256": "0k8740vjail6ld8vgq3ilbkz2kzjfzwaaah8l3dzn5spvfsmgmb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDMwCn0="}}} , {"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": "46", "sha256": "1hg4148gi2zpwba8x0vxibz7n4zqm1xn7cpl9mr9cinr9m2ixrl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FYXN5U2NyZWVuQ2FzdC9FYXN5U2NyZWVuQ2FzdCIsCiAgInV1aWQiOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "40": {"version": "46", "sha256": "1hg4148gi2zpwba8x0vxibz7n4zqm1xn7cpl9mr9cinr9m2ixrl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FYXN5U2NyZWVuQ2FzdC9FYXN5U2NyZWVuQ2FzdCIsCiAgInV1aWQiOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "41": {"version": "46", "sha256": "1hg4148gi2zpwba8x0vxibz7n4zqm1xn7cpl9mr9cinr9m2ixrl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FYXN5U2NyZWVuQ2FzdC9FYXN5U2NyZWVuQ2FzdCIsCiAgInV1aWQiOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "42": {"version": "46", "sha256": "1hg4148gi2zpwba8x0vxibz7n4zqm1xn7cpl9mr9cinr9m2ixrl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FYXN5U2NyZWVuQ2FzdC9FYXN5U2NyZWVuQ2FzdCIsCiAgInV1aWQiOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "43": {"version": "46", "sha256": "1hg4148gi2zpwba8x0vxibz7n4zqm1xn7cpl9mr9cinr9m2ixrl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FYXN5U2NyZWVuQ2FzdC9FYXN5U2NyZWVuQ2FzdCIsCiAgInV1aWQiOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}}} -, {"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": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="}, "41": {"version": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="}, "42": {"version": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="}, "43": {"version": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="}}} +, {"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": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="}, "41": {"version": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="}, "42": {"version": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="}, "43": {"version": "33", "sha256": "00khagznqp07ac392zjnccw0qnz1v8zy6m7mz1mwflqbgz18ki6p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMzCn0="}}} , {"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": "I'm sorry to say, that I am not able to work on this project anymore.\nI simply don't have the power to do it any longer.\nIf anybody wants to take it over, feel free to fork it.\nBest wishes to all the users.\n\nJens\n\nConfiguring 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": "12mv6fcaanv6r3zrf7717jqzq5mndy25gqh6y7hqh9cmyssakis2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkknbSBzb3JyeSB0byBzYXksIHRoYXQgSSBhbSBub3QgYWJsZSB0byB3b3JrIG9uIHRoaXMgcHJvamVjdCBhbnltb3JlLlxuSSBzaW1wbHkgZG9uJ3QgaGF2ZSB0aGUgcG93ZXIgdG8gZG8gaXQgYW55IGxvbmdlci5cbklmIGFueWJvZHkgd2FudHMgdG8gdGFrZSBpdCBvdmVyLCBmZWVsIGZyZWUgdG8gZm9yayBpdC5cbkJlc3Qgd2lzaGVzIHRvIGFsbCB0aGUgdXNlcnMuXG5cbkplbnNcblxuQ29uZmlndXJpbmcgd2hlcmUgb24gdGhlIChtYWluKSBzY3JlZW4gbm90aWZpY2F0aW9ucyB3aWxsIGFwcGVhciwgaW5zdGVhZCBvZiBqdXN0IGFib3ZlIHRoZSBtZXNzYWdlIHRyYXkiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlBhbmVsIE9TRCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2plbnNsb2R5L2dub21lLXNoZWxsLWV4dGVuc2lvbi1wYW5lbC1vc2QiLAogICJ1dWlkIjogInBhbmVsLW9zZEBiZXJlbmQuZGUuc2Nob3V3ZXIuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM5Cn0="}, "40": {"version": "40", "sha256": "16bqq0w6xrzix74xwhj2pyj22scszvspc770w1pkdhmj54mypwks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkknbSBzb3JyeSB0byBzYXksIHRoYXQgSSBhbSBub3QgYWJsZSB0byB3b3JrIG9uIHRoaXMgcHJvamVjdCBhbnltb3JlLlxuSSBzaW1wbHkgZG9uJ3QgaGF2ZSB0aGUgcG93ZXIgdG8gZG8gaXQgYW55IGxvbmdlci5cbklmIGFueWJvZHkgd2FudHMgdG8gdGFrZSBpdCBvdmVyLCBmZWVsIGZyZWUgdG8gZm9yayBpdC5cbkJlc3Qgd2lzaGVzIHRvIGFsbCB0aGUgdXNlcnMuXG5cbkplbnNcblxuQ29uZmlndXJpbmcgd2hlcmUgb24gdGhlIChtYWluKSBzY3JlZW4gbm90aWZpY2F0aW9ucyB3aWxsIGFwcGVhciwgaW5zdGVhZCBvZiBqdXN0IGFib3ZlIHRoZSBtZXNzYWdlIHRyYXkiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlBhbmVsIE9TRCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qZW5zbG9keS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGFuZWwtb3NkIiwKICAidXVpZCI6ICJwYW5lbC1vc2RAYmVyZW5kLmRlLnNjaG91d2VyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MAp9"}}} -, {"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": "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": "28", "sha256": "11bd2ngn359q5858cd1r2v15lcxn7xlgpxr0jjzakj4v4g6zda85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlYWRhbG5peC9waXhlbC1zYXZlciIsCiAgInV1aWQiOiAicGl4ZWwtc2F2ZXJAZGVhZGFsbml4Lm1lIiwKICAidmVyc2lvbiI6IDI4Cn0="}, "40": {"version": "28", "sha256": "11bd2ngn359q5858cd1r2v15lcxn7xlgpxr0jjzakj4v4g6zda85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlYWRhbG5peC9waXhlbC1zYXZlciIsCiAgInV1aWQiOiAicGl4ZWwtc2F2ZXJAZGVhZGFsbml4Lm1lIiwKICAidmVyc2lvbiI6IDI4Cn0="}, "41": {"version": "28", "sha256": "11bd2ngn359q5858cd1r2v15lcxn7xlgpxr0jjzakj4v4g6zda85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlYWRhbG5peC9waXhlbC1zYXZlciIsCiAgInV1aWQiOiAicGl4ZWwtc2F2ZXJAZGVhZGFsbml4Lm1lIiwKICAidmVyc2lvbiI6IDI4Cn0="}, "42": {"version": "28", "sha256": "11bd2ngn359q5858cd1r2v15lcxn7xlgpxr0jjzakj4v4g6zda85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlYWRhbG5peC9waXhlbC1zYXZlciIsCiAgInV1aWQiOiAicGl4ZWwtc2F2ZXJAZGVhZGFsbml4Lm1lIiwKICAidmVyc2lvbiI6IDI4Cn0="}, "43": {"version": "28", "sha256": "11bd2ngn359q5858cd1r2v15lcxn7xlgpxr0jjzakj4v4g6zda85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlYWRhbG5peC9waXhlbC1zYXZlciIsCiAgInV1aWQiOiAicGl4ZWwtc2F2ZXJAZGVhZGFsbml4Lm1lIiwKICAidmVyc2lvbiI6IDI4Cn0="}}} , {"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": "14", "sha256": "107877grdyzvqfysw8cal0dfx93amw6gww9wqmw3w6a6qpqq3fch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFRvIGRpc2FibGUgdG9wIGxlZnQgaG90IGNvcm5lciB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuIiwKICAibmFtZSI6ICJIaWRlIEFjdGl2aXRpZXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJIaWRlX0FjdGl2aXRpZXNAc2hheS5zaGF5ZWwub3JnIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "40": {"version": "14", "sha256": "107877grdyzvqfysw8cal0dfx93amw6gww9wqmw3w6a6qpqq3fch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFRvIGRpc2FibGUgdG9wIGxlZnQgaG90IGNvcm5lciB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuIiwKICAibmFtZSI6ICJIaWRlIEFjdGl2aXRpZXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJIaWRlX0FjdGl2aXRpZXNAc2hheS5zaGF5ZWwub3JnIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "107877grdyzvqfysw8cal0dfx93amw6gww9wqmw3w6a6qpqq3fch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFRvIGRpc2FibGUgdG9wIGxlZnQgaG90IGNvcm5lciB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuIiwKICAibmFtZSI6ICJIaWRlIEFjdGl2aXRpZXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJIaWRlX0FjdGl2aXRpZXNAc2hheS5zaGF5ZWwub3JnIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "14", "sha256": "107877grdyzvqfysw8cal0dfx93amw6gww9wqmw3w6a6qpqq3fch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFRvIGRpc2FibGUgdG9wIGxlZnQgaG90IGNvcm5lciB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuIiwKICAibmFtZSI6ICJIaWRlIEFjdGl2aXRpZXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJIaWRlX0FjdGl2aXRpZXNAc2hheS5zaGF5ZWwub3JnIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "43": {"version": "14", "sha256": "107877grdyzvqfysw8cal0dfx93amw6gww9wqmw3w6a6qpqq3fch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFRvIGRpc2FibGUgdG9wIGxlZnQgaG90IGNvcm5lciB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuIiwKICAibmFtZSI6ICJIaWRlIEFjdGl2aXRpZXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJIaWRlX0FjdGl2aXRpZXNAc2hheS5zaGF5ZWwub3JnIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} , {"uuid": "openweather-extension@jenslody.de", "name": "OpenWeather", "pname": "openweather", "description": "Display weather information for any location on Earth in the GNOME Shell\n\nIf you get an ERROR after update:\n- Restart the GNOME shell (log out)\n- or Reboot completely", "link": "https://extensions.gnome.org/extension/750/openweather/", "shell_version_map": {"38": {"version": "105", "sha256": "197a7gr16x40kfq02zv1csc84kbah2z1183cs5qj4a4czgw6nmh3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBpbmZvcm1hdGlvbiBmb3IgYW55IGxvY2F0aW9uIG9uIEVhcnRoIGluIHRoZSBHTk9NRSBTaGVsbFxuXG5JZiB5b3UgZ2V0IGFuIEVSUk9SIGFmdGVyIHVwZGF0ZTpcbi0gUmVzdGFydCB0aGUgR05PTUUgc2hlbGwgKGxvZyBvdXQpXG4tIG9yIFJlYm9vdCBjb21wbGV0ZWx5IiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NrcmV3YmFsbC9vcGVud2VhdGhlciIsCiAgInV1aWQiOiAib3BlbndlYXRoZXItZXh0ZW5zaW9uQGplbnNsb2R5LmRlIiwKICAidmVyc2lvbiI6IDEwNQp9"}, "40": {"version": "114", "sha256": "01w84n4sg4knlnbbzzz3xf4f5ap4jabnzp21xdk3krkjvaabl7id", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBpbmZvcm1hdGlvbiBmb3IgYW55IGxvY2F0aW9uIG9uIEVhcnRoIGluIHRoZSBHTk9NRSBTaGVsbFxuXG5JZiB5b3UgZ2V0IGFuIEVSUk9SIGFmdGVyIHVwZGF0ZTpcbi0gUmVzdGFydCB0aGUgR05PTUUgc2hlbGwgKGxvZyBvdXQpXG4tIG9yIFJlYm9vdCBjb21wbGV0ZWx5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW9wZW53ZWF0aGVyIiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVud2VhdGhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NrcmV3YmFsbC9vcGVud2VhdGhlciIsCiAgInV1aWQiOiAib3BlbndlYXRoZXItZXh0ZW5zaW9uQGplbnNsb2R5LmRlIiwKICAidmVyc2lvbiI6IDExNAp9"}, "41": {"version": "114", "sha256": "01w84n4sg4knlnbbzzz3xf4f5ap4jabnzp21xdk3krkjvaabl7id", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBpbmZvcm1hdGlvbiBmb3IgYW55IGxvY2F0aW9uIG9uIEVhcnRoIGluIHRoZSBHTk9NRSBTaGVsbFxuXG5JZiB5b3UgZ2V0IGFuIEVSUk9SIGFmdGVyIHVwZGF0ZTpcbi0gUmVzdGFydCB0aGUgR05PTUUgc2hlbGwgKGxvZyBvdXQpXG4tIG9yIFJlYm9vdCBjb21wbGV0ZWx5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW9wZW53ZWF0aGVyIiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVud2VhdGhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NrcmV3YmFsbC9vcGVud2VhdGhlciIsCiAgInV1aWQiOiAib3BlbndlYXRoZXItZXh0ZW5zaW9uQGplbnNsb2R5LmRlIiwKICAidmVyc2lvbiI6IDExNAp9"}, "42": {"version": "118", "sha256": "0c39iq30sb6y1z6c0n8n2qsj8ww7ww9pnaqg900f0pv06nzfmjpz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBpbmZvcm1hdGlvbiBmb3IgYW55IGxvY2F0aW9uIG9uIEVhcnRoIGluIHRoZSBHTk9NRSBTaGVsbFxuXG5JZiB5b3UgZ2V0IGFuIEVSUk9SIGFmdGVyIHVwZGF0ZTpcbi0gUmVzdGFydCB0aGUgR05PTUUgc2hlbGwgKGxvZyBvdXQpXG4tIG9yIFJlYm9vdCBjb21wbGV0ZWx5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW9wZW53ZWF0aGVyIiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVud2VhdGhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9za3Jld2JhbGwvb3BlbndlYXRoZXIiLAogICJ1dWlkIjogIm9wZW53ZWF0aGVyLWV4dGVuc2lvbkBqZW5zbG9keS5kZSIsCiAgInZlcnNpb24iOiAxMTgKfQ=="}, "43": {"version": "119", "sha256": "0xk3r149w2qicbvi3ljxw8av44si004fn4qifdynyqfbfr72hi0n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBpbmZvcm1hdGlvbiBmb3IgYW55IGxvY2F0aW9uIG9uIEVhcnRoIGluIHRoZSBHTk9NRSBTaGVsbFxuXG5JZiB5b3UgZ2V0IGFuIEVSUk9SIGFmdGVyIHVwZGF0ZTpcbi0gUmVzdGFydCB0aGUgR05PTUUgc2hlbGwgKGxvZyBvdXQpXG4tIG9yIFJlYm9vdCBjb21wbGV0ZWx5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW9wZW53ZWF0aGVyIiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVud2VhdGhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9za3Jld2JhbGwvb3BlbndlYXRoZXIiLAogICJ1dWlkIjogIm9wZW53ZWF0aGVyLWV4dGVuc2lvbkBqZW5zbG9keS5kZSIsCiAgInZlcnNpb24iOiAxMTkKfQ=="}}} @@ -70,9 +70,9 @@ , {"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=="}, "41": {"version": "23", "sha256": "1qvvwx0h7bakwy1a65vafy0kvlvkmy58kznzrm3zg2ng31279nfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjY2VzcyBwYXNzd29yZHMgZnJvbSB0aGUgZ25vbWUga2V5cmluZyBpbiBhIGNvbnZlbmllbnQgd2F5OlxuU2ltcGx5IHNlYXJjaCBmb3IgeW91ciBwYXNzd29yZCBhbmQgY29weSBpdCB0byBjbGlwYm9hZCBieSBjbGlja2luZyBpdC4gQWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lIGl0IHdpbGwgYmUgcmVtb3ZlZCBhdXRvbWF0aWNhbGx5IChkZWZhdWx0IGlzIDUgc2Vjb25kcykuIEFzIHRoaXMgb25seSB3b3JrcyBpZiB0aGUga2V5cmluZ3MgYXJlIHVubG9ja2VkLCB0aGlzIGV4dGVuc2lvbiBhbHNvIHByb3ZpZGVzIGVhc3kgYWNjZXNzIHRvIGxvY2svdW5sb2NrIGtleXJpbmdzLiIsCiAgIm5hbWUiOiAiS2V5TWFuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJrZXltYW5AcG9laGUuZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtleW1hbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rwb2V0enNjaC9rZXltYW4iLAogICJ1dWlkIjogImtleW1hbkBkcG9ldHpzY2guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "42": {"version": "23", "sha256": "1qvvwx0h7bakwy1a65vafy0kvlvkmy58kznzrm3zg2ng31279nfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjY2VzcyBwYXNzd29yZHMgZnJvbSB0aGUgZ25vbWUga2V5cmluZyBpbiBhIGNvbnZlbmllbnQgd2F5OlxuU2ltcGx5IHNlYXJjaCBmb3IgeW91ciBwYXNzd29yZCBhbmQgY29weSBpdCB0byBjbGlwYm9hZCBieSBjbGlja2luZyBpdC4gQWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lIGl0IHdpbGwgYmUgcmVtb3ZlZCBhdXRvbWF0aWNhbGx5IChkZWZhdWx0IGlzIDUgc2Vjb25kcykuIEFzIHRoaXMgb25seSB3b3JrcyBpZiB0aGUga2V5cmluZ3MgYXJlIHVubG9ja2VkLCB0aGlzIGV4dGVuc2lvbiBhbHNvIHByb3ZpZGVzIGVhc3kgYWNjZXNzIHRvIGxvY2svdW5sb2NrIGtleXJpbmdzLiIsCiAgIm5hbWUiOiAiS2V5TWFuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJrZXltYW5AcG9laGUuZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtleW1hbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rwb2V0enNjaC9rZXltYW4iLAogICJ1dWlkIjogImtleW1hbkBkcG9ldHpzY2guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "43": {"version": "23", "sha256": "1qvvwx0h7bakwy1a65vafy0kvlvkmy58kznzrm3zg2ng31279nfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjY2VzcyBwYXNzd29yZHMgZnJvbSB0aGUgZ25vbWUga2V5cmluZyBpbiBhIGNvbnZlbmllbnQgd2F5OlxuU2ltcGx5IHNlYXJjaCBmb3IgeW91ciBwYXNzd29yZCBhbmQgY29weSBpdCB0byBjbGlwYm9hZCBieSBjbGlja2luZyBpdC4gQWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lIGl0IHdpbGwgYmUgcmVtb3ZlZCBhdXRvbWF0aWNhbGx5IChkZWZhdWx0IGlzIDUgc2Vjb25kcykuIEFzIHRoaXMgb25seSB3b3JrcyBpZiB0aGUga2V5cmluZ3MgYXJlIHVubG9ja2VkLCB0aGlzIGV4dGVuc2lvbiBhbHNvIHByb3ZpZGVzIGVhc3kgYWNjZXNzIHRvIGxvY2svdW5sb2NrIGtleXJpbmdzLiIsCiAgIm5hbWUiOiAiS2V5TWFuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJrZXltYW5AcG9laGUuZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtleW1hbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rwb2V0enNjaC9rZXltYW4iLAogICJ1dWlkIjogImtleW1hbkBkcG9ldHpzY2guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}}} , {"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": "26", "sha256": "18n86hy3a3gs3xfw6f88rag8gpvl742j8fmd6syp4wpgpqpvv7rx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNhbGN1bGF0ZXMgc3Ryb25nIHBhc3N3b3JkcyBmb3IgZWFjaCBhbGlhcyBmcm9tIHlvdXIgc2luZ2xlIHNlY3JldC4gTm8gbmVlZCB0byByZW1lbWJlciBkb3plbnMgb2YgcGFzc3dvcmRzIGFueSBsb25nZXIuIE5vIG5lZWQgZm9yIGEgcGFzc3dvcmQgbWFuYWdlciBhbnkgbG9uZ2VyLiBGdWxsIGZyZWVkb20gaW4gY2hvb3NpbmcgYWxpYXNlcyBhbmQgc2VjcmV0LCBlLmcuIGFsaWFzOiBcInVzZXJuYW1lQGdvb2dsZS5jb20jMjAxNFwiLCBzZWNyZXQ6IFwic2FGZVx1MjZiZmluXHU2ZjIyXHU1YjU3XCIuIFJlY2VudCBhbGlhc2VzIGFyZSBrZXB0IGluIGEgZWFzaWx5IGFjY2Vzc2libGUgZHJvcC1kb3duLiBZb3UgbWF5IGNob29zZSBiZXR3ZWVuIEhNQUNfU0hBMSBhbmQgU0hBMS4gVGhlIGZvcm11bGEgaXMgYXMgc2ltcGxlIGFzIFwiW3NlY3JldF1bYWxpYXNdXCIgXHUyMTkyIFNIQTEgXHUyMTkyIEJBU0U2NCAiLAogICJuYW1lIjogIlBhc3N3b3JkIENhbGN1bGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHdjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGlsb21hdXJlci9wd2NhbGMiLAogICJ1dWlkIjogInB3Y2FsY0B0aGlsb21hdXJlci5kZSIsCiAgInZlcnNpb24iOiAyNgp9"}, "42": {"version": "26", "sha256": "18n86hy3a3gs3xfw6f88rag8gpvl742j8fmd6syp4wpgpqpvv7rx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNhbGN1bGF0ZXMgc3Ryb25nIHBhc3N3b3JkcyBmb3IgZWFjaCBhbGlhcyBmcm9tIHlvdXIgc2luZ2xlIHNlY3JldC4gTm8gbmVlZCB0byByZW1lbWJlciBkb3plbnMgb2YgcGFzc3dvcmRzIGFueSBsb25nZXIuIE5vIG5lZWQgZm9yIGEgcGFzc3dvcmQgbWFuYWdlciBhbnkgbG9uZ2VyLiBGdWxsIGZyZWVkb20gaW4gY2hvb3NpbmcgYWxpYXNlcyBhbmQgc2VjcmV0LCBlLmcuIGFsaWFzOiBcInVzZXJuYW1lQGdvb2dsZS5jb20jMjAxNFwiLCBzZWNyZXQ6IFwic2FGZVx1MjZiZmluXHU2ZjIyXHU1YjU3XCIuIFJlY2VudCBhbGlhc2VzIGFyZSBrZXB0IGluIGEgZWFzaWx5IGFjY2Vzc2libGUgZHJvcC1kb3duLiBZb3UgbWF5IGNob29zZSBiZXR3ZWVuIEhNQUNfU0hBMSBhbmQgU0hBMS4gVGhlIGZvcm11bGEgaXMgYXMgc2ltcGxlIGFzIFwiW3NlY3JldF1bYWxpYXNdXCIgXHUyMTkyIFNIQTEgXHUyMTkyIEJBU0U2NCAiLAogICJuYW1lIjogIlBhc3N3b3JkIENhbGN1bGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHdjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGlsb21hdXJlci9wd2NhbGMiLAogICJ1dWlkIjogInB3Y2FsY0B0aGlsb21hdXJlci5kZSIsCiAgInZlcnNpb24iOiAyNgp9"}}} +, {"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": "27", "sha256": "1g3i4aq5y8pjaw613gqfj58w88z5pz4j5q4jhv10n6zxb0d2k3n2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNhbGN1bGF0ZXMgc3Ryb25nIHBhc3N3b3JkcyBmb3IgZWFjaCBhbGlhcyBmcm9tIHlvdXIgc2luZ2xlIHNlY3JldC4gTm8gbmVlZCB0byByZW1lbWJlciBkb3plbnMgb2YgcGFzc3dvcmRzIGFueSBsb25nZXIuIE5vIG5lZWQgZm9yIGEgcGFzc3dvcmQgbWFuYWdlciBhbnkgbG9uZ2VyLiBGdWxsIGZyZWVkb20gaW4gY2hvb3NpbmcgYWxpYXNlcyBhbmQgc2VjcmV0LCBlLmcuIGFsaWFzOiBcInVzZXJuYW1lQGdvb2dsZS5jb20jMjAxNFwiLCBzZWNyZXQ6IFwic2FGZVx1MjZiZmluXHU2ZjIyXHU1YjU3XCIuIFJlY2VudCBhbGlhc2VzIGFyZSBrZXB0IGluIGEgZWFzaWx5IGFjY2Vzc2libGUgZHJvcC1kb3duLiBZb3UgbWF5IGNob29zZSBiZXR3ZWVuIEhNQUNfU0hBMSBhbmQgU0hBMS4gVGhlIGZvcm11bGEgaXMgYXMgc2ltcGxlIGFzIFwiW3NlY3JldF1bYWxpYXNdXCIgXHUyMTkyIFNIQTEgXHUyMTkyIEJBU0U2NCAiLAogICJuYW1lIjogIlBhc3N3b3JkIENhbGN1bGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHdjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGhpbG9tYXVyZXIvcHdjYWxjIiwKICAidXVpZCI6ICJwd2NhbGNAdGhpbG9tYXVyZXIuZGUiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "42": {"version": "27", "sha256": "1g3i4aq5y8pjaw613gqfj58w88z5pz4j5q4jhv10n6zxb0d2k3n2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNhbGN1bGF0ZXMgc3Ryb25nIHBhc3N3b3JkcyBmb3IgZWFjaCBhbGlhcyBmcm9tIHlvdXIgc2luZ2xlIHNlY3JldC4gTm8gbmVlZCB0byByZW1lbWJlciBkb3plbnMgb2YgcGFzc3dvcmRzIGFueSBsb25nZXIuIE5vIG5lZWQgZm9yIGEgcGFzc3dvcmQgbWFuYWdlciBhbnkgbG9uZ2VyLiBGdWxsIGZyZWVkb20gaW4gY2hvb3NpbmcgYWxpYXNlcyBhbmQgc2VjcmV0LCBlLmcuIGFsaWFzOiBcInVzZXJuYW1lQGdvb2dsZS5jb20jMjAxNFwiLCBzZWNyZXQ6IFwic2FGZVx1MjZiZmluXHU2ZjIyXHU1YjU3XCIuIFJlY2VudCBhbGlhc2VzIGFyZSBrZXB0IGluIGEgZWFzaWx5IGFjY2Vzc2libGUgZHJvcC1kb3duLiBZb3UgbWF5IGNob29zZSBiZXR3ZWVuIEhNQUNfU0hBMSBhbmQgU0hBMS4gVGhlIGZvcm11bGEgaXMgYXMgc2ltcGxlIGFzIFwiW3NlY3JldF1bYWxpYXNdXCIgXHUyMTkyIFNIQTEgXHUyMTkyIEJBU0U2NCAiLAogICJuYW1lIjogIlBhc3N3b3JkIENhbGN1bGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHdjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGhpbG9tYXVyZXIvcHdjYWxjIiwKICAidXVpZCI6ICJwd2NhbGNAdGhpbG9tYXVyZXIuZGUiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "43": {"version": "27", "sha256": "1g3i4aq5y8pjaw613gqfj58w88z5pz4j5q4jhv10n6zxb0d2k3n2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNhbGN1bGF0ZXMgc3Ryb25nIHBhc3N3b3JkcyBmb3IgZWFjaCBhbGlhcyBmcm9tIHlvdXIgc2luZ2xlIHNlY3JldC4gTm8gbmVlZCB0byByZW1lbWJlciBkb3plbnMgb2YgcGFzc3dvcmRzIGFueSBsb25nZXIuIE5vIG5lZWQgZm9yIGEgcGFzc3dvcmQgbWFuYWdlciBhbnkgbG9uZ2VyLiBGdWxsIGZyZWVkb20gaW4gY2hvb3NpbmcgYWxpYXNlcyBhbmQgc2VjcmV0LCBlLmcuIGFsaWFzOiBcInVzZXJuYW1lQGdvb2dsZS5jb20jMjAxNFwiLCBzZWNyZXQ6IFwic2FGZVx1MjZiZmluXHU2ZjIyXHU1YjU3XCIuIFJlY2VudCBhbGlhc2VzIGFyZSBrZXB0IGluIGEgZWFzaWx5IGFjY2Vzc2libGUgZHJvcC1kb3duLiBZb3UgbWF5IGNob29zZSBiZXR3ZWVuIEhNQUNfU0hBMSBhbmQgU0hBMS4gVGhlIGZvcm11bGEgaXMgYXMgc2ltcGxlIGFzIFwiW3NlY3JldF1bYWxpYXNdXCIgXHUyMTkyIFNIQTEgXHUyMTkyIEJBU0U2NCAiLAogICJuYW1lIjogIlBhc3N3b3JkIENhbGN1bGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHdjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGhpbG9tYXVyZXIvcHdjYWxjIiwKICAidXVpZCI6ICJwd2NhbGNAdGhpbG9tYXVyZXIuZGUiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}}} , {"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": "10", "sha256": "120x66v9xfpfn2a3nd907khh560695104ghjs84kgwjh65ah0cc4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SbWFuby9nc2Utc3dpdGNoLWZvY3VzLW1vZGUiLAogICJ1dWlkIjogIlN3aXRjaEZvY3VzVHlwZUByb21hbm8ucmd0dGkuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "10", "sha256": "120x66v9xfpfn2a3nd907khh560695104ghjs84kgwjh65ah0cc4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SbWFuby9nc2Utc3dpdGNoLWZvY3VzLW1vZGUiLAogICJ1dWlkIjogIlN3aXRjaEZvY3VzVHlwZUByb21hbm8ucmd0dGkuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "120x66v9xfpfn2a3nd907khh560695104ghjs84kgwjh65ah0cc4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SbWFuby9nc2Utc3dpdGNoLWZvY3VzLW1vZGUiLAogICJ1dWlkIjogIlN3aXRjaEZvY3VzVHlwZUByb21hbm8ucmd0dGkuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "120x66v9xfpfn2a3nd907khh560695104ghjs84kgwjh65ah0cc4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SbWFuby9nc2Utc3dpdGNoLWZvY3VzLW1vZGUiLAogICJ1dWlkIjogIlN3aXRjaEZvY3VzVHlwZUByb21hbm8ucmd0dGkuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "43": {"version": "10", "sha256": "120x66v9xfpfn2a3nd907khh560695104ghjs84kgwjh65ah0cc4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SbWFuby9nc2Utc3dpdGNoLWZvY3VzLW1vZGUiLAogICJ1dWlkIjogIlN3aXRjaEZvY3VzVHlwZUByb21hbm8ucmd0dGkuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} -, {"uuid": "radio@hslbck.gmail.com", "name": "Internet Radio", "pname": "internet-radio", "description": "Listen to an Internet Radio Stream", "link": "https://extensions.gnome.org/extension/836/internet-radio/", "shell_version_map": {"38": {"version": "14", "sha256": "013wbf3npz7f438i39cd41s6whs4lgaigv4i1zais994n9ybw5y9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBhbiBJbnRlcm5ldCBSYWRpbyBTdHJlYW0iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyYWRpb0Boc2xiY2suZ21haWwuY29tIiwKICAibmFtZSI6ICJJbnRlcm5ldCBSYWRpbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hzbGJjay9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmFkaW8iLAogICJ1dWlkIjogInJhZGlvQGhzbGJjay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "40": {"version": "19", "sha256": "046lh1yhaa2yp64n0ax1abzlw26avnr8z1yc3v6wral9xkz5c94h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBhbiBJbnRlcm5ldCBSYWRpbyBTdHJlYW0iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyYWRpb0Boc2xiY2suZ21haWwuY29tIiwKICAibmFtZSI6ICJJbnRlcm5ldCBSYWRpbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hzbGJjay9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmFkaW8iLAogICJ1dWlkIjogInJhZGlvQGhzbGJjay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "41": {"version": "19", "sha256": "046lh1yhaa2yp64n0ax1abzlw26avnr8z1yc3v6wral9xkz5c94h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBhbiBJbnRlcm5ldCBSYWRpbyBTdHJlYW0iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyYWRpb0Boc2xiY2suZ21haWwuY29tIiwKICAibmFtZSI6ICJJbnRlcm5ldCBSYWRpbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hzbGJjay9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmFkaW8iLAogICJ1dWlkIjogInJhZGlvQGhzbGJjay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "42": {"version": "19", "sha256": "046lh1yhaa2yp64n0ax1abzlw26avnr8z1yc3v6wral9xkz5c94h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBhbiBJbnRlcm5ldCBSYWRpbyBTdHJlYW0iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyYWRpb0Boc2xiY2suZ21haWwuY29tIiwKICAibmFtZSI6ICJJbnRlcm5ldCBSYWRpbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hzbGJjay9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmFkaW8iLAogICJ1dWlkIjogInJhZGlvQGhzbGJjay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}}} +, {"uuid": "radio@hslbck.gmail.com", "name": "Internet Radio", "pname": "internet-radio", "description": "Listen to an Internet Radio Stream\n\nPlease make sure that you have the required GStreamer plugins installed, otherwise the extension cannot play a stream", "link": "https://extensions.gnome.org/extension/836/internet-radio/", "shell_version_map": {"38": {"version": "14", "sha256": "0yh9v2ywk2gdfldy138wrz7n2fi9i9adl64a0gg2swgwjznvdy4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBhbiBJbnRlcm5ldCBSYWRpbyBTdHJlYW1cblxuUGxlYXNlIG1ha2Ugc3VyZSB0aGF0IHlvdSBoYXZlIHRoZSByZXF1aXJlZCBHU3RyZWFtZXIgcGx1Z2lucyBpbnN0YWxsZWQsIG90aGVyd2lzZSB0aGUgZXh0ZW5zaW9uIGNhbm5vdCBwbGF5IGEgc3RyZWFtIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmFkaW9AaHNsYmNrLmdtYWlsLmNvbSIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgUmFkaW8iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmFkaW8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oc2xiY2svZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJhZGlvIiwKICAidXVpZCI6ICJyYWRpb0Boc2xiY2suZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "40": {"version": "19", "sha256": "01zng7gsal3szdw041h06vh57vsy0jrnmhvyc1ymn2rgabzb75ps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBhbiBJbnRlcm5ldCBSYWRpbyBTdHJlYW1cblxuUGxlYXNlIG1ha2Ugc3VyZSB0aGF0IHlvdSBoYXZlIHRoZSByZXF1aXJlZCBHU3RyZWFtZXIgcGx1Z2lucyBpbnN0YWxsZWQsIG90aGVyd2lzZSB0aGUgZXh0ZW5zaW9uIGNhbm5vdCBwbGF5IGEgc3RyZWFtIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmFkaW9AaHNsYmNrLmdtYWlsLmNvbSIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgUmFkaW8iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmFkaW8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oc2xiY2svZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJhZGlvIiwKICAidXVpZCI6ICJyYWRpb0Boc2xiY2suZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "01zng7gsal3szdw041h06vh57vsy0jrnmhvyc1ymn2rgabzb75ps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBhbiBJbnRlcm5ldCBSYWRpbyBTdHJlYW1cblxuUGxlYXNlIG1ha2Ugc3VyZSB0aGF0IHlvdSBoYXZlIHRoZSByZXF1aXJlZCBHU3RyZWFtZXIgcGx1Z2lucyBpbnN0YWxsZWQsIG90aGVyd2lzZSB0aGUgZXh0ZW5zaW9uIGNhbm5vdCBwbGF5IGEgc3RyZWFtIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmFkaW9AaHNsYmNrLmdtYWlsLmNvbSIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgUmFkaW8iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmFkaW8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oc2xiY2svZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJhZGlvIiwKICAidXVpZCI6ICJyYWRpb0Boc2xiY2suZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "42": {"version": "19", "sha256": "01zng7gsal3szdw041h06vh57vsy0jrnmhvyc1ymn2rgabzb75ps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBhbiBJbnRlcm5ldCBSYWRpbyBTdHJlYW1cblxuUGxlYXNlIG1ha2Ugc3VyZSB0aGF0IHlvdSBoYXZlIHRoZSByZXF1aXJlZCBHU3RyZWFtZXIgcGx1Z2lucyBpbnN0YWxsZWQsIG90aGVyd2lzZSB0aGUgZXh0ZW5zaW9uIGNhbm5vdCBwbGF5IGEgc3RyZWFtIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmFkaW9AaHNsYmNrLmdtYWlsLmNvbSIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgUmFkaW8iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmFkaW8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oc2xiY2svZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJhZGlvIiwKICAidXVpZCI6ICJyYWRpb0Boc2xiY2suZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "43": {"version": "20", "sha256": "15jf22hfhh3hnvy2jiiylvcgisymvh2h889pcsr7wdsnvcibn1v1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBhbiBJbnRlcm5ldCBSYWRpbyBTdHJlYW1cblxuUGxlYXNlIG1ha2Ugc3VyZSB0aGF0IHlvdSBoYXZlIHRoZSByZXF1aXJlZCBHU3RyZWFtZXIgcGx1Z2lucyBpbnN0YWxsZWQsIG90aGVyd2lzZSB0aGUgZXh0ZW5zaW9uIGNhbm5vdCBwbGF5IGEgc3RyZWFtIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmFkaW9AaHNsYmNrLmdtYWlsLmNvbSIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgUmFkaW8iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmFkaW8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaHNsYmNrL2dub21lLXNoZWxsLWV4dGVuc2lvbi1yYWRpbyIsCiAgInV1aWQiOiAicmFkaW9AaHNsYmNrLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}}} , {"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": "50", "sha256": "16dc5zf25kc4mga3srb69cji7girv6z314s8k3nabm9whk8jfrg4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Vc2hha292VmFzaWxpaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZnJlb24iLAogICJ1dWlkIjogImZyZW9uQFVzaGFrb3ZWYXNpbGlpX0dpdGh1Yi55YWhvby5jb20iLAogICJ2ZXJzaW9uIjogNTAKfQ=="}, "41": {"version": "50", "sha256": "16dc5zf25kc4mga3srb69cji7girv6z314s8k3nabm9whk8jfrg4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Vc2hha292VmFzaWxpaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZnJlb24iLAogICJ1dWlkIjogImZyZW9uQFVzaGFrb3ZWYXNpbGlpX0dpdGh1Yi55YWhvby5jb20iLAogICJ2ZXJzaW9uIjogNTAKfQ=="}, "42": {"version": "50", "sha256": "16dc5zf25kc4mga3srb69cji7girv6z314s8k3nabm9whk8jfrg4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Vc2hha292VmFzaWxpaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZnJlb24iLAogICJ1dWlkIjogImZyZW9uQFVzaGFrb3ZWYXNpbGlpX0dpdGh1Yi55YWhvby5jb20iLAogICJ2ZXJzaW9uIjogNTAKfQ=="}, "43": {"version": "50", "sha256": "16dc5zf25kc4mga3srb69cji7girv6z314s8k3nabm9whk8jfrg4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Vc2hha292VmFzaWxpaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZnJlb24iLAogICJ1dWlkIjogImZyZW9uQFVzaGFrb3ZWYXNpbGlpX0dpdGh1Yi55YWhvby5jb20iLAogICJ2ZXJzaW9uIjogNTAKfQ=="}}} , {"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="}}} @@ -91,37 +91,37 @@ , {"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": "27", "sha256": "0873r4hfgk5lypi64y21mwl68c9z6d9skgw1p61l1qc23vbqg4d6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB5b3VyIENQVSdzIGZyZXF1ZW5jeSBzY2FsaW5nIGRyaXZlciIsCiAgImxvY2FsZWRpciI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiQ1BVIFBvd2VyIE1hbmFnZXIiLAogICJzY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1cG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZWluc3RhcGVsL2NwdXBvd2VyIiwKICAidXVpZCI6ICJjcHVwb3dlckBta28tc2wuZGUiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "40": {"version": "27", "sha256": "0873r4hfgk5lypi64y21mwl68c9z6d9skgw1p61l1qc23vbqg4d6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB5b3VyIENQVSdzIGZyZXF1ZW5jeSBzY2FsaW5nIGRyaXZlciIsCiAgImxvY2FsZWRpciI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiQ1BVIFBvd2VyIE1hbmFnZXIiLAogICJzY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1cG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZWluc3RhcGVsL2NwdXBvd2VyIiwKICAidXVpZCI6ICJjcHVwb3dlckBta28tc2wuZGUiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "41": {"version": "27", "sha256": "0873r4hfgk5lypi64y21mwl68c9z6d9skgw1p61l1qc23vbqg4d6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB5b3VyIENQVSdzIGZyZXF1ZW5jeSBzY2FsaW5nIGRyaXZlciIsCiAgImxvY2FsZWRpciI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiQ1BVIFBvd2VyIE1hbmFnZXIiLAogICJzY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1cG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZWluc3RhcGVsL2NwdXBvd2VyIiwKICAidXVpZCI6ICJjcHVwb3dlckBta28tc2wuZGUiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "42": {"version": "27", "sha256": "0873r4hfgk5lypi64y21mwl68c9z6d9skgw1p61l1qc23vbqg4d6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB5b3VyIENQVSdzIGZyZXF1ZW5jeSBzY2FsaW5nIGRyaXZlciIsCiAgImxvY2FsZWRpciI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiQ1BVIFBvd2VyIE1hbmFnZXIiLAogICJzY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1cG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZWluc3RhcGVsL2NwdXBvd2VyIiwKICAidXVpZCI6ICJjcHVwb3dlckBta28tc2wuZGUiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}}} , {"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": "19", "sha256": "18l04cf2sv1wrsqcif5wsrmcsw6nsh7y459a7xjhl06hzigf5k0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCEgKEZsYXRwYWsgb3IgU25hcCB2ZXJzaW9ucyBOT1Qgc3VwcG9ydGVkKSBcblxuR25vbWUgXHUyMjY0My4xND8gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjk3L3BhbmVsLXdvcmxkLWNsb2NrLyIsCiAgIm5hbWUiOiAiUGFuZWwgV29ybGQgQ2xvY2sgKExpdGUpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmxkLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3JsZF9jbG9ja19saXRlQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "18l04cf2sv1wrsqcif5wsrmcsw6nsh7y459a7xjhl06hzigf5k0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCEgKEZsYXRwYWsgb3IgU25hcCB2ZXJzaW9ucyBOT1Qgc3VwcG9ydGVkKSBcblxuR25vbWUgXHUyMjY0My4xND8gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjk3L3BhbmVsLXdvcmxkLWNsb2NrLyIsCiAgIm5hbWUiOiAiUGFuZWwgV29ybGQgQ2xvY2sgKExpdGUpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmxkLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3JsZF9jbG9ja19saXRlQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "42": {"version": "19", "sha256": "18l04cf2sv1wrsqcif5wsrmcsw6nsh7y459a7xjhl06hzigf5k0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCEgKEZsYXRwYWsgb3IgU25hcCB2ZXJzaW9ucyBOT1Qgc3VwcG9ydGVkKSBcblxuR25vbWUgXHUyMjY0My4xND8gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjk3L3BhbmVsLXdvcmxkLWNsb2NrLyIsCiAgIm5hbWUiOiAiUGFuZWwgV29ybGQgQ2xvY2sgKExpdGUpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmxkLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3JsZF9jbG9ja19saXRlQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "43": {"version": "19", "sha256": "18l04cf2sv1wrsqcif5wsrmcsw6nsh7y459a7xjhl06hzigf5k0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCEgKEZsYXRwYWsgb3IgU25hcCB2ZXJzaW9ucyBOT1Qgc3VwcG9ydGVkKSBcblxuR25vbWUgXHUyMjY0My4xND8gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjk3L3BhbmVsLXdvcmxkLWNsb2NrLyIsCiAgIm5hbWUiOiAiUGFuZWwgV29ybGQgQ2xvY2sgKExpdGUpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmxkLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3JsZF9jbG9ja19saXRlQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} -, {"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": "27", "sha256": "1lqfsm349bwhbidv5g9sagfncysng3qf0fypnf4sqp0gwaxx6yy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9uYWlsZmFybWVyL2dub21lLXNoZWxsLWRpbS1vbi1iYXR0ZXJ5LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLW9uLWJhdHRlcnlAbmFpbGZhcm1lci5uYWlsZmFybWVyLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "40": {"version": "27", "sha256": "1lqfsm349bwhbidv5g9sagfncysng3qf0fypnf4sqp0gwaxx6yy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9uYWlsZmFybWVyL2dub21lLXNoZWxsLWRpbS1vbi1iYXR0ZXJ5LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLW9uLWJhdHRlcnlAbmFpbGZhcm1lci5uYWlsZmFybWVyLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "27", "sha256": "1lqfsm349bwhbidv5g9sagfncysng3qf0fypnf4sqp0gwaxx6yy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9uYWlsZmFybWVyL2dub21lLXNoZWxsLWRpbS1vbi1iYXR0ZXJ5LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLW9uLWJhdHRlcnlAbmFpbGZhcm1lci5uYWlsZmFybWVyLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "42": {"version": "29", "sha256": "1da36r0yz1jf1r78gv9qx132ws5k2vshgh2fn538szm4skd2nbsk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbmFpbGZhcm1lci9nbm9tZS1zaGVsbC1kaW0tb24tYmF0dGVyeS1leHRlbnNpb24iLAogICJ1dWlkIjogImRpbS1vbi1iYXR0ZXJ5QG5haWxmYXJtZXIubmFpbGZhcm1lci5jb20iLAogICJ2ZXJzaW9uIjogMjkKfQ=="}}} +, {"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": "27", "sha256": "1lqfsm349bwhbidv5g9sagfncysng3qf0fypnf4sqp0gwaxx6yy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9uYWlsZmFybWVyL2dub21lLXNoZWxsLWRpbS1vbi1iYXR0ZXJ5LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLW9uLWJhdHRlcnlAbmFpbGZhcm1lci5uYWlsZmFybWVyLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "40": {"version": "27", "sha256": "1lqfsm349bwhbidv5g9sagfncysng3qf0fypnf4sqp0gwaxx6yy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9uYWlsZmFybWVyL2dub21lLXNoZWxsLWRpbS1vbi1iYXR0ZXJ5LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLW9uLWJhdHRlcnlAbmFpbGZhcm1lci5uYWlsZmFybWVyLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "27", "sha256": "1lqfsm349bwhbidv5g9sagfncysng3qf0fypnf4sqp0gwaxx6yy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9uYWlsZmFybWVyL2dub21lLXNoZWxsLWRpbS1vbi1iYXR0ZXJ5LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLW9uLWJhdHRlcnlAbmFpbGZhcm1lci5uYWlsZmFybWVyLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "42": {"version": "30", "sha256": "00fplpjbb0kfvqassy2zn5rd6yg2268jq5sq0jpkpw9b2bgnlgyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL25haWxmYXJtZXIvZ25vbWUtc2hlbGwtZGltLW9uLWJhdHRlcnktZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaW0tb24tYmF0dGVyeUBuYWlsZmFybWVyLm5haWxmYXJtZXIuY29tIiwKICAidmVyc2lvbiI6IDMwCn0="}, "43": {"version": "30", "sha256": "00fplpjbb0kfvqassy2zn5rd6yg2268jq5sq0jpkpw9b2bgnlgyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL25haWxmYXJtZXIvZ25vbWUtc2hlbGwtZGltLW9uLWJhdHRlcnktZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaW0tb24tYmF0dGVyeUBuYWlsZmFybWVyLm5haWxmYXJtZXIuY29tIiwKICAidmVyc2lvbiI6IDMwCn0="}}} , {"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="}, "42": {"version": "36", "sha256": "06ayifrf49bdf61y9502fcwf9937py3zlmcf1idlp1f3y18s5i8c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIGxhdW5jaCBhcHBsaWNhdGlvbnMgcXVpY2tseSBieSB0eXBpbmdcblxuVXNlIHRoZSBjb25maWd1cmVkIGdsb2JhbCBob3RrZXkgKFN1cGVyK3cgYnkgZGVmYXVsdCkgdG8gb3BlbiBhIGxpc3Qgb2YgY3VycmVudCB3aW5kb3dzLiBUeXBlIGEgcGFydCBvZiB0aGUgbmFtZSBvciB0aXRsZSBvZiB0aGUgYXBwbGljYXRpb24gd2luZG93IHlvdSB3YW50IHRvIGFjdGl2YXRlIGFuZCBoaXQgZW50ZXIgb3IgY2xpY2sgb24gdGhlIGl0ZW0geW91IHdpc2ggdG8gYWN0aXZhdGUuIFlvdSBjYW4gdXNlIHRoZSBhcnJvdyBrZXlzIHRvIG5hdmlnYXRlIGFtb25nIHRoZSBmaWx0ZXJlZCBzZWxlY3Rpb24gYW5kIHR5cGUgc2V2ZXJhbCBzcGFjZSBzZXBhcmF0ZWQgc2VhcmNoIHRlcm1zIHRvIGZpbHRlciBmdXJ0aGVyLiBJZiB5b3VyIHNlYXJjaCBtYXRjaGVzIGxhdW5jaGFibGUgYXBwcywgdGhvc2UgYXJlIHNob3duIGluIHRoZSBsaXN0IHRvby4gVXNlIEVzYyBvciBjbGljayBhbnl3aGVyZSBvdXRzaWRlIHRoZSBzd2l0Y2hlciB0byBjYW5jZWwuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBsb29rIGFuZCBmZWVsIGFuZCBmdW5jdGlvbmFsaXR5IGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJuYW1lIjogIlN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmllbGxhbmRhdS9zd2l0Y2hlciIsCiAgInV1aWQiOiAic3dpdGNoZXJAbGFuZGF1LmZpIiwKICAidmVyc2lvbiI6IDM2Cn0="}}} +, {"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="}, "42": {"version": "36", "sha256": "06ayifrf49bdf61y9502fcwf9937py3zlmcf1idlp1f3y18s5i8c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIGxhdW5jaCBhcHBsaWNhdGlvbnMgcXVpY2tseSBieSB0eXBpbmdcblxuVXNlIHRoZSBjb25maWd1cmVkIGdsb2JhbCBob3RrZXkgKFN1cGVyK3cgYnkgZGVmYXVsdCkgdG8gb3BlbiBhIGxpc3Qgb2YgY3VycmVudCB3aW5kb3dzLiBUeXBlIGEgcGFydCBvZiB0aGUgbmFtZSBvciB0aXRsZSBvZiB0aGUgYXBwbGljYXRpb24gd2luZG93IHlvdSB3YW50IHRvIGFjdGl2YXRlIGFuZCBoaXQgZW50ZXIgb3IgY2xpY2sgb24gdGhlIGl0ZW0geW91IHdpc2ggdG8gYWN0aXZhdGUuIFlvdSBjYW4gdXNlIHRoZSBhcnJvdyBrZXlzIHRvIG5hdmlnYXRlIGFtb25nIHRoZSBmaWx0ZXJlZCBzZWxlY3Rpb24gYW5kIHR5cGUgc2V2ZXJhbCBzcGFjZSBzZXBhcmF0ZWQgc2VhcmNoIHRlcm1zIHRvIGZpbHRlciBmdXJ0aGVyLiBJZiB5b3VyIHNlYXJjaCBtYXRjaGVzIGxhdW5jaGFibGUgYXBwcywgdGhvc2UgYXJlIHNob3duIGluIHRoZSBsaXN0IHRvby4gVXNlIEVzYyBvciBjbGljayBhbnl3aGVyZSBvdXRzaWRlIHRoZSBzd2l0Y2hlciB0byBjYW5jZWwuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBsb29rIGFuZCBmZWVsIGFuZCBmdW5jdGlvbmFsaXR5IGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJuYW1lIjogIlN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmllbGxhbmRhdS9zd2l0Y2hlciIsCiAgInV1aWQiOiAic3dpdGNoZXJAbGFuZGF1LmZpIiwKICAidmVyc2lvbiI6IDM2Cn0="}, "43": {"version": "37", "sha256": "19yrdy58hx1zwl0a7wjd0fwnfwsgsyqv9m1va8x5niynblajcs8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIGxhdW5jaCBhcHBsaWNhdGlvbnMgcXVpY2tseSBieSB0eXBpbmdcblxuVXNlIHRoZSBjb25maWd1cmVkIGdsb2JhbCBob3RrZXkgKFN1cGVyK3cgYnkgZGVmYXVsdCkgdG8gb3BlbiBhIGxpc3Qgb2YgY3VycmVudCB3aW5kb3dzLiBUeXBlIGEgcGFydCBvZiB0aGUgbmFtZSBvciB0aXRsZSBvZiB0aGUgYXBwbGljYXRpb24gd2luZG93IHlvdSB3YW50IHRvIGFjdGl2YXRlIGFuZCBoaXQgZW50ZXIgb3IgY2xpY2sgb24gdGhlIGl0ZW0geW91IHdpc2ggdG8gYWN0aXZhdGUuIFlvdSBjYW4gdXNlIHRoZSBhcnJvdyBrZXlzIHRvIG5hdmlnYXRlIGFtb25nIHRoZSBmaWx0ZXJlZCBzZWxlY3Rpb24gYW5kIHR5cGUgc2V2ZXJhbCBzcGFjZSBzZXBhcmF0ZWQgc2VhcmNoIHRlcm1zIHRvIGZpbHRlciBmdXJ0aGVyLiBJZiB5b3VyIHNlYXJjaCBtYXRjaGVzIGxhdW5jaGFibGUgYXBwcywgdGhvc2UgYXJlIHNob3duIGluIHRoZSBsaXN0IHRvby4gVXNlIEVzYyBvciBjbGljayBhbnl3aGVyZSBvdXRzaWRlIHRoZSBzd2l0Y2hlciB0byBjYW5jZWwuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBsb29rIGFuZCBmZWVsIGFuZCBmdW5jdGlvbmFsaXR5IGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJuYW1lIjogIlN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmllbGxhbmRhdS9zd2l0Y2hlciIsCiAgInV1aWQiOiAic3dpdGNoZXJAbGFuZGF1LmZpIiwKICAidmVyc2lvbiI6IDM3Cn0="}}} , {"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": "16", "sha256": "14l418xz2p8sa8r6df4wbr9x9x337gcdihdah2nj95xzr9f9q1ks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbmVldHNoZXIvS2V5Ym9hcmQtTW9kaWZpZXJzLVN0YXR1cyIsCiAgInV1aWQiOiAia2V5Ym9hcmRfbW9kaWZpZXJzX3N0YXR1c0BzbmVldHNoZXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "40": {"version": "16", "sha256": "14l418xz2p8sa8r6df4wbr9x9x337gcdihdah2nj95xzr9f9q1ks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbmVldHNoZXIvS2V5Ym9hcmQtTW9kaWZpZXJzLVN0YXR1cyIsCiAgInV1aWQiOiAia2V5Ym9hcmRfbW9kaWZpZXJzX3N0YXR1c0BzbmVldHNoZXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "16", "sha256": "14l418xz2p8sa8r6df4wbr9x9x337gcdihdah2nj95xzr9f9q1ks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbmVldHNoZXIvS2V5Ym9hcmQtTW9kaWZpZXJzLVN0YXR1cyIsCiAgInV1aWQiOiAia2V5Ym9hcmRfbW9kaWZpZXJzX3N0YXR1c0BzbmVldHNoZXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "42": {"version": "16", "sha256": "14l418xz2p8sa8r6df4wbr9x9x337gcdihdah2nj95xzr9f9q1ks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbmVldHNoZXIvS2V5Ym9hcmQtTW9kaWZpZXJzLVN0YXR1cyIsCiAgInV1aWQiOiAia2V5Ym9hcmRfbW9kaWZpZXJzX3N0YXR1c0BzbmVldHNoZXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "43": {"version": "16", "sha256": "14l418xz2p8sa8r6df4wbr9x9x337gcdihdah2nj95xzr9f9q1ks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbmVldHNoZXIvS2V5Ym9hcmQtTW9kaWZpZXJzLVN0YXR1cyIsCiAgInV1aWQiOiAia2V5Ym9hcmRfbW9kaWZpZXJzX3N0YXR1c0BzbmVldHNoZXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} -, {"uuid": "thinkpadthermal@moonlight.drive.vk.gmail.com", "name": "ThinkPad Thermal", "pname": "thinkpad-thermal", "description": "ThinkPad thermal monitor, display ThinkPad thermal and fan status using /proc/acpi/ibm/thermal and /proc/acpi/ibm/fan.", "link": "https://extensions.gnome.org/extension/986/thinkpad-thermal/", "shell_version_map": {"42": {"version": "9", "sha256": "0lizicj0nvc7fl7vh88rnnxq6clrp2ablgsyd161359mcnng57qy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaW5rUGFkIHRoZXJtYWwgbW9uaXRvciwgZGlzcGxheSBUaGlua1BhZCB0aGVybWFsIGFuZCBmYW4gc3RhdHVzIHVzaW5nIC9wcm9jL2FjcGkvaWJtL3RoZXJtYWwgYW5kIC9wcm9jL2FjcGkvaWJtL2Zhbi4iLAogICJuYW1lIjogIlRoaW5rUGFkIFRoZXJtYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZtdWpha2l0ei90aGlua3BhZC10aGVybWFsIiwKICAidXVpZCI6ICJ0aGlua3BhZHRoZXJtYWxAbW9vbmxpZ2h0LmRyaXZlLnZrLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "0lizicj0nvc7fl7vh88rnnxq6clrp2ablgsyd161359mcnng57qy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaW5rUGFkIHRoZXJtYWwgbW9uaXRvciwgZGlzcGxheSBUaGlua1BhZCB0aGVybWFsIGFuZCBmYW4gc3RhdHVzIHVzaW5nIC9wcm9jL2FjcGkvaWJtL3RoZXJtYWwgYW5kIC9wcm9jL2FjcGkvaWJtL2Zhbi4iLAogICJuYW1lIjogIlRoaW5rUGFkIFRoZXJtYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZtdWpha2l0ei90aGlua3BhZC10aGVybWFsIiwKICAidXVpZCI6ICJ0aGlua3BhZHRoZXJtYWxAbW9vbmxpZ2h0LmRyaXZlLnZrLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}}} +, {"uuid": "thinkpadthermal@moonlight.drive.vk.gmail.com", "name": "ThinkPad Thermal", "pname": "thinkpad-thermal", "description": "ThinkPad thermal monitor, display ThinkPad thermal and fan status using /proc/acpi/ibm/thermal and /proc/acpi/ibm/fan.", "link": "https://extensions.gnome.org/extension/986/thinkpad-thermal/", "shell_version_map": {"42": {"version": "10", "sha256": "0ahdw7a5v38d8aw4b90yyi57pgi88jp4qbgml1q5ay6vphhn0h7q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaW5rUGFkIHRoZXJtYWwgbW9uaXRvciwgZGlzcGxheSBUaGlua1BhZCB0aGVybWFsIGFuZCBmYW4gc3RhdHVzIHVzaW5nIC9wcm9jL2FjcGkvaWJtL3RoZXJtYWwgYW5kIC9wcm9jL2FjcGkvaWJtL2Zhbi4iLAogICJuYW1lIjogIlRoaW5rUGFkIFRoZXJtYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZtdWpha2l0ei90aGlua3BhZC10aGVybWFsIiwKICAidXVpZCI6ICJ0aGlua3BhZHRoZXJtYWxAbW9vbmxpZ2h0LmRyaXZlLnZrLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "10", "sha256": "0ahdw7a5v38d8aw4b90yyi57pgi88jp4qbgml1q5ay6vphhn0h7q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaW5rUGFkIHRoZXJtYWwgbW9uaXRvciwgZGlzcGxheSBUaGlua1BhZCB0aGVybWFsIGFuZCBmYW4gc3RhdHVzIHVzaW5nIC9wcm9jL2FjcGkvaWJtL3RoZXJtYWwgYW5kIC9wcm9jL2FjcGkvaWJtL2Zhbi4iLAogICJuYW1lIjogIlRoaW5rUGFkIFRoZXJtYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZtdWpha2l0ei90aGlua3BhZC10aGVybWFsIiwKICAidXVpZCI6ICJ0aGlua3BhZHRoZXJtYWxAbW9vbmxpZ2h0LmRyaXZlLnZrLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"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": "33", "sha256": "18lcfg83laqmh2hz4n2x6ppw49arsclhwbdc364l4ixd7vj8i5dm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JpamkvaGFyZGRpc2tsZWQiLAogICJ1dWlkIjogImhhcmRkaXNrbGVkQGJpamlkcm9pZC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "40": {"version": "33", "sha256": "18lcfg83laqmh2hz4n2x6ppw49arsclhwbdc364l4ixd7vj8i5dm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JpamkvaGFyZGRpc2tsZWQiLAogICJ1dWlkIjogImhhcmRkaXNrbGVkQGJpamlkcm9pZC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "41": {"version": "33", "sha256": "18lcfg83laqmh2hz4n2x6ppw49arsclhwbdc364l4ixd7vj8i5dm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JpamkvaGFyZGRpc2tsZWQiLAogICJ1dWlkIjogImhhcmRkaXNrbGVkQGJpamlkcm9pZC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "42": {"version": "33", "sha256": "18lcfg83laqmh2hz4n2x6ppw49arsclhwbdc364l4ixd7vj8i5dm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JpamkvaGFyZGRpc2tsZWQiLAogICJ1dWlkIjogImhhcmRkaXNrbGVkQGJpamlkcm9pZC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "43": {"version": "33", "sha256": "18lcfg83laqmh2hz4n2x6ppw49arsclhwbdc364l4ixd7vj8i5dm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JpamkvaGFyZGRpc2tsZWQiLAogICJ1dWlkIjogImhhcmRkaXNrbGVkQGJpamlkcm9pZC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}}} -, {"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": "34", "sha256": "1pca7xk11bh46a1y1dhxmw6rlmmf5dpp0jamwn17xxxsp35fz5qk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgU3luY3RoaW5nIEljb24gaW4gVG9wIEJhciIsCiAgIm5hbWUiOiAiU3luY3RoaW5nIEljb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamF5c3RyaWN0b3IvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5bmN0aGluZyIsCiAgInV1aWQiOiAic3luY3RoaW5naWNvbkBqYXkuc3RyaWN0QHBvc3Rlby5kZSIsCiAgInZlcnNpb24iOiAzNAp9"}, "41": {"version": "34", "sha256": "1pca7xk11bh46a1y1dhxmw6rlmmf5dpp0jamwn17xxxsp35fz5qk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgU3luY3RoaW5nIEljb24gaW4gVG9wIEJhciIsCiAgIm5hbWUiOiAiU3luY3RoaW5nIEljb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamF5c3RyaWN0b3IvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5bmN0aGluZyIsCiAgInV1aWQiOiAic3luY3RoaW5naWNvbkBqYXkuc3RyaWN0QHBvc3Rlby5kZSIsCiAgInZlcnNpb24iOiAzNAp9"}, "42": {"version": "34", "sha256": "1pca7xk11bh46a1y1dhxmw6rlmmf5dpp0jamwn17xxxsp35fz5qk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgU3luY3RoaW5nIEljb24gaW4gVG9wIEJhciIsCiAgIm5hbWUiOiAiU3luY3RoaW5nIEljb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamF5c3RyaWN0b3IvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5bmN0aGluZyIsCiAgInV1aWQiOiAic3luY3RoaW5naWNvbkBqYXkuc3RyaWN0QHBvc3Rlby5kZSIsCiAgInZlcnNpb24iOiAzNAp9"}}} +, {"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": "34", "sha256": "1pca7xk11bh46a1y1dhxmw6rlmmf5dpp0jamwn17xxxsp35fz5qk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgU3luY3RoaW5nIEljb24gaW4gVG9wIEJhciIsCiAgIm5hbWUiOiAiU3luY3RoaW5nIEljb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamF5c3RyaWN0b3IvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5bmN0aGluZyIsCiAgInV1aWQiOiAic3luY3RoaW5naWNvbkBqYXkuc3RyaWN0QHBvc3Rlby5kZSIsCiAgInZlcnNpb24iOiAzNAp9"}, "41": {"version": "34", "sha256": "1pca7xk11bh46a1y1dhxmw6rlmmf5dpp0jamwn17xxxsp35fz5qk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgU3luY3RoaW5nIEljb24gaW4gVG9wIEJhciIsCiAgIm5hbWUiOiAiU3luY3RoaW5nIEljb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamF5c3RyaWN0b3IvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5bmN0aGluZyIsCiAgInV1aWQiOiAic3luY3RoaW5naWNvbkBqYXkuc3RyaWN0QHBvc3Rlby5kZSIsCiAgInZlcnNpb24iOiAzNAp9"}, "42": {"version": "34", "sha256": "1pca7xk11bh46a1y1dhxmw6rlmmf5dpp0jamwn17xxxsp35fz5qk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgU3luY3RoaW5nIEljb24gaW4gVG9wIEJhciIsCiAgIm5hbWUiOiAiU3luY3RoaW5nIEljb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamF5c3RyaWN0b3IvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5bmN0aGluZyIsCiAgInV1aWQiOiAic3luY3RoaW5naWNvbkBqYXkuc3RyaWN0QHBvc3Rlby5kZSIsCiAgInZlcnNpb24iOiAzNAp9"}, "43": {"version": "35", "sha256": "077m5n41bhaxk2iky751p9bwmcsqkg69rpg2irw4q3nq09lb8s1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgU3luY3RoaW5nIEljb24gaW4gVG9wIEJhciIsCiAgIm5hbWUiOiAiU3luY3RoaW5nIEljb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pheXN0cmljdG9yL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeW5jdGhpbmciLAogICJ1dWlkIjogInN5bmN0aGluZ2ljb25AamF5LnN0cmljdEBwb3N0ZW8uZGUiLAogICJ2ZXJzaW9uIjogMzUKfQ=="}}} , {"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": "19", "sha256": "13i1hdxxd2xyhm1a3vfwwy2j1xhrx625wmrxn7s5xw9rlxj55p0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbnVub2ZhcnJ1Y2EvV2luZG93SXNSZWFkeV9SZW1vdmVyIiwKICAidXVpZCI6ICJ3aW5kb3dJc1JlYWR5X1JlbW92ZXJAbnVub2ZhcnJ1Y2FAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "40": {"version": "19", "sha256": "13i1hdxxd2xyhm1a3vfwwy2j1xhrx625wmrxn7s5xw9rlxj55p0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbnVub2ZhcnJ1Y2EvV2luZG93SXNSZWFkeV9SZW1vdmVyIiwKICAidXVpZCI6ICJ3aW5kb3dJc1JlYWR5X1JlbW92ZXJAbnVub2ZhcnJ1Y2FAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "13i1hdxxd2xyhm1a3vfwwy2j1xhrx625wmrxn7s5xw9rlxj55p0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbnVub2ZhcnJ1Y2EvV2luZG93SXNSZWFkeV9SZW1vdmVyIiwKICAidXVpZCI6ICJ3aW5kb3dJc1JlYWR5X1JlbW92ZXJAbnVub2ZhcnJ1Y2FAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "42": {"version": "19", "sha256": "13i1hdxxd2xyhm1a3vfwwy2j1xhrx625wmrxn7s5xw9rlxj55p0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbnVub2ZhcnJ1Y2EvV2luZG93SXNSZWFkeV9SZW1vdmVyIiwKICAidXVpZCI6ICJ3aW5kb3dJc1JlYWR5X1JlbW92ZXJAbnVub2ZhcnJ1Y2FAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "43": {"version": "19", "sha256": "13i1hdxxd2xyhm1a3vfwwy2j1xhrx625wmrxn7s5xw9rlxj55p0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbnVub2ZhcnJ1Y2EvV2luZG93SXNSZWFkeV9SZW1vdmVyIiwKICAidXVpZCI6ICJ3aW5kb3dJc1JlYWR5X1JlbW92ZXJAbnVub2ZhcnJ1Y2FAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} , {"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 Gnome Console", "link": "https://extensions.gnome.org/extension/1010/archlinux-updates-indicator/", "shell_version_map": {"38": {"version": "39", "sha256": "1wcyjy9idj674s7pyz0210pb6kzb3jmj1fv08cm93frdl9g61dn3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMSIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXJjaC11cGRhdGUiLAogICJ1dWlkIjogImFyY2gtdXBkYXRlQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogMzkKfQ=="}, "40": {"version": "51", "sha256": "1qz9q8vwdwir5v3idxz8y756aps8lhsdj0yp00lj2n5x55hgrh99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiA1MQp9"}, "41": {"version": "51", "sha256": "1qz9q8vwdwir5v3idxz8y756aps8lhsdj0yp00lj2n5x55hgrh99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiA1MQp9"}, "42": {"version": "51", "sha256": "1qz9q8vwdwir5v3idxz8y756aps8lhsdj0yp00lj2n5x55hgrh99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiA1MQp9"}, "43": {"version": "51", "sha256": "1qz9q8vwdwir5v3idxz8y756aps8lhsdj0yp00lj2n5x55hgrh99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiA1MQp9"}}} , {"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": "text-scaler@gnome-shell-extensions.mariospr.org", "name": "Text Scaler", "pname": "text-scaler", "description": "Simple extension to easily define arbitrary values for the text scaling factor", "link": "https://extensions.gnome.org/extension/1018/text-scaler/", "shell_version_map": {"42": {"version": "12", "sha256": "0jp6i0x0zw9ldfq9ngcvg1y5ahcgyaw2za9rngivp172zpvgh2xb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gZWFzaWx5IGRlZmluZSBhcmJpdHJhcnkgdmFsdWVzIGZvciB0aGUgdGV4dCBzY2FsaW5nIGZhY3RvciIsCiAgImdldHRleHQtZG9tYWluIjogInRleHQtc2NhbGVyIiwKICAibmFtZSI6ICJUZXh0IFNjYWxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyaW9zcHIvdGV4dC1zY2FsZXItZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0ZXh0LXNjYWxlckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLm1hcmlvc3ByLm9yZyIsCiAgInZlcnNpb24iOiAxMgp9"}, "43": {"version": "12", "sha256": "0jp6i0x0zw9ldfq9ngcvg1y5ahcgyaw2za9rngivp172zpvgh2xb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gZWFzaWx5IGRlZmluZSBhcmJpdHJhcnkgdmFsdWVzIGZvciB0aGUgdGV4dCBzY2FsaW5nIGZhY3RvciIsCiAgImdldHRleHQtZG9tYWluIjogInRleHQtc2NhbGVyIiwKICAibmFtZSI6ICJUZXh0IFNjYWxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyaW9zcHIvdGV4dC1zY2FsZXItZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0ZXh0LXNjYWxlckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLm1hcmlvc3ByLm9yZyIsCiAgInZlcnNpb24iOiAxMgp9"}}} +, {"uuid": "text-scaler@gnome-shell-extensions.mariospr.org", "name": "Text Scaler", "pname": "text-scaler", "description": "Simple extension to easily define arbitrary values for the text scaling factor", "link": "https://extensions.gnome.org/extension/1018/text-scaler/", "shell_version_map": {"42": {"version": "13", "sha256": "0kzpil4n5h02b12vlqjjgi0rzzv4wsf871170havqg2hymd83fhd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gZWFzaWx5IGRlZmluZSBhcmJpdHJhcnkgdmFsdWVzIGZvciB0aGUgdGV4dCBzY2FsaW5nIGZhY3RvciIsCiAgImdldHRleHQtZG9tYWluIjogInRleHQtc2NhbGVyIiwKICAibmFtZSI6ICJUZXh0IFNjYWxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyaW9zcHIvdGV4dC1zY2FsZXItZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0ZXh0LXNjYWxlckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLm1hcmlvc3ByLm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"}, "43": {"version": "13", "sha256": "0kzpil4n5h02b12vlqjjgi0rzzv4wsf871170havqg2hymd83fhd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gZWFzaWx5IGRlZmluZSBhcmJpdHJhcnkgdmFsdWVzIGZvciB0aGUgdGV4dCBzY2FsaW5nIGZhY3RvciIsCiAgImdldHRleHQtZG9tYWluIjogInRleHQtc2NhbGVyIiwKICAibmFtZSI6ICJUZXh0IFNjYWxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyaW9zcHIvdGV4dC1zY2FsZXItZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0ZXh0LXNjYWxlckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLm1hcmlvc3ByLm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"}}} , {"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": "15", "sha256": "18fzriglzhbcwx8876s9vmlxgcmkps1aa49cqh6r3vxhbgkp3m4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaWNpbmdhLWNoZWNrZXJAc29zdWxza2kubmV0IiwKICAidmVyc2lvbiI6IDE1Cn0="}, "40": {"version": "15", "sha256": "18fzriglzhbcwx8876s9vmlxgcmkps1aa49cqh6r3vxhbgkp3m4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaWNpbmdhLWNoZWNrZXJAc29zdWxza2kubmV0IiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "18fzriglzhbcwx8876s9vmlxgcmkps1aa49cqh6r3vxhbgkp3m4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaWNpbmdhLWNoZWNrZXJAc29zdWxza2kubmV0IiwKICAidmVyc2lvbiI6IDE1Cn0="}, "42": {"version": "15", "sha256": "18fzriglzhbcwx8876s9vmlxgcmkps1aa49cqh6r3vxhbgkp3m4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaWNpbmdhLWNoZWNrZXJAc29zdWxza2kubmV0IiwKICAidmVyc2lvbiI6IDE1Cn0="}, "43": {"version": "15", "sha256": "18fzriglzhbcwx8876s9vmlxgcmkps1aa49cqh6r3vxhbgkp3m4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaWNpbmdhLWNoZWNrZXJAc29zdWxza2kubmV0IiwKICAidmVyc2lvbiI6IDE1Cn0="}}} , {"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": "24", "sha256": "1353658yr64wlh4k2nvqmrbzdsdci7zcagk6bf75qi40k923qzlh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2t3aGlzcGVyZXIgaXMgYSBleHRlbnNpb24gZm9yIFRhc2tXYXJyaW9yIEFwcGxpY2F0aW9uIGh0dHBzOi8vdGFza3dhcnJpb3Iub3JnLiBJdCBpcyB0byBkaXNwbGF5IHVwY29taW5nIHRhc2tzIGFuZCB0YXNrIGRldGFpbHMgYXMgd2VsbCBhcyB0byBjcmVhdGUgYW5kIG1vZGlmeSB0aGVtLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2t3aGlzcGVyZXIiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlRhc2tXaGlzcGVyZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFza3doaXNwZXJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaW5hdGljL3Rhc2t3aGlzcGVyZXIiLAogICJ1dWlkIjogInRhc2t3aGlzcGVyZXItZXh0ZW5zaW9uQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogMjQKfQ=="}, "41": {"version": "24", "sha256": "1353658yr64wlh4k2nvqmrbzdsdci7zcagk6bf75qi40k923qzlh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2t3aGlzcGVyZXIgaXMgYSBleHRlbnNpb24gZm9yIFRhc2tXYXJyaW9yIEFwcGxpY2F0aW9uIGh0dHBzOi8vdGFza3dhcnJpb3Iub3JnLiBJdCBpcyB0byBkaXNwbGF5IHVwY29taW5nIHRhc2tzIGFuZCB0YXNrIGRldGFpbHMgYXMgd2VsbCBhcyB0byBjcmVhdGUgYW5kIG1vZGlmeSB0aGVtLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2t3aGlzcGVyZXIiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlRhc2tXaGlzcGVyZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFza3doaXNwZXJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaW5hdGljL3Rhc2t3aGlzcGVyZXIiLAogICJ1dWlkIjogInRhc2t3aGlzcGVyZXItZXh0ZW5zaW9uQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogMjQKfQ=="}, "42": {"version": "24", "sha256": "1353658yr64wlh4k2nvqmrbzdsdci7zcagk6bf75qi40k923qzlh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2t3aGlzcGVyZXIgaXMgYSBleHRlbnNpb24gZm9yIFRhc2tXYXJyaW9yIEFwcGxpY2F0aW9uIGh0dHBzOi8vdGFza3dhcnJpb3Iub3JnLiBJdCBpcyB0byBkaXNwbGF5IHVwY29taW5nIHRhc2tzIGFuZCB0YXNrIGRldGFpbHMgYXMgd2VsbCBhcyB0byBjcmVhdGUgYW5kIG1vZGlmeSB0aGVtLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2t3aGlzcGVyZXIiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlRhc2tXaGlzcGVyZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFza3doaXNwZXJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaW5hdGljL3Rhc2t3aGlzcGVyZXIiLAogICJ1dWlkIjogInRhc2t3aGlzcGVyZXItZXh0ZW5zaW9uQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogMjQKfQ=="}, "43": {"version": "24", "sha256": "1353658yr64wlh4k2nvqmrbzdsdci7zcagk6bf75qi40k923qzlh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2t3aGlzcGVyZXIgaXMgYSBleHRlbnNpb24gZm9yIFRhc2tXYXJyaW9yIEFwcGxpY2F0aW9uIGh0dHBzOi8vdGFza3dhcnJpb3Iub3JnLiBJdCBpcyB0byBkaXNwbGF5IHVwY29taW5nIHRhc2tzIGFuZCB0YXNrIGRldGFpbHMgYXMgd2VsbCBhcyB0byBjcmVhdGUgYW5kIG1vZGlmeSB0aGVtLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2t3aGlzcGVyZXIiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlRhc2tXaGlzcGVyZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFza3doaXNwZXJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaW5hdGljL3Rhc2t3aGlzcGVyZXIiLAogICJ1dWlkIjogInRhc2t3aGlzcGVyZXItZXh0ZW5zaW9uQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogMjQKfQ=="}}} -, {"uuid": "randomwallpaper@iflow.space", "name": "Random Wallpaper", "pname": "random-wallpaper", "description": "Fetch a random wallpaper from an online source and set it as a desktop background. \nThe desktop background can be updated periodically or manually.\n\nFeatures:\nMany different online sources with filters:\n - Unsplash (https://unsplash.com/)\n - Wallhaven (https://wallhaven.cc/)\n - Reddit (https://reddit.com)\n - Basically any JSON API/File (see Examples on GitHub)\nHistory of previous images\nSet lock screen image\nAutomatic renewal (Auto-Fetching)", "link": "https://extensions.gnome.org/extension/1040/random-wallpaper/", "shell_version_map": {"38": {"version": "22", "sha256": "1mnc7k1816r0q8c95y36ryzl9cni6zms5xm587wmdmy4xi92i8ic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldGNoIGEgcmFuZG9tIHdhbGxwYXBlciBmcm9tIGFuIG9ubGluZSBzb3VyY2UgYW5kIHNldCBpdCBhcyBhIGRlc2t0b3AgYmFja2dyb3VuZC4gXG5UaGUgZGVza3RvcCBiYWNrZ3JvdW5kIGNhbiBiZSB1cGRhdGVkIHBlcmlvZGljYWxseSBvciBtYW51YWxseS5cblxuRmVhdHVyZXM6XG5NYW55IGRpZmZlcmVudCBvbmxpbmUgc291cmNlcyB3aXRoIGZpbHRlcnM6XG4gICAgICAgIC0gVW5zcGxhc2ggKGh0dHBzOi8vdW5zcGxhc2guY29tLylcbiAgICAgICAgLSBXYWxsaGF2ZW4gKGh0dHBzOi8vd2FsbGhhdmVuLmNjLylcbiAgICAgICAgLSBSZWRkaXQgKGh0dHBzOi8vcmVkZGl0LmNvbSlcbiAgICAgICAgLSBCYXNpY2FsbHkgYW55IEpTT04gQVBJL0ZpbGUgKHNlZSBFeGFtcGxlcyBvbiBHaXRIdWIpXG5IaXN0b3J5IG9mIHByZXZpb3VzIGltYWdlc1xuU2V0IGxvY2sgc2NyZWVuIGltYWdlXG5BdXRvbWF0aWMgcmVuZXdhbCAoQXV0by1GZXRjaGluZykiLAogICJuYW1lIjogIlJhbmRvbSBXYWxscGFwZXIiLAogICJzZW1hbnRpYy12ZXJzaW9uIjogIjIuNC41IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLmlmbG93LnJhbmRvbXdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lmbDB3L1JhbmRvbVdhbGxwYXBlckdub21lMyIsCiAgInV1aWQiOiAicmFuZG9td2FsbHBhcGVyQGlmbG93LnNwYWNlIiwKICAidmVyc2lvbiI6IDIyCn0="}, "40": {"version": "28", "sha256": "1j6hvpfqzf2js0hq23j1vyff3pfrwxxd8r2zxcsk2s7wk1vbqjg7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldGNoIGEgcmFuZG9tIHdhbGxwYXBlciBmcm9tIGFuIG9ubGluZSBzb3VyY2UgYW5kIHNldCBpdCBhcyBhIGRlc2t0b3AgYmFja2dyb3VuZC4gXG5UaGUgZGVza3RvcCBiYWNrZ3JvdW5kIGNhbiBiZSB1cGRhdGVkIHBlcmlvZGljYWxseSBvciBtYW51YWxseS5cblxuRmVhdHVyZXM6XG5NYW55IGRpZmZlcmVudCBvbmxpbmUgc291cmNlcyB3aXRoIGZpbHRlcnM6XG4gICAgICAgIC0gVW5zcGxhc2ggKGh0dHBzOi8vdW5zcGxhc2guY29tLylcbiAgICAgICAgLSBXYWxsaGF2ZW4gKGh0dHBzOi8vd2FsbGhhdmVuLmNjLylcbiAgICAgICAgLSBSZWRkaXQgKGh0dHBzOi8vcmVkZGl0LmNvbSlcbiAgICAgICAgLSBCYXNpY2FsbHkgYW55IEpTT04gQVBJL0ZpbGUgKHNlZSBFeGFtcGxlcyBvbiBHaXRIdWIpXG5IaXN0b3J5IG9mIHByZXZpb3VzIGltYWdlc1xuU2V0IGxvY2sgc2NyZWVuIGltYWdlXG5BdXRvbWF0aWMgcmVuZXdhbCAoQXV0by1GZXRjaGluZykiLAogICJuYW1lIjogIlJhbmRvbSBXYWxscGFwZXIiLAogICJzZW1hbnRpYy12ZXJzaW9uIjogIjIuNy4xIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLmlmbG93LnJhbmRvbXdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWZsMHcvUmFuZG9tV2FsbHBhcGVyR25vbWUzIiwKICAidXVpZCI6ICJyYW5kb213YWxscGFwZXJAaWZsb3cuc3BhY2UiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "41": {"version": "28", "sha256": "1j6hvpfqzf2js0hq23j1vyff3pfrwxxd8r2zxcsk2s7wk1vbqjg7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldGNoIGEgcmFuZG9tIHdhbGxwYXBlciBmcm9tIGFuIG9ubGluZSBzb3VyY2UgYW5kIHNldCBpdCBhcyBhIGRlc2t0b3AgYmFja2dyb3VuZC4gXG5UaGUgZGVza3RvcCBiYWNrZ3JvdW5kIGNhbiBiZSB1cGRhdGVkIHBlcmlvZGljYWxseSBvciBtYW51YWxseS5cblxuRmVhdHVyZXM6XG5NYW55IGRpZmZlcmVudCBvbmxpbmUgc291cmNlcyB3aXRoIGZpbHRlcnM6XG4gICAgICAgIC0gVW5zcGxhc2ggKGh0dHBzOi8vdW5zcGxhc2guY29tLylcbiAgICAgICAgLSBXYWxsaGF2ZW4gKGh0dHBzOi8vd2FsbGhhdmVuLmNjLylcbiAgICAgICAgLSBSZWRkaXQgKGh0dHBzOi8vcmVkZGl0LmNvbSlcbiAgICAgICAgLSBCYXNpY2FsbHkgYW55IEpTT04gQVBJL0ZpbGUgKHNlZSBFeGFtcGxlcyBvbiBHaXRIdWIpXG5IaXN0b3J5IG9mIHByZXZpb3VzIGltYWdlc1xuU2V0IGxvY2sgc2NyZWVuIGltYWdlXG5BdXRvbWF0aWMgcmVuZXdhbCAoQXV0by1GZXRjaGluZykiLAogICJuYW1lIjogIlJhbmRvbSBXYWxscGFwZXIiLAogICJzZW1hbnRpYy12ZXJzaW9uIjogIjIuNy4xIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLmlmbG93LnJhbmRvbXdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWZsMHcvUmFuZG9tV2FsbHBhcGVyR25vbWUzIiwKICAidXVpZCI6ICJyYW5kb213YWxscGFwZXJAaWZsb3cuc3BhY2UiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}}} +, {"uuid": "randomwallpaper@iflow.space", "name": "Random Wallpaper", "pname": "random-wallpaper", "description": "Fetch a random wallpaper from an online source and set it as a desktop background. \nThe desktop background can be updated periodically or manually.\n\nFeatures:\nMany different online sources with filters:\n - Unsplash (https://unsplash.com/)\n - Wallhaven (https://wallhaven.cc/)\n - Reddit (https://reddit.com)\n - Basically any JSON API/File (see Examples on GitHub)\nHistory of previous images\nSet lock screen image\nAutomatic renewal (Auto-Fetching)", "link": "https://extensions.gnome.org/extension/1040/random-wallpaper/", "shell_version_map": {"38": {"version": "22", "sha256": "1mnc7k1816r0q8c95y36ryzl9cni6zms5xm587wmdmy4xi92i8ic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldGNoIGEgcmFuZG9tIHdhbGxwYXBlciBmcm9tIGFuIG9ubGluZSBzb3VyY2UgYW5kIHNldCBpdCBhcyBhIGRlc2t0b3AgYmFja2dyb3VuZC4gXG5UaGUgZGVza3RvcCBiYWNrZ3JvdW5kIGNhbiBiZSB1cGRhdGVkIHBlcmlvZGljYWxseSBvciBtYW51YWxseS5cblxuRmVhdHVyZXM6XG5NYW55IGRpZmZlcmVudCBvbmxpbmUgc291cmNlcyB3aXRoIGZpbHRlcnM6XG4gICAgICAgIC0gVW5zcGxhc2ggKGh0dHBzOi8vdW5zcGxhc2guY29tLylcbiAgICAgICAgLSBXYWxsaGF2ZW4gKGh0dHBzOi8vd2FsbGhhdmVuLmNjLylcbiAgICAgICAgLSBSZWRkaXQgKGh0dHBzOi8vcmVkZGl0LmNvbSlcbiAgICAgICAgLSBCYXNpY2FsbHkgYW55IEpTT04gQVBJL0ZpbGUgKHNlZSBFeGFtcGxlcyBvbiBHaXRIdWIpXG5IaXN0b3J5IG9mIHByZXZpb3VzIGltYWdlc1xuU2V0IGxvY2sgc2NyZWVuIGltYWdlXG5BdXRvbWF0aWMgcmVuZXdhbCAoQXV0by1GZXRjaGluZykiLAogICJuYW1lIjogIlJhbmRvbSBXYWxscGFwZXIiLAogICJzZW1hbnRpYy12ZXJzaW9uIjogIjIuNC41IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLmlmbG93LnJhbmRvbXdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lmbDB3L1JhbmRvbVdhbGxwYXBlckdub21lMyIsCiAgInV1aWQiOiAicmFuZG9td2FsbHBhcGVyQGlmbG93LnNwYWNlIiwKICAidmVyc2lvbiI6IDIyCn0="}, "40": {"version": "31", "sha256": "1avzc1yxvr84qjjak9sdqbmjylw0vvll0rqjrx91fxdpwd5w88lw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldGNoIGEgcmFuZG9tIHdhbGxwYXBlciBmcm9tIGFuIG9ubGluZSBzb3VyY2UgYW5kIHNldCBpdCBhcyBhIGRlc2t0b3AgYmFja2dyb3VuZC4gXG5UaGUgZGVza3RvcCBiYWNrZ3JvdW5kIGNhbiBiZSB1cGRhdGVkIHBlcmlvZGljYWxseSBvciBtYW51YWxseS5cblxuRmVhdHVyZXM6XG5NYW55IGRpZmZlcmVudCBvbmxpbmUgc291cmNlcyB3aXRoIGZpbHRlcnM6XG4gICAgICAgIC0gVW5zcGxhc2ggKGh0dHBzOi8vdW5zcGxhc2guY29tLylcbiAgICAgICAgLSBXYWxsaGF2ZW4gKGh0dHBzOi8vd2FsbGhhdmVuLmNjLylcbiAgICAgICAgLSBSZWRkaXQgKGh0dHBzOi8vcmVkZGl0LmNvbSlcbiAgICAgICAgLSBCYXNpY2FsbHkgYW55IEpTT04gQVBJL0ZpbGUgKHNlZSBFeGFtcGxlcyBvbiBHaXRIdWIpXG5IaXN0b3J5IG9mIHByZXZpb3VzIGltYWdlc1xuU2V0IGxvY2sgc2NyZWVuIGltYWdlXG5BdXRvbWF0aWMgcmVuZXdhbCAoQXV0by1GZXRjaGluZykiLAogICJuYW1lIjogIlJhbmRvbSBXYWxscGFwZXIiLAogICJzZW1hbnRpYy12ZXJzaW9uIjogIjIuNy4zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLmlmbG93LnJhbmRvbXdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pZmwwdy9SYW5kb21XYWxscGFwZXJHbm9tZTMiLAogICJ1dWlkIjogInJhbmRvbXdhbGxwYXBlckBpZmxvdy5zcGFjZSIsCiAgInZlcnNpb24iOiAzMQp9"}, "41": {"version": "31", "sha256": "1avzc1yxvr84qjjak9sdqbmjylw0vvll0rqjrx91fxdpwd5w88lw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldGNoIGEgcmFuZG9tIHdhbGxwYXBlciBmcm9tIGFuIG9ubGluZSBzb3VyY2UgYW5kIHNldCBpdCBhcyBhIGRlc2t0b3AgYmFja2dyb3VuZC4gXG5UaGUgZGVza3RvcCBiYWNrZ3JvdW5kIGNhbiBiZSB1cGRhdGVkIHBlcmlvZGljYWxseSBvciBtYW51YWxseS5cblxuRmVhdHVyZXM6XG5NYW55IGRpZmZlcmVudCBvbmxpbmUgc291cmNlcyB3aXRoIGZpbHRlcnM6XG4gICAgICAgIC0gVW5zcGxhc2ggKGh0dHBzOi8vdW5zcGxhc2guY29tLylcbiAgICAgICAgLSBXYWxsaGF2ZW4gKGh0dHBzOi8vd2FsbGhhdmVuLmNjLylcbiAgICAgICAgLSBSZWRkaXQgKGh0dHBzOi8vcmVkZGl0LmNvbSlcbiAgICAgICAgLSBCYXNpY2FsbHkgYW55IEpTT04gQVBJL0ZpbGUgKHNlZSBFeGFtcGxlcyBvbiBHaXRIdWIpXG5IaXN0b3J5IG9mIHByZXZpb3VzIGltYWdlc1xuU2V0IGxvY2sgc2NyZWVuIGltYWdlXG5BdXRvbWF0aWMgcmVuZXdhbCAoQXV0by1GZXRjaGluZykiLAogICJuYW1lIjogIlJhbmRvbSBXYWxscGFwZXIiLAogICJzZW1hbnRpYy12ZXJzaW9uIjogIjIuNy4zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLmlmbG93LnJhbmRvbXdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pZmwwdy9SYW5kb21XYWxscGFwZXJHbm9tZTMiLAogICJ1dWlkIjogInJhbmRvbXdhbGxwYXBlckBpZmxvdy5zcGFjZSIsCiAgInZlcnNpb24iOiAzMQp9"}, "42": {"version": "31", "sha256": "1avzc1yxvr84qjjak9sdqbmjylw0vvll0rqjrx91fxdpwd5w88lw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldGNoIGEgcmFuZG9tIHdhbGxwYXBlciBmcm9tIGFuIG9ubGluZSBzb3VyY2UgYW5kIHNldCBpdCBhcyBhIGRlc2t0b3AgYmFja2dyb3VuZC4gXG5UaGUgZGVza3RvcCBiYWNrZ3JvdW5kIGNhbiBiZSB1cGRhdGVkIHBlcmlvZGljYWxseSBvciBtYW51YWxseS5cblxuRmVhdHVyZXM6XG5NYW55IGRpZmZlcmVudCBvbmxpbmUgc291cmNlcyB3aXRoIGZpbHRlcnM6XG4gICAgICAgIC0gVW5zcGxhc2ggKGh0dHBzOi8vdW5zcGxhc2guY29tLylcbiAgICAgICAgLSBXYWxsaGF2ZW4gKGh0dHBzOi8vd2FsbGhhdmVuLmNjLylcbiAgICAgICAgLSBSZWRkaXQgKGh0dHBzOi8vcmVkZGl0LmNvbSlcbiAgICAgICAgLSBCYXNpY2FsbHkgYW55IEpTT04gQVBJL0ZpbGUgKHNlZSBFeGFtcGxlcyBvbiBHaXRIdWIpXG5IaXN0b3J5IG9mIHByZXZpb3VzIGltYWdlc1xuU2V0IGxvY2sgc2NyZWVuIGltYWdlXG5BdXRvbWF0aWMgcmVuZXdhbCAoQXV0by1GZXRjaGluZykiLAogICJuYW1lIjogIlJhbmRvbSBXYWxscGFwZXIiLAogICJzZW1hbnRpYy12ZXJzaW9uIjogIjIuNy4zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLmlmbG93LnJhbmRvbXdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pZmwwdy9SYW5kb21XYWxscGFwZXJHbm9tZTMiLAogICJ1dWlkIjogInJhbmRvbXdhbGxwYXBlckBpZmxvdy5zcGFjZSIsCiAgInZlcnNpb24iOiAzMQp9"}, "43": {"version": "31", "sha256": "1avzc1yxvr84qjjak9sdqbmjylw0vvll0rqjrx91fxdpwd5w88lw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldGNoIGEgcmFuZG9tIHdhbGxwYXBlciBmcm9tIGFuIG9ubGluZSBzb3VyY2UgYW5kIHNldCBpdCBhcyBhIGRlc2t0b3AgYmFja2dyb3VuZC4gXG5UaGUgZGVza3RvcCBiYWNrZ3JvdW5kIGNhbiBiZSB1cGRhdGVkIHBlcmlvZGljYWxseSBvciBtYW51YWxseS5cblxuRmVhdHVyZXM6XG5NYW55IGRpZmZlcmVudCBvbmxpbmUgc291cmNlcyB3aXRoIGZpbHRlcnM6XG4gICAgICAgIC0gVW5zcGxhc2ggKGh0dHBzOi8vdW5zcGxhc2guY29tLylcbiAgICAgICAgLSBXYWxsaGF2ZW4gKGh0dHBzOi8vd2FsbGhhdmVuLmNjLylcbiAgICAgICAgLSBSZWRkaXQgKGh0dHBzOi8vcmVkZGl0LmNvbSlcbiAgICAgICAgLSBCYXNpY2FsbHkgYW55IEpTT04gQVBJL0ZpbGUgKHNlZSBFeGFtcGxlcyBvbiBHaXRIdWIpXG5IaXN0b3J5IG9mIHByZXZpb3VzIGltYWdlc1xuU2V0IGxvY2sgc2NyZWVuIGltYWdlXG5BdXRvbWF0aWMgcmVuZXdhbCAoQXV0by1GZXRjaGluZykiLAogICJuYW1lIjogIlJhbmRvbSBXYWxscGFwZXIiLAogICJzZW1hbnRpYy12ZXJzaW9uIjogIjIuNy4zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLmlmbG93LnJhbmRvbXdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pZmwwdy9SYW5kb21XYWxscGFwZXJHbm9tZTMiLAogICJ1dWlkIjogInJhbmRvbXdhbGxwYXBlckBpZmxvdy5zcGFjZSIsCiAgInZlcnNpb24iOiAzMQp9"}}} , {"uuid": "gse-haguichi-indicator@ztefn.github.com", "name": "Haguichi Indicator", "pname": "haguichi-indicator", "description": "Lets you control Haguichi directly from the system status area in GNOME Shell.", "link": "https://extensions.gnome.org/extension/1045/haguichi-indicator/", "shell_version_map": {"38": {"version": "19", "sha256": "0yph8cgi4jqb9br2pb009a01i5lg6r6r18kxrh963bymravv7nvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldHMgeW91IGNvbnRyb2wgSGFndWljaGkgZGlyZWN0bHkgZnJvbSB0aGUgc3lzdGVtIHN0YXR1cyBhcmVhIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiSGFndWljaGkgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3p0ZWZuL2dzZS1oYWd1aWNoaS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdzZS1oYWd1aWNoaS1pbmRpY2F0b3JAenRlZm4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "40": {"version": "19", "sha256": "0yph8cgi4jqb9br2pb009a01i5lg6r6r18kxrh963bymravv7nvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldHMgeW91IGNvbnRyb2wgSGFndWljaGkgZGlyZWN0bHkgZnJvbSB0aGUgc3lzdGVtIHN0YXR1cyBhcmVhIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiSGFndWljaGkgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3p0ZWZuL2dzZS1oYWd1aWNoaS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdzZS1oYWd1aWNoaS1pbmRpY2F0b3JAenRlZm4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "41": {"version": "19", "sha256": "0yph8cgi4jqb9br2pb009a01i5lg6r6r18kxrh963bymravv7nvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldHMgeW91IGNvbnRyb2wgSGFndWljaGkgZGlyZWN0bHkgZnJvbSB0aGUgc3lzdGVtIHN0YXR1cyBhcmVhIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiSGFndWljaGkgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3p0ZWZuL2dzZS1oYWd1aWNoaS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdzZS1oYWd1aWNoaS1pbmRpY2F0b3JAenRlZm4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "42": {"version": "19", "sha256": "0yph8cgi4jqb9br2pb009a01i5lg6r6r18kxrh963bymravv7nvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldHMgeW91IGNvbnRyb2wgSGFndWljaGkgZGlyZWN0bHkgZnJvbSB0aGUgc3lzdGVtIHN0YXR1cyBhcmVhIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiSGFndWljaGkgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3p0ZWZuL2dzZS1oYWd1aWNoaS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdzZS1oYWd1aWNoaS1pbmRpY2F0b3JAenRlZm4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "43": {"version": "19", "sha256": "0yph8cgi4jqb9br2pb009a01i5lg6r6r18kxrh963bymravv7nvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldHMgeW91IGNvbnRyb2wgSGFndWljaGkgZGlyZWN0bHkgZnJvbSB0aGUgc3lzdGVtIHN0YXR1cyBhcmVhIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiSGFndWljaGkgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3p0ZWZuL2dzZS1oYWd1aWNoaS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdzZS1oYWd1aWNoaS1pbmRpY2F0b3JAenRlZm4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}}} , {"uuid": "gnome-shutdown-button@kirby_33@hotmail.fr", "name": "Gnome-Shutdown Button", "pname": "gnome-shutdown-button", "description": "Add a power off button to easily turn off your computer.\nThis button replaces the power off icon in the system area of the Gnome panel.\nYou no longer need to open the system menu to turn off your computer.", "link": "https://extensions.gnome.org/extension/1056/gnome-shutdown-button/", "shell_version_map": {"40": {"version": "6", "sha256": "118p8avf2nfxpp3f7l1675s6glcjk0by9fvzrrdv2bqvi0mxnj15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHBvd2VyIG9mZiBidXR0b24gdG8gZWFzaWx5IHR1cm4gb2ZmIHlvdXIgY29tcHV0ZXIuXG5UaGlzIGJ1dHRvbiByZXBsYWNlcyB0aGUgcG93ZXIgb2ZmIGljb24gaW4gdGhlIHN5c3RlbSBhcmVhIG9mIHRoZSBHbm9tZSBwYW5lbC5cbllvdSBubyBsb25nZXIgbmVlZCB0byBvcGVuIHRoZSBzeXN0ZW0gbWVudSB0byB0dXJuIG9mZiB5b3VyIGNvbXB1dGVyLiIsCiAgIm5hbWUiOiAiR25vbWUtU2h1dGRvd24gQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcva2lyYnlfMzMvZ25vbWUtc2h1dGRvd24tYnV0dG9uLyIsCiAgInV1aWQiOiAiZ25vbWUtc2h1dGRvd24tYnV0dG9uQGtpcmJ5XzMzQGhvdG1haWwuZnIiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "118p8avf2nfxpp3f7l1675s6glcjk0by9fvzrrdv2bqvi0mxnj15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHBvd2VyIG9mZiBidXR0b24gdG8gZWFzaWx5IHR1cm4gb2ZmIHlvdXIgY29tcHV0ZXIuXG5UaGlzIGJ1dHRvbiByZXBsYWNlcyB0aGUgcG93ZXIgb2ZmIGljb24gaW4gdGhlIHN5c3RlbSBhcmVhIG9mIHRoZSBHbm9tZSBwYW5lbC5cbllvdSBubyBsb25nZXIgbmVlZCB0byBvcGVuIHRoZSBzeXN0ZW0gbWVudSB0byB0dXJuIG9mZiB5b3VyIGNvbXB1dGVyLiIsCiAgIm5hbWUiOiAiR25vbWUtU2h1dGRvd24gQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcva2lyYnlfMzMvZ25vbWUtc2h1dGRvd24tYnV0dG9uLyIsCiAgInV1aWQiOiAiZ25vbWUtc2h1dGRvd24tYnV0dG9uQGtpcmJ5XzMzQGhvdG1haWwuZnIiLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "118p8avf2nfxpp3f7l1675s6glcjk0by9fvzrrdv2bqvi0mxnj15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHBvd2VyIG9mZiBidXR0b24gdG8gZWFzaWx5IHR1cm4gb2ZmIHlvdXIgY29tcHV0ZXIuXG5UaGlzIGJ1dHRvbiByZXBsYWNlcyB0aGUgcG93ZXIgb2ZmIGljb24gaW4gdGhlIHN5c3RlbSBhcmVhIG9mIHRoZSBHbm9tZSBwYW5lbC5cbllvdSBubyBsb25nZXIgbmVlZCB0byBvcGVuIHRoZSBzeXN0ZW0gbWVudSB0byB0dXJuIG9mZiB5b3VyIGNvbXB1dGVyLiIsCiAgIm5hbWUiOiAiR25vbWUtU2h1dGRvd24gQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcva2lyYnlfMzMvZ25vbWUtc2h1dGRvd24tYnV0dG9uLyIsCiAgInV1aWQiOiAiZ25vbWUtc2h1dGRvd24tYnV0dG9uQGtpcmJ5XzMzQGhvdG1haWwuZnIiLAogICJ2ZXJzaW9uIjogNgp9"}}} -, {"uuid": "timezone@jwendell", "name": "Timezone", "pname": "timezone", "description": "See people with their timezones from the Shell", "link": "https://extensions.gnome.org/extension/1060/timezone/", "shell_version_map": {"40": {"version": "18", "sha256": "1ksb8pm2y4lxjcwn2l0yj6piz5cqgmzx6k4rygx1mbh5y76mwdji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSBwZW9wbGUgd2l0aCB0aGVpciB0aW1lem9uZXMgZnJvbSB0aGUgU2hlbGwiLAogICJuYW1lIjogIlRpbWV6b25lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWV6b25lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2p3ZW5kZWxsL2dub21lLXNoZWxsLWV4dGVuc2lvbi10aW1lem9uZSIsCiAgInV1aWQiOiAidGltZXpvbmVAandlbmRlbGwiLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "41": {"version": "21", "sha256": "04a9rhflbyfi9bwcb3iy5cijl2zj12f4f10d6v4h7rql3fz2r5vd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSBwZW9wbGUgd2l0aCB0aGVpciB0aW1lem9uZXMgZnJvbSB0aGUgU2hlbGwiLAogICJuYW1lIjogIlRpbWV6b25lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWV6b25lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qd2VuZGVsbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGltZXpvbmUiLAogICJ1dWlkIjogInRpbWV6b25lQGp3ZW5kZWxsIiwKICAidmVyc2lvbiI6IDIxCn0="}, "42": {"version": "21", "sha256": "04a9rhflbyfi9bwcb3iy5cijl2zj12f4f10d6v4h7rql3fz2r5vd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSBwZW9wbGUgd2l0aCB0aGVpciB0aW1lem9uZXMgZnJvbSB0aGUgU2hlbGwiLAogICJuYW1lIjogIlRpbWV6b25lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWV6b25lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qd2VuZGVsbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGltZXpvbmUiLAogICJ1dWlkIjogInRpbWV6b25lQGp3ZW5kZWxsIiwKICAidmVyc2lvbiI6IDIxCn0="}}} +, {"uuid": "timezone@jwendell", "name": "Timezone", "pname": "timezone", "description": "See people with their timezones from the Shell", "link": "https://extensions.gnome.org/extension/1060/timezone/", "shell_version_map": {"40": {"version": "18", "sha256": "1ksb8pm2y4lxjcwn2l0yj6piz5cqgmzx6k4rygx1mbh5y76mwdji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSBwZW9wbGUgd2l0aCB0aGVpciB0aW1lem9uZXMgZnJvbSB0aGUgU2hlbGwiLAogICJuYW1lIjogIlRpbWV6b25lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWV6b25lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2p3ZW5kZWxsL2dub21lLXNoZWxsLWV4dGVuc2lvbi10aW1lem9uZSIsCiAgInV1aWQiOiAidGltZXpvbmVAandlbmRlbGwiLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "41": {"version": "21", "sha256": "04a9rhflbyfi9bwcb3iy5cijl2zj12f4f10d6v4h7rql3fz2r5vd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSBwZW9wbGUgd2l0aCB0aGVpciB0aW1lem9uZXMgZnJvbSB0aGUgU2hlbGwiLAogICJuYW1lIjogIlRpbWV6b25lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWV6b25lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qd2VuZGVsbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGltZXpvbmUiLAogICJ1dWlkIjogInRpbWV6b25lQGp3ZW5kZWxsIiwKICAidmVyc2lvbiI6IDIxCn0="}, "42": {"version": "21", "sha256": "04a9rhflbyfi9bwcb3iy5cijl2zj12f4f10d6v4h7rql3fz2r5vd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSBwZW9wbGUgd2l0aCB0aGVpciB0aW1lem9uZXMgZnJvbSB0aGUgU2hlbGwiLAogICJuYW1lIjogIlRpbWV6b25lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWV6b25lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qd2VuZGVsbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGltZXpvbmUiLAogICJ1dWlkIjogInRpbWV6b25lQGp3ZW5kZWxsIiwKICAidmVyc2lvbiI6IDIxCn0="}, "43": {"version": "24", "sha256": "06mp40f1dgphvcj42am3j4l1svwip15mmj1s9nyxzazdwwqhh41a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSBwZW9wbGUgd2l0aCB0aGVpciB0aW1lem9uZXMgZnJvbSB0aGUgU2hlbGwiLAogICJuYW1lIjogIlRpbWV6b25lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWV6b25lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2p3ZW5kZWxsL2dub21lLXNoZWxsLWV4dGVuc2lvbi10aW1lem9uZSIsCiAgInV1aWQiOiAidGltZXpvbmVAandlbmRlbGwiLAogICJ2ZXJzaW9uIjogMjQKfQ=="}}} , {"uuid": "On_Screen_Keyboard_Button@bradan.eu", "name": "On Screen Keyboard Button", "pname": "on-screen-keyboard-button", "description": "Shows or hides the OSK via top bar button. It works with X, not with wayland. Wayland has it's own technique: swipe the keyboard up from the bottom display edge.\n\nSource code: https://github.com/Bradan/Gnome-On-Screen-Keyboard-Button", "link": "https://extensions.gnome.org/extension/1061/on-screen-keyboard-button/", "shell_version_map": {"38": {"version": "5", "sha256": "0z3jcv5gzv1pwfla9ghp5kjljc5n80fcab0d2c2i2pw7y7kvpabr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG9yIGhpZGVzIHRoZSBPU0sgdmlhIHRvcCBiYXIgYnV0dG9uLiBJdCB3b3JrcyB3aXRoIFgsIG5vdCB3aXRoIHdheWxhbmQuIFdheWxhbmQgaGFzIGl0J3Mgb3duIHRlY2huaXF1ZTogc3dpcGUgdGhlIGtleWJvYXJkIHVwIGZyb20gdGhlIGJvdHRvbSBkaXNwbGF5IGVkZ2UuXG5cblNvdXJjZSBjb2RlOiBodHRwczovL2dpdGh1Yi5jb20vQnJhZGFuL0dub21lLU9uLVNjcmVlbi1LZXlib2FyZC1CdXR0b24iLAogICJuYW1lIjogIk9uIFNjcmVlbiBLZXlib2FyZCBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjgiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiT25fU2NyZWVuX0tleWJvYXJkX0J1dHRvbkBicmFkYW4uZXUiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "System_Monitor@bghome.gmail.com", "name": "System Monitor", "pname": "system-monitor", "description": "Display resource usage.\n\nLinux distribution specific installation instructions can be found in the wiki at https://github.com/elvetemedve/gnome-shell-extension-system-monitor/wiki/Installation.\n\nPlease report bugs here: https://github.com/elvetemedve/gnome-shell-extension-system-monitor/issues", "link": "https://extensions.gnome.org/extension/1064/system-monitor/", "shell_version_map": {"38": {"version": "25", "sha256": "09hicika6w7kj38s5hnarxkhh1r0rq3vcq6mrkdssv511ljkr7m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAiU3lzdGVtX01vbml0b3JAYmdob21lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "40": {"version": "25", "sha256": "09hicika6w7kj38s5hnarxkhh1r0rq3vcq6mrkdssv511ljkr7m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAiU3lzdGVtX01vbml0b3JAYmdob21lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "41": {"version": "25", "sha256": "09hicika6w7kj38s5hnarxkhh1r0rq3vcq6mrkdssv511ljkr7m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAiU3lzdGVtX01vbml0b3JAYmdob21lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "42": {"version": "25", "sha256": "09hicika6w7kj38s5hnarxkhh1r0rq3vcq6mrkdssv511ljkr7m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAiU3lzdGVtX01vbml0b3JAYmdob21lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "43": {"version": "25", "sha256": "09hicika6w7kj38s5hnarxkhh1r0rq3vcq6mrkdssv511ljkr7m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAiU3lzdGVtX01vbml0b3JAYmdob21lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}}} , {"uuid": "syncthing@gnome.2nv2u.com", "name": "Syncthing Indicator", "pname": "syncthing-indicator", "description": "Shell indicator for starting, monitoring and controlling the Syncthing daemon using SystemD", "link": "https://extensions.gnome.org/extension/1070/syncthing-indicator/", "shell_version_map": {"38": {"version": "27", "sha256": "08l9xsbndgi7v863x76q4br89gjysaxwx8rhfkcp2nwqw247wfa2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8ybnYydS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nLWluZGljYXRvciIsCiAgInV1aWQiOiAic3luY3RoaW5nQGdub21lLjJudjJ1LmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "40": {"version": "27", "sha256": "08l9xsbndgi7v863x76q4br89gjysaxwx8rhfkcp2nwqw247wfa2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8ybnYydS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nLWluZGljYXRvciIsCiAgInV1aWQiOiAic3luY3RoaW5nQGdub21lLjJudjJ1LmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "27", "sha256": "08l9xsbndgi7v863x76q4br89gjysaxwx8rhfkcp2nwqw247wfa2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8ybnYydS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nLWluZGljYXRvciIsCiAgInV1aWQiOiAic3luY3RoaW5nQGdub21lLjJudjJ1LmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "42": {"version": "27", "sha256": "08l9xsbndgi7v863x76q4br89gjysaxwx8rhfkcp2nwqw247wfa2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8ybnYydS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nLWluZGljYXRvciIsCiAgInV1aWQiOiAic3luY3RoaW5nQGdub21lLjJudjJ1LmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "43": {"version": "28", "sha256": "08pyzrdyccr2gm3y5rh55fq8g1a4j6jlyk1c1dmlbsh4nzxwzvxm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vMm52MnUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5bmN0aGluZy1pbmRpY2F0b3IiLAogICJ1dWlkIjogInN5bmN0aGluZ0Bnbm9tZS4ybnYydS5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}}} , {"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": "16", "sha256": "1ab4dwz36jqcwqyf4311ln1s6622hbykd84l97442blvz108x9gk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgInV1aWQiOiAiYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXBAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiAxNgp9"}, "41": {"version": "16", "sha256": "1ab4dwz36jqcwqyf4311ln1s6622hbykd84l97442blvz108x9gk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgInV1aWQiOiAiYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXBAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiAxNgp9"}, "42": {"version": "16", "sha256": "1ab4dwz36jqcwqyf4311ln1s6622hbykd84l97442blvz108x9gk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgInV1aWQiOiAiYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXBAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiAxNgp9"}, "43": {"version": "16", "sha256": "1ab4dwz36jqcwqyf4311ln1s6622hbykd84l97442blvz108x9gk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgInV1aWQiOiAiYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXBAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiAxNgp9"}}} -, {"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": "39", "sha256": "0kzgzrvhy5si4yj05bkycypjb0si3y3q9y4yfjxvxg9z15cvzlis", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcGFuZWwgc2hvd2luZyB3aGV0aGVyIHlvdXIgZmF2b3JpdGUgVHdpdGNoLnR2IHN0cmVhbWVycyBhcmUgc3RyZWFtaW5nLlxuXG5DeWNsZXMgdGhyb3VnaCB0aGUgb25saW5lIHN0cmVhbWVycyBpZiBtdWx0aXBsZXMgYXJlIGNvbmZpZ3VyZWQuIENsaWNrIG9uIHRoZSBwYW5lbCBhbmQgdGhlbiBvbiBzdHJlYW1lcidzIG5hbWUgdG8gbGF1bmNoIHRoZSBzdHJlYW0gd2l0aCBhIGN1c3RvbSBjb21tYW5kICh5b3VyIGJyb3dzZXIgb3Igc29tZSBvdGhlciBhcHBsaWNhdGlvbikuXG5cbk5lZWRzIGN1cmwgYW5kIG1vZ3JpZnkgdG8gZnVsbHkgc3VwcG9ydCBzdHJlYW1lciBsb2dvcy4gRm9yIGFuIGV4dGVuc2lvbiB2ZXJzaW9uIGNvbXBhdGlibGUgd2l0aCBzaGVsbCB2ZXJzaW9uIDMuMzAgb3IgZWFybGllciB2aXNpdCBvdXIgZ2l0aHViIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHdpdGNobGl2ZSIsCiAgIm5hbWUiOiAiVHdpdGNoTGl2ZSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2l0Y2hsaXZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWF3ZWtpL3R3aXRjaGxpdmUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJUd2l0Y2hMaXZlX1BhbmVsQGV4dGVuc2lvbnMubWF3ZWtpLmRlIiwKICAidmVyc2lvbiI6IDM5Cn0="}, "41": {"version": "39", "sha256": "0kzgzrvhy5si4yj05bkycypjb0si3y3q9y4yfjxvxg9z15cvzlis", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcGFuZWwgc2hvd2luZyB3aGV0aGVyIHlvdXIgZmF2b3JpdGUgVHdpdGNoLnR2IHN0cmVhbWVycyBhcmUgc3RyZWFtaW5nLlxuXG5DeWNsZXMgdGhyb3VnaCB0aGUgb25saW5lIHN0cmVhbWVycyBpZiBtdWx0aXBsZXMgYXJlIGNvbmZpZ3VyZWQuIENsaWNrIG9uIHRoZSBwYW5lbCBhbmQgdGhlbiBvbiBzdHJlYW1lcidzIG5hbWUgdG8gbGF1bmNoIHRoZSBzdHJlYW0gd2l0aCBhIGN1c3RvbSBjb21tYW5kICh5b3VyIGJyb3dzZXIgb3Igc29tZSBvdGhlciBhcHBsaWNhdGlvbikuXG5cbk5lZWRzIGN1cmwgYW5kIG1vZ3JpZnkgdG8gZnVsbHkgc3VwcG9ydCBzdHJlYW1lciBsb2dvcy4gRm9yIGFuIGV4dGVuc2lvbiB2ZXJzaW9uIGNvbXBhdGlibGUgd2l0aCBzaGVsbCB2ZXJzaW9uIDMuMzAgb3IgZWFybGllciB2aXNpdCBvdXIgZ2l0aHViIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHdpdGNobGl2ZSIsCiAgIm5hbWUiOiAiVHdpdGNoTGl2ZSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2l0Y2hsaXZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWF3ZWtpL3R3aXRjaGxpdmUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJUd2l0Y2hMaXZlX1BhbmVsQGV4dGVuc2lvbnMubWF3ZWtpLmRlIiwKICAidmVyc2lvbiI6IDM5Cn0="}, "42": {"version": "39", "sha256": "0kzgzrvhy5si4yj05bkycypjb0si3y3q9y4yfjxvxg9z15cvzlis", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcGFuZWwgc2hvd2luZyB3aGV0aGVyIHlvdXIgZmF2b3JpdGUgVHdpdGNoLnR2IHN0cmVhbWVycyBhcmUgc3RyZWFtaW5nLlxuXG5DeWNsZXMgdGhyb3VnaCB0aGUgb25saW5lIHN0cmVhbWVycyBpZiBtdWx0aXBsZXMgYXJlIGNvbmZpZ3VyZWQuIENsaWNrIG9uIHRoZSBwYW5lbCBhbmQgdGhlbiBvbiBzdHJlYW1lcidzIG5hbWUgdG8gbGF1bmNoIHRoZSBzdHJlYW0gd2l0aCBhIGN1c3RvbSBjb21tYW5kICh5b3VyIGJyb3dzZXIgb3Igc29tZSBvdGhlciBhcHBsaWNhdGlvbikuXG5cbk5lZWRzIGN1cmwgYW5kIG1vZ3JpZnkgdG8gZnVsbHkgc3VwcG9ydCBzdHJlYW1lciBsb2dvcy4gRm9yIGFuIGV4dGVuc2lvbiB2ZXJzaW9uIGNvbXBhdGlibGUgd2l0aCBzaGVsbCB2ZXJzaW9uIDMuMzAgb3IgZWFybGllciB2aXNpdCBvdXIgZ2l0aHViIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHdpdGNobGl2ZSIsCiAgIm5hbWUiOiAiVHdpdGNoTGl2ZSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2l0Y2hsaXZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWF3ZWtpL3R3aXRjaGxpdmUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJUd2l0Y2hMaXZlX1BhbmVsQGV4dGVuc2lvbnMubWF3ZWtpLmRlIiwKICAidmVyc2lvbiI6IDM5Cn0="}}} -, {"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": "52", "sha256": "130dafqn6kzb6sz691firyr2jl68zbwm9vzy1gfaziqlz3kqffkw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tvbmtvci9jcHVmcmVxIiwKICAidXVpZCI6ICJjcHVmcmVxQGtvbmtvciIsCiAgInZlcnNpb24iOiA1Mgp9"}, "40": {"version": "52", "sha256": "130dafqn6kzb6sz691firyr2jl68zbwm9vzy1gfaziqlz3kqffkw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tvbmtvci9jcHVmcmVxIiwKICAidXVpZCI6ICJjcHVmcmVxQGtvbmtvciIsCiAgInZlcnNpb24iOiA1Mgp9"}, "41": {"version": "52", "sha256": "130dafqn6kzb6sz691firyr2jl68zbwm9vzy1gfaziqlz3kqffkw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tvbmtvci9jcHVmcmVxIiwKICAidXVpZCI6ICJjcHVmcmVxQGtvbmtvciIsCiAgInZlcnNpb24iOiA1Mgp9"}, "42": {"version": "52", "sha256": "130dafqn6kzb6sz691firyr2jl68zbwm9vzy1gfaziqlz3kqffkw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tvbmtvci9jcHVmcmVxIiwKICAidXVpZCI6ICJjcHVmcmVxQGtvbmtvciIsCiAgInZlcnNpb24iOiA1Mgp9"}}} +, {"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.", "link": "https://extensions.gnome.org/extension/1078/twitchlive-panel/", "shell_version_map": {"40": {"version": "39", "sha256": "0asq0rvcwl9rqa4l4c4qsjybpm1p0lyj2p6cz75lqrp0rfgzsvfb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcGFuZWwgc2hvd2luZyB3aGV0aGVyIHlvdXIgZmF2b3JpdGUgVHdpdGNoLnR2IHN0cmVhbWVycyBhcmUgc3RyZWFtaW5nLlxuXG5DeWNsZXMgdGhyb3VnaCB0aGUgb25saW5lIHN0cmVhbWVycyBpZiBtdWx0aXBsZXMgYXJlIGNvbmZpZ3VyZWQuIENsaWNrIG9uIHRoZSBwYW5lbCBhbmQgdGhlbiBvbiBzdHJlYW1lcidzIG5hbWUgdG8gbGF1bmNoIHRoZSBzdHJlYW0gd2l0aCBhIGN1c3RvbSBjb21tYW5kICh5b3VyIGJyb3dzZXIgb3Igc29tZSBvdGhlciBhcHBsaWNhdGlvbikuXG5cbk5lZWRzIGN1cmwgYW5kIG1vZ3JpZnkgdG8gZnVsbHkgc3VwcG9ydCBzdHJlYW1lciBsb2dvcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0d2l0Y2hsaXZlIiwKICAibmFtZSI6ICJUd2l0Y2hMaXZlIFBhbmVsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnR3aXRjaGxpdmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXdla2kvdHdpdGNobGl2ZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlR3aXRjaExpdmVfUGFuZWxAZXh0ZW5zaW9ucy5tYXdla2kuZGUiLAogICJ2ZXJzaW9uIjogMzkKfQ=="}, "41": {"version": "39", "sha256": "0asq0rvcwl9rqa4l4c4qsjybpm1p0lyj2p6cz75lqrp0rfgzsvfb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcGFuZWwgc2hvd2luZyB3aGV0aGVyIHlvdXIgZmF2b3JpdGUgVHdpdGNoLnR2IHN0cmVhbWVycyBhcmUgc3RyZWFtaW5nLlxuXG5DeWNsZXMgdGhyb3VnaCB0aGUgb25saW5lIHN0cmVhbWVycyBpZiBtdWx0aXBsZXMgYXJlIGNvbmZpZ3VyZWQuIENsaWNrIG9uIHRoZSBwYW5lbCBhbmQgdGhlbiBvbiBzdHJlYW1lcidzIG5hbWUgdG8gbGF1bmNoIHRoZSBzdHJlYW0gd2l0aCBhIGN1c3RvbSBjb21tYW5kICh5b3VyIGJyb3dzZXIgb3Igc29tZSBvdGhlciBhcHBsaWNhdGlvbikuXG5cbk5lZWRzIGN1cmwgYW5kIG1vZ3JpZnkgdG8gZnVsbHkgc3VwcG9ydCBzdHJlYW1lciBsb2dvcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0d2l0Y2hsaXZlIiwKICAibmFtZSI6ICJUd2l0Y2hMaXZlIFBhbmVsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnR3aXRjaGxpdmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXdla2kvdHdpdGNobGl2ZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlR3aXRjaExpdmVfUGFuZWxAZXh0ZW5zaW9ucy5tYXdla2kuZGUiLAogICJ2ZXJzaW9uIjogMzkKfQ=="}, "42": {"version": "39", "sha256": "0asq0rvcwl9rqa4l4c4qsjybpm1p0lyj2p6cz75lqrp0rfgzsvfb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcGFuZWwgc2hvd2luZyB3aGV0aGVyIHlvdXIgZmF2b3JpdGUgVHdpdGNoLnR2IHN0cmVhbWVycyBhcmUgc3RyZWFtaW5nLlxuXG5DeWNsZXMgdGhyb3VnaCB0aGUgb25saW5lIHN0cmVhbWVycyBpZiBtdWx0aXBsZXMgYXJlIGNvbmZpZ3VyZWQuIENsaWNrIG9uIHRoZSBwYW5lbCBhbmQgdGhlbiBvbiBzdHJlYW1lcidzIG5hbWUgdG8gbGF1bmNoIHRoZSBzdHJlYW0gd2l0aCBhIGN1c3RvbSBjb21tYW5kICh5b3VyIGJyb3dzZXIgb3Igc29tZSBvdGhlciBhcHBsaWNhdGlvbikuXG5cbk5lZWRzIGN1cmwgYW5kIG1vZ3JpZnkgdG8gZnVsbHkgc3VwcG9ydCBzdHJlYW1lciBsb2dvcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0d2l0Y2hsaXZlIiwKICAibmFtZSI6ICJUd2l0Y2hMaXZlIFBhbmVsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnR3aXRjaGxpdmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXdla2kvdHdpdGNobGl2ZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlR3aXRjaExpdmVfUGFuZWxAZXh0ZW5zaW9ucy5tYXdla2kuZGUiLAogICJ2ZXJzaW9uIjogMzkKfQ=="}, "43": {"version": "40", "sha256": "1sywzqy85dmv72iakvhpbpagj2vh6svgxjyx9amlc3a8ajhvws33", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcGFuZWwgc2hvd2luZyB3aGV0aGVyIHlvdXIgZmF2b3JpdGUgVHdpdGNoLnR2IHN0cmVhbWVycyBhcmUgc3RyZWFtaW5nLlxuXG5DeWNsZXMgdGhyb3VnaCB0aGUgb25saW5lIHN0cmVhbWVycyBpZiBtdWx0aXBsZXMgYXJlIGNvbmZpZ3VyZWQuIENsaWNrIG9uIHRoZSBwYW5lbCBhbmQgdGhlbiBvbiBzdHJlYW1lcidzIG5hbWUgdG8gbGF1bmNoIHRoZSBzdHJlYW0gd2l0aCBhIGN1c3RvbSBjb21tYW5kICh5b3VyIGJyb3dzZXIgb3Igc29tZSBvdGhlciBhcHBsaWNhdGlvbikuXG5cbk5lZWRzIGN1cmwgYW5kIG1vZ3JpZnkgdG8gZnVsbHkgc3VwcG9ydCBzdHJlYW1lciBsb2dvcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0d2l0Y2hsaXZlIiwKICAibmFtZSI6ICJUd2l0Y2hMaXZlIFBhbmVsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnR3aXRjaGxpdmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWF3ZWtpL3R3aXRjaGxpdmUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJUd2l0Y2hMaXZlX1BhbmVsQGV4dGVuc2lvbnMubWF3ZWtpLmRlIiwKICAidmVyc2lvbiI6IDQwCn0="}}} +, {"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": "53", "sha256": "0wf2zdchj5rcjz848w60wik77bmjfpihnmb9xib04gpnsybxz8z8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb25rb3IvY3B1ZnJlcSIsCiAgInV1aWQiOiAiY3B1ZnJlcUBrb25rb3IiLAogICJ2ZXJzaW9uIjogNTMKfQ=="}, "40": {"version": "53", "sha256": "0wf2zdchj5rcjz848w60wik77bmjfpihnmb9xib04gpnsybxz8z8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb25rb3IvY3B1ZnJlcSIsCiAgInV1aWQiOiAiY3B1ZnJlcUBrb25rb3IiLAogICJ2ZXJzaW9uIjogNTMKfQ=="}, "41": {"version": "53", "sha256": "0wf2zdchj5rcjz848w60wik77bmjfpihnmb9xib04gpnsybxz8z8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb25rb3IvY3B1ZnJlcSIsCiAgInV1aWQiOiAiY3B1ZnJlcUBrb25rb3IiLAogICJ2ZXJzaW9uIjogNTMKfQ=="}, "42": {"version": "53", "sha256": "0wf2zdchj5rcjz848w60wik77bmjfpihnmb9xib04gpnsybxz8z8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb25rb3IvY3B1ZnJlcSIsCiAgInV1aWQiOiAiY3B1ZnJlcUBrb25rb3IiLAogICJ2ZXJzaW9uIjogNTMKfQ=="}, "43": {"version": "53", "sha256": "0wf2zdchj5rcjz848w60wik77bmjfpihnmb9xib04gpnsybxz8z8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb25rb3IvY3B1ZnJlcSIsCiAgInV1aWQiOiAiY3B1ZnJlcUBrb25rb3IiLAogICJ2ZXJzaW9uIjogNTMKfQ=="}}} , {"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": "29", "sha256": "10a9q8s9swxqz5m6s22mbh4v89mi1f7mzpjxw73lljscgac1y7ah", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jpamkvc2ltcGxlbmV0c3BlZWQiLAogICJ1dWlkIjogInNpbXBsZW5ldHNwZWVkQGJpamkuZXh0ZW5zaW9uIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "40": {"version": "29", "sha256": "10a9q8s9swxqz5m6s22mbh4v89mi1f7mzpjxw73lljscgac1y7ah", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jpamkvc2ltcGxlbmV0c3BlZWQiLAogICJ1dWlkIjogInNpbXBsZW5ldHNwZWVkQGJpamkuZXh0ZW5zaW9uIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "41": {"version": "29", "sha256": "10a9q8s9swxqz5m6s22mbh4v89mi1f7mzpjxw73lljscgac1y7ah", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jpamkvc2ltcGxlbmV0c3BlZWQiLAogICJ1dWlkIjogInNpbXBsZW5ldHNwZWVkQGJpamkuZXh0ZW5zaW9uIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "42": {"version": "29", "sha256": "10a9q8s9swxqz5m6s22mbh4v89mi1f7mzpjxw73lljscgac1y7ah", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jpamkvc2ltcGxlbmV0c3BlZWQiLAogICJ1dWlkIjogInNpbXBsZW5ldHNwZWVkQGJpamkuZXh0ZW5zaW9uIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "43": {"version": "29", "sha256": "10a9q8s9swxqz5m6s22mbh4v89mi1f7mzpjxw73lljscgac1y7ah", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jpamkvc2ltcGxlbmV0c3BlZWQiLAogICJ1dWlkIjogInNpbXBsZW5ldHNwZWVkQGJpamkuZXh0ZW5zaW9uIiwKICAidmVyc2lvbiI6IDI5Cn0="}}} , {"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": "10", "sha256": "06nxsbvka6i9r4dsq7cmdmz51sria80wxk790rm25vbabzisn2q6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmphbi9nbm9tZS1zaGVsbC1nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2VAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "06nxsbvka6i9r4dsq7cmdmz51sria80wxk790rm25vbabzisn2q6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmphbi9nbm9tZS1zaGVsbC1nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2VAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "06nxsbvka6i9r4dsq7cmdmz51sria80wxk790rm25vbabzisn2q6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmphbi9nbm9tZS1zaGVsbC1nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2VAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "06nxsbvka6i9r4dsq7cmdmz51sria80wxk790rm25vbabzisn2q6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmphbi9nbm9tZS1zaGVsbC1nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2VAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "10", "sha256": "06nxsbvka6i9r4dsq7cmdmz51sria80wxk790rm25vbabzisn2q6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmphbi9nbm9tZS1zaGVsbC1nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2VAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "KeepAwake@jepfa.de", "name": "Keep awake!", "pname": "keep-awake", "description": "Keep your computer awake! Prevents that your computer activates sceensaver, turns off its screen(s) or goes to hibernate when not actively used for a while. Click the indicator icon once to keep your computer awake for the current session. Click again to keep it awake also between restarts (indicated by a small lock icon on the indicator). Clicking again to not keep awake.", "link": "https://extensions.gnome.org/extension/1097/keep-awake/", "shell_version_map": {"38": {"version": "10", "sha256": "08bl5ijlpm493h3gxi6rp3i5dlzgf326p6xj9jwm9681232flnq3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgaXRzIHNjcmVlbihzKSBvciBnb2VzIHRvIGhpYmVybmF0ZSB3aGVuIG5vdCBhY3RpdmVseSB1c2VkIGZvciBhIHdoaWxlLiBDbGljayB0aGUgaW5kaWNhdG9yIGljb24gb25jZSB0byBrZWVwIHlvdXIgY29tcHV0ZXIgYXdha2UgZm9yIHRoZSBjdXJyZW50IHNlc3Npb24uIENsaWNrIGFnYWluIHRvIGtlZXAgaXQgYXdha2UgYWxzbyBiZXR3ZWVuIHJlc3RhcnRzIChpbmRpY2F0ZWQgYnkgYSBzbWFsbCBsb2NrIGljb24gb24gdGhlIGluZGljYXRvcikuIENsaWNraW5nIGFnYWluIHRvIG5vdCBrZWVwIGF3YWtlLiIsCiAgIm5hbWUiOiAiS2VlcCBhd2FrZSEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuS2VlcEF3YWtlQGplcGZhLmRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plbnNwZmFobC9LZWVwQXdha2UiLAogICJ1dWlkIjogIktlZXBBd2FrZUBqZXBmYS5kZSIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "08bl5ijlpm493h3gxi6rp3i5dlzgf326p6xj9jwm9681232flnq3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgaXRzIHNjcmVlbihzKSBvciBnb2VzIHRvIGhpYmVybmF0ZSB3aGVuIG5vdCBhY3RpdmVseSB1c2VkIGZvciBhIHdoaWxlLiBDbGljayB0aGUgaW5kaWNhdG9yIGljb24gb25jZSB0byBrZWVwIHlvdXIgY29tcHV0ZXIgYXdha2UgZm9yIHRoZSBjdXJyZW50IHNlc3Npb24uIENsaWNrIGFnYWluIHRvIGtlZXAgaXQgYXdha2UgYWxzbyBiZXR3ZWVuIHJlc3RhcnRzIChpbmRpY2F0ZWQgYnkgYSBzbWFsbCBsb2NrIGljb24gb24gdGhlIGluZGljYXRvcikuIENsaWNraW5nIGFnYWluIHRvIG5vdCBrZWVwIGF3YWtlLiIsCiAgIm5hbWUiOiAiS2VlcCBhd2FrZSEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuS2VlcEF3YWtlQGplcGZhLmRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plbnNwZmFobC9LZWVwQXdha2UiLAogICJ1dWlkIjogIktlZXBBd2FrZUBqZXBmYS5kZSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "08bl5ijlpm493h3gxi6rp3i5dlzgf326p6xj9jwm9681232flnq3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgaXRzIHNjcmVlbihzKSBvciBnb2VzIHRvIGhpYmVybmF0ZSB3aGVuIG5vdCBhY3RpdmVseSB1c2VkIGZvciBhIHdoaWxlLiBDbGljayB0aGUgaW5kaWNhdG9yIGljb24gb25jZSB0byBrZWVwIHlvdXIgY29tcHV0ZXIgYXdha2UgZm9yIHRoZSBjdXJyZW50IHNlc3Npb24uIENsaWNrIGFnYWluIHRvIGtlZXAgaXQgYXdha2UgYWxzbyBiZXR3ZWVuIHJlc3RhcnRzIChpbmRpY2F0ZWQgYnkgYSBzbWFsbCBsb2NrIGljb24gb24gdGhlIGluZGljYXRvcikuIENsaWNraW5nIGFnYWluIHRvIG5vdCBrZWVwIGF3YWtlLiIsCiAgIm5hbWUiOiAiS2VlcCBhd2FrZSEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuS2VlcEF3YWtlQGplcGZhLmRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plbnNwZmFobC9LZWVwQXdha2UiLAogICJ1dWlkIjogIktlZXBBd2FrZUBqZXBmYS5kZSIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "08bl5ijlpm493h3gxi6rp3i5dlzgf326p6xj9jwm9681232flnq3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgaXRzIHNjcmVlbihzKSBvciBnb2VzIHRvIGhpYmVybmF0ZSB3aGVuIG5vdCBhY3RpdmVseSB1c2VkIGZvciBhIHdoaWxlLiBDbGljayB0aGUgaW5kaWNhdG9yIGljb24gb25jZSB0byBrZWVwIHlvdXIgY29tcHV0ZXIgYXdha2UgZm9yIHRoZSBjdXJyZW50IHNlc3Npb24uIENsaWNrIGFnYWluIHRvIGtlZXAgaXQgYXdha2UgYWxzbyBiZXR3ZWVuIHJlc3RhcnRzIChpbmRpY2F0ZWQgYnkgYSBzbWFsbCBsb2NrIGljb24gb24gdGhlIGluZGljYXRvcikuIENsaWNraW5nIGFnYWluIHRvIG5vdCBrZWVwIGF3YWtlLiIsCiAgIm5hbWUiOiAiS2VlcCBhd2FrZSEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuS2VlcEF3YWtlQGplcGZhLmRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plbnNwZmFobC9LZWVwQXdha2UiLAogICJ1dWlkIjogIktlZXBBd2FrZUBqZXBmYS5kZSIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "10", "sha256": "08bl5ijlpm493h3gxi6rp3i5dlzgf326p6xj9jwm9681232flnq3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgaXRzIHNjcmVlbihzKSBvciBnb2VzIHRvIGhpYmVybmF0ZSB3aGVuIG5vdCBhY3RpdmVseSB1c2VkIGZvciBhIHdoaWxlLiBDbGljayB0aGUgaW5kaWNhdG9yIGljb24gb25jZSB0byBrZWVwIHlvdXIgY29tcHV0ZXIgYXdha2UgZm9yIHRoZSBjdXJyZW50IHNlc3Npb24uIENsaWNrIGFnYWluIHRvIGtlZXAgaXQgYXdha2UgYWxzbyBiZXR3ZWVuIHJlc3RhcnRzIChpbmRpY2F0ZWQgYnkgYSBzbWFsbCBsb2NrIGljb24gb24gdGhlIGluZGljYXRvcikuIENsaWNraW5nIGFnYWluIHRvIG5vdCBrZWVwIGF3YWtlLiIsCiAgIm5hbWUiOiAiS2VlcCBhd2FrZSEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuS2VlcEF3YWtlQGplcGZhLmRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plbnNwZmFobC9LZWVwQXdha2UiLAogICJ1dWlkIjogIktlZXBBd2FrZUBqZXBmYS5kZSIsCiAgInZlcnNpb24iOiAxMAp9"}}} -, {"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": "13", "sha256": "1mvx4l04yhw5hjphw5iyrsdzvgmkh1c7yri3gg80qs41vs8hfry9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB0b2RvIGxpc3Qgd2l0aCBhbiBhcHBsZXRcblxuKiBBZGQgYW5kIHJlbW92ZSB0YXNrIG9uIHlvdXIgbGlzdCBpbiBkaWZmZXJlbnQgc2VjdGlvbnMuXG4qIENsaWNrIGFuIGl0ZW0gdG8gcmVuYW1lIGl0LlxuKiBBY2Nlc3MgdGhlIGV4dGVuc2lvbiB1c2luZyBIb3QtS2V5IChkZWZhdWx0OiBDdHJsK1NwYWNlKVxuIiwKICAibmFtZSI6ICJTZWN0aW9uIFRvZG8gTGlzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvbU1vcmFsL1RvRG9MaXN0IiwKICAidXVpZCI6ICJ0b2RvbGlzdEB0b21Nb3JhbC5vcmciLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "40": {"version": "13", "sha256": "1mvx4l04yhw5hjphw5iyrsdzvgmkh1c7yri3gg80qs41vs8hfry9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB0b2RvIGxpc3Qgd2l0aCBhbiBhcHBsZXRcblxuKiBBZGQgYW5kIHJlbW92ZSB0YXNrIG9uIHlvdXIgbGlzdCBpbiBkaWZmZXJlbnQgc2VjdGlvbnMuXG4qIENsaWNrIGFuIGl0ZW0gdG8gcmVuYW1lIGl0LlxuKiBBY2Nlc3MgdGhlIGV4dGVuc2lvbiB1c2luZyBIb3QtS2V5IChkZWZhdWx0OiBDdHJsK1NwYWNlKVxuIiwKICAibmFtZSI6ICJTZWN0aW9uIFRvZG8gTGlzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvbU1vcmFsL1RvRG9MaXN0IiwKICAidXVpZCI6ICJ0b2RvbGlzdEB0b21Nb3JhbC5vcmciLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "42": {"version": "13", "sha256": "1mvx4l04yhw5hjphw5iyrsdzvgmkh1c7yri3gg80qs41vs8hfry9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB0b2RvIGxpc3Qgd2l0aCBhbiBhcHBsZXRcblxuKiBBZGQgYW5kIHJlbW92ZSB0YXNrIG9uIHlvdXIgbGlzdCBpbiBkaWZmZXJlbnQgc2VjdGlvbnMuXG4qIENsaWNrIGFuIGl0ZW0gdG8gcmVuYW1lIGl0LlxuKiBBY2Nlc3MgdGhlIGV4dGVuc2lvbiB1c2luZyBIb3QtS2V5IChkZWZhdWx0OiBDdHJsK1NwYWNlKVxuIiwKICAibmFtZSI6ICJTZWN0aW9uIFRvZG8gTGlzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvbU1vcmFsL1RvRG9MaXN0IiwKICAidXVpZCI6ICJ0b2RvbGlzdEB0b21Nb3JhbC5vcmciLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "43": {"version": "13", "sha256": "1mvx4l04yhw5hjphw5iyrsdzvgmkh1c7yri3gg80qs41vs8hfry9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB0b2RvIGxpc3Qgd2l0aCBhbiBhcHBsZXRcblxuKiBBZGQgYW5kIHJlbW92ZSB0YXNrIG9uIHlvdXIgbGlzdCBpbiBkaWZmZXJlbnQgc2VjdGlvbnMuXG4qIENsaWNrIGFuIGl0ZW0gdG8gcmVuYW1lIGl0LlxuKiBBY2Nlc3MgdGhlIGV4dGVuc2lvbiB1c2luZyBIb3QtS2V5IChkZWZhdWx0OiBDdHJsK1NwYWNlKVxuIiwKICAibmFtZSI6ICJTZWN0aW9uIFRvZG8gTGlzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvbU1vcmFsL1RvRG9MaXN0IiwKICAidXVpZCI6ICJ0b2RvbGlzdEB0b21Nb3JhbC5vcmciLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} -, {"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.\n\n--\n\nIf you liked this extension and want to reward me somehow, you can warm my heart simply by saying \"thank you\" on the comments below or by buying me a cup of coffee :)\n\nhttps://www.buymeacoffee.com/brendaw (in US Dollars)\nhttps://ko-fi.com/brendaw (in Brazilian Reais)", "link": "https://extensions.gnome.org/extension/1108/add-username-to-top-panel/", "shell_version_map": {"38": {"version": "8", "sha256": "1mym2czsc7gqn1dc858wp31dvpxwzh2wyfvz2v0wfy0ylywvnlka", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgYWdncmVnYXRlIG1lbnUuXG5cbi0tXG5cbklmIHlvdSBsaWtlZCB0aGlzIGV4dGVuc2lvbiBhbmQgd2FudCB0byByZXdhcmQgbWUgc29tZWhvdywgeW91IGNhbiB3YXJtIG15IGhlYXJ0IHNpbXBseSBieSBzYXlpbmcgXCJ0aGFuayB5b3VcIiBvbiB0aGUgY29tbWVudHMgYmVsb3cgb3IgYnkgYnV5aW5nIG1lIGEgY3VwIG9mIGNvZmZlZSA6KVxuXG5odHRwczovL3d3dy5idXltZWFjb2ZmZWUuY29tL2JyZW5kYXcgKGluIFVTIERvbGxhcnMpXG5odHRwczovL2tvLWZpLmNvbS9icmVuZGF3IChpbiBCcmF6aWxpYW4gUmVhaXMpIiwKICAibmFtZSI6ICJBZGQgVXNlcm5hbWUgdG8gVG9wIFBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ3aWxsaWFtYnJlbmRhd0Bwcm90b25tYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMjAuNCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JyZW5kYXcvYWRkLXVzZXJuYW1lLXRvcHBhbmVsIiwKICAidXVpZCI6ICJhZGQtdXNlcm5hbWUtdG9wcGFuZWxAYnJlbmRhdy5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "1mym2czsc7gqn1dc858wp31dvpxwzh2wyfvz2v0wfy0ylywvnlka", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgYWdncmVnYXRlIG1lbnUuXG5cbi0tXG5cbklmIHlvdSBsaWtlZCB0aGlzIGV4dGVuc2lvbiBhbmQgd2FudCB0byByZXdhcmQgbWUgc29tZWhvdywgeW91IGNhbiB3YXJtIG15IGhlYXJ0IHNpbXBseSBieSBzYXlpbmcgXCJ0aGFuayB5b3VcIiBvbiB0aGUgY29tbWVudHMgYmVsb3cgb3IgYnkgYnV5aW5nIG1lIGEgY3VwIG9mIGNvZmZlZSA6KVxuXG5odHRwczovL3d3dy5idXltZWFjb2ZmZWUuY29tL2JyZW5kYXcgKGluIFVTIERvbGxhcnMpXG5odHRwczovL2tvLWZpLmNvbS9icmVuZGF3IChpbiBCcmF6aWxpYW4gUmVhaXMpIiwKICAibmFtZSI6ICJBZGQgVXNlcm5hbWUgdG8gVG9wIFBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ3aWxsaWFtYnJlbmRhd0Bwcm90b25tYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMjAuNCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JyZW5kYXcvYWRkLXVzZXJuYW1lLXRvcHBhbmVsIiwKICAidXVpZCI6ICJhZGQtdXNlcm5hbWUtdG9wcGFuZWxAYnJlbmRhdy5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "1mym2czsc7gqn1dc858wp31dvpxwzh2wyfvz2v0wfy0ylywvnlka", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgYWdncmVnYXRlIG1lbnUuXG5cbi0tXG5cbklmIHlvdSBsaWtlZCB0aGlzIGV4dGVuc2lvbiBhbmQgd2FudCB0byByZXdhcmQgbWUgc29tZWhvdywgeW91IGNhbiB3YXJtIG15IGhlYXJ0IHNpbXBseSBieSBzYXlpbmcgXCJ0aGFuayB5b3VcIiBvbiB0aGUgY29tbWVudHMgYmVsb3cgb3IgYnkgYnV5aW5nIG1lIGEgY3VwIG9mIGNvZmZlZSA6KVxuXG5odHRwczovL3d3dy5idXltZWFjb2ZmZWUuY29tL2JyZW5kYXcgKGluIFVTIERvbGxhcnMpXG5odHRwczovL2tvLWZpLmNvbS9icmVuZGF3IChpbiBCcmF6aWxpYW4gUmVhaXMpIiwKICAibmFtZSI6ICJBZGQgVXNlcm5hbWUgdG8gVG9wIFBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ3aWxsaWFtYnJlbmRhd0Bwcm90b25tYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMjAuNCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JyZW5kYXcvYWRkLXVzZXJuYW1lLXRvcHBhbmVsIiwKICAidXVpZCI6ICJhZGQtdXNlcm5hbWUtdG9wcGFuZWxAYnJlbmRhdy5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "1mym2czsc7gqn1dc858wp31dvpxwzh2wyfvz2v0wfy0ylywvnlka", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgYWdncmVnYXRlIG1lbnUuXG5cbi0tXG5cbklmIHlvdSBsaWtlZCB0aGlzIGV4dGVuc2lvbiBhbmQgd2FudCB0byByZXdhcmQgbWUgc29tZWhvdywgeW91IGNhbiB3YXJtIG15IGhlYXJ0IHNpbXBseSBieSBzYXlpbmcgXCJ0aGFuayB5b3VcIiBvbiB0aGUgY29tbWVudHMgYmVsb3cgb3IgYnkgYnV5aW5nIG1lIGEgY3VwIG9mIGNvZmZlZSA6KVxuXG5odHRwczovL3d3dy5idXltZWFjb2ZmZWUuY29tL2JyZW5kYXcgKGluIFVTIERvbGxhcnMpXG5odHRwczovL2tvLWZpLmNvbS9icmVuZGF3IChpbiBCcmF6aWxpYW4gUmVhaXMpIiwKICAibmFtZSI6ICJBZGQgVXNlcm5hbWUgdG8gVG9wIFBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ3aWxsaWFtYnJlbmRhd0Bwcm90b25tYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMjAuNCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JyZW5kYXcvYWRkLXVzZXJuYW1lLXRvcHBhbmVsIiwKICAidXVpZCI6ICJhZGQtdXNlcm5hbWUtdG9wcGFuZWxAYnJlbmRhdy5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}}} +, {"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\n**Note:** I don't come on this page often so if you need any help, please refer to the github repo and open an issue :) ", "link": "https://extensions.gnome.org/extension/1104/section-todo-list/", "shell_version_map": {"38": {"version": "13", "sha256": "0q2sl28w2dmcdxvhvwvldmm89qh3m83678nww0v6varbmf99vj1b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB0b2RvIGxpc3Qgd2l0aCBhbiBhcHBsZXRcblxuKiBBZGQgYW5kIHJlbW92ZSB0YXNrIG9uIHlvdXIgbGlzdCBpbiBkaWZmZXJlbnQgc2VjdGlvbnMuXG4qIENsaWNrIGFuIGl0ZW0gdG8gcmVuYW1lIGl0LlxuKiBBY2Nlc3MgdGhlIGV4dGVuc2lvbiB1c2luZyBIb3QtS2V5IChkZWZhdWx0OiBDdHJsK1NwYWNlKVxuXG4qKk5vdGU6KiogSSBkb24ndCBjb21lIG9uIHRoaXMgcGFnZSBvZnRlbiBzbyBpZiB5b3UgbmVlZCBhbnkgaGVscCwgcGxlYXNlIHJlZmVyIHRvIHRoZSBnaXRodWIgcmVwbyBhbmQgb3BlbiBhbiBpc3N1ZSA6KSAiLAogICJuYW1lIjogIlNlY3Rpb24gVG9kbyBMaXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9tTW9yYWwvVG9Eb0xpc3QiLAogICJ1dWlkIjogInRvZG9saXN0QHRvbU1vcmFsLm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "13", "sha256": "0q2sl28w2dmcdxvhvwvldmm89qh3m83678nww0v6varbmf99vj1b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB0b2RvIGxpc3Qgd2l0aCBhbiBhcHBsZXRcblxuKiBBZGQgYW5kIHJlbW92ZSB0YXNrIG9uIHlvdXIgbGlzdCBpbiBkaWZmZXJlbnQgc2VjdGlvbnMuXG4qIENsaWNrIGFuIGl0ZW0gdG8gcmVuYW1lIGl0LlxuKiBBY2Nlc3MgdGhlIGV4dGVuc2lvbiB1c2luZyBIb3QtS2V5IChkZWZhdWx0OiBDdHJsK1NwYWNlKVxuXG4qKk5vdGU6KiogSSBkb24ndCBjb21lIG9uIHRoaXMgcGFnZSBvZnRlbiBzbyBpZiB5b3UgbmVlZCBhbnkgaGVscCwgcGxlYXNlIHJlZmVyIHRvIHRoZSBnaXRodWIgcmVwbyBhbmQgb3BlbiBhbiBpc3N1ZSA6KSAiLAogICJuYW1lIjogIlNlY3Rpb24gVG9kbyBMaXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9tTW9yYWwvVG9Eb0xpc3QiLAogICJ1dWlkIjogInRvZG9saXN0QHRvbU1vcmFsLm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"}, "42": {"version": "13", "sha256": "0q2sl28w2dmcdxvhvwvldmm89qh3m83678nww0v6varbmf99vj1b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB0b2RvIGxpc3Qgd2l0aCBhbiBhcHBsZXRcblxuKiBBZGQgYW5kIHJlbW92ZSB0YXNrIG9uIHlvdXIgbGlzdCBpbiBkaWZmZXJlbnQgc2VjdGlvbnMuXG4qIENsaWNrIGFuIGl0ZW0gdG8gcmVuYW1lIGl0LlxuKiBBY2Nlc3MgdGhlIGV4dGVuc2lvbiB1c2luZyBIb3QtS2V5IChkZWZhdWx0OiBDdHJsK1NwYWNlKVxuXG4qKk5vdGU6KiogSSBkb24ndCBjb21lIG9uIHRoaXMgcGFnZSBvZnRlbiBzbyBpZiB5b3UgbmVlZCBhbnkgaGVscCwgcGxlYXNlIHJlZmVyIHRvIHRoZSBnaXRodWIgcmVwbyBhbmQgb3BlbiBhbiBpc3N1ZSA6KSAiLAogICJuYW1lIjogIlNlY3Rpb24gVG9kbyBMaXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9tTW9yYWwvVG9Eb0xpc3QiLAogICJ1dWlkIjogInRvZG9saXN0QHRvbU1vcmFsLm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"}, "43": {"version": "13", "sha256": "0q2sl28w2dmcdxvhvwvldmm89qh3m83678nww0v6varbmf99vj1b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB0b2RvIGxpc3Qgd2l0aCBhbiBhcHBsZXRcblxuKiBBZGQgYW5kIHJlbW92ZSB0YXNrIG9uIHlvdXIgbGlzdCBpbiBkaWZmZXJlbnQgc2VjdGlvbnMuXG4qIENsaWNrIGFuIGl0ZW0gdG8gcmVuYW1lIGl0LlxuKiBBY2Nlc3MgdGhlIGV4dGVuc2lvbiB1c2luZyBIb3QtS2V5IChkZWZhdWx0OiBDdHJsK1NwYWNlKVxuXG4qKk5vdGU6KiogSSBkb24ndCBjb21lIG9uIHRoaXMgcGFnZSBvZnRlbiBzbyBpZiB5b3UgbmVlZCBhbnkgaGVscCwgcGxlYXNlIHJlZmVyIHRvIHRoZSBnaXRodWIgcmVwbyBhbmQgb3BlbiBhbiBpc3N1ZSA6KSAiLAogICJuYW1lIjogIlNlY3Rpb24gVG9kbyBMaXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9tTW9yYWwvVG9Eb0xpc3QiLAogICJ1dWlkIjogInRvZG9saXN0QHRvbU1vcmFsLm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"}}} +, {"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 quick settings menu.", "link": "https://extensions.gnome.org/extension/1108/add-username-to-top-panel/", "shell_version_map": {"38": {"version": "8", "sha256": "0vkbwld1p68y1w97qblkra164698qbhkk8laamr6rdnk29iy0zrh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgcXVpY2sgc2V0dGluZ3MgbWVudS4iLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QHByb3Rvbm1haWwuY29tIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4yMC40IiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJlbmRhdy9hZGQtdXNlcm5hbWUtdG9wcGFuZWwiLAogICJ1dWlkIjogImFkZC11c2VybmFtZS10b3BwYW5lbEBicmVuZGF3LmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "0vkbwld1p68y1w97qblkra164698qbhkk8laamr6rdnk29iy0zrh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgcXVpY2sgc2V0dGluZ3MgbWVudS4iLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QHByb3Rvbm1haWwuY29tIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4yMC40IiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJlbmRhdy9hZGQtdXNlcm5hbWUtdG9wcGFuZWwiLAogICJ1dWlkIjogImFkZC11c2VybmFtZS10b3BwYW5lbEBicmVuZGF3LmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0vkbwld1p68y1w97qblkra164698qbhkk8laamr6rdnk29iy0zrh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgcXVpY2sgc2V0dGluZ3MgbWVudS4iLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QHByb3Rvbm1haWwuY29tIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4yMC40IiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJlbmRhdy9hZGQtdXNlcm5hbWUtdG9wcGFuZWwiLAogICJ1dWlkIjogImFkZC11c2VybmFtZS10b3BwYW5lbEBicmVuZGF3LmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "0vkbwld1p68y1w97qblkra164698qbhkk8laamr6rdnk29iy0zrh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgcXVpY2sgc2V0dGluZ3MgbWVudS4iLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QHByb3Rvbm1haWwuY29tIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4yMC40IiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJlbmRhdy9hZGQtdXNlcm5hbWUtdG9wcGFuZWwiLAogICJ1dWlkIjogImFkZC11c2VybmFtZS10b3BwYW5lbEBicmVuZGF3LmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "9", "sha256": "1xa94181dv720vrjaxqa1yhbsb446fybw7pd9svwrlg0g4f0sjs8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgcXVpY2sgc2V0dGluZ3MgbWVudS4iLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QGljbG91ZC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JyZW5kYXcvYWRkLXVzZXJuYW1lLXRvcHBhbmVsIiwKICAidXVpZCI6ICJhZGQtdXNlcm5hbWUtdG9wcGFuZWxAYnJlbmRhdy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"uuid": "hide_clock@grantmcwilliams.com", "name": "Hide Clock", "pname": "hide-clock", "description": "Hides Clock", "link": "https://extensions.gnome.org/extension/1110/hide-clock/", "shell_version_map": {"38": {"version": "10", "sha256": "1cvwfwd7d86zwgna70p98zb09rvpvkw6ksl5bj23jgsnr9jdpvvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIENsb2NrIiwKICAibmFtZSI6ICJIaWRlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyYW50bWN3aWxsaWFtcy9Hbm9tZV9IaWRlX0Nsb2NrIiwKICAidXVpZCI6ICJoaWRlX2Nsb2NrQGdyYW50bWN3aWxsaWFtcy5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "1cvwfwd7d86zwgna70p98zb09rvpvkw6ksl5bj23jgsnr9jdpvvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIENsb2NrIiwKICAibmFtZSI6ICJIaWRlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyYW50bWN3aWxsaWFtcy9Hbm9tZV9IaWRlX0Nsb2NrIiwKICAidXVpZCI6ICJoaWRlX2Nsb2NrQGdyYW50bWN3aWxsaWFtcy5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "1cvwfwd7d86zwgna70p98zb09rvpvkw6ksl5bj23jgsnr9jdpvvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIENsb2NrIiwKICAibmFtZSI6ICJIaWRlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyYW50bWN3aWxsaWFtcy9Hbm9tZV9IaWRlX0Nsb2NrIiwKICAidXVpZCI6ICJoaWRlX2Nsb2NrQGdyYW50bWN3aWxsaWFtcy5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "42": {"version": "10", "sha256": "1cvwfwd7d86zwgna70p98zb09rvpvkw6ksl5bj23jgsnr9jdpvvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIENsb2NrIiwKICAibmFtZSI6ICJIaWRlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyYW50bWN3aWxsaWFtcy9Hbm9tZV9IaWRlX0Nsb2NrIiwKICAidXVpZCI6ICJoaWRlX2Nsb2NrQGdyYW50bWN3aWxsaWFtcy5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "43": {"version": "10", "sha256": "1cvwfwd7d86zwgna70p98zb09rvpvkw6ksl5bj23jgsnr9jdpvvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIENsb2NrIiwKICAibmFtZSI6ICJIaWRlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyYW50bWN3aWxsaWFtcy9Hbm9tZV9IaWRlX0Nsb2NrIiwKICAidXVpZCI6ICJoaWRlX2Nsb2NrQGdyYW50bWN3aWxsaWFtcy5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} , {"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": "68", "sha256": "1py94s1v5vjnf8w7as7ypprbk2504a0kkh6p6ppm9glcr2vl8w2r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY2OCIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLXNjcmVlbnNob3QvIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1zY3JlZW5zaG90QHR0bGwuZGUiLAogICJ2ZXJzaW9uIjogNjgKfQ=="}, "41": {"version": "68", "sha256": "1py94s1v5vjnf8w7as7ypprbk2504a0kkh6p6ppm9glcr2vl8w2r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY2OCIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLXNjcmVlbnNob3QvIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1zY3JlZW5zaG90QHR0bGwuZGUiLAogICJ2ZXJzaW9uIjogNjgKfQ=="}, "42": {"version": "68", "sha256": "1py94s1v5vjnf8w7as7ypprbk2504a0kkh6p6ppm9glcr2vl8w2r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY2OCIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLXNjcmVlbnNob3QvIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1zY3JlZW5zaG90QHR0bGwuZGUiLAogICJ2ZXJzaW9uIjogNjgKfQ=="}, "43": {"version": "69", "sha256": "1sfv67yj5c973yiizbn7hwxcz7ijyzxcni5f9ck3d02zypg4idjy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY2OSIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vT3R0b0FsbG1lbmRpbmdlci9nbm9tZS1zaGVsbC1zY3JlZW5zaG90LyIsCiAgInV1aWQiOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdEB0dGxsLmRlIiwKICAidmVyc2lvbiI6IDY5Cn0="}}} , {"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": "17", "sha256": "0dwqhikmwir8hyrzzy4kkicn8b1bnbc94mipih5w1qrip69j3j50", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiMy4zNi45IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2JvbHN0ZXIvbm90aGluZy10by1zYXkiLAogICJ1dWlkIjogIm5vdGhpbmctdG8tc2F5QGV4dGVuc2lvbnMuZ25vbWUud291dGVyLmJvbHN0ZXJsLmVlIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "41": {"version": "17", "sha256": "0dwqhikmwir8hyrzzy4kkicn8b1bnbc94mipih5w1qrip69j3j50", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiMy4zNi45IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2JvbHN0ZXIvbm90aGluZy10by1zYXkiLAogICJ1dWlkIjogIm5vdGhpbmctdG8tc2F5QGV4dGVuc2lvbnMuZ25vbWUud291dGVyLmJvbHN0ZXJsLmVlIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "42": {"version": "17", "sha256": "0dwqhikmwir8hyrzzy4kkicn8b1bnbc94mipih5w1qrip69j3j50", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiMy4zNi45IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2JvbHN0ZXIvbm90aGluZy10by1zYXkiLAogICJ1dWlkIjogIm5vdGhpbmctdG8tc2F5QGV4dGVuc2lvbnMuZ25vbWUud291dGVyLmJvbHN0ZXJsLmVlIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "43": {"version": "17", "sha256": "0dwqhikmwir8hyrzzy4kkicn8b1bnbc94mipih5w1qrip69j3j50", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiMy4zNi45IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2JvbHN0ZXIvbm90aGluZy10by1zYXkiLAogICJ1dWlkIjogIm5vdGhpbmctdG8tc2F5QGV4dGVuc2lvbnMuZ25vbWUud291dGVyLmJvbHN0ZXJsLmVlIiwKICAidmVyc2lvbiI6IDE3Cn0="}}} @@ -129,7 +129,7 @@ , {"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": "12", "sha256": "0vsn7rrkpys580vxg8hzkf1cj2ki7540rvpg1w90nqy7s1agm6w9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInVzZSBpYnVzIGZvbnQgc2V0dGluZyBvZiBpYnVzIHNldHVwIGRpYWxvZyB0byBlbmhhbmNlIHRoZSB1c2VyIGV4cGVyaWVuY2UiLAogICJuYW1lIjogImlidXMgZm9udCBzZXR0aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3B3dS5mZWRvcmFwZW9wbGUub3JnL2lidXMvaWJ1cy1mb250LXNldHRpbmciLAogICJ1dWlkIjogImlidXMtZm9udC1zZXR0aW5nQGlidXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "0vsn7rrkpys580vxg8hzkf1cj2ki7540rvpg1w90nqy7s1agm6w9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInVzZSBpYnVzIGZvbnQgc2V0dGluZyBvZiBpYnVzIHNldHVwIGRpYWxvZyB0byBlbmhhbmNlIHRoZSB1c2VyIGV4cGVyaWVuY2UiLAogICJuYW1lIjogImlidXMgZm9udCBzZXR0aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3B3dS5mZWRvcmFwZW9wbGUub3JnL2lidXMvaWJ1cy1mb250LXNldHRpbmciLAogICJ1dWlkIjogImlidXMtZm9udC1zZXR0aW5nQGlidXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "42": {"version": "12", "sha256": "0vsn7rrkpys580vxg8hzkf1cj2ki7540rvpg1w90nqy7s1agm6w9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInVzZSBpYnVzIGZvbnQgc2V0dGluZyBvZiBpYnVzIHNldHVwIGRpYWxvZyB0byBlbmhhbmNlIHRoZSB1c2VyIGV4cGVyaWVuY2UiLAogICJuYW1lIjogImlidXMgZm9udCBzZXR0aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3B3dS5mZWRvcmFwZW9wbGUub3JnL2lidXMvaWJ1cy1mb250LXNldHRpbmciLAogICJ1dWlkIjogImlidXMtZm9udC1zZXR0aW5nQGlidXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"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": "22", "sha256": "069lbl8f9c5kcj9nwdnh7bqlffw1kgp96pi46xg3pj8hxdibhahc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBHaXRodWIncyBub3RpZmljYXRpb25zIHdpdGhpbiB0aGUgZ25vbWUgZGVza3RvcCBlbnZpcm9ubWVudFxuU291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZHVmL2dub21lLWdpdGh1Yi1ub3RpZmljYXRpb25zIiwKICAibmFtZSI6ICJHaXRodWIgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnaXRodWIubm90aWZpY2F0aW9uc0BhbGV4YW5kcmUuZHVmb3VybmV0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "41": {"version": "22", "sha256": "069lbl8f9c5kcj9nwdnh7bqlffw1kgp96pi46xg3pj8hxdibhahc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBHaXRodWIncyBub3RpZmljYXRpb25zIHdpdGhpbiB0aGUgZ25vbWUgZGVza3RvcCBlbnZpcm9ubWVudFxuU291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZHVmL2dub21lLWdpdGh1Yi1ub3RpZmljYXRpb25zIiwKICAibmFtZSI6ICJHaXRodWIgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnaXRodWIubm90aWZpY2F0aW9uc0BhbGV4YW5kcmUuZHVmb3VybmV0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "42": {"version": "22", "sha256": "069lbl8f9c5kcj9nwdnh7bqlffw1kgp96pi46xg3pj8hxdibhahc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBHaXRodWIncyBub3RpZmljYXRpb25zIHdpdGhpbiB0aGUgZ25vbWUgZGVza3RvcCBlbnZpcm9ubWVudFxuU291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZHVmL2dub21lLWdpdGh1Yi1ub3RpZmljYXRpb25zIiwKICAibmFtZSI6ICJHaXRodWIgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnaXRodWIubm90aWZpY2F0aW9uc0BhbGV4YW5kcmUuZHVmb3VybmV0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}}} , {"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": "25", "sha256": "15ah5ipi9b0jqscw8igxxni1p12jzsv1vcm8jfdfrmq8c3dziadf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB3YWxscGFwZXIgY2hhbmdlciB3aXRoIG11bHRpcGxlIHByb2ZpbGUgc3VwcG9ydC4gSW50ZWdyYXRlcyBpbnRvIHRoZSBzaGVsbCBieSBwcm92aWRpbmcgaXQncyBvd24gcGFuZWwgaWNvbi4gVGhlIGRhZW1vbiBpcyB3cml0dGVuIHVzaW5nIGdqcyBhbmQgcnVucyBpbmRlcGVuZGVudGx5IG9mIHRoZSBleHRlbnNpb24gYXMgYSBiYWNrZ3JvdW5kIHByb2Nlc3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVzay1jaGFuZ2VyIiwKICAibmFtZSI6ICJEZXNrIENoYW5nZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVzay1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JpZ0UvZGVzay1jaGFuZ2VyLyIsCiAgInV1aWQiOiAiZGVzay1jaGFuZ2VyQGVyaWMuZ2FjaC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "40": {"version": "25", "sha256": "15ah5ipi9b0jqscw8igxxni1p12jzsv1vcm8jfdfrmq8c3dziadf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB3YWxscGFwZXIgY2hhbmdlciB3aXRoIG11bHRpcGxlIHByb2ZpbGUgc3VwcG9ydC4gSW50ZWdyYXRlcyBpbnRvIHRoZSBzaGVsbCBieSBwcm92aWRpbmcgaXQncyBvd24gcGFuZWwgaWNvbi4gVGhlIGRhZW1vbiBpcyB3cml0dGVuIHVzaW5nIGdqcyBhbmQgcnVucyBpbmRlcGVuZGVudGx5IG9mIHRoZSBleHRlbnNpb24gYXMgYSBiYWNrZ3JvdW5kIHByb2Nlc3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVzay1jaGFuZ2VyIiwKICAibmFtZSI6ICJEZXNrIENoYW5nZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVzay1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JpZ0UvZGVzay1jaGFuZ2VyLyIsCiAgInV1aWQiOiAiZGVzay1jaGFuZ2VyQGVyaWMuZ2FjaC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "41": {"version": "25", "sha256": "15ah5ipi9b0jqscw8igxxni1p12jzsv1vcm8jfdfrmq8c3dziadf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB3YWxscGFwZXIgY2hhbmdlciB3aXRoIG11bHRpcGxlIHByb2ZpbGUgc3VwcG9ydC4gSW50ZWdyYXRlcyBpbnRvIHRoZSBzaGVsbCBieSBwcm92aWRpbmcgaXQncyBvd24gcGFuZWwgaWNvbi4gVGhlIGRhZW1vbiBpcyB3cml0dGVuIHVzaW5nIGdqcyBhbmQgcnVucyBpbmRlcGVuZGVudGx5IG9mIHRoZSBleHRlbnNpb24gYXMgYSBiYWNrZ3JvdW5kIHByb2Nlc3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVzay1jaGFuZ2VyIiwKICAibmFtZSI6ICJEZXNrIENoYW5nZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVzay1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JpZ0UvZGVzay1jaGFuZ2VyLyIsCiAgInV1aWQiOiAiZGVzay1jaGFuZ2VyQGVyaWMuZ2FjaC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "42": {"version": "25", "sha256": "15ah5ipi9b0jqscw8igxxni1p12jzsv1vcm8jfdfrmq8c3dziadf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB3YWxscGFwZXIgY2hhbmdlciB3aXRoIG11bHRpcGxlIHByb2ZpbGUgc3VwcG9ydC4gSW50ZWdyYXRlcyBpbnRvIHRoZSBzaGVsbCBieSBwcm92aWRpbmcgaXQncyBvd24gcGFuZWwgaWNvbi4gVGhlIGRhZW1vbiBpcyB3cml0dGVuIHVzaW5nIGdqcyBhbmQgcnVucyBpbmRlcGVuZGVudGx5IG9mIHRoZSBleHRlbnNpb24gYXMgYSBiYWNrZ3JvdW5kIHByb2Nlc3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVzay1jaGFuZ2VyIiwKICAibmFtZSI6ICJEZXNrIENoYW5nZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVzay1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JpZ0UvZGVzay1jaGFuZ2VyLyIsCiAgInV1aWQiOiAiZGVzay1jaGFuZ2VyQGVyaWMuZ2FjaC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "43": {"version": "25", "sha256": "15ah5ipi9b0jqscw8igxxni1p12jzsv1vcm8jfdfrmq8c3dziadf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB3YWxscGFwZXIgY2hhbmdlciB3aXRoIG11bHRpcGxlIHByb2ZpbGUgc3VwcG9ydC4gSW50ZWdyYXRlcyBpbnRvIHRoZSBzaGVsbCBieSBwcm92aWRpbmcgaXQncyBvd24gcGFuZWwgaWNvbi4gVGhlIGRhZW1vbiBpcyB3cml0dGVuIHVzaW5nIGdqcyBhbmQgcnVucyBpbmRlcGVuZGVudGx5IG9mIHRoZSBleHRlbnNpb24gYXMgYSBiYWNrZ3JvdW5kIHByb2Nlc3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVzay1jaGFuZ2VyIiwKICAibmFtZSI6ICJEZXNrIENoYW5nZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVzay1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JpZ0UvZGVzay1jaGFuZ2VyLyIsCiAgInV1aWQiOiAiZGVzay1jaGFuZ2VyQGVyaWMuZ2FjaC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}}} -, {"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": "11", "sha256": "0zlsl45l443wwnamjwb858w83kdbmwxxpnnxna66b8s8d8f4vys4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcGFkZGF0cmFwcGVyL3Nob3J0Y3V0cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlNob3J0Y3V0c0BreWxlLmFpbXMuYWMuemEiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "0zlsl45l443wwnamjwb858w83kdbmwxxpnnxna66b8s8d8f4vys4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcGFkZGF0cmFwcGVyL3Nob3J0Y3V0cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlNob3J0Y3V0c0BreWxlLmFpbXMuYWMuemEiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0zlsl45l443wwnamjwb858w83kdbmwxxpnnxna66b8s8d8f4vys4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcGFkZGF0cmFwcGVyL3Nob3J0Y3V0cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlNob3J0Y3V0c0BreWxlLmFpbXMuYWMuemEiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "0zlsl45l443wwnamjwb858w83kdbmwxxpnnxna66b8s8d8f4vys4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcGFkZGF0cmFwcGVyL3Nob3J0Y3V0cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlNob3J0Y3V0c0BreWxlLmFpbXMuYWMuemEiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} +, {"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": "13", "sha256": "18l70pzvsk1rnhyz82z48a7a6cgbk22k3xin9djf2j0g0hwzb9v3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3BhZGRhdHJhcHBlci9zaG9ydGN1dHMtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTaG9ydGN1dHNAa3lsZS5haW1zLmFjLnphIiwKICAidmVyc2lvbiI6IDEzCn0="}, "40": {"version": "13", "sha256": "18l70pzvsk1rnhyz82z48a7a6cgbk22k3xin9djf2j0g0hwzb9v3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3BhZGRhdHJhcHBlci9zaG9ydGN1dHMtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTaG9ydGN1dHNAa3lsZS5haW1zLmFjLnphIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "18l70pzvsk1rnhyz82z48a7a6cgbk22k3xin9djf2j0g0hwzb9v3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3BhZGRhdHJhcHBlci9zaG9ydGN1dHMtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTaG9ydGN1dHNAa3lsZS5haW1zLmFjLnphIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "18l70pzvsk1rnhyz82z48a7a6cgbk22k3xin9djf2j0g0hwzb9v3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3BhZGRhdHJhcHBlci9zaG9ydGN1dHMtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTaG9ydGN1dHNAa3lsZS5haW1zLmFjLnphIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "13", "sha256": "18l70pzvsk1rnhyz82z48a7a6cgbk22k3xin9djf2j0g0hwzb9v3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3BhZGRhdHJhcHBlci9zaG9ydGN1dHMtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTaG9ydGN1dHNAa3lsZS5haW1zLmFjLnphIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"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": "18", "sha256": "0wlba8jkpvzirczc54jbapywds5icbsg97bjbzhc0qjiwbmicb96", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcXVpcmVzIGxtLXNlbnNvcnMgKG9yIGxtX3NlbnNvcnMpLiBTaG93cyBDUFUgdGVtcGVyYXR1cmUsIGRpc2sgdGVtcGVyYXR1cmUsIHZpZGVvIGNhcmQgdGVtcGVyYXR1cmUsIHZvbHRhZ2UgYW5kIGZhbiBSUE0uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2Vuc29yeS1wZXJjZXB0aW9uIiwKICAibmFtZSI6ICJTZW5zb3J5IFBlcmNlcHRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2Vuc29yeS1wZXJjZXB0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGFybGVtU3F1aXJyZWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNlbnNvcnktcGVyY2VwdGlvbiIsCiAgInV1aWQiOiAic2Vuc29yeS1wZXJjZXB0aW9uQEhhcmxlbVNxdWlycmVsLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxOAp9"}, "41": {"version": "18", "sha256": "0wlba8jkpvzirczc54jbapywds5icbsg97bjbzhc0qjiwbmicb96", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcXVpcmVzIGxtLXNlbnNvcnMgKG9yIGxtX3NlbnNvcnMpLiBTaG93cyBDUFUgdGVtcGVyYXR1cmUsIGRpc2sgdGVtcGVyYXR1cmUsIHZpZGVvIGNhcmQgdGVtcGVyYXR1cmUsIHZvbHRhZ2UgYW5kIGZhbiBSUE0uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2Vuc29yeS1wZXJjZXB0aW9uIiwKICAibmFtZSI6ICJTZW5zb3J5IFBlcmNlcHRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2Vuc29yeS1wZXJjZXB0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGFybGVtU3F1aXJyZWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNlbnNvcnktcGVyY2VwdGlvbiIsCiAgInV1aWQiOiAic2Vuc29yeS1wZXJjZXB0aW9uQEhhcmxlbVNxdWlycmVsLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxOAp9"}, "42": {"version": "18", "sha256": "0wlba8jkpvzirczc54jbapywds5icbsg97bjbzhc0qjiwbmicb96", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcXVpcmVzIGxtLXNlbnNvcnMgKG9yIGxtX3NlbnNvcnMpLiBTaG93cyBDUFUgdGVtcGVyYXR1cmUsIGRpc2sgdGVtcGVyYXR1cmUsIHZpZGVvIGNhcmQgdGVtcGVyYXR1cmUsIHZvbHRhZ2UgYW5kIGZhbiBSUE0uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2Vuc29yeS1wZXJjZXB0aW9uIiwKICAibmFtZSI6ICJTZW5zb3J5IFBlcmNlcHRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2Vuc29yeS1wZXJjZXB0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGFybGVtU3F1aXJyZWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNlbnNvcnktcGVyY2VwdGlvbiIsCiAgInV1aWQiOiAic2Vuc29yeS1wZXJjZXB0aW9uQEhhcmxlbVNxdWlycmVsLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxOAp9"}}} , {"uuid": "activityAppLauncher@rastersoft.com", "name": "Activity App Launcher", "pname": "activity-app-launcher", "description": "Integrates a category-based application launcher in the activities window. IMPORTANT: it needs the 'gnome-menus' and 'libgnome-menu-3-dev'; they must be installed in the system before installing this extension.", "link": "https://extensions.gnome.org/extension/1149/activity-app-launcher/", "shell_version_map": {"38": {"version": "31", "sha256": "18jqnk4psdvdx1hydfss1870v0gnpxkmsm5yasnb0m5m484in0qv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmFzdGVyc29mdC9hY3Rpdml0eUFwcExhdW5jaGVyIiwKICAidXVpZCI6ICJhY3Rpdml0eUFwcExhdW5jaGVyQHJhc3RlcnNvZnQuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "40": {"version": "35", "sha256": "1b1mr30kpn26hhhp871pybymk23w0s5zdn18zsp4lnvf2f618j25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvYWN0aXZpdHlBcHBMYXVuY2hlciIsCiAgInV1aWQiOiAiYWN0aXZpdHlBcHBMYXVuY2hlckByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}, "41": {"version": "35", "sha256": "1b1mr30kpn26hhhp871pybymk23w0s5zdn18zsp4lnvf2f618j25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvYWN0aXZpdHlBcHBMYXVuY2hlciIsCiAgInV1aWQiOiAiYWN0aXZpdHlBcHBMYXVuY2hlckByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}, "42": {"version": "35", "sha256": "1b1mr30kpn26hhhp871pybymk23w0s5zdn18zsp4lnvf2f618j25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvYWN0aXZpdHlBcHBMYXVuY2hlciIsCiAgInV1aWQiOiAiYWN0aXZpdHlBcHBMYXVuY2hlckByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}, "43": {"version": "35", "sha256": "1b1mr30kpn26hhhp871pybymk23w0s5zdn18zsp4lnvf2f618j25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvYWN0aXZpdHlBcHBMYXVuY2hlciIsCiAgInV1aWQiOiAiYWN0aXZpdHlBcHBMYXVuY2hlckByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}}} , {"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="}}} @@ -139,9 +139,9 @@ , {"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", "link": "https://extensions.gnome.org/extension/1183/utcclock/", "shell_version_map": {"38": {"version": "24", "sha256": "0yjbpmrq8y52yn4q2yp6bgg4b6r60h9spccrc0d7jn6vi3a4ns4s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJVVENDbG9jayIsCiAgIm5hbWUiOiAiVVRDQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXRjY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL1VUQ0Nsb2NrIiwKICAidXVpZCI6ICJ1dGNjbG9ja0BpbmpjcmlzdGlhbnJvamFzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="}, "40": {"version": "32", "sha256": "0qcz5i2kikkq2yj39mxvk0iq7wzl1lbnsk648vh3plc6v10d8yvx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJVVENDbG9jayIsCiAgIm5hbWUiOiAiVVRDQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXRjY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW5qY3Jpc3RpYW5yb2phcy9VVENDbG9jayIsCiAgInV1aWQiOiAidXRjY2xvY2tAaW5qY3Jpc3RpYW5yb2phcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMyCn0="}, "41": {"version": "32", "sha256": "0qcz5i2kikkq2yj39mxvk0iq7wzl1lbnsk648vh3plc6v10d8yvx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJVVENDbG9jayIsCiAgIm5hbWUiOiAiVVRDQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXRjY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW5qY3Jpc3RpYW5yb2phcy9VVENDbG9jayIsCiAgInV1aWQiOiAidXRjY2xvY2tAaW5qY3Jpc3RpYW5yb2phcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMyCn0="}, "42": {"version": "32", "sha256": "0qcz5i2kikkq2yj39mxvk0iq7wzl1lbnsk648vh3plc6v10d8yvx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJVVENDbG9jayIsCiAgIm5hbWUiOiAiVVRDQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXRjY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW5qY3Jpc3RpYW5yb2phcy9VVENDbG9jayIsCiAgInV1aWQiOiAidXRjY2xvY2tAaW5qY3Jpc3RpYW5yb2phcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMyCn0="}, "43": {"version": "32", "sha256": "0qcz5i2kikkq2yj39mxvk0iq7wzl1lbnsk648vh3plc6v10d8yvx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJVVENDbG9jayIsCiAgIm5hbWUiOiAiVVRDQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXRjY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW5qY3Jpc3RpYW5yb2phcy9VVENDbG9jayIsCiAgInV1aWQiOiAidXRjY2xvY2tAaW5qY3Jpc3RpYW5yb2phcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMyCn0="}}} -, {"uuid": "show-desktop-button@amivaleo", "name": "Show Desktop Button", "pname": "show-desktop-button", "description": "Minimize/unminimize all open windows with a single click.\n\nNOTE: I ignore bug reports sent here. Please use github.\n\nv28: Added \"Far left\" and \"Far right\" for the indicator's position\n\nv27: New algorithm. If you have at least one unminimized window, the extension will minimize it. Otherwise, if all your windows are minimized, the extension will unminimize them all.", "link": "https://extensions.gnome.org/extension/1194/show-desktop-button/", "shell_version_map": {"38": {"version": "17", "sha256": "15n06gzw1zqvicg478i05jcdarj3awf5699b9ybj5xfs80bgmx8n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLlxuXG52Mjg6IEFkZGVkIFwiRmFyIGxlZnRcIiBhbmQgXCJGYXIgcmlnaHRcIiBmb3IgdGhlIGluZGljYXRvcidzIHBvc2l0aW9uXG5cbnYyNzogTmV3IGFsZ29yaXRobS4gSWYgeW91IGhhdmUgYXQgbGVhc3Qgb25lIHVubWluaW1pemVkIHdpbmRvdywgdGhlIGV4dGVuc2lvbiB3aWxsIG1pbmltaXplIGl0LiBPdGhlcndpc2UsIGlmIGFsbCB5b3VyIHdpbmRvd3MgYXJlIG1pbmltaXplZCwgdGhlIGV4dGVuc2lvbiB3aWxsIHVubWluaW1pemUgdGhlbSBhbGwuIiwKICAiZXh0ZW5zaW9uLWlkIjogInNob3ctZGVza3RvcC1idXR0b24iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAibG9jYWxlZGlyIjogIi91c3Ivc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJTaG93IERlc2t0b3AgQnV0dG9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3ctZGVza3RvcC1idXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWl2YWxlby9TaG93LURlc2t0b3AtQnV0dG9uIiwKICAidXVpZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uQGFtaXZhbGVvIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "40": {"version": "29", "sha256": "1sp4qyynlw5vnjamm4r1lk05qr8h8xlggvd51d9iag52kyb3zhb6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLlxuXG52Mjg6IEFkZGVkIFwiRmFyIGxlZnRcIiBhbmQgXCJGYXIgcmlnaHRcIiBmb3IgdGhlIGluZGljYXRvcidzIHBvc2l0aW9uXG5cbnYyNzogTmV3IGFsZ29yaXRobS4gSWYgeW91IGhhdmUgYXQgbGVhc3Qgb25lIHVubWluaW1pemVkIHdpbmRvdywgdGhlIGV4dGVuc2lvbiB3aWxsIG1pbmltaXplIGl0LiBPdGhlcndpc2UsIGlmIGFsbCB5b3VyIHdpbmRvd3MgYXJlIG1pbmltaXplZCwgdGhlIGV4dGVuc2lvbiB3aWxsIHVubWluaW1pemUgdGhlbSBhbGwuIiwKICAiZXh0ZW5zaW9uLWlkIjogInNob3ctZGVza3RvcC1idXR0b24iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAibG9jYWxlZGlyIjogIi91c3Ivc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJTaG93IERlc2t0b3AgQnV0dG9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3ctZGVza3RvcC1idXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1pdmFsZW8vU2hvdy1EZXNrdG9wLUJ1dHRvbiIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWJ1dHRvbkBhbWl2YWxlbyIsCiAgInZlcnNpb24iOiAyOQp9"}, "41": {"version": "29", "sha256": "1sp4qyynlw5vnjamm4r1lk05qr8h8xlggvd51d9iag52kyb3zhb6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLlxuXG52Mjg6IEFkZGVkIFwiRmFyIGxlZnRcIiBhbmQgXCJGYXIgcmlnaHRcIiBmb3IgdGhlIGluZGljYXRvcidzIHBvc2l0aW9uXG5cbnYyNzogTmV3IGFsZ29yaXRobS4gSWYgeW91IGhhdmUgYXQgbGVhc3Qgb25lIHVubWluaW1pemVkIHdpbmRvdywgdGhlIGV4dGVuc2lvbiB3aWxsIG1pbmltaXplIGl0LiBPdGhlcndpc2UsIGlmIGFsbCB5b3VyIHdpbmRvd3MgYXJlIG1pbmltaXplZCwgdGhlIGV4dGVuc2lvbiB3aWxsIHVubWluaW1pemUgdGhlbSBhbGwuIiwKICAiZXh0ZW5zaW9uLWlkIjogInNob3ctZGVza3RvcC1idXR0b24iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAibG9jYWxlZGlyIjogIi91c3Ivc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJTaG93IERlc2t0b3AgQnV0dG9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3ctZGVza3RvcC1idXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1pdmFsZW8vU2hvdy1EZXNrdG9wLUJ1dHRvbiIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWJ1dHRvbkBhbWl2YWxlbyIsCiAgInZlcnNpb24iOiAyOQp9"}, "42": {"version": "29", "sha256": "1sp4qyynlw5vnjamm4r1lk05qr8h8xlggvd51d9iag52kyb3zhb6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLlxuXG52Mjg6IEFkZGVkIFwiRmFyIGxlZnRcIiBhbmQgXCJGYXIgcmlnaHRcIiBmb3IgdGhlIGluZGljYXRvcidzIHBvc2l0aW9uXG5cbnYyNzogTmV3IGFsZ29yaXRobS4gSWYgeW91IGhhdmUgYXQgbGVhc3Qgb25lIHVubWluaW1pemVkIHdpbmRvdywgdGhlIGV4dGVuc2lvbiB3aWxsIG1pbmltaXplIGl0LiBPdGhlcndpc2UsIGlmIGFsbCB5b3VyIHdpbmRvd3MgYXJlIG1pbmltaXplZCwgdGhlIGV4dGVuc2lvbiB3aWxsIHVubWluaW1pemUgdGhlbSBhbGwuIiwKICAiZXh0ZW5zaW9uLWlkIjogInNob3ctZGVza3RvcC1idXR0b24iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAibG9jYWxlZGlyIjogIi91c3Ivc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJTaG93IERlc2t0b3AgQnV0dG9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3ctZGVza3RvcC1idXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1pdmFsZW8vU2hvdy1EZXNrdG9wLUJ1dHRvbiIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWJ1dHRvbkBhbWl2YWxlbyIsCiAgInZlcnNpb24iOiAyOQp9"}, "43": {"version": "29", "sha256": "1sp4qyynlw5vnjamm4r1lk05qr8h8xlggvd51d9iag52kyb3zhb6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLlxuXG52Mjg6IEFkZGVkIFwiRmFyIGxlZnRcIiBhbmQgXCJGYXIgcmlnaHRcIiBmb3IgdGhlIGluZGljYXRvcidzIHBvc2l0aW9uXG5cbnYyNzogTmV3IGFsZ29yaXRobS4gSWYgeW91IGhhdmUgYXQgbGVhc3Qgb25lIHVubWluaW1pemVkIHdpbmRvdywgdGhlIGV4dGVuc2lvbiB3aWxsIG1pbmltaXplIGl0LiBPdGhlcndpc2UsIGlmIGFsbCB5b3VyIHdpbmRvd3MgYXJlIG1pbmltaXplZCwgdGhlIGV4dGVuc2lvbiB3aWxsIHVubWluaW1pemUgdGhlbSBhbGwuIiwKICAiZXh0ZW5zaW9uLWlkIjogInNob3ctZGVza3RvcC1idXR0b24iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAibG9jYWxlZGlyIjogIi91c3Ivc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJTaG93IERlc2t0b3AgQnV0dG9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3ctZGVza3RvcC1idXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1pdmFsZW8vU2hvdy1EZXNrdG9wLUJ1dHRvbiIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWJ1dHRvbkBhbWl2YWxlbyIsCiAgInZlcnNpb24iOiAyOQp9"}}} +, {"uuid": "show-desktop-button@amivaleo", "name": "Show Desktop Button", "pname": "show-desktop-button", "description": "Minimize/unminimize all open windows with a single click.\n\nNOTE: I ignore bug reports sent here. Please use github.", "link": "https://extensions.gnome.org/extension/1194/show-desktop-button/", "shell_version_map": {"38": {"version": "17", "sha256": "0hq25s6kwkd857z5799598n8nx5dxvwy9xwnsrsad3n79pgl7rir", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1pdmFsZW8vU2hvdy1EZXNrdG9wLUJ1dHRvbiIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWJ1dHRvbkBhbWl2YWxlbyIsCiAgInZlcnNpb24iOiAxNwp9"}, "40": {"version": "30", "sha256": "1gw8dy8kvx52n0mqmsb0lm4fjw4zgfcfi13fxb57y4g90397dlxv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtaXZhbGVvL1Nob3ctRGVza3RvcC1CdXR0b24iLAogICJ1dWlkIjogInNob3ctZGVza3RvcC1idXR0b25AYW1pdmFsZW8iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "41": {"version": "30", "sha256": "1gw8dy8kvx52n0mqmsb0lm4fjw4zgfcfi13fxb57y4g90397dlxv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtaXZhbGVvL1Nob3ctRGVza3RvcC1CdXR0b24iLAogICJ1dWlkIjogInNob3ctZGVza3RvcC1idXR0b25AYW1pdmFsZW8iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "42": {"version": "30", "sha256": "1gw8dy8kvx52n0mqmsb0lm4fjw4zgfcfi13fxb57y4g90397dlxv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtaXZhbGVvL1Nob3ctRGVza3RvcC1CdXR0b24iLAogICJ1dWlkIjogInNob3ctZGVza3RvcC1idXR0b25AYW1pdmFsZW8iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "43": {"version": "30", "sha256": "1gw8dy8kvx52n0mqmsb0lm4fjw4zgfcfi13fxb57y4g90397dlxv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtaXZhbGVvL1Nob3ctRGVza3RvcC1CdXR0b24iLAogICJ1dWlkIjogInNob3ctZGVza3RvcC1idXR0b25AYW1pdmFsZW8iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}}} , {"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": "33", "sha256": "1x0si8w2mzvb6msck3nvcgsn7day00cva58il04l9z53sj04d6b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDMzCn0="}, "41": {"version": "33", "sha256": "1x0si8w2mzvb6msck3nvcgsn7day00cva58il04l9z53sj04d6b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDMzCn0="}, "42": {"version": "33", "sha256": "1x0si8w2mzvb6msck3nvcgsn7day00cva58il04l9z53sj04d6b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDMzCn0="}, "43": {"version": "34", "sha256": "1klwfcz4jn1swwh9lwqrr75ncad9y4218f8asnsfhnd0mmxc3xjx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hc2EtYXBvZCIsCiAgInV1aWQiOiAibmFzYV9hcG9kQGVsaW52ZW50aW9uLm92aCIsCiAgInZlcnNpb24iOiAzNAp9"}}} +, {"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": "33", "sha256": "1x0si8w2mzvb6msck3nvcgsn7day00cva58il04l9z53sj04d6b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDMzCn0="}, "41": {"version": "33", "sha256": "1x0si8w2mzvb6msck3nvcgsn7day00cva58il04l9z53sj04d6b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDMzCn0="}, "42": {"version": "33", "sha256": "1x0si8w2mzvb6msck3nvcgsn7day00cva58il04l9z53sj04d6b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDMzCn0="}, "43": {"version": "35", "sha256": "166h6l5dvh9hj1h5jmxwn2lrp41h2gi8awybkwr28gdbynwyr01c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hc2EtYXBvZCIsCiAgInV1aWQiOiAibmFzYV9hcG9kQGVsaW52ZW50aW9uLm92aCIsCiAgInZlcnNpb24iOiAzNQp9"}}} , {"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": "7", "sha256": "1ivk8x3sjdsyhjj10lfzdrhci7p1f8ws68nyml0vs7ypqdchihcr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJzdW4ud3hnQGdtYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAidXVpZCI6ICJ1bmRlY29yYXRlQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "1ivk8x3sjdsyhjj10lfzdrhci7p1f8ws68nyml0vs7ypqdchihcr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJzdW4ud3hnQGdtYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAidXVpZCI6ICJ1bmRlY29yYXRlQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "1ivk8x3sjdsyhjj10lfzdrhci7p1f8ws68nyml0vs7ypqdchihcr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJzdW4ud3hnQGdtYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAidXVpZCI6ICJ1bmRlY29yYXRlQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "43": {"version": "7", "sha256": "1ivk8x3sjdsyhjj10lfzdrhci7p1f8ws68nyml0vs7ypqdchihcr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJzdW4ud3hnQGdtYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAidXVpZCI6ICJ1bmRlY29yYXRlQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"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"}}} @@ -150,27 +150,27 @@ , {"uuid": "arc-menu@linxgem33.com", "name": "Arc Menu", "pname": "arc-menu", "description": "## Unmaintained Project ##\n\nThis project and all related repositories have been officially archived. \n\nKind Regards - LinxGem33 (Andy C)", "link": "https://extensions.gnome.org/extension/1228/arc-menu/", "shell_version_map": {"38": {"version": "49", "sha256": "1h2ry7vf024kq3rxgvv09d08iq7wxrb9xm1qvl126ppq6x15sgr4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMjIFVubWFpbnRhaW5lZCBQcm9qZWN0ICMjXG5cblRoaXMgcHJvamVjdCBhbmQgYWxsIHJlbGF0ZWQgcmVwb3NpdG9yaWVzIGhhdmUgYmVlbiBvZmZpY2lhbGx5IGFyY2hpdmVkLiBcblxuS2luZCBSZWdhcmRzIC0gTGlueEdlbTMzIChBbmR5IEMpIiwKICAiZXh0ZW5zaW9uLWlkIjogImFyYy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjLW1lbnUiLAogICJuYW1lIjogIkFyYyBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFyYy1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vTGlueEdlbTMzL0FyYy1NZW51IiwKICAidXVpZCI6ICJhcmMtbWVudUBsaW54Z2VtMzMuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}}} , {"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"}, "42": {"version": "25", "sha256": "0qvyhmdivl3wgg1qzmh7r6fci3j0fj6dwm0bspvwjg6mj8fbgj14", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEdtYWlsIGFuZCBPdXRsb29rIG5vdGlmaWNhdGlvbnMgaW4gR25vbWUgTWVzc2FnZSBUcmF5IHVzaW5nIEdub21lIE9ubGluZSBBY2NvdW50c1xuIiwKICAibmFtZSI6ICJHbm9tZSBFbWFpbCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NodW1pbmdjaC9nbm9tZS1lbWFpbC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJHbWFpbE1lc3NhZ2VUcmF5QHNodW1pbmcwMjA3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}}} , {"uuid": "switchWorkSpace@sun.wxg@gmail.com", "name": "Switch Workspace", "pname": "switch-workspace", "description": "Switch workspace like using ALT+TAB key to switch windows \n\n Default shortcut key to switch workspace is Ctrl+Above_Tab .", "link": "https://extensions.gnome.org/extension/1231/switch-workspace/", "shell_version_map": {"38": {"version": "30", "sha256": "1z6dafy981y2kjbnk9dncnkkpgqk45njbh3k08s3jg385qvfryvg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zd2l0Y2h3b3Jrc3BhY2UiLAogICJ1dWlkIjogInN3aXRjaFdvcmtTcGFjZUBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzMAp9"}, "40": {"version": "35", "sha256": "08jjqfmb2y067lig8xkamrmzxyvxqpd2bdqykxsb98i8mzgwb2d4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3dpdGNod29ya3NwYWNlIiwKICAidXVpZCI6ICJzd2l0Y2hXb3JrU3BhY2VAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}, "41": {"version": "35", "sha256": "08jjqfmb2y067lig8xkamrmzxyvxqpd2bdqykxsb98i8mzgwb2d4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3dpdGNod29ya3NwYWNlIiwKICAidXVpZCI6ICJzd2l0Y2hXb3JrU3BhY2VAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}, "42": {"version": "35", "sha256": "08jjqfmb2y067lig8xkamrmzxyvxqpd2bdqykxsb98i8mzgwb2d4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3dpdGNod29ya3NwYWNlIiwKICAidXVpZCI6ICJzd2l0Y2hXb3JrU3BhY2VAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}, "43": {"version": "35", "sha256": "08jjqfmb2y067lig8xkamrmzxyvxqpd2bdqykxsb98i8mzgwb2d4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3dpdGNod29ya3NwYWNlIiwKICAidXVpZCI6ICJzd2l0Y2hXb3JrU3BhY2VAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}}} -, {"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": "noannoyance@sindex.com", "name": "NoAnnoyance", "pname": "noannoyance", "description": "Removes the 'Windows is ready' notification and puts the window into focus.", "link": "https://extensions.gnome.org/extension/1236/noannoyance/", "shell_version_map": {"38": {"version": "6", "sha256": "1zqxykbfcc11xmk201d7dgi2qy0srzcm9il0q745dh4sllz1ar9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3dzIGlzIHJlYWR5JyBub3RpZmljYXRpb24gYW5kIHB1dHMgdGhlIHdpbmRvdyBpbnRvIGZvY3VzLiIsCiAgIm5hbWUiOiAiTm9Bbm5veWFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2luZGV4L25vLWFubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAc2luZGV4LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "1zqxykbfcc11xmk201d7dgi2qy0srzcm9il0q745dh4sllz1ar9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3dzIGlzIHJlYWR5JyBub3RpZmljYXRpb24gYW5kIHB1dHMgdGhlIHdpbmRvdyBpbnRvIGZvY3VzLiIsCiAgIm5hbWUiOiAiTm9Bbm5veWFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2luZGV4L25vLWFubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAc2luZGV4LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1zqxykbfcc11xmk201d7dgi2qy0srzcm9il0q745dh4sllz1ar9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3dzIGlzIHJlYWR5JyBub3RpZmljYXRpb24gYW5kIHB1dHMgdGhlIHdpbmRvdyBpbnRvIGZvY3VzLiIsCiAgIm5hbWUiOiAiTm9Bbm5veWFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2luZGV4L25vLWFubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAc2luZGV4LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "1zqxykbfcc11xmk201d7dgi2qy0srzcm9il0q745dh4sllz1ar9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3dzIGlzIHJlYWR5JyBub3RpZmljYXRpb24gYW5kIHB1dHMgdGhlIHdpbmRvdyBpbnRvIGZvY3VzLiIsCiAgIm5hbWUiOiAiTm9Bbm5veWFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2luZGV4L25vLWFubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAc2luZGV4LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "1zqxykbfcc11xmk201d7dgi2qy0srzcm9il0q745dh4sllz1ar9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3dzIGlzIHJlYWR5JyBub3RpZmljYXRpb24gYW5kIHB1dHMgdGhlIHdpbmRvdyBpbnRvIGZvY3VzLiIsCiAgIm5hbWUiOiAiTm9Bbm5veWFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2luZGV4L25vLWFubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAc2luZGV4LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"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="}, "42": {"version": "165", "sha256": "1zf2nf3ymzj2177yn7qz98yv6avwr77ws57g37v3f1711cfsb222", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNhY2hlLWZpbGUtZm9ybWF0LXZlcnNpb24iOiB7CiAgICAiYWxhcm1zIjogMywKICAgICJwb21vZG9ybyI6IDMsCiAgICAic3RvcHdhdGNoIjogNCwKICAgICJ0aW1lciI6IDMsCiAgICAidG9kbyI6IDEwCiAgfSwKICAiZGVzY3JpcHRpb24iOiAiQSB0b2RvLnR4dCBtYW5hZ2VyLCB0aW1lIHRyYWNrZXIsIHRpbWVyLCBzdG9wd2F0Y2gsIHBvbW9kb3JvLCBhbmQgYWxhcm0gY2xvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aW1lcHAiLAogICJpc3N1ZXNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvaXNzdWVzIiwKICAibmFtZSI6ICJUaW1lICsrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ0cmFuc2xhdGlvbnNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvdHJlZS9tYXN0ZXIvZGF0YS9wb19maWxlcyIsCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy90aW1lcHBfX2dub21lIiwKICAidXVpZCI6ICJ0aW1lcHBAemFnb3J0ZW5heTMzMyIsCiAgInZlcnNpb24iOiAxNjUKfQ=="}}} , {"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": "Sync 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\nFeatures:\n* UHD resolution wallpapers\n* Automatically fetches current Bing wallpaper of the day and sets as both lock screen and desktop wallpaper (user selectable on GNOME versions that support it)\n* Doesn't poll continuously - only once per day and on startup (schedules a refresh when Bing is due to update)\n * random mode (from previously downloaded wallpapers)\n *NEW: select/cycle wallpaper through previously downloaded images\n* Language support: English (en), German (de), Dutch (nl), Italian (it), Polish (pl), Chinese (zh_CN, zh_TW), French (fr_FR), Portuguese (pt, pt_BR), Ukrainian (uk), Russian (ru_RU), Spanish (es), Korean (ko), Indonesian (id), Catalan (ca), Norwegian Bokmål (nb) & Nynorsk (ni), Swedish (sv), Arabic (ar), Hungarian (hu) and Japanese (ja) - a HUGE thanks to the translators\n\nThis extension was forked from 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\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": "43", "sha256": "1bhd491i0kzn8ia55wgrw99jvz5jrjxhxq9bf44cw542pica5zkb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}, "40": {"version": "43", "sha256": "1bhd491i0kzn8ia55wgrw99jvz5jrjxhxq9bf44cw542pica5zkb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}, "41": {"version": "43", "sha256": "1bhd491i0kzn8ia55wgrw99jvz5jrjxhxq9bf44cw542pica5zkb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}, "42": {"version": "43", "sha256": "1bhd491i0kzn8ia55wgrw99jvz5jrjxhxq9bf44cw542pica5zkb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}, "43": {"version": "43", "sha256": "1bhd491i0kzn8ia55wgrw99jvz5jrjxhxq9bf44cw542pica5zkb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}}} +, {"uuid": "BingWallpaper@ineffable-gmail.com", "name": "Bing Wallpaper", "pname": "bing-wallpaper-changer", "description": "Sync 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\nFeatures:\n* UHD resolution wallpapers\n* Automatically fetches current Bing wallpaper of the day and sets as both lock screen and desktop wallpaper (user selectable on GNOME versions that support it)\n* Doesn't poll continuously - only once per day and on startup (schedules a refresh when Bing is due to update)\n * random mode (from previously downloaded wallpapers)\n *NEW: select/cycle wallpaper through previously downloaded images\n* Language support: English (en), German (de), Dutch (nl), Italian (it), Polish (pl), Chinese (zh_CN, zh_TW), French (fr_FR), Portuguese (pt, pt_BR), Ukrainian (uk), Russian (ru_RU), Spanish (es), Korean (ko), Indonesian (id), Catalan (ca), Norwegian Bokmål (nb) & Nynorsk (ni), Swedish (sv), Arabic (ar), Hungarian (hu) and Japanese (ja) - a HUGE thanks to the translators\n\nThis extension was forked from 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\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": "44", "sha256": "0cij7hp4197qnjfzxx68798fmqxxz4xa0jlc6kvnc1gphg891gdg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="}, "40": {"version": "44", "sha256": "0cij7hp4197qnjfzxx68798fmqxxz4xa0jlc6kvnc1gphg891gdg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="}, "41": {"version": "44", "sha256": "0cij7hp4197qnjfzxx68798fmqxxz4xa0jlc6kvnc1gphg891gdg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="}, "42": {"version": "44", "sha256": "0cij7hp4197qnjfzxx68798fmqxxz4xa0jlc6kvnc1gphg891gdg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="}, "43": {"version": "44", "sha256": "0cij7hp4197qnjfzxx68798fmqxxz4xa0jlc6kvnc1gphg891gdg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="}}} , {"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": "15", "sha256": "0ca6jssz9h2dycs4ash89j0c8mwsxhlbc4mf684zfxih30fj43hl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEiLAogICJkZXNjcmlwdGlvbi1odG1sIjogIkluc3BpcmVkIGJ5IDxhIGhyZWY9XCJodHRwczovL2dpdGh1Yi5jb20vY2FuZGlkdGltL3ZhZ3JhbnQtYXBwaW5kaWNhdG9yXCI+dmdhcHBsZXQ8L2E+LFxuPGI+R05PTUUgVmFncmFudCBJbmRpY2F0b3I8L2I+IGxldHMgeW91IGVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJsaWNlbnNlIjogIkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjAiLAogICJsaWNlbnNlLWh0bWwiOiAiVGhpcyBwcm9ncmFtIGNvbWVzIHdpdGggQUJTT0xVVEVMWSBOTyBXQVJSQU5UWS5cblNlZSB0aGUgPGEgaHJlZj1cImh0dHBzOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvZ3BsLTMuMC5odG1sXCI+R05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMDwvYT4gZm9yIGRldGFpbHMuIiwKICAibmFtZSI6ICJHTk9NRSBWYWdyYW50IEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJGcmFuam8gRmlsbyA8ZmZmaWxvNjY2QGdtYWlsLmNvbT4iLAogICJvcmlnaW5hbC1hdXRob3ItaHRtbCI6ICJGcmFuam8gRmlsbyA8YSBocmVmPVwibWFpbHRvOmZmZmlsbzY2NkBnbWFpbC5jb21cIj4mbHQ7ZmZmaWxvNjY2QGdtYWlsLmNvbSZndDs8L2E+IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLXZhZ3JhbnQtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmZpbG8vZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdub21lLXZhZ3JhbnQtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4c3RlbnNpb25zLmZmZmlsby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "0ca6jssz9h2dycs4ash89j0c8mwsxhlbc4mf684zfxih30fj43hl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEiLAogICJkZXNjcmlwdGlvbi1odG1sIjogIkluc3BpcmVkIGJ5IDxhIGhyZWY9XCJodHRwczovL2dpdGh1Yi5jb20vY2FuZGlkdGltL3ZhZ3JhbnQtYXBwaW5kaWNhdG9yXCI+dmdhcHBsZXQ8L2E+LFxuPGI+R05PTUUgVmFncmFudCBJbmRpY2F0b3I8L2I+IGxldHMgeW91IGVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJsaWNlbnNlIjogIkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjAiLAogICJsaWNlbnNlLWh0bWwiOiAiVGhpcyBwcm9ncmFtIGNvbWVzIHdpdGggQUJTT0xVVEVMWSBOTyBXQVJSQU5UWS5cblNlZSB0aGUgPGEgaHJlZj1cImh0dHBzOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvZ3BsLTMuMC5odG1sXCI+R05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMDwvYT4gZm9yIGRldGFpbHMuIiwKICAibmFtZSI6ICJHTk9NRSBWYWdyYW50IEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJGcmFuam8gRmlsbyA8ZmZmaWxvNjY2QGdtYWlsLmNvbT4iLAogICJvcmlnaW5hbC1hdXRob3ItaHRtbCI6ICJGcmFuam8gRmlsbyA8YSBocmVmPVwibWFpbHRvOmZmZmlsbzY2NkBnbWFpbC5jb21cIj4mbHQ7ZmZmaWxvNjY2QGdtYWlsLmNvbSZndDs8L2E+IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLXZhZ3JhbnQtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmZpbG8vZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdub21lLXZhZ3JhbnQtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4c3RlbnNpb25zLmZmZmlsby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "42": {"version": "16", "sha256": "0gr6x1zpflcwkv15xv372fvi992s88ldc479igis6pyp5v9mb5zv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEiLAogICJkZXNjcmlwdGlvbi1odG1sIjogIkluc3BpcmVkIGJ5IDxhIGhyZWY9XCJodHRwczovL2dpdGh1Yi5jb20vY2FuZGlkdGltL3ZhZ3JhbnQtYXBwaW5kaWNhdG9yXCI+dmdhcHBsZXQ8L2E+LDxiciAvPjxiPkdOT01FIFZhZ3JhbnQgSW5kaWNhdG9yPC9iPiBsZXRzIHlvdSBlYXNpbHkgbWFuYWdlPGJyIC8+eW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJsaWNlbnNlIjogIkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjAiLAogICJsaWNlbnNlLWh0bWwiOiAiVGhpcyBwcm9ncmFtIGNvbWVzIHdpdGggQUJTT0xVVEVMWSBOTyBXQVJSQU5UWS48YnIgLz5TZWUgdGhlIDxhIGhyZWY9XCJodHRwczovL3d3dy5nbnUub3JnL2xpY2Vuc2VzL2dwbC0zLjAuaHRtbFwiPkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjA8L2E+IGZvciBkZXRhaWxzLiIsCiAgIm5hbWUiOiAiR05PTUUgVmFncmFudCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gPGEgaHJlZj1cIm1haWx0bzpmZmZpbG82NjZAZ21haWwuY29tXCI+Jmx0O2ZmZmlsbzY2NkBnbWFpbC5jb20mZ3Q7PC9hPiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS12YWdyYW50LWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmZpbG8vZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdub21lLXZhZ3JhbnQtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4c3RlbnNpb25zLmZmZmlsby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE2Cn0="}}} -, {"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": "10", "sha256": "0p8yrdryw4f6a4llsqlv0415hb08lkgjf8q6vb8b14y736hphzns", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVsL05WSURJQSBHUFUgU3dpdGNoIiwKICAiZGVzY3JpcHRpb24taHRtbCI6ICJHTk9NRSBzaGVsbCBleHRlbnNpb24gdGhhdCBhZGRzIEludGVsL05WSURJQSBHUFUgc3dpdGNoIHRvIGFnZ3JlZ2F0ZSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInByaW1lLWluZGljYXRvciIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIlByaW1lIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJGcmFuam8gRmlsbyA8ZmZmaWxvNjY2QGdtYWlsLmNvbT4iLAogICJvcmlnaW5hbC1hdXRob3ItaHRtbCI6ICJGcmFuam8gRmlsbyAmbHQ7PGEgaHJlZj1cIm1haWx0bzpmZmZpbG82NjZAZ21haWwuY29tXCI+ZmZmaWxvNjY2QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW1lLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmZmaWxvL3ByaW1lLWluZGljYXRvciIsCiAgInV1aWQiOiAicHJpbWUtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4c3RlbnNpb25zLmZmZmlsby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0p8yrdryw4f6a4llsqlv0415hb08lkgjf8q6vb8b14y736hphzns", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVsL05WSURJQSBHUFUgU3dpdGNoIiwKICAiZGVzY3JpcHRpb24taHRtbCI6ICJHTk9NRSBzaGVsbCBleHRlbnNpb24gdGhhdCBhZGRzIEludGVsL05WSURJQSBHUFUgc3dpdGNoIHRvIGFnZ3JlZ2F0ZSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInByaW1lLWluZGljYXRvciIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIlByaW1lIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJGcmFuam8gRmlsbyA8ZmZmaWxvNjY2QGdtYWlsLmNvbT4iLAogICJvcmlnaW5hbC1hdXRob3ItaHRtbCI6ICJGcmFuam8gRmlsbyAmbHQ7PGEgaHJlZj1cIm1haWx0bzpmZmZpbG82NjZAZ21haWwuY29tXCI+ZmZmaWxvNjY2QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW1lLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmZmaWxvL3ByaW1lLWluZGljYXRvciIsCiAgInV1aWQiOiAicHJpbWUtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4c3RlbnNpb25zLmZmZmlsby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "12", "sha256": "1m17gqfpqfjyc58q0ldsdcjagwkjc5ks4dlc9jgjvvx0fzz5sijf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVsL05WSURJQSBHUFUgU3dpdGNoIiwKICAiZGVzY3JpcHRpb24taHRtbCI6ICJHTk9NRSBzaGVsbCBleHRlbnNpb24gdGhhdCBhZGRzIEludGVsL05WSURJQSBHUFUgc3dpdGNoIHRvIGFnZ3JlZ2F0ZSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInByaW1lLWluZGljYXRvciIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLjxiciAvPlNlZSB0aGUgPGEgaHJlZj1cImh0dHBzOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvZ3BsLTMuMC5odG1sXCI+R05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMDwvYT4gZm9yIGRldGFpbHMuIiwKICAibmFtZSI6ICJQcmltZSBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wcmltZS1pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmZmaWxvL3ByaW1lLWluZGljYXRvciIsCiAgInVybC1kb25hdGlvbiI6ICJodHRwczovL3d3dy5idXltZWFjb2ZmZWUuY29tL2ZmZmlsbyIsCiAgInV1aWQiOiAicHJpbWUtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4c3RlbnNpb25zLmZmZmlsby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}}} +, {"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": "15", "sha256": "0ca6jssz9h2dycs4ash89j0c8mwsxhlbc4mf684zfxih30fj43hl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEiLAogICJkZXNjcmlwdGlvbi1odG1sIjogIkluc3BpcmVkIGJ5IDxhIGhyZWY9XCJodHRwczovL2dpdGh1Yi5jb20vY2FuZGlkdGltL3ZhZ3JhbnQtYXBwaW5kaWNhdG9yXCI+dmdhcHBsZXQ8L2E+LFxuPGI+R05PTUUgVmFncmFudCBJbmRpY2F0b3I8L2I+IGxldHMgeW91IGVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJsaWNlbnNlIjogIkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjAiLAogICJsaWNlbnNlLWh0bWwiOiAiVGhpcyBwcm9ncmFtIGNvbWVzIHdpdGggQUJTT0xVVEVMWSBOTyBXQVJSQU5UWS5cblNlZSB0aGUgPGEgaHJlZj1cImh0dHBzOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvZ3BsLTMuMC5odG1sXCI+R05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMDwvYT4gZm9yIGRldGFpbHMuIiwKICAibmFtZSI6ICJHTk9NRSBWYWdyYW50IEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJGcmFuam8gRmlsbyA8ZmZmaWxvNjY2QGdtYWlsLmNvbT4iLAogICJvcmlnaW5hbC1hdXRob3ItaHRtbCI6ICJGcmFuam8gRmlsbyA8YSBocmVmPVwibWFpbHRvOmZmZmlsbzY2NkBnbWFpbC5jb21cIj4mbHQ7ZmZmaWxvNjY2QGdtYWlsLmNvbSZndDs8L2E+IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLXZhZ3JhbnQtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmZpbG8vZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdub21lLXZhZ3JhbnQtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4c3RlbnNpb25zLmZmZmlsby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "0ca6jssz9h2dycs4ash89j0c8mwsxhlbc4mf684zfxih30fj43hl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEiLAogICJkZXNjcmlwdGlvbi1odG1sIjogIkluc3BpcmVkIGJ5IDxhIGhyZWY9XCJodHRwczovL2dpdGh1Yi5jb20vY2FuZGlkdGltL3ZhZ3JhbnQtYXBwaW5kaWNhdG9yXCI+dmdhcHBsZXQ8L2E+LFxuPGI+R05PTUUgVmFncmFudCBJbmRpY2F0b3I8L2I+IGxldHMgeW91IGVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJsaWNlbnNlIjogIkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjAiLAogICJsaWNlbnNlLWh0bWwiOiAiVGhpcyBwcm9ncmFtIGNvbWVzIHdpdGggQUJTT0xVVEVMWSBOTyBXQVJSQU5UWS5cblNlZSB0aGUgPGEgaHJlZj1cImh0dHBzOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvZ3BsLTMuMC5odG1sXCI+R05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMDwvYT4gZm9yIGRldGFpbHMuIiwKICAibmFtZSI6ICJHTk9NRSBWYWdyYW50IEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJGcmFuam8gRmlsbyA8ZmZmaWxvNjY2QGdtYWlsLmNvbT4iLAogICJvcmlnaW5hbC1hdXRob3ItaHRtbCI6ICJGcmFuam8gRmlsbyA8YSBocmVmPVwibWFpbHRvOmZmZmlsbzY2NkBnbWFpbC5jb21cIj4mbHQ7ZmZmaWxvNjY2QGdtYWlsLmNvbSZndDs8L2E+IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLXZhZ3JhbnQtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmZpbG8vZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdub21lLXZhZ3JhbnQtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4c3RlbnNpb25zLmZmZmlsby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "42": {"version": "17", "sha256": "1nwyjh48rs18scgmr5ghgm15x4azmx83mad7s91fx8cbb8h7l71h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEiLAogICJkZXNjcmlwdGlvbi1odG1sIjogIkluc3BpcmVkIGJ5IDxhIGhyZWY9XCJodHRwczovL2dpdGh1Yi5jb20vY2FuZGlkdGltL3ZhZ3JhbnQtYXBwaW5kaWNhdG9yXCI+dmdhcHBsZXQ8L2E+LDxiciAvPjxiPkdOT01FIFZhZ3JhbnQgSW5kaWNhdG9yPC9iPiBsZXRzIHlvdSBlYXNpbHkgbWFuYWdlPGJyIC8+eW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEuIiwKICAiZG9uYXRpb24iOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9mZmZpbG8iLAogICJkb25hdGlvbi1odG1sIjogIklmIHlvdSBmaW5kIHRoaXMgcHJvamVjdCB1c2VmdWwgeW91IG1heSBjb25zaWRlciB0aGUgb3B0aW9uIHRvPGJyLz5idXkgbWUgYSBiZWVyLCBpbiByZWFsIGxpZmUgb3IgdGhyb3VnaCA8YSBocmVmPVwiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9mZmZpbG9cIj5kb25hdGlvbjwvYT4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJsaWNlbnNlIjogIkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjAiLAogICJsaWNlbnNlLWh0bWwiOiAiVGhpcyBwcm9ncmFtIGNvbWVzIHdpdGggQUJTT0xVVEVMWSBOTyBXQVJSQU5UWS48YnIgLz5TZWUgdGhlIDxhIGhyZWY9XCJodHRwczovL3d3dy5nbnUub3JnL2xpY2Vuc2VzL2dwbC0zLjAuaHRtbFwiPkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjA8L2E+IGZvciBkZXRhaWxzLiIsCiAgIm5hbWUiOiAiR05PTUUgVmFncmFudCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gPGEgaHJlZj1cIm1haWx0bzpmZmZpbG82NjZAZ21haWwuY29tXCI+Jmx0O2ZmZmlsbzY2NkBnbWFpbC5jb20mZ3Q7PC9hPiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS12YWdyYW50LWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmZpbG8vZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdub21lLXZhZ3JhbnQtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4c3RlbnNpb25zLmZmZmlsby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="}}} +, {"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": "10", "sha256": "0p8yrdryw4f6a4llsqlv0415hb08lkgjf8q6vb8b14y736hphzns", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVsL05WSURJQSBHUFUgU3dpdGNoIiwKICAiZGVzY3JpcHRpb24taHRtbCI6ICJHTk9NRSBzaGVsbCBleHRlbnNpb24gdGhhdCBhZGRzIEludGVsL05WSURJQSBHUFUgc3dpdGNoIHRvIGFnZ3JlZ2F0ZSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInByaW1lLWluZGljYXRvciIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIlByaW1lIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJGcmFuam8gRmlsbyA8ZmZmaWxvNjY2QGdtYWlsLmNvbT4iLAogICJvcmlnaW5hbC1hdXRob3ItaHRtbCI6ICJGcmFuam8gRmlsbyAmbHQ7PGEgaHJlZj1cIm1haWx0bzpmZmZpbG82NjZAZ21haWwuY29tXCI+ZmZmaWxvNjY2QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW1lLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmZmaWxvL3ByaW1lLWluZGljYXRvciIsCiAgInV1aWQiOiAicHJpbWUtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4c3RlbnNpb25zLmZmZmlsby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0p8yrdryw4f6a4llsqlv0415hb08lkgjf8q6vb8b14y736hphzns", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVsL05WSURJQSBHUFUgU3dpdGNoIiwKICAiZGVzY3JpcHRpb24taHRtbCI6ICJHTk9NRSBzaGVsbCBleHRlbnNpb24gdGhhdCBhZGRzIEludGVsL05WSURJQSBHUFUgc3dpdGNoIHRvIGFnZ3JlZ2F0ZSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInByaW1lLWluZGljYXRvciIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIlByaW1lIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJGcmFuam8gRmlsbyA8ZmZmaWxvNjY2QGdtYWlsLmNvbT4iLAogICJvcmlnaW5hbC1hdXRob3ItaHRtbCI6ICJGcmFuam8gRmlsbyAmbHQ7PGEgaHJlZj1cIm1haWx0bzpmZmZpbG82NjZAZ21haWwuY29tXCI+ZmZmaWxvNjY2QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW1lLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmZmaWxvL3ByaW1lLWluZGljYXRvciIsCiAgInV1aWQiOiAicHJpbWUtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4c3RlbnNpb25zLmZmZmlsby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "13", "sha256": "0cm6m0w9rv99l68v1xkn4ry0k6b1y8kmpblldzjd7f560zz8h64h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVsL05WSURJQSBHUFUgU3dpdGNoIiwKICAiZGVzY3JpcHRpb24taHRtbCI6ICJHTk9NRSBzaGVsbCBleHRlbnNpb24gdGhhdCBhZGRzIEludGVsL05WSURJQSBHUFUgc3dpdGNoIHRvIGFnZ3JlZ2F0ZSBtZW51LiIsCiAgImRvbmF0aW9uIjogImh0dHBzOi8vd3d3LmJ1eW1lYWNvZmZlZS5jb20vZmZmaWxvIiwKICAiZG9uYXRpb24taHRtbCI6ICJJZiB5b3UgZmluZCB0aGlzIHByb2plY3QgdXNlZnVsIHlvdSBtYXkgY29uc2lkZXIgdGhlIG9wdGlvbiB0bzxici8+YnV5IG1lIGEgYmVlciwgaW4gcmVhbCBsaWZlIG9yIHRocm91Z2ggPGEgaHJlZj1cImh0dHBzOi8vd3d3LmJ1eW1lYWNvZmZlZS5jb20vZmZmaWxvXCI+ZG9uYXRpb248L2E+LiIsCiAgImdldHRleHQtZG9tYWluIjogInByaW1lLWluZGljYXRvciIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLjxiciAvPlNlZSB0aGUgPGEgaHJlZj1cImh0dHBzOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvZ3BsLTMuMC5odG1sXCI+R05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMDwvYT4gZm9yIGRldGFpbHMuIiwKICAibmFtZSI6ICJQcmltZSBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wcmltZS1pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmZmaWxvL3ByaW1lLWluZGljYXRvciIsCiAgInVybC1kb25hdGlvbiI6ICJodHRwczovL3d3dy5idXltZWFjb2ZmZWUuY29tL2ZmZmlsbyIsCiAgInV1aWQiOiAicHJpbWUtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4c3RlbnNpb25zLmZmZmlsby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"uuid": "night-light-slider.timur@linux.com", "name": "Night Light Slider", "pname": "night-light-slider", "description": "A GNOME extension to manage the built-in night light temperature", "link": "https://extensions.gnome.org/extension/1276/night-light-slider/", "shell_version_map": {"38": {"version": "19", "sha256": "01vp7p3qwr51n4xqar55ak61a84wypbrla6kkmw0wdb6a0d119mc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRvIG1hbmFnZSB0aGUgYnVpbHQtaW4gbmlnaHQgbGlnaHQgdGVtcGVyYXR1cmUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuaWdodC1saWdodC1zbGlkZXIudGltdXJAbGludXguY29tIiwKICAiZ3Jlc291cmNlLWRhdGEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmlnaHRsaWdodHNsaWRlci5kYXRhLmdyZXNvdXJjZSIsCiAgIm5hbWUiOiAiTmlnaHQgTGlnaHQgU2xpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0bGlnaHRzbGlkZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vY29kZWJlcmcub3JnL2tpeXVpL2dub21lLXNoZWxsLW5pZ2h0LWxpZ2h0LXNsaWRlci1leHRlbnNpb24iLAogICJ1dWlkIjogIm5pZ2h0LWxpZ2h0LXNsaWRlci50aW11ckBsaW51eC5jb20iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "40": {"version": "23", "sha256": "1yqawlnpv2hql90xgkz947930bb4xdk94mrnf5rib2qyp9a83111", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRvIG1hbmFnZSB0aGUgYnVpbHQtaW4gbmlnaHQgbGlnaHQgdGVtcGVyYXR1cmUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuaWdodC1saWdodC1zbGlkZXIudGltdXJAbGludXguY29tIiwKICAibmFtZSI6ICJOaWdodCBMaWdodCBTbGlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmlnaHRsaWdodHNsaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9jb2RlYmVyZy5vcmcva2l5dWkvZ25vbWUtc2hlbGwtbmlnaHQtbGlnaHQtc2xpZGVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibmlnaHQtbGlnaHQtc2xpZGVyLnRpbXVyQGxpbnV4LmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}}} , {"uuid": "Poppy_Menu@dies", "name": "Poppy Menu", "pname": "poppy-menu", "description": "Replace Activities button with an Poppy menu - clone of Apple menu", "link": "https://extensions.gnome.org/extension/1279/poppy-menu/", "shell_version_map": {"42": {"version": "2", "sha256": "1lvxmf4p04zh2b6hcvssrbg0824biv2lcpz8gb6iargsf12kw69p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBidXR0b24gd2l0aCBhbiBQb3BweSBtZW51IC0gY2xvbmUgb2YgQXBwbGUgbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogInBvcHB5LW1lbnUiLAogICJuYW1lIjogIlBvcHB5IE1lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLnBvcHB5LnBvcHB5LW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIlBvcHB5X01lbnVAZGllcyIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"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": "DualShock/DualSense battery percentage", "pname": "dual-shock-4-battery-percentage", "description": "Show DS5/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": "10dm03mjk61fhbzpc848rba0spnnmbwy9mj9614zc3vbli2dgz1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgRFM1L0RTNC9EUzMgYmF0dGVyeSByZW1haW5pbmcgcG93ZXIgcGVyY2VudGFnZSBhdCB0aGUgdG9wIHBhbmVsIiwKICAibmFtZSI6ICJEdWFsU2hvY2svRHVhbFNlbnNlIGJhdHRlcnkgcGVyY2VudGFnZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWVAc2xpZS5ydSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGFua2p1cmEvZHM0YmF0dGVyeSIsCiAgInV1aWQiOiAiZHM0YmF0dGVyeUBzbGllLnJ1IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "8", "sha256": "02jp0vmf6644g5h8il5kw576sc75zgfix6vk22in4638l63kwk79", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgRFM1L0RTNC9EUzMgYmF0dGVyeSByZW1haW5pbmcgcG93ZXIgcGVyY2VudGFnZSBhdCB0aGUgdG9wIHBhbmVsIiwKICAibmFtZSI6ICJEdWFsU2hvY2svRHVhbFNlbnNlIGJhdHRlcnkgcGVyY2VudGFnZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWVAc2xpZS5ydSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGhhbmtqdXJhL2RzNGJhdHRlcnkiLAogICJ1dWlkIjogImRzNGJhdHRlcnlAc2xpZS5ydSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "02jp0vmf6644g5h8il5kw576sc75zgfix6vk22in4638l63kwk79", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgRFM1L0RTNC9EUzMgYmF0dGVyeSByZW1haW5pbmcgcG93ZXIgcGVyY2VudGFnZSBhdCB0aGUgdG9wIHBhbmVsIiwKICAibmFtZSI6ICJEdWFsU2hvY2svRHVhbFNlbnNlIGJhdHRlcnkgcGVyY2VudGFnZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWVAc2xpZS5ydSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGhhbmtqdXJhL2RzNGJhdHRlcnkiLAogICJ1dWlkIjogImRzNGJhdHRlcnlAc2xpZS5ydSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "02jp0vmf6644g5h8il5kw576sc75zgfix6vk22in4638l63kwk79", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgRFM1L0RTNC9EUzMgYmF0dGVyeSByZW1haW5pbmcgcG93ZXIgcGVyY2VudGFnZSBhdCB0aGUgdG9wIHBhbmVsIiwKICAibmFtZSI6ICJEdWFsU2hvY2svRHVhbFNlbnNlIGJhdHRlcnkgcGVyY2VudGFnZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWVAc2xpZS5ydSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGhhbmtqdXJhL2RzNGJhdHRlcnkiLAogICJ1dWlkIjogImRzNGJhdHRlcnlAc2xpZS5ydSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "02jp0vmf6644g5h8il5kw576sc75zgfix6vk22in4638l63kwk79", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgRFM1L0RTNC9EUzMgYmF0dGVyeSByZW1haW5pbmcgcG93ZXIgcGVyY2VudGFnZSBhdCB0aGUgdG9wIHBhbmVsIiwKICAibmFtZSI6ICJEdWFsU2hvY2svRHVhbFNlbnNlIGJhdHRlcnkgcGVyY2VudGFnZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWVAc2xpZS5ydSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGhhbmtqdXJhL2RzNGJhdHRlcnkiLAogICJ1dWlkIjogImRzNGJhdHRlcnlAc2xpZS5ydSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"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": "19", "sha256": "0xhvxlf4dmlb7vkjzqv7w8ks060mw3vmars58v7milxapig3p2pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhvdGVsIE1hbmFnZXIgYWxsb3dzIHRvIHN0YXJ0IGFuZCBzdG9wIHRoZSBIb3RlbCBkYWVtb24gYW5kIHlvdXIgZGV2ZWxvcG1lbnQgc2VydmVycyB2aWEgYSBtZW51IGluIHRoZSBzdGF0dXMgYXJlYS4iLAogICJuYW1lIjogIkhvdGVsIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyZHBpeGVsL2hvdGVsLW1hbmFnZXIiLAogICJ1dWlkIjogImhvdGVsLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDE5Cn0="}, "40": {"version": "19", "sha256": "0xhvxlf4dmlb7vkjzqv7w8ks060mw3vmars58v7milxapig3p2pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhvdGVsIE1hbmFnZXIgYWxsb3dzIHRvIHN0YXJ0IGFuZCBzdG9wIHRoZSBIb3RlbCBkYWVtb24gYW5kIHlvdXIgZGV2ZWxvcG1lbnQgc2VydmVycyB2aWEgYSBtZW51IGluIHRoZSBzdGF0dXMgYXJlYS4iLAogICJuYW1lIjogIkhvdGVsIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyZHBpeGVsL2hvdGVsLW1hbmFnZXIiLAogICJ1dWlkIjogImhvdGVsLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "0xhvxlf4dmlb7vkjzqv7w8ks060mw3vmars58v7milxapig3p2pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhvdGVsIE1hbmFnZXIgYWxsb3dzIHRvIHN0YXJ0IGFuZCBzdG9wIHRoZSBIb3RlbCBkYWVtb24gYW5kIHlvdXIgZGV2ZWxvcG1lbnQgc2VydmVycyB2aWEgYSBtZW51IGluIHRoZSBzdGF0dXMgYXJlYS4iLAogICJuYW1lIjogIkhvdGVsIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyZHBpeGVsL2hvdGVsLW1hbmFnZXIiLAogICJ1dWlkIjogImhvdGVsLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDE5Cn0="}, "42": {"version": "19", "sha256": "0xhvxlf4dmlb7vkjzqv7w8ks060mw3vmars58v7milxapig3p2pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhvdGVsIE1hbmFnZXIgYWxsb3dzIHRvIHN0YXJ0IGFuZCBzdG9wIHRoZSBIb3RlbCBkYWVtb24gYW5kIHlvdXIgZGV2ZWxvcG1lbnQgc2VydmVycyB2aWEgYSBtZW51IGluIHRoZSBzdGF0dXMgYXJlYS4iLAogICJuYW1lIjogIkhvdGVsIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyZHBpeGVsL2hvdGVsLW1hbmFnZXIiLAogICJ1dWlkIjogImhvdGVsLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDE5Cn0="}, "43": {"version": "19", "sha256": "0xhvxlf4dmlb7vkjzqv7w8ks060mw3vmars58v7milxapig3p2pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhvdGVsIE1hbmFnZXIgYWxsb3dzIHRvIHN0YXJ0IGFuZCBzdG9wIHRoZSBIb3RlbCBkYWVtb24gYW5kIHlvdXIgZGV2ZWxvcG1lbnQgc2VydmVycyB2aWEgYSBtZW51IGluIHRoZSBzdGF0dXMgYXJlYS4iLAogICJuYW1lIjogIkhvdGVsIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyZHBpeGVsL2hvdGVsLW1hbmFnZXIiLAogICJ1dWlkIjogImhvdGVsLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDE5Cn0="}}} , {"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": "69", "sha256": "1ajvk5f2zzgv0w8j9610wy9f56n4g5hjvh8dm5wwvp5f9qsmfn3r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuaXRlIGlzIGEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIHdoaWNoIG1ha2VzIGEgZmV3IGxheW91dCB0d2Vha3MgdG8gdGhlIHRvcCBwYW5lbCBhbmQgcmVtb3ZlcyB3aW5kb3cgZGVjb3JhdGlvbnMgdG8gbWFrZSBpdCBsb29rIGxpa2UgVWJ1bnR1IFVuaXR5IFNoZWxsLlxuXG4tIEFkZHMgd2luZG93IGJ1dHRvbnMgdG8gdGhlIHRvcCBwYW5lbCBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFNob3dzIGN1cnJlbnQgd2luZG93IHRpdGxlIGluIHRoZSBhcHAgbWVudSBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFJlbW92ZXMgdGl0bGViYXJzIG9uIG1heGltaXplZCB3aW5kb3dzLlxuLSBIaWRlcyB3aW5kb3cgY29udHJvbHMgb24gbWF4aW1pemVkIHdpbmRvd3Mgd2l0aCBoZWFkZXJiYXJzLlxuLSBNb3ZlcyB0aGUgZGF0ZSB0byB0aGUgcmlnaHQsIHJlZHVjZXMgcGFuZWwgc3BhY2luZyBhbmQgcmVtb3ZlcyBkcm9wZG93biBhcnJvd3MuXG4tIE1vdmVzIGxlZ2FjeSB0cmF5IGljb25zIHRvIHRoZSB0b3AgcGFuZWwuXG4tIE1vdmVzIG5vdGlmaWNhdGlvbnMgdG8gdGhlIHJpZ2h0LlxuLSBIaWRlcyBhY3Rpdml0aWVzIGJ1dHRvbi5cbi0gQWRkcyBkZXNrdG9wIG5hbWUgdG8gdGhlIHRvcCBwYW5lbC5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBzb21lIFhvcmcgdXRpbGl0aWVzLiBUbyBpbnN0YWxsIHRoZW06XG4tIERlYmlhbi9VYnVudHU6IGFwdCBpbnN0YWxsIHgxMS11dGlsc1xuLSBGZWRvcmEvUkhFTDogZG5mIGluc3RhbGwgeHByb3Bcbi0gRmVkb3JhIFNpbHZlcmJsdWU6IHJwbS1vc3RyZWUgaW5zdGFsbCB4cHJvcFxuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIG9yIGN1c3RvbWl6ZSB0aGUgYXZhaWxhYmxlIHR3ZWFrcy5cbiogU2luY2UgdmVyc2lvbiAyIGFwcGxpY2F0aW9ucyBvbiB3YXlsYW5kIHdpdGggY2xpZW50IHNpZGUgZGVjb3JhdGlvbnMgYXJlIHN1cHBvcnRlZCB1c2luZyBDU1MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidW5pdGUiLAogICJuYW1lIjogIlVuaXRlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVuaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC91bml0ZS1zaGVsbCIsCiAgInV1aWQiOiAidW5pdGVAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDY5Cn0="}, "40": {"version": "69", "sha256": "1ajvk5f2zzgv0w8j9610wy9f56n4g5hjvh8dm5wwvp5f9qsmfn3r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuaXRlIGlzIGEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIHdoaWNoIG1ha2VzIGEgZmV3IGxheW91dCB0d2Vha3MgdG8gdGhlIHRvcCBwYW5lbCBhbmQgcmVtb3ZlcyB3aW5kb3cgZGVjb3JhdGlvbnMgdG8gbWFrZSBpdCBsb29rIGxpa2UgVWJ1bnR1IFVuaXR5IFNoZWxsLlxuXG4tIEFkZHMgd2luZG93IGJ1dHRvbnMgdG8gdGhlIHRvcCBwYW5lbCBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFNob3dzIGN1cnJlbnQgd2luZG93IHRpdGxlIGluIHRoZSBhcHAgbWVudSBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFJlbW92ZXMgdGl0bGViYXJzIG9uIG1heGltaXplZCB3aW5kb3dzLlxuLSBIaWRlcyB3aW5kb3cgY29udHJvbHMgb24gbWF4aW1pemVkIHdpbmRvd3Mgd2l0aCBoZWFkZXJiYXJzLlxuLSBNb3ZlcyB0aGUgZGF0ZSB0byB0aGUgcmlnaHQsIHJlZHVjZXMgcGFuZWwgc3BhY2luZyBhbmQgcmVtb3ZlcyBkcm9wZG93biBhcnJvd3MuXG4tIE1vdmVzIGxlZ2FjeSB0cmF5IGljb25zIHRvIHRoZSB0b3AgcGFuZWwuXG4tIE1vdmVzIG5vdGlmaWNhdGlvbnMgdG8gdGhlIHJpZ2h0LlxuLSBIaWRlcyBhY3Rpdml0aWVzIGJ1dHRvbi5cbi0gQWRkcyBkZXNrdG9wIG5hbWUgdG8gdGhlIHRvcCBwYW5lbC5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBzb21lIFhvcmcgdXRpbGl0aWVzLiBUbyBpbnN0YWxsIHRoZW06XG4tIERlYmlhbi9VYnVudHU6IGFwdCBpbnN0YWxsIHgxMS11dGlsc1xuLSBGZWRvcmEvUkhFTDogZG5mIGluc3RhbGwgeHByb3Bcbi0gRmVkb3JhIFNpbHZlcmJsdWU6IHJwbS1vc3RyZWUgaW5zdGFsbCB4cHJvcFxuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIG9yIGN1c3RvbWl6ZSB0aGUgYXZhaWxhYmxlIHR3ZWFrcy5cbiogU2luY2UgdmVyc2lvbiAyIGFwcGxpY2F0aW9ucyBvbiB3YXlsYW5kIHdpdGggY2xpZW50IHNpZGUgZGVjb3JhdGlvbnMgYXJlIHN1cHBvcnRlZCB1c2luZyBDU1MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidW5pdGUiLAogICJuYW1lIjogIlVuaXRlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVuaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC91bml0ZS1zaGVsbCIsCiAgInV1aWQiOiAidW5pdGVAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDY5Cn0="}, "41": {"version": "69", "sha256": "1ajvk5f2zzgv0w8j9610wy9f56n4g5hjvh8dm5wwvp5f9qsmfn3r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuaXRlIGlzIGEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIHdoaWNoIG1ha2VzIGEgZmV3IGxheW91dCB0d2Vha3MgdG8gdGhlIHRvcCBwYW5lbCBhbmQgcmVtb3ZlcyB3aW5kb3cgZGVjb3JhdGlvbnMgdG8gbWFrZSBpdCBsb29rIGxpa2UgVWJ1bnR1IFVuaXR5IFNoZWxsLlxuXG4tIEFkZHMgd2luZG93IGJ1dHRvbnMgdG8gdGhlIHRvcCBwYW5lbCBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFNob3dzIGN1cnJlbnQgd2luZG93IHRpdGxlIGluIHRoZSBhcHAgbWVudSBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFJlbW92ZXMgdGl0bGViYXJzIG9uIG1heGltaXplZCB3aW5kb3dzLlxuLSBIaWRlcyB3aW5kb3cgY29udHJvbHMgb24gbWF4aW1pemVkIHdpbmRvd3Mgd2l0aCBoZWFkZXJiYXJzLlxuLSBNb3ZlcyB0aGUgZGF0ZSB0byB0aGUgcmlnaHQsIHJlZHVjZXMgcGFuZWwgc3BhY2luZyBhbmQgcmVtb3ZlcyBkcm9wZG93biBhcnJvd3MuXG4tIE1vdmVzIGxlZ2FjeSB0cmF5IGljb25zIHRvIHRoZSB0b3AgcGFuZWwuXG4tIE1vdmVzIG5vdGlmaWNhdGlvbnMgdG8gdGhlIHJpZ2h0LlxuLSBIaWRlcyBhY3Rpdml0aWVzIGJ1dHRvbi5cbi0gQWRkcyBkZXNrdG9wIG5hbWUgdG8gdGhlIHRvcCBwYW5lbC5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBzb21lIFhvcmcgdXRpbGl0aWVzLiBUbyBpbnN0YWxsIHRoZW06XG4tIERlYmlhbi9VYnVudHU6IGFwdCBpbnN0YWxsIHgxMS11dGlsc1xuLSBGZWRvcmEvUkhFTDogZG5mIGluc3RhbGwgeHByb3Bcbi0gRmVkb3JhIFNpbHZlcmJsdWU6IHJwbS1vc3RyZWUgaW5zdGFsbCB4cHJvcFxuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIG9yIGN1c3RvbWl6ZSB0aGUgYXZhaWxhYmxlIHR3ZWFrcy5cbiogU2luY2UgdmVyc2lvbiAyIGFwcGxpY2F0aW9ucyBvbiB3YXlsYW5kIHdpdGggY2xpZW50IHNpZGUgZGVjb3JhdGlvbnMgYXJlIHN1cHBvcnRlZCB1c2luZyBDU1MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidW5pdGUiLAogICJuYW1lIjogIlVuaXRlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVuaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC91bml0ZS1zaGVsbCIsCiAgInV1aWQiOiAidW5pdGVAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDY5Cn0="}, "42": {"version": "69", "sha256": "1ajvk5f2zzgv0w8j9610wy9f56n4g5hjvh8dm5wwvp5f9qsmfn3r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuaXRlIGlzIGEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIHdoaWNoIG1ha2VzIGEgZmV3IGxheW91dCB0d2Vha3MgdG8gdGhlIHRvcCBwYW5lbCBhbmQgcmVtb3ZlcyB3aW5kb3cgZGVjb3JhdGlvbnMgdG8gbWFrZSBpdCBsb29rIGxpa2UgVWJ1bnR1IFVuaXR5IFNoZWxsLlxuXG4tIEFkZHMgd2luZG93IGJ1dHRvbnMgdG8gdGhlIHRvcCBwYW5lbCBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFNob3dzIGN1cnJlbnQgd2luZG93IHRpdGxlIGluIHRoZSBhcHAgbWVudSBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFJlbW92ZXMgdGl0bGViYXJzIG9uIG1heGltaXplZCB3aW5kb3dzLlxuLSBIaWRlcyB3aW5kb3cgY29udHJvbHMgb24gbWF4aW1pemVkIHdpbmRvd3Mgd2l0aCBoZWFkZXJiYXJzLlxuLSBNb3ZlcyB0aGUgZGF0ZSB0byB0aGUgcmlnaHQsIHJlZHVjZXMgcGFuZWwgc3BhY2luZyBhbmQgcmVtb3ZlcyBkcm9wZG93biBhcnJvd3MuXG4tIE1vdmVzIGxlZ2FjeSB0cmF5IGljb25zIHRvIHRoZSB0b3AgcGFuZWwuXG4tIE1vdmVzIG5vdGlmaWNhdGlvbnMgdG8gdGhlIHJpZ2h0LlxuLSBIaWRlcyBhY3Rpdml0aWVzIGJ1dHRvbi5cbi0gQWRkcyBkZXNrdG9wIG5hbWUgdG8gdGhlIHRvcCBwYW5lbC5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBzb21lIFhvcmcgdXRpbGl0aWVzLiBUbyBpbnN0YWxsIHRoZW06XG4tIERlYmlhbi9VYnVudHU6IGFwdCBpbnN0YWxsIHgxMS11dGlsc1xuLSBGZWRvcmEvUkhFTDogZG5mIGluc3RhbGwgeHByb3Bcbi0gRmVkb3JhIFNpbHZlcmJsdWU6IHJwbS1vc3RyZWUgaW5zdGFsbCB4cHJvcFxuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIG9yIGN1c3RvbWl6ZSB0aGUgYXZhaWxhYmxlIHR3ZWFrcy5cbiogU2luY2UgdmVyc2lvbiAyIGFwcGxpY2F0aW9ucyBvbiB3YXlsYW5kIHdpdGggY2xpZW50IHNpZGUgZGVjb3JhdGlvbnMgYXJlIHN1cHBvcnRlZCB1c2luZyBDU1MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidW5pdGUiLAogICJuYW1lIjogIlVuaXRlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVuaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC91bml0ZS1zaGVsbCIsCiAgInV1aWQiOiAidW5pdGVAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDY5Cn0="}, "43": {"version": "69", "sha256": "1ajvk5f2zzgv0w8j9610wy9f56n4g5hjvh8dm5wwvp5f9qsmfn3r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuaXRlIGlzIGEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIHdoaWNoIG1ha2VzIGEgZmV3IGxheW91dCB0d2Vha3MgdG8gdGhlIHRvcCBwYW5lbCBhbmQgcmVtb3ZlcyB3aW5kb3cgZGVjb3JhdGlvbnMgdG8gbWFrZSBpdCBsb29rIGxpa2UgVWJ1bnR1IFVuaXR5IFNoZWxsLlxuXG4tIEFkZHMgd2luZG93IGJ1dHRvbnMgdG8gdGhlIHRvcCBwYW5lbCBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFNob3dzIGN1cnJlbnQgd2luZG93IHRpdGxlIGluIHRoZSBhcHAgbWVudSBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFJlbW92ZXMgdGl0bGViYXJzIG9uIG1heGltaXplZCB3aW5kb3dzLlxuLSBIaWRlcyB3aW5kb3cgY29udHJvbHMgb24gbWF4aW1pemVkIHdpbmRvd3Mgd2l0aCBoZWFkZXJiYXJzLlxuLSBNb3ZlcyB0aGUgZGF0ZSB0byB0aGUgcmlnaHQsIHJlZHVjZXMgcGFuZWwgc3BhY2luZyBhbmQgcmVtb3ZlcyBkcm9wZG93biBhcnJvd3MuXG4tIE1vdmVzIGxlZ2FjeSB0cmF5IGljb25zIHRvIHRoZSB0b3AgcGFuZWwuXG4tIE1vdmVzIG5vdGlmaWNhdGlvbnMgdG8gdGhlIHJpZ2h0LlxuLSBIaWRlcyBhY3Rpdml0aWVzIGJ1dHRvbi5cbi0gQWRkcyBkZXNrdG9wIG5hbWUgdG8gdGhlIHRvcCBwYW5lbC5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBzb21lIFhvcmcgdXRpbGl0aWVzLiBUbyBpbnN0YWxsIHRoZW06XG4tIERlYmlhbi9VYnVudHU6IGFwdCBpbnN0YWxsIHgxMS11dGlsc1xuLSBGZWRvcmEvUkhFTDogZG5mIGluc3RhbGwgeHByb3Bcbi0gRmVkb3JhIFNpbHZlcmJsdWU6IHJwbS1vc3RyZWUgaW5zdGFsbCB4cHJvcFxuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIG9yIGN1c3RvbWl6ZSB0aGUgYXZhaWxhYmxlIHR3ZWFrcy5cbiogU2luY2UgdmVyc2lvbiAyIGFwcGxpY2F0aW9ucyBvbiB3YXlsYW5kIHdpdGggY2xpZW50IHNpZGUgZGVjb3JhdGlvbnMgYXJlIHN1cHBvcnRlZCB1c2luZyBDU1MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidW5pdGUiLAogICJuYW1lIjogIlVuaXRlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVuaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC91bml0ZS1zaGVsbCIsCiAgInV1aWQiOiAidW5pdGVAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDY5Cn0="}}} -, {"uuid": "GoogleEarthWallpaper@neffo.github.com", "name": "Google Earth Wallpaper", "pname": "google-earth-wallpaper", "description": "Lightweight GNOME shell extension to sets your wallpaper to a random photo from the curated Google Earth collection (2604 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": "15", "sha256": "0r68krvgjgkf8fdllb2k02zdg0xd6iidmn5nnz8w2hzx1jdvsmf9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXRzIHlvdXIgd2FsbHBhcGVyIHRvIGEgcmFuZG9tIHBob3RvIGZyb20gdGhlIGN1cmF0ZWQgR29vZ2xlIEVhcnRoIGNvbGxlY3Rpb24gKDI2MDQgcGhvdG9zKS5cblxuKkRpc2NsYWltZXIqOiB0aGlzIGV4dGVuc2lvbiBpcyB1bm9mZmljaWFsIGFuZCBub3QgYWZmaWxpYXRlZCB3aXRoIEdvb2dsZSBpbiBhbnkgd2F5LiBJbWFnZXMgYXJlIHByb3RlY3RlZCBieSBjb3B5cmlnaHQgYW5kIGFyZSBsaWNlbnNlZCBvbmx5IGZvciB1c2UgYXMgd2FsbHBhcGVycy5cblxuU2VlIGFsc28gbXkgb3RoZXIgZXh0ZW5zaW9uLCBCaW5nIFdhbGxwYXBlciBDaGFuZ2VyIChodHRwczovL2dpdGh1Yi5jb20vbmVmZm8vYmluZy13YWxscGFwZXItZ25vbWUtZXh0ZW5zaW9uKS5cblxuRmVhdHVyZXM6XG4qIEZldGNoZXMgYSByYW5kb20gR29vZ2xlIEVhcnRoIHdhbGxwYXBlciBhbmQgc2V0cyBhcyBib3RoIGxvY2sgc2NyZWVuIGFuZCBkZXNrdG9wIHdhbGxwYXBlclxuKiBVc2VyIHNlbGVjdGFibGUgcmVmcmVzaCBpbnRlcnZhbHMgKGRlZmF1bHQgaXMgb25jZSBwZXIgZGF5KVxuKiBWaWV3IGxvY2F0aW9uIG9uIEdvb2dsZSBNYXBzLCBCaW5nIE1hcHMsIEdub21lIE1hcHMsIE9wZW5TdHJlZXRNYXBzXG4qICBHZXJtYW4sIER1dGNoIGFuZCBDaGluZXNlIHRyYW5zbGF0aW9uc1xuXG5QbGVhc2UgcmVwb3J0IGFueSBidWdzIG9yIHN1Z2dlc3Rpb25zIHRvIGV4dGVuc2lvbiBHaXRIdWIgcGFnZSBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJHb29nbGVFYXJ0aFdhbGxwYXBlciIsCiAgIm5hbWUiOiAiR29vZ2xlIEVhcnRoIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nb29nbGVlYXJ0aHdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2VhcnRoLXZpZXctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiR29vZ2xlRWFydGhXYWxscGFwZXJAbmVmZm8uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "40": {"version": "15", "sha256": "0r68krvgjgkf8fdllb2k02zdg0xd6iidmn5nnz8w2hzx1jdvsmf9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXRzIHlvdXIgd2FsbHBhcGVyIHRvIGEgcmFuZG9tIHBob3RvIGZyb20gdGhlIGN1cmF0ZWQgR29vZ2xlIEVhcnRoIGNvbGxlY3Rpb24gKDI2MDQgcGhvdG9zKS5cblxuKkRpc2NsYWltZXIqOiB0aGlzIGV4dGVuc2lvbiBpcyB1bm9mZmljaWFsIGFuZCBub3QgYWZmaWxpYXRlZCB3aXRoIEdvb2dsZSBpbiBhbnkgd2F5LiBJbWFnZXMgYXJlIHByb3RlY3RlZCBieSBjb3B5cmlnaHQgYW5kIGFyZSBsaWNlbnNlZCBvbmx5IGZvciB1c2UgYXMgd2FsbHBhcGVycy5cblxuU2VlIGFsc28gbXkgb3RoZXIgZXh0ZW5zaW9uLCBCaW5nIFdhbGxwYXBlciBDaGFuZ2VyIChodHRwczovL2dpdGh1Yi5jb20vbmVmZm8vYmluZy13YWxscGFwZXItZ25vbWUtZXh0ZW5zaW9uKS5cblxuRmVhdHVyZXM6XG4qIEZldGNoZXMgYSByYW5kb20gR29vZ2xlIEVhcnRoIHdhbGxwYXBlciBhbmQgc2V0cyBhcyBib3RoIGxvY2sgc2NyZWVuIGFuZCBkZXNrdG9wIHdhbGxwYXBlclxuKiBVc2VyIHNlbGVjdGFibGUgcmVmcmVzaCBpbnRlcnZhbHMgKGRlZmF1bHQgaXMgb25jZSBwZXIgZGF5KVxuKiBWaWV3IGxvY2F0aW9uIG9uIEdvb2dsZSBNYXBzLCBCaW5nIE1hcHMsIEdub21lIE1hcHMsIE9wZW5TdHJlZXRNYXBzXG4qICBHZXJtYW4sIER1dGNoIGFuZCBDaGluZXNlIHRyYW5zbGF0aW9uc1xuXG5QbGVhc2UgcmVwb3J0IGFueSBidWdzIG9yIHN1Z2dlc3Rpb25zIHRvIGV4dGVuc2lvbiBHaXRIdWIgcGFnZSBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJHb29nbGVFYXJ0aFdhbGxwYXBlciIsCiAgIm5hbWUiOiAiR29vZ2xlIEVhcnRoIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nb29nbGVlYXJ0aHdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2VhcnRoLXZpZXctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiR29vZ2xlRWFydGhXYWxscGFwZXJAbmVmZm8uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "41": {"version": "15", "sha256": "0r68krvgjgkf8fdllb2k02zdg0xd6iidmn5nnz8w2hzx1jdvsmf9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXRzIHlvdXIgd2FsbHBhcGVyIHRvIGEgcmFuZG9tIHBob3RvIGZyb20gdGhlIGN1cmF0ZWQgR29vZ2xlIEVhcnRoIGNvbGxlY3Rpb24gKDI2MDQgcGhvdG9zKS5cblxuKkRpc2NsYWltZXIqOiB0aGlzIGV4dGVuc2lvbiBpcyB1bm9mZmljaWFsIGFuZCBub3QgYWZmaWxpYXRlZCB3aXRoIEdvb2dsZSBpbiBhbnkgd2F5LiBJbWFnZXMgYXJlIHByb3RlY3RlZCBieSBjb3B5cmlnaHQgYW5kIGFyZSBsaWNlbnNlZCBvbmx5IGZvciB1c2UgYXMgd2FsbHBhcGVycy5cblxuU2VlIGFsc28gbXkgb3RoZXIgZXh0ZW5zaW9uLCBCaW5nIFdhbGxwYXBlciBDaGFuZ2VyIChodHRwczovL2dpdGh1Yi5jb20vbmVmZm8vYmluZy13YWxscGFwZXItZ25vbWUtZXh0ZW5zaW9uKS5cblxuRmVhdHVyZXM6XG4qIEZldGNoZXMgYSByYW5kb20gR29vZ2xlIEVhcnRoIHdhbGxwYXBlciBhbmQgc2V0cyBhcyBib3RoIGxvY2sgc2NyZWVuIGFuZCBkZXNrdG9wIHdhbGxwYXBlclxuKiBVc2VyIHNlbGVjdGFibGUgcmVmcmVzaCBpbnRlcnZhbHMgKGRlZmF1bHQgaXMgb25jZSBwZXIgZGF5KVxuKiBWaWV3IGxvY2F0aW9uIG9uIEdvb2dsZSBNYXBzLCBCaW5nIE1hcHMsIEdub21lIE1hcHMsIE9wZW5TdHJlZXRNYXBzXG4qICBHZXJtYW4sIER1dGNoIGFuZCBDaGluZXNlIHRyYW5zbGF0aW9uc1xuXG5QbGVhc2UgcmVwb3J0IGFueSBidWdzIG9yIHN1Z2dlc3Rpb25zIHRvIGV4dGVuc2lvbiBHaXRIdWIgcGFnZSBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJHb29nbGVFYXJ0aFdhbGxwYXBlciIsCiAgIm5hbWUiOiAiR29vZ2xlIEVhcnRoIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nb29nbGVlYXJ0aHdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2VhcnRoLXZpZXctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiR29vZ2xlRWFydGhXYWxscGFwZXJAbmVmZm8uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "42": {"version": "15", "sha256": "0r68krvgjgkf8fdllb2k02zdg0xd6iidmn5nnz8w2hzx1jdvsmf9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXRzIHlvdXIgd2FsbHBhcGVyIHRvIGEgcmFuZG9tIHBob3RvIGZyb20gdGhlIGN1cmF0ZWQgR29vZ2xlIEVhcnRoIGNvbGxlY3Rpb24gKDI2MDQgcGhvdG9zKS5cblxuKkRpc2NsYWltZXIqOiB0aGlzIGV4dGVuc2lvbiBpcyB1bm9mZmljaWFsIGFuZCBub3QgYWZmaWxpYXRlZCB3aXRoIEdvb2dsZSBpbiBhbnkgd2F5LiBJbWFnZXMgYXJlIHByb3RlY3RlZCBieSBjb3B5cmlnaHQgYW5kIGFyZSBsaWNlbnNlZCBvbmx5IGZvciB1c2UgYXMgd2FsbHBhcGVycy5cblxuU2VlIGFsc28gbXkgb3RoZXIgZXh0ZW5zaW9uLCBCaW5nIFdhbGxwYXBlciBDaGFuZ2VyIChodHRwczovL2dpdGh1Yi5jb20vbmVmZm8vYmluZy13YWxscGFwZXItZ25vbWUtZXh0ZW5zaW9uKS5cblxuRmVhdHVyZXM6XG4qIEZldGNoZXMgYSByYW5kb20gR29vZ2xlIEVhcnRoIHdhbGxwYXBlciBhbmQgc2V0cyBhcyBib3RoIGxvY2sgc2NyZWVuIGFuZCBkZXNrdG9wIHdhbGxwYXBlclxuKiBVc2VyIHNlbGVjdGFibGUgcmVmcmVzaCBpbnRlcnZhbHMgKGRlZmF1bHQgaXMgb25jZSBwZXIgZGF5KVxuKiBWaWV3IGxvY2F0aW9uIG9uIEdvb2dsZSBNYXBzLCBCaW5nIE1hcHMsIEdub21lIE1hcHMsIE9wZW5TdHJlZXRNYXBzXG4qICBHZXJtYW4sIER1dGNoIGFuZCBDaGluZXNlIHRyYW5zbGF0aW9uc1xuXG5QbGVhc2UgcmVwb3J0IGFueSBidWdzIG9yIHN1Z2dlc3Rpb25zIHRvIGV4dGVuc2lvbiBHaXRIdWIgcGFnZSBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJHb29nbGVFYXJ0aFdhbGxwYXBlciIsCiAgIm5hbWUiOiAiR29vZ2xlIEVhcnRoIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nb29nbGVlYXJ0aHdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2VhcnRoLXZpZXctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiR29vZ2xlRWFydGhXYWxscGFwZXJAbmVmZm8uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}}} +, {"uuid": "GoogleEarthWallpaper@neffo.github.com", "name": "Google Earth Wallpaper", "pname": "google-earth-wallpaper", "description": "Sets your wallpaper to a random photo from the curated Google Earth collection (2604 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": "16", "sha256": "03lwcfi7k3wdqxw5dhi1m9zhlar1mfycp696p3y4gsbnkgfb8pvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHMgeW91ciB3YWxscGFwZXIgdG8gYSByYW5kb20gcGhvdG8gZnJvbSB0aGUgY3VyYXRlZCBHb29nbGUgRWFydGggY29sbGVjdGlvbiAoMjYwNCBwaG90b3MpLlxuXG4qRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggR29vZ2xlIGluIGFueSB3YXkuIEltYWdlcyBhcmUgcHJvdGVjdGVkIGJ5IGNvcHlyaWdodCBhbmQgYXJlIGxpY2Vuc2VkIG9ubHkgZm9yIHVzZSBhcyB3YWxscGFwZXJzLlxuXG5TZWUgYWxzbyBteSBvdGhlciBleHRlbnNpb24sIEJpbmcgV2FsbHBhcGVyIENoYW5nZXIgKGh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9iaW5nLXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24pLlxuXG5GZWF0dXJlczpcbiogRmV0Y2hlcyBhIHJhbmRvbSBHb29nbGUgRWFydGggd2FsbHBhcGVyIGFuZCBzZXRzIGFzIGJvdGggbG9jayBzY3JlZW4gYW5kIGRlc2t0b3Agd2FsbHBhcGVyXG4qIFVzZXIgc2VsZWN0YWJsZSByZWZyZXNoIGludGVydmFscyAoZGVmYXVsdCBpcyBvbmNlIHBlciBkYXkpXG4qIFZpZXcgbG9jYXRpb24gb24gR29vZ2xlIE1hcHMsIEJpbmcgTWFwcywgR25vbWUgTWFwcywgT3BlblN0cmVldE1hcHNcbiogIEdlcm1hbiwgRHV0Y2ggYW5kIENoaW5lc2UgdHJhbnNsYXRpb25zXG5cblBsZWFzZSByZXBvcnQgYW55IGJ1Z3Mgb3Igc3VnZ2VzdGlvbnMgdG8gZXh0ZW5zaW9uIEdpdEh1YiBwYWdlIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogIkdvb2dsZUVhcnRoV2FsbHBhcGVyIiwKICAibmFtZSI6ICJHb29nbGUgRWFydGggV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvb2dsZWVhcnRod2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2VhcnRoLXZpZXctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiR29vZ2xlRWFydGhXYWxscGFwZXJAbmVmZm8uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}, "40": {"version": "16", "sha256": "03lwcfi7k3wdqxw5dhi1m9zhlar1mfycp696p3y4gsbnkgfb8pvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHMgeW91ciB3YWxscGFwZXIgdG8gYSByYW5kb20gcGhvdG8gZnJvbSB0aGUgY3VyYXRlZCBHb29nbGUgRWFydGggY29sbGVjdGlvbiAoMjYwNCBwaG90b3MpLlxuXG4qRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggR29vZ2xlIGluIGFueSB3YXkuIEltYWdlcyBhcmUgcHJvdGVjdGVkIGJ5IGNvcHlyaWdodCBhbmQgYXJlIGxpY2Vuc2VkIG9ubHkgZm9yIHVzZSBhcyB3YWxscGFwZXJzLlxuXG5TZWUgYWxzbyBteSBvdGhlciBleHRlbnNpb24sIEJpbmcgV2FsbHBhcGVyIENoYW5nZXIgKGh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9iaW5nLXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24pLlxuXG5GZWF0dXJlczpcbiogRmV0Y2hlcyBhIHJhbmRvbSBHb29nbGUgRWFydGggd2FsbHBhcGVyIGFuZCBzZXRzIGFzIGJvdGggbG9jayBzY3JlZW4gYW5kIGRlc2t0b3Agd2FsbHBhcGVyXG4qIFVzZXIgc2VsZWN0YWJsZSByZWZyZXNoIGludGVydmFscyAoZGVmYXVsdCBpcyBvbmNlIHBlciBkYXkpXG4qIFZpZXcgbG9jYXRpb24gb24gR29vZ2xlIE1hcHMsIEJpbmcgTWFwcywgR25vbWUgTWFwcywgT3BlblN0cmVldE1hcHNcbiogIEdlcm1hbiwgRHV0Y2ggYW5kIENoaW5lc2UgdHJhbnNsYXRpb25zXG5cblBsZWFzZSByZXBvcnQgYW55IGJ1Z3Mgb3Igc3VnZ2VzdGlvbnMgdG8gZXh0ZW5zaW9uIEdpdEh1YiBwYWdlIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogIkdvb2dsZUVhcnRoV2FsbHBhcGVyIiwKICAibmFtZSI6ICJHb29nbGUgRWFydGggV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvb2dsZWVhcnRod2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2VhcnRoLXZpZXctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiR29vZ2xlRWFydGhXYWxscGFwZXJAbmVmZm8uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}, "41": {"version": "16", "sha256": "03lwcfi7k3wdqxw5dhi1m9zhlar1mfycp696p3y4gsbnkgfb8pvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHMgeW91ciB3YWxscGFwZXIgdG8gYSByYW5kb20gcGhvdG8gZnJvbSB0aGUgY3VyYXRlZCBHb29nbGUgRWFydGggY29sbGVjdGlvbiAoMjYwNCBwaG90b3MpLlxuXG4qRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggR29vZ2xlIGluIGFueSB3YXkuIEltYWdlcyBhcmUgcHJvdGVjdGVkIGJ5IGNvcHlyaWdodCBhbmQgYXJlIGxpY2Vuc2VkIG9ubHkgZm9yIHVzZSBhcyB3YWxscGFwZXJzLlxuXG5TZWUgYWxzbyBteSBvdGhlciBleHRlbnNpb24sIEJpbmcgV2FsbHBhcGVyIENoYW5nZXIgKGh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9iaW5nLXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24pLlxuXG5GZWF0dXJlczpcbiogRmV0Y2hlcyBhIHJhbmRvbSBHb29nbGUgRWFydGggd2FsbHBhcGVyIGFuZCBzZXRzIGFzIGJvdGggbG9jayBzY3JlZW4gYW5kIGRlc2t0b3Agd2FsbHBhcGVyXG4qIFVzZXIgc2VsZWN0YWJsZSByZWZyZXNoIGludGVydmFscyAoZGVmYXVsdCBpcyBvbmNlIHBlciBkYXkpXG4qIFZpZXcgbG9jYXRpb24gb24gR29vZ2xlIE1hcHMsIEJpbmcgTWFwcywgR25vbWUgTWFwcywgT3BlblN0cmVldE1hcHNcbiogIEdlcm1hbiwgRHV0Y2ggYW5kIENoaW5lc2UgdHJhbnNsYXRpb25zXG5cblBsZWFzZSByZXBvcnQgYW55IGJ1Z3Mgb3Igc3VnZ2VzdGlvbnMgdG8gZXh0ZW5zaW9uIEdpdEh1YiBwYWdlIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogIkdvb2dsZUVhcnRoV2FsbHBhcGVyIiwKICAibmFtZSI6ICJHb29nbGUgRWFydGggV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvb2dsZWVhcnRod2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2VhcnRoLXZpZXctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiR29vZ2xlRWFydGhXYWxscGFwZXJAbmVmZm8uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}, "42": {"version": "16", "sha256": "03lwcfi7k3wdqxw5dhi1m9zhlar1mfycp696p3y4gsbnkgfb8pvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHMgeW91ciB3YWxscGFwZXIgdG8gYSByYW5kb20gcGhvdG8gZnJvbSB0aGUgY3VyYXRlZCBHb29nbGUgRWFydGggY29sbGVjdGlvbiAoMjYwNCBwaG90b3MpLlxuXG4qRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggR29vZ2xlIGluIGFueSB3YXkuIEltYWdlcyBhcmUgcHJvdGVjdGVkIGJ5IGNvcHlyaWdodCBhbmQgYXJlIGxpY2Vuc2VkIG9ubHkgZm9yIHVzZSBhcyB3YWxscGFwZXJzLlxuXG5TZWUgYWxzbyBteSBvdGhlciBleHRlbnNpb24sIEJpbmcgV2FsbHBhcGVyIENoYW5nZXIgKGh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9iaW5nLXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24pLlxuXG5GZWF0dXJlczpcbiogRmV0Y2hlcyBhIHJhbmRvbSBHb29nbGUgRWFydGggd2FsbHBhcGVyIGFuZCBzZXRzIGFzIGJvdGggbG9jayBzY3JlZW4gYW5kIGRlc2t0b3Agd2FsbHBhcGVyXG4qIFVzZXIgc2VsZWN0YWJsZSByZWZyZXNoIGludGVydmFscyAoZGVmYXVsdCBpcyBvbmNlIHBlciBkYXkpXG4qIFZpZXcgbG9jYXRpb24gb24gR29vZ2xlIE1hcHMsIEJpbmcgTWFwcywgR25vbWUgTWFwcywgT3BlblN0cmVldE1hcHNcbiogIEdlcm1hbiwgRHV0Y2ggYW5kIENoaW5lc2UgdHJhbnNsYXRpb25zXG5cblBsZWFzZSByZXBvcnQgYW55IGJ1Z3Mgb3Igc3VnZ2VzdGlvbnMgdG8gZXh0ZW5zaW9uIEdpdEh1YiBwYWdlIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogIkdvb2dsZUVhcnRoV2FsbHBhcGVyIiwKICAibmFtZSI6ICJHb29nbGUgRWFydGggV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvb2dsZWVhcnRod2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2VhcnRoLXZpZXctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiR29vZ2xlRWFydGhXYWxscGFwZXJAbmVmZm8uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}, "43": {"version": "16", "sha256": "03lwcfi7k3wdqxw5dhi1m9zhlar1mfycp696p3y4gsbnkgfb8pvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHMgeW91ciB3YWxscGFwZXIgdG8gYSByYW5kb20gcGhvdG8gZnJvbSB0aGUgY3VyYXRlZCBHb29nbGUgRWFydGggY29sbGVjdGlvbiAoMjYwNCBwaG90b3MpLlxuXG4qRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggR29vZ2xlIGluIGFueSB3YXkuIEltYWdlcyBhcmUgcHJvdGVjdGVkIGJ5IGNvcHlyaWdodCBhbmQgYXJlIGxpY2Vuc2VkIG9ubHkgZm9yIHVzZSBhcyB3YWxscGFwZXJzLlxuXG5TZWUgYWxzbyBteSBvdGhlciBleHRlbnNpb24sIEJpbmcgV2FsbHBhcGVyIENoYW5nZXIgKGh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9iaW5nLXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24pLlxuXG5GZWF0dXJlczpcbiogRmV0Y2hlcyBhIHJhbmRvbSBHb29nbGUgRWFydGggd2FsbHBhcGVyIGFuZCBzZXRzIGFzIGJvdGggbG9jayBzY3JlZW4gYW5kIGRlc2t0b3Agd2FsbHBhcGVyXG4qIFVzZXIgc2VsZWN0YWJsZSByZWZyZXNoIGludGVydmFscyAoZGVmYXVsdCBpcyBvbmNlIHBlciBkYXkpXG4qIFZpZXcgbG9jYXRpb24gb24gR29vZ2xlIE1hcHMsIEJpbmcgTWFwcywgR25vbWUgTWFwcywgT3BlblN0cmVldE1hcHNcbiogIEdlcm1hbiwgRHV0Y2ggYW5kIENoaW5lc2UgdHJhbnNsYXRpb25zXG5cblBsZWFzZSByZXBvcnQgYW55IGJ1Z3Mgb3Igc3VnZ2VzdGlvbnMgdG8gZXh0ZW5zaW9uIEdpdEh1YiBwYWdlIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogIkdvb2dsZUVhcnRoV2FsbHBhcGVyIiwKICAibmFtZSI6ICJHb29nbGUgRWFydGggV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvb2dsZWVhcnRod2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2VhcnRoLXZpZXctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiR29vZ2xlRWFydGhXYWxscGFwZXJAbmVmZm8uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}}} , {"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, iOS, macOS and Windows.\n\nPlease report issues on Github!", "link": "https://extensions.gnome.org/extension/1319/gsconnect/", "shell_version_map": {"38": {"version": "51", "sha256": "1dzfslhpkl8i134xd9ygip6fj2vwwdd9kv2vwg2rgz1drch772fr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoLCBpT1MsIG1hY09TIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HU0Nvbm5lY3QvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWdzY29ubmVjdC93aWtpIiwKICAidXVpZCI6ICJnc2Nvbm5lY3RAYW5keWhvbG1lcy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNTEKfQ=="}, "40": {"version": "47", "sha256": "0b77cwbk3vclrifzrikmjlkjj207fgnxg6bdr842ny9a6j7fvcx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoLCBpT1MsIG1hY09TIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR1NDb25uZWN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nc2Nvbm5lY3Qvd2lraSIsCiAgInV1aWQiOiAiZ3Njb25uZWN0QGFuZHlob2xtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQ3Cn0="}, "41": {"version": "49", "sha256": "1jr9q34611sbikfk05mn9j1c90vsh7358s3p9v8p87kmy6wj3k76", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoLCBpT1MsIG1hY09TIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR1NDb25uZWN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nc2Nvbm5lY3Qvd2lraSIsCiAgInV1aWQiOiAiZ3Njb25uZWN0QGFuZHlob2xtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQ5Cn0="}, "42": {"version": "50", "sha256": "1rn5pf3s7b1iy8i63afa8a40590v6cn919rdn9shxcdxww97rj9n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoLCBpT1MsIG1hY09TIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR1NDb25uZWN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nc2Nvbm5lY3Qvd2lraSIsCiAgInV1aWQiOiAiZ3Njb25uZWN0QGFuZHlob2xtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUwCn0="}, "43": {"version": "54", "sha256": "1964vai2d5jn0s9aa0nckdsq17mgirl57jznp5glhp4gpq5y970j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoLCBpT1MsIG1hY09TIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR1NDb25uZWN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nc2Nvbm5lY3Qvd2lraSIsCiAgInV1aWQiOiAiZ3Njb25uZWN0QGFuZHlob2xtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDU0Cn0="}}} , {"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=="}, "40": {"version": "10", "sha256": "1x6ifcdmvfvp1y5xj2fmb50gw9m9jrhxrq9jpqjgx7y4mbp6xazb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIE5WSURJQSBHUFUgc3RhdHMgaW4gdGhlIHRvb2xiYXIuIFJlcXVpcmVzIG52aWRpYS1zZXR0aW5ncyBvciBudmlkaWEtc21pLiBJbmNsdWRlcyBCdW1ibGViZWUgc3VwcG9ydC4iLAogICJuYW1lIjogIk5WSURJQSBHUFUgU3RhdHMgVG9vbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5udmlkaWF1dGlsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXRoYW53aGFycmlzL2dub21lLW52aWRpYS1leHRlbnNpb24iLAogICJ1dWlkIjogIm52aWRpYXV0aWxAZXRoYW53aGFycmlzIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "1x6ifcdmvfvp1y5xj2fmb50gw9m9jrhxrq9jpqjgx7y4mbp6xazb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIE5WSURJQSBHUFUgc3RhdHMgaW4gdGhlIHRvb2xiYXIuIFJlcXVpcmVzIG52aWRpYS1zZXR0aW5ncyBvciBudmlkaWEtc21pLiBJbmNsdWRlcyBCdW1ibGViZWUgc3VwcG9ydC4iLAogICJuYW1lIjogIk5WSURJQSBHUFUgU3RhdHMgVG9vbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5udmlkaWF1dGlsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXRoYW53aGFycmlzL2dub21lLW52aWRpYS1leHRlbnNpb24iLAogICJ1dWlkIjogIm52aWRpYXV0aWxAZXRoYW53aGFycmlzIiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "1x6ifcdmvfvp1y5xj2fmb50gw9m9jrhxrq9jpqjgx7y4mbp6xazb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIE5WSURJQSBHUFUgc3RhdHMgaW4gdGhlIHRvb2xiYXIuIFJlcXVpcmVzIG52aWRpYS1zZXR0aW5ncyBvciBudmlkaWEtc21pLiBJbmNsdWRlcyBCdW1ibGViZWUgc3VwcG9ydC4iLAogICJuYW1lIjogIk5WSURJQSBHUFUgU3RhdHMgVG9vbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5udmlkaWF1dGlsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXRoYW53aGFycmlzL2dub21lLW52aWRpYS1leHRlbnNpb24iLAogICJ1dWlkIjogIm52aWRpYXV0aWxAZXRoYW53aGFycmlzIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"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": "14", "sha256": "0lgfv3sba1hhn7s45yjc2snljjc2njysnjjjmra765jhb4z1gbyr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcC1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyBhcHBsaWNhdGlvbnMgYnkgY3VycmVudCB3b3Jrc3BhY2UgZmlyc3QuIEl0IHNlcGFyYXRlcyBhcHBzIGludG8gMiBzZXBhcmF0ZSBpY29ucyBpZiB0aGUgYXBwIGFsc28gaGFzIHdpbmRvd3Mgb24gb3RoZXIgd29ya3NwYWNlcy5cblxuTk9URTogVGhlIEFwcCBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIGFwcGxpY2F0aW9ucyIsCiAgIm5hbWUiOiAiQXBwLVN3aXRjaGVyIEN1cnJlbnQgV29ya3NwYWNlIEZpcnN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFwcC1zd2l0Y2hlcl9jdXJyZW50X3dvcmtzcGFjZV9maXJzdEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxNAp9"}, "40": {"version": "14", "sha256": "0lgfv3sba1hhn7s45yjc2snljjc2njysnjjjmra765jhb4z1gbyr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcC1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyBhcHBsaWNhdGlvbnMgYnkgY3VycmVudCB3b3Jrc3BhY2UgZmlyc3QuIEl0IHNlcGFyYXRlcyBhcHBzIGludG8gMiBzZXBhcmF0ZSBpY29ucyBpZiB0aGUgYXBwIGFsc28gaGFzIHdpbmRvd3Mgb24gb3RoZXIgd29ya3NwYWNlcy5cblxuTk9URTogVGhlIEFwcCBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIGFwcGxpY2F0aW9ucyIsCiAgIm5hbWUiOiAiQXBwLVN3aXRjaGVyIEN1cnJlbnQgV29ya3NwYWNlIEZpcnN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFwcC1zd2l0Y2hlcl9jdXJyZW50X3dvcmtzcGFjZV9maXJzdEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxNAp9"}, "41": {"version": "14", "sha256": "0lgfv3sba1hhn7s45yjc2snljjc2njysnjjjmra765jhb4z1gbyr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcC1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyBhcHBsaWNhdGlvbnMgYnkgY3VycmVudCB3b3Jrc3BhY2UgZmlyc3QuIEl0IHNlcGFyYXRlcyBhcHBzIGludG8gMiBzZXBhcmF0ZSBpY29ucyBpZiB0aGUgYXBwIGFsc28gaGFzIHdpbmRvd3Mgb24gb3RoZXIgd29ya3NwYWNlcy5cblxuTk9URTogVGhlIEFwcCBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIGFwcGxpY2F0aW9ucyIsCiAgIm5hbWUiOiAiQXBwLVN3aXRjaGVyIEN1cnJlbnQgV29ya3NwYWNlIEZpcnN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFwcC1zd2l0Y2hlcl9jdXJyZW50X3dvcmtzcGFjZV9maXJzdEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxNAp9"}, "42": {"version": "14", "sha256": "0lgfv3sba1hhn7s45yjc2snljjc2njysnjjjmra765jhb4z1gbyr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcC1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyBhcHBsaWNhdGlvbnMgYnkgY3VycmVudCB3b3Jrc3BhY2UgZmlyc3QuIEl0IHNlcGFyYXRlcyBhcHBzIGludG8gMiBzZXBhcmF0ZSBpY29ucyBpZiB0aGUgYXBwIGFsc28gaGFzIHdpbmRvd3Mgb24gb3RoZXIgd29ya3NwYWNlcy5cblxuTk9URTogVGhlIEFwcCBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIGFwcGxpY2F0aW9ucyIsCiAgIm5hbWUiOiAiQXBwLVN3aXRjaGVyIEN1cnJlbnQgV29ya3NwYWNlIEZpcnN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFwcC1zd2l0Y2hlcl9jdXJyZW50X3dvcmtzcGFjZV9maXJzdEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxNAp9"}}} -, {"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": "16", "sha256": "12d9gsf4i88cgs9hjz4w6ghh4s10a0c4cpblanazlbiydfn6cbd1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdy1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyB3aW5kb3dzIGJ5IGN1cnJlbnQgd29ya3NwYWNlIGZpcnN0LiBUaGUgb3RoZXIgd2luZG93cyBhcmUgYWRkZWQgYWNjb3JkaW5nIHRvIHRoZWlyIHdvcmtzcGFjZS5cblxuTk9URTogVGhlIFdpbmRvdyBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIHdpbmRvd3MiLAogICJuYW1lIjogIldpbmRvdy1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aW5kb3ctc3dpdGNoZXJfY3VycmVudF93b3Jrc3BhY2VfZmlyc3RAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "40": {"version": "16", "sha256": "12d9gsf4i88cgs9hjz4w6ghh4s10a0c4cpblanazlbiydfn6cbd1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdy1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyB3aW5kb3dzIGJ5IGN1cnJlbnQgd29ya3NwYWNlIGZpcnN0LiBUaGUgb3RoZXIgd2luZG93cyBhcmUgYWRkZWQgYWNjb3JkaW5nIHRvIHRoZWlyIHdvcmtzcGFjZS5cblxuTk9URTogVGhlIFdpbmRvdyBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIHdpbmRvd3MiLAogICJuYW1lIjogIldpbmRvdy1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aW5kb3ctc3dpdGNoZXJfY3VycmVudF93b3Jrc3BhY2VfZmlyc3RAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "16", "sha256": "12d9gsf4i88cgs9hjz4w6ghh4s10a0c4cpblanazlbiydfn6cbd1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdy1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyB3aW5kb3dzIGJ5IGN1cnJlbnQgd29ya3NwYWNlIGZpcnN0LiBUaGUgb3RoZXIgd2luZG93cyBhcmUgYWRkZWQgYWNjb3JkaW5nIHRvIHRoZWlyIHdvcmtzcGFjZS5cblxuTk9URTogVGhlIFdpbmRvdyBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIHdpbmRvd3MiLAogICJuYW1lIjogIldpbmRvdy1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aW5kb3ctc3dpdGNoZXJfY3VycmVudF93b3Jrc3BhY2VfZmlyc3RAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "42": {"version": "16", "sha256": "12d9gsf4i88cgs9hjz4w6ghh4s10a0c4cpblanazlbiydfn6cbd1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdy1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyB3aW5kb3dzIGJ5IGN1cnJlbnQgd29ya3NwYWNlIGZpcnN0LiBUaGUgb3RoZXIgd2luZG93cyBhcmUgYWRkZWQgYWNjb3JkaW5nIHRvIHRoZWlyIHdvcmtzcGFjZS5cblxuTk9URTogVGhlIFdpbmRvdyBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIHdpbmRvd3MiLAogICJuYW1lIjogIldpbmRvdy1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aW5kb3ctc3dpdGNoZXJfY3VycmVudF93b3Jrc3BhY2VfZmlyc3RAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} +, {"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": "17", "sha256": "1rgy8595hd9xclgkrc2l33yvidypycw67shg881qanf3rs4l2zgr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdy1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyB3aW5kb3dzIGJ5IGN1cnJlbnQgd29ya3NwYWNlIGZpcnN0LiBUaGUgb3RoZXIgd2luZG93cyBhcmUgYWRkZWQgYWNjb3JkaW5nIHRvIHRoZWlyIHdvcmtzcGFjZS5cblxuTk9URTogVGhlIFdpbmRvdyBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIHdpbmRvd3MiLAogICJuYW1lIjogIldpbmRvdy1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAid2luZG93LXN3aXRjaGVyX2N1cnJlbnRfd29ya3NwYWNlX2ZpcnN0QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "40": {"version": "17", "sha256": "1rgy8595hd9xclgkrc2l33yvidypycw67shg881qanf3rs4l2zgr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdy1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyB3aW5kb3dzIGJ5IGN1cnJlbnQgd29ya3NwYWNlIGZpcnN0LiBUaGUgb3RoZXIgd2luZG93cyBhcmUgYWRkZWQgYWNjb3JkaW5nIHRvIHRoZWlyIHdvcmtzcGFjZS5cblxuTk9URTogVGhlIFdpbmRvdyBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIHdpbmRvd3MiLAogICJuYW1lIjogIldpbmRvdy1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAid2luZG93LXN3aXRjaGVyX2N1cnJlbnRfd29ya3NwYWNlX2ZpcnN0QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "41": {"version": "17", "sha256": "1rgy8595hd9xclgkrc2l33yvidypycw67shg881qanf3rs4l2zgr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdy1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyB3aW5kb3dzIGJ5IGN1cnJlbnQgd29ya3NwYWNlIGZpcnN0LiBUaGUgb3RoZXIgd2luZG93cyBhcmUgYWRkZWQgYWNjb3JkaW5nIHRvIHRoZWlyIHdvcmtzcGFjZS5cblxuTk9URTogVGhlIFdpbmRvdyBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIHdpbmRvd3MiLAogICJuYW1lIjogIldpbmRvdy1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAid2luZG93LXN3aXRjaGVyX2N1cnJlbnRfd29ya3NwYWNlX2ZpcnN0QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "42": {"version": "17", "sha256": "1rgy8595hd9xclgkrc2l33yvidypycw67shg881qanf3rs4l2zgr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdy1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyB3aW5kb3dzIGJ5IGN1cnJlbnQgd29ya3NwYWNlIGZpcnN0LiBUaGUgb3RoZXIgd2luZG93cyBhcmUgYWRkZWQgYWNjb3JkaW5nIHRvIHRoZWlyIHdvcmtzcGFjZS5cblxuTk9URTogVGhlIFdpbmRvdyBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIHdpbmRvd3MiLAogICJuYW1lIjogIldpbmRvdy1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAid2luZG93LXN3aXRjaGVyX2N1cnJlbnRfd29ya3NwYWNlX2ZpcnN0QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "43": {"version": "17", "sha256": "1rgy8595hd9xclgkrc2l33yvidypycw67shg881qanf3rs4l2zgr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdy1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyB3aW5kb3dzIGJ5IGN1cnJlbnQgd29ya3NwYWNlIGZpcnN0LiBUaGUgb3RoZXIgd2luZG93cyBhcmUgYWRkZWQgYWNjb3JkaW5nIHRvIHRoZWlyIHdvcmtzcGFjZS5cblxuTk9URTogVGhlIFdpbmRvdyBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIHdpbmRvd3MiLAogICJuYW1lIjogIldpbmRvdy1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAid2luZG93LXN3aXRjaGVyX2N1cnJlbnRfd29ya3NwYWNlX2ZpcnN0QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDE3Cn0="}}} , {"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": "17", "sha256": "0gy12njkdz697zc8mnwj453r6806rq11c300wv47xxaqd5mhiz9j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICIzLjMyLjEiLAogICAgIjMuMzYiLAogICAgIjMuMzguMSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "40": {"version": "27", "sha256": "1v8ij7y3z3j22x6g6p3py0bx1z89k6hlzbchrgvrknpxh4r9fbz4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "41": {"version": "27", "sha256": "1v8ij7y3z3j22x6g6p3py0bx1z89k6hlzbchrgvrknpxh4r9fbz4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "42": {"version": "27", "sha256": "1v8ij7y3z3j22x6g6p3py0bx1z89k6hlzbchrgvrknpxh4r9fbz4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "43": {"version": "27", "sha256": "1v8ij7y3z3j22x6g6p3py0bx1z89k6hlzbchrgvrknpxh4r9fbz4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}}} , {"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": "8", "sha256": "0dj704fq6g8jfl13gkfljyq360s6in77vd61w8ds8azysarmaww3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBPdmVydmlldyB3aWxsIHNob3cgQXBwbGljYXRpb25zIGluc3RlYWQgb2YgV29ya3NwYWNlcyB3aGVuIGludm9rZWQuIiwKICAibmFtZSI6ICJTaG93IEFwcGxpY2F0aW9ucyBJbnN0ZWFkIE9mIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic2hvd19hcHBsaWNhdGlvbnNfaW5zdGVhZF9vZl9vdmVydmlld0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "0dj704fq6g8jfl13gkfljyq360s6in77vd61w8ds8azysarmaww3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBPdmVydmlldyB3aWxsIHNob3cgQXBwbGljYXRpb25zIGluc3RlYWQgb2YgV29ya3NwYWNlcyB3aGVuIGludm9rZWQuIiwKICAibmFtZSI6ICJTaG93IEFwcGxpY2F0aW9ucyBJbnN0ZWFkIE9mIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic2hvd19hcHBsaWNhdGlvbnNfaW5zdGVhZF9vZl9vdmVydmlld0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0dj704fq6g8jfl13gkfljyq360s6in77vd61w8ds8azysarmaww3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBPdmVydmlldyB3aWxsIHNob3cgQXBwbGljYXRpb25zIGluc3RlYWQgb2YgV29ya3NwYWNlcyB3aGVuIGludm9rZWQuIiwKICAibmFtZSI6ICJTaG93IEFwcGxpY2F0aW9ucyBJbnN0ZWFkIE9mIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic2hvd19hcHBsaWNhdGlvbnNfaW5zdGVhZF9vZl9vdmVydmlld0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "0dj704fq6g8jfl13gkfljyq360s6in77vd61w8ds8azysarmaww3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBPdmVydmlldyB3aWxsIHNob3cgQXBwbGljYXRpb25zIGluc3RlYWQgb2YgV29ya3NwYWNlcyB3aGVuIGludm9rZWQuIiwKICAibmFtZSI6ICJTaG93IEFwcGxpY2F0aW9ucyBJbnN0ZWFkIE9mIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic2hvd19hcHBsaWNhdGlvbnNfaW5zdGVhZF9vZl9vdmVydmlld0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"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"}}} @@ -180,7 +180,7 @@ , {"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": "5", "sha256": "0x4xx9msy6zhix2vmm09wf55mfnh0v8zzm7kk9gl52ayclf4221b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG51bWJlciBvZiBub3RpZmljYXRpb25zIGluIHF1ZXVlLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIENvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Zrcml6YW4vTm90aWZpY2F0aW9uQ291bnRlciIsCiAgInV1aWQiOiAiTm90aWZpY2F0aW9uQ291bnRlckBjb29sbGxzayIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "0x4xx9msy6zhix2vmm09wf55mfnh0v8zzm7kk9gl52ayclf4221b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG51bWJlciBvZiBub3RpZmljYXRpb25zIGluIHF1ZXVlLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIENvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Zrcml6YW4vTm90aWZpY2F0aW9uQ291bnRlciIsCiAgInV1aWQiOiAiTm90aWZpY2F0aW9uQ291bnRlckBjb29sbGxzayIsCiAgInZlcnNpb24iOiA1Cn0="}}} +, {"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": "6", "sha256": "04bh9yawzznin0rmy1zr3xgr38b5c080a1xcqlcx8ldzifgpsd39", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG51bWJlciBvZiBub3RpZmljYXRpb25zIGluIHF1ZXVlLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIENvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92a3JpemFuL05vdGlmaWNhdGlvbkNvdW50ZXIiLAogICJ1dWlkIjogIk5vdGlmaWNhdGlvbkNvdW50ZXJAY29vbGxsc2siLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "04bh9yawzznin0rmy1zr3xgr38b5c080a1xcqlcx8ldzifgpsd39", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG51bWJlciBvZiBub3RpZmljYXRpb25zIGluIHF1ZXVlLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIENvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92a3JpemFuL05vdGlmaWNhdGlvbkNvdW50ZXIiLAogICJ1dWlkIjogIk5vdGlmaWNhdGlvbkNvdW50ZXJAY29vbGxsc2siLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "04bh9yawzznin0rmy1zr3xgr38b5c080a1xcqlcx8ldzifgpsd39", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG51bWJlciBvZiBub3RpZmljYXRpb25zIGluIHF1ZXVlLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIENvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92a3JpemFuL05vdGlmaWNhdGlvbkNvdW50ZXIiLAogICJ1dWlkIjogIk5vdGlmaWNhdGlvbkNvdW50ZXJAY29vbGxsc2siLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"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": "30", "sha256": "1sirfmi5dny4lcim6psib5ik5ynvhmms1r7rd5lndx8spv3wgh3i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "41": {"version": "30", "sha256": "1sirfmi5dny4lcim6psib5ik5ynvhmms1r7rd5lndx8spv3wgh3i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "42": {"version": "30", "sha256": "1sirfmi5dny4lcim6psib5ik5ynvhmms1r7rd5lndx8spv3wgh3i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "43": {"version": "30", "sha256": "1sirfmi5dny4lcim6psib5ik5ynvhmms1r7rd5lndx8spv3wgh3i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}}} @@ -192,12 +192,12 @@ , {"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=="}, "42": {"version": "24", "sha256": "18d34l47mf4v04kd0vx8ljyfwlrr9jjygi5hl526v1bddyz8xy5r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0b2NrcyBFeHRlbnNpb24gYnJpbmdzIHN0b2NrIHF1b3RlcyB0byB5b3VyIEdOT01FIFNoZWxsIFBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic3RvY2tzQGluZmluaWNvZGUuZGUiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlN0b2NrcyBFeHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RvY2tzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NpbmF0aWMvc3RvY2tzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RvY2tzQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogMjQKfQ=="}, "43": {"version": "25", "sha256": "1ajbpy7691fg2sd8y3nhvx1kmh6h5qkdav6kq9qx8bsp2yq27s2n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0b2NrcyBFeHRlbnNpb24gYnJpbmdzIHN0b2NrIHF1b3RlcyB0byB5b3VyIEdOT01FIFNoZWxsIFBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic3RvY2tzQGluZmluaWNvZGUuZGUiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlN0b2NrcyBFeHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RvY2tzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NpbmF0aWMvc3RvY2tzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RvY2tzQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogMjUKfQ=="}}} , {"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": "10", "sha256": "1c9ymmdq9krs52f22fr9ahsrf56wi8f28qncawg2s0iwwh1b71ri", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpbWl0cyB0aGUgd2luZG93cyBzaG93biBvbiB0aGUgc3dpdGNoZXIgdG8gdGhvc2Ugb2YgdGhlIGN1cnJlbnQgbW9uaXRvciIsCiAgIm5hbWUiOiAiQ3VycmVudCBzY3JlZW4gb25seSBvbiB3aW5kb3cgc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbW1haS9DdXJyZW50X3NjcmVlbl9vbmx5X29uX3dpbmRvd19zd2l0Y2hlciIsCiAgInV1aWQiOiAiQ3VycmVudF9zY3JlZW5fb25seV9mb3JfQWx0ZXJuYXRlX1RhYkBib3VyY2VyZWF1LmZyIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "1c9ymmdq9krs52f22fr9ahsrf56wi8f28qncawg2s0iwwh1b71ri", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpbWl0cyB0aGUgd2luZG93cyBzaG93biBvbiB0aGUgc3dpdGNoZXIgdG8gdGhvc2Ugb2YgdGhlIGN1cnJlbnQgbW9uaXRvciIsCiAgIm5hbWUiOiAiQ3VycmVudCBzY3JlZW4gb25seSBvbiB3aW5kb3cgc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbW1haS9DdXJyZW50X3NjcmVlbl9vbmx5X29uX3dpbmRvd19zd2l0Y2hlciIsCiAgInV1aWQiOiAiQ3VycmVudF9zY3JlZW5fb25seV9mb3JfQWx0ZXJuYXRlX1RhYkBib3VyY2VyZWF1LmZyIiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "1c9ymmdq9krs52f22fr9ahsrf56wi8f28qncawg2s0iwwh1b71ri", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpbWl0cyB0aGUgd2luZG93cyBzaG93biBvbiB0aGUgc3dpdGNoZXIgdG8gdGhvc2Ugb2YgdGhlIGN1cnJlbnQgbW9uaXRvciIsCiAgIm5hbWUiOiAiQ3VycmVudCBzY3JlZW4gb25seSBvbiB3aW5kb3cgc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbW1haS9DdXJyZW50X3NjcmVlbl9vbmx5X29uX3dpbmRvd19zd2l0Y2hlciIsCiAgInV1aWQiOiAiQ3VycmVudF9zY3JlZW5fb25seV9mb3JfQWx0ZXJuYXRlX1RhYkBib3VyY2VyZWF1LmZyIiwKICAidmVyc2lvbiI6IDEwCn0="}, "43": {"version": "10", "sha256": "1c9ymmdq9krs52f22fr9ahsrf56wi8f28qncawg2s0iwwh1b71ri", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpbWl0cyB0aGUgd2luZG93cyBzaG93biBvbiB0aGUgc3dpdGNoZXIgdG8gdGhvc2Ugb2YgdGhlIGN1cnJlbnQgbW9uaXRvciIsCiAgIm5hbWUiOiAiQ3VycmVudCBzY3JlZW4gb25seSBvbiB3aW5kb3cgc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbW1haS9DdXJyZW50X3NjcmVlbl9vbmx5X29uX3dpbmRvd19zd2l0Y2hlciIsCiAgInV1aWQiOiAiQ3VycmVudF9zY3JlZW5fb25seV9mb3JfQWx0ZXJuYXRlX1RhYkBib3VyY2VyZWF1LmZyIiwKICAidmVyc2lvbiI6IDEwCn0="}}} -, {"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": "20", "sha256": "13my8cb8jzmlbb6ny0sk51ckbsdxrggqkvsql3dyzndya3d8bnr2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGt1YmUgY29uZmlnIGNvbnRleHQiLAogICJuYW1lIjogIkt1YmUgQ29uZmlnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmt1YmUtY29uZmlnIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdnZib2dkYW5vdjg3L2dub21lLXNoZWxsLWV4dGVuc2lvbi1rdWJlY29uZmlnIiwKICAidXVpZCI6ICJrdWJlX2NvbmZpZ0B2dmJvZ2Rhbm92ODcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, "41": {"version": "20", "sha256": "13my8cb8jzmlbb6ny0sk51ckbsdxrggqkvsql3dyzndya3d8bnr2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGt1YmUgY29uZmlnIGNvbnRleHQiLAogICJuYW1lIjogIkt1YmUgQ29uZmlnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmt1YmUtY29uZmlnIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdnZib2dkYW5vdjg3L2dub21lLXNoZWxsLWV4dGVuc2lvbi1rdWJlY29uZmlnIiwKICAidXVpZCI6ICJrdWJlX2NvbmZpZ0B2dmJvZ2Rhbm92ODcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, "42": {"version": "20", "sha256": "13my8cb8jzmlbb6ny0sk51ckbsdxrggqkvsql3dyzndya3d8bnr2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGt1YmUgY29uZmlnIGNvbnRleHQiLAogICJuYW1lIjogIkt1YmUgQ29uZmlnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmt1YmUtY29uZmlnIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdnZib2dkYW5vdjg3L2dub21lLXNoZWxsLWV4dGVuc2lvbi1rdWJlY29uZmlnIiwKICAidXVpZCI6ICJrdWJlX2NvbmZpZ0B2dmJvZ2Rhbm92ODcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}}} +, {"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": "21", "sha256": "1jvx4nphdpjgvg0ghjspgq0y8pligmbwgnbkqb983df2l4jqcqsq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGt1YmUgY29uZmlnIGNvbnRleHQiLAogICJuYW1lIjogIkt1YmUgQ29uZmlnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmt1YmUtY29uZmlnIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Z2Ym9nZGFub3Y4Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24ta3ViZWNvbmZpZyIsCiAgInV1aWQiOiAia3ViZV9jb25maWdAdnZib2dkYW5vdjg3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"}, "41": {"version": "21", "sha256": "1jvx4nphdpjgvg0ghjspgq0y8pligmbwgnbkqb983df2l4jqcqsq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGt1YmUgY29uZmlnIGNvbnRleHQiLAogICJuYW1lIjogIkt1YmUgQ29uZmlnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmt1YmUtY29uZmlnIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Z2Ym9nZGFub3Y4Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24ta3ViZWNvbmZpZyIsCiAgInV1aWQiOiAia3ViZV9jb25maWdAdnZib2dkYW5vdjg3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"}, "42": {"version": "21", "sha256": "1jvx4nphdpjgvg0ghjspgq0y8pligmbwgnbkqb983df2l4jqcqsq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGt1YmUgY29uZmlnIGNvbnRleHQiLAogICJuYW1lIjogIkt1YmUgQ29uZmlnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmt1YmUtY29uZmlnIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Z2Ym9nZGFub3Y4Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24ta3ViZWNvbmZpZyIsCiAgInV1aWQiOiAia3ViZV9jb25maWdAdnZib2dkYW5vdjg3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"}, "43": {"version": "21", "sha256": "1jvx4nphdpjgvg0ghjspgq0y8pligmbwgnbkqb983df2l4jqcqsq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGt1YmUgY29uZmlnIGNvbnRleHQiLAogICJuYW1lIjogIkt1YmUgQ29uZmlnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmt1YmUtY29uZmlnIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Z2Ym9nZGFub3Y4Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24ta3ViZWNvbmZpZyIsCiAgInV1aWQiOiAia3ViZV9jb25maWdAdnZib2dkYW5vdjg3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"}}} , {"uuid": "microphone-loopback@atareao.es", "name": "Microphone Loopback", "pname": "microphone-loopback", "description": "This extension enables hear microphone on headphones or speakers", "link": "https://extensions.gnome.org/extension/1443/microphone-loopback/", "shell_version_map": {"40": {"version": "5", "sha256": "1s9sh3afa3d7vbjlna6c7yls7kglwrxy6j5hns1ql4nprkdx8nb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGVuYWJsZXMgaGVhciBtaWNyb3Bob25lIG9uIGhlYWRwaG9uZXMgb3Igc3BlYWtlcnMiLAogICJleHRlbnNpb24taWQiOiAibWljcm9waG9uZS1sb29wYmFja0BhdGFyZWFvLmVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWljcm9waG9uZS1sb29wYmFja0BhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJtaWNyb3Bob25lLWxvb3BiYWNrIiwKICAibmFtZSI6ICJNaWNyb3Bob25lIExvb3BiYWNrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pY3JvcGhvbmUtbG9vcGJhY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdGFyZWFvL21pY3JvcGhvbmUtbG9vcGJhY2siLAogICJ1dWlkIjogIm1pY3JvcGhvbmUtbG9vcGJhY2tAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1s9sh3afa3d7vbjlna6c7yls7kglwrxy6j5hns1ql4nprkdx8nb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGVuYWJsZXMgaGVhciBtaWNyb3Bob25lIG9uIGhlYWRwaG9uZXMgb3Igc3BlYWtlcnMiLAogICJleHRlbnNpb24taWQiOiAibWljcm9waG9uZS1sb29wYmFja0BhdGFyZWFvLmVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWljcm9waG9uZS1sb29wYmFja0BhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJtaWNyb3Bob25lLWxvb3BiYWNrIiwKICAibmFtZSI6ICJNaWNyb3Bob25lIExvb3BiYWNrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pY3JvcGhvbmUtbG9vcGJhY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdGFyZWFvL21pY3JvcGhvbmUtbG9vcGJhY2siLAogICJ1dWlkIjogIm1pY3JvcGhvbmUtbG9vcGJhY2tAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "1s9sh3afa3d7vbjlna6c7yls7kglwrxy6j5hns1ql4nprkdx8nb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGVuYWJsZXMgaGVhciBtaWNyb3Bob25lIG9uIGhlYWRwaG9uZXMgb3Igc3BlYWtlcnMiLAogICJleHRlbnNpb24taWQiOiAibWljcm9waG9uZS1sb29wYmFja0BhdGFyZWFvLmVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWljcm9waG9uZS1sb29wYmFja0BhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJtaWNyb3Bob25lLWxvb3BiYWNrIiwKICAibmFtZSI6ICJNaWNyb3Bob25lIExvb3BiYWNrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pY3JvcGhvbmUtbG9vcGJhY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdGFyZWFvL21pY3JvcGhvbmUtbG9vcGJhY2siLAogICJ1dWlkIjogIm1pY3JvcGhvbmUtbG9vcGJhY2tAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA1Cn0="}}} -, {"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": "11", "sha256": "1dak0ckabddfq8hfl3ppdwbfxnkjhk90jwaqm875avn72zwvlsvi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvdHJhbnNwYXJlbnQtd2luZG93LW1vdmluZyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93LW1vdmluZ0Bub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "1dak0ckabddfq8hfl3ppdwbfxnkjhk90jwaqm875avn72zwvlsvi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvdHJhbnNwYXJlbnQtd2luZG93LW1vdmluZyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93LW1vdmluZ0Bub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "1dak0ckabddfq8hfl3ppdwbfxnkjhk90jwaqm875avn72zwvlsvi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvdHJhbnNwYXJlbnQtd2luZG93LW1vdmluZyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93LW1vdmluZ0Bub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "43": {"version": "11", "sha256": "1dak0ckabddfq8hfl3ppdwbfxnkjhk90jwaqm875avn72zwvlsvi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvdHJhbnNwYXJlbnQtd2luZG93LW1vdmluZyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93LW1vdmluZ0Bub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} -, {"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": "11", "sha256": "07qn7hwpv8pzwbgw60mr87ww10mwcz8x8w3d4gq4zszgynw63nbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "07qn7hwpv8pzwbgw60mr87ww10mwcz8x8w3d4gq4zszgynw63nbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "07qn7hwpv8pzwbgw60mr87ww10mwcz8x8w3d4gq4zszgynw63nbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "07qn7hwpv8pzwbgw60mr87ww10mwcz8x8w3d4gq4zszgynw63nbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} +, {"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": "12", "sha256": "0h4f4abl3x1qrvwi6s12kclvg2sv1c697ayk2ps8yy2pq6ri62mf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvdHJhbnNwYXJlbnQtd2luZG93LW1vdmluZyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93LW1vdmluZ0Bub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "41": {"version": "12", "sha256": "0h4f4abl3x1qrvwi6s12kclvg2sv1c697ayk2ps8yy2pq6ri62mf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvdHJhbnNwYXJlbnQtd2luZG93LW1vdmluZyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93LW1vdmluZ0Bub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "42": {"version": "12", "sha256": "0h4f4abl3x1qrvwi6s12kclvg2sv1c697ayk2ps8yy2pq6ri62mf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvdHJhbnNwYXJlbnQtd2luZG93LW1vdmluZyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93LW1vdmluZ0Bub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "43": {"version": "12", "sha256": "0h4f4abl3x1qrvwi6s12kclvg2sv1c697ayk2ps8yy2pq6ri62mf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvdHJhbnNwYXJlbnQtd2luZG93LW1vdmluZyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93LW1vdmluZ0Bub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}}} +, {"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.\n\nUse following modifer key code list to calculate hotkey code(E.g. Ctrl+Alt is 4 + 8 = 12):\nShift 1\n AltGr 2\n Control 4\n Alt 8\n ShiftL 16\n ShiftR 32\n CtrlL 64\n CtrlR 128\n CapsShift 256\nhttps://man7.org/linux/man-pages/man5/keymaps.5.html", "link": "https://extensions.gnome.org/extension/1454/transparent-window/", "shell_version_map": {"38": {"version": "12", "sha256": "0padnsq8if6kzws2sqi3yza2401pdxpzpsnrpydscrfl7xb91r5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay5cblxuVXNlIGZvbGxvd2luZyBtb2RpZmVyIGtleSBjb2RlIGxpc3QgdG8gY2FsY3VsYXRlIGhvdGtleSBjb2RlKEUuZy4gQ3RybCtBbHQgaXMgNCArIDggPSAxMik6XG5TaGlmdCAgICAgICAgICAgICAgICAgIDFcbiAgICAgICAgICAgICAgQWx0R3IgICAgICAgICAgICAgICAgICAyXG4gICAgICAgICAgICAgIENvbnRyb2wgICAgICAgICAgICAgICAgNFxuICAgICAgICAgICAgICBBbHQgICAgICAgICAgICAgICAgICAgIDhcbiAgICAgICAgICAgICAgU2hpZnRMICAgICAgICAgICAgICAgIDE2XG4gICAgICAgICAgICAgIFNoaWZ0UiAgICAgICAgICAgICAgICAzMlxuICAgICAgICAgICAgICBDdHJsTCAgICAgICAgICAgICAgICAgNjRcbiAgICAgICAgICAgICAgQ3RybFIgICAgICAgICAgICAgICAgMTI4XG4gICAgICAgICAgICAgIENhcHNTaGlmdCAgICAgICAgICAgIDI1NlxuaHR0cHM6Ly9tYW43Lm9yZy9saW51eC9tYW4tcGFnZXMvbWFuNS9rZXltYXBzLjUuaHRtbCIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlRyYW5zcGFyZW50V2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4LjEiLAogICAgIjMuMzYuMSIsCiAgICAiMy4zOC4xIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "40": {"version": "12", "sha256": "0padnsq8if6kzws2sqi3yza2401pdxpzpsnrpydscrfl7xb91r5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay5cblxuVXNlIGZvbGxvd2luZyBtb2RpZmVyIGtleSBjb2RlIGxpc3QgdG8gY2FsY3VsYXRlIGhvdGtleSBjb2RlKEUuZy4gQ3RybCtBbHQgaXMgNCArIDggPSAxMik6XG5TaGlmdCAgICAgICAgICAgICAgICAgIDFcbiAgICAgICAgICAgICAgQWx0R3IgICAgICAgICAgICAgICAgICAyXG4gICAgICAgICAgICAgIENvbnRyb2wgICAgICAgICAgICAgICAgNFxuICAgICAgICAgICAgICBBbHQgICAgICAgICAgICAgICAgICAgIDhcbiAgICAgICAgICAgICAgU2hpZnRMICAgICAgICAgICAgICAgIDE2XG4gICAgICAgICAgICAgIFNoaWZ0UiAgICAgICAgICAgICAgICAzMlxuICAgICAgICAgICAgICBDdHJsTCAgICAgICAgICAgICAgICAgNjRcbiAgICAgICAgICAgICAgQ3RybFIgICAgICAgICAgICAgICAgMTI4XG4gICAgICAgICAgICAgIENhcHNTaGlmdCAgICAgICAgICAgIDI1NlxuaHR0cHM6Ly9tYW43Lm9yZy9saW51eC9tYW4tcGFnZXMvbWFuNS9rZXltYXBzLjUuaHRtbCIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlRyYW5zcGFyZW50V2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4LjEiLAogICAgIjMuMzYuMSIsCiAgICAiMy4zOC4xIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "41": {"version": "12", "sha256": "0padnsq8if6kzws2sqi3yza2401pdxpzpsnrpydscrfl7xb91r5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay5cblxuVXNlIGZvbGxvd2luZyBtb2RpZmVyIGtleSBjb2RlIGxpc3QgdG8gY2FsY3VsYXRlIGhvdGtleSBjb2RlKEUuZy4gQ3RybCtBbHQgaXMgNCArIDggPSAxMik6XG5TaGlmdCAgICAgICAgICAgICAgICAgIDFcbiAgICAgICAgICAgICAgQWx0R3IgICAgICAgICAgICAgICAgICAyXG4gICAgICAgICAgICAgIENvbnRyb2wgICAgICAgICAgICAgICAgNFxuICAgICAgICAgICAgICBBbHQgICAgICAgICAgICAgICAgICAgIDhcbiAgICAgICAgICAgICAgU2hpZnRMICAgICAgICAgICAgICAgIDE2XG4gICAgICAgICAgICAgIFNoaWZ0UiAgICAgICAgICAgICAgICAzMlxuICAgICAgICAgICAgICBDdHJsTCAgICAgICAgICAgICAgICAgNjRcbiAgICAgICAgICAgICAgQ3RybFIgICAgICAgICAgICAgICAgMTI4XG4gICAgICAgICAgICAgIENhcHNTaGlmdCAgICAgICAgICAgIDI1NlxuaHR0cHM6Ly9tYW43Lm9yZy9saW51eC9tYW4tcGFnZXMvbWFuNS9rZXltYXBzLjUuaHRtbCIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlRyYW5zcGFyZW50V2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4LjEiLAogICAgIjMuMzYuMSIsCiAgICAiMy4zOC4xIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "42": {"version": "12", "sha256": "0padnsq8if6kzws2sqi3yza2401pdxpzpsnrpydscrfl7xb91r5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay5cblxuVXNlIGZvbGxvd2luZyBtb2RpZmVyIGtleSBjb2RlIGxpc3QgdG8gY2FsY3VsYXRlIGhvdGtleSBjb2RlKEUuZy4gQ3RybCtBbHQgaXMgNCArIDggPSAxMik6XG5TaGlmdCAgICAgICAgICAgICAgICAgIDFcbiAgICAgICAgICAgICAgQWx0R3IgICAgICAgICAgICAgICAgICAyXG4gICAgICAgICAgICAgIENvbnRyb2wgICAgICAgICAgICAgICAgNFxuICAgICAgICAgICAgICBBbHQgICAgICAgICAgICAgICAgICAgIDhcbiAgICAgICAgICAgICAgU2hpZnRMICAgICAgICAgICAgICAgIDE2XG4gICAgICAgICAgICAgIFNoaWZ0UiAgICAgICAgICAgICAgICAzMlxuICAgICAgICAgICAgICBDdHJsTCAgICAgICAgICAgICAgICAgNjRcbiAgICAgICAgICAgICAgQ3RybFIgICAgICAgICAgICAgICAgMTI4XG4gICAgICAgICAgICAgIENhcHNTaGlmdCAgICAgICAgICAgIDI1NlxuaHR0cHM6Ly9tYW43Lm9yZy9saW51eC9tYW4tcGFnZXMvbWFuNS9rZXltYXBzLjUuaHRtbCIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlRyYW5zcGFyZW50V2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4LjEiLAogICAgIjMuMzYuMSIsCiAgICAiMy4zOC4xIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "43": {"version": "12", "sha256": "0padnsq8if6kzws2sqi3yza2401pdxpzpsnrpydscrfl7xb91r5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay5cblxuVXNlIGZvbGxvd2luZyBtb2RpZmVyIGtleSBjb2RlIGxpc3QgdG8gY2FsY3VsYXRlIGhvdGtleSBjb2RlKEUuZy4gQ3RybCtBbHQgaXMgNCArIDggPSAxMik6XG5TaGlmdCAgICAgICAgICAgICAgICAgIDFcbiAgICAgICAgICAgICAgQWx0R3IgICAgICAgICAgICAgICAgICAyXG4gICAgICAgICAgICAgIENvbnRyb2wgICAgICAgICAgICAgICAgNFxuICAgICAgICAgICAgICBBbHQgICAgICAgICAgICAgICAgICAgIDhcbiAgICAgICAgICAgICAgU2hpZnRMICAgICAgICAgICAgICAgIDE2XG4gICAgICAgICAgICAgIFNoaWZ0UiAgICAgICAgICAgICAgICAzMlxuICAgICAgICAgICAgICBDdHJsTCAgICAgICAgICAgICAgICAgNjRcbiAgICAgICAgICAgICAgQ3RybFIgICAgICAgICAgICAgICAgMTI4XG4gICAgICAgICAgICAgIENhcHNTaGlmdCAgICAgICAgICAgIDI1NlxuaHR0cHM6Ly9tYW43Lm9yZy9saW51eC9tYW4tcGFnZXMvbWFuNS9rZXltYXBzLjUuaHRtbCIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlRyYW5zcGFyZW50V2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4LjEiLAogICAgIjMuMzYuMSIsCiAgICAiMy4zOC4xIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}}} , {"uuid": "miniview@thesecretaryofwar.com", "name": "Miniview", "pname": "miniview", "description": "Displays a mini window preview (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 (or shift + click): 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": "09bkkqhah75pgx38a601pb65w44d9q8b2n24bxnvwc6bzh1rcbbv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbWluaSB3aW5kb3cgcHJldmlldyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVik6XG5cdTIwMTQgTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG5cdTIwMTQgUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuXHUyMDE0IFNjcm9sbCB3aGVlbCAob3Igc2hpZnQgKyBjbGljayk6IGNoYW5nZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgU2hpZnQgKyBGMTI6IHRvZ2dsZSBwcmV2aWV3IHdpbmRvdyAodGhpcyBjYW4gYmUgY2hhbmdlZCBvciBkaXNhYmxlZCBpbiBwcmVmZXJlbmNlcylcblx1MjAxNCBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWFtbGVtZWMvbWluaXZpZXciLAogICJ1dWlkIjogIm1pbml2aWV3QHRoZXNlY3JldGFyeW9md2FyLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "15", "sha256": "04r06w0yr4agzjhizmx9grvvymnlihk5idchzicyby55zvzma48l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbWluaSB3aW5kb3cgcHJldmlldyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVik6XG5cdTIwMTQgTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG5cdTIwMTQgUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuXHUyMDE0IFNjcm9sbCB3aGVlbCAob3Igc2hpZnQgKyBjbGljayk6IGNoYW5nZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgU2hpZnQgKyBGMTI6IHRvZ2dsZSBwcmV2aWV3IHdpbmRvdyAodGhpcyBjYW4gYmUgY2hhbmdlZCBvciBkaXNhYmxlZCBpbiBwcmVmZXJlbmNlcylcblx1MjAxNCBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lhbWxlbWVjL21pbml2aWV3IiwKICAidXVpZCI6ICJtaW5pdmlld0B0aGVzZWNyZXRhcnlvZndhci5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "15", "sha256": "04r06w0yr4agzjhizmx9grvvymnlihk5idchzicyby55zvzma48l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbWluaSB3aW5kb3cgcHJldmlldyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVik6XG5cdTIwMTQgTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG5cdTIwMTQgUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuXHUyMDE0IFNjcm9sbCB3aGVlbCAob3Igc2hpZnQgKyBjbGljayk6IGNoYW5nZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgU2hpZnQgKyBGMTI6IHRvZ2dsZSBwcmV2aWV3IHdpbmRvdyAodGhpcyBjYW4gYmUgY2hhbmdlZCBvciBkaXNhYmxlZCBpbiBwcmVmZXJlbmNlcylcblx1MjAxNCBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lhbWxlbWVjL21pbml2aWV3IiwKICAidXVpZCI6ICJtaW5pdmlld0B0aGVzZWNyZXRhcnlvZndhci5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "42": {"version": "15", "sha256": "04r06w0yr4agzjhizmx9grvvymnlihk5idchzicyby55zvzma48l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbWluaSB3aW5kb3cgcHJldmlldyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVik6XG5cdTIwMTQgTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG5cdTIwMTQgUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuXHUyMDE0IFNjcm9sbCB3aGVlbCAob3Igc2hpZnQgKyBjbGljayk6IGNoYW5nZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgU2hpZnQgKyBGMTI6IHRvZ2dsZSBwcmV2aWV3IHdpbmRvdyAodGhpcyBjYW4gYmUgY2hhbmdlZCBvciBkaXNhYmxlZCBpbiBwcmVmZXJlbmNlcylcblx1MjAxNCBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lhbWxlbWVjL21pbml2aWV3IiwKICAidXVpZCI6ICJtaW5pdmlld0B0aGVzZWNyZXRhcnlvZndhci5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "43": {"version": "15", "sha256": "04r06w0yr4agzjhizmx9grvvymnlihk5idchzicyby55zvzma48l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbWluaSB3aW5kb3cgcHJldmlldyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVik6XG5cdTIwMTQgTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG5cdTIwMTQgUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuXHUyMDE0IFNjcm9sbCB3aGVlbCAob3Igc2hpZnQgKyBjbGljayk6IGNoYW5nZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgU2hpZnQgKyBGMTI6IHRvZ2dsZSBwcmV2aWV3IHdpbmRvdyAodGhpcyBjYW4gYmUgY2hhbmdlZCBvciBkaXNhYmxlZCBpbiBwcmVmZXJlbmNlcylcblx1MjAxNCBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lhbWxlbWVjL21pbml2aWV3IiwKICAidXVpZCI6ICJtaW5pdmlld0B0aGVzZWNyZXRhcnlvZndhci5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} -, {"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": "57", "sha256": "1q6h9pc1d31993v5knnb7c4224h6f7x1jida2xnwi0047nz5b8zn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="}, "40": {"version": "57", "sha256": "1q6h9pc1d31993v5knnb7c4224h6f7x1jida2xnwi0047nz5b8zn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="}, "41": {"version": "57", "sha256": "1q6h9pc1d31993v5knnb7c4224h6f7x1jida2xnwi0047nz5b8zn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="}, "42": {"version": "57", "sha256": "1q6h9pc1d31993v5knnb7c4224h6f7x1jida2xnwi0047nz5b8zn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="}, "43": {"version": "57", "sha256": "1q6h9pc1d31993v5knnb7c4224h6f7x1jida2xnwi0047nz5b8zn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="}}} +, {"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": "57", "sha256": "1q6h9pc1d31993v5knnb7c4224h6f7x1jida2xnwi0047nz5b8zn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="}, "40": {"version": "59", "sha256": "0ws5qdj8h9i2g2fa3dpzrawaabcx785qdwb58a9b7zmvr0k5a0ha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTkKfQ=="}, "41": {"version": "59", "sha256": "0ws5qdj8h9i2g2fa3dpzrawaabcx785qdwb58a9b7zmvr0k5a0ha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTkKfQ=="}, "42": {"version": "59", "sha256": "0ws5qdj8h9i2g2fa3dpzrawaabcx785qdwb58a9b7zmvr0k5a0ha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTkKfQ=="}, "43": {"version": "59", "sha256": "0ws5qdj8h9i2g2fa3dpzrawaabcx785qdwb58a9b7zmvr0k5a0ha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTkKfQ=="}}} , {"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": "9", "sha256": "1g6jfb8pq1k88k5fvwavhb77nkkn8kgxy9y8f3kc26hyjwbfpn11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tFSUlJL2dub21lLXNoZWxsLXBhbmVsLWRhdGUtZm9ybWF0IiwKICAidXVpZCI6ICJwYW5lbC1kYXRlLWZvcm1hdEBrZWlpaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "1g6jfb8pq1k88k5fvwavhb77nkkn8kgxy9y8f3kc26hyjwbfpn11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tFSUlJL2dub21lLXNoZWxsLXBhbmVsLWRhdGUtZm9ybWF0IiwKICAidXVpZCI6ICJwYW5lbC1kYXRlLWZvcm1hdEBrZWlpaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "1g6jfb8pq1k88k5fvwavhb77nkkn8kgxy9y8f3kc26hyjwbfpn11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tFSUlJL2dub21lLXNoZWxsLXBhbmVsLWRhdGUtZm9ybWF0IiwKICAidXVpZCI6ICJwYW5lbC1kYXRlLWZvcm1hdEBrZWlpaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "1g6jfb8pq1k88k5fvwavhb77nkkn8kgxy9y8f3kc26hyjwbfpn11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tFSUlJL2dub21lLXNoZWxsLXBhbmVsLWRhdGUtZm9ybWF0IiwKICAidXVpZCI6ICJwYW5lbC1kYXRlLWZvcm1hdEBrZWlpaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"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"}}} @@ -205,7 +205,7 @@ , {"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": "11", "sha256": "0n6pnkfzwdsafkwf302vg9bvih70mpqvhn25k8l8h5r83x17q41a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tenVyL2dub21lLXNoZWxsLWJhdGltZSIsCiAgInV1aWQiOiAiYmF0aW1lQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0n6pnkfzwdsafkwf302vg9bvih70mpqvhn25k8l8h5r83x17q41a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tenVyL2dub21lLXNoZWxsLWJhdGltZSIsCiAgInV1aWQiOiAiYmF0aW1lQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "0n6pnkfzwdsafkwf302vg9bvih70mpqvhn25k8l8h5r83x17q41a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tenVyL2dub21lLXNoZWxsLWJhdGltZSIsCiAgInV1aWQiOiAiYmF0aW1lQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"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=="}, "42": {"version": "27", "sha256": "1kzrm6n8cj9lpxdz4nkdi2g014rbalv1rdwvqpdf7z8wjgf69q7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLlxuSWYgeW91IHVzZSBVYnVudHUsIGluc3RhbGwgcGFja2FnZSBnaXIxLjItY2x1dHRlci0xLjAgZmlyc3QuIiwKICAibmFtZSI6ICJMb2NrIHNjcmVlbiBiYWNrZ3JvdW5kIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmxvY2tEaWFsb2dCYWNrZ3JvdW5kIiwKICAidXVpZCI6ICJ1bmxvY2tEaWFsb2dCYWNrZ3JvdW5kQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "43": {"version": "27", "sha256": "1kzrm6n8cj9lpxdz4nkdi2g014rbalv1rdwvqpdf7z8wjgf69q7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLlxuSWYgeW91IHVzZSBVYnVudHUsIGluc3RhbGwgcGFja2FnZSBnaXIxLjItY2x1dHRlci0xLjAgZmlyc3QuIiwKICAibmFtZSI6ICJMb2NrIHNjcmVlbiBiYWNrZ3JvdW5kIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmxvY2tEaWFsb2dCYWNrZ3JvdW5kIiwKICAidXVpZCI6ICJ1bmxvY2tEaWFsb2dCYWNrZ3JvdW5kQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}}} -, {"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=="}, "42": {"version": "36", "sha256": "1fbhqjam8r7y7g9zxk606qzp19nzrrprrwf76bzq7j9yvhng7m3j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMzYKfQ=="}, "43": {"version": "36", "sha256": "1fbhqjam8r7y7g9zxk606qzp19nzrrprrwf76bzq7j9yvhng7m3j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMzYKfQ=="}}} +, {"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=="}, "42": {"version": "37", "sha256": "0idw53rxkfjq7wy9z7b13qpcq85sslgvr4rsp3gfxiyar9wdz21g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMzcKfQ=="}, "43": {"version": "37", "sha256": "0idw53rxkfjq7wy9z7b13qpcq85sslgvr4rsp3gfxiyar9wdz21g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMzcKfQ=="}}} , {"uuid": "extensions-sync@elhan.io", "name": "Extensions Sync", "pname": "extensions-sync", "description": "Syncs gnome-shell keybindings, tweaks settings and extensions with their configuration across all gnome installations", "link": "https://extensions.gnome.org/extension/1486/extensions-sync/", "shell_version_map": {"38": {"version": "12", "sha256": "1gxjbxbfk2xkbpfc5yv38najmixxsz34g5p6y3rmi6ly5kgca798", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmNzIGdub21lLXNoZWxsIGtleWJpbmRpbmdzLCB0d2Vha3Mgc2V0dGluZ3MgYW5kIGV4dGVuc2lvbnMgd2l0aCB0aGVpciBjb25maWd1cmF0aW9uIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFsbGF0aW9ucyIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9ucyBTeW5jIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc3luYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29hZS9nbm9tZS1zaGVsbC1leHRlbnNpb25zLXN5bmMiLAogICJ1dWlkIjogImV4dGVuc2lvbnMtc3luY0BlbGhhbi5pbyIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "17", "sha256": "112qqwa5smms0k2ki8d3qwpzf17y6sw2lgpz4ibi57zja0y3plgn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmNzIGdub21lLXNoZWxsIGtleWJpbmRpbmdzLCB0d2Vha3Mgc2V0dGluZ3MgYW5kIGV4dGVuc2lvbnMgd2l0aCB0aGVpciBjb25maWd1cmF0aW9uIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFsbGF0aW9ucyIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9ucyBTeW5jIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc3luYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29hZS9nbm9tZS1zaGVsbC1leHRlbnNpb25zLXN5bmMiLAogICJ1dWlkIjogImV4dGVuc2lvbnMtc3luY0BlbGhhbi5pbyIsCiAgInZlcnNpb24iOiAxNwp9"}, "41": {"version": "17", "sha256": "112qqwa5smms0k2ki8d3qwpzf17y6sw2lgpz4ibi57zja0y3plgn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmNzIGdub21lLXNoZWxsIGtleWJpbmRpbmdzLCB0d2Vha3Mgc2V0dGluZ3MgYW5kIGV4dGVuc2lvbnMgd2l0aCB0aGVpciBjb25maWd1cmF0aW9uIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFsbGF0aW9ucyIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9ucyBTeW5jIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc3luYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29hZS9nbm9tZS1zaGVsbC1leHRlbnNpb25zLXN5bmMiLAogICJ1dWlkIjogImV4dGVuc2lvbnMtc3luY0BlbGhhbi5pbyIsCiAgInZlcnNpb24iOiAxNwp9"}, "42": {"version": "18", "sha256": "1ira1azgc5glm45j0f7jbzj0iyvrkfxymihfcqimr9047mzv79va", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmNzIGdub21lLXNoZWxsIGtleWJpbmRpbmdzLCB0d2Vha3Mgc2V0dGluZ3MgYW5kIGV4dGVuc2lvbnMgd2l0aCB0aGVpciBjb25maWd1cmF0aW9uIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFsbGF0aW9ucyIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9ucyBTeW5jIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc3luYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2FlL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtc3luYyIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zeW5jQGVsaGFuLmlvIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "43": {"version": "18", "sha256": "1ira1azgc5glm45j0f7jbzj0iyvrkfxymihfcqimr9047mzv79va", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmNzIGdub21lLXNoZWxsIGtleWJpbmRpbmdzLCB0d2Vha3Mgc2V0dGluZ3MgYW5kIGV4dGVuc2lvbnMgd2l0aCB0aGVpciBjb25maWd1cmF0aW9uIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFsbGF0aW9ucyIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9ucyBTeW5jIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc3luYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2FlL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtc3luYyIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zeW5jQGVsaGFuLmlvIiwKICAidmVyc2lvbiI6IDE4Cn0="}}} , {"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": "24", "sha256": "0kgws75qhqwczxvi6d8fp7jpxjcr7qh4jx29a2yb1y73ab5iiw6w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZ29sYW5naC9nbm9tZS1zaGVsbC1leHRlbnNpb24tY29udGFpbmVycyIsCiAgInV1aWQiOiAiY29udGFpbmVyc0Byb3lnIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "41": {"version": "24", "sha256": "0kgws75qhqwczxvi6d8fp7jpxjcr7qh4jx29a2yb1y73ab5iiw6w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZ29sYW5naC9nbm9tZS1zaGVsbC1leHRlbnNpb24tY29udGFpbmVycyIsCiAgInV1aWQiOiAiY29udGFpbmVyc0Byb3lnIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "42": {"version": "24", "sha256": "0kgws75qhqwczxvi6d8fp7jpxjcr7qh4jx29a2yb1y73ab5iiw6w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZ29sYW5naC9nbm9tZS1zaGVsbC1leHRlbnNpb24tY29udGFpbmVycyIsCiAgInV1aWQiOiAiY29udGFpbmVyc0Byb3lnIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "43": {"version": "24", "sha256": "0kgws75qhqwczxvi6d8fp7jpxjcr7qh4jx29a2yb1y73ab5iiw6w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZ29sYW5naC9nbm9tZS1zaGVsbC1leHRlbnNpb24tY29udGFpbmVycyIsCiAgInV1aWQiOiAiY29udGFpbmVyc0Byb3lnIiwKICAidmVyc2lvbiI6IDI0Cn0="}}} , {"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": "8", "sha256": "0csx7mqgbjjvf3cwk492bk9b92l2270qw2c2badckwsyl6qwahj4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93IHRvIGEgbmV3IHdvcmtzcGFjZSB3aGVuIHlvdSBtYXhpbWl6ZSBvciBtYWtlIGl0IGZ1bGxzY3JlZW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnVsbHNjcmVlbndvcmtzcGFjZSIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBPbiBOZXcgV29ya3NwYWNlIiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW53b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zYXRyYW4vZnVsbHNjcmVlbndvcmtzcGFjZS1zYXRyYW4uaW4iLAogICJ1dWlkIjogImZ1bGxzY3JlZW53b3Jrc3BhY2VAc2F0cmFuLmluIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "0csx7mqgbjjvf3cwk492bk9b92l2270qw2c2badckwsyl6qwahj4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93IHRvIGEgbmV3IHdvcmtzcGFjZSB3aGVuIHlvdSBtYXhpbWl6ZSBvciBtYWtlIGl0IGZ1bGxzY3JlZW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnVsbHNjcmVlbndvcmtzcGFjZSIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBPbiBOZXcgV29ya3NwYWNlIiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW53b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zYXRyYW4vZnVsbHNjcmVlbndvcmtzcGFjZS1zYXRyYW4uaW4iLAogICJ1dWlkIjogImZ1bGxzY3JlZW53b3Jrc3BhY2VAc2F0cmFuLmluIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "0csx7mqgbjjvf3cwk492bk9b92l2270qw2c2badckwsyl6qwahj4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93IHRvIGEgbmV3IHdvcmtzcGFjZSB3aGVuIHlvdSBtYXhpbWl6ZSBvciBtYWtlIGl0IGZ1bGxzY3JlZW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnVsbHNjcmVlbndvcmtzcGFjZSIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBPbiBOZXcgV29ya3NwYWNlIiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW53b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zYXRyYW4vZnVsbHNjcmVlbndvcmtzcGFjZS1zYXRyYW4uaW4iLAogICJ1dWlkIjogImZ1bGxzY3JlZW53b3Jrc3BhY2VAc2F0cmFuLmluIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "42": {"version": "8", "sha256": "0csx7mqgbjjvf3cwk492bk9b92l2270qw2c2badckwsyl6qwahj4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93IHRvIGEgbmV3IHdvcmtzcGFjZSB3aGVuIHlvdSBtYXhpbWl6ZSBvciBtYWtlIGl0IGZ1bGxzY3JlZW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnVsbHNjcmVlbndvcmtzcGFjZSIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBPbiBOZXcgV29ya3NwYWNlIiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW53b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zYXRyYW4vZnVsbHNjcmVlbndvcmtzcGFjZS1zYXRyYW4uaW4iLAogICJ1dWlkIjogImZ1bGxzY3JlZW53b3Jrc3BhY2VAc2F0cmFuLmluIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} @@ -218,9 +218,9 @@ , {"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": "14", "sha256": "15gp2ncmh7ad1pdr2wc8jilwcp47mgchi82ldk0zpfbkl2f8cpm0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgYW5kIENhcHNsb2NrIHN0YXR1cyBvbiB0aGUgcGFuZWwuIEljb25zIGFyZSBhdXRvIGhpZGRlbi4gU2ltcGxpZmllZCB3aXRoIG5vIG1lbnVzLCBub3RpZmljYXRpb25zIG9yIHNldHRpbmdzLlxuXG5XYXlsYW5kIGlzIG9ubHkgc3VwcG9ydGVkIGZvciBHbm9tZSBTaGVsbCAzLjM4LiIsCiAgIm5hbWUiOiAiTG9jayBLZXlzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTdGV2ZSBDbGFyaywgS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJsb2Nra2V5c0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxNAp9"}, "40": {"version": "14", "sha256": "15gp2ncmh7ad1pdr2wc8jilwcp47mgchi82ldk0zpfbkl2f8cpm0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgYW5kIENhcHNsb2NrIHN0YXR1cyBvbiB0aGUgcGFuZWwuIEljb25zIGFyZSBhdXRvIGhpZGRlbi4gU2ltcGxpZmllZCB3aXRoIG5vIG1lbnVzLCBub3RpZmljYXRpb25zIG9yIHNldHRpbmdzLlxuXG5XYXlsYW5kIGlzIG9ubHkgc3VwcG9ydGVkIGZvciBHbm9tZSBTaGVsbCAzLjM4LiIsCiAgIm5hbWUiOiAiTG9jayBLZXlzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTdGV2ZSBDbGFyaywgS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJsb2Nra2V5c0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxNAp9"}, "41": {"version": "14", "sha256": "15gp2ncmh7ad1pdr2wc8jilwcp47mgchi82ldk0zpfbkl2f8cpm0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgYW5kIENhcHNsb2NrIHN0YXR1cyBvbiB0aGUgcGFuZWwuIEljb25zIGFyZSBhdXRvIGhpZGRlbi4gU2ltcGxpZmllZCB3aXRoIG5vIG1lbnVzLCBub3RpZmljYXRpb25zIG9yIHNldHRpbmdzLlxuXG5XYXlsYW5kIGlzIG9ubHkgc3VwcG9ydGVkIGZvciBHbm9tZSBTaGVsbCAzLjM4LiIsCiAgIm5hbWUiOiAiTG9jayBLZXlzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTdGV2ZSBDbGFyaywgS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJsb2Nra2V5c0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxNAp9"}, "42": {"version": "14", "sha256": "15gp2ncmh7ad1pdr2wc8jilwcp47mgchi82ldk0zpfbkl2f8cpm0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgYW5kIENhcHNsb2NrIHN0YXR1cyBvbiB0aGUgcGFuZWwuIEljb25zIGFyZSBhdXRvIGhpZGRlbi4gU2ltcGxpZmllZCB3aXRoIG5vIG1lbnVzLCBub3RpZmljYXRpb25zIG9yIHNldHRpbmdzLlxuXG5XYXlsYW5kIGlzIG9ubHkgc3VwcG9ydGVkIGZvciBHbm9tZSBTaGVsbCAzLjM4LiIsCiAgIm5hbWUiOiAiTG9jayBLZXlzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTdGV2ZSBDbGFyaywgS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJsb2Nra2V5c0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxNAp9"}}} -, {"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": "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"}, "42": {"version": "6", "sha256": "1rsxxqrg7csrj9yi5i17jqwa53kz26r0rrpvawfil4zrgpwrpw7d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIHdpbnRlciB0byB5b3VyIGRlc2t0b3A6IHVuaWNvZGUgc25vd2ZsYWtlcyBmYWxsaW5nIG9uIHlvdXIgc2NyZWVucy5cblxuRmVhdHVyZXM6XG4tIHNub3cgZG9lc24ndCBmYWxsIG92ZXIgY3VycmVudGx5IGFjdGl2ZSB3aW5kb3dcbi0gdXNlIHNsaWRlciB0byBjaG9vc2UgaG93IG11Y2ggc25vdyB5b3Ugd2FudFxuLSB3b3JrcyB3aXRoIG11bHRpcGxlIG1vbml0b3JzXG5cbkluc3BpcmVkIGJ5IGdzbm93IChodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTU2L2dzbm93LykuIiwKICAibmFtZSI6ICJMZXQgaXQgc25vdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vYml0YnVja2V0Lm9yZy9tYXRiYW4vbGV0LWl0LXNub3ciLAogICJ1dWlkIjogIkxldEl0U25vd0BtYXRldXN6LmJhbmFzemVrLm9wLnBsIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"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": "10", "sha256": "1v8nibi910axllycphivwclk74zdsvngbn71lby01kfjxzpzy7rh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgaG90IGNvcm5lciBpbiBmdWxsc2NyZWVuIG1vZGUiLAogICJuYW1lIjogIkZ1bGxzY3JlZW4gSG90IENvcm5lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvYWwvZ25vbWUtc2hlbGwtZnVsbHNjcmVlbi1ob3QtY29ybmVyIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWhvdC1jb3JuZXJAc29ycm93LmFib3V0LmFsaWNlLnBtLm1lIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "11", "sha256": "0xs8fyh3q6hvdw0w5qiga7dpm1vhbrx431mb53r69nys4s3q4syl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgaG90IGNvcm5lciBpbiBmdWxsc2NyZWVuIG1vZGUiLAogICJuYW1lIjogIkZ1bGxzY3JlZW4gSG90IENvcm5lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvYWwvZ25vbWUtc2hlbGwtZnVsbHNjcmVlbi1ob3QtY29ybmVyIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWhvdC1jb3JuZXJAc29ycm93LmFib3V0LmFsaWNlLnBtLm1lIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "0xs8fyh3q6hvdw0w5qiga7dpm1vhbrx431mb53r69nys4s3q4syl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgaG90IGNvcm5lciBpbiBmdWxsc2NyZWVuIG1vZGUiLAogICJuYW1lIjogIkZ1bGxzY3JlZW4gSG90IENvcm5lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvYWwvZ25vbWUtc2hlbGwtZnVsbHNjcmVlbi1ob3QtY29ybmVyIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWhvdC1jb3JuZXJAc29ycm93LmFib3V0LmFsaWNlLnBtLm1lIiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "11", "sha256": "0xs8fyh3q6hvdw0w5qiga7dpm1vhbrx431mb53r69nys4s3q4syl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgaG90IGNvcm5lciBpbiBmdWxsc2NyZWVuIG1vZGUiLAogICJuYW1lIjogIkZ1bGxzY3JlZW4gSG90IENvcm5lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvYWwvZ25vbWUtc2hlbGwtZnVsbHNjcmVlbi1ob3QtY29ybmVyIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWhvdC1jb3JuZXJAc29ycm93LmFib3V0LmFsaWNlLnBtLm1lIiwKICAidmVyc2lvbiI6IDExCn0="}}} -, {"uuid": "worksets@blipk.xyz", "name": "Customised Workspaces", "pname": "worksets", "description": "Customised Workspaces enables creating isolated and customised workspaces.\n\n* Choose a different background image for each workspace\n* Your dash will have unique favourite applications on each workspace\n* Optionally isolate running applications to only appear on the dash in their respective workspace\n* Optionally show workspace information and actions in the overview\n* Set each customised workspace to autoload on specific workspaces\n* Hide the extension once you've configured your preferences to enjoy seamlessly upgraded workspaces in gnome shell\n\nPlease do not leave a comment for issues and instead report it here: https://github.com/blipk/Customised-Workspaces/issues", "link": "https://extensions.gnome.org/extension/1583/worksets/", "shell_version_map": {"38": {"version": "30", "sha256": "1z1yy47x20vqmjgghn91zs9nfs2g6f57nv4rzyi47bnklw7zsdcf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIENob29zZSBhIGRpZmZlcmVudCBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBZb3VyIGRhc2ggd2lsbCBoYXZlIHVuaXF1ZSBmYXZvdXJpdGUgYXBwbGljYXRpb25zIG9uIGVhY2ggd29ya3NwYWNlXG4qIE9wdGlvbmFsbHkgaXNvbGF0ZSBydW5uaW5nIGFwcGxpY2F0aW9ucyB0byBvbmx5IGFwcGVhciBvbiB0aGUgZGFzaCBpbiB0aGVpciByZXNwZWN0aXZlIHdvcmtzcGFjZVxuKiBPcHRpb25hbGx5IHNob3cgd29ya3NwYWNlIGluZm9ybWF0aW9uIGFuZCBhY3Rpb25zIGluIHRoZSBvdmVydmlld1xuKiBTZXQgZWFjaCBjdXN0b21pc2VkIHdvcmtzcGFjZSB0byBhdXRvbG9hZCBvbiBzcGVjaWZpYyB3b3Jrc3BhY2VzXG4qIEhpZGUgdGhlIGV4dGVuc2lvbiBvbmNlIHlvdSd2ZSBjb25maWd1cmVkIHlvdXIgcHJlZmVyZW5jZXMgdG8gZW5qb3kgc2VhbWxlc3NseSB1cGdyYWRlZCB3b3Jrc3BhY2VzIGluIGdub21lIHNoZWxsXG5cblBsZWFzZSBkbyBub3QgbGVhdmUgYSBjb21tZW50IGZvciBpc3N1ZXMgYW5kIGluc3RlYWQgcmVwb3J0IGl0IGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9DdXN0b21pc2VkLVdvcmtzcGFjZXMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzZXRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NldHMiLAogICJuYW1lIjogIkN1c3RvbWlzZWQgV29ya3NwYWNlcyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJhZG1pbkBrcm9ub3NvdWwueHl6IiwKICAicmVzb3VyY2UtcGF0aCI6ICIvb3JnL2tyb25vc291bC93b3Jrc2V0cy8iLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy93b3Jrc2V0cy8iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NldHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLmJldGEiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvQ3VzdG9taXNlZC1Xb3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ3b3Jrc2V0c0BibGlway54eXoiLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "40": {"version": "44", "sha256": "0mn0ahbvgf78wn957hikjp0lhmy85sczlgf70sgzgacz266h6vb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIENob29zZSBhIGRpZmZlcmVudCBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBZb3VyIGRhc2ggd2lsbCBoYXZlIHVuaXF1ZSBmYXZvdXJpdGUgYXBwbGljYXRpb25zIG9uIGVhY2ggd29ya3NwYWNlXG4qIE9wdGlvbmFsbHkgaXNvbGF0ZSBydW5uaW5nIGFwcGxpY2F0aW9ucyB0byBvbmx5IGFwcGVhciBvbiB0aGUgZGFzaCBpbiB0aGVpciByZXNwZWN0aXZlIHdvcmtzcGFjZVxuKiBPcHRpb25hbGx5IHNob3cgd29ya3NwYWNlIGluZm9ybWF0aW9uIGFuZCBhY3Rpb25zIGluIHRoZSBvdmVydmlld1xuKiBTZXQgZWFjaCBjdXN0b21pc2VkIHdvcmtzcGFjZSB0byBhdXRvbG9hZCBvbiBzcGVjaWZpYyB3b3Jrc3BhY2VzXG4qIEhpZGUgdGhlIGV4dGVuc2lvbiBvbmNlIHlvdSd2ZSBjb25maWd1cmVkIHlvdXIgcHJlZmVyZW5jZXMgdG8gZW5qb3kgc2VhbWxlc3NseSB1cGdyYWRlZCB3b3Jrc3BhY2VzIGluIGdub21lIHNoZWxsXG5cblBsZWFzZSBkbyBub3QgbGVhdmUgYSBjb21tZW50IGZvciBpc3N1ZXMgYW5kIGluc3RlYWQgcmVwb3J0IGl0IGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9DdXN0b21pc2VkLVdvcmtzcGFjZXMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzZXRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NldHMiLAogICJuYW1lIjogIkN1c3RvbWlzZWQgV29ya3NwYWNlcyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJibGlwayIsCiAgInJlc291cmNlLXBhdGgiOiAiL29yZy9rcm9ub3NvdWwvd29ya3NldHMvIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvd29ya3NldHMvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvQ3VzdG9taXNlZC1Xb3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ3b3Jrc2V0c0BibGlway54eXoiLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "41": {"version": "44", "sha256": "0mn0ahbvgf78wn957hikjp0lhmy85sczlgf70sgzgacz266h6vb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIENob29zZSBhIGRpZmZlcmVudCBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBZb3VyIGRhc2ggd2lsbCBoYXZlIHVuaXF1ZSBmYXZvdXJpdGUgYXBwbGljYXRpb25zIG9uIGVhY2ggd29ya3NwYWNlXG4qIE9wdGlvbmFsbHkgaXNvbGF0ZSBydW5uaW5nIGFwcGxpY2F0aW9ucyB0byBvbmx5IGFwcGVhciBvbiB0aGUgZGFzaCBpbiB0aGVpciByZXNwZWN0aXZlIHdvcmtzcGFjZVxuKiBPcHRpb25hbGx5IHNob3cgd29ya3NwYWNlIGluZm9ybWF0aW9uIGFuZCBhY3Rpb25zIGluIHRoZSBvdmVydmlld1xuKiBTZXQgZWFjaCBjdXN0b21pc2VkIHdvcmtzcGFjZSB0byBhdXRvbG9hZCBvbiBzcGVjaWZpYyB3b3Jrc3BhY2VzXG4qIEhpZGUgdGhlIGV4dGVuc2lvbiBvbmNlIHlvdSd2ZSBjb25maWd1cmVkIHlvdXIgcHJlZmVyZW5jZXMgdG8gZW5qb3kgc2VhbWxlc3NseSB1cGdyYWRlZCB3b3Jrc3BhY2VzIGluIGdub21lIHNoZWxsXG5cblBsZWFzZSBkbyBub3QgbGVhdmUgYSBjb21tZW50IGZvciBpc3N1ZXMgYW5kIGluc3RlYWQgcmVwb3J0IGl0IGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9DdXN0b21pc2VkLVdvcmtzcGFjZXMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzZXRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NldHMiLAogICJuYW1lIjogIkN1c3RvbWlzZWQgV29ya3NwYWNlcyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJibGlwayIsCiAgInJlc291cmNlLXBhdGgiOiAiL29yZy9rcm9ub3NvdWwvd29ya3NldHMvIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvd29ya3NldHMvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvQ3VzdG9taXNlZC1Xb3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ3b3Jrc2V0c0BibGlway54eXoiLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "42": {"version": "47", "sha256": "0kgcp74ik8pn50h4s3c9ql5sl9bqf78s50vnrnkr7aih3k3ylbdd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIENob29zZSBhIGRpZmZlcmVudCBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBZb3VyIGRhc2ggd2lsbCBoYXZlIHVuaXF1ZSBmYXZvdXJpdGUgYXBwbGljYXRpb25zIG9uIGVhY2ggd29ya3NwYWNlXG4qIE9wdGlvbmFsbHkgaXNvbGF0ZSBydW5uaW5nIGFwcGxpY2F0aW9ucyB0byBvbmx5IGFwcGVhciBvbiB0aGUgZGFzaCBpbiB0aGVpciByZXNwZWN0aXZlIHdvcmtzcGFjZVxuKiBPcHRpb25hbGx5IHNob3cgd29ya3NwYWNlIGluZm9ybWF0aW9uIGFuZCBhY3Rpb25zIGluIHRoZSBvdmVydmlld1xuKiBTZXQgZWFjaCBjdXN0b21pc2VkIHdvcmtzcGFjZSB0byBhdXRvbG9hZCBvbiBzcGVjaWZpYyB3b3Jrc3BhY2VzXG4qIEhpZGUgdGhlIGV4dGVuc2lvbiBvbmNlIHlvdSd2ZSBjb25maWd1cmVkIHlvdXIgcHJlZmVyZW5jZXMgdG8gZW5qb3kgc2VhbWxlc3NseSB1cGdyYWRlZCB3b3Jrc3BhY2VzIGluIGdub21lIHNoZWxsXG5cblBsZWFzZSBkbyBub3QgbGVhdmUgYSBjb21tZW50IGZvciBpc3N1ZXMgYW5kIGluc3RlYWQgcmVwb3J0IGl0IGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9DdXN0b21pc2VkLVdvcmtzcGFjZXMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzZXRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NldHMiLAogICJuYW1lIjogIkN1c3RvbWlzZWQgV29ya3NwYWNlcyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJibGlwayIsCiAgInJlc291cmNlLXBhdGgiOiAiL29yZy9rcm9ub3NvdWwvd29ya3NldHMvIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvd29ya3NldHMvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9DdXN0b21pc2VkLVdvcmtzcGFjZXMiLAogICJ1dWlkIjogIndvcmtzZXRzQGJsaXBrLnh5eiIsCiAgInZlcnNpb24iOiA0Nwp9"}, "43": {"version": "47", "sha256": "0kgcp74ik8pn50h4s3c9ql5sl9bqf78s50vnrnkr7aih3k3ylbdd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIENob29zZSBhIGRpZmZlcmVudCBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBZb3VyIGRhc2ggd2lsbCBoYXZlIHVuaXF1ZSBmYXZvdXJpdGUgYXBwbGljYXRpb25zIG9uIGVhY2ggd29ya3NwYWNlXG4qIE9wdGlvbmFsbHkgaXNvbGF0ZSBydW5uaW5nIGFwcGxpY2F0aW9ucyB0byBvbmx5IGFwcGVhciBvbiB0aGUgZGFzaCBpbiB0aGVpciByZXNwZWN0aXZlIHdvcmtzcGFjZVxuKiBPcHRpb25hbGx5IHNob3cgd29ya3NwYWNlIGluZm9ybWF0aW9uIGFuZCBhY3Rpb25zIGluIHRoZSBvdmVydmlld1xuKiBTZXQgZWFjaCBjdXN0b21pc2VkIHdvcmtzcGFjZSB0byBhdXRvbG9hZCBvbiBzcGVjaWZpYyB3b3Jrc3BhY2VzXG4qIEhpZGUgdGhlIGV4dGVuc2lvbiBvbmNlIHlvdSd2ZSBjb25maWd1cmVkIHlvdXIgcHJlZmVyZW5jZXMgdG8gZW5qb3kgc2VhbWxlc3NseSB1cGdyYWRlZCB3b3Jrc3BhY2VzIGluIGdub21lIHNoZWxsXG5cblBsZWFzZSBkbyBub3QgbGVhdmUgYSBjb21tZW50IGZvciBpc3N1ZXMgYW5kIGluc3RlYWQgcmVwb3J0IGl0IGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9DdXN0b21pc2VkLVdvcmtzcGFjZXMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzZXRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NldHMiLAogICJuYW1lIjogIkN1c3RvbWlzZWQgV29ya3NwYWNlcyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJibGlwayIsCiAgInJlc291cmNlLXBhdGgiOiAiL29yZy9rcm9ub3NvdWwvd29ya3NldHMvIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvd29ya3NldHMvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9DdXN0b21pc2VkLVdvcmtzcGFjZXMiLAogICJ1dWlkIjogIndvcmtzZXRzQGJsaXBrLnh5eiIsCiAgInZlcnNpb24iOiA0Nwp9"}}} +, {"uuid": "worksets@blipk.xyz", "name": "Customised Workspaces", "pname": "worksets", "description": "Customised Workspaces enables creating isolated and customised workspaces.\n\n* Choose a different background image for each workspace\n* Your dash will have unique favourite applications on each workspace\n* Optionally isolate running applications to only appear on the dash in their respective workspace\n* Optionally show workspace information and actions in the overview\n* Set each customised workspace to autoload on specific workspaces\n* Hide the extension once you've configured your preferences to enjoy seamlessly upgraded workspaces in gnome shell\n\nPlease do not leave a comment for issues and instead report it here: https://github.com/blipk/Customised-Workspaces/issues", "link": "https://extensions.gnome.org/extension/1583/worksets/", "shell_version_map": {"38": {"version": "30", "sha256": "1z1yy47x20vqmjgghn91zs9nfs2g6f57nv4rzyi47bnklw7zsdcf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIENob29zZSBhIGRpZmZlcmVudCBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBZb3VyIGRhc2ggd2lsbCBoYXZlIHVuaXF1ZSBmYXZvdXJpdGUgYXBwbGljYXRpb25zIG9uIGVhY2ggd29ya3NwYWNlXG4qIE9wdGlvbmFsbHkgaXNvbGF0ZSBydW5uaW5nIGFwcGxpY2F0aW9ucyB0byBvbmx5IGFwcGVhciBvbiB0aGUgZGFzaCBpbiB0aGVpciByZXNwZWN0aXZlIHdvcmtzcGFjZVxuKiBPcHRpb25hbGx5IHNob3cgd29ya3NwYWNlIGluZm9ybWF0aW9uIGFuZCBhY3Rpb25zIGluIHRoZSBvdmVydmlld1xuKiBTZXQgZWFjaCBjdXN0b21pc2VkIHdvcmtzcGFjZSB0byBhdXRvbG9hZCBvbiBzcGVjaWZpYyB3b3Jrc3BhY2VzXG4qIEhpZGUgdGhlIGV4dGVuc2lvbiBvbmNlIHlvdSd2ZSBjb25maWd1cmVkIHlvdXIgcHJlZmVyZW5jZXMgdG8gZW5qb3kgc2VhbWxlc3NseSB1cGdyYWRlZCB3b3Jrc3BhY2VzIGluIGdub21lIHNoZWxsXG5cblBsZWFzZSBkbyBub3QgbGVhdmUgYSBjb21tZW50IGZvciBpc3N1ZXMgYW5kIGluc3RlYWQgcmVwb3J0IGl0IGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9DdXN0b21pc2VkLVdvcmtzcGFjZXMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzZXRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NldHMiLAogICJuYW1lIjogIkN1c3RvbWlzZWQgV29ya3NwYWNlcyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJhZG1pbkBrcm9ub3NvdWwueHl6IiwKICAicmVzb3VyY2UtcGF0aCI6ICIvb3JnL2tyb25vc291bC93b3Jrc2V0cy8iLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy93b3Jrc2V0cy8iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NldHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLmJldGEiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvQ3VzdG9taXNlZC1Xb3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ3b3Jrc2V0c0BibGlway54eXoiLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "40": {"version": "51", "sha256": "1jaq2sldksjll3c0wq7zg5m3hkgfzzm9qs4k1jfxdawvw4hi7mz8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIENob29zZSBhIGRpZmZlcmVudCBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBZb3VyIGRhc2ggd2lsbCBoYXZlIHVuaXF1ZSBmYXZvdXJpdGUgYXBwbGljYXRpb25zIG9uIGVhY2ggd29ya3NwYWNlXG4qIE9wdGlvbmFsbHkgaXNvbGF0ZSBydW5uaW5nIGFwcGxpY2F0aW9ucyB0byBvbmx5IGFwcGVhciBvbiB0aGUgZGFzaCBpbiB0aGVpciByZXNwZWN0aXZlIHdvcmtzcGFjZVxuKiBPcHRpb25hbGx5IHNob3cgd29ya3NwYWNlIGluZm9ybWF0aW9uIGFuZCBhY3Rpb25zIGluIHRoZSBvdmVydmlld1xuKiBTZXQgZWFjaCBjdXN0b21pc2VkIHdvcmtzcGFjZSB0byBhdXRvbG9hZCBvbiBzcGVjaWZpYyB3b3Jrc3BhY2VzXG4qIEhpZGUgdGhlIGV4dGVuc2lvbiBvbmNlIHlvdSd2ZSBjb25maWd1cmVkIHlvdXIgcHJlZmVyZW5jZXMgdG8gZW5qb3kgc2VhbWxlc3NseSB1cGdyYWRlZCB3b3Jrc3BhY2VzIGluIGdub21lIHNoZWxsXG5cblBsZWFzZSBkbyBub3QgbGVhdmUgYSBjb21tZW50IGZvciBpc3N1ZXMgYW5kIGluc3RlYWQgcmVwb3J0IGl0IGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9DdXN0b21pc2VkLVdvcmtzcGFjZXMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzZXRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NldHMiLAogICJuYW1lIjogIkN1c3RvbWlzZWQgV29ya3NwYWNlcyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJibGlwayIsCiAgInJlc291cmNlLXBhdGgiOiAiL29yZy9rcm9ub3NvdWwvd29ya3NldHMvIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvd29ya3NldHMvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsaXBrL0N1c3RvbWlzZWQtV29ya3NwYWNlcyIsCiAgInV1aWQiOiAid29ya3NldHNAYmxpcGsueHl6IiwKICAidmVyc2lvbiI6IDUxCn0="}, "41": {"version": "51", "sha256": "1jaq2sldksjll3c0wq7zg5m3hkgfzzm9qs4k1jfxdawvw4hi7mz8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIENob29zZSBhIGRpZmZlcmVudCBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBZb3VyIGRhc2ggd2lsbCBoYXZlIHVuaXF1ZSBmYXZvdXJpdGUgYXBwbGljYXRpb25zIG9uIGVhY2ggd29ya3NwYWNlXG4qIE9wdGlvbmFsbHkgaXNvbGF0ZSBydW5uaW5nIGFwcGxpY2F0aW9ucyB0byBvbmx5IGFwcGVhciBvbiB0aGUgZGFzaCBpbiB0aGVpciByZXNwZWN0aXZlIHdvcmtzcGFjZVxuKiBPcHRpb25hbGx5IHNob3cgd29ya3NwYWNlIGluZm9ybWF0aW9uIGFuZCBhY3Rpb25zIGluIHRoZSBvdmVydmlld1xuKiBTZXQgZWFjaCBjdXN0b21pc2VkIHdvcmtzcGFjZSB0byBhdXRvbG9hZCBvbiBzcGVjaWZpYyB3b3Jrc3BhY2VzXG4qIEhpZGUgdGhlIGV4dGVuc2lvbiBvbmNlIHlvdSd2ZSBjb25maWd1cmVkIHlvdXIgcHJlZmVyZW5jZXMgdG8gZW5qb3kgc2VhbWxlc3NseSB1cGdyYWRlZCB3b3Jrc3BhY2VzIGluIGdub21lIHNoZWxsXG5cblBsZWFzZSBkbyBub3QgbGVhdmUgYSBjb21tZW50IGZvciBpc3N1ZXMgYW5kIGluc3RlYWQgcmVwb3J0IGl0IGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9DdXN0b21pc2VkLVdvcmtzcGFjZXMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzZXRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NldHMiLAogICJuYW1lIjogIkN1c3RvbWlzZWQgV29ya3NwYWNlcyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJibGlwayIsCiAgInJlc291cmNlLXBhdGgiOiAiL29yZy9rcm9ub3NvdWwvd29ya3NldHMvIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvd29ya3NldHMvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsaXBrL0N1c3RvbWlzZWQtV29ya3NwYWNlcyIsCiAgInV1aWQiOiAid29ya3NldHNAYmxpcGsueHl6IiwKICAidmVyc2lvbiI6IDUxCn0="}, "42": {"version": "51", "sha256": "1jaq2sldksjll3c0wq7zg5m3hkgfzzm9qs4k1jfxdawvw4hi7mz8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIENob29zZSBhIGRpZmZlcmVudCBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBZb3VyIGRhc2ggd2lsbCBoYXZlIHVuaXF1ZSBmYXZvdXJpdGUgYXBwbGljYXRpb25zIG9uIGVhY2ggd29ya3NwYWNlXG4qIE9wdGlvbmFsbHkgaXNvbGF0ZSBydW5uaW5nIGFwcGxpY2F0aW9ucyB0byBvbmx5IGFwcGVhciBvbiB0aGUgZGFzaCBpbiB0aGVpciByZXNwZWN0aXZlIHdvcmtzcGFjZVxuKiBPcHRpb25hbGx5IHNob3cgd29ya3NwYWNlIGluZm9ybWF0aW9uIGFuZCBhY3Rpb25zIGluIHRoZSBvdmVydmlld1xuKiBTZXQgZWFjaCBjdXN0b21pc2VkIHdvcmtzcGFjZSB0byBhdXRvbG9hZCBvbiBzcGVjaWZpYyB3b3Jrc3BhY2VzXG4qIEhpZGUgdGhlIGV4dGVuc2lvbiBvbmNlIHlvdSd2ZSBjb25maWd1cmVkIHlvdXIgcHJlZmVyZW5jZXMgdG8gZW5qb3kgc2VhbWxlc3NseSB1cGdyYWRlZCB3b3Jrc3BhY2VzIGluIGdub21lIHNoZWxsXG5cblBsZWFzZSBkbyBub3QgbGVhdmUgYSBjb21tZW50IGZvciBpc3N1ZXMgYW5kIGluc3RlYWQgcmVwb3J0IGl0IGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9DdXN0b21pc2VkLVdvcmtzcGFjZXMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzZXRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NldHMiLAogICJuYW1lIjogIkN1c3RvbWlzZWQgV29ya3NwYWNlcyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJibGlwayIsCiAgInJlc291cmNlLXBhdGgiOiAiL29yZy9rcm9ub3NvdWwvd29ya3NldHMvIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvd29ya3NldHMvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsaXBrL0N1c3RvbWlzZWQtV29ya3NwYWNlcyIsCiAgInV1aWQiOiAid29ya3NldHNAYmxpcGsueHl6IiwKICAidmVyc2lvbiI6IDUxCn0="}, "43": {"version": "51", "sha256": "1jaq2sldksjll3c0wq7zg5m3hkgfzzm9qs4k1jfxdawvw4hi7mz8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIENob29zZSBhIGRpZmZlcmVudCBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBZb3VyIGRhc2ggd2lsbCBoYXZlIHVuaXF1ZSBmYXZvdXJpdGUgYXBwbGljYXRpb25zIG9uIGVhY2ggd29ya3NwYWNlXG4qIE9wdGlvbmFsbHkgaXNvbGF0ZSBydW5uaW5nIGFwcGxpY2F0aW9ucyB0byBvbmx5IGFwcGVhciBvbiB0aGUgZGFzaCBpbiB0aGVpciByZXNwZWN0aXZlIHdvcmtzcGFjZVxuKiBPcHRpb25hbGx5IHNob3cgd29ya3NwYWNlIGluZm9ybWF0aW9uIGFuZCBhY3Rpb25zIGluIHRoZSBvdmVydmlld1xuKiBTZXQgZWFjaCBjdXN0b21pc2VkIHdvcmtzcGFjZSB0byBhdXRvbG9hZCBvbiBzcGVjaWZpYyB3b3Jrc3BhY2VzXG4qIEhpZGUgdGhlIGV4dGVuc2lvbiBvbmNlIHlvdSd2ZSBjb25maWd1cmVkIHlvdXIgcHJlZmVyZW5jZXMgdG8gZW5qb3kgc2VhbWxlc3NseSB1cGdyYWRlZCB3b3Jrc3BhY2VzIGluIGdub21lIHNoZWxsXG5cblBsZWFzZSBkbyBub3QgbGVhdmUgYSBjb21tZW50IGZvciBpc3N1ZXMgYW5kIGluc3RlYWQgcmVwb3J0IGl0IGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9DdXN0b21pc2VkLVdvcmtzcGFjZXMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzZXRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NldHMiLAogICJuYW1lIjogIkN1c3RvbWlzZWQgV29ya3NwYWNlcyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJibGlwayIsCiAgInJlc291cmNlLXBhdGgiOiAiL29yZy9rcm9ub3NvdWwvd29ya3NldHMvIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvd29ya3NldHMvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsaXBrL0N1c3RvbWlzZWQtV29ya3NwYWNlcyIsCiAgInV1aWQiOiAid29ya3NldHNAYmxpcGsueHl6IiwKICAidmVyc2lvbiI6IDUxCn0="}}} , {"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": "24", "sha256": "031z1p545bvw2d0wg62d416dvjsbd0d1am32g7dqnw2p4fzb061j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBvbiB0aGUgbW9uaXRvcnNcblxuSG90a2V5czpcbiBDdHJsK0FsdCsxIENhc2NhZGUgd2luZG93c1xuIEN0cmwrQWx0KzIgVGlsaW5nIHdpbmRvd3NcbiBDdHJsK0FsdCszIFNpZGUgYnkgc2lkZSB3aW5kb3dzXG4gQ3RybCtBbHQrNCBTdGFjayB3aW5kb3dzIiwKICAibmFtZSI6ICJBcnJhbmdlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXJyYW5nZVdpbmRvd3MiLAogICJ1dWlkIjogImFycmFuZ2VXaW5kb3dzQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "40": {"version": "24", "sha256": "031z1p545bvw2d0wg62d416dvjsbd0d1am32g7dqnw2p4fzb061j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBvbiB0aGUgbW9uaXRvcnNcblxuSG90a2V5czpcbiBDdHJsK0FsdCsxIENhc2NhZGUgd2luZG93c1xuIEN0cmwrQWx0KzIgVGlsaW5nIHdpbmRvd3NcbiBDdHJsK0FsdCszIFNpZGUgYnkgc2lkZSB3aW5kb3dzXG4gQ3RybCtBbHQrNCBTdGFjayB3aW5kb3dzIiwKICAibmFtZSI6ICJBcnJhbmdlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXJyYW5nZVdpbmRvd3MiLAogICJ1dWlkIjogImFycmFuZ2VXaW5kb3dzQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "41": {"version": "24", "sha256": "031z1p545bvw2d0wg62d416dvjsbd0d1am32g7dqnw2p4fzb061j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBvbiB0aGUgbW9uaXRvcnNcblxuSG90a2V5czpcbiBDdHJsK0FsdCsxIENhc2NhZGUgd2luZG93c1xuIEN0cmwrQWx0KzIgVGlsaW5nIHdpbmRvd3NcbiBDdHJsK0FsdCszIFNpZGUgYnkgc2lkZSB3aW5kb3dzXG4gQ3RybCtBbHQrNCBTdGFjayB3aW5kb3dzIiwKICAibmFtZSI6ICJBcnJhbmdlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXJyYW5nZVdpbmRvd3MiLAogICJ1dWlkIjogImFycmFuZ2VXaW5kb3dzQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "42": {"version": "24", "sha256": "031z1p545bvw2d0wg62d416dvjsbd0d1am32g7dqnw2p4fzb061j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBvbiB0aGUgbW9uaXRvcnNcblxuSG90a2V5czpcbiBDdHJsK0FsdCsxIENhc2NhZGUgd2luZG93c1xuIEN0cmwrQWx0KzIgVGlsaW5nIHdpbmRvd3NcbiBDdHJsK0FsdCszIFNpZGUgYnkgc2lkZSB3aW5kb3dzXG4gQ3RybCtBbHQrNCBTdGFjayB3aW5kb3dzIiwKICAibmFtZSI6ICJBcnJhbmdlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXJyYW5nZVdpbmRvd3MiLAogICJ1dWlkIjogImFycmFuZ2VXaW5kb3dzQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "43": {"version": "24", "sha256": "031z1p545bvw2d0wg62d416dvjsbd0d1am32g7dqnw2p4fzb061j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBvbiB0aGUgbW9uaXRvcnNcblxuSG90a2V5czpcbiBDdHJsK0FsdCsxIENhc2NhZGUgd2luZG93c1xuIEN0cmwrQWx0KzIgVGlsaW5nIHdpbmRvd3NcbiBDdHJsK0FsdCszIFNpZGUgYnkgc2lkZSB3aW5kb3dzXG4gQ3RybCtBbHQrNCBTdGFjayB3aW5kb3dzIiwKICAibmFtZSI6ICJBcnJhbmdlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXJyYW5nZVdpbmRvd3MiLAogICJ1dWlkIjogImFycmFuZ2VXaW5kb3dzQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="}}} , {"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": "6", "sha256": "00klclxdknknbv30acqsgzz43wsbp8gxmfgammm1xjg9kncp030j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgYWxsIG5vdGlmaWNhdGlvbnMgaW4gZnVsbHNjcmVlbiBtb2RlIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIE5vdGlmaWNhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zb2FsL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mdWxsc2NyZWVuLW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tbm90aWZpY2F0aW9uc0Bzb3Jyb3cuYWJvdXQuYWxpY2UucG0ubWUiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "7", "sha256": "182sxw90kds36m3wr42kp92vl5adrw5a4rd1dgyl8xc2dgib667d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgYWxsIG5vdGlmaWNhdGlvbnMgaW4gZnVsbHNjcmVlbiBtb2RlIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIE5vdGlmaWNhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zb2FsL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mdWxsc2NyZWVuLW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tbm90aWZpY2F0aW9uc0Bzb3Jyb3cuYWJvdXQuYWxpY2UucG0ubWUiLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "182sxw90kds36m3wr42kp92vl5adrw5a4rd1dgyl8xc2dgib667d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgYWxsIG5vdGlmaWNhdGlvbnMgaW4gZnVsbHNjcmVlbiBtb2RlIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIE5vdGlmaWNhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zb2FsL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mdWxsc2NyZWVuLW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tbm90aWZpY2F0aW9uc0Bzb3Jyb3cuYWJvdXQuYWxpY2UucG0ubWUiLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "182sxw90kds36m3wr42kp92vl5adrw5a4rd1dgyl8xc2dgib667d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgYWxsIG5vdGlmaWNhdGlvbnMgaW4gZnVsbHNjcmVlbiBtb2RlIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIE5vdGlmaWNhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zb2FsL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mdWxsc2NyZWVuLW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tbm90aWZpY2F0aW9uc0Bzb3Jyb3cuYWJvdXQuYWxpY2UucG0ubWUiLAogICJ2ZXJzaW9uIjogNwp9"}}} @@ -242,8 +242,8 @@ , {"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": "11", "sha256": "1w8rda3295ycj5173ryd5q8x7pff6hhnc4ydhjlaqgvrlczk5rxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgTEFOIElQIGFkZHJlc3Mgb24gR05PTUUgcGFuZWwuIERvIG5vdCBzaG93IGxvb3BiYWNrIGFkZHJlc3NlcyAoMTI3LjAuMC4wLzgpIG9yIERvY2tlciBuZXR3b3Jrcy4iLAogICJuYW1lIjogIkxBTiBJUCBBZGRyZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0pvc2hvbGl0aC9nbm9tZS1leHRlbnNpb24tbGFuLWlwLWFkZHJlc3MiLAogICJ1dWlkIjogImxhbi1pcC1hZGRyZXNzQG1yaHViZXIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "1w8rda3295ycj5173ryd5q8x7pff6hhnc4ydhjlaqgvrlczk5rxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgTEFOIElQIGFkZHJlc3Mgb24gR05PTUUgcGFuZWwuIERvIG5vdCBzaG93IGxvb3BiYWNrIGFkZHJlc3NlcyAoMTI3LjAuMC4wLzgpIG9yIERvY2tlciBuZXR3b3Jrcy4iLAogICJuYW1lIjogIkxBTiBJUCBBZGRyZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0pvc2hvbGl0aC9nbm9tZS1leHRlbnNpb24tbGFuLWlwLWFkZHJlc3MiLAogICJ1dWlkIjogImxhbi1pcC1hZGRyZXNzQG1yaHViZXIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "1w8rda3295ycj5173ryd5q8x7pff6hhnc4ydhjlaqgvrlczk5rxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgTEFOIElQIGFkZHJlc3Mgb24gR05PTUUgcGFuZWwuIERvIG5vdCBzaG93IGxvb3BiYWNrIGFkZHJlc3NlcyAoMTI3LjAuMC4wLzgpIG9yIERvY2tlciBuZXR3b3Jrcy4iLAogICJuYW1lIjogIkxBTiBJUCBBZGRyZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0pvc2hvbGl0aC9nbm9tZS1leHRlbnNpb24tbGFuLWlwLWFkZHJlc3MiLAogICJ1dWlkIjogImxhbi1pcC1hZGRyZXNzQG1yaHViZXIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "11", "sha256": "1w8rda3295ycj5173ryd5q8x7pff6hhnc4ydhjlaqgvrlczk5rxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgTEFOIElQIGFkZHJlc3Mgb24gR05PTUUgcGFuZWwuIERvIG5vdCBzaG93IGxvb3BiYWNrIGFkZHJlc3NlcyAoMTI3LjAuMC4wLzgpIG9yIERvY2tlciBuZXR3b3Jrcy4iLAogICJuYW1lIjogIkxBTiBJUCBBZGRyZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0pvc2hvbGl0aC9nbm9tZS1leHRlbnNpb24tbGFuLWlwLWFkZHJlc3MiLAogICJ1dWlkIjogImxhbi1pcC1hZGRyZXNzQG1yaHViZXIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"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="}}} -, {"uuid": "colortint@matt.serverus.co.uk", "name": "ColorTint", "pname": "colortint", "description": "Tint your desktop with a color of your choice to help with dyslexia, scopic sensitivity, and related conditions.", "link": "https://extensions.gnome.org/extension/1789/colortint/", "shell_version_map": {"38": {"version": "12", "sha256": "0sschclbnazzcvpl108iaz43gh0npd38ip9534q0v4sb2ai9xvcn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJuYW1lIjogIkNvbG9yVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdHRCeU5hbWUvY29sb3ItdGludCIsCiAgInV1aWQiOiAiY29sb3J0aW50QG1hdHQuc2VydmVydXMuY28udWsiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "40": {"version": "12", "sha256": "0sschclbnazzcvpl108iaz43gh0npd38ip9534q0v4sb2ai9xvcn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJuYW1lIjogIkNvbG9yVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdHRCeU5hbWUvY29sb3ItdGludCIsCiAgInV1aWQiOiAiY29sb3J0aW50QG1hdHQuc2VydmVydXMuY28udWsiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "41": {"version": "12", "sha256": "0sschclbnazzcvpl108iaz43gh0npd38ip9534q0v4sb2ai9xvcn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJuYW1lIjogIkNvbG9yVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdHRCeU5hbWUvY29sb3ItdGludCIsCiAgInV1aWQiOiAiY29sb3J0aW50QG1hdHQuc2VydmVydXMuY28udWsiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "42": {"version": "12", "sha256": "0sschclbnazzcvpl108iaz43gh0npd38ip9534q0v4sb2ai9xvcn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJuYW1lIjogIkNvbG9yVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdHRCeU5hbWUvY29sb3ItdGludCIsCiAgInV1aWQiOiAiY29sb3J0aW50QG1hdHQuc2VydmVydXMuY28udWsiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}}} -, {"uuid": "sermon@rovellipaolo-gmail.com", "name": "SerMon: Service Monitor", "pname": "sermon", "description": "SerMon: an extension for monitoring and managing systemd services, cron jobs, docker and podman containers", "link": "https://extensions.gnome.org/extension/1804/sermon/", "shell_version_map": {"38": {"version": "19", "sha256": "1ln6yksbn3ximq69hi8nzkb0c76xyzgbbwiwb36rinzxng1zdg4k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlck1vbjogYW4gZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGFuZCBtYW5hZ2luZyBzeXN0ZW1kIHNlcnZpY2VzLCBjcm9uIGpvYnMsIGRvY2tlciBhbmQgcG9kbWFuIGNvbnRhaW5lcnMiLAogICJuYW1lIjogIlNlck1vbjogU2VydmljZSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlcm1vbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JvdmVsbGlwYW9sby9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2VybW9uIiwKICAidXVpZCI6ICJzZXJtb25Acm92ZWxsaXBhb2xvLWdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "40": {"version": "19", "sha256": "1ln6yksbn3ximq69hi8nzkb0c76xyzgbbwiwb36rinzxng1zdg4k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlck1vbjogYW4gZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGFuZCBtYW5hZ2luZyBzeXN0ZW1kIHNlcnZpY2VzLCBjcm9uIGpvYnMsIGRvY2tlciBhbmQgcG9kbWFuIGNvbnRhaW5lcnMiLAogICJuYW1lIjogIlNlck1vbjogU2VydmljZSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlcm1vbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JvdmVsbGlwYW9sby9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2VybW9uIiwKICAidXVpZCI6ICJzZXJtb25Acm92ZWxsaXBhb2xvLWdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "41": {"version": "19", "sha256": "1ln6yksbn3ximq69hi8nzkb0c76xyzgbbwiwb36rinzxng1zdg4k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlck1vbjogYW4gZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGFuZCBtYW5hZ2luZyBzeXN0ZW1kIHNlcnZpY2VzLCBjcm9uIGpvYnMsIGRvY2tlciBhbmQgcG9kbWFuIGNvbnRhaW5lcnMiLAogICJuYW1lIjogIlNlck1vbjogU2VydmljZSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlcm1vbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JvdmVsbGlwYW9sby9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2VybW9uIiwKICAidXVpZCI6ICJzZXJtb25Acm92ZWxsaXBhb2xvLWdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "42": {"version": "19", "sha256": "1ln6yksbn3ximq69hi8nzkb0c76xyzgbbwiwb36rinzxng1zdg4k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlck1vbjogYW4gZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGFuZCBtYW5hZ2luZyBzeXN0ZW1kIHNlcnZpY2VzLCBjcm9uIGpvYnMsIGRvY2tlciBhbmQgcG9kbWFuIGNvbnRhaW5lcnMiLAogICJuYW1lIjogIlNlck1vbjogU2VydmljZSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlcm1vbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JvdmVsbGlwYW9sby9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2VybW9uIiwKICAidXVpZCI6ICJzZXJtb25Acm92ZWxsaXBhb2xvLWdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}}} +, {"uuid": "colortint@matt.serverus.co.uk", "name": "ColorTint", "pname": "colortint", "description": "Tint your desktop with a color of your choice to help with dyslexia, scopic sensitivity, and related conditions.", "link": "https://extensions.gnome.org/extension/1789/colortint/", "shell_version_map": {"38": {"version": "14", "sha256": "09ayk3xwywbisgazhfnzv0ka0xpakskjqa6g4awkwrjdlxd450rs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJuYW1lIjogIkNvbG9yVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXR0QnlOYW1lL2NvbG9yLXRpbnQiLAogICJ1dWlkIjogImNvbG9ydGludEBtYXR0LnNlcnZlcnVzLmNvLnVrIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "40": {"version": "14", "sha256": "09ayk3xwywbisgazhfnzv0ka0xpakskjqa6g4awkwrjdlxd450rs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJuYW1lIjogIkNvbG9yVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXR0QnlOYW1lL2NvbG9yLXRpbnQiLAogICJ1dWlkIjogImNvbG9ydGludEBtYXR0LnNlcnZlcnVzLmNvLnVrIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "09ayk3xwywbisgazhfnzv0ka0xpakskjqa6g4awkwrjdlxd450rs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJuYW1lIjogIkNvbG9yVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXR0QnlOYW1lL2NvbG9yLXRpbnQiLAogICJ1dWlkIjogImNvbG9ydGludEBtYXR0LnNlcnZlcnVzLmNvLnVrIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "17", "sha256": "1xl85i0j7idkcx923zfy06l6c97lnrdnvgphind64qswfsk0hgaa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJuYW1lIjogIkNvbG9yVGludCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvcnRpbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdHRCeU5hbWUvY29sb3ItdGludCIsCiAgInV1aWQiOiAiY29sb3J0aW50QG1hdHQuc2VydmVydXMuY28udWsiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "43": {"version": "17", "sha256": "1xl85i0j7idkcx923zfy06l6c97lnrdnvgphind64qswfsk0hgaa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJuYW1lIjogIkNvbG9yVGludCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvcnRpbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdHRCeU5hbWUvY29sb3ItdGludCIsCiAgInV1aWQiOiAiY29sb3J0aW50QG1hdHQuc2VydmVydXMuY28udWsiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} +, {"uuid": "sermon@rovellipaolo-gmail.com", "name": "SerMon: Service Monitor", "pname": "sermon", "description": "SerMon: an extension for monitoring and managing systemd services, cron jobs, docker and podman containers", "link": "https://extensions.gnome.org/extension/1804/sermon/", "shell_version_map": {"38": {"version": "22", "sha256": "1pa8pg4z5hawwmgfgi5wdgqkkl6742m01gwvsii7xrgbzwgmj22z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlck1vbjogYW4gZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGFuZCBtYW5hZ2luZyBzeXN0ZW1kIHNlcnZpY2VzLCBjcm9uIGpvYnMsIGRvY2tlciBhbmQgcG9kbWFuIGNvbnRhaW5lcnMiLAogICJuYW1lIjogIlNlck1vbjogU2VydmljZSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlcm1vbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yb3ZlbGxpcGFvbG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNlcm1vbiIsCiAgInV1aWQiOiAic2VybW9uQHJvdmVsbGlwYW9sby1nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "40": {"version": "22", "sha256": "1pa8pg4z5hawwmgfgi5wdgqkkl6742m01gwvsii7xrgbzwgmj22z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlck1vbjogYW4gZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGFuZCBtYW5hZ2luZyBzeXN0ZW1kIHNlcnZpY2VzLCBjcm9uIGpvYnMsIGRvY2tlciBhbmQgcG9kbWFuIGNvbnRhaW5lcnMiLAogICJuYW1lIjogIlNlck1vbjogU2VydmljZSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlcm1vbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yb3ZlbGxpcGFvbG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNlcm1vbiIsCiAgInV1aWQiOiAic2VybW9uQHJvdmVsbGlwYW9sby1nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "41": {"version": "22", "sha256": "1pa8pg4z5hawwmgfgi5wdgqkkl6742m01gwvsii7xrgbzwgmj22z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlck1vbjogYW4gZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGFuZCBtYW5hZ2luZyBzeXN0ZW1kIHNlcnZpY2VzLCBjcm9uIGpvYnMsIGRvY2tlciBhbmQgcG9kbWFuIGNvbnRhaW5lcnMiLAogICJuYW1lIjogIlNlck1vbjogU2VydmljZSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlcm1vbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yb3ZlbGxpcGFvbG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNlcm1vbiIsCiAgInV1aWQiOiAic2VybW9uQHJvdmVsbGlwYW9sby1nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "1pa8pg4z5hawwmgfgi5wdgqkkl6742m01gwvsii7xrgbzwgmj22z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlck1vbjogYW4gZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGFuZCBtYW5hZ2luZyBzeXN0ZW1kIHNlcnZpY2VzLCBjcm9uIGpvYnMsIGRvY2tlciBhbmQgcG9kbWFuIGNvbnRhaW5lcnMiLAogICJuYW1lIjogIlNlck1vbjogU2VydmljZSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlcm1vbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yb3ZlbGxpcGFvbG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNlcm1vbiIsCiAgInV1aWQiOiAic2VybW9uQHJvdmVsbGlwYW9sby1nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "22", "sha256": "1pa8pg4z5hawwmgfgi5wdgqkkl6742m01gwvsii7xrgbzwgmj22z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlck1vbjogYW4gZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGFuZCBtYW5hZ2luZyBzeXN0ZW1kIHNlcnZpY2VzLCBjcm9uIGpvYnMsIGRvY2tlciBhbmQgcG9kbWFuIGNvbnRhaW5lcnMiLAogICJuYW1lIjogIlNlck1vbjogU2VydmljZSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlcm1vbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yb3ZlbGxpcGFvbG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNlcm1vbiIsCiAgInV1aWQiOiAic2VybW9uQHJvdmVsbGlwYW9sby1nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} , {"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": "39", "sha256": "1dgnx3vpqgmpl9vr7bli7aifyr367jifbqyxjdb0ygqd7j4fav5f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpY3QiLAogICJ1dWlkIjogImRpY3RAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="}, "41": {"version": "39", "sha256": "1dgnx3vpqgmpl9vr7bli7aifyr367jifbqyxjdb0ygqd7j4fav5f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpY3QiLAogICJ1dWlkIjogImRpY3RAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="}, "42": {"version": "39", "sha256": "1dgnx3vpqgmpl9vr7bli7aifyr367jifbqyxjdb0ygqd7j4fav5f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpY3QiLAogICJ1dWlkIjogImRpY3RAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="}, "43": {"version": "43", "sha256": "10616nlscy2qdqskafvza2lp0bw963m38srzmmaqbqiry0rd5ifs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaWN0IiwKICAidXVpZCI6ICJkaWN0QHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}}} , {"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": "7", "sha256": "1vkrwbdqgpbs5m6gq7awar53bflr59a1c3lgr3g642gswdnr2230", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBpbmRpY2F0b3IgZm9yIEdhbWVNb2RlIiwKICAiZXh0ZW5zaW9uLWlkIjogImdhbWVtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJHYW1lTW9kZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJja2VsbG5lckByZWRoYXQuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdhbWVtb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2ljbW8vZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnYW1lbW9kZUBjaHJpc3RpYW4ua2VsbG5lci5tZSIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "1vkrwbdqgpbs5m6gq7awar53bflr59a1c3lgr3g642gswdnr2230", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBpbmRpY2F0b3IgZm9yIEdhbWVNb2RlIiwKICAiZXh0ZW5zaW9uLWlkIjogImdhbWVtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJHYW1lTW9kZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJja2VsbG5lckByZWRoYXQuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdhbWVtb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2ljbW8vZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnYW1lbW9kZUBjaHJpc3RpYW4ua2VsbG5lci5tZSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1vkrwbdqgpbs5m6gq7awar53bflr59a1c3lgr3g642gswdnr2230", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBpbmRpY2F0b3IgZm9yIEdhbWVNb2RlIiwKICAiZXh0ZW5zaW9uLWlkIjogImdhbWVtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJHYW1lTW9kZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJja2VsbG5lckByZWRoYXQuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdhbWVtb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2ljbW8vZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnYW1lbW9kZUBjaHJpc3RpYW4ua2VsbG5lci5tZSIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "7", "sha256": "1vkrwbdqgpbs5m6gq7awar53bflr59a1c3lgr3g642gswdnr2230", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBpbmRpY2F0b3IgZm9yIEdhbWVNb2RlIiwKICAiZXh0ZW5zaW9uLWlkIjogImdhbWVtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJHYW1lTW9kZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJja2VsbG5lckByZWRoYXQuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdhbWVtb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2ljbW8vZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnYW1lbW9kZUBjaHJpc3RpYW4ua2VsbG5lci5tZSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "unredirect@vaina.lt", "name": "Disable unredirect fullscreen windows", "pname": "disable-unredirect-fullscreen-windows", "description": "Disables unredirect fullscreen windows in gnome-shell to workaround https://bugzilla.redhat.com/show_bug.cgi?id=767397 and https://bugzilla.gnome.org/show_bug.cgi?id=738719", "link": "https://extensions.gnome.org/extension/1873/disable-unredirect-fullscreen-windows/", "shell_version_map": {"38": {"version": "6", "sha256": "194kzkhi4k0hkv3p2wbnnfadzjchd7b6da809kr7ggsdc1sd04r6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tL3Nob3dfYnVnLmNnaT9pZD03NjczOTcgYW5kIGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNnaT9pZD03Mzg3MTkiLAogICJuYW1lIjogIkRpc2FibGUgdW5yZWRpcmVjdCBmdWxsc2NyZWVuIHdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYXp5c21hc3Rlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGlzYWJsZS11bnJlZGlyZWN0IiwKICAidXVpZCI6ICJ1bnJlZGlyZWN0QHZhaW5hLmx0IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "194kzkhi4k0hkv3p2wbnnfadzjchd7b6da809kr7ggsdc1sd04r6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tL3Nob3dfYnVnLmNnaT9pZD03NjczOTcgYW5kIGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNnaT9pZD03Mzg3MTkiLAogICJuYW1lIjogIkRpc2FibGUgdW5yZWRpcmVjdCBmdWxsc2NyZWVuIHdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYXp5c21hc3Rlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGlzYWJsZS11bnJlZGlyZWN0IiwKICAidXVpZCI6ICJ1bnJlZGlyZWN0QHZhaW5hLmx0IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "194kzkhi4k0hkv3p2wbnnfadzjchd7b6da809kr7ggsdc1sd04r6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tL3Nob3dfYnVnLmNnaT9pZD03NjczOTcgYW5kIGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNnaT9pZD03Mzg3MTkiLAogICJuYW1lIjogIkRpc2FibGUgdW5yZWRpcmVjdCBmdWxsc2NyZWVuIHdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYXp5c21hc3Rlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGlzYWJsZS11bnJlZGlyZWN0IiwKICAidXVpZCI6ICJ1bnJlZGlyZWN0QHZhaW5hLmx0IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "194kzkhi4k0hkv3p2wbnnfadzjchd7b6da809kr7ggsdc1sd04r6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tL3Nob3dfYnVnLmNnaT9pZD03NjczOTcgYW5kIGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNnaT9pZD03Mzg3MTkiLAogICJuYW1lIjogIkRpc2FibGUgdW5yZWRpcmVjdCBmdWxsc2NyZWVuIHdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYXp5c21hc3Rlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGlzYWJsZS11bnJlZGlyZWN0IiwKICAidXVpZCI6ICJ1bnJlZGlyZWN0QHZhaW5hLmx0IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "43": {"version": "6", "sha256": "194kzkhi4k0hkv3p2wbnnfadzjchd7b6da809kr7ggsdc1sd04r6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tL3Nob3dfYnVnLmNnaT9pZD03NjczOTcgYW5kIGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNnaT9pZD03Mzg3MTkiLAogICJuYW1lIjogIkRpc2FibGUgdW5yZWRpcmVjdCBmdWxsc2NyZWVuIHdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYXp5c21hc3Rlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGlzYWJsZS11bnJlZGlyZWN0IiwKICAidXVpZCI6ICJ1bnJlZGlyZWN0QHZhaW5hLmx0IiwKICAidmVyc2lvbiI6IDYKfQ=="}}} @@ -251,10 +251,10 @@ , {"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": "26", "sha256": "0jiys746bz0knqlh7yxmdd3839jkmsdjzpbchgigbwrd4ya67fsp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBhcHBsaWNhdGlvbiB2aWV3IHdoZW4gdGhlIHdvcmtzcGFjZSBpcyBvciBiZWNvbWVzIGVtcHR5LCBzdWNoIGFzIHN3aXRjaGluZyB0byBhbiBlbXB0eSB3b3Jrc3BhY2UsIHdoZW4gYWxsIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2UgYXJlIGNsb3NlZCwgb3IgYWZ0ZXIgbG9naW4uIFN0YXJ0aW5nIGFwcGxpY2F0aW9ucyBvciBzd2l0Y2hpbmcgdG8gYSB3b3Jrc3BhY2Ugd2l0aCBvcGVuIHdpbmRvd3Mgd2lsbCBoaWRlIHRoZSBhcHBsaWNhdGlvbiB2aWV3IGlmIGl0J3Mgc2hvd2luZy5cbkZyb20gdmVyc2lvbiAyMiwgdGhpcyBleHRlbnNpb24gd2FpdHMgZm9yIGFueSB3aW5kb3cgY2xvc2luZyBhbmltYXRpb24gdG8gY29tcGxldGUgKGlmIGVuYWJsZWQpIGJlZm9yZSBzaG93aW5nIHRoZSBhcHBsaWNhdGlvbiB2aWV3LiIsCiAgIm5hbWUiOiAiU2hvdyBBcHBsaWNhdGlvbiBWaWV3IFdoZW4gV29ya3NwYWNlIEVtcHR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFwcGxpY2F0aW9uX3ZpZXdfd2hlbl9lbXB0eUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyNgp9"}, "40": {"version": "26", "sha256": "0jiys746bz0knqlh7yxmdd3839jkmsdjzpbchgigbwrd4ya67fsp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBhcHBsaWNhdGlvbiB2aWV3IHdoZW4gdGhlIHdvcmtzcGFjZSBpcyBvciBiZWNvbWVzIGVtcHR5LCBzdWNoIGFzIHN3aXRjaGluZyB0byBhbiBlbXB0eSB3b3Jrc3BhY2UsIHdoZW4gYWxsIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2UgYXJlIGNsb3NlZCwgb3IgYWZ0ZXIgbG9naW4uIFN0YXJ0aW5nIGFwcGxpY2F0aW9ucyBvciBzd2l0Y2hpbmcgdG8gYSB3b3Jrc3BhY2Ugd2l0aCBvcGVuIHdpbmRvd3Mgd2lsbCBoaWRlIHRoZSBhcHBsaWNhdGlvbiB2aWV3IGlmIGl0J3Mgc2hvd2luZy5cbkZyb20gdmVyc2lvbiAyMiwgdGhpcyBleHRlbnNpb24gd2FpdHMgZm9yIGFueSB3aW5kb3cgY2xvc2luZyBhbmltYXRpb24gdG8gY29tcGxldGUgKGlmIGVuYWJsZWQpIGJlZm9yZSBzaG93aW5nIHRoZSBhcHBsaWNhdGlvbiB2aWV3LiIsCiAgIm5hbWUiOiAiU2hvdyBBcHBsaWNhdGlvbiBWaWV3IFdoZW4gV29ya3NwYWNlIEVtcHR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFwcGxpY2F0aW9uX3ZpZXdfd2hlbl9lbXB0eUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyNgp9"}, "41": {"version": "26", "sha256": "0jiys746bz0knqlh7yxmdd3839jkmsdjzpbchgigbwrd4ya67fsp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBhcHBsaWNhdGlvbiB2aWV3IHdoZW4gdGhlIHdvcmtzcGFjZSBpcyBvciBiZWNvbWVzIGVtcHR5LCBzdWNoIGFzIHN3aXRjaGluZyB0byBhbiBlbXB0eSB3b3Jrc3BhY2UsIHdoZW4gYWxsIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2UgYXJlIGNsb3NlZCwgb3IgYWZ0ZXIgbG9naW4uIFN0YXJ0aW5nIGFwcGxpY2F0aW9ucyBvciBzd2l0Y2hpbmcgdG8gYSB3b3Jrc3BhY2Ugd2l0aCBvcGVuIHdpbmRvd3Mgd2lsbCBoaWRlIHRoZSBhcHBsaWNhdGlvbiB2aWV3IGlmIGl0J3Mgc2hvd2luZy5cbkZyb20gdmVyc2lvbiAyMiwgdGhpcyBleHRlbnNpb24gd2FpdHMgZm9yIGFueSB3aW5kb3cgY2xvc2luZyBhbmltYXRpb24gdG8gY29tcGxldGUgKGlmIGVuYWJsZWQpIGJlZm9yZSBzaG93aW5nIHRoZSBhcHBsaWNhdGlvbiB2aWV3LiIsCiAgIm5hbWUiOiAiU2hvdyBBcHBsaWNhdGlvbiBWaWV3IFdoZW4gV29ya3NwYWNlIEVtcHR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFwcGxpY2F0aW9uX3ZpZXdfd2hlbl9lbXB0eUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyNgp9"}, "42": {"version": "26", "sha256": "0jiys746bz0knqlh7yxmdd3839jkmsdjzpbchgigbwrd4ya67fsp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBhcHBsaWNhdGlvbiB2aWV3IHdoZW4gdGhlIHdvcmtzcGFjZSBpcyBvciBiZWNvbWVzIGVtcHR5LCBzdWNoIGFzIHN3aXRjaGluZyB0byBhbiBlbXB0eSB3b3Jrc3BhY2UsIHdoZW4gYWxsIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2UgYXJlIGNsb3NlZCwgb3IgYWZ0ZXIgbG9naW4uIFN0YXJ0aW5nIGFwcGxpY2F0aW9ucyBvciBzd2l0Y2hpbmcgdG8gYSB3b3Jrc3BhY2Ugd2l0aCBvcGVuIHdpbmRvd3Mgd2lsbCBoaWRlIHRoZSBhcHBsaWNhdGlvbiB2aWV3IGlmIGl0J3Mgc2hvd2luZy5cbkZyb20gdmVyc2lvbiAyMiwgdGhpcyBleHRlbnNpb24gd2FpdHMgZm9yIGFueSB3aW5kb3cgY2xvc2luZyBhbmltYXRpb24gdG8gY29tcGxldGUgKGlmIGVuYWJsZWQpIGJlZm9yZSBzaG93aW5nIHRoZSBhcHBsaWNhdGlvbiB2aWV3LiIsCiAgIm5hbWUiOiAiU2hvdyBBcHBsaWNhdGlvbiBWaWV3IFdoZW4gV29ya3NwYWNlIEVtcHR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFwcGxpY2F0aW9uX3ZpZXdfd2hlbl9lbXB0eUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyNgp9"}}} -, {"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": "11", "sha256": "028nrx3hakj8mcr3n6nsnrzg2mfikn49m4j2pjyq67y7vikjr4af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHR1cm5zIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBpbnRvIGEgcG9wdXAgbWVudSB3aXRoIGljb25zIGZvciBzZWxlY3RpbmcgZWl0aGVyIEFwcGxpY2F0aW9ucyBvciBXb3Jrc3BhY2VzIGluIHRoZSBPdmVydmlldy4gU2VsZWN0aW5nIHRoZSBzYW1lIHZpZXcgYWdhaW4gd2lsbCBoaWRlIHRoZSBvdmVydmlldy5cblxuVGhpcyBpcyBwYXJ0aWN1bGFybHkgdXNlZnVsIGZvciB0YWJsZXQgdXNlcnMgdGhhdCBmaW5kIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBkaWZmaWN1bHQgdG8gY2xpY2sgb24sIHdoZXJlYXMgYSBtZW51IGNhbiBiZSBtb3JlIGVhc2lseSBpbnZva2VkLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29uIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYWN0aXZpdGllc19pY29uX21lbnVAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "028nrx3hakj8mcr3n6nsnrzg2mfikn49m4j2pjyq67y7vikjr4af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHR1cm5zIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBpbnRvIGEgcG9wdXAgbWVudSB3aXRoIGljb25zIGZvciBzZWxlY3RpbmcgZWl0aGVyIEFwcGxpY2F0aW9ucyBvciBXb3Jrc3BhY2VzIGluIHRoZSBPdmVydmlldy4gU2VsZWN0aW5nIHRoZSBzYW1lIHZpZXcgYWdhaW4gd2lsbCBoaWRlIHRoZSBvdmVydmlldy5cblxuVGhpcyBpcyBwYXJ0aWN1bGFybHkgdXNlZnVsIGZvciB0YWJsZXQgdXNlcnMgdGhhdCBmaW5kIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBkaWZmaWN1bHQgdG8gY2xpY2sgb24sIHdoZXJlYXMgYSBtZW51IGNhbiBiZSBtb3JlIGVhc2lseSBpbnZva2VkLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29uIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYWN0aXZpdGllc19pY29uX21lbnVAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "028nrx3hakj8mcr3n6nsnrzg2mfikn49m4j2pjyq67y7vikjr4af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHR1cm5zIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBpbnRvIGEgcG9wdXAgbWVudSB3aXRoIGljb25zIGZvciBzZWxlY3RpbmcgZWl0aGVyIEFwcGxpY2F0aW9ucyBvciBXb3Jrc3BhY2VzIGluIHRoZSBPdmVydmlldy4gU2VsZWN0aW5nIHRoZSBzYW1lIHZpZXcgYWdhaW4gd2lsbCBoaWRlIHRoZSBvdmVydmlldy5cblxuVGhpcyBpcyBwYXJ0aWN1bGFybHkgdXNlZnVsIGZvciB0YWJsZXQgdXNlcnMgdGhhdCBmaW5kIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBkaWZmaWN1bHQgdG8gY2xpY2sgb24sIHdoZXJlYXMgYSBtZW51IGNhbiBiZSBtb3JlIGVhc2lseSBpbnZva2VkLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29uIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYWN0aXZpdGllc19pY29uX21lbnVAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "028nrx3hakj8mcr3n6nsnrzg2mfikn49m4j2pjyq67y7vikjr4af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHR1cm5zIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBpbnRvIGEgcG9wdXAgbWVudSB3aXRoIGljb25zIGZvciBzZWxlY3RpbmcgZWl0aGVyIEFwcGxpY2F0aW9ucyBvciBXb3Jrc3BhY2VzIGluIHRoZSBPdmVydmlldy4gU2VsZWN0aW5nIHRoZSBzYW1lIHZpZXcgYWdhaW4gd2lsbCBoaWRlIHRoZSBvdmVydmlldy5cblxuVGhpcyBpcyBwYXJ0aWN1bGFybHkgdXNlZnVsIGZvciB0YWJsZXQgdXNlcnMgdGhhdCBmaW5kIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBkaWZmaWN1bHQgdG8gY2xpY2sgb24sIHdoZXJlYXMgYSBtZW51IGNhbiBiZSBtb3JlIGVhc2lseSBpbnZva2VkLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29uIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYWN0aXZpdGllc19pY29uX21lbnVAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} +, {"uuid": "activities_icon_menu@fawtytoo", "name": "Activities Icon Menu", "pname": "activities-menu-for-apps-and-windows", "description": "NO LONGER MAINTAINED.\n\nThis 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": "11", "sha256": "1jq6bprdy2j7fdk988ch9bcawjwnkdvhb5s59aknmfl1k2r3mpmg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PIExPTkdFUiBNQUlOVEFJTkVELlxuXG5UaGlzIGV4dGVuc2lvbiB0dXJucyB0aGUgQWN0aXZpdGllcyBidXR0b24gaW50byBhIHBvcHVwIG1lbnUgd2l0aCBpY29ucyBmb3Igc2VsZWN0aW5nIGVpdGhlciBBcHBsaWNhdGlvbnMgb3IgV29ya3NwYWNlcyBpbiB0aGUgT3ZlcnZpZXcuIFNlbGVjdGluZyB0aGUgc2FtZSB2aWV3IGFnYWluIHdpbGwgaGlkZSB0aGUgb3ZlcnZpZXcuXG5cblRoaXMgaXMgcGFydGljdWxhcmx5IHVzZWZ1bCBmb3IgdGFibGV0IHVzZXJzIHRoYXQgZmluZCB0aGUgQWN0aXZpdGllcyBidXR0b24gZGlmZmljdWx0IHRvIGNsaWNrIG9uLCB3aGVyZWFzIGEgbWVudSBjYW4gYmUgbW9yZSBlYXNpbHkgaW52b2tlZC4iLAogICJuYW1lIjogIkFjdGl2aXRpZXMgSWNvbiBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFjdGl2aXRpZXNfaWNvbl9tZW51QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "1jq6bprdy2j7fdk988ch9bcawjwnkdvhb5s59aknmfl1k2r3mpmg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PIExPTkdFUiBNQUlOVEFJTkVELlxuXG5UaGlzIGV4dGVuc2lvbiB0dXJucyB0aGUgQWN0aXZpdGllcyBidXR0b24gaW50byBhIHBvcHVwIG1lbnUgd2l0aCBpY29ucyBmb3Igc2VsZWN0aW5nIGVpdGhlciBBcHBsaWNhdGlvbnMgb3IgV29ya3NwYWNlcyBpbiB0aGUgT3ZlcnZpZXcuIFNlbGVjdGluZyB0aGUgc2FtZSB2aWV3IGFnYWluIHdpbGwgaGlkZSB0aGUgb3ZlcnZpZXcuXG5cblRoaXMgaXMgcGFydGljdWxhcmx5IHVzZWZ1bCBmb3IgdGFibGV0IHVzZXJzIHRoYXQgZmluZCB0aGUgQWN0aXZpdGllcyBidXR0b24gZGlmZmljdWx0IHRvIGNsaWNrIG9uLCB3aGVyZWFzIGEgbWVudSBjYW4gYmUgbW9yZSBlYXNpbHkgaW52b2tlZC4iLAogICJuYW1lIjogIkFjdGl2aXRpZXMgSWNvbiBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFjdGl2aXRpZXNfaWNvbl9tZW51QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "1jq6bprdy2j7fdk988ch9bcawjwnkdvhb5s59aknmfl1k2r3mpmg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PIExPTkdFUiBNQUlOVEFJTkVELlxuXG5UaGlzIGV4dGVuc2lvbiB0dXJucyB0aGUgQWN0aXZpdGllcyBidXR0b24gaW50byBhIHBvcHVwIG1lbnUgd2l0aCBpY29ucyBmb3Igc2VsZWN0aW5nIGVpdGhlciBBcHBsaWNhdGlvbnMgb3IgV29ya3NwYWNlcyBpbiB0aGUgT3ZlcnZpZXcuIFNlbGVjdGluZyB0aGUgc2FtZSB2aWV3IGFnYWluIHdpbGwgaGlkZSB0aGUgb3ZlcnZpZXcuXG5cblRoaXMgaXMgcGFydGljdWxhcmx5IHVzZWZ1bCBmb3IgdGFibGV0IHVzZXJzIHRoYXQgZmluZCB0aGUgQWN0aXZpdGllcyBidXR0b24gZGlmZmljdWx0IHRvIGNsaWNrIG9uLCB3aGVyZWFzIGEgbWVudSBjYW4gYmUgbW9yZSBlYXNpbHkgaW52b2tlZC4iLAogICJuYW1lIjogIkFjdGl2aXRpZXMgSWNvbiBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFjdGl2aXRpZXNfaWNvbl9tZW51QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "1jq6bprdy2j7fdk988ch9bcawjwnkdvhb5s59aknmfl1k2r3mpmg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PIExPTkdFUiBNQUlOVEFJTkVELlxuXG5UaGlzIGV4dGVuc2lvbiB0dXJucyB0aGUgQWN0aXZpdGllcyBidXR0b24gaW50byBhIHBvcHVwIG1lbnUgd2l0aCBpY29ucyBmb3Igc2VsZWN0aW5nIGVpdGhlciBBcHBsaWNhdGlvbnMgb3IgV29ya3NwYWNlcyBpbiB0aGUgT3ZlcnZpZXcuIFNlbGVjdGluZyB0aGUgc2FtZSB2aWV3IGFnYWluIHdpbGwgaGlkZSB0aGUgb3ZlcnZpZXcuXG5cblRoaXMgaXMgcGFydGljdWxhcmx5IHVzZWZ1bCBmb3IgdGFibGV0IHVzZXJzIHRoYXQgZmluZCB0aGUgQWN0aXZpdGllcyBidXR0b24gZGlmZmljdWx0IHRvIGNsaWNrIG9uLCB3aGVyZWFzIGEgbWVudSBjYW4gYmUgbW9yZSBlYXNpbHkgaW52b2tlZC4iLAogICJuYW1lIjogIkFjdGl2aXRpZXMgSWNvbiBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFjdGl2aXRpZXNfaWNvbl9tZW51QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"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": "27", "sha256": "13km181vzf13id19xrv2b1mbry6378c9vhhpzm9agplgka104xap", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2dvbGRwcmljZW1vbml0b3IiLAogICJ1dWlkIjogIkdvbGRfUHJpY2VfTW9uaXRvckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "41": {"version": "27", "sha256": "13km181vzf13id19xrv2b1mbry6378c9vhhpzm9agplgka104xap", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2dvbGRwcmljZW1vbml0b3IiLAogICJ1dWlkIjogIkdvbGRfUHJpY2VfTW9uaXRvckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "42": {"version": "27", "sha256": "13km181vzf13id19xrv2b1mbry6378c9vhhpzm9agplgka104xap", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2dvbGRwcmljZW1vbml0b3IiLAogICJ1dWlkIjogIkdvbGRfUHJpY2VfTW9uaXRvckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "43": {"version": "27", "sha256": "13km181vzf13id19xrv2b1mbry6378c9vhhpzm9agplgka104xap", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2dvbGRwcmljZW1vbml0b3IiLAogICJ1dWlkIjogIkdvbGRfUHJpY2VfTW9uaXRvckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}}} -, {"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": "50", "sha256": "0f69lk9mdxmf2z9mx6wvx5l876nryjm1vjrwb70bxwxhqj5qwp5p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"}, "40": {"version": "50", "sha256": "0f69lk9mdxmf2z9mx6wvx5l876nryjm1vjrwb70bxwxhqj5qwp5p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"}, "41": {"version": "50", "sha256": "0f69lk9mdxmf2z9mx6wvx5l876nryjm1vjrwb70bxwxhqj5qwp5p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"}, "42": {"version": "50", "sha256": "0f69lk9mdxmf2z9mx6wvx5l876nryjm1vjrwb70bxwxhqj5qwp5p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"}, "43": {"version": "50", "sha256": "0f69lk9mdxmf2z9mx6wvx5l876nryjm1vjrwb70bxwxhqj5qwp5p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"}}} -, {"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"}, "40": {"version": "13", "sha256": "1ld85pl6d5axmy6413x8dsb1n7g98qja0065fz6h1f924c23wqh5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "1ld85pl6d5axmy6413x8dsb1n7g98qja0065fz6h1f924c23wqh5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "1ld85pl6d5axmy6413x8dsb1n7g98qja0065fz6h1f924c23wqh5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "13", "sha256": "1ld85pl6d5axmy6413x8dsb1n7g98qja0065fz6h1f924c23wqh5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} +, {"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": "54", "sha256": "0k7djhv1i36rs193zm2nxbqn60dwi4d6lx166zch4p3ivr39bcvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}, "40": {"version": "54", "sha256": "0k7djhv1i36rs193zm2nxbqn60dwi4d6lx166zch4p3ivr39bcvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}, "41": {"version": "54", "sha256": "0k7djhv1i36rs193zm2nxbqn60dwi4d6lx166zch4p3ivr39bcvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}, "42": {"version": "54", "sha256": "0k7djhv1i36rs193zm2nxbqn60dwi4d6lx166zch4p3ivr39bcvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}, "43": {"version": "54", "sha256": "0k7djhv1i36rs193zm2nxbqn60dwi4d6lx166zch4p3ivr39bcvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}}} +, {"uuid": "order-extensions@wa4557.github.com", "name": "Order Gnome Shell extensions", "pname": "order-gnome-shell-extensions", "description": "Fixes order of gnome-shell extensions in the panel (also with items added by other extensions such as https://extensions.gnome.org/extension/615/appindicator-support/) . The order can be set for each item individually via settings.\nBug reports and issues please here https://github.com/andia89/order-icons/issues", "link": "https://extensions.gnome.org/extension/2114/order-gnome-shell-extensions/", "shell_version_map": {"38": {"version": "6", "sha256": "17nd8jddb9hvb8rz7nvrd9nabbv5zmlxj0y16d1y5jbjqnm6snaa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIGluIHRoZSBwYW5lbCAoYWxzbyB3aXRoIGl0ZW1zIGFkZGVkIGJ5IG90aGVyIGV4dGVuc2lvbnMgc3VjaCBhcyBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi82MTUvYXBwaW5kaWNhdG9yLXN1cHBvcnQvKSAuIFRoZSBvcmRlciBjYW4gYmUgc2V0IGZvciBlYWNoIGl0ZW0gaW5kaXZpZHVhbGx5IHZpYSBzZXR0aW5ncy5cbkJ1ZyByZXBvcnRzIGFuZCBpc3N1ZXMgcGxlYXNlIGhlcmUgaHR0cHM6Ly9naXRodWIuY29tL2FuZGlhODkvb3JkZXItaWNvbnMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICIzLjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm9yZGVyLWV4dGVuc2lvbnNAd2E0NTU3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "13", "sha256": "0hwh0w3bwl5nsdahii43j7ac792ciabsdsp8xarnrkbfvlafb2lk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIGluIHRoZSBwYW5lbCAoYWxzbyB3aXRoIGl0ZW1zIGFkZGVkIGJ5IG90aGVyIGV4dGVuc2lvbnMgc3VjaCBhcyBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi82MTUvYXBwaW5kaWNhdG9yLXN1cHBvcnQvKSAuIFRoZSBvcmRlciBjYW4gYmUgc2V0IGZvciBlYWNoIGl0ZW0gaW5kaXZpZHVhbGx5IHZpYSBzZXR0aW5ncy5cbkJ1ZyByZXBvcnRzIGFuZCBpc3N1ZXMgcGxlYXNlIGhlcmUgaHR0cHM6Ly9naXRodWIuY29tL2FuZGlhODkvb3JkZXItaWNvbnMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "0hwh0w3bwl5nsdahii43j7ac792ciabsdsp8xarnrkbfvlafb2lk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIGluIHRoZSBwYW5lbCAoYWxzbyB3aXRoIGl0ZW1zIGFkZGVkIGJ5IG90aGVyIGV4dGVuc2lvbnMgc3VjaCBhcyBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi82MTUvYXBwaW5kaWNhdG9yLXN1cHBvcnQvKSAuIFRoZSBvcmRlciBjYW4gYmUgc2V0IGZvciBlYWNoIGl0ZW0gaW5kaXZpZHVhbGx5IHZpYSBzZXR0aW5ncy5cbkJ1ZyByZXBvcnRzIGFuZCBpc3N1ZXMgcGxlYXNlIGhlcmUgaHR0cHM6Ly9naXRodWIuY29tL2FuZGlhODkvb3JkZXItaWNvbnMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "0hwh0w3bwl5nsdahii43j7ac792ciabsdsp8xarnrkbfvlafb2lk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIGluIHRoZSBwYW5lbCAoYWxzbyB3aXRoIGl0ZW1zIGFkZGVkIGJ5IG90aGVyIGV4dGVuc2lvbnMgc3VjaCBhcyBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi82MTUvYXBwaW5kaWNhdG9yLXN1cHBvcnQvKSAuIFRoZSBvcmRlciBjYW4gYmUgc2V0IGZvciBlYWNoIGl0ZW0gaW5kaXZpZHVhbGx5IHZpYSBzZXR0aW5ncy5cbkJ1ZyByZXBvcnRzIGFuZCBpc3N1ZXMgcGxlYXNlIGhlcmUgaHR0cHM6Ly9naXRodWIuY29tL2FuZGlhODkvb3JkZXItaWNvbnMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "13", "sha256": "0hwh0w3bwl5nsdahii43j7ac792ciabsdsp8xarnrkbfvlafb2lk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIGluIHRoZSBwYW5lbCAoYWxzbyB3aXRoIGl0ZW1zIGFkZGVkIGJ5IG90aGVyIGV4dGVuc2lvbnMgc3VjaCBhcyBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi82MTUvYXBwaW5kaWNhdG9yLXN1cHBvcnQvKSAuIFRoZSBvcmRlciBjYW4gYmUgc2V0IGZvciBlYWNoIGl0ZW0gaW5kaXZpZHVhbGx5IHZpYSBzZXR0aW5ncy5cbkJ1ZyByZXBvcnRzIGFuZCBpc3N1ZXMgcGxlYXNlIGhlcmUgaHR0cHM6Ly9naXRodWIuY29tL2FuZGlhODkvb3JkZXItaWNvbnMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"uuid": "sound-percentage@maestroschan.fr", "name": "Sound percentage", "pname": "sound-percentage", "description": "Display the current sound percentage in the system tray", "link": "https://extensions.gnome.org/extension/2120/sound-percentage/", "shell_version_map": {"38": {"version": "3", "sha256": "140a83mqwja4vkk83ajmknginh0izli65b8x7nab32sif99z7nya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgc291bmQgcGVyY2VudGFnZSBpbiB0aGUgc3lzdGVtIHRyYXkiLAogICJuYW1lIjogIlNvdW5kIHBlcmNlbnRhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovc291bmQtcGVyY2VudGFnZS1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogInNvdW5kLXBlcmNlbnRhZ2VAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "140a83mqwja4vkk83ajmknginh0izli65b8x7nab32sif99z7nya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgc291bmQgcGVyY2VudGFnZSBpbiB0aGUgc3lzdGVtIHRyYXkiLAogICJuYW1lIjogIlNvdW5kIHBlcmNlbnRhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovc291bmQtcGVyY2VudGFnZS1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogInNvdW5kLXBlcmNlbnRhZ2VAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "140a83mqwja4vkk83ajmknginh0izli65b8x7nab32sif99z7nya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgc291bmQgcGVyY2VudGFnZSBpbiB0aGUgc3lzdGVtIHRyYXkiLAogICJuYW1lIjogIlNvdW5kIHBlcmNlbnRhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovc291bmQtcGVyY2VudGFnZS1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogInNvdW5kLXBlcmNlbnRhZ2VAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "140a83mqwja4vkk83ajmknginh0izli65b8x7nab32sif99z7nya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgc291bmQgcGVyY2VudGFnZSBpbiB0aGUgc3lzdGVtIHRyYXkiLAogICJuYW1lIjogIlNvdW5kIHBlcmNlbnRhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovc291bmQtcGVyY2VudGFnZS1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogInNvdW5kLXBlcmNlbnRhZ2VAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"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="}}} @@ -262,7 +262,7 @@ , {"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": "17", "sha256": "11liw6l5p6bwb9yz5wvz214z8blbrf6pw40lj0hp0b7yhk2lg9rl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5vYW5ub3lhbmNlIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub2Fubm95YW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Cam9lcm5EYWFzZS9ub2Fubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAZGFhc2UubmV0IiwKICAidmVyc2lvbiI6IDE3Cn0="}, "41": {"version": "17", "sha256": "11liw6l5p6bwb9yz5wvz214z8blbrf6pw40lj0hp0b7yhk2lg9rl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5vYW5ub3lhbmNlIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub2Fubm95YW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Cam9lcm5EYWFzZS9ub2Fubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAZGFhc2UubmV0IiwKICAidmVyc2lvbiI6IDE3Cn0="}, "42": {"version": "17", "sha256": "11liw6l5p6bwb9yz5wvz214z8blbrf6pw40lj0hp0b7yhk2lg9rl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5vYW5ub3lhbmNlIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub2Fubm95YW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Cam9lcm5EYWFzZS9ub2Fubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAZGFhc2UubmV0IiwKICAidmVyc2lvbiI6IDE3Cn0="}, "43": {"version": "17", "sha256": "11liw6l5p6bwb9yz5wvz214z8blbrf6pw40lj0hp0b7yhk2lg9rl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5vYW5ub3lhbmNlIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub2Fubm95YW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Cam9lcm5EYWFzZS9ub2Fubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAZGFhc2UubmV0IiwKICAidmVyc2lvbiI6IDE3Cn0="}}} , {"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": "7", "sha256": "1dxwkqnfmqr3xghrf58hix5v4hs13ycg1hqm5alr4lknn6i7sfwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb2tvLW5nL3ZpbS1hbHRUYWIiLAogICJ1dWlkIjogInZpbS1hbHRUYWJAa29rb25nLmluZm8iLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "1dxwkqnfmqr3xghrf58hix5v4hs13ycg1hqm5alr4lknn6i7sfwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb2tvLW5nL3ZpbS1hbHRUYWIiLAogICJ1dWlkIjogInZpbS1hbHRUYWJAa29rb25nLmluZm8iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "1dxwkqnfmqr3xghrf58hix5v4hs13ycg1hqm5alr4lknn6i7sfwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb2tvLW5nL3ZpbS1hbHRUYWIiLAogICJ1dWlkIjogInZpbS1hbHRUYWJAa29rb25nLmluZm8iLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "1dxwkqnfmqr3xghrf58hix5v4hs13ycg1hqm5alr4lknn6i7sfwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb2tvLW5nL3ZpbS1hbHRUYWIiLAogICJ1dWlkIjogInZpbS1hbHRUYWJAa29rb25nLmluZm8iLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "1dxwkqnfmqr3xghrf58hix5v4hs13ycg1hqm5alr4lknn6i7sfwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb2tvLW5nL3ZpbS1hbHRUYWIiLAogICJ1dWlkIjogInZpbS1hbHRUYWJAa29rb25nLmluZm8iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"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": "19", "sha256": "1vxjq29qfy1i358n0y41zhjy8l624ylyrg0xgcfc4lpb0n3zg5r9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JlZFNvZnR3YXJlU3lzdGVtcy9lYXN5X2RvY2tlcl9jb250YWluZXJzIiwKICAidXVpZCI6ICJlYXN5X2RvY2tlcl9jb250YWluZXJzQHJlZC5zb2Z0d2FyZS5zeXN0ZW1zIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "40": {"version": "19", "sha256": "1vxjq29qfy1i358n0y41zhjy8l624ylyrg0xgcfc4lpb0n3zg5r9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JlZFNvZnR3YXJlU3lzdGVtcy9lYXN5X2RvY2tlcl9jb250YWluZXJzIiwKICAidXVpZCI6ICJlYXN5X2RvY2tlcl9jb250YWluZXJzQHJlZC5zb2Z0d2FyZS5zeXN0ZW1zIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "1vxjq29qfy1i358n0y41zhjy8l624ylyrg0xgcfc4lpb0n3zg5r9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JlZFNvZnR3YXJlU3lzdGVtcy9lYXN5X2RvY2tlcl9jb250YWluZXJzIiwKICAidXVpZCI6ICJlYXN5X2RvY2tlcl9jb250YWluZXJzQHJlZC5zb2Z0d2FyZS5zeXN0ZW1zIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "42": {"version": "19", "sha256": "1vxjq29qfy1i358n0y41zhjy8l624ylyrg0xgcfc4lpb0n3zg5r9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JlZFNvZnR3YXJlU3lzdGVtcy9lYXN5X2RvY2tlcl9jb250YWluZXJzIiwKICAidXVpZCI6ICJlYXN5X2RvY2tlcl9jb250YWluZXJzQHJlZC5zb2Z0d2FyZS5zeXN0ZW1zIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "43": {"version": "19", "sha256": "1vxjq29qfy1i358n0y41zhjy8l624ylyrg0xgcfc4lpb0n3zg5r9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JlZFNvZnR3YXJlU3lzdGVtcy9lYXN5X2RvY2tlcl9jb250YWluZXJzIiwKICAidXVpZCI6ICJlYXN5X2RvY2tlcl9jb250YWluZXJzQHJlZC5zb2Z0d2FyZS5zeXN0ZW1zIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} -, {"uuid": "nightthemeswitcher@romainvigier.fr", "name": "Night Theme Switcher", "pname": "night-theme-switcher", "description": "Automatically toggle your desktop’s color scheme between light and dark, switch backgrounds and run custom commands at sunset and sunrise.", "link": "https://extensions.gnome.org/extension/2236/night-theme-switcher/", "shell_version_map": {"38": {"version": "46", "sha256": "1riz1c59l1vzxb6irh723fw3vh2l5y07b59h3h11gs3lwlhgki0j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmlnaHR0aGVtZXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL25pZ2h0dGhlbWVzd2l0Y2hlci5yb21haW52aWdpZXIuZnIiLAogICJ1dWlkIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJ2ZXJzaW9uIjogNDYKfQ=="}, "40": {"version": "51", "sha256": "1pd3q7if06bvwrnln1v9h6wp82fpvs7lqq8c593rjsxrwdsjhbjq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmlnaHR0aGVtZXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9uaWdodHRoZW1lc3dpdGNoZXIucm9tYWludmlnaWVyLmZyIiwKICAidXVpZCI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAidmVyc2lvbiI6IDUxCn0="}, "41": {"version": "55", "sha256": "0qy9i3ayg3pbcxk5fj79s8agjl55c4vq36lxzd785kaljrzv0jws", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmlnaHR0aGVtZXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9uaWdodHRoZW1lc3dpdGNoZXIucm9tYWludmlnaWVyLmZyIiwKICAidXVpZCI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAidmVyc2lvbiI6IDU1Cn0="}, "42": {"version": "65", "sha256": "0482gvsrg0q5l8rrlq2jn5j8a49p52l6gfnpggpj4qgj8ccrapkv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0dGhlbWVzd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA2NQp9"}, "43": {"version": "71", "sha256": "0l312vx37xqvjppfshp6n09j6rh1caj4smxfaigpjixlabhi1ya7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJ1aWxkLXR5cGUiOiAicmVsZWFzZSIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0dGhlbWVzd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA3MQp9"}}} +, {"uuid": "nightthemeswitcher@romainvigier.fr", "name": "Night Theme Switcher", "pname": "night-theme-switcher", "description": "Automatically toggle your desktop’s color scheme between light and dark, switch backgrounds and run custom commands at sunset and sunrise.\n\n⚠️ Ubuntu is not supported due to their heavily patched GNOME components that conflict with the extension ⚠️", "link": "https://extensions.gnome.org/extension/2236/night-theme-switcher/", "shell_version_map": {"38": {"version": "46", "sha256": "1mqan95pv7fjgr3bis9f1262i6nwwmp15lalh6c3aspn17pncp7w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuXG5cblx1MjZhMFx1ZmUwZiBVYnVudHUgaXMgbm90IHN1cHBvcnRlZCBkdWUgdG8gdGhlaXIgaGVhdmlseSBwYXRjaGVkIEdOT01FIGNvbXBvbmVudHMgdGhhdCBjb25mbGljdCB3aXRoIHRoZSBleHRlbnNpb24gXHUyNmEwXHVmZTBmIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmlnaHR0aGVtZXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL25pZ2h0dGhlbWVzd2l0Y2hlci5yb21haW52aWdpZXIuZnIiLAogICJ1dWlkIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJ2ZXJzaW9uIjogNDYKfQ=="}, "40": {"version": "51", "sha256": "1f0y4laflf9kx7zf4rmv63ax3n9i06hpys648g32nmrm4xjwff5q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuXG5cblx1MjZhMFx1ZmUwZiBVYnVudHUgaXMgbm90IHN1cHBvcnRlZCBkdWUgdG8gdGhlaXIgaGVhdmlseSBwYXRjaGVkIEdOT01FIGNvbXBvbmVudHMgdGhhdCBjb25mbGljdCB3aXRoIHRoZSBleHRlbnNpb24gXHUyNmEwXHVmZTBmIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmlnaHR0aGVtZXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9uaWdodHRoZW1lc3dpdGNoZXIucm9tYWludmlnaWVyLmZyIiwKICAidXVpZCI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAidmVyc2lvbiI6IDUxCn0="}, "41": {"version": "55", "sha256": "08g48yxxsqhaqhq9sm9mmasc63dxvhqi121a7xsv8cys5wihl0bx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuXG5cblx1MjZhMFx1ZmUwZiBVYnVudHUgaXMgbm90IHN1cHBvcnRlZCBkdWUgdG8gdGhlaXIgaGVhdmlseSBwYXRjaGVkIEdOT01FIGNvbXBvbmVudHMgdGhhdCBjb25mbGljdCB3aXRoIHRoZSBleHRlbnNpb24gXHUyNmEwXHVmZTBmIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmlnaHR0aGVtZXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9uaWdodHRoZW1lc3dpdGNoZXIucm9tYWludmlnaWVyLmZyIiwKICAidXVpZCI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAidmVyc2lvbiI6IDU1Cn0="}, "42": {"version": "65", "sha256": "1crg4ggpxv0s6fj1nds461579wnf4a6j6llw4a9yqk479d6kfszv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuXG5cblx1MjZhMFx1ZmUwZiBVYnVudHUgaXMgbm90IHN1cHBvcnRlZCBkdWUgdG8gdGhlaXIgaGVhdmlseSBwYXRjaGVkIEdOT01FIGNvbXBvbmVudHMgdGhhdCBjb25mbGljdCB3aXRoIHRoZSBleHRlbnNpb24gXHUyNmEwXHVmZTBmIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0dGhlbWVzd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA2NQp9"}, "43": {"version": "72", "sha256": "08aj0q515dqrxpbv9i2icsjlzjfsjrdrmh6picg78j5p3cyn35kh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJ1aWxkLXR5cGUiOiAicmVsZWFzZSIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuXG5cblx1MjZhMFx1ZmUwZiBVYnVudHUgaXMgbm90IHN1cHBvcnRlZCBkdWUgdG8gdGhlaXIgaGVhdmlseSBwYXRjaGVkIEdOT01FIGNvbXBvbmVudHMgdGhhdCBjb25mbGljdCB3aXRoIHRoZSBleHRlbnNpb24gXHUyNmEwXHVmZTBmIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0dGhlbWVzd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA3Mgp9"}}} , {"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.\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": "10", "sha256": "0wj4xg6mz7f7lgknzpss3dma8y8k3w4m5a6zld1ymlpidz0k5i2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAidXVpZCI6ICJsZ2J1dHRvbkBnbGVycm8uZ25vbWUuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "10", "sha256": "0wj4xg6mz7f7lgknzpss3dma8y8k3w4m5a6zld1ymlpidz0k5i2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAidXVpZCI6ICJsZ2J1dHRvbkBnbGVycm8uZ25vbWUuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0wj4xg6mz7f7lgknzpss3dma8y8k3w4m5a6zld1ymlpidz0k5i2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAidXVpZCI6ICJsZ2J1dHRvbkBnbGVycm8uZ25vbWUuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "0wj4xg6mz7f7lgknzpss3dma8y8k3w4m5a6zld1ymlpidz0k5i2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAidXVpZCI6ICJsZ2J1dHRvbkBnbGVycm8uZ25vbWUuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDEwCn0="}, "43": {"version": "10", "sha256": "0wj4xg6mz7f7lgknzpss3dma8y8k3w4m5a6zld1ymlpidz0k5i2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAidXVpZCI6ICJsZ2J1dHRvbkBnbGVycm8uZ25vbWUuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"uuid": "tp_wattmeter@gistart", "name": "tp_wattmeter", "pname": "tp_wattmeter", "description": "Shows battery power consumption of ThinkPad laptops. Now configurable!", "link": "https://extensions.gnome.org/extension/2308/tp_wattmeter/", "shell_version_map": {"40": {"version": "11", "sha256": "1sw6mq3fgzv1jl33yf08rgd1fzqb17c5qvq41gq5b6kgn1cs36ji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGJhdHRlcnkgcG93ZXIgY29uc3VtcHRpb24gb2YgVGhpbmtQYWQgbGFwdG9wcy4gTm93IGNvbmZpZ3VyYWJsZSEiLAogICJuYW1lIjogInRwX3dhdHRtZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dpc3RhcnQvdHBfd2F0dG1ldGVyIiwKICAidXVpZCI6ICJ0cF93YXR0bWV0ZXJAZ2lzdGFydCIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "1sw6mq3fgzv1jl33yf08rgd1fzqb17c5qvq41gq5b6kgn1cs36ji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGJhdHRlcnkgcG93ZXIgY29uc3VtcHRpb24gb2YgVGhpbmtQYWQgbGFwdG9wcy4gTm93IGNvbmZpZ3VyYWJsZSEiLAogICJuYW1lIjogInRwX3dhdHRtZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dpc3RhcnQvdHBfd2F0dG1ldGVyIiwKICAidXVpZCI6ICJ0cF93YXR0bWV0ZXJAZ2lzdGFydCIsCiAgInZlcnNpb24iOiAxMQp9"}, "42": {"version": "11", "sha256": "1sw6mq3fgzv1jl33yf08rgd1fzqb17c5qvq41gq5b6kgn1cs36ji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGJhdHRlcnkgcG93ZXIgY29uc3VtcHRpb24gb2YgVGhpbmtQYWQgbGFwdG9wcy4gTm93IGNvbmZpZ3VyYWJsZSEiLAogICJuYW1lIjogInRwX3dhdHRtZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dpc3RhcnQvdHBfd2F0dG1ldGVyIiwKICAidXVpZCI6ICJ0cF93YXR0bWV0ZXJAZ2lzdGFydCIsCiAgInZlcnNpb24iOiAxMQp9"}}} @@ -271,83 +271,83 @@ , {"uuid": "roundrobintaborder@scottworley.com", "name": "Round Robin Tab Order", "pname": "round-robin-tab-order", "description": "Window switch order becomes round-robin instead of most-recently-used", "link": "https://extensions.gnome.org/extension/2446/round-robin-tab-order/", "shell_version_map": {"40": {"version": "3", "sha256": "0p2qfv6i43pi0hjsyz8xzxkxijr06b0d20q618y8gfj4ar82glv7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdyBzd2l0Y2ggb3JkZXIgYmVjb21lcyByb3VuZC1yb2JpbiBpbnN0ZWFkIG9mIG1vc3QtcmVjZW50bHktdXNlZCIsCiAgIm5hbWUiOiAiUm91bmQgUm9iaW4gVGFiIE9yZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2NodWNrL3JvdW5kLXJvYmluLXRhYi1vcmRlciIsCiAgInV1aWQiOiAicm91bmRyb2JpbnRhYm9yZGVyQHNjb3R0d29ybGV5LmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "bubblemail@razer.framagit.org", "name": "Bubblemail", "pname": "bubblemail", "description": "Indicator for new and unread mail (Yahoo, Gmail, Microsoft, Outlook, Aol, Icloud, Protonmail, Gmx...)\n * Multiple accounts support\n * Local mail support for Maildir and Mbox formats\n * Remote mail support for Pop3, Imap and Exchange protocols\n * Automatic imports of Gnome Online Accounts\n * Plugin support with default ones : spam filter, sound alert, libnotify, user script\n * Avatars provided by the server or default colorized ones\n * Reports for connection errors.\n\nBE AWARE THAT THIS EXTENSION REQUIRES BUBBLEMAIL SERVICE INSTALLATION\nCheck your distribution packaging system for availability.\nPackages for distributions and source tarballs can be found here :\nhttp://bubblemail.free.fr\n\nPlease report any issue on the gitlab pages of the project :\nhttps://framagit.org/razer/bubblemail/issues\nhttps://framagit.org/razer/bubblemail-gnome-shell/issues", "link": "https://extensions.gnome.org/extension/2458/bubblemail/", "shell_version_map": {"38": {"version": "19", "sha256": "141gn3pf6l3j2ms9zkn25qap07w4fc20z3d0jy4w7jwlv2l2pd5g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBmb3IgbmV3IGFuZCB1bnJlYWQgbWFpbCAoWWFob28sIEdtYWlsLCBNaWNyb3NvZnQsIE91dGxvb2ssIEFvbCwgSWNsb3VkLCBQcm90b25tYWlsLCBHbXguLi4pXG4gKiBNdWx0aXBsZSBhY2NvdW50cyBzdXBwb3J0XG4gKiBMb2NhbCBtYWlsIHN1cHBvcnQgZm9yIE1haWxkaXIgYW5kIE1ib3ggZm9ybWF0c1xuICogUmVtb3RlIG1haWwgc3VwcG9ydCBmb3IgUG9wMywgSW1hcCBhbmQgRXhjaGFuZ2UgcHJvdG9jb2xzXG4gKiBBdXRvbWF0aWMgaW1wb3J0cyBvZiBHbm9tZSBPbmxpbmUgQWNjb3VudHNcbiAqIFBsdWdpbiBzdXBwb3J0IHdpdGggZGVmYXVsdCBvbmVzIDogc3BhbSBmaWx0ZXIsIHNvdW5kIGFsZXJ0LCBsaWJub3RpZnksIHVzZXIgc2NyaXB0XG4gKiBBdmF0YXJzIHByb3ZpZGVkIGJ5IHRoZSBzZXJ2ZXIgb3IgZGVmYXVsdCBjb2xvcml6ZWQgb25lc1xuICogUmVwb3J0cyBmb3IgY29ubmVjdGlvbiBlcnJvcnMuXG5cbkJFIEFXQVJFIFRIQVQgVEhJUyBFWFRFTlNJT04gUkVRVUlSRVMgQlVCQkxFTUFJTCBTRVJWSUNFIElOU1RBTExBVElPTlxuQ2hlY2sgeW91ciBkaXN0cmlidXRpb24gcGFja2FnaW5nIHN5c3RlbSBmb3IgYXZhaWxhYmlsaXR5LlxuUGFja2FnZXMgZm9yIGRpc3RyaWJ1dGlvbnMgYW5kIHNvdXJjZSB0YXJiYWxscyBjYW4gYmUgZm91bmQgaGVyZSA6XG5odHRwOi8vYnViYmxlbWFpbC5mcmVlLmZyXG5cblBsZWFzZSByZXBvcnQgYW55IGlzc3VlIG9uIHRoZSBnaXRsYWIgcGFnZXMgb2YgdGhlIHByb2plY3QgOlxuaHR0cHM6Ly9mcmFtYWdpdC5vcmcvcmF6ZXIvYnViYmxlbWFpbC9pc3N1ZXNcbmh0dHBzOi8vZnJhbWFnaXQub3JnL3JhemVyL2J1YmJsZW1haWwtZ25vbWUtc2hlbGwvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYnViYmxlbWFpbC1nbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiQnViYmxlbWFpbCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAicmF6ZXJyYXpAZnJlZS5mciIsCiAgICAienVsdTk5QGdteC5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJ1YmJsZW1haWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwOi8vYnViYmxlbWFpbC5mcmVlLmZyIiwKICAidXVpZCI6ICJidWJibGVtYWlsQHJhemVyLmZyYW1hZ2l0Lm9yZyIsCiAgInZlcnNpb24iOiAxOQp9"}, "40": {"version": "19", "sha256": "141gn3pf6l3j2ms9zkn25qap07w4fc20z3d0jy4w7jwlv2l2pd5g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBmb3IgbmV3IGFuZCB1bnJlYWQgbWFpbCAoWWFob28sIEdtYWlsLCBNaWNyb3NvZnQsIE91dGxvb2ssIEFvbCwgSWNsb3VkLCBQcm90b25tYWlsLCBHbXguLi4pXG4gKiBNdWx0aXBsZSBhY2NvdW50cyBzdXBwb3J0XG4gKiBMb2NhbCBtYWlsIHN1cHBvcnQgZm9yIE1haWxkaXIgYW5kIE1ib3ggZm9ybWF0c1xuICogUmVtb3RlIG1haWwgc3VwcG9ydCBmb3IgUG9wMywgSW1hcCBhbmQgRXhjaGFuZ2UgcHJvdG9jb2xzXG4gKiBBdXRvbWF0aWMgaW1wb3J0cyBvZiBHbm9tZSBPbmxpbmUgQWNjb3VudHNcbiAqIFBsdWdpbiBzdXBwb3J0IHdpdGggZGVmYXVsdCBvbmVzIDogc3BhbSBmaWx0ZXIsIHNvdW5kIGFsZXJ0LCBsaWJub3RpZnksIHVzZXIgc2NyaXB0XG4gKiBBdmF0YXJzIHByb3ZpZGVkIGJ5IHRoZSBzZXJ2ZXIgb3IgZGVmYXVsdCBjb2xvcml6ZWQgb25lc1xuICogUmVwb3J0cyBmb3IgY29ubmVjdGlvbiBlcnJvcnMuXG5cbkJFIEFXQVJFIFRIQVQgVEhJUyBFWFRFTlNJT04gUkVRVUlSRVMgQlVCQkxFTUFJTCBTRVJWSUNFIElOU1RBTExBVElPTlxuQ2hlY2sgeW91ciBkaXN0cmlidXRpb24gcGFja2FnaW5nIHN5c3RlbSBmb3IgYXZhaWxhYmlsaXR5LlxuUGFja2FnZXMgZm9yIGRpc3RyaWJ1dGlvbnMgYW5kIHNvdXJjZSB0YXJiYWxscyBjYW4gYmUgZm91bmQgaGVyZSA6XG5odHRwOi8vYnViYmxlbWFpbC5mcmVlLmZyXG5cblBsZWFzZSByZXBvcnQgYW55IGlzc3VlIG9uIHRoZSBnaXRsYWIgcGFnZXMgb2YgdGhlIHByb2plY3QgOlxuaHR0cHM6Ly9mcmFtYWdpdC5vcmcvcmF6ZXIvYnViYmxlbWFpbC9pc3N1ZXNcbmh0dHBzOi8vZnJhbWFnaXQub3JnL3JhemVyL2J1YmJsZW1haWwtZ25vbWUtc2hlbGwvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYnViYmxlbWFpbC1nbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiQnViYmxlbWFpbCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAicmF6ZXJyYXpAZnJlZS5mciIsCiAgICAienVsdTk5QGdteC5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJ1YmJsZW1haWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwOi8vYnViYmxlbWFpbC5mcmVlLmZyIiwKICAidXVpZCI6ICJidWJibGVtYWlsQHJhemVyLmZyYW1hZ2l0Lm9yZyIsCiAgInZlcnNpb24iOiAxOQp9"}, "41": {"version": "19", "sha256": "141gn3pf6l3j2ms9zkn25qap07w4fc20z3d0jy4w7jwlv2l2pd5g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBmb3IgbmV3IGFuZCB1bnJlYWQgbWFpbCAoWWFob28sIEdtYWlsLCBNaWNyb3NvZnQsIE91dGxvb2ssIEFvbCwgSWNsb3VkLCBQcm90b25tYWlsLCBHbXguLi4pXG4gKiBNdWx0aXBsZSBhY2NvdW50cyBzdXBwb3J0XG4gKiBMb2NhbCBtYWlsIHN1cHBvcnQgZm9yIE1haWxkaXIgYW5kIE1ib3ggZm9ybWF0c1xuICogUmVtb3RlIG1haWwgc3VwcG9ydCBmb3IgUG9wMywgSW1hcCBhbmQgRXhjaGFuZ2UgcHJvdG9jb2xzXG4gKiBBdXRvbWF0aWMgaW1wb3J0cyBvZiBHbm9tZSBPbmxpbmUgQWNjb3VudHNcbiAqIFBsdWdpbiBzdXBwb3J0IHdpdGggZGVmYXVsdCBvbmVzIDogc3BhbSBmaWx0ZXIsIHNvdW5kIGFsZXJ0LCBsaWJub3RpZnksIHVzZXIgc2NyaXB0XG4gKiBBdmF0YXJzIHByb3ZpZGVkIGJ5IHRoZSBzZXJ2ZXIgb3IgZGVmYXVsdCBjb2xvcml6ZWQgb25lc1xuICogUmVwb3J0cyBmb3IgY29ubmVjdGlvbiBlcnJvcnMuXG5cbkJFIEFXQVJFIFRIQVQgVEhJUyBFWFRFTlNJT04gUkVRVUlSRVMgQlVCQkxFTUFJTCBTRVJWSUNFIElOU1RBTExBVElPTlxuQ2hlY2sgeW91ciBkaXN0cmlidXRpb24gcGFja2FnaW5nIHN5c3RlbSBmb3IgYXZhaWxhYmlsaXR5LlxuUGFja2FnZXMgZm9yIGRpc3RyaWJ1dGlvbnMgYW5kIHNvdXJjZSB0YXJiYWxscyBjYW4gYmUgZm91bmQgaGVyZSA6XG5odHRwOi8vYnViYmxlbWFpbC5mcmVlLmZyXG5cblBsZWFzZSByZXBvcnQgYW55IGlzc3VlIG9uIHRoZSBnaXRsYWIgcGFnZXMgb2YgdGhlIHByb2plY3QgOlxuaHR0cHM6Ly9mcmFtYWdpdC5vcmcvcmF6ZXIvYnViYmxlbWFpbC9pc3N1ZXNcbmh0dHBzOi8vZnJhbWFnaXQub3JnL3JhemVyL2J1YmJsZW1haWwtZ25vbWUtc2hlbGwvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYnViYmxlbWFpbC1nbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiQnViYmxlbWFpbCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAicmF6ZXJyYXpAZnJlZS5mciIsCiAgICAienVsdTk5QGdteC5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJ1YmJsZW1haWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwOi8vYnViYmxlbWFpbC5mcmVlLmZyIiwKICAidXVpZCI6ICJidWJibGVtYWlsQHJhemVyLmZyYW1hZ2l0Lm9yZyIsCiAgInZlcnNpb24iOiAxOQp9"}, "42": {"version": "19", "sha256": "141gn3pf6l3j2ms9zkn25qap07w4fc20z3d0jy4w7jwlv2l2pd5g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBmb3IgbmV3IGFuZCB1bnJlYWQgbWFpbCAoWWFob28sIEdtYWlsLCBNaWNyb3NvZnQsIE91dGxvb2ssIEFvbCwgSWNsb3VkLCBQcm90b25tYWlsLCBHbXguLi4pXG4gKiBNdWx0aXBsZSBhY2NvdW50cyBzdXBwb3J0XG4gKiBMb2NhbCBtYWlsIHN1cHBvcnQgZm9yIE1haWxkaXIgYW5kIE1ib3ggZm9ybWF0c1xuICogUmVtb3RlIG1haWwgc3VwcG9ydCBmb3IgUG9wMywgSW1hcCBhbmQgRXhjaGFuZ2UgcHJvdG9jb2xzXG4gKiBBdXRvbWF0aWMgaW1wb3J0cyBvZiBHbm9tZSBPbmxpbmUgQWNjb3VudHNcbiAqIFBsdWdpbiBzdXBwb3J0IHdpdGggZGVmYXVsdCBvbmVzIDogc3BhbSBmaWx0ZXIsIHNvdW5kIGFsZXJ0LCBsaWJub3RpZnksIHVzZXIgc2NyaXB0XG4gKiBBdmF0YXJzIHByb3ZpZGVkIGJ5IHRoZSBzZXJ2ZXIgb3IgZGVmYXVsdCBjb2xvcml6ZWQgb25lc1xuICogUmVwb3J0cyBmb3IgY29ubmVjdGlvbiBlcnJvcnMuXG5cbkJFIEFXQVJFIFRIQVQgVEhJUyBFWFRFTlNJT04gUkVRVUlSRVMgQlVCQkxFTUFJTCBTRVJWSUNFIElOU1RBTExBVElPTlxuQ2hlY2sgeW91ciBkaXN0cmlidXRpb24gcGFja2FnaW5nIHN5c3RlbSBmb3IgYXZhaWxhYmlsaXR5LlxuUGFja2FnZXMgZm9yIGRpc3RyaWJ1dGlvbnMgYW5kIHNvdXJjZSB0YXJiYWxscyBjYW4gYmUgZm91bmQgaGVyZSA6XG5odHRwOi8vYnViYmxlbWFpbC5mcmVlLmZyXG5cblBsZWFzZSByZXBvcnQgYW55IGlzc3VlIG9uIHRoZSBnaXRsYWIgcGFnZXMgb2YgdGhlIHByb2plY3QgOlxuaHR0cHM6Ly9mcmFtYWdpdC5vcmcvcmF6ZXIvYnViYmxlbWFpbC9pc3N1ZXNcbmh0dHBzOi8vZnJhbWFnaXQub3JnL3JhemVyL2J1YmJsZW1haWwtZ25vbWUtc2hlbGwvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYnViYmxlbWFpbC1nbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiQnViYmxlbWFpbCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAicmF6ZXJyYXpAZnJlZS5mciIsCiAgICAienVsdTk5QGdteC5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJ1YmJsZW1haWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwOi8vYnViYmxlbWFpbC5mcmVlLmZyIiwKICAidXVpZCI6ICJidWJibGVtYWlsQHJhemVyLmZyYW1hZ2l0Lm9yZyIsCiAgInZlcnNpb24iOiAxOQp9"}, "43": {"version": "19", "sha256": "141gn3pf6l3j2ms9zkn25qap07w4fc20z3d0jy4w7jwlv2l2pd5g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBmb3IgbmV3IGFuZCB1bnJlYWQgbWFpbCAoWWFob28sIEdtYWlsLCBNaWNyb3NvZnQsIE91dGxvb2ssIEFvbCwgSWNsb3VkLCBQcm90b25tYWlsLCBHbXguLi4pXG4gKiBNdWx0aXBsZSBhY2NvdW50cyBzdXBwb3J0XG4gKiBMb2NhbCBtYWlsIHN1cHBvcnQgZm9yIE1haWxkaXIgYW5kIE1ib3ggZm9ybWF0c1xuICogUmVtb3RlIG1haWwgc3VwcG9ydCBmb3IgUG9wMywgSW1hcCBhbmQgRXhjaGFuZ2UgcHJvdG9jb2xzXG4gKiBBdXRvbWF0aWMgaW1wb3J0cyBvZiBHbm9tZSBPbmxpbmUgQWNjb3VudHNcbiAqIFBsdWdpbiBzdXBwb3J0IHdpdGggZGVmYXVsdCBvbmVzIDogc3BhbSBmaWx0ZXIsIHNvdW5kIGFsZXJ0LCBsaWJub3RpZnksIHVzZXIgc2NyaXB0XG4gKiBBdmF0YXJzIHByb3ZpZGVkIGJ5IHRoZSBzZXJ2ZXIgb3IgZGVmYXVsdCBjb2xvcml6ZWQgb25lc1xuICogUmVwb3J0cyBmb3IgY29ubmVjdGlvbiBlcnJvcnMuXG5cbkJFIEFXQVJFIFRIQVQgVEhJUyBFWFRFTlNJT04gUkVRVUlSRVMgQlVCQkxFTUFJTCBTRVJWSUNFIElOU1RBTExBVElPTlxuQ2hlY2sgeW91ciBkaXN0cmlidXRpb24gcGFja2FnaW5nIHN5c3RlbSBmb3IgYXZhaWxhYmlsaXR5LlxuUGFja2FnZXMgZm9yIGRpc3RyaWJ1dGlvbnMgYW5kIHNvdXJjZSB0YXJiYWxscyBjYW4gYmUgZm91bmQgaGVyZSA6XG5odHRwOi8vYnViYmxlbWFpbC5mcmVlLmZyXG5cblBsZWFzZSByZXBvcnQgYW55IGlzc3VlIG9uIHRoZSBnaXRsYWIgcGFnZXMgb2YgdGhlIHByb2plY3QgOlxuaHR0cHM6Ly9mcmFtYWdpdC5vcmcvcmF6ZXIvYnViYmxlbWFpbC9pc3N1ZXNcbmh0dHBzOi8vZnJhbWFnaXQub3JnL3JhemVyL2J1YmJsZW1haWwtZ25vbWUtc2hlbGwvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYnViYmxlbWFpbC1nbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiQnViYmxlbWFpbCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAicmF6ZXJyYXpAZnJlZS5mciIsCiAgICAienVsdTk5QGdteC5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJ1YmJsZW1haWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwOi8vYnViYmxlbWFpbC5mcmVlLmZyIiwKICAidXVpZCI6ICJidWJibGVtYWlsQHJhemVyLmZyYW1hZ2l0Lm9yZyIsCiAgInZlcnNpb24iOiAxOQp9"}}} , {"uuid": "keypadTiling@abakkk.framagit.org", "name": "Keypad Tiling", "pname": "keypad-tiling", "description": "", "link": "https://extensions.gnome.org/extension/2473/keypad-tiling/", "shell_version_map": {"38": {"version": "4", "sha256": "1v0hxg96l482wngrszh0xabgj95q7rmyimd2rxnbkddd2gascnya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiIsCiAgImdldHRleHQtZG9tYWluIjogImtleXBhZC10aWxpbmciLAogICJuYW1lIjogIktleXBhZCBUaWxpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2V5cGFkLXRpbGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJrZXlwYWRUaWxpbmdAYWJha2trLmZyYW1hZ2l0Lm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "reminder_alarm_clock@trifonovkv.gmail.com", "name": "Reminder Alarm Clock", "pname": "reminder-alarm-clock", "description": "The reminder alarm clock will remind you of an important event at the appointed time.", "link": "https://extensions.gnome.org/extension/2482/reminder-alarm-clock/", "shell_version_map": {"38": {"version": "40", "sha256": "0yljdig44gly3fky4ls42shbpvf2387kgnn1dfla9zmxxzjdkryq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSByZW1pbmRlciBhbGFybSBjbG9jayB3aWxsIHJlbWluZCB5b3Ugb2YgYW4gaW1wb3J0YW50IGV2ZW50IGF0IHRoZSBhcHBvaW50ZWQgdGltZS4iLAogICJuYW1lIjogIlJlbWluZGVyIEFsYXJtIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4LjEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90cmlmb25vdmt2L1JlbWluZGVyQWxhcm1DbG9jayIsCiAgInV1aWQiOiAicmVtaW5kZXJfYWxhcm1fY2xvY2tAdHJpZm9ub3Zrdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDAKfQ=="}, "40": {"version": "42", "sha256": "05l8rss6nxcdv983iz5pxbqmkmhqwz7c24d7i7w4x40xz6lcn67z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSByZW1pbmRlciBhbGFybSBjbG9jayB3aWxsIHJlbWluZCB5b3Ugb2YgYW4gaW1wb3J0YW50IGV2ZW50IGF0IHRoZSBhcHBvaW50ZWQgdGltZS4iLAogICJuYW1lIjogIlJlbWluZGVyIEFsYXJtIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHJpZm9ub3Zrdi9SZW1pbmRlckFsYXJtQ2xvY2siLAogICJ1dWlkIjogInJlbWluZGVyX2FsYXJtX2Nsb2NrQHRyaWZvbm92a3YuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="}, "41": {"version": "42", "sha256": "05l8rss6nxcdv983iz5pxbqmkmhqwz7c24d7i7w4x40xz6lcn67z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSByZW1pbmRlciBhbGFybSBjbG9jayB3aWxsIHJlbWluZCB5b3Ugb2YgYW4gaW1wb3J0YW50IGV2ZW50IGF0IHRoZSBhcHBvaW50ZWQgdGltZS4iLAogICJuYW1lIjogIlJlbWluZGVyIEFsYXJtIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHJpZm9ub3Zrdi9SZW1pbmRlckFsYXJtQ2xvY2siLAogICJ1dWlkIjogInJlbWluZGVyX2FsYXJtX2Nsb2NrQHRyaWZvbm92a3YuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="}, "42": {"version": "42", "sha256": "05l8rss6nxcdv983iz5pxbqmkmhqwz7c24d7i7w4x40xz6lcn67z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSByZW1pbmRlciBhbGFybSBjbG9jayB3aWxsIHJlbWluZCB5b3Ugb2YgYW4gaW1wb3J0YW50IGV2ZW50IGF0IHRoZSBhcHBvaW50ZWQgdGltZS4iLAogICJuYW1lIjogIlJlbWluZGVyIEFsYXJtIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHJpZm9ub3Zrdi9SZW1pbmRlckFsYXJtQ2xvY2siLAogICJ1dWlkIjogInJlbWluZGVyX2FsYXJtX2Nsb2NrQHRyaWZvbm92a3YuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="}}} +, {"uuid": "reminder_alarm_clock@trifonovkv.gmail.com", "name": "Reminder Alarm Clock", "pname": "reminder-alarm-clock", "description": "The reminder alarm clock will remind you of an important event at the appointed time.", "link": "https://extensions.gnome.org/extension/2482/reminder-alarm-clock/", "shell_version_map": {"38": {"version": "40", "sha256": "0yljdig44gly3fky4ls42shbpvf2387kgnn1dfla9zmxxzjdkryq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSByZW1pbmRlciBhbGFybSBjbG9jayB3aWxsIHJlbWluZCB5b3Ugb2YgYW4gaW1wb3J0YW50IGV2ZW50IGF0IHRoZSBhcHBvaW50ZWQgdGltZS4iLAogICJuYW1lIjogIlJlbWluZGVyIEFsYXJtIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4LjEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90cmlmb25vdmt2L1JlbWluZGVyQWxhcm1DbG9jayIsCiAgInV1aWQiOiAicmVtaW5kZXJfYWxhcm1fY2xvY2tAdHJpZm9ub3Zrdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDAKfQ=="}, "40": {"version": "43", "sha256": "0y7lmssx1wa3iybd49zicbkjni238jh187rjjs8jaha2k6p82mvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSByZW1pbmRlciBhbGFybSBjbG9jayB3aWxsIHJlbWluZCB5b3Ugb2YgYW4gaW1wb3J0YW50IGV2ZW50IGF0IHRoZSBhcHBvaW50ZWQgdGltZS4iLAogICJuYW1lIjogIlJlbWluZGVyIEFsYXJtIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyaWZvbm92a3YvUmVtaW5kZXJBbGFybUNsb2NrIiwKICAidXVpZCI6ICJyZW1pbmRlcl9hbGFybV9jbG9ja0B0cmlmb25vdmt2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Mwp9"}, "41": {"version": "43", "sha256": "0y7lmssx1wa3iybd49zicbkjni238jh187rjjs8jaha2k6p82mvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSByZW1pbmRlciBhbGFybSBjbG9jayB3aWxsIHJlbWluZCB5b3Ugb2YgYW4gaW1wb3J0YW50IGV2ZW50IGF0IHRoZSBhcHBvaW50ZWQgdGltZS4iLAogICJuYW1lIjogIlJlbWluZGVyIEFsYXJtIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyaWZvbm92a3YvUmVtaW5kZXJBbGFybUNsb2NrIiwKICAidXVpZCI6ICJyZW1pbmRlcl9hbGFybV9jbG9ja0B0cmlmb25vdmt2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Mwp9"}, "42": {"version": "43", "sha256": "0y7lmssx1wa3iybd49zicbkjni238jh187rjjs8jaha2k6p82mvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSByZW1pbmRlciBhbGFybSBjbG9jayB3aWxsIHJlbWluZCB5b3Ugb2YgYW4gaW1wb3J0YW50IGV2ZW50IGF0IHRoZSBhcHBvaW50ZWQgdGltZS4iLAogICJuYW1lIjogIlJlbWluZGVyIEFsYXJtIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyaWZvbm92a3YvUmVtaW5kZXJBbGFybUNsb2NrIiwKICAidXVpZCI6ICJyZW1pbmRlcl9hbGFybV9jbG9ja0B0cmlmb25vdmt2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Mwp9"}, "43": {"version": "43", "sha256": "0y7lmssx1wa3iybd49zicbkjni238jh187rjjs8jaha2k6p82mvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSByZW1pbmRlciBhbGFybSBjbG9jayB3aWxsIHJlbWluZCB5b3Ugb2YgYW4gaW1wb3J0YW50IGV2ZW50IGF0IHRoZSBhcHBvaW50ZWQgdGltZS4iLAogICJuYW1lIjogIlJlbWluZGVyIEFsYXJtIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyaWZvbm92a3YvUmVtaW5kZXJBbGFybUNsb2NrIiwKICAidXVpZCI6ICJyZW1pbmRlcl9hbGFybV9jbG9ja0B0cmlmb25vdmt2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Mwp9"}}} , {"uuid": "TaskBar@c0ldplasma", "name": "TaskBar 2020", "pname": "taskbar-updated", "description": "!!! Development stopped !!!! Look at Dash to Panel as an alternative: https://extensions.gnome.org/extension/1160/dash-to-panel/\n\n----------------------------------------------------------------------\n\nTaskBar 2020 displays icons of running applications and favorites on the top panel or alternatively on a new bottom panel. Activate, minimize or close tasks with a simple click. \n\nTaskBar 2020 is a dock-like windows list on the top/bottom bar. \n\nFork of zpydr/gnome-shell-extension-taskbar to support newer versions of GNOME", "link": "https://extensions.gnome.org/extension/2506/taskbar-updated/", "shell_version_map": {"38": {"version": "5", "sha256": "09yn1p0vmq70ll7vi3jdjvj479cm38r4am0mw08nca8hl4zdiamj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiEhISBEZXZlbG9wbWVudCBzdG9wcGVkICEhISEgIExvb2sgYXQgRGFzaCB0byBQYW5lbCBhcyBhbiBhbHRlcm5hdGl2ZTogaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMTE2MC9kYXNoLXRvLXBhbmVsL1xuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5cblRhc2tCYXIgMjAyMCBkaXNwbGF5cyBpY29ucyBvZiBydW5uaW5nIGFwcGxpY2F0aW9ucyBhbmQgZmF2b3JpdGVzIG9uIHRoZSB0b3AgcGFuZWwgb3IgYWx0ZXJuYXRpdmVseSBvbiBhIG5ldyBib3R0b20gcGFuZWwuIEFjdGl2YXRlLCBtaW5pbWl6ZSBvciBjbG9zZSB0YXNrcyB3aXRoIGEgc2ltcGxlIGNsaWNrLiBcblxuVGFza0JhciAyMDIwIGlzIGEgZG9jay1saWtlIHdpbmRvd3MgbGlzdCBvbiB0aGUgdG9wL2JvdHRvbSBiYXIuIFxuXG5Gb3JrIG9mIHpweWRyL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrYmFyIHRvIHN1cHBvcnQgbmV3ZXIgdmVyc2lvbnMgb2YgR05PTUUiLAogICJuYW1lIjogIlRhc2tCYXIgMjAyMCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2MwbGRwbGFzbWEvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2tiYXIiLAogICJ1dWlkIjogIlRhc2tCYXJAYzBsZHBsYXNtYSIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "8", "sha256": "0a2fwmm1n5n2ifryb6yfzh4nj4h11qkphpxvp876fyll03y9p2m5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiEhISBEZXZlbG9wbWVudCBzdG9wcGVkICEhISEgIExvb2sgYXQgRGFzaCB0byBQYW5lbCBhcyBhbiBhbHRlcm5hdGl2ZTogaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMTE2MC9kYXNoLXRvLXBhbmVsL1xuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5cblRhc2tCYXIgMjAyMCBkaXNwbGF5cyBpY29ucyBvZiBydW5uaW5nIGFwcGxpY2F0aW9ucyBhbmQgZmF2b3JpdGVzIG9uIHRoZSB0b3AgcGFuZWwgb3IgYWx0ZXJuYXRpdmVseSBvbiBhIG5ldyBib3R0b20gcGFuZWwuIEFjdGl2YXRlLCBtaW5pbWl6ZSBvciBjbG9zZSB0YXNrcyB3aXRoIGEgc2ltcGxlIGNsaWNrLiBcblxuVGFza0JhciAyMDIwIGlzIGEgZG9jay1saWtlIHdpbmRvd3MgbGlzdCBvbiB0aGUgdG9wL2JvdHRvbSBiYXIuIFxuXG5Gb3JrIG9mIHpweWRyL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrYmFyIHRvIHN1cHBvcnQgbmV3ZXIgdmVyc2lvbnMgb2YgR05PTUUiLAogICJuYW1lIjogIlRhc2tCYXIgMjAyMCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jMGxkcGxhc21hL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrYmFyIiwKICAidXVpZCI6ICJUYXNrQmFyQGMwbGRwbGFzbWEiLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"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": "6", "sha256": "1id2wlp3w35rjsyh2jhzhmxzmfrhk1p1mg4vvgxqaz40rdv69dzz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGtlcm5lbCB2ZXJzaW9uIGluIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJLZXJuZWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2VsYm91bGFuZ2Vyby9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2VybmVsLWluZGljYXRvciIsCiAgInV1aWQiOiAia2VybmVsLWluZGljYXRvckBlbGJvdWxhbmdlcm8uZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1id2wlp3w35rjsyh2jhzhmxzmfrhk1p1mg4vvgxqaz40rdv69dzz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGtlcm5lbCB2ZXJzaW9uIGluIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJLZXJuZWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2VsYm91bGFuZ2Vyby9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2VybmVsLWluZGljYXRvciIsCiAgInV1aWQiOiAia2VybmVsLWluZGljYXRvckBlbGJvdWxhbmdlcm8uZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "1id2wlp3w35rjsyh2jhzhmxzmfrhk1p1mg4vvgxqaz40rdv69dzz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGtlcm5lbCB2ZXJzaW9uIGluIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJLZXJuZWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2VsYm91bGFuZ2Vyby9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2VybmVsLWluZGljYXRvciIsCiAgInV1aWQiOiAia2VybmVsLWluZGljYXRvckBlbGJvdWxhbmdlcm8uZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "1id2wlp3w35rjsyh2jhzhmxzmfrhk1p1mg4vvgxqaz40rdv69dzz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGtlcm5lbCB2ZXJzaW9uIGluIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJLZXJuZWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2VsYm91bGFuZ2Vyby9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2VybmVsLWluZGljYXRvciIsCiAgInV1aWQiOiAia2VybmVsLWluZGljYXRvckBlbGJvdWxhbmdlcm8uZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"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="}, "42": {"version": "32", "sha256": "06mn3wfd80pxd47z55lhdl2nqm5a2dd69app6kajsf56rvxq7bq3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mbG9hdGluZ0RvY2siLAogICJ1dWlkIjogImZsb2F0aW5nRG9ja0BzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzMgp9"}, "43": {"version": "32", "sha256": "06mn3wfd80pxd47z55lhdl2nqm5a2dd69app6kajsf56rvxq7bq3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mbG9hdGluZ0RvY2siLAogICJ1dWlkIjogImZsb2F0aW5nRG9ja0BzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzMgp9"}}} , {"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": "10", "sha256": "0xpw8n29y5j8vfb1fkxn8ph78m4bhi1k8q830g1zzpr3gmsabadi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSXNvcG9saXRvL2dOb3JkVlBOLUxvY2FsIiwKICAidXVpZCI6ICJnbm9yZHZwbi1sb2NhbEBpc29wb2xpdG8iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "11", "sha256": "1l5g5g279agfa1b3v02z1lhb1yhgaaxan5vwkksc0ck2cm7pi9mq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Jc29wb2xpdG8vZ05vcmRWUE4tTG9jYWwiLAogICJ1dWlkIjogImdub3JkdnBuLWxvY2FsQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "1l5g5g279agfa1b3v02z1lhb1yhgaaxan5vwkksc0ck2cm7pi9mq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Jc29wb2xpdG8vZ05vcmRWUE4tTG9jYWwiLAogICJ1dWlkIjogImdub3JkdnBuLWxvY2FsQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiAxMQp9"}, "42": {"version": "11", "sha256": "1l5g5g279agfa1b3v02z1lhb1yhgaaxan5vwkksc0ck2cm7pi9mq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Jc29wb2xpdG8vZ05vcmRWUE4tTG9jYWwiLAogICJ1dWlkIjogImdub3JkdnBuLWxvY2FsQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiAxMQp9"}, "43": {"version": "13", "sha256": "0m0i6nkp0k309zcqkdjraaq5r7skvi3gp9jz1xs2pvx5wrh6fbmf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSXNvcG9saXRvL2dOb3JkVlBOLUxvY2FsIiwKICAidXVpZCI6ICJnbm9yZHZwbi1sb2NhbEBpc29wb2xpdG8iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} +, {"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": "10", "sha256": "0xpw8n29y5j8vfb1fkxn8ph78m4bhi1k8q830g1zzpr3gmsabadi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSXNvcG9saXRvL2dOb3JkVlBOLUxvY2FsIiwKICAidXVpZCI6ICJnbm9yZHZwbi1sb2NhbEBpc29wb2xpdG8iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "15", "sha256": "14prrydkkvyq6kmznapjq31abk55v04bxdp3cx30gsdi6bkbfqav", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Jc29wb2xpdG8vZ05vcmRWUE4tTG9jYWwiLAogICJ1dWlkIjogImdub3JkdnBuLWxvY2FsQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiAxNQp9"}, "41": {"version": "15", "sha256": "14prrydkkvyq6kmznapjq31abk55v04bxdp3cx30gsdi6bkbfqav", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Jc29wb2xpdG8vZ05vcmRWUE4tTG9jYWwiLAogICJ1dWlkIjogImdub3JkdnBuLWxvY2FsQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiAxNQp9"}, "42": {"version": "15", "sha256": "14prrydkkvyq6kmznapjq31abk55v04bxdp3cx30gsdi6bkbfqav", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Jc29wb2xpdG8vZ05vcmRWUE4tTG9jYWwiLAogICJ1dWlkIjogImdub3JkdnBuLWxvY2FsQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiAxNQp9"}, "43": {"version": "16", "sha256": "02nk15pfqd0s7f2djyvpn90idaqby8xfh2h4jbv40w792g40z52b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSXNvcG9saXRvL2dOb3JkVlBOLUxvY2FsIiwKICAidXVpZCI6ICJnbm9yZHZwbi1sb2NhbEBpc29wb2xpdG8iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} , {"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": "8", "sha256": "006pxfxpvw41fjbqpyyifr9r7fai5ghvfgb0wmdl8xm9ix1sh4j2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6IDEpIE5ldyBtZXNzYWdlIGluZGljYXRvciBpcyBhbHdheXMgc2hvd24gaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIDIpIFRoZSBjb2xvciBvZiB0aGUgaW5kaWNhdG9yIGNhbiBiZSBjdXN0b21pemVkLiAzKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx3YXlzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQWx3YXlzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHdheXMtaW5kaWNhdG9yLXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXp1ci9nbm9tZS1zaGVsbC1hbHdheXMtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJhbHdheXMtaW5kaWNhdG9yQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "006pxfxpvw41fjbqpyyifr9r7fai5ghvfgb0wmdl8xm9ix1sh4j2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6IDEpIE5ldyBtZXNzYWdlIGluZGljYXRvciBpcyBhbHdheXMgc2hvd24gaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIDIpIFRoZSBjb2xvciBvZiB0aGUgaW5kaWNhdG9yIGNhbiBiZSBjdXN0b21pemVkLiAzKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx3YXlzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQWx3YXlzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHdheXMtaW5kaWNhdG9yLXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXp1ci9nbm9tZS1zaGVsbC1hbHdheXMtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJhbHdheXMtaW5kaWNhdG9yQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "006pxfxpvw41fjbqpyyifr9r7fai5ghvfgb0wmdl8xm9ix1sh4j2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6IDEpIE5ldyBtZXNzYWdlIGluZGljYXRvciBpcyBhbHdheXMgc2hvd24gaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIDIpIFRoZSBjb2xvciBvZiB0aGUgaW5kaWNhdG9yIGNhbiBiZSBjdXN0b21pemVkLiAzKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx3YXlzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQWx3YXlzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHdheXMtaW5kaWNhdG9yLXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXp1ci9nbm9tZS1zaGVsbC1hbHdheXMtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJhbHdheXMtaW5kaWNhdG9yQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogOAp9"}}} -, {"uuid": "eruption-profile-switcher@x3n0m0rph59.org", "name": "Eruption Profile Switcher", "pname": "eruption-profile-switcher", "description": "Runtime Profile switcher for the Eruption Realtime RGB LED Driver for Linux", "link": "https://extensions.gnome.org/extension/2621/eruption-profile-switcher/", "shell_version_map": {"38": {"version": "15", "sha256": "14zgczf2z7jv707whimggl3h31c44m1qdzncin38vdcdzhm2g7hv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9YM24wbTBycGg1OS9lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJlcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyQHgzbjBtMHJwaDU5Lm9yZyIsCiAgInZlcnNpb24iOiAxNQp9"}, "40": {"version": "27", "sha256": "1lcsf8611365d8pjk4s905jmj3sc8dq6y833fbv6yxbd36xvkghs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "41": {"version": "27", "sha256": "1lcsf8611365d8pjk4s905jmj3sc8dq6y833fbv6yxbd36xvkghs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "42": {"version": "27", "sha256": "1lcsf8611365d8pjk4s905jmj3sc8dq6y833fbv6yxbd36xvkghs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "43": {"version": "27", "sha256": "1lcsf8611365d8pjk4s905jmj3sc8dq6y833fbv6yxbd36xvkghs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDI3Cn0="}}} +, {"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": "9", "sha256": "06rgadbhjkayyjjqffkrq7xija49fzd1n0xzxddkin8s121h1mr7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6IDEpIE5ldyBtZXNzYWdlIGluZGljYXRvciBpcyBhbHdheXMgc2hvd24gaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIDIpIFRoZSBjb2xvciBvZiB0aGUgaW5kaWNhdG9yIGNhbiBiZSBjdXN0b21pemVkLiAzKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx3YXlzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQWx3YXlzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHdheXMtaW5kaWNhdG9yLXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYWx3YXlzLWluZGljYXRvciIsCiAgInV1aWQiOiAiYWx3YXlzLWluZGljYXRvckBtYXJ0aW4uenVyb3dpZXR6LmRlIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "06rgadbhjkayyjjqffkrq7xija49fzd1n0xzxddkin8s121h1mr7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6IDEpIE5ldyBtZXNzYWdlIGluZGljYXRvciBpcyBhbHdheXMgc2hvd24gaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIDIpIFRoZSBjb2xvciBvZiB0aGUgaW5kaWNhdG9yIGNhbiBiZSBjdXN0b21pemVkLiAzKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx3YXlzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQWx3YXlzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHdheXMtaW5kaWNhdG9yLXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYWx3YXlzLWluZGljYXRvciIsCiAgInV1aWQiOiAiYWx3YXlzLWluZGljYXRvckBtYXJ0aW4uenVyb3dpZXR6LmRlIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "06rgadbhjkayyjjqffkrq7xija49fzd1n0xzxddkin8s121h1mr7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6IDEpIE5ldyBtZXNzYWdlIGluZGljYXRvciBpcyBhbHdheXMgc2hvd24gaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIDIpIFRoZSBjb2xvciBvZiB0aGUgaW5kaWNhdG9yIGNhbiBiZSBjdXN0b21pemVkLiAzKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx3YXlzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQWx3YXlzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHdheXMtaW5kaWNhdG9yLXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYWx3YXlzLWluZGljYXRvciIsCiAgInV1aWQiOiAiYWx3YXlzLWluZGljYXRvckBtYXJ0aW4uenVyb3dpZXR6LmRlIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "06rgadbhjkayyjjqffkrq7xija49fzd1n0xzxddkin8s121h1mr7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6IDEpIE5ldyBtZXNzYWdlIGluZGljYXRvciBpcyBhbHdheXMgc2hvd24gaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIDIpIFRoZSBjb2xvciBvZiB0aGUgaW5kaWNhdG9yIGNhbiBiZSBjdXN0b21pemVkLiAzKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx3YXlzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQWx3YXlzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHdheXMtaW5kaWNhdG9yLXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYWx3YXlzLWluZGljYXRvciIsCiAgInV1aWQiOiAiYWx3YXlzLWluZGljYXRvckBtYXJ0aW4uenVyb3dpZXR6LmRlIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} +, {"uuid": "eruption-profile-switcher@x3n0m0rph59.org", "name": "Eruption Profile Switcher", "pname": "eruption-profile-switcher", "description": "Runtime Profile switcher for the Eruption Realtime RGB LED Driver for Linux", "link": "https://extensions.gnome.org/extension/2621/eruption-profile-switcher/", "shell_version_map": {"38": {"version": "15", "sha256": "14zgczf2z7jv707whimggl3h31c44m1qdzncin38vdcdzhm2g7hv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9YM24wbTBycGg1OS9lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJlcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyQHgzbjBtMHJwaDU5Lm9yZyIsCiAgInZlcnNpb24iOiAxNQp9"}, "40": {"version": "32", "sha256": "1rqhyb1f3mw93df6v7qdh1y5ih5n4dangg8qzi6jynw9ajndlfcc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDMyCn0="}, "41": {"version": "32", "sha256": "1rqhyb1f3mw93df6v7qdh1y5ih5n4dangg8qzi6jynw9ajndlfcc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDMyCn0="}, "42": {"version": "32", "sha256": "1rqhyb1f3mw93df6v7qdh1y5ih5n4dangg8qzi6jynw9ajndlfcc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDMyCn0="}, "43": {"version": "32", "sha256": "1rqhyb1f3mw93df6v7qdh1y5ih5n4dangg8qzi6jynw9ajndlfcc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDMyCn0="}}} , {"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": "8", "sha256": "1qzjh4gf6gry6xy6759bha3s3rsnfmizw32isap4j0rdsyl77j90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "1qzjh4gf6gry6xy6759bha3s3rsnfmizw32isap4j0rdsyl77j90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1qzjh4gf6gry6xy6759bha3s3rsnfmizw32isap4j0rdsyl77j90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "1qzjh4gf6gry6xy6759bha3s3rsnfmizw32isap4j0rdsyl77j90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"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": "7", "sha256": "03x65bms6ns9jz1m0kmklpjaq1lgdl9h2pmqvfczmk2vf3bmjjwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vaGlkZS1taW5pbWl6ZWQiLAogICJ1dWlkIjogImhpZGUtbWluaW1pemVkQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "03x65bms6ns9jz1m0kmklpjaq1lgdl9h2pmqvfczmk2vf3bmjjwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vaGlkZS1taW5pbWl6ZWQiLAogICJ1dWlkIjogImhpZGUtbWluaW1pemVkQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "03x65bms6ns9jz1m0kmklpjaq1lgdl9h2pmqvfczmk2vf3bmjjwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vaGlkZS1taW5pbWl6ZWQiLAogICJ1dWlkIjogImhpZGUtbWluaW1pemVkQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "03x65bms6ns9jz1m0kmklpjaq1lgdl9h2pmqvfczmk2vf3bmjjwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vaGlkZS1taW5pbWl6ZWQiLAogICJ1dWlkIjogImhpZGUtbWluaW1pemVkQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "03x65bms6ns9jz1m0kmklpjaq1lgdl9h2pmqvfczmk2vf3bmjjwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vaGlkZS1taW5pbWl6ZWQiLAogICJ1dWlkIjogImhpZGUtbWluaW1pemVkQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}}} -, {"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": "30", "sha256": "14xvsd4irbhqicz8hkwny0mm9kb3230qyjypz61q1ip1i6sr8f26", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZWQgMjAyMi1KYW4tMDU6IFRoZXJlIGFyZSBtdWx0aXBsZSB3YXlzIG9mIGxpc3RpbmcgdGhlIGNvbnRyb2wgc2xpZGVycywgZWl0aGVyIGluIHRvcCBiYXIgb3IgaW4gc3lzdGVtIG1lbnUsIHdpdGggb3Igd2l0aG91dCB2YWx1ZSBsYWJlbHMuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgInV1aWQiOiAiZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWxAdGhlbWlnaHR5ZGVpdHkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMAp9"}, "41": {"version": "30", "sha256": "14xvsd4irbhqicz8hkwny0mm9kb3230qyjypz61q1ip1i6sr8f26", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZWQgMjAyMi1KYW4tMDU6IFRoZXJlIGFyZSBtdWx0aXBsZSB3YXlzIG9mIGxpc3RpbmcgdGhlIGNvbnRyb2wgc2xpZGVycywgZWl0aGVyIGluIHRvcCBiYXIgb3IgaW4gc3lzdGVtIG1lbnUsIHdpdGggb3Igd2l0aG91dCB2YWx1ZSBsYWJlbHMuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgInV1aWQiOiAiZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWxAdGhlbWlnaHR5ZGVpdHkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMAp9"}, "42": {"version": "31", "sha256": "0lzcpankfsis4z0hb6hk03k1rzcipdb5645vz4wvlkzbriqdvwmd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZWQgMjAyMi1KYW4tMDU6IFRoZXJlIGFyZSBtdWx0aXBsZSB3YXlzIG9mIGxpc3RpbmcgdGhlIGNvbnRyb2wgc2xpZGVycywgZWl0aGVyIGluIHRvcCBiYXIgb3IgaW4gc3lzdGVtIG1lbnUsIHdpdGggb3Igd2l0aG91dCB2YWx1ZSBsYWJlbHMuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzEKfQ=="}, "43": {"version": "32", "sha256": "0rf7bb4mgca7g03rb7xbs001zpa3lyccvn4xvlybiisgsvzw3z7d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZWQgMjAyMi1KYW4tMDU6IFRoZXJlIGFyZSBtdWx0aXBsZSB3YXlzIG9mIGxpc3RpbmcgdGhlIGNvbnRyb2wgc2xpZGVycywgZWl0aGVyIGluIHRvcCBiYXIgb3IgaW4gc3lzdGVtIG1lbnUsIHdpdGggb3Igd2l0aG91dCB2YWx1ZSBsYWJlbHMuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="}}} +, {"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\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": "1a9ndhkjx6myqynx6smyjxd9f9f4520wfwyh92lghg8c6bvr4mb6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJuYW1lIjogIkJyaWdodG5lc3MgY29udHJvbCB1c2luZyBkZGN1dGlsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "30", "sha256": "121kw0impmq3vpaikngjxr7jm98dk54c0cfxkr6zzcbvz3ni0rrl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgInV1aWQiOiAiZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWxAdGhlbWlnaHR5ZGVpdHkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMAp9"}, "41": {"version": "30", "sha256": "121kw0impmq3vpaikngjxr7jm98dk54c0cfxkr6zzcbvz3ni0rrl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgInV1aWQiOiAiZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWxAdGhlbWlnaHR5ZGVpdHkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMAp9"}, "42": {"version": "31", "sha256": "035j0qswaw2hj06ybq2qdhlsshwfi2fyh2l0mca7jq1qp2w955xw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzEKfQ=="}, "43": {"version": "35", "sha256": "06bji8hg3ffvwp1mslzqlbgjq6zpjn6c652h9lrk9vswwzwriffs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}}} , {"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": "3", "sha256": "178yi4wm7h52al01a9l0q765rm6hwj0j19sg29jw4pgm0c11kywq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hc3F1ZXJhZGUtQ2lyY3VzL2dub21lLXRpbWV6b25lcy1leHRlbnNpb24iLAogICJ1dWlkIjogInRpbWV6b25lc0BtYXNxdWVyYWRlLWNpcmN1cy5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "178yi4wm7h52al01a9l0q765rm6hwj0j19sg29jw4pgm0c11kywq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hc3F1ZXJhZGUtQ2lyY3VzL2dub21lLXRpbWV6b25lcy1leHRlbnNpb24iLAogICJ1dWlkIjogInRpbWV6b25lc0BtYXNxdWVyYWRlLWNpcmN1cy5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "178yi4wm7h52al01a9l0q765rm6hwj0j19sg29jw4pgm0c11kywq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hc3F1ZXJhZGUtQ2lyY3VzL2dub21lLXRpbWV6b25lcy1leHRlbnNpb24iLAogICJ1dWlkIjogInRpbWV6b25lc0BtYXNxdWVyYWRlLWNpcmN1cy5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "178yi4wm7h52al01a9l0q765rm6hwj0j19sg29jw4pgm0c11kywq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hc3F1ZXJhZGUtQ2lyY3VzL2dub21lLXRpbWV6b25lcy1leHRlbnNpb24iLAogICJ1dWlkIjogInRpbWV6b25lc0BtYXNxdWVyYWRlLWNpcmN1cy5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"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.\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": "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": "10", "sha256": "0hahn9aihbcmy0pi6z9wqhdykw042y5kfbllh270dix8qvd2vmga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIHNoZWxmIGluIHRoZSB0b3AgcGFuZWwsIHdpdGggbWluaW1pemVkIHdpbmRvd3Mgb2YgdGhlIGN1cnJlbnQgd29ya3NwYWNlLlxuXG4gTm8gc2V0dGluZ3MgYnV0IHlvdSBjYW4gZWFzaWx5IHBsYXkgYXJvdW5kIHdpdGggQ1NTIGZpbGUuIFRoaXMgZXh0ZW5zaW9uIGlzIGxpZ2h0IGFuZCBzaG91bGQgbm90IGludGVyZmVyZSB3aXRoIEdOT01FIFNoZWxsIGJlaGF2aW91citsb2dpYy4iLAogICJuYW1lIjogIk1pbmltaXplIFNoZWxmIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmF0aXN0ZW8vbWluaW1pemUtc2hlbGYiLAogICJ1dWlkIjogIm1pbmltaXplLXNoZWxmQGV0ZW5pbCIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0hahn9aihbcmy0pi6z9wqhdykw042y5kfbllh270dix8qvd2vmga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIHNoZWxmIGluIHRoZSB0b3AgcGFuZWwsIHdpdGggbWluaW1pemVkIHdpbmRvd3Mgb2YgdGhlIGN1cnJlbnQgd29ya3NwYWNlLlxuXG4gTm8gc2V0dGluZ3MgYnV0IHlvdSBjYW4gZWFzaWx5IHBsYXkgYXJvdW5kIHdpdGggQ1NTIGZpbGUuIFRoaXMgZXh0ZW5zaW9uIGlzIGxpZ2h0IGFuZCBzaG91bGQgbm90IGludGVyZmVyZSB3aXRoIEdOT01FIFNoZWxsIGJlaGF2aW91citsb2dpYy4iLAogICJuYW1lIjogIk1pbmltaXplIFNoZWxmIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmF0aXN0ZW8vbWluaW1pemUtc2hlbGYiLAogICJ1dWlkIjogIm1pbmltaXplLXNoZWxmQGV0ZW5pbCIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "0hahn9aihbcmy0pi6z9wqhdykw042y5kfbllh270dix8qvd2vmga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIHNoZWxmIGluIHRoZSB0b3AgcGFuZWwsIHdpdGggbWluaW1pemVkIHdpbmRvd3Mgb2YgdGhlIGN1cnJlbnQgd29ya3NwYWNlLlxuXG4gTm8gc2V0dGluZ3MgYnV0IHlvdSBjYW4gZWFzaWx5IHBsYXkgYXJvdW5kIHdpdGggQ1NTIGZpbGUuIFRoaXMgZXh0ZW5zaW9uIGlzIGxpZ2h0IGFuZCBzaG91bGQgbm90IGludGVyZmVyZSB3aXRoIEdOT01FIFNoZWxsIGJlaGF2aW91citsb2dpYy4iLAogICJuYW1lIjogIk1pbmltaXplIFNoZWxmIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmF0aXN0ZW8vbWluaW1pemUtc2hlbGYiLAogICJ1dWlkIjogIm1pbmltaXplLXNoZWxmQGV0ZW5pbCIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"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": "8", "sha256": "1zbhy2cgd1h8wqq2cgx97r6d9jfks5w90aalcybswfh9dvnxcis0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmpvZXJuRGFhc2UvcmVtb3ZlLWFsdC10YWItZGVsYXkiLAogICJ1dWlkIjogInJlbW92ZS1hbHQtdGFiLWRlbGF5QGRhYXNlLm5ldCIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "1zbhy2cgd1h8wqq2cgx97r6d9jfks5w90aalcybswfh9dvnxcis0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmpvZXJuRGFhc2UvcmVtb3ZlLWFsdC10YWItZGVsYXkiLAogICJ1dWlkIjogInJlbW92ZS1hbHQtdGFiLWRlbGF5QGRhYXNlLm5ldCIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "1zbhy2cgd1h8wqq2cgx97r6d9jfks5w90aalcybswfh9dvnxcis0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmpvZXJuRGFhc2UvcmVtb3ZlLWFsdC10YWItZGVsYXkiLAogICJ1dWlkIjogInJlbW92ZS1hbHQtdGFiLWRlbGF5QGRhYXNlLm5ldCIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1zbhy2cgd1h8wqq2cgx97r6d9jfks5w90aalcybswfh9dvnxcis0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmpvZXJuRGFhc2UvcmVtb3ZlLWFsdC10YWItZGVsYXkiLAogICJ1dWlkIjogInJlbW92ZS1hbHQtdGFiLWRlbGF5QGRhYXNlLm5ldCIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "1zbhy2cgd1h8wqq2cgx97r6d9jfks5w90aalcybswfh9dvnxcis0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmpvZXJuRGFhc2UvcmVtb3ZlLWFsdC10YWItZGVsYXkiLAogICJ1dWlkIjogInJlbW92ZS1hbHQtdGFiLWRlbGF5QGRhYXNlLm5ldCIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"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": "7", "sha256": "0xycwf9zks6kcwxrrn5rk1sn0km7zvzxzzp6bfag6qnibkgliwsn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklmIGEgYmFja2xpZ2h0IGRldmljZSBpcyBhdmFpbGFibGUsIHRoaXMgZXh0ZW5zaW9uIHNob3dzIGEgYnJpZ2h0bmVzcyBpbmRpY2F0b3Igb24gcGFuZWwgbWVudSwgdGhhdCBhbGxvd3MgY2hhbmdpbmcgYnJpZ2h0bmVzcyB0aHJvdWdoIHNjcm9sbGluZyBvbiBpdC4gVXNlZnVsLCB3aGVuIHVzaW5nIGRkY2NpLWRyaXZlci1saW51eCBvbiBhIGRlc2t0b3AgUEMgd2l0aG91dCBuYXRpdmUga2V5Ym9hcmQgYnV0dG9ucyB0byBjaGFuZ2UgYnJpZ2h0bmVzcy4iLAogICJuYW1lIjogIkJyaWdodG5lc3MgUGFuZWwgTWVudSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG8tc2NoL2dub21lLXNoZWxsLWJyaWdodG5lc3MtcGFuZWwtbWVudS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJyaWdodG5lc3NwYW5lbG1lbnVpbmRpY2F0b3JAZG8uc2NoLmRldi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "0xycwf9zks6kcwxrrn5rk1sn0km7zvzxzzp6bfag6qnibkgliwsn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklmIGEgYmFja2xpZ2h0IGRldmljZSBpcyBhdmFpbGFibGUsIHRoaXMgZXh0ZW5zaW9uIHNob3dzIGEgYnJpZ2h0bmVzcyBpbmRpY2F0b3Igb24gcGFuZWwgbWVudSwgdGhhdCBhbGxvd3MgY2hhbmdpbmcgYnJpZ2h0bmVzcyB0aHJvdWdoIHNjcm9sbGluZyBvbiBpdC4gVXNlZnVsLCB3aGVuIHVzaW5nIGRkY2NpLWRyaXZlci1saW51eCBvbiBhIGRlc2t0b3AgUEMgd2l0aG91dCBuYXRpdmUga2V5Ym9hcmQgYnV0dG9ucyB0byBjaGFuZ2UgYnJpZ2h0bmVzcy4iLAogICJuYW1lIjogIkJyaWdodG5lc3MgUGFuZWwgTWVudSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG8tc2NoL2dub21lLXNoZWxsLWJyaWdodG5lc3MtcGFuZWwtbWVudS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJyaWdodG5lc3NwYW5lbG1lbnVpbmRpY2F0b3JAZG8uc2NoLmRldi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "0xycwf9zks6kcwxrrn5rk1sn0km7zvzxzzp6bfag6qnibkgliwsn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklmIGEgYmFja2xpZ2h0IGRldmljZSBpcyBhdmFpbGFibGUsIHRoaXMgZXh0ZW5zaW9uIHNob3dzIGEgYnJpZ2h0bmVzcyBpbmRpY2F0b3Igb24gcGFuZWwgbWVudSwgdGhhdCBhbGxvd3MgY2hhbmdpbmcgYnJpZ2h0bmVzcyB0aHJvdWdoIHNjcm9sbGluZyBvbiBpdC4gVXNlZnVsLCB3aGVuIHVzaW5nIGRkY2NpLWRyaXZlci1saW51eCBvbiBhIGRlc2t0b3AgUEMgd2l0aG91dCBuYXRpdmUga2V5Ym9hcmQgYnV0dG9ucyB0byBjaGFuZ2UgYnJpZ2h0bmVzcy4iLAogICJuYW1lIjogIkJyaWdodG5lc3MgUGFuZWwgTWVudSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG8tc2NoL2dub21lLXNoZWxsLWJyaWdodG5lc3MtcGFuZWwtbWVudS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJyaWdodG5lc3NwYW5lbG1lbnVpbmRpY2F0b3JAZG8uc2NoLmRldi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "0xycwf9zks6kcwxrrn5rk1sn0km7zvzxzzp6bfag6qnibkgliwsn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklmIGEgYmFja2xpZ2h0IGRldmljZSBpcyBhdmFpbGFibGUsIHRoaXMgZXh0ZW5zaW9uIHNob3dzIGEgYnJpZ2h0bmVzcyBpbmRpY2F0b3Igb24gcGFuZWwgbWVudSwgdGhhdCBhbGxvd3MgY2hhbmdpbmcgYnJpZ2h0bmVzcyB0aHJvdWdoIHNjcm9sbGluZyBvbiBpdC4gVXNlZnVsLCB3aGVuIHVzaW5nIGRkY2NpLWRyaXZlci1saW51eCBvbiBhIGRlc2t0b3AgUEMgd2l0aG91dCBuYXRpdmUga2V5Ym9hcmQgYnV0dG9ucyB0byBjaGFuZ2UgYnJpZ2h0bmVzcy4iLAogICJuYW1lIjogIkJyaWdodG5lc3MgUGFuZWwgTWVudSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG8tc2NoL2dub21lLXNoZWxsLWJyaWdodG5lc3MtcGFuZWwtbWVudS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJyaWdodG5lc3NwYW5lbG1lbnVpbmRpY2F0b3JAZG8uc2NoLmRldi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "0xycwf9zks6kcwxrrn5rk1sn0km7zvzxzzp6bfag6qnibkgliwsn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklmIGEgYmFja2xpZ2h0IGRldmljZSBpcyBhdmFpbGFibGUsIHRoaXMgZXh0ZW5zaW9uIHNob3dzIGEgYnJpZ2h0bmVzcyBpbmRpY2F0b3Igb24gcGFuZWwgbWVudSwgdGhhdCBhbGxvd3MgY2hhbmdpbmcgYnJpZ2h0bmVzcyB0aHJvdWdoIHNjcm9sbGluZyBvbiBpdC4gVXNlZnVsLCB3aGVuIHVzaW5nIGRkY2NpLWRyaXZlci1saW51eCBvbiBhIGRlc2t0b3AgUEMgd2l0aG91dCBuYXRpdmUga2V5Ym9hcmQgYnV0dG9ucyB0byBjaGFuZ2UgYnJpZ2h0bmVzcy4iLAogICJuYW1lIjogIkJyaWdodG5lc3MgUGFuZWwgTWVudSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG8tc2NoL2dub21lLXNoZWxsLWJyaWdodG5lc3MtcGFuZWwtbWVudS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJyaWdodG5lc3NwYW5lbG1lbnVpbmRpY2F0b3JAZG8uc2NoLmRldi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} -, {"uuid": "crypto@alipirpiran.github", "name": "Crypto Price Tracker", "pname": "crypto-price-tracker", "description": "Simple extension to track price of Crypto Currencies\n\nSources: Binance, OKX, Coingecko\n\nAdd coins by symbols, for example:\n* Binance pairs: \"BTC/USDT\"\n* OKX pairs: \"LTC/USDT\"\n* Coingecko pairs: \"BTC/USD\"\n\nUsing api.coingecko.com, okx.com, binance.com\nComplete list of pairs: https://www.binance.com/indexSpa.html\nComplete guide: https://github.com/alipirpiran/Crypto-Price-Tracker-for-Gnome-Shell#readme\n\n** if it faced error after update:\n**Restart Gnome-shell. (ALT+F2, r, Enter)", "link": "https://extensions.gnome.org/extension/2817/crypto-price-tracker/", "shell_version_map": {"40": {"version": "35", "sha256": "08kyk70q4id0wj3h094mp2iw2hc35r8i97whwp4qmkaz87ldrpyi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcblxuU291cmNlczogQmluYW5jZSwgT0tYLCBDb2luZ2Vja29cblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuXG5Vc2luZyBhcGkuY29pbmdlY2tvLmNvbSwgb2t4LmNvbSwgYmluYW5jZS5jb21cbkNvbXBsZXRlIGxpc3Qgb2YgcGFpcnM6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWxcbkNvbXBsZXRlIGd1aWRlOiBodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsI3JlYWRtZVxuXG4qKiBpZiBpdCBmYWNlZCBlcnJvciBhZnRlciB1cGRhdGU6XG4qKlJlc3RhcnQgR25vbWUtc2hlbGwuIChBTFQrRjIsIHIsIEVudGVyKSIsCiAgIm5hbWUiOiAiQ3J5cHRvIFByaWNlIFRyYWNrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3J5cHRvLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJjcnlwdG9AYWxpcGlycGlyYW4uZ2l0aHViIiwKICAidmVyc2lvbiI6IDM1Cn0="}, "41": {"version": "35", "sha256": "08kyk70q4id0wj3h094mp2iw2hc35r8i97whwp4qmkaz87ldrpyi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcblxuU291cmNlczogQmluYW5jZSwgT0tYLCBDb2luZ2Vja29cblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuXG5Vc2luZyBhcGkuY29pbmdlY2tvLmNvbSwgb2t4LmNvbSwgYmluYW5jZS5jb21cbkNvbXBsZXRlIGxpc3Qgb2YgcGFpcnM6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWxcbkNvbXBsZXRlIGd1aWRlOiBodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsI3JlYWRtZVxuXG4qKiBpZiBpdCBmYWNlZCBlcnJvciBhZnRlciB1cGRhdGU6XG4qKlJlc3RhcnQgR25vbWUtc2hlbGwuIChBTFQrRjIsIHIsIEVudGVyKSIsCiAgIm5hbWUiOiAiQ3J5cHRvIFByaWNlIFRyYWNrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3J5cHRvLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJjcnlwdG9AYWxpcGlycGlyYW4uZ2l0aHViIiwKICAidmVyc2lvbiI6IDM1Cn0="}, "42": {"version": "35", "sha256": "08kyk70q4id0wj3h094mp2iw2hc35r8i97whwp4qmkaz87ldrpyi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcblxuU291cmNlczogQmluYW5jZSwgT0tYLCBDb2luZ2Vja29cblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuXG5Vc2luZyBhcGkuY29pbmdlY2tvLmNvbSwgb2t4LmNvbSwgYmluYW5jZS5jb21cbkNvbXBsZXRlIGxpc3Qgb2YgcGFpcnM6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWxcbkNvbXBsZXRlIGd1aWRlOiBodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsI3JlYWRtZVxuXG4qKiBpZiBpdCBmYWNlZCBlcnJvciBhZnRlciB1cGRhdGU6XG4qKlJlc3RhcnQgR25vbWUtc2hlbGwuIChBTFQrRjIsIHIsIEVudGVyKSIsCiAgIm5hbWUiOiAiQ3J5cHRvIFByaWNlIFRyYWNrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3J5cHRvLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJjcnlwdG9AYWxpcGlycGlyYW4uZ2l0aHViIiwKICAidmVyc2lvbiI6IDM1Cn0="}, "43": {"version": "35", "sha256": "08kyk70q4id0wj3h094mp2iw2hc35r8i97whwp4qmkaz87ldrpyi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcblxuU291cmNlczogQmluYW5jZSwgT0tYLCBDb2luZ2Vja29cblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuXG5Vc2luZyBhcGkuY29pbmdlY2tvLmNvbSwgb2t4LmNvbSwgYmluYW5jZS5jb21cbkNvbXBsZXRlIGxpc3Qgb2YgcGFpcnM6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWxcbkNvbXBsZXRlIGd1aWRlOiBodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsI3JlYWRtZVxuXG4qKiBpZiBpdCBmYWNlZCBlcnJvciBhZnRlciB1cGRhdGU6XG4qKlJlc3RhcnQgR25vbWUtc2hlbGwuIChBTFQrRjIsIHIsIEVudGVyKSIsCiAgIm5hbWUiOiAiQ3J5cHRvIFByaWNlIFRyYWNrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3J5cHRvLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJjcnlwdG9AYWxpcGlycGlyYW4uZ2l0aHViIiwKICAidmVyc2lvbiI6IDM1Cn0="}}} +, {"uuid": "crypto@alipirpiran.github", "name": "Crypto Price Tracker", "pname": "crypto-price-tracker", "description": "Simple extension to track price of Crypto Currencies\nLike: BTC, ETH, BNB, DOGE and etc..\n\nSources: Binance, Crypto, Coingecko, OKX\n\nAdd coins by symbols, for example:\n* Binance pairs: \"BTC/USDT\"\n* OKX pairs: \"LTC/USDT\"\n* Coingecko pairs: \"BTC/USD\"\n\nUsing api.coingecko.com, okx.com, binance.com, crypto.com\nComplete list of pairs: https://www.binance.com/indexSpa.html\nComplete guide: https://github.com/alipirpiran/Crypto-Price-Tracker-for-Gnome-Shell#readme\n\n** if it faced error after update:\n**Restart Gnome-shell. (ALT+F2, r, Enter)", "link": "https://extensions.gnome.org/extension/2817/crypto-price-tracker/", "shell_version_map": {"40": {"version": "40", "sha256": "0q0h2075p55h90sykpy68lw18gfn6da45lq9p3457ghvi87jjmq3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcbkxpa2U6IEJUQywgRVRILCBCTkIsIERPR0UgYW5kIGV0Yy4uXG5cblNvdXJjZXM6IEJpbmFuY2UsIENyeXB0bywgQ29pbmdlY2tvLCBPS1hcblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuXG5Vc2luZyBhcGkuY29pbmdlY2tvLmNvbSwgb2t4LmNvbSwgYmluYW5jZS5jb20sIGNyeXB0by5jb21cbkNvbXBsZXRlIGxpc3Qgb2YgcGFpcnM6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWxcbkNvbXBsZXRlIGd1aWRlOiBodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsI3JlYWRtZVxuXG4qKiBpZiBpdCBmYWNlZCBlcnJvciBhZnRlciB1cGRhdGU6XG4qKlJlc3RhcnQgR25vbWUtc2hlbGwuIChBTFQrRjIsIHIsIEVudGVyKSIsCiAgIm5hbWUiOiAiQ3J5cHRvIFByaWNlIFRyYWNrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3J5cHRvLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJjcnlwdG9AYWxpcGlycGlyYW4uZ2l0aHViIiwKICAidmVyc2lvbiI6IDQwCn0="}, "41": {"version": "40", "sha256": "0q0h2075p55h90sykpy68lw18gfn6da45lq9p3457ghvi87jjmq3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcbkxpa2U6IEJUQywgRVRILCBCTkIsIERPR0UgYW5kIGV0Yy4uXG5cblNvdXJjZXM6IEJpbmFuY2UsIENyeXB0bywgQ29pbmdlY2tvLCBPS1hcblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuXG5Vc2luZyBhcGkuY29pbmdlY2tvLmNvbSwgb2t4LmNvbSwgYmluYW5jZS5jb20sIGNyeXB0by5jb21cbkNvbXBsZXRlIGxpc3Qgb2YgcGFpcnM6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWxcbkNvbXBsZXRlIGd1aWRlOiBodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsI3JlYWRtZVxuXG4qKiBpZiBpdCBmYWNlZCBlcnJvciBhZnRlciB1cGRhdGU6XG4qKlJlc3RhcnQgR25vbWUtc2hlbGwuIChBTFQrRjIsIHIsIEVudGVyKSIsCiAgIm5hbWUiOiAiQ3J5cHRvIFByaWNlIFRyYWNrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3J5cHRvLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJjcnlwdG9AYWxpcGlycGlyYW4uZ2l0aHViIiwKICAidmVyc2lvbiI6IDQwCn0="}, "42": {"version": "40", "sha256": "0q0h2075p55h90sykpy68lw18gfn6da45lq9p3457ghvi87jjmq3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcbkxpa2U6IEJUQywgRVRILCBCTkIsIERPR0UgYW5kIGV0Yy4uXG5cblNvdXJjZXM6IEJpbmFuY2UsIENyeXB0bywgQ29pbmdlY2tvLCBPS1hcblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuXG5Vc2luZyBhcGkuY29pbmdlY2tvLmNvbSwgb2t4LmNvbSwgYmluYW5jZS5jb20sIGNyeXB0by5jb21cbkNvbXBsZXRlIGxpc3Qgb2YgcGFpcnM6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWxcbkNvbXBsZXRlIGd1aWRlOiBodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsI3JlYWRtZVxuXG4qKiBpZiBpdCBmYWNlZCBlcnJvciBhZnRlciB1cGRhdGU6XG4qKlJlc3RhcnQgR25vbWUtc2hlbGwuIChBTFQrRjIsIHIsIEVudGVyKSIsCiAgIm5hbWUiOiAiQ3J5cHRvIFByaWNlIFRyYWNrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3J5cHRvLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJjcnlwdG9AYWxpcGlycGlyYW4uZ2l0aHViIiwKICAidmVyc2lvbiI6IDQwCn0="}, "43": {"version": "40", "sha256": "0q0h2075p55h90sykpy68lw18gfn6da45lq9p3457ghvi87jjmq3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcbkxpa2U6IEJUQywgRVRILCBCTkIsIERPR0UgYW5kIGV0Yy4uXG5cblNvdXJjZXM6IEJpbmFuY2UsIENyeXB0bywgQ29pbmdlY2tvLCBPS1hcblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuXG5Vc2luZyBhcGkuY29pbmdlY2tvLmNvbSwgb2t4LmNvbSwgYmluYW5jZS5jb20sIGNyeXB0by5jb21cbkNvbXBsZXRlIGxpc3Qgb2YgcGFpcnM6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWxcbkNvbXBsZXRlIGd1aWRlOiBodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsI3JlYWRtZVxuXG4qKiBpZiBpdCBmYWNlZCBlcnJvciBhZnRlciB1cGRhdGU6XG4qKlJlc3RhcnQgR25vbWUtc2hlbGwuIChBTFQrRjIsIHIsIEVudGVyKSIsCiAgIm5hbWUiOiAiQ3J5cHRvIFByaWNlIFRyYWNrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3J5cHRvLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJjcnlwdG9AYWxpcGlycGlyYW4uZ2l0aHViIiwKICAidmVyc2lvbiI6IDQwCn0="}}} , {"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="}, "43": {"version": "40", "sha256": "0b807s4bfxmxf6131749gi3nil42dabmz2ndwwsblcpbj0cas7mv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24taWJ1cy10d2Vha2VyIiwKICAibmFtZSI6ICJJQnVzIFR3ZWFrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWJ1cy10d2Vha2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvaWJ1cy10d2Vha2VyIiwKICAidXVpZCI6ICJpYnVzLXR3ZWFrZXJAdHViZXJyeS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQwCn0="}}} , {"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": "10", "sha256": "0kvniacvxv57f6jfcrlrd7ggwj4h0bfs60r59p150m6nldm9zf23", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHA6Ly9pbmRlZmVyby5zb3V0YWRlLmZyL3AvZ2VuZXJpY21vbml0b3IiLAogICJ1dWlkIjogImdlbmVyaWMtbW9uaXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "10", "sha256": "0kvniacvxv57f6jfcrlrd7ggwj4h0bfs60r59p150m6nldm9zf23", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHA6Ly9pbmRlZmVyby5zb3V0YWRlLmZyL3AvZ2VuZXJpY21vbml0b3IiLAogICJ1dWlkIjogImdlbmVyaWMtbW9uaXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "12", "sha256": "1bdn84l653p8m3r5wshz0939h6jhq2a27hcls4mhydz53vkxy6pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQyLjMiCiAgXSwKICAidXJsIjogImh0dHA6Ly9pbmRlZmVyby5zb3V0YWRlLmZyL3AvZ2VuZXJpY21vbml0b3IiLAogICJ1dWlkIjogImdlbmVyaWMtbW9uaXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "12", "sha256": "1bdn84l653p8m3r5wshz0939h6jhq2a27hcls4mhydz53vkxy6pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQyLjMiCiAgXSwKICAidXJsIjogImh0dHA6Ly9pbmRlZmVyby5zb3V0YWRlLmZyL3AvZ2VuZXJpY21vbml0b3IiLAogICJ1dWlkIjogImdlbmVyaWMtbW9uaXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidmVyc2lvbiI6IDEyCn0="}, "43": {"version": "12", "sha256": "1bdn84l653p8m3r5wshz0939h6jhq2a27hcls4mhydz53vkxy6pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQyLjMiCiAgXSwKICAidXJsIjogImh0dHA6Ly9pbmRlZmVyby5zb3V0YWRlLmZyL3AvZ2VuZXJpY21vbml0b3IiLAogICJ1dWlkIjogImdlbmVyaWMtbW9uaXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidmVyc2lvbiI6IDEyCn0="}}} , {"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": "5", "sha256": "12axnvpbpv1pnpbxinr9ay2pxdgd36f3fjqhx37ymvdjdhak5x4p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJIaWRlIEtleWJvYXJkIExheW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9oaWRlLWtleWJvYXJkLWxheW91dCIsCiAgInV1aWQiOiAiaGlkZS1rZXlib2FyZC1sYXlvdXRAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "12axnvpbpv1pnpbxinr9ay2pxdgd36f3fjqhx37ymvdjdhak5x4p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJIaWRlIEtleWJvYXJkIExheW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9oaWRlLWtleWJvYXJkLWxheW91dCIsCiAgInV1aWQiOiAiaGlkZS1rZXlib2FyZC1sYXlvdXRAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "12axnvpbpv1pnpbxinr9ay2pxdgd36f3fjqhx37ymvdjdhak5x4p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJIaWRlIEtleWJvYXJkIExheW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9oaWRlLWtleWJvYXJkLWxheW91dCIsCiAgInV1aWQiOiAiaGlkZS1rZXlib2FyZC1sYXlvdXRAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "42": {"version": "5", "sha256": "12axnvpbpv1pnpbxinr9ay2pxdgd36f3fjqhx37ymvdjdhak5x4p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJIaWRlIEtleWJvYXJkIExheW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9oaWRlLWtleWJvYXJkLWxheW91dCIsCiAgInV1aWQiOiAiaGlkZS1rZXlib2FyZC1sYXlvdXRAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "43": {"version": "5", "sha256": "12axnvpbpv1pnpbxinr9ay2pxdgd36f3fjqhx37ymvdjdhak5x4p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJIaWRlIEtleWJvYXJkIExheW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9oaWRlLWtleWJvYXJkLWxheW91dCIsCiAgInV1aWQiOiAiaGlkZS1rZXlib2FyZC1sYXlvdXRAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"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": "5", "sha256": "0wl9qhrrx1j1qwz7iczpn1zb2kzy7q895a1ar8178a58lddxhwzy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwb3dlcm9mZiBidXR0b24gb24gdG9wYmFyIiwKICAibmFtZSI6ICJQb3dlcm9mZiBCdXR0b24gb24gVG9wYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGFya25pY28vR05PTUUtU2hlbGwtRXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAicG93ZXJvZmYtYnV0dG9uLW9uLXRvcGJhckBkYXJrbmljby5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "0wl9qhrrx1j1qwz7iczpn1zb2kzy7q895a1ar8178a58lddxhwzy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwb3dlcm9mZiBidXR0b24gb24gdG9wYmFyIiwKICAibmFtZSI6ICJQb3dlcm9mZiBCdXR0b24gb24gVG9wYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGFya25pY28vR05PTUUtU2hlbGwtRXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAicG93ZXJvZmYtYnV0dG9uLW9uLXRvcGJhckBkYXJrbmljby5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "0wl9qhrrx1j1qwz7iczpn1zb2kzy7q895a1ar8178a58lddxhwzy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwb3dlcm9mZiBidXR0b24gb24gdG9wYmFyIiwKICAibmFtZSI6ICJQb3dlcm9mZiBCdXR0b24gb24gVG9wYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGFya25pY28vR05PTUUtU2hlbGwtRXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAicG93ZXJvZmYtYnV0dG9uLW9uLXRvcGJhckBkYXJrbmljby5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "5", "sha256": "0wl9qhrrx1j1qwz7iczpn1zb2kzy7q895a1ar8178a58lddxhwzy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwb3dlcm9mZiBidXR0b24gb24gdG9wYmFyIiwKICAibmFtZSI6ICJQb3dlcm9mZiBCdXR0b24gb24gVG9wYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGFya25pY28vR05PTUUtU2hlbGwtRXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAicG93ZXJvZmYtYnV0dG9uLW9uLXRvcGJhckBkYXJrbmljby5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} -, {"uuid": "maximize-to-workspace@raonetwo.github.com", "name": "Maximize To Workspace With History", "pname": "maximize-to-workspace-with-history", "description": "Like MacOS, puts window in a new workspace when its maximized or full-screened and brings you back to original workspace when its unmaximized or unfull-screened or closed. \n\nRecommended to use with touchegg/fusuma/libinput multi finger swipe gestures.", "link": "https://extensions.gnome.org/extension/2857/maximize-to-workspace-with-history/", "shell_version_map": {"38": {"version": "21", "sha256": "1m1vhscnflmlhscinj4nipybhkps213sh2s9qpp4bxm9h9waihww", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpa2UgTWFjT1MsIHB1dHMgd2luZG93IGluIGEgbmV3IHdvcmtzcGFjZSB3aGVuIGl0cyBtYXhpbWl6ZWQgb3IgZnVsbC1zY3JlZW5lZCBhbmQgYnJpbmdzIHlvdSBiYWNrIHRvIG9yaWdpbmFsIHdvcmtzcGFjZSB3aGVuIGl0cyB1bm1heGltaXplZCBvciB1bmZ1bGwtc2NyZWVuZWQgb3IgY2xvc2VkLiBcblxuUmVjb21tZW5kZWQgdG8gdXNlIHdpdGggdG91Y2hlZ2cvZnVzdW1hL2xpYmlucHV0IG11bHRpIGZpbmdlciBzd2lwZSBnZXN0dXJlcy4iLAogICJuYW1lIjogIk1heGltaXplIFRvIFdvcmtzcGFjZSBXaXRoIEhpc3RvcnkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYW9uZXR3by9NYXhpbWl6ZVRvV29ya3NwYWNlIiwKICAidXVpZCI6ICJtYXhpbWl6ZS10by13b3Jrc3BhY2VAcmFvbmV0d28uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"}, "40": {"version": "21", "sha256": "1m1vhscnflmlhscinj4nipybhkps213sh2s9qpp4bxm9h9waihww", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpa2UgTWFjT1MsIHB1dHMgd2luZG93IGluIGEgbmV3IHdvcmtzcGFjZSB3aGVuIGl0cyBtYXhpbWl6ZWQgb3IgZnVsbC1zY3JlZW5lZCBhbmQgYnJpbmdzIHlvdSBiYWNrIHRvIG9yaWdpbmFsIHdvcmtzcGFjZSB3aGVuIGl0cyB1bm1heGltaXplZCBvciB1bmZ1bGwtc2NyZWVuZWQgb3IgY2xvc2VkLiBcblxuUmVjb21tZW5kZWQgdG8gdXNlIHdpdGggdG91Y2hlZ2cvZnVzdW1hL2xpYmlucHV0IG11bHRpIGZpbmdlciBzd2lwZSBnZXN0dXJlcy4iLAogICJuYW1lIjogIk1heGltaXplIFRvIFdvcmtzcGFjZSBXaXRoIEhpc3RvcnkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYW9uZXR3by9NYXhpbWl6ZVRvV29ya3NwYWNlIiwKICAidXVpZCI6ICJtYXhpbWl6ZS10by13b3Jrc3BhY2VAcmFvbmV0d28uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"}}} +, {"uuid": "maximize-to-workspace@raonetwo.github.com", "name": "Maximize To Workspace With History", "pname": "maximize-to-workspace-with-history", "description": "Like MacOS, puts windows in a new workspace when maximized or full-screened and brings you back to original workspacce when unmaximized or unfull-screened or the window gets closed. Recommended to use with multi finger gestures configured for your trackpad.", "link": "https://extensions.gnome.org/extension/2857/maximize-to-workspace-with-history/", "shell_version_map": {"38": {"version": "23", "sha256": "0gvays7xr74xpb84sxxa78mrl0n5xgm4ax3jkgjldp81jy3qzs3b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpa2UgTWFjT1MsIHB1dHMgd2luZG93cyBpbiBhIG5ldyB3b3Jrc3BhY2Ugd2hlbiBtYXhpbWl6ZWQgb3IgZnVsbC1zY3JlZW5lZCBhbmQgYnJpbmdzIHlvdSBiYWNrIHRvIG9yaWdpbmFsIHdvcmtzcGFjY2Ugd2hlbiB1bm1heGltaXplZCBvciB1bmZ1bGwtc2NyZWVuZWQgb3IgdGhlIHdpbmRvdyBnZXRzIGNsb3NlZC4gUmVjb21tZW5kZWQgdG8gdXNlIHdpdGggbXVsdGkgZmluZ2VyIGdlc3R1cmVzIGNvbmZpZ3VyZWQgZm9yIHlvdXIgdHJhY2twYWQuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBXb3Jrc3BhY2UgV2l0aCBIaXN0b3J5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Jhb25ldHdvL01heGltaXplVG9Xb3Jrc3BhY2UiLAogICJ1dWlkIjogIm1heGltaXplLXRvLXdvcmtzcGFjZUByYW9uZXR3by5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "40": {"version": "23", "sha256": "0gvays7xr74xpb84sxxa78mrl0n5xgm4ax3jkgjldp81jy3qzs3b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpa2UgTWFjT1MsIHB1dHMgd2luZG93cyBpbiBhIG5ldyB3b3Jrc3BhY2Ugd2hlbiBtYXhpbWl6ZWQgb3IgZnVsbC1zY3JlZW5lZCBhbmQgYnJpbmdzIHlvdSBiYWNrIHRvIG9yaWdpbmFsIHdvcmtzcGFjY2Ugd2hlbiB1bm1heGltaXplZCBvciB1bmZ1bGwtc2NyZWVuZWQgb3IgdGhlIHdpbmRvdyBnZXRzIGNsb3NlZC4gUmVjb21tZW5kZWQgdG8gdXNlIHdpdGggbXVsdGkgZmluZ2VyIGdlc3R1cmVzIGNvbmZpZ3VyZWQgZm9yIHlvdXIgdHJhY2twYWQuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBXb3Jrc3BhY2UgV2l0aCBIaXN0b3J5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Jhb25ldHdvL01heGltaXplVG9Xb3Jrc3BhY2UiLAogICJ1dWlkIjogIm1heGltaXplLXRvLXdvcmtzcGFjZUByYW9uZXR3by5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "41": {"version": "23", "sha256": "0gvays7xr74xpb84sxxa78mrl0n5xgm4ax3jkgjldp81jy3qzs3b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpa2UgTWFjT1MsIHB1dHMgd2luZG93cyBpbiBhIG5ldyB3b3Jrc3BhY2Ugd2hlbiBtYXhpbWl6ZWQgb3IgZnVsbC1zY3JlZW5lZCBhbmQgYnJpbmdzIHlvdSBiYWNrIHRvIG9yaWdpbmFsIHdvcmtzcGFjY2Ugd2hlbiB1bm1heGltaXplZCBvciB1bmZ1bGwtc2NyZWVuZWQgb3IgdGhlIHdpbmRvdyBnZXRzIGNsb3NlZC4gUmVjb21tZW5kZWQgdG8gdXNlIHdpdGggbXVsdGkgZmluZ2VyIGdlc3R1cmVzIGNvbmZpZ3VyZWQgZm9yIHlvdXIgdHJhY2twYWQuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBXb3Jrc3BhY2UgV2l0aCBIaXN0b3J5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Jhb25ldHdvL01heGltaXplVG9Xb3Jrc3BhY2UiLAogICJ1dWlkIjogIm1heGltaXplLXRvLXdvcmtzcGFjZUByYW9uZXR3by5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "42": {"version": "23", "sha256": "0gvays7xr74xpb84sxxa78mrl0n5xgm4ax3jkgjldp81jy3qzs3b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpa2UgTWFjT1MsIHB1dHMgd2luZG93cyBpbiBhIG5ldyB3b3Jrc3BhY2Ugd2hlbiBtYXhpbWl6ZWQgb3IgZnVsbC1zY3JlZW5lZCBhbmQgYnJpbmdzIHlvdSBiYWNrIHRvIG9yaWdpbmFsIHdvcmtzcGFjY2Ugd2hlbiB1bm1heGltaXplZCBvciB1bmZ1bGwtc2NyZWVuZWQgb3IgdGhlIHdpbmRvdyBnZXRzIGNsb3NlZC4gUmVjb21tZW5kZWQgdG8gdXNlIHdpdGggbXVsdGkgZmluZ2VyIGdlc3R1cmVzIGNvbmZpZ3VyZWQgZm9yIHlvdXIgdHJhY2twYWQuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBXb3Jrc3BhY2UgV2l0aCBIaXN0b3J5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Jhb25ldHdvL01heGltaXplVG9Xb3Jrc3BhY2UiLAogICJ1dWlkIjogIm1heGltaXplLXRvLXdvcmtzcGFjZUByYW9uZXR3by5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "43": {"version": "23", "sha256": "0gvays7xr74xpb84sxxa78mrl0n5xgm4ax3jkgjldp81jy3qzs3b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpa2UgTWFjT1MsIHB1dHMgd2luZG93cyBpbiBhIG5ldyB3b3Jrc3BhY2Ugd2hlbiBtYXhpbWl6ZWQgb3IgZnVsbC1zY3JlZW5lZCBhbmQgYnJpbmdzIHlvdSBiYWNrIHRvIG9yaWdpbmFsIHdvcmtzcGFjY2Ugd2hlbiB1bm1heGltaXplZCBvciB1bmZ1bGwtc2NyZWVuZWQgb3IgdGhlIHdpbmRvdyBnZXRzIGNsb3NlZC4gUmVjb21tZW5kZWQgdG8gdXNlIHdpdGggbXVsdGkgZmluZ2VyIGdlc3R1cmVzIGNvbmZpZ3VyZWQgZm9yIHlvdXIgdHJhY2twYWQuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBXb3Jrc3BhY2UgV2l0aCBIaXN0b3J5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Jhb25ldHdvL01heGltaXplVG9Xb3Jrc3BhY2UiLAogICJ1dWlkIjogIm1heGltaXplLXRvLXdvcmtzcGFjZUByYW9uZXR3by5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}}} , {"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": "11", "sha256": "15q966xnyn8f4sxpbs5ngzhn03c637nzc546x257g789rxnf545j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBiZWNvbWVzIDIgaWNvbnMgZm9yIHNlbGVjdGluZyBlaXRoZXIgQXBwbGljYXRpb25zIG9yIFdvcmtzcGFjZXMgaW4gdGhlIG92ZXJ2aWV3LiBTZWxlY3RpbmcgdGhlIHNhbWUgdmlldyBhZ2FpbiB3aWxsIGhpZGUgdGhlIG92ZXJ2aWV3LlxuU2Nyb2xsaW5nIG9uIHRoZSBpY29ucyBhbGxvd3Mgc3dpdGNoaW5nIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2Ugb3IgY3ljbGluZyB0aHJvdWdoIHRoZSBXb3Jrc3BhY2VzLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhY3Rpdml0aWVzX2ljb25zQGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "15q966xnyn8f4sxpbs5ngzhn03c637nzc546x257g789rxnf545j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBiZWNvbWVzIDIgaWNvbnMgZm9yIHNlbGVjdGluZyBlaXRoZXIgQXBwbGljYXRpb25zIG9yIFdvcmtzcGFjZXMgaW4gdGhlIG92ZXJ2aWV3LiBTZWxlY3RpbmcgdGhlIHNhbWUgdmlldyBhZ2FpbiB3aWxsIGhpZGUgdGhlIG92ZXJ2aWV3LlxuU2Nyb2xsaW5nIG9uIHRoZSBpY29ucyBhbGxvd3Mgc3dpdGNoaW5nIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2Ugb3IgY3ljbGluZyB0aHJvdWdoIHRoZSBXb3Jrc3BhY2VzLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhY3Rpdml0aWVzX2ljb25zQGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "15q966xnyn8f4sxpbs5ngzhn03c637nzc546x257g789rxnf545j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBiZWNvbWVzIDIgaWNvbnMgZm9yIHNlbGVjdGluZyBlaXRoZXIgQXBwbGljYXRpb25zIG9yIFdvcmtzcGFjZXMgaW4gdGhlIG92ZXJ2aWV3LiBTZWxlY3RpbmcgdGhlIHNhbWUgdmlldyBhZ2FpbiB3aWxsIGhpZGUgdGhlIG92ZXJ2aWV3LlxuU2Nyb2xsaW5nIG9uIHRoZSBpY29ucyBhbGxvd3Mgc3dpdGNoaW5nIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2Ugb3IgY3ljbGluZyB0aHJvdWdoIHRoZSBXb3Jrc3BhY2VzLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhY3Rpdml0aWVzX2ljb25zQGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "15q966xnyn8f4sxpbs5ngzhn03c637nzc546x257g789rxnf545j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBiZWNvbWVzIDIgaWNvbnMgZm9yIHNlbGVjdGluZyBlaXRoZXIgQXBwbGljYXRpb25zIG9yIFdvcmtzcGFjZXMgaW4gdGhlIG92ZXJ2aWV3LiBTZWxlY3RpbmcgdGhlIHNhbWUgdmlldyBhZ2FpbiB3aWxsIGhpZGUgdGhlIG92ZXJ2aWV3LlxuU2Nyb2xsaW5nIG9uIHRoZSBpY29ucyBhbGxvd3Mgc3dpdGNoaW5nIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2Ugb3IgY3ljbGluZyB0aHJvdWdoIHRoZSBXb3Jrc3BhY2VzLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhY3Rpdml0aWVzX2ljb25zQGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"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": "11", "sha256": "11628vpgmal4w46apsg6vyv7q9hxdr1z6x6yfh5344nv605904cq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvdGFsbHkgdHJhbnNwYXJlbnQgdG9wIHBhbmVsIGluIHRoZSBPdmVydmlldy5cbkFsc28gYWRkcyBkcm9wIHNoYWRvd3MgdG8gdGV4dCBhbmQgaWNvbnMgZm9yIHRob3NlIHVzaW5nIEdTIDMuMzguIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnRfcGFuZWxAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "11628vpgmal4w46apsg6vyv7q9hxdr1z6x6yfh5344nv605904cq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvdGFsbHkgdHJhbnNwYXJlbnQgdG9wIHBhbmVsIGluIHRoZSBPdmVydmlldy5cbkFsc28gYWRkcyBkcm9wIHNoYWRvd3MgdG8gdGV4dCBhbmQgaWNvbnMgZm9yIHRob3NlIHVzaW5nIEdTIDMuMzguIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnRfcGFuZWxAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "11628vpgmal4w46apsg6vyv7q9hxdr1z6x6yfh5344nv605904cq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvdGFsbHkgdHJhbnNwYXJlbnQgdG9wIHBhbmVsIGluIHRoZSBPdmVydmlldy5cbkFsc28gYWRkcyBkcm9wIHNoYWRvd3MgdG8gdGV4dCBhbmQgaWNvbnMgZm9yIHRob3NlIHVzaW5nIEdTIDMuMzguIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnRfcGFuZWxAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "11628vpgmal4w46apsg6vyv7q9hxdr1z6x6yfh5344nv605904cq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvdGFsbHkgdHJhbnNwYXJlbnQgdG9wIHBhbmVsIGluIHRoZSBPdmVydmlldy5cbkFsc28gYWRkcyBkcm9wIHNoYWRvd3MgdG8gdGV4dCBhbmQgaWNvbnMgZm9yIHRob3NlIHVzaW5nIEdTIDMuMzguIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnRfcGFuZWxAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"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.", "link": "https://extensions.gnome.org/extension/2890/tray-icons-reloaded/", "shell_version_map": {"38": {"version": "11", "sha256": "16dx06l7m8jjcy1xr7s3vj57csnbdmdwlmmjwxhilq10a1dapiw8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJheUljb25zUmVsb2FkZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "16", "sha256": "0ywl1v26b3qfkj58g2l7y1g2qf1fi7kkjd6403546hwyzcqkph0z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJheUljb25zUmVsb2FkZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvVHJheS1JY29ucy1SZWxvYWRlZCIsCiAgInV1aWQiOiAidHJheUljb25zUmVsb2FkZWRAc2VsZm1hZGUucGwiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "22", "sha256": "0nmrjpk93afmywq0zrm7qjpkil6s6wszmr9f78q0ybnjv58jf953", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIsCiAgICAiWWFkIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmF5SWNvbnNSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAyMgp9"}, "42": {"version": "25", "sha256": "0y3sks6idn9v2r54rb4i69gliip0c9na5q5kwl9vfc7irncgmqjr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIsCiAgICAiWWFkIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmF5SWNvbnNSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAyNQp9"}, "43": {"version": "26", "sha256": "1yx9w70ql13f0gnjbihkscyhi8mgapbl6p0hy0aqmnirhwn3fc31", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIsCiAgICAiWWFkIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmF5SWNvbnNSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAyNgp9"}}} -, {"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": "16", "sha256": "1xb9fj4i29sjxjj978mlab32kx0p0wwwbycp84ck12acr2p8l06l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAxNgp9"}, "41": {"version": "16", "sha256": "1xb9fj4i29sjxjj978mlab32kx0p0wwwbycp84ck12acr2p8l06l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAxNgp9"}, "42": {"version": "16", "sha256": "1xb9fj4i29sjxjj978mlab32kx0p0wwwbycp84ck12acr2p8l06l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAxNgp9"}, "43": {"version": "16", "sha256": "1xb9fj4i29sjxjj978mlab32kx0p0wwwbycp84ck12acr2p8l06l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAxNgp9"}}} -, {"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 quicksettings. Originally created by XES.\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", "link": "https://extensions.gnome.org/extension/2899/settingscenter/", "shell_version_map": {"38": {"version": "2", "sha256": "0sywdlmfgy4k5bkxmawcb7b8100g8wnpndmwvdzjq51xv5605gcs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjQiLAogICAgIjMuNiIsCiAgICAiMy41LjQiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9YRVMtU2V0dGluZ3MtQ2VudGVyLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "11", "sha256": "17na0a5bm4qkh1lcch9frpmlxn44kg7d4lx96lmpx8v0zp4v0c2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "17na0a5bm4qkh1lcch9frpmlxn44kg7d4lx96lmpx8v0zp4v0c2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "17na0a5bm4qkh1lcch9frpmlxn44kg7d4lx96lmpx8v0zp4v0c2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "13", "sha256": "07jx19xfn6np66nnm5ip1jhlp4nfh05qnvnhaqhq3h7yzshr92j2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImdldHRleHQtZG9tYWluIjogIlNldHRpbmdzQ2VudGVyIiwKICAibmFtZSI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJYZXMsIGwzMDBsdmwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU2V0dGluZ3NDZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDEzCn0="}}} +, {"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": "20", "sha256": "1hssx7g6cz8b03iafcvqf956s5ylav9ss9ifn4x385wp75r9spj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAyMAp9"}, "41": {"version": "20", "sha256": "1hssx7g6cz8b03iafcvqf956s5ylav9ss9ifn4x385wp75r9spj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAyMAp9"}, "42": {"version": "20", "sha256": "1hssx7g6cz8b03iafcvqf956s5ylav9ss9ifn4x385wp75r9spj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAyMAp9"}, "43": {"version": "20", "sha256": "1hssx7g6cz8b03iafcvqf956s5ylav9ss9ifn4x385wp75r9spj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAyMAp9"}}} +, {"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 quicksettings. Originally created by XES.\n\nSettings shortcuts : gnome-tweaks, dconf-editor, gconf-editor, gnome-session-properties, gnome-shell-extension-prefs, seahorse and nvidia-settings, pulseaudio. You can add your own\n\nOriginal source : http://svn.xesnet.fr/gnomeextensions", "link": "https://extensions.gnome.org/extension/2899/settingscenter/", "shell_version_map": {"38": {"version": "2", "sha256": "0p1iq97210rvm4p5wwcs9m8wnicnlvx1qgxbp6mnifny7srw4p0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vha3MsIGRjb25mLWVkaXRvciwgZ2NvbmYtZWRpdG9yLCBnbm9tZS1zZXNzaW9uLXByb3BlcnRpZXMsIGdub21lLXNoZWxsLWV4dGVuc2lvbi1wcmVmcywgc2VhaG9yc2UgYW5kIG52aWRpYS1zZXR0aW5ncywgcHVsc2VhdWRpby4gWW91IGNhbiBhZGQgeW91ciBvd25cblxuT3JpZ2luYWwgc291cmNlIDogaHR0cDovL3N2bi54ZXNuZXQuZnIvZ25vbWVleHRlbnNpb25zIiwKICAibG9jYWxlIjogIi91c3Ivc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJYZXMsIGwzMDBsdmwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuNCIsCiAgICAiMy42IiwKICAgICIzLjUuNCIsCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "11", "sha256": "0lc74s1ii73v091skwdcfjj7pd2zhn89bhm4jyivjpkhghc1kzby", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vha3MsIGRjb25mLWVkaXRvciwgZ2NvbmYtZWRpdG9yLCBnbm9tZS1zZXNzaW9uLXByb3BlcnRpZXMsIGdub21lLXNoZWxsLWV4dGVuc2lvbi1wcmVmcywgc2VhaG9yc2UgYW5kIG52aWRpYS1zZXR0aW5ncywgcHVsc2VhdWRpby4gWW91IGNhbiBhZGQgeW91ciBvd25cblxuT3JpZ2luYWwgc291cmNlIDogaHR0cDovL3N2bi54ZXNuZXQuZnIvZ25vbWVleHRlbnNpb25zIiwKICAibG9jYWxlIjogIi91c3Ivc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJYZXMsIGwzMDBsdmwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU2V0dGluZ3NDZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvWEVTLVNldHRpbmdzLUNlbnRlci1FeHRlbnNpb24iLAogICJ1dWlkIjogIlNldHRpbmdzQ2VudGVyQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0lc74s1ii73v091skwdcfjj7pd2zhn89bhm4jyivjpkhghc1kzby", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vha3MsIGRjb25mLWVkaXRvciwgZ2NvbmYtZWRpdG9yLCBnbm9tZS1zZXNzaW9uLXByb3BlcnRpZXMsIGdub21lLXNoZWxsLWV4dGVuc2lvbi1wcmVmcywgc2VhaG9yc2UgYW5kIG52aWRpYS1zZXR0aW5ncywgcHVsc2VhdWRpby4gWW91IGNhbiBhZGQgeW91ciBvd25cblxuT3JpZ2luYWwgc291cmNlIDogaHR0cDovL3N2bi54ZXNuZXQuZnIvZ25vbWVleHRlbnNpb25zIiwKICAibG9jYWxlIjogIi91c3Ivc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJYZXMsIGwzMDBsdmwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU2V0dGluZ3NDZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvWEVTLVNldHRpbmdzLUNlbnRlci1FeHRlbnNpb24iLAogICJ1dWlkIjogIlNldHRpbmdzQ2VudGVyQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "0lc74s1ii73v091skwdcfjj7pd2zhn89bhm4jyivjpkhghc1kzby", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vha3MsIGRjb25mLWVkaXRvciwgZ2NvbmYtZWRpdG9yLCBnbm9tZS1zZXNzaW9uLXByb3BlcnRpZXMsIGdub21lLXNoZWxsLWV4dGVuc2lvbi1wcmVmcywgc2VhaG9yc2UgYW5kIG52aWRpYS1zZXR0aW5ncywgcHVsc2VhdWRpby4gWW91IGNhbiBhZGQgeW91ciBvd25cblxuT3JpZ2luYWwgc291cmNlIDogaHR0cDovL3N2bi54ZXNuZXQuZnIvZ25vbWVleHRlbnNpb25zIiwKICAibG9jYWxlIjogIi91c3Ivc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJYZXMsIGwzMDBsdmwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU2V0dGluZ3NDZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvWEVTLVNldHRpbmdzLUNlbnRlci1FeHRlbnNpb24iLAogICJ1dWlkIjogIlNldHRpbmdzQ2VudGVyQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "43": {"version": "16", "sha256": "1xik5jhf8cf9zswxkhy9rgji30bl26adzysv2j6i9nsc8y0jjkn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vha3MsIGRjb25mLWVkaXRvciwgZ2NvbmYtZWRpdG9yLCBnbm9tZS1zZXNzaW9uLXByb3BlcnRpZXMsIGdub21lLXNoZWxsLWV4dGVuc2lvbi1wcmVmcywgc2VhaG9yc2UgYW5kIG52aWRpYS1zZXR0aW5ncywgcHVsc2VhdWRpby4gWW91IGNhbiBhZGQgeW91ciBvd25cblxuT3JpZ2luYWwgc291cmNlIDogaHR0cDovL3N2bi54ZXNuZXQuZnIvZ25vbWVleHRlbnNpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2V0dGluZ3NDZW50ZXIiLAogICJuYW1lIjogIlNldHRpbmdzQ2VudGVyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIlhlcywgbDMwMGx2bCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5TZXR0aW5nc0NlbnRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvWEVTLVNldHRpbmdzLUNlbnRlci1FeHRlbnNpb24iLAogICJ1dWlkIjogIlNldHRpbmdzQ2VudGVyQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} , {"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": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "40": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "41": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "42": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "43": {"version": "32", "sha256": "0w0fcxnvmv9ppblcafl7di5wax84f1ck9czr9091ipywna7p4s01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQnJpbmctT3V0LVN1Ym1lbnUtb2YtUG93ZXItT2ZmLUxvZ291dCIsCiAgInV1aWQiOiAiQnJpbmdPdXRTdWJtZW51T2ZQb3dlck9mZkxvZ291dEJ1dHRvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMzIKfQ=="}}} -, {"uuid": "batterytimepercentagecompact@sagrland.de", "name": "Battery Time (Percentage) Compact", "pname": "battery-time-percentage-compact", "description": "Show 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": "9", "sha256": "1zs6m9smazmxm4l14xvj7a41pfbsj8f99jmqhxg6d30crrxpqwdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NhR3JMYW5kL2dub21lLXNoZWxsLWJhdHRlcnktdGltZS1wZXJjZW50YWdlLWNvbXBhY3QiLAogICJ1dWlkIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3RAc2FncmxhbmQuZGUiLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "1zs6m9smazmxm4l14xvj7a41pfbsj8f99jmqhxg6d30crrxpqwdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NhR3JMYW5kL2dub21lLXNoZWxsLWJhdHRlcnktdGltZS1wZXJjZW50YWdlLWNvbXBhY3QiLAogICJ1dWlkIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3RAc2FncmxhbmQuZGUiLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "1zs6m9smazmxm4l14xvj7a41pfbsj8f99jmqhxg6d30crrxpqwdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NhR3JMYW5kL2dub21lLXNoZWxsLWJhdHRlcnktdGltZS1wZXJjZW50YWdlLWNvbXBhY3QiLAogICJ1dWlkIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3RAc2FncmxhbmQuZGUiLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "1zs6m9smazmxm4l14xvj7a41pfbsj8f99jmqhxg6d30crrxpqwdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NhR3JMYW5kL2dub21lLXNoZWxsLWJhdHRlcnktdGltZS1wZXJjZW50YWdlLWNvbXBhY3QiLAogICJ1dWlkIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3RAc2FncmxhbmQuZGUiLAogICJ2ZXJzaW9uIjogOQp9"}, "43": {"version": "9", "sha256": "1zs6m9smazmxm4l14xvj7a41pfbsj8f99jmqhxg6d30crrxpqwdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NhR3JMYW5kL2dub21lLXNoZWxsLWJhdHRlcnktdGltZS1wZXJjZW50YWdlLWNvbXBhY3QiLAogICJ1dWlkIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3RAc2FncmxhbmQuZGUiLAogICJ2ZXJzaW9uIjogOQp9"}}} +, {"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": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "40": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "41": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "42": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "43": {"version": "35", "sha256": "1295hf1xgzj6p89k40zz7x4fbdbvm9bkv88ym8f2ibn6080gbx1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQnJpbmctT3V0LVN1Ym1lbnUtb2YtUG93ZXItT2ZmLUxvZ291dCIsCiAgInV1aWQiOiAiQnJpbmdPdXRTdWJtZW51T2ZQb3dlck9mZkxvZ291dEJ1dHRvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}}} +, {"uuid": "batterytimepercentagecompact@sagrland.de", "name": "Battery Time (Percentage) Compact", "pname": "battery-time-percentage-compact", "description": "Show 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": "8", "sha256": "143gj2xmi1hhma2fjggk6vaq3sx7p0glszayds1jbnz7003xc89q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtYmF0dGVyeS10aW1lLXBlcmNlbnRhZ2UtY29tcGFjdCIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdEBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "143gj2xmi1hhma2fjggk6vaq3sx7p0glszayds1jbnz7003xc89q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtYmF0dGVyeS10aW1lLXBlcmNlbnRhZ2UtY29tcGFjdCIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdEBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "143gj2xmi1hhma2fjggk6vaq3sx7p0glszayds1jbnz7003xc89q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtYmF0dGVyeS10aW1lLXBlcmNlbnRhZ2UtY29tcGFjdCIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdEBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "143gj2xmi1hhma2fjggk6vaq3sx7p0glszayds1jbnz7003xc89q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtYmF0dGVyeS10aW1lLXBlcmNlbnRhZ2UtY29tcGFjdCIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdEBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"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": "20", "sha256": "1kgvn9mg7n7h01l82rsn5b6wq11znb3vg796dw6xpqbkmrf282kw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmF1am9uYXMvZXhlY3V0b3IiLAogICJ1dWlkIjogImV4ZWN1dG9yQHJhdWpvbmFzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "20", "sha256": "1kgvn9mg7n7h01l82rsn5b6wq11znb3vg796dw6xpqbkmrf282kw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmF1am9uYXMvZXhlY3V0b3IiLAogICJ1dWlkIjogImV4ZWN1dG9yQHJhdWpvbmFzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyMAp9"}, "41": {"version": "20", "sha256": "1kgvn9mg7n7h01l82rsn5b6wq11znb3vg796dw6xpqbkmrf282kw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmF1am9uYXMvZXhlY3V0b3IiLAogICJ1dWlkIjogImV4ZWN1dG9yQHJhdWpvbmFzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyMAp9"}, "42": {"version": "20", "sha256": "1kgvn9mg7n7h01l82rsn5b6wq11znb3vg796dw6xpqbkmrf282kw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmF1am9uYXMvZXhlY3V0b3IiLAogICJ1dWlkIjogImV4ZWN1dG9yQHJhdWpvbmFzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyMAp9"}, "43": {"version": "20", "sha256": "1kgvn9mg7n7h01l82rsn5b6wq11znb3vg796dw6xpqbkmrf282kw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmF1am9uYXMvZXhlY3V0b3IiLAogICJ1dWlkIjogImV4ZWN1dG9yQHJhdWpvbmFzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyMAp9"}}} , {"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": "18", "sha256": "0wxyfkd9nyrnxzlcp1sp0kb2q0zsjnhs5s0lgg85rnn72x8wnnbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9Db250cm9sX0JsdXJfRWZmZWN0X09uX0xvY2tfU2NyZWVuIiwKICAidXVpZCI6ICJDb250cm9sQmx1ckVmZmVjdE9uTG9ja1NjcmVlbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "41": {"version": "18", "sha256": "0wxyfkd9nyrnxzlcp1sp0kb2q0zsjnhs5s0lgg85rnn72x8wnnbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9Db250cm9sX0JsdXJfRWZmZWN0X09uX0xvY2tfU2NyZWVuIiwKICAidXVpZCI6ICJDb250cm9sQmx1ckVmZmVjdE9uTG9ja1NjcmVlbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "42": {"version": "18", "sha256": "0wxyfkd9nyrnxzlcp1sp0kb2q0zsjnhs5s0lgg85rnn72x8wnnbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9Db250cm9sX0JsdXJfRWZmZWN0X09uX0xvY2tfU2NyZWVuIiwKICAidXVpZCI6ICJDb250cm9sQmx1ckVmZmVjdE9uTG9ja1NjcmVlbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}}} , {"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"}, "42": {"version": "67", "sha256": "05nxmlsik60nmci7x1zvdfwjymab10ikb4pdgq4cmpim3mrpp3xn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzLlxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGlnaHQtZGljdCIsCiAgIm5hbWUiOiAiTGlnaHQgRGljdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1kaWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvbGlnaHQtZGljdCIsCiAgInV1aWQiOiAibGlnaHQtZGljdEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Nwp9"}, "43": {"version": "68", "sha256": "0vyyhdd19k14nz6pvifvlks4i7k18zdqsppsaix25h1z53ib63y7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzLlxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGlnaHQtZGljdCIsCiAgIm5hbWUiOiAiTGlnaHQgRGljdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1kaWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvbGlnaHQtZGljdCIsCiAgInV1aWQiOiAibGlnaHQtZGljdEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2OAp9"}}} -, {"uuid": "InternetSpeedMeter@alshakib.dev", "name": "Internet Speed Meter", "pname": "internet-speed-meter", "description": "Simple and minimal internet speed meter extension for the Gnome Shell", "link": "https://extensions.gnome.org/extension/2980/internet-speed-meter/", "shell_version_map": {"38": {"version": "11", "sha256": "1y33l24q441nc147njjp4ylygmfr73br8adc8yfbp9p8dzh084f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "12", "sha256": "0m8psgasxh6b7hfczz0dp3xn44w9pjzzxwrjn5nzmpcpzcdg59p9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "0m8psgasxh6b7hfczz0dp3xn44w9pjzzxwrjn5nzmpcpzcdg59p9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "12", "sha256": "0m8psgasxh6b7hfczz0dp3xn44w9pjzzxwrjn5nzmpcpzcdg59p9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDEyCn0="}, "43": {"version": "12", "sha256": "0m8psgasxh6b7hfczz0dp3xn44w9pjzzxwrjn5nzmpcpzcdg59p9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDEyCn0="}}} +, {"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"}, "43": {"version": "71", "sha256": "15wh8s5yllgrf4aj2zz9vd2hyqjhys5md2lmlmh7nrhy87j1bi1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzLlxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGlnaHQtZGljdCIsCiAgIm5hbWUiOiAiTGlnaHQgRGljdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1kaWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvbGlnaHQtZGljdCIsCiAgInV1aWQiOiAibGlnaHQtZGljdEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3MQp9"}}} +, {"uuid": "InternetSpeedMeter@alshakib.dev", "name": "Internet Speed Meter", "pname": "internet-speed-meter", "description": "Simple and minimal internet speed meter extension for the Gnome Shell", "link": "https://extensions.gnome.org/extension/2980/internet-speed-meter/", "shell_version_map": {"38": {"version": "11", "sha256": "1y33l24q441nc147njjp4ylygmfr73br8adc8yfbp9p8dzh084f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "15", "sha256": "0psypjrg31303rd9l7i18y11vg7k905w36p2zlhmr5gmlklpma9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "0psypjrg31303rd9l7i18y11vg7k905w36p2zlhmr5gmlklpma9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDE1Cn0="}, "42": {"version": "15", "sha256": "0psypjrg31303rd9l7i18y11vg7k905w36p2zlhmr5gmlklpma9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDE1Cn0="}, "43": {"version": "15", "sha256": "0psypjrg31303rd9l7i18y11vg7k905w36p2zlhmr5gmlklpma9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDE1Cn0="}}} , {"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"}, "42": {"version": "10", "sha256": "10h8m6m38ykf0nlsnqjpyp2m409ravjpf1n9ylx79cpnwrl4a86y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHVzZWZ1bCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBBZGRyZXNzXG5cbklQIEZpbmRlciBkaXNwbGF5cyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBhZGRyZXNzLCBob3N0bmFtZSwgY291bnRyeSwgQVMgQmxvY2ssIGFzIHdlbGwgYXMgIGEgbWFwIHRpbGUgb2YgeW91ciBHZW9sb2NhdGlvbiBhbmQgY291bnRyeSBmbGFnLCAgdGhpcyBleHRlbnNpb24gaXMgQWxzbyBVc2VmdWwgZm9yIGluZm9ybWF0aW9uYWwgcHVycG9zZXMgdG8gbW9uaXRvciBWUE4gY2hhbmdlcyBhbmQgcHVibGljIG5ldHdvcmsgSVAgQWRkcmVzc2VzLlxuXG49PT09PT09PT09PT09PT09PT09PT1cbklQIEZpbmRlciBjYW4gbW9uaXRvciBpbiByZWFsIHRpbWVcbj09PT09PT09PT09PT09PT09PT09PVxuKldpcmVndWFyZCBjb25uZWN0aW9uc1xuKk9wZW5WUE4gY29ubmVjdGlvbnNcbipJUFY0LzYgY29ubmVjdGlvbnNcbipQcm94eSBjb25uZWN0aW9uc1xuKlZQTiB2ZW5kb3IgYXBwbGljYXRpb25zXG4qTWFudWFsIHN0YXRpYyBJUCBjaGFuZ2VzXG5cbj09PT09PT09PT09PT09PT09PT09XG5JUCBGaW5kZXIgaGFzIGFkZGVkIHNlY3VyaXR5XG49PT09PT09PT09PT09PT09PT09PVxuTmV3bHkgZGV2ZWxvcGVkIHJldmlzZWQgY29kZSBiYXNlIHVzaW5nIG9wZW4gdGVjaG5vbG9naWVzIGFuZCB1c2luZyBBUEkncyBmb3IgUHVibGljIElQIGFuZCBNYXAgVGlsZSBpbWFnZSBsb2NhdGlvbnMgdXNpbmcgR0VUIHJlcXVlc3RzIG92ZXIgSFRUUFMgZm9yIGEgYWRkZWQgbGF5ZXIgb2YgZW5jcnlwdGVkICBTZWN1cml0eSwgUGxlYXNlIHNlZSBzb3VyY2UgY29kZSBmb3IgbW9yZSBkZXRhaWxzLlxuXG49PT09PT09PT09PT09PT09PT09PVxuQ29tcGF0aWJsZSBHTk9NRSBzaGVsbCAtIDMuMzYgYW5kIG5ld2VyLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJpcC1maW5kZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpcC1maW5kZXIiLAogICJuYW1lIjogIklQIEZpbmRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wdWJsaWMtaXAtYWRkcmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9MaW54R2VtMzMvSVAtRmluZGVyIiwKICAidXVpZCI6ICJJUC1GaW5kZXJAbGlueGdlbTMzLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "15", "sha256": "1d40848mk3vhzn3q6ij47h3y3d923xzl39d5mm4nyk69kvfz9ljj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHVzZWZ1bCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBBZGRyZXNzXG5cbklQIEZpbmRlciBkaXNwbGF5cyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBhZGRyZXNzLCBob3N0bmFtZSwgY291bnRyeSwgQVMgQmxvY2ssIGFzIHdlbGwgYXMgIGEgbWFwIHRpbGUgb2YgeW91ciBHZW9sb2NhdGlvbiBhbmQgY291bnRyeSBmbGFnLCAgdGhpcyBleHRlbnNpb24gaXMgQWxzbyBVc2VmdWwgZm9yIGluZm9ybWF0aW9uYWwgcHVycG9zZXMgdG8gbW9uaXRvciBWUE4gY2hhbmdlcyBhbmQgcHVibGljIG5ldHdvcmsgSVAgQWRkcmVzc2VzLlxuXG49PT09PT09PT09PT09PT09PT09PT1cbklQIEZpbmRlciBjYW4gbW9uaXRvciBpbiByZWFsIHRpbWVcbj09PT09PT09PT09PT09PT09PT09PVxuKldpcmVndWFyZCBjb25uZWN0aW9uc1xuKk9wZW5WUE4gY29ubmVjdGlvbnNcbipJUFY0LzYgY29ubmVjdGlvbnNcbipQcm94eSBjb25uZWN0aW9uc1xuKlZQTiB2ZW5kb3IgYXBwbGljYXRpb25zXG4qTWFudWFsIHN0YXRpYyBJUCBjaGFuZ2VzXG5cbj09PT09PT09PT09PT09PT09PT09XG5JUCBGaW5kZXIgaGFzIGFkZGVkIHNlY3VyaXR5XG49PT09PT09PT09PT09PT09PT09PVxuTmV3bHkgZGV2ZWxvcGVkIHJldmlzZWQgY29kZSBiYXNlIHVzaW5nIG9wZW4gdGVjaG5vbG9naWVzIGFuZCB1c2luZyBBUEkncyBmb3IgUHVibGljIElQIGFuZCBNYXAgVGlsZSBpbWFnZSBsb2NhdGlvbnMgdXNpbmcgR0VUIHJlcXVlc3RzIG92ZXIgSFRUUFMgZm9yIGEgYWRkZWQgbGF5ZXIgb2YgZW5jcnlwdGVkICBTZWN1cml0eSwgUGxlYXNlIHNlZSBzb3VyY2UgY29kZSBmb3IgbW9yZSBkZXRhaWxzLlxuXG49PT09PT09PT09PT09PT09PT09PVxuQ29tcGF0aWJsZSBHTk9NRSBzaGVsbCAtIDMuMzYgYW5kIG5ld2VyLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJpcC1maW5kZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpcC1maW5kZXIiLAogICJuYW1lIjogIklQIEZpbmRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pcC1maW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vTGlueEdlbTMzL0lQLUZpbmRlciIsCiAgInV1aWQiOiAiSVAtRmluZGVyQGxpbnhnZW0zMy5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} , {"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": "19", "sha256": "1l15bacj0rn9s4y3ksqqfk0jps12xvdajlvfllb1mjiijw4qdcx6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgIm5hbWUiOiAiUnVuQ2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dpbjBlcnIvZ25vbWUtcnVuY2F0IiwKICAidXVpZCI6ICJydW5jYXRAa29sZXNuaWtvdi5zZSIsCiAgInZlcnNpb24iOiAxOQp9"}, "40": {"version": "19", "sha256": "1l15bacj0rn9s4y3ksqqfk0jps12xvdajlvfllb1mjiijw4qdcx6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgIm5hbWUiOiAiUnVuQ2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dpbjBlcnIvZ25vbWUtcnVuY2F0IiwKICAidXVpZCI6ICJydW5jYXRAa29sZXNuaWtvdi5zZSIsCiAgInZlcnNpb24iOiAxOQp9"}, "41": {"version": "19", "sha256": "1l15bacj0rn9s4y3ksqqfk0jps12xvdajlvfllb1mjiijw4qdcx6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgIm5hbWUiOiAiUnVuQ2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dpbjBlcnIvZ25vbWUtcnVuY2F0IiwKICAidXVpZCI6ICJydW5jYXRAa29sZXNuaWtvdi5zZSIsCiAgInZlcnNpb24iOiAxOQp9"}, "42": {"version": "21", "sha256": "1v26g6p9vchjhw9ci3k23arvrzf2icd7aj1b1diw2i87y4zszs36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgImdldHRleHQtZG9tYWluIjogInJ1bmNhdEBrb2xlc25pa292LnNlIiwKICAibmFtZSI6ICJSdW5DYXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dpbjBlcnIvZ25vbWUtcnVuY2F0IiwKICAidXVpZCI6ICJydW5jYXRAa29sZXNuaWtvdi5zZSIsCiAgInZlcnNpb24iOiAyMQp9"}, "43": {"version": "21", "sha256": "1v26g6p9vchjhw9ci3k23arvrzf2icd7aj1b1diw2i87y4zszs36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgImdldHRleHQtZG9tYWluIjogInJ1bmNhdEBrb2xlc25pa292LnNlIiwKICAibmFtZSI6ICJSdW5DYXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dpbjBlcnIvZ25vbWUtcnVuY2F0IiwKICAidXVpZCI6ICJydW5jYXRAa29sZXNuaWtvdi5zZSIsCiAgInZlcnNpb24iOiAyMQp9"}}} , {"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": "13", "sha256": "1qh02pk4s8lni7rgsbbdv1hb1brh4sfqkr82f4a9lcll2s486hfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwuQm93c2VyIiwKICAiZGVzY3JpcHRpb24iOiAiQ3JlYXRlIHJ1bGVzIHRvIG9wZW4gc3BlY2lmaWMgd2Vic2l0ZXMgaW4gc3BlY2lmaWMgd2ViIGJyb3dzZXJzIGZvciBsaW5rcyBjbGlja2VkIGluIGFueSBhcHBsaWNhdGlvbiBvbiB5b3VyIGNvbXB1dGVyLiAoZW1haWxzLCBjaGF0IGV0YykiLAogICJleHRlbnNpb24taWQiOiAiYm93c2VyLWdub21lIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYm93c2VyLWdub21lIiwKICAibmFtZSI6ICJCb3dzZXIgR25vbWUgRXh0ZW5zaW9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImFkbWluQGtyb25vc291bC54eXoiLAogICJyZXNvdXJjZS1wYXRoIjogIi9vcmcva3Jvbm9zb3VsL0Jvd3Nlci8iLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9Cb3dzZXIvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJvd3NlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9ib3dzZXItZ25vbWUiLAogICJ1dWlkIjogImJvd3Nlci1nbm9tZUBrcm9ub3NvdWwueHl6IiwKICAidmVyc2lvbiI6IDEzCn0="}, "40": {"version": "13", "sha256": "1qh02pk4s8lni7rgsbbdv1hb1brh4sfqkr82f4a9lcll2s486hfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwuQm93c2VyIiwKICAiZGVzY3JpcHRpb24iOiAiQ3JlYXRlIHJ1bGVzIHRvIG9wZW4gc3BlY2lmaWMgd2Vic2l0ZXMgaW4gc3BlY2lmaWMgd2ViIGJyb3dzZXJzIGZvciBsaW5rcyBjbGlja2VkIGluIGFueSBhcHBsaWNhdGlvbiBvbiB5b3VyIGNvbXB1dGVyLiAoZW1haWxzLCBjaGF0IGV0YykiLAogICJleHRlbnNpb24taWQiOiAiYm93c2VyLWdub21lIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYm93c2VyLWdub21lIiwKICAibmFtZSI6ICJCb3dzZXIgR25vbWUgRXh0ZW5zaW9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImFkbWluQGtyb25vc291bC54eXoiLAogICJyZXNvdXJjZS1wYXRoIjogIi9vcmcva3Jvbm9zb3VsL0Jvd3Nlci8iLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9Cb3dzZXIvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJvd3NlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9ib3dzZXItZ25vbWUiLAogICJ1dWlkIjogImJvd3Nlci1nbm9tZUBrcm9ub3NvdWwueHl6IiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "1qh02pk4s8lni7rgsbbdv1hb1brh4sfqkr82f4a9lcll2s486hfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwuQm93c2VyIiwKICAiZGVzY3JpcHRpb24iOiAiQ3JlYXRlIHJ1bGVzIHRvIG9wZW4gc3BlY2lmaWMgd2Vic2l0ZXMgaW4gc3BlY2lmaWMgd2ViIGJyb3dzZXJzIGZvciBsaW5rcyBjbGlja2VkIGluIGFueSBhcHBsaWNhdGlvbiBvbiB5b3VyIGNvbXB1dGVyLiAoZW1haWxzLCBjaGF0IGV0YykiLAogICJleHRlbnNpb24taWQiOiAiYm93c2VyLWdub21lIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYm93c2VyLWdub21lIiwKICAibmFtZSI6ICJCb3dzZXIgR25vbWUgRXh0ZW5zaW9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImFkbWluQGtyb25vc291bC54eXoiLAogICJyZXNvdXJjZS1wYXRoIjogIi9vcmcva3Jvbm9zb3VsL0Jvd3Nlci8iLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9Cb3dzZXIvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJvd3NlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9ib3dzZXItZ25vbWUiLAogICJ1dWlkIjogImJvd3Nlci1nbm9tZUBrcm9ub3NvdWwueHl6IiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "1qh02pk4s8lni7rgsbbdv1hb1brh4sfqkr82f4a9lcll2s486hfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwuQm93c2VyIiwKICAiZGVzY3JpcHRpb24iOiAiQ3JlYXRlIHJ1bGVzIHRvIG9wZW4gc3BlY2lmaWMgd2Vic2l0ZXMgaW4gc3BlY2lmaWMgd2ViIGJyb3dzZXJzIGZvciBsaW5rcyBjbGlja2VkIGluIGFueSBhcHBsaWNhdGlvbiBvbiB5b3VyIGNvbXB1dGVyLiAoZW1haWxzLCBjaGF0IGV0YykiLAogICJleHRlbnNpb24taWQiOiAiYm93c2VyLWdub21lIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYm93c2VyLWdub21lIiwKICAibmFtZSI6ICJCb3dzZXIgR25vbWUgRXh0ZW5zaW9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImFkbWluQGtyb25vc291bC54eXoiLAogICJyZXNvdXJjZS1wYXRoIjogIi9vcmcva3Jvbm9zb3VsL0Jvd3Nlci8iLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9Cb3dzZXIvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJvd3NlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9ib3dzZXItZ25vbWUiLAogICJ1dWlkIjogImJvd3Nlci1nbm9tZUBrcm9ub3NvdWwueHl6IiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "13", "sha256": "1qh02pk4s8lni7rgsbbdv1hb1brh4sfqkr82f4a9lcll2s486hfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwuQm93c2VyIiwKICAiZGVzY3JpcHRpb24iOiAiQ3JlYXRlIHJ1bGVzIHRvIG9wZW4gc3BlY2lmaWMgd2Vic2l0ZXMgaW4gc3BlY2lmaWMgd2ViIGJyb3dzZXJzIGZvciBsaW5rcyBjbGlja2VkIGluIGFueSBhcHBsaWNhdGlvbiBvbiB5b3VyIGNvbXB1dGVyLiAoZW1haWxzLCBjaGF0IGV0YykiLAogICJleHRlbnNpb24taWQiOiAiYm93c2VyLWdub21lIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYm93c2VyLWdub21lIiwKICAibmFtZSI6ICJCb3dzZXIgR25vbWUgRXh0ZW5zaW9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImFkbWluQGtyb25vc291bC54eXoiLAogICJyZXNvdXJjZS1wYXRoIjogIi9vcmcva3Jvbm9zb3VsL0Jvd3Nlci8iLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9Cb3dzZXIvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJvd3NlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ibGlway9ib3dzZXItZ25vbWUiLAogICJ1dWlkIjogImJvd3Nlci1nbm9tZUBrcm9ub3NvdWwueHl6IiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"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": "11", "sha256": "0p0crv91n0lals20hkrvivj00yhsadkwy9s2bfdyzmk6slwa35rb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGF1cmVudG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWlkZWFwYWQiLAogICJ1dWlkIjogImlkZWFwYWRAbGF1cmVudG8uZnJpdHRlbGxhIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "0p0crv91n0lals20hkrvivj00yhsadkwy9s2bfdyzmk6slwa35rb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGF1cmVudG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWlkZWFwYWQiLAogICJ1dWlkIjogImlkZWFwYWRAbGF1cmVudG8uZnJpdHRlbGxhIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "0p0crv91n0lals20hkrvivj00yhsadkwy9s2bfdyzmk6slwa35rb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGF1cmVudG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWlkZWFwYWQiLAogICJ1dWlkIjogImlkZWFwYWRAbGF1cmVudG8uZnJpdHRlbGxhIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "0p0crv91n0lals20hkrvivj00yhsadkwy9s2bfdyzmk6slwa35rb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGF1cmVudG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWlkZWFwYWQiLAogICJ1dWlkIjogImlkZWFwYWRAbGF1cmVudG8uZnJpdHRlbGxhIiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "12", "sha256": "1z9n3qfr129ismgzw7nwgmq0gwjwf7y7lzq7mcdw0dc227gkxww3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJlbnRvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1pZGVhcGFkIiwKICAidXVpZCI6ICJpZGVhcGFkQGxhdXJlbnRvLmZyaXR0ZWxsYSIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"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": "43", "sha256": "0s6l2dgbd0z5h8vbb7mmpdaws6dcdw52m2nm3rh28gryv7k9926c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLlxuXG5UaGlzIGlzIHByZWZlcmFibGUgZm9yIHVzZXJzIG9uIGJsZWVkaW5nIGVkZ2UgZGlzdHJpYnV0aW9ucyB0aGF0IHByZWZlciBub3QgdG8gd2FpdCBmb3IgYSBzdGFibGUgcmVsZWFzZSBmcm9tIHRoZSBtYWluIHJlcG8uIE9mIGNvdXJzZSwgc2luY2Ugd2UncmUgcmVsZWFzaW5nIGRpcmVjdGx5IGZyb20gbWFzdGVyIHNvbWUgaW5zdGFiaWxpdHkgaXMgaW5ldml0YWJsZS5cblxuSWYgeW91IGdldCBhbiBlcnJvciBhZnRlciB1cGRhdGluZywgdHJ5IHJlc3RhcnRpbmcgR25vbWUgU2hlbGwgd2l0aCBBbHQtRjIgdGhlbiAncicuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogInN5c3RlbS1tb25pdG9yLW5leHQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3lzdGVtLW1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWdhbGdzL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItbmV4dEBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDMKfQ=="}, "41": {"version": "43", "sha256": "0s6l2dgbd0z5h8vbb7mmpdaws6dcdw52m2nm3rh28gryv7k9926c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLlxuXG5UaGlzIGlzIHByZWZlcmFibGUgZm9yIHVzZXJzIG9uIGJsZWVkaW5nIGVkZ2UgZGlzdHJpYnV0aW9ucyB0aGF0IHByZWZlciBub3QgdG8gd2FpdCBmb3IgYSBzdGFibGUgcmVsZWFzZSBmcm9tIHRoZSBtYWluIHJlcG8uIE9mIGNvdXJzZSwgc2luY2Ugd2UncmUgcmVsZWFzaW5nIGRpcmVjdGx5IGZyb20gbWFzdGVyIHNvbWUgaW5zdGFiaWxpdHkgaXMgaW5ldml0YWJsZS5cblxuSWYgeW91IGdldCBhbiBlcnJvciBhZnRlciB1cGRhdGluZywgdHJ5IHJlc3RhcnRpbmcgR25vbWUgU2hlbGwgd2l0aCBBbHQtRjIgdGhlbiAncicuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogInN5c3RlbS1tb25pdG9yLW5leHQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3lzdGVtLW1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWdhbGdzL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItbmV4dEBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDMKfQ=="}, "42": {"version": "43", "sha256": "0s6l2dgbd0z5h8vbb7mmpdaws6dcdw52m2nm3rh28gryv7k9926c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLlxuXG5UaGlzIGlzIHByZWZlcmFibGUgZm9yIHVzZXJzIG9uIGJsZWVkaW5nIGVkZ2UgZGlzdHJpYnV0aW9ucyB0aGF0IHByZWZlciBub3QgdG8gd2FpdCBmb3IgYSBzdGFibGUgcmVsZWFzZSBmcm9tIHRoZSBtYWluIHJlcG8uIE9mIGNvdXJzZSwgc2luY2Ugd2UncmUgcmVsZWFzaW5nIGRpcmVjdGx5IGZyb20gbWFzdGVyIHNvbWUgaW5zdGFiaWxpdHkgaXMgaW5ldml0YWJsZS5cblxuSWYgeW91IGdldCBhbiBlcnJvciBhZnRlciB1cGRhdGluZywgdHJ5IHJlc3RhcnRpbmcgR25vbWUgU2hlbGwgd2l0aCBBbHQtRjIgdGhlbiAncicuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogInN5c3RlbS1tb25pdG9yLW5leHQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3lzdGVtLW1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWdhbGdzL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItbmV4dEBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDMKfQ=="}, "43": {"version": "43", "sha256": "0s6l2dgbd0z5h8vbb7mmpdaws6dcdw52m2nm3rh28gryv7k9926c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLlxuXG5UaGlzIGlzIHByZWZlcmFibGUgZm9yIHVzZXJzIG9uIGJsZWVkaW5nIGVkZ2UgZGlzdHJpYnV0aW9ucyB0aGF0IHByZWZlciBub3QgdG8gd2FpdCBmb3IgYSBzdGFibGUgcmVsZWFzZSBmcm9tIHRoZSBtYWluIHJlcG8uIE9mIGNvdXJzZSwgc2luY2Ugd2UncmUgcmVsZWFzaW5nIGRpcmVjdGx5IGZyb20gbWFzdGVyIHNvbWUgaW5zdGFiaWxpdHkgaXMgaW5ldml0YWJsZS5cblxuSWYgeW91IGdldCBhbiBlcnJvciBhZnRlciB1cGRhdGluZywgdHJ5IHJlc3RhcnRpbmcgR25vbWUgU2hlbGwgd2l0aCBBbHQtRjIgdGhlbiAncicuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogInN5c3RlbS1tb25pdG9yLW5leHQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3lzdGVtLW1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWdhbGdzL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItbmV4dEBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDMKfQ=="}}} -, {"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"}, "43": {"version": "30", "sha256": "1522c37ys86cphghggrfq7b1c2gx7jh465xvh14i8brcwi53sxsq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIHN1cHBvcnRcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUteCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11c2VyLXRoZW1lLXgiLAogICJuYW1lIjogIlVzZXIgVGhlbWVzIFgiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS91c2VyLXRoZW1lLXgiLAogICJ1dWlkIjogInVzZXItdGhlbWUteEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzMAp9"}}} +, {"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 based on the Night Light\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": "1jzhp67580k8l71nn4vab0hr0ai04rlkprdcb4dz8v1dpg0fvhw1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIGJhc2VkIG9uIHRoZSBOaWdodCBMaWdodFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJleHRlbnNpb24taWQiOiAidXNlci10aGVtZS14IiwKICAiZ2V0dGV4dC1kb21haW4iOiAidXNlci10aGVtZS14IiwKICAibmFtZSI6ICJVc2VyIFRoZW1lcyBYIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2huLnN0b3dlcnNAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51c2VyLXRoZW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS91c2VyLXRoZW1lLXgiLAogICJ1dWlkIjogInVzZXItdGhlbWUteEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyMQp9"}, "40": {"version": "24", "sha256": "038szqnw9an2b8mwghc3ki7h7h8pf31g7mvbfbk87b016g7npcn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIGJhc2VkIG9uIHRoZSBOaWdodCBMaWdodFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJleHRlbnNpb24taWQiOiAidXNlci10aGVtZS14IiwKICAiZ2V0dGV4dC1kb21haW4iOiAidXNlci10aGVtZS14IiwKICAibmFtZSI6ICJVc2VyIFRoZW1lcyBYIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2huLnN0b3dlcnNAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51c2VyLXRoZW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvdXNlci10aGVtZS14IiwKICAidXVpZCI6ICJ1c2VyLXRoZW1lLXhAdHViZXJyeS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjQKfQ=="}, "41": {"version": "25", "sha256": "0g5hahmvjxc6dfb7lhy3fxv73lppln63j0zfpw5dhalwzvsk9kh6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIGJhc2VkIG9uIHRoZSBOaWdodCBMaWdodFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJleHRlbnNpb24taWQiOiAidXNlci10aGVtZS14IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVzZXItdGhlbWUteCIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMgWCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3VzZXItdGhlbWUteCIsCiAgInV1aWQiOiAidXNlci10aGVtZS14QHR1YmVycnkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "42": {"version": "28", "sha256": "0y9zlmlj13zqm4vhf5c7wyaxjpsscnx6ac6v4b5jlngp2kx439z7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIGJhc2VkIG9uIHRoZSBOaWdodCBMaWdodFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJleHRlbnNpb24taWQiOiAidXNlci10aGVtZS14IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVzZXItdGhlbWUteCIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMgWCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3VzZXItdGhlbWUteCIsCiAgInV1aWQiOiAidXNlci10aGVtZS14QHR1YmVycnkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDI4Cn0="}, "43": {"version": "31", "sha256": "0njfm8jpckp2kwjdsfpv8q1igin1mys2rv4fv8wfvyk86nfllyr8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIGJhc2VkIG9uIHRoZSBOaWdodCBMaWdodFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJleHRlbnNpb24taWQiOiAidXNlci10aGVtZS14IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVzZXItdGhlbWUteCIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMgWCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3VzZXItdGhlbWUteCIsCiAgInV1aWQiOiAidXNlci10aGVtZS14QHR1YmVycnkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMxCn0="}}} , {"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": "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": "11", "sha256": "08g99hh9a3nbpqnc88j5xacpcz542qwkc230fm5ma67g49g2ca7k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIGluZGljYXRvciBmb3IgYSBWUE4gYW5kIFNOWChDaGVjayBQb2ludCkgY29ubmVjdGlvbi4iLAogICJuYW1lIjogIlZQTiBhbmQgU05YIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsZXhleWxvdmNoaWtvdi92cG4taW5kaWNhdG9yLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidnBuLXNueC1pbmRpY2F0b3JAYWxzLmt6IiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "08g99hh9a3nbpqnc88j5xacpcz542qwkc230fm5ma67g49g2ca7k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIGluZGljYXRvciBmb3IgYSBWUE4gYW5kIFNOWChDaGVjayBQb2ludCkgY29ubmVjdGlvbi4iLAogICJuYW1lIjogIlZQTiBhbmQgU05YIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsZXhleWxvdmNoaWtvdi92cG4taW5kaWNhdG9yLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidnBuLXNueC1pbmRpY2F0b3JAYWxzLmt6IiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "08g99hh9a3nbpqnc88j5xacpcz542qwkc230fm5ma67g49g2ca7k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIGluZGljYXRvciBmb3IgYSBWUE4gYW5kIFNOWChDaGVjayBQb2ludCkgY29ubmVjdGlvbi4iLAogICJuYW1lIjogIlZQTiBhbmQgU05YIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsZXhleWxvdmNoaWtvdi92cG4taW5kaWNhdG9yLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidnBuLXNueC1pbmRpY2F0b3JAYWxzLmt6IiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"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": "4", "sha256": "03axq6rikn71d02qjwkb12igxv05y742i7dva3b8n87mjdzr5qc2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIGFuZCBkZWFjdGl2YXRlIFZMQU4gY29ubmVjdGlvbnMgZnJvbSB0aGUgc3lzdGVtIHBhbmVsLiIsCiAgIm5hbWUiOiAiVkxBTiBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFyY2F0by9nbm9tZS12bGFuLXN3aXRjaGVyIiwKICAidXVpZCI6ICJ2bGFuLXN3aXRjaGVyQGRhcmNhdG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "03axq6rikn71d02qjwkb12igxv05y742i7dva3b8n87mjdzr5qc2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIGFuZCBkZWFjdGl2YXRlIFZMQU4gY29ubmVjdGlvbnMgZnJvbSB0aGUgc3lzdGVtIHBhbmVsLiIsCiAgIm5hbWUiOiAiVkxBTiBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFyY2F0by9nbm9tZS12bGFuLXN3aXRjaGVyIiwKICAidXVpZCI6ICJ2bGFuLXN3aXRjaGVyQGRhcmNhdG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "03axq6rikn71d02qjwkb12igxv05y742i7dva3b8n87mjdzr5qc2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIGFuZCBkZWFjdGl2YXRlIFZMQU4gY29ubmVjdGlvbnMgZnJvbSB0aGUgc3lzdGVtIHBhbmVsLiIsCiAgIm5hbWUiOiAiVkxBTiBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFyY2F0by9nbm9tZS12bGFuLXN3aXRjaGVyIiwKICAidXVpZCI6ICJ2bGFuLXN3aXRjaGVyQGRhcmNhdG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"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=="}, "43": {"version": "24", "sha256": "170i3w64gwd12z4cx9h6dlxishaf867sv6rg7zq12x217qy8wz3i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3Mtc3Vic2NyaWJlciIsCiAgIm5hbWUiOiAiU2ltcGxlIFN1YnNjcmliZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3Mtc3Vic2NyaWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3NzLXN1YnNjcmliZXIiLAogICJ1dWlkIjogInNzc3NAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMjQKfQ=="}}} -, {"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=="}, "43": {"version": "32", "sha256": "1iq44f1mymasly9pnwx6rcyagnqxydaciwzb158f4kwny4hmbz6l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMzIKfQ=="}}} +, {"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=="}, "43": {"version": "25", "sha256": "0s33s1gq6na12ygzmjf4kkcbv4zz6mwg449456m0pxhblmwng093", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3Mtc3Vic2NyaWJlciIsCiAgIm5hbWUiOiAiU2ltcGxlIFN1YnNjcmliZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3Mtc3Vic2NyaWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3NzLXN1YnNjcmliZXIiLAogICJ1dWlkIjogInNzc3NAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMjUKfQ=="}}} +, {"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=="}, "43": {"version": "34", "sha256": "0jq0c80y20d8rljn1478v537lch6klwir0gkzp35y03s1wj0ma36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMzQKfQ=="}}} , {"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": "12", "sha256": "13srjh0zhhc0v3sqsa2drksy8p0b3whfszbrwvjp1qgjd8k1rn9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2Fpc2VyYWNtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tYXhpbWl6ZS10by1lbXB0eS13b3Jrc3BhY2UiLAogICJ1dWlkIjogIk1heGltaXplVG9FbXB0eVdvcmtzcGFjZS1leHRlbnNpb25Aa2Fpc2Vyc2l0ZS5kZSIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "13srjh0zhhc0v3sqsa2drksy8p0b3whfszbrwvjp1qgjd8k1rn9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2Fpc2VyYWNtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tYXhpbWl6ZS10by1lbXB0eS13b3Jrc3BhY2UiLAogICJ1dWlkIjogIk1heGltaXplVG9FbXB0eVdvcmtzcGFjZS1leHRlbnNpb25Aa2Fpc2Vyc2l0ZS5kZSIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "13srjh0zhhc0v3sqsa2drksy8p0b3whfszbrwvjp1qgjd8k1rn9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2Fpc2VyYWNtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tYXhpbWl6ZS10by1lbXB0eS13b3Jrc3BhY2UiLAogICJ1dWlkIjogIk1heGltaXplVG9FbXB0eVdvcmtzcGFjZS1leHRlbnNpb25Aa2Fpc2Vyc2l0ZS5kZSIsCiAgInZlcnNpb24iOiAxMgp9"}, "42": {"version": "12", "sha256": "13srjh0zhhc0v3sqsa2drksy8p0b3whfszbrwvjp1qgjd8k1rn9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2Fpc2VyYWNtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tYXhpbWl6ZS10by1lbXB0eS13b3Jrc3BhY2UiLAogICJ1dWlkIjogIk1heGltaXplVG9FbXB0eVdvcmtzcGFjZS1leHRlbnNpb25Aa2Fpc2Vyc2l0ZS5kZSIsCiAgInZlcnNpb24iOiAxMgp9"}, "43": {"version": "12", "sha256": "13srjh0zhhc0v3sqsa2drksy8p0b3whfszbrwvjp1qgjd8k1rn9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2Fpc2VyYWNtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tYXhpbWl6ZS10by1lbXB0eS13b3Jrc3BhY2UiLAogICJ1dWlkIjogIk1heGltaXplVG9FbXB0eVdvcmtzcGFjZS1leHRlbnNpb25Aa2Fpc2Vyc2l0ZS5kZSIsCiAgInZlcnNpb24iOiAxMgp9"}}} -, {"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": "10", "sha256": "15d8w18s0chk5w0b9bfm9xyhnlrwmgkf833yg144wxc1l5c23lrz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gZXllIHRvIHRoZSBpbmRpY2F0b3IgYmFyIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvciBcbllvdSBjYW4gYWxzbyBkaXNwbGF5IHRoZSBtb3VzZSBpbmRpY2F0b3IsIHBlcmhhcHMgaXQgd2lsbCBoZWxwIHlvdSB3aXRoIHRoZSBwcm9ibGVtIG9mIGRpc3BsYXlpbmcgdGhlIG1vdXNlIGN1cnNvciBpbiBTa3lwZSIsCiAgImdldHRleHQtZG9tYWluIjogIkV5ZUV4dGVuZGVkIiwKICAibmFtZSI6ICJFeWUgYW5kIE1vdXNlIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImt6LmFscy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMCIsCiAgICAiMy4zOC4wIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "15d8w18s0chk5w0b9bfm9xyhnlrwmgkf833yg144wxc1l5c23lrz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gZXllIHRvIHRoZSBpbmRpY2F0b3IgYmFyIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvciBcbllvdSBjYW4gYWxzbyBkaXNwbGF5IHRoZSBtb3VzZSBpbmRpY2F0b3IsIHBlcmhhcHMgaXQgd2lsbCBoZWxwIHlvdSB3aXRoIHRoZSBwcm9ibGVtIG9mIGRpc3BsYXlpbmcgdGhlIG1vdXNlIGN1cnNvciBpbiBTa3lwZSIsCiAgImdldHRleHQtZG9tYWluIjogIkV5ZUV4dGVuZGVkIiwKICAibmFtZSI6ICJFeWUgYW5kIE1vdXNlIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImt6LmFscy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMCIsCiAgICAiMy4zOC4wIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "15d8w18s0chk5w0b9bfm9xyhnlrwmgkf833yg144wxc1l5c23lrz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gZXllIHRvIHRoZSBpbmRpY2F0b3IgYmFyIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvciBcbllvdSBjYW4gYWxzbyBkaXNwbGF5IHRoZSBtb3VzZSBpbmRpY2F0b3IsIHBlcmhhcHMgaXQgd2lsbCBoZWxwIHlvdSB3aXRoIHRoZSBwcm9ibGVtIG9mIGRpc3BsYXlpbmcgdGhlIG1vdXNlIGN1cnNvciBpbiBTa3lwZSIsCiAgImdldHRleHQtZG9tYWluIjogIkV5ZUV4dGVuZGVkIiwKICAibmFtZSI6ICJFeWUgYW5kIE1vdXNlIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImt6LmFscy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMCIsCiAgICAiMy4zOC4wIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "42": {"version": "10", "sha256": "15d8w18s0chk5w0b9bfm9xyhnlrwmgkf833yg144wxc1l5c23lrz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gZXllIHRvIHRoZSBpbmRpY2F0b3IgYmFyIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvciBcbllvdSBjYW4gYWxzbyBkaXNwbGF5IHRoZSBtb3VzZSBpbmRpY2F0b3IsIHBlcmhhcHMgaXQgd2lsbCBoZWxwIHlvdSB3aXRoIHRoZSBwcm9ibGVtIG9mIGRpc3BsYXlpbmcgdGhlIG1vdXNlIGN1cnNvciBpbiBTa3lwZSIsCiAgImdldHRleHQtZG9tYWluIjogIkV5ZUV4dGVuZGVkIiwKICAibmFtZSI6ICJFeWUgYW5kIE1vdXNlIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImt6LmFscy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMCIsCiAgICAiMy4zOC4wIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} +, {"uuid": "eye-extended@als.kz", "name": "Eye and Mouse Extended", "pname": "eye-extended", "description": "An eye on the top panel that follows your cursor.\nIt includes a mouse indicator to better keep track of your mouse location.", "link": "https://extensions.gnome.org/extension/3139/eye-extended/", "shell_version_map": {"38": {"version": "10", "sha256": "0jh8ic9krn8fqnaar3lwcvd255y5ibi1kdjmgw7vjwq42psnc1nd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRXllRXh0ZW5kZWQiLAogICJuYW1lIjogIkV5ZSBhbmQgTW91c2UgRXh0ZW5kZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAia3ouYWxzLmV5ZS1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNi4wIiwKICAgICIzLjM4LjAiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZXlsb3ZjaGlrb3YvZXllLWV4dGVuZGVkLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZXllLWV4dGVuZGVkQGFscy5reiIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "12", "sha256": "1a334plhay126wlkh4vn2z8b6kmibygz45rjvg38ridkkpqzjprb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "41": {"version": "12", "sha256": "1a334plhay126wlkh4vn2z8b6kmibygz45rjvg38ridkkpqzjprb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "42": {"version": "12", "sha256": "1a334plhay126wlkh4vn2z8b6kmibygz45rjvg38ridkkpqzjprb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "43": {"version": "12", "sha256": "1a334plhay126wlkh4vn2z8b6kmibygz45rjvg38ridkkpqzjprb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}}} , {"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": "no_activities@yaya.cout", "name": "No activities button", "pname": "no-activities-button", "description": "Hide the activities button", "link": "https://extensions.gnome.org/extension/3184/no-activities-button/", "shell_version_map": {"38": {"version": "4", "sha256": "1759h1yp2hndbksaqm2zid2lsca9zmxwfb5n8jrlx7rjfgr7cb11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjdGl2aXRpZXMgYnV0dG9uIiwKICAibmFtZSI6ICJObyBhY3Rpdml0aWVzIGJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibm9fYWN0aXZpdGllc0B5YXlhLmNvdXQiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "1759h1yp2hndbksaqm2zid2lsca9zmxwfb5n8jrlx7rjfgr7cb11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjdGl2aXRpZXMgYnV0dG9uIiwKICAibmFtZSI6ICJObyBhY3Rpdml0aWVzIGJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibm9fYWN0aXZpdGllc0B5YXlhLmNvdXQiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "1759h1yp2hndbksaqm2zid2lsca9zmxwfb5n8jrlx7rjfgr7cb11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjdGl2aXRpZXMgYnV0dG9uIiwKICAibmFtZSI6ICJObyBhY3Rpdml0aWVzIGJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibm9fYWN0aXZpdGllc0B5YXlhLmNvdXQiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "1759h1yp2hndbksaqm2zid2lsca9zmxwfb5n8jrlx7rjfgr7cb11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjdGl2aXRpZXMgYnV0dG9uIiwKICAibmFtZSI6ICJObyBhY3Rpdml0aWVzIGJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibm9fYWN0aXZpdGllc0B5YXlhLmNvdXQiLAogICJ2ZXJzaW9uIjogNAp9"}, "43": {"version": "4", "sha256": "1759h1yp2hndbksaqm2zid2lsca9zmxwfb5n8jrlx7rjfgr7cb11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjdGl2aXRpZXMgYnV0dG9uIiwKICAibmFtZSI6ICJObyBhY3Rpdml0aWVzIGJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibm9fYWN0aXZpdGllc0B5YXlhLmNvdXQiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"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\n\nNote: if the extension shows an error after updating, please make sure to restart your session to see if it persists. This is due to a bug in gnome shell, which I can't fix by myself.", "link": "https://extensions.gnome.org/extension/3193/blur-my-shell/", "shell_version_map": {"38": {"version": "22", "sha256": "1ss5vhzjkp2bpllxpjlk1l2i8n7p4xjpzkn0q6jg3gd472kkanfx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWJsdXItbXktc2hlbGwiLAogICJ1dWlkIjogImJsdXItbXktc2hlbGxAYXVuZXR4IiwKICAidmVyc2lvbiI6IDIyCn0="}, "40": {"version": "29", "sha256": "09zflyqk5mlybc4avm812hqr32q0yzrkkw0qy5q4lbkdid7cpqpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, "41": {"version": "29", "sha256": "09zflyqk5mlybc4avm812hqr32q0yzrkkw0qy5q4lbkdid7cpqpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, "42": {"version": "44", "sha256": "1cgr803nh5vmc62adsmxjmd5aba3ln4fxn3g4ynqfjql7s2ymkz9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIm1lQGF1bmV0eC5kZXYiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdXItbXktc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "43": {"version": "44", "sha256": "1cgr803nh5vmc62adsmxjmd5aba3ln4fxn3g4ynqfjql7s2ymkz9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIm1lQGF1bmV0eC5kZXYiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdXItbXktc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogNDQKfQ=="}}} , {"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": "5", "sha256": "12jycfdlywlc2gf7hcpa1draqsy8jgb2dgr8sihh2f97b31dk1nh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBPdmVydmlldyB3aXRoIGEgc2luZ2xlIEVTQyBwcmVzcyB3aGVuIHNlYXJjaGJveCBpcyBlbXB0eS5cblxuVGhlIGRlZmF1bHQgZ25vbWUtc2hlbGwgYmVoYXZpb3VyIGlzLCBkdXJpbmcgZmlyc3QgRVNDIHByZXNzLCBjbGVhbiB0aGUgc2VhcmNoYm94LCB0aGVuIHNlY29uZCBFU0MgcHJlc3MgZ2V0IGJhY2sgdG8gQWN0aXZpdGllcyBvdmVydmlldyBhbmQgdGhlbiB0aGlyZCBFU0MgcHJlc3Mgd2lsbCBmaW5hbGx5IGNsb3NlIHRoZSBvdmVydmlldy4iLAogICJuYW1lIjogIkVTQ2FwZSBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhZWxnYy9lc2NhcGUtb3ZlcnZpZXciLAogICJ1dWlkIjogImVzY2FwZS1vdmVydmlld0ByYWVsZ2MiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "12jycfdlywlc2gf7hcpa1draqsy8jgb2dgr8sihh2f97b31dk1nh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBPdmVydmlldyB3aXRoIGEgc2luZ2xlIEVTQyBwcmVzcyB3aGVuIHNlYXJjaGJveCBpcyBlbXB0eS5cblxuVGhlIGRlZmF1bHQgZ25vbWUtc2hlbGwgYmVoYXZpb3VyIGlzLCBkdXJpbmcgZmlyc3QgRVNDIHByZXNzLCBjbGVhbiB0aGUgc2VhcmNoYm94LCB0aGVuIHNlY29uZCBFU0MgcHJlc3MgZ2V0IGJhY2sgdG8gQWN0aXZpdGllcyBvdmVydmlldyBhbmQgdGhlbiB0aGlyZCBFU0MgcHJlc3Mgd2lsbCBmaW5hbGx5IGNsb3NlIHRoZSBvdmVydmlldy4iLAogICJuYW1lIjogIkVTQ2FwZSBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhZWxnYy9lc2NhcGUtb3ZlcnZpZXciLAogICJ1dWlkIjogImVzY2FwZS1vdmVydmlld0ByYWVsZ2MiLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "12jycfdlywlc2gf7hcpa1draqsy8jgb2dgr8sihh2f97b31dk1nh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBPdmVydmlldyB3aXRoIGEgc2luZ2xlIEVTQyBwcmVzcyB3aGVuIHNlYXJjaGJveCBpcyBlbXB0eS5cblxuVGhlIGRlZmF1bHQgZ25vbWUtc2hlbGwgYmVoYXZpb3VyIGlzLCBkdXJpbmcgZmlyc3QgRVNDIHByZXNzLCBjbGVhbiB0aGUgc2VhcmNoYm94LCB0aGVuIHNlY29uZCBFU0MgcHJlc3MgZ2V0IGJhY2sgdG8gQWN0aXZpdGllcyBvdmVydmlldyBhbmQgdGhlbiB0aGlyZCBFU0MgcHJlc3Mgd2lsbCBmaW5hbGx5IGNsb3NlIHRoZSBvdmVydmlldy4iLAogICJuYW1lIjogIkVTQ2FwZSBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhZWxnYy9lc2NhcGUtb3ZlcnZpZXciLAogICJ1dWlkIjogImVzY2FwZS1vdmVydmlld0ByYWVsZ2MiLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "5", "sha256": "12jycfdlywlc2gf7hcpa1draqsy8jgb2dgr8sihh2f97b31dk1nh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBPdmVydmlldyB3aXRoIGEgc2luZ2xlIEVTQyBwcmVzcyB3aGVuIHNlYXJjaGJveCBpcyBlbXB0eS5cblxuVGhlIGRlZmF1bHQgZ25vbWUtc2hlbGwgYmVoYXZpb3VyIGlzLCBkdXJpbmcgZmlyc3QgRVNDIHByZXNzLCBjbGVhbiB0aGUgc2VhcmNoYm94LCB0aGVuIHNlY29uZCBFU0MgcHJlc3MgZ2V0IGJhY2sgdG8gQWN0aXZpdGllcyBvdmVydmlldyBhbmQgdGhlbiB0aGlyZCBFU0MgcHJlc3Mgd2lsbCBmaW5hbGx5IGNsb3NlIHRoZSBvdmVydmlldy4iLAogICJuYW1lIjogIkVTQ2FwZSBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhZWxnYy9lc2NhcGUtb3ZlcnZpZXciLAogICJ1dWlkIjogImVzY2FwZS1vdmVydmlld0ByYWVsZ2MiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "compiz-windows-effect@hermes83.github.com", "name": "Compiz windows effect", "pname": "compiz-windows-effect", "description": "Compiz wobbly windows effect thanks to compiz plugin engine.\n\nDoes NOT requires any external library\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": "19", "sha256": "19zysj4fb4hdxp0arcj4wilv4znxsalv92irlysk7dpxp1yyvj5z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGNvbXBpeiBwbHVnaW4gZW5naW5lLlxuXG5Eb2VzIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeVxuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICBWaWRlb1xuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbmh0dHBzOi8veW91dHUuYmUvRzhiQVZJQjlBN0EiLAogICJuYW1lIjogIkNvbXBpeiB3aW5kb3dzIGVmZmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "40": {"version": "19", "sha256": "19zysj4fb4hdxp0arcj4wilv4znxsalv92irlysk7dpxp1yyvj5z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGNvbXBpeiBwbHVnaW4gZW5naW5lLlxuXG5Eb2VzIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeVxuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICBWaWRlb1xuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbmh0dHBzOi8veW91dHUuYmUvRzhiQVZJQjlBN0EiLAogICJuYW1lIjogIkNvbXBpeiB3aW5kb3dzIGVmZmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "19zysj4fb4hdxp0arcj4wilv4znxsalv92irlysk7dpxp1yyvj5z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGNvbXBpeiBwbHVnaW4gZW5naW5lLlxuXG5Eb2VzIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeVxuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICBWaWRlb1xuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbmh0dHBzOi8veW91dHUuYmUvRzhiQVZJQjlBN0EiLAogICJuYW1lIjogIkNvbXBpeiB3aW5kb3dzIGVmZmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "42": {"version": "19", "sha256": "19zysj4fb4hdxp0arcj4wilv4znxsalv92irlysk7dpxp1yyvj5z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGNvbXBpeiBwbHVnaW4gZW5naW5lLlxuXG5Eb2VzIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeVxuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICBWaWRlb1xuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbmh0dHBzOi8veW91dHUuYmUvRzhiQVZJQjlBN0EiLAogICJuYW1lIjogIkNvbXBpeiB3aW5kb3dzIGVmZmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "43": {"version": "19", "sha256": "19zysj4fb4hdxp0arcj4wilv4znxsalv92irlysk7dpxp1yyvj5z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGNvbXBpeiBwbHVnaW4gZW5naW5lLlxuXG5Eb2VzIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeVxuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICBWaWRlb1xuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbmh0dHBzOi8veW91dHUuYmUvRzhiQVZJQjlBN0EiLAogICJuYW1lIjogIkNvbXBpeiB3aW5kb3dzIGVmZmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} , {"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 - 42 on Fedora 32 - 36. 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": {"38": {"version": "5", "sha256": "18hvivfwf3kl0fxwp2f9fbk24l899migcz3jq7n5xh1di2w4xd0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsb2NrcyBjYXJpYm91ICh0aGUgb24gc2NyZWVuIGtleWJvYXJkKSBmcm9tIHBvcHBpbmcgdXAgd2hlbiB5b3UgdXNlIGEgdG91Y2hzY3JlZW4uIEV2ZW4gaWYgaXQncyBkaXNhYmxlZCBpbiB0aGUgYWNjZXNzaWJpbGl0eSBzZXJ2aWNlcyBtZW51LiBDb250aW51YXRpb24gb2Yga2VyaW5nYXIncyB3b3JrLiBUZXN0ZWQgb24gR05PTUUgU2hlbGwgdmVyc2lvbiAzLjM2IC0gNDIgb24gRmVkb3JhIDMyIC0gMzYuIEZvciBhIGhpZ2hlciB2ZXJzaW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyI2luc3RhbGxpbmctb24taGlnaC1nbm9tZS1zaGVsbC12ZXJzaW9uIC4iLAogICJuYW1lIjogIkJsb2NrIENhcmlib3UgMzYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9seHlseHkxMjM0NTYvY2FyaWJvdWJsb2NrZXIiLAogICJ1dWlkIjogImJsb2NrLWNhcmlib3UtMzZAbHh5bHh5MTIzNDU2LmVyY2xpLmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "18hvivfwf3kl0fxwp2f9fbk24l899migcz3jq7n5xh1di2w4xd0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsb2NrcyBjYXJpYm91ICh0aGUgb24gc2NyZWVuIGtleWJvYXJkKSBmcm9tIHBvcHBpbmcgdXAgd2hlbiB5b3UgdXNlIGEgdG91Y2hzY3JlZW4uIEV2ZW4gaWYgaXQncyBkaXNhYmxlZCBpbiB0aGUgYWNjZXNzaWJpbGl0eSBzZXJ2aWNlcyBtZW51LiBDb250aW51YXRpb24gb2Yga2VyaW5nYXIncyB3b3JrLiBUZXN0ZWQgb24gR05PTUUgU2hlbGwgdmVyc2lvbiAzLjM2IC0gNDIgb24gRmVkb3JhIDMyIC0gMzYuIEZvciBhIGhpZ2hlciB2ZXJzaW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyI2luc3RhbGxpbmctb24taGlnaC1nbm9tZS1zaGVsbC12ZXJzaW9uIC4iLAogICJuYW1lIjogIkJsb2NrIENhcmlib3UgMzYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9seHlseHkxMjM0NTYvY2FyaWJvdWJsb2NrZXIiLAogICJ1dWlkIjogImJsb2NrLWNhcmlib3UtMzZAbHh5bHh5MTIzNDU2LmVyY2xpLmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "18hvivfwf3kl0fxwp2f9fbk24l899migcz3jq7n5xh1di2w4xd0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsb2NrcyBjYXJpYm91ICh0aGUgb24gc2NyZWVuIGtleWJvYXJkKSBmcm9tIHBvcHBpbmcgdXAgd2hlbiB5b3UgdXNlIGEgdG91Y2hzY3JlZW4uIEV2ZW4gaWYgaXQncyBkaXNhYmxlZCBpbiB0aGUgYWNjZXNzaWJpbGl0eSBzZXJ2aWNlcyBtZW51LiBDb250aW51YXRpb24gb2Yga2VyaW5nYXIncyB3b3JrLiBUZXN0ZWQgb24gR05PTUUgU2hlbGwgdmVyc2lvbiAzLjM2IC0gNDIgb24gRmVkb3JhIDMyIC0gMzYuIEZvciBhIGhpZ2hlciB2ZXJzaW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyI2luc3RhbGxpbmctb24taGlnaC1nbm9tZS1zaGVsbC12ZXJzaW9uIC4iLAogICJuYW1lIjogIkJsb2NrIENhcmlib3UgMzYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9seHlseHkxMjM0NTYvY2FyaWJvdWJsb2NrZXIiLAogICJ1dWlkIjogImJsb2NrLWNhcmlib3UtMzZAbHh5bHh5MTIzNDU2LmVyY2xpLmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "18hvivfwf3kl0fxwp2f9fbk24l899migcz3jq7n5xh1di2w4xd0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsb2NrcyBjYXJpYm91ICh0aGUgb24gc2NyZWVuIGtleWJvYXJkKSBmcm9tIHBvcHBpbmcgdXAgd2hlbiB5b3UgdXNlIGEgdG91Y2hzY3JlZW4uIEV2ZW4gaWYgaXQncyBkaXNhYmxlZCBpbiB0aGUgYWNjZXNzaWJpbGl0eSBzZXJ2aWNlcyBtZW51LiBDb250aW51YXRpb24gb2Yga2VyaW5nYXIncyB3b3JrLiBUZXN0ZWQgb24gR05PTUUgU2hlbGwgdmVyc2lvbiAzLjM2IC0gNDIgb24gRmVkb3JhIDMyIC0gMzYuIEZvciBhIGhpZ2hlciB2ZXJzaW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyI2luc3RhbGxpbmctb24taGlnaC1nbm9tZS1zaGVsbC12ZXJzaW9uIC4iLAogICJuYW1lIjogIkJsb2NrIENhcmlib3UgMzYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9seHlseHkxMjM0NTYvY2FyaWJvdWJsb2NrZXIiLAogICJ1dWlkIjogImJsb2NrLWNhcmlib3UtMzZAbHh5bHh5MTIzNDU2LmVyY2xpLmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}}} +, {"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 - 43 on Fedora 32 - 37. 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": {"38": {"version": "6", "sha256": "1pn30dn8vzx5cp10sz9pxqic91761dhaq2krvq1lsqjx2dcwkbyi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsb2NrcyBjYXJpYm91ICh0aGUgb24gc2NyZWVuIGtleWJvYXJkKSBmcm9tIHBvcHBpbmcgdXAgd2hlbiB5b3UgdXNlIGEgdG91Y2hzY3JlZW4uIEV2ZW4gaWYgaXQncyBkaXNhYmxlZCBpbiB0aGUgYWNjZXNzaWJpbGl0eSBzZXJ2aWNlcyBtZW51LiBDb250aW51YXRpb24gb2Yga2VyaW5nYXIncyB3b3JrLiBUZXN0ZWQgb24gR05PTUUgU2hlbGwgdmVyc2lvbiAzLjM2IC0gNDMgb24gRmVkb3JhIDMyIC0gMzcuIEZvciBhIGhpZ2hlciB2ZXJzaW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyI2luc3RhbGxpbmctb24taGlnaC1nbm9tZS1zaGVsbC12ZXJzaW9uIC4iLAogICJuYW1lIjogIkJsb2NrIENhcmlib3UgMzYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyIiwKICAidXVpZCI6ICJibG9jay1jYXJpYm91LTM2QGx4eWx4eTEyMzQ1Ni5lcmNsaS5kZXYiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "1pn30dn8vzx5cp10sz9pxqic91761dhaq2krvq1lsqjx2dcwkbyi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsb2NrcyBjYXJpYm91ICh0aGUgb24gc2NyZWVuIGtleWJvYXJkKSBmcm9tIHBvcHBpbmcgdXAgd2hlbiB5b3UgdXNlIGEgdG91Y2hzY3JlZW4uIEV2ZW4gaWYgaXQncyBkaXNhYmxlZCBpbiB0aGUgYWNjZXNzaWJpbGl0eSBzZXJ2aWNlcyBtZW51LiBDb250aW51YXRpb24gb2Yga2VyaW5nYXIncyB3b3JrLiBUZXN0ZWQgb24gR05PTUUgU2hlbGwgdmVyc2lvbiAzLjM2IC0gNDMgb24gRmVkb3JhIDMyIC0gMzcuIEZvciBhIGhpZ2hlciB2ZXJzaW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyI2luc3RhbGxpbmctb24taGlnaC1nbm9tZS1zaGVsbC12ZXJzaW9uIC4iLAogICJuYW1lIjogIkJsb2NrIENhcmlib3UgMzYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyIiwKICAidXVpZCI6ICJibG9jay1jYXJpYm91LTM2QGx4eWx4eTEyMzQ1Ni5lcmNsaS5kZXYiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "1pn30dn8vzx5cp10sz9pxqic91761dhaq2krvq1lsqjx2dcwkbyi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsb2NrcyBjYXJpYm91ICh0aGUgb24gc2NyZWVuIGtleWJvYXJkKSBmcm9tIHBvcHBpbmcgdXAgd2hlbiB5b3UgdXNlIGEgdG91Y2hzY3JlZW4uIEV2ZW4gaWYgaXQncyBkaXNhYmxlZCBpbiB0aGUgYWNjZXNzaWJpbGl0eSBzZXJ2aWNlcyBtZW51LiBDb250aW51YXRpb24gb2Yga2VyaW5nYXIncyB3b3JrLiBUZXN0ZWQgb24gR05PTUUgU2hlbGwgdmVyc2lvbiAzLjM2IC0gNDMgb24gRmVkb3JhIDMyIC0gMzcuIEZvciBhIGhpZ2hlciB2ZXJzaW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyI2luc3RhbGxpbmctb24taGlnaC1nbm9tZS1zaGVsbC12ZXJzaW9uIC4iLAogICJuYW1lIjogIkJsb2NrIENhcmlib3UgMzYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyIiwKICAidXVpZCI6ICJibG9jay1jYXJpYm91LTM2QGx4eWx4eTEyMzQ1Ni5lcmNsaS5kZXYiLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "1pn30dn8vzx5cp10sz9pxqic91761dhaq2krvq1lsqjx2dcwkbyi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsb2NrcyBjYXJpYm91ICh0aGUgb24gc2NyZWVuIGtleWJvYXJkKSBmcm9tIHBvcHBpbmcgdXAgd2hlbiB5b3UgdXNlIGEgdG91Y2hzY3JlZW4uIEV2ZW4gaWYgaXQncyBkaXNhYmxlZCBpbiB0aGUgYWNjZXNzaWJpbGl0eSBzZXJ2aWNlcyBtZW51LiBDb250aW51YXRpb24gb2Yga2VyaW5nYXIncyB3b3JrLiBUZXN0ZWQgb24gR05PTUUgU2hlbGwgdmVyc2lvbiAzLjM2IC0gNDMgb24gRmVkb3JhIDMyIC0gMzcuIEZvciBhIGhpZ2hlciB2ZXJzaW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyI2luc3RhbGxpbmctb24taGlnaC1nbm9tZS1zaGVsbC12ZXJzaW9uIC4iLAogICJuYW1lIjogIkJsb2NrIENhcmlib3UgMzYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyIiwKICAidXVpZCI6ICJibG9jay1jYXJpYm91LTM2QGx4eWx4eTEyMzQ1Ni5lcmNsaS5kZXYiLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "1pn30dn8vzx5cp10sz9pxqic91761dhaq2krvq1lsqjx2dcwkbyi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsb2NrcyBjYXJpYm91ICh0aGUgb24gc2NyZWVuIGtleWJvYXJkKSBmcm9tIHBvcHBpbmcgdXAgd2hlbiB5b3UgdXNlIGEgdG91Y2hzY3JlZW4uIEV2ZW4gaWYgaXQncyBkaXNhYmxlZCBpbiB0aGUgYWNjZXNzaWJpbGl0eSBzZXJ2aWNlcyBtZW51LiBDb250aW51YXRpb24gb2Yga2VyaW5nYXIncyB3b3JrLiBUZXN0ZWQgb24gR05PTUUgU2hlbGwgdmVyc2lvbiAzLjM2IC0gNDMgb24gRmVkb3JhIDMyIC0gMzcuIEZvciBhIGhpZ2hlciB2ZXJzaW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyI2luc3RhbGxpbmctb24taGlnaC1nbm9tZS1zaGVsbC12ZXJzaW9uIC4iLAogICJuYW1lIjogIkJsb2NrIENhcmlib3UgMzYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyIiwKICAidXVpZCI6ICJibG9jay1jYXJpYm91LTM2QGx4eWx4eTEyMzQ1Ni5lcmNsaS5kZXYiLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"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": "7", "sha256": "1c1ri2qqkxc0aw47yci9ndplgqpx2i1dnpwlsjjrwqszdmm0nxwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubWF4aW1pemUgdGhlIGN1cnJlbnQgd2luZG93IG9uIGRvdWJsZSBjbGljayBvbiB0aGUgdG9wIHBhbmVsLiBZb3UgY2FuIGFsc28gbWF4aW1pemUgaG9yaXpvbnRhbGx5IGFuZCB2ZXJ0aWNhbGx5IHdpdGggbWlkZGxlIGFuZCByaWdodCBjbGljay4iLAogICJuYW1lIjogIlVubWF4aW1pemUgRG91YmxlIENsaWNrIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3VubWF4aW1pemUtZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ1bm1heGltaXplX2RvdWJsZV9jbGlja0Bnb256YS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "1c1ri2qqkxc0aw47yci9ndplgqpx2i1dnpwlsjjrwqszdmm0nxwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubWF4aW1pemUgdGhlIGN1cnJlbnQgd2luZG93IG9uIGRvdWJsZSBjbGljayBvbiB0aGUgdG9wIHBhbmVsLiBZb3UgY2FuIGFsc28gbWF4aW1pemUgaG9yaXpvbnRhbGx5IGFuZCB2ZXJ0aWNhbGx5IHdpdGggbWlkZGxlIGFuZCByaWdodCBjbGljay4iLAogICJuYW1lIjogIlVubWF4aW1pemUgRG91YmxlIENsaWNrIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3VubWF4aW1pemUtZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ1bm1heGltaXplX2RvdWJsZV9jbGlja0Bnb256YS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "1c1ri2qqkxc0aw47yci9ndplgqpx2i1dnpwlsjjrwqszdmm0nxwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubWF4aW1pemUgdGhlIGN1cnJlbnQgd2luZG93IG9uIGRvdWJsZSBjbGljayBvbiB0aGUgdG9wIHBhbmVsLiBZb3UgY2FuIGFsc28gbWF4aW1pemUgaG9yaXpvbnRhbGx5IGFuZCB2ZXJ0aWNhbGx5IHdpdGggbWlkZGxlIGFuZCByaWdodCBjbGljay4iLAogICJuYW1lIjogIlVubWF4aW1pemUgRG91YmxlIENsaWNrIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3VubWF4aW1pemUtZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ1bm1heGltaXplX2RvdWJsZV9jbGlja0Bnb256YS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "1c1ri2qqkxc0aw47yci9ndplgqpx2i1dnpwlsjjrwqszdmm0nxwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubWF4aW1pemUgdGhlIGN1cnJlbnQgd2luZG93IG9uIGRvdWJsZSBjbGljayBvbiB0aGUgdG9wIHBhbmVsLiBZb3UgY2FuIGFsc28gbWF4aW1pemUgaG9yaXpvbnRhbGx5IGFuZCB2ZXJ0aWNhbGx5IHdpdGggbWlkZGxlIGFuZCByaWdodCBjbGljay4iLAogICJuYW1lIjogIlVubWF4aW1pemUgRG91YmxlIENsaWNrIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3VubWF4aW1pemUtZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ1bm1heGltaXplX2RvdWJsZV9jbGlja0Bnb256YS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"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": "13", "sha256": "1f0izmzksy1vf4kaa8gwzz3pkjxihg2mzswn8mw50cybq5p596gi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5pdHktbGlrZS1zd2l0Y2hlci1nbm9tZS1leHQiLAogICJ1dWlkIjogInVuaXR5LWxpa2UtYXBwc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "40": {"version": "13", "sha256": "1f0izmzksy1vf4kaa8gwzz3pkjxihg2mzswn8mw50cybq5p596gi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5pdHktbGlrZS1zd2l0Y2hlci1nbm9tZS1leHQiLAogICJ1dWlkIjogInVuaXR5LWxpa2UtYXBwc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "1f0izmzksy1vf4kaa8gwzz3pkjxihg2mzswn8mw50cybq5p596gi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5pdHktbGlrZS1zd2l0Y2hlci1nbm9tZS1leHQiLAogICJ1dWlkIjogInVuaXR5LWxpa2UtYXBwc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "1f0izmzksy1vf4kaa8gwzz3pkjxihg2mzswn8mw50cybq5p596gi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5pdHktbGlrZS1zd2l0Y2hlci1nbm9tZS1leHQiLAogICJ1dWlkIjogInVuaXR5LWxpa2UtYXBwc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"uuid": "ssh-quick-connect@ibrokemy.computer", "name": "SSH Quick Connect", "pname": "ssh-quick-connect", "description": "This extension puts an icon in the panel with a simple dropdown menu that launches items from your ssh configs", "link": "https://extensions.gnome.org/extension/3237/ssh-quick-connect/", "shell_version_map": {"40": {"version": "9", "sha256": "13rg6syi3m9ahkkhww51jhblir2jb8k5qv7ya97plgsnc3awh6p8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgd2l0aCBhIHNpbXBsZSBkcm9wZG93biBtZW51IHRoYXQgbGF1bmNoZXMgaXRlbXMgZnJvbSB5b3VyIHNzaCBjb25maWdzIiwKICAibmFtZSI6ICJTU0ggUXVpY2sgQ29ubmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vd3d3LmdpdGh1Yi5jb20vaWJyb2tlbXljb21wdXRlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3NoLXF1aWNrLWNvbm5lY3QiLAogICJ1dWlkIjogInNzaC1xdWljay1jb25uZWN0QGlicm9rZW15LmNvbXB1dGVyIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "13rg6syi3m9ahkkhww51jhblir2jb8k5qv7ya97plgsnc3awh6p8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgd2l0aCBhIHNpbXBsZSBkcm9wZG93biBtZW51IHRoYXQgbGF1bmNoZXMgaXRlbXMgZnJvbSB5b3VyIHNzaCBjb25maWdzIiwKICAibmFtZSI6ICJTU0ggUXVpY2sgQ29ubmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vd3d3LmdpdGh1Yi5jb20vaWJyb2tlbXljb21wdXRlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3NoLXF1aWNrLWNvbm5lY3QiLAogICJ1dWlkIjogInNzaC1xdWljay1jb25uZWN0QGlicm9rZW15LmNvbXB1dGVyIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "13rg6syi3m9ahkkhww51jhblir2jb8k5qv7ya97plgsnc3awh6p8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgd2l0aCBhIHNpbXBsZSBkcm9wZG93biBtZW51IHRoYXQgbGF1bmNoZXMgaXRlbXMgZnJvbSB5b3VyIHNzaCBjb25maWdzIiwKICAibmFtZSI6ICJTU0ggUXVpY2sgQ29ubmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vd3d3LmdpdGh1Yi5jb20vaWJyb2tlbXljb21wdXRlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3NoLXF1aWNrLWNvbm5lY3QiLAogICJ1dWlkIjogInNzaC1xdWljay1jb25uZWN0QGlicm9rZW15LmNvbXB1dGVyIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "13rg6syi3m9ahkkhww51jhblir2jb8k5qv7ya97plgsnc3awh6p8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgd2l0aCBhIHNpbXBsZSBkcm9wZG93biBtZW51IHRoYXQgbGF1bmNoZXMgaXRlbXMgZnJvbSB5b3VyIHNzaCBjb25maWdzIiwKICAibmFtZSI6ICJTU0ggUXVpY2sgQ29ubmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vd3d3LmdpdGh1Yi5jb20vaWJyb2tlbXljb21wdXRlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3NoLXF1aWNrLWNvbm5lY3QiLAogICJ1dWlkIjogInNzaC1xdWljay1jb25uZWN0QGlicm9rZW15LmNvbXB1dGVyIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} -, {"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"}, "42": {"version": "8", "sha256": "07byzng0c6cgqrlphk1h0lxl80vw5w5njdncf4krykxh2idwvhkn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbW1pbW9uL2FkZC10by1kZXNrdG9wIiwKICAidXVpZCI6ICJhZGQtdG8tZGVza3RvcEB0b21taW1vbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "43": {"version": "8", "sha256": "07byzng0c6cgqrlphk1h0lxl80vw5w5njdncf4krykxh2idwvhkn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbW1pbW9uL2FkZC10by1kZXNrdG9wIiwKICAidXVpZCI6ICJhZGQtdG8tZGVza3RvcEB0b21taW1vbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} +, {"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"}, "42": {"version": "9", "sha256": "0jdr9cyp2sc897qiplwz5rxp3m654h0c12wy9kn5kjpcspjbifl6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbW1pbW9uL2FkZC10by1kZXNrdG9wIiwKICAidXVpZCI6ICJhZGQtdG8tZGVza3RvcEB0b21taW1vbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "0jdr9cyp2sc897qiplwz5rxp3m654h0c12wy9kn5kjpcspjbifl6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbW1pbW9uL2FkZC10by1kZXNrdG9wIiwKICAidXVpZCI6ICJhZGQtdG8tZGVza3RvcEB0b21taW1vbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"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": "4", "sha256": "1ydbdm68i38fbaiscmnkz1ywak072ppz93fiqa37fwgr7hsamxg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBEdWNrRHVja0dvIHNlYXJjaCBzdWdnZXN0aW9ucyB0byBHbm9tZSBTaGVsbCBTZWFyY2giLAogICJuYW1lIjogIkR1Y2tEdWNrR28gU2VhcmNoIFByb3ZpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VpdGhhbXVzL2dub21lLXNoZWxsLWR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1kdWNrZHVja2dvLXNlYXJjaC1wcm92aWRlckBrZWl0aGNpcmtlbC5jby51ayIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1ydbdm68i38fbaiscmnkz1ywak072ppz93fiqa37fwgr7hsamxg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBEdWNrRHVja0dvIHNlYXJjaCBzdWdnZXN0aW9ucyB0byBHbm9tZSBTaGVsbCBTZWFyY2giLAogICJuYW1lIjogIkR1Y2tEdWNrR28gU2VhcmNoIFByb3ZpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VpdGhhbXVzL2dub21lLXNoZWxsLWR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1kdWNrZHVja2dvLXNlYXJjaC1wcm92aWRlckBrZWl0aGNpcmtlbC5jby51ayIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1ydbdm68i38fbaiscmnkz1ywak072ppz93fiqa37fwgr7hsamxg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBEdWNrRHVja0dvIHNlYXJjaCBzdWdnZXN0aW9ucyB0byBHbm9tZSBTaGVsbCBTZWFyY2giLAogICJuYW1lIjogIkR1Y2tEdWNrR28gU2VhcmNoIFByb3ZpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VpdGhhbXVzL2dub21lLXNoZWxsLWR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1kdWNrZHVja2dvLXNlYXJjaC1wcm92aWRlckBrZWl0aGNpcmtlbC5jby51ayIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1ydbdm68i38fbaiscmnkz1ywak072ppz93fiqa37fwgr7hsamxg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBEdWNrRHVja0dvIHNlYXJjaCBzdWdnZXN0aW9ucyB0byBHbm9tZSBTaGVsbCBTZWFyY2giLAogICJuYW1lIjogIkR1Y2tEdWNrR28gU2VhcmNoIFByb3ZpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VpdGhhbXVzL2dub21lLXNoZWxsLWR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1kdWNrZHVja2dvLXNlYXJjaC1wcm92aWRlckBrZWl0aGNpcmtlbC5jby51ayIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"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": "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": "26", "sha256": "0iwv06v7yf3blxdhpa9fa91z4mr1n15h91fj67jifvb6s3k42yb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiNTRkM2Y0NyIsCiAgImRlc2NyaXB0aW9uIjogIkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAyNgp9"}, "41": {"version": "26", "sha256": "0iwv06v7yf3blxdhpa9fa91z4mr1n15h91fj67jifvb6s3k42yb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiNTRkM2Y0NyIsCiAgImRlc2NyaXB0aW9uIjogIkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAyNgp9"}, "42": {"version": "26", "sha256": "0iwv06v7yf3blxdhpa9fa91z4mr1n15h91fj67jifvb6s3k42yb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiNTRkM2Y0NyIsCiAgImRlc2NyaXB0aW9uIjogIkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAyNgp9"}, "43": {"version": "26", "sha256": "0iwv06v7yf3blxdhpa9fa91z4mr1n15h91fj67jifvb6s3k42yb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiNTRkM2Y0NyIsCiAgImRlc2NyaXB0aW9uIjogIkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAyNgp9"}}} +, {"uuid": "material-shell@papyelgringo", "name": "Material Shell", "pname": "material-shell", "description": "EXPERIMENTAL SHELL - USE WITH CAUTION AND DISABLE OTHERS EXTENSIONS\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": "0pd9clx3mqwhlfgx1ngflj9hnrz56vnv7kxw0d95ri74d1c4a2sd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJFWFBFUklNRU5UQUwgU0hFTEwgLSBVU0UgV0lUSCBDQVVUSU9OIEFORCBESVNBQkxFIE9USEVSUyBFWFRFTlNJT05TXG5BIG1vZGVybiBkZXNrdG9wIGludGVyZmFjZSBmb3IgTGludXggLSBwYWNrYWdlZCBhcyBhbiBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBJbXByb3ZlIHlvdXIgdXNlciBleHBlcmllbmNlIGFuZCBnZXQgcmlkIG9mIHRoZSBhbmFyY2h5IG9mIHRyYWRpdGlvbmFsIGRlc2t0b3Agd29ya2Zsb3dzLiBEZXNpZ25lZCB0byBzaW1wbGlmeSBuYXZpZ2F0aW9uIGFuZCByZWR1Y2UgdGhlIG5lZWQgdG8gbWFuaXB1bGF0ZSB3aW5kb3dzIGluIG9yZGVyIHRvIGltcHJvdmUgcHJvZHVjdGl2aXR5LiBJdCdzIG1lYW50IHRvIGJlIDEwMCUgcHJlZGljdGFibGUgYW5kIGJyaW5nIHRoZSBiZW5lZml0cyBvZiB0b29scyBjb3ZldGVkIGJ5IHByb2Zlc3Npb25hbHMgdG8gZXZlcnlvbmUuIiwKICAibGF5b3V0cyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLmxheW91dHMiLAogICJuYW1lIjogIk1hdGVyaWFsIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "31", "sha256": "0h00hkgycjrkf180xkvx1qy6v3pwc7lh6bf0nbnmkwjkkr5rdnz9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiZDJkOTYwYyIsCiAgImRlc2NyaXB0aW9uIjogIkVYUEVSSU1FTlRBTCBTSEVMTCAtIFVTRSBXSVRIIENBVVRJT04gQU5EIERJU0FCTEUgT1RIRVJTIEVYVEVOU0lPTlNcbkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAzMQp9"}, "41": {"version": "31", "sha256": "0h00hkgycjrkf180xkvx1qy6v3pwc7lh6bf0nbnmkwjkkr5rdnz9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiZDJkOTYwYyIsCiAgImRlc2NyaXB0aW9uIjogIkVYUEVSSU1FTlRBTCBTSEVMTCAtIFVTRSBXSVRIIENBVVRJT04gQU5EIERJU0FCTEUgT1RIRVJTIEVYVEVOU0lPTlNcbkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAzMQp9"}, "42": {"version": "31", "sha256": "0h00hkgycjrkf180xkvx1qy6v3pwc7lh6bf0nbnmkwjkkr5rdnz9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiZDJkOTYwYyIsCiAgImRlc2NyaXB0aW9uIjogIkVYUEVSSU1FTlRBTCBTSEVMTCAtIFVTRSBXSVRIIENBVVRJT04gQU5EIERJU0FCTEUgT1RIRVJTIEVYVEVOU0lPTlNcbkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAzMQp9"}, "43": {"version": "31", "sha256": "0h00hkgycjrkf180xkvx1qy6v3pwc7lh6bf0nbnmkwjkkr5rdnz9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiZDJkOTYwYyIsCiAgImRlc2NyaXB0aW9uIjogIkVYUEVSSU1FTlRBTCBTSEVMTCAtIFVTRSBXSVRIIENBVVRJT04gQU5EIERJU0FCTEUgT1RIRVJTIEVYVEVOU0lPTlNcbkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAzMQp9"}}} , {"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="}, "42": {"version": "30", "sha256": "04dagpvpb535nq4l9nd7wjiv8p1npbzlbw8zi3zkp0r1hy4qxbll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvY29sb3ItcGlja2VyIiwKICAidXVpZCI6ICJjb2xvci1waWNrZXJAdHViZXJyeSIsCiAgInZlcnNpb24iOiAzMAp9"}, "43": {"version": "32", "sha256": "06qzahlnqjc7w2cjhviqpw0i0ir4ck40v885ddh4ax7kzd2ny3j6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9jb2xvci1waWNrZXIiLAogICJ1dWlkIjogImNvbG9yLXBpY2tlckB0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDMyCn0="}}} +, {"uuid": "galaxy-buds-battery@pemmoura", "name": "Galaxy Buds Battery", "pname": "galaxy-buds-battery", "description": "Gnome extension to display a battery indicator for Samsung Galaxy Buds family. Inspired by keyboard-battery (https://extensions.gnome.org/extension/2170/keyboard-battery/)\n\nUses the python script for Galaxy buds from ThePBone (https://github.com/ThePBone/GalaxyBuds-BatteryLevel)\nINSTALLATION\n\nThis extension requires Python 3.x!\n\nYou also need Bluez and PyBluez:\n\nFor debian based distributions install with:\n\nsudo apt install bluez python3-bluez\n\nFor Fedora install with:\n\nsudo dns install bluez python3-bluez", "link": "https://extensions.gnome.org/extension/3383/galaxy-buds-battery/", "shell_version_map": {"38": {"version": "6", "sha256": "0mi645cb0il5i13i64qdagalv91g4m7mv2mfza8hxhpks5r4pr81", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiB0byBkaXNwbGF5IGEgYmF0dGVyeSBpbmRpY2F0b3IgZm9yIFNhbXN1bmcgR2FsYXh5IEJ1ZHMgZmFtaWx5LiBJbnNwaXJlZCBieSBrZXlib2FyZC1iYXR0ZXJ5IChodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8yMTcwL2tleWJvYXJkLWJhdHRlcnkvKVxuXG5Vc2VzIHRoZSBweXRob24gc2NyaXB0IGZvciBHYWxheHkgYnVkcyBmcm9tIFRoZVBCb25lIChodHRwczovL2dpdGh1Yi5jb20vVGhlUEJvbmUvR2FsYXh5QnVkcy1CYXR0ZXJ5TGV2ZWwpXG5JTlNUQUxMQVRJT05cblxuVGhpcyBleHRlbnNpb24gcmVxdWlyZXMgUHl0aG9uIDMueCFcblxuWW91IGFsc28gbmVlZCBCbHVleiBhbmQgUHlCbHVlejpcblxuRm9yIGRlYmlhbiBiYXNlZCBkaXN0cmlidXRpb25zIGluc3RhbGwgd2l0aDpcblxuc3VkbyBhcHQgaW5zdGFsbCBibHVleiBweXRob24zLWJsdWV6XG5cbkZvciBGZWRvcmEgaW5zdGFsbCB3aXRoOlxuXG5zdWRvIGRucyBpbnN0YWxsIGJsdWV6IHB5dGhvbjMtYmx1ZXoiLAogICJuYW1lIjogIkdhbGF4eSBCdWRzIEJhdHRlcnkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZW1tb3VyYS9nYWxheHlidWRzLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZ2FsYXh5LWJ1ZHMtYmF0dGVyeUBwZW1tb3VyYSIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "7", "sha256": "0wqx4wmxsfd2d3ssqddfmvaa7c3d6br5xfs0n17r76vmfmd09qkl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiB0byBkaXNwbGF5IGEgYmF0dGVyeSBpbmRpY2F0b3IgZm9yIFNhbXN1bmcgR2FsYXh5IEJ1ZHMgZmFtaWx5LiBJbnNwaXJlZCBieSBrZXlib2FyZC1iYXR0ZXJ5IChodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8yMTcwL2tleWJvYXJkLWJhdHRlcnkvKVxuXG5Vc2VzIHRoZSBweXRob24gc2NyaXB0IGZvciBHYWxheHkgYnVkcyBmcm9tIFRoZVBCb25lIChodHRwczovL2dpdGh1Yi5jb20vVGhlUEJvbmUvR2FsYXh5QnVkcy1CYXR0ZXJ5TGV2ZWwpXG5JTlNUQUxMQVRJT05cblxuVGhpcyBleHRlbnNpb24gcmVxdWlyZXMgUHl0aG9uIDMueCFcblxuWW91IGFsc28gbmVlZCBCbHVleiBhbmQgUHlCbHVlejpcblxuRm9yIGRlYmlhbiBiYXNlZCBkaXN0cmlidXRpb25zIGluc3RhbGwgd2l0aDpcblxuc3VkbyBhcHQgaW5zdGFsbCBibHVleiBweXRob24zLWJsdWV6XG5cbkZvciBGZWRvcmEgaW5zdGFsbCB3aXRoOlxuXG5zdWRvIGRucyBpbnN0YWxsIGJsdWV6IHB5dGhvbjMtYmx1ZXoiLAogICJuYW1lIjogIkdhbGF4eSBCdWRzIEJhdHRlcnkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGVtbW91cmEvZ2FsYXh5YnVkcy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdhbGF4eS1idWRzLWJhdHRlcnlAcGVtbW91cmEiLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"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": "30", "sha256": "04dagpvpb535nq4l9nd7wjiv8p1npbzlbw8zi3zkp0r1hy4qxbll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvY29sb3ItcGlja2VyIiwKICAidXVpZCI6ICJjb2xvci1waWNrZXJAdHViZXJyeSIsCiAgInZlcnNpb24iOiAzMAp9"}, "43": {"version": "34", "sha256": "00mpmx7yfzy9wram6abwm8m7dklk84m3z38r0p8zxp20p3rik660", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9jb2xvci1waWNrZXIiLAogICJ1dWlkIjogImNvbG9yLXBpY2tlckB0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDM0Cn0="}}} , {"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": "6", "sha256": "1byyyjiaby13zwbrxv7k5r280rhzc3pl65lpr6nfhi76yjdh8n3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tYXN6R2FzaW9yL2dub21lLXNoZWxsLXVzZXItc3R5bGVzaGVldC1hbmQtZm9udCIsCiAgInV1aWQiOiAidXNlci1zdHlsZXNoZWV0QHRvbWFzemdhc2lvci5wbCIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "1byyyjiaby13zwbrxv7k5r280rhzc3pl65lpr6nfhi76yjdh8n3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tYXN6R2FzaW9yL2dub21lLXNoZWxsLXVzZXItc3R5bGVzaGVldC1hbmQtZm9udCIsCiAgInV1aWQiOiAidXNlci1zdHlsZXNoZWV0QHRvbWFzemdhc2lvci5wbCIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1byyyjiaby13zwbrxv7k5r280rhzc3pl65lpr6nfhi76yjdh8n3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tYXN6R2FzaW9yL2dub21lLXNoZWxsLXVzZXItc3R5bGVzaGVldC1hbmQtZm9udCIsCiAgInV1aWQiOiAidXNlci1zdHlsZXNoZWV0QHRvbWFzemdhc2lvci5wbCIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "1byyyjiaby13zwbrxv7k5r280rhzc3pl65lpr6nfhi76yjdh8n3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tYXN6R2FzaW9yL2dub21lLXNoZWxsLXVzZXItc3R5bGVzaGVldC1hbmQtZm9udCIsCiAgInV1aWQiOiAidXNlci1zdHlsZXNoZWV0QHRvbWFzemdhc2lvci5wbCIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "1byyyjiaby13zwbrxv7k5r280rhzc3pl65lpr6nfhi76yjdh8n3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tYXN6R2FzaW9yL2dub21lLXNoZWxsLXVzZXItc3R5bGVzaGVldC1hbmQtZm9udCIsCiAgInV1aWQiOiAidXNlci1zdHlsZXNoZWV0QHRvbWFzemdhc2lvci5wbCIsCiAgInZlcnNpb24iOiA2Cn0="}}} @@ -360,9 +360,9 @@ , {"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": "Add your username and icon to your menu panel, and run apps or shell commands.", "link": "https://extensions.gnome.org/extension/3488/big-avatar/", "shell_version_map": {"38": {"version": "6", "sha256": "077j74vvyndllbgrz6fsqd2dqmw2smsy93wn0hmaqz059n3f8rj8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB5b3VyIHVzZXJuYW1lIGFuZCBpY29uIHRvIHlvdXIgbWVudSBwYW5lbCwgYW5kIHJ1biBhcHBzIG9yIHNoZWxsIGNvbW1hbmRzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJiaWctYXZhdGFyIiwKICAibmFtZSI6ICJCaWcgQXZhdGFyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJpZy1hdmF0YXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HdXN0YXZvUGVyZWRvL0JpZy1BdmF0YXItR25vbWUtU2hlbGwtRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJiaWctYXZhdGFyQGd1c3Rhdm9wZXJlZG8ub3JnIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "16", "sha256": "08gpmdghgx3v3filx6jml6sfhgmmw7ljznbkrhrr3jirg9qxsgah", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB5b3VyIHVzZXJuYW1lIGFuZCBpY29uIHRvIHlvdXIgbWVudSBwYW5lbCwgYW5kIHJ1biBhcHBzIG9yIHNoZWxsIGNvbW1hbmRzLiIsCiAgIm5hbWUiOiAiQmlnIEF2YXRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaWctYXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3VzdGF2b1BlcmVkby9CaWctQXZhdGFyLUdub21lLVNoZWxsLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYmlnLWF2YXRhckBndXN0YXZvcGVyZWRvLm9yZyIsCiAgInZlcnNpb24iOiAxNgp9"}, "41": {"version": "16", "sha256": "08gpmdghgx3v3filx6jml6sfhgmmw7ljznbkrhrr3jirg9qxsgah", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB5b3VyIHVzZXJuYW1lIGFuZCBpY29uIHRvIHlvdXIgbWVudSBwYW5lbCwgYW5kIHJ1biBhcHBzIG9yIHNoZWxsIGNvbW1hbmRzLiIsCiAgIm5hbWUiOiAiQmlnIEF2YXRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaWctYXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3VzdGF2b1BlcmVkby9CaWctQXZhdGFyLUdub21lLVNoZWxsLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYmlnLWF2YXRhckBndXN0YXZvcGVyZWRvLm9yZyIsCiAgInZlcnNpb24iOiAxNgp9"}, "42": {"version": "16", "sha256": "08gpmdghgx3v3filx6jml6sfhgmmw7ljznbkrhrr3jirg9qxsgah", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB5b3VyIHVzZXJuYW1lIGFuZCBpY29uIHRvIHlvdXIgbWVudSBwYW5lbCwgYW5kIHJ1biBhcHBzIG9yIHNoZWxsIGNvbW1hbmRzLiIsCiAgIm5hbWUiOiAiQmlnIEF2YXRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaWctYXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3VzdGF2b1BlcmVkby9CaWctQXZhdGFyLUdub21lLVNoZWxsLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYmlnLWF2YXRhckBndXN0YXZvcGVyZWRvLm9yZyIsCiAgInZlcnNpb24iOiAxNgp9"}}} , {"uuid": "volume-mixer@evermiss.net", "name": "Application Volume Mixer", "pname": "application-volume-mixer", "description": "Control volume output per-application\n\n\nAfter installing or updating the extension, an error may appear and you will need to log out and back into GNOME to activate the extension.", "link": "https://extensions.gnome.org/extension/3499/application-volume-mixer/", "shell_version_map": {"38": {"version": "10", "sha256": "0y945168sp4ajmzqwvk5siwf5bcg2c2bkzwwcf8gxwiiqxcw2daw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb25cblxuXG5BZnRlciBpbnN0YWxsaW5nIG9yIHVwZGF0aW5nIHRoZSBleHRlbnNpb24sIGFuIGVycm9yIG1heSBhcHBlYXIgYW5kIHlvdSB3aWxsIG5lZWQgdG8gbG9nIG91dCBhbmQgYmFjayBpbnRvIEdOT01FIHRvIGFjdGl2YXRlIHRoZSBleHRlbnNpb24uIiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBWb2x1bWUgTWl4ZXIiLAogICJvcmdpbmFsLWF1dGhvciI6ICJteW1pbmRzdG9ybUBldmVybWlzcy5uZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9teW1pbmRzdG9ybS9nbm9tZS12b2x1bWUtbWl4ZXIiLAogICJ1dWlkIjogInZvbHVtZS1taXhlckBldmVybWlzcy5uZXQiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "0y945168sp4ajmzqwvk5siwf5bcg2c2bkzwwcf8gxwiiqxcw2daw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb25cblxuXG5BZnRlciBpbnN0YWxsaW5nIG9yIHVwZGF0aW5nIHRoZSBleHRlbnNpb24sIGFuIGVycm9yIG1heSBhcHBlYXIgYW5kIHlvdSB3aWxsIG5lZWQgdG8gbG9nIG91dCBhbmQgYmFjayBpbnRvIEdOT01FIHRvIGFjdGl2YXRlIHRoZSBleHRlbnNpb24uIiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBWb2x1bWUgTWl4ZXIiLAogICJvcmdpbmFsLWF1dGhvciI6ICJteW1pbmRzdG9ybUBldmVybWlzcy5uZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9teW1pbmRzdG9ybS9nbm9tZS12b2x1bWUtbWl4ZXIiLAogICJ1dWlkIjogInZvbHVtZS1taXhlckBldmVybWlzcy5uZXQiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "0y945168sp4ajmzqwvk5siwf5bcg2c2bkzwwcf8gxwiiqxcw2daw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb25cblxuXG5BZnRlciBpbnN0YWxsaW5nIG9yIHVwZGF0aW5nIHRoZSBleHRlbnNpb24sIGFuIGVycm9yIG1heSBhcHBlYXIgYW5kIHlvdSB3aWxsIG5lZWQgdG8gbG9nIG91dCBhbmQgYmFjayBpbnRvIEdOT01FIHRvIGFjdGl2YXRlIHRoZSBleHRlbnNpb24uIiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBWb2x1bWUgTWl4ZXIiLAogICJvcmdpbmFsLWF1dGhvciI6ICJteW1pbmRzdG9ybUBldmVybWlzcy5uZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9teW1pbmRzdG9ybS9nbm9tZS12b2x1bWUtbWl4ZXIiLAogICJ1dWlkIjogInZvbHVtZS1taXhlckBldmVybWlzcy5uZXQiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "42": {"version": "11", "sha256": "107y42fn0pqqxxf6g1sc5snkh42gr9w9jr9r7h4mlp1nzmj6hi42", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb25cblxuXG5BZnRlciBpbnN0YWxsaW5nIG9yIHVwZGF0aW5nIHRoZSBleHRlbnNpb24sIGFuIGVycm9yIG1heSBhcHBlYXIgYW5kIHlvdSB3aWxsIG5lZWQgdG8gbG9nIG91dCBhbmQgYmFjayBpbnRvIEdOT01FIHRvIGFjdGl2YXRlIHRoZSBleHRlbnNpb24uIiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBWb2x1bWUgTWl4ZXIiLAogICJvcmdpbmFsLWF1dGhvciI6ICJteW1pbmRzdG9ybUBldmVybWlzcy5uZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXltaW5kc3Rvcm0vZ25vbWUtdm9sdW1lLW1peGVyIiwKICAidXVpZCI6ICJ2b2x1bWUtbWl4ZXJAZXZlcm1pc3MubmV0IiwKICAidmVyc2lvbiI6IDExCn0="}}} -, {"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": "3", "sha256": "1hzsxysm480clf1c21yp2lvmq4s6phly117ym0r2k8w0c96xr1sw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgQ3JlYXRpdmUgU291bmQgQmxhc3RlciIsCiAgIm5hbWUiOiAiQ3JlYXRpdmUgU291bmQgQmxhc3RlciBjb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNhdWwzMi9nbm9tZS1zaGVsbC1leHRlbnNpb24tY3JlYXRpdmUtY29udHJvbCIsCiAgInV1aWQiOiAiY3JlYXRpdmUtY29udHJvbEBzYXUubGkiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1hzsxysm480clf1c21yp2lvmq4s6phly117ym0r2k8w0c96xr1sw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgQ3JlYXRpdmUgU291bmQgQmxhc3RlciIsCiAgIm5hbWUiOiAiQ3JlYXRpdmUgU291bmQgQmxhc3RlciBjb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNhdWwzMi9nbm9tZS1zaGVsbC1leHRlbnNpb24tY3JlYXRpdmUtY29udHJvbCIsCiAgInV1aWQiOiAiY3JlYXRpdmUtY29udHJvbEBzYXUubGkiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1hzsxysm480clf1c21yp2lvmq4s6phly117ym0r2k8w0c96xr1sw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgQ3JlYXRpdmUgU291bmQgQmxhc3RlciIsCiAgIm5hbWUiOiAiQ3JlYXRpdmUgU291bmQgQmxhc3RlciBjb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNhdWwzMi9nbm9tZS1zaGVsbC1leHRlbnNpb24tY3JlYXRpdmUtY29udHJvbCIsCiAgInV1aWQiOiAiY3JlYXRpdmUtY29udHJvbEBzYXUubGkiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "1hzsxysm480clf1c21yp2lvmq4s6phly117ym0r2k8w0c96xr1sw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgQ3JlYXRpdmUgU291bmQgQmxhc3RlciIsCiAgIm5hbWUiOiAiQ3JlYXRpdmUgU291bmQgQmxhc3RlciBjb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNhdWwzMi9nbm9tZS1zaGVsbC1leHRlbnNpb24tY3JlYXRpdmUtY29udHJvbCIsCiAgInV1aWQiOiAiY3JlYXRpdmUtY29udHJvbEBzYXUubGkiLAogICJ2ZXJzaW9uIjogMwp9"}}} +, {"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": "4", "sha256": "0wb9dwcn010kwrrvznnicv4g2yjkzhvs5gixlh3y1cj5qndryhl4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgQ3JlYXRpdmUgU291bmQgQmxhc3RlciIsCiAgIm5hbWUiOiAiQ3JlYXRpdmUgU291bmQgQmxhc3RlciBjb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lzYXVsMzIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNyZWF0aXZlLWNvbnRyb2wiLAogICJ1dWlkIjogImNyZWF0aXZlLWNvbnRyb2xAc2F1LmxpIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "0wb9dwcn010kwrrvznnicv4g2yjkzhvs5gixlh3y1cj5qndryhl4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgQ3JlYXRpdmUgU291bmQgQmxhc3RlciIsCiAgIm5hbWUiOiAiQ3JlYXRpdmUgU291bmQgQmxhc3RlciBjb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lzYXVsMzIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNyZWF0aXZlLWNvbnRyb2wiLAogICJ1dWlkIjogImNyZWF0aXZlLWNvbnRyb2xAc2F1LmxpIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0wb9dwcn010kwrrvznnicv4g2yjkzhvs5gixlh3y1cj5qndryhl4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgQ3JlYXRpdmUgU291bmQgQmxhc3RlciIsCiAgIm5hbWUiOiAiQ3JlYXRpdmUgU291bmQgQmxhc3RlciBjb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lzYXVsMzIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNyZWF0aXZlLWNvbnRyb2wiLAogICJ1dWlkIjogImNyZWF0aXZlLWNvbnRyb2xAc2F1LmxpIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "0wb9dwcn010kwrrvznnicv4g2yjkzhvs5gixlh3y1cj5qndryhl4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgQ3JlYXRpdmUgU291bmQgQmxhc3RlciIsCiAgIm5hbWUiOiAiQ3JlYXRpdmUgU291bmQgQmxhc3RlciBjb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lzYXVsMzIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNyZWF0aXZlLWNvbnRyb2wiLAogICJ1dWlkIjogImNyZWF0aXZlLWNvbnRyb2xAc2F1LmxpIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "0wb9dwcn010kwrrvznnicv4g2yjkzhvs5gixlh3y1cj5qndryhl4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgQ3JlYXRpdmUgU291bmQgQmxhc3RlciIsCiAgIm5hbWUiOiAiQ3JlYXRpdmUgU291bmQgQmxhc3RlciBjb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lzYXVsMzIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNyZWF0aXZlLWNvbnRyb2wiLAogICJ1dWlkIjogImNyZWF0aXZlLWNvbnRyb2xAc2F1LmxpIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"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, workspace view) transparent.", "link": "https://extensions.gnome.org/extension/3518/transparent-shell/", "shell_version_map": {"38": {"version": "6", "sha256": "11xdqaf7w2ki0q2m0798hk2am0ygglnbd4cq9hd77jl8akr8m20c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgd29ya3NwYWNlIHZpZXcpIHRyYW5zcGFyZW50LiIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TaXJvajQyL2dub21lLWV4dGVuc2lvbi10cmFuc3BhcmVudC1zaGVsbCIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtc2hlbGxAc2lyb2o0Mi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "9", "sha256": "0q83lylm0albagn8bnjp0538j0zcksvsqzz9gq6al6dyq5fvf7yz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgd29ya3NwYWNlIHZpZXcpIHRyYW5zcGFyZW50LiIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNwYXJlbnQtc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TaXJvajQyL2dub21lLWV4dGVuc2lvbi10cmFuc3BhcmVudC1zaGVsbCIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtc2hlbGxAc2lyb2o0Mi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "0q83lylm0albagn8bnjp0538j0zcksvsqzz9gq6al6dyq5fvf7yz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgd29ya3NwYWNlIHZpZXcpIHRyYW5zcGFyZW50LiIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNwYXJlbnQtc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TaXJvajQyL2dub21lLWV4dGVuc2lvbi10cmFuc3BhcmVudC1zaGVsbCIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtc2hlbGxAc2lyb2o0Mi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "0q83lylm0albagn8bnjp0538j0zcksvsqzz9gq6al6dyq5fvf7yz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgd29ya3NwYWNlIHZpZXcpIHRyYW5zcGFyZW50LiIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNwYXJlbnQtc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TaXJvajQyL2dub21lLWV4dGVuc2lvbi10cmFuc3BhcmVudC1zaGVsbCIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtc2hlbGxAc2lyb2o0Mi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOQp9"}}} +, {"uuid": "transparent-shell@siroj42.github.io", "name": "Transparent Shell", "pname": "transparent-shell", "description": "Make the main shell components (Top bar, dash, workspace view) transparent.", "link": "https://extensions.gnome.org/extension/3518/transparent-shell/", "shell_version_map": {"38": {"version": "6", "sha256": "11xdqaf7w2ki0q2m0798hk2am0ygglnbd4cq9hd77jl8akr8m20c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgd29ya3NwYWNlIHZpZXcpIHRyYW5zcGFyZW50LiIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TaXJvajQyL2dub21lLWV4dGVuc2lvbi10cmFuc3BhcmVudC1zaGVsbCIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtc2hlbGxAc2lyb2o0Mi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "11", "sha256": "08cbigb0dkvk900y52hqqf7cwccbr2sbkirzfgayp6kks6kf51zp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgd29ya3NwYWNlIHZpZXcpIHRyYW5zcGFyZW50LiIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNwYXJlbnQtc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2lyb2o0Mi9nbm9tZS1leHRlbnNpb24tdHJhbnNwYXJlbnQtc2hlbGwiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXNoZWxsQHNpcm9qNDIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "08cbigb0dkvk900y52hqqf7cwccbr2sbkirzfgayp6kks6kf51zp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgd29ya3NwYWNlIHZpZXcpIHRyYW5zcGFyZW50LiIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNwYXJlbnQtc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2lyb2o0Mi9nbm9tZS1leHRlbnNpb24tdHJhbnNwYXJlbnQtc2hlbGwiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXNoZWxsQHNpcm9qNDIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "08cbigb0dkvk900y52hqqf7cwccbr2sbkirzfgayp6kks6kf51zp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgd29ya3NwYWNlIHZpZXcpIHRyYW5zcGFyZW50LiIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNwYXJlbnQtc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2lyb2o0Mi9nbm9tZS1leHRlbnNpb24tdHJhbnNwYXJlbnQtc2hlbGwiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXNoZWxsQHNpcm9qNDIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "11", "sha256": "08cbigb0dkvk900y52hqqf7cwccbr2sbkirzfgayp6kks6kf51zp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgd29ya3NwYWNlIHZpZXcpIHRyYW5zcGFyZW50LiIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNwYXJlbnQtc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2lyb2o0Mi9nbm9tZS1leHRlbnNpb24tdHJhbnNwYXJlbnQtc2hlbGwiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXNoZWxsQHNpcm9qNDIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"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": "11", "sha256": "10hfxck76ka8grpdy7d4alfrs1jax2jk5wbk7058san6a6jjfbrm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2phY2trZW5uZXkvZ25vbWUtdHJ1ZS1jb2xvci1pbnZlcnQiLAogICJ1dWlkIjogInRydWUtY29sb3ItaW52ZXJ0QGphY2trZW5uZXkiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "10hfxck76ka8grpdy7d4alfrs1jax2jk5wbk7058san6a6jjfbrm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2phY2trZW5uZXkvZ25vbWUtdHJ1ZS1jb2xvci1pbnZlcnQiLAogICJ1dWlkIjogInRydWUtY29sb3ItaW52ZXJ0QGphY2trZW5uZXkiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "10hfxck76ka8grpdy7d4alfrs1jax2jk5wbk7058san6a6jjfbrm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2phY2trZW5uZXkvZ25vbWUtdHJ1ZS1jb2xvci1pbnZlcnQiLAogICJ1dWlkIjogInRydWUtY29sb3ItaW52ZXJ0QGphY2trZW5uZXkiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "10hfxck76ka8grpdy7d4alfrs1jax2jk5wbk7058san6a6jjfbrm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2phY2trZW5uZXkvZ25vbWUtdHJ1ZS1jb2xvci1pbnZlcnQiLAogICJ1dWlkIjogInRydWUtY29sb3ItaW52ZXJ0QGphY2trZW5uZXkiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"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"}, "42": {"version": "7", "sha256": "063d61mk4wavrclf09vxbl1qxd66475fblqhnl2yq5rv7zrl5ys6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdExhYiBleHRlbnNpb24gdXRpbGl6ZXMgdGhlIG9mZmljaWFsIEdpdExhYiBBUEkgdG8gcHJvdmlkZSBhIGNvbWZvcnRhYmxlIG92ZXJ2aWV3IGFib3V0IHlvdXIgcHJvamVjdHMsIGNvbW1pdHMgJiBwaXBlbGluZXMuXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tZ2l0bGFiIiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJHaXRMYWIgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdpdGxhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaW5hdGljL2dpdGxhYi1leHRlbnNpb24iLAogICJ1dWlkIjogImdpdGxhYi1leHRlbnNpb25AaW5maW5pY29kZS5kZSIsCiAgInZlcnNpb24iOiA3Cn0="}, "43": {"version": "8", "sha256": "0mzb78ldrj8sh06ngf5vwnjpjw1in00n8djxxrd7s2hr2gavxssi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdExhYiBleHRlbnNpb24gdXRpbGl6ZXMgdGhlIG9mZmljaWFsIEdpdExhYiBBUEkgdG8gcHJvdmlkZSBhIGNvbWZvcnRhYmxlIG92ZXJ2aWV3IGFib3V0IHlvdXIgcHJvamVjdHMsIGNvbW1pdHMgJiBwaXBlbGluZXMuXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tZ2l0bGFiIiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJHaXRMYWIgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdpdGxhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaW5hdGljL2dpdGxhYi1leHRlbnNpb24iLAogICJ1dWlkIjogImdpdGxhYi1leHRlbnNpb25AaW5maW5pY29kZS5kZSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"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": "22", "sha256": "12s8c2685w07fi84widdw8wrniwhhn0k96ggypgv47jkmhv31v3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b3JjdWx1cy9Eb3duRmFsbCIsCiAgInV1aWQiOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "40": {"version": "22", "sha256": "12s8c2685w07fi84widdw8wrniwhhn0k96ggypgv47jkmhv31v3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b3JjdWx1cy9Eb3duRmFsbCIsCiAgInV1aWQiOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "41": {"version": "22", "sha256": "12s8c2685w07fi84widdw8wrniwhhn0k96ggypgv47jkmhv31v3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b3JjdWx1cy9Eb3duRmFsbCIsCiAgInV1aWQiOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "42": {"version": "22", "sha256": "12s8c2685w07fi84widdw8wrniwhhn0k96ggypgv47jkmhv31v3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b3JjdWx1cy9Eb3duRmFsbCIsCiAgInV1aWQiOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "43": {"version": "22", "sha256": "12s8c2685w07fi84widdw8wrniwhhn0k96ggypgv47jkmhv31v3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b3JjdWx1cy9Eb3duRmFsbCIsCiAgInV1aWQiOiAiZG93bmZhbGxAdG9yY3VsdXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}}} @@ -374,9 +374,9 @@ , {"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="}}} , {"uuid": "blur-provider@corvettecole.github.com", "name": "blur-provider", "pname": "blur-provider", "description": "Provides an easy way for applications to request blur, and allows users to set blur on applications", "link": "https://extensions.gnome.org/extension/3607/blur-provider/", "shell_version_map": {"38": {"version": "2", "sha256": "1p0cyq1bfi18ysk1fvydjvk6qdl87qi9p3kpc165q5i0d4b41ffp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGFuIGVhc3kgd2F5IGZvciBhcHBsaWNhdGlvbnMgdG8gcmVxdWVzdCBibHVyLCBhbmQgYWxsb3dzIHVzZXJzIHRvIHNldCBibHVyIG9uIGFwcGxpY2F0aW9ucyIsCiAgImV4dGVuc2lvbi1pZCI6ICJibHVyLXByb3ZpZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiYmx1ci1wcm92aWRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ibHVyLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29ydmV0dGVjb2xlL2JsdXItcHJvdmlkZXIiLAogICJ1dWlkIjogImJsdXItcHJvdmlkZXJAY29ydmV0dGVjb2xlLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"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": "9", "sha256": "058sqbzj2is7n6j8nrf23n6g5mxi1agwmdfv2q8lwmi444bl8xjx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBXaXJlR3VhcmQgVlBOIGZyb20gRGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJpY29uIjogIndpcmVndWFyZC1pY29uIiwKICAibmFtZSI6ICJXaXJlR3VhcmQgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImVzLmF0YXJlYW8ud2lyZWd1YXJkLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F0YXJlYW8vd2lyZWd1YXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAid2lyZWd1YXJkLWluZGljYXRvckBhdGFyZWFvLmVzIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "058sqbzj2is7n6j8nrf23n6g5mxi1agwmdfv2q8lwmi444bl8xjx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBXaXJlR3VhcmQgVlBOIGZyb20gRGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJpY29uIjogIndpcmVndWFyZC1pY29uIiwKICAibmFtZSI6ICJXaXJlR3VhcmQgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImVzLmF0YXJlYW8ud2lyZWd1YXJkLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F0YXJlYW8vd2lyZWd1YXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAid2lyZWd1YXJkLWluZGljYXRvckBhdGFyZWFvLmVzIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "058sqbzj2is7n6j8nrf23n6g5mxi1agwmdfv2q8lwmi444bl8xjx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBXaXJlR3VhcmQgVlBOIGZyb20gRGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJpY29uIjogIndpcmVndWFyZC1pY29uIiwKICAibmFtZSI6ICJXaXJlR3VhcmQgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImVzLmF0YXJlYW8ud2lyZWd1YXJkLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F0YXJlYW8vd2lyZWd1YXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAid2lyZWd1YXJkLWluZGljYXRvckBhdGFyZWFvLmVzIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} -, {"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": "23", "sha256": "1pd93br2sl1x2dyjzvcbsy5bmjsnir6wnbphvm0xvwc6abwqkwrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zY3ItaXIvZ25vbWUtc2hhbXNpLWNhbGVuZGFyIiwKICAidXVpZCI6ICJzaGFtc2ktY2FsZW5kYXJAZ25vbWUuc2NyLmlyIiwKICAidmVyc2lvbiI6IDIzCn0="}, "40": {"version": "23", "sha256": "1pd93br2sl1x2dyjzvcbsy5bmjsnir6wnbphvm0xvwc6abwqkwrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zY3ItaXIvZ25vbWUtc2hhbXNpLWNhbGVuZGFyIiwKICAidXVpZCI6ICJzaGFtc2ktY2FsZW5kYXJAZ25vbWUuc2NyLmlyIiwKICAidmVyc2lvbiI6IDIzCn0="}, "41": {"version": "23", "sha256": "1pd93br2sl1x2dyjzvcbsy5bmjsnir6wnbphvm0xvwc6abwqkwrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zY3ItaXIvZ25vbWUtc2hhbXNpLWNhbGVuZGFyIiwKICAidXVpZCI6ICJzaGFtc2ktY2FsZW5kYXJAZ25vbWUuc2NyLmlyIiwKICAidmVyc2lvbiI6IDIzCn0="}, "42": {"version": "23", "sha256": "1pd93br2sl1x2dyjzvcbsy5bmjsnir6wnbphvm0xvwc6abwqkwrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zY3ItaXIvZ25vbWUtc2hhbXNpLWNhbGVuZGFyIiwKICAidXVpZCI6ICJzaGFtc2ktY2FsZW5kYXJAZ25vbWUuc2NyLmlyIiwKICAidmVyc2lvbiI6IDIzCn0="}}} +, {"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": "24", "sha256": "0009g7p694iqff89d5rrcgcvlbhzylg4yy0879lk6cwjib8l77d7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNAp9"}, "40": {"version": "24", "sha256": "0009g7p694iqff89d5rrcgcvlbhzylg4yy0879lk6cwjib8l77d7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNAp9"}, "41": {"version": "24", "sha256": "0009g7p694iqff89d5rrcgcvlbhzylg4yy0879lk6cwjib8l77d7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNAp9"}, "42": {"version": "24", "sha256": "0009g7p694iqff89d5rrcgcvlbhzylg4yy0879lk6cwjib8l77d7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNAp9"}, "43": {"version": "24", "sha256": "0009g7p694iqff89d5rrcgcvlbhzylg4yy0879lk6cwjib8l77d7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNAp9"}}} , {"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 Shell\n\nFeatures include: various menu layouts, 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": "13", "sha256": "140zii41az315lnnj72dsa8xd0mg31ymp9sp8203vykj83ndsf3q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "40": {"version": "27", "sha256": "05wv774x3x31dzs5b2ls1gf3lrjjl43pvmh5zfj3211by9b72292", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "41": {"version": "27", "sha256": "05wv774x3x31dzs5b2ls1gf3lrjjl43pvmh5zfj3211by9b72292", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "42": {"version": "42", "sha256": "0xpdrjih6g0s8vnz18raxx7js1k03wwh1v0f3rbn7bmn9mq1r8m0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, "43": {"version": "42", "sha256": "0xpdrjih6g0s8vnz18raxx7js1k03wwh1v0f3rbn7bmn9mq1r8m0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgRXh0ZW5zaW9uIGZvciBHTk9NRSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}}} +, {"uuid": "arcmenu@arcmenu.com", "name": "ArcMenu", "pname": "arcmenu", "description": "Application menu for GNOME Shell\n\nFeatures include: various menu layouts, 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": "13", "sha256": "1sqsj5vj234c53m508wa2zxjkqnf1pcgm6iqmj2k33dq7h75nhlw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJleHRlbnNpb24taWQiOiAiYXJjbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgInV1aWQiOiAiYXJjbWVudUBhcmNtZW51LmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "27", "sha256": "01h4r7alddj1fly4l4rxpji17ilmf0v56559rdnsl0sy1lx8bkrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJleHRlbnNpb24taWQiOiAiYXJjbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "41": {"version": "27", "sha256": "01h4r7alddj1fly4l4rxpji17ilmf0v56559rdnsl0sy1lx8bkrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJleHRlbnNpb24taWQiOiAiYXJjbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "42": {"version": "43", "sha256": "18dqnr0jsi7crkmd03vdywkhmkkd0zwf5bq7p0kkgg27cmbgx6dy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJleHRlbnNpb24taWQiOiAiYXJjbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}, "43": {"version": "43", "sha256": "18dqnr0jsi7crkmd03vdywkhmkkd0zwf5bq7p0kkgg27cmbgx6dy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJleHRlbnNpb24taWQiOiAiYXJjbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}}} , {"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": "7", "sha256": "18z9h0fcq6w3kmcc5v8swjn18nc9hkck54jfzyv2697py6cd83kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "18z9h0fcq6w3kmcc5v8swjn18nc9hkck54jfzyv2697py6cd83kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "18z9h0fcq6w3kmcc5v8swjn18nc9hkck54jfzyv2697py6cd83kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "18z9h0fcq6w3kmcc5v8swjn18nc9hkck54jfzyv2697py6cd83kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "18z9h0fcq6w3kmcc5v8swjn18nc9hkck54jfzyv2697py6cd83kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"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": "Reorder workspaces in the overview with Alt+Up/Alt+Down", "link": "https://extensions.gnome.org/extension/3685/reorder-workspaces/", "shell_version_map": {"38": {"version": "12", "sha256": "0l4ivdbhsnpmr2bngqrzmybal6i1ni85dlpd5ir0dafd95yl7y04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbW1yMC9nbm9tZS1yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInJlb3JkZXItd29ya3NwYWNlc0BqZXIuZGV2IiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "12", "sha256": "0l4ivdbhsnpmr2bngqrzmybal6i1ni85dlpd5ir0dafd95yl7y04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbW1yMC9nbm9tZS1yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInJlb3JkZXItd29ya3NwYWNlc0BqZXIuZGV2IiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "0l4ivdbhsnpmr2bngqrzmybal6i1ni85dlpd5ir0dafd95yl7y04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbW1yMC9nbm9tZS1yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInJlb3JkZXItd29ya3NwYWNlc0BqZXIuZGV2IiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "15", "sha256": "0i23jb0piamykqypavaviwlwvb44dw4jda6zmqqz3dlgkqjbrigm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NtbXIwL2dub21lLXJlb3JkZXItd29ya3NwYWNlcyIsCiAgInV1aWQiOiAicmVvcmRlci13b3Jrc3BhY2VzQGplci5kZXYiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "43": {"version": "15", "sha256": "0i23jb0piamykqypavaviwlwvb44dw4jda6zmqqz3dlgkqjbrigm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NtbXIwL2dub21lLXJlb3JkZXItd29ya3NwYWNlcyIsCiAgInV1aWQiOiAicmVvcmRlci13b3Jrc3BhY2VzQGplci5kZXYiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} @@ -388,7 +388,7 @@ , {"uuid": "netspeedsimplified@prateekmedia.extension", "name": "Net speed Simplified", "pname": "net-speed-simplified", "description": "A Net Speed extension With Loads of Customization. Fork of simplenetspeed\n\nFull CHANGELOG can be found on github releases page\n\nFeatures \n1. Clean UI \n2. Adjustable Refresh rate \n3. Preferences to manage extension \n4. Vertical Alignment Support \n5. Two Icon sets for Indicators \n\nFeature Highlights for Preferences \n1. Lock Mouse Actions option \n2. Advance Position options to pinpoint where to place the indicator on the Panel. \n3. Refresh time option by which you can change refresh rate value between 1.0 and 10.0 seconds. \n4. Option to show upload speed first \n5. Color Customizations for speed indicators \n6. Option to Hide when Disconnected \n7. Option to use shorter units like K/s instead of KB/s \n8. Limit Unit option and more... \n\nModes \n1. Total net speed in terms of bits per second \n2. Total net speed in terms of bytes per second \n3. Combined Up & down speed in terms of bits per second \n4. Combined Up & down speed in terms of bytes per second \n5. Total transferred data in terms of bytes (Right click to reset counter) \n\nMouse Events \n- Left click to change modes \n- Right click(in 1-4 modes): Toggle the visibility of total transfer data. \n- Right click(in 5th mode): Reset total transfer data. \n- Right Click(Four consecutive times): Toggle through horizontal/vertical alignment. \n- Middle click: Cycle through the font sizes.", "link": "https://extensions.gnome.org/extension/3724/net-speed-simplified/", "shell_version_map": {"38": {"version": "35", "sha256": "1lqrgqxmfys2v7d8kl6rffdzjqi6gcvz05kd0wllmbb7p64aprc3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTmV0IFNwZWVkIGV4dGVuc2lvbiBXaXRoIExvYWRzIG9mIEN1c3RvbWl6YXRpb24uIEZvcmsgb2Ygc2ltcGxlbmV0c3BlZWRcblxuRnVsbCBDSEFOR0VMT0cgY2FuIGJlIGZvdW5kIG9uIGdpdGh1YiByZWxlYXNlcyBwYWdlXG5cbkZlYXR1cmVzIFxuMS4gQ2xlYW4gVUkgXG4yLiBBZGp1c3RhYmxlIFJlZnJlc2ggcmF0ZSBcbjMuIFByZWZlcmVuY2VzIHRvIG1hbmFnZSBleHRlbnNpb24gXG40LiBWZXJ0aWNhbCBBbGlnbm1lbnQgU3VwcG9ydCBcbjUuIFR3byBJY29uIHNldHMgZm9yIEluZGljYXRvcnMgXG5cbkZlYXR1cmUgSGlnaGxpZ2h0cyBmb3IgUHJlZmVyZW5jZXMgXG4xLiBMb2NrIE1vdXNlIEFjdGlvbnMgb3B0aW9uIFxuMi4gQWR2YW5jZSBQb3NpdGlvbiBvcHRpb25zIHRvIHBpbnBvaW50IHdoZXJlIHRvIHBsYWNlIHRoZSBpbmRpY2F0b3Igb24gdGhlIFBhbmVsLiBcbjMuIFJlZnJlc2ggdGltZSBvcHRpb24gYnkgd2hpY2ggeW91IGNhbiBjaGFuZ2UgcmVmcmVzaCByYXRlIHZhbHVlIGJldHdlZW4gMS4wIGFuZCAxMC4wIHNlY29uZHMuIFxuNC4gT3B0aW9uIHRvIHNob3cgdXBsb2FkIHNwZWVkIGZpcnN0IFxuNS4gQ29sb3IgQ3VzdG9taXphdGlvbnMgZm9yIHNwZWVkIGluZGljYXRvcnMgXG42LiBPcHRpb24gdG8gSGlkZSB3aGVuIERpc2Nvbm5lY3RlZCBcbjcuIE9wdGlvbiB0byB1c2Ugc2hvcnRlciB1bml0cyBsaWtlIEsvcyBpbnN0ZWFkIG9mIEtCL3MgXG44LiBMaW1pdCBVbml0IG9wdGlvbiBhbmQgbW9yZS4uLiBcblxuTW9kZXMgXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuMi4gVG90YWwgbmV0IHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG4zLiBDb21iaW5lZCBVcCAmIGRvd24gc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuNC4gQ29tYmluZWQgVXAgJiBkb3duIHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG41LiBUb3RhbCB0cmFuc2ZlcnJlZCBkYXRhIGluIHRlcm1zIG9mIGJ5dGVzIChSaWdodCBjbGljayB0byByZXNldCBjb3VudGVyKSBcblxuTW91c2UgRXZlbnRzIFxuLSBMZWZ0IGNsaWNrIHRvIGNoYW5nZSBtb2RlcyBcbi0gUmlnaHQgY2xpY2soaW4gMS00IG1vZGVzKTogVG9nZ2xlIHRoZSB2aXNpYmlsaXR5IG9mIHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBjbGljayhpbiA1dGggbW9kZSk6IFJlc2V0IHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBDbGljayhGb3VyIGNvbnNlY3V0aXZlIHRpbWVzKTogVG9nZ2xlIHRocm91Z2ggaG9yaXpvbnRhbC92ZXJ0aWNhbCBhbGlnbm1lbnQuIFxuLSBNaWRkbGUgY2xpY2s6IEN5Y2xlIHRocm91Z2ggdGhlIGZvbnQgc2l6ZXMuIiwKICAibmFtZSI6ICJOZXQgc3BlZWQgU2ltcGxpZmllZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ByYXRlZWttZWRpYS9uZXRzcGVlZHNpbXBsaWZpZWQiLAogICJ1dWlkIjogIm5ldHNwZWVkc2ltcGxpZmllZEBwcmF0ZWVrbWVkaWEuZXh0ZW5zaW9uIiwKICAidmVyc2lvbiI6IDM1Cn0="}, "40": {"version": "36", "sha256": "0np2d9m6arjn4i1nh9d88hhkkd0x95hk8fb3hgilcrc3sph8m1nz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTmV0IFNwZWVkIGV4dGVuc2lvbiBXaXRoIExvYWRzIG9mIEN1c3RvbWl6YXRpb24uIEZvcmsgb2Ygc2ltcGxlbmV0c3BlZWRcblxuRnVsbCBDSEFOR0VMT0cgY2FuIGJlIGZvdW5kIG9uIGdpdGh1YiByZWxlYXNlcyBwYWdlXG5cbkZlYXR1cmVzIFxuMS4gQ2xlYW4gVUkgXG4yLiBBZGp1c3RhYmxlIFJlZnJlc2ggcmF0ZSBcbjMuIFByZWZlcmVuY2VzIHRvIG1hbmFnZSBleHRlbnNpb24gXG40LiBWZXJ0aWNhbCBBbGlnbm1lbnQgU3VwcG9ydCBcbjUuIFR3byBJY29uIHNldHMgZm9yIEluZGljYXRvcnMgXG5cbkZlYXR1cmUgSGlnaGxpZ2h0cyBmb3IgUHJlZmVyZW5jZXMgXG4xLiBMb2NrIE1vdXNlIEFjdGlvbnMgb3B0aW9uIFxuMi4gQWR2YW5jZSBQb3NpdGlvbiBvcHRpb25zIHRvIHBpbnBvaW50IHdoZXJlIHRvIHBsYWNlIHRoZSBpbmRpY2F0b3Igb24gdGhlIFBhbmVsLiBcbjMuIFJlZnJlc2ggdGltZSBvcHRpb24gYnkgd2hpY2ggeW91IGNhbiBjaGFuZ2UgcmVmcmVzaCByYXRlIHZhbHVlIGJldHdlZW4gMS4wIGFuZCAxMC4wIHNlY29uZHMuIFxuNC4gT3B0aW9uIHRvIHNob3cgdXBsb2FkIHNwZWVkIGZpcnN0IFxuNS4gQ29sb3IgQ3VzdG9taXphdGlvbnMgZm9yIHNwZWVkIGluZGljYXRvcnMgXG42LiBPcHRpb24gdG8gSGlkZSB3aGVuIERpc2Nvbm5lY3RlZCBcbjcuIE9wdGlvbiB0byB1c2Ugc2hvcnRlciB1bml0cyBsaWtlIEsvcyBpbnN0ZWFkIG9mIEtCL3MgXG44LiBMaW1pdCBVbml0IG9wdGlvbiBhbmQgbW9yZS4uLiBcblxuTW9kZXMgXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuMi4gVG90YWwgbmV0IHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG4zLiBDb21iaW5lZCBVcCAmIGRvd24gc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuNC4gQ29tYmluZWQgVXAgJiBkb3duIHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG41LiBUb3RhbCB0cmFuc2ZlcnJlZCBkYXRhIGluIHRlcm1zIG9mIGJ5dGVzIChSaWdodCBjbGljayB0byByZXNldCBjb3VudGVyKSBcblxuTW91c2UgRXZlbnRzIFxuLSBMZWZ0IGNsaWNrIHRvIGNoYW5nZSBtb2RlcyBcbi0gUmlnaHQgY2xpY2soaW4gMS00IG1vZGVzKTogVG9nZ2xlIHRoZSB2aXNpYmlsaXR5IG9mIHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBjbGljayhpbiA1dGggbW9kZSk6IFJlc2V0IHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBDbGljayhGb3VyIGNvbnNlY3V0aXZlIHRpbWVzKTogVG9nZ2xlIHRocm91Z2ggaG9yaXpvbnRhbC92ZXJ0aWNhbCBhbGlnbm1lbnQuIFxuLSBNaWRkbGUgY2xpY2s6IEN5Y2xlIHRocm91Z2ggdGhlIGZvbnQgc2l6ZXMuIiwKICAibmFtZSI6ICJOZXQgc3BlZWQgU2ltcGxpZmllZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wcmF0ZWVrbWVkaWEvbmV0c3BlZWRzaW1wbGlmaWVkIiwKICAidXVpZCI6ICJuZXRzcGVlZHNpbXBsaWZpZWRAcHJhdGVla21lZGlhLmV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiAzNgp9"}, "41": {"version": "36", "sha256": "0np2d9m6arjn4i1nh9d88hhkkd0x95hk8fb3hgilcrc3sph8m1nz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTmV0IFNwZWVkIGV4dGVuc2lvbiBXaXRoIExvYWRzIG9mIEN1c3RvbWl6YXRpb24uIEZvcmsgb2Ygc2ltcGxlbmV0c3BlZWRcblxuRnVsbCBDSEFOR0VMT0cgY2FuIGJlIGZvdW5kIG9uIGdpdGh1YiByZWxlYXNlcyBwYWdlXG5cbkZlYXR1cmVzIFxuMS4gQ2xlYW4gVUkgXG4yLiBBZGp1c3RhYmxlIFJlZnJlc2ggcmF0ZSBcbjMuIFByZWZlcmVuY2VzIHRvIG1hbmFnZSBleHRlbnNpb24gXG40LiBWZXJ0aWNhbCBBbGlnbm1lbnQgU3VwcG9ydCBcbjUuIFR3byBJY29uIHNldHMgZm9yIEluZGljYXRvcnMgXG5cbkZlYXR1cmUgSGlnaGxpZ2h0cyBmb3IgUHJlZmVyZW5jZXMgXG4xLiBMb2NrIE1vdXNlIEFjdGlvbnMgb3B0aW9uIFxuMi4gQWR2YW5jZSBQb3NpdGlvbiBvcHRpb25zIHRvIHBpbnBvaW50IHdoZXJlIHRvIHBsYWNlIHRoZSBpbmRpY2F0b3Igb24gdGhlIFBhbmVsLiBcbjMuIFJlZnJlc2ggdGltZSBvcHRpb24gYnkgd2hpY2ggeW91IGNhbiBjaGFuZ2UgcmVmcmVzaCByYXRlIHZhbHVlIGJldHdlZW4gMS4wIGFuZCAxMC4wIHNlY29uZHMuIFxuNC4gT3B0aW9uIHRvIHNob3cgdXBsb2FkIHNwZWVkIGZpcnN0IFxuNS4gQ29sb3IgQ3VzdG9taXphdGlvbnMgZm9yIHNwZWVkIGluZGljYXRvcnMgXG42LiBPcHRpb24gdG8gSGlkZSB3aGVuIERpc2Nvbm5lY3RlZCBcbjcuIE9wdGlvbiB0byB1c2Ugc2hvcnRlciB1bml0cyBsaWtlIEsvcyBpbnN0ZWFkIG9mIEtCL3MgXG44LiBMaW1pdCBVbml0IG9wdGlvbiBhbmQgbW9yZS4uLiBcblxuTW9kZXMgXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuMi4gVG90YWwgbmV0IHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG4zLiBDb21iaW5lZCBVcCAmIGRvd24gc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuNC4gQ29tYmluZWQgVXAgJiBkb3duIHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG41LiBUb3RhbCB0cmFuc2ZlcnJlZCBkYXRhIGluIHRlcm1zIG9mIGJ5dGVzIChSaWdodCBjbGljayB0byByZXNldCBjb3VudGVyKSBcblxuTW91c2UgRXZlbnRzIFxuLSBMZWZ0IGNsaWNrIHRvIGNoYW5nZSBtb2RlcyBcbi0gUmlnaHQgY2xpY2soaW4gMS00IG1vZGVzKTogVG9nZ2xlIHRoZSB2aXNpYmlsaXR5IG9mIHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBjbGljayhpbiA1dGggbW9kZSk6IFJlc2V0IHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBDbGljayhGb3VyIGNvbnNlY3V0aXZlIHRpbWVzKTogVG9nZ2xlIHRocm91Z2ggaG9yaXpvbnRhbC92ZXJ0aWNhbCBhbGlnbm1lbnQuIFxuLSBNaWRkbGUgY2xpY2s6IEN5Y2xlIHRocm91Z2ggdGhlIGZvbnQgc2l6ZXMuIiwKICAibmFtZSI6ICJOZXQgc3BlZWQgU2ltcGxpZmllZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wcmF0ZWVrbWVkaWEvbmV0c3BlZWRzaW1wbGlmaWVkIiwKICAidXVpZCI6ICJuZXRzcGVlZHNpbXBsaWZpZWRAcHJhdGVla21lZGlhLmV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiAzNgp9"}, "42": {"version": "36", "sha256": "0np2d9m6arjn4i1nh9d88hhkkd0x95hk8fb3hgilcrc3sph8m1nz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTmV0IFNwZWVkIGV4dGVuc2lvbiBXaXRoIExvYWRzIG9mIEN1c3RvbWl6YXRpb24uIEZvcmsgb2Ygc2ltcGxlbmV0c3BlZWRcblxuRnVsbCBDSEFOR0VMT0cgY2FuIGJlIGZvdW5kIG9uIGdpdGh1YiByZWxlYXNlcyBwYWdlXG5cbkZlYXR1cmVzIFxuMS4gQ2xlYW4gVUkgXG4yLiBBZGp1c3RhYmxlIFJlZnJlc2ggcmF0ZSBcbjMuIFByZWZlcmVuY2VzIHRvIG1hbmFnZSBleHRlbnNpb24gXG40LiBWZXJ0aWNhbCBBbGlnbm1lbnQgU3VwcG9ydCBcbjUuIFR3byBJY29uIHNldHMgZm9yIEluZGljYXRvcnMgXG5cbkZlYXR1cmUgSGlnaGxpZ2h0cyBmb3IgUHJlZmVyZW5jZXMgXG4xLiBMb2NrIE1vdXNlIEFjdGlvbnMgb3B0aW9uIFxuMi4gQWR2YW5jZSBQb3NpdGlvbiBvcHRpb25zIHRvIHBpbnBvaW50IHdoZXJlIHRvIHBsYWNlIHRoZSBpbmRpY2F0b3Igb24gdGhlIFBhbmVsLiBcbjMuIFJlZnJlc2ggdGltZSBvcHRpb24gYnkgd2hpY2ggeW91IGNhbiBjaGFuZ2UgcmVmcmVzaCByYXRlIHZhbHVlIGJldHdlZW4gMS4wIGFuZCAxMC4wIHNlY29uZHMuIFxuNC4gT3B0aW9uIHRvIHNob3cgdXBsb2FkIHNwZWVkIGZpcnN0IFxuNS4gQ29sb3IgQ3VzdG9taXphdGlvbnMgZm9yIHNwZWVkIGluZGljYXRvcnMgXG42LiBPcHRpb24gdG8gSGlkZSB3aGVuIERpc2Nvbm5lY3RlZCBcbjcuIE9wdGlvbiB0byB1c2Ugc2hvcnRlciB1bml0cyBsaWtlIEsvcyBpbnN0ZWFkIG9mIEtCL3MgXG44LiBMaW1pdCBVbml0IG9wdGlvbiBhbmQgbW9yZS4uLiBcblxuTW9kZXMgXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuMi4gVG90YWwgbmV0IHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG4zLiBDb21iaW5lZCBVcCAmIGRvd24gc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuNC4gQ29tYmluZWQgVXAgJiBkb3duIHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG41LiBUb3RhbCB0cmFuc2ZlcnJlZCBkYXRhIGluIHRlcm1zIG9mIGJ5dGVzIChSaWdodCBjbGljayB0byByZXNldCBjb3VudGVyKSBcblxuTW91c2UgRXZlbnRzIFxuLSBMZWZ0IGNsaWNrIHRvIGNoYW5nZSBtb2RlcyBcbi0gUmlnaHQgY2xpY2soaW4gMS00IG1vZGVzKTogVG9nZ2xlIHRoZSB2aXNpYmlsaXR5IG9mIHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBjbGljayhpbiA1dGggbW9kZSk6IFJlc2V0IHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBDbGljayhGb3VyIGNvbnNlY3V0aXZlIHRpbWVzKTogVG9nZ2xlIHRocm91Z2ggaG9yaXpvbnRhbC92ZXJ0aWNhbCBhbGlnbm1lbnQuIFxuLSBNaWRkbGUgY2xpY2s6IEN5Y2xlIHRocm91Z2ggdGhlIGZvbnQgc2l6ZXMuIiwKICAibmFtZSI6ICJOZXQgc3BlZWQgU2ltcGxpZmllZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wcmF0ZWVrbWVkaWEvbmV0c3BlZWRzaW1wbGlmaWVkIiwKICAidXVpZCI6ICJuZXRzcGVlZHNpbXBsaWZpZWRAcHJhdGVla21lZGlhLmV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiAzNgp9"}, "43": {"version": "36", "sha256": "0np2d9m6arjn4i1nh9d88hhkkd0x95hk8fb3hgilcrc3sph8m1nz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTmV0IFNwZWVkIGV4dGVuc2lvbiBXaXRoIExvYWRzIG9mIEN1c3RvbWl6YXRpb24uIEZvcmsgb2Ygc2ltcGxlbmV0c3BlZWRcblxuRnVsbCBDSEFOR0VMT0cgY2FuIGJlIGZvdW5kIG9uIGdpdGh1YiByZWxlYXNlcyBwYWdlXG5cbkZlYXR1cmVzIFxuMS4gQ2xlYW4gVUkgXG4yLiBBZGp1c3RhYmxlIFJlZnJlc2ggcmF0ZSBcbjMuIFByZWZlcmVuY2VzIHRvIG1hbmFnZSBleHRlbnNpb24gXG40LiBWZXJ0aWNhbCBBbGlnbm1lbnQgU3VwcG9ydCBcbjUuIFR3byBJY29uIHNldHMgZm9yIEluZGljYXRvcnMgXG5cbkZlYXR1cmUgSGlnaGxpZ2h0cyBmb3IgUHJlZmVyZW5jZXMgXG4xLiBMb2NrIE1vdXNlIEFjdGlvbnMgb3B0aW9uIFxuMi4gQWR2YW5jZSBQb3NpdGlvbiBvcHRpb25zIHRvIHBpbnBvaW50IHdoZXJlIHRvIHBsYWNlIHRoZSBpbmRpY2F0b3Igb24gdGhlIFBhbmVsLiBcbjMuIFJlZnJlc2ggdGltZSBvcHRpb24gYnkgd2hpY2ggeW91IGNhbiBjaGFuZ2UgcmVmcmVzaCByYXRlIHZhbHVlIGJldHdlZW4gMS4wIGFuZCAxMC4wIHNlY29uZHMuIFxuNC4gT3B0aW9uIHRvIHNob3cgdXBsb2FkIHNwZWVkIGZpcnN0IFxuNS4gQ29sb3IgQ3VzdG9taXphdGlvbnMgZm9yIHNwZWVkIGluZGljYXRvcnMgXG42LiBPcHRpb24gdG8gSGlkZSB3aGVuIERpc2Nvbm5lY3RlZCBcbjcuIE9wdGlvbiB0byB1c2Ugc2hvcnRlciB1bml0cyBsaWtlIEsvcyBpbnN0ZWFkIG9mIEtCL3MgXG44LiBMaW1pdCBVbml0IG9wdGlvbiBhbmQgbW9yZS4uLiBcblxuTW9kZXMgXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuMi4gVG90YWwgbmV0IHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG4zLiBDb21iaW5lZCBVcCAmIGRvd24gc3BlZWQgaW4gdGVybXMgb2YgYml0cyBwZXIgc2Vjb25kIFxuNC4gQ29tYmluZWQgVXAgJiBkb3duIHNwZWVkIGluIHRlcm1zIG9mIGJ5dGVzIHBlciBzZWNvbmQgXG41LiBUb3RhbCB0cmFuc2ZlcnJlZCBkYXRhIGluIHRlcm1zIG9mIGJ5dGVzIChSaWdodCBjbGljayB0byByZXNldCBjb3VudGVyKSBcblxuTW91c2UgRXZlbnRzIFxuLSBMZWZ0IGNsaWNrIHRvIGNoYW5nZSBtb2RlcyBcbi0gUmlnaHQgY2xpY2soaW4gMS00IG1vZGVzKTogVG9nZ2xlIHRoZSB2aXNpYmlsaXR5IG9mIHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBjbGljayhpbiA1dGggbW9kZSk6IFJlc2V0IHRvdGFsIHRyYW5zZmVyIGRhdGEuIFxuLSBSaWdodCBDbGljayhGb3VyIGNvbnNlY3V0aXZlIHRpbWVzKTogVG9nZ2xlIHRocm91Z2ggaG9yaXpvbnRhbC92ZXJ0aWNhbCBhbGlnbm1lbnQuIFxuLSBNaWRkbGUgY2xpY2s6IEN5Y2xlIHRocm91Z2ggdGhlIGZvbnQgc2l6ZXMuIiwKICAibmFtZSI6ICJOZXQgc3BlZWQgU2ltcGxpZmllZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wcmF0ZWVrbWVkaWEvbmV0c3BlZWRzaW1wbGlmaWVkIiwKICAidXVpZCI6ICJuZXRzcGVlZHNpbXBsaWZpZWRAcHJhdGVla21lZGlhLmV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiAzNgp9"}}} , {"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="}, "42": {"version": "36", "sha256": "1dj98am80c82mfw7cz9mzhqnahxqpkgm7lazd2s023rs0hfx825c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDM2Cn0="}, "43": {"version": "36", "sha256": "1dj98am80c82mfw7cz9mzhqnahxqpkgm7lazd2s023rs0hfx825c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDM2Cn0="}}} +, {"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="}, "42": {"version": "36", "sha256": "1dj98am80c82mfw7cz9mzhqnahxqpkgm7lazd2s023rs0hfx825c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDM2Cn0="}, "43": {"version": "39", "sha256": "1f3mrnp0rdv5j8abbhnwm72gcwgnxzjz2r5p04dp8jqib8lwpf0w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlbGVhdC9UaWxpbmctQXNzaXN0YW50IiwKICAidXVpZCI6ICJ0aWxpbmctYXNzaXN0YW50QGxlbGVhdC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMzkKfQ=="}}} , {"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": "7", "sha256": "1dyiqinjzjlh89vas00q78dzalh5mgj7q1a3vp8k13xfki4l0gzd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXJcblxuLyFcXCBOZWVkcyBBaXJTdGF0dXMgdG8gd29yazogaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL0FpclN0YXR1cyIsCiAgIm5hbWUiOiAiQWlycG9kcyBCYXR0ZXJ5IHN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL2dub21lLWFpcnBvZHMtYmF0dGVyeS1zdGF0dXMiLAogICJ1dWlkIjogImFpcnBvZHMtYmF0dGVyeS1zdGF0dXNAanUud3RmIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "1dyiqinjzjlh89vas00q78dzalh5mgj7q1a3vp8k13xfki4l0gzd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXJcblxuLyFcXCBOZWVkcyBBaXJTdGF0dXMgdG8gd29yazogaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL0FpclN0YXR1cyIsCiAgIm5hbWUiOiAiQWlycG9kcyBCYXR0ZXJ5IHN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL2dub21lLWFpcnBvZHMtYmF0dGVyeS1zdGF0dXMiLAogICJ1dWlkIjogImFpcnBvZHMtYmF0dGVyeS1zdGF0dXNAanUud3RmIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "1dyiqinjzjlh89vas00q78dzalh5mgj7q1a3vp8k13xfki4l0gzd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXJcblxuLyFcXCBOZWVkcyBBaXJTdGF0dXMgdG8gd29yazogaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL0FpclN0YXR1cyIsCiAgIm5hbWUiOiAiQWlycG9kcyBCYXR0ZXJ5IHN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL2dub21lLWFpcnBvZHMtYmF0dGVyeS1zdGF0dXMiLAogICJ1dWlkIjogImFpcnBvZHMtYmF0dGVyeS1zdGF0dXNAanUud3RmIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "1dyiqinjzjlh89vas00q78dzalh5mgj7q1a3vp8k13xfki4l0gzd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXJcblxuLyFcXCBOZWVkcyBBaXJTdGF0dXMgdG8gd29yazogaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL0FpclN0YXR1cyIsCiAgIm5hbWUiOiAiQWlycG9kcyBCYXR0ZXJ5IHN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL2dub21lLWFpcnBvZHMtYmF0dGVyeS1zdGF0dXMiLAogICJ1dWlkIjogImFpcnBvZHMtYmF0dGVyeS1zdGF0dXNAanUud3RmIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"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": "24", "sha256": "10rc9x685hp35j47ia2lk216997k3lddwjw3x6y9pyf87dhrwbz7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="}, "40": {"version": "26", "sha256": "0pf3b6mxipwhqs90r0iqzwl8w92fsz97vnip18r0znqw5pdl4hw3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "41": {"version": "26", "sha256": "0pf3b6mxipwhqs90r0iqzwl8w92fsz97vnip18r0znqw5pdl4hw3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "42": {"version": "26", "sha256": "0pf3b6mxipwhqs90r0iqzwl8w92fsz97vnip18r0znqw5pdl4hw3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "43": {"version": "26", "sha256": "0pf3b6mxipwhqs90r0iqzwl8w92fsz97vnip18r0znqw5pdl4hw3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}}} , {"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": "13", "sha256": "17b2nxg36v09fc6m5ja0kdi0mnjwid0gama4bg3x5qj87gs5j077", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "40": {"version": "13", "sha256": "17b2nxg36v09fc6m5ja0kdi0mnjwid0gama4bg3x5qj87gs5j077", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "17b2nxg36v09fc6m5ja0kdi0mnjwid0gama4bg3x5qj87gs5j077", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "42": {"version": "13", "sha256": "17b2nxg36v09fc6m5ja0kdi0mnjwid0gama4bg3x5qj87gs5j077", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "43": {"version": "13", "sha256": "17b2nxg36v09fc6m5ja0kdi0mnjwid0gama4bg3x5qj87gs5j077", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} @@ -398,14 +398,14 @@ , {"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": "6", "sha256": "00zz3f00bdr95579250m7blrgavqziwh88dw45x928lq06xb052w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGJhdHRlcnkgc3RhdHVzIiwKICAiZXh0ZW5zaW9uLWlkIjogImJhdHRlcnktc3RhdHVzQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LXN0YXR1c0BhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJiYXR0ZXJ5LXN0YXR1cy1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IFN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJlcy5hdGFyZWFvLmJhdHRlcnktc3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXRhcmVhby9iYXR0ZXJ5LXN0YXR1cyIsCiAgInV1aWQiOiAiYmF0dGVyeS1zdGF0dXNAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "00zz3f00bdr95579250m7blrgavqziwh88dw45x928lq06xb052w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGJhdHRlcnkgc3RhdHVzIiwKICAiZXh0ZW5zaW9uLWlkIjogImJhdHRlcnktc3RhdHVzQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LXN0YXR1c0BhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJiYXR0ZXJ5LXN0YXR1cy1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IFN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJlcy5hdGFyZWFvLmJhdHRlcnktc3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXRhcmVhby9iYXR0ZXJ5LXN0YXR1cyIsCiAgInV1aWQiOiAiYmF0dGVyeS1zdGF0dXNAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "00zz3f00bdr95579250m7blrgavqziwh88dw45x928lq06xb052w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGJhdHRlcnkgc3RhdHVzIiwKICAiZXh0ZW5zaW9uLWlkIjogImJhdHRlcnktc3RhdHVzQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LXN0YXR1c0BhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJiYXR0ZXJ5LXN0YXR1cy1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IFN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJlcy5hdGFyZWFvLmJhdHRlcnktc3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXRhcmVhby9iYXR0ZXJ5LXN0YXR1cyIsCiAgInV1aWQiOiAiYmF0dGVyeS1zdGF0dXNAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"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": "41", "sha256": "0cff42krfad74yscn0l36p1sgskdg86wqdr5a3hrwy2777i4ds5f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQxCn0="}, "40": {"version": "41", "sha256": "0cff42krfad74yscn0l36p1sgskdg86wqdr5a3hrwy2777i4ds5f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQxCn0="}, "41": {"version": "41", "sha256": "0cff42krfad74yscn0l36p1sgskdg86wqdr5a3hrwy2777i4ds5f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQxCn0="}, "42": {"version": "41", "sha256": "0cff42krfad74yscn0l36p1sgskdg86wqdr5a3hrwy2777i4ds5f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQxCn0="}, "43": {"version": "41", "sha256": "0cff42krfad74yscn0l36p1sgskdg86wqdr5a3hrwy2777i4ds5f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQxCn0="}}} +, {"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": "43", "sha256": "1g5266vxl5k6m2fi86jsjpnlf2dd7vzp243y6bxrmipj7m602vlx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}, "40": {"version": "43", "sha256": "1g5266vxl5k6m2fi86jsjpnlf2dd7vzp243y6bxrmipj7m602vlx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}, "41": {"version": "43", "sha256": "1g5266vxl5k6m2fi86jsjpnlf2dd7vzp243y6bxrmipj7m602vlx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}, "42": {"version": "43", "sha256": "1g5266vxl5k6m2fi86jsjpnlf2dd7vzp243y6bxrmipj7m602vlx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}, "43": {"version": "43", "sha256": "1g5266vxl5k6m2fi86jsjpnlf2dd7vzp243y6bxrmipj7m602vlx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}}} , {"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": "6", "sha256": "0fgz8zcs913i13jar3bvwp41zvc9gmgmwg3xiw71jlhbjl128f07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vbm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi10aW1lb3V0QGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "0fgz8zcs913i13jar3bvwp41zvc9gmgmwg3xiw71jlhbjl128f07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vbm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi10aW1lb3V0QGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "0fgz8zcs913i13jar3bvwp41zvc9gmgmwg3xiw71jlhbjl128f07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vbm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi10aW1lb3V0QGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "0fgz8zcs913i13jar3bvwp41zvc9gmgmwg3xiw71jlhbjl128f07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vbm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi10aW1lb3V0QGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "0fgz8zcs913i13jar3bvwp41zvc9gmgmwg3xiw71jlhbjl128f07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vbm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi10aW1lb3V0QGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"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": "9", "sha256": "0hp93b4s1lcvsc6fwda9mrwcv5bwqya178zhyqpx37fm7r7kz9vz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyB0aGUgb3B0aW9uIHRvIGhpYmVybmF0ZSBhbW9uZ3N0IG90aGVyIHN5c3RlbSBhY3Rpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlQGRhZm5lLnJvY2tzIiwKICAibmFtZSI6ICJTeXN0ZW0gQWN0aW9uIC0gSGliZXJuYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1oaWJlcm5hdGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWJlcm5hdGVAZGFmbmUucm9ja3MiLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "0hp93b4s1lcvsc6fwda9mrwcv5bwqya178zhyqpx37fm7r7kz9vz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyB0aGUgb3B0aW9uIHRvIGhpYmVybmF0ZSBhbW9uZ3N0IG90aGVyIHN5c3RlbSBhY3Rpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlQGRhZm5lLnJvY2tzIiwKICAibmFtZSI6ICJTeXN0ZW0gQWN0aW9uIC0gSGliZXJuYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1oaWJlcm5hdGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWJlcm5hdGVAZGFmbmUucm9ja3MiLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "0hp93b4s1lcvsc6fwda9mrwcv5bwqya178zhyqpx37fm7r7kz9vz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyB0aGUgb3B0aW9uIHRvIGhpYmVybmF0ZSBhbW9uZ3N0IG90aGVyIHN5c3RlbSBhY3Rpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlQGRhZm5lLnJvY2tzIiwKICAibmFtZSI6ICJTeXN0ZW0gQWN0aW9uIC0gSGliZXJuYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1oaWJlcm5hdGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWJlcm5hdGVAZGFmbmUucm9ja3MiLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "0hp93b4s1lcvsc6fwda9mrwcv5bwqya178zhyqpx37fm7r7kz9vz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyB0aGUgb3B0aW9uIHRvIGhpYmVybmF0ZSBhbW9uZ3N0IG90aGVyIHN5c3RlbSBhY3Rpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlQGRhZm5lLnJvY2tzIiwKICAibmFtZSI6ICJTeXN0ZW0gQWN0aW9uIC0gSGliZXJuYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1oaWJlcm5hdGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWJlcm5hdGVAZGFmbmUucm9ja3MiLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"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": "7", "sha256": "1pjp5yv27dvghdq74017brzqpk8jczmhw893wzw2id0nja2pjvqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2wzbm40cnQvY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXciLAogICJ1dWlkIjogImNsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3QGwzbm40cnQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "1pjp5yv27dvghdq74017brzqpk8jczmhw893wzw2id0nja2pjvqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2wzbm40cnQvY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXciLAogICJ1dWlkIjogImNsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3QGwzbm40cnQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "1pjp5yv27dvghdq74017brzqpk8jczmhw893wzw2id0nja2pjvqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2wzbm40cnQvY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXciLAogICJ1dWlkIjogImNsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3QGwzbm40cnQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "43": {"version": "7", "sha256": "1pjp5yv27dvghdq74017brzqpk8jczmhw893wzw2id0nja2pjvqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2wzbm40cnQvY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXciLAogICJ1dWlkIjogImNsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3QGwzbm40cnQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} -, {"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- Alt Tab Icon Size\n- Alt Tab Window Preview Icon Size\n- Alt Tab Window Preview Size\n- Always Show Workspace Switcher on Dynamic Workspaces (40, 41, 42)\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 Label Visibility\n- App Menu Visibility\n- Background Menu Visibility\n- Calendar Visibility\n- Clock Menu Position\n- Clock Menu Visibility\n- Dash Icon Size\n- Dash Separator Visibility (40, 41, 42)\n- Dash Visibility\n- Disable Type to Search\n- Double Super Key to App Grid\n- Events in Clock Menu Visibility\n- GNOME Shell Theme Override\n- Hot Corner (3.36, 3.38, 40)\n- Keyboard Layout Visibility\n- Looking Glass Size\n- Notification Banner Position\n- OSD 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- Quick Settings Menu Visibility (43)\n- Ripple Box\n- Search Visibility\n- Startup Status(40, 41, 42)\n- System Menu (Aggregate Menu) Visibility (3.36, 3.38, 40, 41, 42)\n- Take Screenshot Button in Window 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, 42)\n- Workspace Background Corner Size in Overview (40, 41, 42)\n- Workspace Popup Visibility\n- Workspaces in app grid Visibility (40, 41, 42)\n- Workspace Switcher Size (40, 41, 42)\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": "22", "sha256": "12ak9dxmzrrlgc9zjf3j7i6dl3gfqp4n95pqwfwcmvhv7nk20v16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIpXG4tIEFuaW1hdGlvbiBTcGVlZCBvciBEaXNhYmxlIGl0XG4tIEFwcCBHZXN0dXJlICgzLjM2LCAzLjM4KVxuLSBBcHBsaWNhdGlvbnMgQnV0dG9uIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgSWNvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IExhYmVsIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgVmlzaWJpbGl0eVxuLSBCYWNrZ3JvdW5kIE1lbnUgVmlzaWJpbGl0eVxuLSBDYWxlbmRhciBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggU2VwYXJhdG9yIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIpXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gRXZlbnRzIGluIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBHTk9NRSBTaGVsbCBUaGVtZSBPdmVycmlkZVxuLSBIb3QgQ29ybmVyICgzLjM2LCAzLjM4LCA0MClcbi0gS2V5Ym9hcmQgTGF5b3V0IFZpc2liaWxpdHlcbi0gTG9va2luZyBHbGFzcyBTaXplXG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFBvc2l0aW9uXG4tIE9TRCBWaXNpYmlsaXR5XG4tIFBhbmVsIEFycm93IFZpc2liaWxpdHkgKDMuMzYsIDMuMzgpXG4tIFBhbmVsIEJ1dHRvbiBQYWRkaW5nIFNpemVcbi0gUGFuZWwgSGVpZ2h0XG4tIFBhbmVsIGljb24gc2l6ZSBcbi0gUGFuZWwgSW5kaWNhdG9yIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBOb3RpZmljYXRpb24gaWNvbiBWaXNpYmlsaXR5XG4tIFBhbmVsIFBvc2l0aW9uXG4tIFBhbmVsIFJvdW5kIENvcm5lciBTaXplICgzLjM2LCAzLjM4LCA0MCwgNDEpXG4tIFBhbmVsIFZpc2liaWxpdHlcbi0gUGFuZWwgVmlzaWJpbGl0eSBpbiBPdmVydmlld1xuLSBQb3dlciBJY29uIFZpc2liaWxpdHlcbi0gUXVpY2sgU2V0dGluZ3MgTWVudSBWaXNpYmlsaXR5ICg0Mylcbi0gUmlwcGxlIEJveFxuLSBTZWFyY2ggVmlzaWJpbGl0eVxuLSBTdGFydHVwIFN0YXR1cyg0MCwgNDEsIDQyKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgQmFja2dyb3VuZCBDb3JuZXIgU2l6ZSBpbiBPdmVydmlldyAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlIFdyYXBhcm91bmRcbi0gV29ybGQgQ2xvY2sgVmlzaWJpbGl0eSIsCiAgImdldHRleHQtZG9tYWluIjogImp1c3QtcGVyZmVjdGlvbiIsCiAgIm5hbWUiOiAiSnVzdCBQZXJmZWN0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1c3QtcGVyZmVjdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "40": {"version": "22", "sha256": "12ak9dxmzrrlgc9zjf3j7i6dl3gfqp4n95pqwfwcmvhv7nk20v16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIpXG4tIEFuaW1hdGlvbiBTcGVlZCBvciBEaXNhYmxlIGl0XG4tIEFwcCBHZXN0dXJlICgzLjM2LCAzLjM4KVxuLSBBcHBsaWNhdGlvbnMgQnV0dG9uIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgSWNvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IExhYmVsIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgVmlzaWJpbGl0eVxuLSBCYWNrZ3JvdW5kIE1lbnUgVmlzaWJpbGl0eVxuLSBDYWxlbmRhciBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggU2VwYXJhdG9yIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIpXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gRXZlbnRzIGluIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBHTk9NRSBTaGVsbCBUaGVtZSBPdmVycmlkZVxuLSBIb3QgQ29ybmVyICgzLjM2LCAzLjM4LCA0MClcbi0gS2V5Ym9hcmQgTGF5b3V0IFZpc2liaWxpdHlcbi0gTG9va2luZyBHbGFzcyBTaXplXG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFBvc2l0aW9uXG4tIE9TRCBWaXNpYmlsaXR5XG4tIFBhbmVsIEFycm93IFZpc2liaWxpdHkgKDMuMzYsIDMuMzgpXG4tIFBhbmVsIEJ1dHRvbiBQYWRkaW5nIFNpemVcbi0gUGFuZWwgSGVpZ2h0XG4tIFBhbmVsIGljb24gc2l6ZSBcbi0gUGFuZWwgSW5kaWNhdG9yIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBOb3RpZmljYXRpb24gaWNvbiBWaXNpYmlsaXR5XG4tIFBhbmVsIFBvc2l0aW9uXG4tIFBhbmVsIFJvdW5kIENvcm5lciBTaXplICgzLjM2LCAzLjM4LCA0MCwgNDEpXG4tIFBhbmVsIFZpc2liaWxpdHlcbi0gUGFuZWwgVmlzaWJpbGl0eSBpbiBPdmVydmlld1xuLSBQb3dlciBJY29uIFZpc2liaWxpdHlcbi0gUXVpY2sgU2V0dGluZ3MgTWVudSBWaXNpYmlsaXR5ICg0Mylcbi0gUmlwcGxlIEJveFxuLSBTZWFyY2ggVmlzaWJpbGl0eVxuLSBTdGFydHVwIFN0YXR1cyg0MCwgNDEsIDQyKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgQmFja2dyb3VuZCBDb3JuZXIgU2l6ZSBpbiBPdmVydmlldyAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlIFdyYXBhcm91bmRcbi0gV29ybGQgQ2xvY2sgVmlzaWJpbGl0eSIsCiAgImdldHRleHQtZG9tYWluIjogImp1c3QtcGVyZmVjdGlvbiIsCiAgIm5hbWUiOiAiSnVzdCBQZXJmZWN0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1c3QtcGVyZmVjdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "41": {"version": "22", "sha256": "12ak9dxmzrrlgc9zjf3j7i6dl3gfqp4n95pqwfwcmvhv7nk20v16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIpXG4tIEFuaW1hdGlvbiBTcGVlZCBvciBEaXNhYmxlIGl0XG4tIEFwcCBHZXN0dXJlICgzLjM2LCAzLjM4KVxuLSBBcHBsaWNhdGlvbnMgQnV0dG9uIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgSWNvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IExhYmVsIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgVmlzaWJpbGl0eVxuLSBCYWNrZ3JvdW5kIE1lbnUgVmlzaWJpbGl0eVxuLSBDYWxlbmRhciBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggU2VwYXJhdG9yIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIpXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gRXZlbnRzIGluIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBHTk9NRSBTaGVsbCBUaGVtZSBPdmVycmlkZVxuLSBIb3QgQ29ybmVyICgzLjM2LCAzLjM4LCA0MClcbi0gS2V5Ym9hcmQgTGF5b3V0IFZpc2liaWxpdHlcbi0gTG9va2luZyBHbGFzcyBTaXplXG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFBvc2l0aW9uXG4tIE9TRCBWaXNpYmlsaXR5XG4tIFBhbmVsIEFycm93IFZpc2liaWxpdHkgKDMuMzYsIDMuMzgpXG4tIFBhbmVsIEJ1dHRvbiBQYWRkaW5nIFNpemVcbi0gUGFuZWwgSGVpZ2h0XG4tIFBhbmVsIGljb24gc2l6ZSBcbi0gUGFuZWwgSW5kaWNhdG9yIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBOb3RpZmljYXRpb24gaWNvbiBWaXNpYmlsaXR5XG4tIFBhbmVsIFBvc2l0aW9uXG4tIFBhbmVsIFJvdW5kIENvcm5lciBTaXplICgzLjM2LCAzLjM4LCA0MCwgNDEpXG4tIFBhbmVsIFZpc2liaWxpdHlcbi0gUGFuZWwgVmlzaWJpbGl0eSBpbiBPdmVydmlld1xuLSBQb3dlciBJY29uIFZpc2liaWxpdHlcbi0gUXVpY2sgU2V0dGluZ3MgTWVudSBWaXNpYmlsaXR5ICg0Mylcbi0gUmlwcGxlIEJveFxuLSBTZWFyY2ggVmlzaWJpbGl0eVxuLSBTdGFydHVwIFN0YXR1cyg0MCwgNDEsIDQyKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgQmFja2dyb3VuZCBDb3JuZXIgU2l6ZSBpbiBPdmVydmlldyAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlIFdyYXBhcm91bmRcbi0gV29ybGQgQ2xvY2sgVmlzaWJpbGl0eSIsCiAgImdldHRleHQtZG9tYWluIjogImp1c3QtcGVyZmVjdGlvbiIsCiAgIm5hbWUiOiAiSnVzdCBQZXJmZWN0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1c3QtcGVyZmVjdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "12ak9dxmzrrlgc9zjf3j7i6dl3gfqp4n95pqwfwcmvhv7nk20v16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIpXG4tIEFuaW1hdGlvbiBTcGVlZCBvciBEaXNhYmxlIGl0XG4tIEFwcCBHZXN0dXJlICgzLjM2LCAzLjM4KVxuLSBBcHBsaWNhdGlvbnMgQnV0dG9uIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgSWNvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IExhYmVsIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgVmlzaWJpbGl0eVxuLSBCYWNrZ3JvdW5kIE1lbnUgVmlzaWJpbGl0eVxuLSBDYWxlbmRhciBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggU2VwYXJhdG9yIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIpXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gRXZlbnRzIGluIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBHTk9NRSBTaGVsbCBUaGVtZSBPdmVycmlkZVxuLSBIb3QgQ29ybmVyICgzLjM2LCAzLjM4LCA0MClcbi0gS2V5Ym9hcmQgTGF5b3V0IFZpc2liaWxpdHlcbi0gTG9va2luZyBHbGFzcyBTaXplXG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFBvc2l0aW9uXG4tIE9TRCBWaXNpYmlsaXR5XG4tIFBhbmVsIEFycm93IFZpc2liaWxpdHkgKDMuMzYsIDMuMzgpXG4tIFBhbmVsIEJ1dHRvbiBQYWRkaW5nIFNpemVcbi0gUGFuZWwgSGVpZ2h0XG4tIFBhbmVsIGljb24gc2l6ZSBcbi0gUGFuZWwgSW5kaWNhdG9yIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBOb3RpZmljYXRpb24gaWNvbiBWaXNpYmlsaXR5XG4tIFBhbmVsIFBvc2l0aW9uXG4tIFBhbmVsIFJvdW5kIENvcm5lciBTaXplICgzLjM2LCAzLjM4LCA0MCwgNDEpXG4tIFBhbmVsIFZpc2liaWxpdHlcbi0gUGFuZWwgVmlzaWJpbGl0eSBpbiBPdmVydmlld1xuLSBQb3dlciBJY29uIFZpc2liaWxpdHlcbi0gUXVpY2sgU2V0dGluZ3MgTWVudSBWaXNpYmlsaXR5ICg0Mylcbi0gUmlwcGxlIEJveFxuLSBTZWFyY2ggVmlzaWJpbGl0eVxuLSBTdGFydHVwIFN0YXR1cyg0MCwgNDEsIDQyKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgQmFja2dyb3VuZCBDb3JuZXIgU2l6ZSBpbiBPdmVydmlldyAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlIFdyYXBhcm91bmRcbi0gV29ybGQgQ2xvY2sgVmlzaWJpbGl0eSIsCiAgImdldHRleHQtZG9tYWluIjogImp1c3QtcGVyZmVjdGlvbiIsCiAgIm5hbWUiOiAiSnVzdCBQZXJmZWN0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1c3QtcGVyZmVjdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "22", "sha256": "12ak9dxmzrrlgc9zjf3j7i6dl3gfqp4n95pqwfwcmvhv7nk20v16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIpXG4tIEFuaW1hdGlvbiBTcGVlZCBvciBEaXNhYmxlIGl0XG4tIEFwcCBHZXN0dXJlICgzLjM2LCAzLjM4KVxuLSBBcHBsaWNhdGlvbnMgQnV0dG9uIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgSWNvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IExhYmVsIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgVmlzaWJpbGl0eVxuLSBCYWNrZ3JvdW5kIE1lbnUgVmlzaWJpbGl0eVxuLSBDYWxlbmRhciBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggU2VwYXJhdG9yIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIpXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gRXZlbnRzIGluIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBHTk9NRSBTaGVsbCBUaGVtZSBPdmVycmlkZVxuLSBIb3QgQ29ybmVyICgzLjM2LCAzLjM4LCA0MClcbi0gS2V5Ym9hcmQgTGF5b3V0IFZpc2liaWxpdHlcbi0gTG9va2luZyBHbGFzcyBTaXplXG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFBvc2l0aW9uXG4tIE9TRCBWaXNpYmlsaXR5XG4tIFBhbmVsIEFycm93IFZpc2liaWxpdHkgKDMuMzYsIDMuMzgpXG4tIFBhbmVsIEJ1dHRvbiBQYWRkaW5nIFNpemVcbi0gUGFuZWwgSGVpZ2h0XG4tIFBhbmVsIGljb24gc2l6ZSBcbi0gUGFuZWwgSW5kaWNhdG9yIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBOb3RpZmljYXRpb24gaWNvbiBWaXNpYmlsaXR5XG4tIFBhbmVsIFBvc2l0aW9uXG4tIFBhbmVsIFJvdW5kIENvcm5lciBTaXplICgzLjM2LCAzLjM4LCA0MCwgNDEpXG4tIFBhbmVsIFZpc2liaWxpdHlcbi0gUGFuZWwgVmlzaWJpbGl0eSBpbiBPdmVydmlld1xuLSBQb3dlciBJY29uIFZpc2liaWxpdHlcbi0gUXVpY2sgU2V0dGluZ3MgTWVudSBWaXNpYmlsaXR5ICg0Mylcbi0gUmlwcGxlIEJveFxuLSBTZWFyY2ggVmlzaWJpbGl0eVxuLSBTdGFydHVwIFN0YXR1cyg0MCwgNDEsIDQyKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgQmFja2dyb3VuZCBDb3JuZXIgU2l6ZSBpbiBPdmVydmlldyAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlIFdyYXBhcm91bmRcbi0gV29ybGQgQ2xvY2sgVmlzaWJpbGl0eSIsCiAgImdldHRleHQtZG9tYWluIjogImp1c3QtcGVyZmVjdGlvbiIsCiAgIm5hbWUiOiAiSnVzdCBQZXJmZWN0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1c3QtcGVyZmVjdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} +, {"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- Alt Tab Icon Size\n- Alt Tab Window Preview Icon Size\n- Alt Tab Window Preview Size\n- Always Show Workspace Switcher on Dynamic Workspaces (40, 41, 42, 43)\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 Label Visibility\n- App Menu Visibility\n- Background Menu Visibility\n- Calendar Visibility\n- Clock Menu Position\n- Clock Menu Visibility\n- Dash Icon Size\n- Dash Separator Visibility (40, 41, 42, 43)\n- Dash Visibility\n- Disable Type to Search\n- Double Super Key to App Grid\n- Events in Clock Menu Visibility\n- GNOME Shell Theme Override\n- Hot Corner (3.36, 3.38, 40)\n- Keyboard Layout Visibility\n- Looking Glass Size\n- Notification Banner Position\n- OSD 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- Quick Settings Menu Visibility (43)\n- Ripple Box\n- Search Visibility\n- Startup Status(40, 41, 42, 43)\n- System Menu (Aggregate Menu) Visibility (3.36, 3.38, 40, 41, 42)\n- Take Screenshot Button in Window 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, 42, 43)\n- Workspace Background Corner Size in Overview (40, 41, 42, 43)\n- Workspace Popup Visibility\n- Workspaces in app grid Visibility (40, 41, 42, 43)\n- Workspace Switcher Size (40, 41, 42, 43)\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": "22", "sha256": "04hzcwj6yhym6lkn08qgpjv7ycqldasn3jrgcmmgkrfx6hljf91g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIsIDQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyLCA0Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYsIDMuMzgsIDQwKVxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBMb29raW5nIEdsYXNzIFNpemVcbi0gTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvblxuLSBPU0QgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSAoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgaWNvbiBzaXplIFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSwgNDIsIDQzKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyLCA0Mylcbi0gV29ya3NwYWNlIEJhY2tncm91bmQgQ29ybmVyIFNpemUgaW4gT3ZlcnZpZXcgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgUG9wdXAgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2VzIGluIGFwcCBncmlkIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0MiwgNDMpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDIyCn0="}, "40": {"version": "22", "sha256": "04hzcwj6yhym6lkn08qgpjv7ycqldasn3jrgcmmgkrfx6hljf91g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIsIDQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyLCA0Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYsIDMuMzgsIDQwKVxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBMb29raW5nIEdsYXNzIFNpemVcbi0gTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvblxuLSBPU0QgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSAoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgaWNvbiBzaXplIFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSwgNDIsIDQzKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyLCA0Mylcbi0gV29ya3NwYWNlIEJhY2tncm91bmQgQ29ybmVyIFNpemUgaW4gT3ZlcnZpZXcgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgUG9wdXAgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2VzIGluIGFwcCBncmlkIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0MiwgNDMpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDIyCn0="}, "41": {"version": "22", "sha256": "04hzcwj6yhym6lkn08qgpjv7ycqldasn3jrgcmmgkrfx6hljf91g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIsIDQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyLCA0Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYsIDMuMzgsIDQwKVxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBMb29raW5nIEdsYXNzIFNpemVcbi0gTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvblxuLSBPU0QgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSAoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgaWNvbiBzaXplIFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSwgNDIsIDQzKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyLCA0Mylcbi0gV29ya3NwYWNlIEJhY2tncm91bmQgQ29ybmVyIFNpemUgaW4gT3ZlcnZpZXcgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgUG9wdXAgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2VzIGluIGFwcCBncmlkIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0MiwgNDMpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDIyCn0="}, "42": {"version": "22", "sha256": "04hzcwj6yhym6lkn08qgpjv7ycqldasn3jrgcmmgkrfx6hljf91g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIsIDQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyLCA0Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYsIDMuMzgsIDQwKVxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBMb29raW5nIEdsYXNzIFNpemVcbi0gTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvblxuLSBPU0QgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSAoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgaWNvbiBzaXplIFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSwgNDIsIDQzKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyLCA0Mylcbi0gV29ya3NwYWNlIEJhY2tncm91bmQgQ29ybmVyIFNpemUgaW4gT3ZlcnZpZXcgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgUG9wdXAgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2VzIGluIGFwcCBncmlkIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0MiwgNDMpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDIyCn0="}, "43": {"version": "22", "sha256": "04hzcwj6yhym6lkn08qgpjv7ycqldasn3jrgcmmgkrfx6hljf91g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIsIDQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyLCA0Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYsIDMuMzgsIDQwKVxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBMb29raW5nIEdsYXNzIFNpemVcbi0gTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvblxuLSBPU0QgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSAoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgaWNvbiBzaXplIFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSwgNDIsIDQzKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyLCA0Mylcbi0gV29ya3NwYWNlIEJhY2tncm91bmQgQ29ybmVyIFNpemUgaW4gT3ZlcnZpZXcgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgUG9wdXAgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2VzIGluIGFwcCBncmlkIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0MiwgNDMpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDIyCn0="}}} , {"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": "13", "sha256": "1pmbdzm5ingnqx1i6hd7br14fcmyss6nyrclq74ld5zbpzgy6sih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd29ya3NwYWNlcy1iYXIiLAogICJ1dWlkIjogIndvcmtzcGFjZXMtYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "40": {"version": "13", "sha256": "1pmbdzm5ingnqx1i6hd7br14fcmyss6nyrclq74ld5zbpzgy6sih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd29ya3NwYWNlcy1iYXIiLAogICJ1dWlkIjogIndvcmtzcGFjZXMtYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "1pmbdzm5ingnqx1i6hd7br14fcmyss6nyrclq74ld5zbpzgy6sih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd29ya3NwYWNlcy1iYXIiLAogICJ1dWlkIjogIndvcmtzcGFjZXMtYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "42": {"version": "13", "sha256": "1pmbdzm5ingnqx1i6hd7br14fcmyss6nyrclq74ld5zbpzgy6sih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd29ya3NwYWNlcy1iYXIiLAogICJ1dWlkIjogIndvcmtzcGFjZXMtYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} , {"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"}}} @@ -417,41 +417,42 @@ , {"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": "14", "sha256": "015q21hnllkpj3566rr8086qi9kcig5n5wgg91j3s4j62sszwa2h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXhwb3NlZENhdC9zbm93eSIsCiAgInV1aWQiOiAic25vd3lAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiAxNAp9"}, "41": {"version": "14", "sha256": "015q21hnllkpj3566rr8086qi9kcig5n5wgg91j3s4j62sszwa2h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXhwb3NlZENhdC9zbm93eSIsCiAgInV1aWQiOiAic25vd3lAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiAxNAp9"}, "42": {"version": "14", "sha256": "015q21hnllkpj3566rr8086qi9kcig5n5wgg91j3s4j62sszwa2h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXhwb3NlZENhdC9zbm93eSIsCiAgInV1aWQiOiAic25vd3lAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiAxNAp9"}, "43": {"version": "14", "sha256": "015q21hnllkpj3566rr8086qi9kcig5n5wgg91j3s4j62sszwa2h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXhwb3NlZENhdC9zbm93eSIsCiAgInV1aWQiOiAic25vd3lAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiAxNAp9"}}} +, {"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": "16", "sha256": "1yf27cddw4pdqrdynxyvbmrnvnljkl6wjf9zasnqva3dl726i96c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXhwb3NlZENhdC9zbm93eSIsCiAgInV1aWQiOiAic25vd3lAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiAxNgp9"}, "41": {"version": "16", "sha256": "1yf27cddw4pdqrdynxyvbmrnvnljkl6wjf9zasnqva3dl726i96c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXhwb3NlZENhdC9zbm93eSIsCiAgInV1aWQiOiAic25vd3lAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiAxNgp9"}, "42": {"version": "16", "sha256": "1yf27cddw4pdqrdynxyvbmrnvnljkl6wjf9zasnqva3dl726i96c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXhwb3NlZENhdC9zbm93eSIsCiAgInV1aWQiOiAic25vd3lAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiAxNgp9"}, "43": {"version": "16", "sha256": "1yf27cddw4pdqrdynxyvbmrnvnljkl6wjf9zasnqva3dl726i96c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXhwb3NlZENhdC9zbm93eSIsCiAgInV1aWQiOiAic25vd3lAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiAxNgp9"}}} , {"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": "10", "sha256": "0y5myj24bkci6y944dnl9p52jz87fiqjxq5x3xcm8s4lc7zgzkfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NjYXJ5cmF3ci9nbm9tZS1mb2N1cyIsCiAgInV1aWQiOiAiZm9jdXNAc2NhcnlyYXdyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "0y5myj24bkci6y944dnl9p52jz87fiqjxq5x3xcm8s4lc7zgzkfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NjYXJ5cmF3ci9nbm9tZS1mb2N1cyIsCiAgInV1aWQiOiAiZm9jdXNAc2NhcnlyYXdyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0y5myj24bkci6y944dnl9p52jz87fiqjxq5x3xcm8s4lc7zgzkfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NjYXJ5cmF3ci9nbm9tZS1mb2N1cyIsCiAgInV1aWQiOiAiZm9jdXNAc2NhcnlyYXdyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "0y5myj24bkci6y944dnl9p52jz87fiqjxq5x3xcm8s4lc7zgzkfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NjYXJ5cmF3ci9nbm9tZS1mb2N1cyIsCiAgInV1aWQiOiAiZm9jdXNAc2NhcnlyYXdyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "10", "sha256": "0y5myj24bkci6y944dnl9p52jz87fiqjxq5x3xcm8s4lc7zgzkfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NjYXJ5cmF3ci9nbm9tZS1mb2N1cyIsCiAgInV1aWQiOiAiZm9jdXNAc2NhcnlyYXdyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"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": "6", "sha256": "1p4fyaxdhnyfzz1ba6zvpjv2ik5mvrc55cv2ii0ghr6ia0xi5yda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gc2VsZWN0cyBoZWFkc2V0cyB3aGVuIHBvc3NpYmxlIGluc3RlYWQgb2Ygc2hvd2luZyBhIGRpYWxvZyIsCiAgIm5hbWUiOiAiQXV0byBzZWxlY3QgaGVhZHNldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb3NlcGhsYmFybmV0dC9hdXRvc2VsZWN0aGVhZHNldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImF1dG9zZWxlY3RoZWFkc2V0QGpvc2VwaGxiYXJuZXR0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "1p4fyaxdhnyfzz1ba6zvpjv2ik5mvrc55cv2ii0ghr6ia0xi5yda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gc2VsZWN0cyBoZWFkc2V0cyB3aGVuIHBvc3NpYmxlIGluc3RlYWQgb2Ygc2hvd2luZyBhIGRpYWxvZyIsCiAgIm5hbWUiOiAiQXV0byBzZWxlY3QgaGVhZHNldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb3NlcGhsYmFybmV0dC9hdXRvc2VsZWN0aGVhZHNldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImF1dG9zZWxlY3RoZWFkc2V0QGpvc2VwaGxiYXJuZXR0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "1p4fyaxdhnyfzz1ba6zvpjv2ik5mvrc55cv2ii0ghr6ia0xi5yda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gc2VsZWN0cyBoZWFkc2V0cyB3aGVuIHBvc3NpYmxlIGluc3RlYWQgb2Ygc2hvd2luZyBhIGRpYWxvZyIsCiAgIm5hbWUiOiAiQXV0byBzZWxlY3QgaGVhZHNldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb3NlcGhsYmFybmV0dC9hdXRvc2VsZWN0aGVhZHNldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImF1dG9zZWxlY3RoZWFkc2V0QGpvc2VwaGxiYXJuZXR0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "1p4fyaxdhnyfzz1ba6zvpjv2ik5mvrc55cv2ii0ghr6ia0xi5yda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gc2VsZWN0cyBoZWFkc2V0cyB3aGVuIHBvc3NpYmxlIGluc3RlYWQgb2Ygc2hvd2luZyBhIGRpYWxvZyIsCiAgIm5hbWUiOiAiQXV0byBzZWxlY3QgaGVhZHNldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb3NlcGhsYmFybmV0dC9hdXRvc2VsZWN0aGVhZHNldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImF1dG9zZWxlY3RoZWFkc2V0QGpvc2VwaGxiYXJuZXR0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "1p4fyaxdhnyfzz1ba6zvpjv2ik5mvrc55cv2ii0ghr6ia0xi5yda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gc2VsZWN0cyBoZWFkc2V0cyB3aGVuIHBvc3NpYmxlIGluc3RlYWQgb2Ygc2hvd2luZyBhIGRpYWxvZyIsCiAgIm5hbWUiOiAiQXV0byBzZWxlY3QgaGVhZHNldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb3NlcGhsYmFybmV0dC9hdXRvc2VsZWN0aGVhZHNldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImF1dG9zZWxlY3RoZWFkc2V0QGpvc2VwaGxiYXJuZXR0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"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": "7", "sha256": "13s25az5g1n500jih7n1n7mprm70c2mg4r9cfdrxvivvmy080s5b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IHRvZ2dsZSBuaWdodC1saWdodCBmcm9tIHRoZSB0b3AtYmFyIGJ5IGNsaWNraW5nIGl0LiIsCiAgIm5hbWUiOiAiVG9nZ2xlIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2Fuc296YmlyL2dub21lLXNoZWxsLXRvZ2dsZS1uaWdodC1saWdodC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZ2dsZS1uaWdodC1saWdodEBjYW5zb3piaXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "13s25az5g1n500jih7n1n7mprm70c2mg4r9cfdrxvivvmy080s5b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IHRvZ2dsZSBuaWdodC1saWdodCBmcm9tIHRoZSB0b3AtYmFyIGJ5IGNsaWNraW5nIGl0LiIsCiAgIm5hbWUiOiAiVG9nZ2xlIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2Fuc296YmlyL2dub21lLXNoZWxsLXRvZ2dsZS1uaWdodC1saWdodC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZ2dsZS1uaWdodC1saWdodEBjYW5zb3piaXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "13s25az5g1n500jih7n1n7mprm70c2mg4r9cfdrxvivvmy080s5b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IHRvZ2dsZSBuaWdodC1saWdodCBmcm9tIHRoZSB0b3AtYmFyIGJ5IGNsaWNraW5nIGl0LiIsCiAgIm5hbWUiOiAiVG9nZ2xlIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2Fuc296YmlyL2dub21lLXNoZWxsLXRvZ2dsZS1uaWdodC1saWdodC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZ2dsZS1uaWdodC1saWdodEBjYW5zb3piaXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "13s25az5g1n500jih7n1n7mprm70c2mg4r9cfdrxvivvmy080s5b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IHRvZ2dsZSBuaWdodC1saWdodCBmcm9tIHRoZSB0b3AtYmFyIGJ5IGNsaWNraW5nIGl0LiIsCiAgIm5hbWUiOiAiVG9nZ2xlIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2Fuc296YmlyL2dub21lLXNoZWxsLXRvZ2dsZS1uaWdodC1saWdodC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZ2dsZS1uaWdodC1saWdodEBjYW5zb3piaXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"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": "7", "sha256": "1ssyb68vxjrlbc19pgcd91g325wfkbf5qdcpqpjd3xvifih00j95", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29sb3NodWJvdi9mbmxvY2stc3dpdGNoLXRwLWNvbXAtdXNiLWtiIiwKICAidXVpZCI6ICJmbmxvY2stc3dpdGNoLXRwLWNvbXAtdXNiLWtiQGdvbG9zaHVib3YuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "1ssyb68vxjrlbc19pgcd91g325wfkbf5qdcpqpjd3xvifih00j95", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29sb3NodWJvdi9mbmxvY2stc3dpdGNoLXRwLWNvbXAtdXNiLWtiIiwKICAidXVpZCI6ICJmbmxvY2stc3dpdGNoLXRwLWNvbXAtdXNiLWtiQGdvbG9zaHVib3YuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "1ssyb68vxjrlbc19pgcd91g325wfkbf5qdcpqpjd3xvifih00j95", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29sb3NodWJvdi9mbmxvY2stc3dpdGNoLXRwLWNvbXAtdXNiLWtiIiwKICAidXVpZCI6ICJmbmxvY2stc3dpdGNoLXRwLWNvbXAtdXNiLWtiQGdvbG9zaHVib3YuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "1ssyb68vxjrlbc19pgcd91g325wfkbf5qdcpqpjd3xvifih00j95", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29sb3NodWJvdi9mbmxvY2stc3dpdGNoLXRwLWNvbXAtdXNiLWtiIiwKICAidXVpZCI6ICJmbmxvY2stc3dpdGNoLXRwLWNvbXAtdXNiLWtiQGdvbG9zaHVib3YuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "43": {"version": "7", "sha256": "1ssyb68vxjrlbc19pgcd91g325wfkbf5qdcpqpjd3xvifih00j95", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29sb3NodWJvdi9mbmxvY2stc3dpdGNoLXRwLWNvbXAtdXNiLWtiIiwKICAidXVpZCI6ICJmbmxvY2stc3dpdGNoLXRwLWNvbXAtdXNiLWtiQGdvbG9zaHVib3YuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} +, {"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": "7", "sha256": "0c961naj9y10l1cjwi11vx10cvs248rs5wh67441z4w68zclhszy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb2xvc2h1Ym92L2ZubG9jay1zd2l0Y2gtdHAtY29tcC11c2Ita2IiLAogICJ1dWlkIjogImZubG9jay1zd2l0Y2gtdHAtY29tcC11c2Ita2JAZ29sb3NodWJvdi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "0c961naj9y10l1cjwi11vx10cvs248rs5wh67441z4w68zclhszy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb2xvc2h1Ym92L2ZubG9jay1zd2l0Y2gtdHAtY29tcC11c2Ita2IiLAogICJ1dWlkIjogImZubG9jay1zd2l0Y2gtdHAtY29tcC11c2Ita2JAZ29sb3NodWJvdi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "0c961naj9y10l1cjwi11vx10cvs248rs5wh67441z4w68zclhszy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb2xvc2h1Ym92L2ZubG9jay1zd2l0Y2gtdHAtY29tcC11c2Ita2IiLAogICJ1dWlkIjogImZubG9jay1zd2l0Y2gtdHAtY29tcC11c2Ita2JAZ29sb3NodWJvdi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "0c961naj9y10l1cjwi11vx10cvs248rs5wh67441z4w68zclhszy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb2xvc2h1Ym92L2ZubG9jay1zd2l0Y2gtdHAtY29tcC11c2Ita2IiLAogICJ1dWlkIjogImZubG9jay1zd2l0Y2gtdHAtY29tcC11c2Ita2JAZ29sb3NodWJvdi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "0c961naj9y10l1cjwi11vx10cvs248rs5wh67441z4w68zclhszy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb2xvc2h1Ym92L2ZubG9jay1zd2l0Y2gtdHAtY29tcC11c2Ita2IiLAogICJ1dWlkIjogImZubG9jay1zd2l0Y2gtdHAtY29tcC11c2Ita2JAZ29sb3NodWJvdi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"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": "5", "sha256": "0vw3zyn0gz6szb33qizhazv6zck1aa9wzj9jar0hfddyllrmfpw1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgQWxhY3JpdHR5IHdpbmRvdyB2aWEgaG90a2V5OiBBbHQrelxuXG5JZiBBbGFjcml0dHkgaXMgbm90IGxhdW5jaGVkLCBhdHRlbXB0cyB0byBzdGFydCBpdCAoL3Vzci9iaW4vYWxhY3JpdHR5KVxuXG5Xb3JrcyB1bmRlciBib3RoIFdheWxhbmQgYW5kIFgxMVxuXG5UbyBjaGFuZ2UgaG90a2V5IHBsZWFzZSBmb2xsb3cgaW5zdHJ1Y3Rpb24gaW4gdGhlIFJFQURNRS5tZDoiLAogICJuYW1lIjogIlRvZ2dsZSBBbGFjcml0dHkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9nZ2xlLWFsYWNyaXR0eSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9heHhhcHkvZ25vbWUtYWxhY3JpdHR5LXRvZ2dsZSIsCiAgInV1aWQiOiAidG9nZ2xlLWFsYWNyaXR0eUBpdHN0aW1lLnRlY2giLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "0vw3zyn0gz6szb33qizhazv6zck1aa9wzj9jar0hfddyllrmfpw1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgQWxhY3JpdHR5IHdpbmRvdyB2aWEgaG90a2V5OiBBbHQrelxuXG5JZiBBbGFjcml0dHkgaXMgbm90IGxhdW5jaGVkLCBhdHRlbXB0cyB0byBzdGFydCBpdCAoL3Vzci9iaW4vYWxhY3JpdHR5KVxuXG5Xb3JrcyB1bmRlciBib3RoIFdheWxhbmQgYW5kIFgxMVxuXG5UbyBjaGFuZ2UgaG90a2V5IHBsZWFzZSBmb2xsb3cgaW5zdHJ1Y3Rpb24gaW4gdGhlIFJFQURNRS5tZDoiLAogICJuYW1lIjogIlRvZ2dsZSBBbGFjcml0dHkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9nZ2xlLWFsYWNyaXR0eSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9heHhhcHkvZ25vbWUtYWxhY3JpdHR5LXRvZ2dsZSIsCiAgInV1aWQiOiAidG9nZ2xlLWFsYWNyaXR0eUBpdHN0aW1lLnRlY2giLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "0vw3zyn0gz6szb33qizhazv6zck1aa9wzj9jar0hfddyllrmfpw1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgQWxhY3JpdHR5IHdpbmRvdyB2aWEgaG90a2V5OiBBbHQrelxuXG5JZiBBbGFjcml0dHkgaXMgbm90IGxhdW5jaGVkLCBhdHRlbXB0cyB0byBzdGFydCBpdCAoL3Vzci9iaW4vYWxhY3JpdHR5KVxuXG5Xb3JrcyB1bmRlciBib3RoIFdheWxhbmQgYW5kIFgxMVxuXG5UbyBjaGFuZ2UgaG90a2V5IHBsZWFzZSBmb2xsb3cgaW5zdHJ1Y3Rpb24gaW4gdGhlIFJFQURNRS5tZDoiLAogICJuYW1lIjogIlRvZ2dsZSBBbGFjcml0dHkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9nZ2xlLWFsYWNyaXR0eSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9heHhhcHkvZ25vbWUtYWxhY3JpdHR5LXRvZ2dsZSIsCiAgInV1aWQiOiAidG9nZ2xlLWFsYWNyaXR0eUBpdHN0aW1lLnRlY2giLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "5", "sha256": "0vw3zyn0gz6szb33qizhazv6zck1aa9wzj9jar0hfddyllrmfpw1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgQWxhY3JpdHR5IHdpbmRvdyB2aWEgaG90a2V5OiBBbHQrelxuXG5JZiBBbGFjcml0dHkgaXMgbm90IGxhdW5jaGVkLCBhdHRlbXB0cyB0byBzdGFydCBpdCAoL3Vzci9iaW4vYWxhY3JpdHR5KVxuXG5Xb3JrcyB1bmRlciBib3RoIFdheWxhbmQgYW5kIFgxMVxuXG5UbyBjaGFuZ2UgaG90a2V5IHBsZWFzZSBmb2xsb3cgaW5zdHJ1Y3Rpb24gaW4gdGhlIFJFQURNRS5tZDoiLAogICJuYW1lIjogIlRvZ2dsZSBBbGFjcml0dHkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9nZ2xlLWFsYWNyaXR0eSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9heHhhcHkvZ25vbWUtYWxhY3JpdHR5LXRvZ2dsZSIsCiAgInV1aWQiOiAidG9nZ2xlLWFsYWNyaXR0eUBpdHN0aW1lLnRlY2giLAogICJ2ZXJzaW9uIjogNQp9"}, "43": {"version": "5", "sha256": "0vw3zyn0gz6szb33qizhazv6zck1aa9wzj9jar0hfddyllrmfpw1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgQWxhY3JpdHR5IHdpbmRvdyB2aWEgaG90a2V5OiBBbHQrelxuXG5JZiBBbGFjcml0dHkgaXMgbm90IGxhdW5jaGVkLCBhdHRlbXB0cyB0byBzdGFydCBpdCAoL3Vzci9iaW4vYWxhY3JpdHR5KVxuXG5Xb3JrcyB1bmRlciBib3RoIFdheWxhbmQgYW5kIFgxMVxuXG5UbyBjaGFuZ2UgaG90a2V5IHBsZWFzZSBmb2xsb3cgaW5zdHJ1Y3Rpb24gaW4gdGhlIFJFQURNRS5tZDoiLAogICJuYW1lIjogIlRvZ2dsZSBBbGFjcml0dHkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9nZ2xlLWFsYWNyaXR0eSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9heHhhcHkvZ25vbWUtYWxhY3JpdHR5LXRvZ2dsZSIsCiAgInV1aWQiOiAidG9nZ2xlLWFsYWNyaXR0eUBpdHN0aW1lLnRlY2giLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"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. Middle click calls overview.\n\nIf your indicator looks different from one on screen shot, install DejaVu Serif or Ubuntu font.", "link": "https://extensions.gnome.org/extension/3952/workspace-indicator/", "shell_version_map": {"38": {"version": "9", "sha256": "0phd62k87dq9jzxz4ybfw75s54mrzcfjni7d27gv5j92y2ymlhs5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuIE1pZGRsZSBjbGljayBjYWxscyBvdmVydmlldy5cblxuSWYgeW91ciBpbmRpY2F0b3IgbG9va3MgZGlmZmVyZW50IGZyb20gb25lIG9uIHNjcmVlbiBzaG90LCBpbnN0YWxsIERlamFWdSBTZXJpZiBvciBVYnVudHUgZm9udC4iLAogICJuYW1lIjogIldvcmtzcGFjZSBpbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R0eTIvaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3JAdHR5Mi5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "16", "sha256": "1vvnwbc2pl616ksprlwqx5ggkcm2i3gc8i5g0z7n3ahkl3hy5w3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuIE1pZGRsZSBjbGljayBjYWxscyBvdmVydmlldy5cblxuSWYgeW91ciBpbmRpY2F0b3IgbG9va3MgZGlmZmVyZW50IGZyb20gb25lIG9uIHNjcmVlbiBzaG90LCBpbnN0YWxsIERlamFWdSBTZXJpZiBvciBVYnVudHUgZm9udC4iLAogICJuYW1lIjogIldvcmtzcGFjZSBpbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R0eTIvaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3JAdHR5Mi5pbyIsCiAgInZlcnNpb24iOiAxNgp9"}, "41": {"version": "16", "sha256": "1vvnwbc2pl616ksprlwqx5ggkcm2i3gc8i5g0z7n3ahkl3hy5w3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuIE1pZGRsZSBjbGljayBjYWxscyBvdmVydmlldy5cblxuSWYgeW91ciBpbmRpY2F0b3IgbG9va3MgZGlmZmVyZW50IGZyb20gb25lIG9uIHNjcmVlbiBzaG90LCBpbnN0YWxsIERlamFWdSBTZXJpZiBvciBVYnVudHUgZm9udC4iLAogICJuYW1lIjogIldvcmtzcGFjZSBpbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R0eTIvaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3JAdHR5Mi5pbyIsCiAgInZlcnNpb24iOiAxNgp9"}, "42": {"version": "16", "sha256": "1vvnwbc2pl616ksprlwqx5ggkcm2i3gc8i5g0z7n3ahkl3hy5w3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuIE1pZGRsZSBjbGljayBjYWxscyBvdmVydmlldy5cblxuSWYgeW91ciBpbmRpY2F0b3IgbG9va3MgZGlmZmVyZW50IGZyb20gb25lIG9uIHNjcmVlbiBzaG90LCBpbnN0YWxsIERlamFWdSBTZXJpZiBvciBVYnVudHUgZm9udC4iLAogICJuYW1lIjogIldvcmtzcGFjZSBpbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R0eTIvaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3JAdHR5Mi5pbyIsCiAgInZlcnNpb24iOiAxNgp9"}, "43": {"version": "16", "sha256": "1vvnwbc2pl616ksprlwqx5ggkcm2i3gc8i5g0z7n3ahkl3hy5w3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuIE1pZGRsZSBjbGljayBjYWxscyBvdmVydmlldy5cblxuSWYgeW91ciBpbmRpY2F0b3IgbG9va3MgZGlmZmVyZW50IGZyb20gb25lIG9uIHNjcmVlbiBzaG90LCBpbnN0YWxsIERlamFWdSBTZXJpZiBvciBVYnVudHUgZm9udC4iLAogICJuYW1lIjogIldvcmtzcGFjZSBpbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R0eTIvaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3JAdHR5Mi5pbyIsCiAgInZlcnNpb24iOiAxNgp9"}}} +, {"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. \nYou can use it as an indicator only but widget is clickable. Left button click: move to left, right click: move right. Middle click calls overview.\nThere are options to customize look of the widget, check settings for that.\nTo apply changes turn the widget off and on again.\nIf your indicator looks different from one on screen shot, install DejaVu Serif or Ubuntu font.", "link": "https://extensions.gnome.org/extension/3952/workspace-indicator/", "shell_version_map": {"38": {"version": "9", "sha256": "0lli6bq8h1w974vn6fjqv0plgnmbsja08qqqyjwl4qmlfywrvxc7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLiBcbllvdSBjYW4gdXNlIGl0IGFzIGFuIGluZGljYXRvciBvbmx5IGJ1dCB3aWRnZXQgaXMgY2xpY2thYmxlLiBMZWZ0IGJ1dHRvbiBjbGljazogbW92ZSB0byBsZWZ0LCByaWdodCBjbGljazogbW92ZSByaWdodC4gTWlkZGxlIGNsaWNrIGNhbGxzIG92ZXJ2aWV3LlxuVGhlcmUgYXJlIG9wdGlvbnMgdG8gY3VzdG9taXplIGxvb2sgb2YgdGhlIHdpZGdldCwgY2hlY2sgc2V0dGluZ3MgZm9yIHRoYXQuXG5UbyBhcHBseSBjaGFuZ2VzIHR1cm4gdGhlIHdpZGdldCBvZmYgYW5kIG9uIGFnYWluLlxuSWYgeW91ciBpbmRpY2F0b3IgbG9va3MgZGlmZmVyZW50IGZyb20gb25lIG9uIHNjcmVlbiBzaG90LCBpbnN0YWxsIERlamFWdSBTZXJpZiBvciBVYnVudHUgZm9udC4iLAogICJuYW1lIjogIldvcmtzcGFjZSBpbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R0eTIvaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3JAdHR5Mi5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "18", "sha256": "10ps4bshjk259yrqb39hrsw2gm22yqgcl6drq2m1xvzlz24nwsm8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLiBcbllvdSBjYW4gdXNlIGl0IGFzIGFuIGluZGljYXRvciBvbmx5IGJ1dCB3aWRnZXQgaXMgY2xpY2thYmxlLiBMZWZ0IGJ1dHRvbiBjbGljazogbW92ZSB0byBsZWZ0LCByaWdodCBjbGljazogbW92ZSByaWdodC4gTWlkZGxlIGNsaWNrIGNhbGxzIG92ZXJ2aWV3LlxuVGhlcmUgYXJlIG9wdGlvbnMgdG8gY3VzdG9taXplIGxvb2sgb2YgdGhlIHdpZGdldCwgY2hlY2sgc2V0dGluZ3MgZm9yIHRoYXQuXG5UbyBhcHBseSBjaGFuZ2VzIHR1cm4gdGhlIHdpZGdldCBvZmYgYW5kIG9uIGFnYWluLlxuSWYgeW91ciBpbmRpY2F0b3IgbG9va3MgZGlmZmVyZW50IGZyb20gb25lIG9uIHNjcmVlbiBzaG90LCBpbnN0YWxsIERlamFWdSBTZXJpZiBvciBVYnVudHUgZm9udC4iLAogICJuYW1lIjogIldvcmtzcGFjZSBpbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R0eTIvaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3JAdHR5Mi5pbyIsCiAgInZlcnNpb24iOiAxOAp9"}, "41": {"version": "18", "sha256": "10ps4bshjk259yrqb39hrsw2gm22yqgcl6drq2m1xvzlz24nwsm8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLiBcbllvdSBjYW4gdXNlIGl0IGFzIGFuIGluZGljYXRvciBvbmx5IGJ1dCB3aWRnZXQgaXMgY2xpY2thYmxlLiBMZWZ0IGJ1dHRvbiBjbGljazogbW92ZSB0byBsZWZ0LCByaWdodCBjbGljazogbW92ZSByaWdodC4gTWlkZGxlIGNsaWNrIGNhbGxzIG92ZXJ2aWV3LlxuVGhlcmUgYXJlIG9wdGlvbnMgdG8gY3VzdG9taXplIGxvb2sgb2YgdGhlIHdpZGdldCwgY2hlY2sgc2V0dGluZ3MgZm9yIHRoYXQuXG5UbyBhcHBseSBjaGFuZ2VzIHR1cm4gdGhlIHdpZGdldCBvZmYgYW5kIG9uIGFnYWluLlxuSWYgeW91ciBpbmRpY2F0b3IgbG9va3MgZGlmZmVyZW50IGZyb20gb25lIG9uIHNjcmVlbiBzaG90LCBpbnN0YWxsIERlamFWdSBTZXJpZiBvciBVYnVudHUgZm9udC4iLAogICJuYW1lIjogIldvcmtzcGFjZSBpbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R0eTIvaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3JAdHR5Mi5pbyIsCiAgInZlcnNpb24iOiAxOAp9"}, "42": {"version": "18", "sha256": "10ps4bshjk259yrqb39hrsw2gm22yqgcl6drq2m1xvzlz24nwsm8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLiBcbllvdSBjYW4gdXNlIGl0IGFzIGFuIGluZGljYXRvciBvbmx5IGJ1dCB3aWRnZXQgaXMgY2xpY2thYmxlLiBMZWZ0IGJ1dHRvbiBjbGljazogbW92ZSB0byBsZWZ0LCByaWdodCBjbGljazogbW92ZSByaWdodC4gTWlkZGxlIGNsaWNrIGNhbGxzIG92ZXJ2aWV3LlxuVGhlcmUgYXJlIG9wdGlvbnMgdG8gY3VzdG9taXplIGxvb2sgb2YgdGhlIHdpZGdldCwgY2hlY2sgc2V0dGluZ3MgZm9yIHRoYXQuXG5UbyBhcHBseSBjaGFuZ2VzIHR1cm4gdGhlIHdpZGdldCBvZmYgYW5kIG9uIGFnYWluLlxuSWYgeW91ciBpbmRpY2F0b3IgbG9va3MgZGlmZmVyZW50IGZyb20gb25lIG9uIHNjcmVlbiBzaG90LCBpbnN0YWxsIERlamFWdSBTZXJpZiBvciBVYnVudHUgZm9udC4iLAogICJuYW1lIjogIldvcmtzcGFjZSBpbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R0eTIvaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3JAdHR5Mi5pbyIsCiAgInZlcnNpb24iOiAxOAp9"}, "43": {"version": "18", "sha256": "10ps4bshjk259yrqb39hrsw2gm22yqgcl6drq2m1xvzlz24nwsm8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLiBcbllvdSBjYW4gdXNlIGl0IGFzIGFuIGluZGljYXRvciBvbmx5IGJ1dCB3aWRnZXQgaXMgY2xpY2thYmxlLiBMZWZ0IGJ1dHRvbiBjbGljazogbW92ZSB0byBsZWZ0LCByaWdodCBjbGljazogbW92ZSByaWdodC4gTWlkZGxlIGNsaWNrIGNhbGxzIG92ZXJ2aWV3LlxuVGhlcmUgYXJlIG9wdGlvbnMgdG8gY3VzdG9taXplIGxvb2sgb2YgdGhlIHdpZGdldCwgY2hlY2sgc2V0dGluZ3MgZm9yIHRoYXQuXG5UbyBhcHBseSBjaGFuZ2VzIHR1cm4gdGhlIHdpZGdldCBvZmYgYW5kIG9uIGFnYWluLlxuSWYgeW91ciBpbmRpY2F0b3IgbG9va3MgZGlmZmVyZW50IGZyb20gb25lIG9uIHNjcmVlbiBzaG90LCBpbnN0YWxsIERlamFWdSBTZXJpZiBvciBVYnVudHUgZm9udC4iLAogICJuYW1lIjogIldvcmtzcGFjZSBpbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R0eTIvaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3JAdHR5Mi5pbyIsCiAgInZlcnNpb24iOiAxOAp9"}}} , {"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": "18", "sha256": "1k79mlsck0j3phq59cmg5y5cs1ma1hs4n4d9q96r7wqlyxp6mc9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"}, "40": {"version": "18", "sha256": "1k79mlsck0j3phq59cmg5y5cs1ma1hs4n4d9q96r7wqlyxp6mc9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"}, "41": {"version": "18", "sha256": "1k79mlsck0j3phq59cmg5y5cs1ma1hs4n4d9q96r7wqlyxp6mc9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"}, "42": {"version": "18", "sha256": "1k79mlsck0j3phq59cmg5y5cs1ma1hs4n4d9q96r7wqlyxp6mc9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"}, "43": {"version": "18", "sha256": "1k79mlsck0j3phq59cmg5y5cs1ma1hs4n4d9q96r7wqlyxp6mc9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"}}} , {"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": "13", "sha256": "11gpqcgwr5mhcxqfv5f5wp1ppryf5fn1f4rcfgwfc1hqha59qssh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "11gpqcgwr5mhcxqfv5f5wp1ppryf5fn1f4rcfgwfc1hqha59qssh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "11gpqcgwr5mhcxqfv5f5wp1ppryf5fn1f4rcfgwfc1hqha59qssh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "13", "sha256": "11gpqcgwr5mhcxqfv5f5wp1ppryf5fn1f4rcfgwfc1hqha59qssh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} -, {"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": "14", "sha256": "0jl37l0nzj29hzak06jlv7qvdji77xyda1wy0qb5p1j3n32x6xzf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "40": {"version": "14", "sha256": "0jl37l0nzj29hzak06jlv7qvdji77xyda1wy0qb5p1j3n32x6xzf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "0jl37l0nzj29hzak06jlv7qvdji77xyda1wy0qb5p1j3n32x6xzf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "14", "sha256": "0jl37l0nzj29hzak06jlv7qvdji77xyda1wy0qb5p1j3n32x6xzf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "43": {"version": "14", "sha256": "0jl37l0nzj29hzak06jlv7qvdji77xyda1wy0qb5p1j3n32x6xzf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} +, {"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": "14", "sha256": "1z47lp7c5d0r4qzbfppnycy85xzlxig5m5kvl55shdi4mqjb56kj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "1z47lp7c5d0r4qzbfppnycy85xzlxig5m5kvl55shdi4mqjb56kj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "14", "sha256": "1z47lp7c5d0r4qzbfppnycy85xzlxig5m5kvl55shdi4mqjb56kj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "43": {"version": "14", "sha256": "1z47lp7c5d0r4qzbfppnycy85xzlxig5m5kvl55shdi4mqjb56kj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} +, {"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": "16", "sha256": "1g56fvxz8crjxy64l6dxa4ra0ni3bn3wwayy16yh1l6wcfsq9632", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "40": {"version": "16", "sha256": "1g56fvxz8crjxy64l6dxa4ra0ni3bn3wwayy16yh1l6wcfsq9632", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "41": {"version": "16", "sha256": "1g56fvxz8crjxy64l6dxa4ra0ni3bn3wwayy16yh1l6wcfsq9632", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "42": {"version": "16", "sha256": "1g56fvxz8crjxy64l6dxa4ra0ni3bn3wwayy16yh1l6wcfsq9632", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "43": {"version": "16", "sha256": "1g56fvxz8crjxy64l6dxa4ra0ni3bn3wwayy16yh1l6wcfsq9632", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE2Cn0="}}} , {"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": {"40": {"version": "16", "sha256": "0xxlvifdkd9x0kgzrrvg3abgmgklzcy3bfs1x634myjbh5y13ws2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2VudGU3Ni9ndWlsbG90aW5lLyIsCiAgInV1aWQiOiAiZ3VpbGxvdGluZUBmb3Bkb29kbGUubmV0IiwKICAidmVyc2lvbiI6IDE2Cn0="}, "41": {"version": "16", "sha256": "0xxlvifdkd9x0kgzrrvg3abgmgklzcy3bfs1x634myjbh5y13ws2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2VudGU3Ni9ndWlsbG90aW5lLyIsCiAgInV1aWQiOiAiZ3VpbGxvdGluZUBmb3Bkb29kbGUubmV0IiwKICAidmVyc2lvbiI6IDE2Cn0="}, "42": {"version": "16", "sha256": "0xxlvifdkd9x0kgzrrvg3abgmgklzcy3bfs1x634myjbh5y13ws2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2VudGU3Ni9ndWlsbG90aW5lLyIsCiAgInV1aWQiOiAiZ3VpbGxvdGluZUBmb3Bkb29kbGUubmV0IiwKICAidmVyc2lvbiI6IDE2Cn0="}, "43": {"version": "16", "sha256": "0xxlvifdkd9x0kgzrrvg3abgmgklzcy3bfs1x634myjbh5y13ws2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2VudGU3Ni9ndWlsbG90aW5lLyIsCiAgInV1aWQiOiAiZ3VpbGxvdGluZUBmb3Bkb29kbGUubmV0IiwKICAidmVyc2lvbiI6IDE2Cn0="}}} , {"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"}, "43": {"version": "23", "sha256": "1nsjpjjsllrdh2k6v9h06xm656b5dbq2vpxs7kqn4p7l8b0ycav4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAyMwp9"}}} , {"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": "4", "sha256": "18iy39i5i8ii2salpxnyin0bwfckl6kp2fzkkij3fqd0pga1frix", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICIyNTU1ZGNhYjYxZTZiODBhZGFiYjM2NDM5MzEwMmY5MGU3MzhiOTRmIiwKICAiZGVzY3JpcHRpb24iOiAiVHVybnMgb2ZmIG5vdGlmaWNhdGlvbnMgd2hpbGUgc2hhcmluZyBzY3JlZW4gZHVyaW5nIGEgWm9vbSBjYWxsIiwKICAibmFtZSI6ICJaaWxlbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcGFua293c2tpL3ppbGVuY2UiLAogICJ1dWlkIjogInppbGVuY2VAYXBhbmtvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "18iy39i5i8ii2salpxnyin0bwfckl6kp2fzkkij3fqd0pga1frix", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICIyNTU1ZGNhYjYxZTZiODBhZGFiYjM2NDM5MzEwMmY5MGU3MzhiOTRmIiwKICAiZGVzY3JpcHRpb24iOiAiVHVybnMgb2ZmIG5vdGlmaWNhdGlvbnMgd2hpbGUgc2hhcmluZyBzY3JlZW4gZHVyaW5nIGEgWm9vbSBjYWxsIiwKICAibmFtZSI6ICJaaWxlbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcGFua293c2tpL3ppbGVuY2UiLAogICJ1dWlkIjogInppbGVuY2VAYXBhbmtvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "18iy39i5i8ii2salpxnyin0bwfckl6kp2fzkkij3fqd0pga1frix", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICIyNTU1ZGNhYjYxZTZiODBhZGFiYjM2NDM5MzEwMmY5MGU3MzhiOTRmIiwKICAiZGVzY3JpcHRpb24iOiAiVHVybnMgb2ZmIG5vdGlmaWNhdGlvbnMgd2hpbGUgc2hhcmluZyBzY3JlZW4gZHVyaW5nIGEgWm9vbSBjYWxsIiwKICAibmFtZSI6ICJaaWxlbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcGFua293c2tpL3ppbGVuY2UiLAogICJ1dWlkIjogInppbGVuY2VAYXBhbmtvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"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": "26", "sha256": "07p56424nlhcs8rmbxyywc86jvhrr83hwzs1xq4jv338kiprp04j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "40": {"version": "26", "sha256": "07p56424nlhcs8rmbxyywc86jvhrr83hwzs1xq4jv338kiprp04j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "41": {"version": "26", "sha256": "07p56424nlhcs8rmbxyywc86jvhrr83hwzs1xq4jv338kiprp04j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "42": {"version": "28", "sha256": "0w53wwjkg8vdisrpazb7k6m34jsf4ajhqrdszw5rnw2xy5yy6jwg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"}, "43": {"version": "28", "sha256": "0w53wwjkg8vdisrpazb7k6m34jsf4ajhqrdszw5rnw2xy5yy6jwg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"}}} -, {"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": "9", "sha256": "15myjlkxdpypxdcrf7y81gr4k8y9h8qw7icdc4xyix9wsdpk70bj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDkKfQ=="}, "40": {"version": "9", "sha256": "15myjlkxdpypxdcrf7y81gr4k8y9h8qw7icdc4xyix9wsdpk70bj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "15myjlkxdpypxdcrf7y81gr4k8y9h8qw7icdc4xyix9wsdpk70bj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "15myjlkxdpypxdcrf7y81gr4k8y9h8qw7icdc4xyix9wsdpk70bj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "15myjlkxdpypxdcrf7y81gr4k8y9h8qw7icdc4xyix9wsdpk70bj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDkKfQ=="}}} +, {"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": "26", "sha256": "07p56424nlhcs8rmbxyywc86jvhrr83hwzs1xq4jv338kiprp04j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "40": {"version": "26", "sha256": "07p56424nlhcs8rmbxyywc86jvhrr83hwzs1xq4jv338kiprp04j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "41": {"version": "26", "sha256": "07p56424nlhcs8rmbxyywc86jvhrr83hwzs1xq4jv338kiprp04j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "42": {"version": "29", "sha256": "040v90gk5j89zbfcc6nh9xkhk1amj8898pqd8wjybcnxwbf12wfn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "43": {"version": "29", "sha256": "040v90gk5j89zbfcc6nh9xkhk1amj8898pqd8wjybcnxwbf12wfn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"}}} +, {"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": "11", "sha256": "1zhps3jb7wgalssdxncifn9ksf2kd236h5wznqxn0hn58fq0gvcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "1zhps3jb7wgalssdxncifn9ksf2kd236h5wznqxn0hn58fq0gvcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "1zhps3jb7wgalssdxncifn9ksf2kd236h5wznqxn0hn58fq0gvcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "1zhps3jb7wgalssdxncifn9ksf2kd236h5wznqxn0hn58fq0gvcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "11", "sha256": "1zhps3jb7wgalssdxncifn9ksf2kd236h5wznqxn0hn58fq0gvcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"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=="}, "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": "6", "sha256": "0qil706632ff90f2m9fc1a2zlrsiyjzx56b8xxxv7f0jdj08rp1n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktpdHNjaCBpcyBhIGNvbGxlY3Rpb24gb2YgY2hlYXAsIHBvcHVsYXIsIGFuZCBtYXJrZXRhYmxlIGltcHJvdmVtZW50cyB0byBHbm9tZS4gT25lIGNvdWxkIGNvbnNpZGVyIGl0IGFwcGx5aW5nIGEgY29zbWV0aWMgc3VyZ2VyeSB0byBHbm9tZS5cblxuS2l0c2NoIGNhbiBlYXNpbHkgYmUgY29uZmlndXJlZCBhbmQgb2ZmZXJzIHRoZSBmb2xsb3dpbmcgZmVhdHVyZXM6XG4tIHJlbW92ZSBhcHBsaWNhdGlvbiBtZW51IGZyb20gdGhlIHRvcCBiYXJcbi0gcmVtb3ZlIHRoZSBhY3Rpdml0eSBidXR0b24gZnJvbSB0aGUgdG9wIGJhclxuLSBwZXJpb2RpY2FsbHkgY2hhbmdlIHRoZSBiYWNrZ3JvdW5kIHBpY3R1cmVcblxuVGhpcyBleHRlbnNpb24gZG9lcyBub3QgY29tZSB3aXRoIGFueSBidXR0b24gb24gdGhlIHBhbmVsLiBWaXNpdCB0aGUgd2Vic2l0ZSBmb3IgYSBkb2N1bWVudGF0aW9uLiIsCiAgIm5hbWUiOiAiS2l0c2NoIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtpdHNjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VudGU3Ni9raXRzY2gvIiwKICAidXVpZCI6ICJraXRzY2hAZm9wZG9vZGxlLm5ldCIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "0qil706632ff90f2m9fc1a2zlrsiyjzx56b8xxxv7f0jdj08rp1n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktpdHNjaCBpcyBhIGNvbGxlY3Rpb24gb2YgY2hlYXAsIHBvcHVsYXIsIGFuZCBtYXJrZXRhYmxlIGltcHJvdmVtZW50cyB0byBHbm9tZS4gT25lIGNvdWxkIGNvbnNpZGVyIGl0IGFwcGx5aW5nIGEgY29zbWV0aWMgc3VyZ2VyeSB0byBHbm9tZS5cblxuS2l0c2NoIGNhbiBlYXNpbHkgYmUgY29uZmlndXJlZCBhbmQgb2ZmZXJzIHRoZSBmb2xsb3dpbmcgZmVhdHVyZXM6XG4tIHJlbW92ZSBhcHBsaWNhdGlvbiBtZW51IGZyb20gdGhlIHRvcCBiYXJcbi0gcmVtb3ZlIHRoZSBhY3Rpdml0eSBidXR0b24gZnJvbSB0aGUgdG9wIGJhclxuLSBwZXJpb2RpY2FsbHkgY2hhbmdlIHRoZSBiYWNrZ3JvdW5kIHBpY3R1cmVcblxuVGhpcyBleHRlbnNpb24gZG9lcyBub3QgY29tZSB3aXRoIGFueSBidXR0b24gb24gdGhlIHBhbmVsLiBWaXNpdCB0aGUgd2Vic2l0ZSBmb3IgYSBkb2N1bWVudGF0aW9uLiIsCiAgIm5hbWUiOiAiS2l0c2NoIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtpdHNjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VudGU3Ni9raXRzY2gvIiwKICAidXVpZCI6ICJraXRzY2hAZm9wZG9vZGxlLm5ldCIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "0qil706632ff90f2m9fc1a2zlrsiyjzx56b8xxxv7f0jdj08rp1n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktpdHNjaCBpcyBhIGNvbGxlY3Rpb24gb2YgY2hlYXAsIHBvcHVsYXIsIGFuZCBtYXJrZXRhYmxlIGltcHJvdmVtZW50cyB0byBHbm9tZS4gT25lIGNvdWxkIGNvbnNpZGVyIGl0IGFwcGx5aW5nIGEgY29zbWV0aWMgc3VyZ2VyeSB0byBHbm9tZS5cblxuS2l0c2NoIGNhbiBlYXNpbHkgYmUgY29uZmlndXJlZCBhbmQgb2ZmZXJzIHRoZSBmb2xsb3dpbmcgZmVhdHVyZXM6XG4tIHJlbW92ZSBhcHBsaWNhdGlvbiBtZW51IGZyb20gdGhlIHRvcCBiYXJcbi0gcmVtb3ZlIHRoZSBhY3Rpdml0eSBidXR0b24gZnJvbSB0aGUgdG9wIGJhclxuLSBwZXJpb2RpY2FsbHkgY2hhbmdlIHRoZSBiYWNrZ3JvdW5kIHBpY3R1cmVcblxuVGhpcyBleHRlbnNpb24gZG9lcyBub3QgY29tZSB3aXRoIGFueSBidXR0b24gb24gdGhlIHBhbmVsLiBWaXNpdCB0aGUgd2Vic2l0ZSBmb3IgYSBkb2N1bWVudGF0aW9uLiIsCiAgIm5hbWUiOiAiS2l0c2NoIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtpdHNjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VudGU3Ni9raXRzY2gvIiwKICAidXVpZCI6ICJraXRzY2hAZm9wZG9vZGxlLm5ldCIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"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"}, "42": {"version": "13", "sha256": "0j23i2gl956r2wffqky5vg6ca24gn3hkibhrhsvkqd87g90cjdq6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlc2t0b3AtbHlyaWMiLAogICJuYW1lIjogIkRlc2t0b3AgTHlyaWMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVza3RvcC1seXJpYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2Rlc2t0b3AtbHlyaWMiLAogICJ1dWlkIjogImRlc2t0b3AtbHlyaWNAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxMwp9"}, "43": {"version": "14", "sha256": "0aadysrcxb5jradbrf95cb6xd1gj9kms4f9nvrgjiimgymsbwygv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlc2t0b3AtbHlyaWMiLAogICJuYW1lIjogIkRlc2t0b3AgTHlyaWMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVza3RvcC1seXJpYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2Rlc2t0b3AtbHlyaWMiLAogICJ1dWlkIjogImRlc2t0b3AtbHlyaWNAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxNAp9"}}} +, {"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"}, "43": {"version": "16", "sha256": "1frahic00q1dqi27vbxw8y0dz1qcfd99m1kzha1r8pyfgwd22fqv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlc2t0b3AtbHlyaWMiLAogICJuYW1lIjogIkRlc2t0b3AgTHlyaWMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVza3RvcC1seXJpYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2Rlc2t0b3AtbHlyaWMiLAogICJ1dWlkIjogImRlc2t0b3AtbHlyaWNAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxNgp9"}}} , {"uuid": "alttab-mod@leleat-on-github", "name": "AltTab Mod", "pname": "alttab-mod", "description": "Add some QoL changes to the App Switcher (Alt/Super+Tab)...\n- use `WASD`, `hjkl` or the arrow keys for navigation\n- `Q` only closes the selected window instead of the entire app\n- only raise the first window instead of every instance\n- optionally: only show windows from the current workspace\n- optionally: only show windows from the current monitor\n- optionally: remove the App Switcher's delayed appearance", "link": "https://extensions.gnome.org/extension/4007/alttab-mod/", "shell_version_map": {"38": {"version": "6", "sha256": "1010nmdyga6lqk78vlc9r02h3kcgimlvamb7xhp5vw7i71gay4jv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzb21lIFFvTCBjaGFuZ2VzIHRvIHRoZSBBcHAgU3dpdGNoZXIgKEFsdC9TdXBlcitUYWIpLi4uXG4tIHVzZSBgV0FTRGAsIGBoamtsYCBvciB0aGUgYXJyb3cga2V5cyBmb3IgbmF2aWdhdGlvblxuLSBgUWAgb25seSBjbG9zZXMgdGhlIHNlbGVjdGVkIHdpbmRvdyBpbnN0ZWFkIG9mIHRoZSBlbnRpcmUgYXBwXG4tIG9ubHkgcmFpc2UgdGhlIGZpcnN0IHdpbmRvdyBpbnN0ZWFkIG9mIGV2ZXJ5IGluc3RhbmNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgd29ya3NwYWNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvclxuLSBvcHRpb25hbGx5OiByZW1vdmUgdGhlIEFwcCBTd2l0Y2hlcidzIGRlbGF5ZWQgYXBwZWFyYW5jZSIsCiAgIm5hbWUiOiAiQWx0VGFiIE1vZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVsZWF0L0FsdFRhYi1Nb2QiLAogICJ1dWlkIjogImFsdHRhYi1tb2RAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "7", "sha256": "1kxrjyhqh0f1dc21sv0y0hq852nrh5sxjamqn54vjki9k4jqpw0m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzb21lIFFvTCBjaGFuZ2VzIHRvIHRoZSBBcHAgU3dpdGNoZXIgKEFsdC9TdXBlcitUYWIpLi4uXG4tIHVzZSBgV0FTRGAsIGBoamtsYCBvciB0aGUgYXJyb3cga2V5cyBmb3IgbmF2aWdhdGlvblxuLSBgUWAgb25seSBjbG9zZXMgdGhlIHNlbGVjdGVkIHdpbmRvdyBpbnN0ZWFkIG9mIHRoZSBlbnRpcmUgYXBwXG4tIG9ubHkgcmFpc2UgdGhlIGZpcnN0IHdpbmRvdyBpbnN0ZWFkIG9mIGV2ZXJ5IGluc3RhbmNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgd29ya3NwYWNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvclxuLSBvcHRpb25hbGx5OiByZW1vdmUgdGhlIEFwcCBTd2l0Y2hlcidzIGRlbGF5ZWQgYXBwZWFyYW5jZSIsCiAgIm5hbWUiOiAiQWx0VGFiIE1vZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHRUYWItbW9kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvQWx0VGFiLU1vZCIsCiAgInV1aWQiOiAiYWx0dGFiLW1vZEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "1kxrjyhqh0f1dc21sv0y0hq852nrh5sxjamqn54vjki9k4jqpw0m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzb21lIFFvTCBjaGFuZ2VzIHRvIHRoZSBBcHAgU3dpdGNoZXIgKEFsdC9TdXBlcitUYWIpLi4uXG4tIHVzZSBgV0FTRGAsIGBoamtsYCBvciB0aGUgYXJyb3cga2V5cyBmb3IgbmF2aWdhdGlvblxuLSBgUWAgb25seSBjbG9zZXMgdGhlIHNlbGVjdGVkIHdpbmRvdyBpbnN0ZWFkIG9mIHRoZSBlbnRpcmUgYXBwXG4tIG9ubHkgcmFpc2UgdGhlIGZpcnN0IHdpbmRvdyBpbnN0ZWFkIG9mIGV2ZXJ5IGluc3RhbmNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgd29ya3NwYWNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvclxuLSBvcHRpb25hbGx5OiByZW1vdmUgdGhlIEFwcCBTd2l0Y2hlcidzIGRlbGF5ZWQgYXBwZWFyYW5jZSIsCiAgIm5hbWUiOiAiQWx0VGFiIE1vZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHRUYWItbW9kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvQWx0VGFiLU1vZCIsCiAgInV1aWQiOiAiYWx0dGFiLW1vZEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "9", "sha256": "0pncb2rd3yqrj3qs5c83xlpibb7y6i6jc5c6pdjsa6hwmifrmp5r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzb21lIFFvTCBjaGFuZ2VzIHRvIHRoZSBBcHAgU3dpdGNoZXIgKEFsdC9TdXBlcitUYWIpLi4uXG4tIHVzZSBgV0FTRGAsIGBoamtsYCBvciB0aGUgYXJyb3cga2V5cyBmb3IgbmF2aWdhdGlvblxuLSBgUWAgb25seSBjbG9zZXMgdGhlIHNlbGVjdGVkIHdpbmRvdyBpbnN0ZWFkIG9mIHRoZSBlbnRpcmUgYXBwXG4tIG9ubHkgcmFpc2UgdGhlIGZpcnN0IHdpbmRvdyBpbnN0ZWFkIG9mIGV2ZXJ5IGluc3RhbmNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgd29ya3NwYWNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvclxuLSBvcHRpb25hbGx5OiByZW1vdmUgdGhlIEFwcCBTd2l0Y2hlcidzIGRlbGF5ZWQgYXBwZWFyYW5jZSIsCiAgIm5hbWUiOiAiQWx0VGFiIE1vZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHRUYWItbW9kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvQWx0VGFiLU1vZCIsCiAgInV1aWQiOiAiYWx0dGFiLW1vZEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "0pncb2rd3yqrj3qs5c83xlpibb7y6i6jc5c6pdjsa6hwmifrmp5r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzb21lIFFvTCBjaGFuZ2VzIHRvIHRoZSBBcHAgU3dpdGNoZXIgKEFsdC9TdXBlcitUYWIpLi4uXG4tIHVzZSBgV0FTRGAsIGBoamtsYCBvciB0aGUgYXJyb3cga2V5cyBmb3IgbmF2aWdhdGlvblxuLSBgUWAgb25seSBjbG9zZXMgdGhlIHNlbGVjdGVkIHdpbmRvdyBpbnN0ZWFkIG9mIHRoZSBlbnRpcmUgYXBwXG4tIG9ubHkgcmFpc2UgdGhlIGZpcnN0IHdpbmRvdyBpbnN0ZWFkIG9mIGV2ZXJ5IGluc3RhbmNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgd29ya3NwYWNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvclxuLSBvcHRpb25hbGx5OiByZW1vdmUgdGhlIEFwcCBTd2l0Y2hlcidzIGRlbGF5ZWQgYXBwZWFyYW5jZSIsCiAgIm5hbWUiOiAiQWx0VGFiIE1vZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHRUYWItbW9kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvQWx0VGFiLU1vZCIsCiAgInV1aWQiOiAiYWx0dGFiLW1vZEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"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;'\n", "link": "https://extensions.gnome.org/extension/4012/gnome-bedtime/", "shell_version_map": {"38": {"version": "10", "sha256": "0biakzi3szz2czl6mdhacysq4apz3pslxqi9hhp6lyp1hnch7jll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiZWR0aW1lLW1vZGUiLAogICJuYW1lIjogIkJlZHRpbWUgTW9kZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "0biakzi3szz2czl6mdhacysq4apz3pslxqi9hhp6lyp1hnch7jll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiZWR0aW1lLW1vZGUiLAogICJuYW1lIjogIkJlZHRpbWUgTW9kZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "0biakzi3szz2czl6mdhacysq4apz3pslxqi9hhp6lyp1hnch7jll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiZWR0aW1lLW1vZGUiLAogICJuYW1lIjogIkJlZHRpbWUgTW9kZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "42": {"version": "10", "sha256": "0biakzi3szz2czl6mdhacysq4apz3pslxqi9hhp6lyp1hnch7jll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiZWR0aW1lLW1vZGUiLAogICJuYW1lIjogIkJlZHRpbWUgTW9kZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "43": {"version": "11", "sha256": "06gc9wdkjbdmy4jl862pnza0q3j84pd1qwarvdqqxnnw250rgfdm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiZWR0aW1lLW1vZGUiLAogICJuYW1lIjogIkJlZHRpbWUgTW9kZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW9udXRib3J0aXMvZ25vbWUtYmVkdGltZS1tb2RlIiwKICAidXVpZCI6ICJnbm9tZWJlZHRpbWVAaW9udXRib3J0aXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}}} -, {"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": "15", "sha256": "0l2xwl7fca9br9b7vsn9mxr3cz40v0jg79sa9294cxl2xx7v7i6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgU3BvdGlmeSBmcm9tIHRoZSB0b3BiYXIhXG5cbkNyZWRpdCB0byBNYXJjdXMgSGVpbmUgKGh0dHBzOi8vZ2l0aHViLmNvbS9taGVpbmUpIGZvciBtb3N0IG9mIHRoZSBjb2RlIGluIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiU3BvdGlmeSBDb250cm9sbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbGxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tvb2xza2F0ZWd1eTg5L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zcG90aWZ5LWNvbnRyb2xsZXIiLAogICJ1dWlkIjogInNwb3RpZnktY29udHJvbGxlckBrb29sc2thdGVndXk4OSIsCiAgInZlcnNpb24iOiAxNQp9"}, "40": {"version": "15", "sha256": "0l2xwl7fca9br9b7vsn9mxr3cz40v0jg79sa9294cxl2xx7v7i6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgU3BvdGlmeSBmcm9tIHRoZSB0b3BiYXIhXG5cbkNyZWRpdCB0byBNYXJjdXMgSGVpbmUgKGh0dHBzOi8vZ2l0aHViLmNvbS9taGVpbmUpIGZvciBtb3N0IG9mIHRoZSBjb2RlIGluIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiU3BvdGlmeSBDb250cm9sbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbGxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tvb2xza2F0ZWd1eTg5L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zcG90aWZ5LWNvbnRyb2xsZXIiLAogICJ1dWlkIjogInNwb3RpZnktY29udHJvbGxlckBrb29sc2thdGVndXk4OSIsCiAgInZlcnNpb24iOiAxNQp9"}, "41": {"version": "15", "sha256": "0l2xwl7fca9br9b7vsn9mxr3cz40v0jg79sa9294cxl2xx7v7i6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgU3BvdGlmeSBmcm9tIHRoZSB0b3BiYXIhXG5cbkNyZWRpdCB0byBNYXJjdXMgSGVpbmUgKGh0dHBzOi8vZ2l0aHViLmNvbS9taGVpbmUpIGZvciBtb3N0IG9mIHRoZSBjb2RlIGluIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiU3BvdGlmeSBDb250cm9sbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbGxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tvb2xza2F0ZWd1eTg5L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zcG90aWZ5LWNvbnRyb2xsZXIiLAogICJ1dWlkIjogInNwb3RpZnktY29udHJvbGxlckBrb29sc2thdGVndXk4OSIsCiAgInZlcnNpb24iOiAxNQp9"}, "42": {"version": "15", "sha256": "0l2xwl7fca9br9b7vsn9mxr3cz40v0jg79sa9294cxl2xx7v7i6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgU3BvdGlmeSBmcm9tIHRoZSB0b3BiYXIhXG5cbkNyZWRpdCB0byBNYXJjdXMgSGVpbmUgKGh0dHBzOi8vZ2l0aHViLmNvbS9taGVpbmUpIGZvciBtb3N0IG9mIHRoZSBjb2RlIGluIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiU3BvdGlmeSBDb250cm9sbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbGxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tvb2xza2F0ZWd1eTg5L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zcG90aWZ5LWNvbnRyb2xsZXIiLAogICJ1dWlkIjogInNwb3RpZnktY29udHJvbGxlckBrb29sc2thdGVndXk4OSIsCiAgInZlcnNpb24iOiAxNQp9"}}} +, {"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 a Quick Settings toggle to manually enable/disable 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": "12", "sha256": "0mgbp0ksd1y45zkp96lbr9h55v7q577h32nyb0vwi0l1pw10ffz2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIGEgUXVpY2sgU2V0dGluZ3MgdG9nZ2xlIHRvIG1hbnVhbGx5IGVuYWJsZS9kaXNhYmxlIHRoZSBtb2RlXG4tIENvbnRyb2wgdGhlIE9uIERlbWFuZCBidXR0b24gdmlzaWJpbGl0eSwgYXBwZWFyYW5jZSBhbmQgcG9zaXRpb24gaW4gVG9wIEJhclxuLSBDaG9vc2UgYW5vdGhlciBjb2xvciBwcmVzZXQgYW5kIGludGVuc2l0eSwgaWYgeW91IHByZWZlciBhIGRpZmZlcmVudCBjb2xvciBzY2hlbWVcbi0gQ2hhbmdlIGNvbG9yIGludGVuc2l0eSBvbiB0aGUgZmx5IGJ5IHNjcm9sbGluZyBvdmVyIHRoZSBPbiBEZW1hbmQgYnV0dG9uIGluIFRvcCBCYXJcblxuTXVsdGkgbGFuZ3VhZ2Ugc3VwcG9ydCBpcyBhbHNvIGF2YWlsYWJsZSwgcGxlYXNlIGNoZWNrIHRoZSBHaXRIdWIgcGFnZSBpZiB5b3Ugd2FudCB0byBoZWxwIHdpdGggdGhlIHRyYW5zbGF0aW9ucy4gU28gZmFyLCB0aGUgZXh0ZW5zaW9uIGlzIGZ1bGx5IHRyYW5zbGF0ZWQgdG8gU3BhbmlzaCwgRHV0Y2gsIEdlcm1hbiwgUm9tYW5pYW4gYW5kIEVuZ2xpc2guXG5cbklmIHlvdSB3YW50IHRvIHVzZSBhIGtleWJvYXJkIHNob3J0Y3V0IGluIG9yZGVyIHRvIHRvZ2dsZSB0aGUgQmVkdGltZSBNb2RlIHRoZW4geW91IGNhbiB1c2UgdGhpcyBjb21tYW5kIGZvciB0aGUgc2hvcnRjdXQ6XG5cbmJhc2ggLWMgJ3NjaGVtYV9pZD1vcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGU7IHNjaGVtYV9kaXI9fi8ubG9jYWwvc2hhcmUvZ25vbWUtc2hlbGwvZXh0ZW5zaW9ucy9nbm9tZWJlZHRpbWVAaW9udXRib3J0aXMuZ21haWwuY29tL3NjaGVtYXMvOyBpZiBbWyAkKGdzZXR0aW5ncyAtLXNjaGVtYWRpciAkc2NoZW1hX2RpciBnZXQgJHNjaGVtYV9pZCBiZWR0aW1lLW1vZGUtYWN0aXZlKSA9PSBcInRydWVcIiBdXTsgdGhlbiB0dXJuX29uPWZhbHNlOyBlbHNlIHR1cm5fb249dHJ1ZTsgZmk7IGdzZXR0aW5ncyAtLXNjaGVtYWRpciAkc2NoZW1hX2RpciBzZXQgJHNjaGVtYV9pZCBiZWR0aW1lLW1vZGUtYWN0aXZlICR0dXJuX29uOydcbiIsCiAgImdldHRleHQtZG9tYWluIjogImJlZHRpbWUtbW9kZSIsCiAgIm5hbWUiOiAiQmVkdGltZSBNb2RlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJlZHRpbWUtbW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lvbnV0Ym9ydGlzL2dub21lLWJlZHRpbWUtbW9kZSIsCiAgInV1aWQiOiAiZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "0mgbp0ksd1y45zkp96lbr9h55v7q577h32nyb0vwi0l1pw10ffz2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIGEgUXVpY2sgU2V0dGluZ3MgdG9nZ2xlIHRvIG1hbnVhbGx5IGVuYWJsZS9kaXNhYmxlIHRoZSBtb2RlXG4tIENvbnRyb2wgdGhlIE9uIERlbWFuZCBidXR0b24gdmlzaWJpbGl0eSwgYXBwZWFyYW5jZSBhbmQgcG9zaXRpb24gaW4gVG9wIEJhclxuLSBDaG9vc2UgYW5vdGhlciBjb2xvciBwcmVzZXQgYW5kIGludGVuc2l0eSwgaWYgeW91IHByZWZlciBhIGRpZmZlcmVudCBjb2xvciBzY2hlbWVcbi0gQ2hhbmdlIGNvbG9yIGludGVuc2l0eSBvbiB0aGUgZmx5IGJ5IHNjcm9sbGluZyBvdmVyIHRoZSBPbiBEZW1hbmQgYnV0dG9uIGluIFRvcCBCYXJcblxuTXVsdGkgbGFuZ3VhZ2Ugc3VwcG9ydCBpcyBhbHNvIGF2YWlsYWJsZSwgcGxlYXNlIGNoZWNrIHRoZSBHaXRIdWIgcGFnZSBpZiB5b3Ugd2FudCB0byBoZWxwIHdpdGggdGhlIHRyYW5zbGF0aW9ucy4gU28gZmFyLCB0aGUgZXh0ZW5zaW9uIGlzIGZ1bGx5IHRyYW5zbGF0ZWQgdG8gU3BhbmlzaCwgRHV0Y2gsIEdlcm1hbiwgUm9tYW5pYW4gYW5kIEVuZ2xpc2guXG5cbklmIHlvdSB3YW50IHRvIHVzZSBhIGtleWJvYXJkIHNob3J0Y3V0IGluIG9yZGVyIHRvIHRvZ2dsZSB0aGUgQmVkdGltZSBNb2RlIHRoZW4geW91IGNhbiB1c2UgdGhpcyBjb21tYW5kIGZvciB0aGUgc2hvcnRjdXQ6XG5cbmJhc2ggLWMgJ3NjaGVtYV9pZD1vcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGU7IHNjaGVtYV9kaXI9fi8ubG9jYWwvc2hhcmUvZ25vbWUtc2hlbGwvZXh0ZW5zaW9ucy9nbm9tZWJlZHRpbWVAaW9udXRib3J0aXMuZ21haWwuY29tL3NjaGVtYXMvOyBpZiBbWyAkKGdzZXR0aW5ncyAtLXNjaGVtYWRpciAkc2NoZW1hX2RpciBnZXQgJHNjaGVtYV9pZCBiZWR0aW1lLW1vZGUtYWN0aXZlKSA9PSBcInRydWVcIiBdXTsgdGhlbiB0dXJuX29uPWZhbHNlOyBlbHNlIHR1cm5fb249dHJ1ZTsgZmk7IGdzZXR0aW5ncyAtLXNjaGVtYWRpciAkc2NoZW1hX2RpciBzZXQgJHNjaGVtYV9pZCBiZWR0aW1lLW1vZGUtYWN0aXZlICR0dXJuX29uOydcbiIsCiAgImdldHRleHQtZG9tYWluIjogImJlZHRpbWUtbW9kZSIsCiAgIm5hbWUiOiAiQmVkdGltZSBNb2RlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJlZHRpbWUtbW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lvbnV0Ym9ydGlzL2dub21lLWJlZHRpbWUtbW9kZSIsCiAgInV1aWQiOiAiZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "0mgbp0ksd1y45zkp96lbr9h55v7q577h32nyb0vwi0l1pw10ffz2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIGEgUXVpY2sgU2V0dGluZ3MgdG9nZ2xlIHRvIG1hbnVhbGx5IGVuYWJsZS9kaXNhYmxlIHRoZSBtb2RlXG4tIENvbnRyb2wgdGhlIE9uIERlbWFuZCBidXR0b24gdmlzaWJpbGl0eSwgYXBwZWFyYW5jZSBhbmQgcG9zaXRpb24gaW4gVG9wIEJhclxuLSBDaG9vc2UgYW5vdGhlciBjb2xvciBwcmVzZXQgYW5kIGludGVuc2l0eSwgaWYgeW91IHByZWZlciBhIGRpZmZlcmVudCBjb2xvciBzY2hlbWVcbi0gQ2hhbmdlIGNvbG9yIGludGVuc2l0eSBvbiB0aGUgZmx5IGJ5IHNjcm9sbGluZyBvdmVyIHRoZSBPbiBEZW1hbmQgYnV0dG9uIGluIFRvcCBCYXJcblxuTXVsdGkgbGFuZ3VhZ2Ugc3VwcG9ydCBpcyBhbHNvIGF2YWlsYWJsZSwgcGxlYXNlIGNoZWNrIHRoZSBHaXRIdWIgcGFnZSBpZiB5b3Ugd2FudCB0byBoZWxwIHdpdGggdGhlIHRyYW5zbGF0aW9ucy4gU28gZmFyLCB0aGUgZXh0ZW5zaW9uIGlzIGZ1bGx5IHRyYW5zbGF0ZWQgdG8gU3BhbmlzaCwgRHV0Y2gsIEdlcm1hbiwgUm9tYW5pYW4gYW5kIEVuZ2xpc2guXG5cbklmIHlvdSB3YW50IHRvIHVzZSBhIGtleWJvYXJkIHNob3J0Y3V0IGluIG9yZGVyIHRvIHRvZ2dsZSB0aGUgQmVkdGltZSBNb2RlIHRoZW4geW91IGNhbiB1c2UgdGhpcyBjb21tYW5kIGZvciB0aGUgc2hvcnRjdXQ6XG5cbmJhc2ggLWMgJ3NjaGVtYV9pZD1vcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGU7IHNjaGVtYV9kaXI9fi8ubG9jYWwvc2hhcmUvZ25vbWUtc2hlbGwvZXh0ZW5zaW9ucy9nbm9tZWJlZHRpbWVAaW9udXRib3J0aXMuZ21haWwuY29tL3NjaGVtYXMvOyBpZiBbWyAkKGdzZXR0aW5ncyAtLXNjaGVtYWRpciAkc2NoZW1hX2RpciBnZXQgJHNjaGVtYV9pZCBiZWR0aW1lLW1vZGUtYWN0aXZlKSA9PSBcInRydWVcIiBdXTsgdGhlbiB0dXJuX29uPWZhbHNlOyBlbHNlIHR1cm5fb249dHJ1ZTsgZmk7IGdzZXR0aW5ncyAtLXNjaGVtYWRpciAkc2NoZW1hX2RpciBzZXQgJHNjaGVtYV9pZCBiZWR0aW1lLW1vZGUtYWN0aXZlICR0dXJuX29uOydcbiIsCiAgImdldHRleHQtZG9tYWluIjogImJlZHRpbWUtbW9kZSIsCiAgIm5hbWUiOiAiQmVkdGltZSBNb2RlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJlZHRpbWUtbW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lvbnV0Ym9ydGlzL2dub21lLWJlZHRpbWUtbW9kZSIsCiAgInV1aWQiOiAiZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "42": {"version": "12", "sha256": "0mgbp0ksd1y45zkp96lbr9h55v7q577h32nyb0vwi0l1pw10ffz2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIGEgUXVpY2sgU2V0dGluZ3MgdG9nZ2xlIHRvIG1hbnVhbGx5IGVuYWJsZS9kaXNhYmxlIHRoZSBtb2RlXG4tIENvbnRyb2wgdGhlIE9uIERlbWFuZCBidXR0b24gdmlzaWJpbGl0eSwgYXBwZWFyYW5jZSBhbmQgcG9zaXRpb24gaW4gVG9wIEJhclxuLSBDaG9vc2UgYW5vdGhlciBjb2xvciBwcmVzZXQgYW5kIGludGVuc2l0eSwgaWYgeW91IHByZWZlciBhIGRpZmZlcmVudCBjb2xvciBzY2hlbWVcbi0gQ2hhbmdlIGNvbG9yIGludGVuc2l0eSBvbiB0aGUgZmx5IGJ5IHNjcm9sbGluZyBvdmVyIHRoZSBPbiBEZW1hbmQgYnV0dG9uIGluIFRvcCBCYXJcblxuTXVsdGkgbGFuZ3VhZ2Ugc3VwcG9ydCBpcyBhbHNvIGF2YWlsYWJsZSwgcGxlYXNlIGNoZWNrIHRoZSBHaXRIdWIgcGFnZSBpZiB5b3Ugd2FudCB0byBoZWxwIHdpdGggdGhlIHRyYW5zbGF0aW9ucy4gU28gZmFyLCB0aGUgZXh0ZW5zaW9uIGlzIGZ1bGx5IHRyYW5zbGF0ZWQgdG8gU3BhbmlzaCwgRHV0Y2gsIEdlcm1hbiwgUm9tYW5pYW4gYW5kIEVuZ2xpc2guXG5cbklmIHlvdSB3YW50IHRvIHVzZSBhIGtleWJvYXJkIHNob3J0Y3V0IGluIG9yZGVyIHRvIHRvZ2dsZSB0aGUgQmVkdGltZSBNb2RlIHRoZW4geW91IGNhbiB1c2UgdGhpcyBjb21tYW5kIGZvciB0aGUgc2hvcnRjdXQ6XG5cbmJhc2ggLWMgJ3NjaGVtYV9pZD1vcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGU7IHNjaGVtYV9kaXI9fi8ubG9jYWwvc2hhcmUvZ25vbWUtc2hlbGwvZXh0ZW5zaW9ucy9nbm9tZWJlZHRpbWVAaW9udXRib3J0aXMuZ21haWwuY29tL3NjaGVtYXMvOyBpZiBbWyAkKGdzZXR0aW5ncyAtLXNjaGVtYWRpciAkc2NoZW1hX2RpciBnZXQgJHNjaGVtYV9pZCBiZWR0aW1lLW1vZGUtYWN0aXZlKSA9PSBcInRydWVcIiBdXTsgdGhlbiB0dXJuX29uPWZhbHNlOyBlbHNlIHR1cm5fb249dHJ1ZTsgZmk7IGdzZXR0aW5ncyAtLXNjaGVtYWRpciAkc2NoZW1hX2RpciBzZXQgJHNjaGVtYV9pZCBiZWR0aW1lLW1vZGUtYWN0aXZlICR0dXJuX29uOydcbiIsCiAgImdldHRleHQtZG9tYWluIjogImJlZHRpbWUtbW9kZSIsCiAgIm5hbWUiOiAiQmVkdGltZSBNb2RlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJlZHRpbWUtbW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lvbnV0Ym9ydGlzL2dub21lLWJlZHRpbWUtbW9kZSIsCiAgInV1aWQiOiAiZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "43": {"version": "13", "sha256": "122c1gbnn1481i571imrs79n1a4ylfp7g7349c0hf45hi1hs23db", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIGEgUXVpY2sgU2V0dGluZ3MgdG9nZ2xlIHRvIG1hbnVhbGx5IGVuYWJsZS9kaXNhYmxlIHRoZSBtb2RlXG4tIENvbnRyb2wgdGhlIE9uIERlbWFuZCBidXR0b24gdmlzaWJpbGl0eSwgYXBwZWFyYW5jZSBhbmQgcG9zaXRpb24gaW4gVG9wIEJhclxuLSBDaG9vc2UgYW5vdGhlciBjb2xvciBwcmVzZXQgYW5kIGludGVuc2l0eSwgaWYgeW91IHByZWZlciBhIGRpZmZlcmVudCBjb2xvciBzY2hlbWVcbi0gQ2hhbmdlIGNvbG9yIGludGVuc2l0eSBvbiB0aGUgZmx5IGJ5IHNjcm9sbGluZyBvdmVyIHRoZSBPbiBEZW1hbmQgYnV0dG9uIGluIFRvcCBCYXJcblxuTXVsdGkgbGFuZ3VhZ2Ugc3VwcG9ydCBpcyBhbHNvIGF2YWlsYWJsZSwgcGxlYXNlIGNoZWNrIHRoZSBHaXRIdWIgcGFnZSBpZiB5b3Ugd2FudCB0byBoZWxwIHdpdGggdGhlIHRyYW5zbGF0aW9ucy4gU28gZmFyLCB0aGUgZXh0ZW5zaW9uIGlzIGZ1bGx5IHRyYW5zbGF0ZWQgdG8gU3BhbmlzaCwgRHV0Y2gsIEdlcm1hbiwgUm9tYW5pYW4gYW5kIEVuZ2xpc2guXG5cbklmIHlvdSB3YW50IHRvIHVzZSBhIGtleWJvYXJkIHNob3J0Y3V0IGluIG9yZGVyIHRvIHRvZ2dsZSB0aGUgQmVkdGltZSBNb2RlIHRoZW4geW91IGNhbiB1c2UgdGhpcyBjb21tYW5kIGZvciB0aGUgc2hvcnRjdXQ6XG5cbmJhc2ggLWMgJ3NjaGVtYV9pZD1vcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGU7IHNjaGVtYV9kaXI9fi8ubG9jYWwvc2hhcmUvZ25vbWUtc2hlbGwvZXh0ZW5zaW9ucy9nbm9tZWJlZHRpbWVAaW9udXRib3J0aXMuZ21haWwuY29tL3NjaGVtYXMvOyBpZiBbWyAkKGdzZXR0aW5ncyAtLXNjaGVtYWRpciAkc2NoZW1hX2RpciBnZXQgJHNjaGVtYV9pZCBiZWR0aW1lLW1vZGUtYWN0aXZlKSA9PSBcInRydWVcIiBdXTsgdGhlbiB0dXJuX29uPWZhbHNlOyBlbHNlIHR1cm5fb249dHJ1ZTsgZmk7IGdzZXR0aW5ncyAtLXNjaGVtYWRpciAkc2NoZW1hX2RpciBzZXQgJHNjaGVtYV9pZCBiZWR0aW1lLW1vZGUtYWN0aXZlICR0dXJuX29uOydcbiIsCiAgImdldHRleHQtZG9tYWluIjogImJlZHRpbWUtbW9kZSIsCiAgIm5hbWUiOiAiQmVkdGltZSBNb2RlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJlZHRpbWUtbW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} +, {"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": "16", "sha256": "1gd9i7979crcm73v1wyhpsl8xvkpa45kxkxvwx6navbbz0g4885f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgU3BvdGlmeSBmcm9tIHRoZSB0b3BiYXIhXG5cbkNyZWRpdCB0byBNYXJjdXMgSGVpbmUgKGh0dHBzOi8vZ2l0aHViLmNvbS9taGVpbmUpIGZvciBtb3N0IG9mIHRoZSBjb2RlIGluIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiU3BvdGlmeSBDb250cm9sbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbGxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb29sc2thdGVndXk4OS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3BvdGlmeS1jb250cm9sbGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWNvbnRyb2xsZXJAa29vbHNrYXRlZ3V5ODkiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "40": {"version": "16", "sha256": "1gd9i7979crcm73v1wyhpsl8xvkpa45kxkxvwx6navbbz0g4885f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgU3BvdGlmeSBmcm9tIHRoZSB0b3BiYXIhXG5cbkNyZWRpdCB0byBNYXJjdXMgSGVpbmUgKGh0dHBzOi8vZ2l0aHViLmNvbS9taGVpbmUpIGZvciBtb3N0IG9mIHRoZSBjb2RlIGluIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiU3BvdGlmeSBDb250cm9sbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbGxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb29sc2thdGVndXk4OS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3BvdGlmeS1jb250cm9sbGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWNvbnRyb2xsZXJAa29vbHNrYXRlZ3V5ODkiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "16", "sha256": "1gd9i7979crcm73v1wyhpsl8xvkpa45kxkxvwx6navbbz0g4885f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgU3BvdGlmeSBmcm9tIHRoZSB0b3BiYXIhXG5cbkNyZWRpdCB0byBNYXJjdXMgSGVpbmUgKGh0dHBzOi8vZ2l0aHViLmNvbS9taGVpbmUpIGZvciBtb3N0IG9mIHRoZSBjb2RlIGluIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiU3BvdGlmeSBDb250cm9sbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbGxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb29sc2thdGVndXk4OS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3BvdGlmeS1jb250cm9sbGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWNvbnRyb2xsZXJAa29vbHNrYXRlZ3V5ODkiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "42": {"version": "16", "sha256": "1gd9i7979crcm73v1wyhpsl8xvkpa45kxkxvwx6navbbz0g4885f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgU3BvdGlmeSBmcm9tIHRoZSB0b3BiYXIhXG5cbkNyZWRpdCB0byBNYXJjdXMgSGVpbmUgKGh0dHBzOi8vZ2l0aHViLmNvbS9taGVpbmUpIGZvciBtb3N0IG9mIHRoZSBjb2RlIGluIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiU3BvdGlmeSBDb250cm9sbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbGxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb29sc2thdGVndXk4OS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3BvdGlmeS1jb250cm9sbGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWNvbnRyb2xsZXJAa29vbHNrYXRlZ3V5ODkiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "43": {"version": "16", "sha256": "1gd9i7979crcm73v1wyhpsl8xvkpa45kxkxvwx6navbbz0g4885f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgU3BvdGlmeSBmcm9tIHRoZSB0b3BiYXIhXG5cbkNyZWRpdCB0byBNYXJjdXMgSGVpbmUgKGh0dHBzOi8vZ2l0aHViLmNvbS9taGVpbmUpIGZvciBtb3N0IG9mIHRoZSBjb2RlIGluIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiU3BvdGlmeSBDb250cm9sbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbGxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb29sc2thdGVndXk4OS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3BvdGlmeS1jb250cm9sbGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWNvbnRyb2xsZXJAa29vbHNrYXRlZ3V5ODkiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} , {"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": "8", "sha256": "1pmj9dx0103rk2zaia53q8rc461dj7ybfih9lnh8v1bcm2sjca3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBkZWZhdWx0IHNjcmVlbnNob3QgZGlyZWN0b3J5IGlzIH4vUGljdHVyZXMuIFRoaXMgZXh0ZW5zaW9uIGNoYW5nZXMgdGhhdCB0byB1c2Ugd2hhdGV2ZXIgaXMgc2V0IGlmIHlvdSB1c2VkIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC4gVGhpcyBjYW4gYmUgZm91bmQgaW4gdGhlIGRjb25mIHNldHRpbmc6IC9vcmcvZ25vbWUvZ25vbWUtc2NyZWVuc2hvdC9sYXN0LXNhdmUtZGlyZWN0b3J5LiBJZiB0aGF0IGRpcmVjdG9yeSBkb2Vzbid0IGV4aXN0LCB0aGUgZXh0ZW5zaW9uIHdpbGwgdXNlIHRoZSBIb21lIGRpcmVjdG9yeSBpbnN0ZWFkLlxuXG5Ob3RlOiBJZiB0aGUgZGNvbmYgc2V0dGluZyBkb2Vzbid0IGV4aXN0LCB5b3UgbmVlZCB0byBpbnN0YWxsIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC5cblxuVGhlIGlkZWEgd2FzIHRha2VuIGZyb20gdGhlIGV4dGVuc2lvbjogU2NyZWVuc2hvdCBMb2NhdGlvbnMuIiwKICAibmFtZSI6ICJTY3JlZW5zaG90IERpcmVjdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzY3JlZW5zaG90LWRpcmVjdG9yeUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "1pmj9dx0103rk2zaia53q8rc461dj7ybfih9lnh8v1bcm2sjca3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBkZWZhdWx0IHNjcmVlbnNob3QgZGlyZWN0b3J5IGlzIH4vUGljdHVyZXMuIFRoaXMgZXh0ZW5zaW9uIGNoYW5nZXMgdGhhdCB0byB1c2Ugd2hhdGV2ZXIgaXMgc2V0IGlmIHlvdSB1c2VkIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC4gVGhpcyBjYW4gYmUgZm91bmQgaW4gdGhlIGRjb25mIHNldHRpbmc6IC9vcmcvZ25vbWUvZ25vbWUtc2NyZWVuc2hvdC9sYXN0LXNhdmUtZGlyZWN0b3J5LiBJZiB0aGF0IGRpcmVjdG9yeSBkb2Vzbid0IGV4aXN0LCB0aGUgZXh0ZW5zaW9uIHdpbGwgdXNlIHRoZSBIb21lIGRpcmVjdG9yeSBpbnN0ZWFkLlxuXG5Ob3RlOiBJZiB0aGUgZGNvbmYgc2V0dGluZyBkb2Vzbid0IGV4aXN0LCB5b3UgbmVlZCB0byBpbnN0YWxsIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC5cblxuVGhlIGlkZWEgd2FzIHRha2VuIGZyb20gdGhlIGV4dGVuc2lvbjogU2NyZWVuc2hvdCBMb2NhdGlvbnMuIiwKICAibmFtZSI6ICJTY3JlZW5zaG90IERpcmVjdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzY3JlZW5zaG90LWRpcmVjdG9yeUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "1pmj9dx0103rk2zaia53q8rc461dj7ybfih9lnh8v1bcm2sjca3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBkZWZhdWx0IHNjcmVlbnNob3QgZGlyZWN0b3J5IGlzIH4vUGljdHVyZXMuIFRoaXMgZXh0ZW5zaW9uIGNoYW5nZXMgdGhhdCB0byB1c2Ugd2hhdGV2ZXIgaXMgc2V0IGlmIHlvdSB1c2VkIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC4gVGhpcyBjYW4gYmUgZm91bmQgaW4gdGhlIGRjb25mIHNldHRpbmc6IC9vcmcvZ25vbWUvZ25vbWUtc2NyZWVuc2hvdC9sYXN0LXNhdmUtZGlyZWN0b3J5LiBJZiB0aGF0IGRpcmVjdG9yeSBkb2Vzbid0IGV4aXN0LCB0aGUgZXh0ZW5zaW9uIHdpbGwgdXNlIHRoZSBIb21lIGRpcmVjdG9yeSBpbnN0ZWFkLlxuXG5Ob3RlOiBJZiB0aGUgZGNvbmYgc2V0dGluZyBkb2Vzbid0IGV4aXN0LCB5b3UgbmVlZCB0byBpbnN0YWxsIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC5cblxuVGhlIGlkZWEgd2FzIHRha2VuIGZyb20gdGhlIGV4dGVuc2lvbjogU2NyZWVuc2hvdCBMb2NhdGlvbnMuIiwKICAibmFtZSI6ICJTY3JlZW5zaG90IERpcmVjdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzY3JlZW5zaG90LWRpcmVjdG9yeUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1pmj9dx0103rk2zaia53q8rc461dj7ybfih9lnh8v1bcm2sjca3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBkZWZhdWx0IHNjcmVlbnNob3QgZGlyZWN0b3J5IGlzIH4vUGljdHVyZXMuIFRoaXMgZXh0ZW5zaW9uIGNoYW5nZXMgdGhhdCB0byB1c2Ugd2hhdGV2ZXIgaXMgc2V0IGlmIHlvdSB1c2VkIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC4gVGhpcyBjYW4gYmUgZm91bmQgaW4gdGhlIGRjb25mIHNldHRpbmc6IC9vcmcvZ25vbWUvZ25vbWUtc2NyZWVuc2hvdC9sYXN0LXNhdmUtZGlyZWN0b3J5LiBJZiB0aGF0IGRpcmVjdG9yeSBkb2Vzbid0IGV4aXN0LCB0aGUgZXh0ZW5zaW9uIHdpbGwgdXNlIHRoZSBIb21lIGRpcmVjdG9yeSBpbnN0ZWFkLlxuXG5Ob3RlOiBJZiB0aGUgZGNvbmYgc2V0dGluZyBkb2Vzbid0IGV4aXN0LCB5b3UgbmVlZCB0byBpbnN0YWxsIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC5cblxuVGhlIGlkZWEgd2FzIHRha2VuIGZyb20gdGhlIGV4dGVuc2lvbjogU2NyZWVuc2hvdCBMb2NhdGlvbnMuIiwKICAibmFtZSI6ICJTY3JlZW5zaG90IERpcmVjdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzY3JlZW5zaG90LWRpcmVjdG9yeUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"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": "15", "sha256": "0hls48z9vfmk7qhwxwj1y5sap3wms9jvnjjd8dnxfbqdz8018lby", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSm9zZUV4cG9zaXRvL2dub21lLXNoZWxsLWV4dGVuc2lvbi14MTFnZXN0dXJlcyIsCiAgInV1aWQiOiAieDExZ2VzdHVyZXNAam9zZWV4cG9zaXRvLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNQp9"}, "40": {"version": "15", "sha256": "0hls48z9vfmk7qhwxwj1y5sap3wms9jvnjjd8dnxfbqdz8018lby", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSm9zZUV4cG9zaXRvL2dub21lLXNoZWxsLWV4dGVuc2lvbi14MTFnZXN0dXJlcyIsCiAgInV1aWQiOiAieDExZ2VzdHVyZXNAam9zZWV4cG9zaXRvLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNQp9"}, "41": {"version": "15", "sha256": "0hls48z9vfmk7qhwxwj1y5sap3wms9jvnjjd8dnxfbqdz8018lby", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSm9zZUV4cG9zaXRvL2dub21lLXNoZWxsLWV4dGVuc2lvbi14MTFnZXN0dXJlcyIsCiAgInV1aWQiOiAieDExZ2VzdHVyZXNAam9zZWV4cG9zaXRvLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNQp9"}, "42": {"version": "15", "sha256": "0hls48z9vfmk7qhwxwj1y5sap3wms9jvnjjd8dnxfbqdz8018lby", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSm9zZUV4cG9zaXRvL2dub21lLXNoZWxsLWV4dGVuc2lvbi14MTFnZXN0dXJlcyIsCiAgInV1aWQiOiAieDExZ2VzdHVyZXNAam9zZWV4cG9zaXRvLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNQp9"}, "43": {"version": "15", "sha256": "0hls48z9vfmk7qhwxwj1y5sap3wms9jvnjjd8dnxfbqdz8018lby", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSm9zZUV4cG9zaXRvL2dub21lLXNoZWxsLWV4dGVuc2lvbi14MTFnZXN0dXJlcyIsCiAgInV1aWQiOiAieDExZ2VzdHVyZXNAam9zZWV4cG9zaXRvLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNQp9"}}} , {"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": "waktu-sholat@arpodungge.github.com", "name": "Waktu Sholat", "pname": "waktu-sholat", "description": "Waktu Sholat - Indonesia", "link": "https://extensions.gnome.org/extension/4036/waktu-sholat/", "shell_version_map": {"40": {"version": "4", "sha256": "1rykk6klv9kwy923rja05grrs10ignh3v05kzss01a2526d2afcn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldha3R1IFNob2xhdCAtIEluZG9uZXNpYSIsCiAgIm5hbWUiOiAiV2FrdHUgU2hvbGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FycG9kdW5nZ2Uvd2FrdHUtc2hvbGF0IiwKICAidXVpZCI6ICJ3YWt0dS1zaG9sYXRAYXJwb2R1bmdnZS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1rykk6klv9kwy923rja05grrs10ignh3v05kzss01a2526d2afcn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldha3R1IFNob2xhdCAtIEluZG9uZXNpYSIsCiAgIm5hbWUiOiAiV2FrdHUgU2hvbGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FycG9kdW5nZ2Uvd2FrdHUtc2hvbGF0IiwKICAidXVpZCI6ICJ3YWt0dS1zaG9sYXRAYXJwb2R1bmdnZS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "1rykk6klv9kwy923rja05grrs10ignh3v05kzss01a2526d2afcn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldha3R1IFNob2xhdCAtIEluZG9uZXNpYSIsCiAgIm5hbWUiOiAiV2FrdHUgU2hvbGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FycG9kdW5nZ2Uvd2FrdHUtc2hvbGF0IiwKICAidXVpZCI6ICJ3YWt0dS1zaG9sYXRAYXJwb2R1bmdnZS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "1rykk6klv9kwy923rja05grrs10ignh3v05kzss01a2526d2afcn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldha3R1IFNob2xhdCAtIEluZG9uZXNpYSIsCiAgIm5hbWUiOiAiV2FrdHUgU2hvbGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FycG9kdW5nZ2Uvd2FrdHUtc2hvbGF0IiwKICAidXVpZCI6ICJ3YWt0dS1zaG9sYXRAYXJwb2R1bmdnZS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"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": "5", "sha256": "1gf79zbbscw34ypybpy01f5p8ymdbcb3lhh3s62k9vi9cjpzqd4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzd2l0Y2h0d29sYXlvdXRzQHF0bWF4LmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "1gf79zbbscw34ypybpy01f5p8ymdbcb3lhh3s62k9vi9cjpzqd4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzd2l0Y2h0d29sYXlvdXRzQHF0bWF4LmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1gf79zbbscw34ypybpy01f5p8ymdbcb3lhh3s62k9vi9cjpzqd4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzd2l0Y2h0d29sYXlvdXRzQHF0bWF4LmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "1gf79zbbscw34ypybpy01f5p8ymdbcb3lhh3s62k9vi9cjpzqd4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzd2l0Y2h0d29sYXlvdXRzQHF0bWF4LmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "43": {"version": "5", "sha256": "1gf79zbbscw34ypybpy01f5p8ymdbcb3lhh3s62k9vi9cjpzqd4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzd2l0Y2h0d29sYXlvdXRzQHF0bWF4LmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "notification-dismiss@kronosoul.xyz", "name": "Dismiss Notifications on Right Click", "pname": "dismiss-notifications-on-right-click", "description": "Simple extension that removes notification popups when they are right clicked.", "link": "https://extensions.gnome.org/extension/4048/dismiss-notifications-on-right-click/", "shell_version_map": {"38": {"version": "1", "sha256": "19pdz3lg1ybmgvpahfwzzhwk8fyhm1sr3wawddz5z66i22spcgjj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwubm90aWZpY2F0aW9uLWRpc21pc3MiLAogICJkZXNjcmlwdGlvbiI6ICJTaW1wbGUgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyBub3RpZmljYXRpb24gcG9wdXBzIHdoZW4gdGhleSBhcmUgcmlnaHQgY2xpY2tlZC4iLAogICJleHRlbnNpb24taWQiOiAiZ2R0b29scyIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzZXRzIiwKICAibmFtZSI6ICJEaXNtaXNzIE5vdGlmaWNhdGlvbnMgb24gUmlnaHQgQ2xpY2siLAogICJvcmlnaW5hbC1hdXRob3IiOiAiYWRtaW5Aa3Jvbm9zb3VsLnh5eiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4wIiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tZGlzbWlzc0Brcm9ub3NvdWwueHl6IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} @@ -462,7 +463,7 @@ , {"uuid": "custom-vpn-toggler@giteduberger.fr", "name": "Custom VPN Toggler (and indicator)", "pname": "custom-vpn-toggler", "description": "See the status of a VPN (with its icon) and toggle VPN. \nCompatible with FortinetVPN, GlobalProtect, NetExtender, NordVpn, OpenVPN...", "link": "https://extensions.gnome.org/extension/4061/custom-vpn-toggler/", "shell_version_map": {"38": {"version": "8", "sha256": "01nmh9bmwp2w70d4icn61hxl548bspcy7k49ld5pqnpch3i0pa47", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSBhbmQgdG9nZ2xlIFZQTi4gXG5Db21wYXRpYmxlIHdpdGggRm9ydGluZXRWUE4sIEdsb2JhbFByb3RlY3QsIE5ldEV4dGVuZGVyLCBOb3JkVnBuLCBPcGVuVlBOLi4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgIm5hbWUiOiAiQ3VzdG9tIFZQTiBUb2dnbGVyIChhbmQgaW5kaWNhdG9yKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJmci5naXRlZHViZXJnZXIuY3VzdG9tLXZwbi10b2dnbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vWGF2aWVyQmVyZ2VyL2N1c3RvbS12cG4tdG9nZ2xlciIsCiAgInV1aWQiOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "10", "sha256": "1rawssdlj563nzp5i1w6is8q3v0699zaf12apn7h7jxsqr6qwajf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSBhbmQgdG9nZ2xlIFZQTi4gXG5Db21wYXRpYmxlIHdpdGggRm9ydGluZXRWUE4sIEdsb2JhbFByb3RlY3QsIE5ldEV4dGVuZGVyLCBOb3JkVnBuLCBPcGVuVlBOLi4uIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbS12cG4tdG9nZ2xlci5naXRlZHViZXJnZXIuZnIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20tdnBuLXRvZ2dsZXIiLAogICJuYW1lIjogIkN1c3RvbSBWUE4gVG9nZ2xlciAoYW5kIGluZGljYXRvcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9tLXZwbi10b2dnbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vWGF2aWVyQmVyZ2VyL2N1c3RvbS12cG4tdG9nZ2xlciIsCiAgInV1aWQiOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "1rawssdlj563nzp5i1w6is8q3v0699zaf12apn7h7jxsqr6qwajf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSBhbmQgdG9nZ2xlIFZQTi4gXG5Db21wYXRpYmxlIHdpdGggRm9ydGluZXRWUE4sIEdsb2JhbFByb3RlY3QsIE5ldEV4dGVuZGVyLCBOb3JkVnBuLCBPcGVuVlBOLi4uIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbS12cG4tdG9nZ2xlci5naXRlZHViZXJnZXIuZnIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20tdnBuLXRvZ2dsZXIiLAogICJuYW1lIjogIkN1c3RvbSBWUE4gVG9nZ2xlciAoYW5kIGluZGljYXRvcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9tLXZwbi10b2dnbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vWGF2aWVyQmVyZ2VyL2N1c3RvbS12cG4tdG9nZ2xlciIsCiAgInV1aWQiOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "1rawssdlj563nzp5i1w6is8q3v0699zaf12apn7h7jxsqr6qwajf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSBhbmQgdG9nZ2xlIFZQTi4gXG5Db21wYXRpYmxlIHdpdGggRm9ydGluZXRWUE4sIEdsb2JhbFByb3RlY3QsIE5ldEV4dGVuZGVyLCBOb3JkVnBuLCBPcGVuVlBOLi4uIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbS12cG4tdG9nZ2xlci5naXRlZHViZXJnZXIuZnIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20tdnBuLXRvZ2dsZXIiLAogICJuYW1lIjogIkN1c3RvbSBWUE4gVG9nZ2xlciAoYW5kIGluZGljYXRvcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9tLXZwbi10b2dnbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vWGF2aWVyQmVyZ2VyL2N1c3RvbS12cG4tdG9nZ2xlciIsCiAgInV1aWQiOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "geary-tray-icon@taylantatli.github.com", "name": "Geary Tray Icon", "pname": "geary-tray-icon", "description": "Adds an icon to the panel to open mailbox and creating new mail.", "link": "https://extensions.gnome.org/extension/4073/geary-tray-icon/", "shell_version_map": {"38": {"version": "3", "sha256": "0nq7jf63yln8w4fivflwncdrdzagzky0ds9qzj43s1vhp046wbf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiB0byB0aGUgcGFuZWwgdG8gb3BlbiBtYWlsYm94IGFuZCBjcmVhdGluZyBuZXcgbWFpbC4iLAogICJuYW1lIjogIkdlYXJ5IFRyYXkgSWNvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RheWxhblRhdGxpL2dlYXJ5LXRyYXktaWNvbiIsCiAgInV1aWQiOiAiZ2VhcnktdHJheS1pY29uQHRheWxhbnRhdGxpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "0nq7jf63yln8w4fivflwncdrdzagzky0ds9qzj43s1vhp046wbf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiB0byB0aGUgcGFuZWwgdG8gb3BlbiBtYWlsYm94IGFuZCBjcmVhdGluZyBuZXcgbWFpbC4iLAogICJuYW1lIjogIkdlYXJ5IFRyYXkgSWNvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RheWxhblRhdGxpL2dlYXJ5LXRyYXktaWNvbiIsCiAgInV1aWQiOiAiZ2VhcnktdHJheS1pY29uQHRheWxhbnRhdGxpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "0nq7jf63yln8w4fivflwncdrdzagzky0ds9qzj43s1vhp046wbf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiB0byB0aGUgcGFuZWwgdG8gb3BlbiBtYWlsYm94IGFuZCBjcmVhdGluZyBuZXcgbWFpbC4iLAogICJuYW1lIjogIkdlYXJ5IFRyYXkgSWNvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RheWxhblRhdGxpL2dlYXJ5LXRyYXktaWNvbiIsCiAgInV1aWQiOiAiZ2VhcnktdHJheS1pY29uQHRheWxhbnRhdGxpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "0nq7jf63yln8w4fivflwncdrdzagzky0ds9qzj43s1vhp046wbf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiB0byB0aGUgcGFuZWwgdG8gb3BlbiBtYWlsYm94IGFuZCBjcmVhdGluZyBuZXcgbWFpbC4iLAogICJuYW1lIjogIkdlYXJ5IFRyYXkgSWNvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RheWxhblRhdGxpL2dlYXJ5LXRyYXktaWNvbiIsCiAgInV1aWQiOiAiZ2VhcnktdHJheS1pY29uQHRheWxhbnRhdGxpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"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": "20", "sha256": "1n13cxrq4wl544077w4f4jqyk18yq9xz4578fmy5x3kd9ayjcby6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd290bXNodWFpc2kvaXFhaXJHbm9tZUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaXFhaXJAd290bXNodWFpc2lfZ2l0aHViIiwKICAidmVyc2lvbiI6IDIwCn0="}, "41": {"version": "20", "sha256": "1n13cxrq4wl544077w4f4jqyk18yq9xz4578fmy5x3kd9ayjcby6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd290bXNodWFpc2kvaXFhaXJHbm9tZUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaXFhaXJAd290bXNodWFpc2lfZ2l0aHViIiwKICAidmVyc2lvbiI6IDIwCn0="}, "42": {"version": "20", "sha256": "1n13cxrq4wl544077w4f4jqyk18yq9xz4578fmy5x3kd9ayjcby6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd290bXNodWFpc2kvaXFhaXJHbm9tZUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaXFhaXJAd290bXNodWFpc2lfZ2l0aHViIiwKICAidmVyc2lvbiI6IDIwCn0="}, "43": {"version": "20", "sha256": "1n13cxrq4wl544077w4f4jqyk18yq9xz4578fmy5x3kd9ayjcby6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd290bXNodWFpc2kvaXFhaXJHbm9tZUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaXFhaXJAd290bXNodWFpc2lfZ2l0aHViIiwKICAidmVyc2lvbiI6IDIwCn0="}}} +, {"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": "17", "sha256": "07fv1z9rk9xjdrqrvs9cglmq5dbcnf3dgjfz7dnflabcrb9yqisv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "07fv1z9rk9xjdrqrvs9cglmq5dbcnf3dgjfz7dnflabcrb9yqisv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "42": {"version": "17", "sha256": "07fv1z9rk9xjdrqrvs9cglmq5dbcnf3dgjfz7dnflabcrb9yqisv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "43": {"version": "21", "sha256": "0h2hfizx3ysyhnl3cwwjrq1wmgf3szh0hbnb3w06wqaav6rq1y42", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd290bXNodWFpc2kvaXFhaXJHbm9tZUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaXFhaXJAd290bXNodWFpc2lfZ2l0aHViIiwKICAidmVyc2lvbiI6IDIxCn0="}}} , {"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": "44", "sha256": "0z8rpw3dfcfjxnk1p42vzpndb33yww6zmbrzc2dz2df5rfgp2lpv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL09yZGlzc2ltby9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJ1dWlkIjogImJpZ1N1ci1TdGF0dXNBcmVhQG9yZGlzc2ltby5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "41": {"version": "44", "sha256": "0z8rpw3dfcfjxnk1p42vzpndb33yww6zmbrzc2dz2df5rfgp2lpv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL09yZGlzc2ltby9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJ1dWlkIjogImJpZ1N1ci1TdGF0dXNBcmVhQG9yZGlzc2ltby5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "42": {"version": "47", "sha256": "15p910lncf5g0v9xphqmsk55vc9wr276s00dlnxlwx7261bk5a3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vT3JkaXNzaW1vL0JpZy1TdXItU3RhdHVzQXJlYSIsCiAgInV1aWQiOiAiYmlnU3VyLVN0YXR1c0FyZWFAb3JkaXNzaW1vLmNvbSIsCiAgInZlcnNpb24iOiA0Nwp9"}}} , {"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"}}} @@ -475,7 +476,7 @@ , {"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": "7", "sha256": "0fa1kxg6ii6l4r22jgbv6fxhhwfp7cfvkbjwn6vg287gadjrl70s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icnVub2RydWdvd2ljay9ub3RpZmljYXRpb24tcG9zaXRpb24tZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tcG9zaXRpb25AZHJ1Z28uZGV2IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "0fa1kxg6ii6l4r22jgbv6fxhhwfp7cfvkbjwn6vg287gadjrl70s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icnVub2RydWdvd2ljay9ub3RpZmljYXRpb24tcG9zaXRpb24tZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tcG9zaXRpb25AZHJ1Z28uZGV2IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0fa1kxg6ii6l4r22jgbv6fxhhwfp7cfvkbjwn6vg287gadjrl70s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icnVub2RydWdvd2ljay9ub3RpZmljYXRpb24tcG9zaXRpb24tZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tcG9zaXRpb25AZHJ1Z28uZGV2IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "0fa1kxg6ii6l4r22jgbv6fxhhwfp7cfvkbjwn6vg287gadjrl70s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icnVub2RydWdvd2ljay9ub3RpZmljYXRpb24tcG9zaXRpb24tZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tcG9zaXRpb25AZHJ1Z28uZGV2IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "43": {"version": "7", "sha256": "0fa1kxg6ii6l4r22jgbv6fxhhwfp7cfvkbjwn6vg287gadjrl70s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icnVub2RydWdvd2ljay9ub3RpZmljYXRpb24tcG9zaXRpb24tZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tcG9zaXRpb25AZHJ1Z28uZGV2IiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"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": "7", "sha256": "13ha95kxcp018p390d49qcakfy91y23lf80wvfdvzilcbficpjk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyZmx5bm44OS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckB0cmZseW5uODkucG0ubWUiLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "13ha95kxcp018p390d49qcakfy91y23lf80wvfdvzilcbficpjk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyZmx5bm44OS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckB0cmZseW5uODkucG0ubWUiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "13ha95kxcp018p390d49qcakfy91y23lf80wvfdvzilcbficpjk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyZmx5bm44OS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckB0cmZseW5uODkucG0ubWUiLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "13ha95kxcp018p390d49qcakfy91y23lf80wvfdvzilcbficpjk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyZmx5bm44OS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckB0cmZseW5uODkucG0ubWUiLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "13ha95kxcp018p390d49qcakfy91y23lf80wvfdvzilcbficpjk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyZmx5bm44OS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckB0cmZseW5uODkucG0ubWUiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"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": "84", "sha256": "05a39i1a0ks8m2iv9s2zc8xck01lfk9jvh6757fx5r22z77d4yds", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuU1VTRS9DdXN0b21pemUtSUJ1cyIsCiAgInV1aWQiOiAiY3VzdG9taXplLWlidXNAaG9sbG93bWFuLm1sIiwKICAidmVyc2lvbiI6IDg0Cn0="}, "40": {"version": "84", "sha256": "05a39i1a0ks8m2iv9s2zc8xck01lfk9jvh6757fx5r22z77d4yds", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuU1VTRS9DdXN0b21pemUtSUJ1cyIsCiAgInV1aWQiOiAiY3VzdG9taXplLWlidXNAaG9sbG93bWFuLm1sIiwKICAidmVyc2lvbiI6IDg0Cn0="}, "41": {"version": "84", "sha256": "05a39i1a0ks8m2iv9s2zc8xck01lfk9jvh6757fx5r22z77d4yds", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuU1VTRS9DdXN0b21pemUtSUJ1cyIsCiAgInV1aWQiOiAiY3VzdG9taXplLWlidXNAaG9sbG93bWFuLm1sIiwKICAidmVyc2lvbiI6IDg0Cn0="}, "42": {"version": "84", "sha256": "05a39i1a0ks8m2iv9s2zc8xck01lfk9jvh6757fx5r22z77d4yds", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuU1VTRS9DdXN0b21pemUtSUJ1cyIsCiAgInV1aWQiOiAiY3VzdG9taXplLWlidXNAaG9sbG93bWFuLm1sIiwKICAidmVyc2lvbiI6IDg0Cn0="}, "43": {"version": "84", "sha256": "05a39i1a0ks8m2iv9s2zc8xck01lfk9jvh6757fx5r22z77d4yds", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuU1VTRS9DdXN0b21pemUtSUJ1cyIsCiAgInV1aWQiOiAiY3VzdG9taXplLWlidXNAaG9sbG93bWFuLm1sIiwKICAidmVyc2lvbiI6IDg0Cn0="}}} +, {"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": "85", "sha256": "12hqxcxxd4d4yh19ichsy8zmyh134c7rcks5smijv6d9ifslkigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuU1VTRS9DdXN0b21pemUtSUJ1cyIsCiAgInV1aWQiOiAiY3VzdG9taXplLWlidXNAaG9sbG93bWFuLm1sIiwKICAidmVyc2lvbiI6IDg1Cn0="}, "40": {"version": "85", "sha256": "12hqxcxxd4d4yh19ichsy8zmyh134c7rcks5smijv6d9ifslkigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuU1VTRS9DdXN0b21pemUtSUJ1cyIsCiAgInV1aWQiOiAiY3VzdG9taXplLWlidXNAaG9sbG93bWFuLm1sIiwKICAidmVyc2lvbiI6IDg1Cn0="}, "41": {"version": "85", "sha256": "12hqxcxxd4d4yh19ichsy8zmyh134c7rcks5smijv6d9ifslkigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuU1VTRS9DdXN0b21pemUtSUJ1cyIsCiAgInV1aWQiOiAiY3VzdG9taXplLWlidXNAaG9sbG93bWFuLm1sIiwKICAidmVyc2lvbiI6IDg1Cn0="}, "42": {"version": "85", "sha256": "12hqxcxxd4d4yh19ichsy8zmyh134c7rcks5smijv6d9ifslkigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuU1VTRS9DdXN0b21pemUtSUJ1cyIsCiAgInV1aWQiOiAiY3VzdG9taXplLWlidXNAaG9sbG93bWFuLm1sIiwKICAidmVyc2lvbiI6IDg1Cn0="}, "43": {"version": "85", "sha256": "12hqxcxxd4d4yh19ichsy8zmyh134c7rcks5smijv6d9ifslkigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vcGVuU1VTRS9DdXN0b21pemUtSUJ1cyIsCiAgInV1aWQiOiAiY3VzdG9taXplLWlidXNAaG9sbG93bWFuLm1sIiwKICAidmVyc2lvbiI6IDg1Cn0="}}} , {"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="}}} @@ -490,10 +491,10 @@ , {"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": "5", "sha256": "1nfi25gdydknsbn79h72bc8ll8x4fq2pn4a8lpdk2j2gadknlmi4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHdvcmtzcGFjZSB0aHVtYm5haWxzIGV2ZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHdheXMtc2hvdy13b3Jrc3BhY2UtdGh1bWJuYWlscy8iLAogICJ1dWlkIjogImFsd2F5c3Nob3d3b3Jrc3BhY2V0aHVtYm5haWxzQGFseW54Lm9uZSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1nfi25gdydknsbn79h72bc8ll8x4fq2pn4a8lpdk2j2gadknlmi4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHdvcmtzcGFjZSB0aHVtYm5haWxzIGV2ZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHdheXMtc2hvdy13b3Jrc3BhY2UtdGh1bWJuYWlscy8iLAogICJ1dWlkIjogImFsd2F5c3Nob3d3b3Jrc3BhY2V0aHVtYm5haWxzQGFseW54Lm9uZSIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "1nfi25gdydknsbn79h72bc8ll8x4fq2pn4a8lpdk2j2gadknlmi4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHdvcmtzcGFjZSB0aHVtYm5haWxzIGV2ZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHdheXMtc2hvdy13b3Jrc3BhY2UtdGh1bWJuYWlscy8iLAogICJ1dWlkIjogImFsd2F5c3Nob3d3b3Jrc3BhY2V0aHVtYm5haWxzQGFseW54Lm9uZSIsCiAgInZlcnNpb24iOiA1Cn0="}, "43": {"version": "5", "sha256": "1nfi25gdydknsbn79h72bc8ll8x4fq2pn4a8lpdk2j2gadknlmi4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHdvcmtzcGFjZSB0aHVtYm5haWxzIGV2ZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHdheXMtc2hvdy13b3Jrc3BhY2UtdGh1bWJuYWlscy8iLAogICJ1dWlkIjogImFsd2F5c3Nob3d3b3Jrc3BhY2V0aHVtYm5haWxzQGFseW54Lm9uZSIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "gnome-ui-tune@itstime.tech", "name": "Gnome 4x UI Improvements", "pname": "gnome-40-ui-improvements", "description": "Tunes gnome 40-43 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 (or 3x, configurable)\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": "13", "sha256": "0nbszy9bash509nqsvgmqvlbj8d3djbbbnc07jdn3qsq5m4ipyqp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLTQzIE92ZXJ2aWV3IFVJIHRvIG1ha2UgaXQgbW9yZSB1c2FibGUuXG5cbkNoYW5nZXM6XG4tIFNlYXJjaCB0ZXh0Ym94IGlzIGhpZGRlbiBieSBkZWZhdWx0IGFuZCBzaG93biBvbmx5IHdoZW4gdXNlciBiZWdpbnMgdG8gdHlwZS10by1zZWFyY2hcbi0gU2NhbGUgb2Ygd29ya3NwYWNlcycgdGh1bWJuYWlscyBpbmNyZWFzZWQgMnggKG9yIDN4LCBjb25maWd1cmFibGUpXG4tIFJlc3RvcmVzIHdhbGxwYXBlciBvbiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzLiBObyBtb3JlIGdyYXkgYmFja2dyb3VuZFxuLSBTaG93IHdvcmtzcGFjZXMnIHRodW1ibmFpbHMgZXZlbiB3aGVuIHRoZXJlIGlzIG9ubHkgb25lIHdvcmtzcGFjZVxuLSBGaXJlZm94J3MgUElQIChwaWN0dXJlIGluIHBpY3R1cmUpIHdpbmRvdyBpcyBub3cgZGlzcGxheWVkIG9uIHRoZSBvdmVydmlldyBzY3JlZW5cblxuQWxsIG1vZGlmaWNhdGlvbnMgY2FuIGJlIGRpc2FibGVkIGluIHRoZSBleHRlbnNpb24ncyBzZXR0aW5ncy5cblxuQVRURU5USU9OIVxuQWZ0ZXIgZXh0ZW5zaW9uIHVwZGF0ZSwgZ25vbWUtc2hlbGwgcmVzdGFydCBpcyByZXF1aXJlZDpcblgxMTogQWx0K0YyID0+IHJcbldheWxhbmQ6IGxvZ291dCA9PiBsb2dpbiIsCiAgIm5hbWUiOiAiR25vbWUgNHggVUkgSW1wcm92ZW1lbnRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLXVpLXR1bmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9heHhhcHkvZ25vbWUtdWktdHVuZSIsCiAgInV1aWQiOiAiZ25vbWUtdWktdHVuZUBpdHN0aW1lLnRlY2giLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "0nbszy9bash509nqsvgmqvlbj8d3djbbbnc07jdn3qsq5m4ipyqp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLTQzIE92ZXJ2aWV3IFVJIHRvIG1ha2UgaXQgbW9yZSB1c2FibGUuXG5cbkNoYW5nZXM6XG4tIFNlYXJjaCB0ZXh0Ym94IGlzIGhpZGRlbiBieSBkZWZhdWx0IGFuZCBzaG93biBvbmx5IHdoZW4gdXNlciBiZWdpbnMgdG8gdHlwZS10by1zZWFyY2hcbi0gU2NhbGUgb2Ygd29ya3NwYWNlcycgdGh1bWJuYWlscyBpbmNyZWFzZWQgMnggKG9yIDN4LCBjb25maWd1cmFibGUpXG4tIFJlc3RvcmVzIHdhbGxwYXBlciBvbiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzLiBObyBtb3JlIGdyYXkgYmFja2dyb3VuZFxuLSBTaG93IHdvcmtzcGFjZXMnIHRodW1ibmFpbHMgZXZlbiB3aGVuIHRoZXJlIGlzIG9ubHkgb25lIHdvcmtzcGFjZVxuLSBGaXJlZm94J3MgUElQIChwaWN0dXJlIGluIHBpY3R1cmUpIHdpbmRvdyBpcyBub3cgZGlzcGxheWVkIG9uIHRoZSBvdmVydmlldyBzY3JlZW5cblxuQWxsIG1vZGlmaWNhdGlvbnMgY2FuIGJlIGRpc2FibGVkIGluIHRoZSBleHRlbnNpb24ncyBzZXR0aW5ncy5cblxuQVRURU5USU9OIVxuQWZ0ZXIgZXh0ZW5zaW9uIHVwZGF0ZSwgZ25vbWUtc2hlbGwgcmVzdGFydCBpcyByZXF1aXJlZDpcblgxMTogQWx0K0YyID0+IHJcbldheWxhbmQ6IGxvZ291dCA9PiBsb2dpbiIsCiAgIm5hbWUiOiAiR25vbWUgNHggVUkgSW1wcm92ZW1lbnRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLXVpLXR1bmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9heHhhcHkvZ25vbWUtdWktdHVuZSIsCiAgInV1aWQiOiAiZ25vbWUtdWktdHVuZUBpdHN0aW1lLnRlY2giLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "42": {"version": "15", "sha256": "0i0jz0blrvly0s5814vryixadbasg96nphqacp93k7farzshmd2x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLTQzIE92ZXJ2aWV3IFVJIHRvIG1ha2UgaXQgbW9yZSB1c2FibGUuXG5cbkNoYW5nZXM6XG4tIFNlYXJjaCB0ZXh0Ym94IGlzIGhpZGRlbiBieSBkZWZhdWx0IGFuZCBzaG93biBvbmx5IHdoZW4gdXNlciBiZWdpbnMgdG8gdHlwZS10by1zZWFyY2hcbi0gU2NhbGUgb2Ygd29ya3NwYWNlcycgdGh1bWJuYWlscyBpbmNyZWFzZWQgMnggKG9yIDN4LCBjb25maWd1cmFibGUpXG4tIFJlc3RvcmVzIHdhbGxwYXBlciBvbiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzLiBObyBtb3JlIGdyYXkgYmFja2dyb3VuZFxuLSBTaG93IHdvcmtzcGFjZXMnIHRodW1ibmFpbHMgZXZlbiB3aGVuIHRoZXJlIGlzIG9ubHkgb25lIHdvcmtzcGFjZVxuLSBGaXJlZm94J3MgUElQIChwaWN0dXJlIGluIHBpY3R1cmUpIHdpbmRvdyBpcyBub3cgZGlzcGxheWVkIG9uIHRoZSBvdmVydmlldyBzY3JlZW5cblxuQWxsIG1vZGlmaWNhdGlvbnMgY2FuIGJlIGRpc2FibGVkIGluIHRoZSBleHRlbnNpb24ncyBzZXR0aW5ncy5cblxuQVRURU5USU9OIVxuQWZ0ZXIgZXh0ZW5zaW9uIHVwZGF0ZSwgZ25vbWUtc2hlbGwgcmVzdGFydCBpcyByZXF1aXJlZDpcblgxMTogQWx0K0YyID0+IHJcbldheWxhbmQ6IGxvZ291dCA9PiBsb2dpbiIsCiAgIm5hbWUiOiAiR25vbWUgNHggVUkgSW1wcm92ZW1lbnRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLXVpLXR1bmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F4eGFweS9nbm9tZS11aS10dW5lIiwKICAidXVpZCI6ICJnbm9tZS11aS10dW5lQGl0c3RpbWUudGVjaCIsCiAgInZlcnNpb24iOiAxNQp9"}, "43": {"version": "15", "sha256": "0i0jz0blrvly0s5814vryixadbasg96nphqacp93k7farzshmd2x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLTQzIE92ZXJ2aWV3IFVJIHRvIG1ha2UgaXQgbW9yZSB1c2FibGUuXG5cbkNoYW5nZXM6XG4tIFNlYXJjaCB0ZXh0Ym94IGlzIGhpZGRlbiBieSBkZWZhdWx0IGFuZCBzaG93biBvbmx5IHdoZW4gdXNlciBiZWdpbnMgdG8gdHlwZS10by1zZWFyY2hcbi0gU2NhbGUgb2Ygd29ya3NwYWNlcycgdGh1bWJuYWlscyBpbmNyZWFzZWQgMnggKG9yIDN4LCBjb25maWd1cmFibGUpXG4tIFJlc3RvcmVzIHdhbGxwYXBlciBvbiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzLiBObyBtb3JlIGdyYXkgYmFja2dyb3VuZFxuLSBTaG93IHdvcmtzcGFjZXMnIHRodW1ibmFpbHMgZXZlbiB3aGVuIHRoZXJlIGlzIG9ubHkgb25lIHdvcmtzcGFjZVxuLSBGaXJlZm94J3MgUElQIChwaWN0dXJlIGluIHBpY3R1cmUpIHdpbmRvdyBpcyBub3cgZGlzcGxheWVkIG9uIHRoZSBvdmVydmlldyBzY3JlZW5cblxuQWxsIG1vZGlmaWNhdGlvbnMgY2FuIGJlIGRpc2FibGVkIGluIHRoZSBleHRlbnNpb24ncyBzZXR0aW5ncy5cblxuQVRURU5USU9OIVxuQWZ0ZXIgZXh0ZW5zaW9uIHVwZGF0ZSwgZ25vbWUtc2hlbGwgcmVzdGFydCBpcyByZXF1aXJlZDpcblgxMTogQWx0K0YyID0+IHJcbldheWxhbmQ6IGxvZ291dCA9PiBsb2dpbiIsCiAgIm5hbWUiOiAiR25vbWUgNHggVUkgSW1wcm92ZW1lbnRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLXVpLXR1bmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F4eGFweS9nbm9tZS11aS10dW5lIiwKICAidXVpZCI6ICJnbm9tZS11aS10dW5lQGl0c3RpbWUudGVjaCIsCiAgInZlcnNpb24iOiAxNQp9"}}} , {"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 capabilities.\nMouse pointer pressure, clicks and scrolls over the monitor corners/edges or custom keyboard shortcuts can trigger any of dozens built-in actions that helps you navigate and control your desktop environment, or your own shell commands.\n\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.\n\nPlease report bugs/issues on GitHub page linked below as Extension Homepage.\nDo NOT use bug report form on this page, I will NOT respond to it.\n\nkeywords: keyboard shortcut, switch windows, 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, close workspace, switcher, hide panel", "link": "https://extensions.gnome.org/extension/4167/custom-hot-corners-extended/", "shell_version_map": {"38": {"version": "22", "sha256": "1jqbqsfcil3j6mikb7z1y89r3czpw1czsxh3hjln1198gb77v42k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLlxuRG8gTk9UIHVzZSBidWcgcmVwb3J0IGZvcm0gb24gdGhpcyBwYWdlLCBJIHdpbGwgTk9UIHJlc3BvbmQgdG8gaXQuXG5cbmtleXdvcmRzOiBrZXlib2FyZCBzaG9ydGN1dCwgc3dpdGNoIHdpbmRvd3MsIG92ZXJ2aWV3LCBhcHAgZ3JpZCwgY29tbWFuZCwgYnJpZ2h0bmVzcywgY29udHJhc3QsIHRyYW5zcGFyZW50LCBvcGFjaXR5LCBjb2xvciBlZmZlY3QsIGludmVydCBsaWdodG5lc3MsIGNvbG9yIHRpbnQsIGNvbG9yIGJsaW5kIGZpbHRlciwgc2ltdWxhdGlvbiwgZGVzYXR1cmF0ZSwgbmlnaHQgbGlnaHRzLCBkYXJrIHRoZW1lLCB2b2x1bWUsIG11dGUsIG1hZ25pZmllciwgem9vbSwgc2NyZWVuIGtleWJvYXJkLCByZWFkZXIsIGxhcmdlIHRleHQsIGZvcmNlIGNsb3NlLCBraWxsIC05LCBzaG93IGRlc2t0b3AsIHJlb3JkZXIgd29ya3NwYWNlLCB3aW5kb3cgdGh1bWJuYWlsLCBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCBjbG9zZSB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "40": {"version": "22", "sha256": "1jqbqsfcil3j6mikb7z1y89r3czpw1czsxh3hjln1198gb77v42k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLlxuRG8gTk9UIHVzZSBidWcgcmVwb3J0IGZvcm0gb24gdGhpcyBwYWdlLCBJIHdpbGwgTk9UIHJlc3BvbmQgdG8gaXQuXG5cbmtleXdvcmRzOiBrZXlib2FyZCBzaG9ydGN1dCwgc3dpdGNoIHdpbmRvd3MsIG92ZXJ2aWV3LCBhcHAgZ3JpZCwgY29tbWFuZCwgYnJpZ2h0bmVzcywgY29udHJhc3QsIHRyYW5zcGFyZW50LCBvcGFjaXR5LCBjb2xvciBlZmZlY3QsIGludmVydCBsaWdodG5lc3MsIGNvbG9yIHRpbnQsIGNvbG9yIGJsaW5kIGZpbHRlciwgc2ltdWxhdGlvbiwgZGVzYXR1cmF0ZSwgbmlnaHQgbGlnaHRzLCBkYXJrIHRoZW1lLCB2b2x1bWUsIG11dGUsIG1hZ25pZmllciwgem9vbSwgc2NyZWVuIGtleWJvYXJkLCByZWFkZXIsIGxhcmdlIHRleHQsIGZvcmNlIGNsb3NlLCBraWxsIC05LCBzaG93IGRlc2t0b3AsIHJlb3JkZXIgd29ya3NwYWNlLCB3aW5kb3cgdGh1bWJuYWlsLCBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCBjbG9zZSB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "41": {"version": "22", "sha256": "1jqbqsfcil3j6mikb7z1y89r3czpw1czsxh3hjln1198gb77v42k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLlxuRG8gTk9UIHVzZSBidWcgcmVwb3J0IGZvcm0gb24gdGhpcyBwYWdlLCBJIHdpbGwgTk9UIHJlc3BvbmQgdG8gaXQuXG5cbmtleXdvcmRzOiBrZXlib2FyZCBzaG9ydGN1dCwgc3dpdGNoIHdpbmRvd3MsIG92ZXJ2aWV3LCBhcHAgZ3JpZCwgY29tbWFuZCwgYnJpZ2h0bmVzcywgY29udHJhc3QsIHRyYW5zcGFyZW50LCBvcGFjaXR5LCBjb2xvciBlZmZlY3QsIGludmVydCBsaWdodG5lc3MsIGNvbG9yIHRpbnQsIGNvbG9yIGJsaW5kIGZpbHRlciwgc2ltdWxhdGlvbiwgZGVzYXR1cmF0ZSwgbmlnaHQgbGlnaHRzLCBkYXJrIHRoZW1lLCB2b2x1bWUsIG11dGUsIG1hZ25pZmllciwgem9vbSwgc2NyZWVuIGtleWJvYXJkLCByZWFkZXIsIGxhcmdlIHRleHQsIGZvcmNlIGNsb3NlLCBraWxsIC05LCBzaG93IGRlc2t0b3AsIHJlb3JkZXIgd29ya3NwYWNlLCB3aW5kb3cgdGh1bWJuYWlsLCBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCBjbG9zZSB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "1jqbqsfcil3j6mikb7z1y89r3czpw1czsxh3hjln1198gb77v42k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLlxuRG8gTk9UIHVzZSBidWcgcmVwb3J0IGZvcm0gb24gdGhpcyBwYWdlLCBJIHdpbGwgTk9UIHJlc3BvbmQgdG8gaXQuXG5cbmtleXdvcmRzOiBrZXlib2FyZCBzaG9ydGN1dCwgc3dpdGNoIHdpbmRvd3MsIG92ZXJ2aWV3LCBhcHAgZ3JpZCwgY29tbWFuZCwgYnJpZ2h0bmVzcywgY29udHJhc3QsIHRyYW5zcGFyZW50LCBvcGFjaXR5LCBjb2xvciBlZmZlY3QsIGludmVydCBsaWdodG5lc3MsIGNvbG9yIHRpbnQsIGNvbG9yIGJsaW5kIGZpbHRlciwgc2ltdWxhdGlvbiwgZGVzYXR1cmF0ZSwgbmlnaHQgbGlnaHRzLCBkYXJrIHRoZW1lLCB2b2x1bWUsIG11dGUsIG1hZ25pZmllciwgem9vbSwgc2NyZWVuIGtleWJvYXJkLCByZWFkZXIsIGxhcmdlIHRleHQsIGZvcmNlIGNsb3NlLCBraWxsIC05LCBzaG93IGRlc2t0b3AsIHJlb3JkZXIgd29ya3NwYWNlLCB3aW5kb3cgdGh1bWJuYWlsLCBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCBjbG9zZSB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "22", "sha256": "1jqbqsfcil3j6mikb7z1y89r3czpw1czsxh3hjln1198gb77v42k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLlxuRG8gTk9UIHVzZSBidWcgcmVwb3J0IGZvcm0gb24gdGhpcyBwYWdlLCBJIHdpbGwgTk9UIHJlc3BvbmQgdG8gaXQuXG5cbmtleXdvcmRzOiBrZXlib2FyZCBzaG9ydGN1dCwgc3dpdGNoIHdpbmRvd3MsIG92ZXJ2aWV3LCBhcHAgZ3JpZCwgY29tbWFuZCwgYnJpZ2h0bmVzcywgY29udHJhc3QsIHRyYW5zcGFyZW50LCBvcGFjaXR5LCBjb2xvciBlZmZlY3QsIGludmVydCBsaWdodG5lc3MsIGNvbG9yIHRpbnQsIGNvbG9yIGJsaW5kIGZpbHRlciwgc2ltdWxhdGlvbiwgZGVzYXR1cmF0ZSwgbmlnaHQgbGlnaHRzLCBkYXJrIHRoZW1lLCB2b2x1bWUsIG11dGUsIG1hZ25pZmllciwgem9vbSwgc2NyZWVuIGtleWJvYXJkLCByZWFkZXIsIGxhcmdlIHRleHQsIGZvcmNlIGNsb3NlLCBraWxsIC05LCBzaG93IGRlc2t0b3AsIHJlb3JkZXIgd29ya3NwYWNlLCB3aW5kb3cgdGh1bWJuYWlsLCBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCBjbG9zZSB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} -, {"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": "11", "sha256": "0jjjzcqdhprlbxk2aacb339spf3svpqyx9sz38cpw2xvy3hy6cy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgImdldHRleHQtZG9tYWluIjogImhhc3MtZ3NoZWxsIiwKICAibmFtZSI6ICJIb21lIEFzc2lzdGFudCBFeHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGFzcy1kYXRhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VvcGg5L2hhc3MtZ3NoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGFzcy1nc2hlbGxAZ2VvcGg5LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "0jjjzcqdhprlbxk2aacb339spf3svpqyx9sz38cpw2xvy3hy6cy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgImdldHRleHQtZG9tYWluIjogImhhc3MtZ3NoZWxsIiwKICAibmFtZSI6ICJIb21lIEFzc2lzdGFudCBFeHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGFzcy1kYXRhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VvcGg5L2hhc3MtZ3NoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGFzcy1nc2hlbGxAZ2VvcGg5LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxMQp9"}, "42": {"version": "11", "sha256": "0jjjzcqdhprlbxk2aacb339spf3svpqyx9sz38cpw2xvy3hy6cy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgImdldHRleHQtZG9tYWluIjogImhhc3MtZ3NoZWxsIiwKICAibmFtZSI6ICJIb21lIEFzc2lzdGFudCBFeHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGFzcy1kYXRhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VvcGg5L2hhc3MtZ3NoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGFzcy1nc2hlbGxAZ2VvcGg5LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxMQp9"}}} +, {"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 monitor corners/edges or custom keyboard shortcuts can trigger any of dozens built-in actions that helps you navigate and control your desktop environment, or your own shell commands.\n\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.\n\nPlease report bugs/issues on GitHub page linked below as Extension Homepage.\nDo NOT use bug report form on this page, I will NOT respond to it.\n\nkeywords: keyboard shortcut, switch windows, 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, close workspace, switcher, hide panel", "link": "https://extensions.gnome.org/extension/4167/custom-hot-corners-extended/", "shell_version_map": {"38": {"version": "23", "sha256": "0ndi14lls6532kx3xnl9p3kdq6cnxp54z6xbkrpymy3d7y8qq7yq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLlxuRG8gTk9UIHVzZSBidWcgcmVwb3J0IGZvcm0gb24gdGhpcyBwYWdlLCBJIHdpbGwgTk9UIHJlc3BvbmQgdG8gaXQuXG5cbmtleXdvcmRzOiBrZXlib2FyZCBzaG9ydGN1dCwgc3dpdGNoIHdpbmRvd3MsIG92ZXJ2aWV3LCBhcHAgZ3JpZCwgY29tbWFuZCwgYnJpZ2h0bmVzcywgY29udHJhc3QsIHRyYW5zcGFyZW50LCBvcGFjaXR5LCBjb2xvciBlZmZlY3QsIGludmVydCBsaWdodG5lc3MsIGNvbG9yIHRpbnQsIGNvbG9yIGJsaW5kIGZpbHRlciwgc2ltdWxhdGlvbiwgZGVzYXR1cmF0ZSwgbmlnaHQgbGlnaHRzLCBkYXJrIHRoZW1lLCB2b2x1bWUsIG11dGUsIG1hZ25pZmllciwgem9vbSwgc2NyZWVuIGtleWJvYXJkLCByZWFkZXIsIGxhcmdlIHRleHQsIGZvcmNlIGNsb3NlLCBraWxsIC05LCBzaG93IGRlc2t0b3AsIHJlb3JkZXIgd29ya3NwYWNlLCB3aW5kb3cgdGh1bWJuYWlsLCBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCBjbG9zZSB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "40": {"version": "23", "sha256": "0ndi14lls6532kx3xnl9p3kdq6cnxp54z6xbkrpymy3d7y8qq7yq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLlxuRG8gTk9UIHVzZSBidWcgcmVwb3J0IGZvcm0gb24gdGhpcyBwYWdlLCBJIHdpbGwgTk9UIHJlc3BvbmQgdG8gaXQuXG5cbmtleXdvcmRzOiBrZXlib2FyZCBzaG9ydGN1dCwgc3dpdGNoIHdpbmRvd3MsIG92ZXJ2aWV3LCBhcHAgZ3JpZCwgY29tbWFuZCwgYnJpZ2h0bmVzcywgY29udHJhc3QsIHRyYW5zcGFyZW50LCBvcGFjaXR5LCBjb2xvciBlZmZlY3QsIGludmVydCBsaWdodG5lc3MsIGNvbG9yIHRpbnQsIGNvbG9yIGJsaW5kIGZpbHRlciwgc2ltdWxhdGlvbiwgZGVzYXR1cmF0ZSwgbmlnaHQgbGlnaHRzLCBkYXJrIHRoZW1lLCB2b2x1bWUsIG11dGUsIG1hZ25pZmllciwgem9vbSwgc2NyZWVuIGtleWJvYXJkLCByZWFkZXIsIGxhcmdlIHRleHQsIGZvcmNlIGNsb3NlLCBraWxsIC05LCBzaG93IGRlc2t0b3AsIHJlb3JkZXIgd29ya3NwYWNlLCB3aW5kb3cgdGh1bWJuYWlsLCBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCBjbG9zZSB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "41": {"version": "23", "sha256": "0ndi14lls6532kx3xnl9p3kdq6cnxp54z6xbkrpymy3d7y8qq7yq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLlxuRG8gTk9UIHVzZSBidWcgcmVwb3J0IGZvcm0gb24gdGhpcyBwYWdlLCBJIHdpbGwgTk9UIHJlc3BvbmQgdG8gaXQuXG5cbmtleXdvcmRzOiBrZXlib2FyZCBzaG9ydGN1dCwgc3dpdGNoIHdpbmRvd3MsIG92ZXJ2aWV3LCBhcHAgZ3JpZCwgY29tbWFuZCwgYnJpZ2h0bmVzcywgY29udHJhc3QsIHRyYW5zcGFyZW50LCBvcGFjaXR5LCBjb2xvciBlZmZlY3QsIGludmVydCBsaWdodG5lc3MsIGNvbG9yIHRpbnQsIGNvbG9yIGJsaW5kIGZpbHRlciwgc2ltdWxhdGlvbiwgZGVzYXR1cmF0ZSwgbmlnaHQgbGlnaHRzLCBkYXJrIHRoZW1lLCB2b2x1bWUsIG11dGUsIG1hZ25pZmllciwgem9vbSwgc2NyZWVuIGtleWJvYXJkLCByZWFkZXIsIGxhcmdlIHRleHQsIGZvcmNlIGNsb3NlLCBraWxsIC05LCBzaG93IGRlc2t0b3AsIHJlb3JkZXIgd29ya3NwYWNlLCB3aW5kb3cgdGh1bWJuYWlsLCBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCBjbG9zZSB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "42": {"version": "23", "sha256": "0ndi14lls6532kx3xnl9p3kdq6cnxp54z6xbkrpymy3d7y8qq7yq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLlxuRG8gTk9UIHVzZSBidWcgcmVwb3J0IGZvcm0gb24gdGhpcyBwYWdlLCBJIHdpbGwgTk9UIHJlc3BvbmQgdG8gaXQuXG5cbmtleXdvcmRzOiBrZXlib2FyZCBzaG9ydGN1dCwgc3dpdGNoIHdpbmRvd3MsIG92ZXJ2aWV3LCBhcHAgZ3JpZCwgY29tbWFuZCwgYnJpZ2h0bmVzcywgY29udHJhc3QsIHRyYW5zcGFyZW50LCBvcGFjaXR5LCBjb2xvciBlZmZlY3QsIGludmVydCBsaWdodG5lc3MsIGNvbG9yIHRpbnQsIGNvbG9yIGJsaW5kIGZpbHRlciwgc2ltdWxhdGlvbiwgZGVzYXR1cmF0ZSwgbmlnaHQgbGlnaHRzLCBkYXJrIHRoZW1lLCB2b2x1bWUsIG11dGUsIG1hZ25pZmllciwgem9vbSwgc2NyZWVuIGtleWJvYXJkLCByZWFkZXIsIGxhcmdlIHRleHQsIGZvcmNlIGNsb3NlLCBraWxsIC05LCBzaG93IGRlc2t0b3AsIHJlb3JkZXIgd29ya3NwYWNlLCB3aW5kb3cgdGh1bWJuYWlsLCBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCBjbG9zZSB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "43": {"version": "23", "sha256": "0ndi14lls6532kx3xnl9p3kdq6cnxp54z6xbkrpymy3d7y8qq7yq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLlxuRG8gTk9UIHVzZSBidWcgcmVwb3J0IGZvcm0gb24gdGhpcyBwYWdlLCBJIHdpbGwgTk9UIHJlc3BvbmQgdG8gaXQuXG5cbmtleXdvcmRzOiBrZXlib2FyZCBzaG9ydGN1dCwgc3dpdGNoIHdpbmRvd3MsIG92ZXJ2aWV3LCBhcHAgZ3JpZCwgY29tbWFuZCwgYnJpZ2h0bmVzcywgY29udHJhc3QsIHRyYW5zcGFyZW50LCBvcGFjaXR5LCBjb2xvciBlZmZlY3QsIGludmVydCBsaWdodG5lc3MsIGNvbG9yIHRpbnQsIGNvbG9yIGJsaW5kIGZpbHRlciwgc2ltdWxhdGlvbiwgZGVzYXR1cmF0ZSwgbmlnaHQgbGlnaHRzLCBkYXJrIHRoZW1lLCB2b2x1bWUsIG11dGUsIG1hZ25pZmllciwgem9vbSwgc2NyZWVuIGtleWJvYXJkLCByZWFkZXIsIGxhcmdlIHRleHQsIGZvcmNlIGNsb3NlLCBraWxsIC05LCBzaG93IGRlc2t0b3AsIHJlb3JkZXIgd29ya3NwYWNlLCB3aW5kb3cgdGh1bWJuYWlsLCBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCBjbG9zZSB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} +, {"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": "11", "sha256": "0jjjzcqdhprlbxk2aacb339spf3svpqyx9sz38cpw2xvy3hy6cy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgImdldHRleHQtZG9tYWluIjogImhhc3MtZ3NoZWxsIiwKICAibmFtZSI6ICJIb21lIEFzc2lzdGFudCBFeHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGFzcy1kYXRhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VvcGg5L2hhc3MtZ3NoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGFzcy1nc2hlbGxAZ2VvcGg5LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "0jjjzcqdhprlbxk2aacb339spf3svpqyx9sz38cpw2xvy3hy6cy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgImdldHRleHQtZG9tYWluIjogImhhc3MtZ3NoZWxsIiwKICAibmFtZSI6ICJIb21lIEFzc2lzdGFudCBFeHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGFzcy1kYXRhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VvcGg5L2hhc3MtZ3NoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGFzcy1nc2hlbGxAZ2VvcGg5LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxMQp9"}, "42": {"version": "11", "sha256": "0jjjzcqdhprlbxk2aacb339spf3svpqyx9sz38cpw2xvy3hy6cy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgImdldHRleHQtZG9tYWluIjogImhhc3MtZ3NoZWxsIiwKICAibmFtZSI6ICJIb21lIEFzc2lzdGFudCBFeHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGFzcy1kYXRhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VvcGg5L2hhc3MtZ3NoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGFzcy1nc2hlbGxAZ2VvcGg5LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxMQp9"}, "43": {"version": "15", "sha256": "1wsc395r2qm6i1yhrp0vlbrc3clfda9msycsijii6jd713kfnq1l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgImdldHRleHQtZG9tYWluIjogImhhc3MtZ3NoZWxsIiwKICAibmFtZSI6ICJIb21lIEFzc2lzdGFudCBFeHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGFzcy1kYXRhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dlb3BoOS9oYXNzLWdzaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImhhc3MtZ3NoZWxsQGdlb3BoOS1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} , {"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": "6", "sha256": "1xfq9i816p0djfidimgci5xk1mjfrka0xrvxrs44lsqq109xf8pc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGx5IHRyYW5zcGFyZW50IHRvcGJhciwgcGFpcnMgd2l0aCB0aGUgemhhbmdoYWkgdHJhbnNwYXJlbnQgdG9wIGJhciBleHRlbnNpb24gdG8gbWFrZSBiYXIgb3BhcXVlIHdoZW4gd2luZG93IGlzIG1heGltaXplZCIsCiAgIm5hbWUiOiAiQ2xlYXIgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1cGVydGVycmFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jbGVhci10b3AtYmFyIiwKICAidXVpZCI6ICJjbGVhci10b3AtYmFyQHN1cGVydGVycmFuLm5ldCIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1xfq9i816p0djfidimgci5xk1mjfrka0xrvxrs44lsqq109xf8pc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGx5IHRyYW5zcGFyZW50IHRvcGJhciwgcGFpcnMgd2l0aCB0aGUgemhhbmdoYWkgdHJhbnNwYXJlbnQgdG9wIGJhciBleHRlbnNpb24gdG8gbWFrZSBiYXIgb3BhcXVlIHdoZW4gd2luZG93IGlzIG1heGltaXplZCIsCiAgIm5hbWUiOiAiQ2xlYXIgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1cGVydGVycmFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jbGVhci10b3AtYmFyIiwKICAidXVpZCI6ICJjbGVhci10b3AtYmFyQHN1cGVydGVycmFuLm5ldCIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "1xfq9i816p0djfidimgci5xk1mjfrka0xrvxrs44lsqq109xf8pc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGx5IHRyYW5zcGFyZW50IHRvcGJhciwgcGFpcnMgd2l0aCB0aGUgemhhbmdoYWkgdHJhbnNwYXJlbnQgdG9wIGJhciBleHRlbnNpb24gdG8gbWFrZSBiYXIgb3BhcXVlIHdoZW4gd2luZG93IGlzIG1heGltaXplZCIsCiAgIm5hbWUiOiAiQ2xlYXIgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1cGVydGVycmFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jbGVhci10b3AtYmFyIiwKICAidXVpZCI6ICJjbGVhci10b3AtYmFyQHN1cGVydGVycmFuLm5ldCIsCiAgInZlcnNpb24iOiA2Cn0="}}} -, {"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": "11", "sha256": "08rddd5nmyrfjqdzjq5yb6rbwrcw5n6r4yp6i86ba9bhn22c77qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvc3lzdGVtZC1tYW5hZ2VyIiwKICAidXVpZCI6ICJzeXN0ZW1kLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "08rddd5nmyrfjqdzjq5yb6rbwrcw5n6r4yp6i86ba9bhn22c77qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvc3lzdGVtZC1tYW5hZ2VyIiwKICAidXVpZCI6ICJzeXN0ZW1kLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "08rddd5nmyrfjqdzjq5yb6rbwrcw5n6r4yp6i86ba9bhn22c77qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvc3lzdGVtZC1tYW5hZ2VyIiwKICAidXVpZCI6ICJzeXN0ZW1kLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "08rddd5nmyrfjqdzjq5yb6rbwrcw5n6r4yp6i86ba9bhn22c77qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvc3lzdGVtZC1tYW5hZ2VyIiwKICAidXVpZCI6ICJzeXN0ZW1kLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "11", "sha256": "08rddd5nmyrfjqdzjq5yb6rbwrcw5n6r4yp6i86ba9bhn22c77qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvc3lzdGVtZC1tYW5hZ2VyIiwKICAidXVpZCI6ICJzeXN0ZW1kLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDExCn0="}}} +, {"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": "12", "sha256": "1cjh0zdc7808jk37bxd2xydlmn2svm9f9sw2g8cwjrq77ss28qm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvc3lzdGVtZC1tYW5hZ2VyIiwKICAidXVpZCI6ICJzeXN0ZW1kLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "12", "sha256": "1cjh0zdc7808jk37bxd2xydlmn2svm9f9sw2g8cwjrq77ss28qm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvc3lzdGVtZC1tYW5hZ2VyIiwKICAidXVpZCI6ICJzeXN0ZW1kLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "1cjh0zdc7808jk37bxd2xydlmn2svm9f9sw2g8cwjrq77ss28qm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvc3lzdGVtZC1tYW5hZ2VyIiwKICAidXVpZCI6ICJzeXN0ZW1kLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "12", "sha256": "1cjh0zdc7808jk37bxd2xydlmn2svm9f9sw2g8cwjrq77ss28qm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvc3lzdGVtZC1tYW5hZ2VyIiwKICAidXVpZCI6ICJzeXN0ZW1kLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDEyCn0="}, "43": {"version": "12", "sha256": "1cjh0zdc7808jk37bxd2xydlmn2svm9f9sw2g8cwjrq77ss28qm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvc3lzdGVtZC1tYW5hZ2VyIiwKICAidXVpZCI6ICJzeXN0ZW1kLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDEyCn0="}}} , {"uuid": "auto-activities@acedron.github.io", "name": "Auto Activities (DEPRECATED)", "pname": "auto-activities", "description": "Show activities overview when there are no windows, or hide it when there are new windows.\n\n--DEPRECATED--\nDeprecated in favor of https://extensions.gnome.org/extension/5500/auto-activities", "link": "https://extensions.gnome.org/extension/4179/auto-activities/", "shell_version_map": {"40": {"version": "14", "sha256": "134yqy4rbg1svicfkgp5z6ni1w6vvjg5s7apa5j4ynkgycqmrlam", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG4tLURFUFJFQ0FURUQtLVxuRGVwcmVjYXRlZCBpbiBmYXZvciBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi81NTAwL2F1dG8tYWN0aXZpdGllcyIsCiAgImdldHRleHQtZG9tYWluIjogImF1dG8tYWN0aXZpdGllcyIsCiAgIm5hbWUiOiAiQXV0byBBY3Rpdml0aWVzIChERVBSRUNBVEVEKSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJhY2Vkcm9uc0B5YWhvby5jby5qcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NsZW9NZW5lemVzSnIvYXV0by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJhdXRvLWFjdGl2aXRpZXNAYWNlZHJvbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "41": {"version": "14", "sha256": "134yqy4rbg1svicfkgp5z6ni1w6vvjg5s7apa5j4ynkgycqmrlam", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG4tLURFUFJFQ0FURUQtLVxuRGVwcmVjYXRlZCBpbiBmYXZvciBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi81NTAwL2F1dG8tYWN0aXZpdGllcyIsCiAgImdldHRleHQtZG9tYWluIjogImF1dG8tYWN0aXZpdGllcyIsCiAgIm5hbWUiOiAiQXV0byBBY3Rpdml0aWVzIChERVBSRUNBVEVEKSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJhY2Vkcm9uc0B5YWhvby5jby5qcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NsZW9NZW5lemVzSnIvYXV0by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJhdXRvLWFjdGl2aXRpZXNAYWNlZHJvbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "42": {"version": "14", "sha256": "134yqy4rbg1svicfkgp5z6ni1w6vvjg5s7apa5j4ynkgycqmrlam", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG4tLURFUFJFQ0FURUQtLVxuRGVwcmVjYXRlZCBpbiBmYXZvciBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi81NTAwL2F1dG8tYWN0aXZpdGllcyIsCiAgImdldHRleHQtZG9tYWluIjogImF1dG8tYWN0aXZpdGllcyIsCiAgIm5hbWUiOiAiQXV0byBBY3Rpdml0aWVzIChERVBSRUNBVEVEKSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJhY2Vkcm9uc0B5YWhvby5jby5qcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NsZW9NZW5lemVzSnIvYXV0by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJhdXRvLWFjdGl2aXRpZXNAYWNlZHJvbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} , {"uuid": "clippie@blackjackshellac.ca", "name": "clippie [replaced by eclipse]", "pname": "clippie", "description": "clippie has been rereleased as 'eclipse'\n\nClipboard interface to gpaste-client output\n\nhttps://extensions.gnome.org/extension/4246/eclipse/\n\nClippie now uses dbus to communicate with the gpaste daemon\nAdded encryption of clipboard items with eclipse feature", "link": "https://extensions.gnome.org/extension/4182/clippie/", "shell_version_map": {"38": {"version": "6", "sha256": "05kd2pq605k21yq6wcaqcm2lrpnlc6mbiq1wxgmwdnpvi7ib2h8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNsaXBwaWUgaGFzIGJlZW4gcmVyZWxlYXNlZCBhcyAnZWNsaXBzZSdcblxuQ2xpcGJvYXJkIGludGVyZmFjZSB0byBncGFzdGUtY2xpZW50IG91dHB1dFxuXG5odHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi80MjQ2L2VjbGlwc2UvXG5cbkNsaXBwaWUgbm93IHVzZXMgZGJ1cyB0byBjb21tdW5pY2F0ZSB3aXRoIHRoZSBncGFzdGUgZGFlbW9uXG5BZGRlZCBlbmNyeXB0aW9uIG9mIGNsaXBib2FyZCBpdGVtcyB3aXRoIGVjbGlwc2UgZmVhdHVyZSIsCiAgImdldHRleHQtZG9tYWluIjogImNsaXBwaWUtYmxhY2tqYWNrc2hlbGxhYyIsCiAgIm5hbWUiOiAiY2xpcHBpZSBbcmVwbGFjZWQgYnkgZWNsaXBzZV0iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2xpcHBpZS1ibGFja2phY2tzaGVsbGFjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsYWNramFja3NoZWxsYWMvZWNsaXBzZSIsCiAgInV1aWQiOiAiY2xpcHBpZUBibGFja2phY2tzaGVsbGFjLmNhIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "05kd2pq605k21yq6wcaqcm2lrpnlc6mbiq1wxgmwdnpvi7ib2h8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNsaXBwaWUgaGFzIGJlZW4gcmVyZWxlYXNlZCBhcyAnZWNsaXBzZSdcblxuQ2xpcGJvYXJkIGludGVyZmFjZSB0byBncGFzdGUtY2xpZW50IG91dHB1dFxuXG5odHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi80MjQ2L2VjbGlwc2UvXG5cbkNsaXBwaWUgbm93IHVzZXMgZGJ1cyB0byBjb21tdW5pY2F0ZSB3aXRoIHRoZSBncGFzdGUgZGFlbW9uXG5BZGRlZCBlbmNyeXB0aW9uIG9mIGNsaXBib2FyZCBpdGVtcyB3aXRoIGVjbGlwc2UgZmVhdHVyZSIsCiAgImdldHRleHQtZG9tYWluIjogImNsaXBwaWUtYmxhY2tqYWNrc2hlbGxhYyIsCiAgIm5hbWUiOiAiY2xpcHBpZSBbcmVwbGFjZWQgYnkgZWNsaXBzZV0iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2xpcHBpZS1ibGFja2phY2tzaGVsbGFjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsYWNramFja3NoZWxsYWMvZWNsaXBzZSIsCiAgInV1aWQiOiAiY2xpcHBpZUBibGFja2phY2tzaGVsbGFjLmNhIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "screen-autorotate@kosmospredanie.yandex.ru", "name": "Screen Autorotate", "pname": "screen-autorotate", "description": "Enable screen rotation regardless of touch mode", "link": "https://extensions.gnome.org/extension/4191/screen-autorotate/", "shell_version_map": {"40": {"version": "3", "sha256": "1sfk9801zqg2cd7w5mkm5qr2zkjm5dbhvi3bcxkf9ikg2ilxcq9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNjcmVlbi1hdXRvcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gQXV0b3JvdGF0ZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tYXV0b3JvdGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29zbW9zcHJlZGFuaWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNjcmVlbi1hdXRvcm90YXRlIiwKICAidXVpZCI6ICJzY3JlZW4tYXV0b3JvdGF0ZUBrb3Ntb3NwcmVkYW5pZS55YW5kZXgucnUiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1sfk9801zqg2cd7w5mkm5qr2zkjm5dbhvi3bcxkf9ikg2ilxcq9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNjcmVlbi1hdXRvcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gQXV0b3JvdGF0ZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tYXV0b3JvdGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29zbW9zcHJlZGFuaWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNjcmVlbi1hdXRvcm90YXRlIiwKICAidXVpZCI6ICJzY3JlZW4tYXV0b3JvdGF0ZUBrb3Ntb3NwcmVkYW5pZS55YW5kZXgucnUiLAogICJ2ZXJzaW9uIjogMwp9"}}} @@ -501,15 +502,15 @@ , {"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": "14", "sha256": "00mgrjk4a8rxch0ghj7vjb2ddhc2bicbrnfxsddj6k57yclac0am", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGludGVncmF0aW9uIGZvciBQbGFuaywgdGhlIHNpbXBsZXN0IGRvY2sgb24gdGhlIHBsYW5ldC4gVG8gdXNlIHRoaXMgZXh0ZW5zaW9uLCB5b3UgbXVzdCBoYXZlIFBsYW5rIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbS5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBQbGFuay4gVG8gaW5zdGFsbCBpdDpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgcGxhbmtcbi0gRmVkb3JhL1JIRUw6IGRuZiBpbnN0YWxsIHBsYW5rXG4tIEFyY2g6IHBhY21hbiAtUyBwbGFua1xuXG4qKiBUaGlzIGV4dGVuc2lvbiBkb2VzIE5PVCBXT1JLIG9uIFdBWUxBTkQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaC10by1wbGFuayIsCiAgIm5hbWUiOiAiRGFzaCB0byBQbGFuayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoLXRvLXBsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXNoLXRvLXBsYW5rIiwKICAidXVpZCI6ICJkYXNoLXRvLXBsYW5rQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiAxNAp9"}, "40": {"version": "14", "sha256": "00mgrjk4a8rxch0ghj7vjb2ddhc2bicbrnfxsddj6k57yclac0am", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGludGVncmF0aW9uIGZvciBQbGFuaywgdGhlIHNpbXBsZXN0IGRvY2sgb24gdGhlIHBsYW5ldC4gVG8gdXNlIHRoaXMgZXh0ZW5zaW9uLCB5b3UgbXVzdCBoYXZlIFBsYW5rIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbS5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBQbGFuay4gVG8gaW5zdGFsbCBpdDpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgcGxhbmtcbi0gRmVkb3JhL1JIRUw6IGRuZiBpbnN0YWxsIHBsYW5rXG4tIEFyY2g6IHBhY21hbiAtUyBwbGFua1xuXG4qKiBUaGlzIGV4dGVuc2lvbiBkb2VzIE5PVCBXT1JLIG9uIFdBWUxBTkQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaC10by1wbGFuayIsCiAgIm5hbWUiOiAiRGFzaCB0byBQbGFuayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoLXRvLXBsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXNoLXRvLXBsYW5rIiwKICAidXVpZCI6ICJkYXNoLXRvLXBsYW5rQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiAxNAp9"}, "41": {"version": "14", "sha256": "00mgrjk4a8rxch0ghj7vjb2ddhc2bicbrnfxsddj6k57yclac0am", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGludGVncmF0aW9uIGZvciBQbGFuaywgdGhlIHNpbXBsZXN0IGRvY2sgb24gdGhlIHBsYW5ldC4gVG8gdXNlIHRoaXMgZXh0ZW5zaW9uLCB5b3UgbXVzdCBoYXZlIFBsYW5rIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbS5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBQbGFuay4gVG8gaW5zdGFsbCBpdDpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgcGxhbmtcbi0gRmVkb3JhL1JIRUw6IGRuZiBpbnN0YWxsIHBsYW5rXG4tIEFyY2g6IHBhY21hbiAtUyBwbGFua1xuXG4qKiBUaGlzIGV4dGVuc2lvbiBkb2VzIE5PVCBXT1JLIG9uIFdBWUxBTkQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaC10by1wbGFuayIsCiAgIm5hbWUiOiAiRGFzaCB0byBQbGFuayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoLXRvLXBsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXNoLXRvLXBsYW5rIiwKICAidXVpZCI6ICJkYXNoLXRvLXBsYW5rQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiAxNAp9"}, "42": {"version": "14", "sha256": "00mgrjk4a8rxch0ghj7vjb2ddhc2bicbrnfxsddj6k57yclac0am", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGludGVncmF0aW9uIGZvciBQbGFuaywgdGhlIHNpbXBsZXN0IGRvY2sgb24gdGhlIHBsYW5ldC4gVG8gdXNlIHRoaXMgZXh0ZW5zaW9uLCB5b3UgbXVzdCBoYXZlIFBsYW5rIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbS5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBQbGFuay4gVG8gaW5zdGFsbCBpdDpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgcGxhbmtcbi0gRmVkb3JhL1JIRUw6IGRuZiBpbnN0YWxsIHBsYW5rXG4tIEFyY2g6IHBhY21hbiAtUyBwbGFua1xuXG4qKiBUaGlzIGV4dGVuc2lvbiBkb2VzIE5PVCBXT1JLIG9uIFdBWUxBTkQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaC10by1wbGFuayIsCiAgIm5hbWUiOiAiRGFzaCB0byBQbGFuayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoLXRvLXBsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXNoLXRvLXBsYW5rIiwKICAidXVpZCI6ICJkYXNoLXRvLXBsYW5rQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiAxNAp9"}, "43": {"version": "14", "sha256": "00mgrjk4a8rxch0ghj7vjb2ddhc2bicbrnfxsddj6k57yclac0am", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGludGVncmF0aW9uIGZvciBQbGFuaywgdGhlIHNpbXBsZXN0IGRvY2sgb24gdGhlIHBsYW5ldC4gVG8gdXNlIHRoaXMgZXh0ZW5zaW9uLCB5b3UgbXVzdCBoYXZlIFBsYW5rIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbS5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBQbGFuay4gVG8gaW5zdGFsbCBpdDpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgcGxhbmtcbi0gRmVkb3JhL1JIRUw6IGRuZiBpbnN0YWxsIHBsYW5rXG4tIEFyY2g6IHBhY21hbiAtUyBwbGFua1xuXG4qKiBUaGlzIGV4dGVuc2lvbiBkb2VzIE5PVCBXT1JLIG9uIFdBWUxBTkQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaC10by1wbGFuayIsCiAgIm5hbWUiOiAiRGFzaCB0byBQbGFuayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoLXRvLXBsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXNoLXRvLXBsYW5rIiwKICAidXVpZCI6ICJkYXNoLXRvLXBsYW5rQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiAxNAp9"}}} , {"uuid": "rrc@ogarcia.me", "name": "Remove Rounded Corners", "pname": "remove-rounded-corners", "description": "Removes rounded corners from main panel or top bar\n\nWARNING: From GNOME 42 onwards this extension is not needed since it no longer has rounded corners", "link": "https://extensions.gnome.org/extension/4201/remove-rounded-corners/", "shell_version_map": {"40": {"version": "5", "sha256": "1xi1al0kaqk381sf4p2q8lj0f7hbhirh523sy5h2510p4xwaybwi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgcm91bmRlZCBjb3JuZXJzIGZyb20gbWFpbiBwYW5lbCBvciB0b3AgYmFyXG5cbldBUk5JTkc6IEZyb20gR05PTUUgNDIgb253YXJkcyB0aGlzIGV4dGVuc2lvbiBpcyBub3QgbmVlZGVkIHNpbmNlIGl0IG5vIGxvbmdlciBoYXMgcm91bmRlZCBjb3JuZXJzIiwKICAibmFtZSI6ICJSZW1vdmUgUm91bmRlZCBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vZ2FyY2lhL3JlbW92ZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogInJyY0BvZ2FyY2lhLm1lIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "1xi1al0kaqk381sf4p2q8lj0f7hbhirh523sy5h2510p4xwaybwi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgcm91bmRlZCBjb3JuZXJzIGZyb20gbWFpbiBwYW5lbCBvciB0b3AgYmFyXG5cbldBUk5JTkc6IEZyb20gR05PTUUgNDIgb253YXJkcyB0aGlzIGV4dGVuc2lvbiBpcyBub3QgbmVlZGVkIHNpbmNlIGl0IG5vIGxvbmdlciBoYXMgcm91bmRlZCBjb3JuZXJzIiwKICAibmFtZSI6ICJSZW1vdmUgUm91bmRlZCBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vZ2FyY2lhL3JlbW92ZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogInJyY0BvZ2FyY2lhLm1lIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"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": "11", "sha256": "0661a17dih6d6pfpilhnv70wsf5v4b8ixwvmbswllmd07x2791dw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0661a17dih6d6pfpilhnv70wsf5v4b8ixwvmbswllmd07x2791dw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "0661a17dih6d6pfpilhnv70wsf5v4b8ixwvmbswllmd07x2791dw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "43": {"version": "11", "sha256": "0661a17dih6d6pfpilhnv70wsf5v4b8ixwvmbswllmd07x2791dw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} +, {"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": "12", "sha256": "1bxcynflaray45x57zyhcfq4jbyfshs9pbikgvry5sp0ljvsmwvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "41": {"version": "12", "sha256": "1bxcynflaray45x57zyhcfq4jbyfshs9pbikgvry5sp0ljvsmwvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "42": {"version": "12", "sha256": "1bxcynflaray45x57zyhcfq4jbyfshs9pbikgvry5sp0ljvsmwvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "43": {"version": "12", "sha256": "1bxcynflaray45x57zyhcfq4jbyfshs9pbikgvry5sp0ljvsmwvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}}} , {"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\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": "16", "sha256": "1h0bzw25arzd1rfdavl7b0xny078agl5cfp665xdkc89701q7wf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZSIsCiAgInV1aWQiOiAiaG90ZWRnZUBqb25hdGhhbi5qZG9kYS5jYSIsCiAgInZlcnNpb24iOiAxNgp9"}, "41": {"version": "16", "sha256": "1h0bzw25arzd1rfdavl7b0xny078agl5cfp665xdkc89701q7wf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZSIsCiAgInV1aWQiOiAiaG90ZWRnZUBqb25hdGhhbi5qZG9kYS5jYSIsCiAgInZlcnNpb24iOiAxNgp9"}, "42": {"version": "16", "sha256": "1h0bzw25arzd1rfdavl7b0xny078agl5cfp665xdkc89701q7wf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZSIsCiAgInV1aWQiOiAiaG90ZWRnZUBqb25hdGhhbi5qZG9kYS5jYSIsCiAgInZlcnNpb24iOiAxNgp9"}, "43": {"version": "16", "sha256": "1h0bzw25arzd1rfdavl7b0xny078agl5cfp665xdkc89701q7wf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZSIsCiAgInV1aWQiOiAiaG90ZWRnZUBqb25hdGhhbi5qZG9kYS5jYSIsCiAgInZlcnNpb24iOiAxNgp9"}}} , {"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": "7", "sha256": "1lck0xfigdlhyrsn9kv4z27r3h8q3xzs0qf7gai30ml1lw8kkv2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL3dpcmVsZXNzLWhpZCIsCiAgInV1aWQiOiAid2lyZWxlc3MtaGlkQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "1lck0xfigdlhyrsn9kv4z27r3h8q3xzs0qf7gai30ml1lw8kkv2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL3dpcmVsZXNzLWhpZCIsCiAgInV1aWQiOiAid2lyZWxlc3MtaGlkQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1lck0xfigdlhyrsn9kv4z27r3h8q3xzs0qf7gai30ml1lw8kkv2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL3dpcmVsZXNzLWhpZCIsCiAgInV1aWQiOiAid2lyZWxlc3MtaGlkQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "7", "sha256": "1lck0xfigdlhyrsn9kv4z27r3h8q3xzs0qf7gai30ml1lw8kkv2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL3dpcmVsZXNzLWhpZCIsCiAgInV1aWQiOiAid2lyZWxlc3MtaGlkQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "43": {"version": "7", "sha256": "1lck0xfigdlhyrsn9kv4z27r3h8q3xzs0qf7gai30ml1lw8kkv2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL3dpcmVsZXNzLWhpZCIsCiAgInV1aWQiOiAid2lyZWxlc3MtaGlkQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} +, {"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": "9", "sha256": "1r0l7jr97q4nghsgldd79prp42wda6z1zpy4ldl9n0a1lxg01c87", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "1r0l7jr97q4nghsgldd79prp42wda6z1zpy4ldl9n0a1lxg01c87", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "1r0l7jr97q4nghsgldd79prp42wda6z1zpy4ldl9n0a1lxg01c87", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "1r0l7jr97q4nghsgldd79prp42wda6z1zpy4ldl9n0a1lxg01c87", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "43": {"version": "9", "sha256": "1r0l7jr97q4nghsgldd79prp42wda6z1zpy4ldl9n0a1lxg01c87", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"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", "link": "https://extensions.gnome.org/extension/4234/arbtt-stats/", "shell_version_map": {"38": {"version": "11", "sha256": "1aqw1s7r3mk4dk6plx826i9ha478v40l8hld458a1riajxhyv0s3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgc2ltcGxlIGFyYnR0IHN0YXRzIG9uIHRoZSBwYW5lbCIsCiAgIm5hbWUiOiAiQXJidHQgc3RhdHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoZXJ3b29kaW5jL2FyYnR0LXN0YXRzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXJidHRzdGF0c0BnZXJ2YXNpb3BlcmV6LmFyIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "1aqw1s7r3mk4dk6plx826i9ha478v40l8hld458a1riajxhyv0s3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgc2ltcGxlIGFyYnR0IHN0YXRzIG9uIHRoZSBwYW5lbCIsCiAgIm5hbWUiOiAiQXJidHQgc3RhdHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoZXJ3b29kaW5jL2FyYnR0LXN0YXRzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXJidHRzdGF0c0BnZXJ2YXNpb3BlcmV6LmFyIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "1aqw1s7r3mk4dk6plx826i9ha478v40l8hld458a1riajxhyv0s3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgc2ltcGxlIGFyYnR0IHN0YXRzIG9uIHRoZSBwYW5lbCIsCiAgIm5hbWUiOiAiQXJidHQgc3RhdHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoZXJ3b29kaW5jL2FyYnR0LXN0YXRzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXJidHRzdGF0c0BnZXJ2YXNpb3BlcmV6LmFyIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"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• Application specific keyboard shortcut based hold-swipe gestures (e.g., navigating browser tabs)\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": "0srrlqk0h62d9ivhkv1gciw0zgp4rs6p6pc9p1w4gsayhh7zsqf2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmUgdG91Y2hwYWQgZ2VzdHVyZXMgZm9yIFdheWxhbmQvWDExXG5cblRoaXMgZXh0ZW5zaW9uIGFkZHMgZm9sbG93aW5nIGZlYXR1cmVzOlxuXG5cdTIwMjIgU3dpdGNoIHdpbmRvd3MgZnJvbSBjdXJyZW50IHdvcmtzcGFjZSB1c2luZyAzLWZpbmdlciBob3Jpem9udGFsIHN3aXBlXG5cdTIwMjIgQ3ljbGljIGdlc3R1cmVzIGJldHdlZW4gRGVza3RvcC9PdmVydmlldy9BcHBHcmlkIHVzaW5nIDQgdmVydGljYWwgc3dpcGVcblx1MjAyMiBTd2l0Y2ggYXBwLXBhZ2VzIHVzaW5nIDMtZmluZ2VyIHN3aXBlIGdlc3R1cmUgb24gQXBwR3JpZFxuXHUyMDIyIFVubWF4aW1pemUvbWF4aW1pemUvZnVsbHNjcmVlbi9oYWxmLXRpbGluZyB1c2luZyAzLWZpbmdlciB2ZXJ0aWNhbCAmIGhvcml6b250YWwgZ2VzdHVyZVxuXHUyMDIyIE9wdGlvbmFsIG1pbmltaXplIGEgd2luZG93IGdlc3R1cmVcblx1MjAyMiBPdmVycmlkZSAzLWZpbmdlciBnZXN0dXJlIHdpdGggNC1maW5nZXIgZm9yIHN3aXRjaGluZyB3b3Jrc3BhY2Vcblx1MjAyMiBQaW5jaCB0byBzaG93IGRlc2t0b3Bcblx1MjAyMiBBcHBsaWNhdGlvbiBzcGVjaWZpYyBrZXlib2FyZCBzaG9ydGN1dCBiYXNlZCBob2xkLXN3aXBlIGdlc3R1cmVzIChlLmcuLCBuYXZpZ2F0aW5nIGJyb3dzZXIgdGFicylcblx1MjAyMiBDb25maWd1cmUgc3BlZWQgb2YgZ2VzdHVyZXNcblx1MjAyMiBTdXBwb3J0IGZvciBYMTFcbiAgIFxuT24gWDExLCB5b3UgbmVlZCB0byBpbnN0YWxsIGh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLXgxMS1nZXN0dXJlLWRhZW1vblxuXG5SZXBvcnQgYW55IGJ1Z3MvcmVxdWVzdHMgb24gR2l0SHViIChsaW5rIGRpcmVjdGx5IGJlbG93KVxuIiwKICAibmFtZSI6ICJHZXN0dXJlIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nZXN0dXJlSW1wcm92ZW1lbnRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLWdlc3R1cmUtaW1wcm92ZW1lbnRzIiwKICAidXVpZCI6ICJnZXN0dXJlSW1wcm92ZW1lbnRzQGdlc3R1cmVzIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "0srrlqk0h62d9ivhkv1gciw0zgp4rs6p6pc9p1w4gsayhh7zsqf2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmUgdG91Y2hwYWQgZ2VzdHVyZXMgZm9yIFdheWxhbmQvWDExXG5cblRoaXMgZXh0ZW5zaW9uIGFkZHMgZm9sbG93aW5nIGZlYXR1cmVzOlxuXG5cdTIwMjIgU3dpdGNoIHdpbmRvd3MgZnJvbSBjdXJyZW50IHdvcmtzcGFjZSB1c2luZyAzLWZpbmdlciBob3Jpem9udGFsIHN3aXBlXG5cdTIwMjIgQ3ljbGljIGdlc3R1cmVzIGJldHdlZW4gRGVza3RvcC9PdmVydmlldy9BcHBHcmlkIHVzaW5nIDQgdmVydGljYWwgc3dpcGVcblx1MjAyMiBTd2l0Y2ggYXBwLXBhZ2VzIHVzaW5nIDMtZmluZ2VyIHN3aXBlIGdlc3R1cmUgb24gQXBwR3JpZFxuXHUyMDIyIFVubWF4aW1pemUvbWF4aW1pemUvZnVsbHNjcmVlbi9oYWxmLXRpbGluZyB1c2luZyAzLWZpbmdlciB2ZXJ0aWNhbCAmIGhvcml6b250YWwgZ2VzdHVyZVxuXHUyMDIyIE9wdGlvbmFsIG1pbmltaXplIGEgd2luZG93IGdlc3R1cmVcblx1MjAyMiBPdmVycmlkZSAzLWZpbmdlciBnZXN0dXJlIHdpdGggNC1maW5nZXIgZm9yIHN3aXRjaGluZyB3b3Jrc3BhY2Vcblx1MjAyMiBQaW5jaCB0byBzaG93IGRlc2t0b3Bcblx1MjAyMiBBcHBsaWNhdGlvbiBzcGVjaWZpYyBrZXlib2FyZCBzaG9ydGN1dCBiYXNlZCBob2xkLXN3aXBlIGdlc3R1cmVzIChlLmcuLCBuYXZpZ2F0aW5nIGJyb3dzZXIgdGFicylcblx1MjAyMiBDb25maWd1cmUgc3BlZWQgb2YgZ2VzdHVyZXNcblx1MjAyMiBTdXBwb3J0IGZvciBYMTFcbiAgIFxuT24gWDExLCB5b3UgbmVlZCB0byBpbnN0YWxsIGh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLXgxMS1nZXN0dXJlLWRhZW1vblxuXG5SZXBvcnQgYW55IGJ1Z3MvcmVxdWVzdHMgb24gR2l0SHViIChsaW5rIGRpcmVjdGx5IGJlbG93KVxuIiwKICAibmFtZSI6ICJHZXN0dXJlIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nZXN0dXJlSW1wcm92ZW1lbnRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLWdlc3R1cmUtaW1wcm92ZW1lbnRzIiwKICAidXVpZCI6ICJnZXN0dXJlSW1wcm92ZW1lbnRzQGdlc3R1cmVzIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "42": {"version": "23", "sha256": "0kbchgsx5fmnsszhprka8iambc4kdvv9xs56dfqx77pjrd8wyjw3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmUgdG91Y2hwYWQgZ2VzdHVyZXMgZm9yIFdheWxhbmQvWDExXG5cblRoaXMgZXh0ZW5zaW9uIGFkZHMgZm9sbG93aW5nIGZlYXR1cmVzOlxuXG5cdTIwMjIgU3dpdGNoIHdpbmRvd3MgZnJvbSBjdXJyZW50IHdvcmtzcGFjZSB1c2luZyAzLWZpbmdlciBob3Jpem9udGFsIHN3aXBlXG5cdTIwMjIgQ3ljbGljIGdlc3R1cmVzIGJldHdlZW4gRGVza3RvcC9PdmVydmlldy9BcHBHcmlkIHVzaW5nIDQgdmVydGljYWwgc3dpcGVcblx1MjAyMiBTd2l0Y2ggYXBwLXBhZ2VzIHVzaW5nIDMtZmluZ2VyIHN3aXBlIGdlc3R1cmUgb24gQXBwR3JpZFxuXHUyMDIyIFVubWF4aW1pemUvbWF4aW1pemUvZnVsbHNjcmVlbi9oYWxmLXRpbGluZyB1c2luZyAzLWZpbmdlciB2ZXJ0aWNhbCAmIGhvcml6b250YWwgZ2VzdHVyZVxuXHUyMDIyIE9wdGlvbmFsIG1pbmltaXplIGEgd2luZG93IGdlc3R1cmVcblx1MjAyMiBPdmVycmlkZSAzLWZpbmdlciBnZXN0dXJlIHdpdGggNC1maW5nZXIgZm9yIHN3aXRjaGluZyB3b3Jrc3BhY2Vcblx1MjAyMiBQaW5jaCB0byBzaG93IGRlc2t0b3Bcblx1MjAyMiBBcHBsaWNhdGlvbiBzcGVjaWZpYyBrZXlib2FyZCBzaG9ydGN1dCBiYXNlZCBob2xkLXN3aXBlIGdlc3R1cmVzIChlLmcuLCBuYXZpZ2F0aW5nIGJyb3dzZXIgdGFicylcblx1MjAyMiBDb25maWd1cmUgc3BlZWQgb2YgZ2VzdHVyZXNcblx1MjAyMiBTdXBwb3J0IGZvciBYMTFcbiAgIFxuT24gWDExLCB5b3UgbmVlZCB0byBpbnN0YWxsIGh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLXgxMS1nZXN0dXJlLWRhZW1vblxuXG5SZXBvcnQgYW55IGJ1Z3MvcmVxdWVzdHMgb24gR2l0SHViIChsaW5rIGRpcmVjdGx5IGJlbG93KVxuIiwKICAibmFtZSI6ICJHZXN0dXJlIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nZXN0dXJlSW1wcm92ZW1lbnRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcnNoYWRnYXZhbGkvZ25vbWUtZ2VzdHVyZS1pbXByb3ZlbWVudHMiLAogICJ1dWlkIjogImdlc3R1cmVJbXByb3ZlbWVudHNAZ2VzdHVyZXMiLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} +, {"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• Application specific keyboard shortcut based hold-swipe gestures (e.g., navigating browser tabs)\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": "0srrlqk0h62d9ivhkv1gciw0zgp4rs6p6pc9p1w4gsayhh7zsqf2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmUgdG91Y2hwYWQgZ2VzdHVyZXMgZm9yIFdheWxhbmQvWDExXG5cblRoaXMgZXh0ZW5zaW9uIGFkZHMgZm9sbG93aW5nIGZlYXR1cmVzOlxuXG5cdTIwMjIgU3dpdGNoIHdpbmRvd3MgZnJvbSBjdXJyZW50IHdvcmtzcGFjZSB1c2luZyAzLWZpbmdlciBob3Jpem9udGFsIHN3aXBlXG5cdTIwMjIgQ3ljbGljIGdlc3R1cmVzIGJldHdlZW4gRGVza3RvcC9PdmVydmlldy9BcHBHcmlkIHVzaW5nIDQgdmVydGljYWwgc3dpcGVcblx1MjAyMiBTd2l0Y2ggYXBwLXBhZ2VzIHVzaW5nIDMtZmluZ2VyIHN3aXBlIGdlc3R1cmUgb24gQXBwR3JpZFxuXHUyMDIyIFVubWF4aW1pemUvbWF4aW1pemUvZnVsbHNjcmVlbi9oYWxmLXRpbGluZyB1c2luZyAzLWZpbmdlciB2ZXJ0aWNhbCAmIGhvcml6b250YWwgZ2VzdHVyZVxuXHUyMDIyIE9wdGlvbmFsIG1pbmltaXplIGEgd2luZG93IGdlc3R1cmVcblx1MjAyMiBPdmVycmlkZSAzLWZpbmdlciBnZXN0dXJlIHdpdGggNC1maW5nZXIgZm9yIHN3aXRjaGluZyB3b3Jrc3BhY2Vcblx1MjAyMiBQaW5jaCB0byBzaG93IGRlc2t0b3Bcblx1MjAyMiBBcHBsaWNhdGlvbiBzcGVjaWZpYyBrZXlib2FyZCBzaG9ydGN1dCBiYXNlZCBob2xkLXN3aXBlIGdlc3R1cmVzIChlLmcuLCBuYXZpZ2F0aW5nIGJyb3dzZXIgdGFicylcblx1MjAyMiBDb25maWd1cmUgc3BlZWQgb2YgZ2VzdHVyZXNcblx1MjAyMiBTdXBwb3J0IGZvciBYMTFcbiAgIFxuT24gWDExLCB5b3UgbmVlZCB0byBpbnN0YWxsIGh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLXgxMS1nZXN0dXJlLWRhZW1vblxuXG5SZXBvcnQgYW55IGJ1Z3MvcmVxdWVzdHMgb24gR2l0SHViIChsaW5rIGRpcmVjdGx5IGJlbG93KVxuIiwKICAibmFtZSI6ICJHZXN0dXJlIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nZXN0dXJlSW1wcm92ZW1lbnRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLWdlc3R1cmUtaW1wcm92ZW1lbnRzIiwKICAidXVpZCI6ICJnZXN0dXJlSW1wcm92ZW1lbnRzQGdlc3R1cmVzIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "0srrlqk0h62d9ivhkv1gciw0zgp4rs6p6pc9p1w4gsayhh7zsqf2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmUgdG91Y2hwYWQgZ2VzdHVyZXMgZm9yIFdheWxhbmQvWDExXG5cblRoaXMgZXh0ZW5zaW9uIGFkZHMgZm9sbG93aW5nIGZlYXR1cmVzOlxuXG5cdTIwMjIgU3dpdGNoIHdpbmRvd3MgZnJvbSBjdXJyZW50IHdvcmtzcGFjZSB1c2luZyAzLWZpbmdlciBob3Jpem9udGFsIHN3aXBlXG5cdTIwMjIgQ3ljbGljIGdlc3R1cmVzIGJldHdlZW4gRGVza3RvcC9PdmVydmlldy9BcHBHcmlkIHVzaW5nIDQgdmVydGljYWwgc3dpcGVcblx1MjAyMiBTd2l0Y2ggYXBwLXBhZ2VzIHVzaW5nIDMtZmluZ2VyIHN3aXBlIGdlc3R1cmUgb24gQXBwR3JpZFxuXHUyMDIyIFVubWF4aW1pemUvbWF4aW1pemUvZnVsbHNjcmVlbi9oYWxmLXRpbGluZyB1c2luZyAzLWZpbmdlciB2ZXJ0aWNhbCAmIGhvcml6b250YWwgZ2VzdHVyZVxuXHUyMDIyIE9wdGlvbmFsIG1pbmltaXplIGEgd2luZG93IGdlc3R1cmVcblx1MjAyMiBPdmVycmlkZSAzLWZpbmdlciBnZXN0dXJlIHdpdGggNC1maW5nZXIgZm9yIHN3aXRjaGluZyB3b3Jrc3BhY2Vcblx1MjAyMiBQaW5jaCB0byBzaG93IGRlc2t0b3Bcblx1MjAyMiBBcHBsaWNhdGlvbiBzcGVjaWZpYyBrZXlib2FyZCBzaG9ydGN1dCBiYXNlZCBob2xkLXN3aXBlIGdlc3R1cmVzIChlLmcuLCBuYXZpZ2F0aW5nIGJyb3dzZXIgdGFicylcblx1MjAyMiBDb25maWd1cmUgc3BlZWQgb2YgZ2VzdHVyZXNcblx1MjAyMiBTdXBwb3J0IGZvciBYMTFcbiAgIFxuT24gWDExLCB5b3UgbmVlZCB0byBpbnN0YWxsIGh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLXgxMS1nZXN0dXJlLWRhZW1vblxuXG5SZXBvcnQgYW55IGJ1Z3MvcmVxdWVzdHMgb24gR2l0SHViIChsaW5rIGRpcmVjdGx5IGJlbG93KVxuIiwKICAibmFtZSI6ICJHZXN0dXJlIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nZXN0dXJlSW1wcm92ZW1lbnRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLWdlc3R1cmUtaW1wcm92ZW1lbnRzIiwKICAidXVpZCI6ICJnZXN0dXJlSW1wcm92ZW1lbnRzQGdlc3R1cmVzIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "42": {"version": "24", "sha256": "0aaxcmb773l4f95pqy7l81myj5n6n1j24i5br5mzznkqvq1zfyna", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmUgdG91Y2hwYWQgZ2VzdHVyZXMgZm9yIFdheWxhbmQvWDExXG5cblRoaXMgZXh0ZW5zaW9uIGFkZHMgZm9sbG93aW5nIGZlYXR1cmVzOlxuXG5cdTIwMjIgU3dpdGNoIHdpbmRvd3MgZnJvbSBjdXJyZW50IHdvcmtzcGFjZSB1c2luZyAzLWZpbmdlciBob3Jpem9udGFsIHN3aXBlXG5cdTIwMjIgQ3ljbGljIGdlc3R1cmVzIGJldHdlZW4gRGVza3RvcC9PdmVydmlldy9BcHBHcmlkIHVzaW5nIDQgdmVydGljYWwgc3dpcGVcblx1MjAyMiBTd2l0Y2ggYXBwLXBhZ2VzIHVzaW5nIDMtZmluZ2VyIHN3aXBlIGdlc3R1cmUgb24gQXBwR3JpZFxuXHUyMDIyIFVubWF4aW1pemUvbWF4aW1pemUvZnVsbHNjcmVlbi9oYWxmLXRpbGluZyB1c2luZyAzLWZpbmdlciB2ZXJ0aWNhbCAmIGhvcml6b250YWwgZ2VzdHVyZVxuXHUyMDIyIE9wdGlvbmFsIG1pbmltaXplIGEgd2luZG93IGdlc3R1cmVcblx1MjAyMiBPdmVycmlkZSAzLWZpbmdlciBnZXN0dXJlIHdpdGggNC1maW5nZXIgZm9yIHN3aXRjaGluZyB3b3Jrc3BhY2Vcblx1MjAyMiBQaW5jaCB0byBzaG93IGRlc2t0b3Bcblx1MjAyMiBBcHBsaWNhdGlvbiBzcGVjaWZpYyBrZXlib2FyZCBzaG9ydGN1dCBiYXNlZCBob2xkLXN3aXBlIGdlc3R1cmVzIChlLmcuLCBuYXZpZ2F0aW5nIGJyb3dzZXIgdGFicylcblx1MjAyMiBDb25maWd1cmUgc3BlZWQgb2YgZ2VzdHVyZXNcblx1MjAyMiBTdXBwb3J0IGZvciBYMTFcbiAgIFxuT24gWDExLCB5b3UgbmVlZCB0byBpbnN0YWxsIGh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLXgxMS1nZXN0dXJlLWRhZW1vblxuXG5SZXBvcnQgYW55IGJ1Z3MvcmVxdWVzdHMgb24gR2l0SHViIChsaW5rIGRpcmVjdGx5IGJlbG93KVxuIiwKICAibmFtZSI6ICJHZXN0dXJlIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nZXN0dXJlSW1wcm92ZW1lbnRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLWdlc3R1cmUtaW1wcm92ZW1lbnRzIiwKICAidXVpZCI6ICJnZXN0dXJlSW1wcm92ZW1lbnRzQGdlc3R1cmVzIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "43": {"version": "24", "sha256": "0aaxcmb773l4f95pqy7l81myj5n6n1j24i5br5mzznkqvq1zfyna", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmUgdG91Y2hwYWQgZ2VzdHVyZXMgZm9yIFdheWxhbmQvWDExXG5cblRoaXMgZXh0ZW5zaW9uIGFkZHMgZm9sbG93aW5nIGZlYXR1cmVzOlxuXG5cdTIwMjIgU3dpdGNoIHdpbmRvd3MgZnJvbSBjdXJyZW50IHdvcmtzcGFjZSB1c2luZyAzLWZpbmdlciBob3Jpem9udGFsIHN3aXBlXG5cdTIwMjIgQ3ljbGljIGdlc3R1cmVzIGJldHdlZW4gRGVza3RvcC9PdmVydmlldy9BcHBHcmlkIHVzaW5nIDQgdmVydGljYWwgc3dpcGVcblx1MjAyMiBTd2l0Y2ggYXBwLXBhZ2VzIHVzaW5nIDMtZmluZ2VyIHN3aXBlIGdlc3R1cmUgb24gQXBwR3JpZFxuXHUyMDIyIFVubWF4aW1pemUvbWF4aW1pemUvZnVsbHNjcmVlbi9oYWxmLXRpbGluZyB1c2luZyAzLWZpbmdlciB2ZXJ0aWNhbCAmIGhvcml6b250YWwgZ2VzdHVyZVxuXHUyMDIyIE9wdGlvbmFsIG1pbmltaXplIGEgd2luZG93IGdlc3R1cmVcblx1MjAyMiBPdmVycmlkZSAzLWZpbmdlciBnZXN0dXJlIHdpdGggNC1maW5nZXIgZm9yIHN3aXRjaGluZyB3b3Jrc3BhY2Vcblx1MjAyMiBQaW5jaCB0byBzaG93IGRlc2t0b3Bcblx1MjAyMiBBcHBsaWNhdGlvbiBzcGVjaWZpYyBrZXlib2FyZCBzaG9ydGN1dCBiYXNlZCBob2xkLXN3aXBlIGdlc3R1cmVzIChlLmcuLCBuYXZpZ2F0aW5nIGJyb3dzZXIgdGFicylcblx1MjAyMiBDb25maWd1cmUgc3BlZWQgb2YgZ2VzdHVyZXNcblx1MjAyMiBTdXBwb3J0IGZvciBYMTFcbiAgIFxuT24gWDExLCB5b3UgbmVlZCB0byBpbnN0YWxsIGh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLXgxMS1nZXN0dXJlLWRhZW1vblxuXG5SZXBvcnQgYW55IGJ1Z3MvcmVxdWVzdHMgb24gR2l0SHViIChsaW5rIGRpcmVjdGx5IGJlbG93KVxuIiwKICAibmFtZSI6ICJHZXN0dXJlIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nZXN0dXJlSW1wcm92ZW1lbnRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLWdlc3R1cmUtaW1wcm92ZW1lbnRzIiwKICAidXVpZCI6ICJnZXN0dXJlSW1wcm92ZW1lbnRzQGdlc3R1cmVzIiwKICAidmVyc2lvbiI6IDI0Cn0="}}} , {"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": "5", "sha256": "08nsdp92q8xb5p5bbqws7727vxvifzyv015igz2z04z2mqr0xc9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvZGVuYW1lIjogIldoaXRlc21va2UiLAogICJkZXNjcmlwdGlvbiI6ICJDb25maWd1cmUgYW5kIGN1c3RvbWl6ZSBHTk9NRSBTaGVsbCB3aXRoIGFkdmFuY2VkIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogInNoZWxsLWNvbmZpZ3VyYXRvciIsCiAgImluc3RhbGwtdHlwZSI6ICJ1c2VyIiwKICAibmFtZSI6ICJTaGVsbCBDb25maWd1cmF0b3IiLAogICJyZWxlYXNlLXN0YXRlIjogInN0YWJsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FkZXN3YW50YVRlY2hzL3NoZWxsLWNvbmZpZ3VyYXRvciIsCiAgInV1aWQiOiAic2hlbGwtY29uZmlndXJhdG9yQGFkZXN3YW50YSIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "08nsdp92q8xb5p5bbqws7727vxvifzyv015igz2z04z2mqr0xc9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvZGVuYW1lIjogIldoaXRlc21va2UiLAogICJkZXNjcmlwdGlvbiI6ICJDb25maWd1cmUgYW5kIGN1c3RvbWl6ZSBHTk9NRSBTaGVsbCB3aXRoIGFkdmFuY2VkIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogInNoZWxsLWNvbmZpZ3VyYXRvciIsCiAgImluc3RhbGwtdHlwZSI6ICJ1c2VyIiwKICAibmFtZSI6ICJTaGVsbCBDb25maWd1cmF0b3IiLAogICJyZWxlYXNlLXN0YXRlIjogInN0YWJsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FkZXN3YW50YVRlY2hzL3NoZWxsLWNvbmZpZ3VyYXRvciIsCiAgInV1aWQiOiAic2hlbGwtY29uZmlndXJhdG9yQGFkZXN3YW50YSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "08nsdp92q8xb5p5bbqws7727vxvifzyv015igz2z04z2mqr0xc9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvZGVuYW1lIjogIldoaXRlc21va2UiLAogICJkZXNjcmlwdGlvbiI6ICJDb25maWd1cmUgYW5kIGN1c3RvbWl6ZSBHTk9NRSBTaGVsbCB3aXRoIGFkdmFuY2VkIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogInNoZWxsLWNvbmZpZ3VyYXRvciIsCiAgImluc3RhbGwtdHlwZSI6ICJ1c2VyIiwKICAibmFtZSI6ICJTaGVsbCBDb25maWd1cmF0b3IiLAogICJyZWxlYXNlLXN0YXRlIjogInN0YWJsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FkZXN3YW50YVRlY2hzL3NoZWxsLWNvbmZpZ3VyYXRvciIsCiAgInV1aWQiOiAic2hlbGwtY29uZmlndXJhdG9yQGFkZXN3YW50YSIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "08nsdp92q8xb5p5bbqws7727vxvifzyv015igz2z04z2mqr0xc9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvZGVuYW1lIjogIldoaXRlc21va2UiLAogICJkZXNjcmlwdGlvbiI6ICJDb25maWd1cmUgYW5kIGN1c3RvbWl6ZSBHTk9NRSBTaGVsbCB3aXRoIGFkdmFuY2VkIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogInNoZWxsLWNvbmZpZ3VyYXRvciIsCiAgImluc3RhbGwtdHlwZSI6ICJ1c2VyIiwKICAibmFtZSI6ICJTaGVsbCBDb25maWd1cmF0b3IiLAogICJyZWxlYXNlLXN0YXRlIjogInN0YWJsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FkZXN3YW50YVRlY2hzL3NoZWxsLWNvbmZpZ3VyYXRvciIsCiAgInV1aWQiOiAic2hlbGwtY29uZmlndXJhdG9yQGFkZXN3YW50YSIsCiAgInZlcnNpb24iOiA1Cn0="}}} @@ -518,38 +519,39 @@ , {"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": "4", "sha256": "0c6dbpgjvx9i8hgh97agbglsq7mbwxl8sndl569hjsvjvk232j26", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTk0L3Nob3ctZGVza3RvcC1idXR0b24vXG5cbkZlYXR1cmVzOlxuLSBXaW5kb3dzLWxpa2UgYmVoYXZpb3Jcbi0gQ2FuIGJlIHBsYWNlZCBhdCB0aGUgZW5kIG9mIHBhbmVsXG4tIEhvdGtleSBzdXBwb3J0IChjYW4gYmUgYWN0aXZhdGVkIGluIHNldHRpbmdzKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYXBwbGV0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWFwcGxldCIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVmFsZW50LWluL1Nob3ctRGVza3RvcC1BcHBsZXQiLAogICJ1dWlkIjogInNob3ctZGVza3RvcC1hcHBsZXRAdmFsZW50LWluIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "0c6dbpgjvx9i8hgh97agbglsq7mbwxl8sndl569hjsvjvk232j26", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTk0L3Nob3ctZGVza3RvcC1idXR0b24vXG5cbkZlYXR1cmVzOlxuLSBXaW5kb3dzLWxpa2UgYmVoYXZpb3Jcbi0gQ2FuIGJlIHBsYWNlZCBhdCB0aGUgZW5kIG9mIHBhbmVsXG4tIEhvdGtleSBzdXBwb3J0IChjYW4gYmUgYWN0aXZhdGVkIGluIHNldHRpbmdzKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYXBwbGV0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWFwcGxldCIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVmFsZW50LWluL1Nob3ctRGVza3RvcC1BcHBsZXQiLAogICJ1dWlkIjogInNob3ctZGVza3RvcC1hcHBsZXRAdmFsZW50LWluIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0c6dbpgjvx9i8hgh97agbglsq7mbwxl8sndl569hjsvjvk232j26", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTk0L3Nob3ctZGVza3RvcC1idXR0b24vXG5cbkZlYXR1cmVzOlxuLSBXaW5kb3dzLWxpa2UgYmVoYXZpb3Jcbi0gQ2FuIGJlIHBsYWNlZCBhdCB0aGUgZW5kIG9mIHBhbmVsXG4tIEhvdGtleSBzdXBwb3J0IChjYW4gYmUgYWN0aXZhdGVkIGluIHNldHRpbmdzKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYXBwbGV0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWFwcGxldCIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVmFsZW50LWluL1Nob3ctRGVza3RvcC1BcHBsZXQiLAogICJ1dWlkIjogInNob3ctZGVza3RvcC1hcHBsZXRAdmFsZW50LWluIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "0c6dbpgjvx9i8hgh97agbglsq7mbwxl8sndl569hjsvjvk232j26", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTk0L3Nob3ctZGVza3RvcC1idXR0b24vXG5cbkZlYXR1cmVzOlxuLSBXaW5kb3dzLWxpa2UgYmVoYXZpb3Jcbi0gQ2FuIGJlIHBsYWNlZCBhdCB0aGUgZW5kIG9mIHBhbmVsXG4tIEhvdGtleSBzdXBwb3J0IChjYW4gYmUgYWN0aXZhdGVkIGluIHNldHRpbmdzKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYXBwbGV0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWFwcGxldCIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVmFsZW50LWluL1Nob3ctRGVza3RvcC1BcHBsZXQiLAogICJ1dWlkIjogInNob3ctZGVza3RvcC1hcHBsZXRAdmFsZW50LWluIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"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": "26", "sha256": "1wgfip9lss2jlfjkqqklb65shzdvhdyaz7vnyz45cmadhsz9mcs0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNgp9"}, "40": {"version": "26", "sha256": "1wgfip9lss2jlfjkqqklb65shzdvhdyaz7vnyz45cmadhsz9mcs0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNgp9"}, "41": {"version": "26", "sha256": "1wgfip9lss2jlfjkqqklb65shzdvhdyaz7vnyz45cmadhsz9mcs0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNgp9"}, "42": {"version": "26", "sha256": "1wgfip9lss2jlfjkqqklb65shzdvhdyaz7vnyz45cmadhsz9mcs0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNgp9"}, "43": {"version": "26", "sha256": "1wgfip9lss2jlfjkqqklb65shzdvhdyaz7vnyz45cmadhsz9mcs0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNgp9"}}} +, {"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": "27", "sha256": "1j703nwbswfk6bg4gk7kr2rn36mwblygjgp7ba1abmb3b8n0ybim", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNwp9"}, "40": {"version": "27", "sha256": "1j703nwbswfk6bg4gk7kr2rn36mwblygjgp7ba1abmb3b8n0ybim", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "27", "sha256": "1j703nwbswfk6bg4gk7kr2rn36mwblygjgp7ba1abmb3b8n0ybim", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNwp9"}, "42": {"version": "27", "sha256": "1j703nwbswfk6bg4gk7kr2rn36mwblygjgp7ba1abmb3b8n0ybim", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNwp9"}, "43": {"version": "27", "sha256": "1j703nwbswfk6bg4gk7kr2rn36mwblygjgp7ba1abmb3b8n0ybim", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNwp9"}}} , {"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"}}} , {"uuid": "gnometoggle@foreverxml.github.io", "name": "Gnome Toggle", "pname": "gnome-toggle", "description": "Turn on your GNOME dark mode! (For up-to-date versions, download from GitHub.)", "link": "https://extensions.gnome.org/extension/4287/gnome-toggle/", "shell_version_map": {"38": {"version": "1", "sha256": "1a1qvrdq0xglr0lf4pglaxhn03k9qxhh77n4g0d51r419l4y6n2r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1cm4gb24geW91ciBHTk9NRSBkYXJrIG1vZGUhIChGb3IgdXAtdG8tZGF0ZSB2ZXJzaW9ucywgZG93bmxvYWQgZnJvbSBHaXRIdWIuKSIsCiAgIm5hbWUiOiAiR25vbWUgVG9nZ2xlIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImZvcmV2ZXJ4bWxAdHV0YS5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mb3JldmVyeG1sL2dub21lLXRvZ2dsZSIsCiAgInV1aWQiOiAiZ25vbWV0b2dnbGVAZm9yZXZlcnhtbC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "1a1qvrdq0xglr0lf4pglaxhn03k9qxhh77n4g0d51r419l4y6n2r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1cm4gb24geW91ciBHTk9NRSBkYXJrIG1vZGUhIChGb3IgdXAtdG8tZGF0ZSB2ZXJzaW9ucywgZG93bmxvYWQgZnJvbSBHaXRIdWIuKSIsCiAgIm5hbWUiOiAiR25vbWUgVG9nZ2xlIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImZvcmV2ZXJ4bWxAdHV0YS5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mb3JldmVyeG1sL2dub21lLXRvZ2dsZSIsCiAgInV1aWQiOiAiZ25vbWV0b2dnbGVAZm9yZXZlcnhtbC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "instantworkspaceswitcher@amalantony.net", "name": "Disable Workspace Switch Animation for GNOME 40+", "pname": "disable-workspace-switch-animation-for-gnome-40", "description": "Disables the workspace switch animation while preserving all other animations - instantly switch between workspaces with keyboard shortcuts.", "link": "https://extensions.gnome.org/extension/4290/disable-workspace-switch-animation-for-gnome-40/", "shell_version_map": {"40": {"version": "6", "sha256": "0kc09n6xna31nb3k5m4wvfm2x3qxs04dcjygss3b1d8x6wm15ha9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWFsYW50b255L2dub21lLXNoZWxsLWV4dGVuc2lvbi1pbnN0YW50LXdvcmtzcGFjZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiaW5zdGFudHdvcmtzcGFjZXN3aXRjaGVyQGFtYWxhbnRvbnkubmV0IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0kc09n6xna31nb3k5m4wvfm2x3qxs04dcjygss3b1d8x6wm15ha9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWFsYW50b255L2dub21lLXNoZWxsLWV4dGVuc2lvbi1pbnN0YW50LXdvcmtzcGFjZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiaW5zdGFudHdvcmtzcGFjZXN3aXRjaGVyQGFtYWxhbnRvbnkubmV0IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "0kc09n6xna31nb3k5m4wvfm2x3qxs04dcjygss3b1d8x6wm15ha9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWFsYW50b255L2dub21lLXNoZWxsLWV4dGVuc2lvbi1pbnN0YW50LXdvcmtzcGFjZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiaW5zdGFudHdvcmtzcGFjZXN3aXRjaGVyQGFtYWxhbnRvbnkubmV0IiwKICAidmVyc2lvbiI6IDYKfQ=="}}} +, {"uuid": "instantworkspaceswitcher@amalantony.net", "name": "Disable Workspace Switch Animation for GNOME 40+", "pname": "disable-workspace-switch-animation-for-gnome-40", "description": "Disables the workspace switch animation while preserving all other animations - instantly switch between workspaces with keyboard shortcuts.", "link": "https://extensions.gnome.org/extension/4290/disable-workspace-switch-animation-for-gnome-40/", "shell_version_map": {"40": {"version": "7", "sha256": "0mfqhg3d4iq4k7av8y5k780jb65qrqpb3mr6g090cr2vlk3ngw13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtYWxhbnRvbnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWluc3RhbnQtd29ya3NwYWNlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJpbnN0YW50d29ya3NwYWNlc3dpdGNoZXJAYW1hbGFudG9ueS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "0mfqhg3d4iq4k7av8y5k780jb65qrqpb3mr6g090cr2vlk3ngw13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtYWxhbnRvbnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWluc3RhbnQtd29ya3NwYWNlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJpbnN0YW50d29ya3NwYWNlc3dpdGNoZXJAYW1hbGFudG9ueS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "0mfqhg3d4iq4k7av8y5k780jb65qrqpb3mr6g090cr2vlk3ngw13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtYWxhbnRvbnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWluc3RhbnQtd29ya3NwYWNlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJpbnN0YW50d29ya3NwYWNlc3dpdGNoZXJAYW1hbGFudG9ueS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "0mfqhg3d4iq4k7av8y5k780jb65qrqpb3mr6g090cr2vlk3ngw13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtYWxhbnRvbnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWluc3RhbnQtd29ya3NwYWNlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJpbnN0YW50d29ya3NwYWNlc3dpdGNoZXJAYW1hbGFudG9ueS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "top-panel-notification-icons@5th0.github.com", "name": "Top Panel Notification Icons", "pname": "top-panel-notification-icons", "description": "Display notification icons in the Top", "link": "https://extensions.gnome.org/extension/4293/top-panel-notification-icons/", "shell_version_map": {"38": {"version": "1", "sha256": "0s84r45nc1kyv6sc6a9jbxv981f1ih8g2nfdzrzd33n3032f30px", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbm90aWZpY2F0aW9uIGljb25zIGluIHRoZSBUb3AiLAogICJuYW1lIjogIlRvcCBQYW5lbCBOb3RpZmljYXRpb24gSWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInRvcC1wYW5lbC1ub3RpZmljYXRpb24taWNvbnNANXRoMC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "1", "sha256": "0s84r45nc1kyv6sc6a9jbxv981f1ih8g2nfdzrzd33n3032f30px", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbm90aWZpY2F0aW9uIGljb25zIGluIHRoZSBUb3AiLAogICJuYW1lIjogIlRvcCBQYW5lbCBOb3RpZmljYXRpb24gSWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInRvcC1wYW5lbC1ub3RpZmljYXRpb24taWNvbnNANXRoMC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "custom-menu-panel@AndreaBenini", "name": "custom-menu-panel", "pname": "custom-menu-panel", "description": "Quick custom menu for launching your favorite applications", "link": "https://extensions.gnome.org/extension/4295/custom-menu-panel/", "shell_version_map": {"40": {"version": "2", "sha256": "12d8p8cmsq93pmyd6y07jx7r0ls4h7pfqlhp8bvmsw48gmiv5sq8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGN1c3RvbSBtZW51IGZvciBsYXVuY2hpbmcgeW91ciBmYXZvcml0ZSBhcHBsaWNhdGlvbnMiLAogICJuYW1lIjogImN1c3RvbS1tZW51LXBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjdXN0b20tbWVudS1wYW5lbEBBbmRyZWFCZW5pbmkiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "clean-system-menu@astrapi.de", "name": "Clean System Menu", "pname": "clean-system-menu", "description": "Cleanup the System Menu from Power Options", "link": "https://extensions.gnome.org/extension/4298/clean-system-menu/", "shell_version_map": {"40": {"version": "4", "sha256": "1x3fvi8qbbbqa9nc5xqp7ql2djcrch2w5azw0xq1dampdgz1976q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsZWFudXAgdGhlIFN5c3RlbSBNZW51IGZyb20gUG93ZXIgT3B0aW9ucyIsCiAgIm5hbWUiOiAiQ2xlYW4gU3lzdGVtIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvYXN0cmFwaS9jbGVhbi1zeXN0ZW0tbWVudSIsCiAgInV1aWQiOiAiY2xlYW4tc3lzdGVtLW1lbnVAYXN0cmFwaS5kZSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"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": "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": "14", "sha256": "13kc4ga2wvka3p0kwyy35wjlcnb2zr19xqhkbisn0n36y59cd2f9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25vcm9hZHNsZWZ0MDAwL2dub21lLW5ldHdvcmstc3RhdHMiLAogICJ1dWlkIjogIm5ldHdvcmstc3RhdHNAZ25vbWUubm9yb2Fkc2xlZnQueHl6IiwKICAidmVyc2lvbiI6IDE0Cn0="}, "40": {"version": "14", "sha256": "13kc4ga2wvka3p0kwyy35wjlcnb2zr19xqhkbisn0n36y59cd2f9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25vcm9hZHNsZWZ0MDAwL2dub21lLW5ldHdvcmstc3RhdHMiLAogICJ1dWlkIjogIm5ldHdvcmstc3RhdHNAZ25vbWUubm9yb2Fkc2xlZnQueHl6IiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "13kc4ga2wvka3p0kwyy35wjlcnb2zr19xqhkbisn0n36y59cd2f9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25vcm9hZHNsZWZ0MDAwL2dub21lLW5ldHdvcmstc3RhdHMiLAogICJ1dWlkIjogIm5ldHdvcmstc3RhdHNAZ25vbWUubm9yb2Fkc2xlZnQueHl6IiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "14", "sha256": "13kc4ga2wvka3p0kwyy35wjlcnb2zr19xqhkbisn0n36y59cd2f9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25vcm9hZHNsZWZ0MDAwL2dub21lLW5ldHdvcmstc3RhdHMiLAogICJ1dWlkIjogIm5ldHdvcmstc3RhdHNAZ25vbWUubm9yb2Fkc2xlZnQueHl6IiwKICAidmVyc2lvbiI6IDE0Cn0="}}} +, {"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": "19", "sha256": "1910cj3a2wdijsflsalp6mzd66wfpqnamiqj7czdb25hnhxh003d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3JvYWRzbGVmdDAwMC9nbm9tZS1uZXR3b3JrLXN0YXRzIiwKICAidXVpZCI6ICJuZXR3b3JrLXN0YXRzQGdub21lLm5vcm9hZHNsZWZ0Lnh5eiIsCiAgInZlcnNpb24iOiAxOQp9"}, "40": {"version": "19", "sha256": "1910cj3a2wdijsflsalp6mzd66wfpqnamiqj7czdb25hnhxh003d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3JvYWRzbGVmdDAwMC9nbm9tZS1uZXR3b3JrLXN0YXRzIiwKICAidXVpZCI6ICJuZXR3b3JrLXN0YXRzQGdub21lLm5vcm9hZHNsZWZ0Lnh5eiIsCiAgInZlcnNpb24iOiAxOQp9"}, "41": {"version": "19", "sha256": "1910cj3a2wdijsflsalp6mzd66wfpqnamiqj7czdb25hnhxh003d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3JvYWRzbGVmdDAwMC9nbm9tZS1uZXR3b3JrLXN0YXRzIiwKICAidXVpZCI6ICJuZXR3b3JrLXN0YXRzQGdub21lLm5vcm9hZHNsZWZ0Lnh5eiIsCiAgInZlcnNpb24iOiAxOQp9"}, "42": {"version": "19", "sha256": "1910cj3a2wdijsflsalp6mzd66wfpqnamiqj7czdb25hnhxh003d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3JvYWRzbGVmdDAwMC9nbm9tZS1uZXR3b3JrLXN0YXRzIiwKICAidXVpZCI6ICJuZXR3b3JrLXN0YXRzQGdub21lLm5vcm9hZHNsZWZ0Lnh5eiIsCiAgInZlcnNpb24iOiAxOQp9"}, "43": {"version": "19", "sha256": "1910cj3a2wdijsflsalp6mzd66wfpqnamiqj7czdb25hnhxh003d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3JvYWRzbGVmdDAwMC9nbm9tZS1uZXR3b3JrLXN0YXRzIiwKICAidXVpZCI6ICJuZXR3b3JrLXN0YXRzQGdub21lLm5vcm9hZHNsZWZ0Lnh5eiIsCiAgInZlcnNpb24iOiAxOQp9"}}} , {"uuid": "screen-lock@garciabaameiro.com", "name": "Screen lock", "pname": "extension-list", "description": "Simple gnome shell extension to use xscreensaver in top panel.\n\nIMPORTANT! You need to install xscreensaver. For Debian distribution, you can use the following command: sudo apt-get install xscreensaver\n\nThank you for using this extension!", "link": "https://extensions.gnome.org/extension/4311/extension-list/", "shell_version_map": {"40": {"version": "1", "sha256": "1h436z67sk68jcgjxs6p1wlg3hlim3g8j8lrg9aa92rwangfkdcp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBnbm9tZSBzaGVsbCBleHRlbnNpb24gdG8gdXNlIHhzY3JlZW5zYXZlciBpbiB0b3AgcGFuZWwuXG5cbklNUE9SVEFOVCEgWW91IG5lZWQgdG8gaW5zdGFsbCB4c2NyZWVuc2F2ZXIuIEZvciBEZWJpYW4gZGlzdHJpYnV0aW9uLCB5b3UgY2FuIHVzZSB0aGUgZm9sbG93aW5nIGNvbW1hbmQ6IHN1ZG8gYXB0LWdldCBpbnN0YWxsIHhzY3JlZW5zYXZlclxuXG5UaGFuayB5b3UgZm9yIHVzaW5nIHRoaXMgZXh0ZW5zaW9uISIsCiAgImdldHRleHQtZG9tYWluIjogInNjcmVlbi1sb2NrIiwKICAibmFtZSI6ICJTY3JlZW4gbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYXd5ZXIxMy9zY3JlZW4tbG9jayIsCiAgInV1aWQiOiAic2NyZWVuLWxvY2tAZ2FyY2lhYmFhbWVpcm8uY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"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": "5", "sha256": "19r7ll9vl0wf2y6yc4zznafav8bi131fv1sq3hhs0v494jn81sji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vd2FybmluZ25vbnBvdGFibGV3YXRlci9mb3JjZS1zaG93LW9zayIsCiAgInV1aWQiOiAiZm9yY2Utc2hvdy1vc2tAYnJ1aC5sdGQiLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "19r7ll9vl0wf2y6yc4zznafav8bi131fv1sq3hhs0v494jn81sji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vd2FybmluZ25vbnBvdGFibGV3YXRlci9mb3JjZS1zaG93LW9zayIsCiAgInV1aWQiOiAiZm9yY2Utc2hvdy1vc2tAYnJ1aC5sdGQiLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "5", "sha256": "19r7ll9vl0wf2y6yc4zznafav8bi131fv1sq3hhs0v494jn81sji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vd2FybmluZ25vbnBvdGFibGV3YXRlci9mb3JjZS1zaG93LW9zayIsCiAgInV1aWQiOiAiZm9yY2Utc2hvdy1vc2tAYnJ1aC5sdGQiLAogICJ2ZXJzaW9uIjogNQp9"}, "43": {"version": "5", "sha256": "19r7ll9vl0wf2y6yc4zznafav8bi131fv1sq3hhs0v494jn81sji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vd2FybmluZ25vbnBvdGFibGV3YXRlci9mb3JjZS1zaG93LW9zayIsCiAgInV1aWQiOiAiZm9yY2Utc2hvdy1vc2tAYnJ1aC5sdGQiLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"uuid": "alt-tab-active-windows@github.com", "name": "Alt-Tab Active Windows", "pname": "alt-tab-active-windows", "description": "Only show active(not minimized) windows on Alt-Tab", "link": "https://extensions.gnome.org/extension/4322/alt-tab-active-windows/", "shell_version_map": {"40": {"version": "2", "sha256": "1as10k3m66kalwskr3awq0zila7j2n0xyn7nfill2in8kl82nxms", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9ubHkgc2hvdyBhY3RpdmUobm90IG1pbmltaXplZCkgd2luZG93cyBvbiBBbHQtVGFiIiwKICAibmFtZSI6ICJBbHQtVGFiIEFjdGl2ZSBXaW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vYWx0LXRhYi1hY3RpdmUtd2luZG93cyIsCiAgInV1aWQiOiAiYWx0LXRhYi1hY3RpdmUtd2luZG93c0BnaXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "1as10k3m66kalwskr3awq0zila7j2n0xyn7nfill2in8kl82nxms", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9ubHkgc2hvdyBhY3RpdmUobm90IG1pbmltaXplZCkgd2luZG93cyBvbiBBbHQtVGFiIiwKICAibmFtZSI6ICJBbHQtVGFiIEFjdGl2ZSBXaW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vYWx0LXRhYi1hY3RpdmUtd2luZG93cyIsCiAgInV1aWQiOiAiYWx0LXRhYi1hY3RpdmUtd2luZG93c0BnaXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "1as10k3m66kalwskr3awq0zila7j2n0xyn7nfill2in8kl82nxms", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9ubHkgc2hvdyBhY3RpdmUobm90IG1pbmltaXplZCkgd2luZG93cyBvbiBBbHQtVGFiIiwKICAibmFtZSI6ICJBbHQtVGFiIEFjdGl2ZSBXaW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vYWx0LXRhYi1hY3RpdmUtd2luZG93cyIsCiAgInV1aWQiOiAiYWx0LXRhYi1hY3RpdmUtd2luZG93c0BnaXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "43": {"version": "2", "sha256": "1as10k3m66kalwskr3awq0zila7j2n0xyn7nfill2in8kl82nxms", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9ubHkgc2hvdyBhY3RpdmUobm90IG1pbmltaXplZCkgd2luZG93cyBvbiBBbHQtVGFiIiwKICAibmFtZSI6ICJBbHQtVGFiIEFjdGl2ZSBXaW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vYWx0LXRhYi1hY3RpdmUtd2luZG93cyIsCiAgInV1aWQiOiAiYWx0LXRhYi1hY3RpdmUtd2luZG93c0BnaXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"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.\n\n", "link": "https://extensions.gnome.org/extension/4328/shortcuts-for-apt/", "shell_version_map": {"38": {"version": "2", "sha256": "0p4nzm6wv7akjywdis9prlvdg7y6660i7iby9c1ns865068s6i5m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgQVBUIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy5cblxuIiwKICAibmFtZSI6ICJTaG9ydGN1dHMgZm9yIEFQVCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXB0LXNob3J0Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "0p4nzm6wv7akjywdis9prlvdg7y6660i7iby9c1ns865068s6i5m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgQVBUIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy5cblxuIiwKICAibmFtZSI6ICJTaG9ydGN1dHMgZm9yIEFQVCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXB0LXNob3J0Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"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": "4", "sha256": "13yrdgly54bbpx7f23h929mq86nyl716kpa426h4np08g8w4rzb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYXJnbmluZyBtb2RlIGluZGljYXRvciBmb3IgbGFwdG9wcy4gQWxsb3dzIHRvIHN3aXRjaCB0aGUgY2hhcmdpbmcgbW9kZSBmcm9tIGNvbnNlcnZhdGl2ZSBvciBoZWFsdGh5IHRvIG5vcm1hbCBtb2RlLiBJbmRpY2F0ZXMgYWxzbyB3aGljaCBtb2RlIHlvdSBhcmUgdXNpbmcgbm93LiBXb3JrcyBvbiBMZW5vdm8gU2xpbSA3LlxuXG5QbGVhc2UgUmVwb3J0IFByb2JsZW1zIG9yIGlzc3VlcyBvbiBHaXRsYWIgYXQ6XG5cbmh0dHBzOi8vZ2l0bGFiLmNvbS9hbm5leGhhY2svY29uc2VydmF0aW9uLW1vZGUtbGVub3ZvIiwKICAibmFtZSI6ICJpZGVhcGFkIG1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hbm5leGhhY2svY29uc2VydmF0aW9uLW1vZGUtbGVub3ZvIiwKICAidXVpZCI6ICJpZGVhcGFkLW1vZGVAYW5uZXhoYWNrLmluY2VwdGl2ZS5ydSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "13yrdgly54bbpx7f23h929mq86nyl716kpa426h4np08g8w4rzb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYXJnbmluZyBtb2RlIGluZGljYXRvciBmb3IgbGFwdG9wcy4gQWxsb3dzIHRvIHN3aXRjaCB0aGUgY2hhcmdpbmcgbW9kZSBmcm9tIGNvbnNlcnZhdGl2ZSBvciBoZWFsdGh5IHRvIG5vcm1hbCBtb2RlLiBJbmRpY2F0ZXMgYWxzbyB3aGljaCBtb2RlIHlvdSBhcmUgdXNpbmcgbm93LiBXb3JrcyBvbiBMZW5vdm8gU2xpbSA3LlxuXG5QbGVhc2UgUmVwb3J0IFByb2JsZW1zIG9yIGlzc3VlcyBvbiBHaXRsYWIgYXQ6XG5cbmh0dHBzOi8vZ2l0bGFiLmNvbS9hbm5leGhhY2svY29uc2VydmF0aW9uLW1vZGUtbGVub3ZvIiwKICAibmFtZSI6ICJpZGVhcGFkIG1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hbm5leGhhY2svY29uc2VydmF0aW9uLW1vZGUtbGVub3ZvIiwKICAidXVpZCI6ICJpZGVhcGFkLW1vZGVAYW5uZXhoYWNrLmluY2VwdGl2ZS5ydSIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "13yrdgly54bbpx7f23h929mq86nyl716kpa426h4np08g8w4rzb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYXJnbmluZyBtb2RlIGluZGljYXRvciBmb3IgbGFwdG9wcy4gQWxsb3dzIHRvIHN3aXRjaCB0aGUgY2hhcmdpbmcgbW9kZSBmcm9tIGNvbnNlcnZhdGl2ZSBvciBoZWFsdGh5IHRvIG5vcm1hbCBtb2RlLiBJbmRpY2F0ZXMgYWxzbyB3aGljaCBtb2RlIHlvdSBhcmUgdXNpbmcgbm93LiBXb3JrcyBvbiBMZW5vdm8gU2xpbSA3LlxuXG5QbGVhc2UgUmVwb3J0IFByb2JsZW1zIG9yIGlzc3VlcyBvbiBHaXRsYWIgYXQ6XG5cbmh0dHBzOi8vZ2l0bGFiLmNvbS9hbm5leGhhY2svY29uc2VydmF0aW9uLW1vZGUtbGVub3ZvIiwKICAibmFtZSI6ICJpZGVhcGFkIG1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hbm5leGhhY2svY29uc2VydmF0aW9uLW1vZGUtbGVub3ZvIiwKICAidXVpZCI6ICJpZGVhcGFkLW1vZGVAYW5uZXhoYWNrLmluY2VwdGl2ZS5ydSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "ubuntu-yaru-appearance@itzlightyhd", "name": "Ubuntu Appearance (GNOME 40)", "pname": "ubuntu-appearance-gnome-40", "description": "Adds a toggle between the default Ubuntu themes on GNOME 40. Forked from https://github.com/Muqtxdir/yaru-remix-theme-toggle.\n\nIt requires the `gnome-shell-extension-prefs` package installed on your Linux environment.", "link": "https://extensions.gnome.org/extension/4335/ubuntu-appearance-gnome-40/", "shell_version_map": {"40": {"version": "1", "sha256": "16068sihwydg99w82nw6qr3lrnq1vh8jl8fbr3q27i3zyds4xyja", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvcnMiOiBbCiAgICAiQXBleGllRGV2ZWxvcG1lbnQiLAogICAgIkl0ekxpZ2h0eUhEIgogIF0sCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSB0b2dnbGUgYmV0d2VlbiB0aGUgZGVmYXVsdCBVYnVudHUgdGhlbWVzIG9uIEdOT01FIDQwLiBGb3JrZWQgZnJvbSBodHRwczovL2dpdGh1Yi5jb20vTXVxdHhkaXIveWFydS1yZW1peC10aGVtZS10b2dnbGUuXG5cbkl0IHJlcXVpcmVzIHRoZSBgZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXByZWZzYCBwYWNrYWdlIGluc3RhbGxlZCBvbiB5b3VyIExpbnV4IGVudmlyb25tZW50LiIsCiAgIm5hbWUiOiAiVWJ1bnR1IEFwcGVhcmFuY2UgKEdOT01FIDQwKSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BcGV4aWVEZXZlbG9wbWVudC91YnVudHUteWFydS1hcHBlYXJhbmNlIiwKICAidXVpZCI6ICJ1YnVudHUteWFydS1hcHBlYXJhbmNlQGl0emxpZ2h0eWhkIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} -, {"uuid": "desktopicons-neo@darkdemon", "name": "Desktop Icons: Neo", "pname": "desktop-icons-neo", "description": "This adds desktop icons to GNOME. A fork of Desktop Icons NG with a massive amount of customizations (like icon shapes and curved corners), features, bug fixes, and overall polish.", "link": "https://extensions.gnome.org/extension/4337/desktop-icons-neo/", "shell_version_map": {"38": {"version": "7", "sha256": "1gvpcgvx2d3mkyb4qzyw4d2gw6s700042ld033dix1v3isdb4sn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgYWRkcyBkZXNrdG9wIGljb25zIHRvIEdOT01FLiBBIGZvcmsgb2YgRGVza3RvcCBJY29ucyBORyB3aXRoIGEgbWFzc2l2ZSBhbW91bnQgb2YgY3VzdG9taXphdGlvbnMgKGxpa2UgaWNvbiBzaGFwZXMgYW5kIGN1cnZlZCBjb3JuZXJzKSwgZmVhdHVyZXMsIGJ1ZyBmaXhlcywgYW5kIG92ZXJhbGwgcG9saXNoLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29uczogTmVvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vREVNME5Bc3Npc3NhbjcvZGVza3RvcC1pY29ucy1uZW8iLAogICJ1dWlkIjogImRlc2t0b3BpY29ucy1uZW9AZGFya2RlbW9uIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "1gvpcgvx2d3mkyb4qzyw4d2gw6s700042ld033dix1v3isdb4sn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgYWRkcyBkZXNrdG9wIGljb25zIHRvIEdOT01FLiBBIGZvcmsgb2YgRGVza3RvcCBJY29ucyBORyB3aXRoIGEgbWFzc2l2ZSBhbW91bnQgb2YgY3VzdG9taXphdGlvbnMgKGxpa2UgaWNvbiBzaGFwZXMgYW5kIGN1cnZlZCBjb3JuZXJzKSwgZmVhdHVyZXMsIGJ1ZyBmaXhlcywgYW5kIG92ZXJhbGwgcG9saXNoLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29uczogTmVvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vREVNME5Bc3Npc3NhbjcvZGVza3RvcC1pY29ucy1uZW8iLAogICJ1dWlkIjogImRlc2t0b3BpY29ucy1uZW9AZGFya2RlbW9uIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "1gvpcgvx2d3mkyb4qzyw4d2gw6s700042ld033dix1v3isdb4sn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgYWRkcyBkZXNrdG9wIGljb25zIHRvIEdOT01FLiBBIGZvcmsgb2YgRGVza3RvcCBJY29ucyBORyB3aXRoIGEgbWFzc2l2ZSBhbW91bnQgb2YgY3VzdG9taXphdGlvbnMgKGxpa2UgaWNvbiBzaGFwZXMgYW5kIGN1cnZlZCBjb3JuZXJzKSwgZmVhdHVyZXMsIGJ1ZyBmaXhlcywgYW5kIG92ZXJhbGwgcG9saXNoLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29uczogTmVvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vREVNME5Bc3Npc3NhbjcvZGVza3RvcC1pY29ucy1uZW8iLAogICJ1dWlkIjogImRlc2t0b3BpY29ucy1uZW9AZGFya2RlbW9uIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "1gvpcgvx2d3mkyb4qzyw4d2gw6s700042ld033dix1v3isdb4sn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgYWRkcyBkZXNrdG9wIGljb25zIHRvIEdOT01FLiBBIGZvcmsgb2YgRGVza3RvcCBJY29ucyBORyB3aXRoIGEgbWFzc2l2ZSBhbW91bnQgb2YgY3VzdG9taXphdGlvbnMgKGxpa2UgaWNvbiBzaGFwZXMgYW5kIGN1cnZlZCBjb3JuZXJzKSwgZmVhdHVyZXMsIGJ1ZyBmaXhlcywgYW5kIG92ZXJhbGwgcG9saXNoLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29uczogTmVvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vREVNME5Bc3Npc3NhbjcvZGVza3RvcC1pY29ucy1uZW8iLAogICJ1dWlkIjogImRlc2t0b3BpY29ucy1uZW9AZGFya2RlbW9uIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} +, {"uuid": "desktopicons-neo@darkdemon", "name": "Desktop Icons: Neo", "pname": "desktop-icons-neo", "description": "This adds desktop icons to GNOME. A fork of Desktop Icons NG with a massive amount of customizations (like icon shapes and curved corners), features, bug fixes, and overall polish.", "link": "https://extensions.gnome.org/extension/4337/desktop-icons-neo/", "shell_version_map": {"38": {"version": "8", "sha256": "1s60xyv7642w6b83g2npi3bfh6adpg4lja3f37adj7l3b7qf0pr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgYWRkcyBkZXNrdG9wIGljb25zIHRvIEdOT01FLiBBIGZvcmsgb2YgRGVza3RvcCBJY29ucyBORyB3aXRoIGEgbWFzc2l2ZSBhbW91bnQgb2YgY3VzdG9taXphdGlvbnMgKGxpa2UgaWNvbiBzaGFwZXMgYW5kIGN1cnZlZCBjb3JuZXJzKSwgZmVhdHVyZXMsIGJ1ZyBmaXhlcywgYW5kIG92ZXJhbGwgcG9saXNoLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29uczogTmVvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RFTTBOQXNzaXNzYW43L2Rlc2t0b3AtaWNvbnMtbmVvIiwKICAidXVpZCI6ICJkZXNrdG9waWNvbnMtbmVvQGRhcmtkZW1vbiIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "1s60xyv7642w6b83g2npi3bfh6adpg4lja3f37adj7l3b7qf0pr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgYWRkcyBkZXNrdG9wIGljb25zIHRvIEdOT01FLiBBIGZvcmsgb2YgRGVza3RvcCBJY29ucyBORyB3aXRoIGEgbWFzc2l2ZSBhbW91bnQgb2YgY3VzdG9taXphdGlvbnMgKGxpa2UgaWNvbiBzaGFwZXMgYW5kIGN1cnZlZCBjb3JuZXJzKSwgZmVhdHVyZXMsIGJ1ZyBmaXhlcywgYW5kIG92ZXJhbGwgcG9saXNoLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29uczogTmVvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RFTTBOQXNzaXNzYW43L2Rlc2t0b3AtaWNvbnMtbmVvIiwKICAidXVpZCI6ICJkZXNrdG9waWNvbnMtbmVvQGRhcmtkZW1vbiIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "1s60xyv7642w6b83g2npi3bfh6adpg4lja3f37adj7l3b7qf0pr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgYWRkcyBkZXNrdG9wIGljb25zIHRvIEdOT01FLiBBIGZvcmsgb2YgRGVza3RvcCBJY29ucyBORyB3aXRoIGEgbWFzc2l2ZSBhbW91bnQgb2YgY3VzdG9taXphdGlvbnMgKGxpa2UgaWNvbiBzaGFwZXMgYW5kIGN1cnZlZCBjb3JuZXJzKSwgZmVhdHVyZXMsIGJ1ZyBmaXhlcywgYW5kIG92ZXJhbGwgcG9saXNoLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29uczogTmVvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RFTTBOQXNzaXNzYW43L2Rlc2t0b3AtaWNvbnMtbmVvIiwKICAidXVpZCI6ICJkZXNrdG9waWNvbnMtbmVvQGRhcmtkZW1vbiIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1s60xyv7642w6b83g2npi3bfh6adpg4lja3f37adj7l3b7qf0pr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgYWRkcyBkZXNrdG9wIGljb25zIHRvIEdOT01FLiBBIGZvcmsgb2YgRGVza3RvcCBJY29ucyBORyB3aXRoIGEgbWFzc2l2ZSBhbW91bnQgb2YgY3VzdG9taXphdGlvbnMgKGxpa2UgaWNvbiBzaGFwZXMgYW5kIGN1cnZlZCBjb3JuZXJzKSwgZmVhdHVyZXMsIGJ1ZyBmaXhlcywgYW5kIG92ZXJhbGwgcG9saXNoLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29uczogTmVvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RFTTBOQXNzaXNzYW43L2Rlc2t0b3AtaWNvbnMtbmVvIiwKICAidXVpZCI6ICJkZXNrdG9waWNvbnMtbmVvQGRhcmtkZW1vbiIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "1s60xyv7642w6b83g2npi3bfh6adpg4lja3f37adj7l3b7qf0pr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgYWRkcyBkZXNrdG9wIGljb25zIHRvIEdOT01FLiBBIGZvcmsgb2YgRGVza3RvcCBJY29ucyBORyB3aXRoIGEgbWFzc2l2ZSBhbW91bnQgb2YgY3VzdG9taXphdGlvbnMgKGxpa2UgaWNvbiBzaGFwZXMgYW5kIGN1cnZlZCBjb3JuZXJzKSwgZmVhdHVyZXMsIGJ1ZyBmaXhlcywgYW5kIG92ZXJhbGwgcG9saXNoLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29uczogTmVvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RFTTBOQXNzaXNzYW43L2Rlc2t0b3AtaWNvbnMtbmVvIiwKICAidXVpZCI6ICJkZXNrdG9waWNvbnMtbmVvQGRhcmtkZW1vbiIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "allowlockedremotedesktop@kamens.us", "name": "Allow Locked Remote Desktop", "pname": "allow-locked-remote-desktop", "description": "Allow remote desktop connections when the screen is locked", "link": "https://extensions.gnome.org/extension/4338/allow-locked-remote-desktop/", "shell_version_map": {"38": {"version": "6", "sha256": "0imfg8camy52qnidh4b1yqdasmmc3xba6d96pa2skw388h71h40j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFsbG93bG9ja2VkcmVtb3RlZGVza3RvcEBrYW1lbnMudXMiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "0imfg8camy52qnidh4b1yqdasmmc3xba6d96pa2skw388h71h40j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFsbG93bG9ja2VkcmVtb3RlZGVza3RvcEBrYW1lbnMudXMiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "0imfg8camy52qnidh4b1yqdasmmc3xba6d96pa2skw388h71h40j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFsbG93bG9ja2VkcmVtb3RlZGVza3RvcEBrYW1lbnMudXMiLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "8", "sha256": "1ba4jxyh4j2avqrzzlsablrr4kvpav19bixgr9gn9gni0mxmp8n3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhbGxvd2xvY2tlZHJlbW90ZWRlc2t0b3BAa2FtZW5zLnVzIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "43": {"version": "8", "sha256": "1ba4jxyh4j2avqrzzlsablrr4kvpav19bixgr9gn9gni0mxmp8n3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhbGxvd2xvY2tlZHJlbW90ZWRlc2t0b3BAa2FtZW5zLnVzIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "mumble-ping@maweil.github.com", "name": "MumblePing", "pname": "mumbleping", "description": "Displays how many users are currently online on a mumble server", "link": "https://extensions.gnome.org/extension/4341/mumbleping/", "shell_version_map": {"38": {"version": "4", "sha256": "10h3q3nbxi49scfdpr2q657fl3fkw6g90z3ggzncjmz9vpsmarzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGhvdyBtYW55IHVzZXJzIGFyZSBjdXJyZW50bHkgb25saW5lIG9uIGEgbXVtYmxlIHNlcnZlciIsCiAgImdldHRleHQtZG9tYWluIjogIm11bWJsZS1waW5nIiwKICAibmFtZSI6ICJNdW1ibGVQaW5nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm11bWJsZS1waW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hd2VpbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXVtYmxlLXBpbmciLAogICJ1dWlkIjogIm11bWJsZS1waW5nQG1hd2VpbC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "10h3q3nbxi49scfdpr2q657fl3fkw6g90z3ggzncjmz9vpsmarzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGhvdyBtYW55IHVzZXJzIGFyZSBjdXJyZW50bHkgb25saW5lIG9uIGEgbXVtYmxlIHNlcnZlciIsCiAgImdldHRleHQtZG9tYWluIjogIm11bWJsZS1waW5nIiwKICAibmFtZSI6ICJNdW1ibGVQaW5nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm11bWJsZS1waW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hd2VpbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXVtYmxlLXBpbmciLAogICJ1dWlkIjogIm11bWJsZS1waW5nQG1hd2VpbC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "10h3q3nbxi49scfdpr2q657fl3fkw6g90z3ggzncjmz9vpsmarzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGhvdyBtYW55IHVzZXJzIGFyZSBjdXJyZW50bHkgb25saW5lIG9uIGEgbXVtYmxlIHNlcnZlciIsCiAgImdldHRleHQtZG9tYWluIjogIm11bWJsZS1waW5nIiwKICAibmFtZSI6ICJNdW1ibGVQaW5nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm11bWJsZS1waW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hd2VpbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXVtYmxlLXBpbmciLAogICJ1dWlkIjogIm11bWJsZS1waW5nQG1hd2VpbC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "10h3q3nbxi49scfdpr2q657fl3fkw6g90z3ggzncjmz9vpsmarzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGhvdyBtYW55IHVzZXJzIGFyZSBjdXJyZW50bHkgb25saW5lIG9uIGEgbXVtYmxlIHNlcnZlciIsCiAgImdldHRleHQtZG9tYWluIjogIm11bWJsZS1waW5nIiwKICAibmFtZSI6ICJNdW1ibGVQaW5nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm11bWJsZS1waW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hd2VpbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXVtYmxlLXBpbmciLAogICJ1dWlkIjogIm11bWJsZS1waW5nQG1hd2VpbC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "10h3q3nbxi49scfdpr2q657fl3fkw6g90z3ggzncjmz9vpsmarzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGhvdyBtYW55IHVzZXJzIGFyZSBjdXJyZW50bHkgb25saW5lIG9uIGEgbXVtYmxlIHNlcnZlciIsCiAgImdldHRleHQtZG9tYWluIjogIm11bWJsZS1waW5nIiwKICAibmFtZSI6ICJNdW1ibGVQaW5nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm11bWJsZS1waW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hd2VpbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXVtYmxlLXBpbmciLAogICJ1dWlkIjogIm11bWJsZS1waW5nQG1hd2VpbC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "simply.workspaces@andyrichardson.dev", "name": "Simply Workspaces", "pname": "simply-workspaces", "description": "Workspace indication with an i3/polybar style.", "link": "https://extensions.gnome.org/extension/4343/simply-workspaces/", "shell_version_map": {"40": {"version": "7", "sha256": "0s3a4pzmq6wycnwv0gn8sjiwqxa3csssb136c8srghdraicvq3f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBseSBXb3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZHlyaWNoYXJkc29uL3NpbXBseS13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzaW1wbHkud29ya3NwYWNlc0BhbmR5cmljaGFyZHNvbi5kZXYiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "0s3a4pzmq6wycnwv0gn8sjiwqxa3csssb136c8srghdraicvq3f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBseSBXb3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZHlyaWNoYXJkc29uL3NpbXBseS13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzaW1wbHkud29ya3NwYWNlc0BhbmR5cmljaGFyZHNvbi5kZXYiLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "0s3a4pzmq6wycnwv0gn8sjiwqxa3csssb136c8srghdraicvq3f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBseSBXb3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZHlyaWNoYXJkc29uL3NpbXBseS13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzaW1wbHkud29ya3NwYWNlc0BhbmR5cmljaGFyZHNvbi5kZXYiLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "0s3a4pzmq6wycnwv0gn8sjiwqxa3csssb136c8srghdraicvq3f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBseSBXb3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZHlyaWNoYXJkc29uL3NpbXBseS13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzaW1wbHkud29ya3NwYWNlc0BhbmR5cmljaGFyZHNvbi5kZXYiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "nonblockingswitcher@scottworley.com", "name": "Non-Blocking Switcher", "pname": "non-blocking-switcher", "description": "Application switching oughtn't stop all other keyboard shortcuts", "link": "https://extensions.gnome.org/extension/4347/non-blocking-switcher/", "shell_version_map": {"40": {"version": "2", "sha256": "05a59fi1454kxh2q8p5qp3an7ss243v3d67jm37k6xggwd59v5fn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIHN3aXRjaGluZyBvdWdodG4ndCBzdG9wIGFsbCBvdGhlciBrZXlib2FyZCBzaG9ydGN1dHMiLAogICJuYW1lIjogIk5vbi1CbG9ja2luZyBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9jaHVjay9ub24tYmxvY2tpbmctc3dpdGNoZXIiLAogICJ1dWlkIjogIm5vbmJsb2NraW5nc3dpdGNoZXJAc2NvdHR3b3JsZXkuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"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": "top-bar-organizer@julian.gse.jsts.xyz", "name": "Top Bar Organizer", "pname": "top-bar-organizer", "description": "Organize the items of the top (menu)bar.", "link": "https://extensions.gnome.org/extension/4356/top-bar-organizer/", "shell_version_map": {"40": {"version": "3", "sha256": "143gkzalaqzp1bjydy9dm1mi0k2sql8m77yj57gxb854bbipymqs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2p1bGlhbnNjaGFjaGVyL3RvcC1iYXItb3JnYW5pemVyIiwKICAidXVpZCI6ICJ0b3AtYmFyLW9yZ2FuaXplckBqdWxpYW4uZ3NlLmpzdHMueHl6IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"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": "8", "sha256": "0f952h27gziw0wnjdcbvzcyrxd382rzi5rvjfs660r5vr8d7yzjz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL2Z1bGxzY3JlZW4tYXZvaWRlciIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0f952h27gziw0wnjdcbvzcyrxd382rzi5rvjfs660r5vr8d7yzjz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL2Z1bGxzY3JlZW4tYXZvaWRlciIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "0f952h27gziw0wnjdcbvzcyrxd382rzi5rvjfs660r5vr8d7yzjz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL2Z1bGxzY3JlZW4tYXZvaWRlciIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "0f952h27gziw0wnjdcbvzcyrxd382rzi5rvjfs660r5vr8d7yzjz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL2Z1bGxzY3JlZW4tYXZvaWRlciIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"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": "nepalidate@kritishdhaubanjar.gmail.com", "name": "Nepali Date", "pname": "nepali-date", "description": "Show Today's Nepali Date", "link": "https://extensions.gnome.org/extension/4366/nepali-date/", "shell_version_map": {"40": {"version": "3", "sha256": "0b1lqfvdplrrsraz9k49k6j26pl6r9azmj3icn818rcf7avin18y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgVG9kYXkncyBOZXBhbGkgRGF0ZSIsCiAgIm5hbWUiOiAiTmVwYWxpIERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tyaXRpc2gtZGhhdWJhbmphci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmVwYWxpLWRhdGUiLAogICJ1dWlkIjogIm5lcGFsaWRhdGVAa3JpdGlzaGRoYXViYW5qYXIuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "0b1lqfvdplrrsraz9k49k6j26pl6r9azmj3icn818rcf7avin18y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgVG9kYXkncyBOZXBhbGkgRGF0ZSIsCiAgIm5hbWUiOiAiTmVwYWxpIERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tyaXRpc2gtZGhhdWJhbmphci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmVwYWxpLWRhdGUiLAogICJ1dWlkIjogIm5lcGFsaWRhdGVAa3JpdGlzaGRoYXViYW5qYXIuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"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": "9", "sha256": "03w5zymxyryh11dxzn4yjrq8m6568zkpjyz4yn2p8q2m9s40lval", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3R1ZGVudC92ZXJ0aWNhbC13aW5kb3ctbGlzdCIsCiAgInV1aWQiOiAidmVydGljYWwtd2luZG93LWxpc3RAc3R1ZGVudC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "03w5zymxyryh11dxzn4yjrq8m6568zkpjyz4yn2p8q2m9s40lval", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3R1ZGVudC92ZXJ0aWNhbC13aW5kb3ctbGlzdCIsCiAgInV1aWQiOiAidmVydGljYWwtd2luZG93LWxpc3RAc3R1ZGVudC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "03w5zymxyryh11dxzn4yjrq8m6568zkpjyz4yn2p8q2m9s40lval", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3R1ZGVudC92ZXJ0aWNhbC13aW5kb3ctbGlzdCIsCiAgInV1aWQiOiAidmVydGljYWwtd2luZG93LWxpc3RAc3R1ZGVudC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "03w5zymxyryh11dxzn4yjrq8m6568zkpjyz4yn2p8q2m9s40lval", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3R1ZGVudC92ZXJ0aWNhbC13aW5kb3ctbGlzdCIsCiAgInV1aWQiOiAidmVydGljYWwtd2luZG93LWxpc3RAc3R1ZGVudC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} -, {"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": "31", "sha256": "1w0l81g1l21f9f6ga53dlp7y1wg5s1nxz67y990ywh9sp0n4dkac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1dGRvd250aW1lci1kZW1pbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDMxCn0="}, "43": {"version": "33", "sha256": "0nvn4wis75s7wg4vf6d2ggxaj2sy4hhgvycsrh69bjfl2hs825lr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1dGRvd250aW1lci1kZW1pbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDMzCn0="}}} +, {"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": "31", "sha256": "1w0l81g1l21f9f6ga53dlp7y1wg5s1nxz67y990ywh9sp0n4dkac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1dGRvd250aW1lci1kZW1pbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDMxCn0="}, "43": {"version": "34", "sha256": "14psakvxi28sl929d4vd817lvi2wb73lb1lwd78ja7wdms5n1pqj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1dGRvd250aW1lci1kZW1pbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDM0Cn0="}}} , {"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* Top / bottom 'view split' anchoring cycles through 3 sizes: 1/3, 1/2, and 2/3 of the current screen height.\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": "2", "sha256": "1khfbm9gfi50vwvjz3vdix58013agab9ldca9v1wcwiskjja1qq2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBhZGRpbmcgbW9yZSB3aW5kb3cgbWFuYWdlbWVudCBrZXlib2FyZCBzaG9ydGN1dHMuXG5cbiogTGVmdCAvIHJpZ2h0ICd2aWV3IHNwbGl0JyBhbmNob3JpbmcgY3ljbGVzIHRocm91Z2ggMyBzaXplczogMS8zLCAxLzIsIGFuZCAyLzMgb2YgdGhlIGN1cnJlbnQgc2NyZWVuIHdpZHRoLlxuKiBUb3AgLyBib3R0b20gJ3ZpZXcgc3BsaXQnIGFuY2hvcmluZyBjeWNsZXMgdGhyb3VnaCAzIHNpemVzOiAxLzMsIDEvMiwgYW5kIDIvMyBvZiB0aGUgY3VycmVudCBzY3JlZW4gaGVpZ2h0LlxuKkFkZHMgJ21pZCBzY3JlZW4nIG9mIGNlbnRlcmluZyB0aGUgd2luZG93IHdpdGggMy80IHNjcmVlbiBoZWlnaHQgYW5kIHdpZHRoLiIsCiAgIm5hbWUiOiAiQmlmb2NhbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoaXpuYXRpeC9iaWZvY2Fscy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImJpZm9jYWxzQHNoaXpuYXRpeCIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "1khfbm9gfi50vwvjz3vdix58013agab9ldca9v1wcwiskjja1qq2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBhZGRpbmcgbW9yZSB3aW5kb3cgbWFuYWdlbWVudCBrZXlib2FyZCBzaG9ydGN1dHMuXG5cbiogTGVmdCAvIHJpZ2h0ICd2aWV3IHNwbGl0JyBhbmNob3JpbmcgY3ljbGVzIHRocm91Z2ggMyBzaXplczogMS8zLCAxLzIsIGFuZCAyLzMgb2YgdGhlIGN1cnJlbnQgc2NyZWVuIHdpZHRoLlxuKiBUb3AgLyBib3R0b20gJ3ZpZXcgc3BsaXQnIGFuY2hvcmluZyBjeWNsZXMgdGhyb3VnaCAzIHNpemVzOiAxLzMsIDEvMiwgYW5kIDIvMyBvZiB0aGUgY3VycmVudCBzY3JlZW4gaGVpZ2h0LlxuKkFkZHMgJ21pZCBzY3JlZW4nIG9mIGNlbnRlcmluZyB0aGUgd2luZG93IHdpdGggMy80IHNjcmVlbiBoZWlnaHQgYW5kIHdpZHRoLiIsCiAgIm5hbWUiOiAiQmlmb2NhbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoaXpuYXRpeC9iaWZvY2Fscy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImJpZm9jYWxzQHNoaXpuYXRpeCIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "1khfbm9gfi50vwvjz3vdix58013agab9ldca9v1wcwiskjja1qq2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBhZGRpbmcgbW9yZSB3aW5kb3cgbWFuYWdlbWVudCBrZXlib2FyZCBzaG9ydGN1dHMuXG5cbiogTGVmdCAvIHJpZ2h0ICd2aWV3IHNwbGl0JyBhbmNob3JpbmcgY3ljbGVzIHRocm91Z2ggMyBzaXplczogMS8zLCAxLzIsIGFuZCAyLzMgb2YgdGhlIGN1cnJlbnQgc2NyZWVuIHdpZHRoLlxuKiBUb3AgLyBib3R0b20gJ3ZpZXcgc3BsaXQnIGFuY2hvcmluZyBjeWNsZXMgdGhyb3VnaCAzIHNpemVzOiAxLzMsIDEvMiwgYW5kIDIvMyBvZiB0aGUgY3VycmVudCBzY3JlZW4gaGVpZ2h0LlxuKkFkZHMgJ21pZCBzY3JlZW4nIG9mIGNlbnRlcmluZyB0aGUgd2luZG93IHdpdGggMy80IHNjcmVlbiBoZWlnaHQgYW5kIHdpZHRoLiIsCiAgIm5hbWUiOiAiQmlmb2NhbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoaXpuYXRpeC9iaWZvY2Fscy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImJpZm9jYWxzQHNoaXpuYXRpeCIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"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"}}} @@ -563,30 +565,30 @@ , {"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": "11", "sha256": "0gvmi2np73rq7hvxvzyy4rzn4vsb3ylr67k6r48rmr0axg2nkicx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgU2ltcGxlIEV4dGVuc2lvbiB0byBDaGFuZ2UgJ0FjdGl2aXRpZXMnIExhYmVsIHdpdGggTG9nbyBhbmQgVGV4dC5cbllvdSBjYW4gS2VlcCBFaXRoZXJcbjEuIExvZ28gb3JcbjIuIFRleHQgb3JcbjMuIEJvdGggb3JcbjQuIE5vbmUgYXQgYWxsIiwKICAibmFtZSI6ICJSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZXBsYWNlQWN0aXZpdGllc1RleHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQWN0aXZpdGllc1RleHQiLAogICJ1dWlkIjogInJlcGxhY2VBY3Rpdml0aWVzVGV4dEBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0gvmi2np73rq7hvxvzyy4rzn4vsb3ylr67k6r48rmr0axg2nkicx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgU2ltcGxlIEV4dGVuc2lvbiB0byBDaGFuZ2UgJ0FjdGl2aXRpZXMnIExhYmVsIHdpdGggTG9nbyBhbmQgVGV4dC5cbllvdSBjYW4gS2VlcCBFaXRoZXJcbjEuIExvZ28gb3JcbjIuIFRleHQgb3JcbjMuIEJvdGggb3JcbjQuIE5vbmUgYXQgYWxsIiwKICAibmFtZSI6ICJSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZXBsYWNlQWN0aXZpdGllc1RleHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQWN0aXZpdGllc1RleHQiLAogICJ1dWlkIjogInJlcGxhY2VBY3Rpdml0aWVzVGV4dEBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "14", "sha256": "1zra0j594240fafwjrfqhl0m77pckf3jija6pg30vf1rrngm6xlj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgU2ltcGxlIEV4dGVuc2lvbiB0byBDaGFuZ2UgJ0FjdGl2aXRpZXMnIExhYmVsIHdpdGggTG9nbyBhbmQgVGV4dC5cbllvdSBjYW4gS2VlcCBFaXRoZXJcbjEuIExvZ28gb3JcbjIuIFRleHQgb3JcbjMuIEJvdGggb3JcbjQuIE5vbmUgYXQgYWxsIiwKICAibmFtZSI6ICJSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZXBsYWNlQWN0aXZpdGllc1RleHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9BY3Rpdml0aWVzVGV4dCIsCiAgInV1aWQiOiAicmVwbGFjZUFjdGl2aXRpZXNUZXh0QHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAxNAp9"}, "43": {"version": "14", "sha256": "1zra0j594240fafwjrfqhl0m77pckf3jija6pg30vf1rrngm6xlj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgU2ltcGxlIEV4dGVuc2lvbiB0byBDaGFuZ2UgJ0FjdGl2aXRpZXMnIExhYmVsIHdpdGggTG9nbyBhbmQgVGV4dC5cbllvdSBjYW4gS2VlcCBFaXRoZXJcbjEuIExvZ28gb3JcbjIuIFRleHQgb3JcbjMuIEJvdGggb3JcbjQuIE5vbmUgYXQgYWxsIiwKICAibmFtZSI6ICJSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZXBsYWNlQWN0aXZpdGllc1RleHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9BY3Rpdml0aWVzVGV4dCIsCiAgInV1aWQiOiAicmVwbGFjZUFjdGl2aXRpZXNUZXh0QHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAxNAp9"}}} , {"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": "4", "sha256": "0vksxvigc4aam3s5bh0bs7n9yn0ls10rdlb6whxjk2qns0p8l268", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhcHBNZW51SWNvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "0vksxvigc4aam3s5bh0bs7n9yn0ls10rdlb6whxjk2qns0p8l268", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhcHBNZW51SWNvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0vksxvigc4aam3s5bh0bs7n9yn0ls10rdlb6whxjk2qns0p8l268", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhcHBNZW51SWNvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "0vksxvigc4aam3s5bh0bs7n9yn0ls10rdlb6whxjk2qns0p8l268", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhcHBNZW51SWNvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogNAp9"}, "43": {"version": "4", "sha256": "0vksxvigc4aam3s5bh0bs7n9yn0ls10rdlb6whxjk2qns0p8l268", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhcHBNZW51SWNvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"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": "10", "sha256": "1zx6r0zf751hw6l0kvmyc0izw6x59p0zm2dn9x4aijrdfvaz69gp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLXRyYXNoIiwKICAidXVpZCI6ICJnbm9tZS10cmFzaEBiMDBmLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "1zx6r0zf751hw6l0kvmyc0izw6x59p0zm2dn9x4aijrdfvaz69gp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLXRyYXNoIiwKICAidXVpZCI6ICJnbm9tZS10cmFzaEBiMDBmLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "1zx6r0zf751hw6l0kvmyc0izw6x59p0zm2dn9x4aijrdfvaz69gp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLXRyYXNoIiwKICAidXVpZCI6ICJnbm9tZS10cmFzaEBiMDBmLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} -, {"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 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 also offers activation by the Super key and/or top/bottom hot edge, so it can be used as a replacement for the dash or 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": "20", "sha256": "0mpzla12lawrw980ribnw3qasinsg9z2d6ibsbsbyqmjjbnvppmd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIEFsdC9TdXBlcitUYWIgd2luZG93L2FwcCBzd2l0Y2hlcnMgdGhhdCBvZmZlcnMgJ3R5cGUgdG8gc2VhcmNoJyBtb2RlLCB2YXJpb3VzIGZpbHRlcmluZyBhbmQgc29ydGluZyBvcHRpb25zLCB3b3Jrc3BhY2UgYW5kIG1vbml0b3IgbmF2aWdhdGlvbiwgY29uZmlndXJhYmxlIGhvdGtleXMgZm9yIG5hdmlnYXRpb24gYW5kIHdpbmRvdy9hcHAgY29udHJvbCBhbmQgYW4gYXBwIGxhdW5jaGVyLlxuQUFUV1MgYWxzbyBvZmZlcnMgYWN0aXZhdGlvbiBieSB0aGUgU3VwZXIga2V5IGFuZC9vciB0b3AvYm90dG9tIGhvdCBlZGdlLCBzbyBpdCBjYW4gYmUgdXNlZCBhcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgZGFzaCBvciBkb2NrLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvYWR2YW5jZWQtYWx0dGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR2YW5jZWQtYWx0LXRhYkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "40": {"version": "20", "sha256": "0mpzla12lawrw980ribnw3qasinsg9z2d6ibsbsbyqmjjbnvppmd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIEFsdC9TdXBlcitUYWIgd2luZG93L2FwcCBzd2l0Y2hlcnMgdGhhdCBvZmZlcnMgJ3R5cGUgdG8gc2VhcmNoJyBtb2RlLCB2YXJpb3VzIGZpbHRlcmluZyBhbmQgc29ydGluZyBvcHRpb25zLCB3b3Jrc3BhY2UgYW5kIG1vbml0b3IgbmF2aWdhdGlvbiwgY29uZmlndXJhYmxlIGhvdGtleXMgZm9yIG5hdmlnYXRpb24gYW5kIHdpbmRvdy9hcHAgY29udHJvbCBhbmQgYW4gYXBwIGxhdW5jaGVyLlxuQUFUV1MgYWxzbyBvZmZlcnMgYWN0aXZhdGlvbiBieSB0aGUgU3VwZXIga2V5IGFuZC9vciB0b3AvYm90dG9tIGhvdCBlZGdlLCBzbyBpdCBjYW4gYmUgdXNlZCBhcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgZGFzaCBvciBkb2NrLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvYWR2YW5jZWQtYWx0dGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR2YW5jZWQtYWx0LXRhYkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "41": {"version": "20", "sha256": "0mpzla12lawrw980ribnw3qasinsg9z2d6ibsbsbyqmjjbnvppmd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIEFsdC9TdXBlcitUYWIgd2luZG93L2FwcCBzd2l0Y2hlcnMgdGhhdCBvZmZlcnMgJ3R5cGUgdG8gc2VhcmNoJyBtb2RlLCB2YXJpb3VzIGZpbHRlcmluZyBhbmQgc29ydGluZyBvcHRpb25zLCB3b3Jrc3BhY2UgYW5kIG1vbml0b3IgbmF2aWdhdGlvbiwgY29uZmlndXJhYmxlIGhvdGtleXMgZm9yIG5hdmlnYXRpb24gYW5kIHdpbmRvdy9hcHAgY29udHJvbCBhbmQgYW4gYXBwIGxhdW5jaGVyLlxuQUFUV1MgYWxzbyBvZmZlcnMgYWN0aXZhdGlvbiBieSB0aGUgU3VwZXIga2V5IGFuZC9vciB0b3AvYm90dG9tIGhvdCBlZGdlLCBzbyBpdCBjYW4gYmUgdXNlZCBhcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgZGFzaCBvciBkb2NrLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvYWR2YW5jZWQtYWx0dGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR2YW5jZWQtYWx0LXRhYkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "42": {"version": "20", "sha256": "0mpzla12lawrw980ribnw3qasinsg9z2d6ibsbsbyqmjjbnvppmd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIEFsdC9TdXBlcitUYWIgd2luZG93L2FwcCBzd2l0Y2hlcnMgdGhhdCBvZmZlcnMgJ3R5cGUgdG8gc2VhcmNoJyBtb2RlLCB2YXJpb3VzIGZpbHRlcmluZyBhbmQgc29ydGluZyBvcHRpb25zLCB3b3Jrc3BhY2UgYW5kIG1vbml0b3IgbmF2aWdhdGlvbiwgY29uZmlndXJhYmxlIGhvdGtleXMgZm9yIG5hdmlnYXRpb24gYW5kIHdpbmRvdy9hcHAgY29udHJvbCBhbmQgYW4gYXBwIGxhdW5jaGVyLlxuQUFUV1MgYWxzbyBvZmZlcnMgYWN0aXZhdGlvbiBieSB0aGUgU3VwZXIga2V5IGFuZC9vciB0b3AvYm90dG9tIGhvdCBlZGdlLCBzbyBpdCBjYW4gYmUgdXNlZCBhcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgZGFzaCBvciBkb2NrLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvYWR2YW5jZWQtYWx0dGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR2YW5jZWQtYWx0LXRhYkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "43": {"version": "20", "sha256": "0mpzla12lawrw980ribnw3qasinsg9z2d6ibsbsbyqmjjbnvppmd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIEFsdC9TdXBlcitUYWIgd2luZG93L2FwcCBzd2l0Y2hlcnMgdGhhdCBvZmZlcnMgJ3R5cGUgdG8gc2VhcmNoJyBtb2RlLCB2YXJpb3VzIGZpbHRlcmluZyBhbmQgc29ydGluZyBvcHRpb25zLCB3b3Jrc3BhY2UgYW5kIG1vbml0b3IgbmF2aWdhdGlvbiwgY29uZmlndXJhYmxlIGhvdGtleXMgZm9yIG5hdmlnYXRpb24gYW5kIHdpbmRvdy9hcHAgY29udHJvbCBhbmQgYW4gYXBwIGxhdW5jaGVyLlxuQUFUV1MgYWxzbyBvZmZlcnMgYWN0aXZhdGlvbiBieSB0aGUgU3VwZXIga2V5IGFuZC9vciB0b3AvYm90dG9tIGhvdCBlZGdlLCBzbyBpdCBjYW4gYmUgdXNlZCBhcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgZGFzaCBvciBkb2NrLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvYWR2YW5jZWQtYWx0dGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR2YW5jZWQtYWx0LXRhYkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}}} +, {"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": "22", "sha256": "1a75rhv0cll97mcswryj6qq7waagnaywzjahrla49x46zn8zwj60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvYWR2YW5jZWQtYWx0dGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR2YW5jZWQtYWx0LXRhYkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "40": {"version": "22", "sha256": "1a75rhv0cll97mcswryj6qq7waagnaywzjahrla49x46zn8zwj60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvYWR2YW5jZWQtYWx0dGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR2YW5jZWQtYWx0LXRhYkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "41": {"version": "22", "sha256": "1a75rhv0cll97mcswryj6qq7waagnaywzjahrla49x46zn8zwj60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvYWR2YW5jZWQtYWx0dGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR2YW5jZWQtYWx0LXRhYkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "1a75rhv0cll97mcswryj6qq7waagnaywzjahrla49x46zn8zwj60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvYWR2YW5jZWQtYWx0dGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR2YW5jZWQtYWx0LXRhYkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "22", "sha256": "1a75rhv0cll97mcswryj6qq7waagnaywzjahrla49x46zn8zwj60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvYWR2YW5jZWQtYWx0dGFiLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYWR2YW5jZWQtYWx0LXRhYkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} , {"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": "9", "sha256": "17cdv570c9smkvkkzpk9nlrkh03300m4dqd66g9f4bjlqmx5mjl5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmljay1zaG15cmV2L2ltcHJvdmVkLW9zay1nbm9tZS1leHQiLAogICJ1dWlkIjogImltcHJvdmVkb3NrQG5pY2stc2hteXJldi5kZXYiLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "17cdv570c9smkvkkzpk9nlrkh03300m4dqd66g9f4bjlqmx5mjl5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmljay1zaG15cmV2L2ltcHJvdmVkLW9zay1nbm9tZS1leHQiLAogICJ1dWlkIjogImltcHJvdmVkb3NrQG5pY2stc2hteXJldi5kZXYiLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "17cdv570c9smkvkkzpk9nlrkh03300m4dqd66g9f4bjlqmx5mjl5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmljay1zaG15cmV2L2ltcHJvdmVkLW9zay1nbm9tZS1leHQiLAogICJ1dWlkIjogImltcHJvdmVkb3NrQG5pY2stc2hteXJldi5kZXYiLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "17cdv570c9smkvkkzpk9nlrkh03300m4dqd66g9f4bjlqmx5mjl5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmljay1zaG15cmV2L2ltcHJvdmVkLW9zay1nbm9tZS1leHQiLAogICJ1dWlkIjogImltcHJvdmVkb3NrQG5pY2stc2hteXJldi5kZXYiLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"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": "5", "sha256": "1j6q1mgl75mjbr53z88vj2ablnrp4nx0q2a416wdgbiiwdazidbw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eCBhbmQgR05PTUUgU2hlbGwuIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZXBlMzg2L2ZlZG9yYS11cGRhdGUiLAogICJ1dWlkIjogImZlZG9yYS11cGRhdGVAcGVwZTM4NiIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1j6q1mgl75mjbr53z88vj2ablnrp4nx0q2a416wdgbiiwdazidbw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eCBhbmQgR05PTUUgU2hlbGwuIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZXBlMzg2L2ZlZG9yYS11cGRhdGUiLAogICJ1dWlkIjogImZlZG9yYS11cGRhdGVAcGVwZTM4NiIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "1j6q1mgl75mjbr53z88vj2ablnrp4nx0q2a416wdgbiiwdazidbw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eCBhbmQgR05PTUUgU2hlbGwuIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZXBlMzg2L2ZlZG9yYS11cGRhdGUiLAogICJ1dWlkIjogImZlZG9yYS11cGRhdGVAcGVwZTM4NiIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "readingstrip@lupantano.gihthub", "name": "Reading Strip", "pname": "reading-strip", "description": "It’s an extension for Gnome-Shell. It works as a reading guide for computer and this is really useful for people affected by dyslexia. It works great in helping children focusing to read very well, it marks the sentence that they are reading and hides the previous and the next one. It's already used in education projects at schools, it puts the attention on screen but it's also really useful for programmers and graphic designers who want to check their works.", "link": "https://extensions.gnome.org/extension/4419/reading-strip/", "shell_version_map": {"38": {"version": "26", "sha256": "07qvw42vl2pk9f856a9b4dzzh5jia3gp9xp9r7bgra97c05qwd6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0XHUyMDE5cyBhbiBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsLiBJdCB3b3JrcyBhcyBhIHJlYWRpbmcgZ3VpZGUgZm9yIGNvbXB1dGVyIGFuZCB0aGlzIGlzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSBhZmZlY3RlZCBieSBkeXNsZXhpYS4gSXQgd29ya3MgZ3JlYXQgaW4gaGVscGluZyBjaGlsZHJlbiBmb2N1c2luZyB0byByZWFkIHZlcnkgd2VsbCwgaXQgbWFya3MgdGhlIHNlbnRlbmNlIHRoYXQgdGhleSBhcmUgcmVhZGluZyBhbmQgaGlkZXMgdGhlIHByZXZpb3VzIGFuZCB0aGUgbmV4dCBvbmUuIEl0J3MgYWxyZWFkeSB1c2VkIGluIGVkdWNhdGlvbiBwcm9qZWN0cyBhdCBzY2hvb2xzLCBpdCBwdXRzIHRoZSBhdHRlbnRpb24gb24gc2NyZWVuIGJ1dCBpdCdzIGFsc28gcmVhbGx5IHVzZWZ1bCBmb3IgcHJvZ3JhbW1lcnMgYW5kIGdyYXBoaWMgZGVzaWduZXJzIHdobyB3YW50IHRvIGNoZWNrIHRoZWlyIHdvcmtzLiIsCiAgImdldHRleHQtZG9tYWluIjogInJlYWRpbmctc3RyaXAiLAogICJuYW1lIjogIlJlYWRpbmcgU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1cGFudGFuby9yZWFkaW5nc3RyaXAiLAogICJ1dWlkIjogInJlYWRpbmdzdHJpcEBsdXBhbnRhbm8uZ2lodGh1YiIsCiAgInZlcnNpb24iOiAyNgp9"}, "40": {"version": "26", "sha256": "07qvw42vl2pk9f856a9b4dzzh5jia3gp9xp9r7bgra97c05qwd6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0XHUyMDE5cyBhbiBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsLiBJdCB3b3JrcyBhcyBhIHJlYWRpbmcgZ3VpZGUgZm9yIGNvbXB1dGVyIGFuZCB0aGlzIGlzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSBhZmZlY3RlZCBieSBkeXNsZXhpYS4gSXQgd29ya3MgZ3JlYXQgaW4gaGVscGluZyBjaGlsZHJlbiBmb2N1c2luZyB0byByZWFkIHZlcnkgd2VsbCwgaXQgbWFya3MgdGhlIHNlbnRlbmNlIHRoYXQgdGhleSBhcmUgcmVhZGluZyBhbmQgaGlkZXMgdGhlIHByZXZpb3VzIGFuZCB0aGUgbmV4dCBvbmUuIEl0J3MgYWxyZWFkeSB1c2VkIGluIGVkdWNhdGlvbiBwcm9qZWN0cyBhdCBzY2hvb2xzLCBpdCBwdXRzIHRoZSBhdHRlbnRpb24gb24gc2NyZWVuIGJ1dCBpdCdzIGFsc28gcmVhbGx5IHVzZWZ1bCBmb3IgcHJvZ3JhbW1lcnMgYW5kIGdyYXBoaWMgZGVzaWduZXJzIHdobyB3YW50IHRvIGNoZWNrIHRoZWlyIHdvcmtzLiIsCiAgImdldHRleHQtZG9tYWluIjogInJlYWRpbmctc3RyaXAiLAogICJuYW1lIjogIlJlYWRpbmcgU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1cGFudGFuby9yZWFkaW5nc3RyaXAiLAogICJ1dWlkIjogInJlYWRpbmdzdHJpcEBsdXBhbnRhbm8uZ2lodGh1YiIsCiAgInZlcnNpb24iOiAyNgp9"}, "41": {"version": "26", "sha256": "07qvw42vl2pk9f856a9b4dzzh5jia3gp9xp9r7bgra97c05qwd6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0XHUyMDE5cyBhbiBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsLiBJdCB3b3JrcyBhcyBhIHJlYWRpbmcgZ3VpZGUgZm9yIGNvbXB1dGVyIGFuZCB0aGlzIGlzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSBhZmZlY3RlZCBieSBkeXNsZXhpYS4gSXQgd29ya3MgZ3JlYXQgaW4gaGVscGluZyBjaGlsZHJlbiBmb2N1c2luZyB0byByZWFkIHZlcnkgd2VsbCwgaXQgbWFya3MgdGhlIHNlbnRlbmNlIHRoYXQgdGhleSBhcmUgcmVhZGluZyBhbmQgaGlkZXMgdGhlIHByZXZpb3VzIGFuZCB0aGUgbmV4dCBvbmUuIEl0J3MgYWxyZWFkeSB1c2VkIGluIGVkdWNhdGlvbiBwcm9qZWN0cyBhdCBzY2hvb2xzLCBpdCBwdXRzIHRoZSBhdHRlbnRpb24gb24gc2NyZWVuIGJ1dCBpdCdzIGFsc28gcmVhbGx5IHVzZWZ1bCBmb3IgcHJvZ3JhbW1lcnMgYW5kIGdyYXBoaWMgZGVzaWduZXJzIHdobyB3YW50IHRvIGNoZWNrIHRoZWlyIHdvcmtzLiIsCiAgImdldHRleHQtZG9tYWluIjogInJlYWRpbmctc3RyaXAiLAogICJuYW1lIjogIlJlYWRpbmcgU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1cGFudGFuby9yZWFkaW5nc3RyaXAiLAogICJ1dWlkIjogInJlYWRpbmdzdHJpcEBsdXBhbnRhbm8uZ2lodGh1YiIsCiAgInZlcnNpb24iOiAyNgp9"}, "42": {"version": "26", "sha256": "07qvw42vl2pk9f856a9b4dzzh5jia3gp9xp9r7bgra97c05qwd6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0XHUyMDE5cyBhbiBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsLiBJdCB3b3JrcyBhcyBhIHJlYWRpbmcgZ3VpZGUgZm9yIGNvbXB1dGVyIGFuZCB0aGlzIGlzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSBhZmZlY3RlZCBieSBkeXNsZXhpYS4gSXQgd29ya3MgZ3JlYXQgaW4gaGVscGluZyBjaGlsZHJlbiBmb2N1c2luZyB0byByZWFkIHZlcnkgd2VsbCwgaXQgbWFya3MgdGhlIHNlbnRlbmNlIHRoYXQgdGhleSBhcmUgcmVhZGluZyBhbmQgaGlkZXMgdGhlIHByZXZpb3VzIGFuZCB0aGUgbmV4dCBvbmUuIEl0J3MgYWxyZWFkeSB1c2VkIGluIGVkdWNhdGlvbiBwcm9qZWN0cyBhdCBzY2hvb2xzLCBpdCBwdXRzIHRoZSBhdHRlbnRpb24gb24gc2NyZWVuIGJ1dCBpdCdzIGFsc28gcmVhbGx5IHVzZWZ1bCBmb3IgcHJvZ3JhbW1lcnMgYW5kIGdyYXBoaWMgZGVzaWduZXJzIHdobyB3YW50IHRvIGNoZWNrIHRoZWlyIHdvcmtzLiIsCiAgImdldHRleHQtZG9tYWluIjogInJlYWRpbmctc3RyaXAiLAogICJuYW1lIjogIlJlYWRpbmcgU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1cGFudGFuby9yZWFkaW5nc3RyaXAiLAogICJ1dWlkIjogInJlYWRpbmdzdHJpcEBsdXBhbnRhbm8uZ2lodGh1YiIsCiAgInZlcnNpb24iOiAyNgp9"}, "43": {"version": "26", "sha256": "07qvw42vl2pk9f856a9b4dzzh5jia3gp9xp9r7bgra97c05qwd6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0XHUyMDE5cyBhbiBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsLiBJdCB3b3JrcyBhcyBhIHJlYWRpbmcgZ3VpZGUgZm9yIGNvbXB1dGVyIGFuZCB0aGlzIGlzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSBhZmZlY3RlZCBieSBkeXNsZXhpYS4gSXQgd29ya3MgZ3JlYXQgaW4gaGVscGluZyBjaGlsZHJlbiBmb2N1c2luZyB0byByZWFkIHZlcnkgd2VsbCwgaXQgbWFya3MgdGhlIHNlbnRlbmNlIHRoYXQgdGhleSBhcmUgcmVhZGluZyBhbmQgaGlkZXMgdGhlIHByZXZpb3VzIGFuZCB0aGUgbmV4dCBvbmUuIEl0J3MgYWxyZWFkeSB1c2VkIGluIGVkdWNhdGlvbiBwcm9qZWN0cyBhdCBzY2hvb2xzLCBpdCBwdXRzIHRoZSBhdHRlbnRpb24gb24gc2NyZWVuIGJ1dCBpdCdzIGFsc28gcmVhbGx5IHVzZWZ1bCBmb3IgcHJvZ3JhbW1lcnMgYW5kIGdyYXBoaWMgZGVzaWduZXJzIHdobyB3YW50IHRvIGNoZWNrIHRoZWlyIHdvcmtzLiIsCiAgImdldHRleHQtZG9tYWluIjogInJlYWRpbmctc3RyaXAiLAogICJuYW1lIjogIlJlYWRpbmcgU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1cGFudGFuby9yZWFkaW5nc3RyaXAiLAogICJ1dWlkIjogInJlYWRpbmdzdHJpcEBsdXBhbnRhbm8uZ2lodGh1YiIsCiAgInZlcnNpb24iOiAyNgp9"}}} -, {"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": "15", "sha256": "1nr1l2frbk3jrl9fi8kvkcgvw0jn1a9w2wa70mys3m2imhcdvzas", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtY2xpcGJvYXJkIiwKICAidXVpZCI6ICJnbm9tZS1jbGlwYm9hcmRAYjAwZi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "15", "sha256": "1nr1l2frbk3jrl9fi8kvkcgvw0jn1a9w2wa70mys3m2imhcdvzas", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtY2xpcGJvYXJkIiwKICAidXVpZCI6ICJnbm9tZS1jbGlwYm9hcmRAYjAwZi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "42": {"version": "15", "sha256": "1nr1l2frbk3jrl9fi8kvkcgvw0jn1a9w2wa70mys3m2imhcdvzas", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtY2xpcGJvYXJkIiwKICAidXVpZCI6ICJnbm9tZS1jbGlwYm9hcmRAYjAwZi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} +, {"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": "17", "sha256": "0lqn0x4a216fq2073rs1kvgf81fkrr2vcf64xxb0na0nzgb0syb2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLWNsaXBib2FyZCIsCiAgInV1aWQiOiAiZ25vbWUtY2xpcGJvYXJkQGIwMGYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "41": {"version": "17", "sha256": "0lqn0x4a216fq2073rs1kvgf81fkrr2vcf64xxb0na0nzgb0syb2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLWNsaXBib2FyZCIsCiAgInV1aWQiOiAiZ25vbWUtY2xpcGJvYXJkQGIwMGYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "42": {"version": "17", "sha256": "0lqn0x4a216fq2073rs1kvgf81fkrr2vcf64xxb0na0nzgb0syb2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLWNsaXBib2FyZCIsCiAgInV1aWQiOiAiZ25vbWUtY2xpcGJvYXJkQGIwMGYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "43": {"version": "17", "sha256": "0lqn0x4a216fq2073rs1kvgf81fkrr2vcf64xxb0na0nzgb0syb2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLWNsaXBib2FyZCIsCiAgInV1aWQiOiAiZ25vbWUtY2xpcGJvYXJkQGIwMGYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE3Cn0="}}} , {"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": "8", "sha256": "1bak0ap7rf6101qhvlbjiw41dwqiz21yg3px9l2dqkf751jmq7gz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgYWdlIGluIHJlYWwgdGltZS4gXG5cbkdyZWF0IHNvdXJjZSBvZiBtb3RpdmF0aW9uIGFjY29yZGluZyB0byB0ZXJyb3IgbWFuYWdlbWVudCB0aGVvcnkhIiwKICAibmFtZSI6ICJUaGFuYXRvcGhvYmlhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V5b3RlZC90aGFuYXRvcGhvYmlhIiwKICAidXVpZCI6ICJ0aGFuYXRvcGhvYmlhQHlhdHgub25lIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "1bak0ap7rf6101qhvlbjiw41dwqiz21yg3px9l2dqkf751jmq7gz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgYWdlIGluIHJlYWwgdGltZS4gXG5cbkdyZWF0IHNvdXJjZSBvZiBtb3RpdmF0aW9uIGFjY29yZGluZyB0byB0ZXJyb3IgbWFuYWdlbWVudCB0aGVvcnkhIiwKICAibmFtZSI6ICJUaGFuYXRvcGhvYmlhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V5b3RlZC90aGFuYXRvcGhvYmlhIiwKICAidXVpZCI6ICJ0aGFuYXRvcGhvYmlhQHlhdHgub25lIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "42": {"version": "8", "sha256": "1bak0ap7rf6101qhvlbjiw41dwqiz21yg3px9l2dqkf751jmq7gz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgYWdlIGluIHJlYWwgdGltZS4gXG5cbkdyZWF0IHNvdXJjZSBvZiBtb3RpdmF0aW9uIGFjY29yZGluZyB0byB0ZXJyb3IgbWFuYWdlbWVudCB0aGVvcnkhIiwKICAibmFtZSI6ICJUaGFuYXRvcGhvYmlhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V5b3RlZC90aGFuYXRvcGhvYmlhIiwKICAidXVpZCI6ICJ0aGFuYXRvcGhvYmlhQHlhdHgub25lIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"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": "3", "sha256": "0f4w8bf0vp6s79zcfwa0r7ksazrvl309v8jdbfjf0800dc0zsnw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHR5cGV3cml0ZXIgZWZmZWN0IHRvIHlvdXIga2V5Ym9hcmQuXG4gXG5UaGlzIGV4dGVuc2lvbiBpcyBiYXNlZCBvbiB0eXBld3JpdGVyLWtiIGFwcGxpY2F0aW9uIFxuKGh0dHBzOi8vZ2l0aHViLmNvbS9aaGVrZWhaL2xpbnV4LXR5cGV3cml0ZXIta2IpLCB3aGljaCBcbmlzIHJlcXVpcmVkIHRvIHJ1biB0aGUgZXh0ZW5zaW9uLCBidXQgaXMgbm90IHBhcnQgb2YgaXQuXG4gXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5JY29ucyBtYWRlIGJ5IEZyZWVwaWsgZnJvbSB3d3cuZmxhdGljb24uY29tIiwKICAibmFtZSI6ICJUeXBld3JpdGVyIEtleWJvYXJkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInR5cGV3cml0ZXIta2JAenp6aGVrYTk3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "0f4w8bf0vp6s79zcfwa0r7ksazrvl309v8jdbfjf0800dc0zsnw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHR5cGV3cml0ZXIgZWZmZWN0IHRvIHlvdXIga2V5Ym9hcmQuXG4gXG5UaGlzIGV4dGVuc2lvbiBpcyBiYXNlZCBvbiB0eXBld3JpdGVyLWtiIGFwcGxpY2F0aW9uIFxuKGh0dHBzOi8vZ2l0aHViLmNvbS9aaGVrZWhaL2xpbnV4LXR5cGV3cml0ZXIta2IpLCB3aGljaCBcbmlzIHJlcXVpcmVkIHRvIHJ1biB0aGUgZXh0ZW5zaW9uLCBidXQgaXMgbm90IHBhcnQgb2YgaXQuXG4gXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5JY29ucyBtYWRlIGJ5IEZyZWVwaWsgZnJvbSB3d3cuZmxhdGljb24uY29tIiwKICAibmFtZSI6ICJUeXBld3JpdGVyIEtleWJvYXJkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInR5cGV3cml0ZXIta2JAenp6aGVrYTk3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "0f4w8bf0vp6s79zcfwa0r7ksazrvl309v8jdbfjf0800dc0zsnw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHR5cGV3cml0ZXIgZWZmZWN0IHRvIHlvdXIga2V5Ym9hcmQuXG4gXG5UaGlzIGV4dGVuc2lvbiBpcyBiYXNlZCBvbiB0eXBld3JpdGVyLWtiIGFwcGxpY2F0aW9uIFxuKGh0dHBzOi8vZ2l0aHViLmNvbS9aaGVrZWhaL2xpbnV4LXR5cGV3cml0ZXIta2IpLCB3aGljaCBcbmlzIHJlcXVpcmVkIHRvIHJ1biB0aGUgZXh0ZW5zaW9uLCBidXQgaXMgbm90IHBhcnQgb2YgaXQuXG4gXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5JY29ucyBtYWRlIGJ5IEZyZWVwaWsgZnJvbSB3d3cuZmxhdGljb24uY29tIiwKICAibmFtZSI6ICJUeXBld3JpdGVyIEtleWJvYXJkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInR5cGV3cml0ZXIta2JAenp6aGVrYTk3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "0f4w8bf0vp6s79zcfwa0r7ksazrvl309v8jdbfjf0800dc0zsnw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHR5cGV3cml0ZXIgZWZmZWN0IHRvIHlvdXIga2V5Ym9hcmQuXG4gXG5UaGlzIGV4dGVuc2lvbiBpcyBiYXNlZCBvbiB0eXBld3JpdGVyLWtiIGFwcGxpY2F0aW9uIFxuKGh0dHBzOi8vZ2l0aHViLmNvbS9aaGVrZWhaL2xpbnV4LXR5cGV3cml0ZXIta2IpLCB3aGljaCBcbmlzIHJlcXVpcmVkIHRvIHJ1biB0aGUgZXh0ZW5zaW9uLCBidXQgaXMgbm90IHBhcnQgb2YgaXQuXG4gXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5JY29ucyBtYWRlIGJ5IEZyZWVwaWsgZnJvbSB3d3cuZmxhdGljb24uY29tIiwKICAibmFtZSI6ICJUeXBld3JpdGVyIEtleWJvYXJkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInR5cGV3cml0ZXIta2JAenp6aGVrYTk3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"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": "13", "sha256": "0bjr2j7097ja6z2zrkkjjff1jnfjnmpl9s19bvhk9r3r9ymapylx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNhaG9zYm9ybmUvZ1NuYXAiLAogICJ1dWlkIjogImdTbmFwQG1pY2Fob3Nib3JuZSIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "0bjr2j7097ja6z2zrkkjjff1jnfjnmpl9s19bvhk9r3r9ymapylx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNhaG9zYm9ybmUvZ1NuYXAiLAogICJ1dWlkIjogImdTbmFwQG1pY2Fob3Nib3JuZSIsCiAgInZlcnNpb24iOiAxMwp9"}, "42": {"version": "13", "sha256": "0bjr2j7097ja6z2zrkkjjff1jnfjnmpl9s19bvhk9r3r9ymapylx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNhaG9zYm9ybmUvZ1NuYXAiLAogICJ1dWlkIjogImdTbmFwQG1pY2Fob3Nib3JuZSIsCiAgInZlcnNpb24iOiAxMwp9"}, "43": {"version": "13", "sha256": "0bjr2j7097ja6z2zrkkjjff1jnfjnmpl9s19bvhk9r3r9ymapylx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNhaG9zYm9ybmUvZ1NuYXAiLAogICJ1dWlkIjogImdTbmFwQG1pY2Fob3Nib3JuZSIsCiAgInZlcnNpb24iOiAxMwp9"}}} +, {"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 on.py and off.py 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": "1pz3la3m0f5k3p4zdwq3il0rk4jjwa41a9yr41qsj12lh9zgmkin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgV2l6IENvbm5lY3RlZCBMaWdodHMgVGhyb3VnaCBHbm9tZSBTaGVsbFxuXG5SZXF1aXJlbWVudHM6XG4gICAgICAgICNXaXogZW5hYmxlZCBzbWFydCBidWxiXG4gICAgICAgICNweXRob24zICAoVG8gaW5zdGFsbCAgdXNlIGNvbW1hbmQgXCJzdWRvIGFwdCBpbnN0YWxsIHB5dGhvbjNcIilcbiAgICAgICAgI3B5d2l6bGlnaHQgKFRvIGluc3RhbGwgdXNlIGNvbW1hbmQgXCJwaXAzIGluc3RhbGwgcHl3aXpsaWdodFwiKVxuXG5UbyBVc2UgZ28gdG8gdGhlIGxvY2F0aW9uIHdoZXJlIGV4dGVuc2lvbiBpcyBpbnN0YWxsZWQgKHVzdWFsbHkgc3RvcmVkIGluIFwifi8ubG9jYWwvc2hhcmUvZ25vbWUtc2hlbGwvZXh0ZW5zaW9uc1wiKSBhbmQgY2hhbmdlIElQIGFkZHJlc3MgaW4gb24ucHkgYW5kIG9mZi5weSB0byB5b3VyIHNtYXJ0IGJ1bGIncyBJUCBhZGRyZXNzIGFuZCB0aGVuIGV4dGVuc2lvbiBzaG91bGQgd29yay4iLAogICJuYW1lIjogIldpeiBMaWdodCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FscGhhc3BlYXIvV2l6LUxpZ2h0IiwKICAidXVpZCI6ICJ3aXpsaWdodEBpYWJoaWxhc2hqb3NoaSIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"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": "14", "sha256": "1g99s963c2bqq85k73x8h8g6r27z5yczbi4al6ymw0zx8my9x1jx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNhaG9zYm9ybmUvZ1NuYXAiLAogICJ1dWlkIjogImdTbmFwQG1pY2Fob3Nib3JuZSIsCiAgInZlcnNpb24iOiAxNAp9"}, "41": {"version": "14", "sha256": "1g99s963c2bqq85k73x8h8g6r27z5yczbi4al6ymw0zx8my9x1jx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNhaG9zYm9ybmUvZ1NuYXAiLAogICJ1dWlkIjogImdTbmFwQG1pY2Fob3Nib3JuZSIsCiAgInZlcnNpb24iOiAxNAp9"}, "42": {"version": "14", "sha256": "1g99s963c2bqq85k73x8h8g6r27z5yczbi4al6ymw0zx8my9x1jx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNhaG9zYm9ybmUvZ1NuYXAiLAogICJ1dWlkIjogImdTbmFwQG1pY2Fob3Nib3JuZSIsCiAgInZlcnNpb24iOiAxNAp9"}, "43": {"version": "14", "sha256": "1g99s963c2bqq85k73x8h8g6r27z5yczbi4al6ymw0zx8my9x1jx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNhaG9zYm9ybmUvZ1NuYXAiLAogICJ1dWlkIjogImdTbmFwQG1pY2Fob3Nib3JuZSIsCiAgInZlcnNpb24iOiAxNAp9"}}} , {"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": "15", "sha256": "01ah2msicbfnascckf6ly5rqivcfs9iay27x0pswf31ppjjdgsbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXJ5YW4yMC9Mb2dvbWVudSIsCiAgInV1aWQiOiAibG9nb21lbnVAYXJ5YW5fayIsCiAgInZlcnNpb24iOiAxNQp9"}, "40": {"version": "15", "sha256": "01ah2msicbfnascckf6ly5rqivcfs9iay27x0pswf31ppjjdgsbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXJ5YW4yMC9Mb2dvbWVudSIsCiAgInV1aWQiOiAibG9nb21lbnVAYXJ5YW5fayIsCiAgInZlcnNpb24iOiAxNQp9"}, "41": {"version": "15", "sha256": "01ah2msicbfnascckf6ly5rqivcfs9iay27x0pswf31ppjjdgsbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXJ5YW4yMC9Mb2dvbWVudSIsCiAgInV1aWQiOiAibG9nb21lbnVAYXJ5YW5fayIsCiAgInZlcnNpb24iOiAxNQp9"}, "42": {"version": "15", "sha256": "01ah2msicbfnascckf6ly5rqivcfs9iay27x0pswf31ppjjdgsbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXJ5YW4yMC9Mb2dvbWVudSIsCiAgInV1aWQiOiAibG9nb21lbnVAYXJ5YW5fayIsCiAgInZlcnNpb24iOiAxNQp9"}, "43": {"version": "15", "sha256": "01ah2msicbfnascckf6ly5rqivcfs9iay27x0pswf31ppjjdgsbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXJ5YW4yMC9Mb2dvbWVudSIsCiAgInV1aWQiOiAibG9nb21lbnVAYXJ5YW5fayIsCiAgInZlcnNpb24iOiAxNQp9"}}} +, {"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": "16", "sha256": "1107w126mfhz6zjddh0xvvjyzszfn9s5ld2vcv1xw5shx7g5h44w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXJ5YW4yMC9Mb2dvbWVudSIsCiAgInV1aWQiOiAibG9nb21lbnVAYXJ5YW5fayIsCiAgInZlcnNpb24iOiAxNgp9"}, "40": {"version": "16", "sha256": "1107w126mfhz6zjddh0xvvjyzszfn9s5ld2vcv1xw5shx7g5h44w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXJ5YW4yMC9Mb2dvbWVudSIsCiAgInV1aWQiOiAibG9nb21lbnVAYXJ5YW5fayIsCiAgInZlcnNpb24iOiAxNgp9"}, "41": {"version": "16", "sha256": "1107w126mfhz6zjddh0xvvjyzszfn9s5ld2vcv1xw5shx7g5h44w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXJ5YW4yMC9Mb2dvbWVudSIsCiAgInV1aWQiOiAibG9nb21lbnVAYXJ5YW5fayIsCiAgInZlcnNpb24iOiAxNgp9"}, "42": {"version": "16", "sha256": "1107w126mfhz6zjddh0xvvjyzszfn9s5ld2vcv1xw5shx7g5h44w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXJ5YW4yMC9Mb2dvbWVudSIsCiAgInV1aWQiOiAibG9nb21lbnVAYXJ5YW5fayIsCiAgInZlcnNpb24iOiAxNgp9"}, "43": {"version": "16", "sha256": "1107w126mfhz6zjddh0xvvjyzszfn9s5ld2vcv1xw5shx7g5h44w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXJ5YW4yMC9Mb2dvbWVudSIsCiAgInV1aWQiOiAibG9nb21lbnVAYXJ5YW5fayIsCiAgInZlcnNpb24iOiAxNgp9"}}} , {"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. \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.", "link": "https://extensions.gnome.org/extension/4463/expandable-notifications/", "shell_version_map": {"40": {"version": "10", "sha256": "0ry4nd0mb9qyfx3m7n14byhv9v2zzg66gg19zgsl5hpbai60cnzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBleHBhbmRhYmxlLiBVc2luZyBnc2V0dGluZ3MsIHlvdSBjYW4gY2hvb3NlIGJldHdlZW4gdGhyZWUgbW9kZXM6IEFVVE8sIEFSUk9XIGFuZCBDUklUSUNBTC4gXG5BVVRPIHdpbGwgZXhwYW5kIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBhdXRvbWF0aWNhbGx5LiBcbkFSUk9XIGFkZHMgYW4gYXJyb3cgdGhhdCBsZXRzIHlvdSBjaG9vc2Ugd2hhdCB0byBleHBhbmQgb3IgdW5leHBhbmQuIFxuQ1JJVElDQUwgaXMgc2ltaWxhciB0byBhcnJvdywgYnV0IGV4cGFuZHMgbm90aWZpY2F0aW9ucyB3aXRoIHRoZSB1cmdlbmN5IGNyaXRpY2FsIGF1dG9tYXRpY2FsbHkuIFxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYW4gZXhhbXBsZSBjb21tYW5kIHRvIGNoYW5nZSB0aGUgbW9kZSwgSSByZWNvbW1lbmQgdG8gbG9vayBhdCB0aGUgcmVwb3NpdG9yeS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJuYW1lIjogIkV4cGFuZGFibGUgTm90aWZpY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYWFuZ2luYW0vZXhwYW5kYWJsZS1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnNAa2Fhbi5nLmluYW0ub3JnIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0ry4nd0mb9qyfx3m7n14byhv9v2zzg66gg19zgsl5hpbai60cnzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBleHBhbmRhYmxlLiBVc2luZyBnc2V0dGluZ3MsIHlvdSBjYW4gY2hvb3NlIGJldHdlZW4gdGhyZWUgbW9kZXM6IEFVVE8sIEFSUk9XIGFuZCBDUklUSUNBTC4gXG5BVVRPIHdpbGwgZXhwYW5kIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBhdXRvbWF0aWNhbGx5LiBcbkFSUk9XIGFkZHMgYW4gYXJyb3cgdGhhdCBsZXRzIHlvdSBjaG9vc2Ugd2hhdCB0byBleHBhbmQgb3IgdW5leHBhbmQuIFxuQ1JJVElDQUwgaXMgc2ltaWxhciB0byBhcnJvdywgYnV0IGV4cGFuZHMgbm90aWZpY2F0aW9ucyB3aXRoIHRoZSB1cmdlbmN5IGNyaXRpY2FsIGF1dG9tYXRpY2FsbHkuIFxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYW4gZXhhbXBsZSBjb21tYW5kIHRvIGNoYW5nZSB0aGUgbW9kZSwgSSByZWNvbW1lbmQgdG8gbG9vayBhdCB0aGUgcmVwb3NpdG9yeS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJuYW1lIjogIkV4cGFuZGFibGUgTm90aWZpY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYWFuZ2luYW0vZXhwYW5kYWJsZS1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnNAa2Fhbi5nLmluYW0ub3JnIiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "0ry4nd0mb9qyfx3m7n14byhv9v2zzg66gg19zgsl5hpbai60cnzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBleHBhbmRhYmxlLiBVc2luZyBnc2V0dGluZ3MsIHlvdSBjYW4gY2hvb3NlIGJldHdlZW4gdGhyZWUgbW9kZXM6IEFVVE8sIEFSUk9XIGFuZCBDUklUSUNBTC4gXG5BVVRPIHdpbGwgZXhwYW5kIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBhdXRvbWF0aWNhbGx5LiBcbkFSUk9XIGFkZHMgYW4gYXJyb3cgdGhhdCBsZXRzIHlvdSBjaG9vc2Ugd2hhdCB0byBleHBhbmQgb3IgdW5leHBhbmQuIFxuQ1JJVElDQUwgaXMgc2ltaWxhciB0byBhcnJvdywgYnV0IGV4cGFuZHMgbm90aWZpY2F0aW9ucyB3aXRoIHRoZSB1cmdlbmN5IGNyaXRpY2FsIGF1dG9tYXRpY2FsbHkuIFxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYW4gZXhhbXBsZSBjb21tYW5kIHRvIGNoYW5nZSB0aGUgbW9kZSwgSSByZWNvbW1lbmQgdG8gbG9vayBhdCB0aGUgcmVwb3NpdG9yeS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJuYW1lIjogIkV4cGFuZGFibGUgTm90aWZpY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYWFuZ2luYW0vZXhwYW5kYWJsZS1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnNAa2Fhbi5nLmluYW0ub3JnIiwKICAidmVyc2lvbiI6IDEwCn0="}}} +, {"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. \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.", "link": "https://extensions.gnome.org/extension/4463/expandable-notifications/", "shell_version_map": {"40": {"version": "11", "sha256": "04wjyj7z5iind83vf8sh37agzd9n4g66iksx94nrxk6xbzp9jzkj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBleHBhbmRhYmxlLiBVc2luZyBnc2V0dGluZ3MsIHlvdSBjYW4gY2hvb3NlIGJldHdlZW4gdGhyZWUgbW9kZXM6IEFVVE8sIEFSUk9XIGFuZCBDUklUSUNBTC4gXG5BVVRPIHdpbGwgZXhwYW5kIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBhdXRvbWF0aWNhbGx5LiBcbkFSUk9XIGFkZHMgYW4gYXJyb3cgdGhhdCBsZXRzIHlvdSBjaG9vc2Ugd2hhdCB0byBleHBhbmQgb3IgdW5leHBhbmQuIFxuQ1JJVElDQUwgaXMgc2ltaWxhciB0byBhcnJvdywgYnV0IGV4cGFuZHMgbm90aWZpY2F0aW9ucyB3aXRoIHRoZSB1cmdlbmN5IGNyaXRpY2FsIGF1dG9tYXRpY2FsbHkuIFxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYW4gZXhhbXBsZSBjb21tYW5kIHRvIGNoYW5nZSB0aGUgbW9kZSwgSSByZWNvbW1lbmQgdG8gbG9vayBhdCB0aGUgcmVwb3NpdG9yeS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJuYW1lIjogIkV4cGFuZGFibGUgTm90aWZpY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2FhbmdpbmFtL2V4cGFuZGFibGUtbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAiZXhwYW5kYWJsZS1ub3RpZmljYXRpb25zQGthYW4uZy5pbmFtLm9yZyIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "04wjyj7z5iind83vf8sh37agzd9n4g66iksx94nrxk6xbzp9jzkj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBleHBhbmRhYmxlLiBVc2luZyBnc2V0dGluZ3MsIHlvdSBjYW4gY2hvb3NlIGJldHdlZW4gdGhyZWUgbW9kZXM6IEFVVE8sIEFSUk9XIGFuZCBDUklUSUNBTC4gXG5BVVRPIHdpbGwgZXhwYW5kIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBhdXRvbWF0aWNhbGx5LiBcbkFSUk9XIGFkZHMgYW4gYXJyb3cgdGhhdCBsZXRzIHlvdSBjaG9vc2Ugd2hhdCB0byBleHBhbmQgb3IgdW5leHBhbmQuIFxuQ1JJVElDQUwgaXMgc2ltaWxhciB0byBhcnJvdywgYnV0IGV4cGFuZHMgbm90aWZpY2F0aW9ucyB3aXRoIHRoZSB1cmdlbmN5IGNyaXRpY2FsIGF1dG9tYXRpY2FsbHkuIFxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYW4gZXhhbXBsZSBjb21tYW5kIHRvIGNoYW5nZSB0aGUgbW9kZSwgSSByZWNvbW1lbmQgdG8gbG9vayBhdCB0aGUgcmVwb3NpdG9yeS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJuYW1lIjogIkV4cGFuZGFibGUgTm90aWZpY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2FhbmdpbmFtL2V4cGFuZGFibGUtbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAiZXhwYW5kYWJsZS1ub3RpZmljYXRpb25zQGthYW4uZy5pbmFtLm9yZyIsCiAgInZlcnNpb24iOiAxMQp9"}, "42": {"version": "11", "sha256": "04wjyj7z5iind83vf8sh37agzd9n4g66iksx94nrxk6xbzp9jzkj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBleHBhbmRhYmxlLiBVc2luZyBnc2V0dGluZ3MsIHlvdSBjYW4gY2hvb3NlIGJldHdlZW4gdGhyZWUgbW9kZXM6IEFVVE8sIEFSUk9XIGFuZCBDUklUSUNBTC4gXG5BVVRPIHdpbGwgZXhwYW5kIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBhdXRvbWF0aWNhbGx5LiBcbkFSUk9XIGFkZHMgYW4gYXJyb3cgdGhhdCBsZXRzIHlvdSBjaG9vc2Ugd2hhdCB0byBleHBhbmQgb3IgdW5leHBhbmQuIFxuQ1JJVElDQUwgaXMgc2ltaWxhciB0byBhcnJvdywgYnV0IGV4cGFuZHMgbm90aWZpY2F0aW9ucyB3aXRoIHRoZSB1cmdlbmN5IGNyaXRpY2FsIGF1dG9tYXRpY2FsbHkuIFxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYW4gZXhhbXBsZSBjb21tYW5kIHRvIGNoYW5nZSB0aGUgbW9kZSwgSSByZWNvbW1lbmQgdG8gbG9vayBhdCB0aGUgcmVwb3NpdG9yeS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJuYW1lIjogIkV4cGFuZGFibGUgTm90aWZpY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2FhbmdpbmFtL2V4cGFuZGFibGUtbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAiZXhwYW5kYWJsZS1ub3RpZmljYXRpb25zQGthYW4uZy5pbmFtLm9yZyIsCiAgInZlcnNpb24iOiAxMQp9"}, "43": {"version": "11", "sha256": "04wjyj7z5iind83vf8sh37agzd9n4g66iksx94nrxk6xbzp9jzkj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBleHBhbmRhYmxlLiBVc2luZyBnc2V0dGluZ3MsIHlvdSBjYW4gY2hvb3NlIGJldHdlZW4gdGhyZWUgbW9kZXM6IEFVVE8sIEFSUk9XIGFuZCBDUklUSUNBTC4gXG5BVVRPIHdpbGwgZXhwYW5kIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBhdXRvbWF0aWNhbGx5LiBcbkFSUk9XIGFkZHMgYW4gYXJyb3cgdGhhdCBsZXRzIHlvdSBjaG9vc2Ugd2hhdCB0byBleHBhbmQgb3IgdW5leHBhbmQuIFxuQ1JJVElDQUwgaXMgc2ltaWxhciB0byBhcnJvdywgYnV0IGV4cGFuZHMgbm90aWZpY2F0aW9ucyB3aXRoIHRoZSB1cmdlbmN5IGNyaXRpY2FsIGF1dG9tYXRpY2FsbHkuIFxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYW4gZXhhbXBsZSBjb21tYW5kIHRvIGNoYW5nZSB0aGUgbW9kZSwgSSByZWNvbW1lbmQgdG8gbG9vayBhdCB0aGUgcmVwb3NpdG9yeS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJuYW1lIjogIkV4cGFuZGFibGUgTm90aWZpY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2FhbmdpbmFtL2V4cGFuZGFibGUtbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAiZXhwYW5kYWJsZS1ub3RpZmljYXRpb25zQGthYW4uZy5pbmFtLm9yZyIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"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, 42\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": "1gn3457s7wfzqmd3dsih6frga32lcn3yb47l57vqg7bfwxr19rkj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MSwgNDJcbiAgICAtIENhY2hlcyBhbGJ1bSBhcnRcbiAgICAtIENvbnRyb2wgZXZlcnkgZWxlbWVudCBpbiB0aGUgZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJNZWRpYSBDb250cm9scyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZWRpYWNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jbGlmZm5pZmYvbWVkaWEtY29udHJvbHMiLAogICJ1dWlkIjogIm1lZGlhY29udHJvbHNAY2xpZmZuaWZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "40": {"version": "20", "sha256": "1gn3457s7wfzqmd3dsih6frga32lcn3yb47l57vqg7bfwxr19rkj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MSwgNDJcbiAgICAtIENhY2hlcyBhbGJ1bSBhcnRcbiAgICAtIENvbnRyb2wgZXZlcnkgZWxlbWVudCBpbiB0aGUgZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJNZWRpYSBDb250cm9scyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZWRpYWNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jbGlmZm5pZmYvbWVkaWEtY29udHJvbHMiLAogICJ1dWlkIjogIm1lZGlhY29udHJvbHNAY2xpZmZuaWZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "41": {"version": "20", "sha256": "1gn3457s7wfzqmd3dsih6frga32lcn3yb47l57vqg7bfwxr19rkj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MSwgNDJcbiAgICAtIENhY2hlcyBhbGJ1bSBhcnRcbiAgICAtIENvbnRyb2wgZXZlcnkgZWxlbWVudCBpbiB0aGUgZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJNZWRpYSBDb250cm9scyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZWRpYWNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jbGlmZm5pZmYvbWVkaWEtY29udHJvbHMiLAogICJ1dWlkIjogIm1lZGlhY29udHJvbHNAY2xpZmZuaWZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "42": {"version": "22", "sha256": "1psik5d38h796hl4ifypansxm87h9mkpb5g9rp2rnvwml9kb5gkl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MSwgNDJcbiAgICAtIENhY2hlcyBhbGJ1bSBhcnRcbiAgICAtIENvbnRyb2wgZXZlcnkgZWxlbWVudCBpbiB0aGUgZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJNZWRpYSBDb250cm9scyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZWRpYWNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsaWZmbmlmZi9tZWRpYS1jb250cm9scyIsCiAgInV1aWQiOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}}} -, {"uuid": "sp-tray@sp-tray.esenliyim.github.com", "name": "spotify-tray", "pname": "spotify-tray", "description": "Adds a button to the panel that shows information Spotify playback. For bug reports, feature requests, translation contributions, etc., please visit the extension's github page.", "link": "https://extensions.gnome.org/extension/4472/spotify-tray/", "shell_version_map": {"38": {"version": "17", "sha256": "11gyy143n5bvsrydlr4hvy3ggn49k1pxk1d7x11dafic8xxwv5cl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "40": {"version": "19", "sha256": "1hkqy3fg7x83abb979wy879zjngjdldgsj6yxxlaqi3ggpxi9wdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXNlbmxpeWltL3NwLXRyYXkiLAogICJ1dWlkIjogInNwLXRyYXlAc3AtdHJheS5lc2VubGl5aW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "41": {"version": "19", "sha256": "1hkqy3fg7x83abb979wy879zjngjdldgsj6yxxlaqi3ggpxi9wdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXNlbmxpeWltL3NwLXRyYXkiLAogICJ1dWlkIjogInNwLXRyYXlAc3AtdHJheS5lc2VubGl5aW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "42": {"version": "19", "sha256": "1hkqy3fg7x83abb979wy879zjngjdldgsj6yxxlaqi3ggpxi9wdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXNlbmxpeWltL3NwLXRyYXkiLAogICJ1dWlkIjogInNwLXRyYXlAc3AtdHJheS5lc2VubGl5aW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "43": {"version": "19", "sha256": "1hkqy3fg7x83abb979wy879zjngjdldgsj6yxxlaqi3ggpxi9wdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXNlbmxpeWltL3NwLXRyYXkiLAogICJ1dWlkIjogInNwLXRyYXlAc3AtdHJheS5lc2VubGl5aW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}}} +, {"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, 42, \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": "0l1viaj4fzmy82m3c1xhdp27z9cxzly8yq80fs4pi1ivn3nggdac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MSwgNDIsIFxuICAgIC0gQ2FjaGVzIGFsYnVtIGFydFxuICAgIC0gQ29udHJvbCBldmVyeSBlbGVtZW50IGluIHRoZSBleHRlbnNpb24iLAogICJuYW1lIjogIk1lZGlhIENvbnRyb2xzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lZGlhY29udHJvbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsaWZmbmlmZi9tZWRpYS1jb250cm9scyIsCiAgInV1aWQiOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "20", "sha256": "0l1viaj4fzmy82m3c1xhdp27z9cxzly8yq80fs4pi1ivn3nggdac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MSwgNDIsIFxuICAgIC0gQ2FjaGVzIGFsYnVtIGFydFxuICAgIC0gQ29udHJvbCBldmVyeSBlbGVtZW50IGluIHRoZSBleHRlbnNpb24iLAogICJuYW1lIjogIk1lZGlhIENvbnRyb2xzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lZGlhY29udHJvbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsaWZmbmlmZi9tZWRpYS1jb250cm9scyIsCiAgInV1aWQiOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "41": {"version": "20", "sha256": "0l1viaj4fzmy82m3c1xhdp27z9cxzly8yq80fs4pi1ivn3nggdac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MSwgNDIsIFxuICAgIC0gQ2FjaGVzIGFsYnVtIGFydFxuICAgIC0gQ29udHJvbCBldmVyeSBlbGVtZW50IGluIHRoZSBleHRlbnNpb24iLAogICJuYW1lIjogIk1lZGlhIENvbnRyb2xzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lZGlhY29udHJvbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsaWZmbmlmZi9tZWRpYS1jb250cm9scyIsCiAgInV1aWQiOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "42": {"version": "23", "sha256": "1m9j2jm7mgg457p3x732sv6zpmw6wjzmiy6caszw54kqlz124rda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MSwgNDIsIFxuICAgIC0gQ2FjaGVzIGFsYnVtIGFydFxuICAgIC0gQ29udHJvbCBldmVyeSBlbGVtZW50IGluIHRoZSBleHRlbnNpb24iLAogICJuYW1lIjogIk1lZGlhIENvbnRyb2xzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lZGlhY29udHJvbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsaWZmbmlmZi9tZWRpYS1jb250cm9scyIsCiAgInV1aWQiOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "43": {"version": "23", "sha256": "1m9j2jm7mgg457p3x732sv6zpmw6wjzmiy6caszw54kqlz124rda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MSwgNDIsIFxuICAgIC0gQ2FjaGVzIGFsYnVtIGFydFxuICAgIC0gQ29udHJvbCBldmVyeSBlbGVtZW50IGluIHRoZSBleHRlbnNpb24iLAogICJuYW1lIjogIk1lZGlhIENvbnRyb2xzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lZGlhY29udHJvbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsaWZmbmlmZi9tZWRpYS1jb250cm9scyIsCiAgInV1aWQiOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}}} +, {"uuid": "sp-tray@sp-tray.esenliyim.github.com", "name": "spotify-tray", "pname": "spotify-tray", "description": "Adds a button to the panel that shows information Spotify playback. For bug reports, feature requests, translation contributions, etc., please visit the extension's github page.", "link": "https://extensions.gnome.org/extension/4472/spotify-tray/", "shell_version_map": {"38": {"version": "17", "sha256": "11gyy143n5bvsrydlr4hvy3ggn49k1pxk1d7x11dafic8xxwv5cl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "40": {"version": "20", "sha256": "1prsmrf9z2cyhzg70jvvwq2dksklxrnbzalk5a9riav7w16q93cx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXNlbmxpeWltL3NwLXRyYXkiLAogICJ1dWlkIjogInNwLXRyYXlAc3AtdHJheS5lc2VubGl5aW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "41": {"version": "20", "sha256": "1prsmrf9z2cyhzg70jvvwq2dksklxrnbzalk5a9riav7w16q93cx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXNlbmxpeWltL3NwLXRyYXkiLAogICJ1dWlkIjogInNwLXRyYXlAc3AtdHJheS5lc2VubGl5aW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "42": {"version": "20", "sha256": "1prsmrf9z2cyhzg70jvvwq2dksklxrnbzalk5a9riav7w16q93cx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXNlbmxpeWltL3NwLXRyYXkiLAogICJ1dWlkIjogInNwLXRyYXlAc3AtdHJheS5lc2VubGl5aW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "43": {"version": "20", "sha256": "1prsmrf9z2cyhzg70jvvwq2dksklxrnbzalk5a9riav7w16q93cx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXNlbmxpeWltL3NwLXRyYXkiLAogICJ1dWlkIjogInNwLXRyYXlAc3AtdHJheS5lc2VubGl5aW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}}} , {"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": "4", "sha256": "1imgp4d42g05j88y8ilvfcfdvygaqchi9hivvap1kyshbl08ys3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgcXVpY2tseSBzZXR0aW5nIG5hbWVkIHByb2ZpbGVzIGFzIHRoZSBkZWZhdWx0IiwKICAibmFtZSI6ICJBV1MgRGVmYXVsdCBQcm9maWxlIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V2aW5jaGFwcGVsbC9hd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJhd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyQGtldmluLWNoYXBwZWxsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1imgp4d42g05j88y8ilvfcfdvygaqchi9hivvap1kyshbl08ys3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgcXVpY2tseSBzZXR0aW5nIG5hbWVkIHByb2ZpbGVzIGFzIHRoZSBkZWZhdWx0IiwKICAibmFtZSI6ICJBV1MgRGVmYXVsdCBQcm9maWxlIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V2aW5jaGFwcGVsbC9hd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJhd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyQGtldmluLWNoYXBwZWxsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1imgp4d42g05j88y8ilvfcfdvygaqchi9hivvap1kyshbl08ys3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgcXVpY2tseSBzZXR0aW5nIG5hbWVkIHByb2ZpbGVzIGFzIHRoZSBkZWZhdWx0IiwKICAibmFtZSI6ICJBV1MgRGVmYXVsdCBQcm9maWxlIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V2aW5jaGFwcGVsbC9hd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJhd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyQGtldmluLWNoYXBwZWxsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1imgp4d42g05j88y8ilvfcfdvygaqchi9hivvap1kyshbl08ys3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgcXVpY2tseSBzZXR0aW5nIG5hbWVkIHByb2ZpbGVzIGFzIHRoZSBkZWZhdWx0IiwKICAibmFtZSI6ICJBV1MgRGVmYXVsdCBQcm9maWxlIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V2aW5jaGFwcGVsbC9hd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJhd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyQGtldmluLWNoYXBwZWxsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"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": "5", "sha256": "086nrp8zhlabhpaj013pyw6bhhcgqysyfa0j2cm9lgnjwv112lxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBuZXQgc3BlZWQgb24gcGFuZWwuIiwKICAibmFtZSI6ICJOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1uZXQtc3BlZWQvIiwKICAidXVpZCI6ICJuZXRzcGVlZEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "086nrp8zhlabhpaj013pyw6bhhcgqysyfa0j2cm9lgnjwv112lxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBuZXQgc3BlZWQgb24gcGFuZWwuIiwKICAibmFtZSI6ICJOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1uZXQtc3BlZWQvIiwKICAidXVpZCI6ICJuZXRzcGVlZEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "5", "sha256": "086nrp8zhlabhpaj013pyw6bhhcgqysyfa0j2cm9lgnjwv112lxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBuZXQgc3BlZWQgb24gcGFuZWwuIiwKICAibmFtZSI6ICJOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1uZXQtc3BlZWQvIiwKICAidXVpZCI6ICJuZXRzcGVlZEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNQp9"}, "43": {"version": "5", "sha256": "086nrp8zhlabhpaj013pyw6bhhcgqysyfa0j2cm9lgnjwv112lxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBuZXQgc3BlZWQgb24gcGFuZWwuIiwKICAibmFtZSI6ICJOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1uZXQtc3BlZWQvIiwKICAidXVpZCI6ICJuZXRzcGVlZEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNQp9"}}} -, {"uuid": "forge@jmmaranan.com", "name": "Forge", "pname": "forge", "description": "Tiling and window manager for GNOME\n\nCHANGES\n\n - Floating windows always-on-top tiling windows. Can be toggled.\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": "1mncw35iidp6dm2zjkr63kifss08ragmfa0j4aipizygpl2cpicy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gRmxvYXRpbmcgd2luZG93cyBhbHdheXMtb24tdG9wIHRpbGluZyB3aW5kb3dzLiBDYW4gYmUgdG9nZ2xlZC5cblxuIFBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gaHR0cHM6Ly9naXRodWIuY29tL2ptbWFyYW5hbi9mb3JnZS9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb3JnZSIsCiAgIm5hbWUiOiAiRm9yZ2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZm9yZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogMzgKfQ=="}, "40": {"version": "58", "sha256": "173w1ya4hpm7pih4ajkj0yx44grw88zs2hxi5nwfs39i92f4ssw7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gRmxvYXRpbmcgd2luZG93cyBhbHdheXMtb24tdG9wIHRpbGluZyB3aW5kb3dzLiBDYW4gYmUgdG9nZ2xlZC5cblxuIFBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gaHR0cHM6Ly9naXRodWIuY29tL2ptbWFyYW5hbi9mb3JnZS9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb3JnZSIsCiAgIm5hbWUiOiAiRm9yZ2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZm9yZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlIiwKICAidXVpZCI6ICJmb3JnZUBqbW1hcmFuYW4uY29tIiwKICAidmVyc2lvbiI6IDU4Cn0="}, "41": {"version": "58", "sha256": "173w1ya4hpm7pih4ajkj0yx44grw88zs2hxi5nwfs39i92f4ssw7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gRmxvYXRpbmcgd2luZG93cyBhbHdheXMtb24tdG9wIHRpbGluZyB3aW5kb3dzLiBDYW4gYmUgdG9nZ2xlZC5cblxuIFBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gaHR0cHM6Ly9naXRodWIuY29tL2ptbWFyYW5hbi9mb3JnZS9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb3JnZSIsCiAgIm5hbWUiOiAiRm9yZ2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZm9yZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlIiwKICAidXVpZCI6ICJmb3JnZUBqbW1hcmFuYW4uY29tIiwKICAidmVyc2lvbiI6IDU4Cn0="}, "42": {"version": "58", "sha256": "173w1ya4hpm7pih4ajkj0yx44grw88zs2hxi5nwfs39i92f4ssw7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gRmxvYXRpbmcgd2luZG93cyBhbHdheXMtb24tdG9wIHRpbGluZyB3aW5kb3dzLiBDYW4gYmUgdG9nZ2xlZC5cblxuIFBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gaHR0cHM6Ly9naXRodWIuY29tL2ptbWFyYW5hbi9mb3JnZS9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb3JnZSIsCiAgIm5hbWUiOiAiRm9yZ2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZm9yZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlIiwKICAidXVpZCI6ICJmb3JnZUBqbW1hcmFuYW4uY29tIiwKICAidmVyc2lvbiI6IDU4Cn0="}, "43": {"version": "58", "sha256": "173w1ya4hpm7pih4ajkj0yx44grw88zs2hxi5nwfs39i92f4ssw7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gRmxvYXRpbmcgd2luZG93cyBhbHdheXMtb24tdG9wIHRpbGluZyB3aW5kb3dzLiBDYW4gYmUgdG9nZ2xlZC5cblxuIFBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gaHR0cHM6Ly9naXRodWIuY29tL2ptbWFyYW5hbi9mb3JnZS9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmb3JnZSIsCiAgIm5hbWUiOiAiRm9yZ2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZm9yZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlIiwKICAidXVpZCI6ICJmb3JnZUBqbW1hcmFuYW4uY29tIiwKICAidmVyc2lvbiI6IDU4Cn0="}}} +, {"uuid": "forge@jmmaranan.com", "name": "Forge", "pname": "forge", "description": "Tiling and window manager for GNOME\n\nCHANGES\n\n - Quarter tiling, for more information see https://github.com/jmmaranan/forge/issues/166. Can be toggled.\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": "1dblgs42gxxphzy6vffx501np3g6nkclds54wdzs675i82vj4m2p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ptbWFyYW5hbi9mb3JnZSIsCiAgInV1aWQiOiAiZm9yZ2VAam1tYXJhbmFuLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"}, "40": {"version": "61", "sha256": "13ivig36s8chn9ygpk1q7sxv7qgdnlpraq5j7347rlav5qbankra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNjEKfQ=="}, "41": {"version": "61", "sha256": "13ivig36s8chn9ygpk1q7sxv7qgdnlpraq5j7347rlav5qbankra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNjEKfQ=="}, "42": {"version": "61", "sha256": "13ivig36s8chn9ygpk1q7sxv7qgdnlpraq5j7347rlav5qbankra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNjEKfQ=="}, "43": {"version": "61", "sha256": "13ivig36s8chn9ygpk1q7sxv7qgdnlpraq5j7347rlav5qbankra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNjEKfQ=="}}} , {"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": "2", "sha256": "0cbz05qmn0i7c3591c5h5znq4fp90xc9dz1jdaj213pybynqdphl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgZmF2b3VyaXRlIGFwcGxpY2F0aW9ucyBpbiBBcHBHcmlkIiwKICAibmFtZSI6ICJGYXZvdXJpdGVzIGluIEFwcEdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9oYXJzaGFkZ2F2YWxpL2Zhdm91cml0ZXMtaW4tYXBwZ3JpZC8iLAogICJ1dWlkIjogImZhdm91cml0ZXMtaW4tYXBwZ3JpZEBoYXJzaGFkZ2F2YWxpLmdpdGxhYi5vcmciLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "0cbz05qmn0i7c3591c5h5znq4fp90xc9dz1jdaj213pybynqdphl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgZmF2b3VyaXRlIGFwcGxpY2F0aW9ucyBpbiBBcHBHcmlkIiwKICAibmFtZSI6ICJGYXZvdXJpdGVzIGluIEFwcEdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9oYXJzaGFkZ2F2YWxpL2Zhdm91cml0ZXMtaW4tYXBwZ3JpZC8iLAogICJ1dWlkIjogImZhdm91cml0ZXMtaW4tYXBwZ3JpZEBoYXJzaGFkZ2F2YWxpLmdpdGxhYi5vcmciLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "0cbz05qmn0i7c3591c5h5znq4fp90xc9dz1jdaj213pybynqdphl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgZmF2b3VyaXRlIGFwcGxpY2F0aW9ucyBpbiBBcHBHcmlkIiwKICAibmFtZSI6ICJGYXZvdXJpdGVzIGluIEFwcEdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9oYXJzaGFkZ2F2YWxpL2Zhdm91cml0ZXMtaW4tYXBwZ3JpZC8iLAogICJ1dWlkIjogImZhdm91cml0ZXMtaW4tYXBwZ3JpZEBoYXJzaGFkZ2F2YWxpLmdpdGxhYi5vcmciLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"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": "3", "sha256": "1zx3ivzid3cjr5h6070kyb9n2cjsxjg08s7h5ds18by1bahzffkr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgZmF2b3VyaXRlIGFwcGxpY2F0aW9ucyBpbiBBcHBHcmlkIiwKICAibmFtZSI6ICJGYXZvdXJpdGVzIGluIEFwcEdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvaGFyc2hhZGdhdmFsaS9mYXZvdXJpdGVzLWluLWFwcGdyaWQvIiwKICAidXVpZCI6ICJmYXZvdXJpdGVzLWluLWFwcGdyaWRAaGFyc2hhZGdhdmFsaS5naXRsYWIub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1zx3ivzid3cjr5h6070kyb9n2cjsxjg08s7h5ds18by1bahzffkr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgZmF2b3VyaXRlIGFwcGxpY2F0aW9ucyBpbiBBcHBHcmlkIiwKICAibmFtZSI6ICJGYXZvdXJpdGVzIGluIEFwcEdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvaGFyc2hhZGdhdmFsaS9mYXZvdXJpdGVzLWluLWFwcGdyaWQvIiwKICAidXVpZCI6ICJmYXZvdXJpdGVzLWluLWFwcGdyaWRAaGFyc2hhZGdhdmFsaS5naXRsYWIub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "1zx3ivzid3cjr5h6070kyb9n2cjsxjg08s7h5ds18by1bahzffkr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgZmF2b3VyaXRlIGFwcGxpY2F0aW9ucyBpbiBBcHBHcmlkIiwKICAibmFtZSI6ICJGYXZvdXJpdGVzIGluIEFwcEdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvaGFyc2hhZGdhdmFsaS9mYXZvdXJpdGVzLWluLWFwcGdyaWQvIiwKICAidXVpZCI6ICJmYXZvdXJpdGVzLWluLWFwcGdyaWRAaGFyc2hhZGdhdmFsaS5naXRsYWIub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "1zx3ivzid3cjr5h6070kyb9n2cjsxjg08s7h5ds18by1bahzffkr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgZmF2b3VyaXRlIGFwcGxpY2F0aW9ucyBpbiBBcHBHcmlkIiwKICAibmFtZSI6ICJGYXZvdXJpdGVzIGluIEFwcEdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvaGFyc2hhZGdhdmFsaS9mYXZvdXJpdGVzLWluLWFwcGdyaWQvIiwKICAidXVpZCI6ICJmYXZvdXJpdGVzLWluLWFwcGdyaWRAaGFyc2hhZGdhdmFsaS5naXRsYWIub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"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": "6", "sha256": "1j5pbkxqiqi6nnm1q0ygq9cw9qbrrpsykbrd9zami230wqz6adhy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBkYXJrIHdpbmRvdyBkZWNvcmF0aW9ucyBvbiBhcHBsaWNhdGlvbnMuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggYXBwbGljYXRpb25zIHRoYXQgdXNlIENsaWVudCBTaWRlIERlY29yYXRpb25zIChDU0QpLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgeDExLXV0aWxzXG4tIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIGFwcGxpY2F0aW9ucy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXJrLXZhcmlhbnQiLAogICJuYW1lIjogIkRhcmsgVmFyaWFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXJrLXZhcmlhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvZGFyay12YXJpYW50IiwKICAidXVpZCI6ICJkYXJrLXZhcmlhbnRAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "1j5pbkxqiqi6nnm1q0ygq9cw9qbrrpsykbrd9zami230wqz6adhy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBkYXJrIHdpbmRvdyBkZWNvcmF0aW9ucyBvbiBhcHBsaWNhdGlvbnMuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggYXBwbGljYXRpb25zIHRoYXQgdXNlIENsaWVudCBTaWRlIERlY29yYXRpb25zIChDU0QpLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgeDExLXV0aWxzXG4tIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIGFwcGxpY2F0aW9ucy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXJrLXZhcmlhbnQiLAogICJuYW1lIjogIkRhcmsgVmFyaWFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXJrLXZhcmlhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvZGFyay12YXJpYW50IiwKICAidXVpZCI6ICJkYXJrLXZhcmlhbnRAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "8", "sha256": "1cvfifkp1z8qazc39aq6b2yc3xwsfnpdwr66mjvgrj6j06ldbraf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBkYXJrIHdpbmRvdyBkZWNvcmF0aW9ucyBvbiBhcHBsaWNhdGlvbnMuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggYXBwbGljYXRpb25zIHRoYXQgdXNlIENsaWVudCBTaWRlIERlY29yYXRpb25zIChDU0QpLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgeDExLXV0aWxzXG4tIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIGFwcGxpY2F0aW9ucy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXJrLXZhcmlhbnQiLAogICJuYW1lIjogIkRhcmsgVmFyaWFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXJrLXZhcmlhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXJrLXZhcmlhbnQiLAogICJ1dWlkIjogImRhcmstdmFyaWFudEBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogOAp9"}, "43": {"version": "8", "sha256": "1cvfifkp1z8qazc39aq6b2yc3xwsfnpdwr66mjvgrj6j06ldbraf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBkYXJrIHdpbmRvdyBkZWNvcmF0aW9ucyBvbiBhcHBsaWNhdGlvbnMuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggYXBwbGljYXRpb25zIHRoYXQgdXNlIENsaWVudCBTaWRlIERlY29yYXRpb25zIChDU0QpLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgeDExLXV0aWxzXG4tIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIGFwcGxpY2F0aW9ucy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXJrLXZhcmlhbnQiLAogICJuYW1lIjogIkRhcmsgVmFyaWFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXJrLXZhcmlhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXJrLXZhcmlhbnQiLAogICJ1dWlkIjogImRhcmstdmFyaWFudEBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "PrivacyMenu@stuarthayhurst", "name": "Privacy Quick 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": "9", "sha256": "0hibs7nfcj750ywx0w3w1wix7axnlyjlzjd7fy37gdwvvrhwp6vl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBRdWljayBTZXR0aW5ncyBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaXZhY3ktbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9wcml2YWN5LW1lbnUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "9", "sha256": "0hibs7nfcj750ywx0w3w1wix7axnlyjlzjd7fy37gdwvvrhwp6vl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBRdWljayBTZXR0aW5ncyBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaXZhY3ktbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9wcml2YWN5LW1lbnUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "0hibs7nfcj750ywx0w3w1wix7axnlyjlzjd7fy37gdwvvrhwp6vl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBRdWljayBTZXR0aW5ncyBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaXZhY3ktbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9wcml2YWN5LW1lbnUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiA5Cn0="}, "42": {"version": "9", "sha256": "0hibs7nfcj750ywx0w3w1wix7axnlyjlzjd7fy37gdwvvrhwp6vl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBRdWljayBTZXR0aW5ncyBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaXZhY3ktbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9wcml2YWN5LW1lbnUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "0hibs7nfcj750ywx0w3w1wix7axnlyjlzjd7fy37gdwvvrhwp6vl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBRdWljayBTZXR0aW5ncyBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaXZhY3ktbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9wcml2YWN5LW1lbnUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"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="}}} @@ -600,22 +602,22 @@ , {"uuid": "autohide-volume@unboiled.info", "name": "Autohide Volume", "pname": "autohide-volume", "description": "Autohide volume indicator when muted", "link": "https://extensions.gnome.org/extension/4539/autohide-volume/", "shell_version_map": {"41": {"version": "3", "sha256": "1qmnzs0a620nd5zvaqhrbp2b4rzz85x67cfsvswj4qxj8ha38b5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZCIsCiAgIm5hbWUiOiAiQXV0b2hpZGUgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS90MTg0MjU2L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvaGlkZS12b2x1bWUiLAogICJ1dWlkIjogImF1dG9oaWRlLXZvbHVtZUB1bmJvaWxlZC5pbmZvIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "1qmnzs0a620nd5zvaqhrbp2b4rzz85x67cfsvswj4qxj8ha38b5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZCIsCiAgIm5hbWUiOiAiQXV0b2hpZGUgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS90MTg0MjU2L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvaGlkZS12b2x1bWUiLAogICJ1dWlkIjogImF1dG9oaWRlLXZvbHVtZUB1bmJvaWxlZC5pbmZvIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "1qmnzs0a620nd5zvaqhrbp2b4rzz85x67cfsvswj4qxj8ha38b5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZCIsCiAgIm5hbWUiOiAiQXV0b2hpZGUgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS90MTg0MjU2L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvaGlkZS12b2x1bWUiLAogICJ1dWlkIjogImF1dG9oaWRlLXZvbHVtZUB1bmJvaWxlZC5pbmZvIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "cloudflare@adam.gadmz", "name": "Cloudflare", "pname": "cloudflare", "description": "Warp Connect", "link": "https://extensions.gnome.org/extension/4542/cloudflare/", "shell_version_map": {"38": {"version": "10", "sha256": "0lr2g0hmaw7v4h538rg3mxmnds8nnmbs0h0k816s4dkwmx45pyb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiV2FycCBDb25uZWN0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsb3VkZmxhcmUiLAogICJuYW1lIjogIkNsb3VkZmxhcmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdW9uZ2dpYWtoYW5oYi9DbG91ZGZsYXJlX0dOT01FX0V4dGVuc2lvbiIsCiAgInV1aWQiOiAiY2xvdWRmbGFyZUBhZGFtLmdhZG16IiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "10", "sha256": "0lr2g0hmaw7v4h538rg3mxmnds8nnmbs0h0k816s4dkwmx45pyb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiV2FycCBDb25uZWN0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsb3VkZmxhcmUiLAogICJuYW1lIjogIkNsb3VkZmxhcmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdW9uZ2dpYWtoYW5oYi9DbG91ZGZsYXJlX0dOT01FX0V4dGVuc2lvbiIsCiAgInV1aWQiOiAiY2xvdWRmbGFyZUBhZGFtLmdhZG16IiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0lr2g0hmaw7v4h538rg3mxmnds8nnmbs0h0k816s4dkwmx45pyb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiV2FycCBDb25uZWN0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsb3VkZmxhcmUiLAogICJuYW1lIjogIkNsb3VkZmxhcmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdW9uZ2dpYWtoYW5oYi9DbG91ZGZsYXJlX0dOT01FX0V4dGVuc2lvbiIsCiAgInV1aWQiOiAiY2xvdWRmbGFyZUBhZGFtLmdhZG16IiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "0lr2g0hmaw7v4h538rg3mxmnds8nnmbs0h0k816s4dkwmx45pyb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiV2FycCBDb25uZWN0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsb3VkZmxhcmUiLAogICJuYW1lIjogIkNsb3VkZmxhcmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdW9uZ2dpYWtoYW5oYi9DbG91ZGZsYXJlX0dOT01FX0V4dGVuc2lvbiIsCiAgInV1aWQiOiAiY2xvdWRmbGFyZUBhZGFtLmdhZG16IiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"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": "8", "sha256": "1v0k79pvzsh57zdys41lrp9vy5n6fcq0vfnliavqizc2rhnf9xdn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSBzaGVsbCB0byBhY2Nlc3MgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBvcHRpb25zLlxuXG5DdXJyZW50bHksIG9ubHkgYmF0dGVyeSBjaGFyZ2Ugc2V0dGluZ3MgYXJlIGltcGxlbWVudGVkLlxuXG5UaGUgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSB0b29sIG11c3QgYmUgaW5zdGFsbGVkIHNlcGFyYXRlbHkgZnJvbSBEZWxsIGh0dHBzOi8vd3d3LmRlbGwuY29tL3N1cHBvcnQva2Jkb2MvZW4tdWsvMDAwMTc4MDAwL2RlbGwtY29tbWFuZC1jb25maWd1cmUjRG93bmxvYWRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgIm5hbWUiOiAiRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlbGxjb21tYW5kY29uZmlndXJlbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZzaW1rdXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgInV1aWQiOiAiZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51QHZzaW1rdXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "1v0k79pvzsh57zdys41lrp9vy5n6fcq0vfnliavqizc2rhnf9xdn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSBzaGVsbCB0byBhY2Nlc3MgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBvcHRpb25zLlxuXG5DdXJyZW50bHksIG9ubHkgYmF0dGVyeSBjaGFyZ2Ugc2V0dGluZ3MgYXJlIGltcGxlbWVudGVkLlxuXG5UaGUgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSB0b29sIG11c3QgYmUgaW5zdGFsbGVkIHNlcGFyYXRlbHkgZnJvbSBEZWxsIGh0dHBzOi8vd3d3LmRlbGwuY29tL3N1cHBvcnQva2Jkb2MvZW4tdWsvMDAwMTc4MDAwL2RlbGwtY29tbWFuZC1jb25maWd1cmUjRG93bmxvYWRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgIm5hbWUiOiAiRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlbGxjb21tYW5kY29uZmlndXJlbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZzaW1rdXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgInV1aWQiOiAiZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51QHZzaW1rdXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "42": {"version": "8", "sha256": "1v0k79pvzsh57zdys41lrp9vy5n6fcq0vfnliavqizc2rhnf9xdn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSBzaGVsbCB0byBhY2Nlc3MgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBvcHRpb25zLlxuXG5DdXJyZW50bHksIG9ubHkgYmF0dGVyeSBjaGFyZ2Ugc2V0dGluZ3MgYXJlIGltcGxlbWVudGVkLlxuXG5UaGUgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSB0b29sIG11c3QgYmUgaW5zdGFsbGVkIHNlcGFyYXRlbHkgZnJvbSBEZWxsIGh0dHBzOi8vd3d3LmRlbGwuY29tL3N1cHBvcnQva2Jkb2MvZW4tdWsvMDAwMTc4MDAwL2RlbGwtY29tbWFuZC1jb25maWd1cmUjRG93bmxvYWRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgIm5hbWUiOiAiRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlbGxjb21tYW5kY29uZmlndXJlbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZzaW1rdXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgInV1aWQiOiAiZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51QHZzaW1rdXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} -, {"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": "23", "sha256": "04g5sk23iafi63qym3mpm2vfr9x3pbwvwsabv8qs6x83z3ynj7hv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDIzCn0="}, "40": {"version": "23", "sha256": "04g5sk23iafi63qym3mpm2vfr9x3pbwvwsabv8qs6x83z3ynj7hv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDIzCn0="}, "41": {"version": "23", "sha256": "04g5sk23iafi63qym3mpm2vfr9x3pbwvwsabv8qs6x83z3ynj7hv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDIzCn0="}, "42": {"version": "23", "sha256": "04g5sk23iafi63qym3mpm2vfr9x3pbwvwsabv8qs6x83z3ynj7hv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDIzCn0="}, "43": {"version": "23", "sha256": "04g5sk23iafi63qym3mpm2vfr9x3pbwvwsabv8qs6x83z3ynj7hv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDIzCn0="}}} +, {"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": "24", "sha256": "0k4xk8vgqd4j1cp5kkk8i7qv4d4d6jmgji434ckkm3vjx64nrzwp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "40": {"version": "24", "sha256": "0k4xk8vgqd4j1cp5kkk8i7qv4d4d6jmgji434ckkm3vjx64nrzwp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "41": {"version": "24", "sha256": "0k4xk8vgqd4j1cp5kkk8i7qv4d4d6jmgji434ckkm3vjx64nrzwp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "42": {"version": "24", "sha256": "0k4xk8vgqd4j1cp5kkk8i7qv4d4d6jmgji434ckkm3vjx64nrzwp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "43": {"version": "24", "sha256": "0k4xk8vgqd4j1cp5kkk8i7qv4d4d6jmgji434ckkm3vjx64nrzwp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="}}} , {"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": "5", "sha256": "1d768xi63z8917p0m67wdy5vmv514yq6p3m84qyzk5lv084h5x0y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiRm9yY2UgcXVpdCBvciBraWxsIGFwcGxpY2F0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbGxhcHAiLAogICJuYW1lIjogIktpbGwgQXBwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHVvbmdnaWFraGFuaGIvS2lsbGFwcF9HTk9NRV9FeHRlbnNpb24iLAogICJ1dWlkIjogImtpbGxhcHBAYWRhbS5nYWRteiIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "1d768xi63z8917p0m67wdy5vmv514yq6p3m84qyzk5lv084h5x0y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiRm9yY2UgcXVpdCBvciBraWxsIGFwcGxpY2F0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbGxhcHAiLAogICJuYW1lIjogIktpbGwgQXBwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHVvbmdnaWFraGFuaGIvS2lsbGFwcF9HTk9NRV9FeHRlbnNpb24iLAogICJ1dWlkIjogImtpbGxhcHBAYWRhbS5nYWRteiIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1d768xi63z8917p0m67wdy5vmv514yq6p3m84qyzk5lv084h5x0y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiRm9yY2UgcXVpdCBvciBraWxsIGFwcGxpY2F0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbGxhcHAiLAogICJuYW1lIjogIktpbGwgQXBwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHVvbmdnaWFraGFuaGIvS2lsbGFwcF9HTk9NRV9FeHRlbnNpb24iLAogICJ1dWlkIjogImtpbGxhcHBAYWRhbS5nYWRteiIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "1d768xi63z8917p0m67wdy5vmv514yq6p3m84qyzk5lv084h5x0y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiRm9yY2UgcXVpdCBvciBraWxsIGFwcGxpY2F0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbGxhcHAiLAogICJuYW1lIjogIktpbGwgQXBwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHVvbmdnaWFraGFuaGIvS2lsbGFwcF9HTk9NRV9FeHRlbnNpb24iLAogICJ1dWlkIjogImtpbGxhcHBAYWRhbS5nYWRteiIsCiAgInZlcnNpb24iOiA1Cn0="}}} -, {"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": "5", "sha256": "1nygr81qcg62imd28cb360l1n49b2q64c3az9w6n46zx04bk1y0b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcC11cCBjaGVhdHNoZWV0IHdpdGggY3VycmVudGx5IGNvbmZpZ3VyZWQga2V5Ym9hcmQgc2hvcnRjdXRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhvdGtleXMtcG9wdXAiLAogICJuYW1lIjogIkhvdGtleXMgUG9wdXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG90a2V5cy1wb3B1cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL21pcG1pcC5naXRodWIuaW8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1ob3RrZXlzLXBvcHVwLyIsCiAgInV1aWQiOiAiaG90a2V5cy1wb3B1cEBwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1nygr81qcg62imd28cb360l1n49b2q64c3az9w6n46zx04bk1y0b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcC11cCBjaGVhdHNoZWV0IHdpdGggY3VycmVudGx5IGNvbmZpZ3VyZWQga2V5Ym9hcmQgc2hvcnRjdXRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhvdGtleXMtcG9wdXAiLAogICJuYW1lIjogIkhvdGtleXMgUG9wdXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG90a2V5cy1wb3B1cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL21pcG1pcC5naXRodWIuaW8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1ob3RrZXlzLXBvcHVwLyIsCiAgInV1aWQiOiAiaG90a2V5cy1wb3B1cEBwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} +, {"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": "9", "sha256": "0phywsc05w93nlm0lmmzizf0ci7a8h8hrarnvnl853fx8b11vfy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcC11cCBjaGVhdHNoZWV0IHdpdGggY3VycmVudGx5IGNvbmZpZ3VyZWQga2V5Ym9hcmQgc2hvcnRjdXRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhvdGtleXMtcG9wdXAiLAogICJuYW1lIjogIkhvdGtleXMgUG9wdXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG90a2V5cy1wb3B1cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhvdGtleXMtcG9wdXBAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "0phywsc05w93nlm0lmmzizf0ci7a8h8hrarnvnl853fx8b11vfy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcC11cCBjaGVhdHNoZWV0IHdpdGggY3VycmVudGx5IGNvbmZpZ3VyZWQga2V5Ym9hcmQgc2hvcnRjdXRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhvdGtleXMtcG9wdXAiLAogICJuYW1lIjogIkhvdGtleXMgUG9wdXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG90a2V5cy1wb3B1cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhvdGtleXMtcG9wdXBAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "0phywsc05w93nlm0lmmzizf0ci7a8h8hrarnvnl853fx8b11vfy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcC11cCBjaGVhdHNoZWV0IHdpdGggY3VycmVudGx5IGNvbmZpZ3VyZWQga2V5Ym9hcmQgc2hvcnRjdXRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhvdGtleXMtcG9wdXAiLAogICJuYW1lIjogIkhvdGtleXMgUG9wdXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG90a2V5cy1wb3B1cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhvdGtleXMtcG9wdXBAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "43": {"version": "9", "sha256": "0phywsc05w93nlm0lmmzizf0ci7a8h8hrarnvnl853fx8b11vfy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcC11cCBjaGVhdHNoZWV0IHdpdGggY3VycmVudGx5IGNvbmZpZ3VyZWQga2V5Ym9hcmQgc2hvcnRjdXRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhvdGtleXMtcG9wdXAiLAogICJuYW1lIjogIkhvdGtleXMgUG9wdXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG90a2V5cy1wb3B1cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhvdGtleXMtcG9wdXBAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"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="}}} , {"uuid": "quick-lang-switch@ankostis.gmail.com", "name": "Quick Lang Switch", "pname": "quick-lang-switch", "description": "Quickly switch keyboard language layout without showing the switcher popup.\n\nThe language switcher popup by default takes ~0.7sec to appear, meaning that roughly 2-4 strokes are lost till the switch completes. This affects heavily users typing languages with non-latin based alphabets (e.g. Greek, Cyrilic, Arabic, Japanese), particularly when writting technical documents.\nThis extension reduces the switching time to 1/10th of a second (on a 2019 PC).", "link": "https://extensions.gnome.org/extension/4559/quick-lang-switch/", "shell_version_map": {"38": {"version": "6", "sha256": "0shl17zj6qlpsfxahyn8vipkdfbj9bbidcx4p94argysjjsvx5jn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc3dpdGNoIGtleWJvYXJkIGxhbmd1YWdlIGxheW91dCB3aXRob3V0IHNob3dpbmcgdGhlIHN3aXRjaGVyIHBvcHVwLlxuXG5UaGUgbGFuZ3VhZ2Ugc3dpdGNoZXIgcG9wdXAgYnkgZGVmYXVsdCB0YWtlcyB+MC43c2VjIHRvIGFwcGVhciwgbWVhbmluZyB0aGF0IHJvdWdobHkgMi00IHN0cm9rZXMgYXJlIGxvc3QgdGlsbCB0aGUgc3dpdGNoIGNvbXBsZXRlcy4gVGhpcyBhZmZlY3RzIGhlYXZpbHkgdXNlcnMgdHlwaW5nIGxhbmd1YWdlcyB3aXRoIG5vbi1sYXRpbiBiYXNlZCBhbHBoYWJldHMgKGUuZy4gR3JlZWssIEN5cmlsaWMsIEFyYWJpYywgSmFwYW5lc2UpLCBwYXJ0aWN1bGFybHkgd2hlbiB3cml0dGluZyB0ZWNobmljYWwgZG9jdW1lbnRzLlxuVGhpcyBleHRlbnNpb24gcmVkdWNlcyB0aGUgc3dpdGNoaW5nIHRpbWUgdG8gMS8xMHRoIG9mIGEgc2Vjb25kIChvbiBhIDIwMTkgUEMpLiIsCiAgIm5hbWUiOiAiUXVpY2sgTGFuZyBTd2l0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5rb3N0aXMvZ25vbWUtc2hlbGwtcXVpY2stbGFuZy1zd2l0Y2giLAogICJ1dWlkIjogInF1aWNrLWxhbmctc3dpdGNoQGFua29zdGlzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "0shl17zj6qlpsfxahyn8vipkdfbj9bbidcx4p94argysjjsvx5jn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc3dpdGNoIGtleWJvYXJkIGxhbmd1YWdlIGxheW91dCB3aXRob3V0IHNob3dpbmcgdGhlIHN3aXRjaGVyIHBvcHVwLlxuXG5UaGUgbGFuZ3VhZ2Ugc3dpdGNoZXIgcG9wdXAgYnkgZGVmYXVsdCB0YWtlcyB+MC43c2VjIHRvIGFwcGVhciwgbWVhbmluZyB0aGF0IHJvdWdobHkgMi00IHN0cm9rZXMgYXJlIGxvc3QgdGlsbCB0aGUgc3dpdGNoIGNvbXBsZXRlcy4gVGhpcyBhZmZlY3RzIGhlYXZpbHkgdXNlcnMgdHlwaW5nIGxhbmd1YWdlcyB3aXRoIG5vbi1sYXRpbiBiYXNlZCBhbHBoYWJldHMgKGUuZy4gR3JlZWssIEN5cmlsaWMsIEFyYWJpYywgSmFwYW5lc2UpLCBwYXJ0aWN1bGFybHkgd2hlbiB3cml0dGluZyB0ZWNobmljYWwgZG9jdW1lbnRzLlxuVGhpcyBleHRlbnNpb24gcmVkdWNlcyB0aGUgc3dpdGNoaW5nIHRpbWUgdG8gMS8xMHRoIG9mIGEgc2Vjb25kIChvbiBhIDIwMTkgUEMpLiIsCiAgIm5hbWUiOiAiUXVpY2sgTGFuZyBTd2l0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5rb3N0aXMvZ25vbWUtc2hlbGwtcXVpY2stbGFuZy1zd2l0Y2giLAogICJ1dWlkIjogInF1aWNrLWxhbmctc3dpdGNoQGFua29zdGlzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "0shl17zj6qlpsfxahyn8vipkdfbj9bbidcx4p94argysjjsvx5jn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc3dpdGNoIGtleWJvYXJkIGxhbmd1YWdlIGxheW91dCB3aXRob3V0IHNob3dpbmcgdGhlIHN3aXRjaGVyIHBvcHVwLlxuXG5UaGUgbGFuZ3VhZ2Ugc3dpdGNoZXIgcG9wdXAgYnkgZGVmYXVsdCB0YWtlcyB+MC43c2VjIHRvIGFwcGVhciwgbWVhbmluZyB0aGF0IHJvdWdobHkgMi00IHN0cm9rZXMgYXJlIGxvc3QgdGlsbCB0aGUgc3dpdGNoIGNvbXBsZXRlcy4gVGhpcyBhZmZlY3RzIGhlYXZpbHkgdXNlcnMgdHlwaW5nIGxhbmd1YWdlcyB3aXRoIG5vbi1sYXRpbiBiYXNlZCBhbHBoYWJldHMgKGUuZy4gR3JlZWssIEN5cmlsaWMsIEFyYWJpYywgSmFwYW5lc2UpLCBwYXJ0aWN1bGFybHkgd2hlbiB3cml0dGluZyB0ZWNobmljYWwgZG9jdW1lbnRzLlxuVGhpcyBleHRlbnNpb24gcmVkdWNlcyB0aGUgc3dpdGNoaW5nIHRpbWUgdG8gMS8xMHRoIG9mIGEgc2Vjb25kIChvbiBhIDIwMTkgUEMpLiIsCiAgIm5hbWUiOiAiUXVpY2sgTGFuZyBTd2l0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5rb3N0aXMvZ25vbWUtc2hlbGwtcXVpY2stbGFuZy1zd2l0Y2giLAogICJ1dWlkIjogInF1aWNrLWxhbmctc3dpdGNoQGFua29zdGlzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "0shl17zj6qlpsfxahyn8vipkdfbj9bbidcx4p94argysjjsvx5jn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc3dpdGNoIGtleWJvYXJkIGxhbmd1YWdlIGxheW91dCB3aXRob3V0IHNob3dpbmcgdGhlIHN3aXRjaGVyIHBvcHVwLlxuXG5UaGUgbGFuZ3VhZ2Ugc3dpdGNoZXIgcG9wdXAgYnkgZGVmYXVsdCB0YWtlcyB+MC43c2VjIHRvIGFwcGVhciwgbWVhbmluZyB0aGF0IHJvdWdobHkgMi00IHN0cm9rZXMgYXJlIGxvc3QgdGlsbCB0aGUgc3dpdGNoIGNvbXBsZXRlcy4gVGhpcyBhZmZlY3RzIGhlYXZpbHkgdXNlcnMgdHlwaW5nIGxhbmd1YWdlcyB3aXRoIG5vbi1sYXRpbiBiYXNlZCBhbHBoYWJldHMgKGUuZy4gR3JlZWssIEN5cmlsaWMsIEFyYWJpYywgSmFwYW5lc2UpLCBwYXJ0aWN1bGFybHkgd2hlbiB3cml0dGluZyB0ZWNobmljYWwgZG9jdW1lbnRzLlxuVGhpcyBleHRlbnNpb24gcmVkdWNlcyB0aGUgc3dpdGNoaW5nIHRpbWUgdG8gMS8xMHRoIG9mIGEgc2Vjb25kIChvbiBhIDIwMTkgUEMpLiIsCiAgIm5hbWUiOiAiUXVpY2sgTGFuZyBTd2l0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5rb3N0aXMvZ25vbWUtc2hlbGwtcXVpY2stbGFuZy1zd2l0Y2giLAogICJ1dWlkIjogInF1aWNrLWxhbmctc3dpdGNoQGFua29zdGlzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "0shl17zj6qlpsfxahyn8vipkdfbj9bbidcx4p94argysjjsvx5jn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc3dpdGNoIGtleWJvYXJkIGxhbmd1YWdlIGxheW91dCB3aXRob3V0IHNob3dpbmcgdGhlIHN3aXRjaGVyIHBvcHVwLlxuXG5UaGUgbGFuZ3VhZ2Ugc3dpdGNoZXIgcG9wdXAgYnkgZGVmYXVsdCB0YWtlcyB+MC43c2VjIHRvIGFwcGVhciwgbWVhbmluZyB0aGF0IHJvdWdobHkgMi00IHN0cm9rZXMgYXJlIGxvc3QgdGlsbCB0aGUgc3dpdGNoIGNvbXBsZXRlcy4gVGhpcyBhZmZlY3RzIGhlYXZpbHkgdXNlcnMgdHlwaW5nIGxhbmd1YWdlcyB3aXRoIG5vbi1sYXRpbiBiYXNlZCBhbHBoYWJldHMgKGUuZy4gR3JlZWssIEN5cmlsaWMsIEFyYWJpYywgSmFwYW5lc2UpLCBwYXJ0aWN1bGFybHkgd2hlbiB3cml0dGluZyB0ZWNobmljYWwgZG9jdW1lbnRzLlxuVGhpcyBleHRlbnNpb24gcmVkdWNlcyB0aGUgc3dpdGNoaW5nIHRpbWUgdG8gMS8xMHRoIG9mIGEgc2Vjb25kIChvbiBhIDIwMTkgUEMpLiIsCiAgIm5hbWUiOiAiUXVpY2sgTGFuZyBTd2l0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5rb3N0aXMvZ25vbWUtc2hlbGwtcXVpY2stbGFuZy1zd2l0Y2giLAogICJ1dWlkIjogInF1aWNrLWxhbmctc3dpdGNoQGFua29zdGlzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "ssh-connect-menu@edavidf", "name": "SSH Connect Menu", "pname": "ssh-connect-menu", "description": "This extension puts an icon in the panel with a simple dropdown menu that launches items from your ~.ssh/config. \n\nThis is a fork of original by Josh Martens (https://extensions.gnome.org/extension/3237/ssh-quick-connect/) for Gnome 40 compatible changes that Josh made but did not upload here for quick/easy install/remove. Besides this description, uuid, name, and version number, no changes were made.", "link": "https://extensions.gnome.org/extension/4564/ssh-connect-menu/", "shell_version_map": {"40": {"version": "1", "sha256": "1s85qm4gzsywr5wagvkwag2344iandh57gc7cj00wlx34y642kpr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgd2l0aCBhIHNpbXBsZSBkcm9wZG93biBtZW51IHRoYXQgbGF1bmNoZXMgaXRlbXMgZnJvbSB5b3VyIH4uc3NoL2NvbmZpZy4gXG5cblRoaXMgaXMgYSBmb3JrIG9mIG9yaWdpbmFsIGJ5IEpvc2ggTWFydGVucyAoaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzIzNy9zc2gtcXVpY2stY29ubmVjdC8pIGZvciBHbm9tZSA0MCBjb21wYXRpYmxlIGNoYW5nZXMgdGhhdCBKb3NoIG1hZGUgYnV0IGRpZCBub3QgdXBsb2FkIGhlcmUgZm9yIHF1aWNrL2Vhc3kgaW5zdGFsbC9yZW1vdmUuIEJlc2lkZXMgdGhpcyBkZXNjcmlwdGlvbiwgdXVpZCwgbmFtZSwgYW5kIHZlcnNpb24gbnVtYmVyLCBubyBjaGFuZ2VzIHdlcmUgbWFkZS4iLAogICJuYW1lIjogIlNTSCBDb25uZWN0IE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5naXRodWIuY29tL0VEYXZpZEYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNzaC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJzc2gtY29ubmVjdC1tZW51QGVkYXZpZGYiLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"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": {"38": {"version": "2", "sha256": "1x9pgj7679sdmgqnnwq48mzvpmdxdhz18jp7v3nvvifpcw1mw4ak", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3RhdHVzIG9mIFpGUyBmaWxlc3lzdGVtIHBvb2xzIGN1cnJlbnRseSBwcmVzZW50IG9uIHRoZSBzeXN0ZW0sIHVwZGF0aW5nIGV2ZXJ5IDYwIHNlY29uZHMuIiwKICAibmFtZSI6ICJaRlMgU3RhdHVzIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9odWJpY2svZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXpmcy1zdGF0dXMtbW9uaXRvciIsCiAgInV1aWQiOiAiemZzLXN0YXR1cy1tb25pdG9yQGNocmlzLmh1Ymljay5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "1x9pgj7679sdmgqnnwq48mzvpmdxdhz18jp7v3nvvifpcw1mw4ak", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3RhdHVzIG9mIFpGUyBmaWxlc3lzdGVtIHBvb2xzIGN1cnJlbnRseSBwcmVzZW50IG9uIHRoZSBzeXN0ZW0sIHVwZGF0aW5nIGV2ZXJ5IDYwIHNlY29uZHMuIiwKICAibmFtZSI6ICJaRlMgU3RhdHVzIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9odWJpY2svZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXpmcy1zdGF0dXMtbW9uaXRvciIsCiAgInV1aWQiOiAiemZzLXN0YXR1cy1tb25pdG9yQGNocmlzLmh1Ymljay5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1x9pgj7679sdmgqnnwq48mzvpmdxdhz18jp7v3nvvifpcw1mw4ak", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3RhdHVzIG9mIFpGUyBmaWxlc3lzdGVtIHBvb2xzIGN1cnJlbnRseSBwcmVzZW50IG9uIHRoZSBzeXN0ZW0sIHVwZGF0aW5nIGV2ZXJ5IDYwIHNlY29uZHMuIiwKICAibmFtZSI6ICJaRlMgU3RhdHVzIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9odWJpY2svZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXpmcy1zdGF0dXMtbW9uaXRvciIsCiAgInV1aWQiOiAiemZzLXN0YXR1cy1tb25pdG9yQGNocmlzLmh1Ymljay5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "1x9pgj7679sdmgqnnwq48mzvpmdxdhz18jp7v3nvvifpcw1mw4ak", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3RhdHVzIG9mIFpGUyBmaWxlc3lzdGVtIHBvb2xzIGN1cnJlbnRseSBwcmVzZW50IG9uIHRoZSBzeXN0ZW0sIHVwZGF0aW5nIGV2ZXJ5IDYwIHNlY29uZHMuIiwKICAibmFtZSI6ICJaRlMgU3RhdHVzIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9odWJpY2svZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXpmcy1zdGF0dXMtbW9uaXRvciIsCiAgInV1aWQiOiAiemZzLXN0YXR1cy1tb25pdG9yQGNocmlzLmh1Ymljay5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"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": "8", "sha256": "16x9m7srrb9dj7mx3n488prni2107ycpmm9pndx7s7svwmg584ns", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdOT01FIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4iLAogICJuYW1lIjogIkFjdGl2YXRlIEdOT01FIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFjdGl2YXRlX2dub21lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lzamVycnl4aWFvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hY3RpdmF0ZS1nbm9tZSIsCiAgInV1aWQiOiAiYWN0aXZhdGVfZ25vbWVAaXNqZXJyeXhpYW8iLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "16x9m7srrb9dj7mx3n488prni2107ycpmm9pndx7s7svwmg584ns", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdOT01FIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4iLAogICJuYW1lIjogIkFjdGl2YXRlIEdOT01FIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFjdGl2YXRlX2dub21lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lzamVycnl4aWFvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hY3RpdmF0ZS1nbm9tZSIsCiAgInV1aWQiOiAiYWN0aXZhdGVfZ25vbWVAaXNqZXJyeXhpYW8iLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "16x9m7srrb9dj7mx3n488prni2107ycpmm9pndx7s7svwmg584ns", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdOT01FIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4iLAogICJuYW1lIjogIkFjdGl2YXRlIEdOT01FIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFjdGl2YXRlX2dub21lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lzamVycnl4aWFvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hY3RpdmF0ZS1nbm9tZSIsCiAgInV1aWQiOiAiYWN0aXZhdGVfZ25vbWVAaXNqZXJyeXhpYW8iLAogICJ2ZXJzaW9uIjogOAp9"}, "43": {"version": "8", "sha256": "16x9m7srrb9dj7mx3n488prni2107ycpmm9pndx7s7svwmg584ns", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdOT01FIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4iLAogICJuYW1lIjogIkFjdGl2YXRlIEdOT01FIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFjdGl2YXRlX2dub21lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lzamVycnl4aWFvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hY3RpdmF0ZS1nbm9tZSIsCiAgInV1aWQiOiAiYWN0aXZhdGVfZ25vbWVAaXNqZXJyeXhpYW8iLAogICJ2ZXJzaW9uIjogOAp9"}}} -, {"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.", "link": "https://extensions.gnome.org/extension/4580/huawei-wmi-controls/", "shell_version_map": {"40": {"version": "9", "sha256": "0vdl61ccfzjq456difraxc8pxnrgl15fzgb9bhfpwydk981k5q8j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgYW5kIEhvbm9yIGxhcHRvcHMgV01JIGZ1bmN0aW9ucywgc3VjaCBhcyBiYXR0ZXJ5IHByb3RlY3Rpb24sIEZuLWxvY2ssIHBvd2VyIHVubG9jayBhbmQga2V5Ym9hcmQgYmFja2xpZ2h0LiIsCiAgIm5hbWUiOiAiSHVhd2VpIFdNSSBjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9hcHBzLnNkb3JlLm1lL2dub21lLWV4dGVuc2lvbi1odWF3ZWktd21pIiwKICAidXVpZCI6ICJodWF3ZWktd21pQGFwcHMuc2RvcmUubWUiLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "0vdl61ccfzjq456difraxc8pxnrgl15fzgb9bhfpwydk981k5q8j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgYW5kIEhvbm9yIGxhcHRvcHMgV01JIGZ1bmN0aW9ucywgc3VjaCBhcyBiYXR0ZXJ5IHByb3RlY3Rpb24sIEZuLWxvY2ssIHBvd2VyIHVubG9jayBhbmQga2V5Ym9hcmQgYmFja2xpZ2h0LiIsCiAgIm5hbWUiOiAiSHVhd2VpIFdNSSBjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9hcHBzLnNkb3JlLm1lL2dub21lLWV4dGVuc2lvbi1odWF3ZWktd21pIiwKICAidXVpZCI6ICJodWF3ZWktd21pQGFwcHMuc2RvcmUubWUiLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "0vdl61ccfzjq456difraxc8pxnrgl15fzgb9bhfpwydk981k5q8j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgYW5kIEhvbm9yIGxhcHRvcHMgV01JIGZ1bmN0aW9ucywgc3VjaCBhcyBiYXR0ZXJ5IHByb3RlY3Rpb24sIEZuLWxvY2ssIHBvd2VyIHVubG9jayBhbmQga2V5Ym9hcmQgYmFja2xpZ2h0LiIsCiAgIm5hbWUiOiAiSHVhd2VpIFdNSSBjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9hcHBzLnNkb3JlLm1lL2dub21lLWV4dGVuc2lvbi1odWF3ZWktd21pIiwKICAidXVpZCI6ICJodWF3ZWktd21pQGFwcHMuc2RvcmUubWUiLAogICJ2ZXJzaW9uIjogOQp9"}}} +, {"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.", "link": "https://extensions.gnome.org/extension/4580/huawei-wmi-controls/", "shell_version_map": {"40": {"version": "10", "sha256": "07h8vq0m18c7s91g3jc26ka159c827a17s1ypzddr38kcbijmw4d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgYW5kIEhvbm9yIGxhcHRvcHMgV01JIGZ1bmN0aW9ucywgc3VjaCBhcyBiYXR0ZXJ5IHByb3RlY3Rpb24sIEZuLWxvY2ssIHBvd2VyIHVubG9jayBhbmQga2V5Ym9hcmQgYmFja2xpZ2h0LiIsCiAgIm5hbWUiOiAiSHVhd2VpIFdNSSBjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vYXBwcy5zZG9yZS5tZS9nbm9tZS1leHRlbnNpb24taHVhd2VpLXdtaSIsCiAgInV1aWQiOiAiaHVhd2VpLXdtaUBhcHBzLnNkb3JlLm1lIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "07h8vq0m18c7s91g3jc26ka159c827a17s1ypzddr38kcbijmw4d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgYW5kIEhvbm9yIGxhcHRvcHMgV01JIGZ1bmN0aW9ucywgc3VjaCBhcyBiYXR0ZXJ5IHByb3RlY3Rpb24sIEZuLWxvY2ssIHBvd2VyIHVubG9jayBhbmQga2V5Ym9hcmQgYmFja2xpZ2h0LiIsCiAgIm5hbWUiOiAiSHVhd2VpIFdNSSBjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vYXBwcy5zZG9yZS5tZS9nbm9tZS1leHRlbnNpb24taHVhd2VpLXdtaSIsCiAgInV1aWQiOiAiaHVhd2VpLXdtaUBhcHBzLnNkb3JlLm1lIiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "07h8vq0m18c7s91g3jc26ka159c827a17s1ypzddr38kcbijmw4d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgYW5kIEhvbm9yIGxhcHRvcHMgV01JIGZ1bmN0aW9ucywgc3VjaCBhcyBiYXR0ZXJ5IHByb3RlY3Rpb24sIEZuLWxvY2ssIHBvd2VyIHVubG9jayBhbmQga2V5Ym9hcmQgYmFja2xpZ2h0LiIsCiAgIm5hbWUiOiAiSHVhd2VpIFdNSSBjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vYXBwcy5zZG9yZS5tZS9nbm9tZS1leHRlbnNpb24taHVhd2VpLXdtaSIsCiAgInV1aWQiOiAiaHVhd2VpLXdtaUBhcHBzLnNkb3JlLm1lIiwKICAidmVyc2lvbiI6IDEwCn0="}, "43": {"version": "10", "sha256": "07h8vq0m18c7s91g3jc26ka159c827a17s1ypzddr38kcbijmw4d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgYW5kIEhvbm9yIGxhcHRvcHMgV01JIGZ1bmN0aW9ucywgc3VjaCBhcyBiYXR0ZXJ5IHByb3RlY3Rpb24sIEZuLWxvY2ssIHBvd2VyIHVubG9jayBhbmQga2V5Ym9hcmQgYmFja2xpZ2h0LiIsCiAgIm5hbWUiOiAiSHVhd2VpIFdNSSBjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vYXBwcy5zZG9yZS5tZS9nbm9tZS1leHRlbnNpb24taHVhd2VpLXdtaSIsCiAgInV1aWQiOiAiaHVhd2VpLXdtaUBhcHBzLnNkb3JlLm1lIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"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": "5", "sha256": "1g9jsfwxxz2as2nwkqdzr0km24ykkzhdfmya9mqxvr68fsanw27n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJVc2VybmFtZSBhbmQgSG9zdG5hbWUgdG8gcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9pdC11bmQtZW50d2lja2x1bmctZmcvVXNlcm5hbWUtYW5kLUhvc3RuYW1lLyIsCiAgInV1aWQiOiAidXNlcm5hbWUtaG90bmFtZUBpdC11bmQtZW50d2lja2x1bmctZmcuZGUiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "1g9jsfwxxz2as2nwkqdzr0km24ykkzhdfmya9mqxvr68fsanw27n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJVc2VybmFtZSBhbmQgSG9zdG5hbWUgdG8gcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9pdC11bmQtZW50d2lja2x1bmctZmcvVXNlcm5hbWUtYW5kLUhvc3RuYW1lLyIsCiAgInV1aWQiOiAidXNlcm5hbWUtaG90bmFtZUBpdC11bmQtZW50d2lja2x1bmctZmcuZGUiLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "1g9jsfwxxz2as2nwkqdzr0km24ykkzhdfmya9mqxvr68fsanw27n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJVc2VybmFtZSBhbmQgSG9zdG5hbWUgdG8gcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9pdC11bmQtZW50d2lja2x1bmctZmcvVXNlcm5hbWUtYW5kLUhvc3RuYW1lLyIsCiAgInV1aWQiOiAidXNlcm5hbWUtaG90bmFtZUBpdC11bmQtZW50d2lja2x1bmctZmcuZGUiLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "5", "sha256": "1g9jsfwxxz2as2nwkqdzr0km24ykkzhdfmya9mqxvr68fsanw27n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJVc2VybmFtZSBhbmQgSG9zdG5hbWUgdG8gcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9pdC11bmQtZW50d2lja2x1bmctZmcvVXNlcm5hbWUtYW5kLUhvc3RuYW1lLyIsCiAgInV1aWQiOiAidXNlcm5hbWUtaG90bmFtZUBpdC11bmQtZW50d2lja2x1bmctZmcuZGUiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "InternetSpeedMonitor@Rishu", "name": "Internet Speed Monitor", "pname": "internet-speed-monitor", "description": "Extension to Monitor Internet Speed and Daily Data Usage minimally.\n It is a fork of InternetSpeedMeter", "link": "https://extensions.gnome.org/extension/4585/internet-speed-monitor/", "shell_version_map": {"38": {"version": "6", "sha256": "1addh1pdb49zijqsjv10xrqs7rp6k8x26h91vkry6pvzdc9arqln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBNb25pdG9yIEludGVybmV0IFNwZWVkIGFuZCBEYWlseSBEYXRhIFVzYWdlIG1pbmltYWxseS5cbiBJdCBpcyBhIGZvcmsgb2YgSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9JbnRlcm5ldFNwZWVkTW9uaXRvciIsCiAgInV1aWQiOiAiSW50ZXJuZXRTcGVlZE1vbml0b3JAUmlzaHUiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "1addh1pdb49zijqsjv10xrqs7rp6k8x26h91vkry6pvzdc9arqln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBNb25pdG9yIEludGVybmV0IFNwZWVkIGFuZCBEYWlseSBEYXRhIFVzYWdlIG1pbmltYWxseS5cbiBJdCBpcyBhIGZvcmsgb2YgSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9JbnRlcm5ldFNwZWVkTW9uaXRvciIsCiAgInV1aWQiOiAiSW50ZXJuZXRTcGVlZE1vbml0b3JAUmlzaHUiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "1addh1pdb49zijqsjv10xrqs7rp6k8x26h91vkry6pvzdc9arqln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBNb25pdG9yIEludGVybmV0IFNwZWVkIGFuZCBEYWlseSBEYXRhIFVzYWdlIG1pbmltYWxseS5cbiBJdCBpcyBhIGZvcmsgb2YgSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9JbnRlcm5ldFNwZWVkTW9uaXRvciIsCiAgInV1aWQiOiAiSW50ZXJuZXRTcGVlZE1vbml0b3JAUmlzaHUiLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "7", "sha256": "12szbvm51zq13z9mqfvwsrwbjhqf59f9cwnmpa204c7yxnfcxqp1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBNb25pdG9yIEludGVybmV0IFNwZWVkIGFuZCBEYWlseSBEYXRhIFVzYWdlIG1pbmltYWxseS5cbiBJdCBpcyBhIGZvcmsgb2YgSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yaXNodWluZmluaXR5L0ludGVybmV0U3BlZWRNb25pdG9yIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTW9uaXRvckBSaXNodSIsCiAgInZlcnNpb24iOiA3Cn0="}, "43": {"version": "7", "sha256": "12szbvm51zq13z9mqfvwsrwbjhqf59f9cwnmpa204c7yxnfcxqp1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBNb25pdG9yIEludGVybmV0IFNwZWVkIGFuZCBEYWlseSBEYXRhIFVzYWdlIG1pbmltYWxseS5cbiBJdCBpcyBhIGZvcmsgb2YgSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yaXNodWluZmluaXR5L0ludGVybmV0U3BlZWRNb25pdG9yIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTW9uaXRvckBSaXNodSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"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": "9", "sha256": "16lv8hysyc0yla5w6i5l94nc9h425bgf9z3cj9xqfsfzc0icalga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "16lv8hysyc0yla5w6i5l94nc9h425bgf9z3cj9xqfsfzc0icalga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "16lv8hysyc0yla5w6i5l94nc9h425bgf9z3cj9xqfsfzc0icalga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "16lv8hysyc0yla5w6i5l94nc9h425bgf9z3cj9xqfsfzc0icalga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "43": {"version": "9", "sha256": "16lv8hysyc0yla5w6i5l94nc9h425bgf9z3cj9xqfsfzc0icalga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"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: \n - Use a shortcut to move the in-focus window to a *new* workspace on the right/left of your current workspace\n\nNew-empty-workspace Shortcut:\n - Use a shortcut to create an *empty* workspace\n\nReorder-workspace Shortcut:\n - Use a shortcut to move an entire workspace left or right of the current workspace", "link": "https://extensions.gnome.org/extension/4597/new-workspace-shortcut/", "shell_version_map": {"41": {"version": "9", "sha256": "0lhfwz45qb6dhfwg6f1hlhixibypzx9w6q1x8xh5pv04y2zb6h2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6IFxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhICpuZXcqIHdvcmtzcGFjZSBvbiB0aGUgcmlnaHQvbGVmdCBvZiB5b3VyIGN1cnJlbnQgd29ya3NwYWNlXG5cbk5ldy1lbXB0eS13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gIC0gVXNlIGEgc2hvcnRjdXQgdG8gY3JlYXRlIGFuICplbXB0eSogd29ya3NwYWNlXG5cblJlb3JkZXItd29ya3NwYWNlIFNob3J0Y3V0OlxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZSIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "42": {"version": "9", "sha256": "0lhfwz45qb6dhfwg6f1hlhixibypzx9w6q1x8xh5pv04y2zb6h2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6IFxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhICpuZXcqIHdvcmtzcGFjZSBvbiB0aGUgcmlnaHQvbGVmdCBvZiB5b3VyIGN1cnJlbnQgd29ya3NwYWNlXG5cbk5ldy1lbXB0eS13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gIC0gVXNlIGEgc2hvcnRjdXQgdG8gY3JlYXRlIGFuICplbXB0eSogd29ya3NwYWNlXG5cblJlb3JkZXItd29ya3NwYWNlIFNob3J0Y3V0OlxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZSIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "0lhfwz45qb6dhfwg6f1hlhixibypzx9w6q1x8xh5pv04y2zb6h2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6IFxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhICpuZXcqIHdvcmtzcGFjZSBvbiB0aGUgcmlnaHQvbGVmdCBvZiB5b3VyIGN1cnJlbnQgd29ya3NwYWNlXG5cbk5ldy1lbXB0eS13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gIC0gVXNlIGEgc2hvcnRjdXQgdG8gY3JlYXRlIGFuICplbXB0eSogd29ya3NwYWNlXG5cblJlb3JkZXItd29ya3NwYWNlIFNob3J0Y3V0OlxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZSIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"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": "9", "sha256": "14p3wrx43a9lgq7g7bdmkj4i9jb6kpc1x8kl9q6197xdgyzpvll3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94S2lwcGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNhbmUtYWlycGxhbmUtbW9kZSIsCiAgInV1aWQiOiAic2FuZS1haXJwbGFuZS1tb2RlQGtpcHBpIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "14p3wrx43a9lgq7g7bdmkj4i9jb6kpc1x8kl9q6197xdgyzpvll3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94S2lwcGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNhbmUtYWlycGxhbmUtbW9kZSIsCiAgInV1aWQiOiAic2FuZS1haXJwbGFuZS1tb2RlQGtpcHBpIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "14p3wrx43a9lgq7g7bdmkj4i9jb6kpc1x8kl9q6197xdgyzpvll3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94S2lwcGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNhbmUtYWlycGxhbmUtbW9kZSIsCiAgInV1aWQiOiAic2FuZS1haXJwbGFuZS1tb2RlQGtpcHBpIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "14p3wrx43a9lgq7g7bdmkj4i9jb6kpc1x8kl9q6197xdgyzpvll3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94S2lwcGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNhbmUtYWlycGxhbmUtbW9kZSIsCiAgInV1aWQiOiAic2FuZS1haXJwbGFuZS1tb2RlQGtpcHBpIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} +, {"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": {"38": {"version": "11", "sha256": "1dwq3ynivdaw6x678iyss5nkvbhzzscgxknibxk4gh5gay8rvsxk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94S2lwcGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNhbmUtYWlycGxhbmUtbW9kZSIsCiAgInV1aWQiOiAic2FuZS1haXJwbGFuZS1tb2RlQGtpcHBpIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "1dwq3ynivdaw6x678iyss5nkvbhzzscgxknibxk4gh5gay8rvsxk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94S2lwcGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNhbmUtYWlycGxhbmUtbW9kZSIsCiAgInV1aWQiOiAic2FuZS1haXJwbGFuZS1tb2RlQGtpcHBpIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "1dwq3ynivdaw6x678iyss5nkvbhzzscgxknibxk4gh5gay8rvsxk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94S2lwcGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNhbmUtYWlycGxhbmUtbW9kZSIsCiAgInV1aWQiOiAic2FuZS1haXJwbGFuZS1tb2RlQGtpcHBpIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "1dwq3ynivdaw6x678iyss5nkvbhzzscgxknibxk4gh5gay8rvsxk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94S2lwcGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNhbmUtYWlycGxhbmUtbW9kZSIsCiAgInV1aWQiOiAic2FuZS1haXJwbGFuZS1tb2RlQGtpcHBpIiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "11", "sha256": "1dwq3ynivdaw6x678iyss5nkvbhzzscgxknibxk4gh5gay8rvsxk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94S2lwcGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNhbmUtYWlycGxhbmUtbW9kZSIsCiAgInV1aWQiOiAic2FuZS1haXJwbGFuZS1tb2RlQGtpcHBpIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"uuid": "undecorate@tabdeveloper.com", "name": "Undecorate Window for Wayland", "pname": "undecorate-window-for-wayland", "description": "Adds undecorate option to window menu to toggle window decoration.", "link": "https://extensions.gnome.org/extension/4606/undecorate-window-for-wayland/", "shell_version_map": {"40": {"version": "3", "sha256": "1ikbxwqdc204w6vjn1slbrmqvxmkcbyzgqg35jacv8r1z66n6nwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdW5kZWNvcmF0ZSBvcHRpb24gdG8gd2luZG93IG1lbnUgdG8gdG9nZ2xlIHdpbmRvdyBkZWNvcmF0aW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAibmFtZSI6ICJVbmRlY29yYXRlIFdpbmRvdyBmb3IgV2F5bGFuZCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iLAogICAgInRpbUB0YWJkZXZlbG9wZXIuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmRlY29yYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJyYW55ZW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuZGVjb3JhdGUiLAogICJ1dWlkIjogInVuZGVjb3JhdGVAdGFiZGV2ZWxvcGVyLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "1ikbxwqdc204w6vjn1slbrmqvxmkcbyzgqg35jacv8r1z66n6nwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdW5kZWNvcmF0ZSBvcHRpb24gdG8gd2luZG93IG1lbnUgdG8gdG9nZ2xlIHdpbmRvdyBkZWNvcmF0aW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAibmFtZSI6ICJVbmRlY29yYXRlIFdpbmRvdyBmb3IgV2F5bGFuZCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iLAogICAgInRpbUB0YWJkZXZlbG9wZXIuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmRlY29yYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJyYW55ZW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuZGVjb3JhdGUiLAogICJ1dWlkIjogInVuZGVjb3JhdGVAdGFiZGV2ZWxvcGVyLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "1ikbxwqdc204w6vjn1slbrmqvxmkcbyzgqg35jacv8r1z66n6nwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdW5kZWNvcmF0ZSBvcHRpb24gdG8gd2luZG93IG1lbnUgdG8gdG9nZ2xlIHdpbmRvdyBkZWNvcmF0aW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAibmFtZSI6ICJVbmRlY29yYXRlIFdpbmRvdyBmb3IgV2F5bGFuZCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iLAogICAgInRpbUB0YWJkZXZlbG9wZXIuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmRlY29yYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJyYW55ZW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuZGVjb3JhdGUiLAogICJ1dWlkIjogInVuZGVjb3JhdGVAdGFiZGV2ZWxvcGVyLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "zenbook-duo@laurinneff.ch", "name": "Asus ZenBook Duo Integration", "pname": "asus-zenbook-duo-integration", "description": "Integrate the features of the Asus ZenBook Duo into GNOME", "link": "https://extensions.gnome.org/extension/4607/asus-zenbook-duo-integration/", "shell_version_map": {"40": {"version": "5", "sha256": "1xljk5qklm8f9k6hx6ax2axp6r6si510706bksrsbzy72i2dp46w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSB0aGUgZmVhdHVyZXMgb2YgdGhlIEFzdXMgWmVuQm9vayBEdW8gaW50byBHTk9NRSIsCiAgIm5hbWUiOiAiQXN1cyBaZW5Cb29rIER1byBJbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJpbm5lZmYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXplbmJvb2stZHVvIiwKICAidXVpZCI6ICJ6ZW5ib29rLWR1b0BsYXVyaW5uZWZmLmNoIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "1xljk5qklm8f9k6hx6ax2axp6r6si510706bksrsbzy72i2dp46w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSB0aGUgZmVhdHVyZXMgb2YgdGhlIEFzdXMgWmVuQm9vayBEdW8gaW50byBHTk9NRSIsCiAgIm5hbWUiOiAiQXN1cyBaZW5Cb29rIER1byBJbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJpbm5lZmYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXplbmJvb2stZHVvIiwKICAidXVpZCI6ICJ6ZW5ib29rLWR1b0BsYXVyaW5uZWZmLmNoIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "42": {"version": "5", "sha256": "1xljk5qklm8f9k6hx6ax2axp6r6si510706bksrsbzy72i2dp46w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSB0aGUgZmVhdHVyZXMgb2YgdGhlIEFzdXMgWmVuQm9vayBEdW8gaW50byBHTk9NRSIsCiAgIm5hbWUiOiAiQXN1cyBaZW5Cb29rIER1byBJbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJpbm5lZmYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXplbmJvb2stZHVvIiwKICAidXVpZCI6ICJ6ZW5ib29rLWR1b0BsYXVyaW5uZWZmLmNoIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "batterythreshold@francku.gitlab.com", "name": "Battery threshold", "pname": "battery-threshold", "description": "A simple extension for gnome-shell that let easily set a threshold to limit battery charge level.\n\nThis extension uses \"pkexec\" since sudo permissions are needed to change the threshold level.\n\nTested on Fedora Silverblue 35 (gnome-shell 3.41) on an Asus Vivobook.\n\nGithub page: https://github.com/francku/gnome-shell-extension-battery-threshold", "link": "https://extensions.gnome.org/extension/4612/battery-threshold/", "shell_version_map": {"41": {"version": "3", "sha256": "0jydbi1lwz6ls0rg3660b3s7gwlmkd9a08v1mhx12zp89rgrxfm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiBmb3IgZ25vbWUtc2hlbGwgdGhhdCBsZXQgZWFzaWx5IHNldCBhIHRocmVzaG9sZCB0byBsaW1pdCBiYXR0ZXJ5IGNoYXJnZSBsZXZlbC5cblxuVGhpcyBleHRlbnNpb24gdXNlcyBcInBrZXhlY1wiIHNpbmNlIHN1ZG8gcGVybWlzc2lvbnMgYXJlIG5lZWRlZCB0byBjaGFuZ2UgdGhlIHRocmVzaG9sZCBsZXZlbC5cblxuVGVzdGVkIG9uIEZlZG9yYSBTaWx2ZXJibHVlIDM1IChnbm9tZS1zaGVsbCAzLjQxKSBvbiBhbiBBc3VzIFZpdm9ib29rLlxuXG5HaXRodWIgcGFnZTogaHR0cHM6Ly9naXRodWIuY29tL2ZyYW5ja3UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWJhdHRlcnktdGhyZXNob2xkIiwKICAibmFtZSI6ICJCYXR0ZXJ5IHRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJiYXR0ZXJ5dGhyZXNob2xkQGZyYW5ja3UuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "0jydbi1lwz6ls0rg3660b3s7gwlmkd9a08v1mhx12zp89rgrxfm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiBmb3IgZ25vbWUtc2hlbGwgdGhhdCBsZXQgZWFzaWx5IHNldCBhIHRocmVzaG9sZCB0byBsaW1pdCBiYXR0ZXJ5IGNoYXJnZSBsZXZlbC5cblxuVGhpcyBleHRlbnNpb24gdXNlcyBcInBrZXhlY1wiIHNpbmNlIHN1ZG8gcGVybWlzc2lvbnMgYXJlIG5lZWRlZCB0byBjaGFuZ2UgdGhlIHRocmVzaG9sZCBsZXZlbC5cblxuVGVzdGVkIG9uIEZlZG9yYSBTaWx2ZXJibHVlIDM1IChnbm9tZS1zaGVsbCAzLjQxKSBvbiBhbiBBc3VzIFZpdm9ib29rLlxuXG5HaXRodWIgcGFnZTogaHR0cHM6Ly9naXRodWIuY29tL2ZyYW5ja3UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWJhdHRlcnktdGhyZXNob2xkIiwKICAibmFtZSI6ICJCYXR0ZXJ5IHRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJiYXR0ZXJ5dGhyZXNob2xkQGZyYW5ja3UuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "0jydbi1lwz6ls0rg3660b3s7gwlmkd9a08v1mhx12zp89rgrxfm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiBmb3IgZ25vbWUtc2hlbGwgdGhhdCBsZXQgZWFzaWx5IHNldCBhIHRocmVzaG9sZCB0byBsaW1pdCBiYXR0ZXJ5IGNoYXJnZSBsZXZlbC5cblxuVGhpcyBleHRlbnNpb24gdXNlcyBcInBrZXhlY1wiIHNpbmNlIHN1ZG8gcGVybWlzc2lvbnMgYXJlIG5lZWRlZCB0byBjaGFuZ2UgdGhlIHRocmVzaG9sZCBsZXZlbC5cblxuVGVzdGVkIG9uIEZlZG9yYSBTaWx2ZXJibHVlIDM1IChnbm9tZS1zaGVsbCAzLjQxKSBvbiBhbiBBc3VzIFZpdm9ib29rLlxuXG5HaXRodWIgcGFnZTogaHR0cHM6Ly9naXRodWIuY29tL2ZyYW5ja3UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWJhdHRlcnktdGhyZXNob2xkIiwKICAibmFtZSI6ICJCYXR0ZXJ5IHRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJiYXR0ZXJ5dGhyZXNob2xkQGZyYW5ja3UuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} @@ -623,14 +625,14 @@ , {"uuid": "hideTopBarWindow@kinzoku.one", "name": "Hide Top Bar Window", "pname": "hide-top-bar-window", "description": "Hides the selected window entry in the top bar.", "link": "https://extensions.gnome.org/extension/4621/hide-top-bar-window/", "shell_version_map": {"41": {"version": "1", "sha256": "0r7f8qb23ilz42pbbcd4rh22nnczqa9bags6msri1hl68lbv1qwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBzZWxlY3RlZCB3aW5kb3cgZW50cnkgaW4gdGhlIHRvcCBiYXIuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIgV2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDEuMSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9raW56b2t1Lm9uZSIsCiAgInV1aWQiOiAiaGlkZVRvcEJhcldpbmRvd0BraW56b2t1Lm9uZSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"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": "6", "sha256": "0b76kxjpx2vwsib6lchg2b7b0ggvm83dma2diydwwi5rjichl3kh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFydGlmaWNpYWxseSByZWR1Y2UgYnJpZ2h0bmVzcyBvZiB5b3VyIGRpc3BsYXlzIChpbmNsdWRpbmcgZXh0ZXJuYWwgbW9uaXRvcnMpLlxuXG5JdCBpcyBhIGZvcmsgb2YgQ29sb3JUaW50IG1vZGlmaWVkIHRvIHJlZHVjZSBicmlnaHRuZXNzIHdpdGhvdXQgYW4gYWxwaGEgY2hhbm5lbC4iLAogICJuYW1lIjogIkFscGhhVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhaWZ1bGJraGFuL2FscGhhLXRpbnQiLAogICJ1dWlkIjogImFscGhhdGludEBzYWlmdWxia2hhbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0b76kxjpx2vwsib6lchg2b7b0ggvm83dma2diydwwi5rjichl3kh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFydGlmaWNpYWxseSByZWR1Y2UgYnJpZ2h0bmVzcyBvZiB5b3VyIGRpc3BsYXlzIChpbmNsdWRpbmcgZXh0ZXJuYWwgbW9uaXRvcnMpLlxuXG5JdCBpcyBhIGZvcmsgb2YgQ29sb3JUaW50IG1vZGlmaWVkIHRvIHJlZHVjZSBicmlnaHRuZXNzIHdpdGhvdXQgYW4gYWxwaGEgY2hhbm5lbC4iLAogICJuYW1lIjogIkFscGhhVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhaWZ1bGJraGFuL2FscGhhLXRpbnQiLAogICJ1dWlkIjogImFscGhhdGludEBzYWlmdWxia2hhbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "0b76kxjpx2vwsib6lchg2b7b0ggvm83dma2diydwwi5rjichl3kh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFydGlmaWNpYWxseSByZWR1Y2UgYnJpZ2h0bmVzcyBvZiB5b3VyIGRpc3BsYXlzIChpbmNsdWRpbmcgZXh0ZXJuYWwgbW9uaXRvcnMpLlxuXG5JdCBpcyBhIGZvcmsgb2YgQ29sb3JUaW50IG1vZGlmaWVkIHRvIHJlZHVjZSBicmlnaHRuZXNzIHdpdGhvdXQgYW4gYWxwaGEgY2hhbm5lbC4iLAogICJuYW1lIjogIkFscGhhVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhaWZ1bGJraGFuL2FscGhhLXRpbnQiLAogICJ1dWlkIjogImFscGhhdGludEBzYWlmdWxia2hhbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"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": "13", "sha256": "0wx3cz35pnws71a2n89ivks9innlcbdba8p9bd0znf6amyalvpg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJ0aW5oamFydG15ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZm9jdXMtY2hhbmdlciIsCiAgInV1aWQiOiAiZm9jdXMtY2hhbmdlckBoZWFydG1pcmUiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "0wx3cz35pnws71a2n89ivks9innlcbdba8p9bd0znf6amyalvpg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJ0aW5oamFydG15ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZm9jdXMtY2hhbmdlciIsCiAgInV1aWQiOiAiZm9jdXMtY2hhbmdlckBoZWFydG1pcmUiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "42": {"version": "13", "sha256": "0wx3cz35pnws71a2n89ivks9innlcbdba8p9bd0znf6amyalvpg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJ0aW5oamFydG15ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZm9jdXMtY2hhbmdlciIsCiAgInV1aWQiOiAiZm9jdXMtY2hhbmdlckBoZWFydG1pcmUiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "43": {"version": "13", "sha256": "0wx3cz35pnws71a2n89ivks9innlcbdba8p9bd0znf6amyalvpg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJ0aW5oamFydG15ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZm9jdXMtY2hhbmdlciIsCiAgInV1aWQiOiAiZm9jdXMtY2hhbmdlckBoZWFydG1pcmUiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} -, {"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": "6", "sha256": "1z7f6cnfxd7gy0z5sh96li98ds97cb7hl5iihsxcg8vq76l7a3ds", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBjbGFzc2ljIHRpdGxlIGJhciBvZiBtYXhpbWl6ZWQgWC5Pcmcgd2luZG93cyIsCiAgIm5hbWUiOiAiTm8gVGl0bGViYXIgV2hlbiBNYXhpbWl6ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGVjZG90bmluamEvbm8tdGl0bGViYXItd2hlbi1tYXhpbWl6ZWQiLAogICJ1dWlkIjogIm5vLXRpdGxlYmFyLXdoZW4tbWF4aW1pemVkQGFsZWMubmluamEiLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "1z7f6cnfxd7gy0z5sh96li98ds97cb7hl5iihsxcg8vq76l7a3ds", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBjbGFzc2ljIHRpdGxlIGJhciBvZiBtYXhpbWl6ZWQgWC5Pcmcgd2luZG93cyIsCiAgIm5hbWUiOiAiTm8gVGl0bGViYXIgV2hlbiBNYXhpbWl6ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGVjZG90bmluamEvbm8tdGl0bGViYXItd2hlbi1tYXhpbWl6ZWQiLAogICJ1dWlkIjogIm5vLXRpdGxlYmFyLXdoZW4tbWF4aW1pemVkQGFsZWMubmluamEiLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "1z7f6cnfxd7gy0z5sh96li98ds97cb7hl5iihsxcg8vq76l7a3ds", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBjbGFzc2ljIHRpdGxlIGJhciBvZiBtYXhpbWl6ZWQgWC5Pcmcgd2luZG93cyIsCiAgIm5hbWUiOiAiTm8gVGl0bGViYXIgV2hlbiBNYXhpbWl6ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGVjZG90bmluamEvbm8tdGl0bGViYXItd2hlbi1tYXhpbWl6ZWQiLAogICJ1dWlkIjogIm5vLXRpdGxlYmFyLXdoZW4tbWF4aW1pemVkQGFsZWMubmluamEiLAogICJ2ZXJzaW9uIjogNgp9"}}} -, {"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": "9", "sha256": "18gq0ylx5s0y71fr9pd67nd27dzkhgr5ympw39ijh763hnx2nlpw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2QweDJmL0NyeXB0b1dhdGNoIiwKICAidXVpZCI6ICJjcnlwdG93YXRjaEBkMHgyZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "18gq0ylx5s0y71fr9pd67nd27dzkhgr5ympw39ijh763hnx2nlpw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2QweDJmL0NyeXB0b1dhdGNoIiwKICAidXVpZCI6ICJjcnlwdG93YXRjaEBkMHgyZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "18gq0ylx5s0y71fr9pd67nd27dzkhgr5ympw39ijh763hnx2nlpw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2QweDJmL0NyeXB0b1dhdGNoIiwKICAidXVpZCI6ICJjcnlwdG93YXRjaEBkMHgyZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} -, {"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": "5", "sha256": "1ppwh8vs8hizx2w7kyysm88817pmdszpx09s8f26wkhif6yri5ib", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFyZSB5b3UgYSBwb3dlci11c2VyP1xuRG8geW91IGxpa2UgdXNpbmcgU3VwZXIrMSwyLDMgdG8gYWNjZXNzIHlvdXIgZmF2b3JpdGUgYXBwcz9cbkFyZSB5b3UgYW5ub3llZCB0aGF0IHlvdSBoYXZlIHRvIG1hbnVhbGx5IG1vdmUgeW91ciBtb3VzZSBiZXR3ZWVuIHNjcmVlbnMgYmVjYXVzZSBpdCBjYW4ndCBrZWVwIHVwIHdpdGggeW91ciBrZXlib2FyZCBzaG9ydGN1dHM/XG5UaGVuIHRoaXMgZXh0ZW5zaW9uIGlzIGZvciB5b3UhXG5cblRoaXMgc2ltcGxlIEdOT01FIHNoZWxsIGV4dGVuc2lvbiBkb2VzIHRoZSBvcHBvc2l0ZSBvZiB0aGUgJ2ZvY3VzIGZvbGxvd3MgbW91c2UnIHNldHRpbmcuIEl0IG1ha2VzIHRoZSBtb3VzZSBmb2xsb3cgeW91ciBrZXlib2FyZCBmb2N1cy4gV2hlbmV2ZXIgeW91IGZvY3VzIGEgd2luZG93LCBpZiB0aGUgY3Vyc29yIGlzbid0IGFscmVhZHkgaW4gaXQsIGl0IHdpbGwganVtcCB0byB0aGUgd2luZG93cyBjZW50ZXIsIG1ha2luZyBpdCBlYXN5IHRvIGludGVyYWN0IHdpdGggaXQuIiwKICAibmFtZSI6ICJNb3VzZSBGb2xsb3dzIEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZW9uTWF0dGhlcy9tb3VzZWZvbGxvd3Nmb2N1cyIsCiAgInV1aWQiOiAibW91c2Vmb2xsb3dzZm9jdXNAbWF0dGhlcy5iaXoiLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "5", "sha256": "1ppwh8vs8hizx2w7kyysm88817pmdszpx09s8f26wkhif6yri5ib", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFyZSB5b3UgYSBwb3dlci11c2VyP1xuRG8geW91IGxpa2UgdXNpbmcgU3VwZXIrMSwyLDMgdG8gYWNjZXNzIHlvdXIgZmF2b3JpdGUgYXBwcz9cbkFyZSB5b3UgYW5ub3llZCB0aGF0IHlvdSBoYXZlIHRvIG1hbnVhbGx5IG1vdmUgeW91ciBtb3VzZSBiZXR3ZWVuIHNjcmVlbnMgYmVjYXVzZSBpdCBjYW4ndCBrZWVwIHVwIHdpdGggeW91ciBrZXlib2FyZCBzaG9ydGN1dHM/XG5UaGVuIHRoaXMgZXh0ZW5zaW9uIGlzIGZvciB5b3UhXG5cblRoaXMgc2ltcGxlIEdOT01FIHNoZWxsIGV4dGVuc2lvbiBkb2VzIHRoZSBvcHBvc2l0ZSBvZiB0aGUgJ2ZvY3VzIGZvbGxvd3MgbW91c2UnIHNldHRpbmcuIEl0IG1ha2VzIHRoZSBtb3VzZSBmb2xsb3cgeW91ciBrZXlib2FyZCBmb2N1cy4gV2hlbmV2ZXIgeW91IGZvY3VzIGEgd2luZG93LCBpZiB0aGUgY3Vyc29yIGlzbid0IGFscmVhZHkgaW4gaXQsIGl0IHdpbGwganVtcCB0byB0aGUgd2luZG93cyBjZW50ZXIsIG1ha2luZyBpdCBlYXN5IHRvIGludGVyYWN0IHdpdGggaXQuIiwKICAibmFtZSI6ICJNb3VzZSBGb2xsb3dzIEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZW9uTWF0dGhlcy9tb3VzZWZvbGxvd3Nmb2N1cyIsCiAgInV1aWQiOiAibW91c2Vmb2xsb3dzZm9jdXNAbWF0dGhlcy5iaXoiLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"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": "10", "sha256": "0d96rfjlvj7h84lhm8x17w0mnpajgsblhhxn17mq16gi8qwgpggc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBjbGFzc2ljIHRpdGxlIGJhciBvZiBtYXhpbWl6ZWQgWC5Pcmcgd2luZG93cyIsCiAgIm5hbWUiOiAiTm8gVGl0bGViYXIgV2hlbiBNYXhpbWl6ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGVjZG90bmluamEvbm8tdGl0bGViYXItd2hlbi1tYXhpbWl6ZWQiLAogICJ1dWlkIjogIm5vLXRpdGxlYmFyLXdoZW4tbWF4aW1pemVkQGFsZWMubmluamEiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "42": {"version": "10", "sha256": "0d96rfjlvj7h84lhm8x17w0mnpajgsblhhxn17mq16gi8qwgpggc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBjbGFzc2ljIHRpdGxlIGJhciBvZiBtYXhpbWl6ZWQgWC5Pcmcgd2luZG93cyIsCiAgIm5hbWUiOiAiTm8gVGl0bGViYXIgV2hlbiBNYXhpbWl6ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGVjZG90bmluamEvbm8tdGl0bGViYXItd2hlbi1tYXhpbWl6ZWQiLAogICJ1dWlkIjogIm5vLXRpdGxlYmFyLXdoZW4tbWF4aW1pemVkQGFsZWMubmluamEiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "43": {"version": "10", "sha256": "0d96rfjlvj7h84lhm8x17w0mnpajgsblhhxn17mq16gi8qwgpggc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBjbGFzc2ljIHRpdGxlIGJhciBvZiBtYXhpbWl6ZWQgWC5Pcmcgd2luZG93cyIsCiAgIm5hbWUiOiAiTm8gVGl0bGViYXIgV2hlbiBNYXhpbWl6ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGVjZG90bmluamEvbm8tdGl0bGViYXItd2hlbi1tYXhpbWl6ZWQiLAogICJ1dWlkIjogIm5vLXRpdGxlYmFyLXdoZW4tbWF4aW1pemVkQGFsZWMubmluamEiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} +, {"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": "10", "sha256": "1q980xnrarcvzfpvdkn1pwz436k296g7l9d813zrl40hq7dwjzh3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kMHgyZi9DcnlwdG9XYXRjaCIsCiAgInV1aWQiOiAiY3J5cHRvd2F0Y2hAZDB4MmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "1q980xnrarcvzfpvdkn1pwz436k296g7l9d813zrl40hq7dwjzh3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kMHgyZi9DcnlwdG9XYXRjaCIsCiAgInV1aWQiOiAiY3J5cHRvd2F0Y2hAZDB4MmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "1q980xnrarcvzfpvdkn1pwz436k296g7l9d813zrl40hq7dwjzh3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kMHgyZi9DcnlwdG9XYXRjaCIsCiAgInV1aWQiOiAiY3J5cHRvd2F0Y2hAZDB4MmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "10", "sha256": "1q980xnrarcvzfpvdkn1pwz436k296g7l9d813zrl40hq7dwjzh3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kMHgyZi9DcnlwdG9XYXRjaCIsCiAgInV1aWQiOiAiY3J5cHRvd2F0Y2hAZDB4MmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} +, {"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": "6", "sha256": "08x7rbsh6fzfhj2h423mynjsvzgfvyyyj81divyr125dh3nin81w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFyZSB5b3UgYSBwb3dlci11c2VyP1xuRG8geW91IGxpa2UgdXNpbmcgU3VwZXIrMSwyLDMgdG8gYWNjZXNzIHlvdXIgZmF2b3JpdGUgYXBwcz9cbkFyZSB5b3UgYW5ub3llZCB0aGF0IHlvdSBoYXZlIHRvIG1hbnVhbGx5IG1vdmUgeW91ciBtb3VzZSBiZXR3ZWVuIHNjcmVlbnMgYmVjYXVzZSBpdCBjYW4ndCBrZWVwIHVwIHdpdGggeW91ciBrZXlib2FyZCBzaG9ydGN1dHM/XG5UaGVuIHRoaXMgZXh0ZW5zaW9uIGlzIGZvciB5b3UhXG5cblRoaXMgc2ltcGxlIEdOT01FIHNoZWxsIGV4dGVuc2lvbiBkb2VzIHRoZSBvcHBvc2l0ZSBvZiB0aGUgJ2ZvY3VzIGZvbGxvd3MgbW91c2UnIHNldHRpbmcuIEl0IG1ha2VzIHRoZSBtb3VzZSBmb2xsb3cgeW91ciBrZXlib2FyZCBmb2N1cy4gV2hlbmV2ZXIgeW91IGZvY3VzIGEgd2luZG93LCBpZiB0aGUgY3Vyc29yIGlzbid0IGFscmVhZHkgaW4gaXQsIGl0IHdpbGwganVtcCB0byB0aGUgd2luZG93cyBjZW50ZXIsIG1ha2luZyBpdCBlYXN5IHRvIGludGVyYWN0IHdpdGggaXQuIiwKICAibmFtZSI6ICJNb3VzZSBGb2xsb3dzIEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVvbk1hdHRoZXMvbW91c2Vmb2xsb3dzZm9jdXMiLAogICJ1dWlkIjogIm1vdXNlZm9sbG93c2ZvY3VzQG1hdHRoZXMuYml6IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "08x7rbsh6fzfhj2h423mynjsvzgfvyyyj81divyr125dh3nin81w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFyZSB5b3UgYSBwb3dlci11c2VyP1xuRG8geW91IGxpa2UgdXNpbmcgU3VwZXIrMSwyLDMgdG8gYWNjZXNzIHlvdXIgZmF2b3JpdGUgYXBwcz9cbkFyZSB5b3UgYW5ub3llZCB0aGF0IHlvdSBoYXZlIHRvIG1hbnVhbGx5IG1vdmUgeW91ciBtb3VzZSBiZXR3ZWVuIHNjcmVlbnMgYmVjYXVzZSBpdCBjYW4ndCBrZWVwIHVwIHdpdGggeW91ciBrZXlib2FyZCBzaG9ydGN1dHM/XG5UaGVuIHRoaXMgZXh0ZW5zaW9uIGlzIGZvciB5b3UhXG5cblRoaXMgc2ltcGxlIEdOT01FIHNoZWxsIGV4dGVuc2lvbiBkb2VzIHRoZSBvcHBvc2l0ZSBvZiB0aGUgJ2ZvY3VzIGZvbGxvd3MgbW91c2UnIHNldHRpbmcuIEl0IG1ha2VzIHRoZSBtb3VzZSBmb2xsb3cgeW91ciBrZXlib2FyZCBmb2N1cy4gV2hlbmV2ZXIgeW91IGZvY3VzIGEgd2luZG93LCBpZiB0aGUgY3Vyc29yIGlzbid0IGFscmVhZHkgaW4gaXQsIGl0IHdpbGwganVtcCB0byB0aGUgd2luZG93cyBjZW50ZXIsIG1ha2luZyBpdCBlYXN5IHRvIGludGVyYWN0IHdpdGggaXQuIiwKICAibmFtZSI6ICJNb3VzZSBGb2xsb3dzIEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVvbk1hdHRoZXMvbW91c2Vmb2xsb3dzZm9jdXMiLAogICJ1dWlkIjogIm1vdXNlZm9sbG93c2ZvY3VzQG1hdHRoZXMuYml6IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "43": {"version": "6", "sha256": "08x7rbsh6fzfhj2h423mynjsvzgfvyyyj81divyr125dh3nin81w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFyZSB5b3UgYSBwb3dlci11c2VyP1xuRG8geW91IGxpa2UgdXNpbmcgU3VwZXIrMSwyLDMgdG8gYWNjZXNzIHlvdXIgZmF2b3JpdGUgYXBwcz9cbkFyZSB5b3UgYW5ub3llZCB0aGF0IHlvdSBoYXZlIHRvIG1hbnVhbGx5IG1vdmUgeW91ciBtb3VzZSBiZXR3ZWVuIHNjcmVlbnMgYmVjYXVzZSBpdCBjYW4ndCBrZWVwIHVwIHdpdGggeW91ciBrZXlib2FyZCBzaG9ydGN1dHM/XG5UaGVuIHRoaXMgZXh0ZW5zaW9uIGlzIGZvciB5b3UhXG5cblRoaXMgc2ltcGxlIEdOT01FIHNoZWxsIGV4dGVuc2lvbiBkb2VzIHRoZSBvcHBvc2l0ZSBvZiB0aGUgJ2ZvY3VzIGZvbGxvd3MgbW91c2UnIHNldHRpbmcuIEl0IG1ha2VzIHRoZSBtb3VzZSBmb2xsb3cgeW91ciBrZXlib2FyZCBmb2N1cy4gV2hlbmV2ZXIgeW91IGZvY3VzIGEgd2luZG93LCBpZiB0aGUgY3Vyc29yIGlzbid0IGFscmVhZHkgaW4gaXQsIGl0IHdpbGwganVtcCB0byB0aGUgd2luZG93cyBjZW50ZXIsIG1ha2luZyBpdCBlYXN5IHRvIGludGVyYWN0IHdpdGggaXQuIiwKICAibmFtZSI6ICJNb3VzZSBGb2xsb3dzIEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVvbk1hdHRoZXMvbW91c2Vmb2xsb3dzZm9jdXMiLAogICJ1dWlkIjogIm1vdXNlZm9sbG93c2ZvY3VzQG1hdHRoZXMuYml6IiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"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": "13", "sha256": "027jz7h07340ayqvzji8l33x2y7jxrzf64wr4gvh16dbgw1229fa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0Rlc2t0b3AtQ3ViZSIsCiAgInV1aWQiOiAiZGVza3RvcC1jdWJlQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "027jz7h07340ayqvzji8l33x2y7jxrzf64wr4gvh16dbgw1229fa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0Rlc2t0b3AtQ3ViZSIsCiAgInV1aWQiOiAiZGVza3RvcC1jdWJlQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "42": {"version": "13", "sha256": "027jz7h07340ayqvzji8l33x2y7jxrzf64wr4gvh16dbgw1229fa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0Rlc2t0b3AtQ3ViZSIsCiAgInV1aWQiOiAiZGVza3RvcC1jdWJlQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "43": {"version": "13", "sha256": "027jz7h07340ayqvzji8l33x2y7jxrzf64wr4gvh16dbgw1229fa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0Rlc2t0b3AtQ3ViZSIsCiAgInV1aWQiOiAiZGVza3RvcC1jdWJlQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} -, {"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": "5", "sha256": "1sc8s3qiwcvwydva7biaw2val5ki1cqrpybhpk9by1p6kk1cg5vg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvbm90aWZpY2F0aW9uLXBvc2l0aW9uLXJlbG9hZGVkIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tYmFubmVyLXJlbG9hZGVkQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1sc8s3qiwcvwydva7biaw2val5ki1cqrpybhpk9by1p6kk1cg5vg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvbm90aWZpY2F0aW9uLXBvc2l0aW9uLXJlbG9hZGVkIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tYmFubmVyLXJlbG9hZGVkQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "1sc8s3qiwcvwydva7biaw2val5ki1cqrpybhpk9by1p6kk1cg5vg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvbm90aWZpY2F0aW9uLXBvc2l0aW9uLXJlbG9hZGVkIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tYmFubmVyLXJlbG9hZGVkQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} +, {"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": "7", "sha256": "13hjbixsr10dfc1yjj6xh1gc3rhs4rx0wppxwp7rfv0x1f0d3813", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWt1Ym93c2tpL25vdGlmaWNhdGlvbi1wb3NpdGlvbi1yZWxvYWRlZCIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZEBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "13hjbixsr10dfc1yjj6xh1gc3rhs4rx0wppxwp7rfv0x1f0d3813", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWt1Ym93c2tpL25vdGlmaWNhdGlvbi1wb3NpdGlvbi1yZWxvYWRlZCIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZEBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "13hjbixsr10dfc1yjj6xh1gc3rhs4rx0wppxwp7rfv0x1f0d3813", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWt1Ym93c2tpL25vdGlmaWNhdGlvbi1wb3NpdGlvbi1yZWxvYWRlZCIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZEBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "13hjbixsr10dfc1yjj6xh1gc3rhs4rx0wppxwp7rfv0x1f0d3813", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWt1Ym93c2tpL25vdGlmaWNhdGlvbi1wb3NpdGlvbi1yZWxvYWRlZCIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZEBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"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": "25", "sha256": "17q2644zi9idq0i3msiwnz5nfhd1hffd2fn3yrvj6m2rnar9x59b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9icnVuby5lbmdsZXJ0L2dub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzc0BicnVuby5lbmdsZXJ0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "41": {"version": "25", "sha256": "17q2644zi9idq0i3msiwnz5nfhd1hffd2fn3yrvj6m2rnar9x59b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9icnVuby5lbmdsZXJ0L2dub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzc0BicnVuby5lbmdsZXJ0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "42": {"version": "25", "sha256": "17q2644zi9idq0i3msiwnz5nfhd1hffd2fn3yrvj6m2rnar9x59b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9icnVuby5lbmdsZXJ0L2dub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzc0BicnVuby5lbmdsZXJ0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "43": {"version": "25", "sha256": "17q2644zi9idq0i3msiwnz5nfhd1hffd2fn3yrvj6m2rnar9x59b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9icnVuby5lbmdsZXJ0L2dub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzc0BicnVuby5lbmdsZXJ0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}}} -, {"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": "7", "sha256": "0l6fx4dfqr1pkpg7ckiynicwjzjrdn31mcbksk1a199scivkhilk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9ucyIsCiAgIm5hbWUiOiAiRGF0ZSBNZW51IEZvcm1hdHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImRhdGUtbWVudS1mb3JtYXR0ZXJAbWFyY2luamFrdWJvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0l6fx4dfqr1pkpg7ckiynicwjzjrdn31mcbksk1a199scivkhilk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9ucyIsCiAgIm5hbWUiOiAiRGF0ZSBNZW51IEZvcm1hdHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImRhdGUtbWVudS1mb3JtYXR0ZXJAbWFyY2luamFrdWJvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "0l6fx4dfqr1pkpg7ckiynicwjzjrdn31mcbksk1a199scivkhilk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9ucyIsCiAgIm5hbWUiOiAiRGF0ZSBNZW51IEZvcm1hdHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImRhdGUtbWVudS1mb3JtYXR0ZXJAbWFyY2luamFrdWJvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} +, {"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": "8", "sha256": "1x84k8714y0bqvy4qcyhrw3vbhw0kaf95sns62j6h9a0xb0ldw78", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9ucyIsCiAgIm5hbWUiOiAiRGF0ZSBNZW51IEZvcm1hdHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInV1aWQiOiAiZGF0ZS1tZW51LWZvcm1hdHRlckBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "1x84k8714y0bqvy4qcyhrw3vbhw0kaf95sns62j6h9a0xb0ldw78", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9ucyIsCiAgIm5hbWUiOiAiRGF0ZSBNZW51IEZvcm1hdHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInV1aWQiOiAiZGF0ZS1tZW51LWZvcm1hdHRlckBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "1x84k8714y0bqvy4qcyhrw3vbhw0kaf95sns62j6h9a0xb0ldw78", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9ucyIsCiAgIm5hbWUiOiAiRGF0ZSBNZW51IEZvcm1hdHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInV1aWQiOiAiZGF0ZS1tZW51LWZvcm1hdHRlckBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "43": {"version": "8", "sha256": "1x84k8714y0bqvy4qcyhrw3vbhw0kaf95sns62j6h9a0xb0ldw78", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9ucyIsCiAgIm5hbWUiOiAiRGF0ZSBNZW51IEZvcm1hdHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInV1aWQiOiAiZGF0ZS1tZW51LWZvcm1hdHRlckBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "surf@diegonz.github.io", "name": "Surf", "pname": "surf", "description": "Visit URL or perform a web search with the terms provided directly from GNOME Shell", "link": "https://extensions.gnome.org/extension/4661/surf/", "shell_version_map": {"38": {"version": "2", "sha256": "04rs32jzy89vr2fyw44vmjx47l2kkdhqklqms9fqckf8ii3l4h56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpc2l0IFVSTCBvciBwZXJmb3JtIGEgd2ViIHNlYXJjaCB3aXRoIHRoZSB0ZXJtcyBwcm92aWRlZCBkaXJlY3RseSBmcm9tIEdOT01FIFNoZWxsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN1cmYiLAogICJuYW1lIjogIlN1cmYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VyZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ29uei9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3VyZiIsCiAgInV1aWQiOiAic3VyZkBkaWVnb256LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "04rs32jzy89vr2fyw44vmjx47l2kkdhqklqms9fqckf8ii3l4h56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpc2l0IFVSTCBvciBwZXJmb3JtIGEgd2ViIHNlYXJjaCB3aXRoIHRoZSB0ZXJtcyBwcm92aWRlZCBkaXJlY3RseSBmcm9tIEdOT01FIFNoZWxsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN1cmYiLAogICJuYW1lIjogIlN1cmYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VyZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ29uei9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3VyZiIsCiAgInV1aWQiOiAic3VyZkBkaWVnb256LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "04rs32jzy89vr2fyw44vmjx47l2kkdhqklqms9fqckf8ii3l4h56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpc2l0IFVSTCBvciBwZXJmb3JtIGEgd2ViIHNlYXJjaCB3aXRoIHRoZSB0ZXJtcyBwcm92aWRlZCBkaXJlY3RseSBmcm9tIEdOT01FIFNoZWxsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN1cmYiLAogICJuYW1lIjogIlN1cmYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VyZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ29uei9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3VyZiIsCiAgInV1aWQiOiAic3VyZkBkaWVnb256LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "CustomizeClockOnLockScreen@pratap.fastmail.fm", "name": "Customize Clock on Lock Screen", "pname": "customize-clock-on-lock-screen", "description": "Customize Clock on Lock Screen.", "link": "https://extensions.gnome.org/extension/4663/customize-clock-on-lock-screen/", "shell_version_map": {"41": {"version": "5", "sha256": "1nnkyvppbga65dpmszv066hps12p0b5rcaimhn489x2bzhyiycn1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbi4iLAogICJuYW1lIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2N1c3RvbWl6ZS1jbG9jay1vbi1sb2NrLXNjcmVlbiIsCiAgInV1aWQiOiAiQ3VzdG9taXplQ2xvY2tPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "42": {"version": "5", "sha256": "1nnkyvppbga65dpmszv066hps12p0b5rcaimhn489x2bzhyiycn1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbi4iLAogICJuYW1lIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2N1c3RvbWl6ZS1jbG9jay1vbi1sb2NrLXNjcmVlbiIsCiAgInV1aWQiOiAiQ3VzdG9taXplQ2xvY2tPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "LeftClock@adityashrivastava.tk", "name": "Left Clock", "pname": "left-clock", "description": "Replaces the activity button with clock and moves it to left side of top bar.", "link": "https://extensions.gnome.org/extension/4667/left-clock/", "shell_version_map": {"40": {"version": "6", "sha256": "0qx71si3vggkh81wdpkl22hsq0kpgjy2b02n47qbxk5m9swyv3ky", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VzIHRoZSBhY3Rpdml0eSBidXR0b24gd2l0aCBjbG9jayBhbmQgbW92ZXMgaXQgdG8gbGVmdCBzaWRlIG9mIHRvcCBiYXIuIiwKICAibmFtZSI6ICJMZWZ0IENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkxlZnRDbG9ja0BhZGl0eWFzaHJpdmFzdGF2YS50ayIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "0qx71si3vggkh81wdpkl22hsq0kpgjy2b02n47qbxk5m9swyv3ky", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VzIHRoZSBhY3Rpdml0eSBidXR0b24gd2l0aCBjbG9jayBhbmQgbW92ZXMgaXQgdG8gbGVmdCBzaWRlIG9mIHRvcCBiYXIuIiwKICAibmFtZSI6ICJMZWZ0IENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkxlZnRDbG9ja0BhZGl0eWFzaHJpdmFzdGF2YS50ayIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "0qx71si3vggkh81wdpkl22hsq0kpgjy2b02n47qbxk5m9swyv3ky", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VzIHRoZSBhY3Rpdml0eSBidXR0b24gd2l0aCBjbG9jayBhbmQgbW92ZXMgaXQgdG8gbGVmdCBzaWRlIG9mIHRvcCBiYXIuIiwKICAibmFtZSI6ICJMZWZ0IENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkxlZnRDbG9ja0BhZGl0eWFzaHJpdmFzdGF2YS50ayIsCiAgInZlcnNpb24iOiA2Cn0="}}} @@ -638,56 +640,56 @@ , {"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": "6", "sha256": "1zq03ih8ahc5xkfcn7wdjs6dpmhswvdm55bds9wzchscs041sfrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIgZXh0ZW5zaW9uIGZvciBHTk9NRSBzaGVsbCIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2xvdWRmbGFyZS13YXJwLXN3aXRjaGVyLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IYXJzaGFuMDEvQ2xvdWRmbGFyZS1XQVJQLUdOT01FLVN3aXRjaGVyIiwKICAidXVpZCI6ICJjbG91ZGZsYXJlLXdhcnAtZ25vbWVAaGFyc2hhbjAxIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "1zq03ih8ahc5xkfcn7wdjs6dpmhswvdm55bds9wzchscs041sfrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIgZXh0ZW5zaW9uIGZvciBHTk9NRSBzaGVsbCIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2xvdWRmbGFyZS13YXJwLXN3aXRjaGVyLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IYXJzaGFuMDEvQ2xvdWRmbGFyZS1XQVJQLUdOT01FLVN3aXRjaGVyIiwKICAidXVpZCI6ICJjbG91ZGZsYXJlLXdhcnAtZ25vbWVAaGFyc2hhbjAxIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "1zq03ih8ahc5xkfcn7wdjs6dpmhswvdm55bds9wzchscs041sfrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIgZXh0ZW5zaW9uIGZvciBHTk9NRSBzaGVsbCIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2xvdWRmbGFyZS13YXJwLXN3aXRjaGVyLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IYXJzaGFuMDEvQ2xvdWRmbGFyZS1XQVJQLUdOT01FLVN3aXRjaGVyIiwKICAidXVpZCI6ICJjbG91ZGZsYXJlLXdhcnAtZ25vbWVAaGFyc2hhbjAxIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "1zq03ih8ahc5xkfcn7wdjs6dpmhswvdm55bds9wzchscs041sfrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIgZXh0ZW5zaW9uIGZvciBHTk9NRSBzaGVsbCIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2xvdWRmbGFyZS13YXJwLXN3aXRjaGVyLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IYXJzaGFuMDEvQ2xvdWRmbGFyZS1XQVJQLUdOT01FLVN3aXRjaGVyIiwKICAidXVpZCI6ICJjbG91ZGZsYXJlLXdhcnAtZ25vbWVAaGFyc2hhbjAxIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"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": "2", "sha256": "0ncpa84dh632wix9cdfiaykzz3d2k3kz1wsbh7y5kwmsib2rjp1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgbW91c2UgcG9pbnRlciBvbnRvIGFjdGl2ZSB3aW5kb3cgYWZ0ZXIgQWx0LVRhYi4gVGhpcyBleHRlbnNpb24gaXMgd29ya2Fyb3VuZCBvZiBzb21lIHNsb3BweSBmb2N1cyBwcm9ibGVtcyIsCiAgIm5hbWUiOiAiQWx0LVRhYiBNb3ZlIE1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnV6enRhaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLW1vdmUtbW91c2UiLAogICJ1dWlkIjogImFsdC10YWItbW92ZS1tb3VzZUBidXp6dGFpa2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "0ncpa84dh632wix9cdfiaykzz3d2k3kz1wsbh7y5kwmsib2rjp1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgbW91c2UgcG9pbnRlciBvbnRvIGFjdGl2ZSB3aW5kb3cgYWZ0ZXIgQWx0LVRhYi4gVGhpcyBleHRlbnNpb24gaXMgd29ya2Fyb3VuZCBvZiBzb21lIHNsb3BweSBmb2N1cyBwcm9ibGVtcyIsCiAgIm5hbWUiOiAiQWx0LVRhYiBNb3ZlIE1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnV6enRhaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLW1vdmUtbW91c2UiLAogICJ1dWlkIjogImFsdC10YWItbW92ZS1tb3VzZUBidXp6dGFpa2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "0ncpa84dh632wix9cdfiaykzz3d2k3kz1wsbh7y5kwmsib2rjp1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgbW91c2UgcG9pbnRlciBvbnRvIGFjdGl2ZSB3aW5kb3cgYWZ0ZXIgQWx0LVRhYi4gVGhpcyBleHRlbnNpb24gaXMgd29ya2Fyb3VuZCBvZiBzb21lIHNsb3BweSBmb2N1cyBwcm9ibGVtcyIsCiAgIm5hbWUiOiAiQWx0LVRhYiBNb3ZlIE1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnV6enRhaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLW1vdmUtbW91c2UiLAogICJ1dWlkIjogImFsdC10YWItbW92ZS1tb3VzZUBidXp6dGFpa2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"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 windows with style.", "link": "https://extensions.gnome.org/extension/4679/burn-my-windows/", "shell_version_map": {"38": {"version": "22", "sha256": "1hzdg7357fjrfdrgqk7blb7y3v9crsmv1hk7wwln112sammpjvnw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "40": {"version": "22", "sha256": "1hzdg7357fjrfdrgqk7blb7y3v9crsmv1hk7wwln112sammpjvnw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "41": {"version": "22", "sha256": "1hzdg7357fjrfdrgqk7blb7y3v9crsmv1hk7wwln112sammpjvnw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "1hzdg7357fjrfdrgqk7blb7y3v9crsmv1hk7wwln112sammpjvnw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "22", "sha256": "1hzdg7357fjrfdrgqk7blb7y3v9crsmv1hk7wwln112sammpjvnw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} +, {"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": "25", "sha256": "0wck691kf340w8ibmban8zx6xs02h39fdi2cvg8mwzzhbrrisdk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "40": {"version": "25", "sha256": "0wck691kf340w8ibmban8zx6xs02h39fdi2cvg8mwzzhbrrisdk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "41": {"version": "25", "sha256": "0wck691kf340w8ibmban8zx6xs02h39fdi2cvg8mwzzhbrrisdk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "42": {"version": "25", "sha256": "0wck691kf340w8ibmban8zx6xs02h39fdi2cvg8mwzzhbrrisdk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "43": {"version": "25", "sha256": "0wck691kf340w8ibmban8zx6xs02h39fdi2cvg8mwzzhbrrisdk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}}} , {"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": "9", "sha256": "00h9p7vhv23r8jb00pwkw5vfjdz21p1hdfhn288jld6kdj4w00zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "9", "sha256": "00h9p7vhv23r8jb00pwkw5vfjdz21p1hdfhn288jld6kdj4w00zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "00h9p7vhv23r8jb00pwkw5vfjdz21p1hdfhn288jld6kdj4w00zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "42": {"version": "9", "sha256": "00h9p7vhv23r8jb00pwkw5vfjdz21p1hdfhn288jld6kdj4w00zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "00h9p7vhv23r8jb00pwkw5vfjdz21p1hdfhn288jld6kdj4w00zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}}} +, {"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": "9", "sha256": "00h9p7vhv23r8jb00pwkw5vfjdz21p1hdfhn288jld6kdj4w00zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "10", "sha256": "0b5gblslp47qiazgg56rxzcsk8si5bycnimlxbykqa64i27kriaj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0b5gblslp47qiazgg56rxzcsk8si5bycnimlxbykqa64i27kriaj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "0b5gblslp47qiazgg56rxzcsk8si5bycnimlxbykqa64i27kriaj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "10", "sha256": "0b5gblslp47qiazgg56rxzcsk8si5bycnimlxbykqa64i27kriaj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"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": "8", "sha256": "1mm2b6fwx58yvcq8fkxrkcb5bcm4ak8al5jw0939mwr8fjhgd13s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1mm2b6fwx58yvcq8fkxrkcb5bcm4ak8al5jw0939mwr8fjhgd13s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "9", "sha256": "19afjjkkga6ky7ixc03ga7fyg49jkqld01v05pq5jrbf1bhzgvcf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0My4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ3JhaWdGb290ZS9jYS5mb290ZXdhcmUuZ25vbWVzaGVsbC5zZXJ2ZXJzdGF0dXMuZ2l0IiwKICAidXVpZCI6ICJzZXJ2ZXJzdGF0dXNAZm9vdGV3YXJlLmNhIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} -, {"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": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "4", "sha256": "1gppfxk8nrg4zk18hmlnkn1q0vbm1rgykm9pibl6n7pbf30snp5m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFmb3N0YXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBpcC1vbi10b3AiLAogICJ1dWlkIjogInBpcC1vbi10b3BAcmFmb3N0YXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"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", "link": "https://extensions.gnome.org/extension/4688/focus-follows-workspace/", "shell_version_map": {"41": {"version": "3", "sha256": "0hvfl7ip07cvnbgk1yc10x11yc80x7mqwxgrayfl1n7qw6j0b4lv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NocmlzdG9waGVyLWwvZm9jdXMtZm9sbG93cy13b3Jrc3BhY2UiLAogICJ1dWlkIjogImZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlQGNocmlzdG9waGVyLmx1ZWJiZW1laWVyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "0hvfl7ip07cvnbgk1yc10x11yc80x7mqwxgrayfl1n7qw6j0b4lv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NocmlzdG9waGVyLWwvZm9jdXMtZm9sbG93cy13b3Jrc3BhY2UiLAogICJ1dWlkIjogImZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlQGNocmlzdG9waGVyLmx1ZWJiZW1laWVyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "0hvfl7ip07cvnbgk1yc10x11yc80x7mqwxgrayfl1n7qw6j0b4lv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NocmlzdG9waGVyLWwvZm9jdXMtZm9sbG93cy13b3Jrc3BhY2UiLAogICJ1dWlkIjogImZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlQGNocmlzdG9waGVyLmx1ZWJiZW1laWVyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"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": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "5", "sha256": "1z0alar9zlxd13klapnfggpsiws77pjfjhb1p3fymak4h492k3ra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhZm9zdGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waXAtb24tdG9wIiwKICAidXVpZCI6ICJwaXAtb24tdG9wQHJhZm9zdGFyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "43": {"version": "5", "sha256": "1z0alar9zlxd13klapnfggpsiws77pjfjhb1p3fymak4h492k3ra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhZm9zdGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waXAtb24tdG9wIiwKICAidXVpZCI6ICJwaXAtb24tdG9wQHJhZm9zdGFyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"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": "20", "sha256": "044a1vp619lvxrnxiv4af2z4m9x18aqhp97g22wh4y3h8ns5ds8h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvcm91bmRlZC1zeXN0ZW0tbWVudS1idXR0b25zIiwKICAidXVpZCI6ICJyb3VuZGVkU3lzdGVtTWVudUJ1dHRvbnNAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIwCn0="}, "41": {"version": "20", "sha256": "044a1vp619lvxrnxiv4af2z4m9x18aqhp97g22wh4y3h8ns5ds8h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvcm91bmRlZC1zeXN0ZW0tbWVudS1idXR0b25zIiwKICAidXVpZCI6ICJyb3VuZGVkU3lzdGVtTWVudUJ1dHRvbnNAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIwCn0="}, "42": {"version": "20", "sha256": "044a1vp619lvxrnxiv4af2z4m9x18aqhp97g22wh4y3h8ns5ds8h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvcm91bmRlZC1zeXN0ZW0tbWVudS1idXR0b25zIiwKICAidXVpZCI6ICJyb3VuZGVkU3lzdGVtTWVudUJ1dHRvbnNAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIwCn0="}}} , {"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": "3", "sha256": "06ndnyv988v6m2rns8rf56axygh2hj00l5103fqkrgq122cvxw02", "metadata": "ewogICAgIm5hbWUiIDogIlN0YXRpYyBiYWNrZ3JvdW5kIGluIG92ZXJ2aWV3IiwKICAgICJkZXNjcmlwdGlvbiIgOiAiVGhlIGJhY2tncm91bmQsIGFsd2F5cyBjbGVhcmx5IHZpc2libGUuIiwKICAgICJvcmlnaW5hbC1hdXRob3IiOiAicmVucy5hbHRodWlzQGdtYWlsLmNvbSIsCiAgICAic2hlbGwtdmVyc2lvbiIgOiBbCiAgICAgICAgIjQwIiwKICAgICAgICAiNDEiLAogICAgICAgICI0MiIKICAgIF0sCiAgICAidXJsIiA6ICJodHRwczovL2dpdGh1Yi5jb20vZHo0ay9nbm9tZS1zdGF0aWMtYmFja2dyb3VuZCIsCiAgICAidXVpZCIgOiAic3RhdGljLWJhY2tncm91bmRAZGVuaXpha3NpbXNlay5jb20iLAogICAgInZlcnNpb24iIDogMwp9Cg=="}, "41": {"version": "3", "sha256": "06ndnyv988v6m2rns8rf56axygh2hj00l5103fqkrgq122cvxw02", "metadata": "ewogICAgIm5hbWUiIDogIlN0YXRpYyBiYWNrZ3JvdW5kIGluIG92ZXJ2aWV3IiwKICAgICJkZXNjcmlwdGlvbiIgOiAiVGhlIGJhY2tncm91bmQsIGFsd2F5cyBjbGVhcmx5IHZpc2libGUuIiwKICAgICJvcmlnaW5hbC1hdXRob3IiOiAicmVucy5hbHRodWlzQGdtYWlsLmNvbSIsCiAgICAic2hlbGwtdmVyc2lvbiIgOiBbCiAgICAgICAgIjQwIiwKICAgICAgICAiNDEiLAogICAgICAgICI0MiIKICAgIF0sCiAgICAidXJsIiA6ICJodHRwczovL2dpdGh1Yi5jb20vZHo0ay9nbm9tZS1zdGF0aWMtYmFja2dyb3VuZCIsCiAgICAidXVpZCIgOiAic3RhdGljLWJhY2tncm91bmRAZGVuaXpha3NpbXNlay5jb20iLAogICAgInZlcnNpb24iIDogMwp9Cg=="}, "42": {"version": "3", "sha256": "06ndnyv988v6m2rns8rf56axygh2hj00l5103fqkrgq122cvxw02", "metadata": "ewogICAgIm5hbWUiIDogIlN0YXRpYyBiYWNrZ3JvdW5kIGluIG92ZXJ2aWV3IiwKICAgICJkZXNjcmlwdGlvbiIgOiAiVGhlIGJhY2tncm91bmQsIGFsd2F5cyBjbGVhcmx5IHZpc2libGUuIiwKICAgICJvcmlnaW5hbC1hdXRob3IiOiAicmVucy5hbHRodWlzQGdtYWlsLmNvbSIsCiAgICAic2hlbGwtdmVyc2lvbiIgOiBbCiAgICAgICAgIjQwIiwKICAgICAgICAiNDEiLAogICAgICAgICI0MiIKICAgIF0sCiAgICAidXJsIiA6ICJodHRwczovL2dpdGh1Yi5jb20vZHo0ay9nbm9tZS1zdGF0aWMtYmFja2dyb3VuZCIsCiAgICAidXVpZCIgOiAic3RhdGljLWJhY2tncm91bmRAZGVuaXpha3NpbXNlay5jb20iLAogICAgInZlcnNpb24iIDogMwp9Cg=="}}} -, {"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": "3", "sha256": "0rrcx03vljp9xzcsr3qa6wp2swhgcchx61lzr1fdq5y5g62g42iz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "0rrcx03vljp9xzcsr3qa6wp2swhgcchx61lzr1fdq5y5g62g42iz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "0rrcx03vljp9xzcsr3qa6wp2swhgcchx61lzr1fdq5y5g62g42iz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "0rrcx03vljp9xzcsr3qa6wp2swhgcchx61lzr1fdq5y5g62g42iz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "0rrcx03vljp9xzcsr3qa6wp2swhgcchx61lzr1fdq5y5g62g42iz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"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": "3", "sha256": "0rrcx03vljp9xzcsr3qa6wp2swhgcchx61lzr1fdq5y5g62g42iz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "7", "sha256": "0lw1qghggvvnxnkj41grc59v24bh73phj5rwi37lh973cs29yif1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0lw1qghggvvnxnkj41grc59v24bh73phj5rwi37lh973cs29yif1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "0lw1qghggvvnxnkj41grc59v24bh73phj5rwi37lh973cs29yif1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "43": {"version": "7", "sha256": "0lw1qghggvvnxnkj41grc59v24bh73phj5rwi37lh973cs29yif1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"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": "8", "sha256": "16xvdmlm7fgy81igyrxd29mfxih10f35vmiqcna8kvsnzxs77cp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmVsaXRhc2FsaS9nbm9tZS1hd2Vzb21lLXRpbGVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "16xvdmlm7fgy81igyrxd29mfxih10f35vmiqcna8kvsnzxs77cp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmVsaXRhc2FsaS9nbm9tZS1hd2Vzb21lLXRpbGVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "16xvdmlm7fgy81igyrxd29mfxih10f35vmiqcna8kvsnzxs77cp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmVsaXRhc2FsaS9nbm9tZS1hd2Vzb21lLXRpbGVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "16xvdmlm7fgy81igyrxd29mfxih10f35vmiqcna8kvsnzxs77cp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmVsaXRhc2FsaS9nbm9tZS1hd2Vzb21lLXRpbGVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} -, {"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. Scroll on the dock to change workspace. Some preferences in UI (thanks @rastersoft).\n\n I'm not notified of messages here, please report bugs only through GitHub.", "link": "https://extensions.gnome.org/extension/4703/dock-from-dash/", "shell_version_map": {"40": {"version": "58", "sha256": "0z4k8mc6dqfhr8p7irqwimxskcn51gnrj9pyk6fw101rmqb0xm72", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}, "41": {"version": "58", "sha256": "0z4k8mc6dqfhr8p7irqwimxskcn51gnrj9pyk6fw101rmqb0xm72", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}, "42": {"version": "58", "sha256": "0z4k8mc6dqfhr8p7irqwimxskcn51gnrj9pyk6fw101rmqb0xm72", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}, "43": {"version": "58", "sha256": "0z4k8mc6dqfhr8p7irqwimxskcn51gnrj9pyk6fw101rmqb0xm72", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}}} -, {"uuid": "another-window-session-manager@gmail.com", "name": "Another Window Session Manager", "pname": "another-window-session-manager", "description": "Close open windows gracefully and save them as a session. And you can restore them when necessary manually or automatically at startup. Most importantly, it supports both X11 and Wayland!\n\nMain features:\n- Close open windows gracefully\n- Close apps with multiple windows gracefully via `ydotool` so you don't lose sessions of this app. Please see https://github.com/nlpsuge/gnome-shell-extension-another-window-session-manager#how-to-restore-a-session-at-startup to learn how to make `Close by rules` work\n- Save open windows\n- Restore session(s)\n- Restore a session at startup. Please note that this feature is disabled by default. See https://github.com/nlpsuge/gnome-shell-extension-another-window-session-manager#how-to-restore-a-session-at-startup to learn how to enable and use it\n- Restore window state, including Always on Top, Always on Visible Workspace and maximization\n- Restore window workspace, size and position\n- Restore 2 column window tiling\n- Stash all supported window states so that those states will be restored after gnome shell restarts via `Alt+F2 then type r` or `killall -3 gnome-shell`.\n- Move windows to their own workspace according to a saved session\n- Support multi-monitor\n- Remove saved session to trash\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": "29", "sha256": "0x49f6j1jfk54aki0if1w5y6582p7dn486qc7aczbz304rq311va", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "41": {"version": "29", "sha256": "0x49f6j1jfk54aki0if1w5y6582p7dn486qc7aczbz304rq311va", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "42": {"version": "29", "sha256": "0x49f6j1jfk54aki0if1w5y6582p7dn486qc7aczbz304rq311va", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "43": {"version": "29", "sha256": "0x49f6j1jfk54aki0if1w5y6582p7dn486qc7aczbz304rq311va", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}}} +, {"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: intelligent minimize if one window is open, cycle if several windows are open. Scroll on the dock to change workspace. Some preferences in UI (thanks @rastersoft).\n\n I'm not notified of messages here, please report bugs only through GitHub.", "link": "https://extensions.gnome.org/extension/4703/dock-from-dash/", "shell_version_map": {"40": {"version": "62", "sha256": "1s5ml7hg04650l43yl4zm3nbqlfzcbkp58xik4f39v0s91scia2x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogaW50ZWxsaWdlbnQgbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBjeWNsZSBpZiBzZXZlcmFsIHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNjIKfQ=="}, "41": {"version": "62", "sha256": "1s5ml7hg04650l43yl4zm3nbqlfzcbkp58xik4f39v0s91scia2x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogaW50ZWxsaWdlbnQgbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBjeWNsZSBpZiBzZXZlcmFsIHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNjIKfQ=="}, "42": {"version": "62", "sha256": "1s5ml7hg04650l43yl4zm3nbqlfzcbkp58xik4f39v0s91scia2x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogaW50ZWxsaWdlbnQgbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBjeWNsZSBpZiBzZXZlcmFsIHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNjIKfQ=="}, "43": {"version": "62", "sha256": "1s5ml7hg04650l43yl4zm3nbqlfzcbkp58xik4f39v0s91scia2x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogaW50ZWxsaWdlbnQgbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBjeWNsZSBpZiBzZXZlcmFsIHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNjIKfQ=="}}} +, {"uuid": "another-window-session-manager@gmail.com", "name": "Another Window Session Manager", "pname": "another-window-session-manager", "description": "Close open windows gracefully and save them as a session. And you can restore them when necessary manually or automatically at startup. Most importantly, it supports both X11 and Wayland!\n\nMain features:\n- Close open windows gracefully\n- Close apps with multiple windows gracefully via `ydotool` so you don't lose sessions of this app. Please see https://github.com/nlpsuge/gnome-shell-extension-another-window-session-manager#how-to-restore-a-session-at-startup to learn how to make `Close by rules` work\n- Save open windows\n- Restore session(s)\n- Restore a session at startup. Please note that this feature is disabled by default. See https://github.com/nlpsuge/gnome-shell-extension-another-window-session-manager#how-to-restore-a-session-at-startup to learn how to enable and use it\n- Restore window state, including Always on Top, Always on Visible Workspace and maximization\n- Restore window workspace, size and position\n- Restore 2 column window tiling\n- Stash all supported window states so that those states will be restored after gnome shell restarts via `Alt+F2 then type r` or `killall -3 gnome-shell`.\n- Move windows to their own workspace according to a saved session\n- Support multi-monitor\n- Remove saved session to trash\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": "31", "sha256": "0sa8km3jchfizyf4w5gybxbc9l33bz4wyamywhbw6c5ifvbb7nny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "41": {"version": "31", "sha256": "0sa8km3jchfizyf4w5gybxbc9l33bz4wyamywhbw6c5ifvbb7nny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "42": {"version": "31", "sha256": "0sa8km3jchfizyf4w5gybxbc9l33bz4wyamywhbw6c5ifvbb7nny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "43": {"version": "31", "sha256": "0sa8km3jchfizyf4w5gybxbc9l33bz4wyamywhbw6c5ifvbb7nny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}}} , {"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": "3", "sha256": "048h90h8ckm0zzwjr4h5kv96gak1mzcpygv826l1pmll890ac3n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBNSU5fTlVNQkVSX1dPUktTUEFDRVMgdG8gMSBzbyB0aGVyZSBpcyBvbmx5IG9uZSBlbXB0eSB3b3Jrc3BhY2Ugd2hlbiB0aGVyZSBhcmUgbm8gd2luZG93cyBvcGVuLlxuXG5odHRwczovL2dpdGxhYi5jb20vZzM3ODYvcHJldmVudC1kb3VibGUtZW1wdHktd2luZG93IiwKICAibmFtZSI6ICJQcmV2ZW50IGRvdWJsZSBlbXB0eSB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInByZXZlbnQtZG91YmxlLWVtcHR5LXdpbmRvd0BzaWxsaWV3b3VzLm5sIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "048h90h8ckm0zzwjr4h5kv96gak1mzcpygv826l1pmll890ac3n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBNSU5fTlVNQkVSX1dPUktTUEFDRVMgdG8gMSBzbyB0aGVyZSBpcyBvbmx5IG9uZSBlbXB0eSB3b3Jrc3BhY2Ugd2hlbiB0aGVyZSBhcmUgbm8gd2luZG93cyBvcGVuLlxuXG5odHRwczovL2dpdGxhYi5jb20vZzM3ODYvcHJldmVudC1kb3VibGUtZW1wdHktd2luZG93IiwKICAibmFtZSI6ICJQcmV2ZW50IGRvdWJsZSBlbXB0eSB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInByZXZlbnQtZG91YmxlLWVtcHR5LXdpbmRvd0BzaWxsaWV3b3VzLm5sIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "048h90h8ckm0zzwjr4h5kv96gak1mzcpygv826l1pmll890ac3n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBNSU5fTlVNQkVSX1dPUktTUEFDRVMgdG8gMSBzbyB0aGVyZSBpcyBvbmx5IG9uZSBlbXB0eSB3b3Jrc3BhY2Ugd2hlbiB0aGVyZSBhcmUgbm8gd2luZG93cyBvcGVuLlxuXG5odHRwczovL2dpdGxhYi5jb20vZzM3ODYvcHJldmVudC1kb3VibGUtZW1wdHktd2luZG93IiwKICAibmFtZSI6ICJQcmV2ZW50IGRvdWJsZSBlbXB0eSB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInByZXZlbnQtZG91YmxlLWVtcHR5LXdpbmRvd0BzaWxsaWV3b3VzLm5sIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "048h90h8ckm0zzwjr4h5kv96gak1mzcpygv826l1pmll890ac3n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBNSU5fTlVNQkVSX1dPUktTUEFDRVMgdG8gMSBzbyB0aGVyZSBpcyBvbmx5IG9uZSBlbXB0eSB3b3Jrc3BhY2Ugd2hlbiB0aGVyZSBhcmUgbm8gd2luZG93cyBvcGVuLlxuXG5odHRwczovL2dpdGxhYi5jb20vZzM3ODYvcHJldmVudC1kb3VibGUtZW1wdHktd2luZG93IiwKICAibmFtZSI6ICJQcmV2ZW50IGRvdWJsZSBlbXB0eSB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInByZXZlbnQtZG91YmxlLWVtcHR5LXdpbmRvd0BzaWxsaWV3b3VzLm5sIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} -, {"uuid": "display-ddc-brightness-volume@sagrland.de", "name": "Display DDC Brightness Volume", "pname": "display-ddc-brightness-volume", "description": "Simple GNOME extension to control displays' brightness and audio volume via DDC. It requires ddcutil to be installed, i2c permissions for non-root users configured.", "link": "https://extensions.gnome.org/extension/4712/display-ddc-brightness-volume/", "shell_version_map": {"40": {"version": "6", "sha256": "0x3ih2fpwg4sf07wwygf0bjf8n1z32x90a09bzrfffjlycqwhbqd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzIFZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0x3ih2fpwg4sf07wwygf0bjf8n1z32x90a09bzrfffjlycqwhbqd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzIFZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "0x3ih2fpwg4sf07wwygf0bjf8n1z32x90a09bzrfffjlycqwhbqd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzIFZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "43": {"version": "6", "sha256": "0x3ih2fpwg4sf07wwygf0bjf8n1z32x90a09bzrfffjlycqwhbqd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzIFZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} +, {"uuid": "display-ddc-brightness-volume@sagrland.de", "name": "Display DDC Brightness Volume", "pname": "display-ddc-brightness-volume", "description": "Simple GNOME extension to control displays' brightness and audio volume via DDC. It requires ddcutil to be installed, i2c permissions for non-root users configured.", "link": "https://extensions.gnome.org/extension/4712/display-ddc-brightness-volume/", "shell_version_map": {"40": {"version": "8", "sha256": "1mkks185kv7ks3gjznffawjllw7lr2z4003hbarlb2k90qs8nif4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzIFZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "1mkks185kv7ks3gjznffawjllw7lr2z4003hbarlb2k90qs8nif4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzIFZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "42": {"version": "8", "sha256": "1mkks185kv7ks3gjznffawjllw7lr2z4003hbarlb2k90qs8nif4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzIFZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "43": {"version": "8", "sha256": "1mkks185kv7ks3gjznffawjllw7lr2z4003hbarlb2k90qs8nif4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzIFZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"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.\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": "2", "sha256": "1nd538h9g8l18v0vw29ishilxpj0a7p6np281blqxwssix2dqn5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuIiwKICAibmFtZSI6ICJEaXNhYmxlIEhvdmVyIE9uIEFwcCAmIFdpbmRvdyBTd2l0Y2hlciBQb3B1cHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "1nd538h9g8l18v0vw29ishilxpj0a7p6np281blqxwssix2dqn5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuIiwKICAibmFtZSI6ICJEaXNhYmxlIEhvdmVyIE9uIEFwcCAmIFdpbmRvdyBTd2l0Y2hlciBQb3B1cHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "1nd538h9g8l18v0vw29ishilxpj0a7p6np281blqxwssix2dqn5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuIiwKICAibmFtZSI6ICJEaXNhYmxlIEhvdmVyIE9uIEFwcCAmIFdpbmRvdyBTd2l0Y2hlciBQb3B1cHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "1nd538h9g8l18v0vw29ishilxpj0a7p6np281blqxwssix2dqn5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuIiwKICAibmFtZSI6ICJEaXNhYmxlIEhvdmVyIE9uIEFwcCAmIFdpbmRvdyBTd2l0Y2hlciBQb3B1cHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"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": "Adds dbus calls which can return list of windows, move, resize, close them etc", "link": "https://extensions.gnome.org/extension/4724/window-calls/", "shell_version_map": {"40": {"version": "12", "sha256": "08gsyi51f0c3wdi0r3y1ykja9avdkyaplzd7vd8fydlsh4bya18g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgZGJ1cyBjYWxscyB3aGljaCBjYW4gcmV0dXJuIGxpc3Qgb2Ygd2luZG93cywgbW92ZSwgcmVzaXplLCBjbG9zZSB0aGVtIGV0YyIsCiAgIm5hbWUiOiAiV2luZG93IENhbGxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lja3lpY2t5L3dpbmRvdy1jYWxscyIsCiAgInV1aWQiOiAid2luZG93LWNhbGxzQGRvbWFuZG9tYW4ueHl6IiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "08gsyi51f0c3wdi0r3y1ykja9avdkyaplzd7vd8fydlsh4bya18g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgZGJ1cyBjYWxscyB3aGljaCBjYW4gcmV0dXJuIGxpc3Qgb2Ygd2luZG93cywgbW92ZSwgcmVzaXplLCBjbG9zZSB0aGVtIGV0YyIsCiAgIm5hbWUiOiAiV2luZG93IENhbGxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lja3lpY2t5L3dpbmRvdy1jYWxscyIsCiAgInV1aWQiOiAid2luZG93LWNhbGxzQGRvbWFuZG9tYW4ueHl6IiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "12", "sha256": "08gsyi51f0c3wdi0r3y1ykja9avdkyaplzd7vd8fydlsh4bya18g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgZGJ1cyBjYWxscyB3aGljaCBjYW4gcmV0dXJuIGxpc3Qgb2Ygd2luZG93cywgbW92ZSwgcmVzaXplLCBjbG9zZSB0aGVtIGV0YyIsCiAgIm5hbWUiOiAiV2luZG93IENhbGxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lja3lpY2t5L3dpbmRvdy1jYWxscyIsCiAgInV1aWQiOiAid2luZG93LWNhbGxzQGRvbWFuZG9tYW4ueHl6IiwKICAidmVyc2lvbiI6IDEyCn0="}, "43": {"version": "12", "sha256": "08gsyi51f0c3wdi0r3y1ykja9avdkyaplzd7vd8fydlsh4bya18g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgZGJ1cyBjYWxscyB3aGljaCBjYW4gcmV0dXJuIGxpc3Qgb2Ygd2luZG93cywgbW92ZSwgcmVzaXplLCBjbG9zZSB0aGVtIGV0YyIsCiAgIm5hbWUiOiAiV2luZG93IENhbGxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lja3lpY2t5L3dpbmRvdy1jYWxscyIsCiAgInV1aWQiOiAid2luZG93LWNhbGxzQGRvbWFuZG9tYW4ueHl6IiwKICAidmVyc2lvbiI6IDEyCn0="}}} , {"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": "4", "sha256": "0dj9lkvi6qwwiwx8bhj5d8d3v5msrynqv8lfi31cgb9an72rc23y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc2FnaWRheWFuL3ByaW1hcnktaW5wdXQtb24tbG9ja3NjcmVlbiIsCiAgInV1aWQiOiAicHJpbWFyeV9pbnB1dF9vbl9sb2Nrc2NyZWVuQHNhZ2lkYXlhbi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0dj9lkvi6qwwiwx8bhj5d8d3v5msrynqv8lfi31cgb9an72rc23y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc2FnaWRheWFuL3ByaW1hcnktaW5wdXQtb24tbG9ja3NjcmVlbiIsCiAgInV1aWQiOiAicHJpbWFyeV9pbnB1dF9vbl9sb2Nrc2NyZWVuQHNhZ2lkYXlhbi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "0dj9lkvi6qwwiwx8bhj5d8d3v5msrynqv8lfi31cgb9an72rc23y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc2FnaWRheWFuL3ByaW1hcnktaW5wdXQtb24tbG9ja3NjcmVlbiIsCiAgInV1aWQiOiAicHJpbWFyeV9pbnB1dF9vbl9sb2Nrc2NyZWVuQHNhZ2lkYXlhbi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "43": {"version": "4", "sha256": "0dj9lkvi6qwwiwx8bhj5d8d3v5msrynqv8lfi31cgb9an72rc23y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc2FnaWRheWFuL3ByaW1hcnktaW5wdXQtb24tbG9ja3NjcmVlbiIsCiAgInV1aWQiOiAicHJpbWFyeV9pbnB1dF9vbl9sb2Nrc2NyZWVuQHNhZ2lkYXlhbi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} -, {"uuid": "browser-tabs@com.github.harshadgavali", "name": "Browser tabs", "pname": "browser-tabs", "description": "Search and switch to browser tabs using GNOME overview/ArcMenu\n\nSee following github link for installing necessary browser extension and host app!", "link": "https://extensions.gnome.org/extension/4733/browser-tabs/", "shell_version_map": {"40": {"version": "4", "sha256": "1r1m6cfi9pv0sz651b95ji2rk40rhwmdnivq2jaf030w3qrkwysf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgc3dpdGNoIHRvIGJyb3dzZXIgdGFicyB1c2luZyBHTk9NRSBvdmVydmlldy9BcmNNZW51XG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgbmVjZXNzYXJ5IGJyb3dzZXIgZXh0ZW5zaW9uIGFuZCBob3N0IGFwcCEiLAogICJuYW1lIjogIkJyb3dzZXIgdGFicyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcnNoYWRnYXZhbGkvc2VhcmNocHJvdmlkZXItZm9yLWJyb3dzZXItdGFicy5naXQvIiwKICAidXVpZCI6ICJicm93c2VyLXRhYnNAY29tLmdpdGh1Yi5oYXJzaGFkZ2F2YWxpIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1r1m6cfi9pv0sz651b95ji2rk40rhwmdnivq2jaf030w3qrkwysf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgc3dpdGNoIHRvIGJyb3dzZXIgdGFicyB1c2luZyBHTk9NRSBvdmVydmlldy9BcmNNZW51XG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgbmVjZXNzYXJ5IGJyb3dzZXIgZXh0ZW5zaW9uIGFuZCBob3N0IGFwcCEiLAogICJuYW1lIjogIkJyb3dzZXIgdGFicyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcnNoYWRnYXZhbGkvc2VhcmNocHJvdmlkZXItZm9yLWJyb3dzZXItdGFicy5naXQvIiwKICAidXVpZCI6ICJicm93c2VyLXRhYnNAY29tLmdpdGh1Yi5oYXJzaGFkZ2F2YWxpIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "1r1m6cfi9pv0sz651b95ji2rk40rhwmdnivq2jaf030w3qrkwysf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgc3dpdGNoIHRvIGJyb3dzZXIgdGFicyB1c2luZyBHTk9NRSBvdmVydmlldy9BcmNNZW51XG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgbmVjZXNzYXJ5IGJyb3dzZXIgZXh0ZW5zaW9uIGFuZCBob3N0IGFwcCEiLAogICJuYW1lIjogIkJyb3dzZXIgdGFicyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcnNoYWRnYXZhbGkvc2VhcmNocHJvdmlkZXItZm9yLWJyb3dzZXItdGFicy5naXQvIiwKICAidXVpZCI6ICJicm93c2VyLXRhYnNAY29tLmdpdGh1Yi5oYXJzaGFkZ2F2YWxpIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"uuid": "browser-tabs@com.github.harshadgavali", "name": "Browser tabs", "pname": "browser-tabs", "description": "Search and switch to browser tabs using GNOME overview/ArcMenu\n\nSee following github link for installing necessary browser extension and host app!", "link": "https://extensions.gnome.org/extension/4733/browser-tabs/", "shell_version_map": {"40": {"version": "4", "sha256": "1r1m6cfi9pv0sz651b95ji2rk40rhwmdnivq2jaf030w3qrkwysf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgc3dpdGNoIHRvIGJyb3dzZXIgdGFicyB1c2luZyBHTk9NRSBvdmVydmlldy9BcmNNZW51XG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgbmVjZXNzYXJ5IGJyb3dzZXIgZXh0ZW5zaW9uIGFuZCBob3N0IGFwcCEiLAogICJuYW1lIjogIkJyb3dzZXIgdGFicyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcnNoYWRnYXZhbGkvc2VhcmNocHJvdmlkZXItZm9yLWJyb3dzZXItdGFicy5naXQvIiwKICAidXVpZCI6ICJicm93c2VyLXRhYnNAY29tLmdpdGh1Yi5oYXJzaGFkZ2F2YWxpIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1r1m6cfi9pv0sz651b95ji2rk40rhwmdnivq2jaf030w3qrkwysf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgc3dpdGNoIHRvIGJyb3dzZXIgdGFicyB1c2luZyBHTk9NRSBvdmVydmlldy9BcmNNZW51XG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgbmVjZXNzYXJ5IGJyb3dzZXIgZXh0ZW5zaW9uIGFuZCBob3N0IGFwcCEiLAogICJuYW1lIjogIkJyb3dzZXIgdGFicyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcnNoYWRnYXZhbGkvc2VhcmNocHJvdmlkZXItZm9yLWJyb3dzZXItdGFicy5naXQvIiwKICAidXVpZCI6ICJicm93c2VyLXRhYnNAY29tLmdpdGh1Yi5oYXJzaGFkZ2F2YWxpIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "1r1m6cfi9pv0sz651b95ji2rk40rhwmdnivq2jaf030w3qrkwysf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgc3dpdGNoIHRvIGJyb3dzZXIgdGFicyB1c2luZyBHTk9NRSBvdmVydmlldy9BcmNNZW51XG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgbmVjZXNzYXJ5IGJyb3dzZXIgZXh0ZW5zaW9uIGFuZCBob3N0IGFwcCEiLAogICJuYW1lIjogIkJyb3dzZXIgdGFicyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcnNoYWRnYXZhbGkvc2VhcmNocHJvdmlkZXItZm9yLWJyb3dzZXItdGFicy5naXQvIiwKICAidXVpZCI6ICJicm93c2VyLXRhYnNAY29tLmdpdGh1Yi5oYXJzaGFkZ2F2YWxpIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "5", "sha256": "0lza6kbywaflzkqkkqvrhj9b66a7v89in86z9mvp156sz49f8zwg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgc3dpdGNoIHRvIGJyb3dzZXIgdGFicyB1c2luZyBHTk9NRSBvdmVydmlldy9BcmNNZW51XG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgbmVjZXNzYXJ5IGJyb3dzZXIgZXh0ZW5zaW9uIGFuZCBob3N0IGFwcCEiLAogICJuYW1lIjogIkJyb3dzZXIgdGFicyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL3NlYXJjaHByb3ZpZGVyLWZvci1icm93c2VyLXRhYnMuZ2l0LyIsCiAgInV1aWQiOiAiYnJvd3Nlci10YWJzQGNvbS5naXRodWIuaGFyc2hhZGdhdmFsaSIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"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": "17", "sha256": "07h7vx2l4yvvfh4blkaxqd2h30v398d5478qb7gjh94cs7n4hgqf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2toaW1hcm9zL3NtYXJ0LWF1dG8tbW92ZSIsCiAgInV1aWQiOiAic21hcnQtYXV0by1tb3ZlQGtoaW1hcm9zLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "42": {"version": "17", "sha256": "07h7vx2l4yvvfh4blkaxqd2h30v398d5478qb7gjh94cs7n4hgqf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2toaW1hcm9zL3NtYXJ0LWF1dG8tbW92ZSIsCiAgInV1aWQiOiAic21hcnQtYXV0by1tb3ZlQGtoaW1hcm9zLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "43": {"version": "17", "sha256": "07h7vx2l4yvvfh4blkaxqd2h30v398d5478qb7gjh94cs7n4hgqf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2toaW1hcm9zL3NtYXJ0LWF1dG8tbW92ZSIsCiAgInV1aWQiOiAic21hcnQtYXV0by1tb3ZlQGtoaW1hcm9zLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}}} -, {"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.\nDutch language support added by Vistaus (Heimen Stoffels) https://github.com/Vistaus", "link": "https://extensions.gnome.org/extension/4739/alternate-menu-for-hplip2/", "shell_version_map": {"40": {"version": "7", "sha256": "06g0p9l5yg6anppmlydlzbmqzplj3v959bvz7p2zj2vm9ly6p55a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cbkR1dGNoIGxhbmd1YWdlIHN1cHBvcnQgYWRkZWQgYnkgVmlzdGF1cyAoSGVpbWVuIFN0b2ZmZWxzKSBodHRwczovL2dpdGh1Yi5jb20vVmlzdGF1cyIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwMiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ocGxpcC1tZW51MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ncml6emx5c21pdC9ocGxpcC1tZW51Mi1ncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidXVpZCI6ICJocGxpcC1tZW51MkBncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "06g0p9l5yg6anppmlydlzbmqzplj3v959bvz7p2zj2vm9ly6p55a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cbkR1dGNoIGxhbmd1YWdlIHN1cHBvcnQgYWRkZWQgYnkgVmlzdGF1cyAoSGVpbWVuIFN0b2ZmZWxzKSBodHRwczovL2dpdGh1Yi5jb20vVmlzdGF1cyIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwMiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ocGxpcC1tZW51MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ncml6emx5c21pdC9ocGxpcC1tZW51Mi1ncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidXVpZCI6ICJocGxpcC1tZW51MkBncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "06g0p9l5yg6anppmlydlzbmqzplj3v959bvz7p2zj2vm9ly6p55a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cbkR1dGNoIGxhbmd1YWdlIHN1cHBvcnQgYWRkZWQgYnkgVmlzdGF1cyAoSGVpbWVuIFN0b2ZmZWxzKSBodHRwczovL2dpdGh1Yi5jb20vVmlzdGF1cyIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwMiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ocGxpcC1tZW51MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ncml6emx5c21pdC9ocGxpcC1tZW51Mi1ncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidXVpZCI6ICJocGxpcC1tZW51MkBncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "43": {"version": "7", "sha256": "06g0p9l5yg6anppmlydlzbmqzplj3v959bvz7p2zj2vm9ly6p55a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cbkR1dGNoIGxhbmd1YWdlIHN1cHBvcnQgYWRkZWQgYnkgVmlzdGF1cyAoSGVpbWVuIFN0b2ZmZWxzKSBodHRwczovL2dpdGh1Yi5jb20vVmlzdGF1cyIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwMiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ocGxpcC1tZW51MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ncml6emx5c21pdC9ocGxpcC1tZW51Mi1ncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidXVpZCI6ICJocGxpcC1tZW51MkBncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidmVyc2lvbiI6IDcKfQ=="}}} +, {"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.\n\nDutch language support added by Vistaus (Heimen Stoffels) https://github.com/Vistaus\n\nyou'll need to restart gnome-shell after upgrades so either reboot,\nlog out and back in again, or if your using X11 then alt+F2 then run r", "link": "https://extensions.gnome.org/extension/4739/alternate-menu-for-hplip2/", "shell_version_map": {"40": {"version": "10", "sha256": "0jqjdkirfm8hrvx1aalm6ffpadsmr7bvb09whn7jh75wfliblkcn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3JpenpseXNtaXQvaHBsaXAtbWVudTItZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInV1aWQiOiAiaHBsaXAtbWVudTJAZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0jqjdkirfm8hrvx1aalm6ffpadsmr7bvb09whn7jh75wfliblkcn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3JpenpseXNtaXQvaHBsaXAtbWVudTItZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInV1aWQiOiAiaHBsaXAtbWVudTJAZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "0jqjdkirfm8hrvx1aalm6ffpadsmr7bvb09whn7jh75wfliblkcn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3JpenpseXNtaXQvaHBsaXAtbWVudTItZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInV1aWQiOiAiaHBsaXAtbWVudTJAZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "10", "sha256": "0jqjdkirfm8hrvx1aalm6ffpadsmr7bvb09whn7jh75wfliblkcn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3JpenpseXNtaXQvaHBsaXAtbWVudTItZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInV1aWQiOiAiaHBsaXAtbWVudTJAZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"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 Scroll on dock or panel changes workspace. Preferences UI.\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": "3", "sha256": "10lcxqkg9i7gjvgdb01b6fahj5yr7c614yj4jcz9ywi5v571b1hw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBkb2NrIGZvciBHTk9NRSA0MCsuIEhvdmVyIHRvcCBwYW5lbCBhbmQgR05PTUUgU2hlbGwgZGFzaCBhcHBlYXJzIHdpdGhvdXQgb3ZlcnZpZXcuXG5cbiBTY3JvbGwgb24gZG9jayBvciBwYW5lbCBjaGFuZ2VzIHdvcmtzcGFjZS4gUHJlZmVyZW5jZXMgVUkuXG5cbiBEb2VzIHVzZSBuYXRpdmUgR05PTUUgU2hlbGwgRGFzaC4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEYXNoIGZyb20gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2gtZnJvbS1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC1mcm9tLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "10lcxqkg9i7gjvgdb01b6fahj5yr7c614yj4jcz9ywi5v571b1hw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBkb2NrIGZvciBHTk9NRSA0MCsuIEhvdmVyIHRvcCBwYW5lbCBhbmQgR05PTUUgU2hlbGwgZGFzaCBhcHBlYXJzIHdpdGhvdXQgb3ZlcnZpZXcuXG5cbiBTY3JvbGwgb24gZG9jayBvciBwYW5lbCBjaGFuZ2VzIHdvcmtzcGFjZS4gUHJlZmVyZW5jZXMgVUkuXG5cbiBEb2VzIHVzZSBuYXRpdmUgR05PTUUgU2hlbGwgRGFzaC4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEYXNoIGZyb20gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2gtZnJvbS1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC1mcm9tLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "10lcxqkg9i7gjvgdb01b6fahj5yr7c614yj4jcz9ywi5v571b1hw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBkb2NrIGZvciBHTk9NRSA0MCsuIEhvdmVyIHRvcCBwYW5lbCBhbmQgR05PTUUgU2hlbGwgZGFzaCBhcHBlYXJzIHdpdGhvdXQgb3ZlcnZpZXcuXG5cbiBTY3JvbGwgb24gZG9jayBvciBwYW5lbCBjaGFuZ2VzIHdvcmtzcGFjZS4gUHJlZmVyZW5jZXMgVUkuXG5cbiBEb2VzIHVzZSBuYXRpdmUgR05PTUUgU2hlbGwgRGFzaC4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEYXNoIGZyb20gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2gtZnJvbS1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC1mcm9tLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"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": "0i5gcmxxl8p0zfh6jbdrhb6s4dw7wrfl74h0z527zwfzb454yj20", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogVHJhbnNsYXRlIGZyb20gQ2xpcGJvYXJkIGNvbnRlbnQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLXRyYW5zbGF0b3IiLAogICJuYW1lIjogIkNsaXAgVHJhbnNsYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLWNsaXAtdHJhbnNsYXRvciIsCiAgInV1aWQiOiAiY2xpcC10cmFuc2xhdG9yQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "0i5gcmxxl8p0zfh6jbdrhb6s4dw7wrfl74h0z527zwfzb454yj20", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogVHJhbnNsYXRlIGZyb20gQ2xpcGJvYXJkIGNvbnRlbnQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLXRyYW5zbGF0b3IiLAogICJuYW1lIjogIkNsaXAgVHJhbnNsYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLWNsaXAtdHJhbnNsYXRvciIsCiAgInV1aWQiOiAiY2xpcC10cmFuc2xhdG9yQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "42": {"version": "13", "sha256": "0i5gcmxxl8p0zfh6jbdrhb6s4dw7wrfl74h0z527zwfzb454yj20", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogVHJhbnNsYXRlIGZyb20gQ2xpcGJvYXJkIGNvbnRlbnQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLXRyYW5zbGF0b3IiLAogICJuYW1lIjogIkNsaXAgVHJhbnNsYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLWNsaXAtdHJhbnNsYXRvciIsCiAgInV1aWQiOiAiY2xpcC10cmFuc2xhdG9yQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} , {"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": "5", "sha256": "0bg0dsmx89ndf6gkhhqy8av6jvcgfzdnnalj51vvcgcprz5msm5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnVzcmFjYWdsaXlhbi9Hbm9tZS1FeHRlbnNpb24tRXhhbXBsZXMvdHJlZS9tYWluL2hpZGVkYXRlJTQwaGlkZWRhdGUuY29tIiwKICAidXVpZCI6ICJoaWRlZGF0ZUBoaWRlZGF0ZS5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "0bg0dsmx89ndf6gkhhqy8av6jvcgfzdnnalj51vvcgcprz5msm5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnVzcmFjYWdsaXlhbi9Hbm9tZS1FeHRlbnNpb24tRXhhbXBsZXMvdHJlZS9tYWluL2hpZGVkYXRlJTQwaGlkZWRhdGUuY29tIiwKICAidXVpZCI6ICJoaWRlZGF0ZUBoaWRlZGF0ZS5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "0bg0dsmx89ndf6gkhhqy8av6jvcgfzdnnalj51vvcgcprz5msm5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnVzcmFjYWdsaXlhbi9Hbm9tZS1FeHRlbnNpb24tRXhhbXBsZXMvdHJlZS9tYWluL2hpZGVkYXRlJTQwaGlkZWRhdGUuY29tIiwKICAidXVpZCI6ICJoaWRlZGF0ZUBoaWRlZGF0ZS5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "5", "sha256": "0bg0dsmx89ndf6gkhhqy8av6jvcgfzdnnalj51vvcgcprz5msm5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnVzcmFjYWdsaXlhbi9Hbm9tZS1FeHRlbnNpb24tRXhhbXBsZXMvdHJlZS9tYWluL2hpZGVkYXRlJTQwaGlkZWRhdGUuY29tIiwKICAidXVpZCI6ICJoaWRlZGF0ZUBoaWRlZGF0ZS5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"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 a 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 https://github.com/mijorus/toggle-imwheel", "link": "https://extensions.gnome.org/extension/4748/toggle-imwheel/", "shell_version_map": {"40": {"version": "8", "sha256": "0wlb32ml77hwzh1wln0zzscc44pagga15wnwv9fa17jdi0z78pla", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2ltcGxlIGV4dGVuc2lvbiB3YW50cyB0byBtaXRpZ2F0ZSB0aGUgbGFjayBvZiBhIGRlZGljYXRlZCBtb3VzZSB3aGVlbCBjb250cm9sIG9uIG1vc3Qgb2YgdGhlIG1vZGVybiBsaW51eCBkaXN0cmlidXRpb25zLiBNYW55IGFyZSB1c2luZyBpbXdoZWVsIGFzIGEgdGVtcG9yYXJ5IGZpeDsgaG93ZXZlciwgaWYgeW91IGFyZSB1c2luZyBhIGxhcHRvcCwgeW91IG1pZ2h0IHdhbnQgdG8gaGF2ZSB0d28gZGlmZmVyZW50IHNldHRpbmdzIGZvciB0aGUgdG91Y2hwYWQgYW5kIHRoZSBtb3VzZS4gXG4gVGhpcyBleHRlbnNpb24gd2lsbCBhZGQgYW4gaWNvbiBpbiB0aGUgdG9wIGJhciB3aGljaCBsZXRzIHlvdSB0b2dnbGUgaW13aGVlbCBiZXR3ZWVuIHR3byBjdXN0b20gc2V0dGluZ3MuIFxuIGh0dHBzOi8vZ2l0aHViLmNvbS9taWpvcnVzL3RvZ2dsZS1pbXdoZWVsIiwKICAibmFtZSI6ICJUb2dnbGUgaW13aGVlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0b2dnbGVpbXdoZWVsQG1pam9ydXMuaXQiLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "0wlb32ml77hwzh1wln0zzscc44pagga15wnwv9fa17jdi0z78pla", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2ltcGxlIGV4dGVuc2lvbiB3YW50cyB0byBtaXRpZ2F0ZSB0aGUgbGFjayBvZiBhIGRlZGljYXRlZCBtb3VzZSB3aGVlbCBjb250cm9sIG9uIG1vc3Qgb2YgdGhlIG1vZGVybiBsaW51eCBkaXN0cmlidXRpb25zLiBNYW55IGFyZSB1c2luZyBpbXdoZWVsIGFzIGEgdGVtcG9yYXJ5IGZpeDsgaG93ZXZlciwgaWYgeW91IGFyZSB1c2luZyBhIGxhcHRvcCwgeW91IG1pZ2h0IHdhbnQgdG8gaGF2ZSB0d28gZGlmZmVyZW50IHNldHRpbmdzIGZvciB0aGUgdG91Y2hwYWQgYW5kIHRoZSBtb3VzZS4gXG4gVGhpcyBleHRlbnNpb24gd2lsbCBhZGQgYW4gaWNvbiBpbiB0aGUgdG9wIGJhciB3aGljaCBsZXRzIHlvdSB0b2dnbGUgaW13aGVlbCBiZXR3ZWVuIHR3byBjdXN0b20gc2V0dGluZ3MuIFxuIGh0dHBzOi8vZ2l0aHViLmNvbS9taWpvcnVzL3RvZ2dsZS1pbXdoZWVsIiwKICAibmFtZSI6ICJUb2dnbGUgaW13aGVlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0b2dnbGVpbXdoZWVsQG1pam9ydXMuaXQiLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "0wlb32ml77hwzh1wln0zzscc44pagga15wnwv9fa17jdi0z78pla", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2ltcGxlIGV4dGVuc2lvbiB3YW50cyB0byBtaXRpZ2F0ZSB0aGUgbGFjayBvZiBhIGRlZGljYXRlZCBtb3VzZSB3aGVlbCBjb250cm9sIG9uIG1vc3Qgb2YgdGhlIG1vZGVybiBsaW51eCBkaXN0cmlidXRpb25zLiBNYW55IGFyZSB1c2luZyBpbXdoZWVsIGFzIGEgdGVtcG9yYXJ5IGZpeDsgaG93ZXZlciwgaWYgeW91IGFyZSB1c2luZyBhIGxhcHRvcCwgeW91IG1pZ2h0IHdhbnQgdG8gaGF2ZSB0d28gZGlmZmVyZW50IHNldHRpbmdzIGZvciB0aGUgdG91Y2hwYWQgYW5kIHRoZSBtb3VzZS4gXG4gVGhpcyBleHRlbnNpb24gd2lsbCBhZGQgYW4gaWNvbiBpbiB0aGUgdG9wIGJhciB3aGljaCBsZXRzIHlvdSB0b2dnbGUgaW13aGVlbCBiZXR3ZWVuIHR3byBjdXN0b20gc2V0dGluZ3MuIFxuIGh0dHBzOi8vZ2l0aHViLmNvbS9taWpvcnVzL3RvZ2dsZS1pbXdoZWVsIiwKICAibmFtZSI6ICJUb2dnbGUgaW13aGVlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0b2dnbGVpbXdoZWVsQG1pam9ydXMuaXQiLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"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": "6", "sha256": "069fk11nr2nnssyb8ljzdf3xb15lvbgny2jp8skq1ky7w8k7a0cx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxiZXJ0dmFrYS95YWt1YWtlLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAieWFrdWFrZS1leHRlbnNpb25Aa2RlLm9yZyIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "069fk11nr2nnssyb8ljzdf3xb15lvbgny2jp8skq1ky7w8k7a0cx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxiZXJ0dmFrYS95YWt1YWtlLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAieWFrdWFrZS1leHRlbnNpb25Aa2RlLm9yZyIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "069fk11nr2nnssyb8ljzdf3xb15lvbgny2jp8skq1ky7w8k7a0cx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxiZXJ0dmFrYS95YWt1YWtlLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAieWFrdWFrZS1leHRlbnNpb25Aa2RlLm9yZyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"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": {"40": {"version": "7", "sha256": "1snlqcyv39z02ml400qa1i7mcznpf88g3fzd4gvhc1fj3h8i6frn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MdWtlVmFkZXItSVYvZ25vbWUtc3BlZWQtYmFja2dyb3VuZC1leHRlbnNpb24vIiwKICAidXVpZCI6ICJzcGVlZGJhY2tncm91bmRAbHVrZS52YWRlciIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1snlqcyv39z02ml400qa1i7mcznpf88g3fzd4gvhc1fj3h8i6frn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MdWtlVmFkZXItSVYvZ25vbWUtc3BlZWQtYmFja2dyb3VuZC1leHRlbnNpb24vIiwKICAidXVpZCI6ICJzcGVlZGJhY2tncm91bmRAbHVrZS52YWRlciIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "7", "sha256": "1snlqcyv39z02ml400qa1i7mcznpf88g3fzd4gvhc1fj3h8i6frn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MdWtlVmFkZXItSVYvZ25vbWUtc3BlZWQtYmFja2dyb3VuZC1leHRlbnNpb24vIiwKICAidXVpZCI6ICJzcGVlZGJhY2tncm91bmRAbHVrZS52YWRlciIsCiAgInZlcnNpb24iOiA3Cn0="}, "43": {"version": "7", "sha256": "1snlqcyv39z02ml400qa1i7mcznpf88g3fzd4gvhc1fj3h8i6frn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MdWtlVmFkZXItSVYvZ25vbWUtc3BlZWQtYmFja2dyb3VuZC1leHRlbnNpb24vIiwKICAidXVpZCI6ICJzcGVlZGJhY2tncm91bmRAbHVrZS52YWRlciIsCiAgInZlcnNpb24iOiA3Cn0="}}} +, {"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": {"40": {"version": "9", "sha256": "1b21kww4wim3gs3kmwhchqj5daccisl1bwvj3jf3b630wa8j6x0m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTHVrZVZhZGVyLUlWL2dub21lLXNwZWVkLWJhY2tncm91bmQtZXh0ZW5zaW9uLyIsCiAgInV1aWQiOiAic3BlZWRiYWNrZ3JvdW5kQGx1a2UudmFkZXIiLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "1b21kww4wim3gs3kmwhchqj5daccisl1bwvj3jf3b630wa8j6x0m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTHVrZVZhZGVyLUlWL2dub21lLXNwZWVkLWJhY2tncm91bmQtZXh0ZW5zaW9uLyIsCiAgInV1aWQiOiAic3BlZWRiYWNrZ3JvdW5kQGx1a2UudmFkZXIiLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "1b21kww4wim3gs3kmwhchqj5daccisl1bwvj3jf3b630wa8j6x0m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTHVrZVZhZGVyLUlWL2dub21lLXNwZWVkLWJhY2tncm91bmQtZXh0ZW5zaW9uLyIsCiAgInV1aWQiOiAic3BlZWRiYWNrZ3JvdW5kQGx1a2UudmFkZXIiLAogICJ2ZXJzaW9uIjogOQp9"}, "43": {"version": "9", "sha256": "1b21kww4wim3gs3kmwhchqj5daccisl1bwvj3jf3b630wa8j6x0m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTHVrZVZhZGVyLUlWL2dub21lLXNwZWVkLWJhY2tncm91bmQtZXh0ZW5zaW9uLyIsCiAgInV1aWQiOiAic3BlZWRiYWNrZ3JvdW5kQGx1a2UudmFkZXIiLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"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 clock for the gnome-shell panel", "link": "https://extensions.gnome.org/extension/4771/fuzzy-clock/", "shell_version_map": {"40": {"version": "4", "sha256": "10bhb3abmiinh6aw0jddljd47sllp0gqhwl2wz1wigfw0kp93mwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "10bhb3abmiinh6aw0jddljd47sllp0gqhwl2wz1wigfw0kp93mwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "10bhb3abmiinh6aw0jddljd47sllp0gqhwl2wz1wigfw0kp93mwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogNAp9"}}} +, {"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": "6", "sha256": "0yqhzvamjzpfhw71v0yx5v8p0xq6cq9gwwyl7s8wrd7pb6hyxq68", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vam9obmdvZXR6L0Z1enp5Q2xvY2siLAogICJ1dWlkIjogIkZ1enp5Q2xvY2tAam9obmdvZXR6IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0yqhzvamjzpfhw71v0yx5v8p0xq6cq9gwwyl7s8wrd7pb6hyxq68", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vam9obmdvZXR6L0Z1enp5Q2xvY2siLAogICJ1dWlkIjogIkZ1enp5Q2xvY2tAam9obmdvZXR6IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "0yqhzvamjzpfhw71v0yx5v8p0xq6cq9gwwyl7s8wrd7pb6hyxq68", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vam9obmdvZXR6L0Z1enp5Q2xvY2siLAogICJ1dWlkIjogIkZ1enp5Q2xvY2tAam9obmdvZXR6IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "43": {"version": "6", "sha256": "0yqhzvamjzpfhw71v0yx5v8p0xq6cq9gwwyl7s8wrd7pb6hyxq68", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vam9obmdvZXR6L0Z1enp5Q2xvY2siLAogICJ1dWlkIjogIkZ1enp5Q2xvY2tAam9obmdvZXR6IiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"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": "7", "sha256": "1nkv8bjsjdp4scklmpn7f74fhnyqd65dvhlplzn54qad74afdjdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1nkv8bjsjdp4scklmpn7f74fhnyqd65dvhlplzn54qad74afdjdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "9", "sha256": "1i84rwbdfnjkipvdvlpsa0xqd6vi38vjby1rbyr1ibrbhvwijxmf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "1i84rwbdfnjkipvdvlpsa0xqd6vi38vjby1rbyr1ibrbhvwijxmf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}}} -, {"uuid": "avatar@pawel.swiszcz.com", "name": "Avatar", "pname": "avatar", "description": "The Avatar Extension can add into the panel: \n * Avatar (horizontal/vertical, shades, visibility of username and hostname) \n * Primary buttons \n * MPRIS \n * Top image (can be Your own image from system) ", "link": "https://extensions.gnome.org/extension/4782/avatar/", "shell_version_map": {"41": {"version": "19", "sha256": "14r0q2s96cmhnb56sqjbs64pjp3j81xyr1hfjnv4n7qq02k7lj7c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBdmF0YXIgRXh0ZW5zaW9uIGNhbiBhZGQgaW50byB0aGUgcGFuZWw6IFxuICogQXZhdGFyIChob3Jpem9udGFsL3ZlcnRpY2FsLCBzaGFkZXMsIHZpc2liaWxpdHkgb2YgdXNlcm5hbWUgYW5kIGhvc3RuYW1lKSBcbiAqIFByaW1hcnkgYnV0dG9ucyBcbiAqIE1QUklTIFxuICogVG9wIGltYWdlIChjYW4gYmUgWW91ciBvd24gaW1hZ2UgZnJvbSBzeXN0ZW0pICIsCiAgIm5hbWUiOiAiQXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF3ZWxzd2lzemN6L0F2YXRhci1Hbm9tZS1TaGVsbC1FeHRlbnNpb24iLAogICJ1dWlkIjogImF2YXRhckBwYXdlbC5zd2lzemN6LmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "42": {"version": "19", "sha256": "14r0q2s96cmhnb56sqjbs64pjp3j81xyr1hfjnv4n7qq02k7lj7c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBdmF0YXIgRXh0ZW5zaW9uIGNhbiBhZGQgaW50byB0aGUgcGFuZWw6IFxuICogQXZhdGFyIChob3Jpem9udGFsL3ZlcnRpY2FsLCBzaGFkZXMsIHZpc2liaWxpdHkgb2YgdXNlcm5hbWUgYW5kIGhvc3RuYW1lKSBcbiAqIFByaW1hcnkgYnV0dG9ucyBcbiAqIE1QUklTIFxuICogVG9wIGltYWdlIChjYW4gYmUgWW91ciBvd24gaW1hZ2UgZnJvbSBzeXN0ZW0pICIsCiAgIm5hbWUiOiAiQXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF3ZWxzd2lzemN6L0F2YXRhci1Hbm9tZS1TaGVsbC1FeHRlbnNpb24iLAogICJ1dWlkIjogImF2YXRhckBwYXdlbC5zd2lzemN6LmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "43": {"version": "19", "sha256": "14r0q2s96cmhnb56sqjbs64pjp3j81xyr1hfjnv4n7qq02k7lj7c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBdmF0YXIgRXh0ZW5zaW9uIGNhbiBhZGQgaW50byB0aGUgcGFuZWw6IFxuICogQXZhdGFyIChob3Jpem9udGFsL3ZlcnRpY2FsLCBzaGFkZXMsIHZpc2liaWxpdHkgb2YgdXNlcm5hbWUgYW5kIGhvc3RuYW1lKSBcbiAqIFByaW1hcnkgYnV0dG9ucyBcbiAqIE1QUklTIFxuICogVG9wIGltYWdlIChjYW4gYmUgWW91ciBvd24gaW1hZ2UgZnJvbSBzeXN0ZW0pICIsCiAgIm5hbWUiOiAiQXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF3ZWxzd2lzemN6L0F2YXRhci1Hbm9tZS1TaGVsbC1FeHRlbnNpb24iLAogICJ1dWlkIjogImF2YXRhckBwYXdlbC5zd2lzemN6LmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}}} -, {"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": "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": "7", "sha256": "1nkv8bjsjdp4scklmpn7f74fhnyqd65dvhlplzn54qad74afdjdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1nkv8bjsjdp4scklmpn7f74fhnyqd65dvhlplzn54qad74afdjdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "10", "sha256": "1c41wpif8vndhqs11bjjdhpmg7ma0ifwg9nblj85s0wbin369yvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgImdldHRleHQtZG9tYWluIjogImdsYXNhIiwKICAibmFtZSI6ICJHbGFzYSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbGFzYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHlyYWhnYW1lcy9nbm9tZS1leHRlbnNpb24tZ2xhc2EiLAogICJ1dWlkIjogImdsYXNhQGx5cmFoZ2FtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEwCn0="}, "43": {"version": "10", "sha256": "1c41wpif8vndhqs11bjjdhpmg7ma0ifwg9nblj85s0wbin369yvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgImdldHRleHQtZG9tYWluIjogImdsYXNhIiwKICAibmFtZSI6ICJHbGFzYSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbGFzYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHlyYWhnYW1lcy9nbm9tZS1leHRlbnNpb24tZ2xhc2EiLAogICJ1dWlkIjogImdsYXNhQGx5cmFoZ2FtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEwCn0="}}} +, {"uuid": "avatar@pawel.swiszcz.com", "name": "Avatar", "pname": "avatar", "description": "Add Avatar, MPRIS and Top image into the panel. Options to change: \n * Avatar (horizontal/vertical, shades, visibility of username and hostname) \n * Primary buttons \n * MPRIS \n * Top image (can be Your own image from system) ", "link": "https://extensions.gnome.org/extension/4782/avatar/", "shell_version_map": {"41": {"version": "22", "sha256": "0flak21wzrwyc4q32shpg7pxfbbbas634yy5lkq4jjfqpgka3f33", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBBdmF0YXIsIE1QUklTIGFuZCBUb3AgaW1hZ2UgaW50byB0aGUgcGFuZWwuIE9wdGlvbnMgdG8gY2hhbmdlOiBcbiAqIEF2YXRhciAoaG9yaXpvbnRhbC92ZXJ0aWNhbCwgc2hhZGVzLCB2aXNpYmlsaXR5IG9mIHVzZXJuYW1lIGFuZCBob3N0bmFtZSkgXG4gKiBQcmltYXJ5IGJ1dHRvbnMgXG4gKiBNUFJJUyBcbiAqIFRvcCBpbWFnZSAoY2FuIGJlIFlvdXIgb3duIGltYWdlIGZyb20gc3lzdGVtKSAiLAogICJuYW1lIjogIkF2YXRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Bhd2Vsc3dpc3pjei9BdmF0YXItR25vbWUtU2hlbGwtRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhdmF0YXJAcGF3ZWwuc3dpc3pjei5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "0flak21wzrwyc4q32shpg7pxfbbbas634yy5lkq4jjfqpgka3f33", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBBdmF0YXIsIE1QUklTIGFuZCBUb3AgaW1hZ2UgaW50byB0aGUgcGFuZWwuIE9wdGlvbnMgdG8gY2hhbmdlOiBcbiAqIEF2YXRhciAoaG9yaXpvbnRhbC92ZXJ0aWNhbCwgc2hhZGVzLCB2aXNpYmlsaXR5IG9mIHVzZXJuYW1lIGFuZCBob3N0bmFtZSkgXG4gKiBQcmltYXJ5IGJ1dHRvbnMgXG4gKiBNUFJJUyBcbiAqIFRvcCBpbWFnZSAoY2FuIGJlIFlvdXIgb3duIGltYWdlIGZyb20gc3lzdGVtKSAiLAogICJuYW1lIjogIkF2YXRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Bhd2Vsc3dpc3pjei9BdmF0YXItR25vbWUtU2hlbGwtRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhdmF0YXJAcGF3ZWwuc3dpc3pjei5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "22", "sha256": "0flak21wzrwyc4q32shpg7pxfbbbas634yy5lkq4jjfqpgka3f33", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBBdmF0YXIsIE1QUklTIGFuZCBUb3AgaW1hZ2UgaW50byB0aGUgcGFuZWwuIE9wdGlvbnMgdG8gY2hhbmdlOiBcbiAqIEF2YXRhciAoaG9yaXpvbnRhbC92ZXJ0aWNhbCwgc2hhZGVzLCB2aXNpYmlsaXR5IG9mIHVzZXJuYW1lIGFuZCBob3N0bmFtZSkgXG4gKiBQcmltYXJ5IGJ1dHRvbnMgXG4gKiBNUFJJUyBcbiAqIFRvcCBpbWFnZSAoY2FuIGJlIFlvdXIgb3duIGltYWdlIGZyb20gc3lzdGVtKSAiLAogICJuYW1lIjogIkF2YXRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Bhd2Vsc3dpc3pjei9BdmF0YXItR25vbWUtU2hlbGwtRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhdmF0YXJAcGF3ZWwuc3dpc3pjei5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} +, {"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": "3", "sha256": "0717gyz1cwgl859jg9ij0902jy53cik6rx58hglv3828lvfg7qyv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdGV1c1JvZENvc3RhL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWZhdWx0LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZGVmYXVsdC13b3Jrc3BhY2VAbWF0ZXVzcm9kY29zdGEuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "0717gyz1cwgl859jg9ij0902jy53cik6rx58hglv3828lvfg7qyv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdGV1c1JvZENvc3RhL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWZhdWx0LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZGVmYXVsdC13b3Jrc3BhY2VAbWF0ZXVzcm9kY29zdGEuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "0717gyz1cwgl859jg9ij0902jy53cik6rx58hglv3828lvfg7qyv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdGV1c1JvZENvc3RhL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWZhdWx0LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZGVmYXVsdC13b3Jrc3BhY2VAbWF0ZXVzcm9kY29zdGEuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "0717gyz1cwgl859jg9ij0902jy53cik6rx58hglv3828lvfg7qyv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdGV1c1JvZENvc3RhL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWZhdWx0LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZGVmYXVsdC13b3Jrc3BhY2VAbWF0ZXVzcm9kY29zdGEuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "alt-mouse@eexpss.gmail.com", "name": "Alt Mouse", "pname": "alt-mouse", "description": "* Alt + Mouse control window\nDetailed instructions are on the home page and in config interface. \nDisable desktop BackgroundMenu, Disable Panel dragMode. \nAdd a gap at right screen edge. \nAdd Top-Left and Top-Right corner as hot coner.", "link": "https://extensions.gnome.org/extension/4786/alt-mouse/", "shell_version_map": {"40": {"version": "12", "sha256": "1kcsbvvm6wigw0h2d23rx4vsqdawa7m5gfynjdc9xzxn3q8sxx0b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQWx0ICsgTW91c2UgY29udHJvbCB3aW5kb3dcbkRldGFpbGVkIGluc3RydWN0aW9ucyBhcmUgb24gdGhlIGhvbWUgcGFnZSBhbmQgaW4gY29uZmlnIGludGVyZmFjZS4gXG5EaXNhYmxlIGRlc2t0b3AgQmFja2dyb3VuZE1lbnUsIERpc2FibGUgUGFuZWwgZHJhZ01vZGUuIFxuQWRkIGEgZ2FwIGF0IHJpZ2h0IHNjcmVlbiBlZGdlLiBcbkFkZCBUb3AtTGVmdCBhbmQgVG9wLVJpZ2h0IGNvcm5lciBhcyBob3QgY29uZXIuIiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy1hbHQtbW91c2UiLAogICJ1dWlkIjogImFsdC1tb3VzZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "1kcsbvvm6wigw0h2d23rx4vsqdawa7m5gfynjdc9xzxn3q8sxx0b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQWx0ICsgTW91c2UgY29udHJvbCB3aW5kb3dcbkRldGFpbGVkIGluc3RydWN0aW9ucyBhcmUgb24gdGhlIGhvbWUgcGFnZSBhbmQgaW4gY29uZmlnIGludGVyZmFjZS4gXG5EaXNhYmxlIGRlc2t0b3AgQmFja2dyb3VuZE1lbnUsIERpc2FibGUgUGFuZWwgZHJhZ01vZGUuIFxuQWRkIGEgZ2FwIGF0IHJpZ2h0IHNjcmVlbiBlZGdlLiBcbkFkZCBUb3AtTGVmdCBhbmQgVG9wLVJpZ2h0IGNvcm5lciBhcyBob3QgY29uZXIuIiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy1hbHQtbW91c2UiLAogICJ1dWlkIjogImFsdC1tb3VzZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "24", "sha256": "1j20kzq4va9s0jpvcm2y91wjk0c772mx4xk1rmr49hy1rb2crdpc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQWx0ICsgTW91c2UgY29udHJvbCB3aW5kb3dcbkRldGFpbGVkIGluc3RydWN0aW9ucyBhcmUgb24gdGhlIGhvbWUgcGFnZSBhbmQgaW4gY29uZmlnIGludGVyZmFjZS4gXG5EaXNhYmxlIGRlc2t0b3AgQmFja2dyb3VuZE1lbnUsIERpc2FibGUgUGFuZWwgZHJhZ01vZGUuIFxuQWRkIGEgZ2FwIGF0IHJpZ2h0IHNjcmVlbiBlZGdlLiBcbkFkZCBUb3AtTGVmdCBhbmQgVG9wLVJpZ2h0IGNvcm5lciBhcyBob3QgY29uZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx0LW1vdXNlIiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWx0LW1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLWFsdC1tb3VzZSIsCiAgInV1aWQiOiAiYWx0LW1vdXNlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="}}} , {"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 the content, dimensions, position, orientation and colors of its popup indicator.\n\n- all GNOME workspace related options at one place\n- allows to switch workspaces orientation to horizontal or vertical\n- adds workspace 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- workspace switcher popup appearance customization includes position on screen, timings, size, colors , orientation.\n\nPlease, report bugs on the GitHub page linked below.", "link": "https://extensions.gnome.org/extension/4788/workspace-switcher-manager/", "shell_version_map": {"38": {"version": "9", "sha256": "1pd5a520rfnf4hcpdqxq7z5c7691qh07685as6s9ssvfdzhxxf61", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgYXQgb25lIHBsYWNlXG4tIGFsbG93cyB0byBzd2l0Y2ggd29ya3NwYWNlcyBvcmllbnRhdGlvbiB0byBob3Jpem9udGFsIG9yIHZlcnRpY2FsXG4tIGFkZHMgd29ya3NwYWNlIHN3aXRjaGVyICdXcmFwYXJvdWQnIGFuZCAnSWdub3JlIExhc3QgKGVtcHR5KSBXb3Jrc3BhY2UnIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbi5cblxuUGxlYXNlLCByZXBvcnQgYnVncyBvbiB0aGUgR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "1pd5a520rfnf4hcpdqxq7z5c7691qh07685as6s9ssvfdzhxxf61", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgYXQgb25lIHBsYWNlXG4tIGFsbG93cyB0byBzd2l0Y2ggd29ya3NwYWNlcyBvcmllbnRhdGlvbiB0byBob3Jpem9udGFsIG9yIHZlcnRpY2FsXG4tIGFkZHMgd29ya3NwYWNlIHN3aXRjaGVyICdXcmFwYXJvdWQnIGFuZCAnSWdub3JlIExhc3QgKGVtcHR5KSBXb3Jrc3BhY2UnIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbi5cblxuUGxlYXNlLCByZXBvcnQgYnVncyBvbiB0aGUgR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "1pd5a520rfnf4hcpdqxq7z5c7691qh07685as6s9ssvfdzhxxf61", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgYXQgb25lIHBsYWNlXG4tIGFsbG93cyB0byBzd2l0Y2ggd29ya3NwYWNlcyBvcmllbnRhdGlvbiB0byBob3Jpem9udGFsIG9yIHZlcnRpY2FsXG4tIGFkZHMgd29ya3NwYWNlIHN3aXRjaGVyICdXcmFwYXJvdWQnIGFuZCAnSWdub3JlIExhc3QgKGVtcHR5KSBXb3Jrc3BhY2UnIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbi5cblxuUGxlYXNlLCByZXBvcnQgYnVncyBvbiB0aGUgR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "1pd5a520rfnf4hcpdqxq7z5c7691qh07685as6s9ssvfdzhxxf61", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgYXQgb25lIHBsYWNlXG4tIGFsbG93cyB0byBzd2l0Y2ggd29ya3NwYWNlcyBvcmllbnRhdGlvbiB0byBob3Jpem9udGFsIG9yIHZlcnRpY2FsXG4tIGFkZHMgd29ya3NwYWNlIHN3aXRjaGVyICdXcmFwYXJvdWQnIGFuZCAnSWdub3JlIExhc3QgKGVtcHR5KSBXb3Jrc3BhY2UnIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbi5cblxuUGxlYXNlLCByZXBvcnQgYnVncyBvbiB0aGUgR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "43": {"version": "9", "sha256": "1pd5a520rfnf4hcpdqxq7z5c7691qh07685as6s9ssvfdzhxxf61", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgYXQgb25lIHBsYWNlXG4tIGFsbG93cyB0byBzd2l0Y2ggd29ya3NwYWNlcyBvcmllbnRhdGlvbiB0byBob3Jpem9udGFsIG9yIHZlcnRpY2FsXG4tIGFkZHMgd29ya3NwYWNlIHN3aXRjaGVyICdXcmFwYXJvdWQnIGFuZCAnSWdub3JlIExhc3QgKGVtcHR5KSBXb3Jrc3BhY2UnIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbi5cblxuUGxlYXNlLCByZXBvcnQgYnVncyBvbiB0aGUgR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"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": "15", "sha256": "0is8y6cs3qfaljlmyfhjpp71fbd98bizldf0rhrblm91mjfhqi3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "0is8y6cs3qfaljlmyfhjpp71fbd98bizldf0rhrblm91mjfhqi3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "42": {"version": "15", "sha256": "0is8y6cs3qfaljlmyfhjpp71fbd98bizldf0rhrblm91mjfhqi3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}}} -, {"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.", "link": "https://extensions.gnome.org/extension/4792/frequency-boost-switch/", "shell_version_map": {"41": {"version": "6", "sha256": "0yrrh10n7nkj8x1kmsndqlwcv5crad77a52vmq1xbcb24m3aswgp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWV0YWwwMzMyNi9nbm9tZS1mcmVxdWVuY3ktYm9vc3Qtc3dpdGNoIiwKICAidXVpZCI6ICJmcmVxLWJvb3N0LXN3aXRjaEBtZXRhbDAzMzI2IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "8", "sha256": "0ldkfawgpdzzicr7ja1v1lyjg38pw0mh2i91gm3bdf9wxln4d6j7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tZXRhbDAzMzI2L2dub21lLWZyZXF1ZW5jeS1ib29zdC1zd2l0Y2giLAogICJ1dWlkIjogImZyZXEtYm9vc3Qtc3dpdGNoQG1ldGFsMDMzMjYiLAogICJ2ZXJzaW9uIjogOAp9"}}} -, {"uuid": "pop-launcher-super-key@ManeLippert", "name": "Pop Launcher Super-Key", "pname": "pop-launcher-super-key", "description": "Binds Pop-Launcher on Super-Key (Fork of Pop-Cosmic Extension)\n\n! Requirements ! -> Pop-Launcher and Pop-Shell have to be installed on used OS", "link": "https://extensions.gnome.org/extension/4797/pop-launcher-super-key/", "shell_version_map": {"38": {"version": "5", "sha256": "1x34hvnycy0an3pb0ljymknpqy2grr4y398fwwv4hx7rx1qbvdwk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cbiEgUmVxdWlyZW1lbnRzICEgLT4gUG9wLUxhdW5jaGVyIGFuZCBQb3AtU2hlbGwgaGF2ZSB0byBiZSBpbnN0YWxsZWQgb24gdXNlZCBPUyIsCiAgIm5hbWUiOiAiUG9wIExhdW5jaGVyIFN1cGVyLUtleSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiU3lzdGVtNzYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYW5lTGlwcGVydC9wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAidXVpZCI6ICJwb3AtbGF1bmNoZXItc3VwZXIta2V5QE1hbmVMaXBwZXJ0IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "1x34hvnycy0an3pb0ljymknpqy2grr4y398fwwv4hx7rx1qbvdwk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cbiEgUmVxdWlyZW1lbnRzICEgLT4gUG9wLUxhdW5jaGVyIGFuZCBQb3AtU2hlbGwgaGF2ZSB0byBiZSBpbnN0YWxsZWQgb24gdXNlZCBPUyIsCiAgIm5hbWUiOiAiUG9wIExhdW5jaGVyIFN1cGVyLUtleSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiU3lzdGVtNzYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYW5lTGlwcGVydC9wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAidXVpZCI6ICJwb3AtbGF1bmNoZXItc3VwZXIta2V5QE1hbmVMaXBwZXJ0IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "1x34hvnycy0an3pb0ljymknpqy2grr4y398fwwv4hx7rx1qbvdwk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cbiEgUmVxdWlyZW1lbnRzICEgLT4gUG9wLUxhdW5jaGVyIGFuZCBQb3AtU2hlbGwgaGF2ZSB0byBiZSBpbnN0YWxsZWQgb24gdXNlZCBPUyIsCiAgIm5hbWUiOiAiUG9wIExhdW5jaGVyIFN1cGVyLUtleSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiU3lzdGVtNzYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYW5lTGlwcGVydC9wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAidXVpZCI6ICJwb3AtbGF1bmNoZXItc3VwZXIta2V5QE1hbmVMaXBwZXJ0IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "42": {"version": "5", "sha256": "1x34hvnycy0an3pb0ljymknpqy2grr4y398fwwv4hx7rx1qbvdwk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cbiEgUmVxdWlyZW1lbnRzICEgLT4gUG9wLUxhdW5jaGVyIGFuZCBQb3AtU2hlbGwgaGF2ZSB0byBiZSBpbnN0YWxsZWQgb24gdXNlZCBPUyIsCiAgIm5hbWUiOiAiUG9wIExhdW5jaGVyIFN1cGVyLUtleSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiU3lzdGVtNzYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYW5lTGlwcGVydC9wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAidXVpZCI6ICJwb3AtbGF1bmNoZXItc3VwZXIta2V5QE1hbmVMaXBwZXJ0IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "43": {"version": "5", "sha256": "1x34hvnycy0an3pb0ljymknpqy2grr4y398fwwv4hx7rx1qbvdwk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cbiEgUmVxdWlyZW1lbnRzICEgLT4gUG9wLUxhdW5jaGVyIGFuZCBQb3AtU2hlbGwgaGF2ZSB0byBiZSBpbnN0YWxsZWQgb24gdXNlZCBPUyIsCiAgIm5hbWUiOiAiUG9wIExhdW5jaGVyIFN1cGVyLUtleSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiU3lzdGVtNzYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYW5lTGlwcGVydC9wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAidXVpZCI6ICJwb3AtbGF1bmNoZXItc3VwZXIta2V5QE1hbmVMaXBwZXJ0IiwKICAidmVyc2lvbiI6IDUKfQ=="}}} -, {"uuid": "thinkpad-battery-threshold@marcosdalvarez.org", "name": "Thinkpad Battery Threshold", "pname": "thinkpad-battery-threshold", "description": "Enable/Disable battery threshold on Lenovo Thinkpad laptops.\n\nIf you mainly use the system with the AC power adapter connected and only use the battery sporadically, you can increase battery life by setting the maximum charge value to less than 100%. This is useful because batteries that are used sporadically have a longer lifespan when kept at less than full charge.", "link": "https://extensions.gnome.org/extension/4798/thinkpad-battery-threshold/", "shell_version_map": {"41": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}}} +, {"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.", "link": "https://extensions.gnome.org/extension/4792/frequency-boost-switch/", "shell_version_map": {"41": {"version": "6", "sha256": "0yrrh10n7nkj8x1kmsndqlwcv5crad77a52vmq1xbcb24m3aswgp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWV0YWwwMzMyNi9nbm9tZS1mcmVxdWVuY3ktYm9vc3Qtc3dpdGNoIiwKICAidXVpZCI6ICJmcmVxLWJvb3N0LXN3aXRjaEBtZXRhbDAzMzI2IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "8", "sha256": "0ldkfawgpdzzicr7ja1v1lyjg38pw0mh2i91gm3bdf9wxln4d6j7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tZXRhbDAzMzI2L2dub21lLWZyZXF1ZW5jeS1ib29zdC1zd2l0Y2giLAogICJ1dWlkIjogImZyZXEtYm9vc3Qtc3dpdGNoQG1ldGFsMDMzMjYiLAogICJ2ZXJzaW9uIjogOAp9"}, "43": {"version": "9", "sha256": "0fj1bc209l2zz8cwllxm5nadd0hmvikf9d1ydfwc25l201czl68m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tZXRhbDAzMzI2L2dub21lLWZyZXF1ZW5jeS1ib29zdC1zd2l0Y2giLAogICJ1dWlkIjogImZyZXEtYm9vc3Qtc3dpdGNoQG1ldGFsMDMzMjYiLAogICJ2ZXJzaW9uIjogOQp9"}}} +, {"uuid": "pop-launcher-super-key@ManeLippert", "name": "Pop Launcher Super-Key", "pname": "pop-launcher-super-key", "description": "Binds Pop-Launcher on Super-Key (Fork of Pop-Cosmic Extension)\n\nSince Pop!_OS moves to its own desktop enviroment (COSMIC DE) and I left linux behind me this extension will not get continued.\n\n! Requirements ! : Pop-Launcher and Pop-Shell have to be installed on used OS", "link": "https://extensions.gnome.org/extension/4797/pop-launcher-super-key/", "shell_version_map": {"38": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}, "43": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}}} +, {"uuid": "thinkpad-battery-threshold@marcosdalvarez.org", "name": "Thinkpad Battery Threshold", "pname": "thinkpad-battery-threshold", "description": "Enable/Disable battery threshold on Lenovo Thinkpad laptops.\n\nIf you mainly use the system with the AC power adapter connected and only use the battery sporadically, you can increase battery life by setting the maximum charge value to less than 100%. This is useful because batteries that are used sporadically have a longer lifespan when kept at less than full charge.", "link": "https://extensions.gnome.org/extension/4798/thinkpad-battery-threshold/", "shell_version_map": {"41": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "19", "sha256": "1sas1z00r0ygbx8jhhj7wlixzjf8qwnfifdmiwcljwrdxvm8a2kh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJjb3NkYWx2YXJlei90aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZC1leHRlbnNpb24iLAogICJ1dWlkIjogInRoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkQG1hcmNvc2RhbHZhcmV6Lm9yZyIsCiAgInZlcnNpb24iOiAxOQp9"}}} , {"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": "3", "sha256": "0hkr6gm7kr69fc4zjb8rddwj75jpbpvqz4wpkfl659wjn4980s3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BZHZlbmRyYURlc3dhbnRhL2xvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJ1dWlkIjogImxvY2stc2NyZWVuLW1lc3NhZ2VAYWR2ZW5kcmFkZXN3YW50YS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "0hkr6gm7kr69fc4zjb8rddwj75jpbpvqz4wpkfl659wjn4980s3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BZHZlbmRyYURlc3dhbnRhL2xvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJ1dWlkIjogImxvY2stc2NyZWVuLW1lc3NhZ2VAYWR2ZW5kcmFkZXN3YW50YS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "0hkr6gm7kr69fc4zjb8rddwj75jpbpvqz4wpkfl659wjn4980s3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BZHZlbmRyYURlc3dhbnRhL2xvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJ1dWlkIjogImxvY2stc2NyZWVuLW1lc3NhZ2VAYWR2ZW5kcmFkZXN3YW50YS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"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": "6", "sha256": "1fzfl8c28cmc0a26gx9xyyk78lapgfc2x2ykgwaq8mgz86vap4f6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9wYW5lbC1jb3JuZXJzIiwKICAidXVpZCI6ICJwYW5lbC1jb3JuZXJzQGF1bmV0eCIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "1fzfl8c28cmc0a26gx9xyyk78lapgfc2x2ykgwaq8mgz86vap4f6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9wYW5lbC1jb3JuZXJzIiwKICAidXVpZCI6ICJwYW5lbC1jb3JuZXJzQGF1bmV0eCIsCiAgInZlcnNpb24iOiA2Cn0="}}} -, {"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": "5", "sha256": "0pvbsf7497s9bnvsvk4axh5jynk9axflmc915qla76w1xkinqv9w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1phcHBvLUlJL1doYXRXYXRjaCIsCiAgInV1aWQiOiAiV2hhdFdhdGNoQFphcHBvLUlJLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "0pvbsf7497s9bnvsvk4axh5jynk9axflmc915qla76w1xkinqv9w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1phcHBvLUlJL1doYXRXYXRjaCIsCiAgInV1aWQiOiAiV2hhdFdhdGNoQFphcHBvLUlJLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "0pvbsf7497s9bnvsvk4axh5jynk9axflmc915qla76w1xkinqv9w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1phcHBvLUlJL1doYXRXYXRjaCIsCiAgInV1aWQiOiAiV2hhdFdhdGNoQFphcHBvLUlJLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "0pvbsf7497s9bnvsvk4axh5jynk9axflmc915qla76w1xkinqv9w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1phcHBvLUlJL1doYXRXYXRjaCIsCiAgInV1aWQiOiAiV2hhdFdhdGNoQFphcHBvLUlJLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}}} +, {"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": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"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": "17", "sha256": "161nflaca6l269m4v0g62yci3ffbahfk0id9f0215wqgnm1paap9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhaXJvIENsb2NrLiBcbiBDbGljayB0aGUgY2xvY2sgZmFjZSB0byBzZXQgdGhlIGFsYXJtLCBjbGljayB0aGUgY2VudGVyIGNpcmNsZSB0byBlbmFibGUgdGhlIGFsYXJtLlxuIEFsdCArIGNsaWNrIG9uIG1haW4gaWNvbiwgYmFja2dyb3VuZCBvZiBpY29uIGJlY29tZSBncmVlbiwgdGhpcyBlbmFibGUgUG9wdXAgcGVyIGhvdXIgZnVuY3Rpb24uIFxuIEN0cmwgKyBjbGljayBvbiBtYWluIGljb24sIGNhbiB0ZXN0IHRoZSBhbGFybSBlZmZlY3QuXG4gSW4gY2FzZSBvZiBhbGFybSwgdGhlIGNsb2NrIHdpbGwgc3dpbmcgZHluYW1pY2FsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2Fpcm8tY2xvY2siLAogICJuYW1lIjogIkNhaXJvIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY2Fpcm8iLAogICJ1dWlkIjogImNhaXJvQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "161nflaca6l269m4v0g62yci3ffbahfk0id9f0215wqgnm1paap9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhaXJvIENsb2NrLiBcbiBDbGljayB0aGUgY2xvY2sgZmFjZSB0byBzZXQgdGhlIGFsYXJtLCBjbGljayB0aGUgY2VudGVyIGNpcmNsZSB0byBlbmFibGUgdGhlIGFsYXJtLlxuIEFsdCArIGNsaWNrIG9uIG1haW4gaWNvbiwgYmFja2dyb3VuZCBvZiBpY29uIGJlY29tZSBncmVlbiwgdGhpcyBlbmFibGUgUG9wdXAgcGVyIGhvdXIgZnVuY3Rpb24uIFxuIEN0cmwgKyBjbGljayBvbiBtYWluIGljb24sIGNhbiB0ZXN0IHRoZSBhbGFybSBlZmZlY3QuXG4gSW4gY2FzZSBvZiBhbGFybSwgdGhlIGNsb2NrIHdpbGwgc3dpbmcgZHluYW1pY2FsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2Fpcm8tY2xvY2siLAogICJuYW1lIjogIkNhaXJvIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY2Fpcm8iLAogICJ1dWlkIjogImNhaXJvQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "42": {"version": "17", "sha256": "161nflaca6l269m4v0g62yci3ffbahfk0id9f0215wqgnm1paap9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhaXJvIENsb2NrLiBcbiBDbGljayB0aGUgY2xvY2sgZmFjZSB0byBzZXQgdGhlIGFsYXJtLCBjbGljayB0aGUgY2VudGVyIGNpcmNsZSB0byBlbmFibGUgdGhlIGFsYXJtLlxuIEFsdCArIGNsaWNrIG9uIG1haW4gaWNvbiwgYmFja2dyb3VuZCBvZiBpY29uIGJlY29tZSBncmVlbiwgdGhpcyBlbmFibGUgUG9wdXAgcGVyIGhvdXIgZnVuY3Rpb24uIFxuIEN0cmwgKyBjbGljayBvbiBtYWluIGljb24sIGNhbiB0ZXN0IHRoZSBhbGFybSBlZmZlY3QuXG4gSW4gY2FzZSBvZiBhbGFybSwgdGhlIGNsb2NrIHdpbGwgc3dpbmcgZHluYW1pY2FsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2Fpcm8tY2xvY2siLAogICJuYW1lIjogIkNhaXJvIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY2Fpcm8iLAogICJ1dWlkIjogImNhaXJvQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"uuid": "WallpaperSwitcher@Rishu", "name": "Wallpaper Switcher", "pname": "wallpaper-switcher", "description": "Extension to automatically Change wallpaper after a given interval", "link": "https://extensions.gnome.org/extension/4812/wallpaper-switcher/", "shell_version_map": {"38": {"version": "3", "sha256": "0a1zkl3dfdbql6d1n7f2l2xi77p8f6vq1f96gyny17vxpjbhghbv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBhdXRvbWF0aWNhbGx5IENoYW5nZSB3YWxscGFwZXIgYWZ0ZXIgYSBnaXZlbiBpbnRlcnZhbCIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9XYWxscGFwZXJTd2l0Y2hlciIsCiAgInV1aWQiOiAiV2FsbHBhcGVyU3dpdGNoZXJAUmlzaHUiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "0a1zkl3dfdbql6d1n7f2l2xi77p8f6vq1f96gyny17vxpjbhghbv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBhdXRvbWF0aWNhbGx5IENoYW5nZSB3YWxscGFwZXIgYWZ0ZXIgYSBnaXZlbiBpbnRlcnZhbCIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9XYWxscGFwZXJTd2l0Y2hlciIsCiAgInV1aWQiOiAiV2FsbHBhcGVyU3dpdGNoZXJAUmlzaHUiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "0a1zkl3dfdbql6d1n7f2l2xi77p8f6vq1f96gyny17vxpjbhghbv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBhdXRvbWF0aWNhbGx5IENoYW5nZSB3YWxscGFwZXIgYWZ0ZXIgYSBnaXZlbiBpbnRlcnZhbCIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9XYWxscGFwZXJTd2l0Y2hlciIsCiAgInV1aWQiOiAiV2FsbHBhcGVyU3dpdGNoZXJAUmlzaHUiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "8", "sha256": "1gbli5yyh5d4ijl76j1qkg59qb3k6265s8bqscxkvlgpvxdwb9fi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBhdXRvbWF0aWNhbGx5IENoYW5nZSB3YWxscGFwZXIgYWZ0ZXIgYSBnaXZlbiBpbnRlcnZhbCIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yaXNodWluZmluaXR5L1dhbGxwYXBlclN3aXRjaGVyIiwKICAidXVpZCI6ICJXYWxscGFwZXJTd2l0Y2hlckBSaXNodSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "1gbli5yyh5d4ijl76j1qkg59qb3k6265s8bqscxkvlgpvxdwb9fi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBhdXRvbWF0aWNhbGx5IENoYW5nZSB3YWxscGFwZXIgYWZ0ZXIgYSBnaXZlbiBpbnRlcnZhbCIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yaXNodWluZmluaXR5L1dhbGxwYXBlclN3aXRjaGVyIiwKICAidXVpZCI6ICJXYWxscGFwZXJTd2l0Y2hlckBSaXNodSIsCiAgInZlcnNpb24iOiA4Cn0="}}} -, {"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": "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": "4", "sha256": "1znz1h3adx88kz4s6m4qwlqiwcdhs0vylin0ccdk50idmgg94wjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBudW1iZXIgb2YgYW1idWxhbmNlcyB0aGF0IGFyZSBpbiBhIG1pc3Npb24gaW4gTG9tYmFyZHksIEl0YWx5IiwKICAibmFtZSI6ICJBUkVVIFN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yLWNhcmlzc2ltaS9hcmV1LXN0YXR1cy1nbm9tZSIsCiAgInV1aWQiOiAiYXJldXN0YXR1c0BjYXJpc3NpbWkuZXUiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "1znz1h3adx88kz4s6m4qwlqiwcdhs0vylin0ccdk50idmgg94wjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBudW1iZXIgb2YgYW1idWxhbmNlcyB0aGF0IGFyZSBpbiBhIG1pc3Npb24gaW4gTG9tYmFyZHksIEl0YWx5IiwKICAibmFtZSI6ICJBUkVVIFN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yLWNhcmlzc2ltaS9hcmV1LXN0YXR1cy1nbm9tZSIsCiAgInV1aWQiOiAiYXJldXN0YXR1c0BjYXJpc3NpbWkuZXUiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "1znz1h3adx88kz4s6m4qwlqiwcdhs0vylin0ccdk50idmgg94wjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBudW1iZXIgb2YgYW1idWxhbmNlcyB0aGF0IGFyZSBpbiBhIG1pc3Npb24gaW4gTG9tYmFyZHksIEl0YWx5IiwKICAibmFtZSI6ICJBUkVVIFN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yLWNhcmlzc2ltaS9hcmV1LXN0YXR1cy1nbm9tZSIsCiAgInV1aWQiOiAiYXJldXN0YXR1c0BjYXJpc3NpbWkuZXUiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "1znz1h3adx88kz4s6m4qwlqiwcdhs0vylin0ccdk50idmgg94wjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBudW1iZXIgb2YgYW1idWxhbmNlcyB0aGF0IGFyZSBpbiBhIG1pc3Npb24gaW4gTG9tYmFyZHksIEl0YWx5IiwKICAibmFtZSI6ICJBUkVVIFN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yLWNhcmlzc2ltaS9hcmV1LXN0YXR1cy1nbm9tZSIsCiAgInV1aWQiOiAiYXJldXN0YXR1c0BjYXJpc3NpbWkuZXUiLAogICJ2ZXJzaW9uIjogNAp9"}, "43": {"version": "4", "sha256": "1znz1h3adx88kz4s6m4qwlqiwcdhs0vylin0ccdk50idmgg94wjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBudW1iZXIgb2YgYW1idWxhbmNlcyB0aGF0IGFyZSBpbiBhIG1pc3Npb24gaW4gTG9tYmFyZHksIEl0YWx5IiwKICAibmFtZSI6ICJBUkVVIFN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yLWNhcmlzc2ltaS9hcmV1LXN0YXR1cy1nbm9tZSIsCiAgInV1aWQiOiAiYXJldXN0YXR1c0BjYXJpc3NpbWkuZXUiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "colorful-battery-indicator@aneruam", "name": "Colorful Battery Indicator", "pname": "colorful-battery-indicator", "description": "Make color of battery indicator change with level of battery charge", "link": "https://extensions.gnome.org/extension/4817/colorful-battery-indicator/", "shell_version_map": {"38": {"version": "8", "sha256": "1v1l367fjzpjqsq3yb75xyly1yx10hvgndxlwn1i8rnrs5gyh2ry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgY29sb3Igb2YgYmF0dGVyeSBpbmRpY2F0b3IgY2hhbmdlIHdpdGggbGV2ZWwgb2YgYmF0dGVyeSBjaGFyZ2UiLAogICJuYW1lIjogIkNvbG9yZnVsIEJhdHRlcnkgSW5kaWNhdG9yIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZXJ1YS9nbm9tZS1jb2xvcmZ1bC1iYXR0ZXJ5LWluZGljYXRvciIsCiAgInV1aWQiOiAiY29sb3JmdWwtYmF0dGVyeS1pbmRpY2F0b3JAYW5lcnVhbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "1v1l367fjzpjqsq3yb75xyly1yx10hvgndxlwn1i8rnrs5gyh2ry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgY29sb3Igb2YgYmF0dGVyeSBpbmRpY2F0b3IgY2hhbmdlIHdpdGggbGV2ZWwgb2YgYmF0dGVyeSBjaGFyZ2UiLAogICJuYW1lIjogIkNvbG9yZnVsIEJhdHRlcnkgSW5kaWNhdG9yIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZXJ1YS9nbm9tZS1jb2xvcmZ1bC1iYXR0ZXJ5LWluZGljYXRvciIsCiAgInV1aWQiOiAiY29sb3JmdWwtYmF0dGVyeS1pbmRpY2F0b3JAYW5lcnVhbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "1v1l367fjzpjqsq3yb75xyly1yx10hvgndxlwn1i8rnrs5gyh2ry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgY29sb3Igb2YgYmF0dGVyeSBpbmRpY2F0b3IgY2hhbmdlIHdpdGggbGV2ZWwgb2YgYmF0dGVyeSBjaGFyZ2UiLAogICJuYW1lIjogIkNvbG9yZnVsIEJhdHRlcnkgSW5kaWNhdG9yIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZXJ1YS9nbm9tZS1jb2xvcmZ1bC1iYXR0ZXJ5LWluZGljYXRvciIsCiAgInV1aWQiOiAiY29sb3JmdWwtYmF0dGVyeS1pbmRpY2F0b3JAYW5lcnVhbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1v1l367fjzpjqsq3yb75xyly1yx10hvgndxlwn1i8rnrs5gyh2ry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgY29sb3Igb2YgYmF0dGVyeSBpbmRpY2F0b3IgY2hhbmdlIHdpdGggbGV2ZWwgb2YgYmF0dGVyeSBjaGFyZ2UiLAogICJuYW1lIjogIkNvbG9yZnVsIEJhdHRlcnkgSW5kaWNhdG9yIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZXJ1YS9nbm9tZS1jb2xvcmZ1bC1iYXR0ZXJ5LWluZGljYXRvciIsCiAgInV1aWQiOiAiY29sb3JmdWwtYmF0dGVyeS1pbmRpY2F0b3JAYW5lcnVhbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} -, {"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=="}, "42": {"version": "4", "sha256": "0capz1lzk9kg7bxaz5ccsnlj3c3sihpxyhx1cys1gq20h76rx9b8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24gb24gdGhlIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIkluYWN0aXZpdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmVkZWFudHVuYS9pbmFjdGl2aXR5IiwKICAidXVpZCI6ICJpbmFjdGl2aXR5QGZlZGVhbnR1bmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"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=="}, "42": {"version": "5", "sha256": "0lb2va30i9ljbhnf33h70cqi5c2hi223y2h9hj3rkjdcnj343y30", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24gb24gdGhlIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIkluYWN0aXZpdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZlZGVhbnR1bmEvaW5hY3Rpdml0eSIsCiAgInV1aWQiOiAiaW5hY3Rpdml0eUBmZWRlYW50dW5hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}, "43": {"version": "5", "sha256": "0lb2va30i9ljbhnf33h70cqi5c2hi223y2h9hj3rkjdcnj343y30", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24gb24gdGhlIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIkluYWN0aXZpdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZlZGVhbnR1bmEvaW5hY3Rpdml0eSIsCiAgInV1aWQiOiAiaW5hY3Rpdml0eUBmZWRlYW50dW5hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"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": "0bjxq76s6p6g5gdyxlflsdkccnyaca8cicm9w7i56n7i1db6r2bn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogTTNVOCBQbGF5LiBTZWFyY2ggYW5kIHNlbGVjdCB0byBwbGF5ICh1c2UgYGZmcGxheS9mZm1wZWdgKS4gYG0zdThgIGZpbGVzIG5lZWQgcHV0IGludG8gYH4vLmxvY2FsL3NoYXJlL20zdTgtcGxheS9gIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibTN1OC1wbGF5IiwKICAibmFtZSI6ICJNM1U4IFBsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy1tM3U4LXBsYXkvIiwKICAidXVpZCI6ICJtM3U4LXBsYXlAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "0bjxq76s6p6g5gdyxlflsdkccnyaca8cicm9w7i56n7i1db6r2bn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogTTNVOCBQbGF5LiBTZWFyY2ggYW5kIHNlbGVjdCB0byBwbGF5ICh1c2UgYGZmcGxheS9mZm1wZWdgKS4gYG0zdThgIGZpbGVzIG5lZWQgcHV0IGludG8gYH4vLmxvY2FsL3NoYXJlL20zdTgtcGxheS9gIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibTN1OC1wbGF5IiwKICAibmFtZSI6ICJNM1U4IFBsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy1tM3U4LXBsYXkvIiwKICAidXVpZCI6ICJtM3U4LXBsYXlAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "7", "sha256": "0bjxq76s6p6g5gdyxlflsdkccnyaca8cicm9w7i56n7i1db6r2bn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogTTNVOCBQbGF5LiBTZWFyY2ggYW5kIHNlbGVjdCB0byBwbGF5ICh1c2UgYGZmcGxheS9mZm1wZWdgKS4gYG0zdThgIGZpbGVzIG5lZWQgcHV0IGludG8gYH4vLmxvY2FsL3NoYXJlL20zdTgtcGxheS9gIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibTN1OC1wbGF5IiwKICAibmFtZSI6ICJNM1U4IFBsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy1tM3U4LXBsYXkvIiwKICAidXVpZCI6ICJtM3U4LXBsYXlAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"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=="}}} @@ -697,53 +699,53 @@ , {"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": "Dock Toggle", "pname": "dash-to-dock-toggle", "description": "Adds a button to top panel to switch Dock mode between \"always visible\" and \"autohide\".\n\n**Does not work with all dock extensions.**\n\nWorks with the following extensions:\nDash to Dock\nDash to Dock for COSMIC\nUbuntu Dock", "link": "https://extensions.gnome.org/extension/4845/dash-to-dock-toggle/", "shell_version_map": {"40": {"version": "3", "sha256": "0ajqpqj8kzh6k2chn9wxkav0ll9k5x8hf7gh75gzga5kbdngri53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdG9wIHBhbmVsIHRvIHN3aXRjaCBEb2NrIG1vZGUgYmV0d2VlbiBcImFsd2F5cyB2aXNpYmxlXCIgYW5kIFwiYXV0b2hpZGVcIi5cblxuKipEb2VzIG5vdCB3b3JrIHdpdGggYWxsIGRvY2sgZXh0ZW5zaW9ucy4qKlxuXG5Xb3JrcyB3aXRoIHRoZSBmb2xsb3dpbmcgZXh0ZW5zaW9uczpcbkRhc2ggdG8gRG9ja1xuRGFzaCB0byBEb2NrIGZvciBDT1NNSUNcblVidW50dSBEb2NrIiwKICAibmFtZSI6ICJEb2NrIFRvZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0thdm95YWEvZG9jay10b2dnbGUiLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay10b2dnbGVAa2F2b3lhYS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "0ajqpqj8kzh6k2chn9wxkav0ll9k5x8hf7gh75gzga5kbdngri53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdG9wIHBhbmVsIHRvIHN3aXRjaCBEb2NrIG1vZGUgYmV0d2VlbiBcImFsd2F5cyB2aXNpYmxlXCIgYW5kIFwiYXV0b2hpZGVcIi5cblxuKipEb2VzIG5vdCB3b3JrIHdpdGggYWxsIGRvY2sgZXh0ZW5zaW9ucy4qKlxuXG5Xb3JrcyB3aXRoIHRoZSBmb2xsb3dpbmcgZXh0ZW5zaW9uczpcbkRhc2ggdG8gRG9ja1xuRGFzaCB0byBEb2NrIGZvciBDT1NNSUNcblVidW50dSBEb2NrIiwKICAibmFtZSI6ICJEb2NrIFRvZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0thdm95YWEvZG9jay10b2dnbGUiLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay10b2dnbGVAa2F2b3lhYS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "0ajqpqj8kzh6k2chn9wxkav0ll9k5x8hf7gh75gzga5kbdngri53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdG9wIHBhbmVsIHRvIHN3aXRjaCBEb2NrIG1vZGUgYmV0d2VlbiBcImFsd2F5cyB2aXNpYmxlXCIgYW5kIFwiYXV0b2hpZGVcIi5cblxuKipEb2VzIG5vdCB3b3JrIHdpdGggYWxsIGRvY2sgZXh0ZW5zaW9ucy4qKlxuXG5Xb3JrcyB3aXRoIHRoZSBmb2xsb3dpbmcgZXh0ZW5zaW9uczpcbkRhc2ggdG8gRG9ja1xuRGFzaCB0byBEb2NrIGZvciBDT1NNSUNcblVidW50dSBEb2NrIiwKICAibmFtZSI6ICJEb2NrIFRvZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0thdm95YWEvZG9jay10b2dnbGUiLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay10b2dnbGVAa2F2b3lhYS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"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": "00lcrb7ijn587wq6sxm1x3mlgr02s691l1r7cgl6vmn1i6rsf5rm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQ29weSAvIFNlbGVjdCBhIGZ1bGwgcGF0aCBmaWxlIC8gZGlyZWN0b3J5IG5hbWUsIG9yIGluY29tcGxldGUgcGF0aCwgb3IgcHVyZSBmaWxlIG5hbWUuIE9wZW4gYSBjb250ZXh0IG1lbnUgdG8gbGV0IHlvdSBjaG9vc2UgaG93IHRvIG9wZW4gaXQsIG9yIHByZXNzIEN0cmwtU2hpZnQtTyBkaXJlY3RsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3BlbiIsCiAgIm5hbWUiOiAiT3BlbiBBbnl3aGVyZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVuIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3Mtb3BlbiIsCiAgInV1aWQiOiAib3BlbkBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "00lcrb7ijn587wq6sxm1x3mlgr02s691l1r7cgl6vmn1i6rsf5rm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQ29weSAvIFNlbGVjdCBhIGZ1bGwgcGF0aCBmaWxlIC8gZGlyZWN0b3J5IG5hbWUsIG9yIGluY29tcGxldGUgcGF0aCwgb3IgcHVyZSBmaWxlIG5hbWUuIE9wZW4gYSBjb250ZXh0IG1lbnUgdG8gbGV0IHlvdSBjaG9vc2UgaG93IHRvIG9wZW4gaXQsIG9yIHByZXNzIEN0cmwtU2hpZnQtTyBkaXJlY3RsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3BlbiIsCiAgIm5hbWUiOiAiT3BlbiBBbnl3aGVyZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVuIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3Mtb3BlbiIsCiAgInV1aWQiOiAib3BlbkBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "00lcrb7ijn587wq6sxm1x3mlgr02s691l1r7cgl6vmn1i6rsf5rm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQ29weSAvIFNlbGVjdCBhIGZ1bGwgcGF0aCBmaWxlIC8gZGlyZWN0b3J5IG5hbWUsIG9yIGluY29tcGxldGUgcGF0aCwgb3IgcHVyZSBmaWxlIG5hbWUuIE9wZW4gYSBjb250ZXh0IG1lbnUgdG8gbGV0IHlvdSBjaG9vc2UgaG93IHRvIG9wZW4gaXQsIG9yIHByZXNzIEN0cmwtU2hpZnQtTyBkaXJlY3RsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3BlbiIsCiAgIm5hbWUiOiAiT3BlbiBBbnl3aGVyZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVuIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3Mtb3BlbiIsCiAgInV1aWQiOiAib3BlbkBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"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": "5", "sha256": "1i7ixmnv9g950gqxw1wvz1zq8sp5fi7jg2pwg8rsxijdlm933csn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgRXh0ZW5zaW9uIHRvIG1hbmFnZSBzaG9ydGN1dHMgaW4gVG9wIEJhciAoSW5zcGlyZWQgYnkgU2h1dHRsZSBhbmQgU1NITWVudSkuIEVkaXQgdGhlIC5jb21tYW5kcy5qc29uIGZpbGUgdG8gYWRkIHlvdXIgb3duIHNob3J0Y3V0cy5cblxuU2FtcGxlIENvbmZpZyBpbiB0aGUgUkVBRE1FIC0gaHR0cHM6Ly9naXRodWIuY29tL2FydW5rMTQwL2dub21lLWNvbW1hbmQtbWVudS9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJDb21tYW5kIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcnVuazE0MC9nbm9tZS1jb21tYW5kLW1lbnUiLAogICJ1dWlkIjogImNvbW1hbmQtbWVudUBhcnVuazE0MC5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "1i7ixmnv9g950gqxw1wvz1zq8sp5fi7jg2pwg8rsxijdlm933csn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgRXh0ZW5zaW9uIHRvIG1hbmFnZSBzaG9ydGN1dHMgaW4gVG9wIEJhciAoSW5zcGlyZWQgYnkgU2h1dHRsZSBhbmQgU1NITWVudSkuIEVkaXQgdGhlIC5jb21tYW5kcy5qc29uIGZpbGUgdG8gYWRkIHlvdXIgb3duIHNob3J0Y3V0cy5cblxuU2FtcGxlIENvbmZpZyBpbiB0aGUgUkVBRE1FIC0gaHR0cHM6Ly9naXRodWIuY29tL2FydW5rMTQwL2dub21lLWNvbW1hbmQtbWVudS9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJDb21tYW5kIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcnVuazE0MC9nbm9tZS1jb21tYW5kLW1lbnUiLAogICJ1dWlkIjogImNvbW1hbmQtbWVudUBhcnVuazE0MC5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "5", "sha256": "1i7ixmnv9g950gqxw1wvz1zq8sp5fi7jg2pwg8rsxijdlm933csn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgRXh0ZW5zaW9uIHRvIG1hbmFnZSBzaG9ydGN1dHMgaW4gVG9wIEJhciAoSW5zcGlyZWQgYnkgU2h1dHRsZSBhbmQgU1NITWVudSkuIEVkaXQgdGhlIC5jb21tYW5kcy5qc29uIGZpbGUgdG8gYWRkIHlvdXIgb3duIHNob3J0Y3V0cy5cblxuU2FtcGxlIENvbmZpZyBpbiB0aGUgUkVBRE1FIC0gaHR0cHM6Ly9naXRodWIuY29tL2FydW5rMTQwL2dub21lLWNvbW1hbmQtbWVudS9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJDb21tYW5kIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcnVuazE0MC9nbm9tZS1jb21tYW5kLW1lbnUiLAogICJ1dWlkIjogImNvbW1hbmQtbWVudUBhcnVuazE0MC5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"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": "6", "sha256": "1m14i6bdnm3fzhlg7mrgqdvgdcp429dwww7qbzcpl47xckrqsdy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgRXh0ZW5zaW9uIHRvIG1hbmFnZSBzaG9ydGN1dHMgaW4gVG9wIEJhciAoSW5zcGlyZWQgYnkgU2h1dHRsZSBhbmQgU1NITWVudSkuIEVkaXQgdGhlIC5jb21tYW5kcy5qc29uIGZpbGUgdG8gYWRkIHlvdXIgb3duIHNob3J0Y3V0cy5cblxuU2FtcGxlIENvbmZpZyBpbiB0aGUgUkVBRE1FIC0gaHR0cHM6Ly9naXRodWIuY29tL2FydW5rMTQwL2dub21lLWNvbW1hbmQtbWVudS9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJDb21tYW5kIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJ1bmsxNDAvZ25vbWUtY29tbWFuZC1tZW51IiwKICAidXVpZCI6ICJjb21tYW5kLW1lbnVAYXJ1bmsxNDAuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "1m14i6bdnm3fzhlg7mrgqdvgdcp429dwww7qbzcpl47xckrqsdy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgRXh0ZW5zaW9uIHRvIG1hbmFnZSBzaG9ydGN1dHMgaW4gVG9wIEJhciAoSW5zcGlyZWQgYnkgU2h1dHRsZSBhbmQgU1NITWVudSkuIEVkaXQgdGhlIC5jb21tYW5kcy5qc29uIGZpbGUgdG8gYWRkIHlvdXIgb3duIHNob3J0Y3V0cy5cblxuU2FtcGxlIENvbmZpZyBpbiB0aGUgUkVBRE1FIC0gaHR0cHM6Ly9naXRodWIuY29tL2FydW5rMTQwL2dub21lLWNvbW1hbmQtbWVudS9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJDb21tYW5kIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJ1bmsxNDAvZ25vbWUtY29tbWFuZC1tZW51IiwKICAidXVpZCI6ICJjb21tYW5kLW1lbnVAYXJ1bmsxNDAuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "1m14i6bdnm3fzhlg7mrgqdvgdcp429dwww7qbzcpl47xckrqsdy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgRXh0ZW5zaW9uIHRvIG1hbmFnZSBzaG9ydGN1dHMgaW4gVG9wIEJhciAoSW5zcGlyZWQgYnkgU2h1dHRsZSBhbmQgU1NITWVudSkuIEVkaXQgdGhlIC5jb21tYW5kcy5qc29uIGZpbGUgdG8gYWRkIHlvdXIgb3duIHNob3J0Y3V0cy5cblxuU2FtcGxlIENvbmZpZyBpbiB0aGUgUkVBRE1FIC0gaHR0cHM6Ly9naXRodWIuY29tL2FydW5rMTQwL2dub21lLWNvbW1hbmQtbWVudS9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJDb21tYW5kIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJ1bmsxNDAvZ25vbWUtY29tbWFuZC1tZW51IiwKICAidXVpZCI6ICJjb21tYW5kLW1lbnVAYXJ1bmsxNDAuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "43": {"version": "6", "sha256": "1m14i6bdnm3fzhlg7mrgqdvgdcp429dwww7qbzcpl47xckrqsdy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgRXh0ZW5zaW9uIHRvIG1hbmFnZSBzaG9ydGN1dHMgaW4gVG9wIEJhciAoSW5zcGlyZWQgYnkgU2h1dHRsZSBhbmQgU1NITWVudSkuIEVkaXQgdGhlIC5jb21tYW5kcy5qc29uIGZpbGUgdG8gYWRkIHlvdXIgb3duIHNob3J0Y3V0cy5cblxuU2FtcGxlIENvbmZpZyBpbiB0aGUgUkVBRE1FIC0gaHR0cHM6Ly9naXRodWIuY29tL2FydW5rMTQwL2dub21lLWNvbW1hbmQtbWVudS9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJDb21tYW5kIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJ1bmsxNDAvZ25vbWUtY29tbWFuZC1tZW51IiwKICAidXVpZCI6ICJjb21tYW5kLW1lbnVAYXJ1bmsxNDAuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"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": "4", "sha256": "1k024sly2637yb2hh8v0p5i4syksmmw83vj9cji0l3kmswlx3q5h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgd2l0aCBTeXN0ZW03NiBTY2hlZHVsZXIgdG8gcHJpb3JpdGlzZSBmb3JlZ3JvdW5kIHByb2Nlc3Nlcy5cbk5vdGU6IHN5c3RlbTc2LXNjaGVkdWxlciBtdXN0IGJlIGluc3RhbGxlZCBzZXBhcmF0ZWx5IVxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQgd2l0aCBub3Igc3VwcG9ydGVkIGJ5IFN5c3RlbTc2LiIsCiAgIm5hbWUiOiAiU3lzdGVtNzYgU2NoZWR1bGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21qYWtlbWFuL3M3Ni1zY2hlZHVsZXItcGx1Z2luLyIsCiAgInV1aWQiOiAiczc2LXNjaGVkdWxlckBtYXR0amFrZW1hbi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "1k024sly2637yb2hh8v0p5i4syksmmw83vj9cji0l3kmswlx3q5h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgd2l0aCBTeXN0ZW03NiBTY2hlZHVsZXIgdG8gcHJpb3JpdGlzZSBmb3JlZ3JvdW5kIHByb2Nlc3Nlcy5cbk5vdGU6IHN5c3RlbTc2LXNjaGVkdWxlciBtdXN0IGJlIGluc3RhbGxlZCBzZXBhcmF0ZWx5IVxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQgd2l0aCBub3Igc3VwcG9ydGVkIGJ5IFN5c3RlbTc2LiIsCiAgIm5hbWUiOiAiU3lzdGVtNzYgU2NoZWR1bGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21qYWtlbWFuL3M3Ni1zY2hlZHVsZXItcGx1Z2luLyIsCiAgInV1aWQiOiAiczc2LXNjaGVkdWxlckBtYXR0amFrZW1hbi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "1k024sly2637yb2hh8v0p5i4syksmmw83vj9cji0l3kmswlx3q5h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgd2l0aCBTeXN0ZW03NiBTY2hlZHVsZXIgdG8gcHJpb3JpdGlzZSBmb3JlZ3JvdW5kIHByb2Nlc3Nlcy5cbk5vdGU6IHN5c3RlbTc2LXNjaGVkdWxlciBtdXN0IGJlIGluc3RhbGxlZCBzZXBhcmF0ZWx5IVxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQgd2l0aCBub3Igc3VwcG9ydGVkIGJ5IFN5c3RlbTc2LiIsCiAgIm5hbWUiOiAiU3lzdGVtNzYgU2NoZWR1bGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21qYWtlbWFuL3M3Ni1zY2hlZHVsZXItcGx1Z2luLyIsCiAgInV1aWQiOiAiczc2LXNjaGVkdWxlckBtYXR0amFrZW1hbi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "43": {"version": "4", "sha256": "1k024sly2637yb2hh8v0p5i4syksmmw83vj9cji0l3kmswlx3q5h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgd2l0aCBTeXN0ZW03NiBTY2hlZHVsZXIgdG8gcHJpb3JpdGlzZSBmb3JlZ3JvdW5kIHByb2Nlc3Nlcy5cbk5vdGU6IHN5c3RlbTc2LXNjaGVkdWxlciBtdXN0IGJlIGluc3RhbGxlZCBzZXBhcmF0ZWx5IVxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQgd2l0aCBub3Igc3VwcG9ydGVkIGJ5IFN5c3RlbTc2LiIsCiAgIm5hbWUiOiAiU3lzdGVtNzYgU2NoZWR1bGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21qYWtlbWFuL3M3Ni1zY2hlZHVsZXItcGx1Z2luLyIsCiAgInV1aWQiOiAiczc2LXNjaGVkdWxlckBtYXR0amFrZW1hbi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} -, {"uuid": "quarterwindows@troyready.com", "name": "Quarter Windows", "pname": "quarter-windows", "description": "Add additional window management shortcuts", "link": "https://extensions.gnome.org/extension/4857/quarter-windows/", "shell_version_map": {"41": {"version": "4", "sha256": "0341v7phajakviwwcw0wfa9rai5g5qc3g28v9r2ndz4r076zapcv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhZGRpdGlvbmFsIHdpbmRvdyBtYW5hZ2VtZW50IHNob3J0Y3V0cyIsCiAgIm5hbWUiOiAiUXVhcnRlciBXaW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90cm95cmVhZHkvcXVhcnRlcndpbmRvd3MiLAogICJ1dWlkIjogInF1YXJ0ZXJ3aW5kb3dzQHRyb3lyZWFkeS5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "0341v7phajakviwwcw0wfa9rai5g5qc3g28v9r2ndz4r076zapcv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhZGRpdGlvbmFsIHdpbmRvdyBtYW5hZ2VtZW50IHNob3J0Y3V0cyIsCiAgIm5hbWUiOiAiUXVhcnRlciBXaW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90cm95cmVhZHkvcXVhcnRlcndpbmRvd3MiLAogICJ1dWlkIjogInF1YXJ0ZXJ3aW5kb3dzQHRyb3lyZWFkeS5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} +, {"uuid": "quarterwindows@troyready.com", "name": "Quarter Windows", "pname": "quarter-windows", "description": "Add additional window management shortcuts", "link": "https://extensions.gnome.org/extension/4857/quarter-windows/", "shell_version_map": {"41": {"version": "5", "sha256": "13rqs4349xrcchmp7j82dcc21pxjghcx72hm7jf1qaa35q1z1svm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhZGRpdGlvbmFsIHdpbmRvdyBtYW5hZ2VtZW50IHNob3J0Y3V0cyIsCiAgIm5hbWUiOiAiUXVhcnRlciBXaW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHJveXJlYWR5L3F1YXJ0ZXJ3aW5kb3dzIiwKICAidXVpZCI6ICJxdWFydGVyd2luZG93c0B0cm95cmVhZHkuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "42": {"version": "5", "sha256": "13rqs4349xrcchmp7j82dcc21pxjghcx72hm7jf1qaa35q1z1svm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhZGRpdGlvbmFsIHdpbmRvdyBtYW5hZ2VtZW50IHNob3J0Y3V0cyIsCiAgIm5hbWUiOiAiUXVhcnRlciBXaW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHJveXJlYWR5L3F1YXJ0ZXJ3aW5kb3dzIiwKICAidXVpZCI6ICJxdWFydGVyd2luZG93c0B0cm95cmVhZHkuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "43": {"version": "5", "sha256": "13rqs4349xrcchmp7j82dcc21pxjghcx72hm7jf1qaa35q1z1svm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhZGRpdGlvbmFsIHdpbmRvdyBtYW5hZ2VtZW50IHNob3J0Y3V0cyIsCiAgIm5hbWUiOiAiUXVhcnRlciBXaW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHJveXJlYWR5L3F1YXJ0ZXJ3aW5kb3dzIiwKICAidXVpZCI6ICJxdWFydGVyd2luZG93c0B0cm95cmVhZHkuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "batt_consumption_wattmetter@wennaspeedy", "name": "Power 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.\nDefault sync reload set to 4 seconds.\nNo consumption info when battery is full.\nSettings: interval, percentage label (also when full), battery selection", "link": "https://extensions.gnome.org/extension/4862/bat_consumption_wattmeter/", "shell_version_map": {"40": {"version": "10", "sha256": "1qidycwl16b2x4x6chzzkyvpawwpkfy0rhp0lq2szbkmv3k4glin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGFjdHVhbCBjaGFyZ2luZy9kaXNjaGFyZ2luZyBjb25zdW1wdGlvbiAoKy8tKSBpbiBXYXR0IG5leHQgdG8gYmF0dGVyeSBwZXJjZW50YWdlIGxldmVsLlxuRW5hYmxlIHBlcmNlbnRhZ2UgbGFiZWwgd2hlbiBkaXNhYmxlZC5cbkRlZmF1bHQgc3luYyByZWxvYWQgc2V0IHRvIDQgc2Vjb25kcy5cbk5vIGNvbnN1bXB0aW9uIGluZm8gd2hlbiBiYXR0ZXJ5IGlzIGZ1bGwuXG5TZXR0aW5nczogaW50ZXJ2YWwsIHBlcmNlbnRhZ2UgbGFiZWwgKGFsc28gd2hlbiBmdWxsKSwgYmF0dGVyeSBzZWxlY3Rpb24iLAogICJuYW1lIjogIlBvd2VyIGJhdHRlcnkgQ29uc3VtcHRpb24gV2F0dCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dlbm5hc3BlZWR5L2JhdHRfY29uc3VtcHRpb25fd2F0dG1ldHRlciIsCiAgInV1aWQiOiAiYmF0dF9jb25zdW1wdGlvbl93YXR0bWV0dGVyQHdlbm5hc3BlZWR5IiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "1qidycwl16b2x4x6chzzkyvpawwpkfy0rhp0lq2szbkmv3k4glin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGFjdHVhbCBjaGFyZ2luZy9kaXNjaGFyZ2luZyBjb25zdW1wdGlvbiAoKy8tKSBpbiBXYXR0IG5leHQgdG8gYmF0dGVyeSBwZXJjZW50YWdlIGxldmVsLlxuRW5hYmxlIHBlcmNlbnRhZ2UgbGFiZWwgd2hlbiBkaXNhYmxlZC5cbkRlZmF1bHQgc3luYyByZWxvYWQgc2V0IHRvIDQgc2Vjb25kcy5cbk5vIGNvbnN1bXB0aW9uIGluZm8gd2hlbiBiYXR0ZXJ5IGlzIGZ1bGwuXG5TZXR0aW5nczogaW50ZXJ2YWwsIHBlcmNlbnRhZ2UgbGFiZWwgKGFsc28gd2hlbiBmdWxsKSwgYmF0dGVyeSBzZWxlY3Rpb24iLAogICJuYW1lIjogIlBvd2VyIGJhdHRlcnkgQ29uc3VtcHRpb24gV2F0dCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dlbm5hc3BlZWR5L2JhdHRfY29uc3VtcHRpb25fd2F0dG1ldHRlciIsCiAgInV1aWQiOiAiYmF0dF9jb25zdW1wdGlvbl93YXR0bWV0dGVyQHdlbm5hc3BlZWR5IiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "1qidycwl16b2x4x6chzzkyvpawwpkfy0rhp0lq2szbkmv3k4glin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGFjdHVhbCBjaGFyZ2luZy9kaXNjaGFyZ2luZyBjb25zdW1wdGlvbiAoKy8tKSBpbiBXYXR0IG5leHQgdG8gYmF0dGVyeSBwZXJjZW50YWdlIGxldmVsLlxuRW5hYmxlIHBlcmNlbnRhZ2UgbGFiZWwgd2hlbiBkaXNhYmxlZC5cbkRlZmF1bHQgc3luYyByZWxvYWQgc2V0IHRvIDQgc2Vjb25kcy5cbk5vIGNvbnN1bXB0aW9uIGluZm8gd2hlbiBiYXR0ZXJ5IGlzIGZ1bGwuXG5TZXR0aW5nczogaW50ZXJ2YWwsIHBlcmNlbnRhZ2UgbGFiZWwgKGFsc28gd2hlbiBmdWxsKSwgYmF0dGVyeSBzZWxlY3Rpb24iLAogICJuYW1lIjogIlBvd2VyIGJhdHRlcnkgQ29uc3VtcHRpb24gV2F0dCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dlbm5hc3BlZWR5L2JhdHRfY29uc3VtcHRpb25fd2F0dG1ldHRlciIsCiAgInV1aWQiOiAiYmF0dF9jb25zdW1wdGlvbl93YXR0bWV0dGVyQHdlbm5hc3BlZWR5IiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"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.", "link": "https://extensions.gnome.org/extension/4869/dollar-pkr/", "shell_version_map": {"38": {"version": "10", "sha256": "15b4kvzml4ibwis3mg4zffrhgfzw7kdaw2pibmv39v4gwm9rwmsx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVTRCAoVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gUEtSIChQYWtpc3RhbiBScykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMuIiwKICAibmFtZSI6ICJEb2xsYXItUEtSIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2hvYWlienMvIiwKICAidXVpZCI6ICJkb2xsYXItcGtyQHNob2FpYnpzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "15b4kvzml4ibwis3mg4zffrhgfzw7kdaw2pibmv39v4gwm9rwmsx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVTRCAoVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gUEtSIChQYWtpc3RhbiBScykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMuIiwKICAibmFtZSI6ICJEb2xsYXItUEtSIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2hvYWlienMvIiwKICAidXVpZCI6ICJkb2xsYXItcGtyQHNob2FpYnpzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "15b4kvzml4ibwis3mg4zffrhgfzw7kdaw2pibmv39v4gwm9rwmsx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVTRCAoVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gUEtSIChQYWtpc3RhbiBScykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMuIiwKICAibmFtZSI6ICJEb2xsYXItUEtSIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2hvYWlienMvIiwKICAidXVpZCI6ICJkb2xsYXItcGtyQHNob2FpYnpzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "42": {"version": "10", "sha256": "15b4kvzml4ibwis3mg4zffrhgfzw7kdaw2pibmv39v4gwm9rwmsx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVTRCAoVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gUEtSIChQYWtpc3RhbiBScykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMuIiwKICAibmFtZSI6ICJEb2xsYXItUEtSIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2hvYWlienMvIiwKICAidXVpZCI6ICJkb2xsYXItcGtyQHNob2FpYnpzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "43": {"version": "9", "sha256": "1vbvzxqy1nnk6m2d4chr6a6xqw9832by2cw1g6m7n7zfwcqg576x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVTRCAoVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gUEtSIChQYWtpc3RhbiBScykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMuIiwKICAibmFtZSI6ICJEb2xsYXItUEtSIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Nob2FpYnpzLyIsCiAgInV1aWQiOiAiZG9sbGFyLXBrckBzaG9haWJ6cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"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": "3", "sha256": "1v5ihfp6mbh4h8kissx8frlcrw52ywbi6lskra3qkhiqlq181m62", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG4gTm8gdXBkYXRlIG5vdGlmaWNhdGlvbiBhdCBzZXNzaW9uIHN0YXJ0LXVwOiB1c2UgU25hcCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgdGhhdC5cblxuIEFsbCB0aGUgcmVzdWx0cyBvZiBhY3Rpb25zIGFyZSBkaXNwbGF5ZWQgaW4gR05PTUUgVGVybWluYWwsIHNvIHlvdSBjYW4gZXhhY3RseSBrbm93IHdoYXQgeW91IGFyZSBkb2luZyBhbmQgd2hhdCBpcyBwcm9jZXNzaW5nLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbiwgbm8gYmFja2dyb3VuZCBwcm9jZXNzLCBubyBwZXJpb2RpYyBiYWNrZ3JvdW5kIHRhc2suXG5cbiBZb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIGxpbWl0ZWQgdGltZSAodXAgdG8gb25lIG1vbnRoLCByZW5ld2FibGUpLCBjb25zZXF1ZW50bHkgYmUgbm90aWZpZWQgb2Ygc25hcCB1cGRhdGVzIGFuZCBtYW51YWxseSBpbnN0YWxsIHRoZW0uXG5cbiBUaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zbmFwLW1hbmFnZXItbGl0ZSIsCiAgInV1aWQiOiAic25hcC1tYW5hZ2VyLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "1v5ihfp6mbh4h8kissx8frlcrw52ywbi6lskra3qkhiqlq181m62", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG4gTm8gdXBkYXRlIG5vdGlmaWNhdGlvbiBhdCBzZXNzaW9uIHN0YXJ0LXVwOiB1c2UgU25hcCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgdGhhdC5cblxuIEFsbCB0aGUgcmVzdWx0cyBvZiBhY3Rpb25zIGFyZSBkaXNwbGF5ZWQgaW4gR05PTUUgVGVybWluYWwsIHNvIHlvdSBjYW4gZXhhY3RseSBrbm93IHdoYXQgeW91IGFyZSBkb2luZyBhbmQgd2hhdCBpcyBwcm9jZXNzaW5nLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbiwgbm8gYmFja2dyb3VuZCBwcm9jZXNzLCBubyBwZXJpb2RpYyBiYWNrZ3JvdW5kIHRhc2suXG5cbiBZb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIGxpbWl0ZWQgdGltZSAodXAgdG8gb25lIG1vbnRoLCByZW5ld2FibGUpLCBjb25zZXF1ZW50bHkgYmUgbm90aWZpZWQgb2Ygc25hcCB1cGRhdGVzIGFuZCBtYW51YWxseSBpbnN0YWxsIHRoZW0uXG5cbiBUaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zbmFwLW1hbmFnZXItbGl0ZSIsCiAgInV1aWQiOiAic25hcC1tYW5hZ2VyLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "1v5ihfp6mbh4h8kissx8frlcrw52ywbi6lskra3qkhiqlq181m62", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG4gTm8gdXBkYXRlIG5vdGlmaWNhdGlvbiBhdCBzZXNzaW9uIHN0YXJ0LXVwOiB1c2UgU25hcCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgdGhhdC5cblxuIEFsbCB0aGUgcmVzdWx0cyBvZiBhY3Rpb25zIGFyZSBkaXNwbGF5ZWQgaW4gR05PTUUgVGVybWluYWwsIHNvIHlvdSBjYW4gZXhhY3RseSBrbm93IHdoYXQgeW91IGFyZSBkb2luZyBhbmQgd2hhdCBpcyBwcm9jZXNzaW5nLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbiwgbm8gYmFja2dyb3VuZCBwcm9jZXNzLCBubyBwZXJpb2RpYyBiYWNrZ3JvdW5kIHRhc2suXG5cbiBZb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIGxpbWl0ZWQgdGltZSAodXAgdG8gb25lIG1vbnRoLCByZW5ld2FibGUpLCBjb25zZXF1ZW50bHkgYmUgbm90aWZpZWQgb2Ygc25hcCB1cGRhdGVzIGFuZCBtYW51YWxseSBpbnN0YWxsIHRoZW0uXG5cbiBUaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zbmFwLW1hbmFnZXItbGl0ZSIsCiAgInV1aWQiOiAic25hcC1tYW5hZ2VyLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "1v5ihfp6mbh4h8kissx8frlcrw52ywbi6lskra3qkhiqlq181m62", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG4gTm8gdXBkYXRlIG5vdGlmaWNhdGlvbiBhdCBzZXNzaW9uIHN0YXJ0LXVwOiB1c2UgU25hcCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgdGhhdC5cblxuIEFsbCB0aGUgcmVzdWx0cyBvZiBhY3Rpb25zIGFyZSBkaXNwbGF5ZWQgaW4gR05PTUUgVGVybWluYWwsIHNvIHlvdSBjYW4gZXhhY3RseSBrbm93IHdoYXQgeW91IGFyZSBkb2luZyBhbmQgd2hhdCBpcyBwcm9jZXNzaW5nLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbiwgbm8gYmFja2dyb3VuZCBwcm9jZXNzLCBubyBwZXJpb2RpYyBiYWNrZ3JvdW5kIHRhc2suXG5cbiBZb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIGxpbWl0ZWQgdGltZSAodXAgdG8gb25lIG1vbnRoLCByZW5ld2FibGUpLCBjb25zZXF1ZW50bHkgYmUgbm90aWZpZWQgb2Ygc25hcCB1cGRhdGVzIGFuZCBtYW51YWxseSBpbnN0YWxsIHRoZW0uXG5cbiBUaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zbmFwLW1hbmFnZXItbGl0ZSIsCiAgInV1aWQiOiAic25hcC1tYW5hZ2VyLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAzCn0="}}} -, {"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": "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\nNo update notification at session start-up: use Snap Manager extension for that.\n\nAll 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\nYou can disable snaps auto updates for a some time (up to +oo) and consequently manually manage them.\n\nThis is not an official Ubuntu/Canonical extension.", "link": "https://extensions.gnome.org/extension/4889/snap-manager-lite/", "shell_version_map": {"38": {"version": "3", "sha256": "1ddccfkrm2iwblfaq240m25clqjcwa3drlp60n268pybg8d1ril7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG5ObyB1cGRhdGUgbm90aWZpY2F0aW9uIGF0IHNlc3Npb24gc3RhcnQtdXA6IHVzZSBTbmFwIE1hbmFnZXIgZXh0ZW5zaW9uIGZvciB0aGF0LlxuXG5BbGwgdGhlIHJlc3VsdHMgb2YgYWN0aW9ucyBhcmUgZGlzcGxheWVkIGluIEdOT01FIFRlcm1pbmFsLCBzbyB5b3UgY2FuIGV4YWN0bHkga25vdyB3aGF0IHlvdSBhcmUgZG9pbmcgYW5kIHdoYXQgaXMgcHJvY2Vzc2luZy4gVmVyeSBsaWdodCBleHRlbnNpb24sIG5vIGJhY2tncm91bmQgcHJvY2Vzcywgbm8gcGVyaW9kaWMgYmFja2dyb3VuZCB0YXNrLlxuXG5Zb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIHNvbWUgdGltZSAodXAgdG8gK29vKSBhbmQgY29uc2VxdWVudGx5IG1hbnVhbGx5IG1hbmFnZSB0aGVtLlxuXG5UaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zbmFwLW1hbmFnZXItbGl0ZSIsCiAgInV1aWQiOiAic25hcC1tYW5hZ2VyLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "1ddccfkrm2iwblfaq240m25clqjcwa3drlp60n268pybg8d1ril7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG5ObyB1cGRhdGUgbm90aWZpY2F0aW9uIGF0IHNlc3Npb24gc3RhcnQtdXA6IHVzZSBTbmFwIE1hbmFnZXIgZXh0ZW5zaW9uIGZvciB0aGF0LlxuXG5BbGwgdGhlIHJlc3VsdHMgb2YgYWN0aW9ucyBhcmUgZGlzcGxheWVkIGluIEdOT01FIFRlcm1pbmFsLCBzbyB5b3UgY2FuIGV4YWN0bHkga25vdyB3aGF0IHlvdSBhcmUgZG9pbmcgYW5kIHdoYXQgaXMgcHJvY2Vzc2luZy4gVmVyeSBsaWdodCBleHRlbnNpb24sIG5vIGJhY2tncm91bmQgcHJvY2Vzcywgbm8gcGVyaW9kaWMgYmFja2dyb3VuZCB0YXNrLlxuXG5Zb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIHNvbWUgdGltZSAodXAgdG8gK29vKSBhbmQgY29uc2VxdWVudGx5IG1hbnVhbGx5IG1hbmFnZSB0aGVtLlxuXG5UaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zbmFwLW1hbmFnZXItbGl0ZSIsCiAgInV1aWQiOiAic25hcC1tYW5hZ2VyLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "1ddccfkrm2iwblfaq240m25clqjcwa3drlp60n268pybg8d1ril7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG5ObyB1cGRhdGUgbm90aWZpY2F0aW9uIGF0IHNlc3Npb24gc3RhcnQtdXA6IHVzZSBTbmFwIE1hbmFnZXIgZXh0ZW5zaW9uIGZvciB0aGF0LlxuXG5BbGwgdGhlIHJlc3VsdHMgb2YgYWN0aW9ucyBhcmUgZGlzcGxheWVkIGluIEdOT01FIFRlcm1pbmFsLCBzbyB5b3UgY2FuIGV4YWN0bHkga25vdyB3aGF0IHlvdSBhcmUgZG9pbmcgYW5kIHdoYXQgaXMgcHJvY2Vzc2luZy4gVmVyeSBsaWdodCBleHRlbnNpb24sIG5vIGJhY2tncm91bmQgcHJvY2Vzcywgbm8gcGVyaW9kaWMgYmFja2dyb3VuZCB0YXNrLlxuXG5Zb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIHNvbWUgdGltZSAodXAgdG8gK29vKSBhbmQgY29uc2VxdWVudGx5IG1hbnVhbGx5IG1hbmFnZSB0aGVtLlxuXG5UaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zbmFwLW1hbmFnZXItbGl0ZSIsCiAgInV1aWQiOiAic25hcC1tYW5hZ2VyLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "4", "sha256": "0qjb4fwdnq0rs2i7j1g694mjib272s69nccarjkwiy5wwyqxafxf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG5ObyB1cGRhdGUgbm90aWZpY2F0aW9uIGF0IHNlc3Npb24gc3RhcnQtdXA6IHVzZSBTbmFwIE1hbmFnZXIgZXh0ZW5zaW9uIGZvciB0aGF0LlxuXG5BbGwgdGhlIHJlc3VsdHMgb2YgYWN0aW9ucyBhcmUgZGlzcGxheWVkIGluIEdOT01FIFRlcm1pbmFsLCBzbyB5b3UgY2FuIGV4YWN0bHkga25vdyB3aGF0IHlvdSBhcmUgZG9pbmcgYW5kIHdoYXQgaXMgcHJvY2Vzc2luZy4gVmVyeSBsaWdodCBleHRlbnNpb24sIG5vIGJhY2tncm91bmQgcHJvY2Vzcywgbm8gcGVyaW9kaWMgYmFja2dyb3VuZCB0YXNrLlxuXG5Zb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIHNvbWUgdGltZSAodXAgdG8gK29vKSBhbmQgY29uc2VxdWVudGx5IG1hbnVhbGx5IG1hbmFnZSB0aGVtLlxuXG5UaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3NuYXAtbWFuYWdlci1saXRlIiwKICAidXVpZCI6ICJzbmFwLW1hbmFnZXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "0qjb4fwdnq0rs2i7j1g694mjib272s69nccarjkwiy5wwyqxafxf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG5ObyB1cGRhdGUgbm90aWZpY2F0aW9uIGF0IHNlc3Npb24gc3RhcnQtdXA6IHVzZSBTbmFwIE1hbmFnZXIgZXh0ZW5zaW9uIGZvciB0aGF0LlxuXG5BbGwgdGhlIHJlc3VsdHMgb2YgYWN0aW9ucyBhcmUgZGlzcGxheWVkIGluIEdOT01FIFRlcm1pbmFsLCBzbyB5b3UgY2FuIGV4YWN0bHkga25vdyB3aGF0IHlvdSBhcmUgZG9pbmcgYW5kIHdoYXQgaXMgcHJvY2Vzc2luZy4gVmVyeSBsaWdodCBleHRlbnNpb24sIG5vIGJhY2tncm91bmQgcHJvY2Vzcywgbm8gcGVyaW9kaWMgYmFja2dyb3VuZCB0YXNrLlxuXG5Zb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIHNvbWUgdGltZSAodXAgdG8gK29vKSBhbmQgY29uc2VxdWVudGx5IG1hbnVhbGx5IG1hbmFnZSB0aGVtLlxuXG5UaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3NuYXAtbWFuYWdlci1saXRlIiwKICAidXVpZCI6ICJzbmFwLW1hbmFnZXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"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": {"40": {"version": "3", "sha256": "1risn5j48kgzdhlyrll5s4qwdznhzqshflz18zgfhx336yngp34f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHBhbmVsIHRvIHNlY29uZGFyeSBtb25pdG9yIG9uIHN0YXJ0dXAsIHdpdGhvdXQgY2hhbmdpbmcgdGhlIHByaW1hcnkgZGlzcGxheS4gT25seSB3b3JrcyBvbiBXYXlsYW5kLiIsCiAgIm5hbWUiOiAiTW92ZSBQYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9semJ6L21vdmUtcGFuZWwiLAogICJ1dWlkIjogIm1vdmUtcGFuZWxAbHpiei5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1risn5j48kgzdhlyrll5s4qwdznhzqshflz18zgfhx336yngp34f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHBhbmVsIHRvIHNlY29uZGFyeSBtb25pdG9yIG9uIHN0YXJ0dXAsIHdpdGhvdXQgY2hhbmdpbmcgdGhlIHByaW1hcnkgZGlzcGxheS4gT25seSB3b3JrcyBvbiBXYXlsYW5kLiIsCiAgIm5hbWUiOiAiTW92ZSBQYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9semJ6L21vdmUtcGFuZWwiLAogICJ1dWlkIjogIm1vdmUtcGFuZWxAbHpiei5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "1risn5j48kgzdhlyrll5s4qwdznhzqshflz18zgfhx336yngp34f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHBhbmVsIHRvIHNlY29uZGFyeSBtb25pdG9yIG9uIHN0YXJ0dXAsIHdpdGhvdXQgY2hhbmdpbmcgdGhlIHByaW1hcnkgZGlzcGxheS4gT25seSB3b3JrcyBvbiBXYXlsYW5kLiIsCiAgIm5hbWUiOiAiTW92ZSBQYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9semJ6L21vdmUtcGFuZWwiLAogICJ1dWlkIjogIm1vdmUtcGFuZWxAbHpiei5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "1risn5j48kgzdhlyrll5s4qwdznhzqshflz18zgfhx336yngp34f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHBhbmVsIHRvIHNlY29uZGFyeSBtb25pdG9yIG9uIHN0YXJ0dXAsIHdpdGhvdXQgY2hhbmdpbmcgdGhlIHByaW1hcnkgZGlzcGxheS4gT25seSB3b3JrcyBvbiBXYXlsYW5kLiIsCiAgIm5hbWUiOiAiTW92ZSBQYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9semJ6L21vdmUtcGFuZWwiLAogICJ1dWlkIjogIm1vdmUtcGFuZWxAbHpiei5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "usable-overview@mechtifs", "name": "Usable Overview", "pname": "usable-overview", "description": "Right click at top left corner to bring up apps menu.", "link": "https://extensions.gnome.org/extension/4895/usable-overview/", "shell_version_map": {"40": {"version": "2", "sha256": "03rfnfa4d4qcgcishfh61f12sn5j4smdsnnfbjc5sbcgrqsshiwg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "03rfnfa4d4qcgcishfh61f12sn5j4smdsnnfbjc5sbcgrqsshiwg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "03rfnfa4d4qcgcishfh61f12sn5j4smdsnnfbjc5sbcgrqsshiwg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "03rfnfa4d4qcgcishfh61f12sn5j4smdsnnfbjc5sbcgrqsshiwg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"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.\nScroll Mouse on panel icon, can change the shape.", "link": "https://extensions.gnome.org/extension/4901/screen-net-speed/", "shell_version_map": {"40": {"version": "6", "sha256": "18wr7jxydm4394bjais986q9qrx8w0kmljyy56z93hmj45pwq0c2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQW5pbWF0aW9uIG5ldCBzcGVlZCBzaG93IG9uIHRoZSBzY3JlZW4uIFlvdSBjYW4gY2xpY2sgaXQgdG8gaGF2ZSBmdW4gYW5kIHBhc3MgdGhlIHRpbWUuIENhbiBiZSB0dXJuZWQgb24gLyBvZmYgYXQgYW55IHRpbWUuXG5TY3JvbGwgTW91c2Ugb24gcGFuZWwgaWNvbiwgY2FuIGNoYW5nZSB0aGUgc2hhcGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2NyZWVuLW5ldC1zcGVlZCIsCiAgIm5hbWUiOiAiU2NyZWVuIE5ldCBTcGVlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLXNwZWVkIiwKICAidXVpZCI6ICJzcGVlZEBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "18wr7jxydm4394bjais986q9qrx8w0kmljyy56z93hmj45pwq0c2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQW5pbWF0aW9uIG5ldCBzcGVlZCBzaG93IG9uIHRoZSBzY3JlZW4uIFlvdSBjYW4gY2xpY2sgaXQgdG8gaGF2ZSBmdW4gYW5kIHBhc3MgdGhlIHRpbWUuIENhbiBiZSB0dXJuZWQgb24gLyBvZmYgYXQgYW55IHRpbWUuXG5TY3JvbGwgTW91c2Ugb24gcGFuZWwgaWNvbiwgY2FuIGNoYW5nZSB0aGUgc2hhcGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2NyZWVuLW5ldC1zcGVlZCIsCiAgIm5hbWUiOiAiU2NyZWVuIE5ldCBTcGVlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLXNwZWVkIiwKICAidXVpZCI6ICJzcGVlZEBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "18wr7jxydm4394bjais986q9qrx8w0kmljyy56z93hmj45pwq0c2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQW5pbWF0aW9uIG5ldCBzcGVlZCBzaG93IG9uIHRoZSBzY3JlZW4uIFlvdSBjYW4gY2xpY2sgaXQgdG8gaGF2ZSBmdW4gYW5kIHBhc3MgdGhlIHRpbWUuIENhbiBiZSB0dXJuZWQgb24gLyBvZmYgYXQgYW55IHRpbWUuXG5TY3JvbGwgTW91c2Ugb24gcGFuZWwgaWNvbiwgY2FuIGNoYW5nZSB0aGUgc2hhcGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2NyZWVuLW5ldC1zcGVlZCIsCiAgIm5hbWUiOiAiU2NyZWVuIE5ldCBTcGVlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLXNwZWVkIiwKICAidXVpZCI6ICJzcGVlZEBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"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": "4", "sha256": "1mjwpm8078d4n2ff5rsq4plp5fhsf91k1f2zar6f5jf650bzz6rh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJ1dHRvbiBwb3dlciBvZmYiLAogICJuYW1lIjogIkFkZCBTaHV0ZG93biBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhZGRzaHV0YnV0dG9uQGplcm9tQG9saWthLm92aCIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1mjwpm8078d4n2ff5rsq4plp5fhsf91k1f2zar6f5jf650bzz6rh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJ1dHRvbiBwb3dlciBvZmYiLAogICJuYW1lIjogIkFkZCBTaHV0ZG93biBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhZGRzaHV0YnV0dG9uQGplcm9tQG9saWthLm92aCIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"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": "12", "sha256": "1fp65hv89f8v3ckffq26x0f435sa1m9p5cwd5ixyykiix0l5q9xl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "12", "sha256": "1fp65hv89f8v3ckffq26x0f435sa1m9p5cwd5ixyykiix0l5q9xl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "1fp65hv89f8v3ckffq26x0f435sa1m9p5cwd5ixyykiix0l5q9xl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "12", "sha256": "1fp65hv89f8v3ckffq26x0f435sa1m9p5cwd5ixyykiix0l5q9xl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEyCn0="}, "43": {"version": "12", "sha256": "1fp65hv89f8v3ckffq26x0f435sa1m9p5cwd5ixyykiix0l5q9xl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEyCn0="}}} +, {"uuid": "eepresetselector@ulville.github.io", "name": "EasyEffects Preset Selector", "pname": "easyeffects-preset-selector", "description": "Quickly show and load EasyEffects Presets\n\n# What's Changed in version 14:\n- If there are a ton of presets or screen resolution is low, the list of presets would overflow the screen area. This update fixes it by placing presets into scrollable menu sections in case of an overflow.", "link": "https://extensions.gnome.org/extension/4907/easyeffects-preset-selector/", "shell_version_map": {"38": {"version": "14", "sha256": "0ck8kwxkn7a24p73sixzjzxvmlck69a8v515riksqsrb6hh0zjgl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzXG5cbiMgV2hhdCdzIENoYW5nZWQgaW4gdmVyc2lvbiAxNDpcbi0gSWYgdGhlcmUgYXJlIGEgdG9uIG9mIHByZXNldHMgb3Igc2NyZWVuIHJlc29sdXRpb24gaXMgbG93LCB0aGUgbGlzdCBvZiBwcmVzZXRzIHdvdWxkIG92ZXJmbG93IHRoZSBzY3JlZW4gYXJlYS4gVGhpcyB1cGRhdGUgZml4ZXMgaXQgYnkgcGxhY2luZyBwcmVzZXRzIGludG8gc2Nyb2xsYWJsZSBtZW51IHNlY3Rpb25zIGluIGNhc2Ugb2YgYW4gb3ZlcmZsb3cuIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "40": {"version": "14", "sha256": "0ck8kwxkn7a24p73sixzjzxvmlck69a8v515riksqsrb6hh0zjgl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzXG5cbiMgV2hhdCdzIENoYW5nZWQgaW4gdmVyc2lvbiAxNDpcbi0gSWYgdGhlcmUgYXJlIGEgdG9uIG9mIHByZXNldHMgb3Igc2NyZWVuIHJlc29sdXRpb24gaXMgbG93LCB0aGUgbGlzdCBvZiBwcmVzZXRzIHdvdWxkIG92ZXJmbG93IHRoZSBzY3JlZW4gYXJlYS4gVGhpcyB1cGRhdGUgZml4ZXMgaXQgYnkgcGxhY2luZyBwcmVzZXRzIGludG8gc2Nyb2xsYWJsZSBtZW51IHNlY3Rpb25zIGluIGNhc2Ugb2YgYW4gb3ZlcmZsb3cuIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "0ck8kwxkn7a24p73sixzjzxvmlck69a8v515riksqsrb6hh0zjgl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzXG5cbiMgV2hhdCdzIENoYW5nZWQgaW4gdmVyc2lvbiAxNDpcbi0gSWYgdGhlcmUgYXJlIGEgdG9uIG9mIHByZXNldHMgb3Igc2NyZWVuIHJlc29sdXRpb24gaXMgbG93LCB0aGUgbGlzdCBvZiBwcmVzZXRzIHdvdWxkIG92ZXJmbG93IHRoZSBzY3JlZW4gYXJlYS4gVGhpcyB1cGRhdGUgZml4ZXMgaXQgYnkgcGxhY2luZyBwcmVzZXRzIGludG8gc2Nyb2xsYWJsZSBtZW51IHNlY3Rpb25zIGluIGNhc2Ugb2YgYW4gb3ZlcmZsb3cuIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "14", "sha256": "0ck8kwxkn7a24p73sixzjzxvmlck69a8v515riksqsrb6hh0zjgl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzXG5cbiMgV2hhdCdzIENoYW5nZWQgaW4gdmVyc2lvbiAxNDpcbi0gSWYgdGhlcmUgYXJlIGEgdG9uIG9mIHByZXNldHMgb3Igc2NyZWVuIHJlc29sdXRpb24gaXMgbG93LCB0aGUgbGlzdCBvZiBwcmVzZXRzIHdvdWxkIG92ZXJmbG93IHRoZSBzY3JlZW4gYXJlYS4gVGhpcyB1cGRhdGUgZml4ZXMgaXQgYnkgcGxhY2luZyBwcmVzZXRzIGludG8gc2Nyb2xsYWJsZSBtZW51IHNlY3Rpb25zIGluIGNhc2Ugb2YgYW4gb3ZlcmZsb3cuIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "43": {"version": "14", "sha256": "0ck8kwxkn7a24p73sixzjzxvmlck69a8v515riksqsrb6hh0zjgl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzXG5cbiMgV2hhdCdzIENoYW5nZWQgaW4gdmVyc2lvbiAxNDpcbi0gSWYgdGhlcmUgYXJlIGEgdG9uIG9mIHByZXNldHMgb3Igc2NyZWVuIHJlc29sdXRpb24gaXMgbG93LCB0aGUgbGlzdCBvZiBwcmVzZXRzIHdvdWxkIG92ZXJmbG93IHRoZSBzY3JlZW4gYXJlYS4gVGhpcyB1cGRhdGUgZml4ZXMgaXQgYnkgcGxhY2luZyBwcmVzZXRzIGludG8gc2Nyb2xsYWJsZSBtZW51IHNlY3Rpb25zIGluIGNhc2Ugb2YgYW4gb3ZlcmZsb3cuIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} , {"uuid": "gnomehub@gnome-hub.github.io", "name": "gnomehub", "pname": "gnomehub", "description": "An all in one extension which catagorizes notifications and displays system information", "link": "https://extensions.gnome.org/extension/4913/gnomehub/", "shell_version_map": {"38": {"version": "6", "sha256": "15dgj0jbfhsa0p87gi0ai6c55kj4nj9yz5ydpzamwy69k9jjjcd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGFsbCBpbiBvbmUgZXh0ZW5zaW9uIHdoaWNoIGNhdGFnb3JpemVzIG5vdGlmaWNhdGlvbnMgYW5kIGRpc3BsYXlzIHN5c3RlbSBpbmZvcm1hdGlvbiIsCiAgIm5hbWUiOiAiZ25vbWVodWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dub21lLWh1Yi5naXRodWIuaW8vIiwKICAidXVpZCI6ICJnbm9tZWh1YkBnbm9tZS1odWIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "15dgj0jbfhsa0p87gi0ai6c55kj4nj9yz5ydpzamwy69k9jjjcd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGFsbCBpbiBvbmUgZXh0ZW5zaW9uIHdoaWNoIGNhdGFnb3JpemVzIG5vdGlmaWNhdGlvbnMgYW5kIGRpc3BsYXlzIHN5c3RlbSBpbmZvcm1hdGlvbiIsCiAgIm5hbWUiOiAiZ25vbWVodWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dub21lLWh1Yi5naXRodWIuaW8vIiwKICAidXVpZCI6ICJnbm9tZWh1YkBnbm9tZS1odWIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"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": "2", "sha256": "0524g5yc4k0sgdy1v6dah5y3nrf95zdl94nmqp5x77nwmdxvdpqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9za29za2kvZ25vbWUtc2hlbGwtdm9sdW1lLXNjcm9sbGVyIiwKICAidXVpZCI6ICJ2b2x1bWVfc2Nyb2xsZXJAbm9za29za2kiLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "0524g5yc4k0sgdy1v6dah5y3nrf95zdl94nmqp5x77nwmdxvdpqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9za29za2kvZ25vbWUtc2hlbGwtdm9sdW1lLXNjcm9sbGVyIiwKICAidXVpZCI6ICJ2b2x1bWVfc2Nyb2xsZXJAbm9za29za2kiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "0524g5yc4k0sgdy1v6dah5y3nrf95zdl94nmqp5x77nwmdxvdpqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9za29za2kvZ25vbWUtc2hlbGwtdm9sdW1lLXNjcm9sbGVyIiwKICAidXVpZCI6ICJ2b2x1bWVfc2Nyb2xsZXJAbm9za29za2kiLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "0524g5yc4k0sgdy1v6dah5y3nrf95zdl94nmqp5x77nwmdxvdpqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9za29za2kvZ25vbWUtc2hlbGwtdm9sdW1lLXNjcm9sbGVyIiwKICAidXVpZCI6ICJ2b2x1bWVfc2Nyb2xsZXJAbm9za29za2kiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"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\nAdded i18n date, weather, temperature", "link": "https://extensions.gnome.org/extension/4919/weather/", "shell_version_map": {"40": {"version": "3", "sha256": "1ygk3jab26axk6wdn63wgfqlglrppyxwxh443bnwg1vyi3f6sz1a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGlvbiBXZWF0aGVyLiBcbk1vdXNlIDE6IHNob3cgd2VhdGhlclxuTW91c2UgMjogcmVmcmVzaCB3ZWF0aGVyXG5Nb3VzZSAzOiBkaXNtaXNzXG5TY3JvbGxVcDogaW5jcmVhc2UgZGF5XG5TY3JvbGxEb3duOiBkZWNyZWFzZSBkYXlcbkFkZGVkIGkxOG4gZGF0ZSwgd2VhdGhlciwgdGVtcGVyYXR1cmUiLAogICJuYW1lIjogIldlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy13ZWF0aGVyIiwKICAidXVpZCI6ICJ3ZWF0aGVyQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1ygk3jab26axk6wdn63wgfqlglrppyxwxh443bnwg1vyi3f6sz1a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGlvbiBXZWF0aGVyLiBcbk1vdXNlIDE6IHNob3cgd2VhdGhlclxuTW91c2UgMjogcmVmcmVzaCB3ZWF0aGVyXG5Nb3VzZSAzOiBkaXNtaXNzXG5TY3JvbGxVcDogaW5jcmVhc2UgZGF5XG5TY3JvbGxEb3duOiBkZWNyZWFzZSBkYXlcbkFkZGVkIGkxOG4gZGF0ZSwgd2VhdGhlciwgdGVtcGVyYXR1cmUiLAogICJuYW1lIjogIldlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy13ZWF0aGVyIiwKICAidXVpZCI6ICJ3ZWF0aGVyQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "13", "sha256": "05mijfwd5pxsf45bk1ld3g18dvdni41gz0yvq1bm944igp3wnqki", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGlvbiBXZWF0aGVyLiBcbk1vdXNlIDE6IHNob3cgd2VhdGhlclxuTW91c2UgMjogcmVmcmVzaCB3ZWF0aGVyXG5Nb3VzZSAzOiBkaXNtaXNzXG5TY3JvbGxVcDogaW5jcmVhc2UgZGF5XG5TY3JvbGxEb3duOiBkZWNyZWFzZSBkYXlcbkFkZGVkIGkxOG4gZGF0ZSwgd2VhdGhlciwgdGVtcGVyYXR1cmUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3ZWF0aGVyIiwKICAibmFtZSI6ICJXZWF0aGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3Mtd2VhdGhlciIsCiAgInV1aWQiOiAid2VhdGhlckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"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": {"38": {"version": "4", "sha256": "0jja1rwask9w4namal50pknprydqyskmz6hnpfvwz0v2d7398ksx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Fhcm9uQlBhZGVuL3doaXRlYm9yZGVyLWFhcm9uYnBhZGVuLmdtYWlsLmNvbSIsCiAgInV1aWQiOiAid2hpdGVib3JkZXJAYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "0jja1rwask9w4namal50pknprydqyskmz6hnpfvwz0v2d7398ksx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Fhcm9uQlBhZGVuL3doaXRlYm9yZGVyLWFhcm9uYnBhZGVuLmdtYWlsLmNvbSIsCiAgInV1aWQiOiAid2hpdGVib3JkZXJAYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0jja1rwask9w4namal50pknprydqyskmz6hnpfvwz0v2d7398ksx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Fhcm9uQlBhZGVuL3doaXRlYm9yZGVyLWFhcm9uYnBhZGVuLmdtYWlsLmNvbSIsCiAgInV1aWQiOiAid2hpdGVib3JkZXJAYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "0jja1rwask9w4namal50pknprydqyskmz6hnpfvwz0v2d7398ksx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Fhcm9uQlBhZGVuL3doaXRlYm9yZGVyLWFhcm9uYnBhZGVuLmdtYWlsLmNvbSIsCiAgInV1aWQiOiAid2hpdGVib3JkZXJAYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "0jja1rwask9w4namal50pknprydqyskmz6hnpfvwz0v2d7398ksx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Fhcm9uQlBhZGVuL3doaXRlYm9yZGVyLWFhcm9uYnBhZGVuLmdtYWlsLmNvbSIsCiAgInV1aWQiOiAid2hpdGVib3JkZXJAYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "git@eexpss.gmail.com", "name": "Git Monitor", "pname": "git", "description": "## monitor git directory for changes.\n> Working with a lot of git directories, I always forgot commit.\n### Panel Icon\n- Mouse 2, force refresh (re-read config file, check git dirs, refresh menu).\n- Mouse 3, open configfile. config file is `~/.config/git-monitor.json`.\n### Menu Item\n- Directory: Mouse 1 opened in the Files(Nautilus), Mouse 3 open in the gnome-terminal.\n- Files: Mouse 1, opened with `git difftool`, eg `meld`. Mouse 3, open file.", "link": "https://extensions.gnome.org/extension/4925/git/", "shell_version_map": {"40": {"version": "6", "sha256": "1ad7cavpbzkxqpk667gvqm74sls13ypyfsd7hps35bhjy00q2h6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMjIG1vbml0b3IgZ2l0IGRpcmVjdG9yeSBmb3IgY2hhbmdlcy5cbj4gV29ya2luZyB3aXRoIGEgbG90IG9mIGdpdCBkaXJlY3RvcmllcywgSSBhbHdheXMgZm9yZ290IGNvbW1pdC5cbiMjIyBQYW5lbCBJY29uXG4tIE1vdXNlIDIsIGZvcmNlIHJlZnJlc2ggKHJlLXJlYWQgY29uZmlnIGZpbGUsIGNoZWNrIGdpdCBkaXJzLCByZWZyZXNoIG1lbnUpLlxuLSBNb3VzZSAzLCBvcGVuIGNvbmZpZ2ZpbGUuIGNvbmZpZyBmaWxlIGlzIGB+Ly5jb25maWcvZ2l0LW1vbml0b3IuanNvbmAuXG4jIyMgTWVudSBJdGVtXG4tIERpcmVjdG9yeTogTW91c2UgMSBvcGVuZWQgaW4gdGhlIEZpbGVzKE5hdXRpbHVzKSwgTW91c2UgMyBvcGVuIGluIHRoZSBnbm9tZS10ZXJtaW5hbC5cbi0gRmlsZXM6IE1vdXNlIDEsIG9wZW5lZCB3aXRoIGBnaXQgZGlmZnRvb2xgLCBlZyBgbWVsZGAuIE1vdXNlIDMsIG9wZW4gZmlsZS4iLAogICJuYW1lIjogIkdpdCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtZ2l0IiwKICAidXVpZCI6ICJnaXRAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1ad7cavpbzkxqpk667gvqm74sls13ypyfsd7hps35bhjy00q2h6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMjIG1vbml0b3IgZ2l0IGRpcmVjdG9yeSBmb3IgY2hhbmdlcy5cbj4gV29ya2luZyB3aXRoIGEgbG90IG9mIGdpdCBkaXJlY3RvcmllcywgSSBhbHdheXMgZm9yZ290IGNvbW1pdC5cbiMjIyBQYW5lbCBJY29uXG4tIE1vdXNlIDIsIGZvcmNlIHJlZnJlc2ggKHJlLXJlYWQgY29uZmlnIGZpbGUsIGNoZWNrIGdpdCBkaXJzLCByZWZyZXNoIG1lbnUpLlxuLSBNb3VzZSAzLCBvcGVuIGNvbmZpZ2ZpbGUuIGNvbmZpZyBmaWxlIGlzIGB+Ly5jb25maWcvZ2l0LW1vbml0b3IuanNvbmAuXG4jIyMgTWVudSBJdGVtXG4tIERpcmVjdG9yeTogTW91c2UgMSBvcGVuZWQgaW4gdGhlIEZpbGVzKE5hdXRpbHVzKSwgTW91c2UgMyBvcGVuIGluIHRoZSBnbm9tZS10ZXJtaW5hbC5cbi0gRmlsZXM6IE1vdXNlIDEsIG9wZW5lZCB3aXRoIGBnaXQgZGlmZnRvb2xgLCBlZyBgbWVsZGAuIE1vdXNlIDMsIG9wZW4gZmlsZS4iLAogICJuYW1lIjogIkdpdCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtZ2l0IiwKICAidXVpZCI6ICJnaXRAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "1ad7cavpbzkxqpk667gvqm74sls13ypyfsd7hps35bhjy00q2h6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMjIG1vbml0b3IgZ2l0IGRpcmVjdG9yeSBmb3IgY2hhbmdlcy5cbj4gV29ya2luZyB3aXRoIGEgbG90IG9mIGdpdCBkaXJlY3RvcmllcywgSSBhbHdheXMgZm9yZ290IGNvbW1pdC5cbiMjIyBQYW5lbCBJY29uXG4tIE1vdXNlIDIsIGZvcmNlIHJlZnJlc2ggKHJlLXJlYWQgY29uZmlnIGZpbGUsIGNoZWNrIGdpdCBkaXJzLCByZWZyZXNoIG1lbnUpLlxuLSBNb3VzZSAzLCBvcGVuIGNvbmZpZ2ZpbGUuIGNvbmZpZyBmaWxlIGlzIGB+Ly5jb25maWcvZ2l0LW1vbml0b3IuanNvbmAuXG4jIyMgTWVudSBJdGVtXG4tIERpcmVjdG9yeTogTW91c2UgMSBvcGVuZWQgaW4gdGhlIEZpbGVzKE5hdXRpbHVzKSwgTW91c2UgMyBvcGVuIGluIHRoZSBnbm9tZS10ZXJtaW5hbC5cbi0gRmlsZXM6IE1vdXNlIDEsIG9wZW5lZCB3aXRoIGBnaXQgZGlmZnRvb2xgLCBlZyBgbWVsZGAuIE1vdXNlIDMsIG9wZW4gZmlsZS4iLAogICJuYW1lIjogIkdpdCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtZ2l0IiwKICAidXVpZCI6ICJnaXRAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} -, {"uuid": "mprisLabel@moon-0xff.github.com", "name": "Mpris Label", "pname": "mpris-label", "description": "Displays a label in the top bar with metadata from an mpris compatible source. It works with Spotify, Vlc, Rhythmbox, Chromium based browsers and (probably) any mpris compatible player.", "link": "https://extensions.gnome.org/extension/4928/mpris-label/", "shell_version_map": {"38": {"version": "3", "sha256": "1sqih9f21jybimxm7h4qb8x9rxsp3qj9gpkhnvnzf1djn5zvy90q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbGFiZWwgaW4gdGhlIHRvcCBiYXIgd2l0aCBtZXRhZGF0YSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgc291cmNlLiBJdCB3b3JrcyB3aXRoIFNwb3RpZnksIFZsYywgUmh5dGhtYm94LCBDaHJvbWl1bSBiYXNlZCBicm93c2VycyBhbmQgKHByb2JhYmx5KSBhbnkgbXByaXMgY29tcGF0aWJsZSBwbGF5ZXIuIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1sqih9f21jybimxm7h4qb8x9rxsp3qj9gpkhnvnzf1djn5zvy90q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbGFiZWwgaW4gdGhlIHRvcCBiYXIgd2l0aCBtZXRhZGF0YSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgc291cmNlLiBJdCB3b3JrcyB3aXRoIFNwb3RpZnksIFZsYywgUmh5dGhtYm94LCBDaHJvbWl1bSBiYXNlZCBicm93c2VycyBhbmQgKHByb2JhYmx5KSBhbnkgbXByaXMgY29tcGF0aWJsZSBwbGF5ZXIuIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1sqih9f21jybimxm7h4qb8x9rxsp3qj9gpkhnvnzf1djn5zvy90q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbGFiZWwgaW4gdGhlIHRvcCBiYXIgd2l0aCBtZXRhZGF0YSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgc291cmNlLiBJdCB3b3JrcyB3aXRoIFNwb3RpZnksIFZsYywgUmh5dGhtYm94LCBDaHJvbWl1bSBiYXNlZCBicm93c2VycyBhbmQgKHByb2JhYmx5KSBhbnkgbXByaXMgY29tcGF0aWJsZSBwbGF5ZXIuIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "1sqih9f21jybimxm7h4qb8x9rxsp3qj9gpkhnvnzf1djn5zvy90q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbGFiZWwgaW4gdGhlIHRvcCBiYXIgd2l0aCBtZXRhZGF0YSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgc291cmNlLiBJdCB3b3JrcyB3aXRoIFNwb3RpZnksIFZsYywgUmh5dGhtYm94LCBDaHJvbWl1bSBiYXNlZCBicm93c2VycyBhbmQgKHByb2JhYmx5KSBhbnkgbXByaXMgY29tcGF0aWJsZSBwbGF5ZXIuIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "1sqih9f21jybimxm7h4qb8x9rxsp3qj9gpkhnvnzf1djn5zvy90q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbGFiZWwgaW4gdGhlIHRvcCBiYXIgd2l0aCBtZXRhZGF0YSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgc291cmNlLiBJdCB3b3JrcyB3aXRoIFNwb3RpZnksIFZsYywgUmh5dGhtYm94LCBDaHJvbWl1bSBiYXNlZCBicm93c2VycyBhbmQgKHByb2JhYmx5KSBhbnkgbXByaXMgY29tcGF0aWJsZSBwbGF5ZXIuIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} +, {"uuid": "mprisLabel@moon-0xff.github.com", "name": "Mpris Label", "pname": "mpris-label", "description": "Display in your panel the (song)title, album and/or artist name available from an mpris compatible player, such as Spotify, Vlc, Rhythmbox, Firefox, Chromium and many more. Lots of features and very customizable!\n\nLast update: Version 12 (Jan 26 2023)\n- Fixes issues with the panel position being \"stolen\" by other extensions\n- Adds filters to allow/disallow specified mpris sources\n- Adds tooltips(hints) for various options\n\nAny feedback is gladly welcomed!", "link": "https://extensions.gnome.org/extension/4928/mpris-label/", "shell_version_map": {"38": {"version": "12", "sha256": "1a12m9ih7p58375l8s9f3cdib7z7hk1z0lmk3ny7hpp94wgvnsyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "12", "sha256": "1a12m9ih7p58375l8s9f3cdib7z7hk1z0lmk3ny7hpp94wgvnsyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "1a12m9ih7p58375l8s9f3cdib7z7hk1z0lmk3ny7hpp94wgvnsyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "12", "sha256": "1a12m9ih7p58375l8s9f3cdib7z7hk1z0lmk3ny7hpp94wgvnsyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "43": {"version": "12", "sha256": "1a12m9ih7p58375l8s9f3cdib7z7hk1z0lmk3ny7hpp94wgvnsyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}}} , {"uuid": "captivate@rensoliemans.nl", "name": "Captivate", "pname": "captivate", "description": "Activate your CapsLock button.\nUsing gnome-tweaks, remap your CapsLock to a Menu key, and then this extension works perfectly. Alternatively, choose a different key in the extension settings.\n\nDon't forget to log out and in again if you're updating the extension manually.", "link": "https://extensions.gnome.org/extension/4932/captivate/", "shell_version_map": {"40": {"version": "6", "sha256": "1lpaq3pbhg0c90xbvhwi9hz8m5nzvfgw14g61wg7f8fc17a7s77i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIHlvdXIgQ2Fwc0xvY2sgYnV0dG9uLlxuVXNpbmcgZ25vbWUtdHdlYWtzLCByZW1hcCB5b3VyIENhcHNMb2NrIHRvIGEgTWVudSBrZXksIGFuZCB0aGVuIHRoaXMgZXh0ZW5zaW9uIHdvcmtzIHBlcmZlY3RseS4gQWx0ZXJuYXRpdmVseSwgY2hvb3NlIGEgZGlmZmVyZW50IGtleSBpbiB0aGUgZXh0ZW5zaW9uIHNldHRpbmdzLlxuXG5Eb24ndCBmb3JnZXQgdG8gbG9nIG91dCBhbmQgaW4gYWdhaW4gaWYgeW91J3JlIHVwZGF0aW5nIHRoZSBleHRlbnNpb24gbWFudWFsbHkuIiwKICAibmFtZSI6ICJDYXB0aXZhdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2FwdGl2YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmVuc29saWVtYW5zL2NhcHRpdmF0ZSIsCiAgInV1aWQiOiAiY2FwdGl2YXRlQHJlbnNvbGllbWFucy5ubCIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1lpaq3pbhg0c90xbvhwi9hz8m5nzvfgw14g61wg7f8fc17a7s77i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIHlvdXIgQ2Fwc0xvY2sgYnV0dG9uLlxuVXNpbmcgZ25vbWUtdHdlYWtzLCByZW1hcCB5b3VyIENhcHNMb2NrIHRvIGEgTWVudSBrZXksIGFuZCB0aGVuIHRoaXMgZXh0ZW5zaW9uIHdvcmtzIHBlcmZlY3RseS4gQWx0ZXJuYXRpdmVseSwgY2hvb3NlIGEgZGlmZmVyZW50IGtleSBpbiB0aGUgZXh0ZW5zaW9uIHNldHRpbmdzLlxuXG5Eb24ndCBmb3JnZXQgdG8gbG9nIG91dCBhbmQgaW4gYWdhaW4gaWYgeW91J3JlIHVwZGF0aW5nIHRoZSBleHRlbnNpb24gbWFudWFsbHkuIiwKICAibmFtZSI6ICJDYXB0aXZhdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2FwdGl2YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmVuc29saWVtYW5zL2NhcHRpdmF0ZSIsCiAgInV1aWQiOiAiY2FwdGl2YXRlQHJlbnNvbGllbWFucy5ubCIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "1lpaq3pbhg0c90xbvhwi9hz8m5nzvfgw14g61wg7f8fc17a7s77i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIHlvdXIgQ2Fwc0xvY2sgYnV0dG9uLlxuVXNpbmcgZ25vbWUtdHdlYWtzLCByZW1hcCB5b3VyIENhcHNMb2NrIHRvIGEgTWVudSBrZXksIGFuZCB0aGVuIHRoaXMgZXh0ZW5zaW9uIHdvcmtzIHBlcmZlY3RseS4gQWx0ZXJuYXRpdmVseSwgY2hvb3NlIGEgZGlmZmVyZW50IGtleSBpbiB0aGUgZXh0ZW5zaW9uIHNldHRpbmdzLlxuXG5Eb24ndCBmb3JnZXQgdG8gbG9nIG91dCBhbmQgaW4gYWdhaW4gaWYgeW91J3JlIHVwZGF0aW5nIHRoZSBleHRlbnNpb24gbWFudWFsbHkuIiwKICAibmFtZSI6ICJDYXB0aXZhdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2FwdGl2YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmVuc29saWVtYW5zL2NhcHRpdmF0ZSIsCiAgInV1aWQiOiAiY2FwdGl2YXRlQHJlbnNvbGllbWFucy5ubCIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "goto-previous-workspaces@zubarev.net", "name": "Switch workspaces to previous", "pname": "switch-workspaces-to-previous", "description": "move to previous workspace", "link": "https://extensions.gnome.org/extension/4935/switch-workspaces-to-previous/", "shell_version_map": {"38": {"version": "1", "sha256": "0f2ri8w9zh49z81ya12rrfclmljhgv05yl30s0jbgafi9im396cv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG8gcHJldmlvdXMgd29ya3NwYWNlIiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyB0byBwcmV2aW91cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiYW5kcmV5QHp1YmFyZXYubmV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvdG8tcHJldmlvdXMtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F6eW9za29sL2dub21lLXNoZWxsLWV4dGVuc2lvbi1nb3RvLXByZXZpb3VzLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogImdvdG8tcHJldmlvdXMtd29ya3NwYWNlc0B6dWJhcmV2Lm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}, "40": {"version": "1", "sha256": "0f2ri8w9zh49z81ya12rrfclmljhgv05yl30s0jbgafi9im396cv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG8gcHJldmlvdXMgd29ya3NwYWNlIiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyB0byBwcmV2aW91cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiYW5kcmV5QHp1YmFyZXYubmV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvdG8tcHJldmlvdXMtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F6eW9za29sL2dub21lLXNoZWxsLWV4dGVuc2lvbi1nb3RvLXByZXZpb3VzLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogImdvdG8tcHJldmlvdXMtd29ya3NwYWNlc0B6dWJhcmV2Lm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "0f2ri8w9zh49z81ya12rrfclmljhgv05yl30s0jbgafi9im396cv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG8gcHJldmlvdXMgd29ya3NwYWNlIiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyB0byBwcmV2aW91cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiYW5kcmV5QHp1YmFyZXYubmV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvdG8tcHJldmlvdXMtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F6eW9za29sL2dub21lLXNoZWxsLWV4dGVuc2lvbi1nb3RvLXByZXZpb3VzLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogImdvdG8tcHJldmlvdXMtd29ya3NwYWNlc0B6dWJhcmV2Lm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "0f2ri8w9zh49z81ya12rrfclmljhgv05yl30s0jbgafi9im396cv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG8gcHJldmlvdXMgd29ya3NwYWNlIiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyB0byBwcmV2aW91cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiYW5kcmV5QHp1YmFyZXYubmV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvdG8tcHJldmlvdXMtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F6eW9za29sL2dub21lLXNoZWxsLWV4dGVuc2lvbi1nb3RvLXByZXZpb3VzLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogImdvdG8tcHJldmlvdXMtd29ya3NwYWNlc0B6dWJhcmV2Lm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "draw-on-your-screen2@zhrexl.github.com", "name": "Draw On Your Screen 2", "pname": "draw-on-you-screen-2", "description": "This is a fork from Abakk Draw On Your Screen. Start drawing with Super+Alt+D and save your beautiful work by taking a screenshot", "link": "https://extensions.gnome.org/extension/4937/draw-on-you-screen-2/", "shell_version_map": {"40": {"version": "1", "sha256": "052v97bj47dxmm5gpz0yqbkdkfrqmf03mq3q2qpippzy6lmf7h7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhdGEtZGlyIjogImRyYXctb24teW91ci1zY3JlZW4iLAogICJkZXNjcmlwdGlvbiI6ICJUaGlzIGlzIGEgZm9yayBmcm9tIEFiYWtrIERyYXcgT24gWW91ciBTY3JlZW4uIFN0YXJ0IGRyYXdpbmcgd2l0aCBTdXBlcitBbHQrRCBhbmQgc2F2ZSB5b3VyIGJlYXV0aWZ1bCB3b3JrIGJ5IHRha2luZyBhIHNjcmVlbnNob3QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkcmF3LW9uLXlvdXItc2NyZWVuIiwKICAibmFtZSI6ICJEcmF3IE9uIFlvdXIgU2NyZWVuIDIiLAogICJwZXJzaXN0ZW50LWZpbGUtbmFtZSI6ICJwZXJzaXN0ZW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyYXctb24teW91ci1zY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJzdmctZmlsZS1uYW1lIjogIkRyYXdPbllvdXJTY3JlZW4iLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3pocmV4bC9EcmF3T25Zb3VyU2NyZWVuMiIsCiAgInV1aWQiOiAiZHJhdy1vbi15b3VyLXNjcmVlbjJAemhyZXhsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "052v97bj47dxmm5gpz0yqbkdkfrqmf03mq3q2qpippzy6lmf7h7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhdGEtZGlyIjogImRyYXctb24teW91ci1zY3JlZW4iLAogICJkZXNjcmlwdGlvbiI6ICJUaGlzIGlzIGEgZm9yayBmcm9tIEFiYWtrIERyYXcgT24gWW91ciBTY3JlZW4uIFN0YXJ0IGRyYXdpbmcgd2l0aCBTdXBlcitBbHQrRCBhbmQgc2F2ZSB5b3VyIGJlYXV0aWZ1bCB3b3JrIGJ5IHRha2luZyBhIHNjcmVlbnNob3QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkcmF3LW9uLXlvdXItc2NyZWVuIiwKICAibmFtZSI6ICJEcmF3IE9uIFlvdXIgU2NyZWVuIDIiLAogICJwZXJzaXN0ZW50LWZpbGUtbmFtZSI6ICJwZXJzaXN0ZW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyYXctb24teW91ci1zY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJzdmctZmlsZS1uYW1lIjogIkRyYXdPbllvdXJTY3JlZW4iLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3pocmV4bC9EcmF3T25Zb3VyU2NyZWVuMiIsCiAgInV1aWQiOiAiZHJhdy1vbi15b3VyLXNjcmVlbjJAemhyZXhsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "42": {"version": "3", "sha256": "0kh895fvimv9xibznnigg3filyba9k2s883y3zn9xqpkj9lsf9qb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhdGEtZGlyIjogImRyYXctb24teW91ci1zY3JlZW4iLAogICJkZXNjcmlwdGlvbiI6ICJUaGlzIGlzIGEgZm9yayBmcm9tIEFiYWtrIERyYXcgT24gWW91ciBTY3JlZW4uIFN0YXJ0IGRyYXdpbmcgd2l0aCBTdXBlcitBbHQrRCBhbmQgc2F2ZSB5b3VyIGJlYXV0aWZ1bCB3b3JrIGJ5IHRha2luZyBhIHNjcmVlbnNob3QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkcmF3LW9uLXlvdXItc2NyZWVuIiwKICAibmFtZSI6ICJEcmF3IE9uIFlvdXIgU2NyZWVuIDIiLAogICJwZXJzaXN0ZW50LWZpbGUtbmFtZSI6ICJwZXJzaXN0ZW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyYXctb24teW91ci1zY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJzdmctZmlsZS1uYW1lIjogIkRyYXdPbllvdXJTY3JlZW4iLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3pocmV4bC9EcmF3T25Zb3VyU2NyZWVuMiIsCiAgInV1aWQiOiAiZHJhdy1vbi15b3VyLXNjcmVlbjJAemhyZXhsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "0kh895fvimv9xibznnigg3filyba9k2s883y3zn9xqpkj9lsf9qb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhdGEtZGlyIjogImRyYXctb24teW91ci1zY3JlZW4iLAogICJkZXNjcmlwdGlvbiI6ICJUaGlzIGlzIGEgZm9yayBmcm9tIEFiYWtrIERyYXcgT24gWW91ciBTY3JlZW4uIFN0YXJ0IGRyYXdpbmcgd2l0aCBTdXBlcitBbHQrRCBhbmQgc2F2ZSB5b3VyIGJlYXV0aWZ1bCB3b3JrIGJ5IHRha2luZyBhIHNjcmVlbnNob3QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkcmF3LW9uLXlvdXItc2NyZWVuIiwKICAibmFtZSI6ICJEcmF3IE9uIFlvdXIgU2NyZWVuIDIiLAogICJwZXJzaXN0ZW50LWZpbGUtbmFtZSI6ICJwZXJzaXN0ZW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyYXctb24teW91ci1zY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJzdmctZmlsZS1uYW1lIjogIkRyYXdPbllvdXJTY3JlZW4iLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3pocmV4bC9EcmF3T25Zb3VyU2NyZWVuMiIsCiAgInV1aWQiOiAiZHJhdy1vbi15b3VyLXNjcmVlbjJAemhyZXhsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "aztaskbar@aztaskbar.gitlab.com", "name": "App Icons Taskbar", "pname": "app-icons-taskbar", "description": "A simple app icon taskbar. Show running apps and favorites on the main panel.", "link": "https://extensions.gnome.org/extension/4944/app-icons-taskbar/", "shell_version_map": {"41": {"version": "7", "sha256": "1slix3771pmzdbhwsacssvbplfgsg7sq1in4xrja3wfz5ffikdb7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6dGFza2JhciIsCiAgInV1aWQiOiAiYXp0YXNrYmFyQGF6dGFza2Jhci5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "12", "sha256": "08yziv7pj9dj5ay9v2jyh11rfz45mb1r3ncp7qy2mmmv7ps9041p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6dGFza2JhciIsCiAgInV1aWQiOiAiYXp0YXNrYmFyQGF6dGFza2Jhci5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "43": {"version": "12", "sha256": "08yziv7pj9dj5ay9v2jyh11rfz45mb1r3ncp7qy2mmmv7ps9041p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6dGFza2JhciIsCiAgInV1aWQiOiAiYXp0YXNrYmFyQGF6dGFza2Jhci5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}}} +, {"uuid": "aztaskbar@aztaskbar.gitlab.com", "name": "App Icons Taskbar", "pname": "app-icons-taskbar", "description": "A simple app icon taskbar. Show running apps and favorites on the main panel.", "link": "https://extensions.gnome.org/extension/4944/app-icons-taskbar/", "shell_version_map": {"41": {"version": "7", "sha256": "1slix3771pmzdbhwsacssvbplfgsg7sq1in4xrja3wfz5ffikdb7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6dGFza2JhciIsCiAgInV1aWQiOiAiYXp0YXNrYmFyQGF6dGFza2Jhci5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "14", "sha256": "162sphzjjsdspx77140y6xpdvnmgv54ml3ahq5lnk5hjyzsqkapm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6dGFza2JhciIsCiAgInV1aWQiOiAiYXp0YXNrYmFyQGF6dGFza2Jhci5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "43": {"version": "14", "sha256": "162sphzjjsdspx77140y6xpdvnmgv54ml3ahq5lnk5hjyzsqkapm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6dGFza2JhciIsCiAgInV1aWQiOiAiYXp0YXNrYmFyQGF6dGFza2Jhci5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} , {"uuid": "netSpeedMonitor@nidyran.github.io", "name": "net speed monitor", "pname": "net-speed-monitor", "description": "This extension helps tracking and monitoring network speed. \nThere are five modes: \n1 - download speed only. \n2 - upload speed only. \n3 - download speed and upload speed together. \n4 - download speed and upload speed summed. \n5 - total data usage \nTo switch between modes, use left mouse click. \nTo switch between available sources, use right mouse click. \nTo change refresh time 200 - 1000 use middle mouse click. \nThe first source with usage higher than zero will be picked by default. \nThe extension will pick the first source by default, and if no traffic is established it will switch to the next one and so on\nThe source code is available in the link below, update requests are welcome.", "link": "https://extensions.gnome.org/extension/4947/net-speed-monitor/", "shell_version_map": {"38": {"version": "5", "sha256": "1zvp8zx82kqbf9ck55csgcysld3z1gr3cigkl5y73s5rvqj3ks5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHRyYWNraW5nIGFuZCBtb25pdG9yaW5nIG5ldHdvcmsgc3BlZWQuIFxuVGhlcmUgYXJlIGZpdmUgbW9kZXM6IFxuMSAtIGRvd25sb2FkIHNwZWVkIG9ubHkuIFxuMiAtIHVwbG9hZCBzcGVlZCBvbmx5LiBcbjMgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHRvZ2V0aGVyLiBcbjQgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHN1bW1lZC4gXG41IC0gdG90YWwgZGF0YSB1c2FnZSBcblRvIHN3aXRjaCBiZXR3ZWVuIG1vZGVzLCB1c2UgbGVmdCBtb3VzZSBjbGljay4gXG5UbyBzd2l0Y2ggYmV0d2VlbiBhdmFpbGFibGUgc291cmNlcywgdXNlIHJpZ2h0IG1vdXNlIGNsaWNrLiBcblRvIGNoYW5nZSByZWZyZXNoIHRpbWUgMjAwIC0gMTAwMCB1c2UgbWlkZGxlIG1vdXNlIGNsaWNrLiBcblRoZSBmaXJzdCBzb3VyY2Ugd2l0aCB1c2FnZSBoaWdoZXIgdGhhbiB6ZXJvIHdpbGwgYmUgcGlja2VkIGJ5IGRlZmF1bHQuIFxuVGhlIGV4dGVuc2lvbiB3aWxsIHBpY2sgdGhlIGZpcnN0IHNvdXJjZSBieSBkZWZhdWx0LCBhbmQgaWYgbm8gdHJhZmZpYyBpcyBlc3RhYmxpc2hlZCBpdCB3aWxsIHN3aXRjaCB0byB0aGUgbmV4dCBvbmUgYW5kIHNvIG9uXG5UaGUgc291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGluIHRoZSBsaW5rIGJlbG93LCB1cGRhdGUgcmVxdWVzdHMgYXJlIHdlbGNvbWUuIiwKICAibmFtZSI6ICJuZXQgc3BlZWQgbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmlkeXJhbi9uZXRTcGVlZE1vbml0b3IvIiwKICAidXVpZCI6ICJuZXRTcGVlZE1vbml0b3JAbmlkeXJhbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "1zvp8zx82kqbf9ck55csgcysld3z1gr3cigkl5y73s5rvqj3ks5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHRyYWNraW5nIGFuZCBtb25pdG9yaW5nIG5ldHdvcmsgc3BlZWQuIFxuVGhlcmUgYXJlIGZpdmUgbW9kZXM6IFxuMSAtIGRvd25sb2FkIHNwZWVkIG9ubHkuIFxuMiAtIHVwbG9hZCBzcGVlZCBvbmx5LiBcbjMgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHRvZ2V0aGVyLiBcbjQgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHN1bW1lZC4gXG41IC0gdG90YWwgZGF0YSB1c2FnZSBcblRvIHN3aXRjaCBiZXR3ZWVuIG1vZGVzLCB1c2UgbGVmdCBtb3VzZSBjbGljay4gXG5UbyBzd2l0Y2ggYmV0d2VlbiBhdmFpbGFibGUgc291cmNlcywgdXNlIHJpZ2h0IG1vdXNlIGNsaWNrLiBcblRvIGNoYW5nZSByZWZyZXNoIHRpbWUgMjAwIC0gMTAwMCB1c2UgbWlkZGxlIG1vdXNlIGNsaWNrLiBcblRoZSBmaXJzdCBzb3VyY2Ugd2l0aCB1c2FnZSBoaWdoZXIgdGhhbiB6ZXJvIHdpbGwgYmUgcGlja2VkIGJ5IGRlZmF1bHQuIFxuVGhlIGV4dGVuc2lvbiB3aWxsIHBpY2sgdGhlIGZpcnN0IHNvdXJjZSBieSBkZWZhdWx0LCBhbmQgaWYgbm8gdHJhZmZpYyBpcyBlc3RhYmxpc2hlZCBpdCB3aWxsIHN3aXRjaCB0byB0aGUgbmV4dCBvbmUgYW5kIHNvIG9uXG5UaGUgc291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGluIHRoZSBsaW5rIGJlbG93LCB1cGRhdGUgcmVxdWVzdHMgYXJlIHdlbGNvbWUuIiwKICAibmFtZSI6ICJuZXQgc3BlZWQgbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmlkeXJhbi9uZXRTcGVlZE1vbml0b3IvIiwKICAidXVpZCI6ICJuZXRTcGVlZE1vbml0b3JAbmlkeXJhbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "1zvp8zx82kqbf9ck55csgcysld3z1gr3cigkl5y73s5rvqj3ks5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHRyYWNraW5nIGFuZCBtb25pdG9yaW5nIG5ldHdvcmsgc3BlZWQuIFxuVGhlcmUgYXJlIGZpdmUgbW9kZXM6IFxuMSAtIGRvd25sb2FkIHNwZWVkIG9ubHkuIFxuMiAtIHVwbG9hZCBzcGVlZCBvbmx5LiBcbjMgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHRvZ2V0aGVyLiBcbjQgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHN1bW1lZC4gXG41IC0gdG90YWwgZGF0YSB1c2FnZSBcblRvIHN3aXRjaCBiZXR3ZWVuIG1vZGVzLCB1c2UgbGVmdCBtb3VzZSBjbGljay4gXG5UbyBzd2l0Y2ggYmV0d2VlbiBhdmFpbGFibGUgc291cmNlcywgdXNlIHJpZ2h0IG1vdXNlIGNsaWNrLiBcblRvIGNoYW5nZSByZWZyZXNoIHRpbWUgMjAwIC0gMTAwMCB1c2UgbWlkZGxlIG1vdXNlIGNsaWNrLiBcblRoZSBmaXJzdCBzb3VyY2Ugd2l0aCB1c2FnZSBoaWdoZXIgdGhhbiB6ZXJvIHdpbGwgYmUgcGlja2VkIGJ5IGRlZmF1bHQuIFxuVGhlIGV4dGVuc2lvbiB3aWxsIHBpY2sgdGhlIGZpcnN0IHNvdXJjZSBieSBkZWZhdWx0LCBhbmQgaWYgbm8gdHJhZmZpYyBpcyBlc3RhYmxpc2hlZCBpdCB3aWxsIHN3aXRjaCB0byB0aGUgbmV4dCBvbmUgYW5kIHNvIG9uXG5UaGUgc291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGluIHRoZSBsaW5rIGJlbG93LCB1cGRhdGUgcmVxdWVzdHMgYXJlIHdlbGNvbWUuIiwKICAibmFtZSI6ICJuZXQgc3BlZWQgbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmlkeXJhbi9uZXRTcGVlZE1vbml0b3IvIiwKICAidXVpZCI6ICJuZXRTcGVlZE1vbml0b3JAbmlkeXJhbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "gradienttopbar@pshow.org", "name": "Gradient Top Bar", "pname": "gradient-top-bar", "description": "Makes GNOME's topbar's background gradient.", "link": "https://extensions.gnome.org/extension/4955/gradient-top-bar/", "shell_version_map": {"38": {"version": "3", "sha256": "0i93xakwcmcxi29bbyw2i41rfby4qlrqcm4vfjpbc2h8q9kpxfh1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGV0YXItdi9ncmFkaWVudHRvcGJhciIsCiAgInV1aWQiOiAiZ3JhZGllbnR0b3BiYXJAcHNob3cub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "0i93xakwcmcxi29bbyw2i41rfby4qlrqcm4vfjpbc2h8q9kpxfh1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGV0YXItdi9ncmFkaWVudHRvcGJhciIsCiAgInV1aWQiOiAiZ3JhZGllbnR0b3BiYXJAcHNob3cub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "0i93xakwcmcxi29bbyw2i41rfby4qlrqcm4vfjpbc2h8q9kpxfh1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGV0YXItdi9ncmFkaWVudHRvcGJhciIsCiAgInV1aWQiOiAiZ3JhZGllbnR0b3BiYXJAcHNob3cub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "0i93xakwcmcxi29bbyw2i41rfby4qlrqcm4vfjpbc2h8q9kpxfh1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGV0YXItdi9ncmFkaWVudHRvcGJhciIsCiAgInV1aWQiOiAiZ3JhZGllbnR0b3BiYXJAcHNob3cub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "0i93xakwcmcxi29bbyw2i41rfby4qlrqcm4vfjpbc2h8q9kpxfh1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGV0YXItdi9ncmFkaWVudHRvcGJhciIsCiAgInV1aWQiOiAiZ3JhZGllbnR0b3BiYXJAcHNob3cub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} -, {"uuid": "clipman@popov895.ukr.net", "name": "Clipman", "pname": "clipman", "description": "Simple clipboard manager.", "link": "https://extensions.gnome.org/extension/4958/clipman/", "shell_version_map": {"40": {"version": "10", "sha256": "1z0nrwmsf4amp1jhgfwqbvsajjanwvnh0b9hn8giidqaz17fxdk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjbGlwYm9hcmQgbWFuYWdlci4iLAogICJuYW1lIjogIkNsaXBtYW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9DbGlwbWFuIiwKICAidXVpZCI6ICJjbGlwbWFuQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "1z0nrwmsf4amp1jhgfwqbvsajjanwvnh0b9hn8giidqaz17fxdk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjbGlwYm9hcmQgbWFuYWdlci4iLAogICJuYW1lIjogIkNsaXBtYW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9DbGlwbWFuIiwKICAidXVpZCI6ICJjbGlwbWFuQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "42": {"version": "22", "sha256": "0paiavxdsnwcnhn06qwxr774z6ar1ncx79g4kdzg3gv7wxs204qy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjbGlwYm9hcmQgbWFuYWdlci4iLAogICJuYW1lIjogIkNsaXBtYW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L0NsaXBtYW4iLAogICJ1dWlkIjogImNsaXBtYW5AcG9wb3Y4OTUudWtyLm5ldCIsCiAgInZlcnNpb24iOiAyMgp9"}, "43": {"version": "22", "sha256": "0paiavxdsnwcnhn06qwxr774z6ar1ncx79g4kdzg3gv7wxs204qy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjbGlwYm9hcmQgbWFuYWdlci4iLAogICJuYW1lIjogIkNsaXBtYW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L0NsaXBtYW4iLAogICJ1dWlkIjogImNsaXBtYW5AcG9wb3Y4OTUudWtyLm5ldCIsCiAgInZlcnNpb24iOiAyMgp9"}}} +, {"uuid": "clipman@popov895.ukr.net", "name": "Clipman", "pname": "clipman", "description": "Simple clipboard manager.", "link": "https://extensions.gnome.org/extension/4958/clipman/", "shell_version_map": {"40": {"version": "10", "sha256": "1z0nrwmsf4amp1jhgfwqbvsajjanwvnh0b9hn8giidqaz17fxdk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjbGlwYm9hcmQgbWFuYWdlci4iLAogICJuYW1lIjogIkNsaXBtYW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9DbGlwbWFuIiwKICAidXVpZCI6ICJjbGlwbWFuQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "1z0nrwmsf4amp1jhgfwqbvsajjanwvnh0b9hn8giidqaz17fxdk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjbGlwYm9hcmQgbWFuYWdlci4iLAogICJuYW1lIjogIkNsaXBtYW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9DbGlwbWFuIiwKICAidXVpZCI6ICJjbGlwbWFuQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "42": {"version": "24", "sha256": "01x362z05bk3335a3cavwxmd2bnq97d018bjfd2vabbkc1ry1p15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjbGlwYm9hcmQgbWFuYWdlci4iLAogICJuYW1lIjogIkNsaXBtYW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L0NsaXBtYW4iLAogICJ1dWlkIjogImNsaXBtYW5AcG9wb3Y4OTUudWtyLm5ldCIsCiAgInZlcnNpb24iOiAyNAp9"}, "43": {"version": "24", "sha256": "01x362z05bk3335a3cavwxmd2bnq97d018bjfd2vabbkc1ry1p15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjbGlwYm9hcmQgbWFuYWdlci4iLAogICJuYW1lIjogIkNsaXBtYW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L0NsaXBtYW4iLAogICJ1dWlkIjogImNsaXBtYW5AcG9wb3Y4OTUudWtyLm5ldCIsCiAgInZlcnNpb24iOiAyNAp9"}}} , {"uuid": "note@eexpss.gmail.com", "name": "note", "pname": "note", "description": "Add selected text to Note.\n- Notes automatic recognition and sort as 'Directory' 'Command' 'Clipboard'.\n- 'Directory': Mouse 1/2/3 act as 'Open in Files/Open in termianl/Paste dir'. It can be used as a temporary bookmark. And any click will change the working diretory in real time.\n- 'Command': Mouse 1/3 as 'Excute command in Terminal/Paste cmd'.\n- 'Clipboard': Mouse act as 'Paste to Clipboard(PRIMARY)'.\n- Terminal support kgx(new gnome-console) and gnome-terminal.", "link": "https://extensions.gnome.org/extension/4962/note/", "shell_version_map": {"42": {"version": "7", "sha256": "1niwlhls41l92g0bcllp4y4bdhn7k310514xkd36rn61pqz9b7q6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzZWxlY3RlZCB0ZXh0IHRvIE5vdGUuXG4tIE5vdGVzIGF1dG9tYXRpYyByZWNvZ25pdGlvbiBhbmQgc29ydCBhcyAnRGlyZWN0b3J5JyAnQ29tbWFuZCcgJ0NsaXBib2FyZCcuXG4tICdEaXJlY3RvcnknOiBNb3VzZSAxLzIvMyBhY3QgYXMgJ09wZW4gaW4gRmlsZXMvT3BlbiBpbiB0ZXJtaWFubC9QYXN0ZSBkaXInLiBJdCBjYW4gYmUgdXNlZCBhcyBhIHRlbXBvcmFyeSBib29rbWFyay4gQW5kIGFueSBjbGljayB3aWxsIGNoYW5nZSB0aGUgd29ya2luZyBkaXJldG9yeSBpbiByZWFsIHRpbWUuXG4tICdDb21tYW5kJzogTW91c2UgMS8zIGFzICdFeGN1dGUgY29tbWFuZCBpbiBUZXJtaW5hbC9QYXN0ZSBjbWQnLlxuLSAnQ2xpcGJvYXJkJzogTW91c2UgYWN0IGFzICdQYXN0ZSB0byBDbGlwYm9hcmQoUFJJTUFSWSknLlxuLSBUZXJtaW5hbCBzdXBwb3J0IGtneChuZXcgZ25vbWUtY29uc29sZSkgYW5kIGdub21lLXRlcm1pbmFsLiIsCiAgImdldHRleHQtZG9tYWluIjogIm5vdGUiLAogICJuYW1lIjogIm5vdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy1ub3RlIiwKICAidXVpZCI6ICJub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "ddnet-friends-panel@hus3h", "name": "DDNet Friends Panel", "pname": "ddnet-friends-panel", "description": "Automatically check for online DDNet friends and join them from your top bar.\n\nThis extension will check for online DDNet friends every 1 minute and show their count in your top bar. You can click the indicator to expand the panel and see more details like what map each friend is playing, you can click on a friend list item to launch the game and connect to the server they are in.", "link": "https://extensions.gnome.org/extension/4965/ddnet-friends-panel/", "shell_version_map": {"40": {"version": "2", "sha256": "14qly508cm9h7v4ws0gd1bvfhcnlbvlxm0rr21pydz9g9pf9bg7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGFuZCBqb2luIHRoZW0gZnJvbSB5b3VyIHRvcCBiYXIuXG5cblRoaXMgZXh0ZW5zaW9uIHdpbGwgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGV2ZXJ5IDEgbWludXRlIGFuZCBzaG93IHRoZWlyIGNvdW50IGluIHlvdXIgdG9wIGJhci4gWW91IGNhbiBjbGljayB0aGUgaW5kaWNhdG9yIHRvIGV4cGFuZCB0aGUgcGFuZWwgYW5kIHNlZSBtb3JlIGRldGFpbHMgbGlrZSB3aGF0IG1hcCBlYWNoIGZyaWVuZCBpcyBwbGF5aW5nLCB5b3UgY2FuIGNsaWNrIG9uIGEgZnJpZW5kIGxpc3QgaXRlbSB0byBsYXVuY2ggdGhlIGdhbWUgYW5kIGNvbm5lY3QgdG8gdGhlIHNlcnZlciB0aGV5IGFyZSBpbi4iLAogICJuYW1lIjogIkRETmV0IEZyaWVuZHMgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9odXMzaC9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGRuZXQtZnJpZW5kcy1wYW5lbCIsCiAgInV1aWQiOiAiZGRuZXQtZnJpZW5kcy1wYW5lbEBodXMzaCIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "14qly508cm9h7v4ws0gd1bvfhcnlbvlxm0rr21pydz9g9pf9bg7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGFuZCBqb2luIHRoZW0gZnJvbSB5b3VyIHRvcCBiYXIuXG5cblRoaXMgZXh0ZW5zaW9uIHdpbGwgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGV2ZXJ5IDEgbWludXRlIGFuZCBzaG93IHRoZWlyIGNvdW50IGluIHlvdXIgdG9wIGJhci4gWW91IGNhbiBjbGljayB0aGUgaW5kaWNhdG9yIHRvIGV4cGFuZCB0aGUgcGFuZWwgYW5kIHNlZSBtb3JlIGRldGFpbHMgbGlrZSB3aGF0IG1hcCBlYWNoIGZyaWVuZCBpcyBwbGF5aW5nLCB5b3UgY2FuIGNsaWNrIG9uIGEgZnJpZW5kIGxpc3QgaXRlbSB0byBsYXVuY2ggdGhlIGdhbWUgYW5kIGNvbm5lY3QgdG8gdGhlIHNlcnZlciB0aGV5IGFyZSBpbi4iLAogICJuYW1lIjogIkRETmV0IEZyaWVuZHMgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9odXMzaC9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGRuZXQtZnJpZW5kcy1wYW5lbCIsCiAgInV1aWQiOiAiZGRuZXQtZnJpZW5kcy1wYW5lbEBodXMzaCIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "14qly508cm9h7v4ws0gd1bvfhcnlbvlxm0rr21pydz9g9pf9bg7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGFuZCBqb2luIHRoZW0gZnJvbSB5b3VyIHRvcCBiYXIuXG5cblRoaXMgZXh0ZW5zaW9uIHdpbGwgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGV2ZXJ5IDEgbWludXRlIGFuZCBzaG93IHRoZWlyIGNvdW50IGluIHlvdXIgdG9wIGJhci4gWW91IGNhbiBjbGljayB0aGUgaW5kaWNhdG9yIHRvIGV4cGFuZCB0aGUgcGFuZWwgYW5kIHNlZSBtb3JlIGRldGFpbHMgbGlrZSB3aGF0IG1hcCBlYWNoIGZyaWVuZCBpcyBwbGF5aW5nLCB5b3UgY2FuIGNsaWNrIG9uIGEgZnJpZW5kIGxpc3QgaXRlbSB0byBsYXVuY2ggdGhlIGdhbWUgYW5kIGNvbm5lY3QgdG8gdGhlIHNlcnZlciB0aGV5IGFyZSBpbi4iLAogICJuYW1lIjogIkRETmV0IEZyaWVuZHMgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9odXMzaC9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGRuZXQtZnJpZW5kcy1wYW5lbCIsCiAgInV1aWQiOiAiZGRuZXQtZnJpZW5kcy1wYW5lbEBodXMzaCIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "theme-switcher@fthx", "name": "Light/Dark Theme Switcher", "pname": "lightdark-theme-switcher", "description": "Button in panel: switch between global dark and light themes. For GNOME Shell 42+.", "link": "https://extensions.gnome.org/extension/4968/lightdark-theme-switcher/", "shell_version_map": {"42": {"version": "6", "sha256": "0m66lvx8pygy9kk8pkzy21pa3ac8ka0ghk5bqy68f3nsmfp9q4qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiBpbiBwYW5lbDogc3dpdGNoIGJldHdlZW4gZ2xvYmFsIGRhcmsgYW5kIGxpZ2h0IHRoZW1lcy4gRm9yIEdOT01FIFNoZWxsIDQyKy4iLAogICJuYW1lIjogIkxpZ2h0L0RhcmsgVGhlbWUgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvdGhlbWUtc3dpdGNoZXIiLAogICJ1dWlkIjogInRoZW1lLXN3aXRjaGVyQGZ0aHgiLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "0m66lvx8pygy9kk8pkzy21pa3ac8ka0ghk5bqy68f3nsmfp9q4qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiBpbiBwYW5lbDogc3dpdGNoIGJldHdlZW4gZ2xvYmFsIGRhcmsgYW5kIGxpZ2h0IHRoZW1lcy4gRm9yIEdOT01FIFNoZWxsIDQyKy4iLAogICJuYW1lIjogIkxpZ2h0L0RhcmsgVGhlbWUgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvdGhlbWUtc3dpdGNoZXIiLAogICJ1dWlkIjogInRoZW1lLXN3aXRjaGVyQGZ0aHgiLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "window-calls-extended@hseliger.eu", "name": "Window Calls Extended", "pname": "window-calls-extended", "description": "Add new dbus call for windows to get windows list and some of theirs properties, plus details on window under focus.", "link": "https://extensions.gnome.org/extension/4974/window-calls-extended/", "shell_version_map": {"41": {"version": "3", "sha256": "0krzyxwzij1j335z7lhk7mmgvgnp2cxrgkp5ln5m4a5k4zyn6hra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMsIHBsdXMgZGV0YWlscyBvbiB3aW5kb3cgdW5kZXIgZm9jdXMuIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMgRXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oc2VsaWdlci93aW5kb3ctY2FsbHMtZXh0ZW5kZWQiLAogICJ1dWlkIjogIndpbmRvdy1jYWxscy1leHRlbmRlZEBoc2VsaWdlci5ldSIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "0krzyxwzij1j335z7lhk7mmgvgnp2cxrgkp5ln5m4a5k4zyn6hra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMsIHBsdXMgZGV0YWlscyBvbiB3aW5kb3cgdW5kZXIgZm9jdXMuIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMgRXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oc2VsaWdlci93aW5kb3ctY2FsbHMtZXh0ZW5kZWQiLAogICJ1dWlkIjogIndpbmRvdy1jYWxscy1leHRlbmRlZEBoc2VsaWdlci5ldSIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "0krzyxwzij1j335z7lhk7mmgvgnp2cxrgkp5ln5m4a5k4zyn6hra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMsIHBsdXMgZGV0YWlscyBvbiB3aW5kb3cgdW5kZXIgZm9jdXMuIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMgRXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oc2VsaWdlci93aW5kb3ctY2FsbHMtZXh0ZW5kZWQiLAogICJ1dWlkIjogIndpbmRvdy1jYWxscy1leHRlbmRlZEBoc2VsaWdlci5ldSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "Sur_Clock@medaip90.com", "name": "Sur Clock", "pname": "sur-clock", "description": "Move the clock to the left or the right of the system indicators like in MacOs.", "link": "https://extensions.gnome.org/extension/4977/sur-clock/", "shell_version_map": {"40": {"version": "3", "sha256": "0kjwzickw4ch7vmkw81d6wiad9hrwiz1i898mb2gmjby6g83d1sf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIGNsb2NrIHRvIHRoZSBsZWZ0IG9yIHRoZSByaWdodCBvZiB0aGUgc3lzdGVtIGluZGljYXRvcnMgbGlrZSBpbiBNYWNPcy4iLAogICJuYW1lIjogIlN1ciBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NZWRhaVA5MC9nbm9tZS1zdXItY2xvY2siLAogICJ1dWlkIjogIlN1cl9DbG9ja0BtZWRhaXA5MC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "0kjwzickw4ch7vmkw81d6wiad9hrwiz1i898mb2gmjby6g83d1sf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIGNsb2NrIHRvIHRoZSBsZWZ0IG9yIHRoZSByaWdodCBvZiB0aGUgc3lzdGVtIGluZGljYXRvcnMgbGlrZSBpbiBNYWNPcy4iLAogICJuYW1lIjogIlN1ciBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NZWRhaVA5MC9nbm9tZS1zdXItY2xvY2siLAogICJ1dWlkIjogIlN1cl9DbG9ja0BtZWRhaXA5MC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "0kjwzickw4ch7vmkw81d6wiad9hrwiz1i898mb2gmjby6g83d1sf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIGNsb2NrIHRvIHRoZSBsZWZ0IG9yIHRoZSByaWdodCBvZiB0aGUgc3lzdGVtIGluZGljYXRvcnMgbGlrZSBpbiBNYWNPcy4iLAogICJuYW1lIjogIlN1ciBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NZWRhaVA5MC9nbm9tZS1zdXItY2xvY2siLAogICJ1dWlkIjogIlN1cl9DbG9ja0BtZWRhaXA5MC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "0kjwzickw4ch7vmkw81d6wiad9hrwiz1i898mb2gmjby6g83d1sf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIGNsb2NrIHRvIHRoZSBsZWZ0IG9yIHRoZSByaWdodCBvZiB0aGUgc3lzdGVtIGluZGljYXRvcnMgbGlrZSBpbiBNYWNPcy4iLAogICJuYW1lIjogIlN1ciBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NZWRhaVA5MC9nbm9tZS1zdXItY2xvY2siLAogICJ1dWlkIjogIlN1cl9DbG9ja0BtZWRhaXA5MC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "disable-workspace-switcher@jbradaric.me", "name": "Disable Workspace Switcher", "pname": "disable-workspace-switcher", "description": "Disable the workspace switcher popup.", "link": "https://extensions.gnome.org/extension/4980/disable-workspace-switcher/", "shell_version_map": {"42": {"version": "2", "sha256": "0r9ia17agk7xmg5lazjjhc629pciqp0sgsrs1f5pk47slx3rnnvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cC4iLAogICJuYW1lIjogIkRpc2FibGUgV29ya3NwYWNlIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qYnJhZGFyaWMvZGlzYWJsZS13b3Jrc3BhY2Utc3dpdGNoZXIiLAogICJ1dWlkIjogImRpc2FibGUtd29ya3NwYWNlLXN3aXRjaGVyQGpicmFkYXJpYy5tZSIsCiAgInZlcnNpb24iOiAyCn0="}, "43": {"version": "2", "sha256": "0r9ia17agk7xmg5lazjjhc629pciqp0sgsrs1f5pk47slx3rnnvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cC4iLAogICJuYW1lIjogIkRpc2FibGUgV29ya3NwYWNlIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qYnJhZGFyaWMvZGlzYWJsZS13b3Jrc3BhY2Utc3dpdGNoZXIiLAogICJ1dWlkIjogImRpc2FibGUtd29ya3NwYWNlLXN3aXRjaGVyQGpicmFkYXJpYy5tZSIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "nextcloud-folder@cosinus.org", "name": "Nextcloud Folder", "pname": "nextcloud-folder", "description": "Simple and lightweight GNOME 42+ extension to open Nextcloud folder in one click.", "link": "https://extensions.gnome.org/extension/4983/nextcloud-folder/", "shell_version_map": {"42": {"version": "4", "sha256": "1cdkfd03y0bfh09m40zikl51mcli311sarjqicnnqw6bzj1zqskj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbGlnaHR3ZWlnaHQgR05PTUUgNDIrIGV4dGVuc2lvbiB0byBvcGVuIE5leHRjbG91ZCBmb2xkZXIgaW4gb25lIGNsaWNrLiIsCiAgIm5hbWUiOiAiTmV4dGNsb3VkIEZvbGRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXh0Y2xvdWQtZm9sZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsZXNjZGIvbmV4dGNsb3VkLWZvbGRlciIsCiAgInV1aWQiOiAibmV4dGNsb3VkLWZvbGRlckBjb3NpbnVzLm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"uuid": "nextcloud-folder@cosinus.org", "name": "Nextcloud Folder", "pname": "nextcloud-folder", "description": "Simple and lightweight GNOME 42+ extension to open Nextcloud folder in one click.", "link": "https://extensions.gnome.org/extension/4983/nextcloud-folder/", "shell_version_map": {"42": {"version": "5", "sha256": "0hmkpvd3lsq2wgvn3s2lg14yya80gwbfzncqv7xkwdcxj74kssqa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbGlnaHR3ZWlnaHQgR05PTUUgNDIrIGV4dGVuc2lvbiB0byBvcGVuIE5leHRjbG91ZCBmb2xkZXIgaW4gb25lIGNsaWNrLiIsCiAgIm5hbWUiOiAiTmV4dGNsb3VkIEZvbGRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXh0Y2xvdWQtZm9sZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGVzY2RiL25leHRjbG91ZC1mb2xkZXIiLAogICJ1dWlkIjogIm5leHRjbG91ZC1mb2xkZXJAY29zaW51cy5vcmciLAogICJ2ZXJzaW9uIjogNQp9"}, "43": {"version": "5", "sha256": "0hmkpvd3lsq2wgvn3s2lg14yya80gwbfzncqv7xkwdcxj74kssqa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbGlnaHR3ZWlnaHQgR05PTUUgNDIrIGV4dGVuc2lvbiB0byBvcGVuIE5leHRjbG91ZCBmb2xkZXIgaW4gb25lIGNsaWNrLiIsCiAgIm5hbWUiOiAiTmV4dGNsb3VkIEZvbGRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXh0Y2xvdWQtZm9sZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGVzY2RiL25leHRjbG91ZC1mb2xkZXIiLAogICJ1dWlkIjogIm5leHRjbG91ZC1mb2xkZXJAY29zaW51cy5vcmciLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "php-laravel-valet@rahulhaque", "name": "PHP Laravel Valet", "pname": "php-laravel-valet", "description": "A PHP Laravel Valet status indicator and manager.", "link": "https://extensions.gnome.org/extension/4985/php-laravel-valet/", "shell_version_map": {"40": {"version": "4", "sha256": "0h1hfh8i6sqzi0dy0sbh35s7flncqwpsxha4yr1bgrmg2a0gshzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUEhQIExhcmF2ZWwgVmFsZXQgc3RhdHVzIGluZGljYXRvciBhbmQgbWFuYWdlci4iLAogICJuYW1lIjogIlBIUCBMYXJhdmVsIFZhbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFodWxoYXF1ZS9waHAtbGFyYXZlbC12YWxldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInBocC1sYXJhdmVsLXZhbGV0QHJhaHVsaGFxdWUiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0h1hfh8i6sqzi0dy0sbh35s7flncqwpsxha4yr1bgrmg2a0gshzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUEhQIExhcmF2ZWwgVmFsZXQgc3RhdHVzIGluZGljYXRvciBhbmQgbWFuYWdlci4iLAogICJuYW1lIjogIlBIUCBMYXJhdmVsIFZhbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFodWxoYXF1ZS9waHAtbGFyYXZlbC12YWxldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInBocC1sYXJhdmVsLXZhbGV0QHJhaHVsaGFxdWUiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "0h1hfh8i6sqzi0dy0sbh35s7flncqwpsxha4yr1bgrmg2a0gshzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUEhQIExhcmF2ZWwgVmFsZXQgc3RhdHVzIGluZGljYXRvciBhbmQgbWFuYWdlci4iLAogICJuYW1lIjogIlBIUCBMYXJhdmVsIFZhbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFodWxoYXF1ZS9waHAtbGFyYXZlbC12YWxldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInBocC1sYXJhdmVsLXZhbGV0QHJhaHVsaGFxdWUiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "Home-Server@sven.kramer", "name": "Home-Server", "pname": "home-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.", "link": "https://extensions.gnome.org/extension/4989/home-server/", "shell_version_map": {"38": {"version": "1", "sha256": "05cwv23w1438pg38ixhrvm360g3s11vrl8wqk84ai2xgydy94z2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiIsCiAgIm1pbm9yIjogMSwKICAibmFtZSI6ICJIb21lLVNlcnZlciIsCiAgInJldmlzaW9uIjogMSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhvbWUtU2VydmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5zdmVuLWtyYW1lci5ldS9saW51eC9nbm9tZS1zaGVsbC1leHRlbnNpb24vaG9tZS1zZXJ2ZXIvIiwKICAidXVpZCI6ICJIb21lLVNlcnZlckBzdmVuLmtyYW1lciIsCiAgInZlcnNpb24iOiAxCn0="}, "40": {"version": "1", "sha256": "05cwv23w1438pg38ixhrvm360g3s11vrl8wqk84ai2xgydy94z2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiIsCiAgIm1pbm9yIjogMSwKICAibmFtZSI6ICJIb21lLVNlcnZlciIsCiAgInJldmlzaW9uIjogMSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhvbWUtU2VydmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5zdmVuLWtyYW1lci5ldS9saW51eC9nbm9tZS1zaGVsbC1leHRlbnNpb24vaG9tZS1zZXJ2ZXIvIiwKICAidXVpZCI6ICJIb21lLVNlcnZlckBzdmVuLmtyYW1lciIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "05cwv23w1438pg38ixhrvm360g3s11vrl8wqk84ai2xgydy94z2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiIsCiAgIm1pbm9yIjogMSwKICAibmFtZSI6ICJIb21lLVNlcnZlciIsCiAgInJldmlzaW9uIjogMSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhvbWUtU2VydmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5zdmVuLWtyYW1lci5ldS9saW51eC9nbm9tZS1zaGVsbC1leHRlbnNpb24vaG9tZS1zZXJ2ZXIvIiwKICAidXVpZCI6ICJIb21lLVNlcnZlckBzdmVuLmtyYW1lciIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "05cwv23w1438pg38ixhrvm360g3s11vrl8wqk84ai2xgydy94z2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiIsCiAgIm1pbm9yIjogMSwKICAibmFtZSI6ICJIb21lLVNlcnZlciIsCiAgInJldmlzaW9uIjogMSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhvbWUtU2VydmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5zdmVuLWtyYW1lci5ldS9saW51eC9nbm9tZS1zaGVsbC1leHRlbnNpb24vaG9tZS1zZXJ2ZXIvIiwKICAidXVpZCI6ICJIb21lLVNlcnZlckBzdmVuLmtyYW1lciIsCiAgInZlcnNpb24iOiAxCn0="}}} -, {"uuid": "dash2dock-lite@icedman.github.com", "name": "Dash2Dock Lite", "pname": "dash2dock-lite", "description": "minimal implementation of dash to dock", "link": "https://extensions.gnome.org/extension/4994/dash2dock-lite/", "shell_version_map": {"40": {"version": "17", "sha256": "07mgyasq8pwsg9zfmlm3zg433zgp2d4nmd3v4mm2fknzsq67rcbp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1pbmltYWwgaW1wbGVtZW50YXRpb24gb2YgZGFzaCB0byBkb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "07mgyasq8pwsg9zfmlm3zg433zgp2d4nmd3v4mm2fknzsq67rcbp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1pbmltYWwgaW1wbGVtZW50YXRpb24gb2YgZGFzaCB0byBkb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "42": {"version": "17", "sha256": "07mgyasq8pwsg9zfmlm3zg433zgp2d4nmd3v4mm2fknzsq67rcbp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1pbmltYWwgaW1wbGVtZW50YXRpb24gb2YgZGFzaCB0byBkb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "43": {"version": "17", "sha256": "07mgyasq8pwsg9zfmlm3zg433zgp2d4nmd3v4mm2fknzsq67rcbp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1pbmltYWwgaW1wbGVtZW50YXRpb24gb2YgZGFzaCB0byBkb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} +, {"uuid": "dash2dock-lite@icedman.github.com", "name": "Dash2Dock Lite", "pname": "dash2dock-lite", "description": "The Animated & Effectful Dock", "link": "https://extensions.gnome.org/extension/4994/dash2dock-lite/", "shell_version_map": {"40": {"version": "27", "sha256": "06cj6qw18kz8zx15g062f708iyy9w5802va50sk5d6lfsap2a3m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "41": {"version": "27", "sha256": "06cj6qw18kz8zx15g062f708iyy9w5802va50sk5d6lfsap2a3m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "42": {"version": "27", "sha256": "06cj6qw18kz8zx15g062f708iyy9w5802va50sk5d6lfsap2a3m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "43": {"version": "27", "sha256": "06cj6qw18kz8zx15g062f708iyy9w5802va50sk5d6lfsap2a3m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}}} , {"uuid": "animate@eexpss.gmail.com", "name": "animate", "pname": "animate", "description": "Animated small man run through the screen. Scroll mouse can change deferent character. You can use your PNG characters instead of the original ones.", "link": "https://extensions.gnome.org/extension/4995/animate/", "shell_version_map": {"40": {"version": "4", "sha256": "1p110wz7wdr51z2fsn6z72lcnln13h8lfbw9a00hs9qb0y71qf5q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGVkIHNtYWxsIG1hbiBydW4gdGhyb3VnaCB0aGUgc2NyZWVuLiBTY3JvbGwgbW91c2UgY2FuIGNoYW5nZSBkZWZlcmVudCBjaGFyYWN0ZXIuIFlvdSBjYW4gdXNlIHlvdXIgUE5HIGNoYXJhY3RlcnMgaW5zdGVhZCBvZiB0aGUgb3JpZ2luYWwgb25lcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhbmltYXRlIiwKICAibmFtZSI6ICJhbmltYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtYW5pbWF0ZSIsCiAgInV1aWQiOiAiYW5pbWF0ZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1p110wz7wdr51z2fsn6z72lcnln13h8lfbw9a00hs9qb0y71qf5q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGVkIHNtYWxsIG1hbiBydW4gdGhyb3VnaCB0aGUgc2NyZWVuLiBTY3JvbGwgbW91c2UgY2FuIGNoYW5nZSBkZWZlcmVudCBjaGFyYWN0ZXIuIFlvdSBjYW4gdXNlIHlvdXIgUE5HIGNoYXJhY3RlcnMgaW5zdGVhZCBvZiB0aGUgb3JpZ2luYWwgb25lcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhbmltYXRlIiwKICAibmFtZSI6ICJhbmltYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtYW5pbWF0ZSIsCiAgInV1aWQiOiAiYW5pbWF0ZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "1p110wz7wdr51z2fsn6z72lcnln13h8lfbw9a00hs9qb0y71qf5q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGVkIHNtYWxsIG1hbiBydW4gdGhyb3VnaCB0aGUgc2NyZWVuLiBTY3JvbGwgbW91c2UgY2FuIGNoYW5nZSBkZWZlcmVudCBjaGFyYWN0ZXIuIFlvdSBjYW4gdXNlIHlvdXIgUE5HIGNoYXJhY3RlcnMgaW5zdGVhZCBvZiB0aGUgb3JpZ2luYWwgb25lcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhbmltYXRlIiwKICAibmFtZSI6ICJhbmltYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtYW5pbWF0ZSIsCiAgInV1aWQiOiAiYW5pbWF0ZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "legacyschemeautoswitcher@joshimukul29.gmail.com", "name": "Legacy (GTK3) Theme Scheme Auto Switcher", "pname": "legacy-gtk3-theme-scheme-auto-switcher", "description": "Change the GTK3 theme to light/dark variant based on the system color scheme on Gnome 42", "link": "https://extensions.gnome.org/extension/4998/legacy-gtk3-theme-scheme-auto-switcher/", "shell_version_map": {"42": {"version": "4", "sha256": "022drnhrqmgpgfsikxwhy82bds27mr8h1wxm2hh4pry6smmdgx2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgR1RLMyB0aGVtZSB0byBsaWdodC9kYXJrIHZhcmlhbnQgYmFzZWQgb24gdGhlIHN5c3RlbSBjb2xvciBzY2hlbWUgb24gR25vbWUgNDIiLAogICJuYW1lIjogIkxlZ2FjeSAoR1RLMykgVGhlbWUgU2NoZW1lIEF1dG8gU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL211a3VsMjkvbGVnYWN5LXRoZW1lLWF1dG8tc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJsZWdhY3lzY2hlbWVhdXRvc3dpdGNoZXJAam9zaGltdWt1bDI5LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "022drnhrqmgpgfsikxwhy82bds27mr8h1wxm2hh4pry6smmdgx2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgR1RLMyB0aGVtZSB0byBsaWdodC9kYXJrIHZhcmlhbnQgYmFzZWQgb24gdGhlIHN5c3RlbSBjb2xvciBzY2hlbWUgb24gR25vbWUgNDIiLAogICJuYW1lIjogIkxlZ2FjeSAoR1RLMykgVGhlbWUgU2NoZW1lIEF1dG8gU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL211a3VsMjkvbGVnYWN5LXRoZW1lLWF1dG8tc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJsZWdhY3lzY2hlbWVhdXRvc3dpdGNoZXJAam9zaGltdWt1bDI5LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "dash-to-dock-cosmic-@halfmexicanhalfamazing@gmail.com", "name": "Dash to Dock for COSMIC", "pname": "dash-to-dock-for-cosmic", "description": "A Dash to Dock fork for the COSMIC/GNOME Shell, fixes conflict with Cosmic Workspace. It prevents Cosmic Workspaces from breaking after suspend.\n\nAdds Features:\nDock Alignment\nCustom Border Radius\nCustom Margins", "link": "https://extensions.gnome.org/extension/5004/dash-to-dock-for-cosmic/", "shell_version_map": {"40": {"version": "20", "sha256": "0gr31f557aas7dgm67gcmdhgnw0iyih4lwckbhsz62i7c6v43f3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0IHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC5cblxuQWRkcyBGZWF0dXJlczpcbkRvY2sgQWxpZ25tZW50XG5DdXN0b20gQm9yZGVyIFJhZGl1c1xuQ3VzdG9tIE1hcmdpbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, "41": {"version": "20", "sha256": "0gr31f557aas7dgm67gcmdhgnw0iyih4lwckbhsz62i7c6v43f3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0IHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC5cblxuQWRkcyBGZWF0dXJlczpcbkRvY2sgQWxpZ25tZW50XG5DdXN0b20gQm9yZGVyIFJhZGl1c1xuQ3VzdG9tIE1hcmdpbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, "42": {"version": "20", "sha256": "0gr31f557aas7dgm67gcmdhgnw0iyih4lwckbhsz62i7c6v43f3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0IHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC5cblxuQWRkcyBGZWF0dXJlczpcbkRvY2sgQWxpZ25tZW50XG5DdXN0b20gQm9yZGVyIFJhZGl1c1xuQ3VzdG9tIE1hcmdpbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, "43": {"version": "20", "sha256": "0gr31f557aas7dgm67gcmdhgnw0iyih4lwckbhsz62i7c6v43f3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0IHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC5cblxuQWRkcyBGZWF0dXJlczpcbkRvY2sgQWxpZ25tZW50XG5DdXN0b20gQm9yZGVyIFJhZGl1c1xuQ3VzdG9tIE1hcmdpbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}}} -, {"uuid": "rclone-manager@germanztz.com", "name": "rclone-manager", "pname": "rclone-manager", "description": "Is like Dropbox sync client but for more than 30 services, adds an indicator to the top panel so you can manage the rclone profiles configured in your system, perform operations such as mount as remote, watch for file modifications, sync with remote storage, navigate it's main folder. Also, it shows the status of each profile so you can supervise the operations, and provides an easy access log of events. Backup and restore the rclone configuration file, so you won't have to configure all your devices one by one", "link": "https://extensions.gnome.org/extension/5006/rclone-manager/", "shell_version_map": {"40": {"version": "7", "sha256": "04wpr0qjlgwsdax3j91sp2ihwpprk5imfahmhbcvy1pcc5a68b94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dlcm1hbnp0ei9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmNsb25lLW1hbmFnZXIiLAogICJ1dWlkIjogInJjbG9uZS1tYW5hZ2VyQGdlcm1hbnp0ei5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "04wpr0qjlgwsdax3j91sp2ihwpprk5imfahmhbcvy1pcc5a68b94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dlcm1hbnp0ei9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmNsb25lLW1hbmFnZXIiLAogICJ1dWlkIjogInJjbG9uZS1tYW5hZ2VyQGdlcm1hbnp0ei5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} -, {"uuid": "GPU_profile_selector@lorenzo9904.gmail.com", "name": "GPU profile selector", "pname": "gpu-profile-selector", "description": "You need also envycontrol(https://github.com/geminis3/envycontrol) for making this extension working. This is a simple gnome-shell extension which provides a simple way to switch between GPU profiles on Nvidia Optimus systems (i.e laptops with Intel + Nvidia or AMD + Nvidia configurations) in a few clicks.", "link": "https://extensions.gnome.org/extension/5009/gpu-profile-selector/", "shell_version_map": {"38": {"version": "11", "sha256": "1lpifpyl35njacan260lvcyarr64gf54kcskq74kfp0h5p56cxss", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTG9yZW56b01vcmVsbGkvR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJ1dWlkIjogIkdQVV9wcm9maWxlX3NlbGVjdG9yQGxvcmVuem85OTA0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "11", "sha256": "1lpifpyl35njacan260lvcyarr64gf54kcskq74kfp0h5p56cxss", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTG9yZW56b01vcmVsbGkvR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJ1dWlkIjogIkdQVV9wcm9maWxlX3NlbGVjdG9yQGxvcmVuem85OTA0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "1lpifpyl35njacan260lvcyarr64gf54kcskq74kfp0h5p56cxss", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTG9yZW56b01vcmVsbGkvR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJ1dWlkIjogIkdQVV9wcm9maWxlX3NlbGVjdG9yQGxvcmVuem85OTA0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}, "42": {"version": "11", "sha256": "1lpifpyl35njacan260lvcyarr64gf54kcskq74kfp0h5p56cxss", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTG9yZW56b01vcmVsbGkvR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJ1dWlkIjogIkdQVV9wcm9maWxlX3NlbGVjdG9yQGxvcmVuem85OTA0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}}} +, {"uuid": "rclone-manager@germanztz.com", "name": "rclone-manager", "pname": "rclone-manager", "description": "Is like Dropbox sync client but for more than 30 services, adds an indicator to the top panel so you can manage the rclone profiles configured in your system, perform operations such as mount as remote, watch for file modifications, sync with remote storage, navigate it's main folder. Also, it shows the status of each profile so you can supervise the operations, and provides an easy access log of events. Backup and restore the rclone configuration file, so you won't have to configure all your devices one by one", "link": "https://extensions.gnome.org/extension/5006/rclone-manager/", "shell_version_map": {"40": {"version": "8", "sha256": "1idgrrqcp4pk65b212bwabq0fycsp9amc59svk986izprbmrsysy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "42": {"version": "8", "sha256": "1idgrrqcp4pk65b212bwabq0fycsp9amc59svk986izprbmrsysy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "43": {"version": "8", "sha256": "1idgrrqcp4pk65b212bwabq0fycsp9amc59svk986izprbmrsysy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} +, {"uuid": "GPU_profile_selector@lorenzo9904.gmail.com", "name": "GPU profile selector", "pname": "gpu-profile-selector", "description": "You need also envycontrol(https://github.com/geminis3/envycontrol) for making this extension working. This is a simple gnome-shell extension which provides a simple way to switch between GPU profiles on Nvidia Optimus systems (i.e laptops with Intel + Nvidia or AMD + Nvidia configurations) in a few clicks.", "link": "https://extensions.gnome.org/extension/5009/gpu-profile-selector/", "shell_version_map": {"38": {"version": "13", "sha256": "1ad0swz0nh0srpkxcrwa33y70i94m8082slgp6f1pvynw8g79yq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "40": {"version": "13", "sha256": "1ad0swz0nh0srpkxcrwa33y70i94m8082slgp6f1pvynw8g79yq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "1ad0swz0nh0srpkxcrwa33y70i94m8082slgp6f1pvynw8g79yq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "42": {"version": "13", "sha256": "1ad0swz0nh0srpkxcrwa33y70i94m8082slgp6f1pvynw8g79yq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "43": {"version": "13", "sha256": "1ad0swz0nh0srpkxcrwa33y70i94m8082slgp6f1pvynw8g79yq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} , {"uuid": "username-to-activities@deserts", "name": "Replace Activities text with username", "pname": "replce-activities-text-with-username", "description": "Replace Activities text with username.\nThis is a fork of Replace Activities Text by pratap@fastmail.fm", "link": "https://extensions.gnome.org/extension/5010/replce-activities-text-with-username/", "shell_version_map": {"38": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}, "43": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "overview-dash-hide@rokenz05.github.com", "name": "Overview Dash Hide", "pname": "overview-dash-hide", "description": "Hide dash to dock in activities overview", "link": "https://extensions.gnome.org/extension/5013/overview-dash-hide/", "shell_version_map": {"42": {"version": "1", "sha256": "1i0s0gjyml0q8lz08pwh1nva2yrf5vydpcrz2ncz46qvpjhik7dm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgZGFzaCB0byBkb2NrIGluIGFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJuYW1lIjogIk92ZXJ2aWV3IERhc2ggSGlkZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAib3ZlcnZpZXctZGFzaC1oaWRlQHJva2VuejA1LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "simple-message@freddez", "name": "Simple Message", "pname": "simple-message", "description": "Show a message written by the user on the top bar.", "link": "https://extensions.gnome.org/extension/5018/simple-message/", "shell_version_map": {"40": {"version": "10", "sha256": "1sjlqnfmprfp6jhyb2835nz53s1bcp00bfris6y60lm9g7sji387", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBtZXNzYWdlIHdyaXR0ZW4gYnkgdGhlIHVzZXIgb24gdGhlIHRvcCBiYXIuIiwKICAibmFtZSI6ICJTaW1wbGUgTWVzc2FnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaW1wbGUtbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmVkZGV6L2dub21lLXNoZWxsLXNpbXBsZS1tZXNzYWdlIiwKICAidXVpZCI6ICJzaW1wbGUtbWVzc2FnZUBmcmVkZGV6IiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "1sjlqnfmprfp6jhyb2835nz53s1bcp00bfris6y60lm9g7sji387", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBtZXNzYWdlIHdyaXR0ZW4gYnkgdGhlIHVzZXIgb24gdGhlIHRvcCBiYXIuIiwKICAibmFtZSI6ICJTaW1wbGUgTWVzc2FnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaW1wbGUtbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmVkZGV6L2dub21lLXNoZWxsLXNpbXBsZS1tZXNzYWdlIiwKICAidXVpZCI6ICJzaW1wbGUtbWVzc2FnZUBmcmVkZGV6IiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "1sjlqnfmprfp6jhyb2835nz53s1bcp00bfris6y60lm9g7sji387", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBtZXNzYWdlIHdyaXR0ZW4gYnkgdGhlIHVzZXIgb24gdGhlIHRvcCBiYXIuIiwKICAibmFtZSI6ICJTaW1wbGUgTWVzc2FnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaW1wbGUtbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmVkZGV6L2dub21lLXNoZWxsLXNpbXBsZS1tZXNzYWdlIiwKICAidXVpZCI6ICJzaW1wbGUtbWVzc2FnZUBmcmVkZGV6IiwKICAidmVyc2lvbiI6IDEwCn0="}, "43": {"version": "10", "sha256": "1sjlqnfmprfp6jhyb2835nz53s1bcp00bfris6y60lm9g7sji387", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBtZXNzYWdlIHdyaXR0ZW4gYnkgdGhlIHVzZXIgb24gdGhlIHRvcCBiYXIuIiwKICAibmFtZSI6ICJTaW1wbGUgTWVzc2FnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaW1wbGUtbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmVkZGV6L2dub21lLXNoZWxsLXNpbXBsZS1tZXNzYWdlIiwKICAidXVpZCI6ICJzaW1wbGUtbWVzc2FnZUBmcmVkZGV6IiwKICAidmVyc2lvbiI6IDEwCn0="}}} +, {"uuid": "simple-message@freddez", "name": "Simple Message", "pname": "simple-message", "description": "Set a message on the top bar. Custom command can also be launched on click.", "link": "https://extensions.gnome.org/extension/5018/simple-message/", "shell_version_map": {"40": {"version": "10", "sha256": "08bjap2gp50b4pzs793imcxw41q9jcrzw44bvwzhyrb5s71rfzzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBhIG1lc3NhZ2Ugb24gdGhlIHRvcCBiYXIuIEN1c3RvbSBjb21tYW5kIGNhbiBhbHNvIGJlIGxhdW5jaGVkIG9uIGNsaWNrLiIsCiAgIm5hbWUiOiAiU2ltcGxlIE1lc3NhZ2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2ltcGxlLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJlZGRlei9nbm9tZS1zaGVsbC1zaW1wbGUtbWVzc2FnZSIsCiAgInV1aWQiOiAic2ltcGxlLW1lc3NhZ2VAZnJlZGRleiIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "08bjap2gp50b4pzs793imcxw41q9jcrzw44bvwzhyrb5s71rfzzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBhIG1lc3NhZ2Ugb24gdGhlIHRvcCBiYXIuIEN1c3RvbSBjb21tYW5kIGNhbiBhbHNvIGJlIGxhdW5jaGVkIG9uIGNsaWNrLiIsCiAgIm5hbWUiOiAiU2ltcGxlIE1lc3NhZ2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2ltcGxlLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJlZGRlei9nbm9tZS1zaGVsbC1zaW1wbGUtbWVzc2FnZSIsCiAgInV1aWQiOiAic2ltcGxlLW1lc3NhZ2VAZnJlZGRleiIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "13", "sha256": "16jcix25ydv607c4z9hrl3zhqg01pc6i2ii493xjnlr4mdyld4gg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBhIG1lc3NhZ2Ugb24gdGhlIHRvcCBiYXIuIEN1c3RvbSBjb21tYW5kIGNhbiBhbHNvIGJlIGxhdW5jaGVkIG9uIGNsaWNrLiIsCiAgImdldHRleHQtZG9tYWluIjogInNpbXBsZS1tZXNzYWdlIiwKICAibmFtZSI6ICJTaW1wbGUgTWVzc2FnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaW1wbGUtbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJlZGRlei9nbm9tZS1zaGVsbC1zaW1wbGUtbWVzc2FnZSIsCiAgInV1aWQiOiAic2ltcGxlLW1lc3NhZ2VAZnJlZGRleiIsCiAgInZlcnNpb24iOiAxMwp9"}, "43": {"version": "13", "sha256": "16jcix25ydv607c4z9hrl3zhqg01pc6i2ii493xjnlr4mdyld4gg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBhIG1lc3NhZ2Ugb24gdGhlIHRvcCBiYXIuIEN1c3RvbSBjb21tYW5kIGNhbiBhbHNvIGJlIGxhdW5jaGVkIG9uIGNsaWNrLiIsCiAgImdldHRleHQtZG9tYWluIjogInNpbXBsZS1tZXNzYWdlIiwKICAibmFtZSI6ICJTaW1wbGUgTWVzc2FnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaW1wbGUtbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJlZGRlei9nbm9tZS1zaGVsbC1zaW1wbGUtbWVzc2FnZSIsCiAgInV1aWQiOiAic2ltcGxlLW1lc3NhZ2VAZnJlZGRleiIsCiAgInZlcnNpb24iOiAxMwp9"}}} , {"uuid": "activate-window-by-title@lucaswerkmeister.de", "name": "Activate Window By Title", "pname": "activate-window-by-title", "description": "Expose a D-Bus interface to activate a window by its title or WM_CLASS", "link": "https://extensions.gnome.org/extension/5021/activate-window-by-title/", "shell_version_map": {"42": {"version": "3", "sha256": "16fbclbvs9n4910iw7krr4g3nn89nha3nzagjsqc89hg37ngfk4v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZSBhIHdpbmRvdyBieSBpdHMgdGl0bGUgb3IgV01fQ0xBU1MiLAogICJuYW1lIjogIkFjdGl2YXRlIFdpbmRvdyBCeSBUaXRsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHVjYXN3ZXJrbWVpc3Rlci9hY3RpdmF0ZS13aW5kb3ctYnktdGl0bGUiLAogICJ1dWlkIjogImFjdGl2YXRlLXdpbmRvdy1ieS10aXRsZUBsdWNhc3dlcmttZWlzdGVyLmRlIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "16fbclbvs9n4910iw7krr4g3nn89nha3nzagjsqc89hg37ngfk4v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZSBhIHdpbmRvdyBieSBpdHMgdGl0bGUgb3IgV01fQ0xBU1MiLAogICJuYW1lIjogIkFjdGl2YXRlIFdpbmRvdyBCeSBUaXRsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHVjYXN3ZXJrbWVpc3Rlci9hY3RpdmF0ZS13aW5kb3ctYnktdGl0bGUiLAogICJ1dWlkIjogImFjdGl2YXRlLXdpbmRvdy1ieS10aXRsZUBsdWNhc3dlcmttZWlzdGVyLmRlIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "nano-system-monitor@eeeeeio", "name": "Nano System Monitor", "pname": "nano-system-monitor", "description": "Show current status on GNOME Shell panel\n\nbar shows CPU|memory|swap usages,then the download|upload speed and CPU temperature and fan speed\n\nDifferent colors represent different percentage states and CPU temperature\n\nplease use monospaced font for best experience", "link": "https://extensions.gnome.org/extension/5037/nano-system-monitor/", "shell_version_map": {"38": {"version": "6", "sha256": "1kd3c9bml1qh6djjmd4qr393z4zp7il0p3sz9bb7qv2smsg582lf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJOYW5vIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWVlZWVpby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFuby1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAibmFuby1zeXN0ZW0tbW9uaXRvckBlZWVlZWlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "1kd3c9bml1qh6djjmd4qr393z4zp7il0p3sz9bb7qv2smsg582lf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJOYW5vIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWVlZWVpby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFuby1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAibmFuby1zeXN0ZW0tbW9uaXRvckBlZWVlZWlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "1kd3c9bml1qh6djjmd4qr393z4zp7il0p3sz9bb7qv2smsg582lf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJOYW5vIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWVlZWVpby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFuby1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAibmFuby1zeXN0ZW0tbW9uaXRvckBlZWVlZWlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "1kd3c9bml1qh6djjmd4qr393z4zp7il0p3sz9bb7qv2smsg582lf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJOYW5vIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWVlZWVpby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFuby1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAibmFuby1zeXN0ZW0tbW9uaXRvckBlZWVlZWlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "start-overlay-in-application-view@Hex_cz", "name": "Start Overlay in Application View", "pname": "start-overlay-in-application-view", "description": "When activating overview (Super button), the application view is shown instead of the view with the windows.", "link": "https://extensions.gnome.org/extension/5040/start-overlay-in-application-view/", "shell_version_map": {"40": {"version": "4", "sha256": "0zj39jd2l3d2wxx11yvm73rjpljvikr5y9xwxpjf6xmlpxs7hdh9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hleGN6L1N0YXJ0LU92ZXJsYXktaW4tQXBwbGljYXRpb24tVmlldy1mb3ItR25vbWUtNDAtIiwKICAidXVpZCI6ICJzdGFydC1vdmVybGF5LWluLWFwcGxpY2F0aW9uLXZpZXdASGV4X2N6IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0zj39jd2l3d2wxx11yvm73rjpljvikr5y9xwxpjf6xmlpxs7hdh9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hleGN6L1N0YXJ0LU92ZXJsYXktaW4tQXBwbGljYXRpb24tVmlldy1mb3ItR25vbWUtNDAtIiwKICAidXVpZCI6ICJzdGFydC1vdmVybGF5LWluLWFwcGxpY2F0aW9uLXZpZXdASGV4X2N6IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "0zj39jd2l3d2wxx11yvm73rjpljvikr5y9xwxpjf6xmlpxs7hdh9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hleGN6L1N0YXJ0LU92ZXJsYXktaW4tQXBwbGljYXRpb24tVmlldy1mb3ItR25vbWUtNDAtIiwKICAidXVpZCI6ICJzdGFydC1vdmVybGF5LWluLWFwcGxpY2F0aW9uLXZpZXdASGV4X2N6IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "0zj39jd2l3d2wxx11yvm73rjpljvikr5y9xwxpjf6xmlpxs7hdh9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hleGN6L1N0YXJ0LU92ZXJsYXktaW4tQXBwbGljYXRpb24tVmlldy1mb3ItR25vbWUtNDAtIiwKICAidXVpZCI6ICJzdGFydC1vdmVybGF5LWluLWFwcGxpY2F0aW9uLXZpZXdASGV4X2N6IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} @@ -753,53 +755,53 @@ , {"uuid": "SomaFm-Radio@cajhne.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.\n\n* Donation\nYou can donate if you like my work :)\n\nBTC: 1KXJPJSmXUocieC3neRZEDakpzfcyumLqS\nBCH : qzzmzegfy76r5glpj26jzq2xly2cczsmfyrn66ax8q\nETHER: 0xb6178080c8f0792e6370959909199647e26b8457", "link": "https://extensions.gnome.org/extension/5064/somafm-internet-radio/", "shell_version_map": {"38": {"version": "1", "sha256": "0k92wz17isih4sph7ssidcjddi7r4xvcha1pi9vb7dnwrhc6x1hg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby5cblxuKiBEb25hdGlvblxuWW91IGNhbiBkb25hdGUgaWYgeW91IGxpa2UgbXkgd29yayA6KVxuXG5CVEM6IDFLWEpQSlNtWFVvY2llQzNuZVJaRURha3B6ZmN5dW1McVNcbkJDSCA6IHF6em16ZWdmeTc2cjVnbHBqMjZqenEyeGx5MmNjenNtZnlybjY2YXg4cVxuRVRIRVI6IDB4YjYxNzgwODBjOGYwNzkyZTYzNzA5NTk5MDkxOTk2NDdlMjZiODQ1NyIsCiAgIm5hbWUiOiAiU29tYUZNIGludGVybmV0IHJhZGlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AY2FqaG5lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "40": {"version": "1", "sha256": "0k92wz17isih4sph7ssidcjddi7r4xvcha1pi9vb7dnwrhc6x1hg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby5cblxuKiBEb25hdGlvblxuWW91IGNhbiBkb25hdGUgaWYgeW91IGxpa2UgbXkgd29yayA6KVxuXG5CVEM6IDFLWEpQSlNtWFVvY2llQzNuZVJaRURha3B6ZmN5dW1McVNcbkJDSCA6IHF6em16ZWdmeTc2cjVnbHBqMjZqenEyeGx5MmNjenNtZnlybjY2YXg4cVxuRVRIRVI6IDB4YjYxNzgwODBjOGYwNzkyZTYzNzA5NTk5MDkxOTk2NDdlMjZiODQ1NyIsCiAgIm5hbWUiOiAiU29tYUZNIGludGVybmV0IHJhZGlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AY2FqaG5lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "0k92wz17isih4sph7ssidcjddi7r4xvcha1pi9vb7dnwrhc6x1hg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby5cblxuKiBEb25hdGlvblxuWW91IGNhbiBkb25hdGUgaWYgeW91IGxpa2UgbXkgd29yayA6KVxuXG5CVEM6IDFLWEpQSlNtWFVvY2llQzNuZVJaRURha3B6ZmN5dW1McVNcbkJDSCA6IHF6em16ZWdmeTc2cjVnbHBqMjZqenEyeGx5MmNjenNtZnlybjY2YXg4cVxuRVRIRVI6IDB4YjYxNzgwODBjOGYwNzkyZTYzNzA5NTk5MDkxOTk2NDdlMjZiODQ1NyIsCiAgIm5hbWUiOiAiU29tYUZNIGludGVybmV0IHJhZGlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AY2FqaG5lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "0k92wz17isih4sph7ssidcjddi7r4xvcha1pi9vb7dnwrhc6x1hg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby5cblxuKiBEb25hdGlvblxuWW91IGNhbiBkb25hdGUgaWYgeW91IGxpa2UgbXkgd29yayA6KVxuXG5CVEM6IDFLWEpQSlNtWFVvY2llQzNuZVJaRURha3B6ZmN5dW1McVNcbkJDSCA6IHF6em16ZWdmeTc2cjVnbHBqMjZqenEyeGx5MmNjenNtZnlybjY2YXg4cVxuRVRIRVI6IDB4YjYxNzgwODBjOGYwNzkyZTYzNzA5NTk5MDkxOTk2NDdlMjZiODQ1NyIsCiAgIm5hbWUiOiAiU29tYUZNIGludGVybmV0IHJhZGlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AY2FqaG5lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "dollar-clp@albolea.github.com", "name": "Dollar-CLP", "pname": "dollar-clp", "description": "(USD US Dollar) converted to (CLP Peso Chileno). 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/5066/dollar-clp/", "shell_version_map": {"38": {"version": "2", "sha256": "0lc7mx77qvxx2q04bljza8pv1p98sv5qyi7rpbmr572yalxmsyv7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihVU0QgVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gKENMUCBQZXNvIENoaWxlbm8pLiBVcGRhdGVzIGFyZSByZWNlaXZlZCBldmVyeSAzMCBzZWNvbmRzIGFuZCBhcmUgYmFzZWQgb24gaW5mb3JtYXRpb24gcHJvdmlkZWQgYnkgQXdlc29tZUFQSSBBUEksIHdoaWNoIGNhbiBiZSBjb25zdWx0ZWQgZGlyZWN0bHkgYnkgYWNjZXNzaW5nIHRoZSBhZGRyZXNzIGh0dHBzOi8vZG9jcy5hd2Vzb21lYXBpLmNvbS5ici4gKGJhc2VkIG9uIG1pY2hhZWwubWF0dG9zJ3MgRG9sbGFyIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ1NzMvZG9sbGFyLykiLAogICJuYW1lIjogIkRvbGxhci1DTFAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJvbGVhL2RvbGxhci1jbHAiLAogICJ1dWlkIjogImRvbGxhci1jbHBAYWxib2xlYS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "0lc7mx77qvxx2q04bljza8pv1p98sv5qyi7rpbmr572yalxmsyv7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihVU0QgVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gKENMUCBQZXNvIENoaWxlbm8pLiBVcGRhdGVzIGFyZSByZWNlaXZlZCBldmVyeSAzMCBzZWNvbmRzIGFuZCBhcmUgYmFzZWQgb24gaW5mb3JtYXRpb24gcHJvdmlkZWQgYnkgQXdlc29tZUFQSSBBUEksIHdoaWNoIGNhbiBiZSBjb25zdWx0ZWQgZGlyZWN0bHkgYnkgYWNjZXNzaW5nIHRoZSBhZGRyZXNzIGh0dHBzOi8vZG9jcy5hd2Vzb21lYXBpLmNvbS5ici4gKGJhc2VkIG9uIG1pY2hhZWwubWF0dG9zJ3MgRG9sbGFyIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ1NzMvZG9sbGFyLykiLAogICJuYW1lIjogIkRvbGxhci1DTFAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJvbGVhL2RvbGxhci1jbHAiLAogICJ1dWlkIjogImRvbGxhci1jbHBAYWxib2xlYS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0lc7mx77qvxx2q04bljza8pv1p98sv5qyi7rpbmr572yalxmsyv7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihVU0QgVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gKENMUCBQZXNvIENoaWxlbm8pLiBVcGRhdGVzIGFyZSByZWNlaXZlZCBldmVyeSAzMCBzZWNvbmRzIGFuZCBhcmUgYmFzZWQgb24gaW5mb3JtYXRpb24gcHJvdmlkZWQgYnkgQXdlc29tZUFQSSBBUEksIHdoaWNoIGNhbiBiZSBjb25zdWx0ZWQgZGlyZWN0bHkgYnkgYWNjZXNzaW5nIHRoZSBhZGRyZXNzIGh0dHBzOi8vZG9jcy5hd2Vzb21lYXBpLmNvbS5ici4gKGJhc2VkIG9uIG1pY2hhZWwubWF0dG9zJ3MgRG9sbGFyIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ1NzMvZG9sbGFyLykiLAogICJuYW1lIjogIkRvbGxhci1DTFAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJvbGVhL2RvbGxhci1jbHAiLAogICJ1dWlkIjogImRvbGxhci1jbHBAYWxib2xlYS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "0lc7mx77qvxx2q04bljza8pv1p98sv5qyi7rpbmr572yalxmsyv7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihVU0QgVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gKENMUCBQZXNvIENoaWxlbm8pLiBVcGRhdGVzIGFyZSByZWNlaXZlZCBldmVyeSAzMCBzZWNvbmRzIGFuZCBhcmUgYmFzZWQgb24gaW5mb3JtYXRpb24gcHJvdmlkZWQgYnkgQXdlc29tZUFQSSBBUEksIHdoaWNoIGNhbiBiZSBjb25zdWx0ZWQgZGlyZWN0bHkgYnkgYWNjZXNzaW5nIHRoZSBhZGRyZXNzIGh0dHBzOi8vZG9jcy5hd2Vzb21lYXBpLmNvbS5ici4gKGJhc2VkIG9uIG1pY2hhZWwubWF0dG9zJ3MgRG9sbGFyIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ1NzMvZG9sbGFyLykiLAogICJuYW1lIjogIkRvbGxhci1DTFAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJvbGVhL2RvbGxhci1jbHAiLAogICJ1dWlkIjogImRvbGxhci1jbHBAYWxib2xlYS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "real-clp@albolea.github.com", "name": "Real-CLP", "pname": "real-clp", "description": "(BRL Brazil Real) converted to (CLP Peso Chileno). 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/5069/real-clp/", "shell_version_map": {"38": {"version": "1", "sha256": "1kapkrz86qgxssas6wvf2rqmja0528j70b0dm9lhr88ya8rv4y93", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihCUkwgQnJhemlsIFJlYWwpIGNvbnZlcnRlZCB0byAoQ0xQIFBlc28gQ2hpbGVubykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMgYW5kIGFyZSBiYXNlZCBvbiBpbmZvcm1hdGlvbiBwcm92aWRlZCBieSBBd2Vzb21lQVBJIEFQSSwgd2hpY2ggY2FuIGJlIGNvbnN1bHRlZCBkaXJlY3RseSBieSBhY2Nlc3NpbmcgdGhlIGFkZHJlc3MgaHR0cHM6Ly9kb2NzLmF3ZXNvbWVhcGkuY29tLmJyLiAoYmFzZWQgb24gbWljaGFlbC5tYXR0b3MncyBEb2xsYXIgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDU3My9kb2xsYXIvKSIsCiAgIm5hbWUiOiAiUmVhbC1DTFAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJvbGVhL3JlYWwtY2xwIiwKICAidXVpZCI6ICJyZWFsLWNscEBhbGJvbGVhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "1kapkrz86qgxssas6wvf2rqmja0528j70b0dm9lhr88ya8rv4y93", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihCUkwgQnJhemlsIFJlYWwpIGNvbnZlcnRlZCB0byAoQ0xQIFBlc28gQ2hpbGVubykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMgYW5kIGFyZSBiYXNlZCBvbiBpbmZvcm1hdGlvbiBwcm92aWRlZCBieSBBd2Vzb21lQVBJIEFQSSwgd2hpY2ggY2FuIGJlIGNvbnN1bHRlZCBkaXJlY3RseSBieSBhY2Nlc3NpbmcgdGhlIGFkZHJlc3MgaHR0cHM6Ly9kb2NzLmF3ZXNvbWVhcGkuY29tLmJyLiAoYmFzZWQgb24gbWljaGFlbC5tYXR0b3MncyBEb2xsYXIgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDU3My9kb2xsYXIvKSIsCiAgIm5hbWUiOiAiUmVhbC1DTFAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJvbGVhL3JlYWwtY2xwIiwKICAidXVpZCI6ICJyZWFsLWNscEBhbGJvbGVhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "1kapkrz86qgxssas6wvf2rqmja0528j70b0dm9lhr88ya8rv4y93", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihCUkwgQnJhemlsIFJlYWwpIGNvbnZlcnRlZCB0byAoQ0xQIFBlc28gQ2hpbGVubykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMgYW5kIGFyZSBiYXNlZCBvbiBpbmZvcm1hdGlvbiBwcm92aWRlZCBieSBBd2Vzb21lQVBJIEFQSSwgd2hpY2ggY2FuIGJlIGNvbnN1bHRlZCBkaXJlY3RseSBieSBhY2Nlc3NpbmcgdGhlIGFkZHJlc3MgaHR0cHM6Ly9kb2NzLmF3ZXNvbWVhcGkuY29tLmJyLiAoYmFzZWQgb24gbWljaGFlbC5tYXR0b3MncyBEb2xsYXIgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDU3My9kb2xsYXIvKSIsCiAgIm5hbWUiOiAiUmVhbC1DTFAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJvbGVhL3JlYWwtY2xwIiwKICAidXVpZCI6ICJyZWFsLWNscEBhbGJvbGVhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "42": {"version": "1", "sha256": "1kapkrz86qgxssas6wvf2rqmja0528j70b0dm9lhr88ya8rv4y93", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihCUkwgQnJhemlsIFJlYWwpIGNvbnZlcnRlZCB0byAoQ0xQIFBlc28gQ2hpbGVubykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMgYW5kIGFyZSBiYXNlZCBvbiBpbmZvcm1hdGlvbiBwcm92aWRlZCBieSBBd2Vzb21lQVBJIEFQSSwgd2hpY2ggY2FuIGJlIGNvbnN1bHRlZCBkaXJlY3RseSBieSBhY2Nlc3NpbmcgdGhlIGFkZHJlc3MgaHR0cHM6Ly9kb2NzLmF3ZXNvbWVhcGkuY29tLmJyLiAoYmFzZWQgb24gbWljaGFlbC5tYXR0b3MncyBEb2xsYXIgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDU3My9kb2xsYXIvKSIsCiAgIm5hbWUiOiAiUmVhbC1DTFAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJvbGVhL3JlYWwtY2xwIiwKICAidXVpZCI6ICJyZWFsLWNscEBhbGJvbGVhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "one-thing@github.com", "name": "One Thing", "pname": "one-thing", "description": "Put a single task or goal in your menu bar - panel", "link": "https://extensions.gnome.org/extension/5072/one-thing/", "shell_version_map": {"38": {"version": "4", "sha256": "1r0zgd3cmksmr592f7mf1zipw0xf3j8lz9cgx4aaby264hnb4m0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciAtIHBhbmVsIiwKICAibmFtZSI6ICJPbmUgVGhpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFudGVoZW1lcnNvbi9vbmUtdGhpbmciLAogICJ1dWlkIjogIm9uZS10aGluZ0BnaXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "1r0zgd3cmksmr592f7mf1zipw0xf3j8lz9cgx4aaby264hnb4m0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciAtIHBhbmVsIiwKICAibmFtZSI6ICJPbmUgVGhpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFudGVoZW1lcnNvbi9vbmUtdGhpbmciLAogICJ1dWlkIjogIm9uZS10aGluZ0BnaXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"uuid": "one-thing@github.com", "name": "One Thing", "pname": "one-thing", "description": "Put a single task or goal in your menu bar", "link": "https://extensions.gnome.org/extension/5072/one-thing/", "shell_version_map": {"38": {"version": "9", "sha256": "0idcih4hqy18r215vpxlfpi7ar9vk2nkw7bd204rn9lhlj3rlvj7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciIsCiAgIm5hbWUiOiAiT25lIFRoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vb25lLXRoaW5nIiwKICAidXVpZCI6ICJvbmUtdGhpbmdAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "9", "sha256": "0idcih4hqy18r215vpxlfpi7ar9vk2nkw7bd204rn9lhlj3rlvj7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciIsCiAgIm5hbWUiOiAiT25lIFRoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vb25lLXRoaW5nIiwKICAidXVpZCI6ICJvbmUtdGhpbmdAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "0idcih4hqy18r215vpxlfpi7ar9vk2nkw7bd204rn9lhlj3rlvj7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciIsCiAgIm5hbWUiOiAiT25lIFRoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vb25lLXRoaW5nIiwKICAidXVpZCI6ICJvbmUtdGhpbmdAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "42": {"version": "9", "sha256": "0idcih4hqy18r215vpxlfpi7ar9vk2nkw7bd204rn9lhlj3rlvj7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciIsCiAgIm5hbWUiOiAiT25lIFRoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vb25lLXRoaW5nIiwKICAidXVpZCI6ICJvbmUtdGhpbmdAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "0idcih4hqy18r215vpxlfpi7ar9vk2nkw7bd204rn9lhlj3rlvj7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciIsCiAgIm5hbWUiOiAiT25lIFRoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vb25lLXRoaW5nIiwKICAidXVpZCI6ICJvbmUtdGhpbmdAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"uuid": "vpn-toggler@rheddes.nl", "name": "VPN Toggler", "pname": "vpn-toggler", "description": "A forked version of (https://extensions.gnome.org/extension/4061/custom-vpn-toggler/).\nVPN 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 Open VPN is available on extension repository. \nFollow the link to Extension Web Site and see README.", "link": "https://extensions.gnome.org/extension/5075/vpn-toggler/", "shell_version_map": {"42": {"version": "2", "sha256": "1xxxqzr8q6zjrvkdhlkq8nfa5nv56sdnm1fyl3nxv453hfhdqmzs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZm9ya2VkIHZlcnNpb24gb2YgKGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQwNjEvY3VzdG9tLXZwbi10b2dnbGVyLykuXG5WUE4gVG9nZ2xlciAoYW5kIGluZGljYXRvcikgYWxsb3dzIHRvIHNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSwgc2VlIElQIGFkZHJlc3MgYXNzb2NpYXRlZCBhbmQgcGVybWl0IHRvIHN0YXJ0IGFuZCBzdG9wIFZQTiAoZnJvbSBhIG1lbnUpLlxuXG5UaGlzIHBsdWdpbiByZXF1aXJlZCBhbiBhZGRpdGlvbmFsIHNjcmlwdCB0byBpbnRlcmFjdCB3aXRoIFZQTi4gXG5BbiBleGFtcGxlIGZvciBPcGVuIFZQTiBpcyBhdmFpbGFibGUgb24gZXh0ZW5zaW9uIHJlcG9zaXRvcnkuIFxuRm9sbG93IHRoZSBsaW5rIHRvIEV4dGVuc2lvbiBXZWIgU2l0ZSBhbmQgc2VlIFJFQURNRS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ2cG4tdG9nZ2xlckByaGVkZGVzLm5sIiwKICAibmFtZSI6ICJWUE4gVG9nZ2xlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52cG4tdG9nZ2xlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SaGVkZGVzL3Zwbi10b2dnbGVyIiwKICAidXVpZCI6ICJ2cG4tdG9nZ2xlckByaGVkZGVzLm5sIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "mozillavpn@inytar.github.com", "name": "Mozilla VPN Indicator", "pname": "mozilla-vpn-indicator", "description": "Toggle Mozilla VPN\n\nA simple indicator that can be used together with the Mozilla VPN linuxdaemon (https://github.com/mozilla-mobile/mozilla-vpn-client) to activate and deactivate the VPN.\n\nThis extension is in no way associated with Mozilla.", "link": "https://extensions.gnome.org/extension/5078/mozilla-vpn-indicator/", "shell_version_map": {"40": {"version": "1", "sha256": "18wq3m5ifvzwhj3pidfs2vnx0pj7w602iqizfgvp572qpxj6xayd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBNb3ppbGxhIFZQTlxuXG5BIHNpbXBsZSBpbmRpY2F0b3IgdGhhdCBjYW4gYmUgdXNlZCB0b2dldGhlciB3aXRoIHRoZSBNb3ppbGxhIFZQTiBsaW51eGRhZW1vbiAoaHR0cHM6Ly9naXRodWIuY29tL21vemlsbGEtbW9iaWxlL21vemlsbGEtdnBuLWNsaWVudCkgdG8gYWN0aXZhdGUgYW5kIGRlYWN0aXZhdGUgdGhlIFZQTi5cblxuVGhpcyBleHRlbnNpb24gaXMgaW4gbm8gd2F5IGFzc29jaWF0ZWQgd2l0aCBNb3ppbGxhLiIsCiAgIm5hbWUiOiAiTW96aWxsYSBWUE4gSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW55dGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tb3ppbGxhLXZwbiIsCiAgInV1aWQiOiAibW96aWxsYXZwbkBpbnl0YXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "18wq3m5ifvzwhj3pidfs2vnx0pj7w602iqizfgvp572qpxj6xayd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBNb3ppbGxhIFZQTlxuXG5BIHNpbXBsZSBpbmRpY2F0b3IgdGhhdCBjYW4gYmUgdXNlZCB0b2dldGhlciB3aXRoIHRoZSBNb3ppbGxhIFZQTiBsaW51eGRhZW1vbiAoaHR0cHM6Ly9naXRodWIuY29tL21vemlsbGEtbW9iaWxlL21vemlsbGEtdnBuLWNsaWVudCkgdG8gYWN0aXZhdGUgYW5kIGRlYWN0aXZhdGUgdGhlIFZQTi5cblxuVGhpcyBleHRlbnNpb24gaXMgaW4gbm8gd2F5IGFzc29jaWF0ZWQgd2l0aCBNb3ppbGxhLiIsCiAgIm5hbWUiOiAiTW96aWxsYSBWUE4gSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW55dGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tb3ppbGxhLXZwbiIsCiAgInV1aWQiOiAibW96aWxsYXZwbkBpbnl0YXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "18wq3m5ifvzwhj3pidfs2vnx0pj7w602iqizfgvp572qpxj6xayd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBNb3ppbGxhIFZQTlxuXG5BIHNpbXBsZSBpbmRpY2F0b3IgdGhhdCBjYW4gYmUgdXNlZCB0b2dldGhlciB3aXRoIHRoZSBNb3ppbGxhIFZQTiBsaW51eGRhZW1vbiAoaHR0cHM6Ly9naXRodWIuY29tL21vemlsbGEtbW9iaWxlL21vemlsbGEtdnBuLWNsaWVudCkgdG8gYWN0aXZhdGUgYW5kIGRlYWN0aXZhdGUgdGhlIFZQTi5cblxuVGhpcyBleHRlbnNpb24gaXMgaW4gbm8gd2F5IGFzc29jaWF0ZWQgd2l0aCBNb3ppbGxhLiIsCiAgIm5hbWUiOiAiTW96aWxsYSBWUE4gSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW55dGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tb3ppbGxhLXZwbiIsCiAgInV1aWQiOiAibW96aWxsYXZwbkBpbnl0YXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} -, {"uuid": "this.simple-indication-of-workspaces@azate.email", "name": "Simple indication of workspaces", "pname": "simple-indication-of-workspaces", "description": "Workspace indication with an i3/polybar style.", "link": "https://extensions.gnome.org/extension/5081/simple-indication-of-workspaces/", "shell_version_map": {"42": {"version": "2", "sha256": "00lh574s9zcvxfqkrlf7acaz1k0fz2c5gj0hvjfmwg4l7mmyqiy7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBsZSBpbmRpY2F0aW9uIG9mIHdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXphdGUvc2ltcGxlLWluZGljYXRpb24tb2Ytd29ya3NwYWNlcyIsCiAgInV1aWQiOiAidGhpcy5zaW1wbGUtaW5kaWNhdGlvbi1vZi13b3Jrc3BhY2VzQGF6YXRlLmVtYWlsIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "this.simple-indication-of-workspaces@azate.email", "name": "Simple indication of workspaces", "pname": "simple-indication-of-workspaces", "description": "Workspace indication with an i3/polybar style.", "link": "https://extensions.gnome.org/extension/5081/simple-indication-of-workspaces/", "shell_version_map": {"42": {"version": "3", "sha256": "1xh6kgbb7lvlv6w663yz8a6jw93j5njjxqlgivjiq1s2rhhg3pqw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBsZSBpbmRpY2F0aW9uIG9mIHdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F6YXRlL3NpbXBsZS1pbmRpY2F0aW9uLW9mLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInRoaXMuc2ltcGxlLWluZGljYXRpb24tb2Ytd29ya3NwYWNlc0BhemF0ZS5lbWFpbCIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "1xh6kgbb7lvlv6w663yz8a6jw93j5njjxqlgivjiq1s2rhhg3pqw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBsZSBpbmRpY2F0aW9uIG9mIHdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F6YXRlL3NpbXBsZS1pbmRpY2F0aW9uLW9mLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInRoaXMuc2ltcGxlLWluZGljYXRpb24tb2Ytd29ya3NwYWNlc0BhemF0ZS5lbWFpbCIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "WallpaperOverlay@Rishu", "name": "Wallpaper Overlay", "pname": "wallpaper-overlay", "description": "Extension to apply overlays on wallpaper\nMake sure imagemagick is installed.\nFeatures:\n* Option to choose primary colour of the overlay\n* Apply multiple overlays at once\n* You can use custom overlays (png or svg file) and apply it on your wallpaper\n* Option to auto-apply whenever the desktop wallpaper changes\n* Compatible with Wallpaper Switcher(gnome extension) so as to provide smooth experience\n* You can download more custom overlays from https://rishuinfinity.github.io/wallpaper-overlays-collection/", "link": "https://extensions.gnome.org/extension/5082/wallpaper-overlay/", "shell_version_map": {"42": {"version": "8", "sha256": "0xxsws1ggc3xi84qgch5kpdp4q8641vzw4gsxb8rgyf5rvhdj76m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBhcHBseSBvdmVybGF5cyBvbiB3YWxscGFwZXJcbk1ha2Ugc3VyZSBpbWFnZW1hZ2ljayBpcyBpbnN0YWxsZWQuXG5GZWF0dXJlczpcbiogT3B0aW9uIHRvIGNob29zZSBwcmltYXJ5IGNvbG91ciBvZiB0aGUgb3ZlcmxheVxuKiBBcHBseSBtdWx0aXBsZSBvdmVybGF5cyBhdCBvbmNlXG4qIFlvdSBjYW4gdXNlIGN1c3RvbSBvdmVybGF5cyAocG5nIG9yIHN2ZyBmaWxlKSBhbmQgYXBwbHkgaXQgb24geW91ciB3YWxscGFwZXJcbiogT3B0aW9uIHRvIGF1dG8tYXBwbHkgd2hlbmV2ZXIgdGhlIGRlc2t0b3Agd2FsbHBhcGVyIGNoYW5nZXNcbiogQ29tcGF0aWJsZSB3aXRoIFdhbGxwYXBlciBTd2l0Y2hlcihnbm9tZSBleHRlbnNpb24pIHNvIGFzIHRvIHByb3ZpZGUgc21vb3RoIGV4cGVyaWVuY2VcbiogWW91IGNhbiBkb3dubG9hZCBtb3JlIGN1c3RvbSBvdmVybGF5cyBmcm9tIGh0dHBzOi8vcmlzaHVpbmZpbml0eS5naXRodWIuaW8vd2FsbHBhcGVyLW92ZXJsYXlzLWNvbGxlY3Rpb24vIiwKICAibmFtZSI6ICJXYWxscGFwZXIgT3ZlcmxheSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yaXNodWluZmluaXR5L1dhbGxwYXBlck92ZXJsYXkiLAogICJ1dWlkIjogIldhbGxwYXBlck92ZXJsYXlAUmlzaHUiLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "startup-measure@marco.trevi.me", "name": "Applications Startup Time Measure", "pname": "startup-measure", "description": "Shows startup time of an application", "link": "https://extensions.gnome.org/extension/5087/startup-measure/", "shell_version_map": {"38": {"version": "9", "sha256": "1a5vm06awhqj21rvn93k8kywfn5zbi5gazvnghnv46mma2riga7f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHN0YXJ0dXAgdGltZSBvZiBhbiBhcHBsaWNhdGlvbiIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIFN0YXJ0dXAgVGltZSBNZWFzdXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvM3YxbjAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcHMtc3RhcnR1cC1tZWFzdXJlIiwKICAidXVpZCI6ICJzdGFydHVwLW1lYXN1cmVAbWFyY28udHJldmkubWUiLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "1a5vm06awhqj21rvn93k8kywfn5zbi5gazvnghnv46mma2riga7f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHN0YXJ0dXAgdGltZSBvZiBhbiBhcHBsaWNhdGlvbiIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIFN0YXJ0dXAgVGltZSBNZWFzdXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvM3YxbjAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcHMtc3RhcnR1cC1tZWFzdXJlIiwKICAidXVpZCI6ICJzdGFydHVwLW1lYXN1cmVAbWFyY28udHJldmkubWUiLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "1a5vm06awhqj21rvn93k8kywfn5zbi5gazvnghnv46mma2riga7f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHN0YXJ0dXAgdGltZSBvZiBhbiBhcHBsaWNhdGlvbiIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIFN0YXJ0dXAgVGltZSBNZWFzdXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvM3YxbjAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcHMtc3RhcnR1cC1tZWFzdXJlIiwKICAidXVpZCI6ICJzdGFydHVwLW1lYXN1cmVAbWFyY28udHJldmkubWUiLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "1a5vm06awhqj21rvn93k8kywfn5zbi5gazvnghnv46mma2riga7f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHN0YXJ0dXAgdGltZSBvZiBhbiBhcHBsaWNhdGlvbiIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIFN0YXJ0dXAgVGltZSBNZWFzdXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvM3YxbjAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcHMtc3RhcnR1cC1tZWFzdXJlIiwKICAidXVpZCI6ICJzdGFydHVwLW1lYXN1cmVAbWFyY28udHJldmkubWUiLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"uuid": "mute-unmute@mcast.gnomext.com", "name": "Mute/Unmute", "pname": "muteunmute", "description": "Mute/unmute audio how it should be, by clicking the audio output icon next to the volume slider (or middle-clicking the speaker icon on the menu bar). This extension uses mute/unmute API in order to restore previous volume level after unmuting.", "link": "https://extensions.gnome.org/extension/5088/muteunmute/", "shell_version_map": {"38": {"version": "9", "sha256": "1yblf69w05sjg1qznwsynjw2qc3sc3g8sra2b9ikg3781d3i3qg1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUvdW5tdXRlIGF1ZGlvIGhvdyBpdCBzaG91bGQgYmUsIGJ5IGNsaWNraW5nIHRoZSBhdWRpbyBvdXRwdXQgaWNvbiBuZXh0IHRvIHRoZSB2b2x1bWUgc2xpZGVyIChvciBtaWRkbGUtY2xpY2tpbmcgdGhlIHNwZWFrZXIgaWNvbiBvbiB0aGUgbWVudSBiYXIpLiBUaGlzIGV4dGVuc2lvbiB1c2VzIG11dGUvdW5tdXRlIEFQSSBpbiBvcmRlciB0byByZXN0b3JlIHByZXZpb3VzIHZvbHVtZSBsZXZlbCBhZnRlciB1bm11dGluZy4iLAogICJuYW1lIjogIk11dGUvVW5tdXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2locGxlZC9tdXRlLXVubXV0ZSIsCiAgInV1aWQiOiAibXV0ZS11bm11dGVAbWNhc3QuZ25vbWV4dC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "1yblf69w05sjg1qznwsynjw2qc3sc3g8sra2b9ikg3781d3i3qg1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUvdW5tdXRlIGF1ZGlvIGhvdyBpdCBzaG91bGQgYmUsIGJ5IGNsaWNraW5nIHRoZSBhdWRpbyBvdXRwdXQgaWNvbiBuZXh0IHRvIHRoZSB2b2x1bWUgc2xpZGVyIChvciBtaWRkbGUtY2xpY2tpbmcgdGhlIHNwZWFrZXIgaWNvbiBvbiB0aGUgbWVudSBiYXIpLiBUaGlzIGV4dGVuc2lvbiB1c2VzIG11dGUvdW5tdXRlIEFQSSBpbiBvcmRlciB0byByZXN0b3JlIHByZXZpb3VzIHZvbHVtZSBsZXZlbCBhZnRlciB1bm11dGluZy4iLAogICJuYW1lIjogIk11dGUvVW5tdXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2locGxlZC9tdXRlLXVubXV0ZSIsCiAgInV1aWQiOiAibXV0ZS11bm11dGVAbWNhc3QuZ25vbWV4dC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "1yblf69w05sjg1qznwsynjw2qc3sc3g8sra2b9ikg3781d3i3qg1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUvdW5tdXRlIGF1ZGlvIGhvdyBpdCBzaG91bGQgYmUsIGJ5IGNsaWNraW5nIHRoZSBhdWRpbyBvdXRwdXQgaWNvbiBuZXh0IHRvIHRoZSB2b2x1bWUgc2xpZGVyIChvciBtaWRkbGUtY2xpY2tpbmcgdGhlIHNwZWFrZXIgaWNvbiBvbiB0aGUgbWVudSBiYXIpLiBUaGlzIGV4dGVuc2lvbiB1c2VzIG11dGUvdW5tdXRlIEFQSSBpbiBvcmRlciB0byByZXN0b3JlIHByZXZpb3VzIHZvbHVtZSBsZXZlbCBhZnRlciB1bm11dGluZy4iLAogICJuYW1lIjogIk11dGUvVW5tdXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2locGxlZC9tdXRlLXVubXV0ZSIsCiAgInV1aWQiOiAibXV0ZS11bm11dGVAbWNhc3QuZ25vbWV4dC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "1yblf69w05sjg1qznwsynjw2qc3sc3g8sra2b9ikg3781d3i3qg1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUvdW5tdXRlIGF1ZGlvIGhvdyBpdCBzaG91bGQgYmUsIGJ5IGNsaWNraW5nIHRoZSBhdWRpbyBvdXRwdXQgaWNvbiBuZXh0IHRvIHRoZSB2b2x1bWUgc2xpZGVyIChvciBtaWRkbGUtY2xpY2tpbmcgdGhlIHNwZWFrZXIgaWNvbiBvbiB0aGUgbWVudSBiYXIpLiBUaGlzIGV4dGVuc2lvbiB1c2VzIG11dGUvdW5tdXRlIEFQSSBpbiBvcmRlciB0byByZXN0b3JlIHByZXZpb3VzIHZvbHVtZSBsZXZlbCBhZnRlciB1bm11dGluZy4iLAogICJuYW1lIjogIk11dGUvVW5tdXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2locGxlZC9tdXRlLXVubXV0ZSIsCiAgInV1aWQiOiAibXV0ZS11bm11dGVAbWNhc3QuZ25vbWV4dC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "43": {"version": "9", "sha256": "1yblf69w05sjg1qznwsynjw2qc3sc3g8sra2b9ikg3781d3i3qg1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUvdW5tdXRlIGF1ZGlvIGhvdyBpdCBzaG91bGQgYmUsIGJ5IGNsaWNraW5nIHRoZSBhdWRpbyBvdXRwdXQgaWNvbiBuZXh0IHRvIHRoZSB2b2x1bWUgc2xpZGVyIChvciBtaWRkbGUtY2xpY2tpbmcgdGhlIHNwZWFrZXIgaWNvbiBvbiB0aGUgbWVudSBiYXIpLiBUaGlzIGV4dGVuc2lvbiB1c2VzIG11dGUvdW5tdXRlIEFQSSBpbiBvcmRlciB0byByZXN0b3JlIHByZXZpb3VzIHZvbHVtZSBsZXZlbCBhZnRlciB1bm11dGluZy4iLAogICJuYW1lIjogIk11dGUvVW5tdXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2locGxlZC9tdXRlLXVubXV0ZSIsCiAgInV1aWQiOiAibXV0ZS11bm11dGVAbWNhc3QuZ25vbWV4dC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"uuid": "space-bar@luchrioh", "name": "Space Bar", "pname": "space-bar", "description": "Replaces the 'Activities' button with an i3-like workspaces bar.\n\nOriginally a fork of the extension Workspaces Bar by fthx, this extension grew into a more comprehensive set of features to support a workspace-based workflow.\n\nFeatures:\n- First class support for static and dynamic workspaces as well as multi-monitor setups\n- Add, remove, and rename workspaces\n- Rearrange workspaces via drag and drop\n- Automatically updates workspace names to reflect changes of workspaces\n- Automatically assign workspace names based on started applications\n- Keyboard shortcuts extend and refine system shortcuts\n- Scroll through workspaces by mouse wheel over the panel\n\nLimitations:\n- Adding workspaces by dragging a window in overview between existing workspaces is not recognized and will confuse workspace names", "link": "https://extensions.gnome.org/extension/5090/space-bar/", "shell_version_map": {"42": {"version": "5", "sha256": "1dkir0j6vk7zwsgc16mv8pdg775lrwzaicnfaivhvd3gvfp9xfwz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VzIHRoZSAnQWN0aXZpdGllcycgYnV0dG9uIHdpdGggYW4gaTMtbGlrZSB3b3Jrc3BhY2VzIGJhci5cblxuT3JpZ2luYWxseSBhIGZvcmsgb2YgdGhlIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEJhciBieSBmdGh4LCB0aGlzIGV4dGVuc2lvbiBncmV3IGludG8gYSBtb3JlIGNvbXByZWhlbnNpdmUgc2V0IG9mIGZlYXR1cmVzIHRvIHN1cHBvcnQgYSB3b3Jrc3BhY2UtYmFzZWQgd29ya2Zsb3cuXG5cbkZlYXR1cmVzOlxuLSAgIEZpcnN0IGNsYXNzIHN1cHBvcnQgZm9yIHN0YXRpYyBhbmQgZHluYW1pYyB3b3Jrc3BhY2VzIGFzIHdlbGwgYXMgbXVsdGktbW9uaXRvciBzZXR1cHNcbi0gICBBZGQsIHJlbW92ZSwgYW5kIHJlbmFtZSB3b3Jrc3BhY2VzXG4tICAgUmVhcnJhbmdlIHdvcmtzcGFjZXMgdmlhIGRyYWcgYW5kIGRyb3Bcbi0gICBBdXRvbWF0aWNhbGx5IHVwZGF0ZXMgd29ya3NwYWNlIG5hbWVzIHRvIHJlZmxlY3QgY2hhbmdlcyBvZiB3b3Jrc3BhY2VzXG4tICAgQXV0b21hdGljYWxseSBhc3NpZ24gd29ya3NwYWNlIG5hbWVzIGJhc2VkIG9uIHN0YXJ0ZWQgYXBwbGljYXRpb25zXG4tICAgS2V5Ym9hcmQgc2hvcnRjdXRzIGV4dGVuZCBhbmQgcmVmaW5lIHN5c3RlbSBzaG9ydGN1dHNcbi0gICBTY3JvbGwgdGhyb3VnaCB3b3Jrc3BhY2VzIGJ5IG1vdXNlIHdoZWVsIG92ZXIgdGhlIHBhbmVsXG5cbkxpbWl0YXRpb25zOlxuLSAgIEFkZGluZyB3b3Jrc3BhY2VzIGJ5IGRyYWdnaW5nIGEgd2luZG93IGluIG92ZXJ2aWV3IGJldHdlZW4gZXhpc3Rpbmcgd29ya3NwYWNlcyBpcyBub3QgcmVjb2duaXplZCBhbmQgd2lsbCBjb25mdXNlIHdvcmtzcGFjZSBuYW1lcyIsCiAgIm5hbWUiOiAiU3BhY2UgQmFyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLWJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2hyaXN0b3BoZXItbC9zcGFjZS1iYXIiLAogICJ1dWlkIjogInNwYWNlLWJhckBsdWNocmlvaCIsCiAgInZlcnNpb24iOiA1Cn0="}, "43": {"version": "5", "sha256": "1dkir0j6vk7zwsgc16mv8pdg775lrwzaicnfaivhvd3gvfp9xfwz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VzIHRoZSAnQWN0aXZpdGllcycgYnV0dG9uIHdpdGggYW4gaTMtbGlrZSB3b3Jrc3BhY2VzIGJhci5cblxuT3JpZ2luYWxseSBhIGZvcmsgb2YgdGhlIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEJhciBieSBmdGh4LCB0aGlzIGV4dGVuc2lvbiBncmV3IGludG8gYSBtb3JlIGNvbXByZWhlbnNpdmUgc2V0IG9mIGZlYXR1cmVzIHRvIHN1cHBvcnQgYSB3b3Jrc3BhY2UtYmFzZWQgd29ya2Zsb3cuXG5cbkZlYXR1cmVzOlxuLSAgIEZpcnN0IGNsYXNzIHN1cHBvcnQgZm9yIHN0YXRpYyBhbmQgZHluYW1pYyB3b3Jrc3BhY2VzIGFzIHdlbGwgYXMgbXVsdGktbW9uaXRvciBzZXR1cHNcbi0gICBBZGQsIHJlbW92ZSwgYW5kIHJlbmFtZSB3b3Jrc3BhY2VzXG4tICAgUmVhcnJhbmdlIHdvcmtzcGFjZXMgdmlhIGRyYWcgYW5kIGRyb3Bcbi0gICBBdXRvbWF0aWNhbGx5IHVwZGF0ZXMgd29ya3NwYWNlIG5hbWVzIHRvIHJlZmxlY3QgY2hhbmdlcyBvZiB3b3Jrc3BhY2VzXG4tICAgQXV0b21hdGljYWxseSBhc3NpZ24gd29ya3NwYWNlIG5hbWVzIGJhc2VkIG9uIHN0YXJ0ZWQgYXBwbGljYXRpb25zXG4tICAgS2V5Ym9hcmQgc2hvcnRjdXRzIGV4dGVuZCBhbmQgcmVmaW5lIHN5c3RlbSBzaG9ydGN1dHNcbi0gICBTY3JvbGwgdGhyb3VnaCB3b3Jrc3BhY2VzIGJ5IG1vdXNlIHdoZWVsIG92ZXIgdGhlIHBhbmVsXG5cbkxpbWl0YXRpb25zOlxuLSAgIEFkZGluZyB3b3Jrc3BhY2VzIGJ5IGRyYWdnaW5nIGEgd2luZG93IGluIG92ZXJ2aWV3IGJldHdlZW4gZXhpc3Rpbmcgd29ya3NwYWNlcyBpcyBub3QgcmVjb2duaXplZCBhbmQgd2lsbCBjb25mdXNlIHdvcmtzcGFjZSBuYW1lcyIsCiAgIm5hbWUiOiAiU3BhY2UgQmFyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLWJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2hyaXN0b3BoZXItbC9zcGFjZS1iYXIiLAogICJ1dWlkIjogInNwYWNlLWJhckBsdWNocmlvaCIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "gnome-shellext-hide-lock@adyrosebrigg", "name": "Hide Lock item in System Menu", "pname": "hide-lock-item-in-system-menu", "description": "Hides the \"Lock\" option from the system menu dropdown in the top right.", "link": "https://extensions.gnome.org/extension/5091/hide-lock-item-in-system-menu/", "shell_version_map": {"42": {"version": "2", "sha256": "0ab3yc5z9yhvp21145cfgh88sby4x464argy12c80anyhf55zm79", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBcIkxvY2tcIiBvcHRpb24gZnJvbSB0aGUgc3lzdGVtIG1lbnUgZHJvcGRvd24gaW4gdGhlIHRvcCByaWdodC4iLAogICJuYW1lIjogIkhpZGUgTG9jayBpdGVtIGluIFN5c3RlbSBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FkeXJvc2VicmlnZy9nbm9tZS1zaGVsbGV4dC1oaWRlLWxvY2siLAogICJ1dWlkIjogImdub21lLXNoZWxsZXh0LWhpZGUtbG9ja0BhZHlyb3NlYnJpZ2ciLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "favorites-apps-indicator@zecarneiro.pt", "name": "Favorites Apps Indicator", "pname": "favorites-apps-indicator", "description": "Your favorites commands and Apps Menu Indicator", "link": "https://extensions.gnome.org/extension/5096/favorites-apps-indicator/", "shell_version_map": {"42": {"version": "4", "sha256": "1hxb94bniwk0gvd4dk193rhjsqhawpcm3x5vi5djflqhc37bjzp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdXIgZmF2b3JpdGVzIGNvbW1hbmRzIGFuZCBBcHBzIE1lbnUgSW5kaWNhdG9yIiwKICAibmFtZSI6ICJGYXZvcml0ZXMgQXBwcyBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkpvc1x1MDBlOSBNLiBDLiBOb3JvbmhhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3plY2FybmVpcm8vZmF2b3JpdGVzLWFwcHMtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJmYXZvcml0ZXMtYXBwcy1pbmRpY2F0b3JAemVjYXJuZWlyby5wdCIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "hot-bottom@fthx", "name": "Hot Bottom", "pname": "hot-bottom", "description": "Enter overview when you hover the bottom of the screen. Very light extension.\n\n For GNOME Shell 40+. The width of the show zone is the same as the Gnome Shell dash.\n\n I'm not notified of messages here, please report bugs only through GitHub.", "link": "https://extensions.gnome.org/extension/5099/hot-bottom/", "shell_version_map": {"40": {"version": "2", "sha256": "0xarbsardhqzpcwxa59vyb11v90fl9qj03kdrn8sqmcjs48xir3f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVudGVyIG92ZXJ2aWV3IHdoZW4geW91IGhvdmVyIHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbi4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBGb3IgR05PTUUgU2hlbGwgNDArLiBUaGUgd2lkdGggb2YgdGhlIHNob3cgem9uZSBpcyB0aGUgc2FtZSBhcyB0aGUgR25vbWUgU2hlbGwgZGFzaC5cblxuIEknbSBub3Qgbm90aWZpZWQgb2YgbWVzc2FnZXMgaGVyZSwgcGxlYXNlIHJlcG9ydCBidWdzIG9ubHkgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJIb3QgQm90dG9tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9ob3QtYm90dG9tIiwKICAidXVpZCI6ICJob3QtYm90dG9tQGZ0aHgiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "0xarbsardhqzpcwxa59vyb11v90fl9qj03kdrn8sqmcjs48xir3f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVudGVyIG92ZXJ2aWV3IHdoZW4geW91IGhvdmVyIHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbi4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBGb3IgR05PTUUgU2hlbGwgNDArLiBUaGUgd2lkdGggb2YgdGhlIHNob3cgem9uZSBpcyB0aGUgc2FtZSBhcyB0aGUgR25vbWUgU2hlbGwgZGFzaC5cblxuIEknbSBub3Qgbm90aWZpZWQgb2YgbWVzc2FnZXMgaGVyZSwgcGxlYXNlIHJlcG9ydCBidWdzIG9ubHkgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJIb3QgQm90dG9tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9ob3QtYm90dG9tIiwKICAidXVpZCI6ICJob3QtYm90dG9tQGZ0aHgiLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "0xarbsardhqzpcwxa59vyb11v90fl9qj03kdrn8sqmcjs48xir3f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVudGVyIG92ZXJ2aWV3IHdoZW4geW91IGhvdmVyIHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbi4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBGb3IgR05PTUUgU2hlbGwgNDArLiBUaGUgd2lkdGggb2YgdGhlIHNob3cgem9uZSBpcyB0aGUgc2FtZSBhcyB0aGUgR25vbWUgU2hlbGwgZGFzaC5cblxuIEknbSBub3Qgbm90aWZpZWQgb2YgbWVzc2FnZXMgaGVyZSwgcGxlYXNlIHJlcG9ydCBidWdzIG9ubHkgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJIb3QgQm90dG9tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9ob3QtYm90dG9tIiwKICAidXVpZCI6ICJob3QtYm90dG9tQGZ0aHgiLAogICJ2ZXJzaW9uIjogMgp9"}}} -, {"uuid": "docker@stickman_0x00.com", "name": "Docker", "pname": "docker", "description": "Quick access to Docker and Docker Compose.", "link": "https://extensions.gnome.org/extension/5103/docker/", "shell_version_map": {"42": {"version": "14", "sha256": "0hf71mr8s1r885jdbr6l578x59fd9wy7id6zn5m2l2njk5riiwj8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zdGlja21hbl8weDAwL2dub21lX3NoZWxsX2V4dGVuc2lvbl9kb2NrZXIiLAogICJ1dWlkIjogImRvY2tlckBzdGlja21hbl8weDAwLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"}, "43": {"version": "14", "sha256": "0hf71mr8s1r885jdbr6l578x59fd9wy7id6zn5m2l2njk5riiwj8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zdGlja21hbl8weDAwL2dub21lX3NoZWxsX2V4dGVuc2lvbl9kb2NrZXIiLAogICJ1dWlkIjogImRvY2tlckBzdGlja21hbl8weDAwLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"}}} -, {"uuid": "reboottouefi@ubaygd.com", "name": "RebootToUEFI", "pname": "reboottouefi", "description": "Reboot system into UEFI", "link": "https://extensions.gnome.org/extension/5105/reboottouefi/", "shell_version_map": {"42": {"version": "9", "sha256": "0f24likzn2min23l03ayn71qb3n3cl2fks7w6ijdwd7c7ns1k27d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290VG9VRUZJIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9VYmF5R0QvcmVib290dG91ZWZpIiwKICAidXVpZCI6ICJyZWJvb3R0b3VlZmlAdWJheWdkLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "0f24likzn2min23l03ayn71qb3n3cl2fks7w6ijdwd7c7ns1k27d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290VG9VRUZJIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9VYmF5R0QvcmVib290dG91ZWZpIiwKICAidXVpZCI6ICJyZWJvb3R0b3VlZmlAdWJheWdkLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}}} +, {"uuid": "hot-bottom@fthx", "name": "Hot Bottom", "pname": "hot-bottom", "description": "Enter overview when you hover the bottom of the screen. Very light extension.\n\n For GNOME Shell 40+. The width of the show zone is the same as the Gnome Shell dash.\n\n I'm not notified of messages here, please report bugs only through GitHub.", "link": "https://extensions.gnome.org/extension/5099/hot-bottom/", "shell_version_map": {"40": {"version": "3", "sha256": "1d50ibjfr9dzhpi45crxikrlqn2jlrqm2krsyfpdma8bqk1d3l7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVudGVyIG92ZXJ2aWV3IHdoZW4geW91IGhvdmVyIHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbi4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBGb3IgR05PTUUgU2hlbGwgNDArLiBUaGUgd2lkdGggb2YgdGhlIHNob3cgem9uZSBpcyB0aGUgc2FtZSBhcyB0aGUgR25vbWUgU2hlbGwgZGFzaC5cblxuIEknbSBub3Qgbm90aWZpZWQgb2YgbWVzc2FnZXMgaGVyZSwgcGxlYXNlIHJlcG9ydCBidWdzIG9ubHkgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJIb3QgQm90dG9tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaG90LWJvdHRvbSIsCiAgInV1aWQiOiAiaG90LWJvdHRvbUBmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1d50ibjfr9dzhpi45crxikrlqn2jlrqm2krsyfpdma8bqk1d3l7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVudGVyIG92ZXJ2aWV3IHdoZW4geW91IGhvdmVyIHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbi4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBGb3IgR05PTUUgU2hlbGwgNDArLiBUaGUgd2lkdGggb2YgdGhlIHNob3cgem9uZSBpcyB0aGUgc2FtZSBhcyB0aGUgR25vbWUgU2hlbGwgZGFzaC5cblxuIEknbSBub3Qgbm90aWZpZWQgb2YgbWVzc2FnZXMgaGVyZSwgcGxlYXNlIHJlcG9ydCBidWdzIG9ubHkgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJIb3QgQm90dG9tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaG90LWJvdHRvbSIsCiAgInV1aWQiOiAiaG90LWJvdHRvbUBmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "1d50ibjfr9dzhpi45crxikrlqn2jlrqm2krsyfpdma8bqk1d3l7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVudGVyIG92ZXJ2aWV3IHdoZW4geW91IGhvdmVyIHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbi4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBGb3IgR05PTUUgU2hlbGwgNDArLiBUaGUgd2lkdGggb2YgdGhlIHNob3cgem9uZSBpcyB0aGUgc2FtZSBhcyB0aGUgR25vbWUgU2hlbGwgZGFzaC5cblxuIEknbSBub3Qgbm90aWZpZWQgb2YgbWVzc2FnZXMgaGVyZSwgcGxlYXNlIHJlcG9ydCBidWdzIG9ubHkgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJIb3QgQm90dG9tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaG90LWJvdHRvbSIsCiAgInV1aWQiOiAiaG90LWJvdHRvbUBmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "1d50ibjfr9dzhpi45crxikrlqn2jlrqm2krsyfpdma8bqk1d3l7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVudGVyIG92ZXJ2aWV3IHdoZW4geW91IGhvdmVyIHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbi4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBGb3IgR05PTUUgU2hlbGwgNDArLiBUaGUgd2lkdGggb2YgdGhlIHNob3cgem9uZSBpcyB0aGUgc2FtZSBhcyB0aGUgR25vbWUgU2hlbGwgZGFzaC5cblxuIEknbSBub3Qgbm90aWZpZWQgb2YgbWVzc2FnZXMgaGVyZSwgcGxlYXNlIHJlcG9ydCBidWdzIG9ubHkgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJIb3QgQm90dG9tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaG90LWJvdHRvbSIsCiAgInV1aWQiOiAiaG90LWJvdHRvbUBmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "docker@stickman_0x00.com", "name": "Docker", "pname": "docker", "description": "Quick access to Docker and Docker Compose.", "link": "https://extensions.gnome.org/extension/5103/docker/", "shell_version_map": {"42": {"version": "17", "sha256": "1rz50l9119hdhznh3mm1pfm00rn7rw7xzlxfigf0m8xsfh179zyq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zdGlja21hbl8weDAwL2dub21lX3NoZWxsX2V4dGVuc2lvbl9kb2NrZXIiLAogICJ1dWlkIjogImRvY2tlckBzdGlja21hbl8weDAwLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "43": {"version": "17", "sha256": "1rz50l9119hdhznh3mm1pfm00rn7rw7xzlxfigf0m8xsfh179zyq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zdGlja21hbl8weDAwL2dub21lX3NoZWxsX2V4dGVuc2lvbl9kb2NrZXIiLAogICJ1dWlkIjogImRvY2tlckBzdGlja21hbl8weDAwLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}}} +, {"uuid": "reboottouefi@ubaygd.com", "name": "RebootToUEFI", "pname": "reboottouefi", "description": "Reboot system into UEFI", "link": "https://extensions.gnome.org/extension/5105/reboottouefi/", "shell_version_map": {"42": {"version": "10", "sha256": "0khvq6yahpbs82ikh4c33wq3wyaij7ijjvss9x55v9c4n1iym16d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290VG9VRUZJIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9VYmF5R0QvcmVib290dG91ZWZpIiwKICAidXVpZCI6ICJyZWJvb3R0b3VlZmlAdWJheWdkLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "10", "sha256": "0khvq6yahpbs82ikh4c33wq3wyaij7ijjvss9x55v9c4n1iym16d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290VG9VRUZJIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9VYmF5R0QvcmVib290dG91ZWZpIiwKICAidXVpZCI6ICJyZWJvb3R0b3VlZmlAdWJheWdkLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "touch-ux@dblandford.com", "name": "Touch-UX", "pname": "touch-ux", "description": "Provides a swipe up gesture bar and a status bar shortcut to force the on screen keyboard to show in scenarios that it does not automatically show when expected.", "link": "https://extensions.gnome.org/extension/5108/touch-ux/", "shell_version_map": {"42": {"version": "3", "sha256": "1vjchsz0jml0qaj2mz0khsagacxz1m60ypcjnymh3swrx9lj765m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGEgc3dpcGUgdXAgZ2VzdHVyZSBiYXIgYW5kIGEgc3RhdHVzIGJhciBzaG9ydGN1dCB0byBmb3JjZSB0aGUgb24gc2NyZWVuIGtleWJvYXJkIHRvIHNob3cgaW4gc2NlbmFyaW9zIHRoYXQgaXQgZG9lcyBub3QgYXV0b21hdGljYWxseSBzaG93IHdoZW4gZXhwZWN0ZWQuIiwKICAibmFtZSI6ICJUb3VjaC1VWCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EYW5pZWwtQmxhbmRmb3JkL1RvdWNoLVVYIiwKICAidXVpZCI6ICJ0b3VjaC11eEBkYmxhbmRmb3JkLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "display-scale-switcher@knokelmaat.gitlab.com", "name": "Display Scale Switcher", "pname": "display-scale-switcher", "description": "Quickly change the display scaling factor from the system menu.", "link": "https://extensions.gnome.org/extension/5111/display-scale-switcher/", "shell_version_map": {"42": {"version": "1", "sha256": "14yd0xzgqvqxq1s11pbspqn1y1sqjsdgq2giqkwf8r1n2rn1wc94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IHNjYWxpbmcgZmFjdG9yIGZyb20gdGhlIHN5c3RlbSBtZW51LiIsCiAgIm5hbWUiOiAiRGlzcGxheSBTY2FsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9rbm9rZWxtYWF0L2Rpc3BsYXktc2NhbGUtc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaXNwbGF5LXNjYWxlLXN3aXRjaGVyQGtub2tlbG1hYXQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "43": {"version": "3", "sha256": "0lkyfzks9l7y784rswadfg831rfqk5jknzzg5pvbjqhyk6v22cc7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IHNjYWxpbmcgZmFjdG9yIGZyb20gdGhlIHN5c3RlbSBtZW51LiIsCiAgIm5hbWUiOiAiRGlzcGxheSBTY2FsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9rbm9rZWxtYWF0L2Rpc3BsYXktc2NhbGUtc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaXNwbGF5LXNjYWxlLXN3aXRjaGVyQGtub2tlbG1hYXQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} -, {"uuid": "tailscale-status@maxgallup.github.com", "name": "Tailscale Status", "pname": "tailscale-status", "description": "Manage Tailscale connections and check status from desktop read more at https://github.com/maxgallup/tailscale-status/blob/main/README.md", "link": "https://extensions.gnome.org/extension/5112/tailscale-status/", "shell_version_map": {"42": {"version": "16", "sha256": "1f69xhqy5qddqwswqsrq97jc0x65d5r95a38vp6vwkmdxlpf67sv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cyIsCiAgInV1aWQiOiAidGFpbHNjYWxlLXN0YXR1c0BtYXhnYWxsdXAuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}, "43": {"version": "16", "sha256": "1f69xhqy5qddqwswqsrq97jc0x65d5r95a38vp6vwkmdxlpf67sv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cyIsCiAgInV1aWQiOiAidGFpbHNjYWxlLXN0YXR1c0BtYXhnYWxsdXAuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}}} +, {"uuid": "tailscale-status@maxgallup.github.com", "name": "Tailscale Status", "pname": "tailscale-status", "description": "Manage Tailscale connections and check status from desktop read more at https://github.com/maxgallup/tailscale-status/blob/main/README.md", "link": "https://extensions.gnome.org/extension/5112/tailscale-status/", "shell_version_map": {"42": {"version": "17", "sha256": "0s9fp09c9f0fnmqncmdia8gghmllgmv006iy3q63jq4cpy5978k9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cyIsCiAgInV1aWQiOiAidGFpbHNjYWxlLXN0YXR1c0BtYXhnYWxsdXAuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "43": {"version": "17", "sha256": "0s9fp09c9f0fnmqncmdia8gghmllgmv006iy3q63jq4cpy5978k9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cyIsCiAgInV1aWQiOiAidGFpbHNjYWxlLXN0YXR1c0BtYXhnYWxsdXAuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}}} , {"uuid": "simple-timer@majortomvr.github.com", "name": "Simple Timer", "pname": "simple-timer", "description": "Simple Timer is a Gnome Shell Extension that adds a Timer to the Panel.", "link": "https://extensions.gnome.org/extension/5115/simple-timer/", "shell_version_map": {"41": {"version": "1", "sha256": "1k1qxygahg7h5x5g2b6c13j0hnv0sy9k82nw45ixjkzmfrx99pr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01ham9ydG9tVlIvc2ltcGxlLXRpbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2ltcGxlLXRpbWVyQG1ham9ydG9tdnIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "7", "sha256": "1zvw5mr36rcbs1qhkk8arss44g9f3qmgvasy16n4bxl5p0hzr2q6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYWpvcnRvbVZSL3NpbXBsZS10aW1lci1leHRlbnNpb24iLAogICJ1dWlkIjogInNpbXBsZS10aW1lckBtYWpvcnRvbXZyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "1zvw5mr36rcbs1qhkk8arss44g9f3qmgvasy16n4bxl5p0hzr2q6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYWpvcnRvbVZSL3NpbXBsZS10aW1lci1leHRlbnNpb24iLAogICJ1dWlkIjogInNpbXBsZS10aW1lckBtYWpvcnRvbXZyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "translate-assistant@atareao.es", "name": "Translate assistant", "pname": "translate-assistant", "description": "Translate with DeepL Translator", "link": "https://extensions.gnome.org/extension/5124/translate-assistant/", "shell_version_map": {"42": {"version": "6", "sha256": "0rql3ax7m3pr8g5h7iadl4isa2wv2wyzl9n0nihwf2js19i6ya97", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3aXRoIERlZXBMIFRyYW5zbGF0b3IiLAogICJleHRlbnNpb24taWQiOiAidHJhbnNsYXRlLWFzc2lzdGFudEBhdGFyZWFvLmVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHJhbnNsYXRlLWFzc2lzdGFudEBhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJ0cmFuc2xhdGUtYXNzaXN0YW50LWljb24iLAogICJuYW1lIjogIlRyYW5zbGF0ZSBhc3Npc3RhbnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNsYXRlLWFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdGFyZWFvL3RyYW5zbGF0ZS1hc3Npc3RhbnQiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1hc3Npc3RhbnRAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "stand-with-ukraine@vshut", "name": "Stand With Ukraine", "pname": "stand-with-ukraine", "description": "Displays Ukraine emoji flag in the top panel and provides menu with useful links.", "link": "https://extensions.gnome.org/extension/5126/stand-with-ukraine/", "shell_version_map": {"38": {"version": "3", "sha256": "1iqhy6jf6l74dig8lfd5kyqn6rc0f1f43qr9xk3396f2l1wjy6vf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFVrcmFpbmUgZW1vamkgZmxhZyBpbiB0aGUgdG9wIHBhbmVsIGFuZCBwcm92aWRlcyBtZW51IHdpdGggdXNlZnVsIGxpbmtzLiIsCiAgIm5hbWUiOiAiU3RhbmQgV2l0aCBVa3JhaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdmxhZHNodXQvc3RhbmQtd2l0aC11a3JhaW5lLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhbmQtd2l0aC11a3JhaW5lQHZzaHV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "1iqhy6jf6l74dig8lfd5kyqn6rc0f1f43qr9xk3396f2l1wjy6vf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFVrcmFpbmUgZW1vamkgZmxhZyBpbiB0aGUgdG9wIHBhbmVsIGFuZCBwcm92aWRlcyBtZW51IHdpdGggdXNlZnVsIGxpbmtzLiIsCiAgIm5hbWUiOiAiU3RhbmQgV2l0aCBVa3JhaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdmxhZHNodXQvc3RhbmQtd2l0aC11a3JhaW5lLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhbmQtd2l0aC11a3JhaW5lQHZzaHV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1iqhy6jf6l74dig8lfd5kyqn6rc0f1f43qr9xk3396f2l1wjy6vf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFVrcmFpbmUgZW1vamkgZmxhZyBpbiB0aGUgdG9wIHBhbmVsIGFuZCBwcm92aWRlcyBtZW51IHdpdGggdXNlZnVsIGxpbmtzLiIsCiAgIm5hbWUiOiAiU3RhbmQgV2l0aCBVa3JhaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdmxhZHNodXQvc3RhbmQtd2l0aC11a3JhaW5lLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhbmQtd2l0aC11a3JhaW5lQHZzaHV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "1iqhy6jf6l74dig8lfd5kyqn6rc0f1f43qr9xk3396f2l1wjy6vf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFVrcmFpbmUgZW1vamkgZmxhZyBpbiB0aGUgdG9wIHBhbmVsIGFuZCBwcm92aWRlcyBtZW51IHdpdGggdXNlZnVsIGxpbmtzLiIsCiAgIm5hbWUiOiAiU3RhbmQgV2l0aCBVa3JhaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdmxhZHNodXQvc3RhbmQtd2l0aC11a3JhaW5lLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhbmQtd2l0aC11a3JhaW5lQHZzaHV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "audio-selector@harald65.simon.gmail.com", "name": "Audio Selector", "pname": "audio-selector", "description": "Select audio output and/or input port", "link": "https://extensions.gnome.org/extension/5135/audio-selector/", "shell_version_map": {"42": {"version": "5", "sha256": "00ww12j34fpbrqlxkc6d47s0i542byz6r39yrshyf8xrcs8r7ifm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlbGVjdCBhdWRpbyBvdXRwdXQgYW5kL29yIGlucHV0IHBvcnQiLAogICJuYW1lIjogIkF1ZGlvIFNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hzNjUvR25vbWUtU2hlbGwtRXh0ZW5zaW9uLUF1ZGlvLVNlbGVjdG9yLmdpdCIsCiAgInV1aWQiOiAiYXVkaW8tc2VsZWN0b3JAaGFyYWxkNjUuc2ltb24uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} -, {"uuid": "dashbar@fthx", "name": "DashBar", "pname": "dashbar", "description": "Task bar. Very light extension.\n\n Features:\n\n - Hide overview at start-up.\n\n - Scroll on taskbar to change workspace.\n\n - Show desktop button. Left click to minimize all windows. Right click to activate all windows.\n\n - Show apps button. Left click to enter overview. Right click to show apps overview.\n\n - GNOME Shell dash items in top bar. Left click to toggle (or cycle if many app windows). Right click to show app menu. Middle click to open new window. Drag'n'drop favorites.\n\n - Remove 'Activities' button.\n\n - Change 'Places' extension label to an icon.\n\n No settings. If you want customization through preferences UI, please consider BaBar or Dash to Panel.\n\n ----------\n\n Please report any bug only through GitHub, I'm not notified here.", "link": "https://extensions.gnome.org/extension/5143/dashbar/", "shell_version_map": {"42": {"version": "10", "sha256": "1gxf40bczqhfsnn9djlphcm9f0daklmj7xi1s7xd16q7x5a301d0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi5cblxuIEZlYXR1cmVzOlxuXG4gLSBIaWRlIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLlxuXG4gLSBTY3JvbGwgb24gdGFza2JhciB0byBjaGFuZ2Ugd29ya3NwYWNlLlxuXG4gLSBTaG93IGRlc2t0b3AgYnV0dG9uLiBMZWZ0IGNsaWNrIHRvIG1pbmltaXplIGFsbCB3aW5kb3dzLiBSaWdodCBjbGljayB0byBhY3RpdmF0ZSBhbGwgd2luZG93cy5cblxuIC0gU2hvdyBhcHBzIGJ1dHRvbi4gTGVmdCBjbGljayB0byBlbnRlciBvdmVydmlldy4gUmlnaHQgY2xpY2sgdG8gc2hvdyBhcHBzIG92ZXJ2aWV3LlxuXG4gLSBHTk9NRSBTaGVsbCBkYXNoIGl0ZW1zIGluIHRvcCBiYXIuIExlZnQgY2xpY2sgdG8gdG9nZ2xlIChvciBjeWNsZSBpZiBtYW55IGFwcCB3aW5kb3dzKS4gUmlnaHQgY2xpY2sgdG8gc2hvdyBhcHAgbWVudS4gTWlkZGxlIGNsaWNrIHRvIG9wZW4gbmV3IHdpbmRvdy4gRHJhZyduJ2Ryb3AgZmF2b3JpdGVzLlxuXG4gLSBSZW1vdmUgJ0FjdGl2aXRpZXMnIGJ1dHRvbi5cblxuIC0gQ2hhbmdlICdQbGFjZXMnIGV4dGVuc2lvbiBsYWJlbCB0byBhbiBpY29uLlxuXG4gTm8gc2V0dGluZ3MuIElmIHlvdSB3YW50IGN1c3RvbWl6YXRpb24gdGhyb3VnaCBwcmVmZXJlbmNlcyBVSSwgcGxlYXNlIGNvbnNpZGVyIEJhQmFyIG9yIERhc2ggdG8gUGFuZWwuXG5cbiAtLS0tLS0tLS0tXG5cbiBQbGVhc2UgcmVwb3J0IGFueSBidWcgb25seSB0aHJvdWdoIEdpdEh1YiwgSSdtIG5vdCBub3RpZmllZCBoZXJlLiIsCiAgIm5hbWUiOiAiRGFzaEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9kYXNoYmFyIiwKICAidXVpZCI6ICJkYXNoYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "43": {"version": "10", "sha256": "1gxf40bczqhfsnn9djlphcm9f0daklmj7xi1s7xd16q7x5a301d0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi5cblxuIEZlYXR1cmVzOlxuXG4gLSBIaWRlIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLlxuXG4gLSBTY3JvbGwgb24gdGFza2JhciB0byBjaGFuZ2Ugd29ya3NwYWNlLlxuXG4gLSBTaG93IGRlc2t0b3AgYnV0dG9uLiBMZWZ0IGNsaWNrIHRvIG1pbmltaXplIGFsbCB3aW5kb3dzLiBSaWdodCBjbGljayB0byBhY3RpdmF0ZSBhbGwgd2luZG93cy5cblxuIC0gU2hvdyBhcHBzIGJ1dHRvbi4gTGVmdCBjbGljayB0byBlbnRlciBvdmVydmlldy4gUmlnaHQgY2xpY2sgdG8gc2hvdyBhcHBzIG92ZXJ2aWV3LlxuXG4gLSBHTk9NRSBTaGVsbCBkYXNoIGl0ZW1zIGluIHRvcCBiYXIuIExlZnQgY2xpY2sgdG8gdG9nZ2xlIChvciBjeWNsZSBpZiBtYW55IGFwcCB3aW5kb3dzKS4gUmlnaHQgY2xpY2sgdG8gc2hvdyBhcHAgbWVudS4gTWlkZGxlIGNsaWNrIHRvIG9wZW4gbmV3IHdpbmRvdy4gRHJhZyduJ2Ryb3AgZmF2b3JpdGVzLlxuXG4gLSBSZW1vdmUgJ0FjdGl2aXRpZXMnIGJ1dHRvbi5cblxuIC0gQ2hhbmdlICdQbGFjZXMnIGV4dGVuc2lvbiBsYWJlbCB0byBhbiBpY29uLlxuXG4gTm8gc2V0dGluZ3MuIElmIHlvdSB3YW50IGN1c3RvbWl6YXRpb24gdGhyb3VnaCBwcmVmZXJlbmNlcyBVSSwgcGxlYXNlIGNvbnNpZGVyIEJhQmFyIG9yIERhc2ggdG8gUGFuZWwuXG5cbiAtLS0tLS0tLS0tXG5cbiBQbGVhc2UgcmVwb3J0IGFueSBidWcgb25seSB0aHJvdWdoIEdpdEh1YiwgSSdtIG5vdCBub3RpZmllZCBoZXJlLiIsCiAgIm5hbWUiOiAiRGFzaEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9kYXNoYmFyIiwKICAidXVpZCI6ICJkYXNoYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} +, {"uuid": "dashbar@fthx", "name": "DashBar", "pname": "dashbar", "description": "Task bar. Very light extension.\n\n Features:\n\n - Hide overview at start-up.\n\n - Scroll on taskbar to change workspace.\n\n - Show apps button (left click to enter overview, right click to show apps overview).\n\n - GNOME Shell dash items in top bar (left click to toggle or cycle, right click to show app menu, middle click to open new window).\n\n - Drag'n'drop favorites.\n\n - Remove 'Activities' button.\n\n - Change 'Places' extension label to an icon.\n\n No settings. If you want customization through preferences UI, please consider BaBar or Dash to Panel.\n\n ----------\n\n Please report any bug only through GitHub, I'm not notified here.", "link": "https://extensions.gnome.org/extension/5143/dashbar/", "shell_version_map": {"42": {"version": "13", "sha256": "0pp6fiza9wq170r95fasb97qw9jxd606q958xxnb9r23zrnsijnh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi5cblxuIEZlYXR1cmVzOlxuXG4gLSBIaWRlIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLlxuXG4gLSBTY3JvbGwgb24gdGFza2JhciB0byBjaGFuZ2Ugd29ya3NwYWNlLlxuXG4gLSBTaG93IGFwcHMgYnV0dG9uIChsZWZ0IGNsaWNrIHRvIGVudGVyIG92ZXJ2aWV3LCByaWdodCBjbGljayB0byBzaG93IGFwcHMgb3ZlcnZpZXcpLlxuXG4gLSBHTk9NRSBTaGVsbCBkYXNoIGl0ZW1zIGluIHRvcCBiYXIgKGxlZnQgY2xpY2sgdG8gdG9nZ2xlIG9yIGN5Y2xlLCByaWdodCBjbGljayB0byBzaG93IGFwcCBtZW51LCBtaWRkbGUgY2xpY2sgdG8gb3BlbiBuZXcgd2luZG93KS5cblxuIC0gRHJhZyduJ2Ryb3AgZmF2b3JpdGVzLlxuXG4gLSBSZW1vdmUgJ0FjdGl2aXRpZXMnIGJ1dHRvbi5cblxuIC0gQ2hhbmdlICdQbGFjZXMnIGV4dGVuc2lvbiBsYWJlbCB0byBhbiBpY29uLlxuXG4gTm8gc2V0dGluZ3MuIElmIHlvdSB3YW50IGN1c3RvbWl6YXRpb24gdGhyb3VnaCBwcmVmZXJlbmNlcyBVSSwgcGxlYXNlIGNvbnNpZGVyIEJhQmFyIG9yIERhc2ggdG8gUGFuZWwuXG5cbiAtLS0tLS0tLS0tXG5cbiBQbGVhc2UgcmVwb3J0IGFueSBidWcgb25seSB0aHJvdWdoIEdpdEh1YiwgSSdtIG5vdCBub3RpZmllZCBoZXJlLiIsCiAgIm5hbWUiOiAiRGFzaEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9kYXNoYmFyIiwKICAidXVpZCI6ICJkYXNoYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "43": {"version": "13", "sha256": "0pp6fiza9wq170r95fasb97qw9jxd606q958xxnb9r23zrnsijnh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi5cblxuIEZlYXR1cmVzOlxuXG4gLSBIaWRlIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLlxuXG4gLSBTY3JvbGwgb24gdGFza2JhciB0byBjaGFuZ2Ugd29ya3NwYWNlLlxuXG4gLSBTaG93IGFwcHMgYnV0dG9uIChsZWZ0IGNsaWNrIHRvIGVudGVyIG92ZXJ2aWV3LCByaWdodCBjbGljayB0byBzaG93IGFwcHMgb3ZlcnZpZXcpLlxuXG4gLSBHTk9NRSBTaGVsbCBkYXNoIGl0ZW1zIGluIHRvcCBiYXIgKGxlZnQgY2xpY2sgdG8gdG9nZ2xlIG9yIGN5Y2xlLCByaWdodCBjbGljayB0byBzaG93IGFwcCBtZW51LCBtaWRkbGUgY2xpY2sgdG8gb3BlbiBuZXcgd2luZG93KS5cblxuIC0gRHJhZyduJ2Ryb3AgZmF2b3JpdGVzLlxuXG4gLSBSZW1vdmUgJ0FjdGl2aXRpZXMnIGJ1dHRvbi5cblxuIC0gQ2hhbmdlICdQbGFjZXMnIGV4dGVuc2lvbiBsYWJlbCB0byBhbiBpY29uLlxuXG4gTm8gc2V0dGluZ3MuIElmIHlvdSB3YW50IGN1c3RvbWl6YXRpb24gdGhyb3VnaCBwcmVmZXJlbmNlcyBVSSwgcGxlYXNlIGNvbnNpZGVyIEJhQmFyIG9yIERhc2ggdG8gUGFuZWwuXG5cbiAtLS0tLS0tLS0tXG5cbiBQbGVhc2UgcmVwb3J0IGFueSBidWcgb25seSB0aHJvdWdoIEdpdEh1YiwgSSdtIG5vdCBub3RpZmllZCBoZXJlLiIsCiAgIm5hbWUiOiAiRGFzaEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9kYXNoYmFyIiwKICAidXVpZCI6ICJkYXNoYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} , {"uuid": "extended-screen@free-bots.github.io", "name": "Extended Screen", "pname": "extended-screen", "description": "Enables Gnome's hidden extending screen feature. Available at version 42+.", "link": "https://extensions.gnome.org/extension/5146/extended-screen/", "shell_version_map": {"42": {"version": "3", "sha256": "0d9svp0wqawkxvaikj6jhrqjzhs3xc7w6wml57x82036b9krmv6y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgR25vbWUncyBoaWRkZW4gZXh0ZW5kaW5nIHNjcmVlbiBmZWF0dXJlLiBBdmFpbGFibGUgYXQgdmVyc2lvbiA0MisuIiwKICAibmFtZSI6ICJFeHRlbmRlZCBTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyZWUtYm90cy9leHRlbmRlZC1zY3JlZW4iLAogICJ1dWlkIjogImV4dGVuZGVkLXNjcmVlbkBmcmVlLWJvdHMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "0d9svp0wqawkxvaikj6jhrqjzhs3xc7w6wml57x82036b9krmv6y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgR25vbWUncyBoaWRkZW4gZXh0ZW5kaW5nIHNjcmVlbiBmZWF0dXJlLiBBdmFpbGFibGUgYXQgdmVyc2lvbiA0MisuIiwKICAibmFtZSI6ICJFeHRlbmRlZCBTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyZWUtYm90cy9leHRlbmRlZC1zY3JlZW4iLAogICJ1dWlkIjogImV4dGVuZGVkLXNjcmVlbkBmcmVlLWJvdHMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "waylandorx11@injcristianrojas.github.com", "name": "Wayland or X11", "pname": "wayland-or-x11", "description": "Am I using Wayland or X11?", "link": "https://extensions.gnome.org/extension/5149/wayland-or-x11/", "shell_version_map": {"40": {"version": "8", "sha256": "0lq5cxv6v3qf31yd4mdj58s32dk9xnr0b244k86xrdafpd4xjp9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFtIEkgdXNpbmcgV2F5bGFuZCBvciBYMTE/IiwKICAibmFtZSI6ICJXYXlsYW5kIG9yIFgxMSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL3dheWxhbmRvcngxMSIsCiAgInV1aWQiOiAid2F5bGFuZG9yeDExQGluamNyaXN0aWFucm9qYXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0lq5cxv6v3qf31yd4mdj58s32dk9xnr0b244k86xrdafpd4xjp9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFtIEkgdXNpbmcgV2F5bGFuZCBvciBYMTE/IiwKICAibmFtZSI6ICJXYXlsYW5kIG9yIFgxMSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL3dheWxhbmRvcngxMSIsCiAgInV1aWQiOiAid2F5bGFuZG9yeDExQGluamNyaXN0aWFucm9qYXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "0lq5cxv6v3qf31yd4mdj58s32dk9xnr0b244k86xrdafpd4xjp9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFtIEkgdXNpbmcgV2F5bGFuZCBvciBYMTE/IiwKICAibmFtZSI6ICJXYXlsYW5kIG9yIFgxMSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL3dheWxhbmRvcngxMSIsCiAgInV1aWQiOiAid2F5bGFuZG9yeDExQGluamNyaXN0aWFucm9qYXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "0lq5cxv6v3qf31yd4mdj58s32dk9xnr0b244k86xrdafpd4xjp9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFtIEkgdXNpbmcgV2F5bGFuZCBvciBYMTE/IiwKICAibmFtZSI6ICJXYXlsYW5kIG9yIFgxMSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL3dheWxhbmRvcngxMSIsCiAgInV1aWQiOiAid2F5bGFuZG9yeDExQGluamNyaXN0aWFucm9qYXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} -, {"uuid": "azclock@azclock.gitlab.com", "name": "Desktop Clock", "pname": "desktop-clock", "description": "Add a clock to the desktop!", "link": "https://extensions.gnome.org/extension/5156/desktop-clock/", "shell_version_map": {"42": {"version": "2", "sha256": "1kzrqldvfq1c0rxjalcp6jcail3zq69w3mnkjz1wksi3ja8h71bz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wISIsCiAgImdldHRleHQtZG9tYWluIjogImF6Y2xvY2siLAogICJuYW1lIjogIkRlc2t0b3AgQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXpjbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXpjbG9jayIsCiAgInV1aWQiOiAiYXpjbG9ja0BhemNsb2NrLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "1kzrqldvfq1c0rxjalcp6jcail3zq69w3mnkjz1wksi3ja8h71bz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wISIsCiAgImdldHRleHQtZG9tYWluIjogImF6Y2xvY2siLAogICJuYW1lIjogIkRlc2t0b3AgQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXpjbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXpjbG9jayIsCiAgInV1aWQiOiAiYXpjbG9ja0BhemNsb2NrLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "azclock@azclock.gitlab.com", "name": "Desktop Clock", "pname": "desktop-clock", "description": "Add a clock to the desktop!\n\nAnalog and Digital clock styles available. Highly customizable.\n\nDigital clock labels support markup, allowing you to style individual components on each label.\n\nNote: Temporarily turn off Desktop Icons to move the clock around.", "link": "https://extensions.gnome.org/extension/5156/desktop-clock/", "shell_version_map": {"42": {"version": "4", "sha256": "11nc2r4vdckqhcwrc2ry7zzs1ypmshqfpg5n3l1fj9ja9rnpyplv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wIVxuXG5BbmFsb2cgYW5kIERpZ2l0YWwgY2xvY2sgc3R5bGVzIGF2YWlsYWJsZS4gSGlnaGx5IGN1c3RvbWl6YWJsZS5cblxuRGlnaXRhbCBjbG9jayBsYWJlbHMgc3VwcG9ydCBtYXJrdXAsIGFsbG93aW5nIHlvdSB0byBzdHlsZSBpbmRpdmlkdWFsIGNvbXBvbmVudHMgb24gZWFjaCBsYWJlbC5cblxuTm90ZTogVGVtcG9yYXJpbHkgdHVybiBvZmYgRGVza3RvcCBJY29ucyB0byBtb3ZlIHRoZSBjbG9jayBhcm91bmQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXpjbG9jayIsCiAgIm5hbWUiOiAiRGVza3RvcCBDbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hemNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9hemNsb2NrIiwKICAidXVpZCI6ICJhemNsb2NrQGF6Y2xvY2suZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "11nc2r4vdckqhcwrc2ry7zzs1ypmshqfpg5n3l1fj9ja9rnpyplv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wIVxuXG5BbmFsb2cgYW5kIERpZ2l0YWwgY2xvY2sgc3R5bGVzIGF2YWlsYWJsZS4gSGlnaGx5IGN1c3RvbWl6YWJsZS5cblxuRGlnaXRhbCBjbG9jayBsYWJlbHMgc3VwcG9ydCBtYXJrdXAsIGFsbG93aW5nIHlvdSB0byBzdHlsZSBpbmRpdmlkdWFsIGNvbXBvbmVudHMgb24gZWFjaCBsYWJlbC5cblxuTm90ZTogVGVtcG9yYXJpbHkgdHVybiBvZmYgRGVza3RvcCBJY29ucyB0byBtb3ZlIHRoZSBjbG9jayBhcm91bmQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXpjbG9jayIsCiAgIm5hbWUiOiAiRGVza3RvcCBDbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hemNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9hemNsb2NrIiwKICAidXVpZCI6ICJhemNsb2NrQGF6Y2xvY2suZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "since-indicator@atareao.es", "name": "Since Indicator", "pname": "since-indicator", "description": "A simple menubar app for GNOME Shell that tracks how long you've been using your computer uninterruptedly", "link": "https://extensions.gnome.org/extension/5158/since-indicator/", "shell_version_map": {"40": {"version": "3", "sha256": "0ddrbs8c95v3lhgs1pllhb89ddwlkzavdfgsijw1w5pjcxrq4hn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dG9yIjogIkxvcmVuem8gQ2FyYm9uZWxsIiwKICAiY29weXJpZ2h0IjogIjIwMjIiLAogICJkZXNjcmlwdGlvbiI6ICJBIHNpbXBsZSBtZW51YmFyIGFwcCBmb3IgR05PTUUgU2hlbGwgdGhhdCB0cmFja3MgaG93IGxvbmcgeW91J3ZlIGJlZW4gdXNpbmcgeW91ciBjb21wdXRlciB1bmludGVycnVwdGVkbHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzaW5jZS1pbmRpY2F0b3JAYXRhcmVhby5lcyIsCiAgImljb24iOiAic2luY2UtaW5kaWNhdG9yIiwKICAibmFtZSI6ICJTaW5jZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2luY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5hdGFyZWFvLmVzL2FwbGljYWNpb24vc2luY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJzaW5jZS1pbmRpY2F0b3JAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "0ddrbs8c95v3lhgs1pllhb89ddwlkzavdfgsijw1w5pjcxrq4hn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dG9yIjogIkxvcmVuem8gQ2FyYm9uZWxsIiwKICAiY29weXJpZ2h0IjogIjIwMjIiLAogICJkZXNjcmlwdGlvbiI6ICJBIHNpbXBsZSBtZW51YmFyIGFwcCBmb3IgR05PTUUgU2hlbGwgdGhhdCB0cmFja3MgaG93IGxvbmcgeW91J3ZlIGJlZW4gdXNpbmcgeW91ciBjb21wdXRlciB1bmludGVycnVwdGVkbHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzaW5jZS1pbmRpY2F0b3JAYXRhcmVhby5lcyIsCiAgImljb24iOiAic2luY2UtaW5kaWNhdG9yIiwKICAibmFtZSI6ICJTaW5jZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2luY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5hdGFyZWFvLmVzL2FwbGljYWNpb24vc2luY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJzaW5jZS1pbmRpY2F0b3JAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "0ddrbs8c95v3lhgs1pllhb89ddwlkzavdfgsijw1w5pjcxrq4hn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dG9yIjogIkxvcmVuem8gQ2FyYm9uZWxsIiwKICAiY29weXJpZ2h0IjogIjIwMjIiLAogICJkZXNjcmlwdGlvbiI6ICJBIHNpbXBsZSBtZW51YmFyIGFwcCBmb3IgR05PTUUgU2hlbGwgdGhhdCB0cmFja3MgaG93IGxvbmcgeW91J3ZlIGJlZW4gdXNpbmcgeW91ciBjb21wdXRlciB1bmludGVycnVwdGVkbHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzaW5jZS1pbmRpY2F0b3JAYXRhcmVhby5lcyIsCiAgImljb24iOiAic2luY2UtaW5kaWNhdG9yIiwKICAibmFtZSI6ICJTaW5jZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2luY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5hdGFyZWFvLmVzL2FwbGljYWNpb24vc2luY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJzaW5jZS1pbmRpY2F0b3JAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "dollar-to-brl", "name": "Dollar", "pname": "dollar", "description": "Convert Dollar USD to Real BRL using API AWESOMEAPI https://docs.awesomeapi.com.br.", "link": "https://extensions.gnome.org/extension/5159/dollar/", "shell_version_map": {"41": {"version": "4", "sha256": "1aqvgf1inrjz6m4x44dm5r3x0xmj8xmi8mjyr91kjh2n76h3afn6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnQgRG9sbGFyIFVTRCB0byBSZWFsIEJSTCB1c2luZyBBUEkgQVdFU09NRUFQSSBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQyLjQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsRGVNYXR0b3MvZG9sbGFyLXRvLWJybCIsCiAgInV1aWQiOiAiZG9sbGFyLXRvLWJybCIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1aqvgf1inrjz6m4x44dm5r3x0xmj8xmi8mjyr91kjh2n76h3afn6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnQgRG9sbGFyIFVTRCB0byBSZWFsIEJSTCB1c2luZyBBUEkgQVdFU09NRUFQSSBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQyLjQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsRGVNYXR0b3MvZG9sbGFyLXRvLWJybCIsCiAgInV1aWQiOiAiZG9sbGFyLXRvLWJybCIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "1aqvgf1inrjz6m4x44dm5r3x0xmj8xmi8mjyr91kjh2n76h3afn6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnQgRG9sbGFyIFVTRCB0byBSZWFsIEJSTCB1c2luZyBBUEkgQVdFU09NRUFQSSBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQyLjQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsRGVNYXR0b3MvZG9sbGFyLXRvLWJybCIsCiAgInV1aWQiOiAiZG9sbGFyLXRvLWJybCIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "noa11y@popov895.ukr.net", "name": "No a11y", "pname": "no-a11y", "description": "Hide the accessibility button on the top bar.", "link": "https://extensions.gnome.org/extension/5162/no-a11y/", "shell_version_map": {"42": {"version": "1", "sha256": "0nv9iwyx0pqf81jhdgfm5dsjh7ryp8y25w32l1ll1w7223chz2v7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvbm9hMTF5IiwKICAidXVpZCI6ICJub2ExMXlAcG9wb3Y4OTUudWtyLm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "noa11y@popov895.ukr.net", "name": "No a11y", "pname": "no-a11y", "description": "Hide the accessibility button on the top bar.", "link": "https://extensions.gnome.org/extension/5162/no-a11y/", "shell_version_map": {"42": {"version": "2", "sha256": "0bczyngw6zzprf7c6ih78j100wc9dvv3inxc8aqdmxqv291z7qwy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L25vYTExeSIsCiAgInV1aWQiOiAibm9hMTF5QHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "0bczyngw6zzprf7c6ih78j100wc9dvv3inxc8aqdmxqv291z7qwy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L25vYTExeSIsCiAgInV1aWQiOiAibm9hMTF5QHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "upower-battery@codilia.com", "name": "UPower Battery", "pname": "upower-battery", "description": "UPower Battery Indicator.", "link": "https://extensions.gnome.org/extension/5165/upower-battery/", "shell_version_map": {"42": {"version": "8", "sha256": "0wx1hjhn93ppb6dch3cc6zzh7va7jhkggg9xslxa8qyws7mshswp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVQb3dlciBCYXR0ZXJ5IEluZGljYXRvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cG93ZXJfYmF0dGVyeV9pbmRpY2F0b3IiLAogICJuYW1lIjogIlVQb3dlciBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb2RpbGlhL3Vwb3dlci1iYXR0ZXJ5IiwKICAidXVpZCI6ICJ1cG93ZXItYmF0dGVyeUBjb2RpbGlhLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "0wx1hjhn93ppb6dch3cc6zzh7va7jhkggg9xslxa8qyws7mshswp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVQb3dlciBCYXR0ZXJ5IEluZGljYXRvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cG93ZXJfYmF0dGVyeV9pbmRpY2F0b3IiLAogICJuYW1lIjogIlVQb3dlciBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb2RpbGlhL3Vwb3dlci1iYXR0ZXJ5IiwKICAidXVpZCI6ICJ1cG93ZXItYmF0dGVyeUBjb2RpbGlhLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} -, {"uuid": "vertical-workspaces@G-dH.github.com", "name": "Vertical Workspaces", "pname": "vertical-workspaces", "description": "Vertical orientation of workspaces and options to customize Activities overview layout and content for GNOME 40+.\n\nIf you find this extension useful, please leave a comment, your feedback is important to me, be it positive or negative!\nPlease report bugs and feature requests on the GitHub page linked below as Extension Homepage.", "link": "https://extensions.gnome.org/extension/5177/vertical-workspaces/", "shell_version_map": {"40": {"version": "13", "sha256": "1vy3wk8fjv8brbny638fyhkq84q8x00h9scqf7qi6dr1mvzf93g6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBmaW5kIHRoaXMgZXh0ZW5zaW9uIHVzZWZ1bCwgcGxlYXNlIGxlYXZlIGEgY29tbWVudCwgeW91ciBmZWVkYmFjayBpcyBpbXBvcnRhbnQgdG8gbWUsIGJlIGl0IHBvc2l0aXZlIG9yIG5lZ2F0aXZlIVxuUGxlYXNlIHJlcG9ydCBidWdzIGFuZCBmZWF0dXJlIHJlcXVlc3RzIG9uIHRoZSBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "1vy3wk8fjv8brbny638fyhkq84q8x00h9scqf7qi6dr1mvzf93g6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBmaW5kIHRoaXMgZXh0ZW5zaW9uIHVzZWZ1bCwgcGxlYXNlIGxlYXZlIGEgY29tbWVudCwgeW91ciBmZWVkYmFjayBpcyBpbXBvcnRhbnQgdG8gbWUsIGJlIGl0IHBvc2l0aXZlIG9yIG5lZ2F0aXZlIVxuUGxlYXNlIHJlcG9ydCBidWdzIGFuZCBmZWF0dXJlIHJlcXVlc3RzIG9uIHRoZSBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "42": {"version": "13", "sha256": "1vy3wk8fjv8brbny638fyhkq84q8x00h9scqf7qi6dr1mvzf93g6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBmaW5kIHRoaXMgZXh0ZW5zaW9uIHVzZWZ1bCwgcGxlYXNlIGxlYXZlIGEgY29tbWVudCwgeW91ciBmZWVkYmFjayBpcyBpbXBvcnRhbnQgdG8gbWUsIGJlIGl0IHBvc2l0aXZlIG9yIG5lZ2F0aXZlIVxuUGxlYXNlIHJlcG9ydCBidWdzIGFuZCBmZWF0dXJlIHJlcXVlc3RzIG9uIHRoZSBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "43": {"version": "13", "sha256": "1vy3wk8fjv8brbny638fyhkq84q8x00h9scqf7qi6dr1mvzf93g6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBmaW5kIHRoaXMgZXh0ZW5zaW9uIHVzZWZ1bCwgcGxlYXNlIGxlYXZlIGEgY29tbWVudCwgeW91ciBmZWVkYmFjayBpcyBpbXBvcnRhbnQgdG8gbWUsIGJlIGl0IHBvc2l0aXZlIG9yIG5lZ2F0aXZlIVxuUGxlYXNlIHJlcG9ydCBidWdzIGFuZCBmZWF0dXJlIHJlcXVlc3RzIG9uIHRoZSBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} +, {"uuid": "vertical-workspaces@G-dH.github.com", "name": "Vertical Workspaces", "pname": "vertical-workspaces", "description": "Vertical orientation of workspaces and options to customize Activities overview layout and content for GNOME 40+.\n\nIf you like vertically stacked workpsaces, this extension allows you to customize GNOME Activities to your needs. Layout, visibility and size of the dash and workspace thumbnails, dash orientation, static app grid, static workspace overview modes, static blurred background, workspace titles, window titles always visible, ...", "link": "https://extensions.gnome.org/extension/5177/vertical-workspaces/", "shell_version_map": {"40": {"version": "23", "sha256": "1ggfbhfv7c4xnk63kdpjs0qky0bkqcv5w60i2v2ha0j4qcy90i3d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmVydGljYWwtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "41": {"version": "23", "sha256": "1ggfbhfv7c4xnk63kdpjs0qky0bkqcv5w60i2v2ha0j4qcy90i3d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmVydGljYWwtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "42": {"version": "23", "sha256": "1ggfbhfv7c4xnk63kdpjs0qky0bkqcv5w60i2v2ha0j4qcy90i3d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmVydGljYWwtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "43": {"version": "23", "sha256": "1ggfbhfv7c4xnk63kdpjs0qky0bkqcv5w60i2v2ha0j4qcy90i3d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmVydGljYWwtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}}} , {"uuid": "rocketbar@chepkun.github.com", "name": "Rocketbar", "pname": "rocketbar", "description": "Taskbar and misc additions for the GNOME Shell.", "link": "https://extensions.gnome.org/extension/5180/rocketbar/", "shell_version_map": {"42": {"version": "6", "sha256": "1d7qqjw7absip9yg248kjw8vj07cxpcvy8pdpvwn6fvinmhp99y4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9saW51eC1pcy1hd2Vzb21lL2dub21lX2V4dGVuc2lvbl9yb2NrZXRiYXIiLAogICJ1dWlkIjogInJvY2tldGJhckBjaGVwa3VuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "1d7qqjw7absip9yg248kjw8vj07cxpcvy8pdpvwn6fvinmhp99y4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9saW51eC1pcy1hd2Vzb21lL2dub21lX2V4dGVuc2lvbl9yb2NrZXRiYXIiLAogICJ1dWlkIjogInJvY2tldGJhckBjaGVwa3VuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "contestcountdown@raghav", "name": "Contest Countdown", "pname": "contest-countdown", "description": "Countdown to next codeforces contest. This extension uses the API of codeforces.com to get the list of all upcoming contests. A countdown to the closest upcoming contest (that you are participating in) is shown in the panel, which can be clicked on to view the list of all upcoming contests.", "link": "https://extensions.gnome.org/extension/5183/contest-countdown/", "shell_version_map": {"40": {"version": "3", "sha256": "096vwrc9b5lxg1zk7v8w6ynwnp7x3n3h9f3r5p02rdqy73ybsqia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biB0byBuZXh0IGNvZGVmb3JjZXMgY29udGVzdC4gVGhpcyBleHRlbnNpb24gdXNlcyB0aGUgQVBJIG9mIGNvZGVmb3JjZXMuY29tIHRvIGdldCB0aGUgbGlzdCBvZiBhbGwgdXBjb21pbmcgY29udGVzdHMuIEEgY291bnRkb3duIHRvIHRoZSBjbG9zZXN0IHVwY29taW5nIGNvbnRlc3QgKHRoYXQgeW91IGFyZSBwYXJ0aWNpcGF0aW5nIGluKSBpcyBzaG93biBpbiB0aGUgcGFuZWwsIHdoaWNoIGNhbiBiZSBjbGlja2VkIG9uIHRvIHZpZXcgdGhlIGxpc3Qgb2YgYWxsIHVwY29taW5nIGNvbnRlc3RzLiIsCiAgIm5hbWUiOiAiQ29udGVzdCBDb3VudGRvd24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29udGVzdC1jb3VudGRvd24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhZy1oYXYvY29udGVzdGNvdW50ZG93biIsCiAgInV1aWQiOiAiY29udGVzdGNvdW50ZG93bkByYWdoYXYiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "096vwrc9b5lxg1zk7v8w6ynwnp7x3n3h9f3r5p02rdqy73ybsqia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biB0byBuZXh0IGNvZGVmb3JjZXMgY29udGVzdC4gVGhpcyBleHRlbnNpb24gdXNlcyB0aGUgQVBJIG9mIGNvZGVmb3JjZXMuY29tIHRvIGdldCB0aGUgbGlzdCBvZiBhbGwgdXBjb21pbmcgY29udGVzdHMuIEEgY291bnRkb3duIHRvIHRoZSBjbG9zZXN0IHVwY29taW5nIGNvbnRlc3QgKHRoYXQgeW91IGFyZSBwYXJ0aWNpcGF0aW5nIGluKSBpcyBzaG93biBpbiB0aGUgcGFuZWwsIHdoaWNoIGNhbiBiZSBjbGlja2VkIG9uIHRvIHZpZXcgdGhlIGxpc3Qgb2YgYWxsIHVwY29taW5nIGNvbnRlc3RzLiIsCiAgIm5hbWUiOiAiQ29udGVzdCBDb3VudGRvd24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29udGVzdC1jb3VudGRvd24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhZy1oYXYvY29udGVzdGNvdW50ZG93biIsCiAgInV1aWQiOiAiY29udGVzdGNvdW50ZG93bkByYWdoYXYiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "toggle-window@togglewindow.com", "name": "Toggle Window", "pname": "toggle-window", "description": "For security reasons, since Gnome 41, cann't invoke '**org.gnome.Shell.Eval**' to control the behavior of window, we expose a D-Bus interface to activate/minimized a window by WMclass name.", "link": "https://extensions.gnome.org/extension/5185/toggle-window/", "shell_version_map": {"42": {"version": "3", "sha256": "03d53mf46jdypbqvw5720cc4ii39q87jscnnnwmqcd2x6sn6c0xs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBzZWN1cml0eSByZWFzb25zLCBzaW5jZSBHbm9tZSA0MSwgY2Fubid0IGludm9rZSAnKipvcmcuZ25vbWUuU2hlbGwuRXZhbCoqJyB0byBjb250cm9sIHRoZSBiZWhhdmlvciBvZiB3aW5kb3csIHdlIGV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZS9taW5pbWl6ZWQgYSB3aW5kb3cgYnkgV01jbGFzcyBuYW1lLiIsCiAgIm5hbWUiOiAiVG9nZ2xlIFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2ppYWtvdXpmL3RvZ2dsZV93aW5kb3ciLAogICJ1dWlkIjogInRvZ2dsZS13aW5kb3dAdG9nZ2xld2luZG93LmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "super-key@tommimon.github.com", "name": "Super Key", "pname": "super-key", "description": "Fork of Pop Launcher Super-Key: Bind the Super-Key to a custom action", "link": "https://extensions.gnome.org/extension/5188/super-key/", "shell_version_map": {"42": {"version": "3", "sha256": "0jrhj7c7826xvdr4v2p5fi59fav5ralym3bsxaiv308fpcapzns0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIExhdW5jaGVyIFN1cGVyLUtleTogQmluZCB0aGUgU3VwZXItS2V5IHRvIGEgY3VzdG9tIGFjdGlvbiIsCiAgIm5hbWUiOiAiU3VwZXIgS2V5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9tbWltb24iLAogICJ1dWlkIjogInN1cGVyLWtleUB0b21taW1vbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "0jrhj7c7826xvdr4v2p5fi59fav5ralym3bsxaiv308fpcapzns0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIExhdW5jaGVyIFN1cGVyLUtleTogQmluZCB0aGUgU3VwZXItS2V5IHRvIGEgY3VzdG9tIGFjdGlvbiIsCiAgIm5hbWUiOiAiU3VwZXIgS2V5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9tbWltb24iLAogICJ1dWlkIjogInN1cGVyLWtleUB0b21taW1vbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "quick-google-meet@gmail.com", "name": "Quick Google Meet", "pname": "quick-google-meet", "description": "Quick open your personal google meet conference. This extension is not affiliated with Google", "link": "https://extensions.gnome.org/extension/5189/quick-google-meet/", "shell_version_map": {"42": {"version": "2", "sha256": "17c0yrnwfanfp8jmmzwk87si5g93bchp7rhf6k2srf788pcbiifr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIG9wZW4geW91ciBwZXJzb25hbCBnb29nbGUgbWVldCBjb25mZXJlbmNlLiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCB3aXRoIEdvb2dsZSIsCiAgIm5hbWUiOiAiUXVpY2sgR29vZ2xlIE1lZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWlzY2VsbGlhbi9xdWljay1nb29nbGUtbWVldCIsCiAgInV1aWQiOiAicXVpY2stZ29vZ2xlLW1lZXRAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} -, {"uuid": "overview-feature-pack@G-dH.github.com", "name": "OFP - Overview Feature Pack", "pname": "ofp-overview-feature-pack", "description": "Adds useful features to the Activities Overview and Dash, including powerful window search provider.\n\nIncludes following options:\nOverview:\n- Shift Reorders Workspace (Shift + scroll / Shift + Page Up/Down)\n- Ctrl + Space Activates Dash\n- Move Titles Into Windows\n- Always Show Window Titles\n- Hover Selects Window For Activation (hover window preview and press Super to activate it)\n- Fullscreen Hot Corner\n\nDash:\n- Shift + Click Moves App To Current Workspace\n- Hovering Icon Highlights App Windows\n- Scroll Switches App Windows Workspaces\n- Show Windows Before Activation\n\nApp Icon Menu Items:\n- Force Quit\n- Move App to Current Workspace\n- Close Windows on Current Workspace\n\nSearch:\n- Enable Window Search Provider\n- Space Activates Window Search\n- Enable Commands in Search Entry\n- Shift Moves Window to Current Workspace\n- Ctrl + Shift Moves All Windows (from search result) to Current Workspace\n- Secondary Click On Workspace Activates Window Search\n\nKeywords: reorder, move, order, find windows", "link": "https://extensions.gnome.org/extension/5192/ofp-overview-feature-pack/", "shell_version_map": {"41": {"version": "1", "sha256": "1sd4d15vfm6lghx366bfcsa7wjb8si5q3xg3ayzivzamc0xwczda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlZnVsIGZlYXR1cmVzIHRvIHRoZSBBY3Rpdml0aWVzIE92ZXJ2aWV3IGFuZCBEYXNoLCBpbmNsdWRpbmcgcG93ZXJmdWwgd2luZG93IHNlYXJjaCBwcm92aWRlci5cblxuSW5jbHVkZXMgZm9sbG93aW5nIG9wdGlvbnM6XG5PdmVydmlldzpcbi0gU2hpZnQgUmVvcmRlcnMgV29ya3NwYWNlIChTaGlmdCArIHNjcm9sbCAvIFNoaWZ0ICsgUGFnZSBVcC9Eb3duKVxuLSBDdHJsICsgU3BhY2UgQWN0aXZhdGVzIERhc2hcbi0gTW92ZSBUaXRsZXMgSW50byBXaW5kb3dzXG4tIEFsd2F5cyBTaG93IFdpbmRvdyBUaXRsZXNcbi0gSG92ZXIgU2VsZWN0cyBXaW5kb3cgRm9yIEFjdGl2YXRpb24gKGhvdmVyIHdpbmRvdyBwcmV2aWV3IGFuZCBwcmVzcyBTdXBlciB0byBhY3RpdmF0ZSBpdClcbi0gRnVsbHNjcmVlbiBIb3QgQ29ybmVyXG5cbkRhc2g6XG4tIFNoaWZ0ICsgQ2xpY2sgTW92ZXMgQXBwIFRvIEN1cnJlbnQgV29ya3NwYWNlXG4tIEhvdmVyaW5nIEljb24gSGlnaGxpZ2h0cyBBcHAgV2luZG93c1xuLSBTY3JvbGwgU3dpdGNoZXMgQXBwIFdpbmRvd3MgV29ya3NwYWNlc1xuLSBTaG93IFdpbmRvd3MgQmVmb3JlIEFjdGl2YXRpb25cblxuQXBwIEljb24gTWVudSBJdGVtczpcbi0gRm9yY2UgUXVpdFxuLSBNb3ZlIEFwcCB0byBDdXJyZW50IFdvcmtzcGFjZVxuLSBDbG9zZSBXaW5kb3dzIG9uIEN1cnJlbnQgV29ya3NwYWNlXG5cblNlYXJjaDpcbi0gRW5hYmxlIFdpbmRvdyBTZWFyY2ggUHJvdmlkZXJcbi0gU3BhY2UgQWN0aXZhdGVzIFdpbmRvdyBTZWFyY2hcbi0gRW5hYmxlIENvbW1hbmRzIGluIFNlYXJjaCBFbnRyeVxuLSBTaGlmdCBNb3ZlcyBXaW5kb3cgdG8gQ3VycmVudCBXb3Jrc3BhY2Vcbi0gQ3RybCArIFNoaWZ0IE1vdmVzIEFsbCBXaW5kb3dzIChmcm9tIHNlYXJjaCByZXN1bHQpIHRvIEN1cnJlbnQgV29ya3NwYWNlXG4tIFNlY29uZGFyeSBDbGljayBPbiBXb3Jrc3BhY2UgQWN0aXZhdGVzIFdpbmRvdyBTZWFyY2hcblxuS2V5d29yZHM6IHJlb3JkZXIsIG1vdmUsIG9yZGVyLCBmaW5kIHdpbmRvd3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdmVydmlldy1mZWF0dXJlLXBhY2siLAogICJuYW1lIjogIk9GUCAtIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9vdmVydmlldy1mZWF0dXJlLXBhY2siLAogICJ1dWlkIjogIm92ZXJ2aWV3LWZlYXR1cmUtcGFja0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "42": {"version": "1", "sha256": "1sd4d15vfm6lghx366bfcsa7wjb8si5q3xg3ayzivzamc0xwczda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlZnVsIGZlYXR1cmVzIHRvIHRoZSBBY3Rpdml0aWVzIE92ZXJ2aWV3IGFuZCBEYXNoLCBpbmNsdWRpbmcgcG93ZXJmdWwgd2luZG93IHNlYXJjaCBwcm92aWRlci5cblxuSW5jbHVkZXMgZm9sbG93aW5nIG9wdGlvbnM6XG5PdmVydmlldzpcbi0gU2hpZnQgUmVvcmRlcnMgV29ya3NwYWNlIChTaGlmdCArIHNjcm9sbCAvIFNoaWZ0ICsgUGFnZSBVcC9Eb3duKVxuLSBDdHJsICsgU3BhY2UgQWN0aXZhdGVzIERhc2hcbi0gTW92ZSBUaXRsZXMgSW50byBXaW5kb3dzXG4tIEFsd2F5cyBTaG93IFdpbmRvdyBUaXRsZXNcbi0gSG92ZXIgU2VsZWN0cyBXaW5kb3cgRm9yIEFjdGl2YXRpb24gKGhvdmVyIHdpbmRvdyBwcmV2aWV3IGFuZCBwcmVzcyBTdXBlciB0byBhY3RpdmF0ZSBpdClcbi0gRnVsbHNjcmVlbiBIb3QgQ29ybmVyXG5cbkRhc2g6XG4tIFNoaWZ0ICsgQ2xpY2sgTW92ZXMgQXBwIFRvIEN1cnJlbnQgV29ya3NwYWNlXG4tIEhvdmVyaW5nIEljb24gSGlnaGxpZ2h0cyBBcHAgV2luZG93c1xuLSBTY3JvbGwgU3dpdGNoZXMgQXBwIFdpbmRvd3MgV29ya3NwYWNlc1xuLSBTaG93IFdpbmRvd3MgQmVmb3JlIEFjdGl2YXRpb25cblxuQXBwIEljb24gTWVudSBJdGVtczpcbi0gRm9yY2UgUXVpdFxuLSBNb3ZlIEFwcCB0byBDdXJyZW50IFdvcmtzcGFjZVxuLSBDbG9zZSBXaW5kb3dzIG9uIEN1cnJlbnQgV29ya3NwYWNlXG5cblNlYXJjaDpcbi0gRW5hYmxlIFdpbmRvdyBTZWFyY2ggUHJvdmlkZXJcbi0gU3BhY2UgQWN0aXZhdGVzIFdpbmRvdyBTZWFyY2hcbi0gRW5hYmxlIENvbW1hbmRzIGluIFNlYXJjaCBFbnRyeVxuLSBTaGlmdCBNb3ZlcyBXaW5kb3cgdG8gQ3VycmVudCBXb3Jrc3BhY2Vcbi0gQ3RybCArIFNoaWZ0IE1vdmVzIEFsbCBXaW5kb3dzIChmcm9tIHNlYXJjaCByZXN1bHQpIHRvIEN1cnJlbnQgV29ya3NwYWNlXG4tIFNlY29uZGFyeSBDbGljayBPbiBXb3Jrc3BhY2UgQWN0aXZhdGVzIFdpbmRvdyBTZWFyY2hcblxuS2V5d29yZHM6IHJlb3JkZXIsIG1vdmUsIG9yZGVyLCBmaW5kIHdpbmRvd3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdmVydmlldy1mZWF0dXJlLXBhY2siLAogICJuYW1lIjogIk9GUCAtIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9vdmVydmlldy1mZWF0dXJlLXBhY2siLAogICJ1dWlkIjogIm92ZXJ2aWV3LWZlYXR1cmUtcGFja0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"uuid": "overview-feature-pack@G-dH.github.com", "name": "OFP - Overview Feature Pack", "pname": "ofp-overview-feature-pack", "description": "Adds useful features to the Activities overview and Dash, including powerful window search provider.\n\nKeywords: reorder, workspace, name, move, find windows, app order, app grid, columns, rows, icon, size, thumbnail, force, quit, navigate.", "link": "https://extensions.gnome.org/extension/5192/ofp-overview-feature-pack/", "shell_version_map": {"41": {"version": "2", "sha256": "1m2zbab8i9njm5nsl6n3kb9pvwmqk95srrm2rsdd85nlb9q3flgl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlZnVsIGZlYXR1cmVzIHRvIHRoZSBBY3Rpdml0aWVzIG92ZXJ2aWV3IGFuZCBEYXNoLCBpbmNsdWRpbmcgcG93ZXJmdWwgd2luZG93IHNlYXJjaCBwcm92aWRlci5cblxuS2V5d29yZHM6IHJlb3JkZXIsIHdvcmtzcGFjZSwgbmFtZSwgbW92ZSwgZmluZCB3aW5kb3dzLCBhcHAgb3JkZXIsIGFwcCBncmlkLCBjb2x1bW5zLCByb3dzLCBpY29uLCBzaXplLCB0aHVtYm5haWwsIGZvcmNlLCBxdWl0LCBuYXZpZ2F0ZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdmVydmlldy1mZWF0dXJlLXBhY2siLAogICJuYW1lIjogIk9GUCAtIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvb3ZlcnZpZXctZmVhdHVyZS1wYWNrIiwKICAidXVpZCI6ICJvdmVydmlldy1mZWF0dXJlLXBhY2tARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "1m2zbab8i9njm5nsl6n3kb9pvwmqk95srrm2rsdd85nlb9q3flgl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlZnVsIGZlYXR1cmVzIHRvIHRoZSBBY3Rpdml0aWVzIG92ZXJ2aWV3IGFuZCBEYXNoLCBpbmNsdWRpbmcgcG93ZXJmdWwgd2luZG93IHNlYXJjaCBwcm92aWRlci5cblxuS2V5d29yZHM6IHJlb3JkZXIsIHdvcmtzcGFjZSwgbmFtZSwgbW92ZSwgZmluZCB3aW5kb3dzLCBhcHAgb3JkZXIsIGFwcCBncmlkLCBjb2x1bW5zLCByb3dzLCBpY29uLCBzaXplLCB0aHVtYm5haWwsIGZvcmNlLCBxdWl0LCBuYXZpZ2F0ZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdmVydmlldy1mZWF0dXJlLXBhY2siLAogICJuYW1lIjogIk9GUCAtIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvb3ZlcnZpZXctZmVhdHVyZS1wYWNrIiwKICAidXVpZCI6ICJvdmVydmlldy1mZWF0dXJlLXBhY2tARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "43": {"version": "2", "sha256": "1m2zbab8i9njm5nsl6n3kb9pvwmqk95srrm2rsdd85nlb9q3flgl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlZnVsIGZlYXR1cmVzIHRvIHRoZSBBY3Rpdml0aWVzIG92ZXJ2aWV3IGFuZCBEYXNoLCBpbmNsdWRpbmcgcG93ZXJmdWwgd2luZG93IHNlYXJjaCBwcm92aWRlci5cblxuS2V5d29yZHM6IHJlb3JkZXIsIHdvcmtzcGFjZSwgbmFtZSwgbW92ZSwgZmluZCB3aW5kb3dzLCBhcHAgb3JkZXIsIGFwcCBncmlkLCBjb2x1bW5zLCByb3dzLCBpY29uLCBzaXplLCB0aHVtYm5haWwsIGZvcmNlLCBxdWl0LCBuYXZpZ2F0ZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdmVydmlldy1mZWF0dXJlLXBhY2siLAogICJuYW1lIjogIk9GUCAtIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvb3ZlcnZpZXctZmVhdHVyZS1wYWNrIiwKICAidXVpZCI6ICJvdmVydmlldy1mZWF0dXJlLXBhY2tARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "weekend-o-meter@coffeverton.gmail.com", "name": "Weekend-O-Meter Revived", "pname": "weekend-o-meter-revived", "description": "Beer timer until next week-end (based on https://extensions.gnome.org/extension/667/weekend-o-meter/)", "link": "https://extensions.gnome.org/extension/5198/weekend-o-meter-revived/", "shell_version_map": {"38": {"version": "1", "sha256": "165chwgiy0wfh12vywgpjz5grlhfkqj7wwc3y672w6qwfdg1hz5r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJlZXIgdGltZXIgdW50aWwgbmV4dCB3ZWVrLWVuZCAoYmFzZWQgb24gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjY3L3dlZWtlbmQtby1tZXRlci8pIiwKICAibmFtZSI6ICJXZWVrZW5kLU8tTWV0ZXIgUmV2aXZlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvZmZldmVydG9uL3dlZWtlbmQtby1tZXRlciIsCiAgInV1aWQiOiAid2Vla2VuZC1vLW1ldGVyQGNvZmZldmVydG9uLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "time-in-date-menu@knedme", "name": "Time in date menu", "pname": "time-in-date-menu", "description": "Adds current time to date menu.", "link": "https://extensions.gnome.org/extension/5204/time-in-date-menu/", "shell_version_map": {"38": {"version": "2", "sha256": "1shyf64lrrzzb2q72l859yaa1vmlk0galz0p7wfgmf6zcs77jawl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS25lZG1lL1RpbWUtaW4tZGF0ZS1tZW51IiwKICAidXVpZCI6ICJ0aW1lLWluLWRhdGUtbWVudUBrbmVkbWUiLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "1shyf64lrrzzb2q72l859yaa1vmlk0galz0p7wfgmf6zcs77jawl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS25lZG1lL1RpbWUtaW4tZGF0ZS1tZW51IiwKICAidXVpZCI6ICJ0aW1lLWluLWRhdGUtbWVudUBrbmVkbWUiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1shyf64lrrzzb2q72l859yaa1vmlk0galz0p7wfgmf6zcs77jawl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS25lZG1lL1RpbWUtaW4tZGF0ZS1tZW51IiwKICAidXVpZCI6ICJ0aW1lLWluLWRhdGUtbWVudUBrbmVkbWUiLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "1shyf64lrrzzb2q72l859yaa1vmlk0galz0p7wfgmf6zcs77jawl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS25lZG1lL1RpbWUtaW4tZGF0ZS1tZW51IiwKICAidXVpZCI6ICJ0aW1lLWluLWRhdGUtbWVudUBrbmVkbWUiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "suspend-to-topbar@madebysteven.nl", "name": "Suspend button in topbar", "pname": "suspend-button-in-top-bar", "description": "Suspend your computer via a topbar button, added settings to the fork for asking to suspend or cancel. Original project: https://github.com/trofosila/suspend-to-topbar", "link": "https://extensions.gnome.org/extension/5213/suspend-button-in-top-bar/", "shell_version_map": {"38": {"version": "4", "sha256": "1gwf4axjwvwmlribsv6g0w1xdifdxxbr5mjjp6yl3xkz6rkbip9w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN1c3BlbmQgeW91ciBjb21wdXRlciB2aWEgYSB0b3BiYXIgYnV0dG9uLCBhZGRlZCBzZXR0aW5ncyB0byB0aGUgZm9yayBmb3IgYXNraW5nIHRvIHN1c3BlbmQgb3IgY2FuY2VsLiBPcmlnaW5hbCBwcm9qZWN0OiBodHRwczovL2dpdGh1Yi5jb20vdHJvZm9zaWxhL3N1c3BlbmQtdG8tdG9wYmFyIiwKICAibmFtZSI6ICJTdXNwZW5kIGJ1dHRvbiBpbiB0b3BiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VzcGVuZC10by10b3BiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdGV2ZW5kZWpvbmdubC9zdXNwZW5kLXRvLXRvcGJhciIsCiAgInV1aWQiOiAic3VzcGVuZC10by10b3BiYXJAbWFkZWJ5c3RldmVuLm5sIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "mutter-primary-gpu@zaidka.github.io", "name": "Mutter Primary GPU", "pname": "mutter-primary-gpu", "description": "Override primary GPU selection for Wayland", "link": "https://extensions.gnome.org/extension/5218/mutter-primary-gpu/", "shell_version_map": {"42": {"version": "3", "sha256": "0i7q860mzk65cbqsm9q29sjg8k6ai8kv715rkw1wb2lx2xig434a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlIHByaW1hcnkgR1BVIHNlbGVjdGlvbiBmb3IgV2F5bGFuZCIsCiAgIm5hbWUiOiAiTXV0dGVyIFByaW1hcnkgR1BVIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phaWRrYS9tdXR0ZXItcHJpbWFyeS1ncHUiLAogICJ1dWlkIjogIm11dHRlci1wcmltYXJ5LWdwdUB6YWlka2EuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} -, {"uuid": "tophat@fflewddur.github.io", "name": "TopHat", "pname": "tophat", "description": "An elegant system resource monitor. View real-time details about your computer's CPU, memory, and network usage.\n", "link": "https://extensions.gnome.org/extension/5219/tophat/", "shell_version_map": {"38": {"version": "4", "sha256": "07lcbr53f0xfkrl0svihdrsh96j0w44z8wmz3w0d8qgh0xs6g54r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IuIFZpZXcgcmVhbC10aW1lIGRldGFpbHMgYWJvdXQgeW91ciBjb21wdXRlcidzIENQVSwgbWVtb3J5LCBhbmQgbmV0d29yayB1c2FnZS5cbiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZmbGV3ZGR1ci90b3BoYXQiLAogICJ1dWlkIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "07lcbr53f0xfkrl0svihdrsh96j0w44z8wmz3w0d8qgh0xs6g54r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IuIFZpZXcgcmVhbC10aW1lIGRldGFpbHMgYWJvdXQgeW91ciBjb21wdXRlcidzIENQVSwgbWVtb3J5LCBhbmQgbmV0d29yayB1c2FnZS5cbiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZmbGV3ZGR1ci90b3BoYXQiLAogICJ1dWlkIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "07lcbr53f0xfkrl0svihdrsh96j0w44z8wmz3w0d8qgh0xs6g54r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IuIFZpZXcgcmVhbC10aW1lIGRldGFpbHMgYWJvdXQgeW91ciBjb21wdXRlcidzIENQVSwgbWVtb3J5LCBhbmQgbmV0d29yayB1c2FnZS5cbiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZmbGV3ZGR1ci90b3BoYXQiLAogICJ1dWlkIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "07lcbr53f0xfkrl0svihdrsh96j0w44z8wmz3w0d8qgh0xs6g54r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IuIFZpZXcgcmVhbC10aW1lIGRldGFpbHMgYWJvdXQgeW91ciBjb21wdXRlcidzIENQVSwgbWVtb3J5LCBhbmQgbmV0d29yayB1c2FnZS5cbiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZmbGV3ZGR1ci90b3BoYXQiLAogICJ1dWlkIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "07lcbr53f0xfkrl0svihdrsh96j0w44z8wmz3w0d8qgh0xs6g54r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IuIFZpZXcgcmVhbC10aW1lIGRldGFpbHMgYWJvdXQgeW91ciBjb21wdXRlcidzIENQVSwgbWVtb3J5LCBhbmQgbmV0d29yayB1c2FnZS5cbiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZmbGV3ZGR1ci90b3BoYXQiLAogICJ1dWlkIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"uuid": "tophat@fflewddur.github.io", "name": "TopHat", "pname": "tophat", "description": "A resource monitor showing CPU, memory, and network activity in the GNOME top bar.", "link": "https://extensions.gnome.org/extension/5219/tophat/", "shell_version_map": {"38": {"version": "6", "sha256": "1bl4mzwnqphlclv1pq44rgn42mnh2v8979v3mnlybl9km7ksg2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcmVzb3VyY2UgbW9uaXRvciBzaG93aW5nIENQVSwgbWVtb3J5LCBhbmQgbmV0d29yayBhY3Rpdml0eSBpbiB0aGUgR05PTUUgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiVG9wSGF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcGhhdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "1bl4mzwnqphlclv1pq44rgn42mnh2v8979v3mnlybl9km7ksg2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcmVzb3VyY2UgbW9uaXRvciBzaG93aW5nIENQVSwgbWVtb3J5LCBhbmQgbmV0d29yayBhY3Rpdml0eSBpbiB0aGUgR05PTUUgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiVG9wSGF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcGhhdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1bl4mzwnqphlclv1pq44rgn42mnh2v8979v3mnlybl9km7ksg2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcmVzb3VyY2UgbW9uaXRvciBzaG93aW5nIENQVSwgbWVtb3J5LCBhbmQgbmV0d29yayBhY3Rpdml0eSBpbiB0aGUgR05PTUUgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiVG9wSGF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcGhhdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "1bl4mzwnqphlclv1pq44rgn42mnh2v8979v3mnlybl9km7ksg2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcmVzb3VyY2UgbW9uaXRvciBzaG93aW5nIENQVSwgbWVtb3J5LCBhbmQgbmV0d29yayBhY3Rpdml0eSBpbiB0aGUgR05PTUUgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiVG9wSGF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcGhhdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "1bl4mzwnqphlclv1pq44rgn42mnh2v8979v3mnlybl9km7ksg2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcmVzb3VyY2UgbW9uaXRvciBzaG93aW5nIENQVSwgbWVtb3J5LCBhbmQgbmV0d29yayBhY3Rpdml0eSBpbiB0aGUgR05PTUUgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiVG9wSGF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcGhhdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "dash-animator@icedman.github.com", "name": "Dash to Dock Animator", "pname": "dash-to-dock-animator", "description": "Animate the icons of dash to dock", "link": "https://extensions.gnome.org/extension/5222/dash-to-dock-animator/", "shell_version_map": {"40": {"version": "5", "sha256": "1630470pa0zr9mvl2dmnc3mnwx17pkwfll0ibas148yvxf0hj0fp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGUgdGhlIGljb25zIG9mIGRhc2ggdG8gZG9jayIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtYW5pbWF0b3IiLAogICJuYW1lIjogIkRhc2ggdG8gRG9jayBBbmltYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiaWNlZG1hbiIKICBdLAogICJzY2hlbWEtaWQiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGFzaC1hbmltYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gtYW5pbWF0b3IiLAogICJ1dWlkIjogImRhc2gtYW5pbWF0b3JAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "1630470pa0zr9mvl2dmnc3mnwx17pkwfll0ibas148yvxf0hj0fp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGUgdGhlIGljb25zIG9mIGRhc2ggdG8gZG9jayIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtYW5pbWF0b3IiLAogICJuYW1lIjogIkRhc2ggdG8gRG9jayBBbmltYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiaWNlZG1hbiIKICBdLAogICJzY2hlbWEtaWQiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGFzaC1hbmltYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gtYW5pbWF0b3IiLAogICJ1dWlkIjogImRhc2gtYW5pbWF0b3JAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "42": {"version": "5", "sha256": "1630470pa0zr9mvl2dmnc3mnwx17pkwfll0ibas148yvxf0hj0fp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGUgdGhlIGljb25zIG9mIGRhc2ggdG8gZG9jayIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtYW5pbWF0b3IiLAogICJuYW1lIjogIkRhc2ggdG8gRG9jayBBbmltYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiaWNlZG1hbiIKICBdLAogICJzY2hlbWEtaWQiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGFzaC1hbmltYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gtYW5pbWF0b3IiLAogICJ1dWlkIjogImRhc2gtYW5pbWF0b3JAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "43": {"version": "5", "sha256": "1630470pa0zr9mvl2dmnc3mnwx17pkwfll0ibas148yvxf0hj0fp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGUgdGhlIGljb25zIG9mIGRhc2ggdG8gZG9jayIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtYW5pbWF0b3IiLAogICJuYW1lIjogIkRhc2ggdG8gRG9jayBBbmltYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiaWNlZG1hbiIKICBdLAogICJzY2hlbWEtaWQiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGFzaC1hbmltYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gtYW5pbWF0b3IiLAogICJ1dWlkIjogImRhc2gtYW5pbWF0b3JAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "swap-finger-gestures-3-4@icedman.github.com", "name": "Swap Finger Gestures (3 to 4)", "pname": "swap-finger-gestures-3-to-4", "description": "Use 4 fingers swipe to change workspace instead of 3.", "link": "https://extensions.gnome.org/extension/5233/swap-finger-gestures-3-to-4/", "shell_version_map": {"42": {"version": "3", "sha256": "0z6hacg6szlsgfy23i8i8m11qwssiq6n80apbvd7v6c7cmjglvqd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSA0IGZpbmdlcnMgc3dpcGUgdG8gY2hhbmdlIHdvcmtzcGFjZSBpbnN0ZWFkIG9mIDMuIiwKICAibmFtZSI6ICJTd2FwIEZpbmdlciBHZXN0dXJlcyAoMyB0byA0KSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9zd2FwLWZpbmdlci1nZXN0dXJlcy0zLTQiLAogICJ1dWlkIjogInN3YXAtZmluZ2VyLWdlc3R1cmVzLTMtNEBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "0z6hacg6szlsgfy23i8i8m11qwssiq6n80apbvd7v6c7cmjglvqd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSA0IGZpbmdlcnMgc3dpcGUgdG8gY2hhbmdlIHdvcmtzcGFjZSBpbnN0ZWFkIG9mIDMuIiwKICAibmFtZSI6ICJTd2FwIEZpbmdlciBHZXN0dXJlcyAoMyB0byA0KSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9zd2FwLWZpbmdlci1nZXN0dXJlcy0zLTQiLAogICJ1dWlkIjogInN3YXAtZmluZ2VyLWdlc3R1cmVzLTMtNEBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "material-you-theme@asubbiah.com", "name": "Material You Color Theming", "pname": "material-you-color-theming", "description": "Applies generated libadwaita theme from wallpaper using Material You", "link": "https://extensions.gnome.org/extension/5236/material-you-color-theming/", "shell_version_map": {"42": {"version": "14", "sha256": "0nabd98nk22iz4azyqlb53igk3kvygh6fzh1k28ll7y2l1wgzm75", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpZXMgZ2VuZXJhdGVkIGxpYmFkd2FpdGEgdGhlbWUgZnJvbSB3YWxscGFwZXIgdXNpbmcgTWF0ZXJpYWwgWW91IiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWF0ZXJpYWwteW91LXRoZW1lIiwKICAibmFtZSI6ICJNYXRlcmlhbCBZb3UgQ29sb3IgVGhlbWluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXZhbmlzaHN1YmJpYWgvbWF0ZXJpYWwteW91LXRoZW1lIiwKICAidXVpZCI6ICJtYXRlcmlhbC15b3UtdGhlbWVAYXN1YmJpYWguY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "43": {"version": "14", "sha256": "0nabd98nk22iz4azyqlb53igk3kvygh6fzh1k28ll7y2l1wgzm75", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpZXMgZ2VuZXJhdGVkIGxpYmFkd2FpdGEgdGhlbWUgZnJvbSB3YWxscGFwZXIgdXNpbmcgTWF0ZXJpYWwgWW91IiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWF0ZXJpYWwteW91LXRoZW1lIiwKICAibmFtZSI6ICJNYXRlcmlhbCBZb3UgQ29sb3IgVGhlbWluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXZhbmlzaHN1YmJpYWgvbWF0ZXJpYWwteW91LXRoZW1lIiwKICAidXVpZCI6ICJtYXRlcmlhbC15b3UtdGhlbWVAYXN1YmJpYWguY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} -, {"uuid": "rounded-window-corners@yilozt", "name": "Rounded Window Corners", "pname": "rounded-window-corners", "description": "Add rounded corners for all windows", "link": "https://extensions.gnome.org/extension/5237/rounded-window-corners/", "shell_version_map": {"40": {"version": "9", "sha256": "1cvwj03ikmq6yl89a60sss671fsd2yrijy62v29y1xbxw03l2ma9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbG96dC9yb3VuZGVkLXdpbmRvdy1jb3JuZXJzIiwKICAidXVpZCI6ICJyb3VuZGVkLXdpbmRvdy1jb3JuZXJzQHlpbG96dCIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "1cvwj03ikmq6yl89a60sss671fsd2yrijy62v29y1xbxw03l2ma9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbG96dC9yb3VuZGVkLXdpbmRvdy1jb3JuZXJzIiwKICAidXVpZCI6ICJyb3VuZGVkLXdpbmRvdy1jb3JuZXJzQHlpbG96dCIsCiAgInZlcnNpb24iOiA5Cn0="}, "42": {"version": "9", "sha256": "1cvwj03ikmq6yl89a60sss671fsd2yrijy62v29y1xbxw03l2ma9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbG96dC9yb3VuZGVkLXdpbmRvdy1jb3JuZXJzIiwKICAidXVpZCI6ICJyb3VuZGVkLXdpbmRvdy1jb3JuZXJzQHlpbG96dCIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "1cvwj03ikmq6yl89a60sss671fsd2yrijy62v29y1xbxw03l2ma9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbG96dC9yb3VuZGVkLXdpbmRvdy1jb3JuZXJzIiwKICAidXVpZCI6ICJyb3VuZGVkLXdpbmRvdy1jb3JuZXJzQHlpbG96dCIsCiAgInZlcnNpb24iOiA5Cn0="}}} +, {"uuid": "rounded-window-corners@yilozt", "name": "Rounded Window Corners", "pname": "rounded-window-corners", "description": "Add rounded corners for all windows", "link": "https://extensions.gnome.org/extension/5237/rounded-window-corners/", "shell_version_map": {"40": {"version": "10", "sha256": "1dbqa5a16z88fpks221fyv5a1zhrlrcdgkdmlgl8c42jad8w1bzr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbG96dC9yb3VuZGVkLXdpbmRvdy1jb3JuZXJzIiwKICAidXVpZCI6ICJyb3VuZGVkLXdpbmRvdy1jb3JuZXJzQHlpbG96dCIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "1dbqa5a16z88fpks221fyv5a1zhrlrcdgkdmlgl8c42jad8w1bzr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbG96dC9yb3VuZGVkLXdpbmRvdy1jb3JuZXJzIiwKICAidXVpZCI6ICJyb3VuZGVkLXdpbmRvdy1jb3JuZXJzQHlpbG96dCIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "1dbqa5a16z88fpks221fyv5a1zhrlrcdgkdmlgl8c42jad8w1bzr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbG96dC9yb3VuZGVkLXdpbmRvdy1jb3JuZXJzIiwKICAidXVpZCI6ICJyb3VuZGVkLXdpbmRvdy1jb3JuZXJzQHlpbG96dCIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "10", "sha256": "1dbqa5a16z88fpks221fyv5a1zhrlrcdgkdmlgl8c42jad8w1bzr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbG96dC9yb3VuZGVkLXdpbmRvdy1jb3JuZXJzIiwKICAidXVpZCI6ICJyb3VuZGVkLXdpbmRvdy1jb3JuZXJzQHlpbG96dCIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "ideapad-controls@azzamalsharafi.gmail.com", "name": "IdeaPad Controls", "pname": "ideapad-controls", "description": "Control Lenovo IdeaPad laptops options: Conservation Mode, Camera Lock, Fn Lock, Touchpad Lock, USB charging", "link": "https://extensions.gnome.org/extension/5260/ideapad-controls/", "shell_version_map": {"42": {"version": "7", "sha256": "0l4chkpyk06ax6jb99vdz9365jn1mvinbcj3lq83df6yq9cwgc19", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgTGVub3ZvIElkZWFQYWQgbGFwdG9wcyBvcHRpb25zOiBDb25zZXJ2YXRpb24gTW9kZSwgQ2FtZXJhIExvY2ssIEZuIExvY2ssIFRvdWNocGFkIExvY2ssIFVTQiBjaGFyZ2luZyIsCiAgIm5hbWUiOiAiSWRlYVBhZCBDb250cm9scyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pZGVhcGFkLUNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BenphbUFsc2hhcmFmaS9pZGVhcGFkLWNvbnRyb2xzLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaWRlYXBhZC1jb250cm9sc0BhenphbWFsc2hhcmFmaS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "0l4chkpyk06ax6jb99vdz9365jn1mvinbcj3lq83df6yq9cwgc19", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgTGVub3ZvIElkZWFQYWQgbGFwdG9wcyBvcHRpb25zOiBDb25zZXJ2YXRpb24gTW9kZSwgQ2FtZXJhIExvY2ssIEZuIExvY2ssIFRvdWNocGFkIExvY2ssIFVTQiBjaGFyZ2luZyIsCiAgIm5hbWUiOiAiSWRlYVBhZCBDb250cm9scyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pZGVhcGFkLUNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BenphbUFsc2hhcmFmaS9pZGVhcGFkLWNvbnRyb2xzLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaWRlYXBhZC1jb250cm9sc0BhenphbWFsc2hhcmFmaS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} -, {"uuid": "gtk4-ding@smedius.gitlab.com", "name": "Gtk4, GSconnect, Desktop Icons NG (DING)", "pname": "gtk4-desktop-icons-ng-ding", "description": "Adds Gtk4 icons to the Gnome desktop. Gtk4 Fork of the original Desktop Icons extension, with several enhancements.\n\nWorks only on Wayland, see readme for X11\n\nPlease report all issues to the homepage below, this page is not monitored.", "link": "https://extensions.gnome.org/extension/5263/gtk4-desktop-icons-ng-ding/", "shell_version_map": {"40": {"version": "17", "sha256": "1h1wnp23p75b8vcnr542wgaj7ypkzmdx9b22zas3291cp61jqyyh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy5cblxuV29ya3Mgb25seSBvbiBXYXlsYW5kLCBzZWUgcmVhZG1lIGZvciBYMTFcblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIHRvIHRoZSBob21lcGFnZSBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCwgR1Njb25uZWN0LCBEZXNrdG9wIEljb25zIE5HIChESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "41": {"version": "17", "sha256": "1h1wnp23p75b8vcnr542wgaj7ypkzmdx9b22zas3291cp61jqyyh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy5cblxuV29ya3Mgb25seSBvbiBXYXlsYW5kLCBzZWUgcmVhZG1lIGZvciBYMTFcblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIHRvIHRoZSBob21lcGFnZSBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCwgR1Njb25uZWN0LCBEZXNrdG9wIEljb25zIE5HIChESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "42": {"version": "18", "sha256": "0q4dzgwhf16sv4nf57nphn6i5aibw700ydw7fwshjsx7lnpy1gsx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy5cblxuV29ya3Mgb25seSBvbiBXYXlsYW5kLCBzZWUgcmVhZG1lIGZvciBYMTFcblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIHRvIHRoZSBob21lcGFnZSBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCwgR1Njb25uZWN0LCBEZXNrdG9wIEljb25zIE5HIChESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "43": {"version": "18", "sha256": "0q4dzgwhf16sv4nf57nphn6i5aibw700ydw7fwshjsx7lnpy1gsx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy5cblxuV29ya3Mgb25seSBvbiBXYXlsYW5kLCBzZWUgcmVhZG1lIGZvciBYMTFcblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIHRvIHRoZSBob21lcGFnZSBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCwgR1Njb25uZWN0LCBEZXNrdG9wIEljb25zIE5HIChESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}}} -, {"uuid": "fig-gnome-integration@fig.io", "name": "Fig GNOME Integration", "pname": "fig-gnome-integration", "description": "Tightly integrates Fig with GNOME shell", "link": "https://extensions.gnome.org/extension/5266/fig-gnome-integration/", "shell_version_map": {"41": {"version": "5", "sha256": "17h04ypqmmsbkd8ski7rznv6adsd1y3jlabxjvmshjqy7w9xqbsv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpZ2h0bHkgaW50ZWdyYXRlcyBGaWcgd2l0aCBHTk9NRSBzaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogImZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgIm5hbWUiOiAiRmlnIEdOT01FIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2l0aGZpZy9nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImZpZy1nbm9tZS1pbnRlZ3JhdGlvbkBmaWcuaW8iLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "5", "sha256": "17h04ypqmmsbkd8ski7rznv6adsd1y3jlabxjvmshjqy7w9xqbsv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpZ2h0bHkgaW50ZWdyYXRlcyBGaWcgd2l0aCBHTk9NRSBzaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogImZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgIm5hbWUiOiAiRmlnIEdOT01FIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2l0aGZpZy9nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImZpZy1nbm9tZS1pbnRlZ3JhdGlvbkBmaWcuaW8iLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"uuid": "gtk4-ding@smedius.gitlab.com", "name": "Gtk4 Desktop Icons NG with GSconnect Integration, Drag and Drop onto Dock (Gtk4-DING)", "pname": "gtk4-desktop-icons-ng-ding", "description": "Gtk4 Port of Desktop Icons NG with updated and modified code base, uses gio menus, all functions are async where possible, multiple fixes and new features-\n\n* Make Links on Desktop.\n* Copied/dropped/pasted files retain dropped position.\n* Right Click Menus will not go under the dock.\n* Better multi monitor support, preference to place icons on non primary monitor.\n* GSconnect extension integration, can send files from desktop directly to mobile device.\n* Drag and drop Favorite apps from Dash to Dock, Dash to Panel directly to Desktop or remove from favorites.\n* Improved gesture switching of workspaces, icons appear to be on all workspaces in moving windows.\n* Support for dragging icons onto the dock - Drag icons from desktop to and drop over application icon to open them with the app. Works with Dash to Dock and Dash to Panel.\n* Support for dragging icons from desktop directly to Trash on Dash to Dock or to mounted volumes to copy them directly.\n* Display GIMP thumbnails, even for snap and flatpack installs.\n\nPlease see Readme for full details of new features. Works best on Wayland. There is a bug in GJS on X11, please see Readme. This extension now works with some hacks, even on X11. However your mileage may vary and use with caution on X11 and report any issues.\n\nPlease report all issues on the gitlab link below, this page is not monitored.", "link": "https://extensions.gnome.org/extension/5263/gtk4-desktop-icons-ng-ding/", "shell_version_map": {"40": {"version": "17", "sha256": "00jlr91nbiff1zkpryayq07kchk82dgcydrn3xddsxkd6a7qq6zf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsIGZ1bmN0aW9ucyBhcmUgYXN5bmMgd2hlcmUgcG9zc2libGUsIG11bHRpcGxlIGZpeGVzIGFuZCBuZXcgZmVhdHVyZXMtXG5cbiogTWFrZSBMaW5rcyBvbiBEZXNrdG9wLlxuKiBDb3BpZWQvZHJvcHBlZC9wYXN0ZWQgZmlsZXMgcmV0YWluIGRyb3BwZWQgcG9zaXRpb24uXG4qIFJpZ2h0IENsaWNrIE1lbnVzIHdpbGwgbm90IGdvIHVuZGVyIHRoZSBkb2NrLlxuKiBCZXR0ZXIgbXVsdGkgbW9uaXRvciBzdXBwb3J0LCBwcmVmZXJlbmNlIHRvIHBsYWNlIGljb25zIG9uIG5vbiBwcmltYXJ5IG1vbml0b3IuXG4qIEdTY29ubmVjdCBleHRlbnNpb24gaW50ZWdyYXRpb24sIGNhbiBzZW5kIGZpbGVzIGZyb20gZGVza3RvcCBkaXJlY3RseSB0byBtb2JpbGUgZGV2aWNlLlxuKiBEcmFnIGFuZCBkcm9wIEZhdm9yaXRlIGFwcHMgZnJvbSBEYXNoIHRvIERvY2ssIERhc2ggdG8gUGFuZWwgZGlyZWN0bHkgdG8gRGVza3RvcCBvciByZW1vdmUgZnJvbSBmYXZvcml0ZXMuXG4qIEltcHJvdmVkIGdlc3R1cmUgc3dpdGNoaW5nIG9mIHdvcmtzcGFjZXMsIGljb25zIGFwcGVhciB0byBiZSBvbiBhbGwgd29ya3NwYWNlcyBpbiBtb3Zpbmcgd2luZG93cy5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgb250byB0aGUgZG9jayAtIERyYWcgaWNvbnMgZnJvbSBkZXNrdG9wIHRvIGFuZCBkcm9wIG92ZXIgYXBwbGljYXRpb24gaWNvbiB0byBvcGVuIHRoZW0gd2l0aCB0aGUgYXBwLiBXb3JrcyB3aXRoIERhc2ggdG8gRG9jayBhbmQgRGFzaCB0byBQYW5lbC5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIFRyYXNoIG9uIERhc2ggdG8gRG9jayBvciB0byBtb3VudGVkIHZvbHVtZXMgdG8gY29weSB0aGVtIGRpcmVjdGx5LlxuKiBEaXNwbGF5IEdJTVAgdGh1bWJuYWlscywgZXZlbiBmb3Igc25hcCBhbmQgZmxhdHBhY2sgaW5zdGFsbHMuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBiZXN0IG9uIFdheWxhbmQuIFRoZXJlIGlzIGEgYnVnIGluIEdKUyBvbiBYMTEsIHBsZWFzZSBzZWUgUmVhZG1lLiBUaGlzIGV4dGVuc2lvbiBub3cgd29ya3Mgd2l0aCBzb21lIGhhY2tzLCBldmVuIG9uIFgxMS4gSG93ZXZlciB5b3VyIG1pbGVhZ2UgbWF5IHZhcnkgYW5kIHVzZSB3aXRoIGNhdXRpb24gb24gWDExIGFuZCByZXBvcnQgYW55IGlzc3Vlcy5cblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIG9uIHRoZSBnaXRsYWIgbGluayBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "41": {"version": "17", "sha256": "00jlr91nbiff1zkpryayq07kchk82dgcydrn3xddsxkd6a7qq6zf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsIGZ1bmN0aW9ucyBhcmUgYXN5bmMgd2hlcmUgcG9zc2libGUsIG11bHRpcGxlIGZpeGVzIGFuZCBuZXcgZmVhdHVyZXMtXG5cbiogTWFrZSBMaW5rcyBvbiBEZXNrdG9wLlxuKiBDb3BpZWQvZHJvcHBlZC9wYXN0ZWQgZmlsZXMgcmV0YWluIGRyb3BwZWQgcG9zaXRpb24uXG4qIFJpZ2h0IENsaWNrIE1lbnVzIHdpbGwgbm90IGdvIHVuZGVyIHRoZSBkb2NrLlxuKiBCZXR0ZXIgbXVsdGkgbW9uaXRvciBzdXBwb3J0LCBwcmVmZXJlbmNlIHRvIHBsYWNlIGljb25zIG9uIG5vbiBwcmltYXJ5IG1vbml0b3IuXG4qIEdTY29ubmVjdCBleHRlbnNpb24gaW50ZWdyYXRpb24sIGNhbiBzZW5kIGZpbGVzIGZyb20gZGVza3RvcCBkaXJlY3RseSB0byBtb2JpbGUgZGV2aWNlLlxuKiBEcmFnIGFuZCBkcm9wIEZhdm9yaXRlIGFwcHMgZnJvbSBEYXNoIHRvIERvY2ssIERhc2ggdG8gUGFuZWwgZGlyZWN0bHkgdG8gRGVza3RvcCBvciByZW1vdmUgZnJvbSBmYXZvcml0ZXMuXG4qIEltcHJvdmVkIGdlc3R1cmUgc3dpdGNoaW5nIG9mIHdvcmtzcGFjZXMsIGljb25zIGFwcGVhciB0byBiZSBvbiBhbGwgd29ya3NwYWNlcyBpbiBtb3Zpbmcgd2luZG93cy5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgb250byB0aGUgZG9jayAtIERyYWcgaWNvbnMgZnJvbSBkZXNrdG9wIHRvIGFuZCBkcm9wIG92ZXIgYXBwbGljYXRpb24gaWNvbiB0byBvcGVuIHRoZW0gd2l0aCB0aGUgYXBwLiBXb3JrcyB3aXRoIERhc2ggdG8gRG9jayBhbmQgRGFzaCB0byBQYW5lbC5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIFRyYXNoIG9uIERhc2ggdG8gRG9jayBvciB0byBtb3VudGVkIHZvbHVtZXMgdG8gY29weSB0aGVtIGRpcmVjdGx5LlxuKiBEaXNwbGF5IEdJTVAgdGh1bWJuYWlscywgZXZlbiBmb3Igc25hcCBhbmQgZmxhdHBhY2sgaW5zdGFsbHMuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBiZXN0IG9uIFdheWxhbmQuIFRoZXJlIGlzIGEgYnVnIGluIEdKUyBvbiBYMTEsIHBsZWFzZSBzZWUgUmVhZG1lLiBUaGlzIGV4dGVuc2lvbiBub3cgd29ya3Mgd2l0aCBzb21lIGhhY2tzLCBldmVuIG9uIFgxMS4gSG93ZXZlciB5b3VyIG1pbGVhZ2UgbWF5IHZhcnkgYW5kIHVzZSB3aXRoIGNhdXRpb24gb24gWDExIGFuZCByZXBvcnQgYW55IGlzc3Vlcy5cblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIG9uIHRoZSBnaXRsYWIgbGluayBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "42": {"version": "28", "sha256": "03s3lf5kyr4lvg76czzvy0rpkq7icl9462mz0q6cl3f6208qnrfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsIGZ1bmN0aW9ucyBhcmUgYXN5bmMgd2hlcmUgcG9zc2libGUsIG11bHRpcGxlIGZpeGVzIGFuZCBuZXcgZmVhdHVyZXMtXG5cbiogTWFrZSBMaW5rcyBvbiBEZXNrdG9wLlxuKiBDb3BpZWQvZHJvcHBlZC9wYXN0ZWQgZmlsZXMgcmV0YWluIGRyb3BwZWQgcG9zaXRpb24uXG4qIFJpZ2h0IENsaWNrIE1lbnVzIHdpbGwgbm90IGdvIHVuZGVyIHRoZSBkb2NrLlxuKiBCZXR0ZXIgbXVsdGkgbW9uaXRvciBzdXBwb3J0LCBwcmVmZXJlbmNlIHRvIHBsYWNlIGljb25zIG9uIG5vbiBwcmltYXJ5IG1vbml0b3IuXG4qIEdTY29ubmVjdCBleHRlbnNpb24gaW50ZWdyYXRpb24sIGNhbiBzZW5kIGZpbGVzIGZyb20gZGVza3RvcCBkaXJlY3RseSB0byBtb2JpbGUgZGV2aWNlLlxuKiBEcmFnIGFuZCBkcm9wIEZhdm9yaXRlIGFwcHMgZnJvbSBEYXNoIHRvIERvY2ssIERhc2ggdG8gUGFuZWwgZGlyZWN0bHkgdG8gRGVza3RvcCBvciByZW1vdmUgZnJvbSBmYXZvcml0ZXMuXG4qIEltcHJvdmVkIGdlc3R1cmUgc3dpdGNoaW5nIG9mIHdvcmtzcGFjZXMsIGljb25zIGFwcGVhciB0byBiZSBvbiBhbGwgd29ya3NwYWNlcyBpbiBtb3Zpbmcgd2luZG93cy5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgb250byB0aGUgZG9jayAtIERyYWcgaWNvbnMgZnJvbSBkZXNrdG9wIHRvIGFuZCBkcm9wIG92ZXIgYXBwbGljYXRpb24gaWNvbiB0byBvcGVuIHRoZW0gd2l0aCB0aGUgYXBwLiBXb3JrcyB3aXRoIERhc2ggdG8gRG9jayBhbmQgRGFzaCB0byBQYW5lbC5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIFRyYXNoIG9uIERhc2ggdG8gRG9jayBvciB0byBtb3VudGVkIHZvbHVtZXMgdG8gY29weSB0aGVtIGRpcmVjdGx5LlxuKiBEaXNwbGF5IEdJTVAgdGh1bWJuYWlscywgZXZlbiBmb3Igc25hcCBhbmQgZmxhdHBhY2sgaW5zdGFsbHMuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBiZXN0IG9uIFdheWxhbmQuIFRoZXJlIGlzIGEgYnVnIGluIEdKUyBvbiBYMTEsIHBsZWFzZSBzZWUgUmVhZG1lLiBUaGlzIGV4dGVuc2lvbiBub3cgd29ya3Mgd2l0aCBzb21lIGhhY2tzLCBldmVuIG9uIFgxMS4gSG93ZXZlciB5b3VyIG1pbGVhZ2UgbWF5IHZhcnkgYW5kIHVzZSB3aXRoIGNhdXRpb24gb24gWDExIGFuZCByZXBvcnQgYW55IGlzc3Vlcy5cblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIG9uIHRoZSBnaXRsYWIgbGluayBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "43": {"version": "28", "sha256": "03s3lf5kyr4lvg76czzvy0rpkq7icl9462mz0q6cl3f6208qnrfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsIGZ1bmN0aW9ucyBhcmUgYXN5bmMgd2hlcmUgcG9zc2libGUsIG11bHRpcGxlIGZpeGVzIGFuZCBuZXcgZmVhdHVyZXMtXG5cbiogTWFrZSBMaW5rcyBvbiBEZXNrdG9wLlxuKiBDb3BpZWQvZHJvcHBlZC9wYXN0ZWQgZmlsZXMgcmV0YWluIGRyb3BwZWQgcG9zaXRpb24uXG4qIFJpZ2h0IENsaWNrIE1lbnVzIHdpbGwgbm90IGdvIHVuZGVyIHRoZSBkb2NrLlxuKiBCZXR0ZXIgbXVsdGkgbW9uaXRvciBzdXBwb3J0LCBwcmVmZXJlbmNlIHRvIHBsYWNlIGljb25zIG9uIG5vbiBwcmltYXJ5IG1vbml0b3IuXG4qIEdTY29ubmVjdCBleHRlbnNpb24gaW50ZWdyYXRpb24sIGNhbiBzZW5kIGZpbGVzIGZyb20gZGVza3RvcCBkaXJlY3RseSB0byBtb2JpbGUgZGV2aWNlLlxuKiBEcmFnIGFuZCBkcm9wIEZhdm9yaXRlIGFwcHMgZnJvbSBEYXNoIHRvIERvY2ssIERhc2ggdG8gUGFuZWwgZGlyZWN0bHkgdG8gRGVza3RvcCBvciByZW1vdmUgZnJvbSBmYXZvcml0ZXMuXG4qIEltcHJvdmVkIGdlc3R1cmUgc3dpdGNoaW5nIG9mIHdvcmtzcGFjZXMsIGljb25zIGFwcGVhciB0byBiZSBvbiBhbGwgd29ya3NwYWNlcyBpbiBtb3Zpbmcgd2luZG93cy5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgb250byB0aGUgZG9jayAtIERyYWcgaWNvbnMgZnJvbSBkZXNrdG9wIHRvIGFuZCBkcm9wIG92ZXIgYXBwbGljYXRpb24gaWNvbiB0byBvcGVuIHRoZW0gd2l0aCB0aGUgYXBwLiBXb3JrcyB3aXRoIERhc2ggdG8gRG9jayBhbmQgRGFzaCB0byBQYW5lbC5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIFRyYXNoIG9uIERhc2ggdG8gRG9jayBvciB0byBtb3VudGVkIHZvbHVtZXMgdG8gY29weSB0aGVtIGRpcmVjdGx5LlxuKiBEaXNwbGF5IEdJTVAgdGh1bWJuYWlscywgZXZlbiBmb3Igc25hcCBhbmQgZmxhdHBhY2sgaW5zdGFsbHMuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBiZXN0IG9uIFdheWxhbmQuIFRoZXJlIGlzIGEgYnVnIGluIEdKUyBvbiBYMTEsIHBsZWFzZSBzZWUgUmVhZG1lLiBUaGlzIGV4dGVuc2lvbiBub3cgd29ya3Mgd2l0aCBzb21lIGhhY2tzLCBldmVuIG9uIFgxMS4gSG93ZXZlciB5b3VyIG1pbGVhZ2UgbWF5IHZhcnkgYW5kIHVzZSB3aXRoIGNhdXRpb24gb24gWDExIGFuZCByZXBvcnQgYW55IGlzc3Vlcy5cblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIG9uIHRoZSBnaXRsYWIgbGluayBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}}} +, {"uuid": "fig-gnome-integration@fig.io", "name": "Fig GNOME Integration", "pname": "fig-gnome-integration", "description": "Tightly integrates Fig with GNOME shell", "link": "https://extensions.gnome.org/extension/5266/fig-gnome-integration/", "shell_version_map": {"41": {"version": "6", "sha256": "1j5wy8zb5jnm4gh0y3brr6663ykjh56ximygkchns8ahyjmba85p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpZ2h0bHkgaW50ZWdyYXRlcyBGaWcgd2l0aCBHTk9NRSBzaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogImZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgIm5hbWUiOiAiRmlnIEdOT01FIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dpdGhmaWcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJmaWctZ25vbWUtaW50ZWdyYXRpb25AZmlnLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "1j5wy8zb5jnm4gh0y3brr6663ykjh56ximygkchns8ahyjmba85p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpZ2h0bHkgaW50ZWdyYXRlcyBGaWcgd2l0aCBHTk9NRSBzaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogImZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgIm5hbWUiOiAiRmlnIEdOT01FIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dpdGhmaWcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJmaWctZ25vbWUtaW50ZWdyYXRpb25AZmlnLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "43": {"version": "6", "sha256": "1j5wy8zb5jnm4gh0y3brr6663ykjh56ximygkchns8ahyjmba85p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpZ2h0bHkgaW50ZWdyYXRlcyBGaWcgd2l0aCBHTk9NRSBzaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogImZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgIm5hbWUiOiAiRmlnIEdOT01FIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dpdGhmaWcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJmaWctZ25vbWUtaW50ZWdyYXRpb25AZmlnLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "walkpaper2@walkpaper.massimiliano-dalcero.github.com", "name": "Walkpaper2", "pname": "walkpaper2", "description": "Set different wallpaper for each workspace by having the wallpaper switch on workspace change. Forked from the BlinkBP'project (https://github.com/BlinkBP/walkpaper)\n\nUnlike the previous extension is added a delay during transition. Is need for avoid flickering during switch using shortcuts :)", "link": "https://extensions.gnome.org/extension/5267/walkpaper2/", "shell_version_map": {"42": {"version": "7", "sha256": "00z56wfsvw4821siywgg83r9xhyq1sp0dijvd6y2lgg1zf08xkvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBkaWZmZXJlbnQgd2FsbHBhcGVyIGZvciBlYWNoIHdvcmtzcGFjZSBieSBoYXZpbmcgdGhlIHdhbGxwYXBlciBzd2l0Y2ggb24gd29ya3NwYWNlIGNoYW5nZS4gRm9ya2VkIGZyb20gdGhlIEJsaW5rQlAncHJvamVjdCAoaHR0cHM6Ly9naXRodWIuY29tL0JsaW5rQlAvd2Fsa3BhcGVyKVxuXG5Vbmxpa2UgdGhlIHByZXZpb3VzIGV4dGVuc2lvbiBpcyBhZGRlZCBhIGRlbGF5IGR1cmluZyB0cmFuc2l0aW9uLiBJcyBuZWVkIGZvciBhdm9pZCBmbGlja2VyaW5nIGR1cmluZyBzd2l0Y2ggdXNpbmcgc2hvcnRjdXRzIDopIiwKICAiZXh0ZW5zaW9uLWlkIjogIndhbGtwYXBlcjIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3YWxrcGFwZXIyQHdhbGtwYXBlci5tYXNzaW1pbGlhbm8tZGFsY2Vyby5naXRodWIuY29tIiwKICAibmFtZSI6ICJXYWxrcGFwZXIyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndhbGtwYXBlcjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFzc2ltaWxpYW5vLWRhbGNlcm8vd2Fsa3BhcGVyIiwKICAidXVpZCI6ICJ3YWxrcGFwZXIyQHdhbGtwYXBlci5tYXNzaW1pbGlhbm8tZGFsY2Vyby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "dock-reloaded@selfmade.pl", "name": "Dock: Reloaded", "pname": "dock-reloaded", "description": "Few tweaks to GNOME dock: top position, autohide - reveals under cursor pressure, only favorites apps", "link": "https://extensions.gnome.org/extension/5269/dock-reloaded/", "shell_version_map": {"42": {"version": "2", "sha256": "1cs766qr77i68s53dvaswlyv3jh1sv51d19jgigd7m71qndxwv70", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldyB0d2Vha3MgdG8gR05PTUUgZG9jazogdG9wIHBvc2l0aW9uLCBhdXRvaGlkZSAtIHJldmVhbHMgdW5kZXIgY3Vyc29yIHByZXNzdXJlLCBvbmx5IGZhdm9yaXRlcyBhcHBzIiwKICAibmFtZSI6ICJEb2NrOiBSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9Eb2NrLVJlbG9hZGVkIiwKICAidXVpZCI6ICJkb2NrLXJlbG9hZGVkQHNlbGZtYWRlLnBsIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "43": {"version": "3", "sha256": "1zs2imsp8jw6z1x5q4c7b6qnrih11d8j09xs1zvfj65dm5ag2nz9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldyB0d2Vha3MgdG8gR05PTUUgZG9jazogdG9wIHBvc2l0aW9uLCBhdXRvaGlkZSAtIHJldmVhbHMgdW5kZXIgY3Vyc29yIHByZXNzdXJlLCBvbmx5IGZhdm9yaXRlcyBhcHBzIiwKICAibmFtZSI6ICJEb2NrOiBSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9Eb2NrLVJlbG9hZGVkIiwKICAidXVpZCI6ICJkb2NrLXJlbG9hZGVkQHNlbGZtYWRlLnBsIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "shutdownbutton@asr-webdesign.fr", "name": "Add a Shutdown Button", "pname": "add-a-shutdown-button", "description": "Add power off button", "link": "https://extensions.gnome.org/extension/5272/add-a-shutdown-button/", "shell_version_map": {"40": {"version": "1", "sha256": "0kav86za1i9vkliwrbp86rnmvjn9pgvn1wdkqxbsxmmqhsn5awb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwb3dlciBvZmYgYnV0dG9uIiwKICAibmFtZSI6ICJBZGQgYSBTaHV0ZG93biBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzaHV0ZG93bmJ1dHRvbkBhc3Itd2ViZGVzaWduLmZyIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "42": {"version": "1", "sha256": "0kav86za1i9vkliwrbp86rnmvjn9pgvn1wdkqxbsxmmqhsn5awb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwb3dlciBvZmYgYnV0dG9uIiwKICAibmFtZSI6ICJBZGQgYSBTaHV0ZG93biBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzaHV0ZG93bmJ1dHRvbkBhc3Itd2ViZGVzaWduLmZyIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} @@ -808,53 +810,87 @@ , {"uuid": "pano@elhan.io", "name": "Pano - Clipboard Manager", "pname": "pano", "description": "Next-gen Clipboard manager for Gnome Shell\n\nYou need libgda and gsound for this extension to work.\n\nFedora: sudo dnf install libgda libgda-sqlite\nArch Linux: sudo pacman -S libgda (libgda6 for gnome-43)\nUbuntu/Debian: sudo apt install gir1.2-gda-5.0 gir1.2-gsound-1.0\nopenSUSE: sudo zypper install libgda-6_0-sqlite typelib-1_0-Gda-6_0 typelib-1_0-GSound-1_0", "link": "https://extensions.gnome.org/extension/5278/pano/", "shell_version_map": {"42": {"version": "10", "sha256": "09jx23f50n4iz77hcl0csgzpkyafxb2ani5xaanddc9cxyp5mkbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5leHQtZ2VuIENsaXBib2FyZCBtYW5hZ2VyIGZvciBHbm9tZSBTaGVsbFxuXG5Zb3UgbmVlZCBsaWJnZGEgYW5kIGdzb3VuZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay5cblxuRmVkb3JhOiBzdWRvIGRuZiBpbnN0YWxsIGxpYmdkYSBsaWJnZGEtc3FsaXRlXG5BcmNoIExpbnV4OiBzdWRvIHBhY21hbiAtUyBsaWJnZGEgKGxpYmdkYTYgZm9yIGdub21lLTQzKVxuVWJ1bnR1L0RlYmlhbjogc3VkbyBhcHQgaW5zdGFsbCBnaXIxLjItZ2RhLTUuMCBnaXIxLjItZ3NvdW5kLTEuMFxub3BlblNVU0U6IHN1ZG8genlwcGVyIGluc3RhbGwgbGliZ2RhLTZfMC1zcWxpdGUgdHlwZWxpYi0xXzAtR2RhLTZfMCB0eXBlbGliLTFfMC1HU291bmQtMV8wIiwKICAibmFtZSI6ICJQYW5vIC0gQ2xpcGJvYXJkIE1hbmFnZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFubyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2FlL2dub21lLXNoZWxsLXBhbm8iLAogICJ1dWlkIjogInBhbm9AZWxoYW4uaW8iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "43": {"version": "10", "sha256": "09jx23f50n4iz77hcl0csgzpkyafxb2ani5xaanddc9cxyp5mkbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5leHQtZ2VuIENsaXBib2FyZCBtYW5hZ2VyIGZvciBHbm9tZSBTaGVsbFxuXG5Zb3UgbmVlZCBsaWJnZGEgYW5kIGdzb3VuZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay5cblxuRmVkb3JhOiBzdWRvIGRuZiBpbnN0YWxsIGxpYmdkYSBsaWJnZGEtc3FsaXRlXG5BcmNoIExpbnV4OiBzdWRvIHBhY21hbiAtUyBsaWJnZGEgKGxpYmdkYTYgZm9yIGdub21lLTQzKVxuVWJ1bnR1L0RlYmlhbjogc3VkbyBhcHQgaW5zdGFsbCBnaXIxLjItZ2RhLTUuMCBnaXIxLjItZ3NvdW5kLTEuMFxub3BlblNVU0U6IHN1ZG8genlwcGVyIGluc3RhbGwgbGliZ2RhLTZfMC1zcWxpdGUgdHlwZWxpYi0xXzAtR2RhLTZfMCB0eXBlbGliLTFfMC1HU291bmQtMV8wIiwKICAibmFtZSI6ICJQYW5vIC0gQ2xpcGJvYXJkIE1hbmFnZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFubyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2FlL2dub21lLXNoZWxsLXBhbm8iLAogICJ1dWlkIjogInBhbm9AZWxoYW4uaW8iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} , {"uuid": "nauta-connect@jorgeajimenezl.com", "name": "Nauta Connect", "pname": "nauta-connect", "description": "Utility to authenticate in ETECSA network", "link": "https://extensions.gnome.org/extension/5279/nauta-connect/", "shell_version_map": {"41": {"version": "5", "sha256": "1hlrl5550015px3hvggsbaqfwr6rpn81yyx10cvz2jvancn2g7nj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlV0aWxpdHkgdG8gYXV0aGVudGljYXRlIGluIEVURUNTQSBuZXR3b3JrIiwKICAibmFtZSI6ICJOYXV0YSBDb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam9yZ2VhamltZW5lemwvbmF1dGEtY29ubmVjdC1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIm5hdXRhLWNvbm5lY3RAam9yZ2VhamltZW5lemwuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "42": {"version": "5", "sha256": "1hlrl5550015px3hvggsbaqfwr6rpn81yyx10cvz2jvancn2g7nj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlV0aWxpdHkgdG8gYXV0aGVudGljYXRlIGluIEVURUNTQSBuZXR3b3JrIiwKICAibmFtZSI6ICJOYXV0YSBDb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam9yZ2VhamltZW5lemwvbmF1dGEtY29ubmVjdC1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIm5hdXRhLWNvbm5lY3RAam9yZ2VhamltZW5lemwuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "43": {"version": "5", "sha256": "1hlrl5550015px3hvggsbaqfwr6rpn81yyx10cvz2jvancn2g7nj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlV0aWxpdHkgdG8gYXV0aGVudGljYXRlIGluIEVURUNTQSBuZXR3b3JrIiwKICAibmFtZSI6ICJOYXV0YSBDb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam9yZ2VhamltZW5lemwvbmF1dGEtY29ubmVjdC1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIm5hdXRhLWNvbm5lY3RAam9yZ2VhamltZW5lemwuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "addshutbutton@flioner@jerom@olika.ovh", "name": "Add Shutdown Menu (Gnome 42)", "pname": "add-shutdown-button-2204-lts", "description": "Add a button for the power off menu, you can now select options with the 'enter' key on Gnome 42 (fork of jerom's add shutdown button extension, added minor functionality)", "link": "https://extensions.gnome.org/extension/5281/add-shutdown-button-2204-lts/", "shell_version_map": {"40": {"version": "1", "sha256": "0jmb667zb89yjlk2gwla13ay46n72vh677r6vakv3czqz0fmlgha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJ1dHRvbiBmb3IgdGhlIHBvd2VyIG9mZiBtZW51LCB5b3UgY2FuIG5vdyBzZWxlY3Qgb3B0aW9ucyB3aXRoIHRoZSAnZW50ZXInIGtleSBvbiBHbm9tZSA0MiAoZm9yayBvZiBqZXJvbSdzIGFkZCBzaHV0ZG93biBidXR0b24gZXh0ZW5zaW9uLCBhZGRlZCBtaW5vciBmdW5jdGlvbmFsaXR5KSIsCiAgIm5hbWUiOiAiQWRkIFNodXRkb3duIE1lbnUgKEdub21lIDQyKSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFkZHNodXRidXR0b25AZmxpb25lckBqZXJvbUBvbGlrYS5vdmgiLAogICJ2ZXJzaW9uIjogMQp9"}, "42": {"version": "1", "sha256": "0jmb667zb89yjlk2gwla13ay46n72vh677r6vakv3czqz0fmlgha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJ1dHRvbiBmb3IgdGhlIHBvd2VyIG9mZiBtZW51LCB5b3UgY2FuIG5vdyBzZWxlY3Qgb3B0aW9ucyB3aXRoIHRoZSAnZW50ZXInIGtleSBvbiBHbm9tZSA0MiAoZm9yayBvZiBqZXJvbSdzIGFkZCBzaHV0ZG93biBidXR0b24gZXh0ZW5zaW9uLCBhZGRlZCBtaW5vciBmdW5jdGlvbmFsaXR5KSIsCiAgIm5hbWUiOiAiQWRkIFNodXRkb3duIE1lbnUgKEdub21lIDQyKSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFkZHNodXRidXR0b25AZmxpb25lckBqZXJvbUBvbGlrYS5vdmgiLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "alt-tab-scroll-workaround@lucasresck.github.io", "name": "Alt+Tab Scroll Workaround", "pname": "alttab-scroll-workaround", "description": "Temporary fix for a bug that buffers the scroll between different windows (e.g., Chrome and VS Code).", "link": "https://extensions.gnome.org/extension/5282/alttab-scroll-workaround/", "shell_version_map": {"42": {"version": "2", "sha256": "0q6v5309hn04frq1cbj557a56rjgshrdw3jhkjqlpc6na8nci3b3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRlbXBvcmFyeSBmaXggZm9yIGEgYnVnIHRoYXQgYnVmZmVycyB0aGUgc2Nyb2xsIGJldHdlZW4gZGlmZmVyZW50IHdpbmRvd3MgKGUuZy4sIENocm9tZSBhbmQgVlMgQ29kZSkuIiwKICAibmFtZSI6ICJBbHQrVGFiIFNjcm9sbCBXb3JrYXJvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdWNhc3Jlc2NrL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLXNjcm9sbC13b3JrYXJvdW5kIiwKICAidXVpZCI6ICJhbHQtdGFiLXNjcm9sbC13b3JrYXJvdW5kQGx1Y2FzcmVzY2suZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "43": {"version": "2", "sha256": "0q6v5309hn04frq1cbj557a56rjgshrdw3jhkjqlpc6na8nci3b3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRlbXBvcmFyeSBmaXggZm9yIGEgYnVnIHRoYXQgYnVmZmVycyB0aGUgc2Nyb2xsIGJldHdlZW4gZGlmZmVyZW50IHdpbmRvd3MgKGUuZy4sIENocm9tZSBhbmQgVlMgQ29kZSkuIiwKICAibmFtZSI6ICJBbHQrVGFiIFNjcm9sbCBXb3JrYXJvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdWNhc3Jlc2NrL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLXNjcm9sbC13b3JrYXJvdW5kIiwKICAidXVpZCI6ICJhbHQtdGFiLXNjcm9sbC13b3JrYXJvdW5kQGx1Y2FzcmVzY2suZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "alt-tab-scroll-workaround@lucasresck.github.io", "name": "Alt+Tab Scroll Workaround", "pname": "alttab-scroll-workaround", "description": "Temporary fix for a bug that buffers the scroll between different windows (e.g., Chrome and VS Code).", "link": "https://extensions.gnome.org/extension/5282/alttab-scroll-workaround/", "shell_version_map": {"42": {"version": "3", "sha256": "0grxkjvcj1z6mjms11k5m5fh1myxs8b18pn330kvfhxf7ymhlk2l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRlbXBvcmFyeSBmaXggZm9yIGEgYnVnIHRoYXQgYnVmZmVycyB0aGUgc2Nyb2xsIGJldHdlZW4gZGlmZmVyZW50IHdpbmRvd3MgKGUuZy4sIENocm9tZSBhbmQgVlMgQ29kZSkuIiwKICAibmFtZSI6ICJBbHQrVGFiIFNjcm9sbCBXb3JrYXJvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdWNhc3Jlc2NrL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLXNjcm9sbC13b3JrYXJvdW5kIiwKICAidXVpZCI6ICJhbHQtdGFiLXNjcm9sbC13b3JrYXJvdW5kQGx1Y2FzcmVzY2suZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "0grxkjvcj1z6mjms11k5m5fh1myxs8b18pn330kvfhxf7ymhlk2l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRlbXBvcmFyeSBmaXggZm9yIGEgYnVnIHRoYXQgYnVmZmVycyB0aGUgc2Nyb2xsIGJldHdlZW4gZGlmZmVyZW50IHdpbmRvd3MgKGUuZy4sIENocm9tZSBhbmQgVlMgQ29kZSkuIiwKICAibmFtZSI6ICJBbHQrVGFiIFNjcm9sbCBXb3JrYXJvdW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdWNhc3Jlc2NrL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLXNjcm9sbC13b3JrYXJvdW5kIiwKICAidXVpZCI6ICJhbHQtdGFiLXNjcm9sbC13b3JrYXJvdW5kQGx1Y2FzcmVzY2suZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "projectmanagerforvscode@ahmafi.ir", "name": "Project Manager for VSCode", "pname": "project-manager-for-vscode", "description": "Easily open your Visual Studio Code projects from GNOME shell\n\nDisclaimer:This extension is an independent project and is not affiliated with, authorized by, sponsored by, or in any way associated with Microsoft corporation, Visual Studio Code software and GNOME Foundation.", "link": "https://extensions.gnome.org/extension/5289/project-manager-for-vscode/", "shell_version_map": {"42": {"version": "2", "sha256": "102iykjh5pd0qsj1m9p4nnvh20li732xbmk3jvgfl1f8dhb121x6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVhc2lseSBvcGVuIHlvdXIgVmlzdWFsIFN0dWRpbyBDb2RlIHByb2plY3RzIGZyb20gR05PTUUgc2hlbGxcblxuRGlzY2xhaW1lcjpUaGlzIGV4dGVuc2lvbiBpcyBhbiBpbmRlcGVuZGVudCBwcm9qZWN0IGFuZCBpcyBub3QgYWZmaWxpYXRlZCB3aXRoLCBhdXRob3JpemVkIGJ5LCBzcG9uc29yZWQgYnksIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIE1pY3Jvc29mdCBjb3Jwb3JhdGlvbiwgVmlzdWFsIFN0dWRpbyBDb2RlIHNvZnR3YXJlIGFuZCBHTk9NRSBGb3VuZGF0aW9uLiIsCiAgIm5hbWUiOiAiUHJvamVjdCBNYW5hZ2VyIGZvciBWU0NvZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWhtYWZpL2dub21lLXZzY29kZS1wcm9qZWN0cyIsCiAgInV1aWQiOiAicHJvamVjdG1hbmFnZXJmb3J2c2NvZGVAYWhtYWZpLmlyIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "quick-touchpad-toggle@kramo.hu", "name": "Quick Touchpad Toggle", "pname": "quick-touchpad-toggle", "description": "Toggle the \"disable touchpad while typing\" setting more easily.", "link": "https://extensions.gnome.org/extension/5292/quick-touchpad-toggle/", "shell_version_map": {"40": {"version": "4", "sha256": "1wqdvla5nm0v80h9df6js8cbwkwn3qv26n7gmq46f3in3zmjm73x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgXCJkaXNhYmxlIHRvdWNocGFkIHdoaWxlIHR5cGluZ1wiIHNldHRpbmcgbW9yZSBlYXNpbHkuIiwKICAibmFtZSI6ICJRdWljayBUb3VjaHBhZCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va3JhLW1vL3F1aWNrLXRvdWNocGFkLXRvZ2dsZS8iLAogICJ1dWlkIjogInF1aWNrLXRvdWNocGFkLXRvZ2dsZUBrcmFtby5odSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1wqdvla5nm0v80h9df6js8cbwkwn3qv26n7gmq46f3in3zmjm73x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgXCJkaXNhYmxlIHRvdWNocGFkIHdoaWxlIHR5cGluZ1wiIHNldHRpbmcgbW9yZSBlYXNpbHkuIiwKICAibmFtZSI6ICJRdWljayBUb3VjaHBhZCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va3JhLW1vL3F1aWNrLXRvdWNocGFkLXRvZ2dsZS8iLAogICJ1dWlkIjogInF1aWNrLXRvdWNocGFkLXRvZ2dsZUBrcmFtby5odSIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1wqdvla5nm0v80h9df6js8cbwkwn3qv26n7gmq46f3in3zmjm73x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgXCJkaXNhYmxlIHRvdWNocGFkIHdoaWxlIHR5cGluZ1wiIHNldHRpbmcgbW9yZSBlYXNpbHkuIiwKICAibmFtZSI6ICJRdWljayBUb3VjaHBhZCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va3JhLW1vL3F1aWNrLXRvdWNocGFkLXRvZ2dsZS8iLAogICJ1dWlkIjogInF1aWNrLXRvdWNocGFkLXRvZ2dsZUBrcmFtby5odSIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "6", "sha256": "0nr0msrgplc3nj0f1990zhdb8lpw1iq7zcxdnkj118x6asrk02jc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgXCJkaXNhYmxlIHRvdWNocGFkIHdoaWxlIHR5cGluZ1wiIHNldHRpbmcgbW9yZSBlYXNpbHkuIiwKICAibmFtZSI6ICJRdWljayBUb3VjaHBhZCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va3JhLW1vL3F1aWNrLXRvdWNocGFkLXRvZ2dsZS8iLAogICJ1dWlkIjogInF1aWNrLXRvdWNocGFkLXRvZ2dsZUBrcmFtby5odSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "desktop-zoom@colin.kinlo.ch", "name": "Desktop Zoom", "pname": "desktop-zoom", "description": "Scroll to zoom gnome desktop.\n\nUsage: Hold Alt and Scroll\n\nCursor must not be over a window (must be over background or top bar).\nMagnifier / zoom must be enabled in accessibility.\n\nTo disable zoom after removing the extension, disable zoom in gnomes accessibility settings:\nhttps://help.gnome.org/users/gnome-help/stable/a11y-mag.html.en\n\nReport issues on GITHUB.COM", "link": "https://extensions.gnome.org/extension/5297/desktop-zoom/", "shell_version_map": {"42": {"version": "6", "sha256": "14vi9jzdcnc9srsf8r4x38ymcjjxjl8xyb49rndcb3ldbr60wxpj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB0byB6b29tIGdub21lIGRlc2t0b3AuXG5cblVzYWdlOiBIb2xkIEFsdCBhbmQgU2Nyb2xsXG5cbkN1cnNvciBtdXN0IG5vdCBiZSBvdmVyIGEgd2luZG93IChtdXN0IGJlIG92ZXIgYmFja2dyb3VuZCBvciB0b3AgYmFyKS5cbk1hZ25pZmllciAvIHpvb20gbXVzdCBiZSBlbmFibGVkIGluIGFjY2Vzc2liaWxpdHkuXG5cblRvIGRpc2FibGUgem9vbSBhZnRlciByZW1vdmluZyB0aGUgZXh0ZW5zaW9uLCBkaXNhYmxlIHpvb20gaW4gZ25vbWVzIGFjY2Vzc2liaWxpdHkgc2V0dGluZ3M6XG5odHRwczovL2hlbHAuZ25vbWUub3JnL3VzZXJzL2dub21lLWhlbHAvc3RhYmxlL2ExMXktbWFnLmh0bWwuZW5cblxuUmVwb3J0IGlzc3VlcyBvbiBHSVRIVUIuQ09NIiwKICAibmFtZSI6ICJEZXNrdG9wIFpvb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NvbGluS2lubG9jaC9kZXNrdG9wLXpvb20tZ25vbWUtc2hlbGwiLAogICJ1dWlkIjogImRlc2t0b3Atem9vbUBjb2xpbi5raW5sby5jaCIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "14vi9jzdcnc9srsf8r4x38ymcjjxjl8xyb49rndcb3ldbr60wxpj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB0byB6b29tIGdub21lIGRlc2t0b3AuXG5cblVzYWdlOiBIb2xkIEFsdCBhbmQgU2Nyb2xsXG5cbkN1cnNvciBtdXN0IG5vdCBiZSBvdmVyIGEgd2luZG93IChtdXN0IGJlIG92ZXIgYmFja2dyb3VuZCBvciB0b3AgYmFyKS5cbk1hZ25pZmllciAvIHpvb20gbXVzdCBiZSBlbmFibGVkIGluIGFjY2Vzc2liaWxpdHkuXG5cblRvIGRpc2FibGUgem9vbSBhZnRlciByZW1vdmluZyB0aGUgZXh0ZW5zaW9uLCBkaXNhYmxlIHpvb20gaW4gZ25vbWVzIGFjY2Vzc2liaWxpdHkgc2V0dGluZ3M6XG5odHRwczovL2hlbHAuZ25vbWUub3JnL3VzZXJzL2dub21lLWhlbHAvc3RhYmxlL2ExMXktbWFnLmh0bWwuZW5cblxuUmVwb3J0IGlzc3VlcyBvbiBHSVRIVUIuQ09NIiwKICAibmFtZSI6ICJEZXNrdG9wIFpvb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NvbGluS2lubG9jaC9kZXNrdG9wLXpvb20tZ25vbWUtc2hlbGwiLAogICJ1dWlkIjogImRlc2t0b3Atem9vbUBjb2xpbi5raW5sby5jaCIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "zoomwayland@polyte.de", "name": "Zoom Wayland Extension", "pname": "zoom-wayland-extension", "description": "Enables Zoom Screensharing under Wayland", "link": "https://extensions.gnome.org/extension/5302/zoom-wayland-extension/", "shell_version_map": {"42": {"version": "1", "sha256": "0dnd2mi0aq2ddgp7kvc8vbsl61yi3akawp97wi38z1nbbqflgmag", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgWm9vbSBTY3JlZW5zaGFyaW5nIHVuZGVyIFdheWxhbmQiLAogICJuYW1lIjogIlpvb20gV2F5bGFuZCBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanVsaWFucG9sbG1hbm4vem9vbS13YXlsYW5kLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiem9vbXdheWxhbmRAcG9seXRlLmRlIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "firefox-pip@bennypowers.com", "name": "Firefox PiP Always on Top", "pname": "firefox-pip-always-on-top", "description": "Ensure that Firefox Picture-in-Picture window are always on top", "link": "https://extensions.gnome.org/extension/5306/firefox-pip-always-on-top/", "shell_version_map": {"42": {"version": "3", "sha256": "0473sbsjp7qg1cla28s5r9rrpg3qa2fk015h3gv101ndn32mfs6l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuc3VyZSB0aGF0IEZpcmVmb3ggUGljdHVyZS1pbi1QaWN0dXJlIHdpbmRvdyBhcmUgYWx3YXlzIG9uIHRvcCIsCiAgIm5hbWUiOiAiRmlyZWZveCBQaVAgQWx3YXlzIG9uIFRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmVubnlwb3dlcnMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZpcmVmb3gtcGlwIiwKICAidXVpZCI6ICJmaXJlZm94LXBpcEBiZW5ueXBvd2Vycy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "0473sbsjp7qg1cla28s5r9rrpg3qa2fk015h3gv101ndn32mfs6l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuc3VyZSB0aGF0IEZpcmVmb3ggUGljdHVyZS1pbi1QaWN0dXJlIHdpbmRvdyBhcmUgYWx3YXlzIG9uIHRvcCIsCiAgIm5hbWUiOiAiRmlyZWZveCBQaVAgQWx3YXlzIG9uIFRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmVubnlwb3dlcnMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZpcmVmb3gtcGlwIiwKICAidXVpZCI6ICJmaXJlZm94LXBpcEBiZW5ueXBvd2Vycy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "activitiesworkspacename@ahmafi.ir", "name": "Activities Workspace Name", "pname": "activities-workspace-name", "description": "Replace Activities Text with Current Workspace Name", "link": "https://extensions.gnome.org/extension/5311/activities-workspace-name/", "shell_version_map": {"42": {"version": "1", "sha256": "1syxsxw713ly8a2fbppvad91hw0i94bgi8xa0h5za87y34qqd7gz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBUZXh0IHdpdGggQ3VycmVudCBXb3Jrc3BhY2UgTmFtZSIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBXb3Jrc3BhY2UgTmFtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haG1hZmkvZ25vbWUtYWN0aXZpdGllcy13b3Jrc3BhY2UtbmFtZSIsCiAgInV1aWQiOiAiYWN0aXZpdGllc3dvcmtzcGFjZW5hbWVAYWhtYWZpLmlyIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} -, {"uuid": "webfeed@xynium.github.com", "name": "WebFeed", "pname": "webfeed", "description": "RSS and Atom Feed reader for GNOME Shell", "link": "https://extensions.gnome.org/extension/5321/webfeed/", "shell_version_map": {"42": {"version": "6", "sha256": "0p6cv0hrpd52s215w3ilhkdyqb2x97j1kijcpw4byiajfkvqc1i6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJTUyBhbmQgQXRvbSBGZWVkIHJlYWRlciBmb3IgR05PTUUgU2hlbGwiLAogICJuYW1lIjogIldlYkZlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3h5bml1bS93ZWJmZWVkIiwKICAidXVpZCI6ICJ3ZWJmZWVkQHh5bml1bS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "43": {"version": "6", "sha256": "0p6cv0hrpd52s215w3ilhkdyqb2x97j1kijcpw4byiajfkvqc1i6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJTUyBhbmQgQXRvbSBGZWVkIHJlYWRlciBmb3IgR05PTUUgU2hlbGwiLAogICJuYW1lIjogIldlYkZlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3h5bml1bS93ZWJmZWVkIiwKICAidXVpZCI6ICJ3ZWJmZWVkQHh5bml1bS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} +, {"uuid": "activitiesworkspacename@ahmafi.ir", "name": "Activities Workspace Name", "pname": "activities-workspace-name", "description": "Replace Activities Text with Current Workspace Name", "link": "https://extensions.gnome.org/extension/5311/activities-workspace-name/", "shell_version_map": {"42": {"version": "2", "sha256": "0rdzh3g4sl5fcl736qw864lkkp9gcdlha5kny48mcxwqh48zlv1f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBUZXh0IHdpdGggQ3VycmVudCBXb3Jrc3BhY2UgTmFtZSIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBXb3Jrc3BhY2UgTmFtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWhtYWZpL2dub21lLWFjdGl2aXRpZXMtd29ya3NwYWNlLW5hbWUiLAogICJ1dWlkIjogImFjdGl2aXRpZXN3b3Jrc3BhY2VuYW1lQGFobWFmaS5pciIsCiAgInZlcnNpb24iOiAyCn0="}, "43": {"version": "2", "sha256": "0rdzh3g4sl5fcl736qw864lkkp9gcdlha5kny48mcxwqh48zlv1f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBUZXh0IHdpdGggQ3VycmVudCBXb3Jrc3BhY2UgTmFtZSIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBXb3Jrc3BhY2UgTmFtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWhtYWZpL2dub21lLWFjdGl2aXRpZXMtd29ya3NwYWNlLW5hbWUiLAogICJ1dWlkIjogImFjdGl2aXRpZXN3b3Jrc3BhY2VuYW1lQGFobWFmaS5pciIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "webfeed@xynium.github.com", "name": "WebFeed", "pname": "webfeed", "description": "RSS and Atom Feed reader for GNOME Shell", "link": "https://extensions.gnome.org/extension/5321/webfeed/", "shell_version_map": {"42": {"version": "6", "sha256": "0p6cv0hrpd52s215w3ilhkdyqb2x97j1kijcpw4byiajfkvqc1i6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJTUyBhbmQgQXRvbSBGZWVkIHJlYWRlciBmb3IgR05PTUUgU2hlbGwiLAogICJuYW1lIjogIldlYkZlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3h5bml1bS93ZWJmZWVkIiwKICAidXVpZCI6ICJ3ZWJmZWVkQHh5bml1bS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "43": {"version": "8", "sha256": "15nngcapwcf80fv6dqp8mxlbzxd1n4rv73blfyvvzxxwh0inbhg9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJTUyBhbmQgQXRvbSBGZWVkIHJlYWRlciBmb3IgR05PTUUgU2hlbGwiLAogICJuYW1lIjogIldlYkZlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veHluaXVtL3dlYmZlZWQiLAogICJ1dWlkIjogIndlYmZlZWRAeHluaXVtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "pingindic@xynium.github.com", "name": "PingIndic", "pname": "pingindic", "description": "show network ping delay", "link": "https://extensions.gnome.org/extension/5330/pingindic/", "shell_version_map": {"42": {"version": "3", "sha256": "0f4kgq5qagv39s98bdyncfs9jwcd6lm5bnjb1qcfhr3364rd0yab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInNob3cgbmV0d29yayBwaW5nIGRlbGF5IiwKICAibmFtZSI6ICJQaW5nSW5kaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3h5bml1bS9waW5naW5kaWMiLAogICJ1dWlkIjogInBpbmdpbmRpY0B4eW5pdW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "0f4kgq5qagv39s98bdyncfs9jwcd6lm5bnjb1qcfhr3364rd0yab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInNob3cgbmV0d29yayBwaW5nIGRlbGF5IiwKICAibmFtZSI6ICJQaW5nSW5kaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3h5bml1bS9waW5naW5kaWMiLAogICJ1dWlkIjogInBpbmdpbmRpY0B4eW5pdW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "power-profile-indicator@laux.wtf", "name": "Power Profiles Indicator", "pname": "power-profile-indicator", "description": "a simple indicator in the system icons area of the top panel that represent the current power profile", "link": "https://extensions.gnome.org/extension/5335/power-profile-indicator/", "shell_version_map": {"40": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} -, {"uuid": "widgets@aylur", "name": "Aylur's Widgets", "pname": "aylurs-widgets", "description": "My set of extensions: Battery Bar, Dash Board, DateMenu Mod, Media Player, Power Menu, Workspace Indicator, Notification Indicator, Modified Quick Settings, Background Clock.\n Disclaimer: this extension contains copyrighted icons.", "link": "https://extensions.gnome.org/extension/5338/aylurs-widgets/", "shell_version_map": {"42": {"version": "14", "sha256": "0bmv10sarbl0hn3hknw0ad9msm09xjm8bb98a9xydqqbaba08l1a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "43": {"version": "14", "sha256": "0bmv10sarbl0hn3hknw0ad9msm09xjm8bb98a9xydqqbaba08l1a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} -, {"uuid": "supergfxctl-gex@asus-linux.org", "name": "supergfxctl-gex", "pname": "supergfxctl-gex", "description": "supergfxctl-gex is a frontend for supergfxctl that was born inside the asus-linux.org community. supergfxctl is required for this extension to work. It is tested on a variaty of laptops including Intel / Nvidia, AMD / Nvidia, Intel / AMD and AMD / AMD GPU combinations.\n\nIt is a platform agnostic tool for hybrid graphics laptops.\n\nsupergfxctl gets packages by the community for Fedora and Arch. But without much of a hastle can be compiled for every systemd based Linux distribution.\n\nTo learn more about it, please have a look at:\n\nhttps://gitlab.com/asus-linux/supergfxctl\nhttps://asus-linux.org/", "link": "https://extensions.gnome.org/extension/5344/supergfxctl-gex/", "shell_version_map": {"40": {"version": "22", "sha256": "1wfgxshafzm1p2i3f2xyr16ak2sgmvyxc61pslh11qd3d23xchbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJzdXBlcmdmeGN0bC1nZXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VwZXJnZnhjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInN1cGVyZ2Z4Y3RsIjogIjUuMC4xIiwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3VwZXJnZnhjdGwtZ2V4QGFzdXMtbGludXgub3JnIiwKICAidXVpZC1kZXYiOiAic3VwZXJnZnhjdGwtZ2V4LWRldkBhc3VzLWxpbnV4Lm9yZyIsCiAgInZlcnNpb24iOiAyMgp9"}, "41": {"version": "22", "sha256": "1wfgxshafzm1p2i3f2xyr16ak2sgmvyxc61pslh11qd3d23xchbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJzdXBlcmdmeGN0bC1nZXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VwZXJnZnhjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInN1cGVyZ2Z4Y3RsIjogIjUuMC4xIiwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3VwZXJnZnhjdGwtZ2V4QGFzdXMtbGludXgub3JnIiwKICAidXVpZC1kZXYiOiAic3VwZXJnZnhjdGwtZ2V4LWRldkBhc3VzLWxpbnV4Lm9yZyIsCiAgInZlcnNpb24iOiAyMgp9"}, "42": {"version": "22", "sha256": "1wfgxshafzm1p2i3f2xyr16ak2sgmvyxc61pslh11qd3d23xchbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJzdXBlcmdmeGN0bC1nZXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VwZXJnZnhjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInN1cGVyZ2Z4Y3RsIjogIjUuMC4xIiwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3VwZXJnZnhjdGwtZ2V4QGFzdXMtbGludXgub3JnIiwKICAidXVpZC1kZXYiOiAic3VwZXJnZnhjdGwtZ2V4LWRldkBhc3VzLWxpbnV4Lm9yZyIsCiAgInZlcnNpb24iOiAyMgp9"}, "43": {"version": "21", "sha256": "06hqq7j48wfzq3k607zx7a5126d3xl7miymv2z9qqa8qs650036a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJzdXBlcmdmeGN0bC1nZXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VwZXJnZnhjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjEKfQ=="}}} +, {"uuid": "widgets@aylur", "name": "Aylur's Widgets", "pname": "aylurs-widgets", "description": "My set of extensions: Battery Bar, Dash Board, DateMenu Mod, Media Player, Power Menu, Workspace Indicator, Notification Indicator, Modified Quick Settings, Background Clock.\n Disclaimer: this extension contains copyrighted icons.", "link": "https://extensions.gnome.org/extension/5338/aylurs-widgets/", "shell_version_map": {"42": {"version": "18", "sha256": "1772n3d3q601jkbhv4iwjfxgzy105iz4zr3mbp9zrhyha4xy390s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "43": {"version": "18", "sha256": "1772n3d3q601jkbhv4iwjfxgzy105iz4zr3mbp9zrhyha4xy390s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDE4Cn0="}}} +, {"uuid": "supergfxctl-gex@asus-linux.org", "name": "Super Graphics Control", "pname": "supergfxctl-gex", "description": "supergfxctl-gex is a frontend for supergfxctl that was born inside the asus-linux.org community. supergfxctl is required for this extension to work. It is tested on a variaty of laptops including Intel / Nvidia, AMD / Nvidia, Intel / AMD and AMD / AMD GPU combinations.\n\nIt is a platform agnostic tool for hybrid graphics laptops.\n\nsupergfxctl gets packages by the community for Fedora and Arch. But without much of a hastle can be compiled for every systemd based Linux distribution.\n\nTo learn more about it, please have a look at:\n\nhttps://gitlab.com/asus-linux/supergfxctl\nhttps://asus-linux.org/", "link": "https://extensions.gnome.org/extension/5344/supergfxctl-gex/", "shell_version_map": {"40": {"version": "22", "sha256": "04g3fjpdblxh25jlygzww79a6zzzrhgs113575jrnmwcrxq4vgmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "41": {"version": "22", "sha256": "04g3fjpdblxh25jlygzww79a6zzzrhgs113575jrnmwcrxq4vgmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "04g3fjpdblxh25jlygzww79a6zzzrhgs113575jrnmwcrxq4vgmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "24", "sha256": "1xd0mlbca2cg6nxysv8x4kiqkwsb3dw3qw3rv87i81b6n5v26y7q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAic3VwZXJnZnhjdGwiOiAiNS4wLjEiLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzdXBlcmdmeGN0bC1nZXhAYXN1cy1saW51eC5vcmciLAogICJ1dWlkLWRldiI6ICJzdXBlcmdmeGN0bC1nZXgtZGV2QGFzdXMtbGludXgub3JnIiwKICAidmVyc2lvbiI6IDI0Cn0="}}} , {"uuid": "dotspaces@charlieqle", "name": "Dotspaces", "pname": "dotspaces", "description": "A simple workspace switcher", "link": "https://extensions.gnome.org/extension/5347/dotspaces/", "shell_version_map": {"42": {"version": "6", "sha256": "1drw6hyhc9cfwyz49xbspyh42k9pgwvwnlmqbkcxskn7ljjxw5lp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHdvcmtzcGFjZSBzd2l0Y2hlciIsCiAgIm5hbWUiOiAiRG90c3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRvdHNwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hhcmxpZVFMZS9nbm9tZS1leHRlbnNpb24tZG90c3BhY2VzIiwKICAidXVpZCI6ICJkb3RzcGFjZXNAY2hhcmxpZXFsZSIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "1drw6hyhc9cfwyz49xbspyh42k9pgwvwnlmqbkcxskn7ljjxw5lp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHdvcmtzcGFjZSBzd2l0Y2hlciIsCiAgIm5hbWUiOiAiRG90c3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRvdHNwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hhcmxpZVFMZS9nbm9tZS1leHRlbnNpb24tZG90c3BhY2VzIiwKICAidXVpZCI6ICJkb3RzcGFjZXNAY2hhcmxpZXFsZSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "window-state-manager@kishorv06.github.io", "name": "Window State Manager", "pname": "window-state-manager", "description": "Automatically remember and restore window state and positions. Useful when using Gnome with wayland in a multi-monitor setup. Some applications won't remember their location when monitors are connected or disconnected. This extension solves that problem by saving window state periodically and restoring it when screen arrangement is changed.", "link": "https://extensions.gnome.org/extension/5353/window-state-manager/", "shell_version_map": {"42": {"version": "3", "sha256": "0f6mcn8kkgkdhaa354jy1hhn474iw6f99wbq4pn5y8qdvc12wzsh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcmVtZW1iZXIgYW5kIHJlc3RvcmUgd2luZG93IHN0YXRlIGFuZCBwb3NpdGlvbnMuIFVzZWZ1bCB3aGVuIHVzaW5nIEdub21lIHdpdGggd2F5bGFuZCBpbiBhIG11bHRpLW1vbml0b3Igc2V0dXAuIFNvbWUgYXBwbGljYXRpb25zIHdvbid0IHJlbWVtYmVyIHRoZWlyIGxvY2F0aW9uIHdoZW4gbW9uaXRvcnMgYXJlIGNvbm5lY3RlZCBvciBkaXNjb25uZWN0ZWQuIFRoaXMgZXh0ZW5zaW9uIHNvbHZlcyB0aGF0IHByb2JsZW0gYnkgc2F2aW5nIHdpbmRvdyBzdGF0ZSBwZXJpb2RpY2FsbHkgYW5kIHJlc3RvcmluZyBpdCB3aGVuIHNjcmVlbiBhcnJhbmdlbWVudCBpcyBjaGFuZ2VkLiIsCiAgIm5hbWUiOiAiV2luZG93IFN0YXRlIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tpc2hvcnYwNi93aW5kb3ctc3RhdGUtbWFuYWdlciIsCiAgInV1aWQiOiAid2luZG93LXN0YXRlLW1hbmFnZXJAa2lzaG9ydjA2LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "0f6mcn8kkgkdhaa354jy1hhn474iw6f99wbq4pn5y8qdvc12wzsh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcmVtZW1iZXIgYW5kIHJlc3RvcmUgd2luZG93IHN0YXRlIGFuZCBwb3NpdGlvbnMuIFVzZWZ1bCB3aGVuIHVzaW5nIEdub21lIHdpdGggd2F5bGFuZCBpbiBhIG11bHRpLW1vbml0b3Igc2V0dXAuIFNvbWUgYXBwbGljYXRpb25zIHdvbid0IHJlbWVtYmVyIHRoZWlyIGxvY2F0aW9uIHdoZW4gbW9uaXRvcnMgYXJlIGNvbm5lY3RlZCBvciBkaXNjb25uZWN0ZWQuIFRoaXMgZXh0ZW5zaW9uIHNvbHZlcyB0aGF0IHByb2JsZW0gYnkgc2F2aW5nIHdpbmRvdyBzdGF0ZSBwZXJpb2RpY2FsbHkgYW5kIHJlc3RvcmluZyBpdCB3aGVuIHNjcmVlbiBhcnJhbmdlbWVudCBpcyBjaGFuZ2VkLiIsCiAgIm5hbWUiOiAiV2luZG93IFN0YXRlIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tpc2hvcnYwNi93aW5kb3ctc3RhdGUtbWFuYWdlciIsCiAgInV1aWQiOiAid2luZG93LXN0YXRlLW1hbmFnZXJAa2lzaG9ydjA2LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "vpn-status@peterroux.com", "name": "VPN Status", "pname": "vpn-status", "description": "A VPN Status indicator.", "link": "https://extensions.gnome.org/extension/5356/vpn-status/", "shell_version_map": {"38": {"version": "2", "sha256": "09qfrs7wi5sn8dgz7806x3wqfyq62f1gfl0jfwwnypkmcqc7rigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVlBOIFN0YXR1cyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJWUE4gU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidnBuLXN0YXR1c0BwZXRlcnJvdXguY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "09qfrs7wi5sn8dgz7806x3wqfyq62f1gfl0jfwwnypkmcqc7rigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVlBOIFN0YXR1cyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJWUE4gU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidnBuLXN0YXR1c0BwZXRlcnJvdXguY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "09qfrs7wi5sn8dgz7806x3wqfyq62f1gfl0jfwwnypkmcqc7rigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVlBOIFN0YXR1cyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJWUE4gU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidnBuLXN0YXR1c0BwZXRlcnJvdXguY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "smartlock@huy.im", "name": "Bluetooth Smart Lock", "pname": "bluetooth-smart-lock", "description": "Dynamic lock for GNOME. Use your smart phone/watch/band to lock your desktop automatically when you step away.\n\nWhen your device is out of bluetooth range or get disconnected, it will lock your desktop automatically.", "link": "https://extensions.gnome.org/extension/5359/bluetooth-smart-lock/", "shell_version_map": {"42": {"version": "13", "sha256": "1bajl6xmnv2lb7vh4wc8i02g9kqac9ljq31f035nshha4p324b6z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkR5bmFtaWMgbG9jayBmb3IgR05PTUUuIFVzZSB5b3VyIHNtYXJ0IHBob25lL3dhdGNoL2JhbmQgdG8gbG9jayB5b3VyIGRlc2t0b3AgYXV0b21hdGljYWxseSB3aGVuIHlvdSBzdGVwIGF3YXkuXG5cbldoZW4geW91ciBkZXZpY2UgaXMgb3V0IG9mIGJsdWV0b290aCByYW5nZSBvciBnZXQgZGlzY29ubmVjdGVkLCBpdCB3aWxsIGxvY2sgeW91ciBkZXNrdG9wIGF1dG9tYXRpY2FsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXNtYXJ0bG9jayIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIFNtYXJ0IExvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmx1ZXRvb3RoX3NtYXJ0bG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmEwZjMvZ25vbWUtYmx1ZXRvb3RoLXNtYXJ0bG9jayIsCiAgInV1aWQiOiAic21hcnRsb2NrQGh1eS5pbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "43": {"version": "13", "sha256": "1bajl6xmnv2lb7vh4wc8i02g9kqac9ljq31f035nshha4p324b6z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkR5bmFtaWMgbG9jayBmb3IgR05PTUUuIFVzZSB5b3VyIHNtYXJ0IHBob25lL3dhdGNoL2JhbmQgdG8gbG9jayB5b3VyIGRlc2t0b3AgYXV0b21hdGljYWxseSB3aGVuIHlvdSBzdGVwIGF3YXkuXG5cbldoZW4geW91ciBkZXZpY2UgaXMgb3V0IG9mIGJsdWV0b290aCByYW5nZSBvciBnZXQgZGlzY29ubmVjdGVkLCBpdCB3aWxsIGxvY2sgeW91ciBkZXNrdG9wIGF1dG9tYXRpY2FsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXNtYXJ0bG9jayIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIFNtYXJ0IExvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmx1ZXRvb3RoX3NtYXJ0bG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmEwZjMvZ25vbWUtYmx1ZXRvb3RoLXNtYXJ0bG9jayIsCiAgInV1aWQiOiAic21hcnRsb2NrQGh1eS5pbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} -, {"uuid": "gnome-wireguard-extension@SJBERTRAND.github.com", "name": "WireGuard-VPN-extension", "pname": "wireguard-vpn-extension", "description": "Enable/Disable Wireguard tunnels", "link": "https://extensions.gnome.org/extension/5362/wireguard-vpn-extension/", "shell_version_map": {"42": {"version": "5", "sha256": "0xl60kd28kvsdgci2kr80chxpybhwf9fxjzrmxjp6p04icrmy68z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIFdpcmVndWFyZCB0dW5uZWxzIiwKICAibmFtZSI6ICJXaXJlR3VhcmQtVlBOLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU0pCRVJUUkFORC9nbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "43": {"version": "5", "sha256": "0xl60kd28kvsdgci2kr80chxpybhwf9fxjzrmxjp6p04icrmy68z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIFdpcmVndWFyZCB0dW5uZWxzIiwKICAibmFtZSI6ICJXaXJlR3VhcmQtVlBOLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU0pCRVJUUkFORC9nbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} +, {"uuid": "gnome-wireguard-extension@SJBERTRAND.github.com", "name": "WireGuard-VPN-extension", "pname": "wireguard-vpn-extension", "description": "Enable/Disable Wireguard tunnels", "link": "https://extensions.gnome.org/extension/5362/wireguard-vpn-extension/", "shell_version_map": {"42": {"version": "6", "sha256": "19mdv9ngz73jnp1k55kg8d8nsn4yd4rfbxz3rnjsh3a85zh0hb6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIFdpcmVndWFyZCB0dW5uZWxzIiwKICAibmFtZSI6ICJXaXJlR3VhcmQtVlBOLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU0pCRVJUUkFORC9nbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "19mdv9ngz73jnp1k55kg8d8nsn4yd4rfbxz3rnjsh3a85zh0hb6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIFdpcmVndWFyZCB0dW5uZWxzIiwKICAibmFtZSI6ICJXaXJlR3VhcmQtVlBOLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU0pCRVJUUkFORC9nbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "memento-mori@paveloom", "name": "Memento Mori", "pname": "memento-mori", "description": "Make every second of your life count. Literally!\n\nThis extension adds a counter to the panel which counts down the time you have left based on your birthday and life expectancy.", "link": "https://extensions.gnome.org/extension/5365/memento-mori/", "shell_version_map": {"42": {"version": "6", "sha256": "1psx0n9lzdyh36kh4i334hmpy61fbr8blmrz8qqlzgivj2abg022", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgZXZlcnkgc2Vjb25kIG9mIHlvdXIgbGlmZSBjb3VudC4gTGl0ZXJhbGx5IVxuXG5UaGlzIGV4dGVuc2lvbiBhZGRzIGEgY291bnRlciB0byB0aGUgcGFuZWwgd2hpY2ggY291bnRzIGRvd24gdGhlIHRpbWUgeW91IGhhdmUgbGVmdCBiYXNlZCBvbiB5b3VyIGJpcnRoZGF5IGFuZCBsaWZlIGV4cGVjdGFuY3kuIiwKICAibmFtZSI6ICJNZW1lbnRvIE1vcmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVtZW50by1tb3JpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXZlbG9vbS10L2dub21lLXNoZWxsLW1lbWVudG8tbW9yaSIsCiAgInV1aWQiOiAibWVtZW50by1tb3JpQHBhdmVsb29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "43": {"version": "6", "sha256": "1psx0n9lzdyh36kh4i334hmpy61fbr8blmrz8qqlzgivj2abg022", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgZXZlcnkgc2Vjb25kIG9mIHlvdXIgbGlmZSBjb3VudC4gTGl0ZXJhbGx5IVxuXG5UaGlzIGV4dGVuc2lvbiBhZGRzIGEgY291bnRlciB0byB0aGUgcGFuZWwgd2hpY2ggY291bnRzIGRvd24gdGhlIHRpbWUgeW91IGhhdmUgbGVmdCBiYXNlZCBvbiB5b3VyIGJpcnRoZGF5IGFuZCBsaWZlIGV4cGVjdGFuY3kuIiwKICAibmFtZSI6ICJNZW1lbnRvIE1vcmkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVtZW50by1tb3JpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXZlbG9vbS10L2dub21lLXNoZWxsLW1lbWVudG8tbW9yaSIsCiAgInV1aWQiOiAibWVtZW50by1tb3JpQHBhdmVsb29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} -, {"uuid": "external-ip-extension@ipcan.cyou", "name": "Show External IP", "pname": "show-external-ip-thisipcancyou", "description": "Displays your external IP in the Toolbar and sends a system notification if changed. \n\nThis extension is handy for those work at different locations or with different VPNs to quickly see your public IP and country. It uses the free thisipcan.cyou service to check at regular intervals and whenever computer network events occur (like switching networks or locations).", "link": "https://extensions.gnome.org/extension/5368/show-external-ip-thisipcancyou/", "shell_version_map": {"40": {"version": "14", "sha256": "17nnifzz3axvp8q94wz2zra8aqmp0ikbw0d9nw11y4v7za0f4632", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgZXh0ZXJuYWwgSVAgaW4gdGhlIFRvb2xiYXIgYW5kIHNlbmRzIGEgc3lzdGVtIG5vdGlmaWNhdGlvbiBpZiBjaGFuZ2VkLiBcblxuVGhpcyBleHRlbnNpb24gaXMgaGFuZHkgZm9yIHRob3NlIHdvcmsgYXQgZGlmZmVyZW50IGxvY2F0aW9ucyBvciB3aXRoIGRpZmZlcmVudCBWUE5zIHRvIHF1aWNrbHkgc2VlIHlvdXIgcHVibGljIElQIGFuZCBjb3VudHJ5LiBJdCB1c2VzIHRoZSBmcmVlIHRoaXNpcGNhbi5jeW91IHNlcnZpY2UgdG8gY2hlY2sgYXQgcmVndWxhciBpbnRlcnZhbHMgYW5kIHdoZW5ldmVyIGNvbXB1dGVyIG5ldHdvcmsgZXZlbnRzIG9jY3VyIChsaWtlIHN3aXRjaGluZyBuZXR3b3JrcyBvciBsb2NhdGlvbnMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVybmFsLWlwLW5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiU2hvdyBFeHRlcm5hbCBJUCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL3RoaXNpcGNhbi5jeW91IiwKICAidXVpZCI6ICJleHRlcm5hbC1pcC1leHRlbnNpb25AaXBjYW4uY3lvdSIsCiAgInZlcnNpb24iOiAxNAp9"}, "41": {"version": "14", "sha256": "17nnifzz3axvp8q94wz2zra8aqmp0ikbw0d9nw11y4v7za0f4632", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgZXh0ZXJuYWwgSVAgaW4gdGhlIFRvb2xiYXIgYW5kIHNlbmRzIGEgc3lzdGVtIG5vdGlmaWNhdGlvbiBpZiBjaGFuZ2VkLiBcblxuVGhpcyBleHRlbnNpb24gaXMgaGFuZHkgZm9yIHRob3NlIHdvcmsgYXQgZGlmZmVyZW50IGxvY2F0aW9ucyBvciB3aXRoIGRpZmZlcmVudCBWUE5zIHRvIHF1aWNrbHkgc2VlIHlvdXIgcHVibGljIElQIGFuZCBjb3VudHJ5LiBJdCB1c2VzIHRoZSBmcmVlIHRoaXNpcGNhbi5jeW91IHNlcnZpY2UgdG8gY2hlY2sgYXQgcmVndWxhciBpbnRlcnZhbHMgYW5kIHdoZW5ldmVyIGNvbXB1dGVyIG5ldHdvcmsgZXZlbnRzIG9jY3VyIChsaWtlIHN3aXRjaGluZyBuZXR3b3JrcyBvciBsb2NhdGlvbnMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVybmFsLWlwLW5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiU2hvdyBFeHRlcm5hbCBJUCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL3RoaXNpcGNhbi5jeW91IiwKICAidXVpZCI6ICJleHRlcm5hbC1pcC1leHRlbnNpb25AaXBjYW4uY3lvdSIsCiAgInZlcnNpb24iOiAxNAp9"}, "42": {"version": "14", "sha256": "17nnifzz3axvp8q94wz2zra8aqmp0ikbw0d9nw11y4v7za0f4632", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgZXh0ZXJuYWwgSVAgaW4gdGhlIFRvb2xiYXIgYW5kIHNlbmRzIGEgc3lzdGVtIG5vdGlmaWNhdGlvbiBpZiBjaGFuZ2VkLiBcblxuVGhpcyBleHRlbnNpb24gaXMgaGFuZHkgZm9yIHRob3NlIHdvcmsgYXQgZGlmZmVyZW50IGxvY2F0aW9ucyBvciB3aXRoIGRpZmZlcmVudCBWUE5zIHRvIHF1aWNrbHkgc2VlIHlvdXIgcHVibGljIElQIGFuZCBjb3VudHJ5LiBJdCB1c2VzIHRoZSBmcmVlIHRoaXNpcGNhbi5jeW91IHNlcnZpY2UgdG8gY2hlY2sgYXQgcmVndWxhciBpbnRlcnZhbHMgYW5kIHdoZW5ldmVyIGNvbXB1dGVyIG5ldHdvcmsgZXZlbnRzIG9jY3VyIChsaWtlIHN3aXRjaGluZyBuZXR3b3JrcyBvciBsb2NhdGlvbnMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVybmFsLWlwLW5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiU2hvdyBFeHRlcm5hbCBJUCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL3RoaXNpcGNhbi5jeW91IiwKICAidXVpZCI6ICJleHRlcm5hbC1pcC1leHRlbnNpb25AaXBjYW4uY3lvdSIsCiAgInZlcnNpb24iOiAxNAp9"}}} +, {"uuid": "external-ip-extension@ipcan.cyou", "name": "Show External IP", "pname": "show-external-ip-thisipcancyou", "description": "Displays your external IP in the Toolbar and sends a system notification if changed. \n\nThis extension is handy for those work at different locations or with different VPNs to quickly see your public IP and country. It uses the free thisipcan.cyou service to check at regular intervals and whenever computer network events occur (like switching networks or locations).", "link": "https://extensions.gnome.org/extension/5368/show-external-ip-thisipcancyou/", "shell_version_map": {"40": {"version": "15", "sha256": "0k4jlhdhfv46f12wa112yw81kp4fmz2g2mj772vjbqb7cid7gdf1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgZXh0ZXJuYWwgSVAgaW4gdGhlIFRvb2xiYXIgYW5kIHNlbmRzIGEgc3lzdGVtIG5vdGlmaWNhdGlvbiBpZiBjaGFuZ2VkLiBcblxuVGhpcyBleHRlbnNpb24gaXMgaGFuZHkgZm9yIHRob3NlIHdvcmsgYXQgZGlmZmVyZW50IGxvY2F0aW9ucyBvciB3aXRoIGRpZmZlcmVudCBWUE5zIHRvIHF1aWNrbHkgc2VlIHlvdXIgcHVibGljIElQIGFuZCBjb3VudHJ5LiBJdCB1c2VzIHRoZSBmcmVlIHRoaXNpcGNhbi5jeW91IHNlcnZpY2UgdG8gY2hlY2sgYXQgcmVndWxhciBpbnRlcnZhbHMgYW5kIHdoZW5ldmVyIGNvbXB1dGVyIG5ldHdvcmsgZXZlbnRzIG9jY3VyIChsaWtlIHN3aXRjaGluZyBuZXR3b3JrcyBvciBsb2NhdGlvbnMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVybmFsLWlwLW5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiU2hvdyBFeHRlcm5hbCBJUCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jd2l0dGVuYmVyZy90aGlzaXBjYW4uY3lvdSIsCiAgInV1aWQiOiAiZXh0ZXJuYWwtaXAtZXh0ZW5zaW9uQGlwY2FuLmN5b3UiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "15", "sha256": "0k4jlhdhfv46f12wa112yw81kp4fmz2g2mj772vjbqb7cid7gdf1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgZXh0ZXJuYWwgSVAgaW4gdGhlIFRvb2xiYXIgYW5kIHNlbmRzIGEgc3lzdGVtIG5vdGlmaWNhdGlvbiBpZiBjaGFuZ2VkLiBcblxuVGhpcyBleHRlbnNpb24gaXMgaGFuZHkgZm9yIHRob3NlIHdvcmsgYXQgZGlmZmVyZW50IGxvY2F0aW9ucyBvciB3aXRoIGRpZmZlcmVudCBWUE5zIHRvIHF1aWNrbHkgc2VlIHlvdXIgcHVibGljIElQIGFuZCBjb3VudHJ5LiBJdCB1c2VzIHRoZSBmcmVlIHRoaXNpcGNhbi5jeW91IHNlcnZpY2UgdG8gY2hlY2sgYXQgcmVndWxhciBpbnRlcnZhbHMgYW5kIHdoZW5ldmVyIGNvbXB1dGVyIG5ldHdvcmsgZXZlbnRzIG9jY3VyIChsaWtlIHN3aXRjaGluZyBuZXR3b3JrcyBvciBsb2NhdGlvbnMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVybmFsLWlwLW5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiU2hvdyBFeHRlcm5hbCBJUCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jd2l0dGVuYmVyZy90aGlzaXBjYW4uY3lvdSIsCiAgInV1aWQiOiAiZXh0ZXJuYWwtaXAtZXh0ZW5zaW9uQGlwY2FuLmN5b3UiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "42": {"version": "15", "sha256": "0k4jlhdhfv46f12wa112yw81kp4fmz2g2mj772vjbqb7cid7gdf1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgZXh0ZXJuYWwgSVAgaW4gdGhlIFRvb2xiYXIgYW5kIHNlbmRzIGEgc3lzdGVtIG5vdGlmaWNhdGlvbiBpZiBjaGFuZ2VkLiBcblxuVGhpcyBleHRlbnNpb24gaXMgaGFuZHkgZm9yIHRob3NlIHdvcmsgYXQgZGlmZmVyZW50IGxvY2F0aW9ucyBvciB3aXRoIGRpZmZlcmVudCBWUE5zIHRvIHF1aWNrbHkgc2VlIHlvdXIgcHVibGljIElQIGFuZCBjb3VudHJ5LiBJdCB1c2VzIHRoZSBmcmVlIHRoaXNpcGNhbi5jeW91IHNlcnZpY2UgdG8gY2hlY2sgYXQgcmVndWxhciBpbnRlcnZhbHMgYW5kIHdoZW5ldmVyIGNvbXB1dGVyIG5ldHdvcmsgZXZlbnRzIG9jY3VyIChsaWtlIHN3aXRjaGluZyBuZXR3b3JrcyBvciBsb2NhdGlvbnMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVybmFsLWlwLW5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiU2hvdyBFeHRlcm5hbCBJUCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jd2l0dGVuYmVyZy90aGlzaXBjYW4uY3lvdSIsCiAgInV1aWQiOiAiZXh0ZXJuYWwtaXAtZXh0ZW5zaW9uQGlwY2FuLmN5b3UiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "43": {"version": "15", "sha256": "0k4jlhdhfv46f12wa112yw81kp4fmz2g2mj772vjbqb7cid7gdf1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgZXh0ZXJuYWwgSVAgaW4gdGhlIFRvb2xiYXIgYW5kIHNlbmRzIGEgc3lzdGVtIG5vdGlmaWNhdGlvbiBpZiBjaGFuZ2VkLiBcblxuVGhpcyBleHRlbnNpb24gaXMgaGFuZHkgZm9yIHRob3NlIHdvcmsgYXQgZGlmZmVyZW50IGxvY2F0aW9ucyBvciB3aXRoIGRpZmZlcmVudCBWUE5zIHRvIHF1aWNrbHkgc2VlIHlvdXIgcHVibGljIElQIGFuZCBjb3VudHJ5LiBJdCB1c2VzIHRoZSBmcmVlIHRoaXNpcGNhbi5jeW91IHNlcnZpY2UgdG8gY2hlY2sgYXQgcmVndWxhciBpbnRlcnZhbHMgYW5kIHdoZW5ldmVyIGNvbXB1dGVyIG5ldHdvcmsgZXZlbnRzIG9jY3VyIChsaWtlIHN3aXRjaGluZyBuZXR3b3JrcyBvciBsb2NhdGlvbnMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVybmFsLWlwLW5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiU2hvdyBFeHRlcm5hbCBJUCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jd2l0dGVuYmVyZy90aGlzaXBjYW4uY3lvdSIsCiAgInV1aWQiOiAiZXh0ZXJuYWwtaXAtZXh0ZW5zaW9uQGlwY2FuLmN5b3UiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} , {"uuid": "usd-bra@bramba.github.com", "name": "USD-BRA", "pname": "usd-bra", "description": "An easy and clean viewer of USD -> BRL currency. In which it is easy to understand if the currency is increasing or decreasing.", "link": "https://extensions.gnome.org/extension/5371/usd-bra/", "shell_version_map": {"42": {"version": "4", "sha256": "125ch4b675zddx46lj59f4jb8g5s6mq4aqv3vk21bbmnb05zzk5r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgYW5kIGNsZWFuIHZpZXdlciBvZiBVU0QgLT4gQlJMIGN1cnJlbmN5LiBJbiB3aGljaCBpdCBpcyBlYXN5IHRvIHVuZGVyc3RhbmQgaWYgdGhlIGN1cnJlbmN5IGlzIGluY3JlYXNpbmcgb3IgZGVjcmVhc2luZy4iLAogICJuYW1lIjogIlVTRC1CUkEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQnJhbWJhNy9VU0QtQlJBIiwKICAidXVpZCI6ICJ1c2QtYnJhQGJyYW1iYS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "gnome-pushover-messages-unofficial@iwont.cyou", "name": "Pushover Message Notifications", "pname": "pushover-message-notifications", "description": "Displays Pushover Notifications within GNOME and within your tray. Privacy respecting unofficial client.", "link": "https://extensions.gnome.org/extension/5377/pushover-message-notifications/", "shell_version_map": {"40": {"version": "7", "sha256": "05wn575gq0ysl6pwsiwlhsqvgr9lvajfajr7psnz5raxccr75jd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3dpdHRlbmJlcmcvZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgInV1aWQiOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbEBpd29udC5jeW91IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "05wn575gq0ysl6pwsiwlhsqvgr9lvajfajr7psnz5raxccr75jd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3dpdHRlbmJlcmcvZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgInV1aWQiOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbEBpd29udC5jeW91IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "05wn575gq0ysl6pwsiwlhsqvgr9lvajfajr7psnz5raxccr75jd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY3dpdHRlbmJlcmcvZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgInV1aWQiOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbEBpd29udC5jeW91IiwKICAidmVyc2lvbiI6IDcKfQ=="}}} -, {"uuid": "notification-filter@asynclink.org", "name": "Notification Filter", "pname": "notification-filter", "description": "Filter out notifications by their text content to block them from appearing.\nIf you've ever been annoyed by certain notifications distracting you, this extension gives you more fine tuned control of which notifications to prevent from showing up.\n\nGives you the ability to filter by both the title and body content, use regex matching, and add multiple different filters.\n\nNote: Only prevents new notifications from appearing, does not remove existing notifications.", "link": "https://extensions.gnome.org/extension/5380/notification-filter/", "shell_version_map": {"40": {"version": "2", "sha256": "1933q2vywyc26kggdrhy0p3p137k0zb2rav4cdzqlz1hz9savjw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3B5YnVnL05vdGlmeUZpbHRlci1Hbm9tZUV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWZpbHRlckBhc3luY2xpbmsub3JnIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "1933q2vywyc26kggdrhy0p3p137k0zb2rav4cdzqlz1hz9savjw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3B5YnVnL05vdGlmeUZpbHRlci1Hbm9tZUV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWZpbHRlckBhc3luY2xpbmsub3JnIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "1933q2vywyc26kggdrhy0p3p137k0zb2rav4cdzqlz1hz9savjw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3B5YnVnL05vdGlmeUZpbHRlci1Hbm9tZUV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWZpbHRlckBhc3luY2xpbmsub3JnIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "gnome-pushover-messages-unofficial@iwont.cyou", "name": "Pushover Message Notifications", "pname": "pushover-message-notifications", "description": "Displays Pushover Notifications within GNOME and within your tray. Privacy respecting unofficial client.", "link": "https://extensions.gnome.org/extension/5377/pushover-message-notifications/", "shell_version_map": {"40": {"version": "8", "sha256": "0q6wzq2m0pjfcgf0jrbf2ygagikdmmgrkx561fw1fb23332v1f8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL2dub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWwiLAogICJ1dWlkIjogImdub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWxAaXdvbnQuY3lvdSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0q6wzq2m0pjfcgf0jrbf2ygagikdmmgrkx561fw1fb23332v1f8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL2dub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWwiLAogICJ1dWlkIjogImdub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWxAaXdvbnQuY3lvdSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "0q6wzq2m0pjfcgf0jrbf2ygagikdmmgrkx561fw1fb23332v1f8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL2dub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWwiLAogICJ1dWlkIjogImdub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWxAaXdvbnQuY3lvdSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "0q6wzq2m0pjfcgf0jrbf2ygagikdmmgrkx561fw1fb23332v1f8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL2dub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWwiLAogICJ1dWlkIjogImdub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWxAaXdvbnQuY3lvdSIsCiAgInZlcnNpb24iOiA4Cn0="}}} +, {"uuid": "notification-filter@asynclink.org", "name": "Notification Filter", "pname": "notification-filter", "description": "Filter out notifications by their text content to block them from appearing.\nIf you've ever been annoyed by certain notifications distracting you, this extension gives you more fine tuned control of which notifications to prevent from showing up.\n\nGives you the ability to filter by both the title and body content, use regex matching, and add multiple different filters.\n\nNote: Only prevents new notifications from appearing, does not remove existing notifications.", "link": "https://extensions.gnome.org/extension/5380/notification-filter/", "shell_version_map": {"40": {"version": "3", "sha256": "19jry9hg34i1i1f3r5v7pg9vplfhf27c1rvrnqqwld4qzpp5g0p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NweWJ1Zy9Ob3RpZnlGaWx0ZXItR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1maWx0ZXJAYXN5bmNsaW5rLm9yZyIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "19jry9hg34i1i1f3r5v7pg9vplfhf27c1rvrnqqwld4qzpp5g0p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NweWJ1Zy9Ob3RpZnlGaWx0ZXItR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1maWx0ZXJAYXN5bmNsaW5rLm9yZyIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "19jry9hg34i1i1f3r5v7pg9vplfhf27c1rvrnqqwld4qzpp5g0p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NweWJ1Zy9Ob3RpZnlGaWx0ZXItR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1maWx0ZXJAYXN5bmNsaW5rLm9yZyIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "19jry9hg34i1i1f3r5v7pg9vplfhf27c1rvrnqqwld4qzpp5g0p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NweWJ1Zy9Ob3RpZnlGaWx0ZXItR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1maWx0ZXJAYXN5bmNsaW5rLm9yZyIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "evpn-assistant@xytrexl.com", "name": "ExpressVPN - EVPN Shell Assistant", "pname": "evpn-shell-assistant", "description": "Allows ExpressVPN to be controlled through the GNOME shell.", "link": "https://extensions.gnome.org/extension/5385/evpn-shell-assistant/", "shell_version_map": {"42": {"version": "3", "sha256": "07ag6pk024xhhbxyrn5vrfmg1qx6rfyf5xnl6fhcp3rardzkakgr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBFeHByZXNzVlBOIHRvIGJlIGNvbnRyb2xsZWQgdGhyb3VnaCB0aGUgR05PTUUgc2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWV2cG4tYXNzaXN0YW50IiwKICAibmFtZSI6ICJFeHByZXNzVlBOIC0gRVZQTiBTaGVsbCBBc3Npc3RhbnQiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiU3R1YXJ0IEdpbG1vdXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXZwbi1hc3Npc3RhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0amFtZXNnaWxtb3VyL2V2cG4tYXNzaXN0YW50IiwKICAidXVpZCI6ICJldnBuLWFzc2lzdGFudEB4eXRyZXhsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "screen-rotate@shyzus.github.io", "name": "Screen Rotate", "pname": "screen-rotate", "description": "Enable screen rotation regardless of touch mode. Fork of Screen Autorotate by Kosmospredanie.", "link": "https://extensions.gnome.org/extension/5389/screen-rotate/", "shell_version_map": {"40": {"version": "8", "sha256": "0xwbwiz203ml083hi5i52872dfhb3kkqx0fvnm9rdm16rs4gnxx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0xwbwiz203ml083hi5i52872dfhb3kkqx0fvnm9rdm16rs4gnxx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "0xwbwiz203ml083hi5i52872dfhb3kkqx0fvnm9rdm16rs4gnxx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "0xwbwiz203ml083hi5i52872dfhb3kkqx0fvnm9rdm16rs4gnxx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}}} -, {"uuid": "devtools@romix.ch", "name": "Dev Tools", "pname": "dev-tools", "description": "Generate random UUID and current time in milliseconds as a shell extension.", "link": "https://extensions.gnome.org/extension/5393/dev-tools/", "shell_version_map": {"42": {"version": "4", "sha256": "0n8n8v003fdf9jg6aqwgpxd6zlgy0ycd26q8yzyc82js3p8w33jj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIHJhbmRvbSBVVUlEIGFuZCBjdXJyZW50IHRpbWUgaW4gbWlsbGlzZWNvbmRzIGFzIGEgc2hlbGwgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiRGV2IFRvb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JvbWl4Y2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRldi10b29scyIsCiAgInV1aWQiOiAiZGV2dG9vbHNAcm9taXguY2giLAogICJ2ZXJzaW9uIjogNAp9"}}} +, {"uuid": "devtools@romix.ch", "name": "Dev Tools", "pname": "dev-tools", "description": "Generate random UUID and current time in milliseconds as a shell extension.", "link": "https://extensions.gnome.org/extension/5393/dev-tools/", "shell_version_map": {"42": {"version": "7", "sha256": "15pvi8vi6dpv53g46cdlcxlnybvvvjw851dzqd810kg3alb2jw81", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIHJhbmRvbSBVVUlEIGFuZCBjdXJyZW50IHRpbWUgaW4gbWlsbGlzZWNvbmRzIGFzIGEgc2hlbGwgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiRGV2IFRvb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yb21peGNoL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZXYtdG9vbHMiLAogICJ1dWlkIjogImRldnRvb2xzQHJvbWl4LmNoIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "43": {"version": "7", "sha256": "15pvi8vi6dpv53g46cdlcxlnybvvvjw851dzqd810kg3alb2jw81", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIHJhbmRvbSBVVUlEIGFuZCBjdXJyZW50IHRpbWUgaW4gbWlsbGlzZWNvbmRzIGFzIGEgc2hlbGwgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiRGV2IFRvb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yb21peGNoL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZXYtdG9vbHMiLAogICJ1dWlkIjogImRldnRvb2xzQHJvbWl4LmNoIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "inhibit-suspend@charlieqle", "name": "Inhibit Suspend", "pname": "inhibit-suspend", "description": "Inhibit autosuspend at the press of a button", "link": "https://extensions.gnome.org/extension/5397/inhibit-suspend/", "shell_version_map": {"43": {"version": "3", "sha256": "0xp3b7i46lsvxkgsk3z3lx1k1zymnwm8hnsl1v39j01zsxyh2fnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluaGliaXQgYXV0b3N1c3BlbmQgYXQgdGhlIHByZXNzIG9mIGEgYnV0dG9uIiwKICAibmFtZSI6ICJJbmhpYml0IFN1c3BlbmQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW5oaWJpdC1zdXNwZW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NoYXJsaWVRTGUvZ25vbWUtZXh0ZW5zaW9uLWluaGliaXQtc3VzcGVuZCIsCiAgInV1aWQiOiAiaW5oaWJpdC1zdXNwZW5kQGNoYXJsaWVxbGUiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "gtk3-theme-switcher@charlieqle", "name": "GTK3 Theme Switcher", "pname": "gtk3-theme-switcher", "description": "A simple GTK 3.0 theme switcher", "link": "https://extensions.gnome.org/extension/5401/gtk3-theme-switcher/", "shell_version_map": {"42": {"version": "1", "sha256": "1vm6hcjgq5mzibrwx9dm6iyiz6hmp5vm3qi8jj1w28ylhrvr7hfb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdUSyAzLjAgdGhlbWUgc3dpdGNoZXIiLAogICJuYW1lIjogIkdUSzMgVGhlbWUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrMy10aGVtZS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hhcmxpZVFMZS9nbm9tZS1leHRlbnNpb24tZ3RrMy10aGVtZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZ3RrMy10aGVtZS1zd2l0Y2hlckBjaGFybGllcWxlIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "43": {"version": "1", "sha256": "1vm6hcjgq5mzibrwx9dm6iyiz6hmp5vm3qi8jj1w28ylhrvr7hfb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdUSyAzLjAgdGhlbWUgc3dpdGNoZXIiLAogICJuYW1lIjogIkdUSzMgVGhlbWUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrMy10aGVtZS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hhcmxpZVFMZS9nbm9tZS1leHRlbnNpb24tZ3RrMy10aGVtZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZ3RrMy10aGVtZS1zd2l0Y2hlckBjaGFybGllcWxlIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "grand-theft-focus@zalckos.github.com", "name": "Grand Theft Focus", "pname": "grand-theft-focus", "description": "Removes the 'Window is ready' notification and brings the window into focus instead.", "link": "https://extensions.gnome.org/extension/5410/grand-theft-focus/", "shell_version_map": {"40": {"version": "2", "sha256": "0slaqwhzk7y4z11s59y6x8qahsaahfs63z4v2n7ms45ri3387qmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phbGNrb3MvR3JhbmRUaGVmdEZvY3VzIiwKICAidXVpZCI6ICJncmFuZC10aGVmdC1mb2N1c0B6YWxja29zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "0slaqwhzk7y4z11s59y6x8qahsaahfs63z4v2n7ms45ri3387qmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phbGNrb3MvR3JhbmRUaGVmdEZvY3VzIiwKICAidXVpZCI6ICJncmFuZC10aGVmdC1mb2N1c0B6YWxja29zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "0slaqwhzk7y4z11s59y6x8qahsaahfs63z4v2n7ms45ri3387qmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phbGNrb3MvR3JhbmRUaGVmdEZvY3VzIiwKICAidXVpZCI6ICJncmFuZC10aGVmdC1mb2N1c0B6YWxja29zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "0slaqwhzk7y4z11s59y6x8qahsaahfs63z4v2n7ms45ri3387qmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phbGNrb3MvR3JhbmRUaGVmdEZvY3VzIiwKICAidXVpZCI6ICJncmFuZC10aGVmdC1mb2N1c0B6YWxja29zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} -, {"uuid": "wifiqrcode@glerro.pm.me", "name": "Wifi QrCode", "pname": "wifi-qrcode", "description": "This extension add a switch to the WiFi menu, in the GNOME system menu, that show a QrCode of the active connection.\n\nThis can be useful for quickly connecting devices capable of reading QrCode and applying the settings to the system, without having to type in the name and the password of the WiFi. (e.g. Android Smartphone).", "link": "https://extensions.gnome.org/extension/5416/wifi-qrcode/", "shell_version_map": {"40": {"version": "1", "sha256": "1nvi0miv40l31an8xvkbkja8v249mhzj7gdivypiik7i4mq7r6l4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFyQ29kZSBvZiB0aGUgYWN0aXZlIGNvbm5lY3Rpb24uXG5cblRoaXMgY2FuIGJlIHVzZWZ1bCBmb3IgcXVpY2tseSBjb25uZWN0aW5nIGRldmljZXMgY2FwYWJsZSBvZiByZWFkaW5nIFFyQ29kZSBhbmQgYXBwbHlpbmcgdGhlIHNldHRpbmdzIHRvIHRoZSBzeXN0ZW0sIHdpdGhvdXQgaGF2aW5nIHRvIHR5cGUgaW4gdGhlIG5hbWUgYW5kIHRoZSBwYXNzd29yZCBvZiB0aGUgV2lGaS4gKGUuZy4gQW5kcm9pZCBTbWFydHBob25lKS4iLAogICJuYW1lIjogIldpZmkgUXJDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "1nvi0miv40l31an8xvkbkja8v249mhzj7gdivypiik7i4mq7r6l4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFyQ29kZSBvZiB0aGUgYWN0aXZlIGNvbm5lY3Rpb24uXG5cblRoaXMgY2FuIGJlIHVzZWZ1bCBmb3IgcXVpY2tseSBjb25uZWN0aW5nIGRldmljZXMgY2FwYWJsZSBvZiByZWFkaW5nIFFyQ29kZSBhbmQgYXBwbHlpbmcgdGhlIHNldHRpbmdzIHRvIHRoZSBzeXN0ZW0sIHdpdGhvdXQgaGF2aW5nIHRvIHR5cGUgaW4gdGhlIG5hbWUgYW5kIHRoZSBwYXNzd29yZCBvZiB0aGUgV2lGaS4gKGUuZy4gQW5kcm9pZCBTbWFydHBob25lKS4iLAogICJuYW1lIjogIldpZmkgUXJDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMQp9"}, "42": {"version": "1", "sha256": "1nvi0miv40l31an8xvkbkja8v249mhzj7gdivypiik7i4mq7r6l4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFyQ29kZSBvZiB0aGUgYWN0aXZlIGNvbm5lY3Rpb24uXG5cblRoaXMgY2FuIGJlIHVzZWZ1bCBmb3IgcXVpY2tseSBjb25uZWN0aW5nIGRldmljZXMgY2FwYWJsZSBvZiByZWFkaW5nIFFyQ29kZSBhbmQgYXBwbHlpbmcgdGhlIHNldHRpbmdzIHRvIHRoZSBzeXN0ZW0sIHdpdGhvdXQgaGF2aW5nIHRvIHR5cGUgaW4gdGhlIG5hbWUgYW5kIHRoZSBwYXNzd29yZCBvZiB0aGUgV2lGaS4gKGUuZy4gQW5kcm9pZCBTbWFydHBob25lKS4iLAogICJuYW1lIjogIldpZmkgUXJDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMQp9"}, "43": {"version": "1", "sha256": "1nvi0miv40l31an8xvkbkja8v249mhzj7gdivypiik7i4mq7r6l4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFyQ29kZSBvZiB0aGUgYWN0aXZlIGNvbm5lY3Rpb24uXG5cblRoaXMgY2FuIGJlIHVzZWZ1bCBmb3IgcXVpY2tseSBjb25uZWN0aW5nIGRldmljZXMgY2FwYWJsZSBvZiByZWFkaW5nIFFyQ29kZSBhbmQgYXBwbHlpbmcgdGhlIHNldHRpbmdzIHRvIHRoZSBzeXN0ZW0sIHdpdGhvdXQgaGF2aW5nIHRvIHR5cGUgaW4gdGhlIG5hbWUgYW5kIHRoZSBwYXNzd29yZCBvZiB0aGUgV2lGaS4gKGUuZy4gQW5kcm9pZCBTbWFydHBob25lKS4iLAogICJuYW1lIjogIldpZmkgUXJDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"uuid": "wifiqrcode@glerro.pm.me", "name": "Wifi QR Code", "pname": "wifi-qrcode", "description": "This extension add a switch to the WiFi menu, in the GNOME system menu, that show a QR Code of the active connection.\n\nThis can be useful for quickly connecting devices capable of reading QR Code and applying the settings to the system, without having to type in the name and the password of the WiFi. (e.g. Android Smartphone).", "link": "https://extensions.gnome.org/extension/5416/wifi-qrcode/", "shell_version_map": {"40": {"version": "3", "sha256": "1yxfmqbyqi9mn48zhmqakgi2r3z9axcmiy643br0n27pfcrfca9s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiIsCiAgIm5hbWUiOiAiV2lmaSBRUiBDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1yxfmqbyqi9mn48zhmqakgi2r3z9axcmiy643br0n27pfcrfca9s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiIsCiAgIm5hbWUiOiAiV2lmaSBRUiBDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "1yxfmqbyqi9mn48zhmqakgi2r3z9axcmiy643br0n27pfcrfca9s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiIsCiAgIm5hbWUiOiAiV2lmaSBRUiBDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "1yxfmqbyqi9mn48zhmqakgi2r3z9axcmiy643br0n27pfcrfca9s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiIsCiAgIm5hbWUiOiAiV2lmaSBRUiBDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "eos-desktop@endlessm.com", "name": "Endless Desktop", "pname": "endless-desktop", "description": "Endless OS signature desktop", "link": "https://extensions.gnome.org/extension/5419/endless-desktop/", "shell_version_map": {"41": {"version": "2", "sha256": "07wg7nab34bvhqnlfdni622c5r3pvlq04dly8spk53nxdwvisckr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuZGxlc3MgT1Mgc2lnbmF0dXJlIGRlc2t0b3AiLAogICJuYW1lIjogIkVuZGxlc3MgRGVza3RvcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJjb20uZW5kbGVzc20uZGVza3RvcC1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VuZGxlc3NtL2Vvcy1kZXNrdG9wLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZW9zLWRlc2t0b3BAZW5kbGVzc20uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "07wg7nab34bvhqnlfdni622c5r3pvlq04dly8spk53nxdwvisckr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuZGxlc3MgT1Mgc2lnbmF0dXJlIGRlc2t0b3AiLAogICJuYW1lIjogIkVuZGxlc3MgRGVza3RvcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJjb20uZW5kbGVzc20uZGVza3RvcC1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VuZGxlc3NtL2Vvcy1kZXNrdG9wLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZW9zLWRlc2t0b3BAZW5kbGVzc20uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "batterytime@typeof.pw", "name": "Battery Time", "pname": "battery-time", "description": "Get estimated battery remaining time back on quick menu.\n\nWhen computer is on battery or is charging, the remaining time or time to full will be shown in quick menu.", "link": "https://extensions.gnome.org/extension/5425/battery-time/", "shell_version_map": {"43": {"version": "1", "sha256": "1wv56yaws3vrpwp0hr7s9gb4w8kwrnwhirwd7k3i5vvf7w707d3j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBlc3RpbWF0ZWQgYmF0dGVyeSByZW1haW5pbmcgdGltZSBiYWNrIG9uIHF1aWNrIG1lbnUuXG5cbldoZW4gY29tcHV0ZXIgaXMgb24gYmF0dGVyeSBvciBpcyBjaGFyZ2luZywgdGhlIHJlbWFpbmluZyB0aW1lIG9yIHRpbWUgdG8gZnVsbCB3aWxsIGJlIHNob3duIGluIHF1aWNrIG1lbnUuIiwKICAibmFtZSI6ICJCYXR0ZXJ5IFRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9tb2tlL2JhdHRlcnlfdGltZSIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVAdHlwZW9mLnB3IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} -, {"uuid": "onedrive@diegomerida.com", "name": "One Drive Resurrect", "pname": "one-drive-resurrect", "description": "One Drive extension. This extension is not affiliated, funded, or in any way associated with Microsoft and OneDrive.", "link": "https://extensions.gnome.org/extension/5428/one-drive-resurrect/", "shell_version_map": {"42": {"version": "5", "sha256": "166jgia2lc1z64by9zpqdi0l95xpgpg2fq1wqpqccrgcgsxs9kvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSBEcml2ZSBleHRlbnNpb24uIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIE1pY3Jvc29mdCBhbmQgT25lRHJpdmUuIiwKICAibmFtZSI6ICJPbmUgRHJpdmUgUmVzdXJyZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RpZWdzdHJveWVyL29uZURyaXZlIiwKICAidXVpZCI6ICJvbmVkcml2ZUBkaWVnb21lcmlkYS5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} -, {"uuid": "warpswitcher@pikokr.dev", "name": "Cloudflare Warp Quick Settings", "pname": "cloudflare-warp-quick-settings", "description": "Toggle cloudflare warp in quick settings\n\nThe logo is from cloudflare(https://www.cloudflare.com). This extension is not affiliated, funded, or in any way associated with Cloudflare.", "link": "https://extensions.gnome.org/extension/5440/cloudflare-warp-quick-settings/", "shell_version_map": {"43": {"version": "2", "sha256": "0jl5zacz7g9smjiimyap9vl3wkzpvxih312qylp28cj39qhnpj6q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBjbG91ZGZsYXJlIHdhcnAgaW4gcXVpY2sgc2V0dGluZ3NcblxuVGhlIGxvZ28gaXMgZnJvbSBjbG91ZGZsYXJlKGh0dHBzOi8vd3d3LmNsb3VkZmxhcmUuY29tKS4gVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggQ2xvdWRmbGFyZS4iLAogICJuYW1lIjogIkNsb3VkZmxhcmUgV2FycCBRdWljayBTZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9waWtva3IvY2xvdWRmbGFyZS13YXJwLXF1aWNrc2V0dGluZ3MiLAogICJ1dWlkIjogIndhcnBzd2l0Y2hlckBwaWtva3IuZGV2IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "onedrive@diegomerida.com", "name": "One Drive Resurrect", "pname": "one-drive-resurrect", "description": "One Drive extension. This extension is not affiliated, funded, or in any way associated with Microsoft and OneDrive.", "link": "https://extensions.gnome.org/extension/5428/one-drive-resurrect/", "shell_version_map": {"41": {"version": "8", "sha256": "1ymldaf55blbj7b3wicskjbb6gc4fy98jcljbayzi94kfvdxg6vy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSBEcml2ZSBleHRlbnNpb24uIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIE1pY3Jvc29mdCBhbmQgT25lRHJpdmUuIiwKICAibmFtZSI6ICJPbmUgRHJpdmUgUmVzdXJyZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ3N0cm95ZXIvb25lRHJpdmUiLAogICJ1dWlkIjogIm9uZWRyaXZlQGRpZWdvbWVyaWRhLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1ymldaf55blbj7b3wicskjbb6gc4fy98jcljbayzi94kfvdxg6vy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSBEcml2ZSBleHRlbnNpb24uIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIE1pY3Jvc29mdCBhbmQgT25lRHJpdmUuIiwKICAibmFtZSI6ICJPbmUgRHJpdmUgUmVzdXJyZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ3N0cm95ZXIvb25lRHJpdmUiLAogICJ1dWlkIjogIm9uZWRyaXZlQGRpZWdvbWVyaWRhLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "1ymldaf55blbj7b3wicskjbb6gc4fy98jcljbayzi94kfvdxg6vy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSBEcml2ZSBleHRlbnNpb24uIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIE1pY3Jvc29mdCBhbmQgT25lRHJpdmUuIiwKICAibmFtZSI6ICJPbmUgRHJpdmUgUmVzdXJyZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ3N0cm95ZXIvb25lRHJpdmUiLAogICJ1dWlkIjogIm9uZWRyaXZlQGRpZWdvbWVyaWRhLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} +, {"uuid": "warpswitcher@pikokr.dev", "name": "Cloudflare Warp Quick Settings", "pname": "cloudflare-warp-quick-settings", "description": "Toggle cloudflare warp in quick settings\n\nThe logo is from cloudflare(https://www.cloudflare.com). This extension is not affiliated, funded, or in any way associated with Cloudflare.", "link": "https://extensions.gnome.org/extension/5440/cloudflare-warp-quick-settings/", "shell_version_map": {"43": {"version": "4", "sha256": "085gv1v514ibiyn8vbbd99217ddnlmw80690swz50kk07bfkkb3q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBjbG91ZGZsYXJlIHdhcnAgaW4gcXVpY2sgc2V0dGluZ3NcblxuVGhlIGxvZ28gaXMgZnJvbSBjbG91ZGZsYXJlKGh0dHBzOi8vd3d3LmNsb3VkZmxhcmUuY29tKS4gVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggQ2xvdWRmbGFyZS4iLAogICJuYW1lIjogIkNsb3VkZmxhcmUgV2FycCBRdWljayBTZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9waWtva3IvY2xvdWRmbGFyZS13YXJwLXF1aWNrc2V0dGluZ3MiLAogICJ1dWlkIjogIndhcnBzd2l0Y2hlckBwaWtva3IuZGV2IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "quick-settings-button-remover@qwreey", "name": "Quick Settings Button Remover (DEPRECATED)", "pname": "quick-settings-button-remover", "description": "This extensions is DEPRECATED!\nUse this extension instead:\nhttps://extensions.gnome.org/extension/5446/quick-settings-tweaker/", "link": "https://extensions.gnome.org/extension/5443/quick-settings-button-remover/", "shell_version_map": {"43": {"version": "1", "sha256": "1mdyycav4y70qqjn0dppczcywydy7d9nj78zgvfkp5870hgvws51", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9ucyBpcyBERVBSRUNBVEVEIVxuVXNlIHRoaXMgZXh0ZW5zaW9uIGluc3RlYWQ6XG5odHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi81NDQ2L3F1aWNrLXNldHRpbmdzLXR3ZWFrZXIvIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBCdXR0b24gUmVtb3ZlciAoREVQUkVDQVRFRCkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucXVpY2stc2V0dGluZ3MtYnV0dG9uLXJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcXdyZWV5NzUvZ25vbWUtcXVpY2stc2V0dGluZ3MtYnV0dG9uLXJlbW92ZXIiLAogICJ1dWlkIjogInF1aWNrLXNldHRpbmdzLWJ1dHRvbi1yZW1vdmVyQHF3cmVleSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "quick-settings-tweaks@qwreey", "name": "Quick Settings Tweaker", "pname": "quick-settings-tweaker", "description": "Let's tweak gnome 43's quick settings! You can add Media Controls, Notifications, Volume Mixer on quick settings and remove useless buttons!", "link": "https://extensions.gnome.org/extension/5446/quick-settings-tweaker/", "shell_version_map": {"43": {"version": "17", "sha256": "1b3x4zqfyzph7x3r3kr3m2m07hralfazpazx5950iiscmx5s4cbg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCdzIHR3ZWFrIGdub21lIDQzJ3MgcXVpY2sgc2V0dGluZ3MhIFlvdSBjYW4gYWRkIE1lZGlhIENvbnRyb2xzLCBOb3RpZmljYXRpb25zLCBWb2x1bWUgTWl4ZXIgb24gcXVpY2sgc2V0dGluZ3MgYW5kIHJlbW92ZSB1c2VsZXNzIGJ1dHRvbnMhIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicXVpY2stc2V0dGluZ3MtdHdlYWtzIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBUd2Vha2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1aWNrLXNldHRpbmdzLXR3ZWFrcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9xd3JlZXk3NS9xdWljay1zZXR0aW5ncy10d2Vha3MiLAogICJ1dWlkIjogInF1aWNrLXNldHRpbmdzLXR3ZWFrc0Bxd3JlZXkiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"uuid": "osd-volume-number@deminder", "name": "OSD Volume Number", "pname": "osd-volume-number", "description": "Replace the on-screen-display volume level icon with a number.", "link": "https://extensions.gnome.org/extension/5461/osd-volume-number/", "shell_version_map": {"42": {"version": "1", "sha256": "1lfqac0md0zlgg55rlji8ahqviv4a5d6jhgbrnqbwsjnv5845fdg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIG9uLXNjcmVlbi1kaXNwbGF5IHZvbHVtZSBsZXZlbCBpY29uIHdpdGggYSBudW1iZXIuIiwKICAibmFtZSI6ICJPU0QgVm9sdW1lIE51bWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvb3NkLXZvbHVtZS1udW1iZXIiLAogICJ1dWlkIjogIm9zZC12b2x1bWUtbnVtYmVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "43": {"version": "1", "sha256": "1lfqac0md0zlgg55rlji8ahqviv4a5d6jhgbrnqbwsjnv5845fdg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIG9uLXNjcmVlbi1kaXNwbGF5IHZvbHVtZSBsZXZlbCBpY29uIHdpdGggYSBudW1iZXIuIiwKICAibmFtZSI6ICJPU0QgVm9sdW1lIE51bWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvb3NkLXZvbHVtZS1udW1iZXIiLAogICJ1dWlkIjogIm9zZC12b2x1bWUtbnVtYmVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "next-up@artisticat1.github.com", "name": "Next Up", "pname": "next-up", "description": "Show your next calendar event in the status bar", "link": "https://extensions.gnome.org/extension/5465/next-up/", "shell_version_map": {"42": {"version": "2", "sha256": "1p8r4lly20azdl82a2724gdj0rczinccch509dhzvb2j859y7xqh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgeW91ciBuZXh0IGNhbGVuZGFyIGV2ZW50IGluIHRoZSBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJOZXh0IFVwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FydGlzdGljYXQxL2dub21lLW5leHQtdXAiLAogICJ1dWlkIjogIm5leHQtdXBAYXJ0aXN0aWNhdDEuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "weatheroclock@CleoMenezesJr.github.io", "name": "Weather O'Clock", "pname": "weather-oclock", "description": "Display the current Weather on the left side of the clock without de-centering it from the panel. GNOME Weather is required for this extension to function.", "link": "https://extensions.gnome.org/extension/5470/weather-oclock/", "shell_version_map": {"42": {"version": "2", "sha256": "1d795m2sgjbwks5hwld5lcblni8ymyhy63b1z6lww8rjr6zwvk9k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgV2VhdGhlciBvbiB0aGUgbGVmdCBzaWRlIG9mIHRoZSBjbG9jayB3aXRob3V0IGRlLWNlbnRlcmluZyBpdCBmcm9tIHRoZSBwYW5lbC4gR05PTUUgV2VhdGhlciBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gZnVuY3Rpb24uIiwKICAibmFtZSI6ICJXZWF0aGVyIE8nQ2xvY2siLAogICJvcmlnaW5hbC1hdXRob3IiOiAiSmFzb25MRzE5NzlAZ2l0aHViLmlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL2dub21lLXNoZWxsLWV4dGVuc2lvbi13ZWF0aGVyLW9jbG9jayIsCiAgInV1aWQiOiAid2VhdGhlcm9jbG9ja0BDbGVvTWVuZXplc0pyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "43": {"version": "2", "sha256": "1d795m2sgjbwks5hwld5lcblni8ymyhy63b1z6lww8rjr6zwvk9k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgV2VhdGhlciBvbiB0aGUgbGVmdCBzaWRlIG9mIHRoZSBjbG9jayB3aXRob3V0IGRlLWNlbnRlcmluZyBpdCBmcm9tIHRoZSBwYW5lbC4gR05PTUUgV2VhdGhlciBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gZnVuY3Rpb24uIiwKICAibmFtZSI6ICJXZWF0aGVyIE8nQ2xvY2siLAogICJvcmlnaW5hbC1hdXRob3IiOiAiSmFzb25MRzE5NzlAZ2l0aHViLmlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL2dub21lLXNoZWxsLWV4dGVuc2lvbi13ZWF0aGVyLW9jbG9jayIsCiAgInV1aWQiOiAid2VhdGhlcm9jbG9ja0BDbGVvTWVuZXplc0pyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "weatheroclock@CleoMenezesJr.github.io", "name": "Weather O'Clock", "pname": "weather-oclock", "description": "Display the current weather inside the pill next to the clock. GNOME Weather is required for this extension to work.", "link": "https://extensions.gnome.org/extension/5470/weather-oclock/", "shell_version_map": {"42": {"version": "5", "sha256": "1r30cicw43vj8rwm7sw2bshi41239sgmw5nypnjr20a2k7f6rw7i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBpbnNpZGUgdGhlIHBpbGwgbmV4dCB0byB0aGUgY2xvY2suIEdOT01FIFdlYXRoZXIgaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIHdvcmsuIiwKICAibmFtZSI6ICJXZWF0aGVyIE8nQ2xvY2siLAogICJvcmlnaW5hbC1hdXRob3IiOiAiSmFzb25MRzE5NzlAZ2l0aHViLmlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL3dlYXRoZXItb2Nsb2NrIiwKICAidXVpZCI6ICJ3ZWF0aGVyb2Nsb2NrQENsZW9NZW5lemVzSnIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "43": {"version": "5", "sha256": "1r30cicw43vj8rwm7sw2bshi41239sgmw5nypnjr20a2k7f6rw7i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBpbnNpZGUgdGhlIHBpbGwgbmV4dCB0byB0aGUgY2xvY2suIEdOT01FIFdlYXRoZXIgaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIHdvcmsuIiwKICAibmFtZSI6ICJXZWF0aGVyIE8nQ2xvY2siLAogICJvcmlnaW5hbC1hdXRob3IiOiAiSmFzb25MRzE5NzlAZ2l0aHViLmlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL3dlYXRoZXItb2Nsb2NrIiwKICAidXVpZCI6ICJ3ZWF0aGVyb2Nsb2NrQENsZW9NZW5lemVzSnIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "appmenu-color-icon@arahiko-ayami.github.com", "name": "Color App Menu Icon for GNOME 40+", "pname": "color-app-menu-icon-for-gnome-40", "description": "Replace the symbolic application menu icon with the regular one. An alternative version of yanbab's extension that supports GNOME 40 and higher", "link": "https://extensions.gnome.org/extension/5473/color-app-menu-icon-for-gnome-40/", "shell_version_map": {"38": {"version": "2", "sha256": "1ixv4by9gf6xygz2hm584wp1bbgqz90cc1cmvld3hc0d6pr03arz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIHN5bWJvbGljIGFwcGxpY2F0aW9uIG1lbnUgaWNvbiB3aXRoIHRoZSByZWd1bGFyIG9uZS4gQW4gYWx0ZXJuYXRpdmUgdmVyc2lvbiBvZiB5YW5iYWIncyBleHRlbnNpb24gdGhhdCBzdXBwb3J0cyBHTk9NRSA0MCBhbmQgaGlnaGVyIiwKICAibmFtZSI6ICJDb2xvciBBcHAgTWVudSBJY29uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJhaGlrby1heWFtaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmVndWxhci1hcHBtZW51LWljb24iLAogICJ1dWlkIjogImFwcG1lbnUtY29sb3ItaWNvbkBhcmFoaWtvLWF5YW1pLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "1ixv4by9gf6xygz2hm584wp1bbgqz90cc1cmvld3hc0d6pr03arz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIHN5bWJvbGljIGFwcGxpY2F0aW9uIG1lbnUgaWNvbiB3aXRoIHRoZSByZWd1bGFyIG9uZS4gQW4gYWx0ZXJuYXRpdmUgdmVyc2lvbiBvZiB5YW5iYWIncyBleHRlbnNpb24gdGhhdCBzdXBwb3J0cyBHTk9NRSA0MCBhbmQgaGlnaGVyIiwKICAibmFtZSI6ICJDb2xvciBBcHAgTWVudSBJY29uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJhaGlrby1heWFtaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmVndWxhci1hcHBtZW51LWljb24iLAogICJ1dWlkIjogImFwcG1lbnUtY29sb3ItaWNvbkBhcmFoaWtvLWF5YW1pLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1ixv4by9gf6xygz2hm584wp1bbgqz90cc1cmvld3hc0d6pr03arz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIHN5bWJvbGljIGFwcGxpY2F0aW9uIG1lbnUgaWNvbiB3aXRoIHRoZSByZWd1bGFyIG9uZS4gQW4gYWx0ZXJuYXRpdmUgdmVyc2lvbiBvZiB5YW5iYWIncyBleHRlbnNpb24gdGhhdCBzdXBwb3J0cyBHTk9NRSA0MCBhbmQgaGlnaGVyIiwKICAibmFtZSI6ICJDb2xvciBBcHAgTWVudSBJY29uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJhaGlrby1heWFtaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmVndWxhci1hcHBtZW51LWljb24iLAogICJ1dWlkIjogImFwcG1lbnUtY29sb3ItaWNvbkBhcmFoaWtvLWF5YW1pLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "1ixv4by9gf6xygz2hm584wp1bbgqz90cc1cmvld3hc0d6pr03arz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIHN5bWJvbGljIGFwcGxpY2F0aW9uIG1lbnUgaWNvbiB3aXRoIHRoZSByZWd1bGFyIG9uZS4gQW4gYWx0ZXJuYXRpdmUgdmVyc2lvbiBvZiB5YW5iYWIncyBleHRlbnNpb24gdGhhdCBzdXBwb3J0cyBHTk9NRSA0MCBhbmQgaGlnaGVyIiwKICAibmFtZSI6ICJDb2xvciBBcHAgTWVudSBJY29uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJhaGlrby1heWFtaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmVndWxhci1hcHBtZW51LWljb24iLAogICJ1dWlkIjogImFwcG1lbnUtY29sb3ItaWNvbkBhcmFoaWtvLWF5YW1pLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "1ixv4by9gf6xygz2hm584wp1bbgqz90cc1cmvld3hc0d6pr03arz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIHN5bWJvbGljIGFwcGxpY2F0aW9uIG1lbnUgaWNvbiB3aXRoIHRoZSByZWd1bGFyIG9uZS4gQW4gYWx0ZXJuYXRpdmUgdmVyc2lvbiBvZiB5YW5iYWIncyBleHRlbnNpb24gdGhhdCBzdXBwb3J0cyBHTk9NRSA0MCBhbmQgaGlnaGVyIiwKICAibmFtZSI6ICJDb2xvciBBcHAgTWVudSBJY29uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJhaGlrby1heWFtaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmVndWxhci1hcHBtZW51LWljb24iLAogICJ1dWlkIjogImFwcG1lbnUtY29sb3ItaWNvbkBhcmFoaWtvLWF5YW1pLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "toggle-workspace-span@arngo.github.com", "name": "Toggle workspace span", "pname": "toggle-workspace-span", "description": "Toggle workspaces spanning displays (aka \"Workspaces on primary display only/Workspaces on all displays\").\n\nThe button can be set to show either on the panel or in the quick settings menu.", "link": "https://extensions.gnome.org/extension/5482/toggle-workspace-span/", "shell_version_map": {"43": {"version": "2", "sha256": "19wca76p0rx2qm1dh1yz5rhrdfkdqf0s470d6lhlaj0c8j86bjr2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB3b3Jrc3BhY2VzIHNwYW5uaW5nIGRpc3BsYXlzIChha2EgXCJXb3Jrc3BhY2VzIG9uIHByaW1hcnkgZGlzcGxheSBvbmx5L1dvcmtzcGFjZXMgb24gYWxsIGRpc3BsYXlzXCIpLlxuXG5UaGUgYnV0dG9uIGNhbiBiZSBzZXQgdG8gc2hvdyBlaXRoZXIgb24gdGhlIHBhbmVsIG9yIGluIHRoZSBxdWljayBzZXR0aW5ncyBtZW51LiIsCiAgIm5hbWUiOiAiVG9nZ2xlIHdvcmtzcGFjZSBzcGFuIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FybmdvL2dub21lLXNoZWxsLWV4dGVuc2lvbi10b2dnbGUtd29ya3NwYWNlLXNwYW4iLAogICJ1dWlkIjogInRvZ2dsZS13b3Jrc3BhY2Utc3BhbkBhcm5nby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} -, {"uuid": "search-light@icedman.github.com", "name": "Search Light", "pname": "search-light", "description": "Take the apps search out of overview", "link": "https://extensions.gnome.org/extension/5489/search-light/", "shell_version_map": {"42": {"version": "5", "sha256": "0snfzinz649pw2cv0jg57ln8imwrxdh9fz9x0xm47j6vf8pgxhkp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldyIsCiAgImdldHRleHQtZG9tYWluIjogInNlYXJjaC1saWdodCIsCiAgIm5hbWUiOiAiU2VhcmNoIExpZ2h0IiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlYXJjaC1saWdodCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9zZWFyY2gtbGlnaHQiLAogICJ1dWlkIjogInNlYXJjaC1saWdodEBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "43": {"version": "5", "sha256": "0snfzinz649pw2cv0jg57ln8imwrxdh9fz9x0xm47j6vf8pgxhkp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldyIsCiAgImdldHRleHQtZG9tYWluIjogInNlYXJjaC1saWdodCIsCiAgIm5hbWUiOiAiU2VhcmNoIExpZ2h0IiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlYXJjaC1saWdodCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9zZWFyY2gtbGlnaHQiLAogICJ1dWlkIjogInNlYXJjaC1saWdodEBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"uuid": "search-light@icedman.github.com", "name": "Search Light", "pname": "search-light", "description": "Take the apps search out of overview", "link": "https://extensions.gnome.org/extension/5489/search-light/", "shell_version_map": {"42": {"version": "11", "sha256": "0rb37fbv9782sybh4yzscddzf7n3ir0v44dsp8jcg1bay3wc7m6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldyIsCiAgImdldHRleHQtZG9tYWluIjogInNlYXJjaC1saWdodCIsCiAgIm5hbWUiOiAiU2VhcmNoIExpZ2h0IiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlYXJjaC1saWdodCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9zZWFyY2gtbGlnaHQiLAogICJ1dWlkIjogInNlYXJjaC1saWdodEBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "43": {"version": "11", "sha256": "0rb37fbv9782sybh4yzscddzf7n3ir0v44dsp8jcg1bay3wc7m6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldyIsCiAgImdldHRleHQtZG9tYWluIjogInNlYXJjaC1saWdodCIsCiAgIm5hbWUiOiAiU2VhcmNoIExpZ2h0IiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlYXJjaC1saWdodCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9zZWFyY2gtbGlnaHQiLAogICJ1dWlkIjogInNlYXJjaC1saWdodEBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"uuid": "ibus-switcher@kevinhwang91.github.com", "name": "Ibus Switcher", "pname": "ibus-switcher", "description": "Use d-bus to switch ibus source", "link": "https://extensions.gnome.org/extension/5497/ibus-switcher/", "shell_version_map": {"42": {"version": "1", "sha256": "0f3w2jzrhr2jk08955cnv6kkxsk6qh0ramri6k5r75qyjg1hayz2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICJhMGIzZTdhY2Q0Y2ZiMmI4OTA3ZjE2ZjBiZjA3MDk4MGIyNzdlYTBjIiwKICAiZGVzY3JpcHRpb24iOiAiVXNlIGQtYnVzIHRvIHN3aXRjaCBpYnVzIHNvdXJjZSIsCiAgIm5hbWUiOiAiSWJ1cyBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V2aW5od2FuZzkxL2dub21lLXNoZWxsLWlidXMtc3dpdGNoZXIiLAogICJ1dWlkIjogImlidXMtc3dpdGNoZXJAa2V2aW5od2FuZzkxLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "43": {"version": "1", "sha256": "0f3w2jzrhr2jk08955cnv6kkxsk6qh0ramri6k5r75qyjg1hayz2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICJhMGIzZTdhY2Q0Y2ZiMmI4OTA3ZjE2ZjBiZjA3MDk4MGIyNzdlYTBjIiwKICAiZGVzY3JpcHRpb24iOiAiVXNlIGQtYnVzIHRvIHN3aXRjaCBpYnVzIHNvdXJjZSIsCiAgIm5hbWUiOiAiSWJ1cyBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V2aW5od2FuZzkxL2dub21lLXNoZWxsLWlidXMtc3dpdGNoZXIiLAogICJ1dWlkIjogImlidXMtc3dpdGNoZXJAa2V2aW5od2FuZzkxLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "auto-activities@CleoMenezesJr.github.io", "name": "Auto Activities", "pname": "auto-activities", "description": "Show activities overview when there are no windows, or hide it when there are new windows.\n\nThis extension is a fork of the Auto Activities extension, its former owner transferred its repository to me.", "link": "https://extensions.gnome.org/extension/5500/auto-activities/", "shell_version_map": {"42": {"version": "4", "sha256": "0icdhqn4w0b2i153xqn34bhbpkam1klawxr2p6hs6wcr05cmx6z6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgdGhlIEF1dG8gQWN0aXZpdGllcyBleHRlbnNpb24sIGl0cyBmb3JtZXIgb3duZXIgdHJhbnNmZXJyZWQgaXRzIHJlcG9zaXRvcnkgdG8gbWUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXV0by1hY3Rpdml0aWVzIiwKICAibmFtZSI6ICJBdXRvIEFjdGl2aXRpZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAibWktamFuLXNlbmFAcHJvdG9uLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL2F1dG8tYWN0aXZpdGllcyIsCiAgInV1aWQiOiAiYXV0by1hY3Rpdml0aWVzQENsZW9NZW5lemVzSnIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "0icdhqn4w0b2i153xqn34bhbpkam1klawxr2p6hs6wcr05cmx6z6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgdGhlIEF1dG8gQWN0aXZpdGllcyBleHRlbnNpb24sIGl0cyBmb3JtZXIgb3duZXIgdHJhbnNmZXJyZWQgaXRzIHJlcG9zaXRvcnkgdG8gbWUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXV0by1hY3Rpdml0aWVzIiwKICAibmFtZSI6ICJBdXRvIEFjdGl2aXRpZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAibWktamFuLXNlbmFAcHJvdG9uLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL2F1dG8tYWN0aXZpdGllcyIsCiAgInV1aWQiOiAiYXV0by1hY3Rpdml0aWVzQENsZW9NZW5lemVzSnIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "quick-settings-avatar@d-go", "name": "User Avatar In Quick Settings", "pname": "user-avatar-in-quick-settings", "description": "Display the user avatar in the Quick Settings menu, part of the \"System\" settings", "link": "https://extensions.gnome.org/extension/5506/user-avatar-in-quick-settings/", "shell_version_map": {"43": {"version": "1", "sha256": "12pk2gai1g4cax952kq19jfk74ryjr4j627ipnhbj5n77z063g58", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIHVzZXIgYXZhdGFyIGluIHRoZSBRdWljayBTZXR0aW5ncyBtZW51LCBwYXJ0IG9mIHRoZSBcIlN5c3RlbVwiIHNldHRpbmdzIiwKICAibmFtZSI6ICJVc2VyIEF2YXRhciBJbiBRdWljayBTZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kLWdvL3F1aWNrLXNldHRpbmdzLWF2YXRhciIsCiAgInV1aWQiOiAicXVpY2stc2V0dGluZ3MtYXZhdGFyQGQtZ28iLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"uuid": "quick-settings-avatar@d-go", "name": "User Avatar In Quick Settings", "pname": "user-avatar-in-quick-settings", "description": "Display the user avatar in the Quick Settings menu, part of the \"System\" settings", "link": "https://extensions.gnome.org/extension/5506/user-avatar-in-quick-settings/", "shell_version_map": {"43": {"version": "3", "sha256": "194b4z6ixp0h07qcdrh53yj0sr4n717ap4vqgypaarcrnc4dfm9p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIHVzZXIgYXZhdGFyIGluIHRoZSBRdWljayBTZXR0aW5ncyBtZW51LCBwYXJ0IG9mIHRoZSBcIlN5c3RlbVwiIHNldHRpbmdzIiwKICAibmFtZSI6ICJVc2VyIEF2YXRhciBJbiBRdWljayBTZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kLWdvL3F1aWNrLXNldHRpbmdzLWF2YXRhciIsCiAgInV1aWQiOiAicXVpY2stc2V0dGluZ3MtYXZhdGFyQGQtZ28iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "eur-brl@jcanabarro.github.com", "name": "EUR-BRL", "pname": "eur-brl", "description": "Gnome Extension that shows the current conversion of Euro to Brazilian Reals.\n\nIt is a fork of USD-BRL https://extensions.gnome.org/extension/5371/usd-bra/", "link": "https://extensions.gnome.org/extension/5510/eur-brl/", "shell_version_map": {"42": {"version": "2", "sha256": "0j5wx3dawlxdal6rw7ijh17wbpakdy3qwh634ns9q65a7axqalkz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIEV4dGVuc2lvbiB0aGF0IHNob3dzIHRoZSBjdXJyZW50IGNvbnZlcnNpb24gb2YgRXVybyB0byBCcmF6aWxpYW4gUmVhbHMuXG5cbkl0IGlzIGEgZm9yayBvZiBVU0QtQlJMIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzUzNzEvdXNkLWJyYS8iLAogICJuYW1lIjogIkVVUi1CUkwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamNhbmFiYXJyby9FVVItQlJMIiwKICAidXVpZCI6ICJldXItYnJsQGpjYW5hYmFycm8uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "floating-panel@aylur", "name": "Floating Panel", "pname": "floating-panel", "description": "Floats the panel, if there is a window nearby or maximised, it defloats.", "link": "https://extensions.gnome.org/extension/5514/floating-panel/", "shell_version_map": {"40": {"version": "3", "sha256": "08n87kw0642n9wdw8w86pw0y41cz0mzd6byyqzs6wq6qc682y9bg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "08n87kw0642n9wdw8w86pw0y41cz0mzd6byyqzs6wq6qc682y9bg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "08n87kw0642n9wdw8w86pw0y41cz0mzd6byyqzs6wq6qc682y9bg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "08n87kw0642n9wdw8w86pw0y41cz0mzd6byyqzs6wq6qc682y9bg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"uuid": "floating-panel@aylur", "name": "Floating Panel", "pname": "floating-panel", "description": "Floats the panel, if there is a window nearby or maximised, it defloats.", "link": "https://extensions.gnome.org/extension/5514/floating-panel/", "shell_version_map": {"40": {"version": "4", "sha256": "0jih9lhy9pywilqnkz4cliyg3i2jm4w36kmna67hrx5wqvga6s69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "0jih9lhy9pywilqnkz4cliyg3i2jm4w36kmna67hrx5wqvga6s69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "0jih9lhy9pywilqnkz4cliyg3i2jm4w36kmna67hrx5wqvga6s69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "0jih9lhy9pywilqnkz4cliyg3i2jm4w36kmna67hrx5wqvga6s69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "tun0-ip-address@adamantisspinae.github.com", "name": "tun0 IP Address", "pname": "tun0-ip-address", "description": "Show tun0 IP address on GNOME panel. Do not show loopback addresses (127.0.0.0/8) or other network interface IP addresses. Please install moreutils package as a depedency", "link": "https://extensions.gnome.org/extension/5518/tun0-ip-address/", "shell_version_map": {"40": {"version": "7", "sha256": "08zfm6g38g54km5ks83i78b019v6cihqz0qp636iislhpz6gzylp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdHVuMCBJUCBhZGRyZXNzIG9uIEdOT01FIHBhbmVsLiBEbyBub3Qgc2hvdyBsb29wYmFjayBhZGRyZXNzZXMgKDEyNy4wLjAuMC84KSBvciBvdGhlciBuZXR3b3JrIGludGVyZmFjZSBJUCBhZGRyZXNzZXMuIFBsZWFzZSBpbnN0YWxsIG1vcmV1dGlscyBwYWNrYWdlIGFzIGEgZGVwZWRlbmN5IiwKICAibmFtZSI6ICJ0dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWRhbWFudGlzU3BpbmFlL2dub21lLWV4dGVuc2lvbi10dW4wLWlwLWFkZHJlc3MiLAogICJ1dWlkIjogInR1bjAtaXAtYWRkcmVzc0BhZGFtYW50aXNzcGluYWUuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "08zfm6g38g54km5ks83i78b019v6cihqz0qp636iislhpz6gzylp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdHVuMCBJUCBhZGRyZXNzIG9uIEdOT01FIHBhbmVsLiBEbyBub3Qgc2hvdyBsb29wYmFjayBhZGRyZXNzZXMgKDEyNy4wLjAuMC84KSBvciBvdGhlciBuZXR3b3JrIGludGVyZmFjZSBJUCBhZGRyZXNzZXMuIFBsZWFzZSBpbnN0YWxsIG1vcmV1dGlscyBwYWNrYWdlIGFzIGEgZGVwZWRlbmN5IiwKICAibmFtZSI6ICJ0dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWRhbWFudGlzU3BpbmFlL2dub21lLWV4dGVuc2lvbi10dW4wLWlwLWFkZHJlc3MiLAogICJ1dWlkIjogInR1bjAtaXAtYWRkcmVzc0BhZGFtYW50aXNzcGluYWUuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "7", "sha256": "08zfm6g38g54km5ks83i78b019v6cihqz0qp636iislhpz6gzylp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdHVuMCBJUCBhZGRyZXNzIG9uIEdOT01FIHBhbmVsLiBEbyBub3Qgc2hvdyBsb29wYmFjayBhZGRyZXNzZXMgKDEyNy4wLjAuMC84KSBvciBvdGhlciBuZXR3b3JrIGludGVyZmFjZSBJUCBhZGRyZXNzZXMuIFBsZWFzZSBpbnN0YWxsIG1vcmV1dGlscyBwYWNrYWdlIGFzIGEgZGVwZWRlbmN5IiwKICAibmFtZSI6ICJ0dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWRhbWFudGlzU3BpbmFlL2dub21lLWV4dGVuc2lvbi10dW4wLWlwLWFkZHJlc3MiLAogICJ1dWlkIjogInR1bjAtaXAtYWRkcmVzc0BhZGFtYW50aXNzcGluYWUuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "43": {"version": "7", "sha256": "08zfm6g38g54km5ks83i78b019v6cihqz0qp636iislhpz6gzylp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdHVuMCBJUCBhZGRyZXNzIG9uIEdOT01FIHBhbmVsLiBEbyBub3Qgc2hvdyBsb29wYmFjayBhZGRyZXNzZXMgKDEyNy4wLjAuMC84KSBvciBvdGhlciBuZXR3b3JrIGludGVyZmFjZSBJUCBhZGRyZXNzZXMuIFBsZWFzZSBpbnN0YWxsIG1vcmV1dGlscyBwYWNrYWdlIGFzIGEgZGVwZWRlbmN5IiwKICAibmFtZSI6ICJ0dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWRhbWFudGlzU3BpbmFlL2dub21lLWV4dGVuc2lvbi10dW4wLWlwLWFkZHJlc3MiLAogICJ1dWlkIjogInR1bjAtaXAtYWRkcmVzc0BhZGFtYW50aXNzcGluYWUuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} -, {"uuid": "nano-lights@chlumskyvaclav.gmail.com", "name": "Nano Lights", "pname": "nano-lights", "description": "This extension controls Nanoleaf shapes and possibly others Nanoleaf devices on your local (wifi) network. If you are experiencing an error on the upgrade, please log out and log in again.", "link": "https://extensions.gnome.org/extension/5519/nano-lights/", "shell_version_map": {"43": {"version": "2", "sha256": "12pm2carzgm8pj0zwwx184drh4nnq3rfixdws2k9cirp3gxj2i6y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIE5hbm9sZWFmIHNoYXBlcyBhbmQgcG9zc2libHkgb3RoZXJzIE5hbm9sZWFmIGRldmljZXMgb24geW91ciBsb2NhbCAod2lmaSkgbmV0d29yay4gSWYgeW91IGFyZSBleHBlcmllbmNpbmcgYW4gZXJyb3Igb24gdGhlIHVwZ3JhZGUsIHBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmFuby1saWdodHMiLAogICJuYW1lIjogIk5hbm8gTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vbmFuby1saWdodHMiLAogICJ1dWlkIjogIm5hbm8tbGlnaHRzQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "just-another-search-bar@xelad0m", "name": "Just Another Search Bar", "pname": "just-another-search-bar", "description": "Search from desktop with google/yandex/baidu in default browser\nLocal search is also available using the recoll desktop search tool\nTo open click on the search icon on the menu bar or press Ctrl+Alt+F", "link": "https://extensions.gnome.org/extension/5522/just-another-search-bar/", "shell_version_map": {"43": {"version": "2", "sha256": "1w9zsqnh5pb8nv2r3vvbnfydw6zk5sawkjmxl7nid03xldzh53ls", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmcm9tIGRlc2t0b3Agd2l0aCBnb29nbGUveWFuZGV4L2JhaWR1IGluIGRlZmF1bHQgYnJvd3NlclxuTG9jYWwgc2VhcmNoIGlzIGFsc28gYXZhaWxhYmxlIHVzaW5nIHRoZSByZWNvbGwgZGVza3RvcCBzZWFyY2ggdG9vbFxuVG8gb3BlbiBjbGljayBvbiB0aGUgc2VhcmNoIGljb24gb24gdGhlIG1lbnUgYmFyIG9yIHByZXNzIEN0cmwrQWx0K0YiLAogICJuYW1lIjogIkp1c3QgQW5vdGhlciBTZWFyY2ggQmFyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS1zaGVsbC5leHRlbnNpb25zLmp1c3QtYW5vdGhlci1zZWFyY2gtYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hlbGFkMG0vanVzdC1hbm90aGVyLXNlYXJjaC1iYXIiLAogICJ1dWlkIjogImp1c3QtYW5vdGhlci1zZWFyY2gtYmFyQHhlbGFkMG0iLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "nano-lights@chlumskyvaclav.gmail.com", "name": "Nano Lights", "pname": "nano-lights", "description": "This extension controls Nanoleaf shapes and possibly others Nanoleaf devices on your local (wifi) network. If you are experiencing an error on the upgrade, please log out and log in again.", "link": "https://extensions.gnome.org/extension/5519/nano-lights/", "shell_version_map": {"43": {"version": "3", "sha256": "0zxp4qg13yfh63hpj3fr971syf65r06fxwz7dhr2m0x662pzppv0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIE5hbm9sZWFmIHNoYXBlcyBhbmQgcG9zc2libHkgb3RoZXJzIE5hbm9sZWFmIGRldmljZXMgb24geW91ciBsb2NhbCAod2lmaSkgbmV0d29yay4gSWYgeW91IGFyZSBleHBlcmllbmNpbmcgYW4gZXJyb3Igb24gdGhlIHVwZ3JhZGUsIHBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmFuby1saWdodHMiLAogICJuYW1lIjogIk5hbm8gTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vbmFuby1saWdodHMiLAogICJ1dWlkIjogIm5hbm8tbGlnaHRzQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"uuid": "just-another-search-bar@xelad0m", "name": "Just Another Search Bar", "pname": "just-another-search-bar", "description": "Simple GNOME Shell extension for performing search queries\nfrom desktop. Some search engines are added as examples, you can add your own,\nincluding local search tools with suitable CLI", "link": "https://extensions.gnome.org/extension/5522/just-another-search-bar/", "shell_version_map": {"43": {"version": "7", "sha256": "0354gfmi4cq8g71mzxc3xcq0839lc11fnb2cy5d4f9zxz631lvyh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gZm9yIHBlcmZvcm1pbmcgc2VhcmNoIHF1ZXJpZXNcbmZyb20gZGVza3RvcC4gU29tZSBzZWFyY2ggZW5naW5lcyBhcmUgYWRkZWQgYXMgZXhhbXBsZXMsIHlvdSBjYW4gYWRkIHlvdXIgb3duLFxuaW5jbHVkaW5nIGxvY2FsIHNlYXJjaCB0b29scyB3aXRoIHN1aXRhYmxlIENMSSIsCiAgIm5hbWUiOiAiSnVzdCBBbm90aGVyIFNlYXJjaCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLXNoZWxsLmV4dGVuc2lvbnMuanVzdC1hbm90aGVyLXNlYXJjaC1iYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veGVsYWQwbS9qdXN0LWFub3RoZXItc2VhcmNoLWJhciIsCiAgInV1aWQiOiAianVzdC1hbm90aGVyLXNlYXJjaC1iYXJAeGVsYWQwbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} +, {"uuid": "compact-quick-settings@gnome-shell-extensions.mariospr.org", "name": "Compact Quick Settings", "pname": "compact-quick-settings", "description": "Compact quick settings menu for GNOME 43 and newer", "link": "https://extensions.gnome.org/extension/5527/compact-quick-settings/", "shell_version_map": {"43": {"version": "3", "sha256": "04ffksmfc27gya24x2fj0zpax3yj1kwjdwn33a99rxpypmicvpwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBhY3QgcXVpY2sgc2V0dGluZ3MgbWVudSBmb3IgR05PTUUgNDMgYW5kIG5ld2VyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiIiwKICAibmFtZSI6ICJDb21wYWN0IFF1aWNrIFNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmlvc3ByL2NvbXBhY3QtcXVpY2stc2V0dGluZ3MtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJjb21wYWN0LXF1aWNrLXNldHRpbmdzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMubWFyaW9zcHIub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "circular@widgets.io", "name": "Circular Widgets", "pname": "circular-widgets", "description": "Conky Like widgets but with few customisation options\n- Drag and Drop Support\n- Added Non customisable Calendar\n- Added Net Speed Widget\n- Highly Customisable Ram, Cpu, Clock and Net Speed Widget\nFor any issues,bugs and suggestions plz open an issue on Github", "link": "https://extensions.gnome.org/extension/5530/circular-widgets/", "shell_version_map": {"43": {"version": "6", "sha256": "1cbgjlyfh8y741aswps61qyi3cz6vlv6wn1isbv47x7p40rhfxy3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmt5IExpa2Ugd2lkZ2V0cyBidXQgd2l0aCBmZXcgY3VzdG9taXNhdGlvbiBvcHRpb25zXG4tIERyYWcgYW5kIERyb3AgU3VwcG9ydFxuLSBBZGRlZCBOb24gY3VzdG9taXNhYmxlIENhbGVuZGFyXG4tIEFkZGVkIE5ldCBTcGVlZCBXaWRnZXRcbi0gSGlnaGx5IEN1c3RvbWlzYWJsZSBSYW0sIENwdSwgQ2xvY2sgYW5kIE5ldCBTcGVlZCBXaWRnZXRcbkZvciBhbnkgaXNzdWVzLGJ1Z3MgYW5kIHN1Z2dlc3Rpb25zIHBseiBvcGVuIGFuIGlzc3VlIG9uIEdpdGh1YiIsCiAgIm5hbWUiOiAiQ2lyY3VsYXIgV2lkZ2V0cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jaXJjdWxhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL2NpcmN1bGFyLXdpZGdldHMiLAogICJ1dWlkIjogImNpcmN1bGFyQHdpZGdldHMuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}}} +, {"uuid": "nanakshahi-date@sarabveer", "name": "Nanakshahi Date", "pname": "nanakshahi-date", "description": "Shows Nanakshahi date on the panel.", "link": "https://extensions.gnome.org/extension/5533/nanakshahi-date/", "shell_version_map": {"40": {"version": "2", "sha256": "1wy0saijnj5z2gb3js9wbr1vnkh5v4hl4n0mzw2m4bvxd5vvqyfc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIE5hbmFrc2hhaGkgZGF0ZSBvbiB0aGUgcGFuZWwuIiwKICAibmFtZSI6ICJOYW5ha3NoYWhpIERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FyYWJ2ZWVyL25hbmFrc2hhaGktZ25vbWUiLAogICJ1dWlkIjogIm5hbmFrc2hhaGktZGF0ZUBzYXJhYnZlZXIiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1wy0saijnj5z2gb3js9wbr1vnkh5v4hl4n0mzw2m4bvxd5vvqyfc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIE5hbmFrc2hhaGkgZGF0ZSBvbiB0aGUgcGFuZWwuIiwKICAibmFtZSI6ICJOYW5ha3NoYWhpIERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FyYWJ2ZWVyL25hbmFrc2hhaGktZ25vbWUiLAogICJ1dWlkIjogIm5hbmFrc2hhaGktZGF0ZUBzYXJhYnZlZXIiLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "1wy0saijnj5z2gb3js9wbr1vnkh5v4hl4n0mzw2m4bvxd5vvqyfc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIE5hbmFrc2hhaGkgZGF0ZSBvbiB0aGUgcGFuZWwuIiwKICAibmFtZSI6ICJOYW5ha3NoYWhpIERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FyYWJ2ZWVyL25hbmFrc2hhaGktZ25vbWUiLAogICJ1dWlkIjogIm5hbmFrc2hhaGktZGF0ZUBzYXJhYnZlZXIiLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "1wy0saijnj5z2gb3js9wbr1vnkh5v4hl4n0mzw2m4bvxd5vvqyfc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIE5hbmFrc2hhaGkgZGF0ZSBvbiB0aGUgcGFuZWwuIiwKICAibmFtZSI6ICJOYW5ha3NoYWhpIERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FyYWJ2ZWVyL25hbmFrc2hhaGktZ25vbWUiLAogICJ1dWlkIjogIm5hbmFrc2hhaGktZGF0ZUBzYXJhYnZlZXIiLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "customreboot@nova1545", "name": "Custom Reboot", "pname": "custom-reboot", "description": "Reboot into another OS directly from GNOME.\nOriginal Version: https://github.com/docquantum/gnome-shell-extension-customreboot\nAll credit goes to Docquantum, I just ported it to GNOME 43", "link": "https://extensions.gnome.org/extension/5542/custom-reboot/", "shell_version_map": {"43": {"version": "1", "sha256": "1ky3jd2f1xm5yrg5jcppxvn1pyq1il3rfka7p29gyclwldfwaqk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBpbnRvIGFub3RoZXIgT1MgZGlyZWN0bHkgZnJvbSBHTk9NRS5cbk9yaWdpbmFsIFZlcnNpb246IGh0dHBzOi8vZ2l0aHViLmNvbS9kb2NxdWFudHVtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jdXN0b21yZWJvb3RcbkFsbCBjcmVkaXQgZ29lcyB0byBEb2NxdWFudHVtLCBJIGp1c3QgcG9ydGVkIGl0IHRvIEdOT01FIDQzIiwKICAibmFtZSI6ICJDdXN0b20gUmVib290IiwKICAib3JpZ2luYWwtYXV0aG9yIjogIk5vdmExNTQ1IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vdmExNTQ1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1jdXN0b21yZWJvb3QiLAogICJ1dWlkIjogImN1c3RvbXJlYm9vdEBub3ZhMTU0NSIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "custom-accent-colors@demiskp", "name": "Custom Accent Colors", "pname": "custom-accent-colors", "description": "Custom Accent Color support for GTK4/GTK3 apps and the Gnome Shell.", "link": "https://extensions.gnome.org/extension/5547/custom-accent-colors/", "shell_version_map": {"43": {"version": "4", "sha256": "07mfm8k43l87xffq5x87mvd65hgyc678zkkw5iqxlv2gh51dpbwz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbSBBY2NlbnQgQ29sb3Igc3VwcG9ydCBmb3IgR1RLNC9HVEszIGFwcHMgYW5kIHRoZSBHbm9tZSBTaGVsbC4iLAogICJuYW1lIjogIkN1c3RvbSBBY2NlbnQgQ29sb3JzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlbWlza3AvY3VzdG9tLWFjY2VudC1jb2xvcnMiLAogICJ1dWlkIjogImN1c3RvbS1hY2NlbnQtY29sb3JzQGRlbWlza3AiLAogICJ2ZXJzaW9uIjogNAp9"}}} +, {"uuid": "dynamic-calendar-and-clocks-icons@fcusr.github.com", "name": "Dynamic Calendar, Clocks and Weather Icons", "pname": "dynamic-calendar-and-clocks-icons", "description": "Let Calendar, Clocks and Weather icons show current date, time and weather.", "link": "https://extensions.gnome.org/extension/5550/dynamic-calendar-and-clocks-icons/", "shell_version_map": {"43": {"version": "6", "sha256": "07vkbmyi2bxh6328qn01gwvm2anhpnkknhhdy97qqd5si10csv83", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBDYWxlbmRhciwgQ2xvY2tzIGFuZCBXZWF0aGVyIGljb25zIHNob3cgY3VycmVudCBkYXRlLCB0aW1lIGFuZCB3ZWF0aGVyLiIsCiAgIm5hbWUiOiAiRHluYW1pYyBDYWxlbmRhciwgQ2xvY2tzIGFuZCBXZWF0aGVyIEljb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZjdXNyL2R5bmFtaWMtY2FsZW5kYXItYW5kLWNsb2Nrcy1pY29ucyIsCiAgInV1aWQiOiAiZHluYW1pYy1jYWxlbmRhci1hbmQtY2xvY2tzLWljb25zQGZjdXNyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} +, {"uuid": "showmethetext@Guleri24.github.com", "name": "Show Me The Text", "pname": "show-me-the-text", "description": "Shows desired text on the right side of the top bar ;-)", "link": "https://extensions.gnome.org/extension/5556/show-me-the-text/", "shell_version_map": {"42": {"version": "2", "sha256": "0wcxzizbjc54i956kml1f3insbkri6fz34xbcm1iiaw2p3q0f9fn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGRlc2lyZWQgdGV4dCBvbiB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgdG9wIGJhciA7LSkiLAogICJuYW1lIjogIlNob3cgTWUgVGhlIFRleHQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvd21ldGhldGV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3VsZXJpMjQvc2hvdy1tZS10aGUtdGV4dCIsCiAgInV1aWQiOiAic2hvd21ldGhldGV4dEBHdWxlcmkyNC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "43": {"version": "2", "sha256": "0wcxzizbjc54i956kml1f3insbkri6fz34xbcm1iiaw2p3q0f9fn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGRlc2lyZWQgdGV4dCBvbiB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgdG9wIGJhciA7LSkiLAogICJuYW1lIjogIlNob3cgTWUgVGhlIFRleHQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvd21ldGhldGV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3VsZXJpMjQvc2hvdy1tZS10aGUtdGV4dCIsCiAgInV1aWQiOiAic2hvd21ldGhldGV4dEBHdWxlcmkyNC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "ziion@halborn.com", "name": "ZIIONext", "pname": "ziionext", "description": "GNOME extension for branding and customisation of Ziion\nThe smart contract auditing VM used by https://halborn.com.\n\nThis extension is a heavily modified fork of https://github.com/Aryan20/Logomenu and uses it as a base. Get more information on ZIION at https://ziion.org.", "link": "https://extensions.gnome.org/extension/5559/ziionext/", "shell_version_map": {"38": {"version": "2", "sha256": "1va05s7320h1j2ryzcnhcp4hy9sfn3aw9vcyvn7qpjqb9cp1vj27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxib3JubGFicy9aSUlPTmV4dCIsCiAgInV1aWQiOiAiemlpb25AaGFsYm9ybi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "1va05s7320h1j2ryzcnhcp4hy9sfn3aw9vcyvn7qpjqb9cp1vj27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxib3JubGFicy9aSUlPTmV4dCIsCiAgInV1aWQiOiAiemlpb25AaGFsYm9ybi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1va05s7320h1j2ryzcnhcp4hy9sfn3aw9vcyvn7qpjqb9cp1vj27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxib3JubGFicy9aSUlPTmV4dCIsCiAgInV1aWQiOiAiemlpb25AaGFsYm9ybi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "1va05s7320h1j2ryzcnhcp4hy9sfn3aw9vcyvn7qpjqb9cp1vj27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxib3JubGFicy9aSUlPTmV4dCIsCiAgInV1aWQiOiAiemlpb25AaGFsYm9ybi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "1va05s7320h1j2ryzcnhcp4hy9sfn3aw9vcyvn7qpjqb9cp1vj27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxib3JubGFicy9aSUlPTmV4dCIsCiAgInV1aWQiOiAiemlpb25AaGFsYm9ybi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "window-app-switcher-on-active-monitor@NiKnights.com", "name": "Window/App switcher on active monitor", "pname": "monitor-window-switcher-2", "description": "GNOME shell extension that puts the Window/App switcher on the active monitor (monitor with the cursor).\n\nThis extension is a fork of https://github.com/gedzeppelin/monitor-window-switcher.", "link": "https://extensions.gnome.org/extension/5568/monitor-window-switcher-2/", "shell_version_map": {"38": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} +, {"uuid": "focus-window@chris.al", "name": "Focus Window", "pname": "focus-window", "description": "Do you want a pulldown mode on your terminal without having to switch to tilda or guake? Do you want to focus your Spotify app or email client with a single shortcut key? Then this extension is for you!\n\nThis extension allows one to create various shortcuts for applications, enabling the ability to have one shortcut that triggers both the launch and focus of an application window.", "link": "https://extensions.gnome.org/extension/5571/focus-window/", "shell_version_map": {"42": {"version": "1", "sha256": "1lyz695wqn8zlcbdk9f0c94jmxq9czgnc71s9cndd6vw73pz7z4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvIHlvdSB3YW50IGEgcHVsbGRvd24gbW9kZSBvbiB5b3VyIHRlcm1pbmFsIHdpdGhvdXQgaGF2aW5nIHRvIHN3aXRjaCB0byB0aWxkYSBvciBndWFrZT8gRG8geW91IHdhbnQgdG8gZm9jdXMgeW91ciBTcG90aWZ5IGFwcCBvciBlbWFpbCBjbGllbnQgd2l0aCBhIHNpbmdsZSBzaG9ydGN1dCBrZXk/IFRoZW4gdGhpcyBleHRlbnNpb24gaXMgZm9yIHlvdSFcblxuVGhpcyBleHRlbnNpb24gYWxsb3dzIG9uZSB0byBjcmVhdGUgdmFyaW91cyBzaG9ydGN1dHMgZm9yIGFwcGxpY2F0aW9ucywgZW5hYmxpbmcgdGhlIGFiaWxpdHkgdG8gaGF2ZSBvbmUgc2hvcnRjdXQgdGhhdCB0cmlnZ2VycyBib3RoIHRoZSBsYXVuY2ggYW5kIGZvY3VzIG9mIGFuIGFwcGxpY2F0aW9uIHdpbmRvdy4iLAogICJuYW1lIjogIkZvY3VzIFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wY2Jvd2Vycy9mb2N1cy13aW5kb3ciLAogICJ1dWlkIjogImZvY3VzLXdpbmRvd0BjaHJpcy5hbCIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "power-profile-switcher@eliapasquali.github.io", "name": "Power Profile Switcher", "pname": "power-profile-switcher", "description": "Automatically switch between power profiles based on power supply and percentage.", "link": "https://extensions.gnome.org/extension/5575/power-profile-switcher/", "shell_version_map": {"42": {"version": "3", "sha256": "1ixv6vl03z8129mygf6hpcgfvyqh1ykjz648d589mpi1nkf32dww", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBwZXJjZW50YWdlLiIsCiAgIm5hbWUiOiAiUG93ZXIgUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWxpYXBhc3F1YWxpL3Bvd2VyLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtc3dpdGNoZXJAZWxpYXBhc3F1YWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "1ixv6vl03z8129mygf6hpcgfvyqh1ykjz648d589mpi1nkf32dww", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBwZXJjZW50YWdlLiIsCiAgIm5hbWUiOiAiUG93ZXIgUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWxpYXBhc3F1YWxpL3Bvd2VyLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtc3dpdGNoZXJAZWxpYXBhc3F1YWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"uuid": "colorblind-filters@G-dH.github.com", "name": "Colorblind Filters", "pname": "colorblind-filters", "description": "Color filters that should help color-blind users and also developers.\nThe menu includes correction filters and also simulation filters that can show you what color-blind people see. Included are filters for Protanopia, Deuteranopia and Tritanopia, filter strength is adjustable. Available are also filters for desaturation, channel mix, and lightness and color inversions.\n\nPrimary mouse button click on the panel button toggles active filter, secondary click opens configuration menu, middle click toggles high-contrast correction if available and scroll switches filters.\n\nDiscussions and bug reports on the GitHub page linked below, please.", "link": "https://extensions.gnome.org/extension/5589/colorblind-filters/", "shell_version_map": {"38": {"version": "13", "sha256": "19csbc6gxlkq539qk1qxlp1wqzf4q34a90m4cv12q7yi5z2dysxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "13", "sha256": "19csbc6gxlkq539qk1qxlp1wqzf4q34a90m4cv12q7yi5z2dysxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "19csbc6gxlkq539qk1qxlp1wqzf4q34a90m4cv12q7yi5z2dysxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "42": {"version": "13", "sha256": "19csbc6gxlkq539qk1qxlp1wqzf4q34a90m4cv12q7yi5z2dysxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "43": {"version": "13", "sha256": "19csbc6gxlkq539qk1qxlp1wqzf4q34a90m4cv12q7yi5z2dysxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} +, {"uuid": "focused-window-dbus@flexagoon.com", "name": "Focused Window D-Bus", "pname": "focused-window-d-bus", "description": "Exposes a D-Bus method to get active window title and class", "link": "https://extensions.gnome.org/extension/5592/focused-window-d-bus/", "shell_version_map": {"43": {"version": "2", "sha256": "148xqala2fkjgvzn4nnq0nhq8vp6nc2yfrimg3cpwlgp2zi0g7cn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZXMgYSBELUJ1cyBtZXRob2QgdG8gZ2V0IGFjdGl2ZSB3aW5kb3cgdGl0bGUgYW5kIGNsYXNzIiwKICAibmFtZSI6ICJGb2N1c2VkIFdpbmRvdyBELUJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mbGV4YWdvb24vZm9jdXNlZC13aW5kb3ctZGJ1cyIsCiAgInV1aWQiOiAiZm9jdXNlZC13aW5kb3ctZGJ1c0BmbGV4YWdvb24uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "multimonitorswap@dvrlabs.tv", "name": "Multi Monitor Swap ", "pname": "multi-monitor-swap", "description": "Swap windows between monitors.", "link": "https://extensions.gnome.org/extension/5597/multi-monitor-swap/", "shell_version_map": {"40": {"version": "12", "sha256": "03izg1r7zszz2cs2q1qq92r7kqha9wkgbh1ggii011lpdyryarqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3YXAgd2luZG93cyBiZXR3ZWVuIG1vbml0b3JzLiIsCiAgIm5hbWUiOiAiTXVsdGkgTW9uaXRvciBTd2FwICIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdnJsYWJzL211bHRpbW9uaXRvcnN3YXAiLAogICJ1dWlkIjogIm11bHRpbW9uaXRvcnN3YXBAZHZybGFicy50diIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "03izg1r7zszz2cs2q1qq92r7kqha9wkgbh1ggii011lpdyryarqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3YXAgd2luZG93cyBiZXR3ZWVuIG1vbml0b3JzLiIsCiAgIm5hbWUiOiAiTXVsdGkgTW9uaXRvciBTd2FwICIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdnJsYWJzL211bHRpbW9uaXRvcnN3YXAiLAogICJ1dWlkIjogIm11bHRpbW9uaXRvcnN3YXBAZHZybGFicy50diIsCiAgInZlcnNpb24iOiAxMgp9"}, "42": {"version": "12", "sha256": "03izg1r7zszz2cs2q1qq92r7kqha9wkgbh1ggii011lpdyryarqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3YXAgd2luZG93cyBiZXR3ZWVuIG1vbml0b3JzLiIsCiAgIm5hbWUiOiAiTXVsdGkgTW9uaXRvciBTd2FwICIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdnJsYWJzL211bHRpbW9uaXRvcnN3YXAiLAogICJ1dWlkIjogIm11bHRpbW9uaXRvcnN3YXBAZHZybGFicy50diIsCiAgInZlcnNpb24iOiAxMgp9"}, "43": {"version": "12", "sha256": "03izg1r7zszz2cs2q1qq92r7kqha9wkgbh1ggii011lpdyryarqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3YXAgd2luZG93cyBiZXR3ZWVuIG1vbml0b3JzLiIsCiAgIm5hbWUiOiAiTXVsdGkgTW9uaXRvciBTd2FwICIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdnJsYWJzL211bHRpbW9uaXRvcnN3YXAiLAogICJ1dWlkIjogIm11bHRpbW9uaXRvcnN3YXBAZHZybGFicy50diIsCiAgInZlcnNpb24iOiAxMgp9"}}} +, {"uuid": "osktouchpad@francescocaracciolo.uno", "name": "OSK/Touchpad inverse toggle", "pname": "osktouchpad-inverse-toggle", "description": "This extension enables On Screek Keyboard from accessibility settings when touchpad is turned off, and disables it when it's on. Useful for 2 in 1 when tablet mode is not properly recognized.", "link": "https://extensions.gnome.org/extension/5603/osktouchpad-inverse-toggle/", "shell_version_map": {"40": {"version": "3", "sha256": "09l4m6vb5gg8msmgzqq257ch43j4krspsidg0i23zjwd4s6a88ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGVuYWJsZXMgT24gU2NyZWVrIEtleWJvYXJkIGZyb20gYWNjZXNzaWJpbGl0eSBzZXR0aW5ncyB3aGVuIHRvdWNocGFkIGlzIHR1cm5lZCBvZmYsIGFuZCBkaXNhYmxlcyBpdCB3aGVuIGl0J3Mgb24uIFVzZWZ1bCBmb3IgMiBpbiAxIHdoZW4gdGFibGV0IG1vZGUgaXMgbm90IHByb3Blcmx5IHJlY29nbml6ZWQuIiwKICAibmFtZSI6ICJPU0svVG91Y2hwYWQgaW52ZXJzZSB0b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRnJhbmNlc2NvQ2FyYWNjaW9sby9PU0stVG91Y2hwYWQtaW52ZXJzZS10b2dnbGUtR25vbWUtRXh0IiwKICAidXVpZCI6ICJvc2t0b3VjaHBhZEBmcmFuY2VzY29jYXJhY2Npb2xvLnVubyIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "09l4m6vb5gg8msmgzqq257ch43j4krspsidg0i23zjwd4s6a88ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGVuYWJsZXMgT24gU2NyZWVrIEtleWJvYXJkIGZyb20gYWNjZXNzaWJpbGl0eSBzZXR0aW5ncyB3aGVuIHRvdWNocGFkIGlzIHR1cm5lZCBvZmYsIGFuZCBkaXNhYmxlcyBpdCB3aGVuIGl0J3Mgb24uIFVzZWZ1bCBmb3IgMiBpbiAxIHdoZW4gdGFibGV0IG1vZGUgaXMgbm90IHByb3Blcmx5IHJlY29nbml6ZWQuIiwKICAibmFtZSI6ICJPU0svVG91Y2hwYWQgaW52ZXJzZSB0b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRnJhbmNlc2NvQ2FyYWNjaW9sby9PU0stVG91Y2hwYWQtaW52ZXJzZS10b2dnbGUtR25vbWUtRXh0IiwKICAidXVpZCI6ICJvc2t0b3VjaHBhZEBmcmFuY2VzY29jYXJhY2Npb2xvLnVubyIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "09l4m6vb5gg8msmgzqq257ch43j4krspsidg0i23zjwd4s6a88ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGVuYWJsZXMgT24gU2NyZWVrIEtleWJvYXJkIGZyb20gYWNjZXNzaWJpbGl0eSBzZXR0aW5ncyB3aGVuIHRvdWNocGFkIGlzIHR1cm5lZCBvZmYsIGFuZCBkaXNhYmxlcyBpdCB3aGVuIGl0J3Mgb24uIFVzZWZ1bCBmb3IgMiBpbiAxIHdoZW4gdGFibGV0IG1vZGUgaXMgbm90IHByb3Blcmx5IHJlY29nbml6ZWQuIiwKICAibmFtZSI6ICJPU0svVG91Y2hwYWQgaW52ZXJzZSB0b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRnJhbmNlc2NvQ2FyYWNjaW9sby9PU0stVG91Y2hwYWQtaW52ZXJzZS10b2dnbGUtR25vbWUtRXh0IiwKICAidXVpZCI6ICJvc2t0b3VjaHBhZEBmcmFuY2VzY29jYXJhY2Npb2xvLnVubyIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "09l4m6vb5gg8msmgzqq257ch43j4krspsidg0i23zjwd4s6a88ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGVuYWJsZXMgT24gU2NyZWVrIEtleWJvYXJkIGZyb20gYWNjZXNzaWJpbGl0eSBzZXR0aW5ncyB3aGVuIHRvdWNocGFkIGlzIHR1cm5lZCBvZmYsIGFuZCBkaXNhYmxlcyBpdCB3aGVuIGl0J3Mgb24uIFVzZWZ1bCBmb3IgMiBpbiAxIHdoZW4gdGFibGV0IG1vZGUgaXMgbm90IHByb3Blcmx5IHJlY29nbml6ZWQuIiwKICAibmFtZSI6ICJPU0svVG91Y2hwYWQgaW52ZXJzZSB0b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRnJhbmNlc2NvQ2FyYWNjaW9sby9PU0stVG91Y2hwYWQtaW52ZXJzZS10b2dnbGUtR25vbWUtRXh0IiwKICAidXVpZCI6ICJvc2t0b3VjaHBhZEBmcmFuY2VzY29jYXJhY2Npb2xvLnVubyIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"uuid": "tado-gnome-shell-extension@fio.ie", "name": "Tado°", "pname": "tado", "description": "Manages Tado° home heating. This extension is not affiliated, funded, or in any way associated with Tado", "link": "https://extensions.gnome.org/extension/5606/tado/", "shell_version_map": {"43": {"version": "7", "sha256": "1259rvgj9lbb354avj76wdgizg01cas4fj7wdnd7j8qlgx0k68yz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZXMgVGFkb1x1MDBiMCBob21lIGhlYXRpbmcuICBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBUYWRvIiwKICAibmFtZSI6ICJUYWRvXHUwMGIwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rtem9uZWlsbC90YWRvLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGFkby1nbm9tZS1zaGVsbC1leHRlbnNpb25AZmlvLmllIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} +, {"uuid": "indicate-focus@leleat-on-github", "name": "Focus Indicator", "pname": "focus-indicator", "description": "See https://discourse.gnome.org/t/window-focus-call-for-testing/13277/78. The experiment ended.", "link": "https://extensions.gnome.org/extension/5612/focus-indicator/", "shell_version_map": {"43": {"version": "10", "sha256": "019wv94p74ynyqgg1jarrb36k648vpxv4n7wyp45x2nxxnxm5g8l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSBodHRwczovL2Rpc2NvdXJzZS5nbm9tZS5vcmcvdC93aW5kb3ctZm9jdXMtY2FsbC1mb3ItdGVzdGluZy8xMzI3Ny83OC4gVGhlIGV4cGVyaW1lbnQgZW5kZWQuIiwKICAibmFtZSI6ICJGb2N1cyBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW5kaWNhdGUtZm9jdXMtcHJvdG90eXBlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlbGVhdC9mb2N1cy1pbmRpY2F0b3ItcHJvdG90eXBlIiwKICAidXVpZCI6ICJpbmRpY2F0ZS1mb2N1c0BsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDEwCn0="}}} +, {"uuid": "battery-indicator@jgotti.org", "name": "Battery indicator (upower)", "pname": "battery-indicator-upower", "description": "Display battery level indicators for connected devices (such as mouse, keyboard, game controller, touchpad ...) as reported by upower.\n\nDefault refresh time is 5 minutes but can be changed in settings. Informations that are displayed in italic reflect information that upower report as \"should ignore\", as sometimes informations reported by upower are not that reliable. \n\nAdditionnaly you can simply click devices in the popup menu to set their display in the indicator, the checkmark reflect whether it will be displayed or not (will always display at least on device).\n\nmore info at https://github.com/malko/battery-indicator-upower", "link": "https://extensions.gnome.org/extension/5615/battery-indicator-upower/", "shell_version_map": {"42": {"version": "4", "sha256": "19cv0nw6h14r2qh72z267kfb9w72ml1j2lx5d26gpa4k2r5dzwf6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYmF0dGVyeSBsZXZlbCBpbmRpY2F0b3JzIGZvciBjb25uZWN0ZWQgZGV2aWNlcyAoc3VjaCBhcyBtb3VzZSwga2V5Ym9hcmQsIGdhbWUgY29udHJvbGxlciwgdG91Y2hwYWQgLi4uKSBhcyByZXBvcnRlZCBieSB1cG93ZXIuXG5cbkRlZmF1bHQgcmVmcmVzaCB0aW1lIGlzIDUgbWludXRlcyBidXQgY2FuIGJlIGNoYW5nZWQgaW4gc2V0dGluZ3MuICBJbmZvcm1hdGlvbnMgdGhhdCBhcmUgZGlzcGxheWVkIGluIGl0YWxpYyByZWZsZWN0IGluZm9ybWF0aW9uIHRoYXQgdXBvd2VyIHJlcG9ydCBhcyBcInNob3VsZCBpZ25vcmVcIiwgYXMgc29tZXRpbWVzIGluZm9ybWF0aW9ucyByZXBvcnRlZCBieSB1cG93ZXIgYXJlIG5vdCB0aGF0IHJlbGlhYmxlLiBcblxuQWRkaXRpb25uYWx5IHlvdSBjYW4gc2ltcGx5IGNsaWNrIGRldmljZXMgaW4gdGhlIHBvcHVwIG1lbnUgdG8gc2V0IHRoZWlyIGRpc3BsYXkgaW4gdGhlIGluZGljYXRvciwgdGhlIGNoZWNrbWFyayByZWZsZWN0IHdoZXRoZXIgaXQgd2lsbCBiZSBkaXNwbGF5ZWQgb3Igbm90ICh3aWxsIGFsd2F5cyBkaXNwbGF5IGF0IGxlYXN0IG9uIGRldmljZSkuXG5cbm1vcmUgaW5mbyBhdCBodHRwczovL2dpdGh1Yi5jb20vbWFsa28vYmF0dGVyeS1pbmRpY2F0b3ItdXBvd2VyIiwKICAibmFtZSI6ICJCYXR0ZXJ5IGluZGljYXRvciAodXBvd2VyKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci11cG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hbGtvL2JhdHRlcnktaW5kaWNhdG9yLXVwb3dlciIsCiAgInV1aWQiOiAiYmF0dGVyeS1pbmRpY2F0b3JAamdvdHRpLm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "19cv0nw6h14r2qh72z267kfb9w72ml1j2lx5d26gpa4k2r5dzwf6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYmF0dGVyeSBsZXZlbCBpbmRpY2F0b3JzIGZvciBjb25uZWN0ZWQgZGV2aWNlcyAoc3VjaCBhcyBtb3VzZSwga2V5Ym9hcmQsIGdhbWUgY29udHJvbGxlciwgdG91Y2hwYWQgLi4uKSBhcyByZXBvcnRlZCBieSB1cG93ZXIuXG5cbkRlZmF1bHQgcmVmcmVzaCB0aW1lIGlzIDUgbWludXRlcyBidXQgY2FuIGJlIGNoYW5nZWQgaW4gc2V0dGluZ3MuICBJbmZvcm1hdGlvbnMgdGhhdCBhcmUgZGlzcGxheWVkIGluIGl0YWxpYyByZWZsZWN0IGluZm9ybWF0aW9uIHRoYXQgdXBvd2VyIHJlcG9ydCBhcyBcInNob3VsZCBpZ25vcmVcIiwgYXMgc29tZXRpbWVzIGluZm9ybWF0aW9ucyByZXBvcnRlZCBieSB1cG93ZXIgYXJlIG5vdCB0aGF0IHJlbGlhYmxlLiBcblxuQWRkaXRpb25uYWx5IHlvdSBjYW4gc2ltcGx5IGNsaWNrIGRldmljZXMgaW4gdGhlIHBvcHVwIG1lbnUgdG8gc2V0IHRoZWlyIGRpc3BsYXkgaW4gdGhlIGluZGljYXRvciwgdGhlIGNoZWNrbWFyayByZWZsZWN0IHdoZXRoZXIgaXQgd2lsbCBiZSBkaXNwbGF5ZWQgb3Igbm90ICh3aWxsIGFsd2F5cyBkaXNwbGF5IGF0IGxlYXN0IG9uIGRldmljZSkuXG5cbm1vcmUgaW5mbyBhdCBodHRwczovL2dpdGh1Yi5jb20vbWFsa28vYmF0dGVyeS1pbmRpY2F0b3ItdXBvd2VyIiwKICAibmFtZSI6ICJCYXR0ZXJ5IGluZGljYXRvciAodXBvd2VyKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci11cG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hbGtvL2JhdHRlcnktaW5kaWNhdG9yLXVwb3dlciIsCiAgInV1aWQiOiAiYmF0dGVyeS1pbmRpY2F0b3JAamdvdHRpLm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"uuid": "visualizer@sound.org", "name": "Sound Visualizer", "pname": "sound-visualizer", "description": "A Real Time Sound Visualizer Based On Gstreamer\nFor any Issues,Bugs and Suggestions please open an issue on Github", "link": "https://extensions.gnome.org/extension/5624/sound-visualizer/", "shell_version_map": {"38": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"uuid": "device-power-indicator@ranger-ross.github.io", "name": "Device Power Indicator", "pname": "device-power-indicator", "description": "Shows device power percentage for keyboards and mice", "link": "https://extensions.gnome.org/extension/5627/device-power-indicator/", "shell_version_map": {"41": {"version": "2", "sha256": "1q3wvh734chckca8h4zyhwc681k6xdqfaz7lbsmchy3arfhw4w0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGRldmljZSBwb3dlciBwZXJjZW50YWdlIGZvciBrZXlib2FyZHMgYW5kIG1pY2UiLAogICJuYW1lIjogIkRldmljZSBQb3dlciBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYW5nZXItcm9zcy9nbm9tZS1kZXZpY2UtcG93ZXItaW5kaWNhdG9yIiwKICAidXVpZCI6ICJkZXZpY2UtcG93ZXItaW5kaWNhdG9yQHJhbmdlci1yb3NzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "1q3wvh734chckca8h4zyhwc681k6xdqfaz7lbsmchy3arfhw4w0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGRldmljZSBwb3dlciBwZXJjZW50YWdlIGZvciBrZXlib2FyZHMgYW5kIG1pY2UiLAogICJuYW1lIjogIkRldmljZSBQb3dlciBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYW5nZXItcm9zcy9nbm9tZS1kZXZpY2UtcG93ZXItaW5kaWNhdG9yIiwKICAidXVpZCI6ICJkZXZpY2UtcG93ZXItaW5kaWNhdG9yQHJhbmdlci1yb3NzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "43": {"version": "2", "sha256": "1q3wvh734chckca8h4zyhwc681k6xdqfaz7lbsmchy3arfhw4w0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGRldmljZSBwb3dlciBwZXJjZW50YWdlIGZvciBrZXlib2FyZHMgYW5kIG1pY2UiLAogICJuYW1lIjogIkRldmljZSBQb3dlciBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYW5nZXItcm9zcy9nbm9tZS1kZXZpY2UtcG93ZXItaW5kaWNhdG9yIiwKICAidXVpZCI6ICJkZXZpY2UtcG93ZXItaW5kaWNhdG9yQHJhbmdlci1yb3NzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "imageoverlay@nw.nwhirschfeld.de", "name": "Image Overlay", "pname": "image-overlay", "description": "This GNOME Shell extension allows you to configure multiple images as overlays and bind them to keyboard shortcuts. Possible use cases include quickly accessing cheat sheets or covering your work.", "link": "https://extensions.gnome.org/extension/5630/image-overlay/", "shell_version_map": {"43": {"version": "2", "sha256": "10b748x6kjrmwbwdsbsz1ld2cs9kyvz5qxckw43r33n98h33i2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIGFsbG93cyB5b3UgdG8gY29uZmlndXJlIG11bHRpcGxlIGltYWdlcyBhcyBvdmVybGF5cyBhbmQgYmluZCB0aGVtIHRvIGtleWJvYXJkIHNob3J0Y3V0cy4gUG9zc2libGUgdXNlIGNhc2VzIGluY2x1ZGUgcXVpY2tseSBhY2Nlc3NpbmcgY2hlYXQgc2hlZXRzIG9yIGNvdmVyaW5nIHlvdXIgd29yay4iLAogICJuYW1lIjogIkltYWdlIE92ZXJsYXkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1hZ2VvdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL253aGlyc2NoZmVsZC9JbWFnZS1PdmVybGF5IiwKICAidXVpZCI6ICJpbWFnZW92ZXJsYXlAbncubndoaXJzY2hmZWxkLmRlIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "stonks@0x41ndrea.gitlab.com", "name": "Stonks", "pname": "stonks", "description": "Stonks is an extension for tracking the latest price of your favourite stocks using finance.yahoo.com API", "link": "https://extensions.gnome.org/extension/5633/stonks/", "shell_version_map": {"43": {"version": "2", "sha256": "11i0x7gakgq9q84548zhmdncm0l8dhjyhn9cpgxs92cvlqhyd4yx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0b25rcyBpcyBhbiBleHRlbnNpb24gZm9yIHRyYWNraW5nIHRoZSBsYXRlc3QgcHJpY2Ugb2YgeW91ciBmYXZvdXJpdGUgc3RvY2tzIHVzaW5nIGZpbmFuY2UueWFob28uY29tIEFQSSIsCiAgIm5hbWUiOiAiU3RvbmtzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tLzB4NDFuZHJlYS9nbm9tZS1zaGVsbC1zdG9ua3MiLAogICJ1dWlkIjogInN0b25rc0AweDQxbmRyZWEuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "shortcutbutton@antoine-meloche.github.com", "name": "Shortcut Button", "pname": "shortcut-button", "description": "A Button to execute a command in your shell panel", "link": "https://extensions.gnome.org/extension/5636/shortcut-button/", "shell_version_map": {"42": {"version": "3", "sha256": "1ikvqpiznnmm3ykf84v6i9xj8dximnyyfa6ykmq7cdps0qa9fx1x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgQnV0dG9uIHRvIGV4ZWN1dGUgYSBjb21tYW5kIGluIHlvdXIgc2hlbGwgcGFuZWwiLAogICJuYW1lIjogIlNob3J0Y3V0IEJ1dHRvbiIsCiAgInByZWZzX3NjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG9ydGN1dGJ1dHRvbi5nc2NoZW1hLnhtbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BbnRvaW5lLU1lbG9jaGUvU2hvcnRjdXRCdXR0b24iLAogICJ1dWlkIjogInNob3J0Y3V0YnV0dG9uQGFudG9pbmUtbWVsb2NoZS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "viewsplit@model-map.github.io", "name": "View Split", "pname": "view-split", "description": "Maximize your productivity with View Split, the window management tool that allows you to split windows into top, left, bottom, and right sections", "link": "https://extensions.gnome.org/extension/5651/view-split/", "shell_version_map": {"42": {"version": "2", "sha256": "1cikisv38s91qa399q2bvc4jdz0ysb016bh6paca4av2vkaig89i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1heGltaXplIHlvdXIgcHJvZHVjdGl2aXR5IHdpdGggVmlldyBTcGxpdCwgdGhlIHdpbmRvdyBtYW5hZ2VtZW50IHRvb2wgdGhhdCBhbGxvd3MgeW91IHRvIHNwbGl0IHdpbmRvd3MgaW50byB0b3AsIGxlZnQsIGJvdHRvbSwgYW5kIHJpZ2h0IHNlY3Rpb25zIiwKICAibmFtZSI6ICJWaWV3IFNwbGl0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21vZGVsLW1hcC92aWV3LXNwbGl0LWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidmlld3NwbGl0QG1vZGVsLW1hcC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "floating-panel-usedbymyself@wpism", "name": "Floating Panel-onlyusedbymyself", "pname": "floating-panel", "description": "Floats the panel, if there is a window nearby or maximised, it defloats.", "link": "https://extensions.gnome.org/extension/5657/floating-panel/", "shell_version_map": {"40": {"version": "1", "sha256": "1l54zy5j5i3wslys8034j29lyn1jqv4qxa1hvamxzbvkd7dxj13b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwtb25seXVzZWRieW15c2VsZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmctcGFuZWwiLAogICJ1dWlkIjogImZsb2F0aW5nLXBhbmVsLXVzZWRieW15c2VsZkB3cGlzbSIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "1l54zy5j5i3wslys8034j29lyn1jqv4qxa1hvamxzbvkd7dxj13b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwtb25seXVzZWRieW15c2VsZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmctcGFuZWwiLAogICJ1dWlkIjogImZsb2F0aW5nLXBhbmVsLXVzZWRieW15c2VsZkB3cGlzbSIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "1l54zy5j5i3wslys8034j29lyn1jqv4qxa1hvamxzbvkd7dxj13b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwtb25seXVzZWRieW15c2VsZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmctcGFuZWwiLAogICJ1dWlkIjogImZsb2F0aW5nLXBhbmVsLXVzZWRieW15c2VsZkB3cGlzbSIsCiAgInZlcnNpb24iOiAxCn0="}, "43": {"version": "1", "sha256": "1l54zy5j5i3wslys8034j29lyn1jqv4qxa1hvamxzbvkd7dxj13b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwtb25seXVzZWRieW15c2VsZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmctcGFuZWwiLAogICJ1dWlkIjogImZsb2F0aW5nLXBhbmVsLXVzZWRieW15c2VsZkB3cGlzbSIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "weatherornot@somepaulo.github.io", "name": "Weather or Not", "pname": "weather-or-not", "description": "Display the current weather beside the clock (while also keeping it centered) and click the indicator to open GNOME Weather, which is required for this extension to function properly.\n\nThis is a fork of the Weather O'Clock extension.", "link": "https://extensions.gnome.org/extension/5660/weather-or-not/", "shell_version_map": {"42": {"version": "2", "sha256": "0i34m4s1rrkgmmb8kqwcmbm9fq3k7q91rvhv7znxp46yrk447j4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBiZXNpZGUgdGhlIGNsb2NrICh3aGlsZSBhbHNvIGtlZXBpbmcgaXQgY2VudGVyZWQpIGFuZCBjbGljayB0aGUgaW5kaWNhdG9yIHRvIG9wZW4gR05PTUUgV2VhdGhlciwgd2hpY2ggaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIGZ1bmN0aW9uIHByb3Blcmx5LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgV2VhdGhlciBPJ0Nsb2NrIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIldlYXRoZXIgb3IgTm90IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNvbWVwYXVsb0BkdWNrLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29tZXBhdWxvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13ZWF0aGVyLW9yLW5vdCIsCiAgInV1aWQiOiAid2VhdGhlcm9ybm90QHNvbWVwYXVsby5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "0i34m4s1rrkgmmb8kqwcmbm9fq3k7q91rvhv7znxp46yrk447j4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBiZXNpZGUgdGhlIGNsb2NrICh3aGlsZSBhbHNvIGtlZXBpbmcgaXQgY2VudGVyZWQpIGFuZCBjbGljayB0aGUgaW5kaWNhdG9yIHRvIG9wZW4gR05PTUUgV2VhdGhlciwgd2hpY2ggaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIGZ1bmN0aW9uIHByb3Blcmx5LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgV2VhdGhlciBPJ0Nsb2NrIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIldlYXRoZXIgb3IgTm90IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNvbWVwYXVsb0BkdWNrLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29tZXBhdWxvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13ZWF0aGVyLW9yLW5vdCIsCiAgInV1aWQiOiAid2VhdGhlcm9ybm90QHNvbWVwYXVsby5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "cscotun0-ip-address@cjthedj97.github.com", "name": "cscotun0 IP Address", "pname": "cscotun0-ip-address", "description": "Show cscotun0 IP address on GNOME panel. Do not show loopback addresses (127.0.0.0/8) or other network interface IP addresses. Please install moreutils package as a dependency. Forked from https://github.com/AdamantisSpinae/gnome-extension-tun0-ip-address and modified tunnel interface it looks at.", "link": "https://extensions.gnome.org/extension/5663/cscotun0-ip-address/", "shell_version_map": {"40": {"version": "1", "sha256": "10rfpikf5m3ch39ki44x0vs85jwf9rdj6d1jdr5wwr5jhplz09af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3Njb3R1bjAgSVAgYWRkcmVzcyBvbiBHTk9NRSBwYW5lbC4gRG8gbm90IHNob3cgbG9vcGJhY2sgYWRkcmVzc2VzICgxMjcuMC4wLjAvOCkgb3Igb3RoZXIgbmV0d29yayBpbnRlcmZhY2UgSVAgYWRkcmVzc2VzLiBQbGVhc2UgaW5zdGFsbCBtb3JldXRpbHMgcGFja2FnZSBhcyBhIGRlcGVuZGVuY3kuIEZvcmtlZCBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9BZGFtYW50aXNTcGluYWUvZ25vbWUtZXh0ZW5zaW9uLXR1bjAtaXAtYWRkcmVzcyBhbmQgbW9kaWZpZWQgdHVubmVsIGludGVyZmFjZSBpdCBsb29rcyBhdC4iLAogICJuYW1lIjogImNzY290dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2p0aGVkajk3L2dub21lLWV4dGVuc2lvbi1jc2NvdHVuMC1pcC1hZGRyZXNzLyIsCiAgInV1aWQiOiAiY3Njb3R1bjAtaXAtYWRkcmVzc0BjanRoZWRqOTcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "10rfpikf5m3ch39ki44x0vs85jwf9rdj6d1jdr5wwr5jhplz09af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3Njb3R1bjAgSVAgYWRkcmVzcyBvbiBHTk9NRSBwYW5lbC4gRG8gbm90IHNob3cgbG9vcGJhY2sgYWRkcmVzc2VzICgxMjcuMC4wLjAvOCkgb3Igb3RoZXIgbmV0d29yayBpbnRlcmZhY2UgSVAgYWRkcmVzc2VzLiBQbGVhc2UgaW5zdGFsbCBtb3JldXRpbHMgcGFja2FnZSBhcyBhIGRlcGVuZGVuY3kuIEZvcmtlZCBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9BZGFtYW50aXNTcGluYWUvZ25vbWUtZXh0ZW5zaW9uLXR1bjAtaXAtYWRkcmVzcyBhbmQgbW9kaWZpZWQgdHVubmVsIGludGVyZmFjZSBpdCBsb29rcyBhdC4iLAogICJuYW1lIjogImNzY290dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2p0aGVkajk3L2dub21lLWV4dGVuc2lvbi1jc2NvdHVuMC1pcC1hZGRyZXNzLyIsCiAgInV1aWQiOiAiY3Njb3R1bjAtaXAtYWRkcmVzc0BjanRoZWRqOTcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "10rfpikf5m3ch39ki44x0vs85jwf9rdj6d1jdr5wwr5jhplz09af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3Njb3R1bjAgSVAgYWRkcmVzcyBvbiBHTk9NRSBwYW5lbC4gRG8gbm90IHNob3cgbG9vcGJhY2sgYWRkcmVzc2VzICgxMjcuMC4wLjAvOCkgb3Igb3RoZXIgbmV0d29yayBpbnRlcmZhY2UgSVAgYWRkcmVzc2VzLiBQbGVhc2UgaW5zdGFsbCBtb3JldXRpbHMgcGFja2FnZSBhcyBhIGRlcGVuZGVuY3kuIEZvcmtlZCBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9BZGFtYW50aXNTcGluYWUvZ25vbWUtZXh0ZW5zaW9uLXR1bjAtaXAtYWRkcmVzcyBhbmQgbW9kaWZpZWQgdHVubmVsIGludGVyZmFjZSBpdCBsb29rcyBhdC4iLAogICJuYW1lIjogImNzY290dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2p0aGVkajk3L2dub21lLWV4dGVuc2lvbi1jc2NvdHVuMC1pcC1hZGRyZXNzLyIsCiAgInV1aWQiOiAiY3Njb3R1bjAtaXAtYWRkcmVzc0BjanRoZWRqOTcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "43": {"version": "1", "sha256": "10rfpikf5m3ch39ki44x0vs85jwf9rdj6d1jdr5wwr5jhplz09af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3Njb3R1bjAgSVAgYWRkcmVzcyBvbiBHTk9NRSBwYW5lbC4gRG8gbm90IHNob3cgbG9vcGJhY2sgYWRkcmVzc2VzICgxMjcuMC4wLjAvOCkgb3Igb3RoZXIgbmV0d29yayBpbnRlcmZhY2UgSVAgYWRkcmVzc2VzLiBQbGVhc2UgaW5zdGFsbCBtb3JldXRpbHMgcGFja2FnZSBhcyBhIGRlcGVuZGVuY3kuIEZvcmtlZCBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9BZGFtYW50aXNTcGluYWUvZ25vbWUtZXh0ZW5zaW9uLXR1bjAtaXAtYWRkcmVzcyBhbmQgbW9kaWZpZWQgdHVubmVsIGludGVyZmFjZSBpdCBsb29rcyBhdC4iLAogICJuYW1lIjogImNzY290dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2p0aGVkajk3L2dub21lLWV4dGVuc2lvbi1jc2NvdHVuMC1pcC1hZGRyZXNzLyIsCiAgInV1aWQiOiAiY3Njb3R1bjAtaXAtYWRkcmVzc0BjanRoZWRqOTcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "gnome-compact-top-bar@metehan-arslan.github.io", "name": "Compact Top Bar", "pname": "compact-top-bar", "description": "Adds transparency effects (including notification tray) and slims the top bar for more space. See github page for more screenshots.", "link": "https://extensions.gnome.org/extension/5669/compact-top-bar/", "shell_version_map": {"40": {"version": "1", "sha256": "18chjxyrbd4y8xki0fwzbig7s6sy3bc9rgfy2cpnd5084sb6gjxb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdHJhbnNwYXJlbmN5IGVmZmVjdHMgKGluY2x1ZGluZyBub3RpZmljYXRpb24gdHJheSkgYW5kIHNsaW1zIHRoZSB0b3AgYmFyIGZvciBtb3JlIHNwYWNlLiBTZWUgZ2l0aHViIHBhZ2UgZm9yIG1vcmUgc2NyZWVuc2hvdHMuIiwKICAibmFtZSI6ICJDb21wYWN0IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWV0ZWhhbi1hcnNsYW4vZ25vbWUtY29tcGFjdC10b3AtYmFyIiwKICAidXVpZCI6ICJnbm9tZS1jb21wYWN0LXRvcC1iYXJAbWV0ZWhhbi1hcnNsYW4uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "41": {"version": "1", "sha256": "18chjxyrbd4y8xki0fwzbig7s6sy3bc9rgfy2cpnd5084sb6gjxb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdHJhbnNwYXJlbmN5IGVmZmVjdHMgKGluY2x1ZGluZyBub3RpZmljYXRpb24gdHJheSkgYW5kIHNsaW1zIHRoZSB0b3AgYmFyIGZvciBtb3JlIHNwYWNlLiBTZWUgZ2l0aHViIHBhZ2UgZm9yIG1vcmUgc2NyZWVuc2hvdHMuIiwKICAibmFtZSI6ICJDb21wYWN0IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWV0ZWhhbi1hcnNsYW4vZ25vbWUtY29tcGFjdC10b3AtYmFyIiwKICAidXVpZCI6ICJnbm9tZS1jb21wYWN0LXRvcC1iYXJAbWV0ZWhhbi1hcnNsYW4uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "42": {"version": "1", "sha256": "18chjxyrbd4y8xki0fwzbig7s6sy3bc9rgfy2cpnd5084sb6gjxb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdHJhbnNwYXJlbmN5IGVmZmVjdHMgKGluY2x1ZGluZyBub3RpZmljYXRpb24gdHJheSkgYW5kIHNsaW1zIHRoZSB0b3AgYmFyIGZvciBtb3JlIHNwYWNlLiBTZWUgZ2l0aHViIHBhZ2UgZm9yIG1vcmUgc2NyZWVuc2hvdHMuIiwKICAibmFtZSI6ICJDb21wYWN0IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWV0ZWhhbi1hcnNsYW4vZ25vbWUtY29tcGFjdC10b3AtYmFyIiwKICAidXVpZCI6ICJnbm9tZS1jb21wYWN0LXRvcC1iYXJAbWV0ZWhhbi1hcnNsYW4uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "43": {"version": "1", "sha256": "18chjxyrbd4y8xki0fwzbig7s6sy3bc9rgfy2cpnd5084sb6gjxb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdHJhbnNwYXJlbmN5IGVmZmVjdHMgKGluY2x1ZGluZyBub3RpZmljYXRpb24gdHJheSkgYW5kIHNsaW1zIHRoZSB0b3AgYmFyIGZvciBtb3JlIHNwYWNlLiBTZWUgZ2l0aHViIHBhZ2UgZm9yIG1vcmUgc2NyZWVuc2hvdHMuIiwKICAibmFtZSI6ICJDb21wYWN0IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWV0ZWhhbi1hcnNsYW4vZ25vbWUtY29tcGFjdC10b3AtYmFyIiwKICAidXVpZCI6ICJnbm9tZS1jb21wYWN0LXRvcC1iYXJAbWV0ZWhhbi1hcnNsYW4uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} +, {"uuid": "persistent-notifications@AlexeyReshetnyak", "name": "Persistent Notifications", "pname": "persistent-notifications", "description": "Never hide a new notification, except if you close it.", "link": "https://extensions.gnome.org/extension/5672/persistent-notifications/", "shell_version_map": {"40": {"version": "1", "sha256": "0y0vk8dva14yfbgdss00sl42wdwbf5mhpc9vhapbl773fdr5l2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldmVyIGhpZGUgYSBuZXcgbm90aWZpY2F0aW9uLCBleGNlcHQgaWYgeW91IGNsb3NlIGl0LiIsCiAgIm5hbWUiOiAiUGVyc2lzdGVudCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxleGV5UmVzaGV0bnlhay9wZXJzaXN0ZW50LW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogInBlcnNpc3RlbnQtbm90aWZpY2F0aW9uc0BBbGV4ZXlSZXNoZXRueWFrIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "42": {"version": "1", "sha256": "0y0vk8dva14yfbgdss00sl42wdwbf5mhpc9vhapbl773fdr5l2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldmVyIGhpZGUgYSBuZXcgbm90aWZpY2F0aW9uLCBleGNlcHQgaWYgeW91IGNsb3NlIGl0LiIsCiAgIm5hbWUiOiAiUGVyc2lzdGVudCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxleGV5UmVzaGV0bnlhay9wZXJzaXN0ZW50LW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogInBlcnNpc3RlbnQtbm90aWZpY2F0aW9uc0BBbGV4ZXlSZXNoZXRueWFrIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "43": {"version": "1", "sha256": "0y0vk8dva14yfbgdss00sl42wdwbf5mhpc9vhapbl773fdr5l2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldmVyIGhpZGUgYSBuZXcgbm90aWZpY2F0aW9uLCBleGNlcHQgaWYgeW91IGNsb3NlIGl0LiIsCiAgIm5hbWUiOiAiUGVyc2lzdGVudCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxleGV5UmVzaGV0bnlhay9wZXJzaXN0ZW50LW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogInBlcnNpc3RlbnQtbm90aWZpY2F0aW9uc0BBbGV4ZXlSZXNoZXRueWFrIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} +, {"uuid": "azclock336@andreasplesch.gitlab.com", "name": "Desktop Clock Legacy", "pname": "desktop-clock-legacy", "description": "Add a clock to the desktop ! Please use dconf-editor to change settings.\nThis extension is a simple fork of the 'Desktop Clock' extension modified to work with Gnome Shell 3.36. This requires removal of the Settings dialog.", "link": "https://extensions.gnome.org/extension/5678/desktop-clock-legacy/", "shell_version_map": {"38": {"version": "2", "sha256": "03579g03wyp52fhf6rpszc91zqfw99afqvgf87nifb8bcf05mbyg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICJmNjk1Yjc4ZTgwMGQ0OTdlODUyYmVlZWU3YWJhNDRhMGU5ZWMzMDczIiwKICAiZGVzY3JpcHRpb24iOiAiQWRkIGEgY2xvY2sgdG8gdGhlIGRlc2t0b3AgISBQbGVhc2UgdXNlIGRjb25mLWVkaXRvciB0byBjaGFuZ2Ugc2V0dGluZ3MuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIHNpbXBsZSBmb3JrIG9mIHRoZSAnRGVza3RvcCBDbG9jaycgZXh0ZW5zaW9uIG1vZGlmaWVkIHRvIHdvcmsgd2l0aCBHbm9tZSBTaGVsbCAzLjM2LiBUaGlzIHJlcXVpcmVzIHJlbW92YWwgb2YgdGhlIFNldHRpbmdzIGRpYWxvZy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhemNsb2NrIiwKICAibmFtZSI6ICJEZXNrdG9wIENsb2NrIExlZ2FjeSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hemNsb2NrMzM2IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYW5kcmVhc3BsZXNjaC9hemNsb2NrXzMuMzYiLAogICJ1dWlkIjogImF6Y2xvY2szMzZAYW5kcmVhc3BsZXNjaC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "gnome-one-window-wonderland@jqno.nl", "name": "One Window Wonderland", "pname": "one-window-wonderland", "description": "Automatically maximizes new windows, leaving 'useless gaps' around them", "link": "https://extensions.gnome.org/extension/5696/one-window-wonderland/", "shell_version_map": {"43": {"version": "2", "sha256": "0sva4ilwxcsb59wgz1c82gjv50s28p468s65mdk1rb43icvhns9n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanFuby9nbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmQvIiwKICAidXVpZCI6ICJnbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmRAanFuby5ubCIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "otp-keys@osmank3.net", "name": "OTP keys", "pname": "otp-keys", "description": "Show and copy otp keys", "link": "https://extensions.gnome.org/extension/5697/otp-keys/", "shell_version_map": {"43": {"version": "3", "sha256": "1vax3zqhahaf1k7d4rgd9zwdziiib2zphkxm4ybd7xp034gs2kgx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYW5kIGNvcHkgb3RwIGtleXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdHAta2V5cyIsCiAgIm5hbWUiOiAiT1RQIGtleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3NtYW5rMy9vdHAta2V5cyIsCiAgInV1aWQiOiAib3RwLWtleXNAb3NtYW5rMy5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}}} +, {"uuid": "replace-activities-label@leleat-on-github", "name": "Replace Activities Label", "pname": "replace-activities-label", "description": "Remove the AppMenu, replace the activities label with 3 dots and animate them as a loading spinner.", "link": "https://extensions.gnome.org/extension/5706/replace-activities-label/", "shell_version_map": {"43": {"version": "1", "sha256": "1qcipdm0vzll5322si9hxirqlhar6ajs7vqbwcpq8h1n6s1ll55y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aGUgQXBwTWVudSwgcmVwbGFjZSB0aGUgYWN0aXZpdGllcyBsYWJlbCB3aXRoIDMgZG90cyBhbmQgYW5pbWF0ZSB0aGVtIGFzIGEgbG9hZGluZyBzcGlubmVyLiIsCiAgIm5hbWUiOiAiUmVwbGFjZSBBY3Rpdml0aWVzIExhYmVsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJlcGxhY2UtYWN0aXZpdGllcy1sYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvcmVwbGFjZS1hY3Rpdml0aWVzLWxhYmVsIiwKICAidXVpZCI6ICJyZXBsYWNlLWFjdGl2aXRpZXMtbGFiZWxAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "pin-app-folders-to-dash@fcusr.github.com", "name": "Pin App Folders to Dash", "pname": "pin-app-folders-to-dash", "description": "Allow to pin app folders to dash.", "link": "https://extensions.gnome.org/extension/5709/pin-app-folders-to-dash/", "shell_version_map": {"43": {"version": "1", "sha256": "1n19dd1mjgdrggpkq9c25khfx8lyknf00y44fs7jxnpkixja8lwi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIHBpbiBhcHAgZm9sZGVycyB0byBkYXNoLiIsCiAgIm5hbWUiOiAiUGluIEFwcCBGb2xkZXJzIHRvIERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmN1c3IvcGluLWFwcC1mb2xkZXJzLXRvLWRhc2giLAogICJ1dWlkIjogInBpbi1hcHAtZm9sZGVycy10by1kYXNoQGZjdXNyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} ] diff --git a/pkgs/desktops/gnome/extensions/paperwm/default.nix b/pkgs/desktops/gnome/extensions/paperwm/default.nix index 4880a9312954..7c63248dfee4 100644 --- a/pkgs/desktops/gnome/extensions/paperwm/default.nix +++ b/pkgs/desktops/gnome/extensions/paperwm/default.nix @@ -3,15 +3,15 @@ , fetchFromGitHub }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "gnome-shell-extension-paperwm"; - version = "38.2"; + version = "unstable-2022-12-14"; src = fetchFromGitHub { owner = "paperwm"; repo = "PaperWM"; - rev = finalAttrs.version; - hash = "sha256-Unhz2+MOygOog6B5sOLtYTpdeodQH+/CMI93gC5nDvI="; + rev = "7c0863c944a02d4e8095034403bff6ade3579091"; + hash = "sha256-EN0sWW/NymRNKrApeFnqg8ax7Et4hr0gKZuvMF4kJYU="; }; dontConfigure = true; @@ -33,4 +33,4 @@ stdenv.mkDerivation (finalAttrs: { }; passthru.extensionUuid = "paperwm@hedning:matrix.org"; -}) +} diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix index 5983b89f37f4..77ca7ca8586b 100644 --- a/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.26"; + version = "3.22.27"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "aisleriot"; rev = version; - sha256 = "sha256-enUDJ6KM3QDsPb3ckKOxpRzMe4I0bj4TQR94oZWJJJY="; + sha256 = "sha256-XvYQ1JWMBWVZF5u3VL1zPADgMDMN/1FNuwZ4vaOeo7Y="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/games/atomix/default.nix b/pkgs/desktops/gnome/games/atomix/default.nix index 7720fd1724d6..43278a05b4d6 100644 --- a/pkgs/desktops/gnome/games/atomix/default.nix +++ b/pkgs/desktops/gnome/games/atomix/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Atomix"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/five-or-more/default.nix b/pkgs/desktops/gnome/games/five-or-more/default.nix index ce532d1d5cd4..2b264442eab1 100644 --- a/pkgs/desktops/gnome/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome/games/five-or-more/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { description = "Remove colored balls from the board by forming lines"; maintainers = teams.gnome.members; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/four-in-a-row/default.nix b/pkgs/desktops/gnome/games/four-in-a-row/default.nix index 2c6899ee1aa9..a85da0499215 100644 --- a/pkgs/desktops/gnome/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome/games/four-in-a-row/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Make lines of the same color to win"; maintainers = teams.gnome.members; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix index 112c9cf89554..e431d2de012f 100644 --- a/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "43.0"; + version = "43.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ZDP+3y9C+yK/IC2fE47C7gcjetXXQ4CQULXICbVs28s="; + sha256 = "c08JLZX8YECe6so0J7WkjLm1mdoRmVEZ2FuqmWU+ApI="; }; nativeBuildInputs = [ @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { description = "Play the classic two-player boardgame of chess"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/gnome-klotski/default.nix b/pkgs/desktops/gnome/games/gnome-klotski/default.nix index e21cceb08509..bdfa9f8ed8f7 100644 --- a/pkgs/desktops/gnome/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome/games/gnome-klotski/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { description = "Slide blocks to solve the puzzle"; maintainers = teams.gnome.members; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix index 698741ba8366..e2d7d0729c6c 100644 --- a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { description = "Disassemble a pile of tiles by removing matching pairs"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/gnome-mines/default.nix b/pkgs/desktops/gnome/games/gnome-mines/default.nix index d60a58a83c95..dd214f38071f 100644 --- a/pkgs/desktops/gnome/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome/games/gnome-mines/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Clear hidden mines from a minefield"; maintainers = teams.gnome.members; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/gnome-robots/default.nix b/pkgs/desktops/gnome/games/gnome-robots/default.nix index c9f7cbfc213b..e8b5d48efca1 100644 --- a/pkgs/desktops/gnome/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome/games/gnome-robots/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { description = "Avoid the robots and make them crash into each other"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 388253f131bf..9018df07e9cd 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "43.0"; + version = "43.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ftJ0KJz1ykELHJKxU3BQpcNi99szmaMrU0PQ3nBGbkk="; + sha256 = "we6/QJPzNrSJ+5HHMO2mcdpo7vZeYZehKYqVRseImZ8="; }; nativeBuildInputs = [ @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { description = "Test your logic skills in this number grid puzzle"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/gnome-taquin/default.nix b/pkgs/desktops/gnome/games/gnome-taquin/default.nix index c3e78ff20144..e982f83f3ff7 100644 --- a/pkgs/desktops/gnome/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome/games/gnome-taquin/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { description = "Move tiles so that they reach their places"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix index 6578bf7c0589..46e512ad316a 100644 --- a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { description = "Complete the puzzle by matching numbered tiles"; maintainers = teams.gnome.members; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/hitori/default.nix b/pkgs/desktops/gnome/games/hitori/default.nix index c17ca56044e4..092735d55a17 100644 --- a/pkgs/desktops/gnome/games/hitori/default.nix +++ b/pkgs/desktops/gnome/games/hitori/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { description = "GTK application to generate and let you play games of Hitori"; maintainers = teams.gnome.members; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/iagno/default.nix b/pkgs/desktops/gnome/games/iagno/default.nix index d7e3930eae1e..eb27430be4e9 100644 --- a/pkgs/desktops/gnome/games/iagno/default.nix +++ b/pkgs/desktops/gnome/games/iagno/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { description = "Computer version of the game Reversi, more popularly called Othello"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/lightsoff/default.nix b/pkgs/desktops/gnome/games/lightsoff/default.nix index 94b71f0e8568..fa9eb5d20812 100644 --- a/pkgs/desktops/gnome/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome/games/lightsoff/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; maintainers = teams.gnome.members; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/tali/default.nix b/pkgs/desktops/gnome/games/tali/default.nix index 7cb45ec25c1c..f5c1e83ee4d0 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.8"; + version = "40.9"; src = fetchurl { url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "bBeMFg/LtNEb49FWnVOODngUDVC721KnWDGI95XAF+4="; + sha256 = "+p7eNm8KcuTKpSGJw6sLEMG1aoDHiFsBZgJVjETc59M="; }; nativeBuildInputs = [ @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { description = "Sort of poker with dice and less money"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/misc/geary/default.nix b/pkgs/desktops/gnome/misc/geary/default.nix index cb7726d59069..e2b333430619 100644 --- a/pkgs/desktops/gnome/misc/geary/default.nix +++ b/pkgs/desktops/gnome/misc/geary/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { webkitgtk_4_1 ]; - checkInputs = [ + nativeCheckInputs = [ dbus gnutls # for certtool cacert # trust store for glib-networking @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { HOME=$TMPDIR \ XDG_DATA_DIRS=$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share:${folks}/share/gsettings-schemas/${folks.name} \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test -v --no-stdsplit runHook postCheck diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix index cdebb3628bac..6bb3484ed24a 100644 --- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -180,9 +180,11 @@ let dontWrapGApps = true; # We want to do the wrapping ourselves. # gnome-flashback and gnome-panel need to be added to XDG_DATA_DIRS so that their .desktop files can be found by gnome-session. + # We need to pass the --builtin flag so that gnome-session invokes gnome-session-binary instead of systemd. + # If systemd is used, it doesn't use the environment we set up here and so it can't find the .desktop files. preFixup = '' makeWrapper ${gnome-session}/bin/gnome-session $out \ - --add-flags "--session=gnome-flashback-${wmName}" \ + --add-flags "--session=gnome-flashback-${wmName} --builtin" \ --set-default XDG_CURRENT_DESKTOP 'GNOME-Flashback:GNOME' \ --prefix XDG_DATA_DIRS : '${lib.makeSearchPath "share" ([ wmApplication gnomeSession gnome-flashback ] ++ lib.optional enableGnomePanel gnome-panel)}' \ "''${gappsWrapperArgs[@]}" \ diff --git a/pkgs/desktops/gnome/misc/gpaste/default.nix b/pkgs/desktops/gnome/misc/gpaste/default.nix index bc54591ebd65..adee04a0df80 100644 --- a/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , appstream-glib , clutter , gjs @@ -22,26 +21,18 @@ }: stdenv.mkDerivation rec { - version = "43.0"; + version = "43.1"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-F+AWTYVK145RzJ1Zldh4Q4R/hN/D7aXO3SIJ1t6ClWs="; + sha256 = "sha256-wOxhaYWX76jSur3uh75vDfAedbiLh2ikoMuobCZx3jE="; }; patches = [ ./fix-paths.patch - - # Build against GCR 4. - # Patch was temporarily reverted. - # https://github.com/Keruspe/GPaste/pull/409 - (fetchpatch { - url = "https://github.com/Keruspe/GPaste/commit/0378cb4a657042ce5321f1d9728cff31e55bede6.patch"; - sha256 = "0Ngr+/fS5/wICR84GEiE0pXEXQ/f/3G59lDivH167m8="; - }) ]; # TODO: switch to substituteAll with placeholder @@ -79,6 +70,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ + "-Dgcr3=false" # Build with gcr4 "-Dcontrol-center-keybindings-dir=${placeholder "out"}/share/gnome-control-center/keybindings" "-Ddbus-services-dir=${placeholder "out"}/share/dbus-1/services" "-Dsystemd-user-unit-dir=${placeholder "out"}/etc/systemd/user" diff --git a/pkgs/desktops/gnome/misc/gtkhtml/default.nix b/pkgs/desktops/gnome/misc/gtkhtml/default.nix index f4454e15bb9e..9eb93bc8bc44 100644 --- a/pkgs/desktops/gnome/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome/misc/gtkhtml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, intltool +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, gtk3, intltool , gnome, enchant, isocodes, gsettings-desktop-schemas }: stdenv.mkDerivation rec { @@ -10,11 +10,22 @@ stdenv.mkDerivation rec { sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; }; + patches = [ + # Enables enchant2 support. + # Upstream is dead, no further releases are coming. + (fetchpatch { + name ="enchant-2.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/enchant-2.patch?h=gtkhtml4&id=0218303a63d64c04d6483a6fe9bb55063fcfaa43"; + sha256 = "f0OToWGHZwxvqf+0qosfA9FfwJ/IXfjIPP5/WrcvArI="; + extraPrefix = ""; + }) + ]; + passthru = { updateScript = gnome.updateScript { packageName = "gtkhtml"; attrPath = "gnome.gtkhtml"; }; }; - nativeBuildInputs = [ pkg-config intltool ]; + nativeBuildInputs = [ autoreconfHook pkg-config intltool ]; buildInputs = [ gtk3 gnome.adwaita-icon-theme gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome/misc/metacity/default.nix b/pkgs/desktops/gnome/misc/metacity/default.nix index 460dbfdb38bf..3b141c501a8c 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.46.0"; + version = "3.46.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "S6d36ThUe/zL+azKCWdXTEZkMCLgVMk6AzQZyzzHwew="; + sha256 = "ALpJ92EgiPKzuuynnEXrKjBCPC5Ke+pAFYcr6uJd1sU="; }; patches = [ diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 324605832377..643b7ddecc26 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -2,9 +2,10 @@ , cairo , fetchzip , base, gui -, xlibsWrapper +, fontconfig , freetype , pkg-config +, libXft , libXmu }: @@ -18,7 +19,7 @@ gsmakeDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ cairo base gui freetype xlibsWrapper libXmu ]; + buildInputs = [ cairo base gui fontconfig freetype libXft libXmu ]; meta = { description = "A generic backend for GNUstep"; }; diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index 7c6127a830b4..78c9bdd0aee1 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -19,6 +19,7 @@ gsmakeDerivation rec { url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz"; sha256 = "05vjz19v1w7yb7hm8qrc41bqh6xd8in7sgg2p0h1vldyyaa5sh90"; }; + outputs = [ "out" "dev" "lib" ]; nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ aspell audiofile diff --git a/pkgs/desktops/gnustep/make/builder.sh b/pkgs/desktops/gnustep/make/builder.sh index 39bd77038281..e5c277e796af 100644 --- a/pkgs/desktops/gnustep/make/builder.sh +++ b/pkgs/desktops/gnustep/make/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup preConfigure() { diff --git a/pkgs/desktops/gnustep/make/setup-hook.sh b/pkgs/desktops/gnustep/make/setup-hook.sh index 177a381100a6..83adfefc10cd 100644 --- a/pkgs/desktops/gnustep/make/setup-hook.sh +++ b/pkgs/desktops/gnustep/make/setup-hook.sh @@ -1,20 +1,24 @@ # this path is used by some packages to install additional makefiles export DESTDIR_GNUSTEP_MAKEFILES=$out/share/GNUstep/Makefiles -installFlagsArray=( \ - "GNUSTEP_INSTALLATION_DOMAIN=SYSTEM" \ - "GNUSTEP_SYSTEM_APPS=$out/lib/GNUstep/Applications" \ - "GNUSTEP_SYSTEM_ADMIN_APPS=$out/lib/GNUstep/Applications" \ - "GNUSTEP_SYSTEM_WEB_APPS=$out/lib/GNUstep/WebApplications" \ - "GNUSTEP_SYSTEM_TOOLS=$out/bin" \ - "GNUSTEP_SYSTEM_ADMIN_TOOLS=$out/sbin" \ - "GNUSTEP_SYSTEM_LIBRARY=$out/lib/GNUstep" \ - "GNUSTEP_SYSTEM_HEADERS=$out/include" \ - "GNUSTEP_SYSTEM_LIBRARIES=$out/lib" \ - "GNUSTEP_SYSTEM_DOC=$out/share/GNUstep/Documentation" \ - "GNUSTEP_SYSTEM_DOC_MAN=$out/share/man" \ - "GNUSTEP_SYSTEM_DOC_INFO=$out/share/info" \ -) +addGnustepInstallFlags() { + installFlagsArray=( \ + "GNUSTEP_INSTALLATION_DOMAIN=SYSTEM" \ + "GNUSTEP_SYSTEM_APPS=${!outputLib}/lib/GNUstep/Applications" \ + "GNUSTEP_SYSTEM_ADMIN_APPS=${!outputLib}/lib/GNUstep/Applications" \ + "GNUSTEP_SYSTEM_WEB_APPS=${!outputLib}/lib/GNUstep/WebApplications" \ + "GNUSTEP_SYSTEM_TOOLS=${!outputBin}/bin" \ + "GNUSTEP_SYSTEM_ADMIN_TOOLS=${!outputBin}/sbin" \ + "GNUSTEP_SYSTEM_LIBRARY=${!outputLib}/lib/GNUstep" \ + "GNUSTEP_SYSTEM_HEADERS=${!outputInclude}/include" \ + "GNUSTEP_SYSTEM_LIBRARIES=${!outputLib}/lib" \ + "GNUSTEP_SYSTEM_DOC=${!outputDoc}/share/GNUstep/Documentation" \ + "GNUSTEP_SYSTEM_DOC_MAN=${!outputMan}/share/man" \ + "GNUSTEP_SYSTEM_DOC_INFO=${!outputInfo}/share/info" \ + ) +} + +preInstallPhases+=" addGnustepInstallFlags" addEnvVars() { local filename diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index 1208f9cd64cf..3fc8f0b06cd8 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -7,9 +7,12 @@ , intltool , libxmlxx , keybinder +, keybinder3 , gtk2 +, gtk3 , libX11 , libfm +, libwnck , libwnck2 , libXmu , libXpm @@ -21,6 +24,7 @@ , wirelesstools , curl , supportAlsa ? false, alsa-lib +, withGtk3 ? true }: stdenv.mkDerivation rec { @@ -34,11 +38,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext m4 intltool libxmlxx ]; buildInputs = [ - keybinder - gtk2 + (if withGtk3 then keybinder3 else keybinder) + (if withGtk3 then gtk3 else gtk2) libX11 - libfm - libwnck2 + (libfm.override { inherit withGtk3; }) + (if withGtk3 then libwnck else libwnck2) libXmu libXpm cairo @@ -58,6 +62,8 @@ stdenv.mkDerivation rec { --replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0" ''; + configureFlags = lib.optional withGtk3 "--enable-gtk3"; + meta = with lib; { description = "Lightweight X11 desktop panel for LXDE"; homepage = "https://lxde.org/"; diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 1d3c29802e3a..20ededd3dc26 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "libfm-qt"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "lxqt"; repo = "libfm-qt"; rev = version; - sha256 = "Lg+BQ0VFLF5Nhxzr4eeaDVWQG/pC1/w60pQg+lTddHY="; + sha256 = "CrCLwAdkSIhEKJtVJdtHvwEUNKhcvF22p3OOWOuxBAk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 21292e15ac1d..d1b10f4f91f6 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -30,13 +30,13 @@ mkDerivation rec { pname = "lxqt-panel"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "A/zoK6V+4tFeu8mSFukLeKnFVKl66QtKLtu7N7Z2P2w="; + sha256 = "TwVM0JY+BMvw6e/mzy82AH5E6pPsffE6oadd0BuCZk0="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 2f61efa31c7a..ed3eed1b422c 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "pcmanfm-qt"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "3N+4rhmvVUvQ6svtyOMY0+eP2Kz7EpkmZ3Ua+W4gg0Y="; + sha256 = "HzA6+dOxXyeKrzYaR5Xwqj91rivc66ObjTLKHUay61A="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 27e41079243d..0012e2501c41 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -9,6 +9,7 @@ , libgtop , libXdamage , libXpresent +, libXres , libstartup_notification , gnome , glib @@ -20,11 +21,11 @@ stdenv.mkDerivation rec { pname = "marco"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "01avxrg2fc6grfrp6hl8b0im4scy9xf6011swfrhli87ig6hhg7n"; + sha256 = "tPpVUL+J1Pnv9a5ufWFQ42YaItUw1q3cZ1e86N0qXT0="; }; nativeBuildInputs = [ @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { libgtop libXdamage libXpresent + libXres libstartup_notification gtk3 gnome.zenity diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index a80ecc078f40..4d3c09a9f204 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -25,15 +25,21 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "4.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-6QWvDBhOxoK8HjmygV92WPDgq2Jbk4igWDbXrXc7/FQ="; + sha256 = "sha256-ToRY27qB/cNKjKW22MTEojxxOXMBfO1LUusy/pXKJ9A="; }; + patches = [ + # Having a working nix packagekit backend will supersede this. + # https://github.com/NixOS/nixpkgs/issues/177946 + ./disable-packagekit-backend.patch + ]; + nativeBuildInputs = [ dbus # for pkg-config meson @@ -70,9 +76,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/appcenter/disable-packagekit-backend.patch b/pkgs/desktops/pantheon/apps/appcenter/disable-packagekit-backend.patch new file mode 100644 index 000000000000..76d6245628b7 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/appcenter/disable-packagekit-backend.patch @@ -0,0 +1,167 @@ +diff --git a/src/Application.vala b/src/Application.vala +index a1c4e0d4..35555946 100644 +--- a/src/Application.vala ++++ b/src/Application.vala +@@ -180,9 +180,6 @@ public class AppCenter.App : Gtk.Application { + } + + public override void activate () { +- if (fake_update_packages != null) { +- AppCenterCore.PackageKitBackend.get_default ().fake_packages = fake_update_packages; +- } + + var client = AppCenterCore.Client.get_default (); + +@@ -200,12 +197,6 @@ public class AppCenter.App : Gtk.Application { + + if (local_path != null) { + var file = File.new_for_commandline_arg (local_path); +- +- try { +- local_package = AppCenterCore.PackageKitBackend.get_default ().add_local_component_file (file); +- } catch (Error e) { +- warning ("Failed to load local AppStream XML file: %s", e.message); +- } + } + + if (active_window == null) { +diff --git a/src/Core/BackendAggregator.vala b/src/Core/BackendAggregator.vala +index 1747cd3b..20077394 100644 +--- a/src/Core/BackendAggregator.vala ++++ b/src/Core/BackendAggregator.vala +@@ -26,8 +26,6 @@ public class AppCenterCore.BackendAggregator : Backend, Object { + + construct { + backends = new Gee.ArrayList (); +- backends.add (PackageKitBackend.get_default ()); +- backends.add (UbuntuDriversBackend.get_default ()); + 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 40fa8262..e6b90dd9 100644 +--- a/src/Core/Package.vala ++++ b/src/Core/Package.vala +@@ -327,23 +327,13 @@ public class AppCenterCore.Package : Object { + public string origin_description { + owned get { + unowned string origin = component.get_origin (); +- if (backend is PackageKitBackend) { +- if (origin == APPCENTER_PACKAGE_ORIGIN) { +- return _("AppCenter"); +- } else if (origin == ELEMENTARY_STABLE_PACKAGE_ORIGIN) { +- return _("elementary Updates"); +- } else if (origin.has_prefix ("ubuntu-")) { +- return _("Ubuntu (non-curated)"); +- } +- } else if (backend is FlatpakBackend) { ++ if (backend is FlatpakBackend) { + var fp_package = this as FlatpakPackage; + if (fp_package == null) { + return origin; + } + + return fp_package.remote_title; +- } else if (backend is UbuntuDriversBackend) { +- return _("Ubuntu Drivers"); + } + + return _("Unknown Origin (non-curated)"); +@@ -435,9 +425,7 @@ public class AppCenterCore.Package : Object { + + // 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; +- } ++ _latest_version = null; + + this.component = component; + } +diff --git a/src/Core/UpdateManager.vala b/src/Core/UpdateManager.vala +index 4d844abc..457137eb 100644 +--- a/src/Core/UpdateManager.vala ++++ b/src/Core/UpdateManager.vala +@@ -71,35 +71,9 @@ public class AppCenterCore.UpdateManager : Object { + installed_package.update_state (); + } + +- Pk.Results pk_updates; +- unowned PackageKitBackend client = PackageKitBackend.get_default (); +- try { +- pk_updates = yield client.get_updates (cancellable); +- } catch (Error e) { +- warning ("Unable to get updates from PackageKit backend: %s", e.message); +- return 0; +- } +- + uint os_count = 0; + string os_desc = ""; + +- var package_array = pk_updates.get_package_array (); +- debug ("PackageKit backend reports %d updates", package_array.length); +- +- package_array.foreach ((pk_package) => { +- var pkg_name = pk_package.get_name (); +- debug ("Added %s to OS updates", pkg_name); +- os_count++; +- unowned string pkg_summary = pk_package.get_summary (); +- unowned string pkg_version = pk_package.get_version (); +- os_desc += Markup.printf_escaped ( +- " • %s\n\t%s\n\t%s\n", +- pkg_name, +- pkg_summary, +- _("Version: %s").printf (pkg_version) +- ); +- }); +- + os_updates.component.set_pkgnames ({}); + os_updates.change_information.clear_update_info (); + +@@ -207,30 +181,13 @@ public class AppCenterCore.UpdateManager : Object { + count += 1; + } + +- pk_updates.get_details_array ().foreach ((pk_detail) => { +- var pk_package = new Pk.Package (); +- try { +- pk_package.set_id (pk_detail.get_package_id ()); +- var pkg_name = pk_package.get_name (); +- +- var pkgnames = os_updates.component.pkgnames; +- pkgnames += pkg_name; +- os_updates.component.pkgnames = pkgnames; +- +- os_updates.change_information.updatable_packages.@set (client, pk_package.get_id ()); +- os_updates.change_information.size += pk_detail.size; +- } catch (Error e) { +- critical (e.message); +- } +- }); +- + os_updates.update_state (); + runtime_updates.update_state (); + return count; + } + + public void update_restart_state () { +- var should_restart = restart_file.query_exists () || PackageKitBackend.get_default ().is_restart_required (); ++ var should_restart = restart_file.query_exists (); + + if (should_restart) { + if (!restart_required) { +diff --git a/src/meson.build b/src/meson.build +index e0ef5342..14319492 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/StripeDialog.vala', diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 17b241e7a9cb..b8c4c2035098 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "elementary-calculator"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "calculator"; rev = version; - sha256 = "sha256-NE7x5vSfwakwJJe2VGRFiYc7GCB1M6xU5945EC6Em34="; + sha256 = "sha256-7aKJDlpODIysrHtqtD5wfd+dULFpD+LfWsjzg3OAxkY="; }; nativeBuildInputs = [ @@ -45,9 +45,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 404935756ddb..8f38558e93f2 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -71,9 +71,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 9682f17a8162..ed0c6bd91807 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "elementary-camera"; - version = "6.2.0"; + version = "6.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = "camera"; rev = version; - sha256 = "sha256-866Iky0GKQv2yUJVNY1McgXGeup5WqONN3gvoOlilGU="; + sha256 = "sha256-ijzEMGXoH0gACem/3JaC/aOIaOQgP7Y7n48NgoDMKBk="; }; nativeBuildInputs = [ @@ -60,9 +60,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 25acfc28062b..388feb83cfe7 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , appstream , desktop-file-utils @@ -27,15 +28,24 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "6.2.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "code"; rev = version; - sha256 = "sha256-QhJNRhYgGbPMd7B1X3kG+pnC/lGUoF7gc7O1PdG49LI="; + sha256 = "sha256-6ZOdlOCIDy5aWQre15+SrTH/vhY9OeTffY/uTSroELc="; }; + patches = [ + # Fix global search action disabled at startup + # https://github.com/elementary/code/pull/1254 + (fetchpatch { + url = "https://github.com/elementary/code/commit/1e75388b07c060cc10ecd612076f235b1833fab8.patch"; + sha256 = "sha256-8Djh1orMcmICdYwQFENJCaYlXK0E52NhCmuhlHCz7oM="; + }) + ]; + nativeBuildInputs = [ appstream desktop-file-utils @@ -75,9 +85,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 6c6113e6be92..d24778ffe577 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "elementary-feedback"; - version = "6.1.1"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "feedback"; rev = version; - sha256 = "sha256-YLYHaFQAAeSt25xHF7xDJWhw+rbH9SpzoRoXaYP42jg="; + sha256 = "sha256-QvqyaI9szZuYuE3D6o4zjr5J6mvEzNHqTBWii+gjyMc="; }; patches = [ @@ -59,9 +59,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch b/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch index 20676937e0a7..cc56b7e0d035 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch @@ -1,17 +1,20 @@ diff --git a/src/MainWindow.vala b/src/MainWindow.vala -index 6fee9d3..b0eb28c 100644 +index 14b0701..13638a5 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala -@@ -89,6 +89,12 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow { +@@ -82,6 +82,7 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow { + AppStream.PoolFlags.LOAD_FLATPAK | + AppStream.PoolFlags.RESOLVE_ADDONS + ); ++ appstream_pool.add_extra_data_location ("/run/current-system/sw/share/metainfo/", AppStream.FormatStyle.METAINFO); + #else + appstream_pool.clear_metadata_locations (); + // flatpak's appstream files exists only inside they sandbox +@@ -89,6 +90,7 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow { + foreach (var app in app_entries) { + appstream_pool.add_metadata_location (appdata_dir.printf (app)); + } ++ appstream_pool.add_metadata_location ("/run/current-system/sw/share/metainfo/"); #endif - } -+#if HAS_APPSTREAM_0_15 -+ appstream_pool.add_extra_data_location ("/run/current-system/sw/share/metainfo/", AppStream.FormatStyle.METAINFO); -+#else -+ appstream_pool.add_metadata_location ("/run/current-system/sw/share/metainfo/"); -+#endif -+ - // flatpak's appstream files exists only inside they sandbox - unowned var appdata_dir = "/var/lib/flatpak/app/%s/current/active/files/share/appdata"; - foreach (var app in app_entries) { + try { diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index bc91455fe389..a5586648621f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -39,6 +40,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-pJFeMG2aGaMkS00fSoRlMR2YSg5YzwqwaQT8G7Gk5S4="; }; + patches = [ + # Ensure special user directory icon used for bookmark + # https://github.com/elementary/files/pull/2106 + (fetchpatch { + url = "https://github.com/elementary/files/commit/00b1c2a975aeab378ed6eb1d90c8988f82596add.patch"; + sha256 = "sha256-F/Vk7dg57uBBMO4WOJ/7kKbRNMZuWZ3QfrBfEIBozbw="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils meson @@ -73,9 +83,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix b/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix index 8a0ff75f9038..69d52292f28b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix @@ -59,9 +59,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 879f1f8bd919..31cf6d12eb89 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { # build: support webkit2gtk-4.1 # https://github.com/elementary/mail/pull/794 (fetchpatch { - url = "https://github.com/elementary/mail/commit/7d4878543b27251664852c708d54abc1e4580eab.patch"; - sha256 = "sha256-yl6Bzjinp+ti/aX+t22GibGeQFtharZNk3MmbuJm0Tk="; + url = "https://github.com/elementary/mail/commit/9e6eb73a8420c9bf327e59c25e7e6d8fa87d480a.patch"; + sha256 = "sha256-idkVymePLa7vgfuou0HIrbWRCaWAgZliDcp4HyZBArs="; }) ]; @@ -73,9 +73,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 0a59e4559b8b..b38e315ac773 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , meson , ninja @@ -19,42 +18,15 @@ stdenv.mkDerivation rec { pname = "elementary-music"; - version = "7.0.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "music"; rev = version; - sha256 = "sha256-fZbOjZd6udJWM+jWXCmGwt6cyl/lXPsgM9XeTScbqts="; + sha256 = "sha256-PttmC1Z3rX2XWCECc320HMs692hSBsxkmnh1Q8a/Mg8="; }; - patches = [ - # Use file basename for fallback audio object title - # https://github.com/elementary/music/pull/710 - (fetchpatch { - url = "https://github.com/elementary/music/commit/97a437edc7652e0b85b7d3c6fd87089c14ec02e2.patch"; - sha256 = "sha256-VmK5dKfSKWAIxfaKXsC8tjg6Pqq1XSGxJDQOZWJX92w="; - }) - # Skip invalid files instead of stopping playback - # https://github.com/elementary/music/pull/711 - (fetchpatch { - url = "https://github.com/elementary/music/commit/88f332197d2131daeff3306ec2a484a28fa4db21.patch"; - sha256 = "sha256-Zga0UmL1PAq4P58IjOuEiXGGn187a0/LHbXXze4sSpY="; - }) - # Enable the NEXT button if repeat mode is set to ALL or ONE - # https://github.com/elementary/music/pull/712 - (fetchpatch { - url = "https://github.com/elementary/music/commit/3249e3ca247dfd5ff6b14f4feeeeed63b435bcb8.patch"; - sha256 = "sha256-nx/nlSSRxu4wy8QG5yYBi0BdRoUmnyry7mwzuk5NJxU="; - }) - # Hard code GTK styles - # https://github.com/elementary/music/pull/723 - (fetchpatch { - url = "https://github.com/elementary/music/commit/4e22268d38574e56eb3b42ae201c99cc98b510db.patch"; - sha256 = "sha256-DZds7pg0vYL9vga+tP7KJHcjQTmdKHS+D+q/2aYfMmk="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -92,9 +64,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 218a89a7d5b1..8a1017cfaeb1 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -86,9 +86,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index 48a68860dd94..b41dbaaae88c 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -19,24 +18,15 @@ stdenv.mkDerivation rec { pname = "elementary-screenshot"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "elementary"; repo = "screenshot"; rev = version; - sha256 = "sha256-n+L08C/W5YnHZ5P3F1NGUYE2SH94sc4+kr1x+wXZ+cw="; + sha256 = "sha256-7BrowiMUDcf0raeOEFen2V3nenymgE6Rg5a3RilMQaI="; }; - patches = [ - # Fix build with meson 0.61 - # https://github.com/elementary/screenshot/pull/241 - (fetchpatch { - url = "https://github.com/elementary/screenshot/commit/80a5d942e813dd098e1ef0f6629b81d2ccef05ae.patch"; - sha256 = "sha256-jOQuzUJvsjqytplLcW9BeIxzi9+/k2GFa4hHVZ3+wts="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils meson @@ -61,9 +51,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index cd82dba99bfe..683b4a75acf1 100644 --- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix @@ -61,9 +61,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 80193890779a..c1cfe8d63cf0 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -55,9 +55,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 9059338da479..8335bac3a9d6 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "elementary-videos"; - version = "2.8.4"; + version = "2.9.0"; src = fetchFromGitHub { owner = "elementary"; repo = "videos"; rev = version; - sha256 = "sha256-IUIY/WgGPVRYk9O+ZocopoBF7TlLnTtScNwO6gDCALw="; + sha256 = "sha256-QQcuhYe3/ZMqQEFJS72+vr1AzJC9Y7mr5Fa5yFsNYIc="; }; nativeBuildInputs = [ @@ -59,9 +59,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index e1fd51b516b6..fce4e5e7654e 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -53,9 +53,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 152026e17a21..ae325e3bf8df 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -56,9 +56,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { 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 deleted file mode 100644 index 657ea7a260c9..000000000000 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/add-wallpaper-option.patch +++ /dev/null @@ -1,82 +0,0 @@ -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 977d1a0b9fcc..3c9fc107a978 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -8,32 +8,27 @@ , vala , libgee , libgtop +, libgudev , libhandy , granite , gtk3 , switchboard +, udisks2 , fwupd , appstream }: stdenv.mkDerivation rec { pname = "switchboard-plug-about"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-/8K3xSbzlagOT0zHdXNwEERJP88C+H2I6qJHXwdlTS4="; + sha256 = "sha256-MJybc2yAchU6qMqkoRz45QdhR7bj/UFk2nyxcBivsHI="; }; - patches = [ - # 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 = [ meson ninja @@ -48,19 +43,19 @@ stdenv.mkDerivation rec { gtk3 libgee libgtop + libgudev libhandy switchboard + udisks2 ]; mesonFlags = [ - # This option is introduced in add-wallpaper-option.patch + # Does not play nice with the nix-snowflake logo "-Dwallpaper=false" ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 03fb7e9349bf..776e027cbfff 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -40,9 +40,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index 53dc200a4345..e6e33d0494f0 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -52,9 +52,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index 71bbda8edb17..abb6cfdfe62e 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -56,9 +56,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index 0b538b769764..0b426273b283 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -40,9 +40,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch index 550aefbb1f10..ead8bafaa125 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch @@ -263,7 +263,7 @@ deleted file mode 100644 index 275c302..0000000 --- a/src/InputMethod/Installer/InstallList.vala +++ /dev/null -@@ -1,73 +0,0 @@ +@@ -1,75 +0,0 @@ -/* -* 2019-2020 elementary, Inc. (https://elementary.io) -* @@ -306,7 +306,7 @@ index 275c302..0000000 - case KO: - return { "ibus-hangul" }; - case ZH: -- return { "ibus-cangjie", "ibus-chewing", "ibus-pinyin" }; +- return { "ibus-cangjie", "ibus-chewing", "ibus-pinyin", "ibus-rime" }; - default: - assert_not_reached (); - } @@ -328,6 +328,8 @@ index 275c302..0000000 - return ZH; - case "ibus-pinyin": - return ZH; +- case "ibus-rime": +- return ZH; - default: - assert_not_reached (); - } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 18ccac20bb53..5ff6a7de4b05 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , substituteAll , meson @@ -23,20 +24,33 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-keyboard"; - version = "2.7.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-ge87rctbd7iR9x9Xq4sMIC09DiPHbpbWBgMZUuJNWbw="; + sha256 = "sha256-DofAOv7sCe7RAJpgz9PEYm+C8RAl0a1KgFm9jToMsEY="; }; patches = [ ./0001-Remove-Install-Unlisted-Engines-function.patch (substituteAll { src = ./fix-paths.patch; - inherit ibus onboard; + inherit ibus onboard libgnomekbd; + }) + + # Revert schema key change that requires new GSD and Gala. + # TODO(@bobby285271): drop these in #196511. + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-keyboard/commit/555e9650bb8f74a7664e2393c589fe6664954a88.patch"; + sha256 = "sha256-koSTYLPRh9rOyxmJPtrj/fPuu2jb1SKZu6BwKsMvAmc="; + revert = true; + }) + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-keyboard/commit/6ebd57673b45cc64e1caf895134efc0d5f6cf2be.patch"; + sha256 = "sha256-Ezsh0t1/909MHCB2EJEnl4kcnXngshNYgrmqUQsfsaY="; + revert = true; }) ]; @@ -55,16 +69,13 @@ stdenv.mkDerivation rec { gtk3 ibus libgee - libgnomekbd libhandy libxklavier switchboard ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch index 0b5c8b8fd27e..bed4ca5573c8 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch @@ -24,3 +24,16 @@ index 75d2d805..b86252a4 100644 appinfo.launch (null, null); } catch (Error e) { warning ("Unable to launch onboard-settings: %s", e.message); +diff --git a/src/Dialogs/AddLayoutDialog.vala b/src/Dialogs/AddLayoutDialog.vala +index 7c2efda3..de77094f 100644 +--- a/src/Dialogs/AddLayoutDialog.vala ++++ b/src/Dialogs/AddLayoutDialog.vala +@@ -197,7 +197,7 @@ public class Pantheon.Keyboard.LayoutPage.AddLayoutDialog : Granite.Dialog { + }); + + keyboard_map_button.clicked.connect (() => { +- string command = "gkbd-keyboard-display \"--layout=" + layout_id + "\""; ++ string command = "@libgnomekbd@/bin/gkbd-keyboard-display \"--layout=" + layout_id + "\""; + try { + AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE).launch (null, null); + } catch (Error e) { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index 2c9b3833a0cc..b71f6ee36ac5 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -56,9 +56,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index a136ca5e4e26..74f5592e8ee6 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -51,9 +51,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index f142b8e9bb9c..261b4cab164d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -50,9 +50,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index eea28916220c..11268ab814b4 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { patches = [ # build: support evolution-data-server 3.45 - # https://github.com/elementary/switchboard-plug-onlineaccounts/pull/244 + # https://github.com/elementary/switchboard-plug-onlineaccounts/pull/248 (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch"; - sha256 = "sha256-C7woN4shPrVlSWZeW0Fz+xFi5CTQd2K5BsF5YeI9x0Y="; + url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/08faf7b4241547b7900596af12a03d816712a808.patch"; + sha256 = "sha256-QLe+NPHuo3hLM9n1f4hT5IK4nkWtYSe91L1wVSBzw6k="; }) ]; @@ -52,9 +52,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index f79a8d82cf60..8ee49d024057 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -60,9 +60,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index d0079e6a0571..00b5b0db1ac3 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -48,9 +48,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 85fa5538a41e..039d8e86b977 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -40,9 +40,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index c11a8ff6e268..942522fe0d40 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -57,9 +57,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index 32f572f55d52..ebac90995756 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -38,9 +38,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index b421648e05a2..f7e241942235 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -42,9 +42,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix index 94300fcbdd94..92befc5913fa 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix @@ -47,9 +47,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 7d030050f9d4..f13d90bd088a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -51,9 +51,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index a51b409d9230..483bbb0c4956 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -34,9 +34,7 @@ stdenvNoCC.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index 97fa6fc1ea65..cd151ee19430 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation rec { pname = "elementary-icon-theme"; - version = "7.1.0"; + version = "7.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = "icons"; rev = version; - sha256 = "sha256-SMeVu4RbXodbxtVkQE2tvv6LaVWzrq7UBlwmi30ns2Q="; + sha256 = "sha256-Hh7RiD85N48IpO2sfWSybhS7kJYXH4VOhQ6PVIP9IS8="; }; nativeBuildInputs = [ @@ -50,9 +50,7 @@ stdenvNoCC.mkDerivation rec { postFixup = "gtk-update-icon-cache $out/share/icons/elementary"; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix index d6dc4e66cbcf..66c02d73f71d 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix @@ -23,9 +23,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index 2f326235c4cf..69d391f679cf 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -25,9 +25,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index debf7f0201a1..addef5891d2c 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "elementary-wallpapers"; - version = "6.1.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "wallpapers"; rev = version; - sha256 = "sha256-E/cUxa/GNt/01EjuuvurHxJu3qV9e+jcdcCi2+NxVDA="; + sha256 = "sha256-i9tIz5UckON8uwGlE62b/y0M0Neqt86rR3VdNUWBo04="; }; nativeBuildInputs = [ @@ -32,9 +32,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index a42ae92e97af..85e0f1a28fc4 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -63,9 +63,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 72d06e8a11fb..7598ab5ed818 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -109,9 +109,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; xgreeters = linkFarm "pantheon-greeter-xgreeters" [{ path = "${elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop"; diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 246feae7323a..27847245991e 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -53,9 +53,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix index cc25419f2eb4..816374c24ce2 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -30,9 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index bf466c4d59e1..620c64f11d80 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -28,7 +28,7 @@ let # Upstream relies on /etc/skel to initiate a new users home directory with plank's dockitems. # # That is not possible within nixos, but we can achieve this easily with a simple script that copies - # them. We then use a xdg autostart and initalize it during the "EarlyInitialization" phase of a gnome session + # them. We then use a xdg autostart and initialize it during the "EarlyInitialization" phase of a gnome session # which is most appropriate for installing files into $HOME. # @@ -139,9 +139,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; providedSessions = [ "pantheon" diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index 3cf7cd365f16..94d461a590ac 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -56,9 +56,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 6c7713098822..56428a9124ae 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -60,6 +60,49 @@ stdenv.mkDerivation rec { url = "https://github.com/elementary/gala/commit/23c7edeb0ee9b0ff0aa48c1d19fbd1739df7af78.patch"; sha256 = "sha256-OfIDBfVEZoY8vMu9F8gtfRg4TYA1MUAG94BSOBKVGcI="; }) + + # Work around crash when receiving notifications + # https://github.com/elementary/gala/pull/1497 + (fetchpatch { + url = "https://github.com/elementary/gala/commit/8842e576e3e8643a018d506605f80d152e3f5cec.patch"; + sha256 = "sha256-xu9Rh7TH0ccRU1TInTNTm+dDaCXj5aaEwDw3rBW02q8="; + }) + + # ShadowEffect: let Clutter know the shadow's size + # https://github.com/elementary/gala/pull/1500 + (fetchpatch { + url = "https://github.com/elementary/gala/commit/34a208e26d2ee0bf4a1689c8ad6ddfc06c540ff8.patch"; + sha256 = "sha256-KPIXNWTlKGc3JImt82t5lmcMu0bqrPx1JNv+TbsxhOg="; + }) + + # Fix awkward two-finger scroll in multitasking view + # https://github.com/elementary/gala/pull/1499 + (fetchpatch { + url = "https://github.com/elementary/gala/commit/c175d2662dd05e940a5b3311cc9dc285242b7fc5.patch"; + sha256 = "sha256-xsxYDagPmaNSZO/Cj7NjPqBHCc1hrqvpboAvPIg9P58="; + }) + + # Fix crash when monitor is turned off + # https://github.com/elementary/gala/pull/1491 + (fetchpatch { + url = "https://github.com/elementary/gala/commit/1487660812a343e6a6178881e6e7b25c2405cece.patch"; + sha256 = "sha256-YsRaWmDSg0h0RFTUOoMxlNcKoA4MNa8AhW1GGmk8qLA="; + }) + + # Fix quick zooming (next 3 patches) + # https://github.com/elementary/gala/pull/1501 + (fetchpatch { + url = "https://github.com/elementary/gala/commit/b9c5c9c79a045c3eef7695f74f82d851438ba7e2.patch"; + sha256 = "sha256-PGjf/B/7UQxpW0Pby7ZXuMoDlamZwEaDvaN9PaRulHU="; + }) + (fetchpatch { + url = "https://github.com/elementary/gala/commit/49d3ddae5b631027466ff528c2935e05a8f5dc3f.patch"; + sha256 = "sha256-hvm2GcqiMYYxOLpQFXdyz325jZme7W+VYipu5goKoiU="; + }) + (fetchpatch { + url = "https://github.com/elementary/gala/commit/45126e4c2d3736e872c05941a2047a54788cd011.patch"; + sha256 = "sha256-LdhFFFNwvF1p1LqJXer8+DOgAptiHZHlfnQBwVEIZjo="; + }) ]; nativeBuildInputs = [ @@ -99,9 +142,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix index af83ad915535..163351075c6a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix @@ -45,9 +45,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index ec3edff71cd6..f342642e326c 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -83,9 +83,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 605b4b7709a5..f0c2fb0def00 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -52,9 +52,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 45558813abb1..1fdd91a79945 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -65,9 +65,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index 6a9639b39c22..9cdc3e0000b3 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -53,9 +53,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index bacb5971acaf..58844ccad783 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -43,9 +43,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index a363dec44e9b..a900e7180eea 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -40,9 +40,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index d16472d584dd..6db8166197f6 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -42,9 +42,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 84585f7d779a..2e5329701a0e 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -62,9 +62,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index db3b9807a013..eae385178db4 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -42,9 +42,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index 758ecdf04bf6..b6fb4870b997 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -55,9 +55,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 70f22a377239..8342e2680747 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -72,9 +72,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/granite/7/default.nix b/pkgs/desktops/pantheon/granite/7/default.nix index 4ba07a254602..0f46c7029717 100644 --- a/pkgs/desktops/pantheon/granite/7/default.nix +++ b/pkgs/desktops/pantheon/granite/7/default.nix @@ -53,9 +53,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.granite7"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index ba00be72e279..f4ce10df84cc 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -44,9 +44,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services"; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index 734538259130..fe2649f82a60 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -13,19 +13,19 @@ , libgee , libhandy , gcr -, webkitgtk +, webkitgtk_4_1 , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "elementary-capnet-assist"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "elementary"; repo = "capnet-assist"; rev = version; - sha256 = "sha256-aA71kxu4/dwODZt+DSp3vvely3P0dL23Ykqhd84hrZw="; + sha256 = "sha256-06DWkLkVpdSYnKOR8zqA0tvWXYrglBM9R/XEIfIkwQU="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { gtk3 libgee libhandy - webkitgtk + webkitgtk_4_1 ]; postPatch = '' @@ -53,9 +53,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix index 27b76ce340c1..abff47fbd8b8 100644 --- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -52,9 +52,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 04dc119c52e9..6f4cf8cf8d13 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -59,9 +59,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index 2d4309c0177c..942e53aaf8a4 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -48,9 +48,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index 7ffa02fad7f1..9e1c3464dad7 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -40,9 +40,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { 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 9673be03f61c..a7e0fae873f7 100644 --- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix +++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix @@ -50,9 +50,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix b/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix index 3122af276ab9..a140d9cdcb0e 100644 --- a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix +++ b/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "pantheon-tweaks"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "pantheon-tweaks"; repo = pname; rev = version; - sha256 = "sha256-L/3PrkfWOGYtqeH/DajGEGCsF5yYnWuESxUTfROSHQ4="; + sha256 = "sha256-wj9bvcES8JAgDtW0Damfd8VQNLK+SCFTDVWp/nYGcgI="; }; patches = [ @@ -51,9 +51,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 6396b7c6c51e..dcc5c7f7cf3d 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -130,7 +130,7 @@ let kdeplasma-addons = callPackage ./kdeplasma-addons.nix { }; kgamma5 = callPackage ./kgamma5.nix { }; khotkeys = callPackage ./khotkeys.nix { }; - kinfocenter = callPackage ./kinfocenter.nix { }; + kinfocenter = callPackage ./kinfocenter { }; kmenuedit = callPackage ./kmenuedit.nix { }; kpipewire = callPackage ./kpipewire.nix { }; kscreen = callPackage ./kscreen.nix { }; diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index eb91ba4838fb..2da4dc40e6be 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.26.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.26.5/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix deleted file mode 100644 index c63d22858a55..000000000000 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ mkDerivation -, lib -, extra-cmake-modules -, kdoctools -, qtbase -, kcmutils -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kdbusaddons -, kdeclarative -, ki18n -, kiconthemes -, kio -, kirigami2 -, kpackage -, kservice -, kwayland -, kwidgetsaddons -, kxmlgui -, solid -, systemsettings -, libraw1394 -, libGLU -, pciutils -}: - -mkDerivation { - pname = "kinfocenter"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcmutils - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kdeclarative - ki18n - kiconthemes - kio - kirigami2 - kpackage - kservice - kwayland - kwidgetsaddons - kxmlgui - solid - systemsettings - - libraw1394 - libGLU - pciutils - ]; - preFixup = '' - # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in - # the same directory, while it is actually located in a completely different - # store path - ln -sf ${lib.getBin systemsettings}/bin/systemsettings5 $out/bin/kinfocenter - ''; -} diff --git a/pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch b/pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch new file mode 100644 index 000000000000..c6cf9bd8d6df --- /dev/null +++ b/pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch @@ -0,0 +1,51 @@ +diff --git a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in +index f591b9c..e883212 100644 +--- a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in ++++ b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in +@@ -63,6 +63,6 @@ + "Name[x-test]": "xxWindow Managerxx", + "Name[zh_CN]": "窗口管理器" + }, +- "TryExec": "@QtBinariesDir@/qdbus", ++ "TryExec": "@qdbus@", + "X-KDE-KInfoCenter-Category": "graphical_information" + } +diff --git a/Modules/kwinsupportinfo/main.cpp b/Modules/kwinsupportinfo/main.cpp +index 667c079..b727b67 100644 +--- a/Modules/kwinsupportinfo/main.cpp ++++ b/Modules/kwinsupportinfo/main.cpp +@@ -19,7 +19,7 @@ public: + explicit KCMKWinSupportInfo(QObject *parent, const KPluginMetaData &data, const QVariantList &args) + : ConfigModule(parent, data, args) + { +- auto outputContext = new CommandOutputContext(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QStringLiteral("/qdbus"), ++ auto outputContext = new CommandOutputContext(QStringLiteral("@qdbus@"), + {QStringLiteral("org.kde.KWin"), QStringLiteral("/KWin"), QStringLiteral("supportInformation")}, + parent); + qmlRegisterSingletonInstance("org.kde.kinfocenter.kwinsupportinfo.private", 1, 0, "InfoOutputContext", outputContext); +diff --git a/Modules/xserver/kcm_xserver.json b/Modules/xserver/kcm_xserver.json +index 04acd6b..24b8f36 100644 +--- a/Modules/xserver/kcm_xserver.json ++++ b/Modules/xserver/kcm_xserver.json +@@ -130,7 +130,7 @@ + "Name[zh_CN]": "X 服务器", + "Name[zh_TW]": "X 伺服器" + }, +- "TryExec": "xdpyinfo", ++ "TryExec": "@xdpyinfo@", + "X-DocPath": "kinfocenter/graphical.html#xserver", + "X-KDE-KInfoCenter-Category": "graphical_information", + "X-KDE-Keywords": "X,X-Server,XServer,XFree86,Display,VideoCard,System Information", +diff --git a/Modules/xserver/main.cpp b/Modules/xserver/main.cpp +index c406ff7..a261b90 100644 +--- a/Modules/xserver/main.cpp ++++ b/Modules/xserver/main.cpp +@@ -17,7 +17,7 @@ public: + explicit KCMXServer(QObject *parent, const KPluginMetaData &data, const QVariantList &args) + : ConfigModule(parent, data, args) + { +- auto outputContext = new CommandOutputContext(QStringLiteral("xdpyinfo"), {}, parent); ++ auto outputContext = new CommandOutputContext(QStringLiteral("@xdpyinfo@"), {}, parent); + qmlRegisterSingletonInstance("org.kde.kinfocenter.xserver.private", 1, 0, "InfoOutputContext", outputContext); + + auto *about = new KAboutData(QStringLiteral("kcm_xserver"), i18nc("@label kcm name", "X-Server"), QStringLiteral("1.0"), QString(), KAboutLicense::GPL); diff --git a/pkgs/desktops/plasma-5/kinfocenter/default.nix b/pkgs/desktops/plasma-5/kinfocenter/default.nix new file mode 100644 index 000000000000..222e78558264 --- /dev/null +++ b/pkgs/desktops/plasma-5/kinfocenter/default.nix @@ -0,0 +1,104 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, qtbase +, qttools +, kcmutils +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdeclarative +, ki18n +, kiconthemes +, kio +, kirigami2 +, kpackage +, kservice +, kwayland +, kwidgetsaddons +, kxmlgui +, solid +, systemsettings +, dmidecode +, fwupd +, libraw1394 +, libusb1 +, libGLU +, pciutils +, smartmontools +, util-linux +, vulkan-tools +, wayland-utils +, xdpyinfo +}: + +let + inherit (lib) getBin getExe; + + qdbus = "${getBin qttools}/bin/qdbus"; + +in +mkDerivation { + pname = "kinfocenter"; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + + buildInputs = [ + kcmutils + kcompletion + kconfig + kconfigwidgets + kcoreaddons + kdbusaddons + kdeclarative + ki18n + kiconthemes + kio + kirigami2 + kpackage + kservice + kwayland + kwidgetsaddons + kxmlgui + solid + systemsettings + + dmidecode + fwupd + libraw1394 + libusb1 + libGLU + pciutils + smartmontools + util-linux + vulkan-tools + wayland-utils + xdpyinfo + ]; + + patches = [ + ./0001-tool-paths.patch + ]; + + postPatch = '' + for f in Modules/kwinsupportinfo/{kcm_kwinsupportinfo.json.in,main.cpp}; do + substituteInPlace $f \ + --replace "@qdbus@" "${qdbus}" + done + + for f in Modules/xserver/{kcm_xserver.json,main.cpp}; do + substituteInPlace $f \ + --replace "@xdpyinfo@" "${getExe xdpyinfo}" + done + ''; + + # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in + # the same directory, while it is actually located in a completely different + # store path + preFixup = '' + ln -sf ${lib.getExe systemsettings} $out/bin/kinfocenter + ''; +} diff --git a/pkgs/desktops/plasma-5/plasma-mobile/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix index ce0da404bb59..22ea8bf78252 100644 --- a/pkgs/desktops/plasma-5/plasma-mobile/default.nix +++ b/pkgs/desktops/plasma-5/plasma-mobile/default.nix @@ -16,6 +16,7 @@ , kconfig , krunner , kinit +, kirigami-addons , kwayland , kwin , plasma-framework @@ -50,6 +51,7 @@ mkDerivation { kconfig krunner kinit + kirigami-addons kwayland kwin plasma-framework diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 0d5a6010e6fe..cc0a02b6aabe 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,467 +4,467 @@ { aura-browser = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/aura-browser-5.26.3.tar.xz"; - sha256 = "0103avsjplj6zmjql4gcgh2lrmmx87k3dx0wl371vqdf1prgbv2z"; - name = "aura-browser-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/aura-browser-5.26.5.tar.xz"; + sha256 = "0dhj058vh577jyhcjdp6x9dmh6apxk6yinknfci8l6vss9gchini"; + name = "aura-browser-5.26.5.tar.xz"; }; }; bluedevil = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/bluedevil-5.26.3.tar.xz"; - sha256 = "1f2dh7d0ds5n8vcnrkx919yvf5g3yrl6zg2rfaiac9vff04afcpj"; - name = "bluedevil-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/bluedevil-5.26.5.tar.xz"; + sha256 = "069hsn40zbnpkd73zcnnkdjv7n30dqyls5yvg3m0ljphn1syi79y"; + name = "bluedevil-5.26.5.tar.xz"; }; }; breeze = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/breeze-5.26.3.tar.xz"; - sha256 = "0wn5m8avs1ncvx70lrh5gafnq7sdfd18rvih95cpdbqqs4y222a5"; - name = "breeze-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/breeze-5.26.5.tar.xz"; + sha256 = "00zzb03jan14byh19mga3jrzwi3rl084cgpnk0wj3gwgf903p78y"; + name = "breeze-5.26.5.tar.xz"; }; }; breeze-grub = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/breeze-grub-5.26.3.tar.xz"; - sha256 = "0qnxcwina2m4imgm02yq2yn2ax2rwncp511gihx49h97cy9yx7i5"; - name = "breeze-grub-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/breeze-grub-5.26.5.tar.xz"; + sha256 = "0ibjqv6hyqi4ljf5jhx5sv55li9jcvk5lydl0xrb54v8czbarg4w"; + name = "breeze-grub-5.26.5.tar.xz"; }; }; breeze-gtk = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/breeze-gtk-5.26.3.tar.xz"; - sha256 = "0qrz7kkkv00rmaja6a1dmrldy6nfshdsx56k3vji00fwpi03nfja"; - name = "breeze-gtk-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/breeze-gtk-5.26.5.tar.xz"; + sha256 = "1k1kcrv6cbx9m0yxnqhdgwq0bd8qf8055acwjdphwjhl50icliqi"; + name = "breeze-gtk-5.26.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/breeze-plymouth-5.26.3.tar.xz"; - sha256 = "0n6skqay6c84411n2hi9sibyhiiqisl2kmd5lwbv748h4x311yz8"; - name = "breeze-plymouth-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/breeze-plymouth-5.26.5.tar.xz"; + sha256 = "0skiii7ni6r6jp3a7nq10hd6qdria1481lml4l57ma9afgvpxi9v"; + name = "breeze-plymouth-5.26.5.tar.xz"; }; }; discover = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/discover-5.26.3.tar.xz"; - sha256 = "1p9l6q68kyzm40hg6nhp2jsqx6mjscixj1fkmibphj3ps10xsgqf"; - name = "discover-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/discover-5.26.5.tar.xz"; + sha256 = "19fd4f7nvqznfkrivxh77si627kqjnm1g17lidl9alz2iy2bxfm6"; + name = "discover-5.26.5.tar.xz"; }; }; drkonqi = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/drkonqi-5.26.3.tar.xz"; - sha256 = "0897fkxa3gd7hbvx4h5hhwnxwycgcciyp02aw5m2gmyylav97pb4"; - name = "drkonqi-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/drkonqi-5.26.5.tar.xz"; + sha256 = "1syl78sl7wzjdb53glln6laa017cawgz0c39p33bdwq3kpzckw07"; + name = "drkonqi-5.26.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/kactivitymanagerd-5.26.3.tar.xz"; - sha256 = "1wv6b5shm8741phhhfldrwzb8pm4jskd3sq242pg8230qh054vrc"; - name = "kactivitymanagerd-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/kactivitymanagerd-5.26.5.tar.xz"; + sha256 = "0ypnnh3lpcfw8ggi6nc8sr4hcsamx6s3ax869b6rhh392avcw2ha"; + name = "kactivitymanagerd-5.26.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/kde-cli-tools-5.26.3.tar.xz"; - sha256 = "0h76w9nkcc4d15lh7yz260vfh3fv9apx5d7i5m75pb4z9mgcpgzv"; - name = "kde-cli-tools-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/kde-cli-tools-5.26.5.tar.xz"; + sha256 = "0djxqxdkih4svmggk6lk6p6n3sx3w4q9fsnx2dxfn5injwh0qrkr"; + name = "kde-cli-tools-5.26.5.tar.xz"; }; }; kde-gtk-config = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/kde-gtk-config-5.26.3.tar.xz"; - sha256 = "1fkiqf92222vsbrq15skn6cynni312r7clbr2xrsxnygwbvsqni7"; - name = "kde-gtk-config-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/kde-gtk-config-5.26.5.tar.xz"; + sha256 = "10r4kgpd04hh05yriga2r5awwdb8v93jsx0qksdgj3661xy00x7n"; + name = "kde-gtk-config-5.26.5.tar.xz"; }; }; kdecoration = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/kdecoration-5.26.3.tar.xz"; - sha256 = "0ngcqfp0qy8dmd7df35xw5m2pz5azzvpsj0raby370j76s8l92wi"; - name = "kdecoration-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/kdecoration-5.26.5.tar.xz"; + sha256 = "1dzpqzi25wxmilj92lqjmd6wid3nlkbvnnpcpp0ywd860q30zzd2"; + name = "kdecoration-5.26.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/kdeplasma-addons-5.26.3.tar.xz"; - sha256 = "13j79097j2x8cmssqikiwlxkkajaj8nnw4md6vl4f51qnrz7h7f4"; - name = "kdeplasma-addons-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/kdeplasma-addons-5.26.5.tar.xz"; + sha256 = "17vrdnigif4v38gbh04p8qs7wqp3y3nqll1m7xc4qfqbq1dydyjq"; + name = "kdeplasma-addons-5.26.5.tar.xz"; }; }; kgamma5 = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/kgamma5-5.26.3.tar.xz"; - sha256 = "0pjyqrily8in109ys2bawm3cr0vn4ig788h100l3953wg15alv47"; - name = "kgamma5-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/kgamma5-5.26.5.tar.xz"; + sha256 = "0v4rpm2asv31w1rqrhn25kbcdl1acahg10lmh6iwisxl1i3x8hd8"; + name = "kgamma5-5.26.5.tar.xz"; }; }; khotkeys = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/khotkeys-5.26.3.tar.xz"; - sha256 = "0pwmf35qfz2vrvc5gwwibxjwwpc5lvlihba77cj6lfw1hn9h203m"; - name = "khotkeys-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/khotkeys-5.26.5.tar.xz"; + sha256 = "0lkmh5n76kmrdxm4snkk1zz7d927qkl69ajd5qhz277whpz3slw8"; + name = "khotkeys-5.26.5.tar.xz"; }; }; kinfocenter = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/kinfocenter-5.26.3.tar.xz"; - sha256 = "0fmc34n9yvkrfhgp0akjd9y7mkhjl8jfl485kfij5rrc14zyln65"; - name = "kinfocenter-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/kinfocenter-5.26.5.tar.xz"; + sha256 = "0rka2fm7r2zikv3lcd1q39swgcp6fs5l4f5ldpgwpk9bps96cy4x"; + name = "kinfocenter-5.26.5.tar.xz"; }; }; kmenuedit = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/kmenuedit-5.26.3.tar.xz"; - sha256 = "0bapsrfi9fhj8gw8qbs3f538l1kpawv3k2avkk87zy9cvi9kh1vw"; - name = "kmenuedit-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/kmenuedit-5.26.5.tar.xz"; + sha256 = "17iyk77mb1lp9xjl92ffvv111b4m2qq98xznd1qafnah7ix1cg7p"; + name = "kmenuedit-5.26.5.tar.xz"; }; }; kpipewire = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/kpipewire-5.26.3.tar.xz"; - sha256 = "193wrnz4v8zqi95laa9jpbnd2kmf1y40a57yyhfjhawfijinba5l"; - name = "kpipewire-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/kpipewire-5.26.5.tar.xz"; + sha256 = "1yqymwq48mqv9zfw3idb0abizrfhr7f4d37ys9w7a9jixcm7rdrv"; + name = "kpipewire-5.26.5.tar.xz"; }; }; kscreen = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/kscreen-5.26.3.tar.xz"; - sha256 = "05dcff125vklawf3b8hirbp7fwhjqnpqrlkkaqsxf7w99p3s6bss"; - name = "kscreen-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/kscreen-5.26.5.tar.xz"; + sha256 = "0w8yrzpgr23s7sr3296lrm2zbm2j2174zv5az41i44l907iq9y1x"; + name = "kscreen-5.26.5.tar.xz"; }; }; kscreenlocker = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/kscreenlocker-5.26.3.tar.xz"; - sha256 = "0sa56dyxa7mg76z41dn5w7z1snsyqwyxh0nq32izi9bm20zd2f6f"; - name = "kscreenlocker-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/kscreenlocker-5.26.5.tar.xz"; + sha256 = "0lwn3xbbk1578974m3nkk2x5h9fadrcizvh4q4528s5wgxja6w2g"; + name = "kscreenlocker-5.26.5.tar.xz"; }; }; ksshaskpass = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/ksshaskpass-5.26.3.tar.xz"; - sha256 = "05kwcwny6lx459p149nwgv09hzjb6w24jafqzxa6rk1k1fb0x5wi"; - name = "ksshaskpass-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/ksshaskpass-5.26.5.tar.xz"; + sha256 = "0k0jxbkav115i5nhazxyz3s3wg6gyfcsa1jilf3j3fr8vnh8qhx0"; + name = "ksshaskpass-5.26.5.tar.xz"; }; }; ksystemstats = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/ksystemstats-5.26.3.tar.xz"; - sha256 = "0il22sx3clkksri9z0k41ssqhb07qvfipnymckja90m70npqb2a2"; - name = "ksystemstats-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/ksystemstats-5.26.5.tar.xz"; + sha256 = "18sa2w6vgbqmw8wrg5vqbraql04x9kb7mj9k35z4zs2n4abfrrbi"; + name = "ksystemstats-5.26.5.tar.xz"; }; }; kwallet-pam = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/kwallet-pam-5.26.3.tar.xz"; - sha256 = "03haxcdsjwydb1l27lzizk8bqqhyf313044p4f94ii8gdgg1w8l5"; - name = "kwallet-pam-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/kwallet-pam-5.26.5.tar.xz"; + sha256 = "1c5pzih8id0gld7qdf8ffxsbfgq9bsvpx37qyzr941b3vif7f9yx"; + name = "kwallet-pam-5.26.5.tar.xz"; }; }; kwayland-integration = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/kwayland-integration-5.26.3.tar.xz"; - sha256 = "0hy6xv1009vcmypqaga8mzfsh4nybsrvm107g261hww43qyx2wg5"; - name = "kwayland-integration-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/kwayland-integration-5.26.5.tar.xz"; + sha256 = "0czq16lq210hq7a3wqg7pvdr9a8vm16z6yb82p0w6yqv15kk7alx"; + name = "kwayland-integration-5.26.5.tar.xz"; }; }; kwin = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/kwin-5.26.3.tar.xz"; - sha256 = "050a5j0dm131a45lggiw47mllzzm4fxf2m1mv5csazzwjrbmz661"; - name = "kwin-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/kwin-5.26.5.tar.xz"; + sha256 = "1n0v0553s9l8s6wgdz5bhrnvww20q49h92v3m4w216razj7q3q0k"; + name = "kwin-5.26.5.tar.xz"; }; }; kwrited = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/kwrited-5.26.3.tar.xz"; - sha256 = "0jznp1r92z22vk5zqwjh1fk6j5jzw4vygzjjlm4yv426izkw2xdj"; - name = "kwrited-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/kwrited-5.26.5.tar.xz"; + sha256 = "14savlbywkx5107s0viprafs9pl389zhjk32iy4x5jmf9dk6vmm9"; + name = "kwrited-5.26.5.tar.xz"; }; }; layer-shell-qt = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/layer-shell-qt-5.26.3.tar.xz"; - sha256 = "10d4vi70z27n434d71n38m1l8dgdk33155yk97d7rsaicg7s1hq2"; - name = "layer-shell-qt-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/layer-shell-qt-5.26.5.tar.xz"; + sha256 = "1k79dcyic2hkm92sd7aix03ywagr4rgsdf86a9zy06kafg92jra9"; + name = "layer-shell-qt-5.26.5.tar.xz"; }; }; libkscreen = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/libkscreen-5.26.3.tar.xz"; - sha256 = "1nfpa4h8yhrkfq39qzlbpfkxp1qvd5k11jv4sgdqv0fs99g8xhzf"; - name = "libkscreen-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/libkscreen-5.26.5.tar.xz"; + sha256 = "0vajgzjvpn909ds88jddsg7bman0rdphrm70b0k5ar7bcw0x54d5"; + name = "libkscreen-5.26.5.tar.xz"; }; }; libksysguard = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/libksysguard-5.26.3.tar.xz"; - sha256 = "1lbngciln6q66g2q48xcl7m1j7rb2yjrncpaidr6464a8vffwh69"; - name = "libksysguard-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/libksysguard-5.26.5.tar.xz"; + sha256 = "01a1wm6z191lzjqd5iws90jd3ld3r6r1qaw95bl65l9ar8p3gr8p"; + name = "libksysguard-5.26.5.tar.xz"; }; }; milou = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/milou-5.26.3.tar.xz"; - sha256 = "12wjbvw72033havjq91i2prcj4yjynh6h2lc2z6ba9zsp6rsgk41"; - name = "milou-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/milou-5.26.5.tar.xz"; + sha256 = "1pmz4n41ysb0mhgykvc65r5as8fkd7wr4k57sk0a12wzsndy7zv8"; + name = "milou-5.26.5.tar.xz"; }; }; oxygen = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/oxygen-5.26.3.tar.xz"; - sha256 = "1hczm502afy9ps5qq6pq0zdzvdyn2gsr17072q530fi9mzljbdch"; - name = "oxygen-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/oxygen-5.26.5.tar.xz"; + sha256 = "0wllhniaqpzvzji51a9871j1697kjwbz4xj8q9x1w89ip88pb6gq"; + name = "oxygen-5.26.5.tar.xz"; }; }; oxygen-sounds = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/oxygen-sounds-5.26.3.tar.xz"; - sha256 = "015mn6smrc5ii5jq8yajqi0ndlaci48cy289ks8q5qspvfd99hrs"; - name = "oxygen-sounds-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/oxygen-sounds-5.26.5.tar.xz"; + sha256 = "1ws6bssn2r2m666kd6i0xnmzxb8x3z2pa6qk36xpbs1xjxdv5wny"; + name = "oxygen-sounds-5.26.5.tar.xz"; }; }; plank-player = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plank-player-5.26.3.tar.xz"; - sha256 = "16lmsmg6d363giyfw0vwbyznx27fy8p4cvmpgqdzq23zhc20axnm"; - name = "plank-player-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plank-player-5.26.5.tar.xz"; + sha256 = "18yw74mqcd0igps10m1sd41rlir2y8y78xkljxj5w2y4yvh97vbs"; + name = "plank-player-5.26.5.tar.xz"; }; }; plasma-bigscreen = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plasma-bigscreen-5.26.3.tar.xz"; - sha256 = "13mr8xkmvq0lh6fc103nzirkgda3gpry1qwy3azvw65bxxakf7wq"; - name = "plasma-bigscreen-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plasma-bigscreen-5.26.5.tar.xz"; + sha256 = "0893ngwdgq1l76gib4p9212lwp4i2gxvpnmxygndbmkz7nhjax75"; + name = "plasma-bigscreen-5.26.5.tar.xz"; }; }; plasma-browser-integration = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plasma-browser-integration-5.26.3.tar.xz"; - sha256 = "1bwdl6dzz6cj9753cgivrz1ajxy6qn59g5la4icfp7kn945zw7zm"; - name = "plasma-browser-integration-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plasma-browser-integration-5.26.5.tar.xz"; + sha256 = "1bfzha5vd8hjij758b0g6ibyi4f8gmijz92fgn5is0p1hydm8y4l"; + name = "plasma-browser-integration-5.26.5.tar.xz"; }; }; plasma-desktop = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plasma-desktop-5.26.3.tar.xz"; - sha256 = "1lsw17rkwb91v1kaqg627rg6i3a56q2izj66fcgfy9fl34sc4x31"; - name = "plasma-desktop-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plasma-desktop-5.26.5.tar.xz"; + sha256 = "15kc5sam3y2c1ccp14cs7v5zakgzz9gpxpyxapimlvkwscxmvzn6"; + name = "plasma-desktop-5.26.5.tar.xz"; }; }; plasma-disks = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plasma-disks-5.26.3.tar.xz"; - sha256 = "0gjbhnf74vnd1d1zfbdha9qx0jddx8621z80czyrn0b6yz28pmgm"; - name = "plasma-disks-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plasma-disks-5.26.5.tar.xz"; + sha256 = "137k44lly2qv6vrmfi4g2xqc7y907ywwshp7mn07qmbps3a85h30"; + name = "plasma-disks-5.26.5.tar.xz"; }; }; plasma-firewall = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plasma-firewall-5.26.3.tar.xz"; - sha256 = "0ra23mv2n2bsq5hsyl9biiak2s1ii3fpxhbbmyzakp3dnln0vkwx"; - name = "plasma-firewall-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plasma-firewall-5.26.5.tar.xz"; + sha256 = "18fp7iqnyjx2p44n8hjs7fss212ja3k2i5cryrnmwpf7r0q73l36"; + name = "plasma-firewall-5.26.5.tar.xz"; }; }; plasma-integration = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plasma-integration-5.26.3.tar.xz"; - sha256 = "1vfs6hw9pswxgjln13kj5l7hqfh3m40vqrh0yz3zzs574bfj61y7"; - name = "plasma-integration-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plasma-integration-5.26.5.tar.xz"; + sha256 = "0ap7rzhqmm7ai9sc6w281f2kf81qgs2h2qpf5bvbc6wm3vn1lm1g"; + name = "plasma-integration-5.26.5.tar.xz"; }; }; plasma-mobile = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plasma-mobile-5.26.3.tar.xz"; - sha256 = "0l4m281bsilswvzhp849x6qnpvzc632p1mlarhwh40gak9ymjx0h"; - name = "plasma-mobile-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plasma-mobile-5.26.5.tar.xz"; + sha256 = "06gha8mga9xqmmvzc9why9pfzzpy8czrqym3k3n23pa9hy2qqsvj"; + name = "plasma-mobile-5.26.5.tar.xz"; }; }; plasma-nano = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plasma-nano-5.26.3.tar.xz"; - sha256 = "1n2nfl8s9vrsr919cpz2pji4f8fa6cmlp5qybib490mnwlw6vy7k"; - name = "plasma-nano-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plasma-nano-5.26.5.tar.xz"; + sha256 = "161sabckgl8gjxxsm0aklp33bf05iq2p84vh2v5y6bfpimsnamnj"; + name = "plasma-nano-5.26.5.tar.xz"; }; }; plasma-nm = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plasma-nm-5.26.3.tar.xz"; - sha256 = "1q21lnl5y3dm73pl7586bg7whc9fk540ajm3hy0x4p10q28y7yyc"; - name = "plasma-nm-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plasma-nm-5.26.5.tar.xz"; + sha256 = "1msi9lhkhpb29h6fwkxqmp9js70r8vrvzzf38hzkgxcbf3757k64"; + name = "plasma-nm-5.26.5.tar.xz"; }; }; plasma-pa = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plasma-pa-5.26.3.tar.xz"; - sha256 = "01q8jbbdi1hqa6wx8bhas7qzqg3v5mkqrj3lmaq56qvp9rjyg8ik"; - name = "plasma-pa-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plasma-pa-5.26.5.tar.xz"; + sha256 = "19i9ipajiz68silvprap9pykki6rhb7d2ways501bx8g4vfcb0h5"; + name = "plasma-pa-5.26.5.tar.xz"; }; }; plasma-remotecontrollers = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plasma-remotecontrollers-5.26.3.tar.xz"; - sha256 = "0hmacs0927pqhxmv89p96g5c71ic2wsn7byvbnp9w9gp4wbgkwc2"; - name = "plasma-remotecontrollers-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plasma-remotecontrollers-5.26.5.tar.xz"; + sha256 = "1cam1jchp3nwqkqskln4qbpb4rixzwa0bwma89ysdgqy0pzpq2x0"; + name = "plasma-remotecontrollers-5.26.5.tar.xz"; }; }; plasma-sdk = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plasma-sdk-5.26.3.tar.xz"; - sha256 = "0s71clqpc9ncqcz6pjkv4r0zk4v2bl72i1s6mxr7z9qxmhhmi41f"; - name = "plasma-sdk-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plasma-sdk-5.26.5.tar.xz"; + sha256 = "0p20s2cp5vd1chj28wq88ixb625hisl134hnlllz6h70s5vzy79n"; + name = "plasma-sdk-5.26.5.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plasma-systemmonitor-5.26.3.tar.xz"; - sha256 = "11dvzjr083c3ds4cq2ws7d3365c3hdqdpw0r9sca94grs64jigwz"; - name = "plasma-systemmonitor-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plasma-systemmonitor-5.26.5.tar.xz"; + sha256 = "0xghszlm8h70p192qizv2kj7f02fnf3p3hg1p10ni7sqfaczrbq1"; + name = "plasma-systemmonitor-5.26.5.tar.xz"; }; }; plasma-tests = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plasma-tests-5.26.3.tar.xz"; - sha256 = "1m71rhvfl1yls8vlyxpfs7z3aavf42a0lyg94rmb7awzp4qkf7zv"; - name = "plasma-tests-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plasma-tests-5.26.5.tar.xz"; + sha256 = "1h0cinrgjdp7rhl3v55c40a5agd93rqwx1xjqyj06vkjkbigx0fr"; + name = "plasma-tests-5.26.5.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plasma-thunderbolt-5.26.3.tar.xz"; - sha256 = "1w0b124xkh8g9kivlxwasb4iqpp5spm40y5hdz08r8faw065fn6g"; - name = "plasma-thunderbolt-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plasma-thunderbolt-5.26.5.tar.xz"; + sha256 = "1lzj3m2k34m3fvcq3ykr5igaq0sbc4v87cncxvz6ln0p7cq0i6y5"; + name = "plasma-thunderbolt-5.26.5.tar.xz"; }; }; plasma-vault = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plasma-vault-5.26.3.tar.xz"; - sha256 = "09mljjn7z8vbwzfhdxbjnkr8r4anplbb3di2vvfwcgn0yn2m4hmf"; - name = "plasma-vault-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plasma-vault-5.26.5.tar.xz"; + sha256 = "104cs6prb8v5mccshz5brknfllyfbfnjzzpdrgk1xpzh5apwmhja"; + name = "plasma-vault-5.26.5.tar.xz"; }; }; plasma-workspace = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plasma-workspace-5.26.3.tar.xz"; - sha256 = "0ly96nxdiw5sndb1ga2ngqr4s5sslg8gi9ikp0nq4h75wfc1wb0a"; - name = "plasma-workspace-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plasma-workspace-5.26.5.tar.xz"; + sha256 = "082jnlqgbp48bmyp1nbzg2d0p0pxkvra6xjv40kvh6k6rmpr5cjc"; + name = "plasma-workspace-5.26.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plasma-workspace-wallpapers-5.26.3.tar.xz"; - sha256 = "1qrwfn8r845giganv9gk7v75827q9js8sygc0dvijg2ilmr56d31"; - name = "plasma-workspace-wallpapers-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plasma-workspace-wallpapers-5.26.5.tar.xz"; + sha256 = "07gln5jl947qfpvrgiqa1fnw8lnnf4jg734ayybi927j059s3g8i"; + name = "plasma-workspace-wallpapers-5.26.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/plymouth-kcm-5.26.3.tar.xz"; - sha256 = "14np3wnca4nmcr74zbkrnysbfsrbrhxaf0hb96f4rn391kj5m635"; - name = "plymouth-kcm-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/plymouth-kcm-5.26.5.tar.xz"; + sha256 = "1isxs6gxbab2ddl22c3992gmdgy3mi5yjb9inv32ajzs6r7snrj1"; + name = "plymouth-kcm-5.26.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.26.3"; + version = "1-5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/polkit-kde-agent-1-5.26.3.tar.xz"; - sha256 = "0wd6yjd1qgiqjvvdn575zaa4c3szigk91d5l7a4c4kg4x5yb161g"; - name = "polkit-kde-agent-1-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/polkit-kde-agent-1-5.26.5.tar.xz"; + sha256 = "19jrjx40m8g6hwq5k7ibbm0fmb803hxync2022gqbwzfrdb4493i"; + name = "polkit-kde-agent-1-5.26.5.tar.xz"; }; }; powerdevil = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/powerdevil-5.26.3.tar.xz"; - sha256 = "0190rygc748av81iw2a3bl3zkawl0wjpx0761lagvrdj7hm3x35v"; - name = "powerdevil-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/powerdevil-5.26.5.tar.xz"; + sha256 = "063bqwdnpskcwqzpgcmjwgs9vpkn1gnq2nnzj2sdzrlflfrdsfvp"; + name = "powerdevil-5.26.5.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/qqc2-breeze-style-5.26.3.tar.xz"; - sha256 = "04nx8519g6dwvacyp8x6n2av4wp65kshqbvbfy32f61lildhkg9c"; - name = "qqc2-breeze-style-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/qqc2-breeze-style-5.26.5.tar.xz"; + sha256 = "1lhv4jlg15w8a88czq0fazaizjwva3yv8wv3scdnhhyfnbkch9mr"; + name = "qqc2-breeze-style-5.26.5.tar.xz"; }; }; sddm-kcm = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/sddm-kcm-5.26.3.tar.xz"; - sha256 = "1xfkwqs0aljk1wdmgvw9vqm50d43svlzrkhh7cacy94z9jnaaxia"; - name = "sddm-kcm-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/sddm-kcm-5.26.5.tar.xz"; + sha256 = "0cglb7dvwrkdpl5bgg91yfxrvqfpc2szj3qipcmd6ladsvbz8cxv"; + name = "sddm-kcm-5.26.5.tar.xz"; }; }; systemsettings = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/systemsettings-5.26.3.tar.xz"; - sha256 = "1clqw087nk47gb7qbbmc0s9ks2k5ch5ssim2smz7j6gn3d9n3qy3"; - name = "systemsettings-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/systemsettings-5.26.5.tar.xz"; + sha256 = "1jb1d6933gq07vgg3kzqna91cpcv87p38wrk70g17iz7pszjb3ns"; + name = "systemsettings-5.26.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.26.3"; + version = "5.26.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.3/xdg-desktop-portal-kde-5.26.3.tar.xz"; - sha256 = "1lx73k85ysyyscz1rpdrw3gq8vj16xsgbcz7gs36qcvzhwvg5pjp"; - name = "xdg-desktop-portal-kde-5.26.3.tar.xz"; + url = "${mirror}/stable/plasma/5.26.5/xdg-desktop-portal-kde-5.26.5.tar.xz"; + sha256 = "1hznyl90d3xswnjs4qc6r5azw1z3pzkr7z507v696xhv41j8bzsj"; + name = "xdg-desktop-portal-kde-5.26.5.tar.xz"; }; }; } diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index 94d8f92ac4f9..1c438df1b82f 100644 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ b/pkgs/desktops/plasma-5/systemsettings.nix @@ -45,4 +45,5 @@ mkDerivation { plasma-workspace ]; outputs = [ "bin" "dev" "out" ]; + meta.mainProgram = "systemsettings5"; } diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix index 6a092fce88c6..abbdfd6e498d 100644 --- a/pkgs/desktops/xfce/applications/ristretto/default.nix +++ b/pkgs/desktops/xfce/applications/ristretto/default.nix @@ -1,14 +1,28 @@ -{ lib, mkXfceDerivation, gtk3, glib, libexif -, libxfce4ui, libxfce4util, xfconf }: +{ lib +, mkXfceDerivation +, gtk3 +, glib +, libexif +, libxfce4ui +, libxfce4util +, xfconf +}: mkXfceDerivation { category = "apps"; pname = "ristretto"; - version = "0.12.3"; + version = "0.12.4"; - sha256 = "sha256-Tkjl01OD6yDbKAHzZVRG7c7KnP0MURmsc0d0DbcFuFk="; + sha256 = "sha256-pspS9zRvDOMz4+Ud43uT4gsDQhB51bwmaXPXcGlOhsY="; - buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ]; + buildInputs = [ + glib + gtk3 + libexif + libxfce4ui + libxfce4util + xfconf + ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index 8a376862d9c9..2d3d9c5d4e01 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -12,9 +12,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; - version = "0.6.4"; + version = "0.6.5"; - sha256 = "sha256-H/qAfgwM0qaIxpVlSAUJJ4/Z3WtvYxJb2TtjKHK6AjE="; + sha256 = "sha256-NUEqQk9EcDl23twbo+DUt7QYZrPmWpsRzmi5wIdolqw="; buildInputs = [ gtk3 diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index 7beeb0ff87f2..f0129fe9001a 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -1,30 +1,30 @@ { lib , mkXfceDerivation , exo -, glib-networking -, gtk3 -, libsoup +, libxml2 +, libsoup_3 , libxfce4ui , libxfce4util , xfce4-panel +, xfconf }: mkXfceDerivation { category = "apps"; pname = "xfce4-screenshooter"; - version = "1.9.11"; + version = "1.10.3"; odd-unstable = false; - sha256 = "sha256-sW0SEXypCcly7MlO9lnxHTkYwIiRt+gOME5UQ++Y3JQ="; + sha256 = "sha256-L+qlxzNgjsoMi+VsbOFG7L/IITbF1iqMWqujhk0rAcA="; buildInputs = [ exo - glib-networking - gtk3 - libsoup + libxml2 + libsoup_3 libxfce4ui libxfce4util xfce4-panel + xfconf ]; meta = with lib; { diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix index ace9f16e4261..4eb6786ffddc 100644 --- a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix @@ -1,14 +1,32 @@ -{ lib, mkXfceDerivation, exo, gtk3, libwnck, libXmu }: +{ lib +, mkXfceDerivation +, exo +, gtk3 +, libxfce4ui +, xfconf +, libwnck +, libXmu +}: mkXfceDerivation { category = "apps"; pname = "xfce4-taskmanager"; - version = "1.4.2"; + version = "1.5.5"; + odd-unstable = false; - sha256 = "sha256-jcICXPtG/7t0U0xqgvU52mjiA8wsyw7JQ0OmNjwA89A="; + sha256 = "sha256-worHYB9qibRxMaCYQ0+nHA9CSTColewgahyrXiPOnQA="; - nativeBuildInputs = [ exo ]; - buildInputs = [ gtk3 libwnck libXmu ]; + nativeBuildInputs = [ + exo + ]; + + buildInputs = [ + gtk3 + libxfce4ui + xfconf + libwnck + libXmu + ]; meta = with lib; { description = "Easy to use task manager for Xfce"; diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index 1a63a62510c9..99c8741851fa 100644 --- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -11,6 +11,8 @@ mkXfceDerivation { buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ]; + NIX_CFLAGS_COMPILE = "-I${libxfce4ui.dev}/include/xfce4"; + passthru.tests.test = nixosTests.terminal-emulators.xfce4-terminal; meta = with lib; { diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix index 131181031847..3820cae101a8 100644 --- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix @@ -7,6 +7,12 @@ mkXfceDerivation { sha256 = "sha256-EgmTk19p9OBmz3rWQB0LoPhhoDm4u1V6/vvgitOzUuc="; + # https://gitlab.xfce.org/apps/xfce4-volumed-pulse/-/merge_requests/3 + postPatch = '' + substituteInPlace configure.ac.in \ + --replace "2.16" "2.26" + ''; + buildInputs = [ gtk3 libnotify libpulseaudio keybinder3 xfconf ]; meta = with lib; { diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/desktops/xfce/core/exo/default.nix index 27a5041eac02..bb8a846c5009 100644 --- a/pkgs/desktops/xfce/core/exo/default.nix +++ b/pkgs/desktops/xfce/core/exo/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "exo"; - version = "4.16.4"; + version = "4.18.0"; - sha256 = "sha256-/BKgQYmDaiptzlTTFqDm2aHykTCHm4MIvWnjxKYi6Es="; + sha256 = "sha256-oWlKeUD1v2qqb8vY+2Cu9VJ1iThFPVboP12m/ob5KSQ="; nativeBuildInputs = [ libxslt diff --git a/pkgs/desktops/xfce/core/garcon/default.nix b/pkgs/desktops/xfce/core/garcon/default.nix index 740022550ebb..656ff4ba5e0b 100644 --- a/pkgs/desktops/xfce/core/garcon/default.nix +++ b/pkgs/desktops/xfce/core/garcon/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "garcon"; - version = "4.16.1"; + version = "4.18.0"; - sha256 = "sha256-KimO6w82lkUBSzJbBMI3W8w1eXPARE1oVyJEUk6olow="; + sha256 = "sha256-l1wGitD8MM1GrR4FyyPIxHSqK+AqKKyjTIN7VOaVzpM="; nativeBuildInputs = [ gobject-introspection ]; diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix index fc3535127fa2..56172917df7b 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "libxfce4ui"; - version = "4.16.1"; + version = "4.18.1"; - sha256 = "sha256-5mwyC3YA1LvdVSvaHN7CXDJh+IXjmdHGLKzhpjtUZkw="; + sha256 = "sha256-1kzvFr/WeTl3HpVMJZRBgsvmG8VtYkdEbIQSniJIaHA="; nativeBuildInputs = [ gobject-introspection vala ]; buildInputs = [ gtk3 libstartup_notification libgtop libepoxy xfconf ]; diff --git a/pkgs/desktops/xfce/core/libxfce4util/default.nix b/pkgs/desktops/xfce/core/libxfce4util/default.nix index 4262a0393035..efc917ab1f28 100644 --- a/pkgs/desktops/xfce/core/libxfce4util/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4util/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "libxfce4util"; - version = "4.16.0"; + version = "4.18.1"; - sha256 = "sha256-q2vH4k1OiergjITOaA9+m92C3Q/sbPoKVrAFxG60Gtw="; + sha256 = "sha256-nqASXyHR7wNiNPorlz2ix+Otyir6I9KCCr1vfS6GO8E="; nativeBuildInputs = [ gobject-introspection vala ]; diff --git a/pkgs/desktops/xfce/core/thunar-volman/default.nix b/pkgs/desktops/xfce/core/thunar-volman/default.nix index 3fe2df6f1b62..33b34e5beee8 100644 --- a/pkgs/desktops/xfce/core/thunar-volman/default.nix +++ b/pkgs/desktops/xfce/core/thunar-volman/default.nix @@ -3,11 +3,11 @@ mkXfceDerivation { category = "xfce"; pname = "thunar-volman"; - version = "4.16.0"; + version = "4.18.0"; buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ]; - sha256 = "sha256-A9APQ5FLshb+MXQErCExegax6hqbHnlfI2hgtnWfVgA="; + sha256 = "sha256-NRVoakU8jTCJVe+iyJQwW1xPti2vjd/8n8CYrIYGII0="; odd-unstable = false; diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index dd8e8f980948..f4dfebb422f7 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -21,9 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.16.11"; + version = "4.18.3"; - sha256 = "sha256-xan0HuHYLVArx3dGzzxsCjQ8eWsXNk0LtZGAejA2iGI="; + sha256 = "sha256-sYn1gBzqEFcB3jHWxmoqqv0Cxa3mui/j0kgBqJMgJrc="; nativeBuildInputs = [ docbook_xsl @@ -44,9 +44,7 @@ let unwrapped = mkXfceDerivation { xfconf ]; - patches = [ - ./thunarx_plugins_directory.patch - ]; + configureFlags = [ "--with-custom-thunarx-dirs-enabled" ]; # the desktop file … is in an insecure location» # which pops up when invoking desktop files that are diff --git a/pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch b/pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch deleted file mode 100644 index 594a81c829ef..000000000000 --- a/pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/thunarx/thunarx-provider-factory.c b/thunarx/thunarx-provider-factory.c -index 94b11545..1f66c982 100644 ---- a/thunarx/thunarx-provider-factory.c -+++ b/thunarx/thunarx-provider-factory.c -@@ -150,12 +150,19 @@ static GList* - thunarx_provider_factory_load_modules (ThunarxProviderFactory *factory) - { - ThunarxProviderModule *module; -+ const gchar *thunar_dir; - const gchar *name; - GList *modules = NULL; - GList *lp; - GDir *dp; - -- dp = g_dir_open (THUNARX_DIRECTORY, 0, NULL); -+ thunar_dir = g_getenv("THUNARX_MODULE_DIR"); -+ if (NULL == thunar_dir) -+ { -+ thunar_dir = THUNARX_DIRECTORY; -+ } -+ -+ dp = g_dir_open (thunar_dir, 0, NULL); - if (G_LIKELY (dp != NULL)) - { - /* determine the types for all existing plugins */ -diff --git a/thunarx/thunarx-provider-module.c b/thunarx/thunarx-provider-module.c -index 023ad2ae..b1d1be8f 100644 ---- a/thunarx/thunarx-provider-module.c -+++ b/thunarx/thunarx-provider-module.c -@@ -174,10 +174,17 @@ static gboolean - thunarx_provider_module_load (GTypeModule *type_module) - { - ThunarxProviderModule *module = THUNARX_PROVIDER_MODULE (type_module); -+ const gchar *thunar_dir; - gchar *path; - -+ thunar_dir = g_getenv("THUNARX_MODULE_DIR"); -+ if (NULL == thunar_dir) -+ { -+ thunar_dir = THUNARX_DIRECTORY; -+ } -+ - /* load the module using the runtime link editor */ -- path = g_build_filename (THUNARX_DIRECTORY, type_module->name, NULL); -+ path = g_build_filename (thunar_dir, type_module->name, NULL); - module->library = g_module_open (path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); - g_free (path); - diff --git a/pkgs/desktops/xfce/core/thunar/wrapper.nix b/pkgs/desktops/xfce/core/thunar/wrapper.nix index 584c356547b3..43531f201232 100644 --- a/pkgs/desktops/xfce/core/thunar/wrapper.nix +++ b/pkgs/desktops/xfce/core/thunar/wrapper.nix @@ -9,10 +9,10 @@ symlinkJoin { postBuild = '' wrapProgram "$out/bin/thunar" \ - --set "THUNARX_MODULE_DIR" "$out/lib/thunarx-3" + --set "THUNARX_DIRS" "$out/lib/thunarx-3" wrapProgram "$out/bin/thunar-settings" \ - --set "THUNARX_MODULE_DIR" "$out/lib/thunarx-3" + --set "THUNARX_DIRS" "$out/lib/thunarx-3" # NOTE: we need to remove the folder symlink itself and create # a new folder before trying to substitute any file below. diff --git a/pkgs/desktops/xfce/core/tumbler/default.nix b/pkgs/desktops/xfce/core/tumbler/default.nix index ee5413fdda5a..9d47d1ec7a35 100644 --- a/pkgs/desktops/xfce/core/tumbler/default.nix +++ b/pkgs/desktops/xfce/core/tumbler/default.nix @@ -7,6 +7,7 @@ , libgsf , poppler , gst_all_1 +, libxfce4util }: # TODO: add libopenraw @@ -14,11 +15,12 @@ mkXfceDerivation { category = "xfce"; pname = "tumbler"; - version = "4.16.1"; + version = "4.18.0"; - sha256 = "sha256-f2pCItNHTB0ggovIddpwNWEhaohfxD2otN8x9VfwR4k="; + sha256 = "sha256-qxbS0PMhwVk2I3fbblJEeIuI72xSWVsQx5SslhOvg+c="; buildInputs = [ + libxfce4util ffmpegthumbnailer freetype gdk-pixbuf diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix index d98353a070af..b479a574d97b 100644 --- a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-appfinder"; - version = "4.16.1"; + version = "4.18.0"; - sha256 = "sha256-Xr8iiCDQYmxiLR2+TeuJggV1dLM/U4b7u7kpvFWT+uQ="; + sha256 = "sha256-/VYZpWk08OQPZ/DQ5SqSL4F4KDdh+IieQBDOZUxZvtw="; nativeBuildInputs = [ exo ]; buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ]; diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix index 16c35e6002bf..25b3e6f80599 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix @@ -14,9 +14,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-dev-tools"; - version = "4.16.0"; + version = "4.18.0"; - sha256 = "sha256-5r9dJfCgXosXoOAtNg1kaPWgFEAmyw/pWTtdG+K1h3A="; + sha256 = "sha256-VgQiTRMPD1VeUkUnFkX78C2VrsrXFWCdmupL8PQc7+c="; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index fed25720e336..155e3124207c 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -2,7 +2,6 @@ , mkXfceDerivation , exo , garcon -, glib , gobject-introspection , gtk3 , libdbusmenu-gtk3 @@ -17,9 +16,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.16.5"; + version = "4.18.1"; - sha256 = "sha256-RK4sEir8CvB1aa2dZWJftA+2n4YPUEkhF9afOfOTA0Y="; + sha256 = "sha256-5GJO8buOTnRGnm3+kesrZjTprCY1qiyookpW6dzI2AE="; nativeBuildInputs = [ gobject-introspection @@ -37,7 +36,6 @@ mkXfceDerivation { ]; propagatedBuildInputs = [ - glib gtk3 libxfce4util ]; @@ -49,9 +47,6 @@ mkXfceDerivation { --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; - # Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825 - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - meta = with lib; { description = "Panel for the Xfce desktop environment"; maintainers = with maintainers; [ ] ++ teams.xfce.members; diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix index 107357d5a731..d14752fbab46 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-power-manager"; - version = "4.16.0"; + version = "4.18.0"; - sha256 = "sha256-Qk++1db+agiU99p+QW8/WNnNqFVejV/BcnmgvfoB3OU="; + sha256 = "sha256-vl0SfZyVGxZYnSa2nCnYlqT05Hm7PLzOxgAGzapkKVI="; nativeBuildInputs = [ automakeAddFlags exo ]; buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf xfce4-panel ]; diff --git a/pkgs/desktops/xfce/core/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix index 5ce96c1b02b6..f8dc8b92da30 100644 --- a/pkgs/desktops/xfce/core/xfce4-session/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-session"; - version = "4.16.0"; + version = "4.18.0"; - sha256 = "sha256-LIRAQ1YAkAHwIzC5NYV/0iFLkAP5V96wuTIrYTGbGy0="; + sha256 = "sha256-eSQXVMdwxr/yE806Tly8CLimmJso6k4muuTR7RHPU3U="; buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck xfconf polkit iceauth ]; diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix index bf003fca5a47..2c51baf4df7c 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix @@ -1,13 +1,24 @@ -{ lib, mkXfceDerivation, exo, garcon, gtk3, glib -, libnotify, libxfce4ui, libxfce4util, libxklavier -, upower, xfconf, xf86inputlibinput }: +{ lib +, mkXfceDerivation +, exo +, garcon +, gtk3 +, glib +, libnotify +, libxfce4ui +, libxfce4util +, libxklavier +, upower +, xfconf +, xf86inputlibinput +}: mkXfceDerivation { category = "xfce"; pname = "xfce4-settings"; - version = "4.16.5"; + version = "4.18.1"; - sha256 = "sha256-ZVQw/oqN+jCOWj8O+1ldVCvbzY+QcebaQI5oFOdMOew="; + sha256 = "sha256-Uy5dObnMV+fpt8RdyFOsYVPN8Dyx1zzOu0pDak01ipQ="; postPatch = '' for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix index c3946258292b..18bc54436b4a 100644 --- a/pkgs/desktops/xfce/core/xfconf/default.nix +++ b/pkgs/desktops/xfce/core/xfconf/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfconf"; - version = "4.16.0"; + version = "4.18.0"; - sha256 = "sha256-w8wnHFj1KBX6lCnGbVLgWPEo2ul4SwfemUYVHioTlwE="; + sha256 = "sha256-8zl2EWV1DRHsH0QUNa13OKvfIVDVOhIO0FCMbU978Js="; nativeBuildInputs = [ gobject-introspection vala ]; diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix index bc3c714eb0a4..ed36d2b92b73 100644 --- a/pkgs/desktops/xfce/core/xfdesktop/default.nix +++ b/pkgs/desktops/xfce/core/xfdesktop/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfdesktop"; - version = "4.16.1"; + version = "4.18.1"; - sha256 = "sha256-JecuD0DJASHaxL6gwmL3hcmAEA7sVIyaM0ushrdq4/Y="; + sha256 = "sha256-33G7X5kA3MCNJ9Aq9ZCafP0Qm/46iUmLFB8clhKwDz8="; buildInputs = [ exo diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix index efc12dd91eb9..abd08f5a6f3d 100644 --- a/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfwm4"; - version = "4.16.1"; + version = "4.18.0"; - sha256 = "sha256-CwRJk+fqu3iC4Vb6fKGOIZZk2hxTqYF3sNvm6WKqHdI="; + sha256 = "sha256-nTPgxC0XMBJ48lPCeQgCvWWK1/2ZIoQOYsMeaxDpE1c="; nativeBuildInputs = [ exo librsvg ]; diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 546681afedf9..5dc21338a72c 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -1,31 +1,17 @@ { config , lib , pkgs -, splicePackages -, newScope -, pkgsBuildBuild -, pkgsBuildHost -, pkgsBuildTarget -, pkgsHostHost -, pkgsTargetTarget +, generateSplicesForMkScope +, makeScopeWithSplicing }: let - otherSplices = { - selfBuildBuild = pkgsBuildBuild.xfce; - selfBuildHost = pkgsBuildHost.xfce; - selfBuildTarget = pkgsBuildTarget.xfce; - selfHostHost = pkgsHostHost.xfce; - selfTargetTarget = pkgsTargetTarget.xfce or { }; - }; keep = _self: { }; extra = _spliced0: { }; in -lib.makeScopeWithSplicing - splicePackages - newScope - otherSplices +makeScopeWithSplicing + (generateSplicesForMkScope "xfce") keep extra (self: @@ -39,7 +25,9 @@ lib.makeScopeWithSplicing mkXfceDerivation = callPackage ./mkXfceDerivation.nix { }; - automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh; + automakeAddFlags = pkgs.makeSetupHook { + name = "xfce-automake-add-flags-hook"; + } ./automakeAddFlags.sh; #### CORE @@ -109,9 +97,7 @@ lib.makeScopeWithSplicing xfce4-screensaver = callPackage ./applications/xfce4-screensaver { }; - xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter { - inherit (pkgs.gnome) libsoup; - }; + xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter { }; xfdashboard = callPackage ./applications/xfdashboard { }; @@ -151,8 +137,6 @@ lib.makeScopeWithSplicing xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin { }; - xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin { }; - xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin { }; xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin { }; @@ -192,55 +176,5 @@ lib.makeScopeWithSplicing thunar-bare = self.thunar.override { thunarPlugins = [ ]; }; # added 2019-11-04 - }) // lib.optionalAttrs config.allowAliases { - #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. - - terminal = throw "xfce.terminal has been removed, use xfce.xfce4-terminal instead"; # added 2022-05-24 - thunar-build = throw "xfce.thunar-build has been removed, use xfce.thunar-bare instead"; # added 2022-05-24 - thunarx-2-dev = throw "xfce.thunarx-2-dev has been removed, use xfce.thunar-bare instead"; # added 2022-05-24 - thunar_volman = throw "xfce.thunar_volman has been removed, use xfce.thunar-volman instead"; # added 2022-05-24 - xfce4panel = throw "xfce.xfce4panel has been removed, use xfce.xfce4-panel instead"; # added 2022-05-24 - xfce4session = throw "xfce.xfce4session has been removed, use xfce.xfce4-session instead"; # added 2022-05-24 - xfce4settings = throw "xfce.xfce4settings has been removed, use xfce.xfce4-settings instead"; # added 2022-05-24 - xfce4_power_manager = throw "xfce.xfce4_power_manager has been removed, use xfce.xfce4-power-manager instead"; # added 2022-05-24 - xfce4_appfinder = throw "xfce.xfce4_appfinder has been removed, use xfce.xfce4-appfinder instead"; # added 2022-05-24 - xfce4_dev_tools = throw "xfce.xfce4_dev_tools has been removed, use xfce.xfce4-dev-tools instead"; # added 2022-05-24 - xfce4notifyd = throw "xfce.xfce4notifyd has been removed, use xfce.xfce4-notifyd instead"; # added 2022-05-24 - xfce4taskmanager = throw "xfce.xfce4taskmanager has been removed, use xfce.xfce4-taskmanager instead"; # added 2022-05-24 - xfce4terminal = throw "xfce.xfce4terminal has been removed, use xfce.xfce4-terminal instead"; # added 2022-05-24 - xfce4volumed_pulse = throw "xfce.xfce4volumed_pulse has been removed, use xfce.xfce4-volumed-pulse instead"; # added 2022-05-24 - xfce4icontheme = throw "xfce.xfce4icontheme has been removed, use xfce.xfce4-icon-theme instead"; # added 2022-05-24 - xfwm4themes = throw "xfce.xfwm4themes has been removed, use xfce.xfwm4-themes instead"; # added 2022-05-24 - xfce4_battery_plugin = throw "xfce.xfce4_battery_plugin has been removed, use xfce.xfce4-battery-plugin instead"; # added 2022-05-24 - xfce4_clipman_plugin = throw "xfce.xfce4_clipman_plugin has been removed, use xfce.xfce4-clipman-plugin instead"; # added 2022-05-24 - xfce4_cpufreq_plugin = throw "xfce.xfce4_cpufreq_plugin has been removed, use xfce.xfce4-cpufreq-plugin instead"; # added 2022-05-24 - xfce4_cpugraph_plugin = throw "xfce.xfce4_cpugraph_plugin has been removed, use xfce.xfce4-cpugraph-plugin instead"; # added 2022-05-24 - xfce4_datetime_plugin = throw "xfce.xfce4_datetime_plugin has been removed, use xfce.xfce4-datetime-plugin instead"; # added 2022-05-24 - xfce4_dockbarx_plugin = throw "xfce.xfce4_dockbarx_plugin has been removed, use xfce.xfce4-dockbarx-plugin instead"; # added 2022-05-24 - xfce4_embed_plugin = throw "xfce.xfce4_embed_plugin has been removed, use xfce.xfce4-embed-plugin instead"; # added 2022-05-24 - xfce4_eyes_plugin = throw "xfce.xfce4_eyes_plugin has been removed, use xfce.xfce4-eyes-plugin instead"; # added 2022-05-24 - xfce4_fsguard_plugin = throw "xfce.xfce4_fsguard_plugin has been removed, use xfce.xfce4-fsguard-plugin instead"; # added 2022-05-24 - xfce4_genmon_plugin = throw "xfce.xfce4_genmon_plugin has been removed, use xfce.xfce4-genmon-plugin instead"; # added 2022-05-24 - xfce4_hardware_monitor_plugin = throw "xfce.xfce4_hardware_monitor_plugin has been removed, use xfce.xfce4-hardware-monitor-plugin instead"; # added 2022-05-24 - xfce4_namebar_plugin = throw "xfce.xfce4_namebar_plugin has been removed, use xfce.xfce4-namebar-plugin instead"; # added 2022-05-24 - xfce4_netload_plugin = throw "xfce.xfce4_netload_plugin has been removed, use xfce.xfce4-netload-plugin instead"; # added 2022-05-24 - xfce4_notes_plugin = throw "xfce.xfce4_notes_plugin has been removed, use xfce.xfce4-notes-plugin instead"; # added 2022-05-24 - xfce4_mailwatch_plugin = throw "xfce.xfce4_mailwatch_plugin has been removed, use xfce.xfce4-mailwatch-plugin instead"; # added 2022-05-24 - xfce4_mpc_plugin = throw "xfce.xfce4_mpc_plugin has been removed, use xfce.xfce4-mpc-plugin instead"; # added 2022-05-24 - xfce4_sensors_plugin = throw "xfce.xfce4_sensors_plugin has been removed, use xfce.xfce4-sensors-plugin instead"; # added 2022-05-24 - xfce4_systemload_plugin = throw "xfce.xfce4_systemload_plugin has been removed, use xfce.xfce4-systemload-plugin instead"; # added 2022-05-24 - xfce4_timer_plugin = throw "xfce.xfce4_timer_plugin has been removed, use xfce.xfce4-timer-plugin instead"; # added 2022-05-24 - xfce4_verve_plugin = throw "xfce.xfce4_verve_plugin has been removed, use xfce.xfce4-verve-plugin instead"; # added 2022-05-24 - xfce4_xkb_plugin = throw "xfce.xfce4_xkb_plugin has been removed, use xfce.xfce4-xkb-plugin instead"; # added 2022-05-24 - xfce4_weather_plugin = throw "xfce.xfce4_weather_plugin has been removed, use xfce.xfce4-weather-plugin instead"; # added 2022-05-24 - xfce4_whiskermenu_plugin = throw "xfce.xfce4_whiskermenu_plugin has been removed, use xfce.xfce4-whiskermenu-plugin instead"; # added 2022-05-24 - xfce4_windowck_plugin = throw "xfce.xfce4_windowck_plugin has been removed, use xfce.xfce4-windowck-plugin instead"; # added 2022-05-24 - xfce4_pulseaudio_plugin = throw "xfce.xfce4_pulseaudio_plugin has been removed, use xfce.xfce4-pulseaudio-plugin instead"; # added 2022-05-24 - libxfce4ui_gtk3 = throw "xfce.libxfce4ui_gtk3 has been removed, use xfce.libxfce4ui instead"; # added 2022-05-24 - xfce4panel_gtk3 = throw "xfce.xfce4panel_gtk3 has been removed, use xfce.xfce4-panel instead"; # added 2022-05-24 - xfce4_power_manager_gtk3 = throw "xfce.xfce4_power_manager_gtk3 has been removed, use xfce.xfce4-power-manager instead"; # added 2022-05-24 - gtk = throw "xfce.gtk has been removed, use gtk2 instead"; # added 2022-05-24 - gtksourceview = throw "xfce.gtksourceview has been removed, use gtksourceview instead"; # added 2022-05-24 - dconf = throw "xfce.dconf has been removed, use dconf instead"; # added 2022-05-24 - vte = throw "xfce.vte has been removed, use vte instead"; # added 2022-05-24 -} + xfce4-hardware-monitor-plugin = throw "xfce.xfce4-hardware-monitor-plugin has been removed: abandoned by upstream and does not build"; # added 2023-01-15 + }) 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 fb070ed3652d..bba028bfe536 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.7"; - sha256 = "sha256-M+BehEYcHZlnuYwBlI7F0aPxPGwExTL5I9Jf6W5ugOY="; + version = "1.2.8"; + sha256 = "sha256-wEVv3zBS9PRLOMusFPzTnffVDvTaBnTCyGjstJRQRCo="; 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 8a2cd770944b..ad0110a56429 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix @@ -13,10 +13,10 @@ mkXfceDerivation rec { category = "panel-plugins"; pname = "xfce4-cpugraph-plugin"; - version = "1.2.6"; + version = "1.2.7"; rev-prefix = "xfce4-cpugraph-plugin-"; odd-unstable = false; - sha256 = "sha256-Elm10ZGN93R+1XZ4vJJZZIJ6OcaHpsrH0nQRMMuFnLY="; + sha256 = "sha256-IgxljHJAg9Bp/OFFZiQ6QwE5vtAtQ0WmYHs78NVsmCw="; buildInputs = [ exo diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix index 5202f7f54c24..eaf090c348cf 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix @@ -9,10 +9,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-datetime-plugin"; - version = "0.8.2"; + version = "0.8.3"; rev-prefix = "xfce4-datetime-plugin-"; - sha256 = "sha256-ov4Wh9Pj01u0NrjDn5p+qXlD2LY3gEUC1e/jPjkn4xQ="; + sha256 = "sha256-dpN5ZN7VjgO1GQ6v8NXuBKACyIwIosaiVGtmLEb6auI="; nativeBuildInputs = [ gettext diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix deleted file mode 100644 index 3f1f9c25c509..000000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, autoreconfHook, gnome2, gtkmm2, - libgtop, libxfce4ui, libxfce4util, xfce4-panel, lm_sensors, xfce -}: - -stdenv.mkDerivation rec { - pname = "xfce4-hardware-monitor-plugin"; - version = "1.6.0"; - - src = fetchurl { - url = "https://git.xfce.org/archive/${pname}/snapshot/${pname}-${version}.tar.gz"; - sha256 = "sha256-aLpNY+qUhmobGb8OkbjtJxQMDO9xSlvurVjNLgOpZ4Y="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - intltool - ]; - - buildInputs = [ - gtkmm2 - gnome2.libgnomecanvas - gnome2.libgnomecanvasmm - libgtop - libxfce4ui - libxfce4util - xfce4-panel - lm_sensors - ]; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-hardware-monitor-plugin"; - description = "Hardware monitor plugin for the XFCE4 panel"; - license = licenses.gpl3Only; - platforms = platforms.unix; - broken = true; # unmaintained plugin; no longer compatible with xfce 4.16 - maintainers = with maintainers; [ ] ++ teams.xfce.members; - }; -} 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 2e82deb2d3f1..fbc40f190255 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.3"; + version = "1.4.4"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-FxwCNfcMZfD/7lh+lg2dp5soSFXfIhMCOerCYnLsBsk="; + sha256 = "sha256-bBYFpzjl30DghNCKyT+WLNRFCTOW3h6b+tx6tFiMNrY="; }; nativeBuildInputs = [ 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 9f6d92b745ec..9e1518f7be0a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix @@ -13,11 +13,11 @@ let category = "panel-plugins"; in stdenv.mkDerivation rec { pname = "xfce4-systemload-plugin"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-VtEAeAHVLXwrWhO7VHRfbX8G/aKLSc6TYUVjMGiBdlI="; + sha256 = "sha256-uzA/wwIOBTrR+guPy/DXaBxVY7uPZJNX1qlaV3gCsHI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index 0dc3d3a81aa6..a1027c752ddd 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.7.1"; + version = "2.7.2"; rev-prefix = "v"; odd-unstable = false; - sha256 = "sha256-aN8PwH5YIbjiyS5tTcU2AU4LAYC2tBStDxhCXi/dvkQ="; + sha256 = "sha256-yp8NpBVgqEv34qmDMKPdy53awgSLtYfeaw1JrxENFps="; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index 2d5619620417..5c04ca4a50ff 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -49,17 +49,18 @@ let # targetInfo.triple is what Google thinks the toolchain should be, this is a little # different from what we use. We make it four parts to conform with the existing # standard more properly. - targetConfig = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config); + targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-"); in rec { # Misc tools binaries = stdenv.mkDerivation { - pname = "${targetConfig}-ndk-toolchain"; + pname = "${targetPrefix}ndk-toolchain"; inherit (androidndk) version; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; propagatedBuildInputs = [ androidndk ]; passthru = { + inherit targetPrefix; isClang = true; # clang based cc, but bintools ld }; dontUnpack = true; @@ -91,23 +92,23 @@ rec { ln -s $out/toolchain/bin $out/bin ln -s $out/toolchain/${targetInfo.triple}/bin/* $out/bin/ for f in $out/bin/${targetInfo.triple}-*; do - ln -s $f ''${f/${targetInfo.triple}-/${targetConfig}-} + ln -s $f ''${f/${targetInfo.triple}-/${targetPrefix}} done for f in $(find $out/toolchain -type d -name ${targetInfo.triple}); do - ln -s $f ''${f/${targetInfo.triple}/${targetConfig}} + ln -s $f ''${f/${targetInfo.triple}/${targetPrefix}} done - rm -f $out/bin/${targetConfig}-ld - ln -s $out/bin/lld $out/bin/${targetConfig}-ld + rm -f $out/bin/${targetPrefix}ld + ln -s $out/bin/lld $out/bin/${targetPrefix}ld (cd $out/bin; for tool in llvm-*; do - ln -sf $tool ${targetConfig}-$(echo $tool | sed 's/llvm-//') + ln -sf $tool ${targetPrefix}$(echo $tool | sed 's/llvm-//') ln -sf $tool $(echo $tool | sed 's/llvm-//') done) # handle last, as llvm-as is for llvm bytecode - ln -sf $out/bin/${targetInfo.triple}-as $out/bin/${targetConfig}-as + ln -sf $out/bin/${targetInfo.triple}-as $out/bin/${targetPrefix}as ln -sf $out/bin/${targetInfo.triple}-as $out/bin/as patchShebangs $out/bin @@ -131,7 +132,7 @@ rec { # Android needs executables linked with -pie since version 5.0 # Use -fPIC for compilation, and link with -pie if no -shared flag used in ldflags echo "-target ${targetInfo.triple} -fPIC" >> $out/nix-support/cc-cflags - echo "-z,noexecstack -z,relro -z,now" >> $out/nix-support/cc-ldflags + echo "-z,noexecstack -z,relro -z,now -z,muldefs" >> $out/nix-support/cc-ldflags echo 'if [[ ! " $@ " =~ " -shared " ]]; then NIX_LDFLAGS_${suffixSalt}+=" -pie"; fi' >> $out/nix-support/add-flags.sh echo "-Xclang -mnoexecstack" >> $out/nix-support/cc-cxxflags if [ ${targetInfo.triple} == arm-linux-androideabi ]; then diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix index d1afa55387d3..eb70517c82ec 100644 --- a/pkgs/development/beam-modules/build-erlang-mk.nix +++ b/pkgs/development/beam-modules/build-erlang-mk.nix @@ -17,8 +17,6 @@ , ... }@attrs: -with lib; - let debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "+debug_info"; @@ -107,4 +105,4 @@ let }; }); in -fix pkg +lib.fix pkg diff --git a/pkgs/development/beam-modules/build-hex.nix b/pkgs/development/beam-modules/build-hex.nix index 1ebe3760ec8d..b5d20fa97783 100644 --- a/pkgs/development/beam-modules/build-hex.nix +++ b/pkgs/development/beam-modules/build-hex.nix @@ -5,8 +5,6 @@ , hexPkg ? name , ... }@attrs: -with lib; - let pkg = self: builder (attrs // { @@ -17,4 +15,4 @@ let }; }); in - fix pkg + lib.fix pkg diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 6b6ef7ce3501..081d4988bace 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -15,7 +15,6 @@ , ... }@attrs: -with lib; let shell = drv: stdenv.mkDerivation { name = "interactive-shell-${drv.name}"; @@ -90,5 +89,5 @@ let }; }); in -fix pkg +lib.fix pkg diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index 0dfd68f0993c..43d613d072ee 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -16,8 +16,6 @@ , ... }@attrs: -with lib; - let debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info"; @@ -30,7 +28,7 @@ let buildInputs = [ drv ]; }; - customPhases = filterAttrs + customPhases = lib.filterAttrs (_: v: v != null) { inherit setupHook configurePhase buildPhase installPhase; }; @@ -40,7 +38,7 @@ let inherit version; buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ]; - propagatedBuildInputs = unique beamDeps; + propagatedBuildInputs = lib.unique beamDeps; inherit src; @@ -85,4 +83,4 @@ let }; } // customPhases); in -fix pkg +lib.fix pkg diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 068e1da33133..23982fb2a789 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -1,6 +1,7 @@ -{ lib, pkgs, erlang }: +{ lib, __splicedPackages, erlang }: let + pkgs = __splicedPackages; inherit (lib) makeExtensible; lib' = pkgs.callPackage ./lib.nix { }; @@ -42,7 +43,7 @@ let elvis-erlang = callPackage ./elvis-erlang { }; # BEAM-based languages. - elixir = elixir_1_13; + elixir = elixir_1_14; elixir_1_14 = lib'.callElixir ../interpreters/elixir/1.14.nix { inherit erlang; diff --git a/pkgs/development/beam-modules/elixir-ls/pin.json b/pkgs/development/beam-modules/elixir-ls/pin.json index bd206eb1d1a2..79909f98b7de 100644 --- a/pkgs/development/beam-modules/elixir-ls/pin.json +++ b/pkgs/development/beam-modules/elixir-ls/pin.json @@ -1,5 +1,5 @@ { - "version": "0.12.0", - "sha256": "sha256-ZieKL98EUT3RbZ1UZkhrnXjg3N0RATKB69F8D7IWnJ8=", - "depsSha256": "sha256-Otm8koWrDYxodfliIe+q4U+39eStR5umEKnQQmOOGeA=" + "version": "0.13.0", + "sha256": "sha256-eUAlnEKhoJ3j2Ii2EBL620jv3aGeMJcWoMMG+vWIdm4=", + "depsSha256": "sha256-fAt9BpEE9truGWpor0BttVd9aNZlgQ6UTorIEcJ82wM=" } diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index d35339ea0a8d..34f3edd94337 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 }: +, stdenv, writeScript, lib, erlang }: let - version = "0.41.2"; + version = "0.46.1"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -24,11 +24,18 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "sha256-LUgiQtK0OsdTmg1jEdxJ0x+39U3PXoFYsGlOv4l7/Ig="; + sha256 = "sha256-UiXnamLl6Brp+XOsoldeahNxJ9OKEUgSs1WLRmB9yL8="; rev = version; }; releaseType = "escript"; beamDeps = builtins.attrValues deps; + + # Skip "els_hover_SUITE" test for Erlang/OTP 25+ while upstream hasn't fixed it + # https://github.com/erlang-ls/erlang_ls/pull/1402 + postPatch = lib.optionalString (lib.versionOlder "25" erlang.version) '' + rm apps/els_lsp/test/els_hover_SUITE.erl + ''; + buildPlugins = [ rebar3-proper ]; buildPhase = "HOME=. make"; # based on https://github.com/erlang-ls/erlang_ls/blob/main/.github/workflows/build.yml diff --git a/pkgs/development/beam-modules/fetch-hex.nix b/pkgs/development/beam-modules/fetch-hex.nix index 9c2ed1ea22b6..9d7e18ce24ed 100644 --- a/pkgs/development/beam-modules/fetch-hex.nix +++ b/pkgs/development/beam-modules/fetch-hex.nix @@ -6,8 +6,6 @@ , meta ? { } }: -with lib; - stdenv.mkDerivation ({ pname = "hex-source-${pkg}"; inherit version; diff --git a/pkgs/development/beam-modules/fetch-rebar-deps.nix b/pkgs/development/beam-modules/fetch-rebar-deps.nix index eee8f3729bd4..b253e16761ba 100644 --- a/pkgs/development/beam-modules/fetch-rebar-deps.nix +++ b/pkgs/development/beam-modules/fetch-rebar-deps.nix @@ -7,8 +7,6 @@ , meta ? { } }: -with lib; - stdenv.mkDerivation ({ pname = "rebar-deps-${name}"; inherit version; diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index 1b021cf93472..2d93b28cda6b 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -1,5 +1,8 @@ -{ pkgs, lib }: +{ __splicedPackages, lib }: +let + pkgs = __splicedPackages; +in rec { /* Similar to callPackageWith/callPackage, but without makeOverridable diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index 59771c340295..b884809505f3 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -22,15 +22,13 @@ , ... }@attrs: -with lib; - let shell = drv: stdenv.mkDerivation { name = "interactive-shell-${drv.pname}"; buildInputs = [ drv ]; }; - customPhases = filterAttrs + customPhases = lib.filterAttrs (_: v: v != null) { inherit setupHook configurePhase buildPhase installPhase; }; @@ -105,4 +103,4 @@ let } // (if attrs ? passthru then attrs.passthru else { })); } // customPhases); in -fix pkg +lib.fix pkg diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix new file mode 100644 index 000000000000..bcaab6fae867 --- /dev/null +++ b/pkgs/development/compilers/asn1c/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + pname = "asn1c"; + version = "0.9.28"; + + src = fetchurl { + url = "https://lionet.info/soft/asn1c-${version}.tar.gz"; + sha256 = "1fc64g45ykmv73kdndr4zdm4wxhimhrir4rxnygxvwkych5l81w0"; + }; + + outputs = [ "out" "doc" "man" ]; + + buildInputs = [ perl ]; + + preConfigure = '' + patchShebangs examples/crfc2asn1.pl + ''; + + postInstall = '' + cp -r skeletons/standard-modules $out/share/asn1c + ''; + + doCheck = true; + + meta = with lib; { + homepage = "http://lionet.info/asn1c/compiler.html"; + description = "Open Source ASN.1 Compiler"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.numinit ]; + }; +} diff --git a/pkgs/development/compilers/aspectj/builder.sh b/pkgs/development/compilers/aspectj/builder.sh index 3b4393720042..7ea0a40d3748 100755 --- a/pkgs/development/compilers/aspectj/builder.sh +++ b/pkgs/development/compilers/aspectj/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup export JAVA_HOME=$jre diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix index 8bc1e37ad3ce..9c7e8e3d0ac4 100644 --- a/pkgs/development/compilers/aspectj/default.nix +++ b/pkgs/development/compilers/aspectj/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [jre]; meta = { - homepage = "http://www.eclipse.org/aspectj/"; + homepage = "https://www.eclipse.org/aspectj/"; description = "A seamless aspect-oriented extension to the Java programming language"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index f8de9f57b5d3..f9ba2e1ac417 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -34,12 +34,21 @@ stdenv.mkDerivation rec { hash = "sha256-UWgDjFojPBYgykrCrJyYvVWY+Gc5d4aRGjTWjc528AM="; }; + postPatch = lib.optionalString stdenv.cc.isClang '' + sed -i 's/gcc/clang/g' utils/*/DATS/atscc_util.dats + ''; + buildInputs = [ gmp ]; # Disable parallel build, errors: # *** No rule to make target 'patscc.dats', needed by 'patscc_dats.c'. Stop. enableParallelBuilding = false; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CCOMP=${stdenv.cc.targetPrefix}cc" + ]; + setupHook = with lib; let hookFiles = @@ -55,7 +64,7 @@ stdenv.mkDerivation rec { description = "Functional programming language with dependent types"; homepage = "http://www.ats-lang.org"; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ttuegel bbarker ]; }; } diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index 03cf8f206fc1..d61d34276a30 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -54,10 +54,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ thoughtpolice ]; - # dyld: Library not loaded: /nix/store/w3liqjlrcmzc0sf2kgwjprqgqwqx8z47-libunistring-1.0/lib/libunistring.2.dylib - # Referenced from: /private/tmp/nix-build-bigloo-4.4b.drv-0/bigloo-4.4b/bin/bigloo - # Reason: Incompatible library version: bigloo requires version 5.0.0 or later, but libunistring.2.dylib provides version 4.0.0 - broken = (stdenv.isDarwin && stdenv.isx86_64); longDescription = '' Bigloo is a Scheme implementation devoted to one goal: enabling diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 96483df724c7..3dbc61be4197 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -4,25 +4,25 @@ stdenv.mkDerivation rec { pname = "binaryen"; - version = "109"; + version = "111"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - sha256 = "sha256-HMPoiuTvYhTDaBUfSOfh/Dt4FdO9jGqUaFpi92pnscI="; + sha256 = "sha256-wSwLs/YvrH7nswDSbtR6onOMArCdPE2zi6G7oA10U4Y="; }; patches = [ - # https://github.com/WebAssembly/binaryen/pull/4321 + # https://github.com/WebAssembly/binaryen/pull/5378 (fetchpatch { - url = "https://github.com/WebAssembly/binaryen/commit/93b8849d9f98ef7ed812938ff0b3219819c2be77.patch"; - sha256 = "sha256-Duan/B9A+occ5Lj2SbRX793xIfhzHbdYPI5PyTNCZoU="; + url = "https://github.com/WebAssembly/binaryen/commit/a96fe1a8422140072db7ad7db421378b87898a0d.patch"; + sha256 = "sha256-Wred1IoRxcQBi0nLBWpiUSgt2ApGoGsq9GkoO3mSS6o="; }) - # https://github.com/WebAssembly/binaryen/pull/4913 + # https://github.com/WebAssembly/binaryen/pull/5391 (fetchpatch { - url = "https://github.com/WebAssembly/binaryen/commit/b70fe755aa4c90727edfd91dc0a9a51febf0239d.patch"; - sha256 = "sha256-kjPLbdiMVQepSJ7J1gK6dRSMI/2SsH39k7W5AMOIrkM="; + url = "https://github.com/WebAssembly/binaryen/commit/f92350d2949934c0e0ce4a27ec8b799ac2a85e45.patch"; + sha256 = "sha256-fBwdGSIPjF2WKNnD8I0/2hnQvqevdk3NS9fAxutkZG0="; }) ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { fi ''; - checkInputs = [ gtest lit nodejs filecheck ]; + nativeCheckInputs = [ gtest lit nodejs filecheck ]; checkPhase = '' LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib python3 ../check.py $tests ''; diff --git a/pkgs/development/compilers/blueprint/default.nix b/pkgs/development/compilers/blueprint/default.nix index 8b595fc9c0ac..0016c8a2c7d9 100644 --- a/pkgs/development/compilers/blueprint/default.nix +++ b/pkgs/development/compilers/blueprint/default.nix @@ -1,46 +1,56 @@ -{ python3 -, stdenv -, fetchFromGitLab +{ fetchFromGitLab , gobject-introspection +, gtk4 , lib , meson , ninja +, python3 +, stdenv +, testers }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "blueprint-compiler"; - version = "0.2.0"; + version = "0.6.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "jwestman"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-LXZ6n1oCbPa0taVbUZf52mGECrzXIcF8EaMVJ30rMtc="; + repo = "blueprint-compiler"; + rev = "v${finalAttrs.version}"; + hash = "sha256-L6EGterkZ8EB6xSnJDZ3IMuOumpTpEGnU74X3UgC7k0="; }; - # Requires pythonfuzz, which I've found difficult to package - doCheck = false; - nativeBuildInputs = [ meson ninja ]; buildInputs = [ - python3 + (python3.withPackages (ps: with ps; [ + pygobject3 + ])) ]; propagatedBuildInputs = [ - # So that the compiler can find GIR and .ui files + # For setup hook, so that the compiler can find typelib files gobject-introspection ]; + doCheck = true; + + nativeCheckInputs = [ + gtk4 + ]; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + meta = with lib; { description = "A markup language for GTK user interface files"; homepage = "https://gitlab.gnome.org/jwestman/blueprint-compiler"; license = licenses.lgpl3Plus; - maintainers = [ maintainers.ranfdev ]; - platforms = platforms.all; + maintainers = with maintainers; [ benediktbroich ranfdev ]; + platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index d6accbdbf1fc..4970d02e32c1 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ gmp-static verilog ]; diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/development/compilers/c3c/default.nix index 2fa280fc898c..b68ffc045f64 100644 --- a/pkgs/development/compilers/c3c/default.nix +++ b/pkgs/development/compilers/c3c/default.nix @@ -23,7 +23,7 @@ llvmPackages.stdenv.mkDerivation rec { llvmPackages.lld ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = true; diff --git a/pkgs/development/compilers/cakelisp/default.nix b/pkgs/development/compilers/cakelisp/default.nix index 15afb9fc25ec..a3180205254d 100644 --- a/pkgs/development/compilers/cakelisp/default.nix +++ b/pkgs/development/compilers/cakelisp/default.nix @@ -38,5 +38,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.darwin ++ platforms.linux; maintainers = [ maintainers.sbond75 ]; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix index 209fc6aed611..5abb9b3fe641 100644 --- a/pkgs/development/compilers/carp/default.nix +++ b/pkgs/development/compilers/carp/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, makeWrapper, clang, haskellPackages }: +{ lib, fetchFromGitHub, fetchpatch, makeWrapper, clang, haskellPackages }: haskellPackages.mkDerivation rec { pname = "carp"; @@ -11,6 +11,16 @@ haskellPackages.mkDerivation rec { sha256 = "sha256-B7SBzjegFzL2gGivIJE6BZcLD3f0Bsh8yndjScG2TZI="; }; + patches = [ + # Compat with GHC 9.2 / Stackage LTS 20, can be dropped at the next release + # https://github.com/carp-lang/Carp/pull/1449 + (fetchpatch { + name = "carp-lts-20.patch"; + url = "https://github.com/carp-lang/Carp/commit/25f50c92a57cc91b6cb4ec48df658439f936b641.patch"; + sha256 = "14yjv0hcvw1qyjmrhksrj6chac3n14d1f1gcaxldfa05llrbfqk0"; + }) + ]; + # -Werror breaks build with GHC >= 9.0 # https://github.com/carp-lang/Carp/issues/1386 postPatch = '' @@ -49,5 +59,4 @@ haskellPackages.mkDerivation rec { # Windows not (yet) supported. platforms = with lib.platforms; unix ++ darwin; - } diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index 47625a4d5de9..f33e594b7e25 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation { ] ++ (lib.optionals stdenv.isDarwin [ "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "C_COMPILER=$(CC)" + "POSTINSTALL_PROGRAM=install_name_tool" ]); # We need a bootstrap-chicken to regenerate the c-files after diff --git a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh index 204661063090..cb56eabc5d78 100644 --- a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh +++ b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh @@ -1,9 +1,8 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "exporting egg ${eggName} (version $version) into $out" +echo "exporting egg ${eggName} (version $version) into $out" mkdir -p $out chicken-install -r "${eggName}:${version}" cp -r ${eggName}/* $out/ - -stopNest diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 98dce9af834e..6d50d6f378e1 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "C_COMPILER=$(CC)" "LINKER_OPTIONS=-headerpad_max_install_names" + "POSTINSTALL_PROGRAM=install_name_tool" ]); nativeBuildInputs = [ diff --git a/pkgs/development/compilers/chicken/5/fetchegg/builder.sh b/pkgs/development/compilers/chicken/5/fetchegg/builder.sh index d9adf510f22d..34c9de37233d 100644 --- a/pkgs/development/compilers/chicken/5/fetchegg/builder.sh +++ b/pkgs/development/compilers/chicken/5/fetchegg/builder.sh @@ -1,10 +1,9 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "exporting egg ${eggName} (version $version) into $out" +echo "exporting egg ${eggName} (version $version) into $out" mkdir -p $out CHICKEN_EGG_CACHE=. chicken-install -r "${eggName}:${version}" rm ${eggName}/{STATUS,TIMESTAMP} cp -r ${eggName}/* $out/ - -stopNest diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 7070d3d5394b..9470db3d38c7 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -1,20 +1,24 @@ -{ lib, stdenv, fetchurl, python3, runtimeShell }: +{ lib, stdenv, fetchFromGitHub, stanc, python3, buildPackages, runtimeShell }: stdenv.mkDerivation rec { pname = "cmdstan"; - version = "2.30.1"; + version = "2.31.0"; - # includes stanc binaries needed to build cmdstand - src = fetchurl { - url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}.tar.gz"; - sha256 = "sha256-urdtzvp/TJVVlcC/BJZ3BQf8arDfWJboz4wtsKF+7bk="; + src = fetchFromGitHub { + owner = "stan-dev"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-Uh/ZhEnbhQwC8xGFjDzH9No3VRgVbHYk2KoC+e3YhJw="; }; + nativeBuildInputs = [ stanc ]; + buildFlags = [ "build" ]; enableParallelBuilding = true; doCheck = true; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; CXXFLAGS = lib.optionalString stdenv.isDarwin "-D_BOOST_LGAMMA"; @@ -22,8 +26,18 @@ stdenv.mkDerivation rec { substituteInPlace stan/lib/stan_math/make/libraries \ --replace "/usr/bin/env bash" "bash" patchShebangs . + '' + lib.optionalString stdenv.isAarch64 '' + sed -z -i "s/TEST(CommandStansummary, check_console_output).*TEST(CommandStansummary, check_csv_output)/TEST(CommandStansummary, check_csv_output)/" \ + src/test/interface/stansummary_test.cpp ''; + preConfigure = '' + mkdir -p bin + ln -s ${buildPackages.stanc}/bin/stanc bin/stanc + ''; + + makeFlags = lib.optional stdenv.isDarwin "arch=${stdenv.hostPlatform.darwinArch}"; + checkPhase = '' ./runCmdStanTests.py -j$NIX_BUILD_CORES src/test/interface ''; @@ -41,10 +55,9 @@ stdenv.mkDerivation rec { ''; # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. - preFixup = "rm -rf $(pwd)"; + preFixup = "rm -rf stan"; - meta = { - broken = stdenv.isLinux && stdenv.isAarch64; + meta = with lib; { description = "Command-line interface to Stan"; longDescription = '' Stan is a probabilistic programming language implementing full Bayesian @@ -53,7 +66,8 @@ stdenv.mkDerivation rec { likelihood estimation with Optimization (L-BFGS). ''; homepage = "https://mc-stan.org/interfaces/cmdstan.html"; - license = lib.licenses.bsd3; - platforms = lib.platforms.all; + license = licenses.bsd3; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 88274ef73c94..173cd93f34d5 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -4,6 +4,7 @@ , fetchurl , fetchpatch , lib +, substituteAll # Dependencies , boehmgc , coreutils @@ -15,6 +16,7 @@ , libiconv , libxml2 , libyaml +, libffi , llvmPackages , makeWrapper , openssl @@ -32,7 +34,7 @@ let archs = { x86_64-linux = "linux-x86_64"; i686-linux = "linux-i686"; - x86_64-darwin = "darwin-x86_64"; + x86_64-darwin = "darwin-universal"; aarch64-darwin = "darwin-universal"; aarch64-linux = "linux-aarch64"; }; @@ -40,11 +42,13 @@ let arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported"); isAarch64Darwin = stdenv.system == "aarch64-darwin"; - checkInputs = [ git gmp openssl readline libxml2 libyaml ]; + nativeCheckInputs = [ git gmp openssl readline libxml2 libyaml libffi ]; binaryUrl = version: rel: if arch == archs.aarch64-linux then "https://dev.alpinelinux.org/archive/crystal/crystal-${version}-aarch64-alpine-linux-musl.tar.gz" + else if arch == archs.x86_64-darwin && lib.versionOlder version "1.2.0" then + "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-darwin-x86_64.tar.gz" else "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; @@ -64,12 +68,11 @@ let patchShebangs $out/bin/crystal ''; - meta.broken = lib.versionOlder version "1.2.0" && isAarch64Darwin; + meta.platforms = lib.attrNames sha256s; }; commonBuildInputs = extraBuildInputs: [ boehmgc - libatomic_ops pcre libevent libyaml @@ -85,7 +88,7 @@ let , binary , doCheck ? true , extraBuildInputs ? [ ] - , buildFlags ? [ "all" "docs" ] + , buildFlags ? [ "all" "docs" "release=1"] }: lib.fix (compiler: stdenv.mkDerivation { pname = "crystal"; @@ -98,7 +101,13 @@ let inherit sha256; }; - patches = lib.optionals (lib.versionOlder version "1.2.0") [ + patches = [ + (substituteAll { + src = ./tzdata.patch; + inherit tzdata; + }) + ] + ++ lib.optionals (lib.versionOlder version "1.2.0") [ # add support for DWARF5 debuginfo, fixes builds on recent compilers # the PR is 8 commits from 2019, so just fetch the whole thing # and hope it doesn't change @@ -113,6 +122,7 @@ let postPatch = '' export TMP=$(mktemp -d) export HOME=$TMP + export TMPDIR=$TMP mkdir -p $HOME/test # Add dependency of crystal to docs to avoid issue on flag changes between releases @@ -120,11 +130,6 @@ let substituteInPlace Makefile \ --replace 'docs: ## Generate standard library documentation' 'docs: crystal ## Generate standard library documentation' - substituteInPlace src/crystal/system/unix/time.cr \ - --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo - - ln -sf spec/compiler spec/std - mkdir -p $TMP/crystal substituteInPlace spec/std/file_spec.cr \ @@ -147,6 +152,11 @@ let # See https://github.com/crystal-lang/crystal/issues/8629 substituteInPlace spec/std/socket/udp_socket_spec.cr \ --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' + + '' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.7.0") '' + # See https://github.com/NixOS/nixpkgs/pull/195606#issuecomment-1356491277 + substituteInPlace spec/compiler/loader/unix_spec.cr \ + --replace 'it "parses file paths"' 'pending "parses file paths"' ''; # Defaults are 4 @@ -154,6 +164,7 @@ let export CRYSTAL_WORKERS=$NIX_BUILD_CORES export threads=$NIX_BUILD_CORES export CRYSTAL_CACHE_DIR=$TMP + export MACOSX_DEPLOYMENT_TARGET=10.11 ''; @@ -163,13 +174,16 @@ let makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" + "progress=1" ]; LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; FLAGS = [ - "--release" "--single-module" # needed for deterministic builds + ] ++ lib.optionals (lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.6.1") [ + # ffi is only used by the interpreter and its spec are broken on < 1.6.1 + "-Dwithout_ffi" ]; # This makes sure we don't keep depending on the previous version of @@ -216,62 +230,49 @@ let checkTarget = "compiler_spec"; preCheck = '' - export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH - export PATH=${lib.makeBinPath checkInputs}:$PATH + export LIBRARY_PATH=${lib.makeLibraryPath nativeCheckInputs}:$LIBRARY_PATH + export PATH=${lib.makeBinPath nativeCheckInputs}:$PATH ''; + passthru.buildBinary = binary; passthru.buildCrystalPackage = callPackage ./build-package.nix { crystal = compiler; }; meta = with lib; { - broken = stdenv.isDarwin; + inherit (binary.meta) platforms; description = "A compiled language with Ruby like syntax and type inference"; homepage = "https://crystal-lang.org/"; license = licenses.asl20; maintainers = with maintainers; [ david50407 manveru peterhoeg ]; - platforms = let archNames = builtins.attrNames archs; in - if (lib.versionOlder version "1.2.0") then remove "aarch64-darwin" archNames else archNames; }; }) ); in rec { - binaryCrystal_1_0 = genericBinary { - version = "1.0.0"; - sha256s = { - x86_64-linux = "1949argajiyqyq09824yj3wjyv88gd8wbf20xh895saqfykiq880"; - i686-linux = "0w0f4fwr2ijhx59i7ppicbh05hfmq7vffmgl7lal6im945m29vch"; - x86_64-darwin = "01n0rf8zh551vv8wq3h0ifnsai0fz9a77yq87xx81y9dscl9h099"; - aarch64-linux = "0sns7l4q3z82qi3dc2r4p63f4s8hvifqzgq56ykwyrvawynjhd53"; - }; - }; - binaryCrystal_1_2 = genericBinary { - version = "1.2.0"; + version = "1.2.2"; sha256s = { - aarch64-darwin = "1hrs8cpjxdkcf8mr9qgzilwbg6bakq87sd4yydfsk2f4pqd6g7nf"; + x86_64-linux = "sha256-sW5nhihW/6Dkq95i3vJNWs2D1CtQhujhxVbgQCAas6E="; + aarch64-darwin = "sha256-4VB4yYGl1/YeYSsHOZq7fdeQ8IQMfloAPhEU0iKrvxs="; + x86_64-darwin = "sha256-4VB4yYGl1/YeYSsHOZq7fdeQ8IQMfloAPhEU0iKrvxs="; + aarch64-linux = "sha256-QgPKUDFyodqY1+b85AybSpbbr0RmfISdNpB08Wf34jo="; }; }; - crystal_1_0 = generic { - version = "1.0.0"; - sha256 = "sha256-RI+a3w6Rr+uc5jRf7xw0tOenR+q6qii/ewWfID6dbQ8="; - binary = binaryCrystal_1_0; - }; - - crystal_1_1 = generic { - version = "1.1.1"; - sha256 = "sha256-hhhT3reia8acZiPsflwfuD638Ll2JiXwMfES1TyGyNQ="; - binary = crystal_1_0; - }; - crystal_1_2 = generic { version = "1.2.2"; sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU="; - binary = if isAarch64Darwin then binaryCrystal_1_2 else crystal_1_1; + binary = binaryCrystal_1_2; + extraBuildInputs = [ libatomic_ops ]; }; - crystal = crystal_1_2; + crystal_1_7 = generic { + version = "1.7.2"; + sha256 = "sha256-Bwd9Gmtwa/0oLhps3fc8GqBlB4o31LCR1Sf98Pz4i90="; + binary = binaryCrystal_1_2; + }; + + crystal = crystal_1_7; } diff --git a/pkgs/development/compilers/crystal/tzdata.patch b/pkgs/development/compilers/crystal/tzdata.patch new file mode 100644 index 000000000000..b687336753ad --- /dev/null +++ b/pkgs/development/compilers/crystal/tzdata.patch @@ -0,0 +1,12 @@ +diff --git a/src/crystal/system/unix/time.cr b/src/crystal/system/unix/time.cr +index 333b66075..1c29a0e55 100644 +--- a/src/crystal/system/unix/time.cr ++++ b/src/crystal/system/unix/time.cr +@@ -43,6 +43,7 @@ module Crystal::System::Time + # Many systems use /usr/share/zoneinfo, Solaris 2 has + # /usr/share/lib/zoneinfo, IRIX 6 has /usr/lib/locale/TZ. + ZONE_SOURCES = { ++ "@tzdata@/share/zoneinfo/", + "/usr/share/zoneinfo/", + "/usr/share/lib/zoneinfo/", + "/usr/lib/locale/TZ/", diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index 6375c513f411..a98e188271cb 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -20,7 +20,7 @@ args@ , makeWrapper , ncurses5 , perl -, python27 +, python3 , requireFile , stdenv , unixODBC @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl makeWrapper addOpenGLRunpath ]; buildInputs = [ gdk-pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook runtimeDependencies = [ - ncurses5 expat python27 zlib glibc + ncurses5 expat python3 zlib glibc xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext gtk2 glib fontconfig freetype unixODBC alsa-lib ]; diff --git a/pkgs/development/compilers/cudatoolkit/extension.nix b/pkgs/development/compilers/cudatoolkit/extension.nix index 862c83167992..c11f12b118a2 100644 --- a/pkgs/development/compilers/cudatoolkit/extension.nix +++ b/pkgs/development/compilers/cudatoolkit/extension.nix @@ -10,6 +10,8 @@ final: prev: let ### Add classic cudatoolkit package cudatoolkit = buildCudaToolkitPackage ((attrs: attrs // { gcc = prev.pkgs.${attrs.gcc}; }) cudatoolkitVersions.${final.cudaVersion}); + cudaFlags = final.callPackage ./flags.nix {}; + in { - inherit cudatoolkit; + inherit cudatoolkit cudaFlags; } diff --git a/pkgs/development/compilers/cudatoolkit/flags.nix b/pkgs/development/compilers/cudatoolkit/flags.nix new file mode 100644 index 000000000000..24f653ded29b --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/flags.nix @@ -0,0 +1,78 @@ +{ config +, lib +, cudatoolkit +}: +let + + # Flags are determined based on your CUDA toolkit by default. You may benefit + # from improved performance, reduced file size, or greater hardware suppport by + # passing a configuration based on your specific GPU environment. + # + # config.cudaCapabilities: list of hardware generations to support (e.g., "8.0") + # config.cudaForwardCompat: bool for compatibility with future GPU generations + # + # Please see the accompanying documentation or https://github.com/NixOS/nixpkgs/pull/205351 + + defaultCudaCapabilities = rec { + cuda9 = [ + "3.0" + "3.5" + "5.0" + "5.2" + "6.0" + "6.1" + "7.0" + ]; + + cuda10 = cuda9 ++ [ + "7.5" + ]; + + cuda11 = [ + "3.5" + "5.0" + "5.2" + "6.0" + "6.1" + "7.0" + "7.5" + "8.0" + "8.6" + ]; + + }; + + cudaMicroarchitectureNames = { + "3" = "Kepler"; + "5" = "Maxwell"; + "6" = "Pascal"; + "7" = "Volta"; + "8" = "Ampere"; + "9" = "Hopper"; + }; + + defaultCudaArchList = defaultCudaCapabilities."cuda${lib.versions.major cudatoolkit.version}"; + cudaRealCapabilities = config.cudaCapabilities or defaultCudaArchList; + capabilitiesForward = "${lib.last cudaRealCapabilities}+PTX"; + + dropDot = ver: builtins.replaceStrings ["."] [""] ver; + + archMapper = feat: map (ver: "${feat}_${dropDot ver}"); + gencodeMapper = feat: map (ver: "-gencode=arch=compute_${dropDot ver},code=${feat}_${dropDot ver}"); + cudaRealArchs = archMapper "sm" cudaRealCapabilities; + cudaPTXArchs = archMapper "compute" cudaRealCapabilities; + cudaArchs = cudaRealArchs ++ [ (lib.last cudaPTXArchs) ]; + + cudaArchNames = lib.unique (map (v: cudaMicroarchitectureNames.${lib.versions.major v}) cudaRealCapabilities); + cudaCapabilities = cudaRealCapabilities ++ lib.optional (config.cudaForwardCompat or true) capabilitiesForward; + cudaGencode = gencodeMapper "sm" cudaRealCapabilities ++ lib.optionals (config.cudaForwardCompat or true) (gencodeMapper "compute" [ (lib.last cudaPTXArchs) ]); + + cudaCapabilitiesCommaString = lib.strings.concatStringsSep "," cudaCapabilities; + cudaCapabilitiesSemiColonString = lib.strings.concatStringsSep ";" cudaCapabilities; + cudaRealCapabilitiesCommaString = lib.strings.concatStringsSep "," cudaRealCapabilities; + +in +{ + inherit cudaArchs cudaArchNames cudaCapabilities cudaCapabilitiesCommaString cudaCapabilitiesSemiColonString + cudaRealCapabilities cudaRealCapabilitiesCommaString cudaGencode cudaRealArchs cudaPTXArchs; +} diff --git a/pkgs/development/compilers/cudatoolkit/redist/extension.nix b/pkgs/development/compilers/cudatoolkit/redist/extension.nix index 9c7951c75d13..962663f08bcb 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/extension.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/extension.nix @@ -13,6 +13,7 @@ final: prev: let "11.6" = ./manifests/redistrib_11.6.2.json; "11.7" = ./manifests/redistrib_11.7.0.json; "11.8" = ./manifests/redistrib_11.8.0.json; + "12.0" = ./manifests/redistrib_12.0.0.json; }; # Function to build a single cudatoolkit redist package diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_12.0.0.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_12.0.0.json new file mode 100644 index 000000000000..ca99487e6722 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_12.0.0.json @@ -0,0 +1,1127 @@ +{ + "release_date": "2022-12-08", + "cuda_cccl": { + "name": "CXX Core Compute Libraries", + "license": "CUDA Toolkit", + "version": "12.0.90", + "linux-x86_64": { + "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-12.0.90-archive.tar.xz", + "sha256": "37f6e03b6f95579d8e2e96b9ba15eeb1224dcd18b21ad50c3ac249e408152a24", + "md5": "ced6a2998ad8c3a5f421a60e708bf2c1", + "size": "1029064" + }, + "linux-ppc64le": { + "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-12.0.90-archive.tar.xz", + "sha256": "c6de67acd6a65b24db0383f6330b842ed19b6c27a27a37f828e9f3e96cc96f72", + "md5": "3b533c00dfe103773f60e706d2e6a3c7", + "size": "1029080" + }, + "linux-sbsa": { + "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-12.0.90-archive.tar.xz", + "sha256": "f2a19927c558a9c872fa87eda4c0dc0446e5c4c744df4f846d01f4d4e08c8cd7", + "md5": "66b520f391ae130c31198daf58e61d32", + "size": "1028684" + }, + "windows-x86_64": { + "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-12.0.90-archive.zip", + "sha256": "dd422d4cc8462d112411659a56cc78cb6010d704f83db3e48c55a3f66eed5ec2", + "md5": "efd7fc187d6f1b57d7fa2ca7c6ffe7ad", + "size": "2608382" + }, + "linux-aarch64": { + "relative_path": "cuda_cccl/linux-aarch64/cuda_cccl-linux-aarch64-12.0.90-archive.tar.xz", + "sha256": "1f606217f6477afaa3e8226d0629ce84eb3b35790c2a832fb46baf7912722cb9", + "md5": "244bb1fb614395058ae08f7e436d783b", + "size": "1029128" + } + }, + "cuda_compat": { + "name": "CUDA compat L4T", + "license": "CUDA Toolkit", + "version": "12.0.31752801", + "linux-aarch64": { + "relative_path": "cuda_compat/linux-aarch64/cuda_compat-linux-aarch64-12.0.31752801-archive.tar.xz", + "sha256": "dcb1fa133eb89eb10b049271e6be8861deaefd612133ceec0e13baf38fe43e93", + "md5": "c046dad28e75b3765625757ba006f845", + "size": "16051812" + } + }, + "cuda_cudart": { + "name": "CUDA Runtime (cudart)", + "license": "CUDA Toolkit", + "version": "12.0.107", + "linux-x86_64": { + "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-12.0.107-archive.tar.xz", + "sha256": "c0e16e9593a69afe4997ae96a8b024e751ebce0254523fd969b08bb028582d23", + "md5": "70f9998315314b2e2c4d311a5d70da74", + "size": "977884" + }, + "linux-ppc64le": { + "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-12.0.107-archive.tar.xz", + "sha256": "d785fd613e35e3761fdb0016a31a56417f570605cbfb9a93ca9dc68be6789188", + "md5": "983548770e312f604f818be087609c6d", + "size": "967996" + }, + "linux-sbsa": { + "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-12.0.107-archive.tar.xz", + "sha256": "5de248c6c203f6c91ce34256bbfc028bc87c1b0c552f9f51edb65e60ad665f63", + "md5": "e723920f9c598c87db718022005e0961", + "size": "969628" + }, + "windows-x86_64": { + "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-12.0.107-archive.zip", + "sha256": "1cd8516feee068c6d718453e76b0dfcbee27844a35d4f3aa608a3d316190309c", + "md5": "8c8b57dc2f0e5ea52d1f5b0dfe032676", + "size": "2267147" + }, + "linux-aarch64": { + "relative_path": "cuda_cudart/linux-aarch64/cuda_cudart-linux-aarch64-12.0.107-archive.tar.xz", + "sha256": "a9c29e8fceb877eeeb252a10030074e5a5fa31afb418df42e1261aebd8bf7d8c", + "md5": "3971437445a966ab1a37d7b8041e98b0", + "size": "975680" + } + }, + "cuda_cuobjdump": { + "name": "cuobjdump", + "license": "CUDA Toolkit", + "version": "12.0.76", + "linux-x86_64": { + "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-12.0.76-archive.tar.xz", + "sha256": "c2b627534d8eedff86b50bbf13c043a3c9a01a048fa6aa40678be5548c96d2a9", + "md5": "baa64f45529bc50de813bf0d6ea91295", + "size": "164564" + }, + "linux-ppc64le": { + "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-12.0.76-archive.tar.xz", + "sha256": "6b57dcc8a448068f0bd6a3c109f7dfbf96725f60c260a122a2c818f9cbe5b81c", + "md5": "5e6dea10146a48e4ffbd1eb90d5f0a91", + "size": "209288" + }, + "linux-sbsa": { + "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-12.0.76-archive.tar.xz", + "sha256": "30744ab5f7ae24d2265bd5167d750907abb2d2f6f62922aeab1fac5aa4030eca", + "md5": "285c7a3a8a16e735d625af0bd6038eb7", + "size": "173012" + }, + "windows-x86_64": { + "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-12.0.76-archive.zip", + "sha256": "00688ad84b04df7e6a39e6d4d5fb29fda42d36bdf7e3a432c332ebafbed6fb90", + "md5": "5d28cdc57561d98c0e647f9174cdeb6c", + "size": "3786191" + }, + "linux-aarch64": { + "relative_path": "cuda_cuobjdump/linux-aarch64/cuda_cuobjdump-linux-aarch64-12.0.76-archive.tar.xz", + "sha256": "e75adc4b9c6ebc00d1de652a3a243f362ae654b82fc5653a890819c433e8abac", + "md5": "936385ead6e6c764187f350d4e475939", + "size": "172952" + } + }, + "cuda_cupti": { + "name": "CUPTI", + "license": "CUDA Toolkit", + "version": "12.0.90", + "linux-x86_64": { + "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-12.0.90-archive.tar.xz", + "sha256": "3c93a6a8c5eab3a56c1a0a514c0ac7d374807c70a9551155f089588b6c5e1d10", + "md5": "fb7af580f717fee8ed666b1b4a73eea5", + "size": "18932212" + }, + "linux-ppc64le": { + "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-12.0.90-archive.tar.xz", + "sha256": "bbabb508eb4fb0f9d98ac3ab4a40d0278de41cef95139c1bfe6436b716dd6cfc", + "md5": "e75692d08f0b6a1755e66471a1f93c47", + "size": "9856220" + }, + "linux-sbsa": { + "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-12.0.90-archive.tar.xz", + "sha256": "33b3b06cf9838fa3289c7e40f143a8f58b941ccad93f9d0640a29bb83aa2152e", + "md5": "d95ed64afd78865d16b8e6021d26cb5a", + "size": "9825196" + }, + "windows-x86_64": { + "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-12.0.90-archive.zip", + "sha256": "b65a34a3715e3ef2b835bdd36c43b21c20800325be1eda1e84ad4d80ee837c92", + "md5": "4ebbcd9fae699bc6a224148a2a132f36", + "size": "13242979" + }, + "linux-aarch64": { + "relative_path": "cuda_cupti/linux-aarch64/cuda_cupti-linux-aarch64-12.0.90-archive.tar.xz", + "sha256": "9ae58aa13c33a9d6ec053ec18ff87970ce51a8de77a0371ee1e8133d9733e2bb", + "md5": "8b7ebc65a1e34fe9eb3cb0d9cf7ffd3a", + "size": "7742504" + } + }, + "cuda_cuxxfilt": { + "name": "CUDA cuxxfilt (demangler)", + "license": "CUDA Toolkit", + "version": "12.0.76", + "linux-x86_64": { + "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-12.0.76-archive.tar.xz", + "sha256": "363502e0743a21f487bac7ebd63ef8dba6cf11a2b16cd82149e0cecc83c24c34", + "md5": "9f066a6547b751765bca4cdaf8e25f09", + "size": "186832" + }, + "linux-ppc64le": { + "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-12.0.76-archive.tar.xz", + "sha256": "bfd38cadc3066cf28366722e15bd85c298cd7f4ebe4c7852a4149ba2a6b84d2d", + "md5": "aac148c78969134bc889dd86e2f78895", + "size": "179528" + }, + "linux-sbsa": { + "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-12.0.76-archive.tar.xz", + "sha256": "2f992cc3dabce111cb93caabb599caa868797fee6b37ff53676fadce36701e6f", + "md5": "5221152f2f132150f67985cb7c731fca", + "size": "171236" + }, + "windows-x86_64": { + "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-12.0.76-archive.zip", + "sha256": "0d6276d4a49e7e394b7f8ee150bb6d538297334c7d6b3d1266fa29311ba933f4", + "md5": "f9920e0f1c1c6a2cf3ad9882c6fb043f", + "size": "168494" + }, + "linux-aarch64": { + "relative_path": "cuda_cuxxfilt/linux-aarch64/cuda_cuxxfilt-linux-aarch64-12.0.76-archive.tar.xz", + "sha256": "04337e54fe12dad4fe9aae44dbc952bccaeeb438be11c3730326b5def18ba3bc", + "md5": "9fbadd8c487f309d743bc2494c80ff4a", + "size": "172044" + } + }, + "cuda_demo_suite": { + "name": "CUDA Demo Suite", + "license": "CUDA Toolkit", + "version": "12.0.76", + "linux-x86_64": { + "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-12.0.76-archive.tar.xz", + "sha256": "b8c16b37d6e83e1cd6013a9d296a1244c8e88c6dbaa3111dbbe2bb5119ddd439", + "md5": "2b3940445ffdba7965f75bdbdf88e486", + "size": "4005452" + }, + "windows-x86_64": { + "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-12.0.76-archive.zip", + "sha256": "2bc2d30189f41b0f3150d0629089a1b1c695f12b61ac0dc14877a8e93437761a", + "md5": "4b78b701a76537166ac1d41d84558a7b", + "size": "5048289" + } + }, + "cuda_documentation": { + "name": "CUDA Documentation", + "license": "CUDA Toolkit", + "version": "12.0.76", + "linux-x86_64": { + "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-12.0.76-archive.tar.xz", + "sha256": "63226377fa39bcd93619d799b688a15d0cb9d0b3ebe8adb3cb2b2537f5839d5a", + "md5": "f64f43fc17ee19cf9307ca3386be8de8", + "size": "67016" + }, + "linux-ppc64le": { + "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-12.0.76-archive.tar.xz", + "sha256": "699ca03fcec35d4f7e454b97cac8e59b08085f155708ff522aba1910b61a8698", + "md5": "fb2c805291ac7a1ab34e2415e1c6bd11", + "size": "67188" + }, + "linux-sbsa": { + "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-12.0.76-archive.tar.xz", + "sha256": "771425dbb376e6a9b0caa9a7e31ae598c667b4031d4ca902ea47c9f4ddce05a0", + "md5": "140d34578251899104de09ab5bd3eedb", + "size": "66988" + }, + "windows-x86_64": { + "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-12.0.76-archive.zip", + "sha256": "a980c971deb1ad8fd76c514d63a5df7e2fcec3ddcf4bd9f07a4430aa6ad2f2de", + "md5": "7deb38b0b3b41e96b3f84d3b31b71e49", + "size": "105364" + }, + "linux-aarch64": { + "relative_path": "cuda_documentation/linux-aarch64/cuda_documentation-linux-aarch64-12.0.76-archive.tar.xz", + "sha256": "7808f0eb7f37e22d0cad9bfb67b49cee6843ecb6a0f81dde66647720797f186d", + "md5": "a81c23575e2eb4a4225be0a056d0b0bd", + "size": "67004" + } + }, + "cuda_gdb": { + "name": "CUDA GDB", + "license": "CUDA Toolkit", + "version": "12.0.90", + "linux-x86_64": { + "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-12.0.90-archive.tar.xz", + "sha256": "99fe034f035e426314c138902c6ff972697d8691a2291372fe3fbc8ea6542e05", + "md5": "1a780fa6dc71636dc9d6400cb1df21f0", + "size": "65690768" + }, + "linux-ppc64le": { + "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-12.0.90-archive.tar.xz", + "sha256": "e981b441520fa734451f54ee6fb0c3747d844242d1ca6588e23978c0f4d18be2", + "md5": "7aaa44c15862b6b27bb832d592cebf45", + "size": "65468312" + }, + "linux-sbsa": { + "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-12.0.90-archive.tar.xz", + "sha256": "df48dc586b500db4e7c35e313116bcd760885340e6a554ceca020f640b4896b8", + "md5": "1f0c317de2e264c3981bde9d710e15e5", + "size": "65372192" + }, + "linux-aarch64": { + "relative_path": "cuda_gdb/linux-aarch64/cuda_gdb-linux-aarch64-12.0.90-archive.tar.xz", + "sha256": "93d45774b85b6826d7a0d930b518bb3682c3ae3eb539c49737894a21d574ce21", + "md5": "606b2c05e2feaad2a4d2fe89587cac66", + "size": "65271068" + } + }, + "cuda_nsight": { + "name": "Nsight Eclipse Edition Plugin", + "license": "CUDA Toolkit", + "version": "12.0.78", + "linux-x86_64": { + "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-12.0.78-archive.tar.xz", + "sha256": "d7d151829fa516041174366f1460371e598f0b5b1665fb4a369b539bfc4b60e0", + "md5": "af78990a65dd616cae8632660d459e63", + "size": "118608488" + }, + "linux-ppc64le": { + "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-12.0.78-archive.tar.xz", + "sha256": "00af4bff3ac54bdb0b9c16eba80aa3c95814845805559691d504b8837d620b32", + "md5": "686772a1d5532ce104ac83c3957efa0d", + "size": "118608480" + } + }, + "cuda_nvcc": { + "name": "CUDA NVCC", + "license": "CUDA Toolkit", + "version": "12.0.76", + "linux-x86_64": { + "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-12.0.76-archive.tar.xz", + "sha256": "160ca9f8828f53daa4b2066c5361aacb45fa2575885f70c223cda1d11df53d6f", + "md5": "2014f06172f634e592dc73557b128866", + "size": "44030620" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-12.0.76-archive.tar.xz", + "sha256": "dc5bd7eac57b32a9645c0c23c6a1ba8a9533e846eeec31414e1aa4230afee2f8", + "md5": "98f2c6d8a280c577b49f2f1181a1fde2", + "size": "40973728" + }, + "linux-sbsa": { + "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-12.0.76-archive.tar.xz", + "sha256": "85c8c643ea2cfa398e1b5ffcd597f5bb3b738526c9e3fb8e39dd909c55345f36", + "md5": "8adcc46ee0d47b96f96536cd7ef0711b", + "size": "39603744" + }, + "windows-x86_64": { + "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-12.0.76-archive.zip", + "sha256": "f67406f44263f0e4a110a8cf0200bff1d3d0e32917db8a7c9e417a87eb7ca372", + "md5": "659567fef2b820773e8a3f3d74036f85", + "size": "58899378" + }, + "linux-aarch64": { + "relative_path": "cuda_nvcc/linux-aarch64/cuda_nvcc-linux-aarch64-12.0.76-archive.tar.xz", + "sha256": "5623df048157f29e825df6c219a308d9988671c4ba2068353f5590f5d5cacb85", + "md5": "5a29cb52cfa3a106cdef626ed023e01d", + "size": "39724216" + } + }, + "cuda_nvdisasm": { + "name": "CUDA nvdisasm", + "license": "CUDA Toolkit", + "version": "12.0.76", + "linux-x86_64": { + "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-12.0.76-archive.tar.xz", + "sha256": "0e0660100b052248529ee07353479a7d703258ef3200ac52e9676298511d10c3", + "md5": "8f7eac1f3cbe384c4169d6294190cf8a", + "size": "49863368" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-12.0.76-archive.tar.xz", + "sha256": "aca86a9b2b7678884aa58e7a29881044e6d12dbf790b46266f08f6855a10ac79", + "md5": "ad3cb34c8c7cb150c0fdc800e7069a8b", + "size": "49865020" + }, + "linux-sbsa": { + "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-12.0.76-archive.tar.xz", + "sha256": "4991a102fd8d7d3aa632cf5a28df6368f4074a4ced952e7665c382c6dbdec1fd", + "md5": "bef0429bc003c9f90905320df0444c3c", + "size": "49807864" + }, + "windows-x86_64": { + "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-12.0.76-archive.zip", + "sha256": "7d716f14dc1342d62c9c67d4636cc1dbd496d7648b6097a53d05e1d6864a487c", + "md5": "4e394432bee60b914cd6b729364e45c6", + "size": "50113509" + }, + "linux-aarch64": { + "relative_path": "cuda_nvdisasm/linux-aarch64/cuda_nvdisasm-linux-aarch64-12.0.76-archive.tar.xz", + "sha256": "110567ea874f7fa15f35fc3a9ad6d79dc8dd472e86702dc87d47b9de5aa666bb", + "md5": "dbccdbae44abdc3dc80ade192496da47", + "size": "49807504" + } + }, + "cuda_nvml_dev": { + "name": "CUDA NVML Headers", + "license": "CUDA Toolkit", + "version": "12.0.76", + "linux-x86_64": { + "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-12.0.76-archive.tar.xz", + "sha256": "6780e554784bef73050144afe39668e26923d2533c268460c348e0e380d5d048", + "md5": "965db81d17011596c89428a0a5f86480", + "size": "81844" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-12.0.76-archive.tar.xz", + "sha256": "319b96999d144192094d254f0607debb14118ce206ef7dfeba3d13da1cc805ec", + "md5": "b30ba5deacce533f6027c614a8e75f82", + "size": "81312" + }, + "linux-sbsa": { + "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-12.0.76-archive.tar.xz", + "sha256": "4aee09e48ecd30b2dcaa9de4eb8af2fcdf36ed040eac50c14f3345a12410b6ec", + "md5": "94fe6aa2748a5cae080fe451e7039a0c", + "size": "82068" + }, + "windows-x86_64": { + "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-12.0.76-archive.zip", + "sha256": "abc366280d0aa1ca047323a3e316270b80ffabb649021184647cd16b44c60a71", + "md5": "6f064c5fa6b96a478986593f345e7dd6", + "size": "114128" + }, + "linux-aarch64": { + "relative_path": "cuda_nvml_dev/linux-aarch64/cuda_nvml_dev-linux-aarch64-12.0.76-archive.tar.xz", + "sha256": "62b1d7bedb9b928b28d903b87855fc2f4b9db7d6ce38e27a196340ef828bf4e1", + "md5": "135c74bf4517a5e27cfa9f969311737a", + "size": "81992" + } + }, + "cuda_nvprof": { + "name": "CUDA nvprof", + "license": "CUDA Toolkit", + "version": "12.0.90", + "linux-x86_64": { + "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-12.0.90-archive.tar.xz", + "sha256": "e3313459ff03f17836fc43e53fa7bc1d3ba4079e6089c48ac9d91009c762f196", + "md5": "a2f267cd8a511191e3690a22ac95299a", + "size": "1964632" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-12.0.90-archive.tar.xz", + "sha256": "b1067e82bbf4ce592fd94c8b654d91a72e5b70c2ec407348ce7f7cf462acd6a4", + "md5": "8e52f284df19ed42c8593608ee9daa9a", + "size": "1613276" + }, + "windows-x86_64": { + "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-12.0.90-archive.zip", + "sha256": "d509046b6670105bc11a6a31e412a07c7ceb2f76f5248d1d5699be1544dc6221", + "md5": "e1795d1a90cfe134abbc47c8f79556f1", + "size": "1601545" + } + }, + "cuda_nvprune": { + "name": "CUDA nvprune", + "license": "CUDA Toolkit", + "version": "12.0.76", + "linux-x86_64": { + "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-12.0.76-archive.tar.xz", + "sha256": "51888da85f2a77b09d8e430c764cc5ef06d178dc6acec129e88130e6cb232978", + "md5": "01f2900c204b78d691ec842e1c8d2fd5", + "size": "56264" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-12.0.76-archive.tar.xz", + "sha256": "b1f7f8eeccaa9c0bf98fd4b31f182b7677ab692da3e9010d43a9157d18898e50", + "md5": "3afe2dbdab0a9fc2e8786819650929fa", + "size": "57240" + }, + "linux-sbsa": { + "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-12.0.76-archive.tar.xz", + "sha256": "39eff5df71d45112b606f0f2d03b6be7981c147b941ce7b3f530d24e07c7bc77", + "md5": "b09ae0655fbb40707f4a4336b3265893", + "size": "48476" + }, + "windows-x86_64": { + "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-12.0.76-archive.zip", + "sha256": "38860f15bda7bceaf6aff5d088b6cc50260d16036c4c30ec7f3a9d0c3edc3cba", + "md5": "ad56d80358749c16e9638a0bf3248758", + "size": "145929" + }, + "linux-aarch64": { + "relative_path": "cuda_nvprune/linux-aarch64/cuda_nvprune-linux-aarch64-12.0.76-archive.tar.xz", + "sha256": "38f5ad012d0f8c1e47af42020d9d9282d5681f9a3eeba7b4787222c9c27e0480", + "md5": "8f6cdacb6cea72b52ebb179a54e04f62", + "size": "48468" + } + }, + "cuda_nvrtc": { + "name": "CUDA NVRTC", + "license": "CUDA Toolkit", + "version": "12.0.76", + "linux-x86_64": { + "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-12.0.76-archive.tar.xz", + "sha256": "0a4ebc9a1516a5e00f14c69365ba782dcfab545d2abb15740569970f89855bff", + "md5": "84efcdbcdfdc7307aaa2b46e946305cc", + "size": "30070440" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-12.0.76-archive.tar.xz", + "sha256": "a8a5ad2c6823435762acb209fbfb032d22fc3d09c4bfc0cade8d3734f4a26c60", + "md5": "ee1165e9fcccdab9112df312160f6679", + "size": "27776652" + }, + "linux-sbsa": { + "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-12.0.76-archive.tar.xz", + "sha256": "40d88b96fd41b28f2c5a14fa14a2c16559b0abb77689d1f85525789b23e21cad", + "md5": "a52760480e6c82b3db71a8e4480009de", + "size": "27613176" + }, + "windows-x86_64": { + "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-12.0.76-archive.zip", + "sha256": "2e97727ea5c943d0757e564fe87818a5c8c3d27bc78d60a7aaab8874e3ec5960", + "md5": "87c314e4e9e3b60e926f5d766795fa13", + "size": "96571437" + }, + "linux-aarch64": { + "relative_path": "cuda_nvrtc/linux-aarch64/cuda_nvrtc-linux-aarch64-12.0.76-archive.tar.xz", + "sha256": "6a5bc6281cc778281a0f23402d05ca8265d83b8591d1d3ba661039ad56968c23", + "md5": "d7996ee250f4623f86893df8c0705062", + "size": "27620372" + } + }, + "cuda_nvtx": { + "name": "CUDA NVTX", + "license": "CUDA Toolkit", + "version": "12.0.76", + "linux-x86_64": { + "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-12.0.76-archive.tar.xz", + "sha256": "1d2cbcb05a2e8a04b51a866b6997cb73ed90e61ffa183669d3f9ff7a0c7fd654", + "md5": "8514350a4a5e4d4b968612ac5aafd3c6", + "size": "48396" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-12.0.76-archive.tar.xz", + "sha256": "2a8aef88030147cd0a394d6fe1ceb2d26aa9694aa751e10d58e39623f27cf7e2", + "md5": "c6c975272145ffe63126d0fd39263773", + "size": "48424" + }, + "linux-sbsa": { + "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-12.0.76-archive.tar.xz", + "sha256": "2cb31f10cf0e58d296611bac2bb6e2f9ccb498753bb148b487defbd95e11f3e8", + "md5": "7eee00ed46808fb2421a167568ca7063", + "size": "48964" + }, + "windows-x86_64": { + "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-12.0.76-archive.zip", + "sha256": "e16c1214fb7ae1bb60a9224e07b70aa5fd03310226140672ab3b409ddf4ae2a7", + "md5": "f49f414b982391c1b7848afe5fa29e78", + "size": "65690" + }, + "linux-aarch64": { + "relative_path": "cuda_nvtx/linux-aarch64/cuda_nvtx-linux-aarch64-12.0.76-archive.tar.xz", + "sha256": "a698427df9910c96deb6fb77870360b2d723c57a23383ab4c8d84040ce04a468", + "md5": "94fe72e188fdbad8492a9c0751831079", + "size": "48848" + } + }, + "cuda_nvvp": { + "name": "CUDA NVVP", + "license": "CUDA Toolkit", + "version": "12.0.90", + "linux-x86_64": { + "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-12.0.90-archive.tar.xz", + "sha256": "3139235d52d0a41c56cb5caead9481154895754205b7ded7f96137fae3a9e9b1", + "md5": "8b5dd4767cd6028e7bbad5c1b53b74b4", + "size": "117594056" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-12.0.90-archive.tar.xz", + "sha256": "48928f3b3103c2fe47e557b4bd9966049b637c563af7a171358700cecf84d609", + "md5": "410f75915e32d61ad76cd1b1d3b5535e", + "size": "111727748" + }, + "windows-x86_64": { + "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-12.0.90-archive.zip", + "sha256": "edc4302461ba6f9b716e146d6bb5f10f7dc776ae1268bfd383cfd74ee94fdf19", + "md5": "4176efce368b865763327d97803202cb", + "size": "120357419" + } + }, + "cuda_opencl": { + "name": "CUDA OpenCL", + "license": "CUDA Toolkit", + "version": "12.0.76", + "linux-x86_64": { + "relative_path": "cuda_opencl/linux-x86_64/cuda_opencl-linux-x86_64-12.0.76-archive.tar.xz", + "sha256": "285b646a231d1101d7ffb7b37ca081f2c170114102ebfd0439fe189dbdc07b37", + "md5": "9b248633d7fd920442af53dd0906c999", + "size": "69168" + }, + "windows-x86_64": { + "relative_path": "cuda_opencl/windows-x86_64/cuda_opencl-windows-x86_64-12.0.76-archive.zip", + "sha256": "9a8688abf527dd1105e2f366e5aa84f901975a3ba94d977088764c45586370d3", + "md5": "598fdccab3e88205c17ff06c4e0be022", + "size": "103553" + } + }, + "cuda_profiler_api": { + "name": "CUDA Profiler API", + "license": "CUDA Toolkit", + "version": "12.0.76", + "linux-x86_64": { + "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-12.0.76-archive.tar.xz", + "sha256": "0fb470a3065ad39666dd231c12f8c8a9a94f34c4ac8494e5a399ea8e6ad69346", + "md5": "4748d343c6cdbce71f08e4241c877025", + "size": "16056" + }, + "linux-ppc64le": { + "relative_path": "cuda_profiler_api/linux-ppc64le/cuda_profiler_api-linux-ppc64le-12.0.76-archive.tar.xz", + "sha256": "211513a8a194557a2b838a46700a820af6f38932fac5a82fa229c162779d9a25", + "md5": "e58b3254395a92b8918b415fd6d0e8d6", + "size": "16056" + }, + "linux-sbsa": { + "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-12.0.76-archive.tar.xz", + "sha256": "b93d4e99077c31e7034eeaea09068b43abc0dd2868a01d489ebcd1e51ceab816", + "md5": "5f843fb1aad1b6ee1c19f64e8bb02085", + "size": "16052" + }, + "windows-x86_64": { + "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-12.0.76-archive.zip", + "sha256": "e8bccbfda35abc7076ba6623578d11d05966a9c7fed817cbfe7d4dea9627057e", + "md5": "100f5883eb8242d3fec645616e4fa8fe", + "size": "20075" + }, + "linux-aarch64": { + "relative_path": "cuda_profiler_api/linux-aarch64/cuda_profiler_api-linux-aarch64-12.0.76-archive.tar.xz", + "sha256": "31d6e843ce65c6e02cf7e4d8ed71566b6a243714750e6742b36c1a705db247ed", + "md5": "514992a5be0c84f33cea052f3137dbab", + "size": "16048" + } + }, + "cuda_sanitizer_api": { + "name": "CUDA Compute Sanitizer API", + "license": "CUDA Toolkit", + "version": "12.0.90", + "linux-x86_64": { + "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-12.0.90-archive.tar.xz", + "sha256": "80e23d82bf4a0bb79c564104121467bd0d15f0142e1dc4fff36bb491bc4b3d4f", + "md5": "b050c5f1139eff774f00d15eadbbb581", + "size": "8124684" + }, + "linux-ppc64le": { + "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-12.0.90-archive.tar.xz", + "sha256": "50d66cab58c7b8aa8473b36844669ee2ea7fc85ad92d49473b30214de22c2d25", + "md5": "b737683145211694fcfe45b5f57b7732", + "size": "7453156" + }, + "linux-sbsa": { + "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-12.0.90-archive.tar.xz", + "sha256": "c872f56fa4a0ce50f8acf5f154d73d0c7a3290e9fa7ffa0b368fbdae3d1435b9", + "md5": "d231a77f1a21aaf9e3397d70eaea1236", + "size": "6020964" + }, + "windows-x86_64": { + "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-12.0.90-archive.zip", + "sha256": "cdb48694de35aed5576aaf81f2443d12791a346d7a186e2c37e7606e252ef4e4", + "md5": "053582e559296ad422eb85f0a6df6ee6", + "size": "13689020" + }, + "linux-aarch64": { + "relative_path": "cuda_sanitizer_api/linux-aarch64/cuda_sanitizer_api-linux-aarch64-12.0.90-archive.tar.xz", + "sha256": "33d777ba9460c0b1cdb99c41a5c2f6d8506c0036b29770819cbf9b0669c81e05", + "md5": "696634de97f6d9486a1122c0bcd53384", + "size": "3442072" + } + }, + "fabricmanager": { + "name": "NVIDIA Fabric Manager", + "license": "NVIDIA Driver", + "version": "525.60.13", + "linux-x86_64": { + "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-525.60.13-archive.tar.xz", + "sha256": "1adfbb12817f213e39d389442505f75dd7cc085ce4afa98ecdc2ea26dcb321da", + "md5": "1a1773bd6ae9cdbe9cf08c623f50bb4b", + "size": "1630476" + }, + "linux-sbsa": { + "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-525.60.13-archive.tar.xz", + "sha256": "6c74abdb3f5bb54742a71e0c610d9e550c2754a10f12581dc058324799416a44", + "md5": "bab165a4ba0c2bdaf55de62129b8309b", + "size": "1506948" + } + }, + "libcublas": { + "name": "CUDA cuBLAS", + "license": "CUDA Toolkit", + "version": "12.0.1.189", + "linux-x86_64": { + "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-12.0.1.189-archive.tar.xz", + "sha256": "38272cc9184b4a57a6250fc2cd914ffc827f9f8cd5a3e1356bc3c31f843caf8f", + "md5": "135f10725f9b02eaa0056511b700aff4", + "size": "448944412" + }, + "linux-ppc64le": { + "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-12.0.1.189-archive.tar.xz", + "sha256": "2d46e735f8e76e2eb7df1b4f41d56aa8d5d2683f99988bac82d6ae33fb6d344b", + "md5": "2f3ccd6dbd1cfa7b747e1066852e8643", + "size": "371489968" + }, + "linux-sbsa": { + "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-12.0.1.189-archive.tar.xz", + "sha256": "96b68f6821684f39f338862639ce74a74c75830bf44dcd17ef372a1cb8c2304d", + "md5": "2f9ad67392e1cd1ebbb4553a9429a0b0", + "size": "446508656" + }, + "windows-x86_64": { + "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-12.0.1.189-archive.zip", + "sha256": "88f29bec81880844da2eee13f1cdc51e1ccd8b4c60af6df633577810b30f80d0", + "md5": "4c66759a793bd0f350a2bdc621186dfe", + "size": "375183725" + }, + "linux-aarch64": { + "relative_path": "libcublas/linux-aarch64/libcublas-linux-aarch64-12.0.1.189-archive.tar.xz", + "sha256": "5c07b5c50ec784a90ede8ce3b5f4a8ea088489a171d27d8e84609fa905c1866f", + "md5": "403c178317cb52013c05f11ed09917ae", + "size": "318378464" + } + }, + "libcudla": { + "name": "cuDLA", + "license": "CUDA Toolkit", + "version": "12.0.76", + "linux-aarch64": { + "relative_path": "libcudla/linux-aarch64/libcudla-linux-aarch64-12.0.76-archive.tar.xz", + "sha256": "d85f38c47bceeac61eedff54157e5f9ac424b7a199bfd6299f2b99090faa879e", + "md5": "561d85906e7d09f9aafa3de801107f68", + "size": "38416" + } + }, + "libcufft": { + "name": "CUDA cuFFT", + "license": "CUDA Toolkit", + "version": "11.0.0.21", + "linux-x86_64": { + "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-11.0.0.21-archive.tar.xz", + "sha256": "4650f79fcf377af410afedb56445f1332e8f213ec3c94d660f9a91328c3ecb4a", + "md5": "54369abfc2de7a9704d4a6abfdf57de8", + "size": "121895016" + }, + "linux-ppc64le": { + "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-11.0.0.21-archive.tar.xz", + "sha256": "e711671995e9d92d16015a4cd3751ec30710a49fa22f2b88a4a42905c248d861", + "md5": "39efd61abb12157378ddac5f597acb14", + "size": "122075552" + }, + "linux-sbsa": { + "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-11.0.0.21-archive.tar.xz", + "sha256": "91aa1ba5e68ca65778222c9a427a9214c4550d2f45e978e51779a207bafc17a3", + "md5": "947fe2aeff52e2448cf8b6c85b75d151", + "size": "121276340" + }, + "windows-x86_64": { + "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-11.0.0.21-archive.zip", + "sha256": "a33f577d48ef432d5cfa8d0ebfa789cc5261af5dd84fd9c608235edc3f769e43", + "md5": "150394e3997e99dd5bfda601ae51f8ce", + "size": "87877603" + }, + "linux-aarch64": { + "relative_path": "libcufft/linux-aarch64/libcufft-linux-aarch64-11.0.0.21-archive.tar.xz", + "sha256": "ddc525a7c92816115c8bc39a440f4bad71c29b04bfdb7ce9a58be6167e855a3f", + "md5": "d7ba56c1ca4c0cbab93e0787c042d58e", + "size": "121615432" + } + }, + "libcufile": { + "name": "CUDA cuFile", + "license": "CUDA Toolkit", + "version": "1.5.0.59", + "linux-x86_64": { + "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.5.0.59-archive.tar.xz", + "sha256": "222c49b29afb544c69542c4e658b0a1bd01fd2306f2136ad6990ccfff482a097", + "md5": "eb688d2305ed503bd4b43accf09d7ce1", + "size": "40919608" + }, + "linux-aarch64": { + "relative_path": "libcufile/linux-aarch64/libcufile-linux-aarch64-1.5.0.59-archive.tar.xz", + "sha256": "4e8d2b525322be9ab6ae574bd1d0325a4bf9c6c3bbdaa1611b5b969b7b34b0c4", + "md5": "1c79281002eb45d238f5ec14ff836977", + "size": "40583436" + } + }, + "libcurand": { + "name": "CUDA cuRAND", + "license": "CUDA Toolkit", + "version": "10.3.1.50", + "linux-x86_64": { + "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.3.1.50-archive.tar.xz", + "sha256": "7c25712016fdde96011c3370673d9007eddd7231261a9b47f36b213ceb964191", + "md5": "4144e77f5ca16ad596fc3d76b206c865", + "size": "81944120" + }, + "linux-ppc64le": { + "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.3.1.50-archive.tar.xz", + "sha256": "ac020f6e88105927f96f58ca331d3cddba35b37376f4716e866155c4f56681dd", + "md5": "7d367772ea86af8199ce315c96a57dae", + "size": "81985844" + }, + "linux-sbsa": { + "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.3.1.50-archive.tar.xz", + "sha256": "c7ae331dd6c9936a4e9746abdc222514bbda47a1e495e396b8244b918de377e2", + "md5": "6a3139862df5eb789a55b6d8d5f587f4", + "size": "81931640" + }, + "windows-x86_64": { + "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.3.1.50-archive.zip", + "sha256": "5fb95fbbd1c652e1e2a8c12c41d225117cab3f718c739f0d49d580c11b4a44f1", + "md5": "32dc14283d64989131c88af5b6910e5f", + "size": "55271970" + }, + "linux-aarch64": { + "relative_path": "libcurand/linux-aarch64/libcurand-linux-aarch64-10.3.1.50-archive.tar.xz", + "sha256": "bb1ffdb88d4177c6608f3aceb5c2d2ef0314387e3b17c2cd66d571be0ea37e55", + "md5": "80866689104d7742bb1725d982605804", + "size": "82230320" + } + }, + "libcusolver": { + "name": "CUDA cuSOLVER", + "license": "CUDA Toolkit", + "version": "11.4.2.57", + "linux-x86_64": { + "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.4.2.57-archive.tar.xz", + "sha256": "c9460db500d0c7d14debb2c8e0d88fc26a39197363f1b000ccf760866f636f12", + "md5": "800886ff264202d172b89df3dadbcd25", + "size": "83059560" + }, + "linux-ppc64le": { + "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.4.2.57-archive.tar.xz", + "sha256": "bf3c9a090652d011aafe2190c6f26fe108194cf8512d3c571e406054740168bb", + "md5": "cc8287aac0117581f8a017569e819de2", + "size": "83070796" + }, + "linux-sbsa": { + "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.4.2.57-archive.tar.xz", + "sha256": "0ca46b73520657f96f921711c05af7053bd398328d510aecddfff2521c000e91", + "md5": "9d361eeb7894e0ea97ab0072dec8b76c", + "size": "82258964" + }, + "windows-x86_64": { + "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.4.2.57-archive.zip", + "sha256": "c09836df1f43a3496f2b61ad8827af662ace298508869564a40c30d909ba550f", + "md5": "d06f19ad2f63f84707f8a8f68d320814", + "size": "122669822" + }, + "linux-aarch64": { + "relative_path": "libcusolver/linux-aarch64/libcusolver-linux-aarch64-11.4.2.57-archive.tar.xz", + "sha256": "64b68e5d145fcc883e132df090fa931e3fb34fb9ed802584bb38f5202264c50b", + "md5": "eb07c50be715202d76338ad7110d1aec", + "size": "76026940" + } + }, + "libcusparse": { + "name": "CUDA cuSPARSE", + "license": "CUDA Toolkit", + "version": "12.0.0.76", + "linux-x86_64": { + "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-12.0.0.76-archive.tar.xz", + "sha256": "66bd1962f4905b6fc49446d5b2570bcd6171a96833b93f44ad4fc5650f47a496", + "md5": "9d1f8dd5d9085ec5b0f70a2e0f429ade", + "size": "186834824" + }, + "linux-ppc64le": { + "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-12.0.0.76-archive.tar.xz", + "sha256": "36b5f682ebe21089d1bbc8250eabd18c9c9a8bf498b5f878ea4944fda16d8203", + "md5": "802d9b51bb957c9f7cf01cd077a929b9", + "size": "186984664" + }, + "linux-sbsa": { + "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-12.0.0.76-archive.tar.xz", + "sha256": "ee3a2ff7becc449aeda6b2cec11ad7f0606cef4b54eb6511d5f0c1166c79cc80", + "md5": "42b015133b9395cf7c5cd059ac4c8ba8", + "size": "186428912" + }, + "windows-x86_64": { + "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-12.0.0.76-archive.zip", + "sha256": "a475bc85cfc204aff825e3e5d97d7c1993d3f2cfec22a87e76b8d596fc496a02", + "md5": "7c5144483b1b050cbb91c4bffa5a1e94", + "size": "151652787" + }, + "linux-aarch64": { + "relative_path": "libcusparse/linux-aarch64/libcusparse-linux-aarch64-12.0.0.76-archive.tar.xz", + "sha256": "72a882a92d0ae9a9d62dd1ed0409ddee241da04923bfc0c4b9639a4d13fed4d8", + "md5": "1ce21b4b799209c90cc55e4c42f5f7ad", + "size": "191797084" + } + }, + "libnpp": { + "name": "CUDA NPP", + "license": "CUDA Toolkit", + "version": "12.0.0.30", + "linux-x86_64": { + "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-12.0.0.30-archive.tar.xz", + "sha256": "003365261d69caa6219ba698b649a961ad41ae386772fe673f3b8166c1b42775", + "md5": "a2721015edbd6ae8a63da0c2fcfb3c73", + "size": "183973264" + }, + "linux-ppc64le": { + "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-12.0.0.30-archive.tar.xz", + "sha256": "4e2b56928cfef99725931f98b5840ca35a56505d927871ce53accba6f38005e5", + "md5": "0bc29dcf667156062c719a0e84b863ff", + "size": "184254800" + }, + "linux-sbsa": { + "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-12.0.0.30-archive.tar.xz", + "sha256": "6239013db1d4badf1cc1af8acebe3fc1bc0ef167092b314721078742a2916976", + "md5": "eda65a21bb0a0d762b082508620eb299", + "size": "183254792" + }, + "windows-x86_64": { + "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-12.0.0.30-archive.zip", + "sha256": "a7abd59e05b326d6adfca16840071d2ed02d0cc6df092d921ed96d489a2e864e", + "md5": "dcfac50bad2ee907c0d4cbb272f5a06c", + "size": "152918791" + }, + "linux-aarch64": { + "relative_path": "libnpp/linux-aarch64/libnpp-linux-aarch64-12.0.0.30-archive.tar.xz", + "sha256": "248fde03fb06d6dbdf080b05016baec5ed15bdd202374599de6165110b48e4b0", + "md5": "ee08825c03495d38f12350816952fc08", + "size": "179283116" + } + }, + "libnvidia_nscq": { + "name": "NVIDIA NSCQ API", + "license": "NVIDIA Driver", + "version": "525.60.13", + "linux-x86_64": { + "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-525.60.13-archive.tar.xz", + "sha256": "1335573917e02a0fdb032d2d959d3a82598498680a7aa3a32eb1059db75bbb54", + "md5": "3fc1b5ba901c38176f9f9be503c2f7bf", + "size": "439128" + }, + "linux-sbsa": { + "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-525.60.13-archive.tar.xz", + "sha256": "8a5c56cf99df931b2f7088e3ad0fd962437b0dd5e5b66a8af3ce692c86be44f2", + "md5": "dd005f018eae69ecf91160535e4f077f", + "size": "395800" + } + }, + "libnvjitlink": { + "name": "NVIDIA compiler library for JIT LTO functionality", + "license": "CUDA Toolkit", + "version": "12.0.76", + "linux-x86_64": { + "relative_path": "libnvjitlink/linux-x86_64/libnvjitlink-linux-x86_64-12.0.76-archive.tar.xz", + "sha256": "92a70db1ee90f1816a40d4d2019e0a59c43eebb9f3eb1208abedcc00a13e48be", + "md5": "629eb972949909a441346ba7aa0b7aea", + "size": "25644284" + }, + "linux-ppc64le": { + "relative_path": "libnvjitlink/linux-ppc64le/libnvjitlink-linux-ppc64le-12.0.76-archive.tar.xz", + "sha256": "dd317e1d052b4231ab95d1b472105640f617f7d250aacc5bc1c952aab93d7483", + "md5": "bb08ab81b8df623356c1edd3ff692a92", + "size": "23614740" + }, + "linux-sbsa": { + "relative_path": "libnvjitlink/linux-sbsa/libnvjitlink-linux-sbsa-12.0.76-archive.tar.xz", + "sha256": "9f18090f6587e95be0ee424f07358eeb0e15c5ab3f8636870f68dd84a92ed2e6", + "md5": "1847112c9f0c35b9d12a2be3fdf36e72", + "size": "23443868" + }, + "windows-x86_64": { + "relative_path": "libnvjitlink/windows-x86_64/libnvjitlink-windows-x86_64-12.0.76-archive.zip", + "sha256": "cae74b6790174b283d892bb20e1ff91bff13c8a2a8486de4f417e09675469372", + "md5": "6637e29e523a18f3c1fc7a3e8e1750ca", + "size": "86232010" + }, + "linux-aarch64": { + "relative_path": "libnvjitlink/linux-aarch64/libnvjitlink-linux-aarch64-12.0.76-archive.tar.xz", + "sha256": "e01c074fe008aa81496d65779068d8443b19b1a1d3b6e36d20e2a4018d59888d", + "md5": "81d94bf755b2406d15a986813ef21306", + "size": "23442512" + } + }, + "libnvjpeg": { + "name": "CUDA nvJPEG", + "license": "CUDA Toolkit", + "version": "12.0.0.28", + "linux-x86_64": { + "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-12.0.0.28-archive.tar.xz", + "sha256": "ad3380591a4d5b97ab57d10e9bf05e23dee6429ff91ea939423a3b35ee0e35de", + "md5": "043df4a379a5ce4947909e7a0d3383ea", + "size": "1972024" + }, + "linux-ppc64le": { + "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-12.0.0.28-archive.tar.xz", + "sha256": "f7136bb691d794c680d77376b306bedb80eeebf687bfa4dc74355fdae5adcebb", + "md5": "c7269e3c1bf6b5000fceebf64fbd83f8", + "size": "1980748" + }, + "linux-sbsa": { + "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-12.0.0.28-archive.tar.xz", + "sha256": "31fd6ee0dccc72f0d583e25b849543551eb4bc49d3285628bf3b17929e09bac1", + "md5": "184b017c65856b4f0299a02fc9ec6a5b", + "size": "1786868" + }, + "windows-x86_64": { + "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-12.0.0.28-archive.zip", + "sha256": "b7cb56ab2c69e055a4b1ea41653df917153a568ab23fb0d8121e0739011989a8", + "md5": "18d62f0d142f7e8ce6de806190876a18", + "size": "1943533" + } + }, + "libnvvm_samples": { + "name": "NVVM library samples", + "license": "CUDA Toolkit", + "version": "12.0.94", + "linux-x86_64": { + "relative_path": "libnvvm_samples/linux-x86_64/libnvvm_samples-linux-x86_64-12.0.94-archive.tar.xz", + "sha256": "0f6bcdd9b883cdd8aa706adf1a7b6ffba89ce58ef0ba986ba6dc9d3301d14987", + "md5": "9c07aca7a08caa69da3fd6d8e46aaed0", + "size": "28988" + }, + "linux-ppc64le": { + "relative_path": "libnvvm_samples/linux-ppc64le/libnvvm_samples-linux-ppc64le-12.0.94-archive.tar.xz", + "sha256": "38abed8bc9bf7d103e5d73db587a157dfbf9ef91b8c2d79d8d51c0c085d7d6f7", + "md5": "5d080ed2bd81e0e3c2c497203f76f189", + "size": "28992" + }, + "linux-sbsa": { + "relative_path": "libnvvm_samples/linux-sbsa/libnvvm_samples-linux-sbsa-12.0.94-archive.tar.xz", + "sha256": "892d1e14eefe5d5ba4863575c767e016ac022002014acf87a2ec62e3e562ae09", + "md5": "3fd0884d42bd2c380e4c086f372d172c", + "size": "28900" + }, + "windows-x86_64": { + "relative_path": "libnvvm_samples/windows-x86_64/libnvvm_samples-windows-x86_64-12.0.94-archive.zip", + "sha256": "e801c44c296f93e6c0a1fbb1815fac4e1d58be248bc5c3321ead5b02b825261d", + "md5": "ce6670a8312bc878f9dc1ad3c2680f28", + "size": "44383" + }, + "linux-aarch64": { + "relative_path": "libnvvm_samples/linux-aarch64/libnvvm_samples-linux-aarch64-12.0.94-archive.tar.xz", + "sha256": "069111f6c03835e56795f3306c9a7406f036f734a4b92c4a6007d532e64be5df", + "md5": "a2ca1ffa02c9583ebe455c6481813cdb", + "size": "29000" + } + }, + "nsight_compute": { + "name": "Nsight Compute", + "license": "NVIDIA SLA", + "version": "2022.4.0.15", + "linux-x86_64": { + "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2022.4.0.15-archive.tar.xz", + "sha256": "f084e05eb4d2ba32aceb25e1dcfe03f2a50127630973722b65219cf9e986a139", + "md5": "5728a6b6f74c6fa7399c343f1c727f71", + "size": "704648508" + }, + "linux-ppc64le": { + "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2022.4.0.15-archive.tar.xz", + "sha256": "20e58ce79681bc8fd39394cfb8f8316c177fe4175af3ae95c025996f45904732", + "md5": "9e49ee03465ac3c0ba0df9063d664433", + "size": "181691528" + }, + "linux-sbsa": { + "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2022.4.0.15-archive.tar.xz", + "sha256": "7d0b3d4d01ce36657fa739496c7b0a9c627f5fa42021c1696ddd15e119bb05a4", + "md5": "50dbf4765e7faad5f5c3d4e0adde0d30", + "size": "341158648" + }, + "windows-x86_64": { + "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2022.4.0.15-archive.zip", + "sha256": "958da9986841c49cb5a2885d1e14e4c673ba94e4b404ef9389d083b7a0095d84", + "md5": "4aef8035c676ba89c4d27656c4a4f01e", + "size": "634477385" + }, + "linux-aarch64": { + "relative_path": "nsight_compute/linux-aarch64/nsight_compute-linux-aarch64-2022.4.0.15-archive.tar.xz", + "sha256": "cdcf9b4cefdafbaacbcc2d3266537458fd3924d8a6fb67592605030d18954604", + "md5": "0b5b0f866f9331df8e59316719aaa2d1", + "size": "704209708" + } + }, + "nsight_systems": { + "name": "Nsight Systems", + "license": "NVIDIA SLA", + "version": "2022.4.2.18", + "linux-x86_64": { + "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2022.4.2.18-archive.tar.xz", + "sha256": "9f472990098a719bb8cc3136512e37eb99843c80c95560f9f8edfb2e50d9fa67", + "md5": "b490dfb944a6b8d4e0d12ca4b07b7492", + "size": "197472896" + }, + "linux-ppc64le": { + "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2022.4.2.18-archive.tar.xz", + "sha256": "6a45a64052c80db3ac99dff56bd415cc1c767d5bfb6fa97acf8081a9e793e94b", + "md5": "ad6bfa7fa72adf5324d0e2e75a3cec90", + "size": "53600240" + }, + "linux-sbsa": { + "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2022.4.2.18-archive.tar.xz", + "sha256": "7e1598d5a8eec9bd84c9276d36c5efe7eebf44e5cc308b08c8a6f985ca41e0e2", + "md5": "28be2fa20b9e90b9cf207d60cec75c4b", + "size": "187083996" + }, + "windows-x86_64": { + "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2022.4.2.18-archive.zip", + "sha256": "5984fd60fd80f6cb0073ab7bc5edc754bfa8412c77b1068dbd82da3abe73137e", + "md5": "78b945d4735790cecfe163031b39c16e", + "size": "729028336" + } + }, + "nsight_vse": { + "name": "Nsight Visual Studio Edition (VSE)", + "license": "NVIDIA SLA", + "version": "2022.4.0.22322", + "windows-x86_64": { + "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2022.4.0.22322-archive.zip", + "sha256": "d0452c1bb063482920040d1e1b4f3239bff2de238762c91176a101fb9c748bf8", + "md5": "9a6d042c20eef6349e2e621c2a218086", + "size": "536307565" + } + }, + "nvidia_driver": { + "name": "NVIDIA Linux Driver", + "license": "NVIDIA Driver", + "version": "525.60.13", + "linux-x86_64": { + "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-525.60.13-archive.tar.xz", + "sha256": "a42691822f6e87060da5682a8e0662c86d1b20fbf31d12cb2969b819995e4138", + "md5": "ad2972799f4ebf292e8642c28c83127d", + "size": "417069508" + }, + "linux-ppc64le": { + "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-525.60.13-archive.tar.xz", + "sha256": "4ad08f8431195580349f4984fae2d93697d2f5572837c1e7ae59c37feab291c8", + "md5": "b38a21c5dd06e56a6dcf840cfeb5b82a", + "size": "97903116" + }, + "linux-sbsa": { + "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-525.60.13-archive.tar.xz", + "sha256": "1708ae3ba857559cbfc4e6c06267ed6126eff2c68fa5321a95906f50e984148c", + "md5": "78379197e219d8172a3e9e1cc0de81e3", + "size": "268660720" + } + }, + "nvidia_fs": { + "name": "NVIDIA filesystem", + "license": "CUDA Toolkit", + "version": "2.14.12", + "linux-x86_64": { + "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.14.12-archive.tar.xz", + "sha256": "12a2a04b4cd0b6f9d502556694594e122e22cc1effc7fa359308dbe405732bc2", + "md5": "f47d9f5415c50ddb41d87b58b218c277", + "size": "57124" + }, + "linux-aarch64": { + "relative_path": "nvidia_fs/linux-aarch64/nvidia_fs-linux-aarch64-2.14.12-archive.tar.xz", + "sha256": "c90434ff603a74a4966bce28b0152b383b0c6f48b2e935c4194db5d3ceaa2f77", + "md5": "1bb76127d950212d9450f259f2012825", + "size": "57112" + } + }, + "visual_studio_integration": { + "name": "CUDA Visual Studio Integration", + "license": "CUDA Toolkit", + "version": "12.0.76", + "windows-x86_64": { + "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-12.0.76-archive.zip", + "sha256": "ef81457b08ef6b03899cb08433b1be4043cdf2c69386fc0d45ba55f9c3b36db2", + "md5": "1f048a3cb028e3c50b91823d7211fc63", + "size": "544915" + } + } +} diff --git a/pkgs/development/compilers/cudatoolkit/versions.toml b/pkgs/development/compilers/cudatoolkit/versions.toml index 00e506371bcd..8f1a3d625d40 100644 --- a/pkgs/development/compilers/cudatoolkit/versions.toml +++ b/pkgs/development/compilers/cudatoolkit/versions.toml @@ -71,3 +71,13 @@ version = "11.8.0" url = "https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_520.61.05_linux.run" sha256 = "sha256-kiPErzrr5Ke77Zq9mxY7A6GzS4VfvCtKDRtwasCaWhY=" gcc = "gcc11" + +["12.0"] +version = "12.0.0" +url = "https://developer.download.nvidia.com/compute/cuda/12.0.0/local_installers/cuda_12.0.0_525.60.13_linux.run" +sha256 = "sha256-kF6blRaQCDn7dgZHGdt1JDnzi4y3MLSTNdi9U93605I=" +# CUDA 12 is compatible with gcc12, but nixpkgs default gcc is still on gcc11 as +# of 2023-01-08. See https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements. +# This should be upgraded to gcc12 once nixpkgs default gcc is upgraded. Other +# CUDA versions should likely have their gcc versions upgraded as well. +gcc = "gcc11" diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index 7feb364976e5..816e8e08f4a7 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config llvm_13.dev ]; buildInputs = [ libffi llvm_13 ]; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; checkTarget = "tests"; diff --git a/pkgs/development/compilers/dmd/generic.nix b/pkgs/development/compilers/dmd/generic.nix index d4bb8bb6282c..c1fb9abf77d7 100644 --- a/pkgs/development/compilers/dmd/generic.nix +++ b/pkgs/development/compilers/dmd/generic.nix @@ -151,6 +151,13 @@ stdenv.mkDerivation rec { git ]; + # Workaround cc-wrapper's --sysroot= value for `staging-next`: it + # breaks library lookup via RUNPATH: + # ld: warning: libm.so.6, needed by ./generated/linux/release/64/lib.so, not found (try using -rpath or -rpath-link) + # ld: /build/druntime/generated/linux/release/64/libdruntime.so: undefined reference to `log10@GLIBC_2.2.5' + # TODO(trofi): remove the workaround once cc-wrapper is fixed. + NIX_CFLAGS_COMPILE = [ "--sysroot=/" ]; + buildInputs = [ curl tzdata @@ -158,7 +165,7 @@ stdenv.mkDerivation rec { Foundation ]; - checkInputs = [ + nativeCheckInputs = [ gdb ] ++ lib.optionals (lib.versionOlder version "2.089.0") [ unzip @@ -213,7 +220,7 @@ stdenv.mkDerivation rec { NIX_ENFORCE_PURITY= \ make -C phobos -f posix.mak unittest $checkFlags -j$checkJobs DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$PWD" - runHook postBuild + runHook postCheck ''; installPhase = '' diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index e25a8a1464fe..c51eca24b58c 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -24,6 +24,7 @@ assert if type == "sdk" then packages != null else true; , testers , runCommand , writeShellScript +, mkNugetDeps }: let @@ -40,6 +41,12 @@ let runtime = ".NET Runtime ${version}"; sdk = ".NET SDK ${version}"; }; + + packageDeps = mkNugetDeps { + name = "${pname}-${version}-deps"; + nugetDeps = packages; + }; + in stdenv.mkDerivation (finalAttrs: rec { inherit pname version; @@ -120,14 +127,8 @@ stdenv.mkDerivation (finalAttrs: rec { ''; passthru = rec { - inherit icu packages; - - runtimeIdentifierMap = { - "x86_64-linux" = "linux-x64"; - "aarch64-linux" = "linux-arm64"; - "x86_64-darwin" = "osx-x64"; - "aarch64-darwin" = "osx-arm64"; - }; + inherit icu; + packages = packageDeps; updateScript = if type == "sdk" then @@ -141,9 +142,6 @@ stdenv.mkDerivation (finalAttrs: rec { exec ${./update.sh} "${majorVersion}" '' else null; - # Convert a "stdenv.hostPlatform.system" to a dotnet RID - systemToDotnetRid = system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); - tests = { version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 53c32121aabc..fddcbcea466b 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -14,17 +14,31 @@ let buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); }; + runtimeIdentifierMap = { + "x86_64-linux" = "linux-x64"; + "aarch64-linux" = "linux-arm64"; + "x86_64-darwin" = "osx-x64"; + "aarch64-darwin" = "osx-arm64"; + "x86_64-windows" = "win-x64"; + "i686-windows" = "win-x86"; + }; + + # Convert a "stdenv.hostPlatform.system" to a dotnet RID + systemToDotnetRid = system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); + ## Files in versions/ are generated automatically by update.sh ## dotnet_3_1 = import ./versions/3.1.nix (buildAttrs // { icu = icu70; }); - dotnet_5_0 = import ./versions/5.0.nix (buildAttrs // { inherit icu; }); dotnet_6_0 = import ./versions/6.0.nix (buildAttrs // { inherit icu; }); dotnet_7_0 = import ./versions/7.0.nix (buildAttrs // { inherit icu; }); in rec { + inherit systemToDotnetRid; + 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)"; -} // dotnet_3_1 // dotnet_5_0 // dotnet_6_0 // dotnet_7_0 + sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; + sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; + sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; + sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; +} // dotnet_3_1 // dotnet_6_0 // dotnet_7_0 diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index 8f59e58ff5a5..84bf37c3c8c1 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -91,7 +91,7 @@ aspnetcore_packages () { # would fail due to missing dependencies. # # Moving them to a separate list stored alongside the SDK package definitions, - # and implictly including them along in buildDotnetModule allows us + # and implicitly including them along in buildDotnetModule allows us # to make updating .NET SDK packages a lot easier - we now just update # the versions of these packages in one place, and all packages that # use buildDotnetModule continue building with the new .NET version without changes. @@ -141,7 +141,7 @@ sdk_packages () { # would fail due to missing dependencies. # # Moving them to a separate list stored alongside the SDK package definitions, - # and implictly including them along in buildDotnetModule allows us + # and implicitly including them along in buildDotnetModule allows us # to make updating .NET SDK packages a lot easier - we now just update # the versions of these packages in one place, and all packages that # use buildDotnetModule continue building with the new .NET version without changes. diff --git a/pkgs/development/compilers/dotnet/versions/3.1.nix b/pkgs/development/compilers/dotnet/versions/3.1.nix index 0b3e741c93e8..fa39bd32fad5 100644 --- a/pkgs/development/compilers/dotnet/versions/3.1.nix +++ b/pkgs/development/compilers/dotnet/versions/3.1.nix @@ -1,137 +1,137 @@ { buildAspNetCore, buildNetRuntime, buildNetSdk, icu }: -# v3.1 (maintenance) +# v3.1 (eol) { aspnetcore_3_1 = buildAspNetCore { inherit icu; - version = "3.1.31"; + version = "3.1.32"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/2fc0069c-e99a-4296-99ee-a422b3cf50de/df8aee91eeaf50a12c810c3845341eb3/aspnetcore-runtime-3.1.31-linux-x64.tar.gz"; - sha512 = "9ea1fb4c9a656de8392b8f92c608c2f927fd03ad8e8b195f3f0b69c1433cfbf2679827b1ce2fac783f8ef77307c7b1b36563d0813f914b75b025b5cca6c773f9"; + url = "https://download.visualstudio.microsoft.com/download/pr/39c3ef4c-73c7-4248-8c54-0865d5feb8b2/3420b1ff6b0f36e63044d6f7a794b579/aspnetcore-runtime-3.1.32-linux-x64.tar.gz"; + sha512 = "0aa2aceda3d0b9f6bf02456d4e4b917c221c4f18eff30c8b6418e7514681baa9bb9ccc6b8c78949a92664922db4fb2b2a0dac9da11f775aaef618d9c491bb319"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/216fe20f-6c45-4a87-b206-6c22360567fd/902208836df9ddcf4eb177771b2c6fea/aspnetcore-runtime-3.1.31-linux-arm64.tar.gz"; - sha512 = "970def9298bfe39c00054ae45231e2c632d4364a311349b3594bef5dd3739af2db33329f314f29a3956c271745948df88076e39bd2fa80e8a4dbb9723e3493ec"; + url = "https://download.visualstudio.microsoft.com/download/pr/7a713b60-c2fb-4dc9-ad35-df86c4bfac0c/fff24659d0a2ad9c6b622be1722b8f72/aspnetcore-runtime-3.1.32-linux-arm64.tar.gz"; + sha512 = "34b9ec241cd0047cb23f0b8416d3a009476e511c3dd5854636c11cfd078117faf095f32f06e7c97d810af94fde43621117414f983d3b2041ad40260f50dc330d"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/25282f2c-c43e-4c0f-aa09-f72c565e009e/b581cf1c97879ca4913a1763c7d1fe8d/aspnetcore-runtime-3.1.31-osx-x64.tar.gz"; - sha512 = "25d395435ddc17b8155c6d9b06c6b280e462da3e86a8c2b0b0549cfb80d2770b0df33a0a87845b442e89295000a872fce12a5949b4f1b123f802e8e2d071d504"; + url = "https://download.visualstudio.microsoft.com/download/pr/70cd4d7b-0186-4ce2-a710-f50d6dec246f/84c5b21b8a487127589095336c5158b5/aspnetcore-runtime-3.1.32-osx-x64.tar.gz"; + sha512 = "21f77b64b527af41bbba0f8887c71be631f37d7bbabe9119fe39961c2600a90075f60768173097c9fffe32e40f8db309544837055cb70fe428195682b85fb9a0"; }; }; }; runtime_3_1 = buildNetRuntime { inherit icu; - version = "3.1.31"; + version = "3.1.32"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/046afe25-7b88-48ad-a06c-1c3625115c63/6814f9ca777bc7e2cb4b373027dcdd76/dotnet-runtime-3.1.31-linux-x64.tar.gz"; - sha512 = "fb2ac1a1e3b9b1eceb37587535d96a5a3c0b01edd07182ed57d4725e067678988a3fcdf22f3f49d21bc35760d69398af85a6449e6c3a8ed401ad85df920be4df"; + url = "https://download.visualstudio.microsoft.com/download/pr/fea239ad-fd47-4764-aa71-6a147a82f632/20ee58b0bf08ae9f6e76e37ba3765c57/dotnet-runtime-3.1.32-linux-x64.tar.gz"; + sha512 = "a1de9bbc3d2e3a4f5f52b7742c678b182a58a724d36232997511e390027044d60144a7e010a29d6ee016ec91f2911daef28ac5712a827fff8bdde73314b7e002"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/dbdcd07a-e519-470a-a03e-702f4cbf65d7/e1bc1991aa91cc52582d446ae4b63691/dotnet-runtime-3.1.31-linux-arm64.tar.gz"; - sha512 = "bb9594cdf3b1f8005005d12055fe5e1ae6ba40ed56c2f6f41e36b2c04c9a7fa4630da594c7d93fe587d75d9a00638818fb14228e188fb7f1b7b5eff96d53bc7f"; + url = "https://download.visualstudio.microsoft.com/download/pr/edfb706e-83fe-4a81-804c-23d80b041b70/4f98b067bd2817976a4362c25fbf70e7/dotnet-runtime-3.1.32-linux-arm64.tar.gz"; + sha512 = "ff311df0db488f3b5cc03c7f6724f8442de7e60fa0a503ec8f536361ce7a357ad26d09d2499d68c50ebdfa751a5520bba4aaa77a38b191c892d5a018561ce422"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/3a01bc5f-4deb-4cf5-bbdd-19a1dc406b2c/1c66b68807fe87cda620898c088000c4/dotnet-runtime-3.1.31-osx-x64.tar.gz"; - sha512 = "8890441bd64911656e34a824f3d4abdbcbe4337887efc90fc8eba62189be161bcedd0d0f0e1168dadbc25bc616c462ab1c8499b9a52f05be19173f2af8ea09e7"; + url = "https://download.visualstudio.microsoft.com/download/pr/09f14240-76bf-43df-bdf1-636aa56cbd5c/4898c400f81d0bac651bcf84dc487b6f/dotnet-runtime-3.1.32-osx-x64.tar.gz"; + sha512 = "9fd385812e770525856d734ca62e5d01ddb534ff317bb09e1091ded38ce2c16dc4bd02b5eebad8ea6e01b21755fe6f5ce6ca5183ebbbee04fa1aed956da4c58a"; }; }; }; sdk_3_1 = buildNetSdk { inherit icu; - version = "3.1.425"; + version = "3.1.426"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/c2574deb-9c23-4851-89bd-211243ecd85b/046fc7e68a8e7e6e5854fc0b3b56e59c/dotnet-sdk-3.1.425-linux-x64.tar.gz"; - sha512 = "3d31c6bb578f668111d0f124db6a1222b5d186450380bfd4f42bc8030f156055b025697eabc8c2672791c96e247f6fc499ff0281388e452fcc16fbd1f8a36de1"; + url = "https://download.visualstudio.microsoft.com/download/pr/e89c4f00-5cbb-4810-897d-f5300165ee60/027ace0fdcfb834ae0a13469f0b1a4c8/dotnet-sdk-3.1.426-linux-x64.tar.gz"; + sha512 = "6c3f9541557feb5d5b93f5c10b28264878948e8540f2b8bb7fb966c32bd38191e6b310dcb5f87a4a8f7c67a7046fa932cde3cce9dc8341c1365ae6c9fcc481ec"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/d4a8d050-e3d0-4f07-b222-5cadb21320f2/05d4d832757a78ec88fb56d8f9f4cc65/dotnet-sdk-3.1.425-linux-arm64.tar.gz"; - sha512 = "f3c18acc094c19f3887f6598c34c9a2e1cfa94055f77aa4deae7e51e8d760ca87af7185cc9ed102e08f04d35f9a558894f04f7a44fa56b91232ccc895f4e5a5c"; + url = "https://download.visualstudio.microsoft.com/download/pr/79f1cf3e-ccc7-4de4-9f4c-1a6e061cb867/68cab78b3f9a5a8ce2f275b983204376/dotnet-sdk-3.1.426-linux-arm64.tar.gz"; + sha512 = "300e154fba3123644910bbb89a6e61f67569677efa359aa110871cbbb62afad059709dc362f0af27ece0b9a30bc3e6ef57c3cb7c6f75377b20d48636605f30f7"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/8d52dd3a-13f9-4b1e-ae1b-7afc8896bf08/f01ed5a9f1eb3d425daec9e900a334cf/dotnet-sdk-3.1.425-osx-x64.tar.gz"; - sha512 = "dbe560c6d052333f2922c8337ca84cb4cd1de614de53be8bc3c52537c32bc4d074b8af832f5a1660bf0bc07204c74b3f0610a12ce6b192eae6503f76bb5ce40a"; + url = "https://download.visualstudio.microsoft.com/download/pr/e45c25b7-623f-4b98-8918-13a671884860/d6e4526d0dd31d388b36a749f90ae6e2/dotnet-sdk-3.1.426-osx-x64.tar.gz"; + sha512 = "be1c29ffe8ddec6051d7529796dae35fe18036af89d5e7285fcdad46316fec557f4b15c15eed4d676071d187b363c2e16cb3bcbf708b920b5614340a6e51ab3d"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "3.1.31"; sha256 = "0s8rnj81b04w1lbgwirsv9xzmpkx9ffr8wyzgwwyvb2y2r39w6pg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "3.1.31"; sha256 = "12w3gka0k2z309jaxwhrqlhjfhag0pn26k44528k6039r5vrc62r"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "3.1.31"; sha256 = "1gbiwdhsfns4pkcpvl1kdpzynkplal0binfawxhzx0mjp66447rf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "3.1.31"; sha256 = "1k5zjvak7pp4rzcv3p4jp2ic23xyk89342mna3i9kp20qn4c36mv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.31"; sha256 = "0kilp89vmcqs6yznvx2wpxafhpjbzybrvdbfqpmlxjbbbbsgfi7v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.31"; sha256 = "021a8xn4haa8vha9ypvldnmp8v519snjm9za67vscd2kkvifcxnl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "3.1.31"; sha256 = "1qmd1zx54khnsqwrlq76m70xbw6dv1qrz3f9nva89prjgkqmqag4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "3.1.31"; sha256 = "0dm0prvl1qsws22rwgkbdbb8jkgvgxw8zf88rf7rw3xp1dnhql74"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "3.1.31"; sha256 = "1i6ldw55wqck3nxh9bpw0czv2y7zqbckxky8ih1r35nf08yw6dld"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "3.1.31"; sha256 = "0pyssa4mhm3ik9w261kkmnhxri4l6kli20qg3fmfp5rb9yp99faz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "3.1.31"; sha256 = "14hrfingvks7x5y796dsfkhpjp4zszv7gvmd4ycczjfhrywfxzis"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "3.1.31"; sha256 = "1savp0v2b63sj6qj4qq30vbjgx8bynvvgadmgbgj42sk2p6sgll9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "3.1.31"; sha256 = "13plrsf4bgdqv5v8jha1n2jz0nj7jdggjpc7w7ipc3gxw42w0z1a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "3.1.31"; sha256 = "1r59z5nwdxrwsqy2k4bvisqs2q0chr6wv9kxgsniqsz26vdp163w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.31"; sha256 = "176575973yg2b6ls2c02ysb101xxamlgqkrbxhgbdkfh4w5clf6k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.31"; sha256 = "0nvirb5hfk0swxm92isg3r9czcbsa95lb071k3adfqw7lfz8mqzz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "3.1.31"; sha256 = "09akjvppv6xvg3yyc84jx0yrcxn3kfg27vls71zxa539yvjkh29d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "3.1.31"; sha256 = "03dsvrfb3jyrfril4d6w9z25rgl7ldbiqab5n6s7fjajz6qpmgj8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "3.1.31"; sha256 = "0j2p5110qagrl5lb1j6zll9h0x3d17ad7r2h89ndjfrzs8awj9sp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "3.1.31"; sha256 = "1s5fkl5102ar9kl6w5nibkc71q49yx9jdqr5dgx8zmh88klaqc6s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "3.1.31"; sha256 = "1p74kp59a6f8gvnkqvl9qfgav08lisjdsi882i4dpipxmsizbvn6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "3.1.31"; sha256 = "00vlrk33nrxdjvjxrb1ck5hxv8ybjwscx9v3y3vnffias9dmg5dc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "3.1.31"; sha256 = "037npznm0b3i4dl5ciif0l2cx98b4010633xjsahyfsnzszz6rxb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "3.1.31"; sha256 = "0626jfv9f0rbqp25x8sqdjcpqbbrr0mn7zlggz8lzkdfw3nj91pm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.31"; sha256 = "1rnvh65wav9ah7qs5a5anqb35z04wqp2lf1awzmam4jsmfqd666x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.31"; sha256 = "0zgwx8yl2y7hdc0xdlbmni55gq2fl1ni8xhdzknzyz5pwzr5fghl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "3.1.31"; sha256 = "1n85hrndj8kb9hi95jb7mfd197d17a79gl9mzv0xfb4zwfd3jb26"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "3.1.31"; sha256 = "19ssb0366lcs8w3wfq7nvbc2ja8530vfhps7yrwy3j46p2jl0x1m"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "3.1.31"; sha256 = "1i2das9gpk6lbvc4bjaarrgrmk29086zpqxkasgswqd17kdvpyfq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "3.1.31"; sha256 = "0s2x3ybfkj65p9b5wm0bvn2gfj442ylc44hbp2r4zgxabq0lghh4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "3.1.31"; sha256 = "0j31jicc7107wfims5f7sgwi97vywcmdrqc7y6qc5gkc2djqbslr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "3.1.31"; sha256 = "0afclz46pdy9pbfjzlg9vkyyacy8ymmsq3jp6r161x0d5k2444vw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.31"; sha256 = "0c7yhq57gy004k6fhsl3adb9nqz8cn019dy9gaddp6qlkiidirg9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "3.1.31"; sha256 = "01qirfj6ydwyasr7ggbhymv8c9bmk61vl44cdz9xq8cfvd6yq5bl"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.31"; sha256 = "00x9ldx2906b2z35diihb7z8q5a3a537rak1yyif27pw5s20s6iw"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "3.1.31"; sha256 = "0kpnlygnah6761iiqsdixzgb1sgfrvsqv0jjraz8bdda1778f22d"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.31"; sha256 = "1y9w7yzq47sd9i1wz1hl91s3yzz6vlhb3acwm58yv91r73h6dgy2"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.31"; sha256 = "0fpqmin2mx99ndzzf2l633dlq8xxwgnn7qws3rcsn6kid7hn1kw3"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "3.1.31"; sha256 = "02hyzxi4414z1clxhfni5x9dwmih5aww9wpcv8vjp9r33xigi6d9"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "3.1.31"; sha256 = "0mi3rwjjsgrr8c5yci1sg1yg57f8vhmmcdcyr9zsgwnq8rwrqn91"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.31"; sha256 = "1xbxgsi75xg0yrrpymkvh7fplrrrlw8k47knbgh8824bd7hvdq1b"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.31"; sha256 = "0r12z7z5pkwcjm1zq6dav3axnahl9nvp72lg4a6ds39jz6a94mds"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.31"; sha256 = "15vann79nyz4iayx10gcqwlf0frqqsmw26v9xakfbckha4pjhy1x"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "3.1.31"; sha256 = "13j2graqr5a5jimvzsvd1i5cnnmrzqxfcvax8r385gbav0xr0d0s"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.31"; sha256 = "0v6h1rj25i0cpvk78845wzxa4yffwjcnqkhpwdafj8glac633242"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.31"; sha256 = "0qbn4zzx8fxap4546y3i5zwl6rv0rfdphkns4gmh1fjnkfb7zvjw"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.31"; sha256 = "1ix4w2v5ajq6c4n6l7jrjxky7mx9lynsarfx0byxj4x5qlps1z56"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "3.1.31"; sha256 = "1bkvz6n741dgrh9q57db9jdnlgccp9gcsivw8555n4zqkwx3bwkc"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.31"; sha256 = "0zfhjqya1lnqz1zd9pw9c9w6ldvv8hgg76rh3qaxwfgmnp808vn0"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.31"; sha256 = "1fx08byahkjv797jnql3c7j9ldgb2w4pm9vhb326mpna28x3qgmm"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.31"; sha256 = "0m339qyn21782x2fr73bbxk6aa6dngfav0aqlpbx1gpr0k6xb26b"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "3.1.31"; sha256 = "1wwnzqb9xjadkgz4h6fmi7n0prp8v56cjfx1si79v96f3l9qrasd"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.31"; sha256 = "0zwvrnqn4w38xgall1791msd9z0nr9xv6rk2xy6i1qbkavz4fn8p"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.31"; sha256 = "0dyvsidj5g6rj0khakzimzn193vkgzzciyfs6jqa03mp99zvdl8p"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.31"; sha256 = "0ch5a8xpw89maq8lhncwp1izy16mwpjn1x60bfhzyskib9w931vw"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "3.1.31"; sha256 = "0zxfclfjjcxr33ialjxwihpxvp28by1zrv6cmja0jp71kr882lq1"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.31"; sha256 = "1is7azrlb222wfljhhnrwyhmrrc16d5hy8dadrx3s3h73bnmfl7g"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.31"; sha256 = "101ws6l12rcf08r80d02bya2wmwsaajnhvl4bjprakfiy4pz4laz"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.31"; sha256 = "0k4fx1bnkh3420234pnqm227l30rih8s9ld0zpb7rzpby14dclar"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "3.1.31"; sha256 = "1lsf021hw8ikwic1wdv0r1sdm4bypia9xcl7j01mllihs1idkadb"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.31"; sha256 = "1ccf8zdc1h6ri79qhj7gnclw7pyi08qa5kb2fr0m26zdd8xsgqbb"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.31"; sha256 = "19ffjzqvdfmz5pfrk5pya2wvw6734mn5dg424sxgpbr1228bayai"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "3.1.31"; sha256 = "0pra9gpjlndzh8hhjpxsqjl2awqb7lkp868jiljbv7a0hhrj7aiq"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "3.1.31"; sha256 = "0yj7lw8w74cfc2q2dsz1qhqdw9glxs6narsqk48r80ahfvrbc5kr"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.31"; sha256 = "1mh44i5b204q8kf70ywvhgggqf68b48j9y0d06wvzadnswakqd56"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.31"; sha256 = "11rysifqiysmajaipjg3hcrp3glwf6zg6ijvld0nsxwf3w4pxlvj"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.31"; sha256 = "15hz945p1wr4j9b7qp2vqwd5mah464l938d14ldckhjr3di5c6si"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "3.1.31"; sha256 = "0y7mqvxyhhannk11ky2i4gr60wcxaybv3ni4y7ydfd31k2baywf3"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.31"; sha256 = "1njd0xvn780rg2jvlyvsw7kaxi80qfx1crhsbihhgjnjx4199vgn"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.31"; sha256 = "162589081jp4nn8f2cq2d8mnzppmdw1zclnd66ablxm4dwz2xrij"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "3.1.31"; sha256 = "0nnd9kcz05j83qyyz9xbsyxmc6x872ai4bc45ificxh0rqa7zk9n"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "3.1.31"; sha256 = "1s5p5iby2866zzfmzd0x35aclgzmdmghp9yqn5am7bklhza4dls8"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.31"; sha256 = "0h1nhmmjs55alphb1x51namkaivr64611bn0080hi3kizrmiwnxf"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.31"; sha256 = "0sijpj15qjamyc9s8rxbqazi469525fzc7q81v9jw866x4laj4ms"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "3.1.32"; sha256 = "06ws70zb4p4wbxx6f9bxk8dmighk8h57m82bnsss5cajabhrs9ss"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "3.1.32"; sha256 = "00ha2sl4gvqv68mbrsizd6ngqy0vv6vamngzjxr338k1w7a276dx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "3.1.32"; sha256 = "0rvyv3mnb2fgj619rnqixfngzybhgqfr5mnw3s43v9mlg45la8hp"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "3.1.32"; sha256 = "06xbkmplw7vkcsacrcddnma3hawqgdk2hj9ayjs0mhb31n407j3j"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.32"; sha256 = "0ywz63q8vrdp25ix2j9b7h2jp5grc68hqfl64c6lqk26q9xwhp9r"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.32"; sha256 = "1crk54a1wvj76s9gnh46pi7wk8ryympm9xh2jq4s4rpp329fqgic"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "3.1.32"; sha256 = "148pspjlx85yk95i6svhv37g483wmbinngd460p1ak2di26qbvk8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "3.1.32"; sha256 = "17hbn0qvnclhhp6pdygia124qi46lm7r3ixkgsnbsmh7a5l02f84"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "3.1.32"; sha256 = "0m6qq8va2fd1zns85wlm5arhcg57hf1rfj3801v27hvijfsmcad3"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "3.1.32"; sha256 = "0868nlkxi7sy74g6xrvlaiqzs2h846gq52wcmgapsq202lirnjzh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "3.1.32"; sha256 = "1yip3i79ljg2p23r8ph6p77rdmwm6h6gnlc3q2cikz07vib41042"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "3.1.32"; sha256 = "1zygp70xrk5zggs3q4a6yc6jfdwzcsjjsapqpwn6qyx35m69b72p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "3.1.32"; sha256 = "1cj8wspslr17pbkh50xfbmwcicy9n2z9ha027ssfrah8r488d9sx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "3.1.32"; sha256 = "0r5m0837zx2shp9bfgllnhz85h5792pbsacnk7lmmpgld32crzdx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.32"; sha256 = "08sar3s7j6z1q5prjmz2jrbsq5ms81mrsi1c1zbfrkplkfjpld3a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.32"; sha256 = "186gjn8sbhp4z6pq8fw4g8nqk9dwyaplwvdz2y3fbbvg36lggsh0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "3.1.32"; sha256 = "1pbrqyd43b3fmd6vk2wph726z6yddazp04ycyxbn5dh9zw8f2k55"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "3.1.32"; sha256 = "0i7vv4zvv4aixgdkskza8x8js4bnj5q4mnw0qdb7dmdypf34s2fm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "3.1.32"; sha256 = "0fk77ij5k33gjydk51gw7k639mppqkyhgarch2701i5wciap2h32"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "3.1.32"; sha256 = "1q36zbrkbgwg5wl7gpzmac79xvwd74zzqg13hrsldwfajmnwvdkj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "3.1.32"; sha256 = "16pgzx3gxgvcgb54z2sd48x8jlz4w242gf68s10ghlnqiiggpl4v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "3.1.32"; sha256 = "13pcn74z1swz73s72zjl07f118j35wacnzgk7kbjqn83nwgqdgvq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "3.1.32"; sha256 = "1lxvj597rw4srkhmx83p1hnf71dcmgg93k982vnvv89xmyvvyy42"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "3.1.32"; sha256 = "07rmk5l0k66x2ilm3r2cpl7icgdzpqjcnrhw89afm9z9w06zz78g"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.32"; sha256 = "0mmc57dl8plrspdxwb7209wz29vhiwqds4nfbdfws7zg35yy70c7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.32"; sha256 = "06bk39zcv27cwshjsxfg5d6wzkkzdhfk08sipdc7mr1s8pk7ihi1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "3.1.32"; sha256 = "00n05mi9zws7v88jklyw1a8cjjslx8nnbby1nyxmi6p2acbx6pxp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "3.1.32"; sha256 = "035rs89y8j9v0mshqhaiyydv979x3w1204gcdp2kv2zhvfx1gnp2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "3.1.32"; sha256 = "0qsm03gx86fqx8vadnq3nsin3m3falidib94pc3mb3fy87mapvqw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "3.1.32"; sha256 = "09r2776wbcmn5jh3nksd5ilzv6rrlic938b87xy77awqg251y017"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "1q09dbbx9kd3k4v8wg75llvz4332b5qsvblva7mhslbmyv47vfiq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "0biy6p7kvcjxdn67wcmwyrfvv7pmd5249fj3410pw4xi8svjpxnj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "1hs2czpqwa92x11d49m5dprjzr8n8zi5cx6cq8rcnacpynr19ldm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "1kk8116pvl1jc8k59338hqhbhs8mbnb7kv108xmzbqzygsfgcvb5"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "05yqaxrd981aw4mjg80n19506ls6ni3sy3w0fwiygblaffidj8h3"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "0p82n92njjahhndawz40jq8bf2smw1c61zm4hq3zi6m5f3x0qc4l"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "0x43pjvd7c58c7230i6ga7d4hidd258aahd9d1z9590z4d32v320"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "05mm56j8391rh8zghrdyrnxnbxvrmwqxy3gn4blyf8rb9xgsy78j"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "1pz1p935k4y06q8v9z44qwnc96anmg1r2kfrs3a0fbyqn0qkc4i3"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "0vznqq540gb9idxb4f0l26c2g8500z2fkx0sxrmnla91c3yf9f6c"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "0844r0h1pvb5mvl5939z37nxjb380kbjjf92g64d110bs8397dw3"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "0zr31wppl255hwlhrab78h7r2l4pfz8nz20s66j3xi2w9pvlsprd"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "1g3gxzn035gyq7kq2xwn51vz6wk0473qcq0yi3blakfrmjwdbiax"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "0a3kq34dk5lj0w7g3v3x78vkcs4jw4wjdxigyc3xwwc29rjwmy0x"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "0gygjx90ibi3xi514mll2jfnq8siy8gvmkj9ckwc904pvzy3q5z5"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "0cg209fkmmm0jfr1vj4454v482y4s4971xcnfsyx5ldvqhvq1nj0"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "05qrs75q38x0r542cgjyjm2l9nxbxmqp75nd3m2zny2wbm9zfqcl"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "0zb3qlb2c8s953ja4s8a3q26ips96czxm9xd16mair3fb8z4yvf2"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "05z3rxm7fgsmjmx5lzlihxhfyzvp16r888i4jj5v4kb5hb6y3xfw"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "17xyhgf0d3lhvyb0j6mzfv278l9iy800l1l0i5a72ihvjm4ld40r"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "0k0fng7fxssqkcywf4czpiqrfv60qmjf8pw686rmn9gqyd9y6wbw"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "1hjxa5rld8b1qx8avkc1gd7492vz51r6zqmbqadv1kklg4bf68zq"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "1kdcjy2c02qm0rkqq262iky40vmn1gnz0p1817js4b8a0ha13nl1"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "1q31a7gwl5nl0m4wizbqdd67k0xgrmdbf2wdsx9vx9i3xfcjj7js"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "11p5g8ar7x1czkl32f2s046zlibqqx28b499yiv7snngjcs9fgzq"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "1paagjfdsg9q0aknwipcds4chn8nfk2y83yhcz3qhi28pzpgih53"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "028kccjihxlyfv2i988g88fw98lhsidf7jj525w96wf9rgkl3m2d"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "1jc46wlga8r2nlmy0rhqcrxa2vp677340wiwl8nskp1sb3ci0p8m"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "1m92b4z727178lnvyh9sq1gx2ncs74q5vwaz4nivjh3fdq1qn9dz"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "0grk5axlpzwks3p42km6jy0r82ahcmgybgq1vh61xj1nzna1l3fs"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "0hhk71dqy5plq64ml3jc810y2lyq404k4aynv6y4g5j5y1wycx3s"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "0j50g2gjb6qsm1mp6g9bkvjjrih6jbisns74mghx92hk8q9cbq6v"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "042bjis2yrvsnaviijlpfi0lgp2ds8igsy8cdhbk3mzi9hcgmilg"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "1y7m9awpcg2ilwkn712sg2hbhqq97yf5s0j9bvrpgb6xh0pzk1f3"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "04rspzr88n1dy86v2n5i8vxkyyxqvw9qfgizzxav8dqsvd9yja41"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "105zgdvfx7w1wxbxjxhwjai72gwk1hhi0hjjrky261ga63j5akgg"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "08mizsssb84saw1sd51qvh8inacf6m6xbhpp6dfnmxszpamrzc09"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "02k2fhdb9p6vrn1v4d8fjpqy6a89gmrmlpf477i0pir42kwx7766"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "07jx0syqg5833g3rlmca692cry24iq9mxh6fa3w3p76qxx8aqlmg"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "1lhjckbf4679k8fmg7piqizix6d9rs9dgm83kjd3c9cd3m7xg0ky"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "03s5x7b38mx5s4684jmdlrh6cj5pjyxhs37bwq5jdsip9a24yk5g"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "0pa43dy3fmsgwmhp8xxsdvfbm3qagj4wlqcbcdm3rhk4i3ww88p3"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "1mhzxyahgqabc4gxmnxfyjpb7bp4asac1qcjja891fp23w4fg0gn"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "0c80n8gwzj5dp1ss1hcb8ah8ah0acx2k277pxzji6i7jxaq9wpdv"; }) ]; }; } diff --git a/pkgs/development/compilers/dotnet/versions/5.0.nix b/pkgs/development/compilers/dotnet/versions/5.0.nix deleted file mode 100644 index 64da95920d5a..000000000000 --- a/pkgs/development/compilers/dotnet/versions/5.0.nix +++ /dev/null @@ -1,137 +0,0 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }: - -# v5.0 (eol) -{ - aspnetcore_5_0 = buildAspNetCore { - inherit icu; - version = "5.0.17"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/a2b96f83-e22a-4fa6-a10e-709b3effac9a/0d6ade6c0ceebc8ef7dbf2b1a6d86f17/aspnetcore-runtime-5.0.17-linux-x64.tar.gz"; - sha512 = "d8e87804e9e86273c6512785bd5a6f0e834ff3f4bbebc11c4fcdf16ab4fdfabd0d981a756955267c1aa9bbeec596de3728ce9b2e6415d2d80daef0d999a5df6d"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6eb8aee2-cbea-4c4f-9bb9-ea6229ec229b/d6c438e5071c359ad995134f0a33e731/aspnetcore-runtime-5.0.17-linux-arm64.tar.gz"; - sha512 = "ac1a9d89f1b730dfdca9c2e48373ef21f8f9316014eefbe6b11516f8195d3b3efc4e482883774b74ea2ff1cb77174a2cb471bd1157ab5b7d71621e3026c38e9b"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/25e4817f-6fd0-46dc-be0d-d819445bac5c/a8fa228c872df683741c8a79745f8fb3/aspnetcore-runtime-5.0.17-osx-x64.tar.gz"; - sha512 = "bb0c43c723090fa2d8a0255e6fc8c004ebe7baf2d5d56e22ad2e6336a67fe415333d451e459c8857c0ccb5819d998232c9617bf45f222559d4b8891b0af41f20"; - }; - }; - }; - - runtime_5_0 = buildNetRuntime { - inherit icu; - version = "5.0.17"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e77438f6-865f-45e0-9a52-3e4b04aa609f/024a880ed4bfbfd3b9f222fec0b6aaff/dotnet-runtime-5.0.17-linux-x64.tar.gz"; - sha512 = "a9c4784930a977abbc42aff1337dda06ec588c1ec4769a59f9fcab4d5df4fc9efe65f8e61e5433db078f67a94ea2dfe870c32c482a50d4c16283ffacacff4261"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6690730f-cf10-40f1-9d4d-4c0d002f22d0/e117133858f190c169873200b8d7b9d7/dotnet-runtime-5.0.17-linux-arm64.tar.gz"; - sha512 = "99cb11871924d3abedcc9c8079c54bc0c550203c7cbe4e349ed70d4355f40e4620b68d90b797e6461d898c06bed6953580e2cd4ad01483e5de107ca5a3409610"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/39326cf0-dc7f-42a3-9f7a-fe30c75c7a7f/33cbce552148e13d47120fe4502f5b5e/dotnet-runtime-5.0.17-osx-x64.tar.gz"; - sha512 = "31add512418640f98bc9511509db2049a2674c7725169d26be89218a02ac7972e03e5d6be5a3d45a0dfa764e6eade503a8f4957b7b198ec6ad412e423d95f1b9"; - }; - }; - }; - - sdk_5_0 = buildNetSdk { - inherit icu; - version = "5.0.408"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/904da7d0-ff02-49db-bd6b-5ea615cbdfc5/966690e36643662dcc65e3ca2423041e/dotnet-sdk-5.0.408-linux-x64.tar.gz"; - sha512 = "abbf22c420df2d8398d1616efa3d31e1b8f96130697746c45ad68668676d12e65ec3b4dd75f28a5dc7607da58b6e369693c0e658def15ce2431303c28e99db55"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/d4b71fac-a2fd-4516-ac58-100fb09d796a/e79d6c2a8040b59bf49c0d167ae70a7b/dotnet-sdk-5.0.408-linux-arm64.tar.gz"; - sha512 = "50f23d7aca91051d8b7c37f1a76b1eb51e6fe73e017d98558d757a6b9699e4237d401ce81515c1601b8c21eb62fee4e0b4f0bbed8967eefa3ceba75fc242f01b"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/4aeecc7c-7ffa-418f-9362-cf5eb3ed0396/055d5e6064a9fdecd7d906f5f262373d/dotnet-sdk-5.0.408-osx-x64.tar.gz"; - sha512 = "3fdd4deac2809b00c0f669d5488000ac1b9a47dee6ab7b31167d7cec4759a10ee347fd4f52090a40684e5ecc1e1f57eb99c558e561edfd1436a2f77fc1c1a0b2"; - }; - }; - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "5.0.17"; sha256 = "0mfawgcc23r44a1r7ynafxwga6jzn0f0z5ys03qssrvlcdsb376x"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "5.0.17"; sha256 = "183xgqzlwd5lhacxdwcjl8vcq7r7xypv0hddps9k32mmmwf83d8h"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "5.0.17"; sha256 = "0i5pp1smjkyhiyhcbkyc3cxz0sx9204bfml8wsdy7bxznbh2gkmw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "5.0.17"; sha256 = "1fmd9jq2nzy63hjh4sa6zl636wpgwr3r8ahzln5w14m9k87lfdbk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.17"; sha256 = "066fwdlssbv556zd9w1x87x1j8j4kafj9rxyy0692bssdb4gcyc8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.17"; sha256 = "1qvvqf8mmzzc7a7fhx324dprnbxhknr3qxspb2xhsn3yyg44xn2d"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "5.0.17"; sha256 = "1gzf2gv4z9bn1cr1kpqpf1jf7m0p0wd1pxq5ndylq6bw353yglk1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "5.0.17"; sha256 = "1lml70ln9bfjrfjf3jbxfzd5kgd4cp4h7v052md5ja364g7lalsy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.17"; sha256 = "0j90fri15c05lw96xybgvqkysfm7g8grhkrg25g75vhi6ni2ricj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "5.0.17"; sha256 = "1bdb887xvgxsmphys83zp9skn848p1r8viclc8p29w1rby4wi19i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "5.0.17"; sha256 = "0y90p765sj54clf2bwrka99w73g8b9550b4qvyilqggzydl1c1hk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "5.0.17"; sha256 = "07v7vyqm556xr1ypkazfp6gh6drgf20zkwbhkpja8bwdcr6lphbb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "5.0.17"; sha256 = "0sbzlzhazh31s63hw9553hk9j56fxssncmfgidiyh0dg73aacrsp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "5.0.17"; sha256 = "1qxphvlr882rvmj71y2imnf6r3hh4ln2n138qjyv1z129dp2g4y1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "5.0.17"; sha256 = "1lc2jhr4ikffi5ylyf8f6ya6k0hdj0wp1l0017grrwd4m5ajj4vv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.17"; sha256 = "02g5w41ivrw3n6cy3l3ixhcl8bw1fsv4bzs2m34k9h5fqmliaf3c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "5.0.17"; sha256 = "07rfkxpf6rp8x0lybl8hx40mk09w5gjrr9djkjcp8lvjgzidnxq9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "5.0.17"; sha256 = "1i7wka56n3akr96jrkj37jx98bwxfzhpx5705930v50izligd08x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.17"; sha256 = "15f1kqlpp1d05dhg3dfya32vvzbpj6c7gxds947f10jb0hqlnhdj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "5.0.17"; sha256 = "1j1334zxv815ksdnllnbwwsbwnimjlpknjmqy1riy2zpswxlfkz6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "5.0.17"; sha256 = "0mmgd6nacx4fzf0w02ch0qxa43vrv6wfspykxsy2bkpvrnvr8xr9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "5.0.17"; sha256 = "16whaq82pj6fqa0vam3a0va9ly843aa1z12hza040vn6252kk9fq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "5.0.17"; sha256 = "1zavnwqvn2f7lhb880wgv02anrvqsh6l34w72knwd31irggph08l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "5.0.17"; sha256 = "173r2srcbad2prrw3l914scmdks3mghxgszvlwypdjnv0f2szgvv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.17"; sha256 = "0jgcfs3jc98jfyaaamssznckbpnaygplk8pjsp6dswpansz5bnnq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.17"; sha256 = "1ph5kx18syinp8bpzw80bgq3njl65gwzws727xcmxnysgm7snmjp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "5.0.17"; sha256 = "0m4jhn70parwnl18fql0sk9sf14y8cf08xw6x2cm5bfhnc9jvjny"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "5.0.17"; sha256 = "1af20jkv73767b4fy18s2dvjncaca1ny0csyr7wbhvqfs59y3n1x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.17"; sha256 = "0llhsi03wyp2yjqy0snywqgwjgam91i4nsf5lc9kaxkk5h6vj1a0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "5.0.17"; sha256 = "0xvprbjwd3fymddvavsy7wk5q2hp45hdi10qz4rdbmns23vqkzmf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "0vhvxpba3i9ffp4gp56l3rnlhq9yg07n3dv5qi89zb90vgyqjh1p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "074c9byxwmndfdavxn103220f5gklaaxc9wj7zpb5v3yr3ads30f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "03jkkpsy2zjfp722fa2fcnpk2g6jzy0bn9vip5c39k78y5pz29x6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1ih6c104skp9q17i2dnsma45l6nv5c62vv2i1988dcjw2v0sl98m"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "0gwsxd1l0n32xnw0lyjixj2634iyygdb8pd7chydsr3qk8njxnpk"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0x5dhn1jkwqnd0cki1vi97rhyfac6w79hvh9dxvnkn2k04sbps8q"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "1ipx3qn78z6gi415c4fa9wgy8k75aifbml6ys1c9ghl6yxbv0fd0"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1wgbx648yndl0hh8vx6sflfwjyr5pfhi7vj7v19l6vxnrr1096w7"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "17jc8jc2dk1g8996jpq3k0g6c5inijivxkbz0grxrgr5jbyiv19y"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0ydn40qn6cs6f20byvmc9j008s6csxjbh6jh5w4q995vipcmcpcj"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0bw08wlf96vcyix850y8jips1glrz2cbj647af4d7gggw8p3wwzw"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0xsqyw848scwcz09pgc719776q712xabx4xv47srzij34p2pq7np"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "00b0vipypjai4l8icr74kjhglxx2xlc3nw3vyiwisg52l9zyby66"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "1cdgd4p5zr1mzz9hlb5mj946zfa1vn9wya5y2bhqn9y4ak831wzp"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "17v8m4fxm4q40z49a2h4lw9dawg6pwfv4s2dskzc23ggcjgr6dp1"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1fbqi92prqmvxx0rx7vhl10l665jmmhb2ng5jndimggydb0ckpqh"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "1rijxkzzk65xs9z2ygs13h0rhw1cli5vwshmvs1gfnwhhn8ic0gx"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "02mxvpm2zs5jvawigvxlnrw6si4zwj6qlcas99m9xdmm8yqq22cm"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0c1lcl3yy88vdfw12c7h0ww596qfjd5f8l2mn7mlqs6i3f864bkg"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0w0wg9ah7vngvpyds67l6qhizpkdf2r6m6cqyyvv3s5dw5l8rxin"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "17yy7605vkfz0f4h58005gdfg6fnjxlcnq0vg0hrxsgbdqmd7p1i"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0av25fgkdl7zvn44wp8gqx2xl2mdlv1f9cgxzp7xk5yq8f7ynxpq"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "1smhmdfq0jlv1gq18hdaj0y9yzkvqzmki19c0b3j5b76yxxxpbwz"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0n0cdb9zpdb4h4v6r265pqmqg8c94ydywvna6jp1c6qhqlr0qk39"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "1s2n2sx29c8rx549zizj8yrddjl98a7vwvxw56y0jvvbwphr9gz4"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "19m66yvv0hnmyrmx2l4drbls0fcib75fxq2csdx6p8gd54bnrsh3"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0bcnlsxcrvhybcjbb9879njx0c4z76y7djx4643g1rpjnkcrj9ww"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1bf95h2f0dmpmv7z7961zia5vaqvmjq3wkf6iil9jxv4z674624w"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "02q593q09mwwh23m86048vc7b7an7pqch5nd86d4hxzkamnpnpsa"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "16vzxywfj88gjcwfnmcb6b50ld8dp46i4pqiwwcy7yz15xgdhbm2"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "1ix5lg2j5ihdfp9j3jdxc042g4syjzc4bafid465j52h6znsm6wm"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0w30v8r26cg427n5glm9nz6r10baalkqq5icqqxkq71hmh8fsjqb"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "168iq4hdp6bhdpgqa1mir1bygmh2ggwkys1r82d6kpl2lzbxjy28"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "18jpw2wbrb1b941729lb7hiq4yfq2z53pcxwz4mpgawnr58y0562"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0ig464fcsj2jr0p02f6slifwf1m0408g95npm0vccf5ww1nbgkpi"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0qj5avmjrvabxzimprg4m54k3p6zkwrhbpv0byc8c9gbi47s323j"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "05ghz164lpff7n8mrxs7jm2h8n3clsg4w953zrag3k5ry9j36m9c"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0azgs542mbg69jlc81529i2z5m728w8sc2i9m5dx15hvxqqqcjiz"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "12n1kcgcv5z8hkvjqfk0n705kcipbai4sgcwiimi52xpaf34xw8m"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0b1s2m0a7xcdzfz22x6k7v5hkca90azdjk6pw7wwdnvszwq26nxp"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "1sjpq07swgj0isdgyh6p2yb254qb9781lv44xfhj6nz7mx2yhdh1"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "1gnzrqdp26d7pwwz29gm4qb09n2zsb767qkhbwkifcsyxlwi6m0f"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "089jww13gaf7x7yd9d3qkyx9iq8abcp3r147hd9nblh561c9bzbg"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1nycl1rayk0fhaakpj6q9rfp2lv3dpl7pziavmd9kcfryz952ff5"; }) - ]; - }; -} diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/versions/6.0.nix index 69d94b1d6916..97191e734617 100644 --- a/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -1,174 +1,174 @@ { buildAspNetCore, buildNetRuntime, buildNetSdk, icu }: -# v6.0 (lts) +# v6.0 (active) { aspnetcore_6_0 = buildAspNetCore { inherit icu; - version = "6.0.11"; + version = "6.0.13"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/0a17a9f6-7705-4b47-aead-c0b582cad317/158b62e5183281e416994d56ce81bc0c/aspnetcore-runtime-6.0.11-linux-x64.tar.gz"; - sha512 = "12a30719aacd5b3dd444d075c13966a4bb1dc149c36bcbc0e685730f08d1c75eb3929749b89a88569ddb48bd8104db84aaee2ee097ac3a5fe6fff60c9f09f741"; + url = "https://download.visualstudio.microsoft.com/download/pr/a2234b85-9050-4f90-9fc1-695a428167ee/8d5c3cf8f557e14c7c43965b7cef9c41/aspnetcore-runtime-6.0.13-linux-x64.tar.gz"; + sha512 = "96239951972a04021b1953581c88a3e1e64553d05278fb92729c62827f38eeecd533845d6b0d3e9ba97e9d19701b9ee8e5c02d1ee54b8c14efe54c08c45c15a0"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e25f7ff2-9932-41dd-b549-5b4409b5a727/d00786aeabad50cd661e959a576f8777/aspnetcore-runtime-6.0.11-linux-arm64.tar.gz"; - sha512 = "cf2a469cc2364358e0cd51640e9a614747e60724a99d5151dbd346eaad3779939f741f0cd0a752774a6df51c3e2af5a49ba8e4c5ba7ac02eda192cb7b73d85f7"; + url = "https://download.visualstudio.microsoft.com/download/pr/b675e6e9-652b-42a6-a9eb-2813b90b41e0/88ba0bd190041c1db8a681bef7376ab7/aspnetcore-runtime-6.0.13-linux-arm64.tar.gz"; + sha512 = "72bb5a366fda26eb820c181dc76e43d3fa040feedcc76dadc9064b924c98e2c31c4d4f53e6cac5c325bbd3640b71adde2c605c4cb488435515049ffe9221864c"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/16a48ca7-a75f-48bf-a513-ce5721debde1/b55c60cfbac77c576fb0161a4d4ad8af/aspnetcore-runtime-6.0.11-osx-x64.tar.gz"; - sha512 = "cc5d76404fd1a352404597cfa36def6c06018aac9f53c938d96264fa057534364057531d91c8b0ecfb2aed6c2816ce32c0a67bcae39da241c3ee36cdd35ebe9c"; + url = "https://download.visualstudio.microsoft.com/download/pr/6f9bcb00-fa3c-44d8-8f9a-e4a256f20e81/bb989e5cc189e4b51585b4b78024a060/aspnetcore-runtime-6.0.13-osx-x64.tar.gz"; + sha512 = "9e3608fcc6e8d9f6139d3ec186b253f13d9027eac322b9cbf8ad8f9e72439a95abd0bffc4d63f427b76186f4386c8ffe613a9bcc44cb2448e9ec9be31a2fdfaf"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/4bb8e524-4a1c-403b-adef-362e13b22fcf/6304e6772640e07412ccfb9a0a5ec58a/aspnetcore-runtime-6.0.11-osx-arm64.tar.gz"; - sha512 = "e52add6045fd30482d3ba1703b41d354f38661ac9f88b1b70aa31d4ff5bc685b8767579b172519a4471beaa3cfdb346f46298da369a5714923937f1af03e353c"; + url = "https://download.visualstudio.microsoft.com/download/pr/e687d28e-8121-4099-b505-f52cd856f718/1089325f2ab576f007e246ceb174e276/aspnetcore-runtime-6.0.13-osx-arm64.tar.gz"; + sha512 = "869c2cbda288ff97f470e3c79bf63f33fac30c8ae2740f849254c0f14c7e694d4dd0e3cf283965d620fe86ab8742ea00e606da0455d683fee4dddaaa15d658d1"; }; }; }; runtime_6_0 = buildNetRuntime { inherit icu; - version = "6.0.11"; + version = "6.0.13"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/367108bb-8782-4f0b-839d-c98191b7729a/94185f91ef33890816a5846a374b74b7/dotnet-runtime-6.0.11-linux-x64.tar.gz"; - sha512 = "9462d73fd3f72efaa2fb4aa472055f388da4915e75cfc123298b3494f1dfd8d48c44bfa6cd5c41678ab7353d9085d05dd7f1fee0eef20c11742446e3591e45df"; + url = "https://download.visualstudio.microsoft.com/download/pr/2d8697ac-0b1f-4dc8-8c1a-3748763d5c54/c493efee79b0c36c4bc8d3c5039f27c7/dotnet-runtime-6.0.13-linux-x64.tar.gz"; + sha512 = "af52e1df5e48a1b7465f8137048e9ec292104526c65e415055e5f4630a13f1d4974ae831a143dd4f17e2a813502d90e2c0aef37c6b1eb7a23d01af7ffca5400a"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/b02be36b-8470-4b81-8254-1f957ce8f397/fd6aa0da17fc51c1b57b2d96aa792c1a/dotnet-runtime-6.0.11-linux-arm64.tar.gz"; - sha512 = "c889e70ea0b2224eb9163cca6a57cbbbbb8213a551770dc5c9f08d8d49fec1f38ac4802435cc9509baa03970823666fe1dd80621e6ee8592c27b7e639643e5d3"; + url = "https://download.visualstudio.microsoft.com/download/pr/79baf344-68fd-4fdf-a279-8b32116514f2/3f91babc487289f63c6f423da0a397ad/dotnet-runtime-6.0.13-linux-arm64.tar.gz"; + sha512 = "f70c8e51c06f9563f33a9a1486fba1487c7ca8f2f77a2de02d382f82bb041b6c432b9cd3a399a4a4e0188b8aa96dc4cc78e9147fa0d0c4fca7fffaec55c38903"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c9bd7b7d-8dbd-4486-b3a6-d3bd29e9efc1/4b2debd5a8aa0812cbe19cc6cae26066/dotnet-runtime-6.0.11-osx-x64.tar.gz"; - sha512 = "d8df6aee071b9c59672df6c67cb56c87796d9204a5fb044bd9e7a6fc7d5f83c84e0ee5ec871d57f38a226f57c70d18e52cb35a6520d26d94b335c97a860e6c01"; + url = "https://download.visualstudio.microsoft.com/download/pr/398dc2ef-017b-4e97-8d05-cde933894da9/bce7bf77230301570a1af839a4ce09e7/dotnet-runtime-6.0.13-osx-x64.tar.gz"; + sha512 = "39ee6b678cd6cba46acba9a616df18814e1cb4bd94f276efc5e6e87644f48ec427b155a8e31e63383b3b9281b2f7f6fa73e3be682df65984b11338c5fb12fbd9"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6fde4997-8628-4666-8281-6aef1322cda3/f9ead70f42ef845bbc5c17d53b174931/dotnet-runtime-6.0.11-osx-arm64.tar.gz"; - sha512 = "0fe0a7f88a1c99b682a0f60d60d6d1954b9ce185450fc21e3700f1e0b2b1b58ae7412cd43636bc7e7ef9d1412d38661df772c946524c5659d05b8945fdfb468d"; + url = "https://download.visualstudio.microsoft.com/download/pr/98cb1adf-c95b-4ac1-82b7-54c6ffd7c669/617b0dbf1ff662e78a6eb49b5423f304/dotnet-runtime-6.0.13-osx-arm64.tar.gz"; + sha512 = "73df25201ec16156ae57569308e1d620ccc1a28c86c2485c337a3a793e00e2ed2e2eb991ddbabf6e5db310c8e492eca5f0e8297144c4e10afb5b8c323bb75390"; }; }; }; sdk_6_0 = buildNetSdk { inherit icu; - version = "6.0.403"; + version = "6.0.405"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/1d2007d3-da35-48ad-80cc-a39cbc726908/1f3555baa8b14c3327bb4eaa570d7d07/dotnet-sdk-6.0.403-linux-x64.tar.gz"; - sha512 = "779b3e24a889dbb517e5ff5359dab45dd3296160e4cb5592e6e41ea15cbf87279f08405febf07517aa02351f953b603e59648550a096eefcb0a20fdaf03fadde"; + url = "https://download.visualstudio.microsoft.com/download/pr/c7f21771-9b09-4c81-883b-90dff8760c1e/fe992d38a94cc6f301c0236db3920c0a/dotnet-sdk-6.0.405-linux-x64.tar.gz"; + sha512 = "44e719c67dd06c73a8736ab63423d735850bc607adf4b8a9f4123945b13014f8144b4fb2c4cfe790d323106b7ce604388cc5d617bc153fd7820878b9187a2cd4"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/67ca3f83-3769-4cd8-882a-27ab0c191784/bf631a0229827de92f5c026055218cc0/dotnet-sdk-6.0.403-linux-arm64.tar.gz"; - sha512 = "fe62f6eca80acb6774f0a80c472dd02851d88f7ec09cc7f1cadd9981ec0ee1ceb87224911fc0c544cb932c7f5a91c66471a0458b50f85c899154bc8c3605a88e"; + url = "https://download.visualstudio.microsoft.com/download/pr/c05dfb39-64d7-42cb-8caa-d669c0509c9b/d498099b33fd336d01e28c38515cb21d/dotnet-sdk-6.0.405-linux-arm64.tar.gz"; + sha512 = "6c31666a95817a7049bd47717c9cf9ab159e94e90987f46883e272dc6dee92fb0d890f4e590faca4458cd2b3943133fb2fa58c2fc175db98d4c6c531f6b2c3c3"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/fdbd3d94-ea79-44c9-bf84-ca161871ee50/6e4b47c4926e30251a178014fe3da399/dotnet-sdk-6.0.403-osx-x64.tar.gz"; - sha512 = "8a8b6f86f09d0c5a8dbc35f6adbb14cbb2ed10d1bcee0a15e717a416c759f824b2453fab0b76e0826c149612fe2fb8bdfc3f8827383dd3f8f01ef5497b85d589"; + url = "https://download.visualstudio.microsoft.com/download/pr/3c785c12-6a6b-493c-929a-9a3f3dc568ad/6290551f01f9cc31039e70771d05aeec/dotnet-sdk-6.0.405-osx-x64.tar.gz"; + sha512 = "2a6050d72b3b453e8f9fbf73e40c1fc10b148c7cf6b5e6c30dbcd322567dec1450813b514361015629ec952718a61a5f3b8d67db9f0e7a32b149fbd874511c22"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e825e710-a4ac-4bf8-9777-36aaed9ba8fc/1dbf807664c030ffe386453ed35030fb/dotnet-sdk-6.0.403-osx-arm64.tar.gz"; - sha512 = "1210ec9341f7ce192b2a006b1e5d98385e1108d016b0db3c6eb5ac5a1ecd6c9384fe26b62363d3a885e5ba26ec50cbe483970563e897bbb274568990aa43810b"; + url = "https://download.visualstudio.microsoft.com/download/pr/9ef6ade4-4d92-4243-9e26-748a7c75c490/ef308e5e0bad95bc604fff5c5defd42a/dotnet-sdk-6.0.405-osx-arm64.tar.gz"; + sha512 = "fb1a66189cf54b14d1176ca9178673bef55aebcf16ce7616ba6b2d988b3152be7ad6d230d8369fd3a503f46d1f22d9074da8a48837118648821f7160f1c5533f"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.11"; sha256 = "1z15s89x44yxv80vm3wnnlz09ljalp3aifybs1pd77967ik3xyq0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.11"; sha256 = "1pw25rnw5nm51wjdjbrhzhz9v0c8gjjqn2na2bam3c5xawvnqkqf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.11"; sha256 = "127hcb0fwqhxwcwkb1dy77xqm3vr29c5710n3y6jhk0p4sydnrf6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.11"; sha256 = "16f24lrvrzg02p4ynl69vxq2v13a653pl0i6d1pkn0248mc3h7fk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.11"; sha256 = "0vd5da34frm7avrc9d16d39s2k5sgzd260j5pkjsianhpjby5rbn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.11"; sha256 = "0gy7whqd7blj6k7zyv3bgfs2hhwxvkjvvdf4axvnq43w1sv8s92d"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.11"; sha256 = "0b29lnas3affa0xdgbnxgvcqhzs5v7b40y9kz910lf8k674qxmmy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.11"; sha256 = "0zx6hw2bjhzwlrny8zkd2223bck1cimws3pkwi3gqyajn1ck49im"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.11"; sha256 = "1yaybb1rmwia5n60bahbykn32y7wad9hqp818hkc3ypxzisd2hwp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.11"; sha256 = "06is4h5s81np7bx31xb8svzpqz7m16gxs0hvqx5ab2qxhwkwa8x0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.11"; sha256 = "15n8x52njzxs2cwzzswi0kawm673jkvf2yga87jaf7hr729bfmcr"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.11"; sha256 = "05n56w958nzivf5ysls3v5ld1r31fcxq4k3228g9mdxinswhch0v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.11"; sha256 = "066018q4cr20404gi6i4x6xmq2hcvmlszrx5nv1gr6rlhg7xw6vh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.11"; sha256 = "1ypyxz74hfpcipwgiybdw9pwqkbshbrvil0q53ln75p1hkx51yna"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.11"; sha256 = "0k8nl3hnr8h0ljw185dyhavrz2f7x6wavyadyf7f1v289jzasj72"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.11"; sha256 = "0l5yyqqm1mm96kkyr56b8l1cygs8z5jb72qd51gln47kgxxhcxl0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.11"; sha256 = "12qwrvz46ysw0537s6qax6igcj7bgydcyfskf4s1pb6yzpys84cn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.11"; sha256 = "0bnq4dj7s5mspi7f8ihpp2y4bncb229ihrcmxvifsbb15mlhh8g4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.11"; sha256 = "12g1ynar2n1jrrwa98fcp76gidj227c8swc6c3yfq4v3lgsws9mx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.11"; sha256 = "0k7yylj9jc7rzc8k014pdyrgiqliw6yq5bvqvjx7vm3k26mr5bjj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.11"; sha256 = "0pgdnbklh28hmkaymn3hz3x30754fkms5hhjpvf2f6zwxjznihd0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.11"; sha256 = "19x6xrjika4iz1xsclxcivffnml1byvazly2l16jk2g5yzab52bm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.11"; sha256 = "0rpka8pv6nhzyglyxgmx6a18qq213fsgazi9chh4x7hv0l573dgh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.11"; sha256 = "1dqx8spmn4zk6h0qvy522hf86zl5zf5k3m403rpdvqbwv5d4prsg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.11"; sha256 = "03kvh4l5j8i8263wz7fmznzf5rs1grgazrhi3ayhynvhdal04mdk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.11"; sha256 = "1r604xbnknk6xcsnk4g1g0mw3s99l021f56xf1nbalyhh85q95q5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.11"; sha256 = "1aslp6yidcmwsv9kxykl66sfgwlhi5kq1zw9fzw5mj7zqllgm4l9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.11"; sha256 = "1f60dyl8pnj067i7bvmsbazcvrjkgrz9943vjj0ym49cfyq98cnw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.11"; sha256 = "01bwpalzfw62qc708488aspyy8lpyjppj1ywfhswbqllaf00i5xs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.11"; sha256 = "1gsl464hw93vhigglhg8b771p7lmhq0h4rykjrn7x6148iswmhkw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.11"; sha256 = "19l1533sh8g7fngfxa538lg6lnga4di4f4icph0wbs9133x797zb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.11"; sha256 = "07ym9n57gr4vwr9x693f73nz979p1x839fk04yq0vav6v29s6fgk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.11"; sha256 = "0i9kmk37jddy7672k393idnzkncznim2w846zl58pmb6jdldxm79"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.11"; sha256 = "1q3h9nyjdvcr3951kbghln03fclii83dis0dknni8ygn5nc19zmq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.11"; sha256 = "0g5bc7mv16a7k02zw40i238r3f8yi6swspjba5iwisv5knp85dzb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.11"; sha256 = "0pavlb0dblfcnhwr0w6yvn169nggsr2sip0a48ywmzchss3jxs8s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.11"; sha256 = "01n24jn0i9j5mkh3nwx4l56aw2hc28gkrnfjk7b76rq2yib8dl1i"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.11"; sha256 = "0gzwa2aq158l724sl1dcdarlr0y09ll33mhihc9jkpw1y63c2y2n"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.11"; sha256 = "0aqbqhdli5daynlvbnlg5izf7fhmx2gvf97c9yj8zmvg9grqn4vy"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.11"; sha256 = "12xm1wb5k62dpzk12kmnxqqc96h5sidkbf9rghp2hab4dil7d540"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.11"; sha256 = "1plbj8s3wm77mfcm9ps03zc6mdhf0adxbjxf5k2gfxny736dpsb3"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.11"; sha256 = "10nb9ppd3ifgjaxp5q2yyc2bzw9j7shpbp4lh8r21hm4kbyly6bi"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.11"; sha256 = "1mvcnvjm97808hlq9kf2s502rf0ab5vk4bqm5x1jgg9913819i7y"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.11"; sha256 = "1pmp95dbilxsw84g4bxvibsbs0wgz5kqs07lds5raykhipvrhybp"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.11"; sha256 = "1gawsvad4kwr5z1ccsngrdkqqy8wlivk69f6c9fxnbc5srw5kcp9"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.11"; sha256 = "0qxk7r0m5mhvnb3li1yznl2dw95xl9mpkd4sk9hb15rpyxlkfqmb"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.11"; sha256 = "0xmm6y21296l40sfhxgqfqfp7fxdjva2vh6qixnjx2ddablni8q5"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.11"; sha256 = "0fxwrw3d5sffsbbwka02vwimfxp7gj1f0jf25hyaqnqbj1gpgs0l"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.11"; sha256 = "0shwxx47l4jkk757cp6z1iiwbdkiw6sb9jbzwjmsjv3m8swrr44k"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.11"; sha256 = "040zx6skb8wkdmybhgagyj9dcpj2ag9izn2ww0ak3zhbyx4n6gp4"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.11"; sha256 = "05a35jblvxmc0xdsl6gmfxjbxx473an4ha49wldcmyg0451pfkwk"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.11"; sha256 = "1s9frv6h18fi0089afs1qpm8q4lxbfphg2vfd8gkzkwj844jbbqv"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.11"; sha256 = "1c3r7v664bj3h3dch0d860ly75xbcnfc1894cj34g7a67fdhr0l3"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.11"; sha256 = "0q726zb93cd08lr8z77srxk8ab13m755817kss325i32l3zsij44"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.11"; sha256 = "0yk0alqhjna2brvkmgxzvbgja6bfq39sjh35sakglljkmxgypxpz"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.11"; sha256 = "08cf22dd75yab2y9k561yy2y14pwqmpfscssz1n46kqzmxk6zbak"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.11"; sha256 = "0rkhdp3zdc8r9k508fr7fad0j31fh7x33m9q0wg6pia4fdwvh87s"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.11"; sha256 = "10sbpgxikvngf7ddfjw0w2lm54ni6a2gh5mdk9wnnv2lyy6bicrv"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.11"; sha256 = "0sz6yxwij25rxizzbpf4ic1fm5fb2n1k63hgnd0yxshhrpp8syjg"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.11"; sha256 = "1bkka2i41x8qmk0i4a5spabv9bb2jbd12qq0ym98anky6dfvs1r0"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.11"; sha256 = "0fkzkbl12jkwgn9qk23hcz0b2ydfhq7li6frr5np0qpdc66624ha"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.11"; sha256 = "0w2y4xhdszipq7ypp8psk9xmk96pyr1227f8psrs5hdrb58ahzfl"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.11"; sha256 = "0s62ggs2534cmwcsh341jnf0d7frx3bz98h5lb6qiyxa1844na9g"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.11"; sha256 = "1h5q0836z5xn9r4byb1l0ahmhzfa7wlcd6jfl71ja2l2h051k4rq"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.11"; sha256 = "1wnk0gq69g534840ljq0drq6g7a937y3q6r17jxvjdsi3x7gi8cp"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.11"; sha256 = "1smmca72ld8cn4cj7g15xhnx9iadam1cqj1p8xxg0dwa794b83sh"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.11"; sha256 = "0rdxa2d816l3zrf8ijkq0blf685hh9nfnqsxkb96md3xkpqwimnh"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.11"; sha256 = "18hd09z977ad3m5mmhvgbwzb95m2nhsj9nad7plbsdykg8wh0ls2"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.11"; sha256 = "0p850ixy3qxmhh5xfw7wwhmdqzwcf7wxzn80fmlq5f3iwvb3y6nb"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.11"; sha256 = "18252p14vvjxm2sqbn4j122zv9f78rarzrsg1314fzz5g7glhvb1"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.11"; sha256 = "1jy8h6w6sd17l1fxh21lvrkqacj8484ymrhahiy2jjmg5axm5raa"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.11"; sha256 = "000398ffbw1am6l2jx717ny4qmf2zfpl1f8rm6mdbgghyb8if6dh"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.11"; sha256 = "08hhz84pmvnglr51vdv51h3cbw2qf6n14kq3bvwhrlhpngqs62ni"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.11"; sha256 = "0gi160mr13nkdmhk3ihn3pm8hhvll2ychrm9jyc6ii249cccn9rm"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.11"; sha256 = "19mbaafawl665xgw8451cpwcwq11jjr4pkxhm40cqvsnzk22zs9s"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.11"; sha256 = "1aiw9q7kqmwar3w4w5w45l0134xxd46hb4k04ggdzsamn1vg29za"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.11"; sha256 = "1qxb9axrywyblah8g9fcs141dclmj35wksk2izv1k030c5d7cd3y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.11"; sha256 = "0bpy6md1lfzgn5622388rb2pg32i4pvlw1cb8qpqafvms4p5mm3a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.11"; sha256 = "0mb04dsm2z954q6552al84p2ikajm6lrpsrh8gxb1iw1qabyvhlw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.11"; sha256 = "09laias011a3v854zc962lcddjkc3bif3jwsi0blyk6v1m2mf4kl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.11"; sha256 = "13g4jr43f6b83a3jwd76pxkaj71b1sqz1zwq72rk1y24likpshc4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.11"; sha256 = "12a0fqnwsnd6q8vdkdxylrzmmdwn4hfh58j1bdsii1kgm50qwmqp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.11"; sha256 = "1j64ppdvh5s3pqr6sm3sq9bmk3fzj7l4j3bx023zn3dyllibpv68"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.11"; sha256 = "03nn5x4nlj46vgbl2wkxyl6hibn0n2ry0zxxmzbkvs37mbjxk86z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.11"; sha256 = "0fhsjlqg01kxqzdippg1gz93rpd60pgcxl8pxwcgikxgbj7cy8s4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.11"; sha256 = "11pn7rikm8462xgvy92a1lkss68j47bwqik36yki15hyaqybv4ka"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.11"; sha256 = "0i2v135k2f0lbh00x1ximf97737dm81adh3z9w5sbzymqiyi8q3f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.11"; sha256 = "1ksjj7jj8wphcqxkpzmwqkj0mnyk7x4sdfhyanv1a2f3ik603q4d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.11"; sha256 = "0pj9l7fs4hpfdvl7j3c0q21f4cpf7ch2miibga01g82s2rq0vhli"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.11"; sha256 = "0imidlvxriy3yxvgn9pml3gryf025cyspq9wzyicqqaf9b69vahq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.11"; sha256 = "110x61wlvy01pln698dbmr8km1h0savpxs2rji827h3c43lgpp5q"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.11"; sha256 = "16g5vd8j9ykdr10fnbp2bw7ri6z54a1jnl6ymi7b9lc5q34yic0f"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.11"; sha256 = "10pi42nsdyr4phkyf9fyqnq2ycwi9jb8mqs5qfa8qygq44rw8ph5"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.11"; sha256 = "0ds0rlzx5xcny65kfbhgiwk1za9c4zb1pqpz5ij44qpyw4kyp262"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.11"; sha256 = "1npi6kfyhwij9qw43z179hcr2k7cayjlbacc5j8ibwxfr2hay9gr"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.11"; sha256 = "1zw93b8vrf2i2lci6137q4v12qrf30rd14a6964hzc5gyqa6d9ab"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.11"; sha256 = "14scil6kil1rv6hvfkyi980mx47xnkf3m3ms2lkgn3lkgblrnsvm"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.11"; sha256 = "1y7c0km6b2lwpxrba6jjc3pmfwhs27wp6kagir0ai4yccgxw9lwz"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.11"; sha256 = "0i9877kzl4rxlya5df7sb1l3vi2mlyrqim1ww6c1dscb7ii2qyfi"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.13"; sha256 = "0pld39zgx7rwcr0vcfrr6nkhjqjy8nzy74ambxlfavhiz7jjlz0f"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.13"; sha256 = "1a80w34yb700cvjzfcsq3c5sb32bk95ccgjfcvyqxkpzlgcc50xn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.13"; sha256 = "0sllmnnqzczvqzdwgld8s0jz49k9kzp6qh1a2g98dw8va9kkz8l3"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.13"; sha256 = "1r9v95sjjslhwvgq9jg6szkqv13m5k15yk8d98njwxjz75y8hhq0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.13"; sha256 = "1y2gnkrc788y9k79sygx7dmgkj674qwdajyrxizx0a70rwmjszmw"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.13"; sha256 = "1zkbckl43qv97jrc2lpnab8xgxdw7i27r18l6ai544rfjbf7ympg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.13"; sha256 = "0jmhv6nsx5fxg665mjqynk5v3avrlnxmzpf2m17382y0sdg3vhdg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.13"; sha256 = "11hqmm9hf4h14vcx12iz5zclamlapsjamibdj4fmdgx9gj6lmmzr"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.13"; sha256 = "0rfpd0052a4lkpd3fqpszq6cch13dwkmwgg0ljc4x7y0wq8ddqrf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.13"; sha256 = "18zm0sb9yipnkm00z1q0v3dfrgidj03jswxx132kvwfryy2dlll3"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.13"; sha256 = "1k49nrz5rw1yglkjypmmnclahib2qiwm838008yahk00ysy039f4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.13"; sha256 = "01zakffrqd75vkj590zmcr0c4bm8gz1d8g3czsw9pm706z2klsv7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.13"; sha256 = "0sq1np4y9k651cl47sp22nj1vc3qyx329jr89q4z3idvic5ivbcs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.13"; sha256 = "0q2irgcpyw5yh3zrlljv83j96h08ry26wswz5xaavhh16w0g2i1q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.13"; sha256 = "1xy7x37mkdiv907xbxxc0aijjhgi2hli1s79adqn4adw8fbn2aki"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.13"; sha256 = "0cj9bxk9xzcbvy9rk3r6xwh9cywx80ln05px7hpdxs40qhjd1vy4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.13"; sha256 = "1gh7abjpsjq5067msbixgmck1c6hsdc7rzy0kkbg16j7yzs9219s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.13"; sha256 = "0ph1r2vhnqg7agk1zz4873983qy2i5nwa10q40ba3g96rdy2pg1f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.13"; sha256 = "0k035b1cmw1bk4nmdcjkn5rv6s63l6jcsns016i6j8nxsdx5xan7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.13"; sha256 = "0qdyvzqajs4js03gs9d4r9amqz50lk99r3hz39h053506dzdm126"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.13"; sha256 = "0asqf9j5hdgs2k5yvvx3mla80l7vi68x55jzd8vyw9wcqxh07r5q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.13"; sha256 = "0kg8sxi7nvp1wmgidv2a951pjranc38hdwi51kn96grqwhnxqr79"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.13"; sha256 = "0nfb559qalhr6k2d9bp0s2nj8rn09yvl1sf3lvdiallspawj5rmz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.13"; sha256 = "0rjv4mps6w4mkp4nrrj0jmgy6ykdgwrxrg2cp3zb2mahxz7m8f1z"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.13"; sha256 = "0l1bq22d85sm36hrsmyf74hir1fj0msqv0c6d4ba0b64b3rwhvg0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.13"; sha256 = "0n78az6knnvrvbx3myp59vc25nmw34mzkhl9ayqaq25khwxicjl8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.13"; sha256 = "0i36nx014hn1945sn1s7l9kfbqn5qdy16qrhy36ixv8688yydmsm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.13"; sha256 = "0in8sk9bl2r2dgjf3ncvmqzbdnyvy2329bzmykmvsrq511c76gh3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.13"; sha256 = "1sq235gb213sal14g30x83hg4iryf4iid4412pwbmj9q0bygaf1f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.13"; sha256 = "09ngispg6j04sz5rlbhh28vyk90qyb8ix3zwpvqapn8clgpq29s5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.13"; sha256 = "02hfv113m7ig0iy1354y7h9hs8kqr0addsiplg31ibyifazwr1zg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.13"; sha256 = "1wcb1gik3njsrs77r575f893ik8mlp8q5ljg7bqyay7pi09rbkcb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.13"; sha256 = "0k543qhrf83r9bpanykp49lwkcwkmkz891c177g511vdygid7iyn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "1pv1pqr5rqlzsc73l6gn7wk6gjcrnsig50wx18vxxz9zck9nc6jn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "1r0nfv6f15xqbyjyz5b6j8lhg2645j6718d4q8jxv8f0h5yq0ya2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "0c7s3y86d9h29bmhpb1y89sw3n9bc43vjh65bjn46kfqwrf22xw4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "1rgig3239y7zzn1gjk8ngzwi140d1w7cwahlrn8zqq6dz8df7vad"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "1lvnyhidw4qp0rv1p1l8lwvkjak7pv10agclq7pgybhf7jnsrlk3"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "0rzzpai1d3mvlq1mvpsc3qrwqd5n52jq4dbcmyp422i14q96ghwf"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "1yq9faixq36d2qcnc3x79yvnjnrvdi51f6ah71515rcs83xgv79d"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "1cjxlydhv836gfyh21sb3bn579pf7p4fzcgh3fhanqry0ap7b63r"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "1kdlw21rna5lzvgqh47zcpgzprarjbf20f101inx8j51zxa06xqk"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "1cixlspmka8g94ahmhyqvnms77cmijc6hx71ifrlhki2704cx909"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "1l1rff9hwxv8riz3n1amry5q4szgbkag7wj27l8p97773imy49sz"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "079ayh9kz89sjg691kvbaxq4kyrz2b0g87nw05s4453xi9ng6fb8"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "1xd7cllg3q535fvlihcs3n4rwymg012p645m0fnr5n4ghs31jsab"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "1l7ca5fg6033cikpxhdnmhchnzs94aklqis03403v8jz35llpk8z"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "11rwb65dbn1n0m2m47vhp30fswram419lif2c8s6z3vzpiryvmrs"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "13fyyk2izl15x55dyivl70z80bmhg1nd1nyb99wl5vhws1xjpwvs"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "1lzh157hhiwgikd6ji99by6y3hvmfjpim94xbsp6bk8p2gxkbk04"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "1wgmy41ahxvg2jmvhg8pca77zr3lc814g9kp4d2krm5670r1lq6s"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "170hmj0m09rpklbknafmn52qxjbggk806c50910nhjib5zkmmkk1"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "12dp927q5rwp18n2wpf87mmizfbxmsv3f8yf79qi4713yp3xz8b5"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "0v1x8d238kzz6p1y8gci67i1jykvy5clzpvpzjr8xfyrk2fddm27"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "1pyb2p895kdwjbwqn8krjj311x1sgzh10vr8dkk1yp3m1yndrxcj"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "02pba4c8s4bdd345ay1cdw0hmfy3zpgqm9xsa1a1ky9zbycf0r27"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "0dw6k7ck92zc09kkvx3lp7ncnq9c32hzif56g0x33l6ylfwknnax"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "1157vqmcixmspwfgkyg3xsv3jilv396j7rjg7irwny63h0pwagcz"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "03iciy6fdnx48fff176h12l5zb8i3akhm5aqahr48aqaxw1w4720"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "1s0m2jxk6h9mmisiafjviq3bg029z6px1rrw42r5pmzzxxn3yidv"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "0hd7zycvdqmyi26lnvq01cgyl77r3nsn50xcmi1s5xxi27snzj63"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "1qjkdwiycvf7v254719lrwb98wgbzvv6hf6983ysj4y34mxp66fb"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "1py77bivdbf58csarc5hh2yicpdpvmjl42gpi9hmm1dxfsp2fc5b"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "1gx01w5hcw839m8dwzxag5v0c28zjcr59mg1lkza7qq1cxfg46kq"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "04m52vyh1cwn2vyiymjw8ll04cmbgw4rnwii6qgvym2w7ylzk5qm"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "03xfdv15h21abpnccmqkcah514pi3aywml6pc7yks8ci8y9hsh1p"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "0vf1b3i2rixxvlam47b86j204vnc9dlg046k3i79b2snhx2xcqxg"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "1nzah18j192sbss06rvnsvn5a29s0hwhx1h6d1rnsbdq9rj75lsz"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "0pxflhnq5l4kpwbj5vsljz5sjsch80rrijl18740x3wbzxxpafnf"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "0xsd38czs1nyas79qdssgq5cmd5xiidpqrjx1rijp5c94yq55pxi"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "0sqhxkba7qmyqqprwsa297fn5v012v8d35nvvc5qh5f1l498hi95"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "0cw9yaq2l4nbz6pbnrh8bkpmgrzkrk3h9f4k506znwk54mjjfal2"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "1g35gplkxr1hlbflifc4fj4b3i192cqbfhv8xlwz23qdn67fqyra"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "091ycfgmlawiafaw915h716kmdrrprl12x87rcfvvsnps8r87p0z"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "1nn0igy0a9l0zz1zdjfrqp41i1j43gx60swvycxccn68c0w0rx2h"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "1cqddls75px9fnwjirrzpbpa5hgvsh81z3q6d6lpgm3ascw9v3sq"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "1l9k4ksy19db950875qfwj884z2gqjc7wbq3wld58cyyrbw28g0p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.13"; sha256 = "0gclz5wf4ci3y5qqyibigngikvwwd1v4hmw8r2k8gjq9g0qxmrnp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.13"; sha256 = "09y0ly3akvm5jkkbn597pl958xmhsmx1fs81pmadis504jsny562"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.13"; sha256 = "0a3wnm499iy1jjsyxg51k1sg7b8zb6w7bdaw2j46lk5vcxcz7rlz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.13"; sha256 = "0914qs968m7xqp0wdj1icfqcnwh2zabmkiprw3z22vc7rmjm0v0n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.13"; sha256 = "1d52cacjdlf6dhwalj5bn2vqi8565xd40qpcj6fjxv83a1l80ys4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.13"; sha256 = "0ddygsnms3vfg6s7w2mcm7gqdmb4h7glrdj73hm1l42sndmn9p7v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.13"; sha256 = "1klwr4lykmfcppk2hb2lvx520jxx37aq9xdn9561kaydwis4wj9f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.13"; sha256 = "0zfdj4cgzjadbmm7jxfhfkz8ccf21zg517lxzi13bjmmimz3lap9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.13"; sha256 = "1zpif71jwd2pr2xcwwywyzz3wfkbp3y71rkfjmgk7zhmm0vjk872"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.13"; sha256 = "0bi2xw5v85zbk5nh466af1ppbl3g3pa1z5g3fn25nmcbimk51ki9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.13"; sha256 = "0ipqwxavmpkmg339scydgh212wd0iik0p04zfv2i53qc3j9ap1ws"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.13"; sha256 = "1zchfdhgh13y90yrki5537ik82s7rvcrzyf2y0cfdfw03m7f2yf9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.13"; sha256 = "1ndhp84v7l5ysi66qpqr18qddzvcg119id9d8fdd66fnr2hg207q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.13"; sha256 = "1qx4r2wmryyz7l3r55rhqv4nbjasn74cj0gyh547y9g1fbgh0ib7"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "0jwlkn81larvl41i2hdayy8fx2s1b6zz9ckhqi0y1ixs0xrfh3p4"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "07mdpz2cnyfxcp24adnfx2bzwwxwf9xpx4d87c24lghg1lfbwwca"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "14vaay4mp1rml2jxm9z9qnfmmsiw1673bid7xpmx8xrpxkvbrmpz"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "1cmmzfxnlnz4py738lfz8kdqrcgvyx4cyhbahk60qrynhsfz87yl"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.13"; sha256 = "1p9hnilvkbc7a0mppdmgws00qrhnh76z53j86jps8gsl7d4fm24k"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.13"; sha256 = "1gqsfxbm87qp2dcws8xik18vg66bdjb3s16kp83c3yxa2csnah9w"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.13"; sha256 = "0ibdldj4xzfw845r1bix5nahpck547cp4yb4qazhq6a86944mi53"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.13"; sha256 = "0zzkkwjll40fchaqfg2sy7p40acw7r54539qqanzbl485q61vxiq"; }) ]; }; } diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index 3f7cdd5fb86a..b33feb56c992 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -4,178 +4,178 @@ { aspnetcore_7_0 = buildAspNetCore { inherit icu; - version = "7.0.0"; + version = "7.0.2"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/4bbb4d31-70ba-4def-b747-4358be873982/3dbca5b64c2ffb88641c0e42bdeb297a/aspnetcore-runtime-7.0.0-linux-x64.tar.gz"; - sha512 = "02ce2e0b3c4b1d0eb0d9bdb9517a3293404b2a1aaf23311e305b856bb15723414f6328887788b875f0f80361f3e195c872ea3984971e5f0ab1ad5de43950d707"; + url = "https://download.visualstudio.microsoft.com/download/pr/1d8c4b4c-aec9-451b-9bd3-bf7cdbd28477/def6c1a7a9cfd4590698d4f338da2803/aspnetcore-runtime-7.0.2-linux-x64.tar.gz"; + sha512 = "d3b6c845030069581b3bfd739e3918ce77ae76c8e2e57b8e6c33c9134c46bc8c09fa9b74abdbc917c614c7d09ecbac149b0db1be2e045d26d82c61d976279b49"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/2d6d851a-4eea-4a7a-9d5e-f1d6cdccda29/366a3dd90251ce11d8c5191ae9633efc/aspnetcore-runtime-7.0.0-linux-arm64.tar.gz"; - sha512 = "ffee38cb0c8fd3ba20f3d814b7e141f94be18620eb91a229b80d7c609f6cad77efb7f8f276e9fbee4f3ed8cce33cc0659f0dc77faeb8f5427c95deead97275d7"; + url = "https://download.visualstudio.microsoft.com/download/pr/f88ac12a-fcc7-4f69-baf9-17cfbd9b316e/8745af53d52c38afc5c9fc171cf3c7b2/aspnetcore-runtime-7.0.2-linux-arm64.tar.gz"; + sha512 = "43ad795456b6d7a1f566113aaca4d7817dc4ff9cc893cab48e01d2d9685a1febdf397dfbc774fa7adc30bac7884dbd60980fe6b95efbc9497cf3228688c123c3"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5ea36935-090e-4ca4-841f-49371b408d9d/6e0c2c4721dabbb9a237d6b6ed17df75/aspnetcore-runtime-7.0.0-osx-x64.tar.gz"; - sha512 = "a1ab796c04d17ade8d93bc53b58ebeccd541d30aa0438bd81ff66c728dc13f934043f98528417eb976ea426e58107bef371b26d5877a550f2397005c5362a1da"; + url = "https://download.visualstudio.microsoft.com/download/pr/035d61f7-0418-4834-8364-eec4d3c3d112/b1fd356e10f14ee2c930e023654186f3/aspnetcore-runtime-7.0.2-osx-x64.tar.gz"; + sha512 = "a6e867fa4a9774231c736dd61e54efd8f62dc29fdcae6be298023ee86fbc8d75867d58d5968ffe566a497dfc1b10ef0104194af495d5cad48871e989b1bc2778"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e8576603-3b51-43ac-8ec1-fa96517e9149/7de992056c89e164f60908d9912f3a81/aspnetcore-runtime-7.0.0-osx-arm64.tar.gz"; - sha512 = "437f4fe11c95330eb56dc9e4a0c5836546d9e5b28f6cd0236ef563a82b0103e3526c0e6d50d44c90f4eb19bd6a1f409178d0f7b7620a2fff185aee6ae7cbe337"; + url = "https://download.visualstudio.microsoft.com/download/pr/42ad7951-d95e-4d52-8427-9ff58cdb0c16/f6256fba5b7484979737f34f7fa1e0ac/aspnetcore-runtime-7.0.2-osx-arm64.tar.gz"; + sha512 = "4538a57c6bea5d3137ec44286b17a4ab0df4b5c946db3e9bb50bd97cc0bff6f7ba6f1eb951d77e9f77d3727af7bf04105076f74f2c8b64005b1175f1c8f5cd94"; }; }; }; runtime_7_0 = buildNetRuntime { inherit icu; - version = "7.0.0"; + version = "7.0.2"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/d4b0a69b-29cd-40ef-9e95-a8d16f0ff346/5844add76ae3917af9efd59d95e3cbd4/dotnet-runtime-7.0.0-linux-x64.tar.gz"; - sha512 = "f4a6e9d5fec7d390c791f5ddaa0fcda386a7ec36fe2dbaa6acb3bdad38393ca1f9d984dd577a081920c3cae3d511090a2f2723cc5a79815309f344b8ccce6488"; + url = "https://download.visualstudio.microsoft.com/download/pr/83524cc2-60fb-4e49-8769-e9ecb1af8e46/a28b17808ffe21483b2f719091a0544f/dotnet-runtime-7.0.2-linux-x64.tar.gz"; + sha512 = "56f7f471052b955968b9a4caa27299ac003e0347ae80e8ef23de87d28a2707bdf7ceb70467cc3e9f0c80928a779841dd7e1392ed6b06e66a7a9cda696d5c0a1e"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/edc62d2f-5c2e-4085-a6d8-11ba9abb18f4/6ca82f155ed65e4c1335214d2d948c78/dotnet-runtime-7.0.0-linux-arm64.tar.gz"; - sha512 = "a359402471c0c4f11f9e472ee6f8d7d165b57a29f132e01a95d3ee4020fa27f9c6ed5ede4b41786fd9bbad1491a4726c6f45d105c19695c0a1cc9a9d414ee614"; + url = "https://download.visualstudio.microsoft.com/download/pr/38d90a87-4b35-46e8-a4c7-5c4ae15eeb96/77b1c221366f3c748c226edf25a65577/dotnet-runtime-7.0.2-linux-arm64.tar.gz"; + sha512 = "dece1d39074dde28aa61f51f3d932ee5328c9ec2c5e6c9830e304bc768e3253b5fab3eb2e27752d39547d68c29666440fe5c96f0fb0b8e503b93f55429df544f"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/93aca2a1-570c-4db7-90a1-de89a3a53f27/2d443a62676d498918def9188859f900/dotnet-runtime-7.0.0-osx-x64.tar.gz"; - sha512 = "b9b906561a443b0fc2064d7dfb9c497bcc157421c0fa7967547673e098c091a29012e36af3282d7bae9d51c216a31578b086d82c6e10ef6244e773b40ab57081"; + url = "https://download.visualstudio.microsoft.com/download/pr/4106c55b-9371-47c6-be04-cffe46c334d8/ad559a1e388d9384ae07381ffccdf26c/dotnet-runtime-7.0.2-osx-x64.tar.gz"; + sha512 = "6fde32130590d18d6bfd73fd3c2cd01f3ed6c2b3316285f64fb0bcc8889707e0a6e1415f796f5553486a89ef817628add27c64b69ea41c6cf4cd9fe811caa10f"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/fa0f8c59-92d6-46eb-a35b-2063a888f26e/0dcd341b1bde64bd1a8ae91097dfca7f/dotnet-runtime-7.0.0-osx-arm64.tar.gz"; - sha512 = "4a0dabfc8008dc39c3e7da6315475d5a20d30715cf1f4139e45ad1579486ba005a876918cf69369281b47d6932c070e735a4d7d84dbef8b0ef79f52e12b21d02"; + url = "https://download.visualstudio.microsoft.com/download/pr/42056f30-aea1-456c-94c0-77eafd2cdbec/ddf45ed3e6c84305aa584a35344f5338/dotnet-runtime-7.0.2-osx-arm64.tar.gz"; + sha512 = "c8ee455a364a53d0945bf76096bcc568a45b843bc5b313392ab9a07f1e25b16110a411a2d4bb3b6632891cd4ea5147597c93065097bdcbd5038107382c84c9bb"; }; }; }; sdk_7_0 = buildNetSdk { inherit icu; - version = "7.0.100"; + version = "7.0.102"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/253e5af8-41aa-48c6-86f1-39a51b44afdc/5bb2cb9380c5b1a7f0153e0a2775727b/dotnet-sdk-7.0.100-linux-x64.tar.gz"; - sha512 = "0a2e74486357a3ee16abb551ecd828836f90d8744d6e2b6b83556395c872090d9e5166f92a8d050331333d07d112c4b27e87100ba1af86cac8a37f1aee953078"; + url = "https://download.visualstudio.microsoft.com/download/pr/c646b288-5d5b-4c9c-a95b-e1fad1c0d95d/e13d71d48b629fe3a85f5676deb09e2d/dotnet-sdk-7.0.102-linux-x64.tar.gz"; + sha512 = "7667aae20a9e50d31d1fc004cdc5cb033d2682d3aa793dde28fa2869de5ac9114e8215a87447eb734e87073cfe9496c1c9b940133567f12b3a7dea31a813967f"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/47337472-c910-4815-9d9b-80e1a30fcf16/14847f6a51a6a7e53a859d4a17edc311/dotnet-sdk-7.0.100-linux-arm64.tar.gz"; - sha512 = "0a332df58891e808c9adc2b785e9b0e658b29b494963c8d501b0f8806ff5d3daad4614886349cbba86af638ed7ac76e78a2d05aeca13bac25d5f45fbe62b8251"; + url = "https://download.visualstudio.microsoft.com/download/pr/72ec0dc2-f425-48c3-97f1-dc83740ba400/78e8fa01fa9987834fa01c19a23dd2e7/dotnet-sdk-7.0.102-linux-arm64.tar.gz"; + sha512 = "a98abed737214bd61266d1a5d5096ae34537c6bef04696670d88684e9783bab6f6d45823f775648d723c4e031b1bd341f771baa6b265d2b6e5f5158213721627"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/09e4b839-c809-49b5-b424-86d8ca67b42e/54be2d3868ae49fa00b1cc59065d5e2e/dotnet-sdk-7.0.100-osx-x64.tar.gz"; - sha512 = "86165993dcf768b3ce793e94739ae681f30b63b3f7fdc82c6da7692f3867f93c19ac5b9152bc8f45708f4194187d60b706e0ee61a37f6e1470536c95a5e53e1c"; + url = "https://download.visualstudio.microsoft.com/download/pr/91c41b31-cf90-4771-934b-6928bbb48aaf/76e95bac2a4cb3fd50c920fd1601527c/dotnet-sdk-7.0.102-osx-x64.tar.gz"; + sha512 = "b7a66a6dc9e6648a97a2697103f2a53f37cab42d7dbd62b1f6ce5b347ca6cc7e45e5474ddb546e10f1e49ac27b20c0f58936093decf779941afd2ff761ecf872"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/1a0e0146-3401-4c2b-9369-4cb5e72785b7/8548e8f2c619330ea7282e15d1116155/dotnet-sdk-7.0.100-osx-arm64.tar.gz"; - sha512 = "d1af8592bc8aec43069f689449c159a4b13da419a924dab495b66bbf8c99b526c75c609171205b6d1b30bb0ff6f57797135245048e3629fbb33f462171107581"; + url = "https://download.visualstudio.microsoft.com/download/pr/d0c47b58-a384-46b3-8fce-bd9188541858/dbfe7b537396b747255e65c0fbc9641e/dotnet-sdk-7.0.102-osx-arm64.tar.gz"; + sha512 = "bc95a0215e88540bd52098453f348edb01ffec11ccfc44c7c017bfae5243ce2f0a50f4bb06cc6c3a622c9fc27b89f026be172c2d1bfb8ba62ed007071d5224b5"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.0"; sha256 = "1xzybxsi87vw5fdc0m32l2pdcjbgrj4a9m7766vv3qlm3pnw2gi0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.0"; sha256 = "07b7pv06nvzv6cgn68x64925bi9v120dczqa1s63z1wqih7ijk9b"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.0"; sha256 = "1sflim5k94kdrcb88jm8jqxi354r2bnycgsx1l19mraacpsxw2sd"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.0"; sha256 = "1iiv6vnb7dw00m9m6q3347in8z27pq8h1d759mx8wk4r35wzwijl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.0"; sha256 = "1lnyb2v5ahk730fb7nz0z9vrpiyhn4plgvfl130x9zw6as9rkqf5"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.0"; sha256 = "1aq3lkp6ggsw5iqqyv4ain20c47r3yzwn21i5wbzdfivci0k5pl1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.0"; sha256 = "1izaa212j4363yajcifym1xxhja7qs8pnbin3rsjdkhm7fgffbw1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.0"; sha256 = "0h1nnw0h1p04y8n3p2gj0bgin4bm6byr4mklz15diqwy45c6whp6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.0"; sha256 = "17lvrw4fp44kf68hx619kdxvmwzd27r2h57qi69dnby7v1givcci"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.0"; sha256 = "0vc2w7jrvh2hfxxs4if1k95wprzrvbp9dv9lcw84j1vyzhhanngc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.0"; sha256 = "0xv3sr2a202xzi09m5m9q0034724mzfldjsw1j3jkn8csv7821gi"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.0"; sha256 = "0bcbb1znpdr4r83y0qjx7y61mzn43chyv7dhwsra4wrfmw8zk6r1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.0"; sha256 = "04lbvxk4vywaw5pgwl2ag1nr09a1kx7ji75yfw8igzsp8s3vlqcl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.0"; sha256 = "1hqrljfjzdsl356fnk3s60fmiwh07hzzff5lj6aywbpbb91sr9fk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.0"; sha256 = "155ra9i7k63ii10fcnq3q0kbbrbffzwsdrxddvwg891fr23jkz8j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.0"; sha256 = "016y3d1337ddjg2lsy0bnls9pflljnzvwnx31caxzaigcbabqqkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.0"; sha256 = "101773hcmk7w4cqlw9vlla2vw827lsqaasaalir06gpmrlr3lbwp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.0"; sha256 = "0vamf4d0cwxa4r9rvx2h05rr8dnqy365qls10s1ifl14bqpsjjlb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.0"; sha256 = "06rg0czvg9dw8xr95bvgmpdnmlrjxrqihmlg0hs84gdi3c748xgj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.0"; sha256 = "1gjia7vx6s5vlsniycmkiysygyq6iq8chfd660g7g5j5x4n0bijy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.0"; sha256 = "1gqs62v531l5wpn4l08dnygxawjdmdq7cs1ykqyic407mpyq35pf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.0"; sha256 = "0kpahfm1bmwcl551hq5bxd1i39qx2sigkdv39yxps72g8sh89igf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.0"; sha256 = "0pcz74jxwywm6228zih366qks718wrppb2sv7i3qm1afmqnfkxv3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.0"; sha256 = "19nax9xgm2pv6163l0dicy9ln3snz3rag5bcxn2vgvmsi6by4aa6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.0"; sha256 = "0k06bwbf1v03h4j4crp4x1iby1rvx3b277041glh8fywgpv55h08"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.0"; sha256 = "0nx8ds2f15bxxmhrq1yfvvhniqly1bnknzn1fvg9wxhphlbdync4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.0"; sha256 = "15czc22gw8z6lb31vwac4xgifmmhr1q62cgydj44ksgiq9x6g87w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.0"; sha256 = "1y5ci26p30bjhsmax624x5kw421k2ilf8jl6252cjclq8ghxn3i9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.0"; sha256 = "04s945gayk4r54rfyr3v35b49d26f35pvcng9m9wzzpg2wkyg4ml"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.0"; sha256 = "0zd84ic9zad1qjydicmbp6dgd342yx4vm382aqx9kfvvdz11kds3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.0"; sha256 = "1vqw38b7y59203j8z4af1p491941ixrdsnwl8yqc8akg0q74xhx0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.0"; sha256 = "026r4p2cxpyy0mh0a6fb9cnk2yd5rym8nl9pzzxql664n4fayw6d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.0"; sha256 = "1fkn84yv26r28blq3mjhxdzscci5q92mwwkbs97ldrqxfb4yi3p4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.0"; sha256 = "1dq50frd65gr6m297sgihsqwmczazr6yk8ssky2c1d2y0h8q6b64"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.0"; sha256 = "1arxdwsxq31a9p867sdfl6dxd2wqma1qpjpwxidaab76jgai0awz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.0"; sha256 = "16mnrs799i2z367pa7qvr5hysf3wknbjr8mz6l69c979xfckkzyb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.0"; sha256 = "0fwkyc22bicsqphmlaf26xmv0smnrdls9mknlzmwysxfnzqpg38z"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.0"; sha256 = "056340npn4n4p19fda4jsd0za06q915sn7d12h4c8lqdm51nvrlw"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.0"; sha256 = "12fyxv55lgzf7l6wda6fhlj290r10hy2kqlvswj49106y00qcjfj"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.0"; sha256 = "0rjvqr4v93cy2smcxidxplbfrdc211scpx0mnzrrhygha0jchs89"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.0"; sha256 = "0rsyhklq5njaszf9q9csa1sl27ym0812q0gba2k205ngxgh082rl"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.0"; sha256 = "0ixjyzv6dh5x9dwiiagiabmzhbq2qyk8gwss5viqhgdmd0r30isi"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.0"; sha256 = "0fw209iqv3xvz9fnhrrj1rrjfzpjgig8fr8iim0gl6qixw3a0q8w"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.0"; sha256 = "1jr843dpcvrk363wb7zb674zchnvhwn8yw9jgbz9c5b2ql4swgkd"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.0"; sha256 = "17xv2wl5cim11sg4zp9xc1jpz3wk3rld0xapzwz0h9af2v89yrm8"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.0"; sha256 = "0y3k174hmask6ykhjs4p1sq6jf7zqivlcdy6nw64a5xvqdwfk43g"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.0"; sha256 = "0y81yay24b7idzv836znxryscvns6vy96y0mfdigb2rimv0h4wlj"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.0"; sha256 = "0a7gy6pfaknrq692lls6rg6qxxq81db60qidhvxhrdp8y1m52d4d"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.0"; sha256 = "0x8ib8ffx6sr4pdw9hxdxkpnbvsl76gqv7wldbv8q7fdzg53a1z2"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.0"; sha256 = "12qx9k2a8v0vhc56k459fjykvqq46gygi88n03jfmvapnkvfmdbh"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.0"; sha256 = "0kq19a6wkc0d4qw46jmxdmsf8sg4l6lj3mcdvvxnz03n5lk4c6mv"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.0"; sha256 = "0190xml4crgl27hiby096d4hg1wdy2pkdwcyq525qx5dvqvzpvfs"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.0"; sha256 = "1pmirxjf49dh66in169rn56cvhyla8hjvnv1njpd2a8bjcl9sdp7"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.0"; sha256 = "0wnh0csgdg6cxm82ylhg3bgq3lciha0g0463j36y8vpd9n891axi"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.0"; sha256 = "1xi7n1gx0a26i2c8jwfnmxlv58wbc3bhd7zjmg7m1cy3assqkil9"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.0"; sha256 = "1qr7q4gxgk2fm2hqpkg5w144haica0aayz5jgm1zr5dmc5giw8mh"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.0"; sha256 = "09yk8ay0ng7rgh0rw99igvm1cjyr5yxwfs7m5zsarwbq01hwp36l"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.0"; sha256 = "080k801gqib24x230b7s64cra26vb3jgkhzg5f89897xz4zp7hy3"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.0"; sha256 = "0zkv1zdwfwwlpg0q49733mr8h2d5063gwp1v1rbcw8ka86srdb8k"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.0"; sha256 = "19mc3hyxbqy5hpfi888sclv3mylvhc8pbpvnrjdv2ky82j3czn6z"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.0"; sha256 = "0r4jvv7v9a0yq5p40p5idyr19kfgxck81yyljp9j79za8lbc7wh6"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.0"; sha256 = "07s1vdl5smy94x0f9bd5036bczqhg210kzld4rrins1b6bmv4xl3"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.0"; sha256 = "0kr25wqfcpyjlrb78r0frl2181zkk3qlv9rli3vfb83f35hhdx9s"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.0"; sha256 = "0jhidazb3x4mfc4l4zc6vblcdj3270a6r82pysdqrnhvmznlzic9"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.0"; sha256 = "13vm2drh1fzqi92qrwbh9dzprsn56ivsdr87i1728ivmmka7iqdp"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.0"; sha256 = "1glv394f70q3qjibzjig0czfpbk52k5p6kvv9rim9i5kqkqp4cvy"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.0"; sha256 = "04jm9hkvc57dk2z1parllrsg2zd4hgh9sizjlm2j44s3vm2djy0k"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.0"; sha256 = "16r6b5pcziwlihc05li27ihxr9mjxd58clcnslywvyzmv7gz1dj4"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.0"; sha256 = "0rw5r6lwdc759pys1cws09izij6vm8ikqwgbxnkhn2ll41qkwfaz"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.0"; sha256 = "0a94ic4fd4nxdgiwmk09fg615ib62pfi2mqpypvwfb4kv804hvsl"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.0"; sha256 = "1j5yj4m9d3wmhv5zjwy07wz6gfdhqxh8vylwgv2651zyrlv7kxia"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.0"; sha256 = "0w2a95yw49mr7k51b9cigjb0yryflfxjs2rq8p0r82y0njcxw6b0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.0"; sha256 = "0j7mxxgi6167a7l43db1my2qj9n8q6ww6qmfnndk6jrpxywajh3v"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.0"; sha256 = "1gb27669992lxzlrdj3ah4k68hxr98rk4k2f83miqd2h4zbhp6kd"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.0"; sha256 = "04r7nikvzbcg55hx6xbcss9gwnad8cpy3fy2f0jh0ry8jh990h2g"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.0"; sha256 = "1rb7myjhyan570242b2vhrk3cpdkaga6qvla54czlqgb20c56qja"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.0"; sha256 = "0ssx929yz95b3vvnlb0qwb6sinqqiwlw0ykygaad7l2bxm4bqmvp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.0"; sha256 = "18z37bdi5x5ggmzxwh8kxd77wd75sqmdp3ynlzb2nfp7mvk10s2l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.0"; sha256 = "1qfbznic7wk6gy4c77ff3nrwvgx5pvjg26k05rv1dr8w6h58b7r7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.0"; sha256 = "0fx5zlf9spb2241f1apcyj0zq9kd2crm4mx3b1ccwirnfh20qy9x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.0"; sha256 = "1gjfp5f76g8bwbpmb9qfq116224zwa9vb4310kxaybdx5yb72iky"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.0"; sha256 = "1db2jawfmal5qxmswix8kwf3x68sh52r0r9ihdphivbi4nj8nsg2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.0"; sha256 = "18sf7x6kiigjxjvysbnk1sy0shs50lx6pxslfdcpzr349b7drgap"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.0"; sha256 = "1xwf795qwyajqk81sipr96pzla4gxyvx88cwpfaq7zclihd03p58"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.0"; sha256 = "1v3zcyqrrax5nh447bv2b6c2252l4mbi6xcacw4zjicm2v7kadba"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.0"; sha256 = "1v3j8ffghzd1wjl64r9wl3593xh7adycand78jd9sndiak27qgiv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.0"; sha256 = "1m62g19w1253dy289k4k490pxiavdalql87dimx9syqk81agknr0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.0"; sha256 = "1k3nihw931vvr8vj05x0f9gmx7fqqvnhlby297jdxpj9gsvssr2a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.0"; sha256 = "0wvf8clmyl6xpyi2casa2zxjl5x0f14cj5infkwrm7bkb0hwwj0c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.0"; sha256 = "0zjlamc8bgvb8lrfwmyimqbxi6b4gfn1w7fhfqf20050vyzivqdb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.0"; sha256 = "1zcn8hrmbvqx9w4d5pm69v1znwbpdl4573jwybj8w5myl5ni3jly"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.0"; sha256 = "01blflyln8rgig20cim8kpjc2kj97vhw6ajxf3029b3692lkm693"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.0"; sha256 = "1f7jfxnw0vkmmwm5rkycqf8f5mj3815hqdbwxbg9cxskd46a6rrg"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.0"; sha256 = "0fqbgywnhlb39xhxff0h68pvrx8m17w40z5b5p65jh597l56pgpi"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.0"; sha256 = "0dm9pdm5d5nckfhid846kcpm0lb01g7rmpqmimj0qjwy83jdk88f"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.0"; sha256 = "0ccsg4z8fsyqlflgcd8dhz3kq0xc860nyd9q8amw76ig2l7cj2sw"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.0"; sha256 = "02r5nhn51wpn6nnms1kd8znq3zg0vs624wkh6qwc1raq1b2njlyb"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.0"; sha256 = "0451wbsgkf9gybkdijmljc7rsr527gbyy11nimwc8gn266cgnl9l"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.0"; sha256 = "1vz3wd1dgjwgs91r0qdah9nbs5lgf31rmrkyyr830cc9dj7h18hv"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.0"; sha256 = "1clj5f6ywj5agqdpzjy7slj4vx2y80djq54s5v6hdpcppvw7zykf"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.0"; sha256 = "0mqr862bdgcs08941ljmfxgj7srjx1gi3w4356lrvhr9qn754sgk"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.0"; sha256 = "079va9yfpjmiig3ig9zia831hby7i6dx4bg9axc3aikhclcr15sv"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.0"; sha256 = "15dwcikc033wakvgrqavyyxhqi9mc5cq2g54m8mxvdvslx91g2qp"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.0"; sha256 = "1szhmj9c0s2v3fvsawqk8rj19fb1w7hprvgfygaicqsfvqwlw7x5"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.0"; sha256 = "1ia3pvmyy9dlgpcn7lhvl3hlnbj3bjjlfd1gdg3bpwl1l23pbc81"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.0"; sha256 = "1y946qx7ya3kws9g005bqbr0k8hi4v7na3pfw90hvmr23g47fs5r"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.2"; sha256 = "1yzxfrn3sikcl5xv7l69yly00xs483q5vr5wgp08vrlzgcgyb2rr"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.2"; sha256 = "07m4dxmgl7fcid7crkb51qsrizw66ax0l1zzq1gan7pbyny9gip7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.2"; sha256 = "0vgi12pg0xl0abmzmw0mb29030djg5bk9lqxs1sm6m4sk7137l93"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.2"; sha256 = "1wapqdaw5k9aqzfdhs4y0avrinfcya2y301qbdr92i3p11i7hccf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.2"; sha256 = "1bfs9vgl46zzb59lja3a2phqshspxc9dw4ldc1vqm255isjwyq3c"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.2"; sha256 = "17bpwdpw6b5v1fqiih1c8jb8cklw7wvlfnsw6zy0ac6z67dylyin"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.2"; sha256 = "14mmkyg8pi1i7k2i0zqfqvkn5al2k39n6sv2rc6961y7436a7vmd"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.2"; sha256 = "0j4jzc99az94drwgfzf672hjm8ia1hq7dzhq7i0c8ny4xzdqidwq"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.2"; sha256 = "1ngxdxn3x54pf97vzrn8f89nr16yrzdbl92mp07jmr1z3k5sdb0k"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.2"; sha256 = "1lgxj2x6gcyn1c67h8231w1xx4a9alldp0nfkw97298453gnzqg0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.2"; sha256 = "0162avkqlg4am99jh7a98bv8r4mr3c5r5yrxng8wgyf6n6k7ymy9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.2"; sha256 = "0lns56ppla5xgvval5m84j41yaynbzqfvivfqxw88haxay33nlb9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.2"; sha256 = "0al7s0nscy1941wpvmc2lnrrknpiai6s4p2w2hy75kay4ipcbg97"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.2"; sha256 = "1y8wm5jl5ly30ccfff5kjhnmlyacpk0ykipphvgb6whd8fnck8ph"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.2"; sha256 = "0sjhr5rkk1jv3i9ddgf9k5lk9pclkn0gs961xn2bvjcslm99ns2p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.2"; sha256 = "0jdh1hrwvdq5llma5p1ammhrwgw8y7iw2qqy5rpkmn4jp08lg2k0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.2"; sha256 = "1f5qlp1m9mjs6c72a2kdc1f2hq0spwqxhcdyf8wpb6bg4bb80p20"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.2"; sha256 = "0sfgwgvikpvf1zbzdqmbvi830ri28xgag39x658qk46yp1a13405"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.2"; sha256 = "17nmc7jymlsxmrdh7jvwmcn9cpfzs04yzcwgigq5bvqiqj809px4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.2"; sha256 = "1z0g31wr1rwf09v1pyrd2vjdxri0h2f1w9m69pwkx0n255584b4w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.2"; sha256 = "1b82hk8s3z380vkyzi8w4n3hznjp3x8dh7hrdwyqyb5v7l8lipw5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.2"; sha256 = "10raq3bpnsy9jsni5bb96zkmx4i1l72h2gzv8jvw9basygqqvk8x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.2"; sha256 = "0liiy8m17bcn5gydpzbnxl79g2mfpsq2d2c67l0hwqqn5w1zv2a4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.2"; sha256 = "0lpwyxhxi1ir52lg31kynzldk5pk6qxawy22izdwlw7fhmwkm0sf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.2"; sha256 = "0cbwhjiwj0lhn6chqz3msymlsqhlpmvdwbhd9r499mfjj0isrpq4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.2"; sha256 = "1iijrsbib1ipihm01dinpd8kklckravn5i40b8whynbpcqi8avhx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.2"; sha256 = "0z1lrxnzbjq18fzy1h77rbyfv2amwzwvfzibdaqv0r9xgrzspvdj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.2"; sha256 = "09agcf1z06z816y40lv0n7mq7njjc48i5dr1xsdiwk587kljp71v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.2"; sha256 = "0h6sbb8iand170cdrr5y6a4kmlhd7s21h1jz8c1idjp7p3i2i8x1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.2"; sha256 = "10ddf1b2m8p16hfz16073w1dzlacx9v1mk62vgnbyyv20g4a4gs1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.2"; sha256 = "0z1yjx7s19m52cliy4f7mwi0y4knba2qadg1qma0d90l7i0wc3v3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.2"; sha256 = "1lf4vkn635xilfzz183yn9byyjfxhdgvchngm34j6jj4pi70d0k2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.2"; sha256 = "1j5wmnxanzkngxz9klaf6bd2chc3fk8z6j6sksmrkd46ykrpbxc4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0ay93vi625b7f4rmg6ff9qjhjy0zjvv906ygmg9irghn97qqy283"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1jnxlw78wqdgcq645aai02vxmgghb0dxhkp33c9qpm5c264vlznl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "07bl45jhg07bfx0f5n755h9wcg3b1igjahy3c45j5d9m5c8avh64"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1b40nzkjgv30v15n9dmgph976i883vpi85djmibvrlk7mah66j5k"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0ig879a4yl5n1xh0i0s7cikf2zkrx1wzb0amqv5ml4pk0ryik4sd"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "04mpy53rw19677ba57l77vk26xmfp5vdgqniqwpqga236sahl3v7"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "081csjhs37m6qspm7mrc3sj7jsn685y1xjkc4wxbypdvqsn43smi"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "139r2lsi1yx5g7d3g62kch1vfyxgfwbyr4gps1q0w4fi0s26qaai"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0rkpicqfbvd1c6l32kzvimw5i4fff8pachazvfqdqp2w98qik4g2"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1x73cdb6as4vh4hldql1p5cys94x8lxgmyygb1bj82l1brgqlqzr"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "1cl8ppl19gb442a00g2bf6szbn70wlr465a98q6xg5h5b92a4z1y"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1lch9mwj3jw8zfaz93pg6j3mviw28bm3ll9z3bdv0spkp1d2gy0p"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "1f3jxldxcy3zjc8ya6lcz68ki8ih5q60vkcv8p9v9qbjbcf3x2qg"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "0kqhpf54jv80in1ypygl3mmdbf1miypn7bdp4d26wrq7anfhr1id"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "1r0hq5w5kn1vr3br7ayg60rf17cxa8jmllmj9cc8rqndpjj04qv1"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "0y5jxxr967xx54wvrrxix9c4i49lx9jlj2dr1y76hywl5rib9xff"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0xxkdjdssvxwnmfkdrn4qpb1y9yfwdrzzm6xwdhj8gcfjbyxv8l8"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "0cl0xinjkk6qjcff015rjarni4z71q1d56d9y7jnp7z9sxbqcpmx"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "15sr4ispkd1zbbp4xz08vpb24p5pbc2avgn7mk502g9y2a87xszq"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1iga8qsq38q182p9awjvgf7301f0y0sbzkx2mvgrp3ppy7rz1jvi"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "01kixadmk3zji3cmqimdg9zzaz2jyfkz8dfd5ll78mdl3qcl341z"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1rvnsiiygy1z01qgl64id93j2nhgi20bc4iwqaaqhzwdgh2600mw"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "0ywkdjisj0dsi9f2wyx8faly6zjwhgnzgxvbblfg01saxkqanfrg"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "0wg2vsp7hs2rqh48q2qkb83a4ga5z6awadyn1zkvmxdzrxyk9kry"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "14vq3sndmmfk3x5pfl3q9pcrv2865xpsbmc5i017qah3x1x74i7l"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1i3awdr5dp3jcqkhjkipqy13qdbpgi98cncb9m3jfnnsc36mb732"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "160qg0ar7ja7s3vbh5za28an5xabqdgh7gnnv48baswxm4bls8ds"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1iv0fy0hg62l0r9696f18m9k1fi9qm9pvabq3ahn1nksqmdqjbp8"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0nrnyb6bpqb48rd2pymm0b20rwxpy2yja8ch0l1gzsw0d28ma5c6"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1ys6rfj02vf9jspl7kmyif593kn6mmkyhdncvwpp2fbiip8vxgc4"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "0sn7h66y8jxcd17fpfzcysyyic2bgf3jw2ljlgr8v3ags726kn0w"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1hzfjrrav3pxvx0jryyj6kli7q22w2q5zaix6ij4nml7g3d0ygzr"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "1qwnlz65s9jpl0gr5avfc1krvy9m6d9iprjb4hr8v38gj17q4xxy"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1n4fjjrb2yc7d11p8l7z9x09xx2421diiv2i78wygmkz0czdlw48"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "0yl9yn4i1lhf76yl92izxzi6x9s6srdbwdh4kcwnwxcszf201gkk"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "09387pgs6qvfs71ll648lyyj7i6wrc98sgh77rr2nhmaw2b3gaq5"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "1jngriv8cfn05njhc97h16048z35686526a3p0iim1xi1zqga5vj"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1hlqn3qdjcjnfwp40hlnjb747pic0lhwc6xvcnly1a9zgk387sg8"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "1jbaqhrqpm696d40swrjj9l19q47rmixzfzbxwm4xgjf2pnrjarc"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "0ar8bydq0arfa0ky6xwfqnjvdn86rfkw7v7v9ga2x51h3n60i149"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0dj6f5fph9m4ym1jcg21v101qj4spzb0qwq0wn79sgd54jia1mfl"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "0iwdwxqy08j7arbfjjj5bx3x4w0fdwhzmwbzidkhgzvqq634n7d0"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "0j29f9bfa6hxqs32xy58kwbmqqnbz4b29w2l82ip9w9s8yvjvci3"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1gql9hl2li508sndlvf7hgi0bf74qghbyzyilw6xad88gnvr04vf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.2"; sha256 = "0j9x85vd9lar3mkdxknas1fsvnbxr2713p88qdf6p5zvv2fc2jlw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.2"; sha256 = "1bc3kf8yp6hpmp6layigxz2yzfgdclwgjx621lgg4qiq4xs3sddn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.2"; sha256 = "17kz2565nr7c4737pi3p4kfr1qxrq6gzr3mg3mbm2ky75a2mh016"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.2"; sha256 = "16pvajh1x6pvqrlq1lbzdhin4r5a4ws77zgvf3bp11a85kv7dj1w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.2"; sha256 = "0pmzq9z9d0fflk3zjakc1jjxw66n3wnswm224i0hah02vza2xyia"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.2"; sha256 = "1962bjgwn15p3fh8c1797mhz01bz024mn81dy3dmym755m1mx7c5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.2"; sha256 = "0lxr8agz52wkdm2jd3lz1fkiwqbfkr8rvaxmp65sfzbzs8zmj3dl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.2"; sha256 = "0rcq6fxq8z5xc5nmm2l7zal6c9fqj3vva29b0hwnp8ijk6s2srya"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.2"; sha256 = "1fl418xx0nf5vr6pi3wx257aixiblw70lpsafvjc9f10saihshdj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.2"; sha256 = "1n2b3lpnzc83wyf9pb5cp54hsk0shhww6kh9jd9gw9g89j8la9x7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.2"; sha256 = "0raacw2a86d00q0ky8802c4nhgvik4dls7073dd1mjpmkdc9k8ki"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.2"; sha256 = "14x7cl7dxdy689rkg296rncmzqdv1wsz6axnlf76ywfix5aakh89"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.2"; sha256 = "106n3vwyr2cbgx5a27xy13zp6j943jmmzb0dyj2w3kjmwzdgbjqd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.2"; sha256 = "00y48dbl81d08bcgmy0xfnnr9rp9qnq3w6cad3n151nszz7m3i3f"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "1kl99n29m17ab5vg7k14d9ivsaqpwalbqdxchcfsqxnghby84cia"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "02fbrm2d1000s2ql17c0lcdqv0bacnvgx0kq401yqyirlh5ls0n0"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "0bld37hmv1jnxg3w3lkigpk3iy0s1yxryfdd9l4q8my0bpxbdi11"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "055vc0vkbvllqq945py1av0qqcp7a7wvgd6qhazv9d5kyx6hg7dq"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0wppab4l04l23vizk235wvz5niqhv06v929zdr9gi3zg12ajcw8w"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "0y0rr56sm2ij1mrkq9s5j55w49lh4blxg3s5wwxpb5sxrlwl9ygy"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "0w3hx2bla0pj5g0kjjlhwr65r93fppyb2cl1prr43aq560a766gq"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1kd4mjd2wygsmlrgy2syvlrf17nd6y5w2bqq42pj4d1xa8i3p7rq"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "1a3hywbyc4hd37pr5cyggxhgr1g69yrphwsyi0h0ylypz7njd721"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "1dalxbgxzc45qj2l7xmhnkzm3jfv4lmbvcd8rvhsm6xh2xq1qhnk"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "019zv2jsw9l440s7c6ybb2jaabkv4l1499vzbks3k55gb7985amz"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "0qmkv3dfrqw8j13cwy3ky3bd5jbs781p4x4m0y2sw6rmfccv7xn0"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "0lmncf55nigri5ivfrlzilx0x6m39pg62nld42zwv3bsncmnfjm3"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "1s14lx6qpfah60rpzxjpinlab98j5kvl8nrmi7g3hjzigf3iflm1"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "1pa8j2n09y062grblkq3ihy22gl71b91pff6ad0d8v7q5821ax2z"; }) ]; }; } diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix index f2d50fa6f921..ef00bb19d411 100644 --- a/pkgs/development/compilers/ecl/16.1.2.nix +++ b/pkgs/development/compilers/ecl/16.1.2.nix @@ -93,5 +93,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 8ce4322a12e9..3397252b47a6 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -17,6 +17,8 @@ targetArch = if stdenv.isi686 then "IA32" else if stdenv.isx86_64 then "X64" +else if stdenv.isAarch32 then + "ARM" else if stdenv.isAarch64 then "AARCH64" else @@ -34,7 +36,7 @@ buildType = if stdenv.isDarwin then edk2 = buildStdenv.mkDerivation { pname = "edk2"; - version = "202205"; + version = "202211"; patches = [ # pass targetPrefix as an env var @@ -50,7 +52,7 @@ edk2 = buildStdenv.mkDerivation { repo = "edk2"; rev = "edk2-stable${edk2.version}"; fetchSubmodules = true; - sha256 = "sha256-5V3gXZoePxRVL0miV/ku/HILT7d06E8UI28XRx8vZjA="; + sha256 = "sha256-0jE73xPyenAcgJ1mS35oTc5cYw7jJvVYxhPdhTWpKA0="; }; nativeBuildInputs = [ pythonEnv ]; @@ -83,7 +85,7 @@ edk2 = buildStdenv.mkDerivation { description = "Intel EFI development kit"; 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" ]; + platforms = with platforms; aarch64 ++ arm ++ i686 ++ x86_64; }; passthru = { diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix index 869d7fdeedf3..9931e45c9b66 100644 --- a/pkgs/development/compilers/eli/default.nix +++ b/pkgs/development/compilers/eli/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { construction with extensive libraries implementing common tasks, yet handling arbitrary special cases. Output is the C subset of C++. ''; - homepage = "http://eli-project.sourceforge.net/"; + homepage = "https://eli-project.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ timokau ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index f395651a0f18..e5ccffc7e76a 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -2,7 +2,7 @@ let - # To controll nodejs version we pass down + # To control nodejs version we pass down nodejs = pkgs.nodejs-14_x; fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { }; @@ -37,6 +37,7 @@ let */ elm-format = justStaticExecutables (overrideCabal (drv: { jailbreak = true; + doCheck = assert (drv.version == "0.8.5"); false; # golden tests fail with optparse-applicative 0.17 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"; @@ -96,6 +97,7 @@ let hspec = self.hspec_2_7_10; hspec-core = self.hspec-core_2_7_10; hspec-discover = self.hspec-discover_2_7_10; + hspec-meta = self.hspec-meta_2_7_8; elm-format-test-lib = self.callPackage ./packages/elm-format-test-lib.nix {}; elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {}; diff --git a/pkgs/development/compilers/elm/makeDotElm.nix b/pkgs/development/compilers/elm/makeDotElm.nix index b8076d72e481..43252747c3a3 100644 --- a/pkgs/development/compilers/elm/makeDotElm.nix +++ b/pkgs/development/compilers/elm/makeDotElm.nix @@ -3,7 +3,7 @@ ver: deps: let cmds = lib.mapAttrsToList (name: info: let pkg = stdenv.mkDerivation { - name = lib.replaceChars ["/"] ["-"] name + "-${info.version}"; + name = lib.replaceStrings ["/"] ["-"] name + "-${info.version}"; src = fetchurl { url = "https://github.com/${name}/archive/${info.version}.tar.gz"; diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 44ba33247b40..02b1f6f03b2a 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -1,32 +1,38 @@ { lib, stdenv, fetchFromGitHub, python3, nodejs, closurecompiler , jre, binaryen , llvmPackages -, symlinkJoin, makeWrapper, substituteAll -, mkYarnModules +, symlinkJoin, makeWrapper, substituteAll, fetchpatch +, buildNpmPackage +, emscripten }: stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.17"; + version = "3.1.24"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; paths = with llvmPackages; [ clang-unwrapped clang-unwrapped.lib lld llvm ]; }; - nodeModules = mkYarnModules { + nodeModules = buildNpmPackage { name = "emscripten-node-modules-${version}"; - inherit pname version; - # it is vitally important the the package.json has name and version fields - packageJSON = ./package.json; - yarnLock = ./yarn.lock; - yarnNix = ./yarn.nix; + inherit pname version src; + + npmDepsHash = "sha256-ejuHR2BpAUStWjuvQuGE6ko4byF4GBl6FJBshxlknQk="; + + dontBuild = true; + + # Copy node_modules directly. + installPhase = '' + cp -r node_modules $out/ + ''; }; src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "sha256-xOt9Znn5kCcieRHnXk794rMpgTzoR8pIKBXv/GeKcuw="; + sha256 = "sha256-1jW6ThxK6dThOO90l4Mc5yehVF3tI4HWipBWZAOztrk="; rev = version; }; @@ -38,6 +44,16 @@ stdenv.mkDerivation rec { src = ./0001-emulate-clang-sysroot-include-logic.patch; resourceDir = "${llvmEnv}/lib/clang/${llvmPackages.release_version}/"; }) + # https://github.com/emscripten-core/emscripten/pull/18219 + (fetchpatch { + url = "https://github.com/emscripten-core/emscripten/commit/afbc14950f021513c59cbeaced8807ef8253530a.patch"; + sha256 = "sha256-+gJNTQJng9rWcGN3GAcMBB0YopKPnRp/r8CN9RSTClU="; + }) + # https://github.com/emscripten-core/emscripten/pull/18220 + (fetchpatch { + url = "https://github.com/emscripten-core/emscripten/commit/852982318f9fb692ba1dd1173f62e1eb21ae61ca.patch"; + sha256 = "sha256-hmIOtpRx3PD3sDAahUcreSydydqcdSqArYvyLGgUgd8="; + }) ]; buildPhase = '' @@ -53,7 +69,7 @@ stdenv.mkDerivation rec { sed -i "/^def check_sanity/a\\ return" tools/shared.py # required for wasm2c - ln -s ${nodeModules}/node_modules . + ln -s ${nodeModules} node_modules echo "EMSCRIPTEN_ROOT = '$out/share/emscripten'" > .emscripten echo "LLVM_ROOT = '${llvmEnv}/bin'" >> .emscripten @@ -85,7 +101,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emmake emranlib emrun emscons emsize; do makeWrapper $appdir/$b $out/bin/$b \ - --set NODE_PATH ${nodeModules}/node_modules \ + --set NODE_PATH ${nodeModules} \ --set EM_EXCLUSIVE_CACHE_ACCESS 1 \ --set PYTHON ${python3}/bin/python done @@ -108,19 +124,26 @@ stdenv.mkDerivation rec { popd export PYTHON=${python3}/bin/python - export NODE_PATH=${nodeModules}/node_modules + export NODE_PATH=${nodeModules} pushd $appdir - python tests/runner.py test_hello_world + python test/runner.py test_hello_world popd runHook postInstall ''; + passthru = { + # HACK: Make emscripten look more like a cc-wrapper to GHC + # when building the javascript backend. + targetPrefix = "em"; + bintools = emscripten; + }; + meta = with lib; { homepage = "https://github.com/emscripten-core/emscripten"; description = "An LLVM-to-JavaScript Compiler"; platforms = platforms.all; - maintainers = with maintainers; [ qknight matthewbauer ]; + maintainers = with maintainers; [ qknight matthewbauer raitobezarius ]; license = licenses.ncsa; }; } diff --git a/pkgs/development/compilers/emscripten/package.json b/pkgs/development/compilers/emscripten/package.json deleted file mode 100644 index bf7d2c0642db..000000000000 --- a/pkgs/development/compilers/emscripten/package.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "emscripten", - "version": "3.1.17", - "private": true, - "devDependencies": { - "es-check": "^6.2.1", - "eslint": "^8.16.0", - "eslint-config-google": "^0.14.0", - "source-map": "0.7.3", - "ws": "^8.6.0" - }, - "dependencies": { - "acorn": "^8.7.1", - "google-closure-compiler": "20220502.0.0", - "html-minifier-terser": "6.1.0", - "wasm2c": "1.0.0" - }, - "scripts": { - "lint": "eslint ." - } -} diff --git a/pkgs/development/compilers/emscripten/yarn.lock b/pkgs/development/compilers/emscripten/yarn.lock deleted file mode 100644 index 6b4e1011f947..000000000000 --- a/pkgs/development/compilers/emscripten/yarn.lock +++ /dev/null @@ -1,1563 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@caporal/core@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@caporal/core/-/core-2.0.2.tgz#b7dd808cc58caa45786cf4b5b1603b37bf77ac72" - integrity sha512-o3J5aZINFWkkL+sL0DUs1dPHJjaetAAdwMRLbJ4U8aJW3K81E323IFMkFNYcOwTiPVhNzllC3USxZbU6xWFjFg== - dependencies: - "@types/glob" "^7.1.1" - "@types/lodash" "4.14.149" - "@types/node" "13.9.3" - "@types/table" "5.0.0" - "@types/tabtab" "^3.0.1" - "@types/wrap-ansi" "^3.0.0" - chalk "3.0.0" - glob "^7.1.6" - lodash "4.17.15" - table "5.4.6" - tabtab "^3.0.2" - winston "3.2.1" - wrap-ansi "^6.2.0" - -"@colors/colors@1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" - integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== - -"@eslint/eslintrc@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f" - integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw== - dependencies: - ajv "^6.12.4" - debug "^4.3.2" - espree "^9.3.2" - globals "^13.15.0" - ignore "^5.2.0" - import-fresh "^3.2.1" - js-yaml "^4.1.0" - minimatch "^3.1.2" - 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== - -"@jridgewell/gen-mapping@^0.3.0": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9" - integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg== - dependencies: - "@jridgewell/set-array" "^1.0.0" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/resolve-uri@^3.0.3": - version "3.0.7" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe" - integrity sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA== - -"@jridgewell/set-array@^1.0.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea" - integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ== - -"@jridgewell/source-map@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" - integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== - dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/sourcemap-codec@^1.4.10": - version "1.4.13" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c" - integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w== - -"@jridgewell/trace-mapping@^0.3.9": - version "0.3.13" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea" - integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w== - dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" - -"@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/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/lodash@4.14.149": - version "4.14.149" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.149.tgz#1342d63d948c6062838fbf961012f74d4e638440" - integrity sha512-ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ== - -"@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/node@*": - version "18.0.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a" - integrity sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA== - -"@types/node@13.9.3": - version "13.9.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.3.tgz#6356df2647de9eac569f9a52eda3480fa9e70b4d" - integrity sha512-01s+ac4qerwd6RHD+mVbOEsraDHSgUaefQlEdBbUolnQFjKwCr7luvAlEwW1RFojh67u0z4OUTjPn9LEl4zIkA== - -"@types/table@5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@types/table/-/table-5.0.0.tgz#67c3821138eb41d538c3d9286771c6cdeeac7172" - integrity sha512-fQLtGLZXor264zUPWI95WNDsZ3QV43/c0lJpR/h1hhLJumXRmHNsrvBfEzW2YMhb0EWCsn4U6h82IgwsajAuTA== - -"@types/tabtab@^3.0.1": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@types/tabtab/-/tabtab-3.0.2.tgz#047657fdeb98a13bfd38c6d92d8327066759695c" - integrity sha512-d8aOSJPS3SEGZevyr7vbAVUNPWGFmdFlk13vbPPK87vz+gYGM57L8T11k4wK2mOgQYZjEVYQEqmCTvupPoQBWw== - dependencies: - "@types/node" "*" - -"@types/wrap-ansi@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz#18b97a972f94f60a679fd5c796d96421b9abb9fd" - integrity sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g== - -acorn-jsx@^5.3.2: - version "5.3.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" - integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== - -acorn@^8.5.0, acorn@^8.7.0, acorn@^8.7.1: - version "8.7.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" - integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== - -ajv@^6.10.0, ajv@^6.10.2, 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" - -ansi-escapes@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" - integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== - -ansi-regex@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1" - integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw== - -ansi-regex@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed" - integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g== - -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.0, 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" - -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== - -astral-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" - integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== - -async@^2.6.1: - version "2.6.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" - integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== - dependencies: - lodash "^4.17.14" - -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== - -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.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-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== - -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== - -camel-case@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" - integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw== - dependencies: - pascal-case "^3.1.2" - tslib "^2.0.3" - -chalk@2.x, 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@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" - integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chalk@^4.0.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" - -chardet@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" - integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== - -clean-css@^5.2.2: - version "5.3.0" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.0.tgz#ad3d8238d5f3549e83d5f87205189494bc7cbb59" - integrity sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ== - dependencies: - source-map "~0.6.0" - -cli-cursor@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" - integrity sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw== - dependencies: - restore-cursor "^2.0.0" - -cli-width@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" - integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== - -clone-buffer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" - integrity sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g== - -clone-stats@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" - integrity sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag== - -clone@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" - integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== - -cloneable-readable@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec" - integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ== - dependencies: - inherits "^2.0.1" - process-nextick-args "^2.0.0" - readable-stream "^2.3.5" - -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 sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== - -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: - version "1.9.1" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4" - integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg== - 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" - -colornames@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96" - integrity sha512-/pyV40IrsdulWv+wFPmERh9k/mjsPZ64yUMDmWrtj/k1nmgrzzIENWKdaVKyBbvFdQWqkcaRxr+polCo3VMe7A== - -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@^2.20.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - -commander@^8.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" - integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== - -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== - -cross-spawn@^7.0.2: - 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@^4.0.1, debug@^4.1.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" - -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== - -diagnostics@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a" - integrity sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ== - dependencies: - colorspace "1.1.x" - enabled "1.0.x" - kuler "1.0.x" - -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" - -dot-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" - integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== - dependencies: - no-case "^3.0.4" - tslib "^2.0.3" - -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" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -enabled@1.0.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93" - integrity sha512-nnzgVSpB35qKrUN8358SjO1bYAmxoThECTWw9s3J0x5G8A9hokKHVDFzBjVpCoSryo6MhN8woVyascN5jheaNA== - dependencies: - env-variable "0.0.x" - -env-variable@0.0.x: - version "0.0.6" - resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.6.tgz#74ab20b3786c545b62b4a4813ab8cf22726c9808" - integrity sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg== - -es-check@^6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/es-check/-/es-check-6.2.1.tgz#08d6f5de2045da5d8f1535c66eac39bb611b2b65" - integrity sha512-IPiRXUlwSTd2yMklIf9yEGe6GK5wCS8Sz1aTNHm1QSiYzI4aiq19giYbLi95tb+e0JJVKmcU0iQXQWW60a8V9A== - dependencies: - "@caporal/core" "^2.0.2" - acorn "^8.7.0" - fast-glob "^3.2.11" - -es6-promisify@^6.0.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-6.1.1.tgz#46837651b7b06bf6fff893d03f29393668d01621" - integrity sha512-HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg== - -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 sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== - -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== - -eslint-config-google@^0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz#4f5f8759ba6e11b424294a219dbfa18c508bcc1a" - integrity sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw== - -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 "^5.2.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@^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.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.16.0: - version "8.18.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.18.0.tgz#78d565d16c993d0b73968c523c0446b13da784fd" - integrity sha512-As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA== - dependencies: - "@eslint/eslintrc" "^1.3.0" - "@humanwhocodes/config-array" "^0.9.2" - ajv "^6.10.0" - chalk "^4.0.0" - cross-spawn "^7.0.2" - debug "^4.3.2" - doctrine "^3.0.0" - escape-string-regexp "^4.0.0" - eslint-scope "^7.1.1" - eslint-utils "^3.0.0" - eslint-visitor-keys "^3.3.0" - espree "^9.3.2" - 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 "^6.0.1" - globals "^13.15.0" - ignore "^5.2.0" - import-fresh "^3.0.0" - imurmurhash "^0.1.4" - is-glob "^4.0.0" - js-yaml "^4.1.0" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.4.1" - lodash.merge "^4.6.2" - minimatch "^3.1.2" - natural-compare "^1.4.0" - optionator "^0.9.1" - regexpp "^3.2.0" - strip-ansi "^6.0.1" - strip-json-comments "^3.1.0" - text-table "^0.2.0" - v8-compile-cache "^2.0.3" - -espree@^9.3.2: - version "9.3.2" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz#f58f77bd334731182801ced3380a8cc859091596" - integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA== - dependencies: - acorn "^8.7.1" - acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.3.0" - -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@^5.1.0, estraverse@^5.2.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== - -external-editor@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" - integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== - dependencies: - chardet "^0.7.0" - iconv-lite "^0.4.24" - tmp "^0.0.33" - -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-glob@^3.2.11: - 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: - version "2.0.6" - resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== - -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" - -fecha@^4.2.0: - version "4.2.3" - resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd" - integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw== - -figures@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" - integrity sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA== - dependencies: - escape-string-regexp "^1.0.5" - -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" - -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== - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== - -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 sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g== - -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-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.3" - -glob@^7.1.3, glob@^7.1.6: - version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.1.1" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^13.15.0: - version "13.15.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz#38113218c907d2f7e98658af246cef8b77e90bac" - integrity sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog== - dependencies: - type-fest "^0.20.2" - -google-closure-compiler-java@^20220502.0.0: - version "20220502.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20220502.0.0.tgz#a92696bfc05489738dc06f797041985bbfb334be" - integrity sha512-XDXw1v+1zcNHuEUXQg24eD9MUF2XTHnEDKCwF0P0zQe+8TWQajKvjsekdJnO6JH/Lqcu8XKc7dxO5+SMijr0sw== - -google-closure-compiler-linux@^20220502.0.0: - version "20220502.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20220502.0.0.tgz#64a3c1723f102e047433d85ec1dfd1d101a84b4f" - integrity sha512-T+2p/Qj02yGZHxymhj1oZsiHudNvI9sQKfCLoIH0wi0ikDiVIOh/dsH+57lsaGDJ+XTP/ur5Ozl8GIOjv1Efrw== - -google-closure-compiler-osx@^20220502.0.0: - version "20220502.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20220502.0.0.tgz#b5e40b2adf737622d435d9bfc99d0912a75f967e" - integrity sha512-VwEncD4I1gfkF3zyHlRcUsx2o/poC0qzHjBv+g3Z09wHy9tuqjQ4EP8LmN/GMuV2Hai6gQvkKC0XjYnZTFx2mQ== - -google-closure-compiler-windows@^20220502.0.0: - version "20220502.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20220502.0.0.tgz#6c07ebeddd70e138135ae9382b0ced50aea5add6" - integrity sha512-ssdAUS2VZxJAyciVrbhpnYymvm//V4CHyg8aLvMisUfWRDeUSsOCC5mNXy6D8f9i9bYHs3cFV3itIRUfnYCEWg== - -google-closure-compiler@20220502.0.0: - version "20220502.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20220502.0.0.tgz#94d793f60be006236b174f8e1bc3c1a493ed86f1" - integrity sha512-i9Qdve2v3jlerkHzlm00bpYds+kfAlIdeaOQ+acK/pHPHeLjhiXS+EyIpegVnH8+TY3I1QAMZFuVEXkMVJqpBQ== - dependencies: - chalk "2.x" - google-closure-compiler-java "^20220502.0.0" - minimist "1.x" - vinyl "2.x" - vinyl-sourcemaps-apply "^0.2.0" - optionalDependencies: - google-closure-compiler-linux "^20220502.0.0" - google-closure-compiler-osx "^20220502.0.0" - google-closure-compiler-windows "^20220502.0.0" - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== - -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== - -he@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" - integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== - -html-minifier-terser@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab" - integrity sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw== - dependencies: - camel-case "^4.1.2" - clean-css "^5.2.2" - commander "^8.3.0" - he "^1.2.0" - param-case "^3.0.4" - relateurl "^0.2.7" - terser "^5.10.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" - -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 sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.1, 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== - -inquirer@^6.0.0: - version "6.5.2" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca" - integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ== - dependencies: - ansi-escapes "^3.2.0" - chalk "^2.4.2" - cli-cursor "^2.1.0" - cli-width "^2.0.0" - external-editor "^3.0.3" - figures "^2.0.0" - lodash "^4.17.12" - mute-stream "0.0.7" - run-async "^2.2.0" - rxjs "^6.4.0" - string-width "^2.1.0" - strip-ansi "^5.1.0" - through "^2.3.6" - -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-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== - -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 sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w== - -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: - 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-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== - -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-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-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 sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== - -kuler@1.0.x: - version "1.0.1" - resolved "https://registry.yarnpkg.com/kuler/-/kuler-1.0.1.tgz#ef7c784f36c9fb6e16dd3150d152677b2b0228a6" - integrity sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ== - dependencies: - colornames "^1.1.1" - -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" - -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@4.17.15: - version "4.17.15" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" - integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== - -lodash@^4.17.12, lodash@^4.17.14: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -logform@^2.1.1, logform@^2.3.2: - version "2.4.1" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.4.1.tgz#512c9eaef738044d1c619790ba0f806c80d9d3a9" - integrity sha512-7XB/tqc3VRbri9pRjU6E97mQ8vC27ivJ3lct4jhyT+n0JNDd4YKldFl0D75NqDp46hk8RC7Ma1Vjv/UPf67S+A== - dependencies: - "@colors/colors" "1.5.0" - fecha "^4.2.0" - ms "^2.1.1" - safe-stable-stringify "^2.3.1" - triple-beam "^1.3.0" - -lower-case@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" - integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== - dependencies: - tslib "^2.0.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.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== - dependencies: - braces "^3.0.2" - picomatch "^2.3.1" - -mimic-fn@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" - integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== - -minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2: - 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.x, 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.1: - 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.6" - -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== - -mute-stream@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" - integrity sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ== - -natural-compare@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== - -no-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" - integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== - dependencies: - lower-case "^2.0.2" - tslib "^2.0.3" - -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== - dependencies: - wrappy "1" - -one-time@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e" - integrity sha512-qAMrwuk2xLEutlASoiPiAMW3EN3K96Ka/ilSXYr6qR1zSVXw2j7+yDSqGTC4T9apfLYxM3tLLjKvgPdAUK7kYQ== - -onetime@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" - integrity sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ== - dependencies: - mimic-fn "^1.0.0" - -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" - -os-tmpdir@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== - -param-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" - integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== - dependencies: - dot-case "^3.0.4" - tslib "^2.0.3" - -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" - -pascal-case@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" - integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== - dependencies: - no-case "^3.0.4" - tslib "^2.0.3" - -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 sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== - -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== - -picomatch@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" - integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== - -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== - -process-nextick-args@^2.0.0, 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== - -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== - -readable-stream@^2.3.5: - 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.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" - -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== - -relateurl@^0.2.7: - version "0.2.7" - resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" - integrity sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog== - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw== - -replace-ext@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a" - integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw== - -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== - -restore-cursor@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" - integrity sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q== - dependencies: - onetime "^2.0.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: - 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-async@^2.2.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" - integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== - -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.4.0: - 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.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.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@^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== - -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== - -simple-swizzle@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" - integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg== - dependencies: - is-arrayish "^0.3.1" - -slice-ansi@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" - integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== - dependencies: - ansi-styles "^3.2.0" - astral-regex "^1.0.0" - is-fullwidth-code-point "^2.0.0" - -source-map-support@~0.5.20: - 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.7.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== - -source-map@^0.5.1: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== - -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== - -stack-trace@0.0.x: - version "0.0.10" - resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" - integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== - -string-width@^2.1.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.1.0: - 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.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" - -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow== - 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, 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@^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== - -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@5.4.6: - version "5.4.6" - resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" - integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug== - dependencies: - ajv "^6.10.2" - lodash "^4.17.14" - slice-ansi "^2.1.0" - string-width "^3.0.0" - -tabtab@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/tabtab/-/tabtab-3.0.2.tgz#a2cea0f1035f88d145d7da77eaabbd3fe03e1ec9" - integrity sha512-jANKmUe0sIQc/zTALTBy186PoM/k6aPrh3A7p6AaAfF6WPSbTx1JYeGIGH162btpH+mmVEXln+UxwViZHO2Jhg== - dependencies: - debug "^4.0.1" - es6-promisify "^6.0.0" - inquirer "^6.0.0" - minimist "^1.2.0" - mkdirp "^0.5.1" - untildify "^3.0.3" - -terser@^5.10.0: - version "5.14.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.1.tgz#7c95eec36436cb11cf1902cc79ac564741d19eca" - integrity sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ== - dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" - commander "^2.20.0" - source-map-support "~0.5.20" - -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 sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== - -through@^2.3.6: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== - -tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== - dependencies: - os-tmpdir "~1.0.2" - -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" - -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== - -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== - -tslib@^2.0.3: - version "2.4.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" - integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== - -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-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== - -untildify@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9" - integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA== - -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.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 sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== - -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== - -vinyl-sourcemaps-apply@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705" - integrity sha512-+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw== - dependencies: - source-map "^0.5.1" - -vinyl@2.x: - version "2.2.1" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974" - integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw== - dependencies: - clone "^2.1.1" - clone-buffer "^1.0.0" - clone-stats "^1.0.0" - cloneable-readable "^1.0.0" - remove-trailing-separator "^1.0.1" - replace-ext "^1.0.0" - -wasm2c@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz#761671e141c46b8a7c6c54429db1e6bfa3cd0ec0" - integrity sha512-4SIESF2JNxrry6XFa/UQcsQibn+bxPkQ/oqixiXz2o8fsMl8J4vtvhH/evgbi8vZajAlaukuihEcQTWb9tVLUA== - -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" - -winston-transport@^4.3.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.5.0.tgz#6e7b0dd04d393171ed5e4e4905db265f7ab384fa" - integrity sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q== - dependencies: - logform "^2.3.2" - readable-stream "^3.6.0" - triple-beam "^1.3.0" - -winston@3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.2.1.tgz#63061377976c73584028be2490a1846055f77f07" - integrity sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw== - dependencies: - async "^2.6.1" - diagnostics "^1.1.1" - is-stream "^1.1.0" - logform "^2.1.1" - one-time "0.0.4" - readable-stream "^3.1.1" - stack-trace "0.0.x" - triple-beam "^1.3.0" - winston-transport "^4.3.0" - -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" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== - -ws@^8.6.0: - version "8.8.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.0.tgz#8e71c75e2f6348dbf8d78005107297056cb77769" - integrity sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ== diff --git a/pkgs/development/compilers/emscripten/yarn.nix b/pkgs/development/compilers/emscripten/yarn.nix deleted file mode 100644 index d22d1c7d615b..000000000000 --- a/pkgs/development/compilers/emscripten/yarn.nix +++ /dev/null @@ -1,1861 +0,0 @@ -{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { - offline_cache = linkFarm "offline" packages; - packages = [ - { - name = "_caporal_core___core_2.0.2.tgz"; - path = fetchurl { - name = "_caporal_core___core_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@caporal/core/-/core-2.0.2.tgz"; - sha512 = "o3J5aZINFWkkL+sL0DUs1dPHJjaetAAdwMRLbJ4U8aJW3K81E323IFMkFNYcOwTiPVhNzllC3USxZbU6xWFjFg=="; - }; - } - { - name = "_colors_colors___colors_1.5.0.tgz"; - path = fetchurl { - name = "_colors_colors___colors_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz"; - sha512 = "ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="; - }; - } - { - name = "_eslint_eslintrc___eslintrc_1.3.0.tgz"; - path = fetchurl { - name = "_eslint_eslintrc___eslintrc_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz"; - sha512 = "UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw=="; - }; - } - { - 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=="; - }; - } - { - name = "_jridgewell_gen_mapping___gen_mapping_0.3.1.tgz"; - path = fetchurl { - name = "_jridgewell_gen_mapping___gen_mapping_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz"; - sha512 = "GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg=="; - }; - } - { - name = "_jridgewell_resolve_uri___resolve_uri_3.0.7.tgz"; - path = fetchurl { - name = "_jridgewell_resolve_uri___resolve_uri_3.0.7.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz"; - sha512 = "8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA=="; - }; - } - { - name = "_jridgewell_set_array___set_array_1.1.1.tgz"; - path = fetchurl { - name = "_jridgewell_set_array___set_array_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz"; - sha512 = "Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="; - }; - } - { - name = "_jridgewell_source_map___source_map_0.3.2.tgz"; - path = fetchurl { - name = "_jridgewell_source_map___source_map_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz"; - sha512 = "m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw=="; - }; - } - { - name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.13.tgz"; - path = fetchurl { - name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.13.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz"; - sha512 = "GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="; - }; - } - { - name = "_jridgewell_trace_mapping___trace_mapping_0.3.13.tgz"; - path = fetchurl { - name = "_jridgewell_trace_mapping___trace_mapping_0.3.13.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz"; - sha512 = "o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w=="; - }; - } - { - 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_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_lodash___lodash_4.14.149.tgz"; - path = fetchurl { - name = "_types_lodash___lodash_4.14.149.tgz"; - url = "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.149.tgz"; - sha512 = "ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ=="; - }; - } - { - 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_node___node_18.0.0.tgz"; - path = fetchurl { - name = "_types_node___node_18.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz"; - sha512 = "cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA=="; - }; - } - { - name = "_types_node___node_13.9.3.tgz"; - path = fetchurl { - name = "_types_node___node_13.9.3.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-13.9.3.tgz"; - sha512 = "01s+ac4qerwd6RHD+mVbOEsraDHSgUaefQlEdBbUolnQFjKwCr7luvAlEwW1RFojh67u0z4OUTjPn9LEl4zIkA=="; - }; - } - { - name = "_types_table___table_5.0.0.tgz"; - path = fetchurl { - name = "_types_table___table_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/table/-/table-5.0.0.tgz"; - sha512 = "fQLtGLZXor264zUPWI95WNDsZ3QV43/c0lJpR/h1hhLJumXRmHNsrvBfEzW2YMhb0EWCsn4U6h82IgwsajAuTA=="; - }; - } - { - name = "_types_tabtab___tabtab_3.0.2.tgz"; - path = fetchurl { - name = "_types_tabtab___tabtab_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/tabtab/-/tabtab-3.0.2.tgz"; - sha512 = "d8aOSJPS3SEGZevyr7vbAVUNPWGFmdFlk13vbPPK87vz+gYGM57L8T11k4wK2mOgQYZjEVYQEqmCTvupPoQBWw=="; - }; - } - { - name = "_types_wrap_ansi___wrap_ansi_3.0.0.tgz"; - path = fetchurl { - name = "_types_wrap_ansi___wrap_ansi_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz"; - sha512 = "ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g=="; - }; - } - { - name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; - path = fetchurl { - 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=="; - }; - } - { - name = "acorn___acorn_8.7.1.tgz"; - path = fetchurl { - name = "acorn___acorn_8.7.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz"; - sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; - }; - } - { - 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_escapes___ansi_escapes_3.2.0.tgz"; - path = fetchurl { - name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; - sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; - }; - } - { - name = "ansi_regex___ansi_regex_3.0.1.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz"; - sha512 = "+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="; - }; - } - { - name = "ansi_regex___ansi_regex_4.1.1.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz"; - sha512 = "ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="; - }; - } - { - 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 = "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 = "astral_regex___astral_regex_1.0.0.tgz"; - path = fetchurl { - name = "astral_regex___astral_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz"; - sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; - }; - } - { - name = "async___async_2.6.4.tgz"; - path = fetchurl { - name = "async___async_2.6.4.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz"; - sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; - }; - } - { - 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 = "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 = "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 = "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 = "camel_case___camel_case_4.1.2.tgz"; - path = fetchurl { - name = "camel_case___camel_case_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz"; - sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; - }; - } - { - 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_3.0.0.tgz"; - path = fetchurl { - name = "chalk___chalk_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; - sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; - }; - } - { - 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 = "chardet___chardet_0.7.0.tgz"; - path = fetchurl { - name = "chardet___chardet_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz"; - sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; - }; - } - { - name = "clean_css___clean_css_5.3.0.tgz"; - path = fetchurl { - name = "clean_css___clean_css_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.0.tgz"; - sha512 = "YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ=="; - }; - } - { - name = "cli_cursor___cli_cursor_2.1.0.tgz"; - path = fetchurl { - name = "cli_cursor___cli_cursor_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha512 = "8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw=="; - }; - } - { - 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"; - sha512 = "GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="; - }; - } - { - name = "clone_buffer___clone_buffer_1.0.0.tgz"; - path = fetchurl { - name = "clone_buffer___clone_buffer_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz"; - sha512 = "KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g=="; - }; - } - { - name = "clone_stats___clone_stats_1.0.0.tgz"; - path = fetchurl { - name = "clone_stats___clone_stats_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz"; - sha512 = "au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag=="; - }; - } - { - name = "clone___clone_2.1.2.tgz"; - path = fetchurl { - name = "clone___clone_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz"; - sha512 = "3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="; - }; - } - { - name = "cloneable_readable___cloneable_readable_1.1.3.tgz"; - path = fetchurl { - name = "cloneable_readable___cloneable_readable_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz"; - sha512 = "2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ=="; - }; - } - { - 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"; - sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; - }; - } - { - 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 = "color_string___color_string_1.9.1.tgz"; - path = fetchurl { - name = "color_string___color_string_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz"; - sha512 = "shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg=="; - }; - } - { - name = "color___color_3.2.1.tgz"; - path = fetchurl { - name = "color___color_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz"; - sha512 = "aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA=="; - }; - } - { - name = "colornames___colornames_1.1.1.tgz"; - path = fetchurl { - name = "colornames___colornames_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz"; - sha512 = "/pyV40IrsdulWv+wFPmERh9k/mjsPZ64yUMDmWrtj/k1nmgrzzIENWKdaVKyBbvFdQWqkcaRxr+polCo3VMe7A=="; - }; - } - { - name = "colorspace___colorspace_1.1.4.tgz"; - path = fetchurl { - 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_2.20.3.tgz"; - path = fetchurl { - name = "commander___commander_2.20.3.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; - sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; - }; - } - { - name = "commander___commander_8.3.0.tgz"; - path = fetchurl { - name = "commander___commander_8.3.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz"; - sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; - }; - } - { - 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"; - sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; - }; - } - { - 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 = "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 = "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 = "deep_is___deep_is_0.1.4.tgz"; - path = fetchurl { - 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=="; - }; - } - { - name = "diagnostics___diagnostics_1.1.1.tgz"; - path = fetchurl { - name = "diagnostics___diagnostics_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz"; - sha512 = "8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ=="; - }; - } - { - 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"; - sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; - }; - } - { - name = "dot_case___dot_case_3.0.4.tgz"; - path = fetchurl { - name = "dot_case___dot_case_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz"; - sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="; - }; - } - { - 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"; - sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; - }; - } - { - 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 = "enabled___enabled_1.0.2.tgz"; - path = fetchurl { - name = "enabled___enabled_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz"; - sha512 = "nnzgVSpB35qKrUN8358SjO1bYAmxoThECTWw9s3J0x5G8A9hokKHVDFzBjVpCoSryo6MhN8woVyascN5jheaNA=="; - }; - } - { - name = "env_variable___env_variable_0.0.6.tgz"; - path = fetchurl { - name = "env_variable___env_variable_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.6.tgz"; - sha512 = "bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg=="; - }; - } - { - name = "es_check___es_check_6.2.1.tgz"; - path = fetchurl { - name = "es_check___es_check_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/es-check/-/es-check-6.2.1.tgz"; - sha512 = "IPiRXUlwSTd2yMklIf9yEGe6GK5wCS8Sz1aTNHm1QSiYzI4aiq19giYbLi95tb+e0JJVKmcU0iQXQWW60a8V9A=="; - }; - } - { - name = "es6_promisify___es6_promisify_6.1.1.tgz"; - path = fetchurl { - name = "es6_promisify___es6_promisify_6.1.1.tgz"; - url = "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-6.1.1.tgz"; - sha512 = "HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg=="; - }; - } - { - 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"; - sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; - }; - } - { - 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 = "eslint_config_google___eslint_config_google_0.14.0.tgz"; - path = fetchurl { - name = "eslint_config_google___eslint_config_google_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz"; - sha512 = "WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw=="; - }; - } - { - name = "eslint_scope___eslint_scope_7.1.1.tgz"; - path = fetchurl { - 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_utils___eslint_utils_3.0.0.tgz"; - path = fetchurl { - 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=="; - }; - } - { - name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; - 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"; - sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; - }; - } - { - name = "eslint_visitor_keys___eslint_visitor_keys_3.3.0.tgz"; - path = fetchurl { - 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 = "eslint___eslint_8.18.0.tgz"; - path = fetchurl { - name = "eslint___eslint_8.18.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-8.18.0.tgz"; - sha512 = "As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA=="; - }; - } - { - name = "espree___espree_9.3.2.tgz"; - path = fetchurl { - name = "espree___espree_9.3.2.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz"; - sha512 = "D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA=="; - }; - } - { - 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"; - sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; - }; - } - { - 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"; - sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; - }; - } - { - name = "estraverse___estraverse_5.3.0.tgz"; - path = fetchurl { - name = "estraverse___estraverse_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz"; - sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; - }; - } - { - 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"; - sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; - }; - } - { - name = "external_editor___external_editor_3.1.0.tgz"; - path = fetchurl { - name = "external_editor___external_editor_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz"; - sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; - }; - } - { - 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_glob___fast_glob_3.2.11.tgz"; - path = fetchurl { - 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=="; - }; - } - { - 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 = "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"; - sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; - }; - } - { - 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 = "fecha___fecha_4.2.3.tgz"; - path = fetchurl { - name = "fecha___fecha_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz"; - sha512 = "OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw=="; - }; - } - { - name = "figures___figures_2.0.0.tgz"; - path = fetchurl { - name = "figures___figures_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; - sha512 = "Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA=="; - }; - } - { - 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 = "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.5.tgz"; - path = fetchurl { - name = "flatted___flatted_3.2.5.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz"; - sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; - }; - } - { - 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"; - sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; - }; - } - { - 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"; - sha512 = "dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="; - }; - } - { - 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_parent___glob_parent_6.0.2.tgz"; - path = fetchurl { - 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.2.3.tgz"; - path = fetchurl { - name = "glob___glob_7.2.3.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz"; - sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; - }; - } - { - name = "globals___globals_13.15.0.tgz"; - path = fetchurl { - name = "globals___globals_13.15.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz"; - sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; - }; - } - { - name = "google_closure_compiler_java___google_closure_compiler_java_20220502.0.0.tgz"; - path = fetchurl { - name = "google_closure_compiler_java___google_closure_compiler_java_20220502.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20220502.0.0.tgz"; - sha512 = "XDXw1v+1zcNHuEUXQg24eD9MUF2XTHnEDKCwF0P0zQe+8TWQajKvjsekdJnO6JH/Lqcu8XKc7dxO5+SMijr0sw=="; - }; - } - { - name = "google_closure_compiler_linux___google_closure_compiler_linux_20220502.0.0.tgz"; - path = fetchurl { - name = "google_closure_compiler_linux___google_closure_compiler_linux_20220502.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20220502.0.0.tgz"; - sha512 = "T+2p/Qj02yGZHxymhj1oZsiHudNvI9sQKfCLoIH0wi0ikDiVIOh/dsH+57lsaGDJ+XTP/ur5Ozl8GIOjv1Efrw=="; - }; - } - { - name = "google_closure_compiler_osx___google_closure_compiler_osx_20220502.0.0.tgz"; - path = fetchurl { - name = "google_closure_compiler_osx___google_closure_compiler_osx_20220502.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20220502.0.0.tgz"; - sha512 = "VwEncD4I1gfkF3zyHlRcUsx2o/poC0qzHjBv+g3Z09wHy9tuqjQ4EP8LmN/GMuV2Hai6gQvkKC0XjYnZTFx2mQ=="; - }; - } - { - name = "google_closure_compiler_windows___google_closure_compiler_windows_20220502.0.0.tgz"; - path = fetchurl { - name = "google_closure_compiler_windows___google_closure_compiler_windows_20220502.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20220502.0.0.tgz"; - sha512 = "ssdAUS2VZxJAyciVrbhpnYymvm//V4CHyg8aLvMisUfWRDeUSsOCC5mNXy6D8f9i9bYHs3cFV3itIRUfnYCEWg=="; - }; - } - { - name = "google_closure_compiler___google_closure_compiler_20220502.0.0.tgz"; - path = fetchurl { - name = "google_closure_compiler___google_closure_compiler_20220502.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20220502.0.0.tgz"; - sha512 = "i9Qdve2v3jlerkHzlm00bpYds+kfAlIdeaOQ+acK/pHPHeLjhiXS+EyIpegVnH8+TY3I1QAMZFuVEXkMVJqpBQ=="; - }; - } - { - 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"; - sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; - }; - } - { - 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 = "he___he_1.2.0.tgz"; - path = fetchurl { - name = "he___he_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz"; - sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; - }; - } - { - name = "html_minifier_terser___html_minifier_terser_6.1.0.tgz"; - path = fetchurl { - name = "html_minifier_terser___html_minifier_terser_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz"; - sha512 = "YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw=="; - }; - } - { - 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"; - sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; - }; - } - { - name = "ignore___ignore_5.2.0.tgz"; - path = fetchurl { - name = "ignore___ignore_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz"; - sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; - }; - } - { - 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 = "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"; - sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; - }; - } - { - 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"; - sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; - }; - } - { - 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 = "inquirer___inquirer_6.5.2.tgz"; - path = fetchurl { - name = "inquirer___inquirer_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz"; - sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ=="; - }; - } - { - 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"; - sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; - }; - } - { - 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"; - sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; - }; - } - { - 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"; - sha512 = "VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="; - }; - } - { - 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_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"; - sha512 = "uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="; - }; - } - { - 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"; - sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; - }; - } - { - 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"; - sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; - }; - } - { - 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_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_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"; - sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; - }; - } - { - name = "kuler___kuler_1.0.1.tgz"; - path = fetchurl { - name = "kuler___kuler_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/kuler/-/kuler-1.0.1.tgz"; - sha512 = "J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ=="; - }; - } - { - 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"; - sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; - }; - } - { - 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"; - sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; - }; - } - { - name = "lodash___lodash_4.17.15.tgz"; - path = fetchurl { - name = "lodash___lodash_4.17.15.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; - sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; - }; - } - { - 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 = "logform___logform_2.4.1.tgz"; - path = fetchurl { - name = "logform___logform_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/logform/-/logform-2.4.1.tgz"; - sha512 = "7XB/tqc3VRbri9pRjU6E97mQ8vC27ivJ3lct4jhyT+n0JNDd4YKldFl0D75NqDp46hk8RC7Ma1Vjv/UPf67S+A=="; - }; - } - { - name = "lower_case___lower_case_2.0.2.tgz"; - path = fetchurl { - name = "lower_case___lower_case_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz"; - sha512 = "7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="; - }; - } - { - 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.5.tgz"; - path = fetchurl { - name = "micromatch___micromatch_4.0.5.tgz"; - url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz"; - sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; - }; - } - { - name = "mimic_fn___mimic_fn_1.2.0.tgz"; - path = fetchurl { - name = "mimic_fn___mimic_fn_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; - }; - } - { - 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.6.tgz"; - path = fetchurl { - 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=="; - }; - } - { - 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 = "ms___ms_2.1.3.tgz"; - path = fetchurl { - name = "ms___ms_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; - sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; - }; - } - { - name = "mute_stream___mute_stream_0.0.7.tgz"; - path = fetchurl { - name = "mute_stream___mute_stream_0.0.7.tgz"; - url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz"; - sha512 = "r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ=="; - }; - } - { - 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"; - sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; - }; - } - { - name = "no_case___no_case_3.0.4.tgz"; - path = fetchurl { - name = "no_case___no_case_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz"; - sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; - }; - } - { - 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"; - sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; - }; - } - { - name = "one_time___one_time_0.0.4.tgz"; - path = fetchurl { - name = "one_time___one_time_0.0.4.tgz"; - url = "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz"; - sha512 = "qAMrwuk2xLEutlASoiPiAMW3EN3K96Ka/ilSXYr6qR1zSVXw2j7+yDSqGTC4T9apfLYxM3tLLjKvgPdAUK7kYQ=="; - }; - } - { - name = "onetime___onetime_2.0.1.tgz"; - path = fetchurl { - name = "onetime___onetime_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; - sha512 = "oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ=="; - }; - } - { - 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"; - sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; - }; - } - { - name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; - path = fetchurl { - name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha512 = "D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="; - }; - } - { - name = "param_case___param_case_3.0.4.tgz"; - path = fetchurl { - name = "param_case___param_case_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz"; - sha512 = "RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A=="; - }; - } - { - 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 = "pascal_case___pascal_case_3.1.2.tgz"; - path = fetchurl { - name = "pascal_case___pascal_case_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz"; - sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g=="; - }; - } - { - 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"; - sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; - }; - } - { - 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 = "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=="; - }; - } - { - 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"; - sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; - }; - } - { - 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 = "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 = "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 = "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"; - sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; - }; - } - { - name = "regexpp___regexpp_3.2.0.tgz"; - path = fetchurl { - name = "regexpp___regexpp_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz"; - sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; - }; - } - { - name = "relateurl___relateurl_0.2.7.tgz"; - path = fetchurl { - name = "relateurl___relateurl_0.2.7.tgz"; - url = "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz"; - sha512 = "G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog=="; - }; - } - { - 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"; - sha512 = "/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="; - }; - } - { - name = "replace_ext___replace_ext_1.0.1.tgz"; - path = fetchurl { - name = "replace_ext___replace_ext_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz"; - sha512 = "yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw=="; - }; - } - { - 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 = "restore_cursor___restore_cursor_2.0.0.tgz"; - path = fetchurl { - name = "restore_cursor___restore_cursor_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha512 = "6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q=="; - }; - } - { - 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_async___run_async_2.4.1.tgz"; - path = fetchurl { - name = "run_async___run_async_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; - sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; - }; - } - { - 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 = "rxjs___rxjs_6.6.7.tgz"; - path = fetchurl { - name = "rxjs___rxjs_6.6.7.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz"; - sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; - }; - } - { - 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 = "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"; - sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; - }; - } - { - 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=="; - }; - } - { - 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 = "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 = "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"; - sha512 = "JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg=="; - }; - } - { - name = "slice_ansi___slice_ansi_2.1.0.tgz"; - path = fetchurl { - name = "slice_ansi___slice_ansi_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz"; - sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; - }; - } - { - 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.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"; - sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; - }; - } - { - 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"; - sha512 = "LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="; - }; - } - { - 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 = "stack_trace___stack_trace_0.0.10.tgz"; - path = fetchurl { - name = "stack_trace___stack_trace_0.0.10.tgz"; - url = "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz"; - sha512 = "KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg=="; - }; - } - { - 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"; - sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; - }; - } - { - 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"; - sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; - }; - } - { - 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.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"; - sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; - }; - } - { - 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_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"; - sha512 = "4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow=="; - }; - } - { - 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"; - sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; - }; - } - { - 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_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"; - sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; - }; - } - { - 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 = "table___table_5.4.6.tgz"; - path = fetchurl { - name = "table___table_5.4.6.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz"; - sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; - }; - } - { - name = "tabtab___tabtab_3.0.2.tgz"; - path = fetchurl { - name = "tabtab___tabtab_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/tabtab/-/tabtab-3.0.2.tgz"; - sha512 = "jANKmUe0sIQc/zTALTBy186PoM/k6aPrh3A7p6AaAfF6WPSbTx1JYeGIGH162btpH+mmVEXln+UxwViZHO2Jhg=="; - }; - } - { - name = "terser___terser_5.14.1.tgz"; - path = fetchurl { - name = "terser___terser_5.14.1.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-5.14.1.tgz"; - sha512 = "+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ=="; - }; - } - { - name = "text_hex___text_hex_1.0.0.tgz"; - path = fetchurl { - name = "text_hex___text_hex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz"; - sha512 = "uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="; - }; - } - { - 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"; - sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; - }; - } - { - 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"; - sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="; - }; - } - { - name = "tmp___tmp_0.0.33.tgz"; - path = fetchurl { - name = "tmp___tmp_0.0.33.tgz"; - url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz"; - sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; - }; - } - { - 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 = "triple_beam___triple_beam_1.3.0.tgz"; - path = fetchurl { - name = "triple_beam___triple_beam_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz"; - sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; - }; - } - { - name = "tslib___tslib_1.14.1.tgz"; - path = fetchurl { - name = "tslib___tslib_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; - sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; - }; - } - { - name = "tslib___tslib_2.4.0.tgz"; - path = fetchurl { - name = "tslib___tslib_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz"; - sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; - }; - } - { - 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"; - sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; - }; - } - { - 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 = "untildify___untildify_3.0.3.tgz"; - path = fetchurl { - name = "untildify___untildify_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz"; - sha512 = "iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA=="; - }; - } - { - 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"; - sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; - }; - } - { - 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 = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.2.1.tgz"; - path = fetchurl { - name = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz"; - sha512 = "+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw=="; - }; - } - { - name = "vinyl___vinyl_2.2.1.tgz"; - path = fetchurl { - name = "vinyl___vinyl_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz"; - sha512 = "LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw=="; - }; - } - { - name = "wasm2c___wasm2c_1.0.0.tgz"; - path = fetchurl { - name = "wasm2c___wasm2c_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz"; - sha512 = "4SIESF2JNxrry6XFa/UQcsQibn+bxPkQ/oqixiXz2o8fsMl8J4vtvhH/evgbi8vZajAlaukuihEcQTWb9tVLUA=="; - }; - } - { - 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 = "winston_transport___winston_transport_4.5.0.tgz"; - path = fetchurl { - name = "winston_transport___winston_transport_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.5.0.tgz"; - sha512 = "YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q=="; - }; - } - { - name = "winston___winston_3.2.1.tgz"; - path = fetchurl { - name = "winston___winston_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/winston/-/winston-3.2.1.tgz"; - sha512 = "zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw=="; - }; - } - { - 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"; - sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; - }; - } - { - 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"; - sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; - }; - } - { - 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"; - sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; - }; - } - { - name = "ws___ws_8.8.0.tgz"; - path = fetchurl { - name = "ws___ws_8.8.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.8.0.tgz"; - sha512 = "JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ=="; - }; - } - ]; -} diff --git a/pkgs/development/compilers/flasm/default.nix b/pkgs/development/compilers/flasm/default.nix index 02ee36642397..c1d2cfedc984 100644 --- a/pkgs/development/compilers/flasm/default.nix +++ b/pkgs/development/compilers/flasm/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Assembler and disassembler for Flash (SWF) bytecode"; - homepage = "http://flasm.sourceforge.net/"; + homepage = "https://flasm.sourceforge.net/"; license = licenses.bsd2; maintainers = with maintainers; [ siraben ]; platforms = platforms.all; diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index f9a801284686..642bcff6469e 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -24,9 +24,11 @@ let sha256 = hash; }; }; + flutter2Patches = getPatches ./patches/flutter2; + flutter3Patches = getPatches ./patches/flutter3; in { - inherit mkFlutter; + inherit mkFlutter flutterDrv flutter2Patches flutter3Patches; stable = flutterDrv { pname = "flutter"; version = "3.3.8"; @@ -36,7 +38,7 @@ in x86_64-linux = "sha256-lFw+KaxzhuAMnu6ypczINqywzpiD+8Kd+C/UHJDrO9Y="; aarch64-linux = "sha256-snlFTY4oJ4ALGLc210USbI2Z///cx1IVYUWm7Vo5z2I="; }; - patches = getPatches ./patches/flutter3; + patches = flutter3Patches; }; v2 = flutterDrv { @@ -48,6 +50,6 @@ in x86_64-linux = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI="; aarch64-linux = "sha256-vmerjXkUAUnI8FjK+62qLqgETmA+BLPEZXFxwYpI+KY="; }; - patches = getPatches ./patches/flutter2; + patches = flutter2Patches; }; } diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index c9b8a2113491..531107ddd448 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -85,7 +85,7 @@ let ''; doInstallCheck = true; - installCheckInputs = [ which ]; + nativeInstallCheckInputs = [ which ]; installCheckPhase = '' runHook preInstallCheck @@ -175,7 +175,7 @@ runCommand drvName homepage = "https://flutter.dev"; license = licenses.bsd3; platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ babariviere ericdallo ]; + maintainers = with maintainers; [ babariviere ericdallo h7x4 ]; }; } '' mkdir -p $out/bin diff --git a/pkgs/development/compilers/fpc/binary-builder-darwin.sh b/pkgs/development/compilers/fpc/binary-builder-darwin.sh index f9bdf18e7d68..39db0518281d 100755 --- a/pkgs/development/compilers/fpc/binary-builder-darwin.sh +++ b/pkgs/development/compilers/fpc/binary-builder-darwin.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup pkgdir=$(pwd)/pkg diff --git a/pkgs/development/compilers/fpc/binary-builder.sh b/pkgs/development/compilers/fpc/binary-builder.sh index 4308c1ed211a..c471378c275f 100755 --- a/pkgs/development/compilers/fpc/binary-builder.sh +++ b/pkgs/development/compilers/fpc/binary-builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup tar xf $src diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index a269edd6668a..748869ea63c5 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }: +{ lib, stdenv, writeScript, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles, removeReferencesTo }: stdenv.mkDerivation rec { pname = "fstar"; - version = "2022.01.15"; + version = "2023.02.01"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "sha256-bK3McF/wTjT9q6luihPaEXjx7Lu6+ZbQ9G61Mc4KoB0="; + hash = "sha256-sLhbIGF7j1tH8zKsPq1qOSwHvYDrVCyfln9UbE3IYv0="; }; strictDeps = true; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper installShellFiles + removeReferencesTo ] ++ (with ocamlPackages; [ ocaml findlib @@ -55,12 +56,25 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/fstarlib ''; postInstall = '' + # Remove build artifacts + find $out -name _build -type d | xargs -I{} rm -rf "{}" + remove-references-to -t '${ocamlPackages.ocaml}' $out/bin/fstar.exe + wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin" installShellCompletion --bash .completion/bash/fstar.exe.bash installShellCompletion --fish .completion/fish/fstar.exe.fish installShellCompletion --zsh --name _fstar.exe .completion/zsh/__fstar.exe ''; + passthru.updateScript = writeScript "update-fstar" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p git gnugrep common-updater-scripts + set -eu -o pipefail + + version="$(git ls-remote --tags git@github.com:FStarLang/FStar.git | grep -Po 'v\K\d{4}\.\d{2}\.\d{2}' | sort | tail -n1)" + update-source-version fstar "$version" + ''; + meta = with lib; { description = "ML-like functional programming language aimed at program verification"; homepage = "https://www.fstar-lang.org"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix index 67d775eb7cd8..b10ac198430b 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , ncurses5 -, python27 }: stdenv.mkDerivation rec { @@ -40,7 +39,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true done ''; diff --git a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix new file mode 100644 index 000000000000..caff0ad023f8 --- /dev/null +++ b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchurl +, ncurses5 +, python38 +}: + +stdenv.mkDerivation rec { + pname = "gcc-arm-embedded"; + version = "12.2.rel1"; + + platform = { + aarch64-linux = "aarch64"; + x86_64-darwin = "darwin-x86_64"; + x86_64-linux = "x86_64"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; + sha256 = { + aarch64-linux = "131ydgndff7dyhkivfchbk43lv3cv2p172knkqilx64aapvk5qvy"; + x86_64-darwin = "00i9gd1ny00681pwinh6ng9x45xsyrnwc6hm2vr348z9gasyxh00"; + x86_64-linux = "0rv8r5zh0a5621v0xygxi8f6932qgwinw2s9vnniasp9z7897gl4"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; + + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + + installPhase = '' + mkdir -p $out + cp -r * $out + ''; + + preFixup = '' + find $out -type f | while read f; do + patchelf "$f" > /dev/null 2>&1 || continue + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 ]} "$f" || true + done + ''; + + meta = with lib; { + description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; + homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; + license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; + maintainers = with maintainers; [ prusnak ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index a0d414d974f0..51f3c10f6735 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , ncurses5 -, python27 }: stdenv.mkDerivation rec { @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true done ''; diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 4df2a90f52ea..4d63f7c3ecdc 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , ncurses5 -, python27 }: stdenv.mkDerivation rec { @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true done ''; diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index 152ecdb867d9..6673cb823485 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , ncurses5 -, python27 }: stdenv.mkDerivation rec { @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true done ''; diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix index c625134508e3..841084904cf9 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , ncurses5 -, python27 }: stdenv.mkDerivation rec { @@ -41,7 +40,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true done ''; diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index e4cebab266e8..76374201f456 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -13,7 +13,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , gnatboot ? null @@ -51,8 +51,14 @@ let majorVersion = "10"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - patches = [ ] - ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + patches = [ + # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 + (fetchurl { + name = "fix-bug-80431.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; + sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; + }) + ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied @@ -185,7 +191,7 @@ stdenv.mkDerivation ({ preConfigure = (import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; + inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; }) + '' ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h ''; @@ -202,7 +208,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib @@ -222,6 +228,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/pkgs/development/compilers/gcc/11/avr-gcc-11.3-darwin.patch b/pkgs/development/compilers/gcc/11/avr-gcc-11.3-darwin.patch new file mode 100644 index 000000000000..787862fbcffa --- /dev/null +++ b/pkgs/development/compilers/gcc/11/avr-gcc-11.3-darwin.patch @@ -0,0 +1,20 @@ +--- a/gcc/config/avr/avr.c 2022-10-08 19:18:33.000000000 +0200 ++++ b/gcc/config/avr/avr.patched.c 2022-10-08 19:19:34.000000000 +0200 +@@ -10196,7 +10196,7 @@ + to track need of __do_copy_data. */ + + static void +-avr_output_data_section_asm_op (const void *data) ++avr_output_data_section_asm_op (const char *data) + { + avr_need_copy_data_p = true; + +@@ -10209,7 +10209,7 @@ + to track need of __do_clear_bss. */ + + static void +-avr_output_bss_section_asm_op (const void *data) ++avr_output_bss_section_asm_op (const char *data) + { + avr_need_clear_bss_p = true; + diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 220339c29595..1d3dff7c6f2a 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -13,7 +13,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , gnatboot ? null @@ -47,18 +47,18 @@ with lib; with builtins; let majorVersion = "11"; - # The patch below for aarch64-darwin does not apply to 11.3.0 and an - # updated version is not available. Keep aarch64-darwin on 11.2.0 so the - # large body of packages which depend on gfortran are still functional - # until GCC 12 is the default. - # On x86_64-darwin, building libgcc suffers from some different issues with 11.3.0. - version = if stdenv.isDarwin then - "${majorVersion}.2.0" else "${majorVersion}.3.0"; + version = "${majorVersion}.3.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - patches = - optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + patches = [ + # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 + (fetchurl { + name = "fix-bug-80431.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; + sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; + }) + ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied @@ -70,10 +70,16 @@ let majorVersion = "11"; ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch - ++ optional (stdenv.isDarwin && stdenv.isAarch64) (fetchpatch { - url = "https://github.com/fxcoudert/gcc/compare/releases/gcc-11.2.0...gcc-11.2.0-arm-20211201.diff"; - sha256 = "sha256-z62s/cXuH9Kgq/oD/OiiZ8LWnX1xl1D43sONnwaEW1w="; - }) + ++ optionals stdenv.isDarwin [ + (fetchpatch { + # There are no upstream release tags in https://github.com/iains/gcc-11-branch. + # 2d280e7 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.3.0 + url = "https://github.com/iains/gcc-11-branch/compare/2d280e7eafc086e9df85f50ed1a6526d6a3a204d..gcc-11.3-darwin-r2.diff"; + sha256 = "sha256-LFAXUEoYD7YeCG8V9mWanygyQOI7U5OhCRIKOVCCDAg="; + }) + ] + # https://github.com/osx-cross/homebrew-avr/issues/280#issuecomment-1272381808 + ++ optional (stdenv.isDarwin && targetPlatform.isAvr) ./avr-gcc-11.3-darwin.patch # Obtain latest patch with ../update-mcfgthread-patches.sh ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch; @@ -93,9 +99,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = if stdenv.isDarwin - then "sha256-0I7cU2tUw3KhAQ/2YZ3SdMDxYDqkkhK6IPeqLNo2+os=" - else "sha256-tHzygYaR9bHiHfK7OMeV+sLPvWQO3i0KXhyJ4zijrDk="; + sha256 = "sha256-tHzygYaR9bHiHfK7OMeV+sLPvWQO3i0KXhyJ4zijrDk="; }; inherit patches; @@ -193,7 +197,7 @@ stdenv.mkDerivation ({ preConfigure = (import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; + inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; }) + '' ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h ''; @@ -210,7 +214,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib @@ -230,6 +234,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 78c7a12027ce..3fe6620987a3 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -13,9 +13,10 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null +, libucontext ? null , gnatboot ? null , enableMultilib ? false , enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins @@ -70,6 +71,50 @@ let majorVersion = "12"; }) ++ optional langD ../libphobos.patch + # backport fixes to build gccgo with musl libc + ++ optionals (langGo && stdenv.hostPlatform.isMusl) [ + (fetchpatch { + excludes = [ "gcc/go/gofrontend/MERGE" ]; + url = "https://github.com/gcc-mirror/gcc/commit/cf79b1117bd177d3d4c6ed24b6fa243c3628ac2d.diff"; + hash = "sha256-mS5ZiYi5D8CpGXrWg3tXlbhp4o86ew1imCTwaHLfl+I="; + }) + (fetchpatch { + excludes = [ "gcc/go/gofrontend/MERGE" ]; + url = "https://github.com/gcc-mirror/gcc/commit/7f195a2270910a6ed08bd76e3a16b0a6503f9faf.diff"; + hash = "sha256-Ze/cFM0dQofKH00PWPDoklXUlwWhwA1nyTuiDAZ6FKo="; + }) + (fetchpatch { + excludes = [ "gcc/go/gofrontend/MERGE" ]; + url = "https://github.com/gcc-mirror/gcc/commit/762fd5e5547e464e25b4bee435db6df4eda0de90.diff"; + hash = "sha256-o28upwTcHAnHG2Iq0OewzwSBEhHs+XpBGdIfZdT81pk="; + }) + (fetchpatch { + excludes = [ "gcc/go/gofrontend/MERGE" ]; + url = "https://github.com/gcc-mirror/gcc/commit/e73d9fcafbd07bc3714fbaf8a82db71d50015c92.diff"; + hash = "sha256-1SjYCVHLEUihdON2TOC3Z2ufM+jf2vH0LvYtZL+c1Fo="; + }) + (fetchpatch { + excludes = [ "gcc/go/gofrontend/MERGE" ]; + url = "https://github.com/gcc-mirror/gcc/commit/b6c6a3d64f2e4e9347733290aca3c75898c44b2e.diff"; + hash = "sha256-RycJ3YCHd3MXtYFjxP0zY2Wuw7/C4bWoBAQtTKJZPOQ="; + }) + (fetchpatch { + excludes = [ "gcc/go/gofrontend/MERGE" ]; + url = "https://github.com/gcc-mirror/gcc/commit/2b1a604a9b28fbf4f382060bebd04adb83acc2f9.diff"; + hash = "sha256-WiBQG0Xbk75rHk+AMDvsbrm+dc7lDH0EONJXSdEeMGE="; + }) + (fetchpatch { + url = "https://github.com/gcc-mirror/gcc/commit/c86b726c048eddc1be320c0bf64a897658bee13d.diff"; + hash = "sha256-QSIlqDB6JRQhbj/c3ejlmbfWz9l9FurdSWxpwDebnlI="; + }) + ] + + # Fix detection of bootstrap compiler Ada support (cctools as) on Nix Darwin + ++ optional (stdenv.isDarwin && langAda) ../ada-cctools-as-detection-configure.patch + + # Use absolute path in GNAT dylib install names on Darwin + ++ optional (stdenv.isDarwin && langAda) ../gnat-darwin-dylib-install-name.patch + # Obtain latest patch with ../update-mcfgthread-patches.sh ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch; @@ -178,6 +223,7 @@ stdenv.mkDerivation ({ targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) + ++ (optional (langGo && stdenv.hostPlatform.isMusl) libucontext) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package; @@ -187,7 +233,7 @@ stdenv.mkDerivation ({ preConfigure = (import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; + inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; }) + '' ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h ''; @@ -204,7 +250,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib @@ -224,6 +270,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index ba084af53ee5..810706ed0f3d 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -12,7 +12,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkg-config ? null @@ -192,7 +192,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform langJava langGo crossStageStatic enableMultilib; + inherit version targetPlatform hostPlatform buildPlatform langJava langGo crossStageStatic enableMultilib; }; dontDisableStatic = true; @@ -207,7 +207,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl cloog enableLTO @@ -227,6 +227,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 516cdee708d3..e25af867e537 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -12,7 +12,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkg-config ? null @@ -147,7 +147,7 @@ stdenv.mkDerivation ({ hardeningDisable = [ "format" "pie" ]; - # When targetting darwin, libgcc_ext.10.{4,5}.dylib are created as + # When targeting darwin, libgcc_ext.10.{4,5}.dylib are created as # MH_DYLIB_STUB files, which install_name_tool can't change, so we # get a cycle between $out and $lib. outputs = if langJava || langGo || targetPlatform.isDarwin then ["out" "man" "info"] @@ -212,7 +212,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform langJava langGo crossStageStatic enableMultilib; + inherit version targetPlatform hostPlatform buildPlatform langJava langGo crossStageStatic enableMultilib; }; dontDisableStatic = true; @@ -227,7 +227,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl cloog enableLTO @@ -247,6 +247,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 8bd9d41f1eae..450b23310337 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -14,7 +14,7 @@ , texinfo ? null , flex , perl ? null # optional, for texi2pod (then pod2man); required for Java -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , gnatboot ? null @@ -64,6 +64,13 @@ let majorVersion = "6"; patches = optionals (!stdenv.targetPlatform.isRedox) [ ../use-source-date-epoch.patch ./0001-Fix-build-for-glibc-2.31.patch + + # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 + (fetchurl { + name = "fix-bug-80431.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; + sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; + }) ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional langAda ../gnat-cflags.patch @@ -223,7 +230,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform gnatboot langJava langAda langGo crossStageStatic enableMultilib; + inherit version targetPlatform hostPlatform buildPlatform gnatboot langJava langAda langGo crossStageStatic enableMultilib; }; dontDisableStatic = true; @@ -238,7 +245,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib @@ -258,6 +265,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 637be9fd971c..a0465e8bdd60 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -11,7 +11,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , enableMultilib ? false @@ -56,6 +56,13 @@ let majorVersion = "7"; ./gcc8-asan-glibc-2.34.patch ./0001-Fix-build-for-glibc-2.31.patch + + # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 + (fetchurl { + name = "fix-bug-80431.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; + sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; + }) ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optionals targetPlatform.isNetBSD [ @@ -191,7 +198,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform langGo crossStageStatic enableMultilib; + inherit version targetPlatform hostPlatform buildPlatform langGo crossStageStatic enableMultilib; }; dontDisableStatic = true; @@ -206,7 +213,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib @@ -226,6 +233,7 @@ stdenv.mkDerivation ({ ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 4eb47d00c5c2..03fb9fb1205c 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -11,7 +11,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , enableMultilib ? false @@ -46,8 +46,14 @@ let majorVersion = "8"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - patches = - optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + patches = [ + # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 + (fetchurl { + name = "fix-bug-80431.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; + sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; + }) + ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch ++ optional noSysDirs ../no-sys-dirs.patch /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied @@ -173,7 +179,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform langGo crossStageStatic enableMultilib; + inherit version targetPlatform hostPlatform buildPlatform langGo crossStageStatic enableMultilib; }; dontDisableStatic = true; @@ -188,7 +194,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib @@ -206,6 +212,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 4c49cdaa3e25..317c77ea835f 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -13,7 +13,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , gnatboot ? null @@ -55,9 +55,14 @@ let majorVersion = "9"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - patches = - [ ] - ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + patches = [ + # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 + (fetchurl { + name = "fix-bug-80431.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; + sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; + }) + ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv-gcc9.patch @@ -186,7 +191,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; + inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; }; dontDisableStatic = true; @@ -201,7 +206,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib @@ -221,6 +226,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/pkgs/development/compilers/gcc/ada-cctools-as-detection-configure.patch b/pkgs/development/compilers/gcc/ada-cctools-as-detection-configure.patch new file mode 100644 index 000000000000..e6b5b3653322 --- /dev/null +++ b/pkgs/development/compilers/gcc/ada-cctools-as-detection-configure.patch @@ -0,0 +1,33 @@ +As originally implemented, the error message check +described in the configure script +breaks detection of Ada compiler support on x86_64-darwin, +because the assembler in the version of cctools currently used +unconditionally emits a deprecation message to stdout, +with no way to disable it. + +Furthermore, GCC 3.4 was the minimum version needed to build GNAT +as far back as GCC 4.4 (see the GCC git repo, tags/releases/gcc-4.4.0, +gcc/doc/install.texi, lines 2052-2053 [1]); +GCC 3.4 is newer than any of the broken GCC versions +that the configure script works around +(see the part of the comment in the configure script +before the context in the patch below), +and GCC 4.4 is older than any GCC that Nix currently packages (GCC 4.8). + +We therefore choose to not check for error messages, +and just check for an error code. +There's no harm in still checking for an object file being created, though. + +[1]: https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/doc/install.texi;h=6bdfbece981f7fb6c26da672d45e5d3ba7879c69;hb=b7fc996728085c0591ea7c5d0e1c84a8f6a29bd8#l2052 +--- a/configure 2022-08-19 18:09:52.000000000 +1000 ++++ b/configure 2022-12-26 17:30:49.000000000 +1100 +@@ -5622,8 +5622,7 @@ + # Other compilers, like HP Tru64 UNIX cc, exit successfully when + # given a .adb file, but produce no object file. So we must check + # if an object file was really produced to guard against this. +-errors=`(${CC} -c conftest.adb) 2>&1 || echo failure` +-if test x"$errors" = x && test -f conftest.$ac_objext; then ++if ${CC} -c conftest.adb && test -f conftest.$ac_objext; then + acx_cv_cc_gcc_supports_ada=yes + fi + rm -f conftest.* diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index c73e9e0c1075..dd5a8de76e2a 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup @@ -202,6 +203,17 @@ preInstall() { ln -s lib "$out/${targetConfig}/lib32" ln -s lib "${!outputLib}/${targetConfig}/lib32" fi + + # cc-wrappers uses --sysroot=/nix/store/does/not/exist as a way to + # drop default sysheaders search path. Unfortunately that switches + # clang++ into searching libraries in gcc in cross-compiler paths: + # from ${!outputLib}/lib (native) + # to ${!outputLib}/${targetPlatformConfig}/lib + # We create the symlink to make both native and cross paths + # available even if the toolchain is not the cross-compiler. + if [ ! -e ${!outputLib}/${targetPlatformConfig} ] ; then + ln -s . ${!outputLib}/${targetPlatformConfig} + fi } @@ -239,25 +251,6 @@ postInstall() { # More dependencies with the previous gcc or some libs (gccbug stores the build command line) rm -rf $out/bin/gccbug - if [[ buildConfig == *"linux"* ]]; then - # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out - for i in $(find "$out"/libexec/gcc/*/*/* -type f -a \! -name '*.la'); do - PREV_RPATH=`patchelf --print-rpath "$i"` - NEW_RPATH=`echo "$PREV_RPATH" | sed 's,:[^:]*bootstrap-tools/lib,,g'` - patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK - done - fi - - if [[ targetConfig == *"linux"* ]]; then - # For some reason, when building for linux on darwin, the libs retain - # RPATH to $out. - for i in "$lib"/"$targetConfig"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do - PREV_RPATH=`patchelf --print-rpath "$i"` - NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"` - patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK - done - fi - if type "install_name_tool"; then for i in "${!outputLib}"/lib/*.*.dylib "${!outputLib}"/lib/*.so.[0-9]; do install_name_tool -id "$i" "$i" || true diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 8e444d54bf39..25e59148440a 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -5,7 +5,7 @@ , threadsCross , version -, gmp, mpfr, libmpc, isl +, binutils, gmp, mpfr, libmpc, isl , cloog ? null , enableLTO @@ -51,7 +51,7 @@ let crossConfigureFlags = # Ensure that -print-prog-name is able to find the correct programs. [ - "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + "--with-as=${if targetPackages.stdenv.cc.bintools.isLLVM then binutils else targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++ (if crossStageStatic then [ @@ -94,10 +94,6 @@ let # libsanitizer requires netrom/netrom.h which is not # available in uclibc. "--disable-libsanitizer" - ] ++ lib.optionals (targetPlatform.libc == "uclibc") [ - # In uclibc cases, libgomp needs an additional '-ldl' - # and as I don't know how to pass it, I disable libgomp. - "--disable-libgomp" ] ++ lib.optional (targetPlatform.libc == "newlib" || targetPlatform.libc == "newlib-nano") "--with-newlib" ++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" ); @@ -123,7 +119,7 @@ let # or ${with_sysroot}${native_system_header_dir} # While native build (build == host == target) uses passed headers # path as is: - # ${native_system_header_dir} + # ${with_build_sysroot}${native_system_header_dir} # # Nixpkgs uses flat directory structure for both native and cross # cases. As a result libc headers don't get found for cross case diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix index ae5ffe6ab0d0..e3b38eb74e95 100644 --- a/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -1,4 +1,4 @@ -{ lib, version, hostPlatform, targetPlatform +{ lib, version, buildPlatform, hostPlatform, targetPlatform , gnatboot ? null , langAda ? false , langJava ? false @@ -24,6 +24,31 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export PATH=${gnatboot}/bin:$PATH '' +# On x86_64-darwin, the gnatboot bootstrap compiler that we need to build a +# native GCC with Ada support emits assembly that is accepted by the Clang +# integrated assembler, but not by the GNU assembler in cctools-port that Nix +# usually in the x86_64-darwin stdenv. In particular, x86_64-darwin gnatboot +# emits MOVQ as the mnemonic for quadword interunit moves, such as between XMM +# and general registers (e.g "movq %xmm0, %rbp"); the cctools-port assembler, +# however, only recognises MOVD for such moves. +# +# Therefore, for native x86_64-darwin builds that support Ada, we have to use +# the Clang integrated assembler to build (at least stage 1 of) GCC, but have to +# target GCC at the cctools-port GNU assembler. In the wrapped x86_64-darwin +# gnatboot, the former is provided as `as`, while the latter is provided as +# `gas`. +# ++ lib.optionalString ( + langAda + && buildPlatform == hostPlatform + && hostPlatform == targetPlatform + && targetPlatform.isx86_64 + && targetPlatform.isDarwin + ) '' + export AS_FOR_BUILD=${gnatboot}/bin/as + export AS_FOR_TARGET=${gnatboot}/bin/gas +'' + # NOTE 2020/3/18: This environment variable prevents configure scripts from # detecting the presence of aligned_alloc on Darwin. There are many facts that # collectively make this fix necessary: diff --git a/pkgs/development/compilers/gcc/gnat-darwin-dylib-install-name.patch b/pkgs/development/compilers/gcc/gnat-darwin-dylib-install-name.patch new file mode 100644 index 000000000000..01e5de86a438 --- /dev/null +++ b/pkgs/development/compilers/gcc/gnat-darwin-dylib-install-name.patch @@ -0,0 +1,19 @@ +--- a/gcc/ada/gcc-interface/Makefile.in 2022-08-19 18:09:52.000000000 +1000 ++++ b/gcc/ada/gcc-interface/Makefile.in 2023-01-11 01:54:06.000000000 +1100 +@@ -795,14 +795,14 @@ + -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ + $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \ + $(SO_OPTS) \ +- -Wl,-install_name,@rpath/libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ ++ -Wl,-install_name,$(ADA_RTL_DSO_DIR)/libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ + $(MISCLIB) + cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \ + | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -dynamiclib $(PICFLAG_FOR_TARGET) \ + -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \ + $(GNATRTL_TASKING_OBJS) \ + $(SO_OPTS) \ +- -Wl,-install_name,@rpath/libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \ ++ -Wl,-install_name,$(ADA_RTL_DSO_DIR)/libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \ + $(THREADSLIB) -Wl,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) + cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ + libgnat$(soext) diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index b7f027440de1..afc06e09edb0 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -21,7 +21,9 @@ , # 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 + enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) +, gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 40dabc6c9837..be4ca5edb823 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -20,7 +20,9 @@ , # 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 + enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) +, gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index 0881b58ff717..f69e52701a93 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -23,7 +23,8 @@ , # 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) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index 4cd22a358e14..57e0db560a98 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -263,20 +263,6 @@ stdenv.mkDerivation rec { lib.optionalString stdenv.isLinux '' find . -type f -executable -exec patchelf \ --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; - '' + - # The hadrian install Makefile uses 'xxx' as a temporary placeholder in path - # substitution. Which can break the build if the store path / prefix happens - # to contain this string. This will be fixed with 9.2.3 bindists. - # https://gitlab.haskell.org/ghc/ghc/-/issues/21402 - '' - # Detect hadrian Makefile by checking for the target that has the problem - if grep '^update_package_db' ghc-${version}*/Makefile > /dev/null; then - echo Hadrian bindist, applying workaround for xxx path substitution. - # based on https://gitlab.haskell.org/ghc/ghc/-/commit/dd5fecb0e2990b192d92f4dfd7519ecb33164fad.patch - substituteInPlace ghc-${version}*/Makefile --replace 'xxx' '\0xxx\0' - else - echo Not a hadrian bindist, not applying xxx path workaround. - fi ''; # fix for `configure: error: Your linker is affected by binutils #16177` diff --git a/pkgs/development/compilers/ghc/9.2.4.nix b/pkgs/development/compilers/ghc/9.2.4.nix index cfbc403a3891..6b8efae06e5b 100644 --- a/pkgs/development/compilers/ghc/9.2.4.nix +++ b/pkgs/development/compilers/ghc/9.2.4.nix @@ -23,7 +23,8 @@ , # 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) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. @@ -194,6 +195,14 @@ stdenv.mkDerivation (rec { extraPrefix = "utils/haddock/"; stripLen = 1; }) + # Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs + # Can be removed if the Cabal library included with ghc backports the linked fix + (fetchpatch { + url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch"; + stripLen = 1; + extraPrefix = "libraries/Cabal/"; + sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; + }) ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/9.2.5.nix b/pkgs/development/compilers/ghc/9.2.5.nix index b7798ad044aa..e7c75fcaccf9 100644 --- a/pkgs/development/compilers/ghc/9.2.5.nix +++ b/pkgs/development/compilers/ghc/9.2.5.nix @@ -23,7 +23,8 @@ , # 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) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. @@ -194,6 +195,14 @@ stdenv.mkDerivation (rec { extraPrefix = "utils/haddock/"; stripLen = 1; }) + # Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs + # Can be removed if the Cabal library included with ghc backports the linked fix + (fetchpatch { + url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch"; + stripLen = 1; + extraPrefix = "libraries/Cabal/"; + sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; + }) ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/9.4.2.nix b/pkgs/development/compilers/ghc/9.4.2.nix index a3eb18e15687..d3702f4e849d 100644 --- a/pkgs/development/compilers/ghc/9.4.2.nix +++ b/pkgs/development/compilers/ghc/9.4.2.nix @@ -25,7 +25,8 @@ , # 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) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. diff --git a/pkgs/development/compilers/ghc/9.4.3.nix b/pkgs/development/compilers/ghc/9.4.3.nix index 2b0f206a6fb0..fea2d4c4c8c9 100644 --- a/pkgs/development/compilers/ghc/9.4.3.nix +++ b/pkgs/development/compilers/ghc/9.4.3.nix @@ -25,7 +25,8 @@ , # 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) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. diff --git a/pkgs/development/compilers/ghc/9.4.4.nix b/pkgs/development/compilers/ghc/9.4.4.nix new file mode 100644 index 000000000000..b9897b0f4d82 --- /dev/null +++ b/pkgs/development/compilers/ghc/9.4.4.nix @@ -0,0 +1,371 @@ +# DO NOT port this expression to hadrian. It is not possible to build a GHC +# cross compiler with 9.4.* and hadrian. +{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx +, xattr, autoSignDarwinBinariesHook +, bash + +, libiconv ? null, ncurses +, glibcLocales ? null + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !(stdenv.targetPlatform.isx86 + || stdenv.targetPlatform.isPower + || stdenv.targetPlatform.isSparc + || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildTargetLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slightly slower native + # bignum backend instead of the faster but GPLed gmp backend. + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) +, gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + + # aarch64 outputs otherwise exceed 2GB limit +, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic + +, # Whether to build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + (if useLLVM then "perf-cross" else "perf-cross-ncg") + +, # Whether to build sphinx documentation. + enableDocs ? ( + # Docs disabled for musl and cross because it's a large task to keep + # all `sphinx` dependencies building in those environments. + # `sphinx` pulls in among others: + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. + (stdenv.targetPlatform == stdenv.hostPlatform) + && !stdenv.hostPlatform.isMusl + ) + +, enableHaddockProgram ? + # Disabled for cross; see note [HADDOCK_DOCS]. + (stdenv.targetPlatform == stdenv.hostPlatform) + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS +}: + +assert !enableNativeBignum -> gmp != null; + +# Cross cannot currently build the `haddock` program for silly reasons, +# see note [HADDOCK_DOCS]. +assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} + BUILD_SPHINX_PDF = NO + '' + + # Note [HADDOCK_DOCS]: + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` + # program is built (which we generally always want to have a complete GHC install) + # and whether it is run on the GHC sources to generate hyperlinked source code + # (which is impossible for cross-compilation); see: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # This implies that currently a cross-compiled GHC will never have a `haddock` + # program, so it can never generate haddocks for any packages. + # If this is solved in the future, we'd like to unconditionally + # build the haddock program (removing the `enableHaddockProgram` option). + '' + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} + # Build haddocks for boot packages with hyperlinking + EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump + + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} + '' + lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + '' + lib.optionalString (!enableProfiledLibs) '' + GhcLibWays = "v dyn" + '' + + # -fexternal-dynamic-refs apparently (because it's not clear from the documentation) + # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell. + # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell + lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC -fexternal-dynamic-refs + GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: lib.optional enableTerminfo ncurses + ++ [libffi] + ++ lib.optional (!enableNativeBignum) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + # TODO(@sternenseemann): is buildTarget LLVM unnecessary? + # GHC doesn't seem to have {LLC,OPT}_HOST + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped + # derivation for certain tools depending on the platform. + bintoolsFor = { + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is + # part of the bintools wrapper (due to codesigning requirements), but not on + # x86_64-darwin. + install_name_tool = + if stdenv.targetPlatform.isAarch64 + then targetCC.bintools + else targetCC.bintools.bintools; + # Same goes for strip. + strip = + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + then targetCC.bintools + else targetCC.bintools.bintools; + }; + + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); + + # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. + variantSuffix = lib.concatStrings [ + (lib.optionalString stdenv.hostPlatform.isMusl "-musl") + (lib.optionalString enableNativeBignum "-native-bignum") + ]; + +in + +# C compiler, bintools and LLVM are used at build time, but will also leak into +# the resulting GHC's settings file and used at runtime. This means that we are +# currently only able to build GHC if hostPlatform == buildPlatform. +assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; +assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; +assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; + +stdenv.mkDerivation (rec { + version = "9.4.4"; + pname = "${targetPrefix}ghc${variantSuffix}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "e8cef25a6ded1531cda7a90488d0cfb6d780657d16636daa59430be030cd67e2"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + + postPatch = "patchShebangs ."; + + # GHC needs the locale configured during the Haddock phase. + LANG = "en_US.UTF-8"; + + # GHC is a bit confused on its cross terminology. + # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" + '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' + export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" + '' + lib.optionalString useLLVM '' + export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" + export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" + '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm + export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + '' + '' + + echo -n "${buildMK}" > mk/build.mk + + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' + export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" + '' + lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + + # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 + export XATTR=${lib.getBin xattr}/bin/xattr + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + '' + # HACK: allow bootstrapping with GHC 8.10 which works fine, as we don't have + # binary 9.0 packaged. Bootstrapping with 9.2 is broken without hadrian. + + '' + substituteInPlace configure --replace \ + 'MinBootGhcVersion="9.0"' \ + 'MinBootGhcVersion="8.10"' + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ lib.optional (targetPlatform != hostPlatform) "target"; + + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" + ] ++ lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ lib.optionals useLdGold [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatibility. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook + ] ++ lib.optionals enableDocs [ + sphinx + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = + [ "format" ] + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + + # big-parallel allows us to build with more than 2 cores on + # Hydra which already warrants a significant speedup + requiredSystemFeatures = [ "big-parallel" ]; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # This is used by the haskell builder to query + # the presence of the haddock program. + hasHaddock = enableHaddockProgram; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; + timeout = 24 * 3600; + inherit (ghc.meta) license platforms; + }; + +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 1ca3c9efde94..5f0953b1bca3 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -39,7 +39,8 @@ , useLLVM ? !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc - || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) + || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin) + || stdenv.targetPlatform.isGhcjs) , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. @@ -48,7 +49,9 @@ , # 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) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) + || stdenv.targetPlatform.isGhcjs , gmp , # If enabled, use -fPIC when compiling static libs. @@ -62,7 +65,8 @@ enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic , # Whether to build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows + enableTerminfo ? !(stdenv.targetPlatform.isWindows + || stdenv.targetPlatform.isGhcjs) , # Libdw.c only supports x86_64, i686 and s390x as of 2022-08-04 enableDwarf ? (stdenv.targetPlatform.isx86 || @@ -156,12 +160,6 @@ assert !enableNativeBignum -> gmp != null; -assert stdenv.hostPlatform == stdenv.targetPlatform || throw '' - hadrian doesn't support building an installable GHC cross-compiler at the moment. - Consider using GHC 9.4 or lower which support this via the make build system. - See also: https://gitlab.haskell.org/ghc/ghc/-/issues/22090 -''; - let src = (if rev != null then fetchgit else fetchurl) ({ inherit url sha256; @@ -201,17 +199,19 @@ let # Splicer will pull out correct variations libDeps = platform: lib.optional enableTerminfo ncurses - ++ [libffi] + ++ lib.optionals (!targetPlatform.isGhcjs) [libffi] # Bindist configure script fails w/o elfutils in linker search path # https://gitlab.haskell.org/ghc/ghc/-/issues/22081 ++ lib.optional enableDwarf elfutils ++ lib.optional (!enableNativeBignum) gmp - ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows && !targetPlatform.isGhcjs) libiconv; # TODO(@sternenseemann): is buildTarget LLVM unnecessary? # GHC doesn't seem to have {LLC,OPT}_HOST toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc + (if targetPlatform.isGhcjs + then pkgsBuildTarget.emscripten + else pkgsBuildTarget.targetPackages.stdenv.cc) ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; @@ -251,7 +251,7 @@ in # C compiler, bintools and LLVM are used at build time, but will also leak into # the resulting GHC's settings file and used at runtime. This means that we are # currently only able to build GHC if hostPlatform == buildPlatform. -assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; +assert !targetPlatform.isGhcjs -> targetCC == pkgsHostTarget.targetPackages.stdenv.cc; assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; @@ -334,6 +334,13 @@ stdenv.mkDerivation ({ '*-android*|*-gnueabi*|*-musleabi*)' done '' + # Need to make writable EM_CACHE for emscripten + # https://gitlab.haskell.org/ghc/ghc/-/wikis/javascript-backend#configure-fails-with-sub-word-sized-atomic-operations-not-available + + lib.optionalString targetPlatform.isGhcjs '' + export EM_CACHE="$(mktemp -d emcache.XXXXXXXXXX)" + cp -Lr ${targetCC /* == emscripten */}/share/emscripten/cache/* "$EM_CACHE/" + chmod u+rwX -R "$EM_CACHE" + '' # Create bash array hadrianFlagsArray for use in buildPhase. Do it in # preConfigure, so overrideAttrs can be used to modify it effectively. # hadrianSettings are passed via the command line so they are more visible @@ -345,6 +352,10 @@ stdenv.mkDerivation ({ ) ''; + ${if targetPlatform.isGhcjs then "configureScript" else null} = "emconfigure ./configure"; + # GHC currently ships an edited config.sub so ghcjs is accepted which we can not rollback + ${if targetPlatform.isGhcjs then "dontUpdateAutotoolsGnuConfigScripts" else null} = true; + # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target"; @@ -353,7 +364,7 @@ stdenv.mkDerivation ({ configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ lib.optionals (libffi != null) [ + ] ++ lib.optionals (libffi != null && !targetPlatform.isGhcjs) [ "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" @@ -392,6 +403,9 @@ stdenv.mkDerivation ({ autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx + ] ++ lib.optionals targetPlatform.isGhcjs [ + # emscripten itself is added via depBuildTarget / targetCC + python3 ]; # For building runtime libs @@ -450,7 +464,7 @@ stdenv.mkDerivation ({ preInstall = '' pushd _build/bindist/* - ./configure $configureFlags "''${configureFlagsArray[@]}" + $configureScript $configureFlags "''${configureFlagsArray[@]}" ''; postInstall = '' diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 6158be43d810..19739ecbd14f 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ import ./common-hadrian.nix { - version = "9.5.20220921"; - rev = "2463df2fe21b5b37ecada3df8c6726c534d24590"; - sha256 = "1k2h4myqbs31fdzw5n4iw0qn44mp7d33kjwrr15ix4r54r8yskzs"; + version = "9.7.20221224"; + rev = "a5bd0eb8dd1d03c54e1b0b476ebbc4cc886d6f19"; + sha256 = "1rrds9alzpy4vyh2isan32h1zmf44nsr8552wbsn1y3fg6bnpbxi"; } diff --git a/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix b/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix index e1671d01ffe7..8b54ee2e3531 100644 --- a/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix +++ b/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix @@ -13,25 +13,7 @@ in self: super: { }) ]; }) (super.ghcjs.overrideScope (self: super: { - optparse-applicative = self.optparse-applicative_0_15_1_0; - webdriver = overrideCabal (drv: { - patches = drv.patches or [] ++ [ - # Patch for aeson 2.0 which adds a lower bound on it, so we don't apply it globally - # Pending https://github.com/kallisti-dev/hs-webdriver/pull/183 - (fetchpatch { - name = "webdriver-aeson-2.0.patch"; - url = "https://github.com/georgefst/hs-webdriver/commit/90ded63218da17fc0bd9f9b208b0b3f60b135757.patch"; - sha256 = "1xvkk51r2v020xlmci5n1fd1na8raa332lrj7r9f0ijsyfvnqlv0"; - excludes = [ "webdriver.cabal" ]; - }) - ]; - # Fix line endings so patch applies - prePatch = drv.prePatch or "" + '' - find . -name '*.hs' | xargs "${buildPackages.dos2unix}/bin/dos2unix" - ''; - - jailbreak = true; - broken = false; - }) super.webdriver; + # Allow transformers-compat >= 0.7 + optparse-applicative = doJailbreak self.optparse-applicative_0_15_1_0; })); } diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 96cb84cf8c6d..a3c1d5ca722c 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.24.0"; + version = "0.25.3"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MywgFoydV58oBJ2dGK1lWSu7o3SkuOhLpKhy7WDAJ3I="; + sha256 = "sha256-JT9NUca+DaqxT36heaNKijIuqdnSvrYCfY2uM7wTOGo="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-VcC7G0m/GYpxUZ+c+orFkCaqiNO3fUjymE29Z1pMqek="; + cargoSha256 = "sha256-YPyGCd4//yta3jy5tWB4C5yRgxNbfG+hGF5/QSch/6M="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index dddf7a2b63d5..f5f46ff9f4f7 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , bison , cmake , jq @@ -9,13 +10,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "1.3.231.0"; + version = "1.3.236.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = "sdk-${version}"; - hash = "sha256-huPrQr+lPi7QCF8CufAavHEKGDDimGrcskiojhH9QYk="; + hash = "sha256-iVcx1j7OMJEU4cPydNwQSFufTUiqq7GKp69Y6pEt7Wc="; }; # These get set at all-packages, keep onto them for child drvs @@ -26,6 +27,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 bison jq ]; + patches = [ + (fetchpatch { + name = "Use-CMAKE_INSTALL_FULL_LIBDIR-in-compat-cmake-files.patch"; + url = "https://github.com/KhronosGroup/glslang/commit/7627bd89583c5aafb8b38c81c15494019271fabf.patch"; + hash = "sha256-1Dwhn78PG4gAGgEwTXpC+mkZRyvy8sTIsEvihXFeNaQ="; + }) + ]; + postPatch = '' cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index 4e1301e47a95..7ef2ce03df94 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -1,22 +1,56 @@ { stdenv, lib, autoPatchelfHook, fetchzip, xz, ncurses5, readline, gmp, mpfr , expat, libipt, zlib, dejagnu, sourceHighlight, python3, elfutils, guile, glibc +, majorVersion }: +let + throwUnsupportedSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; + + versionMap = rec { + "11" = { + gccVersion = "11.2.0"; + alireRevision = "4"; + } // { + x86_64-darwin = { + hash = "sha256-FmBgD20PPQlX/ddhJliCTb/PRmKxe9z7TFPa2/SK4GY="; + upstreamTriplet = "x86_64-apple-darwin19.6.0"; + }; + x86_64-linux = { + hash = "sha256-8fMBJp6igH+Md5jE4LMubDmC4GLt4A+bZG/Xcz2LAJQ="; + upstreamTriplet = "x86_64-pc-linux-gnu"; + }; + }.${stdenv.hostPlatform.system} or throwUnsupportedSystem; + "12" = { + gccVersion = "12.1.0"; + alireRevision = "2"; + } // { + x86_64-darwin = { + hash = "sha256-zrcVFvFZMlGUtkG0p1wST6kGInRI64Icdsvkcf25yVs="; + upstreamTriplet = "x86_64-apple-darwin19.6.0"; + }; + x86_64-linux = { + hash = "sha256-EPDPOOjWJnJsUM7GGxj20/PXumjfLoMIEFX1EDtvWVY="; + upstreamTriplet = "x86_64-pc-linux-gnu"; + }; + }.${stdenv.hostPlatform.system} or throwUnsupportedSystem; + }; + +in with versionMap.${majorVersion}; + stdenv.mkDerivation rec { pname = "gnatboot"; - version = "12.1.0-2"; + inherit gccVersion alireRevision; + + version = "${gccVersion}-${alireRevision}"; src = fetchzip { - url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-${version}/gnat-x86_64-linux-${version}.tar.gz"; - hash = "sha256-EPDPOOjWJnJsUM7GGxj20/PXumjfLoMIEFX1EDtvWVY="; + url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-${version}/gnat-${stdenv.hostPlatform.system}-${version}.tar.gz"; + inherit hash; }; nativeBuildInputs = [ - autoPatchelfHook dejagnu - elfutils expat - glibc gmp guile libipt @@ -27,11 +61,69 @@ stdenv.mkDerivation rec { sourceHighlight xz zlib + ] ++ lib.optional stdenv.buildPlatform.isLinux [ + autoPatchelfHook + elfutils + glibc ]; + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin) '' + substituteInPlace lib/gcc/${upstreamTriplet}/${gccVersion}/install-tools/mkheaders.conf \ + --replace "SYSTEM_HEADER_DIR=\"/usr/include\"" "SYSTEM_HEADER_DIR=\"/include\"" + '' + # The included fixincl binary that is called during header fixup has a + # hardcoded execvp("/usr/bin/sed", ...) call, but /usr/bin/sed isn't + # available in the Nix Darwin stdenv. Fortunately, execvp() will search the + # PATH environment variable for the executable if its first argument does not + # contain a slash, so we can just change the string to "sed" and zero the + # other bytes. + + '' + sed -i "s,/usr/bin/sed,sed\x00\x00\x00\x00\x00\x00\x00\x00\x00," libexec/gcc/${upstreamTriplet}/${gccVersion}/install-tools/fixincl + ''; + installPhase = '' mkdir -p $out cp -ar * $out/ + '' + + # So far with the Darwin gnatboot binary packages, there have been two + # types of dylib path references to other dylibs that need fixups: + # + # 1. Dylibs in $out/lib with paths starting with + # /Users/runner/.../gcc/install that refer to other dylibs in $out/lib + # 2. Dylibs in $out/lib/gcc/*/*/adalib with paths starting with + # @rpath that refer to other dylibs in $out/lib/gcc/*/*/adalib + # + # Additionally, per Section 14.4 Fixed Headers in the GCC 12.2.0 manual [2], + # we have to update the fixed header files in current Alire GCC package, since it + # was built against macOS 10.15 (Darwin 19.6.0), but Nix currently + # builds against macOS 10.12, and the two header file structures differ. + # For example, the current Alire GCC package has a fixed + # from macOS 10.15 that contains a #include <_stdio.h>, but neither the Alire + # GCC package nor macOS 10.12 have such a header ( and + # in 10.12 are not equivalent; indeed, 10.15 <_stdio.h> + # says it contains code shared by and ). + # + # [2]: https://gcc.gnu.org/onlinedocs/gcc-12.2.0/gcc/Fixed-Headers.html + + + lib.optionalString (stdenv.hostPlatform.isDarwin) '' + upstreamBuildPrefix="/Users/runner/work/GNAT-FSF-builds/GNAT-FSF-builds/sbx/x86_64-darwin/gcc/install" + for i in "$out"/lib/*.dylib "$out"/lib/gcc/*/*/adalib/*.dylib; do + if [[ -f "$i" && ! -h "$i" ]]; then + install_name_tool -id "$i" "$i" || true + for old_path in $(otool -L "$i" | grep "$upstreamBuildPrefix" | awk '{print $1}'); do + new_path=`echo "$old_path" | sed "s,$upstreamBuildPrefix,$out,"` + install_name_tool -change "$old_path" "$new_path" "$i" || true + done + for old_path in $(otool -L "$i" | grep "@rpath" | awk '{print $1}'); do + new_path=$(echo "$old_path" | sed "s,@rpath,$(dirname "$i"),") + install_name_tool -change "$old_path" "$new_path" "$i" || true + done + fi + done + + "$out"/libexec/gcc/${upstreamTriplet}/${gccVersion}/install-tools/mkheaders -v -v \ + "$out" "${stdenv.cc.libc}" ''; passthru = { @@ -39,6 +131,7 @@ stdenv.mkDerivation rec { langCC = false; langFortran = false; langAda = true; + isGNU = true; }; meta = with lib; { @@ -46,6 +139,6 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/gnat"; license = licenses.gpl3; maintainers = with maintainers; [ ethindp ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gnostic/default.nix b/pkgs/development/compilers/gnostic/default.nix new file mode 100644 index 000000000000..f0d1b53ca23e --- /dev/null +++ b/pkgs/development/compilers/gnostic/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gnostic"; + version = "0.6.8"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "v${version}"; + hash = "sha256-+/KZmwVV3pnbv3JNwNk9Q2gcTyDxV1tgsDzW5IYnnds="; + }; + + vendorHash = "sha256-OoI1/OPBgAy4AysPPSCXGmf0S4opzxO7ZrwBsQYImwU="; + + # some tests are broken and others require network access + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/google/gnostic"; + description = "A compiler for APIs described by the OpenAPI Specification with plugins for code generation and other API support tasks"; + changelog = "https://github.com/google/gnostic/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index 388059f2fc40..0df621fdb64f 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-FgQYnas0qkIedRAA8ApZXLzEylg6PS6+8zzl7j+yOeI="; }; - vendorSha256 = "sha256-j1fTOUpLx34TgzW94A/BctLrg9XoTtb3cBizhVJoEEI="; + vendorHash = "sha256-j1fTOUpLx34TgzW94A/BctLrg9XoTtb3cBizhVJoEEI="; patches = [ # See https://github.com/google/go-jsonnet/issues/653. diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index 7f6e2ce6ace8..3c089f02920a 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -17,7 +17,8 @@ }: let - goBootstrap = buildPackages.callPackage ./bootstrap116.nix { }; + useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV; + goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap116.nix { }; skopeoTest = skopeo.override { buildGoModule = buildGo118Module; }; @@ -45,11 +46,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.18.8"; + version = "1.18.10"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-H3mAIwUBVHnnfYxkFTC8VOyZRlfVxSceAXLrcRg0ahI="; + sha256 = "sha256-nO3MpYhF3wyUdK4AJ0xEqVyd+u+xMvxZkhwox8EG+OY="; }; strictDeps = true; @@ -113,7 +114,7 @@ stdenv.mkDerivation rec { GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go"; buildPhase = '' runHook preBuild diff --git a/pkgs/development/compilers/go/1.19.nix b/pkgs/development/compilers/go/1.19.nix index a406b21458dc..84a6059581e7 100644 --- a/pkgs/development/compilers/go/1.19.nix +++ b/pkgs/development/compilers/go/1.19.nix @@ -17,7 +17,8 @@ }: let - goBootstrap = buildPackages.callPackage ./bootstrap116.nix { }; + useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV; + goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap116.nix { }; skopeoTest = skopeo.override { buildGoModule = buildGo119Module; }; @@ -45,11 +46,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.19.3"; + version = "1.19.5"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-GKwmPjkhC89o2F9DcOl/sXNBZplaH2P7OLT24H2Q0hI="; + sha256 = "sha256-jkhujoWigfxc4/C+3FudLb9idtfbCyXT7ANPMT2gN18="; }; strictDeps = true; @@ -113,7 +114,7 @@ stdenv.mkDerivation rec { GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go"; buildPhase = '' runHook preBuild diff --git a/pkgs/development/compilers/go/1.20.nix b/pkgs/development/compilers/go/1.20.nix new file mode 100644 index 000000000000..a8c441813f17 --- /dev/null +++ b/pkgs/development/compilers/go/1.20.nix @@ -0,0 +1,181 @@ +{ lib +, stdenv +, fetchurl +, tzdata +, substituteAll +, iana-etc +, Security +, Foundation +, xcbuild +, mailcap +, buildPackages +, pkgsBuildTarget +, threadsCross +, testers +, skopeo +, buildGo120Module +}: + +let + useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV; + goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap117.nix { }; + + skopeoTest = skopeo.override { buildGoModule = buildGo120Module; }; + + goarch = platform: { + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + "i686" = "386"; + "mips" = "mips"; + "mips64el" = "mips64le"; + "mipsel" = "mipsle"; + "powerpc64le" = "ppc64le"; + "riscv64" = "riscv64"; + "s390x" = "s390x"; + "x86_64" = "amd64"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); + + # We need a target compiler which is still runnable at build time, + # to handle the cross-building case where build != host == target + targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; + + isCross = stdenv.buildPlatform != stdenv.targetPlatform; +in +stdenv.mkDerivation rec { + pname = "go"; + version = "1.20"; + + src = fetchurl { + url = "https://go.dev/dl/go${version}.src.tar.gz"; + sha256 = "sha256-Oin/BCG+r2MpKSuKRjEcn78GyAAHfO3e9ft/jVsazjM="; + }; + + strictDeps = true; + buildInputs = [ ] + ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Foundation Security xcbuild ]; + + depsBuildTarget = lib.optional isCross targetCC; + + depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; + + postPatch = '' + patchShebangs . + ''; + + patches = [ + (substituteAll { + src = ./iana-etc-1.17.patch; + iana = iana-etc; + }) + # Patch the mimetype database location which is missing on NixOS. + # but also allow static binaries built with NixOS to run outside nix + (substituteAll { + src = ./mailcap-1.17.patch; + inherit mailcap; + }) + # prepend the nix path to the zoneinfo files but also leave the original value for static binaries + # that run outside a nix server + (substituteAll { + src = ./tzdata-1.19.patch; + inherit tzdata; + }) + ./remove-tools-1.11.patch + ./go_no_vendor_checks-1.16.patch + ]; + + GOOS = stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = + if isCross then + "${targetCC}/bin/${targetCC.targetPrefix}cc" + else + null; + CXX_FOR_TARGET = + if isCross then + "${targetCC}/bin/${targetCC.targetPrefix}c++" + else + null; + + GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); + GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + + GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go"; + + buildPhase = '' + runHook preBuild + export GOCACHE=$TMPDIR/go-cache + # this is compiled into the binary + export GOROOT_FINAL=$out/share/go + + export PATH=$(pwd)/bin:$PATH + + ${lib.optionalString isCross '' + # Independent from host/target, CC should produce code for the building system. + # We only set it when cross-compiling. + export CC=${buildPackages.stdenv.cc}/bin/cc + ''} + ulimit -a + + pushd src + ./make.bash + popd + runHook postBuild + ''; + + preInstall = '' + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} + ''} + '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + rm -rf bin/*_* + ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} + ''} + '' else ""); + + installPhase = '' + runHook preInstall + mkdir -p $GOROOT_FINAL + cp -a bin pkg src lib misc api doc $GOROOT_FINAL + ln -s $GOROOT_FINAL/bin $out/bin + runHook postInstall + ''; + + disallowedReferences = [ goBootstrap ]; + + passthru = { + inherit goBootstrap skopeoTest; + tests = { + skopeo = testers.testVersion { package = skopeoTest; }; + }; + }; + + meta = with lib; { + description = "The Go Programming language"; + homepage = "https://go.dev/"; + license = licenses.bsd3; + maintainers = teams.golang.members; + platforms = platforms.darwin ++ platforms.linux; + }; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix index 86de8aae2ef0..bd2d4413ec52 100644 --- a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix +++ b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix @@ -16,7 +16,7 @@ # }; # } config - # GraalVM version that will be used unless overriden by `config..version` + # GraalVM version that will be used unless overridden by `config..version` , defaultVersion # Java version used by GraalVM , javaVersion @@ -319,6 +319,8 @@ let homepage = "https://www.graalvm.org/"; description = "High-Performance Polyglot VM"; license = with licenses; [ upl gpl2Classpath bsd3 ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "java"; maintainers = with maintainers; [ bandresen hlolli diff --git a/pkgs/development/compilers/graalvm/community-edition/update.nix b/pkgs/development/compilers/graalvm/community-edition/update.nix index 05963150eaca..8bb31c792dda 100644 --- a/pkgs/development/compilers/graalvm/community-edition/update.nix +++ b/pkgs/development/compilers/graalvm/community-edition/update.nix @@ -67,6 +67,7 @@ let "ruby-installable-svm" = ".jar"; "wasm-installable-svm" = ".jar"; "python-installable-svm" = ".jar"; + "js-installable-svm" = ".jar"; }.${productName}; # getProductSuffix :: String -> String @@ -77,6 +78,7 @@ let "ruby-installable-svm" = "https://github.com/oracle/truffleruby/releases/download"; "wasm-installable-svm" = "https://github.com/graalvm/graalvm-ce-builds/releases/download"; "python-installable-svm" = "https://github.com/graalvm/graalpython/releases/download"; + "js-installable-svm" = "https://github.com/oracle/graaljs/releases/download"; }.${productName}; # getDevUrl :: String diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix index 38f29cb3200c..b998266487cf 100644 --- a/pkgs/development/compilers/gwt/2.4.0.nix +++ b/pkgs/development/compilers/gwt/2.4.0.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.gwtproject.org/"; + homepage = "https://www.gwtproject.org/"; description = "A development toolkit for building and optimizing complex browser-based applications"; license = lib.licenses.asl20; platforms = lib.platforms.unix; diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 7a6c019c16da..a05c59a6ef87 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls, Security }: +{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls_2, Security }: let ocamlDependencies = version: @@ -11,7 +11,7 @@ let ptmap camlp5 sha - dune_2 + dune_3 luv extlib ] else if lib.versionAtLeast version "4.0" @@ -23,7 +23,7 @@ let ptmap camlp5 sha - dune_2 + dune_3 luv extlib-1-7-7 ] else with ocaml-ng.ocamlPackages_4_05; [ @@ -42,7 +42,7 @@ let inherit version; buildInputs = [ zlib pcre neko ] - ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls + ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls_2 ++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.isDarwin) Security ++ ocamlDependencies version; diff --git a/pkgs/development/compilers/hip-common/0000-fixup-paths.patch b/pkgs/development/compilers/hip-common/0000-fixup-paths.patch new file mode 100644 index 000000000000..f3fd73255520 --- /dev/null +++ b/pkgs/development/compilers/hip-common/0000-fixup-paths.patch @@ -0,0 +1,129 @@ +diff --git a/bin/hipcc.pl b/bin/hipcc.pl +index da9559b..7aaa540 100755 +--- a/bin/hipcc.pl ++++ b/bin/hipcc.pl +@@ -185,7 +185,7 @@ if ($HIP_PLATFORM eq "amd") { + chomp($HIP_CLANG_TARGET); + + if (! defined $HIP_CLANG_INCLUDE_PATH) { +- $HIP_CLANG_INCLUDE_PATH = abs_path("$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/include"); ++ $HIP_CLANG_INCLUDE_PATH = abs_path("@clang@/resource-root/include"); + } + if (! defined $HIP_INCLUDE_PATH) { + $HIP_INCLUDE_PATH = "$HIP_PATH/include"; +@@ -206,8 +206,8 @@ if ($HIP_PLATFORM eq "amd") { + print ("HIP_CLANG_TARGET=$HIP_CLANG_TARGET\n"); + } + +- $HIPCXXFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH/..\""; +- $HIPCFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH/..\""; ++ $HIPCXXFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH\""; ++ $HIPCFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH\""; + $HIPLDFLAGS .= " -L\"$HIP_LIB_PATH\""; + if ($isWindows) { + $HIPLDFLAGS .= " -lamdhip64"; +@@ -625,7 +625,7 @@ if($HIP_PLATFORM eq "amd"){ + $targetsStr = $ENV{HCC_AMDGPU_TARGET}; + } elsif (not $isWindows) { + # Else try using rocm_agent_enumerator +- $ROCM_AGENT_ENUM = "${ROCM_PATH}/bin/rocm_agent_enumerator"; ++ $ROCM_AGENT_ENUM = "@rocminfo@/bin/rocm_agent_enumerator"; + $targetsStr = `${ROCM_AGENT_ENUM} -t GPU`; + $targetsStr =~ s/\n/,/g; + } +@@ -724,16 +724,16 @@ if ($HIP_PLATFORM eq "amd") { + + if (not $isWindows and not $compileOnly) { + if ($linkType eq 0) { +- $toolArgs = " -L$HIP_LIB_PATH -lamdhip64 -L$ROCM_PATH/lib -lhsa-runtime64 -ldl -lnuma " . ${toolArgs}; ++ $toolArgs = " -L$HIP_LIB_PATH -lamdhip64 -L@rocm_runtime@/lib -lhsa-runtime64 -ldl -lnuma " . ${toolArgs}; + } else { + $toolArgs = ${toolArgs} . " -Wl,-rpath=$HIP_LIB_PATH:$ROCM_PATH/lib -lamdhip64 "; + } + # To support __fp16 and _Float16, explicitly link with compiler-rt +- $HIP_CLANG_BUILTIN_LIB="$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a"; ++ $HIP_CLANG_BUILTIN_LIB="@clang@/resource-root/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a"; + if (-e $HIP_CLANG_BUILTIN_LIB) { +- $toolArgs .= " -L$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET -lclang_rt.builtins " ++ $toolArgs .= " -L@clang@/resource-root/lib/$HIP_CLANG_TARGET -lclang_rt.builtins " + } else { +- $toolArgs .= " -L$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/linux -lclang_rt.builtins-x86_64 " ++ $toolArgs .= " -L@clang@/resource-root/lib/linux -lclang_rt.builtins-x86_64 " + } + } + } +diff --git a/bin/hipconfig.pl b/bin/hipconfig.pl +index 5ddb8e9..6a76a2e 100755 +--- a/bin/hipconfig.pl ++++ b/bin/hipconfig.pl +@@ -77,7 +77,7 @@ if ($HIP_COMPILER eq "clang") { + $CPP_CONFIG = " -D__HIP_PLATFORM_HCC__= -D__HIP_PLATFORM_AMD__="; + + $HIP_PATH_INCLUDE = $HIP_PATH."/include"; +- $HIP_CLANG_INCLUDE = $HIP_CLANG_PATH."/../lib/clang/".$HIP_CLANG_VERSION; ++ $HIP_CLANG_INCLUDE = "@clang@/resource-root/include"; + if($isWindows) { + $CPP_CONFIG .= " -I\"$HIP_PATH_INCLUDE\" -I\"$HIP_CLANG_INCLUDE\""; + } else { +@@ -168,7 +168,7 @@ if (!$printed or $p_full) { + print ("HIP_CLANG_PATH : $HIP_CLANG_PATH\n"); + if ($isWindows) { + system("\"$HIP_CLANG_PATH/clang++\" --version"); +- system("\"$HIP_CLANG_PATH/llc\" --version"); ++ system("\"@llvm@/bin/llc\" --version"); + printf("hip-clang-cxxflags : "); + $win_output = `perl \"$HIP_PATH/bin/hipcc\" --cxxflags`; + printf("$win_output \n"); +@@ -177,7 +177,7 @@ if (!$printed or $p_full) { + printf("$win_output \n"); + } else { + system("$HIP_CLANG_PATH/clang++ --version"); +- system("$HIP_CLANG_PATH/llc --version"); ++ system("@llvm@/bin/llc --version"); + print ("hip-clang-cxxflags : "); + system("$HIP_PATH/bin/hipcc --cxxflags"); + printf("\n"); +@@ -219,8 +219,8 @@ if (!$printed or $p_full) { + system ("uname -a"); + } + +- if (-e "/usr/bin/lsb_release") { +- system ("/usr/bin/lsb_release -a"); ++ if (-e "@lsb_release@/bin/lsb_release") { ++ system ("@lsb_release@/bin/lsb_release -a"); + } + + print "\n" ; +diff --git a/hip-lang-config.cmake.in b/hip-lang-config.cmake.in +index 9250a68..f6e27b7 100644 +--- a/hip-lang-config.cmake.in ++++ b/hip-lang-config.cmake.in +@@ -71,8 +71,8 @@ get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH) + + + #need _IMPORT_PREFIX to be set #FILE_REORG_BACKWARD_COMPATIBILITY +-file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "${_IMPORT_PREFIX}/../llvm/lib/clang/*/include") +-file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "${_IMPORT_PREFIX}/llvm/lib/clang/*/include") ++file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "@clang@/resource-root/include") ++file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "@clang@/resource-root/include") + find_path(HIP_CLANG_INCLUDE_PATH __clang_cuda_math.h + HINTS ${HIP_CLANG_INCLUDE_SEARCH_PATHS} + ${HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG} +@@ -89,7 +89,7 @@ find_path(HSA_HEADER hsa/hsa.h + PATHS + "${_IMPORT_PREFIX}/../include" #FILE_REORG_BACKWARD_COMPATIBILITY + "${_IMPORT_PREFIX}/include" +- "${ROCM_PATH}/include" ++ "@rocm_runtime@/include" + ) + + if (NOT HSA_HEADER) +@@ -97,7 +97,7 @@ if (NOT HSA_HEADER) + endif() + + get_filename_component(HIP_COMPILER_INSTALL_PATH ${CMAKE_HIP_COMPILER} DIRECTORY) +-file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "${HIP_COMPILER_INSTALL_PATH}/../lib/clang/*/lib/*") ++file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "@clang@/resource-root/lib/*") + find_library(CLANGRT_BUILTINS + NAMES + clang_rt.builtins diff --git a/pkgs/development/compilers/hip-common/default.nix b/pkgs/development/compilers/hip-common/default.nix new file mode 100644 index 000000000000..1721091d6a60 --- /dev/null +++ b/pkgs/development/compilers/hip-common/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, substituteAll +, llvm +, rocm-runtime +, rocminfo +, lsb-release +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hip-common"; + version = "5.4.2"; + + src = fetchFromGitHub { + owner = "ROCm-Developer-Tools"; + repo = "HIP"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-44CZWk6EsP5EduzBCBbOh2kshS89qOm4v3mx/xNDzV0="; + }; + + patches = [ + (substituteAll { + src = ./0000-fixup-paths.patch; + inherit llvm rocminfo; + clang = stdenv.cc; + rocm_runtime = rocm-runtime; + lsb_release = lsb-release; + }) + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv * $out + + runHook postInstall + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "C++ Heterogeneous-Compute Interface for Portability"; + homepage = "https://github.com/ROCm-Developer-Tools/HIP"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + }; +}) diff --git a/pkgs/development/compilers/hip/0000-fixup-paths.patch b/pkgs/development/compilers/hip/0000-fixup-paths.patch new file mode 100644 index 000000000000..423857218ee7 --- /dev/null +++ b/pkgs/development/compilers/hip/0000-fixup-paths.patch @@ -0,0 +1,62 @@ +diff --git a/hip-config.cmake.in b/hip-config.cmake.in +index 89d1224..dc9ba05 100755 +--- a/hip-config.cmake.in ++++ b/hip-config.cmake.in +@@ -142,7 +142,7 @@ if(HIP_COMPILER STREQUAL "clang") + file(TO_CMAKE_PATH "${HIP_PATH}/../lc" HIP_CLANG_ROOT) + endif() + else() +- set(HIP_CLANG_ROOT "${ROCM_PATH}/llvm") ++ set(HIP_CLANG_ROOT "@clang@") + endif() + if(NOT HIP_CXX_COMPILER) + set(HIP_CXX_COMPILER ${CMAKE_CXX_COMPILER}) +@@ -171,7 +171,7 @@ if(HIP_COMPILER STREQUAL "clang") + get_filename_component(_HIP_CLANG_BIN_PATH "${_HIP_CLANG_REAL_PATH}" DIRECTORY) + get_filename_component(HIP_CLANG_ROOT "${_HIP_CLANG_BIN_PATH}" DIRECTORY) + endif() +- file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS ${HIP_CLANG_ROOT}/lib/clang/*/include) ++ file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "@clang@/resource-root/include") + find_path(HIP_CLANG_INCLUDE_PATH stddef.h + HINTS + ${HIP_CLANG_INCLUDE_SEARCH_PATHS} +@@ -209,7 +209,7 @@ if(NOT WIN32) + "${_IMPORT_PREFIX}/include" + #FILE_REORG_BACKWARD_COMPATIBILITY ${_IMPORT_PREFIX}/../include is for Backward compatibility + "${_IMPORT_PREFIX}/../include" +- ${ROCM_PATH}/include ++ "@rocm_runtime@/include" + ) + + if (NOT HSA_HEADER) +@@ -291,7 +291,7 @@ if(HIP_COMPILER STREQUAL "clang") + endif() + endif() + +- file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "${HIP_CLANG_ROOT}/lib/clang/*/lib/*") ++ file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "@clang@/resource-root/lib/*") + find_library(CLANGRT_BUILTINS + NAMES + clang_rt.builtins +diff --git a/src/hip_embed_pch.sh b/src/hip_embed_pch.sh +index 0a1572b..2feb19a 100755 +--- a/src/hip_embed_pch.sh ++++ b/src/hip_embed_pch.sh +@@ -149,7 +149,7 @@ EOF + + $LLVM_DIR/bin/clang -cc1 -O3 -emit-pch -triple amdgcn-amd-amdhsa -aux-triple x86_64-unknown-linux-gnu -fcuda-is-device -std=c++17 -fgnuc-version=4.2.1 -o $tmp/hip_wave64.pch -x hip-cpp-output - <$tmp/pch_wave64.cui && + +- $LLVM_DIR/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj && ++ @llvm@/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj && + + rm -rf $tmp + } +@@ -195,7 +195,7 @@ EOF + set -x + $LLVM_DIR/bin/clang -O3 --rocm-path=$HIP_INC_DIR/.. -std=c++14 -nogpulib --hip-version=4.4 -isystem $HIP_INC_DIR -isystem $HIP_BUILD_INC_DIR -isystem $HIP_AMD_INC_DIR --cuda-device-only -D__HIPCC_RTC__ -x hip $tmp/hipRTC_header.h -E -o $tmp/hiprtc && + cat $macroFile >> $tmp/hiprtc && +- $LLVM_DIR/bin/llvm-mc -o $tmp/hiprtc_header.o $tmp/hipRTC_header.mcin --filetype=obj && ++ @llvm@/bin/llvm-mc -o $tmp/hiprtc_header.o $tmp/hipRTC_header.mcin --filetype=obj && + $LLVM_DIR/bin/clang $tmp/hiprtc_header.o -o $rtc_shared_lib_out -shared && + $LLVM_DIR/bin/clang -O3 --rocm-path=$HIP_INC_DIR/.. -std=c++14 -nogpulib -nogpuinc -emit-llvm -c -o $tmp/tmp.bc --cuda-device-only -D__HIPCC_RTC__ --offload-arch=gfx906 -x hip-cpp-output $tmp/hiprtc && + rm -rf $tmp diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index 60400f38bb7d..610fffa03879 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -1,206 +1,197 @@ -{ stdenv -, binutils-unwrapped -, clang -, cmake +{ lib +, stdenv , fetchFromGitHub , fetchpatch -, file -, lib -, libglvnd -, libX11 -, libxml2 -, llvm +, rocmUpdateScript +, substituteAll , makeWrapper -, numactl -, perl -, python3 -, python3Packages +, hip-common +, hipcc , rocclr +, roctracer +, cmake +, perl +, llvm +, rocminfo +, rocm-thunk , rocm-comgr , rocm-device-libs -, rocm-opencl-runtime , rocm-runtime -, rocm-thunk -, rocminfo -, substituteAll -, writeScript -, writeText +, rocm-opencl-runtime +, cudatoolkit +, numactl +, libxml2 +, libX11 +, libglvnd +, doxygen +, graphviz +, fontconfig +, python3Packages +, buildDocs ? true +, buildTests ? false +, useNVIDIA ? false }: let - hip = stdenv.mkDerivation rec { - pname = "hip"; - version = "5.3.1"; + hipPlatform = if useNVIDIA then "nvidia" else "amd"; - src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; - repo = "HIP"; - rev = "rocm-${version}"; - hash = "sha256-kmRvrwnT0h2dBMI+H9d1vmeW3TmDBD+qW4YYhaMV2dE="; - }; + wrapperArgs = [ + "--prefix PATH : $out/bin" + "--prefix LD_LIBRARY_PATH : ${rocm-runtime}" + "--set HIP_PLATFORM ${hipPlatform}" + "--set HIP_PATH $out" + "--set HIP_CLANG_PATH ${stdenv.cc}/bin" + "--set DEVICE_LIB_PATH ${rocm-device-libs}/amdgcn/bitcode" + "--set HSA_PATH ${rocm-runtime}" + "--set ROCM_PATH $out" + ] ++ lib.optionals useNVIDIA [ + "--set CUDA_PATH ${cudatoolkit}" + ]; +in stdenv.mkDerivation (finalAttrs: { + pname = "hip-${hipPlatform}"; + version = "5.4.2"; - patches = [ - (substituteAll { - src = ./hip-config-paths.patch; - inherit llvm; - rocm_runtime = rocm-runtime; - }) - ]; - - # - fix bash paths - # - fix path to rocm_agent_enumerator - # - fix hcc path - # - fix hcc version parsing - # - add linker flags for libhsa-runtime64 and hc_am since libhip_hcc - # refers to them. - prePatch = '' - for f in $(find bin -type f); do - sed -e 's,#!/usr/bin/perl,#!${perl}/bin/perl,' \ - -e 's,#!/bin/bash,#!${stdenv.shell},' \ - -i "$f" - done - - substituteInPlace bin/hip_embed_pch.sh \ - --replace '$LLVM_DIR/bin/' "" - - 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";,' \ - -e 's,^\($HIP_COMPILER=\).*$,\1"clang";,' \ - -e 's,^\($HIP_RUNTIME=\).*$,\1"ROCclr";,' \ - -e 's,^\([[:space:]]*$HSA_PATH=\).*$,\1"${rocm-runtime}";,'g \ - -e 's,^\([[:space:]]*\)$HIP_CLANG_INCLUDE_PATH = abs_path("$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/include");,\1$HIP_CLANG_INCLUDE_PATH = "${llvm}/lib/clang/$HIP_CLANG_VERSION/include";,' \ - -e 's,^\([[:space:]]*$HIPCXXFLAGS .= " -isystem \\"$HIP_CLANG_INCLUDE_PATH/..\\"\)";,\1 -isystem ${rocm-runtime}/include";,' \ - -e 's,$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION,$HIP_CLANG_PATH/../resource-root,g' \ - -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.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.pl - - sed -e 's, abs_path, Cwd::abs_path,' -i bin/hipvars.pm - ''; - - buildPhase = ""; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -r * $out/ - - runHook postInstall - ''; - - meta = with lib; { - description = "C++ Heterogeneous-Compute Interface for Portability"; - homepage = "https://github.com/ROCm-Developer-Tools/HIP"; - license = licenses.mit; - maintainers = with maintainers; [ lovesegfault Flakebi ]; - platforms = platforms.linux; - }; - }; -in -stdenv.mkDerivation rec { - pname = "hip"; - version = "5.3.1"; + outputs = [ + "out" + ] ++ lib.optionals buildDocs [ + "doc" + ]; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "hipamd"; - rev = "rocm-${version}"; - hash = "sha256-i7hT/j+V0LT6Va2XcQyyKXF1guoIyhcOHvn842wCRx4="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-FcuylhkG7HqLYXH1J6ND6IVEIbDzHp7h7jg2ZZ4XoFM="; }; - nativeBuildInputs = [ cmake python3 makeWrapper perl ]; - buildInputs = [ libxml2 numactl libglvnd libX11 python3Packages.cppheaderparser ]; - propagatedBuildInputs = [ - clang - llvm - rocm-comgr - rocm-device-libs - rocm-runtime - rocm-thunk - rocminfo - ]; - patches = [ (substituteAll { - src = ./hipamd-config-paths.patch; - inherit clang llvm hip; + src = ./0000-fixup-paths.patch; + inherit llvm; + clang = stdenv.cc; rocm_runtime = rocm-runtime; }) + + # https://github.com/ROCm-Developer-Tools/hipamd/commit/be33ec55acc104a59d01df5912261d007c7f3ee9 + (fetchpatch { + url = "https://github.com/ROCm-Developer-Tools/hipamd/commit/be33ec55acc104a59d01df5912261d007c7f3ee9.patch"; + hash = "sha256-eTC4mUIN1FwRce1n38uDOlITFL/vpcOhvnaZTo5R7lo="; + }) ]; - prePatch = '' - sed -e 's,#!/bin/bash,#!${stdenv.shell},' \ - -i src/hip_embed_pch.sh - ''; + nativeBuildInputs = [ + makeWrapper + cmake + perl + python3Packages.python + python3Packages.cppheaderparser + ] ++ lib.optionals buildDocs [ + doxygen + graphviz + fontconfig + ]; - preConfigure = '' - export HIP_CLANG_PATH=${clang}/bin - export DEVICE_LIB_PATH=${rocm-device-libs}/lib - ''; + buildInputs = [ + numactl + libxml2 + libX11 + libglvnd + ]; + + propagatedBuildInputs = [ + stdenv.cc + llvm + rocminfo + rocm-thunk + rocm-comgr + rocm-device-libs + rocm-runtime + rocm-opencl-runtime + ] ++ lib.optionals useNVIDIA [ + cudatoolkit + ]; cmakeFlags = [ - "-DHIP_PLATFORM=amd" - "-DAMD_OPENCL_PATH=${rocm-opencl-runtime.src}" - "-DHIP_COMMON_DIR=${hip}" + "-DROCM_PATH=${rocminfo}" + "-DHIP_PLATFORM=${hipPlatform}" + "-DHIP_COMMON_DIR=${hip-common}" + "-DHIPCC_BIN_DIR=${hipcc}/bin" + "-DHIP_LLVM_ROOT=${stdenv.cc}" "-DROCCLR_PATH=${rocclr}" - "-DHIP_VERSION_BUILD_ID=0" + "-DAMD_OPENCL_PATH=${rocm-opencl-runtime.src}" + "-DPROF_API_HEADER_PATH=${roctracer.src}/inc/ext" # Temporarily set variables to work around upstream CMakeLists issue # Can be removed once https://github.com/ROCm-Developer-Tools/hipamd/issues/55 is fixed "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_LIBDIR=lib" + ] ++ lib.optionals buildTests [ + "-DHIP_CATCH_TEST=1" ]; + postPatch = '' + export HIP_CLANG_PATH=${stdenv.cc}/bin + patchShebangs src + '' + lib.optionalString buildDocs '' + export HOME=$(mktemp -d) + export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf + ''; + + doCheck = buildTests; + checkTarget = "build_tests"; + + preCheck = lib.optionalString buildTests '' + export ROCM_PATH=$PWD + export DEVICE_LIB_PATH=${rocm-device-libs}/amdgcn/bitcode + patchShebangs bin + ''; + postInstall = '' patchShebangs $out/bin - wrapProgram $out/bin/hipcc --set HIP_PATH $out --set HSA_PATH ${rocm-runtime} --set HIP_CLANG_PATH ${clang}/bin --prefix PATH : ${llvm}/bin --set ROCM_PATH $out - wrapProgram $out/bin/hipconfig --set HIP_PATH $out --set HSA_PATH ${rocm-runtime} --set HIP_CLANG_PATH ${clang}/bin + cp -a $out/bin/hipcc $out/bin/hipcc-pl + cp -a $out/bin/hipconfig $out/bin/hipconfig-pl + wrapProgram $out/bin/hipcc --set HIP_USE_PERL_SCRIPTS 0 + wrapProgram $out/bin/hipconfig --set HIP_USE_PERL_SCRIPTS 0 + wrapProgram $out/bin/hipcc.bin ${lib.concatStringsSep " " wrapperArgs} + wrapProgram $out/bin/hipconfig.bin ${lib.concatStringsSep " " wrapperArgs} + wrapProgram $out/bin/hipcc-pl --set HIP_USE_PERL_SCRIPTS 1 + wrapProgram $out/bin/hipconfig-pl --set HIP_USE_PERL_SCRIPTS 1 + wrapProgram $out/bin/hipcc.pl ${lib.concatStringsSep " " wrapperArgs} + wrapProgram $out/bin/hipconfig.pl ${lib.concatStringsSep " " wrapperArgs} ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github - version="$(curl -sL "https://api.github.com/repos/ROCm-Developer-Tools/HIP/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" - current_version="$(grep "version =" pkgs/development/compilers/hip/default.nix | head -n1 | cut -d'"' -f2)" - if [[ "$version" != "$current_version" ]]; then - tarball_meta="$(nix-prefetch-github ROCm-Developer-Tools HIP --rev "rocm-$version")" - tarball_hash="$(nix to-base64 sha256-$(jq -r '.sha256' <<< "$tarball_meta"))" - sed -i -z "pkgs/development/compilers/hip/default.nix" \ - -e 's,version = "[^'"'"'"]*",version = "'"$version"'",1' \ - -e 's,hash = "[^'"'"'"]*",hash = "sha256-'"$tarball_hash"'",1' - else - echo hip already up-to-date - fi + passthru = { + # All known and valid general GPU targets + # We cannot use this for each ROCm library, as each defines their own supported targets + # See: https://github.com/RadeonOpenCompute/ROCm/blob/77cbac4abab13046ee93d8b5bf410684caf91145/README.md#library-target-matrix + gpuTargets = lib.forEach [ + "803" + "900" + "906" + "908" + "90a" + "1010" + "1012" + "1030" + ] (target: "gfx${target}"); - version="$(curl -sL "https://api.github.com/repos/ROCm-Developer-Tools/hipamd/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" - current_version="$(grep "version =" pkgs/development/compilers/hip/default.nix | tail -n1 | cut -d'"' -f2)" - if [[ "$version" != "$current_version" ]]; then - tarball_meta="$(nix-prefetch-github ROCm-Developer-Tools hipamd --rev "rocm-$version")" - tarball_hash="$(nix to-base64 sha256-$(jq -r '.sha256' <<< "$tarball_meta"))" - sed -i -z "pkgs/development/compilers/hip/default.nix" \ - -e 's,version = "[^'"'"'"]*",version = "'"$version"'",2' \ - -e 's,hash = "[^'"'"'"]*",hash = "sha256-'"$tarball_hash"'",2' - else - echo hipamd already up-to-date - fi - ''; + updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + }; meta = with lib; { - description = "C++ Heterogeneous-Compute Interface for Portability"; + description = "C++ Heterogeneous-Compute Interface for Portability specifically for AMD platform"; homepage = "https://github.com/ROCm-Developer-Tools/hipamd"; - license = licenses.mit; - maintainers = with maintainers; [ lovesegfault Flakebi ]; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; + # Tests require GPU, also include issues + broken = + versions.minor finalAttrs.version != versions.minor hip-common.version || + versions.minor finalAttrs.version != versions.minor hipcc.version || + buildTests; }; -} +}) diff --git a/pkgs/development/compilers/hip/hip-config-paths.patch b/pkgs/development/compilers/hip/hip-config-paths.patch deleted file mode 100644 index 25fa3b8da95a..000000000000 --- a/pkgs/development/compilers/hip/hip-config-paths.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/hip-lang-config.cmake.in b/hip-lang-config.cmake.in -index 1a72643a..7f35031f 100644 ---- a/hip-lang-config.cmake.in -+++ b/hip-lang-config.cmake.in -@@ -71,8 +71,8 @@ get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH) - - - #need _IMPORT_PREFIX to be set #FILE_REORG_BACKWARD_COMPATIBILITY --file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "${_IMPORT_PREFIX}/../llvm/lib/clang/*/include") --file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "${_IMPORT_PREFIX}/llvm/lib/clang/*/include") -+file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "@llvm@/lib/clang/*/include") -+file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "@llvm@/lib/clang/*/include") - find_path(HIP_CLANG_INCLUDE_PATH __clang_cuda_math.h - HINTS ${HIP_CLANG_INCLUDE_SEARCH_PATHS} - ${HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG} -@@ -87,9 +87,7 @@ endif() - #if HSA is not under ROCm then provide CMAKE_PREFIX_PATH= - find_path(HSA_HEADER hsa/hsa.h - PATHS -- "${_IMPORT_PREFIX}/../include" #FILE_REORG_BACKWARD_COMPATIBILITY -- "${_IMPORT_PREFIX}/include" -- "${ROCM_PATH}/include" -+ "@rocm_runtime@/include" - ) - - if (NOT HSA_HEADER) -@@ -97,7 +94,7 @@ if (HSA_HEADER-NOTFOUND) - endif() - - get_filename_component(HIP_COMPILER_INSTALL_PATH ${CMAKE_HIP_COMPILER} DIRECTORY) --file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "${HIP_COMPILER_INSTALL_PATH}/../lib/clang/*/lib/*") -+file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "@llvm@/lib/clang/*/lib/*") - find_library(CLANGRT_BUILTINS - NAMES - clang_rt.builtins diff --git a/pkgs/development/compilers/hip/hipamd-config-paths.patch b/pkgs/development/compilers/hip/hipamd-config-paths.patch deleted file mode 100644 index 78838836e9aa..000000000000 --- a/pkgs/development/compilers/hip/hipamd-config-paths.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/hip-config.cmake.in b/hip-config.cmake.in -index 89d1224e..120b68c6 100755 ---- a/hip-config.cmake.in -+++ b/hip-config.cmake.in -@@ -142,7 +142,7 @@ if(HIP_COMPILER STREQUAL "clang") - file(TO_CMAKE_PATH "${HIP_PATH}/../lc" HIP_CLANG_ROOT) - endif() - else() -- set(HIP_CLANG_ROOT "${ROCM_PATH}/llvm") -+ set(HIP_CLANG_ROOT "@clang@") - endif() - if(NOT HIP_CXX_COMPILER) - set(HIP_CXX_COMPILER ${CMAKE_CXX_COMPILER}) -@@ -206,10 +206,7 @@ if(NOT WIN32) - #if HSA is not under ROCm then provide CMAKE_PREFIX_PATH= - find_path(HSA_HEADER hsa/hsa.h - PATHS -- "${_IMPORT_PREFIX}/include" -- #FILE_REORG_BACKWARD_COMPATIBILITY ${_IMPORT_PREFIX}/../include is for Backward compatibility -- "${_IMPORT_PREFIX}/../include" -- ${ROCM_PATH}/include -+ "@rocm_runtime@/include" - ) - - if (NOT HSA_HEADER) -@@ -224,8 +221,8 @@ set_target_properties(hip::host PROPERTIES - - if(HIP_RUNTIME MATCHES "rocclr") - set_target_properties(hip::amdhip64 PROPERTIES -- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}" -- INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}" -+ INTERFACE_INCLUDE_DIRECTORIES "@hip@/include;${HSA_HEADER}" -+ INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "@hip@/include;${HSA_HEADER}" - ) - - get_target_property(amdhip64_type hip::amdhip64 TYPE) -@@ -233,8 +230,8 @@ if(HIP_RUNTIME MATCHES "rocclr") - - if(NOT WIN32) - set_target_properties(hip::device PROPERTIES -- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" -- INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" -+ INTERFACE_INCLUDE_DIRECTORIES "@hip@/include" -+ INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "@hip@/include" - ) - endif() - endif() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 83866d83..4125d3aa 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -178,7 +178,7 @@ if(__HIP_ENABLE_PCH) - ${ROCM_PATH}/llvm) - # find_package(LLVM) returns the lib/cmake/llvm location. We require the root. - if(NOT DEFINED HIP_LLVM_ROOT) -- set(HIP_LLVM_ROOT "${LLVM_DIR}/../../..") -+ set(HIP_LLVM_ROOT "@clang@") - endif() - - execute_process(COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/hip_embed_pch.sh ${HIP_COMMON_INCLUDE_DIR} ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/include ${HIP_LLVM_ROOT}" COMMAND_ECHO STDERR RESULT_VARIABLE EMBED_PCH_RC) -diff --git a/src/hip_embed_pch.sh b/src/hip_embed_pch.sh -index 0a1572b2..aa855d63 100755 ---- a/src/hip_embed_pch.sh -+++ b/src/hip_embed_pch.sh -@@ -149,7 +149,7 @@ EOF - - $LLVM_DIR/bin/clang -cc1 -O3 -emit-pch -triple amdgcn-amd-amdhsa -aux-triple x86_64-unknown-linux-gnu -fcuda-is-device -std=c++17 -fgnuc-version=4.2.1 -o $tmp/hip_wave64.pch -x hip-cpp-output - <$tmp/pch_wave64.cui && - -- $LLVM_DIR/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj && -+ @llvm@/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj && - - rm -rf $tmp - } diff --git a/pkgs/development/compilers/hipcc/0000-fixup-paths.patch b/pkgs/development/compilers/hipcc/0000-fixup-paths.patch new file mode 100644 index 000000000000..4f52c1ad11aa --- /dev/null +++ b/pkgs/development/compilers/hipcc/0000-fixup-paths.patch @@ -0,0 +1,130 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c21f247..5bd3e45 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,6 +17,6 @@ if (NOT WIN32) # C++17 does not require the std lib linking + target_link_libraries(hipconfig.bin ${LINK_LIBS} ) # for hipconfig.bin + endif() + +-set(HIP_VERSION_MAJOR 4 PARENT_SCOPE) +-set(HIP_VERSION_MINOR 4 PARENT_SCOPE) +-set(HIP_VERSION_PATCH 4 PARENT_SCOPE) ++set(HIP_VERSION_MAJOR @version_major@) ++set(HIP_VERSION_MINOR @version_minor@) ++set(HIP_VERSION_PATCH @version_patch@) +diff --git a/src/hipBin_amd.h b/src/hipBin_amd.h +index f94e4a5..f0b1b83 100644 +--- a/src/hipBin_amd.h ++++ b/src/hipBin_amd.h +@@ -207,7 +207,7 @@ void HipBinAmd::initializeHipCXXFlags() { + hipClangIncludePath = getCompilerIncludePath(); + hipCXXFlags += " -isystem \"" + hipClangIncludePath; + fs::path hipCXXFlagsTempFs = hipCXXFlags; +- hipCXXFlagsTempFs /= "..\""; ++ hipCXXFlagsTempFs /= "\""; + hipCXXFlags = hipCXXFlagsTempFs.string(); + const EnvVariables& var = getEnvVariables(); + // Allow __fp16 as function parameter and return type. +@@ -266,7 +266,7 @@ void HipBinAmd::printCompilerInfo() const { + string cmd = hipClangPath + "/clang++ --version"; + system(cmd.c_str()); // hipclang version + cout << "llc-version :" << endl; +- cmd = hipClangPath + "/llc --version"; ++ cmd = "@llvm@/bin/llc --version"; + system(cmd.c_str()); // llc version + cout << "hip-clang-cxxflags :" << endl; + cmd = hipPath + "/bin/hipcc --cxxflags"; +@@ -278,7 +278,7 @@ void HipBinAmd::printCompilerInfo() const { + } else { + string cmd = hipClangPath + "/clang++ --version"; + system(cmd.c_str()); // hipclang version +- cmd = hipClangPath + "/llc --version"; ++ cmd = "@llvm@/bin/llc --version"; + system(cmd.c_str()); // llc version + cout << "hip-clang-cxxflags :" << endl; + cmd = hipPath + "/bin/hipcc --cxxflags"; +@@ -331,10 +331,7 @@ string HipBinAmd::getCppConfig() { + hipPathInclude /= "include"; + + const string& compilerPath = getCompilerPath(); +- hipClangInclude = compilerPath; +- hipClangInclude = hipClangInclude.parent_path(); +- hipClangInclude /= "lib/clang/"; +- hipClangInclude /= compilerVersion; ++ hipClangInclude = "@clang@/resource-root/include"; + string hipClangPath = hipClangInclude.string(); + + const OsType& osInfo = getOSInfo(); +@@ -442,17 +439,7 @@ string HipBinAmd::getHipCC() const { + + + string HipBinAmd::getCompilerIncludePath() { +- string hipClangVersion, includePath, compilerIncludePath; +- const string& hipClangPath = getCompilerPath(); +- hipClangVersion = getCompilerVersion(); +- fs::path includePathfs = hipClangPath; +- includePathfs = includePathfs.parent_path(); +- includePathfs /= "lib/clang/"; +- includePathfs /= hipClangVersion; +- includePathfs /= "include"; +- includePathfs = fs::absolute(includePathfs).string(); +- compilerIncludePath = includePathfs.string(); +- return compilerIncludePath; ++ return "@clang@/resource-root/include"; + } + + +@@ -506,8 +493,8 @@ void HipBinAmd::printFull() { + cout << endl << "== Envirnoment Variables" << endl; + printEnvironmentVariables(); + getSystemInfo(); +- if (fs::exists("/usr/bin/lsb_release")) +- system("/usr/bin/lsb_release -a"); ++ if (fs::exists("@lsb_release@/bin/lsb_release")) ++ system("@lsb_release@/bin/lsb_release -a"); + cout << endl; + } + +@@ -993,7 +980,7 @@ void HipBinAmd::executeHipCCCmd(vector argv) { + } else if (os != windows) { + // Else try using rocm_agent_enumerator + string ROCM_AGENT_ENUM; +- ROCM_AGENT_ENUM = roccmPath + "/bin/rocm_agent_enumerator"; ++ ROCM_AGENT_ENUM = "@rocminfo@/bin/rocm_agent_enumerator"; + targetsStr = ROCM_AGENT_ENUM +" -t GPU"; + SystemCmdOut sysOut = hipBinUtilPtr_->exec(targetsStr.c_str()); + regex toReplace("\n+"); +@@ -1097,7 +1084,7 @@ void HipBinAmd::executeHipCCCmd(vector argv) { + string hipClangVersion, toolArgTemp; + if (linkType == 0) { + toolArgTemp = " -L"+ hipLibPath + "-lamdhip64 -L" + +- roccmPath+ "/lib -lhsa-runtime64 -ldl -lnuma " + toolArgs; ++ "@rocm_runtime@/lib -lhsa-runtime64 -ldl -lnuma " + toolArgs; + toolArgs = toolArgTemp; + } else { + toolArgTemp = toolArgs + " -Wl,--enable-new-dtags -Wl,-rpath=" + hipLibPath + ":" +@@ -1107,8 +1094,7 @@ void HipBinAmd::executeHipCCCmd(vector argv) { + + hipClangVersion = getCompilerVersion(); + // To support __fp16 and _Float16, explicitly link with compiler-rt +- toolArgs += " -L" + hipClangPath + "/../lib/clang/" + +- hipClangVersion + "/lib/linux -lclang_rt.builtins-x86_64 "; ++ toolArgs += " -L@clang@/resource-root/lib/linux -lclang_rt.builtins-x86_64 "; + } + if (!var.hipccCompileFlagsAppendEnv_.empty()) { + HIPCXXFLAGS += " " + var.hipccCompileFlagsAppendEnv_ + " "; +diff --git a/src/hipBin_nvidia.h b/src/hipBin_nvidia.h +index 6feb315..b61739d 100644 +--- a/src/hipBin_nvidia.h ++++ b/src/hipBin_nvidia.h +@@ -157,8 +157,8 @@ void HipBinNvidia::printFull() { + cout << endl << "== Envirnoment Variables" << endl; + printEnvironmentVariables(); + getSystemInfo(); +- if (fs::exists("/usr/bin/lsb_release")) +- system("/usr/bin/lsb_release -a"); ++ if (fs::exists("@lsb_release@/bin/lsb_release")) ++ system("@lsb_release@/bin/lsb_release -a"); + } + + // returns hip include diff --git a/pkgs/development/compilers/hipcc/default.nix b/pkgs/development/compilers/hipcc/default.nix new file mode 100644 index 000000000000..af0cb35c1480 --- /dev/null +++ b/pkgs/development/compilers/hipcc/default.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, substituteAll +, cmake +, llvm +, rocm-runtime +, rocminfo +, lsb-release +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hipcc"; + version = "5.4.2"; + + src = fetchFromGitHub { + owner = "ROCm-Developer-Tools"; + repo = "HIPCC"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-PEwue4O43MiMkF8UmTeHsmlikBG2V3/nFQLKmtHrRWQ="; + }; + + patches = [ + (substituteAll { + src = ./0000-fixup-paths.patch; + inherit llvm rocminfo; + version_major = lib.versions.major finalAttrs.version; + version_minor = lib.versions.minor finalAttrs.version; + version_patch = lib.versions.patch finalAttrs.version; + clang = stdenv.cc; + rocm_runtime = rocm-runtime; + lsb_release = lsb-release; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv *.bin $out/bin + + runHook postInstall + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Compiler driver utility that calls clang or nvcc"; + homepage = "https://github.com/ROCm-Developer-Tools/HIPCC"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + }; +}) diff --git a/pkgs/development/compilers/hipify/default.nix b/pkgs/development/compilers/hipify/default.nix new file mode 100644 index 000000000000..342e8e7e8bd4 --- /dev/null +++ b/pkgs/development/compilers/hipify/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, libxml2 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hipify"; + version = "5.4.2"; + + src = fetchFromGitHub { + owner = "ROCm-Developer-Tools"; + repo = "HIPIFY"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-EaHtI1ywjEHioWptuHvCllJ3dENtSClVoE6NpWTOa9I="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libxml2 ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "\''${LLVM_TOOLS_BINARY_DIR}/clang" "${stdenv.cc}/bin/clang" + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + # Fixup weird install paths + postInstall = '' + mkdir -p $out/bin + mv $out/{*.sh,hipify-*} $out/bin + cp -afs $out/bin $out/hip + ''; + + meta = with lib; { + description = "Convert CUDA to Portable C++ Code"; + homepage = "https://github.com/ROCm-Developer-Tools/HIPIFY"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + }; +}) diff --git a/pkgs/development/compilers/hvm/default.nix b/pkgs/development/compilers/hvm/default.nix index e314e52a0523..1d60a610729d 100644 --- a/pkgs/development/compilers/hvm/default.nix +++ b/pkgs/development/compilers/hvm/default.nix @@ -1,30 +1,33 @@ { lib , rustPlatform , fetchCrate -, pkg-config -, openssl , stdenv -, Security +, darwin }: rustPlatform.buildRustPackage rec { pname = "hvm"; - version = "0.1.89"; + version = "1.0.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-xPF8HW4QFXLLjg2HO5Pl+uQ44XCdAHc6koVpVXxN6dE="; + sha256 = "sha256-nPkUGUcekZ2fvQgiVTNvt8vfQsNMyqsrkT2zqEfu/bE="; }; - cargoSha256 = "sha256-dDSmiMwDbVDfStXamQvOMBBO5MiuDFhgzWPx0oYwzcM="; + cargoSha256 = "sha256-EaZTpKFZPfDlP/2XylhJHznvlah7VNw4snrKDmT7ecw="; - nativeBuildInputs = [ pkg-config ]; + buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + darwin.apple_sdk.frameworks.IOKit + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + darwin.apple_sdk_11_0.frameworks.Foundation + ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - - # memory allocation of 34359738368 bytes failed + # tests are broken doCheck = false; + # enable nightly features + RUSTC_BOOTSTRAP = true; + meta = with lib; { description = "A pure functional compile target that is lazy, non-garbage-collected, and parallel"; homepage = "https://github.com/kindelia/hvm"; diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index 7f413877a593..2760eb268c19 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { buildFlags = [ "bootstrap" "SCHEME=scheme" ]; checkTarget = "test"; - checkInputs = [ gambit nodejs ]; # racket ]; + nativeCheckInputs = [ gambit nodejs ]; # racket ]; checkFlags = [ "INTERACTIVE=" ]; # TODO: Move this into its own derivation, such that this can be changed diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix index c61b6eee9dfa..24bc14c0b3a9 100644 --- a/pkgs/development/compilers/inform7/default.nix +++ b/pkgs/development/compilers/inform7/default.nix @@ -22,11 +22,12 @@ in stdenv.mkDerivation { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "A design system for interactive fiction"; homepage = "http://inform7.com/"; license = licenses.artistic2; maintainers = with maintainers; [ mbbx6spp ]; platforms = platforms.unix; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/pkgs/development/compilers/inklecate/default.nix b/pkgs/development/compilers/inklecate/default.nix index 101c77a1c965..ac32e2954937 100644 --- a/pkgs/development/compilers/inklecate/default.nix +++ b/pkgs/development/compilers/inklecate/default.nix @@ -8,24 +8,24 @@ buildDotnetModule rec { pname = "inklecate"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "inkle"; repo = "ink"; rev = "v${version}"; - sha256 = "00lagmwsbxap5mgnw4gndpavmv3xsgincdaq1zvw7fkc3vn3pxqc"; + hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA=="; }; nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib ]; projectFile = "inklecate/inklecate.csproj"; - nugetDeps = if stdenv.isDarwin then ./deps-darwin.nix else ./deps-linux.nix; + nugetDeps = ./deps.nix; executables = [ "inklecate" ]; - dotnet-runtime = dotnetCorePackages.runtime_3_1; - dotnet-sdk = dotnetCorePackages.sdk_3_1; + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; meta = with lib; { description = "Compiler for ink, inkle's scripting language"; diff --git a/pkgs/development/compilers/inklecate/deps-darwin.nix b/pkgs/development/compilers/inklecate/deps-darwin.nix deleted file mode 100644 index 0d6f9f5afa5f..000000000000 --- a/pkgs/development/compilers/inklecate/deps-darwin.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.26"; sha256 = "1vk4dr2z72nmjg2skqvy2m2h5brqp21v51pnd7ldpm7asgr5ck8n"; }) - (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"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (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.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (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"; 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"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (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"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (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/development/compilers/inklecate/deps-linux.nix b/pkgs/development/compilers/inklecate/deps-linux.nix deleted file mode 100644 index 9252dc606184..000000000000 --- a/pkgs/development/compilers/inklecate/deps-linux.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.26"; sha256 = "1xyha28nvy9zqanb4ciscm60jls2fcc4c93k1ma6z3hgk6g9nfqr"; }) - (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"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (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.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (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/development/compilers/inklecate/deps.nix b/pkgs/development/compilers/inklecate/deps.nix new file mode 100644 index 000000000000..f3a17967e25c --- /dev/null +++ b/pkgs/development/compilers/inklecate/deps.nix @@ -0,0 +1,5 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ +] diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 0eab971fb977..0570450b32bf 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -6,7 +6,6 @@ , bison , flex , llvmPackages_11 -, lld_11 , opencl-clang , python3 , spirv-tools @@ -20,42 +19,40 @@ let vc_intrinsics_src = fetchFromGitHub { owner = "intel"; repo = "vc-intrinsics"; - rev = "v0.3.0"; - sha256 = "sha256-1Rm4TCERTOcPGWJF+yNoKeB9x3jfqnh7Vlv+0Xpmjbk="; + rev = "v0.7.1"; + sha256 = "sha256-bpi4hLpov1CbFy4jr9Eytc5O4ismYw0J+KgXyZtQYks="; }; + llvmPkgs = llvmPackages_11 // { - inherit spirv-llvm-translator; - }; - inherit (llvmPkgs) llvm; - inherit (if buildWithPatches then opencl-clang else llvmPkgs) clang libclang spirv-llvm-translator; - inherit (lib) getVersion optional optionals versionOlder versions; + spirv-llvm-translator = spirv-llvm-translator.override { llvm = llvm; }; + } // lib.optionalAttrs buildWithPatches opencl-clang; + + inherit (llvmPackages_11) lld llvm; + inherit (llvmPkgs) clang libclang spirv-llvm-translator; in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.11061"; + version = "1.0.12504.5"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - sha256 = "sha256-qS/+GTqHtp3T6ggPKrCDsrTb7XvVOUaNbMzGU51jTu4="; + sha256 = "sha256-Ok+cXMTBABrHHM4Vc2yzlou48YHoQnaB3We8mGZhSwI="; }; - nativeBuildInputs = [ clang cmake bison flex python3 ]; + nativeBuildInputs = [ cmake bison flex python3 ]; - buildInputs = [ spirv-headers spirv-tools clang opencl-clang spirv-llvm-translator llvm lld_11 ]; + buildInputs = [ spirv-headers spirv-tools spirv-llvm-translator llvm lld ]; strictDeps = true; - # checkInputs = [ lit pythonPackages.nose ]; - - # FIXME: How do we run the test suite? - # https://github.com/intel/intel-graphics-compiler/issues/98 + # testing is done via intel-compute-runtime doCheck = false; postPatch = '' - substituteInPlace ./external/SPIRV-Tools/CMakeLists.txt \ + substituteInPlace external/SPIRV-Tools/CMakeLists.txt \ --replace '$'''{SPIRV-Tools_DIR}../../..' \ '${spirv-tools}' \ --replace 'SPIRV-Headers_INCLUDE_DIR "/usr/include"' \ @@ -64,7 +61,7 @@ stdenv.mkDerivation rec { 'set_target_properties(SPIRV-Tools-shared' \ --replace 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools' \ 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools-shared' - substituteInPlace ./IGC/AdaptorOCL/igc-opencl.pc.in \ + substituteInPlace IGC/AdaptorOCL/igc-opencl.pc.in \ --replace '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \ --replace '/@CMAKE_INSTALL_LIBDIR@' "/lib" ''; @@ -74,10 +71,10 @@ stdenv.mkDerivation rec { prebuilds = runCommandLocal "igc-cclang-prebuilds" { } '' mkdir $out ln -s ${clang}/bin/clang $out/ - ln -s clang $out/clang-${versions.major (getVersion clang)} + ln -s clang $out/clang-${lib.versions.major (lib.getVersion clang)} ln -s ${opencl-clang}/lib/* $out/ - ln -s ${lib.getLib libclang}/lib/clang/${getVersion clang}/include/opencl-c.h $out/ - ln -s ${lib.getLib libclang}/lib/clang/${getVersion clang}/include/opencl-c-base.h $out/ + ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c.h $out/ + ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c-base.h $out/ ''; cmakeFlags = [ @@ -86,15 +83,14 @@ stdenv.mkDerivation rec { "-DIGC_OPTION__SPIRV_TOOLS_MODE=Prebuilds" "-DCCLANG_BUILD_PREBUILDS=ON" "-DCCLANG_BUILD_PREBUILDS_DIR=${prebuilds}" - "-DIGC_PREFERRED_LLVM_VERSION=${getVersion llvm}" + "-DIGC_PREFERRED_LLVM_VERSION=${lib.getVersion llvm}" ]; meta = with lib; { homepage = "https://github.com/intel/intel-graphics-compiler"; description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware"; license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ gloaming ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/intel-graphics-compiler.x86_64-darwin + platforms = platforms.linux; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/development/compilers/intercal/default.nix index 54641d45bce5..1fde0f320c40 100644 --- a/pkgs/development/compilers/intercal/default.nix +++ b/pkgs/development/compilers/intercal/default.nix @@ -3,7 +3,6 @@ , bison, flex , makeWrapper }: -with lib; stdenv.mkDerivation rec { pname = "intercal"; @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/ick --suffix PATH ':' ${stdenv.cc}/bin ''; - meta = { + meta = with lib; { description = "The original esoteric programming language"; longDescription = '' INTERCAL, an abbreviation for "Compiler Language With No diff --git a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh index 68ba3ed3a920..47459664af0a 100644 --- a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh +++ b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh @@ -1,4 +1,5 @@ # -*- shell-script -*- +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup function extract diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index d36f36a85a73..004bf4bb10de 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -2,18 +2,18 @@ , cmake, which, m4, python3, bison, flex, llvmPackages, ncurses # the default test target is sse4, but that is not supported by all Hydra agents -, testedTargets ? [ "sse2-i32x4" ] +, testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ] }: stdenv.mkDerivation rec { pname = "ispc"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-eI/zUhZDTd2SiFltjrs8kxvQQOPHpqhArGyOW+och3E="; + sha256 = "sha256-WBAVgjQjW4x9JGx6xotPoTVOePsPjBJEyBYA7TCTBvc="; }; nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev ]; @@ -58,14 +58,15 @@ stdenv.mkDerivation rec { "-DCLANGPP_EXECUTABLE=${llvmPackages.clang}/bin/clang++" "-DISPC_INCLUDE_EXAMPLES=OFF" "-DISPC_INCLUDE_UTILS=OFF" - "-DARM_ENABLED=FALSE" + ("-DARM_ENABLED=" + (if stdenv.isAarch64 || stdenv.isAarch32 then "TRUE" else "FALSE")) + ("-DX86_ENABLED=" + (if stdenv.isx86_64 || stdenv.isx86_32 then "TRUE" else "FALSE")) ]; meta = with lib; { homepage = "https://ispc.github.io/"; description = "Intel 'Single Program, Multiple Data' Compiler, a vectorised language"; license = licenses.bsd3; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; # TODO: buildable on more platforms? + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; # TODO: buildable on more platforms? maintainers = with maintainers; [ aristid thoughtpolice athas ]; }; } diff --git a/pkgs/development/compilers/jasmin/default.nix b/pkgs/development/compilers/jasmin/default.nix index c61f267bf1af..01f09772a84e 100644 --- a/pkgs/development/compilers/jasmin/default.nix +++ b/pkgs/development/compilers/jasmin/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An assembler for the Java Virtual Machine"; - homepage = "http://jasmin.sourceforge.net/"; + homepage = "https://jasmin.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/jasmin/files/latest/download"; license = licenses.bsd3; maintainers = with maintainers; [ fgaz ]; diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 8f7896aa6bfa..5702ba2a2e6c 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -3,22 +3,122 @@ , fetchFromGitHub , jetbrains , openjdk17 +, openjdk17-bootstrap +, git +, autoconf +, unzip +, rsync +, debugBuild ? false + +, libXdamage +, libXxf86vm +, libXrandr +, libXi +, libXcursor +, libXrender +, libX11 +, libXext +, libxcb +, nss +, nspr +, libdrm +, mesa +, wayland +, udev }: openjdk17.overrideAttrs (oldAttrs: rec { - pname = "jetbrains-jdk"; - version = "17.0.3-b469.37"; + pname = "jetbrains-jdk-jcef"; + javaVersion = "17.0.5"; + build = "653.25"; + # To get the new tag: + # git clone https://github.com/jetbrains/jetbrainsruntime + # cd jetbrainsruntime + # git reset --hard [revision] + # git log --simplify-by-decoration --decorate=short --pretty=short | grep "jdk-" | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1 + openjdkTag = "jdk-18+0"; + version = "${javaVersion}-b${build}"; src = fetchFromGitHub { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; - hash = - # Upstream issue: https://github.com/JetBrains/JetBrainsRuntime/issues/163 - if stdenv.isDarwin then "sha256-ExRvjs53rIuhUx4oCgAqu1Av3CNAgmE1ZlN0srEh3XM=" - else "sha256-O+OIDRJcIsb/vhO2+SYuYdUYWYTGkBcQ9cHTExLIFDE="; + hash = "sha256-/3NzluFpzKC8mFQxrKY9WlgBh9asbEE7lrGJy/ZJXRU="; }; + BOOT_JDK = openjdk17-bootstrap.home; + SOURCE_DATE_EPOCH = 1666098567; + + patches = []; + + # Configure is done in build phase + configurePhase = "true"; + + buildPhase = '' + runHook preBuild + + mkdir -p jcef_linux_x64/jmods + cp ${jetbrains.jcef}/* jcef_linux_x64/jmods + + sed \ + -e "s/OPENJDK_TAG=.*/OPENJDK_TAG=${openjdkTag}/" \ + -e "s/SOURCE_DATE_EPOCH=.*//" \ + -e "s/export SOURCE_DATE_EPOCH//" \ + -i jb/project/tools/common/scripts/common.sh + sed -i "s/STATIC_CONF_ARGS/STATIC_CONF_ARGS \$configureFlags/" jb/project/tools/linux/scripts/mkimages_x64.sh + sed \ + -e "s/create_image_bundle \"jb/#/" \ + -e "s/echo Creating /exit 0 #/" \ + -i jb/project/tools/linux/scripts/mkimages_x64.sh + + patchShebangs . + ./jb/project/tools/linux/scripts/mkimages_x64.sh ${build} ${if debugBuild then "fd" else "jcef"} + + runHook postBuild + ''; + + installPhase = let + buildType = if debugBuild then "fastdebug" else "release"; + debugSuffix = if debugBuild then "-fastdebug" else ""; + jcefSuffix = if debugBuild then "" else "_jcef"; + in '' + runHook preInstall + + mv build/linux-x86_64-server-${buildType}/images/jdk/man build/linux-x86_64-server-${buildType}/images/jbrsdk${jcefSuffix}-${javaVersion}-linux-x64${debugSuffix}-b${build} + rm -rf build/linux-x86_64-server-${buildType}/images/jdk + mv build/linux-x86_64-server-${buildType}/images/jbrsdk${jcefSuffix}-${javaVersion}-linux-x64${debugSuffix}-b${build} build/linux-x86_64-server-${buildType}/images/jdk + '' + oldAttrs.installPhase + "runHook postInstall"; + + postInstall = '' + chmod +x $out/lib/openjdk/lib/chrome-sandbox + ''; + + dontStrip = debugBuild; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="${lib.makeLibraryPath [ + libXdamage libXxf86vm libXrandr libXi libXcursor libXrender libX11 libXext libxcb + nss nspr libdrm mesa wayland udev + ]}" + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" + done + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + ''; + + nativeBuildInputs = [ git autoconf unzip rsync ] ++ oldAttrs.nativeBuildInputs; + meta = with lib; { description = "An OpenJDK fork to better support Jetbrains's products."; longDescription = '' @@ -28,7 +128,6 @@ openjdk17.overrideAttrs (oldAttrs: rec { include: Subpixel Anti-Aliasing, enhanced font rendering on Linux, HiDPI support, ligatures, some fixes for native crashes not presented in official build, and other small enhancements. - JetBrains Runtime is not a certified build of OpenJDK. Please, use at your own risk. ''; diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix new file mode 100644 index 000000000000..a1fa2034eeb2 --- /dev/null +++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix @@ -0,0 +1,221 @@ +{ fetchFromGitHub +, fetchurl +, fetchzip +, stdenv +, cmake +, python3 +, jdk17 +, git +, libcef +, rsync +, lib +, ant +, ninja + +, debugBuild ? false + +, glib +, nss +, nspr +, atk +, at-spi2-atk +, libdrm +, expat +, libxcb +, libxkbcommon +, libX11 +, libXcomposite +, libXdamage +, libXext +, libXfixes +, libXrandr +, mesa +, gtk3 +, pango +, cairo +, alsa-lib +, dbus +, at-spi2-core +, cups +, libxshmfence +, udev +}: + +assert !stdenv.isDarwin; +# I can't test darwin + +let rpath = lib.makeLibraryPath [ + glib + nss + nspr + atk + at-spi2-atk + libdrm + expat + libxcb + libxkbcommon + libX11 + libXcomposite + libXdamage + libXext + libXfixes + libXrandr + mesa + gtk3 + pango + cairo + alsa-lib + dbus + at-spi2-core + cups + libxshmfence + udev +]; + +buildType = if debugBuild then "Debug" else "Release"; + +in stdenv.mkDerivation rec { + name = "jcef-jetbrains"; + rev = "153d40c761a25a745d7ebf0ee3a024bbc2c840b5"; + commit-num = "611"; # Run `git rev-list --count HEAD` + + nativeBuildInputs = [ cmake python3 jdk17 git rsync ant ninja ]; + buildInputs = [ libX11 libXdamage nss nspr ]; + + src = fetchFromGitHub { + owner = "jetbrains"; + repo = "jcef"; + inherit rev; + hash = "sha256-Vud4nIT2c7uOK7GKKw3plf41WzKqhg+2xpIwB/LyqnE="; + }; + cef-bin = let + fileName = "cef_binary_104.4.26+g4180781+chromium-104.0.5112.102_linux64_minimal"; + urlName = builtins.replaceStrings ["+"] ["%2B"] fileName; + in fetchzip rec { + name = fileName; + url = "https://cef-builds.spotifycdn.com/${urlName}.tar.bz2"; + hash = "sha256-0PAWWBR+9TO8hhejydWz8R6Df3d9A/Mb0VL8stlPz5Q="; + }; + clang-fmt = fetchurl { + url = "https://storage.googleapis.com/chromium-clang-format/942fc8b1789144b8071d3fc03ff0fcbe1cf81ac8"; + hash = "sha256-5iAU49tQmLS7zkS+6iGT+6SEdERRo1RkyRpiRvc9nVY="; + }; + + configurePhase = '' + runHook preConfigure + + patchShebangs . + + cp -r ${cef-bin} third_party/cef/${cef-bin.name} + chmod +w -R third_party/cef/${cef-bin.name} + patchelf third_party/cef/${cef-bin.name}/${buildType}/libcef.so --set-rpath "${rpath}" --add-needed libudev.so + patchelf third_party/cef/${cef-bin.name}/${buildType}/chrome-sandbox --set-interpreter $(cat $NIX_BINTOOLS/nix-support/dynamic-linker) + sed 's/-O0/-O2/' -i third_party/cef/${cef-bin.name}/cmake/cef_variables.cmake + + sed \ + -e 's|os.path.isdir(os.path.join(path, \x27.git\x27))|True|' \ + -e 's|"%s rev-parse %s" % (git_exe, branch)|"echo '${rev}'"|' \ + -e 's|"%s config --get remote.origin.url" % git_exe|"echo 'https://github.com/jetbrains/jcef'"|' \ + -e 's|"%s rev-list --count %s" % (git_exe, branch)|"echo '${commit-num}'"|' \ + -i tools/git_util.py + + cp ${clang-fmt} tools/buildtools/linux64/clang-format + chmod +w tools/buildtools/linux64/clang-format + + mkdir jcef_build + cd jcef_build + + cmake -G "Ninja" -DPROJECT_ARCH="x86_64" -DCMAKE_BUILD_TYPE=${buildType} .. + + runHook postConfigure + ''; + + outputs = [ "out" "unpacked" ]; + + postBuild = '' + export JCEF_ROOT_DIR=$(realpath ..) + ../tools/compile.sh linux64 Release + ''; + + # Mostly taken from jb/tools/common/create_modules.sh + installPhase = '' + runHook preInstall + + export JCEF_ROOT_DIR=$(realpath ..) + export OUT_NATIVE_DIR=$JCEF_ROOT_DIR/jcef_build/native/${buildType} + export JB_TOOLS_DIR=$(realpath ../jb/tools) + export JB_TOOLS_OS_DIR=$JB_TOOLS_DIR/linux + export OUT_CLS_DIR=$(realpath ../out/linux64) + export TARGET_ARCH=x86_64 DEPS_ARCH=amd64 + export OS=linux + export JOGAMP_DIR="$JCEF_ROOT_DIR"/third_party/jogamp/jar + + mkdir -p $unpacked/{jogl,gluegen,jcef} + + function extract_jar { + __jar=$1 + __dst_dir=$2 + __content_dir="''${3:-.}" + __tmp=.tmp_extract_jar + rm -rf "$__tmp" && mkdir "$__tmp" + ( + cd "$__tmp" || exit 1 + jar -xf "$__jar" + ) + rm -rf "$__tmp/META-INF" + rm -rf "$__dst_dir" && mkdir "$__dst_dir" + if [ -z "$__content_dir" ] + then + cp -R "$__tmp"/* "$__dst_dir" + else + cp -R "$__tmp"/"$__content_dir"/* "$__dst_dir" + fi + rm -rf $__tmp + } + + cd $unpacked/gluegen + cp "$JOGAMP_DIR"/gluegen-rt.jar . + cp "$JB_TOOLS_DIR"/common/gluegen-module-info.java module-info.java + javac --patch-module gluegen.rt=gluegen-rt.jar module-info.java + jar uf gluegen-rt.jar module-info.class + rm module-info.class module-info.java + mkdir lib + extract_jar "$JOGAMP_DIR"/gluegen-rt-natives-"$OS"-"$DEPS_ARCH".jar lib natives/"$OS"-"$DEPS_ARCH" + + cd ../jogl + cp "$JOGAMP_DIR"/gluegen-rt.jar . + cp "$JOGAMP_DIR"/jogl-all.jar . + cp "$JB_TOOLS_OS_DIR"/jogl-module-info.java module-info.java + javac --module-path . --patch-module jogl.all=jogl-all.jar module-info.java + jar uf jogl-all.jar module-info.class + rm module-info.class module-info.java + mkdir lib + extract_jar "$JOGAMP_DIR"/jogl-all-natives-"$OS"-"$DEPS_ARCH".jar lib natives/"$OS"-"$DEPS_ARCH" + + cd ../jcef + cp "$OUT_CLS_DIR"/jcef.jar . + mkdir lib + cp -R "$OUT_NATIVE_DIR"/* lib + + mkdir $out + + runHook postInstall + ''; + + dontStrip = debugBuild; + + postFixup = '' + cd $unpacked/gluegen + jmod create --class-path gluegen-rt.jar --libs lib $out/gluegen.rt.jmod + cd ../jogl + jmod create --module-path . --class-path jogl-all.jar --libs lib $out/jogl.all.jmod + cd ../jcef + jmod create --module-path . --class-path jcef.jar --libs lib $out/jcef.jmod + ''; + + meta = { + description = "Jetbrains' fork of JCEF"; + license = lib.licenses.bsd3; + homepage = "https://github.com/JetBrains/JCEF"; + }; +} diff --git a/pkgs/development/compilers/jrsonnet/default.nix b/pkgs/development/compilers/jrsonnet/default.nix index 696f7acb3311..ffbd1c22d4b6 100644 --- a/pkgs/development/compilers/jrsonnet/default.nix +++ b/pkgs/development/compilers/jrsonnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "jrsonnet"; @@ -11,8 +11,15 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-OX+iJJ3vdCsWWr8x31psV9Vne6xWDZnJc83NbJqMK1A="; }; + cargoSha256 = "sha256-eFfAU9Q3nYAJK+kKP1Y6ONjOIfkuYTlelrFrEW9IJ8c="; + nativeBuildInputs = [ installShellFiles ]; + # skip flaky tests + checkFlags = [ + "--skip=tests::native_ext" + ]; + postInstall = '' ln -s $out/bin/jrsonnet $out/bin/jsonnet @@ -24,13 +31,10 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "sha256-eFfAU9Q3nYAJK+kKP1Y6ONjOIfkuYTlelrFrEW9IJ8c="; - - meta = { + meta = with lib; { description = "Purely-functional configuration language that helps you define JSON data"; - maintainers = with lib.maintainers; [ lach ]; - license = lib.licenses.mit; homepage = "https://github.com/CertainLach/jrsonnet"; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/jrsonnet.x86_64-darwin + license = licenses.mit; + maintainers = with maintainers; [ figsoda lach ]; }; } diff --git a/pkgs/development/compilers/julia/1.6-bin.nix b/pkgs/development/compilers/julia/1.6-bin.nix index 79203ce7e0a3..cf72457a1434 100644 --- a/pkgs/development/compilers/julia/1.6-bin.nix +++ b/pkgs/development/compilers/julia/1.6-bin.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ninjin raskin ]; + maintainers = with lib.maintainers; [ raskin ]; platforms = [ "x86_64-linux" ]; mainProgram = "julia"; }; diff --git a/pkgs/development/compilers/julia/1.8-bin.nix b/pkgs/development/compilers/julia/1.8-bin.nix index 325ed73e2d58..24eac49df9db 100644 --- a/pkgs/development/compilers/julia/1.8-bin.nix +++ b/pkgs/development/compilers/julia/1.8-bin.nix @@ -1,20 +1,51 @@ { autoPatchelfHook, fetchurl, lib, stdenv }: +let + skip_tests = [ + # Test flaky on ofborg + "channels" + ] ++ lib.optionals stdenv.isDarwin [ + # Test flaky on ofborg + "FileWatching" + # Test requires pbcopy + "InteractiveUtils" + # Test requires network access + "Sockets" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # Test Failed at $out/share/julia/stdlib/v1.8/LinearAlgebra/test/blas.jl:702 + "LinearAlgebra/blas" + # Test Failed at $out/share/julia/test/misc.jl:724 + "misc" + ]; +in stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.8.3"; + version = "1.8.5"; 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 = "sha256-M8Owk1b/qiXTMxw2RrHy1LCZROj5P8uZSVeAG4u/WKk="; + sha256 = "sha256-5xokgW6P6dX0gHZky7tCc49aqf4FOX01yB1MXWSbnQU="; }; aarch64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz"; - sha256 = "sha256-2/+xNKQTtxLUqOHujmZepV7bCGVxmhutmXkSPWQzrMk="; + sha256 = "sha256-ofY3tExx6pvJbXw+80dyTAVKHlInuYCt6/wzWZ5RU6Q="; + }; + x86_64-darwin = fetchurl { + url = "https://julialang-s3.julialang.org/bin/mac/x64/${lib.versions.majorMinor version}/julia-${version}-mac64.tar.gz"; + sha256 = "sha256-oahZ7af7QaC1VGczmhHDwcDfeLJ9HhYOgLxnWLPY2uA="; + }; + aarch64-darwin = fetchurl { + url = "https://julialang-s3.julialang.org/bin/mac/aarch64/${lib.versions.majorMinor version}/julia-${version}-macaarch64.tar.gz"; + sha256 = "sha256-6oXgSJw2MkxNpiFjqhuC/PL1L3LRc+590hOjqSmSyrc="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + patches = [ + # https://github.com/JuliaLang/julia/commit/f5eeba35d9bf20de251bb9160cc935c71e8b19ba + ./patches/1.8-bin/0001-allow-skipping-internet-required-tests.patch + ]; + postPatch = '' # Julia fails to pick up our Certification Authority root certificates, but # it provides its own so we can simply disable the test. Patching in the @@ -24,7 +55,7 @@ stdenv.mkDerivation rec { '@test_skip ca_roots_path() != bundled_ca_roots()' ''; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; installPhase = '' runHook preInstall @@ -48,7 +79,8 @@ stdenv.mkDerivation rec { --check-bounds=yes \ --startup-file=no \ --depwarn=error \ - $out/share/julia/test/runtests.jl + $out/share/julia/test/runtests.jl \ + --skip internet_required ${toString skip_tests} runHook postInstallCheck ''; @@ -57,8 +89,8 @@ stdenv.mkDerivation rec { homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ninjin raskin nickcao ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = with lib.maintainers; [ raskin nickcao wegank ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "julia"; }; } diff --git a/pkgs/development/compilers/julia/1.8.nix b/pkgs/development/compilers/julia/1.8.nix index f8b0daa1ace7..1a6d6e7332c1 100644 --- a/pkgs/development/compilers/julia/1.8.nix +++ b/pkgs/development/compilers/julia/1.8.nix @@ -4,55 +4,26 @@ , which , python3 , gfortran -, gcc , cmake , perl , gnum4 -, libwhich , libxml2 -, libunwind -, libgit2 -, curl -, nghttp2 -, mbedtls -, libssh2 -, gmp -, mpfr -, suitesparse -, utf8proc -, zlib -, p7zip -, ncurses -, pcre2 +, openssl }: stdenv.mkDerivation rec { pname = "julia"; - version = "1.8.3"; + version = "1.8.5"; src = fetchurl { url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; - hash = "sha256-UraJWp1K0v422yYe6MTIzJISuDehL5MAL6r1N6IVH1A="; + hash = "sha256-NVVAgKS0085S7yICVDBr1CrA2I7/nrhVkqV9BmPbXfI="; }; - patches = - let - path = name: "https://raw.githubusercontent.com/archlinux/svntogit-community/6fd126d089d44fdc875c363488a7c7435a223cec/trunk/${name}"; - in - [ - (fetchurl { - url = path "julia-hardcoded-libs.patch"; - sha256 = "sha256-kppSpVA7bRohd0wXDs4Jgct9ocHnpbeiiSz7ElFom1U="; - }) - (fetchurl { - url = path "julia-libunwind-1.6.patch"; - sha256 = "sha256-zqMh9+Fjgd15XuINe9Xtpk+bRTwB0T6WCWLrJyOQfiQ="; - }) - ./patches/1.8/0001-skip-symlink-system-libraries.patch - ./patches/1.8/0002-skip-building-doc.patch - ./patches/1.8/0003-skip-failing-tests.patch - ./patches/1.8/0004-ignore-absolute-path-when-loading-library.patch - ]; + patches = [ + ./patches/1.8/0001-skip-building-doc.patch + ./patches/1.8/0002-skip-failing-and-flaky-tests.patch + ]; nativeBuildInputs = [ which @@ -61,66 +32,38 @@ stdenv.mkDerivation rec { cmake perl gnum4 - libwhich ]; buildInputs = [ libxml2 - libunwind - libgit2 - curl - nghttp2 - mbedtls - libssh2 - gmp - mpfr - utf8proc - zlib - p7zip - pcre2 + openssl ]; - JULIA_RPATH = lib.makeLibraryPath (buildInputs ++ [ stdenv.cc.cc gfortran.cc ncurses ]); - dontUseCmakeConfigure = true; postPatch = '' patchShebangs . ''; - LDFLAGS = "-Wl,-rpath,${JULIA_RPATH}"; - makeFlags = [ "prefix=$(out)" "USE_BINARYBUILDER=0" - "USE_SYSTEM_CSL=1" - "USE_SYSTEM_LLVM=0" # a patched version is required - "USE_SYSTEM_LIBUNWIND=1" - "USE_SYSTEM_PCRE=1" - "USE_SYSTEM_LIBM=0" - "USE_SYSTEM_OPENLIBM=0" - "USE_SYSTEM_DSFMT=0" # not available in nixpkgs - "USE_SYSTEM_LIBBLASTRAMPOLINE=0" # not available in nixpkgs - "USE_SYSTEM_BLAS=0" # test failure - "USE_SYSTEM_LAPACK=0" # test failure - "USE_SYSTEM_GMP=1" - "USE_SYSTEM_MPFR=1" - "USE_SYSTEM_LIBSUITESPARSE=0" # test failure - "USE_SYSTEM_LIBUV=0" # a patched version is required - "USE_SYSTEM_UTF8PROC=1" - "USE_SYSTEM_MBEDTLS=1" - "USE_SYSTEM_LIBSSH2=1" - "USE_SYSTEM_NGHTTP2=1" - "USE_SYSTEM_CURL=1" - "USE_SYSTEM_LIBGIT2=1" - "USE_SYSTEM_PATCHELF=1" - "USE_SYSTEM_LIBWHICH=1" - "USE_SYSTEM_ZLIB=1" - "USE_SYSTEM_P7ZIP=1" - - "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" + # workaround for https://github.com/JuliaLang/julia/issues/47989 + "USE_INTEL_JITEVENTS=0" + ] ++ lib.optionals stdenv.isx86_64 [ + # https://github.com/JuliaCI/julia-buildbot/blob/master/master/inventory.py + "JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)" + ] ++ lib.optionals stdenv.isAarch64 [ + "JULIA_CPU_TARGET=generic;cortex-a57;thunderx2t99;armv8.2-a,crypto,fullfp16,lse,rdm" ]; + # remove forbidden reference to $TMPDIR + preFixup = '' + for file in libcurl.so libgmpxx.so; do + patchelf --shrink-rpath --allowed-rpath-prefixes ${builtins.storeDir} "$out/lib/julia/$file" + done + ''; + doInstallCheck = true; installCheckTarget = "testall"; @@ -131,12 +74,6 @@ stdenv.mkDerivation rec { dontStrip = true; - postFixup = '' - for file in $out/bin/julia $out/lib/libjulia.so $out/lib/julia/libjulia-internal.so $out/lib/julia/libjulia-codegen.so; do - patchelf --set-rpath "$out/lib:$out/lib/julia:${JULIA_RPATH}" $file - done - ''; - enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/development/compilers/julia/1.9.nix b/pkgs/development/compilers/julia/1.9.nix new file mode 100644 index 000000000000..71bf442c82cd --- /dev/null +++ b/pkgs/development/compilers/julia/1.9.nix @@ -0,0 +1,94 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, which +, python3 +, gfortran +, cmake +, perl +, gnum4 +, openssl +, libxml2 +}: + +stdenv.mkDerivation rec { + pname = "julia"; + version = "1.9.0-beta2"; + + src = fetchurl { + url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; + hash = "sha256-LTQp5vBMOSlwThYpSIv/UNJ9eIU+WId/XWGFxsrQEzs="; + }; + + patches = [ + ./patches/1.8/0002-skip-failing-and-flaky-tests.patch + # https://github.com/JuliaLang/julia/issues/46530 + (fetchpatch { + url = "https://github.com/JuliaLang/julia/commit/b9b60fcde61ff18d77cb548421b3f71a369b4e02.patch"; + revert = true; + hash = "sha256-XXn4U8aWkWwZYwpvIx+Gk5E16prjeXooF9AafK0aEfg="; + }) + ]; + + strictDeps = true; + + nativeBuildInputs = [ + which + python3 + gfortran + cmake + perl + gnum4 + openssl + ]; + + buildInputs = [ + libxml2 + ]; + + dontUseCmakeConfigure = true; + + postPatch = '' + patchShebangs . + ''; + + makeFlags = [ + "prefix=$(out)" + "USE_BINARYBUILDER=0" + # workaround for https://github.com/JuliaLang/julia/issues/47989 + "USE_INTEL_JITEVENTS=0" + ] ++ lib.optionals stdenv.isx86_64 [ + # https://github.com/JuliaCI/julia-buildbot/blob/master/master/inventory.py + "JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)" + ] ++ lib.optionals stdenv.isAarch64 [ + "JULIA_CPU_TARGET=generic;cortex-a57;thunderx2t99;armv8.2-a,crypto,fullfp16,lse,rdm" + ]; + + # remove forbidden reference to $TMPDIR + preFixup = '' + for file in libcurl.so libgmpxx.so libmpfr.so; do + patchelf --shrink-rpath --allowed-rpath-prefixes ${builtins.storeDir} "$out/lib/julia/$file" + done + ''; + + doInstallCheck = true; + installCheckTarget = "testall"; + + preInstallCheck = '' + export HOME="$TMPDIR" + export JULIA_TEST_USE_MULTIPLE_WORKERS="true" + ''; + + dontStrip = true; + + enableParallelBuilding = true; + + meta = with lib; { + description = "High-level performance-oriented dynamical language for technical computing"; + homepage = "https://julialang.org/"; + license = licenses.mit; + maintainers = with maintainers; [ nickcao ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +} diff --git a/pkgs/development/compilers/julia/patches/1.8-bin/0001-allow-skipping-internet-required-tests.patch b/pkgs/development/compilers/julia/patches/1.8-bin/0001-allow-skipping-internet-required-tests.patch new file mode 100644 index 000000000000..ab256f54848e --- /dev/null +++ b/pkgs/development/compilers/julia/patches/1.8-bin/0001-allow-skipping-internet-required-tests.patch @@ -0,0 +1,47 @@ +--- a/share/julia/test/choosetests.jl ++++ b/share/julia/test/choosetests.jl +@@ -31,6 +31,19 @@ const TESTNAMES = [ + "smallarrayshrink", "opaque_closure", "filesystem", "download", + ] + ++ ++const INTERNET_REQUIRED_LIST = [ ++ "Artifacts", ++ "Downloads", ++ "LazyArtifacts", ++ "LibCURL", ++ "LibGit2", ++ "Pkg", ++ "download", ++] ++ ++const NETWORK_REQUIRED_LIST = vcat(INTERNET_REQUIRED_LIST, ["Sockets"]) ++ + """ + `(; tests, net_on, exit_on_error, seed) = choosetests(choices)` selects a set of tests to be + run. `choices` should be a vector of test names; if empty or set to +@@ -147,6 +160,7 @@ function choosetests(choices = []) + filtertests!(tests, "compiler/EscapeAnalysis", [ + "compiler/EscapeAnalysis/local", "compiler/EscapeAnalysis/interprocedural"]) + filtertests!(tests, "stdlib", STDLIBS) ++ filtertests!(tests, "internet_required", INTERNET_REQUIRED_LIST) + # do ambiguous first to avoid failing if ambiguities are introduced by other tests + filtertests!(tests, "ambiguous") + +@@ -157,15 +171,7 @@ function choosetests(choices = []) + filter!(x -> (x != "Profile"), tests) + end + +- net_required_for = [ +- "Artifacts", +- "Downloads", +- "LazyArtifacts", +- "LibCURL", +- "LibGit2", +- "Sockets", +- "download", +- ] ++ net_required_for = filter!(in(tests), NETWORK_REQUIRED_LIST) + net_on = true + JULIA_TEST_NETWORKING_AVAILABLE = get(ENV, "JULIA_TEST_NETWORKING_AVAILABLE", "") |> + strip |> diff --git a/pkgs/development/compilers/julia/patches/1.8/0002-skip-building-doc.patch b/pkgs/development/compilers/julia/patches/1.8/0001-skip-building-doc.patch similarity index 70% rename from pkgs/development/compilers/julia/patches/1.8/0002-skip-building-doc.patch rename to pkgs/development/compilers/julia/patches/1.8/0001-skip-building-doc.patch index 64c0821eaba8..3b507bf26d77 100644 --- a/pkgs/development/compilers/julia/patches/1.8/0002-skip-building-doc.patch +++ b/pkgs/development/compilers/julia/patches/1.8/0001-skip-building-doc.patch @@ -1,17 +1,17 @@ -From 05c008dcabaf94f5623f2f7e267005eef0a8c5fc Mon Sep 17 00:00:00 2001 +From ce73c82ebadeb2e358e1a8e244eef723ffa96c76 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 20 Sep 2022 18:42:31 +0800 -Subject: [PATCH 2/4] skip building doc +Subject: [PATCH 1/2] skip building doc --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index d38311dce..a775d36e1 100644 +index 94df626014..418f6ff268 100644 --- a/Makefile +++ b/Makefile -@@ -227,7 +227,7 @@ define stringreplace +@@ -229,7 +229,7 @@ define stringreplace endef diff --git a/pkgs/development/compilers/julia/patches/1.8/0001-skip-symlink-system-libraries.patch b/pkgs/development/compilers/julia/patches/1.8/0001-skip-symlink-system-libraries.patch deleted file mode 100644 index a5519d96a9d2..000000000000 --- a/pkgs/development/compilers/julia/patches/1.8/0001-skip-symlink-system-libraries.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1faa30525c9671ffd3a08901896b521a040d7e5c Mon Sep 17 00:00:00 2001 -From: Nick Cao -Date: Tue, 20 Sep 2022 18:42:08 +0800 -Subject: [PATCH 1/4] skip symlink system libraries - ---- - base/Makefile | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/base/Makefile b/base/Makefile -index 23a9c4011..12f92aa05 100644 ---- a/base/Makefile -+++ b/base/Makefile -@@ -181,7 +181,6 @@ $$(build_private_libdir)/$$(libname_$2): - fi; \ - fi - ifneq ($$(USE_SYSTEM_$1),0) --SYMLINK_SYSTEM_LIBRARIES += symlink_$2 - endif - endef - -@@ -265,7 +264,6 @@ $(build_private_libdir)/libLLVM.$(SHLIB_EXT): - ln -sf "$$REALPATH" "$@" - ifneq ($(USE_SYSTEM_LLVM),0) - ifneq ($(USE_LLVM_SHLIB),0) --SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM - endif - endif - --- -2.38.1 - diff --git a/pkgs/development/compilers/julia/patches/1.8/0003-skip-failing-tests.patch b/pkgs/development/compilers/julia/patches/1.8/0002-skip-failing-and-flaky-tests.patch similarity index 72% rename from pkgs/development/compilers/julia/patches/1.8/0003-skip-failing-tests.patch rename to pkgs/development/compilers/julia/patches/1.8/0002-skip-failing-and-flaky-tests.patch index f2b5825c0e5e..966c805ad7ae 100644 --- a/pkgs/development/compilers/julia/patches/1.8/0003-skip-failing-tests.patch +++ b/pkgs/development/compilers/julia/patches/1.8/0002-skip-failing-and-flaky-tests.patch @@ -1,14 +1,14 @@ -From 756d4e977f8f224e20effa82c612e5a9cc14d82e Mon Sep 17 00:00:00 2001 +From 0e1fe51ce93847ac3c4de49a003d9762b2f3d7c6 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 20 Sep 2022 18:42:59 +0800 -Subject: [PATCH 3/4] skip failing tests +Subject: [PATCH 2/2] skip failing and flaky tests --- test/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Makefile b/test/Makefile -index 24e137a5b..c17ccea8a 100644 +index 24e137a5b1..e78f12da04 100644 --- a/test/Makefile +++ b/test/Makefile @@ -23,7 +23,7 @@ default: @@ -16,7 +16,7 @@ index 24e137a5b..c17ccea8a 100644 $(TESTS): @cd $(SRCDIR) && \ - $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl $@) -+ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip LibGit2_jll --skip MozillaCACerts_jll --skip NetworkOptions --skip nghttp2_jll --skip Zlib_jll $@) ++ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip MozillaCACerts_jll --skip NetworkOptions --skip channels $@) $(addprefix revise-, $(TESTS)): revise-% : @cd $(SRCDIR) && \ diff --git a/pkgs/development/compilers/julia/patches/1.8/0004-ignore-absolute-path-when-loading-library.patch b/pkgs/development/compilers/julia/patches/1.8/0004-ignore-absolute-path-when-loading-library.patch deleted file mode 100644 index 2243565b394e..000000000000 --- a/pkgs/development/compilers/julia/patches/1.8/0004-ignore-absolute-path-when-loading-library.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c0e587f4c50bd7bedfe6e5102e9b47c9704fac9b Mon Sep 17 00:00:00 2001 -From: Nick Cao -Date: Tue, 20 Sep 2022 18:43:15 +0800 -Subject: [PATCH 4/4] ignore absolute path when loading library - ---- - cli/loader_lib.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/cli/loader_lib.c b/cli/loader_lib.c -index 0301b6eed..5cbda61af 100644 ---- a/cli/loader_lib.c -+++ b/cli/loader_lib.c -@@ -50,9 +50,7 @@ static void * load_library(const char * rel_path, const char * src_dir, int err) - #endif - - char path[2*JL_PATH_MAX + 1] = {0}; -- strncat(path, src_dir, sizeof(path) - 1); -- strncat(path, PATHSEPSTRING, sizeof(path) - 1); -- strncat(path, rel_path, sizeof(path) - 1); -+ strncat(path, basename, sizeof(path) - 1); - - #if defined(_OS_WINDOWS_) - wchar_t wpath[2*JL_PATH_MAX + 1] = {0}; --- -2.38.1 - diff --git a/pkgs/development/compilers/kind2/default.nix b/pkgs/development/compilers/kind2/default.nix index 7e84d78e0d8e..f3ed8a45b88a 100644 --- a/pkgs/development/compilers/kind2/default.nix +++ b/pkgs/development/compilers/kind2/default.nix @@ -1,36 +1,33 @@ { lib , rustPlatform , fetchCrate -, pkg-config -, openssl , stdenv -, Security +, darwin }: rustPlatform.buildRustPackage rec { pname = "kind2"; - version = "0.2.79"; + version = "0.3.7"; src = fetchCrate { inherit pname version; - sha256 = "sha256-QRPk7BpGVvhGHcDxCWJtJp5d3QOq72ESt5VbaSq5jBU="; + sha256 = "sha256-ZG0BbGcjQBqeNTqfy7WweVHK7sUuKeQSsFi9KIsyIE4="; }; - cargoSha256 = "sha256-i7RAJmhUQzjMe9w7z7hPrpiap64L12Shu4DL+e5A6oc="; + cargoSha256 = "sha256-j64L3HNk2r+MH9eDHWT/ARJ9DT4CchcuVxtIYYVsDxo="; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - - # these tests are flaky - checkFlags = [ - "--skip=test_checker" - "--skip=test_run_hvm" + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Security + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + darwin.apple_sdk_11_0.frameworks.CoreFoundation ]; + # requires nightly features + RUSTC_BOOTSTRAP = true; + meta = with lib; { description = "A functional programming language and proof assistant"; - homepage = "https://github.com/kindelia/kind2"; + homepage = "https://github.com/kindelia/kind"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index bd3cd5a75734..cb78eb5c6b34 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.7.20"; + version = "1.8.0"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - hash = "sha256-XjyND5ZUEP8S6Q1vjcXfL8Cf1ZWmhNUUYWhRzn6Urn0="; + hash = "sha256-C7lBn6yYMqVqOhnK0oL48tbxI30tRn3I3+m9SipDxC4="; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix index dedfaa41d2e7..9288fafa6f77 100644 --- a/pkgs/development/compilers/kotlin/native.nix +++ b/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.7.10"; + version = "1.8.0"; src = let getArch = { @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz"; getHash = arch: { - "macos-aarch64" = "sha256-wCvld/VBpcc+GvdVNABu6m4Jz2ezqIbzI9rm8EBryz4="; - "macos-x86_64" = "sha256-TpRwwl4Mazt56GpZx+yk15xaKMpRXoDbk1BFNbIzKgA="; - "linux-x86_64" = "sha256-uHQ3Poc4G5TGo4UXjqlZSltM/rL7rivYnTy4TJa8O5Y="; + "macos-aarch64" = "19dcc2ylh11vxirglda8xrrm06i2nd53ndd8b1smf2vyj0v9593m"; + "macos-x86_64" = "0pkc4g09qwp4lcvs62qis0zxdjbr9z5mbgyi4mczxx5kqha4fxp3"; + "linux-x86_64" = "124nvhjh9xj8nsdjf71vzsgfjdq6mc0nalk79xfvsp2wh7xd8d0n"; }.${arch}; in fetchurl { url = getUrl version getArch; - hash = getHash getArch; + sha256 = getHash getArch; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index f0edb4815d6a..72f4a9591184 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , fetchFromGitLab , git , coq @@ -9,12 +10,12 @@ ocamlPackages.buildDunePackage rec { pname = "ligo"; - version = "0.55.0"; + version = "0.59.0"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; rev = version; - sha256 = "sha256-GEw9OEHXdTxBvb5ATIcL71wdUCLD+X/A7CYQxwTUQWw="; + sha256 = "sha256-JwFFreUV70W5soXY0UF8/4QlN2oWejdxqwh4KT5VDoQ="; fetchSubmodules = true; }; @@ -95,7 +96,7 @@ ocamlPackages.buildDunePackage rec { zarith_stubs_js ]; - checkInputs = [ + nativeCheckInputs = [ cacert ocamlPackages.ca-certs ]; @@ -108,6 +109,7 @@ ocamlPackages.buildDunePackage rec { description = "A friendly Smart Contract Language for Tezos"; license = licenses.mit; platforms = ocamlPackages.ocaml.meta.platforms; + broken = stdenv.isLinux && stdenv.isAarch64; maintainers = with maintainers; [ ulrikstrid ]; }; } diff --git a/pkgs/development/compilers/llvm/10/bintools/default.nix b/pkgs/development/compilers/llvm/10/bintools/default.nix index 53f7941e3369..1eb7215c0085 100644 --- a/pkgs/development/compilers/llvm/10/bintools/default.nix +++ b/pkgs/development/compilers/llvm/10/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) @@ -15,15 +20,18 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' 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-ar $out/bin/${prefix}dlltool + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt 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-objcopy $out/bin/${prefix}strip 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-readobj $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 ${llvm}/bin/llvm-strings $out/bin/${prefix}strings + ln -s ${llvm}/bin/llvm-symbolizer $out/bin/${prefix}addr2line ln -s ${lld}/bin/lld $out/bin/${prefix}ld '' diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix index 5336e4ea35a3..0f3c943b527e 100644 --- a/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/pkgs/development/compilers/llvm/10/clang/default.nix @@ -84,6 +84,7 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + patchShebangs $python/bin mkdir -p $dev/bin cp bin/clang-tblgen $dev/bin @@ -108,6 +109,7 @@ let of tools that can be built using the Clang frontend as a library to parse C/C++ code. ''; + mainProgram = "clang"; }; } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index 84af7bcf3d77..f4120cb91cac 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -3,6 +3,7 @@ , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross +, targetLlvm # 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. @@ -30,7 +31,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -109,7 +110,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -146,7 +147,7 @@ let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -156,7 +157,7 @@ let 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.isFreeBSD && stdenv.targetPlatform.useLLVM or false) '' + '' + 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 @@ -259,7 +260,7 @@ let }; openmp = callPackage ./openmp { - inherit llvm_meta; + inherit llvm_meta targetLlvm; }; }); diff --git a/pkgs/development/compilers/llvm/10/libcxx/default.nix b/pkgs/development/compilers/llvm/10/libcxx/default.nix index 6a4e645bb300..cc029ea657cd 100644 --- a/pkgs/development/compilers/llvm/10/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/10/libcxx/default.nix @@ -1,7 +1,11 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta, fetch, cmake, python3, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic }: +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; + stdenv.mkDerivation { pname = "libcxx"; inherit version; @@ -37,13 +41,13 @@ stdenv.mkDerivation { ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; + buildInputs = [ cxxabi ]; cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_CXX_ABI=${cxxabi.pname}" ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (cxxabi.pname == "libcxxabi") "-DLIBCXX_LIBCXXABI_LIB_PATH=${cxxabi}/lib" ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXX_ENABLE_THREADS=OFF" @@ -51,8 +55,23 @@ stdenv.mkDerivation { "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; + preInstall = lib.optionalString (stdenv.isDarwin) '' + for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + + baseName=$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1)) + installName="$out/lib/$baseName" + abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') + + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file + done + done + ''; + passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/pkgs/development/compilers/llvm/10/libcxxabi/default.nix b/pkgs/development/compilers/llvm/10/libcxxabi/default.nix index b046e627d831..d59191dfd724 100644 --- a/pkgs/development/compilers/llvm/10/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/10/libcxxabi/default.nix @@ -42,8 +42,10 @@ stdenv.mkDerivation { preInstall = lib.optionalString stdenv.isDarwin '' for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + # Fix up the install name. Preserve the basename, just replace the path. - installName="$out/lib/$(basename $(otool -D $file | tail -n 1))" + installName="$out/lib/$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))" # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables @@ -54,7 +56,7 @@ stdenv.mkDerivation { # cc-wrapper passes '-lc++abi' to all c++ link steps, but that causes # libcxxabi to sometimes link against a different version of itself. # Here we simply make that second reference point to ourselves. - for other in $(otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do ${stdenv.cc.targetPrefix}install_name_tool -change $other $installName $file done done @@ -65,6 +67,10 @@ stdenv.mkDerivation { install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/pkgs/development/compilers/llvm/10/lldb/default.nix b/pkgs/development/compilers/llvm/10/lldb/default.nix index a762151a586c..c1be5230e220 100644 --- a/pkgs/development/compilers/llvm/10/lldb/default.nix +++ b/pkgs/development/compilers/llvm/10/lldb/default.nix @@ -94,6 +94,8 @@ stdenv.mkDerivation (rec { larger LLVM Project, such as the Clang expression parser and LLVM disassembler. ''; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } // lib.optionalAttrs enableManpages { pname = "lldb-manpages"; diff --git a/pkgs/development/compilers/llvm/10/llvm/default.nix b/pkgs/development/compilers/llvm/10/llvm/default.nix index 78b0adcaadfb..95eba5d7fb36 100644 --- a/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -16,10 +16,9 @@ , 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 -) +# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 +# broken for the armv7l builder +, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch , enablePolly ? true }: diff --git a/pkgs/development/compilers/llvm/10/openmp/default.nix b/pkgs/development/compilers/llvm/10/openmp/default.nix index a1b04c7c66b2..012f882e5871 100644 --- a/pkgs/development/compilers/llvm/10/openmp/default.nix +++ b/pkgs/development/compilers/llvm/10/openmp/default.nix @@ -4,6 +4,7 @@ , fetch , cmake , llvm +, targetLlvm , perl , version }: @@ -15,7 +16,9 @@ stdenv.mkDerivation rec { src = fetch pname "0i4bn84lkpm5w3qkpvwm5z6jdj8fynp7d3bcasa1xyq4is6757yi"; nativeBuildInputs = [ cmake perl ]; - buildInputs = [ llvm ]; + buildInputs = [ + (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + ]; meta = llvm_meta // { homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/11/bintools/default.nix b/pkgs/development/compilers/llvm/11/bintools/default.nix index 53f7941e3369..1eb7215c0085 100644 --- a/pkgs/development/compilers/llvm/11/bintools/default.nix +++ b/pkgs/development/compilers/llvm/11/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) @@ -15,15 +20,18 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' 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-ar $out/bin/${prefix}dlltool + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt 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-objcopy $out/bin/${prefix}strip 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-readobj $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 ${llvm}/bin/llvm-strings $out/bin/${prefix}strings + ln -s ${llvm}/bin/llvm-symbolizer $out/bin/${prefix}addr2line ln -s ${lld}/bin/lld $out/bin/${prefix}ld '' diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix index 4bcdb3ca78b4..fa8080c998fb 100644 --- a/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/pkgs/development/compilers/llvm/11/clang/default.nix @@ -89,6 +89,7 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + patchShebangs $python/bin mkdir -p $dev/bin cp bin/clang-tblgen $dev/bin @@ -113,6 +114,7 @@ let of tools that can be built using the Clang frontend as a library to parse C/C++ code. ''; + mainProgram = "clang"; }; } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index da24f496117d..c950beef0e8d 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -3,6 +3,7 @@ , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross +, targetLlvm # 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. @@ -32,7 +33,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -124,7 +125,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -161,7 +162,7 @@ let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -171,7 +172,7 @@ let 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.isFreeBSD && stdenv.targetPlatform.useLLVM or false) '' + '' + 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 @@ -274,7 +275,7 @@ let }; openmp = callPackage ./openmp { - inherit llvm_meta; + inherit llvm_meta targetLlvm; }; }); diff --git a/pkgs/development/compilers/llvm/11/libcxx/default.nix b/pkgs/development/compilers/llvm/11/libcxx/default.nix index 2a83b36fc425..3e77e03b124b 100644 --- a/pkgs/development/compilers/llvm/11/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/11/libcxx/default.nix @@ -1,7 +1,11 @@ -{ lib, stdenv, llvm_meta, fetch, fetchpatch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta, fetch, fetchpatch, cmake, python3, llvm, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic }: +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; + stdenv.mkDerivation { pname = "libcxx"; inherit version; @@ -42,10 +46,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; + buildInputs = [ cxxabi ]; cmakeFlags = [ - "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_CXX_ABI=${cxxabi.pname}" ] ++ 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 [ @@ -67,8 +71,23 @@ stdenv.mkDerivation { stdenv.hostPlatform != stdenv.buildPlatform ) "-DCMAKE_SYSTEM_VERSION=20.1.0"; + preInstall = lib.optionalString (stdenv.isDarwin) '' + for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + + baseName=$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1)) + installName="$out/lib/$baseName" + abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') + + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file + done + done + ''; + passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/pkgs/development/compilers/llvm/11/libcxxabi/default.nix b/pkgs/development/compilers/llvm/11/libcxxabi/default.nix index 6b5cf85d1ec3..77f7e1411885 100644 --- a/pkgs/development/compilers/llvm/11/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/11/libcxxabi/default.nix @@ -46,8 +46,10 @@ stdenv.mkDerivation { preInstall = lib.optionalString stdenv.isDarwin '' for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + # Fix up the install name. Preserve the basename, just replace the path. - installName="$out/lib/$(basename $(otool -D $file | tail -n 1))" + installName="$out/lib/$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))" # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables @@ -58,7 +60,7 @@ stdenv.mkDerivation { # cc-wrapper passes '-lc++abi' to all c++ link steps, but that causes # libcxxabi to sometimes link against a different version of itself. # Here we simply make that second reference point to ourselves. - for other in $(otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do ${stdenv.cc.targetPrefix}install_name_tool -change $other $installName $file done done @@ -69,6 +71,10 @@ stdenv.mkDerivation { install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/pkgs/development/compilers/llvm/11/llvm/default.nix b/pkgs/development/compilers/llvm/11/llvm/default.nix index 1623d06c7f7a..2123efdf2351 100644 --- a/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -16,10 +16,9 @@ , 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 -) +# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 +# broken for the armv7l builder +, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch , enablePolly ? false # TODO should be on by default }: diff --git a/pkgs/development/compilers/llvm/11/openmp/default.nix b/pkgs/development/compilers/llvm/11/openmp/default.nix index 330560a677dc..6c2dd9ac9577 100644 --- a/pkgs/development/compilers/llvm/11/openmp/default.nix +++ b/pkgs/development/compilers/llvm/11/openmp/default.nix @@ -5,6 +5,7 @@ , fetchpatch , cmake , llvm +, targetLlvm , perl , version }: @@ -25,7 +26,9 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake perl ]; - buildInputs = [ llvm ]; + buildInputs = [ + (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + ]; meta = llvm_meta // { homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/12/bintools/default.nix b/pkgs/development/compilers/llvm/12/bintools/default.nix index 53f7941e3369..1eb7215c0085 100644 --- a/pkgs/development/compilers/llvm/12/bintools/default.nix +++ b/pkgs/development/compilers/llvm/12/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) @@ -15,15 +20,18 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' 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-ar $out/bin/${prefix}dlltool + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt 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-objcopy $out/bin/${prefix}strip 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-readobj $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 ${llvm}/bin/llvm-strings $out/bin/${prefix}strings + ln -s ${llvm}/bin/llvm-symbolizer $out/bin/${prefix}addr2line ln -s ${lld}/bin/lld $out/bin/${prefix}ld '' diff --git a/pkgs/development/compilers/llvm/12/clang/default.nix b/pkgs/development/compilers/llvm/12/clang/default.nix index 0f1e160bbce8..ed99f4fe7bc9 100644 --- a/pkgs/development/compilers/llvm/12/clang/default.nix +++ b/pkgs/development/compilers/llvm/12/clang/default.nix @@ -83,6 +83,7 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + patchShebangs $python/bin mkdir -p $dev/bin cp bin/clang-tblgen $dev/bin @@ -107,6 +108,7 @@ let of tools that can be built using the Clang frontend as a library to parse C/C++ code. ''; + mainProgram = "clang"; }; } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 22c114ab4290..da3beccbe325 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -3,6 +3,7 @@ , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross +, targetLlvm # 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. @@ -33,7 +34,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -112,7 +113,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -153,7 +154,7 @@ let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -163,7 +164,7 @@ let 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.isFreeBSD && stdenv.targetPlatform.useLLVM or false) '' + '' + 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 @@ -267,7 +268,7 @@ let }; openmp = callPackage ./openmp { - inherit llvm_meta; + inherit llvm_meta targetLlvm; }; }); diff --git a/pkgs/development/compilers/llvm/12/libcxx/default.nix b/pkgs/development/compilers/llvm/12/libcxx/default.nix index 1386d3680f91..40bff3c1168b 100644 --- a/pkgs/development/compilers/llvm/12/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/12/libcxx/default.nix @@ -1,7 +1,11 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta, fetch, cmake, python3, llvm, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic }: +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; + stdenv.mkDerivation { pname = "libcxx"; inherit version; @@ -30,10 +34,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; + buildInputs = [ cxxabi ]; cmakeFlags = [ - "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_CXX_ABI=${cxxabi.pname}" ] ++ 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 [ @@ -42,8 +46,23 @@ stdenv.mkDerivation { "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; + preInstall = lib.optionalString (stdenv.isDarwin) '' + for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + + baseName=$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1)) + installName="$out/lib/$baseName" + abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') + + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file + done + done + ''; + passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/pkgs/development/compilers/llvm/12/libcxxabi/default.nix b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix index 3d9a92d9305d..bab39a5272c8 100644 --- a/pkgs/development/compilers/llvm/12/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix @@ -44,8 +44,10 @@ stdenv.mkDerivation { preInstall = lib.optionalString stdenv.isDarwin '' for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + # Fix up the install name. Preserve the basename, just replace the path. - installName="$out/lib/$(basename $(otool -D $file | tail -n 1))" + installName="$out/lib/$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))" # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables @@ -56,7 +58,7 @@ stdenv.mkDerivation { # cc-wrapper passes '-lc++abi' to all c++ link steps, but that causes # libcxxabi to sometimes link against a different version of itself. # Here we simply make that second reference point to ourselves. - for other in $(otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do ${stdenv.cc.targetPrefix}install_name_tool -change $other $installName $file done done @@ -67,6 +69,10 @@ stdenv.mkDerivation { install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index d330b7387595..b04eeb3c7269 100644 --- a/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -16,10 +16,9 @@ , 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 -) +# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 +# broken for the armv7l builder +, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch , enablePolly ? false }: diff --git a/pkgs/development/compilers/llvm/12/openmp/default.nix b/pkgs/development/compilers/llvm/12/openmp/default.nix index 8ed1bf71f008..e0bcf03e00e3 100644 --- a/pkgs/development/compilers/llvm/12/openmp/default.nix +++ b/pkgs/development/compilers/llvm/12/openmp/default.nix @@ -4,6 +4,7 @@ , fetch , cmake , llvm +, targetLlvm , perl , version }: @@ -15,7 +16,9 @@ stdenv.mkDerivation rec { src = fetch pname "14dh0r6h2xh747ffgnsl4z08h0ri04azi9vf79cbz7ma1r27kzk0"; nativeBuildInputs = [ cmake perl ]; - buildInputs = [ llvm ]; + buildInputs = [ + (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + ]; meta = llvm_meta // { homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/13/bintools/default.nix b/pkgs/development/compilers/llvm/13/bintools/default.nix index 53f7941e3369..b6ee7b4dc25c 100644 --- a/pkgs/development/compilers/llvm/13/bintools/default.nix +++ b/pkgs/development/compilers/llvm/13/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) @@ -15,15 +20,19 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' 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-ar $out/bin/${prefix}dlltool + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt 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-objcopy $out/bin/${prefix}strip 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-rc $out/bin/${prefix}windres + ln -s ${llvm}/bin/llvm-readobj $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 ${llvm}/bin/llvm-strings $out/bin/${prefix}strings + ln -s ${llvm}/bin/llvm-symbolizer $out/bin/${prefix}addr2line ln -s ${lld}/bin/lld $out/bin/${prefix}ld '' diff --git a/pkgs/development/compilers/llvm/13/clang/default.nix b/pkgs/development/compilers/llvm/13/clang/default.nix index 62b9e0470a61..056a1b7e0f0d 100644 --- a/pkgs/development/compilers/llvm/13/clang/default.nix +++ b/pkgs/development/compilers/llvm/13/clang/default.nix @@ -77,6 +77,7 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + patchShebangs $python/bin mkdir -p $dev/bin cp bin/clang-tblgen $dev/bin @@ -101,6 +102,7 @@ let of tools that can be built using the Clang frontend as a library to parse C/C++ code. ''; + mainProgram = "clang"; }; } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index fced8f7d2ae3..3fc459eb7f04 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -3,6 +3,7 @@ , 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 +, targetLlvm # 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. @@ -35,7 +36,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -113,7 +114,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -153,7 +154,7 @@ let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -163,7 +164,7 @@ let 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.isFreeBSD && stdenv.targetPlatform.useLLVM or false) '' + '' + 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 @@ -276,7 +277,7 @@ let }; openmp = callPackage ./openmp { - inherit llvm_meta; + inherit llvm_meta targetLlvm; }; }); diff --git a/pkgs/development/compilers/llvm/13/libcxx/default.nix b/pkgs/development/compilers/llvm/13/libcxx/default.nix index 0ce73ed97af6..b18c9da18ffd 100644 --- a/pkgs/development/compilers/llvm/13/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxx/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, llvm_meta, src, cmake, python3, fixDarwinDylibNames, version -, libcxxabi +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic # If headersOnly is true, the resulting package would only include the headers. @@ -10,6 +11,8 @@ , headersOnly ? false }: +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; + stdenv.mkDerivation rec { pname = if headersOnly then "cxx-headers" else "libcxx"; inherit version; @@ -32,9 +35,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = lib.optionals (!headersOnly) [ libcxxabi ]; + buildInputs = lib.optionals (!headersOnly) [ cxxabi ]; - cmakeFlags = [ "-DLIBCXX_CXX_ABI=libcxxabi" ] + cmakeFlags = [ "-DLIBCXX_CXX_ABI=${cxxabi.pname}" ] ++ 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 [ @@ -46,6 +49,20 @@ stdenv.mkDerivation rec { buildFlags = lib.optional headersOnly "generate-cxx-headers"; installTargets = lib.optional headersOnly "install-cxx-headers"; + preInstall = lib.optionalString (stdenv.isDarwin && !headersOnly) '' + for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + + baseName=$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1)) + installName="$out/lib/$baseName" + abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') + + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file + done + done + ''; + # 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) '' @@ -57,6 +74,7 @@ stdenv.mkDerivation rec { passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/pkgs/development/compilers/llvm/13/libcxxabi/default.nix b/pkgs/development/compilers/llvm/13/libcxxabi/default.nix index 9043c6bff25b..06137ab06734 100644 --- a/pkgs/development/compilers/llvm/13/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxxabi/default.nix @@ -41,8 +41,10 @@ stdenv.mkDerivation rec { preInstall = lib.optionalString stdenv.isDarwin '' for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + # Fix up the install name. Preserve the basename, just replace the path. - installName="$out/lib/$(basename $(otool -D $file | tail -n 1))" + installName="$out/lib/$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))" # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { # cc-wrapper passes '-lc++abi' to all c++ link steps, but that causes # libcxxabi to sometimes link against a different version of itself. # Here we simply make that second reference point to ourselves. - for other in $(otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do ${stdenv.cc.targetPrefix}install_name_tool -change $other $installName $file done done @@ -64,6 +66,10 @@ stdenv.mkDerivation rec { install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index 5b8ec69853f2..32e96212fa57 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -17,10 +17,9 @@ , 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 -) +# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 +# broken for the armv7l builder +, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch , enablePolly ? false }: @@ -49,7 +48,7 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ ncurses ] ++ [ zlib ]; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; patches = [ # When cross-compiling we configure llvm-config-native with an approximation diff --git a/pkgs/development/compilers/llvm/13/openmp/default.nix b/pkgs/development/compilers/llvm/13/openmp/default.nix index c5a33df97560..71362be1fdc6 100644 --- a/pkgs/development/compilers/llvm/13/openmp/default.nix +++ b/pkgs/development/compilers/llvm/13/openmp/default.nix @@ -4,6 +4,7 @@ , src , cmake , llvm +, targetLlvm , perl , version }: @@ -16,7 +17,9 @@ stdenv.mkDerivation rec { sourceRoot = "source/${pname}"; nativeBuildInputs = [ cmake perl ]; - buildInputs = [ llvm ]; + buildInputs = [ + (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + ]; cmakeFlags = [ "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL currently fails diff --git a/pkgs/development/compilers/llvm/14/bintools/default.nix b/pkgs/development/compilers/llvm/14/bintools/default.nix index 53f7941e3369..b6ee7b4dc25c 100644 --- a/pkgs/development/compilers/llvm/14/bintools/default.nix +++ b/pkgs/development/compilers/llvm/14/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) @@ -15,15 +20,19 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' 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-ar $out/bin/${prefix}dlltool + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt 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-objcopy $out/bin/${prefix}strip 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-rc $out/bin/${prefix}windres + ln -s ${llvm}/bin/llvm-readobj $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 ${llvm}/bin/llvm-strings $out/bin/${prefix}strings + ln -s ${llvm}/bin/llvm-symbolizer $out/bin/${prefix}addr2line 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 index 6b775efcc039..55d879fb76e4 100644 --- a/pkgs/development/compilers/llvm/14/clang/default.nix +++ b/pkgs/development/compilers/llvm/14/clang/default.nix @@ -80,6 +80,7 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + patchShebangs $python/bin mkdir -p $dev/bin cp bin/clang-tblgen $dev/bin @@ -104,6 +105,7 @@ let of tools that can be built using the Clang frontend as a library to parse C/C++ code. ''; + mainProgram = "clang"; }; } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index 7b7e57748879..5d14c2f5f933 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -3,6 +3,7 @@ , 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 +, targetLlvm # 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. @@ -35,7 +36,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -113,7 +114,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -153,7 +154,7 @@ let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -166,7 +167,7 @@ let ] ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind" ++ lib.optional - (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) + (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) "-lunwind" ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; @@ -273,7 +274,7 @@ let }; openmp = callPackage ./openmp { - inherit llvm_meta; + inherit llvm_meta targetLlvm; }; }); diff --git a/pkgs/development/compilers/llvm/14/libcxx/default.nix b/pkgs/development/compilers/llvm/14/libcxx/default.nix index 0a684782d490..3e42a8b1e43c 100644 --- a/pkgs/development/compilers/llvm/14/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/14/libcxx/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, llvm_meta , monorepoSrc, runCommand , cmake, python3, fixDarwinDylibNames, version -, libcxxabi +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic # If headersOnly is true, the resulting package would only include the headers. @@ -16,6 +17,8 @@ let basename = "libcxx"; in +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; + stdenv.mkDerivation rec { pname = basename + lib.optionalString headersOnly "-headers"; inherit version; @@ -48,9 +51,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = lib.optionals (!headersOnly) [ libcxxabi ]; + buildInputs = lib.optionals (!headersOnly) [ cxxabi ]; - cmakeFlags = [ "-DLIBCXX_CXX_ABI=libcxxabi" ] + cmakeFlags = [ "-DLIBCXX_CXX_ABI=${cxxabi.pname}" ] ++ 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 [ @@ -62,8 +65,23 @@ stdenv.mkDerivation rec { buildFlags = lib.optional headersOnly "generate-cxx-headers"; installTargets = lib.optional headersOnly "install-cxx-headers"; + preInstall = lib.optionalString (stdenv.isDarwin && !headersOnly) '' + for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + + baseName=$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1)) + installName="$out/lib/$baseName" + abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') + + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file + done + done + ''; + passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/pkgs/development/compilers/llvm/14/libcxxabi/default.nix b/pkgs/development/compilers/llvm/14/libcxxabi/default.nix index 26f4c4dba8e4..30cc34a8c0e6 100644 --- a/pkgs/development/compilers/llvm/14/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/14/libcxxabi/default.nix @@ -52,8 +52,10 @@ stdenv.mkDerivation rec { installPhase = if stdenv.isDarwin then '' for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + # Fix up the install name. Preserve the basename, just replace the path. - installName="$out/lib/$(basename $(otool -D $file | tail -n 1))" + installName="$out/lib/$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))" # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables @@ -64,7 +66,7 @@ stdenv.mkDerivation rec { # cc-wrapper passes '-lc++abi' to all c++ link steps, but that causes # libcxxabi to sometimes link against a different version of itself. # Here we simply make that second reference point to ourselves. - for other in $(otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do ${stdenv.cc.targetPrefix}install_name_tool -change $other $installName $file done done @@ -83,6 +85,10 @@ stdenv.mkDerivation rec { ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix index 673cd31460e8..5437735f78fe 100644 --- a/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -18,10 +18,9 @@ , 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 -) +# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 +# broken for the armv7l builder +, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch , enablePolly ? false } @args: @@ -57,7 +56,7 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; patches = [ ./gnu-install-dirs.patch diff --git a/pkgs/development/compilers/llvm/14/openmp/default.nix b/pkgs/development/compilers/llvm/14/openmp/default.nix index 622072b53e18..d1c6a46b4d69 100644 --- a/pkgs/development/compilers/llvm/14/openmp/default.nix +++ b/pkgs/development/compilers/llvm/14/openmp/default.nix @@ -5,6 +5,7 @@ , runCommand , cmake , llvm +, targetLlvm , lit , clang-unwrapped , perl @@ -32,7 +33,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake perl pkg-config lit ]; - buildInputs = [ llvm ]; + buildInputs = [ + (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + ]; # Unsup:Pass:XFail:Fail # 26:267:16:8 diff --git a/pkgs/development/compilers/llvm/15/bintools/default.nix b/pkgs/development/compilers/llvm/15/bintools/default.nix new file mode 100644 index 000000000000..303faf7bbb61 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/bintools/default.nix @@ -0,0 +1,40 @@ +{ runCommand, stdenv, llvm, lld, version }: + +let + prefix = + if stdenv.hostPlatform != stdenv.targetPlatform + then "${stdenv.targetPlatform.config}-" + else ""; +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = 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-ar $out/bin/${prefix}dlltool + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt + ln -s ${llvm}/bin/llvm-debuginfod $out/bin/${prefix}debuginfod + ln -s ${llvm}/bin/llvm-debuginfod-find $out/bin/${prefix}debuginfod-find + 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-objcopy $out/bin/${prefix}strip + ln -s ${llvm}/bin/llvm-objdump $out/bin/${prefix}objdump + ln -s ${llvm}/bin/llvm-rc $out/bin/${prefix}windres + ln -s ${llvm}/bin/llvm-readobj $out/bin/${prefix}readelf + ln -s ${llvm}/bin/llvm-size $out/bin/${prefix}size + ln -s ${llvm}/bin/llvm-strings $out/bin/${prefix}strings + ln -s ${llvm}/bin/llvm-symbolizer $out/bin/${prefix}addr2line + + ln -s ${lld}/bin/lld $out/bin/${prefix}ld +'' diff --git a/pkgs/development/compilers/llvm/15/clang/default.nix b/pkgs/development/compilers/llvm/15/clang/default.nix new file mode 100644 index 000000000000..b0671150a7bd --- /dev/null +++ b/pkgs/development/compilers/llvm/15/clang/default.nix @@ -0,0 +1,129 @@ +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, substituteAll, cmake, ninja, 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" + cp -r ${monorepoSrc}/clang-tools-extra "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; + + nativeBuildInputs = [ cmake ninja python3 ] + ++ lib.optional enableManpages python3.pkgs.sphinx + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + + buildInputs = [ libxml2 libllvm ]; + + cmakeFlags = [ + "-DCLANG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/clang" + "-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 + '' + 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 $dev/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 + patchShebangs $python/bin + + 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. + ''; + mainProgram = "clang"; + }; + } // lib.optionalAttrs enableManpages { + pname = "clang-manpages"; + + ninjaFlags = [ "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/15/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/15/clang/gnu-install-dirs.patch new file mode 100644 index 000000000000..f767c56836d5 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/clang/gnu-install-dirs.patch @@ -0,0 +1,105 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c27beec313d7..480f13e73c9f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -78,15 +78,17 @@ if(CLANG_BUILT_STANDALONE) + if (NOT LLVM_CONFIG_FOUND) + # Pull values from LLVMConfig.cmake. We can drop this once the llvm-config + # path is removed. +- set(MAIN_INCLUDE_DIR "${LLVM_INCLUDE_DIR}") ++ set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS}) + set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}") + # N.B. this is just a default value, the CACHE PATHs below can be overriden. + set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm") + set(TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}") + set(LIBRARY_DIR "${LLVM_LIBRARY_DIR}") ++ else() ++ set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}") + endif() + +- set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include") ++ set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed") + 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_TOOLS_BINARY_DIR "${TOOLS_BINARY_DIR}" CACHE PATH "Path to llvm/bin") +@@ -128,7 +130,7 @@ if(CLANG_BUILT_STANDALONE) + set(LLVM_INCLUDE_TESTS ON) + endif() + +- include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}") ++ include_directories(${LLVM_INCLUDE_DIRS}) + link_directories("${LLVM_LIBRARY_DIR}") + + set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin ) +diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake +index 21ac332e4f5f..b16c314bd1e2 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) +diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt +index 6e2060991b92..b9bc930d26b8 100644 +--- a/lib/Headers/CMakeLists.txt ++++ b/lib/Headers/CMakeLists.txt +@@ -420,7 +420,7 @@ add_header_target("openmp-resource-headers" ${openmp_wrapper_files}) + add_header_target("windows-resource-headers" ${windows_only_files}) + add_header_target("utility-resource-headers" ${utility_files}) + +-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 rules for the catch-all clang-resource-headers target +diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt +index 8d95d0900e8c..ebc70ff7526d 100644 +--- a/tools/libclang/CMakeLists.txt ++++ b/tools/libclang/CMakeLists.txt +@@ -180,7 +180,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/tools/scan-build-py/CMakeLists.txt b/tools/scan-build-py/CMakeLists.txt +index 061dc7ef4dd9..adc54b2edc32 100644 +--- a/tools/scan-build-py/CMakeLists.txt ++++ b/tools/scan-build-py/CMakeLists.txt +@@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild}) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib}) + install(PROGRAMS lib/libscanbuild/${lib} +- DESTINATION lib/libscanbuild ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild" + COMPONENT scan-build-py) + endforeach() + +@@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources}) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource}) + install(PROGRAMS lib/libscanbuild/resources/${resource} +- DESTINATION lib/libscanbuild/resources ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources" + COMPONENT scan-build-py) + endforeach() + +@@ -122,7 +122,7 @@ foreach(lib ${LibEar}) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib}) + install(PROGRAMS lib/libear/${lib} +- DESTINATION lib/libear ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear" + COMPONENT scan-build-py) + endforeach() + diff --git a/pkgs/development/compilers/llvm/15/clang/purity.patch b/pkgs/development/compilers/llvm/15/clang/purity.patch new file mode 100644 index 000000000000..1c94f293eb93 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/clang/purity.patch @@ -0,0 +1,29 @@ +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,13 +487,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + } else { + if (Args.hasArg(options::OPT_rdynamic)) + CmdArgs.push_back("-export-dynamic"); + +- if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE && +- !Args.hasArg(options::OPT_r)) { +- 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/15/compiler-rt/X86-support-extension.patch b/pkgs/development/compilers/llvm/15/compiler-rt/X86-support-extension.patch new file mode 100644 index 000000000000..07013e5a6825 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/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 +@@ -348,4 +348,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} +@@ -723,6 +723,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/15/compiler-rt/armv7l.patch b/pkgs/development/compilers/llvm/15/compiler-rt/armv7l.patch new file mode 100644 index 000000000000..ca1c2332abd9 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/compiler-rt/armv7l.patch @@ -0,0 +1,32 @@ +diff -ur a/cmake/builtin-config-ix.cmake b/cmake/builtin-config-ix.cmake +--- a/cmake/builtin-config-ix.cmake @llvm 15.0.6 ++++ b/cmake/builtin-config-ix.cmake +@@ -46,7 +46,7 @@ + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv8m.main armv8.1m.main) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l armv8m.main armv8.1m.main) + set(AVR avr) + set(HEXAGON hexagon) + set(X86 i386) + set(X86_64 x86_64) +diff -ur a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt +--- a/lib/builtins/CMakeLists.txt @llvm 15.0.6 ++++ b/lib/builtins/CMakeLists.txt +@@ -565,6 +565,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 +@@ -734,7 +735,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|armv8m.main|armv8.1m.main)$") ++ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em|armv8m.main|armv8.1m.main)$") + 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/15/compiler-rt/darwin-targetconditionals.patch b/pkgs/development/compilers/llvm/15/compiler-rt/darwin-targetconditionals.patch new file mode 100644 index 000000000000..425dc2af01e7 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/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/15/compiler-rt/default.nix b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix new file mode 100644 index 000000000000..722a5bd90cbd --- /dev/null +++ b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix @@ -0,0 +1,156 @@ +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake, ninja, python3, xcbuild, libllvm, libcxxabi, libxcrypt +, doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD +}: + +let + + useLLVM = stdenv.hostPlatform.useLLVM or false; + bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; + haveLibc = stdenv.cc.libc != null; + inherit (stdenv.hostPlatform) isMusl isGnu; + + 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 ninja python3 libllvm.dev ] + ++ lib.optional stdenv.isDarwin xcbuild.xcrun; + 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 (haveLibc && stdenv.hostPlatform.libc == "glibc") [ + "-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include" + ] ++ 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) [ + "-DCOMPILER_RT_BUILD_PROFILE=OFF" + ] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal) [ + "-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}" + + # `COMPILER_RT_DEFAULT_TARGET_ONLY` does not apply to Darwin: + # https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/base-config-ix.cmake#L153 + "-DCOMPILER_RT_ENABLE_IOS=OFF" + ]; + + outputs = [ "out" "dev" ]; + + patches = [ + ./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 + ./darwin-targetconditionals.patch + # See: https://github.com/NixOS/nixpkgs/pull/186575 + ../../common/compiler-rt/darwin-plistbuddy-workaround.patch + # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 + ./armv7l.patch + ] + # The `compiler-rt` build inspects `ld` to figure out whether it needs to + # explicitly call `codesign`: + # https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/Modules/AddCompilerRT.cmake#L409-L422 + # + # In our case, despite (currently) having an `ld` version than 609, we don't + # need an explicit codesigning step because `postLinkSignHook` handles this + # for us. + # + # Unfortunately there isn't an easy way to override + # `NEED_EXPLICIT_ADHOC_CODESIGN`. + # + # Adding `codesign` as a build input also doesn't currently work because, as + # of this writing, `codesign` in nixpkgs doesn't support the `--sign` alias + # which the `compiler-rt` build uses. See here for context: + # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272116014 + # + # So, for now, we patch `compiler-rt` to skip the explicit codesigning step. + ++ lib.optional stdenv.hostPlatform.isDarwin ./skip-explicit-codesign.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 + '' + lib.optionalString doFakeLibgcc '' + ln -s $out/lib/freebsd/libclang_rt.builtins-*.a $out/lib/libgcc.a + ''; + + 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. + ''; + }; +} diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/15/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 000000000000..f3b1f63a7d71 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/compiler-rt/gnu-install-dirs.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index 8a6219568b3f..30ee68a47ccf 100644 +--- a/cmake/base-config-ix.cmake ++++ b/cmake/base-config-ix.cmake +@@ -100,13 +100,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/15/compiler-rt/normalize-var.patch b/pkgs/development/compilers/llvm/15/compiler-rt/normalize-var.patch new file mode 100644 index 000000000000..135cf625ef78 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/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/15/compiler-rt/skip-explicit-codesign.patch b/pkgs/development/compilers/llvm/15/compiler-rt/skip-explicit-codesign.patch new file mode 100644 index 000000000000..894a74e74d46 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/compiler-rt/skip-explicit-codesign.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -406,7 +406,7 @@ function(add_compiler_rt_runtime name type) + if (HAD_ERROR) + message(FATAL_ERROR "${CMAKE_LINKER} failed with status ${HAD_ERROR}") + endif() +- set(NEED_EXPLICIT_ADHOC_CODESIGN 1) ++ set(NEED_EXPLICIT_ADHOC_CODESIGN 0) # `postLinkSignHook` handles this for us + if ("${LD_V_OUTPUT}" MATCHES ".*ld64-([0-9.]+).*") + string(REGEX REPLACE ".*ld64-([0-9.]+).*" "\\1" HOST_LINK_VERSION ${LD_V_OUTPUT}) + if (HOST_LINK_VERSION VERSION_GREATER_EQUAL 609) diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix new file mode 100644 index 000000000000..db98f2854a09 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -0,0 +1,354 @@ +{ lowPrio, newScope, pkgs, lib, stdenv, stdenvNoCC, cmake, ninja +, gccForLibs, preLibcCrossHeaders +, libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith +, buildLlvmTools # tools, but from the previous stage, for cross +, targetLlvmLibraries # libraries, but from the next stage, for cross +, targetLlvm +# 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 +# LLVM release information; specify one of these but not both: +, gitRelease ? null + # i.e.: + # { + # version = /* i.e. "15.0.0" */; + # rev = /* commit SHA */; + # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; + # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; + # } +, officialRelease ? { version = "15.0.7"; sha256 = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s="; } + # i.e.: + # { + # version = /* i.e. "15.0.0" */; + # candidate = /* optional; if specified, should be: "rcN" */ + # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; + # } +# By default, we'll try to fetch a release from `github:llvm/llvm-project` +# corresponding to the `gitRelease` or `officialRelease` specified. +# +# You can provide your own LLVM source by specifying this arg but then it's up +# to you to make sure that the LLVM repo given matches the release configuration +# specified. +, monorepoSrc ? null +}: + +assert let + int = a: if a then 1 else 0; + xor = a: b: ((builtins.bitXor (int a) (int b)) == 1); +in + lib.assertMsg + (xor + (gitRelease != null) + (officialRelease != null)) + ("must specify `gitRelease` or `officialRelease`" + + (lib.optionalString (gitRelease != null) " — not both")); +let + monorepoSrc' = monorepoSrc; +in let + releaseInfo = if gitRelease != null then rec { + original = gitRelease; + release_version = original.version; + version = gitRelease.rev-version; + } else rec { + original = officialRelease; + release_version = original.version; + version = if original ? candidate then + "${release_version}-${original.candidate}" + else + release_version; + }; + + monorepoSrc = if monorepoSrc' != null then + monorepoSrc' + else let + sha256 = releaseInfo.original.sha256; + rev = if gitRelease != null then + gitRelease.rev + else + "llvmorg-${releaseInfo.version}"; + in fetchFromGitHub { + owner = "llvm"; + repo = "llvm-project"; + inherit rev sha256; + }; + + inherit (releaseInfo) release_version version; + + llvm_meta = { + license = with lib.licenses; [ ncsa llvm-exception ]; + maintainers = lib.teams.llvm.members; + platforms = lib.platforms.all; + }; + + tools = lib.makeExtensible (tools: let + callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 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 + }); + + 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 = [ + libcxx.cxxabi + 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 = [ + libcxx.cxxabi + targetLlvmLibraries.compiler-rt + ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ + targetLlvmLibraries.libunwind + ]; + extraBuildCommands = mkExtraBuildCommands cc; + nixSupport.cc-cflags = + [ "-rtlib=compiler-rt" + "-Wno-unused-command-line-argument" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ] + ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind" + ++ lib.optional + (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) + "-lunwind" + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; + }; + + clangNoLibcxx = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + nixSupport.cc-cflags = [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + "-nostdlib++" + ]; + }; + + clangNoLibc = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + nixSupport.cc-cflags = [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ]; + }; + + clangNoCompilerRt = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ ]; + extraBuildCommands = mkExtraBuildCommands0 cc; + nixSupport.cc-cflags = [ "-nostartfiles" ]; + }; + + 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 ninja libxml2 python3 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; + + libcxxabi = let + # CMake will "require" a compiler capable of compiling C++ programs + # cxx-header's build does not actually use one so it doesn't really matter + # what stdenv we use here, as long as CMake is happy. + cxx-headers = callPackage ./libcxx { + inherit llvm_meta; + # Note that if we use the regular stdenv here we'll get cycle errors + # when attempting to use this compiler in the stdenv. + # + # The final stdenv pulls `cxx-headers` from the package set where + # hostPlatform *is* the target platform which means that `stdenv` at + # that point attempts to use this toolchain. + # + # So, we use `stdenv_` (the stdenv containing `clang` from this package + # set, defined below) to sidestep this issue. + # + # Because we only use `cxx-headers` in `libcxxabi` (which depends on the + # clang stdenv _anyways_), this is okay. + stdenv = stdenv_; + headersOnly = true; + }; + + # `libcxxabi` *doesn't* need a compiler with a working C++ stdlib but it + # *does* need a relatively modern C++ compiler (see: + # https://releases.llvm.org/15.0.0/projects/libcxx/docs/index.html#platform-and-compiler-support). + # + # So, we use the clang from this LLVM package set, like libc++ + # "boostrapping builds" do: + # https://releases.llvm.org/15.0.0/projects/libcxx/docs/BuildingLibcxx.html#bootstrapping-build + # + # We cannot use `clangNoLibcxx` because that contains `compiler-rt` which, + # on macOS, depends on `libcxxabi`, thus forming a cycle. + stdenv_ = overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc; + in callPackage ./libcxxabi { + stdenv = stdenv_; + inherit llvm_meta cxx-headers; + }; + + # Like `libcxxabi` above, `libcxx` requires a fairly modern C++ compiler, + # so: we use the clang from this LLVM package set instead of the regular + # stdenv's compiler. + libcxx = callPackage ./libcxx { + inherit llvm_meta; + stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; + }; + + libunwind = callPackage ./libunwind { + inherit llvm_meta; + stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; + }; + + openmp = callPackage ./openmp { + inherit llvm_meta targetLlvm; + }; + }); + +in { inherit tools libraries release_version; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/15/libcxx/default.nix b/pkgs/development/compilers/llvm/15/libcxx/default.nix new file mode 100644 index 000000000000..7762df29386e --- /dev/null +++ b/pkgs/development/compilers/llvm/15/libcxx/default.nix @@ -0,0 +1,107 @@ +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, cmake, ninja, python3, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt +, 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 + +assert stdenv.isDarwin -> cxxabi.libName == "c++abi"; + +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" + cp -r ${monorepoSrc}/third-party "$out" + cp -r ${monorepoSrc}/runtimes "$out" + ''; + + sourceRoot = "${src.name}/runtimes"; + + outputs = [ "out" ] ++ lib.optional (!headersOnly) "dev"; + + prePatch = '' + cd ../${basename} + chmod -R u+w . + ''; + + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + ../../libcxx-0001-musl-hacks.patch + ]; + + postPatch = '' + cd ../runtimes + ''; + + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' + patchShebangs utils/cat_files.py + ''; + + nativeBuildInputs = [ cmake ninja python3 ] + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + + buildInputs = lib.optionals (!headersOnly) [ cxxabi ]; + + cmakeFlags = let + # See: https://libcxx.llvm.org/BuildingLibcxx.html#cmdoption-arg-libcxx-cxx-abi-string + libcxx_cxx_abi_opt = { + "c++abi" = "system-libcxxabi"; + "cxxrt" = "libcxxrt"; + }.${cxxabi.libName} or (throw "unknown cxxabi: ${cxxabi.libName} (${cxxabi.pname})"); + in [ + "-DLLVM_ENABLE_RUNTIMES=libcxx" + "-DLIBCXX_CXX_ABI=${if headersOnly then "none" else libcxx_cxx_abi_opt}" + ] ++ lib.optional (!headersOnly && cxxabi.libName == "c++abi") "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi.dev}/include/c++/v1" + ++ 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" + # If we're only building the headers we don't actually *need* a functioning + # C/C++ compiler: + ++ lib.optionals (headersOnly) [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" + ]; + + ninjaFlags = lib.optional headersOnly "generate-cxx-headers"; + installTargets = lib.optional headersOnly "install-cxx-headers"; + + passthru = { + isLLVM = true; + inherit cxxabi; + }; + + 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. + ''; + }; +} diff --git a/pkgs/development/compilers/llvm/15/libcxx/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/15/libcxx/gnu-install-dirs.patch new file mode 100644 index 000000000000..daee5bdd0ed3 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/libcxx/gnu-install-dirs.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 74eff2002fc9..c935d10878bb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -419,7 +419,7 @@ 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_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH + "Path where target-specific libc++ headers should be installed.") +@@ -436,7 +436,7 @@ else() + set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1") + endif() + 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_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH + "Path where target-specific libc++ headers should be installed.") diff --git a/pkgs/development/compilers/llvm/15/libcxxabi/default.nix b/pkgs/development/compilers/llvm/15/libcxxabi/default.nix new file mode 100644 index 000000000000..fd99f4553c0c --- /dev/null +++ b/pkgs/development/compilers/llvm/15/libcxxabi/default.nix @@ -0,0 +1,105 @@ +{ lib, stdenv, llvm_meta, cmake, ninja, python3 +, monorepoSrc, runCommand, fetchpatch +, 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" + cp -r ${monorepoSrc}/llvm/utils "$out/llvm" + cp -r ${monorepoSrc}/runtimes "$out" + ''; + + sourceRoot = "${src.name}/runtimes"; + + 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} + ''; + + prePatch = '' + cd ../${pname} + chmod -R u+w . + ''; + + patches = [ + ./gnu-install-dirs.patch + + # https://reviews.llvm.org/D132298, Allow building libcxxabi alone + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/e6a0800532bb409f6d1c62f3698bdd6994a877dc.patch"; + sha256 = "1xyjd56m4pfwq8p3xh6i8lhkk9kq15jaml7qbhxdf87z4jjkk63a"; + stripLen = 1; + }) + ]; + + postPatch = '' + cd ../runtimes + ''; + + nativeBuildInputs = [ cmake ninja python3 ]; + buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.hostPlatform.isWasm) libunwind; + + cmakeFlags = [ + "-DLLVM_ENABLE_RUNTIMES=libcxxabi" + "-DLIBCXXABI_LIBCXX_INCLUDES=${cxx-headers}/include/c++/v1" + + # `libcxxabi`'s build does not need a toolchain with a c++ stdlib attached + # (we specify the headers it should use explicitly above). + # + # CMake however checks for this anyways; this flag tells it not to. See: + # https://github.com/llvm/llvm-project/blob/4bd3f3759259548e159aeba5c76efb9a0864e6fa/llvm/runtimes/CMakeLists.txt#L243 + "-DCMAKE_CXX_COMPILER_WORKS=ON" + ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + "-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" + ]; + + preInstall = lib.optionalString stdenv.isDarwin '' + 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 + ''; + + postInstall = '' + mkdir -p "$dev/include" + install -m 644 ../../${pname}/include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" + ''; + + passthru = { + libName = "c++abi"; + }; + + 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. + ''; + maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; + }; +} diff --git a/pkgs/development/compilers/llvm/15/libcxxabi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/15/libcxxabi/gnu-install-dirs.patch new file mode 100644 index 000000000000..fa587612aaf6 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/libcxxabi/gnu-install-dirs.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b8326d08d23a..a1e36f713161 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -187,7 +187,7 @@ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE 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.") + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) +@@ -201,7 +201,7 @@ else() + set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR}) + set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) + endif() +- 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.") + endif() + diff --git a/pkgs/development/compilers/llvm/15/libcxxabi/wasm.patch b/pkgs/development/compilers/llvm/15/libcxxabi/wasm.patch new file mode 100644 index 000000000000..4ebfe46aa813 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/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/15/libunwind/default.nix b/pkgs/development/compilers/llvm/15/libunwind/default.nix new file mode 100644 index 000000000000..dd14e2acaf86 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/libunwind/default.nix @@ -0,0 +1,62 @@ +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake +, ninja +, python3 +, 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" + cp -r ${monorepoSrc}/llvm/utils "$out/llvm" + cp -r ${monorepoSrc}/runtimes "$out" + ''; + + sourceRoot = "${src.name}/runtimes"; + + prePatch = '' + cd ../${pname} + chmod -R u+w . + ''; + + patches = [ + ./gnu-install-dirs.patch + ]; + + postPatch = '' + cd ../runtimes + ''; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ninja python3 ]; + + cmakeFlags = [ + "-DLLVM_ENABLE_RUNTIMES=libunwind" + ] ++ 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. + ''; + }; +} diff --git a/pkgs/development/compilers/llvm/15/libunwind/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/15/libunwind/gnu-install-dirs.patch new file mode 100644 index 000000000000..edfb2a8760bd --- /dev/null +++ b/pkgs/development/compilers/llvm/15/libunwind/gnu-install-dirs.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5a06805f05f1..86a50329e6a8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -117,7 +117,7 @@ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE 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_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + "Path where built libunwind libraries should be installed.") + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) +@@ -129,7 +129,7 @@ else() + else() + set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) + endif() +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH + "Path where built libunwind libraries should be installed.") + endif() + diff --git a/pkgs/development/compilers/llvm/15/lld/default.nix b/pkgs/development/compilers/llvm/15/lld/default.nix new file mode 100644 index 000000000000..e8bca769de5f --- /dev/null +++ b/pkgs/development/compilers/llvm/15/lld/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, llvm_meta +, buildLlvmTools +, monorepoSrc, runCommand +, cmake +, ninja +, 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 + ]; + + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ libllvm libxml2 ]; + + cmakeFlags = [ + "-DLLD_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/lld" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ]; + LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; + + 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/15/lld/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/15/lld/gnu-install-dirs.patch new file mode 100644 index 000000000000..ea62b2ad50c7 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/lld/gnu-install-dirs.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dcc649629a4b..58dca54642e4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,13 +70,15 @@ if(LLD_BUILT_STANDALONE) + if (NOT LLVM_CONFIG_FOUND) + # Pull values from LLVMConfig.cmake. We can drop this once the llvm-config + # path is removed. +- set(MAIN_INCLUDE_DIR "${LLVM_INCLUDE_DIR}") ++ set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS}) + set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}") + # N.B. this is just a default value, the CACHE PATHs below can be overridden. + set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm") ++ else() ++ set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}") + endif() + +- set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include") ++ set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed") + 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") + +@@ -95,7 +97,7 @@ if(LLD_BUILT_STANDALONE) + + set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") + +- include_directories("${LLVM_BINARY_DIR}/include" ${LLVM_INCLUDE_DIRS}) ++ include_directories(${LLVM_INCLUDE_DIRS}) + link_directories(${LLVM_LIBRARY_DIRS}) + + if(LLVM_INCLUDE_TESTS) +diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake +index d3924f7243d4..42a7cd62281c 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) diff --git a/pkgs/development/compilers/llvm/15/lldb/cpu_subtype_arm64e_replacement.patch b/pkgs/development/compilers/llvm/15/lldb/cpu_subtype_arm64e_replacement.patch new file mode 100644 index 000000000000..20d35c9f3ea9 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/lldb/cpu_subtype_arm64e_replacement.patch @@ -0,0 +1,12 @@ +diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm +--- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm ++++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm +@@ -233,7 +233,7 @@ void HostInfoMacOSX::ComputeHostArchitectureSupport(ArchSpec &arch_32, + len = sizeof(is_64_bit_capable); + ::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0); + +- if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) { ++ if (cputype == CPU_TYPE_ARM64 && cpusubtype == ((cpu_subtype_t) 2)) { // CPU_SUBTYPE_ARM64E is not available in the macOS 10.12 headers + // The arm64e architecture is a preview. Pretend the host architecture + // is arm64. + cpusubtype = CPU_SUBTYPE_ARM64_ALL; diff --git a/pkgs/development/compilers/llvm/15/lldb/default.nix b/pkgs/development/compilers/llvm/15/lldb/default.nix new file mode 100644 index 000000000000..4b50b79cf613 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/lldb/default.nix @@ -0,0 +1,186 @@ +{ lib, stdenv, llvm_meta +, runCommand +, monorepoSrc +, cmake +, ninja +, zlib +, ncurses +, swig +, which +, libedit +, libxml2 +, libllvm +, libclang +, python3 +, version +, libobjc +, xpc +, Foundation +, bootstrap_cmds +, Carbon +, Cocoa +, lit +, makeWrapper +, darwin +, enableManpages ? false +, lua5_3 +}: + +# TODO: we build the python bindings but don't expose them as a python package +# TODO: expose the vscode extension? + +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 + ] + # This is a stopgap solution if/until the macOS SDK used for x86_64 is + # updated. + # + # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` + # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use + # of this preprocessor symbol in `lldb` with its expansion. + # + # See here for some context: + # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 + ++ lib.optional ( + stdenv.targetPlatform.isDarwin + && !stdenv.targetPlatform.isAarch64 + && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") + ) ./cpu_subtype_arm64e_replacement.patch; + + outputs = [ "out" "lib" "dev" ]; + + nativeBuildInputs = [ + cmake ninja python3 which swig lit makeWrapper lua5_3 + ] ++ 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 + ] + # The older libSystem used on x86_64 macOS is missing the + # `` header which `lldb` uses. + # + # We copy this header over from macOS 10.12 SDK. + # + # See here for context: + # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 + ++ lib.optional ( + stdenv.targetPlatform.isDarwin + && !stdenv.targetPlatform.isAarch64 + ) ( + runCommand "bsm-audit-session-header" { } '' + install -Dm444 \ + "${lib.getDev darwin.apple_sdk.sdk}/include/bsm/audit_session.h" \ + "$out/include/bsm/audit_session.h" + '' + ); + + 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" + + # docs reference `automodapi` but it's not added to the extensions list when + # only building the manpages: + # https://github.com/llvm/llvm-project/blob/af6ec9200b09039573d85e349496c4f5b17c3d7f/lldb/docs/conf.py#L54 + # + # so, we just ignore the resulting errors + "-DSPHINX_WARNINGS_AS_ERRORS=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. + ''; + }; +} // lib.optionalAttrs enableManpages { + pname = "lldb-manpages"; + + ninjaFlags = [ "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/15/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/15/lldb/gnu-install-dirs.patch new file mode 100644 index 000000000000..4388f5c7f593 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/lldb/gnu-install-dirs.patch @@ -0,0 +1,23 @@ +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/15/lldb/procfs.patch b/pkgs/development/compilers/llvm/15/lldb/procfs.patch new file mode 100644 index 000000000000..7b200e86505c --- /dev/null +++ b/pkgs/development/compilers/llvm/15/lldb/procfs.patch @@ -0,0 +1,46 @@ +--- a/source/Plugins/Process/Linux/Procfs.h ++++ b/source/Plugins/Process/Linux/Procfs.h +@@ -10,6 +10,13 @@ + // sys/procfs.h on Android/Linux for all supported architectures. + + #include ++#include ++ ++// on i686 preprocessor symbols with these register names are defined as ++// numeric constants; these symbols clash with identifier names used in ++// `llvm/Support/VirtualFileSystem.h` and `llvm/ADT/SmallVector.h` ++#undef FS ++#undef CS + + #include "lldb/lldb-types.h" + +@@ -17,23 +24,13 @@ + + #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 + + namespace lldb_private { + namespace process_linux { diff --git a/pkgs/development/compilers/llvm/15/lldb/resource-dir.patch b/pkgs/development/compilers/llvm/15/lldb/resource-dir.patch new file mode 100644 index 000000000000..e0db80afeb9f --- /dev/null +++ b/pkgs/development/compilers/llvm/15/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/15/llvm/default.nix b/pkgs/development/compilers/llvm/15/llvm/default.nix new file mode 100644 index 000000000000..e0b79a9acfef --- /dev/null +++ b/pkgs/development/compilers/llvm/15/llvm/default.nix @@ -0,0 +1,429 @@ +{ lib, stdenv, llvm_meta +, pkgsBuildBuild +, monorepoSrc +, runCommand +, fetchpatch +, cmake +, darwin +, ninja +, python3 +, python3Packages +, libffi +, libbfd +, libpfm +, libxml2 +, ncurses +, version +, release_version +, zlib +, which +, sysctl +, buildLlvmTools +, debugVersion ? false +, doCheck ? (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) + && (stdenv.hostPlatform == stdenv.buildPlatform) +, enableManpages ? false +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic +, enablePFM ? stdenv.isLinux /* PFM only supports Linux */ + # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + # broken for the armv7l builder + && !stdenv.hostPlatform.isAarch +, enablePolly ? true +} @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)); + + # Ordinarily we would just the `doCheck` and `checkDeps` functionality + # `mkDerivation` gives us to manage our test dependencies (instead of breaking + # out `doCheck` as a package level attribute). + # + # Unfortunately `lit` does not forward `$PYTHONPATH` to children processes, in + # particular the children it uses to do feature detection. + # + # This means that python deps we add to `checkDeps` (which the python + # interpreter is made aware of via `$PYTHONPATH` – populated by the python + # setup hook) are not picked up by `lit` which causes it to skip tests. + # + # Adding `python3.withPackages (ps: [ ... ])` to `checkDeps` also doesn't work + # because this package is shadowed in `$PATH` by the regular `python3` + # package. + # + # So, we "manually" assemble one python derivation for the package to depend + # on, taking into account whether checks are enabled or not: + python = if doCheck then + # Note that we _explicitly_ ask for a python interpreter for our host + # platform here; the splicing that would ordinarily take care of this for + # us does not seem to work once we use `withPackages`. + let + checkDeps = ps: with ps; [ psutil ]; + in pkgsBuildBuild.targetPackages.python3.withPackages checkDeps + else python3; + +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 '' + chmod u+w "$out/${pname}/tools" + cp -r ${monorepoSrc}/polly "$out/${pname}/tools" + ''); + + sourceRoot = "${src.name}/${pname}"; + + outputs = [ "out" "lib" "dev" "python" ]; + + nativeBuildInputs = [ cmake ninja python ] + ++ optionals enableManpages [ + # Note: we intentionally use `python3Packages` instead of `python3.pkgs`; + # splicing does *not* work with the latter. (TODO: fix) + python3Packages.sphinx python3Packages.recommonmark + ]; + + buildInputs = [ libxml2 libffi ] + ++ optional enablePFM libpfm; # exegesis + + propagatedBuildInputs = [ ncurses zlib ]; + + nativeCheckInputs = [ + which + ] ++ lib.optional stdenv.isDarwin sysctl; + + patches = [ + ./gnu-install-dirs.patch + + # Running the tests involves invoking binaries (like `opt`) that depend on + # the LLVM dylibs and reference them by absolute install path (i.e. their + # nix store path). + # + # Because we have not yet run the install phase (we're running these tests + # as part of `checkPhase` instead of `installCheckPhase`) these absolute + # paths do not exist yet; to work around this we point the loader (`ld` on + # unix, `dyld` on macOS) at the `lib` directory which will later become this + # package's `lib` output. + # + # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` + # dir but: + # - this doesn't generalize well to other platforms; `lit` doesn't forward + # `DYLD_LIBRARY_PATH` (macOS): + # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 + # - even if `lit` forwarded this env var, we actually cannot set + # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because + # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for + # "protected processes" (i.e. the python interpreter that runs `lit`): + # https://stackoverflow.com/a/35570229 + # - other LLVM subprojects deal with this issue by having their `lit` + # configuration set these env vars for us; it makes sense to do the same + # for LLVM: + # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 + # + # !!! TODO: look into upstreaming this patch + ./llvm-lit-cfg-add-libs-to-dylib-path.patch + + # `lit` has a mode where it executes run lines as a shell script which is + # constructs; this is problematic for macOS because it means that there's + # another process in between `lit` and the binaries being tested. As noted + # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our + # tests fail with dyld errors. + # + # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when + # present in the test configuration. + # + # It's not clear to me why this isn't an issue for LLVM developers running + # on macOS (nothing about this _seems_ nix specific).. + ./lit-shell-script-runner-set-dyld-library-path.patch + ] ++ lib.optionals enablePolly [ + ./gnu-install-dirs-polly.patch + + # Just like the `llvm-lit-cfg` patch, but for `polly`. + ./polly-lit-cfg-add-libs-to-dylib-path.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})' "" + + # As of LLVM 15, marked as XFAIL on arm64 macOS but lit doesn't seem to pick + # this up: https://github.com/llvm/llvm-project/blob/c344d97a125b18f8fed0a64aace73c49a870e079/llvm/test/MC/ELF/cfi-version.ll#L7 + rm test/MC/ELF/cfi-version.ll + + # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`) + # and thus fails under the sandbox: + substituteInPlace unittests/Support/Host.cpp \ + --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" + '' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) '' + # This test tries to call the intrinsics `@llvm.roundeven.f32` and + # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf` + # and `roundeven` on x86_64 macOS. + # + # However these functions are glibc specific so the test fails: + # - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html + # - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html + # + # TODO(@rrbutani): this seems to run fine on `aarch64-darwin`, why does it + # pass there? + substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ + --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ + --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" + + # This test fails on darwin x86_64 because `sw_vers` reports a different + # macOS version than what LLVM finds by reading + # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into + # the sandbox on macOS). + # + # The `sw_vers` provided by nixpkgs reports the macOS version associated + # with the `CoreFoundation` framework with which it was built. Because + # nixpkgs pins the SDK for `aarch64-darwin` and `x86_64-darwin` what + # `sw_vers` reports is not guaranteed to match the macOS version of the host + # that's building this derivation. + # + # Astute readers will note that we only _patch_ this test on aarch64-darwin + # (to use the nixpkgs provided `sw_vers`) instead of disabling it outright. + # So why does this test pass on aarch64? + # + # Well, it seems that `sw_vers` on aarch64 actually links against the _host_ + # CoreFoundation framework instead of the nixpkgs provided one. + # + # Not entirely sure what the right fix is here. I'm assuming aarch64 + # `sw_vers` doesn't intentionally link against the host `CoreFoundation` + # (still digging into how this ends up happening, will follow up) but that + # aside I think the more pertinent question is: should we be patching LLVM's + # macOS version detection logic to use `sw_vers` instead of reading host + # paths? This *is* a way in which details about builder machines can creep + # into the artifacts that are produced, affecting reproducibility, but it's + # not clear to me when/where/for what this even gets used in LLVM. + # + # TODO(@rrbutani): fix/follow-up + substituteInPlace unittests/Support/Host.cpp \ + --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" + + # This test fails with a `dysmutil` crash; have not yet dug into what's + # going on here (TODO(@rrbutani)). + rm test/tools/dsymutil/ARM/obfuscated.test + '' + '' + # 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 + rm test/tools/gold/X86/split-dwarf.ll + rm test/tools/llvm-dwarfdump/X86/prettyprint_types.s + rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s + + # !!! Note: these tests are removed in LLVM 16. + # + # See here for context: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999790443 + rm test/CodeGen/RISCV/rv32zbp.ll + rm test/CodeGen/RISCV/rv64zbp.ll + '' + 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 + ''; + + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS="-svj''${NIX_BUILD_CORES} --no-progress-bar" + ) + ''; + + # Defensive check: some paths (that we make symlinks to) depend on the release + # version, for example: + # - https://github.com/llvm/llvm-project/blob/406bde9a15136254f2b10d9ef3a42033b3cb1b16/clang/lib/Headers/CMakeLists.txt#L185 + # + # So we want to sure that the version in the source matches the release + # version we were given. + # + # We do this check here, in the LLVM build, because it happens early. + postConfigure = let + v = lib.versions; + major = v.major release_version; + minor = v.minor release_version; + patch = v.patch release_version; + in '' + # $1: part, $2: expected + check_version() { + part="''${1^^}" + part="$(cat include/llvm/Config/llvm-config.h | grep "#define LLVM_VERSION_''${part} " | cut -d' ' -f3)" + + if [[ "$part" != "$2" ]]; then + echo >&2 \ + "mismatch in the $1 version! we have version ${release_version}" \ + "and expected the $1 version to be '$2'; the source has '$part' instead" + exit 3 + fi + } + + check_version major ${major} + check_version minor ${minor} + check_version patch ${patch} + ''; + + # 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_PACKAGE_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" + "-DLLVM_LINK_LLVM_DYLIB=off" + # 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 + ]) + ) + ]; + + 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 "'"$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 + ''; + + inherit doCheck; + + 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"; + + propagatedBuildInputs = []; + + ninjaFlags = [ "docs-llvm-man" ]; + installTargets = [ "install-docs-llvm-man" ]; + + postPatch = null; + postInstall = null; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man pages for LLVM ${version}"; + }; +}) diff --git a/pkgs/development/compilers/llvm/15/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/15/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 000000000000..b01363e98aa0 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,19 @@ +This is the one remaining Polly install dirs related change that hasn't made it +into upstream yet; previously this patch file also included: +https://reviews.llvm.org/D117541 + +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/pkgs/development/compilers/llvm/15/llvm/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/15/llvm/gnu-install-dirs.patch new file mode 100644 index 000000000000..0ef317af8cc7 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/llvm/gnu-install-dirs.patch @@ -0,0 +1,138 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 45399dc0537e..5d946e9e6583 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -942,7 +942,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "") + add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src + ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime) + install(TARGETS tf_xla_runtime EXPORT LLVMExports +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime) + # Once we add more modules, we should handle this more automatically. + if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL) +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index 057431208322..56f0dcb258da 100644 +--- a/cmake/modules/AddLLVM.cmake ++++ b/cmake/modules/AddLLVM.cmake +@@ -844,8 +844,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) +@@ -2007,7 +2007,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 "${CMAKE_INSTALL_BINDIR}") + endif() +@@ -2271,15 +2271,15 @@ function(llvm_setup_rpath name) + + if (APPLE) + set(_install_name_dir INSTALL_NAME_DIR "@rpath") +- set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS) + # $ORIGIN is not interpreted at link time by aix ld. + # 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_FULL_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 d4b0ab959148..26ed981fd09f 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -128,7 +128,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/docs/CMake.rst b/docs/CMake.rst +index 879b7b231d4c..9c31d14e8950 100644 +--- a/docs/CMake.rst ++++ b/docs/CMake.rst +@@ -250,7 +250,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 +@@ -284,6 +284,10 @@ manual, or execute ``cmake --help-variable VARIABLE_NAME``. + The path to install executables, relative to the *CMAKE_INSTALL_PREFIX*. + Defaults to "bin". + ++**CMAKE_INSTALL_LIBDIR**:PATH ++ The path to install libraries, relative to the *CMAKE_INSTALL_PREFIX*. ++ Defaults to "lib". ++ + **CMAKE_INSTALL_INCLUDEDIR**:PATH + The path to install header files, relative to the *CMAKE_INSTALL_PREFIX*. + Defaults to "include". +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index 370005cd8d7d..7e790bc52111 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -23,6 +23,7 @@ + #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" + #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" + #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" ++#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" + #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" + #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 2c6c55f89d38..f6d2068a0827 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -369,7 +369,11 @@ int main(int argc, char **argv) { + sys::fs::make_absolute(ActivePrefix, Path); + ActiveBinDir = std::string(Path.str()); + } +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; ++ { ++ 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_PACKAGE_DIR); + sys::fs::make_absolute(ActivePrefix, Path); diff --git a/pkgs/development/compilers/llvm/15/llvm/lit-shell-script-runner-set-dyld-library-path.patch b/pkgs/development/compilers/llvm/15/llvm/lit-shell-script-runner-set-dyld-library-path.patch new file mode 100644 index 000000000000..32f1d13a9dc2 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/llvm/lit-shell-script-runner-set-dyld-library-path.patch @@ -0,0 +1,26 @@ +diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py +index 0242e0b75af3..d732011306f7 100644 +--- a/utils/lit/lit/TestRunner.py ++++ b/utils/lit/lit/TestRunner.py +@@ -1029,6 +1029,12 @@ def executeScript(test, litConfig, tmpBase, commands, cwd): + f.write('@echo off\n') + f.write('\n@if %ERRORLEVEL% NEQ 0 EXIT\n'.join(commands)) + else: ++ # This env var is *purged* when invoking subprocesses so we have to ++ # manually set it from within the bash script in order for the commands ++ # in run lines to see this var: ++ if "DYLD_LIBRARY_PATH" in test.config.environment: ++ f.write(f'export DYLD_LIBRARY_PATH="{test.config.environment["DYLD_LIBRARY_PATH"]}"\n') ++ + for i, ln in enumerate(commands): + match = re.match(kPdbgRegex, ln) + if match: +@@ -1363,7 +1369,7 @@ def applySubstitutions(script, substitutions, conditions={}, + return processed + + process = processLine if recursion_limit is None else processLineToFixedPoint +- ++ + return [unescapePercents(process(ln)) for ln in script] + + diff --git a/pkgs/development/compilers/llvm/15/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/15/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch new file mode 100644 index 000000000000..d824516c0a16 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch @@ -0,0 +1,79 @@ +diff --git a/test/Unit/lit.cfg.py b/test/Unit/lit.cfg.py +index 81e8dc04acea..479ff95681e2 100644 +--- a/test/Unit/lit.cfg.py ++++ b/test/Unit/lit.cfg.py +@@ -3,6 +3,7 @@ + # Configuration file for the 'lit' test runner. + + import os ++import platform + import subprocess + + import lit.formats +@@ -55,3 +56,26 @@ if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir): + # Win32 may use %SYSTEMDRIVE% during file system shell operations, so propogate. + if sys.platform == 'win32' and 'SYSTEMDRIVE' in os.environ: + config.environment['SYSTEMDRIVE'] = os.environ['SYSTEMDRIVE'] ++ ++# Add the LLVM dynamic libs to the platform-specific loader search path env var: ++# ++# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. ++def find_shlibpath_var(): ++ if platform.system() in ['Linux', 'FreeBSD', 'NetBSD', 'OpenBSD', 'SunOS']: ++ yield 'LD_LIBRARY_PATH' ++ elif platform.system() == 'Darwin': ++ yield 'DYLD_LIBRARY_PATH' ++ elif platform.system() == 'Windows': ++ yield 'PATH' ++ elif platform.system() == 'AIX': ++ yield 'LIBPATH' ++ ++for shlibpath_var in find_shlibpath_var(): ++ shlibpath = os.path.pathsep.join( ++ (config.shlibdir, ++ config.environment.get(shlibpath_var, ''))) ++ config.environment[shlibpath_var] = shlibpath ++ break ++else: ++ lit_config.warning("unable to inject shared library path on '{}'" ++ .format(platform.system())) +diff --git a/test/lit.cfg.py b/test/lit.cfg.py +index 75a38b4c5dad..856fc75c9d74 100644 +--- a/test/lit.cfg.py ++++ b/test/lit.cfg.py +@@ -42,6 +42,26 @@ llvm_config.with_environment('PATH', config.llvm_tools_dir, append_path=True) + llvm_config.with_system_environment( + ['HOME', 'INCLUDE', 'LIB', 'TMP', 'TEMP']) + ++# Add the LLVM dynamic libs to the platform-specific loader search path env var: ++# ++# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. ++def find_shlibpath_var(): ++ if platform.system() in ['Linux', 'FreeBSD', 'NetBSD', 'OpenBSD', 'SunOS']: ++ yield 'LD_LIBRARY_PATH' ++ elif platform.system() == 'Darwin': ++ yield 'DYLD_LIBRARY_PATH' ++ elif platform.system() == 'Windows': ++ yield 'PATH' ++ elif platform.system() == 'AIX': ++ yield 'LIBPATH' ++ ++for shlibpath_var in find_shlibpath_var(): ++ shlibpath = config.llvm_shlib_dir ++ llvm_config.with_environment(shlibpath_var, shlibpath, append_path = True) ++ break ++else: ++ lit_config.warning("unable to inject shared library path on '{}'" ++ .format(platform.system())) + + # Set up OCAMLPATH to include newly built OCaml libraries. + top_ocaml_lib = os.path.join(config.llvm_lib_dir, 'ocaml') +@@ -318,7 +338,7 @@ def have_cxx_shared_library(): + + try: + readobj_cmd = subprocess.Popen( +- [readobj_exe, '--needed-libs', readobj_exe], stdout=subprocess.PIPE) ++ [readobj_exe, '--needed-libs', readobj_exe], stdout=subprocess.PIPE, env=config.environment) + except OSError: + print('could not exec llvm-readobj') + return False diff --git a/pkgs/development/compilers/llvm/15/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/15/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch new file mode 100644 index 000000000000..1354ad267314 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch @@ -0,0 +1,24 @@ +diff --git a/tools/polly/test/lit.cfg b/tools/polly/test/lit.cfg +index 41e3a589c61e..09f3b17498b0 100644 +--- a/tools/polly/test/lit.cfg ++++ b/tools/polly/test/lit.cfg +@@ -36,9 +36,17 @@ base_paths = [config.llvm_tools_dir, config.environment['PATH']] + path = os.path.pathsep.join(base_paths + config.extra_paths) + config.environment['PATH'] = path + ++# (Copied from polly/test/Unit/lit.cfg) ++if platform.system() == 'Darwin': ++ shlibpath_var = 'DYLD_LIBRARY_PATH' ++elif platform.system() == 'Windows': ++ shlibpath_var = 'PATH' ++else: ++ shlibpath_var = 'LD_LIBRARY_PATH' ++ + path = os.path.pathsep.join((config.llvm_libs_dir, +- config.environment.get('LD_LIBRARY_PATH',''))) +-config.environment['LD_LIBRARY_PATH'] = path ++ config.environment.get(shlibpath_var,''))) ++config.environment[shlibpath_var] = path + + llvm_config.use_default_substitutions() + diff --git a/pkgs/development/compilers/llvm/15/openmp/default.nix b/pkgs/development/compilers/llvm/15/openmp/default.nix new file mode 100644 index 000000000000..8047cb1122de --- /dev/null +++ b/pkgs/development/compilers/llvm/15/openmp/default.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, llvm_meta +, monorepoSrc +, runCommand +, cmake +, ninja +, llvm +, targetLlvm +, lit +, clang-unwrapped +, perl +, pkg-config +, xcbuild +, 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 = [ + ./fix-find-tool.patch + ./gnu-install-dirs.patch + ./run-lit-directly.patch + ]; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ninja perl pkg-config lit ]; + buildInputs = [ + (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + ]; + + nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin xcbuild.xcrun; + + # 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. + ''; + }; +} diff --git a/pkgs/development/compilers/llvm/15/openmp/fix-find-tool.patch b/pkgs/development/compilers/llvm/15/openmp/fix-find-tool.patch new file mode 100644 index 000000000000..103b054ed176 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/openmp/fix-find-tool.patch @@ -0,0 +1,18 @@ +diff --git a/libomptarget/DeviceRTL/CMakeLists.txt b/libomptarget/DeviceRTL/CMakeLists.txt +index ce66214822a2..6ab7b33c95da 100644 +--- a/libomptarget/DeviceRTL/CMakeLists.txt ++++ b/libomptarget/DeviceRTL/CMakeLists.txt +@@ -27,10 +27,10 @@ endif() + if (LLVM_DIR) + # Builds that use pre-installed LLVM have LLVM_DIR set. + # A standalone or LLVM_ENABLE_RUNTIMES=openmp build takes this route +- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR}) + 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) ++ ) ++ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR}) + if ((NOT CLANG_TOOL) OR (NOT LINK_TOOL) OR (NOT OPT_TOOL)) + libomptarget_say("Not building DeviceRTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL} or opt: ${OPT_TOOL}") + return() diff --git a/pkgs/development/compilers/llvm/15/openmp/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/15/openmp/gnu-install-dirs.patch new file mode 100644 index 000000000000..77a93208832a --- /dev/null +++ b/pkgs/development/compilers/llvm/15/openmp/gnu-install-dirs.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b6ddbe90516d..311ab1d50e7f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,7 +29,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 +@@ -40,7 +40,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/pkgs/development/compilers/llvm/15/openmp/run-lit-directly.patch b/pkgs/development/compilers/llvm/15/openmp/run-lit-directly.patch new file mode 100644 index 000000000000..1e952fdc36a8 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/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/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index df3d26139866..57d6fe6ae7f8 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -77,6 +77,7 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + patchShebangs $python/bin mkdir -p $dev/bin cp bin/clang-tblgen $dev/bin @@ -101,6 +102,7 @@ let of tools that can be built using the Clang frontend as a library to parse C/C++ code. ''; + mainProgram = "clang"; }; } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index ef9886fb5ea7..3cfc89dac75f 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -2,6 +2,7 @@ , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross +, targetLlvm }: let @@ -18,7 +19,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -85,7 +86,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -121,7 +122,7 @@ let }; openmp = callPackage ./openmp { - inherit llvm_meta; + inherit llvm_meta targetLlvm; }; }); diff --git a/pkgs/development/compilers/llvm/5/libcxx/default.nix b/pkgs/development/compilers/llvm/5/libcxx/default.nix index 44026fba187b..073787e92db6 100644 --- a/pkgs/development/compilers/llvm/5/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/5/libcxx/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, llvm_meta, fetch, cmake, python3, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt +}: + +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; stdenv.mkDerivation { pname = "libcxx"; @@ -33,16 +38,31 @@ stdenv.mkDerivation { ++ lib.optional stdenv.hostPlatform.isMusl python3 ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; + buildInputs = [ cxxabi ]; cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; + "-DLIBCXX_CXX_ABI=${cxxabi.pname}" + ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (cxxabi.pname == "libcxxabi") "-DLIBCXX_LIBCXXABI_LIB_PATH=${cxxabi}/lib"; + + preInstall = lib.optionalString (stdenv.isDarwin) '' + for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + + baseName=$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1)) + installName="$out/lib/$baseName" + abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') + + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file + done + done + ''; passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/pkgs/development/compilers/llvm/5/libcxxabi/default.nix b/pkgs/development/compilers/llvm/5/libcxxabi/default.nix index 925c8947ccf5..cc2ac1beaf0c 100644 --- a/pkgs/development/compilers/llvm/5/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/5/libcxxabi/default.nix @@ -27,8 +27,10 @@ stdenv.mkDerivation { preInstall = lib.optionalString stdenv.isDarwin '' for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + # Fix up the install name. Preserve the basename, just replace the path. - installName="$out/lib/$(basename $(otool -D $file | tail -n 1))" + installName="$out/lib/$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))" # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables @@ -39,7 +41,7 @@ stdenv.mkDerivation { # cc-wrapper passes '-lc++abi' to all c++ link steps, but that causes # libcxxabi to sometimes link against a different version of itself. # Here we simply make that second reference point to ourselves. - for other in $(otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do ${stdenv.cc.targetPrefix}install_name_tool -change $other $installName $file done done @@ -50,6 +52,10 @@ stdenv.mkDerivation { install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/pkgs/development/compilers/llvm/5/lldb/default.nix b/pkgs/development/compilers/llvm/5/lldb/default.nix index 951e9c8e1ac6..6c60a44b3d65 100644 --- a/pkgs/development/compilers/llvm/5/lldb/default.nix +++ b/pkgs/development/compilers/llvm/5/lldb/default.nix @@ -82,5 +82,7 @@ stdenv.mkDerivation rec { larger LLVM Project, such as the Clang expression parser and LLVM disassembler. ''; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/compilers/llvm/5/openmp/default.nix b/pkgs/development/compilers/llvm/5/openmp/default.nix index 3a1f97919dc3..900e920173fb 100644 --- a/pkgs/development/compilers/llvm/5/openmp/default.nix +++ b/pkgs/development/compilers/llvm/5/openmp/default.nix @@ -4,6 +4,7 @@ , fetch , cmake , llvm +, targetLlvm , perl , version }: @@ -15,7 +16,9 @@ stdenv.mkDerivation { src = fetch "openmp" "0p2n52676wlq6y9q99n5pivq6pvvda1p994r69fxj206ahn59jir"; nativeBuildInputs = [ cmake perl ]; - buildInputs = [ llvm ]; + buildInputs = [ + (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + ]; meta = llvm_meta // { homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index ee8859c159a1..1b37efe3f08e 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -77,6 +77,7 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + patchShebangs $python/bin mkdir -p $dev/bin cp bin/clang-tblgen $dev/bin @@ -101,6 +102,7 @@ let of tools that can be built using the Clang frontend as a library to parse C/C++ code. ''; + mainProgram = "clang"; }; } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 4acfe6cd85d7..a0c4ba727185 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -2,6 +2,7 @@ , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross +, targetLlvm }: let @@ -18,7 +19,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -86,7 +87,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -122,7 +123,7 @@ let }; openmp = callPackage ./openmp { - inherit llvm_meta; + inherit llvm_meta targetLlvm; }; }); diff --git a/pkgs/development/compilers/llvm/6/libcxx/default.nix b/pkgs/development/compilers/llvm/6/libcxx/default.nix index 7077081c5917..0fc31d43cfa1 100644 --- a/pkgs/development/compilers/llvm/6/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/6/libcxx/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, llvm_meta, fetch, cmake, python3, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt +}: + +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; stdenv.mkDerivation { pname = "libcxx"; @@ -39,16 +44,31 @@ stdenv.mkDerivation { ++ lib.optional stdenv.hostPlatform.isMusl python3 ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; + buildInputs = [ cxxabi ]; cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; + "-DLIBCXX_CXX_ABI=${cxxabi.pname}" + ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (cxxabi.pname == "libcxxabi") "-DLIBCXX_LIBCXXABI_LIB_PATH=${cxxabi}/lib"; + + preInstall = lib.optionalString (stdenv.isDarwin) '' + for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + + baseName=$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1)) + installName="$out/lib/$baseName" + abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') + + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file + done + done + ''; passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/pkgs/development/compilers/llvm/6/libcxxabi/default.nix b/pkgs/development/compilers/llvm/6/libcxxabi/default.nix index 3371a8ba1a15..0821dbdae06d 100644 --- a/pkgs/development/compilers/llvm/6/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/6/libcxxabi/default.nix @@ -27,8 +27,10 @@ stdenv.mkDerivation { preInstall = lib.optionalString stdenv.isDarwin '' for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + # Fix up the install name. Preserve the basename, just replace the path. - installName="$out/lib/$(basename $(otool -D $file | tail -n 1))" + installName="$out/lib/$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))" # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables @@ -39,7 +41,7 @@ stdenv.mkDerivation { # cc-wrapper passes '-lc++abi' to all c++ link steps, but that causes # libcxxabi to sometimes link against a different version of itself. # Here we simply make that second reference point to ourselves. - for other in $(otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do ${stdenv.cc.targetPrefix}install_name_tool -change $other $installName $file done done @@ -50,6 +52,10 @@ stdenv.mkDerivation { install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/pkgs/development/compilers/llvm/6/lldb/default.nix b/pkgs/development/compilers/llvm/6/lldb/default.nix index da3c4a73a590..e64584edf29d 100644 --- a/pkgs/development/compilers/llvm/6/lldb/default.nix +++ b/pkgs/development/compilers/llvm/6/lldb/default.nix @@ -82,5 +82,7 @@ stdenv.mkDerivation rec { larger LLVM Project, such as the Clang expression parser and LLVM disassembler. ''; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/compilers/llvm/6/openmp/default.nix b/pkgs/development/compilers/llvm/6/openmp/default.nix index bc21220af7c7..fa07c650970f 100644 --- a/pkgs/development/compilers/llvm/6/openmp/default.nix +++ b/pkgs/development/compilers/llvm/6/openmp/default.nix @@ -4,6 +4,7 @@ , fetch , cmake , llvm +, targetLlvm , perl , version }: @@ -15,7 +16,9 @@ stdenv.mkDerivation { src = fetch "openmp" "0nhwfba9c351r16zgyjyfwdayr98nairky3c2f0b2lc360mwmbv6"; nativeBuildInputs = [ cmake perl ]; - buildInputs = [ llvm ]; + buildInputs = [ + (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + ]; meta = llvm_meta // { homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/7/bintools/default.nix b/pkgs/development/compilers/llvm/7/bintools/default.nix index 53f7941e3369..1eb7215c0085 100644 --- a/pkgs/development/compilers/llvm/7/bintools/default.nix +++ b/pkgs/development/compilers/llvm/7/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) @@ -15,15 +20,18 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' 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-ar $out/bin/${prefix}dlltool + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt 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-objcopy $out/bin/${prefix}strip 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-readobj $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 ${llvm}/bin/llvm-strings $out/bin/${prefix}strings + ln -s ${llvm}/bin/llvm-symbolizer $out/bin/${prefix}addr2line ln -s ${lld}/bin/lld $out/bin/${prefix}ld '' diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index afa1669ace61..d146e5b5f815 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -89,6 +89,7 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + patchShebangs $python/bin mkdir -p $dev/bin cp bin/clang-tblgen $dev/bin @@ -113,6 +114,7 @@ let of tools that can be built using the Clang frontend as a library to parse C/C++ code. ''; + mainProgram = "clang"; }; } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index cf799d53f53b..7ddd14b60d3d 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -3,6 +3,7 @@ , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross +, targetLlvm # 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. @@ -30,7 +31,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -116,7 +117,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -153,7 +154,7 @@ let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -163,7 +164,7 @@ let 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.isFreeBSD && stdenv.targetPlatform.useLLVM or false) '' + '' + 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 @@ -268,7 +269,7 @@ let }; openmp = callPackage ./openmp { - inherit llvm_meta; + inherit llvm_meta targetLlvm; }; }); diff --git a/pkgs/development/compilers/llvm/7/libcxx/default.nix b/pkgs/development/compilers/llvm/7/libcxx/default.nix index 07d84432d422..3834e17fb8dd 100644 --- a/pkgs/development/compilers/llvm/7/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/7/libcxx/default.nix @@ -1,7 +1,11 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta, fetch, cmake, python3, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic }: +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; + stdenv.mkDerivation { pname = "libcxx"; inherit version; @@ -42,18 +46,33 @@ stdenv.mkDerivation { ++ lib.optional stdenv.hostPlatform.isMusl python3 ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; + buildInputs = [ cxxabi ]; cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_CXX_ABI=${cxxabi.pname}" ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (cxxabi.pname == "libcxxabi") "-DLIBCXX_LIBCXXABI_LIB_PATH=${cxxabi}/lib" ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" ; + preInstall = lib.optionalString (stdenv.isDarwin) '' + for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + + baseName=$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1)) + installName="$out/lib/$baseName" + abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') + + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file + done + done + ''; + passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/pkgs/development/compilers/llvm/7/libcxxabi/default.nix b/pkgs/development/compilers/llvm/7/libcxxabi/default.nix index 8be9690f5f40..c33c61361e2a 100644 --- a/pkgs/development/compilers/llvm/7/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/7/libcxxabi/default.nix @@ -46,8 +46,10 @@ stdenv.mkDerivation { preInstall = lib.optionalString stdenv.isDarwin '' for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + # Fix up the install name. Preserve the basename, just replace the path. - installName="$out/lib/$(basename $(otool -D $file | tail -n 1))" + installName="$out/lib/$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))" # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables @@ -58,7 +60,7 @@ stdenv.mkDerivation { # cc-wrapper passes '-lc++abi' to all c++ link steps, but that causes # libcxxabi to sometimes link against a different version of itself. # Here we simply make that second reference point to ourselves. - for other in $(otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do ${stdenv.cc.targetPrefix}install_name_tool -change $other $installName $file done done @@ -69,6 +71,10 @@ stdenv.mkDerivation { install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/pkgs/development/compilers/llvm/7/lldb/default.nix b/pkgs/development/compilers/llvm/7/lldb/default.nix index e2eab31697d7..3ab2daad32bd 100644 --- a/pkgs/development/compilers/llvm/7/lldb/default.nix +++ b/pkgs/development/compilers/llvm/7/lldb/default.nix @@ -85,5 +85,7 @@ stdenv.mkDerivation rec { larger LLVM Project, such as the Clang expression parser and LLVM disassembler. ''; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/compilers/llvm/7/llvm/default.nix b/pkgs/development/compilers/llvm/7/llvm/default.nix index 1aa85f543ea2..da72bb8b35ae 100644 --- a/pkgs/development/compilers/llvm/7/llvm/default.nix +++ b/pkgs/development/compilers/llvm/7/llvm/default.nix @@ -16,10 +16,9 @@ , 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 - ) +# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 +# broken for the armv7l builder +, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch , enablePolly ? false }: diff --git a/pkgs/development/compilers/llvm/7/openmp/default.nix b/pkgs/development/compilers/llvm/7/openmp/default.nix index c331762712f2..a87dd319d8ec 100644 --- a/pkgs/development/compilers/llvm/7/openmp/default.nix +++ b/pkgs/development/compilers/llvm/7/openmp/default.nix @@ -4,6 +4,7 @@ , fetch , cmake , llvm +, targetLlvm , perl , version }: @@ -15,7 +16,9 @@ stdenv.mkDerivation { src = fetch "openmp" "1dg53wzsci2kra8lh1y0chh60h2l8h1by93br5spzvzlxshkmrqy"; nativeBuildInputs = [ cmake perl ]; - buildInputs = [ llvm ]; + buildInputs = [ + (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + ]; meta = llvm_meta // { homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/8/bintools/default.nix b/pkgs/development/compilers/llvm/8/bintools/default.nix index 53f7941e3369..1eb7215c0085 100644 --- a/pkgs/development/compilers/llvm/8/bintools/default.nix +++ b/pkgs/development/compilers/llvm/8/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) @@ -15,15 +20,18 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' 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-ar $out/bin/${prefix}dlltool + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt 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-objcopy $out/bin/${prefix}strip 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-readobj $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 ${llvm}/bin/llvm-strings $out/bin/${prefix}strings + ln -s ${llvm}/bin/llvm-symbolizer $out/bin/${prefix}addr2line ln -s ${lld}/bin/lld $out/bin/${prefix}ld '' diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix index 1d6a5b7d74df..bc2ed03eed90 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -95,6 +95,7 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + patchShebangs $python/bin mkdir -p $dev/bin cp bin/clang-tblgen $dev/bin @@ -119,6 +120,7 @@ let of tools that can be built using the Clang frontend as a library to parse C/C++ code. ''; + mainProgram = "clang"; }; } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index d6f272337f9f..29a2ee7ddc1e 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -3,6 +3,7 @@ , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross +, targetLlvm # 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. @@ -30,7 +31,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -117,7 +118,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -154,7 +155,7 @@ let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -164,7 +165,7 @@ let 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.isFreeBSD && stdenv.targetPlatform.useLLVM or false) '' + '' + 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 @@ -267,7 +268,7 @@ let }; openmp = callPackage ./openmp { - inherit llvm_meta; + inherit llvm_meta targetLlvm; }; }); diff --git a/pkgs/development/compilers/llvm/8/libcxx/default.nix b/pkgs/development/compilers/llvm/8/libcxx/default.nix index 536801129218..967d4b748dbe 100644 --- a/pkgs/development/compilers/llvm/8/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/8/libcxx/default.nix @@ -1,7 +1,11 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta, fetch, cmake, python3, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic }: +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; + stdenv.mkDerivation { pname = "libcxx"; inherit version; @@ -41,13 +45,13 @@ stdenv.mkDerivation { ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; + buildInputs = [ cxxabi ]; cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_CXX_ABI=${cxxabi.pname}" ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (cxxabi.pname == "libcxxabi") "-DLIBCXX_LIBCXXABI_LIB_PATH=${cxxabi}/lib" ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXX_ENABLE_THREADS=OFF" @@ -55,8 +59,23 @@ stdenv.mkDerivation { "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; + preInstall = lib.optionalString (stdenv.isDarwin) '' + for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + + baseName=$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1)) + installName="$out/lib/$baseName" + abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') + + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file + done + done + ''; + passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/pkgs/development/compilers/llvm/8/libcxxabi/default.nix b/pkgs/development/compilers/llvm/8/libcxxabi/default.nix index 6b4de0786b98..ebf8a5c702ee 100644 --- a/pkgs/development/compilers/llvm/8/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/8/libcxxabi/default.nix @@ -42,8 +42,10 @@ stdenv.mkDerivation { preInstall = lib.optionalString stdenv.isDarwin '' for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + # Fix up the install name. Preserve the basename, just replace the path. - installName="$out/lib/$(basename $(otool -D $file | tail -n 1))" + installName="$out/lib/$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))" # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables @@ -54,7 +56,7 @@ stdenv.mkDerivation { # cc-wrapper passes '-lc++abi' to all c++ link steps, but that causes # libcxxabi to sometimes link against a different version of itself. # Here we simply make that second reference point to ourselves. - for other in $(otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do ${stdenv.cc.targetPrefix}install_name_tool -change $other $installName $file done done @@ -65,6 +67,10 @@ stdenv.mkDerivation { install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/pkgs/development/compilers/llvm/8/lldb/default.nix b/pkgs/development/compilers/llvm/8/lldb/default.nix index f6d77d0b00f4..361221154298 100644 --- a/pkgs/development/compilers/llvm/8/lldb/default.nix +++ b/pkgs/development/compilers/llvm/8/lldb/default.nix @@ -23,6 +23,9 @@ stdenv.mkDerivation rec { patches = [ ./gnu-install-dirs.patch + + # Fix darwin build + ./lldb-gdb-remote-no-libcompress.patch ]; postPatch = '' @@ -33,6 +36,9 @@ stdenv.mkDerivation rec { cmake/modules/LLDBStandalone.cmake sed -i 's,"$.LLVM_LIBRARY_DIR.",${libllvm.lib}/lib ${libclang.lib}/lib,' \ cmake/modules/LLDBStandalone.cmake + + substituteInPlace tools/CMakeLists.txt \ + --replace "add_subdirectory(debugserver)" "" ''; outputs = [ "out" "lib" "dev" ]; @@ -46,7 +52,11 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc - darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.Foundation + darwin.bootstrap_cmds + darwin.apple_sdk.frameworks.Carbon + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.DebugSymbols ]; CXXFLAGS = "-fno-rtti"; @@ -55,6 +65,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + ] ++ lib.optionals stdenv.isDarwin [ + # Building debugserver requires the proprietary libcompression + "-DLLDB_NO_DEBUGSERVER=ON" ] ++ 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++" @@ -80,7 +93,7 @@ stdenv.mkDerivation rec { ''; meta = llvm_meta // { - broken = stdenv.isDarwin; + broken = stdenv.isDarwin && stdenv.isAarch64; homepage = "https://lldb.llvm.org/"; description = "A next-generation high-performance debugger"; longDescription = '' diff --git a/pkgs/development/compilers/llvm/8/lldb/lldb-gdb-remote-no-libcompress.patch b/pkgs/development/compilers/llvm/8/lldb/lldb-gdb-remote-no-libcompress.patch new file mode 100644 index 000000000000..e04d4ffb1060 --- /dev/null +++ b/pkgs/development/compilers/llvm/8/lldb/lldb-gdb-remote-no-libcompress.patch @@ -0,0 +1,30 @@ +diff -ru a/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +--- a/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp 2019-01-09 19:46:09.000000000 -0500 ++++ b/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp 2021-11-27 00:23:08.000000000 -0500 +@@ -42,11 +42,6 @@ + #define DEBUGSERVER_BASENAME "lldb-server" + #endif + +-#if defined(__APPLE__) +-#define HAVE_LIBCOMPRESSION +-#include +-#endif +- + #if defined(HAVE_LIBZ) + #include + #endif +diff -ru a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp +--- a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp 2018-12-18 18:02:50.000000000 -0500 ++++ b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp 2021-11-27 00:09:07.000000000 -0500 +@@ -37,11 +37,6 @@ + + #include "llvm/ADT/StringSwitch.h" + +-#if defined(__APPLE__) +-#define HAVE_LIBCOMPRESSION +-#include +-#endif +- + using namespace lldb; + using namespace lldb_private; + using namespace lldb_private::process_gdb_remote; diff --git a/pkgs/development/compilers/llvm/8/llvm/default.nix b/pkgs/development/compilers/llvm/8/llvm/default.nix index 3e01c7ac9ca1..5c381a896e15 100644 --- a/pkgs/development/compilers/llvm/8/llvm/default.nix +++ b/pkgs/development/compilers/llvm/8/llvm/default.nix @@ -16,10 +16,9 @@ , 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 -) +# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 +# broken for the armv7l builder +, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch , enablePolly ? false }: diff --git a/pkgs/development/compilers/llvm/8/openmp/default.nix b/pkgs/development/compilers/llvm/8/openmp/default.nix index e8459d279829..32b564ff0ecf 100644 --- a/pkgs/development/compilers/llvm/8/openmp/default.nix +++ b/pkgs/development/compilers/llvm/8/openmp/default.nix @@ -4,6 +4,7 @@ , fetch , cmake , llvm +, targetLlvm , perl , version }: @@ -15,7 +16,9 @@ stdenv.mkDerivation { src = fetch "openmp" "0b3jlxhqbpyd1nqkpxjfggm5d9va5qpyf7d4i5y7n4a1mlydv19y"; nativeBuildInputs = [ cmake perl ]; - buildInputs = [ llvm ]; + buildInputs = [ + (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + ]; meta = llvm_meta // { homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/9/bintools/default.nix b/pkgs/development/compilers/llvm/9/bintools/default.nix index 53f7941e3369..1eb7215c0085 100644 --- a/pkgs/development/compilers/llvm/9/bintools/default.nix +++ b/pkgs/development/compilers/llvm/9/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) @@ -15,15 +20,18 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' 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-ar $out/bin/${prefix}dlltool + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt 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-objcopy $out/bin/${prefix}strip 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-readobj $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 ${llvm}/bin/llvm-strings $out/bin/${prefix}strings + ln -s ${llvm}/bin/llvm-symbolizer $out/bin/${prefix}addr2line ln -s ${lld}/bin/lld $out/bin/${prefix}ld '' diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix index ee124b43bfce..7819676e33a8 100644 --- a/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/pkgs/development/compilers/llvm/9/clang/default.nix @@ -90,6 +90,7 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + patchShebangs $python/bin mkdir -p $dev/bin cp bin/clang-tblgen $dev/bin @@ -114,6 +115,7 @@ let of tools that can be built using the Clang frontend as a library to parse C/C++ code. ''; + mainProgram = "clang"; }; } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index eaa4641ea628..e2191a81e795 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -3,6 +3,7 @@ , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross +, targetLlvm # 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. @@ -30,7 +31,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -117,7 +118,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -154,7 +155,7 @@ let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -164,7 +165,7 @@ let 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.isFreeBSD && stdenv.targetPlatform.useLLVM or false) '' + '' + 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 @@ -267,7 +268,7 @@ let }; openmp = callPackage ./openmp { - inherit llvm_meta; + inherit llvm_meta targetLlvm; }; }); diff --git a/pkgs/development/compilers/llvm/9/libcxx/default.nix b/pkgs/development/compilers/llvm/9/libcxx/default.nix index 31a00ba54859..ec09998ed37d 100644 --- a/pkgs/development/compilers/llvm/9/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/9/libcxx/default.nix @@ -1,7 +1,11 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta, fetch, cmake, python3, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic }: +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; + stdenv.mkDerivation { pname = "libcxx"; inherit version; @@ -37,13 +41,13 @@ stdenv.mkDerivation { ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; + buildInputs = [ cxxabi ]; cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_CXX_ABI=${cxxabi.pname}" ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (cxxabi.pname == "libcxxabi") "-DLIBCXX_LIBCXXABI_LIB_PATH=${cxxabi}/lib" ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXX_ENABLE_THREADS=OFF" @@ -51,8 +55,23 @@ stdenv.mkDerivation { "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; + preInstall = lib.optionalString (stdenv.isDarwin) '' + for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + + baseName=$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1)) + installName="$out/lib/$baseName" + abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') + + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file + done + done + ''; + passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/pkgs/development/compilers/llvm/9/libcxxabi/default.nix b/pkgs/development/compilers/llvm/9/libcxxabi/default.nix index b7c0c2b0475a..f19bfb157ce9 100644 --- a/pkgs/development/compilers/llvm/9/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/9/libcxxabi/default.nix @@ -42,8 +42,10 @@ stdenv.mkDerivation { preInstall = lib.optionalString stdenv.isDarwin '' for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + # Fix up the install name. Preserve the basename, just replace the path. - installName="$out/lib/$(basename $(otool -D $file | tail -n 1))" + installName="$out/lib/$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))" # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables @@ -54,7 +56,7 @@ stdenv.mkDerivation { # cc-wrapper passes '-lc++abi' to all c++ link steps, but that causes # libcxxabi to sometimes link against a different version of itself. # Here we simply make that second reference point to ourselves. - for other in $(otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do ${stdenv.cc.targetPrefix}install_name_tool -change $other $installName $file done done @@ -65,6 +67,10 @@ stdenv.mkDerivation { install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/pkgs/development/compilers/llvm/9/lldb/default.nix b/pkgs/development/compilers/llvm/9/lldb/default.nix index 644911b905cc..57560ccbfe5b 100644 --- a/pkgs/development/compilers/llvm/9/lldb/default.nix +++ b/pkgs/development/compilers/llvm/9/lldb/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, llvm_meta , fetch +, fetchpatch , cmake , zlib , ncurses @@ -13,6 +14,7 @@ , version , darwin , makeWrapper +, perl , lit }: @@ -25,12 +27,27 @@ stdenv.mkDerivation rec { patches = [ ./procfs.patch ./gnu-install-dirs.patch + + # Fix darwin build + (fetchpatch { + name = "lldb-use-system-debugserver-fix.patch"; + url = "https://github.com/llvm-mirror/lldb/commit/be770754cc43da22eacdb70c6203f4582eeb011f.diff"; + sha256 = "sha256-tKkk6sn//0Hu0nlzoKWs5fXMWc+O2JAWOEJ1ZnaLuVU="; + excludes = [ "packages/*" ]; + postFetch = '' + substituteInPlace "$out" --replace add_lldb_tool_subdirectory add_subdirectory + ''; + }) + ./lldb-gdb-remote-no-libcompress.patch ]; outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ cmake python3 which swig lit makeWrapper + ] ++ lib.optionals stdenv.isDarwin [ + # for scripts/generate-vers.pl + perl ]; buildInputs = [ @@ -42,6 +59,7 @@ stdenv.mkDerivation rec { darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.DebugSymbols ]; CXXFLAGS = "-fno-rtti"; @@ -52,6 +70,9 @@ stdenv.mkDerivation rec { "-DClang_DIR=${libclang.dev}/lib/cmake" "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + ] ++ lib.optionals stdenv.isDarwin [ + # Building debugserver requires the proprietary libcompression + "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" ] ++ 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++" @@ -80,7 +101,7 @@ stdenv.mkDerivation rec { ''; meta = llvm_meta // { - broken = stdenv.isDarwin; + broken = stdenv.isDarwin && stdenv.isAarch64; homepage = "https://lldb.llvm.org/"; description = "A next-generation high-performance debugger"; longDescription = '' diff --git a/pkgs/development/compilers/llvm/9/lldb/lldb-gdb-remote-no-libcompress.patch b/pkgs/development/compilers/llvm/9/lldb/lldb-gdb-remote-no-libcompress.patch new file mode 100644 index 000000000000..ff2dcd301fa3 --- /dev/null +++ b/pkgs/development/compilers/llvm/9/lldb/lldb-gdb-remote-no-libcompress.patch @@ -0,0 +1,17 @@ +diff -ru a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp +--- a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp 2019-12-11 14:15:30.000000000 -0500 ++++ b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp 2021-11-26 23:44:28.000000000 -0500 +@@ -36,13 +36,6 @@ + + #include "llvm/ADT/StringSwitch.h" + +-#if defined(__APPLE__) +-#ifndef HAVE_LIBCOMPRESSION +-#define HAVE_LIBCOMPRESSION +-#endif +-#include +-#endif +- + using namespace lldb; + using namespace lldb_private; + using namespace lldb_private::process_gdb_remote; diff --git a/pkgs/development/compilers/llvm/9/llvm/default.nix b/pkgs/development/compilers/llvm/9/llvm/default.nix index 6c0a37cadd90..f8b6a8170f85 100644 --- a/pkgs/development/compilers/llvm/9/llvm/default.nix +++ b/pkgs/development/compilers/llvm/9/llvm/default.nix @@ -16,10 +16,9 @@ , 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 -) +# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 +# broken for the armv7l builder +, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch , enablePolly ? false }: diff --git a/pkgs/development/compilers/llvm/9/openmp/default.nix b/pkgs/development/compilers/llvm/9/openmp/default.nix index bedd191d5134..7cd9ad761fdf 100644 --- a/pkgs/development/compilers/llvm/9/openmp/default.nix +++ b/pkgs/development/compilers/llvm/9/openmp/default.nix @@ -4,6 +4,7 @@ , fetch , cmake , llvm +, targetLlvm , perl , version }: @@ -15,7 +16,9 @@ stdenv.mkDerivation rec { src = fetch pname "1knafnpp0f7hylx8q20lkd6g1sf0flly572dayc5d5kghh7hd52w"; nativeBuildInputs = [ cmake perl ]; - buildInputs = [ llvm ]; + buildInputs = [ + (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + ]; meta = llvm_meta // { homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/git/bintools/default.nix b/pkgs/development/compilers/llvm/git/bintools/default.nix index 53f7941e3369..303faf7bbb61 100644 --- a/pkgs/development/compilers/llvm/git/bintools/default.nix +++ b/pkgs/development/compilers/llvm/git/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) @@ -15,15 +20,21 @@ in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' 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-ar $out/bin/${prefix}dlltool + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt + ln -s ${llvm}/bin/llvm-debuginfod $out/bin/${prefix}debuginfod + ln -s ${llvm}/bin/llvm-debuginfod-find $out/bin/${prefix}debuginfod-find 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-objcopy $out/bin/${prefix}strip 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-rc $out/bin/${prefix}windres + ln -s ${llvm}/bin/llvm-readobj $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 ${llvm}/bin/llvm-strings $out/bin/${prefix}strings + ln -s ${llvm}/bin/llvm-symbolizer $out/bin/${prefix}addr2line ln -s ${lld}/bin/lld $out/bin/${prefix}ld '' diff --git a/pkgs/development/compilers/llvm/git/clang/default.nix b/pkgs/development/compilers/llvm/git/clang/default.nix index 3df0e5042b8d..8f2663b7e896 100644 --- a/pkgs/development/compilers/llvm/git/clang/default.nix +++ b/pkgs/development/compilers/llvm/git/clang/default.nix @@ -81,6 +81,7 @@ let fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test + patchShebangs $python/bin mkdir -p $dev/bin cp bin/clang-tblgen $dev/bin @@ -105,6 +106,7 @@ let of tools that can be built using the Clang frontend as a library to parse C/C++ code. ''; + mainProgram = "clang"; }; } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index c5567d2f2e2a..ffbce74a4822 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -35,7 +35,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -113,7 +113,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -153,7 +153,7 @@ let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -166,7 +166,7 @@ let ] ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind" ++ lib.optional - (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) + (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) "-lunwind" ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; diff --git a/pkgs/development/compilers/llvm/git/libcxx/default.nix b/pkgs/development/compilers/llvm/git/libcxx/default.nix index 5e1f875bf338..a29edb0658d3 100644 --- a/pkgs/development/compilers/llvm/git/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxx/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, llvm_meta , monorepoSrc, runCommand , cmake, python3, fixDarwinDylibNames, version -, libcxxabi +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic # If headersOnly is true, the resulting package would only include the headers. @@ -16,6 +17,8 @@ let basename = "libcxx"; in +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; + stdenv.mkDerivation rec { pname = basename + lib.optionalString headersOnly "-headers"; inherit version; @@ -59,12 +62,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = lib.optionals (!headersOnly) [ libcxxabi ]; + buildInputs = lib.optionals (!headersOnly) [ cxxabi ]; cmakeFlags = [ "-DLLVM_ENABLE_RUNTIMES=libcxx" - "-DLIBCXX_CXX_ABI=${lib.optionalString (!headersOnly) "system-"}libcxxabi" - ] ++ lib.optional (!headersOnly) "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${libcxxabi.dev}/include/c++/v1" + "-DLIBCXX_CXX_ABI=${lib.optionalString (!headersOnly) "system-"}${cxxabi.pname}" + ] ++ lib.optional (!headersOnly && cxxabi.pname == "libcxxabi") "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi.dev}/include/c++/v1" ++ 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 [ @@ -76,8 +79,23 @@ stdenv.mkDerivation rec { buildFlags = lib.optional headersOnly "generate-cxx-headers"; installTargets = lib.optional headersOnly "install-cxx-headers"; + preInstall = lib.optionalString (stdenv.isDarwin && !headersOnly) '' + for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + + baseName=$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1)) + installName="$out/lib/$baseName" + abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') + + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file + done + done + ''; + passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index 42a811e131b8..3d5f875637fd 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -70,8 +70,10 @@ stdenv.mkDerivation rec { preInstall = lib.optionalString stdenv.isDarwin '' for file in lib/*.dylib; do + if [ -L "$file" ]; then continue; fi + # Fix up the install name. Preserve the basename, just replace the path. - installName="$out/lib/$(basename $(otool -D $file | tail -n 1))" + installName="$out/lib/$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))" # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables @@ -82,7 +84,7 @@ stdenv.mkDerivation rec { # cc-wrapper passes '-lc++abi' to all c++ link steps, but that causes # libcxxabi to sometimes link against a different version of itself. # Here we simply make that second reference point to ourselves. - for other in $(otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do + for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do ${stdenv.cc.targetPrefix}install_name_tool -change $other $installName $file done done @@ -93,6 +95,10 @@ stdenv.mkDerivation rec { install -m 644 ../../${pname}/include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index 656c226574a4..b4e2757f20ca 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; patches = [ ./gnu-install-dirs.patch diff --git a/pkgs/development/compilers/llvm/rocm/0000-fix-openmp.patch b/pkgs/development/compilers/llvm/rocm/0000-fix-openmp.patch new file mode 100644 index 000000000000..2811df7d29f7 --- /dev/null +++ b/pkgs/development/compilers/llvm/rocm/0000-fix-openmp.patch @@ -0,0 +1,18 @@ +diff --git a/libomptarget/plugins/amdgpu/impl/impl.cpp b/libomptarget/plugins/amdgpu/impl/impl.cpp +index 80e024789..3a14e0889 100644 +--- a/libomptarget/plugins/amdgpu/impl/impl.cpp ++++ b/libomptarget/plugins/amdgpu/impl/impl.cpp +@@ -21,10 +21,11 @@ bool is_locked(void *ptr, hsa_status_t *err_p, void **agentBaseAddress) { + info.size = sizeof(hsa_amd_pointer_info_t); + err = hsa_amd_pointer_info(ptr, &info, nullptr, nullptr, nullptr); + +- if (err != HSA_STATUS_SUCCESS) ++ if (err != HSA_STATUS_SUCCESS) { + DP("Error when getting pointer info\n"); +- else ++ } else { + is_locked = (info.type == HSA_EXT_POINTER_TYPE_LOCKED); ++ } + + if (is_locked && agentBaseAddress != nullptr) { + // When user passes in a basePtr+offset we need to fix the diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index cb2ed8a703db..75314a4b4633 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,54 +1,600 @@ -{ stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }: +{ lib +, stdenv +, callPackage +, overrideCC +, wrapCCWith +, wrapBintoolsWith +, runCommand +, lit +, glibc +, spirv-llvm-translator +, xz +, swig +, lua5_3 +, gtest +, hip +, rocm-comgr +, vulkan-loader +, vulkan-headers +, glslang +, shaderc +, perl +, rocm-device-libs +, rocm-runtime +, elfutils +, python3Packages +}: let - version = "5.3.1"; - src = fetchFromGitHub { - owner = "RadeonOpenCompute"; - repo = "llvm-project"; - rev = "rocm-${version}"; - hash = "sha256-IKo7N8wWvh5PBrZ2mh1Vu5s3uUXhanqYtC4qLV/+JBs="; + # Stage 1 + # Base + llvm = callPackage ./llvm.nix { }; + + # Projects + clang-unwrapped = callPackage ./llvm.nix rec { + targetName = "clang"; + targetDir = targetName; + extraBuildInputs = [ llvm ]; + + extraCMakeFlags = [ + "-DCMAKE_POLICY_DEFAULT_CMP0116=NEW" + "-DCLANG_INCLUDE_DOCS=ON" + "-DCLANG_INCLUDE_TESTS=ON" + ]; + + extraPostPatch = '' + # Looks like they forgot to add finding libedit to the standalone build + ln -s ../cmake/Modules/FindLibEdit.cmake cmake/modules + + substituteInPlace CMakeLists.txt \ + --replace "include(CheckIncludeFile)" "include(CheckIncludeFile)''\nfind_package(LibEdit)" + + # `No such file or directory: '/build/source/clang/tools/scan-build/bin/scan-build'` + rm test/Analysis/scan-build/*.test + rm test/Analysis/scan-build/rebuild_index/rebuild_index.test + + # `does not depend on a module exporting 'baz.h'` + rm test/Modules/header-attribs.cpp + + # `fatal error: 'stdio.h' file not found` + rm test/OpenMP/amdgcn_emit_llvm.c + ''; + + extraPostInstall = '' + mv bin/clang-tblgen $out/bin + ''; }; + + lld = callPackage ./llvm.nix rec { + buildMan = false; # No man pages to build + targetName = "lld"; + targetDir = targetName; + extraBuildInputs = [ llvm ]; + extraCMakeFlags = [ "-DCMAKE_POLICY_DEFAULT_CMP0116=NEW" ]; + checkTargets = [ "check-lld" ]; + }; + + # Runtimes + runtimes = callPackage ./llvm.nix { + buildDocs = false; + buildMan = false; + buildTests = false; + targetDir = "runtimes"; + + targetRuntimes = [ + # "libc" https://github.com/llvm/llvm-project/issues/57719 + "libunwind" + "libcxxabi" + "libcxx" + "compiler-rt" + ]; + + extraBuildInputs = [ llvm ]; + + extraCMakeFlags = [ + "-DCMAKE_POLICY_DEFAULT_CMP0114=NEW" + "-DLIBCXX_INCLUDE_BENCHMARKS=OFF" + "-DLIBCXX_CXX_ABI=libcxxabi" + ]; + + extraLicenses = [ lib.licenses.mit ]; + }; + + # Stage 2 + # Helpers + rStdenv = overrideCC stdenv (wrapCCWith rec { + inherit bintools; + libcxx = runtimes; + cc = clang-unwrapped; + + extraPackages = [ + llvm + lld + ]; + + nixSupport.cc-cflags = [ + "-resource-dir=$out/resource-root" + "-fuse-ld=lld" + "-rtlib=compiler-rt" + "-unwindlib=libunwind" + "-Wno-unused-command-line-argument" + ]; + + extraBuildCommands = '' + clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` + mkdir -p $out/resource-root + ln -s ${cc}/lib/clang/$clang_version/include $out/resource-root + ln -s ${runtimes}/lib $out/resource-root + ''; + }); + + bintools = wrapBintoolsWith { bintools = bintools-unwrapped; }; + + bintools-unwrapped = runCommand "rocm-llvm-binutils-${llvm.version}" { preferLocalBuild = true; } '' + mkdir -p $out/bin + + for prog in ${lld}/bin/*; do + ln -s $prog $out/bin/$(basename $prog) + done + + for prog in ${llvm}/bin/*; do + ln -sf $prog $out/bin/$(basename $prog) + done + + ln -s ${llvm}/bin/llvm-ar $out/bin/ar + ln -s ${llvm}/bin/llvm-as $out/bin/as + ln -s ${llvm}/bin/llvm-dwp $out/bin/dwp + ln -s ${llvm}/bin/llvm-nm $out/bin/nm + ln -s ${llvm}/bin/llvm-objcopy $out/bin/objcopy + ln -s ${llvm}/bin/llvm-objdump $out/bin/objdump + ln -s ${llvm}/bin/llvm-ranlib $out/bin/ranlib + ln -s ${llvm}/bin/llvm-readelf $out/bin/readelf + ln -s ${llvm}/bin/llvm-size $out/bin/size + ln -s ${llvm}/bin/llvm-strip $out/bin/strip + ln -s ${lld}/bin/lld $out/bin/ld + ''; in rec { + inherit + llvm + clang-unwrapped + lld + bintools + bintools-unwrapped; + + # Runtimes + libc = callPackage ./llvm.nix rec { + stdenv = rStdenv; + targetName = "libc"; + targetDir = "runtimes"; + targetRuntimes = [ targetName ]; + isBroken = true; # https://github.com/llvm/llvm-project/issues/57719 + }; + + libunwind = callPackage ./llvm.nix rec { + stdenv = rStdenv; + buildMan = false; # No man pages to build + targetName = "libunwind"; + targetDir = "runtimes"; + targetRuntimes = [ targetName ]; + + extraCMakeFlags = [ + "-DLIBUNWIND_INCLUDE_DOCS=ON" + "-DLIBUNWIND_INCLUDE_TESTS=ON" + "-DLIBUNWIND_USE_COMPILER_RT=ON" + ]; + }; + + libcxxabi = callPackage ./llvm.nix rec { + stdenv = rStdenv; + buildDocs = false; # No documentation to build + buildMan = false; # No man pages to build + targetName = "libcxxabi"; + targetDir = "runtimes"; + + targetRuntimes = [ + "libunwind" + targetName + "libcxx" + ]; + + extraCMakeFlags = [ + "-DLIBCXXABI_INCLUDE_TESTS=ON" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + "-DLIBCXXABI_USE_COMPILER_RT=ON" + + # Workaround having to build combined + "-DLIBUNWIND_INCLUDE_DOCS=OFF" + "-DLIBUNWIND_INCLUDE_TESTS=OFF" + "-DLIBUNWIND_USE_COMPILER_RT=ON" + "-DLIBUNWIND_INSTALL_LIBRARY=OFF" + "-DLIBUNWIND_INSTALL_HEADERS=OFF" + "-DLIBCXX_INCLUDE_DOCS=OFF" + "-DLIBCXX_INCLUDE_TESTS=OFF" + "-DLIBCXX_USE_COMPILER_RT=ON" + "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_INSTALL_LIBRARY=OFF" + "-DLIBCXX_INSTALL_HEADERS=OFF" + ]; + }; + + libcxx = callPackage ./llvm.nix rec { + stdenv = rStdenv; + buildMan = false; # No man pages to build + targetName = "libcxx"; + targetDir = "runtimes"; + + targetRuntimes = [ + "libunwind" + "libcxxabi" + targetName + ]; + + extraCMakeFlags = [ + "-DLIBCXX_INCLUDE_DOCS=ON" + "-DLIBCXX_INCLUDE_TESTS=ON" + "-DLIBCXX_USE_COMPILER_RT=ON" + "-DLIBCXX_CXX_ABI=libcxxabi" + + # Workaround having to build combined + "-DLIBUNWIND_INCLUDE_DOCS=OFF" + "-DLIBUNWIND_INCLUDE_TESTS=OFF" + "-DLIBUNWIND_USE_COMPILER_RT=ON" + "-DLIBUNWIND_INSTALL_LIBRARY=OFF" + "-DLIBUNWIND_INSTALL_HEADERS=OFF" + "-DLIBCXXABI_INCLUDE_TESTS=OFF" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + "-DLIBCXXABI_USE_COMPILER_RT=ON" + "-DLIBCXXABI_INSTALL_LIBRARY=OFF" + "-DLIBCXXABI_INSTALL_HEADERS=OFF" + ]; + + # Most of these can't find `bash` or `mkdir`, might just be hard-coded paths, or PATH is altered + extraPostPatch = '' + chmod +w -R ../libcxx/test/{libcxx,std} + rm -rf ../libcxx/test/libcxx/input.output/filesystems + rm ../libcxx/test/libcxx/selftest/remote-substitutions.sh.cpp + rm ../libcxx/test/std/input.output/file.streams/fstreams/filebuf.virtuals/pbackfail.pass.cpp + rm ../libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.buffer/pbackfail.pass.cpp + rm ../libcxx/test/std/utilities/optional/optional.object/optional.object.assign/emplace_initializer_list.pass.cpp + rm ../libcxx/test/std/utilities/optional/optional.object/optional.object.assign/nullopt_t.pass.cpp + rm -rf ../libcxx/test/std/utilities/optional/optional.object/optional.object.ctor + rm -rf ../libcxx/test/std/input.output/filesystems/{class.directory_entry,class.directory_iterator,class.rec.dir.itr,fs.op.funcs} + ''; + }; + + compiler-rt = callPackage ./llvm.nix rec { + stdenv = rStdenv; + buildDocs = false; # No documentation to build + buildMan = false; # No man pages to build + targetName = "compiler-rt"; + targetDir = "runtimes"; + + targetRuntimes = [ + "libunwind" + "libcxxabi" + "libcxx" + targetName + ]; + + extraCMakeFlags = [ + "-DCMAKE_POLICY_DEFAULT_CMP0114=NEW" + "-DCOMPILER_RT_INCLUDE_TESTS=ON" + "-DCOMPILER_RT_USE_LLVM_UNWINDER=ON" + "-DCOMPILER_RT_CXX_LIBRARY=libcxx" + "-DCOMPILER_RT_CAN_EXECUTE_TESTS=OFF" # We can't run most of these + + # Workaround having to build combined + "-DLIBUNWIND_INCLUDE_DOCS=OFF" + "-DLIBUNWIND_INCLUDE_TESTS=OFF" + "-DLIBUNWIND_USE_COMPILER_RT=ON" + "-DLIBUNWIND_INSTALL_LIBRARY=OFF" + "-DLIBUNWIND_INSTALL_HEADERS=OFF" + "-DLIBCXXABI_INCLUDE_TESTS=OFF" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + "-DLIBCXXABI_USE_COMPILER_RT=ON" + "-DLIBCXXABI_INSTALL_LIBRARY=OFF" + "-DLIBCXXABI_INSTALL_HEADERS=OFF" + "-DLIBCXX_INCLUDE_DOCS=OFF" + "-DLIBCXX_INCLUDE_TESTS=OFF" + "-DLIBCXX_USE_COMPILER_RT=ON" + "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_INSTALL_LIBRARY=OFF" + "-DLIBCXX_INSTALL_HEADERS=OFF" + ]; + + extraPostPatch = '' + # `No such file or directory: 'ldd'` + substituteInPlace ../compiler-rt/test/lit.common.cfg.py \ + --replace "'ldd'," "'${glibc.bin}/bin/ldd'," + + # We can run these + substituteInPlace ../compiler-rt/test/CMakeLists.txt \ + --replace "endfunction()" "endfunction()''\nadd_subdirectory(builtins)''\nadd_subdirectory(shadowcallstack)" + ''; + + extraLicenses = [ lib.licenses.mit ]; + }; + + # Stage 3 + # Helpers + rocmClangStdenv = overrideCC stdenv clang; + clang = wrapCCWith rec { - cc = llvm; + # inherit libc libcxx bintools; + inherit libcxx bintools; + + # We do this to avoid HIP pathing problems, and mimic a monolithic install + cc = stdenv.mkDerivation (finalAttrs: { + inherit (clang-unwrapped) pname version; + dontUnpack = true; + + installPhase = '' + runHook preInstall + + clang_version=`${clang-unwrapped}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` + mkdir -p $out/{bin,include/c++/v1,lib/{cmake,clang/$clang_version/{include,lib}},libexec,share} + + for path in ${llvm} ${clang-unwrapped} ${lld} ${libunwind} ${libcxxabi} ${libcxx} ${compiler-rt}; do + cp -as $path/* $out + chmod +w $out/{*,include/c++/v1,lib/{clang/$clang_version/include,cmake}} + rm -f $out/lib/libc++.so + done + + ln -s $out/lib/* $out/lib/clang/$clang_version/lib + ln -s $out/include/* $out/lib/clang/$clang_version/include + + runHook postInstall + ''; + + passthru.isClang = true; + }); + + extraPackages = [ + llvm + lld + libunwind + libcxxabi + compiler-rt + ]; + + nixSupport.cc-cflags = [ + "-resource-dir=$out/resource-root" + "-fuse-ld=lld" + "-rtlib=compiler-rt" + "-unwindlib=libunwind" + "-Wno-unused-command-line-argument" + ]; + extraBuildCommands = '' clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc" - ln -s "${cc}/lib/clang/$clang_version/lib" "$rsrc/lib" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - echo "--gcc-toolchain=${stdenv.cc.cc}" >> $out/nix-support/cc-cflags + mkdir -p $out/resource-root + ln -s ${cc}/lib/clang/$clang_version/{include,lib} $out/resource-root + + # Not sure why, but hardening seems to make things break rm $out/nix-support/add-hardening.sh touch $out/nix-support/add-hardening.sh - # GPU compilation uses builtin lld - substituteInPlace $out/bin/clang \ - --replace '-MM) dontLink=1 ;;' $'-MM | --cuda-device-only) dontLink=1 ;;\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;' - substituteInPlace $out/bin/clang++ \ - --replace '-MM) dontLink=1 ;;' $'-MM | --cuda-device-only) dontLink=1 ;;\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;' + + # GPU compilation uses builtin `lld` + substituteInPlace $out/bin/{clang,clang++} \ + --replace "-MM) dontLink=1 ;;" "-MM | --cuda-device-only) dontLink=1 ;;''\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;" ''; }; - clangNoCompilerRt = wrapCCWith rec { - cc = llvm; - extraBuildCommands = '' - clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - echo "--gcc-toolchain=${stdenv.cc.cc}" >> $out/nix-support/cc-cflags - rm $out/nix-support/add-hardening.sh - touch $out/nix-support/add-hardening.sh - # GPU compilation uses builtin lld - substituteInPlace $out/bin/clang \ - --replace '-MM) dontLink=1 ;;' $'-MM | --cuda-device-only) dontLink=1 ;;\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;' - substituteInPlace $out/bin/clang++ \ - --replace '-MM) dontLink=1 ;;' $'-MM | --cuda-device-only) dontLink=1 ;;\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;' + # Base + # Unfortunately, we cannot build `clang-tools-extra` separately. + clang-tools-extra = callPackage ./llvm.nix { + stdenv = rocmClangStdenv; + buildTests = false; # `invalid operands to binary expression ('std::basic_stringstream' and 'const llvm::StringRef')` + targetName = "clang-tools-extra"; + + targetProjects = [ + "clang" + "clang-tools-extra" + ]; + + extraBuildInputs = [ gtest ]; + + extraCMakeFlags = [ + "-DLLVM_INCLUDE_DOCS=OFF" + "-DLLVM_INCLUDE_TESTS=OFF" + "-DCLANG_INCLUDE_DOCS=OFF" + "-DCLANG_INCLUDE_TESTS=ON" + "-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON" + ]; + + extraPostInstall = '' + # Remove LLVM and Clang + for path in `find ${llvm} ${clang-unwrapped}`; do + if [ $path != ${llvm} ] && [ $path != ${clang-unwrapped} ]; then + rm -f $out''${path#${llvm}} $out''${path#${clang-unwrapped}} || true + fi + done + + # Cleanup empty directories + find $out -type d -empty -delete ''; }; - llvm = callPackage ./llvm.nix { - inherit src version; + # Projects + libclc = let + spirv = (spirv-llvm-translator.override { inherit llvm; }); + in callPackage ./llvm.nix rec { + stdenv = rocmClangStdenv; + buildDocs = false; # No documentation to build + buildMan = false; # No man pages to build + targetName = "libclc"; + targetDir = targetName; + extraBuildInputs = [ spirv ]; + + # `spirv-mesa3d` isn't compiling with LLVM 15.0.0, it does with LLVM 14.0.0 + # Try removing the `spirv-mesa3d` and `clspv` patches next update + # `clspv` tests fail, unresolved calls + extraPostPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "find_program( LLVM_CLANG clang PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \ + "find_program( LLVM_CLANG clang PATHS \"${clang}/bin\" NO_DEFAULT_PATH )" \ + --replace "find_program( LLVM_SPIRV llvm-spirv PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \ + "find_program( LLVM_SPIRV llvm-spirv PATHS \"${spirv}/bin\" NO_DEFAULT_PATH )" \ + --replace " spirv-mesa3d-" "" \ + --replace " spirv64-mesa3d-" "" \ + --replace "NOT \''${t} MATCHES" \ + "NOT \''${ARCH} STREQUAL \"clspv\" AND NOT \''${ARCH} STREQUAL \"clspv64\" AND NOT \''${t} MATCHES" + ''; + + checkTargets = [ ]; + }; + + lldb = callPackage ./llvm.nix rec { + stdenv = rocmClangStdenv; + buildTests = false; # ld.lld: error: unable to find library -lllvm_gtest_main + targetName = "lldb"; + targetDir = targetName; + extraNativeBuildInputs = [ python3Packages.sphinx-automodapi ]; + + extraBuildInputs = [ + xz + swig + lua5_3 + gtest + ]; + + extraCMakeFlags = [ + "-DLLVM_EXTERNAL_LIT=${lit}/bin/.lit-wrapped" + "-DLLDB_INCLUDE_TESTS=ON" + "-DLLDB_INCLUDE_UNITTESTS=ON" + ]; + }; + + mlir = callPackage ./llvm.nix rec { + stdenv = rocmClangStdenv; + buildDocs = false; # No decent way to hack this to work + buildMan = false; # No man pages to build + targetName = "mlir"; + targetDir = targetName; + extraNativeBuildInputs = [ hip ]; + + extraBuildInputs = [ + rocm-comgr + vulkan-headers + vulkan-loader + glslang + shaderc + ]; + + extraCMakeFlags = [ + "-DCMAKE_POLICY_DEFAULT_CMP0116=NEW" + "-DMLIR_INCLUDE_DOCS=ON" + "-DMLIR_INCLUDE_TESTS=ON" + "-DMLIR_ENABLE_ROCM_RUNNER=ON" + "-DMLIR_ENABLE_SPIRV_CPU_RUNNER=ON" + "-DMLIR_ENABLE_VULKAN_RUNNER=ON" + "-DROCM_TEST_CHIPSET=gfx000" # CPU runner + ]; + + extraPostPatch = '' + chmod +w ../llvm + mkdir -p ../llvm/build/bin + ln -s ${lit}/bin/lit ../llvm/build/bin/llvm-lit + + substituteInPlace test/CMakeLists.txt \ + --replace "FileCheck count not" "" \ + --replace "list(APPEND MLIR_TEST_DEPENDS mlir_rocm_runtime)" "" + + substituteInPlace lib/ExecutionEngine/CMakeLists.txt \ + --replace "return()" "" + + # Remove problematic tests + rm test/CAPI/execution_engine.c + rm test/Target/LLVMIR/llvmir-intrinsics.mlir + rm test/Target/LLVMIR/llvmir.mlir + rm test/Target/LLVMIR/openmp-llvm.mlir + rm test/mlir-cpu-runner/*.mlir + rm test/mlir-vulkan-runner/*.mlir + ''; + + extraPostInstall = '' + mkdir -p $out/bin + mv bin/mlir-tblgen $out/bin + ''; + + checkTargets = [ "check-${targetName}" ]; + }; + + polly = callPackage ./llvm.nix rec { + stdenv = rocmClangStdenv; + targetName = "polly"; + targetDir = targetName; + checkTargets = [ "check-${targetName}" ]; + }; + + flang = callPackage ./llvm.nix rec { + stdenv = rocmClangStdenv; + buildTests = false; # `Executable "flang1" doesn't exist!` + targetName = "flang"; + targetDir = targetName; + extraNativeBuildInputs = [ python3Packages.sphinx-markdown-tables ]; + extraBuildInputs = [ mlir ]; + + extraCMakeFlags = [ + "-DCMAKE_POLICY_DEFAULT_CMP0116=NEW" + "-DCLANG_DIR=${clang-unwrapped}/lib/cmake/clang" + "-DFLANG_INCLUDE_TESTS=OFF" + "-DMLIR_TABLEGEN_EXE=${mlir}/bin/mlir-tblgen" + ]; + + extraPostPatch = '' + substituteInPlace test/CMakeLists.txt \ + --replace "FileCheck" "" \ + --replace "count" "" \ + --replace "not" "" + + substituteInPlace docs/CMakeLists.txt \ + --replace "CLANG_TABLEGEN_EXE clang-tblgen" "CLANG_TABLEGEN_EXE ${clang-unwrapped}/bin/clang-tblgen" + ''; + }; + + openmp = callPackage ./llvm.nix rec { + stdenv = rocmClangStdenv; + buildTests = false; # Too many failures, most pass + targetName = "openmp"; + targetDir = targetName; + extraPatches = [ ./0000-fix-openmp.patch ]; + extraNativeBuildInputs = [ perl ]; + + extraBuildInputs = [ + rocm-device-libs + rocm-runtime + elfutils + ]; + + extraCMakeFlags = [ + "-DCMAKE_MODULE_PATH=/build/source/llvm/cmake/modules" # For docs + "-DCLANG_TOOL=${clang}/bin/clang" + "-DCLANG_OFFLOAD_BUNDLER_TOOL=${clang-unwrapped}/bin/clang-offload-bundler" + "-DOPENMP_LLVM_TOOLS_DIR=${llvm}/bin" + "-DOPENMP_LLVM_LIT_EXECUTABLE=${lit}/bin/.lit-wrapped" + "-DDEVICELIBS_ROOT=${rocm-device-libs.src}" + ]; + + extraPostPatch = '' + # We can't build this target at the moment + substituteInPlace libomptarget/DeviceRTL/CMakeLists.txt \ + --replace "gfx1010" "" + ''; + + checkTargets = [ "check-${targetName}" ]; + extraLicenses = [ lib.licenses.mit ]; + }; + + # Runtimes + pstl = callPackage ./llvm.nix rec { + stdenv = rocmClangStdenv; + buildDocs = false; # No documentation to build + buildMan = false; # No man pages to build + buildTests = false; # Too many errors + targetName = "pstl"; + targetDir = "runtimes"; + targetRuntimes = [ targetName ]; + checkTargets = [ "check-${targetName}" ]; }; } diff --git a/pkgs/development/compilers/llvm/rocm/install-symlinks.patch b/pkgs/development/compilers/llvm/rocm/install-symlinks.patch deleted file mode 100644 index 8d9bb83632db..000000000000 --- a/pkgs/development/compilers/llvm/rocm/install-symlinks.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/llvm/cmake/modules/LLVMInstallSymlink.cmake b/llvm/cmake/modules/LLVMInstallSymlink.cmake -index b5c35f706cb7..ac25e40b1436 100644 ---- a/cmake/modules/LLVMInstallSymlink.cmake -+++ b/cmake/modules/LLVMInstallSymlink.cmake -@@ -4,11 +4,16 @@ - - include(GNUInstallDirs) - -+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../../cmake/Modules" ${CMAKE_MODULE_PATH}) -+include(ExtendPath) -+ - function(install_symlink name target outdir) - set(DESTDIR $ENV{DESTDIR}) -- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}") -+ message(STATUS "Creating ${name} at ${bindir} (${CMAKE_MODULE_PATH})") -+ extend_path(prefixed_outdir "${CMAKE_INSTALL_PREFIX}" "${outdir}") -+ set(bindir "${DESTDIR}${prefixed_outdir}") - -- message(STATUS "Creating ${name}") -+ message(STATUS "Creating ${name} at ${bindir}") - - execute_process( - COMMAND "${CMAKE_COMMAND}" -E create_symlink "${target}" "${name}" diff --git a/pkgs/development/compilers/llvm/rocm/llvm.nix b/pkgs/development/compilers/llvm/rocm/llvm.nix index c5ad96a6a189..f014676a1809 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm.nix @@ -1,22 +1,44 @@ -{ stdenv -, lib -, fetchgit +{ lib +, stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript +, pkg-config , cmake , ninja -, python3 +, git +, doxygen +, sphinx +, lit , libxml2 -, libffi -, libbfd , libxcrypt -, ncurses +, libedit +, libffi +, mpfr , zlib -, debugVersion ? false -, enableManpages ? false - -, version -, src +, ncurses +, python3Packages +, buildDocs ? true +, buildMan ? true +, buildTests ? true +, targetName ? "llvm" +, targetDir ? "llvm" +, targetProjects ? [ ] +, targetRuntimes ? [ ] +, extraPatches ? [ ] +, extraNativeBuildInputs ? [ ] +, extraBuildInputs ? [ ] +, extraCMakeFlags ? [ ] +, extraPostPatch ? "" +, checkTargets ? [( + lib.optionalString buildTests ( + if targetDir == "runtimes" + then "check-runtimes" + else "check-all" + ) +)] +, extraPostInstall ? "" +, extraLicenses ? [ ] +, isBroken ? false }: let @@ -24,68 +46,120 @@ let if stdenv.isx86_64 then "X86" else if stdenv.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; -in stdenv.mkDerivation rec { - inherit src version; +in stdenv.mkDerivation (finalAttrs: { + pname = "rocm-llvm-${targetName}"; + version = "5.4.2"; - pname = "rocm-llvm"; + outputs = [ + "out" + ] ++ lib.optionals buildDocs [ + "doc" + ] ++ lib.optionals buildMan [ + "man" + "info" # Avoid `attribute 'info' missing` when using with wrapCC + ]; - sourceRoot = "${src.name}/llvm"; + patches = extraPatches; - nativeBuildInputs = [ cmake ninja python3 ]; + src = fetchFromGitHub { + owner = "RadeonOpenCompute"; + repo = "llvm-project"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-iyr3cstC8CB1YaACadNqBs/oI8lh4bJzK0WtEB0wZvg="; + }; - buildInputs = [ libxml2 libxcrypt ]; + nativeBuildInputs = [ + pkg-config + cmake + ninja + git + python3Packages.python + ] ++ lib.optionals (buildDocs || buildMan) [ + doxygen + sphinx + python3Packages.recommonmark + ] ++ lib.optionals (buildTests && !finalAttrs.passthru.isLLVM) [ + lit + ] ++ extraNativeBuildInputs; - propagatedBuildInputs = [ ncurses zlib ]; + buildInputs = [ + libxml2 + libxcrypt + libedit + libffi + mpfr + ] ++ extraBuildInputs; - cmakeFlags = with stdenv; [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc + propagatedBuildInputs = lib.optionals finalAttrs.passthru.isLLVM [ + zlib + ncurses + ]; + + sourceRoot = "${finalAttrs.src.name}/${targetDir}"; + + cmakeFlags = [ "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" - "-DLLVM_ENABLE_PROJECTS=clang;lld;compiler-rt" - ] - ++ lib.optionals enableManpages [ - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" + ] ++ lib.optionals (finalAttrs.passthru.isLLVM && targetProjects != [ ]) [ + "-DLLVM_ENABLE_PROJECTS=${lib.concatStringsSep ";" targetProjects}" + ] ++ lib.optionals ((finalAttrs.passthru.isLLVM || targetDir == "runtimes") && targetRuntimes != [ ]) [ + "-DLLVM_ENABLE_RUNTIMES=${lib.concatStringsSep ";" targetRuntimes}" + ] ++ lib.optionals (finalAttrs.passthru.isLLVM || finalAttrs.passthru.isClang) [ + "-DLLVM_ENABLE_RTTI=ON" + "-DLLVM_ENABLE_EH=ON" + ] ++ lib.optionals (buildDocs || buildMan) [ + "-DLLVM_INCLUDE_DOCS=ON" "-DLLVM_BUILD_DOCS=ON" + # "-DLLVM_ENABLE_DOXYGEN=ON" Way too slow, only uses one core "-DLLVM_ENABLE_SPHINX=ON" + "-DLLVM_ENABLE_OCAMLDOC=OFF" + "-DSPHINX_OUTPUT_HTML=ON" "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ]; + ] ++ lib.optionals buildTests [ + "-DLLVM_INCLUDE_TESTS=ON" + "-DLLVM_BUILD_TESTS=ON" + ] ++ lib.optionals (buildTests && !finalAttrs.passthru.isLLVM) [ + "-DLLVM_EXTERNAL_LIT=${lit}/bin/.lit-wrapped" + ] ++ extraCMakeFlags; - patches = [ - ./install-symlinks.patch - ]; - - postPatch = '' + postPatch = lib.optionalString finalAttrs.passthru.isLLVM '' patchShebangs lib/OffloadArch/make_generated_offload_arch_h.sh - substituteInPlace ../clang/cmake/modules/CMakeLists.txt \ - --replace 'FILES_MATCHING' 'NO_SOURCE_PERMISSIONS FILES_MATCHING' - ''; + '' + lib.optionalString (buildTests && finalAttrs.passthru.isLLVM) '' + # FileSystem permissions tests fail with various special bits + rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test + rm unittests/Support/Path.cpp - updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "Path.cpp" "" + '' + extraPostPatch; - version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/llvm-project/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - current_version="$(grep "version =" pkgs/development/compilers/llvm/rocm/default.nix | cut -d'"' -f2)" - if [[ "$version" != "$current_version" ]]; then - tarball_meta="$(nix-prefetch-github RadeonOpenCompute llvm-project --rev "rocm-$version")" - tarball_hash="$(nix to-base64 sha256-$(jq -r '.sha256' <<< "$tarball_meta"))" - sed -i "pkgs/development/compilers/llvm/rocm/default.nix" \ - -e 's,version = "\(.*\)",version = "'"$version"'",' \ - -e 's,hash = "\(.*\)",hash = "sha256-'"$tarball_hash"'",' - else - echo rocm-llvm already up-to-date - fi - ''; + doCheck = buildTests; + checkTarget = lib.concatStringsSep " " checkTargets; - passthru.isClang = true; + postInstall = lib.optionalString finalAttrs.passthru.isLLVM '' + # `lit` expects these for some test suites + mv bin/{FileCheck,not,count,yaml2obj,obj2yaml} $out/bin + '' + lib.optionalString buildMan '' + mkdir -p $info + '' + extraPostInstall; + + passthru = { + isLLVM = targetDir == "llvm"; + isClang = targetDir == "clang" || builtins.elem "clang" targetProjects; + + updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + }; meta = with lib; { description = "ROCm fork of the LLVM compiler infrastructure"; homepage = "https://github.com/RadeonOpenCompute/llvm-project"; - license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ acowley lovesegfault Flakebi ]; + license = with licenses; [ ncsa ] ++ extraLicenses; + maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; + broken = isBroken; }; -} +}) diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix index 4f2b081b4db2..903fdb54fee1 100644 --- a/pkgs/development/compilers/mezzo/default.nix +++ b/pkgs/development/compilers/mezzo/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation { sha256 = "0yck5r6di0935s3iy2mm9538jkf77ssr789qb06ms7sivd7g3ip6"; }; - buildInputs = [ ocaml findlib ocamlbuild yojson menhir menhirLib ulex pprint fix functory ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ yojson menhir menhirLib ulex pprint fix functory ]; # Sets warning 3 as non-fatal prePatch = lib.optionalString (check-ocaml-version "4.02") '' diff --git a/pkgs/development/compilers/minimacy/default.nix b/pkgs/development/compilers/minimacy/default.nix new file mode 100644 index 000000000000..0ad4fa0db83e --- /dev/null +++ b/pkgs/development/compilers/minimacy/default.nix @@ -0,0 +1,73 @@ +{ lib, stdenv, fetchFromGitHub, makeBinaryWrapper +, alsaLib, libX11, libXext, libGL, libGLU +}: + +stdenv.mkDerivation rec { + pname = "minimacy"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "ambermind"; + repo = pname; + rev = version; + sha256 = "i0Z1UKApX+elHmFgujwjiF7k6OmtFF37HJim464OMfU="; + }; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + buildInputs = [ libGL libGLU ] ++ lib.optionals stdenv.isLinux [ alsaLib libX11 libXext ]; + + enableParallelBuilding = true; + + NIX_CFLAGS_COMPILE = "-Wno-unused-result"; + + preBuild = '' + pushd ${if stdenv.isDarwin then "macos/cmdline" else "unix"} + ''; + + # TODO: build graphic version for darwin + buildFlags = (if stdenv.isDarwin then [ "nox" ] else [ "all" ]) ++ [ "CC=${stdenv.cc.targetPrefix}cc" ]; + + postBuild = '' + popd + ''; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + bin/${if stdenv.isDarwin then "minimacyMac" else "minimacy"} system/demo/demo.fun.mandelbrot.mcy + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/minimacy + cp -r {README.md,LICENSE,system,rom,topLevel.mcy} $out/lib/minimacy + install bin/minimacy* -Dt $out/bin + + runHook postInstall + ''; + + postFixup = '' + for prog in $out/bin/minimacy*; + do wrapProgram $prog \ + --set MINIMACY $out/lib/minimacy + done + ''; + + meta = { + description = "An open-source minimalist computing technology"; + longDescription = '' + Minimacy is an open-source minimalist computation system based on the principle "Less is more". + It is designed and programmed by Sylvain Huet. + ''; + maintainers = with lib.maintainers; [ jboy ]; + homepage = "https://minimacy.net"; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 75b3d1128e45..5a96242da7b1 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -1,6 +1,17 @@ -{ fetchurl, lib, stdenv, makeWrapper, gnum4, texinfo, texLive, automake, - autoconf, libtool, ghostscript, ncurses, - enableX11 ? false, xlibsWrapper }: +{ fetchurl +, lib +, stdenv +, makeWrapper +, gnum4 +, texinfo +, texLive +, automake +, autoconf +, libtool +, ghostscript +, ncurses +, enableX11 ? false, libX11 +}: let version = "11.2"; @@ -29,7 +40,7 @@ stdenv.mkDerivation { sha256 = "17822hs9y07vcviv2af17p3va7qh79dird49nj50bwi9rz64ia3w"; }; - buildInputs = [ ncurses ] ++ lib.optional enableX11 xlibsWrapper; + buildInputs = [ ncurses ] ++ lib.optionals enableX11 [ libX11 ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 8336f76b5253..ddd77509c766 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, bison, pkg-config, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python3, version, sha256, autoconf, libtool, automake, cmake, which +{ lib, stdenv, fetchurl, bison, pkg-config, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib +, withLLVM ? false, cacert, Foundation, libobjc, python3, version, sha256, autoconf, libtool, automake, cmake, which , gnumake42 , enableParallelBuilding ? true , srcArchiveSuffix ? "tar.bz2" @@ -6,7 +7,7 @@ }: let - llvm = callPackage ./llvm.nix { }; + llvm = callPackage ./llvm.nix { }; in stdenv.mkDerivation rec { pname = "mono"; @@ -18,23 +19,21 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ automake bison cmake pkg-config which gnumake42 ]; - buildInputs = - [ glib gettext perl libgdiplus libX11 ncurses zlib python3 autoconf libtool - ] - ++ (lib.optionals stdenv.isDarwin [ Foundation libobjc ]); + buildInputs = [ + glib gettext perl libgdiplus libX11 ncurses zlib python3 autoconf libtool + ] ++ lib.optionals stdenv.isDarwin [ Foundation libobjc ]; configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" "--with-libgdiplus=${libgdiplus}/lib/libgdiplus.so" - ] - ++ lib.optionals withLLVM [ + ] ++ lib.optionals withLLVM [ "--enable-llvm" "--with-llvm=${llvm}" ]; configurePhase = '' - patchShebangs ./ + patchShebangs autogen.sh mcs/build/start-compiler-server.sh ./autogen.sh --prefix $out $configureFlags ''; diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix index 2ac3a1ea22d7..b901e7c34891 100644 --- a/pkgs/development/compilers/mozart/default.nix +++ b/pkgs/development/compilers/mozart/default.nix @@ -81,10 +81,10 @@ in stdenv.mkDerivation rec { tk ]; - meta = { + meta = with lib; { description = "An open source implementation of Oz 3"; - maintainers = [ lib.maintainers.layus ]; - license = lib.licenses.bsd2; + maintainers = with maintainers; [ layus h7x4 ]; + license = licenses.bsd2; homepage = "https://mozart.github.io"; }; diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index ce053e87130f..b9f0e856f65c 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nasm"; - version = "2.15.05"; + version = "2.16.01"; src = fetchurl { url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${pname}-${version}.tar.xz"; - sha256 = "0gqand86b0r86k3h46dh560lykxmxqqywz5m55kgjfq7q4lngbrw"; + sha256 = "sha256-x3dF9IAjde/u4uxcCta38DfqnIfJKxSaljf/CZ8WJVg="; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 96bf06e41ea0..40e39d411d69 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, boehmgc, zlib, sqlite, pcre, cmake, pkg-config -, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs +, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls_2, openssl, pkgs, gtk2, libpthreadstubs }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config git ]; buildInputs = [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil - libmysqlclient mbedtls openssl libpthreadstubs ] + libmysqlclient mbedtls_2 openssl libpthreadstubs ] ++ lib.optional stdenv.isLinux gtk2 ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security pkgs.darwin.apple_sdk.frameworks.Carbon]; diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index bbecfff831f9..260c3fb9a4c1 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -14,14 +14,14 @@ let in stdenv.mkDerivation rec { pname = "nextpnr"; - version = "0.4"; + version = "0.5"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; rev = "${pname}-${version}"; - hash = "sha256-gnNUFSV+/SzCuP43KyUUgVNdAzjOM7lOLNJT72L8lTY="; + hash = "sha256-3/a6nVr2v9kK/FFmxZq9LQLAoE/yNRcTGojiFPGRkHU="; name = "nextpnr"; }) (fetchFromGitHub { diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 7673bb2279be..bdd8022e69de 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -71,16 +71,27 @@ let nimHost = parsePlatform stdenv.hostPlatform; nimTarget = parsePlatform stdenv.targetPlatform; + + bootstrapCompiler = stdenv.mkDerivation { + pname = "nim-bootstrap"; + inherit (nim-unwrapped) version src preBuild; + enableParallelBuilding = true; + installPhase = '' + runHook preInstall + install -Dt $out/bin bin/nim + runHook postInstall + ''; + }; in { nim-unwrapped = stdenv.mkDerivation rec { pname = "nim-unwrapped"; - version = "1.6.8"; + version = "1.6.10"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - hash = "sha256-D1tlzbYPeK9BywdcI4mDaJoeH34lyBnxeYYsGKSEz1c="; + hash = "sha256-E9dwL4tXCHur6M0FHBO8VqMXFBi6hntJxrvQmynST+o="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ]; @@ -95,6 +106,7 @@ in { configurePhase = '' runHook preConfigure + cp ${bootstrapCompiler}/bin/nim bin/ echo 'define:nixbuild' >> config/nim.cfg runHook postConfigure ''; @@ -106,13 +118,14 @@ in { "-d:useGnuReadline" ] ++ lib.optional (stdenv.isDarwin || stdenv.isLinux) "-d:nativeStacktrace"; + preBuild = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + substituteInPlace makefile \ + --replace "aarch64" "arm64" + ''; + buildPhase = '' runHook preBuild local HOME=$TMPDIR - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - sed -i "s/aarch64/arm64/g" makefile - '' + '' - make -j$NIX_BUILD_CORES ./bin/nim c --parallelBuild:$NIX_BUILD_CORES koch ./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES ./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES @@ -249,7 +262,7 @@ in { runHook postBuild ''; - wrapperArgs = [ + wrapperArgs = lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ "--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${ placeholder "out" }/bin" diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix index af895131dec9..3e13b9247fb9 100644 --- a/pkgs/development/compilers/obliv-c/default.nix +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -1,8 +1,11 @@ { lib, stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }: stdenv.mkDerivation rec { pname = "obliv-c"; + version = "0.0pre20210621"; - buildInputs = [ perl ] + + strictDeps = true; + nativeBuildInputs = [ perl ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]); propagatedBuildInputs = [ libgcrypt ]; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 2033cbc32d23..c25da7346dd1 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, ncurses, xlibsWrapper }: +{ lib, stdenv, fetchurl, fetchpatch, ncurses, libX11 }: let useX11 = !stdenv.isAarch32 && !stdenv.isMips; @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fcommon"; prefixKey = "-prefix "; - configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; + configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" libX11 ]; buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; - buildInputs = [ ncurses ] ++ optional useX11 xlibsWrapper; + buildInputs = [ ncurses ] ++ optionals useX11 [ libX11 ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; preConfigure = '' CAT=$(type -tp cat) diff --git a/pkgs/development/compilers/ocaml/4.02.nix b/pkgs/development/compilers/ocaml/4.02.nix index 42b9e21108d8..59836955f441 100644 --- a/pkgs/development/compilers/ocaml/4.02.nix +++ b/pkgs/development/compilers/ocaml/4.02.nix @@ -8,6 +8,9 @@ import ./generic.nix { # Compatibility with Glibc 2.34 { url = "https://github.com/ocaml/ocaml/commit/9de2b77472aee18a94b41cff70caee27fb901225.patch"; sha256 = "sha256:12sw512kpwk0xf2g6j0h5vqgd8xcmgrvgyilx6fxbd6bnfv1yib9"; } + # Compatibility with Binutils 2.29 + { url = "https://github.com/ocaml/ocaml/commit/bcc7a767279ff70518b3f4219cc0b9bffec7dd43.patch"; + sha256 = "sha256-z3xrqN6bh/EW9dkPg6Hz8mT79DFm26yGRoPbE+RMYi0="; } ]; sha256 = "1qwwvy8nzd87hk8rd9sm667nppakiapnx4ypdwcrlnav2dz6kil3"; diff --git a/pkgs/development/compilers/ocaml/4.03.nix b/pkgs/development/compilers/ocaml/4.03.nix index ea0a23502fed..8c561c553295 100644 --- a/pkgs/development/compilers/ocaml/4.03.nix +++ b/pkgs/development/compilers/ocaml/4.03.nix @@ -8,6 +8,9 @@ import ./generic.nix { # Compatibility with Glibc 2.34 { url = "https://github.com/ocaml/ocaml/commit/a8b2cc3b40f5269ce8525164ec2a63b35722b22b.patch"; sha256 = "sha256:1rrknmrk86xrj2k3hznnjk1gwnliyqh125zabg1hvy6dlvml9b0x"; } + # Compatibility with Binutils 2.29 + { url = "https://github.com/ocaml/ocaml/commit/c204f07bfb20174f9e1c9ff586fb7b2f42b8bf18.patch"; + sha256 = "sha256-AAXyMZ7ujO67SGz+tGXKZkVcINAwvccHlFHmKnUt848="; } ]; # Workaround build failure on -fno-common toolchains like upstream diff --git a/pkgs/development/compilers/ocaml/4.04.nix b/pkgs/development/compilers/ocaml/4.04.nix index 6d92ba187706..9651650d0d69 100644 --- a/pkgs/development/compilers/ocaml/4.04.nix +++ b/pkgs/development/compilers/ocaml/4.04.nix @@ -11,6 +11,9 @@ import ./generic.nix { # Compatibility with Glibc 2.34 { url = "https://github.com/ocaml/ocaml/commit/6bcff7e6ce1a43e088469278eb3a9341e6a2ca5b.patch"; sha256 = "sha256:1hd45f7mwwrrym2y4dbcwklpv0g94avbz7qrn81l7w8mrrj3bngi"; } + # Compatibility with Binutils 2.29 + { url = "https://github.com/ocaml/ocaml/commit/db11f141a0e35c7fbaec419a33c4c39d199e2635.patch"; + sha256 = "sha256-oIwmbXOCzDGyASpbQ7hd7SCs4YHjd9hBBksJ74V3GiY="; } ]; # Workaround build failure on -fno-common toolchains like upstream diff --git a/pkgs/development/compilers/ocaml/4.05.nix b/pkgs/development/compilers/ocaml/4.05.nix index 332aa7399009..aabd1b2f69a5 100644 --- a/pkgs/development/compilers/ocaml/4.05.nix +++ b/pkgs/development/compilers/ocaml/4.05.nix @@ -11,6 +11,9 @@ import ./generic.nix { # Compatibility with Glibc 2.34 { url = "https://github.com/ocaml/ocaml/commit/50c2d1275e537906ea144bd557fde31e0bf16e5f.patch"; sha256 = "sha256:0ck9b2dpgg5k2p9ndbgniql24h35pn1bbpxjvk69j715lswzy4mh"; } + # Compatibility with Binutils 2.29 + { url = "https://github.com/ocaml/ocaml/commit/b00000c6679804731692362b0baac27fa3fddfd5.patch"; + sha256 = "sha256-CuEXGK3EsOevyUrc9TmSZo9DVBwjunQX7mKnDVHFpkY="; } ]; # Workaround build failure on -fno-common toolchains like upstream diff --git a/pkgs/development/compilers/ocaml/5.0.nix b/pkgs/development/compilers/ocaml/5.0.nix index a36b3e31a427..390bb151b715 100644 --- a/pkgs/development/compilers/ocaml/5.0.nix +++ b/pkgs/development/compilers/ocaml/5.0.nix @@ -1,9 +1,6 @@ import ./generic.nix { major_version = "5"; minor_version = "0"; - patch_version = "0-beta1"; - src = fetchTarball { - url = "https://caml.inria.fr/pub/distrib/ocaml-5.0/ocaml-5.0.0~beta1.tar.xz"; - sha256 = "sha256:1kwb53ra5qbwiiyrx5da7l5mqkjf0fr3rqgkrm3wr83l25scimj4"; - }; + patch_version = "0"; + sha256 = "sha256-yxfwpTTdSz/sk9ARsL4bpcYIfaAzz3iehaNLlkHsxl8="; } diff --git a/pkgs/development/compilers/ocaml/builder.sh b/pkgs/development/compilers/ocaml/builder.sh index a1807682d867..88acc0654cf2 100644 --- a/pkgs/development/compilers/ocaml/builder.sh +++ b/pkgs/development/compilers/ocaml/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup configureFlags="-prefix $out $configureFlags" diff --git a/pkgs/development/compilers/ocaml/configure-3.08.0 b/pkgs/development/compilers/ocaml/configure-3.08.0 deleted file mode 100755 index 9c8705855120..000000000000 --- a/pkgs/development/compilers/ocaml/configure-3.08.0 +++ /dev/null @@ -1,1482 +0,0 @@ -#! /bin/sh - -######################################################################### -# # -# Objective Caml # -# # -# Xavier Leroy, projet Cristal, INRIA Rocquencourt # -# # -# Copyright 1999 Institut National de Recherche en Informatique et # -# en Automatique. All rights reserved. This file is distributed # -# under the terms of the GNU Library General Public License, with # -# the special exception on linking described in file LICENSE. # -# # -######################################################################### - -# $Id: configure,v 1.215.2.3 2004/07/09 15:08:51 doligez Exp $ - -configure_options="$*" -prefix=/usr/local -bindir='' -libdir='' -mandir='' -manext=1 -host_type=unknown -ccoption='' -cclibs='' -curseslibs='' -mathlib='-lm' -dllib='' -x11_include_dir='' -x11_lib_dir='' -tk_wanted=yes -pthread_wanted=yes -tk_defs='' -tk_libs='' -tk_x11=yes -dl_defs='' -verbose=no -withcurses=yes -withsharedlibs=yes -binutils_dir='' -gcc_warnings="-Wall" - -# Try to turn internationalization off, can cause config.guess to malfunction! -unset LANG -unset LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME - -# Turn off some macOS debugging stuff, same reason -unset RC_TRACE_ARCHIVES RC_TRACE_DYLIBS RC_TRACE_PREBINDING_DISABLED - -# Parse command-line arguments - -while : ; do - case "$1" in - "") break;; - -prefix|--prefix) - prefix=$2; shift;; - -bindir|--bindir) - bindir=$2; shift;; - -libdir|--libdir) - libdir=$2; shift;; - -mandir|--mandir) - case "$2" in - */man[1-9ln]) - mandir=`echo $2 | sed -e 's|^\(.*\)/man.$|\1|'` - manext=`echo $2 | sed -e 's/^.*\(.\)$/\1/'`;; - *) - mandir=$2 - manext=1;; - esac - shift;; - -host*|--host*) - host_type=$2; shift;; - -cc*) - ccoption="$2"; shift;; - -lib*) - cclibs="$2 $cclibs"; shift;; - -no-curses) - withcurses=no;; - -no-shared-libs) - withsharedlibs=no;; - -x11include*|--x11include*) - x11_include_dir=$2; shift;; - -x11lib*|--x11lib*) - x11_lib_dir=$2; shift;; - -with-pthread*|--with-pthread*) - ;; # Ignored for backward compatibility - -no-pthread*|--no-pthread*) - pthread_wanted=no;; - -no-tk|--no-tk) - tk_wanted=no;; - -tkdefs*|--tkdefs*) - tk_defs=$2; shift;; - -tklibs*|--tklibs*) - tk_libs=$2; shift;; - -tk-no-x11|--tk-no-x11) - tk_x11=no;; - -dldefs*|--dldefs*) - dl_defs="$2"; shift;; - -dllibs*|--dllibs*) - dllib="$2"; shift;; - -binutils*|--binutils*) - binutils_dir=$2; shift;; - -verbose|--verbose) - verbose=yes;; - *) echo "Unknown option \"$1\"." 1>&2; exit 2;; - esac - shift -done - -# Sanity checks - -case "$prefix" in - /*) ;; - *) echo "The -prefix directory must be absolute." 1>&2; exit 2;; -esac -case "$bindir" in - /*) ;; - "") ;; - *) echo "The -bindir directory must be absolute." 1>&2; exit 2;; -esac -case "$libdir" in - /*) ;; - "") ;; - *) echo "The -libdir directory must be absolute." 1>&2; exit 2;; -esac -case "$mandir" in - /*) ;; - "") ;; - *) echo "The -mandir directory must be absolute." 1>&2; exit 2;; -esac - -# Generate the files - -cd config/auto-aux -rm -f s.h m.h Makefile -touch s.h m.h Makefile - -# Write options to Makefile - -echo "# generated by ./configure $configure_options" >> Makefile - -# Where to install - -echo "PREFIX=$prefix" >> Makefile -case "$bindir" in - "") echo 'BINDIR=$(PREFIX)/bin' >> Makefile - bindir="$prefix/bin";; - *) echo "BINDIR=$bindir" >> Makefile;; -esac -case "$libdir" in - "") echo 'LIBDIR=$(PREFIX)/lib/ocaml' >> Makefile - libdir="$prefix/lib/ocaml";; - *) echo "LIBDIR=$libdir" >> Makefile;; -esac -echo 'STUBLIBDIR=$(LIBDIR)/stublibs' >> Makefile -case "$mandir" in - "") echo 'MANDIR=$(PREFIX)/man' >> Makefile - mandir="$prefix/man";; - *) echo "MANDIR=$mandir" >> Makefile;; -esac -echo "MANEXT=$manext" >> Makefile - -# Determine the system type - -if test "$host_type" = "unknown"; then - if host_type=`../gnu/config.guess`; then :; else - echo "Cannot guess host type" - echo "You must specify one with the -host option" - exit 2 - fi -fi -if host=`../gnu/config.sub $host_type`; then :; else - echo "Please specify the correct host type with the -host option" - exit 2 -fi -echo "Configuring for a $host ..." - -# Do we have gcc? - -if test -z "$ccoption"; then - if sh ./searchpath gcc; then - echo "gcc found" - cc=gcc - else - cc=cc - fi -else - cc="$ccoption" -fi - -# Check for buggy versions of GCC - -buggycc="no" - -case "$host,$cc" in - i[3456]86-*-*,gcc*) - case `$cc --version` in - 2.7.2.1) cat <<'EOF' - -WARNING: you are using gcc version 2.7.2.1 on an Intel x86 processor. -This version of gcc is known to generate incorrect code for the -Objective Caml runtime system on some Intel x86 machines. (The symptom -is a crash of boot/ocamlc when compiling stdlib/pervasives.mli.) -In particular, the version of gcc 2.7.2.1 that comes with -Linux RedHat 4.x / Intel is affected by this problem. -Other Linux distributions might also be affected. -If you are using one of these configurations, you are strongly advised -to use another version of gcc, such as 2.95, which are -known to work well with Objective Caml. - -Press to proceed or to stop. -EOF - read reply;; - 2.96*) cat <<'EOF' - -WARNING: you are using gcc version 2.96 on an Intel x86 processor. -Certain patched versions of gcc 2.96 are known to generate incorrect -code for the Objective Caml runtime system. (The symptom is a segmentation -violation on boot/ocamlc.) Those incorrectly patched versions can be found -in RedHat 7.2 and Mandrake 8.0 and 8.1; other Linux distributions -might also be affected. (See bug #57760 on bugzilla.redhat.com) - -Auto-configuration will now select gcc compiler flags that work around -the problem. Still, if you observe segmentation faults while running -ocamlc or ocamlopt, you are advised to try another version of gcc, -such as 2.95.3 or 3.2. - -EOF - buggycc="gcc.2.96";; - - esac;; -esac - -# Configure the bytecode compiler - -bytecc="$cc" -bytecccompopts="" -bytecclinkopts="" -ostype="Unix" -exe="" - -case "$bytecc,$host" in - cc,*-*-nextstep*) - # GNU C extensions disabled, but __GNUC__ still defined! - bytecccompopts="-fno-defer-pop $gcc_warnings -U__GNUC__ -posix" - bytecclinkopts="-posix";; - *,*-*-rhapsody*) - # Almost the same as NeXTStep - bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC" - mathlib="";; - *,*-*-darwin*) - # Almost the same as rhapsody - bytecccompopts="-fno-defer-pop -no-cpp-precomp $gcc_warnings" - mathlib="";; - *,*-*-beos*) - bytecccompopts="-fno-defer-pop $gcc_warnings" - # No -lm library - mathlib="";; - gcc,alpha*-*-osf*) - bytecccompopts="-fno-defer-pop $gcc_warnings" - if cc="$bytecc" sh ./hasgot -mieee; then - bytecccompopts="-mieee $bytecccompopts"; - fi - # Put code and static data in lower 4GB - bytecclinkopts="-Wl,-T,12000000 -Wl,-D,14000000" - # Tell gcc that we can use 32-bit code addresses for threaded code - echo "#define ARCH_CODE32" >> m.h;; - cc,alpha*-*-osf*) - bytecccompopts="-std1 -ieee";; - gcc,alpha*-*-linux*) - if cc="$bytecc" sh ./hasgot -mieee; then - bytecccompopts="-mieee $bytecccompopts"; - fi;; - cc,mips-*-irix6*) - # Add -n32 flag to ensure compatibility with native-code compiler - bytecccompopts="-n32" - # Turn off warning "unused library" - bytecclinkopts="-n32 -Wl,-woff,84";; - cc*,mips-*-irix6*) - # (For those who want to force "cc -64") - # Turn off warning "unused library" - bytecclinkopts="-Wl,-woff,84";; - *,alpha*-*-unicos*) - # For the Cray T3E - bytecccompopts="-DUMK";; - gcc*,powerpc-*-aix4.3*) - # Avoid name-space pollution by requiring Unix98-conformant includes - bytecccompopts="-fno-defer-pop $gcc_warnings -D_XOPEN_SOURCE=500";; - *,powerpc-*-aix4.3*) - bytecccompopts="-D_XOPEN_SOURCE=500";; - gcc*,*-*-cygwin*) - bytecccompopts="-fno-defer-pop $gcc_warnings -U_WIN32" - exe=".exe" - ostype="Cygwin";; - gcc*,x86_64-*-linux*) - bytecccompopts="-fno-defer-pop $gcc_warnings" - # Tell gcc that we can use 32-bit code addresses for threaded code - echo "#define ARCH_CODE32" >> m.h;; - gcc*) - bytecccompopts="-fno-defer-pop $gcc_warnings";; -esac - -# Configure compiler to use in further tests - -cc="$bytecc -O $bytecclinkopts" -export cc cclibs verbose - -# Check C compiler - -sh ./runtest ansi.c -case $? in - 0) echo "The C compiler is ANSI-compliant.";; - 1) echo "The C compiler $cc is not ANSI-compliant." - echo "You need an ANSI C compiler to build Objective Caml." - exit 2;; - *) echo "Unable to compile the test program." - echo "Make sure the C compiler $cc is properly installed." - exit 2;; -esac - -# Check the sizes of data types - -echo "Checking the sizes of integers and pointers..." -set `sh ./runtest sizes.c` -case "$2,$3" in - 4,4) echo "OK, this is a regular 32 bit architecture." - echo "#undef ARCH_SIXTYFOUR" >> m.h;; - 8,8) echo "Wow! A 64 bit architecture!" - echo "#define ARCH_SIXTYFOUR" >> m.h;; - *,8) echo "Wow! A 64 bit architecture!" - echo "Unfortunately, Objective Caml cannot work in the case" - echo "sizeof(long) != sizeof(long *)." - echo "Objective Caml won't run on this architecture." - exit 2;; - *,*) echo "This architecture seems to be neither 32 bits nor 64 bits." - echo "Objective Caml won't run on this architecture." - exit 2;; - *) echo "Unable to compile the test program." - echo "Make sure the C compiler $cc is properly installed." - exit 2;; -esac -if test $1 != 4 && test $2 != 4 && test $4 != 4; then - echo "Sorry, we can't find a 32-bit integer type" - echo "(sizeof(short) = $4, sizeof(int) = $1, sizeof(long) = $2)" - echo "Objective Caml won't run on this architecture." - exit 2 -fi - -echo "#define SIZEOF_INT $1" >> m.h -echo "#define SIZEOF_LONG $2" >> m.h -echo "#define SIZEOF_SHORT $4" >> m.h - -if test $2 = 8; then - echo "#define ARCH_INT64_TYPE long" >> m.h - echo "#define ARCH_UINT64_TYPE unsigned long" >> m.h - echo '#define ARCH_INT64_PRINTF_FORMAT "l"' >> m.h - int64_native=true -else - sh ./runtest longlong.c - case $? in - 0) echo "64-bit \"long long\" integer type found (printf with \"%ll\")." - echo "#define ARCH_INT64_TYPE long long" >> m.h - echo "#define ARCH_UINT64_TYPE unsigned long long" >> m.h - echo '#define ARCH_INT64_PRINTF_FORMAT "ll"' >> m.h - int64_native=true;; - 1) echo "64-bit \"long long\" integer type found (printf with \"%q\")." - echo "#define ARCH_INT64_TYPE long long" >> m.h - echo "#define ARCH_UINT64_TYPE unsigned long long" >> m.h - echo '#define ARCH_INT64_PRINTF_FORMAT "q"' >> m.h - int64_native=true;; - 2) echo "64-bit \"long long\" integer type found (but no printf)." - echo "#define ARCH_INT64_TYPE long long" >> m.h - echo "#define ARCH_UINT64_TYPE unsigned long long" >> m.h - echo '#undef ARCH_INT64_PRINTF_FORMAT' >> m.h - int64_native=true;; - *) echo "No suitable 64-bit integer type found, will use software emulation." - echo "#undef ARCH_INT64_TYPE" >> m.h - echo "#undef ARCH_UINT64_TYPE" >> m.h - echo '#undef ARCH_INT64_PRINTF_FORMAT' >> m.h - int64_native=false;; - esac -fi - -# Determine endianness - -sh ./runtest endian.c -case $? in - 0) echo "This is a big-endian architecture." - echo "#define ARCH_BIG_ENDIAN" >> m.h;; - 1) echo "This is a little-endian architecture." - echo "#undef ARCH_BIG_ENDIAN" >> m.h;; - 2) echo "This architecture seems to be neither big endian nor little endian." - echo "Objective Caml won't run on this architecture." - exit 2;; - *) echo "Something went wrong during endianness determination." - echo "You'll have to figure out endianness yourself" - echo "(option ARCH_BIG_ENDIAN in m.h).";; -esac - -# Determine alignment constraints - -case "$host" in - sparc-*-*|hppa*-*-*) - # On Sparc V9 with certain versions of gcc, determination of double - # alignment is not reliable (PR#1521), hence force it. - # Same goes for hppa. - # But there's a knack (PR#2572): - # if we're in 64-bit mode (sizeof(long) == 8), - # we must not doubleword-align floats... - if test $2 = 8; then - echo "Doubles can be word-aligned." - echo "#undef ARCH_ALIGN_DOUBLE" >> m.h - else - echo "Doubles must be doubleword-aligned." - echo "#define ARCH_ALIGN_DOUBLE" >> m.h - fi;; - *) - sh ./runtest dblalign.c - case $? in - 0) echo "Doubles can be word-aligned." - echo "#undef ARCH_ALIGN_DOUBLE" >> m.h;; - 1) echo "Doubles must be doubleword-aligned." - echo "#define ARCH_ALIGN_DOUBLE" >> m.h;; - *) echo "Something went wrong during alignment determination for doubles." - echo "I'm going to assume this architecture has alignment constraints over doubles." - echo "That's a safe bet: Objective Caml will work even if" - echo "this architecture has actually no alignment constraints." - echo "#define ARCH_ALIGN_DOUBLE" >> m.h;; - esac;; -esac - -if $int64_native; then - case "$host" in - hppa*-*-*) - if test $2 = 8; then - echo "64-bit integers can be word-aligned." - echo "#undef ARCH_ALIGN_INT64" >> m.h - else - echo "64-bit integers must be doubleword-aligned." - echo "#define ARCH_ALIGN_INT64" >> m.h - fi;; - *) - sh ./runtest int64align.c - case $? in - 0) echo "64-bit integers can be word-aligned." - echo "#undef ARCH_ALIGN_INT64" >> m.h;; - 1) echo "64-bit integers must be doubleword-aligned." - echo "#define ARCH_ALIGN_INT64" >> m.h;; - *) echo "Something went wrong during alignment determination for 64-bit integers." - echo "I'm going to assume this architecture has alignment constraints." - echo "That's a safe bet: Objective Caml will work even if" - echo "this architecture has actually no alignment constraints." - echo "#define ARCH_ALIGN_INT64" >> m.h;; - esac - esac -else - echo "#undef ARCH_ALIGN_INT64" >> m.h -fi - -# Check semantics of division and modulus - -sh ./runtest divmod.c -case $? in - 0) echo "Native division and modulus have round-towards-zero semantics, will use them." - echo "#undef NONSTANDARD_DIV_MOD" >> m.h;; - 1) echo "Native division and modulus do not have round-towards-zero semantics, will use software emulation." - echo "#define NONSTANDARD_DIV_MOD" >> m.h;; - *) echo "Something went wrong while checking native division and modulus, please report it." - echo "#define NONSTANDARD_DIV_MOD" >> m.h;; -esac - -# Shared library support - -shared_libraries_supported=false -dl_needs_underscore=false -sharedcccompopts='' -mksharedlib='' -byteccrpath='' -mksharedlibrpath='' - -if test $withsharedlibs = "yes"; then - case "$host" in - *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*) - sharedcccompopts="-fPIC" - mksharedlib="$bytecc -shared -o" - bytecclinkopts="$bytecclinkopts -Wl,-E" - byteccrpath="-Wl,-rpath," - mksharedlibrpath="-Wl,-rpath," - shared_libraries_supported=true;; - alpha*-*-osf*) - case "$bytecc" in - gcc*) - sharedcccompopts="-fPIC" - mksharedlib="$bytecc -shared -o" - byteccrpath="-Wl,-rpath," - mksharedlibrpath="-Wl,-rpath," - shared_libraries_supported=true;; - cc*) - sharedcccompopts="" - mksharedlib="ld -shared -expect_unresolved '*' -o" - byteccrpath="-Wl,-rpath," - mksharedlibrpath="-rpath " - shared_libraries_supported=true;; - esac;; - *-*-solaris2*) - case "$bytecc" in - gcc*) - sharedcccompopts="-fPIC" - if sh ./solaris-ld; then - mksharedlib="$bytecc -shared -o" - byteccrpath="-R" - mksharedlibrpath="-R" - else - mksharedlib="$bytecc -shared -o" - bytecclinkopts="$bytecclinkopts -Wl,-E" - byteccrpath="-Wl,-rpath," - mksharedlibrpath="-Wl,-rpath," - fi - shared_libraries_supported=true;; - *) - sharedcccompopts="-KPIC" - byteccrpath="-R" - mksharedlibrpath="-R" - mksharedlib="/usr/ccs/bin/ld -G -o" - shared_libraries_supported=true;; - esac;; - mips*-*-irix[56]*) - case "$bytecc" in - cc*) sharedcccompopts="";; - gcc*) sharedcccompopts="-fPIC";; - esac - mksharedlib="ld -shared -rdata_shared -o" - byteccrpath="-Wl,-rpath," - mksharedlibrpath="-rpath " - shared_libraries_supported=true;; - powerpc-apple-darwin*) - mksharedlib="cc -bundle -flat_namespace -undefined suppress -o" - bytecccompopts="$dl_defs $bytecccompopts" - #sharedcccompopts="-fnocommon" - dl_needs_underscore=true - shared_libraries_supported=true;; - esac -fi - -# Further machine-specific hacks - -case "$host" in - ia64-*-linux*|alpha*-*-linux*|x86_64-*-linux*) - echo "Will use mmap() instead of malloc() for allocation of major heap chunks." - echo "#define USE_MMAP_INSTEAD_OF_MALLOC" >> s.h;; -esac - -# Configure the native-code compiler - -arch=none -model=default -system=unknown - -case "$host" in - alpha*-*-osf*) arch=alpha; system=digital;; - alpha*-*-linux*) arch=alpha; system=linux;; - alpha*-*-freebsd*) arch=alpha; system=freebsd;; - alpha*-*-netbsd*) arch=alpha; system=netbsd;; - alpha*-*-openbsd*) arch=alpha; system=openbsd;; - sparc*-*-sunos4.*) arch=sparc; system=sunos;; - sparc*-*-solaris2.*) arch=sparc; system=solaris;; - sparc*-*-*bsd*) arch=sparc; system=bsd;; - sparc*-*-linux*) arch=sparc; system=linux;; - i[3456]86-*-linux*) arch=i386; system=linux_`sh ./runtest elf.c`;; - i[3456]86-*-*bsd*) arch=i386; system=bsd_`sh ./runtest elf.c`;; - i[3456]86-*-nextstep*) arch=i386; system=nextstep;; - i[3456]86-*-solaris*) arch=i386; system=solaris;; - i[3456]86-*-beos*) arch=i386; system=beos;; - i[3456]86-*-cygwin*) arch=i386; system=cygwin;; - mips-*-irix6*) arch=mips; system=irix;; - hppa1.1-*-hpux*) arch=hppa; system=hpux;; - hppa2.0*-*-hpux*) arch=hppa; system=hpux;; - hppa*-*-linux*) arch=hppa; system=linux;; - powerpc-*-linux*) arch=power; model=ppc; system=elf;; - powerpc-*-netbsd*) arch=power; model=ppc; system=bsd;; - powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;; - powerpc-*-darwin*) arch=power; model=ppc; system=rhapsody;; - arm*-*-linux*) arch=arm; system=linux;; - ia64-*-linux*) arch=ia64; system=linux;; - ia64-*-freebsd*) arch=ia64; system=freebsd;; - x86_64-*-linux*) arch=amd64; system=linux;; - x86_64-*-freebsd*) arch=amd64; system=freebsd;; - x86_64-*-openbsd*) arch=amd64; system=openbsd;; -esac - -if test -z "$ccoption"; then - case "$arch,$system,$cc" in - alpha,digital,gcc*) nativecc=cc;; - mips,*,gcc*) nativecc=cc;; - *) nativecc="$bytecc";; - esac -else - nativecc="$ccoption" -fi - -nativecccompopts='' -nativecclinkopts='' -nativeccrpath="$byteccrpath" - -case "$arch,$nativecc,$system,$host_type" in - alpha,cc*,digital,*) nativecccompopts=-std1;; - mips,cc*,irix,*) nativecccompopts=-n32 - nativecclinkopts="-n32 -Wl,-woff,84";; - *,*,nextstep,*) nativecccompopts="$gcc_warnings -U__GNUC__ -posix" - nativecclinkopts="-posix";; - *,*,rhapsody,*darwin[1-5].*) - nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";; - *,*,rhapsody,*) - nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs";; - *,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";; - *,gcc*,*,*) nativecccompopts="$gcc_warnings";; -esac - -asflags='' -aspp='$(AS)' -asppflags='' -asppprofflags='-DPROFILING' - -case "$arch,$model,$system" in - alpha,*,digital) asflags='-O2'; asppflags='-O2 -DSYS_$(SYSTEM)'; - asppprofflags='-pg -DPROFILING';; - alpha,*,linux) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - alpha,*,freebsd) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - alpha,*,netbsd) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - alpha,*,openbsd) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - mips,*,irix) asflags='-n32 -O2'; asppflags="$asflags";; - sparc,*,bsd) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - sparc,*,linux) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - sparc,*,*) case "$cc" in - gcc*) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - *) asppflags='-P -DSYS_$(SYSTEM)';; - esac;; - i386,*,solaris) aspp='/usr/ccs/bin/as'; asppflags='-P -DSYS_$(SYSTEM)';; - i386,*,*) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - hppa,*,*) aspp="$cc"; asppflags='-traditional -c -DSYS_$(SYSTEM)';; - power,*,elf) aspp='gcc'; asppflags='-c';; - power,*,bsd) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - power,*,rhapsody) ;; - arm,*,linux) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - ia64,*,*) asflags=-xexplicit - aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM) -Wa,-xexplicit';; - amd64,*,*) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; -esac - -cc_profile='-pg' -case "$arch,$model,$system" in - alpha,*,digital) profiling='prof';; - i386,*,linux_elf) profiling='prof';; - i386,*,bsd_elf) profiling='prof';; - sparc,*,solaris) - profiling='prof' - case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;; - amd64,*,linux) profiling='prof';; - *) profiling='noprof';; -esac - -# Where are GNU binutils? - -binutils_objcopy='' -binutils_nm='' - -if test "$arch" != "none"; then - binutils_path="${binutils_dir}:${PATH}:/usr/libexec/binutils" - old_IFS="$IFS" - IFS=':' - for d in ${binutils_path}; do - if test -z "$d"; then continue; fi - if test -f "$d/objcopy" && test -f "$d/nm"; then - echo "objcopy and nm found in $d" - if test `$d/objcopy --help | grep -s -c 'redefine-sym'` -eq 0; then - echo "$d/objcopy does not support option --redefine-sym, discarded" - continue; - fi - if test `$d/nm --version | grep -s -c 'GNU nm'` -eq 0; then - echo "$d/nm is not from GNU binutils, discarded" - continue; - fi - binutils_objcopy="$d/objcopy" - binutils_nm="$d/nm" - break - fi - done - IFS="$old_IFS" -fi - -# Where is ranlib? - -if sh ./searchpath ranlib; then - echo "ranlib found" - echo "RANLIB=ranlib" >> Makefile - echo "RANLIBCMD=ranlib" >> Makefile -else - echo "ranlib not used" - echo "RANLIB=ar rs" >> Makefile - echo "RANLIBCMD=" >> Makefile -fi - -# Do #! scripts work? - -if (SHELL=/bin/sh; export SHELL; (./sharpbang || ./sharpbang2) >/dev/null); then - echo "#! appears to work in shell scripts" - case "$host" in - *-*-sunos*|*-*-unicos*) - echo "We won't use it, though, because under SunOS and Unicos it breaks" - echo "on pathnames longer than 30 characters" - echo "SHARPBANGSCRIPTS=false" >> Makefile;; - *-*-cygwin*) - echo "We won't use it, though, because of conflicts with .exe extension" - echo "under Cygwin" - echo "SHARPBANGSCRIPTS=false" >> Makefile;; - *) - echo "SHARPBANGSCRIPTS=true" >> Makefile;; - esac -else - echo "No support for #! in shell scripts" - echo "SHARPBANGSCRIPTS=false" >> Makefile -fi - -# Write the OS type (Unix or Cygwin) - -echo "#define OCAML_OS_TYPE \"$ostype\"" >> s.h -echo "#define OCAML_STDLIB_DIR \"$libdir\"" >> s.h - -# Use 64-bit file offset if possible - -bytecccompopts="$bytecccompopts -D_FILE_OFFSET_BITS=64" -nativecccompopts="$nativecccompopts -D_FILE_OFFSET_BITS=64" - -# Check the semantics of signal handlers - -if sh ./hasgot sigaction sigprocmask; then - echo "POSIX signal handling found." - echo "#define POSIX_SIGNALS" >> s.h -else - if sh ./runtest signals.c; then - echo "Signals have the BSD semantics." - echo "#define BSD_SIGNALS" >> s.h - else - echo "Signals have the System V semantics." - fi - if sh ./hasgot sigsetmask; then - echo "sigsetmask() found" - echo "#define HAS_SIGSETMASK" >> s.h - fi -fi - -# For the sys module - -if sh ./hasgot times; then - echo "times() found." - echo "#define HAS_TIMES" >> s.h -fi - -# For the terminfo module - -if test "$withcurses" = "yes"; then - for libs in "" "-lcurses" "-ltermcap" "-lcurses -ltermcap" "-lncurses"; do - if sh ./hasgot $libs tgetent tgetstr tgetnum tputs; then - echo "termcap functions found (with libraries '$libs')" - echo "#define HAS_TERMCAP" >> s.h - curseslibs="${libs}" - break - fi - done -fi - -# Configuration for the libraries - -otherlibraries="unix str num dynlink bigarray" - -# For the Unix library - -has_sockets=no -if sh ./hasgot socket socketpair bind listen accept connect; then - echo "You have BSD sockets." - echo "#define HAS_SOCKETS" >> s.h - has_sockets=yes -elif sh ./hasgot -lnsl -lsocket socket socketpair bind listen accept connect; then - echo "You have BSD sockets (with libraries '-lnsl -lsocket')" - cclibs="$cclibs -lnsl -lsocket" - echo "#define HAS_SOCKETS" >> s.h - has_sockets=yes -fi - -if sh ./hasgot -i sys/socket.h -t socklen_t; then - echo "socklen_t is defined in " - echo "#define HAS_SOCKLEN_T" >> s.h -fi - -if sh ./hasgot inet_aton; then - echo "inet_aton() found." - echo "#define HAS_INET_ATON" >> s.h -fi - -if sh ./hasgot -i sys/types.h -i sys/socket.h -i netinet/in.h \ - -t 'struct sockaddr_in6' \ -&& sh ./hasgot getaddrinfo getnameinfo inet_pton inet_ntop; then - echo "IPv6 is supported." - echo "#define HAS_IPV6" >> s.h -fi - -if sh ./hasgot -i unistd.h; then - echo "unistd.h found." - echo "#define HAS_UNISTD" >> s.h -fi - -if sh ./hasgot -i sys/types.h -t off_t; then - echo "off_t is defined in " - echo "#define HAS_OFF_T" >> s.h -fi - -if sh ./hasgot -i sys/types.h -i dirent.h; then - echo "dirent.h found." - echo "#define HAS_DIRENT" >> s.h -fi - -if sh ./hasgot rewinddir; then - echo "rewinddir() found." - echo "#define HAS_REWINDDIR" >> s.h -fi - -if sh ./hasgot lockf; then - echo "lockf() found." - echo "#define HAS_LOCKF" >> s.h -fi - -if sh ./hasgot mkfifo; then - echo "mkfifo() found." - echo "#define HAS_MKFIFO" >> s.h -fi - -if sh ./hasgot getcwd; then - echo "getcwd() found." - echo "#define HAS_GETCWD" >> s.h -fi - -if sh ./hasgot getwd; then - echo "getwd() found." - echo "#define HAS_GETWD" >> s.h -fi - -if sh ./hasgot getpriority setpriority; then - echo "getpriority() found." - echo "#define HAS_GETPRIORITY" >> s.h -fi - -if sh ./hasgot -i sys/types.h -i utime.h && sh ./hasgot utime; then - echo "utime() found." - echo "#define HAS_UTIME" >> s.h -fi - -if sh ./hasgot utimes; then - echo "utimes() found." - echo "#define HAS_UTIMES" >> s.h -fi - -if sh ./hasgot dup2; then - echo "dup2() found." - echo "#define HAS_DUP2" >> s.h -fi - -if sh ./hasgot fchmod fchown; then - echo "fchmod() found." - echo "#define HAS_FCHMOD" >> s.h -fi - -if sh ./hasgot truncate ftruncate; then - echo "truncate() found." - echo "#define HAS_TRUNCATE" >> s.h -fi - -select_include='' -if sh ./hasgot -i sys/types.h -i sys/select.h; then - echo "sys/select.h found." - echo "#define HAS_SYS_SELECT_H" >> s.h - select_include='-i sys/select.h' -fi - -has_select=no -if sh ./hasgot select && \ - sh ./hasgot -i sys/types.h $select_include -t fd_set ; then - echo "select() found." - echo "#define HAS_SELECT" >> s.h - has_select=yes -fi - -if sh ./hasgot symlink readlink lstat; then - echo "symlink() found." - echo "#define HAS_SYMLINK" >> s.h -fi - -has_wait=no -if sh ./hasgot waitpid; then - echo "waitpid() found." - echo "#define HAS_WAITPID" >> s.h - has_wait=yes -fi - -if sh ./hasgot wait4; then - echo "wait4() found." - echo "#define HAS_WAIT4" >> s.h - has_wait=yes -fi - -if sh ./hasgot -i limits.h && sh ./runtest getgroups.c; then - echo "getgroups() found." - echo "#define HAS_GETGROUPS" >> s.h -fi - -if sh ./hasgot -i termios.h && - sh ./hasgot tcgetattr tcsetattr tcsendbreak tcflush tcflow; then - echo "POSIX termios found." - echo "#define HAS_TERMIOS" >> s.h -fi - -# Async I/O under OSF1 3.x are so buggy that the test program hangs... -testasyncio=true -if test -f /usr/bin/uname; then - case "`/usr/bin/uname -s -r`" in - "OSF1 V3."*) testasyncio=false;; - esac -fi -if $testasyncio && sh ./runtest async_io.c; then - echo "Asynchronous I/O are supported." - echo "#define HAS_ASYNC_IO" >> s.h -fi - -has_setitimer=no -if sh ./hasgot setitimer; then - echo "setitimer() found." - echo "#define HAS_SETITIMER" >> s.h - has_setitimer="yes" -fi - -if sh ./hasgot gethostname; then - echo "gethostname() found." - echo "#define HAS_GETHOSTNAME" >> s.h -fi - -if sh ./hasgot -i sys/utsname.h && sh ./hasgot uname; then - echo "uname() found." - echo "#define HAS_UNAME" >> s.h -fi - -has_gettimeofday=no -if sh ./hasgot gettimeofday; then - echo "gettimeofday() found." - echo "#define HAS_GETTIMEOFDAY" >> s.h - has_gettimeofday="yes" -fi - -if sh ./hasgot mktime; then - echo "mktime() found." - echo "#define HAS_MKTIME" >> s.h -fi - -case "$host" in - *-*-cygwin*) ;; # setsid emulation under Cygwin breaks the debugger - *) if sh ./hasgot setsid; then - echo "setsid() found." - echo "#define HAS_SETSID" >> s.h - fi;; -esac - -if sh ./hasgot putenv; then - echo "putenv() found." - echo "#define HAS_PUTENV" >> s.h -fi - -if sh ./hasgot -i locale.h && sh ./hasgot setlocale; then - echo "setlocale() and found." - echo "#define HAS_LOCALE" >> s.h -fi - -if sh ./hasgot -i mach-o/dyld.h && sh ./hasgot NSLinkModule; then - echo "NSLinkModule() found. Using darwin dynamic loading." - echo "#define HAS_NSLINKMODULE" >> s.h -elif sh ./hasgot $dllib dlopen; then - echo "dlopen() found." -elif sh ./hasgot $dllib -ldl dlopen; then - echo "dlopen() found in -ldl." - dllib="$dllib -ldl" -else - shared_libraries_supported=no -fi - -if $shared_libraries_supported; then - echo "Dynamic loading of shared libraries is supported." - echo "#define SUPPORT_DYNAMIC_LINKING" >> s.h - if $dl_needs_underscore; then - echo '#define DL_NEEDS_UNDERSCORE' >>s.h - fi -fi - -if sh ./hasgot -i sys/types.h -i sys/mman.h && sh ./hasgot mmap munmap; then - echo "mmap() found." - echo "#define HAS_MMAP" >> s.h -fi - -nargs=none -for i in 5 6; do - if sh ./trycompile -DNUM_ARGS=${i} gethostbyname.c; then nargs=$i; break; fi -done -if test $nargs != "none"; then - echo "gethostbyname_r() found (with ${nargs} arguments)." - echo "#define HAS_GETHOSTBYNAME_R $nargs" >> s.h -fi - -nargs=none -for i in 7 8; do - if sh ./trycompile -DNUM_ARGS=${i} gethostbyaddr.c; then nargs=$i; break; fi -done -if test $nargs != "none"; then - echo "gethostbyaddr_r() found (with ${nargs} arguments)." - echo "#define HAS_GETHOSTBYADDR_R $nargs" >> s.h -fi - -# Determine if the debugger is supported - -if test "$has_sockets" = "yes"; then - echo "Replay debugger supported." - debugger="ocamldebugger" -else - echo "No replay debugger (missing system calls)" - debugger="" -fi - - -# Determine if system stack overflows can be detected - -case "$arch,$system" in - i386,linux_elf) - echo "System stack overflow can be detected." - echo "#define HAS_STACK_OVERFLOW_DETECTION" >> s.h;; - *) - echo "Cannot detect system stack overflow.";; -esac - -# Determine the target architecture for the "num" library - -case "$host" in - alpha*-*-*) bng_arch=alpha; bng_asm_level=1;; - i[3456]86-*-*) bng_arch=ia32 - if sh ./trycompile ia32sse2.c - then bng_asm_level=2 - else bng_asm_level=1 - fi;; - mips-*-*) bng_arch=mips; bng_asm_level=1;; - powerpc-*-*) bng_arch=ppc; bng_asm_level=1;; - sparc*-*-*) bng_arch=sparc; bng_asm_level=1;; - x86_64-*-*) bng_arch=amd64; bng_asm_level=1;; - *) bng_arch=generic; bng_asm_level=0;; -esac - -echo "BNG_ARCH=$bng_arch" >> Makefile -echo "BNG_ASM_LEVEL=$bng_asm_level" >> Makefile - -# Determine if the POSIX threads library is supported - -if test "$pthread_wanted" = "yes"; then - case "$host" in - *-*-solaris*) pthread_link="-lpthread -lposix4";; - *-*-freebsd*) pthread_link="-pthread";; - *-*-openbsd*) pthread_link="-pthread";; - *) pthread_link="-lpthread";; - esac - if ./hasgot -i pthread.h $pthread_link pthread_self; then - echo "POSIX threads library supported." - otherlibraries="$otherlibraries systhreads" - bytecccompopts="$bytecccompopts -D_REENTRANT" - nativecccompopts="$nativecccompopts -D_REENTRANT" - case "$host" in - *-*-freebsd*) - bytecccompopts="$bytecccompopts -D_THREAD_SAFE" - nativecccompopts="$nativecccompopts -D_THREAD_SAFE";; - *-*-openbsd*) - bytecccompopts="$bytecccompopts -pthread" - asppflags="$asppflags -pthread" - nativecccompopts="$nativecccompopts -pthread";; - esac - echo "Options for linking with POSIX threads: $pthread_link" - echo "PTHREAD_LINK=$pthread_link" >> Makefile - if sh ./hasgot $pthread_link sigwait; then - echo "sigwait() found" - echo "#define HAS_SIGWAIT" >> s.h - fi - else - echo "POSIX threads not found." - pthread_link="" - fi -fi - -# Determine if the bytecode thread library is supported - -if test "$has_select" = "yes" \ -&& test "$has_setitimer" = "yes" \ -&& test "$has_gettimeofday" = "yes" \ -&& test "$has_wait" = "yes"; then - echo "Bytecode threads library supported." - otherlibraries="$otherlibraries threads" -else - echo "Bytecode threads library not supported (missing system calls)" -fi - -# Determine the location of X include files and libraries - -x11_include="not found" -x11_link="not found" - -for dir in \ - $x11_include_dir \ - ; \ -do - if test -f $dir/X11/X.h; then - x11_include=$dir - break - fi -done - -if test "$x11_include" = "not found"; then - x11_try_lib_dir='' -else - x11_try_lib_dir=`echo $x11_include | sed -e 's|include|lib|'` -fi - -for dir in \ - $x11_lib_dir \ - $x11_try_lib_dir \ - ; \ -do - if test -f $dir/libX11.a || \ - test -f $dir/libX11.so || \ - test -f $dir/libX11.dll.a || \ - test -f $dir/libX11.sa; then - if test $dir = /usr/lib; then - x11_link="-lX11" - else - x11_link="-L$dir -lX11" - x11_libs="-L$dir" - fi - break - fi -done - - -if test "$x11_include" = "not found" || test "$x11_link" = "not found" -then - echo "X11 not found, the \"graph\" library will not be supported." - x11_include="" -else - echo "Location of X11 include files: $x11_include/X11" - echo "Options for linking with X11: $x11_link" - otherlibraries="$otherlibraries graph" - if test "$x11_include" = "/usr/include"; then - x11_include="" - else - x11_include="-I$x11_include" - fi - echo "X11_INCLUDES=$x11_include" >> Makefile - echo "X11_LINK=$x11_link" >> Makefile -fi - -# See if we can compile the dbm library - -dbm_include="not found" -dbm_link="not found" -use_gdbm_ndbm=no - -for dir in ; do - if test -f $dir/ndbm.h; then - dbm_include=$dir - if sh ./hasgot dbm_open; then - dbm_link="" - elif sh ./hasgot -lndbm dbm_open; then - dbm_link="-lndbm" - elif sh ./hasgot -ldb1 dbm_open; then - dbm_link="-ldb1" - elif sh ./hasgot -lgdbm dbm_open; then - dbm_link="-lgdbm" - elif sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then - dbm_link="-lgdbm_compat -lgdbm" - fi - break - fi - if test -f $dir/gdbm-ndbm.h; then - dbm_include=$dir - use_gdbm_ndbm=yes - if sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then - dbm_link="-lgdbm_compat -lgdbm" - fi - break - fi -done -if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then - echo "NDBM not found, the \"dbm\" library will not be supported." -else - echo "NDBM found (in $dbm_include)" - if test "$dbm_include" = "/usr/include"; then - dbm_include="" - else - dbm_include="-I$dbm_include" - fi - echo "DBM_INCLUDES=$dbm_include" >> Makefile - echo "DBM_LINK=$dbm_link" >> Makefile - if test "$use_gdbm_ndbm" = "yes"; then - echo "#define DBM_USES_GDBM_NDBM" >> s.h - fi - otherlibraries="$otherlibraries dbm" -fi - -# Look for tcl/tk - -echo "Configuring LablTk..." - -if test $tk_wanted = no; then - has_tk=false -elif test $tk_x11 = no; then - has_tk=true -elif test "$x11_include" = "not found" || test "$x11_link" = "not found"; then - echo "X11 not found." - has_tk=false -else - tk_x11_include="$x11_include" - tk_x11_libs="$x11_libs -lX11" - has_tk=true -fi - -if test $has_tk = true; then - tcl_version='' - tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` - if test -z "$tcl_version" && test -z "$tk_defs"; then - tk_defs=-I/usr/local/include - tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` - fi - if test -z "$tcl_version"; then - tk_defs="-I/usr/local/include/tcl8.2 -I/usr/local/include/tk8.2" - tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` - fi - if test -z "$tcl_version"; then - tk_defs="-I/usr/local/include/tcl8.3 -I/usr/local/include/tk8.3" - tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` - fi - if test -z "$tcl_version"; then - tk_defs="-I/usr/local/include/tcl8.4 -I/usr/local/include/tk8.4" - tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` - fi - if test -z "$tcl_version"; then - tk_defs="-I/usr/include/tcl8.2 -I/usr/include/tk8.2" - tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` - fi - if test -z "$tcl_version"; then - tk_defs="-I/usr/include/tcl8.3 -I/usr/include/tk8.3" - tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` - fi - if test -z "$tcl_version"; then - tk_defs="-I/usr/include/tcl8.4 -I/usr/include/tk8.4" - tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` - fi - if test -z "$tcl_version"; then - tk_defs="-I/sw/include" - tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` - fi - if test -n "$tcl_version"; then - echo "tcl.h version $tcl_version found with \"$tk_defs\"." - case $tcl_version in - 7.5) tclmaj=7 tclmin=5 tkmaj=4 tkmin=1 ;; - 7.6) tclmaj=7 tclmin=6 tkmaj=4 tkmin=2 ;; - 8.0) tclmaj=8 tclmin=0 tkmaj=8 tkmin=0 ;; - 8.1) tclmaj=8 tclmin=1 tkmaj=8 tkmin=1 ;; - 8.2) tclmaj=8 tclmin=2 tkmaj=8 tkmin=2 ;; - 8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;; - 8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;; - *) echo "This version is not known."; has_tk=false ;; - esac - else - echo "tcl.h not found." - has_tk=false - fi -fi - -if test $has_tk = true; then - if sh ./hasgot $tk_x11_include $tk_defs -i tk.h; then - echo "tk.h found." - else - echo "tk.h not found." - has_tk=false - fi -fi - -tkauxlibs="$mathlib $dllib" -tcllib='' -tklib='' -if test $has_tk = true; then - if sh ./hasgot $tk_libs $tk_x11_libs $tkauxlibs Tcl_DoOneEvent - then tk_libs="$tk_libs $dllib" - elif sh ./hasgot $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs Tcl_DoOneEvent - then - tk_libs="$tk_libs -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib" - elif sh ./hasgot $tk_libs -ltcl$tclmaj$tclmin $tkauxlibs Tcl_DoOneEvent - then - tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin $dllib" - elif test -z "$tk_libs" && tk_libs=-L/usr/local/lib && \ - sh ./hasgot $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs Tcl_DoOneEvent - then - tk_libs="$tk_libs -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib" - elif sh ./hasgot $tk_libs -ltcl$tclmaj$tclmin $tkauxlibs Tcl_DoOneEvent - then - tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin $dllib" -# elif sh ./hasgot $tk_libs -ltcl $tkauxlibs Tcl_DoOneEvent; then -# tk_libs="$tk_libs -ltk -ltcl" - elif sh ./hasgot -L/sw/lib $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs \ - Tcl_DoOneEvent - then tk_libs="-L/sw/lib -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib" - else - echo "Tcl library not found." - has_tk=false - fi -fi -if test $has_tk = true; then - if sh ./hasgot $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then - echo "Tcl/Tk libraries found." - elif sh ./hasgot -L/sw/lib $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then - tk_libs="-L/sw/lib $tk_libs" - echo "Tcl/Tk libraries found." - else - echo "Tcl library found." - echo "Tk library not found." - has_tk=false - fi -fi - -if test $has_tk = true; then - if test $tk_x11 = yes; then - echo "TK_DEFS=$tk_defs "'$(X11_INCLUDES)' >> Makefile - echo "TK_LINK=$tk_libs "'$(X11_LINK)' >> Makefile - else - echo "TK_DEFS=$tk_defs" >> Makefile - echo "TK_LINK=$tk_libs" >> Makefile - fi - otherlibraries="$otherlibraries labltk" -else - echo "Configuration failed, LablTk will not be built." -fi - -# Camlp4 - -( -cd ../../camlp4/config -EXE=$exe ./configure_batch -bindir "$bindir" -libdir "$libdir" -mandir "$mandir" -ocaml-top ../.. > /dev/null -) - -# Final twiddling of compiler options to work around known bugs - -nativeccprofopts="$nativecccompopts" -case "$buggycc" in - gcc.2.96) - bytecccompopts="$bytecccompopts -fomit-frame-pointer" - nativecccompopts="$nativecccompopts -fomit-frame-pointer";; -esac - -# Finish generated files - -cclibs="$cclibs $mathlib" - -echo "BYTECC=$bytecc" >> Makefile -echo "BYTECCCOMPOPTS=$bytecccompopts" >> Makefile -echo "BYTECCLINKOPTS=$bytecclinkopts" >> Makefile -echo "BYTECCLIBS=$cclibs $dllib $curseslibs $pthread_link" >> Makefile -echo "BYTECCRPATH=$byteccrpath" >> Makefile -echo "EXE=$exe" >> Makefile -echo "SUPPORTS_SHARED_LIBRARIES=$shared_libraries_supported" >> Makefile -echo "SHAREDCCCOMPOPTS=$sharedcccompopts" >> Makefile -echo "MKSHAREDLIB=$mksharedlib" >> Makefile -echo "MKSHAREDLIBRPATH=$mksharedlibrpath" >> Makefile -echo "ARCH=$arch" >> Makefile -echo "MODEL=$model" >> Makefile -echo "SYSTEM=$system" >> Makefile -echo "NATIVECC=$nativecc" >> Makefile -echo "NATIVECCCOMPOPTS=$nativecccompopts" >> Makefile -echo "NATIVECCPROFOPTS=$nativeccprofopts" >> Makefile -echo "NATIVECCLINKOPTS=$nativecclinkopts" >> Makefile -echo "NATIVECCRPATH=$nativeccrpath" >> Makefile -echo "NATIVECCLIBS=$cclibs $dllib" >> Makefile -echo "ASFLAGS=$asflags" >> Makefile -echo "ASPP=$aspp" >> Makefile -echo "ASPPFLAGS=$asppflags" >> Makefile -echo "ASPPPROFFLAGS=$asppprofflags" >> Makefile -echo "PROFILING=$profiling" >> Makefile -echo "BINUTILS_OBJCOPY=$binutils_objcopy" >> Makefile -echo "BINUTILS_NM=$binutils_nm" >> Makefile -echo "DYNLINKOPTS=$dllib" >> Makefile -echo "OTHERLIBRARIES=$otherlibraries" >> Makefile -echo "DEBUGGER=$debugger" >> Makefile -echo "CC_PROFILE=$cc_profile" >> Makefile - -rm -f tst hasgot.c -rm -f ../m.h ../s.h ../Makefile -mv m.h s.h Makefile .. - -# Print a summary - -echo -echo "** Configuration summary **" -echo -echo "Directories where Objective Caml will be installed:" -echo " binaries.................. $bindir" -echo " standard library.......... $libdir" -echo " manual pages.............. $mandir (with extension .$manext)" - -echo "Configuration for the bytecode compiler:" -echo " C compiler used........... $bytecc" -echo " options for compiling..... $bytecccompopts" -echo " options for linking....... $bytecclinkopts $cclibs $dllib $curseslibs $pthread_link" -if $shared_libraries_supported; then -echo " shared libraries are supported" -echo " options for compiling..... $sharedcccompopts $bytecccompopts" -echo " command for building...... $mksharedlib lib.so $mksharedlibrpath/a/path objs" -else -echo " shared libraries not supported" -fi - -echo "Configuration for the native-code compiler:" -if test "$arch" = "none"; then - echo " (not supported on this platform)" -else - if test "$model" = "default"; then - echo " hardware architecture..... $arch" - else - echo " hardware architecture..... $arch ($model)" - fi - if test "$system" = "unknown"; then : ; else - echo " OS variant................ $system" - fi - echo " C compiler used........... $nativecc" - echo " options for compiling..... $nativecccompopts" - echo " options for linking....... $nativecclinkopts $cclibs" - echo " assembler ................ \$(AS) $asflags" - echo " preprocessed assembler ... $aspp $asppflags" - if test "$profiling" = "prof"; then - echo " profiling with gprof ..... supported" - else - echo " profiling with gprof ..... not supported" - fi - if test -n "$binutils_objcopy" && test -n "$binutils_nm"; then - echo " ocamlopt -pack ........... supported" - else - echo " ocamlopt -pack ........... not supported (no binutils)" - fi -fi - -if test "$debugger" = "ocamldebugger"; then - echo "Source-level replay debugger: supported" -else - echo "Source-level replay debugger: not supported" -fi - -echo "Additional libraries supported:" -echo " $otherlibraries" - -echo "Configuration for the \"num\" library:" -echo " target architecture ...... $bng_arch (asm level $bng_asm_level)" - -if test "$x11_include" != "not found" && test "$x11_lib" != "not found"; then -echo "Configuration for the \"graph\" library:" -echo " options for compiling .... $x11_include" -echo " options for linking ...... $x11_link" -fi - -if test $has_tk = true; then -echo "Configuration for the \"labltk\" library:" -echo " use tcl/tk version ....... $tcl_version" -echo " options for compiling .... $tk_defs" -echo " options for linking ...... $tk_libs" -else -echo "The \"labltk\" library: not found" -fi diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 44886770cad8..1fa52721ddb9 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -11,12 +11,14 @@ in , aflSupport ? false , flambdaSupport ? false , spaceTimeSupport ? false +, unsafeStringSupport ? false }: assert useX11 -> safeX11 stdenv; assert aflSupport -> lib.versionAtLeast version "4.05"; assert flambdaSupport -> lib.versionAtLeast version "4.03"; assert spaceTimeSupport -> lib.versionAtLeast version "4.04"; +assert unsafeStringSupport -> lib.versionAtLeast version "4.06" && lib.versionOlder version "5.0"; let src = args.src or (fetchurl { @@ -59,6 +61,10 @@ stdenv.mkDerivation (args // { ++ optional aflSupport (flags "--with-afl" "-afl-instrument") ++ optional flambdaSupport (flags "--enable-flambda" "-flambda") ++ optional spaceTimeSupport (flags "--enable-spacetime" "-spacetime") + ++ optionals unsafeStringSupport [ + "--disable-force-safe-string" + "DEFAULT_STRING=unsafe" + ] ++ optional (stdenv.hostPlatform.isStatic && (lib.versionOlder version "4.08")) "-no-shared-libs" ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && lib.versionOlder version "4.08") [ "-host ${stdenv.hostPlatform.config}" @@ -95,7 +101,7 @@ stdenv.mkDerivation (args // { preConfigure = optionalString (lib.versionOlder version "4.04") '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang - '' + optionalString (stdenv.isDarwin && lib.versionOlder version "4.13") '' + '' + optionalString (stdenv.isDarwin) '' # Do what upstream does by default now: https://github.com/ocaml/ocaml/pull/10176 # This is required for aarch64-darwin, everything else works as is. AS="${stdenv.cc}/bin/cc -c" ASPP="${stdenv.cc}/bin/cc -c" @@ -138,7 +144,7 @@ stdenv.mkDerivation (args // { ''; platforms = with platforms; linux ++ darwin; - broken = stdenv.isAarch64 && lib.versionOlder version (if stdenv.isDarwin then "4.10" else "4.06"); + broken = stdenv.isAarch64 && lib.versionOlder version (if stdenv.isDarwin then "4.10" else "4.02"); }; }) diff --git a/pkgs/development/compilers/ocaml/gnused-on-osx-fix.patch b/pkgs/development/compilers/ocaml/gnused-on-osx-fix.patch deleted file mode 100644 index dc2bcb869766..000000000000 --- a/pkgs/development/compilers/ocaml/gnused-on-osx-fix.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Nuar ocaml-3.11.1/ocamldoc/remove_DEBUG ocaml-3.11.1-nixpkgs/ocamldoc/remove_DEBUG ---- ocaml-3.11.1/ocamldoc/remove_DEBUG 2004-04-15 18:18:52.000000000 +0200 -+++ ocaml-3.11.1-nixpkgs/ocamldoc/remove_DEBUG 2011-01-01 17:37:07.000000000 +0100 -@@ -18,4 +18,4 @@ - # respecting the cpp # line annotation conventions - - echo "# 1 \"$1\"" --LC_ALL=C sed -e '/DEBUG/s/.*//' "$1" -+grep -v 'DEBUG' "$1" diff --git a/pkgs/development/compilers/ocaml/mips64.patch b/pkgs/development/compilers/ocaml/mips64.patch deleted file mode 100644 index cdef9cafb932..000000000000 --- a/pkgs/development/compilers/ocaml/mips64.patch +++ /dev/null @@ -1,240 +0,0 @@ -http://caml.inria.fr/mantis/view.php?id=4849 - -diff -bur ocaml-3.11.1/asmcomp/mips/arch.ml my_ocaml/asmcomp/mips/arch.ml ---- asmcomp/mips/arch.ml 2002-11-29 16:03:36.000000000 +0100 -+++ asmcomp/mips/arch.ml 2009-08-09 23:18:31.000000000 +0200 -@@ -35,7 +35,7 @@ - - let big_endian = - match Config.system with -- "ultrix" -> false -+ "ultrix" | "gnu" -> false - | "irix" -> true - | _ -> fatal_error "Arch_mips.big_endian" - -diff -bur ocaml-3.11.1/asmcomp/mips/emit.mlp my_ocaml/asmcomp/mips/emit.mlp ---- asmcomp/mips/emit.mlp 2004-01-05 21:25:56.000000000 +0100 -+++ asmcomp/mips/emit.mlp 2009-08-23 12:11:58.000000000 +0200 -@@ -58,7 +58,7 @@ - !stack_offset + - 4 * num_stack_slots.(0) + 8 * num_stack_slots.(1) + - (if !contains_calls then if !uses_gp then 8 else 4 else 0) in -- Misc.align size 16 -+ Misc.align size 16 (* n32 require quadword alignment *) - - let slot_offset loc cl = - match loc with -@@ -252,7 +252,7 @@ - | Lop(Icall_ind) -> - ` move $25, {emit_reg i.arg.(0)}\n`; - liveregs i live_25; -- ` jal {emit_reg i.arg.(0)}\n`; -+ ` jal $25\n`; (* {emit_reg i.arg.(0)}\n; Equivalent but avoids "Warning: MIPS PIC call to register other than $25" on GNU as *) - `{record_frame i.live}\n` - | Lop(Icall_imm s) -> - liveregs i 0; -@@ -269,7 +269,7 @@ - liveregs i 0; - ` move $25, {emit_reg i.arg.(0)}\n`; - liveregs i live_25; -- ` j {emit_reg i.arg.(0)}\n` -+ ` j $25\n` - | Lop(Itailcall_imm s) -> - if s = !function_name then begin - ` b {emit_label !tailrec_entry_point}\n` -@@ -277,11 +277,11 @@ - let n = frame_size() in - if !contains_calls then - ` lw $31, {emit_int(n - 4)}($sp)\n`; -+ ` la $25, {emit_symbol s}\n`; (* Rxd: put before gp restore *) - if !uses_gp then - ` lw $gp, {emit_int(n - 8)}($sp)\n`; - if n > 0 then - ` addu $sp, $sp, {emit_int n}\n`; -- ` la $25, {emit_symbol s}\n`; - liveregs i live_25; - ` j $25\n` - end -@@ -305,8 +305,13 @@ - begin match chunk with - Double_u -> - (* Destination is not 8-aligned, hence cannot use l.d *) -+ if big_endian then begin - ` ldl $24, {emit_addressing addr i.arg 0}\n`; -- ` ldr $24, {emit_addressing (offset_addressing addr 7) i.arg 0}\n`; -+ ` ldr $24, {emit_addressing (offset_addressing addr 7) i.arg 0}\n` -+ end else begin -+ ` ldl $24, {emit_addressing (offset_addressing addr 7) i.arg 0}\n`; -+ ` ldr $24, {emit_addressing addr i.arg 0}\n` -+ end; - ` dmtc1 $24, {emit_reg dest}\n` - | Single -> - ` l.s {emit_reg dest}, {emit_addressing addr i.arg 0}\n`; -@@ -328,8 +333,13 @@ - Double_u -> - (* Destination is not 8-aligned, hence cannot use l.d *) - ` dmfc1 $24, {emit_reg src}\n`; -+ if big_endian then begin - ` sdl $24, {emit_addressing addr i.arg 1}\n`; - ` sdr $24, {emit_addressing (offset_addressing addr 7) i.arg 1}\n` -+ end else begin -+ ` sdl $24, {emit_addressing (offset_addressing addr 7) i.arg 1}\n`; -+ ` sdr $24, {emit_addressing addr i.arg 1}\n` -+ end - | Single -> - ` cvt.s.d $f31, {emit_reg src}\n`; - ` s.s $f31, {emit_addressing addr i.arg 1}\n` -@@ -552,6 +562,7 @@ - (* There are really two groups of registers: - $sp and $30 always point to stack locations - $2 - $21 never point to stack locations. *) -+ if Config.system = "irix" then begin - ` .noalias $2,$sp; .noalias $2,$30; .noalias $3,$sp; .noalias $3,$30\n`; - ` .noalias $4,$sp; .noalias $4,$30; .noalias $5,$sp; .noalias $5,$30\n`; - ` .noalias $6,$sp; .noalias $6,$30; .noalias $7,$sp; .noalias $7,$30\n`; -@@ -561,7 +572,8 @@ - ` .noalias $14,$sp; .noalias $14,$30; .noalias $15,$sp; .noalias $15,$30\n`; - ` .noalias $16,$sp; .noalias $16,$30; .noalias $17,$sp; .noalias $17,$30\n`; - ` .noalias $18,$sp; .noalias $18,$30; .noalias $19,$sp; .noalias $19,$30\n`; -- ` .noalias $20,$sp; .noalias $20,$30; .noalias $21,$sp; .noalias $21,$30\n\n`; -+ ` .noalias $20,$sp; .noalias $20,$30; .noalias $21,$sp; .noalias $21,$30\n\n` -+ end; - let lbl_begin = Compilenv.make_symbol (Some "data_begin") in - ` .data\n`; - ` .globl {emit_symbol lbl_begin}\n`; -diff -bur ocaml-3.11.1/asmrun/mips.s my_ocaml/asmrun/mips.s ---- asmrun/mips.s 2004-07-13 14:18:53.000000000 +0200 -+++ asmrun/mips.s 2009-08-20 09:34:36.000000000 +0200 -@@ -187,7 +187,7 @@ - sw $30, caml_exception_pointer - /* Call C function */ - move $25, $24 -- jal $24 -+ jal $25 /* Rxd: $24 replaced by $25 to avoid this "Warning: MIPS PIC call to register other than $25" ? */ - /* Reload return address, alloc ptr, alloc limit */ - lw $31, 0($16) /* caml_last_return_address */ - lw $22, 0($17) /* caml_young_ptr */ -@@ -254,7 +254,7 @@ - sw $0, caml_last_return_address - /* Call the Caml code */ - move $25, $24 -- jal $24 -+ jal $25 /* Rxd: 24 replaced by 25 */ - $104: - /* Pop the trap frame, restoring caml_exception_pointer */ - lw $24, 0($sp) -@@ -384,3 +384,8 @@ - .word $104 /* return address into callback */ - .half -1 /* negative frame size => use callback link */ - .half 0 /* no roots here */ -+ -+#if defined(SYS_linux) -+ /* Mark stack as non-executable, PR#4564 */ -+ .section .note.GNU-stack,"",%progbits -+#endif -diff -bur ocaml-3.11.1/configure my_ocaml/configure ---- configure 2009-05-20 17:33:09.000000000 +0200 -+++ configure 2009-08-23 10:55:44.000000000 +0200 -@@ -40,7 +40,7 @@ - verbose=no - withcurses=yes - withsharedlibs=yes --gcc_warnings="-Wall" -+gcc_warnings="-W -Wall" - partialld="ld -r" - - # Try to turn internationalization off, can cause config.guess to malfunction! -@@ -292,6 +292,9 @@ - # (For those who want to force "cc -64") - # Turn off warning "unused library" - bytecclinkopts="-Wl,-woff,84";; -+ gcc*,mips64el-*) -+ bytecccompopts="" -+ bytecclinkopts="-fno-defer-pop $gcc_warnings -Wl,-O1 -Wl,--as-needed";; - *,alpha*-*-unicos*) - # For the Cray T3E - bytecccompopts="-DUMK";; -@@ -468,6 +471,8 @@ - echo "64-bit integers must be doubleword-aligned." - echo "#define ARCH_ALIGN_INT64" >> m.h - fi;; -+ mips64el-*) -+ echo "#define ARCH_ALIGN_INT64" >> m.h;; - *) - sh ./runtest int64align.c - case $? in -@@ -636,6 +641,7 @@ - fi;; - i[3456]86-*-gnu*) arch=i386; system=gnu;; - mips-*-irix6*) arch=mips; system=irix;; -+ mips*-gnu*) arch=mips; system=gnu;; - hppa1.1-*-hpux*) arch=hppa; system=hpux;; - hppa2.0*-*-hpux*) arch=hppa; system=hpux;; - hppa*-*-linux*) arch=hppa; system=linux;; -@@ -672,7 +678,7 @@ - if test -z "$ccoption"; then - case "$arch,$system,$cc" in - alpha,digital,gcc*) nativecc=cc;; -- mips,*,gcc*) nativecc=cc;; -+ mips,irix,gcc*) nativecc=cc;; - *) nativecc="$bytecc";; - esac - else -@@ -687,6 +693,9 @@ - alpha,cc*,digital,*) nativecccompopts=-std1;; - mips,cc*,irix,*) nativecccompopts=-n32 - nativecclinkopts="-n32 -Wl,-woff,84";; -+ mips,gcc*,gnu,mips64el-*) -+ nativecccompopts="$gcc_warnings -fPIC" -+ nativecclinkopts="--as-needed";; - *,*,nextstep,*) nativecccompopts="$gcc_warnings -U__GNUC__ -posix" - nativecclinkopts="-posix";; - *,*,rhapsody,*darwin[1-5].*) -@@ -725,6 +734,8 @@ - aspp='gcc -c -Wa,-xexplicit';; - mips,*,irix) as='as -n32 -O2 -nocpp -g0' - aspp='as -n32 -O2';; -+ mips,*,gnu) as='as -KPIC' -+ aspp='gcc -c -fPIC';; # got bus error without fPIC ? - power,*,elf) as='as -u -m ppc' - aspp='gcc -c';; - power,*,bsd) as='as' -@@ -756,6 +767,7 @@ - case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;; - amd64,*,linux) profiling='prof';; - amd64,*,gnu) profiling='prof';; -+ mips,*,gnu) profiling='prof';; - *) profiling='noprof';; - esac - -diff -bur ocaml-3.11.1/asmcomp/mips/proc.ml my_ocaml/asmcomp/mips/proc.ml ---- asmcomp/mips/proc.ml 2007-10-30 13:37:16.000000000 +0100 -+++ asmcomp/mips/proc.ml 2010-03-18 08:08:06.000000000 +0100 -@@ -114,7 +114,7 @@ - incr int - end else begin - loc.(i) <- stack_slot (make_stack !ofs) ty; -- ofs := !ofs + size_int -+ ofs := !ofs + 8 - end - | Float -> - if !float <= last_float then begin -@@ -143,7 +143,7 @@ - or float regs $f12...$f19. Each argument "consumes" both one slot - in the int register file and one slot in the float register file. - Extra arguments are passed on stack, in a 64-bits slot, right-justified -- (i.e. at +4 from natural address). *) -+ (i.e. at +4 from natural address for big endians). *) - - let loc_external_arguments arg = - let loc = Array.create (Array.length arg) Reg.dummy in -@@ -158,7 +158,7 @@ - end else begin - begin match arg.(i).typ with - Float -> loc.(i) <- stack_slot (Outgoing !ofs) Float -- | ty -> loc.(i) <- stack_slot (Outgoing (!ofs + 4)) ty -+ | ty -> loc.(i) <- stack_slot (Outgoing (!ofs + (if big_endian then 4 else 0))) ty - end; - ofs := !ofs + 8 - end - diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index e4cd191683c9..2843625daef2 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "http://opalang.org/"; license = lib.licenses.gpl3; maintainers = [ ]; - platforms = with lib.platforms; unix; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index 9d8a2367b934..a61a66ada934 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -13,19 +13,19 @@ stdenv.mkDerivation rec { pname = "${passthru.prettyName}-unwrapped"; # nixpkgs-update: no auto update - version = "unstable-2022-10-03"; + version = "unstable-2023-01-30"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "61538429a501a09f369366d832799f2e3b196a02"; - sha256 = "sha256-YvqRw0klSqOxIuO5QFKjcUp6aRWlO2j3L+T1ekx8SfA="; + rev = "996740acdbb173499ec1bf2ba6c8942f2a374220"; + sha256 = "sha256-9m+0e2v1Hk8jYZHqJwb1mN02WgGDArsWbF7Ut3Z5OIg="; }; postPatch = '' patchShebangs *.sh - for dateSource in cmnvars.sh bld/wipfc/configure; do + for dateSource in bld/wipfc/configure; do substituteInPlace $dateSource \ --replace '`date ' '`date -ud "@$SOURCE_DATE_EPOCH" ' done @@ -35,14 +35,17 @@ stdenv.mkDerivation rec { --replace '__TIME__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%T')\"" substituteInPlace build/makeinit \ - --replace '%__CYEAR__' '%OWCYEAR' + --replace '$+$(%__CYEAR__)$-' "$(date -ud "@$SOURCE_DATE_EPOCH" +'%Y')" '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace build/mif/local.mif \ --replace '-static' "" ''; - nativeBuildInputs = [ dosbox ] - ++ lib.optional withDocs ghostscript; + nativeBuildInputs = [ + dosbox + ] ++ lib.optionals withDocs [ + ghostscript + ]; configurePhase = '' runHook preConfigure @@ -120,7 +123,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://open-watcom.github.io"; license = licenses.watcom; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-windows" "i686-windows" ]; + platforms = with platforms; windows ++ unix; + badPlatforms = platforms.riscv ++ [ "powerpc64-linux" "powerpc64le-linux" "mips64el-linux" ]; maintainers = with maintainers; [ OPNA2608 ]; }; } diff --git a/pkgs/development/compilers/open-watcom/wrapper.nix b/pkgs/development/compilers/open-watcom/wrapper.nix index 0677d32e6ea9..95752b2c2fe4 100644 --- a/pkgs/development/compilers/open-watcom/wrapper.nix +++ b/pkgs/development/compilers/open-watcom/wrapper.nix @@ -13,16 +13,29 @@ let wrapper = {}: let + archToBindir = with stdenv.hostPlatform; if isx86 then + "bin" + else if isAarch then + "arm" + # we don't support running on AXP + # don't know what MIPS, PPC bindirs are called + else throw "Don't know where ${system} binaries are located!"; + binDirs = with stdenv.hostPlatform; if isWindows then [ - (lib.optionalString is64bit "binnt64") - "binnt" - (lib.optionalString is32bit "binw") - ] else if (isDarwin && is64bit) then [ - "bino64" + (lib.optionalString is64bit "${archToBindir}nt64") + "${archToBindir}nt" + (lib.optionalString is32bit "${archToBindir}w") + ] else if (isDarwin) then [ + (lib.optionalString is64bit "${archToBindir}o64") + # modern Darwin cannot execute 32-bit code anymore + (lib.optionalString is32bit "${archToBindir}o") ] else [ - (lib.optionalString is64bit "binl64") - "binl" + (lib.optionalString is64bit "${archToBindir}l64") + "${archToBindir}l" ]; + # TODO + # This works good enough as-is, but should really only be targetPlatform-specific + # but we don't support targeting DOS, OS/2, 16-bit Windows etc Nixpkgs-wide so this needs extra logic includeDirs = with stdenv.hostPlatform; [ "h" ] @@ -71,9 +84,9 @@ let } EOF cat test.c - # Darwin target not supported, only host wcl386 -fe=test_c test.c - ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "./test_c"} + # Only test execution if hostPlatform is targetable + ${lib.optionalString (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch) "./test_c"} cat <test.cpp #include @@ -91,9 +104,9 @@ let } EOF cat test.cpp - # Darwin target not supported, only host wcl386 -fe=test_cpp test.cpp - ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "./test_cpp"} + # Only test execution if hostPlatform is targetable + ${lib.optionalString (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch) "./test_cpp"} touch $out ''; cross = runCommand "${name}-test-cross" { nativeBuildInputs = [ wrapped file ]; } '' diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 820469ab8f15..72b25bff777b 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -11,8 +11,8 @@ let major = "11"; minor = "0"; - update = "15"; - build = "10"; + update = "17"; + build = "8"; openjdk = stdenv.mkDerivation rec { pname = "openjdk" + lib.optionalString headless "-headless"; @@ -22,7 +22,7 @@ let owner = "openjdk"; repo = "jdk${major}u"; rev = "jdk-${version}"; - sha256 = "le2JDxPJPSuga4JxLJNRZwCaodptSb2kh4TsJXumTXs="; + sha256 = "sha256-kvgLYqQZPqyuigVyzbDHc3TMff0clvzM8IdzYLYcxPU="; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; @@ -131,12 +131,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index a8de9fe43ffc..bd3defbd6b98 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -135,12 +135,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index 5b7e87b0ef3a..40dc753f7955 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -135,12 +135,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index 1381b0995a76..047e1a390819 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -131,12 +131,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix index 6ea1d0b1dd31..c33e937f9f24 100644 --- a/pkgs/development/compilers/openjdk/15.nix +++ b/pkgs/development/compilers/openjdk/15.nix @@ -131,12 +131,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index 0e1911bb1a70..461cd724144e 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -138,12 +138,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix index f49ef7bf553d..6d8087d7e948 100644 --- a/pkgs/development/compilers/openjdk/17.nix +++ b/pkgs/development/compilers/openjdk/17.nix @@ -11,7 +11,7 @@ let version = { feature = "17"; - interim = ".0.4"; + interim = ".0.5"; build = "8"; }; @@ -23,7 +23,7 @@ let owner = "openjdk"; repo = "jdk${version.feature}u"; rev = "jdk-${version.feature}${version.interim}+${version.build}"; - sha256 = "drbljLz82ZyK29lIDLPqCkwqpBdgU/7zCTZ0ceeb1SI="; + sha256 = "sha256-2k1Mm36ds6MZheZVsLvXkoqQG4zYeIRWzbP1aZ72Vqs="; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; @@ -55,8 +55,8 @@ let # Patch borrowed from Alpine to fix build errors with musl libc and recent gcc. # This is applied anywhere to prevent patchrot. (fetchurl { - url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=6f97cb0ae4dff6588dae5868c2522aea96c99d2c"; - sha256 = "sha256-giOmMInwLH0Ei9H7ETsrrzQU09I6+dn8KpPrKb7zn8I="; + url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c"; + sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo="; }) ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk13.patch @@ -149,12 +149,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/18.nix b/pkgs/development/compilers/openjdk/18.nix index 5be60eb94875..37b51a1ee4ce 100644 --- a/pkgs/development/compilers/openjdk/18.nix +++ b/pkgs/development/compilers/openjdk/18.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio +{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio , file, which, unzip, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib , libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst , libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk18-bootstrap @@ -49,6 +49,13 @@ let url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) + + # Patch borrowed from Alpine to fix build errors with musl libc and recent gcc. + # This is applied anywhere to prevent patchrot. + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/testing/openjdk18/FixNullPtrCast.patch?id=b93d1fc37fcf106144958d957bb97c7db67bd41f"; + hash = "sha256-nvO8RcmKwMcPdzq28mZ4If1XJ6FQ76CYWqRIozPCk5U="; + }) ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk13.patch ]; @@ -140,12 +147,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix new file mode 100644 index 000000000000..717bfedcb635 --- /dev/null +++ b/pkgs/development/compilers/openjdk/19.nix @@ -0,0 +1,178 @@ +{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio +, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib +, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst +, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk19-bootstrap +, ensureNewerSourcesForZipFilesHook +, setJavaClassPath +# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages +# which should be fixable, this is a no-rebuild workaround for GHC. +, headless ? stdenv.targetPlatform.isGhcjs +, enableJavaFX ? openjfx.meta.available, openjfx +, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +}: + +let + version = { + feature = "19"; + interim = ".0.1"; + build = "10"; + }; + + openjdk = stdenv.mkDerivation { + pname = "openjdk" + lib.optionalString headless "-headless"; + version = "${version.feature}${version.interim}+${version.build}"; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jdk${version.feature}u"; + rev = "jdk-${version.feature}${version.interim}+${version.build}"; + hash = "sha256-IS6ABnVdW1qJ4gu4YSgMVFXBTNdtWFdbNNz+kMaiyk8="; + }; + + nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; + buildInputs = [ + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib + libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst + libXi libXinerama libXcursor libXrandr fontconfig openjdk19-bootstrap + ] ++ lib.optionals (!headless && enableGnome2) [ + gtk3 gnome_vfs GConf glib + ]; + + patches = [ + ./fix-java-home-jdk10.patch + ./read-truststore-from-env-jdk10.patch + ./currency-date-range-jdk10.patch + ./increase-javadoc-heap-jdk13.patch + ./ignore-LegalNoticeFilePlugin-jdk18.patch + + # -Wformat etc. are stricter in newer gccs, per + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 + # so grab the work-around from + # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 + (fetchurl { + url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; + sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; + }) + + # Patch borrowed from Alpine to fix build errors with musl libc and recent gcc. + # This is applied anywhere to prevent patchrot. + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/testing/openjdk19/FixNullPtrCast.patch?id=b93d1fc37fcf106144958d957bb97c7db67bd41f"; + hash = "sha256-cnpeYcVoRYjuDgrl2x27frv6KUAnu1+1MVPehPZy/Cg="; + }) + ] ++ lib.optionals (!headless && enableGnome2) [ + ./swing-use-gtk-jdk13.patch + ]; + + postPatch = '' + chmod +x configure + patchShebangs --build configure + ''; + + configureFlags = [ + "--with-boot-jdk=${openjdk19-bootstrap.home}" + "--with-version-build=${version.build}" + "--with-version-opt=nixos" + "--with-version-pre=" + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + "--with-libjpeg=system" + "--with-giflib=system" + "--with-libpng=system" + "--with-zlib=system" + "--with-lcms=system" + "--with-stdc++lib=dynamic" + ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + + separateDebugInfo = true; + + NIX_CFLAGS_COMPILE = "-Wno-error"; + + NIX_LDFLAGS = toString (lib.optionals (!headless) [ + "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" + ] ++ lib.optionals (!headless && enableGnome2) [ + "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ]); + + # -j flag is explicitly rejected by the build system: + # Error: 'make -jN' is not supported, use 'make JOBS=N' + # Note: it does not make build sequential. Build system + # still runs in parallel. + enableParallelBuilding = false; + + buildFlags = [ "images" ]; + + installPhase = '' + mkdir -p $out/lib + + mv build/*/images/jdk $out/lib/openjdk + + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man + + # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) + ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo + ${lib.optionalString headless '' + rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so + ''} + + ln -s $out/lib/openjdk/bin $out/bin + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook so that any package + # that depends on the JDK has $CLASSPATH set up properly. + mkdir -p $out/nix-support + #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 + echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat < $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi + EOF + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $(getAllOutputNames); do + if [ "$output" = debug ]; then continue; fi + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" + done + # Add the local library paths to remove dependencies on the bootstrap + for output in $(getAllOutputNames); do + if [ "$output" = debug ]; then continue; fi + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + ''; + + disallowedReferences = [ openjdk19-bootstrap ]; + + meta = import ./meta.nix lib version.feature; + + passthru = { + architecture = ""; + home = "${openjdk}/lib/openjdk"; + inherit gtk3; + }; + }; +in openjdk diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index c232b1f01f16..c65a9fcc66b6 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -20,7 +20,7 @@ let powerpc64le-linux = "ppc64le"; }.${stdenv.system} or (throw "Unsupported platform ${stdenv.system}"); - update = "322"; + update = "352"; build = "ga"; openjdk8 = stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ let owner = "openjdk"; repo = "jdk8u"; rev = "jdk${version}"; - sha256 = "sha256-e39Yv+NDQG7z6fGmpKEnkKd5MoHZ50SXlq/Q7lzWcDA="; + sha256 = "sha256-xDiiALDjStD9IPhbBr997rm/v2Q/WdS10cILBCmdJIQ="; }; outputs = [ "out" "jre" ]; @@ -187,12 +187,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/darwin/19.nix b/pkgs/development/compilers/openjdk/darwin/19.nix new file mode 100644 index 000000000000..e582c4016a54 --- /dev/null +++ b/pkgs/development/compilers/openjdk/darwin/19.nix @@ -0,0 +1,81 @@ +{ lib, stdenv, fetchurl, unzip, setJavaClassPath }: +let + # Details from https://www.azul.com/downloads/?version=java-19-sts&os=macos&package=jdk + # Note that the latest build may differ by platform + dist = { + x86_64-darwin = { + arch = "x64"; + zuluVersion = "19.30.11"; + jdkVersion = "19.0.1"; + sha256 = "1h0qj0xgpxjy506ikbgdn74pi4860lsnh5n3q3bayfmn0pxc5ksn"; + }; + + aarch64-darwin = { + arch = "aarch64"; + zuluVersion = "19.30.11"; + jdkVersion = "19.0.1"; + sha256 = "0g8i371h5fv686xhiff0431sgvdk80lbp2lkz86jpfdv9lgg0qnk"; + }; + }."${stdenv.hostPlatform.system}"; + + jce-policies = fetchurl { + # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; + }; + + jdk = stdenv.mkDerivation rec { + pname = "zulu${dist.zuluVersion}-ca-jdk"; + version = dist.jdkVersion; + + src = fetchurl { + url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; + inherit (dist) sha256; + curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; + }; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out + mv * $out + + unzip ${jce-policies} + mv -f ZuluJCEPolicies/*.jar $out/lib/security/ + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/darwin/*_md.h $out/include/ + + if [ -f $out/LICENSE ]; then + install -D $out/LICENSE $out/share/zulu/LICENSE + rm $out/LICENSE + fi + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook from the JDK so that + # any package that depends on the JDK has $CLASSPATH set up + # properly. + mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + cat <> $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + # fixupPhase is moving the man to share/man which breaks it because it's a + # relative symlink. + postFixup = '' + ln -nsf ../zulu-${lib.versions.major version}.jdk/Contents/Home/man $out/share/man + ''; + + passthru = { + home = jdk; + }; + + meta = import ./meta.nix lib version; + }; +in +jdk diff --git a/pkgs/development/compilers/openjdk/meta.nix b/pkgs/development/compilers/openjdk/meta.nix index 0fbd9eff3e4c..127a921f097c 100644 --- a/pkgs/development/compilers/openjdk/meta.nix +++ b/pkgs/development/compilers/openjdk/meta.nix @@ -3,7 +3,7 @@ lib: version: with lib; { license = licenses.gpl2Only; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo asbachb ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" "powerpc64le-linux" ]; mainProgram = "java"; knownVulnerabilities = optionals (builtins.elem (versions.major version) [ "12" "13" "14" "15" "16" "18" ]) [ "This OpenJDK version has reached its end of life." diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 7a01486e2dd9..164677c3b8dc 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,26 +1,38 @@ -{ stdenv, lib, fetchurl, writeText, gradle_4, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4, python2, ruby +{ stdenv, lib, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby, icu68 , openjdk11-bootstrap }: let major = "11"; - update = ".0.3"; + update = ".0.17"; build = "1"; repover = "${major}${update}+${build}"; - gradle_ = (gradle_4.override { + gradle_ = (gradle_7.override { java = openjdk11-bootstrap; }); + NIX_CFLAGS_COMPILE = [ + # avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc. + "-DGLIB_DISABLE_DEPRECATION_WARNINGS" + # glib-2.62 deprecations + # -fcommon: gstreamer workaround for -fno-common toolchains: + # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of + # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here + "-fcommon" + ]; + makePackage = args: stdenv.mkDerivation ({ version = "${major}${update}-${build}"; - src = fetchurl { - url = "https://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz"; - sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194"; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx${major}u"; + rev = repover; + sha256 = "sha256-uKb6k+tIFdwy1BYiHWeGmKNz82X4CZjFlGYqLDpSFY0="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python2 ruby ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -34,9 +46,6 @@ let JDK_HOME = ${openjdk11-bootstrap.home} '' + args.gradleProperties or ""); - #avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc. - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; - buildPhase = '' runHook preBuild @@ -65,11 +74,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - # Downloaded AWT jars differ by platform. - outputHash = { - i686-linux = "0mjlyf6jvbis7nrm5d394sjv4hjw6k3753hr1nwdxk8skwc3ry08"; - x86_64-linux = "0d4msxswdav1xsfkpr0qd3xgqkcbxzf47v1zdy5jmg5w4bs6a78a"; - }.${stdenv.system} or (throw "Unsupported platform"); + outputHash = "sha256-syceJMUEknBDCHK8eGs6rUU3IQn+HnQfURfCrDxYPa9="; }; in makePackage { @@ -77,7 +82,7 @@ in makePackage { gradleProperties = '' COMPILE_MEDIA = true - COMPILE_WEBKIT = true + COMPILE_WEBKIT = false ''; preBuild = '' @@ -91,12 +96,6 @@ in makePackage { cp -r build/modular-sdk $out ''; - # glib-2.62 deprecations - # -fcommon: gstreamer workaround for -fno-common toolchains: - # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of - # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS -fcommon"; - stripDebugList = [ "." ]; postFixup = '' @@ -105,6 +104,9 @@ in makePackage { new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${openjdk11-bootstrap}[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done + + # Remove licenses, otherwise they may conflict with the ones included in the openjdk + rm -rf $out/modules_legal/* ''; disallowedReferences = [ openjdk11-bootstrap ]; @@ -119,6 +121,6 @@ in makePackage { license = licenses.gpl2; description = "The next-generation Java client toolkit"; maintainers = with maintainers; [ abbradar ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index 74f83fdabf1a..788baabde848 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_5 +{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_6 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg_4, python3, ruby }: +, ffmpeg_4-headless, python3, ruby }: let major = "15"; update = ".0.1"; build = "+1"; repover = "${major}${update}${build}"; - gradle_ = (gradle_5.override { + gradle_ = (gradle_6.override { java = openjdk11_headless; }); @@ -21,7 +21,7 @@ let sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -69,11 +69,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - # Downloaded AWT jars differ by platform. - outputHash = { - x86_64-linux = "0hmyr5nnjgwyw3fcwqf0crqg9lny27jfirycg3xmkzbcrwqd6qkw"; - i686-linux = "0hx69p2z96p7jbyq4r20jykkb8gx6r8q2cj7m30pldlsw3650bqx"; - }.${stdenv.system} or (throw "Unsupported platform"); + outputHash = "sha256-fGLTMM9s/Vn7eMzn6OQR3tL0cGbAYc7c4J4/aW3JvkI="; }; in makePackage { @@ -81,7 +77,7 @@ in makePackage { gradleProperties = '' COMPILE_MEDIA = true - COMPILE_WEBKIT = true + COMPILE_WEBKIT = false ''; preBuild = '' @@ -121,6 +117,9 @@ in makePackage { license = licenses.gpl2; description = "The next-generation Java client toolkit"; maintainers = with maintainers; [ abbradar ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + knownVulnerabilities = [ + "This OpenJFX version has reached its end of life." + ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17.nix index 734f4d079ef0..8d4d47df32e7 100644 --- a/pkgs/development/compilers/openjdk/openjfx/17.nix +++ b/pkgs/development/compilers/openjdk/openjfx/17.nix @@ -1,10 +1,10 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg_4, python3, ruby, icu68 }: +, ffmpeg_4-headless, python3, ruby, icu68 }: let major = "17"; - update = ".0.0.1"; + update = ".0.5"; build = "+1"; repover = "${major}${update}${build}"; gradle_ = (gradle_7.override { @@ -16,12 +16,12 @@ let src = fetchFromGitHub { owner = "openjdk"; - repo = "jfx"; + repo = "jfx${major}u"; rev = repover; - sha256 = "sha256-PSiE9KbF/4u9VyBl9PAMLGzKyGFB86/XByeh7vhL6Kw="; + sha256 = "sha256-jzLOlWuhkUS0/4+nXtjd1/IYbAHHnJrusFRTh7aPt8U="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/openjdk/openjfx/19.nix b/pkgs/development/compilers/openjdk/openjfx/19.nix new file mode 100644 index 000000000000..96103734eb0a --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/19.nix @@ -0,0 +1,123 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless +, openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst +, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, icu68 }: + +let + major = "19"; + update = ""; + build = "+11"; + repover = "${major}${update}${build}"; + gradle_ = (gradle_7.override { + # note: gradle does not yet support running on 19 + java = openjdk17_headless; + }); + + makePackage = args: stdenv.mkDerivation ({ + version = "${major}${update}${build}"; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx"; + rev = repover; + hash = "sha256-UXTaXtJ8py83V7IQK9wACIEWDAMRUaYNgH9e/Aeyuzc="; + }; + + patches = [ + # 8295962: Reference to State in Task.java is ambiguous when building with JDK 19 + (fetchpatch { + url = "https://github.com/openjdk/jfx/pull/933/commits/cfaee2a52350eff39dd4352484c892716076d3de.patch"; + hash = "sha256-hzJMenhvtmHs/6BJj8GfaLp14myV8VCXCLLC8n32yEw="; + }) + # ditto + (fetchpatch { + url = "https://github.com/openjdk/jfx/pull/933/commits/bd46ce12df0a93a56fe0d58d3653d08e58409b7f.patch"; + hash = "sha256-o9908uw9vYvULmAh/lbfyHhgxz6jpgPq2fcAltWsYoU="; + }) + ]; + + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; + + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" ('' + CONF = Release + JDK_HOME = ${openjdk19_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"; + # suspiciously the same as for openjfx 17 ... + # could they really not have changed any of their dependencies? + # or did we miss changing another upstream hash when copy-pasting? + 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='${openjdk19_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 openjdk19_headless ]; + + passthru.deps = deps; + + meta = with lib; { + homepage = "https://openjdk.org/projects/openjfx/"; + license = licenses.gpl2Classpath; + description = "The next-generation Java client toolkit"; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 5ea72781e41f..771830d8b6ac 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -1,15 +1,28 @@ -{ lib, stdenv, fetchurl, meson, ninja -, gtk-doc ? null, file, docbook_xsl +{ lib +, stdenv +, fetchurl +, meson +, ninja +, file +, docbook_xsl +, gtk-doc ? null , buildDevDoc ? gtk-doc != null + +# for passthru.tests +, gnuradio +, gst_all_1 +, qt6 +, vips + }: let inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "orc"; - version = "0.4.32"; + version = "0.4.33"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/orc/${pname}-${version}.tar.xz"; - sha256 = "1w0qmyj3v9sb2g7ff39pp38b9850y9hyy0bag26ifrby5f7ksvm6"; + sha256 = "sha256-hE5tfbgIb3k/V2GNPUto0p2ZsWA05xQw3zwhz9PDVCo="; }; postPatch = lib.optionalString stdenv.isAarch32 '' @@ -35,6 +48,12 @@ in stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + inherit (gst_all_1) gst-plugins-good gst-plugins-bad gst-plugins-ugly; + inherit gnuradio vips; + qt6-qtmultimedia = qt6.qtmultimedia; + }; + meta = with lib; { description = "The Oil Runtime Compiler"; homepage = "https://gstreamer.freedesktop.org/projects/orc.html"; diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 0fbb0eff2382..5f56966cd489 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -6,7 +6,7 @@ , libclang , zlib , openexr -, openimageio2 +, openimageio , llvm , boost , flex @@ -33,6 +33,7 @@ in stdenv.mkDerivation rec { }; cmakeFlags = [ + "-DBoost_ROOT=${boost}" "-DUSE_BOOST_WAVE=ON" "-DENABLE_RTTI=ON" @@ -59,7 +60,7 @@ in stdenv.mkDerivation rec { libclang llvm openexr - openimageio2 + openimageio partio pugixml python3.pkgs.pybind11 @@ -73,7 +74,6 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "Advanced shading language for production GI renderers"; homepage = "https://opensource.imageworks.com/osl.html"; maintainers = with maintainers; [ hodapp ]; diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix index 2471910fdb5b..c33c35e61427 100644 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "owl-lisp"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitLab { owner = "owl-lisp"; repo = "owl"; rev = "v${version}"; - sha256 = "sha256-G12yZxlq6Hss5j4Seq1hcPQWXMIeL2Z8VkBdmIGESX8="; + sha256 = "sha256-TQOj3DYmzFT4ClZ/sBAOs5XJWRgGTaVQjH+8JotSb1A="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/compilers/p4c/default.nix b/pkgs/development/compilers/p4c/default.nix index cf02a656b770..798cdb790b87 100644 --- a/pkgs/development/compilers/p4c/default.nix +++ b/pkgs/development/compilers/p4c/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "p4c"; - version = "1.2.3.2"; + version = "1.2.3.5"; src = fetchFromGitHub { owner = "p4lang"; repo = "p4c"; rev = "v${version}"; - sha256 = "sha256-EeTYH7CsmPPBL05zJ+g4aM677n0NqDD+H40lBuKpY6M="; + sha256 = "sha256-5wDwHj+1X6HhhiLfEbOzijpZH6GwpTPEKgNh3iIGTWY="; fetchSubmodules = true; }; @@ -80,9 +80,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/p4lang/p4c"; + changelog = "https://github.com/p4lang/p4c/releases"; description = "Reference compiler for the P4 programming language"; platforms = platforms.linux; - maintainers = with maintainers; [ raitobezarius ]; + maintainers = with maintainers; [ raitobezarius govanify ]; license = licenses.asl20; }; } diff --git a/pkgs/development/compilers/paco/default.nix b/pkgs/development/compilers/paco/default.nix index 69e7b2628787..d8014dd8e51b 100644 --- a/pkgs/development/compilers/paco/default.nix +++ b/pkgs/development/compilers/paco/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "paco"; version = "1.0"; @@ -8,11 +8,22 @@ buildGoPackage rec { owner = "pacolang"; repo = "paco"; rev = "v${version}"; - sha256 = "03x75h40dhjswbf2g1408krj9b1w05y9pjzygzhklldc75r3n9dh"; + hash = "sha256-sCU7cjmsUTrhf/7Lm3wBPKwk80SAhCfc4lrCBggspw8="; }; - goPackagePath = "github.com/pacolang/paco"; - goDeps = ./deps.nix; + vendorHash = "sha256-J0TKp1df5IWq3Irlzf1lvhWlXnP//MsVqs9M8TtEraw="; + + patches = [ + # Set correct package path in go.mod + (fetchpatch { + url = "https://github.com/pacolang/paco/pull/1/commits/886f0407e94418d34c7e062c6857834aea3c99ac.patch"; + hash = "sha256-HRNJSyWz1OY+kCV+eaRJbaDXkH4n1NaMpFxCuEhocK4="; + }) + ]; + + subPackages = [ "." ]; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "A simple compiled programming language"; diff --git a/pkgs/development/compilers/paco/deps.nix b/pkgs/development/compilers/paco/deps.nix deleted file mode 100644 index a3ec48b7f1e7..000000000000 --- a/pkgs/development/compilers/paco/deps.nix +++ /dev/null @@ -1,93 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.0"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/gookit/color"; - fetch = { - type = "git"; - url = "https://github.com/gookit/color"; - rev = "v1.1.7"; - sha256 = "02gq82i9srr8bv5yhgkmn5j1r3pn8wspiisvhpbyhykm1fn736mz"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/niemeyer/pretty"; - fetch = { - type = "git"; - url = "https://github.com/niemeyer/pretty"; - rev = "a10e7caefd8e"; - sha256 = "1jmazh4xzaa3v6g46hz60q2z7nmqs9l9cxdzmmscn3kbcs2znq4v"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "8fa46927fb4f"; - sha256 = "0fx03x0nx9mjwnqphnx852q9p76qg7cazrachvgr1bj357lplrcw"; - }; - } - { - goPackagePath = "gopkg.in/pipe.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/pipe.v2"; - rev = "3c2ca4d52544"; - sha256 = "090wrj4n6a6pzdlakcxy9qnkngc8hp6m49ipbnlszs0hyj2hnngv"; - }; - } -] diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix index efd3d1bfd40a..f48377e0e0ac 100644 --- a/pkgs/development/compilers/polyml/5.7.nix +++ b/pkgs/development/compilers/polyml/5.7.nix @@ -44,5 +44,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; platforms = with platforms; (linux ++ darwin); maintainers = with maintainers; [ maggesi ]; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/compilers/ponyc/pony-corral.nix b/pkgs/development/compilers/ponyc/pony-corral.nix index ab7bf63006a2..a39973733474 100644 --- a/pkgs/development/compilers/ponyc/pony-corral.nix +++ b/pkgs/development/compilers/ponyc/pony-corral.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, ponyc }: +{ lib +, stdenv +, fetchFromGitHub +, ponyc +}: stdenv.mkDerivation ( rec { pname = "corral"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; - rev = version; - sha256 = "sha256-8hSs1pllAips27Lut1GbSn3E9lbp4BT1L2AlkyDd46o="; + rev = "refs/tags/${version}"; + hash = "sha256-Rv1K6kFRylWodm1uACBs8KqqEqQZh86NqAG50heNteE="; }; buildInputs = [ ponyc ]; @@ -18,6 +22,7 @@ stdenv.mkDerivation ( rec { meta = with lib; { description = "Corral is a dependency management tool for ponylang (ponyc)"; homepage = "https://www.ponylang.io"; + changelog = "https://github.com/ponylang/corral/blob/${version}/CHANGELOG.md"; license = licenses.bsd2; maintainers = with maintainers; [ redvers ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index c3bb4c7ff016..acd889ce85b8 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.15.6"; + version = "0.15.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 = "14l4m9xgp9slg4hfaqkwvzdvmg26qj2livldni3lmivvcagjgb2x"; + sha256 = "0aq5sr93z6c5l76sqbj3g48z6yrhxfqxri0x1ajmjwhcwjg79d6v"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "1vw3igxv4zr5gf1ml5ls17w9cc9shdn8fvbk6dkfnxrs93cwrq0k"; + sha256 = "032jqrk46k9zbq058ms8rnrq0209rd8vkxwj73vqrlgqvpzlfl5k"; }; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 6dca665ad99d..732d33608e35 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -12,19 +12,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-etzEXbILje+CrfJxIhH7jthEMoSJdS6O33QoG8HrLvI="; }; + strictDeps = true; nativeBuildInputs = [ makeWrapper menhir - ]; - - buildInputs = [ + ocaml + menhir cppo dune_3 findlib + ]; + + buildInputs = [ fix - menhir menhirSdk - ocaml ppxlib utop ] ++ lib.optional (lib.versionOlder ocaml.version "4.07") ncurses; diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index 0d076f0cfae3..b58f24c151aa 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.5.2"; + version = "0.6.1"; src = fetchFromGitHub { owner = "gbdev"; repo = "rgbds"; rev = "v${version}"; - sha256 = "sha256-/GjxdB3Nt+XuKKQWjU12mS91U4FFoeP+9t0L+HsB/o8="; + sha256 = "sha256-3mx4yymrOQnP5aJCzPWl5G96WBxt1ixU6tdzhhOsF04="; }; nativeBuildInputs = [ bison flex pkg-config ]; buildInputs = [ libpng ]; diff --git a/pkgs/development/compilers/rml/default.nix b/pkgs/development/compilers/rml/default.nix new file mode 100644 index 000000000000..7eebf8a622b4 --- /dev/null +++ b/pkgs/development/compilers/rml/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, ocamlPackages +}: + +stdenv.mkDerivation rec { + pname = "rml"; + version = "1.09.07"; + + src = fetchFromGitHub { + owner = "reactiveml"; + repo = pname; + rev = "${pname}-${version}-2021-07-26"; + hash = "sha256-UFqXQBeIQMSV4O439j9s06p1hh7xA98Tu79FsjK9PIY="; + }; + + nativeBuildInputs = with ocamlPackages; [ + ocaml + ]; + + buildInputs = with ocamlPackages; [ + num + ]; + + configureFlags = [ "--prefix" "${placeholder "out"}" ]; + + dontAddPrefix = true; + + meta = with lib; { + description = "ReactiveML: a programming language for implementing interactive systems"; + homepage = "https://rml.lri.fr"; + license = with licenses; [ qpl lgpl21Plus ]; + maintainers = with maintainers; [ wegank ]; + }; +} diff --git a/pkgs/development/compilers/roslyn/create-deps.sh b/pkgs/development/compilers/roslyn/create-deps.sh deleted file mode 100755 index f5da4acd8bff..000000000000 --- a/pkgs/development/compilers/roslyn/create-deps.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p dotnet-sdk_5 -p jq -p xmlstarlet -p curl -set -euo pipefail - -cat << EOL -{ fetchurl }: [ -EOL - -tmpdir="$(mktemp -d -p "$(pwd)")" # must be under source root -trap 'rm -rf "$tmpdir"' EXIT - -HOME="$tmpdir" dotnet msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir"/.nuget/packages \ - -p:RestoreNoCache=true -p:RestoreForce=true \ - src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj >&2 - -mapfile -t repos < <( - xmlstarlet sel -t -v 'configuration/packageSources/add/@value' -n NuGet.config "$tmpdir"/.nuget/NuGet/NuGet.Config | - while IFS= read index - do - curl --compressed -fsL "$index" | \ - jq -r '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"' - done -) - -cd "$tmpdir/.nuget/packages" -for package in * -do - cd "$package" - for version in * - do - found=false - for repo in "${repos[@]}" - do - url="$repo$package/$version/$package.$version.nupkg" - if curl -fsL "$url" -o /dev/null - then - found=true - break - fi - done - - if ! $found - then - echo "couldn't find $package $version" >&2 - exit 1 - fi - - sha256=$(nix-prefetch-url "$url" 2>/dev/null) - cat << EOL - { - pname = "$package"; - version = "$version"; - src = fetchurl { - url = "$url"; - sha256 = "$sha256"; - }; - } -EOL - done - cd .. -done - -cat << EOL -] -EOL diff --git a/pkgs/development/compilers/roslyn/default.nix b/pkgs/development/compilers/roslyn/default.nix index 69cca6b13d9b..dc98dce8b2b5 100644 --- a/pkgs/development/compilers/roslyn/default.nix +++ b/pkgs/development/compilers/roslyn/default.nix @@ -1,90 +1,40 @@ -{ lib, stdenv +{ lib , fetchFromGitHub -, fetchurl , mono -, dotnet-sdk_5 -, makeWrapper -, dotnetPackages +, buildDotnetModule +, dotnetCorePackages , unzip -, writeText -, symlinkJoin }: -let - - deps = map (package: stdenv.mkDerivation (with package; { - inherit pname version src; - - buildInputs = [ unzip ]; - unpackPhase = '' - unzip -o $src - chmod -R u+r . - function traverseRename () { - for e in * - do - t="$(echo "$e" | sed -e "s/%20/\ /g" -e "s/%2B/+/g")" - [ "$t" != "$e" ] && mv -vn "$e" "$t" - if [ -d "$t" ] - then - cd "$t" - traverseRename - cd .. - fi - done - } - - traverseRename - ''; - - installPhase = '' - runHook preInstall - - package=$out/lib/dotnet/${pname}/${version} - mkdir -p $package - cp -r . $package - echo "{}" > $package/.nupkg.metadata - - runHook postInstall - ''; - - dontFixup = true; - })) - (import ./deps.nix { inherit fetchurl; }); - - nuget-config = writeText "NuGet.Config" '' - - - - - - - ''; - - packages = symlinkJoin { name = "roslyn-deps"; paths = deps; }; - - packageVersion = "3.10.0"; - -in stdenv.mkDerivation rec { - +buildDotnetModule rec { pname = "roslyn"; - version = "${packageVersion}-1.21102.26"; + version = "4.2.0"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "v${version}"; - sha256 = "0yf4f4vpqn9lixr37lkp29m2mk51xcm3ysv2ag332xn6zm5zpm2b"; + hash = "sha256-4iXabFp0LqJ8TXOrqeD+oTAocg6ZTIfijfX3s3fMJuI="; }; - nativeBuildInputs = [ makeWrapper dotnet-sdk_5 unzip ]; + dotnet-sdk = dotnetCorePackages.sdk_6_0; + + projectFile = [ "src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj" ]; + + nugetDeps = ./extended-deps.nix; + + dontDotnetFixup = true; + + nativeBuildInputs = [ unzip ]; + + postPatch = '' + sed -i 's/latestPatch/latestFeature/' global.json + ''; buildPhase = '' runHook preBuild - rm NuGet.config - install -m644 -D ${nuget-config} fake-home/.nuget/NuGet/NuGet.Config - ln -s ${packages}/lib/dotnet fake-home/.nuget/packages - HOME=$(pwd)/fake-home dotnet msbuild -r -v:m -t:pack \ + dotnet msbuild -v:m -t:pack \ -p:Configuration=Release \ -p:RepositoryUrl="${meta.homepage}" \ -p:RepositoryCommit="v${version}" \ @@ -94,22 +44,24 @@ in stdenv.mkDerivation rec { ''; installPhase = '' - pkg=$out/lib/dotnet/microsoft.net.compilers.toolset/${packageVersion} - mkdir -p $out/bin $pkg - unzip -q artifacts/packages/Release/Shipping/Microsoft.Net.Compilers.Toolset.${packageVersion}-dev.nupkg \ - -d $pkg + pkg="$out/lib/dotnet/microsoft.net.compilers.toolset/${version}" + mkdir -p "$out/bin" "$pkg" + + unzip -q artifacts/packages/Release/Shipping/Microsoft.Net.Compilers.Toolset.${version}-dev.nupkg \ + -d "$pkg" # nupkg has 0 permissions for a bunch of things - chmod -R +rw $pkg + chmod -R +rw "$pkg" makeWrapper ${mono}/bin/mono $out/bin/csc \ --add-flags "$pkg/tasks/net472/csc.exe" - makeWrapper ${mono}/bin/mono $out/bin/vbs \ - --add-flags "$pkg/tasks/net472/vbs.exe" + makeWrapper ${mono}/bin/mono $out/bin/vbc \ + --add-flags "$pkg/tasks/net472/vbc.exe" ''; meta = with lib; { description = ".NET C# and Visual Basic compiler"; homepage = "https://github.com/dotnet/roslyn"; + mainProgram = "csc"; platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ corngood ]; diff --git a/pkgs/development/compilers/roslyn/deps.nix b/pkgs/development/compilers/roslyn/deps.nix index 1b396eaa4a97..53318abedae9 100644 --- a/pkgs/development/compilers/roslyn/deps.nix +++ b/pkgs/development/compilers/roslyn/deps.nix @@ -1,1138 +1,169 @@ -{ fetchurl }: [ - { - 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"; - sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; - }; - } - { - 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"; - sha256 = "1dhanwb9ihbfay85xj7cwn0byzmmdz94hqfi3q6r1ncwdjd8y1s2"; - }; - } - { - 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"; - sha256 = "135swyygp7cz2civwsz6a7dj7h8bzp7yrybmgxjanxwrw66hm933"; - }; - } - { - 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"; - sha256 = "1gwlhvqlkvs5c7qjky726alf71xflbh3x970g3dypfczi0y6gccx"; - }; - } - { - 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"; - sha256 = "1p8a0l9sxmjj86qha748qjw2s2n07q8mn41mj5r6apjnwl27ywnf"; - }; - } - { - 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"; - sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; - }; - } - { - 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"; - sha256 = "0rmvi0z21nrmv57z88jp6i3yis94w37yqnlyycwr3k9gn0682pig"; - }; - } - { - 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"; - sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; - }; - } - { - 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"; - sha256 = "0r9gvyal8338q1n1fplh90isa4bz3vrwrw1pmadf3grd9xyz2amz"; - }; - } - { - 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"; - sha256 = "1n1l9w5v44v13lafqcm440s4g483b7gjcj8m59msr20h3s9lvc8l"; - }; - } - { - 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"; - sha256 = "0nqc0ab8yv9wmk3zzmzfngrm083cxwp6i4wfnzsrafr5h1kckg1m"; - }; - } - { - 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"; - sha256 = "1vmll01v47xvjbs6pzixsvvlinbys042jj3n95lw6gcyyvp3zkav"; - }; - } - { - 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"; - sha256 = "1akg10gzbymnp6phvkh3rwf6d23kfiv62af1nhbm0a3fiz86xyqk"; - }; - } - { - 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"; - sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; - }; - } - { - 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"; - sha256 = "0w26g69ikhd8jjcw96b26rf6ia2wg6c61cl4sm1jgbnhgq23jkdx"; - }; - } - { - 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"; - sha256 = "0bzgwdf9cm8ji08qd9i4z191igkgmf1cjzbdhcwxqd7pgalj7cwq"; - }; - } - { - 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"; - sha256 = "024m4d9d3dg89w7d8z7wqkbxb44084zk56f2r8qavqj2gib6pb6c"; - }; - } - { - pname = "microsoft.netcore.app.host.linux-x64"; - version = "3.1.25"; - 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.25/microsoft.netcore.app.host.linux-x64.3.1.25.nupkg"; - sha256 = "1dxk7v29wr736hlz8nfm2xv8dxmdl59w8w56kqjrvdw1lvgm411v"; - }; - } - { - pname = "microsoft.netcore.app.host.linux-arm64"; - version = "3.1.25"; - src = fetchurl { - url = "https://globalcdn.nuget.org/packages/microsoft.netcore.app.host.linux-arm64.3.1.25.nupkg"; - sha256 = "1xp56v22il0cmg6r113yv9rprgyppmvphx400zagdgac8a536ywq"; - }; - } - { - 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"; - sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; - }; - } - { - 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"; - sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; - }; - } - { - 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"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }; - } - { - 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"; - sha256 = "0nmdnkmwyxj8cp746hs9an57zspqlmqdm55b00i7yk8a22s6akxz"; - }; - } - { - 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"; - sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; - }; - } - { - 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"; - sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; - }; - } - { - 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"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }; - } - { - 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"; - sha256 = "0402cmxxqkpmjmckzwhy9k25rxrai40zxk9vla3rqgg14a02g55h"; - }; - } - { - 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"; - sha256 = "0mpjn9j6l9mah825rydxd1wqqljsjlnqg1hx6bb97l10xjmgf288"; - }; - } - { - 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"; - sha256 = "00hfjh8d3z5np51qgr1s3q4j7bl34mfiypf7nbxcmxa7cyj0rg65"; - }; - } - { - 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"; - sha256 = "1qv0k0apxv3j1pccki2rzakjfb0868hmg0968da0639f75s3glr9"; - }; - } - { - 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"; - sha256 = "0q1mgjjkwxvzn5v29pqiyg0j0jwi5qc0q04za9k1x138kliq2iba"; - }; - } - { - 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"; - sha256 = "1xb6ly8w4kisg517pd9pamm8g4y7k0k311aji504ccdjxin4fflp"; - }; - } - { - 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"; - sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; - }; - } - { - 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"; - sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"; - }; - } - { - 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"; - sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; - }; - } - { - 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"; - sha256 = "1pp1608xizvv0h9q01bqy7isd3yzb3lxb2yp27j4k25xsvw460vg"; - }; - } - { - 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"; - sha256 = "0q35h0h4jdazkn695f0vppyxnl0zgb7qqa5cdr56fgvdw53b01y0"; - }; - } - { - 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"; - sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; - }; - } - { - 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"; - sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; - }; - } - { - 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"; - sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; - }; - } - { - 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"; - sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; - }; - } - { - 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"; - sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; - }; - } - { - 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"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; - }; - } - { - 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"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; - }; - } - { - 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"; - sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; - }; - } - { - 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"; - sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; - }; - } - { - 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"; - sha256 = "17615br2x5riyx8ivf1dcqwj6q3ipq1bi5hqhw54yfyxmx38ddva"; - }; - } - { - 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"; - sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; - }; - } - { - 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"; - sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; - }; - } - { - 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"; - sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; - }; - } - { - 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"; - sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; - }; - } - { - 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"; - sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; - }; - } - { - 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"; - sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; - }; - } - { - 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"; - sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; - }; - } - { - 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"; - sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; - }; - } - { - 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"; - sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; - }; - } - { - 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"; - sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; - }; - } - { - 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"; - sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; - }; - } - { - 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"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }; - } - { - 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"; - sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; - }; - } - { - 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"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; - }; - } - { - 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"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }; - } - { - 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"; - sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; - }; - } - { - 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"; - sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; - }; - } - { - 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"; - sha256 = "1i5i5hc7mdvkhip4fpf0nbskanrigcp52wa5n16kmm920gl5ab4r"; - }; - } - { - 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"; - sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; - }; - } - { - 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"; - sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; - }; - } - { - 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"; - sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; - }; - } - { - 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"; - sha256 = "0i33x9f4h3yq26yvv6xnq4b0v51rl5z8v1bm7vk972h5lvf4apad"; - }; - } - { - 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"; - sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; - }; - } - { - 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"; - sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; - }; - } - { - 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"; - sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; - }; - } - { - 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"; - sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; - }; - } - { - 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"; - sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; - }; - } - { - 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"; - sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; - }; - } - { - 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"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; - }; - } - { - 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"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }; - } - { - 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"; - sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; - }; - } - { - 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"; - sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; - }; - } - { - 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"; - sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; - }; - } - { - 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"; - sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; - }; - } - { - 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"; - sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; - }; - } - { - 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"; - sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; - }; - } - { - 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"; - sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; - }; - } - { - 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"; - sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; - }; - } - { - 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"; - sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b"; - }; - } - { - 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"; - sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; - }; - } - { - 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"; - sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; - }; - } - { - 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"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; - }; - } - { - 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"; - sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; - }; - } - { - 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"; - sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; - }; - } - { - 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"; - sha256 = "1jafi73dcf1lalrir46manq3iy6xnxk2z7gpdpwg4wqql7dv3ril"; - }; - } - { - 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"; - sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; - }; - } - { - 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"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; - }; - } - { - 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"; - sha256 = "07hp218kjdcvpl27djspnixgnacbp9apma61zz3wsca9fx5g3lmv"; - }; - } - { - 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"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; - }; - } - { - 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"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }; - } - { - 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"; - sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; - }; - } - { - 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"; - sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; - }; - } - { - 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"; - sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; - }; - } - { - 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"; - sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; - }; - } - { - 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"; - sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; - }; - } - { - 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"; - sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; - }; - } - { - 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"; - sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; - }; - } - { - 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"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; - }; - } - { - 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"; - sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; - }; - } - { - 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"; - sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; - }; - } - { - 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"; - sha256 = "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"; - }; - } - { - 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"; - sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; - }; - } - { - 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"; - sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; - }; - } - { - 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"; - sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk"; - }; - } - { - 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"; - sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; - }; - } - { - 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"; - sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; - }; - } - { - 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"; - sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; - }; - } - { - 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"; - sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; - }; - } - { - 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"; - sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; - }; - } - { - 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"; - sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; - }; - } - { - 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"; - sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; - }; - } - { - 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"; - sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; - }; - } - { - 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"; - sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; - }; - } - { - 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"; - sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; - }; - } - { - 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"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; - }; - } - { - 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"; - sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; - }; - } - { - 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"; - sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; - }; - } - { - 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"; - sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; - }; - } - { - 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"; - sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; - }; - } - { - 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"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; - }; - } - { - 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"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }; - } - { - 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"; - sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; - }; - } - { - 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"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; - }; - } - { - 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"; - sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; - }; - } - { - 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"; - sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; - }; - } - { - 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"; - sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; - }; - } - { - 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"; - sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; - }; - } - { - 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"; - sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; - }; - } - { - 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"; - sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; - }; - } - { - 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"; - sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; - }; - } - { - 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"; - sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; - }; - } - { - 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"; - sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; - }; - } - { - 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"; - sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m"; - }; - } - { - 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"; - sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; - }; - } - { - 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"; - sha256 = "0xsfzws7rn9sfk4mgkbil21m8d3k3kccfk5f4g6lzvc1vk0pa26j"; - }; - } +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; 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"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "3.1.32"; sha256 = "00ha2sl4gvqv68mbrsizd6ngqy0vv6vamngzjxr338k1w7a276dx"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/3.1.32/microsoft.aspnetcore.app.runtime.linux-arm64.3.1.32.nupkg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.32"; sha256 = "0ywz63q8vrdp25ix2j9b7h2jp5grc68hqfl64c6lqk26q9xwhp9r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/3.1.32/microsoft.aspnetcore.app.runtime.linux-x64.3.1.32.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "16.5.0"; sha256 = "1xgr02r7s9i6s70n237hss4yi9zicssia3zd2ny6s8vyxb7jpdyb"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/16.5.0/microsoft.build.framework.16.5.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "16.5.0"; sha256 = "08mpdcnjbjpsggfzb3plpmjg1jhx2j4zslm8m2p3icnrpw8swxz4"; 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/16.5.0/microsoft.build.tasks.core.16.5.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.2.0-beta-22167-02"; sha256 = "1zb5vhlc9kzqbw22hg84hakhqms0aa7ghy585229hsf278rfh2sy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.tasks.git/1.2.0-beta-22167-02/microsoft.build.tasks.git.1.2.0-beta-22167-02.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "16.5.0"; sha256 = "127l700qqky1nfrljncrpk7y4f0qi0811kpk2j87659nnv81bxs7"; 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/16.5.0/microsoft.build.utilities.core.16.5.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; 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.3.3/microsoft.codeanalysis.analyzers.3.3.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.4-beta1.22160.2"; sha256 = "1g95w9jbwg74f04dif3wbdbcigrx5rwv1ng4g102970l1lbx898b"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49e5305d-d845-4a14-9d69-6f5dbfb9570c/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.3.4-beta1.22160.2/microsoft.codeanalysis.bannedapianalyzers.3.3.4-beta1.22160.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; 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"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "6.0.0-rc1.21366.2"; sha256 = "18svr40y7c0gv68hv9g9fzd9f8hm7bqwygrwvax3i8cajbfwmzp4"; 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-rc1.21366.2/microsoft.codeanalysis.netanalyzers.6.0.0-rc1.21366.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers"; version = "3.3.4-beta1.22160.2"; sha256 = "01jaajr4qmc70dwixzrxyh638wkf5s33hm0km4lwrw4n5j1xivp1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/e31c6eea-0277-49f3-8194-142be67a9f72/nuget/v3/flat2/microsoft.codeanalysis.performancesensitiveanalyzers/3.3.4-beta1.22160.2/microsoft.codeanalysis.performancesensitiveanalyzers.3.3.4-beta1.22160.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.PublicApiAnalyzers"; version = "3.3.4-beta1.22160.2"; sha256 = "0ih091ls51x5k9q998g14pfy4r3g1ygvzihj1gkrl79wydn7b0n3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49e5305d-d845-4a14-9d69-6f5dbfb9570c/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.3.4-beta1.22160.2/microsoft.codeanalysis.publicapianalyzers.3.3.4-beta1.22160.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.csharp/4.7.0/microsoft.csharp.4.7.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.DiaSymReader.Native"; version = "17.0.0-beta1.21524.1"; sha256 = "0gash3xgzvcb78w2xqv003l0cld199zpfilnjbagwbr5ikdh6f3s"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diasymreader.native/17.0.0-beta1.21524.1/microsoft.diasymreader.native.17.0.0-beta1.21524.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.DotNet.XliffTasks"; version = "1.0.0-beta.22169.1"; sha256 = "12fcin3d4m0lawla9fflz9f2qispzgvzf1mwkpscmlk5lnvb0riw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/1.0.0-beta.22169.1/microsoft.dotnet.xlifftasks.1.0.0-beta.22169.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Net.Compilers.Toolset"; version = "4.2.0-1.final"; sha256 = "02zas22hj29gv2w7h74q786i0cvxffgwqai21ri0zj41nb2hwhyq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.compilers.toolset/4.2.0-1.final/microsoft.net.compilers.toolset.4.2.0-1.final.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "3.1.32"; sha256 = "1zygp70xrk5zggs3q4a6yc6jfdwzcsjjsapqpwn6qyx35m69b72p"; 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-arm64/3.1.32/microsoft.netcore.app.host.linux-arm64.3.1.32.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.32"; sha256 = "08sar3s7j6z1q5prjmz2jrbsq5ms81mrsi1c1zbfrkplkfjpld3a"; 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.32/microsoft.netcore.app.host.linux-x64.3.1.32.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; 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"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "3.1.32"; sha256 = "13pcn74z1swz73s72zjl07f118j35wacnzgk7kbjqn83nwgqdgvq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/3.1.32/microsoft.netcore.app.runtime.linux-arm64.3.1.32.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.32"; sha256 = "0mmc57dl8plrspdxwb7209wz29vhiwqds4nfbdfws7zg35yy70c7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/3.1.32/microsoft.netcore.app.runtime.linux-x64.3.1.32.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; 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"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; 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"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; 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.1/microsoft.netcore.platforms.1.1.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/5.0.0/microsoft.netcore.platforms.5.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; 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"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; 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"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.2"; sha256 = "0i42rn8xmvhn08799manpym06kpw89qy9080myyy2ngy565pqh0a"; 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.2/microsoft.netframework.referenceassemblies.1.0.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.2"; sha256 = "1dny43jksy6dm9zrkdm8j80gb25w6wdvjlxnphj7ngf0fbg3dd2c"; 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.2/microsoft.netframework.referenceassemblies.net472.1.0.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.AzureRepos.Git"; version = "1.2.0-beta-22167-02"; sha256 = "1mqzajvp0xa8smhilrakp9nr18r2lbqgn0jb79443srvjf93f6sl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.sourcelink.azurerepos.git/1.2.0-beta-22167-02/microsoft.sourcelink.azurerepos.git.1.2.0-beta-22167-02.nupkg"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.2.0-beta-22167-02"; sha256 = "1s4x6syw1vfs0wrlyjvf5n7xiqgqnyv9cmmnaxzmx41f7zydirj6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.sourcelink.common/1.2.0-beta-22167-02/microsoft.sourcelink.common.1.2.0-beta-22167-02.nupkg"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.2.0-beta-22167-02"; sha256 = "0zwc5sxvcz26rcyirrbd55cnz1v7s0njlj91jk3rdjxw6aw2bgnr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.sourcelink.github/1.2.0-beta-22167-02/microsoft.sourcelink.github.1.2.0-beta-22167-02.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "1.16.30"; sha256 = "14022lx03vdcqlvbbdmbsxg5pqfx1rfq2jywxlyaz9v68cvsb0g4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/1.16.30/microsoft.visualstudio.setup.configuration.interop.1.16.30.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.2.10-alpha"; sha256 = "1wv2cs1zkb7dc66vdmcdwl92jyza5a6d043kpn8zzqdig1p9b5da"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/2a239fd0-3e21-40b0-b9d6-bc122fec7eb2/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.2.10-alpha/microsoft.visualstudio.threading.analyzers.17.2.10-alpha.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; 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.3.0/microsoft.win32.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; 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.3.0/microsoft.win32.registry.4.3.0.nupkg"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; 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"; }) + (fetchNuGet { pname = "RichCodeNav.EnvVarDump"; version = "0.1.1643-alpha"; sha256 = "1pp1608xizvv0h9q01bqy7isd3yzb3lxb2yp27j4k25xsvw460vg"; 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"; }) + (fetchNuGet { pname = "Roslyn.Diagnostics.Analyzers"; version = "3.3.4-beta1.22160.2"; sha256 = "0rr7q46vc5lbywm3mf4ld1kjkg9w7fbmkkyka0bi8idrfib7kn0i"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49e5305d-d845-4a14-9d69-6f5dbfb9570c/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.3.4-beta1.22160.2/roslyn.diagnostics.analyzers.3.3.4-beta1.22160.2.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.globalization.calendars/4.3.0/runtime.any.system.globalization.calendars.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/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"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/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"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/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"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; 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.3.0/runtime.native.system.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; 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.3.0/runtime.native.system.net.http.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; 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.apple/4.3.0/runtime.native.system.security.cryptography.apple.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; 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.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; 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.openssl/4.3.2/runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/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"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/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"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/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"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/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"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/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"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/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"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/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"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/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"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.microsoft.win32.primitives/4.3.0/runtime.unix.microsoft.win32.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.diagnostics.debug/4.3.0/runtime.unix.system.diagnostics.debug.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.io.filesystem/4.3.0/runtime.unix.system.io.filesystem.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.net.primitives/4.3.0/runtime.unix.system.net.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.private.uri/4.3.0/runtime.unix.system.private.uri.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.runtime.extensions/4.3.0/runtime.unix.system.runtime.extensions.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.3.0/system.buffers.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; 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"; }) + (fetchNuGet { pname = "System.CodeDom"; version = "4.4.0"; sha256 = "1zgbafm5p380r50ap5iddp11kzhr9khrf2pnai6k593wjar74p1g"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.codedom/4.4.0/system.codedom.4.4.0.nupkg"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; 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"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; 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"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; 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"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; 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.3.0/system.collections.concurrent.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; 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.5.0/system.collections.immutable.1.5.0.nupkg"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; 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"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; 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"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; 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"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.diagnosticsource/4.3.0/system.diagnostics.diagnosticsource.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; 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"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; 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.3.0/system.diagnostics.tracing.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; 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"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; 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"; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; 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.3.0/system.globalization.calendars.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization.extensions/4.3.0/system.globalization.extensions.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; 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"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; 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"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; 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.3.0/system.io.filesystem.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; 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.3.0/system.io.filesystem.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.IO.Pipes.AccessControl"; version = "5.0.0"; sha256 = "0jl5b95cy8biivi1kdn2wi0gy2m1a0gyj8fy88djybrg2705c8fz"; 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/5.0.0/system.io.pipes.accesscontrol.5.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; 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"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; 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"; }) + (fetchNuGet { pname = "System.Linq.Parallel"; version = "4.0.1"; sha256 = "0i33x9f4h3yq26yvv6xnq4b0v51rl5z8v1bm7vk972h5lvf4apad"; 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"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; 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"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.http/4.3.4/system.net.http.4.3.4.nupkg"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; 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"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; 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"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; 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"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; 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"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; 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.6.0/system.reflection.metadata.1.6.0.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; 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"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; 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"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; 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"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; 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"; }) + (fetchNuGet { pname = "System.Resources.Extensions"; version = "4.6.0"; sha256 = "0inch9jgchgmsg3xjivbhh9mpin40mhdd8dgf4i1p3g42i0hzc0j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.extensions/4.6.0/system.resources.extensions.4.6.0.nupkg"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; 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"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; 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"; }) + (fetchNuGet { pname = "System.Resources.Writer"; version = "4.0.0"; sha256 = "07hp218kjdcvpl27djspnixgnacbp9apma61zz3wsca9fx5g3lmv"; 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"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; 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"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; 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"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; 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"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; 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/6.0.0/system.runtime.compilerservices.unsafe.6.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; 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"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; 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"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; 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"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; 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"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; 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"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; 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"; }) + (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; sha256 = "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"; 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"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; 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.3.0/system.runtime.numerics.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; 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"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/5.0.0/system.security.accesscontrol.5.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; 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.3.0/system.security.cryptography.algorithms.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; 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.3.0/system.security.cryptography.cng.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; 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.3.0/system.security.cryptography.csp.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; 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.3.0/system.security.cryptography.encoding.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; 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.3.0/system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; 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.3.0/system.security.cryptography.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; 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.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; 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/5.0.0/system.security.principal.windows.5.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; 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"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; 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"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.0.1"; sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; 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"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; 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"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; 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/6.0.0/system.text.encoding.codepages.6.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; 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.3.0/system.text.encoding.extensions.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; 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"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; 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"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; 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"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; 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"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "4.9.0"; sha256 = "1g6s9pjg4z8iy98df60y9a01imdqy59zd767vz74rrng78jl2dk5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.dataflow/4.9.0/system.threading.tasks.dataflow.4.9.0.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; 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"; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; 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"; }) ] diff --git a/pkgs/development/compilers/roslyn/extended-deps.nix b/pkgs/development/compilers/roslyn/extended-deps.nix new file mode 100644 index 000000000000..9401e0709d56 --- /dev/null +++ b/pkgs/development/compilers/roslyn/extended-deps.nix @@ -0,0 +1,11 @@ +# Some required nuget packages are not picked up by the deps generation script, +# since they are referenced as a SDK reference, which unfortunately only gets +# downloaded during build time. So we include them manually. +{ fetchNuGet }: (import ./deps.nix { inherit fetchNuGet; }) ++ [ + (fetchNuGet rec { + pname = "Microsoft.DotNet.Arcade.Sdk"; + version = "7.0.0-beta.22171.2"; + 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/${version}/microsoft.dotnet.arcade.sdk.${version}.nupkg"; + sha256 = "15y26skavivkwhnpfa984if3cnpnllbbwbdsjiyfdcalp32fhmjq"; + }) +] diff --git a/pkgs/development/compilers/rust/1_64.nix b/pkgs/development/compilers/rust/1_66.nix similarity index 56% rename from pkgs/development/compilers/rust/1_64.nix rename to pkgs/development/compilers/rust/1_66.nix index f93123fcd70a..6aee98bdba06 100644 --- a/pkgs/development/compilers/rust/1_64.nix +++ b/pkgs/development/compilers/rust/1_66.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.64.0"; - rustcSha256 = "sha256-s82fSB4aKQG/bzgI0wxpzE6oDZPEzE4u1SJYsYA4EgU="; + rustcVersion = "1.66.1"; + rustcSha256 = "sha256-WzyTOpTHIYdwXU7ikxmLq/3QlEL1k3+9aF2zqB9JWbo="; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_14.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_14.libllvm.override { enableSharedLibraries = true; }; @@ -37,25 +37,25 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.63.0"; + bootstrapVersion = "1.65.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "6ac6ca18f119e099749d67c6dc25ce3f70542b43cc05062d5138fc1052e44c54"; - x86_64-unknown-linux-gnu = "536bcf16807a4ff49b7b29af6e573a2f1821055bfad72c275c60e56edc693984"; - x86_64-unknown-linux-musl = "4516f1fa2a0d9ec9176cc734e5faaa0a3d439bd49f75553a484b6c3c6d7905ab"; - arm-unknown-linux-gnueabihf = "8847d8482e1d5ec962e092a63c95618dc7e17a079a9bf58bec1da39cac0ba4ce"; - armv7-unknown-linux-gnueabihf = "d9227bf6d93f49889c698d35adc7ab3e042988740b9d9d9c81fb54fc0f854474"; - aarch64-unknown-linux-gnu = "26745b57500da293a8147122a5998926301350a610c164f053107cbe026d3a51"; - aarch64-unknown-linux-musl = "8fee65f2bd7e010259763939cbef8ed0794773ec8959c5ef90273cf39dcba180"; - x86_64-apple-darwin = "37f76a45b8616e764c2663850758ce822c730e96af60168a46b818f528c1467d"; - aarch64-apple-darwin = "25c3f43459da9b8683292999c3522d88980b0ca3244fe830f5a87a8092aac5a6"; - powerpc64le-unknown-linux-gnu = "781662048caa48b78540c2fb22f0aa7c06d6d8e81aede0f6ef900c11428056cf"; - riscv64gc-unknown-linux-gnu = "a7f398b45229c5cca833f75421c32897174e365fbbdf78e19b87612736c918aa"; - mips64el-unknown-linux-gnuabi64 = "19f04c576c9d6b171acba65cfe44edcbcf6134a75a853d2f1538fdb2128ec654"; + i686-unknown-linux-gnu = "b29869f8e2c7029150a929b2c4e26843f363846ad99253a25be6abcfa8e84f46"; + x86_64-unknown-linux-gnu = "8f754fdd5af783fe9020978c64e414cb45f3ad0a6f44d045219bbf2210ca3cb9"; + x86_64-unknown-linux-musl = "716984def5509a844c2dde1c7be42bfadeb179f751d5c1a30c9c7198c8c089cd"; + arm-unknown-linux-gnueabihf = "e27f835c16bfcb66ad022a17d5c4602899e021e483a432ca4cc2cb4ecd39e938"; + armv7-unknown-linux-gnueabihf = "5376d467a29b32cacb771e0c76dc280bd623852709e7ffd92caabab076d5475f"; + aarch64-unknown-linux-gnu = "f406136010e6a1cdce3fb6573506f00d23858af49dd20a46723c3fa5257b7796"; + aarch64-unknown-linux-musl = "4b701dc3cbac04ebf0e336cff2f4ce5fc1a1984c183226863c9ed911eb00b07e"; + x86_64-apple-darwin = "139087a3937799415fd829e5a88162a69a32c23725a44457f9c96b98e4d64a7c"; + aarch64-apple-darwin = "7ddc335bd10fc32d3039ef36248a5d0c4865db2437c8aad20a2428a6cf41df09"; + powerpc64le-unknown-linux-gnu = "3f1d0d5bb13213348dc65e373f8c412fc0a12ee55abc1c864f7e0300932fc687"; + riscv64gc-unknown-linux-gnu = "aac7067348d218faa452b4bdc735778a51570a310ad645313ec767b5d7c88492"; + mips64el-unknown-linux-gnuabi64 = "d91ed3857c5256720da890f6533684b684e880bf9006dc4e4f4181213a5c4a09"; }; - selectRustPackage = pkgs: pkgs.rust_1_64; + selectRustPackage = pkgs: pkgs.rust_1_66; rustcPatches = [ ]; diff --git a/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix new file mode 100644 index 000000000000..b50097d5e66b --- /dev/null +++ b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix @@ -0,0 +1,10 @@ +{ lib, writeShellScriptBin, cargo, cargo-auditable }: + +(writeShellScriptBin "cargo" '' + export PATH="${lib.makeBinPath [ cargo cargo-auditable ]}:$PATH" + CARGO_AUDITABLE_IGNORE_UNSUPPORTED=1 exec cargo auditable "$@" +'') // { + meta = cargo-auditable.meta // { + mainProgram = "cargo"; + }; +} diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/development/compilers/rust/cargo-auditable.nix new file mode 100644 index 000000000000..1c621276021a --- /dev/null +++ b/pkgs/development/compilers/rust/cargo-auditable.nix @@ -0,0 +1,40 @@ +{ lib, fetchFromGitHub, makeRustPlatform, rustc, cargo }: + +let + args = rec { + pname = "cargo-auditable"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "rust-secure-code"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-mSiEC+9QtRjWmywJnGgUqp+q8fhY0qUYrgjrAVaY114="; + }; + + cargoSha256 = "sha256-Wz5My/QxPpZVsPBUe3KHT3ttD6CTU8NCY8rhFEC+UlA="; + + meta = with lib; { + description = "A tool to make production Rust binaries auditable"; + homepage = "https://github.com/rust-secure-code/cargo-auditable"; + changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${version}/cargo-auditable/CHANGELOG.md"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; + }; + + rustPlatform = makeRustPlatform { + inherit rustc; + cargo = cargo.override { + auditable = false; + }; + }; + + bootstrap = rustPlatform.buildRustPackage (args // { + auditable = false; + }); +in + +rustPlatform.buildRustPackage.override { cargo-auditable = bootstrap; } (args // { + auditable = true; # TODO: remove when this is the default +}) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 2c9a3b1af472..d04eebe7eadf 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,7 +1,8 @@ { lib, stdenv, pkgsHostHost , file, curl, pkg-config, python3, openssl, cmake, zlib , installShellFiles, makeWrapper, cacert, rustPlatform, rustc -, libiconv, CoreFoundation, Security +, CoreFoundation, Security +, auditable ? false # TODO: change to true when this is the default }: rustPlatform.buildRustPackage { @@ -12,6 +13,8 @@ rustPlatform.buildRustPackage { cargoVendorDir = "vendor"; buildAndTestSubdir = "src/tools/cargo"; + inherit auditable; + passthru = { rustc = rustc; inherit (rustc) tests; @@ -23,9 +26,10 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config cmake installShellFiles makeWrapper (lib.getDev pkgsHostHost.curl) + zlib ]; buildInputs = [ cacert file curl python3 openssl zlib ] - ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]; + ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; # cargo uses git-rs which is made for a version of libgit2 from recent master that # is not compatible with the current version in nixpkgs. @@ -72,7 +76,7 @@ rustPlatform.buildRustPackage { meta = with lib; { homepage = "https://crates.io"; description = "Downloads your Rust project's dependencies and builds your project"; - maintainers = with maintainers; [ retrry ]; + maintainers = with maintainers; [ retrry ] ++ teams.rust.members; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index ef01cbf2abc1..42ca74c7164d 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -31,9 +31,8 @@ in inherit (lib') toTargetArch toTargetOs toRustTarget toRustTargetSpec IsNoStdTarget; # This just contains tools for now. But it would conceivably contain - # libraries too, say if we picked some default/recommended versions from - # `cratesIO` to build by Hydra and/or try to prefer/bias in Cargo.lock for - # all vendored Carnix-generated nix. + # libraries too, say if we picked some default/recommended versions to build + # by Hydra. # # In the end game, rustc, the rust standard library (`core`, `std`, etc.), # and cargo would themselves be built with `buildRustCreate` like @@ -82,6 +81,8 @@ in rustPlatform = bootRustPlatform; inherit CoreFoundation Security; }; + cargo-auditable = self.callPackage ./cargo-auditable.nix { }; + cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { }; clippy = self.callPackage ./clippy.nix { inherit Security; }; }); }; diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index b859d01dc085..25a692565db3 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -1,6 +1,11 @@ { buildPackages, callPackage, stdenv, runCommand }@prev: -{ rustc, cargo, stdenv ? prev.stdenv, ... }: +{ rustc +, cargo +, cargo-auditable ? null +, stdenv ? prev.stdenv +, ... +}: rec { rust = { @@ -13,12 +18,11 @@ rec { }; buildRustPackage = callPackage ../../../build-support/rust/build-rust-package { - git = buildPackages.gitMinimal; - inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook - fetchCargoTarball importCargoLock rustc; + inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoNextestHook cargoSetupHook + fetchCargoTarball importCargoLock rustc cargo cargo-auditable; }; - importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {}; + importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix { inherit cargo; }; rustcSrc = callPackage ./rust-src.nix { inherit runCommand rustc; @@ -31,5 +35,5 @@ rec { # Hooks inherit (callPackage ../../../build-support/rust/hooks { inherit stdenv cargo rustc; - }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook bindgenHook; + }) cargoBuildHook cargoCheckHook cargoInstallHook cargoNextestHook cargoSetupHook maturinBuildHook bindgenHook; } diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 8288cd5c61e3..426f13778838 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -52,7 +52,9 @@ in stdenv.mkDerivation rec { # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state" ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++" - ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib"); + ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib" + # https://github.com/NixOS/nixpkgs/issues/201254 + ++ optional (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"); # Increase codegen units to introduce parallelism within the compiler. RUSTFLAGS = "-Ccodegen-units=10"; @@ -163,11 +165,10 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openssl ] - ++ optionals stdenv.isDarwin [ Security ] + # TODO: remove libiconv once 1.66 is used to bootstrap + ++ optionals stdenv.isDarwin [ libiconv Security ] ++ optional (!withBundledLLVM) llvmShared; - depsTargetTargetPropagated = optionals stdenv.isDarwin [ libiconv ]; - outputs = [ "out" "man" "doc" ]; setOutputFlags = false; @@ -210,7 +211,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.rust-lang.org/"; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ cstrahan globin havvy ]; + maintainers = with maintainers; [ cstrahan globin havvy ] ++ teams.rust.members; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/compilers/sbcl/2.x.nix b/pkgs/development/compilers/sbcl/2.x.nix index ec12ccf17b72..c9aa4a962ffa 100644 --- a/pkgs/development/compilers/sbcl/2.x.nix +++ b/pkgs/development/compilers/sbcl/2.x.nix @@ -53,6 +53,18 @@ let "2.2.9" = { sha256 = "sha256-fr69bSAj//cHewNy+hFx+IBSm97GEE8gmDKXwv63wXI="; }; + + "2.2.10" = { + sha256 = "sha256-jMPDqHYSI63vFEqIcwsmdQg6Oyb6FV1wz5GruTXpCDM="; + }; + + "2.2.11" = { + sha256 = "sha256-NgfWgBZzGICEXO1dXVXGBUzEnxkSGhUCfmxWB66Elt8="; + }; + + "2.3.0" = { + sha256 = "sha256-v3Q5SXEq4Cy3ST87i1fOJBlIv2ETHjaGDdszTaFDnJc="; + }; }; in with versionMap.${version}; @@ -99,6 +111,12 @@ stdenv.mkDerivation rec { url = "https://github.com/sbcl/sbcl/commit/f88989694200a5192fb68047d43d0500b2165f7b.patch"; sha256 = "sha256-MXEsK46RARPmB2WBPcrmZk6ArliU8DgHw73x9+/QAmk="; }) + ] ++ lib.optionals (version == "2.2.10") [ + # hard-coded /bin/cat to just ‘cat’, trusting the PATH + (fetchpatch { + url = "https://github.com/sbcl/sbcl/commit/8ed662fbfeb5dde35eb265f390b55b01f79f70c1.patch"; + sha256 = "sha256-2aqb13AFdw9KMf8KQ9yj1HVxgoFWZ9xWmnoDdbRSLy4="; + }) ]; postPatch = '' @@ -159,7 +177,9 @@ stdenv.mkDerivation rec { # duplicate symbol '_static_code_space_free_pointer' in: alloc.o traceroot.o # Should be fixed past 2.1.10 release. "-fcommon" - ]; + ] + # Fails to find `O_LARGEFILE` otherwise. + ++ [ "-D_GNU_SOURCE" ]; buildPhase = '' runHook preBuild diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index 601f05a51bb0..7bb69bde677c 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -1,8 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper, jre, gnugrep, coreutils, writeScript , common-updater-scripts, git, gnused, nix, nixfmt, majorVersion }: -with lib; - let repo = "git@github.com:scala/scala.git"; @@ -102,7 +100,7 @@ stdenv.mkDerivation rec { ''; }; - meta = { + meta = with lib; { description = "A general purpose programming language"; longDescription = '' Scala is a general purpose programming language designed to express diff --git a/pkgs/development/compilers/scala/bare.nix b/pkgs/development/compilers/scala/bare.nix index 92d22ca7d6e6..1914156e59d6 100644 --- a/pkgs/development/compilers/scala/bare.nix +++ b/pkgs/development/compilers/scala/bare.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { mv * $out ''; - fixupPhase = '' + # Use preFixup instead of fixupPhase + # because we want the default fixupPhase as well + preFixup = '' bin_files=$(find $out/bin -type f ! -name common) for f in $bin_files ; do wrapProgram $f --set JAVA_HOME ${jre} --prefix PATH : '${ncurses.dev}/bin' diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 11787f1aa690..2ad68ffec3b3 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -21,4 +21,4 @@ stdenv.mkDerivation { ''; inherit (bare) meta; -} +} // { inherit bare; } diff --git a/pkgs/development/compilers/scryer-prolog/cargo.patch b/pkgs/development/compilers/scryer-prolog/cargo.patch index ccce7ba357d7..48db924ca261 100644 --- a/pkgs/development/compilers/scryer-prolog/cargo.patch +++ b/pkgs/development/compilers/scryer-prolog/cargo.patch @@ -1,66 +1,24 @@ diff --git a/Cargo.lock b/Cargo.lock -index 4d699f11..1eb894fc 100644 +index 05e54911..3a567165 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -875,15 +875,6 @@ version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" - --[[package]] --name = "openssl-src" --version = "300.0.2+3.0.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "14a760a11390b1a5daf72074d4f6ff1a6e772534ae191f999f57e9ee8146d1fb" --dependencies = [ -- "cc", --] -- - [[package]] - name = "openssl-sys" - version = "0.9.70" -@@ -893,7 +884,6 @@ dependencies = [ - "autocfg 1.0.1", - "cc", - "libc", -- "openssl-src", - "pkg-config", - "vcpkg", - ] -@@ -1432,6 +1422,7 @@ dependencies = [ - "divrem", +@@ -1826,6 +1826,7 @@ dependencies = [ + "futures", "fxhash", "git-version", + "gmp-mpfr-sys", "hostname", - "indexmap", - "instructions-template", + "hyper", + "hyper-tls", diff --git a/Cargo.toml b/Cargo.toml -index 8e81a947..d21a8d49 100644 +index 6e42de23..a50e3d47 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -55,7 +55,7 @@ ring = "0.16.13" - ripemd160 = "0.8.0" - sha3 = "0.8.2" - blake2 = "0.8.1" --openssl = { version = "0.10.29", features = ["vendored"] } -+openssl = { version = "0.10.29" } - native-tls = "0.2.4" - chrono = "0.4.11" - select = "0.4.3" -@@ -66,10 +66,14 @@ sodiumoxide = "0.2.6" - static_assertions = "1.1.0" - slice-deque = "0.3.0" +@@ -63,6 +63,7 @@ hyper = { version = "0.14", features = ["full"] } + hyper-tls = "0.5.0" + tokio = { version = "1", features = ["full"] } + futures = "0.3" ++gmp-mpfr-sys = { version = "1.4.10", features = ["use-system-libs"] } -+[dependencies.gmp-mpfr-sys] -+version = "1.4" -+features = ["use-system-libs"] -+ [dev-dependencies] assert_cmd = "1.0.3" - predicates-core = "1.0.2" - serial_test = "0.5.1" - - [profile.release] --debug = true -\ No newline at end of file -+debug = true diff --git a/pkgs/development/compilers/scryer-prolog/default.nix b/pkgs/development/compilers/scryer-prolog/default.nix index 0d4d843664ca..739d600bf63d 100644 --- a/pkgs/development/compilers/scryer-prolog/default.nix +++ b/pkgs/development/compilers/scryer-prolog/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , rustPlatform , rustfmt , gmp @@ -13,30 +12,21 @@ rustPlatform.buildRustPackage rec { pname = "scryer-prolog"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "mthom"; repo = "scryer-prolog"; rev = "v${version}"; - sha256 = "3NHpEg6QaUaqbBCq8uM5hFcqS24q4XrOnKjMmn8Z1Dg="; + sha256 = "bDLVOXX9nv6Guu5czRFkviJf7dBiaqt5O8SLUJlcBZo="; }; cargoPatches = [ # Use system openssl, gmp, mpc and mpfr. ./cargo.patch - - ./fix-tests.patch - - # Avoid testing failing with "couldn't save history" - (fetchpatch { - name = "fix-tests-1"; - url = "https://patch-diff.githubusercontent.com/raw/mthom/scryer-prolog/pull/1342.patch"; - sha256 = "2N0AOkFuf+H/aUn2QTXgmqjmvShTxHxB6kNuNdNoVRI="; - }) ]; - cargoSha256 = "nqAHVXAmTW9mdE2L2yhpOTz16JbYgQUmCgiFq9pBzUU="; + cargoSha256 = "A6HtvxGTjJliDMUSGkQKB13FRyfBU4EPvrlZ97ic0Ic="; nativeBuildInputs = [ pkg-config rustfmt]; buildInputs = [ openssl gmp libmpc mpfr ]; diff --git a/pkgs/development/compilers/scryer-prolog/fix-tests.patch b/pkgs/development/compilers/scryer-prolog/fix-tests.patch deleted file mode 100644 index 53ececfdc794..000000000000 --- a/pkgs/development/compilers/scryer-prolog/fix-tests.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/tests/scryer/src_tests.rs b/tests/scryer/src_tests.rs -index b0b9efb5..8fddd842 100644 ---- a/tests/scryer/src_tests.rs -+++ b/tests/scryer/src_tests.rs -@@ -46,24 +46,6 @@ fn rules() { - load_module_test("src/tests/rules.pl", ""); - } - --#[serial] --#[test] --fn setup_call_cleanup_load() { -- load_module_test( -- "src/tests/setup_call_cleanup.pl", -- "1+21+31+2>_17737+_177381+_158071+2>41+2>_177381+2>31+2>31+2>4ba" -- ); --} -- --#[test] --fn setup_call_cleanup_process() { -- run_top_level_test_with_args( -- &["src/tests/setup_call_cleanup.pl", "-f", "-g", "halt"], -- "", -- "1+21+31+2>_19590+_195911+_176601+2>41+2>_195911+2>31+2>31+2>4ba" -- ); --} -- - #[serial] - #[test] - fn clpz_load() { diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index 8f6bc5e6dac0..584c0e7a6604 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -1,11 +1,9 @@ { lib, stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, zlib, gputils ? null , excludePorts ? [] }: -with lib; - let # choices: mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8 - excludedPorts = excludePorts ++ (optionals (gputils == null) [ "pic14" "pic16" ]); + excludedPorts = excludePorts ++ (lib.optionals (gputils == null) [ "pic14" "pic16" ]); in stdenv.mkDerivation rec { @@ -29,7 +27,7 @@ stdenv.mkDerivation rec { fi ''; - meta = { + meta = with lib; { description = "Small Device C Compiler"; longDescription = '' SDCC is a retargettable, optimizing ANSI - C compiler suite that targets @@ -39,7 +37,7 @@ stdenv.mkDerivation rec { Rabbit 3000A). Work is in progress on supporting the Microchip PIC16 and PIC18 targets. It can be retargeted for other microprocessors. ''; - homepage = "http://sdcc.sourceforge.net/"; + homepage = "https://sdcc.sourceforge.net/"; license = with licenses; if (gputils == null) then gpl2Plus else unfreeRedistributable; maintainers = with maintainers; [ bjornfor yorickvp ]; platforms = platforms.all; diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 65938fcc2265..3a75c9b8c959 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -8,25 +8,25 @@ let glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "18eef33bd7a4bf5ad8c69f99cb72022608cf6e73"; - sha256 = "sha256-tkWVvYmSpJPaZ8VJOkAWndDWhA0PiHAkR3feBAo+knM="; + rev = "728c689574fba7e53305b475cd57f196c1a21226"; + hash = "sha256-BAgDQosiO3e4yy2DpQ6SjrJNrHTUDSduHFRvzWvd4v0="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "c2d5375fa7cc87c93f692e7200d5d974283d4391"; - sha256 = "sha256-tMJRljrlH+qb+27rTn+3LuEyMOVpiU0zSCiGNfUTb6g="; + rev = "d9446130d5165f7fafcb3599252a22e264c7d4bd"; + hash = "sha256-fuYhzfkWXDm1icLHifc32XZCNQ6Dj5f5WJslT2JoMbc="; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "0c28b6451d77774912e52949c1e57fa726edf113"; - sha256 = "sha256-KpCMceTV/BRaoJe1qeXhKYQNQqdGaM6Q9nklpJKzHFY="; + rev = "c214f6f2d1a7253bb0e9f195c2dc5b0659dc99ef"; + hash = "sha256-/9EDOiqN6ZzDhRKP/Kv8D/BT2Cs7G8wyzEsGATLpmrA="; }; in stdenv.mkDerivation rec { pname = "shaderc"; - version = "2021.0"; + version = "2022.4"; outputs = [ "out" "lib" "bin" "dev" "static" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "google"; repo = "shaderc"; rev = "v${version}"; - sha256 = "sha256-RfSMzrGVtdXbr/mjSrHoN447e3vMQfJbesQMvLOARBs="; + hash = "sha256-/p2gJ7Lnh8IfvwBwHPDtmfLJ8j+Rbv+Oxu9lxY6fxfk="; }; patchPhase = '' diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index 7f1311579892..26efb81e1686 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -88,5 +88,7 @@ in stdenv.mkDerivation { platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ thoughtpolice ]; mainProgram = "sml"; + # never built on x86_64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index d00a354be187..55bf5237e618 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -84,7 +84,7 @@ let buildInputs = [ boost ] ++ lib.optionals z3Support [ z3 ] ++ lib.optionals cvc4Support [ cvc4 cln gmp ]; - checkInputs = [ ncurses python3 ]; + nativeCheckInputs = [ ncurses python3 ]; # tests take 60+ minutes to complete, only run as part of passthru tests doCheck = false; diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 30c87ed99735..96d3b5f6fc42 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , bash-completion, perl, ncurses, zlib, sqlite, libffi , mcpp, cmake, bison, flex, doxygen, graphviz , makeWrapper @@ -19,6 +19,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-wdTBSmyA2I+gaSV577NNKA2oY2fdVTGmvV7h15NY1tU="; }; + patches = [ + ./threads.patch + (fetchpatch { + name = "missing-override.patch"; + url = "https://github.com/souffle-lang/souffle/commit/da2d778f0cca94f206686546fa56b9ffc738ad75.patch"; + sha256 = "Oefm3vRRwOyom94oGSOK2w9m23gkbJ++9gcWrdLlkyk="; + }) + ]; + + hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ]; + 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, @@ -35,7 +46,6 @@ stdenv.mkDerivation rec { outputs = [ "out" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "A translator of declarative Datalog programs into the C++ language"; homepage = "https://souffle-lang.github.io/"; platforms = platforms.unix; diff --git a/pkgs/development/compilers/souffle/threads.patch b/pkgs/development/compilers/souffle/threads.patch new file mode 100644 index 000000000000..cf23baa1550d --- /dev/null +++ b/pkgs/development/compilers/souffle/threads.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73d5c3c84..e4b0dbfd1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -104,13 +104,6 @@ option(SOUFFLE_CUSTOM_GETOPTLONG "Enable/Disable custom getopt_long implementati + cmake_dependent_option(SOUFFLE_USE_LIBCPP "Link to libc++ instead of libstdc++" ON + "CMAKE_CXX_COMPILER_ID STREQUAL Clang" OFF) + +-# Using Clang? Likely want to use `lld` too. +-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld") +- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld") +- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld") +-endif() +- + # Add aditional modules to CMake + set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) + +@@ -247,7 +240,11 @@ endif() + # pthreads + # -------------------------------------------------- + set(THREADS_PREFER_PTHREAD_FLAG ON) +-find_package(Threads REQUIRED) ++set(CMAKE_THREAD_LIBS_INIT "-lpthread") ++set(CMAKE_HAVE_THREADS_LIBRARY 1) ++set(CMAKE_USE_WIN32_THREADS_INIT 0) ++set(CMAKE_USE_PTHREADS_INIT 1) ++set(THREADS_PREFER_PTHREAD_FLAG ON) + + # -------------------------------------------------- + # OpenMP diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 2100c7d9070a..19fa928a4d0e 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -10,23 +10,25 @@ let llvmMajor = lib.versions.major llvm.version; + isROCm = lib.hasPrefix "rocm" llvm.pname; + # ROCm will always be at the latest version branch = - if llvmMajor == "15" then rec { + if llvmMajor == "15" || isROCm then rec { version = "15.0.0"; rev = "v${version}"; - hash = "sha256-111yL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg="; + hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI="; } else if llvmMajor == "14" then rec{ version = "14.0.0"; rev = "v${version}"; hash = "sha256-BhNAApgZ/w/92XjpoDY6ZEIhSTwgJ4D3/EfNvPmNM2o="; } else if llvmMajor == "11" then { version = "unstable-2022-05-04"; - rev = "99420daab98998a7e36858befac9c5ed109d4920"; # 265 commits ahead of v11.0.0 - hash = "sha256-/vUyL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg="; + rev = "4ef524240833abfeee1c5b9fff6b1bd53f4806b3"; # 267 commits ahead of v11.0.0 + hash = "sha256-NoIoa20+2sH41rEnr8lsMhtfesrtdPINiXtUnxYVm8s="; } else throw "Incompatible LLVM version."; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "SPIRV-LLVM-Translator"; inherit (branch) version; @@ -36,15 +38,17 @@ stdenv.mkDerivation rec { inherit (branch) rev hash; }; - nativeBuildInputs = [ pkg-config cmake llvm.dev spirv-tools ]; + nativeBuildInputs = [ pkg-config cmake spirv-tools ] + ++ (if isROCm then [ llvm ] else [ llvm.dev ]); - buildInputs = [ spirv-headers llvm ]; + buildInputs = [ spirv-headers ] + ++ lib.optionals (!isROCm) [ llvm ]; - checkInputs = [ lit ]; + nativeCheckInputs = [ lit ]; cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=ON" - "-DLLVM_DIR=${llvm.dev}" + "-DLLVM_DIR=${(if isROCm then llvm else llvm.dev)}" "-DBUILD_SHARED_LIBS=YES" "-DLLVM_SPIRV_BUILD_EXTERNAL=YES" # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/ @@ -64,7 +68,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator"; description = "A tool and a library for bi-directional translation between SPIR-V and LLVM IR"; license = licenses.ncsa; - platforms = platforms.all; + platforms = platforms.unix; maintainers = with maintainers; [ gloaming ]; }; } diff --git a/pkgs/development/compilers/stanc/default.nix b/pkgs/development/compilers/stanc/default.nix new file mode 100644 index 000000000000..b4d0c5e68230 --- /dev/null +++ b/pkgs/development/compilers/stanc/default.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, ocamlPackages +}: + +ocamlPackages.buildDunePackage rec { + pname = "stanc"; + version = "2.31.0"; + + minimalOCamlVersion = "4.12"; + + src = fetchFromGitHub { + owner = "stan-dev"; + repo = "stanc3"; + rev = "v${version}"; + hash = "sha256-5GOyKVt3LHN1D6UysOZT8isVQLKexwEcK0rwI45dDcg="; + }; + + # Error: This expression has type [ `Use_Sys_unix ] + postPatch = '' + substituteInPlace test/integration/run_bin_on_args.ml \ + --replace "if Sys.file_exists (to_windows path) then to_windows cmd else cmd" "cmd" + ''; + + nativeBuildInputs = with ocamlPackages; [ + menhir + ]; + buildInputs = with ocamlPackages; [ + core_unix + menhirLib + ppx_deriving + fmt + yojson + ]; + + meta = with lib; { + homepage = "https://github.com/stan-dev/stanc3"; + description = "The Stan compiler and utilities"; + license = licenses.bsd3; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix new file mode 100644 index 000000000000..5f37c3ec841b --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -0,0 +1,691 @@ +{ lib +, stdenv +, callPackage +, cmake +, coreutils +, gnugrep +, perl +, ninja +, pkg-config +, clang +, bintools +, python3 +, git +, fetchpatch +, makeWrapper +, gnumake +, file +, runCommand +, writeShellScriptBin +# For lldb +, libedit +, ncurses +, swig +, libxml2 +# Linux-specific +, glibc +, libuuid +# Darwin-specific +, substituteAll +, fixDarwinDylibNames +, runCommandLocal +, xcbuild +, cctools # libtool +, sigtool +, DarwinTools +, CoreServices +, Foundation +, Combine +, MacOSX-SDK +, CLTools_Executables +}: + +let + + inherit (stdenv) hostPlatform targetPlatform; + + sources = callPackage ../sources.nix { }; + + # Tools invoked by swift at run-time. + runtimeDeps = lib.optionals stdenv.isDarwin [ + # libtool is used for static linking. This is part of cctools, but adding + # that as a build input puts an unwrapped linker in PATH, and breaks + # builds. This small derivation exposes just libtool. + # NOTE: The same applies to swift-driver, but that is currently always + # invoked via the old `swift` / `swiftc`. May change in the future. + (runCommandLocal "libtool" { } '' + mkdir -p $out/bin + ln -s ${cctools}/bin/libtool $out/bin/libtool + '') + ]; + + # There are apparently multiple naming conventions on Darwin. Swift uses the + # xcrun naming convention. See `configure_sdk_darwin` calls in CMake files. + swiftOs = if targetPlatform.isDarwin + then { + "macos" = "macosx"; + "ios" = "iphoneos"; + #iphonesimulator + #appletvos + #appletvsimulator + #watchos + #watchsimulator + }.${targetPlatform.darwinPlatform} + or (throw "Cannot build Swift for target Darwin platform '${targetPlatform.darwinPlatform}'") + else targetPlatform.parsed.kernel.name; + + # Apple Silicon uses a different CPU name in the target triple. + swiftArch = if stdenv.isDarwin && stdenv.isAarch64 then "arm64" + else targetPlatform.parsed.cpu.name; + + # On Darwin, a `.swiftmodule` is a subdirectory in `lib/swift/`, + # containing binaries for supported archs. On other platforms, binaries are + # installed to `lib/swift//`. Note that our setup-hook also adds + # `lib/swift` for convenience. + swiftLibSubdir = "lib/swift/${swiftOs}"; + swiftModuleSubdir = if hostPlatform.isDarwin + then "lib/swift/${swiftOs}" + else "lib/swift/${swiftOs}/${swiftArch}"; + + # And then there's also a separate subtree for statically linked modules. + toStaticSubdir = lib.replaceStrings [ "/swift/" ] [ "/swift_static/" ]; + swiftStaticLibSubdir = toStaticSubdir swiftLibSubdir; + swiftStaticModuleSubdir = toStaticSubdir swiftModuleSubdir; + + # This matches _SWIFT_DEFAULT_COMPONENTS, with specific components disabled. + swiftInstallComponents = [ + "autolink-driver" + "compiler" + # "clang-builtin-headers" + "stdlib" + "sdk-overlay" + "parser-lib" + "static-mirror-lib" + "editor-integration" + # "tools" + # "testsuite-tools" + "toolchain-tools" + "toolchain-dev-tools" + "license" + (if stdenv.isDarwin then "sourcekit-xpc-service" else "sourcekit-inproc") + "swift-remote-mirror" + "swift-remote-mirror-headers" + ]; + + # Build a tool used during the build to create a custom clang wrapper, with + # which we wrap the clang produced by the swift build. + # + # This is used in a `POST_BUILD` for the CMake target, so we rename the + # actual clang to clang-unwrapped, then put the wrapper in place. + # + # We replace the `exec ...` command with `exec -a "$0"` in order to + # preserve $0 for clang. This is because, unlike Nix, we don't have + # separate wrappers for clang/clang++, and clang uses $0 to detect C++. + # + # Similarly, the C++ detection in the wrapper itself also won't work for us, + # so we base it on $0 as well. + makeClangWrapper = writeShellScriptBin "nix-swift-make-clang-wrapper" '' + set -euo pipefail + + targetFile="$1" + unwrappedClang="$targetFile-unwrapped" + + mv "$targetFile" "$unwrappedClang" + sed < '${clang}/bin/clang' > "$targetFile" \ + -e 's|^\s*exec|exec -a "$0"|g' \ + -e 's|^\[\[ "${clang.cc}/bin/clang" = \*++ ]]|[[ "$0" = *++ ]]|' \ + -e "s|${clang.cc}/bin/clang|$unwrappedClang|g" + chmod a+x "$targetFile" + ''; + + # Create a tool used during the build to create a custom swift wrapper for + # each of the swift executables produced by the build. + # + # The build produces several `swift-frontend` executables during + # bootstrapping. Each of these has numerous aliases via symlinks, and the + # executable uses $0 to detect what tool is called. + wrapperParams = { + inherit bintools; + default_cc_wrapper = clang; # Instead of `@out@` in the original. + coreutils_bin = lib.getBin coreutils; + gnugrep_bin = gnugrep; + suffixSalt = lib.replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; + use_response_file_by_default = 1; + swiftDriver = ""; + # NOTE: @prog@ needs to be filled elsewhere. + }; + swiftWrapper = runCommand "swift-wrapper.sh" wrapperParams '' + substituteAll '${../wrapper/wrapper.sh}' "$out" + ''; + makeSwiftcWrapper = writeShellScriptBin "nix-swift-make-swift-wrapper" '' + set -euo pipefail + + targetFile="$1" + unwrappedSwift="$targetFile-unwrapped" + + mv "$targetFile" "$unwrappedSwift" + sed < '${swiftWrapper}' > "$targetFile" \ + -e "s|@prog@|'$unwrappedSwift'|g" \ + -e 's|exec "$prog"|exec -a "$0" "$prog"|g' + chmod a+x "$targetFile" + ''; + + # On Darwin, we need to use BOOTSTRAPPING-WITH-HOSTLIBS because of ABI + # stability, and have to provide the definitions for the system stdlib. + appleSwiftCore = stdenv.mkDerivation { + name = "apple-swift-core"; + dontUnpack = true; + + installPhase = '' + mkdir -p $out/lib/swift + cp -r \ + "${MacOSX-SDK}/usr/lib/swift/Swift.swiftmodule" \ + "${MacOSX-SDK}/usr/lib/swift/libswiftCore.tbd" \ + $out/lib/swift/ + ''; + }; + +in stdenv.mkDerivation { + pname = "swift"; + inherit (sources) version; + + outputs = [ "out" "lib" "dev" "doc" "man" ]; + + nativeBuildInputs = [ + cmake + git + ninja + perl # pod2man + pkg-config + python3 + makeWrapper + makeClangWrapper + makeSwiftcWrapper + ] + ++ lib.optionals stdenv.isDarwin [ + xcbuild + sigtool # codesign + DarwinTools # sw_vers + fixDarwinDylibNames + ]; + + buildInputs = [ + # For lldb + python3 + swig + libxml2 + ] + ++ lib.optionals stdenv.isLinux [ + libuuid + ] + ++ lib.optionals stdenv.isDarwin [ + CoreServices + Foundation + Combine + ]; + + # This is a partial reimplementation of our setup hook. Because we reuse + # the Swift wrapper for the Swift build itself, we need to do some of the + # same preparation. + postHook = '' + for pkg in "''${pkgsHostTarget[@]}" '${clang.libc}'; do + for subdir in ${swiftModuleSubdir} ${swiftStaticModuleSubdir} lib/swift; do + if [[ -d "$pkg/$subdir" ]]; then + export NIX_SWIFTFLAGS_COMPILE+=" -I $pkg/$subdir" + fi + done + for subdir in ${swiftLibSubdir} ${swiftStaticLibSubdir} lib/swift; do + if [[ -d "$pkg/$subdir" ]]; then + export NIX_LDFLAGS+=" -L $pkg/$subdir" + fi + done + done + ''; + + # We invoke cmakeConfigurePhase multiple times, but only need this once. + dontFixCmake = true; + # We setup custom build directories. + dontUseCmakeBuildDir = true; + + unpackPhase = let + copySource = repo: "cp -r ${sources.${repo}} ${repo}"; + in '' + mkdir src + cd src + + ${copySource "swift-cmark"} + ${copySource "llvm-project"} + ${copySource "swift"} + ${copySource "swift-experimental-string-processing"} + ${lib.optionalString + (!stdenv.isDarwin) + (copySource "swift-corelibs-libdispatch")} + + chmod -R u+w . + ''; + + patchPhase = '' + # Just patch all the things for now, we can focus this later. + # TODO: eliminate use of env. + find -type f -print0 | xargs -0 sed -i \ + ${lib.optionalString stdenv.isDarwin + "-e 's|/usr/libexec/PlistBuddy|${xcbuild}/bin/PlistBuddy|g'"} \ + -e 's|/usr/bin/env|${coreutils}/bin/env|g' \ + -e 's|/usr/bin/make|${gnumake}/bin/make|g' \ + -e 's|/bin/mkdir|${coreutils}/bin/mkdir|g' \ + -e 's|/bin/cp|${coreutils}/bin/cp|g' \ + -e 's|/usr/bin/file|${file}/bin/file|g' + + patch -p1 -d swift -i ${./patches/swift-wrap.patch} + patch -p1 -d swift -i ${./patches/swift-nix-resource-root.patch} + patch -p1 -d swift -i ${./patches/swift-linux-fix-linking.patch} + patch -p1 -d swift -i ${substituteAll { + src = ./patches/swift-darwin-plistbuddy-workaround.patch; + inherit swiftArch; + }} + patch -p1 -d swift -i ${substituteAll { + src = ./patches/swift-prevent-sdk-dirs-warning.patch; + inherit (builtins) storeDir; + }} + substituteInPlace swift/cmake/modules/SwiftConfigureSDK.cmake \ + --replace '/usr/include' "${stdenv.cc.libc_dev}/include" + + # This patch needs to know the lib output location, so must be substituted + # in the same derivation as the compiler. + storeDir="${builtins.storeDir}" \ + substituteAll ${./patches/swift-separate-lib.patch} $TMPDIR/swift-separate-lib.patch + patch -p1 -d swift -i $TMPDIR/swift-separate-lib.patch + + patch -p1 -d llvm-project/llvm -i ${./patches/llvm-module-cache.patch} + + patch -p1 -d llvm-project/clang -i ${./patches/clang-toolchain-dir.patch} + patch -p1 -d llvm-project/clang -i ${./patches/clang-wrap.patch} + patch -p1 -d llvm-project/clang -i ${../../llvm/14/clang/purity.patch} + patch -p2 -d llvm-project/clang -i ${fetchpatch { + name = "clang-cmake-fix-interpreter.patch"; + url = "https://github.com/llvm/llvm-project/commit/b5eaf500f2441eff2277ea2973878fb1f171fd0a.patch"; + sha256 = "1rma1al0rbm3s3ql6bnvbcighp74lri1lcrwbyacgdqp80fgw1b6"; + }} + + ${lib.optionalString stdenv.isLinux '' + substituteInPlace llvm-project/clang/lib/Driver/ToolChains/Linux.cpp \ + --replace 'SysRoot + "/lib' '"${glibc}/lib" "' \ + --replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "' \ + --replace 'LibDir = "lib";' 'LibDir = "${glibc}/lib";' \ + --replace 'LibDir = "lib64";' 'LibDir = "${glibc}/lib";' \ + --replace 'LibDir = X32 ? "libx32" : "lib64";' 'LibDir = "${glibc}/lib";' + + # uuid.h is not part of glibc, but of libuuid. + sed -i 's|''${GLIBC_INCLUDE_PATH}/uuid/uuid.h|${libuuid.dev}/include/uuid/uuid.h|' \ + swift/stdlib/public/Platform/glibc.modulemap.gyb + ''} + + # Remove tests for cross compilation, which we don't currently support. + rm swift/test/Interop/Cxx/class/constructors-copy-irgen.swift + rm swift/test/Interop/Cxx/class/constructors-irgen.swift + + # TODO: consider fixing and re-adding. This test fails due to a non-standard "install_prefix". + rm swift/validation-test/Python/build_swift.swift + + # We cannot handle the SDK location being in "Weird Location" due to Nix isolation. + rm swift/test/DebugInfo/compiler-flags.swift + + # TODO: Fix issue with ld.gold invoked from script finding crtbeginS.o and crtendS.o. + rm swift/test/IRGen/ELF-remove-autolink-section.swift + + # The following two tests fail because we use don't use the bundled libicu: + # [SOURCE_DIR/utils/build-script] ERROR: can't find source directory for libicu (tried /build/src/icu) + rm swift/validation-test/BuildSystem/default_build_still_performs_epilogue_opts_after_split.test + rm swift/validation-test/BuildSystem/test_early_swift_driver_and_infer.swift + + # TODO: This test fails for some unknown reason + rm swift/test/Serialization/restrict-swiftmodule-to-revision.swift + + # This test was flaky in ofborg, see #186476 + rm swift/test/AutoDiff/compiler_crashers_fixed/sr14290-missing-debug-scopes-in-pullback-trampoline.swift + + patchShebangs . + + ${lib.optionalString (!stdenv.isDarwin) '' + # NOTE: This interferes with ABI stability on Darwin, which uses the system + # libraries in the hardcoded path /usr/lib/swift. + fixCmakeFiles . + ''} + ''; + + configurePhase = '' + export SWIFT_SOURCE_ROOT="$PWD" + mkdir -p ../build + cd ../build + export SWIFT_BUILD_ROOT="$PWD" + + # Most builds set a target, but LLDB doesn't. Harmless on non-Darwin. + export MACOSX_DEPLOYMENT_TARGET=10.15 + ''; + + # These steps are derived from doing a normal build with. + # + # ./swift/utils/build-toolchain test --dry-run + # + # But dealing with the custom Python build system is far more trouble than + # simply invoking CMake directly. Few variables it passes to CMake are + # actually required or non-default. + # + # Using CMake directly also allows us to split up the already large build, + # and package Swift components separately. + # + # Besides `--dry-run`, another good way to compare build changes between + # Swift releases is to diff the scripts: + # + # git diff swift-5.6.3-RELEASE..swift-5.7-RELEASE -- utils/build* + # + buildPhase = '' + # Helper to build a subdirectory. + # + # Always reset cmakeFlags before calling this. The cmakeConfigurePhase + # amends flags and would otherwise keep expanding it. + function buildProject() { + mkdir -p $SWIFT_BUILD_ROOT/$1 + cd $SWIFT_BUILD_ROOT/$1 + + cmakeDir=$SWIFT_SOURCE_ROOT/''${2-$1} + cmakeConfigurePhase + + ninjaBuildPhase + } + + cmakeFlags="-GNinja" + buildProject swift-cmark + + # Some notes: + # - The Swift build just needs Clang. + # - We can further reduce targets to just our targetPlatform. + cmakeFlags=" + -GNinja + -DLLVM_ENABLE_PROJECTS=clang + -DLLVM_TARGETS_TO_BUILD=${{ + "x86_64" = "X86"; + "aarch64" = "AArch64"; + }.${targetPlatform.parsed.cpu.name}} + " + buildProject llvm llvm-project/llvm + + '' + lib.optionalString stdenv.isDarwin '' + # Add appleSwiftCore to the search paths. We can't simply add it to + # buildInputs, because it is potentially an older stdlib than the one we're + # building. We have to remove it again after the main Swift build, or later + # build steps may fail. (Specific case: Concurrency backdeploy uses the + # Sendable protocol, which appears to not be present in the macOS 11 SDK.) + OLD_NIX_SWIFTFLAGS_COMPILE="$NIX_SWIFTFLAGS_COMPILE" + OLD_NIX_LDFLAGS="$NIX_LDFLAGS" + export NIX_SWIFTFLAGS_COMPILE+=" -I ${appleSwiftCore}/lib/swift" + export NIX_LDFLAGS+=" -L ${appleSwiftCore}/lib/swift" + '' + '' + + # Some notes: + # - BOOTSTRAPPING_MODE defaults to OFF in CMake, but is enabled in standard + # builds, so we enable it as well. On Darwin, we have to use the system + # Swift libs because of ABI-stability, but this may be trouble if the + # builder is an older macOS. + # - Experimental features are OFF by default in CMake, but are enabled in + # official builds, so we do the same. (Concurrency is also required in + # the stdlib. StringProcessing is often implicitely imported, causing + # lots of warnings if missing.) + # - SWIFT_STDLIB_ENABLE_OBJC_INTEROP is set explicitely because its check + # is buggy. (Uses SWIFT_HOST_VARIANT_SDK before initialized.) + # Fixed in: https://github.com/apple/swift/commit/84083afef1de5931904d5c815d53856cdb3fb232 + cmakeFlags=" + -GNinja + -DBOOTSTRAPPING_MODE=BOOTSTRAPPING${lib.optionalString stdenv.isDarwin "-WITH-HOSTLIBS"} + -DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=ON + -DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY=ON + -DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=ON + -DSWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING=ON + -DLLVM_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/llvm + -DClang_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/clang + -DSWIFT_PATH_TO_CMARK_SOURCE=$SWIFT_SOURCE_ROOT/swift-cmark + -DSWIFT_PATH_TO_CMARK_BUILD=$SWIFT_BUILD_ROOT/swift-cmark + -DSWIFT_PATH_TO_LIBDISPATCH_SOURCE=$SWIFT_SOURCE_ROOT/swift-corelibs-libdispatch + -DEXPERIMENTAL_STRING_PROCESSING_SOURCE_DIR=$SWIFT_SOURCE_ROOT/swift-experimental-string-processing + -DSWIFT_INSTALL_COMPONENTS=${lib.concatStringsSep ";" swiftInstallComponents} + -DSWIFT_STDLIB_ENABLE_OBJC_INTEROP=${if stdenv.isDarwin then "ON" else "OFF"} + " + buildProject swift + + '' + lib.optionalString stdenv.isDarwin '' + # Restore search paths to remove appleSwiftCore. + export NIX_SWIFTFLAGS_COMPILE="$OLD_NIX_SWIFTFLAGS_COMPILE" + export NIX_LDFLAGS="$OLD_NIX_LDFLAGS" + '' + '' + + # These are based on flags in `utils/build-script-impl`. + # + # LLDB_USE_SYSTEM_DEBUGSERVER=ON disables the debugserver build on Darwin, + # which requires a special signature. + # + # CMAKE_BUILD_WITH_INSTALL_NAME_DIR ensures we don't use rpath on Darwin. + # + # NOTE: On Darwin, we only want ncurses in the linker search path, because + # headers are part of libsystem. Adding its headers to the search path + # causes strange mixing and errors. Note that libedit propagates ncurses, + # so we add both manually here, instead of relying on setup hooks. + # TODO: Find a better way to prevent this conflict. + cmakeFlags=" + -GNinja + -DLLDB_SWIFTC=$SWIFT_BUILD_ROOT/swift/bin/swiftc + -DLLDB_SWIFT_LIBS=$SWIFT_BUILD_ROOT/swift/lib/swift + -DLLVM_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/llvm + -DClang_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/clang + -DSwift_DIR=$SWIFT_BUILD_ROOT/swift/lib/cmake/swift + -DLLDB_ENABLE_CURSES=ON + -DLLDB_ENABLE_LIBEDIT=ON + -DLLDB_ENABLE_PYTHON=ON + -DLLDB_ENABLE_LZMA=OFF + -DLLDB_ENABLE_LUA=OFF + -DLLDB_INCLUDE_TESTS=OFF + -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON + ${lib.optionalString stdenv.isDarwin '' + -DLLDB_USE_SYSTEM_DEBUGSERVER=ON + ''} + -DLibEdit_INCLUDE_DIRS=${libedit.dev}/include + -DLibEdit_LIBRARIES=${libedit}/lib/libedit${stdenv.hostPlatform.extensions.sharedLibrary} + -DCURSES_INCLUDE_DIRS=${if stdenv.isDarwin then "/var/empty" else ncurses.dev}/include + -DCURSES_LIBRARIES=${ncurses}/lib/libncurses${stdenv.hostPlatform.extensions.sharedLibrary} + -DPANEL_LIBRARIES=${ncurses}/lib/libpanel${stdenv.hostPlatform.extensions.sharedLibrary} + "; + buildProject lldb llvm-project/lldb + + ${lib.optionalString stdenv.isDarwin '' + # Need to do a standalone build of concurrency for Darwin back deployment. + # Based on: utils/swift_build_support/swift_build_support/products/backdeployconcurrency.py + cmakeFlags=" + -GNinja + -DCMAKE_Swift_COMPILER=$SWIFT_BUILD_ROOT/swift/bin/swiftc + + -DTOOLCHAIN_DIR=/var/empty + -DSWIFT_NATIVE_LLVM_TOOLS_PATH=${stdenv.cc}/bin + -DSWIFT_NATIVE_CLANG_TOOLS_PATH=${stdenv.cc}/bin + -DSWIFT_NATIVE_SWIFT_TOOLS_PATH=$SWIFT_BUILD_ROOT/swift/bin + + -DCMAKE_CROSSCOMPILING=ON + + -DBUILD_SWIFT_CONCURRENCY_BACK_DEPLOYMENT_LIBRARIES=ON + -DSWIFT_INCLUDE_TOOLS=OFF + -DSWIFT_BUILD_STDLIB_EXTRA_TOOLCHAIN_CONTENT=OFF + -DSWIFT_BUILD_TEST_SUPPORT_MODULES=OFF + -DSWIFT_BUILD_STDLIB=OFF + -DSWIFT_BUILD_DYNAMIC_STDLIB=OFF + -DSWIFT_BUILD_STATIC_STDLIB=OFF + -DSWIFT_BUILD_REMOTE_MIRROR=OFF + -DSWIFT_BUILD_SDK_OVERLAY=OFF + -DSWIFT_BUILD_DYNAMIC_SDK_OVERLAY=OFF + -DSWIFT_BUILD_STATIC_SDK_OVERLAY=OFF + -DSWIFT_INCLUDE_TESTS=OFF + -DSWIFT_BUILD_PERF_TESTSUITE=OFF + + -DSWIFT_HOST_VARIANT_ARCH=${swiftArch} + -DBUILD_STANDALONE=ON + + -DSWIFT_INSTALL_COMPONENTS=back-deployment + + -DSWIFT_SDKS=${{ + "macos" = "OSX"; + "ios" = "IOS"; + #IOS_SIMULATOR + #TVOS + #TVOS_SIMULATOR + #WATCHOS + #WATCHOS_SIMULATOR + }.${targetPlatform.darwinPlatform}} + + -DLLVM_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/llvm + + -DSWIFT_DEST_ROOT=$out + -DSWIFT_HOST_VARIANT_SDK=OSX + + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_OSX=10.15 + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_IOS=13.0 + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_MACCATALYST=13.0 + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS=13.0 + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS=6.0 + " + + # This depends on the special Clang build specific to the Swift branch. + # We also need to call a specific Ninja target. + export CC=$SWIFT_BUILD_ROOT/llvm/bin/clang + export CXX=$SWIFT_BUILD_ROOT/llvm/bin/clang++ + ninjaFlags="back-deployment" + + buildProject swift-concurrency-backdeploy swift + + export CC=$NIX_CC/bin/clang + export CXX=$NIX_CC/bin/clang++ + unset ninjaFlags + ''} + ''; + + # TODO: ~50 failing tests on x86_64-linux. Other platforms not checked. + doCheck = false; + nativeCheckInputs = [ file ]; + # TODO: consider using stress-tester and integration-test. + checkPhase = '' + cd $SWIFT_BUILD_ROOT/swift + checkTarget=check-swift-all + ninjaCheckPhase + unset checkTarget + ''; + + installPhase = '' + # Undo the clang and swift wrapping we did for the build. + # (This happened via patches to cmake files.) + cd $SWIFT_BUILD_ROOT + mv llvm/bin/clang-14{-unwrapped,} + mv swift/bin/swift-frontend{-unwrapped,} + + mkdir $out $lib + + # Install clang binaries only. We hide these with the wrapper, so they are + # for private use by Swift only. + cd $SWIFT_BUILD_ROOT/llvm + installTargets=install-clang + ninjaInstallPhase + unset installTargets + + # LLDB is also a private install. + cd $SWIFT_BUILD_ROOT/lldb + ninjaInstallPhase + + cd $SWIFT_BUILD_ROOT/swift + ninjaInstallPhase + + ${lib.optionalString stdenv.isDarwin '' + cd $SWIFT_BUILD_ROOT/swift-concurrency-backdeploy + installTargets=install-back-deployment + ninjaInstallPhase + unset installTargets + ''} + + # Separate $lib output here, because specific logic follows. + # Only move the dynamic run-time parts, to keep $lib small. Every Swift + # build will depend on it. + moveToOutput "lib/swift" "$lib" + moveToOutput "lib/libswiftDemangle.*" "$lib" + + # This link is here because various tools (swiftpm) check for stdlib + # relative to the swift compiler. It's fine if this is for build-time + # stuff, but we should patch all cases were it would end up in an output. + ln -s $lib/lib/swift $out/lib/swift + + # Swift has a separate resource root from Clang, but locates the Clang + # resource root via subdir or symlink. Provide a default here, but we also + # patch Swift to prefer NIX_CC if set. + ln -s ${clang}/resource-root $lib/lib/swift/clang + + ${lib.optionalString stdenv.isDarwin '' + # Install required library for ObjC interop. + # TODO: Is there no source code for this available? + cp -r ${CLTools_Executables}/usr/lib/arc $out/lib/arc + ''} + ''; + + preFixup = lib.optionalString stdenv.isLinux '' + # This is cheesy, but helps the patchelf hook remove /build from RPATH. + cd $SWIFT_BUILD_ROOT/.. + mv build buildx + ''; + + postFixup = lib.optionalString stdenv.isDarwin '' + # These libraries need to use the system install name. The official SDK + # does the same (as opposed to using rpath). Presumably, they are part of + # the stable ABI. Not using the system libraries at run-time is known to + # cause ObjC class conflicts and segfaults. + declare -A systemLibs=( + [libswiftCore.dylib]=1 + [libswiftDarwin.dylib]=1 + [libswiftSwiftOnoneSupport.dylib]=1 + [libswift_Concurrency.dylib]=1 + ) + + for systemLib in "''${!systemLibs[@]}"; do + install_name_tool -id /usr/lib/swift/$systemLib $lib/${swiftLibSubdir}/$systemLib + done + + for file in $out/bin/swift-frontend $lib/${swiftLibSubdir}/*.dylib; do + changeArgs="" + for dylib in $(otool -L $file | awk '{ print $1 }'); do + if [[ ''${systemLibs["$(basename $dylib)"]} ]]; then + changeArgs+=" -change $dylib /usr/lib/swift/$(basename $dylib)" + elif [[ "$dylib" = */bootstrapping1/* ]]; then + changeArgs+=" -change $dylib $lib/lib/swift/$(basename $dylib)" + fi + done + if [[ -n "$changeArgs" ]]; then + install_name_tool $changeArgs $file + fi + done + + wrapProgram $out/bin/swift-frontend \ + --prefix PATH : ${lib.makeBinPath runtimeDeps} + ''; + + passthru = { + inherit + swiftOs swiftArch + swiftModuleSubdir swiftLibSubdir + swiftStaticModuleSubdir swiftStaticLibSubdir; + + # Internal attr for the wrapper. + _wrapperParams = wrapperParams; + }; + + meta = { + description = "The Swift Programming Language"; + homepage = "https://github.com/apple/swift"; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; linux ++ darwin; + # Swift doesn't support 32-bit Linux, unknown on other platforms. + badPlatforms = lib.platforms.i686; + timeout = 86400; # 24 hours. + }; +} diff --git a/pkgs/development/compilers/swift/patches/0005-clang-toolchain-dir.patch b/pkgs/development/compilers/swift/compiler/patches/clang-toolchain-dir.patch similarity index 100% rename from pkgs/development/compilers/swift/patches/0005-clang-toolchain-dir.patch rename to pkgs/development/compilers/swift/compiler/patches/clang-toolchain-dir.patch diff --git a/pkgs/development/compilers/swift/compiler/patches/clang-wrap.patch b/pkgs/development/compilers/swift/compiler/patches/clang-wrap.patch new file mode 100644 index 000000000000..9c6cafed3699 --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/clang-wrap.patch @@ -0,0 +1,18 @@ +Wrap the clang produced during the build + +--- a/tools/driver/CMakeLists.txt ++++ b/tools/driver/CMakeLists.txt +@@ -59,6 +59,13 @@ endif() + + add_dependencies(clang clang-resource-headers) + ++# Nix: wrap the clang build. ++add_custom_command( ++ TARGET clang POST_BUILD ++ COMMAND nix-swift-make-clang-wrapper $ ++ VERBATIM ++) ++ + if(NOT CLANG_LINKS_TO_CREATE) + set(CLANG_LINKS_TO_CREATE clang++ clang-cl clang-cpp) + endif() diff --git a/pkgs/development/compilers/swift/compiler/patches/llvm-module-cache.patch b/pkgs/development/compilers/swift/compiler/patches/llvm-module-cache.patch new file mode 100644 index 000000000000..9a22d0482ea5 --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/llvm-module-cache.patch @@ -0,0 +1,30 @@ +The compiler fails if LLVM modules are enabled and it cannot write its module +cache. This patch detects and rejects the fake, non-existant $HOME used in Nix +builds. + +We could simply return false in `cache_directory`, but that completely disables +module caching, and may unnecessarily slow down builds. Instead, let it use +'/tmp/.cache'. + +--- a/lib/Support/Unix/Path.inc ++++ b/lib/Support/Unix/Path.inc +@@ -1380,6 +1380,9 @@ bool user_config_directory(SmallVectorImpl &result) { + if (!home_directory(result)) { + return false; + } ++ if (std::equal(result.begin(), result.end(), "/homeless-shelter")) { ++ return false; ++ } + append(result, ".config"); + return true; + } +@@ -1401,6 +1404,9 @@ bool cache_directory(SmallVectorImpl &result) { + if (!home_directory(result)) { + return false; + } ++ if (std::equal(result.begin(), result.end(), "/homeless-shelter")) { ++ system_temp_directory(true/*ErasedOnReboot*/, result); ++ } + append(result, ".cache"); + return true; + } diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-darwin-plistbuddy-workaround.patch b/pkgs/development/compilers/swift/compiler/patches/swift-darwin-plistbuddy-workaround.patch new file mode 100644 index 000000000000..a3cf4f60675c --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/swift-darwin-plistbuddy-workaround.patch @@ -0,0 +1,17 @@ +CMake tries to read a list field from SDKSettings.plist, but the output of +facebook/xcbuild PlistBuddy is incompatible with Apple's. + +Simply set the supported architectures to the one target architecture we're +building for. + +--- a/cmake/modules/SwiftConfigureSDK.cmake ++++ b/cmake/modules/SwiftConfigureSDK.cmake +@@ -189,7 +189,7 @@ macro(configure_sdk_darwin + endif() + + # Remove any architectures not supported by the SDK. +- remove_sdk_unsupported_archs(${name} ${xcrun_name} ${SWIFT_SDK_${prefix}_PATH} SWIFT_SDK_${prefix}_ARCHITECTURES) ++ set(SWIFT_SDK_${prefix}_ARCHITECTURES "@swiftArch@") + + list_intersect( + "${SWIFT_DARWIN_MODULE_ARCHS}" # lhs diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-linux-fix-linking.patch b/pkgs/development/compilers/swift/compiler/patches/swift-linux-fix-linking.patch new file mode 100644 index 000000000000..e09d5162a93a --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/swift-linux-fix-linking.patch @@ -0,0 +1,21 @@ +--- a/lib/Driver/ToolChains.cpp ++++ b/lib/Driver/ToolChains.cpp +@@ -1475,7 +1475,17 @@ const char *ToolChain::getClangLinkerDriver( + + // If there is a linker driver in the toolchain folder, use that instead. + if (auto tool = llvm::sys::findProgramByName(LinkerDriver, {toolchainPath})) +- LinkerDriver = Args.MakeArgString(tool.get()); ++ return Args.MakeArgString(tool.get()); ++ } ++ ++ // For Nix, prefer linking using the wrapped system clang, instead of using ++ // the unwrapped clang packaged with swift. The latter is unable to link, but ++ // we still want to use it for other purposes (clang importer). ++ if (auto nixCC = llvm::sys::Process::GetEnv("NIX_CC")) { ++ llvm::SmallString<128> binDir(nixCC.getValue()); ++ llvm::sys::path::append(binDir, "bin"); ++ if (auto tool = llvm::sys::findProgramByName(LinkerDriver, {binDir.str()})) ++ return Args.MakeArgString(tool.get()); + } + + return LinkerDriver; diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-nix-resource-root.patch b/pkgs/development/compilers/swift/compiler/patches/swift-nix-resource-root.patch new file mode 100644 index 000000000000..a68326c580b1 --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/swift-nix-resource-root.patch @@ -0,0 +1,67 @@ +Swift normally looks for the Clang resource dir in a subdir/symlink of its own +resource dir. We provide a symlink to the Swift build-time Clang as a default +there, but we also here patch two checks to try locate it via NIX_CC. + +The first (ClangImporter.cpp) happens when Swift code imports C modules. The +second (ToolChains.cpp) happens when Swift is used to link the final product. + +--- a/lib/ClangImporter/ClangImporter.cpp ++++ b/lib/ClangImporter/ClangImporter.cpp +@@ -68,6 +68,7 @@ + #include "llvm/Support/FileSystem.h" + #include "llvm/Support/Memory.h" + #include "llvm/Support/Path.h" ++#include "llvm/Support/Process.h" + #include "llvm/Support/YAMLParser.h" + #include "llvm/Support/YAMLTraits.h" + #include +@@ -809,6 +810,17 @@ importer::addCommonInvocationArguments( + + const std::string &overrideResourceDir = importerOpts.OverrideResourceDir; + if (overrideResourceDir.empty()) { ++ // Prefer the Clang resource directory from NIX_CC, to allow swapping in a ++ // different stdenv. ++ // TODO: Figure out how to provide a user override for this. Probably a ++ // niche use case, though, and for now a user can unset NIX_CC to work ++ // around it if necessary. ++ if (auto nixCC = llvm::sys::Process::GetEnv("NIX_CC")) { ++ llvm::SmallString<128> resourceDir(nixCC.getValue()); ++ llvm::sys::path::append(resourceDir, "resource-root"); ++ invocationArgStrs.push_back("-resource-dir"); ++ invocationArgStrs.push_back(std::string(resourceDir.str())); ++ } else { + llvm::SmallString<128> resourceDir(searchPathOpts.RuntimeResourcePath); + + // Adjust the path to refer to our copy of the Clang resource directory +@@ -824,6 +836,7 @@ importer::addCommonInvocationArguments( + // Set the Clang resource directory to the path we computed. + invocationArgStrs.push_back("-resource-dir"); + invocationArgStrs.push_back(std::string(resourceDir.str())); ++ } // nixCC + } else { + invocationArgStrs.push_back("-resource-dir"); + invocationArgStrs.push_back(overrideResourceDir); +--- a/lib/Driver/ToolChains.cpp ++++ b/lib/Driver/ToolChains.cpp +@@ -1372,10 +1372,20 @@ void ToolChain::getClangLibraryPath(const ArgList &Args, + SmallString<128> &LibPath) const { + const llvm::Triple &T = getTriple(); + ++ // Nix: We provide a `clang` symlink in the default Swift resource root, but ++ // prefer detecting the Clang resource root via NIX_CC, to allow swapping in ++ // a different stdenv. However, always honor a user-provided `-resource-dir`. ++ auto nixCC = llvm::sys::Process::GetEnv("NIX_CC"); ++ if (nixCC && !Args.hasArgNoClaim(options::OPT_resource_dir)) { ++ LibPath.assign(nixCC.getValue()); ++ llvm::sys::path::append(LibPath, "resource-root"); ++ } else { + getResourceDirPath(LibPath, Args, /*Shared=*/true); + // Remove platform name. + llvm::sys::path::remove_filename(LibPath); +- llvm::sys::path::append(LibPath, "clang", "lib", ++ llvm::sys::path::append(LibPath, "clang"); ++ } // nixCC ++ llvm::sys::path::append(LibPath, "lib", + T.isOSDarwin() ? "darwin" + : getPlatformNameForTriple(T)); + } diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-prevent-sdk-dirs-warning.patch b/pkgs/development/compilers/swift/compiler/patches/swift-prevent-sdk-dirs-warning.patch new file mode 100644 index 000000000000..987b99d74539 --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/swift-prevent-sdk-dirs-warning.patch @@ -0,0 +1,39 @@ +Prevents a user-visible warning on every compilation: + + ld: warning: directory not found for option '-L.../MacOSX11.0.sdk/usr/lib/swift' + +--- a/lib/Driver/ToolChains.cpp ++++ b/lib/Driver/ToolChains.cpp +@@ -1455,9 +1455,11 @@ void ToolChain::getRuntimeLibraryPaths(SmallVectorImpl &runtimeLibP + runtimeLibPaths.push_back(std::string(scratchPath.str())); + } + ++ if (!SDKPath.startswith("@storeDir@")) { + scratchPath = SDKPath; + llvm::sys::path::append(scratchPath, "usr", "lib", "swift"); + runtimeLibPaths.push_back(std::string(scratchPath.str())); ++ } + } + } + +--- a/lib/Frontend/CompilerInvocation.cpp ++++ b/lib/Frontend/CompilerInvocation.cpp +@@ -185,7 +185,9 @@ static void updateRuntimeLibraryPaths(SearchPathOptions &SearchPathOpts, + RuntimeLibraryImportPaths.push_back(std::string(LibPath.str())); + } + +- LibPath = SearchPathOpts.getSDKPath(); ++ auto SDKPath = SearchPathOpts.getSDKPath(); ++ if (!SDKPath.startswith("@storeDir@")) { ++ LibPath = SDKPath; + llvm::sys::path::append(LibPath, "usr", "lib", "swift"); + if (!Triple.isOSDarwin()) { + // Use the non-architecture suffixed form with directory-layout +@@ -200,6 +202,7 @@ static void updateRuntimeLibraryPaths(SearchPathOptions &SearchPathOpts, + llvm::sys::path::append(LibPath, swift::getMajorArchitectureName(Triple)); + } + RuntimeLibraryImportPaths.push_back(std::string(LibPath.str())); ++ } + } + SearchPathOpts.setRuntimeLibraryImportPaths(RuntimeLibraryImportPaths); + } diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-separate-lib.patch b/pkgs/development/compilers/swift/compiler/patches/swift-separate-lib.patch new file mode 100644 index 000000000000..20d81a6e8296 --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/swift-separate-lib.patch @@ -0,0 +1,26 @@ +Patch paths to use the separate 'lib' output. One of the things this patch +fixes is the output of `swift -frontend -print-target-info`, which swiftpm uses +to set rpath on Linux. + +The check if the executable path starts with 'out' is necessary for +bootstrapping, or the compiler will fail when run from the build directory. + +--- a/lib/Frontend/CompilerInvocation.cpp ++++ b/lib/Frontend/CompilerInvocation.cpp +@@ -49,11 +49,16 @@ swift::CompilerInvocation::CompilerInvocation() { + void CompilerInvocation::computeRuntimeResourcePathFromExecutablePath( + StringRef mainExecutablePath, bool shared, + llvm::SmallVectorImpl &runtimeResourcePath) { ++ if (mainExecutablePath.startswith("@storeDir@")) { ++ auto libPath = StringRef("@lib@"); ++ runtimeResourcePath.append(libPath.begin(), libPath.end()); ++ } else { + runtimeResourcePath.append(mainExecutablePath.begin(), + mainExecutablePath.end()); + + llvm::sys::path::remove_filename(runtimeResourcePath); // Remove /swift + llvm::sys::path::remove_filename(runtimeResourcePath); // Remove /bin ++ } + appendSwiftLibDir(runtimeResourcePath, shared); + } + diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-wrap.patch b/pkgs/development/compilers/swift/compiler/patches/swift-wrap.patch new file mode 100644 index 000000000000..e4697f631e70 --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/swift-wrap.patch @@ -0,0 +1,46 @@ +Wrap the swift compiler produced during the build + +--- a/tools/driver/CMakeLists.txt ++++ b/tools/driver/CMakeLists.txt +@@ -16,6 +16,13 @@ if(${LIBSWIFT_BUILD_MODE} MATCHES "BOOTSTRAPPING.*") + swiftDriverTool + libswiftStub) + ++ # Nix: wrap the swift build. ++ add_custom_command( ++ TARGET swift-frontend-bootstrapping0 POST_BUILD ++ COMMAND nix-swift-make-swift-wrapper $ ++ VERBATIM ++ ) ++ + swift_create_post_build_symlink(swift-frontend-bootstrapping0 + SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}" + DESTINATION "swiftc${CMAKE_EXECUTABLE_SUFFIX}" +@@ -34,6 +41,13 @@ if(${LIBSWIFT_BUILD_MODE} MATCHES "BOOTSTRAPPING.*") + swiftDriverTool + libswift-bootstrapping1) + ++ # Nix: wrap the swift build. ++ add_custom_command( ++ TARGET swift-frontend-bootstrapping1 POST_BUILD ++ COMMAND nix-swift-make-swift-wrapper $ ++ VERBATIM ++ ) ++ + swift_create_post_build_symlink(swift-frontend-bootstrapping1 + SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}" + DESTINATION "swiftc${CMAKE_EXECUTABLE_SUFFIX}" +@@ -50,6 +64,13 @@ target_link_libraries(swift-frontend + swiftDriverTool + libswift) + ++# Nix: wrap the swift build. ++add_custom_command( ++ TARGET swift-frontend POST_BUILD ++ COMMAND nix-swift-make-swift-wrapper $ ++ VERBATIM ++) ++ + # Create a `swift-driver` executable adjacent to the `swift-frontend` executable + # to ensure that `swiftc` forwards to the standalone driver when invoked. + swift_create_early_driver_copies(swift-frontend) diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 0ea6e7b07596..e8eb4d738ca9 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -1,475 +1,101 @@ -{ lib, stdenv -, cmake -, coreutils -, glibc -, gccForLibs -, which -, perl -, libedit -, ninja -, pkg-config -, sqlite -, libxml2 -, clang_13 -, python3 -, ncurses -, libuuid -, libxcrypt -, icu -, libgcc -, libblocksruntime -, curl -, rsync -, git -, libgit2 -, fetchFromGitHub -, makeWrapper -, gnumake -, file +{ lib +, pkgs +, newScope +, darwin +, llvmPackages_latest +, overrideCC }: let - # 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 + self = rec { + + callPackage = newScope self; + + # Current versions of Swift on Darwin require macOS SDK 10.15 at least. + # Re-export this so we can rely on the minimum Swift SDK elsewhere. + apple_sdk = pkgs.darwin.apple_sdk_11_0; + + # Our current Clang on Darwin is v11, but we need at least v12. The + # following applies the newer Clang with the same libc overrides as + # `apple_sdk.stdenv`. + # + # If 'latest' becomes an issue, recommend replacing it with v14, which is + # currently closest to the official Swift builds. + clang = if pkgs.stdenv.isDarwin + then + llvmPackages_latest.clang.override rec { + libc = apple_sdk.Libsystem; + bintools = pkgs.bintools.override { inherit libc; }; + } + else + llvmPackages_latest.clang; + + # Overrides that create a useful environment for swift packages, allowing + # packaging with `swiftPackages.callPackage`. These are similar to + # `apple_sdk_11_0.callPackage`, with our clang on top. + inherit (clang) bintools; + stdenv = overrideCC pkgs.stdenv clang; + darwin = pkgs.darwin.overrideScope (_: prev: { + inherit apple_sdk; + inherit (apple_sdk) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security; + CF = apple_sdk.CoreFoundation; + }); + xcodebuild = pkgs.xcbuild.override { + inherit (apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; + inherit stdenv; + sdkVer = "10.15"; + }; + xcbuild = xcodebuild; + + swift-unwrapped = callPackage ./compiler { + inherit (darwin) DarwinTools cctools sigtool; + inherit (apple_sdk) MacOSX-SDK CLTools_Executables; + inherit (apple_sdk.frameworks) CoreServices Foundation Combine; + }; + + swiftNoSwiftDriver = callPackage ./wrapper { + swift = swift-unwrapped; + useSwiftDriver = false; + }; + + Dispatch = if stdenv.isDarwin + then null # part of libsystem + else callPackage ./libdispatch { swift = swiftNoSwiftDriver; }; + + Foundation = if stdenv.isDarwin + then apple_sdk.frameworks.Foundation + else callPackage ./foundation { swift = swiftNoSwiftDriver; }; + + # TODO: Apple distributes a binary XCTest with Xcode, but it is not part of + # CLTools (or SUS), so would have to figure out how to fetch it. The binary + # version has several extra features, like a test runner and ObjC support. + XCTest = callPackage ./xctest { + inherit (darwin) DarwinTools; + swift = swiftNoSwiftDriver; + }; + + swiftpm = callPackage ./swiftpm { + inherit (darwin) DarwinTools cctools; + inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication; + swift = swiftNoSwiftDriver; + }; + + swift-driver = callPackage ./swift-driver { + swift = swiftNoSwiftDriver; + }; + + swift = callPackage ./wrapper { + swift = swift-unwrapped; + }; + + sourcekit-lsp = callPackage ./sourcekit-lsp { + inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication; + }; + + swift-docc = callPackage ./swift-docc { + inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication; + }; - versions = { - swift = "5.6.2"; - yams = "4.0.2"; - argumentParser = "1.0.3"; - format = "release/5.6"; - crypto = "1.1.5"; - nio = "2.31.2"; - nio-ssl = "2.15.0"; }; - 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-${versions.swift}-RELEASE"; - name = "${repo}-${versions.swift}-src"; - }; - - sources = { - # Projects that share `versions.swift` for each release. - - swift = fetchSwiftRelease { - repo = "swift"; - sha256 = "sha256-wiRXAXWEksJuy+YQQ+B7tzr2iLkSVkgV6o+wIz7yKJA="; - }; - cmark = fetchSwiftRelease { - repo = "swift-cmark"; - sha256 = "sha256-f0BoTs4HYdx/aJ9HIGCWMalhl8PvClWD6R4QK3qSgAw="; - }; - llbuild = fetchSwiftRelease { - repo = "swift-llbuild"; - sha256 = "sha256-SQ6V0zVshIYMjayx+ZpYuLijgQ89tqRnPlXBPf2FYqM="; - }; - driver = fetchSwiftRelease { - repo = "swift-driver"; - sha256 = "sha256-D5/C4Rbv5KIsKpy6YbuMxGIGaQkn80PD4Cp0l6bPKzY="; - }; - toolsSupportCore = fetchSwiftRelease { - repo = "swift-tools-support-core"; - sha256 = "sha256-FbtQCq1sSlzrskCrgzD4iYuo5eGaXrAUUxoNX/BiOfg="; - }; - swiftpm = fetchSwiftRelease { - repo = "swift-package-manager"; - sha256 = "sha256-esO4Swz3UYngbVgxoV+fkhSC0AU3IaxVjWkgK/s3x68="; - }; - syntax = fetchSwiftRelease { - repo = "swift-syntax"; - sha256 = "sha256-C9FPCtq49BvKXtTWWeReYWNrU70pHzT2DhAv3NiTbPU="; - }; - corelibsXctest = fetchSwiftRelease { - repo = "swift-corelibs-xctest"; - sha256 = "sha256-0hizfnKJaUUA+jXuXzXWk72FmlSyc+UGEf7BTLdJrx4="; - }; - corelibsFoundation = fetchSwiftRelease { - repo = "swift-corelibs-foundation"; - sha256 = "sha256-8sCL8Ia6yb6bRsJZ52gUJH0jN3lwClM573G8jgUdEhw="; - }; - corelibsLibdispatch = fetchSwiftRelease { - repo = "swift-corelibs-libdispatch"; - sha256 = "sha256-1tIskUMnfblnvZaFDQPUMBfWTmBYG98s7rEww7PwZO8="; - fetchSubmodules = true; - }; - indexstoreDb = fetchSwiftRelease { - repo = "indexstore-db"; - sha256 = "sha256-/PO4eMiASZN3pjFjBQ1r8vYwGRn6xm3SWaB2HDZlkPs="; - }; - sourcekitLsp = fetchSwiftRelease { - repo = "sourcekit-lsp"; - sha256 = "sha256-ttgUC4ZHD3P/xLHllEbACtHVrJ6HXqeVWccXcoPMkts="; - }; - llvmProject = fetchSwiftRelease { - repo = "llvm-project"; - sha256 = "sha256-YVs3lKV2RlaovpYkdGO+vzypolrmXmbKBBP4+osNMYw="; - }; - docc = fetchSwiftRelease { - repo = "swift-docc"; - sha256 = "sha256-rWiaNamZoHTO1bKpubxuT7m1IBOl7amT5M71mNauilY="; - }; - docc-render-artifact = fetchSwiftRelease { - repo = "swift-docc-render-artifact"; - sha256 = "sha256-AX+rtDLhq8drk7N6/hoH3fQioudmmTCnEhR45bME8uU="; - }; - docc-symbolkit = fetchSwiftRelease { - repo = "swift-docc-symbolkit"; - sha256 = "sha256-Xy1TQ5ucDW+MnkeOvVznsATBmwcQ3p1x+ofQ22ofk+o="; - }; - lmdb = fetchSwiftRelease { - repo = "swift-lmdb"; - sha256 = "sha256-i2GkWRWq1W5j8rF4PiHwWgT4Dur5FCY2o44HvUU3vtQ="; - }; - markdown = fetchSwiftRelease { - repo = "swift-markdown"; - sha256 = "sha256-XtFSBiNHhmULjS4OqSpMgUetLu3peRg7l6HpjwVsTj8="; - }; - - cmark-gfm = fetchAppleRepo { - repo = "swift-cmark"; - rev = "swift-${versions.swift}-RELEASE-gfm"; - sha256 = "sha256-g28iKmMR2W0r1urf8Fk1HBxAp5OlonNYSVN3Ril66tQ="; - }; - - # Projects that have their own versions during each release - - argumentParser = fetchAppleRepo { - repo = "swift-argument-parser"; - rev = "${versions.argumentParser}"; - sha256 = "sha256-vNqkuAwSZNCWvwe6E5BqbXQdIbmIia0dENmmSQ9P8Mo="; - }; - format = fetchAppleRepo { - repo = "swift-format"; - rev = "${versions.format}"; - sha256 = "sha256-1f5sIrv9IbPB7Vnahq1VwH8gT41dcjWldRwvVEaMdto="; - }; - crypto = fetchAppleRepo { - repo = "swift-crypto"; - rev = "${versions.crypto}"; - sha256 = "sha256-jwxXQuOF+CnpLMwTZ2z52Fgx2b97yWzXiPTx0Ye8KCQ="; - }; - nio = fetchAppleRepo { - repo = "swift-nio"; - rev = versions.nio; - sha256 = "sha256-FscOA/S7on31QCR/MZFjg4ZB3FGJ+rdptZ6MRZJXexE="; - }; - nio-ssl = fetchAppleRepo { - repo = "swift-nio-ssl"; - rev = versions.nio-ssl; - sha256 = "sha256-5QGkmkCOXhG3uOdf0bd3Fo1MFekB8/WcveBXGhtVZKo="; - }; - yams = fetchFromGitHub { - owner = "jpsim"; - repo = "Yams"; - rev = versions.yams; - sha256 = "sha256-cTkCAwxxLc35laOon1ZXXV8eAxX02oDolJyPauhZado="; - name = "Yams-${versions.yams}-src"; - }; - }; - - devInputs = [ - curl - glibc - icu - libblocksruntime - libedit - libgcc - libuuid - libxcrypt - libxml2 - ncurses - sqlite - ]; - - python = (python3.withPackages (ps: [ps.six])); - - cmakeFlags = [ - "-DGLIBC_INCLUDE_PATH=${stdenv.cc.libc.dev}/include" - "-DC_INCLUDE_DIRS=${lib.makeSearchPathOutput "dev" "include" devInputs}:${libxml2.dev}/include/libxml2" - "-DGCC_INSTALL_PREFIX=${gccForLibs}" - ]; - -in -stdenv.mkDerivation { - pname = "swift"; - version = versions.swift; - - nativeBuildInputs = [ - cmake - git - makeWrapper - ninja - perl - pkg-config - python - rsync - which - ]; - buildInputs = devInputs ++ [ - clang_13 - ]; - - # TODO: Revisit what needs to be propagated and how. - propagatedBuildInputs = [ - libgcc - libgit2 - python - ]; - propagatedUserEnvPkgs = [ git pkg-config ]; - - hardeningDisable = [ "format" ]; # for LLDB - - unpackPhase = '' - mkdir src - cd src - export SWIFT_SOURCE_ROOT=$PWD - - cp -r ${sources.swift} swift - cp -r ${sources.cmark} cmark - cp -r ${sources.llbuild} llbuild - cp -r ${sources.argumentParser} swift-argument-parser - cp -r ${sources.driver} swift-driver - cp -r ${sources.toolsSupportCore} swift-tools-support-core - cp -r ${sources.swiftpm} swiftpm - cp -r ${sources.syntax} swift-syntax - cp -r ${sources.corelibsXctest} swift-corelibs-xctest - cp -r ${sources.corelibsFoundation} swift-corelibs-foundation - cp -r ${sources.corelibsLibdispatch} swift-corelibs-libdispatch - 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 - cp -r ${sources.cmark-gfm} swift-cmark-gfm - cp -r ${sources.docc} swift-docc - cp -r ${sources.docc-render-artifact} swift-docc-render-artifact - cp -r ${sources.docc-symbolkit} swift-docc-symbolkit - cp -r ${sources.lmdb} swift-lmdb - cp -r ${sources.markdown} swift-markdown - cp -r ${sources.nio} swift-nio - cp -r ${sources.nio-ssl} swift-nio-ssl - - chmod -R u+w . - ''; - - patchPhase = '' - # Just patch all the things for now, we can focus this later. - patchShebangs $SWIFT_SOURCE_ROOT - - # TODO: eliminate use of env. - find -type f -print0 | xargs -0 sed -i \ - -e 's|/usr/bin/env|${coreutils}/bin/env|g' \ - -e 's|/usr/bin/make|${gnumake}/bin/make|g' \ - -e 's|/bin/mkdir|${coreutils}/bin/mkdir|g' \ - -e 's|/bin/cp|${coreutils}/bin/cp|g' \ - -e 's|/usr/bin/file|${file}/bin/file|g' - - # Build configuration patches. - patch -p1 -d swift -i ${./patches/0001-build-presets-linux-don-t-require-using-Ninja.patch} - patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch} - patch -p1 -d swift -i ${./patches/0003-build-presets-linux-don-t-build-extra-libs.patch} - patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch} - patch -p1 -d swift -i ${./patches/0007-build-presets-linux-os-stdlib.patch} - substituteInPlace swift/cmake/modules/SwiftConfigureSDK.cmake \ - --replace '/usr/include' "${stdenv.cc.libc.dev}/include" - sed -i swift/utils/build-presets.ini \ - -e 's/^test-installable-package$/# \0/' \ - -e 's/^test$/# \0/' \ - -e 's/^validation-test$/# \0/' \ - -e 's/^long-test$/# \0/' \ - -e 's/^stress-test$/# \0/' \ - -e 's/^test-optimized$/# \0/' \ - -e 's/^swift-install-components=autolink.*$/\0;editor-integration/' - - # LLVM toolchain patches. - patch -p1 -d llvm-project/clang -i ${./patches/0005-clang-toolchain-dir.patch} - patch -p1 -d llvm-project/clang -i ${./patches/0006-clang-purity.patch} - substituteInPlace llvm-project/clang/lib/Driver/ToolChains/Linux.cpp \ - --replace 'SysRoot + "/lib' '"${glibc}/lib" "' \ - --replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "' \ - --replace 'LibDir = "lib";' 'LibDir = "${glibc}/lib";' \ - --replace 'LibDir = "lib64";' 'LibDir = "${glibc}/lib";' \ - --replace 'LibDir = X32 ? "libx32" : "lib64";' 'LibDir = "${glibc}/lib";' - - # Substitute ncurses for curses in llbuild. - sed -i 's/curses/ncurses/' llbuild/*/*/CMakeLists.txt - sed -i 's/curses/ncurses/' llbuild/*/*/*/CMakeLists.txt - - # uuid.h is not part of glibc, but of libuuid. - sed -i 's|''${GLIBC_INCLUDE_PATH}/uuid/uuid.h|${libuuid.dev}/include/uuid/uuid.h|' swift/stdlib/public/Platform/glibc.modulemap.gyb - - # Support library build script patches. - PREFIX=''${out/#\/} - substituteInPlace swift/utils/swift_build_support/swift_build_support/products/benchmarks.py \ - --replace \ - "'--toolchain', toolchain_path," \ - "'--toolchain', '/build/install/$PREFIX'," - substituteInPlace swift/benchmark/scripts/build_script_helper.py \ - --replace \ - "swiftbuild_path = os.path.join(args.toolchain, \"usr\", \"bin\", \"swift-build\")" \ - "swiftbuild_path = os.path.join(args.toolchain, \"bin\", \"swift-build\")" - substituteInPlace swift-corelibs-xctest/build_script.py \ - --replace usr "$PREFIX" - - # Can be removed in later swift-docc versions, see - # https://github.com/apple/swift-docc/commit/bff70b847008f91ac729cfd299a85481eef3f581 - substituteInPlace swift-docc/build-script-helper.py \ - --replace \ - "subprocess.check_output(cmd, env=env).strip(), 'docc')" \ - "subprocess.check_output(cmd, env=env).strip().decode(), 'docc')" - - # Can be removed in later Swift versions, see - # https://github.com/apple/swift/pull/58755 - substituteInPlace swift/utils/process-stats-dir.py \ - --replace \ - "type=argparse.FileType('wb', 0)," \ - "type=argparse.FileType('w', 0)," - - # Apply Python 3 fix, see - # https://github.com/apple/swift/commit/ec6bc595092974628b27b114a472e84162261bbd - substituteInPlace swift/utils/swift_build_support/swift_build_support/productpipeline_list_builder.py \ - --replace \ - "filter(lambda x: x is not None, pipeline)" \ - "[p for p in pipeline if p is not None]" - ''; - - configurePhase = '' - cd .. - - mkdir build install - export SWIFT_BUILD_ROOT=$PWD/build - export SWIFT_INSTALL_DIR=$PWD/install - - export INSTALLABLE_PACKAGE=$PWD/swift.tar.gz - export NIX_ENFORCE_PURITY= - - cd $SWIFT_BUILD_ROOT - ''; - - buildPhase = '' - # Explicitly include C++ headers to prevent errors where stdlib.h is not found from cstdlib. - export NIX_CFLAGS_COMPILE="$(< ${clang_13}/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE" - - # During the Swift build, a full local LLVM build is performed and the resulting clang is - # invoked. This compiler is not using the Nix wrappers, so it needs some help to find things. - export NIX_LDFLAGS_BEFORE="-rpath ${gccForLibs.lib}/lib -L${gccForLibs.lib}/lib $NIX_LDFLAGS_BEFORE" - - # However, we want to use the wrapped compiler whenever possible. - export CC="${clang_13}/bin/clang" - - $SWIFT_SOURCE_ROOT/swift/utils/build-script \ - --preset=buildbot_linux \ - installable_package=$INSTALLABLE_PACKAGE \ - install_prefix=$out \ - install_destdir=$SWIFT_INSTALL_DIR \ - extra_cmake_options="${lib.concatStringsSep "," cmakeFlags}" - ''; - - doCheck = true; - - checkInputs = [ file ]; - - checkPhase = '' - # Remove compiler build system tests which fail due to our modified default build profile and - # nixpkgs-provided version of CMake. - rm $SWIFT_SOURCE_ROOT/swift/validation-test/BuildSystem/infer_implies_install_all.test - rm $SWIFT_SOURCE_ROOT/swift/validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test - - # This test apparently requires Python 2 (strings are assumed to be bytes-like), but the build - # process overall now otherwise requires Python 3 (which is what we have updated to). A fix PR - # has been submitted upstream. - rm $SWIFT_SOURCE_ROOT/swift/validation-test/SIL/verify_all_overlays.py - - # TODO: consider fixing and re-adding. This test fails due to a non-standard "install_prefix". - rm $SWIFT_SOURCE_ROOT/swift/validation-test/Python/build_swift.swift - - # We cannot handle the SDK location being in "Weird Location" due to Nix isolation. - rm $SWIFT_SOURCE_ROOT/swift/test/DebugInfo/compiler-flags.swift - - # TODO: Fix issue with ld.gold invoked from script finding crtbeginS.o and crtendS.o. - rm $SWIFT_SOURCE_ROOT/swift/test/IRGen/ELF-remove-autolink-section.swift - - # The following two tests fail because we use don't use the bundled libicu: - # [SOURCE_DIR/utils/build-script] ERROR: can't find source directory for libicu (tried /build/src/icu) - rm $SWIFT_SOURCE_ROOT/swift/validation-test/BuildSystem/default_build_still_performs_epilogue_opts_after_split.test - rm $SWIFT_SOURCE_ROOT/swift/validation-test/BuildSystem/test_early_swift_driver_and_infer.swift - - # TODO: This test fails for some unknown reason - rm $SWIFT_SOURCE_ROOT/swift/test/Serialization/restrict-swiftmodule-to-revision.swift - - # This test was flaky in ofborg, see #186476 - rm $SWIFT_SOURCE_ROOT/swift/test/AutoDiff/compiler_crashers_fixed/sr14290-missing-debug-scopes-in-pullback-trampoline.swift - - # TODO: consider using stress-tester and integration-test. - - # Match the wrapped version of Swift to be installed. - export LIBRARY_PATH=${lib.makeLibraryPath [icu libgcc libuuid]}:$l - - checkTarget=check-swift-all-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name} - ninjaFlags='-C buildbot_linux/swift-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}' - ninjaCheckPhase - ''; - - installPhase = '' - mkdir -p $out - - # Extract the generated tarball into the store. - tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 ''${out/#\/} - find $out -type d -empty -delete - - # Fix installation weirdness, also present in Apple’s official tarballs. - mv $out/local/include/indexstore $out/include - rmdir $out/local/include $out/local - rm -r $out/bin/sdk-module-lists $out/bin/swift-api-checker.py - - wrapProgram $out/bin/swift \ - --set CC $out/bin/clang \ - --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ - --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \ - --suffix LIBRARY_PATH : ${lib.makeLibraryPath [icu libgcc libuuid]} \ - --suffix PATH : ${lib.makeBinPath [ stdenv.cc.bintools ]} - - wrapProgram $out/bin/swiftc \ - --set CC $out/bin/clang \ - --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ - --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \ - --suffix LIBRARY_PATH : ${lib.makeLibraryPath [icu libgcc libuuid]} \ - --suffix PATH : ${lib.makeBinPath [ stdenv.cc.bintools ]} - ''; - - # Hack to avoid build and install directories in RPATHs. - preFixup = "rm -rf $SWIFT_BUILD_ROOT $SWIFT_INSTALL_DIR"; - - meta = with lib; { - description = "The Swift Programming Language"; - homepage = "https://github.com/apple/swift"; - maintainers = with maintainers; [ dtzWill trepetti dduan trundle ]; - license = licenses.asl20; - # Swift doesn't support 32-bit Linux, unknown on other platforms. - platforms = platforms.linux; - badPlatforms = platforms.i686; - timeout = 86400; # 24 hours. - }; -} +in self diff --git a/pkgs/development/compilers/swift/foundation/default.nix b/pkgs/development/compilers/swift/foundation/default.nix new file mode 100644 index 000000000000..efb35bd74c9f --- /dev/null +++ b/pkgs/development/compilers/swift/foundation/default.nix @@ -0,0 +1,61 @@ +# TODO: We already package the CoreFoundation component of Foundation in: +# pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +# This is separate because the CF build is completely different and part of +# stdenv. Merging the two was kept outside of the scope of Swift work. + +{ lib +, stdenv +, callPackage +, cmake +, ninja +, swift +, Dispatch +, icu +, libxml2 +, curl +}: + +let + sources = callPackage ../sources.nix { }; +in stdenv.mkDerivation { + pname = "swift-corelibs-foundation"; + + inherit (sources) version; + src = sources.swift-corelibs-foundation; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ninja swift ]; + buildInputs = [ icu libxml2 curl ]; + propagatedBuildInputs = [ Dispatch ]; + + preConfigure = '' + # Fails to build with -D_FORTIFY_SOURCE. + NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/} + ''; + + postInstall = '' + # Split up the output. + mkdir $dev + mv $out/lib/swift/${swift.swiftOs} $out/swiftlibs + mv $out/lib/swift $dev/include + mkdir $out/lib/swift + mv $out/swiftlibs $out/lib/swift/${swift.swiftOs} + + # Provide a CMake module. This is primarily used to glue together parts of + # the Swift toolchain. Modifying the CMake config to do this for us is + # otherwise more trouble. + mkdir -p $dev/lib/cmake/Foundation + export dylibExt="${stdenv.hostPlatform.extensions.sharedLibrary}" + export swiftOs="${swift.swiftOs}" + substituteAll ${./glue.cmake} $dev/lib/cmake/Foundation/FoundationConfig.cmake + ''; + + meta = { + description = "Core utilities, internationalization, and OS independence for Swift"; + homepage = "https://github.com/apple/swift-corelibs-foundation"; + platforms = lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + }; +} diff --git a/pkgs/development/compilers/swift/foundation/glue.cmake b/pkgs/development/compilers/swift/foundation/glue.cmake new file mode 100644 index 000000000000..a34984d19f04 --- /dev/null +++ b/pkgs/development/compilers/swift/foundation/glue.cmake @@ -0,0 +1,8 @@ +add_library(Foundation SHARED IMPORTED) +set_property(TARGET Foundation PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libFoundation@dylibExt@") + +add_library(FoundationNetworking SHARED IMPORTED) +set_property(TARGET FoundationNetworking PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libFoundationNetworking@dylibExt@") + +add_library(FoundationXML SHARED IMPORTED) +set_property(TARGET FoundationXML PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libFoundationXML@dylibExt@") diff --git a/pkgs/development/compilers/swift/libdispatch/default.nix b/pkgs/development/compilers/swift/libdispatch/default.nix new file mode 100644 index 000000000000..4a0616ded5ac --- /dev/null +++ b/pkgs/development/compilers/swift/libdispatch/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, callPackage +, cmake +, ninja +, useSwift ? true, swift +}: + +let + sources = callPackage ../sources.nix { }; +in stdenv.mkDerivation { + pname = "swift-corelibs-libdispatch"; + + inherit (sources) version; + src = sources.swift-corelibs-libdispatch; + + outputs = [ "out" "dev" "man" ]; + + nativeBuildInputs = [ cmake ] + ++ lib.optionals useSwift [ ninja swift ]; + + patches = [ ./disable-swift-overlay.patch ]; + + cmakeFlags = lib.optional useSwift "-DENABLE_SWIFT=ON"; + + postInstall = '' + # Provide a CMake module. This is primarily used to glue together parts of + # the Swift toolchain. Modifying the CMake config to do this for us is + # otherwise more trouble. + mkdir -p $dev/lib/cmake/dispatch + export dylibExt="${stdenv.hostPlatform.extensions.sharedLibrary}" + substituteAll ${./glue.cmake} $dev/lib/cmake/dispatch/dispatchConfig.cmake + ''; + + meta = { + description = "Grand Central Dispatch"; + homepage = "https://github.com/apple/swift-corelibs-libdispatch"; + platforms = lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ cmm dtzWill trepetti dduan trundle stephank ]; + }; +} diff --git a/pkgs/development/compilers/swift/libdispatch/disable-swift-overlay.patch b/pkgs/development/compilers/swift/libdispatch/disable-swift-overlay.patch new file mode 100644 index 000000000000..0ea1869d5528 --- /dev/null +++ b/pkgs/development/compilers/swift/libdispatch/disable-swift-overlay.patch @@ -0,0 +1,35 @@ +Enabling Swift support is normally intended for building an overlay for a +Swift SDK, which changes the installation layout. Prevent this. + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -287,7 +287,7 @@ configure_file("${PROJECT_SOURCE_DIR}/cmake/config.h.in" + add_compile_definitions($<$,$>:HAVE_CONFIG_H>) + + +-if(ENABLE_SWIFT) ++if(0) + set(INSTALL_TARGET_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$>:_static>/$" CACHE PATH "Path where the libraries will be installed") + set(INSTALL_DISPATCH_HEADERS_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$>:_static>/dispatch" CACHE PATH "Path where the headers will be installed for libdispatch") + set(INSTALL_BLOCK_HEADERS_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$>:_static>/Block" CACHE PATH "Path where the headers will be installed for the blocks runtime") +--- a/man/CMakeLists.txt ++++ b/man/CMakeLists.txt +@@ -1,6 +1,6 @@ + + # TODO(compnerd) add symlinks +-if(NOT ENABLE_SWIFT) ++if(1) + install(FILES + dispatch.3 + dispatch_after.3 +--- a/src/swift/CMakeLists.txt ++++ b/src/swift/CMakeLists.txt +@@ -47,7 +47,7 @@ get_swift_host_arch(swift_arch) + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/swift/Dispatch.swiftmodule + ${CMAKE_CURRENT_BINARY_DIR}/swift/Dispatch.swiftdoc +- DESTINATION ${INSTALL_TARGET_DIR}/${swift_arch}) ++ DESTINATION ${INSTALL_TARGET_DIR}/swift) + set_property(GLOBAL APPEND PROPERTY DISPATCH_EXPORTS swiftDispatch) + install(TARGETS swiftDispatch + EXPORT dispatchExports diff --git a/pkgs/development/compilers/swift/libdispatch/glue.cmake b/pkgs/development/compilers/swift/libdispatch/glue.cmake new file mode 100644 index 000000000000..dd696dc61085 --- /dev/null +++ b/pkgs/development/compilers/swift/libdispatch/glue.cmake @@ -0,0 +1,5 @@ +add_library(dispatch SHARED IMPORTED) +set_property(TARGET dispatch PROPERTY IMPORTED_LOCATION "@out@/lib/libdispatch@dylibExt@") + +add_library(swiftDispatch SHARED IMPORTED) +set_property(TARGET swiftDispatch PROPERTY IMPORTED_LOCATION "@out@/lib/libswiftDispatch@dylibExt@") diff --git a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch deleted file mode 100644 index 6c42921cd233..000000000000 --- a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch +++ /dev/null @@ -1,13 +0,0 @@ -Don't build Ninja, we use our own. - ---- a/utils/build-presets.ini -+++ b/utils/build-presets.ini -@@ -779,7 +779,7 @@ swiftpm - - dash-dash - --build-ninja -+# build-ninja - install-llvm - install-swift - install-lldb diff --git a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch deleted file mode 100644 index 0b4c2cc55c4f..000000000000 --- a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Use custom install prefix. - ---- a/utils/build-presets.ini -+++ b/utils/build-presets.ini -@@ -788,7 +788,7 @@ - install-swiftpm - install-xctest - install-libicu --install-prefix=/usr -+install-prefix=%(install_prefix)s - install-libcxx - install-sourcekit-lsp - build-swift-static-stdlib diff --git a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch deleted file mode 100644 index eb522ac96f7e..000000000000 --- a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch +++ /dev/null @@ -1,23 +0,0 @@ -Disable targets, where we use Nix packages. - ---- a/utils/build-presets.ini -+++ b/utils/build-presets.ini -@@ -818,8 +818,6 @@ - swiftpm - swift-driver - xctest --libicu --libcxx - swiftdocc - - # build-ninja -@@ -830,9 +828,7 @@ - install-swiftpm - install-swift-driver - install-xctest --install-libicu - install-prefix=%(install_prefix)s --install-libcxx - install-sourcekit-lsp - install-swiftdocc - build-swift-static-stdlib diff --git a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch deleted file mode 100644 index 3cacdfc0c55e..000000000000 --- a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch +++ /dev/null @@ -1,13 +0,0 @@ -Plumb extra-cmake-options. - ---- a/utils/build-presets.ini -+++ b/utils/build-presets.ini -@@ -812,6 +812,8 @@ - # Path to the .tar.gz package we would create. - installable-package=%(installable_package)s - -+extra-cmake-options=%(extra_cmake_options)s -+ - [preset: buildbot_linux] - mixin-preset=mixin_linux_installation - build-subdir=buildbot_linux diff --git a/pkgs/development/compilers/swift/patches/0006-clang-purity.patch b/pkgs/development/compilers/swift/patches/0006-clang-purity.patch deleted file mode 100644 index 928c1db6dee8..000000000000 --- a/pkgs/development/compilers/swift/patches/0006-clang-purity.patch +++ /dev/null @@ -1,16 +0,0 @@ -Apply the "purity" patch (updated for 5.4.2). - ---- a/lib/Driver/ToolChains/Gnu.cpp -+++ b/lib/Driver/ToolChains/Gnu.cpp -@@ -488,11 +488,5 @@ - 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"); diff --git a/pkgs/development/compilers/swift/patches/0007-build-presets-linux-os-stdlib.patch b/pkgs/development/compilers/swift/patches/0007-build-presets-linux-os-stdlib.patch deleted file mode 100644 index 46da01635540..000000000000 --- a/pkgs/development/compilers/swift/patches/0007-build-presets-linux-os-stdlib.patch +++ /dev/null @@ -1,13 +0,0 @@ -Use os-stdlib in tests. - ---- a/utils/build-presets.ini -+++ b/utils/build-presets.ini -@@ -872,7 +872,7 @@ - indexstore-db - sourcekit-lsp - swiftdocc --lit-args=-v --time-tests -+lit-args=-v --time-tests --param use_os_stdlib - - # rdar://problem/31454823 - lldb-test-swift-only diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix new file mode 100644 index 000000000000..deb82de20add --- /dev/null +++ b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, callPackage +, swift +, swiftpm +, swiftpm2nix +, Foundation +, XCTest +, sqlite +, ncurses +, CryptoKit +, LocalAuthentication +}: +let + sources = callPackage ../sources.nix { }; + generated = swiftpm2nix.helpers ./generated; + + # On Darwin, we only want ncurses in the linker search path, because headers + # are part of libsystem. Adding its headers to the search path causes strange + # mixing and errors. + # TODO: Find a better way to prevent this conflict. + ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; +in +stdenv.mkDerivation { + pname = "sourcekit-lsp"; + + inherit (sources) version; + src = sources.sourcekit-lsp; + + nativeBuildInputs = [ swift swiftpm ]; + buildInputs = [ + Foundation + XCTest + sqlite + ncursesInput + ] + ++ lib.optionals stdenv.isDarwin [ CryptoKit LocalAuthentication ]; + + configurePhase = generated.configure + '' + swiftpmMakeMutable indexstore-db + patch -p1 -d .build/checkouts/indexstore-db -i ${./patches/indexstore-db-macos-target.patch} + + # This toggles a section specific to Xcode XCTest, which doesn't work on + # Darwin, where we also use swift-corelibs-xctest. + substituteInPlace Sources/LSPTestSupport/PerfTestCase.swift \ + --replace '#if os(macOS)' '#if false' + + # Required to link with swift-corelibs-xctest on Darwin. + export SWIFTTSC_MACOS_DEPLOYMENT_TARGET=10.12 + ''; + + # TODO: BuildServerBuildSystemTests fails + #doCheck = true; + + installPhase = '' + binPath="$(swiftpmBinPath)" + mkdir -p $out/bin + cp $binPath/sourcekit-lsp $out/bin/ + ''; + + # Canary to verify output of our Swift toolchain does not depend on the Swift + # compiler itself. (Only its 'lib' output.) + disallowedRequisites = [ swift.swift ]; + + meta = { + description = "Language Server Protocol implementation for Swift and C-based languages"; + homepage = "https://github.com/apple/sourcekit-lsp"; + platforms = with lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + }; +} diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/generated/default.nix b/pkgs/development/compilers/swift/sourcekit-lsp/generated/default.nix new file mode 100644 index 000000000000..fbc898142f78 --- /dev/null +++ b/pkgs/development/compilers/swift/sourcekit-lsp/generated/default.nix @@ -0,0 +1,16 @@ +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = { + "indexstore-db" = "05d7l3fgcvbw8plaky3pgjm03x20a63z9r14njxg5qm2zcp5m6jx"; + "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw"; + "swift-collections" = "1k6sjx5rqmp3gklny77b480hyzy6gkhpi23r0s8ljfbrcwawgnan"; + "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313"; + "swift-driver" = "1lcb5wqragc74nd0fjnk47lyph9hs0i9cps1mplvp2i91yzjqk05"; + "swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h"; + "swift-package-manager" = "0a3vahdkj35n0dkinwcgybgfb9dnq2lq1nknn874r38xbj3mhlff"; + "swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7"; + "swift-tools-support-core" = "134f9x44jnzdy8cwi6hs372dwbyqvr4qmsjzjy25wzpyv6m9rhrz"; + "Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45"; + }; +} diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/generated/workspace-state.json b/pkgs/development/compilers/swift/sourcekit-lsp/generated/workspace-state.json new file mode 100644 index 000000000000..af73c7553946 --- /dev/null +++ b/pkgs/development/compilers/swift/sourcekit-lsp/generated/workspace-state.json @@ -0,0 +1,178 @@ +{ + "object": { + "artifacts": [], + "dependencies": [ + { + "basedOn": null, + "packageRef": { + "identity": "indexstore-db", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/indexstore-db.git", + "name": "IndexStoreDB" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "9305648b0a8700434fa2e55eeacf7c7f4402a0d5" + }, + "name": "sourceControlCheckout" + }, + "subpath": "indexstore-db" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-argument-parser", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-argument-parser.git", + "name": "swift-argument-parser" + }, + "state": { + "checkoutState": { + "revision": "e394bf350e38cb100b6bc4172834770ede1b7232", + "version": "1.0.3" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-argument-parser" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-collections", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-collections.git", + "name": "swift-collections" + }, + "state": { + "checkoutState": { + "revision": "937e904258d22af6e447a0b72c0bc67583ef64a2", + "version": "1.0.4" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-collections" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-crypto", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-crypto.git", + "name": "swift-crypto" + }, + "state": { + "checkoutState": { + "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5", + "version": "1.1.7" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-crypto" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-driver", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-driver.git", + "name": "swift-driver" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "82b274af66cfbb8f3131677676517b34d01e30fd" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-driver" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-llbuild", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-llbuild.git", + "name": "llbuild" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-llbuild" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-package-manager", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-package-manager.git", + "name": "SwiftPM" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "c6e40adbfc78acc60ca464ae482b56442f9f34f4" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-package-manager" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-system", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-system.git", + "name": "swift-system" + }, + "state": { + "checkoutState": { + "revision": "836bc4557b74fe6d2660218d56e3ce96aff76574", + "version": "1.1.1" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-system" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-tools-support-core", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-tools-support-core.git", + "name": "swift-tools-support-core" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "286b48b1d73388e1d49b2bb33aabf995838104e3" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-tools-support-core" + }, + { + "basedOn": null, + "packageRef": { + "identity": "yams", + "kind": "remoteSourceControl", + "location": "https://github.com/jpsim/Yams.git", + "name": "Yams" + }, + "state": { + "checkoutState": { + "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", + "version": "4.0.6" + }, + "name": "sourceControlCheckout" + }, + "subpath": "Yams" + } + ] + }, + "version": 5 +} diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/patches/indexstore-db-macos-target.patch b/pkgs/development/compilers/swift/sourcekit-lsp/patches/indexstore-db-macos-target.patch new file mode 100644 index 000000000000..53e790874d5d --- /dev/null +++ b/pkgs/development/compilers/swift/sourcekit-lsp/patches/indexstore-db-macos-target.patch @@ -0,0 +1,12 @@ +Raise the deployment target of IndexStoreDB so it can link against our XCTest. + +--- a/Package.swift ++++ b/Package.swift +@@ -4,6 +4,7 @@ import PackageDescription + + let package = Package( + name: "IndexStoreDB", ++ platforms: [.macOS("10.12")], + products: [ + .library( + name: "IndexStoreDB", diff --git a/pkgs/development/compilers/swift/sources.nix b/pkgs/development/compilers/swift/sources.nix new file mode 100644 index 000000000000..c3b2fb60a7fc --- /dev/null +++ b/pkgs/development/compilers/swift/sources.nix @@ -0,0 +1,33 @@ +{ lib, fetchFromGitHub }: + +let + + # These packages are all part of the Swift toolchain, and have a single + # upstream version that should match. We also list the hashes here so a basic + # version upgrade touches only this file. + version = "5.7.3"; + hashes = { + llvm-project = "sha256-IDtLPe0sXamnmovbFVKvmDMnci4u/A0urAPjWTYwJCo="; + sourcekit-lsp = "sha256-BT6+VCBSupKOg2mXo6HlkvNRc8pVZU772Mj3LKFamsU="; + swift = "sha256-essP2eIp1sLuROqk0OKGBPfJnvnyAW0moMk0cX1IVQQ="; + swift-cmark = "sha256-f0BoTs4HYdx/aJ9HIGCWMalhl8PvClWD6R4QK3qSgAw="; + swift-corelibs-foundation = "sha256-g78zKSq/b/pVFAD2k2SoMpzJQIpkxMvZOaSz5JPaQmA="; + swift-corelibs-libdispatch = "sha256-1qbXiC1k9+T+L6liqXKg6EZXqem6KEEx8OctuL4Kb2o="; + swift-corelibs-xctest = "sha256-qLUO9/3tkJWorDMEHgHd8VC3ovLLq/UWXJWMtb6CMN0="; + swift-docc = "sha256-WlXJMAnrlVPCM+iCIhG0Gyho76BsC2yVBEpX3m/WiIQ="; + swift-docc-render-artifact = "sha256-ttdurN/K7OX+I4577jG3YGeRs+GLUTc7BiiEZGmFD+s="; + swift-driver = "sha256-BUwsvw8pirvprUFfliLQMMHr6SHTSgeaJYc9lTEvi9E="; + swift-experimental-string-processing = "sha256-W0cQBkdR3A0hrV75Wwm0YULUDVg1bjT0O5w5VGBYDJs="; + swift-package-manager = "sha256-zlFYh1wdjUwOsnbagKnAtqXl3vKPcRtnA7YMORtUeyg="; + }; + + # Create fetch derivations. + sources = lib.mapAttrs (repo: hash: fetchFromGitHub { + owner = "apple"; + inherit repo; + rev = "swift-${version}-RELEASE"; + name = "${repo}-${version}-src"; + hash = hashes.${repo}; + }) hashes; + +in sources // { inherit version; } diff --git a/pkgs/development/compilers/swift/swift-docc/default.nix b/pkgs/development/compilers/swift/swift-docc/default.nix new file mode 100644 index 000000000000..f85512f84071 --- /dev/null +++ b/pkgs/development/compilers/swift/swift-docc/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, callPackage +, swift +, swiftpm +, swiftpm2nix +, Foundation +, XCTest +, CryptoKit +, LocalAuthentication +}: +let + sources = callPackage ../sources.nix { }; + generated = swiftpm2nix.helpers ./generated; +in +stdenv.mkDerivation { + pname = "swift-docc"; + + inherit (sources) version; + src = sources.swift-docc; + # TODO: We could build this from `apple/swift-docc-render` source, but that + # repository is not tagged. + renderArtifact = sources.swift-docc-render-artifact; + + nativeBuildInputs = [ swift swiftpm ]; + buildInputs = [ Foundation XCTest ] + ++ lib.optionals stdenv.isDarwin [ CryptoKit LocalAuthentication ]; + + configurePhase = generated.configure; + + # TODO: Tests depend on indexstore-db being provided by an existing Swift + # toolchain. (ie. looks for `../lib/libIndexStore.so` relative to swiftc. + #doCheck = true; + + installPhase = '' + binPath="$(swiftpmBinPath)" + mkdir -p $out/bin $out/share/docc + cp $binPath/docc $out/bin/ + ln -s $renderArtifact/dist $out/share/docc/render + ''; + + # Canary to verify output of our Swift toolchain does not depend on the Swift + # compiler itself. (Only its 'lib' output.) + disallowedRequisites = [ swift.swift ]; + + meta = { + description = "Documentation compiler for Swift"; + homepage = "https://github.com/apple/swift-docc"; + platforms = with lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + }; +} diff --git a/pkgs/development/compilers/swift/swift-docc/generated/default.nix b/pkgs/development/compilers/swift/swift-docc/generated/default.nix new file mode 100644 index 000000000000..bcd873a44f89 --- /dev/null +++ b/pkgs/development/compilers/swift/swift-docc/generated/default.nix @@ -0,0 +1,15 @@ +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = { + "swift-argument-parser" = "070gip241dgn3d0nxgwxva4vp6kbnf11g01q5yaq6kmflcmz58f2"; + "swift-cmark" = "0xfchdgls3070z16in8ks69y8fpiajmyk7lmp5h7ym7164isa6bb"; + "swift-crypto" = "0h054rq14jyg94aiymmp37vqz60a13dlczp5g09pln724j4ypv92"; + "swift-docc-plugin" = "11d6nhi139yzk1lxxrixsbgyj1bnvmh40wj30y725q83nqq49ljh"; + "swift-docc-symbolkit" = "14hb2wc09hisf2r2yny17z28z0m58cf4lnqaczad2x2hk4s1iayi"; + "swift-lmdb" = "1m5y6x2vs1wflcv2c57rx87gh12sy0hkwy5iy9inxmda2mcs8qcb"; + "swift-markdown" = "09270bfrwlp904cma29hsbhr1p25v8kwgvhcfi7lg2av7aaknd97"; + "swift-nio" = "04bvay94b34ynmlvgyl9a7f431l3cf8k2zr483spv8mvyh1hxiqn"; + "swift-nio-ssl" = "1ak4aldilmz0pnfgbwq1x4alr38nfyvx2pz7p2vi2plf82da80g5"; + }; +} diff --git a/pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json b/pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json new file mode 100644 index 000000000000..ced9a6df956c --- /dev/null +++ b/pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json @@ -0,0 +1,161 @@ +{ + "object": { + "artifacts": [], + "dependencies": [ + { + "basedOn": null, + "packageRef": { + "identity": "swift-argument-parser", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-argument-parser", + "name": "swift-argument-parser" + }, + "state": { + "checkoutState": { + "revision": "d2930e8fcf9c33162b9fcc1d522bc975e2d4179b", + "version": "1.0.1" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-argument-parser" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-cmark", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-cmark.git", + "name": "cmark-gfm" + }, + "state": { + "checkoutState": { + "branch": "release/5.7-gfm", + "revision": "792c1c3326327515ce9bf64c44196b7f4daab9a6" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-cmark" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-crypto", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-crypto.git", + "name": "swift-crypto" + }, + "state": { + "checkoutState": { + "revision": "9680b7251cd2be22caaed8f1468bd9e8915a62fb", + "version": "1.1.2" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-crypto" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-docc-plugin", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-docc-plugin", + "name": "SwiftDocCPlugin" + }, + "state": { + "checkoutState": { + "revision": "3303b164430d9a7055ba484c8ead67a52f7b74f6", + "version": "1.0.0" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-docc-plugin" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-docc-symbolkit", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-docc-symbolkit", + "name": "SymbolKit" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "8682202025906dce29a8b04f9263f40ba87b89d8" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-docc-symbolkit" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-lmdb", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-lmdb.git", + "name": "CLMDB" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "6ea45a7ebf6d8f72bd299dfcc3299e284bbb92ee" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-lmdb" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-markdown", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-markdown.git", + "name": "swift-markdown" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "d6cd065a7e4b6c3fad615dcd39890e095a2f63a2" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-markdown" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-nio", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-nio.git", + "name": "swift-nio" + }, + "state": { + "checkoutState": { + "revision": "1d425b0851ffa2695d488cce1d68df2539f42500", + "version": "2.31.2" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-nio" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-nio-ssl", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-nio-ssl.git", + "name": "swift-nio-ssl" + }, + "state": { + "checkoutState": { + "revision": "2e74773972bd6254c41ceeda827f229bccbf1c0f", + "version": "2.15.0" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-nio-ssl" + } + ] + }, + "version": 5 +} diff --git a/pkgs/development/compilers/swift/swift-driver/default.nix b/pkgs/development/compilers/swift/swift-driver/default.nix new file mode 100644 index 000000000000..60fe2aeb9c92 --- /dev/null +++ b/pkgs/development/compilers/swift/swift-driver/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, callPackage +, fetchpatch +, swift +, swiftpm +, swiftpm2nix +, Foundation +, XCTest +, sqlite +, ncurses +, substituteAll +}: +let + sources = callPackage ../sources.nix { }; + generated = swiftpm2nix.helpers ./generated; + + # On Darwin, we only want ncurses in the linker search path, because headers + # are part of libsystem. Adding its headers to the search path causes strange + # mixing and errors. + # TODO: Find a better way to prevent this conflict. + ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; +in +stdenv.mkDerivation { + pname = "swift-driver"; + + inherit (sources) version; + src = sources.swift-driver; + + nativeBuildInputs = [ swift swiftpm ]; + buildInputs = [ + Foundation + XCTest + sqlite + ncursesInput + ]; + + patches = [ + ./patches/nix-resource-root.patch + ./patches/disable-catalyst.patch + ./patches/linux-fix-linking.patch + # TODO: Replace with branch patch once merged: + # https://github.com/apple/swift-driver/pull/1197 + (fetchpatch { + url = "https://github.com/apple/swift-driver/commit/d3ef9cdf4871a58eddec7ff0e28fe611130da3f9.patch"; + hash = "sha256-eVBaKN6uzj48ZnHtwGV0k5ChKjak1tDCyE+wTdyGq2c="; + }) + # Prevent a warning about SDK directories we don't have. + (substituteAll { + src = ./patches/prevent-sdk-dirs-warnings.patch; + inherit (builtins) storeDir; + }) + ]; + + configurePhase = generated.configure; + + # TODO: Tests depend on indexstore-db being provided by an existing Swift + # toolchain. (ie. looks for `../lib/libIndexStore.so` relative to swiftc. + #doCheck = true; + + # TODO: Darwin-specific installation includes more, but not sure why. + installPhase = '' + binPath="$(swiftpmBinPath)" + mkdir -p $out/bin + for executable in swift-driver swift-help swift-build-sdk-interfaces; do + cp $binPath/$executable $out/bin/ + done + ''; + + meta = { + description = "Swift compiler driver"; + homepage = "https://github.com/apple/swift-driver"; + platforms = with lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + }; +} diff --git a/pkgs/development/compilers/swift/swift-driver/generated/default.nix b/pkgs/development/compilers/swift/swift-driver/generated/default.nix new file mode 100644 index 000000000000..760e8156c43f --- /dev/null +++ b/pkgs/development/compilers/swift/swift-driver/generated/default.nix @@ -0,0 +1,11 @@ +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = { + "swift-argument-parser" = "11did5snqj8chcbdbiyx84mpif940ls2pr1iikwivvfp63i248hm"; + "swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h"; + "swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7"; + "swift-tools-support-core" = "134f9x44jnzdy8cwi6hs372dwbyqvr4qmsjzjy25wzpyv6m9rhrz"; + "Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45"; + }; +} diff --git a/pkgs/development/compilers/swift/swift-driver/generated/workspace-state.json b/pkgs/development/compilers/swift/swift-driver/generated/workspace-state.json new file mode 100644 index 000000000000..f9e893abb7c3 --- /dev/null +++ b/pkgs/development/compilers/swift/swift-driver/generated/workspace-state.json @@ -0,0 +1,93 @@ +{ + "object": { + "artifacts": [], + "dependencies": [ + { + "basedOn": null, + "packageRef": { + "identity": "swift-argument-parser", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-argument-parser.git", + "name": "swift-argument-parser" + }, + "state": { + "checkoutState": { + "revision": "e1465042f195f374b94f915ba8ca49de24300a0d", + "version": "1.0.2" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-argument-parser" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-llbuild", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-llbuild.git", + "name": "llbuild" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-llbuild" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-system", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-system.git", + "name": "swift-system" + }, + "state": { + "checkoutState": { + "revision": "836bc4557b74fe6d2660218d56e3ce96aff76574", + "version": "1.1.1" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-system" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-tools-support-core", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-tools-support-core.git", + "name": "swift-tools-support-core" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "286b48b1d73388e1d49b2bb33aabf995838104e3" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-tools-support-core" + }, + { + "basedOn": null, + "packageRef": { + "identity": "yams", + "kind": "remoteSourceControl", + "location": "https://github.com/jpsim/Yams.git", + "name": "Yams" + }, + "state": { + "checkoutState": { + "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", + "version": "4.0.6" + }, + "name": "sourceControlCheckout" + }, + "subpath": "Yams" + } + ] + }, + "version": 5 +} diff --git a/pkgs/development/compilers/swift/swift-driver/patches/disable-catalyst.patch b/pkgs/development/compilers/swift/swift-driver/patches/disable-catalyst.patch new file mode 100644 index 000000000000..b9eb23f21061 --- /dev/null +++ b/pkgs/development/compilers/swift/swift-driver/patches/disable-catalyst.patch @@ -0,0 +1,17 @@ +Tries to parse SDKSettings.plist looking for a Catalyst version map, but we +don't currently support this. + +--- a/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift ++++ b/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift +@@ -297,11 +297,7 @@ public final class DarwinToolchain: Toolchain { + debugDescription: "Malformed version string") + } + self.version = version +- if self.canonicalName.hasPrefix("macosx") { +- self.versionMap = try keyedContainer.decode(VersionMap.self, forKey: .versionMap) +- } else { + self.versionMap = VersionMap() +- } + } + + diff --git a/pkgs/development/compilers/swift/swift-driver/patches/linux-fix-linking.patch b/pkgs/development/compilers/swift/swift-driver/patches/linux-fix-linking.patch new file mode 100644 index 000000000000..c0cfe2b7d225 --- /dev/null +++ b/pkgs/development/compilers/swift/swift-driver/patches/linux-fix-linking.patch @@ -0,0 +1,40 @@ +--- a/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift ++++ b/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift +@@ -9,6 +9,7 @@ + // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors + // + //===----------------------------------------------------------------------===// ++import Foundation + import TSCBasic + import SwiftOptions + +@@ -116,7 +117,20 @@ extension GenericUnixToolchain { + // just using `clang` and avoid a dependency on the C++ runtime. + let clangTool: Tool = + parsedOptions.hasArgument(.enableExperimentalCxxInterop) ? .clangxx : .clang +- var clangPath = try getToolPath(clangTool) ++ ++ // For Nix, prefer linking using the wrapped system clang, instead of using ++ // the unwrapped clang packaged with swift. The latter is unable to link, but ++ // we still want to use it for other purposes (clang importer). ++ var clangPath: AbsolutePath ++ let env = ProcessInfo.processInfo.environment ++ if let nixCC = env["NIX_CC"], ++ let binPath = try? AbsolutePath(validating: "\(nixCC)/bin"), ++ let tool = lookupExecutablePath(filename: parsedOptions.hasArgument(.enableExperimentalCxxInterop) ++ ? "clang++" : "clang", ++ searchPaths: [binPath]) { ++ clangPath = tool ++ } else { ++ clangPath = try getToolPath(clangTool) + if let toolsDirPath = parsedOptions.getLastArgument(.toolsDirectory) { + // FIXME: What if this isn't an absolute path? + let toolsDir = try AbsolutePath(validating: toolsDirPath.asSingle) +@@ -132,6 +146,7 @@ extension GenericUnixToolchain { + commandLine.appendFlag("-B") + commandLine.appendPath(toolsDir) + } ++ } // nixCC + + // Executables on Linux get -pie + if targetTriple.os == .linux && linkerOutputType == .executable { diff --git a/pkgs/development/compilers/swift/swift-driver/patches/nix-resource-root.patch b/pkgs/development/compilers/swift/swift-driver/patches/nix-resource-root.patch new file mode 100644 index 000000000000..6c3ae87d68c9 --- /dev/null +++ b/pkgs/development/compilers/swift/swift-driver/patches/nix-resource-root.patch @@ -0,0 +1,28 @@ +Swift normally looks for the Clang resource dir in a subdir/symlink of its own +resource dir. We provide a symlink to the Swift build-time Clang as a default +there, but we also here patch a check to try locate it via NIX_CC. + +--- a/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift ++++ b/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift +@@ -9,6 +9,7 @@ + // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors + // + //===----------------------------------------------------------------------===// ++import Foundation + import TSCBasic + import SwiftOptions + +@@ -24,6 +25,13 @@ extension Toolchain { + for targetInfo: FrontendTargetInfo, + parsedOptions: inout ParsedOptions + ) throws -> VirtualPath { ++ let env = ProcessInfo.processInfo.environment ++ if let nixCC = env["NIX_CC"] { ++ return try VirtualPath(path: nixCC) ++ .appending(components: "resource-root", "lib", ++ targetInfo.target.triple.platformName(conflatingDarwin: true)!) ++ } ++ + return VirtualPath.lookup(targetInfo.runtimeResourcePath.path) + .appending(components: "clang", "lib", + targetInfo.target.triple.platformName(conflatingDarwin: true)!) diff --git a/pkgs/development/compilers/swift/swift-driver/patches/prevent-sdk-dirs-warnings.patch b/pkgs/development/compilers/swift/swift-driver/patches/prevent-sdk-dirs-warnings.patch new file mode 100644 index 000000000000..6080865ebe37 --- /dev/null +++ b/pkgs/development/compilers/swift/swift-driver/patches/prevent-sdk-dirs-warnings.patch @@ -0,0 +1,16 @@ +Prevents a user-visible warning on every compilation: + + ld: warning: directory not found for option '-L.../MacOSX11.0.sdk/usr/lib/swift' + +--- a/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift ++++ b/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift +@@ -50,7 +50,9 @@ extension Toolchain { + result.append(sdkPath.appending(components: "System", "iOSSupport", "usr", "lib", "swift")) + } + ++ if sdkPath.absolutePath?.pathString.starts(with: "@storeDir@") == false { + result.append(sdkPath.appending(components: "usr", "lib", "swift")) ++ } + } + + return result diff --git a/pkgs/development/compilers/swift/swiftpm/cmake-glue.nix b/pkgs/development/compilers/swift/swiftpm/cmake-glue.nix new file mode 100644 index 000000000000..f297eafd389b --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/cmake-glue.nix @@ -0,0 +1,90 @@ +# SwiftPM dependencies are normally not installed using CMake, and only provide +# CMake modules to link them together in a build tree. We have separate +# derivations, so need a real install step. Here we provide our own minimal +# CMake modules to install along with the build products. +{ lib, stdenv, swift }: +let + + inherit (stdenv.hostPlatform) extensions; + + # This file exports shell snippets for use in postInstall. + mkInstallScript = module: template: '' + mkdir -p $out/lib/cmake/${module} + ( + export staticLibExt="${extensions.staticLibrary}" + export sharedLibExt="${extensions.sharedLibrary}" + export swiftOs="${swift.swiftOs}" + substituteAll \ + ${builtins.toFile "${module}Config.cmake" template} \ + $out/lib/cmake/${module}/${module}Config.cmake + ) + ''; + +in lib.mapAttrs mkInstallScript { + SwiftSystem = '' + add_library(SwiftSystem::SystemPackage STATIC IMPORTED) + set_property(TARGET SwiftSystem::SystemPackage PROPERTY IMPORTED_LOCATION "@out@/lib/swift_static/@swiftOs@/libSystemPackage@staticLibExt@") + ''; + + SwiftCollections = '' + add_library(SwiftCollections::Collections STATIC IMPORTED) + set_property(TARGET SwiftCollections::Collections PROPERTY IMPORTED_LOCATION "@out@/lib/swift_static/@swiftOs@/libCollections@staticLibExt@") + + add_library(SwiftCollections::DequeModule STATIC IMPORTED) + set_property(TARGET SwiftCollections::DequeModule PROPERTY IMPORTED_LOCATION "@out@/lib/swift_static/@swiftOs@/libDequeModule@staticLibExt@") + + add_library(SwiftCollections::OrderedCollections STATIC IMPORTED) + set_property(TARGET SwiftCollections::OrderedCollections PROPERTY IMPORTED_LOCATION "@out@/lib/swift_static/@swiftOs@/libOrderedCollections@staticLibExt@") + ''; + + TSC = '' + add_library(TSCLibc SHARED IMPORTED) + set_property(TARGET TSCLibc PROPERTY IMPORTED_LOCATION "@out@/lib/libTSCLibc@sharedLibExt@") + + add_library(TSCBasic SHARED IMPORTED) + set_property(TARGET TSCBasic PROPERTY IMPORTED_LOCATION "@out@/lib/libTSCBasic@sharedLibExt@") + + add_library(TSCUtility SHARED IMPORTED) + set_property(TARGET TSCUtility PROPERTY IMPORTED_LOCATION "@out@/lib/libTSCUtility@sharedLibExt@") + ''; + + ArgumentParser = '' + add_library(ArgumentParser SHARED IMPORTED) + set_property(TARGET ArgumentParser PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libArgumentParser@sharedLibExt@") + + add_library(ArgumentParserToolInfo SHARED IMPORTED) + set_property(TARGET ArgumentParserToolInfo PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libArgumentParserToolInfo@sharedLibExt@") + ''; + + Yams = '' + add_library(CYaml SHARED IMPORTED) + set_property(TARGET CYaml PROPERTY IMPORTED_LOCATION "@out@/lib/libCYaml@sharedLibExt@") + + add_library(Yams SHARED IMPORTED) + set_property(TARGET Yams PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libYams@sharedLibExt@") + ''; + + LLBuild = '' + add_library(libllbuild SHARED IMPORTED) + set_property(TARGET libllbuild PROPERTY IMPORTED_LOCATION "@out@/lib/libllbuild@sharedLibExt@") + + add_library(llbuildSwift SHARED IMPORTED) + set_property(TARGET llbuildSwift PROPERTY IMPORTED_LOCATION "@out@/lib/swift/pm/llbuild/libllbuildSwift@sharedLibExt@") + ''; + + SwiftDriver = '' + add_library(SwiftDriver SHARED IMPORTED) + set_property(TARGET SwiftDriver PROPERTY IMPORTED_LOCATION "@out@/lib/libSwiftDriver@sharedLibExt@") + + add_library(SwiftDriverExecution SHARED IMPORTED) + set_property(TARGET SwiftDriverExecution PROPERTY IMPORTED_LOCATION "@out@/lib/libSwiftDriverExecution@sharedLibExt@") + + add_library(SwiftOptions SHARED IMPORTED) + set_property(TARGET SwiftOptions PROPERTY IMPORTED_LOCATION "@out@/lib/libSwiftOptions@sharedLibExt@") + ''; + + SwiftCrypto = '' + add_library(Crypto SHARED IMPORTED) + set_property(TARGET Crypto PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libCrypto@sharedLibExt@") + ''; +} diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix new file mode 100644 index 000000000000..3025672563d2 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/default.nix @@ -0,0 +1,419 @@ +{ lib +, stdenv +, callPackage +, cmake +, ninja +, git +, swift +, swiftpm2nix +, Foundation +, XCTest +, sqlite +, ncurses +, substituteAll +, runCommandLocal +, makeWrapper +, DarwinTools # sw_vers +, cctools # vtool +, xcbuild +, CryptoKit +, LocalAuthentication +}: + +let + + inherit (swift) swiftOs swiftModuleSubdir swiftStaticModuleSubdir; + sharedLibraryExt = stdenv.hostPlatform.extensions.sharedLibrary; + + sources = callPackage ../sources.nix { }; + generated = swiftpm2nix.helpers ./generated; + cmakeGlue = callPackage ./cmake-glue.nix { }; + + # Common attributes for the bootstrap swiftpm and the final swiftpm. + commonAttrs = { + inherit (sources) version; + src = sources.swift-package-manager; + nativeBuildInputs = [ makeWrapper ]; + # Required at run-time for the host platform to build package manifests. + propagatedBuildInputs = [ Foundation ]; + patches = [ + ./patches/cmake-disable-rpath.patch + ./patches/disable-index-store.patch + ./patches/disable-sandbox.patch + ./patches/fix-clang-cxx.patch + (substituteAll { + src = ./patches/disable-xctest.patch; + inherit (builtins) storeDir; + }) + (substituteAll { + src = ./patches/fix-stdlib-path.patch; + inherit (builtins) storeDir; + swiftLib = swift.swift.lib; + }) + ]; + postPatch = '' + # The location of xcrun is hardcoded. We need PATH lookup instead. + find Sources -name '*.swift' | xargs sed -i -e 's|/usr/bin/xcrun|xcrun|g' + + # Patch the location where swiftpm looks for its API modules. + substituteInPlace Sources/PackageModel/UserToolchain.swift \ + --replace \ + 'librariesPath = applicationPath.parentDirectory' \ + "librariesPath = AbsolutePath(\"$out\")" + ''; + }; + + # Tools invoked by swiftpm at run-time. + runtimeDeps = [ git ] + ++ lib.optionals stdenv.isDarwin [ + xcbuild.xcrun + # vtool is used to determine a minimum deployment target. This is part of + # cctools, but adding that as a build input puts an unwrapped linker in + # PATH, and breaks builds. This small derivation exposes just vtool. + (runCommandLocal "vtool" { } '' + mkdir -p $out/bin + ln -s ${cctools}/bin/vtool $out/bin/vtool + '') + ]; + + # Common attributes for the bootstrap derivations. + mkBootstrapDerivation = attrs: stdenv.mkDerivation (attrs // { + nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) + ++ [ cmake ninja swift ] + ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + + buildInputs = (attrs.buildInputs or [ ]) + ++ [ Foundation ]; + + postPatch = (attrs.postPatch or "") + + lib.optionalString stdenv.isDarwin '' + # On Darwin only, Swift uses arm64 as cpu arch. + if [ -e cmake/modules/SwiftSupport.cmake ]; then + substituteInPlace cmake/modules/SwiftSupport.cmake \ + --replace '"aarch64" PARENT_SCOPE' '"arm64" PARENT_SCOPE' + fi + ''; + + preConfigure = (attrs.preConfigure or "") + + '' + # Builds often don't set a target, and our default minimum macOS deployment + # target on x86_64-darwin is too low. Harmless on non-Darwin. + export MACOSX_DEPLOYMENT_TARGET=10.15.4 + ''; + + postInstall = (attrs.postInstall or "") + + lib.optionalString stdenv.isDarwin '' + # The install name of libraries is incorrectly set to lib/ (via our + # CMake setup hook) instead of lib/swift/. This'd be easily fixed by + # fixDarwinDylibNames, but some builds create libraries that reference + # eachother, and we also have to fix those references. + dylibs="$(find $out/lib/swift* -name '*.dylib')" + changes="" + for dylib in $dylibs; do + changes+=" -change $(otool -D $dylib | tail -n 1) $dylib" + done + for dylib in $dylibs; do + install_name_tool -id $dylib $changes $dylib + done + ''; + + cmakeFlags = (attrs.cmakeFlags or [ ]) + ++ [ + # Some builds link to libraries within the same build. Make sure these + # create references to $out. None of our builds run their own products, + # so we don't have to account for that scenario. + "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" + ]; + }); + + # On Darwin, we only want ncurses in the linker search path, because headers + # are part of libsystem. Adding its headers to the search path causes strange + # mixing and errors. + # TODO: Find a better way to prevent this conflict. + ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; + + # Derivations for bootstrapping dependencies using CMake. + # This is based on the `swiftpm/Utilities/bootstrap` script. + # + # Some of the installation steps here are a bit hacky, because it seems like + # these packages were not really meant to be installed using CMake. The + # regular swiftpm bootstrap simply refers to the source and build + # directories. The advantage of separate builds is that we can more easily + # link libs together using existing Nixpkgs infra. + # + # In the end, we don't expose these derivations, and they only exist during + # the bootstrap phase. The final swiftpm derivation does not depend on them. + + swift-system = mkBootstrapDerivation { + name = "swift-system"; + src = generated.sources.swift-system; + + postInstall = cmakeGlue.SwiftSystem + + lib.optionalString (!stdenv.isDarwin) '' + # The cmake rules apparently only use the Darwin install convention. + # Fix up the installation so the module can be found on non-Darwin. + mkdir -p $out/${swiftStaticModuleSubdir} + mv $out/lib/swift_static/${swiftOs}/*.swiftmodule $out/${swiftStaticModuleSubdir}/ + ''; + }; + + swift-collections = mkBootstrapDerivation { + name = "swift-collections"; + src = generated.sources.swift-collections; + + postPatch = '' + # Only builds static libs on Linux, but this installation difference is a + # hassle. Because this installation is temporary for the bootstrap, may + # as well build static libs everywhere. + sed -i -e '/BUILD_SHARED_LIBS/d' CMakeLists.txt + ''; + + postInstall = cmakeGlue.SwiftCollections + + lib.optionalString (!stdenv.isDarwin) '' + # The cmake rules apparently only use the Darwin install convention. + # Fix up the installation so the module can be found on non-Darwin. + mkdir -p $out/${swiftStaticModuleSubdir} + mv $out/lib/swift_static/${swiftOs}/*.swiftmodule $out/${swiftStaticModuleSubdir}/ + ''; + }; + + swift-tools-support-core = mkBootstrapDerivation { + name = "swift-tools-support-core"; + src = generated.sources.swift-tools-support-core; + + buildInputs = [ + swift-system + sqlite + ]; + + postInstall = cmakeGlue.TSC + '' + # Swift modules are not installed. + mkdir -p $out/${swiftModuleSubdir} + cp swift/*.swift{module,doc} $out/${swiftModuleSubdir}/ + + # Static libs are not installed. + cp lib/*.a $out/lib/ + + # Headers are not installed. + mkdir -p $out/include + cp -r ../Sources/TSCclibc/include $out/include/TSC + ''; + }; + + swift-argument-parser = mkBootstrapDerivation { + name = "swift-argument-parser"; + src = generated.sources.swift-argument-parser; + + buildInputs = [ ncursesInput sqlite ]; + + cmakeFlags = [ + "-DBUILD_TESTING=NO" + "-DBUILD_EXAMPLES=NO" + ]; + + postInstall = cmakeGlue.ArgumentParser + + lib.optionalString stdenv.isLinux '' + # Fix rpath so ArgumentParserToolInfo can be found. + patchelf --add-rpath "$out/lib/swift/${swiftOs}" \ + $out/lib/swift/${swiftOs}/libArgumentParser.so + ''; + }; + + Yams = mkBootstrapDerivation { + name = "Yams"; + src = generated.sources.Yams; + + # Conflicts with BUILD file on case-insensitive filesystems. + cmakeBuildDir = "_build"; + + postInstall = cmakeGlue.Yams; + }; + + llbuild = mkBootstrapDerivation { + name = "llbuild"; + src = generated.sources.swift-llbuild; + + nativeBuildInputs = lib.optional stdenv.isDarwin xcbuild; + buildInputs = [ ncursesInput sqlite ]; + + patches = [ + ./patches/llbuild-cmake-disable-rpath.patch + ]; + + postPatch = '' + # Substitute ncurses for curses. + find . -name CMakeLists.txt | xargs sed -i -e 's/curses/ncurses/' + + # Use absolute install names instead of rpath. + substituteInPlace \ + products/libllbuild/CMakeLists.txt \ + products/llbuildSwift/CMakeLists.txt \ + --replace '@rpath' "$out/lib" + + # This subdirectory is enabled for Darwin only, but requires ObjC XCTest + # (and only Swift XCTest is open source). + substituteInPlace perftests/CMakeLists.txt \ + --replace 'add_subdirectory(Xcode/' '#add_subdirectory(Xcode/' + ''; + + cmakeFlags = [ + "-DLLBUILD_SUPPORT_BINDINGS=Swift" + ]; + + postInstall = cmakeGlue.LLBuild + '' + # Install module map. + cp ../products/libllbuild/include/module.modulemap $out/include + + # Swift modules are not installed. + mkdir -p $out/${swiftModuleSubdir} + cp products/llbuildSwift/*.swift{module,doc} $out/${swiftModuleSubdir}/ + ''; + }; + + swift-driver = mkBootstrapDerivation { + name = "swift-driver"; + src = generated.sources.swift-driver; + + buildInputs = [ + Yams + llbuild + swift-system + swift-argument-parser + swift-tools-support-core + ]; + + postInstall = cmakeGlue.SwiftDriver + '' + # Swift modules are not installed. + mkdir -p $out/${swiftModuleSubdir} + cp swift/*.swift{module,doc} $out/${swiftModuleSubdir}/ + ''; + }; + + swift-crypto = mkBootstrapDerivation { + name = "swift-crypto"; + src = generated.sources.swift-crypto; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace /usr/bin/ar $NIX_CC/bin/ar + ''; + + postInstall = cmakeGlue.SwiftCrypto + '' + # Static libs are not installed. + cp lib/*.a $out/lib/ + + # Headers are not installed. + cp -r ../Sources/CCryptoBoringSSL/include $out/include + ''; + }; + + # Build a bootrapping swiftpm using CMake. + swiftpm-bootstrap = mkBootstrapDerivation (commonAttrs // { + pname = "swiftpm-bootstrap"; + + buildInputs = [ + llbuild + swift-argument-parser + swift-collections + swift-crypto + swift-driver + swift-system + swift-tools-support-core + ]; + + cmakeFlags = [ + "-DUSE_CMAKE_INSTALL=ON" + ]; + + postInstall = '' + for program in $out/bin/swift-*; do + wrapProgram $program --prefix PATH : ${lib.makeBinPath runtimeDeps} + done + ''; + }); + +# Build the final swiftpm with the bootstrapping swiftpm. +in stdenv.mkDerivation (commonAttrs // { + pname = "swiftpm"; + + nativeBuildInputs = commonAttrs.nativeBuildInputs ++ [ + swift + swiftpm-bootstrap + ]; + buildInputs = [ + ncursesInput + sqlite + XCTest + ] + ++ lib.optionals stdenv.isDarwin [ + CryptoKit + LocalAuthentication + ]; + + configurePhase = generated.configure + '' + # Functionality provided by Xcode XCTest, but not available in + # swift-corelibs-xctest. + swiftpmMakeMutable swift-tools-support-core + substituteInPlace .build/checkouts/swift-tools-support-core/Sources/TSCTestSupport/XCTestCasePerf.swift \ + --replace 'canImport(Darwin)' 'false' + + # Prevent a warning about SDK directories we don't have. + swiftpmMakeMutable swift-driver + patch -p1 -d .build/checkouts/swift-driver -i ${substituteAll { + src = ../swift-driver/patches/prevent-sdk-dirs-warnings.patch; + inherit (builtins) storeDir; + }} + ''; + + buildPhase = '' + # Required to link with swift-corelibs-xctest on Darwin. + export SWIFTTSC_MACOS_DEPLOYMENT_TARGET=10.12 + + TERM=dumb swift-build -c release + ''; + + # TODO: Tests depend on indexstore-db being provided by an existing Swift + # toolchain. (ie. looks for `../lib/libIndexStore.so` relative to swiftc. + #doCheck = true; + #checkPhase = '' + # TERM=dumb swift-test -c release + #''; + + # The following is dervied from Utilities/bootstrap, see install_swiftpm. + installPhase = '' + binPath="$(swift-build --show-bin-path -c release)" + + mkdir -p $out/bin $out/lib/swift + + cp $binPath/swift-package $out/bin/ + wrapProgram $out/bin/swift-package \ + --prefix PATH : ${lib.makeBinPath runtimeDeps} + for tool in swift-build swift-test swift-run swift-package-collection; do + ln -s $out/bin/swift-package $out/bin/$tool + done + + installSwiftpmModule() { + mkdir -p $out/lib/swift/pm/$2 + cp $binPath/lib$1${sharedLibraryExt} $out/lib/swift/pm/$2/ + + if [[ -f $binPath/$1.swiftinterface ]]; then + cp $binPath/$1.swiftinterface $out/lib/swift/pm/$2/ + else + cp -r $binPath/$1.swiftmodule $out/lib/swift/pm/$2/ + fi + cp $binPath/$1.swiftdoc $out/lib/swift/pm/$2/ + } + installSwiftpmModule PackageDescription ManifestAPI + installSwiftpmModule PackagePlugin PluginAPI + ''; + + setupHook = ./setup-hook.sh; + + meta = { + description = "The Package Manager for the Swift Programming Language"; + homepage = "https://github.com/apple/swift-package-manager"; + platforms = with lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + }; +}) diff --git a/pkgs/development/compilers/swift/swiftpm/generated/default.nix b/pkgs/development/compilers/swift/swiftpm/generated/default.nix new file mode 100644 index 000000000000..45d09093c62c --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/generated/default.nix @@ -0,0 +1,14 @@ +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = { + "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw"; + "swift-collections" = "1k6sjx5rqmp3gklny77b480hyzy6gkhpi23r0s8ljfbrcwawgnan"; + "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313"; + "swift-driver" = "1lcb5wqragc74nd0fjnk47lyph9hs0i9cps1mplvp2i91yzjqk05"; + "swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h"; + "swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7"; + "swift-tools-support-core" = "134f9x44jnzdy8cwi6hs372dwbyqvr4qmsjzjy25wzpyv6m9rhrz"; + "Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45"; + }; +} diff --git a/pkgs/development/compilers/swift/swiftpm/generated/workspace-state.json b/pkgs/development/compilers/swift/swiftpm/generated/workspace-state.json new file mode 100644 index 000000000000..48a6350ece96 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/generated/workspace-state.json @@ -0,0 +1,144 @@ +{ + "object": { + "artifacts": [], + "dependencies": [ + { + "basedOn": null, + "packageRef": { + "identity": "swift-argument-parser", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-argument-parser.git", + "name": "swift-argument-parser" + }, + "state": { + "checkoutState": { + "revision": "e394bf350e38cb100b6bc4172834770ede1b7232", + "version": "1.0.3" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-argument-parser" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-collections", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-collections.git", + "name": "swift-collections" + }, + "state": { + "checkoutState": { + "revision": "937e904258d22af6e447a0b72c0bc67583ef64a2", + "version": "1.0.4" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-collections" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-crypto", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-crypto.git", + "name": "swift-crypto" + }, + "state": { + "checkoutState": { + "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5", + "version": "1.1.7" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-crypto" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-driver", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-driver.git", + "name": "swift-driver" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "82b274af66cfbb8f3131677676517b34d01e30fd" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-driver" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-llbuild", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-llbuild.git", + "name": "llbuild" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-llbuild" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-system", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-system.git", + "name": "swift-system" + }, + "state": { + "checkoutState": { + "revision": "836bc4557b74fe6d2660218d56e3ce96aff76574", + "version": "1.1.1" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-system" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-tools-support-core", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-tools-support-core.git", + "name": "swift-tools-support-core" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "286b48b1d73388e1d49b2bb33aabf995838104e3" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-tools-support-core" + }, + { + "basedOn": null, + "packageRef": { + "identity": "yams", + "kind": "remoteSourceControl", + "location": "https://github.com/jpsim/Yams.git", + "name": "Yams" + }, + "state": { + "checkoutState": { + "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", + "version": "4.0.6" + }, + "name": "sourceControlCheckout" + }, + "subpath": "Yams" + } + ] + }, + "version": 5 +} diff --git a/pkgs/development/compilers/swift/swiftpm/patches/cmake-disable-rpath.patch b/pkgs/development/compilers/swift/swiftpm/patches/cmake-disable-rpath.patch new file mode 100644 index 000000000000..9aeba452f9e8 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/patches/cmake-disable-rpath.patch @@ -0,0 +1,36 @@ +Disable rpath for the bootstrap build with CMake. + +--- a/Sources/PackageDescription/CMakeLists.txt ++++ b/Sources/PackageDescription/CMakeLists.txt +@@ -31,14 +31,11 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin) + set(SWIFT_INTERFACE_PATH ${CMAKE_BINARY_DIR}/pm/ManifestAPI/PackageDescription.swiftinterface) + target_compile_options(PackageDescription PUBLIC + $<$:-emit-module-interface-path$${SWIFT_INTERFACE_PATH}>) +- target_link_options(PackageDescription PRIVATE +- "SHELL:-Xlinker -install_name -Xlinker @rpath/libPackageDescription.dylib") + endif() + + set_target_properties(PackageDescription PROPERTIES + Swift_MODULE_NAME PackageDescription + Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI +- INSTALL_NAME_DIR \\@rpath + OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI + OUTPUT_NAME PackageDescription + ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI +--- a/Sources/PackagePlugin/CMakeLists.txt ++++ b/Sources/PackagePlugin/CMakeLists.txt +@@ -29,14 +29,11 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin) + set(SWIFT_INTERFACE_PATH ${CMAKE_BINARY_DIR}/pm/PluginAPI/PackagePlugin.swiftinterface) + target_compile_options(PackagePlugin PUBLIC + $<$:-emit-module-interface-path$${SWIFT_INTERFACE_PATH}>) +- target_link_options(PackagePlugin PRIVATE +- "SHELL:-Xlinker -install_name -Xlinker @rpath/libPackagePlugin.dylib") + endif() + + set_target_properties(PackagePlugin PROPERTIES + Swift_MODULE_NAME PackagePlugin + Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/pm/PluginAPI +- INSTALL_NAME_DIR \\@rpath + OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/PluginAPI + OUTPUT_NAME PackagePlugin + ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/PluginAPI diff --git a/pkgs/development/compilers/swift/swiftpm/patches/disable-index-store.patch b/pkgs/development/compilers/swift/swiftpm/patches/disable-index-store.patch new file mode 100644 index 000000000000..bef8d43a0dbc --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/patches/disable-index-store.patch @@ -0,0 +1,23 @@ +The `-index-store-path` option is an Apple extension not available in our +Clang. Make it opt-in by default. + +(It is assumed the `target.type == test` check is for Xcode support, because +there is no evidence of it in swift-corelibs-xctest.) + +--- a/Sources/Build/BuildPlan.swift ++++ b/Sources/Build/BuildPlan.swift +@@ -103,14 +103,7 @@ extension BuildParameters { + case .off: + addIndexStoreArguments = false + case .auto: +- if configuration == .debug { +- addIndexStoreArguments = true +- } else if target.type == .test { +- // Test discovery requires an index store for the test target to discover the tests +- addIndexStoreArguments = true +- } else { + addIndexStoreArguments = false +- } + } + + if addIndexStoreArguments { diff --git a/pkgs/development/compilers/swift/swiftpm/patches/disable-sandbox.patch b/pkgs/development/compilers/swift/swiftpm/patches/disable-sandbox.patch new file mode 100644 index 000000000000..406e1d68d0e4 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/patches/disable-sandbox.patch @@ -0,0 +1,21 @@ +Nix may already sandbox the build, in which case sandbox_apply will fail. + +--- a/Sources/Basics/Sandbox.swift ++++ b/Sources/Basics/Sandbox.swift +@@ -30,12 +30,14 @@ public enum Sandbox { + readOnlyDirectories: [AbsolutePath] = [] + ) -> [String] { + #if os(macOS) ++ let env = ProcessInfo.processInfo.environment ++ if env["NIX_BUILD_TOP"] == nil || env["IN_NIX_SHELL"] != nil { + let profile = macOSSandboxProfile(strictness: strictness, writableDirectories: writableDirectories, readOnlyDirectories: readOnlyDirectories) + return ["/usr/bin/sandbox-exec", "-p", profile] + command +- #else ++ } ++ #endif + // rdar://40235432, rdar://75636874 tracks implementing sandboxes for other platforms. + return command +- #endif + } + + /// Basic strictness level of a sandbox applied to a command line. diff --git a/pkgs/development/compilers/swift/swiftpm/patches/disable-xctest.patch b/pkgs/development/compilers/swift/swiftpm/patches/disable-xctest.patch new file mode 100644 index 000000000000..e24d154d2987 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/patches/disable-xctest.patch @@ -0,0 +1,48 @@ +XCTest is not fully open-source, only the Swift library parts. We don't have a +command-line runner available, so disable support. + +--- a/Sources/Commands/TestingSupport.swift ++++ b/Sources/Commands/TestingSupport.swift +@@ -60,7 +60,7 @@ enum TestingSupport { + /// - Returns: Array of TestSuite + static func getTestSuites(fromTestAt path: AbsolutePath, swiftTool: SwiftTool, swiftOptions: SwiftToolOptions) throws -> [TestSuite] { + // Run the correct tool. +- #if os(macOS) ++ #if false + let data: String = try withTemporaryFile { tempFile in + let args = [try TestingSupport.xctestHelperPath(swiftTool: swiftTool).pathString, path.pathString, tempFile.path.pathString] + var env = try TestingSupport.constructTestEnvironment(toolchain: try swiftTool.getToolchain(), options: swiftOptions, buildParameters: swiftTool.buildParametersForTest()) +--- a/Sources/swiftpm-xctest-helper/main.swift ++++ b/Sources/swiftpm-xctest-helper/main.swift +@@ -9,8 +9,11 @@ + */ + + #if os(macOS) +-import XCTest + import func Darwin.C.exit ++print("Not supported in Nix.") ++exit(1) ++#if false ++import XCTest + + /// A helper tool to get list of tests from a XCTest Bundle on macOS. + /// +@@ -132,6 +135,7 @@ do { + exit(1) + } + ++#endif // nix + #else + + #if os(Windows) +--- a/Sources/PackageModel/Destination.swift ++++ b/Sources/PackageModel/Destination.swift +@@ -174,7 +174,7 @@ public struct Destination: Encodable, Equatable { + arguments: ["/usr/bin/xcrun", "--sdk", "macosx", "--show-sdk-platform-path"], + environment: environment).spm_chomp() + +- if let platformPath = platformPath, !platformPath.isEmpty { ++ if let platformPath = platformPath, !platformPath.isEmpty && !platformPath.starts(with: "@storeDir@") { + // For XCTest framework. + let fwk = AbsolutePath(platformPath).appending( + components: "Developer", "Library", "Frameworks") diff --git a/pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch b/pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch new file mode 100644 index 000000000000..60c4e33eb154 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch @@ -0,0 +1,121 @@ +Swiftpm may invoke clang, not clang++, to compile C++. Our cc-wrapper also +doesn't pick up the arguments that enable C++ compilation in this case. Patch +swiftpm to properly invoke clang++. + +--- a/Sources/Build/LLBuildManifestBuilder.swift ++++ b/Sources/Build/LLBuildManifestBuilder.swift +@@ -782,7 +782,7 @@ extension LLBuildManifestBuilder { + + args += ["-c", path.source.pathString, "-o", path.object.pathString] + +- let clangCompiler = try buildParameters.toolchain.getClangCompiler().pathString ++ let clangCompiler = try buildParameters.toolchain.getClangCompiler(isCXX: isCXX).pathString + args.insert(clangCompiler, at: 0) + + let objectFileNode: Node = .file(path.object) +--- a/Sources/PackageModel/Destination.swift ++++ b/Sources/PackageModel/Destination.swift +@@ -153,7 +153,7 @@ public struct Destination: Encodable, Equatable { + + var extraCPPFlags: [String] = [] + #if os(macOS) +- extraCPPFlags += ["-lc++"] ++ extraCPPFlags += ["-lc++", "-lc++abi"] + #elseif os(Windows) + extraCPPFlags += [] + #else +--- a/Sources/PackageModel/Toolchain.swift ++++ b/Sources/PackageModel/Toolchain.swift +@@ -20,7 +20,7 @@ public protocol Toolchain { + var macosSwiftStdlib: AbsolutePath { get } + + /// Path of the `clang` compiler. +- func getClangCompiler() throws -> AbsolutePath ++ func getClangCompiler(isCXX: Bool) throws -> AbsolutePath + + // FIXME: This is a temporary API until index store is widely available in + // the OSS clang compiler. This API should not used for any other purpose. +--- a/Sources/PackageModel/UserToolchain.swift ++++ b/Sources/PackageModel/UserToolchain.swift +@@ -57,7 +57,7 @@ public final class UserToolchain: Toolchain { + /// Only use search paths, do not fall back to `xcrun`. + let useXcrun: Bool + +- private var _clangCompiler: AbsolutePath? ++ private var _clangCompiler: [Bool: AbsolutePath] = [:] + + private let environment: EnvironmentVariables + +@@ -150,29 +150,31 @@ public final class UserToolchain: Toolchain { + } + + /// Returns the path to clang compiler tool. +- public func getClangCompiler() throws -> AbsolutePath { ++ public func getClangCompiler(isCXX: Bool) throws -> AbsolutePath { + // Check if we already computed. +- if let clang = self._clangCompiler { ++ if let clang = self._clangCompiler[isCXX] { + return clang + } + + // Check in the environment variable first. +- if let toolPath = UserToolchain.lookup(variable: "CC", searchPaths: self.envSearchPaths, environment: environment) { +- self._clangCompiler = toolPath ++ let envVar = isCXX ? "CXX" : "CC"; ++ if let toolPath = UserToolchain.lookup(variable: envVar, searchPaths: self.envSearchPaths, environment: environment) { ++ self._clangCompiler[isCXX] = toolPath + return toolPath + } + + // Then, check the toolchain. ++ let tool = isCXX ? "clang++" : "clang"; + do { +- if let toolPath = try? UserToolchain.getTool("clang", binDir: self.destination.binDir) { +- self._clangCompiler = toolPath ++ if let toolPath = try? UserToolchain.getTool(tool, binDir: self.destination.binDir) { ++ self._clangCompiler[isCXX] = toolPath + return toolPath + } + } + + // Otherwise, lookup it up on the system. +- let toolPath = try UserToolchain.findTool("clang", envSearchPaths: self.envSearchPaths, useXcrun: useXcrun) +- self._clangCompiler = toolPath ++ let toolPath = try UserToolchain.findTool(tool, envSearchPaths: self.envSearchPaths, useXcrun: useXcrun) ++ self._clangCompiler[isCXX] = toolPath + return toolPath + } + +--- a/Sources/SPMBuildCore/BuildParameters.swift ++++ b/Sources/SPMBuildCore/BuildParameters.swift +@@ -342,7 +342,7 @@ private struct _Toolchain: Encodable { + public func encode(to encoder: Encoder) throws { + var container = encoder.container(keyedBy: CodingKeys.self) + try container.encode(toolchain.swiftCompilerPath, forKey: .swiftCompiler) +- try container.encode(toolchain.getClangCompiler(), forKey: .clangCompiler) ++ try container.encode(toolchain.getClangCompiler(isCXX: false), forKey: .clangCompiler) + + try container.encode(toolchain.extraCCFlags, forKey: .extraCCFlags) + try container.encode(toolchain.extraCPPFlags, forKey: .extraCPPFlags) +--- a/Sources/XCBuildSupport/XcodeBuildSystem.swift ++++ b/Sources/XCBuildSupport/XcodeBuildSystem.swift +@@ -172,7 +172,7 @@ public final class XcodeBuildSystem: SPMBuildCore.BuildSystem { + // Generate a table of any overriding build settings. + var settings: [String: String] = [:] + // An error with determining the override should not be fatal here. +- settings["CC"] = try? buildParameters.toolchain.getClangCompiler().pathString ++ settings["CC"] = try? buildParameters.toolchain.getClangCompiler(isCXX: false).pathString + // Always specify the path of the effective Swift compiler, which was determined in the same way as for the native build system. + settings["SWIFT_EXEC"] = buildParameters.toolchain.swiftCompilerPath.pathString + settings["LIBRARY_SEARCH_PATHS"] = "$(inherited) \(buildParameters.toolchain.toolchainLibDir.pathString)" +--- a/Tests/BuildTests/MockBuildTestHelper.swift ++++ b/Tests/BuildTests/MockBuildTestHelper.swift +@@ -15,7 +15,7 @@ struct MockToolchain: PackageModel.Toolchain { + #else + let extraCPPFlags: [String] = ["-lstdc++"] + #endif +- func getClangCompiler() throws -> AbsolutePath { ++ func getClangCompiler(isCXX: Bool) throws -> AbsolutePath { + return AbsolutePath("/fake/path/to/clang") + } + diff --git a/pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch b/pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch new file mode 100644 index 000000000000..327ccf37e425 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch @@ -0,0 +1,23 @@ +Swiftpm looks for the Swift stdlib relative to the swift compiler, but that's a +wrapper in our case. It wants to add the stdlib to the rpath, which is +necessary for back-deployment of some features. + +--- a/Sources/PackageModel/Toolchain.swift ++++ b/Sources/PackageModel/Toolchain.swift +@@ -43,10 +43,16 @@ extension Toolchain { + } + + public var macosSwiftStdlib: AbsolutePath { ++ if swiftCompilerPath.pathString.starts(with: "@storeDir@") { ++ return AbsolutePath("@swiftLib@/lib/swift/macosx") ++ } + return AbsolutePath("../../lib/swift/macosx", relativeTo: resolveSymlinks(swiftCompilerPath)) + } + + public var toolchainLibDir: AbsolutePath { ++ if swiftCompilerPath.pathString.starts(with: "@storeDir@") { ++ return AbsolutePath("@swiftLib@/lib") ++ } + // FIXME: Not sure if it's better to base this off of Swift compiler or our own binary. + return AbsolutePath("../../lib", relativeTo: resolveSymlinks(swiftCompilerPath)) + } diff --git a/pkgs/development/compilers/swift/swiftpm/patches/llbuild-cmake-disable-rpath.patch b/pkgs/development/compilers/swift/swiftpm/patches/llbuild-cmake-disable-rpath.patch new file mode 100644 index 000000000000..785e82cc34b6 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/patches/llbuild-cmake-disable-rpath.patch @@ -0,0 +1,14 @@ +Specifying `-platform_version` targeting macos before 10.15 causes cctools ld +to link with `@rpath`. This may have something to do with Swift ABI stability. + +--- a/products/llbuildSwift/CMakeLists.txt ++++ b/products/llbuildSwift/CMakeLists.txt +@@ -22,7 +17,7 @@ endif() + + # TODO(compnerd) move both of these outside of the CMake into the invocation + if(CMAKE_SYSTEM_NAME STREQUAL Darwin) +- add_compile_options(-target ${CMAKE_OSX_ARCHITECTURES}-apple-macosx10.10) ++ add_compile_options(-target ${CMAKE_OSX_ARCHITECTURES}-apple-macosx10.15) + if(NOT CMAKE_OSX_SYSROOT STREQUAL "") + add_compile_options(-sdk ${CMAKE_OSX_SYSROOT}) + endif() diff --git a/pkgs/development/compilers/swift/swiftpm/setup-hook.sh b/pkgs/development/compilers/swift/swiftpm/setup-hook.sh new file mode 100644 index 000000000000..160fbb1ccca3 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/setup-hook.sh @@ -0,0 +1,60 @@ +# Build using 'swift-build'. +swiftpmBuildPhase() { + runHook preBuild + + local buildCores=1 + if [ "${enableParallelBuilding-1}" ]; then + buildCores="$NIX_BUILD_CORES" + fi + + local flagsArray=( + -j $buildCores + -c "${swiftpmBuildConfig-release}" + $swiftpmFlags "${swiftpmFlagsArray[@]}" + ) + + echoCmd 'build flags' "${flagsArray[@]}" + TERM=dumb swift-build "${flagsArray[@]}" + + runHook postBuild +} + +if [ -z "${dontUseSwiftpmBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=swiftpmBuildPhase +fi + +# Check using 'swift-test'. +swiftpmCheckPhase() { + runHook preCheck + + local buildCores=1 + if [ "${enableParallelBuilding-1}" ]; then + buildCores="$NIX_BUILD_CORES" + fi + + local flagsArray=( + -j $buildCores + -c "${swiftpmBuildConfig-release}" + $swiftpmFlags "${swiftpmFlagsArray[@]}" + ) + + echoCmd 'check flags' "${flagsArray[@]}" + TERM=dumb swift-test "${flagsArray[@]}" + + runHook postCheck +} + +if [ -z "${dontUseSwiftpmCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=swiftpmCheckPhase +fi + +# Helper used to find the binary output path. +# Useful for performing the installPhase of swiftpm packages. +swiftpmBinPath() { + local flagsArray=( + -c "${swiftpmBuildConfig-release}" + $swiftpmFlags "${swiftpmFlagsArray[@]}" + ) + + swift-build --show-bin-path "${flagsArray[@]}" +} diff --git a/pkgs/development/compilers/swift/wrapper/default.nix b/pkgs/development/compilers/swift/wrapper/default.nix new file mode 100644 index 000000000000..a7d16cc2471a --- /dev/null +++ b/pkgs/development/compilers/swift/wrapper/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, swift +, useSwiftDriver ? true, swift-driver +}: + +stdenv.mkDerivation (swift._wrapperParams // { + pname = "swift-wrapper"; + inherit (swift) version meta; + + outputs = [ "out" "man" ]; + + # Wrapper and setup hook variables. + inherit swift; + inherit (swift) + swiftOs swiftArch + swiftModuleSubdir swiftLibSubdir + swiftStaticModuleSubdir swiftStaticLibSubdir; + swiftDriver = if useSwiftDriver + then "${swift-driver}/bin/swift-driver" else ""; + + passAsFile = [ "buildCommand" ]; + buildCommand = '' + mkdir -p $out/bin $out/nix-support + + # Symlink all Swift binaries first. + # NOTE: This specifically omits clang binaries. We want to hide these for + # private use by Swift only. + ln -s -t $out/bin/ $swift/bin/swift* + + # Replace specific binaries with wrappers. + for executable in swift swiftc swift-frontend; do + export prog=$swift/bin/$executable + rm $out/bin/$executable + substituteAll '${./wrapper.sh}' $out/bin/$executable + chmod a+x $out/bin/$executable + done + + ${lib.optionalString useSwiftDriver '' + # Symlink swift-driver executables. + ln -s -t $out/bin/ ${swift-driver}/bin/* + ''} + + ln -s ${swift.man} $man + + # This link is here because various tools (swiftpm) check for stdlib + # relative to the swift compiler. It's fine if this is for build-time + # stuff, but we should patch all cases were it would end up in an output. + ln -s ${swift.lib}/lib $out/lib + + substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook + ''; + + passthru = { + inherit swift; + inherit (swift) swiftOs swiftArch swiftModuleSubdir swiftLibSubdir; + }; +}) diff --git a/pkgs/development/compilers/swift/wrapper/setup-hook.sh b/pkgs/development/compilers/swift/wrapper/setup-hook.sh new file mode 100644 index 000000000000..398f19977f66 --- /dev/null +++ b/pkgs/development/compilers/swift/wrapper/setup-hook.sh @@ -0,0 +1,28 @@ +# Add import paths for build inputs. +swiftWrapper_addImports () { + # Include subdirectories following both the Swift platform convention, and + # a simple `lib/swift` for Nix convenience. + for subdir in @swiftModuleSubdir@ @swiftStaticModuleSubdir@ lib/swift; do + if [[ -d "$1/$subdir" ]]; then + export NIX_SWIFTFLAGS_COMPILE+=" -I $1/$subdir" + fi + done + for subdir in @swiftLibSubdir@ @swiftStaticLibSubdir@ lib/swift; do + if [[ -d "$1/$subdir" ]]; then + export NIX_LDFLAGS+=" -L $1/$subdir" + fi + done +} + +addEnvHooks "$targetOffset" swiftWrapper_addImports + +# Use a postHook here because we rely on NIX_CC, which is set by the cc-wrapper +# setup hook, so delay until we're sure it was run. +swiftWrapper_postHook () { + # On Darwin, libc also contains Swift modules. + if [[ -e "$NIX_CC/nix-support/orig-libc" ]]; then + swiftWrapper_addImports "$(<$NIX_CC/nix-support/orig-libc)" + fi +} + +postHooks+=(swiftWrapper_postHook) diff --git a/pkgs/development/compilers/swift/wrapper/wrapper.sh b/pkgs/development/compilers/swift/wrapper/wrapper.sh new file mode 100644 index 000000000000..0c56e63b6f29 --- /dev/null +++ b/pkgs/development/compilers/swift/wrapper/wrapper.sh @@ -0,0 +1,291 @@ +#! @shell@ +# NOTE: This wrapper is derived from cc-wrapper.sh, and is hopefully somewhat +# diffable with the original, so changes can be merged if necessary. +set -eu -o pipefail +o posix +shopt -s nullglob + +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + +cc_wrapper="${NIX_CC:-@default_cc_wrapper@}" + +source $cc_wrapper/nix-support/utils.bash + +expandResponseParams "$@" + +# Check if we should wrap this Swift invocation at all, and how. Specifically, +# there are some internal tools we don't wrap, plus swift-frontend doesn't link +# and doesn't understand linker flags. This follows logic in +# `lib/DriverTool/driver.cpp`. +prog=@prog@ +progName="$(basename "$prog")" +firstArg="${params[0]:-}" +isFrontend=0 +isRepl=0 + +# These checks follow `shouldRunAsSubcommand`. +if [[ "$progName" == swift ]]; then + case "$firstArg" in + "" | -* | *.* | */* | repl) + ;; + *) + exec "swift-$firstArg" "${params[@]:1}" + ;; + esac +fi + +# These checks follow the first part of `run_driver`. +# +# NOTE: The original function short-circuits, but we can't here, because both +# paths must be wrapped. So we use an 'isFrontend' flag instead. +case "$firstArg" in + -frontend) + isFrontend=1 + # Ensure this stays the first argument. + params=( "${params[@]:1}" ) + extraBefore+=( "-frontend" ) + ;; + -modulewrap) + # Don't wrap this integrated tool. + exec "$prog" "${params[@]}" + ;; + repl) + isRepl=1 + params=( "${params[@]:1}" ) + ;; + --driver-mode=*) + ;; + *) + if [[ "$progName" == swift-frontend ]]; then + isFrontend=1 + fi + ;; +esac + +# For many tasks, Swift reinvokes swift-driver, the new driver implementation +# written in Swift. It needs some help finding the executable, though, and +# reimplementing the logic here is little effort. These checks follow +# `shouldDisallowNewDriver`. +if [[ + $isFrontend = 0 && + -n "@swiftDriver@" && + -z "${SWIFT_USE_OLD_DRIVER:-}" && + ( "$progName" == "swift" || "$progName" == "swiftc" ) +]]; then + prog=@swiftDriver@ + # Driver mode must be the very first argument. + extraBefore+=( "--driver-mode=$progName" ) + if [[ $isRepl = 1 ]]; then + extraBefore+=( "-repl" ) + fi + + # Ensure swift-driver invokes the unwrapped frontend (instead of finding + # the wrapped one via PATH), because we don't have to wrap a second time. + export SWIFT_DRIVER_SWIFT_FRONTEND_EXEC="@swift@/bin/swift-frontend" + + # Ensure swift-driver can find the LLDB with Swift support for the REPL. + export SWIFT_DRIVER_LLDB_EXEC="@swift@/bin/lldb" +fi + +path_backup="$PATH" + +# That @-vars are substituted separately from bash evaluation makes +# shellcheck think this, and others like it, are useless conditionals. +# shellcheck disable=SC2157 +if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then + PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" +fi + +# Parse command line options and set several variables. +# For instance, figure out if linker flags should be passed. +# GCC prints annoying warnings when they are not needed. +isCxx=0 +dontLink=$isFrontend + +for p in "${params[@]}"; do + case "$p" in + -enable-cxx-interop) + isCxx=1 ;; + esac +done + +# NOTE: We don't modify these for Swift, but sourced scripts may use them. +cxxInclude=1 +cxxLibrary=1 +cInclude=1 + +linkType=$(checkLinkType "${params[@]}") + +# Optionally filter out paths not refering to the store. +if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then + kept=() + nParams=${#params[@]} + declare -i n=0 + while (( "$n" < "$nParams" )); do + p=${params[n]} + p2=${params[n+1]:-} # handle `p` being last one + n+=1 + + skipNext=false + path="" + case "$p" in + -[IL]/*) path=${p:2} ;; + -[IL]) path=$p2 skipNext=true ;; + esac + + if [[ -n $path ]] && badPath "$path"; then + skip "$path" + $skipNext && n+=1 + continue + fi + + kept+=("$p") + done + # Old bash empty array hack + params=(${kept+"${kept[@]}"}) +fi + +# Flirting with a layer violation here. +if [ -z "${NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then + source @bintools@/nix-support/add-flags.sh +fi + +# Put this one second so libc ldflags take priority. +if [ -z "${NIX_CC_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then + source $cc_wrapper/nix-support/add-flags.sh +fi + +if [[ "$isCxx" = 1 ]]; then + if [[ "$cxxInclude" = 1 ]]; then + NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@" + fi + if [[ "$cxxLibrary" = 1 ]]; then + NIX_CFLAGS_LINK_@suffixSalt@+=" $NIX_CXXSTDLIB_LINK_@suffixSalt@" + fi +fi + +source $cc_wrapper/nix-support/add-hardening.sh + +# Add the flags for the C compiler proper. +addCFlagsToList() { + declare -n list="$1" + shift + + for ((i = 1; i <= $#; i++)); do + local val="${!i}" + case "$val" in + # Pass through using -Xcc, but also convert to Swift -I. + # These have slightly different meaning for Clang, but Swift + # doesn't have exact equivalents. + -isystem | -idirafter) + i=$((i + 1)) + list+=("-Xcc" "$val" "-Xcc" "${!i}" "-I" "${!i}") + ;; + # Simple rename. + -iframework) + i=$((i + 1)) + list+=("-Fsystem" "${!i}") + ;; + # Pass through verbatim. + -I | -Fsystem) + i=$((i + 1)) + list+=("${val}" "${!i}") + ;; + -I* | -L* | -F*) + list+=("${val}") + ;; + # Pass through using -Xcc. + *) + list+=("-Xcc" "$val") + ;; + esac + done +} +for i in ${NIX_SWIFTFLAGS_COMPILE:-}; do + extraAfter+=("$i") +done +for i in ${NIX_SWIFTFLAGS_COMPILE_BEFORE:-}; do + extraBefore+=("$i") +done +addCFlagsToList extraAfter $NIX_CFLAGS_COMPILE_@suffixSalt@ +addCFlagsToList extraBefore ${hardeningCFlags[@]+"${hardeningCFlags[@]}"} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@ + +if [ "$dontLink" != 1 ]; then + + # Add the flags that should only be passed to the compiler when + # linking. + addCFlagsToList extraAfter $(filterRpathFlags "$linkType" $NIX_CFLAGS_LINK_@suffixSalt@) + + # Add the flags that should be passed to the linker (and prevent + # `ld-wrapper' from adding NIX_LDFLAGS_@suffixSalt@ again). + for i in $(filterRpathFlags "$linkType" $NIX_LDFLAGS_BEFORE_@suffixSalt@); do + extraBefore+=("-Xlinker" "$i") + done + if [[ "$linkType" == dynamic && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then + extraBefore+=("-Xlinker" "-dynamic-linker=$NIX_DYNAMIC_LINKER_@suffixSalt@") + fi + for i in $(filterRpathFlags "$linkType" $NIX_LDFLAGS_@suffixSalt@); do + if [ "${i:0:3}" = -L/ ]; then + extraAfter+=("$i") + else + extraAfter+=("-Xlinker" "$i") + fi + done + export NIX_LINK_TYPE_@suffixSalt@=$linkType +fi + +# TODO: If we ever need to expand functionality of this hook, it may no longer +# be compatible with Swift. Right now, it is only used on Darwin to force +# -target, which also happens to work with Swift. +if [[ -e $cc_wrapper/nix-support/add-local-cc-cflags-before.sh ]]; then + source $cc_wrapper/nix-support/add-local-cc-cflags-before.sh +fi + +# May need to transform the triple injected by the above. +for ((i = 1; i < ${#extraBefore[@]}; i++)); do + if [[ "${extraBefore[i]}" = -target ]]; then + i=$((i + 1)) + # On Darwin only, need to change 'aarch64' to 'arm64'. + extraBefore[i]="${extraBefore[i]/aarch64-apple-/arm64-apple-}" + # On Darwin, Swift requires the triple to be annotated with a version. + # TODO: Assumes macOS. + extraBefore[i]="${extraBefore[i]/-apple-darwin/-apple-macosx${MACOSX_DEPLOYMENT_TARGET:-11.0}}" + break + fi +done + +# As a very special hack, if the arguments are just `-v', then don't +# add anything. This is to prevent `gcc -v' (which normally prints +# out the version number and returns exit code 0) from printing out +# `No input files specified' and returning exit code 1. +if [ "$*" = -v ]; then + extraAfter=() + extraBefore=() +fi + +# Optionally print debug info. +if (( "${NIX_DEBUG:-0}" >= 1 )); then + # Old bash workaround, see ld-wrapper for explanation. + echo "extra flags before to $prog:" >&2 + printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2 + echo "original flags to $prog:" >&2 + printf " %q\n" ${params+"${params[@]}"} >&2 + echo "extra flags after to $prog:" >&2 + printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2 +fi + +PATH="$path_backup" +# Old bash workaround, see above. + +if (( "${NIX_CC_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then + exec "$prog" @<(printf "%q\n" \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"}) +else + exec "$prog" \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"} +fi diff --git a/pkgs/development/compilers/swift/xctest/default.nix b/pkgs/development/compilers/swift/xctest/default.nix new file mode 100644 index 000000000000..c8003d8486f1 --- /dev/null +++ b/pkgs/development/compilers/swift/xctest/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, callPackage +, cmake +, ninja +, swift +, Foundation +, DarwinTools +}: + +let + sources = callPackage ../sources.nix { }; +in stdenv.mkDerivation { + pname = "swift-corelibs-xctest"; + + inherit (sources) version; + src = sources.swift-corelibs-xctest; + + outputs = [ "out" ]; + + nativeBuildInputs = [ cmake ninja swift ] + ++ lib.optional stdenv.isDarwin DarwinTools; # sw_vers + buildInputs = [ Foundation ]; + + postPatch = lib.optionalString stdenv.isDarwin '' + # On Darwin only, Swift uses arm64 as cpu arch. + substituteInPlace cmake/modules/SwiftSupport.cmake \ + --replace '"aarch64" PARENT_SCOPE' '"arm64" PARENT_SCOPE' + ''; + + preConfigure = '' + # On aarch64-darwin, our minimum target is 11.0, but we can target lower, + # and some dependants require a lower target. Harmless on non-Darwin. + export MACOSX_DEPLOYMENT_TARGET=10.12 + ''; + + cmakeFlags = lib.optional stdenv.isDarwin "-DUSE_FOUNDATION_FRAMEWORK=ON"; + + postInstall = lib.optionalString stdenv.isDarwin '' + # Darwin normally uses the Xcode version of XCTest. Installing + # swift-corelibs-xctest is probably not officially supported, but we have + # no alternative. Fix up the installation here. + mv $out/lib/swift/darwin/${swift.swiftArch}/* $out/lib/swift/darwin + rmdir $out/lib/swift/darwin/${swift.swiftArch} + mv $out/lib/swift/darwin $out/lib/swift/${swift.swiftOs} + ''; + + meta = { + description = "Framework for writing unit tests in Swift"; + homepage = "https://github.com/apple/swift-corelibs-xctest"; + platforms = lib.platforms.all; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + }; +} diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index 7af35920efc6..3e043275a7d9 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -6,7 +6,7 @@ import re import requests import sys -feature_versions = (8, 11, 16, 17) +feature_versions = (8, 11, 16, 17, 18, 19) oses = ("mac", "linux", "alpine-linux") types = ("jre", "jdk") impls = ("hotspot") @@ -15,6 +15,7 @@ arch_to_nixos = { "x64": ("x86_64",), "aarch64": ("aarch64",), "arm": ("armv6l", "armv7l"), + "ppc64le": ("powerpc64le",), } def generate_sources(assets, feature_version, out): diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix index 75bd52dcc9fd..7774b7f2b1ae 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -10,6 +10,13 @@ in jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; }; + jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; + + jdk-18 = common { sourcePerArch = sources.jdk.openjdk18; }; + jre-18 = common { sourcePerArch = sources.jre.openjdk18; }; + + jdk-19 = common { sourcePerArch = sources.jdk.openjdk19; }; + jre-19 = common { sourcePerArch = sources.jre.openjdk19; }; } diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix index a7ed81ca8acb..c601ca63b7cd 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix @@ -20,7 +20,9 @@ # runtime dependencies , cups # runtime dependencies for GTK+ Look and Feel -, gtkSupport ? true +# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages +# which should be fixable, this is a no-rebuild workaround for GHC. +, gtkSupport ? !stdenv.targetPlatform.isGhcjs , cairo , glib , gtk3 diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix index df136f8d0c16..9033413431fe 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -11,6 +11,13 @@ in jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; }; + jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; + + jdk-18 = common { sourcePerArch = sources.jdk.openjdk18; }; + jre-18 = common { sourcePerArch = sources.jre.openjdk18; }; + + jdk-19 = common { sourcePerArch = sources.jdk.openjdk19; }; + jre-19 = common { sourcePerArch = sources.jre.openjdk19; }; } diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index ec696e1ac202..171180492a13 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -6,10 +6,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "327b3bfd1c14e15bf6c7fb4d0c6c3f9406c1282a16e24b1424215d764f687cb6", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "774d5955c09893dda14e3eb0fd3e239a6b2cec58615fcf4ec68747260b6e1cc1", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" } }, "openjdk16": { @@ -23,23 +23,43 @@ } }, "openjdk17": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "cb154396ff3bfb6a9082e3640c564643d31ecae1792fab0956149ed5258ad84b", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + } + }, + "openjdk18": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { "build": "1", - "sha256": "1a1706304c26da0d8d2e05127c5aa7dba00e5401b2c0228c8ae894d2812beee0", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "478c8f56dec7378ed8c687e8d7d0fbf729973c62c497cfc8cf58bd621849d764", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_alpine-linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" + } + }, + "openjdk19": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "76cfcdf47cdf24331b51939fd2840fd387cf62471da99e4718e2e42b486a9270", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_x64_alpine-linux_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "e5dcb8f947b687597f92fa80c008a2a17ce86f739dd6dce7ca741921621acb21", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "8", + "sha256": "aa782e3c561b041a5730cbe728c210e234db71fa7222bd8b661f9f4df7799375", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u352b08.tar.gz", + "version": "8.0.352" } } }, @@ -48,30 +68,50 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "4cdebb54ead80e6dff562ad51db850244b1b419ba72062782156df59854a6b22", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "96d26887d042f3c5630cca208b6cd365679a59bf9efb601b28363e827439796c", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" } }, "openjdk17": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "56daddc4c38cda4fa8716d0a6c5b3197305b94ed7011f06adfcd55357952ae17", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + } + }, + "openjdk18": { "packageType": "jre", "vmType": "hotspot", "x86_64": { "build": "1", - "sha256": "cd0300449a26b3141e313f6ab55b20edfa4b289dc44a7a3989fa2c29152bf7fb", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "ad23309a82e690f769037b1e6417022f588702d214da533289f116bba0f61f4e", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_x64_alpine-linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" + } + }, + "openjdk19": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "32426b790ac99a21a69abec793bfa47996a4fe7f74c7c89484836237f121640b", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_x64_alpine-linux_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "6352a4d55373266af90b2f2ec13f4397ada58f5cdc57944ea046c9c538341fd3", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "8", + "sha256": "0f4a4a3c092d8cca171fc36003ac82e2f3d8d768bd6f530a20e2a4caf79bdb9e", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u352b08.tar.gz", + "version": "8.0.352" } } } @@ -80,30 +120,36 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "1", - "sha256": "2b89cabf0ce1c2cedadd92b798d6e9056bc27c71a06f5ba24ede5dc9c316e3e8", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "d18b5dd73fce9edd5c58f623a1173f9ee2d45023836b8753b96beae51673a432", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" }, "armv6l": { - "build": "1", - "sha256": "a703acfd04ece4a4aac4cb9bda26b7d225874008bba324237bd6f53792edb778", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "9ff3b4bd2bac18fb39f3356148efa2dc710ac029e12dc8f18ea1fe6be23bf299", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" }, "armv7l": { - "build": "1", - "sha256": "a703acfd04ece4a4aac4cb9bda26b7d225874008bba324237bd6f53792edb778", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "9ff3b4bd2bac18fb39f3356148efa2dc710ac029e12dc8f18ea1fe6be23bf299", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" }, "packageType": "jdk", + "powerpc64le": { + "build": "8", + "sha256": "18c636bd103e240d29cdb30d7867720ea9fb9ff7c645738bfb4d5b8027269263", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" + }, "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "5f6b513757d386352cf91514ed5859d1ab59364b4453e1f1c57152ba2039b8e2", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "b8d46ed08ef4859476fe6421a7690d899ed83dce63f13fd894f994043177ef3c", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" } }, "openjdk16": { @@ -126,6 +172,12 @@ "version": "16.0.2" }, "packageType": "jdk", + "powerpc64le": { + "build": "7", + "sha256": "36ebe6c72f2fc19b8b17371f731390e15fa3aab08c28b55b9a8b71d0a578adc9", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" + }, "vmType": "hotspot", "x86_64": { "build": "7", @@ -135,39 +187,113 @@ } }, "openjdk17": { + "aarch64": { + "build": "8", + "sha256": "1c26c0e09f1641a666d6740d802beb81e12180abaea07b47c409d30c7f368109", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + }, + "armv6l": { + "build": "8", + "sha256": "e7c81596f67b6325036e9182d012f2266ced5663c5d4b0de0540ce62dcc67718", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + }, + "armv7l": { + "build": "8", + "sha256": "e7c81596f67b6325036e9182d012f2266ced5663c5d4b0de0540ce62dcc67718", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + }, + "packageType": "jdk", + "powerpc64le": { + "build": "8", + "sha256": "a426a4e2cbc29f46fa686bea8b26613f7b7a9a772a77fed0d40dfe05295be883", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + }, + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "482180725ceca472e12a8e6d1a4af23d608d78287a77d963335e2a0156a020af", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + } + }, + "openjdk18": { "aarch64": { "build": "1", - "sha256": "3c7460de77421284b38b4e57cb1bd584a6cef55c34fc51a12270620544de2b8a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "262be608e266fd76d7496af83b2832be853c3aaf7460d6a4da198cd40db74553", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_aarch64_linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" }, "armv6l": { "build": "1", - "sha256": "efba97cd38af8f43b61f09cb5041f81d92ecd005dcd51c81678fbcf4f24d8461", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_arm_linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "4cd49b92d13847bfad7b3bf635cca349e2c89c7641748c5288bc40d612cdbbd6", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_arm_linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" }, "armv7l": { "build": "1", - "sha256": "efba97cd38af8f43b61f09cb5041f81d92ecd005dcd51c81678fbcf4f24d8461", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_arm_linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "4cd49b92d13847bfad7b3bf635cca349e2c89c7641748c5288bc40d612cdbbd6", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_arm_linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" }, "packageType": "jdk", + "powerpc64le": { + "build": "1", + "sha256": "030261a2189a8f773fda543a85ab9beb4c430bf81ca5be37cf6cb970b5ccbb03", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_ppc64le_linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" + }, "vmType": "hotspot", "x86_64": { "build": "1", - "sha256": "5fbf8b62c44f10be2efab97c5f5dbf15b74fae31e451ec10abbc74e54a04ff44", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "7d6beba8cfc0a8347f278f7414351191a95a707d46b6586e9a786f2669af0f8b", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" + } + }, + "openjdk19": { + "aarch64": { + "build": "10", + "sha256": "5e8d7b3189364afd78d936bad140dbe1e7025d4b96d530ed5536d035c21afb7c", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_aarch64_linux_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" + }, + "armv6l": { + "build": "36", + "sha256": "34a786548033391de80b857fe02a9c7bd42fcb94243e7273e89012df73f1adef", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jdk_arm_linux_hotspot_19_36.tar.gz", + "version": "19.0.0" + }, + "armv7l": { + "build": "36", + "sha256": "34a786548033391de80b857fe02a9c7bd42fcb94243e7273e89012df73f1adef", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jdk_arm_linux_hotspot_19_36.tar.gz", + "version": "19.0.0" + }, + "packageType": "jdk", + "powerpc64le": { + "build": "10", + "sha256": "79320712bbef13825a0aa308621006f32e54f503142737fb21ff085185a61a96", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_ppc64le_linux_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" + }, + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "163da7ea140210bae97c6a4590c757858ab4520a78af0e3e33129863d4087552", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_x64_linux_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" } }, "openjdk8": { "aarch64": { - "build": "1", - "sha256": "c1965fb24dded7d7944e2da36cd902adf3b7b1d327aaa21ea507cff00a5a0090", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_aarch64_linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "8", + "sha256": "a70768968bbcccccf977f036e87e545c3b080ed6c44072a01e9dadb94051c454", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u352b08.tar.gz", + "version": "8.0.352" }, "armv6l": { "build": "1", @@ -182,78 +308,164 @@ "version": "8.0.345" }, "packageType": "jdk", + "powerpc64le": { + "build": "8", + "sha256": "863791dd8e0536a678f5e439c9c67199a0f3f18c76138a8e242775dfe1784009", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u352b08.tar.gz", + "version": "8.0.352" + }, "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "ed6c9db3719895584fb1fd69fc79c29240977675f26631911c5a1dbce07b7d58", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "8", + "sha256": "1633bd7590cb1cd72f5a1378ae8294451028b274d798e2a4ac672059a2f00fee", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u352b08.tar.gz", + "version": "8.0.352" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "1", - "sha256": "b6607f28fa2906d612d517f0babe4f0f895aa1c3f901edcddb493e33c1e27364", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "bd6efe3290c8b5a42f695a55a26f3e3c9c284288574879d4b7089f31f5114177", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" }, "armv6l": { - "build": "1", - "sha256": "2ee7fe636a6a57e4718dfe597e8097b93ef8d976e4b05384433777c9f0526f5a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "8cf113d3d7fa808895c8d2e41bb890af21c47e38c2460e0588147a4bb8fc658d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" }, "armv7l": { - "build": "1", - "sha256": "2ee7fe636a6a57e4718dfe597e8097b93ef8d976e4b05384433777c9f0526f5a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "8cf113d3d7fa808895c8d2e41bb890af21c47e38c2460e0588147a4bb8fc658d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" }, "packageType": "jre", + "powerpc64le": { + "build": "8", + "sha256": "0ca3d806131ab5834c501f9c625bb0248cd528af361c704503348e9c9605bedf", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" + }, "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "1ffe1a682e8179e35238bf3f93aba0cb185850e202c676f41d38cb0561883eda", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_x64_linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "752616097e09d7f60a3ad8bd312f90eaf50ac72577e55df229fe6e8091148f79", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" } }, "openjdk17": { + "aarch64": { + "build": "8", + "sha256": "34d6414710db27cd7760fe369135f3b9927ccc81410280606613166d4106d60a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + }, + "armv6l": { + "build": "8", + "sha256": "9e0d1745139fe502f22df1e261d2ed1ad807085dd75a8b333d481289b579870d", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + }, + "armv7l": { + "build": "8", + "sha256": "9e0d1745139fe502f22df1e261d2ed1ad807085dd75a8b333d481289b579870d", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + }, + "packageType": "jre", + "powerpc64le": { + "build": "8", + "sha256": "51dd491505bd2e096676b9dc8ecaf196d78993215af16c0f9dfddfe3dbc0205b", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + }, + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "11326464a14b63e6328d1d2088a23fb559c0e36b3f380e4c1f8dcbe160a8b95e", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_x64_linux_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + } + }, + "openjdk18": { "aarch64": { "build": "1", - "sha256": "2e4137529319cd7935f74e1289025b7b4c794c0fb47a3d138adffbd1bbc0ea58", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "e11e00438c2f6f79f86ff1ca2b015913b0e16bd9491953a082d5c786402cb50a", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_aarch64_linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" }, "armv6l": { "build": "1", - "sha256": "b63f532cb8b30e4d0bd18d52f08c1933e3cf66aeb373180d002274b6d94b4a25", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_arm_linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "0ae7281fa883de0d39a75b39bfbbcec1d2a5f8ed8691af12226962ce1a761cd7", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_arm_linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" }, "armv7l": { "build": "1", - "sha256": "b63f532cb8b30e4d0bd18d52f08c1933e3cf66aeb373180d002274b6d94b4a25", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_arm_linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "0ae7281fa883de0d39a75b39bfbbcec1d2a5f8ed8691af12226962ce1a761cd7", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_arm_linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" }, "packageType": "jre", + "powerpc64le": { + "build": "1", + "sha256": "2298504c99b4c15f620f70415215e481766d2b2f784d066206eed8c583922f8f", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_ppc64le_linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" + }, "vmType": "hotspot", "x86_64": { "build": "1", - "sha256": "e96814ee145a599397d91e16831d2dddc3c6b8e8517a8527e28e727649aaa2d1", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_x64_linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "74f602ab5abaa554859a5e92a65e5bb6e23c2d4165228299c7f54ed56dbc5959", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_x64_linux_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" + } + }, + "openjdk19": { + "aarch64": { + "build": "10", + "sha256": "c69ffc5474be076b200e8cc72417b838e4f830b36603d593fb8ca6d11b81969b", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_aarch64_linux_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" + }, + "armv6l": { + "build": "36", + "sha256": "f6c4895b8d33118c75403d08f9697af0b77769d0e8574cb678518a0ab3b74a12", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jre_arm_linux_hotspot_19_36.tar.gz", + "version": "19.0.0" + }, + "armv7l": { + "build": "36", + "sha256": "f6c4895b8d33118c75403d08f9697af0b77769d0e8574cb678518a0ab3b74a12", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jre_arm_linux_hotspot_19_36.tar.gz", + "version": "19.0.0" + }, + "packageType": "jre", + "powerpc64le": { + "build": "10", + "sha256": "c5f3d67edfa0d9b5ec935f944c177c0ee4b2d7a2b5846feaf187b77e954f4242", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_ppc64le_linux_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" + }, + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "68cae46c973e48ca6777cd0026bbf25f3457bd3d6730c36bd79d4f3b398c8338", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_x64_linux_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" } }, "openjdk8": { "aarch64": { - "build": "1", - "sha256": "65b8bd74382d6514d2458ff4375468651791a55a186a5bffe0803204801e9c94", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_aarch64_linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "8", + "sha256": "cce4db7c4311378d8d2a174b2cf680d57b52a4036f37c995b14f936b6fc1141a", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jre_aarch64_linux_hotspot_8u352b08.tar.gz", + "version": "8.0.352" }, "armv6l": { "build": "1", @@ -268,12 +480,18 @@ "version": "8.0.345" }, "packageType": "jre", + "powerpc64le": { + "build": "8", + "sha256": "5649672dab65b3519ec16653fb2f154da90a7cd2afc568da03f3bff5c6b30a90", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u352b08.tar.gz", + "version": "8.0.352" + }, "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "2422a8831fe414b9dba4c443ee3562431dfcde27577124f0db58ec903afc262a", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_x64_linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "8", + "sha256": "40b6b4c3d8f7332ea479527b530413bf0dbc13cff3c0ed9fcadf1ca053bed106", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jre_x64_linux_hotspot_8u352b08.tar.gz", + "version": "8.0.352" } } } @@ -282,18 +500,18 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "1", - "sha256": "1953f06702d45eb54bae3ccf453b57c33de827015f5623a2dfc16e1c83e6b0a1", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "79b18cbd398b67a52ebaf033dfca15c7af4c1a84ec5fa68a88f3bf742bb082f7", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "723548e36e0b3e0a5a2f36a38b22ea825d3004e26054a0e254854adc57045352", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_mac_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "f408a12f10d93b3205bef851af62707531b699963cef79408d59197d08763c94", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_x64_mac_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" } }, "openjdk16": { @@ -307,19 +525,51 @@ } }, "openjdk17": { + "aarch64": { + "build": "8", + "sha256": "2dc3e425b52d1cd2915d93af5e468596b9e6a90112056abdcebac8b65bf57049", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "94fe50982b09a179e603a096e83fd8e59fd12c0ae4bcb37ae35f00ef30a75d64", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_mac_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + } + }, + "openjdk18": { "aarch64": { "build": "1", - "sha256": "3a976943a9e6a635e68e2b06bd093fc096aad9f5894acda673d3bea0cb3a6f38", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "c5ec423f52d8f3aa632941f29fd289f2e31dce5fe6f3abed9b72bd374f54cd41", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_aarch64_mac_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { "build": "1", - "sha256": "ac21a5a87f7cfa00212ab7c41f7eb80ca33640d83b63ad850be811c24095d61a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_mac_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "2ed916b0c9d197a6bf71b76e84d94125023c2609e0a9b22c64553eff5c9c29c1", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_mac_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" + } + }, + "openjdk19": { + "aarch64": { + "build": "10", + "sha256": "2be4ffbf7c59b3148886b48ecf3f7d7edb7c745917ceae2a6be145a4678bf014", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_aarch64_mac_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "0d80a8787fa97f5fc2f0000a849b54f4d41c5b87726c29ea1de215e382c8380c", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_x64_mac_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" } }, "openjdk8": { @@ -336,34 +586,66 @@ "jre": { "openjdk11": { "aarch64": { - "build": "1", - "sha256": "c84f38a7d87d50649ffc1f625facb4398fa54885371336a2cbf6ae2b435cbd10", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "2a5cbc2888f8e382c7d0a5bf2c6d2c3bad120ceff51b00d3a62805dae4473c02", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "10be61a8dd3766f7c12e2e823a6eca48cc6361d97e1b76310c752bd39770c7fe", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_x64_mac_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "8", + "sha256": "66508958b5da6e36021d960b65490ab70cc7d44851c98301a3d6d3552f305674", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_mac_hotspot_11.0.17_8.tar.gz", + "version": "11.0.17" } }, "openjdk17": { + "aarch64": { + "build": "8", + "sha256": "d98b7f5ee6cb4a1c49288bd932008e3e37f9bb5d9a0eb9396ea236786e6ab570", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "c4884b6cd8d43497ff46e4fd475ddde5ab91004db435f0c29a801b081662f7ee", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_x64_mac_hotspot_17.0.5_8.tar.gz", + "version": "17.0.5" + } + }, + "openjdk18": { "aarch64": { "build": "1", - "sha256": "63a32fe611f2666856e84b79305eb80609de229bbce4f13991b961797aa88bf8", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "071f073efb9550838bc02e429ef972f9450b477360f803dd1cf19096ca41182e", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_aarch64_mac_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { "build": "1", - "sha256": "9c59e45a9a6cbc1b8d671c4a88bb8d9b8929fae067df0d0a73b1ca71781a0996", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_x64_mac_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "sha256": "3629e3dc9dbab7ed13070fbea3a827030acdd62afa557496e88a6d01f9300474", + "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_x64_mac_hotspot_18.0.2.1_1.tar.gz", + "version": "18.0.2" + } + }, + "openjdk19": { + "aarch64": { + "build": "10", + "sha256": "d6d4a51d2eefb98cabdbdd9118ca473e9b07ced8d784541177f74e9bf09d4a2e", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_aarch64_mac_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "8bf67ece0915f5847caec5060e93eafbeeb1a3c99132a72a9424255b3b7cd063", + "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_x64_mac_hotspot_19.0.1_10.tar.gz", + "version": "19.0.1" } }, "openjdk8": { diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index f4c28cfa18c8..815f28238643 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -89,5 +89,7 @@ in stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ jb55 seylerius thoughtpolice elliottslaughter ]; license = licenses.mit; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix index ac1a2f8abd53..d165b347c60a 100644 --- a/pkgs/development/compilers/teyjus/default.nix +++ b/pkgs/development/compilers/teyjus/default.nix @@ -2,21 +2,32 @@ stdenv.mkDerivation rec { pname = "teyjus"; - version = "2.1"; + version = "unstable-2019-07-26"; src = fetchFromGitHub { owner = "teyjus"; repo = "teyjus"; - rev = "v${version}"; - sha256 = "sha256-nz7jZ+GdF6mZQPzBrVD9K/RtoeuVRuhfs7vej4zDkhg="; + rev = "e63f40aa9f1d0ea5e7bac41aae5e479c3616545c"; + sha256 = "sha256-gaAWKd5/DZrIPaaQzx9l0KtCMW9LPw17vvNPsnopZA0="; }; - patches = [ ./fix-lex-to-flex.patch ]; + patches = [ + ./fix-lex-to-flex.patch + ]; - buildInputs = [ omake ocaml flex bison ]; + postPatch = '' + sed -i "/TST/d" source/OMakefile + rm -rf source/front/caml + ''; + + strictDeps = true; + + nativeBuildInputs = [ omake ocaml flex bison ]; hardeningDisable = [ "format" ]; + NIX_CFLAGS_COMPILE = "-I${ocaml}/include"; + buildPhase = "omake all"; checkPhase = "omake check"; @@ -28,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/teyjus/teyjus"; license = lib.licenses.gpl3; maintainers = [ maintainers.bcdarwin ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 21eb497a116a..159b1827fc8f 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -78,6 +78,10 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; + # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10142.html + preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + rm tests/tests2/{108,114}* + ''; meta = with lib; { homepage = "https://repo.or.cz/tinycc.git"; @@ -106,7 +110,8 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Only; maintainers = with maintainers; [ joachifm AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10199.html + broken = stdenv.isDarwin && stdenv.isAarch64; }; } # TODO: more multiple outputs diff --git a/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch b/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch index 54e389fe1401..7e4c8eded677 100644 --- a/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch +++ b/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch @@ -18,18 +18,18 @@ index 121398fa..a589988b 100644 sourceDir: func() string { llvmDir := filepath.Join(goenv.Get("TINYGOROOT"), "llvm-project/compiler-rt/lib/builtins") diff --git a/builder/picolibc.go b/builder/picolibc.go -index f1b061ae..159f90cf 100644 +index d0786ee3..9a5cf9b0 100644 --- a/builder/picolibc.go +++ b/builder/picolibc.go -@@ -27,7 +27,7 @@ var Picolibc = Library{ - "-D_COMPILING_NEWLIB", - "-DHAVE_ALIAS_ATTRIBUTE", - "-DTINY_STDIO", +@@ -30,7 +30,7 @@ var Picolibc = Library{ + "-D_IEEE_LIBM", + "-D__OBSOLETE_MATH_FLOAT=1", // use old math code that doesn't expect a FPU + "-D__OBSOLETE_MATH_DOUBLE=0", - "-nostdlibinc", + "-isystem", "@clang_include@", - "-isystem", picolibcDir + "/include", - "-I" + picolibcDir + "/tinystdio", - "-I" + headerPath, + "-isystem", newlibDir + "/libc/include", + "-I" + newlibDir + "/libc/tinystdio", + "-I" + newlibDir + "/libm/common", diff --git a/compileopts/config.go b/compileopts/config.go index a006b673..3a105b49 100644 --- a/compileopts/config.go diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 43b981ffd068..0d2541a5a1ab 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -28,17 +28,17 @@ in buildGoModule rec { pname = "tinygo"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - sha256 = "sha256-Rxdxum1UIaz8tpEAGqpLvKd25nHdj4Se+IoN29EJEHg="; + sha256 = "rI8CADPWKdNvfknEsrpp2pCeZobf9fAp0GDIWjupzZA="; fetchSubmodules = true; }; - vendorSha256 = "sha256-QxLY4KT05PtA/W7d1vKxsq5w35YZ6MJL3Lh726b+E9w="; + vendorSha256 = "sha256-ihQd/RAjAQhgQZHbNiWmAD0eOo1MvqAR/OwIOUWtdAM="; patches = [ ./0001-Makefile.patch @@ -52,7 +52,7 @@ buildGoModule rec { ./0003-Use-out-path-as-build-id-on-darwin.patch ]; - checkInputs = [ avrgcc binaryen ]; + nativeCheckInputs = [ avrgcc binaryen ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ llvm clang.cc ] ++ lib.optionals stdenv.isDarwin [ zlib ncurses libffi libxml2 xar ]; diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/development/compilers/tvm/default.nix index 05d2f8696df2..e2245f800ad0 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.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "apache"; repo = "incubator-tvm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-lzLrd4vNK1c7BwWS0H5x1uDdZ3moUl+zWHb8G6gs8hw="; + sha256 = "sha256-v3F+qncs3PFkRllrdWvrle/ofg9thX4BJlvILQz9B6A="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix index 030c30b96a5a..3ce548c9b483 100644 --- a/pkgs/development/compilers/x11basic/default.nix +++ b/pkgs/development/compilers/x11basic/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://x11-basic.sourceforge.net/"; + homepage = "https://x11-basic.sourceforge.net/"; description = "A Basic interpreter and compiler with graphics capabilities"; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/development/compilers/xa/xa.nix b/pkgs/development/compilers/xa/xa.nix index 0fb9d7d058b4..db719c8fd23f 100644 --- a/pkgs/development/compilers/xa/xa.nix +++ b/pkgs/development/compilers/xa/xa.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-qUd68VC2yKkc09QeHPjJ31UtODMmSVV2gwJxykRnvYY="; }; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; dontConfigure = true; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 62bd8b15d1ad..e1c035745f70 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -71,13 +71,13 @@ let in stdenv.mkDerivation rec { pname = "yosys"; - version = "0.23"; + version = "0.25"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "${pname}-${version}"; - hash = "sha256-mOakdXhSij8k4Eo7RwpKjd59IkNjw31NNFDJtL6Adgo="; + hash = "sha256-hOuuKvT6ZM7G0HTGtVeEHHfJWqwUinD+DxT3r0CQZH0="; }; enableParallelBuilding = true; @@ -127,7 +127,7 @@ in stdenv.mkDerivation rec { checkTarget = "test"; doCheck = true; - checkInputs = [ verilog ]; + nativeCheckInputs = [ verilog ]; # Internally, yosys knows to use the specified hardcoded ABCEXTERNAL binary. # But other tools (like mcy or symbiyosys) can't know how yosys was built, so diff --git a/pkgs/development/compilers/yosys/plugins/symbiflow.nix b/pkgs/development/compilers/yosys/plugins/symbiflow.nix index 31e429284c06..899006735873 100644 --- a/pkgs/development/compilers/yosys/plugins/symbiflow.nix +++ b/pkgs/development/compilers/yosys/plugins/symbiflow.nix @@ -54,7 +54,7 @@ in lib.genAttrs plugins (plugin: stdenv.mkDerivation (rec { # xdc has an incorrect path to a test which has yet to be patched doCheck = plugin != "xdc"; - checkInputs = [ static_gtest ]; + nativeCheckInputs = [ static_gtest ]; # ql-qlf tries to fetch a yosys script from github # Run the script in preBuild instead. diff --git a/pkgs/development/compilers/zig/0.10.nix b/pkgs/development/compilers/zig/0.10.nix new file mode 100644 index 000000000000..89f23b9ca25d --- /dev/null +++ b/pkgs/development/compilers/zig/0.10.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, coreutils +, llvmPackages +, libxml2 +, zlib +}: + +stdenv.mkDerivation rec { + pname = "zig"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "ziglang"; + repo = pname; + rev = version; + hash = "sha256-69QIkkKzApOGfrBdgtmxFMDytRkSh+0YiaJQPbXsBeo="; + }; + + nativeBuildInputs = [ + cmake + llvmPackages.llvm.dev + ]; + + buildInputs = [ + coreutils + libxml2 + zlib + ] ++ (with llvmPackages; [ + libclang + lld + llvm + ]); + + preBuild = '' + export HOME=$TMPDIR; + ''; + + postPatch = '' + # Zig's build looks at /usr/bin/env to find dynamic linking info. This + # doesn't work in Nix' sandbox. Use env from our coreutils instead. + substituteInPlace lib/std/zig/system/NativeTargetInfo.zig --replace "/usr/bin/env" "${coreutils}/bin/env" + ''; + + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + + doCheck = true; + installCheckPhase = '' + $out/bin/zig test --cache-dir "$TMPDIR" -I $src/test $src/test/behavior.zig + ''; + + meta = with lib; { + homepage = "https://ziglang.org/"; + description = + "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; + license = licenses.mit; + maintainers = with maintainers; [ aiotter andrewrk AndersonTorres ]; + platforms = platforms.unix; + # Build fails on Darwin on both AArch64 and x86_64: + # https://github.com/NixOS/nixpkgs/pull/210324#issuecomment-1381313616 + # https://github.com/NixOS/nixpkgs/pull/210324#issuecomment-1381236045 + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/0.9.1.nix similarity index 58% rename from pkgs/development/compilers/zig/default.nix rename to pkgs/development/compilers/zig/0.9.1.nix index caba470b9a12..e7c62a4cf938 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/0.9.1.nix @@ -7,6 +7,14 @@ , zlib }: +let + zig_0_10_0 = fetchFromGitHub { + owner = "ziglang"; + repo = "zig"; + rev = "0.10.0"; + hash = "sha256-DNs937N7PLQimuM2anya4npYXcj6cyH+dRS7AiOX7tw="; + }; +in stdenv.mkDerivation rec { pname = "zig"; version = "0.9.1"; @@ -18,8 +26,20 @@ stdenv.mkDerivation rec { hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k="; }; - # Fix index out of bounds reading RPATH (cherry-picked from 0.10-dev) - patches = [ ./rpath.patch ]; + patches = [ + # Fix index out of bounds reading RPATH (cherry-picked from 0.10-dev) + ./rpath.patch + # Fix build on macOS 13 (cherry-picked from 0.10-dev) + ./ventura.patch + ]; + + # TODO: remove on next upgrade + prePatch = '' + cp -R ${zig_0_10_0}/lib/libc/include/any-macos.13-any lib/libc/include/any-macos.13-any + cp -R ${zig_0_10_0}/lib/libc/include/aarch64-macos.13-none lib/libc/include/aarch64-macos.13-gnu + cp -R ${zig_0_10_0}/lib/libc/include/x86_64-macos.13-none lib/libc/include/x86_64-macos.13-gnu + cp ${zig_0_10_0}/lib/libc/darwin/libSystem.13.tbd lib/libc/darwin/ + ''; nativeBuildInputs = [ cmake diff --git a/pkgs/development/compilers/zig/ventura.patch b/pkgs/development/compilers/zig/ventura.patch new file mode 100644 index 000000000000..07b90e223553 --- /dev/null +++ b/pkgs/development/compilers/zig/ventura.patch @@ -0,0 +1,50 @@ +From 98285b17b3887de37b630da66f09a44f42ddbe01 Mon Sep 17 00:00:00 2001 +From: Jakub Konka +Date: Tue, 25 Oct 2022 11:46:42 +0200 +Subject: [PATCH] darwin: bump max macOS version to 13.0 + +--- + lib/std/target.zig | 4 ++-- + src/target.zig | 2 ++ + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/lib/std/target.zig b/lib/std/target.zig +index d791e3b0350..7fbad5baa3c 100644 +--- a/lib/std/target.zig ++++ b/lib/std/target.zig +@@ -277,13 +277,13 @@ pub const Target = struct { + .aarch64 => VersionRange{ + .semver = .{ + .min = .{ .major = 11, .minor = 6 }, +- .max = .{ .major = 12, .minor = 0 }, ++ .max = .{ .major = 13, .minor = 0 }, + }, + }, + .x86_64 => VersionRange{ + .semver = .{ + .min = .{ .major = 10, .minor = 13 }, +- .max = .{ .major = 12, .minor = 0 }, ++ .max = .{ .major = 13, .minor = 0 }, + }, + }, + else => unreachable, +diff --git a/src/target.zig b/src/target.zig +index 9e2d26dac65..fc585912c45 100644 +--- a/src/target.zig ++++ b/src/target.zig +@@ -18,6 +18,7 @@ pub const available_libcs = [_]ArchOsAbi{ + .{ .arch = .aarch64, .os = .windows, .abi = .gnu }, + .{ .arch = .aarch64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 11, .minor = 0 } }, + .{ .arch = .aarch64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 12, .minor = 0 } }, ++ .{ .arch = .aarch64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 13, .minor = 0 } }, + .{ .arch = .armeb, .os = .linux, .abi = .gnueabi }, + .{ .arch = .armeb, .os = .linux, .abi = .gnueabihf }, + .{ .arch = .armeb, .os = .linux, .abi = .musleabi }, +@@ -73,6 +74,7 @@ pub const available_libcs = [_]ArchOsAbi{ + .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 10, .minor = 0 } }, + .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 11, .minor = 0 } }, + .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 12, .minor = 0 } }, ++ .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 13, .minor = 0 } }, + }; + + pub fn libCGenericName(target: std.Target) [:0]const u8 { diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index e23dbdbd6c1b..9780dac344b1 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -21,11 +21,11 @@ }: let - version = "8.48.0.53"; - openjdk = "8.0.265"; + version = "8.68.0.19"; + openjdk = "8.0.362"; - sha256_linux = "ed32513524b32a83b3b388831c69d1884df5675bd5069c6d1485fd1a060be209"; - sha256_darwin = "36f189bfbd0255195848835819377474ba9c1c868e3c204633c451c96e21f30a"; + sha256_linux = "sha256-jNty0iJoXG+sp7v2fGCrwZWCSZfQ4tkYe8ERixQMKL0="; + sha256_darwin = "sha256-3/P3puM6a7tCHP5eZM6IzbdPrqnhY1dTa7QWss9M08M="; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 03dff2348a29..b4338738f892 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -22,12 +22,12 @@ }: let - version = "11.52.13"; - openjdk = "11.0.13"; + version = "11.62.17"; + openjdk = "11.0.18"; - sha256_x64_linux = "77a126669b26b3a89e0117b0f28cddfcd24fcd7699b2c1d35f921487148b9a9f"; - sha256_x64_darwin = "a96f9f859350f977319ebb5c2a999c182ab6b99b24c60e19d97c54367868a63e"; - sha256_aarch64_darwin = "dmzfergSUVz39T30PT/6ZtT8JNqv5lzdX7zUsXsFGJg="; + sha256_x64_linux = "sha256-b65oEbDzrrsUw+WaX94USBz/QS74yiMiGZPxqzMmmqs="; + sha256_x64_darwin = "sha256-nRRWTWiog8bRblmmPIPE5YibA34St3ZrJpZN91qEDUg="; + sha256_aarch64_darwin = "sha256-TBTrBxOfGo6MV+Md49P3sDfqVG1e+NraqfVbw9WTppk="; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isAarch64 && stdenv.isDarwin then sha256_aarch64_darwin else if stdenv.isDarwin then sha256_x64_darwin else sha256_x64_linux; diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix index d7763d87c9e6..5a7ec31f50c1 100644 --- a/pkgs/development/coq-modules/Cheerios/default.nix +++ b/pkgs/development/coq-modules/Cheerios/default.nix @@ -1,13 +1,17 @@ { lib, mkCoqDerivation, coq, StructTact, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "cheerios"; owner = "uwplse"; inherit version; - defaultVersion = if versions.isGe "8.6" coq.version then "20200201" else null; + defaultVersion = if lib.versions.range "8.6" "8.16" coq.version then "20200201" else null; release."20200201".rev = "9c7f66e57b91f706d70afa8ed99d64ed98ab367d"; release."20200201".sha256 = "1h55s6lk47bk0lv5ralh81z55h799jbl9mhizmqwqzy57y8wqgs1"; propagatedBuildInputs = [ StructTact ]; - preConfigure = "patchShebangs ./configure"; + preConfigure = '' + if [ -f ./configure ]; then + patchShebangs ./configure + fi + ''; } diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index 9dabae0bdbca..a926f6d8092d 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, bignums, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "color"; owner = "fblanqui"; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ {case = range "8.12" "8.16"; out = "1.8.2"; } {case = range "8.10" "8.11"; out = "1.7.0"; } {case = range "8.8" "8.9"; out = "1.6.0"; } @@ -26,6 +26,6 @@ with lib; mkCoqDerivation { meta = { homepage = "https://github.com/fblanqui/color"; description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant."; - maintainers = with maintainers; [ jpas jwiegley ]; + maintainers = with lib.maintainers; [ jpas jwiegley ]; }; } diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix index f6e9b3daca2d..a0761dfb5193 100644 --- a/pkgs/development/coq-modules/HoTT/default.nix +++ b/pkgs/development/coq-modules/HoTT/default.nix @@ -1,48 +1,25 @@ { lib, mkCoqDerivation, autoconf, automake, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "HoTT"; + repo = "Coq-HoTT"; owner = "HoTT"; inherit version; - defaultVersion = if coq.coq-version == "8.6" then "20170921" else null; - release."20170921".rev = "e3557740a699167e6adb1a65855509d55a392fa1"; - release."20170921".sha256 = "0zwfp8g62b50vmmbb2kmskj3v6w7qx1pbf43yw0hr7asdz2zbx5v"; - - nativeBuildInputs = [ autoconf automake ]; - - preConfigure = '' - patchShebangs ./autogen.sh - ./autogen.sh - - mkdir -p "$out/bin" - ''; - - configureFlags = [ - "--bindir=$(out)/bin" - ]; + defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.14" "8.16"; out = coq.coq-version; } + ] null; + releaseRev = v: "V${v}"; + release."8.16".sha256 = "sha256-xcEbz4ZQ+U7mb0SEJopaczfoRc2GSgF2BGzUSWI0/HY="; + release."8.15".sha256 = "sha256-JfeiRZVnrjn3SQ87y6dj9DWNwCzrkK3HBogeZARUn9g="; + release."8.14".sha256 = "sha256-7kXk2pmYsTNodHA+Qts3BoMsewvzmCbYvxw9Sgwyvq0="; patchPhase = '' patchShebangs etc - patchShebangs hoqc hoqchk hoqdep hoqide hoqtop - ''; - - postBuild = '' - patchShebangs hoq-config - ''; - - # Currently, all the scripts like hoqc and hoqtop assume that the *.vo files are - # either (1) in the same directory as the scripts, or (2) in /usr/share/hott. - # We fulfill (1), which means that these files are only accessible via hoqtop, - # hoqc, etc and not via coqtop, coqc, etc. - postInstall = '' - mv $out/share/hott/* "$out/bin" - rmdir $out/share/hott - rmdir $out/share ''; meta = { - homepage = "http://homotopytypetheory.org/"; + homepage = "https://homotopytypetheory.org/"; description = "Homotopy type theory"; - maintainers = with maintainers; [ siddharthist ]; + maintainers = with lib.maintainers; [ siddharthist ]; }; } diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix index 23922dcce428..e0a9e1f6bfc4 100644 --- a/pkgs/development/coq-modules/ITree/default.nix +++ b/pkgs/development/coq-modules/ITree/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null , paco, coq-ext-lib }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "InteractionTrees"; owner = "DeepSpec"; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = range "8.10" "8.16"; out = "4.0.0"; } ] null; release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm"; @@ -12,6 +12,6 @@ with lib; mkCoqDerivation rec { propagatedBuildInputs = [ coq-ext-lib paco ]; meta = { description = "A Library for Representing Recursive and Impure Programs in Coq"; - maintainers = with maintainers; [ larsr ]; + maintainers = with lib.maintainers; [ larsr ]; }; } diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix index 1f11ae8e84a2..25ec2f71324d 100644 --- a/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -4,8 +4,12 @@ mkCoqDerivation { pname = "InfSeqExt"; owner = "DistributedComponents"; inherit version; - defaultVersion = if lib.versions.isGe "8.5" coq.version then "20200131" else null; + defaultVersion = if lib.versions.range "8.5" "8.16" coq.version then "20200131" else null; release."20200131".rev = "203d4c20211d6b17741f1fdca46dbc091f5e961a"; release."20200131".sha256 = "0xylkdmb2dqnnqinf3pigz4mf4zmczcbpjnn59g5g76m7f2cqxl0"; - preConfigure = "patchShebangs ./configure"; + preConfigure = '' + if [ -f ./configure ]; then + patchShebangs ./configure + fi + ''; } diff --git a/pkgs/development/coq-modules/LibHyps/default.nix b/pkgs/development/coq-modules/LibHyps/default.nix index 1a9eb9cec059..b0997e857b09 100644 --- a/pkgs/development/coq-modules/LibHyps/default.nix +++ b/pkgs/development/coq-modules/LibHyps/default.nix @@ -1,11 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "LibHyps"; owner = "Matafou"; inherit version; - defaultVersion = if (versions.range "8.11" "8.16") coq.version then "2.0.4.1" else null; + defaultVersion = if (lib.versions.range "8.11" "8.16") coq.version then "2.0.4.1" else null; release = { "2.0.4.1".sha256 = "09p89701zhrfdmqlpxw3mziw8yylj1w1skb4b0xpbdwd1vsn4k3h"; }; @@ -16,6 +15,6 @@ mkCoqDerivation { meta = { description = "Hypotheses manipulation library"; - license = licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix index 6618e75bab80..778ab142654d 100644 --- a/pkgs/development/coq-modules/StructTact/default.nix +++ b/pkgs/development/coq-modules/StructTact/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "StructTact"; owner = "uwplse"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.6" "8.16"; out = "20210328"; } { case = range "8.5" "8.13"; out = "20181102"; } ] null; @@ -12,5 +12,9 @@ with lib; mkCoqDerivation { release."20210328".sha256 = "sha256:1y5r1zm3hli10ah6lnj7n8hxad6rb6rgldd0g7m2fjibzvwqzhdg"; release."20181102".rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510"; release."20181102".sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v"; - preConfigure = "patchShebangs ./configure"; + preConfigure = '' + if [ -f ./configure ]; then + patchShebangs ./configure + fi + ''; } diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index 8ffa99d29b4b..72d88dec6f1d 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -1,7 +1,5 @@ { 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. @@ -11,7 +9,7 @@ let extra_floyd_files = [ "powerlater.v" ] # floyd/printf.v is broken in VST 2.9 - ++ optional (!versions.isGe "8.13" coq.coq-version) "printf.v" + ++ lib.optional (!lib.versions.isGe "8.13" coq.coq-version) "printf.v" ++ [ "quickprogram.v" ]; @@ -24,11 +22,13 @@ mkCoqDerivation { owner = "PrincetonUniversity"; repo = "VST"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.15" "8.16"; out = "2.11.1"; } { case = range "8.14" "8.16"; out = "2.10"; } { case = range "8.13" "8.15"; out = "2.9"; } { case = range "8.12" "8.13"; out = "2.8"; } ] null; + release."2.11.1".sha256 = "sha256-unpNstZBnRT4dIqAYOv9n1J0tWJMeRuaaa2RG1U0Xs0="; release."2.10".sha256 = "sha256-RIxfPWoHnV1CFkpxCusoGY/LIk07TgC7wWGRP4BSq8w="; release."2.9".sha256 = "sha256:1adwzbl1pprrrwrm7cm493098fizxanxpv7nyfbvwdhgbhcnv6qf"; release."2.8".sha256 = "sha256-cyK88uzorRfjapNQ6XgQEmlbWnDsiyLve5po1VG52q0="; @@ -39,7 +39,7 @@ mkCoqDerivation { preConfigure = '' patchShebangs util substituteInPlace Makefile \ - --replace 'COQVERSION= ' 'COQVERSION= 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\ + --replace 'COQVERSION= ' 'COQVERSION= 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\ --replace 'FLOYD_FILES=' 'FLOYD_FILES= ${toString extra_floyd_files}' ''; diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix index 08322fb7fc40..62eb9c389abb 100644 --- a/pkgs/development/coq-modules/Velisarios/default.nix +++ b/pkgs/development/coq-modules/Velisarios/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "Velisarios"; owner = "vrahli"; inherit version; - defaultVersion = if versions.range "8.6" "8.8" coq.coq-version then "20180221" else null; + defaultVersion = if lib.versions.range "8.6" "8.8" coq.coq-version then "20180221" else null; release."20180221".rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b"; release."20180221".sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2"; diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix index 190758855f78..6dec34a095d7 100644 --- a/pkgs/development/coq-modules/Verdi/default.nix +++ b/pkgs/development/coq-modules/Verdi/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, Cheerios, InfSeqExt, ssreflect, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "verdi"; owner = "uwplse"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.7" "8.16"; out = "20211026"; } { case = range "8.7" "8.14"; out = "20210524"; } { case = range "8.7" "8.13"; out = "20200131"; } @@ -21,5 +21,9 @@ with lib; mkCoqDerivation { release."20181102".sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z"; propagatedBuildInputs = [ Cheerios InfSeqExt ssreflect ]; - preConfigure = "patchShebangs ./configure"; + preConfigure = '' + if [ -f ./configure ]; then + patchShebangs ./configure + fi + ''; } diff --git a/pkgs/development/coq-modules/aac-tactics/default.nix b/pkgs/development/coq-modules/aac-tactics/default.nix index 90ddf3e524ff..180b7b88fced 100644 --- a/pkgs/development/coq-modules/aac-tactics/default.nix +++ b/pkgs/development/coq-modules/aac-tactics/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "aac-tactics"; @@ -21,7 +20,7 @@ mkCoqDerivation { release."8.5.0".sha256 = "sha256-7yNxJn6CH5xS5w/zsXfcZYORa6e5/qS9v8PUq2o02h4="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = "8.16"; out = "8.16.0"; } { case = "8.15"; out = "8.15.1"; } { case = "8.14"; out = "8.14.1"; } @@ -37,7 +36,7 @@ mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { description = "Coq plugin providing tactics for rewriting universally quantified equations"; longDescription = '' This Coq plugin provides tactics for rewriting universally quantified diff --git a/pkgs/development/coq-modules/addition-chains/default.nix b/pkgs/development/coq-modules/addition-chains/default.nix index 63ba0e805072..f40bdbf1899c 100644 --- a/pkgs/development/coq-modules/addition-chains/default.nix +++ b/pkgs/development/coq-modules/addition-chains/default.nix @@ -1,6 +1,5 @@ { lib, mkCoqDerivation, coq, mathcomp-ssreflect, mathcomp-algebra, mathcomp-fingroup, paramcoq , version ? null }: -with lib; mkCoqDerivation { pname = "addition-chains"; @@ -12,7 +11,7 @@ mkCoqDerivation { releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "0.6"; } { case = range "8.11" "8.12"; out = "0.4"; } ] null; @@ -21,7 +20,7 @@ mkCoqDerivation { useDune = true; - meta = { + meta = with lib; { description = "Exponentiation algorithms following addition chains"; longDescription = '' Addition chains are algorithms for computations of the p-th diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index 5a7331c22206..72768777c1b5 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, mathcomp-ssreflect, version ? null }: -with lib; mkCoqDerivation { pname = "autosubst"; @@ -8,13 +7,13 @@ mkCoqDerivation { release."1.7".sha256 = "sha256-qoyteQ5W2Noxf12uACOVeHhPLvgmTzrvEo6Ts+FKTGI="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "1.7"; } ] null; propagatedBuildInputs = [ mathcomp-ssreflect ]; - meta = { + meta = with lib; { homepage = "https://www.ps.uni-saarland.de/autosubst/"; description = "Automation for de Bruijn syntax and substitution in Coq"; maintainers = with maintainers; [ siraben jwiegley ]; diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index 798ea04368f8..c62e20a5a2e7 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -1,13 +1,14 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "bignums"; owner = "coq"; displayVersion = { bignums = ""; }; inherit version; - defaultVersion = if versions.isGe "8.6" coq.coq-version + defaultVersion = if lib.versions.isGe "8.6" coq.coq-version then "${coq.coq-version}.0" else null; + release."8.17.0".sha256 = "sha256-MXYjqN86+3O4hT2ql62U83T5H03E/8ysH8erpvC/oyw="; release."8.16.0".sha256 = "sha256-DH3iWwatPlhhCVYVlgL2WLkvneSVzSXUiKo2e0+1zR4="; release."8.15.0".sha256 = "093klwlhclgyrba1iv18dyz1qp5f0lwiaa7y0qwvgmai8rll5fns"; release."8.14.0".sha256 = "0jsgdvj0ddhkls32krprp34r64y1rb5mwxl34fgaxk2k4664yq06"; @@ -24,5 +25,5 @@ with lib; mkCoqDerivation { mlPlugin = true; - meta = { license = licenses.lgpl2; }; + meta = { license = lib.licenses.lgpl2; }; } diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index 97feac90c3bd..ed214533b03f 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -1,6 +1,6 @@ { lib, mkCoqDerivation, coq, ssreflect, equations, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "category-theory"; owner = "jwiegley"; @@ -16,7 +16,7 @@ with lib; mkCoqDerivation { release."20180709".sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = "1.0.0"; } { case = range "8.10" "8.15"; out = "20211213"; } { case = range "8.8" "8.9"; out = "20190414"; } @@ -28,6 +28,6 @@ with lib; mkCoqDerivation { meta = { description = "A formalization of category theory in Coq for personal study and practical work"; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with lib.maintainers; [ jwiegley ]; }; } diff --git a/pkgs/development/coq-modules/ceres/default.nix b/pkgs/development/coq-modules/ceres/default.nix index 1813cd700c70..75d57936ff5f 100644 --- a/pkgs/development/coq-modules/ceres/default.nix +++ b/pkgs/development/coq-modules/ceres/default.nix @@ -1,6 +1,5 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "ceres"; @@ -8,10 +7,10 @@ mkCoqDerivation { owner = "Lysxia"; inherit version; - defaultVersion = if versions.isGe "8.8" coq.version then "0.4.0" else null; + defaultVersion = if lib.versions.range "8.8" "8.16" coq.version then "0.4.0" else null; release."0.4.0".sha256 = "sha256:0zwp3pn6fdj0qdig734zdczrls886al06mxqhhabms0jvvqijmbi"; - meta = { + meta = with lib; { description = "Library for serialization to S-expressions"; license = licenses.mit; maintainers = with maintainers; [ Zimmi48 ]; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index c8c66395c428..0e7225a184a2 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -5,8 +5,6 @@ , version ? null }: -with lib; - let compcert = mkCoqDerivation rec { pname = "compcert"; @@ -15,7 +13,7 @@ let compcert = mkCoqDerivation rec { inherit version; releaseRev = v: "v${v}"; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = range "8.14" "8.16"; out = "3.11"; } { case = isEq "8.13" ; out = "3.10"; } { case = isEq "8.12" ; out = "3.9"; } @@ -29,8 +27,10 @@ let compcert = mkCoqDerivation rec { "3.11".sha256 = "sha256-ZISs/ZAJVWtxp9+Sg5qV5Rss1gI9hK769GnBfawLa6A="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = with ocamlPackages; [ ocaml findlib menhir menhirLib ] ++ [ coq coq2html ]; + strictDeps = true; + + nativeBuildInputs = with ocamlPackages; [ makeWrapper ocaml findlib menhir coq coq2html ]; + buildInputs = with ocamlPackages; [ menhirLib ]; propagatedBuildInputs = [ flocq ]; enableParallelBuilding = true; @@ -84,7 +84,7 @@ let compcert = mkCoqDerivation rec { }; in compcert.overrideAttrs (o: { - patches = with versions; switch [ coq.version o.version ] [ + patches = with lib.versions; lib.switch [ coq.version o.version ] [ { cases = [ (range "8.12.2" "8.13.2") "3.8" ]; out = [ # Support for Coq 8.12.2 @@ -145,6 +145,11 @@ compcert.overrideAttrs (o: url = "https://github.com/AbsInt/CompCert/commit/34be08a23d18d56f2dde24fd24b6dbe3bcb01ec3.patch"; sha256 = "sha256-a5YnftGVadVypEqrOYRRxI7YtGOEWyKnO4GqakFhvzI="; }) + # Support for Coq 8.16.1 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/35531503b3493cb9b0ec8a8585e84928c85b4af9.patch"; + hash = "sha256-DvtYi/eiPUe8tA0EFTcCjJA0JjtVKceUsX4ZDM0pWkE="; + }) ]; } ] []; diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix index cb6dedca3551..2d10f683cc36 100644 --- a/pkgs/development/coq-modules/contribs/default.nix +++ b/pkgs/development/coq-modules/contribs/default.nix @@ -1,16 +1,16 @@ { lib, mkCoqDerivation, coq, callPackage }: -with lib; let mkContrib = pname: coqs: param: + let mkContrib = pname: coqs: param: let contribVersion = {version ? null}: mkCoqDerivation ({ inherit pname version; owner = "coq-contribs"; mlPlugin = true; - } // optionalAttrs (builtins.elem coq.coq-version coqs) ({ + } // lib.optionalAttrs (builtins.elem coq.coq-version coqs) ({ defaultVersion = param.version; release = { "${param.version}" = { inherit (param) rev sha256; }; }; } // (removeAttrs param [ "version" "rev" "sha256" ])) ); in - makeOverridable contribVersion {} ; in + lib.makeOverridable contribVersion {} ; in { aac-tactics = mkContrib "aac-tactics" [ "8.7" "8.8" ] { "8.7" = { diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix index a2ef7e09a7d6..16a26d9fa32e 100644 --- a/pkgs/development/coq-modules/coq-bits/default.nix +++ b/pkgs/development/coq-modules/coq-bits/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "coq-bits"; repo = "bits"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "1.1.0"; } { case = range "8.7" "8.15"; out = "1.0.0"; } ] null; @@ -14,7 +14,7 @@ with lib; mkCoqDerivation { propagatedBuildInputs = [ mathcomp-algebra ]; - meta = { + meta = with lib; { description = "A formalization of bitset operations in Coq"; license = licenses.asl20; maintainers = with maintainers; [ ptival ]; diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index b6f124b3f0fb..d555e55389b1 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "coq-ext-lib"; owner = "coq-ext-lib"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.16"; out = "0.11.7"; } { case = range "8.8" "8.16"; out = "0.11.6"; } { case = range "8.8" "8.14"; out = "0.11.4"; } @@ -30,6 +30,6 @@ with lib; mkCoqDerivation rec { meta = { description = "A collection of theories and plugins that may be useful in other Coq developments"; - maintainers = with maintainers; [ jwiegley ptival ]; + maintainers = with lib.maintainers; [ jwiegley ptival ]; }; } diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix index 7caf754ae50a..028b4c5025eb 100644 --- a/pkgs/development/coq-modules/coq-haskell/default.nix +++ b/pkgs/development/coq-modules/coq-haskell/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, ssreflect, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "coq-haskell"; owner = "jwiegley"; inherit version; - defaultVersion = if versions.range "8.5" "8.8" coq.coq-version then "20171215" else null; + defaultVersion = if lib.versions.range "8.5" "8.8" coq.coq-version then "20171215" else null; release."20171215".rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968"; release."20171215".sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv"; @@ -16,6 +16,6 @@ with lib; mkCoqDerivation { meta = { description = "A library for formalizing Haskell types and functions in Coq"; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with lib.maintainers; [ jwiegley ]; }; } diff --git a/pkgs/development/coq-modules/coq-record-update/default.nix b/pkgs/development/coq-modules/coq-record-update/default.nix index 77c42fb48d4e..a0b27dda845f 100644 --- a/pkgs/development/coq-modules/coq-record-update/default.nix +++ b/pkgs/development/coq-modules/coq-record-update/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { + mkCoqDerivation rec { pname = "coq-record-update"; owner = "tchajed"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "0.3.1"; } ] null; release."0.3.1".sha256 = "sha256-DyGxO2tqmYZZluXN6Oy5Tw6fuLMyuyxonj8CCToWKkk="; @@ -13,6 +13,6 @@ with lib; mkCoqDerivation rec { buildFlags = [ "NO_TEST=1" ]; meta = { description = "Library to create Coq record update functions"; - maintainers = with maintainers; [ ineol ]; + maintainers = with lib.maintainers; [ ineol ]; }; } diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index d3a8e366a0a4..1ccbf9e82a0f 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -2,14 +2,12 @@ mathcomp-real-closed, lib, version ? null }: -with lib; - (mkCoqDerivation { pname = "CoqEAL"; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.13" "8.16") (isGe "1.13.0") ]; out = "1.1.1"; } { 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"; } @@ -28,9 +26,9 @@ with lib; meta = { description = "CoqEAL - The Coq Effective Algebra Library"; - license = licenses.mit; + license = lib.licenses.mit; }; }).overrideAttrs (o: { propagatedBuildInputs = o.propagatedBuildInputs - ++ optional (versions.isGe "1.1" o.version || o.version == "dev") mathcomp-real-closed; + ++ lib.optional (lib.versions.isGe "1.1" o.version || o.version == "dev") mathcomp-real-closed; }) diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index 853e77990b6e..e5e23247f141 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { inherit version; pname = "coqhammer"; owner = "lukaszcz"; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.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"; } @@ -57,7 +57,7 @@ with lib; mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { homepage = "http://cl-informatik.uibk.ac.at/cek/coqhammer/"; description = "Automation for Dependent Type Theory"; license = licenses.lgpl21; diff --git a/pkgs/development/coq-modules/coqide/default.nix b/pkgs/development/coq-modules/coqide/default.nix index 4e1f9e5f6662..a11bfb2c0db7 100644 --- a/pkgs/development/coq-modules/coqide/default.nix +++ b/pkgs/development/coq-modules/coqide/default.nix @@ -8,14 +8,14 @@ , coq , version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "coqide"; inherit version; inherit (coq) src; release."${coq.version}" = {}; - defaultVersion = if versions.isGe "8.14" coq.version then coq.version else null; + defaultVersion = if lib.versions.isGe "8.14" coq.version then coq.version else null; preConfigure = '' patchShebangs dev/tools/ diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index ac05af587253..cfba685e35fb 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -1,11 +1,11 @@ { which, lib, mkCoqDerivation, coq, bignums, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "coqprime"; owner = "thery"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.12" "8.16"; out = "8.15"; } { case = range "8.10" "8.11"; out = "8.10"; } { case = range "8.8" "8.9"; out = "8.8"; } diff --git a/pkgs/development/coq-modules/coqtail-math/default.nix b/pkgs/development/coq-modules/coqtail-math/default.nix index a4f7ca405f71..b43cadb918e3 100644 --- a/pkgs/development/coq-modules/coqtail-math/default.nix +++ b/pkgs/development/coq-modules/coqtail-math/default.nix @@ -1,12 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; - mkCoqDerivation { pname = "coqtail-math"; owner = "coq-community"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.15"; out = "8.14"; } { case = range "8.11" "8.13"; out = "20201124"; } ] null; @@ -15,7 +13,7 @@ mkCoqDerivation { release."20201124".rev = "5c22c3d7dcd8cf4c47cf84a281780f5915488e9e"; release."20201124".sha256 = "sha256-wd+Lh7dpAD4zfpyKuztDmSFEZo5ZiFrR8ti2jUCVvoQ="; mlPlugin = true; - meta = { + meta = with lib; { license = licenses.lgpl3Only; maintainers = [ maintainers.siraben ]; }; diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 09327f2ff76c..922a601584d4 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -1,16 +1,18 @@ { lib, mkCoqDerivation, autoconf, coq, ssreflect, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "coquelicot"; owner = "coquelicot"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.12" "8.16"; out = "3.3.0"; } { case = range "8.8" "8.16"; out = "3.2.0"; } { case = range "8.8" "8.13"; out = "3.1.0"; } { case = range "8.5" "8.9"; out = "3.0.2"; } ] null; + release."3.3.0".sha256 = "sha256-bh9qP/EhWrHpTe2GMGG3S2vgBSSK088mFfhAIGejVoU="; release."3.2.0".sha256 = "07w7dbl8x7xxnbr2q39wrdh054gvi3daqjpdn1jm53crsl1fjxm4"; release."3.1.0".sha256 = "02i0djar13yk01hzaqprcldhhscn9843x9nf6x3jkv4wv1jwnx9f"; release."3.0.2".sha256 = "1rqfbbskgz7b1bcpva8wh3v3456sq2364y804f94sc8y5sij23nl"; @@ -20,7 +22,7 @@ with lib; mkCoqDerivation { propagatedBuildInputs = [ ssreflect ]; useMelquiondRemake.logpath = "Coquelicot"; - meta = { + meta = with lib; { homepage = "http://coquelicot.saclay.inria.fr/"; description = "A Coq library for Reals"; license = licenses.lgpl3; diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index d019d4b4e55f..84bca53931cc 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -1,9 +1,9 @@ { lib, mkCoqDerivation, coq, bignums, math-classes, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "corn"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = "8.6"; out = "8.8.1"; } { case = (range "8.11" "8.16"); out = "8.16.0"; } { case = (range "8.7" "8.15"); out = "8.13.0"; } @@ -21,7 +21,7 @@ with lib; mkCoqDerivation rec { propagatedBuildInputs = [ bignums math-classes ]; - meta = { + meta = with lib; { homepage = "http://c-corn.github.io/"; license = licenses.gpl2; description = "A Coq library for constructive analysis"; diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index f08e86ccc4f8..06e80f118bc0 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -1,14 +1,13 @@ { lib, mkCoqDerivation, coq, version ? null , ssreflect }: -with lib; mkCoqDerivation { pname = "deriving"; owner = "arthuraa"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.16"; out = "0.1.0"; } ] null; @@ -20,7 +19,7 @@ mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { description = "Generic instances of MathComp classes"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index e24729465578..da26b0774d41 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -1,14 +1,13 @@ { lib, mkCoqDerivation, autoreconfHook, coq, version ? null }: -with lib; -let hasWarning = versionAtLeast coq.ocamlPackages.ocaml.version "4.08"; in +let hasWarning = lib.versionAtLeast coq.ocamlPackages.ocaml.version "4.08"; in mkCoqDerivation { pname = "dpdgraph"; owner = "Karmaki"; repo = "coq-dpdgraph"; inherit version; - defaultVersion = switch coq.coq-version [ + defaultVersion = lib.switch coq.coq-version [ { case = "8.16"; out = "1.0+8.16"; } { case = "8.15"; out = "1.0+8.15"; } { case = "8.14"; out = "1.0+8.14"; } @@ -47,11 +46,11 @@ mkCoqDerivation { # dpd_compute.ml uses deprecated Pervasives.compare # Versions prior to 0.6.5 do not have the WARN_ERR build flag - preConfigure = optionalString hasWarning '' + preConfigure = lib.optionalString hasWarning '' substituteInPlace Makefile.in --replace "-warn-error +a " "" ''; - buildFlags = optional hasWarning "WARN_ERR="; + buildFlags = lib.optional hasWarning "WARN_ERR="; preInstall = '' mkdir -p $out/bin @@ -59,7 +58,7 @@ mkCoqDerivation { extraInstallFlags = [ "BINDIR=$(out)/bin" ]; - meta = { + meta = with lib; { description = "Build dependency graphs between Coq objects"; license = licenses.lgpl21; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index ffe72ad330bc..b574f4c9fb20 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -1,11 +1,12 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; (mkCoqDerivation { +(mkCoqDerivation { pname = "equations"; owner = "mattam82"; repo = "Coq-Equations"; inherit version; - defaultVersion = switch coq.coq-version [ + defaultVersion = lib.switch coq.coq-version [ + { case = "8.17"; out = "1.3+8.17"; } { case = "8.16"; out = "1.3+8.16"; } { case = "8.15"; out = "1.3+8.15"; } { case = "8.14"; out = "1.3+8.14"; } @@ -54,14 +55,16 @@ with lib; (mkCoqDerivation { release."1.3+8.15".sha256 = "1vfcfpsp9zyj0sw0cwibk76nj6n0r6gwh8m1aa3lbvc0b1kbm32k"; release."1.3+8.16".rev = "v1.3-8.16"; release."1.3+8.16".sha256 = "sha256-zyMGeRObtSGWh7n3WCqesBZL5EgLvKwmnTy09rYpxyE="; + release."1.3+8.17".rev = "v1.3-8.17"; + release."1.3+8.17".sha256 = "sha256-yNotSIxFkhTg3reZIchGQ7cV9WmTJ7p7hPfKGBiByDw="; mlPlugin = true; - meta = { + meta = with lib; { homepage = "https://mattam82.github.io/Coq-Equations/"; description = "A plugin for Coq to add dependent pattern-matching"; maintainers = with maintainers; [ jwiegley ]; }; }).overrideAttrs (o: { - preBuild = "coq_makefile -f _CoqProject -o Makefile${optionalString (versionAtLeast o.version "1.2.1" || o.version == "dev") ".coq"}"; + preBuild = "coq_makefile -f _CoqProject -o Makefile${lib.optionalString (lib.versionAtLeast o.version "1.2.1" || o.version == "dev") ".coq"}"; }) diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index 2a038ff0c11a..b6345d7b0ac3 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -2,14 +2,13 @@ , ssreflect , deriving }: -with lib; (mkCoqDerivation { pname = "extructures"; owner = "arthuraa"; inherit version; - defaultVersion = with versions; switch [coq.coq-version ssreflect.version] [ + defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ { cases = [(range "8.11" "8.16") (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"; } @@ -23,7 +22,7 @@ with lib; propagatedBuildInputs = [ ssreflect ]; - meta = { + meta = with lib; { description = "Finite data structures with extensional reasoning"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; @@ -31,5 +30,5 @@ with lib; }).overrideAttrs (o: { propagatedBuildInputs = o.propagatedBuildInputs - ++ optional (versionAtLeast o.version "0.3.0") deriving; + ++ lib.optional (lib.versionAtLeast o.version "0.3.0") deriving; }) diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix index d94dc03b6377..0a6375907e89 100644 --- a/pkgs/development/coq-modules/fiat/HEAD.nix +++ b/pkgs/development/coq-modules/fiat/HEAD.nix @@ -1,6 +1,6 @@ {lib, mkCoqDerivation, coq, python27, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "fiat"; owner = "mit-plv"; repo = "fiat"; @@ -29,6 +29,6 @@ with lib; mkCoqDerivation rec { meta = { homepage = "http://plv.csail.mit.edu/fiat/"; description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications"; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with lib.maintainers; [ jwiegley ]; }; } diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index ed973996feea..cf39c8211b78 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -1,12 +1,12 @@ { lib, bash, autoconf, automake, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "flocq"; owner = "flocq"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = "4.1.0"; } { case = range "8.7" "8.15"; out = "3.4.3"; } { case = range "8.5" "8.8"; out = "2.6.1"; } @@ -22,7 +22,7 @@ with lib; mkCoqDerivation { mlPlugin = true; useMelquiondRemake.logpath = "Flocq"; - meta = { + meta = with lib; { description = "A floating-point formalization for the Coq system"; license = licenses.lgpl3; maintainers = with maintainers; [ jwiegley ]; diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix index 3615f5513a39..6548da52b9f7 100644 --- a/pkgs/development/coq-modules/fourcolor/default.nix +++ b/pkgs/development/coq-modules/fourcolor/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, mathcomp, version ? null }: -with lib; mkCoqDerivation { pname = "fourcolor"; @@ -12,15 +11,15 @@ mkCoqDerivation { release."1.2.5".sha256 = "sha256-3qOPNCRjGK2UdHGMSqElpIXhAPVCklpeQgZwf9AFals="; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.11") (isGe "1.12") ]; out = "1.2.5"; } { cases = [ (isGe "8.11") (range "1.11" "1.14") ]; out = "1.2.4"; } - { cases = [ (isLe "8.13") (pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } + { cases = [ (isLe "8.13") (lib.pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } ] null; propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; - meta = { + meta = with lib; { description = "Formal proof of the Four Color Theorem "; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/pkgs/development/coq-modules/gaia-hydras/default.nix b/pkgs/development/coq-modules/gaia-hydras/default.nix index 5377600caba4..4f9e7a12e048 100644 --- a/pkgs/development/coq-modules/gaia-hydras/default.nix +++ b/pkgs/development/coq-modules/gaia-hydras/default.nix @@ -1,7 +1,7 @@ { lib, mkCoqDerivation, coq, hydra-battles, gaia, mathcomp-zify, mathcomp, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "gaia-hydras"; repo = "hydra-battles"; @@ -10,7 +10,7 @@ with lib; mkCoqDerivation rec { releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch [coq.coq-version mathcomp.version] [ + defaultVersion = with lib.versions; lib.switch [coq.coq-version mathcomp.version] [ { cases = [ (range "8.14" "8.16") (isGe "1.12.0") ]; out = "0.6"; } { cases = [ (range "8.13" "8.14") (isGe "1.12.0") ]; out = "0.5"; } ] null; @@ -23,7 +23,7 @@ with lib; mkCoqDerivation rec { useDune = true; - meta = { + meta = with lib; { description = "Comparison between ordinals in Gaia and Hydra battles"; longDescription = '' The Gaia and Hydra battles projects develop different notions of ordinals. diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix index d4fa4a1da309..a2994dcc9b34 100644 --- a/pkgs/development/coq-modules/gaia/default.nix +++ b/pkgs/development/coq-modules/gaia/default.nix @@ -1,6 +1,6 @@ { lib, mkCoqDerivation, coq, mathcomp, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "gaia"; release."1.11".sha256 = "sha256:0gwb0blf37sv9gb0qpn34dab71zdcx7jsnqm3j9p58qw65cgsqn5"; @@ -11,7 +11,7 @@ with lib; mkCoqDerivation { releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.10" "8.16") (isGe "1.12.0") ]; out = "1.15"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; } ] null; @@ -19,7 +19,7 @@ with lib; mkCoqDerivation { propagatedBuildInputs = [ mathcomp.ssreflect mathcomp.algebra mathcomp.fingroup ]; - meta = { + meta = with lib; { description = "Implementation of books from Bourbaki's Elements of Mathematics in Coq"; maintainers = with maintainers; [ Zimmi48 ]; license = licenses.mit; diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index 52e69e90d135..5a4b4b2a4d01 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -1,12 +1,12 @@ { which, lib, mkCoqDerivation, autoconf, coq, flocq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "gappalib"; repo = "coq"; owner = "gappa"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = if versions.range "8.8" "8.16" coq.coq-version then "1.5.2" else null; + defaultVersion = if lib.versions.range "8.8" "8.16" coq.coq-version then "1.5.2" else null; release."1.5.2".sha256 = "sha256-A021Bhqz5r2CZBayfjIiWrCIfUlejcQAfbTmOaf6QTM="; release."1.5.1".sha256 = "1806bq1z6q5rq2ma7d5kfbqfyfr755hjg0dq7b2llry8fx9cxjsg"; release."1.5.0".sha256 = "1i1c0gakffxqqqqw064cbvc243yl325hxd50jmczr6mk18igk41n"; @@ -19,7 +19,7 @@ with lib; mkCoqDerivation { propagatedBuildInputs = [ flocq ]; useMelquiondRemake.logpath = "Gappa"; - meta = { + meta = with lib; { description = "Coq support library for Gappa"; license = licenses.lgpl21; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/goedel/default.nix b/pkgs/development/coq-modules/goedel/default.nix index 19efb786addf..1b16f8c3948a 100644 --- a/pkgs/development/coq-modules/goedel/default.nix +++ b/pkgs/development/coq-modules/goedel/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, hydra-battles, pocklington, version ? null }: -with lib; mkCoqDerivation { pname = "goedel"; @@ -11,13 +10,13 @@ mkCoqDerivation { release."8.13.0".sha256 = "0sqqkmj6wsk4xmhrnqkhcsbsrqjzn2gnk67nqzgrmjpw5danz8y5"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.16"; out = "8.13.0"; } ] null; propagatedBuildInputs = [ hydra-battles pocklington ]; - meta = { + meta = with lib; { description = "The Gödel-Rosser 1st incompleteness theorem in Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.mit; diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix index c2fca0a16a71..cbd919c7aa61 100644 --- a/pkgs/development/coq-modules/graph-theory/default.nix +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -1,8 +1,6 @@ { lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-finmap, mathcomp-fingroup , hierarchy-builder, version ? null }: -with lib; - mkCoqDerivation { pname = "graph-theory"; @@ -11,13 +9,13 @@ mkCoqDerivation { releaseRev = v: "v${v}"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "0.9"; } ] null; propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup hierarchy-builder ]; - meta = { + meta = with lib; { description = "Library of formalized graph theory results in Coq"; longDescription = '' A library of formalized graph theory results, including various diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix index c3a815eb5c87..fc96b2abf98c 100644 --- a/pkgs/development/coq-modules/heq/default.nix +++ b/pkgs/development/coq-modules/heq/default.nix @@ -5,13 +5,13 @@ let fetcher = {rev, repo, owner, sha256, domain, ...}: url = "https://${domain}/${owner}/${repo}/download/${repo}-${rev}.zip"; inherit sha256; }; in -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "heq"; repo = "Heq"; owner = "gil.hur"; domain = "sf.snu.ac.kr"; inherit version fetcher; - defaultVersion = if versions.isLt "8.8" coq.coq-version then "0.92" else null; + defaultVersion = if lib.versions.isLt "8.8" coq.coq-version then "0.92" else null; release."0.92".sha256 = "0cf8y6728n81wwlbpq3vi7l2dbzi7759klypld4gpsjjp1y1fj74"; mlPlugin = true; @@ -22,6 +22,6 @@ with lib; mkCoqDerivation { meta = { homepage = "https://ropas.snu.ac.kr/~gil.hur/Heq/"; description = "Heq : a Coq library for Heterogeneous Equality"; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with lib.maintainers; [ jwiegley ]; }; } diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index 4f319587de93..9bcc07387b1e 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, coq-elpi, version ? null }: -with lib; let hb = mkCoqDerivation { +let hb = mkCoqDerivation { pname = "hierarchy-builder"; owner = "math-comp"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.15" "8.16"; out = "1.4.0"; } { case = range "8.13" "8.14"; out = "1.2.0"; } { case = range "8.12" "8.13"; out = "1.1.0"; } @@ -25,16 +25,16 @@ with lib; let hb = mkCoqDerivation { extraInstallFlags = [ "VFILES=structures.v" ]; - meta = { + meta = with lib; { description = "High level commands to declare a hierarchy based on packed classes"; maintainers = with maintainers; [ cohencyril siraben ]; license = licenses.mit; }; }; in hb.overrideAttrs (o: - optionalAttrs (versions.isGe "1.2.0" o.version || o.version == "dev") + lib.optionalAttrs (lib.versions.isGe "1.2.0" o.version || o.version == "dev") { buildPhase = "make build"; } // - optionalAttrs (versions.isGe "1.1.0" o.version || o.version == "dev") + lib.optionalAttrs (lib.versions.isGe "1.1.0" o.version || o.version == "dev") { installFlags = [ "DESTDIR=$(out)" ] ++ o.installFlags; } ) diff --git a/pkgs/development/coq-modules/hydra-battles/default.nix b/pkgs/development/coq-modules/hydra-battles/default.nix index 2729f7c21391..06798c5fcc29 100644 --- a/pkgs/development/coq-modules/hydra-battles/default.nix +++ b/pkgs/development/coq-modules/hydra-battles/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, equations, LibHyps, version ? null }: -with lib; (mkCoqDerivation { pname = "hydra-battles"; @@ -11,14 +10,14 @@ with lib; releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "0.6"; } { case = range "8.11" "8.12"; out = "0.4"; } ] null; useDune = true; - meta = { + meta = with lib; { description = "Exploration of some properties of Kirby and Paris' hydra battles, with the help of Coq"; longDescription = '' An exploration of some properties of Kirby and Paris' hydra @@ -33,5 +32,5 @@ with lib; }; }).overrideAttrs(o: let inherit (o) version; in { - propagatedBuildInputs = [ equations ] ++ optional (versions.isGe "0.6" version || version == "dev") LibHyps; + propagatedBuildInputs = [ equations ] ++ lib.optional (lib.versions.isGe "0.6" version || version == "dev") LibHyps; }) diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index a2a59e1ab22c..f72dd69f3617 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, stdpp, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "iris"; domain = "gitlab.mpi-sws.org"; owner = "iris"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "4.0.0"; } { case = range "8.12" "8.14"; out = "3.5.0"; } { case = range "8.11" "8.13"; out = "3.4.0"; } @@ -26,7 +26,7 @@ with lib; mkCoqDerivation rec { fi ''; - meta = { + meta = with lib; { description = "The Coq development of the Iris Project"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/itauto/default.nix b/pkgs/development/coq-modules/itauto/default.nix index 1ffa37ec6c32..e2dfe98cf989 100644 --- a/pkgs/development/coq-modules/itauto/default.nix +++ b/pkgs/development/coq-modules/itauto/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { pname = "itauto"; @@ -11,7 +10,7 @@ mkCoqDerivation rec { release."8.14.0".sha256 = "sha256:1k6pqhv4dwpkwg81f2rlfg40wh070ks1gy9r0ravm2zhsbxqcfc9"; release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isEq "8.16"; out = "8.16.0"; } { case = isEq "8.15"; out = "8.15.0"; } { case = isEq "8.14"; out = "8.14.0"; } @@ -22,7 +21,7 @@ mkCoqDerivation rec { nativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); enableParallelBuilding = false; - meta = { + meta = with lib; { description = "A reflexive SAT solver parameterised by a leaf tactic and Nelson-Oppen support"; maintainers = with maintainers; [ siraben ]; license = licenses.gpl3Plus; diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix index c938a7ad0279..da2818429600 100644 --- a/pkgs/development/coq-modules/ltac2/default.nix +++ b/pkgs/development/coq-modules/ltac2/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, which, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "ltac2"; owner = "coq"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = "8.10"; out = "0.3"; } { case = "8.9"; out = "0.2"; } { case = "8.8"; out = "0.1"; } @@ -19,7 +19,7 @@ with lib; mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { description = "A robust and expressive tactic language for Coq"; maintainers = [ maintainers.vbgl ]; license = licenses.lgpl21; diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index da708f87e477..d40dacd39380 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, bignums, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "math-classes"; inherit version; - defaultVersion = if versions.range "8.6" "8.16" coq.coq-version then "8.15.0" else null; + defaultVersion = if lib.versions.range "8.6" "8.16" coq.coq-version then "8.15.0" else null; release."8.12.0".sha256 = "14nd6a08zncrl5yg2gzk0xf4iinwq4hxnsgm4fyv07ydbkxfb425"; release."8.13.0".sha256 = "1ln7ziivfbxzbdvlhbvyg3v30jgblncmwcsam6gg3d1zz6r7cbby"; release."8.15.0".sha256 = "10w1hm537k6jx8a8vghq1yx12rsa0sjk2ipv3scgir71ln30hllw"; @@ -14,6 +14,6 @@ with lib; mkCoqDerivation { meta = { homepage = "https://math-classes.github.io"; description = "A library of abstract interfaces for mathematical structures in Coq."; - maintainers = with maintainers; [ siddharthist jwiegley ]; + maintainers = with lib.maintainers; [ siddharthist jwiegley ]; }; } diff --git a/pkgs/development/coq-modules/mathcomp-abel/default.nix b/pkgs/development/coq-modules/mathcomp-abel/default.nix index 43228252b55f..bae9266d4de1 100644 --- a/pkgs/development/coq-modules/mathcomp-abel/default.nix +++ b/pkgs/development/coq-modules/mathcomp-abel/default.nix @@ -7,7 +7,7 @@ mkCoqDerivation { owner = "math-comp"; inherit version; - defaultVersion = with lib; with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib; with versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.15.0") ]; out = "1.2.1"; } { cases = [ (range "8.10" "8.15") (range "1.12.0" "1.14.0") ]; out = "1.2.0"; } { cases = [ (range "8.10" "8.14") (range "1.11.0" "1.12.0") ]; out = "1.1.2"; } diff --git a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix new file mode 100644 index 000000000000..af37096a4fb1 --- /dev/null +++ b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix @@ -0,0 +1,23 @@ +{ lib, mkCoqDerivation, coq, mathcomp-algebra, + coq-elpi, mathcomp-zify, version ? null }: + +mkCoqDerivation { + namePrefix = [ "coq" "mathcomp" ]; + pname = "algebra-tactics"; + owner = "math-comp"; + inherit version; + + defaultVersion = with lib.versions; + lib.switch [ coq.coq-version mathcomp-algebra.version ] [ + { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; } + ] null; + + release."1.0.0".sha256 = "sha256-kszARPBizWbxSQ/Iqpf2vLbxYc6AjpUCLnSNlPcNfls="; + + propagatedBuildInputs = [ mathcomp-algebra coq-elpi mathcomp-zify ]; + + meta = { + description = "Ring and field tactics for Mathematical Components"; + maintainers = with lib.maintainers; [ cohencyril ]; + }; +} diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index a42b551d1845..3e67675b5efb 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -21,7 +21,7 @@ let release."0.3.1".sha256 = "1iad288yvrjv8ahl9v18vfblgqb1l5z6ax644w49w9hwxs93f2k8"; release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.14") (isGe "1.13.0") ]; out = "0.5.3"; } { cases = [ (isGe "8.14") (range "1.13" "1.15") ]; out = "0.5.2"; } { cases = [ (isGe "8.13") (range "1.13" "1.14") ]; out = "0.5.1"; } @@ -40,7 +40,7 @@ let classical-deps = [ mathcomp.algebra mathcomp-finmap hierarchy-builder ]; analysis-deps = [ mathcomp.field mathcomp-bigenough ]; intra-deps = if package == "single" then [] - else map mathcomp_ (head (splitList (pred.equal package) packages)); + else map mathcomp_ (head (splitList (lib.pred.equal package) packages)); pkgpath = if package == "single" then "." else if package == "analysis" then "theories" else "${package}"; pname = if package == "single" then "mathcomp-analysis-single" diff --git a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix index 8731017eee46..a4e4a1ecbb5c 100644 --- a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix +++ b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix @@ -1,6 +1,6 @@ { coq, mkCoqDerivation, mathcomp, lib, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "bigenough"; @@ -11,8 +11,8 @@ with lib; mkCoqDerivation { "1.0.1".sha256 = "sha256:02f4dv4rz72liciwxb2k7acwx6lgqz4381mqyq5854p3nbyn06aw"; }; inherit version; - defaultVersion = with versions; switch coq.version [ - { case = isGe "8.10" ; out = "1.0.1"; } + defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.10" "8.16"; out = "1.0.1"; } { case = range "8.5" "8.14"; out = "1.0.0"; } ] null; @@ -20,6 +20,6 @@ with lib; mkCoqDerivation { meta = { description = "A small library to do epsilon - N reasonning"; - license = licenses.cecill-b; + license = lib.licenses.cecill-b; }; } diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 8c29208c3f63..551d33c9fadf 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -1,12 +1,12 @@ { coq, mkCoqDerivation, mathcomp, lib, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "finmap"; owner = "math-comp"; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.5.2"; } { cases = [ (isGe "8.10") (isGe "1.11") ]; out = "1.5.1"; } { cases = [ (range "8.7" "8.11") "1.11.0" ]; out = "1.5.0"; } @@ -33,6 +33,6 @@ with lib; mkCoqDerivation { meta = { description = "A finset and finmap library"; - license = licenses.cecill-b; + license = lib.licenses.cecill-b; }; } diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index aef912c6151c..b114a3f290d3 100644 --- a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -1,7 +1,7 @@ { coq, mkCoqDerivation, mathcomp, mathcomp-bigenough, lib, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "real-closed"; @@ -17,7 +17,7 @@ with lib; mkCoqDerivation { "1.0.1".sha256 = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg"; }; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.13") (isGe "1.12.0") ]; out = "1.1.3"; } { cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.1.2"; } { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.1.1"; } @@ -37,6 +37,6 @@ with lib; mkCoqDerivation { meta = { description = "Mathematical Components Library on real closed fields"; - license = licenses.cecill-c; + license = lib.licenses.cecill-c; }; } diff --git a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index 706ee0686922..19ecfcc384de 100644 --- a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -1,14 +1,15 @@ { coq, mkCoqDerivation, mathcomp-ssreflect, mathcomp-fingroup, lib, version ? null }@args: -with lib; mkCoqDerivation { + +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "tarjan"; owner = "math-comp"; inherit version; - defaultVersion = with versions; - switch [ coq.version mathcomp-ssreflect.version ] [{ + defaultVersion = with lib.versions; + lib.switch [ coq.version mathcomp-ssreflect.version ] [{ cases = [ (range "8.10" "8.16") (isGe "1.12.0") ]; out = "1.0.0"; }] null; release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1"; @@ -17,6 +18,6 @@ with lib; mkCoqDerivation { meta = { description = "Proofs of Tarjan and Kosaraju connected components algorithms"; - license = licenses.cecill-b; + license = lib.licenses.cecill-b; }; } diff --git a/pkgs/development/coq-modules/mathcomp-word/default.nix b/pkgs/development/coq-modules/mathcomp-word/default.nix index 5f34434b50f9..090cc4567c3b 100644 --- a/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -1,6 +1,5 @@ { coq, mkCoqDerivation, mathcomp, lib, version ? null }: -with lib; mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "word"; @@ -15,13 +14,13 @@ mkCoqDerivation { release."1.0".sha256 = "sha256:0703m97rnivcbc7vvbd9rl2dxs6l8n52cbykynw61c6w9rhxspcg"; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.12" "8.16") (isGe "1.12") ]; out = "2.0"; } ] null; propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; - meta = { + meta = with lib; { description = "Yet Another Coq Library on Machine Words"; maintainers = [ maintainers.vbgl ]; license = licenses.mit; diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index 1ac1d928738b..86dd239ebf73 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -1,14 +1,14 @@ { lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-ssreflect, mathcomp-fingroup, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { namePrefix = [ "coq" "mathcomp" ]; pname = "zify"; repo = "mczify"; owner = "math-comp"; inherit version; - defaultVersion = with versions; - switch [ coq.coq-version mathcomp-algebra.version ] [ + defaultVersion = with lib.versions; + lib.switch [ coq.coq-version mathcomp-algebra.version ] [ { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; } ] null; @@ -19,6 +19,6 @@ with lib; mkCoqDerivation rec { meta = { description = "Micromega tactics for Mathematical Components"; - maintainers = with maintainers; [ cohencyril ]; + maintainers = with lib.maintainers; [ cohencyril ]; }; } diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 7be30844eb05..031536b7a6ef 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -18,7 +18,7 @@ let repo = "math-comp"; owner = "math-comp"; withDoc = single && (args.withDoc or false); - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = "1.15.0"; } { case = range "8.11" "8.15"; out = "1.14.0"; } { case = range "8.11" "8.15"; out = "1.13.0"; } @@ -50,7 +50,7 @@ let mathcomp_ = package: let mathcomp-deps = if package == "single" then [] - else map mathcomp_ (head (splitList (pred.equal package) packages)); + else map mathcomp_ (head (splitList (lib.pred.equal package) packages)); pkgpath = if package == "single" then "mathcomp" else "mathcomp/${package}"; pname = if package == "single" then "mathcomp" else "mathcomp-${package}"; pkgallMake = '' diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix index ab036add60bb..9a22d82dd400 100644 --- a/pkgs/development/coq-modules/metacoq/default.nix +++ b/pkgs/development/coq-modules/metacoq/default.nix @@ -5,7 +5,7 @@ with builtins // lib; let repo = "metacoq"; owner = "MetaCoq"; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with versions; lib.switch coq.coq-version [ { case = "8.11"; out = "1.0-beta2-8.11"; } { case = "8.12"; out = "1.0-beta2-8.12"; } # Do not provide 8.13 because it does not compile with equations 1.3 provided by default (only 1.2.3) @@ -34,7 +34,7 @@ let metacoq_ = package: let metacoq-deps = if package == "single" then [] - else map metacoq_ (head (splitList (pred.equal package) packages)); + else map metacoq_ (head (splitList (lib.pred.equal package) packages)); pkgpath = if package == "single" then "./" else "./${package}"; pname = if package == "all" then "metacoq" else "metacoq-${package}"; pkgallMake = '' diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix index 6072f9995c06..82d2a16f77ff 100644 --- a/pkgs/development/coq-modules/metalib/default.nix +++ b/pkgs/development/coq-modules/metalib/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "metalib"; owner = "plclub"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = "8.15"; } { case = range "8.10" "8.13"; out = "8.10"; } ] null; @@ -14,7 +14,7 @@ with lib; mkCoqDerivation { sourceRoot = "source/Metalib"; - meta = { + meta = with lib; { license = licenses.mit; maintainers = [ maintainers.jwiegley ]; }; diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index 57f4a381b204..19c6015ce928 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -1,6 +1,6 @@ { coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough, lib, version ? null, useDune ? false }@args: -with lib; mkCoqDerivation { + mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "multinomials"; @@ -8,7 +8,7 @@ with lib; mkCoqDerivation { owner = "math-comp"; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { 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"; } @@ -31,7 +31,7 @@ with lib; mkCoqDerivation { "1.0".sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; }; - useDuneifVersion = v: versions.isGe "1.5.3" v || v == "dev"; + useDuneifVersion = v: lib.versions.isGe "1.5.3" v || v == "dev"; preConfigure = '' patchShebangs configure || true @@ -42,7 +42,7 @@ with lib; mkCoqDerivation { meta = { description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; - license = licenses.cecill-c; + license = lib.licenses.cecill-c; }; } -// optionalAttrs (args?useDune) { inherit useDune; } +// lib.optionalAttrs (args?useDune) { inherit useDune; } diff --git a/pkgs/development/coq-modules/odd-order/default.nix b/pkgs/development/coq-modules/odd-order/default.nix index 066976e8b4b7..b6770aa633de 100644 --- a/pkgs/development/coq-modules/odd-order/default.nix +++ b/pkgs/development/coq-modules/odd-order/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, mathcomp, version ? null }: -with lib; mkCoqDerivation { pname = "odd-order"; @@ -11,7 +10,7 @@ mkCoqDerivation { releaseRev = v: "mathcomp-odd-order.${v}"; inherit version; - defaultVersion = with versions; switch mathcomp.character.version [ + defaultVersion = with lib.versions; lib.switch mathcomp.character.version [ { case = (range "1.13.0" "1.15.0"); out = "1.14.0"; } { case = (range "1.12.0" "1.14.0"); out = "1.13.0"; } { case = (range "1.10.0" "1.12.0"); out = "1.12.0"; } @@ -27,7 +26,7 @@ mkCoqDerivation { mathcomp.all ]; - meta = { + meta = with lib; { description = "Formal proof of the Odd Order Theorem"; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index 82b6079bb2da..e9163c16132c 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "paco"; owner = "snu-sf"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.12" "8.16"; out = "4.1.2"; } { case = range "8.9" "8.13"; out = "4.1.1"; } { case = range "8.6" "8.13"; out = "4.0.2"; } @@ -25,8 +25,8 @@ with lib; mkCoqDerivation { ''; meta = { - homepage = "http://plv.mpi-sws.org/paco/"; + homepage = "https://plv.mpi-sws.org/paco/"; description = "A Coq library implementing parameterized coinduction"; - maintainers = with maintainers; [ jwiegley ptival ]; + maintainers = with lib.maintainers; [ jwiegley ptival ]; }; } diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index e03f44320cf9..e6ef7b83c61a 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -1,13 +1,14 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "paramcoq"; inherit version; - defaultVersion = with versions; switch coq.version [ - { case = range "8.10" "8.16"; out = "1.1.3+coq${coq.coq-version}"; } + defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.10" "8.17"; 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.17".sha256 = "sha256-m8QGGuwj1lHzDprf4LHgAuzwfoblxtDIHunHBdpmiuM="; release."1.1.3+coq8.16".sha256 = "sha256-K7/8hXH6DwiW7Gw41sgQF8UDAO3c32xBGWQQapzG8Mo="; release."1.1.3+coq8.15".sha256 = "0sl7ihznwz05d2x2v78w1zd4q55c1sgy06vxasbcls4v2pkw53hl"; release."1.1.3+coq8.14".sha256 = "00zqq9dc2p5v0ib1jgizl25xkwxrs9mrlylvy0zvb96dpridjc71"; @@ -24,7 +25,7 @@ with lib; mkCoqDerivation { release."1.1.2+coq8.7".sha256 = "09n0ky7ldb24by7yf5j3hv410h85x50ksilf7qacl7xglj4gy5hj"; releaseRev = v: "v${v}"; mlPlugin = true; - meta = { + meta = with lib; { description = "Coq plugin for parametricity"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/parsec/default.nix b/pkgs/development/coq-modules/parsec/default.nix index f764267d77e0..8a30fbeb961a 100644 --- a/pkgs/development/coq-modules/parsec/default.nix +++ b/pkgs/development/coq-modules/parsec/default.nix @@ -1,6 +1,5 @@ { lib, mkCoqDerivation, coq, ceres, coq-ext-lib, version ? null }: -with lib; mkCoqDerivation { pname = "parsec"; @@ -11,14 +10,14 @@ mkCoqDerivation { releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = range "8.12" "8.16"; out = "0.1.1"; } { case = range "8.12" "8.13"; out = "0.1.0"; } ] null; release."0.1.1".sha256 = "sha256:1c0l18s68pzd4c8i3jimh2yz0pqm4g38pca4bm7fr18r8xmqf189"; release."0.1.0".sha256 = "sha256:01avfcqirz2b9wjzi9iywbhz9szybpnnj3672dgkfsimyg9jgnsr"; - meta = { + meta = with lib; { description = "Library for serialization to S-expressions"; license = licenses.bsd3; maintainers = with maintainers; [ Zimmi48 ]; diff --git a/pkgs/development/coq-modules/pocklington/default.nix b/pkgs/development/coq-modules/pocklington/default.nix index 111bffeca2c9..a9e0d43a5a7a 100644 --- a/pkgs/development/coq-modules/pocklington/default.nix +++ b/pkgs/development/coq-modules/pocklington/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "pocklington"; @@ -9,11 +8,11 @@ mkCoqDerivation { release."8.12.0".sha256 = "sha256-0xBrw9+4g14niYdNqp0nx00fPJoSSnaDSDEaIVpPfjs="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isGe "8.7"; out = "8.12.0"; } ] null; - meta = { + meta = with lib; { description = "Pocklington's criterion for primality in Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.mit; diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix index 2d83cbfd883f..44e938e16dbd 100644 --- a/pkgs/development/coq-modules/reglang/default.nix +++ b/pkgs/development/coq-modules/reglang/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, ssreflect, version ? null }: -with lib; mkCoqDerivation { pname = "reglang"; @@ -9,14 +8,14 @@ mkCoqDerivation { release."1.1.2".sha256 = "sha256-SEnMilLNxh6a3oiDNGLaBr8quQ/nO2T9Fwdf/1il2Yk="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "1.1.2"; } ] null; propagatedBuildInputs = [ ssreflect ]; - meta = { + meta = with lib; { description = "Regular Language Representations in Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/pkgs/development/coq-modules/relation-algebra/default.nix b/pkgs/development/coq-modules/relation-algebra/default.nix index d2124d56f3f5..c8fb6982b84e 100644 --- a/pkgs/development/coq-modules/relation-algebra/default.nix +++ b/pkgs/development/coq-modules/relation-algebra/default.nix @@ -1,12 +1,11 @@ { lib, mkCoqDerivation, coq, aac-tactics, mathcomp, version ? null }: -with lib; mkCoqDerivation { pname = "relation-algebra"; owner = "damien-pous"; releaseRev = v: - if versions.isGe "1.7.6" v + if lib.versions.isGe "1.7.6" v then "v.${v}" else "v${v}"; @@ -20,7 +19,7 @@ mkCoqDerivation { release."1.7.1".sha256 = "sha256-WWVMcR6z8rT4wzZPb8SlaVWGe7NC8gScPqawd7bltQA="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isEq "8.16"; out = "1.7.8"; } { case = isEq "8.15"; out = "1.7.7"; } { case = isEq "8.14"; out = "1.7.6"; } @@ -35,7 +34,7 @@ mkCoqDerivation { propagatedBuildInputs = [ aac-tactics mathcomp.ssreflect ]; - meta = { + meta = with lib; { description = "Relation algebra library for Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.gpl3Plus; diff --git a/pkgs/development/coq-modules/semantics/default.nix b/pkgs/development/coq-modules/semantics/default.nix index ecbef5b92fea..468be219d0d7 100644 --- a/pkgs/development/coq-modules/semantics/default.nix +++ b/pkgs/development/coq-modules/semantics/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { pname = "semantics"; @@ -15,7 +14,7 @@ mkCoqDerivation rec { release."8.6.0".sha256 = "sha256-GltkGQ3tJqUPAbdDkqqvKLLhMOap50XvGaCkjshiNdY="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "8.14.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } @@ -34,7 +33,7 @@ mkCoqDerivation rec { done ''; - meta = { + meta = with lib; { description = "A survey of programming language semantics styles in Coq"; longDescription = '' A survey of semantics styles in Coq, from natural semantics through diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index e3ec9bfdc39a..27641f4f5a99 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -17,7 +17,7 @@ in inherit version release; defaultVersion = with versions; - switch coq.version [ + lib.switch coq.version [ { case = isEq "8.16"; out = "8.16.0+0.16.0"; } { case = isEq "8.15"; out = "8.15.0+0.15.0"; } { case = isEq "8.14"; out = "8.14.0+0.14.0"; } diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index f9fe909d8caa..509ce57c5cff 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -1,11 +1,11 @@ { lib, callPackage, mkCoqDerivation, coq, coq-ext-lib, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "simple-io"; owner = "Lysxia"; repo = "coq-simple-io"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.16"; out = "1.7.0"; } { case = range "8.7" "8.13"; out = "1.3.0"; } ] null; @@ -21,7 +21,7 @@ with lib; mkCoqDerivation { passthru.tests.HelloWorld = callPackage ./test.nix {}; - meta = { + meta = with lib; { description = "Purely functional IO for Coq"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/simple-io/test.nix b/pkgs/development/coq-modules/simple-io/test.nix index 39db69d21a5f..255b25efde44 100644 --- a/pkgs/development/coq-modules/simple-io/test.nix +++ b/pkgs/development/coq-modules/simple-io/test.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { pname = "coq-simple-io-test"; inherit (simple-io) src version; - checkInputs = [ coq simple-io ]; + nativeCheckInputs = [ coq simple-io ]; dontConfigure = true; dontBuild = true; doCheck = true; diff --git a/pkgs/development/coq-modules/smpl/default.nix b/pkgs/development/coq-modules/smpl/default.nix index f03065cf0450..2ba755dd42d0 100644 --- a/pkgs/development/coq-modules/smpl/default.nix +++ b/pkgs/development/coq-modules/smpl/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "smpl"; @@ -13,7 +12,7 @@ mkCoqDerivation { releaseRev = v: "v${v}"; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = isEq "8.15"; out = "8.15"; } { case = isEq "8.14"; out = "8.14"; } { case = "8.13.2"; out = "8.13"; } @@ -23,7 +22,7 @@ mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { description = "A Coq plugin providing an extensible tactic similar to first"; maintainers = with maintainers; [ siraben ]; license = licenses.mit; diff --git a/pkgs/development/coq-modules/smtcoq/cvc4.nix b/pkgs/development/coq-modules/smtcoq/cvc4.nix index cbedf1658e4e..036feae5865c 100644 --- a/pkgs/development/coq-modules/smtcoq/cvc4.nix +++ b/pkgs/development/coq-modules/smtcoq/cvc4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cln, fetchurl, gmp, swig, pkg-config +{ lib, stdenv, cln, fetchurl, gmp, gnumake42, swig, pkg-config , libantlr3c, boost, autoreconfHook , python3 }: @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1iw793zsi48q91lxpf8xl8lnvv0jsj4whdad79rakywkm1gbs62w"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + # Build fails with GNUmake 4.4 + nativeBuildInputs = [ autoreconfHook gnumake42 pkg-config ]; buildInputs = [ gmp swig libantlr3c boost python3 ] ++ lib.optionals stdenv.isLinux [ cln ]; diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix index a09930a7c7cc..49c4348b9af5 100644 --- a/pkgs/development/coq-modules/smtcoq/default.nix +++ b/pkgs/development/coq-modules/smtcoq/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, gcc10StdenvCompat, pkgs, mkCoqDerivation, coq, trakt, veriT, zchaff, fetchurl, version ? null }: -with lib; let # version of veriT that works with SMTCoq @@ -23,15 +22,18 @@ mkCoqDerivation { release."2021-09-17".sha256 = "sha256-bF7ES+tXraaAJwVEwAMx3CUESpNlAUerQjr4d2eaGJQ="; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = isEq "8.13"; out = "2021-09-17"; } ] null; propagatedBuildInputs = [ trakt cvc4 veriT' zchaff ] ++ (with coq.ocamlPackages; [ num zarith ]); mlPlugin = true; - nativeBuildInputs = with coq.ocamlPackages; [ ocamlbuild ]; + nativeBuildInputs = (with pkgs; [ gnumake42 ]) ++ (with coq.ocamlPackages; [ ocamlbuild ]); - meta = { + # This is meant to ease future troubleshooting of cvc4 build failures + passthru = { inherit cvc4; }; + + meta = with lib; { description = "Communication between Coq and SAT/SMT solvers "; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 19b72c4e948c..d20b63732141 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "stdpp"; inherit version; domain = "gitlab.mpi-sws.org"; owner = "iris"; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "1.8.0"; } { case = range "8.12" "8.14"; out = "1.6.0"; } { case = range "8.11" "8.13"; out = "1.5.0"; } @@ -24,7 +24,7 @@ with lib; mkCoqDerivation rec { fi ''; - meta = { + meta = with lib; { description = "An extended “Standard Library” for Coq"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix index 79d3ce2d7a04..8ded1abeb146 100644 --- a/pkgs/development/coq-modules/tlc/default.nix +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; (mkCoqDerivation { +(mkCoqDerivation { pname = "tlc"; owner = "charguer"; inherit version; displayVersion = { tlc = false; }; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "20211215"; } { case = range "8.12" "8.13"; out = "20210316"; } { case = range "8.10" "8.12"; out = "20200328"; } @@ -16,14 +16,14 @@ with lib; (mkCoqDerivation { release."20200328".sha256 = "16vzild9gni8zhgb3qhmka47f8zagdh03k6nssif7drpim8233lx"; release."20181116".sha256 = "032lrbkxqm9d3fhf6nv1kq2z0mqd3czv3ijlbsjwnfh12xck4vpl"; - meta = { + meta = with lib; { homepage = "http://www.chargueraud.org/softs/tlc/"; description = "A non-constructive library for Coq"; license = licenses.free; maintainers = [ maintainers.vbgl ]; }; }).overrideAttrs (x: - if versionAtLeast x.version "20210316" + if lib.versionAtLeast x.version "20210316" then {} else { installFlags = [ "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib" ]; diff --git a/pkgs/development/coq-modules/topology/default.nix b/pkgs/development/coq-modules/topology/default.nix index eb94912307a7..de73fbadbf05 100644 --- a/pkgs/development/coq-modules/topology/default.nix +++ b/pkgs/development/coq-modules/topology/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, mathcomp, zorns-lemma, version ? null }: -with lib; mkCoqDerivation rec { pname = "topology"; @@ -15,8 +14,8 @@ mkCoqDerivation rec { release."8.6.0".sha256 = "sha256-eu/dBEFo3y6vnXlJljUD4hds6+qgAPQVvsuspyGHcj8="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.10"; out = "9.0.0"; } + defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.10" "8.16"; out = "9.0.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } { case = "8.7"; out = "8.7.0"; } @@ -25,9 +24,9 @@ mkCoqDerivation rec { propagatedBuildInputs = [ zorns-lemma ]; - useDuneifVersion = versions.isGe "9.0"; + useDuneifVersion = lib.versions.isGe "9.0"; - meta = { + meta = with lib; { description = "General topology in Coq"; longDescription = '' This library develops some of the basic concepts and results of diff --git a/pkgs/development/coq-modules/trakt/default.nix b/pkgs/development/coq-modules/trakt/default.nix index f10e69cc4e90..8bc7581489c3 100644 --- a/pkgs/development/coq-modules/trakt/default.nix +++ b/pkgs/development/coq-modules/trakt/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, coq-elpi, version ? null }: -with lib; mkCoqDerivation { pname = "trakt"; @@ -9,13 +8,13 @@ mkCoqDerivation { release."1.0".sha256 = "sha256-Qhw5fWFYxUFO2kIWWz/og+4fuy9aYG27szfNk3IglhY="; inherit version; - defaultVersion = with versions; switch [ coq.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version ] [ { cases = [ (range "8.13" "8.16") ]; out = "1.0"; } ] null; propagatedBuildInputs = [ coq-elpi ]; - meta = { + meta = with lib; { description = "A generic goal preprocessing tool for proof automation tactics in Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/pkgs/development/coq-modules/zorns-lemma/default.nix b/pkgs/development/coq-modules/zorns-lemma/default.nix index 10f238ae6c11..19696bd81d4f 100644 --- a/pkgs/development/coq-modules/zorns-lemma/default.nix +++ b/pkgs/development/coq-modules/zorns-lemma/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; (mkCoqDerivation { pname = "zorns-lemma"; @@ -16,8 +15,8 @@ with lib; release."8.5.0".sha256 = "sha256-mH/v02ObMjbVPYx2H+Jhz+Xp0XRKN67iMAdA1VNFzso="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.10"; out = "9.0.0"; } + defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.10" "8.16"; out = "9.0.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } { case = "8.7"; out = "8.7.0"; } @@ -25,9 +24,9 @@ with lib; { case = "8.5"; out = "8.5.0"; } ] null; - useDuneifVersion = versions.isGe "9.0"; + useDuneifVersion = lib.versions.isGe "9.0"; - meta = { + meta = with lib; { description = "Development of basic set theory"; longDescription = '' This Coq library develops some basic set theory. The main @@ -37,4 +36,4 @@ with lib; maintainers = with maintainers; [ siraben ]; license = licenses.lgpl21Plus; }; -}).overrideAttrs({version, ...}: if versions.isGe "9.0" version then { repo = "topology"; } else {}) +}).overrideAttrs({version, ...}: if lib.versions.isGe "9.0" version then { repo = "topology"; } else {}) diff --git a/pkgs/development/dotnet-modules/boogie-deps.nix b/pkgs/development/dotnet-modules/boogie-deps.nix index 251b82a8fe67..c0bd976200fa 100644 --- a/pkgs/development/dotnet-modules/boogie-deps.nix +++ b/pkgs/development/dotnet-modules/boogie-deps.nix @@ -1,3 +1,6 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.2.0"; sha256 = "07h1ylca2j7a4hznq4m4b8nrzv1lw7gcf848k2a3nbm6rapv61ki"; }) @@ -20,14 +23,51 @@ (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) (fetchNuGet { pname = "NUnit"; version = "3.12.0"; sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; }) (fetchNuGet { pname = "NUnit3TestAdapter"; version = "3.15.1"; sha256 = "1nhpvzxbxgymmkb3bd5ci40rg8k71bfx2ghbgc99znvnvhf2034y"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.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"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.1.0"; sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; }) (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.0.1"; sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; }) (fetchNuGet { pname = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (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.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 = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) (fetchNuGet { pname = "StyleCop.Analyzers"; version = "1.1.118"; sha256 = "0hj4ax64cay2lvrh9693m0g4pmis0fi5wpm12xwzvc7lkizvac0a"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) @@ -55,6 +95,7 @@ (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.0.0"; sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) @@ -75,10 +116,12 @@ (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; }) (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0"; sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) (fetchNuGet { pname = "System.Private.DataContractSerialization"; version = "4.1.1"; sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) (fetchNuGet { pname = "System.Reactive"; version = "4.4.1"; sha256 = "0gx8jh3hny2y5kijz5k9pxiqw481d013787c04zlhps21ygklw4a"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) @@ -110,6 +153,7 @@ (fetchNuGet { pname = "System.Runtime.Serialization.Json"; version = "4.0.2"; sha256 = "08ypbzs0sb302ga04ds5b2wxa2gg0q50zpa0nvc87ipjhs0v66dn"; }) (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.2.0"; sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; }) (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.0.0"; sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; }) @@ -119,6 +163,8 @@ (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) diff --git a/pkgs/development/dotnet-modules/python-language-server/default.nix b/pkgs/development/dotnet-modules/python-language-server/default.nix index a197f158bb6b..3044e884e3c6 100644 --- a/pkgs/development/dotnet-modules/python-language-server/default.nix +++ b/pkgs/development/dotnet-modules/python-language-server/default.nix @@ -26,8 +26,6 @@ buildDotnetModule rec { dotnet-sdk = dotnetCorePackages.sdk_3_1; dotnet-runtime = dotnetCorePackages.runtime_3_1; - dotnetRestoreFlags = [ "--runtime ${dotnet-sdk.systemToDotnetRid stdenvNoCC.targetPlatform.system}" ]; - nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib ]; runtimeDeps = [ openssl icu ]; diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix index 2f8d7d878a8e..eac0fcde53f6 100644 --- a/pkgs/development/em-modules/generic/default.nix +++ b/pkgs/development/em-modules/generic/default.nix @@ -1,12 +1,20 @@ { pkgs, lib, emscripten, python3 }: +argsFun: + +let + wrapDerivation = f: + pkgs.stdenv.mkDerivation (finalAttrs: + f (lib.toFunction argsFun finalAttrs) + ); +in +wrapDerivation ( { buildInputs ? [], nativeBuildInputs ? [] , enableParallelBuilding ? true , meta ? {}, ... } @ args: -pkgs.stdenv.mkDerivation ( args // { diff --git a/pkgs/development/embedded/arduino/arduino-cli/default.nix b/pkgs/development/embedded/arduino/arduino-cli/default.nix index 0dec3e9284ad..3fbeaab38739 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.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "arduino"; repo = pname; rev = version; - sha256 = "sha256-i6osx4j1YVAYaVVdEQ4ImfaIvXw5jPYmgpEYz6XGkY8="; + sha256 = "sha256-jew4KLpOOXE9N/h4qFqof8y26DQrvm78E/ARbbwocD4="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-NIqsYAnW9elprKWjqmNIsF452thuWT1i8YNPUuuwjVs="; + vendorSha256 = "sha256-BunonnjzGnpcmGJXxEQXvjJLGvdSXUOK9zAhXoAemHY="; doCheck = false; @@ -26,6 +26,7 @@ let meta = with lib; { inherit (src.meta) homepage; description = "Arduino from the command line"; + changelog = "https://github.com/arduino/arduino-cli/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ ryantm ]; }; diff --git a/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/pkgs/development/embedded/arduino/arduino-language-server/default.nix index 6ed310649368..da3d1e7e7c60 100644 --- a/pkgs/development/embedded/arduino/arduino-language-server/default.nix +++ b/pkgs/development/embedded/arduino/arduino-language-server/default.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "arduino-language-server"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitHub { owner = "arduino"; repo = "arduino-language-server"; - rev = version; - hash = "sha256-7xuVCD27gE8uDFBTQgBwH8bx8OWc9Lj71o27FYOSiTY="; + rev = "refs/tags/${version}"; + hash = "sha256-A5JcHdcSrRC1BxoJsPtLKBq1fu58SvwHm9hbgu8Uy5k="; }; subPackages = [ "." ]; - vendorHash = "sha256-Xa26ilo95sQ/6dGvl4gB2bb0vzWXr+WPKLezAnZPeqM="; + vendorHash = "sha256-SKqorfgesYE0kXR/Fm6gI7Me0CxtDeNsTRGYuGJW+vo="; doCheck = false; @@ -22,11 +26,14 @@ buildGoModule rec { "-w" "-X github.com/arduino/arduino-language-server/version.versionString=${version}" "-X github.com/arduino/arduino-language-server/version.commit=unknown" - ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; + ] ++ lib.optionals stdenv.isLinux [ + "-extldflags '-static'" + ]; meta = with lib; { - inherit (src.meta) homepage; description = "An Arduino Language Server based on Clangd to Arduino code autocompletion"; + homepage = "https://github.com/arduino/arduino-language-server"; + changelog = "https://github.com/arduino/arduino-language-server/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ BattleCh1cken ]; }; diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index a6ddb17f9280..fd54383f9efb 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -7,13 +7,13 @@ assert docSupport -> texLive != null && texinfo != null && texi2html != null; stdenv.mkDerivation rec { pname = "avrdude"; - version = "7.0"; + version = "7.1"; src = fetchFromGitHub { owner = "avrdudes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T8MKrvBvFF3WFwBMIN75vCOS0khliHQI+GGQvCk7T1o="; + sha256 = "sha256-pGjOefWnf11kG/zFGwYGet1OjAhKsULNGgh6vqvIQ7c="; }; nativeBuildInputs = [ cmake bison flex ]; diff --git a/pkgs/development/embedded/fpga/apio/default.nix b/pkgs/development/embedded/fpga/apio/default.nix index 3b5ad6012360..b201ca169d4d 100644 --- a/pkgs/development/embedded/fpga/apio/default.nix +++ b/pkgs/development/embedded/fpga/apio/default.nix @@ -60,7 +60,7 @@ buildPythonApplication rec { tinyprog # needed for upload to TinyFPGA ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/embedded/fpga/openfpgaloader/default.nix b/pkgs/development/embedded/fpga/openfpgaloader/default.nix index db97476dd692..b71e89f2de61 100644 --- a/pkgs/development/embedded/fpga/openfpgaloader/default.nix +++ b/pkgs/development/embedded/fpga/openfpgaloader/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "openfpgaloader"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "trabucayre"; repo = "openFPGALoader"; rev = "v${version}"; - sha256 = "sha256-CnJBmbvJ4FfKqdyoD8K94Eeoqly2Q6UV5wQ6EWv2isI="; + sha256 = "sha256-MPIFD7/jUEotY/EhuzNhaz8C3LVMxUr++fhtCpbbz0o="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/embedded/jtag-remote-server/default.nix b/pkgs/development/embedded/jtag-remote-server/default.nix index bcfba506a002..4a2c9c3df3d2 100644 --- a/pkgs/development/embedded/jtag-remote-server/default.nix +++ b/pkgs/development/embedded/jtag-remote-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jtag-remote-server"; - version = "unstable-2022-06-09"; + version = "1.2"; src = fetchFromGitHub { owner = "jiegec"; repo = pname; - rev = "917d8d298423ba1aa6e75aa92e009b7f27f74a57"; - hash = "sha256-Jy0OyRgn9SYpjP3HYWPvRirfxXk4/vMYvZuI3XpPtBw="; + rev = "v${version}"; + hash = "sha256-qtgO0BO2hvWi/E2RzGTTuQynKbh7/OLeoLcm60dqro8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/embedded/nmrpflash/default.nix b/pkgs/development/embedded/nmrpflash/default.nix index a05170b1bd80..76c8902f590a 100644 --- a/pkgs/development/embedded/nmrpflash/default.nix +++ b/pkgs/development/embedded/nmrpflash/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "nmrpflash"; - version = "0.9.18.2"; + version = "0.9.19"; src = fetchFromGitHub { owner = "jclehner"; repo = "nmrpflash"; rev = "v${version}"; - sha256 = "sha256-hKE9FEBkbN39zBRSoy3Ntq/fziizskJXNBcwQZX9igE="; + sha256 = "sha256-bXxJiIbMk8JG0nbWOgINUAb8zaGBN3XUdA3JZev4Igs="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/embedded/platformio/chrootenv.nix b/pkgs/development/embedded/platformio/chrootenv.nix index 75f9adf0d3e6..40aa42337413 100644 --- a/pkgs/development/embedded/platformio/chrootenv.nix +++ b/pkgs/development/embedded/platformio/chrootenv.nix @@ -38,7 +38,7 @@ buildFHSUserEnv { mkdir -p $out/lib/udev/rules.d ln -s $out/bin/platformio $out/bin/pio - ln -s ${src}/scripts/99-platformio-udev.rules $out/lib/udev/rules.d/99-platformio-udev.rules + ln -s ${src}/platformio/assets/system/99-platformio-udev.rules $out/lib/udev/rules.d/99-platformio-udev.rules ''; runScript = "platformio"; diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index bcbcbdcb2cac..61a09e047344 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -21,8 +21,9 @@ with python3.pkgs; buildPythonApplication rec { --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data.json}' substituteInPlace setup.py \ - --replace 'uvicorn==%s" % ("0.17.*"' 'uvicorn==%s" % ("0.18.*"' \ - --replace 'aiofiles==0.8.*' 'aiofiles==22.1.*' \ + --replace 'uvicorn==%s" % ("0.16.0" if PY36 else "0.19.*")' 'uvicorn>=0.16"' \ + --replace 'starlette==%s" % ("0.19.1" if PY36 else "0.21.*")' 'starlette>=0.19.1"' \ + --replace 'tabulate==%s" % ("0.8.10" if PY36 else "0.9.*")' 'tabulate>=0.8.10,<=0.9"' \ --replace 'wsproto==' 'wsproto>=' ''; @@ -53,7 +54,7 @@ with python3.pkgs; buildPythonApplication rec { export PATH=$PATH:$out/bin ''; - checkInputs = [ + nativeCheckInputs = [ jsondiff pytestCheckHook ]; diff --git a/pkgs/development/embedded/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix index e0443c080c32..6fd8592a12cf 100644 --- a/pkgs/development/embedded/platformio/default.nix +++ b/pkgs/development/embedded/platformio/default.nix @@ -3,14 +3,14 @@ let callPackage = newScope self; - version = "6.1.4"; + version = "6.1.6"; # 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 = "sha256-PLVsXnaflEZdn12lWrpnm8+uNfwB+T7JXnvjQihfuSs="; + sha256 = "sha256-BEeMfdmAWqFbQUu8YKKrookQVgmhfZBqXnzeb2gfhms="; }; self = { 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 1f809822cb58..6db8585a55f3 100644 --- a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch @@ -6,13 +6,13 @@ index 1e5f935a..26d1ac6a 100644 @staticmethod @memoized(expire="1h") def load_spdx_licenses(): -- version = "3.18" +- version = "3.19" - spdx_data_url = ( - "https://raw.githubusercontent.com/spdx/license-list-data/" - "v%s/json/licenses.json" % version - ) - return json.loads(fetch_remote_content(spdx_data_url)) -+ # version = "3.18" ++ # version = "3.19" + # spdx_data_url = ( + # "https://raw.githubusercontent.com/spdx/license-list-data/" + # "v%s/json/licenses.json" % version diff --git a/pkgs/development/embedded/svdtools/default.nix b/pkgs/development/embedded/svdtools/default.nix index e902d837c9d5..0da71d1de10d 100644 --- a/pkgs/development/embedded/svdtools/default.nix +++ b/pkgs/development/embedded/svdtools/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.2.7"; + version = "0.2.8"; src = fetchCrate { inherit version pname; - sha256 = "sha256-pRY9lL04BcZDYeFcdArIp2PcWiCZBurCYpYtYhPqFsg="; + sha256 = "sha256-x0C+1Ld4RImmS6x9l9jQaZ/sEd3iLFmmwOWNfA+xYsk="; }; - cargoSha256 = "sha256-9XymDE9ON11VfZObrMiARmpJay2g2mKEf0l2eojbjL8="; + cargoSha256 = "sha256-U1YiQdfk/SgRicAND0X8KdHKgX7wHnYspWNF270WDrE="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/pkgs/development/embedded/xc3sprog/default.nix b/pkgs/development/embedded/xc3sprog/default.nix index ead48a004720..393a11f8a448 100644 --- a/pkgs/development/embedded/xc3sprog/default.nix +++ b/pkgs/development/embedded/xc3sprog/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG"; - homepage = "http://xc3sprog.sourceforge.net/"; + homepage = "https://xc3sprog.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 1ea76cb237df..2bee41af042e 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = false; # Cannot find unit-test module from guile-lib - checkInputs = [ guile-lib ]; + nativeCheckInputs = [ guile-lib ]; meta = with lib; { homepage = "https://www.nongnu.org/guile-cairo/"; diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix index 606162ab94c0..d412c181e95c 100644 --- a/pkgs/development/guile-modules/guile-fibers/default.nix +++ b/pkgs/development/guile-modules/guile-fibers/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "guile-fibers"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "wingo"; repo = "fibers"; rev = "v${version}"; - hash = "sha256-jEY6i+uTqDkXZKdpK+/GRLlK7aJxkRneVZQJIE4bhlI="; + hash = "sha256-3q1mJImce96Dn37UbofaNHj54Uzs1p4XyMNzpu3PdXQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/development/guile-modules/guile-gcrypt/default.nix index 7c7e11e3d2b1..6b1af4048a7c 100644 --- a/pkgs/development/guile-modules/guile-gcrypt/default.nix +++ b/pkgs/development/guile-modules/guile-gcrypt/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "guile-gcrypt"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitea { domain = "notabug.org"; owner = "cwebber"; repo = "guile-gcrypt"; rev = "v${version}"; - sha256 = "sha256-lAaiKBOdTFWEWsmwKgx0C67ACvtnEKUxti66dslzSVQ="; + hash = "sha256-vbm31EsOJiMeTs2tu5KPXckxPcAQbi3/PGJ5EHCC5VQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/development/guile-modules/guile-json/default.nix index dee81f2baebd..81febc3171b7 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.7.2"; + version = "4.7.3"; src = fetchurl { url = "mirror://savannah/guile-json/${pname}-${version}.tar.gz"; - sha256 = "sha256-lCq37FtAhWeZwMqfuBkhrxf8Q2CuvvHMjLH2rZIg1Rk="; + sha256 = "sha256-OLoEjtKdEvBbMsWy+3pReVxEi0HkA6Kxty/wA1gX84g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index c4ec4904f9aa..0ae8424b597d 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "guile-sdl2"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { url = "https://files.dthompson.us/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-h0osCURnYTUQFrKw0i7Jd+QCI8piR1NUE2lbxPv87aQ="; + hash = "sha256-V/XrpFrqOxS5mAphtIt2e3ewflK+HdLFEqOmix98p+w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/guile-modules/guile-ssh/default.nix b/pkgs/development/guile-modules/guile-ssh/default.nix index 1fb97c7a2ae7..be082c373a2d 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.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "artyom-poptsov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3h4U/h6cVgHTJOyliw1gTYtgzQcatRLX6NrP87JXRc0="; + sha256 = "sha256-BDnLm5Q+69v8JbrfAn0+XMuWzRvCeUB/prfrKnvw5eY="; }; configureFlags = [ "--with-guilesitedir=\${out}/share/guile/site" ]; diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 752f1ba4943c..12afee84b156 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -71,7 +71,7 @@ $ ./maintainers/scripts/haskell/hydra-report.hs get-report $ ./maintainers/scripts/haskell/hydra-report.hs ping-maintainers ``` -The `hyda-report.hs ping-maintainers` command generates a Markdown document +The `hydra-report.hs ping-maintainers` command generates a Markdown document that you can paste in a GitHub comment on the PR opened above. This comment describes which Haskell packages are now failing to build. It also pings the maintainers so that they know to fix up their packages. diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index d503463858f7..8a42a0825aab 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2022-10-22"; + version = "unstable-2023-01-06"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/bf7cc8f202e332953f7fbfc1d90490e4c197d287.tar.gz"; - sha256 = "0fmpfl2nl215aids9yxdmdik77w7cppk900rnx23m07rmwg4xa4f"; + url = "https://github.com/NixOS/cabal2nix/archive/d24f4eab2352468510fb81e276aab9d62e94b561.tar.gz"; + sha256 = "16d3mf4d622gns1myx9mwx39sx0l9wndybxn5ik00x0pxnmh7f36"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 55bf787c2f41..548110cafc11 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -12,7 +12,7 @@ { pkgs, haskellLib }: let - inherit (pkgs) fetchpatch lib; + inherit (pkgs) fetchpatch fetchpatch2 lib; inherit (lib) throwIfNot versionOlder; in @@ -60,38 +60,12 @@ self: super: { ghc-datasize = disableLibraryProfiling super.ghc-datasize; ghc-vis = disableLibraryProfiling super.ghc-vis; - # Patch providing GHC9 compat, can be removed once the following gets released: - # > https://github.com/adinapoli/snaplet-purescript/pull/25 - snaplet-purescript = appendPatch (fetchpatch { - url = "https://github.com/adinapoli/snaplet-purescript/commit/4c7457d9357558524d4d19ff7c7f13f85b442539.patch"; - sha256 = "sha256-wpNvCO6txEvSv8LjQaaEIbBBPJnFaMpFx5ER8BT9lXo="; - }) super.snaplet-purescript; - # 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); - # Waiting on a release with the following for bumping base and - # attoparsec upper bounds: - # > https://github.com/snapframework/io-streams-haproxy/pull/21 - # > https://github.com/snapframework/io-streams-haproxy/pull/24 - io-streams-haproxy = doJailbreak super.io-streams-haproxy; - - # xmlhtml's test suite depends on hspec with an invalid boundry range for - # the version we currently track, even though the upper bound is relaxed on - # github it doesn't have a release yet; though there's an MR preparing the - # next release: - # > https://github.com/snapframework/xmlhtml/pull/40 - # Once that's out we can re-enable version checks. - xmlhtml = doJailbreak super.xmlhtml; - - # map-syntax has a restrictive upper bound on base, can be removed once - # > https://github.com/mightybyte/map-syntax/pull/14 - # is released. - map-syntax = doJailbreak super.map-syntax; - # 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; @@ -106,7 +80,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 = "14391vj0awvkpsd32kanmc85yic5mg4pxmjhiv7wjxy7ga13wfqw"; + sha256 = "052ld021yvjbnx1sbj1ryflsyn0v1y1ygx1zv0ql6fk3cysw5lxf"; # 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 @@ -132,32 +106,19 @@ self: super: { postPatch = "sed -i s/home/tmp/ test/Spec.hs"; }) super.shell-conduit; - # https://github.com/cachix/cachix/pull/451 - cachix = appendPatch ./patches/cachix.patch super.cachix; + cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] super.cachix; # https://github.com/froozen/kademlia/issues/2 kademlia = dontCheck super.kademlia; - # https://github.com/haskell-game/dear-imgui.hs/issues/116 - dear-imgui = doJailbreak super.dear-imgui; - # Tests require older versions of tasty. hzk = dontCheck super.hzk; resolv = doJailbreak super.resolv; - tdigest = doJailbreak super.tdigest; - text-short = doJailbreak super.text-short; - tree-diff = doJailbreak super.tree-diff; - zinza = doJailbreak super.zinza; - - # Too strict upper bound on base, no upstream issue tracker nor repository - mmsyn5 = doJailbreak super.mmsyn5; # Tests require a Kafka broker running locally haskakafka = dontCheck super.haskakafka; - bindings-levmar = overrideCabal (drv: { - extraLibraries = [ pkgs.blas ]; - }) super.bindings-levmar; + bindings-levmar = addExtraLibrary pkgs.blas super.bindings-levmar; # Requires wrapQtAppsHook qtah-cpp-qt5 = overrideCabal (drv: { @@ -170,20 +131,9 @@ self: super: { hoodle-core = dontHaddock super.hoodle-core; hsc3-db = dontHaddock super.hsc3-db; - # Pick patch from master for GHC 9.0 support - flat = assert versionOlder super.flat.version "0.5"; appendPatches [ - (fetchpatch { - name = "flat-ghc-9.0.patch"; - url = "https://github.com/Quid2/flat/commit/d32c2c0c0c3c38c41177684ade9febe92d279b06.patch"; - sha256 = "0ay0c53jpjmnnh7ylfpzpxqkhs1vq9jdwm9f84d40r88ki8hls8g"; - }) - ] super.flat; - - # Too strict bounds on base, optparse-applicative: https://github.com/edsko/friendly/issues/5 - friendly = doJailbreak super.friendly; - - # Too strict bound on hspec: https://github.com/ivan-m/graphviz/issues/55 - graphviz = doJailbreak super.graphviz; + # Fix build with time >= 1.10 while retaining compat with time < 1.9 + mbox = appendPatch ./patches/mbox-time-1.10.patch + (overrideCabal { editedCabalFile = null; revision = null; } super.mbox); # https://github.com/techtangents/ablist/issues/1 ABList = dontCheck super.ABList; @@ -235,7 +185,6 @@ self: super: { pocket-dns = dontCheck super.pocket-dns; postgresql-simple = dontCheck super.postgresql-simple; squeal-postgresql = dontCheck super.squeal-postgresql; - postgrest = dontCheck super.postgrest; postgrest-ws = dontCheck super.postgrest-ws; snowball = dontCheck super.snowball; sophia = dontCheck super.sophia; @@ -251,22 +200,18 @@ self: super: { # base bound digit = doJailbreak super.digit; - # matterhorn-50200.17.0 won't work with brick >= 0.71 + # matterhorn-50200.17.0 won't work with brick >= 0.71, brick-skylighting >= 1.0 matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: { brick = self.brick_0_70_1; + brick-skylighting = self.brick-skylighting_0_3; })); # 2020-06-05: HACK: does not pass own build suite - `dontCheck` - # 2022-06-17: Use hnix-store 0.5 until hnix 0.17 - hnix = self.generateOptparseApplicativeCompletions [ "hnix" ] (dontCheck ( - super.hnix.overrideScope (hself: hsuper: { - hnix-store-core = hself.hnix-store-core_0_5_0_0; - hnix-store-remote = hself.hnix-store-remote_0_5_0_0; - }) - )); - # Too strict bounds on algebraic-graphs + # 2022-11-24: jailbreak as it has too strict bounds on a bunch of things + hnix = self.generateOptparseApplicativeCompletions [ "hnix" ] (dontCheck (doJailbreak super.hnix)); + # Too strict bounds on algebraic-graphs and bytestring # https://github.com/haskell-nix/hnix-store/issues/180 - hnix-store-core_0_5_0_0 = doJailbreak super.hnix-store-core_0_5_0_0; + hnix-store-core = doJailbreak super.hnix-store-core; # Fails for non-obvious reasons while attempting to use doctest. focuslist = dontCheck super.focuslist; @@ -289,7 +234,6 @@ self: super: { aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw binary-search = dontCheck super.binary-search; - bits = dontCheck super.bits; # http://hydra.cryp.to/build/500239/log/raw bloodhound = dontCheck super.bloodhound; # https://github.com/plow-technologies/quickcheck-arbitrary-template/issues/10 buildwrapper = dontCheck super.buildwrapper; burst-detection = dontCheck super.burst-detection; # http://hydra.cryp.to/build/496948/log/raw @@ -319,11 +263,9 @@ self: super: { fb = dontCheck super.fb; # needs credentials for Facebook fptest = dontCheck super.fptest; # http://hydra.cryp.to/build/499124/log/raw friday-juicypixels = dontCheck super.friday-juicypixels; #tarball missing test/rgba8.png - ghc-events = dontCheck super.ghc-events; # http://hydra.cryp.to/build/498226/log/raw ghc-events-parallel = dontCheck super.ghc-events-parallel; # http://hydra.cryp.to/build/496828/log/raw ghc-imported-from = dontCheck super.ghc-imported-from; ghc-parmake = dontCheck super.ghc-parmake; - ghcid = dontCheck super.ghcid; git-vogue = dontCheck super.git-vogue; github-rest = dontCheck super.github-rest; # test suite needs the network gitlib-cmdline = dontCheck super.gitlib-cmdline; @@ -442,16 +384,9 @@ self: super: { # https://github.com/bos/snappy/issues/1 snappy = dontCheck super.snappy; - # https://ghc.haskell.org/trac/ghc/ticket/9625 - vty = dontCheck super.vty; - # https://github.com/vincenthz/hs-crypto-pubkey/issues/20 crypto-pubkey = dontCheck super.crypto-pubkey; - # Test suite works with aeson 2.0 only starting with 0.14.1 - vinyl = assert versionOlder super.vinyl.version "0.14.1"; - dontCheck super.vinyl; - # https://github.com/Philonous/xml-picklers/issues/5 xml-picklers = dontCheck super.xml-picklers; @@ -459,14 +394,11 @@ self: super: { stm-delay = dontCheck super.stm-delay; # https://github.com/pixbi/duplo/issues/25 - duplo = dontCheck super.duplo; + duplo = doJailbreak super.duplo; # https://github.com/evanrinehart/mikmod/issues/1 mikmod = addExtraLibrary pkgs.libmikmod super.mikmod; - # https://github.com/basvandijk/threads/issues/10 - threads = dontCheck super.threads; - # Missing module. rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5 rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6 @@ -500,23 +432,8 @@ self: super: { # https://github.com/junjihashimoto/test-sandbox-compose/issues/2 test-sandbox-compose = dontCheck super.test-sandbox-compose; - # Waiting on language-python 0.5.8 https://github.com/bjpop/language-python/issues/60 - xcffib = dontCheck super.xcffib; - - # https://github.com/afcowie/locators/issues/1 - locators = dontCheck super.locators; - # Test suite won't compile against tasty-hunit 0.10.x. - binary-parser = dontCheck super.binary-parser; binary-parsers = dontCheck super.binary-parsers; - bytestring-strict-builder = dontCheck super.bytestring-strict-builder; - bytestring-tree-builder = dontCheck super.bytestring-tree-builder; - - # https://github.com/byteverse/bytebuild/issues/19 - bytebuild = dontCheck super.bytebuild; - - # https://github.com/andrewthad/haskell-ip/issues/67 - ip = dontCheck super.ip; # https://github.com/ndmitchell/shake/issues/804 shake = dontCheck super.shake; @@ -532,17 +449,15 @@ self: super: { # # # Depends on itself for testing # doctest-discover = addBuildTool super.doctest-discover - # (if pkgs.buildPlatform != pkgs.hostPlatform + # (if pkgs.stdenv.buildPlatform != pkgs.stdenv.hostPlatform # then self.buildHaskellPackages.doctest-discover # else dontCheck super.doctest-discover); doctest-discover = dontCheck super.doctest-discover; - tasty-discover = overrideCabal (drv: { - # Depends on itself for testing - preBuild = '' - export PATH="$PWD/dist/build/tasty-discover:$PATH" - '' + (drv.preBuild or ""); - }) super.tasty-discover; + # Test suite is missing an import from hspec + # https://github.com/haskell-works/tasty-discover/issues/9 + # https://github.com/commercialhaskell/stackage/issues/6584#issuecomment-1326522815 + tasty-discover = assert super.tasty-discover.version == "4.2.2"; dontCheck super.tasty-discover; # Known issue with nondeterministic test suite failure # https://github.com/nomeata/tasty-expected-failure/issues/21 @@ -560,6 +475,15 @@ self: super: { # https://github.com/kkardzis/curlhs/issues/6 curlhs = dontCheck super.curlhs; + # curl 7.87.0 introduces a preprocessor typechecker of sorts which fails on + # incorrect usages of curl_easy_getopt and similar functions. Presumably + # because the wrappers in curlc.c don't use static values for the different + # arguments to curl_easy_getinfo, it complains and needs to be disabled. + # https://github.com/GaloisInc/curl/issues/28 + curl = appendConfigureFlags [ + "--ghc-option=-DCURL_DISABLE_TYPECHECK" + ] super.curl; + # https://github.com/hvr/token-bucket/issues/3 token-bucket = dontCheck super.token-bucket; @@ -569,12 +493,6 @@ self: super: { # FPCO's fork of Cabal won't succeed its test suite. Cabal-ide-backend = dontCheck super.Cabal-ide-backend; - # QuickCheck version, also set in cabal2nix - websockets = dontCheck super.websockets; - - # Avoid spurious test suite failures. - fft = dontCheck super.fft; - # This package can't be built on non-Windows systems. Win32 = overrideCabal (drv: { broken = !pkgs.stdenv.isCygwin; }) super.Win32; inline-c-win32 = dontDistribute super.inline-c-win32; @@ -673,17 +591,27 @@ self: super: { doCheck = false; # https://github.com/chrisdone/hindent/issues/299 }) super.hindent); - # https://github.com/bos/configurator/issues/22 - configurator = dontCheck super.configurator; - # https://github.com/basvandijk/concurrent-extra/issues/12 concurrent-extra = dontCheck super.concurrent-extra; - # https://github.com/bos/bloomfilter/issues/7 - bloomfilter = appendPatch ./patches/bloomfilter-fix-on-32bit.patch super.bloomfilter; - - # https://github.com/ashutoshrishi/hunspell-hs/pull/3 - hunspell-hs = addPkgconfigDepend pkgs.hunspell (dontCheck (appendPatch ./patches/hunspell.patch super.hunspell-hs)); + bloomfilter = appendPatches [ + # https://github.com/bos/bloomfilter/issues/7 + ./patches/bloomfilter-fix-on-32bit.patch + # Fix build with GHC >= 9.2 by using stock unsafeShift* functions + # https://github.com/bos/bloomfilter/pull/20 + (pkgs.fetchpatch { + name = "bloomfilter-ghc-9.2-shift.patch"; + url = "https://github.com/bos/bloomfilter/pull/20/commits/fb79b39c44404fd791a3bed973e9d844fb084f1e.patch"; + sha256 = "0clmr5iar4mhp8nbgh1c1rh4fl7dy0g2kbqqh0af8aqmhjpqzrq3"; + }) + ] (overrideCabal (drv: { + # Make sure GHC 9.2 patch applies correctly + revision = null; + editedCabalFile = null; + prePatch = drv.prePatch or "" + '' + "${pkgs.buildPackages.dos2unix}/bin/dos2unix" *.cabal + ''; + }) super.bloomfilter); # https://github.com/pxqr/base32-bytestring/issues/4 base32-bytestring = dontCheck super.base32-bytestring; @@ -726,12 +654,19 @@ self: super: { }) newer; # * The standard libraries are compiled separately. - # * We need multiple patches from master to fix compilation with + # * We need a patch from master to fix compilation with # updated dependencies (haskeline and megaparsec) which can be - # removed when the next idris release (1.3.4 probably) comes - # around. + # removed when the next idris release comes around. idris = self.generateOptparseApplicativeCompletions [ "idris" ] - (doJailbreak (dontCheck super.idris)); + (appendPatch (fetchpatch { + name = "idris-libffi-0.2.patch"; + url = "https://github.com/idris-lang/Idris-dev/commit/6d6017f906c5aa95594dba0fd75e7a512f87883a.patch"; + hash = "sha256-wyLjqCyLh5quHMOwLM5/XjlhylVC7UuahAM79D8+uls="; + }) (doJailbreak (dontCheck super.idris))); + + # Too strict bound on hspec + # https://github.com/lspitzner/multistate/issues/9#issuecomment-1367853016 + multistate = doJailbreak super.multistate; # https://github.com/pontarius/pontarius-xmpp/issues/105 pontarius-xmpp = dontCheck super.pontarius-xmpp; @@ -746,9 +681,6 @@ self: super: { # note: the library is unmaintained, no upstream issue dataenc = doJailbreak super.dataenc; - # https://github.com/divipp/ActiveHs-misc/issues/10 - data-pprint = doJailbreak super.data-pprint; - # horribly outdated (X11 interface changed a lot) sindre = markBroken super.sindre; @@ -758,9 +690,6 @@ self: super: { # https://github.com/mulby/diff-parse/issues/9 diff-parse = doJailbreak super.diff-parse; - # https://github.com/josefs/STMonadTrans/issues/4 - STMonadTrans = dontCheck super.STMonadTrans; - # No upstream issue tracker hspec-expectations-pretty-diff = dontCheck super.hspec-expectations-pretty-diff; @@ -768,27 +697,17 @@ self: super: { # QuickCheck to versions ">=2.3 && <2.9". system-filepath = dontCheck super.system-filepath; - # https://github.com/hvr/uuid/issues/28 - uuid-types = doJailbreak super.uuid-types; - uuid = doJailbreak super.uuid; - # The tests spuriously fail libmpd = dontCheck super.libmpd; - # https://github.com/diagrams/diagrams-braille/issues/1 - diagrams-braille = doJailbreak super.diagrams-braille; - # https://github.com/xu-hao/namespace/issues/1 namespace = doJailbreak super.namespace; - # https://github.com/diagrams/diagrams-solve/issues/4 - diagrams-solve = dontCheck super.diagrams-solve; - # https://github.com/danidiaz/streaming-eversion/issues/1 streaming-eversion = dontCheck super.streaming-eversion; # https://github.com/danidiaz/tailfile-hinotify/issues/2 - tailfile-hinotify = dontCheck super.tailfile-hinotify; + tailfile-hinotify = doJailbreak (dontCheck super.tailfile-hinotify); # Test suite fails: https://github.com/lymar/hastache/issues/46. # Don't install internal mkReadme tool. @@ -800,16 +719,10 @@ self: super: { # Has a dependency on outdated versions of directory. cautious-file = doJailbreak (dontCheck super.cautious-file); - # test suite does not compile with recent versions of QuickCheck - integer-logarithms = dontCheck (super.integer-logarithms); - # missing dependencies: blaze-html >=0.5 && <0.9, blaze-markup >=0.5 && <0.8 digestive-functors-blaze = doJailbreak super.digestive-functors-blaze; digestive-functors = doJailbreak super.digestive-functors; - # https://github.com/takano-akio/filelock/issues/5 - filelock = dontCheck super.filelock; - # Wrap the generated binaries to include their run-time dependencies in # $PATH. Also, cryptol needs a version of sbl that's newer than what we have # in LTS-13.x. @@ -834,9 +747,9 @@ self: super: { testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ]; testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ]; }) (super.sensei.override { - hspec = self.hspec_2_10_6; + hspec = self.hspec_2_10_8; hspec-wai = super.hspec-wai.override { - hspec = self.hspec_2_10_6; + hspec = self.hspec_2_10_8; }; }); @@ -861,52 +774,15 @@ self: super: { # Needs QuickCheck <2.10, which we don't have. edit-distance = doJailbreak super.edit-distance; - blaze-html = doJailbreak super.blaze-html; int-cast = doJailbreak super.int-cast; # Needs QuickCheck <2.10, HUnit <1.6 and base <4.10 pointfree = doJailbreak super.pointfree; - # The project is stale - # - # Archiving request: https://github.com/haskell-hvr/cryptohash-sha512/issues/6 - # - # doJailbreak since base <4.12 && bytestring <0.11 - # Request to support: - # https://github.com/haskell-hvr/cryptohash-sha512/issues/4 - # PRs to support base <4.12: - # https://github.com/haskell-hvr/cryptohash-sha512/pull/3 - # https://github.com/haskell-hvr/cryptohash-sha512/pull/5 - # - # dontCheck since test suite does not support new `base16-bytestring` >= 1 format - # https://github.com/haskell-hvr/cryptohash-sha512/pull/5#issuecomment-752796913 - cryptohash-sha512 = dontCheck (doJailbreak super.cryptohash-sha512); - - # https://github.com/haskell-hvr/cryptohash-sha256/issues/11 - # Jailbreak is necessary to break out of tasty < 1.x dependency. - # hackage2nix generates this as a broken package due to the (fake) dependency - # missing from hackage, so we need to fix the meta attribute set. - cryptohash-sha256 = overrideCabal (drv: { - jailbreak = true; - broken = false; - hydraPlatforms = lib.platforms.all; - }) super.cryptohash-sha256; - - # The test suite has all kinds of out-dated dependencies, so it feels easier - # to just disable it. - cryptohash-sha1 = dontCheck super.cryptohash-sha1; - cryptohash-md5 = dontCheck super.cryptohash-md5; - # Needs tasty-quickcheck ==0.8.*, which we don't have. gitHUD = dontCheck super.gitHUD; githud = dontCheck super.githud; - # https://github.com/aisamanra/config-ini/issues/12 - config-ini = dontCheck super.config-ini; - - # doctest >=0.9 && <0.12 - path = dontCheck super.path; - # Test suite fails due to trying to create directories path-io = dontCheck super.path-io; @@ -920,14 +796,7 @@ self: super: { # https://github.com/alphaHeavy/protobuf/issues/34 protobuf = dontCheck super.protobuf; - # Is this package still maintained? https://github.com/haskell/text-icu/issues/30 - text-icu = overrideCabal (drv: { - doCheck = false; # https://github.com/bos/text-icu/issues/32 - configureFlags = ["--ghc-option=-DU_DEFINE_FALSE_AND_TRUE=1"]; # https://github.com/haskell/text-icu/issues/49 - }) super.text-icu; - # jailbreak tasty < 1.2 until servant-docs > 0.11.3 is on hackage. - servant-docs = doJailbreak super.servant-docs; snap-templates = doJailbreak super.snap-templates; # https://github.com/snapframework/snap-templates/issues/22 # Copy hledger man pages from data directory into the proper place. This code @@ -988,7 +857,8 @@ self: super: { # Compiles some C or C++ source which requires these headers VulkanMemoryAllocator = addExtraLibrary pkgs.vulkan-headers super.VulkanMemoryAllocator; - vulkan-utils = addExtraLibrary pkgs.vulkan-headers super.vulkan-utils; + # dontCheck can be removed on the next package set bump + vulkan-utils = dontCheck (addExtraLibrary pkgs.vulkan-headers super.vulkan-utils); # https://github.com/dmwit/encoding/pull/3 encoding = doJailbreak (appendPatch ./patches/encoding-Cabal-2.0.patch super.encoding); @@ -996,13 +866,6 @@ self: super: { # Work around overspecified constraint on github ==0.18. github-backup = doJailbreak super.github-backup; - # https://github.com/andrewthad/chronos/issues/62 - # doctests are failing on newer GHC versions - chronos = dontCheck super.chronos; - - # Test suite depends on cabal-install - doctest = dontCheck super.doctest; - # dontCheck: https://github.com/haskell-servant/servant-auth/issues/113 # doJailbreak: waiting on revision 1 to hit hackage servant-auth-client = doJailbreak (dontCheck super.servant-auth-client); @@ -1014,33 +877,32 @@ self: super: { # https://github.com/commercialhaskell/stackage/issues/5795 # This issue can be mitigated with 'dontCheck' which skips the tests and their compilation. dhall-json = self.generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (dontCheck super.dhall-json); - dhall-nix = self.generateOptparseApplicativeCompletions [ "dhall-to-nix" ] super.dhall-nix; + dhall-nix = self.generateOptparseApplicativeCompletions [ "dhall-to-nix" ] + (overrideCabal (drv: { + patches = [ + # Compatibility with hnix 0.16, waiting for release + # https://github.com/dhall-lang/dhall-haskell/pull/2474 + (pkgs.fetchpatch { + name = "dhall-nix-hnix-0.16.patch"; + url = "https://github.com/dhall-lang/dhall-haskell/commit/49b9b3e3ce1718a89773c2b1bfa3c2af1a6e8752.patch"; + sha256 = "12sh5md81nlhyzzkmf7jrll3w1rvg2j48m57hfyvjn8has9c4gw6"; + stripLen = 1; + includes = [ "dhall-nix.cabal" "src/Dhall/Nix.hs" ]; + }) + ] ++ drv.patches or []; + prePatch = drv.prePatch or "" + '' + ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal + ''; + }) super.dhall-nix); dhall-yaml = self.generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml; - dhall-nixpkgs = self.generateOptparseApplicativeCompletions [ "dhall-to-nixpkgs" ] super.dhall-nixpkgs; + dhall-nixpkgs = self.generateOptparseApplicativeCompletions [ "dhall-to-nixpkgs" ] + (overrideCabal (drv: { + # Allow hnix 0.16, needs unreleased bounds change + # https://github.com/dhall-lang/dhall-haskell/pull/2474 + jailbreak = assert drv.version == "1.0.9" && drv.revision == "1"; true; + }) super.dhall-nixpkgs); - # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558 - netrc = doJailbreak super.netrc; - - # https://github.com/haskell-hvr/hgettext/issues/14 - hgettext = doJailbreak super.hgettext; - - stack = - self.generateOptparseApplicativeCompletions [ "stack" ] - # stack has a bunch of constraints in its .cabal file that don't seem to be necessary - (doJailbreak - (super.stack.overrideScope (self: super: { - # Needs Cabal-3.6 - Cabal = self.Cabal_3_6_3_0; - # Official stack ships with hpack-0.35.0. Nixpkgs uses the same - # version of hpack so that users who get stack from Nixpkgs - # generate the same .cabal files as users who download official binaries - # of stack. - # - # dontCheck is used because one of the hpack tests appears to be - # incorrectly(?) failing: - # https://github.com/sol/hpack/issues/528 - hpack = dontCheck self.hpack_0_35_0; - }))); + stack = self.generateOptparseApplicativeCompletions [ "stack" ] super.stack; # Too strict version bound on hashable-time. # Tests require newer package version. @@ -1050,6 +912,14 @@ self: super: { # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time; + # Workaround for https://github.com/sol/hpack/issues/528 + # The hpack test suite can't deal with the CRLF line endings hackage revisions insert + hpack = overrideCabal (drv: { + postPatch = drv.postPatch or "" + '' + "${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix" *.cabal + ''; + }) super.hpack; + # hslua has tests that appear to break when using musl. # https://github.com/hslua/hslua/issues/106 # Note that hslua is currently version 1.3. However, in the latest version @@ -1059,7 +929,6 @@ self: super: { # The test suite runs for 20+ minutes on a very fast machine, which feels kinda disproportionate. prettyprinter = dontCheck super.prettyprinter; - brittany = doJailbreak (dontCheck super.brittany); # Outdated upperbound on ghc-exactprint: https://github.com/lspitzner/brittany/issues/342 # Fix with Cabal 2.2, https://github.com/guillaume-nargeot/hpc-coveralls/pull/73 hpc-coveralls = appendPatch (fetchpatch { @@ -1080,13 +949,6 @@ self: super: { # Generate shell completion for spago spago = self.generateOptparseApplicativeCompletions [ "spago" ] super.spago; - # 2020-06-05: HACK: Package can not pass test suite, - # Upstream Report: https://github.com/kcsongor/generic-lens/issues/83 - generic-lens = dontCheck super.generic-lens; - - # https://github.com/danfran/cabal-macosx/issues/13 - cabal-macosx = dontCheck super.cabal-macosx; - # https://github.com/DanielG/cabal-helper/pull/123 cabal-helper = doJailbreak super.cabal-helper; @@ -1103,10 +965,6 @@ self: super: { # https://github.com/mgajda/json-autotype/issues/25 json-autotype = dontCheck super.json-autotype; - # Requires dlist <0.9 but it works fine with dlist-1.0 - # https://github.com/haskell-beam/beam/issues/581 - beam-core = doJailbreak super.beam-core; - # Requires pg_ctl command during tests beam-postgres = overrideCabal (drv: { # https://github.com/NixOS/nixpkgs/issues/198495 @@ -1125,6 +983,8 @@ self: super: { # Fix build with attr-2.4.48 (see #53716) xattr = appendPatch ./patches/xattr-fix-build.patch super.xattr; + patch = dontCheck super.patch; + esqueleto = overrideCabal (drv: { @@ -1174,9 +1034,6 @@ self: super: { # https://github.com/erikd/hjsmin/issues/32 hjsmin = dontCheck super.hjsmin; - # upstream issue: https://github.com/vmchale/atspkg/issues/12 - language-ats = dontCheck super.language-ats; - # Remove for hail > 0.2.0.0 hail = overrideCabal (drv: { patches = [ @@ -1198,9 +1055,6 @@ self: super: { # https://github.com/kazu-yamamoto/dns/issues/150 dns = dontCheck super.dns; - # https://github.com/haskell-servant/servant-blaze/issues/17 - servant-blaze = doJailbreak super.servant-blaze; - # https://github.com/haskell-servant/servant-ekg/issues/15 servant-ekg = doJailbreak super.servant-ekg; @@ -1232,9 +1086,6 @@ self: super: { # 2021-10-04: too strict upper bound on Hakyll hakyll-filestore = doJailbreak super.hakyll-filestore; - # 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71 - nixfmt = doJailbreak super.nixfmt; - # The test suite depends on an impure cabal-install installation in # $HOME, which we don't have in our build sandbox. # 2022-08-31: Jailbreak is done to allow aeson 2.0.*: @@ -1251,18 +1102,15 @@ self: super: { ); # 2022-03-12: Pick patches from master for compat with Stackage Nightly + # 2022-12-07: Lift bounds to allow dependencies shipped with LTS-20 + # https://github.com/jgm/gitit/pull/683 gitit = appendPatches [ - (fetchpatch { - name = "gitit-allow-pandoc-2.17.patch"; - url = "https://github.com/jgm/gitit/commit/9eddd1d3bde46bccb23c6d21e15b289f2a9ebe66.patch"; - sha256 = "09ahvwyaqzqaa9gnpbffncs9574d20mfy30zz2ww67cmm8f2a8iv"; - }) (fetchpatch { name = "gitit-fix-build-with-hoauth2-2.3.0.patch"; url = "https://github.com/jgm/gitit/commit/fd534c0155eef1790500c834e612ab22cf9b67b6.patch"; sha256 = "0hmlqkavn8hr0b4y4hxs1yyg0r79ylkzhzwy1dzbb3a2q86ydd2f"; }) - ] super.gitit; + ] (doJailbreak super.gitit); # Test suite requires database persistent-mysql = dontCheck super.persistent-mysql; @@ -1288,26 +1136,6 @@ self: super: { }) super.persistent-postgresql; - # Fix EdisonAPI and EdisonCore for GHC 8.8: - # https://github.com/robdockins/edison/pull/16 - EdisonAPI = appendPatch (fetchpatch { - url = "https://github.com/robdockins/edison/pull/16/commits/8da6c0f7d8666766e2f0693425c347c0adb492dc.patch"; - postFetch = '' - ${pkgs.buildPackages.patchutils}/bin/filterdiff --include='a/edison-api/*' --strip=1 "$out" > "$tmpfile" - mv "$tmpfile" "$out" - ''; - sha256 = "0yi5pz039lcm4pl9xnl6krqxyqq5rgb5b6m09w0sfy06x0n4x213"; - }) super.EdisonAPI; - - EdisonCore = appendPatch (fetchpatch { - url = "https://github.com/robdockins/edison/pull/16/commits/8da6c0f7d8666766e2f0693425c347c0adb492dc.patch"; - postFetch = '' - ${pkgs.buildPackages.patchutils}/bin/filterdiff --include='a/edison-core/*' --strip=1 "$out" > "$tmpfile" - mv "$tmpfile" "$out" - ''; - sha256 = "097wqn8hxsr50b9mhndg5pjim5jma2ym4ylpibakmmb5m98n17zp"; - }) super.EdisonCore; - # 2021-12-26: Too strict bounds on doctest polysemy-plugin = doJailbreak super.polysemy-plugin; @@ -1315,9 +1143,6 @@ self: super: { # upstream: https://github.com/obsidiansystems/which/pull/6 which = doJailbreak super.which; - # https://github.com/ocharles/weeder/issues/15 - weeder = doJailbreak super.weeder; - # 2022-09-20: We have overridden lsp to not be the stackage version. # dhall-lsp-server needs the older 1.4.0.0 lsp dhall-lsp-server = super.dhall-lsp-server.override { @@ -1326,32 +1151,40 @@ self: super: { }); }; - # Requested version bump on upstream https://github.com/obsidiansystems/constraints-extras/issues/32 - constraints-extras = doJailbreak super.constraints-extras; + jsaddle-webkit2gtk = overrideCabal (old: { + postPatch = old.postPatch or "" + '' + sed -i 's/bytestring.*0.11/bytestring/' jsaddle-webkit2gtk.cabal + ''; + }) super.jsaddle-webkit2gtk; - # Necessary for stack - # x509-validation test suite hangs: upstream https://github.com/vincenthz/hs-certificate/issues/120 - # tls test suite fails: upstream https://github.com/vincenthz/hs-tls/issues/434 - x509-validation = dontCheck super.x509-validation; - tls = dontCheck super.tls; # 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19 jsaddle-dom = overrideCabal (old: { postPatch = old.postPatch or "" + '' sed -i 's/lens.*4.20/lens/' jsaddle-dom.cabal ''; - }) super.jsaddle-dom; + }) (doJailbreak super.jsaddle-dom); # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 # 2022-03-16: Pullrequest for ghc 9 compat https://github.com/reflex-frp/reflex-dom/pull/433 - reflex-dom-core = doDistribute (unmarkBroken (dontCheck - (appendPatch + reflex-dom-core = overrideCabal (old: { + postPatch = old.postPatch or "" + '' + sed -i 's/template-haskell.*2.17/template-haskell/' reflex-dom-core.cabal + ''; + }) + ((appendPatches [ (fetchpatch { - url = "https://github.com/reflex-frp/reflex-dom/compare/a0459deafd296656b3e99db01ea7f65b89b0948c...56fa8a484ccfc7d3365d07fea3caa430155dbcac.patch"; - sha256 = "sha256-azMF3uX7S1rKKRAVjY+xP2XbQKHvEY/9nU7cH81KKPA="; + url = "https://github.com/reflex-frp/reflex-dom/commit/1814640a14c6c30b1b2299e74d08fb6fcaadfb94.patch"; + sha256 = "sha256-QyX2MLd7Tk0M1s0DU0UV3szXs8ngz775i3+KI62Q3B8="; relative = "reflex-dom-core"; }) - super.reflex-dom-core))); + (fetchpatch { + url = "https://github.com/reflex-frp/reflex-dom/commit/56fa8a484ccfc7d3365d07fea3caa430155dbcac.patch"; + sha256 = "sha256-IogAYJZac17Bg99ZnnFX/7I44DAnHo2PRBWD0iVHbNA="; + relative = "reflex-dom-core"; + }) + ] + (doDistribute (unmarkBroken (dontCheck (doJailbreak super.reflex-dom-core)))))); # 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; @@ -1372,7 +1205,7 @@ self: super: { # hasn't bumped upper bounds # test fails because of a "Warning: Unused LANGUAGE pragma" # https://github.com/ennocramer/monad-dijkstra/issues/4 - monad-dijkstra = dontCheck (doJailbreak super.monad-dijkstra); + monad-dijkstra = dontCheck super.monad-dijkstra; # Fixed upstream but not released to Hackage yet: # https://github.com/k0001/hs-libsodium/issues/2 @@ -1380,10 +1213,6 @@ self: super: { libraryToolDepends = (drv.libraryToolDepends or []) ++ [self.buildHaskellPackages.c2hs]; }) super.libsodium; - # Too strict version bounds on haskell-gi - gi-cairo-render = doJailbreak super.gi-cairo-render; - gi-cairo-connector = doJailbreak super.gi-cairo-connector; - svgcairo = appendPatches [ # Remove when https://github.com/gtk2hs/svgcairo/pull/12 goes in. (fetchpatch { @@ -1404,20 +1233,12 @@ self: super: { excludes = ["package.yaml" "stack.yaml" "stack.yaml.lock"]; }) super.espial; - # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released) - # https://github.com/lehins/massiv/pull/104 - massiv = dontCheck super.massiv; - # Upstream PR: https://github.com/jkff/splot/pull/9 splot = appendPatch (fetchpatch { url = "https://github.com/jkff/splot/commit/a6710b05470d25cb5373481cf1cfc1febd686407.patch"; sha256 = "1c5ck2ibag2gcyag6rjivmlwdlp5k0dmr8nhk7wlkzq2vh7zgw63"; }) super.splot; - # Tests are broken because of missing files in hackage tarball. - # https://github.com/jgm/commonmark-hs/issues/55 - commonmark-extensions = dontCheck super.commonmark-extensions; - # Fails with encoding problems, likely needs locale data. # Test can be executed by adding which to testToolDepends and # $PWD/dist/build/haskeline-examples-Test to $PATH. @@ -1427,12 +1248,6 @@ self: super: { # https://github.com/nikita-volkov/stm-containers/issues/29 stm-containers = doJailbreak super.stm-containers; - # https://github.com/agrafix/Spock/issues/180 - # Ignore Stackage LTS bound so we can compile Spock-core again. All other - # reverse dependencies of reroute are marked as broken in nixpkgs, so - # upgrading reroute is probably unproblematic. - reroute = doDistribute self.reroute_0_7_0_0; - # Test suite fails to compile https://github.com/agrafix/Spock/issues/177 Spock = dontCheck super.Spock; @@ -1492,9 +1307,6 @@ self: super: { ekg-core = self.hasura-ekg-core; }); - # https://github.com/bos/statistics/issues/170 - statistics = dontCheck super.statistics; - hcoord = overrideCabal (drv: { # Remove when https://github.com/danfran/hcoord/pull/8 is merged. patches = [ @@ -1512,24 +1324,20 @@ self: super: { # So let's not go there and just disable the tests altogether. hspec-core = dontCheck super.hspec-core; + # tests seem to require a different version of hspec-core + hspec-contrib = dontCheck super.hspec-contrib; + # github.com/ucsd-progsys/liquidhaskell/issues/1729 liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; }; Diff_0_3_4 = dontCheck super.Diff_0_3_4; - # jailbreaking pandoc-crossref because it has not bumped its upper bound on pandoc - # https://github.com/lierdakil/pandoc-crossref/issues/350 - pandoc-crossref = doJailbreak super.pandoc-crossref; - # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox. domain-auth = dontCheck super.domain-auth; - # Too tight version bounds, see https://github.com/haskell-hvr/microaeson/pull/4 - microaeson = doJailbreak super.microaeson; - # - Deps are required during the build for testing and also during execution, # so add them to build input and also wrap the resulting binary so they're in # PATH. - # - Patch can be removed on next package set bump + # - Patch can be removed on next package set bump (for v0.2.11) update-nix-fetchgit = let deps = [ pkgs.git pkgs.nix pkgs.nix-prefetch-git ]; in self.generateOptparseApplicativeCompletions [ "update-nix-fetchgit" ] (overrideCabal (drv: { @@ -1539,18 +1347,7 @@ self: super: { lib.makeBinPath deps }" ''; - }) (addTestToolDepends deps ( - appendPatch (fetchpatch { - url = "https://github.com/expipiplus1/update-nix-fetchgit/commit/2a4229b04aaeec025f1400a39f4e6390af760b54.patch"; - sha256 = "sha256-G3abFWykpvtsh8l3GZhkNUpBo7zRb9Ve4d6mjizysIo="; - includes = [ "src/Update/Nix/FetchGit/Prefetch.hs" ]; - }) - super.update-nix-fetchgit))); - - - # Our quickcheck-instances is too old for the newer binary-instances, but - # quickcheck-instances is only used in the tests of binary-instances. - binary-instances = dontCheck super.binary-instances; + }) (addTestToolDepends deps super.update-nix-fetchgit)); # Raise version bounds: https://github.com/idontgetoutmuch/binary-low-level/pull/16 binary-strict = appendPatches [ @@ -1564,11 +1361,6 @@ self: super: { dontCheck (disableCabalFlag "stan") # Sorry stan is totally unmaintained and terrible to get to run. It only works on ghc 8.8 or 8.10 anyways … ]).overrideScope (lself: lsuper: { - ormolu = doJailbreak lself.ormolu_0_5_0_1; - fourmolu = doJailbreak lself.fourmolu_0_9_0_0; - hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1; - ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; - ghc-lib-parser = lself.ghc-lib-parser_9_2_5_20221107; # For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix, # because some packages, like ormolu, need a newer Cabal version. # ghc-paths is special because it depends on Cabal for building @@ -1581,21 +1373,14 @@ self: super: { ghc-paths = lsuper.ghc-paths.override { Cabal = null; }; }); - hledger_1_27_1 = doDistribute (super.hledger_1_27_1.override { - hledger-lib = self.hledger-lib_1_27_1; - }); - - hls-hlint-plugin = super.hls-hlint-plugin.overrideScope (lself: lsuper: { + hls-hlint-plugin = super.hls-hlint-plugin.override { # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 - hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1; - ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; - ghc-lib-parser = lself.ghc-lib-parser_9_2_5_20221107; - }); + hlint = enableCabalFlag "ghc-lib" super.hlint; + apply-refact = self.apply-refact_0_11_0_0; + }; # For -f-auto see cabal.project in haskell-language-server. - ghc-lib-parser-ex_9_2_0_4 = disableCabalFlag "auto" (super.ghc-lib-parser-ex_9_2_0_4.override { - ghc-lib-parser = self.ghc-lib-parser_9_2_5_20221107; - }); + ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser (disableCabalFlag "auto" super.ghc-lib-parser-ex); # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809 hls-eval-plugin = dontCheck super.hls-eval-plugin; @@ -1603,48 +1388,22 @@ self: super: { # 2021-06-20: Tests fail: https://github.com/haskell/haskell-language-server/issues/1949 hls-refine-imports-plugin = dontCheck super.hls-refine-imports-plugin; - # 2021-09-14: Tests are broken because of undeterministic variable names - hls-tactics-plugin = dontCheck super.hls-tactics-plugin; - # 2021-11-20: https://github.com/haskell/haskell-language-server/pull/2373 hls-explicit-imports-plugin = dontCheck super.hls-explicit-imports-plugin; # 2021-11-20: https://github.com/haskell/haskell-language-server/pull/2374 hls-module-name-plugin = dontCheck super.hls-module-name-plugin; - # 2021-11-20: Testsuite hangs. - # https://github.com/haskell/haskell-language-server/issues/2375 - hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin; - # 2022-09-19: https://github.com/haskell/haskell-language-server/issues/3200 hls-refactor-plugin = dontCheck super.hls-refactor-plugin; - # 2022-11-18: https://github.com/haskell/haskell-language-server/commit/c1a7527c4fb348bee6093d9794b7d3e0c8d563f2 - hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.1.0.0"; doJailbreak super.hls-fourmolu-plugin; - - # 2022-10-27: implicit-hie 0.1.3.0 needs a newer version of Cabal-syntax. - implicit-hie = super.implicit-hie.override { - Cabal-syntax = self.Cabal-syntax_3_8_1_0; - }; - - # 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 - ghcide = doJailbreak (dontCheck super.ghcide); - - data-tree-print = doJailbreak super.data-tree-print; + # tests require network + ghcide = dontCheck super.ghcide; # 2020-11-15: nettle tests are pre MonadFail change # https://github.com/stbuehler/haskell-nettle/issues/10 nettle = dontCheck super.nettle; - # 2020-11-17: Disable tests for hackage-security because of this issue: - # https://github.com/haskell/hackage-security/issues/247 - hackage-security = dontCheck super.hackage-security; - - # 2020-11-17: persistent-test is ahead of the persistent version in stack - persistent-sqlite = dontCheck super.persistent-sqlite; - # The tests for semver-range need to be updated for the MonadFail change in # ghc-8.8: # https://github.com/adnelson/semver-range/issues/15 @@ -1653,24 +1412,8 @@ self: super: { # https://github.com/obsidiansystems/dependent-sum/issues/55 dependent-sum = doJailbreak super.dependent-sum; - # 2022-03-16 upstream is not updating bounds: https://github.com/srid/rib/issues/169 - rib-core = doJailbreak (super.rib-core.override { relude = doJailbreak super.relude_0_7_0_0; }); - neuron = assert super.neuron.version == "1.0.0.0"; overrideCabal { - # neuron is soon to be deprecated - # Fixing another ghc 9.0 bug here - postPatch = '' - sed -i 's/asks routeConfigRouteLink/asks (\\x -> routeConfigRouteLink x)/' src/lib/Neuron/Web/Route.hs - ''; - } - (doJailbreak (super.neuron.override { - clay = dontCheck self.clay_0_13_3; - relude = doJailbreak self.relude_0_7_0_0; - })); - - reflex-dom-pandoc = super.reflex-dom-pandoc.override { clay = dontCheck self.clay_0_13_3; }; - # 2022-06-19: Disable checks because of https://github.com/reflex-frp/reflex/issues/475 - reflex = dontCheck super.reflex; + reflex = doJailbreak (dontCheck super.reflex); # 2020-11-19: jailbreaking because of pretty-simple bound out of date # https://github.com/kowainik/stan/issues/408 @@ -1685,56 +1428,35 @@ self: super: { (self.generateOptparseApplicativeCompletions [ "hi" ] (super.hinit.override { haskeline = self.haskeline_0_8_2; })); - # 2022-03-19: Keeping jailbreak because of tons of strict bounds: https://github.com/snapframework/snap/issues/220 - snap = doJailbreak super.snap; - - # 2020-11-23: Jailbreaking until: https://github.com/michaelt/text-pipes/pull/29 - pipes-text = doJailbreak super.pipes-text; - # 2020-11-23: https://github.com/Rufflewind/blas-hs/issues/8 blas-hs = dontCheck super.blas-hs; - # 2020-11-23: https://github.com/cdornan/fmt/issues/30 - fmt = dontCheck super.fmt; - - # 2020-11-27: Tests broken - # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129 - servant-swagger = dontCheck super.servant-swagger; - # Strange doctest problems # https://github.com/biocad/servant-openapi3/issues/30 servant-openapi3 = dontCheck super.servant-openapi3; # Give hspec 2.10.* correct dependency versions without overrideScope - hspec_2_10_6 = doDistribute (super.hspec_2_10_6.override { - hspec-discover = self.hspec-discover_2_10_6; - hspec-core = self.hspec-core_2_10_6; + hspec_2_10_8 = doDistribute (super.hspec_2_10_8.override { + hspec-discover = self.hspec-discover_2_10_8; + hspec-core = self.hspec-core_2_10_8; }); - hspec-discover_2_10_6 = super.hspec-discover_2_10_6.override { + hspec-discover_2_10_8 = super.hspec-discover_2_10_8.override { hspec-meta = self.hspec-meta_2_10_5; }; - hspec-core_2_10_6 = super.hspec-core_2_10_6.override { + hspec-core_2_10_8 = super.hspec-core_2_10_8.override { hspec-meta = self.hspec-meta_2_10_5; }; # Point hspec 2.7.10 to correct dependencies - hspec_2_7_10 = doDistribute (super.hspec_2_7_10.override { + hspec_2_7_10 = super.hspec_2_7_10.override { hspec-discover = self.hspec-discover_2_7_10; hspec-core = self.hspec-core_2_7_10; - }); + }; # waiting for aeson bump servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core; hercules-ci-agent = lib.pipe super.hercules-ci-agent [ - (appendPatches [ - # https://github.com/hercules-ci/hercules-ci-agent/pull/446 - (fetchpatch { - url = "https://github.com/hercules-ci/hercules-ci-agent/commit/99afac77ddb84122a5321494a08e6fe2e95548a1.patch"; - sha256 = "sha256-0dtmNL1rqzeXvXWinfANc57a5LIM3uNnhR3A+p8mH0A="; - stripLen = 1; - }) - ]) (self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ]) ]; @@ -1767,6 +1489,10 @@ self: super: { }) ] super.pipes-aeson; + # Needs bytestring 0.11 + # https://github.com/Gabriella439/Haskell-Pipes-HTTP-Library/pull/17 + pipes-http = doJailbreak super.pipes-http; + moto-postgresql = appendPatches [ # https://gitlab.com/k0001/moto/-/merge_requests/3 (fetchpatch { @@ -1799,9 +1525,6 @@ self: super: { # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) pandoc-include-code = doJailbreak super.pandoc-include-code; - # https://github.com/yesodweb/yesod/issues/1714 - yesod-core = dontCheck super.yesod-core; - # DerivingVia is not allowed in safe Haskell # https://github.com/strake/util.hs/issues/1 util = appendConfigureFlags [ @@ -1818,36 +1541,12 @@ self: super: { ] super.alg; # Break out of overspecified constraint on QuickCheck. - algebraic-graphs = dontCheck super.algebraic-graphs; - attoparsec = doJailbreak super.attoparsec; # https://github.com/haskell/attoparsec/pull/168 - cassava = doJailbreak super.cassava; filepath-bytestring = doJailbreak super.filepath-bytestring; - ghc-source-gen = doJailbreak super.ghc-source-gen; haddock-library = doJailbreak super.haddock-library; - HsYAML = doJailbreak super.HsYAML; - http-api-data = doJailbreak super.http-api-data; - lzma = doJailbreak super.lzma; - psqueues = doJailbreak super.psqueues; - # Break out of overspecified constraint on QuickCheck. - # https://github.com/Gabriel439/Haskell-Nix-Derivation-Library/pull/10 - nix-derivation = doJailbreak super.nix-derivation; - - # Break out of overspecified constraint on QuickCheck. - # Fixed by https://github.com/haskell-servant/servant/commit/08579ca0039410e04d6c36c975ddc20165819db6 - servant-client = doJailbreak super.servant-client; - servant-client-core = doJailbreak super.servant-client-core; - - # overly strict dependency on aeson - # https://github.com/jaspervdj/profiteur/issues/33 - profiteur = doJailbreak super.profiteur; - - # Test suite has overly strict bounds on tasty. + # Test suite has overly strict bounds on tasty, jailbreaking fails. # https://github.com/input-output-hk/nothunks/issues/9 - nothunks = doJailbreak super.nothunks; - - # Allow building with recent versions of tasty. - lukko = doJailbreak super.lukko; + nothunks = dontCheck super.nothunks; # Allow building with older versions of http-client. http-client-restricted = doJailbreak super.http-client-restricted; @@ -1910,7 +1609,8 @@ self: super: { # Test suite has a too strict bound on base # https://github.com/jswebtools/language-ecmascript/pull/88 - language-ecmascript = doJailbreak super.language-ecmascript; + # Test suite doesn't compile anymore + language-ecmascript = dontCheck (doJailbreak super.language-ecmascript); # Too strict bounds on containers # https://github.com/jswebtools/language-ecmascript-analysis/issues/1 @@ -1938,27 +1638,28 @@ self: super: { ] super.nix-thunk; # list `modbus` in librarySystemDepends, correct to `libmodbus` - libmodbus = overrideCabal (drv: { - librarySystemDepends = [ pkgs.libmodbus ]; - }) super.libmodbus; + libmodbus = doJailbreak (addExtraLibrary pkgs.libmodbus super.libmodbus); # 2021-04-02: Outdated optparse-applicative bound is fixed but not realeased on upstream. trial-optparse-applicative = assert super.trial-optparse-applicative.version == "0.0.0.0"; doJailbreak super.trial-optparse-applicative; - # 2021-04-02: iCalendar is basically unmaintained. - # There are PRs for bumping the bounds: https://github.com/chrra/iCalendar/pull/46 - iCalendar = overrideCabal { - # Overriding bounds behind a cabal flag - preConfigure = ''substituteInPlace iCalendar.cabal --replace "network >=2.6 && <2.7" "network -any"''; - } (doJailbreak super.iCalendar); + # 2022-12-28: Too strict version bounds on bytestring + iconv = doJailbreak super.iconv; - # Apply patch from master relaxing the version bounds on tasty. - # Can be removed at next release (current is 0.10.1.0). - ginger = appendPatch + # 2021-04-02: iCalendar is basically unmaintained. + # There is a PR for fixing the build: https://github.com/chrra/iCalendar/pull/50 + iCalendar = appendPatches [ (fetchpatch { - url = "https://github.com/tdammers/ginger/commit/bd8cb39c1853d4fb4f663c4c201884575906acea.patch"; - sha256 = "1rdy53k0384g52bnc59j1f0i13hr4lbnbksfsabr4av6zmw9wmzf"; - }) super.ginger; + url = "https://github.com/chrra/iCalendar/commit/66b408f10b2d87929ecda715109b26093c711823.patch"; + sha256 = "sha256-MU5OHUx3L8CaX+xAmoQhAAOMxT7u9Xk1OcOaUHBwK3Y="; + }) + (fetchpatch { + url = "https://github.com/chrra/iCalendar/commit/76f5d2e8328cb985f1ee5176e86a5cdd05a17934.patch"; + sha256 = "sha256-Z5V8VTA5Ml9YIRANQn2aD7dljAbR9dq13N11Y3LZdoE="; + }) + ] super.iCalendar; + + ginger = doJailbreak super.ginger; # Too strict version bounds on cryptonite # https://github.com/obsidiansystems/haveibeenpwned/issues/7 @@ -1968,10 +1669,6 @@ self: super: { # https://github.com/mpickering/hs-speedscope/issues/16 hs-speedscope = doJailbreak super.hs-speedscope; - # Too strict version bounds on tasty - # Can likely be removed next week (2021-04-09) when 1.1.1.1 is released. - fused-effects = doJailbreak super.fused-effects; - # Test suite doesn't support base16-bytestring >= 1.0 # https://github.com/centromere/blake2/issues/6 blake2 = dontCheck super.blake2; @@ -2049,6 +1746,7 @@ self: super: { postPatch = '' sed -i 's/ref-tf.*,/ref-tf,/' jsaddle.cabal sed -i 's/attoparsec.*,/attoparsec,/' jsaddle.cabal + sed -i 's/time.*,/time,/' jsaddle.cabal sed -i 's/(!name)/(! name)/' src/Language/Javascript/JSaddle/Object.hs '' + (drv.postPatch or ""); }) (doJailbreak super.jsaddle); @@ -2098,11 +1796,14 @@ self: super: { gi-gtk-declarative = doJailbreak super.gi-gtk-declarative; gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple; - # 2022-01-16 haskell-ci needs Cabal 3.6, ShellCheck 0.7.2 - haskell-ci = super.haskell-ci.overrideScope (self: super: { + # 2022-01-16 haskell-ci needs Cabal 3.6 + haskell-ci = (appendPatches [ + # Allow building with optparse-applicative 0.17* and ShellCheck 0.8.0 + ./patches/haskell-ci-optparse-applicative-0.17-ShellCheck-0.8.patch + ] super.haskell-ci).overrideScope (self: super: { Cabal = self.Cabal_3_6_3_0; - ShellCheck = self.ShellCheck_0_7_2; cabal-install-parsers = self.cabal-install-parsers_0_4_5; + ShellCheck = self.ShellCheck_0_8_0; }); large-hashable = lib.pipe (super.large-hashable.override { @@ -2143,14 +1844,6 @@ self: super: { network = self.network-bsd; }); - # 2021-05-14: Testsuite is failing. - # https://github.com/kcsongor/generic-lens/issues/133 - generic-optics = dontCheck super.generic-optics; - - # Too strict bound on random - # https://github.com/haskell-hvr/missingh/issues/56 - MissingH = doJailbreak super.MissingH; - # Disable flaky tests # https://github.com/DavidEichmann/alpaca-netcode/issues/2 alpaca-netcode = overrideCabal { @@ -2165,10 +1858,6 @@ self: super: { testFlags = [ "-j1" ]; } super.libarchive; - # unrestrict bounds for hashable and semigroups - # https://github.com/HeinrichApfelmus/reactive-banana/issues/215 - reactive-banana = doJailbreak super.reactive-banana; - # Too strict bounds on QuickCheck # https://github.com/muesli4/table-layout/issues/16 table-layout = doJailbreak super.table-layout; @@ -2180,25 +1869,10 @@ self: super: { # https://github.com/plow-technologies/hspec-golden-aeson/issues/17 hspec-golden-aeson = dontCheck super.hspec-golden-aeson; - # 2022-03-21: Newest stylish-haskell needs ghc-lib-parser-9_2 - stylish-haskell = (super.stylish-haskell.override { - ghc-lib-parser = self.ghc-lib-parser_9_2_5_20221107; - ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; - }); - # To strict bound on hspec # https://github.com/dagit/zenc/issues/5 zenc = doJailbreak super.zenc; - # Release 1.0.0.0 added version bounds (was unrestricted before), - # but with too strict lower bounds for our lts-18. - # Disable aeson for now, future release should support it - graphql = - assert super.graphql.version == "1.0.3.0"; - appendConfigureFlags [ - "-f-json" - ] (lib.warnIf (lib.versionAtLeast self.hspec.version "2.9.0") "@NixOS/haskell: Remove jailbreak for graphql" doJailbreak super.graphql); - # https://github.com/ajscholl/basic-cpuid/pull/1 basic-cpuid = appendPatch (fetchpatch { url = "https://github.com/ajscholl/basic-cpuid/commit/2f2bd7a7b53103fb0cf26883f094db9d7659887c.patch"; @@ -2223,27 +1897,8 @@ self: super: { # https://github.com/haskell/haskell-language-server/pull/2887 hls-change-type-signature-plugin = dontCheck super.hls-change-type-signature-plugin; - # Too strict bounds on hspec - # https://github.com/haskell-works/hw-hspec-hedgehog/issues/62 - # https://github.com/haskell-works/hw-prim/issues/132 - # https://github.com/haskell-works/hw-ip/issues/107 - # https://github.com/haskell-works/bits-extra/issues/57 - hw-hspec-hedgehog = doJailbreak super.hw-hspec-hedgehog; - hw-prim = doJailbreak super.hw-prim; - hw-ip = doJailbreak super.hw-ip; - bits-extra = doJailbreak super.bits-extra; - - # Fixes https://github.com/NixOS/nixpkgs/issues/140613 - # https://github.com/recursion-schemes/recursion-schemes/issues/128 - recursion-schemes = overrideCabal (drv: { - patches = drv.patches or [] ++ [ - ./patches/recursion-schemes-128.patch - ]; - # make sure line endings don't break the patch - prePatch = drv.prePatch or "" + '' - "${pkgs.buildPackages.dos2unix}/bin/dos2unix" *.cabal - ''; - }) super.recursion-schemes; + # 2022-12-30: Restrictive upper bound on optparse-applicative + retrie = doJailbreak super.retrie; # 2022-08-30 Too strict bounds on finite-typelits # https://github.com/jumper149/blucontrol/issues/1 @@ -2267,13 +1922,15 @@ self: super: { # Upgrade of unordered-containers in Stackage causes ordering-sensitive test to fail # https://github.com/commercialhaskell/stackage/issues/6366 # https://github.com/kapralVV/Unique/issues/9 + # Too strict bounds on hashable + # https://github.com/kapralVV/Unique/pull/10 Unique = assert super.Unique.version == "0.4.7.9"; overrideCabal (drv: { testFlags = [ "--skip" "/Data.List.UniqueUnsorted.removeDuplicates/removeDuplicates: simple test/" "--skip" "/Data.List.UniqueUnsorted.repeatedBy,repeated,unique/unique: simple test/" "--skip" "/Data.List.UniqueUnsorted.repeatedBy,repeated,unique/repeatedBy: simple test/" ] ++ drv.testFlags or []; - }) super.Unique; + }) (doJailbreak super.Unique); # https://github.com/AndrewRademacher/aeson-casing/issues/8 aeson-casing = assert super.aeson-casing.version == "0.2.0.0"; overrideCabal (drv: { @@ -2282,23 +1939,6 @@ self: super: { ] ++ drv.testFlags or []; }) super.aeson-casing; - # 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124 - # 2021-12-22: https://github.com/snapframework/heist/issues/131 - heist = assert super.heist.version == "1.1.0.1"; - # aeson 2.0 compat https://github.com/snapframework/heist/pull/132 - # not merged in master yet - appendPatch (fetchpatch { - url = "https://github.com/snapframework/heist/compare/de802b0ed5055bd45cfed733524b4086c7e71660...d76adf749d14d7401963d36a22597584c52fc55f.patch"; - sha256 = "sha256-GEIPGYYJO6S4t710AQe1uk3EvBu4UpablrlMDZLBSTk="; - includes = [ "src/*" "heist.cabal"]; - }) - (overrideCabal (drv: { - revision = null; - editedCabalFile = null; - doCheck = false; - }) - (doJailbreak super.heist)); - # https://github.com/emc2/HUnit-Plus/issues/26 HUnit-Plus = dontCheck super.HUnit-Plus; # https://github.com/ewestern/haskell-postgis/issues/7 @@ -2338,18 +1978,6 @@ self: super: { "--skip" "/toJsonSerializer/should generate valid JSON/" ] ++ drv.testFlags or []; }) super.hschema-aeson; - # https://gitlab.com/k0001/xmlbf/-/issues/32 - xmlbf = overrideCabal (drv: { - testFlags = [ - "-p" "!/xml: <\\/x>/&&!/xml: <\\/x>/" - ] ++ drv.testFlags or []; - }) super.xmlbf; - # https://github.com/ssadler/aeson-quick/issues/3 - aeson-quick = overrideCabal (drv: { - testFlags = [ - "-p" "!/asLens.set/&&!/complex.set/&&!/multipleKeys.set/" - ] ++ drv.testFlags or []; - }) super.aeson-quick; # https://github.com/minio/minio-hs/issues/165 minio-hs = overrideCabal (drv: { testFlags = [ @@ -2398,23 +2026,6 @@ self: super: { # https://github.com/kuribas/mfsolve/issues/8 mfsolve = dontCheck super.mfsolve; - # GHC 9 support https://github.com/lambdabot/lambdabot/pull/204 - lambdabot-core = appendPatch ./patches/lambdabot-core-ghc9.patch (overrideCabal (drv: { - revision = null; - editedCabalFile = null; - }) super.lambdabot-core); - lambdabot-novelty-plugins = appendPatch ./patches/lambdabot-novelty-plugins-ghc9.patch super.lambdabot-novelty-plugins; - - # Ships a custom cabal-doctest Setup.hs in the release tarball, but the actual - # test suite is commented out, so the required dependency is missing naturally. - # We need to use a default Setup.hs instead. Current master doesn't exhibit - # this anymore, so this override should be fine to remove once the assert fires. - linear-base = assert super.linear-base.version == "0.1.0"; overrideCabal (drv: { - preCompileBuildDriver = drv.preCompileBuildDriver or "" + '' - rm Setup.hs - ''; - }) super.linear-base; - # https://github.com/peti/hopenssl/issues/5 hopenssl = super.hopenssl.override { openssl = pkgs.openssl_1_1; }; @@ -2482,7 +2093,8 @@ self: super: { system-fileio = doJailbreak super.system-fileio; # Bounds too strict on base and ghc-prim: https://github.com/tibbe/ekg-core/pull/43 (merged); waiting on hackage release - ekg-core = assert super.ekg-core.version == "0.1.1.7"; doJailbreak super.ekg-core; + ekg-core = assert super.ekg-core.version == "0.1.1.7"; doJailbreak super.ekg-core; + hasura-ekg-core = doJailbreak super.hasura-ekg-core; # https://github.com/Synthetica9/nix-linter/issues/65 nix-linter = super.nix-linter.overrideScope (self: super: { @@ -2493,19 +2105,6 @@ self: super: { # https://github.com/zellige/hs-geojson/issues/29 geojson = dontCheck super.geojson; - # Doesn't support aeson >= 2.0 - # https://github.com/channable/vaultenv/issues/118 - vaultenv = super.vaultenv.overrideScope (self: super: { - aeson = self.aeson_1_5_6_0; - }); - - # Support network >= 3.1.2 - # https://github.com/erebe/wstunnel/pull/107 - wstunnel = appendPatch (fetchpatch { - url = "https://github.com/erebe/wstunnel/pull/107/commits/47c1f62bdec1dbe77088d9e3ceb6d872f922ce34.patch"; - sha256 = "sha256-fW5bVbAGQxU/gd9zqgVNclwKraBtUjkKDek7L0c4+O0="; - }) super.wstunnel; - # Test data missing from sdist # https://github.com/ngless-toolkit/ngless/issues/152 NGLess = dontCheck super.NGLess; @@ -2529,6 +2128,13 @@ self: super: { }) super.polynomial); + # Unreleased bound relaxing patch allowing scotty 0.12 + taffybar = appendPatch (pkgs.fetchpatch { + name = "taffybar-allow-scotty-0.12.patch"; + url = "https://github.com/taffybar/taffybar/commit/2e428ba550fc51067526a0350b91185acef72d19.patch"; + sha256 = "1lpcz671mk5cwqffjfi9ncc0d67bmwgzypy3i37a2fhfmxd0y3nl"; + }) ((p: assert p.version == "4.0.0"; p) super.taffybar); + # lucid-htmx has restrictive upper bounds on lucid and servant: # # Setup: Encountered missing or private dependencies: @@ -2553,6 +2159,10 @@ self: super: { doctest-parallel = dontCheck super.doctest-parallel; clash-prelude = dontCheck super.clash-prelude; + # Too strict upper bound on th-desugar, fixed in 3.1.1 + singletons-th = assert super.singletons-th.version == "3.1"; doJailbreak super.singletons-th; + singletons-base = doJailbreak super.singletons-base; + # Ships a broken Setup.hs # https://github.com/lehins/conduit-aeson/issues/1 conduit-aeson = overrideCabal (drv: { @@ -2576,82 +2186,151 @@ self: super: { # https://github.com/phadej/crypt-sha512/issues/13 crypt-sha512 = dontCheck super.crypt-sha512; -} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let - # We need to build purescript with these dependencies and thus also its reverse - # dependencies to avoid version mismatches in their dependency closure. - # TODO(@cdepillabout): maybe unify with the spago overlay in configuration-nix.nix? - purescriptOverlay = self: super: { - # As of 2021-11-08, the latest release of `language-javascript` is 0.7.1.0, - # but it has a problem with parsing the `async` keyword. It doesn't allow - # `async` to be used as an object key: - # https://github.com/erikd/language-javascript/issues/131 - language-javascript = self.language-javascript_0_7_0_0; - }; + # Too strict upper bound on HTTP + oeis = doJailbreak super.oeis; - # Don't support GHC >= 9.0 yet and need aeson 1.5.* - purescriptStOverride = drv: - let - overlayed = drv.overrideScope ( - lib.composeExtensions - purescriptOverlay - (self: super: { - aeson = self.aeson_1_5_6_0; - }) - ); - in - if lib.versionAtLeast self.ghc.version "9.0" - then dontDistribute (markBroken overlayed) - else overlayed; -in { - purescript = - lib.pipe - (super.purescript.overrideScope purescriptOverlay) - ([ - # PureScript uses nodejs to run tests, so the tests have been disabled - # for now. If someone is interested in figuring out how to get this - # working, it seems like it might be possible. - dontCheck - # The current version of purescript (0.14.5) has version bounds for LTS-17, - # but it compiles cleanly using deps in LTS-18 as well. This jailbreak can - # likely be removed when purescript-0.14.6 is released. - doJailbreak - # Generate shell completions - (self.generateOptparseApplicativeCompletions [ "purs" ]) - ] ++ lib.optionals (lib.versions.majorMinor self.ghc.version == "9.2") [ - markUnbroken - doDistribute - ]); + inherit + (let + # We need to build purescript with these dependencies and thus also its reverse + # dependencies to avoid version mismatches in their dependency closure. + # TODO(@cdepillabout): maybe unify with the spago overlay in configuration-nix.nix? + purescriptOverlay = self: super: { + # As of 2021-11-08, the latest release of `language-javascript` is 0.7.1.0, + # but it has a problem with parsing the `async` keyword. It doesn't allow + # `async` to be used as an object key: + # https://github.com/erikd/language-javascript/issues/131 + language-javascript = self.language-javascript_0_7_0_0; + }; + in { + purescript = + lib.pipe + (super.purescript.overrideScope purescriptOverlay) + ([ + # PureScript uses nodejs to run tests, so the tests have been disabled + # for now. If someone is interested in figuring out how to get this + # working, it seems like it might be possible. + dontCheck + # The current version of purescript (0.14.5) has version bounds for LTS-17, + # but it compiles cleanly using deps in LTS-18 as well. This jailbreak can + # likely be removed when purescript-0.14.6 is released. + doJailbreak + # Generate shell completions + (self.generateOptparseApplicativeCompletions [ "purs" ]) + ]); - purescript-cst = purescriptStOverride super.purescript-cst; - - purescript-ast = purescriptStOverride super.purescript-ast; - - purenix = purescriptStOverride super.purenix; - - # Needs update for ghc-9: - # https://github.com/haskell/text-format/issues/27 - text-format = appendPatch (fetchpatch { - url = "https://github.com/hackage-trustees/text-format/pull/4/commits/949383aa053497b8c251219c10506136c29b4d32.patch"; - sha256 = "QzpZ7lDedsz1mZcq6DL4x7LBnn58rx70+ZVvPh9shRo="; - }) super.text-format; - - # 2022-10-04: Needs newer tasty-dejafu than (currently) in stackage - rec-def = super.rec-def.override { tasty-dejafu = self.tasty-dejafu_2_1_0_0; }; + purenix = super.purenix.overrideScope purescriptOverlay; + }) + purescript + purenix + ; # 2022-11-05: https://github.com/ysangkok/haskell-tzdata/issues/3 tzdata = dontCheck super.tzdata; - # 2022-11-04: The situation around heist-emanote is quite terrible. - # It‘s simply a heist fork because heist is unmaintained. - # Upstream jailbreak is unreleased: https://github.com/srid/heist/commit/988692ea850b3cbe966c7dc4dd26ba1d49647706 - heist-emanote = doJailbreak (dontCheck super.heist-emanote); - # 2022-11-15: Needs newer witch package and brick 1.3 which in turn works with text-zipper 0.12 # Other dependencies are resolved with doJailbreak for both swarm and brick_1_3 swarm = doJailbreak (super.swarm.override { - witch = super.witch_1_1_2_0; - brick = doJailbreak (dontCheck (super.brick_1_3.override { - text-zipper = super.text-zipper_0_12; - })); + brick = doJailbreak (dontCheck super.brick_1_3); }); -}) + + # random <1.2 + unfoldable = doJailbreak super.unfoldable; + + # containers <0.6, semigroupoids <5.3 + data-lens = doJailbreak super.data-lens; + + # transformers <0.3 + monads-fd = doJailbreak super.monads-fd; + + # HTF <0.15 + cases = doJailbreak super.cases; + + # exceptions <0.9 + eprocess = doJailbreak super.eprocess; + + # hashable <1.4, mmorph <1.2 + composite-aeson = doJailbreak super.composite-aeson; + + # composite-aeson <0.8, composite-base <0.8 + compdoc = doJailbreak super.compdoc; + + # composite-aeson <0.8, composite-base <0.8 + haskell-coffee = doJailbreak super.haskell-coffee; + + # Test suite doesn't compile anymore + twitter-types = dontCheck super.twitter-types; + + # base <4.14 + numbered-semigroups = doJailbreak super.numbered-semigroups; + + # Tests open file "data/test_vectors_aserti3-2d_run01.txt" but it doesn't exist + haskoin-core = dontCheck super.haskoin-core; + + # base <4.9, transformers <0.5 + MonadCatchIO-transformers = doJailbreak super.MonadCatchIO-transformers; + + # unix-compat <0.5 + hxt-cache = doJailbreak super.hxt-cache; + + # base <4.16 + fast-builder = doJailbreak super.fast-builder; + + # QuickCheck <2.14 + term-rewriting = doJailbreak super.term-rewriting; + + # tests can't find the test binary anymore - parseargs-example + parseargs = dontCheck super.parseargs; + + # base <4.14 + decimal-literals = doJailbreak super.decimal-literals; + + # multiple bounds too strict + snaplet-sqlite-simple = doJailbreak super.snaplet-sqlite-simple; + + emanote = super.emanote.overrideScope (lself: lsuper: { + commonmark-extensions = lself.commonmark-extensions_0_2_3_2; + }); + + # doctest <0.19 + polysemy = doJailbreak super.polysemy; + + # multiple bounds too strict + co-log-polysemy = doJailbreak super.co-log-polysemy; + co-log-polysemy-formatting = doJailbreak super.co-log-polysemy-formatting; + + # 2022-12-02: Needs newer postgrest package + # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275 + # 2022-12-02: Too strict bounds: https://github.com/PostgREST/postgrest/issues/2580 + # 2022-12-02: Tests require running postresql server + postgrest = dontCheck (doJailbreak (overrideSrc rec { + version = "10.1.1"; + src = pkgs.fetchFromGitHub { + owner = "PostgREST"; + repo = "postgrest"; + rev = "v${version}"; + sha256 = "sha256-ceSPBH+lzGU1OwjolcaE1BCpkKCJrvMU5G8TPeaJesM="; + }; + } super.postgrest)); + + html-charset = dontCheck super.html-charset; + + # true-name-0.1.0.4 has been tagged, but has not been released to Hackage. + # Also, beyond 0.1.0.4 an additional patch is required to make true-name + # compatible with current versions of template-haskell + # https://github.com/liyang/true-name/pull/4 + true-name = appendPatch (fetchpatch { + url = "https://github.com/liyang/true-name/compare/0.1.0.3...nuttycom:true-name:update_template_haskell.patch"; + hash = "sha256-ZMBXGGc2X5AKXYbqgkLXkg5BhEwyj022E37sUEWahtc="; + }) (overrideCabal (drv: { + revision = null; + editedCabalFile = null; + }) super.true-name); + + # posix-api has had broken tests since 2020 (until at least 2023-01-11) + # raehik has a fix pending: https://github.com/andrewthad/posix-api/pull/14 + posix-api = dontCheck super.posix-api; + + # bytestring <0.11.0, optparse-applicative <0.13.0 + # https://github.com/kseo/sfnt2woff/issues/1 + sfnt2woff = doJailbreak super.sfnt2woff; +} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 5ad58d156300..2c40ee7711ee 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -301,12 +301,15 @@ self: super: ({ # Build segfaults unless `fixity-th` is disabled. # https://github.com/tweag/ormolu/issues/927 - ormolu_0_5_0_1 = overrideCabal (drv: { + ormolu = overrideCabal (drv: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; - }) (disableCabalFlag "fixity-th" super.ormolu_0_5_0_1); - fourmolu_0_9_0_0 = overrideCabal (drv: { + }) (disableCabalFlag "fixity-th" super.ormolu); + fourmolu = overrideCabal (drv: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; - }) (disableCabalFlag "fixity-th" super.fourmolu_0_9_0_0); + }) (disableCabalFlag "fixity-th" super.fourmolu); + + # https://github.com/NixOS/nixpkgs/issues/149692 + Agda = removeConfigureFlag "-foptimise-heavily" super.Agda; } // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 1a578dbafbdf..baa8752e1e8f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -53,6 +53,9 @@ self: super: { Cabal = self.Cabal_3_8_1_0; Cabal-syntax = self.Cabal-syntax_3_8_1_0; process = self.process_1_6_16_0; + # Prevent dependency on doctest which causes an inconsistent dependency + # due to depending on ghc-8.10.7 (with bundled process) vs. process 1.6.16.0 + vector = dontCheck super.vector; }); cabal-install-solver = super.cabal-install-solver.overrideScope (self: super: { Cabal = self.Cabal_3_8_1_0; @@ -60,8 +63,11 @@ self: super: { process = self.process_1_6_16_0; }); + # Additionally depends on OneTuple for GHC < 9.0 + base-compat-batteries = addBuildDepend self.OneTuple super.base-compat-batteries; + # Pick right versions for GHC-specific packages - ghc-api-compat = doDistribute self.ghc-api-compat_8_10_7; + ghc-api-compat = doDistribute (unmarkBroken self.ghc-api-compat_8_10_7); # ghc versions which don‘t match the ghc-lib-parser-ex version need the # additional dependency to compile successfully. @@ -96,17 +102,42 @@ self: super: { executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ]; }) super.hnix); - haskell-language-server = addBuildDepend self.hls-brittany-plugin (super.haskell-language-server.overrideScope (lself: lsuper: { + haskell-language-server = let + # These aren't included in hackage-packages.nix because hackage2nix is configured for GHC 9.2, under which these plugins aren't supported. + # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self..scope` + additionalDeps = with self.haskell-language-server.scope; [ + hls-brittany-plugin + hls-haddock-comments-plugin + (unmarkBroken hls-splice-plugin) + hls-tactics-plugin + ]; + in addBuildDepends additionalDeps (super.haskell-language-server.overrideScope (lself: lsuper: { Cabal = lself.Cabal_3_6_3_0; aeson = lself.aeson_1_5_6_0; + lens-aeson = lself.lens-aeson_1_1_3; lsp-types = doJailbreak lsuper.lsp-types; # Checks require aeson >= 2.0 })); - hls-brittany-plugin = super.hls-brittany-plugin.overrideScope (lself: lsuper: { - brittany = doJailbreak lself.brittany_0_13_1_2; + hls-tactics-plugin = unmarkBroken (addBuildDepends (with self.hls-tactics-plugin.scope; [ + aeson extra fingertree generic-lens ghc-exactprint ghc-source-gen ghcide + hls-graph hls-plugin-api hls-refactor-plugin hyphenation lens lsp megaparsec + parser-combinators prettyprinter refinery retrie syb unagi-chan unordered-containers + ]) super.hls-tactics-plugin); + + hls-brittany-plugin = unmarkBroken (addBuildDepends (with self.hls-brittany-plugin.scope; [ + brittany czipwith extra ghc-exactprint ghcide hls-plugin-api hls-test-utils lens lsp-types + ]) (super.hls-brittany-plugin.overrideScope (lself: lsuper: { + brittany = doJailbreak (unmarkBroken lself.brittany_0_13_1_2); aeson = lself.aeson_1_5_6_0; + multistate = unmarkBroken (dontCheck lsuper.multistate); lsp-types = doJailbreak lsuper.lsp-types; # Checks require aeson >= 2.0 - }); + }))); + + # This package is marked as unbuildable on GHC 9.2, so hackage2nix doesn't include any dependencies. + # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self..scope` + hls-haddock-comments-plugin = unmarkBroken (addBuildDepends (with self.hls-haddock-comments-plugin.scope; [ + ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lsp-types unordered-containers + ]) super.hls-haddock-comments-plugin); mime-string = disableOptimization super.mime-string; @@ -118,6 +149,8 @@ self: super: { ghc-prim = self.hashable; }; + hashable = addBuildDepend self.base-orphans super.hashable; + # Doesn't build with 9.0, see https://github.com/yi-editor/yi/issues/1125 yi-core = doDistribute (markUnbroken super.yi-core); @@ -145,4 +178,18 @@ self: super: { # Unnecessarily strict lower bound on base # https://github.com/mrkkrp/megaparsec/pull/485#issuecomment-1250051823 megaparsec = doJailbreak super.megaparsec; + + retrie = dontCheck self.retrie_1_1_0_0; + + # Later versions only support GHC >= 9.2 + ghc-exactprint = self.ghc-exactprint_0_6_4; + + apply-refact = self.apply-refact_0_9_3_0; + + hls-hlint-plugin = super.hls-hlint-plugin.override { + inherit (self) apply-refact; + }; + + # Needs OneTuple for ghc < 9.2 + binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index dbb550f6fd00..941f95c07fac 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -66,6 +66,9 @@ self: super: { process = self.process_1_6_16_0; }); + # Additionally depends on OneTuple for GHC < 9.0 + base-compat-batteries = addBuildDepend self.OneTuple super.base-compat-batteries; + # Ignore overly restrictive upper version bounds. aeson-diff = doJailbreak super.aeson-diff; async = doJailbreak super.async; @@ -73,7 +76,7 @@ self: super: { chell = doJailbreak super.chell; Diff = dontCheck super.Diff; doctest = doJailbreak super.doctest; - hashable = doJailbreak super.hashable; + hashable = addBuildDepend self.base-orphans super.hashable; hashable-time = doJailbreak super.hashable-time; hledger-lib = doJailbreak super.hledger-lib; # base >=4.8 && <4.13, easytest >=0.2.1 && <0.3 integer-logarithms = doJailbreak super.integer-logarithms; @@ -123,45 +126,26 @@ self: super: { liquidhaskell = markBroken super.liquidhaskell; # This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore. - exceptions = super.exceptions_0_10_5; - - # ghc versions which don‘t match the ghc-lib-parser-ex version need the - # additional dependency to compile successfully. - ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser super.ghc-lib-parser-ex; + exceptions = super.exceptions_0_10_7; ormolu = super.ormolu_0_2_0_0; # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers vector = dontCheck super.vector; - ghc-api-compat = doDistribute super.ghc-api-compat_8_6; + ghc-api-compat = doDistribute (unmarkBroken super.ghc-api-compat_8_6); mime-string = disableOptimization super.mime-string; - haskell-language-server = addBuildDepend self.hls-brittany-plugin (super.haskell-language-server.overrideScope (lself: lsuper: { - ghc-lib-parser = lself.ghc-lib-parser_8_10_7_20220219; - ghc-lib-parser-ex = addBuildDepend lself.ghc-lib-parser lself.ghc-lib-parser-ex_8_10_0_24; - # Pick old ormolu and fourmolu because ghc-lib-parser is not compatible - ormolu = doJailbreak lself.ormolu_0_1_4_1; - fourmolu = doJailbreak lself.fourmolu_0_3_0_0; - hlint = lself.hlint_3_2_8; - aeson = lself.aeson_1_5_6_0; - stylish-haskell = lself.stylish-haskell_0_13_0_0; - lsp-types = doJailbreak lsuper.lsp-types; - })); + haskell-language-server = throw "haskell-language-server dropped support for ghc 8.8 in version 1.9.0.0 please use a newer ghc version or an older nixpkgs version"; - hls-hlint-plugin = super.hls-hlint-plugin.overrideScope (lself: lsuper: { - # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 - hlint = lself.hlint_3_2_8; - ghc-lib-parser = lself.ghc-lib-parser_8_10_7_20220219; - ghc-lib-parser-ex = addBuildDepend lself.ghc-lib-parser lself.ghc-lib-parser-ex_8_10_0_24; - }); + hlint = self.hlint_3_2_8; - hls-brittany-plugin = super.hls-brittany-plugin.overrideScope (lself: lsuper: { - brittany = doJailbreak lself.brittany_0_13_1_2; - aeson = lself.aeson_1_5_6_0; - lsp-types = doJailbreak lsuper.lsp-types; - }); + ghc-lib-parser = self.ghc-lib-parser_8_10_7_20220219; + + # ghc versions which don‘t match the ghc-lib-parser-ex version need the + # additional dependency to compile successfully. + ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser self.ghc-lib-parser-ex_8_10_0_24; # has a restrictive lower bound on Cabal fourmolu = doJailbreak super.fourmolu; @@ -189,4 +173,11 @@ self: super: { # Unnecessarily strict lower bound on base # https://github.com/mrkkrp/megaparsec/pull/485#issuecomment-1250051823 megaparsec = doJailbreak super.megaparsec; + + # Needs OneTuple for ghc < 9.2 + binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans; + + # Later versions only support GHC >= 9.2 + ghc-exactprint = self.ghc-exactprint_0_6_4; + apply-refact = self.apply-refact_0_9_3_0; } 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 49a97e8b9178..5748691dd400 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -72,7 +72,14 @@ self: super: { dec = doJailbreak super.dec; ed25519 = doJailbreak super.ed25519; hackage-security = doJailbreak super.hackage-security; - hashable = overrideCabal (drv: { postPatch = "sed -i -e 's,integer-gmp .*<1.1,integer-gmp < 2,' hashable.cabal"; }) (doJailbreak (dontCheck super.hashable)); + hashable = + pkgs.lib.pipe + super.hashable + [ (overrideCabal (drv: { postPatch = "sed -i -e 's,integer-gmp .*<1.1,integer-gmp < 2,' hashable.cabal"; })) + doJailbreak + dontCheck + (addBuildDepend self.base-orphans) + ]; hashable-time = doJailbreak super.hashable-time; HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP); integer-logarithms = overrideCabal (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; }) (doJailbreak super.integer-logarithms); @@ -85,6 +92,7 @@ self: super: { split = doJailbreak super.split; tar = doJailbreak super.tar; time-compat = doJailbreak super.time-compat; + tuple = addBuildDepend self.base-orphans super.tuple; vector = doJailbreak (dontCheck super.vector); vector-binary-instances = doJailbreak super.vector-binary-instances; vector-th-unbox = doJailbreak super.vector-th-unbox; @@ -99,11 +107,31 @@ self: super: { sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; }) (doJailbreak super.language-haskell-extract); - haskell-language-server = super.haskell-language-server.overrideScope (lself: lsuper: { + haskell-language-server = let + # These aren't included in hackage-packages.nix because hackage2nix is configured for GHC 9.2, under which these plugins aren't supported. + # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self..scope` + additionalDeps = with self.haskell-language-server.scope; [ + hls-haddock-comments-plugin + (unmarkBroken hls-splice-plugin) + hls-tactics-plugin + ]; + in addBuildDepends additionalDeps (super.haskell-language-server.overrideScope (lself: lsuper: { # Needed for modern ormolu and fourmolu. # Apply this here and not in common, because other ghc versions offer different Cabal versions. Cabal = lself.Cabal_3_6_3_0; - }); + })); + + # This package is marked as unbuildable on GHC 9.2, so hackage2nix doesn't include any dependencies. + # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self..scope` + hls-haddock-comments-plugin = unmarkBroken (addBuildDepends (with self.hls-haddock-comments-plugin.scope; [ + ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lsp-types unordered-containers + ]) super.hls-haddock-comments-plugin); + + hls-tactics-plugin = unmarkBroken (addBuildDepends (with self.hls-tactics-plugin.scope; [ + aeson extra fingertree generic-lens ghc-exactprint ghc-source-gen ghcide + hls-graph hls-plugin-api hls-refactor-plugin hyphenation lens lsp megaparsec + parser-combinators prettyprinter refinery retrie syb unagi-chan unordered-containers + ]) super.hls-tactics-plugin); # The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x. unordered-containers = dontCheck super.unordered-containers; @@ -124,6 +152,8 @@ self: super: { # https://github.com/Soostone/retry/issues/71 retry = dontCheck super.retry; + ghc-api-compat = unmarkBroken super.ghc-api-compat; + # 2021-09-18: cabal2nix does not detect the need for ghc-api-compat. hiedb = overrideCabal (old: { libraryHaskellDepends = old.libraryHaskellDepends ++ [self.ghc-api-compat]; @@ -133,9 +163,6 @@ self: super: { # Restrictive upper bound on ormolu hls-ormolu-plugin = doJailbreak super.hls-ormolu-plugin; - # Too strict bounds on base - # https://github.com/lspitzner/multistate/issues/9 - multistate = doJailbreak super.multistate; # https://github.com/lspitzner/butcher/issues/7 butcher = doJailbreak super.butcher; @@ -150,4 +177,18 @@ self: super: { # Restrictive upper bound on base and containers sv2v = doJailbreak super.sv2v; + + # Later versions only support GHC >= 9.2 + ghc-exactprint = self.ghc-exactprint_0_6_4; + + retrie = dontCheck self.retrie_1_1_0_0; + + apply-refact = self.apply-refact_0_9_3_0; + + hls-hlint-plugin = super.hls-hlint-plugin.override { + inherit (self) apply-refact; + }; + + # Needs OneTuple for ghc < 9.2 + binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 9e0ee396b2c7..54994347dd93 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -49,12 +49,6 @@ self: super: { # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; - # Tests fail because of typechecking changes - conduit = dontCheck super.conduit; - - # 0.30 introduced support for GHC 9.2. - cryptonite = doDistribute self.cryptonite_0_30; - # cabal-install needs most recent versions of Cabal and Cabal-syntax cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_8_1_0; @@ -67,112 +61,16 @@ self: super: { process = self.process_1_6_16_0; }); - doctest = dontCheck (doJailbreak super.doctest); - - # Tests fail in GHC 9.2 - extra = dontCheck super.extra; - # Jailbreaks & Version Updates - - # This `doJailbreak` can be removed once we have doctest v0.20 - aeson-diff = assert super.doctest.version == "0.18.2"; doJailbreak super.aeson-diff; - - assoc = doJailbreak super.assoc; - async = doJailbreak super.async; - base64-bytestring = doJailbreak super.base64-bytestring; - base-compat = self.base-compat_0_12_2; - base-compat-batteries = self.base-compat-batteries_0_12_2; - binary-instances = doJailbreak super.binary-instances; - ChasingBottoms = doJailbreak super.ChasingBottoms; - constraints = doJailbreak super.constraints; - cpphs = overrideCabal (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";}) super.cpphs; - data-fix = doJailbreak super.data-fix; - dbus = self.dbus_1_2_27; - dec = doJailbreak super.dec; - ed25519 = doJailbreak super.ed25519; - ghc-byteorder = doJailbreak super.ghc-byteorder; - ghc-exactprint = overrideCabal (drv: { - # HACK: ghc-exactprint 1.4.1 is not buildable for GHC < 9.2, - # but hackage2nix evaluates the cabal file with GHC 8.10.*, - # causing the build-depends to be skipped. Since the dependency - # list hasn't changed much since 0.6.4, we can just reuse the - # normal expression. - inherit (self.ghc-exactprint_1_5_0) src version; - revision = null; editedCabalFile = null; - libraryHaskellDepends = [ - self.fail - self.ordered-containers - self.data-default - ] ++ drv.libraryHaskellDepends or []; - }) super.ghc-exactprint; - ghc-lib = doDistribute self.ghc-lib_9_2_5_20221107; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_5_20221107; - ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1; - hackage-security = doJailbreak super.hackage-security; - hashable = super.hashable_1_4_1_0; hashable-time = doJailbreak super.hashable-time; - # 1.1.1 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed - hedgehog = assert super.hedgehog.version == "1.0.5"; doJailbreak super.hedgehog; - HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP); - integer-logarithms = overrideCabal (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; }) (doJailbreak super.integer-logarithms); - indexed-traversable = doJailbreak super.indexed-traversable; - indexed-traversable-instances = doJailbreak super.indexed-traversable-instances; - lifted-async = doJailbreak super.lifted-async; - lukko = doJailbreak super.lukko; - lzma-conduit = doJailbreak super.lzma-conduit; - ormolu = self.ormolu_0_5_0_1; - parallel = doJailbreak super.parallel; - path = doJailbreak super.path; - polyparse = overrideCabal (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }) (doJailbreak super.polyparse); - primitive = doJailbreak super.primitive; - regex-posix = doJailbreak super.regex-posix; - resolv = doJailbreak super.resolv; - retrie = doDistribute (dontCheck self.retrie_1_2_0_1); - singleton-bool = doJailbreak super.singleton-bool; - servant = doJailbreak super.servant; - servant-swagger = doJailbreak super.servant-swagger; # Depends on utf8-light which isn't maintained / doesn't support base >= 4.16 # https://github.com/haskell-infra/hackage-trustees/issues/347 # https://mail.haskell.org/pipermail/haskell-cafe/2022-October/135613.html language-javascript_0_7_0_0 = dontCheck super.language-javascript_0_7_0_0; - # 2022-09-02: Too strict bounds on lens - # https://github.com/haskell-servant/servant/pull/1607/files - servant-docs = doJailbreak super.servant-docs; - servant-foreign = doJailbreak super.servant-foreign; - servant-auth = doJailbreak super.servant-auth; - servant-auth-docs = doJailbreak super.servant-auth-docs; - servant-auth-server = doJailbreak super.servant-auth-server; - servant-auth-swagger = doJailbreak super.servant-auth-swagger; - # 2022-09-02: Too strict bounds on lens - # https://github.com/haskell-servant/servant-multipart/pull/64 - servant-multipart = doJailbreak super.servant-multipart; - # 2022-09-02: Too strict bounds on lens - # https://github.com/GetShopTV/swagger2/pull/242 - swagger2 = doJailbreak super.swagger2; - - shelly = doJailbreak super.shelly; - splitmix = doJailbreak super.splitmix; - tasty-hspec = doJailbreak super.tasty-hspec; th-desugar = self.th-desugar_1_14; - time-compat = doJailbreak super.time-compat; - tomland = doJailbreak super.tomland; - type-equality = doJailbreak super.type-equality; - unordered-containers = doJailbreak super.unordered-containers; vector = dontCheck super.vector; - vector-binary-instances = doJailbreak super.vector-binary-instances; - - hpack = overrideCabal (drv: { - # Cabal 3.6 seems to preserve comments when reading, which makes this test fail - # 2021-10-10: 9.2.1 is not yet supported (also no issue) - testFlags = [ - "--skip=/Hpack/renderCabalFile/is inverse to readCabalFile/" - ] ++ drv.testFlags or []; - }) (doJailbreak super.hpack); - - # lens >= 5.1 supports 9.2.1 - lens = doDistribute self.lens_5_2; # Apply patches from head.hackage. language-haskell-extract = appendPatch (pkgs.fetchpatch { @@ -183,55 +81,20 @@ self: super: { # Tests depend on `parseTime` which is no longer available hourglass = dontCheck super.hourglass; - # 0.17.0 introduced support for GHC 9.2.x, so when this assert fails, the whole block can be removed - memory = assert super.memory.version == "0.16.0"; appendPatch (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/memory-0.16.0.patch"; - sha256 = "1kjganx729a6xfgfnrb3z7q6mvnidl042zrsd9n5n5a3i76nl5nl"; - }) (overrideCabal { - editedCabalFile = null; - revision = null; - } super.memory); - # For -fghc-lib see cabal.project in haskell-language-server. stylish-haskell = enableCabalFlag "ghc-lib" super.stylish-haskell; # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 - hlint = doDistribute (enableCabalFlag "ghc-lib" (super.hlint_3_4_1.override { - ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; - })); + hlint = enableCabalFlag "ghc-lib" super.hlint; # https://github.com/sjakobi/bsb-http-chunked/issues/38 bsb-http-chunked = dontCheck super.bsb-http-chunked; - # 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_9_0_0; - - implicit-hie-cradle = doJailbreak super.implicit-hie-cradle; - # 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed - hashtables = assert super.hashtables.version == "1.2.4.2"; doJailbreak super.hashtables; - # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46 - hiedb = doJailbreak (dontCheck super.hiedb); - - apply-refact = doDistribute super.apply-refact_0_10_0_0; - - # 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 = super.haskell-language-server.override { - hls-haddock-comments-plugin = null; - hls-splice-plugin = null; - hls-tactics-plugin = null; - }; + hiedb = dontCheck super.hiedb; # https://github.com/fpco/inline-c/pull/131 inline-c-cpp = (if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x) super.inline-c-cpp; - - relude = dontCheck self.relude_1_1_0_0; - hermes-json = doJailbreak super.hermes-json; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 9a600b5b6028..6278c728131f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -58,19 +58,11 @@ in { # Tests fail because of typechecking changes conduit = dontCheck super.conduit; - # 0.30 introduced support for GHC 9.2. - cryptonite = doDistribute self.cryptonite_0_30; - - doctest = self.doctest_0_20_1; # consequences of doctest breakage follow: - double-conversion = markBroken super.double-conversion; - blaze-textual = checkAgainAfter super.double-conversion "2.0.4.1" "double-conversion fails to build; required for testsuite" (dontCheck super.blaze-textual); ghc-source-gen = checkAgainAfter super.ghc-source-gen "0.4.3.0" "fails to build" (markBroken super.ghc-source-gen); lucid = jailbreakForCurrentVersion super.lucid "2.11.1"; - invariant = jailbreakForCurrentVersion super.invariant "0.5.6"; - implicit-hie-cradle = jailbreakForCurrentVersion super.implicit-hie-cradle "0.5.0.0"; haskell-src-meta = doJailbreak super.haskell-src-meta; @@ -80,13 +72,10 @@ in { # Jailbreaks & Version Updates aeson = self.aeson_2_1_1_0; - lens-aeson = self.lens-aeson_1_2_2; assoc = doJailbreak super.assoc; async = doJailbreak super.async; base64-bytestring = doJailbreak super.base64-bytestring; - base-compat = self.base-compat_0_12_2; - base-compat-batteries = self.base-compat-batteries_0_12_2; binary-instances = doJailbreak super.binary-instances; ChasingBottoms = doJailbreak super.ChasingBottoms; constraints = doJailbreak super.constraints; @@ -95,11 +84,10 @@ in { dec = doJailbreak super.dec; ed25519 = doJailbreak super.ed25519; ghc-byteorder = doJailbreak super.ghc-byteorder; - ghc-lib = doDistribute self.ghc-lib_9_4_3_20221104; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_4_3_20221104; + ghc-lib = doDistribute self.ghc-lib-parser_9_4_4_20221225; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_4_4_20221225; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_4_0_0; hackage-security = doJailbreak super.hackage-security; - hashable = super.hashable_1_4_1_0; hashable-time = doJailbreak super.hashable-time; HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP); integer-logarithms = overrideCabal (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; }) (doJailbreak super.integer-logarithms); @@ -115,20 +103,18 @@ in { regex-posix = doJailbreak super.regex-posix; resolv = doJailbreak super.resolv; singleton-bool = doJailbreak super.singleton-bool; - - # 2022-09-02: Too strict bounds on lens - # https://github.com/GetShopTV/swagger2/pull/242 - swagger2 = doJailbreak super.swagger2; + rope-utf16-splay = doDistribute self.rope-utf16-splay_0_4_0_0; + shake-cabal = doDistribute self.shake-cabal_0_2_2_3; base-orphans = dontCheck super.base-orphans; # Note: Any compilation fixes need to be done on the versioned attributes, # since those are used for the internal dependencies between the versioned # hspec packages in configuration-common.nix. - hspec = self.hspec_2_10_6; - hspec-core = self.hspec-core_2_10_6; + hspec = self.hspec_2_10_8; + hspec-core = self.hspec-core_2_10_8; hspec-meta = self.hspec-meta_2_10_5; - hspec-discover = self.hspec-discover_2_10_6; + hspec-discover = self.hspec-discover_2_10_8; # the dontHaddock is due to a GHC panic. might be this bug, not sure. # https://gitlab.haskell.org/ghc/ghc/-/issues/21619 @@ -136,11 +122,9 @@ in { # We need >= 1.1.2 for ghc-9.4 support, but we don't have 1.1.x in # hackage-packages.nix hedgehog = doDistribute (dontHaddock super.hedgehog_1_2); - # does not work with hedgehog 1.2 yet: + # tasty-hedgehog > 1.3 necessary to work with hedgehog 1.2: # https://github.com/qfpl/tasty-hedgehog/pull/63 - tasty-hedgehog = markBroken super.tasty-hedgehog; - # due to tasty-hedgehog - retry = checkAgainAfter super.tasty-hedgehog "1.3.0.0" "tasty-hedgehog broken" (dontCheck super.retry); + tasty-hedgehog = self.tasty-hedgehog_1_4_0_0; # https://github.com/dreixel/syb/issues/38 syb = dontCheck super.syb; @@ -154,10 +138,6 @@ in { vector = dontCheck super.vector; vector-binary-instances = doJailbreak super.vector-binary-instances; - # fixed in 1.16.x but it's not in hackage-packages yet. - rebase = jailbreakForCurrentVersion super.rebase "1.15.0.3"; - rerebase = jailbreakForCurrentVersion super.rerebase "1.15.0.3"; - hpack = overrideCabal (drv: { # Cabal 3.6 seems to preserve comments when reading, which makes this test fail # 2021-10-10: 9.2.1 is not yet supported (also no issue) @@ -188,37 +168,31 @@ in { jacinda = doDistribute super.jacinda; some = doJailbreak super.some; - # 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed - hashtables = assert super.hashtables.version == "1.2.4.2"; doJailbreak super.hashtables; - # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46 hiedb = dontCheck super.hiedb; + hlint = self.hlint_3_5; + hls-hlint-plugin = super.hls-hlint-plugin.override { + inherit (self) hlint; + }; + # 2022-10-06: https://gitlab.haskell.org/ghc/ghc/-/issues/22260 ghc-check = dontHaddock super.ghc-check; - # 2022-11-06: Override override from common, because Cabal-syntax is included since ghc 9.4. - implicit-hie = super.implicit-hie.override { - Cabal-syntax = null; - }; + ghc-exactprint = overrideCabal (drv: { + libraryHaskellDepends = with self; [ HUnit data-default fail filemanip free ghc-paths ordered-containers silently syb Diff ]; + }) + self.ghc-exactprint_1_6_1_1; # 2022-10-06: plugins disabled for hls 1.8.0.0 based on # https://haskell-language-server.readthedocs.io/en/latest/support/plugin-support.html#current-plugin-support-tiers haskell-language-server = super.haskell-language-server.override { hls-refactor-plugin = null; - hls-class-plugin = null; hls-eval-plugin = null; hls-floskell-plugin = null; - hls-fourmolu-plugin = null; - hls-gadt-plugin = null; - hls-hlint-plugin = null; hls-ormolu-plugin = null; hls-rename-plugin = null; hls-stylish-haskell-plugin = null; - hls-tactics-plugin = null; - hls-haddock-comments-plugin = null; - hls-retrie-plugin = null; - hls-splice-plugin = null; }; # https://github.com/tweag/ormolu/issues/941 @@ -227,5 +201,9 @@ in { }) (disableCabalFlag "fixity-th" super.ormolu); fourmolu = overrideCabal (drv: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; - }) (disableCabalFlag "fixity-th" super.fourmolu); + }) (disableCabalFlag "fixity-th" super.fourmolu_0_10_1_0); + + # The Haskell library has additional dependencies when compiled with ghc-9.4.x. + X11-xft = addExtraLibraries [pkgs.xorg.libXau pkgs.xorg.libXdmcp pkgs.expat] super.X11-xft; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix similarity index 91% rename from pkgs/development/haskell-modules/configuration-ghc-head.nix rename to pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index a2546c3dc5f4..b96526640bb0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -53,9 +53,7 @@ self: super: { time = null; transformers = null; unix = null; - # GHC only bundles the xhtml library if haddock is enabled, check if this is - # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 - xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; + xhtml = null; # https://github.com/tibbe/unordered-containers/issues/214 unordered-containers = dontCheck super.unordered-containers; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 89a0bdf77fa1..e1ee3b669e66 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -47,6 +47,7 @@ broken-packages: - acme-zalgo - acme-zero - AC-MiniTest + - acousticbrainz-client - AC-Terminal - ActionKid - activehs-base @@ -60,23 +61,22 @@ broken-packages: - adaptive-tuple - adb - addy + - adjunction - adobe-swatch-exchange - - ADPfusion - adp-multi - adtrees - - advent-of-code-ocr - AERN-Basics - aeson-applicative - aeson-bson - aeson-decode - aeson-default - - aeson-dependent-sum - aeson-deriving - aeson-diff-generic - aeson-filthy - aeson-flat - aeson-flatten - aeson-flowtyped + - aeson-gadt-th - aeson-injector - aeson-json-ast - aeson-lens @@ -84,7 +84,6 @@ broken-packages: - aeson-modern-tojson - aeson-options - aeson-parsec-picky - - aeson-picker - aeson-prefix - aeson-schema - aeson-schemas @@ -102,13 +101,14 @@ broken-packages: - agda-snippets - agda-unused - AGI - - ag-pictgen - AhoCorasick - aig - airbrake + - air-extra - airship - airtable-api - air-th + - aivika-gpss - ajhc - AlanDeniseEricLauren - alerta @@ -119,14 +119,18 @@ broken-packages: - algebra-dag - algebraic-classes - algebraic-prelude + - algorithmic-composition-additional + - algorithmic-composition-complex - AlgorithmW - algo-s - align-text - ally-invest + - alpaca-netcode - alphachar - alpino-tools - alsa - alsa-midi + - alsa-seq - altcomposition - alternative-extra - alternative-io @@ -139,12 +143,14 @@ broken-packages: - AMI - amqp-conduit - analyze + - analyze-client - anansi-pandoc - android - android-activity - android-lint-summary - angel - angle + - animalcase - Animas - animascii - animate @@ -161,7 +167,9 @@ broken-packages: - antlr-haskell - anydbm - Aoide + - aop-prelude - aosd + - apache-md5 - apart - api-builder - api-rpc-factom @@ -184,6 +192,7 @@ broken-packages: - arbor-monad-logger - arbor-monad-metric - arbor-postgres + - arch-hs - archiver - archlinux - archnews @@ -210,10 +219,12 @@ broken-packages: - artifact - asap - ascii85-conduit + - ascii-caseless - ascii-flatten - ascii-string - ascii-vector-avc - - asil + - asif + - asn1-ber-syntax - asn1-codec - asn1-data - AspectAG @@ -231,11 +242,13 @@ broken-packages: - async-manager - async-timer - aterm + - atlassian-connect-descriptor - atndapi + - atom - atomic-primops-vector - - atom-msp430 - atomo - atp-haskell + - ats-pkg - ats-setup - ats-storable - attempt @@ -257,14 +270,12 @@ broken-packages: - authenticate-ldap - authinfo-hs - auto - - autodocodec-yaml - autom - autonix-deps - autopack - avatar-generator - aviation-units - avl-static - - avro - avro-piper - avr-shake - avwx @@ -301,9 +312,12 @@ broken-packages: - barrie - barrier - barrier-monad + - base16-lens + - base32-lens - base58address - base62 - base64-conduit + - base64-lens - base-compat-migrate - base-encoding - base-feature-macros @@ -332,18 +346,17 @@ broken-packages: - bencoding-lens - berkeleydb - BerkeleyDBXML + - berp - bert - besout - bet - betacode - bgmax - bgzf - - bhoogle - bibdb - bidi-icu - bidirectional - bidirectional-instances - - bidirectionalization-combined - bidispec - bidispec-extras - BiGUL @@ -353,8 +366,9 @@ broken-packages: - binary-derive - binary-ext - binary-indexed-tree - - binary-io + - binary-parsers - binary-protocol + - binary-strict - binary-tree - binary-typed - BinderAnn @@ -387,14 +401,13 @@ broken-packages: - bindings-wlc - bind-marshal - binembed - - bins + - binsm - bio - - BiobaseBlast - BiobaseNewick - - BiobaseTurner - biocore - biohazard - bio-sequence + - birds-of-paradise - biscuit-haskell - bisect-binary - bishbosh @@ -408,15 +421,14 @@ broken-packages: - bits-extras - bitspeak - bit-stream + - bitstream - BitStringRandomMonad - BitSyntax - bitx-bitcoin - bizzlelude-js - bkr - blakesum - - Blammo - blas - - blaze-html-contrib - blaze-html-hexpat - blaze-html-truncate - blaze-json @@ -428,6 +440,7 @@ broken-packages: - blockchain - blockhash - Blogdown + - BlogLiterately - bloomfilter-redis - blosum - blubber-server @@ -439,18 +452,15 @@ broken-packages: - bolt - boltzmann-brain - bookhound - - bookkeeper + - boolean-like - boolean-normal-forms - boolexpr - boombox - - boots-app - boring-window-switcher - borsh - bot - botpp - bottom - - boundingboxes - - bowntz - box - bpath - BPS @@ -460,9 +470,11 @@ broken-packages: - Bravo - brians-brain - brick-dropdownmenu - - brick-panes + - brick-filetree - bricks-internal - brillig + - brittany + - broadcast-chan-tests - broccoli - brok - broker-haskell @@ -474,7 +486,6 @@ broken-packages: - bson-generics - bson-mapping - bsparse - - btree-concurrent - btrfs - buffer - buffer-builder-aeson @@ -491,6 +502,7 @@ broken-packages: - bumper - bunz - burst-detection + - bus-pirate - buster - Buster - butter @@ -499,6 +511,7 @@ broken-packages: - byline - by-other-names - bytearray-parsing + - bytepatch - bytestring-aeson-orphans - bytestring-arbitrary - bytestring-class @@ -514,6 +527,7 @@ broken-packages: - bytestring-substring - bytestring-time - bytestring-typenats + - bzlib - bzlib-conduit-jappie - c10k - c2ats @@ -527,7 +541,6 @@ broken-packages: - cabal-constraints - cabal-db - cabal-dependency-licenses - - cabal-detailed-quickcheck - cabal-dev - cabal-dir - cabal-edit @@ -547,6 +560,7 @@ broken-packages: - cabal-meta - cabal-mon - cabal-nirvana + - cabal-plan-bounds - cabal-progdeps - cabalQuery - CabalSearch @@ -564,43 +578,40 @@ broken-packages: - caching - cacophony - cafeteria-prelude - - caffegraph - cairo-core - cake3 - cal3d - - calamity - caledon - calenderweek - call-alloy - cal-layout - call-haskell-from-anything - call-plantuml - - camfort - canon - canonical-filepath - - canonical-json - canteven-listen-http - canteven-log - canteven-parsedate - cantor + - capataz - capped-list - capri - caps - - captcha-core - caramia - carbonara - carettah - CarneadesDSL - carte - Cartesian + - casa-abbreviations-and-acronyms - casadi-bindings-internal - Cascade - cascading - caseof - - cases - cas-hashable - casr-logbook - casr-logbook-types + - cassandra-cql - Cassava - cassava-conduit - cassava-records @@ -609,6 +620,7 @@ broken-packages: - catamorphism - Catana - catch-fd + - category-printf - category-traced - catnplus - cautious-file @@ -624,6 +636,7 @@ broken-packages: - CC-delcont-ref-tf - cci - ccnx + - cdp - c-dsl - cedict - cef @@ -637,15 +650,16 @@ broken-packages: - cfn-flip - cg - cgen - - cgi-utils + - cgi - cgroup-rts-threads + - chakra - chalkboard - chalmers-lava2000 + - ChannelT - character-cases - charter - chart-histogram - Chart-simple - - chart-svg - chaselev-deque - chatty-text - chatwork @@ -653,27 +667,26 @@ broken-packages: - Checked - checkmate - chez-grater - - chiasma + - chiphunk - Chitra - choose - chorale - chp - - chp-spec - - chr-data - ChristmasTree + - chronograph - chr-parse - chunky - church - church-maybe - - church-pair - - churros - - cicero-api - cielo - cil - cinvoke - c-io - cio + - cipher-aes128 - cipher-blowfish + - cipher-des + - circle - circlehs - citeproc-hs - cjk @@ -685,18 +698,18 @@ broken-packages: - clanki - clarifai - CLASE - - clashilator - - clash-multisignal - - clash-prelude-quickcheck + - clash-prelude - Clash-Royale-Hack-Cheats - - clash-systemverilog - - clash-verilog - - clash-vhdl - ClassLaws - classy-influxdb-simple - classy-parallel - classyplate - ClassyPrelude + - clay + - clckwrks-plugin-bugs + - clckwrks-plugin-mailinglist + - clckwrks-theme-clckwrks + - clckwrks-theme-geo-bootstrap - cld2 - Clean - clean-unions @@ -704,7 +717,6 @@ broken-packages: - clexer - CLI - cli-builder - - clickhouse-haskell - clif - clifm - cli-git @@ -714,13 +726,16 @@ broken-packages: - clipper - clisparkline - clit + - clocked - clock-extras - clogparse - clone-all - closure - cloudfront-signer - clr-inline + - clr-typed - cluss + - clustering - cmark-highlight - cmark-patterns - cmark-sections @@ -738,27 +753,25 @@ broken-packages: - cobot-tools - code-builder - codec-beam - - codec-libevent - codecov-haskell - codeforces-cli - codepad - - codeworld-api - codex - codo-notation + - coercible-utils - coin - coinbase-pro - - cointracking-imports + - colchis - collada-output - collapse-util + - collate - collections - collections-api - co-log-concurrent - co-log-json - - co-log-polysemy-formatting - co-log-sys - colonnade - colorless - - colors - coltrane - com - comark-syntax @@ -767,21 +780,21 @@ broken-packages: - combinatorial-problems - combinator-interactive - combobuffer + - comic - Command - commander + - commander-cli - Commando - - commsec + - commodities + - compact - Compactable - compact-list - compact-map - - compact-mutable-vector - compact-sequences - - compact-socket - compact-string - compact-string-fix - comparse - compdata - - compdoc - compendium-client - competition - compilation @@ -789,9 +802,8 @@ broken-packages: - composable-associations-aeson - compose-trans - composite-aeson-path + - composite-aeson-refined - composite-cassava - - composite-dhall - - composite-lens-extra - composition-tree - compressed - compression @@ -799,17 +811,20 @@ broken-packages: - computations - concrete-relaxng-parser - concrete-typerep - - concur-core + - concurrency-benchmarks - concurrent-buffer - Concurrent-Cache - Concurrential - concurrent-st - concurrent-state + - concurrent-supply - concurrent-utilities + - conditional-restriction-parser - condorcet - conductive-base - conduit-audio-lame - conduit-audio-samplerate + - conduit-connection - conduit-find - conduit-iconv - conduit-network-stream @@ -817,10 +832,12 @@ broken-packages: - conduit-tokenize-attoparsec - conduit-vfs - conf + - conferer-dhall - conferer-hspec - conferer-provider-json - conferer-snap - conferer-source-json + - conferer-warp - confide - ConfigFileTH - config-parser @@ -837,17 +854,21 @@ broken-packages: - Conscript - consistent - console-program + - constable - const-math-ghc-plugin + - constrained - constrained-categories - constrained-dynamic - constrained-monads - ConstraintKinds + - constraints-deriving - constraints-emerge - constr-eq - constructive-algebra - consul-haskell - Consumer - containers-benchmark + - containers-unicode-symbols - containers-verified - ContArrow - ContextAlgebra @@ -855,6 +876,7 @@ broken-packages: - contiguous-checked - contiguous-fft - continue + - contracheck-applicative - Contract - contra-tracers - control-dsl @@ -862,25 +884,26 @@ broken-packages: - control-monad-failure - control-monad-failure-mtl - Control-Monad-ST2 - - contstuff - - copilot-sbv + - contstuff-monads-tf + - contstuff-transformers + - convert-annotation - copr - coquina - COrdering - core - corebot-bliki + - core-compiler - CoreDump - CoreErlang - core-haskell - corenlp-parser - - core-telemetry + - core-warn - Coroutine - coroutine-object - CouchDB - couchdb-conduit - couch-hs - counter - - country - courier - court - coverage @@ -898,12 +921,12 @@ broken-packages: - craftwerk - crawlchain - crc16 + - crc32c - crdt - crdt-event-fold - credential-store - critbit - criterion-cmp - - criterion-compare - criterion-plus - criterion-to-html - criu-rpc-types @@ -926,7 +949,7 @@ broken-packages: - csa - cse-ghc-plugin - csg - - CSPM-FiringRules + - csound-expression-dynamic - CSPM-Frontend - cspretty - css @@ -935,25 +958,28 @@ broken-packages: - css-syntax - C-structs - csv-nptools + - csv-sip - ctemplate - ctkl - cuboid - cuckoo-filter - curl-aeson - curl-runnings + - curly-expander - currency-convert - curry-base - CurryDB - - curryer-rpc - curry-frontend - curryrs - curves - custom-prelude + - cutter - cut-the-crap - CV - d3js - dag - DAG-Tournament + - dahdit - damnpacket - danibot - dao @@ -966,11 +992,12 @@ broken-packages: - darkplaces-rcon - darkplaces-text - data-accessor-monadLib + - data-accessor-monads-fd - data-accessor-monads-tf - data-accessor-template + - data-ascii - data-aviary - data-base - - database-id-groundhog - database-migrate - database-study - data-check @@ -978,11 +1005,11 @@ broken-packages: - data-concurrent-queue - data-construction - data-constructors + - data-default-instances-new-base - data-dispersal - data-diverse - datadog - data-easy - - data-elevator - data-embed - data-emoticons - data-filepath @@ -993,7 +1020,9 @@ broken-packages: - DataIndex - data-ivar - data-kiln - - data-lens + - data-lens-fd + - data-lens-ixset + - data-lens-template - datalog - data-map-multikey - data-named @@ -1014,13 +1043,11 @@ broken-packages: - data-standards - data-store - data-stringmap - - data-sword - DataTreeView - data-type - data-util - data-validation - data-variant - - DataVersion - dates - datetime - datetime-sb @@ -1041,17 +1068,18 @@ broken-packages: - dcpu16 - ddc-base - ddc-code - - ddc-core - dead-code-detection - Deadpan-DDP - dead-simple-json + - debug-me - debug-tracy - decepticons - - decimal-literals + - decision-diagrams - DecisionTree - decoder-conduit - deepcontrol - DeepDarkFantasy + - deepl - deepseq-bounded - deepseq-instances - deepseq-magic @@ -1065,23 +1093,27 @@ broken-packages: - dense - dense-int-set - dependent-hashmap - - dependent-monoidal-map - - dep-t + - dep-t-dynamic - deptrack-core + - dep-t-value - derangement - derivation-trees - derive - derive-enumerable - derive-gadt - deriveJsonNoPrefix + - derive-lifted-instances - derive-monoid - derive-trie + - deriving-openapi3 - derp-lib - describe + - descriptive - deterministic-game-engine - detrospector - deunicode - devil + - df1-html - Dflow - dfsbuild - dgim @@ -1096,11 +1128,13 @@ broken-packages: - dia-base - diagrams-boolean - diagrams-builder + - diagrams-gtk - diagrams-pdf - diagrams-qrcode - diagrams-rubiks-cube - diagrams-tikz - dialogflow-fulfillment + - dialogue - dib - dice2tex - dicom @@ -1108,6 +1142,7 @@ broken-packages: - dictparser - diet - diffcabal + - differential - DifferentialEvolution - diff-gestalt - diffmap @@ -1116,13 +1151,14 @@ broken-packages: - digestive-foundation-lucid - digestive-functors-aeson - digestive-functors-happstack + - digestive-functors-snap - digest-pure - DigitalOcean - digitalocean-kzs - digits + - digraph - dijkstra-simple - DimensionalHash - - dimensional-tf - diophantine - diplomacy - direct-binary-files @@ -1131,9 +1167,8 @@ broken-packages: - direct-http - direct-plugins - direm - - dirtree - - discord-haskell - discordian-calendar + - discord-register - discord-types - discrete - DiscussionSupportSystem @@ -1141,7 +1176,7 @@ broken-packages: - disjoint-containers - disjoint-set - disjoint-set-stateful - - disk-bytes + - diskhash - Dist - distance - distributed-closure @@ -1152,37 +1187,37 @@ broken-packages: - djinn-th - dmcc - dmenu - - dnf-repo - - dns-patterns + - dnscache - dnsrbl - dnssd - dobutok - dobutokO - - dobutokO-frequency - doccheck - docidx - docker-build-cacher - dockercook - dockerfile-creator + - docopt - docrecords - doctest-discover-configurator + - doctest-extract - doctest-prop - docusign-example - docvim - DOH - doi + - domain-optics - dom-parser - domplate - dom-selector - - do-notation - do-notation-dsl - dormouse-uri - do-spaces - dotfs - dot-linker + - dotparse - doublezip - doublify-toolkit - - downhill - downloader - dozenal - dozens @@ -1198,11 +1233,10 @@ broken-packages: - DrIFT - DrIFT-cabalized - drifter-postgresql - - drinkery - drmaa - drone - dropbox - - DSA + - drunken-bishop - dsc - ds-kanren - dsmc @@ -1211,20 +1245,24 @@ broken-packages: - dstring - DTC - dtd-text + - dtw - dualizer - duckling - duet + - dumb-cas - dump-core - dunai-core - Dung - duplo - dura + - duration - dvault - dvdread - dvi-processing - dwarf - dwarfadt - dyckword + - dyna-brick - dynamic-graphs - dynamic-mvector - dynamic-object @@ -1249,7 +1287,7 @@ broken-packages: - easytest - ebeats - ebnf-bff - - eccrypto-ed25519-bindings + - eccrypto - ecma262 - ecta-plugin - ecu @@ -1257,24 +1295,23 @@ broken-packages: - ede - edenmodules - edis - - EdisonAPI - edit - edit-lenses - editline - effectful-st - effect-handlers - effective-aspects - - effect-monad - effect-stack - effet - effin + - eflint - egison-pattern-src - ehaskell - - ehlo - ehs - eibd-client-simple - eigen - Eight-Ball-Pool-Hack-Cheats + - eio - EitherT - either-unwrap - ejdb2-binding @@ -1287,9 +1324,9 @@ broken-packages: - ekg-rrd - ekg-statsd - elevator + - eliminators - elision - elm-export-persistent - - elminator - elm-street - elm-websocket - elocrypt @@ -1303,9 +1340,11 @@ broken-packages: - Empty - empty-monad - enchant + - encode-string - encoding - encoding-io - encryptable + - endo - engine-io - entwine - EnumContainers @@ -1325,9 +1364,9 @@ broken-packages: - epic - epi-sim - epoll - - eprocess - epubname - Eq + - equal-files - EqualitySolver - equational-reasoning-induction - equeue @@ -1345,10 +1384,10 @@ broken-packages: - ert - escape-artist - escoger + - espial - esqueleto-pgcrypto - ess - - essence-of-live-coding-gloss-example - - essence-of-live-coding-pulse-example + - essence-of-live-coding - EstProgress - Etage - etc @@ -1356,22 +1395,20 @@ broken-packages: - ethereum-rlp - eurofxref - evdev-streamly - - eve + - eve-cli - eved - event - event-driven - - eventful-sql-common - eventsource-api + - eventsourced - eventstore - - eventuo11y - - eventuo11y-dsl - - evoke - - ewe - exact-cover - exact-real-positional - except-exceptions - exceptional - exceptionfree-readfile + - exception-monads-fd + - exception-via - exchangerates - execs - executor @@ -1383,13 +1420,12 @@ broken-packages: - exinst - exists - exitcode - - exon - exp-cache + - exp-extended - explain - explicit-constraint-lens - explicit-determinant - explicit-iomodes - - exploring-interpreters - exposed-containers - expression-parser - expressions @@ -1397,9 +1433,10 @@ broken-packages: - extcore - extended-categories - extended-containers + - extensible-data - extensible-effects-concurrent - extensible-skeleton - - Extra + - external-sort - extractelf - ez3 - ez-couch @@ -1409,6 +1446,7 @@ broken-packages: - fadno-braids - fadno-xml - failable-list + - FailT - failure-detector - fake - fake-type @@ -1417,38 +1455,47 @@ broken-packages: - falling-turnip - fastbayes - fast-combinatorics + - fast-downward - fastedit + - fastly - fast-nats - fastpbkdf2 - FastPush + - fast-tagsoup-utf8-only - FastxPipe - fathead-util + - fay - fbmessenger-api - fb-persistent - fca - fcache - fcf-composite + - fcf-graphs - fcg - - fckeditor - fclabels-monadlib - fcm-client - fdo-trash + - feather - feature-flipper - fedora-packages - feed-cli - feed-collect - feed-crawl - fei-cocoapi + - feldspar-language - fenfire - fernet - FerryCore + - festival - Feval - fez-conf - ffeed + - fft - ffunctor - fgl-extras-decompositions - fib - fibon + - fields - fieldwise - fig - file-collection @@ -1472,7 +1519,6 @@ broken-packages: - find-source-files - fingertree-psqueue - fingertree-tf - - finitary - finite - FiniteCategories - finite-fields @@ -1484,6 +1530,7 @@ broken-packages: - fits-parse - fixed-point - fixedprec + - fixed-precision - fixed-storable-array - fixed-timestep - fixed-width @@ -1501,10 +1548,11 @@ broken-packages: - flexible-time - flickr - flink-statefulfun - - float128 - float-binstring - floating-bits + - flock - flowdock + - flowdock-api - flowdock-rest - flow-er - flowlocks-framework @@ -1533,11 +1581,14 @@ broken-packages: - for-free - forger - ForkableT + - formal - formattable + - forml - formura - Fortnite-Hack-Cheats-Free-V-Bucks-Generator - fortran-src-extras - foscam-filename + - fpe - FPretty - fptest - fquery @@ -1562,10 +1613,12 @@ broken-packages: - freesound - free-theorems - FreeTypeGL + - freetype-simple - free-v-bucks-generator-no-survey - free-v-bucks-generator-ps4-no-survey - freq - fresh + - fresnel - friday-devil - friday-scale-dct - frown @@ -1599,7 +1652,6 @@ broken-packages: - fused-effects-exceptions - fused-effects-mwc-random - fused-effects-resumable - - fused-effects-squeal - fusion - futhask - futun @@ -1607,11 +1659,13 @@ broken-packages: - fuzzyfind - fuzzy-timings - fwgl + - fxpak - g4ip - galois-field - gameclock - game-probability - gamgee + - Gamgine - gamma - Ganymede - garepinoh @@ -1624,16 +1678,16 @@ broken-packages: - gegl - gelatin - gemcap - - gemini-exports + - gemini-server - gemstone - gencheck - gender - genders + - general-allocate - general-prelude - GeneralTicTacToe - generator - generators - - generic-accessors - generic-binary - generic-church - generic-enum @@ -1641,21 +1695,24 @@ broken-packages: - generic-labels - generic-lens-labels - generic-lucid-scaffold + - generic-match - generic-maybe - generic-override - generic-pretty + - generic-pretty-instances + - generic-records - genericserialize - generic-server - generics-mrsop - generic-storable - generic-tree - - generic-trie - generic-xml - generic-xmlpickler - genetics - genifunctors - gen-imports - geniplate + - geniplate-mirror - gen-passwd - genprog - gentlemark @@ -1670,13 +1727,13 @@ broken-packages: - geos - Get - getflag - - gf - GGg - ggtsTC + - ghc-api-compat - ghc-clippy-plugin - ghc-core-smallstep - ghc-datasize - - ghc-debug-convention + - ghc-debug-client - ghc-dump-tree - ghc-dup - ghc-events-analyze @@ -1707,10 +1764,8 @@ broken-packages: - ghc-srcspan-plugin - ghc-syb - ghc-syb-utils - - ghc-tags - ghc-tags-core - ghc-time-alloc-prof - - ghcup - ghc-usage - gh-labeler - gi-adwaita @@ -1720,13 +1775,13 @@ broken-packages: - gi-gio-hs-list-model - gi-graphene - gi-gsttag + - gi-gtk-declarative - gi-gtk-layer-shell - gi-gtksheet - gi-handy - - ginger - gingersnap - ginsu - - gi-pangocairo + - gipeda - giphy-api - gist - GiST @@ -1747,10 +1802,8 @@ broken-packages: - gitlab-api - gitlab-haskell - gitlib-cmdline - - gitlib-libgit2 - gitlib-utils - git-repair - - gitson - gitter - git-vogue - glade @@ -1772,14 +1825,12 @@ broken-packages: - glpk-headers - gltf-codec - glue - - gluturtle - g-npm - goa - goal-core - goatee - gochan - godot-haskell - - godot-megaparsec - gofer-prelude - gogol-core - gooey @@ -1792,14 +1843,17 @@ broken-packages: - googlepolyline - google-search - google-server-api + - google-static-maps - google-translate - gopherbot - gopro-plus - gore-and-ash + - gothic - GotoT-transformers + - gotta-go-fast - gpah - GPipe - - GPipe-GLFW4 + - GPipe-Core - gpmf - gpx-conduit - graceful @@ -1807,7 +1861,6 @@ broken-packages: - Grafos - grakn - grammatical-parsers - - grapefruit-frp - Graph500 - Graphalyze - graphbuilder @@ -1833,22 +1886,22 @@ broken-packages: - greg-client - gremlin-haskell - Grempa - - grenade - greplicate - gridfs - grids - grm - GroteTrap - - groundhog-mysql - - groundhog-th + - groundhog + - group-by-date + - groups-generic - group-theory - group-with - growler + - grow-vector - grpc-api-etcd - gsl-random - gstreamer - GTALib - - gtfs-realtime - gtk2hs-cast-th - gtk2hs-hello - gtk2hs-rpn @@ -1867,21 +1920,20 @@ broken-packages: - h2c - haar - HABQT + - hack2-contrib - hack2-handler-warp - hackage2hwn - hackage-api - hackage-diff + - hackage-mirror - hackage-processing - hackage-proxy - hackager - - hackage-repo-tool - hackage-server - hackage-whatsnew - hackernews - hack-frontend-happstack - hack-handler-cgi - - hack-handler-happstack - - hack-handler-kibro - HackMail - hackport - hactor @@ -1892,6 +1944,7 @@ broken-packages: - haddock-test - hadoop-formats - hadoop-rpc + - hadoop-streaming - hafar - Haggressive - hahp @@ -1922,6 +1975,9 @@ broken-packages: - halipeto - halive - halma + - halves + - ham + - HaMinitel - hampp - hamsql - hamtmap @@ -1931,6 +1987,7 @@ broken-packages: - HandlerSocketClient - handsy - Hangman + - HangmanAscii - hannahci - hans - hanspell @@ -1947,14 +2004,17 @@ broken-packages: - happstack-monad-peel - happstack-server-tls-cryptonite - happstack-util + - happstack-yui - HAppS-Util - happybara - happybara-webkit-server + - happy-hour - HappyTree - hapstone - HaPy - haquery - harchive + - hardware-edsl - harfbuzz-pure - HARM - HarmTrace-Base @@ -1962,13 +2022,14 @@ broken-packages: - harpy - harvest-api - has + - hasbolt - HasCacBDD - hascar + - hascard - hascas - hash - hashable-extras - hashable-generics - - hashable-orphans - hashabler - hashed-storage - hashring @@ -1986,12 +2047,13 @@ broken-packages: - haskell98 - haskell98libraries - haskell-abci + - haskell-admin-core - HaskellAnalysisProgram - haskell-awk + - haskell-bcrypt - haskell-bitmex-rest - haskell-brainfuck - haskell-cnc - - haskell-coffee - haskell-compression - haskell-conll - haskell-course-preludes @@ -2008,7 +2070,7 @@ broken-packages: - haskell-in-space - haskell-kubernetes - HaskellLM - - haskell-lsp + - haskell-lsp-types - haskell-ml - haskell-mpfr - haskell-names @@ -2047,8 +2109,8 @@ broken-packages: - haskhol-core - haskmon - haskoin - - haskoin-core - haskoin-util + - haskoin-wallet - haskore - haskore-vintage - HaskRel @@ -2056,19 +2118,21 @@ broken-packages: - hasktorch-ffi-th - hasktorch-signatures-partial - hasktorch-signatures-support - - haskus-binary + - haskus-utils-variant - haskyapi - hasmin - haspara + - hasparql-client - hasql-backend - hasql-class - hasql-cursor-transaction - hasql-explain-tests - hasql-generic + - hasql-interpolate - hasql-resource-pool - hasql-simple - - hasql-streams-example - - hasql-transaction-io + - hasql-streams-core + - hasql-url - hastache - haste - haste-prim @@ -2080,11 +2144,12 @@ broken-packages: - haven - haverer - hax - - haxl-facebook + - haxl - haxparse - haxr-th - hayland - hayoo-cli + - hb3sum - hBDD-CMUBDD - hBDD-CUDD - hbeanstalk @@ -2100,6 +2165,7 @@ broken-packages: - hchesslib - hcltest - hcoap + - hcobs - hcom - hcron - hCsound @@ -2109,10 +2175,8 @@ broken-packages: - hdbc-postgresql-hstore - HDBC-postgresql-hstore - hdevtools - - hdf - hdf5 - hDFA - - hdigest - hdis86 - hdiscount - hdm @@ -2121,6 +2185,7 @@ broken-packages: - hdr-histogram - HDRUtils - headergen + - headroom - heap-console - heapsort - heart-core @@ -2128,9 +2193,9 @@ broken-packages: - heckle - heddit - hedgehog-checkers + - hedgehog-gen - hedgehog-generic - hedgehog-golden - - hedgehog-lens - hedgehog-servant - hedis-config - hedis-namespace @@ -2139,10 +2204,11 @@ broken-packages: - hedra - heidi - hein + - heist-aeson - heist-async + - heist-emanote - helisp - helix - - hell - helm - help-esb - hemkay @@ -2172,12 +2238,11 @@ broken-packages: - hext - hextra - heyefi - - heystone + - heyting-algebras - hF2 - hfann - HFitUI - hfmt - - hfoil - hfov - HFrequencyQueue - hfusion @@ -2190,7 +2255,6 @@ broken-packages: - hGelf - hgeometric - hgeometry-ipe - - hgettext - hgis - hgom - hgopher @@ -2206,6 +2270,7 @@ broken-packages: - hi - hi3status - hichi + - hid - hidden-char - hid-examples - hieraclus @@ -2213,18 +2278,20 @@ broken-packages: - hierarchy - hiernotify - higgledy + - higher-leveldb - higherorder - highjson - highlight-versions - highWaterMark + - hills - himg - hindley-milner - hindley-milner-type-check - - hinotify-conduit - hinquire - hinstaller - hinter - hinterface + - hint-server - hipchat-hs - hipe - Hipmunk @@ -2248,9 +2315,9 @@ broken-packages: - hkt - hlbfgsb - hleap - - hledger-api - hledger-chart - hledger-diff + - hledger-iadd - hledger-irr - hledger-vty - hlibBladeRF @@ -2260,18 +2327,19 @@ broken-packages: - hlogger - HLogger - hlongurl - - hlrdb-core - - hls-exactprint-utils + - hls-brittany-plugin + - hls-haddock-comments-plugin - hls-selection-range-plugin - hls-stan-plugin + - hls-tactics-plugin - hlwm + - hly - hmarkup - hmatrix-banded - hmatrix-mmap - hmatrix-nipals - hmatrix-sparse - hmatrix-static - - hmatrix-sundials - hmatrix-svdlibc - hmatrix-syntax - hmatrix-tests @@ -2283,7 +2351,6 @@ broken-packages: - hMollom - hmp3 - Hmpf - - hmpfr - hmumps - hnetcdf - hnn @@ -2304,14 +2371,12 @@ broken-packages: - hogg - hoggl - hois - - hol - hold-em - hole - holmes - homeomorphic - homoiconic - homplexity - - honeycomb - honi - hoobuddy - hood2 @@ -2324,8 +2389,9 @@ broken-packages: - hopencc - hopencl - HOpenCV + - hopenpgp-tools - hopfield - - hoppy-runtime + - hoppy-generator - hops - hoq - horizon @@ -2337,6 +2403,7 @@ broken-packages: - houseman - hp2any-core - hpack-convert + - hpack-dhall - hpapi - hpasteit - HPath @@ -2347,18 +2414,16 @@ broken-packages: - hplaylist - hpodder - hpqtypes - - hprotoc - hps-kmeans - hPushover - hpygments - hpylos - hpyrg - - hq - - HQu - - hquantlib + - hquantlib-time - hquery - hR - hreq-core + - hRESP - h-reversi - hricket - Hricket @@ -2366,27 +2431,19 @@ broken-packages: - hruby - hs2bf - hs2ps - - hsaml2 - hsay - hsbc - hsbencher - hs-brotli - - hsc3-cairo - - hsc3-db - - hsc3-dot - - hsc3-lang - - hsc3-process - - hsc3-rec + - hsc3 - hsc3-rw - hsc3-sf - - hsc3-unsafe - hscaffold - hscamwire - hs-carbon-examples - hscd - - hs-cdb - hscdio - - hschema + - hschema-aeson - hscim - hsclock - hScraper @@ -2406,7 +2463,6 @@ broken-packages: - hsfilt - hs-fltk - hsforce - - hs-functors - hs-gizapp - hsgnutls - hsgnutls-yj @@ -2428,19 +2484,19 @@ broken-packages: - hslogger-reader - hslogger-template - hs-logo + - hslua-examples - hslua-list - hsluv-haskell - hsmagick - - HSmarty - hsmodetweaks - Hsmtlib - hsmtpclient - hsnock - hs-nombre-generator - hsns + - hsnsq - hsntp - hs-openmoji-data - - hs-opentelemetry-instrumentation-hspec - hsoptions - hsoz - hsparql @@ -2457,6 +2513,7 @@ broken-packages: - hspec-snap - hspec-structured-formatter - hspec-tables + - hspec-webdriver - HsPerl5 - hs-pgms - hspkcs11 @@ -2491,26 +2548,24 @@ broken-packages: - hsx - hsXenCtrl - hsyscall - - hsyslog-tcp + - hsyslog-udp - hszephyr - hTalos - - htar - htdp-image - hTensor - htestu - HTicTacToe - htiled - htlset - - html-charset - - html-parse - html-rules - html-tokenizer - htoml - htoml-megaparsec + - hts - htsn - htssets - - http2-client - - http2-grpc-proto-lens + - http2-client-exe + - http2-grpc-types - http-attoparsec - http-client-lens - http-client-request-modifiers @@ -2520,10 +2575,13 @@ broken-packages: - http-conduit-downloader - http-directory - http-dispatch + - http-encodings - http-grammar - http-kinder + - http-kit - http-listen - http-monad + - http-pony - http-pony-serve-wai - http-proxy - http-querystring @@ -2549,7 +2607,6 @@ broken-packages: - HUnit-Diff - HUnit-Plus - hunit-rematch - - hunspell-hs - hup - hurl - hurriyet @@ -2559,17 +2616,20 @@ broken-packages: - hVOIDP - hwall-auth-iitk - hw-ci-assist + - hw-dump - hweblib - hwhile - hw-json-demo - - hw-lazy + - hw-json-lens - hworker - hw-playground-linear + - hw-prim-bits + - hw-simd-cli - hwsl2 + - hw-tar - hx - hxmppc - HXQ - - hxt-cache - hxt-pickle-utils - hyakko - hydra-hs @@ -2577,13 +2637,13 @@ broken-packages: - hydrogen-multimap - hylide - hylolib + - hyper - hyperdrive - hyperfunctions - - hypergeomatrix - - hyper-haskell-server - hyperion - hyperloglogplus - hyperscript + - hypertypes - hypher - hyraxAbif - hzulip @@ -2609,6 +2669,7 @@ broken-packages: - ieee-utils - iexcloud - ifcxt + - iff - if-instance - IFS - ig @@ -2621,10 +2682,10 @@ broken-packages: - ihaskell-parsec - ihaskell-plot - ihaskell-widgets - - ihp-hsx - illuminate - imagemagick - imagepaste + - image-type - imapget - imgur - imj-prelude @@ -2639,7 +2700,8 @@ broken-packages: - imports - impossible - imprint - - incipit + - impure-containers + - inchworm - indentation-core - index-core - indexed-containers @@ -2647,6 +2709,7 @@ broken-packages: - indextype - indices - infernal + - inferno-types - infer-upstream - inf-interval - infix @@ -2655,9 +2718,9 @@ broken-packages: - inilist - ini-qq - initialize + - inj-base - inject-function - - inline-asm - - inline-r + - injections - in-other-words-plugin - inserts - instana-haskell-trace-sdk @@ -2665,11 +2728,11 @@ broken-packages: - instant-generics - instapaper-sender - instinct - - intcode - integer-pure - - intel-aes + - integer-simple - intensional-datatys - interact + - interactive-plot - interleavableGen - interleavableIO - interlude-l @@ -2681,14 +2744,17 @@ broken-packages: - interpolator - interruptible - interval + - interval-algebra + - interval-patterns - interval-tree-clock - IntFormats + - int-interval-map - int-multimap - intrinsic-superclasses + - intro - introduction - - intro-prelude + - inventory - invertible - - invertible-hlist - invertible-syntax - involutive-semigroups - io-capture @@ -2708,6 +2774,7 @@ broken-packages: - iptables-helpers - IPv6DB - Irc + - ircbot - irc-dcc - irc-fun-types - ireal @@ -2720,13 +2787,13 @@ broken-packages: - IsNull - iso8601-duration - isobmff - - isomorphism-class - isotope - itcli - itemfield - iteratee - iterative-forward-search - iterIO + - iterm-show - it-has - ivory - ixdopp @@ -2738,11 +2805,13 @@ broken-packages: - JackMiniMix - jacobi-roots - jaeger-flamegraph + - jail - jalla + - jammittools - jarfind - jarify - jason - - java-bridge + - java-adt - javascript-bridge - javav - Javav @@ -2755,15 +2824,18 @@ broken-packages: - jet-stream - Jikka - jinquantities + - jmacro-rpc - jml-web-service - jni - jobqueue - join-api - joinlist - - joint - jonathanscard - jort + - joy-rewrite - jpeg + - jsaddle-clib + - jsaddle-warp - jsaddle-wkwebview - js-good-parts - json2 @@ -2774,12 +2846,13 @@ broken-packages: - json-ast-quickcheck - JSONb - json-builder + - json-bytes-builder - json-encoder - jsonextfilter - json-extra - json-fu - json-litobj - - jsonlogic + - jsonlogic-aeson - jsonnet - json-pointer - json-pointy @@ -2802,6 +2875,7 @@ broken-packages: - judy - juicy-gcode - JuicyPixels-blp + - JuicyPixels-blurhash - JuicyPixels-canvas - JuicyPixels-util - JunkDB @@ -2812,7 +2886,6 @@ broken-packages: - jvm-parser - JYU-Utils - kademlia - - kafka-client - kafka-client-sync - kalman - Kalman @@ -2834,22 +2907,22 @@ broken-packages: - kdesrc-build-extra - kd-tree - keccak + - keenser - keera-hails-reactivevalues - keid-ui-dearimgui - keiretsu - kempe - - kerry - kesha - Ketchup - kewar - keycloak-hs - keyed - - keystore + - keyed-vals - khph - kickass-torrents-dump-parser - kickchan - - ki-unlifted - kleene-list + - kmn-programming - kmonad - kmp-dfa - knots @@ -2861,9 +2934,9 @@ broken-packages: - koofr-client - korea-holidays - kraken - - krank - krapsh - Kriens + - kriti-lang - krpc - KSP - ktx @@ -2876,7 +2949,6 @@ broken-packages: - lagrangian - lambda2js - lambdaBase - - lambdabot-telegram-plugins - lambdabot-utils - lambdabot-xmpp - lambda-bridge @@ -2893,9 +2965,10 @@ broken-packages: - lambda-sampler - lambdatex - lambda-toolbox + - lambdatwit + - Lambdaya - lame - lame-tester - - landlock - language-asn - language-c-comments - language-c-inline @@ -2903,14 +2976,15 @@ broken-packages: - language-csharp - language-dart - language-dockerfile - - language-ecmascript - language-elm + - language-fortran - language-gcl - language-gemini - language-go - language-guess - language-hcl - language-java-classfile + - language-js - language-lua2 - language-lua-qq - language-mixal @@ -2925,12 +2999,14 @@ broken-packages: - language-tl - language-typescript - language-webidl + - laop - LargeCardinalHierarchy - Lastik - latest-npm-version - latex-formulae-image - latex-svg-image - LATS + - launchdarkly-server-sdk - launchpad-control - lawless-concurrent-machines - layers @@ -2940,22 +3016,19 @@ broken-packages: - lazify - lazyarray - lazyboy - - lazy-bracket - lazy-priority-queue - lazyset - LazyVault - l-bfgs-b - LC3 - lcs - - lda + - ldgallery-compiler - ldif - ld-intervals - leaf - leapseconds - learn - Learning - - learning-hmm - - learn-physics-examples - leetify - lendingclub - lens-datetime @@ -2966,12 +3039,14 @@ broken-packages: - lens-process - lensref - lens-simple + - lens-tell - lens-text-encoding - lens-th-rewrite - lens-time - lens-tutorial - lens-typelevel - lens-xml + - lenz-template - less-arbitrary - Level0 - level-monad @@ -2993,10 +3068,7 @@ broken-packages: - libpafe - libpq - librandomorg - - librarian - - libsecp256k1 - libsystemd-daemon - - libsystemd-journal - libtagc - libxls - libxlsxwriter-hs @@ -3008,7 +3080,6 @@ broken-packages: - lifetimes - lifted-protolude - lifter - - lifx-lan - ligature - light - lilypond @@ -3029,14 +3100,16 @@ broken-packages: - linkedhashmap - linked-list-with-iterator - linklater + - linnet - linode - linode-v4 - linux-blkid - linux-cgroup + - linux-evdev - linux-kmod - linux-perf + - linux-xattr - linx-gateway - - lion - lipsum-gen - liquid - liquidhaskell-cabal @@ -3045,8 +3118,8 @@ broken-packages: - listlike-instances - list-mux - list-prompt - - list-remote-forwards - list-t-http-client + - list-t-libcurl - list-tries - list-t-text - list-zip-def @@ -3063,31 +3136,31 @@ broken-packages: - llvm-hs - llvm-ht - llvm-pretty - - lmdb-high-level + - lmdb-simple - lmonad + - lnurl - load-balancing - load-font - local-address - located - located-monad-logger - loch - - loc-test - log2json + - log-base + - log-effect - logentries - logger - logging-effect-extra-file - logging-effect-extra-handler - Logic - logicst - - logict-state + - logict-sequence - logplex-parse - log-warper - lojbanParser - lojbanXiragan - - lol - lol-calculus - longboi - - longshot - lookup-tables - loopbreaker - loop-dsl @@ -3098,20 +3171,21 @@ broken-packages: - lorem - loris - loshadka + - louis - lowgl - - lp-diagrams + - lp-diagrams-svg - LRU - lrucaching - lscabal - L-seed - lsfrom - - lti13 - ltiv1p1 - ltk - LTS - lua-bc - luautils - - lucid2 + - lucid2-htmx + - lucid-aria - lucid-hyperscript - luis-client - luka @@ -3142,10 +3216,9 @@ broken-packages: - macos-corelibs - macrm - madlang - - mad-props - mage - - MagicHaskeller - magic-tyfams + - magma - mailchimp - mailchimp-subscribe - makedo @@ -3156,10 +3229,10 @@ broken-packages: - mandulia - mangopay - mapalgebra - - map-classes - map-exts - Mapping - mappy + - map-reduce-folds - MapWith - markdown-kate - marked-pretty @@ -3186,9 +3259,11 @@ broken-packages: - maybench - MaybeT - MaybeT-monads-tf + - MaybeT-transformers - MazesOfMonad - MBot - mbox-tools + - mbox-utility - mbug - mcl - mcm @@ -3206,12 +3281,12 @@ broken-packages: - Mecha - mechs - Mechs - - medea - mediabus - mediawiki - medium-sdk-haskell - meep - megalisp + - melf - mellon-core - melody - membrain @@ -3221,10 +3296,12 @@ broken-packages: - meminfo - memoization-utils - memo-ptr + - memorable-bits - memorypool - memo-sqlite - menoh - menshen + - mercury-api - mergeful-persistent - mergeless-persistent - messagepack-rpc @@ -3243,6 +3320,8 @@ broken-packages: - MHask - mi - miconix-test + - microbase + - microformats2-parser - microgroove - microlens-each - micrologger @@ -3250,9 +3329,8 @@ broken-packages: - microsoft-translator - mida - midi-simple - - midisurface - midi-utils - - migrant-core + - migrant-postgresql-simple - mikmod - mikrokosmos - miku @@ -3269,6 +3347,7 @@ broken-packages: - minst-idx - mios - MIP + - mirror-tweet - mismi-s3-core - miso-action-logger - miso-examples @@ -3280,12 +3359,13 @@ broken-packages: - ml-w - mm2 - mmsyn2 - - mmsyn3 - mmtf - mmtl - Mobile-Legends-Hack-Cheats - mockazo - mock-httpd + - modbus-tcp + - model - modelicaparser - modular-prelude - module-management @@ -3299,15 +3379,17 @@ broken-packages: - monadacme - monad-atom - monad-atom-simple - - monad-bayes - monad-branch - - MonadCatchIO-transformers + - MonadCatchIO-mtl + - MonadCatchIO-transformers-foreign - monad-choice - MonadCompose + - monad-control-aligned + - monadcryptorandom - monad-fork - - monad-http + - monadic-bang - monadiccp - - monad-interleave + - monadic-recursion-schemes - monad-introspect - Monadius - monad-levels @@ -3316,6 +3398,7 @@ broken-packages: - monadloc-pp - monad-log - monadlog + - monad-logger-syslog - monad-lrs - monad-mersenne-random - monad-mock @@ -3325,8 +3408,8 @@ broken-packages: - monad-persist - monadplus - monad-ran + - MonadRandomLazy - monad-recorder - - monads-fd - MonadStack - monad-statevar - monad-ste @@ -3334,9 +3417,9 @@ broken-packages: - monad-task - monad-throw-exit - monad-timing + - monad-tree - monad-tx - monad-unify - - monad-unlift - monad-wrap - Monatron - mondo @@ -3349,36 +3432,32 @@ broken-packages: - monoid-owns - monoidplus - monoids - - monomer-hagrid - monopati - monus - monzo + - moo-nad - morfette - morfeusz - - morloc - - morpheus-graphql-core + - morpheus-graphql-cli - morphisms-functors - morphisms-objects - morte - - mosaico-lib - - motor + - mortred + - motor-reflection - mount - movie-monad - - mpeff - mpppc - mpris - mpvguihs - mqtt - mqtt-hs - - mr-env - mrifk - mrm - ms - msgpack - - msgpack-binary - - msgpack-persist + - msgpack-types - msh - - msi-kb-backlit + - mssql-simple - MTGBuilder - mtgoxapi - mtl-c @@ -3391,7 +3470,6 @@ broken-packages: - MuCheck - mud - mudbath - - muesli - mulang - multext-east-msd - multiaddr @@ -3401,18 +3479,18 @@ broken-packages: - multipass - multipath - multiplate-simplified - - multipool-persistent-postgresql + - multipool - multirec - - multivariant - Munkres-simple - muon + - murmur - mu-schema - musicScroll - music-util - musicxml - mustache2hs - mustache-haskell - - mutable-lens + - mutable - mvc - mxnet - mxnet-nnvm @@ -3425,10 +3503,11 @@ broken-packages: - mysql-simple-quasi - mystem - my-test-docs - - mywatch + - mywork - myxine-client - mzv - n2o-protocols + - NaCl - nagios-plugin-ekg - named-binary-tag - named-lock @@ -3436,6 +3515,7 @@ broken-packages: - named-sop - namelist - nanoAgda + - nano-cryptr - nanocurses - nano-hmac - nano-md5 @@ -3454,7 +3534,6 @@ broken-packages: - nats-client - nat-sized-numbers - natural - - NaturalLanguageAlphabets - NaturalSort - naver-translate - nbt @@ -3467,6 +3546,7 @@ broken-packages: - neither - neither-data - neko-lib + - neko-obfs - Neks - neptune-backend - nero @@ -3475,13 +3555,11 @@ broken-packages: - nestedmap - nested-sequence - netclock - - netcore - netease-fm - netrium - NetSNMP - netspec - net-spider - - nettle-openflow - netwire-input-javascript - netwire-vinylglfw-examples - network-address @@ -3493,9 +3571,10 @@ broken-packages: - network-bytestring - network-carbon - network-dbus - - network-dns - networked-game - network-house + - network-manager-tui + - network-messagepack-rpc-websocket - network-metrics - network-msg - network-msgpack-rpc @@ -3521,13 +3600,16 @@ broken-packages: - next-ref - nextstep-plist - NGrams + - ngrams-loader - ngx-export-log - niagra - nibblestring - nice-html - nicovideo-translator + - nist-beacon - nitro - nix-delegate + - nixdu - nix-eval - nix-freeze-tree - nixfromnpm @@ -3543,7 +3625,7 @@ broken-packages: - nofib-analyse - nofib-analyze - noise - - nom + - noli - NonEmpty - non-empty-containers - nonempty-lift @@ -3551,7 +3633,7 @@ broken-packages: - noodle - no-role-annots - notcpp - - not-gloss-examples + - notmuch-haskell - NoTrace - notzero - np-linear @@ -3563,25 +3645,26 @@ broken-packages: - nullary - null-canvas - nullpipe - - numbered-semigroups - NumberSieves - NumberTheory - - numerals-base - - numeric-ode - numeric-qq - numeric-ranges - numhask-free - numhask-histogram - numhask-prelude + - numtype + - numtype-tf - Nutri - nvim-hs-ghcid + - NXT - NXTDSL - nyan-interpolation-core - nylas - nyx-game + - oanda-rest-api - oasis-xrd - - oauth2-jwt-bearer - oauthenticated + - obd - Object - ObjectIO - ocaml-export @@ -3589,9 +3672,15 @@ broken-packages: - OddWord - oden-go-packages - oeis2 + - OGDF - OGL + - ogma-language-c + - ogma-language-cocospec + - ogma-language-smv - ogmarkup + - ohloh-hs - oi + - okapi - old-version - om-actor - omaketex @@ -3601,13 +3690,13 @@ broken-packages: - Omega - om-elm - om-fail - - om-fork - - om-http - om-http-logging - omnifmt + - om-plugin-imports + - om-show + - om-time - on-a-horse - onama - - ONC-RPC - on-demand-ssh-tunnel - oneormore - onpartitions @@ -3618,9 +3707,12 @@ broken-packages: - opaleye-trans - open-adt - OpenAFP - - openai-servant + - openai-hs + - openapi3 + - openapi3-code-generator - openapi-petstore - openapi-typed + - opencc - opench-meteo - OpenCL - OpenCLRaw @@ -3636,13 +3728,12 @@ broken-packages: - open-haddock - openid-connect - open-pandoc - - openpgp - open-signals - opensoundcontrol-ht - openssh-protocol + - opentelemetry-extra - opentelemetry-http-client - opentheory-char - - opentok - opentype - open-typerep - OpenVGRaw @@ -3657,18 +3748,18 @@ broken-packages: - options-time - optparse-applicative-simple - optparse-helper - - orbits + - optstream - orc - orchestrate - OrchestrateDB - ordered - order-statistics - - ordinal - Ordinary - ordrea - oref - organize-imports - orgmode + - orgmode-parse - origami - orion-hs - orizentic @@ -3677,12 +3768,15 @@ broken-packages: - oscpacking - oset - Oslo-Vectize + - OSM - osm-conduit - oso2pdf - osx-ar - ot - OTP - ottparse-pretty + - overeasy + - overload - overloaded - overloaded-records - overture @@ -3697,6 +3791,7 @@ broken-packages: - packedstring - packer-messagepack - packman + - packstream - packunused - pacman-memcache - padic @@ -3740,8 +3835,10 @@ broken-packages: - papillon - pappy - paragon + - Parallel-Arrows-Definition - parallel-tasks - parameterized-data + - parameterized-utils - paranoia - parco - parcom-lib @@ -3752,13 +3849,13 @@ broken-packages: - PArrows - Parry - parse - - parseargs - parsec2 - parsec3 - parsec-free - parsec-parsers - parsec-pratt - parseerror-eq + - parse-gcstats - parsely - parser241 - parser-combinators-tests @@ -3767,10 +3864,10 @@ broken-packages: - parsers-megaparsec - parser-unbiased-choice-monad-embedding - parsimony - - parsley-core + - parsnip - partage + - partial-lens - partial-records - - partial-semigroup-hedgehog - partly - passage - passman @@ -3780,12 +3877,15 @@ broken-packages: - pasta - pastis - pasty + - patat - patches-vector - Pathfinder - pathfindingcore - PathTree - patrol - patronscraper + - pattern-trie + - paynow-zw - paypal-adaptive-hoops - paypal-api - paypal-rest-client @@ -3799,9 +3899,8 @@ broken-packages: - PCLT - pcre2 - pcre-light-extra - - pdfname + - pdfinfo - pdf-slave-template - - pdfsplit - pdf-toolbox-viewer - pdftotext - pdynload @@ -3812,10 +3911,10 @@ broken-packages: - peggy - pencil - penntreebank-megaparsec - - penrose - percent-encoder - perceptron - peregrin + - perf - PerfectHash - perfect-vector-shuffle - perhaps @@ -3832,11 +3931,11 @@ broken-packages: - persistent-generic - persistent-mongoDB - persistent-odbc - - persistent-protobuf - persistent-ratelimit - persistent-stm - persistent-template-classy - persistent-zookeeper + - persist-state - persona - pesca - pez @@ -3846,6 +3945,7 @@ broken-packages: - pg-harness - pg-harness-server - pg-recorder + - pgsql-simple - pg-store - pgstream - pg-transact @@ -3873,23 +3973,21 @@ broken-packages: - pi-forall - pig - pi-hoole + - pi-lcd + - pinboard - pinch-gen - pinchot - pine - Pipe - pipes-async - pipes-bgzf - - pipes-break - pipes-brotli - - pipes-bzip - pipes-category - - pipes-cborg - pipes-cereal - pipes-core - pipes-errors - pipes-interleave - pipes-io - - pipes-network - pipes-protolude - pipes-rt - pipes-s3 @@ -3898,13 +3996,13 @@ broken-packages: - pipes-transduce - pipes-vector - pipes-zeromq4 - - pipes-zlib - Piso - pit - pivotal-tracker - pixela - pixelated-avatar-generator - pixel-printer + - pixiv - pkcs10 - pkcs7 - pkggraph @@ -3919,7 +4017,6 @@ broken-packages: - platinum-parsing - PlayingCards - playlists - - plex - plist - plist-buddy - plivo @@ -3928,6 +4025,8 @@ broken-packages: - plot-gtk3 - plot-gtk-ui - plot-lab + - plots + - plow-log - plugins - plugins-multistage - plumbers @@ -3941,8 +4040,9 @@ broken-packages: - pointfree-fancy - pointful - pointless-haskell + - poke - pokemon-go-protobuf-types - - poker + - poker-base - poker-eval - pokitdok - polar-configfile @@ -3954,14 +4054,19 @@ broken-packages: - poly-control - polydata-core - polynom + - polynomial - polysemy-check - polysemy-keyed-state - polysemy-kvstore-jsonfile - - polysemy-log-co - - polysemy-managed + - polysemy-methodology-co-log - polysemy-mocks + - polysemy-path - polysemy-readline - - polysemy-scoped-fs + - polysemy-req + - polysemy-resume + - polysemy-socket + - polysemy-video + - polysemy-vinyl - polytypeable - pomaps - pomohoro @@ -3971,36 +4076,35 @@ broken-packages: - pool - pool-conduit - pop3-client - - popkey - poppler + - porpoise - portager - porte - PortFusion - - portray-pretty - - portray-prettyprinter - posit - positron - posix-acl - - posix-api - posix-realtime - posix-waitpid - - posplyu - postcodes - postgres-embedded - PostgreSQL + - postgresql-common + - postgresql-cube - postgresql-lo-stream - postgresql-ltree - postgresql-named + - postgresql-orm - postgresql-query + - postgresql-replicant - postgresql-resilient - postgresql-simple-bind + - postgresql-simple-migration - postgresql-simple-named - postgresql-simple-sop - - postgresql-transactional + - postgresql-tx-monad-logger - postgresql-tx-simple - - postgresql-tx-squeal - postgresql-typed-lifted - - postgrest - postgres-tmp - postgrest-ws - postgres-websockets @@ -4009,6 +4113,7 @@ broken-packages: - postmaster - potato-tool - potoki-core + - powerdns - powermate - powerpc - powerqueue-levelmem @@ -4034,6 +4139,7 @@ broken-packages: - presburger - present - press + - pretty-compact - pretty-ghci - pretty-ncols - prettyprinter-vty @@ -4043,17 +4149,17 @@ broken-packages: - prime - primes-type - prim-instances + - PrimitiveArray - PrimitiveArray-Pretty - primitive-atomic - - primitive-containers - primitive-convenience - primitive-foreign - primitive-indexed - primitive-maybe - primitive-simd + - primitive-sort - primitive-stablename - prim-ref - - prim-spoon - pringletons - printcess - print-debugger @@ -4080,9 +4186,13 @@ broken-packages: - progress-meter - progress-reporting - proj4-hs-bindings + - project-forge - projectile + - project-m36 - prolens - prolog + - prometheus-effect + - prometheus-proc - promise - pronounce - proof-combinators @@ -4092,7 +4202,10 @@ broken-packages: - property-list - prosidy - prosper + - proteaaudio + - proteaaudio-sdl - protocol + - protocol-buffers - protocol-buffers-fork - proto-lens-combinators - protolude-lifted @@ -4102,15 +4215,17 @@ broken-packages: - provenience - proxy-kindness - proxy-mapping + - prune-juice - psc-ide - pseudo-trie + - psi - psx - PTQ + - pub - publicsuffix - publicsuffixlistcreate - publish - pubnub - - pubsub - pugixml - pugs-DrIFT - pugs-HsSyck @@ -4118,7 +4233,8 @@ broken-packages: - Pup-Events-Server - pure-io - pure-priority-queue - - purescript + - purescript-ast + - purescript-cst - purescript-tsd-gen - pure-zlib - pushbullet @@ -4129,12 +4245,10 @@ broken-packages: - push-notifications - putlenses - puzzle-draw - - pvector - pyffi - pyfi - python-pickle - q4c12-twofinger - - qbe - qc-oi-testgenerator - qd - qed @@ -4143,29 +4257,31 @@ broken-packages: - QIO - QLearn - qlinear - - qnap-decrypt + - qrcode - qr-imager - qsem - qt - QuadEdge - QuadTree + - qualified-imports-plugin - quandl-api - - quantfin - quantification - quantum-arrow - quarantimer - - qudb - quenya-verb - querystring-pickle - questioner - quibble-core - QuickAnnotate + - quickbooks - quickcheck-arbitrary-template - - quickcheck-lockstep + - quickcheck-monoid-subclasses - quickcheck-property-comb - quickcheck-property-monad - quickcheck-rematch - quickcheck-report + - QuickCheckVariant + - quickcheck-webdriver - quickjs-hs - QuickPlot - quickpull @@ -4185,21 +4301,22 @@ broken-packages: - radium - radium-formula-parser - radix + - radix-tree - rados-haskell - raft - rakhana - rakuten - ralist - raml - - randfile - rando - random-access-list - random-derive - RandomDotOrg - random-eff - Randometer - - random-extras + - random-source - random-stream + - random-string - rand-vars - Range - rangemin @@ -4208,14 +4325,15 @@ broken-packages: - rank-product - rapid-term - Rasenschach + - rating-chgk-info - rational-list - rattle - rattletrap - raven-haskell-scotty + - raylib-imgui - raz - rbst - rclient - - rdf - react-flux - react-haskell - reaction-logic @@ -4230,6 +4348,7 @@ broken-packages: - readability - read-bounded - read-ctags + - reader-soup - read-io - readline-statevar - readme-lhs @@ -4240,13 +4359,12 @@ broken-packages: - reason-export - record - record-encode - - record-impl - records + - records-sop - record-wrangler - - recursion-schemes-ext - - recursion-schemes-ix - recursors - red-black-record + - redis-glob - redis-hs - redis-simple - Redmine @@ -4257,9 +4375,11 @@ broken-packages: - refcount - Referees - references + - ref-extras - refined-http-api-data - refined-with - reflection-extras + - reflex-backend-socket - reflex-basic-host - reflex-dom-ace - reflex-dom-contrib @@ -4269,10 +4389,10 @@ broken-packages: - reflex-dom-svg - reflex-external-ref - reflex-fsnotify - - reflex-gadt-api - reflex-gi-gtk - reflex-gloss - reflex-jsx + - reflex-libtelnet - reflex-orphans - reflex-sdl2 - reflex-test-host @@ -4282,6 +4402,7 @@ broken-packages: - reformat - refresht - refty + - refurb - reg-alloc - regex-dfa - regexdot @@ -4290,7 +4411,6 @@ broken-packages: - regex-posix-unittest - regexpr-symbolic - regexqq - - regex-rure - regex-tdfa-pipes - regex-tdfa-quasiquoter - regex-tdfa-rc @@ -4309,7 +4429,7 @@ broken-packages: - reified-records - reify - relacion - - relapse + - relation - relevant-time - reload - remark @@ -4336,8 +4456,9 @@ broken-packages: - req-conduit - request - request-monad + - require - req-url-extra - - reserve + - rescue - reservoir - resolve - resolve-trivial-conflicts @@ -4350,9 +4471,9 @@ broken-packages: - resumable-exceptions - rethinkdb - rethinkdb-client-driver - - rethinkdb-wereHamster - retryer - reverse-geocoding + - reverse-list - reversi - ReviewBoard - rewrite-inspector @@ -4360,10 +4481,11 @@ broken-packages: - rfc-prelude - r-glpk-phonetic-languages-ukrainian-durations - rhbzquery + - rhine - riak - riak-protobuf-lens - - rib - ribbit + - rib-core - RichConditional - ridley - riemann @@ -4379,18 +4501,19 @@ broken-packages: - rivet-simple-deploy - RJson - Rlang-QQ - - rle - rlglue - RLP - rl-satton - - RNAdraw - robin - robots-txt - roc-cluster + - roc-id + - roguestar - roku-api - rollbar-client - rollbar-hs - roller + - roman-numerals - ron - rope - rosebud @@ -4398,6 +4521,7 @@ broken-packages: - rosmsg - rosso - rotating-log + - rounded - rounding - roundtrip-aeson - rowrecord @@ -4412,6 +4536,7 @@ broken-packages: - RtMidi - rtnetlink - rtorrent-rpc + - rtorrent-state - rts-loader - ruby-marshal - ruby-qq @@ -4419,6 +4544,7 @@ broken-packages: - ruin - runhs - runmany + - runtime-instances - rustls - rws - RxHaskell @@ -4431,15 +4557,18 @@ broken-packages: - safe-freeze - safe-globals - safeint + - safeio - safe-lazy-io - safe-length + - safe-money-xmlbf - safepath - safe-printf - saferoute - safe-tensor + - safe-wild-cards - sajson - sakuraio-platform - - salak-toml + - salak - Salsa - salvia-protocol - sandlib @@ -4452,14 +4581,14 @@ broken-packages: - satyros - savage - sax - - sbvPlugin + - sbv - sc2-proto - scale - scaleimage - scalendar + - s-cargot-letbind - scc - - scgi - - schedule + - schedevr - schedule-planner - schedyield - schemas @@ -4482,6 +4611,7 @@ broken-packages: - ScratchFs - script-monad - scrobble + - scroll-list - scrz - scythe - scyther-proof @@ -4489,11 +4619,10 @@ broken-packages: - sdl2-cairo-image - sdl2-compositor - sdl2-fps - - SDL-mpeg + - sdp - sdr - seacat - seakale - - search - sec - secdh - seclib @@ -4501,10 +4630,12 @@ broken-packages: - secp256k1 - secp256k1-legacy - secret-santa + - SecureHash-SHA3 + - secure-memory - secure-sockets - secureUDP - SegmentTree - - selda-json + - selda-postgresql - selectors - selenium - selinux @@ -4515,15 +4646,17 @@ broken-packages: - Semigroup - semigroupoids-syntax - semigroups-actions + - semilattices - sendgrid-haskell - sendgrid-v3 - sensu-run - sentry + - seonbi - separated - SeqAlign - sequent-core + - sequential-index - serialize-instances - - serialport - serokell-util - servant-aeson-specs - servant-auth-cookie @@ -4536,20 +4669,22 @@ broken-packages: - servant-docs-simple - servant-elm - servant-errors + - servant-event-stream - servant-gdp - servant-generate - servant-generic - servant-github - servant-github-webhook - - servant-haxl-client - servant-hmac-auth - servant-htmx + - servant-http2-client + - servant-iCalendar + - servant-jquery - servant-kotlin - servant-mock - servant-namedargs - servant-nix - servant-pandoc - - servant-polysemy - servant-pool - servant-proto-lens - servant-purescript @@ -4563,14 +4698,17 @@ broken-packages: - servant-stache - servant-static-th - servant-streaming - - servant-streamly - - servant-util + - servant-tracing + - servant-typed-error - servant-wasm + - servant-xml - servant-yaml - servant-zeppelin - server-generic + - serversession-backend-acid-state - serversession-backend-persistent - services + - serviette - ses-html-snaplet - SessionLogger - sessions @@ -4583,26 +4721,22 @@ broken-packages: - sexp - sext - SFML + - sfml-audio - sfmt - - sfnt2woff - SG - sgd - SGplus - sh2md - shade - shadower - - shady-gen - - shake-cabal - shake-cabal-build - shake-dhall - shake-extras - shake-minify - - shake-pack - shake-path - shake-persist - shakespeare-babel - shakespeare-sass - - shapes - shared-buffer - shared-fields - sha-streams @@ -4616,12 +4750,13 @@ broken-packages: - shivers-cfg - shoap - shopify + - shortbytestring - shortcut-links - shorten-strings - short-vec - show-prettyprint - - Shpadoinkle-backend-snabbdom - Shpadoinkle-console + - Shpadoinkle-debug - Shpadoinkle-isreal - shwifty - sifflet @@ -4629,7 +4764,6 @@ broken-packages: - signable - signable-haskell-protoc - signed-multiset - - significant-figures - simd - simfin - simple-actors @@ -4641,7 +4775,6 @@ broken-packages: - simpleconfig - simple-css - simple-download - - simple-effects - simple-eval - simple-form - simple-genetic-algorithm @@ -4649,6 +4782,7 @@ broken-packages: - simple-index - simpleirc - simple-log + - simple-logging - simple-money - simple-neural-networks - simplenote @@ -4668,12 +4802,14 @@ broken-packages: - simplexmq - simple-zipper - simplistic-generics + - singlethongs - singleton-dict - singleton-typelits - single-tuple - singnal - singular-factory - sink + - siphash - sitepipe - sixfiguregroup - sized-grid @@ -4685,24 +4821,25 @@ broken-packages: - skeletal-set - skell - skemmtun + - skews - skulk - skylighting-extensions - - skylighting-format-ansi + - skylighting-lucid - skype4hs - slack - slack-api - slack-notify-haskell - slack-verify - - slack-web - - slave-thread - sliceofpy - - slick + - slidemews - Slides - slim - sloane - sloth - slot-lambda - slug + - slugger + - slugify - smallarray - small-bytearray-builder - smallcaps @@ -4713,6 +4850,7 @@ broken-packages: - smartcheck - smartconstructor - smartGroup + - smash - sme - smerdyakov - smiles @@ -4721,6 +4859,7 @@ broken-packages: - smt-lib - SmtLib - smtlib2 + - smtlib-backends - SMTPClient - smtp-mail-ng - smtps-gmail @@ -4730,30 +4869,36 @@ broken-packages: - snake - snake-game - snap-accept - - snap-blaze-clay + - snap-auth-cli - snap-configuration-utilities - snap-error-collector - snap-language - snaplet-acid-state - snaplet-amqp + - snaplet-auth-acid + - snaplet-coffee - snaplet-css-min - snaplet-environments - snaplet-hslogger - snaplet-influxdb - snaplet-mandrill - snaplet-mongodb-minimalistic + - snaplet-mysql-simple - snaplet-postgresql-simple + - snaplet-recaptcha - snaplet-redis - snaplet-sass - snaplet-scoped-session - snaplet-ses-html - - snaplet-sqlite-simple + - snaplet-sqlite-simple-jwt-auth - snaplet-typed-sessions + - snap-loader-dynamic - snap-predicates - - snappy-conduit + - snappy - snap-routes - snap-stream - snap-testing + - snap-utils - snap-web-routes - SNet - snipcheck @@ -4763,17 +4908,16 @@ broken-packages: - socket-activation - socketed - socketio + - sockets - sockets-and-pipes - socket-sctp - - socketson - socket-unix - sodium - soegtk - softfloat-hs + - solar - solga - - sonic-visualiser - Sonnex - - SoOSiM - sorted - sorting - sorty @@ -4789,7 +4933,6 @@ broken-packages: - sparsecheck - sparse-lin-alg - sparse-tensor - - spartacon - special-functors - special-keys - spectacle @@ -4800,7 +4943,7 @@ broken-packages: - spir-v - splay - splaytree - - splines + - splint - split-morphism - splitter - Spock-api-ghcjs @@ -4809,17 +4952,16 @@ broken-packages: - spoty - Sprig - spritz - - sproxy - - sproxy-web - spsa - spy - sqlcipher - sqlite + - sqlite-easy - sqlite-simple-errors - sql-simple - sqlvalue-list - srcinst - - sr-extra + - srt-dhall - sscan - ssh - ssh-tunnel @@ -4835,13 +4977,14 @@ broken-packages: - stackage-to-hackage - stackage-types - stack-bump + - stackcollapse-ghc - stack-fix - - stack-hpc-coveralls - stack-lib - stack-prism - stack-run - stack-type - stack-wrapper + - staged-gg - standalone-derive-topdown - standalone-haddock - starling @@ -4867,7 +5010,6 @@ broken-packages: - stdf - stdio - steambrowser - - steeloverseer - stego-uuid - stemmer - stemmer-german @@ -4876,12 +5018,16 @@ broken-packages: - STL - stm-chunked-queues - stm-firehose + - stm-incremental - stm-promise + - stm-queue - stm-stats - stochastic - Stomp + - stooq-api - storable - storable-static-array + - storablevector - stp - str - Strafunski-ATermLib @@ -4891,7 +5037,6 @@ broken-packages: - stratux-types - stream - streamdeck - - streamed - stream-fusion - streaming-benchmarks - streaming-brotli @@ -4905,16 +5050,20 @@ broken-packages: - streaming-png - streaming-postgresql-simple - streaming-sort - - streaming-utils + - streamly-archive - streamly-binary + - streamly-bytestring - streamly-cassava - streamly-examples + - streamly-lmdb - streamly-lz4 - streamly-process - stream-monad - streamproc + - strelka-core - StrictBench - StrictCheck + - strict-containers - strict-ghc-plugin - strictly - strict-tuple-lens @@ -4923,12 +5072,14 @@ broken-packages: - string-isos - stringlike - string-quote + - strings - stringtable-atom - stripe - stripe-core - - stripe-servant - - strongweak + - stripe-hs + - strong-path - structural-traversal + - structured-haskell-mode - structures - stt - stunclient @@ -4936,7 +5087,7 @@ broken-packages: - stylized - subG-instances - subleq-toolchain - - sublists + - submark - subsample - sub-state - subwordgraph @@ -4946,7 +5097,10 @@ broken-packages: - sugar - sugarhaskell - suitable + - summer - summoner + - sump + - sum-type-boilerplate - sunlight - sunroof-compiler - superbubbles @@ -4958,14 +5112,15 @@ broken-packages: - supervisor - supervisors - supplemented - - supply-chain-core - surjective + - sv2v - sv-core - SVD2HS - svfactor - svg-builder-fork - svg-icons - SvgIcons + - svgsym - svgutils - svm-light-utils - svm-simple @@ -4978,17 +5133,15 @@ broken-packages: - swift-lda - swiss - swiss-ephemeris - - SWMMoutGetMB - sws - syb-extras - - SybWidget - syb-with-class-instances-text + - sydtest - syfco - sym - symantic - symantic-cli - symantic-http-client - - symantic-http-pipes - symantic-parser - symantic-xml - symbolic-link @@ -4998,7 +5151,6 @@ broken-packages: - sync-mht - syntax-trees - syntax-trees-fork-bairyn - - synthesizer - Sysmon - system-canonicalpath - system-command @@ -5011,7 +5163,6 @@ broken-packages: - system-test - t3-server - table - - tableaux - tables - Tables - tablestorage @@ -5020,6 +5171,7 @@ broken-packages: - tabloid - tabs - tag-bits + - tagchup - tagged-exception-core - tagged-timers - taggy-lens @@ -5037,22 +5189,25 @@ broken-packages: - tamarin-prover-utils - Tape - tapioca + - taskell - TaskMonad - tasty-auto - tasty-autocollect - tasty-fail-fast - tasty-grading-system - tasty-hedgehog-coverage + - tasty-json - tasty-mgolden - tasty-stats - tasty-test-vector - TastyTLT - TBC - TBit - - tcache-AWS + - TCache - tcod-haskell - tcp - tcp-streams-openssl + - tdd-util - tdigest-Chart - tdoc - tds @@ -5060,6 +5215,7 @@ broken-packages: - technique - teeth - tehepero + - telega - telegram - telegram-api - telegram-types @@ -5075,19 +5231,15 @@ broken-packages: - template-toolkit - template-yj - tempodb - - temporal-csound - tempus - ten - tensor - tensorflow - tensorflow-opgen - tensor-safe - - termbox-banana - termbox-bindings - - termbox-tea - termination-combinators - termplot - - term-rewriting - terntup - tersmu - tesla @@ -5114,24 +5266,23 @@ broken-packages: - text-and-plots - text-ascii - text-builder-linear - - text-compression - text-containers - text-display - text-format-heavy - text-generic-pretty - text-icu-normalized + - text-icu-translit - text-lens - - text-lips - text-markup - text-normal - textocat-api - text-offset - text-position - - text-region - text-register-machine - text-time - text-trie - textual + - text-utf7 - text-utf8 - text-xml-qq - text-zipper-monad @@ -5157,10 +5308,9 @@ broken-packages: - thorn - th-pprint - threadmanager - - thread-supervisor + - threadscope - threepenny-editors - threepenny-gui-contextmenu - - threepenny-gui-flexbox - thrift - Thrift - throttled-io-loop @@ -5170,17 +5320,20 @@ broken-packages: - th-tc - th-to-exp - th-traced + - thumbnail - thumbnail-plus - - thyme - tianbar + - ticket-management - TicTacToe - tictactoe3d - tidal-midi + - tidal-serial - tidal-vis - tie-knot - tiempo - - tiger + - TigerHash - tightrope + - tikzsd - timecalc - time-extras - time-machine @@ -5189,6 +5342,7 @@ broken-packages: - timeout-with-results - timeparsers - TimePiece + - timeplot - time-qq - time-quote - time-recurrence @@ -5197,9 +5351,10 @@ broken-packages: - timeutils - time-w3c - timezone-detect - - tintin - tinyid - TinyLaunchbury + - tinylog + - tinyMesh - tiny-scheduler - tinytemplate - TinyURL @@ -5211,11 +5366,6 @@ broken-packages: - tkhs - tkyprof - tmp-proc-example - - tmp-proc-postgres - - tmp-proc-rabbitmq - - tmp-proc-redis - - tmp-proc-zipkin - - todo - tofromxml - to-haskell - token-bucket @@ -5227,18 +5377,18 @@ broken-packages: - tokstyle - tokyocabinet-haskell - tokyotyrant-haskell - - tomato-rubato-openal - toml - toml-parser - - toml-reader-parse - tonalude - tonaparser - toodles - Top + - topkata - torch - TORCS - to-string-class - TotalMap + - total-maps - touched - Tournament - toxiproxy-haskell @@ -5256,6 +5406,7 @@ broken-packages: - traildb - transactional-events - TransformeR + - transformers-bifunctors - transformers-compose - transformers-lift - transformers-runnable @@ -5271,6 +5422,7 @@ broken-packages: - treap - treemap - treemap-html + - tree-monad - tree-render-text - TreeStructures - tree-traversals @@ -5279,14 +5431,13 @@ broken-packages: - TrendGraph - trhsx - trial-tomland + - tries - trigger - trim - tripLL - trivia - tropical - tropical-geometry - - true-name - - trust-chain - tsession - tslib - tsparse @@ -5294,22 +5445,24 @@ broken-packages: - tsuntsun - tsvsql - ttask + - ttl-hashtables - ttn-client - tttool - tubes - tuntap + - tuple-append - tuple-gen - tuple-hlist - tupleinstances - tuple-lenses - tuple-morph - - turingMachine - turing-machines - turing-music - turtle-options - tweak - twentefp-websockets - twfy-api-client + - twhs - twilio - twiml - twine @@ -5318,38 +5471,37 @@ broken-packages: - twitchapi - twitter - twitter-feed - - twitter-types - tx - txtblk - TYB - tyfam-witnesses - typalyze - - typeable-mock - typeable-th - - typecheck-plugin-nat-simple - type-combinators + - TypeCompose - typed-digits - typed-encoding - - typedflow - typedquery - typed-time - typed-wire - type-eq + - type-errors-pretty - typehash - type-indexed-queues - type-int - type-interpreter - type-level-bst - - type-level-kv-list-esqueleto - type-level-natural-number-induction - type-level-natural-number-operations + - typelevel-rewrite-rules + - type-level-sets - typelevel-tensor - type-list + - typelits-witnesses - type-of-html-static - typeparams - type-prelude - - type-reflection - - type-rig + - type-safe-avl - types-compat - type-settheory - type-spine @@ -5371,21 +5523,21 @@ broken-packages: - uhttpc - ui-command - unamb-custom + - unbeliever - unbounded-delays-units + - unboxed - unboxed-containers - unboxed-references - unbreak - - uncertain - unescaping-print - unfix-binders - - unfoldable - unicode-data-names - unicode-data-scripts - unicode-data-security + - unicode-general-category - unicode-prelude - unicode-symbols - unicode-tricks - - union - union-map - uniprot-kb - uniqueid @@ -5404,6 +5556,7 @@ broken-packages: - unix-handle - unix-process-conduit - unix-recursive + - unlift - unlifted-list - unliftio-messagebox - unlift-stm @@ -5416,6 +5569,7 @@ broken-packages: - unpack-funcs - unroll-ghc-plugin - unsafely + - unsatisfiable - unsequential - unused - uom-plugin @@ -5444,15 +5598,16 @@ broken-packages: - utf8-conversions - utf8-prelude - utf8-validator - - UTFTConverter - util - util-logict - util-plus - util-primitive - uuagc-bootstrap + - uuagc-cabal - uuagc-diagrams - uu-cco - uuid-aeson + - uusi - uvector - uxadt - vabal-lib @@ -5469,7 +5624,6 @@ broken-packages: - variables - variadic - variation - - vaultaire-common - vault-tool - vcache - vcatt @@ -5493,22 +5647,22 @@ broken-packages: - vector-space-opengl - vector-space-points - vector-static - - Vec-Transform - - velma + - vega-view - Verba - verbalexpressions - verdict - verify - verilog - - verismith - - versioning-servant - - vformat-aeson + - verset + - versioning + - vformat + - vgrep - vhd - vhdl - vicinity - - ViennaRNA-extras - viewprof - views + - Villefort - vimus - vintage-basic - vinyl-json @@ -5518,6 +5672,7 @@ broken-packages: - vinyl-vectors - virthualenv - visibility + - visualize-cbn - visual-prof - vitrea - vk-aws-route53 @@ -5537,7 +5692,6 @@ broken-packages: - wai-graceful - wai-handler-devel - wai-handler-fastcgi - - wai-handler-hal - wai-handler-scgi - wai-handler-webkit - wai-hmac-auth @@ -5565,7 +5719,6 @@ broken-packages: - wai-router - wai-routes - wai-secure-cookies - - wai-session-alt - wai-session-mysql - wai-session-postgresql - wai-session-redis @@ -5574,8 +5727,8 @@ broken-packages: - wai-throttler - waitra - wallpaper + - warc - warp-dynamic - - warp-grpc - warp-static - warp-systemd - wasm @@ -5584,33 +5737,30 @@ broken-packages: - wavefront - wavefront-obj - weak-bag + - WeakSets - Weather - weather-api - web3-ipfs - webapi - webapp - WebBits - - webcloud - webcrank - webcrank-dispatch - web-css - - webdriver + - webdriver-angular - webdriver-snoy - web-encodings - WeberLogic - - webex-teams-pipes - webfinger-client - webkitgtk3 - webkit-javascriptcore - webmention - web-output - web-push - - web-rep - Webrexp - web-routes-quasi - web-routes-transformers - webshow - - websockets-rpc - webwire - wedged - WEditor @@ -5624,7 +5774,6 @@ broken-packages: - whim - whiskers - whois - - wholepixels - why3 - WikimediaParser - willow @@ -5634,11 +5783,11 @@ broken-packages: - wireguard-hs - wires - wiring - - witness - witty - wkt - wkt-geom - WL500gPLib + - wl-pprint-console - wl-pprint-extras - WMSigner - woe @@ -5654,10 +5803,10 @@ broken-packages: - wordpass - wordsearch - workdays - - Workflow - workflow-osx - workflow-windows - work-time + - worldturtle - wp-archivebot - wreq-helper - wreq-patchable @@ -5667,7 +5816,7 @@ broken-packages: - writer-cps-morph - wsdl - wsedit - - wsjtx-udp + - wss-client - wtk - wumpus-core - wxdirect @@ -5703,7 +5852,9 @@ broken-packages: - XmlHtmlWriter - xml-parsec - xml-prettify + - xml-prettify-text - xml-query-xml-types + - xml-syntax - xml-to-json - xml-tydom-core - xml-verify @@ -5718,16 +5869,15 @@ broken-packages: - xmonad-windownames - Xorshift128Plus - xorshift-plus - - xournal-types - - xrefcheck - xsact - xsd + - xsha1 - xslt - - xstatic-th - - xturtle + - xxhash - y0l0bot - yabi-muno - yackage + - YACPong - yahoo-finance-api - yahoo-finance-conduit - yahoo-prices @@ -5745,7 +5895,6 @@ broken-packages: - YamlReference - yaml-rpc - yaml-union - - yaml-unscrambler - yampa2048 - yampa-glfw - yampa-gloss @@ -5755,9 +5904,8 @@ broken-packages: - yandex-translate - yaop - yapb - - yarl + - yarn2nix - yarr - - yasi - yate - yaya-test - yaya-unsafe-test @@ -5777,7 +5925,6 @@ broken-packages: - yesod-auth-ldap-mediocre - yesod-auth-ldap-native - yesod-auth-nopassword - - yesod-auth-oauth - yesod-auth-pam - yesod-auth-smbclient - yesod-auth-zendesk @@ -5800,6 +5947,7 @@ broken-packages: - yesod-katip - yesod-links - yesod-lucid + - yesod-middleware-csp - yesod-paginate - yesod-pagination - yesod-pnotify @@ -5822,9 +5970,11 @@ broken-packages: - yhccore - yhseq - yices - - yi-core + - yi-language + - yoctoparsec - yoda - Yogurt + - youtube - yu-core - yuiGrid - yu-tool @@ -5839,6 +5989,8 @@ broken-packages: - zeno - zeolite-lang - zephyr + - zero + - zeromq3-haskell - zeromq4-clone-pattern - zeromq4-conduit - zeromq4-patterns @@ -5851,7 +6003,7 @@ broken-packages: - zipedit - zipkin - ziptastic-core - - zm + - zlib-lens - ZMachine - zmidi-score - zmqat @@ -5862,6 +6014,7 @@ broken-packages: - zsh-battery - zsyntax - ztar + - zuul - Zwaluw - zxcvbn-dvorak - zydiskell diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 8e9df640f283..d61ab5200ceb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -1,40 +1,40 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-9.0.2 +compiler: ghc-9.2.4 core-packages: + - Cabal-3.6.3.0 - array-0.5.4.0 - - base-4.15.1.0 - - binary-0.8.8.0 - - bytestring-0.10.12.1 - - Cabal-3.4.1.0 - - containers-0.6.4.1 - - deepseq-1.4.5.0 + - base-4.16.3.0 + - binary-0.8.9.0 + - bytestring-0.11.3.1 + - containers-0.6.5.1 + - deepseq-1.4.6.1 - directory-1.3.6.2 - exceptions-0.10.4 - - filepath-1.4.2.1 - - ghc-9.0.2 - - ghc-bignum-1.1 - - ghc-boot-9.0.2 - - ghc-boot-th-9.0.2 + - filepath-1.4.2.2 + - ghc-9.2.4 + - ghc-bignum-1.2 + - ghc-boot-9.2.4 + - ghc-boot-th-9.2.4 - ghc-compact-0.1.0.0 - - ghc-heap-9.0.2 - - ghc-prim-0.7.0 - - ghci-9.0.2 + - ghc-heap-9.2.4 + - ghc-prim-0.8.0 + - ghci-9.2.4 - haskeline-0.8.2 - hpc-0.6.1.0 - integer-gmp-1.1 - - libiserv-9.0.2 + - libiserv-9.2.4 - mtl-2.2.2 - - parsec-3.1.14.0 + - parsec-3.1.15.0 - pretty-1.1.3.6 - process-1.6.13.2 - rts-1.0.2 - - stm-2.5.0.0 - - template-haskell-2.17.0.0 + - stm-2.5.0.2 + - template-haskell-2.18.0.0 - terminfo-0.4.1.5 - text-1.2.5.0 - - time-1.9.3 + - time-1.11.1.1 - transformers-0.5.6.2 - unix-2.7.2.2 - xhtml-3000.2.2.1 @@ -70,29 +70,22 @@ core-packages: default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, but stackage still restricts gi-gtk to 3.* - gi-gdkx11 < 4 - # reflex-dom-pandoc is only used by neuron which needs a version < 1.0.0.0 - - reflex-dom-pandoc < 1.0.0.0 - # 2022-02-18: pin to our current GHC version - - ghc-api-compat == 9.0.* # 2021-11-09: ghc-bignum is bundled starting with 9.0.1; only 1.0 builds with GHCs prior to 9.2.1 - ghc-bignum == 1.0 - # 1.2.0.0: “Dropped support for GHC <9.2 (might readd it later)” - - retrie < 1.2.0.0 - # 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 - # Needs dhall 1.41.*, Stackage LTS 19 has 1.40 - - dhall-nix < 1.1.24 - # patch is primarily used by reflex packages not all of which are patch 0.0.7 compatible yet - - patch < 0.0.7 - - reflex < 0.8.2.1 - - reflex-dom-core < 0.7.0.2 # Downgrade hasql-dynamic-statements until hasql 1.6 is in Stackage - hasql-dynamic-statements < 0.3.1.2 - # Its dependency brick >= 1.0 is not yet in stackage - - brick-skylighting < 1.0 + - rope-utf16-splay < 0.4.0.0 + # hnix < 0.17 (unreleased) needs hnix-store-* 0.5.* + - hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17 + - hnix-store-remote == 0.5.0.0 # 2022-06-17: Until hnix 0.17 + # reflex-dom-core 0.7.0.2 has no reflex 0.9 compatible release and most likely most people will want to use them together + - reflex < 0.9.0.0 + # reqired by haskell-language-server 1.9.0.0 + - implicit-hie < 0.1.3 + # latest version requires Cabal >= 3.8 + - shake-cabal < 0.2.2.3 extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. @@ -101,17 +94,17 @@ extra-packages: - Cabal == 3.4.* # required for cabal-install etc. - Cabal == 3.6.* # required for cabal-install-parsers etc. - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - - ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this - aeson < 2 # required by pantry-0.5.2 + - apply-refact == 0.9.* # 2022-12-12: needed for GHC < 9.2 - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now - base16-bytestring < 1 # required for cabal-install etc. - basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10 - bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9 - brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0 + - brick-skylighting < 1.0 # 2022-08-13: needed by matterhorn-50200.17.0 to match brick - brick == 1.3 # 2022-11-03: needed by swarm 0.2.0.0 - brittany == 0.13.1.2 # 2022-09-20: needed for hls on ghc 8.8 - cabal-install-parsers < 0.5 # 2022-08-31: required by haskell-ci 0.14.3 - - clay < 0.14 # 2022-03-20: Needed for neuron 1.0.0.0 - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 @@ -122,6 +115,7 @@ extra-packages: - fourmolu == 0.3.0.0 # 2022-09-21: needed for hls on ghc 8.8 - ghc-api-compat == 8.10.7 # 2022-02-17: preserve for GHC 8.10.7 - ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4 + - ghc-exactprint == 0.6.* # 2022-12-12: needed for GHC < 9.2 - ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 9.2 - ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 @@ -136,16 +130,16 @@ extra-packages: - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - hlint == 3.2.8 # 2022-09-21: needed for hls on ghc 8.8 - hlint == 3.4.1 # 2022-09-21: needed for hls with ghc-lib-parser 9.2 - - hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17 - - hnix-store-remote == 0.5.0.0 # 2022-06-17: Until hnix 0.17 - hpack == 0.35.0 # 2022-09-29: Needed for stack-2.9.1 - hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 + - hspec-meta < 2.8 # 2022-12-07: Needed for elmPackages.elm / hspec-discover - hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 - language-docker == 11.0.0 # required by hadolint 2.12.0, 2022-11-16 - language-javascript == 0.7.0.0 # required by purescript + - lens-aeson < 1.2 # 2022-12-17: For aeson < 2.0 compat - lsp == 1.4.0.0 # 2022-09-18: need for dhall-lsp-server 1.1.2 - lsp-types == 1.4.0.1 # 2022-09-18: need for dhall-lsp-server 1.1.2 - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls @@ -163,7 +157,9 @@ extra-packages: - vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1 - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 - - ghc-exactprint == 1.5.0 # 2022-10-06: newer versions of ghc-exactprint require ghc 9.4.2 + - commonmark-extensions < 0.2.3.3 # 2022-12-17: required by emanote 1.0.0.0 (to avoid a bug in 0.2.3.3) + - ShellCheck == 0.8.0 # 2022-12-28: required by haskell-ci 0.14.3 + - retrie < 1.2.0.0 # 2022-12-30: required for hls on ghc < 9.2 package-maintainers: abbradar: @@ -211,6 +207,8 @@ package-maintainers: - pava - slynx - tlynx + - xmonad + - xmonad-contrib expipiplus1: - VulkanMemoryAllocator - autoapply @@ -272,6 +270,9 @@ package-maintainers: - wstunnel gridaphobe: - located-base + ivanbrennan: + - xmonad + - xmonad-contrib jb55: # - bson-lens - cased @@ -298,15 +299,19 @@ package-maintainers: - ghcide - haskell-language-server - hedgehog + - hledger + - hledger-ui + - hledger-web - hlint - hmatrix - hspec-discover - iCalendar - matrix-client - - neuron - optics + - pandoc - paths - postgresql-simple + - purebred-email - reflex-dom - releaser - replace-megaparsec @@ -332,26 +337,16 @@ package-maintainers: pacien: - ldgallery-compiler peti: - - cabal-install - - cabal2nix - cabal2spec - - distribution-nixpkgs - funcmp - git-annex - - hackage-db - - hledger - hledger-interest - - hledger-ui - - hledger-web - hopenssl - hsdns - hsemail - hsyslog - - jailbreak-cabal - - language-nix - logging-facade-syslog - nix-paths - - pandoc - structured-haskell-mode - titlecase - xmonad @@ -364,6 +359,10 @@ package-maintainers: - persistent-sqlite - persistent-template - shakespeare + raehik: + - strongweak + - binrep + - bytepatch roberth: - arion-compose - cabal-pkg-config-version-hook @@ -401,9 +400,17 @@ package-maintainers: - zre sternenseemann: # also maintain upstream package + - cabal2nix + - distribution-nixpkgs + - hackage-db + - language-nix + - jailbreak-cabal - spacecookie - gopher-proxy # other packages I can help out for + - cabal-install + - hledger + - pandoc - systemd - fast-logger - flat @@ -427,19 +434,26 @@ package-maintainers: terlar: - nix-diff turion: - - rhine - - rhine-gloss + - Agda + - dunai - essence-of-live-coding - essence-of-live-coding-gloss - essence-of-live-coding-pulse - essence-of-live-coding-quickcheck - - Agda - - dunai + - essence-of-live-coding-warp - finite-typelits + - has-transformers + - monad-bayes + - monad-schedule - pulse-simple + - rhine + - rhine-gloss - simple-affine-space + - time-domain utdemir: - nix-tree + zowoq: + - ShellCheck unsupported-platforms: Allure: [ platforms.darwin ] @@ -522,6 +536,7 @@ unsupported-platforms: sdl2-mixer: [ platforms.darwin ] sdl2-ttf: [ platforms.darwin ] sensei: [ platforms.darwin ] + spade: [ platforms.darwin ] # depends on sdl2-mixer, which doesn't work on darwin synthesizer-alsa: [ platforms.darwin ] taffybar: [ platforms.darwin ] emanote: [ x86_64-darwin ] # Depends on stork which is broken on macOS sdk < 10.14 @@ -584,6 +599,7 @@ supported-platforms: linux-namespaces: [ platforms.linux ] lxc: [ platforms.linux ] midi-alsa: [ platforms.linux ] + OrderedBits: [ platforms.x86 ] # lacks implementations for non-x86: https://github.com/choener/OrderedBits/blob/401cbbe933b1635aa33e8e9b29a4a570b0a8f044/lib/Data/Bits/Ordered.hs#L316 password: [ platforms.x86 ] # uses scrypt, which requries x86 password-instances: [ platforms.x86 ] # uses scrypt, which requries x86 reactivity: [ platforms.windows ] diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index a359d8ef4224..dff7577fedca 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 19.32 +# Stackage LTS 20.6 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -15,27 +15,32 @@ default-package-overrides: - ad-delcont ==0.3.0.0 - adjunctions ==4.4.2 - adler32 ==0.1.2.0 - - advent-of-code-api ==0.2.8.1 + - advent-of-code-api ==0.2.8.4 - aern2-mp ==0.2.11.0 - aern2-real ==0.2.11.0 - aeson ==2.0.3.0 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.1 - aeson-casing ==0.2.0.0 - - aeson-commit ==1.4 + - aeson-combinators ==0.1.0.1 + - aeson-commit ==1.6.0 - aeson-compat ==0.3.10 - aeson-diff ==1.1.0.13 - aeson-extra ==0.5.1.1 - aeson-generic-compat ==0.0.1.3 - - aeson-optics ==1.1.1 + - aeson-iproute ==0.3.0 + - aeson-optics ==1.2.0.1 + - aeson-picker ==0.1.0.6 - aeson-pretty ==0.8.9 - aeson-qq ==0.8.4 - - aeson-schemas ==1.3.5.1 - - aeson-typescript ==0.3.0.1 + - aeson-schemas ==1.4.0.1 + - aeson-typescript ==0.4.2.0 + - aeson-value-parser ==0.19.7 - aeson-yak ==0.1.1.3 - aeson-yaml ==1.1.0.1 - Agda ==2.6.2.2 - agda2lagda ==0.2021.6.1 + - airship ==0.9.5 - al ==0.1.4.2 - alarmclock ==0.7.0.6 - alerts ==0.1.2.0 @@ -43,23 +48,23 @@ default-package-overrides: - alex-meta ==0.3.0.13 - algebra ==4.3.1 - algebraic-graphs ==0.6.1 - - align-audio ==0.0 - Allure ==0.11.0.0 - almost-fix ==0.0.2 - alsa-core ==0.5.0.1 - alsa-mixer ==0.3.0 - alsa-pcm ==0.6.1.1 - - alsa-seq ==0.6.0.8 - alternative-vector ==0.0.0 - alternators ==1.0.0.0 - ALUT ==2.4.0.3 - amqp ==0.22.1 - amqp-utils ==0.6.3.2 + - annotated-exception ==0.2.0.4 - annotated-wl-pprint ==0.7.0 - - ansi-terminal ==0.11.3 - - ansi-terminal-game ==1.8.0.0 + - ansi-terminal ==0.11.4 + - ansi-terminal-game ==1.8.1.0 - ansi-wl-pprint ==0.6.9 - ANum ==0.2.0.2 + - aos-signature ==0.1.1 - apecs ==0.9.4 - apecs-gloss ==0.2.4 - apecs-physics ==0.4.5 @@ -67,27 +72,30 @@ default-package-overrides: - api-maker ==0.1.0.6 - ap-normalize ==0.1.0.1 - appar ==0.1.8 + - appendful ==0.1.0.0 + - appendful-persistent ==0.1.0.0 - appendmap ==0.1.5 - - apply-refact ==0.9.3.0 + - apply-refact ==0.10.0.0 - apportionment ==0.0.0.4 - approximate ==0.3.5 - approximate-equality ==1.1.0.2 - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.1 + - arbtt ==0.12.0.1 - arithmoi ==0.12.0.2 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - arrows ==0.4.4.2 - - ascii ==1.1.3.0 - - ascii-case ==1.0.0.11 - - ascii-char ==1.0.0.15 + - ascii ==1.2.4.0 + - ascii-case ==1.0.1.2 + - ascii-char ==1.0.0.17 - asciidiagram ==1.3.3.3 - - ascii-group ==1.0.0.13 - - ascii-numbers ==1.0.0.0 - - ascii-predicates ==1.0.0.10 + - ascii-group ==1.0.0.15 + - ascii-numbers ==1.1.0.2 + - ascii-predicates ==1.0.1.2 - ascii-progress ==0.3.3.0 - - ascii-superset ==1.0.1.13 - - ascii-th ==1.0.0.11 + - ascii-superset ==1.0.1.15 + - ascii-th ==1.0.0.14 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 - asn1-types ==0.3.4 @@ -106,40 +114,41 @@ default-package-overrides: - attoparsec ==0.14.4 - attoparsec-base64 ==0.0.0 - attoparsec-binary ==0.2 - - attoparsec-data ==1.0.5.2 + - attoparsec-data ==1.0.5.3 - attoparsec-expr ==0.1.1.2 - attoparsec-iso8601 ==1.0.2.1 - attoparsec-path ==0.0.0.1 - attoparsec-time ==1.0.3 - - audacity ==0.0.2.1 - aur ==7.0.7 + - aura ==3.2.9 - authenticate ==1.3.5.1 - authenticate-oauth ==1.7 + - autodocodec ==0.2.0.1 + - autodocodec-openapi3 ==0.2.1.1 + - autodocodec-schema ==0.1.0.2 + - autodocodec-yaml ==0.2.0.3 - autoexporter ==2.0.0.2 - auto-update ==0.1.6 - - aws-cloudfront-signed-cookies ==0.2.0.10 + - avro ==0.6.1.2 + - aws-cloudfront-signed-cookies ==0.2.0.12 - aws-xray-client ==0.1.0.2 - aws-xray-client-persistent ==0.1.0.5 - aws-xray-client-wai ==0.1.0.2 - backtracking ==0.1.0 - bank-holidays-england ==0.2.0.8 - - barbies ==2.0.3.1 - - barrier ==0.1.1 - - base16 ==0.3.2.0 + - barbies ==2.0.4.0 + - base16 ==0.3.2.1 - base16-bytestring ==1.0.2.0 - - base16-lens ==0.1.3.2 - base32 ==0.2.2.0 - - base32-lens ==0.1.1.1 - base32string ==0.9.1 - base58-bytestring ==0.1.0 - base58string ==0.10.0 - base64 ==0.4.2.4 - base64-bytestring ==1.2.1.0 - base64-bytestring-type ==1.0.1 - - base64-lens ==0.3.1 - base64-string ==0.2 - - base-compat ==0.11.2 - - base-compat-batteries ==0.11.2 + - base-compat ==0.12.2 + - base-compat-batteries ==0.12.2 - basement ==0.0.15 - base-orphans ==0.8.7 - base-prelude ==1.6.1 @@ -148,6 +157,8 @@ default-package-overrides: - battleship-combinatorics ==0.0.1 - bazel-runfiles ==0.12 - bbdb ==0.8 + - bcp47 ==0.2.0.6 + - bcp47-orphans ==0.1.0.5 - bcrypt ==0.0.11 - beam-core ==0.9.2.1 - beam-migrate ==0.5.1.2 @@ -157,12 +168,15 @@ default-package-overrides: - bech32-th ==1.1.1 - bench ==1.0.12 - benchpress ==0.2.2.21 + - bench-show ==0.3.2 - bencode ==0.6.1.1 - bencoding ==0.4.5.4 + - benri-hspec ==0.1.0.1 - between ==0.11.0.0 + - bhoogle ==0.1.4.2 - bibtex ==0.1.0.6 - - bifunctors ==5.5.13 - - bimap ==0.4.0 + - bifunctors ==5.5.14 + - bimap ==0.5.0 - bimaps ==0.1.0.2 - bimap-server ==0.1.0.1 - bin ==0.1.2 @@ -175,7 +189,6 @@ default-package-overrides: - binary-list ==1.1.1.2 - binary-orphans ==1.0.3 - binary-parser ==0.5.7.2 - - binary-parsers ==0.2.4.0 - binary-search ==2.0.0 - binary-shared ==0.8.3 - binary-tagged ==0.3.1 @@ -183,11 +196,7 @@ default-package-overrides: - bindings-GLFW ==3.3.2.0 - bindings-libzip ==1.0.1 - bindings-uname ==0.1 - - BiobaseENA ==0.0.0.2 - BiobaseEnsembl ==0.2.0.1 - - BiobaseFasta ==0.4.0.1 - - BiobaseTypes ==0.2.1.0 - - BiobaseXNA ==0.11.1.1 - bitarray ==0.0.1.1 - bits ==0.6 - bitset-word8 ==0.1.1.2 @@ -195,6 +204,8 @@ default-package-overrides: - bitvec ==1.1.3.0 - bitwise-enum ==1.0.1.0 - blake2 ==0.3.0 + - Blammo ==1.1.1.1 + - blank-canvas ==0.7.3 - blanks ==0.5.0 - blas-carray ==0.1.0.1 - blas-comfort-array ==0.0.0.3 @@ -202,34 +213,33 @@ default-package-overrides: - blas-hs ==0.1.1.0 - blaze-bootstrap ==0.1.0.1 - blaze-builder ==0.4.2.2 - - blaze-colonnade ==1.2.2.1 - blaze-html ==0.9.1.2 - blaze-markup ==0.8.2.8 - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.2.1 + - bloodhound ==0.21.0.0 - bm ==0.1.0.2 - bmp ==1.2.6.3 - bnb-staking-csvs ==0.2.1.0 - - BNFC ==2.9.4 + - BNFC ==2.9.4.1 - BNFC-meta ==0.6.1 - - board-games ==0.3 - bodhi ==0.1.0 - boltzmann-samplers ==0.1.1.0 - bookkeeping ==0.4.0.1 - Boolean ==0.2.4 - - boolean-like ==0.1.1.0 - boolsimplifier ==0.1.8 - - boomerang ==1.4.8 + - boomerang ==1.4.8.1 - boots ==0.2.0.1 - bordacount ==0.1.0.0 - boring ==0.2 - - both ==0.1.1.2 - bound ==2.0.5 - BoundedChan ==1.0.3.0 - bounded-queue ==1.0.0 + - boundingboxes ==0.2.3 + - bower-json ==1.1.0.0 - boxes ==0.1.5 - - brick ==0.68.1 - - brittany ==0.14.0.2 + - breakpoint ==0.1.2.0 + - brick ==1.4 - broadcast-chan ==0.2.1.2 - brotli ==0.0.0.1 - brotli-streams ==0.0.0.0 @@ -238,52 +248,61 @@ default-package-overrides: - bson-lens ==0.1.1 - buffer-builder ==0.2.4.8 - buffer-pipe ==0.0 + - bugsnag ==1.0.0.1 - bugsnag-haskell ==0.0.4.4 - bugsnag-hs ==0.2.0.9 - - bugzilla-redhat ==1.0.0 + - bugsnag-wai ==1.0.0.1 + - bugsnag-yesod ==1.0.0.1 + - bugzilla-redhat ==1.0.1 - burrito ==2.0.1.2 - butcher ==1.3.3.2 - - buttplug-hs-core ==0.1.0.1 - bv ==0.5 - byteable ==0.1.1 + - bytebuild ==0.3.12.0 - byte-count-reader ==0.10.1.9 - bytedump ==1.0 + - bytehash ==0.1.0.0 - byte-order ==0.1.3.0 - byteorder ==1.0.4 - bytes ==0.17.2 - byteset ==0.1.1.0 + - byteslice ==0.2.7.0 + - bytesmith ==0.3.9.1 - bytestring-builder ==0.10.8.2.0 - bytestring-conversion ==0.3.2 - bytestring-lexing ==0.5.0.9 - bytestring-mmap ==0.2.2 + - bytestring-progress ==1.4 - bytestring-strict-builder ==0.4.5.6 - bytestring-to-vector ==0.3.0.1 - bytestring-tree-builder ==0.2.7.10 - bytestring-trie ==0.2.7 - bz2 ==1.0.1.0 - - bzlib ==0.5.1.0 - bzlib-conduit ==0.3.0.2 - c14n ==0.1.0.2 - c2hs ==0.28.8 - - cabal2spec ==2.6.2 + - cabal2spec ==2.6.3 - cabal-appimage ==0.3.0.5 - - cabal-clean ==0.1.20220814 + - cabal-clean ==0.2.20220819 + - cabal-debian ==5.2.1 - cabal-doctest ==1.0.9 - cabal-file ==0.1.1 - cabal-file-th ==0.2.7 - cabal-flatpak ==0.1.0.3 - - cabal-plan ==0.7.2.1 + - cabal-plan ==0.7.2.3 - cabal-rpm ==2.0.11.1 - Cabal-syntax ==3.6.0.0 - cache ==0.1.3.0 - cached-json-file ==0.1.1 - cacophony ==0.10.1 + - cairo ==0.13.8.2 - calendar-recycling ==0.0.0.1 - - call-alloy ==0.3.0.3 + - call-alloy ==0.4.0.1 + - calligraphy ==0.1.3 + - call-plantuml ==0.0.1.1 - call-stack ==0.4.0 - can-i-haz ==0.3.1.0 - capability ==0.5.0.1 - - capataz ==0.2.1.0 - ca-province-codes ==1.0.0.0 - cardano-coin-selection ==1.0.1 - carray ==0.1.6.8 @@ -291,14 +310,12 @@ default-package-overrides: - casa-types ==0.0.2 - cased ==0.1.0.0 - case-insensitive ==1.2.1.0 - - cases ==0.1.4.1 + - cases ==0.1.4.2 - casing ==0.1.4.1 - cassava ==0.5.3.0 - - cassava-conduit ==0.6.0 - cassava-megaparsec ==2.0.4 - cast ==0.1.0.2 - - caster ==0.0.3.0 - - cayley-client ==0.4.17 + - cayley-client ==0.4.19.2 - cborg ==0.2.8.0 - cborg-json ==0.2.5.0 - cdar-mBound ==0.1.0.4 @@ -306,15 +323,17 @@ default-package-overrides: - cereal ==0.5.8.3 - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 + - cereal-unordered-containers ==0.1 - cereal-vector ==0.2.0.1 - cfenv ==0.1.0.0 - - cgi ==3001.5.0.0 - chan ==0.0.4.1 - - ChannelT ==0.0.0.7 - character-cases ==0.1.0.6 - charset ==0.3.9 - charsetdetect-ae ==1.1.0.4 - Chart ==1.9.4 + - Chart-cairo ==1.9.3 + - Chart-diagrams ==1.9.4 + - chart-svg ==0.3.2 - ChasingBottoms ==1.3.1.12 - cheapskate ==0.1.1.2 - cheapskate-highlight ==0.1.0.0 @@ -322,30 +341,23 @@ default-package-overrides: - check-email ==1.0.2 - checkers ==0.6.0 - checksum ==0.0 - - chimera ==0.3.2.0 - - chiphunk ==0.1.4.0 + - chimera ==0.3.3.0 - choice ==0.2.2 - chronologique ==0.3.1.3 - chunked-data ==0.3.1 - cipher-aes ==0.2.11 - - cipher-aes128 ==0.7.0.6 - cipher-camellia ==0.0.2 - - cipher-des ==0.0.6 - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - circular ==0.4.0.3 - - citeproc ==0.6.0.1 - - clash-ghc ==1.6.4 - - clash-lib ==1.6.4 - - clash-prelude ==1.6.4 + - citeproc ==0.8.0.2 - classy-prelude ==1.5.0.2 - classy-prelude-conduit ==1.5.0 - classy-prelude-yesod ==1.5.0 - - clay ==0.14.0 - cleff ==0.3.3.0 - cleff-plugin ==0.1.0.0 - clientsession ==0.9.1.2 - - climb ==0.3.3 + - climb ==0.4.1 - Clipboard ==2.3.2.0 - clock ==0.8.3 - closed ==0.2.0.2 @@ -358,17 +370,16 @@ default-package-overrides: - codec-beam ==0.2.0 - code-conjure ==0.5.2 - code-page ==0.2.1 - - coercible-utils ==0.1.0 - cointracking-imports ==0.1.0.2 - collect-errors ==0.1.5.0 - - colonnade ==1.2.0.2 + - co-log-core ==0.3.2.0 - Color ==0.3.3 - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 - colour ==2.3.6 - columnar ==1.0.0.0 - combinatorial ==0.1.0.1 - - comfort-array ==0.5.1.1 + - comfort-array ==0.5.2 - comfort-array-shape ==0.0 - comfort-fftw ==0.0 - comfort-graph ==0.0.3.2 @@ -378,21 +389,25 @@ default-package-overrides: - commutative ==0.0.2 - comonad ==5.0.8 - comonad-extras ==4.0.1 - - compact ==0.2.0.0 - compactmap ==0.1.4.2.1 - compensated ==0.8.3 - compiler-warnings ==0.1.0 - componentm ==0.0.0.2 - componentm-devel ==0.0.0.2 - composable-associations ==0.1.0.0 + - composite-base ==0.8.2.1 + - composite-binary ==0.8.2.1 + - composite-ekg ==0.8.2.1 + - composite-tuple ==0.1.2.0 + - composite-xstep ==0.1.0.0 - composition ==1.0.2.2 - composition-extra ==2.0.0 + - composition-prelude ==3.0.0.2 - concise ==0.1.0.1 - concurrency ==1.11.0.2 - concurrent-extra ==0.7.0.12 - concurrent-output ==1.10.16 - concurrent-split ==0.0.1.1 - - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - conduino ==0.2.2.0 - conduit ==1.3.4.3 @@ -400,18 +415,17 @@ default-package-overrides: - conduit-algorithms ==0.0.13.0 - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.3 - - conduit-connection ==0.1.0.5 - conduit-extra ==1.3.6 - conduit-parse ==0.2.1.1 - conduit-zstd ==0.0.2.0 - conferer ==1.1.0.0 - conferer-aeson ==1.1.0.2 - - conferer-warp ==1.1.0.0 - ConfigFile ==1.1.4 - config-ini ==0.2.5.0 - configuration-tools ==0.6.1 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 + - configurator-pg ==0.2.7 - connection ==0.3.1 - connection-pool ==0.2.2 - console-style ==0.0.2.1 @@ -419,7 +433,11 @@ default-package-overrides: - constraints-extras ==0.3.2.1 - constraint-tuples ==0.1.2 - construct ==0.3.1.1 - - containers-unicode-symbols ==0.3.1.3 + - context ==0.2.0.1 + - context-http-client ==0.2.0.1 + - context-resource ==0.2.0.1 + - context-wai-middleware ==0.2.0.1 + - contiguous ==0.6.3.0 - contravariant ==1.5.5 - contravariant-extras ==0.3.5.3 - control-bool ==0.2.1 @@ -427,19 +445,22 @@ default-package-overrides: - control-monad-free ==0.6.2 - control-monad-omega ==0.3.2 - convertible ==1.1.1.1 - - cookie ==0.4.5 + - cookie ==0.4.6 - copr-api ==0.1.0 - core-data ==0.3.8.0 - - core-program ==0.4.6.4 + - core-program ==0.6.1.1 + - core-telemetry ==0.2.7.0 - core-text ==0.3.8.0 - - countable ==1.0 - - covariance ==0.1.0.6 + - countable ==1.2 + - country ==0.2.3 + - covariance ==0.2.0.1 - cpphs ==1.20.9.1 - cprng-aes ==0.6.1 - cpu ==0.1.2 - cpuinfo ==0.1.0.2 + - cql ==4.0.4 + - cql-io ==1.1.1 - crackNum ==3.2 - - crc32c ==0.0.0 - credential-store ==0.1.2 - criterion ==1.5.13.0 - criterion-measurement ==0.1.4.0 @@ -456,7 +477,7 @@ default-package-overrides: - cryptohash-sha1 ==0.11.101.0 - cryptohash-sha256 ==0.11.102.1 - cryptohash-sha512 ==0.11.101.0 - - cryptonite ==0.29 + - cryptonite ==0.30 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 - crypto-pubkey-types ==0.4.3 @@ -477,30 +498,29 @@ default-package-overrides: - curl-runnings ==0.17.0 - currencies ==0.2.0.0 - currency ==0.2.0.0 + - currycarbon ==0.2.1.1 - cursor ==0.3.2.0 - cursor-brick ==0.1.0.1 - cursor-fuzzy-time ==0.0.0.0 - cursor-gen ==0.4.0.0 - - cutter ==0.0 - cyclotomic ==1.1.1 - czipwith ==1.0.1.4 - - d10 ==1.0.1.0 + - d10 ==1.0.1.2 - data-accessor ==0.2.3 - data-accessor-mtl ==0.2.0.4 - data-accessor-transformers ==0.2.1.7 + - data-array-byte ==0.1.0.1 - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.2 - data-checked ==0.3 - data-clist ==0.2 - data-default ==0.7.1.1 - data-default-class ==0.1.2.0 - - data-default-extra ==0.1.0 - data-default-instances-base ==0.1.0.1 - data-default-instances-bytestring ==0.0.1 - data-default-instances-case-insensitive ==0.0.1 - data-default-instances-containers ==0.0.1 - data-default-instances-dlist ==0.0.1 - - data-default-instances-new-base ==0.0.2 - data-default-instances-old-locale ==0.0.1 - data-default-instances-text ==0.0.1 - data-default-instances-unordered-containers ==0.0.1 @@ -510,7 +530,8 @@ default-package-overrides: - data-dword ==0.3.2.1 - data-endian ==0.1.1 - data-fix ==0.3.2 - - data-forest ==0.1.0.9 + - data-forest ==0.1.0.10 + - data-functor-logistic ==0.0 - data-has ==0.4.0.0 - data-hash ==0.2.0.1 - data-interval ==2.1.1 @@ -534,7 +555,7 @@ default-package-overrides: - dawg-ord ==0.5.1.2 - dbcleaner ==0.1.3 - DBFunctor ==0.1.2.1 - - dbus ==1.2.22 + - dbus ==1.2.27 - dbus-hslogger ==0.1.0.1 - debian ==4.0.4 - debian-build ==0.10.2.1 @@ -547,26 +568,29 @@ default-package-overrides: - dejafu ==2.4.0.4 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.4.0.0 - - dependent-sum ==0.7.1.0 + - dependent-sum ==0.7.2.0 - dependent-sum-template ==0.1.1.1 - depq ==0.4.2 - deque ==0.4.4 - deriveJsonNoPrefix ==0.1.0.1 - derive-topdown ==0.0.3.0 - deriving-aeson ==0.2.8 - - deriving-compat ==0.6.1 - - derulo ==2.0.0.3 + - deriving-compat ==0.6.2 - detour-via-sci ==1.0.0 - df1 ==0.4 - - dhall ==1.40.2 - - dhall-bash ==1.0.39 - - dhall-json ==1.7.9 - - dhall-yaml ==1.2.10 + - dhall ==1.41.2 + - dhall-bash ==1.0.40 + - dhall-json ==1.7.11 + - dhall-yaml ==1.2.11 - di ==1.3 - diagrams ==1.4.0.1 - - diagrams-contrib ==1.4.4 + - diagrams-builder ==0.8.0.5 + - diagrams-cairo ==1.4.2 + - diagrams-canvas ==1.4.1.1 + - diagrams-contrib ==1.4.5 - diagrams-core ==1.5.0.1 - - diagrams-lib ==1.4.5.1 + - diagrams-lib ==1.4.5.2 + - diagrams-postscript ==1.5.1 - diagrams-rasterific ==1.4.2.2 - diagrams-solve ==0.1.3 - diagrams-svg ==1.4.3.1 @@ -574,48 +598,50 @@ default-package-overrides: - dictionary-sharing ==0.1.0.0 - di-df1 ==1.2.1 - Diff ==0.4.1 - - digest ==0.0.1.3 + - digest ==0.0.1.4 - digits ==0.3.1 - di-handle ==1.0.1 - - dimensional ==1.4 + - dimensional ==1.5 - di-monad ==1.3.1 - directory-tree ==0.12.1 - direct-sqlite ==2.3.27 - dirichlet ==0.1.0.7 - discount ==0.1.1 - discover-instances ==0.1.0.0 - - discrimination ==0.4.1 + - discrimination ==0.5 - disk-free-space ==0.1.0.1 - - distributed-static ==0.3.9 - distribution-opensuse ==1.1.3 - distributive ==0.6.2.1 + - diversity ==0.8.1.0 - djinn-lib ==0.0.1.4 + - dl-fedora ==0.9.3 - dlist ==1.0 - dlist-instances ==0.1.1.1 - - dlist-nonempty ==0.1.1 - - dns ==4.0.1 + - dlist-nonempty ==0.1.2 + - dns ==4.1.0 + - docker ==0.7.0.1 - dockerfile ==0.2.0 - - doclayout ==0.3.1.1 - - docopt ==0.7.0.7 - - doctemplates ==0.10.0.1 - - doctest ==0.18.2 + - doclayout ==0.4 + - doctemplates ==0.10.0.2 + - doctest ==0.20.1 - doctest-discover ==0.2.0.0 - - doctest-driver-gen ==0.3.0.5 + - doctest-driver-gen ==0.3.0.6 - doctest-exitcode-stdio ==0.0 - - doctest-extract ==0.1 - doctest-lib ==0.1 - - doctest-parallel ==0.2.5 + - doctest-parallel ==0.2.6 - doldol ==0.4.1.2 - do-list ==1.0.1 - - domain ==0.1.1.3 - - domain-core ==0.1.0.2 + - domain ==0.1.1.4 + - domain-aeson ==0.1 + - domain-cereal ==0.1 + - domain-core ==0.1.0.3 - domain-optics ==0.1.0.3 - do-notation ==0.1.0.2 - dot ==0.3 - - dotenv ==0.9.0.2 + - dotenv ==0.10.0.0 - dotgen ==0.4.3 - dotnet-timespan ==0.0.1.0 - - double-conversion ==2.0.4.1 + - double-conversion ==2.0.4.2 - download ==0.3.2.7 - download-curl ==0.1.4 - DPutils ==0.1.1.0 @@ -626,7 +652,7 @@ default-package-overrides: - dual ==0.1.1.1 - dual-tree ==0.2.3.1 - dublincore-xml-conduit ==0.1.0.2 - - dunai ==0.8.3 + - dunai ==0.9.2 - duration ==0.2.0.0 - dvorak ==0.1.0.0 - dynamic-state ==0.3.1 @@ -639,27 +665,33 @@ default-package-overrides: - echo ==0.1.4 - ecstasy ==0.2.1.0 - ed25519 ==0.0.5.0 + - ede ==0.3.3.0 - edit-distance ==0.2.2.1 - edit-distance-vector ==1.0.0.4 - editor-open ==0.6.0.0 + - effectful ==2.2.1.0 + - effectful-core ==2.2.1.0 + - effectful-plugin ==1.0.0.0 + - effectful-th ==1.0.0.0 - either ==5.0.2 - either-both ==0.1.1.1 - either-unwrap ==1.1 - ekg-core ==0.1.1.7 - elerea ==2.9.0 - elf ==0.31 - - eliminators ==0.8 + - eliminators ==0.9 + - elm2nix ==0.3.0 - elm-bridge ==0.8.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - elynx ==0.6.1.1 - - elynx-markov ==0.6.1.1 - - elynx-nexus ==0.6.1.1 - - elynx-seq ==0.6.1.1 - - elynx-tools ==0.6.1.1 - - elynx-tree ==0.6.1.1 - - email-validate ==2.3.2.16 - - emd ==0.2.0.0 + - elynx ==0.7.0.1 + - elynx-markov ==0.7.0.1 + - elynx-nexus ==0.7.0.1 + - elynx-seq ==0.7.0.1 + - elynx-tools ==0.7.0.1 + - elynx-tree ==0.7.0.1 + - emacs-module ==0.1.1.1 + - email-validate ==2.3.2.18 - emojis ==0.1.2 - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 @@ -668,40 +700,35 @@ default-package-overrides: - enumset ==0.1 - enum-text ==0.5.3.0 - envelope ==0.2.2.0 - - envparse ==0.4.1 + - envparse ==0.5.0 - envy ==2.1.1.0 - eq ==4.3 - - equal-files ==0.0.5.3 - equational-reasoning ==0.7.0.1 - equivalence ==0.4.1 - erf ==2.0.0.0 - errata ==0.4.0.0 - - error ==0.3.0.0 + - error ==1.0.0.0 - errorcall-eq-instance ==0.3.0 - - error-or ==0.2.0.0 + - error-or ==0.3.0 - error-or-utils ==0.2.0 - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.13 - esqueleto ==3.5.8.1 - - essence-of-live-coding ==0.2.6 - - essence-of-live-coding-gloss ==0.2.6 - - essence-of-live-coding-pulse ==0.2.6 - - essence-of-live-coding-quickcheck ==0.2.6 - - essence-of-live-coding-warp ==0.2.6 - - eventful-core ==0.2.0 - - eventful-memory ==0.2.0 - - eventful-test-helpers ==0.2.0 + - essence-of-live-coding ==0.2.7 + - essence-of-live-coding-gloss ==0.2.7 + - essence-of-live-coding-pulse ==0.2.7 + - essence-of-live-coding-quickcheck ==0.2.7 + - essence-of-live-coding-warp ==0.2.7 - event-list ==0.1.2 - eventstore ==1.4.2 - every ==0.0.1 - evm-opcodes ==0.1.2 - exact-combinatorics ==0.2.0.11 - exact-pi ==0.5.0.2 - - exception-hierarchy ==0.1.0.6 + - exception-hierarchy ==0.1.0.8 - exception-mtl ==0.4.0.1 - exception-transformers ==0.4.0.11 - - exception-via ==0.1.0.0 - executable-hash ==0.2.0.4 - executable-path ==0.0.3.1 - exit-codes ==1.0.0 @@ -713,6 +740,7 @@ default-package-overrides: - exp-pairs ==0.2.1.0 - express ==1.0.10 - extended-reals ==0.2.4.0 + - extensible ==0.9 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 - extra ==1.7.12 @@ -726,13 +754,14 @@ default-package-overrides: - fakefs ==0.3.0.2 - fakepull ==0.3.0.2 - faktory ==1.1.2.4 - - fast-builder ==0.1.3.0 + - fasta ==0.10.4.2 - fast-logger ==3.1.1 - fast-math ==1.0.2 - - fastmemo ==0.1.1 + - fb ==2.1.1.1 - fclabels ==2.0.5.1 + - fdo-notify ==0.3.1 - feature-flags ==0.1.0.1 - - fedora-dists ==2.0.0 + - fedora-dists ==2.1.1 - fedora-haskell-tools ==1.0 - feed ==1.3.2.1 - FenwickTree ==0.1.2.1 @@ -740,12 +769,13 @@ default-package-overrides: - fftw-ffi ==0.1 - fgl ==5.7.0.3 - fields-json ==0.4.0.0 + - filecache ==0.4.1 - file-embed ==0.0.15.0 - file-embed-lzma ==0.0.1 - filelock ==0.1.1.5 - filemanip ==0.3.6.3 - file-modules ==0.1.2.4 - - filepath-bytestring ==1.4.2.1.9 + - filepath-bytestring ==1.4.2.1.12 - file-path-th ==0.1.0.0 - filepattern ==0.1.3 - fileplow ==0.1.0.0 @@ -760,14 +790,14 @@ default-package-overrides: - fitspec ==0.4.10 - fixed ==0.3 - fixed-length ==0.2.3.1 - - fixed-vector ==1.2.1.0 + - fixed-vector ==1.2.2.1 - fixed-vector-hetero ==0.6.1.1 - - fix-whitespace ==0.0.10 + - fix-whitespace ==0.0.11 - flac ==0.2.0 - flac-picture ==0.1.2 - flags-applicative ==0.1.0.3 - - flat ==0.4.4 - flat-mcmc ==1.5.2 + - flatparse ==0.3.5.1 - flay ==0.4 - flexible-defaults ==0.0.3 - FloatingHex ==0.5 @@ -779,9 +809,7 @@ default-package-overrides: - fn ==0.3.0.2 - focus ==1.0.3 - focuslist ==0.1.1.0 - - fold-debounce ==0.2.0.9 - - fold-debounce-conduit ==0.2.0.6 - - foldl ==1.4.12 + - foldl ==1.4.13 - folds ==0.7.8 - follow-file ==0.0.3 - FontyFruity ==0.5.3.5 @@ -790,13 +818,14 @@ default-package-overrides: - ForestStructures ==0.0.1.0 - forkable-monad ==0.2.0.3 - forma ==1.2.0 + - formatn ==0.2.1 - format-numbers ==0.1.0.1 - formatting ==7.1.3 - - fortran-src ==0.9.0 + - fortran-src ==0.12.0 - foundation ==0.0.29 - - fourmolu ==0.4.0.0 - - Frames ==0.7.3 - - free ==5.1.9 + - fourmolu ==0.9.0.0 + - freckle-app ==1.3.0.0 + - free ==5.1.10 - free-categories ==0.2.0.2 - freenect ==1.2.1 - freer-simple ==1.2.1.2 @@ -812,7 +841,6 @@ default-package-overrides: - funcmp ==1.9 - function-builder ==0.3.0.1 - functor-classes-compat ==2.0.0.2 - - functor-combinators ==0.4.1.0 - fused-effects ==1.1.2.1 - fusion-plugin ==0.2.5 - fusion-plugin-types ==0.1.0 @@ -824,14 +852,15 @@ default-package-overrides: - gauge ==0.2.5 - gd ==3000.7.3 - gdp ==0.0.3.0 + - gemini-exports ==0.1.0.0 - general-games ==1.1.1 - generic-aeson ==0.2.0.14 - - generic-arbitrary ==0.2.2 + - generic-arbitrary ==1.0.1 - generic-constraints ==1.1.1.1 - - generic-data ==0.9.2.1 + - generic-data ==1.0.0.0 - generic-data-surgery ==0.3.0.0 - generic-deriving ==1.14.2 - - generic-functor ==0.2.0.0 + - generic-functor ==1.1.0.0 - generic-lens ==2.2.1.0 - generic-lens-core ==2.2.1.0 - generic-monoid ==0.1.0.1 @@ -841,11 +870,13 @@ default-package-overrides: - generics-eot ==0.4.0.1 - generics-sop ==0.5.1.2 - generics-sop-lens ==0.2.0.1 - - geniplate-mirror ==0.7.8 - - genvalidity ==1.0.0.1 - - genvalidity-bytestring ==1.0.0.0 - - genvalidity-containers ==1.0.0.0 - - genvalidity-criterion ==1.0.0.0 + - genvalidity ==1.1.0.0 + - genvalidity-aeson ==1.0.0.1 + - genvalidity-appendful ==0.1.0.0 + - genvalidity-bytestring ==1.0.0.1 + - genvalidity-case-insensitive ==0.0.0.1 + - genvalidity-containers ==1.0.0.1 + - genvalidity-criterion ==1.1.0.0 - genvalidity-hspec ==1.0.0.2 - genvalidity-hspec-aeson ==1.0.0.0 - genvalidity-hspec-binary ==1.0.0.0 @@ -853,15 +884,22 @@ default-package-overrides: - genvalidity-hspec-hashable ==1.0.0.0 - genvalidity-hspec-optics ==1.0.0.0 - genvalidity-hspec-persistent ==1.0.0.0 + - genvalidity-mergeful ==0.3.0.0 - genvalidity-mergeless ==0.3.0.0 - - genvalidity-path ==1.0.0.0 + - genvalidity-path ==1.0.0.1 - genvalidity-persistent ==1.0.0.1 - genvalidity-property ==1.0.0.0 - genvalidity-scientific ==1.0.0.0 + - genvalidity-sydtest ==1.0.0.0 + - genvalidity-sydtest-aeson ==1.0.0.0 + - genvalidity-sydtest-hashable ==1.0.0.0 + - genvalidity-sydtest-lens ==1.0.0.0 + - genvalidity-sydtest-persistent ==1.0.0.0 - genvalidity-text ==1.0.0.1 - - genvalidity-time ==1.0.0.0 + - genvalidity-time ==1.0.0.1 + - genvalidity-typed-uuid ==0.1.0.1 - genvalidity-unordered-containers ==1.0.0.0 - - genvalidity-uuid ==1.0.0.0 + - genvalidity-uuid ==1.0.0.1 - genvalidity-vector ==1.0.0.0 - geodetics ==0.1.2 - geojson ==4.1.0 @@ -871,20 +909,20 @@ default-package-overrides: - ghc-check ==0.5.0.8 - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - - ghc-events ==0.17.0.3 - - ghc-exactprint ==0.6.4 + - ghc-events ==0.18.0 + - ghc-exactprint ==1.5.0 - ghcid ==0.8.7 - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - ghcjs-perch ==0.3.3.3 - - ghc-lib ==9.0.2.20211226 - - ghc-lib-parser ==9.0.2.20211226 - - ghc-lib-parser-ex ==9.0.0.6 + - ghc-lib ==9.2.5.20221107 + - ghc-lib-parser ==9.2.5.20221107 + - ghc-lib-parser-ex ==9.2.0.4 - ghc-parser ==0.2.4.0 - ghc-paths ==0.1.0.12 - - ghc-prof ==1.4.1.11 + - ghc-prof ==1.4.1.12 - ghc-source-gen ==0.4.3.0 - - ghc-syntax-highlighter ==0.0.7.0 + - ghc-syntax-highlighter ==0.0.8.0 - ghc-tcplugins-extra ==0.4.3 - ghc-trace-events ==0.1.2.6 - ghc-typelits-extra ==0.4.4 @@ -912,27 +950,31 @@ default-package-overrides: - gi-gtksource ==3.0.26 - gi-harfbuzz ==0.0.7 - gi-javascriptcore ==4.0.25 - - ginger ==0.10.4.0 + - gio ==0.13.8.2 - gi-pango ==1.0.27 - githash ==0.1.6.3 - - github ==0.27 + - github ==0.28.0.1 - github-release ==2.0.0.2 - github-rest ==1.1.2 - github-types ==0.2.1 - - github-webhooks ==0.15.0 + - github-webhooks ==0.16.0 + - gitlab-haskell ==1.0.0.1 + - git-lfs ==1.2.0 + - gitlib ==3.1.3 - gitrev ==1.3.1 - gi-vte ==2.91.30 - gi-xlib ==2.0.12 - gl ==0.9 - - glabrous ==2.0.6 - glasso ==0.1.0 - GLFW-b ==3.3.0.0 + - glib ==0.13.8.2 - Glob ==0.10.2 - glob-posix ==0.2.0.1 - - gloss ==1.13.2.1 + - gloss ==1.13.2.2 - gloss-algorithms ==1.13.0.3 + - gloss-examples ==1.13.0.4 - gloss-raster ==1.13.1.2 - - gloss-rendering ==1.13.1.1 + - gloss-rendering ==1.13.1.2 - GLURaw ==2.0.0.5 - GLUT ==2.7.0.16 - gmail-simple ==0.1.0.4 @@ -940,82 +982,82 @@ default-package-overrides: - goldplate ==0.2.0 - google-isbn ==1.0.3 - gopher-proxy ==0.1.1.3 - - gothic ==0.1.8 - gotyno-hs ==1.1.0 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - graphite ==0.10.0.1 + - graphql-client ==1.2.1 - graphs ==0.7.2 - graphula ==2.0.2.2 - graphviz ==2999.20.1.0 - graph-wrapper ==0.2.6.0 - gravatar ==0.8.1 - - greskell ==2.0.0.0 - - greskell-core ==1.0.0.0 - - greskell-websocket ==1.0.0.0 + - gridtables ==0.0.3.0 - groom ==0.1.2.1 - - groundhog ==0.12.0 - - groundhog-postgresql ==0.12 - - groundhog-sqlite ==0.12.0 - - group-by-date ==0.1.0.4 - grouped-list ==0.2.3.0 - groups ==0.5.3 + - gtk ==0.15.7 - gtk2hs-buildtools ==0.13.8.3 + - gtk3 ==0.15.7 - gtk-sni-tray ==0.1.8.1 - gtk-strut ==0.1.3.2 - guarded-allocation ==0.0.1 - hackage-cli ==0.0.3.6 - hackage-db ==2.1.2 - - hackage-security ==0.6.2.2 + - hackage-security ==0.6.2.3 - haddock-library ==1.10.0 - - hadoop-streaming ==0.2.0.3 - hakyll ==4.15.1.1 - hakyll-convert ==0.3.0.4 - - hal ==0.4.10.1 + - hal ==1.0.0.1 - half ==0.3.1 - hall-symbols ==0.1.0.6 - - hamilton ==0.1.0.3 + - hamlet ==1.2.0 - hamtsolo ==1.0.4 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 + - happstack-hsp ==7.3.7.6 + - happstack-jmacro ==7.0.12.4 - happstack-server ==7.7.2 - happstack-server-tls ==7.2.1.3 - happy ==1.20.0 - happy-meta ==0.2.0.11 - - HasBigDecimal ==0.1.1 + - harp ==0.4.3.5 + - HasBigDecimal ==0.2.0.0 - hasbolt ==0.1.6.2 - - hashable ==1.3.5.0 - - hashable-time ==0.3 + - hashable ==1.4.2.0 - hashids ==1.0.2.7 - - hashing ==0.1.0.1 - hashmap ==1.3.3 - - hashtables ==1.2.4.2 + - hashtables ==1.3.1 - haskeline ==0.8.2 - - haskell-awk ==1.2.0.1 - haskell-gi ==0.26.2 - haskell-gi-base ==0.26.3 - haskell-gi-overloading ==1.0 - - haskell-lexer ==1.1 - - haskell-lsp-types ==0.24.0.0 + - haskell-lexer ==1.1.1 + - HaskellNet ==0.6.0.2 + - HaskellNet-SSL ==0.3.4.4 - haskell-src ==1.0.4 - haskell-src-exts ==1.23.1 + - haskell-src-exts-simple ==1.23.0.0 - haskell-src-exts-util ==0.2.5 - haskell-src-meta ==0.8.11 - haskey-btree ==0.3.0.1 - haskintex ==0.8.0.1 - haskoin-core ==0.21.2 + - haskoin-store-data ==0.65.5 - hasktags ==0.72.0 - - hasql ==1.5.1 + - hasql ==1.6.3 + - hasql-dynamic-statements ==0.3.1.2 + - hasql-implicits ==0.1.0.5 - hasql-migration ==0.3.0 - hasql-notifications ==0.2.0.3 - - hasql-optparse-applicative ==0.3.0.9 - - hasql-pool ==0.5.2.2 + - hasql-optparse-applicative ==0.5 + - hasql-pool ==0.8.0.6 - hasql-queue ==1.2.0.2 - - hasql-th ==0.4.0.17 - - hasql-transaction ==1.0.1.1 + - hasql-th ==0.4.0.18 + - hasql-transaction ==1.0.1.2 - has-transformers ==0.1.0.4 - hasty-hamiltonian ==1.3.4 - - HaTeX ==3.22.3.1 + - HaTeX ==3.22.3.2 - HaXml ==1.25.12 - haxr ==3000.11.4.1 - HCodecs ==0.5.2 @@ -1027,8 +1069,8 @@ default-package-overrides: - heaps ==0.4 - heatshrink ==0.1.0.0 - hebrew-time ==0.1.2 - - hedgehog ==1.0.5 - - hedgehog-classes ==0.2.5.3 + - hedgehog ==1.1.2 + - hedgehog-classes ==0.2.5.4 - hedgehog-corpus ==0.2.0 - hedgehog-fakedata ==0.0.1.5 - hedgehog-fn ==1.0 @@ -1040,47 +1082,46 @@ default-package-overrides: - heterocephalus ==1.0.5.7 - hex ==0.2.0 - hexml ==0.3.4 + - hexml-lens ==0.2.2 - hexpat ==0.20.13 - - hex-text ==0.1.0.6 + - hex-text ==0.1.0.8 - hformat ==0.3.3.1 - hfsevents ==0.1.6 - hgeometry ==0.14 - hgeometry-combinatorial ==0.14 - - hid ==0.2.2 - hidapi ==0.1.8 + - hierarchical-clustering ==0.4.7 - hi-file-parser ==0.1.3.0 - - higher-leveldb ==0.6.0.0 - highlighting-kate ==0.6.4 - hindent ==5.3.4 - hinfo ==0.0.3.0 - hinotify ==0.4.1 - hint ==0.9.0.6 + - hip ==1.5.6.0 - histogram-fill ==0.9.1.0 - hjsmin ==0.2.0.4 - hkd-default ==1.1.0.0 - - hkgr ==0.3 - - hledger ==1.25 - - hledger-iadd ==1.3.17 - - hledger-interest ==1.6.3 - - hledger-lib ==1.25 - - hledger-stockquotes ==0.1.2.0 - - hledger-ui ==1.25 - - hledger-web ==1.25 + - hkgr ==0.4.2 + - hledger ==1.27.1 + - hledger-interest ==1.6.4 + - hledger-lib ==1.27.1 + - hledger-stockquotes ==0.1.2.1 + - hledger-ui ==1.27.1 + - hledger-web ==1.27.1 - hlibcpuid ==0.2.0 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.10.1 - - hlint ==3.3.6 + - hlint ==3.4.1 - hmatrix ==0.20.2 - hmatrix-gsl ==0.19.0.1 - hmatrix-gsl-stats ==0.4.1.8 - hmatrix-morpheus ==0.1.1.2 - hmatrix-repa ==0.1.2.2 + - hmatrix-special ==0.19.0.0 - hmatrix-vector-sized ==0.1.3.0 - - hmm-lapack ==0.5 - HMock ==0.5.1.0 - hnock ==0.4.0 - - hoauth2 ==2.3.0 - - hocilib ==0.2.0 + - hoauth2 ==2.6.0 - hoogle ==5.0.18.3 - hopenssl ==2.2.4 - hopfli ==0.2.2.1 @@ -1091,13 +1132,13 @@ default-package-overrides: - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.10 - - hpack ==0.34.7 - - hpack-dhall ==0.5.4 + - hpack ==0.35.1 + - hpack-dhall ==0.5.7 - hpc-codecov ==0.3.0.0 + - hpc-lcov ==1.1.0 - HPDF ==1.6.0 - hpp ==0.6.5 - hpqtypes ==1.9.4.0 - - hprotoc ==2.4.17 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 - hruby ==0.5.0.0 @@ -1106,38 +1147,38 @@ default-package-overrides: - hsc2hs ==0.68.8 - hscolour ==1.24.4 - hsdns ==1.8 + - hse-cpp ==0.2 - hsemail ==2.2.1 - hset ==2.2.0 - - hsexif ==0.6.1.9 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 - hsini ==0.5.1.2 - hsinstall ==2.7 - HSlippyMap ==3.0.1 - hslogger ==1.3.1.0 - - hslua ==2.1.0 - - hslua-aeson ==2.1.0 - - hslua-classes ==2.1.0 - - hslua-core ==2.1.0 - - hslua-marshalling ==2.1.0 + - hslua ==2.2.1 + - hslua-aeson ==2.2.1 + - hslua-classes ==2.2.0 + - hslua-core ==2.2.1 + - hslua-marshalling ==2.2.1 - hslua-module-doclayout ==1.0.4 - hslua-module-path ==1.0.3 - hslua-module-system ==1.0.2 - - hslua-module-text ==1.0.2 + - hslua-module-text ==1.0.3.1 - hslua-module-version ==1.0.3 - - hslua-objectorientation ==2.1.0 - - hslua-packaging ==2.1.0 + - hslua-objectorientation ==2.2.1 + - hslua-packaging ==2.2.1 - hsndfile ==0.8.0 - hsndfile-vector ==0.5.2 - - HsOpenSSL ==0.11.7.2 + - HsOpenSSL ==0.11.7.4 - HsOpenSSL-x509-system ==0.1.0.4 - hsp ==0.10.0 - - hspec ==2.8.5 + - hspec ==2.9.7 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - - hspec-contrib ==0.5.1 - - hspec-core ==2.8.5 - - hspec-discover ==2.8.5 + - hspec-contrib ==0.5.1.1 + - hspec-core ==2.9.7 + - hspec-discover ==2.9.7 - hspec-expectations ==0.8.2 - hspec-expectations-json ==1.0.0.7 - hspec-expectations-lifted ==0.10.0 @@ -1145,25 +1186,26 @@ default-package-overrides: - hspec-golden ==0.2.0.0 - hspec-golden-aeson ==0.9.0.0 - hspec-hedgehog ==0.0.1.2 - - hspec-junit-formatter ==1.0.3.0 + - hspec-junit-formatter ==1.1.0.2 - hspec-leancheck ==0.0.6 - hspec-megaparsec ==2.2.0 - - hspec-meta ==2.7.8 + - hspec-meta ==2.9.3 - hspec-need-env ==0.1.0.10 - hspec-parsec ==0 - hspec-smallcheck ==0.5.2 - hspec-tmp-proc ==0.5.1.2 - hspec-wai ==0.11.1 + - hspec-wai-json ==0.11.0 - hs-php-session ==0.0.9.3 - hsshellscript ==3.5.0 - - hs-tags ==0.1.5.3 - hstatistics ==0.3.1 - HStringTemplate ==0.8.8 - HSvm ==0.1.1.3.25 + - hsx2hs ==0.14.1.10 + - hsx-jmacro ==7.3.8.2 - HsYAML ==0.2.1.1 - HsYAML-aeson ==0.2.0.1 - hsyslog ==5.0.2 - - hsyslog-udp ==0.2.5 - htaglib ==1.2.0 - HTF ==0.15.0.0 - html ==1.0.1.2 @@ -1171,13 +1213,16 @@ default-package-overrides: - html-email-validate ==0.2.0.0 - html-entities ==1.1.4.6 - html-entity-map ==0.1.0.0 + - htoml-megaparsec ==2.1.0.4 + - htoml-parse ==0.1.0.1 - http2 ==3.0.3 - - HTTP ==4000.3.16 + - HTTP ==4000.4.1 - http-api-data ==0.4.3 - http-api-data-qq ==0.1.0.0 - http-client ==0.7.13.1 - http-client-openssl ==0.3.3 - http-client-overrides ==0.1.1.0 + - http-client-restricted ==0.0.5 - http-client-tls ==0.3.6.1 - http-common ==0.8.3.4 - http-conduit ==2.3.8 @@ -1198,7 +1243,7 @@ default-package-overrides: - hunit-dejafu ==2.0.0.6 - hvect ==0.4.0.1 - hvega ==0.12.0.3 - - hw-balancedparens ==0.4.1.2 + - hw-balancedparens ==0.4.1.3 - hw-bits ==0.7.2.2 - hw-conduit ==0.2.1.1 - hw-conduit-merges ==0.2.1.0 @@ -1210,9 +1255,11 @@ default-package-overrides: - hw-fingertree ==0.1.2.1 - hw-fingertree-strict ==0.1.2.1 - hw-hedgehog ==0.1.1.1 + - hw-hspec-hedgehog ==0.1.1.1 - hw-int ==0.0.2.0 - hw-ip ==2.4.2.1 - - hw-json-simd ==0.1.1.1 + - hw-json ==1.3.2.3 + - hw-json-simd ==0.1.1.2 - hw-json-simple-cursor ==0.1.1.1 - hw-json-standard-cursor ==0.2.3.2 - hwk ==0.6 @@ -1224,7 +1271,7 @@ default-package-overrides: - hw-prim ==0.6.3.2 - hw-rankselect ==0.13.4.1 - hw-rankselect-base ==0.3.4.1 - - hw-simd ==0.1.2.1 + - hw-simd ==0.1.2.2 - hw-streams ==0.0.1.0 - hw-string-parse ==0.0.0.5 - hw-succinct ==0.1.0.1 @@ -1239,14 +1286,12 @@ default-package-overrides: - hxt-tagsoup ==9.1.4 - hxt-unicode ==9.0.2.4 - hybrid-vectors ==0.2.3 - - hyper ==0.2.1.1 - hyperloglog ==0.4.6 - hyphenation ==0.8.2 - - iconv ==0.4.1.3 - identicon ==0.2.2 - ieee754 ==0.8.0 - if ==0.1.0.0 - - iff ==0.0.6 + - IfElse ==0.85 - ihaskell ==0.10.3.0 - ihaskell-hvega ==0.5.0.3 - ihs ==0.1.0.3 @@ -1257,6 +1302,7 @@ default-package-overrides: - immortal-queue ==0.1.0.1 - inbox ==0.2.0 - include-file ==0.1.0.4 + - incremental ==0.3.1 - incremental-parser ==0.5.0.4 - indents ==0.5.0.1 - indexed ==0.1.3 @@ -1277,7 +1323,6 @@ default-package-overrides: - insert-ordered-containers ==0.2.5.1 - inspection-testing ==0.4.6.1 - instance-control ==0.1.2.0 - - int-cast ==0.2.0.0 - integer-logarithms ==1.0.3.1 - integer-roots ==1.0.2.0 - integration ==0.2.1 @@ -1285,13 +1330,12 @@ default-package-overrides: - interpolate ==0.2.1 - interpolatedstring-perl6 ==1.0.2 - interpolation ==0.1.1.2 + - Interpolation ==0.3.0 - IntervalMap ==0.6.1.2 - intervals ==0.9.2 - - intro ==0.9.0.0 - intset-imperative ==0.1.0.0 - - invariant ==0.5.6 + - invariant ==0.6 - invert ==1.0.0.2 - - invertible ==0.2.0.7 - invertible-grammar ==0.1.3.3 - io-machine ==0.2.0.0 - io-manager ==0.1.0.3 @@ -1299,14 +1343,14 @@ default-package-overrides: - io-region ==0.1.1 - io-storage ==0.3 - io-streams ==1.5.2.2 + - io-streams-haproxy ==1.0.1.0 + - ip ==1.7.6 - ip6addr ==1.0.3 - iproute ==1.7.12 - IPv6Addr ==2.0.5 - ipynb ==0.2 - ipython-kernel ==0.10.3.0 - irc ==0.6.1.0 - - irc-client ==1.1.2.2 - - irc-conduit ==0.3.0.5 - irc-ctcp ==0.1.3.1 - isbn ==1.1.0.4 - islink ==0.1.0.0 @@ -1314,24 +1358,32 @@ default-package-overrides: - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - isocline ==1.0.9 + - isomorphism-class ==0.1.0.7 - iterable ==3.0 + - ixset ==1.1.1.2 + - ixset-typed ==0.5.1.0 + - ixset-typed-binary-instance ==0.1.0.2 + - ixset-typed-conversions ==0.1.2.0 + - ixset-typed-hashable-instance ==0.1.0.2 - ix-shapable ==0.1.0 - - jack ==0.7.2 - jalaali ==1.0.0.0 - java-adt ==0.2018.11.4 - jira-wiki-markup ==1.4.0 + - jl ==0.1.0 + - jmacro ==0.6.17.1 - jose ==0.9 + - jose-jwt ==0.9.4 - js-chart ==2.9.4.1 - js-dgtable ==0.5.2 - js-flot ==0.8.3 - js-jquery ==3.3.1 - json ==0.10 - json-feed ==2.0.0.4 - - jsonifier ==0.2.1.1 - - jsonpath ==0.2.1.0 + - jsonifier ==0.2.1.2 + - jsonpath ==0.3.0.0 + - json-rpc ==1.0.4 - json-stream ==0.4.4.2 - JuicyPixels ==3.3.7 - - JuicyPixels-blurhash ==0.1.0.3 - JuicyPixels-extra ==0.5.2 - JuicyPixels-scale-dct ==0.1.2 - junit-xml ==0.1.0.2 @@ -1339,30 +1391,34 @@ default-package-overrides: - jwt ==0.11.0 - kan-extensions ==5.2.5 - kanji ==3.5.0 + - kansas-comet ==0.4.1 - katip ==0.8.7.2 - katip-logstash ==0.1.0.2 - - katip-wai ==0.1.2.0 + - katip-wai ==0.1.2.1 - kazura-queue ==0.1.0.4 + - kdt ==0.2.5 - keep-alive ==0.2.1.0 - keycode ==0.2.2 - keys ==3.12.3 - - ki ==0.2.0.1 + - ki ==1.0.0.1 - kind-apply ==0.3.2.1 - kind-generics ==0.4.1.4 - kind-generics-th ==0.2.2.3 + - ki-unlifted ==1.0.0.1 - kleene ==0.1 - kmeans ==0.1.3 + - knob ==0.2.1 - koji ==0.0.2 - - krank ==0.2.3 - l10n ==0.1.0.1 - labels ==0.3.3 - lackey ==2.0.0.3 - LambdaHack ==0.11.0.0 - lame ==0.2.0 + - language-avro ==0.1.4.0 - language-bash ==0.9.2 - language-c ==0.9.1 - language-c-quote ==0.13 - - language-docker ==10.4.3 + - language-docker ==12.0.0 - language-dot ==0.1.1 - language-glsl ==0.3.0 - language-java ==0.2.9 @@ -1370,12 +1426,10 @@ default-package-overrides: - language-protobuf ==1.0.1 - language-python ==0.5.8 - language-thrift ==0.12.0.1 - - lapack ==0.5 - lapack-carray ==0.0.3 - lapack-comfort-array ==0.0.1 - lapack-ffi ==0.0.3 - lapack-ffi-tools ==0.1.3 - - lapack-hmatrix ==0.0.0.1 - largeword ==1.2.5 - latex ==0.1.0.4 - lattices ==2.0.3 @@ -1387,75 +1441,75 @@ default-package-overrides: - leancheck ==0.9.12 - leancheck-instances ==0.0.5 - leapseconds-announced ==2017.1.0.1 - - learn-physics ==0.6.5 - - lens ==5.0.1 + - leb128-cereal ==1.2 + - lens ==5.1.1 - lens-action ==0.2.6 - - lens-aeson ==1.1.3 + - lens-aeson ==1.2.2 - lens-csv ==0.1.1.0 - lens-family ==2.1.2 - lens-family-core ==2.1.2 - lens-family-th ==0.5.2.1 - lens-misc ==0.0.2.0 - - lens-process ==0.4.0.0 - lens-properties ==4.11.1 - lens-regex ==0.1.3 - lens-regex-pcre ==1.1.0.0 - - lentil ==1.5.4.0 + - lentil ==1.5.4.2 - LetsBeRational ==1.0.0.0 - leveldb-haskell ==0.6.5 - lexer-applicative ==2.1.0.2 - libBF ==0.6.5.1 - - libffi ==0.1 + - libffi ==0.2.1 - libgit ==0.3.1 - libgraph ==1.14 - libmpd ==0.10.0.0 - liboath-hs ==0.0.1.2 - libyaml ==0.1.2 - - LibZip ==1.0.1 - lifted-async ==0.10.2.3 - lifted-base ==0.2.3.12 - lift-generics ==0.2.1 - - lift-type ==0.1.0.1 + - lift-type ==0.1.1.1 - line ==4.0.1 - linear ==1.21.10 - - linear-base ==0.1.0 - - linear-circuit ==0.1.0.4 - - linebreak ==1.1.0.1 + - linear-base ==0.3.0 + - linear-generics ==0.2 + - linebreak ==1.1.0.2 - linenoise ==0.3.2 - linux-capabilities ==0.1.1.0 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 - - ListLike ==4.7.7 + - ListLike ==4.7.8 - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - - list-singleton ==2.0.0.2 - list-t ==1.0.5.3 - list-transformer ==1.0.9 - ListTree ==0.2.3 - ListZipper ==1.2.0.2 - literatex ==0.2.0.2 - - little-rio ==0.2.2 - - llvm-hs-pure ==9.0.0 + - little-logger ==1.0.1 + - little-rio ==1.0.1 - lmdb ==0.2.5 - load-env ==0.2.1.0 - - loc ==0.1.3.16 + - loc ==0.1.4.0 - locators ==0.3.0.3 - loch-th ==0.2.2 - lockfree-queue ==0.2.4 - log-domain ==0.13.2 - logfloat ==0.13.4 + - logger-thread ==0.1.0.2 - logging ==3.0.5 + - logging-effect ==1.3.13 - logging-facade ==0.3.1 - logging-facade-syslog ==1 - - logict ==0.7.1.0 + - logict ==0.8.0.0 - logstash ==0.1.0.3 - loop ==0.3.0 - lpeg ==1.0.3 - lrucache ==1.2.0.1 - lrucaching ==0.3.3 - - lua ==2.1.0 + - lua ==2.2.1 - lua-arbitrary ==1.0.1 + - lucid2 ==0.0.20221012 - lucid ==2.11.1 - lucid-cdn ==0.2.2.0 - lucid-extras ==0.2.2 @@ -1468,15 +1522,17 @@ default-package-overrides: - lzma-conduit ==1.2.3 - machines ==0.7.3 - magic ==1.1 - - magico ==0.0.2.3 - mainland-pretty ==0.7.1 - main-tester ==0.2.0.1 - managed ==1.0.9 - mandrill ==0.5.6.0 + - map-syntax ==0.3 - markdown ==0.1.17.5 - markdown-unlit ==0.5.1 - markov-chain ==0.0.3.4 - - massiv ==1.0.2.0 + - markov-chain-usage-model ==0.0.0 + - mason ==0.2.6 + - massiv ==1.0.3.0 - massiv-io ==1.0.0.1 - massiv-persist ==1.0.0.3 - massiv-serialise ==1.0.0.2 @@ -1491,20 +1547,23 @@ default-package-overrides: - matrix-market-attoparsec ==0.1.1.3 - matrix-static ==0.3 - maximal-cliques ==0.1.1 - - mbox ==0.3.4 - - mbox-utility ==0.0.3.1 - - mbtiles ==0.6.0.0 - - mcmc ==0.6.2.2 + - mcmc ==0.8.0.1 - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - med-module ==0.1.2.2 - megaparsec ==9.2.2 - megaparsec-tests ==9.2.2 - mega-sdist ==0.4.2.1 - - memory ==0.16.0 + - membership ==0.0.1 + - memcache ==0.3.0.1 + - memfd ==1.0.1.1 + - memory ==0.17.0 - MemoTrie ==0.6.10 - - mercury-api ==0.1.0.2 - - mergeless ==0.3.0.0 + - mergeful ==0.3.0.0 + - mergeful-persistent ==0.1.0.0 + - mergeless ==0.4.0.0 + - mergeless-persistent ==0.1.0.0 + - merkle-tree ==0.1.1 - mersenne-random ==1.0.0.1 - mersenne-random-pure64 ==0.2.2.0 - messagepack ==0.5.5 @@ -1512,28 +1571,30 @@ default-package-overrides: - mfsolve ==0.3.2.1 - microaeson ==0.1.0.1 - microlens ==0.4.12.0 - - microlens-aeson ==2.4.1 - - microlens-contra ==0.1.0.2 + - microlens-aeson ==2.5.0 + - microlens-contra ==0.1.0.3 - microlens-ghc ==0.4.13.2 - - microlens-mtl ==0.2.0.2 + - microlens-mtl ==0.2.0.3 - microlens-platform ==0.4.2.1 - microlens-process ==0.2.0.2 - - microlens-th ==0.4.3.10 + - microlens-th ==0.4.3.11 - microspec ==0.2.1.3 - microstache ==1.0.2.2 - midair ==0.2.0.1 - midi ==0.2.2.3 - - midi-alsa ==0.2.1 + - midi-music-box ==0.0.1.2 - mighty-metropolis ==2.0.0 - mime-mail ==0.5.1 - mime-mail-ses ==0.4.3 - - mime-types ==0.1.1.0 + - mime-types ==0.1.0.9 - minimal-configuration ==0.1.4 - minimorph ==0.3.0.1 - minio-hs ==1.6.0 + - minisat-solver ==0.1 - miniutter ==0.5.1.2 - min-max-pqueue ==0.1.0.2 - mintty ==0.1.4 + - misfortune ==0.1.2.1 - missing-foreign ==0.1.1 - MissingH ==1.5.0.1 - mixed-types-num ==0.5.11 @@ -1541,7 +1602,7 @@ default-package-overrides: - mmark ==0.0.7.6 - mmark-cli ==0.0.5.1 - mmark-ext ==0.2.1.5 - - mmorph ==1.1.5 + - mmorph ==1.2.0 - mnist-idx ==0.1.3.1 - mnist-idx-conduit ==0.4.0.0 - mockery ==0.3.5 @@ -1552,21 +1613,24 @@ default-package-overrides: - modular ==0.1.0.8 - monad-chronicle ==1.0.1 - monad-control ==1.0.3.1 - - monad-control-aligned ==0.0.1.1 - monad-coroutine ==0.9.2 - monad-extras ==0.6.0 - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - monadlist ==0.0.2 + - monadloc ==0.7.1 - monad-logger ==0.3.37 + - monad-logger-aeson ==0.4.0.2 - monad-logger-json ==0.1.0.0 - monad-logger-logstash ==0.2.0.2 - monad-logger-prefix ==0.1.12 - monad-loops ==0.4.3 - monad-memo ==0.5.4 + - monad-metrics ==0.2.2.0 - monadoid ==0.0.3 + - monadology ==0.1 - monad-par ==0.3.5 - - monad-parallel ==0.7.2.5 + - monad-parallel ==0.8 - monad-par-extras ==0.3.3 - monad-peel ==0.2.1.2 - monad-primitive ==0.1 @@ -1574,37 +1638,47 @@ default-package-overrides: - MonadPrompt ==1.0.0.5 - MonadRandom ==0.5.3 - monad-resumption ==0.1.4.0 + - monad-schedule ==0.1.2.0 - monad-skeleton ==0.2 - monad-st ==0.2.4.1 - monads-tf ==0.1.0.3 - monad-time ==0.3.1.0 - mongoDB ==2.7.1.2 - monoidal-containers ==0.6.3.0 - - monoid-extras ==0.6.1 + - monoid-extras ==0.6.2 - monoid-subclasses ==1.1.3 - monoid-transformer ==0.0.4 - - monomer ==1.3.0.0 + - monomer ==1.5.0.0 - mono-traversable ==1.0.15.3 - mono-traversable-instances ==0.1.1.0 - mono-traversable-keys ==0.2.0 - more-containers ==0.2.2.2 - - morpheus-graphql-tests ==0.18.0 + - morpheus-graphql ==0.27.0 + - morpheus-graphql-app ==0.27.0 + - morpheus-graphql-client ==0.27.0 + - morpheus-graphql-code-gen ==0.27.0 + - morpheus-graphql-code-gen-utils ==0.27.0 + - morpheus-graphql-core ==0.27.0 + - morpheus-graphql-server ==0.27.0 + - morpheus-graphql-subscriptions ==0.27.0 + - morpheus-graphql-tests ==0.27.0 - moss ==0.2.0.1 - mountpoints ==1.0.2 - mpi-hs ==0.7.2.0 - mpi-hs-binary ==0.1.1.0 - mpi-hs-cereal ==0.1.0.0 + - mstate ==0.2.8 - mtl-compat ==0.2.2 - mtl-prelude ==2.0.3.1 - multiarg ==0.30.0.10 - multi-containers ==0.2 - multimap ==1.2.1 - - multipart ==0.2.1 - multiset ==0.3.4.3 - multistate ==0.8.0.4 - murmur3 ==1.0.5 - murmur-hash ==0.1.0.10 - MusicBrainz ==0.4.1 + - mustache ==2.4.1 - mutable-containers ==0.3.4.1 - mwc-probability ==2.3.1 - mwc-random ==0.15.0.2 @@ -1632,9 +1706,10 @@ default-package-overrides: - netlib-carray ==0.1 - netlib-comfort-array ==0.0.0.2 - netlib-ffi ==0.1.1 + - net-mqtt ==0.8.2.5 + - net-mqtt-lens ==0.1.1.0 - netpbm ==1.0.4 - netrc ==0.2.0.0 - - nettle ==0.3.0 - netwire ==5.0.3 - netwire-input ==0.0.7 - netwire-input-glfw ==0.0.11 @@ -1646,15 +1721,14 @@ default-package-overrides: - network-ip ==0.3.0.3 - network-messagepack-rpc ==0.1.2.0 - network-messagepack-rpc-websocket ==0.1.1.1 + - network-multicast ==0.3.2 + - Network-NineP ==0.4.7.2 - network-run ==0.2.4 - network-simple ==0.4.5 - network-simple-tls ==0.4 - - network-transport ==0.5.4 - - network-transport-composed ==0.2.1 - - network-transport-tcp ==0.8.1 - - network-transport-tests ==0.3.1 - - network-uri ==2.6.4.1 - - network-wait ==0.1.2.0 + - network-transport ==0.5.6 + - network-uri ==2.6.4.2 + - network-wait ==0.2.0.0 - newtype ==0.2.2.0 - newtype-generics ==0.6.2 - nfc ==0.1.1 @@ -1664,7 +1738,7 @@ default-package-overrides: - nix-paths ==1.0.1 - NoHoed ==0.1.1 - nonce ==1.0.7 - - nondeterminism ==1.4 + - nondeterminism ==1.5 - non-empty ==0.3.3 - nonempty-containers ==0.3.4.4 - nonemptymap ==0.0.6.0 @@ -1672,8 +1746,8 @@ default-package-overrides: - nonempty-vector ==0.2.1.0 - nonempty-zipper ==1.0.0.4 - non-negative ==0.1.2 + - normaldistribution ==1.1.0.3 - normalization-insensitive ==2.0.2 - - not-gloss ==0.7.7.0 - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - nqe ==0.6.4 @@ -1689,23 +1763,26 @@ default-package-overrides: - NumInstances ==1.4 - numtype-dk ==0.5.0.3 - nuxeo ==0.3.2 - - nvim-hs ==2.2.0.3 + - nvim-hs ==2.3.2.0 + - nvim-hs-contrib ==2.0.0.1 + - nvim-hs-ghcid ==2.0.1.0 + - oauthenticated ==0.3.0.0 - ObjectName ==1.1.0.2 + - oblivious-transfer ==0.1.0 - ochintin-daicho ==0.3.4.2 - - o-clock ==1.2.1.1 - - oeis ==0.3.10 + - o-clock ==1.3.0 - ofx ==0.4.4.0 - old-locale ==1.0.0.7 - old-time ==1.1.0.3 - once ==0.4 - - one-liner ==2.0 + - one-liner ==2.1 - one-liner-instances ==0.1.3.0 - OneTuple ==0.3.1 - Only ==0.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.9.3.2 + - opaleye ==0.9.6.1 - OpenAL ==1.7.0.5 - - openapi3 ==3.2.2 + - openapi3 ==3.2.3 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - OpenGL ==3.0.3.0 @@ -1713,10 +1790,11 @@ default-package-overrides: - openpgp-asciiarmor ==0.1.2 - opensource ==0.1.1.0 - openssl-streams ==1.2.3.0 - - opentelemetry ==0.7.0 - - opentelemetry-extra ==0.7.0 - - opentelemetry-lightstep ==0.7.0 - - opentelemetry-wai ==0.7.0 + - opentelemetry ==0.8.0 + - opentelemetry-extra ==0.8.0 + - opentelemetry-lightstep ==0.8.0 + - opentelemetry-wai ==0.8.0 + - open-witness ==0.6 - operational ==0.2.4.1 - operational-class ==0.3.0.0 - opml-conduit ==0.9.0.0 @@ -1728,14 +1806,14 @@ default-package-overrides: - optima ==0.4.0.3 - optional-args ==1.0.2 - options ==1.2.1.1 - - optparse-applicative ==0.16.1.0 + - optparse-applicative ==0.17.0.0 - optparse-enum ==1.0.0.0 - optparse-generic ==1.4.8 - optparse-simple ==0.1.1.4 - optparse-text ==0.1.1.0 - OrderedBits ==0.0.2.0 - ordered-containers ==0.2.3 - - ormolu ==0.3.1.0 + - ormolu ==0.5.0.1 - overhang ==1.0.0 - packcheck ==0.6.0 - pager ==0.1.1.0 @@ -1743,13 +1821,14 @@ default-package-overrides: - pagure ==0.1.1 - pagure-cli ==0.2.1 - palette ==0.3.0.2 - - pandoc ==2.17.1.1 + - pandoc ==2.19.2 - pandoc-csv2table ==1.0.9 - pandoc-dhall-decoder ==0.1.0.1 - pandoc-lua-marshal ==0.1.7 - - pandoc-plot ==1.4.1 + - pandoc-plot ==1.5.5 - pandoc-throw ==0.1.0.0 - pandoc-types ==1.22.2.1 + - pango ==0.13.8.2 - pantry ==0.5.7 - parallel ==3.2.2.0 - parallel-io ==0.3.5 @@ -1765,7 +1844,7 @@ default-package-overrides: - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.3.0 - partial-order ==0.2.0.0 - - partial-semigroup ==0.5.1.14 + - partial-semigroup ==0.6.0.0 - password ==3.0.2.0 - password-instances ==3.0.0.0 - password-types ==1.0.0.0 @@ -1779,33 +1858,34 @@ default-package-overrides: - path-io ==1.7.0 - path-like ==0.2.0.2 - path-pieces ==0.2.1 + - path-text-utf8 ==0.0.1.10 - pathtype ==0.8.1.1 - path-utils ==0.1.1.0 - pathwalk ==0.3.1.2 - pattern-arrows ==0.0.2 - pava ==0.1.1.4 + - pcf-font ==0.2.2.1 - pcg-random ==0.1.3.7 - pcre2 ==2.1.1.1 - pcre-heavy ==1.0.0.3 - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.2 - pdc ==0.1.1 - - pdfinfo ==1.5.4 - pdf-toolbox-content ==0.1.1 - pdf-toolbox-core ==0.1.1 - pdf-toolbox-document ==0.1.2 - peano ==0.1.0.1 + - pedersen-commitment ==0.2.0 - pem ==0.2.4 - percent-format ==0.0.2 - peregrin ==0.3.3 - - perf ==0.9.0 - - perfect-hash-generator ==0.2.0.6 + - perfect-hash-generator ==1.0.0 - persist ==0.1.1.5 - persistent ==2.13.3.5 - persistent-discover ==0.1.0.6 - persistent-documentation ==0.1.0.4 + - persistent-iproute ==0.2.5 - persistent-mongoDB ==2.13.0.1 - - persistent-mtl ==0.4.0.0 - persistent-mysql ==2.13.1.3 - persistent-pagination ==0.1.1.2 - persistent-postgresql ==2.13.5.0 @@ -1815,13 +1895,14 @@ default-package-overrides: - persistent-sqlite ==2.13.1.0 - persistent-template ==2.12.0.0 - persistent-test ==2.13.1.2 + - persistent-typed-db ==0.1.0.7 - pg-harness-client ==0.6.0 - pgp-wordlist ==0.1.0.3 - pg-transact ==0.3.2.0 - phantom-state ==0.2.1.2 - phatsort ==0.5.0.1 - picosat ==0.1.6 - - pid1 ==0.1.3.0 + - pid1 ==0.1.3.1 - pinch ==0.4.2.0 - pipes ==4.3.16 - pipes-attoparsec ==0.5.1.5 @@ -1832,56 +1913,55 @@ default-package-overrides: - pipes-fastx ==0.3.0.0 - pipes-fluid ==0.6.0.1 - pipes-group ==1.0.12 - - pipes-http ==1.0.6 - pipes-mongodb ==0.1.0.0 - pipes-ordered-zip ==1.2.1 - pipes-parse ==3.0.9 - pipes-random ==1.0.0.5 - pipes-safe ==2.3.4 + - pipes-text ==1.0.1 - pipes-wai ==3.2.0 - - pkgtreediff ==0.5.0 + - pkgtreediff ==0.6.0 - place-cursor-at ==1.0.1 - placeholders ==0.1 - plaid ==0.1.0.4 - - plotlyhs ==0.2.1 + - plot ==0.2.3.11 + - plotlyhs ==0.2.3 + - Plural ==0.0.2 - pointed ==5.0.4 - pointedlist ==0.6.1 - pointless-fun ==1.1.0.8 - poll ==0.0.0.2 - - poly ==0.5.0.0 + - poly ==0.5.1.0 - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.13 - - polysemy ==1.6.0.0 + - polysemy ==1.7.1.0 - polysemy-extra ==0.2.1.0 - polysemy-fs ==0.1.0.0 - - polysemy-fskvstore ==0.1.1.0 - polysemy-kvstore ==0.1.3.0 - polysemy-methodology ==0.2.2.0 - - polysemy-path ==0.2.1.0 - - polysemy-plugin ==0.4.1.1 + - polysemy-plugin ==0.4.4.0 - polysemy-several ==0.1.1.0 - - polysemy-socket ==0.0.2.0 - - polysemy-uncontrolled ==0.1.1.1 - - polysemy-video ==0.2.0.1 - - polysemy-vinyl ==0.1.5.0 - polysemy-webserver ==0.2.1.1 + - polysemy-zoo ==0.8.1.0 + - pontarius-xmpp ==0.5.6.5 - pooled-io ==0.0.2.2 + - portable-lines ==0.1 - port-utils ==0.2.1.0 - posix-paths ==0.3.0.0 + - posix-pty ==0.2.2 - possibly ==1.0.0.0 - postgres-options ==0.2.0.0 - - postgresql-binary ==0.12.5 - - postgresql-libpq ==0.9.4.3 + - postgresql-binary ==0.13.1 + - postgresql-libpq ==0.9.5.0 - postgresql-libpq-notify ==0.2.0.0 - postgresql-migration ==0.2.1.6 - - postgresql-orm ==0.5.1 - - postgresql-query ==3.9.0 + - postgresql-query ==3.10.0 - postgresql-schema ==0.1.14 - - postgresql-simple ==0.6.5 + - postgresql-simple ==0.6.4 - postgresql-simple-url ==0.2.1.0 - postgresql-syntax ==0.4.1 - - postgresql-typed ==0.6.2.1 + - postgresql-typed ==0.6.2.2 - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 - pqueue ==1.4.3.0 @@ -1894,20 +1974,20 @@ default-package-overrides: - pretty-hex ==1.1 - prettyprinter ==1.7.1 - prettyprinter-ansi-terminal ==1.1.3 + - prettyprinter-combinators ==0.1.1 - prettyprinter-compat-annotated-wl-pprint ==1.1 - prettyprinter-compat-ansi-wl-pprint ==1.0.2 - prettyprinter-compat-wl-pprint ==1.0.1 - prettyprinter-convert-ansi-wl-pprint ==1.1.2 - pretty-relative-time ==0.3.0.0 - pretty-show ==1.10 - - pretty-simple ==4.0.0.0 + - pretty-simple ==4.1.2.0 - pretty-sop ==0.2.0.3 - pretty-terminal ==0.1.0.0 - pretty-types ==0.4.0.0 - primes ==0.2.1.0 - primitive ==0.7.3.0 - primitive-addr ==0.1.0.2 - - PrimitiveArray ==0.10.1.1 - primitive-extras ==0.10.1.5 - primitive-offset ==0.2.0.0 - primitive-unaligned ==0.1.1.2 @@ -1918,6 +1998,7 @@ default-package-overrides: - process-extras ==0.7.4 - product-profunctors ==0.11.0.3 - profiterole ==0.1 + - profiteur ==0.4.6.1 - profunctors ==5.6.2 - projectroot ==0.2.0.1 - project-template ==0.2.1.0 @@ -1930,8 +2011,6 @@ default-package-overrides: - prospect ==0.1.0.0 - protobuf ==0.2.1.3 - protobuf-simple ==0.1.1.1 - - protocol-buffers ==2.4.17 - - protocol-buffers-descriptor ==2.4.17 - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.1.0.1 - proto-lens ==0.7.1.2 @@ -1946,21 +2025,21 @@ default-package-overrides: - psql-helpers ==0.1.0.0 - psqueues ==0.2.7.3 - pthread ==0.2.1 + - ptr ==0.16.8.4 - ptr-poker ==0.1.2.8 - pulse-simple ==0.1.14 - pureMD5 ==2.1.4 - purescript-bridge ==0.14.0.0 - pusher-http-haskell ==2.1.0.12 - pvar ==1.0.0.0 - - PyF ==0.10.2.0 + - pwstore-fast ==2.4.4 + - PyF ==0.11.1.0 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.1.0 - qrcode-core ==0.9.5 - qrcode-juicypixels ==0.8.3 - quadratic-irrational ==0.1.1 - QuasiText ==0.1.2.6 - - queue-sheet ==0.7.0.2 - - quickbench ==1.0.1 - QuickCheck ==2.14.2 - quickcheck-arbitrary-adt ==0.3.1.0 - quickcheck-assertions ==0.3.0 @@ -1971,6 +2050,7 @@ default-package-overrides: - quickcheck-io ==0.2.0 - quickcheck-simple ==0.1.1.1 - quickcheck-special ==0.1.0.6 + - quickcheck-state-machine ==0.7.1 - quickcheck-text ==0.1.2.1 - quickcheck-transformer ==0.3.1.1 - quickcheck-unicode ==1.0.1.0 @@ -1988,20 +2068,21 @@ default-package-overrides: - random-bytestring ==0.1.4 - random-fu ==0.3.0.0 - random-shuffle ==0.0.4 - - random-source ==0.3.0.11 - random-tree ==0.6.0.5 - range ==0.3.0.2 + - ranged-list ==0.1.2.0 - Ranged-sets ==0.4.0 + - ranges ==0.2.4 - range-set-list ==0.1.3.1 - rank1dynamic ==0.4.1 - - rank2classes ==1.4.4 + - rank2classes ==1.4.6 - Rasterific ==0.7.5.4 - rasterific-svg ==0.3.3.2 - ratel ==2.0.0.4 - - rate-limit ==1.4.2 - ratel-wai ==2.0.0.1 + - ratio-int ==0.1.2 - rattle ==0.2 - - rattletrap ==11.2.4 + - rattletrap ==11.2.14 - Rattus ==0.5.0.1 - rawfilepath ==1.0.1 - rawstring-qm ==0.2.3.0 @@ -2009,30 +2090,30 @@ default-package-overrides: - rcu ==0.2.6 - rdtsc ==1.3.0.1 - re2 ==0.3 - - readable ==0.3.1 + - reactive-banana ==1.3.1.0 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - reanimate-svg ==0.13.0.1 - - rebase ==1.15.0.3 + - rebase ==1.16.1 + - rec-def ==0.2 - record-dot-preprocessor ==0.2.15 - record-hasfield ==1.0 - - records-sop ==0.1.1.0 - - record-wrangler ==0.1.1.0 - rec-smallarray ==0.1.0.0 - - recursion-schemes ==5.2.2.2 + - recursion-schemes ==5.2.2.3 + - recv ==0.0.0 - redact ==0.4.0.0 - reddit-scrape ==0.0.1 - - redis-io ==1.1.0 - redis-resp ==1.0.0 - reducers ==3.12.4 - refact ==0.3.0.2 - ref-fd ==0.5 - - refined ==0.6.3 + - refined ==0.8 - reflection ==2.1.6 - reform ==0.2.7.5 - reform-blaze ==0.2.4.4 - reform-hamlet ==0.0.5.3 - reform-happstack ==0.2.5.5 + - reform-hsp ==0.2.7.2 - RefSerialize ==0.4.0 - ref-tf ==0.5.0.1 - regex ==1.1.0.2 @@ -2046,30 +2127,35 @@ default-package-overrides: - regex-posix-clib ==2.7 - regex-tdfa ==1.3.2 - regex-with-pcre ==1.1.0.2 + - registry ==0.3.3.4 + - registry-aeson ==0.2.3.3 + - registry-hedgehog ==0.7.2.0 + - registry-hedgehog-aeson ==0.2.0.0 + - registry-options ==0.1.0.0 - reinterpret-cast ==0.1.0 - - rel8 ==1.3.1.0 + - rel8 ==1.4.0.0 + - relapse ==1.0.0.1 - reliable-io ==0.0.2 - - relude ==1.0.0.1 + - relude ==1.1.0.0 - renderable ==0.2.0.1 - reorder-expression ==0.1.0.0 - repa ==3.4.1.5 + - repa-algorithms ==3.4.1.5 - repa-io ==3.4.1.2 - replace-attoparsec ==1.4.5.0 - replace-megaparsec ==1.4.5.0 - repline ==0.4.2.0 - - req ==3.10.0 + - req ==3.13.0 - req-conduit ==1.0.1 - - require ==0.4.11 - - rerebase ==1.15.0.3 - - reroute ==0.6.0.0 - - rescue ==0.4.2.1 - - resistor-cube ==0.0.1.4 + - rerebase ==1.16.1 + - reroute ==0.7.0.0 - resolv ==0.1.2.0 - resource-pool ==0.2.3.2 - resourcet ==1.2.6 - result ==0.2.6.0 - retry ==0.9.3.0 - rev-state ==0.1.2 + - rex ==0.6.2 - rfc1751 ==0.1.3 - rfc5051 ==0.2 - rg ==1.4.0.0 @@ -2077,7 +2163,7 @@ default-package-overrides: - riak-protobuf ==0.25.0.0 - rio ==0.1.22.0 - rio-orphans ==0.1.2.0 - - rio-prettyprint ==0.1.2.0 + - rio-prettyprint ==0.1.3.0 - rng-utils ==0.3.1 - roc-id ==0.1.0.0 - rocksdb-haskell ==1.0.1 @@ -2085,20 +2171,26 @@ default-package-overrides: - rocksdb-query ==0.4.2 - roles ==0.2.1.0 - rollbar ==1.1.3 - - rope-utf16-splay ==0.3.2.0 - rosezipper ==0.2 - rot13 ==0.2.0.1 - rpmbuild-order ==0.4.10 - rpm-nvr ==0.1.2 - rp-tree ==0.7.1 + - rrb-vector ==0.1.1.0 - RSA ==2.4.1 + - rss ==3000.2.0.7 - rss-conduit ==0.6.0.1 + - run-haskell-module ==0.0.2 - runmemo ==1.0.0.1 + - run-st ==0.1.1.0 - rvar ==0.3.0.1 - s3-signer ==0.5.0.0 - safe ==0.3.19 - - safe-coloured-text ==0.1.0.0 - - safe-coloured-text-terminfo ==0.0.0.0 + - safe-coloured-text ==0.2.0.1 + - safe-coloured-text-gen ==0.0.0.1 + - safe-coloured-text-layout ==0.0.0.0 + - safe-coloured-text-layout-gen ==0.0.0.0 + - safe-coloured-text-terminfo ==0.1.0.0 - safecopy ==0.10.4.2 - safe-decimal ==0.2.1.0 - safe-exceptions ==0.1.7.3 @@ -2108,19 +2200,19 @@ default-package-overrides: - safe-json ==1.1.3.1 - safe-money ==0.9.1 - SafeSemaphore ==0.10.1 - - salak ==0.3.6 - - salak-yaml ==0.3.5.3 - - saltine ==0.1.1.1 - salve ==2.0.0.1 - - sample-frame ==0.0.3 - - sample-frame-np ==0.0.4.1 + - sample-frame ==0.0.4 + - sample-frame-np ==0.0.5 - sampling ==0.3.5 - - sandwich ==0.1.1.2 + - sandi ==0.5 + - sandwich ==0.1.2.0 + - sandwich-hedgehog ==0.1.1.0 - sandwich-quickcheck ==0.1.0.6 - sandwich-slack ==0.1.1.0 + - sandwich-webdriver ==0.1.2.0 - say ==0.1.0.1 - - sbp ==4.1.6 - - sbv ==8.17 + - sbp ==4.9.0 + - sbv ==9.0 - scalpel ==0.6.2.1 - scalpel-core ==0.6.2.1 - scanf ==0.1.0.0 @@ -2128,14 +2220,19 @@ default-package-overrides: - scheduler ==2.0.0.1 - SciBaseTypes ==0.1.1.0 - scientific ==0.3.7.0 - - scotty ==0.12 + - scientist ==0.0.0.0 + - scotty ==0.12.1 - scrypt ==0.5.0 - - sdl2 ==2.5.3.0 + - sdl2 ==2.5.4.0 + - sdl2-gfx ==0.3.0.0 + - sdl2-image ==2.1.0.0 + - sdl2-mixer ==1.2.0.0 - sdl2-ttf ==2.1.3 - search-algorithms ==0.3.2 - secp256k1-haskell ==0.6.1 - securemem ==0.1.10 - selda ==0.5.2.0 + - selda-json ==0.1.1.1 - selda-sqlite ==0.1.7.2 - selections ==0.3.0.0 - selective ==0.5 @@ -2144,11 +2241,12 @@ default-package-overrides: - semialign-optics ==1.2 - semigroupoid-extras ==5 - semigroupoids ==5.3.7 - - semigroups ==0.19.2 + - semigroups ==0.20 - semirings ==0.6 - semiring-simple ==1.0.0.1 - semver ==0.4.0.1 - sendfile ==0.7.11.4 + - sendgrid-v3 ==1.0.0.0 - seqalign ==0.2.0.4 - seqid ==0.6.2 - seqid-streams ==0.7.2 @@ -2164,6 +2262,7 @@ default-package-overrides: - servant-auth-swagger ==0.2.10.1 - servant-auth-wordpress ==1.0.0.2 - servant-blaze ==0.9.1 + - servant-cassava ==0.10.2 - servant-checked-exceptions ==2.2.0.1 - servant-checked-exceptions-core ==2.2.0.1 - servant-client ==0.19 @@ -2174,14 +2273,16 @@ default-package-overrides: - servant-exceptions ==0.2.1 - servant-exceptions-server ==0.2.1 - servant-foreign ==0.15.4 + - servant-http-streams ==0.18.4 - servant-JuicyPixels ==0.3.1.0 - servant-lucid ==0.9.0.5 - servant-machines ==0.15.1 - servant-multipart ==0.12.1 - servant-multipart-api ==0.12.1 - servant-multipart-client ==0.12.1 - - servant-openapi3 ==2.0.1.5 + - servant-openapi3 ==2.0.1.6 - servant-pipes ==0.15.3 + - servant-rate-limit ==0.2.0.0 - servant-rawm ==1.0.0.0 - servant-ruby ==0.9.0.0 - servant-server ==0.19.2 @@ -2194,7 +2295,10 @@ default-package-overrides: - servant-websockets ==2.0.0 - servant-xml ==1.0.1.4 - serversession ==1.0.3 + - serversession-backend-persistent ==2.0.1 + - serversession-backend-redis ==1.0.5 - serversession-frontend-wai ==1.0.1 + - serversession-frontend-yesod ==1.0.1 - servius ==1.2.3.0 - ses-html ==0.4.0.0 - set-cover ==0.1.1 @@ -2208,14 +2312,16 @@ default-package-overrides: - shake ==0.19.7 - shake-language-c ==0.12.0 - shake-plus ==0.3.4.0 + - shake-plus-extended ==0.4.1.0 - shakespeare ==2.0.30 + - shakespeare-text ==1.1.0 - shared-memory ==0.2.0.0 - - ShellCheck ==0.8.0 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 - shellmet ==0.0.4.1 - shelltestrunner ==1.9 - shell-utility ==0.1 + - shellwords ==0.1.3.1 - shelly ==1.10.0 - shikensu ==0.4.1 - should-not-typecheck ==2.1.0 @@ -2224,10 +2330,9 @@ default-package-overrides: - signal ==0.1.0.4 - silently ==1.2.5.3 - simple-affine-space ==0.1.1 - - simple-cabal ==0.1.3 + - simple-cabal ==0.1.3.1 - simple-cmd ==0.2.7 - simple-cmd-args ==0.1.8 - - simple-log ==0.9.12 - simple-media-timestamp ==0.2.1.0 - simple-media-timestamp-attoparsec ==0.1.0.0 - simple-media-timestamp-formatting ==0.1.1.0 @@ -2237,60 +2342,56 @@ default-package-overrides: - since ==0.0.0 - singleton-bool ==0.1.6 - singleton-nats ==0.4.6 - - singletons ==3.0.2 - - singletons-base ==3.0 + - singletons ==3.0.1 + - singletons-base ==3.1 - singletons-presburger ==0.6.1.0 - - singletons-th ==3.0 - - siphash ==1.0.3 + - singletons-th ==3.1 - Sit ==0.2022.3.18 - sitemap-gen ==0.1.0.0 - - sized ==1.0.0.1 + - size-based ==0.1.3.1 + - sized ==1.0.0.2 - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 - - skylighting ==0.12.3.1 - - skylighting-core ==0.12.3.1 + - skylighting ==0.13.2 + - skylighting-core ==0.13.2 + - skylighting-format-ansi ==0.1 + - skylighting-format-blaze-html ==0.1.1 + - skylighting-format-context ==0.1.0.1 + - skylighting-format-latex ==0.1 - slack-progressbar ==0.1.0.1 - - slave-thread ==1.1.0.1 - - slist ==0.2.1.0 - - slynx ==0.6.1.1 + - slave-thread ==1.1.0.2 + - slynx ==0.7.0.1 - smallcheck ==1.2.1 - - smash ==0.1.3 - - smash-microlens ==0.1.0.2 - smtp-mail ==0.3.0.0 - - snap-blaze ==0.2.1.5 - - snap-core ==1.0.5.0 - - snappy ==0.2.0.2 - snowflake ==0.1.1.1 - - soap ==0.2.3.6 - - soap-openssl ==0.1.0.2 - - soap-tls ==0.1.1.4 - socket ==0.8.3.0 - socks ==0.6.1 - solana-staking-csvs ==0.1.2.0 - - some ==1.0.3 + - some ==1.0.4.1 - some-dict-of ==0.1.0.2 - sop-core ==0.5.0.2 - sort ==1.0.0.0 - sorted-list ==0.2.1.0 - - sound-collage ==0.2.1 - sourcemap ==0.1.7 - sox ==0.2.3.1 - - soxlib ==0.0.3.1 - spacecookie ==1.0.0.2 - sparse-linear-algebra ==0.3.1 - - spatial-math ==0.5.0.1 + - spdx ==1.0.0.3 - special-values ==0.1.0.0 - speculate ==0.4.14 - speedy-slice ==0.3.2 - Spintax ==0.3.6 - splice ==0.6.1.1 - - splint ==1.0.2.1 - split ==0.2.3.5 - splitmix ==0.1.0.4 - - splitmix-distributions ==0.9.0.0 - - split-record ==0.1.1.4 + - splitmix-distributions ==1.0.0 + - Spock ==0.14.0.0 - Spock-api ==0.14.0.0 + - Spock-api-server ==0.14.0.0 + - Spock-core ==0.14.0.1 + - Spock-lucid ==0.4.0.1 + - Spock-worker ==0.3.1.0 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 - sqlcli ==0.2.2.0 @@ -2301,19 +2402,19 @@ default-package-overrides: - srcloc ==0.6.0.1 - srt ==0.1.2.0 - srt-attoparsec ==0.1.0.0 - - srt-dhall ==0.1.0.0 - srt-formatting ==0.1.0.0 - stache ==2.3.3 + - stack ==2.9.1 - stack-all ==0.4.0.1 - stack-clean-old ==0.4.6 - - stackcollapse-ghc ==0.0.1.4 - stack-templatizer ==0.1.0.2 - state-codes ==0.1.3 - stateref ==0.3 + - statestack ==0.3.1 - StateVar ==1.2.2 - stateWriter ==0.3.0 - static-text ==0.2.0.7 - - statistics ==0.16.1.0 + - statistics ==0.16.1.2 - status-notifier-item ==0.3.1.0 - stb-image-redux ==0.2.1.2 - step-function ==0.2 @@ -2327,7 +2428,6 @@ default-package-overrides: - stm-lifted ==2.5.0.0 - STMonadTrans ==0.4.6 - stm-split ==0.0.2.1 - - stm-supply ==0.2.0.0 - stopwatch ==0.1.0.6 - storable-complex ==0.2.3.0 - storable-endian ==0.2.6.1 @@ -2337,28 +2437,32 @@ default-package-overrides: - store ==0.7.16 - store-core ==0.4.4.4 - store-streaming ==0.2.0.3 + - stratosphere ==0.60.0 - Stream ==0.4.7.2 - streaming ==0.2.3.1 - streaming-attoparsec ==1.0.0.1 - streaming-bytestring ==0.2.4 - streaming-cassava ==0.2.0.0 - streaming-commons ==0.2.2.5 + - streaming-wai ==0.1.1 - streamly ==0.8.1.1 - - streamly-bytestring ==0.1.4 - - streams ==3.3 + - streams ==3.3.1 - streamt ==0.5.0.1 - strict ==0.4.0.1 + - strict-base-types ==0.7 - strict-concurrency ==0.2.4.3 + - strict-lens ==0.4.0.2 - strict-list ==0.1.7 - strict-tuple ==0.1.5.2 - - strict-tuple-lens ==0.2 - strict-wrapper ==0.0.0.0 + - stringable ==0.1.3 - stringbuilder ==0.5.1 - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 - string-conv ==0.2.0 - string-conversions ==0.4.0.1 - - string-interpolate ==0.3.1.2 + - string-interpolate ==0.3.2.0 + - stringprep ==1.0.0 - string-qq ==0.0.4 - string-random ==0.1.4.3 - stringsearch ==0.3.6.6 @@ -2368,28 +2472,43 @@ default-package-overrides: - stripe-signature ==1.0.0.14 - stripe-wreq ==1.0.1.14 - strive ==6.0.0.4 - - strong-path ==1.1.4.0 + - strongweak ==0.3.2 - structs ==0.1.6 - structured ==0.1.1 - structured-cli ==2.7.0.1 + - stylish-haskell ==0.14.3.0 - subcategories ==0.2.0.0 - - sum-type-boilerplate ==0.1.1 - sundown ==0.6 - superbuffer ==0.3.1.2 - svg-builder ==0.1.1 - SVGFonts ==1.8.0.1 - svg-tree ==0.6.2.4 - swagger2 ==2.8.6 - - swish ==0.10.2.0 + - swish ==0.10.3.0 - syb ==0.7.2.2 + - syb-with-class ==0.6.1.14 + - sydtest ==0.13.0.0 + - sydtest-aeson ==0.1.0.0 + - sydtest-amqp ==0.1.0.0 + - sydtest-autodocodec ==0.0.0.0 - sydtest-discover ==0.0.0.2 + - sydtest-hedgehog ==0.3.0.1 + - sydtest-hedis ==0.0.0.0 + - sydtest-hspec ==0.3.0.2 + - sydtest-mongo ==0.0.0.0 + - sydtest-persistent ==0.0.0.1 + - sydtest-persistent-postgresql ==0.2.0.2 + - sydtest-persistent-sqlite ==0.2.0.2 + - sydtest-process ==0.0.0.0 + - sydtest-rabbitmq ==0.1.0.0 + - sydtest-servant ==0.2.0.2 + - sydtest-typed-process ==0.0.0.0 + - sydtest-wai ==0.2.0.0 + - sydtest-yesod ==0.3.0.1 - symbol ==0.2.4 - symengine ==0.1.2.0 - symmetry-operations-symbols ==0.0.2.1 - - synthesizer-alsa ==0.5.0.6 - - synthesizer-core ==0.8.2.1 - - synthesizer-dimensional ==0.8.1 - - synthesizer-midi ==0.6.1.1 + - synthesizer-core ==0.8.3 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 - systemd ==2.3.0 @@ -2397,7 +2516,6 @@ default-package-overrides: - system-filepath ==0.4.14 - system-info ==0.5.2 - tabular ==0.2.2.8 - - tagchup ==0.4.1.1 - tagged ==0.8.6.1 - tagged-binary ==0.2.0.1 - tagged-identity ==0.1.3 @@ -2410,16 +2528,17 @@ default-package-overrides: - tar ==0.5.1.1 - tar-conduit ==0.3.2 - tardis ==0.4.4.0 - - tasty ==1.4.2.3 + - tasty ==1.4.3 - tasty-ant-xml ==1.1.8 + - tasty-autocollect ==0.3.2.0 - tasty-bench ==0.3.2 - - tasty-dejafu ==2.0.0.9 - - tasty-discover ==4.2.4 + - tasty-dejafu ==2.1.0.0 + - tasty-discover ==4.2.2 - tasty-expected-failure ==0.12.3 - tasty-fail-fast ==0.0.3 - tasty-focus ==1.0.1 - tasty-golden ==2.3.5 - - tasty-hedgehog ==1.1.0.0 + - tasty-hedgehog ==1.3.1.0 - tasty-hslua ==1.0.2 - tasty-hspec ==1.2.0.1 - tasty-html ==0.4.1.4 @@ -2438,36 +2557,41 @@ default-package-overrides: - tasty-test-reporter ==0.1.1.4 - tasty-th ==0.1.7 - tasty-wai ==0.1.2.0 - - TCache ==0.12.1 - tce-conf ==1.3 - tcp-streams ==1.0.1.1 - tdigest ==0.2.1.1 - teardown ==0.5.0.1 - - telegram-bot-simple ==0.4.5 + - telegram-bot-simple ==0.6.1 + - template ==0.2.0.10 - template-haskell-compat-v0208 ==0.1.9.1 - temporary ==1.3 - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 - tensorflow-test ==0.1.0.0 - tensors ==0.1.5 - - termbox ==0.3.0 + - termbox ==1.1.0.1 + - termbox-banana ==1.0.0 + - termbox-bindings-c ==0.1.0 + - termbox-bindings-hs ==0.1.0 + - termbox-tea ==0.1.0 - terminal-progress-bar ==0.4.1 - terminal-size ==0.3.3 - - termonad ==4.2.0.1 + - termonad ==4.4.0.0 - test-framework ==0.8.2.0 - test-framework-hunit ==0.3.0.2 - test-framework-leancheck ==0.0.4 - test-framework-quickcheck2 ==0.3.0.5 - test-framework-smallcheck ==0.2 - test-fun ==0.1.0.0 + - testing-feat ==1.1.1.1 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.4 - - text-ansi ==0.1.1 + - texmath ==0.12.5.4 + - text-ansi ==0.2.1 - text-binary ==0.2.1.1 - - text-builder ==0.6.6.5 - - text-builder-dev ==0.2.1 + - text-builder ==0.6.7 + - text-builder-dev ==0.3.3.2 - text-conversions ==0.3.1.1 - - text-icu ==0.7.1.0 + - text-icu ==0.8.0.2 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.14 - textlocal ==0.1.0.5 @@ -2475,19 +2599,20 @@ default-package-overrides: - text-metrics ==0.3.2 - text-postgresql ==0.0.3.1 - text-printer ==0.5.0.2 - - text-regex-replace ==0.1.1.4 - - text-rope ==0.1 + - text-regex-replace ==0.1.1.5 + - text-rope ==0.2 - text-short ==0.1.5 - - text-show ==3.9.7 - - text-show-instances ==3.8.6 - - text-zipper ==0.11 + - text-show ==3.10 + - text-show-instances ==3.9.4 + - text-zipper ==0.12 - tfp ==1.0.2 - tf-random ==0.5 - th-abstraction ==0.4.5.0 - th-bang-compat ==0.0.1.0 - th-compat ==0.1.4 - th-constraint-compat ==0.0.1.0 - - th-desugar ==1.12 + - th-data-compat ==0.1.1.0 + - th-desugar ==1.13.1 - th-env ==0.1.1 - these ==1.1.1.1 - these-lens ==1.0.1.2 @@ -2495,7 +2620,7 @@ default-package-overrides: - these-skinny ==0.7.5 - th-expand-syns ==0.4.10.0 - th-extras ==0.0.0.6 - - th-lego ==0.3.0.1 + - th-lego ==0.3.0.2 - th-lift ==0.8.2 - th-lift-instances ==0.1.20 - th-nowq ==0.1.0.5 @@ -2504,16 +2629,19 @@ default-package-overrides: - thread-hierarchy ==0.3.0.2 - thread-local-storage ==0.2 - threads ==0.5.1.7 + - threads-extras ==0.1.0.3 - thread-supervisor ==0.2.0.0 - th-reify-compat ==0.0.1.5 - th-reify-many ==0.1.10 - through-text ==0.1.0.0 - th-strict-compat ==0.1.0.1 - - th-test-utils ==1.1.1 + - th-test-utils ==1.2.1 - th-utilities ==0.2.5.0 - - tidal ==1.7.10 + - tidal ==1.9.2 + - tidal-link ==1.0.1 - tile ==0.3.0.0 - time-compat ==1.9.6.1 + - time-domain ==0.1.0.1 - timeit ==2.0 - timelens ==0.2.0.2 - time-lens ==0.4.0.2 @@ -2521,35 +2649,39 @@ default-package-overrides: - time-locale-vietnamese ==1.0.0.0 - time-manager ==0.0.0 - time-parsers ==0.1.2.1 - - timerep ==2.0.1.0 - - timers-tick ==0.5.0.1 - - timer-wheel ==0.3.0 + - timerep ==2.1.0.0 + - timers-tick ==0.5.0.2 + - timer-wheel ==0.4.0.1 - timespan ==0.4.0.0 - time-units ==1.0.0 + - time-units-types ==0.2.0.1 - timezone-olson ==0.2.1 - timezone-olson-th ==0.1.0.11 - timezone-series ==0.1.13 - - tinylog ==0.15.0 - titlecase ==1.0.1 - tldr ==0.9.2 - tls ==1.5.8 - tls-debug ==0.4.8 - tls-session-manager ==0.0.4 - - tlynx ==0.6.1.1 + - tlynx ==0.7.0.1 - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - tmp-postgres ==1.34.1.0 - - tmp-proc ==0.5.1.2 + - tmp-proc ==0.5.1.3 + - tmp-proc-postgres ==0.5.2.2 + - tmp-proc-rabbitmq ==0.5.1.2 + - tmp-proc-redis ==0.5.1.2 + - toml-reader ==0.2.0.0 - tophat ==1.0.5.1 - topograph ==1.0.0.2 + - torrent ==10000.1.1 - torsor ==0.1 - tostring ==0.2.1.1 - tracing ==0.0.7.3 - tracing-control ==0.0.7.3 - transaction ==0.1.1.3 - transformers-base ==0.4.6 - - transformers-bifunctors ==0.1 - - transformers-compat ==0.6.6 + - transformers-compat ==0.7.2 - transformers-either ==0.1.2 - transformers-fix ==1.0 - transient ==0.7.0.0 @@ -2562,8 +2694,7 @@ default-package-overrides: - triplesec ==0.2.2.1 - trivial-constraint ==0.7.0.0 - tsv2csv ==0.1.0.2 - - ttc ==1.1.1.1 - - ttl-hashtables ==1.4.1.0 + - ttc ==1.2.0.0 - ttrie ==0.1.2.2 - tuple ==0.3.0.2 - tuples ==0.1.0.0 @@ -2574,30 +2705,32 @@ default-package-overrides: - twitter-conduit ==0.6.1 - twitter-types ==0.11.0 - twitter-types-lens ==0.11.0 - - TypeCompose ==0.9.14 + - typecheck-plugin-nat-simple ==0.1.0.7 - typed-process ==0.2.10.1 + - typed-uuid ==0.2.0.0 - type-equality ==1 - - type-errors ==0.2.0.0 - - type-errors-pretty ==0.0.1.2 + - type-errors ==0.2.0.1 - type-fun ==0.1.3 - type-hint ==0.1 - type-level-integers ==0.0.1 - - type-level-kv-list ==1.1.0 + - type-level-kv-list ==2.0.0 - type-level-natural-number ==2.0 - type-level-numbers ==0.1.1.2 - - typelits-witnesses ==0.4.0.0 - type-map ==0.1.7.0 - type-natural ==1.1.0.1 - typenums ==0.1.4 - type-of-html ==1.6.2.0 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 + - type-rig ==0.1 - type-spec ==0.4.0.0 - typography-geometry ==1.0.1.0 - tz ==0.1.3.6 - - tzdata ==0.2.20221028.0 + - tzdata ==0.2.20221129.0 + - tztime ==0.1.0.0 - ua-parser ==0.7.7.0 - uglymemo ==0.1.0.1 + - ulid ==0.3.2.0 - unagi-chan ==0.4.1.4 - unbounded-delays ==0.1.1.1 - unbound-generics ==0.4.2 @@ -2607,6 +2740,7 @@ default-package-overrides: - unconstrained ==0.1.0.2 - unexceptionalio ==0.5.1 - unexceptionalio-trans ==0.5.1 + - unfork ==1.0.0.1 - unicode ==0.0.1.1 - unicode-collation ==0.1.3.3 - unicode-data ==0.3.1 @@ -2630,27 +2764,28 @@ default-package-overrides: - universe-instances-extended ==1.1.3 - universe-reverse-instances ==1.1.1 - universe-some ==1.2.1 - - universum ==1.7.3 + - universum ==1.8.1 - unix-bytestring ==0.3.7.8 - unix-compat ==0.5.4 - unix-time ==0.4.8 + - unjson ==0.15.4 - unliftio ==0.2.23.0 - unliftio-core ==0.2.0.1 - unliftio-path ==0.0.2.0 - unliftio-pool ==0.2.2.0 - unliftio-streams ==0.1.1.1 - unlit ==0.4.0.0 - - unordered-containers ==0.2.17.0 + - unordered-containers ==0.2.19.1 - unsafe ==0.0 - urbit-hob ==0.3.3 - uri-bytestring ==0.3.3.1 - uri-bytestring-aeson ==0.1.0.8 - uri-encode ==1.5.0.7 - url ==2.1.3 + - userid ==0.1.3.7 - users ==0.5.0.0 - users-postgresql-simple ==0.5.0.2 - users-test ==0.5.0.1 - - utf8-light ==0.4.2 - utf8-string ==1.0.2 - utility-ht ==0.0.16 - uuid ==1.3.15 @@ -2659,8 +2794,11 @@ default-package-overrides: - valida-base ==0.2.0 - validate-input ==0.5.0.0 - validation ==1.1.2 + - validationt ==0.3.0 - validity ==0.12.0.1 + - validity-aeson ==0.2.0.5 - validity-bytestring ==0.4.1.1 + - validity-case-insensitive ==0.0.0.0 - validity-containers ==0.5.0.4 - validity-path ==0.4.0.1 - validity-persistent ==0.0.0.0 @@ -2686,26 +2824,27 @@ default-package-overrides: - vector-builder ==0.3.8.4 - vector-bytes-instances ==0.1.1 - vector-circular ==0.1.4 + - vector-extras ==0.2.8 - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.1 - vector-sized ==1.5.0 - vector-space ==0.16 - vector-split ==1.0.0.2 + - vector-stream ==0.1.0.0 - vector-th-unbox ==0.2.2 - - vectortiles ==1.5.1 - verbosity ==0.4.0.0 - versions ==5.0.4 - vformat ==0.14.1.0 - vformat-time ==0.1.0.0 - ViennaRNAParser ==1.3.3 - - vinyl ==0.13.3 + - vinyl ==0.14.3 - vinyl-loeb ==0.0.1.0 - vivid ==0.5.2.0 - vivid-osc ==0.5.0.0 - vivid-supercollider ==0.4.1.2 - void ==0.7.3 - - vty ==5.33 + - vty ==5.37 - wai ==3.2.3 - wai-app-static ==3.1.7.4 - wai-cli ==0.2.3 @@ -2713,32 +2852,35 @@ default-package-overrides: - wai-cors ==0.2.7 - wai-enforce-https ==1.0.0.0 - wai-eventsource ==3.0.0 - - wai-extra ==3.1.12.1 + - wai-extra ==3.1.13.0 - wai-feature-flags ==0.1.0.4 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.4.0 + - wai-middleware-bearer ==1.0.3 - wai-middleware-caching ==0.1.0.2 - wai-middleware-caching-lru ==0.1.0.0 - wai-middleware-caching-redis ==0.2.0.0 - wai-middleware-clacks ==0.1.0.1 - wai-middleware-delegate ==0.1.3.1 + - wai-middleware-metrics ==0.2.4 - wai-middleware-prometheus ==1.0.0.1 - wai-middleware-static ==0.9.2 - - wai-rate-limit ==0.2.0.0 + - wai-rate-limit ==0.3.0.0 - wai-rate-limit-redis ==0.2.0.1 - - wai-saml2 ==0.2.1.3 + - wai-saml2 ==0.3.0.1 - wai-session ==0.3.3 - wai-session-postgresql ==0.2.1.3 - wai-session-redis ==0.1.0.5 - wai-slack-middleware ==0.2.0 - - wai-transformers ==0.1.0 - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - - warp ==3.3.21 - - warp-tls ==3.3.2 + - warp ==3.3.23 + - warp-tls ==3.3.4 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 - wcwidth ==0.0.2 + - webby ==1.1.0 + - webdriver ==0.10.0.0 - webex-teams-api ==0.2.0.1 - webex-teams-conduit ==0.2.0.1 - webgear-core ==1.0.4 @@ -2750,33 +2892,29 @@ default-package-overrides: - web-routes-boomerang ==0.28.4.3 - web-routes-happstack ==0.23.12.2 - web-routes-hsp ==0.24.6.2 + - web-routes-th ==0.22.7 - web-routes-wai ==0.24.3.2 - webrtc-vad ==0.1.0.3 - websockets ==0.12.7.3 - - websockets-simple ==0.2.0 - weigh ==0.0.16 - - wide-word ==0.1.1.2 - - wikicfp-scraper ==0.1.0.12 - - wild-bind ==0.1.2.8 - - wild-bind-x11 ==0.2.0.14 + - wide-word ==0.1.4.0 - Win32 ==2.12.0.1 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - wire-streams ==0.1.1.0 - - witch ==1.0.2.0 -with-compiler: ghc-9.0.2 + - witch ==1.1.6.0 +with-compiler: ghc-9.2.5 - withdependencies ==0.3.0 - witherable ==0.4.2 - within ==0.2.0.1 - with-location ==0.1.0 - with-utf8 ==1.0.2.3 - - witness ==0.5 + - witness ==0.6.1 - wizards ==1.0.3 - wl-pprint ==1.2.1 - wl-pprint-annotated ==0.1.0.1 - - wl-pprint-console ==0.1.0.2 - wl-pprint-text ==1.2.0.2 - word8 ==0.1.3 + - word-compat ==0.0.6 - wordpress-auth ==1.0.0.1 - word-trie ==0.3.0 - word-wrap ==0.5 @@ -2788,7 +2926,7 @@ with-compiler: ghc-9.0.2 - writer-cps-mtl ==0.1.1.6 - writer-cps-transformers ==0.5.6.1 - wss-client ==0.3.0.0 - - wuss ==1.1.19 + - wuss ==2.0.0.2 - X11 ==1.10.3 - X11-xft ==0.3.4 - x11-xim ==0.0.9.0 @@ -2800,23 +2938,24 @@ with-compiler: ghc-9.0.2 - xdg-basedir ==0.2.2 - xdg-desktop-entry ==0.1.1.1 - xdg-userdirs ==0.1.0.2 - - xeno ==0.5 - - xlsx ==0.8.4 + - xeno ==0.6 + - xlsx ==1.0.0.1 - xlsx-tabular ==0.2.2.1 - xml ==1.3.14 - xml-basic ==0.1.3.1 - - xmlbf ==0.6.1 - - xmlbf-xeno ==0.2 + - xmlbf ==0.6.2 + - xmlbf-xeno ==0.2.1 - xmlbf-xmlhtml ==0.2 - xml-conduit ==1.9.1.1 - xml-conduit-writer ==0.1.1.2 - xmlgen ==0.6.2.2 - xml-hamlet ==0.5.0.2 - xml-helpers ==1.0.0 - - xmlhtml ==0.2.5.2 + - xmlhtml ==0.2.5.3 - xml-html-qq ==0.1.0.1 - xml-indexed-cursor ==0.1.1.0 - - xml-parser ==0.1.1 + - xml-lens ==0.3.1 + - xml-parser ==0.1.1.1 - xml-picklers ==0.3.6 - xml-to-json-fast ==2.0.0 - xml-types ==0.3.8 @@ -2824,11 +2963,11 @@ with-compiler: ghc-9.0.2 - xmonad-contrib ==0.17.1 - xmonad-extras ==0.17.0 - xor ==0.0.1.1 - - xss-sanitize ==0.3.7 + - xss-sanitize ==0.3.7.1 - xxhash-ffi ==0.2.0.0 - yaml ==0.11.8.0 - - yamlparse-applicative ==0.2.0.1 - - yaml-unscrambler ==0.1.0.9 + - yaml-unscrambler ==0.1.0.12 + - Yampa ==0.13.7 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 @@ -2840,6 +2979,7 @@ with-compiler: ghc-9.0.2 - yesod-bin ==1.6.2.2 - yesod-core ==1.6.24.0 - yesod-eventsource ==1.6.0.1 + - yesod-fb ==0.6.1 - yesod-form ==1.7.3 - yesod-form-bootstrap4 ==3.0.1 - yesod-gitrepo ==0.3.0 @@ -2860,22 +3000,20 @@ with-compiler: ghc-9.0.2 - yjsvg ==0.2.0.1 - yjtools ==0.9.18 - yoga ==0.0.0.5 - - youtube ==0.2.1.1 - - zenacy-html ==2.0.4 - - zenacy-unicode ==1.0.1 - - zero ==0.1.5 + - zenacy-html ==2.0.7 + - zenacy-unicode ==1.0.2 - zeromq4-haskell ==0.8.0 - zeromq4-patterns ==0.3.1.0 + - zigzag ==0.0.1.0 - zim-parser ==0.2.1.0 - zio ==0.1.0.2 - zip ==1.7.2 - zip-archive ==0.4.2.2 - zipper-extra ==0.1.3.2 - zippers ==0.3.2 - - zip-stream ==0.2.1.0 + - zip-stream ==0.2.2.0 - zlib ==0.6.3.0 - zlib-bindings ==0.1.1.5 - - zlib-lens ==0.1.2.1 - zot ==0.0.3 - zstd ==0.1.3.0 - ztail ==1.2.0.3 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 64bfa3ad8721..136fe881b2b5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -6,6 +6,7 @@ dont-distribute-packages: - 4Blocks - AC-Vector-Fancy + - ADPfusion - ADPfusionForest - ADPfusionSet - AERN-Net @@ -33,15 +34,21 @@ dont-distribute-packages: - BerlekampAlgorithm - BioHMM - Biobase + - BiobaseBlast - BiobaseDotP + - BiobaseENA - BiobaseEnsembl - BiobaseFR3D + - BiobaseFasta - BiobaseHTTP - BiobaseHTTPTools - BiobaseInfernal - BiobaseMAF - BiobaseTrainingData + - BiobaseTurner + - BiobaseTypes - BiobaseVienna + - BiobaseXNA - BirdPP - Bitly - BlastHTTP @@ -52,6 +59,7 @@ dont-distribute-packages: - CC-delcont-alt - CMCompare - CPBrainfuck + - CSPM-FiringRules - CSPM-Interpreter - CSPM-ToProlog - CSPM-cspm @@ -69,10 +77,13 @@ dont-distribute-packages: - DMuCheck - DOM - DP + - DRBG + - DSA - DSH - DSTM - Dangerous - DarcsHelpers + - DeepArrow - DefendTheKing - DifferenceLogic - DisTract @@ -85,7 +96,6 @@ dont-distribute-packages: - Dust-tools-pcap - DysFRP-Cairo - DysFRP-Craftwerk - - EdisonCore - EditTimeReport - EntrezHTTP - EsounD @@ -94,6 +104,7 @@ dont-distribute-packages: - Eternal10Seconds - Etherbunny - EventSocket + - Extra - FComp - FM-SBLEX - FTPLine @@ -101,7 +112,6 @@ dont-distribute-packages: - FailureT - FermatsLastMargin - FieldTrip - - FilePather - Fin - Finance-Treasury - FiniteMap @@ -123,8 +133,8 @@ dont-distribute-packages: - GPipe-Collada - GPipe-Examples - GPipe-GLFW + - GPipe-GLFW4 - GPipe-TextureLoad - - Gamgine - GeBoP - GenI - GenSmsPdu @@ -142,9 +152,9 @@ dont-distribute-packages: - GrowlNotify - Gtk2hsGenerics - GtkGLTV + - GtkTV - GuiHaskell - GuiTV - - H - HAppS-Data - HAppS-IxSet - HAppS-Server @@ -176,11 +186,13 @@ dont-distribute-packages: - HPhone - HPlot - HPong + - HQu - HROOT - HROOT-graf - HROOT-hist - HROOT-io - HROOT-math + - HROOT-net - HROOT-tree - HRay - HSGEP @@ -189,7 +201,6 @@ dont-distribute-packages: - HStringTemplateHelpers - HTab - HXMPP - - HaMinitel - HaRe - HaTeX-meta - HaTeX-qq @@ -222,12 +233,14 @@ dont-distribute-packages: - IORefCAS - IndexedList - InfixApplicative + - InternedData - JSON-Combinator - JSON-Combinator-Examples - Javasf - JsContracts - JsonGrammar - JuPyTer-notebook + - JuicyPixels-scale-dct - JunkDB-driver-gdbm - JunkDB-driver-hashtables - KiCS @@ -239,7 +252,6 @@ dont-distribute-packages: - LambdaINet - LambdaPrettyQuote - LambdaShell - - Lambdaya - Lattices - LinearSplit - LinkChecker @@ -255,18 +267,16 @@ dont-distribute-packages: - MFlow - MIP-glpk - MSQueue + - MagicHaskeller - MailchimpSimple - Map - - MaybeT-transformers - MetaObject - Metrics - Mhailist - Michelangelo - MicrosoftTranslator - MissingPy - - MonadCatchIO-mtl - MonadCatchIO-mtl-foreign - - MonadCatchIO-transformers-foreign - MonadLab - Monaris - Monatron-IO @@ -276,8 +286,9 @@ dont-distribute-packages: - MuCheck-QuickCheck - MuCheck-SmallCheck - MutationOrder - - NXT + - NGLess - NaperianNetCDF + - NaturalLanguageAlphabets - NearContextAlgebra - Ninjas - NoSlow @@ -288,7 +299,6 @@ dont-distribute-packages: - Nomyx-Web - NonEmptyList - Nussinov78 - - OSM - OnRmt - OpenAFP-Utils - OpenGLCheck @@ -298,7 +308,10 @@ dont-distribute-packages: - PageIO - Paillier - Paraiso + - Parallel-Arrows-BaseSpec - Parallel-Arrows-Eden + - Parallel-Arrows-Multicore + - Parallel-Arrows-ParMonad - PermuteEffects - Plot-ho-matic - PlslTools @@ -313,6 +326,7 @@ dont-distribute-packages: - RNAFold - RNAFoldProgs - RNAdesign + - RNAdraw - RNAlien - RNAwolf - Ranka @@ -337,13 +351,17 @@ dont-distribute-packages: - Shellac-haskeline - Shellac-readline - ShortestPathProblems + - Shpadoinkle - Shpadoinkle-backend-pardiff + - Shpadoinkle-backend-snabbdom - Shpadoinkle-backend-static - Shpadoinkle-developer-tools - Shpadoinkle-disembodied - Shpadoinkle-examples - Shpadoinkle-html + - Shpadoinkle-lens - Shpadoinkle-router + - Shpadoinkle-streaming - Shpadoinkle-template - Shpadoinkle-widgets - SimpleGL @@ -351,6 +369,7 @@ dont-distribute-packages: - SimpleServer - Smooth - Snusmumrik + - SoOSiM - SoccerFun - SoccerFunGL - SourceGraph @@ -358,7 +377,9 @@ dont-distribute-packages: - SpinCounter - StockholmAlignment - Strafunski-Sdf2Haskell + - SybWidget - SyntaxMacros + - TV - Taxonomy - TaxonomyTools - TeX-my-math @@ -370,9 +391,9 @@ dont-distribute-packages: - TypeIlluminator - UMM - URLT + - UTFTConverter - UrlDisp - - Villefort - - WAVE + - ViennaRNA-extras - WEditorBrick - WEditorHyphen - WL500gPControl @@ -385,17 +406,18 @@ dont-distribute-packages: - WebCont - Wired - WordAlignment + - Workflow - WxGeneric - XML - XMPP - XSaiga - - YACPong - Yablog - Yogurt-Standalone - Z-Botan - Z-IO - Z-MessagePack - Z-YAML + - ZipFold - a50 - abcBridge - abstract-par-accelerate @@ -420,17 +442,16 @@ dont-distribute-packages: - access-token-provider - acme-php - acme-safe - - acousticbrainz-client - activehs - actor - acts - adhoc-network - adict - - adjunction - adp-multi-monadiccp - aeson-native - affine - afv + - ag-pictgen - agda-server - agda-snippets-hakyll - agentx @@ -442,11 +463,8 @@ dont-distribute-packages: - algebra-sql - algebraic - algolia - - algorithmic-composition-additional - - algorithmic-composition-basic - - algorithmic-composition-complex - algorithmic-composition-frequency-shift - - algorithmic-composition-overtones + - align-audio - alms - alpha - alsa-gui @@ -597,7 +615,6 @@ dont-distribute-packages: - amby - ampersand - amqp-streamly - - analyze-client - anatomy - animate-example - animate-frames @@ -656,9 +673,12 @@ dont-distribute-packages: - array-forth - arraylist - ascii-cows + - ascii-superset_1_2_5_0 - ascii-table + - ascii-th_1_2_0_0 + - ascii_1_5_1_0 - asic - - asif + - asil - assert4hs-hspec - assert4hs-tasty - assimp @@ -666,19 +686,20 @@ dont-distribute-packages: - astview - aterm-utils - atlassian-connect-core - - atlassian-connect-descriptor - atmos-dimensional-tf + - atom-msp430 - atomic-primops-foreign - atp - ats-format - - ats-pkg - attoparsec-enumerator - attoparsec-iteratee - attoparsec-text-enumerator - atuin + - audacity - audiovisual - aura - authoring + - autodocodec-openapi3 - automata - autonix-deps-kf5 - avers @@ -728,7 +749,6 @@ dont-distribute-packages: - bamstats - barley - base32-bytestring - - base64-bytes - baserock-schema - basic - batchd @@ -738,11 +758,10 @@ dont-distribute-packages: - batching - battlenet-yesod - battleplace-api + - battleship-combinatorics - battleships - bayes-stack - bbi - - bcp47 - - bcp47-orphans - bdcs - bdcs-api - beam-automigrate @@ -752,9 +771,8 @@ dont-distribute-packages: - beeminder-api - bein - belka - - berp - bff - - bglib + - bidirectionalization-combined - bifunctor - billboard-parser - billeksah-forms @@ -770,7 +788,6 @@ dont-distribute-packages: - bindings-ppdev - bindynamic - binembed-example - - binrep - bioace - bioalign - biofasta @@ -790,7 +807,6 @@ dont-distribute-packages: - bitcoin-api-extra - bitcoin-block - bitcoin-compact-filters - - bitcoin-scripting - bitcoin-tx - bitcoin-types - bitcoind-regtest @@ -800,10 +816,12 @@ dont-distribute-packages: - bittorrent - bla - blakesum-demo + - blas-comfort-array - blastxml - blatex - blaze-builder-enumerator - blaze-colonnade + - blaze-html-contrib - ble - blink1 - blip @@ -813,20 +831,23 @@ dont-distribute-packages: - blubber - bluetile - blunt - - bnb-staking-csvs - bno055-haskell + - board-games - bogre-banana - boilerplate - bond - bond-haskell - bond-haskell-compiler - bookhound-format + - bookkeeper - bookkeeper-permissions - boomslang - - boopadoop + - boots-app - boots-cloud - boots-web - borel + - both + - bowntz - box-csv - box-socket - breakout @@ -835,22 +856,24 @@ dont-distribute-packages: - bricks-parsec - bricks-rendering - bricks-syntax + - broadcast-chan-conduit + - broadcast-chan-pipes - bronyradiogermany-streaming - btc-lsp - btree + - btree-concurrent - buchhaltung - buildbox-tools - buildwrapper - bulletproofs - bulmex - burnt-explorer - - bus-pirate - buster-gtk - buster-network - butterflies + - bv-sized + - bv-sized-lens - bytable - - bytelog - - bytepatch - bytestring-builder-varword - bytestring-read - ca @@ -863,6 +886,7 @@ dont-distribute-packages: - cabal2json - cabalmdvrpm - cabalrpmdeps + - caffegraph - cake - cakyrespa - cal3d-examples @@ -871,6 +895,7 @@ dont-distribute-packages: - calculator - caldims - call + - camfort - campfire - canteven-http - cao @@ -878,6 +903,7 @@ dont-distribute-packages: - capnp - captcha-2captcha - captcha-capmonster + - captcha-core - car-pool - carboncopy - cartel @@ -896,7 +922,6 @@ dont-distribute-packages: - casr-logbook-reports-html - casr-logbook-reports-meta - casr-logbook-reports-meta-html - - cassandra-cql - cassandra-thrift - cassy - casui @@ -915,6 +940,8 @@ dont-distribute-packages: - cfipu - cflp - cfopu + - cgi-undecidable + - cgi-utils - chainweb-mining-client - chalkboard-viewer - chapelure @@ -925,21 +952,20 @@ dont-distribute-packages: - cheapskate-terminal - check-pvp - chevalier-common + - chiasma - chiasma-test - chitauri - choose-exe - chorale-geo - chp-mtl - chp-plus + - chp-spec - chp-transformers - - chr-core - chr-lang - chromatin - - chronograph - chu2 - chuchu - chunks - - ciphersaber2 - citation-resolve - citeproc-hs-pandoc-filter - clac @@ -947,31 +973,32 @@ dont-distribute-packages: - claferIG - claferwiki - clash + - clash-ghc + - clash-lib + - clash-lib-hedgehog + - clash-multisignal + - clash-prelude-hedgehog + - clash-prelude-quickcheck + - clash-shake + - clash-systemverilog + - clash-verilog + - clash-vhdl + - clashilator - classify-frog - classy-miso - - clckwrks - - clckwrks-cli - clckwrks-dot-com - - clckwrks-plugin-bugs - clckwrks-plugin-ircbot - - clckwrks-plugin-mailinglist - - clckwrks-plugin-media - - clckwrks-plugin-page - - clckwrks-plugin-redirect - - clckwrks-theme-bootstrap - - clckwrks-theme-clckwrks - - clckwrks-theme-geo-bootstrap - cless - cleveland - click-clack + - clickhouse-haskell - clifford - clippings - - clocked - cloud-haskell - cloud-seeder - cloudyfs + - clr-bindings - clua - - clustering - clustertools - clutterhs - cmathml3 @@ -981,13 +1008,13 @@ dont-distribute-packages: - co-feldspar - cobot-io - codec + - codec-libevent - codec-rpm - codemonitor - coformat - cognimeta-utils - coinbase-exchange - colada - - colchis - collapse-duplication - collection-json - collections-base-instances @@ -999,17 +1026,21 @@ dont-distribute-packages: - columbia - columnar - comark - - comic - - commodities + - comfort-array + - comfort-array-shape + - comfort-fftw + - comfort-glpk + - commsec - commsec-keyexchange - comonad-random - compaREST - compact-mutable + - compact-mutable-vector + - compact-socket - compactable - compdata-automata - compdata-dags - compdata-param - - compdoc-dhall-decoder - complexity - comprehensions-ghc - compstrat @@ -1034,7 +1065,9 @@ dont-distribute-packages: - config-select - configifier - configurator-ng + - conic-graphs - constrained-category + - constrained-platform-instances - constraint - constraint-manip - constraint-reflection @@ -1047,12 +1080,8 @@ dont-distribute-packages: - continuum-client - control - control-monad-attempt - - control-monad-exception-monadsfd - - contstuff-monads-tf - - contstuff-transformers - conversions - convert - - convert-annotation - convertible-ascii - convertible-text - coordinate @@ -1061,9 +1090,8 @@ dont-distribute-packages: - copilot-frp-sketch - copilot-language - copilot-libraries + - copilot-sbv - copilot-theorem - - core-webserver-servant - - core-webserver-warp - coroutine-enumerator - coroutine-iteratee - couch-simple @@ -1077,6 +1105,7 @@ dont-distribute-packages: - cqrs-sqlite3 - cqrs-test - cqrs-testkit + - crackNum - craft - craftwerk-cairo - craftwerk-gtk @@ -1087,26 +1116,32 @@ dont-distribute-packages: - crf-chain1-constrained - crf-chain2-generic - crf-chain2-tiers + - criterion-compare - criu-rpc - crockford - cron-compat - crypto-classical - crypto-conduit - crypto-pubkey + - crypto-sodium - cryptocipher - cryptoids - cryptoids-class - cryptol - crystalfontz + - csound-catalog + - csound-controllers + - csound-expression + - csound-expression-opcodes + - csound-expression-typed + - csound-sampler - cspmchecker - csv-enumerator - ctpl - cube - cuckoo - - cursedcsv - cv-combinators - cypher - - dahdit - dapi - darcs-benchmark - darcs-beta @@ -1116,20 +1151,17 @@ dont-distribute-packages: - darkplaces-demo - darkplaces-rcon-util - dash-haskell - - data-accessor-monads-fd - data-basic - data-cycle + - data-default-extra - data-diverse-lens - - data-elf - data-layer - - data-lens-fd - - data-lens-ixset - - data-lens-template - data-object-json - data-object-yaml - data-result - data-rtuple - data-structure-inferrer + - database-id-groundhog - datadog-tracing - datafix - dataflow @@ -1142,6 +1174,7 @@ dont-distribute-packages: - dbus-client - ddate - ddc-build + - ddc-core - ddc-core-babel - ddc-core-eval - ddc-core-flow @@ -1174,9 +1207,6 @@ dont-distribute-packages: - delimiter-separated - delta - delta-h - - dep-t-advice - - dep-t-dynamic - - dep-t-value - dependent-literals-plugin - dependent-state - depends @@ -1191,6 +1221,7 @@ dont-distribute-packages: - dewdrop - dfinity-radix-tree - dhall-recursive-adt + - dhall-secret - dia-functions - diagrams-haddock - diagrams-html5 @@ -1201,11 +1232,13 @@ dont-distribute-packages: - dialog - diff - difference-monoid - - differential - digestive-functors-hsp + - dimensional-tf + - dimensions - dingo-core - dingo-example - dingo-widgets + - diohsc - diplomacy-server - direct-rocksdb - directory-contents @@ -1213,7 +1246,6 @@ dont-distribute-packages: - discogs-haskell - discord-gateway - discord-hs - - discord-register - discord-rest - disposable - distributed-fork @@ -1244,8 +1276,7 @@ dont-distribute-packages: - dmenu-pkill - dmenu-pmount - dmenu-search - - dnscache - - dobutokO-effects + - dnf-repo - dobutokO-poetry - dobutokO-poetry-general - dobutokO-poetry-general-languages @@ -1253,12 +1284,7 @@ dont-distribute-packages: - dobutokO3 - dobutokO4 - doc-review - - domain - - domain-aeson - - domain-cereal - - domain-optics - dormouse-client - - dotparse - dovetail - dovetail-aeson - dow @@ -1270,21 +1296,21 @@ dont-distribute-packages: - dph-prim-interface - dph-prim-par - dph-prim-seq - - drama - dropbox-sdk - dropsolve - dsh-sql - dsmc-tools - dtd - - dtw - - dumb-cas - dvda - dynamic-cabal - dynamic-plot - dynamic-pp - dynamodb-simple - dynobud + - easytensor + - easytensor-vulkan - ec2-unikernel + - eccrypto-ed25519-bindings - ecdsa - edenskel - edentv @@ -1292,8 +1318,8 @@ dont-distribute-packages: - edges - editable - edits + - effect-monad - effective-aspects-mzv - - eflint - egison - egison-pattern-src-haskell-mode - egison-pattern-src-th-mode @@ -1303,6 +1329,7 @@ dont-distribute-packages: - ekg-carbon - ekg-cloudwatch - ekg-wai + - elasticsearch-interchange - electrs-client - elerea-examples - elliptic-curve @@ -1311,6 +1338,7 @@ dont-distribute-packages: - email - emailparse - embroidery + - emd - engine-io-growler - engine-io-snap - engine-io-wai @@ -1324,12 +1352,21 @@ dont-distribute-packages: - enumerator-tf - enumfun - ephemeral + - erf-native - eros-client - eros-http - error-message - errors-ext - ersatz-toysat - esotericbot + - essence-of-live-coding-PortMidi + - essence-of-live-coding-gloss + - essence-of-live-coding-gloss-example + - essence-of-live-coding-pulse + - essence-of-live-coding-pulse-example + - essence-of-live-coding-quickcheck + - essence-of-live-coding-vivid + - essence-of-live-coding-warp - estimators - estreps - eternity @@ -1340,22 +1377,28 @@ dont-distribute-packages: - ethereum-analyzer-webui - ethereum-client-haskell - ethereum-merkle-patricia-db + - eths-rlp - euphoria - - eve-cli - event-monad + - eventful-core - eventful-dynamodb + - eventful-memory - eventful-postgresql + - eventful-sql-common - eventful-sqlite + - eventful-test-helpers - eventloop - eventsource-geteventstore-store - eventsource-store-specs - eventsource-stub-store + - eventuo11y - eventuo11y-batteries - eventuo11y-json - every-bit-counts - - exception-monads-fd + - ewe - exference - exinst-aeson + - exinst-base - exinst-bytes - exinst-cereal - exinst-deepseq @@ -1373,8 +1416,6 @@ dont-distribute-packages: - expressions-z3 - extemp - extended-containers-lens - - extensible-data - - external-sort - extract-dependencies - factual-api - fadno @@ -1383,11 +1424,9 @@ dont-distribute-packages: - family-tree - fast-bech32 - fastcdc + - fastcgi - fastirc - - fastly - - fastparser - fault-tree - - fay - fay-base - fay-builder - fay-dom @@ -1401,6 +1440,7 @@ dont-distribute-packages: - fay-websockets - fbrnch - fcd + - fckeditor - feature-flipper-postgres - fedora-composes - fedora-img-dl @@ -1416,17 +1456,16 @@ dont-distribute-packages: - fei-modelzoo - fei-nn - feldspar-compiler - - feldspar-language - festung - ffmpeg-tutorials - ficketed - - fields - filepath-crypto - filepath-io-access - filesystem-abstractions - filesystem-enumerator - find-clumpiness - findhttp + - finitary - finitary-derive - finitary-optics - finite-table @@ -1435,14 +1474,12 @@ dont-distribute-packages: - fix-parser-simple - fixed-point-vector - fixed-point-vector-space - - fixed-precision - fixhs - flashblast - flatbuffers - flexiwrap - flexiwrap-smallcheck - flite - - flowdock-api - flower - flowsim - fltkhs-demos @@ -1455,11 +1492,10 @@ dont-distribute-packages: - fmt-for-rio - foldable1 - follower + - fontconfig-pure - foo - - formal - format - format-status - - forml - formlets - formlets-hsp - forsyde-deep @@ -1472,6 +1508,8 @@ dont-distribute-packages: - fpnla-examples - frame-markdown - freckle-app + - freckle-app_1_8_1_0 + - free-functors - free-game - free-theorems-counterexamples - free-theorems-seq @@ -1480,7 +1518,7 @@ dont-distribute-packages: - freekick2 - freelude - freer-converse - - freetype-simple + - fresnel-fused-effects - front - frpnow-gloss - frpnow-gtk @@ -1500,12 +1538,13 @@ dont-distribute-packages: - functor-combo - funflow - funflow-nix + - fungll-combinators - funion - funnyprint - funsat + - fused-effects-squeal - fwgl-glfw - fwgl-javascript - - fxpak - g2 - g2q - gact @@ -1523,7 +1562,9 @@ dont-distribute-packages: - gelatin-gl - gelatin-sdl2 - gelatin-shaders + - gemini-router - gemini-textboard + - generic-accessors - generic-override-aeson - generics-mrsop-gdiff - genesis @@ -1539,22 +1580,23 @@ dont-distribute-packages: - genvalidity-sydtest-hashable - genvalidity-sydtest-lens - genvalidity-sydtest-persistent + - geo-uk - geodetic - geolite-csv - getemx + - gf - ghc-debug-brick - - ghc-debug-client - - ghc-debug-common - - ghc-debug-stub - ghc-imported-from - ghc-instances - ghc-mod - ghc-session - ghc-tags-plugin - ghci-pretty + - ghcjs-dom-hello - ghcjs-dom-webkit - ghcjs-fetch - ghcjs-hplay + - ghcup - ght - gi-cairo-again - gi-clutter @@ -1562,12 +1604,11 @@ dont-distribute-packages: - gi-ges - gi-gsk - gi-gstpbutils + - gi-gtk-declarative-app-simple - gi-gtk_4_0_6 - - gipeda - git-config - git-fmt - git-gpush - - git-monitor - git-object - git-remote-ipfs - git-sanity @@ -1575,6 +1616,7 @@ dont-distribute-packages: - github-webhook-handler-snap - gitlib-cross - gitlib-s3 + - gitson - givegif - gladexml-accessor - glazier @@ -1785,6 +1827,7 @@ dont-distribute-packages: - gogol-youtube-reporting - google-drive - google-mail-filters + - google-maps-geocoding - googleplus - gore-and-ash-actor - gore-and-ash-async @@ -1800,6 +1843,7 @@ dont-distribute-packages: - graflog - grammar-combinators - grapefruit-examples + - grapefruit-frp - grapefruit-records - grapefruit-ui - grapefruit-ui-gtk @@ -1817,12 +1861,17 @@ dont-distribute-packages: - graphql-client - graphtype - greencard-lib + - grenade - gridbounds - gridland - groot - gross - groundhog-converters - groundhog-inspector + - groundhog-mysql + - groundhog-postgresql + - groundhog-sqlite + - groundhog-th - grpc-etcd-client - grpc-haskell - grpc-haskell-core @@ -1833,6 +1882,7 @@ dont-distribute-packages: - gsmenu - gstorable - gtfs + - gtfs-realtime - gtk-serialized-event - gtk2hs-cast-glade - gtk2hs-cast-gnomevfs @@ -1842,7 +1892,6 @@ dont-distribute-packages: - gtkimageview - gtkrsync - guarded-rewriting - - hArduino - hOff-display - hPDB - hPDB-examples @@ -1851,18 +1900,21 @@ dont-distribute-packages: - hablog - hack-contrib - hack-contrib-press + - hack-frontend-monadcgi - hack-handler-epoll - hack-handler-evhttp - hack-handler-fastcgi + - hack-handler-happstack - hack-handler-hyena + - hack-handler-kibro - hack-handler-simpleserver - hack-middleware-cleanpath - hack-middleware-clientsession - hack-middleware-jsonp + - hack2-contrib-extra - hack2-handler-happstack-server - hack2-handler-mongrel2-http - hack2-handler-snap-server - - hackage-mirror - hackage2twitter - hackmanager - haddock @@ -1880,7 +1932,7 @@ dont-distribute-packages: - hall-symbols - halma-gui - halma-telegram-bot - - ham + - hamilton - hamusic - hans-pcap - happlets-lib-gtk @@ -1888,20 +1940,18 @@ dont-distribute-packages: - happs-hsp-template - happs-tutorial - happstack-auth - - happstack-authenticate - happstack-contrib - happstack-data - happstack-dlg - happstack-facebook + - happstack-fastcgi - happstack-fay - happstack-fay-ajax - happstack-helpers - happstack-ixset - - happstack-jmacro - happstack-plugins - happstack-state - happstack-static-routing - - happstack-yui - happybara-webkit - haquil - harg @@ -1909,6 +1959,7 @@ dont-distribute-packages: - harmony - haroonga-httpd - has-th + - hasbolt-extras - hascat - hascat-lib - hascat-setup @@ -1919,11 +1970,15 @@ dont-distribute-packages: - hask-home - haskdeep - haskeem + - haskell-admin + - haskell-admin-health + - haskell-admin-managed-functions - haskell-aliyun - haskell-bitmex-client - haskell-docs - haskell-eigen-util - haskell-ftp + - haskell-lsp - haskell-lsp-client - haskell-pdf-presenter - haskell-platform-test @@ -1945,6 +2000,7 @@ dont-distribute-packages: - haskell-tools-refactor - haskell-tools-rewrite - haskell-tor + - haskell-xmpp - haskelldb-connect-hdbc - haskelldb-connect-hdbc-catchio-mtl - haskelldb-connect-hdbc-catchio-tf @@ -1969,12 +2025,9 @@ dont-distribute-packages: - hasklepias - haskoin-bitcoind - haskoin-crypto - - haskoin-node - haskoin-protocol - haskoin-script - haskoin-store - - haskoin-store-data - - haskoin-wallet - haskoon - haskoon-httpspec - haskoon-salvia @@ -1986,16 +2039,18 @@ dont-distribute-packages: - hasktorch-indef - hasktorch-signatures - hasktorch-zoo + - haskus-binary + - haskus-system-build + - haskus-utils - haskus-utils-compat - haskus-web - haslo - hasloGUI - - hasparql-client - 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 @@ -2010,6 +2065,7 @@ dont-distribute-packages: - hatexmpp3 - hawitter - haxl-amazonka + - haxl-facebook - haxy - hback - hbayes @@ -2028,7 +2084,9 @@ dont-distribute-packages: - hdbi-postgresql - hdbi-sqlite - hdbi-tests + - hdf - hdiff + - hdigest - hdirect - hdocs - hdph @@ -2042,11 +2100,11 @@ dont-distribute-packages: - hedgehog-checkers-lens - hedgehog-gen-json - hedis-pile - - heist-aeson - helic - helics - helics-wai - helium + - hell - hellage - hellnet - hemokit @@ -2067,6 +2125,7 @@ dont-distribute-packages: - hexpat-iteratee - hfd - hfiar + - hfoil - hfractal - hgalib - hgen @@ -2082,7 +2141,6 @@ dont-distribute-packages: - hinduce-classifier - hinduce-classifier-decisiontree - hinduce-examples - - hint-server - hinvaders - hinze-streams - hipbot @@ -2100,18 +2158,20 @@ dont-distribute-packages: - hjsonschema - hjugement-cli - hlcm - - hlrdb + - hledger-api - hls - - hly + - hls-exactprint-utils - hmark - hmatrix-backprop + - hmatrix-sundials - hmeap - hmeap-utils - hmep - - hmt + - hmm-lapack - hmt-diagrams - hnormalise - ho-rewriting + - hoauth2-demo - hoauth2-providers-tutorial - hob - hogre @@ -2130,63 +2190,75 @@ dont-distribute-packages: - hoodle-render - hoovie - hoppy-docs + - hoppy-runtime + - hoppy-std + - horizon-gen-nix + - horizon-spec - hotswap - - hout - hp2any-graph - hp2any-manager - hpaco - hpaco-lib - hpage - hpaste + - hpath-directory + - hpath-io - hpc-tracer - hplayground - hpqtypes-effectful - hpqtypes-extras + - hprotoc - hprotoc-fork - hps - hps-cairo - hpython + - hq + - hquantlib - hranker - hreq-client - hreq-conduit + - hriemann - hs - hs-blake2 - hs-ffmpeg - hs-gen-iface - - hs-ix - hs-pkpass - - hs-profunctors - hs-sdl-term-emulator - hs2dot + - hsaml2 - hsautogui - hsbackup - hsbencher-codespeed - hsbencher-fusion - hsc3-auditor + - hsc3-cairo - hsc3-data + - hsc3-db + - hsc3-dot - hsc3-forth - hsc3-graphs + - hsc3-lang - hsc3-lisp - hsc3-plot + - hsc3-process + - hsc3-rec - hsc3-server - hsc3-sf-hsndfile + - hsc3-unsafe - hsc3-utils - hscassandra - - hschema-aeson - - hschema-prettyprinter - - hschema-quickcheck - hscope - hsdev - hsfacter - hsinspect-lsp - hslogstash - hslua-module-zip - - hsnsq + - hsndfile-storablevector - hspec-expectations-pretty - hspec-pg-transact - hspec-setup - hspec-shouldbe - - hspec-webdriver + - hspecVariant - hsprocess - hsql-mysql - hsql-odbc @@ -2200,19 +2272,17 @@ dont-distribute-packages: - hstzaar - hsubconvert - hswip - - hsx-jmacro - hsx-xhtml + - hsyslog-tcp + - htar - html-kure - - html-parse-util - htoml-parse - - hts - htsn-import - http-client-auth - http-client-rustls - http-enumerator - - http-pony - - http2-client-exe - http2-client-grpc + - http2-grpc-proto-lens - http2-grpc-proto3-wire - https-everywhere-rules - https-everywhere-rules-raw @@ -2221,7 +2291,6 @@ dont-distribute-packages: - hugs2yc - hulk - hunit-gui - - hunp - hunt-searchengine - hunt-server - hurdle @@ -2229,7 +2298,6 @@ dont-distribute-packages: - huzzy - hw-all - hw-aws-sqs-conduit - - hw-kafka-avro - hw-uri - hworker-ses - hwormhole @@ -2254,15 +2322,17 @@ dont-distribute-packages: - hyena - hylotab - hyloutils + - hyper-extra + - hyper-haskell-server - hyperpublic - iException + - ice40-prim - ide-backend - ide-backend-server - ideas-math - ideas-math-types - ideas-statistics - ige-mac-integration - - ihaskell-inline-r - ihaskell-rlangqq - ihttp - imap @@ -2277,6 +2347,7 @@ dont-distribute-packages: - imprevu-happstack - improve - inch + - incipit - incremental-computing - incremental-maps - increments @@ -2284,11 +2355,14 @@ dont-distribute-packages: - indentation-parsec - indentation-trifecta - indexation + - indieweb-algorithms - indigo + - inferno-core + - inferno-lsp + - inferno-vc - infernu - infinity - inline-java - - inspection-proxy - inspector-wrecker - instant-aeson - instant-bytes @@ -2296,10 +2370,13 @@ dont-distribute-packages: - instant-hashable - instant-zipper - integreat + - intel-aes - interpolatedstring-qq - interpolatedstring-qq-mwotton + - intro-prelude - introduction-test - intset + - invertible-hlist - invertible-hxt - ion - ipatch @@ -2322,6 +2399,8 @@ dont-distribute-packages: - iteratee-parsec - iteratee-stm - iterio-server + - iterm-show-JuicyPixels + - iterm-show-diagrams - ival - ivor - ivory-avr-atmega328p-registers @@ -2338,8 +2417,7 @@ dont-distribute-packages: - ix - iyql - j2hs - - jacinda - - jail + - java-bridge - java-bridge-extras - java-character - java-reflect @@ -2347,12 +2425,13 @@ dont-distribute-packages: - javascript-extras - javasf - jespresso - - jmacro - - jmacro-rpc - jmacro-rpc-happstack - jmacro-rpc-snap - - jmonkey - join + - jordan-openapi + - jordan-servant-openapi + - jot + - jsaddle-hello - jsc - jsmw - json-ast-json-encoder @@ -2368,12 +2447,12 @@ dont-distribute-packages: - json-tokens - json2-hdbc - json2sg - - jsonlogic-aeson - jsons-to-schema - jspath - jvm - jvm-batching - jvm-streaming + - kafka-client - kafka-device - kafka-device-glut - kafka-device-joystick @@ -2387,8 +2466,6 @@ dont-distribute-packages: - kansas-lava-shake - karakuri - katip-rollbar - - keenser - - keera-hails-i18n - keera-hails-mvc-environment-gtk - keera-hails-mvc-model-lightmodel - keera-hails-mvc-model-protectedmodel @@ -2405,8 +2482,12 @@ dont-distribute-packages: - keera-hails-reactivelenses - keera-posture - keid-resource-gltf + - kerry - kevin - key-vault + - keyed-vals-hspec-tests + - keyed-vals-mem + - keyed-vals-redis - keyring - keysafe - keyvaluehash @@ -2426,7 +2507,6 @@ dont-distribute-packages: - kubernetes-client - kure-your-boilerplate - kurita - - kvitable - laborantin-hs - labsat - labyrinth @@ -2446,14 +2526,12 @@ dont-distribute-packages: - lambdacube-examples - lambdacube-gl - lambdacube-samples - - lambdatwit - lambdaya-bus - lambdiff + - landlock - lang - language-Modula2 - - language-avro - language-boogie - - language-ecmascript-analysis - language-eiffel - language-kort - language-ninja @@ -2462,6 +2540,9 @@ dont-distribute-packages: - language-python-colour - language-qux - language-spelling + - lapack + - lapack-comfort-array + - lapack-hmatrix - lat - latex-formulae-hakyll - latex-formulae-pandoc @@ -2472,10 +2553,14 @@ dont-distribute-packages: - layouting - lazy-hash - lazy-hash-cache + - lda - ldap-scim-bridge - ldapply - leaky - lean + - learn-physics + - learn-physics-examples + - learning-hmm - legion - legion-discovery - legion-discovery-client @@ -2485,9 +2570,6 @@ dont-distribute-packages: - lens-accelerate - lens-toml-parser - lens-utils - - lenz - - lenz-mtl - - lenz-template - levmar-chart - lex-applicative - lgtk @@ -2509,14 +2591,19 @@ dont-distribute-packages: - lighttpd-conf - lighttpd-conf-qq - linear-accelerate + - linear-circuit - linear-code + - linearEqSolver - linearmap-category - linearscan-hoopl - linkchk - linkcore + - linnet-aeson + - linnet-conduit - linux-ptrace - lio-eci11 - lio-simple + - lion - liquid-base - liquid-bytestring - liquid-containers @@ -2550,20 +2637,22 @@ dont-distribute-packages: - llvm-tools - lmonad-yesod - lnd-client - - lnurl - lnurl-authenticator - local-search - localize - locked-poll - log + - log-effect-syslog + - log-effectful + - log-elasticsearch - log-postgres - log-utils - log4hs - logging-effect-extra - - logging-facade-journald - logic-classes - lojban - lojysamban + - lol - lol-apps - lol-benches - lol-cpp @@ -2571,19 +2660,17 @@ dont-distribute-packages: - lol-tests - lol-typing - loli + - longshot - loop-effin - looper - lorentz - lostcities - loup - - lp-diagrams-svg - lrucaching-haxl - ls-usb - lsystem - - ltext - luachunk - lucid-colonnade - - lucid2-htmx - lucienne - luhn - lui @@ -2600,6 +2687,7 @@ dont-distribute-packages: - macosx-make-standalone - magic-wormhole - magicbane + - magico - mahoro - maid - mailgun @@ -2630,10 +2718,10 @@ dont-distribute-packages: - markdown-pap - markdown2svg - markov-processes + - markup - marmalade-upload - marquise - marvin - - marxup - masakazu-bot - matchers - math-programming-glpk @@ -2645,6 +2733,7 @@ dont-distribute-packages: - maxent-learner-hw-gui - maxsharing - mcmc-samplers + - medea - mediabus-fdk-aac - mediabus-rtp - mellon-gpio @@ -2660,11 +2749,10 @@ dont-distribute-packages: - metronome - micro-gateway - microformats2-types + - midi-alsa - midimory + - midisurface - mighttpd - - migrant-hdbc - - migrant-postgresql-simple - - migrant-sqlite-simple - minecraft-data - minesweeper - mini-egison @@ -2672,22 +2760,16 @@ dont-distribute-packages: - minimung - minioperational - minirotate - - mirror-tweet - miss - miss-porcelain - missing-py2 - mixed-strategies - mkbndl - mlist - - mmsyn4 - mmsyn6ukr - - mmsyn6ukr-array - mmsyn7h - - mmsyn7l - mmsyn7s - mmsyn7ukr - - mmsyn7ukr-array - - mmsyn7ukr-common - mmtl-base - moan - modify-fasta @@ -2697,36 +2779,26 @@ dont-distribute-packages: - modulo - mole - monad-exception + - monad-http - monad-metrics-extensible - monad-state - monad-stlike-stm - - monad-unlift-ref - monadiccp-gecode - - monadology - monarch - monetdb-mapi - mongrel2-handler - monky - monte-carlo - moo - - moo-nad - moonshine - morley - morley-client - morley-prelude - morley-upgradeable - - morpheus-graphql - - morpheus-graphql-app - - morpheus-graphql-cli - - morpheus-graphql-client - - morpheus-graphql-code-gen - - morpheus-graphql-code-gen-utils - - morpheus-graphql-server - - morpheus-graphql-subscriptions + - morloc - morphisms-functors-inventory - - mortred + - mosaico-lib - motor-diagrams - - motor-reflection - mp - mp3decoder - mpdmate @@ -2738,9 +2810,14 @@ dont-distribute-packages: - mptcp-pm - mptcpanalyzer - msgpack-aeson + - msgpack-arbitrary + - msgpack-binary - msgpack-idl + - msgpack-persist - msgpack-rpc - msgpack-rpc-conduit + - msgpack-testsuite + - msi-kb-backlit - mu-avro - mu-graphql - mu-grpc-client @@ -2761,11 +2838,14 @@ dont-distribute-packages: - multihash-serialise - multilinear-io - multiplicity + - multipool-persistent + - multipool-persistent-postgresql + - multipool-postgresql-simple - multirec-alt-deriver - multirec-binary - multisetrewrite + - multivariant - murder - - murmur - murmurhash3 - mushu - music-graphics @@ -2786,19 +2866,20 @@ dont-distribute-packages: - mxnet-examples - mxnet-nn - myTestlll + - mybitcoin-sci - mysnapsession-example - mysql-haskell - mysql-haskell-nem - mysql-haskell-openssl - mysql-simple-typed - - mywork + - mywatch - n2o-web - nakadi-client - named-servant-client - named-servant-server + - named-text - nats-queue - natural-number - - neko-obfs - nemesis-titan - nerf - nero-wai @@ -2808,10 +2889,13 @@ dont-distribute-packages: - net-spider-pangraph - net-spider-rpl - net-spider-rpl-cli + - netcore + - netlib-comfort-array - netlines - netstring-enumerator - nettle-frp - nettle-netkit + - nettle-openflow - network-anonymous-i2p - network-anonymous-tor - network-connection @@ -2827,22 +2911,24 @@ dont-distribute-packages: - network-uri-json - network-websocket - neural + - neuron - newsletter-mailgun - newsynth - - ngrams-loader - ngx-export-tools-extra - nikepub - nirum - nix-thunk - nkjp - nlp-scores-scripts + - nom - nomyx-api - nomyx-core - nomyx-language - nomyx-library - nomyx-server - nonlinear-optimization-backprop - - notmuch-haskell + - not-gloss + - not-gloss-examples - notmuch-web - now-haskell - nri-env-parser @@ -2852,6 +2938,8 @@ dont-distribute-packages: - nri-postgresql - nri-redis - nri-test-encoding + - numerals-base + - numeric-ode - numerical - numhask-hedgehog - numhask-range @@ -2860,9 +2948,8 @@ dont-distribute-packages: - nyan-interpolation - nyan-interpolation-simple - nymphaea - - oanda-rest-api - oath - - obd + - oauth2-jwt-bearer - obdd - oberon0 - obj @@ -2874,22 +2961,29 @@ dont-distribute-packages: - oculus - odd-jobs - off-simple - - ohloh-hs + - ogma-cli + - ogma-core + - ogma-language-fret-cs + - ogma-language-fret-reqs - ois-input-manager - olwrapper + - om-fork + - om-http - om-kubernetes - om-legion + - om-logging + - om-socket - online - online-csv - opc-xml-da-client - open-adt-tutorial - - open-witness - - openai-hs - - openapi3-code-generator - opencv-extra + - openpgp - openpgp-Crypto - openpgp-crypto-api - openssh-github-keys + - opentelemetry-lightstep + - opentok - oplang - optima-for-hasql - optimal-blocks @@ -2898,11 +2992,10 @@ dont-distribute-packages: - orchid - orchid-demo - order-maintenance - - orgmode-parse - orgstat - osm-download - otp-authenticator - - overload + - outsort - package-o-tron - padKONTROL - pairing @@ -2918,6 +3011,7 @@ dont-distribute-packages: - papa-lens - papa-semigroupoids - paprika + - parallel-tree-search - parameterized - parco-attoparsec - parco-parsec @@ -2926,9 +3020,8 @@ dont-distribute-packages: - parse-help - parsestar - parsley + - parsley-core - parsley-garnish - - partial-lens - - partial-semigroup-test - passman-cli - patch-image - patterns @@ -2936,12 +3029,15 @@ dont-distribute-packages: - pcapng - pcf - pdf-slave + - pdfname + - pdfsplit - peakachu - pec - pell - penny - penny-bin - penny-lib + - penrose - peparser - perdure - perf-analysis @@ -2956,25 +3052,21 @@ dont-distribute-packages: - persistent-audit - persistent-hssqlppp - persistent-map - - persistent-mtl_0_5_0_0 + - persistent-mtl - persistent-mysql-haskell + - persistent-protobuf - persistent-relational-record - persona-idp - peyotls - peyotls-codec - pg-entity - - pgsql-simple - phonetic-languages-common - phonetic-languages-constraints - phonetic-languages-examples - phonetic-languages-general - phonetic-languages-permutations - - phonetic-languages-phonetics-basics - phonetic-languages-properties - phonetic-languages-simplified-common - - phonetic-languages-simplified-generalized-examples-array - - phonetic-languages-simplified-generalized-examples-common - - phonetic-languages-simplified-generalized-properties-array - phonetic-languages-simplified-lists-examples - phonetic-languages-simplified-properties-lists - phonetic-languages-simplified-properties-lists-double @@ -2986,6 +3078,7 @@ dont-distribute-packages: - pinpon - pipe-enumerator - pipes-attoparsec-streaming + - pipes-bzip - pipes-cacophony - pipes-cereal-plus - pipes-conduit @@ -2996,16 +3089,15 @@ dont-distribute-packages: - pipes-illumina - pipes-key-value-csv - pipes-misc - - pipes-network-tls - pipes-p2p - pipes-p2p-examples - pisigma - pitchtrack - pkgtreediff - - pkgtreediff_0_6_0 - planet-mitchell - playlists-http - plocketed + - plow-log-async - plugins-auto - png-file - pngload @@ -3013,10 +3105,18 @@ dont-distribute-packages: - point-octree - pointless-lenses - pointless-rewrite - - poke + - poker - polh-lexicon - polydata + - polysemy-RandomFu + - polysemy-conc - polysemy-http + - polysemy-log + - polysemy-log-co + - polysemy-log-di + - polysemy-methodology-composite + - polysemy-process + - polysemy-scoped-fs - polyseq - polytypeable-utils - pomodoro @@ -3025,16 +3125,16 @@ dont-distribute-packages: - porcupine-core - porcupine-http - porcupine-s3 - - portray-diff-hunit - - portray-diff-quickcheck - ports - poseidon - poseidon-postgis + - postgresql-common-persistent - postgresql-pure - postgresql-simple-ltree - postgresql-simple-queue - postgresql-simple-typed - postgresql-tx-query + - postgresql-tx-squeal - postgresql-tx-squeal-compat-simple - postmark - potoki @@ -3053,26 +3153,23 @@ dont-distribute-packages: - presto-hdbc - preview - primal-memory + - primitive-containers - primula-board - primula-bot - proc - process-iterio - process-progress - process-qq - - process-sequential - process-streaming - procrastinating-structure - producer - product - prof2dot - progressbar - - project-forge - - project-m36 - prolog-graph - prolog-graph-lib - prologue - prolude - - prometheus-effect - propane - proplang - prosidyc @@ -3080,12 +3177,14 @@ dont-distribute-packages: - proto3-suite - proto3-wire - protobuf-native + - protocol-buffers-descriptor - protocol-buffers-descriptor-fork - proton - psql - ptera - ptera-core - ptera-th + - pubsub - puffytools - pugs-compat - pugs-hsregex @@ -3096,7 +3195,6 @@ dont-distribute-packages: - purescript-iso - pursuit-client - push-notify - - push-notify-apn - push-notify-ccs - push-notify-general - puzzle-draw-cmdline @@ -3104,25 +3202,27 @@ dont-distribute-packages: - qd-vec - qhs - qhull + - qnap-decrypt - qr-repa + - qtah-cpp-qt5 - qtah-examples + - qtah-generator - qtah-qt5 + - quantfin - quantum-random + - qudb - queryparser - queryparser-demo - queryparser-hive - queryparser-presto - queryparser-vertica - - queue-sheet - queuelike - - quickbooks - - quickcheck-combinators + - quickbench - quickcheck-poly - quickcheck-regex - quickcheck-relaxng - quickcheck-state-machine - quickcheck-state-machine-distributed - - quickcheck-webdriver - quicktest - quipper - quipper-algorithms @@ -3150,12 +3250,13 @@ dont-distribute-packages: - rainbow-tests - raketka - rallod + - randfile - random-access-file - random-class - random-effin + - random-extras - random-hypergeometric - range-space - - ranged-list - rasa - rasa-example-config - rasa-ext-bufs @@ -3169,7 +3270,6 @@ dont-distribute-packages: - rasa-ext-views - rasa-ext-vim - rascal - - rating-chgk-info - raw-feldspar - rawr - razom-text-util @@ -3194,14 +3294,18 @@ dont-distribute-packages: - record-preprocessor - record-syntax - records-th + - recursion-schemes-ix - redHandlers - reddit + - redis-io + - rediscaching-haxl - reduce-equations - refh - reflex-animation - reflex-backend-wai - reflex-dom-colonnade - reflex-dynamic-containers + - reflex-gadt-api - reflex-ghci - reflex-gloss-scene - reflex-localize @@ -3209,7 +3313,6 @@ dont-distribute-packages: - reflex-monad-auth - reflex-process - refractor - - refurb - reg-alloc-graph-color - regex-deriv - regex-genex @@ -3223,10 +3326,14 @@ dont-distribute-packages: - regions-monadstf - regions-mtl - registry-aeson + - registry-aeson_0_3_0_0 - registry-hedgehog - registry-hedgehog-aeson + - registry-hedgehog-aeson_0_3_0_0 + - registry-hedgehog_0_8_0_0 - registry-messagepack - registry-options + - registry-options_0_2_0_0 - regular-extras - regular-web - regular-xmlpickler @@ -3245,6 +3352,7 @@ dont-distribute-packages: - remotion - repa-array - repa-convert + - repa-fftw - repa-flow - repa-plugin - repa-stream @@ -3252,8 +3360,9 @@ dont-distribute-packages: - replicant - repr - representable-tries + - reserve - resin - - resource-pool-catchio + - resistor-cube - resource-simple - rest-client - rest-core @@ -3267,6 +3376,9 @@ dont-distribute-packages: - restful-snap - restricted-workers - rethinkdb-model + - rethinkdb-wereHamster + - retroclash-lib + - retroclash-sim - rewrite - rewriting - rezoom @@ -3275,7 +3387,10 @@ dont-distribute-packages: - rfc-psql - rfc-redis - rfc-servant + - rhine-gloss + - rhine-terminal - rhythm-game-tutorial + - rib - ribosome - ribosome-app - ribosome-host @@ -3321,7 +3436,6 @@ dont-distribute-packages: - ruler - ruler-core - runtime-arbitrary - - runtime-instances - rv - s-expression - safe-coloured-text-gen @@ -3334,6 +3448,8 @@ dont-distribute-packages: - safer-file-handles-text - sai-shape-syb - sak + - salak-toml + - salak-yaml - saltine-quickcheck - salvia - salvia-demo @@ -3344,7 +3460,6 @@ dont-distribute-packages: - samtools-conduit - samtools-enumerator - samtools-iteratee - - sandwich-webdriver - sarsi - sasl - sat-micro-hs @@ -3352,6 +3467,7 @@ dont-distribute-packages: - satchmo-funsat - satchmo-toysat - sauron + - sbvPlugin - sc2-lowlevel - sc2-support - sc2hs @@ -3361,7 +3477,7 @@ dont-distribute-packages: - scalpel-search - scan-metadata - scan-vector-machine - - schedevr + - scgi - scheduling - schematic - scholdoc @@ -3373,16 +3489,25 @@ dont-distribute-packages: - scope-cairo - scotty-fay - scotty-hastache + - scotty-haxl - scp-streams - scrabble-bot - scrapbook - scroll + - sdp-binary + - sdp-deepseq + - sdp-hashable + - sdp-io + - sdp-quickcheck + - sdp4bytestring + - sdp4text + - sdp4unordered + - sdp4vector - seakale-postgresql - seakale-tests - secrm - sednaDBXML - seitz-symbol - - selda-postgresql - selenium-server - self-extract - semantic-source @@ -3391,7 +3516,6 @@ dont-distribute-packages: - semiring-num - sensenet - sentence-jp - - seonbi - seqaid - seqloc - seqloc-datafiles @@ -3411,14 +3535,12 @@ dont-distribute-packages: - servant-db-postgresql - servant-ede - servant-ekg - - servant-event-stream - servant-examples - - servant-http2-client - - servant-jquery - - servant-js + - servant-haxl-client - servant-matrix-param - servant-oauth2 - servant-oauth2-examples + - servant-openapi3 - servant-postgresql - servant-pushbullet-client - servant-rate-limit @@ -3428,8 +3550,10 @@ dont-distribute-packages: - servant-streaming-client - servant-streaming-docs - servant-streaming-server + - servant-streamly - servant-swagger-tags - servant-to-elm + - servant-util - servant-util-beam-pg - servant-waargonaut - servant-zeppelin-client @@ -3440,15 +3564,15 @@ dont-distribute-packages: - sgf - sgrep - sha1 + - shady-gen - shady-graphics - - shake-ats - shake-bindist - shake-minify-css + - shake-pack - shakebook - shaker - shapefile - shapely-data - - shapes-demo - sheets - shelduck - shellmate-extras @@ -3462,13 +3586,13 @@ dont-distribute-packages: - sigma-ij - signals - signature + - signify-hs - silvi - simgi - simple - simple-c-value - simple-firewire - simple-log-syslog - - simple-logging - simple-nix - simple-pascal - simple-postgresql-orm @@ -3483,30 +3607,32 @@ dont-distribute-packages: - skeletons - sketch-frp-copilot - skylark-client - - skylighting_0_13_1_1 - slate - - slidemews - slip32 - smallcheck-laws - smallcheck-lens - smallstring - smartword + - smash-aeson + - smash-lens + - smash-microlens + - smash-optics - smcdel - smith-cli - smith-client - smt + - smtlib-backends-process + - smtlib-backends-tests + - smtlib-backends-z3 - smtlib2-debug - smtlib2-pipe - smtlib2-quickcheck - smtlib2-timing - smtp2mta - - snap-auth-cli + - snap-blaze-clay - snap-elm - snap-extras - - snap-utils - snaplet-actionlog - - snaplet-auth-acid - - snaplet-coffee - snaplet-customauth - snaplet-fay - snaplet-hasql @@ -3514,19 +3640,19 @@ dont-distribute-packages: - snaplet-hdbc - snaplet-lss - snaplet-mongoDB - - snaplet-mysql-simple - snaplet-oauth - snaplet-postmark - - snaplet-recaptcha - snaplet-redson - snaplet-rest - snaplet-riak - snaplet-sedna - - snaplet-sqlite-simple-jwt-auth - snaplet-stripe - snaplet-tasks - snaplet-wordpress + - snappy-conduit + - snappy-framing - snappy-iteratee + - snappy-lazy - sndfile-enumerators - sneakyterm - sneathlane-haste @@ -3537,20 +3663,21 @@ dont-distribute-packages: - snowflake-server - sock2stream - socket-io - - sockets - - solana-staking-csvs + - socketson - solga-swagger - solr + - sonic-visualiser - souffle-dsl - - sounddelay - - soundgen + - sound-collage - source-code-server - - spade + - soxlib - sparkle - sparrow - sparsebit - sparser + - spartacon - spata + - spatial-math - specialize-th - spectral-clustering - speculation-transformers @@ -3560,19 +3687,28 @@ dont-distribute-packages: - sphinx-cli - spice - spike + - splines + - split-record - sprinkles + - sproxy + - sproxy-web + - sproxy2 - sql-simple-mysql - sql-simple-pool - sql-simple-postgresql - sql-simple-sqlite - - sqlite-easy - sqlite-simple-typed - sqsd-local + - squeal-postgresql + - squeal-postgresql-ltree + - squeal-postgresql-uuid-ossp + - sr-extra - sscgi - sshd-lint - sssp - sstable - stable-tree + - stack-hpc-coveralls - stack-network - stack-run-auto - stackage @@ -3592,20 +3728,27 @@ dont-distribute-packages: - statsd-client - statsdi - stern-brocot + - stm-actor + - stm-supply - stmcontrol + - storablevector-carray - storablevector-streamfusion - stratum-tool - stratux - stratux-demo - stratux-http - stratux-websockets + - streamed - streaming-fft - streaming-process + - streamly-posix - strelka + - strelka-wai + - strict-containers-lens + - strict-containers-serialise - strict-data - string-typelits - stripe-haskell - - stripe-hs - stripe-http-client - stripe-http-streams - stripe-tests @@ -3622,14 +3765,12 @@ dont-distribute-packages: - sugar-json - sugar-scheme - summoner-tui - - sump - sunroof-examples - sunroof-server - supercollider-ht - supercollider-midi - superconstraints - supernova - - supply-chain - sv - sv-cassava - sv-svfactor @@ -3638,7 +3779,6 @@ dont-distribute-packages: - swapper - sweet-egison - switch - - sydtest - sydtest-aeson - sydtest-amqp - sydtest-autodocodec @@ -3674,15 +3814,23 @@ dont-distribute-packages: - syntax-pretty - syntax-printer - syntaxnet-haskell + - synthesizer + - synthesizer-alsa + - synthesizer-core + - synthesizer-dimensional + - synthesizer-filter - synthesizer-llvm + - synthesizer-midi - sys-process - systemstats - t3-client - ta + - tableaux - tag-stream - tagged-list - tagged-th - tagsoup-navigate + - tagstew - tak-ai - tal - talash @@ -3694,33 +3842,35 @@ dont-distribute-packages: - task - task-distribution - tasty-bdd + - tasty-checklist - tasty-groundhog-converters - tasty-integrate - tasty-jenkins-xml - tasty-laws - tasty-lens - - tasty-sugar - tateti-tateti - tbox + - tcache-AWS - tccli - - tdd-util - tdlib - tdlib-gen - tdlib-types - - telega + - techlab - telegram-bot - telegram-raw-api + - temporal-csound - ten-lens - ten-unordered-containers - tensorflow-core-ops - tensorflow-logging - tensorflow-ops + - tensorflow-records + - tensorflow-records-conduit - terminal-text - terrahs - test-sandbox-compose - test-simple - testbench - - text-builder-dev_0_3_3 - text-json-qq - text-locale-encoding - text-plus @@ -3730,13 +3880,14 @@ dont-distribute-packages: - th-context - th-instances - th-typegraph - - theatre - theoremquest-client - thimk + - threaded + - threepenny-gui-flexbox - thumbnail-polish - tic-tac-toe - tickle - - tidal-serial + - tiger - tighttp - timberc - time-exts @@ -3747,7 +3898,7 @@ dont-distribute-packages: - timeseries - timezone-unix - tinkoff-invest-sdk - - tinyMesh + - tintin - tip-haskell-frontend - tip-lib - titan @@ -3773,7 +3924,6 @@ dont-distribute-packages: - too-many-cells - top - topaz - - topkata - total-map - toxcore - toxcore-c @@ -3803,15 +3953,15 @@ dont-distribute-packages: - trek-app - trek-db - triangulation - - tries - trimpolya - - truelevel - trurl - tsession-happstack - tsweb - tuntap-simple - tup-functor + - tuple-append-instances - tuple-ops + - turingMachine - tweet-hs - twentefp-eventloop-graphics - twentefp-eventloop-trees @@ -3819,13 +3969,10 @@ dont-distribute-packages: - twentefp-rosetree - twentefp-trees - twentyseven - - twhs - twidge - twilight-stm - twill - - twitter-conduit - twitter-enumerator - - twitter-types-lens - txt - type-assertions - type-cache @@ -3840,9 +3987,10 @@ dont-distribute-packages: - type-sub-th - typed-admin - typed-encoding-encoding + - typed-spreadsheet - typed-streams + - typedflow - typelevel - - typelevel-rewrite-rules - typescript-docs - typson-beam - typson-esqueleto @@ -3856,9 +4004,7 @@ dont-distribute-packages: - uhc-util - ukrainian-phonetics-basic - unagi-bloomfilter - - unbeliever - unbound - - unfoldable-restricted - uni-events - uni-graphs - uni-htk @@ -3888,6 +4034,7 @@ dont-distribute-packages: - urembed - uri-enumerator - uri-enumerator-file + - urlpath - usb - usb-enumerator - usb-hid @@ -3903,6 +4050,7 @@ dont-distribute-packages: - uu-cco-hut-parsing - uu-cco-uu-parsinglib - uu-options + - uuagc - uuid-crypto - uvector-algorithms - v4l2 @@ -3916,20 +4064,27 @@ dont-distribute-packages: - variable-precision - vault-tool-server - vault-trans + - vaultaire-common - vcache-trie - vcard - vcsgui - vect-floating-accelerate - vector-instances-collections - vector-text + - vectortiles - venzone - verdict-json - verifiable-expressions + - verismith + - versioning-servant - vessel - vflow-types + - vformat-aeson + - vformat-time - vfr-waypoints - vigilance - vimeta + - vinyl-generics - vinyl-operational - vision - visual-graphrewrite @@ -3938,25 +4093,34 @@ dont-distribute-packages: - vocoder-conduit - vocoder-dunai - voicebase + - vorbiscomment - vpq - vty-ui-extras - waargonaut - wahsp - wai-devel - wai-dispatch + - wai-frontend-monadcgi - wai-handler-snap - wai-hastache + - wai-log - wai-middleware-brotli - wai-middleware-cache - wai-middleware-cache-redis - wai-middleware-consul + - wai-middleware-content-type - wai-middleware-rollbar - wai-middleware-route - wai-middleware-throttle + - wai-middleware-verbs + - wai-route - wai-routing + - wai-session-alt - wai-session-tokyocabinet - wai-thrift + - wai-transformers - waldo + - warp-grpc - warped - wavesurfer - wavy @@ -3964,6 +4128,7 @@ dont-distribute-packages: - web-inv-route - web-mongrel2 - web-page + - web-rep - web-routes-regular - web-routing - web3 @@ -3973,10 +4138,15 @@ dont-distribute-packages: - web3-polkadot - web3-provider - web3-solidity + - webcloud - webcrank-wai - - webdriver-angular - webdriver-w3c + - webgear-openapi + - webify - webserver + - websockets-rpc + - websockets-simple + - websockets-simple-extra - weighted - werewolf-slack - wgpu-hs @@ -3985,8 +4155,10 @@ dont-distribute-packages: - wheb-redis - wheb-strapped - whitespace + - wholepixels - wikipedia4epub - winio + - wire-streams - wl-pprint-ansiterm - wl-pprint-terminfo - wlc-hs @@ -4001,8 +4173,10 @@ dont-distribute-packages: - wrecker-ui - wright - writer-cps-full + - wsjtx-udp - wtk-gtk - wu-wei + - wuerfelschlange - wumpus-basic - wumpus-drawing - wumpus-microprint @@ -4039,6 +4213,8 @@ dont-distribute-packages: - xournal-convert - xournal-parser - xournal-render + - xournal-types + - xrefcheck - xtc - yajl-enumerator - yam @@ -4054,13 +4230,13 @@ dont-distribute-packages: - yaml-rpc-scotty - yaml-rpc-snap - yarr-image-io + - yasi - yavie - ycextra - yeamer - yeshql - yesod-articles - yesod-auth-ldap - - yesod-auth-lti13 - yesod-colonnade - yesod-continuations - yesod-examples @@ -4077,7 +4253,9 @@ dont-distribute-packages: - yesod-worker - yi - yi-contrib + - yi-core - yi-dynamic-configuration + - yi-emacs-colours - yi-frontend-pango - yi-frontend-vty - yi-fuzzy-open @@ -4101,8 +4279,8 @@ dont-distribute-packages: - yuuko - zasni-gerna - zephyr-copilot + - zerobin - zeromq3-conduit - - zeromq3-haskell - zeroth - zifter-cabal - zifter-git @@ -4114,6 +4292,7 @@ dont-distribute-packages: - zippo - ziptastic-client - zlib-enum + - zm - zmcat - zoom-cache - zoom-cache-pcm diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index d37fd3f7e6a5..26d2e2aef4be 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -91,10 +91,6 @@ self: super: builtins.intersectAttrs super { ''; }) super.jni; - # The package doesn't know about the AL include hierarchy. - # https://github.com/phaazon/al/issues/1 - al = appendConfigureFlag "--extra-include-dirs=${pkgs.openal}/include/AL" super.al; - # Won't find it's header files without help. sfml-audio = appendConfigureFlag "--extra-include-dirs=${pkgs.openal}/include/AL" super.sfml-audio; @@ -119,29 +115,13 @@ self: super: builtins.intersectAttrs super { ]; }) super.arbtt; - hzk = overrideCabal (drv: { - preConfigure = "sed -i -e /include-dirs/d hzk.cabal"; - configureFlags = [ "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper" ]; - }) super.hzk; - - haskakafka = overrideCabal (drv: { - preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d haskakafka.cabal"; - configureFlags = [ "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka" ]; - }) super.haskakafka; - - # library has hard coded directories that need to be removed. Reported upstream here https://github.com/haskell-works/hw-kafka-client/issues/32 - hw-kafka-client = dontCheck (overrideCabal (drv: { - preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d -e /librdkafka/d hw-kafka-client.cabal"; - configureFlags = [ "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka" ]; - }) super.hw-kafka-client); + hzk = appendConfigureFlag "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper" super.hzk; # Foreign dependency name clashes with another Haskell package. libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; }; # Heist's test suite requires system pandoc - heist = overrideCabal (drv: { - testToolDepends = [pkgs.pandoc]; - }) super.heist; + heist = addTestToolDepend pkgs.pandoc super.heist; # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216 gio = disableHardening ["fortify"] (addPkgconfigDepend pkgs.glib (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools super.gio)); @@ -326,30 +306,16 @@ self: super: builtins.intersectAttrs super { greenclip = addExtraLibrary pkgs.xorg.libXdmcp super.greenclip; # The cabal files for these libraries do not list the required system dependencies. - libjwt-typed = overrideCabal (drv: { - librarySystemDepends = [ pkgs.libjwt ]; - }) super.libjwt-typed; - miniball = overrideCabal (drv: { - librarySystemDepends = [ pkgs.miniball ]; - }) super.miniball; - SDL-image = overrideCabal (drv: { - librarySystemDepends = [ pkgs.SDL pkgs.SDL_image ] ++ drv.librarySystemDepends or []; - }) super.SDL-image; - SDL-ttf = overrideCabal (drv: { - librarySystemDepends = [ pkgs.SDL pkgs.SDL_ttf ]; - }) super.SDL-ttf; - SDL-mixer = overrideCabal (drv: { - librarySystemDepends = [ pkgs.SDL pkgs.SDL_mixer ]; - }) super.SDL-mixer; - SDL-gfx = overrideCabal (drv: { - librarySystemDepends = [ pkgs.SDL pkgs.SDL_gfx ]; - }) super.SDL-gfx; - SDL-mpeg = overrideCabal (drv: { - configureFlags = (drv.configureFlags or []) ++ [ - "--extra-lib-dirs=${pkgs.smpeg}/lib" - "--extra-include-dirs=${pkgs.smpeg}/include/smpeg" - ]; - }) super.SDL-mpeg; + libjwt-typed = addExtraLibrary pkgs.libjwt super.libjwt-typed; + miniball = addExtraLibrary pkgs.miniball super.miniball; + SDL-image = addExtraLibrary pkgs.SDL super.SDL-image; + SDL-ttf = addExtraLibrary pkgs.SDL super.SDL-ttf; + SDL-mixer = addExtraLibrary pkgs.SDL super.SDL-mixer; + SDL-gfx = addExtraLibrary pkgs.SDL super.SDL-gfx; + SDL-mpeg = appendConfigureFlags [ + "--extra-lib-dirs=${pkgs.smpeg}/lib" + "--extra-include-dirs=${pkgs.smpeg.dev}/include/smpeg" + ] super.SDL-mpeg; # https://github.com/ivanperez-keera/hcwiid/pull/4 hcwiid = overrideCabal (drv: { @@ -383,9 +349,7 @@ self: super: builtins.intersectAttrs super { }) super.fltkhs; # https://github.com/skogsbaer/hscurses/pull/26 - hscurses = overrideCabal (drv: { - librarySystemDepends = (drv.librarySystemDepends or []) ++ [ pkgs.ncurses ]; - }) super.hscurses; + hscurses = addExtraLibrary pkgs.ncurses super.hscurses; # Looks like Avahi provides the missing library dnssd = super.dnssd.override { dns_sd = pkgs.avahi.override { withLibdnssdCompat = true; }; }; @@ -395,6 +359,24 @@ self: super: builtins.intersectAttrs super { preCheck = ''export PATH="$PWD/dist/build/ghcide:$PATH"''; }) super.ghcide; + # At least on 1.3.4 version on 32-bit architectures tasty requires + # unbounded-delays via .cabal file conditions. + tasty = overrideCabal (drv: { + libraryHaskellDepends = + (drv.libraryHaskellDepends or []) + ++ lib.optionals (!(pkgs.stdenv.hostPlatform.isAarch64 + || pkgs.stdenv.hostPlatform.isx86_64)) [ + self.unbounded-delays + ]; + }) super.tasty; + + tasty-discover = overrideCabal (drv: { + # Depends on itself for testing + preBuild = '' + export PATH="$PWD/dist/build/tasty-discover:$PATH" + '' + (drv.preBuild or ""); + }) super.tasty-discover; + # GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for # it to find `libglut.so` from the nix store. We do this by patching GLUT.cabal to pkg-config # depend on freeglut, which provides GHC to necessary information to generate a correct RPATH. @@ -407,9 +389,7 @@ self: super: builtins.intersectAttrs super { # so disable this on Darwin only ${if pkgs.stdenv.isDarwin then null else "GLUT"} = addPkgconfigDepend pkgs.freeglut (appendPatch ./patches/GLUT.patch super.GLUT); - libsystemd-journal = overrideCabal (old: { - librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ]; - }) super.libsystemd-journal; + libsystemd-journal = doJailbreak (addExtraLibrary pkgs.systemd super.libsystemd-journal); # does not specify tests in cabal file, instead has custom runTest cabal hook, # so cabal2nix will not detect test dependencies. @@ -529,11 +509,11 @@ self: super: builtins.intersectAttrs super { sed -i -e 's|"bitwuzla"|"${pkgs.bitwuzla}/bin/bitwuzla"|' Data/SBV/Provers/Bitwuzla.hs sed -i -e 's|"boolector"|"${pkgs.boolector}/bin/boolector"|' Data/SBV/Provers/Boolector.hs sed -i -e 's|"cvc4"|"${pkgs.cvc4}/bin/cvc4"|' Data/SBV/Provers/CVC4.hs + sed -i -e 's|"cvc5"|"${pkgs.cvc5}/bin/cvc5"|' Data/SBV/Provers/CVC5.hs sed -i -e 's|"yices-smt2"|"${pkgs.yices}/bin/yices-smt2"|' Data/SBV/Provers/Yices.hs sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs # Solvers we don't provide are removed from tests - sed -i -e 's|, cvc5||' SBVTestSuite/SBVConnectionTest.hs sed -i -e 's|, mathSAT||' SBVTestSuite/SBVConnectionTest.hs sed -i -e 's|, dReal||' SBVTestSuite/SBVConnectionTest.hs ''; @@ -668,7 +648,9 @@ self: super: builtins.intersectAttrs super { # Tests require network access. spagoWithoutChecks = dontCheck spagoOldAeson; in - spagoWithoutChecks; + # spago doesn't currently build with ghc92. Top-level spago is pulled from + # ghc90 and explicitly marked unbroken. + markBroken spagoWithoutChecks; # checks SQL statements at compile time, and so requires a running PostgreSQL # database to run it's test suite @@ -703,21 +685,6 @@ self: super: builtins.intersectAttrs super { aeson-gadt-th = disableCabalFlag "build-readme" (doJailbreak super.aeson-gadt-th); - neuron = overrideCabal (drv: { - # neuron expects the neuron-search script to be in PATH at built-time. - buildTools = [ pkgs.buildPackages.makeWrapper ]; - preConfigure = '' - mkdir -p $out/bin - cp src-bash/neuron-search $out/bin/neuron-search - chmod +x $out/bin/neuron-search - wrapProgram $out/bin/neuron-search --prefix 'PATH' ':' ${ - with pkgs; - lib.makeBinPath [ fzf ripgrep gawk bat findutils envsubst ] - } - PATH=$PATH:$out/bin - ''; - }) super.neuron; - # Fix compilation of Setup.hs by removing the module declaration. # See: https://github.com/tippenein/guid/issues/1 guid = overrideCabal (drv: { @@ -734,21 +701,11 @@ self: super: builtins.intersectAttrs super { postgresql-libpq-notify = dontCheck super.postgresql-libpq-notify; postgresql-pure = dontCheck super.postgresql-pure; - retrie = overrideCabal (drv: { - testToolDepends = [ pkgs.git pkgs.mercurial ] ++ drv.testToolDepends or []; - }) super.retrie; + retrie = addTestToolDepends [pkgs.git pkgs.mercurial] super.retrie; + retrie_1_2_0_0 = addTestToolDepends [pkgs.git pkgs.mercurial] super.retrie_1_2_0_0; + retrie_1_2_1_1 = addTestToolDepends [pkgs.git pkgs.mercurial] super.retrie_1_2_1_1; - retrie_1_2_0_0 = overrideCabal (drv: { - testToolDepends = [ pkgs.git pkgs.mercurial ] ++ drv.testToolDepends or []; - }) super.retrie_1_2_0_0; - - haskell-language-server = let - # This wrapper will be included in the sdist in the next release, then we can remove this custom fetch. - abi-compat-check-wrapper = assert super.haskell-language-server.version == "1.8.0.0"; pkgs.fetchurl { - url = "https://raw.githubusercontent.com/haskell/haskell-language-server/c12379c57ab8f0abd606e9f397de54e508d024a0/bindist/wrapper.in"; - sha256 = "sha256-vHi6+s8/V4WJSCxIqjP+thumEpttokpCc+a823WEPPk="; - }; in - overrideCabal (drv: { + 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/. @@ -765,7 +722,7 @@ self: super: builtins.intersectAttrs super { -e "s/@@BOOT_PKGS@@/$BOOT_PKGS/" \ -e "s/@@ABI_HASHES@@/$(for dep in $BOOT_PKGS; do printf "%s:" "$dep" && ghc-pkg-${self.ghc.version} field $dep abi --simple-output ; done | tr '\n' ' ' | xargs)/" \ -e "s!Consider installing ghc.* via ghcup or build HLS from source.!Visit https://haskell4nix.readthedocs.io/nixpkgs-users-guide.html#how-to-install-haskell-language-server to learn how to correctly install a matching hls for your ghc with nix.!" \ - ${abi-compat-check-wrapper} > "$out/bin/haskell-language-server" + bindist/wrapper.in > "$out/bin/haskell-language-server" ln -s "$out/bin/haskell-language-server" "$out/bin/haskell-language-server-${self.ghc.version}" chmod +x "$out/bin/haskell-language-server" ''; @@ -777,10 +734,8 @@ self: super: builtins.intersectAttrs super { ''; }) super.haskell-language-server; - # NOTE: this patch updates the hevm code to work with the latest packages that broke the build - # it's temporary until hevm version 0.50.0 is released - https://github.com/ethereum/hevm/milestone/1 - # tests depend on a specific version of solc - hevm = dontCheck (appendPatch ./patches/hevm-update-deps.patch super.hevm); + # there are three very heavy test suites that need external repos, one requires network access + hevm = dontCheck super.hevm; # hadolint enables static linking by default in the cabal file, so we have to explicitly disable it. # https://github.com/hadolint/hadolint/commit/e1305042c62d52c2af4d77cdce5d62f6a0a3ce7b @@ -856,6 +811,14 @@ self: super: builtins.intersectAttrs super { # time random = dontCheck super.random; + # https://github.com/Gabriella439/nix-diff/pull/74 + nix-diff = overrideCabal (drv: { + postPatch = '' + substituteInPlace src/Nix/Diff/Types.hs \ + --replace "{-# OPTIONS_GHC -Wno-orphans #-}" "{-# OPTIONS_GHC -Wno-orphans -fconstraint-solver-iterations=0 #-}" + ''; + }) (doJailbreak (dontCheck super.nix-diff)); + # mockery's tests depend on hspec-discover which dependso on mockery for its tests mockery = dontCheck super.mockery; # same for logging-facade @@ -896,7 +859,11 @@ self: super: builtins.intersectAttrs super { buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ]; postInstall = drv.postInstall or "" + '' wrapProgram "$out/bin/nvfetcher" --prefix 'PATH' ':' "${ - pkgs.lib.makeBinPath [ pkgs.nvchecker pkgs.nix-prefetch ] + pkgs.lib.makeBinPath [ + pkgs.nvchecker + pkgs.nix-prefetch + pkgs.nix-prefetch-docker + ] }" ''; }) super.nvfetcher); @@ -907,14 +874,17 @@ self: super: builtins.intersectAttrs super { (overrideCabal { doCheck = pkgs.postgresql.doCheck; }) ]; - cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] (super.cachix.override { nix = pkgs.nixVersions.nix_2_9; }); + cachix = super.cachix.override { + nix = self.hercules-ci-cnix-store.passthru.nixPackage; + fsnotify = dontCheck super.fsnotify_0_4_1_0; + hnix-store-core = super.hnix-store-core_0_6_1_0; + }; - hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_9; }; - hercules-ci-cnix-expr = - addTestToolDepend pkgs.git ( - super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_9; } - ); - hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_9; }; + hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }; + hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }); + hercules-ci-cnix-store = (super.hercules-ci-cnix-store.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }).overrideAttrs (_: { + passthru.nixPackage = pkgs.nixVersions.nix_2_12; + }); # the testsuite fails because of not finding tsc without some help aeson-typescript = overrideCabal (drv: { @@ -989,11 +959,18 @@ self: super: builtins.intersectAttrs super { }) super.procex; # Test suite wants to run main executable - fourmolu_0_9_0_0 = overrideCabal (drv: { + fourmolu = overrideCabal (drv: { preCheck = drv.preCheck or "" + '' export PATH="$PWD/dist/build/fourmolu:$PATH" ''; - }) super.fourmolu_0_9_0_0; + }) super.fourmolu; + + # Test suite wants to run main executable + fourmolu_0_10_1_0 = overrideCabal (drv: { + preCheck = drv.preCheck or "" + '' + export PATH="$PWD/dist/build/fourmolu:$PATH" + ''; + }) super.fourmolu_0_10_1_0; # Test suite needs to execute 'disco' binary disco = overrideCabal (drv: { @@ -1059,12 +1036,11 @@ self: super: builtins.intersectAttrs super { # Tests assume dist-newstyle build directory is present cabal-hoogle = dontCheck super.cabal-hoogle; - nfc = overrideCabal (drv: { - isExecutable = true; - executableHaskellDepends = with self; drv.executableHaskellDepends or [] ++ [ base base16-bytestring bytestring ]; - configureFlags = drv.configureFlags or [] ++ [ "-fbuild-examples" ]; - enableSeparateBinOutput = true; - }) super.nfc; + nfc = lib.pipe super.nfc [ + enableSeparateBinOutput + (addBuildDepend self.base16-bytestring) + (appendConfigureFlag "-fbuild-examples") + ]; # Wants to execute cabal-install to (re-)build itself hint = dontCheck super.hint; @@ -1136,17 +1112,22 @@ self: super: builtins.intersectAttrs super { hls-floskell-plugin hls-fourmolu-plugin hls-module-name-plugin - hls-pragmas-plugin hls-splice-plugin hls-refactor-plugin - hls-code-range-plugin - hls-explicit-fixity-plugin; + hls-cabal-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-gadt-plugin = dontCheck super.hls-gadt-plugin; + # https://github.com/haskell/haskell-language-server/pull/3431 + hls-cabal-fmt-plugin = dontCheck super.hls-cabal-fmt-plugin; + hls-code-range-plugin = dontCheck super.hls-code-range-plugin; + hls-explicit-record-fields-plugin = dontCheck super.hls-explicit-record-fields-plugin; + # Flaky tests + hls-explicit-fixity-plugin = dontCheck super.hls-explicit-fixity-plugin; hls-hlint-plugin = dontCheck super.hls-hlint-plugin; + hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin; hls-class-plugin = dontCheck super.hls-class-plugin; hls-rename-plugin = dontCheck super.hls-rename-plugin; hls-alternate-number-format-plugin = dontCheck super.hls-alternate-number-format-plugin; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index bf1f2c387ad9..4b7201bb6ac9 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -11,7 +11,12 @@ let in { pname -, dontStrip ? (ghc.isGhcjs or false) +# Note that ghc.isGhcjs != stdenv.hostPlatform.isGhcjs. +# ghc.isGhcjs implies that we are using ghcjs, a project separate from GHC. +# (mere) stdenv.hostPlatform.isGhcjs means that we are using GHC's JavaScript +# backend. The latter is a normal cross compilation backend and needs little +# special accomodation. +, dontStrip ? (ghc.isGhcjs or false || stdenv.hostPlatform.isGhcjs) , version, revision ? null , sha256 ? null , src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; } @@ -171,7 +176,7 @@ let # Pass the "wrong" C compiler rather than none at all so packages that just # use the C preproccessor still work, see # https://github.com/haskell/cabal/issues/6466 for details. - "--with-gcc=${(if stdenv.hasCC then stdenv else buildPackages.stdenv).cc.targetPrefix}cc" + "--with-gcc=${if stdenv.hasCC then "$CC" else "$CC_FOR_BUILD"}" ] ++ optionals stdenv.hasCC [ "--with-ld=${stdenv.cc.bintools.targetPrefix}ld" "--with-ar=${stdenv.cc.bintools.targetPrefix}ar" @@ -246,7 +251,10 @@ let allPkgconfigDepends = pkg-configDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends; - depsBuildBuild = [ nativeGhc ]; + depsBuildBuild = [ nativeGhc ] + # CC_FOR_BUILD may be necessary if we have no C preprocessor for the host + # platform. See crossCabalFlags above for more details. + ++ lib.optionals (!stdenv.hasCC) [ buildPackages.stdenv.cc ]; collectedToolDepends = buildTools ++ libraryToolDepends ++ executableToolDepends ++ optionals doCheck testToolDepends ++ @@ -316,7 +324,9 @@ stdenv.mkDerivation ({ inherit src; inherit depsBuildBuild nativeBuildInputs; - buildInputs = otherBuildInputs ++ optionals (!isLibrary) propagatedBuildInputs; + buildInputs = otherBuildInputs ++ optionals (!isLibrary) propagatedBuildInputs + # For patchShebangsAuto in fixupPhase + ++ optionals stdenv.hostPlatform.isGhcjs [ nodejs ]; propagatedBuildInputs = optionals isLibrary propagatedBuildInputs; LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase. diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 8b3020f88613..eae0337effc0 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -16,7 +16,9 @@ let # Add all dependencies in buildInputs including propagated ones to # STACK_IN_NIX_EXTRA_ARGS. - stackHook = makeSetupHook {} ./stack-hook.sh; + stackHook = makeSetupHook { + name = "stack-hook"; + } ./stack-hook.sh; in stdenv.mkDerivation (args // { diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b32900944af0..3fb5c3e88a3e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1,4 +1,4 @@ -/* hackage-packages.nix is an auto-generated file -- DO NOT EDIT! */ +/* hackage-packages.nix is auto-generated by hackage2nix -- DO NOT EDIT MANUALLY! */ { pkgs, lib, callPackage }: @@ -312,7 +312,6 @@ self: { description = "Efficient, high-level dynamic programming"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ADPfusionForest" = callPackage @@ -1306,27 +1305,25 @@ self: { }) {}; "BNFC" = callPackage - ({ mkDerivation, alex, array, base, Cabal, cabal-doctest - , containers, deepseq, directory, doctest, filepath, happy, hspec - , hspec-discover, HUnit, mtl, pretty, process, QuickCheck - , string-qq, temporary, time + ({ mkDerivation, alex, array, base, containers, deepseq, directory + , filepath, happy, hspec, hspec-discover, HUnit, mtl, pretty + , process, QuickCheck, string-qq, temporary, time, transformers }: mkDerivation { pname = "BNFC"; - version = "2.9.4"; - sha256 = "1gy7ggrf2zikyfi8anlj2zavs5b99z7rzs1lmyflrjd82a31bmzp"; + version = "2.9.4.1"; + sha256 = "0l3jw86b14jfrd4phjkhpl9qq8im3lnbbhhadmivdr1k2sf614sy"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base containers deepseq directory filepath mtl pretty process - string-qq time + string-qq time transformers ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - array base containers deepseq directory doctest filepath hspec - HUnit mtl pretty process QuickCheck string-qq temporary time + array base containers deepseq directory filepath hspec HUnit mtl + pretty process QuickCheck string-qq temporary time ]; testToolDepends = [ alex happy hspec-discover ]; description = "A compiler front-end generator"; @@ -1644,7 +1641,6 @@ self: { description = "BLAST-related tools"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BiobaseDotP" = callPackage @@ -1679,6 +1675,7 @@ self: { ]; description = "European Nucleotide Archive data"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "BiobaseEnsembl" = callPackage @@ -1743,6 +1740,7 @@ self: { ]; description = "streaming FASTA parser"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "fastaextract"; }) {}; @@ -1904,7 +1902,6 @@ self: { description = "Import Turner RNA parameters"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BiobaseTypes" = callPackage @@ -1938,6 +1935,7 @@ self: { ]; description = "Collection of types for bioinformatics"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "BiobaseVienna" = callPackage @@ -1995,6 +1993,7 @@ self: { ]; description = "Efficient RNA/DNA/Protein Primary/Secondary Structure"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "SubOptDistance"; }) {}; @@ -2069,8 +2068,8 @@ self: { }: mkDerivation { pname = "Blammo"; - version = "1.1.1.0"; - sha256 = "1hqrdzj30lwwb7zis2hkfz887jh107k33mbqkj2hxvd56sc4din5"; + version = "1.1.1.1"; + sha256 = "1qms459jmikx2dxsl6znn8scb6293s4zprz419da5s71lkiql7cp"; libraryHaskellDepends = [ aeson base bytestring case-insensitive clock containers dlist envparse exceptions fast-logger http-types lens monad-logger-aeson @@ -2083,8 +2082,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Batteries-included Structured Logging library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "BlastHTTP" = callPackage @@ -2150,7 +2147,9 @@ self: { executableHaskellDepends = [ base cmdargs ]; description = "A tool for posting Haskelly articles to blogs"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "BlogLiterately"; + broken = true; }) {}; "BlogLiterately-diagrams" = callPackage @@ -2629,7 +2628,6 @@ self: { description = "Firing rules semantic of CSPM"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "CSPM-Frontend" = callPackage @@ -2969,8 +2967,8 @@ self: { pname = "Cabal-syntax"; version = "3.8.1.0"; sha256 = "03yfk3b2sjmqpxmvx3mj185nifiaqapvc8hmbx4825z0kyqxvs07"; - revision = "1"; - editedCabalFile = "0rmrcjpm169acfranqq04ach5g3jv7v6g45yzpwcp3ksk9g7cdj9"; + revision = "2"; + editedCabalFile = "1bzwjxj5mrsxxcgrfgisamx3f3ymz5bz085k6p83s7djh39ayaxx"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath mtl parsec pretty text time transformers unix @@ -3130,6 +3128,8 @@ self: { libraryHaskellDepends = [ base free mmorph mtl transformers-base ]; description = "Generalized stream processors"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Chart" = callPackage @@ -4326,6 +4326,7 @@ self: { ]; description = "Deterministic random bit generator (aka RNG, PRNG) based HMACs, Hashes, and Ciphers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "DSA" = callPackage @@ -4350,7 +4351,6 @@ self: { description = "Implementation of DSA, based on the description of FIPS 186-4"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "DSH" = callPackage @@ -4557,14 +4557,12 @@ self: { }: mkDerivation { pname = "DataVersion"; - version = "0.1.0.0"; - sha256 = "13cw7rzp510spn5ncxdqyzz66d9dnyq7s650zmpmjx2cg456zw9x"; + version = "0.1.0.1"; + sha256 = "051fmlydjqhp67b1ivb7rhaz1vwya6g6r6akwwms1lkhl6d95yda"; libraryHaskellDepends = [ base generic-lens microlens ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Type safe data migrations"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Deadpan-DDP" = callPackage @@ -4648,6 +4646,7 @@ self: { libraryHaskellDepends = [ base haskell-src mtl TypeCompose ]; description = "Arrows for \"deep application\""; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "DeepDarkFantasy" = callPackage @@ -5351,8 +5350,6 @@ self: { libraryHaskellDepends = [ base mtl ]; description = "A library of efficient, purely-functional data structures (API)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "EdisonCore" = callPackage @@ -5368,7 +5365,6 @@ self: { ]; description = "A library of efficient, purely-functional data structures (Core Implementations)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "EditTimeReport" = callPackage @@ -5810,7 +5806,6 @@ self: { description = "A grab bag of modules"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "FAI" = callPackage @@ -5999,6 +5994,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "FailT" = callPackage + ({ mkDerivation, base, doctest, exceptions, hspec, mtl, QuickCheck + , quickcheck-classes, text + }: + mkDerivation { + pname = "FailT"; + version = "0.1.0.0"; + sha256 = "13ai9w5i3ay3v0skn32fllymnywd77zdr4lvf16k99lnimbzzm6y"; + revision = "2"; + editedCabalFile = "1cvw3icblydaid9w74dqaprsp8556zapr4ajw8qi8iw8y3kss891"; + libraryHaskellDepends = [ base exceptions mtl text ]; + testHaskellDepends = [ + base doctest exceptions hspec mtl QuickCheck quickcheck-classes + ]; + description = "A 'FailT' monad transformer that plays well with 'MonadFail'"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "FailureT" = callPackage ({ mkDerivation, base, base-unicode-symbols, mmtl }: mkDerivation { @@ -6175,7 +6190,6 @@ self: { ]; description = "Functions on System.FilePath"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "FileSystem" = callPackage @@ -7083,6 +7097,8 @@ self: { benchmarkHaskellDepends = [ base criterion lens ]; description = "Typesafe functional GPU graphics programming"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "GPipe-Examples" = callPackage @@ -7145,7 +7161,6 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "playground"; - broken = true; }) {}; "GPipe-TextureLoad" = callPackage @@ -7200,6 +7215,7 @@ self: { description = "Some kind of game library or set of utilities"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Ganymede" = callPackage @@ -7956,6 +7972,7 @@ self: { ]; description = "Gtk-based GUIs for Tangible Values"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "GuiHaskell" = callPackage @@ -8006,7 +8023,6 @@ self: { ]; description = "The Haskell/R mixed programming environment"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "H"; }) {}; @@ -8420,7 +8436,7 @@ self: { libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ fuse ]; preConfigure = '' - sed -i -e "s@ Extra-Lib-Dirs: /usr/local/lib@ Extra-Lib-Dirs: ${fuse}/lib@" HFuse.cabal + sed -i -e "s@ Extra-Lib-Dirs: /usr/local/lib@ Extra-Lib-Dirs: ${lib.getLib fuse}/lib@" HFuse.cabal ''; description = "HFuse is a binding for the Linux FUSE library"; license = lib.licenses.bsd3; @@ -9319,119 +9335,146 @@ self: { license = lib.licenses.mit; platforms = lib.platforms.x86; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) gsl;}; "HROOT" = callPackage - ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core - , HROOT-graf, HROOT-hist, HROOT-io, HROOT-math, HROOT-tree - , template-haskell + ({ mkDerivation, base, Cabal, HROOT-core, HROOT-graf, HROOT-hist + , HROOT-io, HROOT-math, HROOT-net, HROOT-tree, process }: mkDerivation { pname = "HROOT"; - version = "0.9.0.1"; - sha256 = "1mc3lhwjdrwv32hbl5q6j293gmifla9hk815sxayz35g3h9pg9p8"; + version = "0.10.0.2"; + sha256 = "1si50g4dhjphg1lqji8wlihgn1wnshsarhl5gjhc8107absddbmb"; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - base fficxx fficxx-runtime HROOT-core HROOT-graf HROOT-hist - HROOT-io HROOT-math HROOT-tree template-haskell + base HROOT-core HROOT-graf HROOT-hist HROOT-io HROOT-math HROOT-net + HROOT-tree ]; description = "Haskell binding to the ROOT data analysis framework"; - license = lib.licenses.lgpl21Only; + license = lib.licenses.lgpl21Plus; hydraPlatforms = lib.platforms.none; }) {}; "HROOT-core" = callPackage - ({ mkDerivation, base, fficxx, fficxx-runtime, template-haskell }: + ({ mkDerivation, base, Cabal, fficxx, fficxx-runtime, process + , stdcxx, template-haskell + }: mkDerivation { pname = "HROOT-core"; - version = "0.9.0.1"; - sha256 = "1qxadv3kdd0wn3vb6jk65h9qr1ihr775zsrn2pp2z1xhlj3d8g85"; + version = "0.10.0.2"; + sha256 = "0cis7fjm1lisn9ipfxk8dkxdxdr8kpfrfp21ac2y6chcappxxpjp"; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - base fficxx fficxx-runtime template-haskell + base fficxx fficxx-runtime stdcxx template-haskell ]; description = "Haskell binding to ROOT Core modules"; - license = lib.licenses.lgpl21Only; + license = lib.licenses.lgpl21Plus; hydraPlatforms = lib.platforms.none; broken = true; }) {}; "HROOT-graf" = callPackage - ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core - , HROOT-hist, template-haskell + ({ mkDerivation, base, Cabal, fficxx, fficxx-runtime, HROOT-core + , HROOT-hist, process, stdcxx, template-haskell }: mkDerivation { pname = "HROOT-graf"; - version = "0.9.0.1"; - sha256 = "1a1i7slarqz64k8v02m6lbrjay11xsr88i2siy8gygqshp6ncf4r"; + version = "0.10.0.2"; + sha256 = "0qfcqla07cz06xw09xdh5jnsixrrl5f4l1gxsf2cg2x2nl4yvpna"; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - base fficxx fficxx-runtime HROOT-core HROOT-hist template-haskell + base fficxx fficxx-runtime HROOT-core HROOT-hist stdcxx + template-haskell ]; description = "Haskell binding to ROOT Graf modules"; - license = lib.licenses.lgpl21Only; + license = lib.licenses.lgpl21Plus; hydraPlatforms = lib.platforms.none; }) {}; "HROOT-hist" = callPackage - ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core - , template-haskell + ({ mkDerivation, base, Cabal, fficxx, fficxx-runtime, HROOT-core + , process, stdcxx, template-haskell }: mkDerivation { pname = "HROOT-hist"; - version = "0.9.0.1"; - sha256 = "059hlsqn394hd3805hzrm85khvycwd9dnsbjrks9lmbr7sz13aad"; + version = "0.10.0.2"; + sha256 = "0xyh3xnjpfz0218jg0r67kl1frw9gf2m11bnjlaxvqlzfnrxgxr0"; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - base fficxx fficxx-runtime HROOT-core template-haskell + base fficxx fficxx-runtime HROOT-core stdcxx template-haskell ]; description = "Haskell binding to ROOT Hist modules"; - license = lib.licenses.lgpl21Only; + license = lib.licenses.lgpl21Plus; hydraPlatforms = lib.platforms.none; }) {}; "HROOT-io" = callPackage - ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core - , template-haskell + ({ mkDerivation, base, Cabal, fficxx, fficxx-runtime, HROOT-core + , process, stdcxx, template-haskell }: mkDerivation { pname = "HROOT-io"; - version = "0.9.0.1"; - sha256 = "0jx3ikypvynpd2mfyya86jqdmjl4i12fzvsmn66yksx32hgcksqw"; + version = "0.10.0.2"; + sha256 = "0h36jpc8ljwhk6rmv6i7i8mls0s0lcii3fdjaa23r9bbrl76jgk4"; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - base fficxx fficxx-runtime HROOT-core template-haskell + base fficxx fficxx-runtime HROOT-core stdcxx template-haskell ]; description = "Haskell binding to ROOT IO modules"; - license = lib.licenses.lgpl21Only; + license = lib.licenses.lgpl21Plus; hydraPlatforms = lib.platforms.none; }) {}; "HROOT-math" = callPackage - ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core - , template-haskell + ({ mkDerivation, base, Cabal, fficxx, fficxx-runtime, HROOT-core + , process, stdcxx, template-haskell }: mkDerivation { pname = "HROOT-math"; - version = "0.9.0.1"; - sha256 = "12cx3m67mdisi7k675gd4ifa2zmbhqywpgb1slacwzdjlqazhs96"; + version = "0.10.0.2"; + sha256 = "1sgj7lr0j7yik0x6fy6vfiv2qqw1b58yhm2z8fq765x3ypilj24m"; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - base fficxx fficxx-runtime HROOT-core template-haskell + base fficxx fficxx-runtime HROOT-core stdcxx template-haskell ]; description = "Haskell binding to ROOT Math modules"; - license = lib.licenses.lgpl21Only; + license = lib.licenses.lgpl21Plus; hydraPlatforms = lib.platforms.none; }) {}; + "HROOT-net" = callPackage + ({ mkDerivation, base, Cabal, fficxx, fficxx-runtime, HROOT-core + , HROOT-io, process, RHTTP, stdcxx, template-haskell + }: + mkDerivation { + pname = "HROOT-net"; + version = "0.10.0.2"; + sha256 = "1lw0zkb8wmd5raa1fbjaw5l3r6kvvll72vs4rmdjqmg0rld3hgnk"; + setupHaskellDepends = [ base Cabal process ]; + libraryHaskellDepends = [ + base fficxx fficxx-runtime HROOT-core HROOT-io stdcxx + template-haskell + ]; + librarySystemDepends = [ RHTTP ]; + description = "Haskell binding to ROOT Net modules"; + license = lib.licenses.lgpl21Plus; + hydraPlatforms = lib.platforms.none; + }) {RHTTP = null;}; + "HROOT-tree" = callPackage - ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core - , template-haskell + ({ mkDerivation, base, Cabal, fficxx, fficxx-runtime, HROOT-core + , process, stdcxx, template-haskell }: mkDerivation { pname = "HROOT-tree"; - version = "0.9.0.1"; - sha256 = "1whcigrfm0mmnkazby0ycgsz3x9182r00zwh569b0lbbg0m5qbj4"; + version = "0.10.0.2"; + sha256 = "1k5sfd9a02hgbxq9slsvaxw40l0i6nyvw0ihjs1v7lamsicd8b7y"; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - base fficxx fficxx-runtime HROOT-core template-haskell + base fficxx fficxx-runtime HROOT-core stdcxx template-haskell ]; description = "Haskell binding to ROOT Tree modules"; - license = lib.licenses.lgpl21Only; + license = lib.licenses.lgpl21Plus; hydraPlatforms = lib.platforms.none; }) {}; @@ -9571,8 +9614,6 @@ self: { testHaskellDepends = [ aeson attoparsec base HTF text ]; description = "Small template engine"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HSoM" = callPackage @@ -9618,8 +9659,8 @@ self: { pname = "HStringTemplate"; version = "0.8.8"; sha256 = "1n8ci0kzjcgnqh4dfpqwlh7mnlzyiqiqc6hc0zr65p0balbg8zbi"; - revision = "3"; - editedCabalFile = "0316jr5npssxxxj85x74vasvm2ib09mjv2jy7abwjs7cfqbpnr8w"; + revision = "4"; + editedCabalFile = "0sj82pzq2hcx3yjsljwgbr1kcdgwpgfmq0n0dhz3am8ckwir0slz"; libraryHaskellDepends = [ array base blaze-builder bytestring containers deepseq directory filepath mtl old-locale parsec pretty semigroups syb @@ -9695,28 +9736,6 @@ self: { }) {}; "HTTP" = callPackage - ({ mkDerivation, array, base, bytestring, deepseq, httpd-shed - , HUnit, mtl, network, network-uri, parsec, pureMD5, split - , test-framework, test-framework-hunit, time - }: - mkDerivation { - pname = "HTTP"; - version = "4000.3.16"; - sha256 = "0bgyj3ahqlyg0jw6qsm2sncp8mklc4h0dj91s043vb3ig01iq2fn"; - revision = "1"; - editedCabalFile = "0wagwgzfy2mqkha88fjl37ah0l7h4biz34v65993xd502ly68hk0"; - libraryHaskellDepends = [ - array base bytestring mtl network network-uri parsec time - ]; - testHaskellDepends = [ - base bytestring deepseq httpd-shed HUnit mtl network network-uri - pureMD5 split test-framework test-framework-hunit - ]; - description = "A library for client-side HTTP"; - license = lib.licenses.bsd3; - }) {}; - - "HTTP_4000_4_1" = callPackage ({ mkDerivation, array, base, bytestring, deepseq, httpd-shed , HUnit, mtl, network, network-uri, parsec, pureMD5, split , test-framework, test-framework-hunit, time, transformers @@ -9737,7 +9756,6 @@ self: { ]; description = "A library for client-side HTTP"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "HTTP-Simple" = callPackage @@ -9926,6 +9944,7 @@ self: { description = "An Haskell library to drive the french Minitel through a serial port"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "HaPy" = callPackage @@ -9986,8 +10005,8 @@ self: { }: mkDerivation { pname = "HaTeX"; - version = "3.22.3.1"; - sha256 = "0vgyixd8j3nzpy8s04cy3q7gj2gfblba2z0ppr58rdm8qgj16j5c"; + version = "3.22.3.2"; + sha256 = "1hxj661nkaylh46xrwddj8zm1gb64714yz7jk1afmy5n4yzsqdzj"; libraryHaskellDepends = [ base bibtex bytestring containers hashable matrix parsec prettyprinter QuickCheck text transformers @@ -10198,7 +10217,9 @@ self: { ]; description = "Yet another Hangman game"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hangman-ascii"; + broken = true; }) {}; "HappyTree" = callPackage @@ -10269,18 +10290,6 @@ self: { }) {}; "HasBigDecimal" = callPackage - ({ mkDerivation, base, hspec, QuickCheck }: - mkDerivation { - pname = "HasBigDecimal"; - version = "0.1.1"; - sha256 = "0ddyngd1mrx9s11nm7sh0nh76zi1zi7yjzmqk7xbpv6ijqka050a"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - description = "A library for arbitrary precision decimal numbers"; - license = lib.licenses.asl20; - }) {}; - - "HasBigDecimal_0_2_0_0" = callPackage ({ mkDerivation, base, criterion, hspec, hspec-discover, QuickCheck }: mkDerivation { @@ -10295,7 +10304,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A library for arbitrary precision decimal numbers"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "HasCacBDD" = callPackage @@ -10462,8 +10470,8 @@ self: { }: mkDerivation { pname = "HaskellNet"; - version = "0.6.0.1"; - sha256 = "08rwi28q46md2d25l1h6s6hdqf8c2c47is5w5vyydbqx6pmfdc73"; + version = "0.6.0.2"; + sha256 = "0lqdqch6qwfrf89hfmvvcna2wgvhzx02v0cwsm7bbhq258alfapj"; libraryHaskellDepends = [ array base base64 bytestring cryptohash-md5 mime-mail mtl network network-bsd old-time pretty text @@ -11138,10 +11146,8 @@ self: { ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.7.2"; - sha256 = "0ysdfl8ck3nzhx597fa13dqf31jq5gzwajlak6r91jajks9w0dl5"; - revision = "3"; - editedCabalFile = "0nsqxym87s48029laqba4nzwpk7nrk35x7wmpjqfnbrj82ddcshd"; + version = "0.11.7.4"; + sha256 = "0zxcfa8b0ng97v53vb8fvg2gss89b28xiz83rx38a0h4lsxpn2xf"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; @@ -11554,8 +11560,8 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.3.2"; - sha256 = "1nhgbrfwabnxgbjwjyksaazb08awlhf7m8w7dx3xhm32m1dkkm6f"; + version = "0.3.3"; + sha256 = "1zgkn998cm2h1fxkydvzb8lxsshlgimz9xa91w7vdpq67gf7rx90"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11710,6 +11716,7 @@ self: { ]; description = "Data interning (with compact regions where possible)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "Interpolation" = callPackage @@ -12146,7 +12153,9 @@ self: { testToolDepends = [ tasty-discover ]; description = "Blurhash is a very compact represenation of a placeholder for an image"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "JuicyPixels-blurhash-exe"; + broken = true; }) {}; "JuicyPixels-canvas" = callPackage @@ -12211,6 +12220,7 @@ self: { ]; description = "Scale JuicyPixels images with DCT"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "JuicyPixels-stbir" = callPackage @@ -12906,6 +12916,7 @@ self: { description = "Library for RedPitaya"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "LargeCardinalHierarchy" = callPackage @@ -13185,10 +13196,8 @@ self: { }: mkDerivation { pname = "ListLike"; - version = "4.7.7"; - sha256 = "0h4yfzrf3ljvzf3x75nx791bpxlmdi7f42ff0xyfk8d498iws08a"; - revision = "1"; - editedCabalFile = "155y1r051ar9k8vhb54q5ga7a5rzlm4jx1c42pbw7cfy3c8af6hc"; + version = "4.7.8"; + sha256 = "1l9pfjy7gh7xqnzflixp37d6lsppmlffzmmq75xn9r8ij3r2jycs"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist fmlist text utf8-string vector @@ -13670,7 +13679,6 @@ self: { description = "Automatic inductive functional programmer by systematic search"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MailchimpSimple" = callPackage @@ -13775,6 +13783,7 @@ self: { description = "MaybeT monad transformer using transformers instead of mtl"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "MazesOfMonad" = callPackage @@ -13992,8 +14001,8 @@ self: { pname = "MissingH"; version = "1.5.0.1"; sha256 = "0c92fdv32nq51kfdizi3lpxmnvscsgk6marfzaycd7k05aka8byb"; - revision = "1"; - editedCabalFile = "18jigc9mis823dhlx14yd0r59618jwqw93hsdyzmdrgfaigd6qpn"; + revision = "2"; + editedCabalFile = "11d922r06p00gcgzhb29hhjkq8ajy1xbqdiwdpbmhp2ar7fw7g9l"; libraryHaskellDepends = [ array base containers directory filepath hslogger mtl network network-bsd old-locale old-time parsec process regex-compat time @@ -14130,6 +14139,7 @@ self: { description = "Monad-transformer version of the Control.Exception module"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "MonadCatchIO-mtl-foreign" = callPackage @@ -14157,8 +14167,6 @@ self: { ]; description = "Monad-transformer compatible version of the Control.Exception module"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "MonadCatchIO-transformers-foreign" = callPackage @@ -14175,6 +14183,7 @@ self: { description = "Polymorphic combinators for working with foreign functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "MonadCompose" = callPackage @@ -14227,8 +14236,8 @@ self: { pname = "MonadRandom"; version = "0.5.3"; sha256 = "17qaw1gg42p9v6f87dj5vih7l88lddbyd8880ananj8avanls617"; - revision = "2"; - editedCabalFile = "1diy29if7w1c9ckc465mrrb52fm0zmd8zzym1h5ryh5a58qafwhr"; + revision = "3"; + editedCabalFile = "0317qhagxgn41ql1w7isnw4jqddnw394wglqahm3c569pbr3lmdv"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -14244,6 +14253,8 @@ self: { pname = "MonadRandom"; version = "0.6"; sha256 = "0i6h9s2iqj71q06i9al3s2akmdjjx16h015qb81nhgjwi4q8cf69"; + revision = "2"; + editedCabalFile = "0pkfprfr4386s2a67dk0kazn2x3m2nfr3w5r32y75rb2aa25dbmy"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -14261,6 +14272,8 @@ self: { libraryHaskellDepends = [ base MonadRandom mtl random ]; description = "Lazy monad for psuedo random-number generation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "MonadStack" = callPackage @@ -14652,6 +14665,7 @@ self: { ]; description = "NGLess implements ngless, a DSL for processing sequencing data"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "ngless"; }) {}; @@ -14723,6 +14737,7 @@ self: { description = "A Haskell interface to Lego Mindstorms NXT"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {bluetooth = null;}; "NXTDSL" = callPackage @@ -14765,6 +14780,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Easy-and-safe-to-use high-level Haskell bindings to NaCl"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "NameGenerator" = callPackage @@ -14877,7 +14894,6 @@ self: { description = "Simple scoring schemes for word alignments"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "NaturalSort" = callPackage @@ -15330,6 +15346,24 @@ self: { broken = true; }) {}; + "OGDF" = callPackage + ({ mkDerivation, base, COIN, fficxx, fficxx-runtime, OGDF, stdcxx + , template-haskell + }: + mkDerivation { + pname = "OGDF"; + version = "1.0.0.0"; + sha256 = "0sn5xyn2yqh7aywadzxvaxcyqj2clivvizqdbnjkljib7960w44z"; + libraryHaskellDepends = [ + base fficxx fficxx-runtime stdcxx template-haskell + ]; + librarySystemDepends = [ COIN OGDF ]; + description = "Haskell binding to OGDF"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {COIN = null; OGDF = null;}; + "OGL" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -15365,9 +15399,7 @@ self: { executableHaskellDepends = [ base filepath ]; description = "ONC RPC (aka Sun RPC) and XDR library"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "hsrpcgen"; - broken = true; }) {}; "OSM" = callPackage @@ -15384,6 +15416,7 @@ self: { description = "Parse OpenStreetMap files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "OTP" = callPackage @@ -15556,18 +15589,14 @@ self: { }) {}; "OneTuple" = callPackage - ({ mkDerivation, base, base-orphans, ghc-prim, hashable - , template-haskell - }: + ({ mkDerivation, base, ghc-prim, hashable, template-haskell }: mkDerivation { pname = "OneTuple"; version = "0.3.1"; sha256 = "1vry21z449ph9k61l5zm7mfmdwkwszxqdlawlhvwrd1gsn13d1cq"; revision = "3"; editedCabalFile = "0g4siv8s6dlrdsivap2qy6ig08y5bjbs93jk192zmgkp8iscncpw"; - libraryHaskellDepends = [ - base base-orphans ghc-prim template-haskell - ]; + libraryHaskellDepends = [ base ghc-prim template-haskell ]; testHaskellDepends = [ base hashable template-haskell ]; description = "Singleton Tuple"; license = lib.licenses.bsd3; @@ -15725,6 +15754,8 @@ self: { pname = "OpenGLRaw"; version = "3.3.4.1"; sha256 = "07nk0rgm6jcxz6yshwhv5lj5frs6371w3hdjxwa4biws2kmbs6hj"; + revision = "1"; + editedCabalFile = "15abvqkxc08lx9d44323izccfp7bqfiljnd587zn80vdvmkzs6zc"; libraryHaskellDepends = [ base bytestring containers fixed half text transformers ]; @@ -15871,6 +15902,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Efficient ordered (by popcount) enumeration of bits"; license = lib.licenses.bsd3; + platforms = lib.platforms.x86; }) {}; "Ordinals" = callPackage @@ -16171,6 +16203,7 @@ self: { ]; description = "BaseSpecs used for @Parallel-Arrows-Definition@ and Co"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "Parallel-Arrows-Definition" = callPackage @@ -16182,6 +16215,8 @@ self: { libraryHaskellDepends = [ base deepseq split ]; description = "Multithreaded evaluation using Arrows"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Parallel-Arrows-Eden" = callPackage @@ -16222,6 +16257,7 @@ self: { ]; description = "GpH based backend for @Parallel-Arrows-Definition@ in a multicore variant"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "Parallel-Arrows-ParMonad" = callPackage @@ -16241,6 +16277,7 @@ self: { ]; description = "Par Monad (@monad-par@) based backend for @Parallel-Arrows-Definition@"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "Parry" = callPackage @@ -16694,6 +16731,8 @@ self: { ]; description = "Efficient multidimensional arrays"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "PrimitiveArray-Pretty" = callPackage @@ -16956,28 +16995,6 @@ self: { }) {}; "PyF" = callPackage - ({ mkDerivation, base, bytestring, deepseq, filepath, ghc, ghc-boot - , hspec, HUnit, mtl, parsec, process, template-haskell, temporary - , text, time - }: - mkDerivation { - pname = "PyF"; - version = "0.10.2.0"; - sha256 = "0a1bq7c3vx6yp7745xr2vlxjsqgqa0s1f7yzqnfsybqwff03zbcw"; - revision = "1"; - editedCabalFile = "0hinbn56d8bw45zxazpmgv1b6lcmlcys9jfdkv2lyr5j44pzpvvj"; - libraryHaskellDepends = [ - base bytestring ghc ghc-boot mtl parsec template-haskell text time - ]; - testHaskellDepends = [ - base bytestring deepseq filepath hspec HUnit process - template-haskell temporary text time - ]; - description = "Quasiquotations for a python like interpolated string formatter"; - license = lib.licenses.bsd3; - }) {}; - - "PyF_0_11_1_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, filepath, ghc, ghc-boot , hspec, HUnit, mtl, parsec, process, template-haskell, temporary , text, time @@ -16995,7 +17012,6 @@ self: { ]; description = "Quasiquotations for a python like interpolated string formatter"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "QIO" = callPackage @@ -17156,6 +17172,8 @@ self: { benchmarkHaskellDepends = [ base hspec QuickCheck ]; description = "Valid and Invalid generator"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "QuickPlot" = callPackage @@ -17420,7 +17438,6 @@ self: { license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "RNAdotplot"; - broken = true; }) {}; "RNAlien" = callPackage @@ -17521,8 +17538,8 @@ self: { pname = "RabbitMQ"; version = "0.1.0.0"; sha256 = "14rxwsxxqhj91alcnvvp6949ig0ifnls9x2mgnd1jmknqz7pwvrs"; - revision = "1"; - editedCabalFile = "17ypl1n9f1nyc1axdmmfgb188d0ml7i3sqgmbka1k4l0p2ik9qpp"; + revision = "2"; + editedCabalFile = "1m6pgha36ag2r0vnr242bndgbpq14v4ng6pab96pxzlj1yjlij6l"; libraryHaskellDepends = [ array base binary bytestring clock containers HsOpenSSL io-streams monad-control network network-uri openssl-streams split stm text @@ -18130,8 +18147,6 @@ self: { librarySystemDepends = [ smpeg ]; description = "Binding to the SMPEG library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) smpeg;}; "SDL-ttf" = callPackage @@ -18533,8 +18548,6 @@ self: { ]; description = "A parser for SWMM 5 binary .OUT files"; license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SableCC2Hs" = callPackage @@ -18744,6 +18757,8 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "simple static linked SHA3 using private symbols and the ref impl"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "SegmentTree" = callPackage @@ -18865,38 +18880,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ShellCheck_0_7_2" = callPackage - ({ mkDerivation, aeson, array, base, bytestring, containers - , deepseq, Diff, directory, filepath, mtl, parsec, process - , QuickCheck, regex-tdfa - }: - mkDerivation { - pname = "ShellCheck"; - version = "0.7.2"; - sha256 = "0wl43njaq95l35y5mvipwp1db9vr551nz9wl0xy83j1x1kc38xgz"; - revision = "1"; - editedCabalFile = "1w65zcr97mghraif6bgcdabzy2dp72gasaad57a9b5yp9i27p2rl"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array base bytestring containers deepseq Diff directory - filepath mtl parsec process QuickCheck regex-tdfa - ]; - executableHaskellDepends = [ - aeson array base bytestring containers deepseq Diff directory - filepath mtl parsec QuickCheck regex-tdfa - ]; - testHaskellDepends = [ - aeson array base bytestring containers deepseq Diff directory - filepath mtl parsec QuickCheck regex-tdfa - ]; - description = "Shell script analysis tool"; - license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - mainProgram = "shellcheck"; - }) {}; - - "ShellCheck" = callPackage + "ShellCheck_0_8_0" = callPackage ({ mkDerivation, aeson, array, base, bytestring, containers , deepseq, Diff, directory, filepath, mtl, parsec, process , QuickCheck, regex-tdfa @@ -18923,7 +18907,38 @@ self: { ]; description = "Shell script analysis tool"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "shellcheck"; + maintainers = [ lib.maintainers.zowoq ]; + }) {}; + + "ShellCheck" = callPackage + ({ mkDerivation, aeson, array, base, bytestring, containers + , deepseq, Diff, directory, fgl, filepath, mtl, parsec, process + , QuickCheck, regex-tdfa, transformers + }: + mkDerivation { + pname = "ShellCheck"; + version = "0.9.0"; + sha256 = "071k2gc8rzpg9lwq9g10c9xx0zm1wcgsf8v4n1csj9fm56vy7gmb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base bytestring containers deepseq Diff directory fgl + filepath mtl parsec process QuickCheck regex-tdfa transformers + ]; + executableHaskellDepends = [ + aeson array base bytestring containers deepseq Diff directory fgl + filepath mtl parsec QuickCheck regex-tdfa transformers + ]; + testHaskellDepends = [ + aeson array base bytestring containers deepseq Diff directory fgl + filepath mtl parsec QuickCheck regex-tdfa transformers + ]; + description = "Shell script analysis tool"; + license = lib.licenses.gpl3Only; + mainProgram = "shellcheck"; + maintainers = [ lib.maintainers.zowoq ]; }) {}; "Shellac" = callPackage @@ -19042,6 +19057,7 @@ self: { ]; description = "A programming model for declarative, high performance user interface"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "Shpadoinkle-backend-pardiff" = callPackage @@ -19079,7 +19095,6 @@ self: { description = "Use the high-performance Snabbdom virtual dom library written in JavaScript"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Shpadoinkle-backend-static" = callPackage @@ -19116,6 +19131,8 @@ self: { libraryHaskellDepends = [ aeson base jsaddle lens text unliftio ]; description = "Debugging tools for Shpadoinkle applications"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Shpadoinkle-developer-tools" = callPackage @@ -19249,6 +19266,7 @@ self: { libraryHaskellDepends = [ base lens Shpadoinkle text ]; description = "Lens combinators for Shpadoinkle applications"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "Shpadoinkle-router" = callPackage @@ -19284,6 +19302,7 @@ self: { libraryHaskellDepends = [ base lens Shpadoinkle streaming text ]; description = "Integration of the streaming library with Shpadoinkle continuations"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "Shpadoinkle-template" = callPackage @@ -19598,7 +19617,6 @@ self: { description = "Abstract full system simulator"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SoccerFun" = callPackage @@ -20232,7 +20250,6 @@ self: { description = "Library which aids constructing generic (SYB3-based) widgets"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SyntaxMacros" = callPackage @@ -20329,6 +20346,8 @@ self: { ]; description = "A Transactional cache with user-defined persistence"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "THEff" = callPackage @@ -20412,6 +20431,7 @@ self: { libraryHaskellDepends = [ base DeepArrow TypeCompose ]; description = "Tangible Values -- composable interfaces"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "TYB" = callPackage @@ -20806,6 +20826,8 @@ self: { libraryHaskellDepends = [ base binary bytestring dataenc ]; description = "TigerHash with C implementation"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "TimePiece" = callPackage @@ -21121,11 +21143,13 @@ self: { pname = "TypeCompose"; version = "0.9.14"; sha256 = "0msss17lrya6y5xfvxl41xsqs6yr09iw6m1px4xlwin72xwly0sn"; - revision = "1"; - editedCabalFile = "1pxg6az5vkl0zvs3zdvvvnhxqawd9fkkd44jmzzzyyibppgni6x4"; + revision = "2"; + editedCabalFile = "1ghzj47mfjs1vqai93gh1mmsk92jz1bx0azfzxm0jmnwkgr3vlnh"; libraryHaskellDepends = [ base base-orphans ]; description = "Type composition classes & instances"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "TypeIlluminator" = callPackage @@ -21256,7 +21280,6 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "UTFTConverter"; - broken = true; }) {}; "Unique" = callPackage @@ -21268,6 +21291,8 @@ self: { pname = "Unique"; version = "0.4.7.9"; sha256 = "14f1qnmhdmbam8qis725dhwq1mk9h86fsnzhkwhsx73ny9z29s1l"; + revision = "1"; + editedCabalFile = "10s0npnfkh7naj49afmyrvnilikp6426fbhi49f97pxrgcmy4dvw"; libraryHaskellDepends = [ base containers extra hashable unordered-containers ]; @@ -21491,8 +21516,6 @@ self: { doHaddock = false; description = "This package is obsolete"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "VecN" = callPackage @@ -21564,7 +21587,6 @@ self: { description = "ViennaRNA v2 extensions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ViennaRNAParser" = callPackage @@ -21613,6 +21635,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "Villefort"; + broken = true; }) {}; "Vulkan" = callPackage @@ -21630,8 +21653,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.10.4"; - sha256 = "1bdab2pbxyyxlmvjicxd2mpa4lwf29s4kpgp2xv7nvwgfbazk9w3"; + version = "0.10.5"; + sha256 = "1brqn6zx4ynljc424dpwrxj5fjmvl0mgp7wycnzpfxpfmwwqib4a"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -21657,7 +21680,6 @@ self: { ]; description = "WAVE audio file IO library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "sinewave"; }) {}; @@ -21831,6 +21853,8 @@ self: { testHaskellDepends = [ base ]; description = "Simple set types. Useful to create sets of arbitrary types and nested sets."; license = lib.licenses.lgpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Weather" = callPackage @@ -22286,7 +22310,6 @@ self: { description = "Workflow patterns over a monad for thread state logging & recovery"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "WxGeneric" = callPackage @@ -22613,6 +22636,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "YACPong"; + broken = true; }) {}; "YFrob" = callPackage @@ -22698,8 +22722,8 @@ self: { ({ mkDerivation, base, deepseq, random, simple-affine-space }: mkDerivation { pname = "Yampa"; - version = "0.13.7"; - sha256 = "0fz4v7q0q1npqxgjcc5ig9ynz1jya54a3vdl5p2mzymg91hwapf8"; + version = "0.14"; + sha256 = "14fhg7pkvm3rjcw6v5c0jxnq2l7v3rhw1bkb3a6g1s27alar9ynl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -22818,26 +22842,24 @@ self: { "Z-Data" = callPackage ({ mkDerivation, base, bytestring, Cabal, case-insensitive - , containers, deepseq, ghc-prim, hashable, hspec, hspec-discover - , HUnit, integer-gmp, primitive, QuickCheck, quickcheck-instances - , random, scientific, tagged, template-haskell, time - , unicode-collation, unordered-containers, uuid-types + , containers, deepseq, hashable, hspec, hspec-discover, HUnit + , primitive, QuickCheck, quickcheck-instances, random, scientific + , tagged, template-haskell, time, unicode-collation + , unordered-containers, uuid-types }: mkDerivation { pname = "Z-Data"; - version = "1.2.0.0"; - sha256 = "1kf20s8y2jgr4gsx72mj9ax6mxrwxz7ss034qsajzd8l3j1h5bir"; + version = "2.0.0.1"; + sha256 = "0w78yrphmb7w2vay75r1a5rlcar1345rvbsq8cx8zh3jcx2r802g"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - base bytestring case-insensitive containers deepseq ghc-prim - hashable integer-gmp primitive QuickCheck random scientific tagged - template-haskell time unicode-collation unordered-containers - uuid-types + base bytestring case-insensitive containers deepseq hashable + primitive QuickCheck random scientific tagged template-haskell time + unicode-collation unordered-containers uuid-types ]; testHaskellDepends = [ - base containers hashable hspec HUnit integer-gmp primitive - QuickCheck quickcheck-instances scientific time - unordered-containers + base containers hashable hspec HUnit primitive QuickCheck + quickcheck-instances scientific time unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "Array, vector and text"; @@ -22854,8 +22876,8 @@ self: { }: mkDerivation { pname = "Z-IO"; - version = "1.0.1.0"; - sha256 = "0w82pfbs7f8yiw7jv95m5gh8yd23v5gwdxjh7z8cwf173r5j6g0k"; + version = "2.0.0.0"; + sha256 = "1n621brs608v6kpnjxb3hgh3h0garw8k1hr1ym5l8l0v7h2gv085"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -22974,6 +22996,7 @@ self: { libraryHaskellDepends = [ base TypeCompose ]; description = "Zipping folds"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ZipperAG" = callPackage @@ -24712,6 +24735,7 @@ self: { description = "AcousticBrainz API client"; license = lib.licenses.cc0; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "acquire" = callPackage @@ -24746,6 +24770,8 @@ self: { pname = "active"; version = "0.2.0.16"; sha256 = "1fz2rsyk41p9f9avlmn9lrdmii5alv88lkw677mw8q6mzyxpw67i"; + revision = "1"; + editedCabalFile = "0cyfwrr5c14f5rgrf8dv7i8qsrnmnzigw0xp6l88kfxd61zhk4n8"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -24847,10 +24873,8 @@ self: { }: mkDerivation { pname = "acts"; - version = "0.3.1.0"; - sha256 = "06bpayfa8vwj8dqlqp71nw2s9iwbffdknkk4hpazd4r1wvhnrg37"; - revision = "4"; - editedCabalFile = "081arnkkll6xkni350ywsnwzagnki2ly5in42cx5zcpfp1xbssmk"; + version = "0.3.1.1"; + sha256 = "1szr7afyk6hwx7hipwwsvhv7y57if4fydsblphvf8fmwg299ya4l"; libraryHaskellDepends = [ base deepseq finitary finite-typelits groups ]; @@ -24991,6 +25015,41 @@ self: { broken = true; }) {}; + "adhoc-fixtures" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-discover + , safe-exceptions, yarl + }: + mkDerivation { + pname = "adhoc-fixtures"; + version = "0.1.0.1"; + sha256 = "1cxrk9nikkvy3c190g2vamv1f7i71v2g080fpzjp6wzspm7r32gy"; + libraryHaskellDepends = [ base safe-exceptions yarl ]; + testHaskellDepends = [ + base hspec hspec-core hspec-discover safe-exceptions yarl + ]; + testToolDepends = [ hspec-discover ]; + description = "Manage fine grained fixtures"; + license = lib.licenses.isc; + }) {}; + + "adhoc-fixtures-hspec" = callPackage + ({ mkDerivation, adhoc-fixtures, base, hspec, hspec-core + , hspec-discover, safe-exceptions, yarl + }: + mkDerivation { + pname = "adhoc-fixtures-hspec"; + version = "0.1.0.1"; + sha256 = "0vd882cna6p7bn58ynmiih9jjv4az0kxf3294v1cl7gw7hclmaqk"; + libraryHaskellDepends = [ adhoc-fixtures base hspec yarl ]; + testHaskellDepends = [ + adhoc-fixtures base hspec hspec-core hspec-discover safe-exceptions + yarl + ]; + testToolDepends = [ hspec-discover ]; + description = "Manage fine grained fixtures"; + license = lib.licenses.isc; + }) {}; + "adhoc-network" = callPackage ({ mkDerivation, base, bytestring, containers, Crypto, dataenc , HaXml, hsgnutls, network, old-locale, parsec, pkcs1, random, time @@ -25045,6 +25104,7 @@ self: { description = "See README for more info"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "adjunctions" = callPackage @@ -25167,8 +25227,8 @@ self: { }: mkDerivation { pname = "advent-of-code-api"; - version = "0.2.8.1"; - sha256 = "17s80883jq75i129b1976qbvr56ml0bsadhfnx2qybbh7b55gxfh"; + version = "0.2.8.4"; + sha256 = "1l7bl0aqn5d6ph730jpwb5h0lwhvrkcw4vla0l73sxrm52j9ma58"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath finite-typelits http-api-data http-client http-client-tls @@ -25182,36 +25242,34 @@ self: { "advent-of-code-ocr" = callPackage ({ mkDerivation, base, containers, criterion, data-default-class - , heredoc, hspec, optparse-applicative, template-haskell, th-lift - , th-lift-instances + , heredoc, hspec, optparse-applicative, template-haskell, th-compat + , th-lift, th-lift-instances }: mkDerivation { pname = "advent-of-code-ocr"; - version = "0.1.2.0"; - sha256 = "0ppa386cbcdwx2k12ya19fsjlrgqgljdryv4mb3a0lrk44804k5c"; + version = "0.1.2.1"; + sha256 = "0dm8kv1k3h83fsblm64d8fqm760da8fl99rnxv2kvkp4nw8nfjm8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-default-class heredoc template-haskell th-lift - th-lift-instances + base containers data-default-class heredoc template-haskell + th-compat th-lift th-lift-instances ]; executableHaskellDepends = [ base containers data-default-class heredoc optparse-applicative - template-haskell th-lift th-lift-instances + template-haskell th-compat th-lift th-lift-instances ]; testHaskellDepends = [ base containers data-default-class heredoc hspec template-haskell - th-lift th-lift-instances + th-compat th-lift th-lift-instances ]; benchmarkHaskellDepends = [ base containers criterion data-default-class heredoc - template-haskell th-lift th-lift-instances + template-haskell th-compat th-lift th-lift-instances ]; description = "Parse Advent of Code ASCII art letters"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "advent-of-code-ocr"; - broken = true; }) {}; "aern2-fun" = callPackage @@ -25514,18 +25572,6 @@ self: { }) {}; "aeson-commit" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, hspec, mtl, text }: - mkDerivation { - pname = "aeson-commit"; - version = "1.4"; - sha256 = "1xbck5hcbfqm2kc3yzrl1dzdmjl9zf84vc33ird3c50ny884amwa"; - libraryHaskellDepends = [ aeson base mtl text ]; - testHaskellDepends = [ aeson aeson-qq base hspec text ]; - description = "Parse Aeson data with commitment"; - license = lib.licenses.bsd3; - }) {}; - - "aeson-commit_1_6_0" = callPackage ({ mkDerivation, aeson, aeson-qq, base, hspec, text, transformers }: mkDerivation { @@ -25536,7 +25582,6 @@ self: { testHaskellDepends = [ aeson aeson-qq base hspec text ]; description = "Parse Aeson data with commitment"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "aeson-compat" = callPackage @@ -25620,8 +25665,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "JSON encoding/decoding for dependent-sum"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aeson-deriving" = callPackage @@ -25820,7 +25863,9 @@ self: { ]; description = "Derivation of Aeson instances for GADTs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "readme"; + broken = true; }) {}; "aeson-generic-compat" = callPackage @@ -25972,25 +26017,6 @@ self: { }) {}; "aeson-optics" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , optics-core, optics-extra, scientific, text, unordered-containers - , vector - }: - mkDerivation { - pname = "aeson-optics"; - version = "1.1.1"; - sha256 = "1na5nsbp4sds8q289knzj4rgiwabbinxm0ihh66jfz0sjiia4wp7"; - revision = "1"; - editedCabalFile = "0wyn0l2qhlrlrf5xy1grk9mshlxsfy566ayabg9f92w7m89n0kff"; - libraryHaskellDepends = [ - aeson attoparsec base base-compat bytestring optics-core - optics-extra scientific text unordered-containers vector - ]; - description = "Law-abiding optics for aeson"; - license = lib.licenses.mit; - }) {}; - - "aeson-optics_1_2_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, optics-core , optics-extra, scientific, text, text-short, vector }: @@ -26004,7 +26030,6 @@ self: { ]; description = "Law-abiding optics for aeson"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "aeson-options" = callPackage @@ -26049,8 +26074,6 @@ self: { testHaskellDepends = [ base hspec text ]; description = "Tiny library to get fields from JSON format"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aeson-prefix" = callPackage @@ -26188,61 +26211,27 @@ self: { "aeson-schemas" = callPackage ({ mkDerivation, aeson, aeson-qq, base, criterion, deepseq - , first-class-families, hashable, hint, interpolate, megaparsec - , QuickCheck, raw-strings-qq, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, text, th-orphans - , th-test-utils, unordered-containers - }: - mkDerivation { - pname = "aeson-schemas"; - version = "1.3.5.1"; - sha256 = "1cp6q92z0zkz9kdkaialcx2v9plvmkcghrg54jv841iqxjwcbj3r"; - revision = "1"; - editedCabalFile = "1yllgsypwpk627x29bjcv49y4m4g8q2xgkj34z6nyib6w1bbjmna"; - libraryHaskellDepends = [ - aeson base first-class-families hashable megaparsec - template-haskell text unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-qq base deepseq first-class-families hashable hint - interpolate megaparsec QuickCheck raw-strings-qq tasty tasty-golden - tasty-hunit tasty-quickcheck template-haskell text th-orphans - th-test-utils unordered-containers - ]; - benchmarkHaskellDepends = [ - aeson base criterion deepseq first-class-families hashable - megaparsec template-haskell text th-test-utils unordered-containers - ]; - description = "Easily consume JSON data on-demand with type-safety"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "aeson-schemas_1_4_0_0" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, criterion, deepseq - , filepath, first-class-families, hashable, hint, interpolate + , directory, filepath, first-class-families, hashable, interpolate , megaparsec, process, QuickCheck, raw-strings-qq, tasty , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell , temporary, text, th-orphans, th-test-utils, unordered-containers }: mkDerivation { pname = "aeson-schemas"; - version = "1.4.0.0"; - sha256 = "0nch4andx0w0l7dlw64ajz503f05zancx42178dsd5fskvd75ks2"; + version = "1.4.0.1"; + sha256 = "1yv4d4i8gmbv0mmlalhlafn9a6kv51wdwnpbksiajm6m47bajqym"; libraryHaskellDepends = [ aeson base first-class-families hashable megaparsec template-haskell text unordered-containers ]; testHaskellDepends = [ - aeson aeson-qq base deepseq filepath first-class-families hashable - hint interpolate megaparsec process QuickCheck raw-strings-qq tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell - temporary text th-orphans th-test-utils unordered-containers + aeson aeson-qq base deepseq directory filepath interpolate process + QuickCheck raw-strings-qq tasty tasty-golden tasty-hunit + tasty-quickcheck template-haskell temporary text th-orphans + th-test-utils ]; benchmarkHaskellDepends = [ - aeson base criterion deepseq first-class-families hashable - megaparsec template-haskell text th-test-utils unordered-containers + aeson base criterion deepseq template-haskell th-test-utils ]; description = "Easily consume JSON data on-demand with type-safety"; license = lib.licenses.bsd3; @@ -26336,8 +26325,8 @@ self: { }: mkDerivation { pname = "aeson-tiled"; - version = "0.0.2.1"; - sha256 = "0fm2dkp0gi5h8xv6b3ax5v5ni7gkdvj8m2v1nrmf7hcyan0lp2aa"; + version = "0.0.2.2"; + sha256 = "1p2w19gmlrcdsni7dj2bs3ajzn8a5460gwas97yl930gwiwivyif"; libraryHaskellDepends = [ aeson base bytestring containers text vector ]; @@ -26360,29 +26349,6 @@ self: { }) {}; "aeson-typescript" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, hspec, mtl, process, string-interpolate - , template-haskell, temporary, text, th-abstraction - , unordered-containers - }: - mkDerivation { - pname = "aeson-typescript"; - version = "0.3.0.1"; - sha256 = "0xbj6m1lxpv4qclz5msrdplpy3mdxq5icjl3fq4bwbqy5rs6vczv"; - libraryHaskellDepends = [ - aeson base containers mtl string-interpolate template-haskell text - th-abstraction unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath hspec mtl - process string-interpolate template-haskell temporary text - th-abstraction unordered-containers - ]; - description = "Generate TypeScript definition files from your ADTs"; - license = lib.licenses.bsd3; - }) {}; - - "aeson-typescript_0_4_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, hspec, mtl, process, string-interpolate , template-haskell, temporary, text, th-abstraction, transformers @@ -26403,7 +26369,6 @@ self: { ]; description = "Generate TypeScript definition files from your ADTs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "aeson-utils" = callPackage @@ -26448,8 +26413,8 @@ self: { }: mkDerivation { pname = "aeson-via"; - version = "0.2.0"; - sha256 = "0v2k9ilm60hnjzsjw1x1b0qcyc6b6db64k6rkci9mbnfqv8bj2wj"; + version = "0.2.1"; + sha256 = "0g8sf1sv1fmqkqmfwsb8sxbgy63zg503gi9sxhhc9apfrp5z9kig"; libraryHaskellDepends = [ aeson aeson-casing base newtype-generics text ]; @@ -26632,7 +26597,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "ag-pictgen"; - broken = true; }) {}; "agda-language-server" = callPackage @@ -26734,8 +26698,8 @@ self: { }: mkDerivation { pname = "agda-unused"; - version = "0.2.0"; - sha256 = "0fxrmcc0kn3jyjbij2fv72pw0r1l2rvg8wglj1i8d438jqpffigw"; + version = "0.3.0"; + sha256 = "0yljqv24xws32vnkaqxngqmy6p0ad55razgcr1igyrc10dq4pm24"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -26889,6 +26853,8 @@ self: { ]; description = "air-extra"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "air-spec" = callPackage @@ -27115,6 +27081,8 @@ self: { ]; description = "GPSS-like DSL for Aivika"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "aivika-lattice" = callPackage @@ -27458,8 +27426,8 @@ self: { }: mkDerivation { pname = "algebra-checkers"; - version = "0.1.0.0"; - sha256 = "0phrm0lncqbjqsyxhk3ifmzfb2q42v6g81qklh49n1y73naykg9v"; + version = "0.1.0.1"; + sha256 = "1b1sj3niy3zwv2v412n6fnjapsz0xsl1zav8s326lx9gy9dxfdqs"; libraryHaskellDepends = [ ansi-terminal base checkers containers groups mtl pretty QuickCheck syb template-haskell th-instance-reification transformers @@ -27721,6 +27689,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "acb"; + broken = true; }) {}; "algorithmic-composition-basic" = callPackage @@ -27739,7 +27708,6 @@ self: { ]; description = "Helps to create experimental music from a file (or its part) and a Ukrainian text"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "algorithmic-composition-complex" = callPackage @@ -27761,6 +27729,7 @@ self: { description = "Helps to create more complex experimental music from a file (especially timbre)"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "algorithmic-composition-frequency-shift" = callPackage @@ -27789,7 +27758,6 @@ self: { libraryHaskellDepends = [ algorithmic-composition-basic base ]; description = "Some variants of the overtones functions to generate a timbre"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "align" = callPackage @@ -27834,6 +27802,7 @@ self: { ]; description = "Find relative time displacement of two recordings of the same music"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "align-audio"; }) {}; @@ -27993,6 +27962,8 @@ self: { testHaskellDepends = [ base containers random tasty tasty-hunit ]; description = "Rollback/replay NetCode for realtime, deterministic, multiplayer games"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "alpha" = callPackage @@ -28203,6 +28174,8 @@ self: { description = "Binding to the ALSA Library API (MIDI sequencer)"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) alsa-lib;}; "alsa-seq-tests" = callPackage @@ -31278,6 +31251,7 @@ self: { description = "Client for analyze service"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "anansi" = callPackage @@ -31488,6 +31462,8 @@ self: { libraryHaskellDepends = [ base bytestring text ]; description = "Convert camelCase to snake_case and vice versa"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "animascii" = callPackage @@ -31794,8 +31770,8 @@ self: { ({ mkDerivation, base, colour }: mkDerivation { pname = "ansi-terminal"; - version = "0.11.3"; - sha256 = "0swy5alj4xvfsnjrfiwxdlgzdnggjy6lgbfwph2d7c8zyzn67mgl"; + version = "0.11.4"; + sha256 = "098f8bdxqmgxaz8y87s6b6bshsq950zq0b75rmbihp2k1a7y963q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base colour ]; @@ -31805,25 +31781,27 @@ self: { "ansi-terminal-game" = callPackage ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal - , clock, containers, exceptions, hspec, linebreak, mintty, mtl - , QuickCheck, random, split, terminal-size, timers-tick, unidecode + , clock, colour, containers, exceptions, hspec, hspec-discover + , linebreak, mintty, mtl, QuickCheck, random, split, terminal-size + , timers-tick, unidecode }: mkDerivation { pname = "ansi-terminal-game"; - version = "1.8.0.0"; - sha256 = "09wd7gh8zm90wq080fsah0qjbr9x3vrh89am7yf0d84a0akqw65m"; + version = "1.8.1.0"; + sha256 = "0wyx6g9fydbnz9xwjniymwfgn3fgn6vql9spmzl3c1hlpbv5ikfq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal array base bytestring cereal clock containers + ansi-terminal array base bytestring cereal clock colour containers exceptions linebreak mintty mtl QuickCheck random split terminal-size timers-tick unidecode ]; testHaskellDepends = [ - ansi-terminal array base bytestring cereal clock containers + ansi-terminal array base bytestring cereal clock colour containers exceptions hspec linebreak mintty mtl QuickCheck random split terminal-size timers-tick unidecode ]; + testToolDepends = [ hspec-discover ]; description = "sdl-like functions for terminal applications, based on ansi-terminal"; license = lib.licenses.gpl3Only; }) {}; @@ -32371,6 +32349,8 @@ self: { testHaskellDepends = [ base ghc-prim ]; description = "prelude for Algebra of Programming"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "aos-signature" = callPackage @@ -32462,6 +32442,8 @@ self: { benchmarkSystemDepends = [ openssl ]; description = "Apache specific MD5 digest algorighm"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) openssl;}; "apart" = callPackage @@ -32787,6 +32769,8 @@ self: { pname = "api-tools"; version = "0.10.0.0"; sha256 = "0hz4pa0n4wf9kd8r98xd0c39p790fn9iaqzjj2m653641acjbm0w"; + revision = "1"; + editedCabalFile = "13c5qg7f1a0hh1x2dmw6hnpi2vkmcasg38wl3lzf2plfcibqb01m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33419,7 +33403,7 @@ self: { broken = true; }) {}; - "apply-refact" = callPackage + "apply-refact_0_9_3_0" = callPackage ({ mkDerivation, base, containers, directory, extra, filemanip , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative , process, refact, silently, syb, tasty, tasty-expected-failure @@ -33450,10 +33434,11 @@ self: { ]; description = "Perform refactorings specified by the refact library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "refactor"; }) {}; - "apply-refact_0_10_0_0" = callPackage + "apply-refact" = callPackage ({ mkDerivation, base, containers, directory, extra, filemanip , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths , optparse-applicative, process, refact, silently, syb, tasty @@ -33484,6 +33469,40 @@ self: { ]; description = "Perform refactorings specified by the refact library"; license = lib.licenses.bsd3; + mainProgram = "refactor"; + }) {}; + + "apply-refact_0_11_0_0" = callPackage + ({ mkDerivation, base, containers, directory, extra, filemanip + , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths + , optparse-applicative, process, refact, silently, syb, tasty + , tasty-expected-failure, tasty-golden, transformers, uniplate + , unix-compat + }: + mkDerivation { + pname = "apply-refact"; + version = "0.11.0.0"; + sha256 = "1bmm9s8h5grqp1c8m1x9icbhznfc565za8w3sqfpiylid7c7fz72"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory extra filemanip ghc ghc-boot-th + ghc-exactprint ghc-paths process refact syb transformers uniplate + unix-compat + ]; + executableHaskellDepends = [ + base containers directory extra filemanip filepath ghc ghc-boot-th + ghc-exactprint ghc-paths optparse-applicative process refact syb + transformers uniplate unix-compat + ]; + testHaskellDepends = [ + base containers directory extra filemanip filepath ghc ghc-boot-th + ghc-exactprint ghc-paths optparse-applicative process refact + silently syb tasty tasty-expected-failure tasty-golden transformers + uniplate unix-compat + ]; + description = "Perform refactorings specified by the refact library"; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "refactor"; }) {}; @@ -33969,6 +33988,8 @@ self: { ]; description = "Distribute hackage packages to archlinux"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "arch-web" = callPackage @@ -34173,8 +34194,8 @@ self: { }: mkDerivation { pname = "arduino-copilot"; - version = "1.7.3"; - sha256 = "02jk4vx6wdbci4rw5gb878y28g2x4krs6v1478cgp8z181kj38xy"; + version = "1.7.5"; + sha256 = "1rmxahc4fp62c00k9j4p3952wl2cqny9adlhd7l1h4z3wml7mwsv"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative sketch-frp-copilot temporary @@ -34420,10 +34441,8 @@ self: { }: mkDerivation { pname = "arion-compose"; - version = "0.1.3.0"; - sha256 = "1pw0vqx1y3zgq303gdgd3vkz95mqrv8hl0pfkw6kyc49hj7l864y"; - revision = "1"; - editedCabalFile = "03pp8dhxdcjkxw2mxgy667p266chbsqn13vc900cccy3qibqqk6m"; + version = "0.2.0.0"; + sha256 = "051lbklcdj7rz9l5mnbijwjy62g0xnvx7s3yjfrb4x9qm3jpscci"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -35079,10 +35098,10 @@ self: { }: mkDerivation { pname = "ascii"; - version = "1.1.3.0"; - sha256 = "0pzyamd64mj8sx5a43gi7yjdy5dx6k9648ihbgsri8k8srlhm0c8"; - revision = "1"; - editedCabalFile = "0lxjb940qm86i1b2i9dgyj8874y49spwmkm5ninxd5hs7g9manll"; + version = "1.2.4.0"; + sha256 = "1rsv9ah0jvf66w3k4smh67wpbm03xl4pdyj8svmdy49hbpihimwi"; + revision = "2"; + editedCabalFile = "00pw1px9ggp6aq9pvimxj9q746b74cgc0pz4rn22q40mdqjadhwl"; libraryHaskellDepends = [ ascii-case ascii-char ascii-group ascii-numbers ascii-predicates ascii-superset ascii-th base bytestring text @@ -35092,22 +35111,23 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii_1_2_3_0" = callPackage - ({ mkDerivation, ascii-case, ascii-char, ascii-group, ascii-numbers - , ascii-predicates, ascii-superset, ascii-th, base, bytestring - , hedgehog, text + "ascii_1_5_1_0" = callPackage + ({ mkDerivation, ascii-case, ascii-caseless, ascii-char + , ascii-group, ascii-numbers, ascii-predicates, ascii-superset + , ascii-th, base, bytestring, hspec, text }: mkDerivation { pname = "ascii"; - version = "1.2.3.0"; - sha256 = "0s6w1wv6hjx1abz038cw7fyl8ilbs3cxmcs989c3hh9659l82p2j"; - revision = "2"; - editedCabalFile = "16b1dmjl0p2zdn05h2iwm1ymhrvgr19c1gzankrn0i7jj89nf979"; + version = "1.5.1.0"; + sha256 = "01a2xrkk60bpbz4x337jp66fy7zhdpb2c649c62inx723cc1q4il"; libraryHaskellDepends = [ - ascii-case ascii-char ascii-group ascii-numbers ascii-predicates - ascii-superset ascii-th base bytestring text + ascii-case ascii-caseless ascii-char ascii-group ascii-numbers + ascii-predicates ascii-superset ascii-th base bytestring text + ]; + testHaskellDepends = [ + ascii-case ascii-caseless ascii-char ascii-group ascii-numbers + ascii-predicates ascii-superset ascii-th base bytestring hspec text ]; - testHaskellDepends = [ base hedgehog text ]; description = "The ASCII character set and encoding"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -35130,33 +35150,56 @@ self: { }) {}; "ascii-case" = callPackage - ({ mkDerivation, ascii-char, base, hashable }: + ({ mkDerivation, ascii-char, base, hashable, hspec }: mkDerivation { pname = "ascii-case"; - version = "1.0.0.11"; - sha256 = "03rhq303igzvx9yil5qli2ga9iz47psrlnbb494785w9whwayxq1"; - revision = "1"; - editedCabalFile = "0a4nz34a5034lkq42q2l7xqdkjpakcy44syqy0gvx8p6h83ccrb1"; + version = "1.0.1.2"; + sha256 = "17gqpc65ffy4ipf0bhrs5nyqcmn6fxpx859m03wzm5m2y7ki67nd"; libraryHaskellDepends = [ ascii-char base hashable ]; - testHaskellDepends = [ ascii-char base ]; + testHaskellDepends = [ ascii-char base hspec ]; description = "ASCII letter case"; license = lib.licenses.asl20; }) {}; + "ascii-caseless" = callPackage + ({ mkDerivation, ascii-case, ascii-char, base, hashable, hspec }: + mkDerivation { + pname = "ascii-caseless"; + version = "0.0.0.0"; + sha256 = "00v05dzs47d638fbnkhb2kv3as5jkzrq33w8skh45srbjabc5w42"; + libraryHaskellDepends = [ ascii-case ascii-char base hashable ]; + testHaskellDepends = [ ascii-case ascii-char base hspec ]; + description = "ASCII character without an upper/lower case distinction"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ascii-char" = callPackage - ({ mkDerivation, base, hashable }: + ({ mkDerivation, base, hashable, hspec }: mkDerivation { pname = "ascii-char"; - version = "1.0.0.15"; - sha256 = "10vvhpl7y1gpw7gw2hpcckl0pmx7rkn35zy6yl6c9mx0hib0745a"; - revision = "1"; - editedCabalFile = "0b73pm9z5k3xbpn49fz4m8jwzw3r4z0l2v4alinf5l7n6vx4wvj0"; + version = "1.0.0.17"; + sha256 = "1562gkfvrcjygs9qpyswsk25d4m2pxblmmbb0hw8jsaml2jwsyss"; libraryHaskellDepends = [ base hashable ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; description = "A Char type representing an ASCII character"; license = lib.licenses.asl20; }) {}; + "ascii-char_1_0_1_0" = callPackage + ({ mkDerivation, base, hashable, hspec }: + mkDerivation { + pname = "ascii-char"; + version = "1.0.1.0"; + sha256 = "1fls3yw3gs36hwqp32pn7mfibkspx5a80k32wybzc3hfp4qyymlv"; + libraryHaskellDepends = [ base hashable ]; + testHaskellDepends = [ base hspec ]; + description = "A Char type representing an ASCII character"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-cows" = callPackage ({ mkDerivation, base, random-extras, random-fu, text }: mkDerivation { @@ -35190,10 +35233,8 @@ self: { ({ mkDerivation, ascii-char, base, hashable, hedgehog }: mkDerivation { pname = "ascii-group"; - version = "1.0.0.13"; - sha256 = "1xynfvrr8lwmrxqww2c2bwp6r3162mqgmx7hljwmbvdmnc0na30d"; - revision = "1"; - editedCabalFile = "0snp4qfj20jjchhhf7v8lyssjydv57sd2wy88fbc0aaba4c5lq7y"; + version = "1.0.0.15"; + sha256 = "006b4idi63hz8x54a5fmx5isypdvif8q4ijf274dr93n0c9wh1di"; libraryHaskellDepends = [ ascii-char base hashable ]; testHaskellDepends = [ ascii-char base hedgehog ]; description = "ASCII character groups"; @@ -35217,35 +35258,15 @@ self: { }) {}; "ascii-numbers" = callPackage - ({ mkDerivation, ascii-case, ascii-char, ascii-superset, base - , bytestring, d10, hashable, hedgehog, invert, text - }: - mkDerivation { - pname = "ascii-numbers"; - version = "1.0.0.0"; - sha256 = "1zmid1p3gqdmbriq6d87fyz69pksh1ha2x7w4m4pw7nch85440f5"; - libraryHaskellDepends = [ - ascii-case ascii-char ascii-superset base bytestring d10 hashable - text - ]; - testHaskellDepends = [ - ascii-case ascii-char ascii-superset base bytestring d10 hashable - hedgehog invert text - ]; - description = "ASCII representations of numbers"; - license = lib.licenses.asl20; - }) {}; - - "ascii-numbers_1_1_0_0" = callPackage ({ mkDerivation, ascii-case, ascii-char, ascii-superset, base , bytestring, hashable, hedgehog, invert, text }: mkDerivation { pname = "ascii-numbers"; - version = "1.1.0.0"; - sha256 = "041qyhgksqchj3x09fbirxba7s31aicaqnk8185g2l70zgxjz6iv"; + version = "1.1.0.2"; + sha256 = "0dqqnqrn3hvmjgakm6vzbidlik4p483wcslcwr60qbxa1v5lmznv"; revision = "2"; - editedCabalFile = "0nw6iy42ql53gl4i74ilmdar5r4l2wbn5ihv1yqbqm7rm9bqda8p"; + editedCabalFile = "19x9mh11pb7j4ykf9vicprn6mlhcb9gwsk82gh5yk366k4r172d7"; libraryHaskellDepends = [ ascii-case ascii-char ascii-superset base bytestring hashable text ]; @@ -35255,36 +35276,20 @@ self: { ]; description = "ASCII representations of numbers"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-predicates" = callPackage ({ mkDerivation, ascii-char, base, hedgehog }: mkDerivation { pname = "ascii-predicates"; - version = "1.0.0.10"; - sha256 = "1964w50mvfwq4x6ss6vhz7q7fg8b9bfhczv95ll9cxs61qn2rir0"; + version = "1.0.1.2"; + sha256 = "0awk97iib6rzrpsh7322f09sj6rkmhkn1hrgsw0zxq0w0bfp7kyj"; libraryHaskellDepends = [ ascii-char base ]; testHaskellDepends = [ ascii-char base hedgehog ]; description = "Various categorizations of ASCII characters"; license = lib.licenses.asl20; }) {}; - "ascii-predicates_1_0_1_0" = callPackage - ({ mkDerivation, ascii-char, base, hedgehog }: - mkDerivation { - pname = "ascii-predicates"; - version = "1.0.1.0"; - sha256 = "1zqlly878qlrkjw2m4mgs4cgw6xspn0alx6xnvnrp1r2b412ykyn"; - revision = "2"; - editedCabalFile = "15jb8yq55dwwbbq0k0vzcznsk4xvxylm61i2jspyhjhgzq9w34ik"; - libraryHaskellDepends = [ ascii-char base ]; - testHaskellDepends = [ ascii-char base hedgehog ]; - description = "Various categorizations of ASCII characters"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - }) {}; - "ascii-progress" = callPackage ({ mkDerivation, async, base, concurrent-output, data-default , hspec, QuickCheck, time @@ -35335,10 +35340,8 @@ self: { }: mkDerivation { pname = "ascii-superset"; - version = "1.0.1.13"; - sha256 = "0pf1awrx0bfpgyc96r1ycybgpy801iqxr8qf3vp9pvbnfava1v8s"; - revision = "2"; - editedCabalFile = "1551j1x284zdv9w233ma5r15bwmwizh5zi2ifcsp86d09c38505n"; + version = "1.0.1.15"; + sha256 = "0jq2kfc6mmpavljrv89xqwn0iskf3z9l3m3hjcm3bw03wlyv6clp"; libraryHaskellDepends = [ ascii-char base bytestring hashable text ]; @@ -35347,6 +35350,25 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-superset_1_2_5_0" = callPackage + ({ mkDerivation, ascii-case, ascii-caseless, ascii-char, base + , bytestring, hashable, hspec, text + }: + mkDerivation { + pname = "ascii-superset"; + version = "1.2.5.0"; + sha256 = "00i662bwrsqj34g0d9awgik2vqxxlr8y2v1xyyrhhqh5fi3s0rwk"; + libraryHaskellDepends = [ + ascii-case ascii-caseless ascii-char base bytestring hashable text + ]; + testHaskellDepends = [ + ascii-case ascii-caseless ascii-char base hspec text + ]; + description = "Representing ASCII with refined supersets"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-table" = callPackage ({ mkDerivation, aeson, base, containers, dlist, hashable, text , unordered-containers, vector, wl-pprint-extras @@ -35366,24 +35388,45 @@ self: { "ascii-th" = callPackage ({ mkDerivation, ascii-char, ascii-superset, base, bytestring - , hedgehog, template-haskell, text + , hspec, template-haskell, text }: mkDerivation { pname = "ascii-th"; - version = "1.0.0.11"; - sha256 = "14a50pxmri17nch7bcmrdflrqq5qq2z5012aiqh260iq4qsw74xq"; - revision = "1"; - editedCabalFile = "037i6n02c9xsxj5zz1nxihwgzhksbzjzd0s2a2m8ndsq3a5hgc61"; + version = "1.0.0.14"; + sha256 = "0wm0n7wr7bypdqs1cpgkcbmcwgz84lm7la2xkqflwc2kn0wr839h"; + revision = "2"; + editedCabalFile = "0a74410lmbd11j6bfh5x1rk3gyp7sybl7lqfxkkz5qws413ijli6"; libraryHaskellDepends = [ ascii-char ascii-superset base template-haskell ]; testHaskellDepends = [ - ascii-char ascii-superset base bytestring hedgehog text + ascii-char ascii-superset base bytestring hspec text ]; description = "Template Haskell support for ASCII"; license = lib.licenses.asl20; }) {}; + "ascii-th_1_2_0_0" = callPackage + ({ mkDerivation, ascii-case, ascii-caseless, ascii-char + , ascii-superset, base, bytestring, hspec, template-haskell, text + }: + mkDerivation { + pname = "ascii-th"; + version = "1.2.0.0"; + sha256 = "07v6795rfwb8h4x31kc7vdmwg9z23jf4418dcv612c27dqhx4hbg"; + libraryHaskellDepends = [ + ascii-case ascii-caseless ascii-char ascii-superset base + template-haskell + ]; + testHaskellDepends = [ + ascii-case ascii-caseless ascii-char ascii-superset base bytestring + hspec text + ]; + description = "Template Haskell support for ASCII"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-vector-avc" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, deepseq , deepseq-generics, HUnit, split, zlib @@ -35520,6 +35563,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "asif"; + broken = true; }) {}; "asil" = callPackage @@ -35539,7 +35583,6 @@ self: { description = "Action Script Instrumentation Library"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "asn" = callPackage @@ -35556,6 +35599,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "asn1-ber-syntax" = callPackage + ({ mkDerivation, array-chunks, base, base16, bytebuild, byteslice + , bytesmith, bytestring, contiguous, filepath, natural-arithmetic + , pretty-simple, primitive, QuickCheck, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text-short, vector + }: + mkDerivation { + pname = "asn1-ber-syntax"; + version = "0.1.0.0"; + sha256 = "0rdn482cdbx149m1048lk894yhdh12ac8iw0d9wmx245627j4cvd"; + libraryHaskellDepends = [ + array-chunks base bytebuild byteslice bytesmith bytestring + contiguous natural-arithmetic primitive text-short vector + ]; + testHaskellDepends = [ + base base16 byteslice bytestring filepath pretty-simple primitive + QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck + text-short + ]; + description = "ASN.1 BER Encode and Decode"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "asn1-codec" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , containers, contravariant, cryptonite, directory, hashable, HUnit @@ -36389,6 +36457,7 @@ self: { description = "Code that helps you create a valid Atlassian Connect Descriptor"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "atmos" = callPackage @@ -36467,6 +36536,8 @@ self: { libraryHaskellDepends = [ base bimap containers mtl process syb ]; description = "An EDSL for embedded hard realtime applications"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "atom-basic" = callPackage @@ -36521,7 +36592,24 @@ self: { description = "Convenience functions for using Atom with the MSP430 microcontroller family"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; + }) {}; + + "atomic-counter" = callPackage + ({ mkDerivation, async, base, primitive, QuickCheck, stm, tasty + , tasty-bench, tasty-quickcheck + }: + mkDerivation { + pname = "atomic-counter"; + version = "0.1"; + sha256 = "1vrggycr9jbnrx2gz71rfqrldmf6417kx5sp2w5g238iv6a3m9p1"; + libraryHaskellDepends = [ async base QuickCheck ]; + testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base primitive QuickCheck stm tasty tasty-bench tasty-quickcheck + ]; + doHaddock = false; + description = "Mutable counters that can be modified with atomic operatinos"; + license = lib.licenses.asl20; }) {}; "atomic-file-ops" = callPackage @@ -36766,6 +36854,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "atspkg"; + broken = true; }) {}; "ats-setup" = callPackage @@ -36826,8 +36915,8 @@ self: { pname = "attenuation"; version = "0.2.0"; sha256 = "0qp203qchmllxsrcfz04lxnssrij203i5q8byy159vc8cspd03nq"; - revision = "3"; - editedCabalFile = "1kg8pqm1ry2nm6182ncj17dfgfxvhw7px460b0kx6j6gy3p0r6l9"; + revision = "4"; + editedCabalFile = "1cp14r4i8zv3c93y78d61fxbwn8y2p7fqfp20192xy8zbnn3hdhy"; libraryHaskellDepends = [ base constraints ]; description = "Subtyping relations and variance roles"; license = lib.licenses.asl20; @@ -36839,8 +36928,8 @@ self: { pname = "attenuation-profunctors"; version = "0.1.0"; sha256 = "11zhh9iwb7r2jfp9bn8bqx1wzl4mln9v80gb2jijp0rryag25ili"; - revision = "1"; - editedCabalFile = "1y3if7w1r6lcr7287svb55pnmhhxrgl7yc906nnwr5qijbabsyvs"; + revision = "2"; + editedCabalFile = "1vwavg3c478r36qv1sz800b689cmpmldn3lyr9jl0ag1vmrff6y6"; libraryHaskellDepends = [ attenuation base constraints profunctors ]; @@ -37046,8 +37135,8 @@ self: { }: mkDerivation { pname = "attoparsec-data"; - version = "1.0.5.2"; - sha256 = "05x7xij5jyfzcl0hyjjw4lxlzgkmi55q48s5vbgvba48a2crv0qj"; + version = "1.0.5.3"; + sha256 = "00clpsv9ggkz34csdwx17fhz6sirvy71g897fwi33qzdv7sb2fx0"; libraryHaskellDepends = [ attoparsec attoparsec-time base bytestring scientific text time uuid @@ -37179,6 +37268,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "attoparsec-run" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, text }: + mkDerivation { + pname = "attoparsec-run"; + version = "0.0.1.0"; + sha256 = "0sdia624pxc0xj7lvai0hw41zjnkfz2da3vpc9mlhldiwzdwa815"; + libraryHaskellDepends = [ attoparsec base bytestring text ]; + description = "Conveniently run Attoparsec parsers"; + license = lib.licenses.asl20; + }) {}; + "attoparsec-text" = callPackage ({ mkDerivation, array, attoparsec, base, containers, text }: mkDerivation { @@ -37318,6 +37418,7 @@ self: { ]; description = "Interchange with the Audacity sound signal editor"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "audiovisual" = callPackage @@ -37576,6 +37677,18 @@ self: { broken = true; }) {}; + "auto-lift-classes" = callPackage + ({ mkDerivation, base, reflection }: + mkDerivation { + pname = "auto-lift-classes"; + version = "1"; + sha256 = "02809ihgynxc20riycghgiw016xpgqh7234bs8m1ilvr7hnnwpr1"; + libraryHaskellDepends = [ base reflection ]; + testHaskellDepends = [ base ]; + description = "Deriving (Show|Read)(1|2)"; + license = lib.licenses.bsd3; + }) {}; + "auto-update" = callPackage ({ mkDerivation, base, exceptions, hspec, HUnit, retry }: mkDerivation { @@ -37639,6 +37752,7 @@ self: { ]; description = "Autodocodec interpreters for openapi3"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "autodocodec-schema" = callPackage @@ -37699,8 +37813,8 @@ self: { }: mkDerivation { pname = "autodocodec-yaml"; - version = "0.2.0.2"; - sha256 = "164nrmpxrwyr49f0gczi2sixzrs3sv2pn8j293s9avw684aq2prx"; + version = "0.2.0.3"; + sha256 = "00cf3zz0jgnqq45rkpf5a9jlds16rgfc15ndhv1fgq7yz935g93f"; libraryHaskellDepends = [ autodocodec autodocodec-schema base bytestring containers path path-io safe-coloured-text scientific text unordered-containers @@ -37708,8 +37822,6 @@ self: { ]; description = "Autodocodec interpreters for yaml"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "autoexporter" = callPackage @@ -38165,8 +38277,6 @@ self: { ]; description = "Avro serialization support for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "avro-piper" = callPackage @@ -38329,6 +38439,8 @@ self: { pname = "aws-arn"; version = "0.3.0.0"; sha256 = "042lzvm1wpdqfrmgl1ygqgkdisvjyf9jfg9aqnibwhk2pw354dj3"; + revision = "1"; + editedCabalFile = "15l89gbz5lzc5v9v872cqdjkvpkiamx4qa6zpl6l4j8b24wkrcay"; libraryHaskellDepends = [ base deriving-compat hashable profunctors tagged text ]; @@ -38348,10 +38460,8 @@ self: { }: mkDerivation { pname = "aws-cloudfront-signed-cookies"; - version = "0.2.0.10"; - sha256 = "1mzsg6wfzgiippl8kw54m16i1m7zxwfqfwx3wbb3m372pg4h9sza"; - revision = "5"; - editedCabalFile = "1d9zsm2y08mzgr25wk3bf1laz918vbjvrfh7kc56r1naiqqprj74"; + version = "0.2.0.12"; + sha256 = "1gdam3h8ir1lz8phhj03ckiv0f371xl79adi4kz2yqk2ayvcixhv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38366,33 +38476,6 @@ self: { mainProgram = "aws-cloudfront-signed-cookies"; }) {}; - "aws-cloudfront-signed-cookies_0_2_0_11" = callPackage - ({ mkDerivation, aeson, aeson-pretty, asn1-encoding, asn1-types - , base, base64-bytestring, bytestring, cookie, cryptonite, hedgehog - , lens, lens-aeson, neat-interpolation, optparse-applicative, pem - , text, time, vector - }: - mkDerivation { - pname = "aws-cloudfront-signed-cookies"; - version = "0.2.0.11"; - sha256 = "018a3q443h19pbcc178ns7zdmsdd3pz8ww3yfixrhr4jfghws3r9"; - revision = "4"; - editedCabalFile = "1rkwa74h6kwpypr7z0fjv8l83n06b27zan1fxgpzsdrhq6d700vj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty asn1-encoding asn1-types base base64-bytestring - bytestring cookie cryptonite lens lens-aeson optparse-applicative - pem text time vector - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hedgehog neat-interpolation ]; - description = "Generate signed cookies for AWS CloudFront"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - mainProgram = "aws-cloudfront-signed-cookies"; - }) {}; - "aws-cloudfront-signer" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring , bytestring, crypto-pubkey-types, RSA, time @@ -39958,8 +40041,8 @@ self: { }: mkDerivation { pname = "barbies"; - version = "2.0.3.1"; - sha256 = "0gfzb52k3py1qnr2b6gshdg7c9aj1j9y2xsdhz86n01ybv81yg51"; + version = "2.0.4.0"; + sha256 = "0v8bckxi58fkqgf1i1xd3100wp792pzd319xlfvmmw8z0ii1g872"; libraryHaskellDepends = [ base distributive transformers ]; testHaskellDepends = [ base distributive QuickCheck tasty tasty-hunit tasty-quickcheck @@ -40147,19 +40230,6 @@ self: { }) {}; "base-compat" = callPackage - ({ mkDerivation, base, unix }: - mkDerivation { - pname = "base-compat"; - version = "0.11.2"; - sha256 = "1nyvkaij4m01jndw72xl8931czz1xp6jpnynpajabys2ahabb9jk"; - revision = "1"; - editedCabalFile = "0h6vr19vr5bhm69w8rvswbvd4xgazggkcq8vz934x69www2cpgri"; - libraryHaskellDepends = [ base unix ]; - description = "A compatibility layer for base"; - license = lib.licenses.mit; - }) {}; - - "base-compat_0_12_2" = callPackage ({ mkDerivation, base, ghc-prim, unix }: mkDerivation { pname = "base-compat"; @@ -40168,25 +40238,9 @@ self: { libraryHaskellDepends = [ base ghc-prim unix ]; description = "A compatibility layer for base"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "base-compat-batteries" = callPackage - ({ mkDerivation, base, base-compat, hspec, hspec-discover - , QuickCheck - }: - mkDerivation { - pname = "base-compat-batteries"; - version = "0.11.2"; - sha256 = "08rh9nlm9ir28fm42xim06ga8qwdqdcvkbb5ckz99bwnmajndq1i"; - libraryHaskellDepends = [ base base-compat ]; - testHaskellDepends = [ base hspec QuickCheck ]; - testToolDepends = [ hspec-discover ]; - description = "base-compat with extra batteries"; - license = lib.licenses.mit; - }) {}; - - "base-compat-batteries_0_12_2" = callPackage ({ mkDerivation, base, base-compat, ghc-prim, hspec, hspec-discover , QuickCheck }: @@ -40199,7 +40253,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "base-compat with extra batteries"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "base-compat-migrate" = callPackage @@ -40331,10 +40384,8 @@ self: { }: mkDerivation { pname = "base16"; - version = "0.3.2.0"; - sha256 = "149kpmx63b8bmlwjpldkxxb4ldf28qz4h4i3ars6dwlyhzxg6qav"; - revision = "1"; - editedCabalFile = "0jlynzbrd9bl7gdnh4hwnf5b4s90yy0jjfr5zg5pw720lb4601y3"; + version = "0.3.2.1"; + sha256 = "0ybmcik5nlly7s9bfwlaqqk8jpgwxp5ac4bhdiq4lckbfynvm0qf"; libraryHaskellDepends = [ base bytestring deepseq primitive text text-short ]; @@ -40396,6 +40447,8 @@ self: { ]; description = "Optics for the Base16 library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "base32" = callPackage @@ -40449,6 +40502,8 @@ self: { ]; description = "Optics for the Base32 library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "base32-z-bytestring" = callPackage @@ -40541,14 +40596,15 @@ self: { "base62" = callPackage ({ mkDerivation, base, bytebuild, byteslice, doctest , natural-arithmetic, primitive, tasty, tasty-hunit - , tasty-quickcheck, wide-word + , tasty-quickcheck, wide-word, word-compat }: mkDerivation { pname = "base62"; - version = "0.1.0.1"; - sha256 = "0jfxbg9il8wiaaxdxjkp5kk6jph2b12qi9aiilb1y23h67lxmh2h"; + version = "0.1.0.2"; + sha256 = "14jjh2c5fhdjq7bwy3i3yff1mihmixjfs36fa8l9w0qvgpdl01qp"; libraryHaskellDepends = [ base bytebuild byteslice natural-arithmetic primitive wide-word + word-compat ]; testHaskellDepends = [ base byteslice doctest primitive tasty tasty-hunit tasty-quickcheck @@ -40589,18 +40645,18 @@ self: { "base64-bytes" = callPackage ({ mkDerivation, base, base64, base64-bytestring, byte-order , bytebuild, byteslice, bytestring, gauge, natural-arithmetic - , primitive, random, run-st, small-bytearray-builder + , primitive, random, run-st, word-compat }: mkDerivation { pname = "base64-bytes"; - version = "0.1.0.0"; - sha256 = "1h6hy4vqhramad2qbz91qirvc9vs2n67ni8qwagmimx0n4ds4w07"; + version = "0.1.1.0"; + sha256 = "0f0a0lj6k4k5b2mk9fbdl28x09h3mah5j44sj04k4ckdifkx3qw3"; libraryHaskellDepends = [ base byte-order bytebuild byteslice natural-arithmetic primitive - run-st + run-st word-compat ]; testHaskellDepends = [ - base byteslice natural-arithmetic primitive small-bytearray-builder + base bytebuild byteslice natural-arithmetic primitive ]; benchmarkHaskellDepends = [ base base64 base64-bytestring byteslice bytestring gauge primitive @@ -40608,7 +40664,6 @@ self: { ]; description = "Base64 encoding of byte sequences"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "base64-bytestring" = callPackage @@ -40688,6 +40743,8 @@ self: { ]; description = "Optics for the Base64 library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "base64-string" = callPackage @@ -41176,6 +41233,7 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Compute number of possible arrangements in the battleship game"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "battleship-combinatorics"; }) {}; @@ -41317,7 +41375,6 @@ self: { ]; description = "Language tags as specified by BCP 47"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "bcp47-orphans" = callPackage @@ -41337,7 +41394,6 @@ self: { ]; description = "BCP47 orphan instances"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "bcrypt" = callPackage @@ -41513,26 +41569,28 @@ self: { ({ mkDerivation, aeson, base, beam-core, beam-postgres, bytestring , containers, criterion, deepseq, dlist , gargoyle-postgresql-connect, microlens, mtl, postgresql-simple - , pretty-simple, QuickCheck, quickcheck-instances, resource-pool - , scientific, splitmix, string-conv, tasty, tasty-quickcheck, text - , time, transformers, uuid, vector + , postgresql-syntax, pretty-simple, QuickCheck + , quickcheck-instances, resource-pool, scientific, splitmix + , string-conv, syb, tasty, tasty-quickcheck, text, time + , transformers, uuid, vector }: mkDerivation { pname = "beam-automigrate"; - version = "0.1.2.0"; - sha256 = "1y7i553zwm46k39k72l400rh2g8k6k2crjj2wdmkn9nndv1x7545"; + version = "0.1.3.0"; + sha256 = "04ihkc2zdflvsz4b94q6kf806hdaxin5gl1h4avp4lbjwzcjqvif"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base beam-core beam-postgres bytestring containers deepseq - dlist microlens mtl postgresql-simple pretty-simple QuickCheck - quickcheck-instances scientific splitmix string-conv text time - transformers uuid vector + dlist gargoyle-postgresql-connect microlens mtl postgresql-simple + pretty-simple QuickCheck quickcheck-instances resource-pool + scientific splitmix string-conv tasty text time transformers uuid + vector ]; executableHaskellDepends = [ aeson base beam-core beam-postgres bytestring containers - gargoyle-postgresql-connect postgresql-simple resource-pool text - time + postgresql-simple postgresql-syntax pretty-simple QuickCheck syb + tasty tasty-quickcheck text time ]; testHaskellDepends = [ base containers pretty-simple QuickCheck tasty tasty-quickcheck @@ -41542,6 +41600,7 @@ self: { base beam-postgres bytestring containers criterion deepseq postgresql-simple QuickCheck splitmix ]; + doHaddock = false; description = "DB migration library for beam, targeting Postgres"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -41729,8 +41788,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.13.7"; - sha256 = "1synznzas89cyp05lhiwxfsbmz5zv2pyjn08548dr21ih1x4560j"; + version = "0.14"; + sha256 = "0iyymq8iagdaymivvfg1vvks76bzaiyysw5mj4ifqn2zc9pyb3wd"; libraryHaskellDepends = [ base deepseq dunai MonadRandom mtl simple-affine-space transformers ]; @@ -42070,8 +42129,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "benri-hspec"; - version = "0.1.0.0"; - sha256 = "0vvc7fw52c9flmdjmgrc9cca9yrl4r7yvh2l5ixc23gvvmlhdycy"; + version = "0.1.0.1"; + sha256 = "11x7dsp6hmz1an1nm8076lgdvgd8r67hl54p81jprpi8m0lh6mqa"; libraryHaskellDepends = [ base hspec ]; description = "Simplify tests where Either or Maybe types are returned from monadic code"; license = lib.licenses.bsd3; @@ -42127,6 +42186,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "berp"; + broken = true; }) {}; "bert" = callPackage @@ -42213,22 +42273,22 @@ self: { }) {}; "betris" = callPackage - ({ mkDerivation, ansi-terminal, base, containers, lens, linear - , optparse-applicative, random, stm, time-units, vty + ({ mkDerivation, ansi-terminal, base, containers, linear, microlens + , microlens-th, optparse-applicative, random, stm, time-units, vty }: mkDerivation { pname = "betris"; - version = "0.2.2.0"; - sha256 = "0ch0gm2fpzga0mqc8n8hdhs5qjfrcm5jxcyqgskwgq1y5jf60ifl"; + version = "0.2.3.0"; + sha256 = "0nqwz88hfhfrcfdd3224cc54yzdqz8hgq358pxyvp5im006didcx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base containers lens linear optparse-applicative - random stm time-units vty + ansi-terminal base containers linear microlens microlens-th + optparse-applicative random stm time-units vty ]; executableHaskellDepends = [ - ansi-terminal base containers lens linear optparse-applicative - random stm time-units vty + ansi-terminal base containers linear microlens microlens-th + optparse-applicative random stm time-units vty ]; description = "A horizontal version of tetris for braille users"; license = lib.licenses.bsd3; @@ -42305,7 +42365,6 @@ self: { ]; description = "Implementation of the BGAPI serial protocol"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "bglibtest"; }) {}; @@ -42356,9 +42415,7 @@ self: { ]; description = "Simple terminal GUI for local hoogle"; license = "(BSD-3-Clause OR Apache-2.0)"; - hydraPlatforms = lib.platforms.none; mainProgram = "bhoogle"; - broken = true; }) {}; "bibdb" = callPackage @@ -42471,7 +42528,6 @@ self: { description = "Prototype Implementation of Combining Syntactic and Semantic Bidirectionalization (ICFP'10)"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bidispec" = callPackage @@ -42521,8 +42577,8 @@ self: { }: mkDerivation { pname = "bifunctors"; - version = "5.5.13"; - sha256 = "1myvlzxk9xrm6vf9863wnv8py3ccgfxqxyc0sqxz0v3rwfnjgk16"; + version = "5.5.14"; + sha256 = "0r4jd4s66xvnx0bk75rz0cwnf6cr0lgx3dxrqdv3ppkwqk81c0ak"; libraryHaskellDepends = [ base base-orphans comonad containers tagged template-haskell th-abstraction transformers @@ -42669,24 +42725,6 @@ self: { }) {}; "bimap" = callPackage - ({ mkDerivation, base, containers, deepseq, exceptions, QuickCheck - , template-haskell - }: - mkDerivation { - pname = "bimap"; - version = "0.4.0"; - sha256 = "1794iykd7rhj29y0w4vyjyn6wnw28hi8sxzvm1j5ivdzmf39d8yi"; - revision = "1"; - editedCabalFile = "111wyqh17a6pkjhyaz8n1891m69hwr2gybqcpacw4xdmarxmi7f5"; - libraryHaskellDepends = [ base containers deepseq exceptions ]; - testHaskellDepends = [ - base containers deepseq exceptions QuickCheck template-haskell - ]; - description = "Bidirectional mapping between two key types"; - license = lib.licenses.bsd3; - }) {}; - - "bimap_0_5_0" = callPackage ({ mkDerivation, base, containers, deepseq, exceptions, QuickCheck , template-haskell }: @@ -42700,7 +42738,6 @@ self: { ]; description = "Bidirectional mapping between two key types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bimap-server" = callPackage @@ -43034,8 +43071,6 @@ self: { ]; description = "Read and write values of types that implement Binary"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "binary-list" = callPackage @@ -43076,7 +43111,7 @@ self: { pname = "binary-orphans"; version = "1.0.3"; sha256 = "0b302hhjaybwbnpzrd8qmdp24g2xj2svib34zfxqqxg67j159rg2"; - libraryHaskellDepends = [ base binary OneTuple transformers ]; + libraryHaskellDepends = [ base binary transformers ]; testHaskellDepends = [ base binary OneTuple QuickCheck quickcheck-instances tagged tasty tasty-quickcheck @@ -43103,6 +43138,25 @@ self: { license = lib.licenses.mit; }) {}; + "binary-parser_0_5_7_3" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, mtl, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + , transformers + }: + mkDerivation { + pname = "binary-parser"; + version = "0.5.7.3"; + sha256 = "1l739h7aixw6dlwbblk7g2cablyn6265715mwywwjq7wb73va1vd"; + libraryHaskellDepends = [ base bytestring mtl text transformers ]; + testHaskellDepends = [ + base base-prelude bytestring mtl QuickCheck quickcheck-instances + tasty tasty-hunit tasty-quickcheck text transformers + ]; + description = "An efficient but limited parser API specialised to bytestrings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary-parsers" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , bytestring-lexing, case-insensitive, criterion, deepseq @@ -43130,6 +43184,8 @@ self: { ]; description = "Extends binary with parsec/attoparsec style parsing combinators"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "binary-protocol" = callPackage @@ -43260,6 +43316,8 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Binary deserialisation using strict ByteStrings"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "binary-tagged" = callPackage @@ -44296,6 +44354,8 @@ self: { pname = "binrep"; version = "0.3.1"; sha256 = "01adzragxiick3l2q4cm0x1xd2pmrxw9xl8m39ysk9l8d15b0n4n"; + revision = "1"; + editedCabalFile = "17l5x2vpdwdp6x14n1wayh6751cpsxsywj205n94khnm1cgcfp1a"; libraryHaskellDepends = [ aeson base bytestring either flatparse mason megaparsec refined strongweak text text-icu vector vector-sized @@ -44308,7 +44368,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Encode precise binary representations directly in types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.raehik ]; }) {}; "bins" = callPackage @@ -44327,8 +44387,6 @@ self: { ]; description = "Aggregate continuous values into discrete bins"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "binsm" = callPackage @@ -44346,7 +44404,9 @@ self: { ]; description = "binary files splitter and merger"; license = "unknown"; + hydraPlatforms = lib.platforms.none; mainProgram = "binsm"; + broken = true; }) {}; "bio" = callPackage @@ -44597,6 +44657,8 @@ self: { pname = "bip32"; version = "0.2"; sha256 = "1ji71m6mdnhqscadrmxs4pwb18cc5j91dhlnqs3d76gk32fyy32q"; + revision = "1"; + editedCabalFile = "0069h82abfgy824zpkdfljwm2y6g7hm5q7yjxrrc08abdn72dkg2"; libraryHaskellDepends = [ base base58-bytestring binary bitcoin-hash bitcoin-keys bytestring ]; @@ -44677,6 +44739,8 @@ self: { testHaskellDepends = [ base ]; description = "Birds of Paradise"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bisc" = callPackage @@ -44701,25 +44765,24 @@ self: { }) {}; "biscuit-haskell" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring - , base64, bytestring, cereal, containers, criterion, cryptonite - , lens, lens-aeson, memory, mtl, parser-combinators, protobuf - , random, regex-tdfa, tasty, tasty-hunit, template-haskell, text + ({ mkDerivation, aeson, async, base, base16, base64, bytestring + , cereal, containers, criterion, cryptonite, lens, lens-aeson + , megaparsec, memory, mtl, parser-combinators, protobuf, random + , regex-tdfa, tasty, tasty-hunit, template-haskell, text , th-lift-instances, time, validation-selective }: mkDerivation { pname = "biscuit-haskell"; - version = "0.2.1.0"; - sha256 = "12c5cl3gc0518b7vrzc0v56ch8rlsc5xvdmhj8lxr085xm16dqng"; + version = "0.3.0.0"; + sha256 = "07n5s6rlalxq12ha8fk8j2ghq015p56n23pdp4y5ba3ax58lgg9b"; libraryHaskellDepends = [ - async attoparsec base base16-bytestring base64 bytestring cereal - containers cryptonite memory mtl parser-combinators protobuf random - regex-tdfa template-haskell text th-lift-instances time - validation-selective + async base base16 base64 bytestring cereal containers cryptonite + megaparsec memory mtl parser-combinators protobuf random regex-tdfa + template-haskell text th-lift-instances time validation-selective ]; testHaskellDepends = [ - aeson async attoparsec base base16-bytestring base64 bytestring - cereal containers cryptonite lens lens-aeson mtl parser-combinators + aeson async base base16 base64 bytestring cereal containers + cryptonite lens lens-aeson megaparsec mtl parser-combinators protobuf random tasty tasty-hunit template-haskell text th-lift-instances time validation-selective ]; @@ -44737,13 +44800,13 @@ self: { }: mkDerivation { pname = "biscuit-servant"; - version = "0.2.1.0"; - sha256 = "1sw496bfvh5kfyb1f0sczjayb5b2vq14x2vdmww99knjjvn0ibxp"; + version = "0.3.0.0"; + sha256 = "1dky9skcfd25pf0plfd5x7framqsvw98ab96xxmnsy6825h6qazd"; libraryHaskellDepends = [ base biscuit-haskell bytestring mtl servant-server text wai ]; testHaskellDepends = [ - base biscuit-haskell bytestring hspec http-client servant + base biscuit-haskell bytestring hspec http-client mtl servant servant-client servant-client-core servant-server text time warp ]; description = "Servant support for the Biscuit security token"; @@ -45165,7 +45228,6 @@ self: { ]; description = "Resources for working with miniscript, and script descriptors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bitcoin-tx" = callPackage @@ -45520,6 +45582,8 @@ self: { ]; description = "Fast, packed, strict and lazy bit streams with stream fusion"; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bitstring" = callPackage @@ -45616,8 +45680,8 @@ self: { pname = "bitwise"; version = "1.0.0.1"; sha256 = "03xyzdkyb99gvm9g5chl07rqbnm7qrxba7wgmrfmal0rkwm0ibkn"; - revision = "5"; - editedCabalFile = "0qfg5kwpavyikgyazwz8mwaykw5j6f3b1i5m0khdja4jbb3f1h04"; + revision = "6"; + editedCabalFile = "0m4swiml8zggzvwzip2yw77y6crhf10a7imy6fj5yq0b9vd2mqkf"; libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ array base bytestring criterion ]; @@ -45984,6 +46048,7 @@ self: { ]; description = "Auto-generated interface to Fortran BLAS via comfort-array"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "blas-ffi" = callPackage @@ -46191,7 +46256,6 @@ self: { description = "Some contributions to add handy things to blaze html"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "blaze-html-hexpat" = callPackage @@ -46520,20 +46584,19 @@ self: { "blockfrost-api" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default - , data-default-class, deriving-aeson, hspec, lens, QuickCheck - , quickcheck-instances, raw-strings-qq, safe-money, servant - , servant-docs, servant-multipart-api, tasty, tasty-discover - , tasty-hspec, tasty-hunit, template-haskell, text, time, vector + , data-default-class, deriving-aeson, hspec, lens, raw-strings-qq + , safe-money, servant, servant-docs, servant-multipart-api, tasty + , tasty-discover, tasty-hspec, tasty-hunit, template-haskell, text + , time, vector }: mkDerivation { pname = "blockfrost-api"; - version = "0.7.0.0"; - sha256 = "0s2ri7g6gxfkcvpf5z7s08qhs60snbpxz75gjaw9bab3h49aadnc"; + version = "0.8.0.0"; + sha256 = "030q47qxk8hzrff1dz0m7409kg3a7fg978c0776dw1l0bljk0v0a"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deriving-aeson - lens QuickCheck quickcheck-instances safe-money servant - servant-docs servant-multipart-api template-haskell text time - vector + lens safe-money servant servant-docs servant-multipart-api + template-haskell text time vector ]; testHaskellDepends = [ aeson base bytestring containers data-default hspec raw-strings-qq @@ -46548,12 +46611,12 @@ self: { ({ mkDerivation, base, blockfrost-api, blockfrost-client-core , bytestring, data-default, directory, filepath, hspec, mtl , servant, servant-client, servant-client-core, tasty - , tasty-discover, tasty-hspec, tasty-hunit, tasty-quickcheck, text + , tasty-discover, tasty-hspec, tasty-hunit, text }: mkDerivation { pname = "blockfrost-client"; - version = "0.7.0.0"; - sha256 = "19gf6shsjikhrbd898504vapii2x49h7pnzv86r1k45ypmibhira"; + version = "0.7.1.1"; + sha256 = "1k795lar667y5ai484cmrv5cvzdcca165cgvai9234b721by80jx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46561,9 +46624,7 @@ self: { directory filepath mtl servant servant-client servant-client-core text ]; - testHaskellDepends = [ - base hspec tasty tasty-hspec tasty-hunit tasty-quickcheck - ]; + testHaskellDepends = [ base hspec tasty tasty-hspec tasty-hunit ]; testToolDepends = [ tasty-discover ]; description = "blockfrost.io basic client"; license = lib.licenses.asl20; @@ -47053,7 +47114,6 @@ self: { ]; description = "Generate CSV Exports of Your BNB Staking Rewards"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "bnb-staking-csvs"; }) {}; @@ -47102,6 +47162,7 @@ self: { ]; description = "Three games for inclusion in a web server"; license = "GPL"; + hydraPlatforms = lib.platforms.none; mainProgram = "board-games"; }) {}; @@ -47413,7 +47474,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "readme"; - broken = true; }) {}; "bookkeeper-permissions" = callPackage @@ -47495,6 +47555,8 @@ self: { ]; description = "Logical combinatory operations dealing with datatypes representing booleans by their constructors"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "boolean-list" = callPackage @@ -47625,8 +47687,8 @@ self: { }: mkDerivation { pname = "boomerang"; - version = "1.4.8"; - sha256 = "141rs9q8i89118ldplm90zqzkjff3jwqhsdld4vp4ipc26f9gjdl"; + version = "1.4.8.1"; + sha256 = "1hal4z1c1skqjq7vvjql0gm2rhfgrrlj29rgchjwlr2hm22zgnjp"; libraryHaskellDepends = [ base mtl semigroups template-haskell text th-abstraction ]; @@ -47688,7 +47750,6 @@ self: { ]; description = "Mathematically sound sound synthesis"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "perfprof"; }) {}; @@ -47728,7 +47789,6 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "demo-app"; - broken = true; }) {}; "boots-cloud" = callPackage @@ -47871,22 +47931,22 @@ self: { }) {}; "borsh" = callPackage - ({ mkDerivation, base, bytestring, containers, generics-sop, memory + ({ mkDerivation, base, bytestring, containers, generics-sop , optics-core, profunctors, QuickCheck, quickcheck-instances , sop-core, tasty, tasty-quickcheck, text, vector, wide-word }: mkDerivation { pname = "borsh"; - version = "0.1.0"; - sha256 = "0nyv91sn2v8m1zlp789v85dm9n21k9gb532rkzhdds5fpvqa6w3z"; + version = "0.2.0"; + sha256 = "0jvyjv7wg8a9f4wncxh3ddrqhnk7wdj45fyz29arnfj4hwdqijj3"; libraryHaskellDepends = [ - base bytestring containers generics-sop memory sop-core text vector + base bytestring containers generics-sop sop-core text vector wide-word ]; testHaskellDepends = [ base bytestring containers generics-sop optics-core profunctors QuickCheck quickcheck-instances sop-core tasty tasty-quickcheck - text + text wide-word ]; description = "Implementation of BORSH serialisation"; license = lib.licenses.bsd3; @@ -47916,6 +47976,7 @@ self: { libraryHaskellDepends = [ base semigroups zero ]; description = "Like Maybe, but with a different Monoid instance"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "botpp" = callPackage @@ -48075,8 +48136,6 @@ self: { libraryHaskellDepends = [ base lens ]; description = "A generic boundingbox for an arbitrary vector"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bower-json_1_0_0_1" = callPackage @@ -48135,7 +48194,6 @@ self: { license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "bowntz"; - broken = true; }) {}; "box" = callPackage @@ -48415,8 +48473,8 @@ self: { }: mkDerivation { pname = "breakpoint"; - version = "0.1.1.1"; - sha256 = "1hyfsn4wgiz2zzlihncq9lj18k7nzd4wq2z53xbnp1palspjqjp2"; + version = "0.1.2.0"; + sha256 = "1hk9mjijxvqjzcfqllzi53rmxiyggbxash05jbb742wrq832h2xw"; libraryHaskellDepends = [ ansi-terminal base containers ghc haskeline mtl pretty-simple template-haskell text transformers @@ -48466,32 +48524,6 @@ self: { broken = true; }) {}; - "brick" = callPackage - ({ mkDerivation, base, bytestring, config-ini, containers - , contravariant, data-clist, deepseq, directory, dlist, exceptions - , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm - , template-haskell, text, text-zipper, transformers, unix, vector - , vty, word-wrap - }: - mkDerivation { - pname = "brick"; - version = "0.68.1"; - sha256 = "17pzp9p4rmd82smxwz2kh1jjd5ssy5b86jnv7a4ac1g1zgnnki0r"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring config-ini containers contravariant data-clist - deepseq directory dlist exceptions filepath microlens microlens-mtl - microlens-th stm template-haskell text text-zipper transformers - unix vector vty word-wrap - ]; - testHaskellDepends = [ - base containers microlens QuickCheck vector - ]; - description = "A declarative terminal user interface library"; - license = lib.licenses.bsd3; - }) {}; - "brick_0_70_1" = callPackage ({ mkDerivation, base, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, exceptions @@ -48546,7 +48578,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "brick_1_4" = callPackage + "brick" = callPackage ({ mkDerivation, base, bimap, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, exceptions , filepath, microlens, microlens-mtl, microlens-th, mtl, QuickCheck @@ -48570,6 +48602,32 @@ self: { ]; description = "A declarative terminal user interface library"; license = lib.licenses.bsd3; + }) {}; + + "brick_1_5" = callPackage + ({ mkDerivation, base, bimap, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, exceptions + , filepath, microlens, microlens-mtl, microlens-th, mtl, QuickCheck + , stm, template-haskell, text, text-zipper, unix, vector, vty + , word-wrap + }: + mkDerivation { + pname = "brick"; + version = "1.5"; + sha256 = "0kszp6yrpqc9v87m38rladhmn8xcdbrrh05xr6fi936n34bhi432"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bimap bytestring config-ini containers contravariant + data-clist deepseq directory exceptions filepath microlens + microlens-mtl microlens-th mtl stm template-haskell text + text-zipper unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector vty + ]; + description = "A declarative terminal user interface library"; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -48610,6 +48668,8 @@ self: { free vector vty ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "brick-panes" = callPackage @@ -48618,8 +48678,8 @@ self: { }: mkDerivation { pname = "brick-panes"; - version = "1.0.0.2"; - sha256 = "1g6q9pnc0a0fnp2qaxqxp8qdriifi6w362ky36csxl633nl6gsw0"; + version = "1.0.0.3"; + sha256 = "0qqm896gyabdscngafgmf4avajs5szds1l6fs0bw2p11xiirhc14"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vty ]; @@ -48630,12 +48690,10 @@ self: { testHaskellDepends = [ base ]; description = "Panes library for Brick providing composition and isolation for TUI apps"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; mainProgram = "mywork-example"; - broken = true; }) {}; - "brick-skylighting" = callPackage + "brick-skylighting_0_3" = callPackage ({ mkDerivation, base, brick, containers, skylighting-core, text , vty }: @@ -48650,9 +48708,10 @@ self: { ]; description = "Show syntax-highlighted text in your Brick UI"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; - "brick-skylighting_1_0" = callPackage + "brick-skylighting" = callPackage ({ mkDerivation, base, brick, containers, skylighting-core, text , vty }: @@ -48667,7 +48726,6 @@ self: { ]; description = "Show syntax-highlighted text in your Brick UI"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bricks" = callPackage @@ -48848,6 +48906,7 @@ self: { license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "brittany"; + broken = true; }) {}; "brittany" = callPackage @@ -48883,7 +48942,9 @@ self: { ]; description = "Haskell source code formatter"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "brittany"; + broken = true; }) {}; "broadcast-chan" = callPackage @@ -48920,6 +48981,7 @@ self: { ]; description = "Conduit-based parallel streaming code for broadcast-chan"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "broadcast-chan-pipes" = callPackage @@ -48938,6 +49000,7 @@ self: { ]; description = "Pipes-based parallel streaming code for broadcast-chan"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "broadcast-chan-tests" = callPackage @@ -48962,6 +49025,8 @@ self: { ]; description = "Helpers for generating tests for broadcast-chan"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "broccoli" = callPackage @@ -49374,7 +49439,6 @@ self: { description = "A backend agnostic, concurrent BTree"; license = "LGPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "btrfs" = callPackage @@ -49728,10 +49792,10 @@ self: { }: mkDerivation { pname = "bugzilla-redhat"; - version = "1.0.0"; - sha256 = "1g95j03y2sg1fwdf48a05nijqllkd0m7scn1wbfyzvb57q716hlx"; - revision = "5"; - editedCabalFile = "13fmsnvjgg2hh5hqr5mvyykafpf770lrwiq7g67i75w6594nippn"; + version = "1.0.1"; + sha256 = "19dir39yxqd5psf3gj4f3vhcbdad1np7374nkxfk0gg4xxvywcvi"; + revision = "1"; + editedCabalFile = "1yai855w6s9xjyswpx206hnryi1y6kda1310vcfff0ghl4gdxpxw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50052,6 +50116,7 @@ self: { description = "Haskell interface to the Bus Pirate binary interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "buster" = callPackage @@ -50315,6 +50380,7 @@ self: { ]; description = "a bitvector datatype that is parameterized by the vector width"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "bv-sized-lens" = callPackage @@ -50326,6 +50392,7 @@ self: { libraryHaskellDepends = [ base bv-sized lens parameterized-utils ]; description = "Well-typed lenses for bv-sized bitvectors"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "by-other-names" = callPackage @@ -50334,8 +50401,8 @@ self: { }: mkDerivation { pname = "by-other-names"; - version = "1.2.1.0"; - sha256 = "1l6b47qxr8hidknl2r7gwp9civlz450z4nxyv98nfkh86bhsdnfm"; + version = "1.2.3.0"; + sha256 = "1hr3r18i0vi86pdcwdlj6116m58bkpyd1x2r4rhf4yv2lsak7sb7"; libraryHaskellDepends = [ aeson base indexed-traversable template-haskell text ]; @@ -50447,8 +50514,8 @@ self: { }: mkDerivation { pname = "bytebuild"; - version = "0.3.11.0"; - sha256 = "0yxss8r5msgbp812xb0k1xsmil02zmh7n8nh7jdfkm8byf3l4saf"; + version = "0.3.12.0"; + sha256 = "0n87jhn46yafnd3kjy07nxs2f36s99xk89x6cwkhiwhvz5hw6c2v"; libraryHaskellDepends = [ base byteslice bytestring haskell-src-meta integer-logarithms natural-arithmetic primitive primitive-offset primitive-unlifted @@ -50522,7 +50589,6 @@ self: { ]; description = "Fast logging"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "byteorder" = callPackage @@ -50569,6 +50635,8 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "bytepatch"; + maintainers = [ lib.maintainers.raehik ]; + broken = true; }) {}; "bytes" = callPackage @@ -50628,6 +50696,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "byteslice_0_2_9_0" = callPackage + ({ mkDerivation, base, bytestring, gauge, primitive, primitive-addr + , primitive-unlifted, quickcheck-classes, run-st, tasty + , tasty-hunit, tasty-quickcheck, text, text-short, transformers + , tuples, vector + }: + mkDerivation { + pname = "byteslice"; + version = "0.2.9.0"; + sha256 = "0rqlpqcnyfwl2m4jy8k7n062drdwpvd3j622f4z4fxyhd84dxv5y"; + libraryHaskellDepends = [ + base bytestring primitive primitive-addr primitive-unlifted run-st + text text-short tuples vector + ]; + testHaskellDepends = [ + base bytestring primitive quickcheck-classes tasty tasty-hunit + tasty-quickcheck text transformers + ]; + benchmarkHaskellDepends = [ base gauge primitive ]; + description = "Slicing managed and unmanaged memory"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bytesmith" = callPackage ({ mkDerivation, base, byte-order, byteslice, bytestring , contiguous, gauge, primitive, run-st, tasty, tasty-hunit @@ -50635,10 +50727,8 @@ self: { }: mkDerivation { pname = "bytesmith"; - version = "0.3.9.0"; - sha256 = "0jmx4flf3j5a4gyrw79cxiybp6f7y0rm9ifmrxypxpwrwc220zjg"; - revision = "1"; - editedCabalFile = "0ly247yj2ay0fpj5v3dqp0hava1wrllqhphf7k3hcifpi5zfr8i0"; + version = "0.3.9.1"; + sha256 = "10d0wzinc30b2xc26cfadvpn29gf30gnppysyl3n35ym3p9lnhm2"; libraryHaskellDepends = [ base byteslice bytestring contiguous primitive run-st text-short wide-word @@ -51239,6 +51329,8 @@ self: { librarySystemDepends = [ bzip2 ]; description = "Compression and decompression in the bzip2 format"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) bzip2;}; "bzlib-conduit" = callPackage @@ -51628,6 +51720,18 @@ self: { license = lib.licenses.agpl3Only; }) {}; + "cabal-appimage_0_4_0_0" = callPackage + ({ mkDerivation, base, Cabal, filepath }: + mkDerivation { + pname = "cabal-appimage"; + version = "0.4.0.0"; + sha256 = "1ws5alrffpzr6yikwsq6yvazdqbclbsa509rc4csc7dmka8xc4dp"; + libraryHaskellDepends = [ base Cabal filepath ]; + description = "Cabal support for creating AppImage applications"; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "cabal-audit" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, HTTP , optparse-applicative @@ -51719,19 +51823,17 @@ self: { "cabal-cache" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-optparse-applicative, antiope-s3, base - , bytestring, containers, cryptonite, deepseq, directory - , exceptions, filepath, generic-lens, hedgehog, hspec - , hspec-discover, http-client, http-client-tls, http-types + , bytestring, cabal-install-parsers, containers, cryptonite + , deepseq, directory, exceptions, filepath, generic-lens, hedgehog + , hspec, hspec-discover, http-client, http-client-tls, http-types , hw-hspec-hedgehog, lens, mtl, network-uri, optparse-applicative , process, raw-strings-qq, relation, resourcet, stm, stringsearch , temporary, text, topograph, transformers, unliftio }: mkDerivation { pname = "cabal-cache"; - version = "1.0.4.0"; - sha256 = "1qh2cy0mwslqfdw747jkvvfbdma0c3mmjd5kpv2s5slz0m7m8l9j"; - revision = "1"; - editedCabalFile = "049x7hz1173650bsqp8ff2yv7gn6v1akl3iz24xx5q8ql1p0silc"; + version = "1.0.5.4"; + sha256 = "15jg140ly7rska7v8ihvd383q9lj4i5c18rzjad4yi8f78jjciqb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51743,9 +51845,10 @@ self: { ]; executableHaskellDepends = [ aeson amazonka amazonka-core antiope-core - antiope-optparse-applicative base bytestring containers directory - exceptions generic-lens http-types lens mtl optparse-applicative - resourcet stm stringsearch temporary text unliftio + antiope-optparse-applicative base bytestring cabal-install-parsers + containers directory exceptions filepath generic-lens http-types + lens mtl optparse-applicative resourcet stm stringsearch temporary + text unliftio ]; testHaskellDepends = [ aeson antiope-core base bytestring filepath hedgehog hspec @@ -51783,25 +51886,6 @@ self: { }) {}; "cabal-clean" = callPackage - ({ mkDerivation, base, containers, directory, filepath, mtl - , optparse-applicative, pretty-terminal, process, split, string-qq - }: - mkDerivation { - pname = "cabal-clean"; - version = "0.1.20220814"; - sha256 = "10kw1d6gxksgawpklqmjhbdc507zcxsghnf6vjwiv2wikrmz8b0d"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base containers directory filepath mtl optparse-applicative - pretty-terminal process split string-qq - ]; - description = "Remove outdated cabal build artefacts from `dist-newstyle`"; - license = lib.licenses.bsd3; - mainProgram = "cabal-clean"; - }) {}; - - "cabal-clean_0_2_20220819" = callPackage ({ mkDerivation, base, containers, directory, filemanip, filepath , mtl, optparse-applicative, pretty-terminal, process, silently , split, string-qq @@ -51819,7 +51903,6 @@ self: { ]; description = "Remove outdated cabal build artefacts from `dist-newstyle`"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "cabal-clean"; }) {}; @@ -51872,8 +51955,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "5.2"; - sha256 = "0vin5nj673l5gyg2q3jjz8vxh6ajja5mh6k81j1ppihwscwmmz4p"; + version = "5.2.1"; + sha256 = "1fz71v2yx3rykvzswvqza5v9jwdhy2ahxj003gkkhfwfc2qjip3p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51915,8 +51998,6 @@ self: { libraryHaskellDepends = [ base Cabal QuickCheck ]; description = "QuickCheck for Cabal tests"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cabal-dev" = callPackage @@ -52274,7 +52355,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "cabal"; - maintainers = [ lib.maintainers.peti ]; + maintainers = [ lib.maintainers.sternenseemann ]; broken = true; }) {Cabal-QuickCheck = null; Cabal-described = null; Cabal-tree-diff = null;}; @@ -52555,10 +52636,8 @@ self: { }: mkDerivation { pname = "cabal-plan"; - version = "0.7.2.1"; - sha256 = "0n45bakzf1r1nyvs76fmrj0cf74knqnpyb2i82baxia0falbp48r"; - revision = "1"; - editedCabalFile = "1pb8r65f279m9ps67mkkcbcpbprbj7pd12b9m2s64l8fgn9in422"; + version = "0.7.2.3"; + sha256 = "0zrk1hai7j0kk7l3nv1ca6srzz36dv1rmvzw7zby945nam7030k2"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -52576,33 +52655,25 @@ self: { mainProgram = "cabal-plan"; }) {}; - "cabal-plan_0_7_2_3" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, base, base-compat - , base16-bytestring, bytestring, containers, directory, filepath - , mtl, optics-core, optparse-applicative, parsec, process - , semialign, singleton-bool, text, these, topograph, transformers - , vector + "cabal-plan-bounds" = callPackage + ({ mkDerivation, base, bytestring, cabal-plan, Cabal-syntax + , containers, optparse-applicative, pretty, text }: mkDerivation { - pname = "cabal-plan"; - version = "0.7.2.3"; - sha256 = "0zrk1hai7j0kk7l3nv1ca6srzz36dv1rmvzw7zby945nam7030k2"; - configureFlags = [ "-fexe" ]; - isLibrary = true; + pname = "cabal-plan-bounds"; + version = "0.1.3"; + sha256 = "0bngpl6j5q11axra38802qgyh1crghdq89dsfpfhyllyrkcmwci6"; + isLibrary = false; isExecutable = true; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring containers directory - filepath text - ]; executableHaskellDepends = [ - ansi-terminal async base base-compat bytestring containers - directory mtl optics-core optparse-applicative parsec process - semialign singleton-bool text these topograph transformers vector + base bytestring cabal-plan Cabal-syntax containers + optparse-applicative pretty text ]; - description = "Library and utility for processing cabal's plan.json file"; - license = lib.licenses.gpl2Plus; + description = "Derives cabal bounds from build plans"; + license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - mainProgram = "cabal-plan"; + mainProgram = "cabal-plan-bounds"; + broken = true; }) {}; "cabal-progdeps" = callPackage @@ -52648,6 +52719,8 @@ self: { pname = "cabal-rpm"; version = "2.0.11.1"; sha256 = "07a2jnzldyva1smbxxdknimzydj2rhr7whhgh5q4nwkifkiliadv"; + revision = "1"; + editedCabalFile = "1dq6c9f0nm7a8nknc2haq79zkpkh1dgrkn2bixzsd16kmjjsl83m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -52945,6 +53018,8 @@ self: { pname = "cabal2json"; version = "0.0.0.0"; sha256 = "19dy7x643243ryqcc4wimz0pm1f1m0bqb0w7as5jhpvnk7rz06zq"; + revision = "1"; + editedCabalFile = "1lxmdh6h2fxqxc275x5a64mwk8kk4kg67gwlsxsjq5ng0rkvpix2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52997,33 +53072,10 @@ self: { ''; description = "Convert Cabal files into Nix build instructions"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.peti ]; + maintainers = [ lib.maintainers.sternenseemann ]; }) {}; "cabal2spec" = callPackage - ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty - , tasty-golden, time - }: - mkDerivation { - pname = "cabal2spec"; - version = "2.6.2"; - sha256 = "0x1r01fk5mch76zindalvmlkfaca4y1x89zw2dm0d46fncsfgdrv"; - revision = "1"; - editedCabalFile = "196j1fga9cqlc0nbxbgl0c3g0ic8sf618whps95zzp58lac9dqak"; - 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; - mainProgram = "cabal2spec"; - maintainers = [ lib.maintainers.peti ]; - }) {}; - - "cabal2spec_2_6_3" = callPackage ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty , tasty-golden, time }: @@ -53042,7 +53094,6 @@ self: { testHaskellDepends = [ base Cabal filepath tasty tasty-golden ]; description = "Convert Cabal files into rpm spec files"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "cabal2spec"; maintainers = [ lib.maintainers.peti ]; }) {}; @@ -53348,9 +53399,10 @@ self: { "cachix" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring - , cachix-api, concurrent-extra, conduit, conduit-extra, containers - , cookie, cryptonite, dhall, directory, ed25519, either, extra - , filepath, fsnotify, hercules-ci-cnix-store, here, hspec + , cachix-api, concurrent-extra, conduit, conduit-extra + , conduit-zstd, containers, cookie, cryptonite, dhall, directory + , ed25519, either, extra, filepath, fsnotify + , hercules-ci-cnix-store, here, hnix-store-core, hspec , hspec-discover, http-client, http-client-tls, http-conduit , http-types, inline-c-cpp, katip, lukko, lzma-conduit, megaparsec , memory, mmorph, netrc, nix, optparse-applicative, pretty-terminal @@ -53363,22 +53415,22 @@ self: { }: mkDerivation { pname = "cachix"; - version = "1.0.1"; - sha256 = "0jgs43h6pmyyq3r1sc7d27zsdxr5fbimgdvl8r8l1fdw1nlb322q"; + version = "1.2"; + sha256 = "1fvm565651rd0wlx3rhsrm3x8fa1jjvpkp9xgrcj8pnpi5dsn07w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring cachix-api - concurrent-extra conduit conduit-extra containers cookie cryptonite - dhall directory ed25519 either extra filepath fsnotify - hercules-ci-cnix-store here http-client http-client-tls - http-conduit http-types inline-c-cpp katip lukko lzma-conduit - megaparsec memory mmorph netrc optparse-applicative pretty-terminal - prettyprinter process protolude resourcet retry safe-exceptions - servant servant-auth servant-auth-client servant-client - servant-client-core servant-conduit stm stm-conduit systemd - temporary text time unix unordered-containers uri-bytestring uuid - vector versions websockets wuss + concurrent-extra conduit conduit-extra conduit-zstd containers + cookie cryptonite dhall directory ed25519 either extra filepath + fsnotify hercules-ci-cnix-store here hnix-store-core http-client + http-client-tls http-conduit http-types inline-c-cpp katip lukko + lzma-conduit megaparsec memory mmorph netrc optparse-applicative + pretty-terminal prettyprinter process protolude resourcet retry + safe-exceptions servant servant-auth servant-auth-client + servant-client servant-client-core servant-conduit stm stm-chans + stm-conduit systemd temporary text time unix unordered-containers + uri-bytestring uuid vector versions websockets wuss ]; libraryPkgconfigDepends = [ nix ]; executableHaskellDepends = [ @@ -53387,8 +53439,8 @@ self: { ]; executableToolDepends = [ hspec-discover ]; testHaskellDepends = [ - base cachix-api directory here hspec protolude servant-auth-client - temporary + aeson base bytestring cachix-api dhall directory extra here hspec + protolude servant-auth-client servant-client-core temporary ]; description = "Command line client for Nix binary cache hosting https://cachix.org"; license = lib.licenses.asl20; @@ -53399,22 +53451,23 @@ self: { ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring , conduit, cookie, cryptonite, deepseq, deriving-aeson, exceptions , hspec, hspec-discover, http-api-data, http-media, jose, lens - , memory, nix-narinfo, protolude, resourcet, servant, servant-auth - , servant-auth-swagger, servant-client, servant-swagger - , servant-swagger-ui-core, string-conv, swagger2, text, time - , transformers, unordered-containers, uuid, websockets + , memory, nix-narinfo, protolude, resourcet, safe-exceptions + , servant, servant-auth, servant-auth-swagger, servant-client + , servant-swagger, servant-swagger-ui-core, stm-chans, string-conv + , swagger2, text, time, transformers, unordered-containers, uuid + , websockets }: mkDerivation { pname = "cachix-api"; - version = "1.0.1"; - sha256 = "1bv4pbzqzkfll8zm9qdrwbpj80jgdk5n0jby52j8szkvbj4rd357"; + version = "1.2"; + sha256 = "1i3z0arn8cwglbsq8kxzcpp2ghypv7i03crpplbn0myk8wzflxdy"; libraryHaskellDepends = [ aeson async base base16-bytestring bytestring conduit cookie cryptonite deepseq deriving-aeson exceptions http-api-data - http-media jose lens memory nix-narinfo protolude resourcet servant - servant-auth servant-auth-swagger servant-client string-conv - swagger2 text time transformers unordered-containers uuid - websockets + http-media jose lens memory nix-narinfo protolude resourcet + safe-exceptions servant servant-auth servant-auth-swagger + servant-client stm-chans string-conv swagger2 text time + transformers unordered-containers uuid websockets ]; testHaskellDepends = [ aeson base base16-bytestring bytestring conduit cookie cryptonite @@ -53515,7 +53568,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cairo" = callPackage @@ -53731,8 +53783,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.7.0.1"; - sha256 = "16hk4c8yry3yrw2isjd2lamdadvfqm210cnpiyllp9lfgn24zdph"; + version = "0.7.1.0"; + sha256 = "17jzv3di73d9pdxcp9fmprkyff1jjkmxywpf1g5a9iq0yc6l3q7f"; libraryHaskellDepends = [ aeson aeson-optics async base bytestring calamity-commands colour concurrent-extra connection containers data-default-class @@ -53745,8 +53797,6 @@ self: { ]; description = "A library for writing discord bots in haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "calamity-commands" = callPackage @@ -53906,29 +53956,6 @@ self: { }) {}; "call-alloy" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, extra - , file-embed, filepath, hashable, hspec, mtl, process, split - , trifecta, unix - }: - mkDerivation { - pname = "call-alloy"; - version = "0.3.0.3"; - sha256 = "1clzw0sk13gzwk2ikxlz7p0f70pb2246pnd01ggjm0nrfykri18p"; - libraryHaskellDepends = [ - base bytestring containers directory extra file-embed filepath - hashable mtl process split trifecta unix - ]; - testHaskellDepends = [ - base bytestring containers directory extra file-embed filepath - hashable hspec mtl process split trifecta unix - ]; - description = "A simple library to call Alloy given a specification"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "call-alloy_0_4_0_1" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , extra, filepath, hspec, mtl, process, split, transformers , trifecta, unix @@ -54066,7 +54093,6 @@ self: { badPlatforms = [ "aarch64-linux" ]; hydraPlatforms = lib.platforms.none; mainProgram = "camfort"; - broken = true; }) {inherit (pkgs) flint;}; "camh" = callPackage @@ -54126,8 +54152,8 @@ self: { }: mkDerivation { pname = "candid"; - version = "0.3.2"; - sha256 = "0p4fxkm3yhlx52g15hcbjlhqmx7nwkdw0rzlr0m11v85y5khz7yd"; + version = "0.4.0.1"; + sha256 = "14np7yakm97d6scw5ldlsjacri317wwyingwsys7987zk01dfcln"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54196,8 +54222,6 @@ self: { benchmarkHaskellDepends = [ base bytestring containers criterion ]; description = "Canonical JSON for signing and hashing JSON values"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "canteven-config" = callPackage @@ -54421,6 +54445,8 @@ self: { ]; description = "OTP-like supervision trees in Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "capnp" = callPackage @@ -54591,7 +54617,6 @@ self: { description = "A package for integrating a variety of captcha solving services"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "car-pool" = callPackage @@ -54913,6 +54938,8 @@ self: { ]; description = "CASA Abbreviations and Acronyms"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "casa-client" = callPackage @@ -55163,15 +55190,13 @@ self: { }: mkDerivation { pname = "cases"; - version = "0.1.4.1"; - sha256 = "16bl4qzjfwkbzacrj33myakqcmg2j9fgzdnykwpnnqc2vikdpn0z"; + version = "0.1.4.2"; + sha256 = "0sla22xr1b8b1655l2rzhy31lxirahypgri0bphd9l6jy874mr40"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ HTF HUnit QuickCheck rerebase ]; benchmarkHaskellDepends = [ gauge mwc-random rerebase ]; description = "A converter for spinal, snake and camel cases"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cash" = callPackage @@ -55398,6 +55423,7 @@ self: { description = "Haskell client for Cassandra's CQL protocol"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cassandra-thrift" = callPackage @@ -55501,6 +55527,8 @@ self: { pname = "cassava-megaparsec"; version = "2.0.4"; sha256 = "0pg9z38jmrylbj683b6pf7psipp7lrdq6mn1hbj8v2gj5lh8yf8n"; + revision = "1"; + editedCabalFile = "1nknyqs8bb3qiysq5a2n1f7lzgkr8b0pvshg5jx5z5wgfmpjmyjf"; libraryHaskellDepends = [ base bytestring cassava megaparsec unordered-containers vector ]; @@ -55624,9 +55652,7 @@ self: { testHaskellDepends = [ base bytestring primitive text ]; description = "Portable CRC-32C"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {primitive-slice = null;}; + }) {}; "caster" = callPackage ({ mkDerivation, base, bytestring, directory, fast-builder, mtl @@ -55799,6 +55825,8 @@ self: { libraryHaskellDepends = [ base bytestring comonad text ]; description = "Highbrow approach to type-safe printf format specifications"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "category-traced" = callPackage @@ -55924,27 +55952,6 @@ self: { }) {}; "cayley-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, bytestring - , exceptions, hspec, http-client, http-conduit, lens, lens-aeson - , mtl, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "cayley-client"; - version = "0.4.17"; - sha256 = "1mc4r45vlwbrcjz33akqs5kh27wc97b8dg1byanvyjyvsvabg5bb"; - libraryHaskellDepends = [ - aeson attoparsec base binary bytestring exceptions http-client - http-conduit lens lens-aeson mtl text transformers - unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec unordered-containers ]; - description = "A Haskell client for the Cayley graph database"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "cayley-client_0_4_19_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson , mtl, text, transformers, unordered-containers, vector @@ -56183,6 +56190,41 @@ self: { mainProgram = "cdeps"; }) {}; + "cdp" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, blaze-html + , blaze-markup, bytestring, containers, data-default, directory + , extra, filepath, hspec, http-conduit, monad-loops, mtl + , network-uri, process, random, text, utf8-string, vector + , websockets + }: + mkDerivation { + pname = "cdp"; + version = "0.0.2.0"; + sha256 = "1pi163mysavwhk9s2a78ldbnw0480b9vmvgyr4m426asc17g1kc9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory extra + filepath http-conduit monad-loops mtl network-uri process random + text vector websockets + ]; + executableHaskellDepends = [ + aeson base base64-bytestring blaze-html blaze-markup bytestring + containers data-default directory extra filepath http-conduit + monad-loops mtl network-uri process random text utf8-string vector + websockets + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory extra + filepath hspec http-conduit monad-loops mtl network-uri process + random text vector websockets + ]; + description = "A library for the Chrome Devtools Protocol"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "cedict" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, parsec , utf8-string @@ -56756,6 +56798,8 @@ self: { ]; description = "A library for writing CGI programs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cgi-undecidable" = callPackage @@ -56767,6 +56811,7 @@ self: { libraryHaskellDepends = [ base cgi mtl ]; description = "Undecidable instances for the cgi package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "cgi-utils" = callPackage @@ -56781,7 +56826,6 @@ self: { description = "Simple modular utilities for CGI/FastCGI (sessions, etc.)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cgrep" = callPackage @@ -56841,26 +56885,33 @@ self: { }) {}; "chainweb-mining-client" = callPackage - ({ mkDerivation, aeson, async, base, bytes, bytestring, Cabal - , configuration-tools, connection, containers, cryptonite - , exceptions, hashable, hostaddress, http-client, http-client-tls - , http-types, lens, loglevel, memory, mwc-random, process, retry - , stm, streaming, streaming-events, text, time + ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring + , bytes, bytestring, Cabal, clock, configuration-tools, connection + , cryptonite, exceptions, hashable, hostaddress, http-client + , http-client-tls, http-types, lens, loglevel, memory, mwc-random + , process, QuickCheck, quickcheck-instances, retry, stm, streaming + , streaming-commons, streaming-events, sydtest, text, time , unordered-containers, wai-extra }: mkDerivation { pname = "chainweb-mining-client"; - version = "0.2"; - sha256 = "1zbqbc3icgz1fb0fgpfi1cf1i7pz2lf3wd82671ks1yixf893ypm"; + version = "0.5"; + sha256 = "1z14rkla1w01pzv894wba8kp1v5zwmzgjnadjkwczvfc9fk6i90h"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal configuration-tools ]; executableHaskellDepends = [ - aeson async base bytes bytestring configuration-tools connection - containers cryptonite exceptions hashable hostaddress http-client - http-client-tls http-types lens loglevel memory mwc-random process - retry stm streaming streaming-events text time unordered-containers - wai-extra + aeson async attoparsec base base16-bytestring bytes bytestring + clock configuration-tools connection cryptonite exceptions hashable + hostaddress http-client http-client-tls http-types lens loglevel + memory mwc-random process retry stm streaming streaming-commons + streaming-events text time unordered-containers wai-extra + ]; + testHaskellDepends = [ + aeson base base16-bytestring bytes bytestring clock + configuration-tools cryptonite exceptions hashable hostaddress + memory QuickCheck quickcheck-instances stm streaming-commons + sydtest text time ]; description = "Mining Client for Kadena Chainweb"; license = lib.licenses.bsd3; @@ -56906,7 +56957,9 @@ self: { ]; description = "A REST Web Api server template for building (micro)services"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "chakra-exe"; + broken = true; }) {}; "chalk" = callPackage @@ -57219,8 +57272,6 @@ self: { ]; description = "Charting library targetting SVGs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chart-svg-various" = callPackage @@ -57534,12 +57585,13 @@ self: { }) {}; "check-cfg-ambiguity" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, doctest, QuickCheck }: mkDerivation { pname = "check-cfg-ambiguity"; - version = "0.0.0.1"; - sha256 = "1qdg707a8yq61s5rs677yc8wp00sxdrf4vpr2r3c98q2psbkxl1n"; + version = "0.1.0.0"; + sha256 = "0iswfg7m9qnhr1128xbhaa06ai2rhnr7c781y7z92v29xd7mjyjg"; libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base doctest QuickCheck ]; description = "Checks context free grammar for ambiguity using brute force up to given limit"; license = lib.licenses.bsd3; }) {}; @@ -57797,8 +57849,8 @@ self: { }: mkDerivation { pname = "chez-grater"; - version = "0.1.1"; - sha256 = "0yxc054mvq0016a8jr6mv9j4l971llmm2cp1gya6by20icav1z54"; + version = "0.1.2"; + sha256 = "0i84fsgh7dsay1p2rw86fxrqasz7w8czfz5jri4ry4ac47ag0mf7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57807,8 +57859,8 @@ self: { scalpel text unordered-containers ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring network-uri optparse-applicative - text + aeson aeson-pretty base bytestring case-insensitive network-uri + optparse-applicative text ]; testHaskellDepends = [ attoparsec base bytestring case-insensitive containers file-embed @@ -57843,7 +57895,6 @@ self: { description = "A tmux client for Polysemy"; license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chiasma-test" = callPackage @@ -57873,22 +57924,22 @@ self: { }) {}; "chimera" = callPackage - ({ mkDerivation, adjunctions, base, distributive, mtl, QuickCheck - , random, tasty, tasty-bench, tasty-hunit, tasty-quickcheck - , tasty-smallcheck, vector + ({ mkDerivation, adjunctions, base, distributive, mtl, primitive + , QuickCheck, random, tasty, tasty-bench, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, transformers, vector }: mkDerivation { pname = "chimera"; - version = "0.3.2.0"; - sha256 = "1p8in1a37hrb0qwvabwi4a9ahzydkd8j3v402cn2i3xmkzcr0kh9"; + version = "0.3.3.0"; + sha256 = "1cy38pgdlgz4f1fglm70w3dlqbnd0lzpckr7j065nnpp0ljlwlpx"; libraryHaskellDepends = [ - adjunctions base distributive mtl vector + adjunctions base distributive mtl primitive transformers vector ]; testHaskellDepends = [ base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck vector ]; - benchmarkHaskellDepends = [ base mtl random tasty-bench ]; + benchmarkHaskellDepends = [ base mtl random tasty tasty-bench ]; description = "Lazy infinite streams with O(1) indexing and applications for memoization"; license = lib.licenses.bsd3; }) {}; @@ -57909,6 +57960,8 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell bindings for Chipmunk2D physics engine"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "chitauri" = callPackage @@ -58071,7 +58124,6 @@ self: { description = "A mirror implementation of chp that generates a specification of the program"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chp-transformers" = callPackage @@ -58100,7 +58152,6 @@ self: { ]; description = "Constraint Handling Rules"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "chr-data" = callPackage @@ -58119,8 +58170,6 @@ self: { ]; description = "Datatypes required for chr library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chr-lang" = callPackage @@ -58221,6 +58270,7 @@ self: { description = "measure timings of data evaluation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "chronologique" = callPackage @@ -58449,8 +58499,6 @@ self: { ]; description = "Church encoded pair"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "churros" = callPackage @@ -58469,8 +58517,6 @@ self: { ]; description = "Channel/Arrow based streaming computation library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cicero-api" = callPackage @@ -58495,9 +58541,7 @@ self: { ]; description = "API bindings to IOHK's Cicero job scheduler"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "cicero-cli"; - broken = true; }) {}; "cielo" = callPackage @@ -58635,6 +58679,8 @@ self: { ]; description = "AES and common modes using AES-NI when available"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cipher-blowfish" = callPackage @@ -58712,6 +58758,8 @@ self: { ]; description = "DES and 3DES primitives"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cipher-rc4" = callPackage @@ -58762,7 +58810,6 @@ self: { executableHaskellDepends = [ array base bytestring parseargs ]; description = "Implementation of CipherSaber2 RC4 cryptography"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "cs2"; }) {}; @@ -58777,6 +58824,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "circle" = callPackage + ({ mkDerivation, aeson, autodocodec, base, bytestring + , case-insensitive, containers, country, hspec, hspec-expectations + , http-client, http-client-tls, http-types, pcre-heavy, random + , refined, safe, template-haskell, text, time, unordered-containers + , uuid, vector + }: + mkDerivation { + pname = "circle"; + version = "0.1.0.0"; + sha256 = "074v9xdrc6gr8galy61pzpnja7fhsldvinma0nq248j3sbywv66c"; + libraryHaskellDepends = [ + aeson autodocodec base bytestring case-insensitive containers + country http-client http-client-tls http-types pcre-heavy refined + template-haskell text time unordered-containers uuid vector + ]; + testHaskellDepends = [ + base hspec hspec-expectations http-client http-client-tls random + safe text time uuid + ]; + description = "Circle API client for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "circle-packing" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -58936,35 +59009,6 @@ self: { }) {}; "citeproc" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring - , case-insensitive, containers, data-default, Diff, directory - , file-embed, filepath, mtl, pandoc-types, pretty, safe, scientific - , text, timeit, transformers, unicode-collation, uniplate, vector - , xml-conduit - }: - mkDerivation { - pname = "citeproc"; - version = "0.6.0.1"; - sha256 = "015ansq3a710s0hzs2157fx12bc4f1hy45l4dbi6j477sy800bqc"; - revision = "1"; - editedCabalFile = "1mzhq6s0jcncm71s825bvc289lq7i45rxmmi33x2j5i0v93zci4b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring case-insensitive containers - data-default file-embed filepath pandoc-types safe scientific text - transformers unicode-collation uniplate vector xml-conduit - ]; - testHaskellDepends = [ - aeson base bytestring containers Diff directory filepath mtl pretty - text timeit transformers - ]; - description = "Generates citations and bibliography from CSL styles"; - license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.sternenseemann ]; - }) {}; - - "citeproc_0_8_0_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , case-insensitive, containers, data-default, Diff, directory , file-embed, filepath, mtl, pandoc-types, pretty, safe, scientific @@ -58988,7 +59032,6 @@ self: { ]; description = "Generates citations and bibliography from CSL styles"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.sternenseemann ]; }) {}; @@ -59371,6 +59414,7 @@ self: { executableHaskellDepends = [ base ]; description = "Clash: a functional hardware description language - GHC frontend"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; }) {}; "clash-lib" = callPackage @@ -59417,6 +59461,7 @@ self: { ]; description = "Clash: a functional hardware description language - As a library"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; mainProgram = "v16-upgrade-primitives"; }) {}; @@ -59438,6 +59483,7 @@ self: { ]; description = "Hedgehog Generators for clash-lib"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; }) {}; "clash-multisignal" = callPackage @@ -59453,7 +59499,6 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clash-prelude" = callPackage @@ -59472,6 +59517,8 @@ self: { pname = "clash-prelude"; version = "1.6.4"; sha256 = "12ic8jcgz3jr4zrgrx06dzd6whlypyyxilrgbja27dcdv02fs6yr"; + revision = "1"; + editedCabalFile = "09ra3gbhghrqlzaanjlvm0qpj05v3ilps62lblzy44n7sxmc5db7"; libraryHaskellDepends = [ array arrows base binary bytestring constraints containers data-binary-ieee754 data-default-class deepseq extra ghc-bignum @@ -59492,6 +59539,8 @@ self: { ]; description = "Clash: a functional hardware description language - Prelude library"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clash-prelude-hedgehog" = callPackage @@ -59508,6 +59557,7 @@ self: { ]; description = "Hedgehog Generators for clash-prelude"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; }) {}; "clash-prelude-quickcheck" = callPackage @@ -59521,7 +59571,6 @@ self: { description = "QuickCheck instances for various types in the CλaSH Prelude"; license = "unknown"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clash-shake" = callPackage @@ -59531,14 +59580,15 @@ self: { }: mkDerivation { pname = "clash-shake"; - version = "0.3.1.2"; - sha256 = "1nj9vhzfybm43jcns8nr3ka4gjc1xyn0ccv6xiqdyjipzldx4a1n"; + version = "0.3.2"; + sha256 = "0bgnl1q1xm1yhwspqlfr02p37iy8vka727r4awr2lihg12x83bjx"; libraryHaskellDepends = [ aeson base bytestring clash-ghc clash-lib clash-prelude directory shake split stache text unordered-containers ]; description = "Shake rules for building Clash programs"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "clash-systemverilog" = callPackage @@ -59557,7 +59607,6 @@ self: { description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clash-verilog" = callPackage @@ -59576,7 +59625,6 @@ self: { description = "CAES Language for Synchronous Hardware - Verilog backend"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clash-vhdl" = callPackage @@ -59595,7 +59643,6 @@ self: { description = "CAES Language for Synchronous Hardware - VHDL backend"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clashilator" = callPackage @@ -59621,7 +59668,6 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "clashilator"; - broken = true; }) {}; "classify" = callPackage @@ -59804,20 +59850,6 @@ self: { broken = true; }) {}; - "clay_0_13_3" = callPackage - ({ mkDerivation, base, hspec, hspec-discover, mtl, text }: - mkDerivation { - pname = "clay"; - version = "0.13.3"; - sha256 = "192lsbyj6azjs2ygpx4i47fyr8zfmvwcas8mia07ndqglk2c9csx"; - libraryHaskellDepends = [ base mtl text ]; - testHaskellDepends = [ base hspec hspec-discover mtl text ]; - testToolDepends = [ hspec-discover ]; - description = "CSS preprocessor as embedded Haskell"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "clay" = callPackage ({ mkDerivation, base, hspec, hspec-discover, mtl, text }: mkDerivation { @@ -59829,6 +59861,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "CSS preprocessor as embedded Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clckwrks" = callPackage @@ -59863,7 +59897,6 @@ self: { libraryToolDepends = [ hsx2hs ]; description = "A secure, reliable content management system (CMS) and blogging platform"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) openssl;}; "clckwrks-cli" = callPackage @@ -59886,7 +59919,6 @@ self: { ]; description = "a command-line interface for adminstrating some aspects of clckwrks"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "clckwrks-cli"; }) {}; @@ -59937,6 +59969,7 @@ self: { description = "bug tracking plugin for clckwrks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clckwrks-plugin-ircbot" = callPackage @@ -59986,6 +60019,7 @@ self: { description = "mailing list plugin for clckwrks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clckwrks-plugin-media" = callPackage @@ -60008,7 +60042,6 @@ self: { ]; description = "media plugin for clckwrks"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "clckwrks-plugin-page" = callPackage @@ -60034,7 +60067,6 @@ self: { libraryToolDepends = [ hsx2hs ]; description = "support for CMS/Blogging in clckwrks"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "clckwrks-plugin-redirect" = callPackage @@ -60059,7 +60091,6 @@ self: { ]; description = "support redirects for CMS/Blogging in clckwrks"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "clckwrks-theme-bootstrap" = callPackage @@ -60077,7 +60108,6 @@ self: { ]; description = "simple bootstrap based template for clckwrks"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "clckwrks-theme-clckwrks" = callPackage @@ -60096,6 +60126,7 @@ self: { description = "simple bootstrap based template for clckwrks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clckwrks-theme-geo-bootstrap" = callPackage @@ -60109,6 +60140,7 @@ self: { description = "geo bootstrap based template for clckwrks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cld2" = callPackage @@ -60197,6 +60229,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "clerk" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default, lens + , mtl, text, time, transformers, xlsx + }: + mkDerivation { + pname = "clerk"; + version = "0.1.0.2"; + sha256 = "0nbli8pj7v4wblbji2hqlkwbh98iiclg7vpbg6qsa91bw8p4nwmd"; + libraryHaskellDepends = [ + base bytestring containers data-default lens mtl text time + transformers xlsx + ]; + description = "Declaratively describe spreadsheets and generate xlsx"; + license = lib.licenses.bsd3; + }) {}; + "cless" = callPackage ({ mkDerivation, base, highlighting-kate, optparse-applicative , process, terminfo, wl-pprint-extras, wl-pprint-terminfo @@ -60218,34 +60266,33 @@ self: { }) {}; "cleveland" = callPackage - ({ mkDerivation, aeson, base-noprelude, bytestring, constraints - , containers, criterion, cryptonite, data-default, directory + ({ mkDerivation, aeson, base-noprelude, constraints, containers + , criterion, cryptonite, data-default, dependent-map, directory , either, exceptions, file-embed, filepath, fmt, hedgehog, hex-text , hspec-expectations, HUnit, lens, lorentz, MonadRandom, morley - , morley-client, morley-prelude, mtl, named, o-clock - , optparse-applicative, safe-exceptions, servant-client - , servant-client-core, singletons, singletons-base, statistics - , tagged, tasty, tasty-ant-xml, tasty-discover, tasty-hedgehog - , tasty-hunit-compat, template-haskell, temporary, text, time - , with-utf8 + , morley-client, morley-prelude, mtl, o-clock, optparse-applicative + , servant-client, servant-client-core, singletons, singletons-base + , some, statistics, tagged, tasty, tasty-ant-xml, tasty-discover + , tasty-hedgehog, tasty-hunit-compat, template-haskell, temporary + , text, time, with-utf8 }: mkDerivation { pname = "cleveland"; - version = "0.2.1"; - sha256 = "1qqk1mld2wfckpgvsj48w8rh9pdkbqq1p36wkvrphf35hl0hr882"; + version = "0.3.0"; + sha256 = "1ahdijygria9rlmfr61vl8s924b29yq31594z1y0dc79asw6vhi1"; libraryHaskellDepends = [ - aeson base-noprelude bytestring constraints containers criterion - cryptonite data-default directory either exceptions file-embed fmt - hedgehog hex-text HUnit lens lorentz MonadRandom morley - morley-client morley-prelude mtl named o-clock optparse-applicative - safe-exceptions servant-client-core singletons singletons-base - statistics tagged tasty tasty-ant-xml tasty-hedgehog - tasty-hunit-compat template-haskell temporary text time with-utf8 + aeson base-noprelude constraints containers criterion cryptonite + data-default dependent-map directory either exceptions file-embed + fmt hedgehog hex-text HUnit lens lorentz MonadRandom morley + morley-client morley-prelude mtl o-clock optparse-applicative + servant-client-core singletons singletons-base some statistics + tagged tasty tasty-ant-xml tasty-hedgehog tasty-hunit-compat + template-haskell temporary text time with-utf8 ]; testHaskellDepends = [ base-noprelude either filepath fmt hedgehog hspec-expectations lens - lorentz morley morley-client morley-prelude named o-clock - servant-client tasty tasty-hedgehog tasty-hunit-compat text time + lorentz morley morley-client morley-prelude o-clock servant-client + tasty tasty-hedgehog tasty-hunit-compat text time ]; testToolDepends = [ tasty-discover ]; description = "Testing framework for Morley"; @@ -60461,7 +60508,6 @@ self: { description = "A Haskell library as database client for Clickhouse"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clientsession" = callPackage @@ -60571,8 +60617,8 @@ self: { }: mkDerivation { pname = "climb"; - version = "0.3.3"; - sha256 = "0d6jscwbjlm21jcdl29c3ix6vd5ly9mjr0ljchzkr6yk7gqk4z24"; + version = "0.4.1"; + sha256 = "1h3a3ghynd1k08jd8fb02rsbf9a1y8j9gz822mrc23p11zh4qcp3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60588,30 +60634,6 @@ self: { mainProgram = "climb-demo"; }) {}; - "climb_0_4_0" = callPackage - ({ mkDerivation, base, bytestring, containers, exceptions - , linenoise, mtl, text, unliftio-core - }: - mkDerivation { - pname = "climb"; - version = "0.4.0"; - sha256 = "0b27hlr70vcm2mklbnrsxk306d684cgbig8qgczgfx7r432wghg1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers exceptions linenoise mtl text - unliftio-core - ]; - executableHaskellDepends = [ - base bytestring containers exceptions linenoise mtl text - unliftio-core - ]; - description = "Building blocks for a GHCi-like REPL with colon-commands"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "climb-demo"; - }) {}; - "clingo" = callPackage ({ mkDerivation, base, bifunctors, clingo, deepseq, exceptions , hashable, mtl, StateVar, text, transformers, wl-pprint-text @@ -60796,6 +60818,7 @@ self: { description = "timer functionality to clock IO commands"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {QtCore = null;}; "clogparse" = callPackage @@ -61019,6 +61042,7 @@ self: { testHaskellDepends = [ base ]; description = "Glue between clr-host and clr-typed"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "clr-host" = callPackage @@ -61093,6 +61117,8 @@ self: { testHaskellDepends = [ base clr-marshal hspec text ]; description = "A strongly typed Haskell interface to the CLR type system"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clr-win-linker" = callPackage @@ -61192,6 +61218,7 @@ self: { description = "High performance clustering algorithms"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clustertools" = callPackage @@ -61727,6 +61754,8 @@ self: { pname = "co-log-concurrent"; version = "0.5.1.0"; sha256 = "07qmx9z03vmgq2cgz4352fsav7r1nx8n7svmrhg2lkdiyp0j7a59"; + revision = "2"; + editedCabalFile = "1ldh0c0927ay8wpamybaw66cz4rz3jskv8iwvxlxw8mmr4pwyvk0"; libraryHaskellDepends = [ base co-log-core stm ]; description = "Asynchronous backend for co-log library"; license = lib.licenses.mpl20; @@ -61752,8 +61781,8 @@ self: { }: mkDerivation { pname = "co-log-json"; - version = "0.0.1.0"; - sha256 = "1ap62gq3s08fif96jwssp7aj6kldsiwf2qx0f5yffl3zna4h6j2p"; + version = "0.1.0.0"; + sha256 = "0212dcaw4anjn569a8gpv30k09b9lk99r70bbsh7kb8hb268rk83"; libraryHaskellDepends = [ aeson base bytestring co-log-core containers string-conv text ]; @@ -61799,9 +61828,7 @@ self: { ]; description = "A Polysemy logging effect for high quality (unstructured) logs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "example"; - broken = true; }) {}; "co-log-sys" = callPackage @@ -62025,7 +62052,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "codec-libevent-generate"; - broken = true; }) {}; "codec-mbox" = callPackage @@ -62179,8 +62205,6 @@ self: { ]; description = "Graphics library for CodeWorld"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "codex" = callPackage @@ -62255,10 +62279,8 @@ self: { ({ mkDerivation, base, profunctors }: mkDerivation { pname = "coercible-subtypes"; - version = "0.2.0.0"; - sha256 = "0n8g69l3iwcy588yj29b7qsac8n8cl44ibb62a36x9n2jpgz5xif"; - revision = "1"; - editedCabalFile = "09573n1g66j1zqipjp5mzspbkzyijwqhgx6xjn0jlf69vglx22rj"; + version = "0.3.0.0"; + sha256 = "14swbn5509wb46iwgp2lj8hqi3ca82jacgq028cmwz35zsc1zjds"; libraryHaskellDepends = [ base profunctors ]; description = "Coercible but only in one direction"; license = lib.licenses.bsd3; @@ -62277,6 +62299,8 @@ self: { benchmarkHaskellDepends = [ base gauge ]; description = "Utility functions for Coercible types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "coercion-extras" = callPackage @@ -62447,8 +62471,8 @@ self: { }: mkDerivation { pname = "coinbase-pro"; - version = "0.9.3.0"; - sha256 = "0974snfkil4xmrkw38d81d85n5w78ld3jd0kbsn3s22jd36dzjlm"; + version = "0.9.3.2"; + sha256 = "06gzynckmdsdzzvlmf3kmkbc883pqjbgd4hxkrm47xykv2m64x6s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62519,8 +62543,6 @@ self: { ]; description = "Generate CSV & XLSX files for importing into CoinTracking"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "colada" = callPackage @@ -62564,6 +62586,7 @@ self: { description = "Rudimentary JSON-RPC 2.0 client over raw TCP."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cold-widow" = callPackage @@ -62671,6 +62694,8 @@ self: { ]; description = "An Applicative Functor for extracting parts of a stream of values"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "collect-errors" = callPackage @@ -62773,8 +62798,8 @@ self: { pname = "colonnade"; version = "1.2.0.2"; sha256 = "1asjx71gp26a15v7g3p8bfddb5nnzky6672c35xx35hq73mhykr4"; - revision = "3"; - editedCabalFile = "078j65fw9cf8sscnvd0c3dkg24pcw4krav1x0zsg493ynxslv95z"; + revision = "4"; + editedCabalFile = "0425ag47i8llirh6jdy11mqilr6bdq0nzcx4yfha2n57qpx1gkjs"; libraryHaskellDepends = [ base bytestring contravariant profunctors semigroups text vector ]; @@ -62906,8 +62931,6 @@ self: { libraryHaskellDepends = [ base lens linear profunctors ]; description = "A type for colors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "colour" = callPackage @@ -63281,19 +63304,20 @@ self: { }: mkDerivation { pname = "comfort-array"; - version = "0.5.1.1"; - sha256 = "07rajrpp495g17naywybkrydd67ixiav5g8rayavwabvyrybnmgy"; + version = "0.5.2"; + sha256 = "0rpv9mn1jmkb9f89y02zfg2vwz4slzny31yjrvwcm43jhdyvzkwh"; libraryHaskellDepends = [ base containers deepseq guarded-allocation non-empty prelude-compat primitive QuickCheck semigroups storable-record storablevector tagged transformers utility-ht ]; testHaskellDepends = [ - base ChasingBottoms containers doctest-exitcode-stdio doctest-lib - QuickCheck tagged + base ChasingBottoms containers deepseq doctest-exitcode-stdio + doctest-lib QuickCheck tagged ]; description = "Arrays where the index type is a function of the shape type"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "comfort-array-shape" = callPackage @@ -63315,6 +63339,7 @@ self: { doHaddock = false; description = "Additional shape types for the comfort-array package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "comfort-fftw" = callPackage @@ -63335,8 +63360,33 @@ self: { ]; description = "High-level interface to FFTW (Fast Fourier Transform) based on comfort-array"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; + "comfort-glpk" = callPackage + ({ mkDerivation, base, comfort-array, deepseq + , doctest-exitcode-stdio, doctest-lib, glpk, glpk-headers + , non-empty, QuickCheck, utility-ht + }: + mkDerivation { + pname = "comfort-glpk"; + version = "0.0"; + sha256 = "16cg5bc1a04zz23bhgfai9bgllwdkl975j9l7r9im8l9qn7ah1xy"; + revision = "1"; + editedCabalFile = "12d7vmy8nas78gzq2s3a9gbpffbv4afjnkqzrdmgnzj3jkljzc7p"; + libraryHaskellDepends = [ + base comfort-array deepseq glpk-headers non-empty utility-ht + ]; + librarySystemDepends = [ glpk ]; + testHaskellDepends = [ + base comfort-array doctest-exitcode-stdio doctest-lib QuickCheck + utility-ht + ]; + description = "Linear Programming using GLPK and comfort-array"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glpk;}; + "comfort-graph" = callPackage ({ mkDerivation, base, containers, doctest-exitcode-stdio , QuickCheck, semigroups, transformers, utility-ht @@ -63373,6 +63423,7 @@ self: { description = "A format for describing comics"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "comma" = callPackage @@ -63451,7 +63502,9 @@ self: { testHaskellDepends = [ base commandert text unordered-containers ]; description = "A command line argument/option parser library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "task-manager"; + broken = true; }) {}; "commandert" = callPackage @@ -63488,6 +63541,7 @@ self: { description = "Library for working with commoditized amounts and price histories"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "commonmark" = callPackage @@ -63533,6 +63587,28 @@ self: { mainProgram = "commonmark"; }) {}; + "commonmark-extensions_0_2_3_2" = callPackage + ({ mkDerivation, base, commonmark, containers, emojis, filepath + , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "commonmark-extensions"; + version = "0.2.3.2"; + sha256 = "1k5rlh2grg6g1waszhp565m360n1iynjvbkjz8xmap8y234g1bjj"; + libraryHaskellDepends = [ + base commonmark containers emojis filepath network-uri parsec text + transformers + ]; + testHaskellDepends = [ + base commonmark parsec tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; + description = "Pure Haskell commonmark parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commonmark-extensions" = callPackage ({ mkDerivation, base, commonmark, containers, emojis, filepath , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text @@ -63618,7 +63694,6 @@ self: { description = "Provide communications security using symmetric ephemeral keys"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "commsec-keyexchange" = callPackage @@ -63790,6 +63865,8 @@ self: { testHaskellDepends = [ base directory ]; description = "Non-GC'd, contiguous storage for immutable data structures"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "compact-list" = callPackage @@ -63853,7 +63930,6 @@ self: { description = "Mutable vector with different GC characteristics"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "compact-sequences" = callPackage @@ -63887,7 +63963,6 @@ self: { description = "Socket functions for compact normal form"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "compact-string" = callPackage @@ -64126,8 +64201,6 @@ self: { ]; description = "Parse a Pandoc to a composite value"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "compdoc-dhall-decoder" = callPackage @@ -64146,7 +64219,6 @@ self: { ]; description = "Allows you to write FromDhall instances for Compdoc"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "compendium-client" = callPackage @@ -64372,8 +64444,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.8.1.0"; - sha256 = "1xpb2m929si22igssijbmacmc2s36h7mq59k0hqwb7i9bnwzzpg5"; + version = "0.8.2.1"; + sha256 = "0glzqkd0vxrbajx76gfwqvrdg2q6648x64x5fm876899dr9cbss7"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -64409,8 +64481,8 @@ self: { ({ mkDerivation, base, composite-aeson, path }: mkDerivation { pname = "composite-aeson-path"; - version = "0.8.1.0"; - sha256 = "11f9xr2zfqj2bskr7yypxrd5qa64lzsbgdr6h3yy7ysr6cwpaqw7"; + version = "0.8.2.1"; + sha256 = "096k8wg3r4rfn4yyqpn8higglllk4mq3iwy57x33mnqgxqbdc1lm"; libraryHaskellDepends = [ base composite-aeson path ]; description = "Formatting data for the path library"; license = lib.licenses.bsd3; @@ -64424,13 +64496,15 @@ self: { }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.8.1.0"; - sha256 = "1w6dp10xxd391dhj1ghqnld27b36c86zjrry0r0xz1yn6bbxw97s"; + version = "0.8.2.1"; + sha256 = "1k1hvhczrpx13z0zryih56dhnajmsrspaslrrbir7kbr9c3mc1jq"; libraryHaskellDepends = [ aeson-better-errors base composite-aeson mtl refined ]; description = "composite-aeson support for Refined from the refined package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "composite-aeson-throw" = callPackage @@ -64469,8 +64543,8 @@ self: { }: mkDerivation { pname = "composite-base"; - version = "0.8.1.0"; - sha256 = "18sq4alpkwidgh6pd9yxnxrq8p11pfwxg84fsjzzxlxqcl50bpm8"; + version = "0.8.2.1"; + sha256 = "0i2mamh5gz7ay1cm5nkmdbh2lnaph42pfi2aa9jb2baxi0jgxdri"; libraryHaskellDepends = [ base deepseq exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base unliftio-core @@ -64489,8 +64563,8 @@ self: { ({ mkDerivation, base, binary, composite-base }: mkDerivation { pname = "composite-binary"; - version = "0.8.1.0"; - sha256 = "1vhcv7jmh4ckf9837dpkzpjrh65alndgngxj15igxrwbsycl2wp9"; + version = "0.8.2.1"; + sha256 = "0bxnzxvw5mjhz3kh6x265l70hp1z3z1y9fbdwhrgv6bhhinxb3hq"; libraryHaskellDepends = [ base binary composite-base ]; description = "Orphan binary instances"; license = lib.licenses.bsd3; @@ -64531,8 +64605,6 @@ self: { ]; description = "Dhall instances for composite records"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "composite-ekg" = callPackage @@ -64540,8 +64612,8 @@ self: { }: mkDerivation { pname = "composite-ekg"; - version = "0.8.1.0"; - sha256 = "17i8mi9i8x3d9idfy60picz5qjqhl2wszjdbm8cj5szjw94lmka5"; + version = "0.8.2.1"; + sha256 = "0c0rxa30r19wcvqrw20xk96652mxknbs1lqpnzdj9kz77al3k1kl"; libraryHaskellDepends = [ base composite-base ekg-core lens text vinyl ]; @@ -64553,8 +64625,8 @@ self: { ({ mkDerivation, base, composite-base, hashable }: mkDerivation { pname = "composite-hashable"; - version = "0.8.1.0"; - sha256 = "0gz5bqyhwm863d6hxd67s6xbvk8shh2x7ggz1iyf48s16mr9i1w7"; + version = "0.8.2.1"; + sha256 = "1ynsmb9rw93n4dyrrfipb9glg5argh0xsbrb59jhgqi8ajfr7gwv"; libraryHaskellDepends = [ base composite-base hashable ]; description = "Orphan hashable instances"; license = lib.licenses.bsd3; @@ -64587,8 +64659,6 @@ self: { libraryHaskellDepends = [ base composite-base lens vinyl ]; description = "Extra lens functions for composite"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "composite-opaleye" = callPackage @@ -64598,8 +64668,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.8.1.0"; - sha256 = "1i0algplj79vafqai57hywcar4j1gi3w9lnq4hv8dv37z0isc6f4"; + version = "0.8.2.1"; + sha256 = "0w62s1cd6izkvc9ycb6rz6cbc7pa8mic9rbbmwjbn9xxfcbk2xph"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors split template-haskell text vinyl @@ -64620,8 +64690,8 @@ self: { }: mkDerivation { pname = "composite-swagger"; - version = "0.8.1.0"; - sha256 = "1229c3wpkmnwmkzgcxs7pc01dmszvipvlq7dc1h1lvgi2jj24pg8"; + version = "0.8.2.1"; + sha256 = "0sbjb60ghd86q3hxgmq4anc81ww4v4ny1ans0r9a5chp3bqvbi6a"; libraryHaskellDepends = [ base composite-base insert-ordered-containers lens swagger2 template-haskell text vinyl @@ -65185,8 +65255,6 @@ self: { ]; description = "A client side web UI framework for Haskell. Core framework."; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "concurrency" = callPackage @@ -65225,7 +65293,9 @@ self: { ]; description = "Benchmarks to compare concurrency APIs"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "makecharts"; + broken = true; }) {}; "concurrent-barrier" = callPackage @@ -65368,6 +65438,8 @@ self: { pname = "concurrent-output"; version = "1.10.16"; sha256 = "0l4k0bkq5bddqraf14g3ngyzwff17f3ngg4axlilcl3zf3c4bamh"; + revision = "1"; + editedCabalFile = "0ak0nnfznsvq3vs8czsnlrw586hw4hj3299y75p7rhqi5jyvi932"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions process stm terminal-size text transformers unix @@ -65376,6 +65448,23 @@ self: { license = lib.licenses.bsd2; }) {}; + "concurrent-output_1_10_17" = callPackage + ({ mkDerivation, ansi-terminal, async, base, directory, exceptions + , process, stm, terminal-size, text, transformers, unix + }: + mkDerivation { + pname = "concurrent-output"; + version = "1.10.17"; + sha256 = "12dmpjdiv3y1jnljvsbx258plzjvsjnizn25csmy7w4scfbrjl0b"; + libraryHaskellDepends = [ + ansi-terminal async base directory exceptions process stm + terminal-size text transformers unix + ]; + description = "Ungarble output from several threads or commands"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "concurrent-resource-map" = callPackage ({ mkDerivation, base, containers, random, stm }: mkDerivation { @@ -65461,6 +65550,8 @@ self: { testHaskellDepends = [ base containers ]; description = "A fast concurrent unique identifier supply with a pure API"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "concurrent-utilities" = callPackage @@ -65513,7 +65604,9 @@ self: { testHaskellDepends = [ base cmdargs hourglass hspec QuickCheck ]; description = "Parser and interpreter of OpenStreetMap conditional restriction values"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "conditional-restriction-parser-exe"; + broken = true; }) {}; "condor" = callPackage @@ -65823,6 +65916,8 @@ self: { ]; description = "Conduit source and sink for Network.Connection."; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "conduit-extra" = callPackage @@ -66177,8 +66272,8 @@ self: { pname = "conferer"; version = "1.1.0.0"; sha256 = "1hkdrqxrac1mbzvd29f6ds4cbihdv0j0daai7yc282myv0varh09"; - revision = "2"; - editedCabalFile = "0j7q975kg4dchl7pn8cl26sf8945bmhw5mvy73s18ylxqx4qqkwb"; + revision = "3"; + editedCabalFile = "15gs9cv1i9j4qx6vnp32yhcjb5rjaf9g3jsfdzmi5v7i3b1gziwc"; libraryHaskellDepends = [ base bytestring containers directory filepath text ]; @@ -66198,8 +66293,8 @@ self: { pname = "conferer-aeson"; version = "1.1.0.2"; sha256 = "07rdal3smq1s14zmsn7g26vc6sqj21rsa2a1vcbrwrfgh9x36jkn"; - revision = "1"; - editedCabalFile = "19v6xla4vvhmhqh3z82inp1b6jzvprbvcmd9nbg1l65nsvqgq25a"; + revision = "2"; + editedCabalFile = "000fs57llk3f1x0rgdkxzbqzwzh5fx3mirpx0scmnj936byapp4c"; libraryHaskellDepends = [ aeson base bytestring conferer directory text unordered-containers vector @@ -66232,6 +66327,8 @@ self: { ]; description = "Configuration for reading dhall files"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "conferer-hedis" = callPackage @@ -66410,14 +66507,16 @@ self: { }: mkDerivation { pname = "conferer-warp"; - version = "1.1.0.0"; - sha256 = "0zbgxq229jr7xwzw6q20rwnslbci07b1vk324izm8hxcp3kb76mj"; + version = "1.1.0.1"; + sha256 = "1dbqm1vb00d1dnm3fixw4p7xv1bwpmv0xfkdig0xlgc5b70xbjsh"; libraryHaskellDepends = [ base conferer http-types text wai warp ]; testHaskellDepends = [ base conferer hspec http-types text wai warp ]; description = "conferer's FromConfig instances for warp settings"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "conferer-yaml" = callPackage @@ -66815,6 +66914,7 @@ self: { ]; description = "Vinyl-style extensible graphs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "conjugateGradient" = callPackage @@ -67046,6 +67146,20 @@ self: { broken = true; }) {}; + "constable" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "constable"; + version = "0.1.0.0"; + sha256 = "0hz63w3h7if70701kzclvcjr1310ycfcm9y46xfv8mgbs4kjp2xx"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + description = "A safe interface for Const summarization"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "constaparser" = callPackage ({ mkDerivation, attoparsec, base, bytestring, vector }: mkDerivation { @@ -67079,6 +67193,8 @@ self: { libraryHaskellDepends = [ base ]; description = "Generalization of standard Functor, Foldable, and Traversable classes"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "constrained-categories" = callPackage @@ -67181,6 +67297,7 @@ self: { ]; description = "Instances of standard platform types for 'constrained' package"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; }) {}; "constraint" = callPackage @@ -67279,6 +67396,8 @@ self: { ]; description = "Manipulating constraints and deriving class instances programmatically"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "constraints-emerge" = callPackage @@ -67316,6 +67435,22 @@ self: { mainProgram = "readme"; }) {}; + "constraints-extras_0_4_0_0" = callPackage + ({ mkDerivation, aeson, base, constraints, template-haskell }: + mkDerivation { + pname = "constraints-extras"; + version = "0.4.0.0"; + sha256 = "1irf4kd7a5h1glczbc73c3590m58azn4s68nfrjfg1h96i7mjfgn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base constraints template-haskell ]; + executableHaskellDepends = [ aeson base constraints ]; + description = "Utility package for constraints"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "readme"; + }) {}; + "constrictor" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { @@ -67554,6 +67689,8 @@ self: { libraryHaskellDepends = [ base base-unicode-symbols containers ]; description = "Unicode alternatives for common functions and operators"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "containers-verified" = callPackage @@ -67730,8 +67867,8 @@ self: { }: mkDerivation { pname = "contiguous"; - version = "0.6.2.0"; - sha256 = "0ykd3nrc2ywf3svrkqsvvhycjf6hf5jm5dhhd3zpl57877r5cz72"; + version = "0.6.3.0"; + sha256 = "1vqzv5xr6dkvw0789rz3z39b7ldm9xrk2sv8c9k2fk14yxl7qibx"; libraryHaskellDepends = [ base deepseq primitive primitive-unlifted run-st ]; @@ -67889,6 +68026,8 @@ self: { ]; description = "Validation types/typeclass based on the contravariance"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "contravariant" = callPackage @@ -68046,7 +68185,6 @@ self: { ]; description = "Monads-fd instances for the EMT exceptions monad transformer"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "control-monad-exception-monadstf" = callPackage @@ -68166,8 +68304,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "Fast, easy to use CPS-based monad transformers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "contstuff-monads-tf" = callPackage @@ -68180,6 +68316,7 @@ self: { description = "ContStuff instances for monads-tf transformers (deprecated)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "contstuff-transformers" = callPackage @@ -68192,6 +68329,7 @@ self: { description = "Deprecated interface between contstuff 0.7.0 and the transformers package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "converge" = callPackage @@ -68318,6 +68456,7 @@ self: { license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "convert-annotation"; + broken = true; }) {}; "convertible" = callPackage @@ -68392,8 +68531,8 @@ self: { }: mkDerivation { pname = "cookie"; - version = "0.4.5"; - sha256 = "10rmdasb7mypbwxdj2mhr810vqhkakpik7hyd8fvj60hng8r8zvh"; + version = "0.4.6"; + sha256 = "1ajbcsk4k0jc6v2fqn36scs6l8wa6fq46gd54pak75rbqdbajhcc"; libraryHaskellDepends = [ base bytestring data-default-class deepseq text time ]; @@ -68438,8 +68577,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.12"; - sha256 = "0svbn9djzxqbmi62106i2692fx31vdxqjjd2y329nlq36iivvyxf"; + version = "3.13"; + sha256 = "1a6r3r1q6vqxmwdj89bmvbzrlkfyyzq6i84ydg756wsvm6mipq7a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68457,8 +68596,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.12"; - sha256 = "0xxvdl1k09il545y263k5x37gi5z1y4plm8f4yjqh3hprv23ffhp"; + version = "3.13"; + sha256 = "112lmmylylq9jwcj0diy3fqn9kbs8xkyqc9l7n5jjy5h3yak8d2c"; libraryHaskellDepends = [ base copilot-core directory filepath language-c99 language-c99-simple mtl pretty @@ -68485,14 +68624,14 @@ self: { }) {}; "copilot-core" = callPackage - ({ mkDerivation, base, dlist, HUnit, pretty, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 + ({ mkDerivation, base, HUnit, pretty, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "copilot-core"; - version = "3.12"; - sha256 = "1aw6pkxqpcwqib86yq2zvjz6jqxjc3ina0hbxsyvmgmcqs5hwybs"; - libraryHaskellDepends = [ base dlist pretty ]; + version = "3.13"; + sha256 = "0i05bpiag7prr3xn361psda7ncfyrgbd6rjsy23rkf4ygmb2908p"; + libraryHaskellDepends = [ base pretty ]; testHaskellDepends = [ base HUnit pretty QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 @@ -68525,8 +68664,8 @@ self: { }: mkDerivation { pname = "copilot-interpreter"; - version = "3.12"; - sha256 = "100nalpd7q9z26nyk06nbl4hr8p6akm8qny988zd8znp2c3z37rr"; + version = "3.13"; + sha256 = "0z03qlafv53sxp50j9ccp1pgfs3nqm4l7m18cxzflzzn6j3bnrjy"; libraryHaskellDepends = [ base copilot-core pretty ]; testHaskellDepends = [ base copilot-core copilot-prettyprinter pretty QuickCheck @@ -68544,8 +68683,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "3.12"; - sha256 = "1n2n83617wi0piw94g843zk39xvralcn7l8vdcvbx6gwqm9dn320"; + version = "3.13"; + sha256 = "060lr6m9kp204qyjga6xl879ypv648wm6gh33w10x5jlzghabl4d"; libraryHaskellDepends = [ array base containers copilot-core copilot-interpreter copilot-prettyprinter copilot-theorem data-reify mtl @@ -68563,8 +68702,8 @@ self: { ({ mkDerivation, base, containers, copilot-language, mtl, parsec }: mkDerivation { pname = "copilot-libraries"; - version = "3.12"; - sha256 = "0xxfz2r04x0cwyidlfd792v4jspv38v8w012w0dmr0ajsw15npxb"; + version = "3.13"; + sha256 = "05ffpp2h83l0wvddfmi6m42c79qsw07dfmx8bmj2zwfhhikp043r"; libraryHaskellDepends = [ base containers copilot-language mtl parsec ]; @@ -68577,8 +68716,8 @@ self: { ({ mkDerivation, base, copilot-core, pretty }: mkDerivation { pname = "copilot-prettyprinter"; - version = "3.12"; - sha256 = "1sj4fjj6kwarjxn53qrfvl0ca200ra9hnh8mrisc4jr87xhdbnh0"; + version = "3.13"; + sha256 = "04ivmsrb51j7agmb1nimzxp0srkkv52qi49qxishf8gj4jnhm10p"; libraryHaskellDepends = [ base copilot-core pretty ]; description = "A prettyprinter of Copilot Specifications"; license = lib.licenses.bsd3; @@ -68598,7 +68737,6 @@ self: { description = "A compiler for CoPilot targeting SBV"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "copilot-theorem" = callPackage @@ -68609,8 +68747,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "3.12"; - sha256 = "1q0r8fa4jvqpkiy099f9fmrcm2qy0wrvxwkaycbqlhgx1zixxl3z"; + version = "3.13"; + sha256 = "0q0pfnaayldy1h62qj25ksfc9v2vyp5aiy3b2lxw436lw2brl4jf"; libraryHaskellDepends = [ base bimap bv-sized containers copilot-core copilot-prettyprinter data-default directory libBF mtl panic parameterized-utils parsec @@ -68717,7 +68855,9 @@ self: { executableToolDepends = [ alex happy ]; description = "compile your own mini functional language with Core"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "core-compiler-exe"; + broken = true; }) {}; "core-data" = callPackage @@ -68756,27 +68896,6 @@ self: { }) {}; "core-program" = callPackage - ({ mkDerivation, async, base, bytestring, chronologique, core-data - , core-text, directory, exceptions, filepath, fsnotify, hashable - , hourglass, mtl, prettyprinter, safe-exceptions, stm - , template-haskell, terminal-size, text, text-short, transformers - , typed-process, unix - }: - mkDerivation { - pname = "core-program"; - version = "0.4.6.4"; - sha256 = "0bkjb9lpcnkj1lkpw309q3chd9aw5s5gvdprr335121xpjbgl33m"; - libraryHaskellDepends = [ - async base bytestring chronologique core-data core-text directory - exceptions filepath fsnotify hashable hourglass mtl prettyprinter - safe-exceptions stm template-haskell terminal-size text text-short - transformers typed-process unix - ]; - description = "Opinionated Haskell Interoperability"; - license = lib.licenses.mit; - }) {}; - - "core-program_0_6_1_1" = callPackage ({ mkDerivation, base, bytestring, core-data, core-text, directory , exceptions, filepath, fsnotify, hashable, hourglass, mtl , prettyprinter, safe-exceptions, stm, template-haskell @@ -68795,7 +68914,6 @@ self: { ]; description = "Opinionated Haskell Interoperability"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "core-telemetry" = callPackage @@ -68815,8 +68933,6 @@ self: { ]; description = "Advanced telemetry"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "core-text" = callPackage @@ -68849,6 +68965,8 @@ self: { testHaskellDepends = [ base ]; description = "\"Provide warnings for unexpected Core generation\""; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "core-webserver-servant" = callPackage @@ -68866,7 +68984,6 @@ self: { ]; description = "Interoperability with Servant"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "core-webserver-warp" = callPackage @@ -68885,7 +69002,6 @@ self: { ]; description = "Interoperability with Wai/Warp"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "corebot-bliki" = callPackage @@ -69134,22 +69250,6 @@ self: { }) {}; "countable" = callPackage - ({ mkDerivation, base, bytestring, silently, tasty, tasty-golden - , tasty-hunit - }: - mkDerivation { - pname = "countable"; - version = "1.0"; - sha256 = "0v0fdapdnzdqbkjhgkicx1njs3ybshk83h79fbgln13sd5pyp87r"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring silently tasty tasty-golden tasty-hunit - ]; - description = "Countable, Searchable, Finite, Empty classes"; - license = lib.licenses.bsd3; - }) {}; - - "countable_1_2" = callPackage ({ mkDerivation, base, bytestring, silently, tasty, tasty-golden , tasty-hunit }: @@ -69163,7 +69263,6 @@ self: { ]; description = "Countable, Searchable, Finite, Empty classes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "countable-inflections" = callPackage @@ -69196,6 +69295,33 @@ self: { }) {}; "country" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytebuild, bytehash + , byteslice, bytestring, compact, contiguous, deepseq, entropy + , gauge, hashable, primitive, primitive-unlifted, QuickCheck + , quickcheck-classes, scientific, tasty, tasty-quickcheck, text + , text-short, unordered-containers + }: + mkDerivation { + pname = "country"; + version = "0.2.3"; + sha256 = "12d1nymfj13jgh5jhznrg8sgxvxyb2y3lvbl6p4mpa3qqhggyr3g"; + libraryHaskellDepends = [ + aeson attoparsec base bytebuild bytehash byteslice bytestring + contiguous deepseq entropy hashable primitive primitive-unlifted + scientific text text-short unordered-containers + ]; + testHaskellDepends = [ + base byteslice primitive QuickCheck quickcheck-classes tasty + tasty-quickcheck text text-short + ]; + benchmarkHaskellDepends = [ + base bytehash byteslice bytestring compact gauge primitive text + ]; + description = "Country data type and functions"; + license = lib.licenses.bsd3; + }) {}; + + "country_0_2_3_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytebuild, bytehash , byteslice, bytestring, compact, contiguous, deepseq, entropy , gauge, hashable, primitive, primitive-unlifted, QuickCheck @@ -69221,7 +69347,6 @@ self: { description = "Country data type and functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "country-codes" = callPackage @@ -69288,21 +69413,6 @@ self: { }) {}; "covariance" = callPackage - ({ mkDerivation, base, glasso, hmatrix, statistics, tasty - , tasty-hunit, vector - }: - mkDerivation { - pname = "covariance"; - version = "0.1.0.6"; - sha256 = "0aqml07q4rxihv3mrflprx2gm1c56np2m4n8kbipcdiflndn1017"; - libraryHaskellDepends = [ base glasso hmatrix statistics vector ]; - testHaskellDepends = [ base hmatrix tasty tasty-hunit ]; - description = "Well-conditioned estimation of large-dimensional covariance matrices"; - license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - - "covariance_0_2_0_1" = callPackage ({ mkDerivation, base, glasso, hmatrix, statistics, tasty , tasty-hunit, vector }: @@ -69314,7 +69424,6 @@ self: { testHaskellDepends = [ base hmatrix tasty tasty-hunit ]; description = "Well-conditioned estimation of large-dimensional covariance matrices"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.dschrempf ]; }) {}; @@ -69535,8 +69644,8 @@ self: { ({ mkDerivation, base, containers, directory, parallel }: mkDerivation { pname = "cpsa"; - version = "3.6.11"; - sha256 = "1kqsr0vb9sxg2c5y14k66d381gx6779bns6ybjymgabw98asmm3k"; + version = "4.4.1"; + sha256 = "14g31626g72qljbrds08cpx670v2zgis05z3nkd5b7lim99ibhfh"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -69911,6 +70020,7 @@ self: { ]; description = "Crack various integer and floating-point data formats"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "crackNum"; }) {}; @@ -70094,8 +70204,8 @@ self: { }: mkDerivation { pname = "crc32c"; - version = "0.0.0"; - sha256 = "1y008mi1livbm6rpc4rj4nnrkwqqm7xk92sdf14r5iqwj8nnh209"; + version = "0.1.0"; + sha256 = "0b7minx4d0801nbyryz9jx680hlbrx6incwnhrz7g0dgpw0fhw0b"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ @@ -70104,6 +70214,8 @@ self: { description = "Haskell bindings for crc32c"; license = lib.licenses.bsd3; platforms = lib.platforms.x86; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "crdt" = callPackage @@ -70471,7 +70583,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "criterion-compare"; - broken = true; }) {}; "criterion-measurement" = callPackage @@ -71165,6 +71276,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "Easy-and-safe-to-use high-level cryptography based on Sodium"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; }) {}; "crypto-token" = callPackage @@ -71484,30 +71596,6 @@ self: { }) {}; "cryptonite" = callPackage - ({ mkDerivation, base, basement, bytestring, deepseq, gauge - , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit - , tasty-kat, tasty-quickcheck - }: - mkDerivation { - pname = "cryptonite"; - version = "0.29"; - sha256 = "13xhp3hshb8x06bw37kp16c9jpjmgfn06nkj9drz745fv8f04fnq"; - revision = "1"; - editedCabalFile = "1gaabsh8ihxcb6f3pplvpkplw7xbdxvflmc1wwnssx7s070n4323"; - libraryHaskellDepends = [ - base basement bytestring deepseq ghc-prim integer-gmp memory - ]; - testHaskellDepends = [ - base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base bytestring deepseq gauge memory random - ]; - description = "Cryptography Primitives sink"; - license = lib.licenses.bsd3; - }) {}; - - "cryptonite_0_30" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, gauge , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit , tasty-kat, tasty-quickcheck @@ -71527,7 +71615,6 @@ self: { ]; description = "Cryptography Primitives sink"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "cryptonite-cd" = callPackage @@ -71727,11 +71814,14 @@ self: { pname = "csound-catalog"; version = "0.7.6"; sha256 = "0gida0g314hl8nyn5ybbv57yjf10mhjmsdmhk5vgblvhnc95ks36"; + revision = "1"; + editedCabalFile = "0jjpnm5v161d0g36kd9jqqasfzq2g2qaqn95pyb87bkrsrhrqnac"; libraryHaskellDepends = [ base csound-expression csound-sampler sharc-timbre transformers ]; description = "a gallery of Csound instruments"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "csound-controllers" = callPackage @@ -71743,6 +71833,7 @@ self: { libraryHaskellDepends = [ base csound-expression ]; testHaskellDepends = [ base csound-expression ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "csound-expression" = callPackage @@ -71755,6 +71846,8 @@ self: { pname = "csound-expression"; version = "5.4.3"; sha256 = "00hd0sb1787cx7yppg2f3zkd3y8d75fsmf460qnsxc77m4qw5388"; + revision = "1"; + editedCabalFile = "0fd6ln4kgf3cvj396l5w4zzl5zfkaf6ylqhly86lajr72mypf1nr"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -71762,6 +71855,7 @@ self: { ]; description = "library to make electronic music"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "csound-expression-dynamic" = callPackage @@ -71773,12 +71867,16 @@ self: { pname = "csound-expression-dynamic"; version = "0.3.9"; sha256 = "0cj1g7x06y9b8dky6k2dixv8gxxrcdjvlr8big5fld34w8k39cn6"; + revision = "2"; + editedCabalFile = "061j05spmhh9nsk77f75bqnh75l0w3xhyv1897rkfpp9gz9k5rrv"; libraryHaskellDepends = [ array base Boolean containers data-default data-fix data-fix-cse deriving-compat hashable transformers wl-pprint ]; description = "dynamic core for csound-expression library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "csound-expression-opcodes" = callPackage @@ -71789,11 +71887,14 @@ self: { pname = "csound-expression-opcodes"; version = "0.0.5.1"; sha256 = "0h1a9yklsqbykhdinmk8znm7kfg0jd1k394cx2lirpdxn136kbcm"; + revision = "1"; + editedCabalFile = "1jia50zyv8kp0x66igy3bzmhgdgw87cc75gjsw2q1lmd7l82pxky"; libraryHaskellDepends = [ base csound-expression-dynamic csound-expression-typed transformers ]; description = "opcodes for the library csound-expression"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "csound-expression-typed" = callPackage @@ -71806,6 +71907,8 @@ self: { pname = "csound-expression-typed"; version = "0.2.7"; sha256 = "1mh1mfyi2vx8ykyc1ca8vpbi545fkp7f0ss5nw6dkykl6zm7pj6d"; + revision = "1"; + editedCabalFile = "05vfq1cjznkpaxsficvdccn47z5qa69ykx1ff43zyri5bab3zqzq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic @@ -71814,6 +71917,7 @@ self: { ]; description = "typed core for the library csound-expression"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "csound-sampler" = callPackage @@ -71822,9 +71926,12 @@ self: { pname = "csound-sampler"; version = "0.0.10.1"; sha256 = "1c2g83a0n4y1fvq3amj9m2hygg9rbpl5x8zsicb52qjm7vjing2i"; + revision = "1"; + editedCabalFile = "09x2bb3ar7c1av0n7988405i3canmk8jxb8a59jn2zdrm0fh7jlz"; libraryHaskellDepends = [ base csound-expression transformers ]; description = "A musical sampler based on Csound"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "csp" = callPackage @@ -71904,17 +72011,18 @@ self: { "css-selectors" = callPackage ({ mkDerivation, aeson, alex, array, base, binary, blaze-markup - , bytestring, data-default, Decimal, happy, hashable, QuickCheck - , shakespeare, template-haskell, test-framework + , bytestring, data-default-class, Decimal, deepseq, happy, hashable + , QuickCheck, shakespeare, template-haskell, test-framework , test-framework-quickcheck2, text, zlib }: mkDerivation { pname = "css-selectors"; - version = "0.4.0.3"; - sha256 = "1jz7s5lpfgs6axzkmwp2is1mhsn8jsb52ahxv8my07lx0yvy1g7v"; + version = "0.5.0.0"; + sha256 = "0k51bs3dqfzrq76fa37z8f9n02nw9gkvb04l1yzbcs3a2fvwdnsq"; libraryHaskellDepends = [ - aeson array base binary blaze-markup bytestring data-default - Decimal hashable QuickCheck shakespeare template-haskell text zlib + aeson array base binary blaze-markup bytestring data-default-class + Decimal deepseq hashable QuickCheck shakespeare template-haskell + text zlib ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ @@ -72068,6 +72176,8 @@ self: { ]; description = "extracts data from a CSV file"; license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "csv-table" = callPackage @@ -72502,6 +72612,8 @@ self: { testHaskellDepends = [ base parsec text ]; description = "Curly braces (brackets) expanding"; license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "currencies" = callPackage @@ -72700,8 +72812,6 @@ self: { ]; description = "Fast, Haskell RPC"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "curryrs" = callPackage @@ -72736,7 +72846,6 @@ self: { ]; description = "Terminal tool for viewing tabular data"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "cursedcsv"; }) {}; @@ -72902,6 +73011,23 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "custom-interpolation" = callPackage + ({ mkDerivation, base, data-default-class, haskell-src-meta, mtl + , parsec, template-haskell + }: + mkDerivation { + pname = "custom-interpolation"; + version = "0.1.0.1"; + sha256 = "158ljlw17486n46p5vhbmsn8y1c4zs7i7piwhd6mjigzhv5hr4vd"; + libraryHaskellDepends = [ + base data-default-class haskell-src-meta mtl parsec + template-haskell + ]; + testHaskellDepends = [ base template-haskell ]; + description = "Customizable string interpolation quasiquoters"; + license = lib.licenses.bsd3; + }) {}; + "custom-prelude" = callPackage ({ mkDerivation, base, basic-prelude, monad-loops }: mkDerivation { @@ -72971,7 +73097,9 @@ self: { ]; description = "Cut files according to a position list"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "cutter"; + broken = true; }) {}; "cv-combinators" = callPackage @@ -73124,8 +73252,8 @@ self: { ({ mkDerivation, base, hashable, hedgehog, template-haskell }: mkDerivation { pname = "d10"; - version = "1.0.1.0"; - sha256 = "0494hnk99nski7xsas06kbskvi4m9k7h5hizn1w8034xc34n0ppg"; + version = "1.0.1.2"; + sha256 = "138mhpl9yhaxbd98m1n5g8h4skbb4agyf7igl1ar3mr6snfhilas"; libraryHaskellDepends = [ base hashable hedgehog template-haskell ]; @@ -73247,6 +73375,7 @@ self: { description = "Binary parsing and serialization with integrated size"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "damnpacket" = callPackage @@ -73800,6 +73929,7 @@ self: { description = "Use Accessor to access state in monads-fd State monad class"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "data-accessor-monads-tf" = callPackage @@ -73899,6 +74029,8 @@ self: { ]; description = "Type-safe, bytestring-based ASCII values"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "data-aviary" = callPackage @@ -74179,6 +74311,7 @@ self: { ]; description = "A class for types with a default value"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "data-default-generics" = callPackage @@ -74270,6 +74403,8 @@ self: { libraryHaskellDepends = [ base data-default-class ]; description = "Default instances for types in newer versions of base package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "data-default-instances-old-locale" = callPackage @@ -74429,8 +74564,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Coerce between unlifted boxed and lifted types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "data-elf" = callPackage @@ -74444,7 +74577,6 @@ self: { ]; description = "Executable and Linkable Format (ELF) data structures"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "data-embed" = callPackage @@ -74666,10 +74798,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "data-forest"; - version = "0.1.0.9"; - sha256 = "1l16hg1pfzrbi2ih6najcam18p2b5lvmmkl6fxvk7izynvcc79jc"; - revision = "1"; - editedCabalFile = "0m0fp8fx21257z5k1g575wjcmavd29qav4cgjcwg5nxkxwrfldg8"; + version = "0.1.0.10"; + sha256 = "0wfw87vb00lgc1pf6cmqmlzfqskhy42kyzfj5nyfw1lch8s6sbvm"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A simple multi-way tree data structure"; @@ -74715,6 +74845,8 @@ self: { pname = "data-functor-logistic"; version = "0.0"; sha256 = "0k2r4jpm7sa3hgd6i08sg9xbgjzkgzx44z5ai5zpw32b7pqr9xqm"; + revision = "1"; + editedCabalFile = "135950pg0gxqhzmvzq9lmvvy5qnsd3q8963fslasgj01bixb3k0f"; libraryHaskellDepends = [ base distributive ]; description = "Updatable analogue of Distributive functors"; license = lib.licenses.bsd3; @@ -74877,8 +75009,6 @@ self: { ]; description = "Used to be Haskell 98 Lenses"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "data-lens-fd" = callPackage @@ -74893,6 +75023,7 @@ self: { description = "Lenses"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "data-lens-ixset" = callPackage @@ -74906,6 +75037,7 @@ self: { description = "A Lens for IxSet"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "data-lens-light" = callPackage @@ -74930,6 +75062,7 @@ self: { description = "Utilities for Data.Lens"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "data-list-sequences" = callPackage @@ -75518,8 +75651,6 @@ self: { testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "Shorter binary words"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "data-tensor" = callPackage @@ -75701,7 +75832,6 @@ self: { description = "HasId/Groundhog interop"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "database-migrate" = callPackage @@ -76345,33 +76475,6 @@ self: { }) {}; "dbus" = callPackage - ({ mkDerivation, base, bytestring, cereal, conduit, containers - , criterion, deepseq, directory, exceptions, extra, filepath, lens - , network, parsec, process, QuickCheck, random, resourcet, split - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text - , th-lift, transformers, unix, vector, xml-conduit, xml-types - }: - mkDerivation { - pname = "dbus"; - version = "1.2.22"; - sha256 = "03bpvdgjq4l7s5mihdhazd0aamcjvg9wxlgpsnm10r7jdk7lbbia"; - libraryHaskellDepends = [ - base bytestring cereal conduit containers deepseq exceptions - filepath lens network parsec random split template-haskell text - th-lift transformers unix vector xml-conduit xml-types - ]; - testHaskellDepends = [ - base bytestring cereal containers directory extra filepath network - parsec process QuickCheck random resourcet tasty tasty-hunit - tasty-quickcheck text transformers unix vector - ]; - benchmarkHaskellDepends = [ base criterion ]; - doCheck = false; - description = "A client library for the D-Bus IPC system"; - license = lib.licenses.asl20; - }) {}; - - "dbus_1_2_27" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers , criterion, deepseq, directory, exceptions, extra, filepath, lens , network, parsec, process, QuickCheck, random, resourcet, split @@ -76396,7 +76499,6 @@ self: { doCheck = false; description = "A client library for the D-Bus IPC system"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "dbus-client" = callPackage @@ -76642,7 +76744,6 @@ self: { description = "Disciplined Disciple Compiler core language and type checker"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ddc-core-babel" = callPackage @@ -76949,8 +77050,8 @@ self: { }: mkDerivation { pname = "dear-imgui"; - version = "2.1.1"; - sha256 = "0br6wx9jzbvk5wnzcnyrlvrq3rslx6akzsfbyb2yqw1m8nl1nkfq"; + version = "2.1.3"; + sha256 = "1czb3g51wh761r0s7d9v47fyx926r1prp3agi5cxpa34vwmghr9x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77089,8 +77190,8 @@ self: { }: mkDerivation { pname = "debug-me"; - version = "1.20220324"; - sha256 = "0zpg45bfqnlcnxh8kg2yy336qq9zb01g0ypqf7s2la33kxgck8n5"; + version = "1.20221231"; + sha256 = "1bwbrxgnsjd1n9za0c1hlsrciq75zkjp1vbs3vzz0m6pj0j405li"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -77104,7 +77205,9 @@ self: { ]; description = "secure remote debugging"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "debug-me"; + broken = true; }) {}; "debug-pp" = callPackage @@ -77258,8 +77361,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "Preprocessing decimal literals more or less as they are (instead of via fractions)"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "decision-diagrams" = callPackage @@ -77286,6 +77387,8 @@ self: { ]; description = "Binary Decision Diagrams (BDD) and Zero-suppressed Binary Decision Diagrams (ZDD)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "declarative" = callPackage @@ -77383,8 +77486,8 @@ self: { }: mkDerivation { pname = "deep-transformations"; - version = "0.2"; - sha256 = "1kk7h4vys9l0456kaapdg1y1d8lzfkzkb71mc996l2lmrdxvzz5v"; + version = "0.2.1"; + sha256 = "0k17v0h5nll73rs03qn5b7lblarzrhmlhk44kx0ipzh4kra55500"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base generic-lens rank2classes template-haskell transformers @@ -77434,7 +77537,9 @@ self: { ]; description = "Call DeepL to translate you files"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "deepl"; + broken = true; }) {}; "deeplearning-hs" = callPackage @@ -77466,12 +77571,12 @@ self: { mainProgram = "deeplearning_demonstration"; }) {}; - "deepseq_1_4_8_0" = callPackage + "deepseq_1_4_8_1" = callPackage ({ mkDerivation, array, base, ghc-prim }: mkDerivation { pname = "deepseq"; - version = "1.4.8.0"; - sha256 = "0nk5hly70xb91q5pnq87yrwh0365kqj7iyhq5mbj8yhgwxr1661d"; + version = "1.4.8.1"; + sha256 = "0p8nmji6r9171mrmnnsm1x396pz6q0vks0afy475vny73i1rx1a7"; libraryHaskellDepends = [ array base ghc-prim ]; testHaskellDepends = [ array base ghc-prim ]; description = "Deep evaluation of data structures"; @@ -78049,8 +78154,8 @@ self: { }: mkDerivation { pname = "dep-t"; - version = "0.6.4.0"; - sha256 = "1xrazkn8pdzkjrcia9ndxiva483w9fyclcq562assnv9j3svi145"; + version = "0.6.6.0"; + sha256 = "1r3pd00jlbqc8z61a1s5iwzp9y1lbqvs55sc9f495fg8m35zxcqz"; libraryHaskellDepends = [ base mtl transformers unliftio-core ]; testHaskellDepends = [ aeson barbies base bytestring containers doctest mtl rank2classes @@ -78059,8 +78164,6 @@ self: { ]; description = "Dependency injection for records-of-functions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dep-t-advice" = callPackage @@ -78086,7 +78189,6 @@ self: { ]; description = "Giving good advice to functions in records-of-functions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "dep-t-dynamic" = callPackage @@ -78112,6 +78214,7 @@ self: { description = "A dynamic environment for dependency injection"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dep-t-value" = callPackage @@ -78134,6 +78237,7 @@ self: { description = "Pair resources files with types within your program"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dependency" = callPackage @@ -78233,6 +78337,8 @@ self: { pname = "dependent-map"; version = "0.4.0.0"; sha256 = "0b0zhyl3wkl4kkrxvq7vwjz3gn0ndxjjgyw9cky8a6xyv190pkjk"; + revision = "1"; + editedCabalFile = "160p9crvlx1sn60inkwxa6mv1h2d4fgqnpsb2km67zrkpdfyd2s2"; libraryHaskellDepends = [ base constraints-extras containers dependent-sum ]; @@ -78246,18 +78352,14 @@ self: { }: mkDerivation { pname = "dependent-monoidal-map"; - version = "0.1.1.2"; - sha256 = "11qcrxji3lvq4blzh1qk9wkhhzjkvz3maxfv63zgby98dpmkxa2x"; - revision = "1"; - editedCabalFile = "0149hmhqlj69pjg325p3da1z96czbjc18vp4i4acrvzbjh060nd4"; + version = "0.1.1.3"; + sha256 = "12kd8xr32zb21pvns3frabz5p8wlg6s3dcfgmam36hhv0d418r8l"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum dependent-sum-aeson-orphans ]; description = "Dependent map that uses semigroup mappend"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dependent-state" = callPackage @@ -78288,10 +78390,8 @@ self: { ({ mkDerivation, base, constraints-extras, some }: mkDerivation { pname = "dependent-sum"; - version = "0.7.1.0"; - sha256 = "0aj63gvak0y4mgxndykqfg5w958hf7lp5blml2z647rjgy85bjw1"; - revision = "2"; - editedCabalFile = "0d7wb1ag60mcm56axcrx9pd6hgrsxmqynyplbcfl01ms2i60fhr9"; + version = "0.7.2.0"; + sha256 = "1frw5965v8i6xqdgs95gg8asgdqcqnmfahz0pmbwiaw5ybn62rc2"; libraryHaskellDepends = [ base constraints-extras some ]; description = "Dependent sum type"; license = lib.licenses.publicDomain; @@ -78303,8 +78403,8 @@ self: { }: mkDerivation { pname = "dependent-sum-aeson-orphans"; - version = "0.3.1.0"; - sha256 = "1psjd7va8k53vq9kh4pclsf27798mc1ggk1csjk39c8d97vm41qz"; + version = "0.3.1.1"; + sha256 = "0d2255gxsamp19hl23m076ds2j08ny95swrk9r3njjfjrwkd4zbq"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum some @@ -78532,8 +78632,8 @@ self: { ({ mkDerivation, base, data-default }: mkDerivation { pname = "derive-enumerable"; - version = "0.1.1.0"; - sha256 = "08zhyn9xcmhrrnh7y2a1r7v4nmgm2af0d41ns0wjqais67rzsxsp"; + version = "0.2.0"; + sha256 = "0hb1hnzh9xb522fj797ix5y85hmh0cy32gqsgpfvgq3zkp2r4k5m"; libraryHaskellDepends = [ base data-default ]; description = "Generic instances for enumerating complex data types"; license = lib.licenses.gpl3Only; @@ -78575,6 +78675,8 @@ self: { ]; description = "Derive class instances though various kinds of lifting"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "derive-monoid" = callPackage @@ -78687,6 +78789,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "deriving-aeson_0_2_9" = callPackage + ({ mkDerivation, aeson, base, bytestring }: + mkDerivation { + pname = "deriving-aeson"; + version = "0.2.9"; + sha256 = "0cqq4ri9dgqkdh9wybf3wf5zxb9nihql591bk1lacnzdyxfrgcn0"; + libraryHaskellDepends = [ aeson base ]; + testHaskellDepends = [ aeson base bytestring ]; + description = "Type driven generic aeson instance customisation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "deriving-compat" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged @@ -78695,10 +78810,8 @@ self: { }: mkDerivation { pname = "deriving-compat"; - version = "0.6.1"; - sha256 = "09lxms6220saycra4kpxihwa7zh253zmv1zpa41dbnhgffxs3zbb"; - revision = "1"; - editedCabalFile = "0m3ywfvj96yqrdyv6mgnmdhlsvjjn89wl0n1n7v2m60zaan14cgh"; + version = "0.6.2"; + sha256 = "18kpai3jrazcnxcfqqjxkv2ghrz8xyg73rn5x0ipim3z09grj6ki"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell th-abstraction transformers transformers-compat @@ -78712,6 +78825,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "deriving-openapi3" = callPackage + ({ mkDerivation, aeson, base, deriving-aeson, lens, openapi3, text + }: + mkDerivation { + pname = "deriving-openapi3"; + version = "0.1.0.0"; + sha256 = "16jl42hpk21pwzlnpwny57l1xv9ibransw65zk4z4scdi4ygg9xi"; + libraryHaskellDepends = [ + aeson base deriving-aeson lens openapi3 text + ]; + description = "DerivingVia for OpenAPI 3"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "deriving-show-simple" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { @@ -78725,16 +78854,17 @@ self: { }) {}; "deriving-trans" = callPackage - ({ mkDerivation, base, monad-control, monad-control-identity, mtl - , transformers, transformers-base + ({ mkDerivation, base, exceptions, monad-control + , monad-control-identity, mtl, transformers, transformers-base + , unliftio-core }: mkDerivation { pname = "deriving-trans"; - version = "0.5.0.1"; - sha256 = "1d9mrld6c6hcjzw2rhss83zhlsjy9fddfhg55fdrwsajr87zsppl"; + version = "0.5.1.0"; + sha256 = "1k6j66v2wcqhcbf7rrj4qsm7fdf68g0i6yslcjdrricdh8b7r9w2"; libraryHaskellDepends = [ - base monad-control monad-control-identity mtl transformers - transformers-base + base exceptions monad-control monad-control-identity mtl + transformers transformers-base unliftio-core ]; description = "Derive instances for monad transformer stacks"; license = lib.licenses.bsd3; @@ -78878,6 +79008,8 @@ self: { ]; description = "Self-describing consumers/parsers; forms, cmd-line args, JSON, etc"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "desert" = callPackage @@ -79101,6 +79233,8 @@ self: { ]; description = "Render and parse df1 logs as HTML"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dfinity-radix-tree" = callPackage @@ -79314,64 +79448,6 @@ self: { }) {}; "dhall" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write - , base, base16-bytestring, bytestring, case-insensitive, cborg - , cborg-json, containers, contravariant, cryptohash-sha256 - , data-fix, deepseq, Diff, directory, doctest, dotgen, either - , exceptions, filepath, foldl, gauge, generic-random, half - , hashable, haskeline, http-client, http-client-tls, http-types - , lens-family-core, megaparsec, mmorph, mockery, mtl, network-uri - , optparse-applicative, parser-combinators, parsers, pretty-simple - , prettyprinter, prettyprinter-ansi-terminal, profunctors - , QuickCheck, quickcheck-instances, repline, scientific, serialise - , special-values, spoon, system-filepath, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , tasty-silver, template-haskell, temporary, text, text-manipulate - , th-lift-instances, time, transformers, turtle - , unordered-containers, uri-encode, vector - }: - mkDerivation { - pname = "dhall"; - version = "1.40.2"; - sha256 = "14wh497fipvz01zc9s31gv144spg1iqfwp6x5mlk1hjk0v9qs5by"; - revision = "2"; - editedCabalFile = "0mxq3knz1wpvs6jcdw6p0mnwpyy7aqriy2qdyxqzmhcbw2yn3hc1"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal atomic-write base - base16-bytestring bytestring case-insensitive cborg cborg-json - containers contravariant cryptohash-sha256 data-fix deepseq Diff - directory dotgen either exceptions filepath half hashable haskeline - http-client http-client-tls http-types lens-family-core megaparsec - mmorph mtl network-uri optparse-applicative parser-combinators - parsers pretty-simple prettyprinter prettyprinter-ansi-terminal - profunctors repline scientific serialise template-haskell text - text-manipulate th-lift-instances time transformers - unordered-containers uri-encode vector - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring cborg containers data-fix deepseq directory doctest - either filepath foldl generic-random http-client http-client-tls - lens-family-core megaparsec mockery prettyprinter QuickCheck - quickcheck-instances scientific serialise special-values spoon - system-filepath tasty tasty-expected-failure tasty-hunit - tasty-quickcheck tasty-silver template-haskell temporary text time - transformers turtle unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base bytestring containers directory gauge text - ]; - doCheck = false; - description = "A configuration language guaranteed to terminate"; - license = lib.licenses.bsd3; - mainProgram = "dhall"; - maintainers = [ lib.maintainers.Gabriel439 ]; - }) {}; - - "dhall_1_41_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, base16-bytestring, bytestring, case-insensitive, cborg , cborg-json, containers, contravariant, cryptohash-sha256 @@ -79393,8 +79469,8 @@ self: { pname = "dhall"; version = "1.41.2"; sha256 = "14m5rrvkid76qnvg0l14xw1mnqclhip3gjrz20g1lp4fd5p056ka"; - revision = "3"; - editedCabalFile = "1j8hhg6jxzvg1lh5lad9wp54fi0znq5syfxa7rpr6sw0v6257fi1"; + revision = "4"; + editedCabalFile = "0innb3cn98ynb8bd83jdyrm64ij7wcvajg5qcwzdwbyzpr62anfx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -79453,37 +79529,11 @@ self: { doCheck = false; description = "A configuration language guaranteed to terminate"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "dhall"; maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; "dhall-bash" = callPackage - ({ mkDerivation, base, bytestring, containers, dhall - , neat-interpolation, optparse-generic, shell-escape, text - }: - mkDerivation { - pname = "dhall-bash"; - version = "1.0.39"; - sha256 = "0by0w5dqsi0yrs9qnkpls7n5m0qwslxkcycb4s97vk8xl6nj5kk8"; - revision = "1"; - editedCabalFile = "1c01623qx7wxas9g8b4hliybvff0g994jbwrcx14hhb77xr6j14v"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers dhall neat-interpolation shell-escape - text - ]; - executableHaskellDepends = [ - base bytestring dhall optparse-generic text - ]; - description = "Compile Dhall to Bash"; - license = lib.licenses.bsd3; - mainProgram = "dhall-to-bash"; - maintainers = [ lib.maintainers.Gabriel439 ]; - }) {}; - - "dhall-bash_1_0_40" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text }: @@ -79504,7 +79554,6 @@ self: { ]; description = "Compile Dhall to Bash"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "dhall-to-bash"; maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; @@ -79633,38 +79682,6 @@ self: { }) {}; "dhall-json" = callPackage - ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal - , base, bytestring, containers, dhall, exceptions, filepath - , lens-family-core, optparse-applicative, prettyprinter - , prettyprinter-ansi-terminal, scientific, tasty, tasty-hunit - , tasty-silver, text, unordered-containers, vector - }: - mkDerivation { - pname = "dhall-json"; - version = "1.7.9"; - sha256 = "11rl46vn6lzcm9kznpfc43c3a2cbq2si2zba3k2x4j360kvg9fgn"; - revision = "2"; - editedCabalFile = "0f1jb37f5k214dzxbbhw2hij7j7srydkdp0hpkapgs5k73vjvqm4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty aeson-yaml base bytestring containers dhall - exceptions filepath lens-family-core optparse-applicative - prettyprinter scientific text unordered-containers vector - ]; - executableHaskellDepends = [ - aeson aeson-pretty ansi-terminal base bytestring dhall exceptions - optparse-applicative prettyprinter prettyprinter-ansi-terminal text - ]; - testHaskellDepends = [ - aeson base bytestring dhall tasty tasty-hunit tasty-silver text - ]; - description = "Convert between Dhall and JSON or YAML"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.Gabriel439 ]; - }) {}; - - "dhall-json_1_7_11" = callPackage ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal , base, bytestring, containers, dhall, exceptions, filepath , lens-family-core, optparse-applicative, prettyprinter @@ -79693,7 +79710,6 @@ self: { ]; description = "Convert between Dhall and JSON or YAML"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; @@ -79750,31 +79766,6 @@ self: { }) {}; "dhall-nix" = callPackage - ({ mkDerivation, base, containers, data-fix, dhall, hnix - , lens-family-core, neat-interpolation, optparse-generic, text - }: - mkDerivation { - pname = "dhall-nix"; - version = "1.1.23"; - sha256 = "17ajfkhxg4kjn6w7v3ymr6nsbqplvywkcwmfzybxqvmphh4zmfjb"; - revision = "1"; - editedCabalFile = "1grr0r30nbhi1d52vhmhp0rx2pas0wbg7m5npsqczfgd1d9p43dz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers data-fix dhall hnix lens-family-core - neat-interpolation text - ]; - executableHaskellDepends = [ - base dhall hnix optparse-generic text - ]; - description = "Dhall to Nix compiler"; - license = lib.licenses.bsd3; - mainProgram = "dhall-to-nix"; - maintainers = [ lib.maintainers.Gabriel439 ]; - }) {}; - - "dhall-nix_1_1_25" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix , lens-family-core, neat-interpolation, optparse-generic, text }: @@ -79795,7 +79786,6 @@ self: { ]; description = "Dhall to Nix compiler"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "dhall-to-nix"; maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; @@ -79874,6 +79864,36 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "dhall-secret" = callPackage + ({ mkDerivation, amazonka, amazonka-kms, base, base64, bech32 + , bytestring, cryptonite, dhall, HUnit, lens, memory + , optparse-applicative, pem, text, unordered-containers + }: + mkDerivation { + pname = "dhall-secret"; + version = "0.5.52"; + sha256 = "1dxnn77kjab3vwf6p1pk000aila9m5jgalnba0g54prcj9rgca6q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + amazonka amazonka-kms base base64 bech32 bytestring cryptonite + dhall lens memory pem text unordered-containers + ]; + executableHaskellDepends = [ + amazonka amazonka-kms base base64 bech32 bytestring cryptonite + dhall lens memory optparse-applicative pem text + unordered-containers + ]; + testHaskellDepends = [ + amazonka amazonka-kms base base64 bech32 bytestring cryptonite + dhall HUnit lens memory pem text unordered-containers + ]; + description = "Encrypt Decrypt Dhall expressions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "dhall-secret"; + }) {}; + "dhall-text" = callPackage ({ mkDerivation, base, dhall, optparse-applicative, text }: mkDerivation { @@ -79973,37 +79993,6 @@ self: { }) {}; "dhall-yaml" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall - , dhall-json, exceptions, HsYAML, HsYAML-aeson - , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , tasty, tasty-expected-failure, tasty-hunit, text, vector - }: - mkDerivation { - pname = "dhall-yaml"; - version = "1.2.10"; - sha256 = "1a3g84799lbq7v9bzdq9bcwzyzci07rd1x42325ck4x51hrqs8nn"; - revision = "1"; - editedCabalFile = "1jfzpwbcg17mqk9c2f1lhqjwadxm1k04rd91j4h4gd5wnsvb85i4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring dhall dhall-json HsYAML HsYAML-aeson - optparse-applicative text vector - ]; - executableHaskellDepends = [ - aeson ansi-terminal base bytestring dhall dhall-json exceptions - optparse-applicative prettyprinter prettyprinter-ansi-terminal text - ]; - testHaskellDepends = [ - base bytestring dhall dhall-json tasty tasty-expected-failure - tasty-hunit text - ]; - description = "Convert between Dhall and YAML"; - license = lib.licenses.gpl3Only; - maintainers = [ lib.maintainers.Gabriel439 ]; - }) {}; - - "dhall-yaml_1_2_11" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall , dhall-json, exceptions, HsYAML, HsYAML-aeson , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal @@ -80031,7 +80020,6 @@ self: { ]; description = "Convert between Dhall and YAML"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; @@ -80339,8 +80327,8 @@ self: { pname = "diagrams-cairo"; version = "1.4.2"; sha256 = "094vavgsfn7hxn2h7phvmx82wdhw51vqqv29p8hsvmijf1gxa7c1"; - revision = "2"; - editedCabalFile = "0hn1bbssknzqz3b8r281d4ibzv3fx3n33vaqcixajhcb87wnsi10"; + revision = "3"; + editedCabalFile = "094l4p8kwqbpdrgmkpy93znljl94la7spkmsd2v3lrc8c4i7r022"; libraryHaskellDepends = [ array base bytestring cairo colour containers data-default-class diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl @@ -80379,10 +80367,10 @@ self: { }: mkDerivation { pname = "diagrams-contrib"; - version = "1.4.4"; - sha256 = "043jpr7lqg708lzmv6cqys7312lfdwnf8ijcnpl4jkbvcwl87c1m"; - revision = "7"; - editedCabalFile = "0jwj06c2bqawpr57y2x8hbnjlsl1nv9k7wjxhk56w240qyspmj3p"; + version = "1.4.5"; + sha256 = "0v18a8hyrmpxqi9r30292956afqd4smxnn5v01s66sx382fay2wh"; + revision = "1"; + editedCabalFile = "0i5s9mr88kc68v2wc07jpdy2hzqh2gc1dsawvb2sracnqmv9q658"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -80406,6 +80394,8 @@ self: { pname = "diagrams-core"; version = "1.5.0.1"; sha256 = "1gv1p5hrxi3hks0nb4l38gdgfq9bh9d86b6dxcyzqxrwxbxk1khn"; + revision = "1"; + editedCabalFile = "1gahbyv00xyr4pcmpq4g95jyh7844fp8z0g9l2ybifv4s73vdrym"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -80414,6 +80404,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-gi-cairo" = callPackage + ({ mkDerivation, array, base, bytestring, colour, containers + , diagrams-core, diagrams-lib, filepath, gi-cairo + , gi-cairo-connector, gi-cairo-render, gi-pango, gi-pangocairo + , hashable, JuicyPixels, mtl, optparse-applicative, split + , statestack, text, unix, vector + }: + mkDerivation { + pname = "diagrams-gi-cairo"; + version = "1.4.2"; + sha256 = "0k6fw1vvqa4pra4czd90n7i7h1vf6hn08a4jip1xbqkf57d89bn6"; + libraryHaskellDepends = [ + array base bytestring colour containers diagrams-core diagrams-lib + filepath gi-cairo gi-cairo-connector gi-cairo-render gi-pango + gi-pangocairo hashable JuicyPixels mtl optparse-applicative split + statestack text unix vector + ]; + description = "Cairo backend for diagrams drawing EDSL"; + license = lib.licenses.bsd3; + }) {}; + "diagrams-graphviz" = callPackage ({ mkDerivation, base, containers, diagrams-lib, fgl, graphviz , split @@ -80444,6 +80455,8 @@ self: { ]; description = "Backend for rendering diagrams directly to GTK windows"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "diagrams-haddock" = callPackage @@ -80526,8 +80539,8 @@ self: { }: mkDerivation { pname = "diagrams-input"; - version = "0.1"; - sha256 = "1ap1qark5f746fgvnzr0fam9csxqqbpvlsyr7smxgwxzhqhsjdjy"; + version = "0.1.1"; + sha256 = "0wad5xdvw33dp5fzqq9h52px3m81nsic35k9wd27ss23bfzgbb6b"; libraryHaskellDepends = [ attoparsec base base64-bytestring blaze-builder blaze-markup bytestring colour conduit conduit-extra containers css-text @@ -80552,10 +80565,10 @@ self: { }: mkDerivation { pname = "diagrams-lib"; - version = "1.4.5.1"; - sha256 = "1hkxp549i99s45qk8zmhjvz1xyyv3i0ffl8155bifkic6fd8y2gz"; - revision = "3"; - editedCabalFile = "1s8iyx86hd7p1h08nlmx8dj03fdzbwi417yw1qxc5ivd77ciqj61"; + version = "1.4.5.2"; + sha256 = "1vx51g9znb4a9bf20pjd9zr98wmh39avk2i06217p0iidcw8whz6"; + revision = "1"; + editedCabalFile = "14lxvlxdzkrhdgblgglr5k0rwak0yl4gzawqkfla04mkg6hkh5bb"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -80587,8 +80600,8 @@ self: { pname = "diagrams-lib"; version = "1.4.5.3"; sha256 = "0h762gc9l4gsbx3r035mkfrwqblwshjaxk943bq277rw9d5vi7ic"; - revision = "1"; - editedCabalFile = "04ss5jkrddlh77gq331w9na3v3gyallqs84vvhj9pfmjcgkbsm1j"; + revision = "3"; + editedCabalFile = "10m1nh6swfh4jvky2mx692g0jp1xk1cym9gvzljmmni3pf41mzsf"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -80891,7 +80904,9 @@ self: { executableHaskellDepends = [ base ]; description = "I/O in Haskell Report 1.2"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "examples"; + broken = true; }) {}; "dib" = callPackage @@ -81094,6 +81109,17 @@ self: { broken = true; }) {}; + "diff-loc" = callPackage + ({ mkDerivation, base, fingertree, show-combinators }: + mkDerivation { + pname = "diff-loc"; + version = "0.1.0.0"; + sha256 = "08sbxkf804bq3lwr9s1k1vigq7yrdjgicrj114zi14cdi4168k3x"; + libraryHaskellDepends = [ base fingertree show-combinators ]; + description = "Map file locations across diffs"; + license = lib.licenses.mit; + }) {}; + "diff-parse" = callPackage ({ mkDerivation, attoparsec, base, hspec, text }: mkDerivation { @@ -81218,6 +81244,7 @@ self: { license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "differential"; + broken = true; }) {}; "diffmap" = callPackage @@ -81277,11 +81304,13 @@ self: { ({ mkDerivation, base, bytestring, zlib }: mkDerivation { pname = "digest"; - version = "0.0.1.3"; - sha256 = "1l5383l5pvp018rj3vabrppnzcqrr2g0dvgvmsrbjdn02wzab5jm"; + version = "0.0.1.4"; + sha256 = "05pc5l4bwddszc6vy1hazwi1dnrxg323521gdkis9cvh7zs2a4gr"; + revision = "1"; + editedCabalFile = "1x9wr09q0rx0v4lc1f3a3mq2md412bq6zhhyvs5njffb7bi8mpdi"; libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ zlib ]; - description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now"; + libraryPkgconfigDepends = [ zlib ]; + description = "Various hashes for bytestrings; CRC32 and Adler32 for now"; license = lib.licenses.bsd3; }) {inherit (pkgs) zlib;}; @@ -81497,6 +81526,8 @@ self: { ]; description = "Snap backend for the digestive-functors library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "digit" = callPackage @@ -81569,6 +81600,8 @@ self: { testHaskellDepends = [ base fgl hashable massiv QuickCheck ]; description = "Directed Graphs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dihaa" = callPackage @@ -81604,27 +81637,6 @@ self: { }) {}; "dimensional" = callPackage - ({ mkDerivation, base, criterion, deepseq, doctest, exact-pi, Glob - , hspec, hspec-discover, ieee754, numtype-dk, QuickCheck - , semigroups, template-haskell, vector - }: - mkDerivation { - pname = "dimensional"; - version = "1.4"; - sha256 = "19w6plp97ylwqgwzhfy54cvjvh0dd1gj843y59cmryckh80jap8s"; - libraryHaskellDepends = [ - base deepseq exact-pi ieee754 numtype-dk semigroups vector - ]; - testHaskellDepends = [ - base doctest Glob hspec QuickCheck template-haskell - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; - description = "Statically checked physical dimensions"; - license = lib.licenses.bsd3; - }) {}; - - "dimensional_1_5" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, exact-pi, Glob , hspec, hspec-discover, ieee754, numtype-dk, QuickCheck , template-haskell, vector @@ -81643,7 +81655,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Statically checked physical dimensions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "dimensional-codata" = callPackage @@ -81667,7 +81678,6 @@ self: { description = "Statically checked physical dimensions, implemented using type families"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dimensions" = callPackage @@ -81683,6 +81693,7 @@ self: { ]; description = "Safe type-level dimensionality for multidimensional data"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "dingo-core" = callPackage @@ -81793,6 +81804,7 @@ self: { ]; description = "Gemini client"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "diohsc"; }) {}; @@ -82180,8 +82192,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A small library for working with directories"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "disassembler" = callPackage @@ -82308,8 +82318,6 @@ self: { executableHaskellDepends = [ base bytestring text unliftio ]; description = "Write bots for Discord in Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "discord-haskell-voice" = callPackage @@ -82388,6 +82396,7 @@ self: { license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; mainProgram = "discord-register-exe"; + broken = true; }) {}; "discord-rest" = callPackage @@ -82512,36 +82521,6 @@ self: { }) {}; "discrimination" = callPackage - ({ mkDerivation, array, base, containers, contravariant, criterion - , deepseq, ghc-bignum, ghc-prim, hashable, primitive, promises - , QuickCheck, quickcheck-instances, splitmix, tasty - , tasty-quickcheck, transformers, unordered-containers, vector - , vector-algorithms - }: - mkDerivation { - pname = "discrimination"; - version = "0.4.1"; - sha256 = "0p0hryrp15bc8cjfr2hypkg35fy1m30hr19s9p6rj91cxxgjbfq2"; - revision = "1"; - editedCabalFile = "1iz2vfizkid17m1k9j1a1rdzr44ir2fgw0nnhg1drjlyirc09p9f"; - libraryHaskellDepends = [ - array base containers contravariant deepseq ghc-bignum ghc-prim - hashable primitive promises transformers - ]; - testHaskellDepends = [ - base containers criterion deepseq hashable QuickCheck - quickcheck-instances splitmix tasty tasty-quickcheck - unordered-containers vector vector-algorithms - ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq ghc-prim hashable primitive - splitmix unordered-containers vector vector-algorithms - ]; - description = "Fast generic linear-time sorting, joins and container construction"; - license = lib.licenses.bsd3; - }) {}; - - "discrimination_0_5" = callPackage ({ mkDerivation, array, base, containers, contravariant, criterion , deepseq, ghc-bignum, ghc-prim, hashable, primitive, promises , QuickCheck, quickcheck-instances, splitmix, tasty @@ -82569,7 +82548,6 @@ self: { ]; description = "Fast generic linear-time sorting, joins and container construction"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "disjoint-containers" = callPackage @@ -82649,8 +82627,6 @@ self: { benchmarkHaskellDepends = [ base bytestring text ]; description = "On-disk storage, but referentially transparent"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "disk-free-space" = callPackage @@ -82682,6 +82658,8 @@ self: { ]; description = "Disk-based hash table"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "display" = callPackage @@ -83395,7 +83373,7 @@ self: { ]; description = "Types and functions to manipulate the Nixpkgs distribution"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.peti ]; + maintainers = [ lib.maintainers.sternenseemann ]; }) {}; "distribution-opensuse" = callPackage @@ -83668,13 +83646,9 @@ self: { }: mkDerivation { pname = "dlist-nonempty"; - version = "0.1.1"; - sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20"; - revision = "13"; - editedCabalFile = "1hbd0j8yw81y4rnxqxxnvhy33ccgl5c7qcr9shzqy97fwi2vkikm"; - libraryHaskellDepends = [ - base base-compat deepseq dlist semigroupoids - ]; + version = "0.1.2"; + sha256 = "1phdqr9fi2smscmqn7l9kfjxfnqfw6ws1v0a1lrqm5civ15gxhms"; + libraryHaskellDepends = [ base deepseq dlist semigroupoids ]; testHaskellDepends = [ base Cabal QuickCheck quickcheck-instances ]; @@ -83804,52 +83778,27 @@ self: { "dnf-repo" = callPackage ({ mkDerivation, base, directory, extra, filepath, Glob - , http-directory, simple-cmd, simple-cmd-args + , http-directory, simple-cmd, simple-cmd-args, unix }: mkDerivation { pname = "dnf-repo"; - version = "0.5.1"; - sha256 = "158gfmdwf77yd623782pjv4702xjnqfr5dxwl4chrbanvsdfg7si"; + version = "0.5.3"; + sha256 = "0ffg7zajfjfr8r3v33kv0ajv8yx2zl7mm83k1haa94ng85k5b5mm"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ base directory extra filepath Glob http-directory simple-cmd - simple-cmd-args + simple-cmd-args unix ]; testHaskellDepends = [ base simple-cmd ]; description = "DNF wrapper tool to control repos"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "dnf-repo"; - broken = true; }) {}; "dns" = callPackage - ({ mkDerivation, array, async, attoparsec, auto-update, base - , base16-bytestring, base64-bytestring, bytestring, containers - , cryptonite, doctest, hourglass, hspec, iproute, mtl, network - , psqueues, QuickCheck, word8 - }: - mkDerivation { - pname = "dns"; - version = "4.0.1"; - sha256 = "1jv89bdhvwb51d9h9157k2r1cg7x0gzari91lddwvghrkx8v9k90"; - libraryHaskellDepends = [ - array async attoparsec auto-update base base16-bytestring - base64-bytestring bytestring containers cryptonite hourglass - iproute mtl network psqueues - ]; - testHaskellDepends = [ - base bytestring doctest hspec iproute network QuickCheck word8 - ]; - doHaddock = false; - testTarget = "spec"; - description = "DNS library in Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "dns_4_1_0" = callPackage ({ mkDerivation, array, async, attoparsec, auto-update, base , base16-bytestring, base64-bytestring, bytestring, containers , cryptonite, doctest, hourglass, hspec, hspec-discover, iproute @@ -83872,7 +83821,6 @@ self: { testTarget = "spec"; description = "DNS library in Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "dns-patterns" = callPackage @@ -83892,8 +83840,6 @@ self: { ]; description = "DNS name parsing and pattern matching utilities"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dnscache" = callPackage @@ -83914,6 +83860,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "massdns"; + broken = true; }) {}; "dnsrbl" = callPackage @@ -83967,8 +83914,6 @@ self: { testHaskellDepends = [ base indexed ]; description = "Generalize do-notation to work on monads and indexed monads simultaneously"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "do-notation-dsl" = callPackage @@ -84054,7 +83999,6 @@ self: { libraryHaskellDepends = [ base dobutokO-frequency ]; description = "A library to deal with SoX effects and possibilities"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "dobutokO-frequency" = callPackage @@ -84066,8 +84010,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Helps to create experimental music. Working with frequencies and types."; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dobutokO-poetry" = callPackage @@ -84381,25 +84323,6 @@ self: { }) {}; "doclayout" = callPackage - ({ mkDerivation, base, containers, criterion, emojis, mtl, safe - , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text - }: - mkDerivation { - pname = "doclayout"; - version = "0.3.1.1"; - sha256 = "1p9kgjlf7y4p1symvkwndgs4lvyw2c45bsgld09y9r4aiqbhdrxp"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base containers emojis mtl safe text ]; - testHaskellDepends = [ - base emojis mtl tasty tasty-golden tasty-hunit tasty-quickcheck - text - ]; - benchmarkHaskellDepends = [ base criterion mtl text ]; - description = "A prettyprinting library for laying out text documents"; - license = lib.licenses.bsd3; - }) {}; - - "doclayout_0_4" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, emojis, mtl , safe, tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text }: @@ -84420,7 +84343,6 @@ self: { ]; description = "A prettyprinting library for laying out text documents"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "docopt" = callPackage @@ -84441,6 +84363,8 @@ self: { ]; description = "A command-line interface parser that will make you smile"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "docrecords" = callPackage @@ -84481,32 +84405,6 @@ self: { }) {}; "doctemplates" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific - , tasty, tasty-golden, tasty-hunit, temporary, text - , text-conversions, vector - }: - mkDerivation { - pname = "doctemplates"; - version = "0.10.0.1"; - sha256 = "08l8lgmvn83xwbdlh4m2jljj5gcyxiq1vjd1ggysv36d81swsg1x"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base containers doclayout filepath HsYAML mtl parsec safe - scientific text text-conversions vector - ]; - testHaskellDepends = [ - aeson base bytestring containers doclayout filepath Glob tasty - tasty-golden tasty-hunit temporary text - ]; - benchmarkHaskellDepends = [ - aeson base containers criterion doclayout filepath mtl text - ]; - description = "Pandoc-style document templates"; - license = lib.licenses.bsd3; - }) {}; - - "doctemplates_0_10_0_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific , tasty, tasty-golden, tasty-hunit, temporary, text @@ -84532,10 +84430,36 @@ self: { ]; description = "Pandoc-style document templates"; license = lib.licenses.bsd3; + }) {}; + + "doctemplates_0_11" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , doclayout, filepath, Glob, mtl, parsec, safe, scientific, tasty + , tasty-golden, tasty-hunit, temporary, text, text-conversions + , vector + }: + mkDerivation { + pname = "doctemplates"; + version = "0.11"; + sha256 = "0ssld40km4nf0r8fxgj9w0z8yfy8yiyyfcgxarhwx60f0dzhq270"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base containers doclayout filepath mtl parsec safe scientific + text text-conversions vector + ]; + testHaskellDepends = [ + aeson base bytestring containers doclayout filepath Glob tasty + tasty-golden tasty-hunit temporary text + ]; + benchmarkHaskellDepends = [ + aeson base containers criterion doclayout filepath mtl text + ]; + description = "Pandoc-style document templates"; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; - "doctest" = callPackage + "doctest_0_18_2" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core, HUnit , mockery, process, QuickCheck, setenv, silently, stringbuilder @@ -84562,10 +84486,11 @@ self: { ]; description = "Test interactive Haskell examples"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "doctest"; }) {}; - "doctest_0_20_1" = callPackage + "doctest" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core , hspec-discover, HUnit, mockery, process, QuickCheck, setenv @@ -84593,7 +84518,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Test interactive Haskell examples"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "doctest"; }) {}; @@ -84651,8 +84575,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "doctest-driver-gen"; - version = "0.3.0.5"; - sha256 = "08zv5c1cfklknpbw974sw4rb6jiijd3q28cpjw1cncc06n2jy85b"; + version = "0.3.0.6"; + sha256 = "0a4jdg4mzhdgfal7jp60yrlv63iv7d8f7nxc9aqvrl93mairny8l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -84698,7 +84622,9 @@ self: { ]; description = "Alternative doctest implementation that extracts comments to modules"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "doctest-extract-0.1"; + broken = true; }) {}; "doctest-lib" = callPackage @@ -84721,8 +84647,8 @@ self: { }: mkDerivation { pname = "doctest-parallel"; - version = "0.2.5"; - sha256 = "075y4yllpgfq0dlfd6y9nqhsdkxzb9s3jgb0v194l216kg5zsqzc"; + version = "0.2.6"; + sha256 = "13hjwhdjw8jrj07zxkrrfbzr0mrk8gwyis1rbdi4ld4jbq3rr1z7"; libraryHaskellDepends = [ base base-compat Cabal code-page containers deepseq directory exceptions extra filepath ghc ghc-paths Glob pretty process random @@ -84740,6 +84666,33 @@ self: { license = lib.licenses.mit; }) {}; + "doctest-parallel_0_3_0" = callPackage + ({ mkDerivation, base, base-compat, Cabal, code-page, containers + , deepseq, directory, exceptions, filepath, ghc, ghc-paths, Glob + , hspec, hspec-core, HUnit, mockery, process, QuickCheck, random + , setenv, silently, stringbuilder, syb, template-haskell + , transformers, unordered-containers + }: + mkDerivation { + pname = "doctest-parallel"; + version = "0.3.0"; + sha256 = "121ql1pygbs1cars5mva7lxa96aq0fhn27n3vnn5zqrvdypn3ys4"; + libraryHaskellDepends = [ + base base-compat Cabal code-page containers deepseq directory + exceptions filepath ghc ghc-paths Glob process random syb + template-haskell transformers unordered-containers + ]; + testHaskellDepends = [ + base base-compat code-page containers deepseq directory exceptions + filepath ghc ghc-paths hspec hspec-core HUnit mockery process + QuickCheck setenv silently stringbuilder syb transformers + ]; + doHaddock = false; + description = "Test interactive Haskell examples"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "doctest-prop" = callPackage ({ mkDerivation, base, doctest, HUnit, QuickCheck }: mkDerivation { @@ -84997,8 +84950,8 @@ self: { }: mkDerivation { pname = "domain"; - version = "0.1.1.3"; - sha256 = "0szq40sxd3cpq5mbgq9293643a5j45mr1p03lkxwny8xxhz6hs5a"; + version = "0.1.1.4"; + sha256 = "0fdpbcn2cyfpkp8qln87b27fqrsy95n7sb2x3bpwhbr5dzz55ih2"; libraryHaskellDepends = [ attoparsec base bytestring domain-core foldl hashable parser-combinators template-haskell template-haskell-compat-v0208 @@ -85011,7 +84964,6 @@ self: { ]; description = "Codegen helping you define domain models"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "domain-aeson" = callPackage @@ -85031,7 +84983,6 @@ self: { testHaskellDepends = [ domain rerebase ]; description = "Integration of domain with aeson"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "domain-auth" = callPackage @@ -85068,7 +85019,6 @@ self: { testHaskellDepends = [ cereal cereal-text domain rerebase ]; description = "Integration of domain with cereal"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "domain-core" = callPackage @@ -85077,8 +85027,8 @@ self: { }: mkDerivation { pname = "domain-core"; - version = "0.1.0.2"; - sha256 = "1x21f9nsikcbvf977sm4ckfc2cqfvkkk315kdax66sbd8f2ipgm2"; + version = "0.1.0.3"; + sha256 = "0wpi5qks29ij8m1s6x3kc66dw706xn28l6vlwfrccqw77603g85a"; libraryHaskellDepends = [ base template-haskell template-haskell-compat-v0208 text th-lego th-lift-instances @@ -85104,6 +85054,7 @@ self: { description = "Integration of domain with optics"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dominion" = callPackage @@ -85253,43 +85204,14 @@ self: { }) {}; "dotenv" = callPackage - ({ mkDerivation, base, base-compat, containers, directory - , exceptions, hspec, hspec-discover, hspec-megaparsec, megaparsec - , optparse-applicative, process, text - }: - mkDerivation { - pname = "dotenv"; - version = "0.9.0.2"; - sha256 = "0f0kzkkfvk7bmlxzq2z7b1rr374aa4qlh8pklbjaqg0drfhyyk6a"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base base-compat containers directory exceptions megaparsec process - text - ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - ]; - testHaskellDepends = [ - base base-compat containers directory exceptions hspec - hspec-megaparsec megaparsec process text - ]; - testToolDepends = [ hspec-discover ]; - description = "Loads environment variables from dotenv files"; - license = lib.licenses.mit; - mainProgram = "dotenv"; - }) {}; - - "dotenv_0_9_0_3" = callPackage ({ mkDerivation, base, base-compat, containers, directory , exceptions, hspec, hspec-discover, hspec-megaparsec, megaparsec , optparse-applicative, process, shellwords, text }: mkDerivation { pname = "dotenv"; - version = "0.9.0.3"; - sha256 = "163w2japbcdjzmhr7afq2rss7sp7gz2j8mylcc716x63gm3ws20h"; + version = "0.10.0.0"; + sha256 = "04brkjk9a17xv2qv2xbsdxbil6ncrrzxcfji9q0civmxhj4vbcfq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -85307,7 +85229,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Loads environment variables from dotenv files"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "dotenv"; }) {}; @@ -85386,6 +85307,7 @@ self: { description = "dot language parsing and printing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "double-conversion" = callPackage @@ -85394,8 +85316,10 @@ self: { }: mkDerivation { pname = "double-conversion"; - version = "2.0.4.1"; - sha256 = "1hrpqh8lbw0kkryqsya95mfnnnj0pj7zswxrn6kvfy4rf7z8v2d4"; + version = "2.0.4.2"; + sha256 = "0r7c1801gzdm5x1flmpx8ajxygbc9dl7sgdj0xn3bpm71wgvrf4s"; + revision = "2"; + editedCabalFile = "1mpnx4m2pg5crfz9k8wamh5mgsha0np3ynnllrmglmwh54gvfjj3"; libraryHaskellDepends = [ base bytestring ghc-prim text ]; testHaskellDepends = [ base bytestring HUnit test-framework test-framework-hunit @@ -85577,8 +85501,6 @@ self: { ]; description = "Reverse mode automatic differentiation"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "download" = callPackage @@ -85894,16 +85816,17 @@ self: { "dr-cabal" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, colourista, optparse-applicative, relude + , terminal-size }: mkDerivation { pname = "dr-cabal"; - version = "0.1.0.0"; - sha256 = "046fm8pdbz2kib4n2nravy15skqwl031j4f0m58d0x0ksjq5yq4i"; + version = "0.2.0.0"; + sha256 = "066016xcg3nhjs8b746kyi05r7gcsglqv7rkz2py54pvi1p7sj35"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring colourista - optparse-applicative relude + optparse-applicative relude terminal-size ]; executableHaskellDepends = [ base relude ]; description = "See README for more info"; @@ -85964,7 +85887,6 @@ self: { executableHaskellDepends = [ base ]; description = "Actor library for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "draw-poker" = callPackage @@ -86091,8 +86013,6 @@ self: { libraryHaskellDepends = [ base exceptions mtl transformers ]; description = "Boozy streaming library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "driving-classes-plugin" = callPackage @@ -86228,6 +86148,8 @@ self: { libraryHaskellDepends = [ array base bytestring pureMD5 ]; description = "An implementation of the Drunken Bishop visual fingerprinting algorithm"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ds-kanren" = callPackage @@ -86509,6 +86431,7 @@ self: { description = "(Fast) Dynamic Time Warping"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dual" = callPackage @@ -86685,6 +86608,7 @@ self: { description = "A computer “algebra” system that knows nothing about algebra, at the core"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dump" = callPackage @@ -86732,8 +86656,8 @@ self: { }: mkDerivation { pname = "dunai"; - version = "0.8.3"; - sha256 = "1xkc7a337g6xg2wgj1sphpmvj22y2fkifs36s7iws7cr7fqx1a1p"; + version = "0.9.2"; + sha256 = "08skmwkfwiyy83s764fcpa9i8zny10bdbpv9wha6fjqr1b80i80f"; libraryHaskellDepends = [ base MonadRandom simple-affine-space transformers transformers-base ]; @@ -86743,24 +86667,6 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; - "dunai_0_9_1" = callPackage - ({ mkDerivation, base, MonadRandom, simple-affine-space, tasty - , tasty-hunit, transformers, transformers-base - }: - mkDerivation { - pname = "dunai"; - version = "0.9.1"; - sha256 = "0krgbs9xqar78815xrgqbj63678jm0mjbsvnqdayh0c2awf9i8bj"; - libraryHaskellDepends = [ - base MonadRandom simple-affine-space transformers transformers-base - ]; - testHaskellDepends = [ base tasty tasty-hunit transformers ]; - description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.turion ]; - }) {}; - "dunai-core" = callPackage ({ mkDerivation, base, MonadRandom, transformers, transformers-base }: @@ -86781,8 +86687,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.9.1"; - sha256 = "0p78yvn98vp3qjd6dx23nwwzq6v6sks2gp9cycmcnjk3yn8470j9"; + version = "0.9.2"; + sha256 = "0ghc1sg1s31qg1z1sg1mzm9qad39ggrkr064mwbwsl2b5xlsnlr4"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -86858,6 +86764,8 @@ self: { ]; description = "A tiny compile-time time utility library inspired by zeit/ms"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dustme" = callPackage @@ -87141,6 +87049,8 @@ self: { testHaskellDepends = [ base ]; description = "FRP for brick Terminal user interface library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dyna-gloss" = callPackage @@ -87827,6 +87737,7 @@ self: { ]; description = "Pure, type-indexed haskell vector, matrix, and tensor library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "easytensor-vulkan" = callPackage @@ -87838,6 +87749,7 @@ self: { libraryHaskellDepends = [ base dimensions easytensor vulkan-api ]; description = "Use easytensor with vulkan-api"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "easytest" = callPackage @@ -87951,6 +87863,8 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion random ]; description = "Elliptic Curve Cryptography for Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "eccrypto-ed25519-bindings" = callPackage @@ -87963,7 +87877,6 @@ self: { description = "provides \"ed25519\" API using \"eccrypto\""; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ecdsa" = callPackage @@ -88530,7 +88443,6 @@ self: { description = "Embeds effect systems and program logics into Haskell using graded monads and parameterised monads"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "effect-stack" = callPackage @@ -88570,6 +88482,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful_2_2_2_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , effectful-core, exceptions, lifted-base, primitive, process, stm + , tasty, tasty-bench, tasty-hunit, text, time, unix, unliftio + }: + mkDerivation { + pname = "effectful"; + version = "2.2.2.0"; + sha256 = "1j6p28d5701v0a5fhgra1mhnzsqbxj44mpnixrh8jy34rcbq02bi"; + libraryHaskellDepends = [ + async base bytestring directory effectful-core process stm time + unliftio + ]; + testHaskellDepends = [ + base containers effectful-core exceptions lifted-base primitive + tasty tasty-hunit unliftio + ]; + benchmarkHaskellDepends = [ + async base tasty-bench text unix unliftio + ]; + description = "An easy to use, performant extensible effects library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-core" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control , primitive, transformers-base, unliftio-core @@ -88587,6 +88524,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-core_2_2_2_1" = callPackage + ({ mkDerivation, base, containers, exceptions, monad-control + , primitive, transformers-base, unliftio-core + }: + mkDerivation { + pname = "effectful-core"; + version = "2.2.2.1"; + sha256 = "1k3l79rh7whfm7yrdxmxyjggmwm912g8r6brwxjkla5d4phg4azp"; + libraryHaskellDepends = [ + base containers exceptions monad-control primitive + transformers-base unliftio-core + ]; + description = "An easy to use, performant extensible effects library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-plugin" = callPackage ({ mkDerivation, base, containers, effectful-core, ghc , ghc-tcplugins-extra @@ -88760,6 +88714,7 @@ self: { description = "Simulation interpreter for FLINT policy descriptions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "egison" = callPackage @@ -88943,8 +88898,6 @@ self: { ]; description = "Minimalistic SMTP client for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ehs" = callPackage @@ -89023,7 +88976,9 @@ self: { executableToolDepends = [ markdown-unlit ]; description = "IO with Exceptions tracked on the type-level"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "readme"; + broken = true; }) {}; "either" = callPackage @@ -89409,6 +89364,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "elasticsearch-interchange" = callPackage + ({ mkDerivation, base, bytebuild, byteslice, bytestring, json-query + , json-syntax, pretty-show, primitive, tasty, tasty-golden + , text-short, unpacked-maybe-text + }: + mkDerivation { + pname = "elasticsearch-interchange"; + version = "0.1.0.0"; + sha256 = "0js90hcq3m1b928fywcvm8yyc1d35ya630zxdxpbylmqv4h0yz6y"; + libraryHaskellDepends = [ + base bytebuild json-query json-syntax primitive text-short + unpacked-maybe-text + ]; + testHaskellDepends = [ + base bytebuild byteslice bytestring json-query json-syntax + pretty-show primitive tasty tasty-golden text-short + unpacked-maybe-text + ]; + description = "Serialization of Elasticsearch requests and responses"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "elbow" = callPackage ({ mkDerivation, base, hmatrix, safe }: mkDerivation { @@ -89535,8 +89513,8 @@ self: { }: mkDerivation { pname = "eliminators"; - version = "0.8"; - sha256 = "00prqf3qnhsswigcx87nq9dfaq9vjvzgcgbpnxrpgw9k36p9mdh2"; + version = "0.9"; + sha256 = "118bd51hfbh29yhs9ai3srk431avwsmccm1500mp21fbwxq8phsj"; libraryHaskellDepends = [ base extra singleton-nats singletons-base template-haskell th-abstraction th-desugar @@ -89545,6 +89523,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Dependently typed elimination functions using singletons"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "eliminators_0_9_1" = callPackage @@ -89565,6 +89545,7 @@ self: { description = "Dependently typed elimination functions using singletons"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "elision" = callPackage @@ -90041,8 +90022,8 @@ self: { }: mkDerivation { pname = "elminator"; - version = "0.2.4.1"; - sha256 = "0b8xn26k2pmb7m5v6yn1l2kv4fv94qjl7k8563zq2aqkrfwdm068"; + version = "0.2.4.2"; + sha256 = "1icmj116hlmgjbss1fnbzav327dl5ga8l092791rc5bf6m0m644z"; libraryHaskellDepends = [ aeson base containers mtl template-haskell text ]; @@ -90051,8 +90032,6 @@ self: { ]; description = "Generate ELM types/encoders/decoders from Haskell types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "elo" = callPackage @@ -90116,25 +90095,6 @@ self: { }) {}; "elynx" = callPackage - ({ mkDerivation, aeson, base, bytestring, elynx-tools - , optparse-applicative, slynx, tlynx - }: - mkDerivation { - pname = "elynx"; - version = "0.6.1.1"; - sha256 = "16kqf4v9ikrd6w19zg3lrpy69xsdhr0p1hni72wi2i8glrzmq4qw"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring elynx-tools optparse-applicative slynx tlynx - ]; - description = "Validate and (optionally) redo ELynx analyses"; - license = lib.licenses.gpl3Plus; - mainProgram = "elynx"; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - - "elynx_0_7_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, elynx-tools , optparse-applicative, slynx, tlynx }: @@ -90149,34 +90109,11 @@ self: { ]; description = "Validate and (optionally) redo ELynx analyses"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; mainProgram = "elynx"; maintainers = [ lib.maintainers.dschrempf ]; }) {}; "elynx-markov" = callPackage - ({ mkDerivation, async, attoparsec, base, bytestring, containers - , elynx-seq, elynx-tools, hmatrix, hspec, integration - , math-functions, mwc-random, primitive, statistics, vector - }: - mkDerivation { - pname = "elynx-markov"; - version = "0.6.1.1"; - sha256 = "1xwvnfyil8kp2qxcv8h4k623qn8kajp8mj4a6jbjjp8qk70rlbrf"; - libraryHaskellDepends = [ - async attoparsec base bytestring containers elynx-seq hmatrix - integration math-functions mwc-random primitive statistics vector - ]; - testHaskellDepends = [ - base containers elynx-tools hmatrix hspec mwc-random vector - ]; - benchmarkHaskellDepends = [ base ]; - description = "Simulate molecular sequences along trees"; - license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - - "elynx-markov_0_7_0_1" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, containers , elynx-seq, elynx-tools, hmatrix, hspec, integration , math-functions, mwc-random, random, statistics, vector @@ -90195,24 +90132,10 @@ self: { benchmarkHaskellDepends = [ base ]; description = "Simulate molecular sequences along trees"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.dschrempf ]; }) {}; "elynx-nexus" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hspec }: - mkDerivation { - pname = "elynx-nexus"; - version = "0.6.1.1"; - sha256 = "0qx28djaj3k56wp0qqcdy7zn90alr24q05l9a93qp0wqahlwmgy3"; - libraryHaskellDepends = [ attoparsec base bytestring ]; - testHaskellDepends = [ base hspec ]; - description = "Import and export Nexus files"; - license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - - "elynx-nexus_0_7_0_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { pname = "elynx-nexus"; @@ -90222,32 +90145,10 @@ self: { testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.dschrempf ]; }) {}; "elynx-seq" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, containers - , elynx-tools, hspec, matrices, mwc-random, parallel, primitive - , vector, vector-th-unbox, word8 - }: - mkDerivation { - pname = "elynx-seq"; - version = "0.6.1.1"; - sha256 = "1mcdg4nv9hdmw0lcr2vhy748d3ykcrlplc8hz14ywkxaxlrqb1sm"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring containers matrices mwc-random - parallel primitive vector vector-th-unbox word8 - ]; - testHaskellDepends = [ - base bytestring elynx-tools hspec matrices vector - ]; - description = "Handle molecular sequences"; - license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - - "elynx-seq_0_7_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , elynx-tools, hspec, matrices, parallel, primitive, random, vector , vector-th-unbox, word8 @@ -90265,31 +90166,10 @@ self: { ]; description = "Handle molecular sequences"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.dschrempf ]; }) {}; "elynx-tools" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, cryptohash-sha256, directory, hmatrix, mwc-random - , optparse-applicative, template-haskell, time, transformers - , vector, zlib - }: - mkDerivation { - pname = "elynx-tools"; - version = "0.6.1.1"; - sha256 = "089dgc8c2y4wxhi0xgvql5yfgfbpwnj8sg88hl7nvgnw5sh4jvs2"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring - cryptohash-sha256 directory hmatrix mwc-random optparse-applicative - template-haskell time transformers vector zlib - ]; - description = "Tools for ELynx"; - license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - - "elynx-tools_0_7_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, cryptohash-sha256, directory, hmatrix , optparse-applicative, random, template-haskell, time @@ -90306,39 +90186,10 @@ self: { ]; description = "Tools for ELynx"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.dschrempf ]; }) {}; "elynx-tree" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad - , containers, criterion, data-default, data-default-class, deepseq - , double-conversion, elynx-nexus, elynx-tools, hspec - , math-functions, microlens, mwc-random, parallel, primitive - , QuickCheck, quickcheck-classes, statistics - }: - mkDerivation { - pname = "elynx-tree"; - version = "0.6.1.1"; - sha256 = "0jhr5czybmp98cxzipa01wjkxz9jbryqlj02lcmbxlal7sqifsy4"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring comonad containers - data-default-class deepseq double-conversion elynx-nexus - math-functions mwc-random parallel primitive statistics - ]; - testHaskellDepends = [ - attoparsec base bytestring containers data-default elynx-tools - hspec QuickCheck quickcheck-classes - ]; - benchmarkHaskellDepends = [ - base criterion elynx-tools microlens mwc-random parallel - ]; - description = "Handle phylogenetic trees"; - license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - - "elynx-tree_0_7_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad , containers, criterion, data-default, data-default-class, deepseq , double-conversion, elynx-nexus, elynx-tools, hspec @@ -90363,44 +90214,74 @@ self: { ]; description = "Handle phylogenetic trees"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.dschrempf ]; }) {}; "ema" = callPackage - ({ mkDerivation, aeson, async, base, blaze-html, blaze-markup - , constraints-extras, containers, data-default, dependent-sum - , dependent-sum-template, directory, file-embed, filepath - , filepattern, fsnotify, generic-optics, generics-sop, http-types - , lvar, monad-logger, monad-logger-extras, mtl, neat-interpolation - , optics-core, optparse-applicative, pandoc, pandoc-types - , raw-strings-qq, relude, sop-core, template-haskell, text, time - , unionmount, unliftio, url-slug, wai, wai-middleware-static - , wai-websockets, warp, websockets + ({ mkDerivation, aeson, async, base, constraints-extras + , data-default, dependent-sum, dependent-sum-template, directory + , file-embed, filepath, filepattern, http-types, lvar, monad-logger + , monad-logger-extras, mtl, neat-interpolation, optics-core + , optparse-applicative, relude, sop-core, text, unliftio, url-slug + , wai, wai-middleware-static, wai-websockets, warp, websockets }: mkDerivation { pname = "ema"; - version = "0.8.2.0"; - sha256 = "158n1qizqncl4q4szk9jwjdnj1y0jsbpzyi4hjslk4zkvkkscwqa"; + version = "0.10.0.0"; + sha256 = "0ayr42l8jwnapr6hkawjv7x9xx2b6dm4bhj2f4qy70jg2w1j6cv9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson async base blaze-html blaze-markup constraints-extras - containers data-default dependent-sum dependent-sum-template - directory file-embed filepath filepattern fsnotify generic-optics - generics-sop http-types lvar monad-logger monad-logger-extras mtl - neat-interpolation optics-core optparse-applicative pandoc - pandoc-types relude sop-core template-haskell text time unionmount - unliftio url-slug wai wai-middleware-static wai-websockets warp - websockets - ]; - testHaskellDepends = [ - base generics-sop raw-strings-qq template-haskell text url-slug + aeson async base constraints-extras data-default dependent-sum + dependent-sum-template directory file-embed filepath filepattern + http-types lvar monad-logger monad-logger-extras mtl + neat-interpolation optics-core optparse-applicative relude sop-core + text unliftio url-slug wai wai-middleware-static wai-websockets + warp websockets ]; description = "Static site generator library with hot reload"; license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.maralorn ]; }) {}; + "ema-extra" = callPackage + ({ mkDerivation, base, containers, data-default, dependent-sum, ema + , ema-generics, filepath, generics-sop, monad-logger, optics-core + , pandoc, relude, sop-core, text, time, unionmount, unliftio + , url-slug + }: + mkDerivation { + pname = "ema-extra"; + version = "0.10.0.0"; + sha256 = "0knp37kxhkk6chbbxdrlj39s3wq081j2jjaln73cwvvkrsr09bpv"; + libraryHaskellDepends = [ + base containers data-default dependent-sum ema ema-generics + filepath generics-sop monad-logger optics-core pandoc relude + sop-core text time unionmount unliftio url-slug + ]; + description = "Useful route types for Ema"; + license = lib.licenses.agpl3Only; + }) {}; + + "ema-generics" = callPackage + ({ mkDerivation, base, ema, generic-optics, generics-sop + , optics-core, raw-strings-qq, relude, sop-core, template-haskell + , text, url-slug + }: + mkDerivation { + pname = "ema-generics"; + version = "0.10.0.0"; + sha256 = "03a2ayxiaa12x0y9388rh10ixprbivjrv7w7rgy1mxk0649f024a"; + libraryHaskellDepends = [ + base ema generic-optics generics-sop optics-core relude sop-core + template-haskell + ]; + testHaskellDepends = [ + base ema generics-sop raw-strings-qq template-haskell text url-slug + ]; + description = "Generic deriving for Ema routes"; + license = lib.licenses.agpl3Only; + }) {}; + "emacs-keys" = callPackage ({ mkDerivation, base, doctest, split, tasty, tasty-hspec , tasty-quickcheck, template-haskell, th-lift, xkbcommon @@ -90502,8 +90383,8 @@ self: { }: mkDerivation { pname = "email-validate"; - version = "2.3.2.16"; - sha256 = "1cr3y23d1a8kkbfjwmqr6lvd330k3lh8p1c8pqjswy5sq5az3rdq"; + version = "2.3.2.18"; + sha256 = "11bi5y5qmri62nl34nl5pv4zs59bjpjknw560yw5ds62gsi2sjcp"; libraryHaskellDepends = [ attoparsec base bytestring template-haskell ]; @@ -90595,30 +90476,31 @@ self: { "emanote" = callPackage ({ mkDerivation, aeson, aeson-extra, aeson-optics, async, base , blaze-html, bytestring, commonmark, commonmark-extensions - , commonmark-pandoc, commonmark-simple, containers, data-default - , dependent-sum, directory, ema, filepath, filepattern, fsnotify - , hedgehog, heist-emanote, heist-extra, hspec, hspec-hedgehog - , ixset-typed, lvar, map-syntax, megaparsec, monad-logger - , monad-logger-extras, mtl, neat-interpolation, optics-core - , optics-th, optparse-applicative, pandoc, pandoc-link-context - , pandoc-types, parsec, path-tree, process-extras, profunctors - , relude, shower, some, stm, tagged, tagtree, tailwind, text, time - , tomland, unionmount, unliftio, unordered-containers, uri-encode - , url-slug, uuid, which, with-utf8, xmlhtml, yaml + , commonmark-pandoc, commonmark-simple, commonmark-wikilink + , containers, data-default, dependent-sum, directory, ema, filepath + , filepattern, fsnotify, hedgehog, heist, heist-extra, hspec + , hspec-hedgehog, ixset-typed, lvar, map-syntax, megaparsec + , monad-logger, monad-logger-extras, mtl, neat-interpolation + , optics-core, optics-th, optparse-applicative, pandoc + , pandoc-link-context, pandoc-types, parsec, path-tree + , process-extras, profunctors, relude, shower, some, stm, tagged + , tagtree, tailwind, text, time, tomland, unionmount, unliftio + , unordered-containers, uri-encode, url-slug, uuid, which + , with-utf8, xmlhtml, yaml }: mkDerivation { pname = "emanote"; - version = "0.8.0.0"; - sha256 = "0w26417vx76lzi6b84c48s462bmsy28ayn8gxi9cpgqifrmydz78"; + version = "1.0.0.0"; + sha256 = "0yysrrcdgp06d0s50am86xzjp4d67d1in5ibwdpvbv9knxnk8w5v"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-extra aeson-optics async base blaze-html bytestring commonmark commonmark-extensions commonmark-pandoc - commonmark-simple containers data-default dependent-sum directory - ema filepath filepattern fsnotify hedgehog heist-emanote - heist-extra hspec hspec-hedgehog ixset-typed lvar map-syntax + commonmark-simple commonmark-wikilink containers data-default + dependent-sum directory ema filepath filepattern fsnotify hedgehog + heist heist-extra hspec hspec-hedgehog ixset-typed lvar map-syntax megaparsec monad-logger monad-logger-extras mtl neat-interpolation optics-core optics-th optparse-applicative pandoc pandoc-link-context pandoc-types parsec path-tree process-extras @@ -90629,9 +90511,22 @@ self: { executableHaskellDepends = [ aeson aeson-extra aeson-optics async base blaze-html bytestring commonmark commonmark-extensions commonmark-pandoc - commonmark-simple containers data-default dependent-sum directory - ema filepath filepattern fsnotify hedgehog heist-emanote - heist-extra hspec hspec-hedgehog ixset-typed lvar map-syntax + commonmark-simple commonmark-wikilink containers data-default + dependent-sum directory ema filepath filepattern fsnotify hedgehog + heist heist-extra hspec hspec-hedgehog ixset-typed lvar map-syntax + megaparsec monad-logger monad-logger-extras mtl neat-interpolation + optics-core optics-th optparse-applicative pandoc + pandoc-link-context pandoc-types parsec path-tree process-extras + profunctors relude shower some stm tagged tagtree tailwind text + time tomland unionmount unliftio unordered-containers uri-encode + url-slug uuid which with-utf8 xmlhtml yaml + ]; + testHaskellDepends = [ + aeson aeson-extra aeson-optics async base blaze-html bytestring + commonmark commonmark-extensions commonmark-pandoc + commonmark-simple commonmark-wikilink containers data-default + dependent-sum directory ema filepath filepattern fsnotify hedgehog + heist heist-extra hspec hspec-hedgehog ixset-typed lvar map-syntax megaparsec monad-logger monad-logger-extras mtl neat-interpolation optics-core optics-th optparse-applicative pandoc pandoc-link-context pandoc-types parsec path-tree process-extras @@ -90753,6 +90648,7 @@ self: { ]; description = "Empirical Mode Decomposition and Hilbert-Huang Transform"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "emgm" = callPackage @@ -90876,6 +90772,8 @@ self: { ]; description = "Safe string conversion and encoding"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "encoding" = callPackage @@ -90885,8 +90783,8 @@ self: { }: mkDerivation { pname = "encoding"; - version = "0.8.7"; - sha256 = "1srnambj9zfr7z33a0dsf6ryl5lxmvpzkqgq60rrqh6n47dz3cwa"; + version = "0.8.8"; + sha256 = "13b73zv9g2m2qriwjccf44bx5jywnqv72fjkhg89zv22ncgsf1fh"; setupHaskellDepends = [ base Cabal containers filepath ghc-prim HaXml ]; @@ -90956,6 +90854,8 @@ self: { ]; description = "Endomorphism utilities"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "eng-stemmer" = callPackage @@ -91544,18 +91444,6 @@ self: { }) {}; "envparse" = callPackage - ({ mkDerivation, base, containers, hspec, text }: - mkDerivation { - pname = "envparse"; - version = "0.4.1"; - sha256 = "00133c2wcxw8hj93srg39l539zvsahiz6jl4pi6wf6lc1zqdm0d1"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base containers hspec text ]; - description = "Parse environment variables"; - license = lib.licenses.bsd3; - }) {}; - - "envparse_0_5_0" = callPackage ({ mkDerivation, base, containers, hspec, text }: mkDerivation { pname = "envparse"; @@ -91565,7 +91453,6 @@ self: { testHaskellDepends = [ base containers hspec text ]; description = "Parse environment variables"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "envstatus" = callPackage @@ -91743,8 +91630,6 @@ self: { libraryHaskellDepends = [ base exceptions mtl ]; description = "Basic Erlang-like process support for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "epub" = callPackage @@ -91856,7 +91741,9 @@ self: { ]; description = "Shell command for finding equal files"; license = "GPL"; + hydraPlatforms = lib.platforms.none; mainProgram = "equal-files"; + broken = true; }) {}; "equational-reasoning" = callPackage @@ -91867,8 +91754,8 @@ self: { pname = "equational-reasoning"; version = "0.7.0.1"; sha256 = "1xp5vmz19idc29xidr7q65hsnhfnl3ca80hxxfllsqpyyh32qlhn"; - revision = "1"; - editedCabalFile = "0bi5xmaq5cbs1jqz6naw4706wv5yjgx1g4vibp872iqzcjc86yka"; + revision = "2"; + editedCabalFile = "0gi4whsdzlkpmqjpvlzv29jhxmia8xx1ni17ay9nw41lw4q5zg8v"; libraryHaskellDepends = [ base containers template-haskell th-desugar void ]; @@ -91979,6 +91866,7 @@ self: { libraryHaskellDepends = [ base polynomial ]; description = "Native Haskell implementation of the interface from the erf package"; license = "GPL"; + hydraPlatforms = lib.platforms.none; }) {}; "erlang" = callPackage @@ -92105,18 +91993,6 @@ self: { }) {}; "error" = callPackage - ({ mkDerivation, base, doctest, text }: - mkDerivation { - pname = "error"; - version = "0.3.0.0"; - sha256 = "1vbmfjcx82b5ngzqda74j4xwqhzwhgl9ikh65ipzk2x26fzkww84"; - libraryHaskellDepends = [ base text ]; - testHaskellDepends = [ base doctest ]; - description = "The canonical error type"; - license = lib.licenses.mit; - }) {}; - - "error_1_0_0_0" = callPackage ({ mkDerivation, base, doctest, text }: mkDerivation { pname = "error"; @@ -92126,7 +92002,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "The canonical error type"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "error-analyze" = callPackage @@ -92244,19 +92119,6 @@ self: { }) {}; "error-or" = callPackage - ({ mkDerivation, base, containers, mtl, text }: - mkDerivation { - pname = "error-or"; - version = "0.2.0.0"; - sha256 = "0wpw8ms1rxc8zhdcr078bang10jl2wkd0ji944knzcvspfnx9hib"; - revision = "1"; - editedCabalFile = "16zplgyfdqcqfnrf4w67fl993akn7dpysgsjl8n3w6cw7ki6a2a8"; - libraryHaskellDepends = [ base containers mtl text ]; - description = "Composable, hierarchical errors"; - license = lib.licenses.bsd3; - }) {}; - - "error-or_0_3_0" = callPackage ({ mkDerivation, base, containers, mtl, text }: mkDerivation { pname = "error-or"; @@ -92265,7 +92127,6 @@ self: { libraryHaskellDepends = [ base containers mtl text ]; description = "Composable, hierarchical errors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "error-or-utils" = callPackage @@ -92599,6 +92460,8 @@ self: { ]; description = "Espial is an open-source, web-based bookmarking server"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "esqueleto" = callPackage @@ -92684,8 +92547,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding"; - version = "0.2.6"; - sha256 = "0bmcy6j0zw9v7z4sr0m300ckr1mdh3wxj975wbgbl8qlkwsfwv9l"; + version = "0.2.7"; + sha256 = "1vg10x8radvr8ysqfzf1cngp2hnqy8g139x07pwqwycj9zwwnbl4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92699,7 +92562,9 @@ self: { ]; description = "General purpose live coding framework"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.turion ]; + broken = true; }) {}; "essence-of-live-coding-PortMidi" = callPackage @@ -92708,14 +92573,15 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-PortMidi"; - version = "0.2.6"; - sha256 = "0n5bivhffrxp8kwhf42r3yf485y3mnxl4r3pzwp2l89h7l380q8z"; + version = "0.2.7"; + sha256 = "1qqswld88yvqa1z8h9rdxqqvjikhkdb67xp2sph6xb231k9710qy"; libraryHaskellDepends = [ base essence-of-live-coding PortMidi transformers ]; description = "General purpose live coding framework - PortMidi backend"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; }) {}; "essence-of-live-coding-gloss" = callPackage @@ -92724,13 +92590,14 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-gloss"; - version = "0.2.6"; - sha256 = "02jdi5ijkhf9jc9r5jyqvlk6idmgbjbv3x4yw6ich2m95yhf8hrl"; + version = "0.2.7"; + sha256 = "0iv5wgzfxy1k80dh6c6hrzh4jcjy3ak4l3l004jm3wpfm7fm0lmx"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store gloss syb transformers ]; description = "General purpose live coding framework - Gloss backend"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.turion ]; }) {}; @@ -92752,7 +92619,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "essence-of-live-coding-gloss-example"; - broken = true; }) {}; "essence-of-live-coding-pulse" = callPackage @@ -92761,13 +92627,14 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-pulse"; - version = "0.2.6"; - sha256 = "16fipxz90vlsy9hgksiw7m7r7wzrqrjdhb6fg11m6jlrk1f5bkka"; + version = "0.2.7"; + sha256 = "0bmnc7901zgak223kfm29md0w5fd9lfv4dxc8c27cdcrdqnqfc2p"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store pulse-simple transformers ]; description = "General purpose live coding framework - pulse backend"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.turion ]; }) {}; @@ -92789,7 +92656,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "essence-of-live-coding-pulse-example"; - broken = true; }) {}; "essence-of-live-coding-quickcheck" = callPackage @@ -92798,14 +92664,15 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-quickcheck"; - version = "0.2.6"; - sha256 = "1hkzp0q0xk3wa892vnjimi7m9gq56m5wx1m2i72ssl6x2jgy52hl"; + version = "0.2.7"; + sha256 = "0jn5bz7xq8jmlkhrrbn5mj3ywh8288gpx43n8fkjzmzdk233kbvp"; libraryHaskellDepends = [ base boltzmann-samplers essence-of-live-coding QuickCheck syb transformers ]; description = "General purpose live coding framework - QuickCheck integration"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.turion ]; }) {}; @@ -92813,11 +92680,12 @@ self: { ({ mkDerivation, base, essence-of-live-coding, vivid }: mkDerivation { pname = "essence-of-live-coding-vivid"; - version = "0.2.6"; - sha256 = "1vw4bjxnqd58h5lrw7wqd1w3026skcnz9vrnwmfxcsbyc09bnyvw"; + version = "0.2.7"; + sha256 = "03j5kmp824s8b2x1n8dp86lh7ac8ccxh54dg0sx7v98j9lflbcqq"; libraryHaskellDepends = [ base essence-of-live-coding vivid ]; description = "General purpose live coding framework - vivid backend"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "essence-of-live-coding-warp" = callPackage @@ -92826,8 +92694,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-warp"; - version = "0.2.6"; - sha256 = "0x18jxw0xwqvbwdalbrz4lp2lq9pyl4a5r9vnky5hc5wcwqm2f4m"; + version = "0.2.7"; + sha256 = "1zykg5qik61xr4ri6d9r04w5rj7wm0wqmnzm6nipwpixal3gdxqa"; libraryHaskellDepends = [ base essence-of-live-coding http-types wai warp ]; @@ -92836,6 +92704,8 @@ self: { ]; description = "General purpose live coding framework"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; }) {}; "estimator" = callPackage @@ -93196,6 +93066,7 @@ self: { ]; description = "Ethereum Recursive Length Prefix Encoding"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "ety" = callPackage @@ -93359,8 +93230,6 @@ self: { ]; description = "An extensible event framework"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "eve-cli" = callPackage @@ -93379,6 +93248,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "eve-cli-exe"; + broken = true; }) {}; "eved" = callPackage @@ -93522,6 +93392,7 @@ self: { ]; description = "Core module for eventful"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "eventful-dynamodb" = callPackage @@ -93565,6 +93436,7 @@ self: { ]; description = "In-memory implementations for eventful"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "eventful-postgresql" = callPackage @@ -93607,7 +93479,6 @@ self: { description = "Common library for SQL event stores"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "eventful-sqlite" = callPackage @@ -93646,20 +93517,20 @@ self: { ]; description = "Common module used for eventful tests"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "eventlog2html" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, blaze-html , bytestring, containers, file-embed, filepath, ghc-events - , ghc-heap, hashable, hashtables, hvega, mtl, optparse-applicative - , semigroups, statistics-linreg, text, time, trie-simple, vector + , ghc-heap, githash, hashable, hashtables, hvega, mtl + , optparse-applicative, semigroups, statistics-linreg, text, time + , trie-simple, vector }: mkDerivation { pname = "eventlog2html"; - version = "0.9.2"; - sha256 = "0mr916gppp8pgyqdx89zhmcil7hkm7462h6vsq1y4n1qf5hx30jv"; - revision = "3"; - editedCabalFile = "12vbcl7l08a8a8xnjibpsb7va270l5m0avmwdw7ms4qnly7c5z29"; + version = "0.9.3"; + sha256 = "1wgpqrqkk0cvyxmmgkmq04k3d1v91qdqb737xx7k51d3lb909n7l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93668,7 +93539,7 @@ self: { mtl optparse-applicative semigroups statistics-linreg text time trie-simple vector ]; - executableHaskellDepends = [ aeson base filepath text ]; + executableHaskellDepends = [ aeson base filepath githash text ]; description = "Visualise an eventlog"; license = lib.licenses.bsd3; mainProgram = "eventlog2html"; @@ -93797,7 +93668,9 @@ self: { ]; description = "Server-Sent Events the UNIX way"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "eventsourced"; + broken = true; }) {}; "eventsourcing" = callPackage @@ -93875,39 +93748,40 @@ self: { }) {}; "eventuo11y" = callPackage - ({ mkDerivation, base, exceptions, primitive, resourcet - , safe-exceptions, transformers, unliftio-core + ({ mkDerivation, base, exceptions, general-allocate, monad-control + , mtl, primitive, transformers, transformers-base, unliftio-core }: mkDerivation { pname = "eventuo11y"; - version = "0.5.0.0"; - sha256 = "19rsw7xs8hy1yl145fgsfd3rddvpxjgxv05kd557hgv35ipkklmz"; + version = "0.6.0.0"; + sha256 = "1zk49cfg2cab5h5xy2bghk643aq6p0zi937linnxgl53c21br1li"; libraryHaskellDepends = [ - base exceptions primitive resourcet safe-exceptions transformers - unliftio-core + base exceptions general-allocate monad-control mtl primitive + transformers transformers-base unliftio-core ]; description = "An event-oriented observability library"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "eventuo11y-batteries" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive - , containers, eventuo11y, eventuo11y-json, http-media, http-types - , monad-control, mtl, network, safe-exceptions, semigroupoids - , servant-client, servant-client-core, text, transformers-base, wai + , containers, eventuo11y, eventuo11y-json, general-allocate + , http-media, http-types, monad-control, mtl, network + , safe-exceptions, semigroupoids, servant-client + , servant-client-core, text, transformers-base, unliftio-core, wai , warp }: mkDerivation { pname = "eventuo11y-batteries"; - version = "0.2.1.1"; - sha256 = "1s3mwr9cnfsn1kh63dq6djwvvj4sx256w47r9s6wsii9ibgqig8v"; + version = "0.3.0.0"; + sha256 = "12agwfk89jxsa2hdy5ghvkjddp2xs58973r4zi5zsf3zzx7nlx56"; libraryHaskellDepends = [ aeson base binary bytestring case-insensitive containers eventuo11y - eventuo11y-json http-media http-types monad-control mtl network - safe-exceptions semigroupoids servant-client servant-client-core - text transformers-base wai warp + eventuo11y-json general-allocate http-media http-types + monad-control mtl network safe-exceptions semigroupoids + servant-client servant-client-core text transformers-base + unliftio-core wai warp ]; description = "Grab bag of eventuo11y-enriched functionality"; license = lib.licenses.asl20; @@ -93915,29 +93789,27 @@ self: { }) {}; "eventuo11y-dsl" = callPackage - ({ mkDerivation, base, template-haskell, th-compat }: + ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "eventuo11y-dsl"; - version = "0.1.0.0"; - sha256 = "0nm0q8p5qbnx56gvpsbzz5vwkx08sn8wcdyb6hli4ihq407ml8qz"; - libraryHaskellDepends = [ base template-haskell th-compat ]; + version = "0.2.0.0"; + sha256 = "0qa5csjkm25278h1vf59aws9am59gyha7zi1yjq7wag1ivhdfa9w"; + libraryHaskellDepends = [ base template-haskell ]; description = "DSL for defining eventuo11y fields and selectors"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "eventuo11y-json" = callPackage ({ mkDerivation, aeson, base, bytestring, eventuo11y - , eventuo11y-dsl, template-haskell, text, th-compat, time, uuid + , eventuo11y-dsl, template-haskell, text, time, uuid }: mkDerivation { pname = "eventuo11y-json"; - version = "0.1.0.0"; - sha256 = "1bl4lqxq38nvwnm6s9w27ja4x571y6lvjvx7amc2i498i3mr5jzq"; + version = "0.2.0.0"; + sha256 = "132dkvsp1p5lj103amsfkn9grc4rx7qgs2nh5506mybykhhhzzg5"; libraryHaskellDepends = [ aeson base bytestring eventuo11y eventuo11y-dsl template-haskell - text th-compat time uuid + text time uuid ]; description = "aeson-based rendering for eventuo11y"; license = lib.licenses.asl20; @@ -94006,8 +93878,6 @@ self: { ]; description = "A GHC plugin to derive instances"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ewe" = callPackage @@ -94029,7 +93899,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "ewe"; - broken = true; }) {}; "ex-pool" = callPackage @@ -94158,25 +94027,13 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "exception-hierarchy"; - version = "0.1.0.6"; - sha256 = "0dnkfznv21sqb8law2smvrlyz76b49dccd83m6fici972f2v1v4k"; + version = "0.1.0.8"; + sha256 = "17wx40kic0gw5lbz1nr094ps612i0j0pbf0wfj4kgzsl6cj80hih"; libraryHaskellDepends = [ base template-haskell ]; description = "Exception type hierarchy with TemplateHaskell"; license = lib.licenses.bsd3; }) {}; - "exception-hierarchy_0_1_0_7" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "exception-hierarchy"; - version = "0.1.0.7"; - sha256 = "14kk0rync05rq2adx5lk59y56h97s0yv7mqfn2grhhwqb10maqj0"; - libraryHaskellDepends = [ base template-haskell ]; - description = "Exception type hierarchy with TemplateHaskell"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "exception-mailer" = callPackage ({ mkDerivation, base, hslogger, mime-mail, text }: mkDerivation { @@ -94202,6 +94059,7 @@ self: { description = "Exception monad transformer instances for monads-fd classes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "exception-monads-tf" = callPackage @@ -94260,6 +94118,8 @@ self: { libraryHaskellDepends = [ base template-haskell ]; description = "DerivingVia for your hierarchical exceptions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "exceptional" = callPackage @@ -94292,17 +94152,15 @@ self: { broken = true; }) {}; - "exceptions_0_10_5" = callPackage + "exceptions_0_10_7" = callPackage ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell , test-framework, test-framework-hunit, test-framework-quickcheck2 , transformers }: mkDerivation { pname = "exceptions"; - version = "0.10.5"; - sha256 = "12xz2x16pv1a6csz64bpl22v40vykjwvdaiz39i8f8nkwasc1qv6"; - revision = "1"; - editedCabalFile = "0ix0ihq1wm9k24r7pisdpvnh5fysy03d0rxfyc6qx9m2bflk9imj"; + version = "0.10.7"; + sha256 = "0jb0ah5k2mb4clhb34c59f615vzl54lhx3hf6njqsgdmr3jashls"; libraryHaskellDepends = [ base mtl stm template-haskell transformers ]; @@ -94315,6 +94173,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "exceptiot" = callPackage + ({ mkDerivation, base, exceptions, hspec, hspec-discover, mtl + , unliftio, unliftio-core + }: + mkDerivation { + pname = "exceptiot"; + version = "0.0.1.0"; + sha256 = "1ss78y1has7yy3ypm29s3k345h8nmxgaqw63r4ahbn0icmi52lys"; + libraryHaskellDepends = [ + base exceptions mtl unliftio unliftio-core + ]; + testHaskellDepends = [ + base exceptions hspec mtl unliftio unliftio-core + ]; + testToolDepends = [ hspec-discover ]; + description = "ExceptT, but uses IO instead of Either"; + license = lib.licenses.bsd3; + }) {}; + "exchangerates" = callPackage ({ mkDerivation, aeson, base, containers, directory, genvalidity , genvalidity-containers, genvalidity-hspec @@ -94534,8 +94411,8 @@ self: { }: mkDerivation { pname = "exiftool"; - version = "0.2.0.1"; - sha256 = "1s59pbwih18izh1iy9y0i56ysh2246dkdv98nan72zp2br5wz7g3"; + version = "0.2.0.2"; + sha256 = "0l9484l07v6hqv675nwwxnm9pck3cz6q3f684vcy7152gyp3z3sq"; libraryHaskellDepends = [ aeson base base64 bytestring hashable process scientific temporary text unordered-containers vector witch @@ -94572,22 +94449,17 @@ self: { }) {}; "exinst" = callPackage - ({ mkDerivation, base, binary, bytestring, constraints, deepseq - , hashable, profunctors, QuickCheck, singletons, tasty, tasty-hunit - , tasty-quickcheck + ({ mkDerivation, base, binary, constraints, deepseq, hashable + , profunctors, QuickCheck, singletons }: mkDerivation { pname = "exinst"; - version = "0.8"; - sha256 = "08axj8yqnqbmxq4yi0fy2rffnkn7lcab2j13b9qlwl5ykc2jrhfh"; + version = "0.9"; + sha256 = "13qsqv1wmz30xvmzznndvzcy2y4qsc52vf21crjrixp38y8in80r"; libraryHaskellDepends = [ base binary constraints deepseq hashable profunctors QuickCheck singletons ]; - testHaskellDepends = [ - base binary bytestring constraints deepseq hashable profunctors - QuickCheck singletons tasty tasty-hunit tasty-quickcheck - ]; description = "Dependent pairs and their instances"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -94596,60 +94468,83 @@ self: { "exinst-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, constraints, exinst - , QuickCheck, singletons, tasty, tasty-quickcheck + , exinst-base, QuickCheck, singletons, tasty, tasty-quickcheck }: mkDerivation { pname = "exinst-aeson"; - version = "0.7.1"; - sha256 = "1rl9sg6bqac944dh4v6xish6fw6x5mr6a937nyq0yrjmg8d3gswp"; + version = "0.9"; + sha256 = "0d4nlx02rr4km0n2g1sc7qk3dzqcbh57lmw3baw3g83xfwmq20r9"; libraryHaskellDepends = [ aeson base constraints exinst singletons ]; testHaskellDepends = [ - aeson base bytestring exinst QuickCheck tasty tasty-quickcheck + aeson base bytestring exinst exinst-base QuickCheck tasty + tasty-quickcheck ]; - description = "Dependent pairs and their instances"; + description = "@exinst@ support for @aeson@ package"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "exinst-base" = callPackage + ({ mkDerivation, base, binary, bytestring, constraints, deepseq + , exinst, hashable, QuickCheck, singletons, singletons-base, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "exinst-base"; + version = "0.9"; + sha256 = "0kv7qxd2brzfbwpiihvwz7ph3vc6g0aysba897brxiifjvr602v0"; + libraryHaskellDepends = [ + base constraints exinst singletons singletons-base + ]; + testHaskellDepends = [ + base binary bytestring deepseq exinst hashable QuickCheck tasty + tasty-quickcheck + ]; + description = "@exinst@ support for @base@ package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; "exinst-bytes" = callPackage ({ mkDerivation, base, binary, bytes, bytestring, cereal - , constraints, exinst, exinst-cereal, QuickCheck, singletons, tasty - , tasty-quickcheck + , constraints, exinst, exinst-base, exinst-cereal, QuickCheck + , singletons, tasty, tasty-quickcheck }: mkDerivation { pname = "exinst-bytes"; - version = "0.7.1"; - sha256 = "0carx1qbs97pxj9bq6splar46myfjz8l0imqmy2nr868sf7an7q5"; + version = "0.9"; + sha256 = "0nla51kwdlspwya5vq8nc52px3f75is4n7qy6xmncsdffmr6bbcl"; libraryHaskellDepends = [ base bytes constraints exinst singletons ]; testHaskellDepends = [ - base binary bytes bytestring cereal exinst exinst-cereal QuickCheck - tasty tasty-quickcheck + base binary bytes bytestring cereal exinst exinst-base + exinst-cereal QuickCheck tasty tasty-quickcheck ]; - description = "Dependent pairs and their instances"; + description = "@exinst@ support for @bytes@ package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; "exinst-cereal" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, constraints - , exinst, QuickCheck, singletons, tasty, tasty-quickcheck + , exinst, exinst-base, QuickCheck, singletons, tasty + , tasty-quickcheck }: mkDerivation { pname = "exinst-cereal"; - version = "0.7.1"; - sha256 = "1ffya75sjy1b60a2c10zymshc8qi1b79rzgpa2mpvlr0glf5i32d"; + version = "0.9"; + sha256 = "19pnrh0z7xyx75hdkk6xqp88j45n2nndnsgc2hz2fxwqyly08cbz"; libraryHaskellDepends = [ base cereal constraints exinst singletons ]; testHaskellDepends = [ - base binary bytestring cereal exinst QuickCheck tasty + base binary bytestring cereal exinst exinst-base QuickCheck tasty tasty-quickcheck ]; - description = "Dependent pairs and their instances"; + description = "@exinst@ support for @cereal@ package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -94681,18 +94576,19 @@ self: { }) {}; "exinst-serialise" = callPackage - ({ mkDerivation, base, binary, constraints, exinst, QuickCheck - , serialise, singletons, tasty, tasty-quickcheck + ({ mkDerivation, base, binary, constraints, exinst, exinst-base + , QuickCheck, serialise, singletons, tasty, tasty-quickcheck }: mkDerivation { pname = "exinst-serialise"; - version = "0.7.1"; - sha256 = "06fqhxcqwam7160i2m0hsmbdkb0q21kv0vy5azilrbphhz4ycfvp"; + version = "0.9"; + sha256 = "0c6hbffyfjbrg3gfdd9wy8yvpwfffb9z9szwivqabr8yigdbhx0d"; libraryHaskellDepends = [ base constraints exinst serialise singletons ]; testHaskellDepends = [ - base binary exinst QuickCheck serialise tasty tasty-quickcheck + base binary exinst exinst-base QuickCheck serialise tasty + tasty-quickcheck ]; description = "Dependent pairs and their instances"; license = lib.licenses.bsd3; @@ -94812,15 +94708,15 @@ self: { "exon" = callPackage ({ mkDerivation, base, criterion, flatparse, generics-sop , ghc-hs-meta, hedgehog, incipit-base, tasty, tasty-hedgehog - , template-haskell, type-errors-pretty + , template-haskell }: mkDerivation { pname = "exon"; - version = "1.2.0.0"; - sha256 = "1cayih5rp386cn1ig5g7flxjfh47451h095zx4av4i0c72j6q7s1"; + version = "1.3.0.0"; + sha256 = "1w93x0yfqm1yp82lh2q1wibb88xn7rh4vh16pq1pzs8vdhgbapc2"; libraryHaskellDepends = [ base flatparse generics-sop ghc-hs-meta incipit-base - template-haskell type-errors-pretty + template-haskell ]; testHaskellDepends = [ base hedgehog incipit-base tasty tasty-hedgehog template-haskell @@ -94828,8 +94724,6 @@ self: { benchmarkHaskellDepends = [ base criterion incipit-base ]; description = "Customizable Quasiquote Interpolation"; license = "BSD-2-Clause-Patent"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "exotic-list-monads" = callPackage @@ -94883,6 +94777,8 @@ self: { libraryHaskellDepends = [ base ]; description = "floating point with extended exponent range"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "exp-pairs" = callPackage @@ -95179,16 +95075,14 @@ self: { }: mkDerivation { pname = "exploring-interpreters"; - version = "1.3.0.0"; - sha256 = "12a2z2z5c8kaqn7mks28ppazmkfvxn9lah6argmjqsd5ahwsxazs"; + version = "1.4.0.0"; + sha256 = "15dadwf6lpcppc1zcv5mwrfsgffjjwbsprasf0fw9prnyx1srw3v"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers exceptions fgl haskeline http-types mtl network scientific text transformers ]; description = "A generic exploring interpreter for exploratory programming"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "exposed-containers" = callPackage @@ -95459,6 +95353,7 @@ self: { description = "Sums/products/lists/trees which can be extended in other modules"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "extensible-effects" = callPackage @@ -95622,6 +95517,7 @@ self: { description = "Sort large arrays on your hard drive. Kind of like the unix util sort."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "extra" = callPackage @@ -96421,6 +96317,8 @@ self: { ]; description = "Solve classical planning problems (STRIPS/SAS+) using Haskell & Fast Downward"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fast-logger" = callPackage @@ -96529,6 +96427,8 @@ self: { libraryHaskellDepends = [ base bytestring tagsoup text ]; description = "Fast parser for tagsoup package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fasta" = callPackage @@ -96591,6 +96491,7 @@ self: { librarySystemDepends = [ fcgi ]; description = "A Haskell library for writing FastCGI programs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) fcgi;}; "fastedit" = callPackage @@ -96672,6 +96573,7 @@ self: { description = "A highly experimental Fastly API client"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fastmemo" = callPackage @@ -96710,7 +96612,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "A fast, but bare bones, bytestring parser combinators library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fastpbkdf2" = callPackage @@ -96812,6 +96713,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "fay"; + broken = true; }) {}; "fay-base" = callPackage @@ -97040,24 +96942,23 @@ self: { ({ mkDerivation, aeson, async, base, bodhi, bugzilla-redhat , bytestring, config-ini, copr-api, directory, email-validate , extra, fedora-dists, filepath, http-conduit, http-directory - , http-query, koji, network-uri, optparse-applicative, pagure - , pretty-terminal, process, rpm-nvr, rpmbuild-order, simple-cmd - , simple-cmd-args, text, time, typed-process, unix - , unordered-containers, utf8-string, xdg-basedir + , http-query, koji, network-uri, pagure, pretty-terminal, process + , rpm-nvr, rpmbuild-order, simple-cmd, simple-cmd-args, text, time + , typed-process, unix, utf8-string, xdg-basedir }: mkDerivation { pname = "fbrnch"; - version = "1.1.2"; - sha256 = "1ybd98gbck5k433hzli7c5qcgxr5rbmy1ydi6hd7wrkhcrr6mndf"; + version = "1.2.1"; + sha256 = "1kf3sc5lcg9w62q18fzf3pgm0rhiyr290wad6l6932yjijxamaj2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson async base bodhi bugzilla-redhat bytestring config-ini copr-api directory email-validate extra fedora-dists filepath - http-conduit http-directory http-query koji network-uri - optparse-applicative pagure pretty-terminal process rpm-nvr - rpmbuild-order simple-cmd simple-cmd-args text time typed-process - unix unordered-containers utf8-string xdg-basedir + http-conduit http-directory http-query koji network-uri pagure + pretty-terminal process rpm-nvr rpmbuild-order simple-cmd + simple-cmd-args text time typed-process unix utf8-string + xdg-basedir ]; description = "Fedora packager tool to build package branches"; license = lib.licenses.gpl2Only; @@ -97179,6 +97080,8 @@ self: { ]; description = "Type-level version of algebraic-graphs"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fcf-vinyl" = callPackage @@ -97219,7 +97122,6 @@ self: { description = "Server-Side Integration for FCKeditor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fclabels" = callPackage @@ -97333,6 +97235,8 @@ self: { libraryHaskellDepends = [ base containers microlens-platform mtl ]; testHaskellDepends = [ base containers microlens-platform mtl ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "feature-flags" = callPackage @@ -97421,21 +97325,6 @@ self: { }) {}; "fedora-dists" = 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; - }) {}; - - "fedora-dists_2_1_1" = callPackage ({ mkDerivation, aeson, base, cached-json-file, pdc, text }: mkDerivation { pname = "fedora-dists"; @@ -97444,7 +97333,6 @@ self: { libraryHaskellDepends = [ aeson base cached-json-file pdc text ]; description = "Library for Fedora distribution versions"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "fedora-haskell-tools" = callPackage @@ -97714,23 +97602,24 @@ self: { }) {}; "feedback" = callPackage - ({ mkDerivation, autodocodec, autodocodec-yaml, base, conduit - , containers, envparse, fsnotify, optparse-applicative, path - , path-io, pretty-show, safe-coloured-text + ({ mkDerivation, autodocodec, autodocodec-yaml, base, bytestring + , conduit, containers, envparse, fsnotify, optparse-applicative + , path, path-io, pretty-show, safe-coloured-text , safe-coloured-text-layout, safe-coloured-text-terminfo, text - , time, typed-process, unliftio, yaml + , time, typed-process, unix, unliftio, yaml }: mkDerivation { pname = "feedback"; - version = "0.0.0.0"; - sha256 = "1y4p38cd0cqg4r43y2p0n2i99q83vnhm7gswx0j34p58isrbad4x"; + version = "0.1.0.1"; + sha256 = "18934n0fwz3q7mgfzc0phwxfng3qakf5hw14iyhal57ks7gm7j2y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - autodocodec autodocodec-yaml base conduit containers envparse - fsnotify optparse-applicative path path-io pretty-show + autodocodec autodocodec-yaml base bytestring conduit containers + envparse fsnotify optparse-applicative path path-io pretty-show safe-coloured-text safe-coloured-text-layout - safe-coloured-text-terminfo text time typed-process unliftio yaml + safe-coloured-text-terminfo text time typed-process unix unliftio + yaml ]; executableHaskellDepends = [ base ]; description = "Declarative feedback loop manager"; @@ -97966,6 +97855,7 @@ self: { description = "A functional embedded language for DSP and parallelism"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "feldspar-signal" = callPackage @@ -98071,6 +97961,27 @@ self: { broken = true; }) {}; + "festival" = callPackage + ({ mkDerivation, alsa-lib, base, bytestring, c2hs, estbase, estools + , eststring, Festival, gomp, ncurses + }: + mkDerivation { + pname = "festival"; + version = "0.1.0.0"; + sha256 = "0w48b4dh41qjcgh0hdb7jd12gpl16zq3gbv907dcmlqmrskd712w"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ + alsa-lib estbase estools eststring Festival gomp ncurses + ]; + libraryToolDepends = [ c2hs ]; + description = "C bindings plus conveniences for the festival tts system"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {Festival = null; inherit (pkgs) alsa-lib; estbase = null; + estools = null; eststring = null; inherit (pkgs) gomp; + inherit (pkgs) ncurses;}; + "festung" = callPackage ({ mkDerivation, aeson, argparser, async, base, base64-bytestring , bytestring, case-insensitive, containers, directory, either @@ -98133,37 +98044,37 @@ self: { }) {}; "fficxx" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal - , containers, data-default, directory, either, errors + ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring + , Cabal, containers, data-default, directory, dotgen, errors , fficxx-runtime, filepath, hashable, haskell-src-exts, lens, mtl , process, pureMD5, split, template, template-haskell, text , transformers, unordered-containers }: mkDerivation { pname = "fficxx"; - version = "0.6"; - sha256 = "0ky5zgdmw03wxngnpyai29ydm28n3bndznqxnmq45vadzhkz2ncz"; + version = "0.7.0.0"; + sha256 = "11ppih6vxvw9a5wmb7cni1jyprzbas1xy6i2zzqqxas3ik9i9sin"; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring Cabal containers data-default - directory either errors fficxx-runtime filepath hashable - haskell-src-exts lens mtl process pureMD5 split template + aeson aeson-pretty array base bytestring Cabal containers + data-default directory dotgen errors fficxx-runtime filepath + hashable haskell-src-exts lens mtl process pureMD5 split template template-haskell text transformers unordered-containers ]; description = "Automatic C++ binding generation"; - license = lib.licenses.bsd3; + license = lib.licenses.bsd2; }) {}; "fficxx-runtime" = callPackage ({ mkDerivation, base, bytestring, hashable, template-haskell }: mkDerivation { pname = "fficxx-runtime"; - version = "0.6"; - sha256 = "12imwghgia5bp4j6gcbww6ikk43q4ysf6fymk54m645bl4agwqrb"; + version = "0.7.0.0"; + sha256 = "1igchjkbmdl3skqnf5aqa4zv1bz5kk1wvgrxwvhq2xdshyflvzkk"; libraryHaskellDepends = [ base bytestring hashable template-haskell ]; description = "Runtime for fficxx-generated library"; - license = lib.licenses.bsd3; + license = lib.licenses.bsd2; }) {}; "ffmpeg-light" = callPackage @@ -98221,6 +98132,8 @@ self: { testHaskellDepends = [ base carray QuickCheck storable-complex ]; description = "Bindings to the FFTW library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; "fftw-ffi" = callPackage @@ -98426,6 +98339,7 @@ self: { description = "First-class record field combinators with infix record field syntax"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fields-json" = callPackage @@ -98559,10 +98473,8 @@ self: { ({ mkDerivation, base, bytestring, filepath, unix }: mkDerivation { pname = "file-io"; - version = "0.1.0.0"; - sha256 = "04h83zz3pgkd7q4p51rndc2wr3a2rk18y9mxahzsvd6hq8jp77gs"; - revision = "1"; - editedCabalFile = "0ahdk69vvydsjlmk9363jkcs9zy589m0sxpn1bqxysvm29lac9gs"; + version = "0.1.0.1"; + sha256 = "1kxr2cdv3zmml7v3gmk2zrd2kwvph46fzv3r2ia5brq5qvm2s544"; libraryHaskellDepends = [ base bytestring filepath unix ]; description = "Basic file IO operations via 'OsPath'"; license = lib.licenses.bsd3; @@ -98755,21 +98667,6 @@ self: { }) {}; "filepath-bytestring" = callPackage - ({ mkDerivation, base, bytestring, criterion, filepath, QuickCheck - , unix - }: - mkDerivation { - pname = "filepath-bytestring"; - version = "1.4.2.1.9"; - sha256 = "1djbx4mxkzmbi6l44r4ag482r71hwd5s22fj2myz6c128lfrvlk7"; - libraryHaskellDepends = [ base bytestring unix ]; - testHaskellDepends = [ base bytestring filepath QuickCheck ]; - benchmarkHaskellDepends = [ base criterion filepath ]; - description = "Library for manipulating RawFilePaths in a cross platform way"; - license = lib.licenses.bsd3; - }) {}; - - "filepath-bytestring_1_4_2_1_12" = callPackage ({ mkDerivation, base, bytestring, criterion, filepath, QuickCheck , unix }: @@ -98782,7 +98679,6 @@ self: { benchmarkHaskellDepends = [ base criterion filepath ]; description = "Library for manipulating RawFilePaths in a cross platform way"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "filepath-crypto" = callPackage @@ -99235,8 +99131,8 @@ self: { }: mkDerivation { pname = "finitary"; - version = "2.1.1.0"; - sha256 = "1ip1l809d7wnhiyz522g34kzsvv2r9hz1l065jqlrwf1pnhgsv0c"; + version = "2.1.1.1"; + sha256 = "006zyb0lna9w4n1yqm2c7k2lpk6aidj4cmf5kx8pcl4r9vkwafgk"; libraryHaskellDepends = [ base bitvec finite-typelits ghc-typelits-knownnat ghc-typelits-natnormalise primitive template-haskell @@ -99250,7 +99146,6 @@ self: { description = "A better, more type-safe Enum"; license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "finitary-derive" = callPackage @@ -99738,8 +99633,8 @@ self: { }: mkDerivation { pname = "fix-whitespace"; - version = "0.0.10"; - sha256 = "1jlkx0ygl315yik0f2fh4ml77c4080y0czs2mlnc84pkhximj58l"; + version = "0.0.11"; + sha256 = "0q36vr3pfk1x14hl86g4g557299ih0510j7cf37h8n5nv8bs8gq2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99838,6 +99733,7 @@ self: { description = "Fixed Precision Arithmetic"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fixed-storable-array" = callPackage @@ -99870,8 +99766,8 @@ self: { ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: mkDerivation { pname = "fixed-vector"; - version = "1.2.1.0"; - sha256 = "05x3qivymg02n17wik17fmz2bqbbhj4b0w5iz7vnjz3szhwjizdf"; + version = "1.2.2.1"; + sha256 = "0kp747v67x1ija33nyqmyh6g178pqn2c7glynrpzcv733lalp00z"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base doctest filemanip primitive ]; description = "Generic vectors with statically known size"; @@ -100325,35 +100221,6 @@ self: { }) {}; "flat" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , dlist, filepath, ghc-prim, hashable, mono-traversable, pretty - , primitive, QuickCheck, quickcheck-instances, quickcheck-text - , semigroups, tasty, tasty-hunit, tasty-quickcheck, text - , unordered-containers, vector - }: - mkDerivation { - pname = "flat"; - version = "0.4.4"; - sha256 = "02i4nzzkmm11sp312k2d3d3g0gm2gzhh3ibczxxscl986svam7p3"; - revision = "1"; - editedCabalFile = "1f9vlfnkr20nh5nayj18wvwh061w0byrd88j01k9gnrmb7qykpf6"; - libraryHaskellDepends = [ - array base bytestring containers deepseq dlist ghc-prim hashable - mono-traversable pretty primitive semigroups text - unordered-containers vector - ]; - testHaskellDepends = [ - array base bytestring containers deepseq dlist filepath ghc-prim - mono-traversable pretty QuickCheck quickcheck-instances - quickcheck-text tasty tasty-hunit tasty-quickcheck text - unordered-containers vector - ]; - description = "Principled and efficient bit-oriented binary serialization"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.sternenseemann ]; - }) {}; - - "flat_0_6" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , dlist, filepath, ghc-prim, hashable, list-t, mono-traversable , pretty, primitive, QuickCheck, quickcheck-text, tasty @@ -100377,7 +100244,6 @@ self: { ]; description = "Principled and efficient bit-oriented binary serialization"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.sternenseemann ]; }) {}; @@ -100767,11 +100633,11 @@ self: { pname = "float128"; version = "0.1"; sha256 = "0f4nrj5qy6j6d9ll22zjkbgvw2rx0x2w7nllhl929zdbmhxrjk73"; + revision = "1"; + editedCabalFile = "0s13mg9gagmvvqdisdm9r8nps6bavw4va18bsq93q080znwg2dw3"; libraryHaskellDepends = [ base integer-gmp ]; description = "FFI bindings for C _Float128"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "floating-bits" = callPackage @@ -100815,6 +100681,8 @@ self: { ]; description = "Wrapper for flock(2)"; license = "unknown"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "floskell" = callPackage @@ -100826,8 +100694,8 @@ self: { }: mkDerivation { pname = "floskell"; - version = "0.10.6"; - sha256 = "0r7djm85lc7qmcfc6fi8kdshg22zc6xhwqg09ipimdbwhlwlpv7f"; + version = "0.10.7"; + sha256 = "0v52x4h52ack88f98n9yrnybmlmp2fqpsvsn9lbjq2krl2p1n2az"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -100955,6 +100823,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "flowdock"; + broken = true; }) {}; "flowdock-rest" = callPackage @@ -101531,17 +101400,18 @@ self: { }) {}; "fold-debounce" = callPackage - ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay - , time + ({ mkDerivation, base, data-default-class, hspec, hspec-discover + , stm, stm-delay, time }: mkDerivation { pname = "fold-debounce"; - version = "0.2.0.9"; - sha256 = "032vk4bpmsd7ix00kpfb2vnabivg9vkkfy3nbazdgm8x01jix4wq"; + version = "0.2.0.10"; + sha256 = "0ql0vi0l19l8559ppb9j0i5w90cgk2l7ipf8laj30xx6xz3yrrji"; libraryHaskellDepends = [ base data-default-class stm stm-delay time ]; testHaskellDepends = [ base hspec stm time ]; + testToolDepends = [ hspec-discover ]; description = "Fold multiple events that happen in a given period of time"; license = lib.licenses.bsd3; }) {}; @@ -101552,8 +101422,8 @@ self: { }: mkDerivation { pname = "fold-debounce-conduit"; - version = "0.2.0.6"; - sha256 = "0xy6vr2hbw41fcs3rlk7wyxqrkqd3nfw5rcr1aiij86zaaifpry5"; + version = "0.2.0.7"; + sha256 = "02a3kxk4b3725h4dbnfvc1va4h7l4mxg3aaf3jacq9vmn1zwl4n5"; libraryHaskellDepends = [ base conduit fold-debounce resourcet stm transformers transformers-base @@ -101597,10 +101467,10 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.4.12"; - sha256 = "0zf4yljh3s2ddxa7dhzdglmylj14kfldhkclc44g37zvjq6kcnag"; - revision = "5"; - editedCabalFile = "1b97k85zryid7x2ygi92ilv480ahfjn5yf1f4blllwyxn7zgvjv4"; + version = "1.4.13"; + sha256 = "14vlhgf40qmwkznwza37z4www3q1v5acsx4nw5vmg25wdnc8ibfw"; + revision = "1"; + editedCabalFile = "0wkjdxjyjyq9kv9hwa5k8k8fp6i0b77xf9b2prrzyq0cwlps016i"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable primitive profunctors random semigroupoids text transformers @@ -101617,8 +101487,8 @@ self: { ({ mkDerivation, base, foldl, hedgehog, safe-exceptions }: mkDerivation { pname = "foldl-exceptions"; - version = "1.0.0.1"; - sha256 = "05b7d7y7lg8b2d4kyzwnad4vkr6qyx1gpjw4wd20kk5smql4bxsq"; + version = "1.0.0.2"; + sha256 = "1303ybbfh60hqbwvydfvc4byva2agjm20vq4cfs4lkassrb36lrp"; libraryHaskellDepends = [ base foldl safe-exceptions ]; testHaskellDepends = [ base foldl hedgehog safe-exceptions ]; description = "Exception handling with FoldM"; @@ -101894,6 +101764,30 @@ self: { broken = true; }) {}; + "fontconfig-pure" = callPackage + ({ mkDerivation, base, containers, css-syntax, fontconfig + , freetype2, hashable, hspec, linear, QuickCheck, scientific + , stylist-traits, text + }: + mkDerivation { + pname = "fontconfig-pure"; + version = "0.1.0.0"; + sha256 = "0rnx9s5kj5lr70gp4454qy3h4lfndf9f976h331jp0f4y47c2d42"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers css-syntax freetype2 hashable linear scientific + stylist-traits text + ]; + libraryPkgconfigDepends = [ fontconfig ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "Pure-functional language bindings to FontConfig"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "fontconfig-pure"; + }) {inherit (pkgs) fontconfig;}; + "foo" = callPackage ({ mkDerivation, base, containers, GLUT, haskell98, OpenGL }: mkDerivation { @@ -101974,8 +101868,8 @@ self: { pname = "force-layout"; version = "0.4.0.6"; sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp"; - revision = "9"; - editedCabalFile = "0271sh8py8lm6amwxyr4dic20cji5hq1iixmikq0kmijg1095wkp"; + revision = "10"; + editedCabalFile = "1mcs51d1a3klzy938wq0gcbx7ln49g940zhajmflxq6imy5h5kwa"; libraryHaskellDepends = [ base containers data-default-class lens linear ]; @@ -102018,8 +101912,8 @@ self: { }: mkDerivation { pname = "foreign"; - version = "0.1.2.0"; - sha256 = "0pmwf96miai50q7vbwjdm5rz2cljpmp115hp3blv2l596mdjrvc0"; + version = "0.2.0.1"; + sha256 = "0jdp0firbgjsgfzwsxw2yr9lj08bibhngcfwamj0sh3asrb6ryws"; libraryHaskellDepends = [ base bytestring ghc-prim primitive primitive-unlifted ]; @@ -102205,6 +102099,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "formal"; + broken = true; }) {}; "format" = callPackage @@ -102307,6 +102202,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "formatting_7_2_0" = callPackage + ({ mkDerivation, base, clock, criterion, double-conversion, hspec + , old-locale, QuickCheck, scientific, text, time, transformers + }: + mkDerivation { + pname = "formatting"; + version = "7.2.0"; + sha256 = "0vbaf1p2grz8irh92d4v44f1np5kywjdjvrfygjyf57ng8bihyy0"; + libraryHaskellDepends = [ + base clock double-conversion old-locale scientific text time + transformers + ]; + testHaskellDepends = [ base hspec scientific text time ]; + benchmarkHaskellDepends = [ base criterion QuickCheck text ]; + description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "forml" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cereal , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger @@ -102331,6 +102245,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "forml"; + broken = true; }) {}; "formlets" = callPackage @@ -102447,38 +102362,6 @@ self: { }) {}; "fortran-src" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , deepseq, directory, either, fgl, filepath, GenericPretty, happy - , hspec, hspec-discover, mtl, pretty, QuickCheck, temporary, text - , uniplate - }: - mkDerivation { - pname = "fortran-src"; - version = "0.9.0"; - sha256 = "0x2dkzqvc1al4zshdjc2iypi5bl2vkrvrvidmw7099jjspp6iw1c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory either - fgl filepath GenericPretty mtl pretty temporary text uniplate - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ - array base binary bytestring containers deepseq directory either - fgl filepath GenericPretty mtl pretty temporary text uniplate - ]; - testHaskellDepends = [ - array base binary bytestring containers deepseq directory either - fgl filepath GenericPretty hspec mtl pretty QuickCheck temporary - text uniplate - ]; - testToolDepends = [ hspec-discover ]; - description = "Parsers and analyses for Fortran standards 66, 77, 90, 95 and 2003 (partial)"; - license = lib.licenses.asl20; - mainProgram = "fortran-src"; - }) {}; - - "fortran-src_0_12_0" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, either, fgl, filepath, GenericPretty, happy , hspec, hspec-discover, mtl, pretty, QuickCheck, singletons @@ -102510,7 +102393,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Parsers and analyses for Fortran standards 66, 77, 90, 95 and 2003 (partial)"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "fortran-src"; }) {}; @@ -102751,40 +102633,6 @@ self: { }) {}; "fourmolu" = 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; - mainProgram = "fourmolu"; - }) {}; - - "fourmolu_0_9_0_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring , Cabal, containers, Diff, directory, dlist, exceptions, filepath , ghc-lib-parser, gitrev, hspec, hspec-discover, hspec-megaparsec @@ -102796,6 +102644,8 @@ self: { pname = "fourmolu"; version = "0.9.0.0"; sha256 = "0zq9fv5yszm7icirgwj8g4lhg21lg87fhz56sssjnfikzmkwyh1l"; + revision = "1"; + editedCabalFile = "0hbjn9qzbr7a9571isi4i651gdi60qqa40idpfg87qlg2sd61485"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102815,6 +102665,40 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = lib.licenses.bsd3; + mainProgram = "fourmolu"; + }) {}; + + "fourmolu_0_10_1_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring + , Cabal-syntax, containers, Diff, directory, dlist, exceptions + , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover + , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative + , path, path-io, pretty, process, QuickCheck, syb, template-haskell + , temporary, text, th-lift-instances, yaml + }: + mkDerivation { + pname = "fourmolu"; + version = "0.10.1.0"; + sha256 = "0gkzd2wf8hji5j0pxjv7l43m405zwsvppj7hax69j86346mb8hp4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal array base bytestring Cabal-syntax containers + Diff directory dlist exceptions filepath ghc-lib-parser megaparsec + MemoTrie mtl syb template-haskell text th-lift-instances yaml + ]; + executableHaskellDepends = [ + base containers directory filepath ghc-lib-parser gitrev + optparse-applicative text yaml + ]; + testHaskellDepends = [ + base containers Diff directory filepath ghc-lib-parser hspec + hspec-megaparsec megaparsec path path-io pretty process QuickCheck + temporary text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "fourmolu"; }) {}; @@ -102890,6 +102774,8 @@ self: { ]; description = "Format-preserving encryption"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fpipe" = callPackage @@ -103180,41 +103066,86 @@ self: { }) {}; "freckle-app" = callPackage - ({ mkDerivation, aeson, aws-xray-client-persistent - , aws-xray-client-wai, base, Blammo, bugsnag, bytestring - , case-insensitive, conduit, containers, datadog, doctest, dotenv - , ekg-core, envparse, errors, exceptions, extra, filepath, Glob + ({ mkDerivation, aeson, base, Blammo, bugsnag, bytestring + , case-insensitive, conduit, containers, datadog, directory, dlist + , doctest, ekg-core, envparse, errors, exceptions, filepath, Glob , hashable, hspec, hspec-core, hspec-expectations-lifted , hspec-junit-formatter, http-client, http-conduit , http-link-header, http-types, immortal, lens, lens-aeson - , memcache, monad-control, MonadRandom, mtl, network-uri - , path-pieces, persistent, persistent-postgresql, postgresql-simple - , primitive, QuickCheck, resource-pool, retry, safe, scientist - , semigroupoids, template-haskell, text, time, transformers - , transformers-base, typed-process, unliftio, unliftio-core - , unordered-containers, vector, wai, wai-extra, yaml, yesod-core + , load-env, memcache, monad-control, monad-logger, MonadRandom, mtl + , network-uri, persistent, persistent-postgresql, postgresql-simple + , primitive, process, resource-pool, retry, safe, scientist + , semigroupoids, template-haskell, temporary, text, time + , transformers, transformers-base, typed-process, unliftio + , unliftio-core, unordered-containers, vector, wai, wai-extra, yaml + , yesod-core }: mkDerivation { pname = "freckle-app"; - version = "1.7.0.0"; - sha256 = "1dndz28fnlwkyskxh2b3afi2imf0ax5sxvqgbd6jl4f06lmk7i5p"; + version = "1.3.0.0"; + sha256 = "1h2ckdjq4h7qv7r5dm28gbs5ja125wi2inzjg3436css9qn1s7v9"; + libraryHaskellDepends = [ + aeson base Blammo bugsnag bytestring case-insensitive conduit + containers datadog dlist doctest ekg-core envparse errors + exceptions filepath Glob hashable hspec hspec-core + hspec-expectations-lifted hspec-junit-formatter http-client + http-conduit http-link-header http-types immortal lens load-env + memcache monad-control monad-logger MonadRandom mtl network-uri + persistent persistent-postgresql postgresql-simple primitive + resource-pool retry safe scientist semigroupoids template-haskell + text time transformers transformers-base typed-process unliftio + unliftio-core unordered-containers vector wai wai-extra yaml + yesod-core + ]; + testHaskellDepends = [ + aeson base bytestring directory errors hspec http-types lens + lens-aeson memcache mtl postgresql-simple process temporary text + time wai wai-extra + ]; + description = "Haskell application toolkit used at Freckle"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "freckle-app_1_8_1_0" = callPackage + ({ mkDerivation, aeson, aws-xray-client-persistent + , aws-xray-client-wai, base, Blammo, bugsnag, bytestring + , case-insensitive, cassava, conduit, conduit-extra, containers + , datadog, doctest, dotenv, ekg-core, envparse, errors, exceptions + , extra, filepath, Glob, hashable, hspec, hspec-core + , hspec-expectations-lifted, hspec-junit-formatter, http-client + , http-conduit, http-link-header, http-types, immortal, lens + , lens-aeson, memcache, monad-control, monad-validate, MonadRandom + , mtl, network-uri, nonempty-containers, path-pieces, persistent + , persistent-postgresql, postgresql-simple, primitive, QuickCheck + , resource-pool, retry, safe, scientist, semigroupoids + , template-haskell, text, time, transformers, transformers-base + , typed-process, unliftio, unliftio-core, unordered-containers + , vector, wai, wai-extra, yaml, yesod-core + }: + mkDerivation { + pname = "freckle-app"; + version = "1.8.1.0"; + sha256 = "14v8km2dd74alanz877yly1p6dnai941g793jxgdgfs9hhhflw2m"; libraryHaskellDepends = [ aeson aws-xray-client-persistent aws-xray-client-wai base Blammo - bugsnag bytestring case-insensitive conduit containers datadog - doctest dotenv ekg-core envparse errors exceptions extra filepath - Glob hashable hspec hspec-core hspec-expectations-lifted - hspec-junit-formatter http-client http-conduit http-link-header - http-types immortal lens memcache monad-control MonadRandom mtl - network-uri path-pieces persistent persistent-postgresql + bugsnag bytestring case-insensitive cassava conduit conduit-extra + containers datadog doctest dotenv ekg-core envparse errors + exceptions extra filepath Glob hashable hspec hspec-core + hspec-expectations-lifted hspec-junit-formatter http-client + http-conduit http-link-header http-types immortal lens memcache + monad-control monad-validate MonadRandom mtl network-uri + nonempty-containers path-pieces persistent persistent-postgresql postgresql-simple primitive resource-pool retry safe scientist semigroupoids template-haskell text time transformers transformers-base typed-process unliftio unliftio-core unordered-containers vector wai wai-extra yaml yesod-core ]; testHaskellDepends = [ - aeson base Blammo bugsnag bytestring errors hspec http-types lens - lens-aeson memcache postgresql-simple QuickCheck unliftio wai - wai-extra + aeson base Blammo bugsnag bytestring cassava conduit errors hspec + http-types lens lens-aeson memcache monad-validate + nonempty-containers postgresql-simple QuickCheck unliftio vector + wai wai-extra ]; description = "Haskell application toolkit used at Freckle"; license = lib.licenses.mit; @@ -103249,10 +103180,8 @@ self: { }: mkDerivation { pname = "free"; - version = "5.1.9"; - sha256 = "1vlzis9sqxh7xrmh3habbgiw3skkhkn710bhqb6fnl45804i6x9f"; - revision = "1"; - editedCabalFile = "133nycxnzy7sgp2vib8hpp2jgzm8pxp31ljf7b4v91jn1gqg3kpl"; + version = "5.1.10"; + sha256 = "0whff0r0nvii5l9z9crw7v0rj0wwblwbnfp99515siyxjkzs9phj"; libraryHaskellDepends = [ base comonad containers distributive exceptions indexed-traversable mtl profunctors semigroupoids template-haskell th-abstraction @@ -103282,6 +103211,18 @@ self: { license = lib.licenses.mpl20; }) {}; + "free-applicative-t" = callPackage + ({ mkDerivation, base, free, hedgehog, transformers }: + mkDerivation { + pname = "free-applicative-t"; + version = "0.1.0.0"; + sha256 = "15bamiy453fl4a2vygjwfywyqwkd46ddxn2v7g4r0y1v7z3y56yn"; + libraryHaskellDepends = [ base free ]; + testHaskellDepends = [ base hedgehog transformers ]; + description = "Free Applicative Transformer"; + license = lib.licenses.bsd3; + }) {}; + "free-categories" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -103353,6 +103294,7 @@ self: { ]; description = "Free functors, adjoint to functors that forget class constraints"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "free-game" = callPackage @@ -103415,15 +103357,13 @@ self: { }) {}; "free-theorems" = callPackage - ({ mkDerivation, base, containers, haskell-src, haskell-src-exts - , mtl, pretty, syb - }: + ({ mkDerivation, base, containers, haskell-src, mtl, pretty, syb }: mkDerivation { pname = "free-theorems"; - version = "0.3.2.0"; - sha256 = "1r0qz8h8fjb9akkhd3impr30gd0s5ky51dj667x0pf155b4lvx2w"; + version = "0.3.2.1"; + sha256 = "0skifd09ccbr950wjm9z9l0adzl9yqrqs73xlhcx24xsy16gn2h8"; libraryHaskellDepends = [ - base containers haskell-src haskell-src-exts mtl pretty syb + base containers haskell-src mtl pretty syb ]; description = "Automatic generation of free theorems"; license = lib.licenses.publicDomain; @@ -103869,6 +103809,7 @@ self: { description = "Single line text rendering for OpenGL ES"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "freetype2" = callPackage @@ -103963,6 +103904,8 @@ self: { ]; description = "high-powered optics in a small package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fresnel-fused-effects" = callPackage @@ -103974,6 +103917,7 @@ self: { libraryHaskellDepends = [ base fresnel fused-effects ]; description = "fresnel/fused-effects integration"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "friday" = callPackage @@ -104707,10 +104651,8 @@ self: { }: mkDerivation { pname = "full-text-search"; - version = "0.2.1.4"; - sha256 = "1qbfklpyxdf5d4d5s1ka9s5a43y892387b0lyjsx9fq3g6d2vck7"; - revision = "1"; - editedCabalFile = "0dma678xflfplrld48aca1p9kjnnwlsqdrqmkgwh9dp54wrxzxl1"; + version = "0.2.2.0"; + sha256 = "12lwjmp31wp3yhbcrpndc89xcs65xyz910d0gzax0n403r24brhx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers text vector ]; @@ -105249,6 +105191,7 @@ self: { ]; description = "GLL parser with simple combinator interface"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "funion" = callPackage @@ -105479,7 +105422,6 @@ self: { description = "A fused-effects adapter for squeal-postgresql"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fused-effects-th" = callPackage @@ -105559,8 +105501,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.22.3"; - sha256 = "1si1hlax2vzaqcdprvgg8bcmk1xkwny5rb30fc3n8h0i0fpdmbic"; + version = "0.22.7"; + sha256 = "0vld3wms8y3bzl7m8lvc6xlcxq80ipi7rfk1wkfjddzzqg5gmnl7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105975,6 +105917,7 @@ self: { description = "Interface to the FXPak/FXPak Pro USB interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "g-npm" = callPackage @@ -106145,6 +106088,21 @@ self: { broken = true; }) {}; + "gambler" = callPackage + ({ mkDerivation, base, criterion, hspec }: + mkDerivation { + pname = "gambler"; + version = "0.0.0.0"; + sha256 = "1bbnczw8771jv0ds082r3babf28214p99lx0f97y4hxcsi29f096"; + revision = "1"; + editedCabalFile = "12wkc92pdpiks8mn375n2yjkjq9b1n0q6vnyyslf0b58p9b9flgw"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Composable, streaming, and efficient left folds"; + license = lib.licenses.bsd3; + }) {}; + "game-of-life" = callPackage ({ mkDerivation, array, base, hscurses, hspec, random, text }: mkDerivation { @@ -106931,8 +106889,8 @@ self: { }: mkDerivation { pname = "gemcap"; - version = "0.1.0"; - sha256 = "0173dhqdcfkkrlj3x3m0fml4rk3sfmiflwfp9bnpja7iq9br2vhf"; + version = "0.1.0.1"; + sha256 = "16ggh7axw9di8b9mwl4hjiqkhl2cqmr9lkd330gshwy8xrrc5ig0"; libraryHaskellDepends = [ base bytestring io-streams network tcp-streams text tls transformers x509 @@ -106970,9 +106928,7 @@ self: { ]; description = "Generate CSV Exports of Your Gemini Trades, Transfers, & Earn Transactions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "gemini-exports"; - broken = true; }) {}; "gemini-router" = callPackage @@ -106990,6 +106946,7 @@ self: { ]; description = "A simple Happstack-style Gemini router"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "gemini-server" = callPackage @@ -107006,6 +106963,8 @@ self: { ]; description = "A lightweight server for the Gemini protocol"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "gemini-textboard" = callPackage @@ -107156,6 +107115,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "general-allocate" = callPackage + ({ mkDerivation, base, containers, mtl, primitive, resourcet + , safe-exceptions, transformers + }: + mkDerivation { + pname = "general-allocate"; + version = "0.2.0.1"; + sha256 = "0n6szggdafnn8s3s4n737q8s8d1jfnz9cb4v25rsz508q56mghzl"; + libraryHaskellDepends = [ + base containers mtl primitive resourcet safe-exceptions + transformers + ]; + description = "Exception-safe resource management in more monads"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "general-games" = callPackage ({ mkDerivation, base, hspec, HUnit, monad-loops, MonadRandom , random, random-shuffle @@ -107232,7 +107209,6 @@ self: { description = "stringly-named getters for generic data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "generic-aeson" = callPackage @@ -107252,17 +107228,6 @@ self: { }) {}; "generic-arbitrary" = callPackage - ({ mkDerivation, base, QuickCheck }: - mkDerivation { - pname = "generic-arbitrary"; - version = "0.2.2"; - sha256 = "12yj55lrddyxr3wfcki0pvcfa181p3q65chziw8qrmszn219yjsx"; - libraryHaskellDepends = [ base QuickCheck ]; - description = "Generic implementation for QuickCheck's Arbitrary"; - license = lib.licenses.mit; - }) {}; - - "generic-arbitrary_1_0_1" = callPackage ({ mkDerivation, base, deepseq, QuickCheck, tasty, tasty-discover , tasty-hunit, tasty-quickcheck }: @@ -107278,7 +107243,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Generic implementation for QuickCheck's Arbitrary"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "generic-binary" = callPackage @@ -107324,31 +107288,6 @@ self: { }) {}; "generic-data" = callPackage - ({ mkDerivation, ap-normalize, base, base-orphans, contravariant - , criterion, deepseq, generic-lens, ghc-boot-th, inspection-testing - , one-liner, show-combinators, tasty, tasty-hunit, template-haskell - , unordered-containers - }: - mkDerivation { - pname = "generic-data"; - version = "0.9.2.1"; - sha256 = "0hs5ahl1nx61kw5j0pnwgjrph7jgqq0djma956ksz6aivzldjf7q"; - revision = "1"; - editedCabalFile = "01ly8r9s34pj8i7ppjclclx3fmnv24lhic1n7cjz5cdk3cxa8klc"; - libraryHaskellDepends = [ - ap-normalize base base-orphans contravariant ghc-boot-th - show-combinators - ]; - testHaskellDepends = [ - base generic-lens inspection-testing one-liner show-combinators - tasty tasty-hunit template-haskell unordered-containers - ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; - description = "Deriving instances with GHC.Generics and related utilities"; - license = lib.licenses.mit; - }) {}; - - "generic-data_1_0_0_0" = callPackage ({ mkDerivation, ap-normalize, base, base-orphans, contravariant , criterion, deepseq, generic-lens, ghc-boot-th, one-liner , show-combinators, tasty, tasty-hunit @@ -107367,7 +107306,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Deriving instances with GHC.Generics and related utilities"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "generic-data-surgery" = callPackage @@ -107455,20 +107393,6 @@ self: { }) {}; "generic-functor" = callPackage - ({ mkDerivation, ap-normalize, base, transformers }: - mkDerivation { - pname = "generic-functor"; - version = "0.2.0.0"; - sha256 = "0zrjsn78ip9kigqgw5cxzm9d7pqf1svdzrc3rm041889ca0szwjv"; - revision = "3"; - editedCabalFile = "1b14y3qhwzp2gkby5zflwad1v8v26wnclb7wnjagy67pvhnnn93d"; - libraryHaskellDepends = [ ap-normalize base ]; - testHaskellDepends = [ base transformers ]; - description = "Deriving generalized functors with GHC.Generics"; - license = lib.licenses.mit; - }) {}; - - "generic-functor_1_1_0_0" = callPackage ({ mkDerivation, ap-normalize, base, transformers }: mkDerivation { pname = "generic-functor"; @@ -107478,7 +107402,6 @@ self: { testHaskellDepends = [ base transformers ]; description = "Deriving generalized functors with GHC.Generics"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "generic-labels" = callPackage @@ -107592,6 +107515,8 @@ self: { libraryHaskellDepends = [ base generics-sop ]; description = "First class pattern matching"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "generic-maybe" = callPackage @@ -107734,6 +107659,8 @@ self: { ]; description = "GenericPretty canonical instances"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "generic-random" = callPackage @@ -107757,6 +107684,8 @@ self: { libraryHaskellDepends = [ base ]; description = "Magic record operations using generics"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "generic-server" = callPackage @@ -107811,9 +107740,7 @@ self: { executableHaskellDepends = [ base ]; description = "A map, where the keys may be complex structured data"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "bogus"; - broken = true; }) {}; "generic-xml" = callPackage @@ -108128,6 +108055,8 @@ self: { libraryHaskellDepends = [ base mtl template-haskell ]; description = "Use Template Haskell to generate Uniplate-like functions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "geniserver" = callPackage @@ -108181,20 +108110,6 @@ self: { }) {}; "genvalidity" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random - , validity - }: - mkDerivation { - pname = "genvalidity"; - version = "1.0.0.1"; - sha256 = "1rkrw46mhb4cvvg69avmbvsmssg5aii9g2kb4xqa9488jf8wz3m0"; - libraryHaskellDepends = [ base QuickCheck random validity ]; - testHaskellDepends = [ base hspec hspec-core QuickCheck ]; - description = "Testing utilities for the validity library"; - license = lib.licenses.mit; - }) {}; - - "genvalidity_1_1_0_0" = callPackage ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random , validity }: @@ -108206,7 +108121,6 @@ self: { testHaskellDepends = [ base hspec hspec-core QuickCheck ]; description = "Testing utilities for the validity library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-aeson" = callPackage @@ -108264,31 +108178,6 @@ self: { }) {}; "genvalidity-bytestring" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, genvalidity - , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck - , random, validity, validity-bytestring - }: - mkDerivation { - pname = "genvalidity-bytestring"; - version = "1.0.0.0"; - sha256 = "0bsi0y05pivyx14cvl7w46fgp1y5b53w2bk07q3vgzk079vfrcrg"; - libraryHaskellDepends = [ - base bytestring genvalidity QuickCheck random validity - validity-bytestring - ]; - testHaskellDepends = [ - base bytestring deepseq genvalidity genvalidity-hspec hspec - QuickCheck validity - ]; - benchmarkHaskellDepends = [ - base bytestring criterion genvalidity genvalidity-criterion - QuickCheck - ]; - description = "GenValidity support for ByteString"; - license = lib.licenses.mit; - }) {}; - - "genvalidity-bytestring_1_0_0_1" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, genvalidity , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck , random, validity, validity-bytestring @@ -108311,7 +108200,6 @@ self: { ]; description = "GenValidity support for ByteString"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-case-insensitive" = callPackage @@ -108338,30 +108226,6 @@ self: { }) {}; "genvalidity-containers" = callPackage - ({ mkDerivation, base, containers, criterion, genvalidity - , genvalidity-criterion, genvalidity-hspec, genvalidity-property - , hspec, QuickCheck, validity, validity-containers - }: - mkDerivation { - pname = "genvalidity-containers"; - version = "1.0.0.0"; - sha256 = "146nnn1k82js6vkgx3ys5nl251jbryqg1lvb56fd3849az68px3k"; - libraryHaskellDepends = [ - base containers genvalidity QuickCheck validity validity-containers - ]; - testHaskellDepends = [ - base containers genvalidity genvalidity-hspec genvalidity-property - hspec QuickCheck validity validity-containers - ]; - benchmarkHaskellDepends = [ - base containers criterion genvalidity genvalidity-criterion - QuickCheck - ]; - description = "GenValidity support for containers"; - license = lib.licenses.mit; - }) {}; - - "genvalidity-containers_1_0_0_1" = callPackage ({ mkDerivation, base, containers, criterion, genvalidity , genvalidity-criterion, genvalidity-hspec, genvalidity-property , hspec, QuickCheck, validity, validity-containers @@ -108383,27 +108247,9 @@ self: { ]; description = "GenValidity support for containers"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-criterion" = callPackage - ({ mkDerivation, base, criterion, deepseq, genvalidity, QuickCheck - }: - mkDerivation { - pname = "genvalidity-criterion"; - version = "1.0.0.0"; - sha256 = "050i515v8wggamlnywmx93nlb8gqhnlf5qafsrn0gl5w8d82blc9"; - libraryHaskellDepends = [ - base criterion deepseq genvalidity QuickCheck - ]; - benchmarkHaskellDepends = [ - base criterion genvalidity QuickCheck - ]; - description = "Criterion benchmarks for generators"; - license = lib.licenses.mit; - }) {}; - - "genvalidity-criterion_1_1_0_0" = callPackage ({ mkDerivation, base, criterion, deepseq, genvalidity, QuickCheck , vector }: @@ -108419,7 +108265,6 @@ self: { ]; description = "Criterion benchmarks for generators"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-hspec" = callPackage @@ -108642,26 +108487,6 @@ self: { }) {}; "genvalidity-path" = callPackage - ({ mkDerivation, base, criterion, genvalidity - , genvalidity-criterion, genvalidity-hspec, hspec, path, QuickCheck - , validity-path - }: - mkDerivation { - pname = "genvalidity-path"; - version = "1.0.0.0"; - sha256 = "172gss10xl274s95l3ywgra32ldnl2a4gicc1xgi5q7v5zmj5gaa"; - libraryHaskellDepends = [ - base genvalidity path QuickCheck validity-path - ]; - testHaskellDepends = [ base genvalidity-hspec hspec path ]; - benchmarkHaskellDepends = [ - base criterion genvalidity genvalidity-criterion path QuickCheck - ]; - description = "GenValidity support for Path"; - license = lib.licenses.mit; - }) {}; - - "genvalidity-path_1_0_0_1" = callPackage ({ mkDerivation, base, criterion, genvalidity , genvalidity-criterion, genvalidity-hspec, hspec, path, QuickCheck , validity-path @@ -108679,7 +108504,6 @@ self: { ]; description = "GenValidity support for Path"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-persistent" = callPackage @@ -108872,26 +108696,6 @@ self: { }) {}; "genvalidity-time" = callPackage - ({ mkDerivation, base, criterion, genvalidity - , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck, time - , validity-time - }: - mkDerivation { - pname = "genvalidity-time"; - version = "1.0.0.0"; - sha256 = "15xj7x915524h0hi9b6c7y6imwkv3g7b10cr7wx8yaysh5d1cx7r"; - libraryHaskellDepends = [ - base genvalidity QuickCheck time validity-time - ]; - testHaskellDepends = [ base genvalidity-hspec hspec time ]; - benchmarkHaskellDepends = [ - base criterion genvalidity-criterion time - ]; - description = "GenValidity support for time"; - license = lib.licenses.mit; - }) {}; - - "genvalidity-time_1_0_0_1" = callPackage ({ mkDerivation, base, criterion, genvalidity , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck, time , validity-time @@ -108909,7 +108713,6 @@ self: { ]; description = "GenValidity support for time"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-typed-uuid" = callPackage @@ -108958,28 +108761,6 @@ self: { }) {}; "genvalidity-uuid" = callPackage - ({ mkDerivation, base, criterion, genvalidity - , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck, uuid - , validity, validity-uuid - }: - mkDerivation { - pname = "genvalidity-uuid"; - version = "1.0.0.0"; - sha256 = "1w53ziz3zbm4dv64gr60md5riis28bi3lrznzsrjyvd6nngxx460"; - libraryHaskellDepends = [ - base genvalidity QuickCheck uuid validity validity-uuid - ]; - testHaskellDepends = [ - base genvalidity genvalidity-hspec hspec QuickCheck uuid - ]; - benchmarkHaskellDepends = [ - base criterion genvalidity genvalidity-criterion QuickCheck uuid - ]; - description = "GenValidity support for UUID"; - license = lib.licenses.mit; - }) {}; - - "genvalidity-uuid_1_0_0_1" = callPackage ({ mkDerivation, base, criterion, genvalidity , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck, uuid , validity, validity-uuid @@ -108999,7 +108780,6 @@ self: { ]; description = "GenValidity support for UUID"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-vector" = callPackage @@ -109058,6 +108838,7 @@ self: { ]; description = "High precision conversion between GPS and UK Grid"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "geocalc" = callPackage @@ -109237,8 +109018,8 @@ self: { }: mkDerivation { pname = "geomancy"; - version = "0.2.4.0"; - sha256 = "1wc9fza03afha1ni7jh9gpm39k20d6n5kmjgkpd06aqpf6yaqfcl"; + version = "0.2.4.1"; + sha256 = "0rnp4ma5gxxd2lf9n36ifbw2jr0nl6jfxqzvvp86mlvs3a7jpsxd"; libraryHaskellDepends = [ base containers deepseq mono-traversable simple-affine-space ]; @@ -109408,7 +109189,6 @@ self: { license = "unknown"; hydraPlatforms = lib.platforms.none; mainProgram = "gf"; - broken = true; }) {}; "ggtsTC" = callPackage @@ -109468,7 +109248,7 @@ self: { mainProgram = "gh-pocket-knife"; }) {}; - "ghc_9_4_2" = callPackage + "ghc_9_4_4" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, Cabal , containers, deepseq, deriveConstants, directory, exceptions , filepath, genprimopcode, ghc-boot, ghc-heap, ghci, happy, hpc @@ -109477,8 +109257,8 @@ self: { }: mkDerivation { pname = "ghc"; - version = "9.4.2"; - sha256 = "1xqcc807pdlm2108iz138dh90ppa3v9swb0nfd790va1xvqdvn4c"; + version = "9.4.4"; + sha256 = "0s97l24miwwi0i9c1jgf7rqlmlc13qfncvp56d8wax4jzjlaa99c"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -109504,6 +109284,7 @@ self: { description = "GHC-API compatibility helpers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ghc-api-compat_8_10_7" = callPackage @@ -109517,6 +109298,7 @@ self: { description = "GHC-API compatibility helpers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ghc-api-compat" = callPackage @@ -109528,6 +109310,8 @@ self: { libraryHaskellDepends = [ base containers ghc ]; description = "GHC-API compatibility helpers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ghc-bignum_1_3" = callPackage @@ -109610,15 +109394,15 @@ self: { "ghc-check" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc - , ghc-paths, process, safe-exceptions, template-haskell, th-compat - , transformers + , ghc-boot, ghc-paths, process, safe-exceptions, template-haskell + , th-compat, transformers }: mkDerivation { pname = "ghc-check"; version = "0.5.0.8"; sha256 = "1m3w1l8gkc7g9p7d07h3f71687rgs9lb5ildgfr1ihxp7wssh98h"; libraryHaskellDepends = [ - base containers directory filepath ghc ghc-paths process + base containers directory filepath ghc ghc-boot ghc-paths process safe-exceptions template-haskell th-compat transformers ]; description = "detect mismatches between compile-time and run-time versions of the ghc api"; @@ -109741,8 +109525,8 @@ self: { }: mkDerivation { pname = "ghc-debug-brick"; - version = "0.3.0.0"; - sha256 = "1ss8gi5x26p7lpcrdq961abz5q0lmnhyyv6x0l1dqsnqxfy71iv4"; + version = "0.4.0.0"; + sha256 = "1xdk23pzfa7q74rrxw26n47ki7iawysnf9liq6r9m92vll7nmq6y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109765,8 +109549,8 @@ self: { }: mkDerivation { pname = "ghc-debug-client"; - version = "0.3.0.0"; - sha256 = "0lr9yjgipfaqg22imxrka3srjm6bcb1illxg018pgl6l7hbpp4k7"; + version = "0.4.0.0"; + sha256 = "0r007lp3vpphcfzlv8p6k2w8r4f65if0kdh990d3pfj4m84xg81i"; libraryHaskellDepends = [ async base binary bitwise bytestring containers contra-tracer directory dom-lt eventlog2html filepath ghc-debug-common @@ -109777,6 +109561,7 @@ self: { description = "Useful functions for writing heap analysis tools which use ghc-debug"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ghc-debug-common" = callPackage @@ -109786,8 +109571,8 @@ self: { }: mkDerivation { pname = "ghc-debug-common"; - version = "0.3.0.0"; - sha256 = "1nb1m8lks5d0svzdl2y1pww0afdc4ywc30myih170w3mf0cs2rld"; + version = "0.4.0.0"; + sha256 = "1h3a1j97xnfpki25nsc80kql751xz59i3cvcf12qh97ii2vziwk5"; libraryHaskellDepends = [ array base binary bytestring containers cpu deepseq directory dom-lt filepath ghc-debug-convention ghc-heap hashable transformers @@ -109795,20 +109580,17 @@ self: { ]; description = "Connect to a socket created by ghc-debug-stub and analyse the heap of the debuggee program"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-debug-convention" = callPackage ({ mkDerivation, base, directory, filepath }: mkDerivation { pname = "ghc-debug-convention"; - version = "0.3.0.0"; - sha256 = "0y7z7xqx5vn6bvx90rvhhajk0jxmp1i1qyhmq7hwhvlyb4p87282"; + version = "0.4.0.0"; + sha256 = "0mmghsf4g4hwls1cldmqzjq9sfnwwp0d94ahxryxd0dla7x423s6"; libraryHaskellDepends = [ base directory filepath ]; description = "Definitions needed by ghc-debug-stub and ghc-debug-common"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ghc-debug-stub" = callPackage @@ -109817,14 +109599,13 @@ self: { }: mkDerivation { pname = "ghc-debug-stub"; - version = "0.3.0.0"; - sha256 = "0m7zngjlcijddz5xrns8531aim3am8y1rki4qj04gvbh7pdq5q3c"; + version = "0.4.0.0"; + sha256 = "0qnshkk3cw26l6x8c415l4s99qkpq5hgl1p7n85w8kbi1xzlgm0w"; libraryHaskellDepends = [ base directory filepath ghc-debug-convention ghc-prim ]; description = "Functions for instrumenting your application so the heap can be analysed with ghc-debug-common"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-definitions-th" = callPackage @@ -109924,28 +109705,28 @@ self: { }: mkDerivation { pname = "ghc-events"; - version = "0.17.0.3"; - sha256 = "0m50x2ycv43d7yzwksbs1zc11wlyiszjz662fj47v9r7hacx335v"; + version = "0.18.0"; + sha256 = "0kwml9dgbj0px4bc3d9kqmw2ijc3y7irs4n02nzm7ilgcvy7hv6h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base binary bytestring containers text vector ]; - executableHaskellDepends = [ base containers ]; + executableHaskellDepends = [ base bytestring containers ]; testHaskellDepends = [ base ]; description = "Library and tool for parsing .eventlog files from GHC"; license = lib.licenses.bsd3; mainProgram = "ghc-events"; }) {}; - "ghc-events_0_18_0" = callPackage + "ghc-events_0_19_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers, text , vector }: mkDerivation { pname = "ghc-events"; - version = "0.18.0"; - sha256 = "0kwml9dgbj0px4bc3d9kqmw2ijc3y7irs4n02nzm7ilgcvy7hv6h"; + version = "0.19.0"; + sha256 = "034wy6rb51xi0avkcn1gy4sj6yf479hwd8y0zxrhqp4y7wb7bjx5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110011,7 +109792,7 @@ self: { broken = true; }) {}; - "ghc-exactprint" = callPackage + "ghc-exactprint_0_6_4" = callPackage ({ mkDerivation, base, bytestring, containers, Diff, directory , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl , silently, syb @@ -110034,10 +109815,14 @@ self: { ]; description = "ExactPrint for GHC"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; - "ghc-exactprint_1_5_0" = callPackage - ({ mkDerivation }: + "ghc-exactprint" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default, Diff + , directory, fail, filemanip, filepath, free, ghc, ghc-boot + , ghc-paths, HUnit, mtl, ordered-containers, silently, syb + }: mkDerivation { pname = "ghc-exactprint"; version = "1.5.0"; @@ -110046,17 +109831,25 @@ self: { editedCabalFile = "1v6my8bnhjhw7k3v2q9iwjpz9lj5g6ilvlzdq6svcabxahmzbr2c"; isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers data-default directory fail filepath + free ghc ghc-boot ghc-paths mtl ordered-containers syb + ]; + testHaskellDepends = [ + base bytestring containers data-default Diff directory fail + filemanip filepath ghc ghc-boot ghc-paths HUnit mtl + ordered-containers silently syb + ]; description = "ExactPrint for GHC"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; - "ghc-exactprint_1_6_1" = callPackage + "ghc-exactprint_1_6_1_1" = callPackage ({ mkDerivation }: mkDerivation { pname = "ghc-exactprint"; - version = "1.6.1"; - sha256 = "1ihr3mffcm0z4plkgysiki5l225ayrxgjfjqx37ysqgp7vvnsr08"; + version = "1.6.1.1"; + sha256 = "0dzl5nhiwi6a5jq226qjq0vlb70iq50hk0kv0h675j4pr93v50w8"; isLibrary = true; isExecutable = true; description = "ExactPrint for GHC"; @@ -110261,27 +110054,6 @@ self: { }) {}; "ghc-lib" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , deepseq, directory, exceptions, filepath, ghc-lib-parser - , ghc-prim, happy, hpc, parsec, pretty, process, rts, time - , transformers, unix - }: - mkDerivation { - pname = "ghc-lib"; - version = "9.0.2.20211226"; - sha256 = "0988500fwl24nh1i2pv22332sx8hgi6b2229ff3drd9jgpp886x1"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory - exceptions filepath ghc-lib-parser ghc-prim hpc parsec pretty - process rts time transformers unix - ]; - libraryToolDepends = [ alex happy ]; - description = "The GHC API, decoupled from GHC versions"; - license = lib.licenses.bsd3; - }) {}; - - "ghc-lib_9_2_5_20221107" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts, time @@ -110300,10 +110072,9 @@ self: { libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib_9_4_3_20221104" = callPackage + "ghc-lib_9_4_4_20221225" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts, stm, time @@ -110311,8 +110082,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.4.3.20221104"; - sha256 = "0qvlf7i5lk7d4q8kaq4b783kvrswl9q5idlw3ggqhph910bgvcwn"; + version = "9.4.4.20221225"; + sha256 = "0cl2w63gafv64q8v4ymvwa79yxwx9jh285zr68qncchmm67cnzql"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -110346,26 +110117,6 @@ self: { }) {}; "ghc-lib-parser" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec - , pretty, process, time, transformers, unix - }: - mkDerivation { - pname = "ghc-lib-parser"; - version = "9.0.2.20211226"; - sha256 = "0krf99pfnyfly22y5pgfsgpxfvbax9jivzjkhgg67hl0synladvz"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory - exceptions filepath ghc-prim parsec pretty process time - transformers unix - ]; - libraryToolDepends = [ alex happy ]; - description = "The GHC API, decoupled from GHC versions"; - license = lib.licenses.bsd3; - }) {}; - - "ghc-lib-parser_9_2_5_20221107" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix @@ -110383,18 +110134,17 @@ self: { libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib-parser_9_4_3_20221104" = callPackage + "ghc-lib-parser_9_4_4_20221225" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.4.3.20221104"; - sha256 = "10j4vfpajr716bnipfr1rfc6r99gdfc3pjmp80lqdsfzv7xfbgj4"; + version = "9.4.4.20221225"; + sha256 = "0av5c7phk0lc8nnaacm5v0cah1hiihw3kqf7cavphhadw06dixk7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -110434,8 +110184,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "9.0.0.6"; - sha256 = "1lqhddx4sw2d407q12ny1ims4khjxgajlk07wvrw0wcgmx91dmc7"; + version = "9.2.0.4"; + sha256 = "138wkpy7qpdkp07028flab3lwq4b3mns0qcrkfrhclixlz8pi74v"; libraryHaskellDepends = [ base bytestring containers ghc ghc-boot ghc-boot-th uniplate ]; @@ -110447,26 +110197,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser-ex_9_2_0_4" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, extra - , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate - }: - mkDerivation { - pname = "ghc-lib-parser-ex"; - version = "9.2.0.4"; - sha256 = "138wkpy7qpdkp07028flab3lwq4b3mns0qcrkfrhclixlz8pi74v"; - libraryHaskellDepends = [ - base bytestring containers ghc-lib-parser uniplate - ]; - testHaskellDepends = [ - base directory extra filepath ghc-lib-parser tasty tasty-hunit - uniplate - ]; - description = "Algorithms on GHC parse trees"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "ghc-lib-parser-ex_9_2_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate @@ -110768,8 +110498,8 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.4.1.11"; - sha256 = "1i6a3dx9ml8r4q8rvap7rw3qhvksgaws1hzna34ldpkwh6b7kfxy"; + version = "1.4.1.12"; + sha256 = "15gshlj8jp85m9y05z1wmssq5rkqyix9890hy1rkmy7nmkhij6mj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110983,13 +110713,13 @@ self: { }: mkDerivation { pname = "ghc-syntax-highlighter"; - version = "0.0.7.0"; - sha256 = "123kvcdlzx18n14122xbpp587byfd8w0z886grlxkzinb53bmzg6"; + version = "0.0.8.0"; + sha256 = "1s6bq90s75qfiv54qsskawv3ihwjhdml4fxq56ww01p54mnrwr27"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base ghc-lib-parser text ]; testHaskellDepends = [ base hspec text ]; testToolDepends = [ hspec-discover ]; - description = "Syntax highlighter for Haskell using lexer of GHC itself"; + description = "Syntax highlighter for Haskell using the lexer of GHC"; license = lib.licenses.bsd3; }) {}; @@ -111011,9 +110741,9 @@ self: { "ghc-tags" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring - , containers, deepseq, directory, filepath, ghc-lib, ghc-paths - , optparse-applicative, process, stm, temporary, text, time, vector - , yaml + , containers, deepseq, directory, filepath, ghc, ghc-boot + , ghc-paths, optparse-applicative, process, stm, temporary, text + , time, vector, yaml }: mkDerivation { pname = "ghc-tags"; @@ -111023,14 +110753,12 @@ self: { isExecutable = true; executableHaskellDepends = [ aeson async attoparsec base bytestring containers deepseq directory - filepath ghc-lib ghc-paths optparse-applicative process stm + filepath ghc ghc-boot ghc-paths optparse-applicative process stm temporary text time vector yaml ]; description = "Utility for generating ctags and etags with GHC API"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; mainProgram = "ghc-tags"; - broken = true; }) {}; "ghc-tags-core" = callPackage @@ -111235,6 +110963,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-typelits-presburger_0_7_1_0" = callPackage + ({ mkDerivation, base, containers, equational-reasoning, ghc + , ghc-tcplugins-extra, mtl, pretty, reflection, syb, tasty + , tasty-discover, tasty-expected-failure, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "ghc-typelits-presburger"; + version = "0.7.1.0"; + sha256 = "03lgzfn0vhcnfyyhb2d2shjwhinzk293k0yjlv6wac2yxxfrvnaj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra mtl pretty reflection syb + transformers + ]; + testHaskellDepends = [ + base equational-reasoning tasty tasty-discover + tasty-expected-failure tasty-hunit text + ]; + testToolDepends = [ tasty-discover ]; + description = "Presburger Arithmetic Solver for GHC Type-level natural numbers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-usage" = callPackage ({ mkDerivation, base, containers, ghc, ghc-paths, unix }: mkDerivation { @@ -111311,8 +111065,8 @@ self: { }: mkDerivation { pname = "ghci-dap"; - version = "0.0.19.0"; - sha256 = "07f0q83pcma3c0v7sdkkb1nzx40f55v47v44gaa2pg6clkl7p1gx"; + version = "0.0.20.0"; + sha256 = "11jzlvv48fvp87p2rkz3rab0707fb3yq0lz1146zh44adpkgf5vb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111522,12 +111276,11 @@ self: { , exceptions, extra, filepath, fingertree, focus, fuzzy, ghc , ghc-boot, ghc-boot-th, ghc-check, ghc-paths, ghc-trace-events , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable - , heapsize, hie-bios, hie-compat, hiedb, hls-graph, hls-plugin-api - , 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, QuickCheck, random - , record-dot-preprocessor, record-hasfield, regex-tdfa + , hie-bios, hie-compat, hiedb, hls-graph, hls-plugin-api, 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, QuickCheck, random, regex-tdfa , safe-exceptions, shake, sorted-list, sqlite-simple, stm , stm-containers, syb, tasty, tasty-expected-failure, tasty-hunit , tasty-quickcheck, tasty-rerun, text, text-rope, time @@ -111536,8 +111289,8 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "1.8.0.0"; - sha256 = "0j46xlaphmsmfpiycdi2n24mydvrb3c20sw2zzqm396x5ziz9p8p"; + version = "1.9.0.0"; + sha256 = "0sjqnh6hgr6w3c26ilz4l6l858m7wk7yg4674s43wy4c72fxww34"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111546,29 +111299,25 @@ self: { data-default deepseq dependent-map dependent-sum Diff directory dlist enummapset exceptions extra filepath fingertree focus ghc ghc-boot ghc-boot-th ghc-check ghc-paths ghc-trace-events Glob - 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 opentelemetry - optparse-applicative parallel prettyprinter - prettyprinter-ansi-terminal random regex-tdfa safe-exceptions - sorted-list sqlite-simple stm stm-containers syb text text-rope - time transformers unix unliftio unliftio-core unordered-containers - vector + haddock-library hashable hie-bios hie-compat hiedb hls-graph + hls-plugin-api hslogger implicit-hie implicit-hie-cradle lens + list-t lsp lsp-types mtl opentelemetry optparse-applicative + parallel prettyprinter prettyprinter-ansi-terminal random + regex-tdfa safe-exceptions sorted-list sqlite-simple stm + stm-containers syb text text-rope time transformers unix unliftio + unliftio-core unordered-containers vector ]; executableHaskellDepends = [ - aeson base data-default directory extra filepath ghc gitrev - hashable heapsize hie-bios hiedb hls-graph hls-plugin-api lens lsp - lsp-types optparse-applicative safe-exceptions text - unordered-containers + base data-default extra gitrev hls-plugin-api lsp lsp-types + optparse-applicative ]; testHaskellDepends = [ aeson async base containers data-default directory extra filepath fuzzy ghc ghc-typelits-knownnat hls-plugin-api lens list-t lsp lsp-test lsp-types monoid-subclasses network-uri QuickCheck random - record-dot-preprocessor record-hasfield regex-tdfa shake - sqlite-simple stm stm-containers tasty tasty-expected-failure - tasty-hunit tasty-quickcheck tasty-rerun text text-rope - unordered-containers + regex-tdfa shake sqlite-simple stm stm-containers tasty + tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun + text text-rope unordered-containers ]; testToolDepends = [ implicit-hie ]; description = "The core of an IDE"; @@ -111586,8 +111335,8 @@ self: { }: mkDerivation { pname = "ghcide-bench"; - version = "0.1"; - sha256 = "0l7sablv85dgyzj12rbn0az704mzx4hjbm6kz88223kwn71qnnzz"; + version = "0.1.1"; + sha256 = "1ypb1wpy19an37aq457579y6jq6cic9anq53y5f6gdf09whlcv12"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111617,8 +111366,8 @@ self: { }: mkDerivation { pname = "ghcide-test-utils"; - version = "1.8.0.0"; - sha256 = "171y27lkngnsv26qd1wga5yfdjrz48bmz1nzwrskfcfws8hwizd7"; + version = "1.9.0.0"; + sha256 = "0f4xxw2y4bmihy8ydi569g11r9w7i6bcrsgk3ap9al98l059xdk6"; libraryHaskellDepends = [ aeson base containers data-default directory extra filepath ghcide hls-plugin-api lens lsp-test lsp-types tasty-hunit text @@ -111715,6 +111464,7 @@ self: { description = "GHCJS DOM Hello World, an example package"; license = lib.licenses.mit; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; }) {}; "ghcjs-dom-jsaddle" = callPackage @@ -111964,7 +111714,6 @@ self: { license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "ghcup"; - broken = true; }) {}; "ghczdecode" = callPackage @@ -112077,7 +111826,7 @@ self: { ]; libraryPkgconfigDepends = [ cairo ]; preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + PKG_CONFIG_PATH+=":${lib.getDev cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; description = "Cairo bindings"; @@ -112787,6 +112536,8 @@ self: { ]; description = "Declarative GTK+ programming in Haskell"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "gi-gtk-declarative-app-simple" = callPackage @@ -112808,6 +112559,7 @@ self: { ]; description = "Declarative GTK+ programming in Haskell in the style of Pux"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; }) {}; "gi-gtk-hs" = callPackage @@ -113091,7 +112843,7 @@ self: { ]; libraryPkgconfigDepends = [ cairo pango ]; preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + PKG_CONFIG_PATH+=":${lib.getDev cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; description = "Pango bindings"; @@ -113118,13 +112870,11 @@ self: { ]; libraryPkgconfigDepends = [ cairo pango ]; preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + PKG_CONFIG_PATH+=":${lib.getDev cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; description = "PangoCairo bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; "gi-poppler" = callPackage @@ -113358,8 +113108,8 @@ self: { "gi-xlib" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers - , xlibsWrapper + , haskell-gi-base, haskell-gi-overloading, libX11, text + , transformers }: mkDerivation { pname = "gi-xlib"; @@ -113370,10 +113120,10 @@ self: { base bytestring containers haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ xlibsWrapper ]; + libraryPkgconfigDepends = [ libX11 ]; description = "xlib bindings"; license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) xlibsWrapper;}; + }) {inherit (pkgs.xorg) libX11;}; "giak" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers @@ -113452,9 +113202,7 @@ self: { ]; description = "An implementation of the Jinja2 template language in Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "ginger"; - broken = true; }) {}; "gingersnap" = callPackage @@ -113546,6 +113294,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "gipeda"; + broken = true; }) {}; "giphy-api" = callPackage @@ -113666,8 +113415,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20221103"; - sha256 = "0fwg74ldw2paq9dr052hqjz2x219zkkramvm8jskpnnnch9c6jgm"; + version = "10.20221212"; + sha256 = "0afnl2w29w4j0229rsla93dzkmhcjlp8dv76sr861n186ywv8rzg"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -113720,20 +113469,23 @@ self: { inherit (pkgs) which;}; "git-brunch" = callPackage - ({ mkDerivation, base, brick, hspec, microlens - , optparse-applicative, process, vector, vty + ({ mkDerivation, base, brick, extra, hspec, microlens + , microlens-mtl, mtl, optparse-applicative, process, text, vector + , vty }: mkDerivation { pname = "git-brunch"; - version = "1.5.1.0"; - sha256 = "057xsm5jzzrmivfxd40abph63lyy0q7pmfs2wvadlkhyhcb8nvgv"; + version = "1.6.0.0"; + sha256 = "1crpcv68lpfl0cs6cxmi7mcd1vawmif6qz1n0j2in49ypr75qkdk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base brick hspec microlens optparse-applicative process vector vty + base brick extra hspec microlens microlens-mtl mtl + optparse-applicative process text vector vty ]; testHaskellDepends = [ - base brick hspec microlens optparse-applicative process vector vty + base brick extra hspec microlens microlens-mtl mtl + optparse-applicative process text vector vty ]; description = "git checkout command-line tool"; license = lib.licenses.bsd3; @@ -113983,7 +113735,6 @@ self: { ]; description = "Passively snapshots working tree changes efficiently"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "git-monitor"; }) {}; @@ -114200,38 +113951,6 @@ self: { }) {}; "github" = callPackage - ({ mkDerivation, aeson, base, base-compat, base16-bytestring - , binary, binary-instances, bytestring, containers, cryptohash-sha1 - , deepseq, deepseq-generics, exceptions, file-embed, hashable - , hspec, hspec-discover, http-client, http-client-tls - , http-link-header, http-types, iso8601-time, mtl, network-uri - , tagged, text, time-compat, tls, transformers, transformers-compat - , unordered-containers, vector, vector-instances - }: - mkDerivation { - pname = "github"; - version = "0.27"; - sha256 = "0vlqsdhhjnfw9wk5vn1i8cmwa45vgczhz4nn46mwgs600xfn94am"; - revision = "1"; - editedCabalFile = "02424a74kjzmwl0nwc4gl7xg0cgdsbspwj3mzzzgx5xxlh3vi212"; - libraryHaskellDepends = [ - aeson base base-compat base16-bytestring binary binary-instances - bytestring containers cryptohash-sha1 deepseq deepseq-generics - exceptions hashable http-client http-client-tls http-link-header - http-types iso8601-time mtl network-uri tagged text time-compat tls - transformers transformers-compat unordered-containers vector - vector-instances - ]; - testHaskellDepends = [ - aeson base base-compat bytestring file-embed hspec tagged text - unordered-containers vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Access to the GitHub API, v3"; - license = lib.licenses.bsd3; - }) {}; - - "github_0_28_0_1" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , binary, binary-instances, bytestring, containers, cryptohash-sha1 , deepseq, deepseq-generics, exceptions, file-embed, hashable @@ -114258,7 +113977,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Access to the GitHub API, v3"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "github-backup" = callPackage @@ -114369,8 +114087,8 @@ self: { pname = "github-rest"; version = "1.1.2"; sha256 = "139ysq1m1ndy6z1znfd1np25ynxankkfm6xmwabhdr7yiqzi2v1b"; - revision = "1"; - editedCabalFile = "09vinl6l5jy8bz504bhw3g2baj9fc0fym2vnh8q76xzmz2s0b686"; + revision = "2"; + editedCabalFile = "0390zxa270d8x8a0imd71z72l6hxnn1ip6jjgrrvrs3zj20c7adp"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types jwt mtl scientific text time transformers unliftio unliftio-core @@ -114482,8 +114200,8 @@ self: { }: mkDerivation { pname = "github-webhooks"; - version = "0.15.0"; - sha256 = "0cmavbh7c59pimspjj42mwlac5jmlgagjsw4239hcsrna5yi4wdz"; + version = "0.16.0"; + sha256 = "1h0l4p0wyy4d6k43gxjfjx2fv0a59xd900dr14ydxdjn75yhc7g0"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite deepseq deepseq-generics memory text time vector @@ -114493,15 +114211,15 @@ self: { license = lib.licenses.mit; }) {}; - "github-webhooks_0_16_0" = callPackage + "github-webhooks_0_17_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time , vector }: mkDerivation { pname = "github-webhooks"; - version = "0.16.0"; - sha256 = "1h0l4p0wyy4d6k43gxjfjx2fv0a59xd900dr14ydxdjn75yhc7g0"; + version = "0.17.0"; + sha256 = "06dh28yqhjmh4gks0r20x6cn1974a0cx1yr3n55l3slr1w9j46bv"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite deepseq deepseq-generics memory text time vector @@ -114731,8 +114449,6 @@ self: { ]; description = "Libgit2 backend for gitlib"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gitlib-s3" = callPackage @@ -114857,7 +114573,6 @@ self: { description = "A document store library for Git + JSON"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gitter" = callPackage @@ -115317,15 +115032,14 @@ self: { "gll" = callPackage ({ mkDerivation, array, base, containers, pretty, regex-applicative - , text, time, TypeCompose + , text, time }: mkDerivation { pname = "gll"; - version = "0.4.0.13"; - sha256 = "1kw1wmc59fz87z8xwdbg9988ghvhdyfj594cxnd28gw0z04gsz4m"; + version = "0.4.1.0"; + sha256 = "00gdgyglm4vif41sbi5wx8r69bnvp8ap5wfi4ahxz51ykhmwl2ka"; libraryHaskellDepends = [ array base containers pretty regex-applicative text time - TypeCompose ]; description = "GLL parser with simple combinator interface"; license = lib.licenses.bsd3; @@ -115440,21 +115154,6 @@ self: { }) {}; "gloss" = callPackage - ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim - , gloss-rendering, GLUT, OpenGL - }: - mkDerivation { - pname = "gloss"; - version = "1.13.2.1"; - sha256 = "0ladpnk2zw27bz895b9gphhrmawb0gwvzrmnisk56msjdxwqq5pn"; - libraryHaskellDepends = [ - base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL - ]; - description = "Painless 2D vector graphics, animations and simulations"; - license = lib.licenses.mit; - }) {}; - - "gloss_1_13_2_2" = callPackage ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim , gloss-rendering, GLUT, OpenGL }: @@ -115467,7 +115166,6 @@ self: { ]; description = "Painless 2D vector graphics, animations and simulations"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "gloss-accelerate" = callPackage @@ -115632,21 +115330,6 @@ self: { }) {}; "gloss-rendering" = callPackage - ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: - mkDerivation { - pname = "gloss-rendering"; - version = "1.13.1.1"; - sha256 = "1pkzm7zzfdya8cz3h66akx8785h3vxbnyb815liw4nilvwg01d9x"; - revision = "1"; - editedCabalFile = "10x83cpxp6yrmamjg4kjm3pzlhh6zj2rdw686py0vcx0jrjy3qg7"; - libraryHaskellDepends = [ - base bmp bytestring containers GLUT OpenGL - ]; - description = "Gloss picture data types and rendering functions"; - license = lib.licenses.mit; - }) {}; - - "gloss-rendering_1_13_1_2" = callPackage ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: mkDerivation { pname = "gloss-rendering"; @@ -115657,7 +115340,6 @@ self: { ]; description = "Gloss picture data types and rendering functions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "gloss-sodium" = callPackage @@ -115673,20 +115355,15 @@ self: { }) {}; "glpk-headers" = callPackage - ({ mkDerivation, base, derive-storable, glpk, tasty, tasty-discover - , tasty-hunit - }: + ({ mkDerivation, base, derive-storable, glpk, hspec }: mkDerivation { pname = "glpk-headers"; - version = "0.4.1"; - sha256 = "1r77p0h9iyffl903ag008cb3v21jw021129cfxpr2mp1mgnkhdjd"; + version = "0.5.0"; + sha256 = "1v9wq6y4qa6m5l6z27rwgjk0s7q8gklq05djmqspm6c456f1z2q5"; libraryHaskellDepends = [ base derive-storable ]; - testHaskellDepends = [ - base derive-storable tasty tasty-discover tasty-hunit - ]; - testSystemDepends = [ glpk ]; - testToolDepends = [ tasty-discover ]; - description = "Low-level Haskell bindings to GLPK"; + librarySystemDepends = [ glpk ]; + testHaskellDepends = [ base hspec ]; + description = "Low-level Haskell bindings to the GLPK library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -115765,20 +115442,22 @@ self: { }: mkDerivation { pname = "gltf-loader"; - version = "0.2.0.1"; - sha256 = "0dx4v2sffg6ffzf5asvc18a2k258qyh68sxmcdf4ycfr5wfskl15"; + version = "0.3.0.0"; + sha256 = "0xzcnv9alp78y61s52n8palqnp9jdyz0d9ggx2cqlh2xyf8020xl"; + revision = "1"; + editedCabalFile = "1xxnzvj8lksk10kzaf89xm26vafbfkixhji8zankz9cg63fwmsz1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring gltf-codec linear microlens rio - unordered-containers + base binary bytestring gltf-codec linear microlens + microlens-platform rio unordered-containers ]; executableHaskellDepends = [ base linear microlens microlens-platform optparse-simple rio ]; testHaskellDepends = [ - base base64 binary bytestring gltf-codec hspec linear microlens rio - unordered-containers + base base64 binary bytestring gltf-codec hspec linear microlens + microlens-platform rio unordered-containers ]; description = "High level GlTF loader"; license = lib.licenses.mit; @@ -115922,8 +115601,6 @@ self: { ]; description = "turtle like LOGO with glut"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gmail-simple" = callPackage @@ -116383,9 +116060,7 @@ self: { executableHaskellDepends = [ base criterion megaparsec text ]; description = "Megaparsec parser for Godot `tscn` and `gdextension` files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "bench"; - broken = true; }) {}; "gofer-prelude" = callPackage @@ -118821,6 +118496,7 @@ self: { ]; description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "google-oauth2" = callPackage @@ -118955,6 +118631,8 @@ self: { ]; description = "Bindings to the Google Maps Static API (formerly Static Maps API)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "google-translate" = callPackage @@ -119308,6 +118986,8 @@ self: { ]; description = "A Haskell Vault KVv2 secret engine client"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "gotta-go-fast" = callPackage @@ -119326,7 +119006,9 @@ self: { ]; description = "A command line utility for practicing typing"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "gotta-go-fast"; + broken = true; }) {}; "gotyno-hs" = callPackage @@ -119419,8 +119101,8 @@ self: { }: mkDerivation { pname = "gpmf"; - version = "0.1.1.1"; - sha256 = "1yl84ghhif3h485gg618ig006kph7ifri0jmi0bwii7da4i1ahsi"; + version = "0.1.2.0"; + sha256 = "0z0l1jl7am48lc8c92jb6l12r5khgil9d5n2rrp53n7ncsljbh1n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119728,7 +119410,6 @@ self: { description = "Functional Reactive Programming core"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "grapefruit-records" = callPackage @@ -120276,14 +119957,15 @@ self: { }: mkDerivation { pname = "graphmod"; - version = "1.4.4"; - sha256 = "12q9kkxyyma23dgzpdnlsrklk20isr4jf2yslkzyb6ny5xmfxsac"; - isLibrary = false; + version = "1.4.5.1"; + sha256 = "1k1nji14wfn36jym0fqc3yfiwd6gimyk109njrp7b1ds8zfp0ayp"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ base Cabal containers directory dotgen filepath haskell-lexer pretty ]; + executableHaskellDepends = [ base ]; description = "Present the module dependencies of a program as a \"dot\" graph"; license = lib.licenses.bsd3; mainProgram = "graphmod"; @@ -120311,23 +119993,23 @@ self: { }) {}; "graphql" = callPackage - ({ mkDerivation, aeson, base, conduit, containers, exceptions - , hspec, hspec-expectations, hspec-megaparsec, megaparsec - , parser-combinators, QuickCheck, scientific, template-haskell - , text, transformers, unordered-containers, vector + ({ mkDerivation, base, conduit, containers, exceptions, hspec + , hspec-expectations, hspec-megaparsec, megaparsec + , parser-combinators, QuickCheck, template-haskell, text + , transformers, unordered-containers, vector }: mkDerivation { pname = "graphql"; - version = "1.0.3.0"; - sha256 = "10b8kqzbw1cb3ylb16v7ps1qxr11irz4546plq0y1ah7cbrgs3d3"; + version = "1.1.0.0"; + sha256 = "07k87v5a9mbpap0n9lra5h4r45359831z7z0ihcibv8nzkkwy798"; libraryHaskellDepends = [ - aeson base conduit containers exceptions hspec-expectations - megaparsec parser-combinators scientific template-haskell text - transformers unordered-containers vector + base conduit containers exceptions megaparsec parser-combinators + template-haskell text transformers unordered-containers vector ]; testHaskellDepends = [ - base conduit containers exceptions hspec hspec-megaparsec - megaparsec QuickCheck text unordered-containers vector + base conduit containers exceptions hspec hspec-expectations + hspec-megaparsec megaparsec QuickCheck text unordered-containers + vector ]; description = "Haskell GraphQL implementation"; license = "MPL-2.0 AND BSD-3-Clause"; @@ -120373,8 +120055,10 @@ self: { }: mkDerivation { pname = "graphql-client"; - version = "1.2.0"; - sha256 = "1570gsfz3f2dlqpmmb00kr2hcjsfz9p4knfnwvjcm2lij7avcvnp"; + version = "1.2.1"; + sha256 = "02wrwb5vgj4px6m178wmfzzy1d2h6018wj106n0j4lzbxyh107iy"; + revision = "1"; + editedCabalFile = "0483nnw03ddv94w02ffr93p5h4aabyv738fbf4qp1v0lrzd54v5k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120382,13 +120066,11 @@ self: { template-haskell text transformers unliftio-core ]; executableHaskellDepends = [ - aeson aeson-schemas base bytestring file-embed http-client - http-client-tls http-types mtl optparse-applicative path path-io - template-haskell text transformers typed-process unliftio-core + base bytestring file-embed optparse-applicative path path-io + template-haskell typed-process ]; testHaskellDepends = [ - aeson aeson-schemas base http-client http-client-tls http-types mtl - tasty tasty-hunit template-haskell text transformers unliftio-core + aeson aeson-schemas base mtl tasty tasty-hunit ]; description = "A client for Haskell programs to query a GraphQL API"; license = lib.licenses.bsd3; @@ -120725,9 +120407,8 @@ self: { "greenclip" = callPackage ({ mkDerivation, base, binary, bytestring, directory, exceptions - , hashable, libXau, libXScrnSaver, microlens, microlens-mtl + , hashable, libX11, libXau, libXScrnSaver, microlens, microlens-mtl , protolude, text, tomland, unix, vector, wordexp, X11, xcb, xdmcp - , xlibsWrapper }: mkDerivation { pname = "greenclip"; @@ -120740,13 +120421,13 @@ self: { microlens-mtl protolude text tomland unix vector wordexp X11 ]; executablePkgconfigDepends = [ - libXau libXScrnSaver xcb xdmcp xlibsWrapper + libX11 libXau libXScrnSaver xcb xdmcp ]; description = "Simple clipboard manager to be integrated with rofi"; license = lib.licenses.bsd3; mainProgram = "greenclip"; - }) {inherit (pkgs.xorg) libXScrnSaver; inherit (pkgs.xorg) libXau; - xcb = null; xdmcp = null; inherit (pkgs) xlibsWrapper;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; + inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null;}; "greg-client" = callPackage ({ mkDerivation, base, binary, bytestring, clock, hostname, network @@ -120813,7 +120494,6 @@ self: { description = "Practical Deep Learning in Haskell"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "greplicate" = callPackage @@ -120835,46 +120515,45 @@ self: { }) {}; "greskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover - , exceptions, greskell-core, hashable, hspec, hspec-discover - , semigroups, should-not-typecheck, text, transformers - , unordered-containers, vector + ({ mkDerivation, aeson, base, bytestring, exceptions, greskell-core + , hashable, hspec, hspec-discover, semigroups, should-not-typecheck + , text, transformers, unordered-containers, vector }: mkDerivation { pname = "greskell"; - version = "2.0.0.0"; - sha256 = "0havwzskc9abganrgj991r7szcagzw4vkm8qh6b7xqykdf4479xv"; + version = "2.0.2.0"; + sha256 = "1hlqy041d7qxvvhbv7lki852m9bvviml5b48vs0x299i4z9mhprx"; libraryHaskellDepends = [ aeson base exceptions greskell-core hashable semigroups text transformers unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring doctest doctest-discover greskell-core hspec - should-not-typecheck text unordered-containers + aeson base bytestring greskell-core hspec should-not-typecheck text + unordered-containers ]; - testToolDepends = [ doctest-discover hspec-discover ]; + testToolDepends = [ hspec-discover ]; description = "Haskell binding for Gremlin graph query language"; license = lib.licenses.bsd3; }) {}; "greskell-core" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest - , doctest-discover, hashable, hspec, hspec-discover, QuickCheck - , scientific, semigroups, text, unordered-containers, uuid, vector + ({ mkDerivation, aeson, base, bytestring, containers, hashable + , hspec, hspec-discover, QuickCheck, scientific, semigroups, text + , unordered-containers, uuid, vector }: mkDerivation { pname = "greskell-core"; - version = "1.0.0.0"; - sha256 = "0b86rwghrbqzqk5vb9n6qsc4a12pbnwvvy20wdiv1g51dpyi440a"; + version = "1.0.0.1"; + sha256 = "1pjsx1cjm18k2x0h2b80y7qv666c2w5w2gz49qi0vdhx1kgrnzvr"; libraryHaskellDepends = [ - aeson base containers hashable scientific semigroups text - unordered-containers uuid vector + aeson base bytestring containers hashable scientific semigroups + text unordered-containers uuid vector ]; testHaskellDepends = [ - aeson base bytestring doctest doctest-discover hspec QuickCheck - text unordered-containers vector + aeson base bytestring hspec QuickCheck text unordered-containers + vector ]; - testToolDepends = [ doctest-discover hspec-discover ]; + testToolDepends = [ hspec-discover ]; description = "Haskell binding for Gremlin graph query language - core data types and tools"; license = lib.licenses.bsd3; }) {}; @@ -120886,8 +120565,8 @@ self: { }: mkDerivation { pname = "greskell-websocket"; - version = "1.0.0.0"; - sha256 = "1nw8jz843080w6jq4j8bmqv9pz66va1yp36a0d1vkybhdhlxs5vy"; + version = "1.0.0.1"; + sha256 = "1r9bs5aswh4kxsmwylpizp2b9xiwljic5h18k6qr9i2hgmpshqcn"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring greskell-core hashtables safe-exceptions stm text unordered-containers uuid @@ -121026,6 +120705,24 @@ self: { }) {}; "gridtables" = callPackage + ({ mkDerivation, array, base, containers, doclayout, parsec, tasty + , tasty-hunit, text + }: + mkDerivation { + pname = "gridtables"; + version = "0.0.3.0"; + sha256 = "1akix9flnax6dx3s9c7yyzb19nw13y8rmh0kz7y3hpjlkaz659xy"; + revision = "1"; + editedCabalFile = "0m2651z81n8s6hb8id7y6k2kprsgwnj7pcd6p8lmdpkzzz3wwd0c"; + libraryHaskellDepends = [ + array base containers doclayout parsec text + ]; + testHaskellDepends = [ array base parsec tasty tasty-hunit text ]; + description = "Parser for reStructuredText-style grid tables"; + license = lib.licenses.mit; + }) {}; + + "gridtables_0_1_0_0" = callPackage ({ mkDerivation, array, base, containers, doclayout, parsec, tasty , tasty-hunit, text }: @@ -121039,6 +120736,7 @@ self: { testHaskellDepends = [ array base parsec tasty tasty-hunit text ]; description = "Parser for reStructuredText-style grid tables"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "grm" = callPackage @@ -121164,6 +120862,8 @@ self: { ]; description = "Type-safe datatype-database mapping library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "groundhog-converters" = callPackage @@ -121226,7 +120926,6 @@ self: { description = "MySQL backend for the groundhog library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "groundhog-postgresql" = callPackage @@ -121245,6 +120944,7 @@ self: { ]; description = "PostgreSQL backend for the groundhog library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "groundhog-sqlite" = callPackage @@ -121262,6 +120962,7 @@ self: { ]; description = "Sqlite3 backend for the groundhog library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "groundhog-th" = callPackage @@ -121281,7 +120982,6 @@ self: { description = "Type-safe datatype-database mapping library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "group-by-date" = callPackage @@ -121300,7 +121000,9 @@ self: { ]; description = "Shell command for grouping files by dates into folders"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "group-by-date"; + broken = true; }) {}; "group-theory" = callPackage @@ -121404,11 +121106,13 @@ self: { ({ mkDerivation, base, generic-data, groups }: mkDerivation { pname = "groups-generic"; - version = "0.2.0.0"; - sha256 = "0a13x4dc114qz5r97cpg2bbdch1kn6gfmndf9glqx2nbhx6qg654"; + version = "0.3.1.0"; + sha256 = "1v9mw478x6kfv38m13kypfmz9w8vn3xkvff3gy9g7x29aq5bvjfy"; libraryHaskellDepends = [ base generic-data groups ]; description = "Generically derive Group instances"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "grow-vector" = callPackage @@ -121428,6 +121132,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Mutable vector with efficient appends"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "growler" = callPackage @@ -121616,8 +121322,8 @@ self: { }: mkDerivation { pname = "gscholar-rss"; - version = "0.3.0.0"; - sha256 = "1hvmnzfh4qqbx41kih1py9hn9kxkribk8vfj0wx9i8v0sac5g87s"; + version = "0.3.0.2"; + sha256 = "0nxkn5irbijfrlmm7z9jyw6mahdwgmr42kmlzd7wzdfnz58dbqrr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121791,7 +121497,6 @@ self: { description = "GTFS RealTime protobafs library (autogenerated from .proto file)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gtk" = callPackage @@ -121974,16 +121679,16 @@ self: { }) {}; "gtk-traymanager" = callPackage - ({ mkDerivation, base, glib, gtk3, xlibsWrapper }: + ({ mkDerivation, base, glib, gtk3, libX11 }: mkDerivation { pname = "gtk-traymanager"; version = "1.0.1"; sha256 = "0vc1gwhg5l7l5iqb1i3zwd1bsy8fxsiwkwzza7j15zi07f97k7di"; libraryHaskellDepends = [ base glib gtk3 ]; - libraryPkgconfigDepends = [ xlibsWrapper ]; + libraryPkgconfigDepends = [ libX11 ]; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) xlibsWrapper;}; + }) {inherit (pkgs.xorg) libX11;}; "gtk2hs-buildtools" = callPackage ({ mkDerivation, alex, array, base, Cabal, containers, directory @@ -122373,6 +122078,21 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "gvti" = callPackage + ({ mkDerivation, base, directory, mmsyn3, process }: + mkDerivation { + pname = "gvti"; + version = "0.2.0.1"; + sha256 = "1bbkzp795h06xgsdfl5sssxi851l7h0ck8jfc5wdbqx9dpcv46x6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory mmsyn3 process ]; + executableHaskellDepends = [ base directory mmsyn3 process ]; + description = "GraphViz Tabular Interface"; + license = lib.licenses.mit; + mainProgram = "gvti"; + }) {}; + "gw" = callPackage ({ mkDerivation, base, unix }: mkDerivation { @@ -122481,23 +122201,24 @@ self: { }) {}; "h-raylib" = callPackage - ({ mkDerivation, base, c, libGL, libX11, libXcursor, libXext, libXi + ({ mkDerivation, base, c, libGL, libX11, libXcursor, libXi , libXinerama, libXrandr }: mkDerivation { pname = "h-raylib"; - version = "4.5.0.3"; - sha256 = "05k7z23fkjdwlq379vcd9ahqch52hkwlpmy774xafrbh2wrfli3d"; + version = "4.5.0.10"; + sha256 = "0qpr04gv0zjnpigmxzls5jsx3d98cl9127z8ljy743m5j0ff5z6f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ]; librarySystemDepends = [ - c libGL libX11 libXcursor libXext libXi libXinerama libXrandr + c libGL libX11 libXcursor libXi libXinerama libXrandr ]; description = "Raylib bindings for Haskell"; license = lib.licenses.asl20; }) {c = null; inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; - inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; - inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; - inherit (pkgs.xorg) libXrandr;}; + inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXi; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr;}; "h-reversi" = callPackage ({ mkDerivation, base, blank-canvas, containers, hspec, QuickCheck @@ -122572,14 +122293,15 @@ self: { }: mkDerivation { pname = "hArduino"; - version = "1.1"; - sha256 = "1xpv4z6lgphq5cy1kz9navyrkx4p83bbvjc5dhlp948cd0fsn17b"; + version = "1.2"; + sha256 = "160k6p5spr6z06qrrgb6fyh8fjdjsywzs0jpnwf4yqfn7kaggqwh"; + revision = "1"; + editedCabalFile = "06jxrr2chksq9j5xd2ns5sbvmb5ispxpajlc1b5nkf39hi8brqxm"; libraryHaskellDepends = [ base bytestring containers mtl serialport time ]; description = "Control your Arduino board from Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hBDD" = callPackage @@ -122910,6 +122632,8 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring ]; description = "haskell implementation of RESP (REdis Serialization Protocol)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hS3" = callPackage @@ -123225,6 +122949,7 @@ self: { libraryHaskellDepends = [ base bytestring cgi containers hack ]; description = "Allows programs written against MonadCGI to run with any hack handler. (deprecated)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hack-handler-cgi" = callPackage @@ -123307,7 +123032,6 @@ self: { description = "Hack Happstack server handler"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hack-handler-hyena" = callPackage @@ -123340,7 +123064,6 @@ self: { description = "Hack Kibro handler"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hack-handler-simpleserver" = callPackage @@ -123441,6 +123164,8 @@ self: { ]; description = "Hack2 contrib"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hack2-contrib-extra" = callPackage @@ -123459,6 +123184,7 @@ self: { ]; description = "Hack2 contrib extra"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hack2-handler-happstack-server" = callPackage @@ -123625,7 +123351,7 @@ self: { ]; description = "Access cabal-install's Hackage database via Data.Map"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.peti ]; + maintainers = [ lib.maintainers.sternenseemann ]; }) {}; "hackage-diff" = callPackage @@ -123679,6 +123405,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "hackage-mirror"; + broken = true; }) {}; "hackage-plot" = callPackage @@ -123762,9 +123489,7 @@ self: { ]; description = "Manage secure file-based package repositories"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hackage-repo-tool"; - broken = true; }) {}; "hackage-security" = callPackage @@ -123777,10 +123502,8 @@ self: { }: mkDerivation { pname = "hackage-security"; - version = "0.6.2.2"; - sha256 = "0xmjw3frssdv3glhdg3yivdy38h5icz6xywngrahc19220ba6cx8"; - revision = "1"; - editedCabalFile = "01fhp3kzc1wfvixzgnz4y52bzm4sickk1cj7pksrwmbi90dghv0s"; + version = "0.6.2.3"; + sha256 = "0rm0avcc1k247qbrajhzi3vz92cgcc4nr3kbhhfmfm8rjxv0bvjj"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal Cabal-syntax containers cryptohash-sha256 directory ed25519 @@ -123804,8 +123527,8 @@ self: { pname = "hackage-security-HTTP"; version = "0.1.1.1"; sha256 = "14hp7gssf80b9937j7m56w8sxrv3hrzjf2s9kgfk76v6llgx79k2"; - revision = "3"; - editedCabalFile = "14cypbxm6njhxwxps9ac80nf1j00vgh9bwcyxx9h74z5hi7wdld2"; + revision = "4"; + editedCabalFile = "09hs3iidjlwdppm5q1vq58p70js11whhcl5nr73kv8zj1yh0ir3h"; libraryHaskellDepends = [ base bytestring hackage-security HTTP mtl network network-uri zlib ]; @@ -124014,28 +123737,29 @@ self: { "hackport" = callPackage ({ mkDerivation, array, async, base, base16-bytestring , base64-bytestring, binary, bytestring, containers - , cryptohash-sha256, deepseq, directory, doctest, echo, ed25519 - , edit-distance, extensible-exceptions, filepath, ghc-prim - , hashable, hspec, hspec-discover, HTTP, lifted-base, monad-control - , mtl, network, network-uri, optparse-applicative, parallel, parsec - , parser-combinators, pretty, process, QuickCheck, random - , regex-base, regex-posix, resolv, split, stm, tar - , template-haskell, text, time, transformers, unix, xml, zlib + , cryptohash-sha256, deepseq, directory, echo, ed25519 + , edit-distance, exceptions, extensible-exceptions, filepath + , ghc-prim, hashable, hspec, hspec-discover, HTTP, lifted-base + , lukko, monad-control, mtl, network, network-uri + , optparse-applicative, parallel, parsec, parser-combinators + , pretty, process, QuickCheck, random, regex-base, regex-posix + , resolv, safe-exceptions, split, stm, tar, template-haskell, text + , time, transformers, unix, xml, zlib }: mkDerivation { pname = "hackport"; - version = "0.7.3.0"; - sha256 = "0166ybpnb0ajp2afgi70lwwmkwbbgavj8mfpcksyaysbpa6zpl4m"; + version = "0.8.0.0"; + sha256 = "0z6mjzzfpf73cl93drdv3wmigrv3b3gr01xjs5di6j6xm2n4fwrf"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ array async base base16-bytestring base64-bytestring binary bytestring containers cryptohash-sha256 deepseq directory echo - ed25519 edit-distance extensible-exceptions filepath ghc-prim - hashable HTTP lifted-base monad-control mtl network network-uri - parallel parsec pretty process QuickCheck random regex-base - regex-posix resolv split stm tar template-haskell text time - transformers unix xml zlib + ed25519 edit-distance exceptions extensible-exceptions filepath + ghc-prim hashable HTTP lifted-base lukko monad-control mtl network + network-uri parallel parsec pretty process QuickCheck random + regex-base regex-posix resolv safe-exceptions split stm tar + template-haskell text time transformers unix xml zlib ]; executableHaskellDepends = [ base directory filepath optparse-applicative parsec @@ -124046,7 +123770,7 @@ self: { extensible-exceptions filepath hspec network-uri parallel parsec pretty process QuickCheck split text time xml ]; - testToolDepends = [ doctest hspec-discover ]; + testToolDepends = [ hspec-discover ]; doHaddock = false; description = "Hackage and Portage integration tool"; license = lib.licenses.gpl3Plus; @@ -124408,6 +124132,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "A simple Hadoop streaming library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hadoop-tools" = callPackage @@ -125331,33 +125057,6 @@ self: { }) {}; "hal" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , case-insensitive, conduit, conduit-extra, containers, envy - , exceptions, hashable, hedgehog, hspec, hspec-hedgehog - , http-client, http-types, mtl, raw-strings-qq, scientific, text - , time, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "hal"; - version = "0.4.10.1"; - sha256 = "1mxlyx0zxvklrybasx8p6di72aw431mbbyj06pb91570j9c46fp0"; - revision = "2"; - editedCabalFile = "143z15p6skr333f1vazhy5hn7rirpkn8zdfh3fzhz311ws7m7lg8"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring case-insensitive conduit - conduit-extra containers envy exceptions hashable http-client - http-types mtl scientific text time unordered-containers - ]; - testHaskellDepends = [ - aeson base base64-bytestring bytestring case-insensitive containers - hedgehog hspec hspec-hedgehog http-client http-types raw-strings-qq - scientific text time transformers unordered-containers vector - ]; - description = "A runtime environment for Haskell applications running on AWS Lambda"; - license = lib.licenses.bsd3; - }) {}; - - "hal_1_0_0_1" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, conduit, conduit-extra, containers, exceptions , hashable, hedgehog, hspec, hspec-hedgehog, http-client @@ -125380,7 +125079,6 @@ self: { ]; description = "A runtime environment for Haskell applications running on AWS Lambda"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "halberd" = callPackage @@ -125630,6 +125328,8 @@ self: { testHaskellDepends = [ base hedgehog lens ]; description = "Split or combine data structures to and from halves, quarters, eighths"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "halvm-web" = callPackage @@ -125679,6 +125379,7 @@ self: { license = "GPL"; hydraPlatforms = lib.platforms.none; mainProgram = "hamlog"; + broken = true; }) {}; "hamid" = callPackage @@ -125715,6 +125416,7 @@ self: { ]; description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hamilton-examples"; }) {}; @@ -126386,7 +126088,6 @@ self: { ]; description = "Happstack Authentication Library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "happstack-clientsession" = callPackage @@ -126506,6 +126207,7 @@ self: { ]; description = "Happstack extension for use with FastCGI"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "happstack-fay" = callPackage @@ -126679,7 +126381,6 @@ self: { ]; description = "Support for using JMacro with Happstack"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "happstack-lite" = callPackage @@ -126903,6 +126604,7 @@ self: { description = "Utilities for using YUI3 with Happstack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "happy_1_19_12" = callPackage @@ -126964,11 +126666,13 @@ self: { ({ mkDerivation, base, Chart, Chart-diagrams }: mkDerivation { pname = "happy-hour"; - version = "0.0.0.3"; - sha256 = "0icdx6lw9bbcchhwcr7q4yaprz9crhlq6gycb430100c2irlfnkw"; + version = "0.0.0.4"; + sha256 = "07cqp51hq9andw9pw5nbpqkcmk4q6a9xlspayfh964pvz7p0vsbv"; libraryHaskellDepends = [ base Chart Chart-diagrams ]; description = "Generate simple okay-looking bar plots without much effort"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "happy-meta" = callPackage @@ -127148,20 +126852,22 @@ self: { ]; description = "Deep embedding of hardware descriptions with code generation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "harfbuzz-pure" = callPackage ({ mkDerivation, base, bytestring, derive-storable, freetype2 - , harfbuzz, parallel, text, utf8-light + , harfbuzz, parallel, text }: mkDerivation { pname = "harfbuzz-pure"; - version = "1.0.0.0"; - sha256 = "1bydw57ab1qlicrs6cav3vk0jzqkvhnwb8c0k7ba48fmjyihi5fp"; + version = "1.0.0.1"; + sha256 = "1icdk19js4kqpw7krk0jl5yqilc52w7wchkylqr5p2zlrm92wp6k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring derive-storable freetype2 text utf8-light + base bytestring derive-storable freetype2 text ]; libraryPkgconfigDepends = [ harfbuzz ]; executableHaskellDepends = [ base bytestring parallel text ]; @@ -127366,6 +127072,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "This library 'Has' transformers"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.turion ]; }) {}; "hasbolt" = callPackage @@ -127391,6 +127098,8 @@ self: { ]; description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hasbolt-extras" = callPackage @@ -127416,6 +127125,7 @@ self: { testHaskellDepends = [ base doctest ]; description = "Extras for hasbolt library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "example"; }) {}; @@ -127497,7 +127207,9 @@ self: { ]; description = "A TUI for reviewing notes using 'flashcards' written with markdown-like syntax"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hascard"; + broken = true; }) {}; "hascas" = callPackage @@ -127656,18 +127368,18 @@ self: { }) {}; "hashable" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, ghc-bignum - , ghc-prim, HUnit, QuickCheck, random, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, unix + ({ mkDerivation, base, bytestring, containers, data-array-byte + , deepseq, filepath, ghc-bignum, ghc-prim, HUnit, QuickCheck + , random, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, unix }: mkDerivation { pname = "hashable"; - version = "1.3.5.0"; - sha256 = "11lqw6xbjzc1gpn4qlrqzq9kjgaw5pr7dgmx2rq1j6r7shndiams"; - revision = "1"; - editedCabalFile = "1mwilvbc5f4myxz4vj95kx6cqqn7nfjy99v8cmqdxy90napywars"; + version = "1.4.2.0"; + sha256 = "1y73606pcrs7zi6f4f07a5rkhc6620n1bx0adpa6j7xqhbm00h0v"; libraryHaskellDepends = [ - base bytestring containers deepseq ghc-bignum ghc-prim text + base bytestring containers data-array-byte deepseq filepath + ghc-bignum ghc-prim text ]; testHaskellDepends = [ base bytestring ghc-prim HUnit QuickCheck random test-framework @@ -127677,29 +127389,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "hashable_1_4_1_0" = callPackage - ({ mkDerivation, base, base-orphans, bytestring, containers - , deepseq, ghc-bignum, ghc-prim, HUnit, QuickCheck, random - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, unix - }: - mkDerivation { - pname = "hashable"; - version = "1.4.1.0"; - sha256 = "11sycr73821amdz8g0k8c97igi4z7f9xdvgaxlkxhsp6h310bcz1"; - libraryHaskellDepends = [ - base base-orphans bytestring containers deepseq ghc-bignum ghc-prim - text - ]; - testHaskellDepends = [ - base bytestring ghc-prim HUnit QuickCheck random test-framework - test-framework-hunit test-framework-quickcheck2 text unix - ]; - description = "A class for types that can be converted to a hash value"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "hashable-accelerate" = callPackage ({ mkDerivation, accelerate, base, template-haskell }: mkDerivation { @@ -127762,8 +127451,6 @@ self: { libraryHaskellDepends = [ base hashable sorted-list time-compat ]; description = "Provides instances missing from Hashable"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hashable-time" = callPackage @@ -127824,8 +127511,8 @@ self: { }: mkDerivation { pname = "hashes"; - version = "0.2.2.1"; - sha256 = "0ni9z93k89nsswzs4xmb78l7cq7142mg841b70lxgbf69i1wd8z8"; + version = "0.2.3"; + sha256 = "12j5wf6q6fzpc5wnln0b9jf5banamdj2hlsrkiid7i0b85z9vcvg"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ @@ -127871,10 +127558,8 @@ self: { }: mkDerivation { pname = "hashing"; - version = "0.1.0.1"; - sha256 = "044lyj8kyhrm8xs1v3z60g9zh8wdc1nvf79qvans1w6ndjfa3975"; - revision = "2"; - editedCabalFile = "1rwl68jiivw7f2f5cg73sr3dawlbmklnwyiwivrcsihrg4b1z1lq"; + version = "0.1.1.0"; + sha256 = "1a3ws6dlmm9gfpcipq2kx7mzbr0kn3faq2cfnavqdxy18ipvxnbi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base bytestring ]; @@ -127977,27 +127662,6 @@ self: { }) {}; "hashtables" = callPackage - ({ mkDerivation, base, ghc-prim, hashable, HUnit, mwc-random - , primitive, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, vector - }: - mkDerivation { - pname = "hashtables"; - version = "1.2.4.2"; - sha256 = "1z3h2h0wbiwzj9zs17bggynzgqa77gxcj8h4x28dq3sha81j5rx8"; - libraryHaskellDepends = [ - base ghc-prim hashable primitive vector - ]; - testHaskellDepends = [ - base ghc-prim hashable HUnit mwc-random primitive QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - vector - ]; - description = "Mutable hash tables in the ST monad"; - license = lib.licenses.bsd3; - }) {}; - - "hashtables_1_3_1" = callPackage ({ mkDerivation, base, ghc-prim, hashable, HUnit, mwc-random , primitive, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, vector @@ -128016,7 +127680,6 @@ self: { ]; description = "Mutable hash tables in the ST monad"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hashtables-plus" = callPackage @@ -128275,8 +127938,8 @@ self: { pname = "haskeline"; version = "0.8.2"; sha256 = "1pr7zik1138cj0463867i1qqb2bgsq716mryap18jx7zb9f1b7gc"; - revision = "2"; - editedCabalFile = "0ylww688l5nfgjw4z5clvr3pmm65axbsq06fg8rpbd2iqzsaz01s"; + revision = "3"; + editedCabalFile = "101qavk0fmc4c6qa307kswz3345psskxqyxhk6hmykynjm05jjrv"; configureFlags = [ "-fterminfo" ]; isLibrary = true; isExecutable = true; @@ -128374,6 +128037,7 @@ self: { ]; description = "Remote Management Platform for Haskell Applications"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "haskell-admin-core" = callPackage @@ -128395,6 +128059,8 @@ self: { ]; description = "Core Modules of Haskell Admin"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "haskell-admin-health" = callPackage @@ -128414,6 +128080,7 @@ self: { ]; description = "Application Health Component for Haskell Admin"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "haskell-admin-managed-functions" = callPackage @@ -128435,6 +128102,7 @@ self: { ]; description = "Managed Functions integration for Haskell Admin"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "haskell-aliyun" = callPackage @@ -128506,6 +128174,8 @@ self: { testHaskellDepends = [ base bytestring QuickCheck random ]; description = "A bcrypt implementation for haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "haskell-bitmex-client" = callPackage @@ -128655,8 +128325,6 @@ self: { libraryHaskellDepends = [ base process ]; description = "Simple CoffeeScript API"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-compression" = callPackage @@ -128715,8 +128383,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "haskell-dap"; - version = "0.0.15.0"; - sha256 = "1wk6813pwwnph7w1waci9q6r0glsjpayk27kr43zddwd2v0abcld"; + version = "0.0.16.0"; + sha256 = "091jy2dcci8a5sasgrnw26gbbii26p8gg62i1w2ih71rirkdi2r6"; libraryHaskellDepends = [ base containers ]; description = "Haskell implementation of the DAP interface data"; license = lib.licenses.bsd3; @@ -128731,8 +128399,8 @@ self: { }: mkDerivation { pname = "haskell-debug-adapter"; - version = "0.0.37.0"; - sha256 = "1srinycpz3zb86r6b1kyn0ikc8hd62vzgig9ki0lddrxjxc637gg"; + version = "0.0.38.0"; + sha256 = "14qqxyrj31j5jm3q467msl76srx0nvhpid9zjqy6qqq8bf7klhrm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128800,6 +128468,45 @@ self: { mainProgram = "haskell-docs"; }) {}; + "haskell-docs-cli" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, async, base, bytestring + , containers, directory, exceptions, extra, filepath, hashable + , haskeline, hoogle, html-conduit, http-client, http-client-tls + , http-types, mtl, network-uri, optparse-applicative, process + , temporary, terminal-size, text, time, transformers, xml-conduit + }: + mkDerivation { + pname = "haskell-docs-cli"; + version = "1.0.0.0"; + sha256 = "0rz2lgkwddq6q74iscj1268agfrkx6cslpx4w9hs9dcrsifrg7f1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint async base bytestring containers directory + exceptions extra filepath hashable haskeline hoogle html-conduit + http-client http-client-tls http-types mtl network-uri + optparse-applicative process temporary terminal-size text time + transformers xml-conduit + ]; + executableHaskellDepends = [ + aeson ansi-wl-pprint async base bytestring containers directory + exceptions extra filepath hashable haskeline hoogle html-conduit + http-client http-client-tls http-types mtl network-uri + optparse-applicative process temporary terminal-size text time + transformers xml-conduit + ]; + testHaskellDepends = [ + aeson ansi-wl-pprint async base bytestring containers directory + exceptions extra filepath hashable haskeline hoogle html-conduit + http-client http-client-tls http-types mtl network-uri + optparse-applicative process temporary terminal-size text time + transformers xml-conduit + ]; + description = "Search Hoogle and navigate Hackage from the command line"; + license = lib.licenses.bsd3; + mainProgram = "hdc"; + }) {}; + "haskell-eigen-util" = callPackage ({ mkDerivation, base, eigen, vector }: mkDerivation { @@ -129115,43 +128822,46 @@ self: { , base16-bytestring, binary, bytestring, containers , cryptohash-sha1, data-default, deepseq, directory, extra , filepath, ghc, ghc-boot-th, ghc-paths, ghcide, ghcide-bench - , githash, gitrev, hashable, hie-bios, hiedb - , hls-alternate-number-format-plugin, hls-call-hierarchy-plugin + , ghcide-test-utils, githash, gitrev, hashable, hie-bios, hiedb + , hls-alternate-number-format-plugin, hls-cabal-fmt-plugin + , hls-cabal-plugin, hls-call-hierarchy-plugin , hls-change-type-signature-plugin, hls-class-plugin , hls-code-range-plugin, hls-eval-plugin , hls-explicit-fixity-plugin, hls-explicit-imports-plugin - , hls-floskell-plugin, hls-fourmolu-plugin, hls-gadt-plugin - , hls-graph, hls-haddock-comments-plugin, hls-hlint-plugin + , hls-explicit-record-fields-plugin, hls-floskell-plugin + , hls-fourmolu-plugin, hls-gadt-plugin, hls-graph, hls-hlint-plugin , hls-module-name-plugin, hls-ormolu-plugin, hls-plugin-api , hls-pragmas-plugin, hls-qualify-imported-names-plugin , hls-refactor-plugin, hls-refine-imports-plugin, hls-rename-plugin , hls-retrie-plugin, hls-splice-plugin, hls-stylish-haskell-plugin - , hls-tactics-plugin, hls-test-utils, hp2pretty, hslogger - , hspec-expectations, implicit-hie, lens, lens-aeson, lsp, lsp-test - , lsp-types, mtl, optparse-applicative, optparse-simple - , prettyprinter, process, regex-tdfa, safe-exceptions, shake - , shake-bench, sqlite-simple, stm, temporary, text, transformers - , unix, unliftio-core, unordered-containers, yaml + , hls-test-utils, hp2pretty, hslogger, hspec-expectations + , implicit-hie, lens, lens-aeson, lsp, lsp-test, lsp-types, mtl + , optparse-applicative, optparse-simple, prettyprinter, process + , regex-tdfa, safe-exceptions, shake, shake-bench, sqlite-simple + , stm, temporary, text, transformers, unix, unliftio-core + , unordered-containers, yaml }: mkDerivation { pname = "haskell-language-server"; - version = "1.8.0.0"; - sha256 = "0jmc9qfqq5r7skajma6vd84p7vj8a7k37mk7yzwrqs66f48wcc54"; + version = "1.9.0.0"; + sha256 = "1bxf3q4yzchqvasxvidbsr0mzf299w2n11g3m85fmxm4q9bc1lkp"; + revision = "1"; + editedCabalFile = "19y9wid97a2c6x8cx2zq2r0asr8x0wlnvxmrj9qhfpvmk05sqrpm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson-pretty async base base16-bytestring bytestring containers cryptohash-sha1 data-default directory extra filepath ghc ghcide githash hie-bios hiedb hls-alternate-number-format-plugin - hls-call-hierarchy-plugin hls-change-type-signature-plugin - hls-class-plugin hls-code-range-plugin hls-eval-plugin - hls-explicit-fixity-plugin hls-explicit-imports-plugin + hls-cabal-fmt-plugin hls-cabal-plugin hls-call-hierarchy-plugin + hls-change-type-signature-plugin hls-class-plugin + hls-code-range-plugin hls-eval-plugin hls-explicit-fixity-plugin + hls-explicit-imports-plugin hls-explicit-record-fields-plugin hls-floskell-plugin hls-fourmolu-plugin hls-gadt-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-refactor-plugin - hls-refine-imports-plugin hls-rename-plugin hls-retrie-plugin - hls-splice-plugin hls-stylish-haskell-plugin hls-tactics-plugin lsp + hls-hlint-plugin hls-module-name-plugin hls-ormolu-plugin + hls-plugin-api hls-pragmas-plugin hls-qualify-imported-names-plugin + hls-refactor-plugin hls-refine-imports-plugin hls-rename-plugin + hls-retrie-plugin hls-splice-plugin hls-stylish-haskell-plugin lsp optparse-applicative optparse-simple prettyprinter process safe-exceptions sqlite-simple text unordered-containers ]; @@ -129165,10 +128875,11 @@ self: { transformers unix unliftio-core unordered-containers ]; testHaskellDepends = [ - aeson base bytestring containers data-default directory extra - filepath ghcide hls-plugin-api hls-refactor-plugin hls-test-utils - hspec-expectations lens lens-aeson lsp-test lsp-types prettyprinter - process text unordered-containers + aeson base bytestring containers data-default deepseq directory + extra filepath ghcide ghcide-test-utils hashable hls-plugin-api + hls-refactor-plugin hls-test-utils hspec-expectations lens + lens-aeson lsp-test lsp-types prettyprinter process text + unordered-containers ]; testToolDepends = [ ghcide ]; benchmarkHaskellDepends = [ @@ -129186,11 +128897,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "haskell-lexer"; - version = "1.1"; - sha256 = "1mb3np20ig0hbgnfxrzr3lczq7ya4p76g20lvnxch8ikck61afii"; + version = "1.1.1"; + sha256 = "0jgkv1api3w7i9j5z01h7qdx2i9cp93h54hp9hj1bw9hk9bdmvn8"; libraryHaskellDepends = [ base ]; description = "A fully compliant Haskell 98 lexer"; - license = lib.licenses.bsd3; + license = lib.licenses.mit; }) {}; "haskell-lsp" = callPackage @@ -129223,7 +128934,6 @@ self: { description = "Haskell library for the Microsoft Language Server Protocol"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-lsp-client" = callPackage @@ -129265,6 +128975,8 @@ self: { ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "haskell-menu" = callPackage @@ -130455,6 +130167,7 @@ self: { executableToolDepends = [ hspec-discover ]; description = "Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "haskell-xmpp-io-test"; }) {}; @@ -131295,8 +131008,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bitcoin & Bitcoin Cash library for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskoin-crypto" = callPackage @@ -131351,7 +131062,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "P2P library for Bitcoin and Bitcoin Cash"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "haskoin-protocol" = callPackage @@ -131482,7 +131192,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Data for Haskoin Store"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "haskoin-util" = callPackage @@ -131550,6 +131259,7 @@ self: { description = "Implementation of a Bitcoin SPV Wallet with BIP32 and multisig support"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "haskoon" = callPackage @@ -132056,7 +131766,6 @@ self: { description = "Haskus binary format manipulation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskus-system-build" = callPackage @@ -132076,6 +131785,7 @@ self: { ]; description = "Haskus system build tool"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "haskus-system-build"; }) {}; @@ -132099,6 +131809,7 @@ self: { ]; description = "Haskus utility modules"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "haskus-utils-compat" = callPackage @@ -132167,6 +131878,8 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ]; description = "Variant and EADT"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "haskus-web" = callPackage @@ -132289,21 +132002,20 @@ self: { }) {}; "haspara" = callPackage - ({ mkDerivation, aeson, base, containers, doctest, exceptions - , hashable, megaparsec, mtl, refined, safe-decimal, scientific - , template-haskell, text, time + ({ mkDerivation, aeson, base, containers, data-default, doctest + , exceptions, hashable, hspec, megaparsec, mtl, refined + , safe-decimal, scientific, template-haskell, text, time }: mkDerivation { pname = "haspara"; - version = "0.0.0.5"; - sha256 = "1y1zgsr2ba8m8rjwias1xqx61p1g081pxxwaas14blq5ijcp9ivz"; + version = "0.0.0.8"; + sha256 = "1yvzzkv0hbki5a5rp6md2kllrslafb26lkz4i9hfydllxqgrm0is"; libraryHaskellDepends = [ - aeson base containers exceptions hashable megaparsec mtl refined - safe-decimal scientific template-haskell text time + aeson base containers data-default exceptions hashable megaparsec + mtl refined safe-decimal scientific template-haskell text time ]; testHaskellDepends = [ - aeson base containers doctest exceptions hashable megaparsec mtl - refined safe-decimal scientific template-haskell text time + base containers data-default doctest hspec time ]; description = "A library providing definitions to work with monetary values"; license = lib.licenses.mit; @@ -132321,6 +132033,7 @@ self: { description = "This package enables to write SPARQL queries to remote endpoints"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "haspell" = callPackage @@ -132336,32 +132049,6 @@ self: { }) {inherit (pkgs) aspell;}; "hasql" = callPackage - ({ mkDerivation, attoparsec, base, bytestring - , bytestring-strict-builder, contravariant, contravariant-extras - , dlist, gauge, hashable, hashtables, mtl, postgresql-binary - , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances - , rerebase, tasty, tasty-hunit, tasty-quickcheck, text - , text-builder, transformers, vector - }: - mkDerivation { - pname = "hasql"; - version = "1.5.1"; - sha256 = "1g9hbn9saf17a9jxjkm4bak7xbjgq0nf8khv5djfkyz1yxmw4l6p"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-strict-builder contravariant - dlist hashable hashtables mtl postgresql-binary postgresql-libpq - profunctors text text-builder transformers vector - ]; - testHaskellDepends = [ - contravariant-extras QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ gauge rerebase ]; - description = "An efficient PostgreSQL driver with a flexible mapping API"; - license = lib.licenses.mit; - }) {}; - - "hasql_1_6_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , dlist, gauge, hashable, hashtables, mtl, network-ip @@ -132372,8 +132059,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.6.2"; - sha256 = "1ph1di36lhhi2y542cc5mm0pprq1j6yb2i69bwms59173amh8gcx"; + version = "1.6.3"; + sha256 = "04d4pa248pffqsj032m69wkv11cn0mdfc21qfygk3dcb1yfh0nnj"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-strict-builder contravariant dlist hashable hashtables mtl network-ip @@ -132387,7 +132074,6 @@ self: { benchmarkHaskellDepends = [ gauge rerebase ]; description = "An efficient PostgreSQL driver with a flexible mapping API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hasql-backend" = callPackage @@ -132475,26 +132161,6 @@ self: { }) {}; "hasql-dynamic-statements" = callPackage - ({ mkDerivation, base, bytestring, containers, hasql - , hasql-implicits, ptr, QuickCheck, quickcheck-instances, rerebase - , tasty, tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "hasql-dynamic-statements"; - version = "0.3.1.1"; - sha256 = "1bc7l6l6ss9grgphnb0sks08v0wx0aalja4rkjzp49p5m6g82rc6"; - libraryHaskellDepends = [ - base bytestring containers hasql hasql-implicits ptr - ]; - testHaskellDepends = [ - hasql QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "Toolkit for constructing Hasql statements dynamically"; - license = lib.licenses.mit; - }) {}; - - "hasql-dynamic-statements_0_3_1_2" = callPackage ({ mkDerivation, base, bytestring, containers, hasql , hasql-implicits, ptr, QuickCheck, quickcheck-instances, rerebase , tasty, tasty-hunit, tasty-quickcheck @@ -132512,7 +132178,6 @@ self: { ]; description = "Toolkit for constructing Hasql statements dynamically"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hasql-explain-tests" = callPackage @@ -132577,8 +132242,8 @@ self: { }: mkDerivation { pname = "hasql-interpolate"; - version = "0.1.0.3"; - sha256 = "1532bs4d04fh0mhdn2dwgyl94x9pgbnh4xmq403pmx3785m60rva"; + version = "0.1.0.4"; + sha256 = "1b3q21m25wxjxrprfr24b2ay94yjjaqs0p2x6s1d9cqagmznh9v0"; libraryHaskellDepends = [ aeson array base bytestring containers haskell-src-meta hasql megaparsec mtl scientific template-haskell text time transformers @@ -132589,6 +132254,8 @@ self: { ]; description = "QuasiQuoter that supports expression interpolation for hasql"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hasql-migration" = callPackage @@ -132632,21 +132299,6 @@ self: { }) {}; "hasql-optparse-applicative" = callPackage - ({ mkDerivation, base-prelude, hasql, hasql-pool - , optparse-applicative - }: - mkDerivation { - pname = "hasql-optparse-applicative"; - version = "0.3.0.9"; - sha256 = "1m4z82l3ip50ly160ccjl46npxp1170knaf5acjdwhirsc6c3qpd"; - libraryHaskellDepends = [ - base-prelude hasql hasql-pool optparse-applicative - ]; - description = "\"optparse-applicative\" parsers for \"hasql\""; - license = lib.licenses.mit; - }) {}; - - "hasql-optparse-applicative_0_5" = callPackage ({ mkDerivation, base-prelude, hasql, hasql-pool , optparse-applicative }: @@ -132659,7 +132311,6 @@ self: { ]; description = "\"optparse-applicative\" parsers for \"hasql\""; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hasql-pipes" = callPackage @@ -132678,18 +132329,6 @@ self: { }) {}; "hasql-pool" = callPackage - ({ mkDerivation, base-prelude, hasql, hspec, resource-pool, time }: - mkDerivation { - pname = "hasql-pool"; - version = "0.5.2.2"; - sha256 = "0sr8ifvkyd5g7ajaqd7bbqgfpnpkazv7fbq5ix07h94kdf1idqq5"; - libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; - testHaskellDepends = [ base-prelude hasql hspec ]; - description = "A pool of connections for Hasql"; - license = lib.licenses.mit; - }) {}; - - "hasql-pool_0_8_0_6" = callPackage ({ mkDerivation, async, base, hasql, hspec, rerebase, stm , transformers }: @@ -132701,7 +132340,6 @@ self: { testHaskellDepends = [ async hasql hspec rerebase stm ]; description = "Pool of connections for Hasql"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hasql-postgres" = callPackage @@ -132852,6 +132490,7 @@ self: { description = "Stream Hasql queries"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hasql-streams-example" = callPackage @@ -132878,7 +132517,6 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "hasql-streaming"; - broken = true; }) {}; "hasql-streams-pipes" = callPackage @@ -132939,8 +132577,8 @@ self: { }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.17"; - sha256 = "1s4ra8i4az6kik4ahfg3h0rzyz54fifn0dkabfpfxalg1ap5y7ic"; + version = "0.4.0.18"; + sha256 = "0z88skdk0i6rnwdqpy06yrhandaldll468kbkd4ilcf7fbwwk06v"; libraryHaskellDepends = [ base bytestring containers contravariant foldl hasql postgresql-syntax template-haskell template-haskell-compat-v0208 @@ -132951,24 +132589,6 @@ self: { }) {}; "hasql-transaction" = callPackage - ({ mkDerivation, async, base, bytestring, bytestring-tree-builder - , contravariant, contravariant-extras, hasql, mtl, rerebase - , transformers - }: - mkDerivation { - pname = "hasql-transaction"; - version = "1.0.1.1"; - sha256 = "0ajk7g9sk83sig2bkfajxpwasqrswxr0f82mxzwfy9j08z3ks235"; - libraryHaskellDepends = [ - base bytestring bytestring-tree-builder contravariant - contravariant-extras hasql mtl transformers - ]; - testHaskellDepends = [ async contravariant-extras hasql rerebase ]; - description = "Composable abstraction over retryable transactions for Hasql"; - license = lib.licenses.mit; - }) {}; - - "hasql-transaction_1_0_1_2" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-tree-builder , contravariant, contravariant-extras, hasql, mtl, rerebase , transformers @@ -132984,7 +132604,6 @@ self: { testHaskellDepends = [ async contravariant-extras hasql rerebase ]; description = "Composable abstraction over retryable transactions for Hasql"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hasql-transaction-io" = callPackage @@ -133001,8 +132620,6 @@ self: { ]; description = "Perform IO actions during transactions for Hasql"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hasql-url" = callPackage @@ -133019,6 +132636,8 @@ self: { testHaskellDepends = [ base hasql tasty tasty-quickcheck ]; description = "Parse PostgreSQL connection URI into Hasql.Connection Settings"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hasqlator-mysql" = callPackage @@ -133582,6 +133201,8 @@ self: { ]; description = "A Haskell library for efficient, concurrent, and concise data access"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "haxl-amazonka" = callPackage @@ -133622,7 +133243,6 @@ self: { description = "An example Haxl data source for accessing the Facebook Graph API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haxparse" = callPackage @@ -133760,7 +133380,9 @@ self: { description = "A command line tool to compute BLAKE3 hashes"; license = lib.licenses.agpl3Only; badPlatforms = [ "aarch64-linux" ]; + hydraPlatforms = lib.platforms.none; mainProgram = "hb3sum"; + broken = true; }) {}; "hback" = callPackage @@ -134083,8 +133705,8 @@ self: { ({ mkDerivation, base, containers, indexed-traversable }: mkDerivation { pname = "hcdt"; - version = "0.1.0.3"; - sha256 = "0km3qh4h0iy1x09qvi112y8jj2vqln6yraqyqd1yls3xn0q1ga25"; + version = "0.1.0.5"; + sha256 = "18hd8x7g615cgafgni27x914kqvashdicd1alaj02mha4jl0380a"; libraryHaskellDepends = [ base containers indexed-traversable ]; description = "2d Delaunay triangulation"; license = lib.licenses.bsd3; @@ -134253,6 +133875,8 @@ self: { ]; description = "An implementation of the Consistent Overhead Byte Stuffing algorithm"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hcom" = callPackage @@ -134590,7 +134214,6 @@ self: { description = "HDF: Uniform Rate Audio Signal Processing in Haskell"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hdf5" = callPackage @@ -134683,7 +134306,6 @@ self: { description = "Server-side HTTP Digest (RFC2617) in the CGI monad"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hdirect" = callPackage @@ -134936,7 +134558,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "License Header Manager"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "headroom"; + broken = true; }) {}; "heap" = callPackage @@ -135306,7 +134930,7 @@ self: { }) {}; "hedgehog" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring + ({ 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 @@ -135314,15 +134938,14 @@ self: { }: mkDerivation { pname = "hedgehog"; - version = "1.0.5"; - sha256 = "1qsqs8lmxa3wmw228cwi98vvvh9hqbc9d43i1sy2c9igw9xlhfi6"; - revision = "2"; - editedCabalFile = "1p6vixwflgz2y1fc94kqxiv8s5jvq63xhp56cqwpw2s7d7g5chx1"; + version = "1.1.2"; + sha256 = "0dbk75hk6hqpzkjdlpw3s63qhm42kqigij33p321by6xndb59jg1"; libraryHaskellDepends = [ - ansi-terminal async 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 + 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 @@ -135395,10 +135018,8 @@ self: { }: mkDerivation { pname = "hedgehog-classes"; - version = "0.2.5.3"; - sha256 = "1qanfnvciykm5hmiqyf0icn4xn16v6zvlfal98lphhcmym26m9x1"; - revision = "3"; - editedCabalFile = "09khb9px24zj24ahb51w1a6glgmcnhk2xn89gn1qwzhs3xn4vlj5"; + version = "0.2.5.4"; + sha256 = "0z9ik5asddc2pnz430jsi1pyahkh6jy36ng0vwm7ywcq7cvhcvlz"; libraryHaskellDepends = [ aeson base binary comonad containers hedgehog pretty-show primitive semirings silently transformers vector wl-pprint-annotated @@ -135421,6 +135042,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "hedgehog-extras" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring + , deepseq, directory, exceptions, filepath, hedgehog, hw-aeson + , mmorph, mtl, network, process, resourcet, stm, temporary, text + , time, transformers, unliftio, unordered-containers, yaml + }: + mkDerivation { + pname = "hedgehog-extras"; + version = "0.3.0.3"; + sha256 = "1jrzijk8b4hnglsghja1aad482sc7zq0g9g0zyjxgwr4pjj7sc6f"; + libraryHaskellDepends = [ + aeson aeson-pretty async base bytestring deepseq directory + exceptions filepath hedgehog hw-aeson mmorph mtl network process + resourcet stm temporary text time transformers unliftio + unordered-containers yaml + ]; + description = "Supplemental library for hedgehog"; + license = lib.licenses.asl20; + }) {}; + "hedgehog-fakedata" = callPackage ({ mkDerivation, base, containers, fakedata, hedgehog, random }: mkDerivation { @@ -135463,6 +135104,8 @@ self: { ]; description = "Customizable Gen for ADT using Generics"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hedgehog-gen-json" = callPackage @@ -135531,18 +135174,14 @@ self: { libraryHaskellDepends = [ base hedgehog lens ]; description = "Hedgehog properties for lens laws"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hedgehog-optics" = callPackage ({ mkDerivation, base, hedgehog, optics-core }: mkDerivation { pname = "hedgehog-optics"; - version = "1.0.0.1"; - sha256 = "0ybpq4c74w8y3wnfmy7macana4zlr4w1m2s0kk88yq67cvzfgb5w"; - revision = "2"; - editedCabalFile = "1w7drklx7z8qkkf9d9pysic5iqa3ija57yqx6pq8qkhzlal09kbx"; + version = "1.0.0.2"; + sha256 = "0i39s3ajrfdf87qy8i2k5v4dh42snc3jw4ar49c9hc76gzhxw2qj"; libraryHaskellDepends = [ base hedgehog optics-core ]; description = "Hedgehog properties for optics laws"; license = lib.licenses.mit; @@ -135790,8 +135429,8 @@ self: { }: mkDerivation { pname = "hegg"; - version = "0.2.0.0"; - sha256 = "124rdj3lmssn57gy3nffinyg1p03wd3w672v7l2aa8gzrpan20cg"; + version = "0.3.0.0"; + sha256 = "08hprlz70vxv759fr15hb95p7fj6qmnahjxvalj3db9rw5xqs4ia"; libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base containers deriving-compat tasty tasty-hunit tasty-quickcheck @@ -135856,39 +135495,38 @@ self: { ({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder , blaze-html, bytestring, containers, criterion , criterion-measurement, directory, directory-tree, dlist, filepath - , hashable, HUnit, lens, lifted-base, map-syntax, monad-control - , mtl, process, QuickCheck, random, statistics, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , transformers, transformers-base, unordered-containers, vector - , xmlhtml + , hashable, HUnit, indexed-traversable, lens, lifted-base + , map-syntax, monad-control, mtl, process, QuickCheck, random + , statistics, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-base, unordered-containers, vector, xmlhtml }: mkDerivation { pname = "heist"; - version = "1.1.0.1"; - sha256 = "1j4h9fwny4hl2m5lgsd257lvm9057fb0hmnaqjw8a9k4hyx7hmqq"; - revision = "4"; - editedCabalFile = "1jwdn5l0iwcrbramfs6h60w0i6hgp2ixii89db8b0xvcbyb8h4hj"; + version = "1.1.1.0"; + sha256 = "17ba0jmzs4wk4303ydcr1p2k2kcjfs11mrhlglaz40z61z3vm1yl"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable - lifted-base map-syntax monad-control mtl process random text time - transformers transformers-base unordered-containers vector xmlhtml + indexed-traversable lifted-base map-syntax monad-control mtl + process random text time transformers transformers-base + unordered-containers vector xmlhtml ]; testHaskellDepends = [ aeson attoparsec base bifunctors blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath - hashable HUnit lens lifted-base map-syntax monad-control mtl - process QuickCheck random test-framework test-framework-hunit - test-framework-quickcheck2 text time transformers transformers-base - unordered-containers vector xmlhtml + hashable HUnit indexed-traversable lens lifted-base map-syntax + monad-control mtl process QuickCheck random test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers transformers-base unordered-containers vector xmlhtml ]; benchmarkHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers criterion criterion-measurement directory directory-tree - dlist filepath hashable HUnit lifted-base map-syntax monad-control - mtl process random statistics test-framework test-framework-hunit - text time transformers transformers-base unordered-containers - vector xmlhtml + dlist filepath hashable HUnit indexed-traversable lifted-base + map-syntax monad-control mtl process random statistics + test-framework test-framework-hunit text time transformers + transformers-base unordered-containers vector xmlhtml ]; description = "An Haskell template system supporting both HTML5 and XML"; license = lib.licenses.bsd3; @@ -135909,6 +135547,7 @@ self: { description = "Use JSON directly from Heist templates"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "heist-async" = callPackage @@ -135965,19 +135604,21 @@ self: { ]; description = "An Haskell template system supporting both HTML5 and XML"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "heist-extra" = callPackage - ({ mkDerivation, base, data-default, filepath, heist-emanote - , map-syntax, mtl, pandoc-types, relude, xmlhtml + ({ mkDerivation, base, data-default, filepath, heist, map-syntax + , mtl, pandoc-types, relude, xmlhtml }: mkDerivation { pname = "heist-extra"; - version = "0.1.0.0"; - sha256 = "175bch1045r69xqzaxh3fhlii2yn5wcwpifk0m5qw9520pbrg4rs"; + version = "0.2.0.0"; + sha256 = "0rjlnj6ja7wfck1cpkfl9hh17kn0ghal8g4j8dh2dfzm6bnprqmk"; libraryHaskellDepends = [ - base data-default filepath heist-emanote map-syntax mtl - pandoc-types relude xmlhtml + base data-default filepath heist map-syntax mtl pandoc-types relude + xmlhtml ]; description = "Extra heist functionality"; license = lib.licenses.mit; @@ -136191,7 +135832,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "hell"; - broken = true; }) {}; "hellage" = callPackage @@ -136468,8 +136108,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.9.7"; - sha256 = "1pgzgmjc025n9if2hq84i4d9syrz7fskzvyy5ilz4h49vqnjngcq"; + version = "0.9.10"; + sha256 = "1sbp3jjn54z6hwkfgb83g0zgn1dm8qi9254g2yc8r4msm6n3nzww"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -136522,8 +136162,8 @@ self: { }: mkDerivation { pname = "hercules-ci-api"; - version = "0.7.2.0"; - sha256 = "0z3j96il0rvzplxih4vq5dghp18plbk5k55ymwm7dxp51d0jg902"; + version = "0.7.2.1"; + sha256 = "1nkmiyfmidrfqvlfy9k75y4asrrbrs2511kdzhrpb3zlrlaw4zb8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136555,8 +136195,8 @@ self: { }: mkDerivation { pname = "hercules-ci-api-agent"; - version = "0.4.5.0"; - sha256 = "1y6j7qbs1r78kd020j1w31xpl1alkwrgp6isigam86dzyngfw2wv"; + version = "0.4.6.1"; + sha256 = "07gvmcag36ai945j7bxnvy2x8fsx9apkabcikp6x1a2anvkgws24"; libraryHaskellDepends = [ aeson base base64-bytestring-type bytestring containers cookie deepseq exceptions hashable hercules-ci-api-core http-api-data @@ -136564,10 +136204,10 @@ self: { swagger2 text time unordered-containers uuid vector ]; testHaskellDepends = [ - aeson base bytestring containers cookie exceptions hashable hspec - http-api-data http-media lens memory network-uri profunctors - QuickCheck quickcheck-classes servant servant-auth string-conv - swagger2 text time uuid vector + aeson base bytestring containers cookie exceptions hashable + hercules-ci-api-core hspec http-api-data http-media lens memory + network-uri profunctors QuickCheck quickcheck-classes servant + servant-auth string-conv swagger2 text time uuid vector ]; description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise"; license = lib.licenses.asl20; @@ -136583,8 +136223,8 @@ self: { }: mkDerivation { pname = "hercules-ci-api-core"; - version = "0.1.4.0"; - sha256 = "05bchaq46928d8mlp9r3h4l4lb21758dkpws8c494vbbgkss6mg1"; + version = "0.1.5.0"; + sha256 = "1f5fxivyy5fkchr5b8na2fxrmp4p7av61a28grsp7n0ndik1lfgd"; libraryHaskellDepends = [ aeson base bytestring containers cookie deepseq exceptions hashable http-api-data http-media katip lens lifted-base memory @@ -136604,17 +136244,17 @@ self: { , hercules-ci-api, hercules-ci-api-agent, hercules-ci-api-core , hercules-ci-cnix-expr, hercules-ci-cnix-store , hercules-ci-optparse-applicative, hostname, hspec, http-client - , http-client-tls, http-types, katip, lens, lens-aeson, lifted-base - , monad-control, network-uri, process, protolude, QuickCheck, retry - , rio, safe-exceptions, servant, servant-auth-client - , servant-client, servant-client-core, servant-conduit, temporary - , text, transformers, transformers-base, unix, unliftio - , unliftio-core, unordered-containers, uuid + , http-client-tls, http-types, inline-c-cpp, katip, lens + , lens-aeson, lifted-base, monad-control, network-uri, process + , protolude, QuickCheck, retry, rio, safe-exceptions, servant + , servant-auth-client, servant-client, servant-client-core + , servant-conduit, temporary, text, transformers, transformers-base + , unix, unliftio, unliftio-core, unordered-containers, uuid }: mkDerivation { pname = "hercules-ci-cli"; - version = "0.3.2"; - sha256 = "1lr7ai19zq55y1ib7133llajpx4n041xv6gv797d1ibk03qj69gc"; + version = "0.3.5"; + sha256 = "0mk6q6ccgpdpjfc7mdms28dbhh1bawy4jnnqcfcb6vxg4cj83f44"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136623,8 +136263,8 @@ self: { hercules-ci-agent hercules-ci-api hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-expr hercules-ci-cnix-store hercules-ci-optparse-applicative hostname http-client - http-client-tls http-types katip lens lens-aeson lifted-base - monad-control network-uri process protolude retry rio + http-client-tls http-types inline-c-cpp katip lens lens-aeson + lifted-base monad-control network-uri process protolude retry rio safe-exceptions servant servant-auth-client servant-client servant-client-core servant-conduit temporary text transformers transformers-base unix unliftio unliftio-core unordered-containers @@ -136653,8 +136293,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-expr"; - version = "0.3.3.0"; - sha256 = "03c579y14cnynnrgfj2p41q65aplhr5ayc8i38yzvm96i5d6w6yq"; + version = "0.3.5.0"; + sha256 = "0r70kjn8a1wiw1zndahrg2gc88k52dscm4yjmms2caf22pkh562a"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ @@ -136683,8 +136323,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-store"; - version = "0.3.3.1"; - sha256 = "12dar9i4kbils7f03almhlarhjysgh2zqsq24xqrsz6fwdcdn5v6"; + version = "0.3.3.3"; + sha256 = "1w4azya8phkk3gmkifcv2pc6jh8zanwk9m2vwqsdgk7kr8zkkzws"; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ base bytestring conduit containers inline-c inline-c-cpp protolude @@ -137115,48 +136755,54 @@ self: { }) {}; "hevm" = callPackage - ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base - , base16-bytestring, binary, brick, bytestring, cereal, containers - , cryptonite, data-dword, Decimal, deepseq, directory, fgl - , filepath, free, haskeline, here, HUnit, lens, lens-aeson, libff - , megaparsec, memory, monad-par, mtl, multiset, operational - , optparse-generic, process, QuickCheck, quickcheck-text - , regex-tdfa, restless-git, rosezipper, s-cargot, sbv, scientific - , secp256k1, semver-range, tasty, tasty-hunit, tasty-quickcheck - , temporary, text, text-format, time, transformers, tree-view - , unordered-containers, vector, vty, witherable, wreq + ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, array, async + , base, base16-bytestring, binary, brick, bytestring, cereal + , containers, cryptonite, data-dword, Decimal, deepseq, directory + , filemanip, filepath, free, haskeline, here, HUnit, lens + , lens-aeson, libff, megaparsec, memory, monad-par, mtl, multiset + , operational, optparse-generic, process, QuickCheck + , quickcheck-instances, quickcheck-text, regex, regex-tdfa + , restless-git, rosezipper, scientific, secp256k1, smt2-parser + , spool, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, temporary, text, time, transformers, tree-view + , tuple, unordered-containers, vector, vty, witherable, word-wrap + , wreq }: mkDerivation { pname = "hevm"; - version = "0.49.0"; - sha256 = "1plkfzx0r5k77ymlkrg694vgx58jil5wx2m43ggs9ixnph0q3ysx"; + version = "0.50.2"; + sha256 = "1yhz8f175z1qypbdfcnbq47bjri3lv0mc2bcfkw0zza9g09mfcaz"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; libraryHaskellDepends = [ - abstract-par aeson ansi-wl-pprint base base16-bytestring binary - brick bytestring cereal containers cryptonite data-dword Decimal - deepseq directory fgl filepath free haskeline here lens lens-aeson - megaparsec memory monad-par mtl multiset operational - optparse-generic process QuickCheck quickcheck-text regex-tdfa - restless-git rosezipper s-cargot sbv scientific semver-range - temporary text text-format time transformers tree-view - unordered-containers vector vty witherable wreq + abstract-par aeson ansi-wl-pprint array async base + base16-bytestring binary brick bytestring cereal containers + cryptonite data-dword Decimal deepseq directory filemanip filepath + free haskeline here HUnit lens lens-aeson megaparsec memory + monad-par mtl multiset operational optparse-generic process + QuickCheck quickcheck-instances quickcheck-text regex regex-tdfa + restless-git rosezipper scientific smt2-parser spool tasty + tasty-expected-failure tasty-hunit tasty-quickcheck temporary text + time transformers tree-view tuple unordered-containers vector vty + witherable word-wrap wreq ]; librarySystemDepends = [ libff secp256k1 ]; executableHaskellDepends = [ aeson ansi-wl-pprint async base base16-bytestring binary brick bytestring containers cryptonite data-dword deepseq directory filepath free lens lens-aeson memory mtl operational - optparse-generic process QuickCheck quickcheck-text regex-tdfa sbv - temporary text text-format unordered-containers vector vty + optparse-generic process QuickCheck quickcheck-text regex-tdfa + temporary text unordered-containers vector vty ]; testHaskellDepends = [ - base base16-bytestring binary bytestring containers free here HUnit - lens mtl QuickCheck sbv tasty tasty-hunit tasty-quickcheck text - vector + aeson array base base16-bytestring binary bytestring containers + data-dword directory filemanip filepath here HUnit lens mtl process + QuickCheck quickcheck-instances regex regex-tdfa smt2-parser tasty + tasty-expected-failure tasty-hunit tasty-quickcheck temporary text + time vector witherable ]; testSystemDepends = [ secp256k1 ]; + doHaddock = false; description = "Ethereum virtual machine evaluator"; license = lib.licenses.agpl3Only; mainProgram = "hevm"; @@ -137213,32 +136859,20 @@ self: { }) {}; "hex-text" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, text }: + ({ mkDerivation, base, base16-bytestring, bytestring, hspec, text + }: mkDerivation { pname = "hex-text"; - version = "0.1.0.6"; - sha256 = "1a5ccvbj7asbx92f4309qfwwih8ffnfi5kkahdn6dp444xa374r7"; - revision = "2"; - editedCabalFile = "00bwakiri9vbn05zi7alwhl5rdg13ls3pydcrgc0q4v8banrp868"; + version = "0.1.0.8"; + sha256 = "06zp9hwvds9fss2206c34q1zv80pklhbxcyrirz1xnwl3ml28fb5"; libraryHaskellDepends = [ base base16-bytestring bytestring text ]; - testHaskellDepends = [ base base16-bytestring bytestring text ]; + testHaskellDepends = [ + base base16-bytestring bytestring hspec text + ]; description = "ByteString-Text hexidecimal conversions"; license = lib.licenses.mit; }) {}; - "hex-text_0_1_0_7" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, text }: - mkDerivation { - pname = "hex-text"; - version = "0.1.0.7"; - sha256 = "1xyyr6570dbp6mgarz8v56s9kg4pfzk1dc10nw0gg51j6xl1c2zn"; - libraryHaskellDepends = [ base base16-bytestring bytestring text ]; - testHaskellDepends = [ base base16-bytestring bytestring text ]; - description = "ByteString-Text hexidecimal conversions"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "hexchat" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -137635,8 +137269,6 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell bindings for the Keystone assembler framework"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) keystone;}; "heyting-algebras" = callPackage @@ -137658,6 +137290,8 @@ self: { ]; description = "Heyting and Boolean algebras"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hfann" = callPackage @@ -137781,7 +137415,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "hfoil"; - broken = true; }) {}; "hformat" = callPackage @@ -137908,6 +137541,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hgdal" = callPackage + ({ mkDerivation, base, fficxx, fficxx-runtime, gdal, stdcxx + , template-haskell + }: + mkDerivation { + pname = "hgdal"; + version = "1.0.0.0"; + sha256 = "0zfqa1rgmkch0gj15w9gqavl1lyvyi2i7jsm3n7srnrrhfchxvfb"; + libraryHaskellDepends = [ + base fficxx fficxx-runtime stdcxx template-haskell + ]; + libraryPkgconfigDepends = [ gdal ]; + description = "Haskell binding to the GDAL library"; + license = lib.licenses.bsd2; + }) {inherit (pkgs) gdal;}; + "hgdbmi" = callPackage ({ mkDerivation, base, directory, HUnit, parsec, process, stm , template-haskell, temporary, test-framework, test-framework-hunit @@ -138138,9 +137787,7 @@ self: { ]; description = "Bindings to libintl.h (gettext, bindtextdomain)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hgettext"; - broken = true; }) {}; "hgis" = callPackage @@ -138523,6 +138170,8 @@ self: { libraryToolDepends = [ c2hs ]; description = "Interface to hidapi library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) hidapi;}; "hid-examples" = callPackage @@ -138606,6 +138255,8 @@ self: { pname = "hie-bios"; version = "0.11.0"; sha256 = "1vqfbyi1jlgzrvl9njgdhvj1hp0b7rl4xpchyldpf179151vy24p"; + revision = "3"; + editedCabalFile = "0axmy522cfk92c5hwrqhkqswlxlm26m821b64rnh32666sxfdhy1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138635,13 +138286,13 @@ self: { }: mkDerivation { pname = "hie-compat"; - version = "0.3.0.0"; - sha256 = "169175gn1699k2w7w8ific49qmvw8h1gh585k3pzfwb921lyj0mb"; + version = "0.3.1.0"; + sha256 = "0ixk1xf8958ajxb11gxx64sf0w6glb9n171jmdqhzdfffd1abs71"; libraryHaskellDepends = [ array base bytestring containers directory filepath ghc ghc-boot transformers ]; - description = "HIE files for GHC 8.6 and other HIE file backports"; + description = "HIE files for GHC 8.8 and other HIE file backports"; license = lib.licenses.asl20; }) {}; @@ -138946,6 +138597,8 @@ self: { ]; description = "A rich monadic API for working with leveldb databases"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "higherorder" = callPackage @@ -139147,7 +138800,9 @@ self: { ]; description = "Generate STL models from SRTM elevation data"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hills"; + broken = true; }) {}; "himerge" = callPackage @@ -139490,8 +139145,6 @@ self: { ]; description = "inotify conduit sources"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hinquire" = callPackage @@ -139568,6 +139221,7 @@ self: { description = "A server process that runs hint"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hinter" = callPackage @@ -140208,6 +139862,31 @@ self: { mainProgram = "hjsmin"; }) {}; + "hjsmin_0_2_1" = callPackage + ({ mkDerivation, base, bytestring, directory, extra, filepath + , language-javascript, optparse-applicative, process, text, unix + }: + mkDerivation { + pname = "hjsmin"; + version = "0.2.1"; + sha256 = "146d4b9k11msqf1q12rzh5bfdrqddkcgsf42w6wpkzfdlhskid2d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring language-javascript text + ]; + executableHaskellDepends = [ + base bytestring language-javascript optparse-applicative text + ]; + testHaskellDepends = [ + base directory extra filepath process unix + ]; + description = "Haskell implementation of a javascript minifier"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hjsmin"; + }) {}; + "hjson" = callPackage ({ mkDerivation, base, containers, parsec }: mkDerivation { @@ -140442,26 +140121,6 @@ self: { }) {}; "hkgr" = callPackage - ({ mkDerivation, base, bytestring, directory, extra, filepath - , simple-cabal, simple-cmd-args, typed-process, xdg-basedir - }: - mkDerivation { - pname = "hkgr"; - version = "0.3"; - sha256 = "1w8ww2dkskdfs0lh6wbn5byhnrf6mwih7n5yp81fr6awdc0k1qrm"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - base bytestring directory extra filepath simple-cabal - simple-cmd-args typed-process xdg-basedir - ]; - description = "Simple Hackage release workflow for package maintainers"; - license = lib.licenses.gpl3Only; - mainProgram = "hkgr"; - }) {}; - - "hkgr_0_4_2" = callPackage ({ mkDerivation, base, bytestring, directory, extra, filepath , simple-cabal, simple-cmd-args, typed-process, xdg-basedir }: @@ -140478,7 +140137,6 @@ self: { ]; description = "Simple Hackage release workflow for package maintainers"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "hkgr"; }) {}; @@ -140586,49 +140244,6 @@ self: { }) {}; "hledger" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs - , containers, data-default, Decimal, Diff, directory, extra - , filepath, githash, hashable, haskeline, hledger-lib, lucid - , math-functions, megaparsec, microlens, mtl, process, regex-tdfa - , safe, shakespeare, split, tabular, tasty, temporary, terminfo - , text, time, timeit, transformers, unordered-containers - , utf8-string, utility-ht, wizards - }: - mkDerivation { - pname = "hledger"; - version = "1.25"; - sha256 = "0dmzmvkg8gk8rwbhvc4v4ch12i1pqvd91jx3z5c0plmx49f8q65k"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base bytestring cmdargs containers data-default - Decimal Diff directory extra filepath githash hashable haskeline - hledger-lib lucid math-functions megaparsec microlens mtl process - regex-tdfa safe shakespeare split tabular tasty temporary terminfo - text time timeit transformers unordered-containers utf8-string - utility-ht wizards - ]; - executableHaskellDepends = [ - aeson ansi-terminal base bytestring cmdargs containers data-default - Decimal directory extra filepath githash haskeline hledger-lib - math-functions megaparsec microlens mtl process regex-tdfa safe - shakespeare split tabular tasty temporary terminfo text time timeit - transformers unordered-containers utf8-string utility-ht wizards - ]; - testHaskellDepends = [ - aeson ansi-terminal base bytestring cmdargs containers data-default - Decimal directory extra filepath githash haskeline hledger-lib - math-functions megaparsec microlens mtl process regex-tdfa safe - shakespeare split tabular tasty temporary terminfo text time timeit - transformers unordered-containers utf8-string utility-ht wizards - ]; - description = "Command-line interface for the hledger accounting system"; - license = lib.licenses.gpl3Only; - mainProgram = "hledger"; - maintainers = [ lib.maintainers.peti ]; - }) {}; - - "hledger_1_27_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, breakpoint, bytestring , cmdargs, containers, data-default, Decimal, Diff, directory , extra, filepath, githash, hashable, haskeline, hledger-lib, lucid @@ -140669,9 +140284,56 @@ self: { ]; description = "Command-line interface for the hledger accounting system"; license = lib.licenses.gpl3Only; + mainProgram = "hledger"; + maintainers = [ + lib.maintainers.maralorn lib.maintainers.sternenseemann + ]; + }) {}; + + "hledger_1_28" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs + , containers, data-default, Decimal, Diff, directory, extra + , filepath, githash, hashable, haskeline, hledger-lib, lucid + , math-functions, megaparsec, microlens, mtl, process, regex-tdfa + , safe, shakespeare, split, tabular, tasty, temporary, terminfo + , text, time, timeit, transformers, unordered-containers + , utf8-string, utility-ht, wizards + }: + mkDerivation { + pname = "hledger"; + version = "1.28"; + sha256 = "0lagm7wk0k8jyk6kqggw7qka0jigqzjyqrrl4pr6cm0wd7x34cd8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring cmdargs containers data-default + Decimal Diff directory extra filepath githash hashable haskeline + hledger-lib lucid math-functions megaparsec microlens mtl process + regex-tdfa safe shakespeare split tabular tasty temporary terminfo + text time timeit transformers unordered-containers utf8-string + utility-ht wizards + ]; + executableHaskellDepends = [ + aeson ansi-terminal base bytestring cmdargs containers data-default + Decimal directory extra filepath githash haskeline hledger-lib + math-functions megaparsec microlens mtl process regex-tdfa safe + shakespeare split tabular tasty temporary terminfo text time timeit + transformers unordered-containers utf8-string utility-ht wizards + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring cmdargs containers data-default + Decimal directory extra filepath githash haskeline hledger-lib + math-functions megaparsec microlens mtl process regex-tdfa safe + shakespeare split tabular tasty temporary terminfo text time timeit + transformers unordered-containers utf8-string utility-ht wizards + ]; + description = "Command-line interface for the hledger accounting system"; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "hledger"; - maintainers = [ lib.maintainers.peti ]; + maintainers = [ + lib.maintainers.maralorn lib.maintainers.sternenseemann + ]; }) {}; "hledger-api" = callPackage @@ -140698,7 +140360,6 @@ self: { license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "hledger-api"; - broken = true; }) {}; "hledger-chart" = callPackage @@ -140775,8 +140436,8 @@ self: { pname = "hledger-iadd"; version = "1.3.17"; sha256 = "1b3qz5vm8db6gsdakg8nf3qc6rp7mlh3zpkzvhi80pqm3jzdbjph"; - revision = "2"; - editedCabalFile = "1npd15zy812mx83xbgwgxv7sdvv5cmznbw75y8inafmxk2jj1wn8"; + revision = "3"; + editedCabalFile = "0xb476i2xn0ncfqx65qy4vs0g2dchw5p0naxgz4zfmffrmyfsc92"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140796,30 +140457,12 @@ self: { testToolDepends = [ hspec-discover ]; description = "A terminal UI as drop-in replacement for hledger add"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hledger-iadd"; + broken = true; }) {}; "hledger-interest" = callPackage - ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, text, time - }: - mkDerivation { - pname = "hledger-interest"; - version = "1.6.3"; - sha256 = "1r8iydl66k2j7xv1b465alf3h8mqwjfz13ffwsd50h0kscxjmxhg"; - revision = "2"; - editedCabalFile = "1hsd1r4j0737lkllxa3ivrbdcp3da2vr5fiakfhrw5fqsbi3p8rc"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal Decimal hledger-lib mtl text time - ]; - description = "computes interest for a given account"; - license = lib.licenses.bsd3; - mainProgram = "hledger-interest"; - maintainers = [ lib.maintainers.peti ]; - }) {}; - - "hledger-interest_1_6_4" = callPackage ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, text, time }: mkDerivation { @@ -140835,7 +140478,6 @@ self: { ]; description = "computes interest for a given account"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hledger-interest"; maintainers = [ lib.maintainers.peti ]; }) {}; @@ -140862,48 +140504,12 @@ self: { }) {}; "hledger-lib" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base - , blaze-markup, bytestring, call-stack, cassava, cassava-megaparsec - , cmdargs, containers, data-default, Decimal, directory, doclayout - , extra, file-embed, filepath, Glob, hashtables, megaparsec - , microlens, microlens-th, mtl, parser-combinators, pretty-simple - , regex-tdfa, safe, tabular, tasty, tasty-hunit, template-haskell - , text, time, timeit, transformers, uglymemo, unordered-containers - , utf8-string - }: - mkDerivation { - pname = "hledger-lib"; - version = "1.25"; - sha256 = "06b9nkpkwbr14jgbc04635qd7b3s068jvdfkfiza2zb4yzhdzh1n"; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal array base blaze-markup bytestring - call-stack cassava cassava-megaparsec cmdargs containers - data-default Decimal directory doclayout extra file-embed filepath - Glob hashtables megaparsec microlens microlens-th mtl - parser-combinators pretty-simple regex-tdfa safe tabular tasty - tasty-hunit template-haskell text time timeit transformers uglymemo - unordered-containers utf8-string - ]; - testHaskellDepends = [ - aeson aeson-pretty ansi-terminal array base blaze-markup bytestring - call-stack cassava cassava-megaparsec cmdargs containers - data-default Decimal directory doclayout extra file-embed filepath - Glob hashtables megaparsec microlens microlens-th mtl - parser-combinators pretty-simple regex-tdfa safe tabular tasty - tasty-hunit template-haskell text time timeit transformers uglymemo - unordered-containers utf8-string - ]; - description = "A reusable library providing the core functionality of hledger"; - license = lib.licenses.gpl3Only; - }) {}; - - "hledger-lib_1_27_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base , blaze-markup, breakpoint, bytestring, call-stack, cassava , cassava-megaparsec, cmdargs, containers, data-default, Decimal - , deepseq, directory, doclayout, extra, file-embed, filepath, Glob - , hashtables, megaparsec, microlens, microlens-th, mtl - , parser-combinators, pretty-simple, regex-tdfa, safe, tabular + , deepseq, directory, doclayout, doctest, extra, file-embed + , filepath, Glob, hashtables, megaparsec, microlens, microlens-th + , mtl, parser-combinators, pretty-simple, regex-tdfa, safe, tabular , tasty, tasty-hunit, template-haskell, text, time, timeit , transformers, uglymemo, unordered-containers, utf8-string }: @@ -140923,12 +140529,48 @@ self: { testHaskellDepends = [ aeson aeson-pretty ansi-terminal array base blaze-markup breakpoint bytestring call-stack cassava cassava-megaparsec cmdargs containers + data-default Decimal deepseq directory doclayout doctest extra + file-embed filepath Glob hashtables megaparsec microlens + microlens-th mtl parser-combinators pretty-simple regex-tdfa safe + tabular tasty tasty-hunit template-haskell text time timeit + transformers uglymemo unordered-containers utf8-string + ]; + description = "A reusable library providing the core functionality of hledger"; + license = lib.licenses.gpl3Only; + }) {}; + + "hledger-lib_1_28" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base + , blaze-markup, bytestring, call-stack, cassava, cassava-megaparsec + , cmdargs, containers, data-default, Decimal, deepseq, directory + , doclayout, doctest, extra, file-embed, filepath, Glob, hashtables + , megaparsec, microlens, microlens-th, mtl, parser-combinators + , pretty-simple, regex-tdfa, safe, tabular, tasty, tasty-hunit + , template-haskell, text, time, timeit, transformers, uglymemo + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "hledger-lib"; + version = "1.28"; + sha256 = "098c36vx16xnjs27sn9h2794hyf7py5bhn1kaw8ira6akljgzh4k"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal array base blaze-markup bytestring + call-stack cassava cassava-megaparsec cmdargs containers data-default Decimal deepseq directory doclayout extra file-embed filepath Glob hashtables megaparsec microlens microlens-th mtl parser-combinators pretty-simple regex-tdfa safe tabular tasty tasty-hunit template-haskell text time timeit transformers uglymemo unordered-containers utf8-string ]; + testHaskellDepends = [ + aeson aeson-pretty ansi-terminal array base blaze-markup bytestring + call-stack cassava cassava-megaparsec cmdargs containers + data-default Decimal deepseq directory doclayout doctest extra + file-embed filepath Glob hashtables megaparsec microlens + microlens-th mtl parser-combinators pretty-simple regex-tdfa safe + tabular tasty tasty-hunit template-haskell text time timeit + transformers uglymemo unordered-containers utf8-string + ]; description = "A reusable library providing the core functionality of hledger"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; @@ -140957,36 +140599,6 @@ self: { }) {}; "hledger-stockquotes" = callPackage - ({ mkDerivation, aeson, base, bytestring, cmdargs, containers - , directory, hedgehog, hledger-lib, raw-strings-qq, req, safe - , safe-exceptions, scientific, split, tasty, tasty-hedgehog - , tasty-hunit, text, time, unordered-containers, xdg-basedir, yaml - }: - mkDerivation { - pname = "hledger-stockquotes"; - version = "0.1.2.0"; - sha256 = "064q6qz6rrahk9ri5hr1y6n17nmd4l124xb3l8q5rvm81x3hzp3x"; - revision = "1"; - editedCabalFile = "1dbcvypi8kcrcy38wbvhaadhs2fwjw1kh3xzzq07ss30a7gg3k8y"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers hledger-lib req safe scientific - split text time unordered-containers - ]; - executableHaskellDepends = [ - aeson base bytestring cmdargs directory raw-strings-qq - safe-exceptions text time xdg-basedir yaml - ]; - testHaskellDepends = [ - base hedgehog tasty tasty-hedgehog tasty-hunit - ]; - description = "Generate HLedger Price Directives From Daily Stock Quotes"; - license = lib.licenses.bsd3; - mainProgram = "hledger-stockquotes"; - }) {}; - - "hledger-stockquotes_0_1_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, containers , directory, hedgehog, hledger-lib, raw-strings-qq, req, safe , safe-exceptions, scientific, split, tasty, tasty-hedgehog @@ -141013,36 +140625,10 @@ self: { ]; description = "Generate HLedger Price Directives From Daily Stock Quotes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hledger-stockquotes"; }) {}; "hledger-ui" = callPackage - ({ mkDerivation, ansi-terminal, async, base, brick, cmdargs - , containers, data-default, directory, doclayout, extra, filepath - , fsnotify, hledger, hledger-lib, megaparsec, microlens - , microlens-platform, process, safe, split, text, text-zipper, time - , transformers, unix, vector, vty - }: - mkDerivation { - pname = "hledger-ui"; - version = "1.25"; - sha256 = "1sagm19anvs9b609s4rzlhjdjwd74ywbxf211j35ia5wslj8031x"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - ansi-terminal async base brick cmdargs containers data-default - directory doclayout extra filepath fsnotify hledger hledger-lib - megaparsec microlens microlens-platform process safe split text - text-zipper time transformers unix vector vty - ]; - description = "Curses-style terminal interface for the hledger accounting system"; - license = lib.licenses.gpl3Only; - mainProgram = "hledger-ui"; - maintainers = [ lib.maintainers.peti ]; - }) {}; - - "hledger-ui_1_27_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, breakpoint, brick , cmdargs, containers, data-default, directory, doclayout, extra , filepath, fsnotify, hledger, hledger-lib, megaparsec, microlens @@ -141063,9 +140649,34 @@ self: { ]; description = "Curses-style terminal interface for the hledger accounting system"; license = lib.licenses.gpl3Only; + mainProgram = "hledger-ui"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + + "hledger-ui_1_28" = callPackage + ({ mkDerivation, ansi-terminal, async, base, brick, cmdargs + , containers, data-default, directory, doclayout, extra, filepath + , fsnotify, hledger, hledger-lib, megaparsec, microlens + , microlens-platform, mtl, process, safe, split, text, text-zipper + , time, transformers, unix, vector, vty + }: + mkDerivation { + pname = "hledger-ui"; + version = "1.28"; + sha256 = "04jq73ra4gv5q5lj0ivhrabkxkvp278c0sqyv6sa9sks0iwlgm3p"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal async base brick cmdargs containers data-default + directory doclayout extra filepath fsnotify hledger hledger-lib + megaparsec microlens microlens-platform mtl process safe split text + text-zipper time transformers unix vector vty + ]; + description = "Curses-style terminal interface for the hledger accounting system"; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "hledger-ui"; - maintainers = [ lib.maintainers.peti ]; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "hledger-vty" = callPackage @@ -141089,43 +140700,6 @@ self: { }) {}; "hledger-web" = callPackage - ({ mkDerivation, aeson, base, base64, blaze-html, blaze-markup - , bytestring, case-insensitive, clientsession, cmdargs, conduit - , conduit-extra, containers, data-default, Decimal, directory - , extra, filepath, hjsmin, hledger, hledger-lib, hspec, http-client - , http-conduit, http-types, megaparsec, mtl, network, shakespeare - , template-haskell, text, time, transformers, unix-compat - , unordered-containers, utf8-string, wai, wai-cors, wai-extra - , wai-handler-launch, warp, yaml, yesod, yesod-core, yesod-form - , yesod-static, yesod-test - }: - mkDerivation { - pname = "hledger-web"; - version = "1.25"; - sha256 = "0bgy2whld4b5f3ahs0zbmrgh56i0drw5hv43wnb57qixcirhlf8g"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base64 blaze-html blaze-markup bytestring - case-insensitive clientsession cmdargs conduit conduit-extra - containers data-default Decimal directory extra filepath hjsmin - hledger hledger-lib hspec http-client http-conduit http-types - megaparsec mtl network shakespeare template-haskell text time - transformers unix-compat unordered-containers utf8-string wai - wai-cors wai-extra wai-handler-launch warp yaml yesod yesod-core - yesod-form yesod-static yesod-test - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base hledger hledger-lib hspec text yesod yesod-test - ]; - description = "Web-based user interface for the hledger accounting system"; - license = lib.licenses.gpl3Only; - mainProgram = "hledger-web"; - maintainers = [ lib.maintainers.peti ]; - }) {}; - - "hledger-web_1_27_1" = callPackage ({ mkDerivation, aeson, base, base64, blaze-html, blaze-markup , breakpoint, bytestring, case-insensitive, clientsession, cmdargs , conduit, conduit-extra, containers, data-default, Decimal @@ -141158,9 +140732,46 @@ self: { ]; description = "Web-based user interface for the hledger accounting system"; license = lib.licenses.gpl3Only; + mainProgram = "hledger-web"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + + "hledger-web_1_28" = callPackage + ({ mkDerivation, aeson, base, base64, blaze-html, blaze-markup + , bytestring, case-insensitive, clientsession, cmdargs, conduit + , conduit-extra, containers, data-default, Decimal, directory + , extra, filepath, hjsmin, hledger, hledger-lib, hspec, http-client + , http-conduit, http-types, megaparsec, mtl, network, shakespeare + , template-haskell, text, time, transformers, unix-compat + , unordered-containers, utf8-string, wai, wai-cors, wai-extra + , wai-handler-launch, warp, yaml, yesod, yesod-core, yesod-form + , yesod-static, yesod-test + }: + mkDerivation { + pname = "hledger-web"; + version = "1.28"; + sha256 = "143340249wbcq4nsykk2d32xv9r89znzl8fr9yhaab68zlppfyh1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64 blaze-html blaze-markup bytestring + case-insensitive clientsession cmdargs conduit conduit-extra + containers data-default Decimal directory extra filepath hjsmin + hledger hledger-lib hspec http-client http-conduit http-types + megaparsec mtl network shakespeare template-haskell text time + transformers unix-compat unordered-containers utf8-string wai + wai-cors wai-extra wai-handler-launch warp yaml yesod yesod-core + yesod-form yesod-static yesod-test + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base hledger hledger-lib hspec text yesod yesod-test + ]; + description = "Web-based user interface for the hledger accounting system"; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "hledger-web"; - maintainers = [ lib.maintainers.peti ]; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "hlibBladeRF" = callPackage @@ -141281,36 +140892,9 @@ self: { }) {}; "hlint" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs - , containers, cpphs, data-default, directory, extra, file-embed - , filepath, filepattern, ghc, ghc-boot, ghc-boot-th - , ghc-lib-parser-ex, hscolour, process, refact, text, transformers - , uniplate, unordered-containers, utf8-string, vector, yaml - }: - mkDerivation { - pname = "hlint"; - version = "3.3.6"; - sha256 = "0g4fnx0xlwny41dw01vxmfq9ibfwvpgf1cailj870k2wrbs2c9df"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-terminal base bytestring cmdargs containers cpphs - data-default directory extra file-embed filepath filepattern ghc - ghc-boot ghc-boot-th ghc-lib-parser-ex hscolour process refact text - transformers uniplate unordered-containers utf8-string vector yaml - ]; - executableHaskellDepends = [ base ]; - description = "Source code suggestions"; - license = lib.licenses.bsd3; - mainProgram = "hlint"; - maintainers = [ lib.maintainers.maralorn ]; - }) {}; - - "hlint_3_4_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, data-default, deriving-aeson, directory, extra - , file-embed, filepath, filepattern, ghc-lib-parser + , file-embed, filepath, filepattern, ghc, ghc-boot, ghc-boot-th , ghc-lib-parser-ex, hscolour, process, refact, text, transformers , uniplate, unordered-containers, utf8-string, vector, yaml }: @@ -141318,20 +140902,21 @@ self: { pname = "hlint"; version = "3.4.1"; sha256 = "0bkk03c9hacvfd73dk89g4r81b50g7pjgw5pavldali4qwss34cz"; + revision = "1"; + editedCabalFile = "1rdaffg5n179yfcn5zjwjb0bki09qy13gz2ijky455y9pbaz8yz9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal base bytestring cmdargs containers cpphs data-default deriving-aeson directory extra file-embed filepath - filepattern ghc-lib-parser ghc-lib-parser-ex hscolour process - refact text transformers uniplate unordered-containers utf8-string - vector yaml + filepattern ghc ghc-boot ghc-boot-th ghc-lib-parser-ex hscolour + process refact text transformers uniplate unordered-containers + utf8-string vector yaml ]; executableHaskellDepends = [ base ]; description = "Source code suggestions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hlint"; maintainers = [ lib.maintainers.maralorn ]; }) {}; @@ -141455,13 +141040,14 @@ self: { pname = "hlrdb"; version = "0.4.0.0"; sha256 = "0cj2ff40n3v171xhvdips3als1f2x91ksxcqm7i570mwkdgbh1jr"; + revision = "1"; + editedCabalFile = "0ymp486cfw71vv2ydn9dgaixmq5dgcpy5x1jzibrld5cd14fs3gg"; libraryHaskellDepends = [ base base64 bytestring cryptonite hashable hedis hlrdb-core memory random store time unordered-containers zstd ]; description = "High-level Redis Database"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hlrdb-core" = callPackage @@ -141472,16 +141058,14 @@ self: { pname = "hlrdb-core"; version = "0.2.0.0"; sha256 = "0hkjll4v4kxc133b19kk9k4dkrbag6qdw24gwrhikrxlk666jsbl"; - revision = "1"; - editedCabalFile = "15pcz7f2alsyccz5id162ka4win9j6l98ygpgaycl6n57vcd3nsv"; + revision = "2"; + editedCabalFile = "1ql8dg9axrwrlz8wnxx7zkw8i5761qqlhkiy5frc3p5nqvxmf18b"; libraryHaskellDepends = [ base bytestring hashable hedis lens mtl profunctors random time unordered-containers ]; description = "High-level Redis Database Core API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls" = callPackage @@ -141498,17 +141082,17 @@ self: { }) {}; "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, aeson, base, containers, extra, 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.2.0.0"; - sha256 = "1rwb24nnwqgqm08yq8737sfan3zvfnccympjrnfjqdj0xihb77j0"; + version = "1.3.0.0"; + sha256 = "0ll16wsdm0r09ibg73n83vnx27kapwn034h39xh6ysdmbc8vf0kj"; libraryHaskellDepends = [ - aeson base containers ghc-boot-th ghcide hie-compat hls-graph + aeson base containers extra ghc-boot-th ghcide hie-compat hls-graph hls-plugin-api lens lsp mtl regex-tdfa syb text unordered-containers ]; @@ -141521,39 +141105,73 @@ self: { }) {}; "hls-brittany-plugin" = callPackage - ({ mkDerivation, base, brittany, czipwith, extra, filepath - , ghc-boot-th, ghc-exactprint, ghcide, hls-plugin-api - , hls-test-utils, lens, lsp-types, text, transformers - }: + ({ mkDerivation }: mkDerivation { pname = "hls-brittany-plugin"; - version = "1.0.2.2"; - sha256 = "0spr7qmqjkg0aqr16cp9pi5dqc10lskhqa6mpx49z0rifhk84hay"; - libraryHaskellDepends = [ - 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 ]; + version = "1.1.0.0"; + sha256 = "11hnkbpg13zvnq69svm46zm5k55yshgz97kjjx1g3jcb9ah1brm1"; description = "Integration with the Brittany code formatter"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "hls-cabal-fmt-plugin" = callPackage + ({ mkDerivation, base, directory, filepath, ghcide, hls-plugin-api + , hls-test-utils, lens, lsp-types, process, text, transformers + }: + mkDerivation { + pname = "hls-cabal-fmt-plugin"; + version = "0.1.0.0"; + sha256 = "1zny0rv6f5km6hwpwq1n9c6chm3ny74d67spyqcmmlrxpqpfc6mp"; + libraryHaskellDepends = [ + base directory filepath ghcide hls-plugin-api lens lsp-types + process text transformers + ]; + testHaskellDepends = [ base directory filepath hls-test-utils ]; + description = "Integration with the cabal-fmt code formatter"; + license = lib.licenses.asl20; + }) {}; + + "hls-cabal-plugin" = callPackage + ({ mkDerivation, base, bytestring, Cabal, deepseq, directory, extra + , filepath, ghcide, hashable, hls-graph, hls-plugin-api + , hls-test-utils, lens, lsp, lsp-types, regex-tdfa, stm + , tasty-hunit, text, unordered-containers + }: + mkDerivation { + pname = "hls-cabal-plugin"; + version = "0.1.0.0"; + sha256 = "0f4vag33gl25dfv4gxxi7ldfaaaczv96pwmasmv0imkhnqzgprd5"; + libraryHaskellDepends = [ + base bytestring Cabal deepseq directory extra ghcide hashable + hls-graph hls-plugin-api lsp lsp-types regex-tdfa stm text + unordered-containers + ]; + testHaskellDepends = [ + base bytestring filepath ghcide hls-test-utils lens lsp-types + tasty-hunit text + ]; + description = "Cabal integration plugin with Haskell Language Server"; + license = lib.licenses.mit; }) {}; "hls-call-hierarchy-plugin" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, extra - , filepath, ghc, ghcide, hiedb, hls-plugin-api, hls-test-utils - , lens, lsp, lsp-test, sqlite-simple, text, unordered-containers + ({ mkDerivation, aeson, base, containers, extra, filepath, ghcide + , ghcide-test-utils, hiedb, hls-plugin-api, hls-test-utils, lens + , lsp, lsp-test, sqlite-simple, text, unordered-containers }: mkDerivation { pname = "hls-call-hierarchy-plugin"; - version = "1.1.0.0"; - sha256 = "1010lwrgp3qs3i9rpsphfiq72d8qisvz4jn9rn09h1wdc10bl7sg"; + version = "1.2.0.0"; + sha256 = "0x5568l5n8dr7vnk12msczcabpg5ffqbqs50rg5gfj1w6n673y41"; libraryHaskellDepends = [ - aeson base bytestring containers extra ghc ghcide hiedb - hls-plugin-api lens lsp sqlite-simple text unordered-containers + aeson base containers extra ghcide hiedb hls-plugin-api lens lsp + sqlite-simple text unordered-containers ]; testHaskellDepends = [ - aeson base containers extra filepath hls-test-utils lens lsp - lsp-test text + aeson base containers extra filepath ghcide-test-utils + hls-test-utils lens lsp lsp-test text ]; description = "Call hierarchy plugin for Haskell Language Server"; license = lib.licenses.asl20; @@ -141566,8 +141184,8 @@ self: { }: mkDerivation { pname = "hls-change-type-signature-plugin"; - version = "1.0.1.1"; - sha256 = "1sgnx7jl7cfklds2vka4sbrc7462spmjfhw34r7kn52m1079x1k2"; + version = "1.1.0.0"; + sha256 = "1n5q5sh6a3miq10fvi7k98jm0yx83hk1p0760jn7084zl443r61m"; libraryHaskellDepends = [ base ghcide hls-plugin-api lsp-types regex-tdfa syb text transformers unordered-containers @@ -141587,8 +141205,8 @@ self: { }: mkDerivation { pname = "hls-class-plugin"; - version = "1.1.0.0"; - sha256 = "049vz69a0xfbc8b3lhf35lcss2pig7nrln6k7n2y5f28dhb3dy00"; + version = "1.1.1.0"; + sha256 = "1qy7r88rbqqy8hnzfzpjbh0jrp9mgffxdrhd80if8fxh0xwpq90s"; libraryHaskellDepends = [ aeson base containers deepseq extra ghc ghc-boot-th ghc-exactprint ghcide hls-graph hls-plugin-api lens lsp text transformers @@ -141609,8 +141227,8 @@ self: { }: mkDerivation { pname = "hls-code-range-plugin"; - version = "1.0.0.0"; - sha256 = "1jk0nklplwbdikp1y5r1w7l0ab3i28isibdd15prcxjf98rsp8m9"; + version = "1.1.0.0"; + sha256 = "1qziqda7gk46a253qx8z0yd4dxhjmi1dl5k3c6rv3jv7i4qci30r"; libraryHaskellDepends = [ aeson base containers deepseq extra ghcide hashable hls-plugin-api lens lsp mtl semigroupoids text transformers vector @@ -141619,7 +141237,7 @@ self: { base bytestring containers filepath ghcide hls-test-utils lens lsp lsp-test tasty-hunit text transformers vector ]; - description = "HLS Plugin to support smart selection range"; + description = "HLS Plugin to support smart selection range and Folding range"; license = lib.licenses.asl20; }) {}; @@ -141633,8 +141251,8 @@ self: { }: mkDerivation { pname = "hls-eval-plugin"; - version = "1.3.0.0"; - sha256 = "0nzrlggabh8s822zc0hirqj943f9b7hkd45yl3dhf2vkgxwm377s"; + version = "1.4.0.0"; + sha256 = "17llknik5f988797xrbvrhv95n79bp6ydz6k0rqyhwpdy9fil71v"; libraryHaskellDepends = [ aeson base containers data-default deepseq Diff directory dlist extra filepath ghc ghc-boot-th ghc-paths ghcide hashable hls-graph @@ -141666,20 +141284,20 @@ self: { description = "Common utilities to interaction between ghc-exactprint and HLS plugins"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls-explicit-fixity-plugin" = callPackage ({ mkDerivation, base, containers, deepseq, extra, filepath, ghc , ghcide, hashable, hls-plugin-api, hls-test-utils, lsp, text + , transformers }: mkDerivation { pname = "hls-explicit-fixity-plugin"; - version = "1.0.0.0"; - sha256 = "0nwfx9k6yaja3qm2s3bckyfl7qagfb1cly602xcrzrc85q1zg4lx"; + version = "1.1.0.0"; + sha256 = "09saakffpncm7p3148m4pz0g1wsrcgmv845ksn58rqvpdkzv0wsw"; libraryHaskellDepends = [ base containers deepseq extra ghc ghcide hashable hls-plugin-api - lsp text + lsp text transformers ]; testHaskellDepends = [ base filepath hls-test-utils text ]; description = "Show fixity explicitly while hovering"; @@ -141693,8 +141311,8 @@ self: { }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "1.1.0.1"; - sha256 = "0xdh9mvhdq9cgw33gi6q46ik010d6mv5acxj07pwca48dks3c2bx"; + version = "1.2.0.0"; + sha256 = "1302xb5p6cvdr715qc231k0qyzf94y98wlmpxnr6bzd0rz0cjh31"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api lsp text unordered-containers @@ -141704,14 +141322,34 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-explicit-record-fields-plugin" = callPackage + ({ mkDerivation, base, containers, filepath, ghc-boot-th, ghcide + , hls-graph, hls-plugin-api, hls-test-utils, lens, lsp, lsp-test + , syb, text, transformers, unordered-containers + }: + mkDerivation { + pname = "hls-explicit-record-fields-plugin"; + version = "1.0.0.0"; + sha256 = "1jywzjz98ixsb9n1kfv09lyc2vl77qbw6hiqwnzxs2cbjw5mkpgb"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghcide hls-graph hls-plugin-api lens + lsp syb text transformers unordered-containers + ]; + testHaskellDepends = [ + base filepath hls-test-utils lsp-test text + ]; + description = "Explicit record fields plugin for Haskell Language Server"; + license = lib.licenses.bsd3; + }) {}; + "hls-floskell-plugin" = callPackage ({ mkDerivation, base, filepath, floskell, ghcide, hls-plugin-api , hls-test-utils, lsp-types, text, transformers }: mkDerivation { pname = "hls-floskell-plugin"; - version = "1.0.1.2"; - sha256 = "06klnrgz6jsxxsy4gpf2mcnbj35kd9gp3xy9l0pyhki14fhi5y4p"; + version = "1.0.2.0"; + sha256 = "1lsfqimmpb4s4j8zwwnxlnxnjhclmg589p54c6mhzgwyhk3llw9i"; libraryHaskellDepends = [ base floskell ghcide hls-plugin-api lsp-types text transformers ]; @@ -141727,8 +141365,8 @@ self: { }: mkDerivation { pname = "hls-fourmolu-plugin"; - version = "1.1.0.0"; - sha256 = "1b3yzzg7lkf57qlv8hr7y15kd88dxijzxhardi27l4p6kh2bv1r1"; + version = "1.1.1.0"; + sha256 = "1gxsx1qskjgm0vgqw7cy33mlkczqr7b6whlykppbpnsfxa2il4jg"; libraryHaskellDepends = [ base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens lsp process-extras text @@ -141750,8 +141388,8 @@ self: { }: mkDerivation { pname = "hls-gadt-plugin"; - version = "1.0.0.0"; - sha256 = "09k1ykb7694v9zmhr78dwbwdp33zvs3vnbq02hsinchhaqb3xj54"; + version = "1.0.1.0"; + sha256 = "10j6fiyxnf5zc0cmgiyb09w2f1dz0g23c4dmflkiz258p12wam4s"; libraryHaskellDepends = [ aeson base containers extra ghc ghc-boot-th ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lens lsp mtl text transformers @@ -141768,19 +141406,18 @@ self: { ({ mkDerivation, aeson, async, base, bytestring, containers , deepseq, directory, exceptions, extra, filepath, focus, hashable , hspec, hspec-discover, js-dgtable, js-flot, js-jquery, list-t - , primitive, stm, stm-containers, tasty, tasty-hspec, tasty-hunit - , tasty-rerun, text, time, transformers, unliftio - , unordered-containers + , stm, stm-containers, tasty, tasty-hspec, tasty-hunit, tasty-rerun + , text, time, transformers, unliftio, unordered-containers }: mkDerivation { pname = "hls-graph"; - version = "1.8.0.0"; - sha256 = "02lliak6nn2cjah0xvwgxb2gsryckgqjly064p4x7f10anrfw62a"; + version = "1.9.0.0"; + sha256 = "0k40cjp52ssp6axb60aqh0ipnm477pps5q1d0smbclhrd9w6gp14"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base bytestring containers deepseq directory exceptions extra filepath focus hashable js-dgtable js-flot js-jquery list-t - primitive stm stm-containers time transformers unliftio + stm stm-containers text time transformers unliftio unordered-containers ]; testHaskellDepends = [ @@ -141793,21 +141430,15 @@ self: { }) {}; "hls-haddock-comments-plugin" = callPackage - ({ mkDerivation, base, containers, filepath, ghc, ghc-exactprint - , ghcide, hls-plugin-api, hls-refactor-plugin, hls-test-utils - , lsp-types, text, unordered-containers - }: + ({ mkDerivation }: mkDerivation { pname = "hls-haddock-comments-plugin"; - version = "1.1.0.0"; - sha256 = "0g0vwn5mcl4g1gxzg501mchxyyqwz83hjhqzai33qsmklcmnk5rc"; - libraryHaskellDepends = [ - base containers ghc ghc-exactprint ghcide hls-plugin-api - hls-refactor-plugin lsp-types text unordered-containers - ]; - testHaskellDepends = [ base filepath hls-test-utils text ]; + version = "1.1.1.0"; + sha256 = "008q2ybk13180vds9ban61j5k80vxrzn2jx7q6d0bd18jsj7xdvn"; description = "Haddock comments plugin for Haskell Language Server"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hls-hlint-plugin" = callPackage @@ -141820,8 +141451,8 @@ self: { }: mkDerivation { pname = "hls-hlint-plugin"; - version = "1.1.0.0"; - sha256 = "1xr6ayzjd12y6l3dd8azlgks7fsiy87z5n14grf7yw65pdfrvgni"; + version = "1.1.1.0"; + sha256 = "10r0kd1w2yxy6r32ar41ca74l4s26cfhywz46rk3d3n6pn71dnlx"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default deepseq Diff directory extra filepath ghc-exactprint ghc-lib-parser @@ -141844,8 +141475,8 @@ self: { }: mkDerivation { pname = "hls-module-name-plugin"; - version = "1.1.0.0"; - sha256 = "1xjj1sbq3a71z37dcsgv0cd3qjklm4fl5grnivprgywa71a8k201"; + version = "1.1.1.0"; + sha256 = "06p0grkkwy1zdik2lq84c0qikfggry5iicldi5xs0xs0skj5y6w2"; libraryHaskellDepends = [ aeson base directory filepath ghcide hls-plugin-api lsp text transformers unordered-containers @@ -141862,8 +141493,8 @@ self: { }: mkDerivation { pname = "hls-ormolu-plugin"; - version = "1.0.2.2"; - sha256 = "063sy86mkrjnhycwq7ifbm3w0h7wc2df8wm3p4wd45mpk9r0cqsb"; + version = "1.0.3.0"; + sha256 = "018j6w2ll7g11bpq7gy7jpkpl9c8ajlhxr6zxd2b179spz5bvivl"; libraryHaskellDepends = [ base filepath ghc ghc-boot-th ghcide hls-plugin-api lens lsp ormolu text @@ -141874,25 +141505,30 @@ self: { }) {}; "hls-plugin-api" = callPackage - ({ mkDerivation, aeson, base, containers, data-default - , dependent-map, dependent-sum, Diff, dlist, extra, filepath, ghc - , hashable, hls-graph, lens, lens-aeson, lsp, lsp-types - , opentelemetry, optparse-applicative, process, regex-tdfa, tasty - , tasty-hunit, tasty-rerun, text, transformers, unix - , unordered-containers + ({ mkDerivation, aeson, base, containers, criterion, data-default + , deepseq, dependent-map, dependent-sum, Diff, dlist, extra + , filepath, ghc, hashable, hls-graph, hw-fingertree, lens + , lens-aeson, lsp, lsp-types, megaparsec, opentelemetry + , optparse-applicative, random, random-fu, regex-tdfa, tasty + , tasty-hunit, tasty-quickcheck, tasty-rerun, text, transformers + , unix, unordered-containers }: mkDerivation { pname = "hls-plugin-api"; - version = "1.5.0.0"; - sha256 = "0vw3bldcrhmq0xfj5k07p67rz0w05ls542q18429g2ikxqyw1rz5"; + version = "1.6.0.0"; + sha256 = "1d5ry2bfa7y76wzwz445h9hpgll1fp6lj2gjq4q5qwcs17y8ph5m"; libraryHaskellDepends = [ aeson base containers data-default dependent-map dependent-sum Diff - dlist extra filepath ghc hashable hls-graph lens lens-aeson lsp - opentelemetry optparse-applicative process regex-tdfa text - transformers unix unordered-containers + dlist extra filepath ghc hashable hls-graph hw-fingertree lens + lens-aeson lsp megaparsec opentelemetry optparse-applicative + regex-tdfa text transformers unix unordered-containers ]; testHaskellDepends = [ - base lsp-types tasty tasty-hunit tasty-rerun + base containers lsp-types tasty tasty-hunit tasty-quickcheck + tasty-rerun text + ]; + benchmarkHaskellDepends = [ + base criterion deepseq lsp-types random random-fu ]; description = "Haskell Language Server API for plugin communication"; license = lib.licenses.asl20; @@ -141905,8 +141541,8 @@ self: { }: mkDerivation { pname = "hls-pragmas-plugin"; - version = "1.0.3.0"; - sha256 = "17fnfndym9w689rp6l7xb3qfb9i603blr52s0qyznmbkdk2l81kl"; + version = "1.0.4.0"; + sha256 = "1cv5m04yzbqvd70rkg1bfry67hzfqn94j4vv13sx15z6cna7nid5"; libraryHaskellDepends = [ base containers extra fuzzy ghc ghcide hls-plugin-api lens lsp text transformers unordered-containers @@ -141925,10 +141561,8 @@ self: { }: mkDerivation { pname = "hls-qualify-imported-names-plugin"; - version = "1.0.1.0"; - sha256 = "0h456cq3qvksrkzfzpq2qsabsl3vpg4gh2mwyxc39xh4qm7ifban"; - revision = "2"; - editedCabalFile = "1adnnd8fg4pfdc6n1797naqf4pmgspisjmw121mk39y02b057cdw"; + version = "1.0.2.0"; + sha256 = "0b2q39bkl9xgq266lq9gffz393lflg26j4pbqpsrj9pv2lkdkb3f"; libraryHaskellDepends = [ aeson base containers deepseq dlist ghc ghcide hls-graph hls-plugin-api lsp text transformers unordered-containers @@ -141949,8 +141583,8 @@ self: { }: mkDerivation { pname = "hls-refactor-plugin"; - version = "1.0.0.0"; - sha256 = "0gn35af8yfdaq7dnbc8x0p79jf2lxs1wvka8xcjcclg3sxji04d1"; + version = "1.1.0.0"; + sha256 = "1cp3w5h3x4mvcd0ipf4gvh3qzjbdl9f6jpznznspdqz5ac53257a"; libraryHaskellDepends = [ aeson base bytestring containers data-default deepseq dlist extra ghc ghc-boot ghc-exactprint ghcide hls-graph hls-plugin-api lens @@ -141959,7 +141593,7 @@ self: { ]; testHaskellDepends = [ aeson async base containers data-default directory extra filepath - ghcide ghcide-test-utils hls-plugin-api hls-test-utils lens + ghc ghcide ghcide-test-utils hls-plugin-api hls-test-utils lens lsp-test lsp-types network-uri parser-combinators regex-tdfa shake tasty tasty-expected-failure tasty-hunit tasty-rerun text text-rope ]; @@ -141974,8 +141608,8 @@ self: { }: mkDerivation { pname = "hls-refine-imports-plugin"; - version = "1.0.3.0"; - sha256 = "1rw9vdpzg63506b289rar0csdqniv1alc37q33x9x65qlvkqf9dh"; + version = "1.0.4.0"; + sha256 = "0rd66jswimmyhfflw1nzgh53q4i8lj4clhny9lm0mplgy76y1c3d"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-explicit-imports-plugin hls-graph hls-plugin-api lsp text @@ -141994,8 +141628,8 @@ self: { }: mkDerivation { pname = "hls-rename-plugin"; - version = "1.0.1.0"; - sha256 = "0619vjcyfdjln5v2gc6hpdvl5lwx8kg97zlqpz937742q6bvkb66"; + version = "1.0.2.0"; + sha256 = "16hzr13k8dafdpsr23wz8kyjjyybdg2v41r10iy5csjggyqp9iq7"; libraryHaskellDepends = [ base containers extra ghc ghc-exactprint ghcide hashable hiedb hls-plugin-api hls-refactor-plugin lsp lsp-types mod syb text @@ -142016,8 +141650,8 @@ self: { }: mkDerivation { pname = "hls-retrie-plugin"; - version = "1.0.2.2"; - sha256 = "19ljig86aw5y0f6w83wgl5aazybh6nlzmigy12p5ldnbl027r4ry"; + version = "1.0.3.0"; + sha256 = "1gfvdymbyhdahwfp02fw5rywpbr6kfs3ggjvblxvj7v2jz62q9ry"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory extra ghc ghcide hashable hls-plugin-api lsp lsp-types retrie safe-exceptions stm @@ -142060,8 +141694,8 @@ self: { }: mkDerivation { pname = "hls-splice-plugin"; - version = "1.0.2.0"; - sha256 = "0dq726cxgya756rx40nqhb7lz6fxd38y3r2cgvywc8jp0crpvmyc"; + version = "1.0.3.0"; + sha256 = "01p098ndnw6s3a6229bj36rpyim39s2kfld2fq40cwlmpll1pr4h"; libraryHaskellDepends = [ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lens lsp retrie syb text @@ -142076,8 +141710,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "hls-stan-plugin"; - version = "1.0.0.0"; - sha256 = "03pg68gmardqkx9xa218bb0j4b1f0h5p6gn6xzfwmdj5c005rxjk"; + version = "1.0.1.0"; + sha256 = "07wvjzi6422c63dwm28xj6ba5zhbxgb2y4fldahy1h8bfrc8vjkx"; description = "Stan integration plugin with Haskell Language Server"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -142091,8 +141725,8 @@ self: { }: mkDerivation { pname = "hls-stylish-haskell-plugin"; - version = "1.0.1.1"; - sha256 = "1k9bv31226zgy5aqxzzj7npph2ff0r5bx692q5n26lpil2ivq6sn"; + version = "1.0.1.2"; + sha256 = "061bqhy6ldrkvp76w2kvdrgzss0rqyhj1nsnqafrr4rdqc1x8y4c"; libraryHaskellDepends = [ base directory filepath ghc ghc-boot-th ghcide hls-plugin-api lsp-types stylish-haskell text @@ -142103,34 +141737,15 @@ self: { }) {}; "hls-tactics-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, directory, extra - , filepath, fingertree, generic-lens, ghc, ghc-boot-th - , ghc-exactprint, ghc-source-gen, ghcide, hls-graph, hls-plugin-api - , hls-refactor-plugin, hls-test-utils, hspec, hspec-discover - , hspec-expectations, hyphenation, lens, lsp, lsp-types, megaparsec - , mtl, parser-combinators, prettyprinter, QuickCheck, refinery - , retrie, syb, tasty-hspec, tasty-hunit, text, transformers - , unagi-chan, unordered-containers - }: + ({ mkDerivation }: mkDerivation { pname = "hls-tactics-plugin"; - version = "1.7.0.0"; - sha256 = "097jkwcdmpabfniqj725bm67z4nf4ir2yh0zxjl4h1zn7lyldqdd"; - libraryHaskellDepends = [ - aeson base containers deepseq directory extra filepath fingertree - generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide - hls-graph hls-plugin-api hls-refactor-plugin hyphenation lens lsp - megaparsec mtl parser-combinators prettyprinter refinery retrie syb - text transformers unagi-chan unordered-containers - ]; - testHaskellDepends = [ - aeson base containers deepseq directory filepath ghc ghcide - hls-plugin-api hls-test-utils hspec hspec-expectations lens - lsp-types mtl QuickCheck tasty-hspec tasty-hunit text - ]; - testToolDepends = [ hspec-discover ]; + version = "1.8.0.0"; + sha256 = "06kxgjds3sv2ygqig9wjc7xys97qgfv1cnpn988s6ji6840bral4"; description = "Wingman plugin for Haskell Language Server"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hls-test-utils" = callPackage @@ -142142,8 +141757,8 @@ self: { }: mkDerivation { pname = "hls-test-utils"; - version = "1.4.0.0"; - sha256 = "01j85mpcj7klvsbfwfvp9zs7985hxl23bj56lqgh2gd73b5g14xd"; + version = "1.5.0.0"; + sha256 = "032y0xa5b9p4idkn4ac6qn28clf1xmhwqc28gwvnq4hz8h6lxng3"; libraryHaskellDepends = [ aeson async base blaze-markup bytestring containers data-default directory extra filepath ghcide hls-graph hls-plugin-api lens lsp @@ -142184,6 +141799,7 @@ self: { description = "Haskell LilyPond"; license = "GPL"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hmark" = callPackage @@ -142230,6 +141846,8 @@ self: { pname = "hmatrix"; version = "0.20.2"; sha256 = "05462prqkbqpxfbzsgsp8waf0sirg2qz6lzsk7r1ll752n7gqkbg"; + revision = "1"; + editedCabalFile = "154n2hddfk90rqd9fwwhfjnq6ab701nglsrdjss71brza93wjy8d"; configureFlags = [ "-fdisable-default-paths" "-fopenblas" ]; libraryHaskellDepends = [ array base binary bytestring deepseq primitive random semigroups @@ -142486,7 +142104,6 @@ self: { description = "hmatrix interface to sundials"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {sundials_arkode = null; sundials_cvode = null;}; "hmatrix-svdlibc" = callPackage @@ -142740,6 +142357,7 @@ self: { doHaddock = false; description = "Hidden Markov Models using LAPACK primitives"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hmp3" = callPackage @@ -142772,8 +142390,8 @@ self: { }: mkDerivation { pname = "hmp3-ng"; - version = "2.12.1"; - sha256 = "15fm6kgdlhzz8y9mhfvmhh0dqzicifv6apsiwm964qbxhgv0ww4y"; + version = "2.14.2"; + sha256 = "1qx8gy63m0q2wb4q6aifrfqmdh0vnanvxxwa47jpwv641sxbp1ck"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -142782,44 +142400,60 @@ self: { ]; executableSystemDepends = [ ncurses ]; description = "A 2019 fork of an ncurses mp3 player written in Haskell"; - license = "GPL"; + license = lib.licenses.gpl2Plus; mainProgram = "hmp3"; }) {inherit (pkgs) ncurses;}; "hmpfr" = callPackage - ({ mkDerivation, base, integer-gmp, mpfr }: + ({ mkDerivation, base, mpfr }: mkDerivation { pname = "hmpfr"; - version = "0.4.4"; - sha256 = "1x8n5245rm0brjl7vhcabazh1k69dcjdas70pnrnlkx26bqfpb9b"; + version = "0.4.5"; + sha256 = "1m2yfaacc4c6ak3dm9k9623kgz8mgqr922apzz79dx9yccpgn2ml"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base integer-gmp ]; + libraryHaskellDepends = [ base ]; librarySystemDepends = [ mpfr ]; description = "Haskell binding to the MPFR library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) mpfr;}; "hmt" = callPackage - ({ mkDerivation, aeson, array, base, bytestring, colour, containers - , data-ordlist, directory, fgl, filepath, hsc3, lazy-csv, logict - , multiset-comb, parsec, permutation, primes, process, random, safe - , split, text, time + ({ mkDerivation, array, base, bytestring, colour, containers + , data-memocombinators, data-ordlist, directory, fgl, filepath + , hmt-base, lazy-csv, logict, multiset-comb, parsec, primes + , process, random, safe, split, strict, text, time }: mkDerivation { pname = "hmt"; - version = "0.18"; - sha256 = "14c54z5zcg84nvq80yv3j3n6l7nha1l772vg3nsfsgy6fg430xdb"; + version = "0.20"; + sha256 = "0nz1k7xyyv51yjxlndwbqlg2vwrgxc7mj362nfclqfmly0ml0ynf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson array base bytestring colour containers data-ordlist - directory fgl filepath hsc3 lazy-csv logict multiset-comb parsec - permutation primes process random safe split text time + array base bytestring colour containers data-memocombinators + data-ordlist directory fgl filepath hmt-base lazy-csv logict + multiset-comb parsec primes process random safe split strict text + time ]; description = "Haskell Music Theory"; - license = "GPL"; - hydraPlatforms = lib.platforms.none; + license = lib.licenses.gpl3Only; + }) {}; + + "hmt-base" = callPackage + ({ mkDerivation, array, base, bytestring, containers, data-ordlist + , directory, filepath, lazy-csv, monad-loops, process, random, safe + , split, text, time + }: + mkDerivation { + pname = "hmt-base"; + version = "0.20"; + sha256 = "1g28if5b4azpbj28s4p6n76i2bami5przmh9f2axaj3awpk1ly2r"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base bytestring containers data-ordlist directory filepath + lazy-csv monad-loops process random safe split text time + ]; + description = "Haskell Music Theory Base"; + license = lib.licenses.gpl3Only; }) {}; "hmt-diagrams" = callPackage @@ -142893,63 +142527,6 @@ self: { }) {inherit (pkgs) netcdf;}; "hnix" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, binary - , bytestring, comonad, containers, criterion, cryptonite, data-fix - , deepseq, deriving-compat, Diff, directory, exceptions, filepath - , free, gitrev, Glob, hashable, hashing, haskeline, hedgehog - , hnix-store-core, hnix-store-remote, http-client, http-client-tls - , http-types, lens-family, lens-family-core, lens-family-th, logict - , megaparsec, monad-control, monadlist, mtl, neat-interpolation - , optparse-applicative, parser-combinators, pretty-show - , prettyprinter, process, ref-tf, regex-tdfa, relude, repline - , scientific, semialign, serialise, some, split, syb, tasty - , tasty-hedgehog, tasty-hunit, tasty-th, template-haskell, text - , th-lift-instances, these, time, transformers, transformers-base - , unix, unordered-containers, vector, xml - }: - mkDerivation { - pname = "hnix"; - version = "0.14.0.8"; - sha256 = "101zbbrqs3fv1kxp428r97pq59fa6g0qkj1bqnsfchv4mxizg8jc"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson array base base16-bytestring binary bytestring comonad - containers cryptonite data-fix deepseq deriving-compat directory - exceptions filepath free gitrev hashable hashing hnix-store-core - hnix-store-remote http-client http-client-tls http-types - lens-family lens-family-core lens-family-th logict megaparsec - monad-control monadlist mtl neat-interpolation optparse-applicative - parser-combinators pretty-show prettyprinter process ref-tf - regex-tdfa relude scientific semialign serialise some split syb - template-haskell text th-lift-instances these time transformers - transformers-base unix unordered-containers vector xml - ]; - executableHaskellDepends = [ - aeson base comonad containers data-fix deepseq exceptions filepath - free haskeline optparse-applicative pretty-show prettyprinter - ref-tf relude repline serialise template-haskell time - ]; - testHaskellDepends = [ - base containers data-fix Diff directory exceptions filepath Glob - hedgehog megaparsec neat-interpolation optparse-applicative - pretty-show prettyprinter process relude serialise split tasty - tasty-hedgehog tasty-hunit tasty-th template-haskell time unix - ]; - benchmarkHaskellDepends = [ - base criterion data-fix exceptions filepath optparse-applicative - relude serialise template-haskell time - ]; - description = "Haskell implementation of the Nix language"; - license = lib.licenses.bsd3; - mainProgram = "hnix"; - maintainers = [ - lib.maintainers.Anton-Latukha lib.maintainers.sorki - ]; - }) {}; - - "hnix_0_16_0" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, binary , bytestring, comonad, containers, criterion, cryptonite, data-fix , deepseq, deriving-compat, Diff, directory, exceptions, filepath @@ -143000,14 +142577,13 @@ self: { ]; description = "Haskell implementation of the Nix language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hnix"; maintainers = [ lib.maintainers.Anton-Latukha lib.maintainers.sorki ]; }) {}; - "hnix-store-core_0_5_0_0" = callPackage + "hnix-store-core" = callPackage ({ mkDerivation, algebraic-graphs, attoparsec, base , base16-bytestring, base64-bytestring, binary, bytestring, cereal , containers, cryptonite, directory, filepath, hashable, hspec @@ -143037,13 +142613,12 @@ self: { testToolDepends = [ tasty-discover ]; description = "Core effects for interacting with the Nix store"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Anton-Latukha lib.maintainers.sorki ]; }) {}; - "hnix-store-core" = callPackage + "hnix-store-core_0_6_1_0" = callPackage ({ mkDerivation, algebraic-graphs, attoparsec, base , base16-bytestring, base64-bytestring, binary, bytestring, cereal , containers, cryptonite, directory, filepath, hashable, hspec @@ -143054,8 +142629,8 @@ self: { }: mkDerivation { pname = "hnix-store-core"; - version = "0.6.0.0"; - sha256 = "1ypwkwc21dx2716chv7qpq75qs7hshy45sdbgwk1h33maisnkn88"; + version = "0.6.1.0"; + sha256 = "1bziw2avcahqn2fpzw40s74kdw9wjvcplp6r2zrg83rbh2k1x73p"; libraryHaskellDepends = [ algebraic-graphs attoparsec base base16-bytestring base64-bytestring bytestring cereal containers cryptonite directory @@ -143072,12 +142647,13 @@ self: { testToolDepends = [ tasty-discover ]; description = "Core effects for interacting with the Nix store"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Anton-Latukha lib.maintainers.sorki ]; }) {}; - "hnix-store-remote_0_5_0_0" = callPackage + "hnix-store-remote" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers , cryptonite, hnix-store-core, mtl, network, nix-derivation, text , time, unordered-containers @@ -143093,13 +142669,12 @@ self: { ]; description = "Remote hnix store"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Anton-Latukha lib.maintainers.sorki ]; }) {}; - "hnix-store-remote" = callPackage + "hnix-store-remote_0_6_0_0" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers , cryptonite, hnix-store-core, mtl, network, nix-derivation, relude , text, time, unordered-containers @@ -143115,6 +142690,7 @@ self: { ]; description = "Remote hnix store"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Anton-Latukha lib.maintainers.sorki ]; @@ -143249,24 +142825,6 @@ self: { }) {}; "hoauth2" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , data-default, exceptions, http-conduit, http-types, microlens - , text, transformers, uri-bytestring, uri-bytestring-aeson - }: - mkDerivation { - pname = "hoauth2"; - version = "2.3.0"; - sha256 = "10y4ik96h61msapqh0rjmb5vjv7kfky6z9iffsln046an59b759v"; - libraryHaskellDepends = [ - aeson base binary bytestring containers data-default exceptions - http-conduit http-types microlens text transformers uri-bytestring - uri-bytestring-aeson - ]; - description = "Haskell OAuth2 authentication client"; - license = lib.licenses.bsd3; - }) {}; - - "hoauth2_2_6_0" = callPackage ({ mkDerivation, aeson, base, base64, binary, bytestring , containers, cryptonite, data-default, exceptions, http-conduit , http-types, memory, microlens, text, transformers, uri-bytestring @@ -143283,22 +142841,70 @@ self: { ]; description = "Haskell OAuth2 authentication client"; license = lib.licenses.mit; + }) {}; + + "hoauth2_2_7_0" = callPackage + ({ mkDerivation, aeson, base, base64, binary, bytestring + , containers, cryptonite, data-default, exceptions, hspec + , hspec-discover, http-conduit, http-types, memory, microlens, text + , transformers, uri-bytestring, uri-bytestring-aeson + }: + mkDerivation { + pname = "hoauth2"; + version = "2.7.0"; + sha256 = "06ziq5xcxlxjr4yp175qvjq6g36r8ys98prgw3c8fsxrp3cpi0c5"; + libraryHaskellDepends = [ + aeson base base64 binary bytestring containers cryptonite + data-default exceptions http-conduit http-types memory microlens + text transformers uri-bytestring uri-bytestring-aeson + ]; + testHaskellDepends = [ aeson base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell OAuth2 authentication client"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; }) {}; - "hoauth2-providers" = callPackage + "hoauth2-demo" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default - , directory, hoauth2, http-conduit, http-types, mtl, parsec, text - , transformers, unordered-containers, uri-bytestring + , directory, hoauth2, hoauth2-providers, http-conduit, http-types + , jose-jwt, microlens, mustache, parsec, scotty, text, transformers + , unordered-containers, uri-bytestring, wai, wai-middleware-static + , warp + }: + mkDerivation { + pname = "hoauth2-demo"; + version = "1.6.0"; + sha256 = "1ypqbx19f25r1g3msj02h74zndl0bflc1y45gh4hfj3a0rz931gq"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + aeson base bytestring containers data-default directory hoauth2 + hoauth2-providers http-conduit http-types jose-jwt microlens + mustache parsec scotty text transformers unordered-containers + uri-bytestring wai wai-middleware-static warp + ]; + description = "hoauth2 demo application"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "hoauth2-demo"; + }) {}; + + "hoauth2-providers" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, cryptonite + , data-default, directory, hoauth2, HsOpenSSL, http-conduit + , http-types, jose-jwt, mtl, parsec, text, time, transformers + , unordered-containers, uri-bytestring }: mkDerivation { pname = "hoauth2-providers"; - version = "0.1"; - sha256 = "1qasw49nyirajiijr7lfinacgx7kbzp76x52wdfvj9km4wc9xj77"; + version = "0.2"; + sha256 = "1d53byy7gfp02dily3xas0aav2a63s32maanl9ba3pbpzlic9lvp"; libraryHaskellDepends = [ - aeson base bytestring containers data-default directory hoauth2 - http-conduit http-types mtl parsec text transformers - unordered-containers uri-bytestring + aeson base bytestring containers cryptonite data-default directory + hoauth2 HsOpenSSL http-conduit http-types jose-jwt mtl parsec text + time transformers unordered-containers uri-bytestring ]; description = "OAuth2 Identity Providers"; license = lib.licenses.mit; @@ -143313,8 +142919,8 @@ self: { }: mkDerivation { pname = "hoauth2-providers-tutorial"; - version = "0.1"; - sha256 = "0zz99sipmgg1n61zx3mc69y3gvjijnslgwywd1dsw9hnqda10k4c"; + version = "0.2"; + sha256 = "1xb25d83qq8bmvx89nhzjcak406110j3id44y4ab6rqaccmgl5xf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143335,8 +142941,8 @@ self: { }: mkDerivation { pname = "hoauth2-tutorial"; - version = "0.1.2"; - sha256 = "0wkyq213vmsdiwbqv5zi6kak978ayj61sf9r7ga8ry5asy5zjx64"; + version = "0.2"; + sha256 = "18mapdfx6ws3477bm63pcg4nvs1brsh75xc7jy3h4zyn99ci8ipv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143715,9 +143321,7 @@ self: { ]; description = "Higher order logic"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "hol-pkg"; - broken = true; }) {}; "hold-em" = callPackage @@ -143961,8 +143565,6 @@ self: { text unliftio unordered-containers uuid vector zlib ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "honi" = callPackage @@ -144480,6 +144082,8 @@ self: { executableToolDepends = [ alex happy ]; description = "hOpenPGP-based command-line tools"; license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hopenssl" = callPackage @@ -144597,6 +144201,8 @@ self: { ]; description = "C++ FFI generator - Code generator"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hoppy-runtime" = callPackage @@ -144613,7 +144219,6 @@ self: { description = "C++ FFI generator - Runtime support"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hoppy-std" = callPackage @@ -144628,6 +144233,7 @@ self: { ]; description = "C++ FFI generator - Standard library bindings"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "hops" = callPackage @@ -144717,6 +144323,51 @@ self: { broken = true; }) {}; + "horizon-gen-nix" = callPackage + ({ mkDerivation, base, Cabal-syntax, cabal2nix, containers, dhall + , directory, distribution-nixpkgs, either, horizon-spec + , language-nix, lens, optparse-applicative, path + , path-dhall-instance, pretty, silently, sydtest, text + }: + mkDerivation { + pname = "horizon-gen-nix"; + version = "0.4.0"; + sha256 = "0s0macrn45wh1y7nflw9y73wxsynvym7n12f9n0yhxi8w3j7wzn2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base Cabal-syntax cabal2nix containers dhall directory + distribution-nixpkgs either horizon-spec language-nix lens + optparse-applicative path path-dhall-instance pretty silently text + ]; + executableHaskellDepends = [ base directory path sydtest ]; + description = "Generate nix expressions from horizon-spec definitions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "horizon-spec" = callPackage + ({ mkDerivation, base, containers, dhall, path, path-dhall-instance + , prettyprinter, sydtest, text + }: + mkDerivation { + pname = "horizon-spec"; + version = "0.4.1"; + sha256 = "1xr9x626fzw8bhrkzgv3r00cjsawav76jb68yznj1jlv91cvmxac"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers dhall path path-dhall-instance text + ]; + executableHaskellDepends = [ + base dhall prettyprinter sydtest text + ]; + description = "Horizon Stable Package Set Type Definitions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "horizon-spec-tests"; + }) {}; + "horizontal-rule" = callPackage ({ mkDerivation, ansi-wl-pprint, base, HMock, optparse-applicative , tasty, tasty-hunit, terminal-size, text, time @@ -144775,6 +144426,24 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "hosc_0_20" = callPackage + ({ mkDerivation, base, binary, blaze-builder, bytestring + , data-binary-ieee754, network, parsec, time, transformers + }: + mkDerivation { + pname = "hosc"; + version = "0.20"; + sha256 = "17pvv6rgl74ymq7pazxqia19smsga53kkg5h1i1dgfpikrmq7fz9"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary blaze-builder bytestring data-binary-ieee754 network + parsec time transformers + ]; + description = "Haskell Open Sound Control"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "hosc-json" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring , hosc, json, text, transformers, unordered-containers, utf8-string @@ -144998,7 +144667,6 @@ self: { testHaskellDepends = [ base do-notation indexed ]; description = "Non-interactive proof assistant monad for first-order logic"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hp2any-core" = callPackage @@ -145098,45 +144766,6 @@ self: { mainProgram = "hp2pretty"; }) {}; - "hpack" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal - , containers, cryptonite, deepseq, directory, filepath, Glob, hspec - , hspec-discover, http-client, http-client-tls, http-types, HUnit - , infer-license, interpolate, mockery, pretty, QuickCheck - , scientific, template-haskell, temporary, text, transformers - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "hpack"; - version = "0.34.7"; - sha256 = "0nzqpma4cxp3xw79i5pxgjynl5iq0dq0nrw8vczwpj373kyijd0h"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bifunctors bytestring Cabal containers cryptonite - deepseq directory filepath Glob http-client http-client-tls - http-types infer-license pretty scientific text transformers - unordered-containers vector yaml - ]; - executableHaskellDepends = [ - aeson base bifunctors bytestring Cabal containers cryptonite - deepseq directory filepath Glob http-client http-client-tls - http-types infer-license pretty scientific text transformers - unordered-containers vector yaml - ]; - testHaskellDepends = [ - aeson base bifunctors bytestring Cabal containers cryptonite - deepseq directory filepath Glob hspec http-client http-client-tls - http-types HUnit infer-license interpolate mockery pretty - QuickCheck scientific template-haskell temporary text transformers - unordered-containers vector yaml - ]; - testToolDepends = [ hspec-discover ]; - description = "A modern format for Haskell packages"; - license = lib.licenses.mit; - mainProgram = "hpack"; - }) {}; - "hpack_0_35_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec @@ -145179,6 +144808,45 @@ self: { mainProgram = "hpack"; }) {}; + "hpack" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , hspec-discover, http-client, http-client-tls, http-types, HUnit + , infer-license, interpolate, mockery, pretty, QuickCheck + , scientific, template-haskell, temporary, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.35.1"; + sha256 = "1hpc6bwx94v943p73l12nnncbs656f2fn7q3hb4qs13xrxygzl4g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec http-client http-client-tls + http-types HUnit infer-license interpolate mockery pretty + QuickCheck scientific template-haskell temporary text transformers + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A modern format for Haskell packages"; + license = lib.licenses.mit; + mainProgram = "hpack"; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -145214,36 +144882,6 @@ self: { }) {}; "hpack-dhall" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal - , dhall, dhall-json, Diff, directory, filepath, hlint, hpack - , megaparsec, microlens, optparse-applicative, prettyprinter, tasty - , tasty-golden, text, transformers, utf8-string, yaml - }: - mkDerivation { - pname = "hpack-dhall"; - version = "0.5.4"; - sha256 = "0yhf9b1nadcz98bq84jzb80mc1w4a6sph5d6c4pnf2xj2akdxcxf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring dhall dhall-json filepath hpack - megaparsec microlens prettyprinter text transformers yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty base bytestring dhall dhall-json filepath hpack - megaparsec microlens optparse-applicative prettyprinter text - transformers yaml - ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring Cabal dhall dhall-json Diff - directory filepath hlint hpack megaparsec microlens prettyprinter - tasty tasty-golden text transformers utf8-string yaml - ]; - description = "hpack's dhalling"; - license = lib.licenses.bsd3; - }) {}; - - "hpack-dhall_0_5_7" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal , dhall, dhall-json, Diff, directory, filepath, hpack, megaparsec , microlens, optparse-applicative, prettyprinter, tasty @@ -145272,6 +144910,7 @@ self: { description = "hpack's dhalling"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hpaco" = callPackage @@ -145438,6 +145077,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Alternative to 'directory' package with ByteString based filepaths"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hpath-filepath" = callPackage @@ -145466,6 +145106,7 @@ self: { ]; description = "High-level IO operations on files/directories"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hpath-posix" = callPackage @@ -145553,6 +145194,8 @@ self: { pname = "hpc-lcov"; version = "1.1.0"; sha256 = "009z1i0ddjx7sazybirrpw99675p1fyl84ykg4dyypa7rz81vv3z"; + revision = "2"; + editedCabalFile = "11sbnn7rdfm7l7k3rcw4g4mvzrbgrw1jlyx726v47j3l39n54qsn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers hpc ]; @@ -145903,7 +145546,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "hprotoc"; - broken = true; }) {}; "hprotoc-fork" = callPackage @@ -146122,7 +145764,6 @@ self: { description = "Quantitative Library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) gsl;}; "hquantlib" = callPackage @@ -146154,7 +145795,6 @@ self: { license = "LGPL"; hydraPlatforms = lib.platforms.none; mainProgram = "mctest"; - broken = true; }) {}; "hquantlib-time" = callPackage @@ -146166,6 +145806,8 @@ self: { libraryHaskellDepends = [ base time ]; description = "HQuantLib Time is a business calendar functions extracted from HQuantLib"; license = "LGPL"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hquery" = callPackage @@ -146364,6 +146006,7 @@ self: { ]; description = "A Riemann Client for Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "hriemann-exe"; }) {}; @@ -146542,20 +146185,18 @@ self: { }) {}; "hs-cdb" = callPackage - ({ mkDerivation, array, base, bytestring, bytestring-mmap - , directory, filepath, mtl + ({ mkDerivation, array, base, bytestring, directory, filepath, mmap + , mtl }: mkDerivation { pname = "hs-cdb"; - version = "0.1.1"; - sha256 = "07pkz35mmk7qaa9ahfxmj4dddja23ksn7dm1fp8g9v8z8d9r9zl0"; + version = "0.1.2"; + sha256 = "16mrj95f72f9n20szn1jk59y0hslqp22i9hm82swjymg7lykd9xf"; libraryHaskellDepends = [ - array base bytestring bytestring-mmap directory filepath mtl + array base bytestring directory filepath mmap mtl ]; description = "A library for reading CDB (Constant Database) files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hs-conllu" = callPackage @@ -146704,8 +146345,6 @@ self: { libraryHaskellDepends = [ base dual tagged transformers ]; description = "Functors from products of Haskell and its dual to Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hs-gchart" = callPackage @@ -146778,7 +146417,6 @@ self: { libraryHaskellDepends = [ base hs-functors ]; description = "Indexed applicative functors and monads"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hs-java" = callPackage @@ -147039,8 +146677,6 @@ self: { unliftio vault ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hs-opentelemetry-instrumentation-http-client" = callPackage @@ -147343,7 +146979,6 @@ self: { libraryHaskellDepends = [ base hs-functors ]; description = "Profunctors from Haskell to Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hs-re" = callPackage @@ -147877,7 +147512,6 @@ self: { description = "OASIS Security Assertion Markup Language (SAML) V2.0"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) libxml2;}; "hsass" = callPackage @@ -148091,8 +147725,8 @@ self: { }: mkDerivation { pname = "hsc3"; - version = "0.19.1"; - sha256 = "0yz8h83hrnw28bwqqaa792w89y2pz1lkv3zwmwj9p2z8xv0hf14n"; + version = "0.20"; + sha256 = "1pi2zzcz6xrj5w0ql5g7z6qf2vbchixc871if2yqna8wndakhcc8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers data-binary-ieee754 @@ -148101,6 +147735,8 @@ self: { ]; description = "Haskell SuperCollider"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hsc3-auditor" = callPackage @@ -148130,7 +147766,6 @@ self: { description = "haskell supercollider cairo drawing"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-data" = callPackage @@ -148162,7 +147797,6 @@ self: { description = "Haskell SuperCollider Unit Generator Database"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-dot" = callPackage @@ -148176,7 +147810,6 @@ self: { description = "haskell supercollider graph drawing"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-forth" = callPackage @@ -148245,7 +147878,6 @@ self: { description = "Haskell SuperCollider Language"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-lisp" = callPackage @@ -148305,7 +147937,6 @@ self: { description = "Create and control scsynth processes"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-rec" = callPackage @@ -148319,7 +147950,6 @@ self: { description = "Haskell SuperCollider Record Variants"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-rw" = callPackage @@ -148410,7 +148040,6 @@ self: { description = "Unsafe Haskell SuperCollider"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsc3-utils" = callPackage @@ -148569,8 +148198,6 @@ self: { ]; description = "Describe schemas for your Haskell data types"; license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hschema-aeson" = callPackage @@ -148601,6 +148228,7 @@ self: { description = "Describe schemas for your Haskell data types"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hschema-prettyprinter" = callPackage @@ -148619,7 +148247,6 @@ self: { ]; description = "Describe schemas for your Haskell data types"; license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "hschema-quickcheck" = callPackage @@ -148637,7 +148264,6 @@ self: { ]; description = "Describe schemas for your Haskell data types"; license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "hscim" = callPackage @@ -149533,29 +149159,6 @@ self: { }) {}; "hslua" = callPackage - ({ mkDerivation, base, bytestring, containers, exceptions - , hslua-classes, hslua-core, hslua-marshalling - , hslua-objectorientation, hslua-packaging, mtl, tasty, tasty-hslua - , tasty-hunit, text - }: - mkDerivation { - pname = "hslua"; - version = "2.1.0"; - sha256 = "0adii64aaq20dmsxkrac8smgwa9vm1ld1rpzz3m33vyyp1yfsjka"; - libraryHaskellDepends = [ - base bytestring containers exceptions hslua-classes hslua-core - hslua-marshalling hslua-objectorientation hslua-packaging mtl text - ]; - testHaskellDepends = [ - base bytestring containers exceptions hslua-classes hslua-core - hslua-marshalling hslua-objectorientation hslua-packaging mtl tasty - tasty-hslua tasty-hunit text - ]; - description = "Bindings to Lua, an embeddable scripting language"; - license = lib.licenses.mit; - }) {}; - - "hslua_2_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions , hslua-aeson, hslua-classes, hslua-core, hslua-marshalling , hslua-objectorientation, hslua-packaging, lua, lua-arbitrary, mtl @@ -149579,33 +149182,9 @@ self: { ]; description = "Bindings to Lua, an embeddable scripting language"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hslua-aeson" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hashable - , hslua-core, hslua-marshalling, mtl, QuickCheck - , quickcheck-instances, scientific, tasty, tasty-quickcheck, text - , unordered-containers, vector - }: - mkDerivation { - pname = "hslua-aeson"; - 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 mtl QuickCheck quickcheck-instances scientific - tasty tasty-quickcheck text unordered-containers vector - ]; - description = "Allow aeson data types to be used with Lua"; - license = lib.licenses.mit; - }) {}; - - "hslua-aeson_2_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hashable , hslua-core, hslua-marshalling, mtl, QuickCheck , quickcheck-instances, scientific, tasty, tasty-quickcheck, text @@ -149626,33 +149205,9 @@ self: { ]; description = "Allow aeson data types to be used with Lua"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hslua-classes" = callPackage - ({ mkDerivation, base, bytestring, containers, exceptions - , hslua-core, hslua-marshalling, lua-arbitrary, QuickCheck - , quickcheck-instances, tasty, tasty-hslua, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "hslua-classes"; - version = "2.1.0"; - sha256 = "0gz30ppa7fjm555mxmwfjq767wn6z60jkw36sdmryrby1raspz4s"; - libraryHaskellDepends = [ - base bytestring containers exceptions hslua-core hslua-marshalling - text - ]; - testHaskellDepends = [ - base bytestring containers exceptions hslua-core hslua-marshalling - lua-arbitrary QuickCheck quickcheck-instances tasty tasty-hslua - tasty-hunit tasty-quickcheck text - ]; - description = "Type classes for HsLua"; - license = lib.licenses.mit; - }) {}; - - "hslua-classes_2_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions , hslua-core, hslua-marshalling, lua-arbitrary, QuickCheck , quickcheck-instances, tasty, tasty-hslua, tasty-hunit @@ -149673,7 +149228,6 @@ self: { ]; description = "Type classes for HsLua"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hslua-cli" = callPackage @@ -149694,26 +149248,6 @@ self: { }) {}; "hslua-core" = callPackage - ({ mkDerivation, base, bytestring, exceptions, lua, lua-arbitrary - , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "hslua-core"; - version = "2.1.0"; - sha256 = "1iaii879b13j8a8lgv78wja85ik2y5xlkv1mzckjl4nqn91968wq"; - libraryHaskellDepends = [ - base bytestring exceptions lua mtl text - ]; - testHaskellDepends = [ - base bytestring exceptions lua lua-arbitrary mtl QuickCheck - quickcheck-instances tasty tasty-hunit tasty-quickcheck text - ]; - description = "Bindings to Lua, an embeddable scripting language"; - license = lib.licenses.mit; - }) {}; - - "hslua-core_2_2_1" = callPackage ({ mkDerivation, base, bytestring, exceptions, lua, lua-arbitrary , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit , tasty-quickcheck, text @@ -149731,7 +149265,6 @@ self: { ]; description = "Bindings to Lua, an embeddable scripting language"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hslua-examples" = callPackage @@ -149749,6 +149282,8 @@ self: { ]; description = "Examples of how to combine Haskell and Lua"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hslua-list" = callPackage @@ -149766,27 +149301,6 @@ self: { }) {}; "hslua-marshalling" = callPackage - ({ mkDerivation, base, bytestring, containers, hslua-core - , lua-arbitrary, mtl, QuickCheck, quickcheck-instances, tasty - , tasty-hslua, tasty-hunit, tasty-quickcheck, text - }: - mkDerivation { - pname = "hslua-marshalling"; - version = "2.1.0"; - sha256 = "0rp2bbk3smmx223c8x781311s29c0dhk0c5z3p8z1vxr3m3lhz1c"; - libraryHaskellDepends = [ - base bytestring containers hslua-core mtl text - ]; - testHaskellDepends = [ - base bytestring containers hslua-core lua-arbitrary mtl QuickCheck - quickcheck-instances tasty tasty-hslua tasty-hunit tasty-quickcheck - text - ]; - description = "Marshalling of values between Haskell and Lua"; - license = lib.licenses.mit; - }) {}; - - "hslua-marshalling_2_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, hslua-core , lua-arbitrary, mtl, QuickCheck, quickcheck-instances, tasty , tasty-hslua, tasty-hunit, tasty-quickcheck, text @@ -149805,7 +149319,6 @@ self: { ]; description = "Marshalling of values between Haskell and Lua"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hslua-module-doclayout" = callPackage @@ -149869,8 +149382,8 @@ self: { }: mkDerivation { pname = "hslua-module-text"; - version = "1.0.2"; - sha256 = "0xq5ndgjhs37d73s8lvm0pndwjpj2pqb67pr0ckjap8yzhjna7fq"; + version = "1.0.3.1"; + sha256 = "025n8vmaq22bl1x60hpg57ih44g6z71jc1qnlxfsi06hram1wcqc"; libraryHaskellDepends = [ base hslua-core hslua-marshalling hslua-packaging text ]; @@ -149924,29 +149437,6 @@ self: { }) {}; "hslua-objectorientation" = callPackage - ({ mkDerivation, base, bytestring, containers, exceptions - , hslua-core, hslua-marshalling, lua-arbitrary, mtl, QuickCheck - , quickcheck-instances, tasty, tasty-hslua, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "hslua-objectorientation"; - version = "2.1.0"; - sha256 = "01ghqsaknl4b8l3f6src8q7b54r5crmja62mhfwhz8a35px3rzrx"; - libraryHaskellDepends = [ - base bytestring containers exceptions hslua-core hslua-marshalling - mtl text - ]; - testHaskellDepends = [ - base bytestring containers exceptions hslua-core hslua-marshalling - lua-arbitrary mtl QuickCheck quickcheck-instances tasty tasty-hslua - tasty-hunit tasty-quickcheck text - ]; - description = "Object orientation tools for HsLua"; - license = lib.licenses.mit; - }) {}; - - "hslua-objectorientation_2_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions , hslua-core, hslua-marshalling, lua-arbitrary, mtl, QuickCheck , quickcheck-instances, tasty, tasty-hslua, tasty-hunit @@ -149967,31 +149457,9 @@ self: { ]; description = "Object orientation tools for HsLua"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hslua-packaging" = callPackage - ({ mkDerivation, base, bytestring, containers, hslua-core - , hslua-marshalling, hslua-objectorientation, mtl, tasty - , tasty-hslua, tasty-hunit, text - }: - mkDerivation { - pname = "hslua-packaging"; - version = "2.1.0"; - sha256 = "0n8vhfi59q6dzcvi4fgsjp8w0slbl8l2s5l6rxgypb6vqgm759l9"; - libraryHaskellDepends = [ - base containers hslua-core hslua-marshalling - hslua-objectorientation mtl text - ]; - testHaskellDepends = [ - base bytestring hslua-core hslua-marshalling - hslua-objectorientation mtl tasty tasty-hslua tasty-hunit text - ]; - description = "Utilities to build Lua modules"; - license = lib.licenses.mit; - }) {}; - - "hslua-packaging_2_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, hslua-core , hslua-marshalling, hslua-objectorientation, mtl, tasty , tasty-hslua, tasty-hunit, text @@ -150010,7 +149478,6 @@ self: { ]; description = "Utilities to build Lua modules"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hsluv-haskell" = callPackage @@ -150125,6 +149592,7 @@ self: { libraryHaskellDepends = [ base hsndfile storablevector ]; description = "Haskell bindings for libsndfile (Data.StorableVector interface)"; license = lib.licenses.lgpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "hsndfile-vector" = callPackage @@ -150206,6 +149674,7 @@ self: { description = "Haskell NSQ client"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hsntp" = callPackage @@ -150390,8 +149859,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.8.5"; - sha256 = "0s6nc0nvf3qr2qdam12m6b8qixwzms0m2r9xwjx71dkjwg7nnga1"; + version = "2.9.7"; + sha256 = "092sfqjkargxxszp9jjqa8ldjz0xv34jwn6k21q59ys5ckvsrpc1"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -150399,14 +149868,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_10_6" = callPackage + "hspec_2_10_8" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.10.6"; - sha256 = "129yk1ar962xf02axbdbcvx2icw09b2b6q7q1639391aikisivqz"; + version = "2.10.8"; + sha256 = "13g46fk7hcnk3058pb2wwq257pi8628qaa9md9sfw5rlw878z25r"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -150457,20 +149926,6 @@ self: { }) {}; "hspec-contrib" = callPackage - ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }: - mkDerivation { - pname = "hspec-contrib"; - version = "0.5.1"; - sha256 = "0hhzxaa3fxz5mk5qcsrnfr98a7bn3szx2ydgr0x9mbqmm1jg06rc"; - revision = "2"; - editedCabalFile = "12jwqbddqx8j69b04q3kzwvnkwh6l9cv8b5fvph4n6nrqnk81mp9"; - libraryHaskellDepends = [ base hspec-core HUnit ]; - testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ]; - description = "Contributed functionality for Hspec"; - license = lib.licenses.mit; - }) {}; - - "hspec-contrib_0_5_1_1" = callPackage ({ mkDerivation, base, hspec, hspec-core, hspec-discover, HUnit , QuickCheck }: @@ -150483,7 +149938,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Contributed functionality for Hspec"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hspec-core_2_7_10" = callPackage @@ -150518,27 +149972,25 @@ self: { "hspec-core" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans - , call-stack, clock, deepseq, directory, filepath + , call-stack, clock, deepseq, directory, filepath, ghc, ghc-boot-th , hspec-expectations, hspec-meta, HUnit, process, QuickCheck , quickcheck-io, random, setenv, silently, stm, temporary , tf-random, transformers }: mkDerivation { pname = "hspec-core"; - version = "2.8.5"; - sha256 = "0hy3qw7qvix5899hkq96mqda2ridif2g3mwdn8sxg2wlhbcvzfjm"; - revision = "1"; - editedCabalFile = "1nwki2mb64akmc7585cmjhiizwm090j7gqx5js1h9rmvl7z2zfbx"; + version = "2.9.7"; + sha256 = "040rzqiqwkp373jjpij8lkmv08pp2ya92zzcf95bw8px215rp08n"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv stm tf-random transformers + filepath ghc ghc-boot-th hspec-expectations HUnit QuickCheck + quickcheck-io random setenv stm tf-random transformers ]; testHaskellDepends = [ ansi-terminal array base base-orphans call-stack clock deepseq - directory filepath hspec-expectations hspec-meta HUnit process - QuickCheck quickcheck-io random setenv silently stm temporary - tf-random transformers + directory filepath ghc ghc-boot-th hspec-expectations hspec-meta + HUnit process QuickCheck quickcheck-io random setenv silently stm + temporary tf-random transformers ]; testToolDepends = [ hspec-meta ]; testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; @@ -150546,27 +149998,27 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_10_6" = callPackage + "hspec-core_2_10_8" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans - , call-stack, deepseq, directory, filepath, ghc, ghc-boot-th + , call-stack, deepseq, directory, filepath, haskell-lexer , hspec-expectations, hspec-meta, HUnit, process, QuickCheck , quickcheck-io, random, setenv, silently, stm, temporary , tf-random, time, transformers }: mkDerivation { pname = "hspec-core"; - version = "2.10.6"; - sha256 = "1cz02l3xkj91f41ghz3mkm5nxl6zaj5kgam63rqp8f0yxzhfrvwm"; + version = "2.10.8"; + sha256 = "0bka7r8b2qh82sxnz5mcfw2swl4k2v3q97yb0n1rhs1g444lfcqn"; libraryHaskellDepends = [ - ansi-terminal array base call-stack deepseq directory filepath ghc - ghc-boot-th hspec-expectations HUnit process QuickCheck + ansi-terminal array base call-stack deepseq directory filepath + haskell-lexer hspec-expectations HUnit process QuickCheck quickcheck-io random setenv stm tf-random time transformers ]; testHaskellDepends = [ ansi-terminal array base base-orphans call-stack deepseq directory - filepath ghc ghc-boot-th hspec-expectations hspec-meta HUnit - process QuickCheck quickcheck-io random setenv silently stm - temporary tf-random time transformers + filepath haskell-lexer hspec-expectations hspec-meta HUnit process + QuickCheck quickcheck-io random setenv silently stm temporary + tf-random time transformers ]; testToolDepends = [ hspec-meta ]; testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; @@ -150621,8 +150073,8 @@ self: { }: mkDerivation { pname = "hspec-discover"; - version = "2.8.5"; - sha256 = "031nay0zmzvpiax3wa990qj74sqrh27vq1lljiamwbzr3b68vy04"; + version = "2.9.7"; + sha256 = "0536kdxjw6p8b6gcwvmr22jbmb6cgzbddi0fkd01b2m847z37sb5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -150637,14 +150089,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hspec-discover_2_10_6" = callPackage + "hspec-discover_2_10_8" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.10.6"; - sha256 = "0x7yx55l2cngg4vw2k4mirajbprpa7bkx8rnyvyads8c6f97s71v"; + version = "2.10.8"; + sha256 = "032s5mfr9sw2bgdi2l6fy8jdwm79nr896dw1ha16m94m8596vmph"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -150886,30 +150338,6 @@ self: { }) {}; "hspec-junit-formatter" = callPackage - ({ mkDerivation, base, conduit, containers, directory, exceptions - , filepath, hspec, hspec-core, markdown-unlit, temporary, text - , time, xml-conduit, xml-types - }: - mkDerivation { - pname = "hspec-junit-formatter"; - version = "1.0.3.0"; - sha256 = "06003bw98bp9jl379463x1bk3ds30spsmg9h4lvr367k6diyi6ax"; - libraryHaskellDepends = [ - base conduit containers directory exceptions filepath hspec-core - text time xml-conduit xml-types - ]; - testHaskellDepends = [ - base containers filepath hspec hspec-core markdown-unlit temporary - text xml-conduit - ]; - testToolDepends = [ markdown-unlit ]; - description = "A JUnit XML runner/formatter for hspec"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "hspec-junit-formatter_1_1_0_2" = callPackage ({ mkDerivation, base, conduit, containers, directory, exceptions , filepath, hspec, hspec-core, iso8601-time, markdown-unlit , temporary, text, time, xml-conduit, xml-types @@ -150974,7 +150402,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "hspec-meta" = callPackage + "hspec-meta_2_7_8" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, QuickCheck, quickcheck-io, random , setenv, stm, time, transformers @@ -150997,6 +150425,33 @@ self: { ]; description = "A version of Hspec which is used to test Hspec itself"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "hspec-meta-discover"; + }) {}; + + "hspec-meta" = callPackage + ({ mkDerivation, ansi-terminal, array, base, call-stack, clock + , deepseq, directory, filepath, ghc, ghc-boot-th, QuickCheck + , quickcheck-io, random, setenv, stm, time, transformers + }: + mkDerivation { + pname = "hspec-meta"; + version = "2.9.3"; + sha256 = "1raxwpsmcijl3x2h5naw6aydhbiknxvhj3x7v384bi1rqi51ainm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath ghc ghc-boot-th QuickCheck quickcheck-io random setenv stm + time transformers + ]; + executableHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath ghc ghc-boot-th QuickCheck quickcheck-io random setenv + time transformers + ]; + description = "A version of Hspec which is used to test Hspec itself"; + license = lib.licenses.mit; mainProgram = "hspec-meta-discover"; }) {}; @@ -151406,6 +150861,7 @@ self: { description = "Write end2end web application tests using webdriver and hspec"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hspec2" = callPackage @@ -151433,6 +150889,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck QuickCheckVariant ]; description = "Spec for testing properties"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "hspkcs11" = callPackage @@ -151466,6 +150923,22 @@ self: { license = lib.licenses.publicDomain; }) {}; + "hspray" = callPackage + ({ mkDerivation, base, containers, hashable, numeric-prelude, tasty + , tasty-hunit, text, unordered-containers + }: + mkDerivation { + pname = "hspray"; + version = "0.1.1.0"; + sha256 = "1x8vya93aqcbipw6m0rwza8xk59im49bms4w5525s24mw82cnsjq"; + libraryHaskellDepends = [ + base containers hashable numeric-prelude text unordered-containers + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Multivariate polynomials"; + license = lib.licenses.gpl3Only; + }) {}; + "hspread" = callPackage ({ mkDerivation, base, binary, bytestring, containers , extensible-exceptions, network @@ -152251,7 +151724,6 @@ self: { ]; description = "hsp+jmacro support"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hsx-xhtml" = callPackage @@ -152332,7 +151804,6 @@ self: { description = "syslog over TCP"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hsyslog-udp" = callPackage @@ -152349,6 +151820,8 @@ self: { testHaskellDepends = [ base hspec time ]; description = "Log to syslog over a network via UDP"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hszephyr" = callPackage @@ -152444,7 +151917,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "htar"; - broken = true; }) {}; "htaut" = callPackage @@ -152573,8 +152045,8 @@ self: { }: mkDerivation { pname = "html-charset"; - version = "0.1.0"; - sha256 = "05d0syzpxbr3y8hkk35pfpsfm8gwg5zwb72l89frrl7i6cv1b24i"; + version = "0.1.1"; + sha256 = "1561m08j6davlwg4mzv6lr42536hpgmcrxkyvg265lhwrzizi4nk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152588,9 +152060,7 @@ self: { ]; description = "Determine character encoding of HTML documents/fragments"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; mainProgram = "html-charset"; - broken = true; }) {}; "html-conduit" = callPackage @@ -152727,8 +152197,6 @@ self: { ]; description = "A high-performance HTML tokenizer"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "html-parse-util" = callPackage @@ -152740,7 +152208,6 @@ self: { libraryHaskellDepends = [ attoparsec base html-parse text ]; description = "Utility functions for working with html-parse"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "html-presentation-text" = callPackage @@ -152990,6 +152457,7 @@ self: { description = "Haskell Music Typesetting"; license = "GPL"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "htsn" = callPackage @@ -153150,8 +152618,8 @@ self: { pname = "http-api-data-qq"; version = "0.1.0.0"; sha256 = "1lvfdbprdwq09k1wkjfvvkpi79053dc4kzkv4g1cx94qb1flbd7a"; - revision = "1"; - editedCabalFile = "1s7swrw42i5zpj99z5559480fi0zsnf1j1g0qhs536fjqs2bdfx4"; + revision = "2"; + editedCabalFile = "03gwjxnd0kcnh18bzlwkb8yivmcjrl8wb0v82y4jqvjy19d61d0n"; libraryHaskellDepends = [ base http-api-data template-haskell text ]; @@ -153188,6 +152656,8 @@ self: { pname = "http-client"; version = "0.7.13.1"; sha256 = "09qfmakjk285jz2rnb53c1m9c764fg8vngfq43ipga1g72h8d3n9"; + revision = "1"; + editedCabalFile = "168nbb80kcxyz59sz4mnaydpag5flq32y9ikfxa1jygj8j8p9034"; libraryHaskellDepends = [ array async base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -153358,22 +152828,6 @@ self: { }) {}; "http-client-restricted" = callPackage - ({ mkDerivation, base, connection, data-default, http-client - , http-client-tls, network, network-bsd, utf8-string - }: - mkDerivation { - pname = "http-client-restricted"; - version = "0.0.4"; - sha256 = "0jljvfjbdjxj61m6nznysbh9y7nszrzmdv0i8ndxgshnmc19q9h1"; - 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; - }) {}; - - "http-client-restricted_0_0_5" = callPackage ({ mkDerivation, base, connection, data-default, http-client , http-client-tls, network, network-bsd, utf8-string }: @@ -153387,7 +152841,6 @@ self: { ]; description = "restricting the servers that http-client will use"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "http-client-rustls" = callPackage @@ -153678,6 +153131,8 @@ self: { ]; description = "A library for encoding and decoding bodies of HTTP messages"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "http-enumerator" = callPackage @@ -153781,6 +153236,8 @@ self: { ]; description = "A low-level HTTP library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "http-link-header" = callPackage @@ -153902,6 +153359,7 @@ self: { description = "A type unsafe http library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "http-pony-serve-wai" = callPackage @@ -154281,8 +153739,6 @@ self: { testHaskellDepends = [ base ]; description = "A native HTTP2 client library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "http2-client-exe" = callPackage @@ -154304,6 +153760,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "http2-client-exe"; + broken = true; }) {}; "http2-client-grpc" = callPackage @@ -154341,7 +153798,6 @@ self: { description = "Encoders based on `proto-lens` for gRPC over HTTP2"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "http2-grpc-proto3-wire" = callPackage @@ -154375,6 +153831,8 @@ self: { ]; description = "Types for gRPC over HTTP2 common for client and servers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "http3" = callPackage @@ -154914,7 +154372,6 @@ self: { ]; description = "Unpacker tool with DWIM"; license = "GPL"; - hydraPlatforms = lib.platforms.none; mainProgram = "hunp"; }) {}; @@ -154932,8 +154389,6 @@ self: { benchmarkPkgconfigDepends = [ hunspell ]; description = "Hunspell thread-safe FFI bindings for spell checking"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) hunspell;}; "hunt-searchengine" = callPackage @@ -155366,10 +154821,8 @@ self: { }: mkDerivation { pname = "hw-balancedparens"; - version = "0.4.1.2"; - sha256 = "163jvw8nnhf3q3h6c16hjdkdzp6y3l2hyvk7hzynhylifg7kki95"; - revision = "2"; - editedCabalFile = "0m3q539nlcfgmxir78vzsyh3c9pf10hx2czh1d16ih1p52mhwbjd"; + version = "0.4.1.3"; + sha256 = "0cp8nzm99ap0j8qzsn15rxcvxa3k6bywqx0y5ccflpvqysd88wfc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155579,7 +155032,9 @@ self: { ]; description = "File Dump"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hw-dump"; + broken = true; }) {}; "hw-eliasfano" = callPackage @@ -155875,6 +155330,8 @@ self: { ]; description = "Lens for hw-json"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hw-json-simd" = callPackage @@ -155883,10 +155340,8 @@ self: { }: mkDerivation { pname = "hw-json-simd"; - version = "0.1.1.1"; - sha256 = "0nn6fyvw0j2csn8anqpgjzdzdasiwa99g1v2qrcyym1wi86biqqb"; - revision = "1"; - editedCabalFile = "0cavymml55m8f1zyh8pby44xq67ckdqdy0wgib8i0xjq00hrp07m"; + version = "0.1.1.2"; + sha256 = "03g2gwmkp6v7b0vf4x8bh4qk91ghr0av5x3c9paj3rp3igycccd6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; @@ -156002,7 +155457,6 @@ self: { testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; description = "Avro support for Kafka infrastructure"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hw-kafka-client" = callPackage @@ -156096,8 +155550,6 @@ self: { testToolDepends = [ doctest-discover hspec-discover ]; description = "Combinators for lazy IO"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hw-mquery" = callPackage @@ -156247,7 +155699,9 @@ self: { description = "Primitive support for bit manipulation"; license = lib.licenses.bsd3; platforms = lib.platforms.x86; + hydraPlatforms = lib.platforms.none; mainProgram = "hw-prim-bits-exe"; + broken = true; }) {}; "hw-rankselect" = callPackage @@ -156327,10 +155781,8 @@ self: { }: mkDerivation { pname = "hw-simd"; - version = "0.1.2.1"; - sha256 = "051dbwi4kvv04dnglcx9666g097fy9rw8kmgbcw5y9cs06mbw9cr"; - revision = "2"; - editedCabalFile = "10ns52d5xzry7bkaaggv5sgry44fxl9jpyx48iafyfpcn3h8439k"; + version = "0.1.2.2"; + sha256 = "0ipcrv19xwmq6znbmwmzrjahmymmcmpbs7hpx0183hrwbx2hyhqx"; libraryHaskellDepends = [ base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect hw-rankselect-base transformers vector @@ -156380,7 +155832,9 @@ self: { testToolDepends = [ doctest-discover ]; description = "SIMD library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hw-simd"; + broken = true; }) {}; "hw-streams" = callPackage @@ -156468,7 +155922,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "Library for creating and extracting tar archives"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hw-tar"; + broken = true; }) {}; "hw-uri" = callPackage @@ -156904,8 +156360,6 @@ self: { ]; description = "Cache for HXT XML Documents and other binary data"; license = "unknown"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hxt-charproperties" = callPackage @@ -157195,6 +156649,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "hydra" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , directory, filepath, hspec, hspec-discover, HsYAML, HUnit + , QuickCheck, scientific, split, text, unordered-containers, vector + }: + mkDerivation { + pname = "hydra"; + version = "0.1.1"; + sha256 = "1ljr6id1z4ym6ipmjhz1msmnqfbsj1z5klhx27dhxwmbfv5ndhyn"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers directory filepath + HsYAML scientific split text unordered-containers vector + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers directory filepath + hspec hspec-discover HsYAML HUnit QuickCheck scientific split text + unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Type-aware transformations for data and programs"; + license = lib.licenses.asl20; + }) {}; + "hydra-hs" = callPackage ({ mkDerivation, base, hmatrix, sixense_x64 }: mkDerivation { @@ -157523,6 +157000,8 @@ self: { libraryHaskellDepends = [ base blaze-html deepseq text ]; description = "Display class for the HyperHaskell graphical Haskell interpreter"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hyper-extra" = callPackage @@ -157538,6 +157017,7 @@ self: { ]; description = "Display instances for the HyperHaskell graphical Haskell interpreter"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hyper-haskell-server" = callPackage @@ -157559,7 +157039,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "hyper-haskell-server"; - broken = true; }) {}; "hyperdrive" = callPackage @@ -157606,22 +157085,20 @@ self: { }: mkDerivation { pname = "hypergeomatrix"; - version = "1.1.0.0"; - sha256 = "1463xpbm3q8ifnjsgddfplpsjnzzfksmpy8g21l2zqmcvghb64bn"; + version = "1.1.0.1"; + sha256 = "02pmjjbdnl5g1zhzs1cb32k1z5g3xkdkpz1idx8xf5gnyxcssy38"; libraryHaskellDepends = [ array base containers cyclotomic ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Hypergeometric function of a matrix argument"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hypergeometric" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "hypergeometric"; - version = "0.1.2.0"; - sha256 = "19vxqc9ng2vfvqxslxb950ygdqdd3cbqs4m6nqw8mbyjgld2wqd8"; + version = "0.1.4.0"; + sha256 = "153j8ml8gqgmgzd6aybwcwvrnafgz54myl42l293mj64kcc1yc9r"; libraryHaskellDepends = [ base ]; description = "Hypergeometric functions"; license = lib.licenses.agpl3Only; @@ -157756,6 +157233,8 @@ self: { ]; description = "Typed ASTs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hyphenate" = callPackage @@ -158154,6 +157633,7 @@ self: { ]; description = "Lattice iCE40 Primitive IP"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "icepeak" = callPackage @@ -158168,8 +157648,8 @@ self: { }: mkDerivation { pname = "icepeak"; - version = "0.7.4.0"; - sha256 = "1jjcjl0i9brdzflfz4b7fba420rwgmv74b1qz7ii6m4bd7i4jkzp"; + version = "1.0.0.0"; + sha256 = "0w8s4kfm97i8pjy6nfi7b0rqd1g83fxpm0lqpwdcxqz443lcwqpa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158775,6 +158255,8 @@ self: { libraryHaskellDepends = [ base binary bytestring ]; description = "Constructing and dissecting IFF files"; license = "GPL"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ifscs" = callPackage @@ -159095,7 +158577,6 @@ self: { ]; description = "Embed R quasiquotes and plots in IHaskell notebooks"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ihaskell-juicypixels" = callPackage @@ -159210,8 +158691,6 @@ self: { ]; description = "JSX-like but for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihs" = callPackage @@ -159301,6 +158780,8 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "Determine the type of an image by reading the first bytes"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "imagefilters" = callPackage @@ -159802,19 +159283,18 @@ self: { }) {}; "implicit-hie" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, Cabal-syntax - , directory, filepath, filepattern, hspec, hspec-attoparsec, text - , transformers, yaml + ({ mkDerivation, attoparsec, base, directory, filepath, filepattern + , hspec, hspec-attoparsec, text, transformers, yaml }: mkDerivation { pname = "implicit-hie"; - version = "0.1.3.0"; - sha256 = "0s2h09gp1z81fxc9j5vcxvzyvf5nvqyhkw7mwq4sg8jjpm0r4gn3"; + version = "0.1.2.7"; + sha256 = "0yb457n26455kbq6kv8g48q66pmmaxcpikmpg9gm00sd6adgq6gl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring Cabal-syntax directory filepath - filepattern text transformers yaml + attoparsec base directory filepath filepattern text transformers + yaml ]; executableHaskellDepends = [ attoparsec base directory filepath filepattern text transformers @@ -159829,6 +159309,34 @@ self: { mainProgram = "gen-hie"; }) {}; + "implicit-hie_0_1_4_0" = callPackage + ({ mkDerivation, attoparsec, base, directory, filepath, filepattern + , hspec, hspec-attoparsec, text, transformers, yaml + }: + mkDerivation { + pname = "implicit-hie"; + version = "0.1.4.0"; + sha256 = "08ggdlh5j1ya5rjhvcp1k1iyd5bvrgm865qnaxnqz7xvq7b1864k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base directory filepath filepattern text transformers + yaml + ]; + executableHaskellDepends = [ + attoparsec base directory filepath filepattern text transformers + yaml + ]; + testHaskellDepends = [ + attoparsec base directory filepath filepattern hspec + hspec-attoparsec text transformers yaml + ]; + description = "Auto generate hie-bios cradles & hie.yaml"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "gen-hie"; + }) {}; + "implicit-hie-cradle" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers , directory, extra, filepath, hie-bios, hslogger, implicit-hie @@ -160030,6 +159538,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Mutable containers in Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "in-other-words" = callPackage @@ -160133,6 +159643,8 @@ self: { libraryHaskellDepends = [ base ]; description = "Simple parser combinators for lexical analysis"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "incipit" = callPackage @@ -160141,8 +159653,8 @@ self: { }: mkDerivation { pname = "incipit"; - version = "0.4.0.0"; - sha256 = "0w4wipaq0iscfnv68x5insjbcqcrnfx6r75lkq6v7nxj1y124yqa"; + version = "0.7.0.0"; + sha256 = "00ymmb2d5hlskc2zc88kibgx1c5mxp4bdfymahzhqg1qhyw3q9ci"; libraryHaskellDepends = [ base incipit-core polysemy-conc polysemy-log polysemy-resume polysemy-time @@ -160150,7 +159662,6 @@ self: { description = "A Prelude for Polysemy"; license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "incipit-base" = callPackage @@ -160159,8 +159670,8 @@ self: { }: mkDerivation { pname = "incipit-base"; - version = "0.3.0.0"; - sha256 = "06p47r0qa8pc0p4738brp9caznmvihv6ipwm2p3nw9whpph16b6i"; + version = "0.5.0.0"; + sha256 = "1h3mmabxb0c29cy349xkk87df4x0dxakfaryyr8r43wj2l39yhj0"; libraryHaskellDepends = [ base bytestring containers data-default stm text ]; @@ -160172,8 +159683,8 @@ self: { ({ mkDerivation, base, incipit-base, polysemy }: mkDerivation { pname = "incipit-core"; - version = "0.3.0.0"; - sha256 = "0gqsdzkbx78dbdb9lwwwwvr8nai5ic6lampxkp32k8ib4pa1csqz"; + version = "0.5.0.0"; + sha256 = "17fbdp2v22fni36ijfm9hb9hkcarg4jy3xksngnhlzxqz77adcyj"; libraryHaskellDepends = [ base incipit-base polysemy ]; description = "A Prelude for Polysemy"; license = "BSD-2-Clause-Patent"; @@ -160662,6 +160173,7 @@ self: { ]; description = "A collection of implementations of IndieWeb algorithms"; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; }) {}; "indigo" = callPackage @@ -160775,6 +160287,105 @@ self: { broken = true; }) {}; + "inferno-core" = callPackage + ({ mkDerivation, base, bimap, bytestring, containers, cryptonite + , exceptions, generic-lens, hspec, hspec-golden-aeson + , inferno-types, inferno-vc, megaparsec, memory, mtl + , parser-combinators, picosat, pretty-simple, prettyprinter + , QuickCheck, recursion-schemes, syb, template-haskell, text, time + }: + mkDerivation { + pname = "inferno-core"; + version = "0.1.0.0"; + sha256 = "06w8fbxvajqgaqvwdfrinfmgb19m3l6kkcgy3gigcg68x3p4ml1y"; + libraryHaskellDepends = [ + base bimap bytestring containers cryptonite exceptions generic-lens + inferno-types megaparsec memory mtl parser-combinators picosat + prettyprinter recursion-schemes syb template-haskell text time + ]; + testHaskellDepends = [ + base containers exceptions hspec hspec-golden-aeson inferno-types + inferno-vc megaparsec mtl pretty-simple prettyprinter QuickCheck + recursion-schemes text + ]; + description = "A statically-typed functional scripting language"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "inferno-lsp" = callPackage + ({ mkDerivation, base, bytestring, co-log-core, containers + , inferno-core, inferno-types, inferno-vc, lsp, lsp-types + , megaparsec, microlens, mtl, plow-log, plow-log-async + , prettyprinter, safe, special-keys, stm, text, text-rope, time + , transformers, uuid + }: + mkDerivation { + pname = "inferno-lsp"; + version = "0.1.0"; + sha256 = "12ss0zq9jwvggjlzsyzbdl1afli3h6w2fl3bs9cbg1k42zzj44s4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring co-log-core containers inferno-core inferno-types + inferno-vc lsp lsp-types megaparsec microlens mtl plow-log + plow-log-async prettyprinter safe special-keys stm text text-rope + time transformers uuid + ]; + executableHaskellDepends = [ base ]; + description = "LSP for Inferno"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "inferno-lsp-server"; + }) {}; + + "inferno-types" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bifunctors + , bytestring, cereal, containers, cryptonite, deepseq, hashable + , megaparsec, memory, mtl, prettyprinter, QuickCheck + , quickcheck-arbitrary-adt, quickcheck-instances, recursion-schemes + , servant, text + }: + mkDerivation { + pname = "inferno-types"; + version = "0.1.0.0"; + sha256 = "1jbp7kirh7cwgi3q1qzrb3hrrarymb1830q1gbs5xszkn0i08gyb"; + libraryHaskellDepends = [ + aeson base base64-bytestring bifunctors bytestring cereal + containers cryptonite deepseq hashable megaparsec memory mtl + prettyprinter QuickCheck quickcheck-arbitrary-adt + quickcheck-instances recursion-schemes servant text + ]; + description = "Core types for Inferno"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "inferno-vc" = callPackage + ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring + , containers, cryptonite, directory, filepath, generic-lens + , http-client, http-types, inferno-types, lens, mtl, plow-log + , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances + , servant, servant-client, servant-server, servant-typed-error + , text, time, wai, wai-extra, warp, yaml, zlib + }: + mkDerivation { + pname = "inferno-vc"; + version = "0.1.0"; + sha256 = "1chq43r134hn0hl910y2lyawpllw8yzdai2kzdmbhawac3q640if"; + libraryHaskellDepends = [ + aeson async base base64-bytestring bytestring containers cryptonite + directory filepath generic-lens http-client http-types + inferno-types lens mtl plow-log QuickCheck quickcheck-arbitrary-adt + quickcheck-instances servant servant-client servant-server + servant-typed-error text time wai wai-extra warp yaml zlib + ]; + description = "Version control server for Inferno"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "infernu" = callPackage ({ mkDerivation, base, containers, digits, either, fgl , language-ecmascript, mtl, optparse-applicative, parsec @@ -160796,6 +160407,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "infinite-list" = callPackage + ({ mkDerivation, base, QuickCheck, tasty, tasty-bench + , tasty-expected-failure, tasty-inspection-testing + , tasty-quickcheck + }: + mkDerivation { + pname = "infinite-list"; + version = "0.1"; + sha256 = "0imayklahbpsiciflwvwj3fxjhg461lw6x4515wxr39hgpb18di1"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-expected-failure + tasty-inspection-testing tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base tasty-bench ]; + description = "Infinite lists"; + license = lib.licenses.bsd3; + }) {}; + "infinite-search" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -161013,6 +160643,8 @@ self: { libraryHaskellDepends = [ base inj ]; description = "'Inj' instances for 'base'"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "inject" = callPackage @@ -161062,6 +160694,8 @@ self: { ]; description = "Canonical categorical conversions (injections and projections)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "inline-asm" = callPackage @@ -161071,8 +160705,8 @@ self: { }: mkDerivation { pname = "inline-asm"; - version = "0.5.0.1"; - sha256 = "1h1g9k71cihc1g0jfprvklcwlcw9ymihlvnsa1fy2mfr759xgjzy"; + version = "0.5.0.2"; + sha256 = "1qvr0p00zs0cxk1bj4bsd6dn7x6kqmmzmsd1jpi01fwks9kpy8d6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161087,8 +160721,6 @@ self: { description = "Inline some Assembly in ur Haskell!"; license = lib.licenses.bsd3; platforms = lib.platforms.x86; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "inline-c" = callPackage @@ -161212,8 +160844,6 @@ self: { ]; description = "Seamlessly call R from Haskell and vice versa. No FFI required."; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) R;}; "inliterate" = callPackage @@ -161338,7 +160968,6 @@ self: { ]; description = "A simple proxy for debugging plaintext protocols communication"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "inspection-proxy"; }) {}; @@ -161410,8 +161039,8 @@ self: { }: mkDerivation { pname = "instana-haskell-trace-sdk"; - version = "0.8.0.0"; - sha256 = "008r4164idzd9877crmmyc8yl63ssm8pszr75h7gkz8j9kyibrsp"; + version = "0.9.0.0"; + sha256 = "08w7s8pa2c2qbw3hwxlmgdlibhvnlb9a9z0jy09drfqgv0qfsk3p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161668,6 +161297,8 @@ self: { ]; description = "Interval map"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "int-like" = callPackage @@ -161723,8 +161354,6 @@ self: { testHaskellDepends = [ base containers doctest primitive ]; description = "Advent of Code 2019 intcode interpreter"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "integer-gmp_1_1" = callPackage @@ -161797,6 +161426,23 @@ self: { libraryHaskellDepends = [ ghc-prim ]; description = "Simple Integer library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "integer-types" = callPackage + ({ mkDerivation, base, deepseq, exceptions, hedgehog, hspec }: + mkDerivation { + pname = "integer-types"; + version = "0.0.0.0"; + sha256 = "1hny749vzc9bp0dqhypfanxnjjp6s87nmwm17xzh75742ajcf86z"; + revision = "1"; + editedCabalFile = "0c5xfvy8cspzbakng4rnnhc45n24hjrldf14i8ipp2l94n8mvn8y"; + libraryHaskellDepends = [ base deepseq exceptions hedgehog ]; + testHaskellDepends = [ base deepseq exceptions hedgehog hspec ]; + doHaddock = false; + description = "Integer, Natural, and Positive"; + license = lib.licenses.asl20; }) {}; "integration" = callPackage @@ -161855,7 +161501,6 @@ self: { description = "Hardware accelerated AES encryption and Random Number Generation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {intel_aes = null;}; "intensional-datatys" = callPackage @@ -161915,7 +161560,9 @@ self: { executableHaskellDepends = [ base ]; description = "Interactive quick time series plotting"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "interactive-plot-demo"; + broken = true; }) {}; "interchangeable" = callPackage @@ -162344,7 +161991,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "An implementation of Allen's interval algebra for temporal logic"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "tutorial"; + broken = true; }) {}; "interval-functor" = callPackage @@ -162361,21 +162010,23 @@ self: { "interval-patterns" = callPackage ({ mkDerivation, base, containers, groups, hspec, lattices - , QuickCheck, relude, semirings, time, time-compat + , QuickCheck, semirings, time, time-compat }: mkDerivation { pname = "interval-patterns"; - version = "0.5.0.0"; - sha256 = "1ayvhjg7a8z7wp1pqsf4wcvxj5y3izsxz3b53q57dsvrlsc9i0kg"; + version = "0.6.0.0"; + sha256 = "0f0gy1442v7di34bngssihhyb6vmhdi71j8yqmii8c7xxvnpr69a"; libraryHaskellDepends = [ - base containers groups lattices relude semirings time time-compat + base containers groups lattices semirings time time-compat ]; testHaskellDepends = [ - base containers groups hspec lattices QuickCheck relude semirings - time time-compat + base containers groups hspec lattices QuickCheck semirings time + time-compat ]; description = "Intervals, and monoids thereof"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "interval-tree-clock" = callPackage @@ -162476,6 +162127,8 @@ self: { ]; description = "Safe and minimal prelude"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "intro-prelude" = callPackage @@ -162492,7 +162145,6 @@ self: { description = "Intro reexported as Prelude"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "introduction" = callPackage @@ -162569,28 +162221,6 @@ self: { }) {}; "invariant" = callPackage - ({ mkDerivation, array, base, bifunctors, comonad, containers - , contravariant, ghc-prim, hspec, hspec-discover, profunctors - , QuickCheck, StateVar, stm, tagged, template-haskell - , th-abstraction, transformers, transformers-compat - , unordered-containers - }: - mkDerivation { - pname = "invariant"; - version = "0.5.6"; - sha256 = "1l73wlnmh09187w8y61qyjjycpljds9lydy16ifa08bmmbxgkzcw"; - libraryHaskellDepends = [ - array base bifunctors comonad containers contravariant ghc-prim - profunctors StateVar stm tagged template-haskell th-abstraction - transformers transformers-compat unordered-containers - ]; - testHaskellDepends = [ base hspec QuickCheck template-haskell ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell98 invariant functors"; - license = lib.licenses.bsd2; - }) {}; - - "invariant_0_6" = callPackage ({ mkDerivation, array, base, bifunctors, comonad, containers , contravariant, ghc-prim, hspec, hspec-discover, profunctors , QuickCheck, StateVar, stm, tagged, template-haskell @@ -162612,7 +162242,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell98 invariant functors"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "inventory" = callPackage @@ -162639,7 +162268,9 @@ self: { ]; description = "Project statistics and definition analysis"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "inventory"; + broken = true; }) {}; "invert" = callPackage @@ -162668,6 +162299,31 @@ self: { license = lib.licenses.asl20; }) {}; + "invert_1_0_0_3" = callPackage + ({ mkDerivation, base, containers, criterion, generic-deriving + , hashable, unordered-containers, vector + }: + mkDerivation { + pname = "invert"; + version = "1.0.0.3"; + sha256 = "08bkn9pv02bklmrn5cf17qkw949ryvs51dc8pzxkixgbjk9fpny4"; + libraryHaskellDepends = [ + base containers generic-deriving hashable unordered-containers + vector + ]; + testHaskellDepends = [ + base containers generic-deriving hashable unordered-containers + vector + ]; + benchmarkHaskellDepends = [ + base containers criterion generic-deriving hashable + unordered-containers vector + ]; + description = "Automatically generate a function’s inverse"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "invertible" = callPackage ({ mkDerivation, base, haskell-src-meta, invariant, lens , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell @@ -162717,7 +162373,6 @@ self: { description = "invertible functions and instances for HList"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "invertible-hxt" = callPackage @@ -163470,8 +163125,8 @@ self: { }: mkDerivation { pname = "irc-client"; - version = "1.1.2.2"; - sha256 = "0hhaf7xhy3q48gkp2j01jjiiz0ww9mwwjh8brbqs8phlal03ks70"; + version = "1.1.2.3"; + sha256 = "0lrlq0dr9mahhda3yh2m6xly77kcpvcw3q0sz4s295vh0mmz0ac3"; libraryHaskellDepends = [ base bytestring conduit connection containers contravariant exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale @@ -163501,8 +163156,8 @@ self: { }: mkDerivation { pname = "irc-conduit"; - version = "0.3.0.5"; - sha256 = "02ziqjzqdyaizhrrzlbq4ddkfjfjf58jvwqfzrbf0mf0f5scv9cz"; + version = "0.3.0.6"; + sha256 = "0lr3csc9hp7g7m6x54vjbwdg3yxvl4lsr6818zf6n2r5s0x1vq42"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra connection irc irc-ctcp network-conduit-tls profunctors text time tls transformers @@ -163669,7 +163324,9 @@ self: { executableHaskellDepends = [ base ]; description = "A library for writing IRC bots"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "ircbot-demo"; + broken = true; }) {}; "ircbouncer" = callPackage @@ -164118,8 +163775,6 @@ self: { ]; description = "Isomorphism typeclass solving the conversion problem"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "isotope" = callPackage @@ -164436,7 +164091,9 @@ self: { executableHaskellDepends = [ base bytestring ]; description = "Enable graphical display of images inline on some terminals"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "it2-show"; + broken = true; }) {}; "iterm-show-JuicyPixels" = callPackage @@ -164450,6 +164107,7 @@ self: { libraryHaskellDepends = [ base iterm-show JuicyPixels ]; description = "Orphan Show instances for JuciyPixels image types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "iterm-show-diagrams" = callPackage @@ -164467,6 +164125,7 @@ self: { ]; description = "Orphan Show instances for diagrams package that render inline in some terminals"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ival" = callPackage @@ -165011,10 +164670,8 @@ self: { }: mkDerivation { pname = "jacinda"; - version = "1.1.0.0"; - sha256 = "0sx15lslkcvck7cvd55ykkifba9cv0ig0h53ycf0izbl3cxdr1j9"; - revision = "1"; - editedCabalFile = "020zfmmiyinbcgrrl7jlkyjq7xajsk2qz4z9infr9vsjig0c61xj"; + version = "1.2.0.0"; + sha256 = "11xgbxhbhd6j974invscbmc1r41f4synjqhc2499kdknjfvnvnv5"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -165034,7 +164691,6 @@ self: { doHaddock = false; description = "Functional, expression-oriented data processing language"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "ja"; maintainers = [ lib.maintainers.sternenseemann ]; }) {}; @@ -165046,10 +164702,8 @@ self: { }: mkDerivation { pname = "jack"; - version = "0.7.2"; - sha256 = "0aa7nz8ybsw7s0nmf12kxnjm5z1afj88c97b1w17b7lvdwvfs3cx"; - revision = "1"; - editedCabalFile = "16g5xc67811jvckfn0xfvcwbxi0kcx1qh87pyhrqvrp4k8m68g2v"; + version = "0.7.2.1"; + sha256 = "03cf6yb3nbcwy0429b0r2dxj6dvk295y4w73lyc6fpjh001yp7c9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165090,15 +164744,18 @@ self: { }) {}; "jackpolynomials" = callPackage - ({ mkDerivation, array, base, ilist, lens, math-functions - , mpolynomials, numeric-prelude + ({ mkDerivation, array, base, hspray, hypergeomatrix, ilist, lens + , math-functions, numeric-prelude, tasty, tasty-hunit }: mkDerivation { pname = "jackpolynomials"; - version = "1.0.0.0"; - sha256 = "13marv1cl4c5xprwjn7yz3hbwln2cnmxski945saf3azs67ki824"; + version = "1.1.0.1"; + sha256 = "0wss00638zsi9zsphmr7pw19rdcvqfmd6fcc0wwhpkz6mkzm4c9s"; libraryHaskellDepends = [ - array base ilist lens math-functions mpolynomials numeric-prelude + array base hspray ilist lens math-functions numeric-prelude + ]; + testHaskellDepends = [ + base hspray hypergeomatrix tasty tasty-hunit ]; description = "Jack, zonal, and Schur polynomials"; license = lib.licenses.gpl3Only; @@ -165160,6 +164817,7 @@ self: { description = "Jailed IO monad"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "jailbreak-cabal" = callPackage @@ -165174,7 +164832,7 @@ self: { description = "Strip version restrictions from Cabal files"; license = lib.licenses.bsd3; mainProgram = "jailbreak-cabal"; - maintainers = [ lib.maintainers.peti ]; + maintainers = [ lib.maintainers.sternenseemann ]; }) {}; "jalaali" = callPackage @@ -165232,7 +164890,9 @@ self: { executableHaskellDepends = [ base boxes directory filepath ]; description = "Export sheet music and audio from Windows/Mac app Jammit"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "jammittools"; + broken = true; }) {}; "japanese-calendar" = callPackage @@ -165342,7 +165002,9 @@ self: { executableToolDepends = [ alex happy ]; description = "Create immutable algebraic data structures for Java"; license = "unknown"; + hydraPlatforms = lib.platforms.none; mainProgram = "java-adt"; + broken = true; }) {}; "java-bridge" = callPackage @@ -165367,7 +165029,6 @@ self: { description = "Bindings to the JNI and a high level interface generator"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "java-bridge-extras" = callPackage @@ -165775,6 +165436,23 @@ self: { mainProgram = "jira-wiki-markup"; }) {}; + "jira-wiki-markup_1_5_0" = callPackage + ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: + mkDerivation { + pname = "jira-wiki-markup"; + version = "1.5.0"; + sha256 = "1ajzsn4129xjcf9kzzs2hwc2w1nv6a5y7kn7nx4im19gs6hjwzs4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl parsec text ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ base parsec tasty tasty-hunit text ]; + description = "Handle Jira wiki markup"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "jira-wiki-markup"; + }) {}; + "jl" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , conduit, conduit-extra, containers, exceptions, mtl @@ -165824,7 +165502,6 @@ self: { ]; description = "QuasiQuotation library for programmatic generation of Javascript code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "jmacro"; }) {}; @@ -165845,6 +165522,7 @@ self: { description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "jmacro-rpc-happstack" = callPackage @@ -165912,7 +165590,6 @@ self: { testHaskellDepends = [ base casing free jmacro ]; description = "Jmonkey is very restricted but handy EDSL for JavaScript"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "jni" = callPackage @@ -166040,8 +165717,6 @@ self: { ]; description = "Trying to compose non-composable"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jonathanscard" = callPackage @@ -166121,6 +165796,7 @@ self: { ]; description = "OpenAPI Definitions for Jordan, Automatically"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "jordan-servant" = callPackage @@ -166190,6 +165866,7 @@ self: { ]; description = "OpenAPI schemas for Jordan-Powered Servant APIs"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "jordan-servant-server" = callPackage @@ -166293,6 +165970,8 @@ self: { pname = "jose-jwt"; version = "0.9.4"; sha256 = "1drdlxbhbac3b6ph2l969vvicmg1yww9yhz3pd9maq7pdajbpjcc"; + revision = "1"; + editedCabalFile = "1xhkdmfsl2wwkjk384gy6bwp2bhncdjgqvncdnzpx9b801v67f3c"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal containers cryptonite memory mtl text time transformers transformers-compat @@ -166323,6 +166002,7 @@ self: { ]; description = "Tiny markdown notebook"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; mainProgram = "jot"; }) {}; @@ -166339,6 +166019,8 @@ self: { testHaskellDepends = [ base hspec ]; description = "Transform Joy code using conditional rewrite rules"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "jpeg" = callPackage @@ -166484,6 +166166,8 @@ self: { ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "jsaddle-dom" = callPackage @@ -166520,6 +166204,7 @@ self: { description = "JSaddle Hello World, an example package"; license = lib.licenses.mit; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; }) {}; "jsaddle-warp" = callPackage @@ -166546,6 +166231,8 @@ self: { ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "jsaddle-webkit2gtk" = callPackage @@ -166866,6 +166553,8 @@ self: { benchmarkHaskellDepends = [ aeson criterion rebase ]; description = "Direct-to-bytes JSON Builder"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "json-directory" = callPackage @@ -167302,8 +166991,8 @@ self: { pname = "json-sop"; version = "0.2.1"; sha256 = "0kzl21669wh9vdxspliflciwrkn5wamwwyg96aqrm4ybdqscpcn4"; - revision = "1"; - editedCabalFile = "04xr0bx28hnp32w8hcqn3bfn90ncgimx1izdwh856jwgmqwj3v7b"; + revision = "2"; + editedCabalFile = "1izlsx427d3c485hlfi1agb2c7gmbnp43736694ia72y1vkcfvh0"; libraryHaskellDepends = [ aeson base generics-sop lens-sop tagged text time transformers unordered-containers vector @@ -167647,8 +167336,8 @@ self: { }: mkDerivation { pname = "jsonifier"; - version = "0.2.1.1"; - sha256 = "0wih0m3g2wj06zwl2wbs9y2bfbc593vmh25imy6hki2iq7wwr3l0"; + version = "0.2.1.2"; + sha256 = "0swv5xmns2qqkmb8wc0f9gsbrs81ghfp8jvq0lr7fgam3cbzaibr"; libraryHaskellDepends = [ base bytestring ptr-poker scientific text ]; @@ -167675,8 +167364,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, conduit, hspec, jsonl }: mkDerivation { pname = "jsonl-conduit"; - version = "0.1.1"; - sha256 = "0678hasvy8f3dvrqsg5m21yd6wdxpj1dffg9asi2b0byr4rxdaax"; + version = "0.1.2"; + sha256 = "03ab1ysyqg0vnlx1pxw5gj1d2gq16zsz9pdrscdjp9491fiwxg2b"; libraryHaskellDepends = [ aeson base bytestring conduit jsonl ]; testHaskellDepends = [ aeson base bytestring conduit hspec ]; description = "Conduit interface to JSONL-encoded data"; @@ -167697,8 +167386,6 @@ self: { ]; description = "JsonLogic Evaluation"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jsonlogic-aeson" = callPackage @@ -167720,6 +167407,7 @@ self: { description = "JsonLogic Aeson Support"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "jsonnet" = callPackage @@ -167762,27 +167450,6 @@ self: { }) {}; "jsonpath" = callPackage - ({ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring - , file-embed, hspec, hspec-attoparsec, hspec-discover, text - , unordered-containers, vector - }: - mkDerivation { - pname = "jsonpath"; - version = "0.2.1.0"; - sha256 = "1d9h6j0xzrpxc56wym9b0sdanpw1v2rcx1sdm49h6iriwwmckb10"; - libraryHaskellDepends = [ - aeson attoparsec base text unordered-containers vector - ]; - testHaskellDepends = [ - aeson aeson-casing attoparsec base bytestring file-embed hspec - hspec-attoparsec text unordered-containers vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Library to parse and execute JSONPath"; - license = lib.licenses.bsd3; - }) {}; - - "jsonpath_0_3_0_0" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, file-embed , hspec, hspec-discover, hspec-megaparsec, megaparsec, scientific , text, unordered-containers, vector @@ -167801,7 +167468,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Library to parse and execute JSONPath"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "jsonresume" = callPackage @@ -168120,8 +167786,8 @@ self: { }: mkDerivation { pname = "juicy-gcode"; - version = "0.2.0.2"; - sha256 = "1kr59d21825mrfr9370f4z717gf45rcdp8jw7xw3d4mp7ba6r66b"; + version = "0.3.0.0"; + sha256 = "0j2q76fwx93az2yk0pnmzl82npl0305ks2ia7gbxi7k9jwdzbp0i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -168456,7 +168122,6 @@ self: { description = "Low-level Haskell client library for Apache Kafka 0.7."; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kafka-client-sync" = callPackage @@ -169099,8 +168764,8 @@ self: { }: mkDerivation { pname = "katip-wai"; - version = "0.1.2.0"; - sha256 = "10chkrjjh6ja6bil3s12hm7mfgi1j1idq490h5iqs1y3am44bda1"; + version = "0.1.2.1"; + sha256 = "1shzmjpz043fglvn4niydbjf3a41bmx2dhyp7ch5g256irqs4a21"; libraryHaskellDepends = [ aeson base bytestring clock http-types katip network text uuid wai ]; @@ -169431,6 +169096,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "keenser-exe"; + broken = true; }) {}; "keep-alive" = callPackage @@ -169470,7 +169136,6 @@ self: { ]; description = "Rapid Gtk Application Development - I18N"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "keera-hails-mvc-controller" = callPackage @@ -169812,8 +169477,8 @@ self: { }: mkDerivation { pname = "keid-core"; - version = "0.1.7.1"; - sha256 = "0izq63b4ii7gc36qs26y87rr19y4sh1l4cw26bqwdyvdndmmsq90"; + version = "0.1.7.2"; + sha256 = "06abgzc7h6h0xsgrv3b1n2krb2axb7svg00l0rz5k2qs3bz26kfd"; libraryHaskellDepends = [ base binary bytestring containers cryptohash-md5 derive-storable derive-storable-plugin file-embed foldl geomancy GLFW-b ktx-codec @@ -170017,7 +169682,6 @@ self: { description = "Manage and abstract your packer configurations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kesha" = callPackage @@ -170214,6 +169878,79 @@ self: { broken = true; }) {}; + "keyed-vals" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, http-api-data + , redis-glob, text + }: + mkDerivation { + pname = "keyed-vals"; + version = "0.2.0.0"; + sha256 = "0im4wn7m5y6kmi8cjxfn72316zldg9v92fbw6hlimc7hkndb34mf"; + libraryHaskellDepends = [ + aeson base bytestring containers http-api-data redis-glob text + ]; + description = "An abstract Handle for accessing collections in stores like Redis"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "keyed-vals-hspec-tests" = callPackage + ({ mkDerivation, aeson, base, benri-hspec, bytestring, containers + , hspec, http-api-data, keyed-vals, text + }: + mkDerivation { + pname = "keyed-vals-hspec-tests"; + version = "0.2.0.0"; + sha256 = "1pmhd9gjq92gn5z36l6av3hbxq5ynwhzy3igij7wvndx3mkj94hm"; + libraryHaskellDepends = [ + aeson base benri-hspec bytestring containers hspec http-api-data + keyed-vals text + ]; + description = "Validate a keyed-vals Handle"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "keyed-vals-mem" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec, keyed-vals + , keyed-vals-hspec-tests, text, unliftio, unliftio-core + }: + mkDerivation { + pname = "keyed-vals-mem"; + version = "0.2.0.0"; + sha256 = "08zsrwdcqw7ic1l9ygcalyg0k985ck1gal03kw21jlsh3l77942d"; + libraryHaskellDepends = [ + base bytestring containers keyed-vals text unliftio unliftio-core + ]; + testHaskellDepends = [ base hspec keyed-vals-hspec-tests ]; + description = "Implements a keyed-vals Handle using in-process memory"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "keyed-vals-redis" = callPackage + ({ mkDerivation, base, bytestring, containers, hedis, hspec + , hspec-tmp-proc, keyed-vals, keyed-vals-hspec-tests, QuickCheck + , read-env-var, text, tmp-proc-redis, unliftio, unliftio-core + }: + mkDerivation { + pname = "keyed-vals-redis"; + version = "0.2.0.0"; + sha256 = "1fxb1r6c19sslhmml04w7adpqwq1glavm5mfix7iiaxly358jdy6"; + libraryHaskellDepends = [ + base bytestring containers hedis keyed-vals read-env-var text + unliftio unliftio-core + ]; + testHaskellDepends = [ + base bytestring hspec hspec-tmp-proc keyed-vals-hspec-tests + QuickCheck text tmp-proc-redis + ]; + description = "Access Redis using a keyed-vals Handle"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "keylayouts" = callPackage ({ mkDerivation, base, bytestring, containers, text, xeno }: mkDerivation { @@ -170320,8 +170057,6 @@ self: { ]; description = "Managing stores of secret things"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keyvaluehash" = callPackage @@ -170387,20 +170122,6 @@ self: { }) {}; "ki" = callPackage - ({ mkDerivation, base, containers, stm }: - mkDerivation { - pname = "ki"; - version = "0.2.0.1"; - sha256 = "1nxmgv4kxh2whdsmj659iypf8gfjrqzyxzyzghapg1fmpffjpcyr"; - revision = "1"; - editedCabalFile = "0prk6bq1rw52dc7ydapqklcapl1z6yqz0vnx0fl4cm600pd9salm"; - libraryHaskellDepends = [ base containers stm ]; - testHaskellDepends = [ base stm ]; - description = "A lightweight, structured-concurrency library"; - license = lib.licenses.bsd3; - }) {}; - - "ki_1_0_0_1" = callPackage ({ mkDerivation, base, containers, stm, tasty, tasty-hunit }: mkDerivation { pname = "ki"; @@ -170410,7 +170131,19 @@ self: { testHaskellDepends = [ base stm tasty tasty-hunit ]; description = "A lightweight structured concurrency library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; + }) {}; + + "ki-effectful" = callPackage + ({ mkDerivation, base, effectful-core, ki, stm, tasty, tasty-hunit + }: + mkDerivation { + pname = "ki-effectful"; + version = "0.1.0.0"; + sha256 = "00r7f666kzjvx54hpvq3aiq09a9zqja0x22bff94l4pdzrpx8ch2"; + libraryHaskellDepends = [ base effectful-core ki stm ]; + testHaskellDepends = [ base effectful-core stm tasty tasty-hunit ]; + description = "Adaptation of the ki library for the effectful ecosystem"; + license = lib.licenses.mit; }) {}; "ki-unlifted" = callPackage @@ -170422,8 +170155,6 @@ self: { libraryHaskellDepends = [ base ki unliftio-core ]; description = "A lightweight structured-concurrency library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kibro" = callPackage @@ -170697,7 +170428,9 @@ self: { ]; description = "K_M,N quadratic programming"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "kmn-programming"; + broken = true; }) {}; "kmonad" = callPackage @@ -171129,39 +170862,6 @@ self: { }) {}; "krank" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hspec - , hspec-expectations, http-client, http-types, lifted-async, mtl - , optparse-applicative, pcre-heavy, pretty-terminal, process, PyF - , req, safe-exceptions, text, unordered-containers - }: - mkDerivation { - pname = "krank"; - version = "0.2.3"; - sha256 = "0y78njv85s7mcza541gdax5l9651vm78k78ay42phcfvniv82hgx"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers http-client http-types - lifted-async mtl pcre-heavy pretty-terminal PyF req safe-exceptions - text unordered-containers - ]; - executableHaskellDepends = [ - base containers mtl optparse-applicative pcre-heavy pretty-terminal - process PyF text - ]; - testHaskellDepends = [ - aeson base bytestring containers hspec hspec-expectations - http-client http-types lifted-async mtl pcre-heavy pretty-terminal - PyF req safe-exceptions text unordered-containers - ]; - description = "Krank checks issue tracker link status in your source code"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "krank"; - broken = true; - }) {}; - - "krank_0_3_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec , hspec-expectations, http-client, http-types, lifted-async, mtl , optparse-applicative, pcre-heavy, pretty-terminal, process, PyF @@ -171189,9 +170889,7 @@ self: { ]; description = "Krank checks issue tracker link status in your source code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "krank"; - broken = true; }) {}; "krapsh" = callPackage @@ -171476,10 +171174,8 @@ self: { }: mkDerivation { pname = "kvitable"; - version = "1.0.1.0"; - sha256 = "0j0sl1bdx174w79xz80j89r3nmllics1h72mslsivnqv04l519l9"; - revision = "1"; - editedCabalFile = "0f801w2jgadc53nxxkgzdmfy90im0vvqh5i36r68cfx0ycywkcgn"; + version = "1.0.2.0"; + sha256 = "0d01sn1wj1d8cndahrvplg8qhkfyhjy5yw22c2h04jjy6n89vwwq"; libraryHaskellDepends = [ base containers lucid microlens prettyprinter text ]; @@ -171489,7 +171185,6 @@ self: { ]; description = "Key/Value Indexed Table container and formatting library"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {}; "kyotocabinet" = callPackage @@ -172012,8 +171707,10 @@ self: { }: mkDerivation { pname = "lambdabot"; - version = "5.3.0.2"; - sha256 = "0c5qwgzisvqxlyh378bbnabb9lbinknwvcf46sjpm6355krcw3g7"; + version = "5.3.1"; + sha256 = "0fznnbjrk5m6g0jd65ngmckqcgnn87hs30mxqfkncqbqp86s3zyd"; + revision = "2"; + editedCabalFile = "0q7sb9man3zxgaajm8vy59ld0xsb5vzjai8vb8rnljxdkgsy4i5j"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -172033,23 +171730,23 @@ self: { , dependent-map, dependent-sum, dependent-sum-template, directory , edit-distance, exceptions, filepath, haskeline, hslogger, HTTP , lifted-base, monad-control, mtl, network, network-bsd, parsec - , prim-uniq, random, random-fu, random-source, regex-tdfa - , SafeSemaphore, split, syb, template-haskell, time, transformers - , transformers-base, unix, utf8-string, zlib + , prim-uniq, random, random-fu, regex-tdfa, SafeSemaphore, split + , syb, template-haskell, time, transformers, transformers-base + , unix, utf8-string, zlib }: mkDerivation { pname = "lambdabot-core"; - version = "5.3.0.2"; - sha256 = "1i375kiw98j5gd4pixh59lcqk0lakwmrgxzpkr0431a48kxffq7r"; - revision = "1"; - editedCabalFile = "1kydr2sis2r7vr313n6cy5rh2bpnci7zfmrbmxd6ih67f0x8aa3q"; + version = "5.3.1"; + sha256 = "1hiq1wh60cprx49y1178rwsw8dcflzx10g2ivi77d4qxyiawljph"; + revision = "2"; + editedCabalFile = "0cp2aldnqxd74l4ggxm523shfyvh864zvp6v0d0zyry5jrx7zyfr"; libraryHaskellDepends = [ base binary bytestring containers dependent-map dependent-sum dependent-sum-template directory edit-distance exceptions filepath haskeline hslogger HTTP lifted-base monad-control mtl network - network-bsd parsec prim-uniq random random-fu random-source - regex-tdfa SafeSemaphore split syb template-haskell time - transformers transformers-base unix utf8-string zlib + network-bsd parsec prim-uniq random random-fu regex-tdfa + SafeSemaphore split syb template-haskell time transformers + transformers-base unix utf8-string zlib ]; description = "Lambdabot core functionality"; license = "GPL"; @@ -172060,21 +171757,23 @@ self: { , data-memocombinators, directory, filepath , haskell-src-exts-simple, hoogle, HTTP, IOSpec, lambdabot-core , lambdabot-reference-plugins, lambdabot-trusted, lifted-base - , logict, MonadRandom, mtl, mueval, network, numbers, oeis, parsec - , pretty, process, QuickCheck, regex-tdfa, show, split, syb - , transformers, utf8-string, vector-space + , logict, mtl, mueval, network, numbers, oeis, parsec, pretty + , process, QuickCheck, regex-tdfa, show, split, syb, transformers + , utf8-string, vector-space }: mkDerivation { pname = "lambdabot-haskell-plugins"; - version = "5.3.0.2"; - sha256 = "1h2f86dw3356n66n1nfcqi5hsnj6kvlc1px8s4nrw3zvjlkangzq"; + version = "5.3.1"; + sha256 = "05xja5xamvl61xc09fyijmv0sylfd3aaii3p410xa34msglsyssd"; + revision = "2"; + editedCabalFile = "15filg6s0xhizffmhx7ca220930d2xjqvmfaafcrl7vpn3dcrgbl"; libraryHaskellDepends = [ array arrows base bytestring containers data-memocombinators directory filepath haskell-src-exts-simple hoogle HTTP IOSpec lambdabot-core lambdabot-reference-plugins lambdabot-trusted - lifted-base logict MonadRandom mtl mueval network numbers oeis - parsec pretty process QuickCheck regex-tdfa show split syb - transformers utf8-string vector-space + lifted-base logict mtl mueval network numbers oeis parsec pretty + process QuickCheck regex-tdfa show split syb transformers + utf8-string vector-space ]; description = "Lambdabot Haskell plugins"; license = "GPL"; @@ -172087,8 +171786,10 @@ self: { }: mkDerivation { pname = "lambdabot-irc-plugins"; - version = "5.3.0.2"; - sha256 = "1pwl77dh474sqvhd4nfqcqvzicz36xww13sw49qs5wd2fkp50zqi"; + version = "5.3.1"; + sha256 = "0fcbp39vm05g6sjjmxmdxflia5n0yckai0chqqkk1g01khb4pkjy"; + revision = "2"; + editedCabalFile = "17kg3vac8jiciwygzxdws3bskiwlxfm41hbqn8wm0hcz0l9h4ss0"; libraryHaskellDepends = [ base bytestring containers directory filepath lambdabot-core lifted-base mtl network SafeSemaphore split time @@ -172100,19 +171801,21 @@ self: { "lambdabot-misc-plugins" = callPackage ({ mkDerivation, base, bytestring, containers, filepath , lambdabot-core, lifted-base, mtl, network, network-uri, parsec - , process, random, random-fu, random-source, regex-tdfa - , SafeSemaphore, split, tagsoup, template-haskell, time - , transformers, transformers-base, unix, utf8-string, zlib + , process, regex-tdfa, SafeSemaphore, split, tagsoup + , template-haskell, time, transformers, transformers-base, unix + , utf8-string, zlib }: mkDerivation { pname = "lambdabot-misc-plugins"; - version = "5.3.0.2"; - sha256 = "0m2rarvcmmas78ghzvzjf1flicj2sf4d14i7y5cxfpc5l3zcyqwq"; + version = "5.3.1"; + sha256 = "01dq0lxr7cbnh6bzlk5cndqif44q1sw2azqimz43gaplpqbnavl6"; + revision = "2"; + editedCabalFile = "188l0yj672dbdssfafnlz4jybyd1d1i7yb3j66v483b5m09m0f2x"; libraryHaskellDepends = [ base bytestring containers filepath lambdabot-core lifted-base mtl - network network-uri parsec process random random-fu random-source - regex-tdfa SafeSemaphore split tagsoup template-haskell time - transformers transformers-base unix utf8-string zlib + network network-uri parsec process regex-tdfa SafeSemaphore split + tagsoup template-haskell time transformers transformers-base unix + utf8-string zlib ]; description = "Lambdabot miscellaneous plugins"; license = "GPL"; @@ -172120,16 +171823,19 @@ self: { "lambdabot-novelty-plugins" = callPackage ({ mkDerivation, base, binary, brainfuck, bytestring, containers - , dice, directory, lambdabot-core, misfortune, process, random-fu - , regex-tdfa, unlambda + , dice, directory, lambdabot-core, misfortune, process, random + , random-fu, regex-tdfa, unlambda }: mkDerivation { pname = "lambdabot-novelty-plugins"; - version = "5.3.0.2"; - sha256 = "09rqshkh1k7536b9zw4rga370l35v47vf28xdlnrh7knwh88yr70"; + version = "5.3.1"; + sha256 = "0v851nxpxr90agfyh9nx44f1r310fs93y2gji4a7x1synb786rnw"; + revision = "2"; + editedCabalFile = "1m500jq122wml8cp398szd7m9bya4fw5yg2fcv349fdz32wr18hd"; libraryHaskellDepends = [ base binary brainfuck bytestring containers dice directory - lambdabot-core misfortune process random-fu regex-tdfa unlambda + lambdabot-core misfortune process random random-fu regex-tdfa + unlambda ]; description = "Novelty plugins for Lambdabot"; license = "GPL"; @@ -172142,8 +171848,10 @@ self: { }: mkDerivation { pname = "lambdabot-reference-plugins"; - version = "5.3.0.2"; - sha256 = "1n9r29gmllmad2nr83gnbafka7gp99qji1pj0hhcr7gb31asz2xl"; + version = "5.3.1"; + sha256 = "16zp4mpp77778i8vkcr58nr3xg2rnfdlm5ap0sdrqqfx51bs8ybq"; + revision = "2"; + editedCabalFile = "1c65bw5q7gap9n1rlxv0y988fd7srzkdzz0m2x6b70kfkj19ha7m"; libraryHaskellDepends = [ base bytestring containers HTTP lambdabot-core mtl network network-uri oeis process regex-tdfa split tagsoup utf8-string @@ -172158,8 +171866,10 @@ self: { }: mkDerivation { pname = "lambdabot-social-plugins"; - version = "5.3.0.2"; - sha256 = "10yl1z562cnnx0ml343c7psaw5zsil66zrbsgvij6cy2b2p2d3m2"; + version = "5.3.1"; + sha256 = "0d8hc34hky8br53yj15qchbkm796d7x9zhhm8bq9h4rn1a2zfmdz"; + revision = "2"; + editedCabalFile = "1gk4qmjzizxk4qzc3kvq36p515my2cf6vybhnb2zaxpnckg9v68k"; libraryHaskellDepends = [ base binary bytestring containers lambdabot-core mtl split time ]; @@ -172191,17 +171901,15 @@ self: { ]; description = "Lambdabot for Telegram"; license = lib.licenses.gpl2Plus; - hydraPlatforms = lib.platforms.none; mainProgram = "telegram-lambdabot"; - broken = true; }) {}; "lambdabot-trusted" = callPackage ({ mkDerivation, base, oeis, QuickCheck, QuickCheck-safe }: mkDerivation { pname = "lambdabot-trusted"; - version = "5.3.0.2"; - sha256 = "1mwgamd75llraiafk7s43j6qz495j96s1dprckrisww37gv3nn8d"; + version = "5.3.1"; + sha256 = "03wmk7l7krb51zql2qxf805ww0gndbgysfw0fgm3pzd98j7bfimh"; libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ]; description = "Lambdabot trusted code"; license = "GPL"; @@ -172569,6 +172277,7 @@ self: { description = "Lambdabot running as a twitter bot. Similar to the @fsibot f# bot."; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lambdaya-bus" = callPackage @@ -172692,7 +172401,6 @@ self: { description = "Haskell bindings for the Linux Landlock API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lang" = callPackage @@ -172821,7 +172529,6 @@ self: { ]; description = "Language definition and parser for AVRO files"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "language-bash" = callPackage @@ -172885,6 +172592,26 @@ self: { maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; + "language-c_0_9_2" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers, deepseq + , directory, filepath, happy, mtl, pretty, process + }: + mkDerivation { + pname = "language-c"; + version = "0.9.2"; + sha256 = "1cvcxwnbg71xijadr4aqzwxaw29fxj5z2gpnz3lp5pqnv8phscdj"; + libraryHaskellDepends = [ + array base bytestring containers deepseq directory filepath mtl + pretty process + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ base directory filepath process ]; + description = "Analysis and generation of C code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.expipiplus1 ]; + }) {}; + "language-c-comments" = callPackage ({ mkDerivation, alex, array, base, language-c }: mkDerivation { @@ -173098,28 +172825,6 @@ self: { mainProgram = "emd"; }) {}; - "language-docker" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , hspec, hspec-megaparsec, HUnit, megaparsec, prettyprinter - , QuickCheck, split, text, time - }: - mkDerivation { - pname = "language-docker"; - version = "10.4.3"; - sha256 = "0s3grrz3n0fvxh7qn4gfaw1m194zd2s4zjqhzar8kr783yw3rr1k"; - libraryHaskellDepends = [ - base bytestring containers data-default-class megaparsec - prettyprinter split text time - ]; - testHaskellDepends = [ - base bytestring containers data-default-class hspec - hspec-megaparsec HUnit megaparsec prettyprinter QuickCheck split - text time - ]; - description = "Dockerfile parser, pretty-printer and embedded DSL"; - license = lib.licenses.gpl3Only; - }) {}; - "language-docker_11_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , data-default-class, hspec, hspec-megaparsec, HUnit, megaparsec @@ -173143,7 +172848,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "language-docker_12_0_0" = callPackage + "language-docker" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , data-default-class, hspec, hspec-megaparsec, HUnit, megaparsec , prettyprinter, QuickCheck, split, text, time @@ -173163,7 +172868,6 @@ self: { ]; description = "Dockerfile parser, pretty-printer and embedded DSL"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "language-dockerfile" = callPackage @@ -173235,8 +172939,6 @@ self: { ]; description = "JavaScript parser and pretty-printer library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "language-ecmascript-analysis" = callPackage @@ -173252,7 +172954,6 @@ self: { ]; description = "JavaScript static analysis library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "language-eiffel" = callPackage @@ -173304,6 +173005,8 @@ self: { libraryToolDepends = [ alex happy ]; description = "Fortran lexer and parser, language support, and extensions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "language-gcl" = callPackage @@ -173513,6 +173216,8 @@ self: { testHaskellDepends = [ base hspec parsec ]; description = "javascript parser for es6 and es7"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "language-kort" = callPackage @@ -173679,7 +173384,7 @@ self: { ]; description = "Data types and functions to represent the Nix language"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.peti ]; + maintainers = [ lib.maintainers.sternenseemann ]; }) {}; "language-oberon" = callPackage @@ -174169,6 +173874,8 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ]; description = "Matrix programming library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lapack" = callPackage @@ -174199,6 +173906,7 @@ self: { ]; description = "Numerical Linear Algebra using LAPACK"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "lapack-carray" = callPackage @@ -174231,6 +173939,7 @@ self: { ]; description = "Auto-generated interface to Fortran LAPACK via comfort-array"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "lapack-ffi" = callPackage @@ -174255,6 +173964,8 @@ self: { pname = "lapack-ffi-tools"; version = "0.1.3"; sha256 = "0qk5a43w8xn8pp9bhmjmjyvriiin2dyf4nvk13w858hsxyx6xqkx"; + revision = "1"; + editedCabalFile = "15w2ml6iqwk7776dl9m7lg0jp7akw9f8s95flrsjfxr479qig48i"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -174281,6 +173992,7 @@ self: { ]; description = "Conversion of objects between 'lapack' and 'hmatrix'"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "large-anon" = callPackage @@ -174648,8 +174360,8 @@ self: { }) {}; "lattices" = callPackage - ({ mkDerivation, base, base-compat, containers, deepseq, ghc-prim - , hashable, integer-logarithms, QuickCheck, quickcheck-instances + ({ mkDerivation, base, base-compat, containers, deepseq, hashable + , integer-logarithms, QuickCheck, quickcheck-instances , semigroupoids, tagged, tasty, tasty-quickcheck, transformers , universe-base, universe-reverse-instances, unordered-containers }: @@ -174660,9 +174372,9 @@ self: { revision = "4"; editedCabalFile = "0nkcdqb3gsp1lqpj7hv4knndj7p258j0cp4cbqx7jixc93gkq044"; libraryHaskellDepends = [ - base base-compat containers deepseq ghc-prim hashable - integer-logarithms QuickCheck semigroupoids tagged transformers - universe-base universe-reverse-instances unordered-containers + base base-compat containers deepseq hashable integer-logarithms + QuickCheck semigroupoids tagged transformers universe-base + universe-reverse-instances unordered-containers ]; testHaskellDepends = [ base base-compat containers QuickCheck quickcheck-instances tasty @@ -174683,8 +174395,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "3.0.3"; - sha256 = "0j5j4x94r7ha7amv0cggs7n7n9vyx1ga5kwdr8mcddc7karz18cg"; + version = "3.0.4"; + sha256 = "0ah3sxghmbv3gzzqs9xak5xi5fpzkvhgf0v637sq2w1k06776k56"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash exceptions extra generic-lens hashtables hedis @@ -174701,6 +174413,8 @@ self: { ]; description = "Server-side SDK for integrating with LaunchDarkly"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "launchpad-control" = callPackage @@ -174926,10 +174640,8 @@ self: { }: mkDerivation { pname = "lazy-async"; - version = "1.0.0.1"; - sha256 = "1nw24hfpw0wd099lxjsi1iqssbb7yw6isilkv4a68agv2q1ranvk"; - revision = "1"; - editedCabalFile = "1rp4ym19rz1z60awfdxyl80abmpmyjhw6s0rb40j1cmrahpvf6hz"; + version = "1.0.0.2"; + sha256 = "0727384j636pbnfmw2v98j6yn9qw0inv5zrsvmyf1p6znk718jf8"; libraryHaskellDepends = [ base exceptions lifted-async monad-control rank2classes stm transformers transformers-base @@ -174952,8 +174664,21 @@ self: { testHaskellDepends = [ base doctest exceptions tasty tasty-hunit ]; description = "A bracket with lazy resource allocation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + }) {}; + + "lazy-cache" = callPackage + ({ mkDerivation, base, clock, hashable, hspec, hspec-discover + , HUnit, psqueues + }: + mkDerivation { + pname = "lazy-cache"; + version = "0.2.0.0"; + sha256 = "0645xv18m0l5pzwqfg974bwg92457na95i8hkfgvhnjrsbb3ijff"; + libraryHaskellDepends = [ base clock hashable psqueues ]; + testHaskellDepends = [ base clock hashable hspec HUnit ]; + testToolDepends = [ hspec-discover ]; + description = "Library for caching IO action that leverages on GHC RTS implementation"; + license = lib.licenses.mpl20; }) {}; "lazy-csv" = callPackage @@ -175215,7 +174940,6 @@ self: { description = "Online Latent Dirichlet Allocation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ldap-client" = callPackage @@ -175311,6 +175035,18 @@ self: { broken = true; }) {}; + "ldtk-types" = callPackage + ({ mkDerivation, aeson, base, text }: + mkDerivation { + pname = "ldtk-types"; + version = "0.2.0.0"; + sha256 = "0dyjzcrd5p3hg54j0qnszxdpfb7wn6gykaq8nc6il284nf9rqbai"; + libraryHaskellDepends = [ aeson base text ]; + testHaskellDepends = [ aeson base text ]; + description = "Datatypes and Aeson instances for parsing LDtk"; + license = lib.licenses.bsd3; + }) {}; + "leaf" = callPackage ({ mkDerivation, base, blaze-html, directory, filepath, pandoc , split @@ -175539,6 +175275,7 @@ self: { ]; description = "Haskell code for learning physics"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "learn-physics-examples" = callPackage @@ -175557,7 +175294,6 @@ self: { description = "examples for learn-physics"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "learning-hmm" = callPackage @@ -175574,7 +175310,6 @@ self: { description = "Yet another library for hidden Markov models"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "leb128" = callPackage @@ -175862,10 +175597,10 @@ self: { }: mkDerivation { pname = "lens"; - version = "5.0.1"; - sha256 = "0gzwx4b758phm51hz5i4bbkbvjw1ka7qj04zd9l9sh9n6s9ksm7c"; - revision = "3"; - editedCabalFile = "17qmk274b88k4ivhnkc6600djhh9d7pr4s1xhzi3ln2cspj5gvb3"; + version = "5.1.1"; + sha256 = "08mkm2mjvhmwg9hc4kd4cd6dgmcszs1p2mzp1nmri7lqbpy9jknc"; + revision = "1"; + editedCabalFile = "19z3k7ikpfa96b86yabxghfqpnq9d0ayy4gdlvci3ycvws0s8cy6"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -175957,7 +175692,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "lens-aeson" = callPackage + "lens-aeson_1_1_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, lens , scientific, text, unordered-containers, vector }: @@ -175973,9 +175708,10 @@ self: { ]; description = "Law-abiding lenses for aeson"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; - "lens-aeson_1_2_2" = callPackage + "lens-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, lens , scientific, text, text-short, unordered-containers, vector }: @@ -175989,7 +175725,6 @@ self: { ]; description = "Law-abiding lenses for aeson"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "lens-core" = callPackage @@ -176266,6 +176001,8 @@ self: { libraryHaskellDepends = [ base lens tell ]; description = "MonadTell-based lens combinators"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lens-text-encoding" = callPackage @@ -176374,6 +176111,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "lens-witherable" = callPackage + ({ mkDerivation, base, witherable }: + mkDerivation { + pname = "lens-witherable"; + version = "0.1.0.2"; + sha256 = "0n00njfd9zcfgrkwajm1h1mvzgblykzn89whca2xwwqspf7f57kd"; + libraryHaskellDepends = [ base witherable ]; + description = "lens-compatible tools for working with witherable"; + license = lib.licenses.mit; + }) {}; + "lens-xml" = callPackage ({ mkDerivation, base, lens, xml }: mkDerivation { @@ -176421,16 +176169,14 @@ self: { "lentil" = callPackage ({ mkDerivation, ansi-wl-pprint, base, csv, deepseq, directory - , dlist, filemanip, filepath, hspec, megaparsec, mtl, natural-sort - , optparse-applicative, regex-tdfa, semigroups + , dlist, filemanip, filepath, hspec, hspec-discover, megaparsec + , mtl, natural-sort, optparse-applicative, regex-tdfa, semigroups , terminal-progress-bar, text }: mkDerivation { pname = "lentil"; - version = "1.5.4.0"; - sha256 = "0xfsf7g9r2w30qkp4829w77hsja562jvx4n9i880j9qngi2ms2h1"; - revision = "2"; - editedCabalFile = "1n88rdsf5ayprgz1wnbx32gaff8kpixfkdkr6q4jvc896fhrhdzp"; + version = "1.5.4.2"; + sha256 = "198ajay44aapyn8zw3416lhv7wdkb8p6y3a77w2m3p9ly9sj5hgc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -176443,6 +176189,7 @@ self: { hspec megaparsec mtl natural-sort optparse-applicative regex-tdfa semigroups terminal-progress-bar text ]; + testToolDepends = [ hspec-discover ]; description = "frugal issue tracker"; license = lib.licenses.gpl3Only; mainProgram = "lentil"; @@ -176464,7 +176211,6 @@ self: { ]; description = "Van Laarhoven lenses"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lenz-mtl" = callPackage @@ -176482,7 +176228,6 @@ self: { ]; description = "mtl operations with Van Laarhoven lenses"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "lenz-template" = callPackage @@ -176501,6 +176246,7 @@ self: { description = "Van Laarhoven lens templates"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "less-arbitrary" = callPackage @@ -176992,19 +176738,6 @@ self: { }) {inherit (pkgs) expect; inherit (pkgs) tcl;}; "libffi" = callPackage - ({ mkDerivation, base, bytestring, ffi, libffi }: - mkDerivation { - pname = "libffi"; - version = "0.1"; - sha256 = "0g7jnhng3j7z5517aaqga0144aamibsbpgm3yynwyfzkq1kp0f28"; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ ffi ]; - libraryPkgconfigDepends = [ libffi ]; - description = "A binding to libffi"; - license = lib.licenses.bsd3; - }) {ffi = null; inherit (pkgs) libffi;}; - - "libffi_0_2_1" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { pname = "libffi"; @@ -177013,7 +176746,6 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "A binding to libffi"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "libffi-dynamic" = callPackage @@ -177601,9 +177333,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Move/rename according a set of rules"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; mainProgram = "librarian"; - broken = true; }) {}; "librato" = callPackage @@ -177704,8 +177434,6 @@ self: { ]; description = "Bindings for secp256k1"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) secp256k1;}; "libsodium" = callPackage @@ -177820,8 +177548,6 @@ self: { description = "Haskell bindings to libsystemd-journal"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) systemd;}; "libtagc" = callPackage @@ -177928,7 +177654,7 @@ self: { version = "0.1.1"; sha256 = "01zvk86kg726lf2vnlr7dxiz7g3xwi5a4ak9gcfbwyhynkzjmsfi"; configureFlags = [ - "--extra-include-dir=${libxml2.dev}/include/libxml2" + "--extra-include-dir=${lib.getDev libxml2}/include/libxml2" ]; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ libxml2 ]; @@ -178171,8 +177897,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "lift-type"; - version = "0.1.0.1"; - sha256 = "1195iyf0s8zmibjmvd10bszyccp1a2g4wdysn7yk10d3j0q9xdxf"; + version = "0.1.1.1"; + sha256 = "039psym2ghkydk4qyycs3cxndrf85ab5hwzrqv0ajxcilqr11n0h"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Lift a type from a Typeable constraint to a Template Haskell type"; @@ -178331,8 +178057,6 @@ self: { ]; description = "LIFX LAN API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ligature" = callPackage @@ -178656,8 +178380,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "line-drawing"; - version = "0.4.0.0"; - sha256 = "0f0dj3hr1b9vryrmd88ghhn0jrv3nn5yhl5kj1bwwl99z59ww7bp"; + version = "0.4.0.1"; + sha256 = "19jyfp5cm5yzsvrjxk0yd5j46j6jk56v94xi7na97ghxqbvaascl"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "raster line drawing"; @@ -178722,6 +178446,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "linear_1_22" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes + , bytestring, cereal, containers, deepseq, distributive, ghc-prim + , hashable, HUnit, indexed-traversable, lens, random, reflection + , semigroupoids, simple-reflect, tagged, template-haskell + , test-framework, test-framework-hunit, transformers + , transformers-compat, unordered-containers, vector, void + }: + mkDerivation { + pname = "linear"; + version = "1.22"; + sha256 = "1ddr0c54kbi9bw7d62i6h3jiss3q0qmrdpkvckajz6qf5lwkxr6g"; + libraryHaskellDepends = [ + adjunctions base base-orphans binary bytes cereal containers + deepseq distributive ghc-prim hashable indexed-traversable lens + random reflection semigroupoids tagged template-haskell + transformers transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base binary bytestring deepseq HUnit reflection simple-reflect + test-framework test-framework-hunit vector + ]; + description = "Linear Algebra"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "linear-accelerate" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear @@ -178764,32 +178515,6 @@ self: { }) {}; "linear-base" = callPackage - ({ mkDerivation, base, containers, deepseq, gauge, ghc-prim - , hashable, hashtables, hedgehog, mmorph, primitive, random - , random-shuffle, storable-tuple, tasty, tasty-hedgehog, text - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "linear-base"; - version = "0.1.0"; - sha256 = "00n7rmvkjg42n1pba1y1lziw9a8gyhix15rw13qsyymi8bdr8k82"; - libraryHaskellDepends = [ - base containers ghc-prim hashable primitive storable-tuple text - transformers vector - ]; - testHaskellDepends = [ - base containers hedgehog mmorph storable-tuple tasty tasty-hedgehog - text vector - ]; - benchmarkHaskellDepends = [ - base deepseq gauge hashable hashtables random random-shuffle - unordered-containers - ]; - description = "Standard library for linear types"; - license = lib.licenses.mit; - }) {}; - - "linear-base_0_3_0" = callPackage ({ mkDerivation, base, containers, deepseq, gauge, ghc-prim , hashable, hashtables, hedgehog, inspection-testing , linear-generics, mmorph, MonadRandom, primitive, random @@ -178816,7 +178541,6 @@ self: { ]; description = "Standard library for linear types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "linear-circuit" = callPackage @@ -178838,6 +178562,7 @@ self: { ]; description = "Compute resistance of linear electrical circuits"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "linear-code" = callPackage @@ -178992,6 +178717,7 @@ self: { description = "Use SMT solvers to solve linear systems over integers and rationals"; license = lib.licenses.bsd3; badPlatforms = [ "aarch64-linux" ]; + hydraPlatforms = lib.platforms.none; }) {}; "linearmap-category" = callPackage @@ -179062,10 +178788,8 @@ self: { ({ mkDerivation, base, hspec, hyphenation }: mkDerivation { pname = "linebreak"; - version = "1.1.0.1"; - sha256 = "11vqz7zv8ihvhbyma9j6pvxainxfg4kml9fylfjy9jpfvilxq5vq"; - revision = "1"; - editedCabalFile = "0pg3r5zvb13sfyhskyadllxpd2l7xvzvjj8r8rvlq248riq78qdc"; + version = "1.1.0.2"; + sha256 = "0i2b7a9f29iyr98x7j2wcagdwxl79rljamch4893vg2syca3h4f5"; libraryHaskellDepends = [ base hyphenation ]; testHaskellDepends = [ base hspec hyphenation ]; description = "breaks strings to fit width"; @@ -179304,6 +179028,8 @@ self: { ]; description = "Lightweight library for building HTTP API"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "linnet-aeson" = callPackage @@ -179321,6 +179047,7 @@ self: { ]; description = "Aeson JSON support for Linnet"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "linnet-conduit" = callPackage @@ -179341,6 +179068,7 @@ self: { ]; description = "Conduit-backed support for streaming in Linnet"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "linode" = callPackage @@ -179438,6 +179166,8 @@ self: { description = "Bindings to Linux evdev input device interface"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "linux-file-extents" = callPackage @@ -179566,6 +179296,8 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "Read, set and list extended attributes"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "linx-gateway" = callPackage @@ -179627,6 +179359,8 @@ self: { pname = "lio-fs"; version = "0.0.1.2"; sha256 = "1zzxsr0kg3bxm2wzhsqw2irk5myzshgqhr3fxi062hzw2rh0nqn9"; + revision = "1"; + editedCabalFile = "1vwdsizbk7h0l10fsn8bql60yc8w5vy7fr0x0z9md6rpmsyfxrr2"; libraryHaskellDepends = [ base bytestring containers directory filepath lio SHA unix xattr ]; @@ -179677,7 +179411,6 @@ self: { description = "RISC-V Core"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lipsum-gen" = callPackage @@ -180101,9 +179834,7 @@ self: { ]; description = "List all remote forwards for mail accounts stored in a SQL database"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "list-remote-forwards"; - broken = true; }) {}; "list-singleton" = callPackage @@ -180135,6 +179866,24 @@ self: { license = lib.licenses.mit; }) {}; + "list-t_1_0_5_6" = callPackage + ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph + , monad-control, mtl, mtl-prelude, transformers, transformers-base + }: + mkDerivation { + pname = "list-t"; + version = "1.0.5.6"; + sha256 = "1ilbc3kjvqanwn4zysy9sdp45cizdqkfyibiymzb1ibg2s56a4sg"; + libraryHaskellDepends = [ + base foldl logict mmorph monad-control mtl transformers + transformers-base + ]; + testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; + description = "ListT done right"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "list-t-attoparsec" = callPackage ({ mkDerivation, attoparsec, base-prelude, either, hspec, list-t , list-t-text, text, transformers @@ -180209,6 +179958,8 @@ self: { ]; description = "A \"libcurl\"-based streaming HTTP client"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "list-t-text" = callPackage @@ -180540,22 +180291,6 @@ self: { }) {}; "little-rio" = callPackage - ({ mkDerivation, base, deepseq, exceptions, microlens - , microlens-mtl, mtl, primitive, resourcet, unliftio-core - }: - mkDerivation { - pname = "little-rio"; - version = "0.2.2"; - sha256 = "1cbadsbhhgls6p46gga4l32b0fhmvp6r9mycaj2srsfdcnwkydr9"; - libraryHaskellDepends = [ - base deepseq exceptions microlens microlens-mtl mtl primitive - resourcet unliftio-core - ]; - description = "When you need just the RIO monad"; - license = lib.licenses.bsd3; - }) {}; - - "little-rio_1_0_1" = callPackage ({ mkDerivation, base, deepseq, exceptions, little-logger , microlens, microlens-mtl, mtl, primitive, resourcet , unliftio-core @@ -180570,7 +180305,6 @@ self: { ]; description = "When you need just the RIO monad"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "live-sequencer" = callPackage @@ -181191,8 +180925,6 @@ self: { ]; description = "Higher level API for working with LMDB"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lmdb-simple" = callPackage @@ -181208,6 +180940,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Simple API for LMDB"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lmonad" = callPackage @@ -181305,6 +181039,7 @@ self: { description = "Support for developing against the LNURL protocol"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lnurl-authenticator" = callPackage @@ -181390,20 +181125,6 @@ self: { }) {}; "loc" = callPackage - ({ mkDerivation, base, containers, doctest, hedgehog }: - mkDerivation { - pname = "loc"; - version = "0.1.3.16"; - sha256 = "0bizqfczhc5higdzrrhinr5q3s971a3klfl3gpffnq9gyzd16nrq"; - revision = "2"; - editedCabalFile = "18fwdgf8l6nrnijla1x5c50ab05snaza27qdkya07sis2fa8286c"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base containers doctest hedgehog ]; - description = "Types representing line and column positions and ranges in text files"; - license = lib.licenses.asl20; - }) {}; - - "loc_0_1_4_0" = callPackage ({ mkDerivation, base, containers, hedgehog, hspec, hspec-hedgehog }: mkDerivation { @@ -181418,6 +181139,21 @@ self: { ]; description = "Types representing line and column positions and ranges in text files"; license = lib.licenses.asl20; + }) {}; + + "loc_0_1_4_1" = callPackage + ({ mkDerivation, base, containers, hedgehog, hspec, hspec-hedgehog + }: + mkDerivation { + pname = "loc"; + version = "0.1.4.1"; + sha256 = "12bsbjl0808dfcshz38iih3cl3768zix23adznnq821ffxsxfiiw"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base containers hedgehog hspec hspec-hedgehog + ]; + description = "Line and column positions and ranges in text files"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; }) {}; @@ -181425,13 +181161,11 @@ self: { ({ mkDerivation, base, containers, hedgehog, loc }: mkDerivation { pname = "loc-test"; - version = "0.1.3.12"; - sha256 = "0xzlv3mgp90l054gsfg8v5li2f5igb1z84r9vz6sdzmsdv6nyzbg"; + version = "0.1.3.13"; + sha256 = "114qi58ppyc5zwyx21d977dh7zhkaxrr0dv7qf1bk98ql5grqcjl"; libraryHaskellDepends = [ base containers hedgehog loc ]; - description = "Test-related utilities related to the /loc/ package"; + description = "Hedgehog generators for loc"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "local-address" = callPackage @@ -181696,6 +181430,8 @@ self: { ]; description = "Structured logging solution (base package)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "log-domain" = callPackage @@ -181736,7 +181472,9 @@ self: { ]; description = "An extensible log effect using extensible-effects"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "log-example"; + broken = true; }) {}; "log-effect-syslog" = callPackage @@ -181753,6 +181491,7 @@ self: { ]; description = "Syslog functions for log-effect"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "log-effectful" = callPackage @@ -181766,6 +181505,7 @@ self: { testHaskellDepends = [ aeson base effectful-core log-base text ]; description = "Adaptation of the log library for the effectful ecosystem"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "log-elasticsearch" = callPackage @@ -181786,6 +181526,7 @@ self: { ]; description = "Structured logging solution (Elasticsearch back end)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "log-postgres" = callPackage @@ -182135,7 +181876,6 @@ self: { description = "Journald back-end for logging-facade"; license = lib.licenses.mit; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; }) {}; "logging-facade-syslog" = callPackage @@ -182198,6 +181938,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "logical-constraints" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "logical-constraints"; + version = "0.1.2.0"; + sha256 = "1sj47ampdyh117wl2czbkqks6vbii2n24p374r49zqnpcw9y4862"; + libraryHaskellDepends = [ base ]; + description = "Simple logical constraints 'syntax-sugar' writing library"; + license = lib.licenses.mit; + }) {}; + "logicst" = callPackage ({ mkDerivation, base, logict, transformers }: mkDerivation { @@ -182212,20 +181963,6 @@ self: { }) {}; "logict" = callPackage - ({ mkDerivation, async, base, mtl, tasty, tasty-hunit }: - mkDerivation { - pname = "logict"; - version = "0.7.1.0"; - sha256 = "1d22b7r8lnak5k8ars166cxbk1lv7gf8g0qs604irsx2s474ybi7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base mtl ]; - testHaskellDepends = [ async base mtl tasty tasty-hunit ]; - description = "A backtracking logic-programming monad"; - license = lib.licenses.bsd3; - }) {}; - - "logict_0_8_0_0" = callPackage ({ mkDerivation, async, base, mtl, tasty, tasty-hunit }: mkDerivation { pname = "logict"; @@ -182237,18 +181974,31 @@ self: { testHaskellDepends = [ async base mtl tasty tasty-hunit ]; description = "A backtracking logic-programming monad"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "logict-sequence" = callPackage - ({ mkDerivation, base, logict, mtl, sequence, type-aligned }: + ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn + , hspec, hspec-hedgehog, list-t, logict, mmorph, mtl, sequence + , transformers + }: mkDerivation { pname = "logict-sequence"; - version = "0.1.0.1"; - sha256 = "15cxn5v3afm5688x972vvd6j7d7x889jwdhnlilpy1c2nzfl9w3i"; - libraryHaskellDepends = [ base logict mtl sequence type-aligned ]; + version = "0.2.0.2"; + sha256 = "0875f15rnfya99h5lfjhhx598y7hsssa927j138zk5dhpz0v3b34"; + libraryHaskellDepends = [ + base logict mmorph mtl sequence transformers + ]; + testHaskellDepends = [ + base hedgehog hedgehog-fn hspec hspec-hedgehog logict mmorph mtl + sequence transformers + ]; + benchmarkHaskellDepends = [ + base containers gauge list-t logict mtl + ]; description = "A backtracking logic-programming monad with asymptotic improvements to msplit"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "logict-state" = callPackage @@ -182260,8 +182010,6 @@ self: { libraryHaskellDepends = [ base logict mtl transformers ]; description = "Library for logic programming based on haskell package logict"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "loglevel" = callPackage @@ -182420,7 +182168,6 @@ self: { description = "A library for lattice cryptography"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lol-apps" = callPackage @@ -182646,7 +182393,6 @@ self: { badPlatforms = [ "aarch64-linux" ]; hydraPlatforms = lib.platforms.none; mainProgram = "longshot"; - broken = true; }) {}; "lookup-tables" = callPackage @@ -182865,18 +182611,18 @@ self: { , constraints, containers, cryptonite, data-default , first-class-families, fmt, lens, morley, morley-prelude, mtl , named, optparse-applicative, singletons, singletons-base - , template-haskell, text, text-manipulate, unordered-containers - , vinyl, with-utf8 + , template-haskell, text, text-manipulate, type-errors + , unordered-containers, vinyl, with-utf8 }: mkDerivation { pname = "lorentz"; - version = "0.14.1"; - sha256 = "0qvg3b0hmnjwarmvsynz7f2y362r6wszzm46168154xwmgyrkb3h"; + version = "0.15.0"; + sha256 = "10nppxymkp7b5vqcrkrm7jd5xg84hvczvvrrh2digdawqmxrakgl"; libraryHaskellDepends = [ aeson-pretty base-noprelude bimap bytestring constraints containers cryptonite data-default first-class-families fmt lens morley morley-prelude mtl named optparse-applicative singletons - singletons-base template-haskell text text-manipulate + singletons-base template-haskell text text-manipulate type-errors unordered-containers vinyl with-utf8 ]; description = "EDSL for the Michelson Language"; @@ -182950,6 +182696,8 @@ self: { ]; description = "Turning images into text using Braille font"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "loup" = callPackage @@ -183014,8 +182762,6 @@ self: { ]; description = "An EDSL for diagrams based based on linear constraints"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lp-diagrams-svg" = callPackage @@ -183036,6 +182782,7 @@ self: { description = "SVG Backend for lp-diagrams"; license = "GPL"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lpeg" = callPackage @@ -183364,30 +183111,30 @@ self: { ]; description = "Parameterized file evaluator"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "ltext"; }) {}; "lti13" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, file-embed - , hspec, http-client, http-types, jose-jwt, oidc-client, QuickCheck - , safe-exceptions, text, th-utilities + , hspec, hspec-discover, http-client, http-types, jose-jwt + , oidc-client, QuickCheck, safe-exceptions, text, th-utilities }: mkDerivation { pname = "lti13"; - version = "0.2.0.3"; - sha256 = "1ls1hfyivmx5yi9i15m95j9j12agyrmfiwza3w9dfa23c210fcxh"; + version = "0.3.0.0"; + sha256 = "0riwrdpfjq1zpz37g0qw34gbf86amb31zz8n3x1xqsrnj69drc6w"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-types jose-jwt oidc-client safe-exceptions text ]; testHaskellDepends = [ - aeson base bytestring file-embed hspec QuickCheck text th-utilities + aeson base bytestring containers file-embed hspec http-client + http-types jose-jwt oidc-client QuickCheck safe-exceptions text + th-utilities ]; - description = "Core functionality for LTI 1.3."; + testToolDepends = [ hspec-discover ]; + description = "Core functionality for LTI 1.3"; license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ltiv1p1" = callPackage @@ -183445,20 +183192,6 @@ self: { }) {}; "lua" = callPackage - ({ mkDerivation, base, lua5_3, tasty, tasty-hunit }: - mkDerivation { - pname = "lua"; - version = "2.1.0"; - sha256 = "00fcx1by3b2bjb3sc86azr3gmy9jd1b0gilbz48pkbb7cw4p5z1c"; - configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; - libraryHaskellDepends = [ base ]; - librarySystemDepends = [ lua5_3 ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - description = "Lua, an embeddable scripting language"; - license = lib.licenses.mit; - }) {inherit (pkgs) lua5_3;}; - - "lua_2_2_1" = callPackage ({ mkDerivation, base, lua5_4, tasty, tasty-hunit }: mkDerivation { pname = "lua"; @@ -183470,7 +183203,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "Lua, an embeddable scripting language"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) lua5_4;}; "lua-arbitrary" = callPackage @@ -183622,6 +183354,8 @@ self: { testHaskellDepends = [ base hspec HUnit lucid ]; description = "Provides ARIA attributes for Lucid templates"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lucid-cdn" = callPackage @@ -183751,8 +183485,6 @@ self: { ]; description = "Clear to write, read and edit DSL for HTML"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lucid2-htmx" = callPackage @@ -183766,6 +183498,7 @@ self: { description = "Use htmx in your lucid templates"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lucienne" = callPackage @@ -183874,8 +183607,8 @@ self: { }: mkDerivation { pname = "lumberjack"; - version = "1.0.1.0"; - sha256 = "0xyza6k73cnqldzqaaqrrx33lwk75gd6qkp85b7byckdkvyy8akh"; + version = "1.0.2.0"; + sha256 = "1yr1l1i5snmbc7h7aykc15mkynw5jcyzx9569hs4svcd92x0lf04"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184339,10 +184072,8 @@ self: { }: mkDerivation { pname = "lzma-static"; - version = "5.2.5.4"; - sha256 = "0ql96kb7hg50d1flk36999p5p05bqs7rp7a59ys4q02423mq1z7b"; - revision = "2"; - editedCabalFile = "0dvqqjihfzkcqaahicga0cnimcwh197dpj8spqrk9mmicmqs5gcr"; + version = "5.2.5.5"; + sha256 = "1qq0lzyfpnjdl9mh8qrr5lhhby8gxzgi1a8wiwpf3vkrziz5hh23"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck @@ -184856,9 +184587,7 @@ self: { ]; description = "Monadic DSL for building constraint solvers using basic propagators"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "sudoku-exe"; - broken = true; }) {}; "madlang" = callPackage @@ -185017,6 +184746,7 @@ self: { ]; description = "Compute solutions for Magico puzzle"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "magico"; }) {}; @@ -185031,6 +184761,8 @@ self: { testHaskellDepends = [ base ghc-prim ]; description = "magma is an algebraic structure"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "magmas" = callPackage @@ -185415,8 +185147,8 @@ self: { pname = "managed"; version = "1.0.9"; sha256 = "0vx8aim8bcyyvxxnmi1xkbl3kwrvskjn99z3y8h458g7nsinsisd"; - revision = "2"; - editedCabalFile = "1hnhi2d5s06bhp2klf9xw9yipymisfyfvb83b6rqfiy549z6ij27"; + revision = "3"; + editedCabalFile = "017h9533j7rlxlsf65ynxpva59yr0qwrdmvhp7if141i98ld4664"; libraryHaskellDepends = [ base transformers ]; description = "A monad for managed values"; license = lib.licenses.bsd3; @@ -186042,8 +185774,6 @@ self: { ]; description = "A set of classes and instances for working with key/value mappings"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "map-exts" = callPackage @@ -186087,6 +185817,8 @@ self: { ]; description = "foldl wrappers for map-reduce"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "map-syntax" = callPackage @@ -186097,8 +185829,8 @@ self: { pname = "map-syntax"; version = "0.3"; sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k"; - revision = "4"; - editedCabalFile = "09sr3lzgkqs59vnwsimqgv098h3hj4srr2avza3z05gfkvxqj8yw"; + revision = "5"; + editedCabalFile = "0vfrq4gbd07jaz656lrxx7yar8lbgimkvkij52sn6d403wak20cv"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -186173,8 +185905,8 @@ self: { ({ mkDerivation, base, tidal }: mkDerivation { pname = "maquinitas-tidal"; - version = "0.2.11"; - sha256 = "1bg0az68jzxkb54rx7zf7bbkdkp5h0aqxyy78d8caaimc5ch2mbv"; + version = "0.2.17"; + sha256 = "1rb72b2p0d61b36d73b0rw6bw7qj125syh3w3b5lr77r8km1np84"; libraryHaskellDepends = [ base tidal ]; description = "library for MIDI control of hardware"; license = lib.licenses.mit; @@ -186419,6 +186151,7 @@ self: { ]; description = "Abstraction for HTML-embedded content"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "markup-preview" = callPackage @@ -186613,7 +186346,6 @@ self: { ]; description = "Markup language preprocessor for Haskell"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; mainProgram = "marxup"; }) {}; @@ -186646,8 +186378,8 @@ self: { }: mkDerivation { pname = "mason"; - version = "0.2.5"; - sha256 = "0ch8qajaj83pifxy24z4srb3j51z5zn94lrx0ziqcfrpshck569j"; + version = "0.2.6"; + sha256 = "10z98igmpswwdfak4b42p5c9rx14fj9zi2j5jb3b194ihi82dnd7"; libraryHaskellDepends = [ array base bytestring ghc-prim network text ]; @@ -186658,14 +186390,15 @@ self: { "massiv" = callPackage ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions , primitive, random, scheduler, unliftio-core, vector + , vector-stream }: mkDerivation { pname = "massiv"; - version = "1.0.2.0"; - sha256 = "15ckrsavsrkgm4c9al2jlk1r4nm2mdjshw1ksbkh8m65l3l5kcrr"; + version = "1.0.3.0"; + sha256 = "1q0qp4xz7z3r70581lry9bkldjv195wfagazwbq6lkxrf8i25lx1"; libraryHaskellDepends = [ base bytestring deepseq exceptions primitive random scheduler - unliftio-core vector + unliftio-core vector vector-stream ]; testHaskellDepends = [ base doctest ]; description = "Massiv (Массив) is an Array Library"; @@ -187703,7 +187436,9 @@ self: { ]; description = "List contents of an mbox file containing e-mails"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "lsmbox"; + broken = true; }) {}; "mbtiles" = callPackage @@ -187832,32 +187567,6 @@ self: { }) {}; "mcmc" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, circular - , containers, covariance, criterion, data-default, deepseq - , directory, dirichlet, double-conversion, hmatrix, hspec - , log-domain, math-functions, microlens, mwc-random, pretty-show - , primitive, statistics, time, transformers, vector, zlib - }: - mkDerivation { - pname = "mcmc"; - version = "0.6.2.2"; - sha256 = "1si81jv8dfwm9lfq3fvfc4mibkg7p61vkjhsgfsmban74v02ja73"; - libraryHaskellDepends = [ - aeson async base bytestring circular containers covariance - data-default deepseq directory dirichlet double-conversion hmatrix - log-domain math-functions microlens mwc-random pretty-show - primitive statistics time transformers vector zlib - ]; - testHaskellDepends = [ base hspec mwc-random statistics ]; - benchmarkHaskellDepends = [ - base criterion math-functions microlens mwc-random - ]; - description = "Sample from a posterior using Markov chain Monte Carlo"; - license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - - "mcmc_0_8_0_1" = callPackage ({ mkDerivation, ad, aeson, async, base, bytestring, circular , containers, covariance, criterion, directory, dirichlet , fixed-vector, hmatrix, hspec, log-domain, math-functions @@ -187880,7 +187589,6 @@ self: { ]; description = "Sample from a posterior using Markov chain Monte Carlo"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.dschrempf ]; }) {}; @@ -188166,7 +187874,6 @@ self: { description = "A schema language for JSON"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mediabus" = callPackage @@ -188440,6 +188147,27 @@ self: { license = lib.licenses.bsd2; }) {}; + "megaparsec_9_3_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , criterion, deepseq, mtl, parser-combinators, scientific, text + , transformers, weigh + }: + mkDerivation { + pname = "megaparsec"; + version = "9.3.0"; + sha256 = "01b05s3chlidz48lrwlyffw712vy4hlfijlh4wj9lq0fdy2b1z0r"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers deepseq mtl + parser-combinators scientific text transformers + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq text weigh + ]; + description = "Monadic parser combinators"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "megaparsec-tests" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , hspec, hspec-discover, hspec-expectations, hspec-megaparsec @@ -188464,6 +188192,32 @@ self: { license = lib.licenses.bsd2; }) {}; + "megaparsec-tests_9_3_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , hspec, hspec-discover, hspec-expectations, hspec-megaparsec + , megaparsec, mtl, parser-combinators, QuickCheck, scientific + , temporary, text, transformers + }: + mkDerivation { + pname = "megaparsec-tests"; + version = "9.3.0"; + sha256 = "1ra1y1gdcxav0xi2djril3l3kb7kvzcjnmxxspmn2nj2921sb0yi"; + libraryHaskellDepends = [ + base bytestring containers hspec hspec-expectations + hspec-megaparsec megaparsec mtl QuickCheck text transformers + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers hspec + hspec-expectations hspec-megaparsec megaparsec mtl + parser-combinators QuickCheck scientific temporary text + transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Test utilities and the test suite of Megaparsec"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "meldable-heap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -188506,6 +188260,8 @@ self: { ]; description = "An Elf parser"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mellon-core" = callPackage @@ -188774,8 +188530,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "memfd"; - version = "1.0.1.0"; - sha256 = "154861xg18h02s26gf3fk8zqhr2d8x21p0s4ar56rfrbi7b2nqrk"; + version = "1.0.1.1"; + sha256 = "1ngd65ixj4ydjp6aqhs1md6vck6mwyf12j5jc425gxnpvmbzwvw8"; libraryHaskellDepends = [ base transformers ]; description = "Open temporary anonymous Linux file handles"; license = lib.licenses.asl20; @@ -188905,7 +188661,9 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion random ]; description = "Generate human memorable strings from binary data"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; mainProgram = "membits"; + broken = true; }) {}; "memory" = callPackage @@ -188914,10 +188672,10 @@ self: { }: mkDerivation { pname = "memory"; - version = "0.16.0"; - sha256 = "0zzxyr2b7gj92h3jzaq1lfqfyfkfj4l636ry35191i9bp3wa0v8l"; + version = "0.17.0"; + sha256 = "0yl3ivvn7i9wbx910b7bzj9c3g0jjjk91j05wj74qb5zx2yyf9rk"; revision = "1"; - editedCabalFile = "02ql04drvyk8sdadxs4yi1h4aic0pxgnrph3j5ndcm6r7hfnv8py"; + editedCabalFile = "1gybf726kz17jm1am0rphi0srmyqyza45y6jdqbq0b8sspm8kggb"; libraryHaskellDepends = [ base basement bytestring deepseq ghc-prim ]; @@ -189084,6 +188842,8 @@ self: { ]; description = "Haskell binding to Mercury API for ThingMagic RFID readers"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "merge" = callPackage @@ -189160,20 +188920,6 @@ self: { }) {}; "mergeless" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, mtl, validity - , validity-containers - }: - mkDerivation { - pname = "mergeless"; - version = "0.3.0.0"; - sha256 = "14kgfh672fywvrjzb9kzhrnw10lxq44216rwniavn68abkg6yx94"; - libraryHaskellDepends = [ - aeson base containers deepseq mtl validity validity-containers - ]; - license = lib.licenses.mit; - }) {}; - - "mergeless_0_4_0_0" = callPackage ({ mkDerivation, aeson, autodocodec, base, containers, deepseq, mtl , text, validity, validity-containers }: @@ -189186,7 +188932,6 @@ self: { validity-containers ]; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "mergeless-persistent" = callPackage @@ -189894,6 +189639,8 @@ self: { doHaddock = false; description = "A minimal base to work around GHC bugs"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "microbench" = callPackage @@ -189951,6 +189698,8 @@ self: { ]; description = "A Microformats 2 parser"; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "microformats2-types" = callPackage @@ -189995,12 +189744,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "microlens_0_4_13_0" = callPackage + "microlens_0_4_13_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "microlens"; - version = "0.4.13.0"; - sha256 = "18qhnan4l8wd5g7ks93m627ymsyvjd82yahwd0ycg8rhxbqd08gw"; + version = "0.4.13.1"; + sha256 = "1z6ph89sgdhgdf8sqaw9g978mlnvlc4k8y50pssaxxplizpanm0a"; libraryHaskellDepends = [ base ]; description = "A tiny lens library with no dependencies"; license = lib.licenses.bsd3; @@ -190008,27 +189757,6 @@ self: { }) {}; "microlens-aeson" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq - , hashable, microlens, scientific, tasty, tasty-hunit, text - , unordered-containers, vector - }: - mkDerivation { - pname = "microlens-aeson"; - version = "2.4.1"; - sha256 = "0h11h1vg467aq1w6gfb0jvzvhk6xsl1i1bl7qfw5kdsnvrd3nbg9"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring deepseq hashable microlens - scientific text unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring deepseq hashable microlens tasty tasty-hunit - text unordered-containers vector - ]; - description = "Law-abiding lenses for Aeson, using microlens"; - license = lib.licenses.mit; - }) {}; - - "microlens-aeson_2_5_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable , microlens, scientific, tasty, tasty-hunit, text, vector }: @@ -190046,15 +189774,14 @@ self: { ]; description = "Law-abiding lenses for Aeson, using microlens"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "microlens-contra" = callPackage ({ mkDerivation, base, microlens }: mkDerivation { pname = "microlens-contra"; - version = "0.1.0.2"; - sha256 = "1ny9qhvd7rfzdkq4jdcgh4mfia856rsgpdhg8lprfprh6p7lhy5m"; + version = "0.1.0.3"; + sha256 = "1jxm6shmvacbic6i6hask0kv89kramnk77pcxpv4gv4xydjsr88n"; libraryHaskellDepends = [ base microlens ]; description = "True folds and getters for microlens"; license = lib.licenses.bsd3; @@ -190088,14 +189815,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "microlens-ghc_0_4_14_0" = callPackage + "microlens-ghc_0_4_14_1" = callPackage ({ mkDerivation, array, base, bytestring, containers, microlens , transformers }: mkDerivation { pname = "microlens-ghc"; - version = "0.4.14.0"; - sha256 = "1iwj2ngkd69il0rncjl84ackphc6jj48skiqgpi27b18l5nwi3v1"; + version = "0.4.14.1"; + sha256 = "1h6wcgv50mxqz09wkamqjgw90382a4m31mq7q57vmzmkl489nw2n"; libraryHaskellDepends = [ array base bytestring containers microlens transformers ]; @@ -190110,8 +189837,8 @@ self: { }: mkDerivation { pname = "microlens-mtl"; - version = "0.2.0.2"; - sha256 = "0y1jli9379l8sgv5a4xl8v3qkz9fkp4qlfsywzdpywbnydl1d5v6"; + version = "0.2.0.3"; + sha256 = "1ilz0zyyk9f6h97gjsaqq65njfs23fk3wxhigvj4z0brf7rnlssd"; libraryHaskellDepends = [ base microlens mtl transformers transformers-compat ]; @@ -190135,14 +189862,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "microlens-platform_0_4_3_2" = callPackage + "microlens-platform_0_4_3_3" = callPackage ({ mkDerivation, base, hashable, microlens, microlens-ghc , microlens-mtl, microlens-th, text, unordered-containers, vector }: mkDerivation { pname = "microlens-platform"; - version = "0.4.3.2"; - sha256 = "12nkwlpj0lr50lw0gr1mf306a94w0x6zkbl97ss4m2cd28im21sj"; + version = "0.4.3.3"; + sha256 = "13s6m07whp3h05vqm2hz3qv5ai51ll6q4s3kf8nr3pif6wxqbisy"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -190175,10 +189902,8 @@ self: { }: mkDerivation { pname = "microlens-th"; - version = "0.4.3.10"; - sha256 = "1dg2xhj85fy8q39m5dd94kjlabjyxgc0336vzkg0174l6l110l1c"; - revision = "1"; - editedCabalFile = "142wksvc854qmd665qd6mwzik8g02yzfpjk1fpxw4mlcns06y4m2"; + version = "0.4.3.11"; + sha256 = "1vjjaclfxr0kvlpmj8zh7f6ci4n4b8vynqd67zszx42al7gal6pj"; libraryHaskellDepends = [ base containers microlens template-haskell th-abstraction transformers @@ -190246,6 +189971,8 @@ self: { pname = "microstache"; version = "1.0.2.2"; sha256 = "1b1nvlb9jragibbbf7bg3k61g0kqhnalpsi91spy2dx18ppxp8gh"; + revision = "1"; + editedCabalFile = "0j9nvvyfk4grxhfg7c0nv6fp635kxnrg95zqmi2dgcw0fkw0apgr"; libraryHaskellDepends = [ aeson base containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -190258,6 +189985,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "microstache_1_0_2_3" = callPackage + ({ mkDerivation, aeson, base, base-orphans, bytestring, containers + , deepseq, directory, filepath, parsec, tasty, tasty-hunit, text + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "microstache"; + version = "1.0.2.3"; + sha256 = "16nj6ss8nmxd0z8lc2a9zpawgvi4kbd5wyjy17xknq43awbi6ynz"; + libraryHaskellDepends = [ + aeson base containers deepseq directory filepath parsec text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base base-orphans bytestring containers parsec tasty + tasty-hunit text + ]; + description = "Mustache templates for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "microtimer" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -190348,6 +190097,7 @@ self: { description = "Convert between datatypes of the midi and the alsa packages"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; + hydraPlatforms = lib.platforms.none; }) {}; "midi-music-box" = callPackage @@ -190465,7 +190215,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "midisurface"; - broken = true; }) {}; "mighttpd" = callPackage @@ -190556,8 +190305,6 @@ self: { ]; description = "Semi-automatic database schema migrations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "migrant-hdbc" = callPackage @@ -190576,7 +190323,6 @@ self: { ]; description = "Semi-automatic database schema migrations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "migrant-postgresql-simple" = callPackage @@ -190598,6 +190344,7 @@ self: { description = "Semi-automatic database schema migrations"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "migrant-sqlite-simple" = callPackage @@ -190615,7 +190362,6 @@ self: { ]; description = "Semi-automatic database schema migrations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "mikmod" = callPackage @@ -190798,6 +190544,17 @@ self: { }) {}; "mime-types" = callPackage + ({ mkDerivation, base, bytestring, containers, text }: + mkDerivation { + pname = "mime-types"; + version = "0.1.0.9"; + sha256 = "1lkipa4v73z3l5lqs6sdhl898iq41kyxv2jb9agsajzgd58l6cha"; + libraryHaskellDepends = [ base bytestring containers text ]; + description = "Basic mime-type handling types and functions"; + license = lib.licenses.mit; + }) {}; + + "mime-types_0_1_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, text }: mkDerivation { pname = "mime-types"; @@ -190806,6 +190563,7 @@ self: { libraryHaskellDepends = [ base bytestring containers text ]; description = "Basic mime-type handling types and functions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "min-max-pqueue" = callPackage @@ -191357,6 +191115,7 @@ self: { license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "mirror-tweet"; + broken = true; }) {}; "misfortune" = callPackage @@ -191961,22 +191720,6 @@ self: { }) {}; "mmorph" = callPackage - ({ mkDerivation, base, mtl, transformers, transformers-compat }: - mkDerivation { - pname = "mmorph"; - version = "1.1.5"; - sha256 = "0bq9m3hlfax1826gg5yhih79x33rvfx59wdh8yf43azd7l74bys6"; - revision = "1"; - editedCabalFile = "087v8ajcfpx4f0v4jxvv16h6jswgnkfnyfn28k406d5w3ihcx1wl"; - libraryHaskellDepends = [ - base mtl transformers transformers-compat - ]; - description = "Monad morphisms"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.Gabriel439 ]; - }) {}; - - "mmorph_1_2_0" = callPackage ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { pname = "mmorph"; @@ -191989,7 +191732,6 @@ self: { ]; description = "Monad morphisms"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; @@ -192048,8 +191790,6 @@ self: { libraryHaskellDepends = [ base directory ]; description = "A small library to deal with executable endings"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mmsyn4" = callPackage @@ -192064,7 +191804,6 @@ self: { executableHaskellDepends = [ base directory mmsyn3 process ]; description = "The \"glue\" between electronic tables and GraphViz"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "mmsyn4"; }) {}; @@ -192125,7 +191864,6 @@ self: { ]; description = "A musical instrument synthesizer or a tool for Ukrainian language listening"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "mmsyn6ukra"; }) {}; @@ -192171,7 +191909,6 @@ self: { ]; description = "Modifies the amplitudes of the sounds representations created by mmsyn7ukr-array and mmsyn7ukr packages"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "mmsyn7l"; }) {}; @@ -192228,7 +191965,6 @@ self: { ]; description = "A simple reduced basic interface to some SoX functionality or to produce a voice that can be used by mmsyn7h-array, dobutokO2-array and other similar packages"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "mmsyn7ukr-common" = callPackage @@ -192240,7 +191976,6 @@ self: { libraryHaskellDepends = [ base directory mmsyn3 process ]; description = "Some common for mmsyn7ukr and mmsyn7ukr-array functionality using SoX"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "mmtf" = callPackage @@ -192457,6 +192192,8 @@ self: { ]; description = "Communicate with Modbus devices over TCP"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "model" = callPackage @@ -192476,6 +192213,8 @@ self: { ]; description = "Derive a model of a data type using Generics"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "modelicaparser" = callPackage @@ -192581,13 +192320,13 @@ self: { }) {}; "modular-arithmetic" = callPackage - ({ mkDerivation, base, doctest, typelits-witnesses }: + ({ mkDerivation, base, doctest }: mkDerivation { pname = "modular-arithmetic"; version = "2.0.0.2"; sha256 = "1bbn3pwvpl9v7a8gkxx83w2s8mk2q9gin7yvkkr97f64rdf8lnrq"; - libraryHaskellDepends = [ base typelits-witnesses ]; - testHaskellDepends = [ base doctest typelits-witnesses ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; description = "A type for integers modulo some constant"; license = lib.licenses.bsd3; }) {}; @@ -192927,9 +192666,8 @@ self: { ]; description = "A library for probabilistic programming"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "example"; - broken = true; + maintainers = [ lib.maintainers.turion ]; }) {}; "monad-bool" = callPackage @@ -193087,6 +192825,8 @@ self: { ]; description = "Just like monad-control, except less efficient, and the monadic state terms are all * -> *"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "monad-control-identity" = callPackage @@ -193243,20 +192983,17 @@ self: { description = "A class of monads which can do http requests"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "monad-interleave" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "monad-interleave"; - version = "0.1"; - sha256 = "09hpl7ah5ivsrx4xlk96d129n1j4wpx7kj6l95zwadyaz7rj9fp7"; + version = "0.2.0.1"; + sha256 = "0ajn06f3q181nf6xa4kish04bv74crqmsmk7i1ny4kw1m9ag139d"; libraryHaskellDepends = [ base ]; description = "Monads with an unsaveInterleaveIO-like operation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "monad-introspect" = callPackage @@ -193376,8 +193113,8 @@ self: { pname = "monad-logger"; version = "0.3.37"; sha256 = "1z275a428zcj73zz0cpfha2adwiwqqqp7klx3kbd3i9rl20xa106"; - revision = "2"; - editedCabalFile = "1kkw07kk8gv7d9iarradqcqzjpdfh5shjlhfbf2v25mmcpchp6hd"; + revision = "3"; + editedCabalFile = "1dzkw08b4ijacdw0vcfxlr13rd819x2yj7b6sr9jrrwicd45zm1z"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm stm-chans @@ -193497,6 +193234,8 @@ self: { ]; description = "syslog output for monad-logger"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "monad-loops" = callPackage @@ -193722,20 +193461,6 @@ self: { }) {}; "monad-parallel" = callPackage - ({ mkDerivation, base, parallel, transformers, transformers-compat - }: - mkDerivation { - pname = "monad-parallel"; - version = "0.7.2.5"; - sha256 = "0yjn8acn8z8b1v5nnmwrmrcim9lqh942kgi2c03cnnklfdc1cqip"; - libraryHaskellDepends = [ - base parallel transformers transformers-compat - ]; - description = "Parallel execution of monadic computations"; - license = lib.licenses.bsd3; - }) {}; - - "monad-parallel_0_8" = callPackage ({ mkDerivation, base, parallel, transformers, transformers-compat }: mkDerivation { @@ -193747,7 +193472,6 @@ self: { ]; description = "Parallel execution of monadic computations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "monad-parallel-progressbar" = callPackage @@ -193902,6 +193626,7 @@ self: { ]; description = "A new, simple, composable concurrency abstraction"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.turion ]; }) {}; "monad-skeleton" = callPackage @@ -194109,6 +193834,8 @@ self: { libraryHaskellDepends = [ base mtl transformers ]; description = "Tree data structure for nondeterministic computations"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "monad-tx" = callPackage @@ -194152,8 +193879,6 @@ self: { ]; description = "Typeclasses for representing monad transformer unlifting"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "monad-unlift-ref" = callPackage @@ -194171,7 +193896,6 @@ self: { ]; description = "Typeclasses for representing monad transformer unlifting"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "monad-validate" = callPackage @@ -194292,6 +194016,8 @@ self: { ]; description = "A monad for using CryptoRandomGen"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "monadfibre" = callPackage @@ -194320,6 +194046,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "monadic-bang" = callPackage + ({ mkDerivation, base, containers, exceptions, fused-effects, ghc + , ghc-boot, ghc-paths, transformers + }: + mkDerivation { + pname = "monadic-bang"; + version = "0.1.0.0"; + sha256 = "0wflx8vlwa5rxa94g40rsn8bwncnwvkbf5iagbhf74mjjdnrc17c"; + libraryHaskellDepends = [ + base containers fused-effects ghc transformers + ]; + testHaskellDepends = [ + base exceptions ghc ghc-boot ghc-paths transformers + ]; + description = "GHC plugin to desugar ! into do-notation"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "monadic-recursion-schemes" = callPackage ({ mkDerivation, base, comonad, containers, free, mtl , recursion-schemes, transformers @@ -194334,6 +194080,8 @@ self: { testHaskellDepends = [ base ]; description = "Recursion Schemes for Monadic version"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "monadiccp" = callPackage @@ -194475,17 +194223,14 @@ self: { ]; testHaskellDepends = [ base tasty tasty-hunit transformers ]; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "monadplus" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "monadplus"; - version = "1.4.2"; - sha256 = "15b5320wdpmdp5slpphnc1x4rhjch3igw245dp2jxbqyvchdavin"; - revision = "1"; - editedCabalFile = "11v5zdsb9mp1rxvgcrxcr2xnc610xi16krwa9r4i5d6njmphfbdp"; + version = "1.4.3"; + sha256 = "1gwy7kkcp696plfsbry22nvvqnainyv1n1van8yzskilz26k2yc5"; libraryHaskellDepends = [ base ]; description = "Haskell98 partial maps and filters over MonadPlus"; license = lib.licenses.bsd3; @@ -194502,8 +194247,6 @@ self: { libraryHaskellDepends = [ base mtl transformers ]; description = "Monad classes, using functional dependencies"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "monads-tf" = callPackage @@ -194611,6 +194354,8 @@ self: { pname = "mongoDB"; version = "2.7.1.2"; sha256 = "0csjhvsvy534lq7lvqx96dw6ia3737rg7q96174067k7mhkxwf9m"; + revision = "1"; + editedCabalFile = "06kdgrg2p2c9n6im1fy04y0rvlwc4xssmk9wvw33k9svhzld7afr"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring binary bson bytestring conduit conduit-extra containers cryptohash @@ -194823,10 +194568,8 @@ self: { }: mkDerivation { pname = "monoid-extras"; - version = "0.6.1"; - sha256 = "1nj5rfax9lmr1pprvgdgq90am9mknx9iv7s84smv6qaw050356jf"; - revision = "2"; - editedCabalFile = "04zbzq7dbv0ddpc1dxrxn9jfyg1xj8sar6ngzhc0cji72cail503"; + version = "0.6.2"; + sha256 = "1qaxp0cf2cvzvfpk7x9mjz1zmlpjfzxij8v2n45w89s7bq9ckvlw"; libraryHaskellDepends = [ base groups semigroupoids ]; benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; @@ -194834,13 +194577,16 @@ self: { }) {}; "monoid-map" = callPackage - ({ mkDerivation, base, monoidal-containers, reflex, witherable }: + ({ mkDerivation, base, commutative-semigroups, monoidal-containers + , patch, reflex, witherable + }: mkDerivation { pname = "monoid-map"; - version = "0.1.1.0"; - sha256 = "0rqmgqvq19yjy3g977zm12ih7a3s3giv2dz32qw1xq8cqjxyc709"; + version = "0.2.0.0"; + sha256 = "0mmz57l0yfkdk3psaxyavs2v5hs860ja5a0wk08n2zar3br4fa2l"; libraryHaskellDepends = [ - base monoidal-containers reflex witherable + base commutative-semigroups monoidal-containers patch reflex + witherable ]; description = "A monoidal map with the right group instance"; license = lib.licenses.bsd3; @@ -194915,15 +194661,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "monoid-subclasses_1_2" = callPackage + "monoid-subclasses_1_2_1" = callPackage ({ mkDerivation, base, bytestring, commutative-semigroups , containers, primes, QuickCheck, quickcheck-instances, tasty , tasty-quickcheck, text, vector }: mkDerivation { pname = "monoid-subclasses"; - version = "1.2"; - sha256 = "10ajd7pm0jgqvsyp61sjyfg4392nmrxir0fry4zc4l2rl8vw1q9s"; + version = "1.2.1"; + sha256 = "10q71zpj2q81q4dpb9mmsds0jwhcvlxqdgxk0kjiqf8i78qy54hn"; libraryHaskellDepends = [ base bytestring commutative-semigroups containers primes text vector @@ -195013,49 +194759,6 @@ self: { }) {}; "monomer" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bytestring - , bytestring-to-vector, c2hs, containers, data-default, directory - , exceptions, extra, formatting, glew, hspec, http-client, HUnit - , JuicyPixels, lens, mtl, nanovg, OpenGL, OpenGLRaw, process - , random, safe, scientific, sdl2, silently, stm, text, text-show - , time, transformers, unordered-containers, vector, websockets - , wreq, wuss - }: - mkDerivation { - pname = "monomer"; - version = "1.3.0.0"; - sha256 = "19k31vppid5lyvqg4q4r07yzw9yisydhx012yn1fzlfjwc89g9bp"; - revision = "3"; - editedCabalFile = "1jz12ww843d0qk7gy6f8fw4l2mpynkcs9knxfc865zyhcjvimfw2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async attoparsec base bytestring bytestring-to-vector containers - data-default exceptions extra formatting http-client JuicyPixels - lens mtl nanovg OpenGL process safe sdl2 stm text text-show time - transformers unordered-containers vector wreq - ]; - librarySystemDepends = [ glew ]; - libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ - aeson async attoparsec base bytestring bytestring-to-vector - containers data-default exceptions extra formatting http-client - JuicyPixels lens mtl nanovg OpenGL OpenGLRaw process random safe - scientific sdl2 stm text text-show time transformers - unordered-containers vector websockets wreq wuss - ]; - testHaskellDepends = [ - async attoparsec base bytestring bytestring-to-vector containers - data-default directory exceptions extra formatting hspec - http-client HUnit JuicyPixels lens mtl nanovg OpenGL process safe - sdl2 silently stm text text-show time transformers - unordered-containers vector wreq - ]; - description = "A GUI library for writing native Haskell applications"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) glew;}; - - "monomer_1_5_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , bytestring-to-vector, c2hs, containers, data-default, exceptions , extra, formatting, glew, hspec, http-client, JuicyPixels, lens @@ -195092,25 +194795,25 @@ self: { ]; description = "A GUI library for writing native Haskell applications"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glew;}; "monomer-hagrid" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , data-default-class, hspec, hspec-discover, ilist, lens, monomer - , mtl, stm, text, time + , mtl, random, stm, text, time }: mkDerivation { pname = "monomer-hagrid"; - version = "0.1.0.0"; - sha256 = "0mr4fnzlrci1qnyl7rdiklzz3l5sqzgax5lqx66n209221a7pnki"; + version = "0.2.0.1"; + sha256 = "0vic013zr80wlm1gf33y8vlkpmrv6z52975dpa3ciypayd36hy2m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers data-default-class ilist lens monomer text ]; executableHaskellDepends = [ - base containers data-default-class ilist lens monomer text time + base containers data-default-class ilist lens monomer random text + time ]; testHaskellDepends = [ base bytestring containers data-default data-default-class hspec @@ -195119,9 +194822,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A datagrid widget for the Monomer library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - mainProgram = "examples"; - broken = true; }) {}; "monomorphic" = callPackage @@ -195334,6 +195034,7 @@ self: { description = "Invocation helpers for the ReaderT-record-of-functions style"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "moonshine" = callPackage @@ -195421,38 +195122,40 @@ self: { "morley" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base-noprelude , base58-bytestring, bimap, binary, bytestring, constraints - , containers, crypto-sodium, cryptonite, data-default, Diff - , elliptic-curve, first-class-families, fmt, galois-field - , generic-deriving, gitrev, haskeline, hex-text, lens, megaparsec - , memory, MonadRandom, morley-prelude, mtl, named - , optparse-applicative, pairing, parser-combinators, scientific - , semigroups, show-type, singletons, singletons-base, syb - , template-haskell, text, text-manipulate, th-lift-instances - , th-reify-many, time, timerep, uncaught-exception - , unordered-containers, vector, vinyl, with-utf8, wl-pprint-text + , constraints-extras, containers, crypto-sodium, cryptonite + , data-default, dependent-sum-template, Diff, elliptic-curve + , first-class-families, fmt, galois-field, generic-deriving, gitrev + , haskeline, hex-text, lens, megaparsec, memory, MonadRandom + , morley-prelude, mtl, named, optparse-applicative, pairing + , parser-combinators, scientific, semigroups, show-type, singletons + , singletons-base, some, syb, template-haskell, text + , text-manipulate, th-lift-instances, th-reify-many, time, timerep + , type-errors, uncaught-exception, unordered-containers, vector + , vinyl, with-utf8, wl-pprint-text }: mkDerivation { pname = "morley"; - version = "1.18.0"; - sha256 = "0kv4rcq8yqdnmf14dsf03196nc717cih2pd574cc7qvfv2frwgh7"; + version = "1.19.0"; + sha256 = "12rps1k1bky7bkx0zl17j9vs07w8fll0576ip02jd6sn1i6541fg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing aeson-pretty base-noprelude base58-bytestring - bimap binary bytestring constraints containers crypto-sodium - cryptonite data-default Diff elliptic-curve first-class-families - fmt galois-field generic-deriving gitrev hex-text lens megaparsec - memory MonadRandom morley-prelude mtl named optparse-applicative - pairing parser-combinators scientific semigroups show-type - singletons singletons-base syb template-haskell text - text-manipulate th-lift-instances th-reify-many time timerep + bimap binary bytestring constraints constraints-extras containers + crypto-sodium cryptonite data-default dependent-sum-template Diff + elliptic-curve first-class-families fmt galois-field + generic-deriving gitrev hex-text lens megaparsec memory MonadRandom + morley-prelude mtl named optparse-applicative pairing + parser-combinators scientific semigroups show-type singletons + singletons-base some syb template-haskell text text-manipulate + th-lift-instances th-reify-many time timerep type-errors uncaught-exception unordered-containers vector vinyl with-utf8 wl-pprint-text ]; executableHaskellDepends = [ aeson base-noprelude base58-bytestring bytestring fmt haskeline - hex-text megaparsec MonadRandom morley-prelude named - optparse-applicative singletons text vinyl with-utf8 + hex-text megaparsec MonadRandom morley-prelude optparse-applicative + singletons text vinyl with-utf8 ]; description = "Developer tools for the Michelson Language"; license = lib.licenses.mit; @@ -195466,26 +195169,24 @@ self: { , 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, text, time, universum - , unliftio + , mtl, optparse-applicative, process, random, safe-exceptions + , scientific, servant, servant-client, servant-client-core + , singletons, syb, tasty, tasty-ant-xml, tasty-discover + , tasty-hunit-compat, text, time, unliftio }: mkDerivation { pname = "morley-client"; - version = "0.2.1"; - sha256 = "0a55lmbk1b2h7469hv084a0gyp48w57hjz05wlpc4npm0gp1ijxw"; + version = "0.3.0"; + sha256 = "0wb6pgds6bijs2bfwdwzkpmhlbwfpx5lwxj4xj2pvd47410lzjfz"; 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 text time - universum unliftio + megaparsec memory morley morley-prelude mtl optparse-applicative + process random scientific servant servant-client + servant-client-core singletons syb text time unliftio ]; executableHaskellDepends = [ aeson base-noprelude data-default fmt morley morley-prelude @@ -195593,7 +195294,6 @@ self: { license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "morloc"; - broken = true; }) {}; "morph" = callPackage @@ -195626,8 +195326,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.26.0"; - sha256 = "1x1hg60l7zbdb7kg2gx93zxknd9f7bbdvr6r9hcy8w86h8aplilm"; + version = "0.27.0"; + sha256 = "1d2wk0zw3qb22skv7g4xagl04las5xnh9f4223c4as9cf39pcrp9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers morpheus-graphql-app @@ -195644,7 +195344,6 @@ self: { ]; description = "Morpheus GraphQL"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "morpheus-graphql-app" = callPackage @@ -195656,8 +195355,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-app"; - version = "0.26.0"; - sha256 = "1dq0hnm1bsy43vbrs2rm5df5j9yy55azj420jf8fs71676xni7hn"; + version = "0.27.0"; + sha256 = "0mg12a8s2zcxcbm1zm5a4gn6vz8d9d1qdhk930zddxqbll5gq7nq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec @@ -195672,7 +195371,6 @@ self: { ]; description = "Morpheus GraphQL App"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "morpheus-graphql-cli" = callPackage @@ -195695,6 +195393,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "morpheus"; + broken = true; }) {}; "morpheus-graphql-client" = callPackage @@ -195707,8 +195406,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.26.0"; - sha256 = "0n8x888qhamlb6pkk4sa864mb3y7h261s1f83waqg0d7qdwcp5nx"; + version = "0.27.0"; + sha256 = "120414v0rcvzgm9dc2fx8598d88dqnpvhkc8zh3y2gl3b1bl31jb"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers file-embed modern-uri @@ -195726,7 +195425,6 @@ self: { ]; description = "Morpheus GraphQL Client"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "morpheus-graphql-code-gen" = callPackage @@ -195738,8 +195436,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen"; - version = "0.26.0"; - sha256 = "1mdhifqqj44dr9j2z4nh0m8n4836mv8cav9qn155b3nairfh3w3a"; + version = "0.27.0"; + sha256 = "0aw9fl0hzl657w2arybyk0zqxvbdz897kiqwsv52r50dnb5x2izf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195757,26 +195455,24 @@ self: { ]; description = "Morpheus GraphQL CLI"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "morpheus"; }) {}; "morpheus-graphql-code-gen-utils" = callPackage ({ mkDerivation, base, bytestring, containers - , morpheus-graphql-core, prettyprinter, relude, template-haskell - , text, unordered-containers + , morpheus-graphql-core, mtl, prettyprinter, relude + , template-haskell, text, unordered-containers }: mkDerivation { pname = "morpheus-graphql-code-gen-utils"; - version = "0.26.0"; - sha256 = "0nhv20vn8v73zri9ws3rwyi9xyshp6pm7v610rrwfa43wyxlpq5g"; + version = "0.27.0"; + sha256 = "1d5v3b63v9yf47a5hh2am6v09hwm4sfxls38iwvlxva3km0s1qgn"; libraryHaskellDepends = [ - base bytestring containers morpheus-graphql-core prettyprinter + base bytestring containers morpheus-graphql-core mtl prettyprinter relude template-haskell text unordered-containers ]; description = "Morpheus GraphQL CLI"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "morpheus-graphql-core" = callPackage @@ -195787,8 +195483,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-core"; - version = "0.26.0"; - sha256 = "0cj78h29ryalxnx4hzpl5kywqdcvjxvxqlc6axibb1cmajn4kbqm"; + version = "0.27.0"; + sha256 = "0001pq7zj5rpjcg0jasd3vklisan2i8nxyk8d7xa31d4f1grn5ff"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec mtl relude @@ -195803,8 +195499,6 @@ self: { ]; description = "Morpheus GraphQL Core"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "morpheus-graphql-server" = callPackage @@ -195816,8 +195510,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-server"; - version = "0.26.0"; - sha256 = "1aca18d60ja6awgsvwjjbikqhvspn3wans1dvh57g37ma1p1v331"; + version = "0.27.0"; + sha256 = "0cd6qczbb5cm12xv181pzq6d62nv7nf4w1yd3gmhzjfrks62lhwy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers morpheus-graphql-app @@ -195832,7 +195526,6 @@ self: { ]; description = "Morpheus GraphQL"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "morpheus-graphql-subscriptions" = callPackage @@ -195842,8 +195535,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-subscriptions"; - version = "0.26.0"; - sha256 = "1kmd37w3kp2mdhz64fwlyl9v7p10x3p6fbzw535kipic89y9pcx2"; + version = "0.27.0"; + sha256 = "138fcganlaj4fyq1aygiyy6f4hhw58n26ldrdkxhd66hr1mqv6j9"; libraryHaskellDepends = [ aeson base bytestring morpheus-graphql-app morpheus-graphql-core mtl relude text transformers unliftio-core unordered-containers @@ -195851,7 +195544,6 @@ self: { ]; description = "Morpheus GraphQL Subscriptions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "morpheus-graphql-tests" = callPackage @@ -195860,8 +195552,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-tests"; - version = "0.18.0"; - sha256 = "0l89mmsl09ph412l8f9xjlyx8yp5g69ffmajynxcqvj501n21s9z"; + version = "0.27.0"; + sha256 = "1h6nri73s5ibzidhwrkxffldardx6khq9kvhmqklm06cilwr56xi"; libraryHaskellDepends = [ aeson base bytestring directory relude tasty tasty-hunit text unordered-containers @@ -195870,23 +195562,6 @@ self: { license = lib.licenses.mit; }) {}; - "morpheus-graphql-tests_0_26_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty - , tasty-hunit, text, unordered-containers - }: - mkDerivation { - pname = "morpheus-graphql-tests"; - version = "0.26.0"; - sha256 = "0dyza53pp9s16y8mlpm63b9ds396lqf8wsj2qaymyy18iakcfb9m"; - libraryHaskellDepends = [ - aeson base bytestring directory relude tasty tasty-hunit text - unordered-containers - ]; - description = "Morpheus GraphQL Test"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "morphisms" = callPackage ({ mkDerivation }: mkDerivation { @@ -196005,6 +195680,7 @@ self: { license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; mainProgram = "mortred"; + broken = true; }) {}; "mosaico-lib" = callPackage @@ -196024,7 +195700,6 @@ self: { description = "Generación interactiva de mosaicos"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mosquitto-hs" = callPackage @@ -196114,9 +195789,7 @@ self: { testHaskellDepends = [ base indexed indexed-extras row-types ]; description = "Type-safe effectful state machines in Haskell"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; mainProgram = "example-door"; - broken = true; }) {}; "motor-diagrams" = callPackage @@ -196155,6 +195828,7 @@ self: { description = "Reflect on Motor FSM typeclasses to obtain runtime representations"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mount" = callPackage @@ -196288,8 +195962,6 @@ self: { libraryHaskellDepends = [ base ghc-prim primitive ]; description = "Efficient effect handlers based on evidence-passing semantics"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mpg123-bindings" = callPackage @@ -196404,8 +196076,8 @@ self: { ({ mkDerivation, base, containers, extra, numeric-prelude, text }: mkDerivation { pname = "mpolynomials"; - version = "0.1.0.0"; - sha256 = "0p2x8hr5yydqnm5znh7ghfyis5s4vapk10q8qs76il7vb68np352"; + version = "0.1.1.0"; + sha256 = "05nqmxh1i7q89iswl47c20z0gzqg4kznnmp8h6qyrj316l14xnlc"; libraryHaskellDepends = [ base containers extra numeric-prelude text ]; @@ -196697,8 +196369,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "A simple way to read environment variables in Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mrifk" = callPackage @@ -196834,6 +196504,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "A Haskell implementation of MessagePack"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "msgpack-binary" = callPackage @@ -196863,7 +196534,6 @@ self: { description = "A Haskell implementation of MessagePack"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "msgpack-idl" = callPackage @@ -196915,7 +196585,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "msgpack-parser"; - broken = true; }) {}; "msgpack-rpc" = callPackage @@ -196977,6 +196646,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "A Haskell implementation of MessagePack"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "msgpack-types" = callPackage @@ -197001,6 +196671,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "A Haskell implementation of MessagePack"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "msh" = callPackage @@ -197034,7 +196706,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "msi-kb-backlit"; - broken = true; }) {}; "mssql-simple" = callPackage @@ -197055,6 +196726,8 @@ self: { ]; description = "SQL Server client library implemented in Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mstate" = callPackage @@ -197123,6 +196796,8 @@ self: { pname = "mtl"; version = "2.3.1"; sha256 = "19ywdksxkv4gfbf05xgpjbnnxd81mgxjnyl2h2vlqapyc35z2y11"; + revision = "1"; + editedCabalFile = "0vby474291gzarkv5y6aqb520g3k5nr6fpfim0qyzqhmfdnnjxsk"; libraryHaskellDepends = [ base transformers ]; description = "Monad classes for transformers, using functional dependencies"; license = lib.licenses.bsd3; @@ -197338,8 +197013,8 @@ self: { }: mkDerivation { pname = "mu-graphql"; - version = "0.5.0.3"; - sha256 = "1ahi51sslxlmv4yi6518bn3i4ks7hpc8327r6lz0l6d4q192k1nq"; + version = "0.5.0.4"; + sha256 = "0xazfpl6xy6j67a4mjgp09akyvlfi2r26b193d8p9rra1hn09334"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -197485,6 +197160,8 @@ self: { pname = "mu-persistent"; version = "0.3.1.0"; sha256 = "0xhqp2ljgh9vjga1crqvb2gk3al3v0mw26aivd1pyi6rq9ncwcca"; + revision = "1"; + editedCabalFile = "15yhvp3snhj8b8lba5p14lgka8vsfm61pdn9m9ks661yy18f17zi"; libraryHaskellDepends = [ base monad-logger mu-schema persistent resource-pool resourcet transformers @@ -197691,8 +197368,6 @@ self: { ]; description = "A simple document-oriented database"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mueval" = callPackage @@ -197901,6 +197576,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "multicurryable" = callPackage + ({ mkDerivation, base, doctest, sop-core }: + mkDerivation { + pname = "multicurryable"; + version = "0.1.0.1"; + sha256 = "1d75pksld6cd9p39avjq54qcb0lhjgm8b78hl1521df17c1yi5y6"; + libraryHaskellDepends = [ base sop-core ]; + testHaskellDepends = [ base doctest sop-core ]; + description = "Uncurry functions with multiple arguments"; + license = lib.licenses.bsd3; + }) {}; + "multifile" = callPackage ({ mkDerivation, base, directory, HaXml, optparse-applicative , pretty, process, transformers @@ -198085,6 +197772,8 @@ self: { pname = "multipart"; version = "0.2.1"; sha256 = "0p6n4knxpjv70nbl6cmd6x7gkdjsjqp4ya7fz00bfrqp7jvhlivn"; + revision = "1"; + editedCabalFile = "03gaapwnvn843hpm5qwdci9df1wf383msd42p8w9ghilpfjj4qy9"; libraryHaskellDepends = [ base bytestring parsec stringsearch ]; description = "Parsers for the HTTP multipart format"; license = lib.licenses.bsd3; @@ -198201,6 +197890,8 @@ self: { ]; description = "Generalized system for reading and writing to distributed systems that have primary/replica topologies"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "multipool-persistent" = callPackage @@ -198221,6 +197912,7 @@ self: { ]; description = "Read and write from appropriate persistent sql instances in replicated environments"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "multipool-persistent-postgresql" = callPackage @@ -198246,7 +197938,6 @@ self: { description = "Read and write appropriately from both master and replicated postgresql instances"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "multipool-postgresql-simple" = callPackage @@ -198267,6 +197958,7 @@ self: { unliftio-core unordered-containers ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "multiprocess" = callPackage @@ -198412,7 +198104,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "example"; - broken = true; }) {}; "multivector" = callPackage @@ -198500,6 +198191,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "mur"; + broken = true; }) {}; "murmur-hash" = callPackage @@ -199013,6 +198705,8 @@ self: { ]; description = "Automatic piecewise-mutable references for your types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mutable-containers" = callPackage @@ -199066,8 +198760,6 @@ self: { benchmarkHaskellDepends = [ base extra primitive ]; description = "Interoperate mutable references with regular lens"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "mute-unmute" = callPackage @@ -199467,6 +199159,7 @@ self: { ]; description = "Binding to mybitcoin.com's Shopping Cart Interface."; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; }) {}; "myo" = callPackage @@ -199723,7 +199416,6 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "mywatch"; - broken = true; }) {}; "mywork" = callPackage @@ -199749,6 +199441,7 @@ self: { license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; mainProgram = "mywork"; + broken = true; }) {}; "myxine-client" = callPackage @@ -200157,6 +199850,28 @@ self: { broken = true; }) {}; + "named-text" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, hashable, hspec + , parameterized-utils, prettyprinter, sayable, tasty, tasty-ant-xml + , tasty-checklist, tasty-hspec, text, unordered-containers + }: + mkDerivation { + pname = "named-text"; + version = "1.1.1.0"; + sha256 = "1g3xb3pr6sxn3sk9h2jbqlj30vh4nxcc14d06dawmqfva8b1gfp5"; + libraryHaskellDepends = [ + aeson base deepseq hashable prettyprinter sayable text + ]; + testHaskellDepends = [ + aeson base bytestring hspec parameterized-utils prettyprinter + sayable tasty tasty-ant-xml tasty-checklist tasty-hspec text + unordered-containers + ]; + description = "A parameterized named text type and associated functionality"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + }) {}; + "namelist" = callPackage ({ mkDerivation, base, case-insensitive, data-default-class, parsec , QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -200227,6 +199942,8 @@ self: { ]; description = "A threadsafe binding to glibc's crypt_r function"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) libxcrypt;}; "nano-erl" = callPackage @@ -201039,6 +200756,7 @@ self: { license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; mainProgram = "neko-obfs"; + broken = true; }) {}; "nemesis" = callPackage @@ -201307,8 +201025,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.8.2.4"; - sha256 = "03w0086kn9zgsry8gm1ij7n5m3fqq7xfas4ma1fviqsx7w8wdc3r"; + version = "0.8.2.5"; + sha256 = "0k6yghgj693hbyk2zsjh3ns1yx9ypjjfj3mrrandn6lvpif08h9x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201549,7 +201267,6 @@ self: { description = "The NetCore compiler and runtime system for OpenFlow networks"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "netease-fm" = callPackage @@ -201607,6 +201324,7 @@ self: { ]; description = "Helper modules for comfort-array wrappers to BLAS and LAPACK"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "netlib-ffi" = callPackage @@ -201848,7 +201566,6 @@ self: { description = "OpenFlow protocol messages, binary formats, and servers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "netwire" = callPackage @@ -202313,9 +202030,7 @@ self: { ]; description = "Domain Name System data structures"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hs-network-dns-examples-resolver"; - broken = true; }) {}; "network-enumerator" = callPackage @@ -202436,7 +202151,9 @@ self: { doHaddock = false; description = "network-manager tui"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "nmt"; + broken = true; }) {}; "network-messagepack-rpc" = callPackage @@ -202473,6 +202190,8 @@ self: { ]; description = "WebSocket backend for MessagePack RPC"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "network-metrics" = callPackage @@ -202830,23 +202549,6 @@ self: { }) {}; "network-transport" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, hashable - , transformers - }: - mkDerivation { - pname = "network-transport"; - version = "0.5.4"; - sha256 = "0izcqi3zl7ynav0qqrrfmiax8vziqwrhflprddhjj6x6nkzhp1sv"; - revision = "1"; - editedCabalFile = "03parnmzh2mffs6fadqbf4lw1d5bsmvr347rzamp230s303nr6yc"; - libraryHaskellDepends = [ - base binary bytestring deepseq hashable transformers - ]; - description = "Network abstraction layer"; - license = lib.licenses.bsd3; - }) {}; - - "network-transport_0_5_6" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, hashable , transformers }: @@ -202859,7 +202561,6 @@ self: { ]; description = "Network abstraction layer"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "network-transport-amqp" = callPackage @@ -203004,8 +202705,8 @@ self: { }: mkDerivation { pname = "network-uri"; - version = "2.6.4.1"; - sha256 = "111m485rx2kyqdymi1x6sl08hi6lp34q3f41yqcx99086swnv1ap"; + version = "2.6.4.2"; + sha256 = "0a3jg6aykwm1yw32nh137hi6r86w2640xwl1p18352bf29rqj64w"; libraryHaskellDepends = [ base deepseq parsec template-haskell th-compat ]; @@ -203104,22 +202805,6 @@ self: { }) {}; "network-wait" = callPackage - ({ mkDerivation, base, exceptions, network, network-simple, retry - , tasty, tasty-hunit - }: - mkDerivation { - pname = "network-wait"; - version = "0.1.2.0"; - sha256 = "1fgcp2didz7zp4jpkc9zap94sbd6ny8nyrx6nwnfai2ssw5rxpfq"; - libraryHaskellDepends = [ base exceptions network retry ]; - testHaskellDepends = [ - base exceptions network network-simple retry tasty tasty-hunit - ]; - description = "Lightweight library for waiting on networked services to become available"; - license = lib.licenses.mit; - }) {}; - - "network-wait_0_2_0_0" = callPackage ({ mkDerivation, base, exceptions, network, network-simple, retry , tasty, tasty-hunit }: @@ -203133,7 +202818,6 @@ self: { ]; description = "Lightweight library for waiting on networked services to become available"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "network-websocket" = callPackage @@ -203308,8 +202992,8 @@ self: { doHaddock = false; description = "Future-proof system for plain-text notes"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "neuron"; - maintainers = [ lib.maintainers.maralorn ]; }) {}; "newbase60" = callPackage @@ -203650,6 +203334,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "ngrams-loader"; + broken = true; }) {}; "ngx-export" = callPackage @@ -203706,8 +203391,8 @@ self: { }: mkDerivation { pname = "ngx-export-log"; - version = "1.5.1"; - sha256 = "03wr3v7x26c0cm01rclc5fkj2a66pamcjikx8wgariljdzfzr7qs"; + version = "1.5.2"; + sha256 = "0l77znlaps924a7nqzkhc4w971y4q9lm3mr0m6xa3n7bdbmgy99i"; libraryHaskellDepends = [ base bytestring ngx-export ngx-export-tools template-haskell ]; @@ -203957,6 +203642,8 @@ self: { libraryHaskellDepends = [ base bytestring http-conduit xml ]; description = "Haskell interface to the nist random beacon"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "nitro" = callPackage @@ -204077,22 +203764,29 @@ self: { }) {}; "nix-diff" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , directory, filepath, mtl, nix-derivation, optparse-applicative - , patience, process, text, unix, vector + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , directory, filepath, generic-arbitrary, mtl, nix-derivation + , optparse-applicative, patience, process, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, tasty-silver, text + , typed-process, uniplate, unix, vector }: mkDerivation { pname = "nix-diff"; - version = "1.0.18"; - sha256 = "0pqz207zywcs38w8yaq5qgbsps7vx0zf2wykaxq9zs43d74ygh64"; - revision = "1"; - editedCabalFile = "12fb817s9dq2hf8v63c1b92zpxkil633swzf41739q1vlwqg39xh"; - isLibrary = false; + version = "1.0.19"; + sha256 = "0iscad4ydgg1365k64bzxn15pl4jnsv17jbzda4s0fs9ff4c5ias"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers directory filepath + generic-arbitrary mtl nix-derivation optparse-applicative patience + process QuickCheck quickcheck-instances text uniplate vector + ]; executableHaskellDepends = [ - attoparsec base bytestring containers directory filepath mtl - nix-derivation optparse-applicative patience process text unix - vector + aeson base bytestring containers mtl optparse-applicative text unix + ]; + testHaskellDepends = [ + aeson base bytestring containers mtl tasty tasty-quickcheck + tasty-silver text typed-process ]; description = "Explain why two Nix derivations differ"; license = lib.licenses.bsd3; @@ -204300,26 +203994,25 @@ self: { "nix-tree" = callPackage ({ mkDerivation, aeson, async, base, brick, bytestring, clock - , containers, deepseq, directory, filepath, hashable, hedgehog - , hrfsize, optparse-applicative, relude, terminal-progress-bar - , text, transformers, typed-process, unordered-containers, vty + , containers, directory, filepath, hedgehog, hrfsize, microlens + , optparse-applicative, relude, terminal-progress-bar, text + , typed-process, unordered-containers, vty }: mkDerivation { pname = "nix-tree"; - version = "0.2.1"; - sha256 = "1ca4a6mmbb8kvja3ipiifj7kfxayq9ik3ip10m6nkf99a56060jw"; + version = "0.3.1"; + sha256 = "13prwlkiy6cjp49clx3fw3rbhp7p1p6cx9lya06d58rqys782qkr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson async base brick bytestring clock containers deepseq - directory filepath hashable hrfsize optparse-applicative relude - terminal-progress-bar text transformers typed-process - unordered-containers vty + aeson async base brick bytestring clock containers directory + filepath hrfsize microlens optparse-applicative relude + terminal-progress-bar text typed-process unordered-containers vty ]; testHaskellDepends = [ - aeson base brick bytestring clock containers deepseq directory - filepath hashable hedgehog hrfsize optparse-applicative relude text - transformers typed-process unordered-containers vty + aeson base brick bytestring clock containers directory filepath + hedgehog hrfsize microlens optparse-applicative relude text + typed-process unordered-containers vty ]; description = "Interactively browse a Nix store paths dependencies"; license = lib.licenses.bsd3; @@ -204345,7 +204038,9 @@ self: { ]; description = "Interactively browse a Nix store paths dependencies"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "nixdu"; + broken = true; }) {}; "nixfmt" = callPackage @@ -204739,6 +204434,8 @@ self: { ]; description = "A static site generator"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "nom" = callPackage @@ -204764,15 +204461,14 @@ self: { description = "Name-binding & alpha-equivalence"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nominal" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "nominal"; - version = "0.2.0.0"; - sha256 = "1wd2vd0qn8ln3a5r29gikdcr4c2c2rf43p6kq3wmqm8ww30djgca"; + version = "0.3.0.0"; + sha256 = "12kryz3z7kds1cca4s414233pd160gkzidf0d1b89zj926zhd766"; libraryHaskellDepends = [ base containers ]; description = "Binders and alpha-equivalence made easy"; license = lib.licenses.gpl3Only; @@ -205018,18 +204714,6 @@ self: { }) {}; "nondeterminism" = callPackage - ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }: - mkDerivation { - pname = "nondeterminism"; - version = "1.4"; - sha256 = "1ibxnkbr1lqjpr00cmw1p94cypcplxr0yr6q3aspl0vp08xwjdrh"; - libraryHaskellDepends = [ base containers mtl ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - description = "A monad and monad transformer for nondeterministic computations"; - license = "LGPL"; - }) {}; - - "nondeterminism_1_5" = callPackage ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }: mkDerivation { pname = "nondeterminism"; @@ -205039,7 +204723,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "A monad and monad transformer for nondeterministic computations"; license = "LGPL"; - hydraPlatforms = lib.platforms.none; }) {}; "nonempty-alternative" = callPackage @@ -205359,6 +205042,7 @@ self: { ]; description = "Painless 3D graphics, no affiliation with gloss"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "not-gloss-examples" = callPackage @@ -205377,7 +205061,6 @@ self: { description = "examples for not-gloss"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "not-in-base" = callPackage @@ -205503,6 +205186,7 @@ self: { license = "LGPL"; hydraPlatforms = lib.platforms.none; mainProgram = "notmuch-test"; + broken = true; }) {inherit (pkgs) notmuch;}; "notmuch-web" = callPackage @@ -205701,23 +205385,23 @@ self: { }) {}; "nri-http" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, http-client - , http-client-tls, http-types, mime-types, network-uri + ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit + , http-client, http-client-tls, http-types, mime-types, network-uri , nri-observability, nri-prelude, safe-exceptions, text, wai, warp }: mkDerivation { pname = "nri-http"; - version = "0.1.0.4"; - sha256 = "1zf55k4c4zlx2229xxs2hfl7y5c0fb3ab7vrms08imfp0hblj91x"; + version = "0.3.0.0"; + sha256 = "1b3zaw96np1x87839fi47shzb79v6rs6hvr116fjb7kvayrz7xpn"; libraryHaskellDepends = [ - aeson base bytestring conduit http-client http-client-tls - http-types mime-types network-uri nri-observability nri-prelude - safe-exceptions text + aeson base bytestring case-insensitive conduit http-client + http-client-tls http-types mime-types network-uri nri-observability + nri-prelude safe-exceptions text ]; testHaskellDepends = [ - aeson base bytestring conduit http-client http-client-tls - http-types mime-types network-uri nri-observability nri-prelude - safe-exceptions text wai warp + aeson base bytestring case-insensitive conduit http-client + http-client-tls http-types mime-types network-uri nri-observability + nri-prelude safe-exceptions text wai warp ]; description = "Make Elm style HTTP requests"; license = lib.licenses.bsd3; @@ -206135,8 +205819,6 @@ self: { libraryHaskellDepends = [ base call-stack semigroups ]; description = "A sequence of semigroups, for composing stuff in multiple spatial directions"; license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "numbering" = callPackage @@ -206207,7 +205889,6 @@ self: { description = "Convert numbers to number words"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "numeric-domains" = callPackage @@ -206303,7 +205984,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "Kepler"; - broken = true; }) {}; "numeric-prelude" = callPackage @@ -206588,6 +206268,8 @@ self: { libraryHaskellDepends = [ base ]; description = "Type-level (low cardinality) integers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "numtype-dk" = callPackage @@ -206610,6 +206292,8 @@ self: { libraryHaskellDepends = [ base ]; description = "Type-level (low cardinality) integers, implemented using type families"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "nurbs" = callPackage @@ -206662,8 +206346,8 @@ self: { }: mkDerivation { pname = "nvfetcher"; - version = "0.5.0.0"; - sha256 = "0kglvniiqa3plxn973sl7dww75lxar5sf8ipjmgjryv9b0wxbv30"; + version = "0.6.0.0"; + sha256 = "0hhfnz5q076z92g1m4yx7y5qsxfimngkqx9r0781hkrcdmi1g2x8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206705,8 +206389,8 @@ self: { }: mkDerivation { pname = "nvim-hs"; - version = "2.2.0.3"; - sha256 = "0sbppnphnbygxjns373hyb3hvbwzlv4sq104682bcajd07x6vhmw"; + version = "2.3.2.0"; + sha256 = "1szvh65sbxk81321ml0b1iib5ziiks2l8liwkgs4z47pmb14cps9"; libraryHaskellDepends = [ base bytestring cereal cereal-conduit conduit containers data-default deepseq foreign-store hslogger megaparsec messagepack @@ -206731,46 +206415,6 @@ self: { license = lib.licenses.asl20; }) {}; - "nvim-hs_2_3_0_0" = callPackage - ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit - , containers, data-default, deepseq, foreign-store, hslogger, hspec - , hspec-discover, HUnit, megaparsec, messagepack, mtl, network - , optparse-applicative, path, path-io, prettyprinter - , prettyprinter-ansi-terminal, QuickCheck, resourcet, stm - , streaming-commons, template-haskell - , template-haskell-compat-v0208, text, time, time-locale-compat - , transformers, transformers-base, typed-process, unliftio - , unliftio-core, utf8-string, vector, void - }: - mkDerivation { - pname = "nvim-hs"; - version = "2.3.0.0"; - sha256 = "0jc0wzxfkah115j0y4pa4hvr4wziba4q319x5ddgb9jbc52rqh7r"; - libraryHaskellDepends = [ - base bytestring cereal cereal-conduit conduit containers - data-default deepseq foreign-store hslogger megaparsec messagepack - mtl network optparse-applicative path path-io prettyprinter - prettyprinter-ansi-terminal resourcet stm streaming-commons - template-haskell template-haskell-compat-v0208 text time - time-locale-compat transformers transformers-base typed-process - unliftio unliftio-core utf8-string vector void - ]; - testHaskellDepends = [ - base bytestring cereal cereal-conduit conduit containers - data-default foreign-store hslogger hspec hspec-discover HUnit - megaparsec messagepack mtl network optparse-applicative path - path-io prettyprinter prettyprinter-ansi-terminal QuickCheck - resourcet stm streaming-commons template-haskell - template-haskell-compat-v0208 text time time-locale-compat - transformers transformers-base typed-process unliftio unliftio-core - utf8-string vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell plugin backend for neovim"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - }) {}; - "nvim-hs-contrib" = callPackage ({ mkDerivation, base, bytestring, data-default, directory , filepath, hspec, hspec-discover, messagepack, mtl, nvim-hs @@ -206801,8 +206445,8 @@ self: { }: mkDerivation { pname = "nvim-hs-ghcid"; - version = "2.0.0.0"; - sha256 = "0i9wc6mgxxzymw1smjvin70i4ynqsn2k3ig36pxmbb6qd0ci0hwg"; + version = "2.0.1.0"; + sha256 = "0vx1hj5x6xzxy305qm7ax74b85440hl7wbr39501xz1yanvz5i1i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206980,29 +206624,6 @@ self: { }) {}; "o-clock" = callPackage - ({ 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.1"; - sha256 = "0rq9bn9lxsmgjw6w55r3c15y1pjq36vi246qldr53csr0pa9ggfy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base doctest Glob hedgehog hspec-expectations markdown-unlit tasty - tasty-hedgehog tasty-hunit-compat type-spec - ]; - testToolDepends = [ doctest markdown-unlit ]; - description = "Type-safe time library"; - license = lib.licenses.mpl20; - mainProgram = "play-o-clock"; - }) {}; - - "o-clock_1_3_0" = callPackage ({ mkDerivation, base, doctest, Glob, hedgehog, hspec-expectations , markdown-unlit, tasty, tasty-hedgehog, tasty-hunit-compat , type-spec @@ -207024,7 +206645,6 @@ self: { testToolDepends = [ doctest markdown-unlit ]; description = "Type-safe time library"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; mainProgram = "play-o-clock"; }) {}; @@ -207051,6 +206671,7 @@ self: { description = "Client to the OANDA REST API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "oasis-xrd" = callPackage @@ -207083,8 +206704,8 @@ self: { }: mkDerivation { pname = "oath"; - version = "0.0"; - sha256 = "1vrspqs9inhdwavz39z0fy05kjpbklz07qm4irx6h9w1552xwb77"; + version = "0.1.1"; + sha256 = "0n9zj2ygmjnkpi9viy97fz3qsyg2gryx0kkv5rvdh8bkimspvhm4"; libraryHaskellDepends = [ base stm stm-delay ]; testHaskellDepends = [ async base futures promise streamly unsafe-promises @@ -207138,7 +206759,6 @@ self: { description = "OAuth2 jwt-bearer client flow as per rfc7523"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "oauthenticated" = callPackage @@ -207191,6 +206811,7 @@ self: { description = "Communicate to OBD interfaces over ELM327"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "obdd" = callPackage @@ -207692,6 +207313,180 @@ self: { license = lib.licenses.bsd3; }) {}; + "ogma-cli" = callPackage + ({ mkDerivation, base, HUnit, ogma-core, optparse-applicative + , process, test-framework, test-framework-hunit, unix + }: + mkDerivation { + pname = "ogma-cli"; + version = "1.0.6"; + sha256 = "1ldjswdyxckxrmypmx027aw90b93r41izqw4qj1szp6p1mjbx3pn"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ogma-core optparse-applicative ]; + testHaskellDepends = [ + base HUnit process test-framework test-framework-hunit unix + ]; + description = "Ogma: Helper tool to interoperate between Copilot and other languages"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + mainProgram = "ogma"; + }) {}; + + "ogma-core" = callPackage + ({ mkDerivation, aeson, base, filepath, HUnit, IfElse, ogma-extra + , ogma-language-c, ogma-language-cocospec, ogma-language-copilot + , ogma-language-fret-cs, ogma-language-fret-reqs, ogma-language-smv + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "ogma-core"; + version = "1.0.6"; + sha256 = "09svwdsn16hfa7rxf4lbpj4i08ay5rrxk6dlmic0gk7yc24mx47c"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base filepath IfElse ogma-extra ogma-language-c + ogma-language-cocospec ogma-language-copilot ogma-language-fret-cs + ogma-language-fret-reqs ogma-language-smv + ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + description = "Ogma: Helper tool to interoperate between Copilot and other languages"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "ogma-extra" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "ogma-extra"; + version = "1.0.6"; + sha256 = "1wk4374k09wwxhb9ki5pcl6igw6d83bxffrdv7qf8xgm051vna2y"; + libraryHaskellDepends = [ + base bytestring Cabal directory filepath + ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "Ogma: Helper tool to interoperate between Copilot and other languages"; + license = "unknown"; + }) {}; + + "ogma-language-c" = callPackage + ({ mkDerivation, array, base, BNFC, Cabal, process, QuickCheck + , test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "ogma-language-c"; + version = "1.0.6"; + sha256 = "1c30gcnrhqd4jg1rsv4s8vi0lvpslc3rn8zwkffrwxhll0qv7dma"; + setupHaskellDepends = [ base BNFC Cabal process ]; + libraryHaskellDepends = [ array base ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "Ogma: Runtime Monitor translator: C Language Frontend"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "ogma-language-cocospec" = callPackage + ({ mkDerivation, array, base, BNFC, Cabal, process, QuickCheck + , test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "ogma-language-cocospec"; + version = "1.0.6"; + sha256 = "0lnqg0mls8j7k1w735ygl1gaqzy9hz0q71sabirdgqf4p446rm21"; + setupHaskellDepends = [ base BNFC Cabal process ]; + libraryHaskellDepends = [ array base ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "Ogma: Runtime Monitor translator: CoCoSpec Language Frontend"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "ogma-language-copilot" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ogma-language-copilot"; + version = "1.0.6"; + sha256 = "0ffbnxbsxl3mcmnys8zhagqwlsxk7da6w2szf9p0sx7032j8j20d"; + libraryHaskellDepends = [ base ]; + description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints"; + license = "unknown"; + }) {}; + + "ogma-language-fret-cs" = callPackage + ({ mkDerivation, aeson, base, ogma-extra, ogma-language-cocospec + , ogma-language-smv, QuickCheck, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "ogma-language-fret-cs"; + version = "1.0.6"; + sha256 = "1jb2xqxnr2wp2fwijlzv3lr8a1vwarbk9sy63881v6ygk7jlyz8f"; + libraryHaskellDepends = [ + aeson base ogma-language-cocospec ogma-language-smv + ]; + testHaskellDepends = [ + aeson base ogma-extra QuickCheck test-framework + test-framework-quickcheck2 + ]; + description = "Ogma: Runtime Monitor translator: FRET Component Specification Frontend"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "ogma-language-fret-reqs" = callPackage + ({ mkDerivation, aeson, base, ogma-extra, ogma-language-cocospec + , ogma-language-smv, QuickCheck, test-framework + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "ogma-language-fret-reqs"; + version = "1.0.6"; + sha256 = "0dlscsf9i877qjijb5ygw32igyi42s02wj7ggav4h1dy36dm0bf7"; + libraryHaskellDepends = [ + aeson base ogma-language-cocospec ogma-language-smv text + ]; + testHaskellDepends = [ + aeson base ogma-extra QuickCheck test-framework + test-framework-quickcheck2 + ]; + description = "Ogma: Runtime Monitor translator: FRET Component Requirement DB Frontend"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "ogma-language-smv" = callPackage + ({ mkDerivation, array, base, BNFC, Cabal, process, QuickCheck + , test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "ogma-language-smv"; + version = "1.0.6"; + sha256 = "1cyjymfil3zyji8lj607r900icj8789nq1zx0civm29mz6ryrj8a"; + setupHaskellDepends = [ base BNFC Cabal process ]; + libraryHaskellDepends = [ array base ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "Ogma: Runtime Monitor translator: SMV Language Frontend"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ogmarkup" = callPackage ({ mkDerivation, base, hspec, hspec-megaparsec, megaparsec, mtl , shakespeare, text @@ -207733,6 +207528,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "cmdoh"; + broken = true; }) {}; "oi" = callPackage @@ -207760,8 +207556,8 @@ self: { }: mkDerivation { pname = "oidc-client"; - version = "0.7.0.0"; - sha256 = "0cc1psif3s6qmina5sx49clvpg54b6sapcvq4ax3r0afsp4hdl3m"; + version = "0.7.0.1"; + sha256 = "161dcwnnis9ddxr76fl107dfif1jw6gpbd1ckhh4rclq63vh9inb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207813,6 +207609,8 @@ self: { ]; description = "A microframework based on monadic parsing"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "old-locale" = callPackage @@ -207964,7 +207762,6 @@ self: { description = "Concurrency utilities"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "om-http" = callPackage @@ -207985,7 +207782,6 @@ self: { description = "Http utilities"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "om-http-logging" = callPackage @@ -208073,6 +207869,24 @@ self: { ]; description = "Opinionated logging utilities"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "om-plugin-imports" = callPackage + ({ mkDerivation, base, containers, ghc }: + mkDerivation { + pname = "om-plugin-imports"; + version = "0.1.0.2"; + sha256 = "0r2pn8fcqisjzxv415vj8ldvxz17kv7hqz9z6h4rjg21h6ckqkva"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers ghc ]; + executableHaskellDepends = [ base containers ghc ]; + description = "Plugin-based import warnings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "om-import-warnings-test"; + broken = true; }) {}; "om-show" = callPackage @@ -208084,6 +207898,8 @@ self: { libraryHaskellDepends = [ aeson base text ]; description = "Utilities for showing string-like things"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "om-socket" = callPackage @@ -208108,6 +207924,7 @@ self: { ]; description = "Socket utilities"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "om-time" = callPackage @@ -208121,6 +207938,8 @@ self: { ]; description = "Misc. time utilites"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "omaketex" = callPackage @@ -208312,8 +208131,8 @@ self: { ({ mkDerivation, aeson, base, text }: mkDerivation { pname = "one-line-aeson-text"; - version = "0.1.0.4"; - sha256 = "0hhdnpc4fs6xz709vlww990i5f98p73n8niq09y6hv1vzgsh5gr1"; + version = "0.1.0.5"; + sha256 = "10ngmv4xbz5w4fpgprrii6n74syia824sysja7ajyv27v6zfbihf"; libraryHaskellDepends = [ aeson base text ]; testHaskellDepends = [ aeson base text ]; description = "Pretty-printing short Aeson values as text"; @@ -208321,25 +208140,6 @@ self: { }) {}; "one-liner" = callPackage - ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit - , linear-base, profunctors, tagged, transformers - }: - mkDerivation { - pname = "one-liner"; - version = "2.0"; - sha256 = "0al9wavxx23xbalqw0cdlhq01kx8kyhg33fipwmn5617z3ddir6v"; - revision = "1"; - editedCabalFile = "19iwyb3jx7bwybmmmamyzf4lxiwik7wdl8k1crikzmxn016pnybz"; - libraryHaskellDepends = [ - base bifunctors contravariant ghc-prim linear-base profunctors - tagged transformers - ]; - testHaskellDepends = [ base contravariant HUnit ]; - description = "Constraint-based generics"; - license = lib.licenses.bsd3; - }) {}; - - "one-liner_2_1" = callPackage ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit , linear-base, profunctors, tagged, transformers }: @@ -208354,7 +208154,6 @@ self: { testHaskellDepends = [ base contravariant HUnit ]; description = "Constraint-based generics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "one-liner-instances" = callPackage @@ -208501,6 +208300,27 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "oops" = callPackage + ({ mkDerivation, base, base-compat, doctest, doctest-discover, Glob + , hedgehog, hedgehog-quickcheck, hspec, hspec-discover + , hw-hspec-hedgehog, lens, mtl, QuickCheck, template-haskell + , transformers + }: + mkDerivation { + pname = "oops"; + version = "0.1.5.0"; + sha256 = "0yb10jv01mx2czz8sb9qxr0b34wfhvvrai52c26s6q4gwybi77jb"; + libraryHaskellDepends = [ base mtl QuickCheck transformers ]; + testHaskellDepends = [ + base base-compat doctest doctest-discover Glob hedgehog + hedgehog-quickcheck hspec hw-hspec-hedgehog lens QuickCheck + template-haskell + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "Combinators for handling errors of many types in a composable way"; + license = lib.licenses.mit; + }) {}; + "op" = callPackage ({ mkDerivation, base, containers, doctest }: mkDerivation { @@ -208516,35 +208336,6 @@ self: { }) {}; "opaleye" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, contravariant, dotenv, hspec - , hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, scientific - , semigroups, text, time, time-compat, time-locale-compat - , transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; - version = "0.9.3.2"; - sha256 = "0lkdi2svbv64z4rnsfxbr7ijb3a5rmsx4c6igzql7ajrlwha49rx"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors scientific semigroups text time-compat - time-locale-compat transformers uuid void - ]; - testHaskellDepends = [ - aeson base bytestring containers contravariant dotenv hspec - hspec-discover multiset postgresql-simple product-profunctors - profunctors QuickCheck semigroups text time time-compat - transformers uuid - ]; - testToolDepends = [ hspec-discover ]; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = lib.licenses.bsd3; - }) {}; - - "opaleye_0_9_6_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -208571,7 +208362,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "An SQL-generating DSL targeting PostgreSQL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -208841,7 +208631,6 @@ self: { testHaskellDepends = [ base mtl tasty tasty-hunit witness ]; description = "open witnesses"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "openai-hs" = callPackage @@ -208866,6 +208655,7 @@ self: { description = "Unofficial OpenAI client"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "openai-servant" = callPackage @@ -208882,8 +208672,6 @@ self: { ]; description = "Unofficial OpenAI servant types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "openal-ffi" = callPackage @@ -208953,24 +208741,22 @@ self: { ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries , bytestring, Cabal, cabal-doctest, containers, cookie, doctest , generics-sop, Glob, hashable, hspec, hspec-discover, http-media - , HUnit, insert-ordered-containers, lens, mtl, network, optics-core + , HUnit, insert-ordered-containers, lens, mtl, optics-core , optics-th, QuickCheck, quickcheck-instances, scientific , template-haskell, text, time, transformers, unordered-containers , utf8-string, uuid-types, vector }: mkDerivation { pname = "openapi3"; - version = "3.2.2"; - sha256 = "0d31ilv2ivwswzbpfibqwnld8697vk63wyr6yl80brjx60g4jp9j"; - revision = "2"; - editedCabalFile = "1yc3wlc8j84glav3hzx1l4yq33k05bll252a8yl6ld275jjswn8p"; + version = "3.2.3"; + sha256 = "0svkzafxfmhjakv4h57p5sw59ksbxz1hn1y3fbg6zimwal4mgr6l"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat-batteries bytestring containers cookie generics-sop hashable http-media insert-ordered-containers - lens mtl network optics-core optics-th QuickCheck scientific + lens mtl optics-core optics-th QuickCheck scientific template-haskell text time transformers unordered-containers uuid-types vector ]; @@ -208984,7 +208770,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "OpenAPI 3.0 data model"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "example"; + broken = true; }) {}; "openapi3-code-generator" = callPackage @@ -209026,6 +208814,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "openapi3-code-generator-exe"; + broken = true; }) {}; "opencc" = callPackage @@ -209040,6 +208829,8 @@ self: { 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 @@ -209334,7 +209125,6 @@ self: { description = "Implementation of the OpenPGP message format"; license = "unknown"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "openpgp-Crypto" = callPackage @@ -209518,20 +209308,6 @@ self: { }) {}; "opentelemetry" = callPackage - ({ mkDerivation, base, bytestring, exceptions, ghc-trace-events - , hashable - }: - mkDerivation { - pname = "opentelemetry"; - version = "0.7.0"; - sha256 = "10k9if33ydjc099mgjvgglp6fcmrz0zxpv6khwkhra6lcz35mylv"; - libraryHaskellDepends = [ - base bytestring exceptions ghc-trace-events hashable - ]; - license = lib.licenses.asl20; - }) {}; - - "opentelemetry_0_8_0" = callPackage ({ mkDerivation, base, bytestring, exceptions, ghc-trace-events , hashable }: @@ -209543,46 +209319,9 @@ self: { base bytestring exceptions ghc-trace-events hashable ]; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "opentelemetry-extra" = callPackage - ({ mkDerivation, async, base, binary, bytestring, clock, containers - , directory, exceptions, filepath, generic-arbitrary, ghc-events - , hashable, hashtables, http-client, http-client-tls, http-types - , hvega, jsonifier, opentelemetry, process, QuickCheck - , quickcheck-instances, random, scientific, splitmix, stm, tasty - , tasty-bench, tasty-discover, tasty-hunit, tasty-quickcheck, text - , text-show, typed-process, unordered-containers - }: - mkDerivation { - pname = "opentelemetry-extra"; - version = "0.7.0"; - sha256 = "11lwhm3rpajmch7kjb4qwngram5ka8fbd3c0mxszlf4a9dlqag32"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async base binary bytestring clock containers directory exceptions - filepath ghc-events hashable http-client http-client-tls http-types - jsonifier opentelemetry random scientific splitmix stm text - text-show unordered-containers - ]; - executableHaskellDepends = [ - async base bytestring clock containers directory exceptions - filepath hashtables http-client http-client-tls hvega opentelemetry - process text typed-process - ]; - testHaskellDepends = [ - base bytestring generic-arbitrary ghc-events hashable opentelemetry - QuickCheck quickcheck-instances splitmix tasty tasty-discover - tasty-hunit tasty-quickcheck text text-show unordered-containers - ]; - testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ base opentelemetry tasty-bench ]; - license = lib.licenses.asl20; - }) {}; - - "opentelemetry-extra_0_8_0" = callPackage ({ mkDerivation, async, base, binary, bytestring, clock, containers , directory, exceptions, filepath, generic-arbitrary, ghc-events , hashable, hashtables, http-client, http-client-tls, http-types @@ -209617,6 +209356,7 @@ self: { benchmarkHaskellDepends = [ base opentelemetry tasty-bench ]; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "opentelemetry-http-client" = callPackage @@ -209635,33 +209375,6 @@ self: { }) {}; "opentelemetry-lightstep" = callPackage - ({ mkDerivation, async, base, bytestring, clock, containers - , exceptions, filepath, ghc-events, http-client, http-client-tls - , http-types, network, opentelemetry, opentelemetry-extra - , scientific, splitmix, stm, text, typed-process - , unordered-containers - }: - mkDerivation { - pname = "opentelemetry-lightstep"; - version = "0.7.0"; - sha256 = "1yd6gzhwwmjjh41ipz2kifzpn7hha9nli3war2rqdjvhj349lrw8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async base bytestring exceptions http-client http-client-tls - http-types network opentelemetry opentelemetry-extra scientific stm - text unordered-containers - ]; - executableHaskellDepends = [ - async base bytestring clock containers exceptions filepath - ghc-events http-client http-types opentelemetry opentelemetry-extra - splitmix text typed-process unordered-containers - ]; - license = lib.licenses.asl20; - mainProgram = "eventlog-to-lightstep"; - }) {}; - - "opentelemetry-lightstep_0_8_0" = callPackage ({ mkDerivation, async, base, bytestring, clock, containers , exceptions, filepath, ghc-events, http-client, http-client-tls , http-types, network, opentelemetry, opentelemetry-extra @@ -209690,20 +209403,6 @@ self: { }) {}; "opentelemetry-wai" = callPackage - ({ mkDerivation, base, bytestring, http-types, opentelemetry, text - , wai - }: - mkDerivation { - pname = "opentelemetry-wai"; - version = "0.7.0"; - sha256 = "09mh8kfh49vx2gascwwmzs4s649sm5i90nsifp76kjvg1nvqhd1m"; - libraryHaskellDepends = [ - base bytestring http-types opentelemetry text wai - ]; - license = lib.licenses.asl20; - }) {}; - - "opentelemetry-wai_0_8_0" = callPackage ({ mkDerivation, base, bytestring, http-types, opentelemetry, text , wai }: @@ -209715,7 +209414,6 @@ self: { base bytestring http-types opentelemetry text wai ]; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "opentheory" = callPackage @@ -209951,7 +209649,6 @@ self: { description = "An OpenTok SDK for Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "opentracing" = callPackage @@ -210084,19 +209781,19 @@ self: { }) {}; "openweathermap" = callPackage - ({ mkDerivation, aeson, base, directory, http-api-data, http-client - , optparse-applicative, servant, servant-client - , servant-client-core, time, xdg-basedir + ({ mkDerivation, aeson, base, bytestring, directory, http-api-data + , http-client-tls, optparse-applicative, servant, servant-client + , servant-client-core, text, time, xdg-basedir }: mkDerivation { pname = "openweathermap"; - version = "0.2.0"; - sha256 = "1sd8rflm3zakpgm5va9rwdw9si4cbqyvdmpysw55ly6mzgvfxad1"; + version = "0.3.0"; + sha256 = "0v6gq42jms12nmprcracarj9rbmqgbfx9sr3q87r230fbzjgq4hb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base http-api-data http-client servant servant-client - servant-client-core + aeson base bytestring http-api-data http-client-tls servant + servant-client servant-client-core text ]; executableHaskellDepends = [ base directory optparse-applicative time xdg-basedir @@ -210556,24 +210253,6 @@ self: { }) {}; "optparse-applicative" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck - , transformers, transformers-compat - }: - mkDerivation { - pname = "optparse-applicative"; - version = "0.16.1.0"; - sha256 = "16nnrkmgd28h540f17nb017ziq4gbzgkxpdraqicaczkca1jf1b2"; - revision = "2"; - editedCabalFile = "0ccpk2nb9fvj97z00w8cmlpw4fn94ayndg4ngm2ls4hrdbnj5321"; - 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; - }) {}; - - "optparse-applicative_0_17_0_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck , transformers, transformers-compat }: @@ -210587,7 +210266,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Utilities and combinators for parsing command line options"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "optparse-applicative-cmdline-util" = callPackage @@ -210596,6 +210274,8 @@ self: { pname = "optparse-applicative-cmdline-util"; version = "0.2.0"; sha256 = "13nr0biqhc2sd30xxn7sms4f0wl629bcahp3hmmcgf45nl38vpbh"; + revision = "1"; + editedCabalFile = "0cgqffzjzww6b6w8mqrs3nm46jbhaqhmflwyd9cis1k35yrw6npg"; libraryHaskellDepends = [ attoparsec base optparse-applicative text ]; @@ -210667,6 +210347,28 @@ self: { maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; + "optparse-generic_1_4_9" = callPackage + ({ mkDerivation, base, bytestring, Only, optparse-applicative + , system-filepath, text, time, transformers, transformers-compat + , void + }: + mkDerivation { + pname = "optparse-generic"; + version = "1.4.9"; + sha256 = "1kxrhh4h2jd2i9fi1lr3sx6wij71n1y50crl0r0j6b3c8hj3c05j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Only optparse-applicative system-filepath text time + transformers transformers-compat void + ]; + executableHaskellDepends = [ base ]; + description = "Auto-generate a command-line parser for your datatype"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.Gabriel439 ]; + }) {}; + "optparse-helper" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -210737,6 +210439,8 @@ self: { ]; description = "Command line option parsing library with a twice applicative interface"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "opusfile" = callPackage @@ -210772,9 +210476,7 @@ self: { ]; description = "Types and functions for Kepler orbits"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.expipiplus1 ]; - broken = true; }) {}; "orc" = callPackage @@ -211004,8 +210706,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Convert numbers to words in different languages"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ordrea" = callPackage @@ -211145,6 +210845,7 @@ self: { description = "A collection of Attoparsec combinators for parsing org-mode flavored documents"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "orgstat" = callPackage @@ -211309,37 +211010,6 @@ self: { }) {}; "ormolu" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers - , Diff, directory, dlist, exceptions, filepath, ghc-lib-parser - , gitrev, hspec, hspec-discover, mtl, optparse-applicative, path - , path-io, syb, temporary, text - }: - mkDerivation { - pname = "ormolu"; - version = "0.3.1.0"; - sha256 = "1517z6bi8ifzdmfclmqdiipi6zcnxagymf1sxr43sj2ipkglg2rs"; - revision = "1"; - editedCabalFile = "1ns76yw44hp84lrxdhl23aa2d14jjf4m6fd906672a4b4x3cr64l"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base bytestring Cabal containers Diff directory dlist - exceptions filepath ghc-lib-parser mtl syb text - ]; - executableHaskellDepends = [ - base 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; - mainProgram = "ormolu"; - }) {}; - - "ormolu_0_5_0_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring , Cabal, containers, Diff, directory, dlist, exceptions, filepath , ghc-lib-parser, gitrev, hspec, hspec-discover, hspec-megaparsec @@ -211369,6 +211039,38 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = lib.licenses.bsd3; + mainProgram = "ormolu"; + }) {}; + + "ormolu_0_5_2_0" = callPackage + ({ mkDerivation, ansi-terminal, array, base, binary, bytestring + , Cabal-syntax, containers, Diff, directory, dlist, file-embed + , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover + , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative + , path, path-io, QuickCheck, syb, temporary, text + }: + mkDerivation { + pname = "ormolu"; + version = "0.5.2.0"; + sha256 = "1ai2wza4drirvf9pb7qsf03kii5jiayqs49c19ir93jd0ak9pi96"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base binary bytestring Cabal-syntax containers + Diff directory dlist file-embed filepath ghc-lib-parser megaparsec + MemoTrie mtl syb text + ]; + executableHaskellDepends = [ + base containers filepath ghc-lib-parser gitrev optparse-applicative + text + ]; + testHaskellDepends = [ + base containers directory filepath ghc-lib-parser hspec + hspec-megaparsec path path-io QuickCheck temporary text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "ormolu"; }) {}; @@ -211708,6 +211410,7 @@ self: { ]; description = "External sorting package based on Conduit"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "SortLines"; }) {}; @@ -211732,6 +211435,8 @@ self: { ]; description = "A purely functional E-Graph library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "overhang" = callPackage @@ -211759,6 +211464,7 @@ self: { description = "Finite overloading"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "overloaded" = callPackage @@ -212135,6 +211841,8 @@ self: { ]; description = "PackStream converter for Neo4j BOLT protocol"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "packunused" = callPackage @@ -212554,66 +212262,6 @@ self: { }) {}; "pandoc" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base - , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , case-insensitive, citeproc, commonmark, commonmark-extensions - , commonmark-pandoc, connection, containers, data-default, deepseq - , Diff, directory, doclayout, doctemplates, emojis, exceptions - , file-embed, filepath, Glob, haddock-library, hslua, hslua-aeson - , hslua-marshalling, hslua-module-path, hslua-module-system - , hslua-module-text, hslua-module-version, http-client - , http-client-tls, http-types, ipynb, jira-wiki-markup, JuicyPixels - , lpeg, mtl, network, network-uri, pandoc-lua-marshal, pandoc-types - , parsec, pretty, pretty-show, process, random, safe, scientific - , SHA, skylighting, skylighting-core, split, syb, tagsoup, tasty - , tasty-bench, tasty-golden, tasty-hunit, tasty-lua - , tasty-quickcheck, temporary, texmath, text, text-conversions - , time, unicode-collation, unicode-transforms, unix, xml - , xml-conduit, yaml, zip-archive, zlib - }: - mkDerivation { - pname = "pandoc"; - version = "2.17.1.1"; - sha256 = "1l8spmsyg2c5j16q7a7fd5i6kcvkyipq4jrhrv2k0ca1s4lcb7k4"; - configureFlags = [ "-f-trypandoc" ]; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson aeson-pretty array attoparsec base base64-bytestring binary - blaze-html blaze-markup bytestring case-insensitive citeproc - commonmark commonmark-extensions commonmark-pandoc connection - containers data-default deepseq directory doclayout doctemplates - emojis exceptions file-embed filepath Glob haddock-library hslua - hslua-aeson hslua-marshalling hslua-module-path hslua-module-system - hslua-module-text hslua-module-version http-client http-client-tls - http-types ipynb jira-wiki-markup JuicyPixels lpeg mtl network - network-uri pandoc-lua-marshal pandoc-types parsec pretty - pretty-show process random safe scientific SHA skylighting - skylighting-core split syb tagsoup temporary texmath text - text-conversions time unicode-collation unicode-transforms unix xml - xml-conduit yaml zip-archive zlib - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring containers Diff directory doctemplates exceptions - filepath Glob hslua mtl pandoc-types process tasty tasty-golden - tasty-hunit tasty-lua tasty-quickcheck text time xml zip-archive - ]; - benchmarkHaskellDepends = [ - base bytestring deepseq mtl tasty-bench text - ]; - postInstall = '' - mkdir -p $out/share/man/man1 - mv "man/"*.1 $out/share/man/man1/ - ''; - description = "Conversion between markup formats"; - license = lib.licenses.gpl2Plus; - mainProgram = "pandoc"; - maintainers = [ lib.maintainers.peti ]; - }) {}; - - "pandoc_2_19_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -212671,9 +212319,10 @@ self: { ''; description = "Conversion between markup formats"; license = lib.licenses.gpl2Plus; - hydraPlatforms = lib.platforms.none; mainProgram = "pandoc"; - maintainers = [ lib.maintainers.peti ]; + maintainers = [ + lib.maintainers.maralorn lib.maintainers.sternenseemann + ]; }) {}; "pandoc-citeproc" = callPackage @@ -212740,10 +212389,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.13.0"; - sha256 = "0fn5xrsh1x1rk74vd30yvg4ha9aicqbm7r1w0nrq9fkgcmz1q01x"; - revision = "1"; - editedCabalFile = "09sjf2fm09jcz1mnqlbmbfwb1237j26xcfgfq6b2fpl00gjg83di"; + version = "0.3.14.0"; + sha256 = "1f55xz5r7h6vjjj0dsq5glavn0zjh02imi4mja8qbwn3rvi67l86"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -213091,41 +212738,6 @@ self: { }) {}; "pandoc-plot" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , data-default, directory, filepath, gitrev, hashable, hspec - , hspec-expectations, lifted-async, lifted-base, mtl - , optparse-applicative, pandoc, pandoc-types, shakespeare, tagsoup - , tasty, tasty-hspec, tasty-hunit, template-haskell, text - , typed-process, unix, yaml - }: - mkDerivation { - pname = "pandoc-plot"; - version = "1.4.1"; - sha256 = "1g9757kj50s0fjn7l29ncbp5fb8yhnp5z0sd46gaaprbgqrqfsgh"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hashable lifted-async lifted-base mtl pandoc pandoc-types - shakespeare tagsoup template-haskell text typed-process unix yaml - ]; - executableHaskellDepends = [ - base containers directory filepath gitrev optparse-applicative - pandoc pandoc-types template-haskell text typed-process - ]; - testHaskellDepends = [ - base containers directory filepath hspec hspec-expectations - pandoc-types tasty tasty-hspec tasty-hunit text - ]; - benchmarkHaskellDepends = [ - base criterion pandoc-types template-haskell text - ]; - description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice"; - license = lib.licenses.gpl2Plus; - mainProgram = "pandoc-plot"; - }) {}; - - "pandoc-plot_1_5_5" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , data-default, directory, filepath, gitrev, hashable , hspec-expectations, lifted-async, lifted-base, mtl @@ -213157,7 +212769,6 @@ self: { ]; description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice"; license = lib.licenses.gpl2Plus; - hydraPlatforms = lib.platforms.none; mainProgram = "pandoc-plot"; }) {}; @@ -213210,17 +212821,17 @@ self: { }) {}; "pandoc-stylefrommeta" = callPackage - ({ mkDerivation, base, bytestring, containers, extra, pandoc - , pandoc-types, text + ({ mkDerivation, base, bytestring, containers, pandoc, pandoc-types + , text }: mkDerivation { pname = "pandoc-stylefrommeta"; - version = "0.2.3.0"; - sha256 = "1145flz4jkn5knqkc5cppc1412m6hfzd13124k2kfm8dmw196k31"; + version = "0.2.4.0"; + sha256 = "0j25frcafcr0jvk3dfrmxan2q95920wy6jm0fahwf20f4jbanzfc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring containers extra pandoc pandoc-types text + base bytestring containers pandoc pandoc-types text ]; description = "Pandoc filter to customize links, images and paragraphs"; license = lib.licenses.bsd3; @@ -213297,18 +212908,17 @@ self: { }) {}; "pandoc-vimhl" = callPackage - ({ mkDerivation, base, cond, directory, filepath, pandoc-types - , process, regex-compat, temporary, text + ({ mkDerivation, base, directory, filepath, pandoc-types, process + , safe, temporary, text }: mkDerivation { pname = "pandoc-vimhl"; - version = "0.1.3.0"; - sha256 = "0ppn42jicmx3v0qk6ql0ccx61kk53c75n5wnl3dppgnv1xgmlnq8"; + version = "0.2.0.0"; + sha256 = "1cc809hjsgnlfimyzyac1ikn2jkjva2lljqxdnqw546nhns7ng5a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base cond directory filepath pandoc-types process regex-compat - temporary text + base directory filepath pandoc-types process safe temporary text ]; description = "Pandoc filter for native Vim code highlighting"; license = lib.licenses.bsd3; @@ -213593,7 +213203,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "pantry_0_7_0" = callPackage + "pantry_0_8_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , casa-client, casa-types, conduit, conduit-extra, containers , cryptonite, cryptonite-conduit, digest, exceptions, filelock @@ -213607,8 +213217,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.7.0"; - sha256 = "19jb1gmpypdv4mdn3gp6fwgwhrynx5w7dy666yr4k23zdbkcrz1v"; + version = "0.8.1"; + sha256 = "01vd0k21mjaj59sjj4jpada3gd112vsjaba962xrp9v9zw2wmzh8"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring Cabal casa-client casa-types conduit conduit-extra containers cryptonite cryptonite-conduit @@ -214261,6 +213871,7 @@ self: { libraryHaskellDepends = [ base parallel tree-monad ]; description = "Parallel Tree Search"; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; }) {}; "parameterized" = callPackage @@ -214298,8 +213909,8 @@ self: { }: mkDerivation { pname = "parameterized-utils"; - version = "2.1.5.0"; - sha256 = "1w0r09kqqdwlj13xq5swzci0crmarxz49bc01vyb92xzrsmjkhss"; + version = "2.1.6.0"; + sha256 = "118inzvvr72bfr1pzgxglrpd2fsz0kn9hk791imygl0fv1258rb6"; libraryHaskellDepends = [ base base-orphans constraints containers deepseq ghc-prim hashable hashtables indexed-traversable lens mtl profunctors @@ -214312,6 +213923,8 @@ self: { ]; description = "Classes and data structures for working with data-kind indexed types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "paramtree" = callPackage @@ -214613,6 +214226,8 @@ self: { ]; description = "Parse machine-readable GHC GC stats"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "parse-help" = callPackage @@ -214646,17 +214261,15 @@ self: { testHaskellDepends = [ base process ]; description = "Parse command-line arguments"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "parseargs-example"; - broken = true; }) {}; - "parsec_3_1_15_1" = callPackage + "parsec_3_1_16_1" = callPackage ({ mkDerivation, base, bytestring, mtl, tasty, tasty-hunit, text }: mkDerivation { pname = "parsec"; - version = "3.1.15.1"; - sha256 = "1pcqgxzhzlyaxrkgdixsl0jh7jfcg66kwqqf6va0am8q64ar1r5b"; + version = "3.1.16.1"; + sha256 = "0ihjbmsn9hrryjid0ydh6vryzq2mnzavhdb7hxc8d9kfszjn46d4"; libraryHaskellDepends = [ base bytestring mtl text ]; testHaskellDepends = [ base mtl tasty tasty-hunit ]; description = "Monadic parser combinators"; @@ -214962,8 +214575,8 @@ self: { }: mkDerivation { pname = "parser-unbiased-choice-monad-embedding"; - version = "0.0.0.3"; - sha256 = "0p8w52f5bmf1y9b6zw5sc8dhhbm4lf8ld59j52a50piyyyl9y0xi"; + version = "0.0.0.4"; + sha256 = "1gp44c30xj37kym32j7vkl103ks0arb13xjrsar1zmlzzafa9fhz"; libraryHaskellDepends = [ base containers Earley srcloc ]; testHaskellDepends = [ base doctest lexer-applicative regex-applicative @@ -215162,7 +214775,6 @@ self: { description = "A fast parser combinator library backed by Typed Template Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "parsley-garnish" = callPackage @@ -215197,6 +214809,8 @@ self: { ]; description = "A fast, minimal parser"; license = "(BSD-2-Clause OR Apache-2.0)"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "partage" = callPackage @@ -215247,6 +214861,8 @@ self: { pname = "partial-isomorphisms"; version = "0.2.3.0"; sha256 = "08390b7vj02kbx0s5q3irxljr1p8w4rvm6kf33ivv04cal3r2q39"; + revision = "1"; + editedCabalFile = "1dgig6n1wpdzk5269k98h7pd295k2y21yfr2gaz5fcfliwckfql5"; libraryHaskellDepends = [ base template-haskell ]; description = "Partial isomorphisms"; license = lib.licenses.bsd3; @@ -215266,6 +214882,7 @@ self: { description = "Haskell 98 Partial Lenses"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "partial-order" = callPackage @@ -215299,18 +214916,6 @@ self: { }) {}; "partial-semigroup" = callPackage - ({ mkDerivation, base, doctest, hedgehog }: - mkDerivation { - pname = "partial-semigroup"; - version = "0.5.1.14"; - sha256 = "11xbdv24jy54wniappiqp6j27nm3wjgrbc8zmjkbfwdgb7fzlrws"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest hedgehog ]; - description = "A partial binary associative operator"; - license = lib.licenses.asl20; - }) {}; - - "partial-semigroup_0_6_0_0" = callPackage ({ mkDerivation, base, hedgehog }: mkDerivation { pname = "partial-semigroup"; @@ -215322,6 +214927,18 @@ self: { testHaskellDepends = [ base hedgehog ]; description = "A partial binary associative operator"; license = lib.licenses.asl20; + }) {}; + + "partial-semigroup_0_6_0_1" = callPackage + ({ mkDerivation, base, hedgehog }: + mkDerivation { + pname = "partial-semigroup"; + version = "0.6.0.1"; + sha256 = "1zzpv5b860k22wng7qa0pcj129vgzm2vxda5x1f26f9vc0bm8q18"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hedgehog ]; + description = "A partial binary associative operator"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; }) {}; @@ -215329,15 +214946,11 @@ self: { ({ mkDerivation, base, hedgehog, partial-semigroup }: mkDerivation { pname = "partial-semigroup-hedgehog"; - version = "0.6.0.12"; - sha256 = "0razhgznrrzp23zdpl1z8056n2dp2azl42cnha2g0b5h04nipg4q"; - revision = "1"; - editedCabalFile = "13ba819c67d1j6a5rr5w2lss1drb3znjdkfv2y0fd5givda2ds5v"; + version = "0.6.0.14"; + sha256 = "1f5c2z8ivmdbdy5s2f4q3pbrb4k53503zwsdc8c5drm34wrvim3b"; libraryHaskellDepends = [ base hedgehog partial-semigroup ]; description = "Property testing for partial semigroups using Hedgehog"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "partial-semigroup-test" = callPackage @@ -215350,7 +214963,6 @@ self: { doHaddock = false; description = "Testing utilities for the partial-semigroup package"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "partial-uri" = callPackage @@ -215675,33 +215287,12 @@ self: { ]; description = "Terminal-based presentations using Pandoc"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; mainProgram = "patat"; + broken = true; }) {}; "patch" = callPackage - ({ mkDerivation, base, constraints-extras, containers - , dependent-map, dependent-sum, directory, filemanip, filepath - , hedgehog, hlint, HUnit, indexed-traversable, lens - , monoidal-containers, semialign, semigroupoids, these - , transformers, witherable - }: - mkDerivation { - pname = "patch"; - version = "0.0.6.0"; - sha256 = "0wgxmk9vfrgnq5vg93jwzkszxmyrk91b36fnnlm8qr6mlg7j8m0z"; - libraryHaskellDepends = [ - base constraints-extras containers dependent-map dependent-sum - indexed-traversable lens monoidal-containers semialign - semigroupoids these transformers witherable - ]; - testHaskellDepends = [ - base containers directory filemanip filepath hedgehog hlint HUnit - ]; - description = "Data structures for describing changes to other data structures"; - license = lib.licenses.bsd3; - }) {}; - - "patch_0_0_7_0" = callPackage ({ mkDerivation, base, commutative-semigroups, constraints-extras , containers, dependent-map, dependent-sum, directory, filemanip , filepath, hedgehog, hlint, HUnit, indexed-traversable, lens @@ -215710,8 +215301,8 @@ self: { }: mkDerivation { pname = "patch"; - version = "0.0.7.0"; - sha256 = "0hpx1sh90rhvvd9j8nmpibdhj9jd4mmwbsr1c220ywaz7g6f3bxv"; + version = "0.0.8.1"; + sha256 = "06hdh1x5lilz1w4gakixwf9r0x4x13a2cijgim8zjf7lq5irlmw5"; libraryHaskellDepends = [ base commutative-semigroups constraints-extras containers dependent-map dependent-sum indexed-traversable lens @@ -215723,7 +215314,6 @@ self: { ]; description = "Data structures for describing changes to other data structures"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "patch-combinators" = callPackage @@ -215913,6 +215503,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "path-io_1_8_0" = callPackage + ({ mkDerivation, base, containers, directory, dlist, exceptions + , filepath, hspec, path, temporary, time, transformers, unix-compat + }: + mkDerivation { + pname = "path-io"; + version = "1.8.0"; + sha256 = "1iq6yj5kj8i20sr4h8rabway76hk0xmy9mi499xv22php3vb79l3"; + 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 { @@ -215954,6 +215565,20 @@ self: { license = lib.licenses.asl20; }) {}; + "path-text-utf8_0_0_1_11" = callPackage + ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: + mkDerivation { + pname = "path-text-utf8"; + version = "0.0.1.11"; + sha256 = "1dxqbcwsr3ayijssm7wr6z96p3vrwrfqhr15zhg7m3i2ad44wz8c"; + libraryHaskellDepends = [ + base bytestring path safe-exceptions text + ]; + description = "Read and write UTF-8 text files"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "path-tree" = callPackage ({ mkDerivation, base, containers, relude }: mkDerivation { @@ -216026,8 +215651,8 @@ self: { pname = "paths"; version = "0.2.0.0"; sha256 = "18pzjlnmx7w79riig7qzyhw13jla92lals9lwayl23qr02ndna4v"; - revision = "3"; - editedCabalFile = "15h5fqql4jj950lm5yddpxczcbslckq9sg2ygdgqlmahjw8mwnnf"; + revision = "4"; + editedCabalFile = "0zf4aij0jq4g77nzgr9b54f305h9gy8yjdzbp3cmpyschxbh16pd"; libraryHaskellDepends = [ base bytestring deepseq directory filepath template-haskell text time @@ -216165,6 +215790,8 @@ self: { ]; description = "Pattern tries"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "patterns" = callPackage @@ -216213,6 +215840,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "paynow-zw" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptohash, hspec + , HTTP, http-conduit, http-types, text, unliftio + }: + mkDerivation { + pname = "paynow-zw"; + version = "0.1.0.0"; + sha256 = "1mcdmiis3zbphmbhy4qxxfjziv9z7n7a5c057yzv17dgn138kbqd"; + libraryHaskellDepends = [ + base bytestring containers cryptohash HTTP http-conduit http-types + text unliftio + ]; + testHaskellDepends = [ base hspec unliftio ]; + description = "A Haskell wrapper for the Paynow payment gateway"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "paypal-adaptive-hoops" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, errors , filepath, http-client, HUnit, lens, lens-aeson, test-framework @@ -216862,6 +216508,8 @@ self: { ]; description = "Wrapper around the pdfinfo command"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pdfname" = callPackage @@ -216881,7 +216529,6 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "pdfname"; - broken = true; }) {}; "pdfsplit" = callPackage @@ -216899,7 +216546,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "pdfsplit"; - broken = true; }) {}; "pdftotext" = callPackage @@ -217297,7 +216943,6 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "penrose"; - broken = true; }) {}; "peparser" = callPackage @@ -217438,21 +217083,6 @@ self: { }) {}; "perf" = callPackage - ({ mkDerivation, base, containers, foldl, mtl, rdtsc, text, time - , transformers - }: - mkDerivation { - pname = "perf"; - version = "0.9.0"; - sha256 = "116j1dygya9226q52vw6l6w64raldjpz7z22kmcm38v36i696lik"; - libraryHaskellDepends = [ - base containers foldl mtl rdtsc text time transformers - ]; - description = "Low-level run time measurement"; - license = lib.licenses.bsd3; - }) {}; - - "perf_0_10_1" = callPackage ({ mkDerivation, base, containers, deepseq, formatn, gauge, mtl , numhask-space, optparse-applicative, rdtsc, recursion-schemes , text, time, vector @@ -217474,6 +217104,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "perf-explore"; + broken = true; }) {}; "perf-analysis" = callPackage @@ -217501,35 +217132,6 @@ self: { }) {}; "perfect-hash-generator" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, data-ordlist - , directory, filepath, hashable, HUnit, optparse-applicative - , random, test-framework, test-framework-hunit, text - , unordered-containers, vector - }: - mkDerivation { - pname = "perfect-hash-generator"; - version = "0.2.0.6"; - sha256 = "045iyxjnx1yzl9xqk5fv8qxjz29sg2pfndry1v24z6a5r88pcwnz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers data-ordlist directory filepath - hashable text unordered-containers vector - ]; - executableHaskellDepends = [ - base binary bytestring containers hashable optparse-applicative - random text unordered-containers vector - ]; - testHaskellDepends = [ - base binary bytestring hashable HUnit optparse-applicative - test-framework test-framework-hunit text unordered-containers - vector - ]; - description = "Perfect minimal hashing implementation in native Haskell"; - license = lib.licenses.asl20; - }) {}; - - "perfect-hash-generator_1_0_0" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-default , data-ordlist, directory, filepath, hashable, HUnit , optparse-applicative, random, sorted-list, test-framework @@ -217557,7 +217159,6 @@ self: { ]; description = "Perfect minimal hashing implementation in native Haskell"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "perfect-vector-shuffle" = callPackage @@ -217882,6 +217483,8 @@ self: { description = "Serialization library with state and leb128 encoding"; license = lib.licenses.bsd3; badPlatforms = [ "aarch64-linux" "armv7l-linux" ]; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "persist2er" = callPackage @@ -217957,8 +217560,8 @@ self: { pname = "persistent"; version = "2.13.3.5"; sha256 = "0z69yvk0rd29dp5qdhi4p587b891y90azrzzpa3g10cxp3gyywvm"; - revision = "2"; - editedCabalFile = "1x802a6ldvgjjn7mdh8d2c0h5cl0jajvf3g75rza7c8cxrn8f2vw"; + revision = "3"; + editedCabalFile = "0kyipwaspzah6f88s51d61kr8i9g05grm2g0lnnw28jp06nggg5d"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -217982,7 +217585,7 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {}; - "persistent_2_14_3_0" = callPackage + "persistent_2_14_4_4" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq , fast-logger, file-embed, hspec, http-api-data, lift-type @@ -217993,24 +217596,22 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.14.3.0"; - sha256 = "06cs30886s0y50kw4p2x8jw1k173il4mfqdfbkkdnd6kc97j920j"; - revision = "1"; - editedCabalFile = "1qbi74kmjk07wgib2y6pscjbr8mazlj490928h5bvahw10jx3611"; + version = "2.14.4.4"; + sha256 = "10i75da5rd5ydg17x93i3jkfx51cywxn37l4km1lr9p35lzhyfa3"; 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 vault vector + conduit containers deepseq 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 vault vector ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger hspec http-api-data 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 + conduit containers deepseq fast-logger hspec http-api-data + 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 ]; benchmarkHaskellDepends = [ base criterion deepseq file-embed template-haskell text @@ -218268,8 +217869,8 @@ self: { pname = "persistent-mongoDB"; version = "2.13.0.1"; sha256 = "1ck74kpzkz623c43qb8r1cjq8chi2p721vx95zrpciz8jm496235"; - revision = "1"; - editedCabalFile = "1h007vh9cx0y963xacxhf3rn2wjnc22ygil9c0z13mljmqssf5h6"; + revision = "2"; + editedCabalFile = "169wvga2zkgq0znvpnmpcyz0wy92sspjsrg48vyj2fr58yvvhbz5"; libraryHaskellDepends = [ aeson base bson bytestring cereal conduit http-api-data mongoDB network path-pieces persistent resource-pool resourcet text time @@ -218288,47 +217889,15 @@ self: { "persistent-mtl" = callPackage ({ mkDerivation, base, bytestring, conduit, containers, esqueleto - , exceptions, explainable-predicates, monad-logger, mtl, persistent - , persistent-postgresql, persistent-sqlite, persistent-template - , resource-pool, resourcet, tasty, tasty-golden, tasty-hunit, text - , transformers, unliftio, unliftio-core, unliftio-pool - }: - mkDerivation { - pname = "persistent-mtl"; - version = "0.4.0.0"; - sha256 = "1i8azgcgj245dw59wnsh1cpn8n3l6b8s8gh5rim8jl315rxbsn5w"; - libraryHaskellDepends = [ - base conduit containers exceptions monad-logger mtl persistent - resource-pool resourcet text transformers unliftio unliftio-core - unliftio-pool - ]; - testHaskellDepends = [ - base bytestring conduit containers esqueleto explainable-predicates - monad-logger persistent persistent-postgresql persistent-sqlite - persistent-template resource-pool resourcet tasty tasty-golden - tasty-hunit text unliftio - ]; - description = "Monad transformer for the persistent API"; - license = lib.licenses.bsd3; - }) {}; - - "persistent-mtl_0_5_0_0" = callPackage - ({ mkDerivation, base, bytestring, conduit, containers, esqueleto - , exceptions, explainable-predicates, monad-logger, mtl, persistent + , explainable-predicates, monad-logger, persistent , persistent-postgresql, persistent-sqlite, persistent-template , resource-pool, resourcet, tasty, tasty-autocollect, tasty-golden - , tasty-hunit, text, transformers, unliftio, unliftio-core - , unliftio-pool + , tasty-hunit, text, unliftio }: mkDerivation { pname = "persistent-mtl"; - version = "0.5.0.0"; - sha256 = "1xmn2zch7zxmjixlyjavl6wwdf0cjqzp01fp7xiy339wfd5higp2"; - libraryHaskellDepends = [ - base conduit containers exceptions monad-logger mtl persistent - resource-pool resourcet text transformers unliftio unliftio-core - unliftio-pool - ]; + version = "0.5.0.1"; + sha256 = "17sxwa8p95nrkacjr1wnpihwfq121z1pkyh1nvlfjy76b4aalqhi"; testHaskellDepends = [ base bytestring conduit containers esqueleto explainable-predicates monad-logger persistent persistent-postgresql persistent-sqlite @@ -218521,7 +218090,6 @@ self: { description = "Template-Haskell helpers for integrating protobufs with persistent"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "persistent-qq" = callPackage @@ -218589,6 +218157,8 @@ self: { pname = "persistent-redis"; version = "2.13.0.1"; sha256 = "1p03bwsldi3w4vsig1krnilhpbkkhzrm240jbx22q514922kgjr9"; + revision = "1"; + editedCabalFile = "0k383hvfpd0s38a8fmr2zad3f10lvz7sj969ainx9fd7hf550br2"; libraryHaskellDepends = [ aeson base binary bytestring hedis http-api-data mtl path-pieces persistent scientific text time transformers utf8-string @@ -218997,8 +218567,10 @@ self: { }: mkDerivation { pname = "pg-entity"; - version = "0.0.3.0"; - sha256 = "047pccw7rkjscn2l209z15ddkbkwk88j948zgijzrm63ykrl114j"; + version = "0.0.4.1"; + sha256 = "0fr0lzr7l31ai134c87jgqabw619ggj478ynq9mp1fq37hd11rbp"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring colourista exceptions monad-control parsec pg-transact postgresql-simple resource-pool safe-exceptions @@ -219255,6 +218827,7 @@ self: { description = "A mid-level PostgreSQL client library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pgstream" = callPackage @@ -219660,7 +219233,6 @@ self: { ]; description = "A library for working with generalized phonetic languages usage"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "pldPL"; }) {}; @@ -219845,7 +219417,6 @@ self: { ]; description = "Helps to create texts with the given phonetic properties (e. g. poetic)."; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-generalized-examples-common" = callPackage @@ -219862,7 +219433,6 @@ self: { ]; description = "Some common code for phonetic languages generalized functionality"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-generalized-properties-array" = callPackage @@ -219880,7 +219450,6 @@ self: { ]; description = "Some 'properties' of the phonetic languages approach text"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-lists-examples" = callPackage @@ -220257,6 +219826,8 @@ self: { executableHaskellDepends = [ base text ]; description = "Control an Adafruit character LCD and keypad kit on a Raspberry Pi"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pia-forward" = callPackage @@ -220439,8 +220010,8 @@ self: { ({ mkDerivation, base, directory, process, unix }: mkDerivation { pname = "pid1"; - version = "0.1.3.0"; - sha256 = "1m2i03ncgn1y6h2352pnvhcqzif45505vlnxh11xngvjx47f85a1"; + version = "0.1.3.1"; + sha256 = "1xyn50zg4phdv1d7bxqq2ljnil4vlw7qqc7cdlzlc8imxfhr30nl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory process unix ]; @@ -220576,6 +220147,8 @@ self: { ]; description = "Access to the Pinboard API"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pinboard-notes-backup" = callPackage @@ -220585,8 +220158,8 @@ self: { }: mkDerivation { pname = "pinboard-notes-backup"; - version = "1.0.5.4"; - sha256 = "1p6if0hzgab49l39czj18b18z5lqm6akajfp68x8mrbydv55ij54"; + version = "1.0.5.6"; + sha256 = "1vghgv9kmlch9g14imp5skb1ia6nndn1bwhpx7r262fn4dv88372"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -220696,8 +220269,8 @@ self: { }: mkDerivation { pname = "ping"; - version = "0.1.0.3"; - sha256 = "1h57p53vakjxm3g6inp9wvj5pp71qb0mpcrxbaa707w8v9lyvwwi"; + version = "0.1.0.4"; + sha256 = "0kj2fh6079xy20mk6ikjvmyb19zf21nglblhzazcmcbk921bmffm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220761,8 +220334,8 @@ self: { }: mkDerivation { pname = "pinned-warnings"; - version = "0.1.0.12"; - sha256 = "1pz6nwxwn9k7l64n9185rgsyqsa85wb3vil52l9ylvsnkdykqz6w"; + version = "0.1.0.13"; + sha256 = "002y3l966wvj1b4d63v8f2z99jzqg5k03lvhv7hhf3380wchyrqv"; libraryHaskellDepends = [ base bytestring containers directory ghc time transformers ]; @@ -221024,8 +220597,6 @@ self: { testHaskellDepends = [ base bytestring mtl pipes QuickCheck ]; description = "Pipes to group by any delimiter (such as lines with carriage returns)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipes-brotli" = callPackage @@ -221087,7 +220658,6 @@ self: { description = "Streaming compression/decompression via pipes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) bzip2;}; "pipes-cacophony" = callPackage @@ -221142,8 +220712,6 @@ self: { ]; description = "Encode and decode cborg streams using the pipes and cborg libraries"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipes-cellular" = callPackage @@ -221454,8 +221022,8 @@ self: { pname = "pipes-http"; version = "1.0.6"; sha256 = "00579dpb7mh8nli5gfr100w0mrn6nvqhbj50qzxc2m5cvw4gncd2"; - revision = "2"; - editedCabalFile = "1pyxrq9m8c1v747c9bk75z418cyivhf8mbgdgfj9g2dvcf6zaq5w"; + revision = "3"; + editedCabalFile = "0m38lrmr356gfrv6gnrncwiy1hnh882084yn7vgmjsqssgvhbz8a"; libraryHaskellDepends = [ base bytestring http-client http-client-tls pipes ]; @@ -221637,8 +221205,6 @@ self: { ]; description = "Use network sockets together with the pipes library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipes-network-tls" = callPackage @@ -221656,7 +221222,6 @@ self: { ]; description = "TLS-secured network connections support for pipes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pipes-network-ws" = callPackage @@ -221852,8 +221417,8 @@ self: { pname = "pipes-safe"; version = "2.3.4"; sha256 = "1ha0q1dwl52rn59shmk8jhp7grngpiwmp8x4qa9h54flvxkqk12x"; - revision = "1"; - editedCabalFile = "0qhlam3m0zrhl8l5pilxhhgigq56n7wp6cak9hpca3b68bh9wph4"; + revision = "2"; + editedCabalFile = "0g1ib89dwhblc19vc8spcjdc10pg56avs9480i55ab315wjfsna2"; libraryHaskellDepends = [ base containers exceptions monad-control mtl pipes primitive transformers transformers-base @@ -222030,8 +221595,6 @@ self: { ]; description = "Zlib and GZip compression and decompression for Pipes streams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pisigma" = callPackage @@ -222218,6 +221781,8 @@ self: { ]; description = "Pixiv API binding based on servant-client"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "piyo" = callPackage @@ -222311,29 +221876,6 @@ self: { }) {}; "pkgtreediff" = callPackage - ({ mkDerivation, async, base, directory, extra, filepath, Glob - , http-client, http-client-tls, http-directory, koji, rpm-nvr - , simple-cmd, simple-cmd-args, text - }: - mkDerivation { - pname = "pkgtreediff"; - version = "0.5.0"; - sha256 = "0zlz53adlah00zxbh4kqvpm3vinn0248n8rzdxpdsbrbrlnlj8y9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base rpm-nvr ]; - executableHaskellDepends = [ - async base directory extra filepath Glob http-client - http-client-tls http-directory koji rpm-nvr simple-cmd - simple-cmd-args text - ]; - description = "RPM package tree diff tool"; - license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - mainProgram = "pkgtreediff"; - }) {}; - - "pkgtreediff_0_6_0" = callPackage ({ mkDerivation, async, base, bytestring, directory, extra , filepath, Glob, http-client, http-client-tls, http-directory , http-types, koji, rpm-nvr, simple-cmd, simple-cmd-args, text @@ -222712,8 +222254,6 @@ self: { ]; description = "run a subprocess, combining stdout and stderr"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "plist" = callPackage @@ -222949,8 +222489,8 @@ self: { }: mkDerivation { pname = "plotlyhs"; - version = "0.2.1"; - sha256 = "1d7cqy22myp6r0x0b00amn64fra0lklb9jy2hd8ic9lxg0nd8pn9"; + version = "0.2.3"; + sha256 = "1j7ns90cjl7gb9nmlsflnikwbsfycnh727hzmb27gaw6s95r047m"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring lucid microlens microlens-th text time @@ -223000,6 +222540,8 @@ self: { ]; description = "Diagrams based plotting library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "plotserver-api" = callPackage @@ -223013,6 +222555,37 @@ self: { license = lib.licenses.mit; }) {}; + "plow-log" = callPackage + ({ mkDerivation, aeson, base, text }: + mkDerivation { + pname = "plow-log"; + version = "0.1.6.0"; + sha256 = "1vb1842pxh84vm6kbrd40f13qgb91rn4i0c3bv726znmdh0lqdsz"; + revision = "1"; + editedCabalFile = "00lwbgqr65yq8fidpdxr3n57zz3abvmhrpc5pcj03zxj26lkrvkl"; + libraryHaskellDepends = [ aeson base text ]; + description = "Contravariant logging library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "plow-log-async" = callPackage + ({ mkDerivation, base, conduit, plow-log, stm-conduit, text, time + , unliftio + }: + mkDerivation { + pname = "plow-log-async"; + version = "0.1.4.0"; + sha256 = "14wg7h1vfkc3yal9951k9prhx0v3kkp5hjbbv8lx7c4n4clm1p2m"; + libraryHaskellDepends = [ + base conduit plow-log stm-conduit text time unliftio + ]; + description = "Async IO tracer for plow-log"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "plucky" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -223519,6 +223092,7 @@ self: { license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; mainProgram = "poke-exe"; + broken = true; }) {}; "pokemon-go-protobuf-types" = callPackage @@ -223561,7 +223135,6 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "poker-exe"; - broken = true; }) {}; "poker-base" = callPackage @@ -223584,6 +223157,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "A library for core poker types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "poker-eval" = callPackage @@ -223752,24 +223327,26 @@ self: { }) {}; "poly" = callPackage - ({ mkDerivation, base, deepseq, doctest, finite-typelits, gauge - , mod, primitive, QuickCheck, quickcheck-classes, semirings, tasty - , tasty-quickcheck, vector, vector-algorithms, vector-sized + ({ mkDerivation, base, deepseq, finite-typelits, mod, primitive + , QuickCheck, quickcheck-classes, quickcheck-classes-base + , semirings, tasty, tasty-bench, tasty-quickcheck, vector + , vector-algorithms, vector-sized }: mkDerivation { pname = "poly"; - version = "0.5.0.0"; - sha256 = "1h7nbyiwnbxyj2jss04raws7zapfq7mvzj7fmi8rqyr0aw91k4zl"; + version = "0.5.1.0"; + sha256 = "0ycjdan9l92glnqr0lms2kdjfs5dg9c2ky2w2rdmrc6nzzxajd9k"; libraryHaskellDepends = [ base deepseq finite-typelits primitive semirings vector vector-algorithms vector-sized ]; testHaskellDepends = [ - base doctest finite-typelits mod QuickCheck quickcheck-classes - semirings tasty tasty-quickcheck vector vector-sized + base finite-typelits mod QuickCheck quickcheck-classes + quickcheck-classes-base semirings tasty tasty-quickcheck vector + vector-sized ]; benchmarkHaskellDepends = [ - base deepseq gauge mod semirings vector + base deepseq mod semirings tasty-bench vector ]; description = "Polynomials"; license = lib.licenses.bsd3; @@ -223922,6 +223499,8 @@ self: { ]; description = "Polynomials"; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polynomial-algebra" = callPackage @@ -223970,8 +223549,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "1.6.0.0"; - sha256 = "1s2hmfp1ii5q8qpxiqm825ykh4fpcq06wphfqbhp7p3sxkkr3c68"; + version = "1.7.1.0"; + sha256 = "09629gyjdp567dsqk0mgzzk5glrwnpn0cwanank5z3zkqg05d5ac"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base containers first-class-families mtl QuickCheck stm syb @@ -223992,33 +223571,27 @@ self: { license = lib.licenses.bsd3; }) {}; - "polysemy_1_7_1_0" = callPackage + "polysemy_1_9_0_0" = callPackage ({ mkDerivation, async, base, Cabal, cabal-doctest, containers - , criterion, doctest, first-class-families, free, freer-simple - , hspec, hspec-discover, inspection-testing, mtl, QuickCheck, stm - , syb, template-haskell, th-abstraction, transformers, type-errors - , unagi-chan + , doctest, first-class-families, hspec, hspec-discover + , inspection-testing, mtl, stm, syb, template-haskell + , th-abstraction, transformers, type-errors, unagi-chan }: mkDerivation { pname = "polysemy"; - version = "1.7.1.0"; - sha256 = "09629gyjdp567dsqk0mgzzk5glrwnpn0cwanank5z3zkqg05d5ac"; + version = "1.9.0.0"; + sha256 = "00qmsn0mr88y29my389ln6c5imcac73p7hisd102w4qlwikwj9ir"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - async base containers first-class-families mtl QuickCheck stm syb + async base containers first-class-families mtl stm syb template-haskell th-abstraction transformers type-errors unagi-chan ]; testHaskellDepends = [ async base containers doctest first-class-families hspec - inspection-testing mtl QuickCheck stm syb template-haskell + hspec-discover inspection-testing mtl stm syb template-haskell th-abstraction transformers type-errors unagi-chan ]; testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - async base containers criterion first-class-families free - freer-simple mtl QuickCheck stm syb template-haskell th-abstraction - transformers type-errors unagi-chan - ]; description = "Higher-order, low-boilerplate free monads"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -224044,6 +223617,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Experimental, RandomFu effect and interpreters for polysemy"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-check" = callPackage @@ -224053,8 +223627,8 @@ self: { }: mkDerivation { pname = "polysemy-check"; - version = "0.9.0.0"; - sha256 = "092p92aavd3jqq7kjp3n2kx3zyg6k49zd99rliaw4gvgn6zk8k0l"; + version = "0.9.0.1"; + sha256 = "0zv6sf379pcnrj39hzmgmw0r0d4nsfizcsgl00c6c5f7n17cc53b"; libraryHaskellDepends = [ base containers kind-generics kind-generics-th polysemy QuickCheck ]; @@ -224075,8 +223649,8 @@ self: { }: mkDerivation { pname = "polysemy-chronos"; - version = "0.5.1.0"; - sha256 = "00kbc6591mpa41fl0vzmxickphn4ryh3fx2f55qbqpshvg417m6x"; + version = "0.6.0.0"; + sha256 = "1zmq8pi0fdzbgz8nkfiwkn2vf6a6k5wgc7xc19v5xkmaps5aiwgp"; libraryHaskellDepends = [ base chronos incipit-core polysemy-time ]; @@ -224095,8 +223669,8 @@ self: { }: mkDerivation { pname = "polysemy-conc"; - version = "0.10.0.0"; - sha256 = "17683p4j54kapg279cbdxl7j0gyrshcsxcs0xngyaplgajwq6pnk"; + version = "0.12.1.0"; + sha256 = "0js5hl84nfmb2i5si67wrf9d0i69piaj44v3sbia6yncq85fj7vn"; libraryHaskellDepends = [ async base containers incipit-core polysemy polysemy-resume polysemy-time stm stm-chans torsor unagi-chan unix @@ -224104,10 +223678,11 @@ self: { testHaskellDepends = [ async base hedgehog incipit-core polysemy polysemy-plugin polysemy-resume polysemy-test polysemy-time stm tasty - tasty-hedgehog time unagi-chan unix + tasty-hedgehog time unix ]; description = "Polysemy effects for concurrency"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-extra" = callPackage @@ -224146,8 +223721,8 @@ self: { }: mkDerivation { pname = "polysemy-fskvstore"; - version = "0.1.1.0"; - sha256 = "1jpiqq65lv1dp7h2wdl2b2czpax6wqwlv4fqh8vhg26pw49mc2lr"; + version = "0.1.2.0"; + sha256 = "165lj55kmra01kxpr26n6a35989qihvwipdxkdbf2gi78xglryrp"; libraryHaskellDepends = [ base bytestring path polysemy polysemy-kvstore rio unliftio-path ]; @@ -224163,8 +223738,8 @@ self: { }: mkDerivation { pname = "polysemy-http"; - version = "0.9.0.0"; - sha256 = "13d5ydyaq6jjinq8h8slxj0iw6bfpg7cdv0lj0kl8kpvikr6livg"; + version = "0.10.0.0"; + sha256 = "1j0a0gmlr1cd6mwa8y4f6dq3zf4asmgj4v4cdriiw0k1cxi81l9c"; libraryHaskellDepends = [ aeson base case-insensitive exon http-client http-client-tls http-types polysemy polysemy-plugin prelate time @@ -224239,8 +223814,8 @@ self: { }: mkDerivation { pname = "polysemy-log"; - version = "0.7.2.0"; - sha256 = "1n206b3g64gdrz488q0y11by25khn5aka9qx37vfg65mrnzald78"; + version = "0.9.0.0"; + sha256 = "1sgmgbh7gkyhp7rmdx2rj6dibwhi6z2qzg4cbnjsx8asz6xa188h"; libraryHaskellDepends = [ ansi-terminal async base incipit-core polysemy polysemy-conc polysemy-time stm time @@ -224254,29 +223829,29 @@ self: { ]; description = "Polysemy effects for logging"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-log-co" = callPackage - ({ mkDerivation, base, co-log, co-log-polysemy, incipit-core - , polysemy, polysemy-conc, polysemy-log, polysemy-test - , polysemy-time, stm, tasty + ({ mkDerivation, base, co-log, co-log-concurrent, co-log-polysemy + , incipit-core, polysemy, polysemy-conc, polysemy-log + , polysemy-test, polysemy-time, stm, tasty }: mkDerivation { pname = "polysemy-log-co"; - version = "0.7.2.0"; - sha256 = "0g3nxfahlsp97zjmy484dgvwkjvfpf70f1zhd6kvpmk9dik6n9r7"; + version = "0.9.0.0"; + sha256 = "18z75dbbqf18ff3dc641svm93fvrdaxzplbaicdy7y3dz3y7apmv"; libraryHaskellDepends = [ - base co-log co-log-polysemy incipit-core polysemy polysemy-conc - polysemy-log polysemy-time stm + base co-log co-log-concurrent co-log-polysemy incipit-core polysemy + polysemy-conc polysemy-log polysemy-time stm ]; testHaskellDepends = [ - base co-log co-log-polysemy incipit-core polysemy polysemy-log - polysemy-test polysemy-time stm tasty + base co-log co-log-concurrent co-log-polysemy incipit-core polysemy + polysemy-log polysemy-test polysemy-time stm tasty ]; description = "Colog adapters for Polysemy.Log"; license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-log-di" = callPackage @@ -224286,8 +223861,8 @@ self: { }: mkDerivation { pname = "polysemy-log-di"; - version = "0.7.2.0"; - sha256 = "0v7zwvb7aapr0cslvmn1kzcvvdr9xw4bzqppxkpzia6cnzhbr09y"; + version = "0.9.0.0"; + sha256 = "0zwcv6b0m5phwiy0c1z3wfnbw0976qg744dpb6k66wdr3yvpl05f"; libraryHaskellDepends = [ base di-polysemy incipit-core polysemy polysemy-conc polysemy-log polysemy-time stm @@ -224297,6 +223872,7 @@ self: { ]; description = "Di adapters for Polysemy.Log"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-managed" = callPackage @@ -224318,8 +223894,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Primitive functions and data types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-methodology" = callPackage @@ -224351,6 +223925,8 @@ self: { ]; description = "Logging functions for polysemy-methodology"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-methodology-composite" = callPackage @@ -224369,6 +223945,7 @@ self: { ]; description = "Functions for using polysemy-methodology with composite"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-mocks" = callPackage @@ -224377,8 +223954,8 @@ self: { }: mkDerivation { pname = "polysemy-mocks"; - version = "0.3.0.0"; - sha256 = "03yq5pyrg2rhykyhvp3f8b816r9j035xr5d9d1cls73zh9pbbh7z"; + version = "0.3.1.0"; + sha256 = "08dsx682fvx7ywiixxjaa5b05r3s97anl893nlfc3vy6qynaqkns"; libraryHaskellDepends = [ base polysemy template-haskell ]; testHaskellDepends = [ base hspec polysemy ]; testToolDepends = [ hspec-discover ]; @@ -224410,6 +223987,8 @@ self: { libraryHaskellDepends = [ base path polysemy polysemy-extra ]; description = "Polysemy versions of Path functions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-plugin" = callPackage @@ -224420,45 +223999,22 @@ self: { }: mkDerivation { pname = "polysemy-plugin"; - version = "0.4.1.1"; - sha256 = "0sw0wzasclj4ibzc4g701p1xvs8vzliaflsgyyj9digajjg1m9n7"; + version = "0.4.4.0"; + sha256 = "1kp7d4m007mlk4pl2p8933b5yzzb8gl30g1vfbbz01vm3pgjcj3d"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers ghc ghc-tcplugins-extra polysemy syb transformers ]; testHaskellDepends = [ base containers doctest ghc ghc-tcplugins-extra hspec - inspection-testing polysemy should-not-typecheck syb transformers + hspec-discover inspection-testing polysemy should-not-typecheck syb + transformers ]; testToolDepends = [ hspec-discover ]; description = "Disambiguate obvious uses of effects"; license = lib.licenses.bsd3; }) {}; - "polysemy-plugin_0_4_3_1" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest - , ghc, ghc-tcplugins-extra, hspec, hspec-discover - , inspection-testing, polysemy, should-not-typecheck, syb - , transformers - }: - mkDerivation { - pname = "polysemy-plugin"; - version = "0.4.3.1"; - sha256 = "02s9hb0y4fgvmlkg7izwq24hrgb92h1jd7v0gjzayjn6la8xmf6r"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base containers ghc ghc-tcplugins-extra polysemy syb transformers - ]; - testHaskellDepends = [ - base containers doctest ghc ghc-tcplugins-extra hspec - inspection-testing polysemy should-not-typecheck syb transformers - ]; - testToolDepends = [ hspec-discover ]; - description = "Disambiguate obvious uses of effects"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "polysemy-process" = callPackage ({ mkDerivation, base, incipit-core, path, path-io, polysemy , polysemy-conc, polysemy-plugin, polysemy-resume, polysemy-test @@ -224467,8 +224023,8 @@ self: { }: mkDerivation { pname = "polysemy-process"; - version = "0.10.0.0"; - sha256 = "1f0bnpzd1k1aj9f3100z240ljvlw9b5ikafif05bwzcpavsy7zli"; + version = "0.12.1.0"; + sha256 = "0009h21pwfkwfyb5qk6v9gw5gh2ksap3xbcbny2icn88dhqs42k6"; libraryHaskellDepends = [ base incipit-core path path-io polysemy polysemy-conc polysemy-resume polysemy-time posix-pty process stm-chans @@ -224481,6 +224037,7 @@ self: { ]; description = "Polysemy effects for system processes"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-readline" = callPackage @@ -224520,26 +224077,28 @@ self: { libraryHaskellDepends = [ base polysemy req ]; description = "Polysemy effect for req"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-resume" = callPackage - ({ mkDerivation, base, hedgehog, incipit-core, polysemy - , polysemy-plugin, polysemy-test, stm, tasty, tasty-hedgehog, text - , transformers + ({ mkDerivation, base, incipit-core, polysemy, polysemy-plugin + , polysemy-test, stm, tasty, transformers }: mkDerivation { pname = "polysemy-resume"; - version = "0.5.0.0"; - sha256 = "1l51p565i0wb9ckxbaiwzgbbl7jicr9586n824478bxdsd45b3di"; + version = "0.7.0.0"; + sha256 = "0f2hlccg7qpx9dd1k73ni59yl447m3v2s6r8h9n2k1klxc21jr07"; libraryHaskellDepends = [ base incipit-core polysemy transformers ]; testHaskellDepends = [ - base hedgehog incipit-core polysemy polysemy-plugin polysemy-test - stm tasty tasty-hedgehog text + base incipit-core polysemy polysemy-plugin polysemy-test stm tasty ]; description = "Polysemy error tracking"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-scoped-fs" = callPackage @@ -224561,7 +224120,6 @@ self: { description = "Well-typed filesystem operation effects"; license = lib.licenses.agpl3Plus; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polysemy-several" = callPackage @@ -224586,6 +224144,8 @@ self: { libraryHaskellDepends = [ base bytestring polysemy socket ]; description = "Socket effect for polysemy"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-test" = callPackage @@ -224594,8 +224154,8 @@ self: { }: mkDerivation { pname = "polysemy-test"; - version = "0.6.0.0"; - sha256 = "093xg4jlxpfb64r8912k9hznbjy8zn9s18f7cci9lp472b4agxph"; + version = "0.7.0.0"; + sha256 = "0s6p163hydh20bwn4k3pjhgl27jbdd9kfgj8xs89kdi1pa65icyl"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base hedgehog incipit-core path path-io polysemy tasty @@ -224609,15 +224169,15 @@ self: { }) {}; "polysemy-time" = callPackage - ({ mkDerivation, aeson, base, incipit-core, polysemy-test, stm - , tasty, template-haskell, time, torsor + ({ mkDerivation, aeson, base, incipit-core, polysemy-test, tasty + , template-haskell, time, torsor }: mkDerivation { pname = "polysemy-time"; - version = "0.5.1.0"; - sha256 = "16p5256v9cvns348xva8qz0dsaqgcf5cijm93831lskfkvlvnzc5"; + version = "0.6.0.0"; + sha256 = "0kl5p1iwd0q7cm05zfvgq0nwhjds547p1mrzqzjwdcy8p4xflr2p"; libraryHaskellDepends = [ - aeson base incipit-core stm template-haskell time torsor + aeson base incipit-core template-haskell time torsor ]; testHaskellDepends = [ base incipit-core polysemy-test tasty time @@ -224655,6 +224215,8 @@ self: { ]; description = "Experimental video processing DSL for polysemy"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-vinyl" = callPackage @@ -224672,6 +224234,8 @@ self: { ]; description = "Functions for mapping vinyl records in polysemy"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-webserver" = callPackage @@ -225108,8 +224672,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Static key-value storage backed by poppy"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "poppler" = callPackage @@ -225266,7 +224828,9 @@ self: { executableHaskellDepends = [ base warp ]; description = "A minimalist HTTP server framework written on top of wai"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "porpoise-example"; + broken = true; }) {}; "port-utils" = callPackage @@ -225375,6 +224939,8 @@ self: { pname = "portray"; version = "0.3.0"; sha256 = "059lyc5p7726y9yj7c3by854czhbiwspgrgiqa6qp22pfbx2ycqn"; + revision = "1"; + editedCabalFile = "06bdmmfxav5ah20bdj09rbgvk4ncjicx1r48m3l9xjcczbm28y5m"; libraryHaskellDepends = [ base bytestring containers text wrapped ]; @@ -225392,6 +224958,8 @@ self: { pname = "portray-diff"; version = "0.1.1"; sha256 = "1z09bs62hh9hsf88qkbsqp3ydxr66jdpbp9s8c7d142vcinmi3wm"; + revision = "1"; + editedCabalFile = "1p5ks82k2q59z20kc8nk5aj8n7isjnf0wc07lqv1djlalb3cwwy3"; libraryHaskellDepends = [ base containers dlist portray text wrapped ]; @@ -225406,14 +224974,13 @@ self: { pname = "portray-diff-hunit"; version = "0.1.0.0"; sha256 = "0gig1gvw0s7cl4jbffqh53r7lfs08clkcjpdypjjbpk0815pk34h"; - revision = "3"; - editedCabalFile = "05y5cci0kip5ribjkkinv7nqfvbjsq7z26vj3b170vd7awgfb2xq"; + revision = "5"; + editedCabalFile = "0yz9jfxsrnb5hb694bjgxc7gwl1dw2m54qnm9z9js51fc1kk2ppa"; libraryHaskellDepends = [ base HUnit portray-diff portray-pretty pretty ]; description = "HUnit assertions based on portray-diff"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "portray-diff-quickcheck" = callPackage @@ -225422,14 +224989,13 @@ self: { pname = "portray-diff-quickcheck"; version = "0.1.0.0"; sha256 = "1kif82y8bapf5d3awkfv7wp3ih89q3p14djanyz6jfapryhccm12"; - revision = "3"; - editedCabalFile = "0c6ld7l8k4kk66rikxknq0c6mjc7dwa1bw7bqbajqfdb0jjbaafc"; + revision = "4"; + editedCabalFile = "1jy6qviv8phj2dr79bkrqsaal1xb940hzhynq84vbkgk2szlcwqr"; libraryHaskellDepends = [ base portray-diff portray-pretty QuickCheck ]; description = "QuickCheck tests with portray-diff"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "portray-pretty" = callPackage @@ -225440,6 +225006,8 @@ self: { pname = "portray-pretty"; version = "0.1.0.3"; sha256 = "08gf384mqsxblxzmhr6ipskvipgbdgx72s3nmdhsld53spg5zhd5"; + revision = "1"; + editedCabalFile = "03r638j282ldxzkpw07l7cnp4kxwh3325bcljkn96hs1l6vy5q4j"; libraryHaskellDepends = [ base portray portray-diff pretty text ]; testHaskellDepends = [ base HUnit portray portray-diff pretty test-framework @@ -225447,8 +225015,6 @@ self: { ]; description = "Portray backend for pretty"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "portray-prettyprinter" = callPackage @@ -225460,6 +225026,8 @@ self: { pname = "portray-prettyprinter"; version = "0.2.1"; sha256 = "0dzhzrv6xq67sbf6ivisghlx4pq53h3qh859ai5rs6cikg6xfb7b"; + revision = "1"; + editedCabalFile = "1jz8jpi4in8znsgzcb9kcgv2zgrw2v99zkb311wjwrzk7vgjm9b7"; libraryHaskellDepends = [ base portray portray-diff prettyprinter prettyprinter-ansi-terminal text @@ -225471,8 +225039,6 @@ self: { ]; description = "Portray backend for prettyprinter"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ports" = callPackage @@ -225579,8 +225145,8 @@ self: { ({ mkDerivation, base, data-dword, deepseq, scientific }: mkDerivation { pname = "posit"; - version = "3.2.0.0"; - sha256 = "1qbf413cj0z35gc5dglkrzk5l20fvrcqs964jpn927k37i3dmxx1"; + version = "3.2.0.3"; + sha256 = "02rjcar4dzdxysk2zixqday8nrwa4j8ypcflb1g12a7v5f1xim66"; libraryHaskellDepends = [ base data-dword deepseq scientific ]; testHaskellDepends = [ base ]; license = lib.licenses.bsd3; @@ -225644,8 +225210,8 @@ self: { }: mkDerivation { pname = "posix-api"; - version = "0.3.5.0"; - sha256 = "0ygww5fcikalyqzliqdrcd4n4g8plhr01gz5p6zd0c5f1y9jgw7x"; + version = "0.4.0.0"; + sha256 = "0j4iz6llg8qgi5jfg51asimw3qwzwlacj6ac0rm0a2g0756wf7mv"; libraryHaskellDepends = [ base byte-order byteslice primitive primitive-addr primitive-offset primitive-unlifted run-st @@ -225657,8 +225223,6 @@ self: { description = "posix bindings"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) systemd;}; "posix-error-codes" = callPackage @@ -225796,9 +225360,7 @@ self: { ]; description = "Sleep tracker for X11, using XScreenSaver extension and manual input"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "posplyu"; - broken = true; }) {}; "possible" = callPackage @@ -225932,31 +225494,6 @@ self: { }) {}; "postgresql-binary" = callPackage - ({ mkDerivation, aeson, base, binary-parser, bytestring - , bytestring-strict-builder, containers, criterion, network-ip - , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase - , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "postgresql-binary"; - version = "0.12.5"; - sha256 = "0fnc97mw4c0aipbqih8jz23ma8xrspgw7r56qq3vzl4k2p9z49vj"; - libraryHaskellDepends = [ - aeson base binary-parser bytestring bytestring-strict-builder - containers network-ip scientific text time transformers - unordered-containers uuid vector - ]; - testHaskellDepends = [ - aeson network-ip postgresql-libpq QuickCheck quickcheck-instances - rerebase tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "Encoders and decoders for the PostgreSQL's binary format"; - license = lib.licenses.mit; - }) {}; - - "postgresql-binary_0_13_1" = callPackage ({ mkDerivation, aeson, base, binary-parser, bytestring , bytestring-strict-builder, containers, criterion, network-ip , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase @@ -225979,7 +225516,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "Encoders and decoders for the PostgreSQL's binary format"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "postgresql-common" = callPackage @@ -225996,6 +225532,8 @@ self: { ]; description = "Library for sharing common PostgreSQL types across Haskell PostgreSQL libraries"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "postgresql-common-persistent" = callPackage @@ -226014,6 +225552,7 @@ self: { ]; description = "Persistent compatibility for postgresql-common"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "postgresql-config" = callPackage @@ -226069,6 +225608,8 @@ self: { libraryHaskellDepends = [ base bytestring postgresql-simple ]; description = "Cube support for postgresql-simple"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "postgresql-error-codes" = callPackage @@ -226086,10 +225627,8 @@ self: { ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }: mkDerivation { pname = "postgresql-libpq"; - version = "0.9.4.3"; - sha256 = "1gfnhc5pibn7zmifdf2g0c112xrpzsk756ln2kjzqljkspf4dqp3"; - revision = "3"; - editedCabalFile = "02cj493a2qxl5hddiq0579079s398hdqqy164pig6d61nl7q66cs"; + version = "0.9.5.0"; + sha256 = "0w2l687r9z92snvd0cjyv3dxghgr5alyw0vc2c6bp2600pc2nnfi"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ postgresql ]; @@ -226217,7 +225756,9 @@ self: { executableHaskellDepends = [ base filepath ]; description = "An ORM (Object Relational Mapping) and migrations DSL for PostgreSQL"; license = "GPL"; + hydraPlatforms = lib.platforms.none; mainProgram = "pg_migrate"; + broken = true; }) {}; "postgresql-placeholder-converter" = callPackage @@ -226284,39 +225825,6 @@ self: { }) {}; "postgresql-query" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring - , containers, data-default, exceptions, file-embed - , generic-arbitrary, haskell-src-meta, hreader, hset, inflections - , monad-control, monad-logger, mtl, postgresql-simple, QuickCheck - , quickcheck-assertions, quickcheck-instances, resource-pool - , semigroups, tasty, tasty-hunit, tasty-quickcheck, tasty-th - , template-haskell, text, th-lift, th-lift-instances, time - , transformers, transformers-base, transformers-compat - }: - mkDerivation { - pname = "postgresql-query"; - version = "3.9.0"; - sha256 = "1520crprhdnan7w5qm9h42r6cxz4v6zffwwfvybzwpczj2g3laa6"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder bytestring containers - data-default exceptions file-embed haskell-src-meta hreader hset - inflections monad-control monad-logger mtl postgresql-simple - resource-pool semigroups template-haskell text th-lift - th-lift-instances time transformers transformers-base - transformers-compat - ]; - testHaskellDepends = [ - attoparsec base generic-arbitrary postgresql-simple QuickCheck - quickcheck-assertions quickcheck-instances tasty tasty-hunit - tasty-quickcheck tasty-th text time - ]; - description = "Sql interpolating quasiquote plus some kind of primitive ORM using it"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "postgresql-query_3_10_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , containers, data-default, doctest, exceptions, file-embed , generic-arbitrary, haskell-src-meta, hreader, hset, inflections @@ -226368,7 +225876,9 @@ self: { testHaskellDepends = [ base binary bytestring cereal hspec ]; description = "PostgreSQL logical streaming replication library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "replicant-example"; + broken = true; }) {}; "postgresql-resilient" = callPackage @@ -226408,6 +225918,37 @@ self: { }) {}; "postgresql-simple" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, bytestring-builder, case-insensitive, containers + , cryptohash-md5, filepath, hashable, HUnit, inspection-testing + , Only, postgresql-libpq, scientific, tasty, tasty-golden + , tasty-hunit, template-haskell, text, time-compat, transformers + , uuid-types, vector + }: + mkDerivation { + pname = "postgresql-simple"; + version = "0.6.4"; + sha256 = "0rz2bklxp4pvbxb2w49h5p6pbwabn6d5d4j4mrya4fpa0d13k43d"; + revision = "8"; + editedCabalFile = "1qavb3qs1g307pc19k9y3yvqp0c1srwsplijvayn9ldp0bxdy6q8"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring bytestring-builder + case-insensitive containers hashable Only postgresql-libpq + scientific template-haskell text time-compat transformers + uuid-types vector + ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive containers + cryptohash-md5 filepath HUnit inspection-testing postgresql-libpq + tasty tasty-golden tasty-hunit text time-compat vector + ]; + benchmarkHaskellDepends = [ base vector ]; + description = "Mid-Level PostgreSQL client library"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + + "postgresql-simple_0_6_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, bytestring-builder, case-insensitive, containers , cryptohash-md5, filepath, hashable, HUnit, inspection-testing @@ -226433,6 +225974,7 @@ self: { benchmarkHaskellDepends = [ base vector ]; description = "Mid-Level PostgreSQL client library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.maralorn ]; }) {}; @@ -226519,7 +226061,9 @@ self: { testHaskellDepends = [ base bytestring hspec postgresql-simple ]; description = "PostgreSQL Schema Migrations"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "migrate"; + broken = true; }) {}; "postgresql-simple-named" = callPackage @@ -226630,8 +226174,8 @@ self: { pname = "postgresql-simple-url"; version = "0.2.1.0"; sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk"; - revision = "5"; - editedCabalFile = "17l5iq6c4yjw3gswgav398cbih5105m05ak68kdibv6jjazkqw7p"; + revision = "6"; + editedCabalFile = "1pvfb61ys58s66dass8qfaxrd4pbkbk8hsbrijds6gybcx3a7nhy"; libraryHaskellDepends = [ base network-uri postgresql-simple split ]; @@ -226676,8 +226220,6 @@ self: { ]; description = "a transactional monad on top of postgresql-simple"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "postgresql-tx" = callPackage @@ -226700,6 +226242,8 @@ self: { libraryHaskellDepends = [ base monad-logger postgresql-tx ]; description = "postgresql-tx interfacing for use with monad-logger"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "postgresql-tx-query" = callPackage @@ -226754,7 +226298,6 @@ self: { description = "postgresql-tx interfacing for use with squeal-postgresql"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "postgresql-tx-squeal-compat-simple" = callPackage @@ -226780,8 +226323,8 @@ self: { }: mkDerivation { pname = "postgresql-typed"; - version = "0.6.2.1"; - sha256 = "15zrsg2zz2jgzb1v0g13c98hfrmnkcjakqpdy2zhbfr6ibivlhkx"; + version = "0.6.2.2"; + sha256 = "0khc6bc1gvlhvrmpgj4ilazimwpjvd2p83lfbbpip9dpj2b5h2ri"; libraryHaskellDepends = [ aeson array attoparsec base binary bytestring containers cryptonite data-default haskell-src-meta HDBC memory network old-locale @@ -226859,9 +226402,7 @@ self: { ]; description = "REST API for any Postgres database"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "postgrest"; - broken = true; }) {}; "postgrest-ws" = callPackage @@ -227167,6 +226708,8 @@ self: { ]; description = "PowerDNS API bindings for api/v1"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "powermate" = callPackage @@ -227757,8 +227300,8 @@ self: { }: mkDerivation { pname = "prelate"; - version = "0.2.0.0"; - sha256 = "03620awa3yh3jfzqzr2i6gbhg4wfq33v7m42rzwnr6j83pkd59im"; + version = "0.4.0.0"; + sha256 = "0bil1d1daw6a37zi0fddf3mja3ab12rcsldi879qcipbjc7bh4bz"; libraryHaskellDepends = [ aeson base exon extra generic-lens incipit microlens microlens-ghc polysemy-chronos polysemy-conc polysemy-log polysemy-process @@ -228108,6 +227651,8 @@ self: { ]; description = "Pretty-printing library"; license = "GPL"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pretty-diff" = callPackage @@ -228197,8 +227742,8 @@ self: { ({ mkDerivation, base, bytestring, filepath, text }: mkDerivation { pname = "pretty-html"; - version = "0.1.0.0"; - sha256 = "099gj9h1smgjnp8xyrp5c0hj99f35lf7jc6rgmbnh8s7ra3a1gz5"; + version = "0.1.0.1"; + sha256 = "14f2jydcjxnm9whxi2irvsx769xc4041dpvn3r7iahcn5gqf3krr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base bytestring filepath text ]; @@ -228289,31 +227834,6 @@ self: { }) {}; "pretty-simple" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, containers, criterion - , doctest, Glob, mtl, prettyprinter, prettyprinter-ansi-terminal - , QuickCheck, template-haskell, text, transformers - }: - mkDerivation { - pname = "pretty-simple"; - version = "4.0.0.0"; - sha256 = "1srvx854ml2gffnkxr2fm12xk8syjsk078rfzrq0a3idwgv46myw"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base containers mtl prettyprinter prettyprinter-ansi-terminal text - transformers - ]; - testHaskellDepends = [ - base doctest Glob QuickCheck template-haskell - ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "pretty printer for data types with a 'Show' instance"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.cdepillabout ]; - }) {}; - - "pretty-simple_4_1_2_0" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, criterion , doctest, Glob, mtl, optparse-applicative, prettyprinter , prettyprinter-ansi-terminal, QuickCheck, template-haskell, text @@ -228337,7 +227857,6 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "pretty printer for data types with a 'Show' instance"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "pretty-simple"; maintainers = [ lib.maintainers.cdepillabout ]; }) {}; @@ -228676,8 +228195,6 @@ self: { benchmarkHaskellDepends = [ base criterion ghc-prim spoon ]; description = "Catch errors thrown from pure computations using primops"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "prim-uniq" = callPackage @@ -228913,7 +228430,6 @@ self: { description = "containers backed by arrays"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "primitive-convenience" = callPackage @@ -229035,6 +228551,17 @@ self: { broken = true; }) {}; + "primitive-slice" = callPackage + ({ mkDerivation, base, primitive, primitive-unlifted }: + mkDerivation { + pname = "primitive-slice"; + version = "0.1.0.0"; + sha256 = "07bwpvqvv42x9dz4wb1k6nia9pj0d406k0apgkxyxhvd6wwk0hxz"; + libraryHaskellDepends = [ base primitive primitive-unlifted ]; + description = "Slices of primitive arrays"; + license = lib.licenses.bsd3; + }) {}; + "primitive-sort" = callPackage ({ mkDerivation, base, containers, contiguous, doctest, gauge , ghc-prim, HUnit, primitive, QuickCheck, random, smallcheck, tasty @@ -229042,16 +228569,20 @@ self: { }: mkDerivation { pname = "primitive-sort"; - version = "0.1.1.0"; - sha256 = "0ixx8cvjzsl93lr6pxppyiv12rgwaxh5xv4m56f6b81cxqdx97f2"; + version = "0.1.2.0"; + sha256 = "0nalkfycg9fpvwi8h2a4k31wmmn1ny16b43kj75gxcpmbc4x6azz"; libraryHaskellDepends = [ base contiguous ghc-prim primitive ]; testHaskellDepends = [ base containers doctest HUnit primitive QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; - benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ]; + benchmarkHaskellDepends = [ + base contiguous gauge ghc-prim primitive random + ]; description = "Sort primitive arrays"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "primitive-stablename" = callPackage @@ -229091,26 +228622,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "primitive-unlifted_1_0_0_0" = callPackage - ({ mkDerivation, array, base, bytestring, primitive, QuickCheck - , quickcheck-classes-base, stm, tasty, tasty-quickcheck, text-short - }: - mkDerivation { - pname = "primitive-unlifted"; - version = "1.0.0.0"; - sha256 = "07b53730nxzqyhac71xxijg598304ppb7wa8lfhw1glicj9h0wad"; - libraryHaskellDepends = [ - array base bytestring primitive text-short - ]; - testHaskellDepends = [ - base primitive QuickCheck quickcheck-classes-base stm tasty - tasty-quickcheck - ]; - description = "Primitive GHC types with unlifted types inside"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "primula-board" = callPackage ({ mkDerivation, base, ConfigFile, containers, directory, happstack , happstack-helpers, happstack-server, happstack-state, hsp @@ -229438,8 +228949,8 @@ self: { ({ mkDerivation, base, containers, hspec, random }: mkDerivation { pname = "prob"; - version = "0.1.0.0"; - sha256 = "1y0xfcjpkg72nj3rp6pfwjxdwqf74hdi30h1ih198kkpa0nsazyh"; + version = "0.1.1"; + sha256 = "0ra2g9l5lir5j0z9c2j8n4gqyxdfkj8v4qdbm7z6b6l9ii2lq8cn"; libraryHaskellDepends = [ base containers random ]; testHaskellDepends = [ base hspec ]; description = "Discrete probability monad"; @@ -229690,7 +229201,6 @@ self: { libraryHaskellDepends = [ base directory mmsyn3 process sublists ]; description = "A test suite for the complex multi files multi level processment"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "process-streaming" = callPackage @@ -230249,6 +229759,7 @@ self: { description = "A project initialization library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "project-m36" = callPackage @@ -230325,6 +229836,7 @@ self: { description = "Relational Algebra Engine"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "project-template" = callPackage @@ -230582,6 +230094,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "test"; + broken = true; }) {}; "prometheus-metrics-ghc" = callPackage @@ -230614,6 +230127,8 @@ self: { ]; description = "Export metrics from /proc for the current process"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "prometheus-wai-middleware" = callPackage @@ -230694,6 +230209,29 @@ self: { broken = true; }) {}; + "proof-assistant-bot" = callPackage + ({ mkDerivation, Agda, async, base, bytestring, dhall, directory + , filepath, mtl, process, rzk, stm, telegram-bot-simple, text, unix + , unordered-containers + }: + mkDerivation { + pname = "proof-assistant-bot"; + version = "0.2.0"; + sha256 = "1sks81xaxzz76ajcki43jy7a95d6lc5ijj3xgl5slmjd5m4fmwyc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + Agda async base bytestring dhall directory filepath mtl process rzk + stm telegram-bot-simple text unix unordered-containers + ]; + executableHaskellDepends = [ base ]; + description = "Telegram bot for proof assistants"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "proof-assistant-bot"; + broken = true; + }) {rzk = null;}; + "proof-combinators" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -230712,8 +230250,8 @@ self: { }: mkDerivation { pname = "prop-unit"; - version = "0.1.0"; - sha256 = "1sz04samdhac9czcym2rra5fgncccvj6hjsymljxsvgcs2h7429i"; + version = "0.1.1"; + sha256 = "0adxa0fkrvp9jgcqv4919g59alc4a6p9lnv3r647hf4mjlywgvkg"; libraryHaskellDepends = [ base hedgehog tasty tasty-hedgehog ]; testHaskellDepends = [ base hedgehog tasty tasty-hedgehog tasty-hunit @@ -230757,8 +230295,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.14.1"; - sha256 = "1lbqd4mj8mjk1l2pcqjw214w9znnp9mbs8z7dxi5spd819vw0d2d"; + version = "5.15"; + sha256 = "0106ayiadnam0mz1836la0fya4s82cv591r3vc6cdyafzpjzjphk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230929,8 +230467,8 @@ self: { }: mkDerivation { pname = "proteaaudio"; - version = "0.9.2"; - sha256 = "0wrahbiq7pa7bg0x7z9ynmy9ap30rj0lldgc2m7b49zhj43kax83"; + version = "0.9.3"; + sha256 = "12572f2pwn3akzwqi83p734jabrfinr7bb89yhinl8pari7lya7k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -230939,6 +230477,8 @@ self: { libraryToolDepends = [ c2hs ]; description = "Simple audio library for Windows, Linux, OSX"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {libpulse = null; libpulse-simple = null; inherit (pkgs) libpulseaudio;}; @@ -230946,8 +230486,8 @@ self: { ({ mkDerivation, base, bytestring, c2hs, SDL2 }: mkDerivation { pname = "proteaaudio-sdl"; - version = "0.9.2"; - sha256 = "0qn6rnv4wc0g8s2mnsx71281nmgi29gnnnbskzy1kbzrwxlshrcc"; + version = "0.9.3"; + sha256 = "117fn2a5821ifl4yv94bwiylbnbhriqgjdl9c4685z98m0n9ryap"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -230956,6 +230496,8 @@ self: { libraryToolDepends = [ c2hs ]; description = "Simple audio library for SDL"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) SDL2;}; "proteome" = callPackage @@ -231073,8 +230615,8 @@ self: { }: mkDerivation { pname = "proto-lens-jsonpb"; - version = "0.2.1"; - sha256 = "0ax5zkg9qa7mh4x38nchahr1n1x2wyaasplknig4hgza7xkcmmas"; + version = "0.2.2"; + sha256 = "1vbaq2qzva5in2fq0nlka39pqgm0xwsqdfjxikhiw8sx7aj7biy3"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring proto-lens-runtime text vector @@ -231256,6 +230798,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "protobuf-builder" = callPackage + ({ mkDerivation, array-builder, base, bytebuild, byteslice + , bytestring, natural-arithmetic, primitive, run-st, text-short + , zigzag + }: + mkDerivation { + pname = "protobuf-builder"; + version = "0.1.0.0"; + sha256 = "0qv7vhg250sfah13likpj4jqkldr8lqvcxvlajp2cx3k69sfv1f9"; + libraryHaskellDepends = [ + array-builder base bytebuild byteslice bytestring + natural-arithmetic primitive run-st text-short zigzag + ]; + description = "Slow protobuf implementation"; + license = lib.licenses.bsd3; + }) {}; + "protobuf-native" = callPackage ({ mkDerivation, base, bytestring, cereal, cplusplus-th, criterion , hprotoc-fork, protobuf, protocol-buffers-fork, QuickCheck @@ -231335,6 +230894,8 @@ self: { ]; description = "Parse Google Protocol Buffer specifications"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "protocol-buffers-descriptor" = callPackage @@ -231351,6 +230912,7 @@ self: { ]; description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "protocol-buffers-descriptor-fork" = callPackage @@ -231626,7 +231188,9 @@ self: { ]; description = "Prune unused Haskell dependencies"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "prune-juice"; + broken = true; }) {}; "psc-ide" = callPackage @@ -231721,6 +231285,8 @@ self: { ]; description = "Yet another custom Prelude"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "psql" = callPackage @@ -231979,6 +231545,8 @@ self: { ]; description = "Pipe stdin to a redis pub/sub channel"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "publicsuffix" = callPackage @@ -232115,7 +231683,6 @@ self: { description = "A library for Google/SixApart pubsub hub interaction"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "puffytools" = callPackage @@ -232502,6 +232069,7 @@ self: { ]; description = "types and parser for email messages (including MIME)"; license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "purenix" = callPackage @@ -232550,75 +232118,70 @@ self: { }) {}; "purescript" = callPackage - ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty - , ansi-terminal, ansi-wl-pprint, array, base, blaze-html - , bower-json, boxes, bytestring, Cabal, cborg, cheapskate, clock - , containers, cryptonite, data-ordlist, deepseq, directory, dlist - , edit-distance, exceptions, file-embed, filepath, fsnotify - , generic-random, gitrev, Glob, happy, haskeline, hspec - , hspec-discover, http-types, HUnit, language-javascript, lens - , lifted-async, lifted-base, memory, monad-control, monad-logger - , monoidal-containers, mtl, network, newtype, optparse-applicative - , parallel, parsec, pattern-arrows, process, protolude, QuickCheck - , regex-base, regex-tdfa, safe, scientific, semialign, semigroups - , serialise, sourcemap, split, stm, stringsearch, syb, text, these - , time, transformers, transformers-base, transformers-compat - , typed-process, unordered-containers, utf8-string, vector - , witherable + ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal + , ansi-wl-pprint, array, base, blaze-html, bower-json, boxes + , bytestring, Cabal, cborg, cheapskate, clock, containers + , cryptonite, data-ordlist, deepseq, directory, dlist + , edit-distance, exceptions, file-embed, filepath, generic-random + , gitrev, Glob, happy, haskeline, hspec, hspec-discover, HUnit + , language-javascript, lens, lifted-async, lifted-base, memory + , monad-control, monad-logger, monoidal-containers, mtl, network + , newtype, optparse-applicative, parallel, parsec, pattern-arrows + , process, protolude, QuickCheck, regex-base, regex-tdfa, safe + , scientific, semialign, semigroups, serialise, sourcemap, split + , stm, stringsearch, template-haskell, text, these, time + , transformers, transformers-base, typed-process, utf8-string + , vector, witherable }: mkDerivation { pname = "purescript"; - version = "0.15.6"; - sha256 = "19p8jzn76vc5w4g95y36vfhih1s5kq12dvczvfb7zkmn3n6n3g3m"; + version = "0.15.7"; + sha256 = "1krjkgmxpfqf5a1jqs7qbg6r7ball1464zw6vgrdfzl9057c6l4f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-better-errors aeson-pretty ansi-terminal array base - blaze-html bower-json boxes bytestring Cabal cborg cheapskate clock - containers cryptonite data-ordlist deepseq directory dlist - edit-distance file-embed filepath fsnotify Glob haskeline - language-javascript lens lifted-async lifted-base memory - monad-control monad-logger monoidal-containers mtl parallel parsec - pattern-arrows process protolude regex-tdfa safe scientific - semialign semigroups serialise sourcemap split stm stringsearch syb - text these time transformers transformers-base transformers-compat - typed-process unordered-containers utf8-string vector witherable + aeson aeson-better-errors ansi-terminal array base blaze-html + bower-json boxes bytestring Cabal cborg cheapskate clock containers + cryptonite data-ordlist deepseq directory dlist edit-distance + file-embed filepath Glob haskeline language-javascript lens + lifted-async lifted-base memory monad-control monad-logger + monoidal-containers mtl parallel parsec pattern-arrows process + protolude regex-tdfa safe scientific semialign semigroups serialise + sourcemap stm stringsearch template-haskell text these time + transformers transformers-base utf8-string vector witherable ]; libraryToolDepends = [ happy ]; executableHaskellDepends = [ - aeson aeson-better-errors aeson-pretty ansi-terminal ansi-wl-pprint - array base blaze-html bower-json boxes bytestring Cabal cborg - cheapskate clock containers cryptonite data-ordlist deepseq - directory dlist edit-distance exceptions file-embed filepath - fsnotify gitrev Glob haskeline http-types language-javascript lens - lifted-async lifted-base memory monad-control monad-logger - monoidal-containers mtl network optparse-applicative parallel - parsec pattern-arrows process protolude regex-tdfa safe scientific - semialign semigroups serialise sourcemap split stm stringsearch syb - text these time transformers transformers-base transformers-compat - typed-process unordered-containers utf8-string vector witherable + aeson aeson-better-errors ansi-terminal ansi-wl-pprint array base + blaze-html bower-json boxes bytestring Cabal cborg cheapskate clock + containers cryptonite data-ordlist deepseq directory dlist + edit-distance exceptions file-embed filepath gitrev Glob haskeline + language-javascript lens lifted-async lifted-base memory + monad-control monad-logger monoidal-containers mtl network + optparse-applicative parallel parsec pattern-arrows process + protolude regex-tdfa safe scientific semialign semigroups serialise + sourcemap stm stringsearch template-haskell text these time + transformers transformers-base utf8-string vector witherable ]; executableToolDepends = [ happy ]; testHaskellDepends = [ - aeson aeson-better-errors aeson-pretty ansi-terminal array base - blaze-html bower-json boxes bytestring Cabal cborg cheapskate clock - containers cryptonite data-ordlist deepseq directory dlist - edit-distance file-embed filepath fsnotify generic-random Glob - haskeline hspec HUnit language-javascript lens lifted-async - lifted-base memory monad-control monad-logger monoidal-containers - mtl newtype parallel parsec pattern-arrows process protolude - QuickCheck regex-base regex-tdfa safe scientific semialign - semigroups serialise sourcemap split stm stringsearch syb text - these time transformers transformers-base transformers-compat - typed-process unordered-containers utf8-string vector witherable + aeson aeson-better-errors ansi-terminal array base blaze-html + bower-json boxes bytestring Cabal cborg cheapskate clock containers + cryptonite data-ordlist deepseq directory dlist edit-distance + file-embed filepath generic-random Glob haskeline hspec HUnit + language-javascript lens lifted-async lifted-base memory + monad-control monad-logger monoidal-containers mtl newtype parallel + parsec pattern-arrows process protolude QuickCheck regex-base + regex-tdfa safe scientific semialign semigroups serialise sourcemap + split stm stringsearch template-haskell text these time + transformers transformers-base typed-process utf8-string vector + witherable ]; testToolDepends = [ happy hspec-discover ]; doCheck = false; description = "PureScript Programming Language Compiler"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "purs"; - broken = true; }) {}; "purescript-ast" = callPackage @@ -232636,6 +232199,8 @@ self: { ]; description = "PureScript Programming Language Abstract Syntax Tree"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "purescript-bridge" = callPackage @@ -232693,6 +232258,8 @@ self: { libraryToolDepends = [ happy ]; description = "PureScript Programming Language Concrete Syntax Tree"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "purescript-iso" = callPackage @@ -232858,7 +232425,6 @@ self: { testHaskellDepends = [ aeson base hspec ]; description = "Send push notifications to mobile iOS devices"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "sendapn"; }) {}; @@ -233176,8 +232742,6 @@ self: { ]; description = "Fast persistent vectors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pvss" = callPackage @@ -233361,6 +232925,8 @@ self: { pname = "qbe"; version = "1.1.0.0"; sha256 = "0hjllz846a7dyfrvjgqhjlkbhzbwhqdrvn3x0hijly01allcypr2"; + revision = "1"; + editedCabalFile = "0sxss7jkdp2g01wsgwb3zyrbd5bc5lcjd6vg5ygfci8bx1ikhjkc"; libraryHaskellDepends = [ base bytestring deepseq hashable prettyprinter text text-short ]; @@ -233369,8 +232935,6 @@ self: { ]; description = "Types and prettyprinter for the IL of the QBE compiler backend"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "qc-oi-testgenerator" = callPackage @@ -233609,7 +233173,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "qnap-decrypt"; - broken = true; }) {}; "qq-literals" = callPackage @@ -233695,6 +233258,8 @@ self: { libraryHaskellDepends = [ array base containers mtl vector ]; description = "QR Code library in pure Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "qrcode-core" = callPackage @@ -233776,6 +233341,7 @@ self: { librarySystemDepends = [ qtbase ]; description = "Qt bindings for Haskell - C++ library"; license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs.qt5) qtbase;}; "qtah-examples" = callPackage @@ -233815,6 +233381,7 @@ self: { executableHaskellDepends = [ base ]; description = "Generator for Qtah Qt bindings"; license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "qtah-generator"; }) {}; @@ -233883,6 +233450,8 @@ self: { testHaskellDepends = [ base text ]; description = "GHC plugin to automatically insert qualified imports"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "quandl-api" = callPackage @@ -233923,7 +233492,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "example"; - broken = true; }) {}; "quantification" = callPackage @@ -234057,7 +233625,6 @@ self: { license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "qudb"; - broken = true; }) {}; "quenya-verb" = callPackage @@ -234252,7 +233819,6 @@ self: { testHaskellDepends = [ base bytestring tasty tasty-hunit ]; description = "queue sheet utility"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "queue-sheet"; }) {}; @@ -234368,6 +233934,7 @@ self: { testHaskellDepends = [ base ]; description = "quick & easy benchmarking of command-line programs"; license = "GPL"; + hydraPlatforms = lib.platforms.none; mainProgram = "quickbench"; }) {}; @@ -234388,6 +233955,7 @@ self: { description = "QuickBooks API binding"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "quickcheck-arbitrary-adt" = callPackage @@ -234480,7 +234048,6 @@ self: { sha256 = "0qdjls949kmcv8wj3a27p4dz8nb1dq4i99zizkw7qyqn47r9ccxd"; libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "quickcheck-dynamic" = callPackage @@ -234563,8 +234130,8 @@ self: { }: mkDerivation { pname = "quickcheck-lockstep"; - version = "0.2.0"; - sha256 = "1vc0ry2qp4c99pql6mgb4csffsjs9qgwciz58g68wbrjqp7rgm2w"; + version = "0.2.1"; + sha256 = "1kw5bp9yih8z3z7plczwld5xdg46slylszmpd63d2fiq2fx7ii7r"; libraryHaskellDepends = [ base constraints containers mtl QuickCheck quickcheck-dynamic ]; @@ -234574,6 +234141,31 @@ self: { ]; description = "Library for lockstep-style testing with 'quickcheck-dynamic'"; license = lib.licenses.bsd3; + }) {}; + + "quickcheck-monoid-subclasses" = callPackage + ({ mkDerivation, base, bytestring, commutative-semigroups + , containers, hspec, hspec-discover, monoid-subclasses, pretty-show + , QuickCheck, quickcheck-classes, quickcheck-instances + , semigroupoids, text, vector + }: + mkDerivation { + pname = "quickcheck-monoid-subclasses"; + version = "0.0.0.1"; + sha256 = "1x1jza5s1v89ik0h5m3kla5qwgh05j5dbd7f2m2miwyy1b75bqly"; + libraryHaskellDepends = [ + base containers monoid-subclasses pretty-show QuickCheck + quickcheck-classes quickcheck-instances semigroupoids + ]; + testHaskellDepends = [ + base bytestring commutative-semigroups containers hspec + monoid-subclasses QuickCheck quickcheck-classes + quickcheck-instances text vector + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Testing monoid subclass instances with QuickCheck"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234877,6 +234469,7 @@ self: { description = "Utilities for using WebDriver with QuickCheck"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "quickcheck-with-counterexamples" = callPackage @@ -235607,8 +235200,8 @@ self: { }: mkDerivation { pname = "raaz"; - version = "0.3.6"; - sha256 = "0h6jc7093r9z729pmy0p9rsyg6nz3yksrkmj2pn6n6ddyw0cfp21"; + version = "0.3.7"; + sha256 = "1sx2p1xqash0737z0s5hg2848j9zf02941ksmwd7dlmfaz35x57h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -235767,6 +235360,8 @@ self: { ]; description = "Radix tree data structive over short byte-strings"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "radixtree" = callPackage @@ -236172,7 +235767,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "randfile"; - broken = true; }) {}; "rando" = callPackage @@ -236331,7 +235925,6 @@ self: { description = "Additional functions for random values"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "random-fu" = callPackage @@ -236420,6 +236013,8 @@ self: { ]; description = "Generic basis for random number generators"; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "random-stream" = callPackage @@ -236449,6 +236044,8 @@ self: { ]; description = "Generate a random base 16, 58, or 64 string"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "random-strings" = callPackage @@ -236615,6 +236212,19 @@ self: { testHaskellDepends = [ base doctest typecheck-plugin-nat-simple ]; description = "The list like structure whose length or range of length can be specified"; license = lib.licenses.bsd3; + }) {}; + + "ranged-list_0_1_2_1" = callPackage + ({ mkDerivation, base, doctest, typecheck-plugin-nat-simple }: + mkDerivation { + pname = "ranged-list"; + version = "0.1.2.1"; + sha256 = "0higq2v525f0i4fwckcq16lf0ig85hlkhiqz0cc3ipanwap8wr6n"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base typecheck-plugin-nat-simple ]; + testHaskellDepends = [ base doctest typecheck-plugin-nat-simple ]; + description = "The list like structure whose length or range of length can be specified"; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -236702,27 +236312,6 @@ self: { }) {}; "rank2classes" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest - , markdown-unlit, tasty, tasty-hunit, template-haskell - , transformers - }: - mkDerivation { - pname = "rank2classes"; - version = "1.4.4"; - sha256 = "0c220gxk7dzn2gb0g34bvjjwjw5ir5i8qa089mcpyqqaba8jzxaw"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base distributive template-haskell transformers - ]; - testHaskellDepends = [ - base distributive doctest tasty tasty-hunit - ]; - testToolDepends = [ markdown-unlit ]; - description = "standard type constructor class hierarchy, only with methods of rank 2 types"; - license = lib.licenses.bsd3; - }) {}; - - "rank2classes_1_4_6" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, data-functor-logistic , distributive, doctest, markdown-unlit, tasty, tasty-hunit , template-haskell, transformers @@ -236742,7 +236331,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "standard type constructor class hierarchy, only with methods of rank 2 types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "rapid" = callPackage @@ -237037,8 +236625,8 @@ self: { ({ mkDerivation, base, stm, time, time-units }: mkDerivation { pname = "rate-limit"; - version = "1.4.2"; - sha256 = "0zb19vwzyj1vg890776r3bprmjzhs9kr2r1vqa42nxv9nvwvnljm"; + version = "1.4.3"; + sha256 = "0xhksvhl0cr5kfvdfnlk78jrn4kvj2h54x19ixp356b4xxijdy9x"; libraryHaskellDepends = [ base stm time time-units ]; description = "A basic library for rate-limiting IO actions"; license = lib.licenses.bsd3; @@ -237125,6 +236713,7 @@ self: { description = "Client for rating.chgk.info API and CSV tables (documentation in Russian)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rating-systems" = callPackage @@ -237208,8 +236797,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "11.2.4"; - sha256 = "0cqk2sfh4brm94zvy3d23khxl2x7zrjc0c62ww96549qpvp8za4y"; + version = "11.2.14"; + sha256 = "0r879vbdhv77l14wzv03s8hlhmmzzfl6igkwnclr9lq8ncbafrxm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -237225,14 +236814,14 @@ self: { broken = true; }) {}; - "rattletrap_11_2_14" = callPackage + "rattletrap_12_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , containers, filepath, http-client, http-client-tls, text }: mkDerivation { pname = "rattletrap"; - version = "11.2.14"; - sha256 = "0r879vbdhv77l14wzv03s8hlhmmzzfl6igkwnclr9lq8ncbafrxm"; + version = "12.0.0"; + sha256 = "0l20d9m84mn6gkmi7hii0q80rs7nzhbmwp1dx3i5jkww42ixbyfi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -237359,6 +236948,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "raylib-imgui" = callPackage + ({ mkDerivation, base, h-raylib }: + mkDerivation { + pname = "raylib-imgui"; + version = "4.5.0.9"; + sha256 = "1b2363czcxzg22d5mjr6y480lzv82v0hkyabq7821zgb9y5v3879"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base h-raylib ]; + description = "Haskell bindings for rlImGui"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "raz" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, MonadRandom , random, transformers @@ -237538,8 +237142,6 @@ self: { ]; description = "Representation and Incremental Processing of RDF Data"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rdf4h" = callPackage @@ -238206,6 +237808,8 @@ self: { ]; description = "Vinyl-based reader-like monad composition"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "readline" = callPackage @@ -238471,27 +238075,6 @@ self: { }) {}; "rebase" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, comonad, containers - , contravariant, deepseq, dlist, either, groups, hashable - , invariant, mtl, profunctors, scientific, selective, semigroupoids - , stm, text, time, time-compat, transformers, unordered-containers - , uuid-types, vector, vector-instances, void - }: - mkDerivation { - pname = "rebase"; - version = "1.15.0.3"; - sha256 = "1dck3800mz307jriz6mcv2dn2lwglgvlpiiy759xn56774h503zj"; - libraryHaskellDepends = [ - base bifunctors bytestring comonad containers contravariant deepseq - dlist either groups hashable invariant mtl profunctors scientific - selective semigroupoids stm text time time-compat transformers - unordered-containers uuid-types vector vector-instances void - ]; - description = "A more progressive alternative to the \"base\" package"; - license = lib.licenses.mit; - }) {}; - - "rebase_1_16_1" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, deepseq, dlist, either, groups, hashable , invariant, mtl, profunctors, scientific, selective, semigroupoids @@ -238512,7 +238095,6 @@ self: { ]; description = "A more progressive alternative to the \"base\" package"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "rebindable" = callPackage @@ -238703,8 +238285,6 @@ self: { ]; testHaskellDepends = [ base time ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "record-operations" = callPackage @@ -238806,6 +238386,8 @@ self: { ]; description = "Record subtyping and record utilities with generics-sop"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "records-th" = callPackage @@ -238864,10 +238446,8 @@ self: { }: mkDerivation { pname = "recursion-schemes"; - version = "5.2.2.2"; - sha256 = "018l7j9pk8izi817vqyrakrkjsxr332jh24d6j0yl35i5wm4khv6"; - revision = "1"; - editedCabalFile = "1l6wbzx8804pb6p8gvk45hal6sz8r1gvyxb8aa9ih6j8pqv4q04c"; + version = "5.2.2.3"; + sha256 = "04233y5qw7vm0kyh4h44zpfk2zsd6kz9081ngvi098y0xiphrwm9"; libraryHaskellDepends = [ base base-orphans comonad containers data-fix free template-haskell th-abstraction transformers @@ -238894,8 +238474,6 @@ self: { ]; description = "Amateur addenda to recursion-schemes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "recursion-schemes-ix" = callPackage @@ -238913,7 +238491,6 @@ self: { description = "Recursion schemes over indexed Functors"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "recursive-line-count" = callPackage @@ -239121,6 +238698,24 @@ self: { license = lib.licenses.mit; }) {}; + "redis-glob" = callPackage + ({ mkDerivation, ascii-char, ascii-superset, base, bytestring + , hspec, megaparsec, QuickCheck + }: + mkDerivation { + pname = "redis-glob"; + version = "0.1.0.4"; + sha256 = "0w1w76ldiaxk4irgazm6xv5s60zvyyvjfsxbpa3b0aq4jgw49gh5"; + libraryHaskellDepends = [ ascii-char base bytestring megaparsec ]; + testHaskellDepends = [ + ascii-char ascii-superset base bytestring hspec QuickCheck + ]; + description = "Specify valid redis globs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "redis-hs" = callPackage ({ mkDerivation, base, bytestring, network, utf8-string }: mkDerivation { @@ -239160,6 +238755,7 @@ self: { ]; description = "Yet another redis client"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; }) {}; "redis-job-queue" = callPackage @@ -239232,6 +238828,7 @@ self: { ]; description = "Combine redis caching and haxl"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "redland" = callPackage @@ -239390,6 +238987,8 @@ self: { ]; description = "Extra stuff for mutable references"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ref-fd" = callPackage @@ -239516,23 +239115,6 @@ self: { }) {}; "refined" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions - , hashable, mtl, QuickCheck, template-haskell, text, these-skinny - }: - mkDerivation { - pname = "refined"; - version = "0.6.3"; - sha256 = "1fpbwzr3q9fmkdghpap0zm56bi9wj6n6k0ys5b8ci5xhz25mrd4g"; - libraryHaskellDepends = [ - aeson base bytestring deepseq exceptions hashable mtl QuickCheck - template-haskell text these-skinny - ]; - testHaskellDepends = [ base QuickCheck ]; - description = "Refinement types with static and runtime checking"; - license = lib.licenses.mit; - }) {}; - - "refined_0_8" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions , hashable, mtl, QuickCheck, template-haskell, text, these-skinny }: @@ -239547,7 +239129,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Refinement types with static and runtime checking"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "refined-http-api-data" = callPackage @@ -239638,46 +239219,6 @@ self: { }) {}; "reflex" = callPackage - ({ mkDerivation, base, bifunctors, comonad, constraints - , constraints-extras, containers, criterion, data-default, deepseq - , dependent-map, dependent-sum, directory, exception-transformers - , filemanip, filepath, haskell-src-exts, haskell-src-meta, hlint - , hspec, lens, loch-th, MemoTrie, mmorph, monad-control - , monoidal-containers, mtl, patch, prim-uniq, primitive, process - , proctest, profunctors, random, ref-tf, reflection, semialign - , semigroupoids, split, stm, syb, template-haskell, text, these - , these-lens, time, transformers, unbounded-delays, witherable - }: - mkDerivation { - pname = "reflex"; - version = "0.8.2.0"; - sha256 = "1hvagxcs413bqairxf77vp19484mxnbfckhd44wv22ncwfh5mq6d"; - revision = "3"; - editedCabalFile = "1sax4fx7pgn85dvih4y6mnvhdq8nssan1rcys5kdfhirnr4vgn1m"; - libraryHaskellDepends = [ - base bifunctors comonad constraints constraints-extras containers - data-default dependent-map dependent-sum exception-transformers - haskell-src-exts haskell-src-meta lens MemoTrie mmorph - monad-control monoidal-containers mtl patch prim-uniq primitive - profunctors random ref-tf reflection semialign semigroupoids stm - syb template-haskell these time transformers unbounded-delays - witherable - ]; - testHaskellDepends = [ - base bifunctors constraints constraints-extras containers deepseq - dependent-map dependent-sum directory filemanip filepath hlint - hspec lens monoidal-containers mtl patch proctest ref-tf semialign - split text these these-lens transformers witherable - ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq dependent-map dependent-sum - loch-th mtl primitive process ref-tf split stm time transformers - ]; - description = "Higher-order Functional Reactive Programming"; - license = lib.licenses.bsd3; - }) {}; - - "reflex_0_8_2_1" = callPackage ({ mkDerivation, base, bifunctors, commutative-semigroups, comonad , constraints, constraints-extras, containers, criterion , data-default, deepseq, dependent-map, dependent-sum, directory @@ -239691,8 +239232,49 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.8.2.1"; - sha256 = "1w8smiwn86cxb3fsfgyzxpk11hryhxi6g94m52grmnx6vhc7sm6v"; + version = "0.8.2.2"; + sha256 = "1add5bcsyq2k02w2q0ifbyfcvcic1hmjdbgxg8ajd5riam0lhb16"; + libraryHaskellDepends = [ + base bifunctors commutative-semigroups comonad constraints + constraints-extras containers data-default dependent-map + dependent-sum exception-transformers haskell-src-exts + haskell-src-meta lens MemoTrie mmorph monad-control + monoidal-containers mtl patch prim-uniq primitive profunctors + random ref-tf reflection semialign semigroupoids stm syb + template-haskell these time transformers unbounded-delays + witherable + ]; + testHaskellDepends = [ + base bifunctors commutative-semigroups constraints + constraints-extras containers deepseq dependent-map dependent-sum + directory filemanip filepath hlint hspec lens monoidal-containers + mtl patch proctest ref-tf semialign split text these these-lens + transformers witherable + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq dependent-map dependent-sum + loch-th mtl primitive process ref-tf split stm time transformers + ]; + description = "Higher-order Functional Reactive Programming"; + license = lib.licenses.bsd3; + }) {}; + + "reflex_0_9_0_0" = callPackage + ({ mkDerivation, base, bifunctors, commutative-semigroups, comonad + , constraints, constraints-extras, containers, criterion + , data-default, deepseq, dependent-map, dependent-sum, directory + , exception-transformers, filemanip, filepath, haskell-src-exts + , haskell-src-meta, hlint, hspec, lens, loch-th, MemoTrie, mmorph + , monad-control, monoidal-containers, mtl, patch, prim-uniq + , primitive, process, proctest, profunctors, random, ref-tf + , reflection, semialign, semigroupoids, split, stm, syb + , template-haskell, text, these, these-lens, time, transformers + , unbounded-delays, witherable + }: + mkDerivation { + pname = "reflex"; + version = "0.9.0.0"; + sha256 = "0g22b2bkv6l2m7aiz7kqi3x572qhzy0hikvpysrq2jffl02by0lm"; libraryHaskellDepends = [ base bifunctors commutative-semigroups comonad constraints constraints-extras containers data-default dependent-map @@ -239755,6 +239337,8 @@ self: { ]; description = "Reflex bindings for TCP sockets"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "reflex-backend-wai" = callPackage @@ -239878,47 +239462,6 @@ self: { }) {}; "reflex-dom-core" = callPackage - ({ mkDerivation, aeson, async, base, bifunctors, bimap - , blaze-builder, bytestring, case-insensitive, chrome-test-utils - , constraints, constraints-extras, containers, contravariant - , data-default, dependent-map, dependent-sum - , dependent-sum-template, directory, exception-transformers - , exceptions, filepath, ghcjs-dom, hlint, hspec, hspec-core - , hspec-webdriver, http-types, HUnit, jsaddle, jsaddle-warp - , keycode, lens, lifted-base, monad-control, mtl, network - , network-uri, primitive, process, random, ref-tf, reflex - , semialign, semigroups, silently, stm, template-haskell, temporary - , text, these, transformers, unix, wai, wai-websockets, warp - , webdriver, websockets, which, zenc - }: - mkDerivation { - pname = "reflex-dom-core"; - version = "0.7.0.1"; - sha256 = "0lhi04i5wfkgblcifah6znkwi6v7294pna48527ns74f0bjc7yy3"; - libraryHaskellDepends = [ - aeson base bifunctors bimap blaze-builder bytestring - case-insensitive constraints containers contravariant data-default - dependent-map dependent-sum dependent-sum-template directory - exception-transformers ghcjs-dom jsaddle keycode lens monad-control - mtl network-uri primitive random ref-tf reflex semialign semigroups - stm template-haskell text these transformers unix zenc - ]; - testHaskellDepends = [ - aeson async base bytestring chrome-test-utils constraints - constraints-extras containers dependent-map dependent-sum - dependent-sum-template directory exceptions filepath ghcjs-dom - hlint hspec hspec-core hspec-webdriver http-types HUnit jsaddle - jsaddle-warp lens lifted-base network process random ref-tf reflex - silently temporary text wai wai-websockets warp webdriver - websockets which - ]; - description = "Functional Reactive Web Apps with Reflex"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {chrome-test-utils = null;}; - - "reflex-dom-core_0_7_0_2" = callPackage ({ mkDerivation, aeson, async, base, bifunctors, bimap , blaze-builder, bytestring, case-insensitive, chrome-test-utils , commutative-semigroups, constraints, constraints-extras @@ -240016,25 +239559,6 @@ self: { }) {}; "reflex-dom-pandoc" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, clay, constraints - , containers, data-default, lens, lens-aeson, modern-uri, mtl - , pandoc-types, ref-tf, reflex, reflex-dom-core, safe, skylighting - , text, time - }: - mkDerivation { - pname = "reflex-dom-pandoc"; - version = "0.6.0.0"; - sha256 = "0dnsvv883jpkflh0319lr52v69ki3vywnrm28zd6m7r8k336mc18"; - libraryHaskellDepends = [ - aeson base binary bytestring clay constraints containers - data-default lens lens-aeson modern-uri mtl pandoc-types ref-tf - reflex reflex-dom-core safe skylighting text time - ]; - description = "Render Pandoc documents to HTML using reflex-dom"; - license = lib.licenses.bsd3; - }) {}; - - "reflex-dom-pandoc_1_0_0_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, constraints , containers, data-default, lens, lens-aeson, mtl, pandoc-types , ref-tf, reflex, reflex-dom-core, safe, skylighting, text, time @@ -240050,7 +239574,6 @@ self: { ]; description = "Render Pandoc documents to HTML using reflex-dom"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reflex-dom-retractable" = callPackage @@ -240171,8 +239694,8 @@ self: { }: mkDerivation { pname = "reflex-gadt-api"; - version = "0.2.2.0"; - sha256 = "1ras7jl1j90a4zd9bnw4x31ykk0ww373kjpkd9sq909i73a7xzxl"; + version = "0.2.2.1"; + sha256 = "042dad8gilpzn1ng4ck5mmca9q257vi9317xxr0in0sp30sn1g11"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -240187,7 +239710,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "readme"; - broken = true; }) {}; "reflex-ghci" = callPackage @@ -240198,8 +239720,8 @@ self: { }: mkDerivation { pname = "reflex-ghci"; - version = "0.1.5.2"; - sha256 = "18w9n6sm9b0ykjxqa800228b7s3y6gg8ckl6jnms3860p0cskpqq"; + version = "0.1.5.4"; + sha256 = "0qp50yscpik3hb2dhga4x9w40vji34hklvcjksnd1a1d512jh485"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -240327,6 +239849,8 @@ self: { description = "Reflex bindings for libtelnet"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "reflex-localize" = callPackage @@ -240405,8 +239929,8 @@ self: { }: mkDerivation { pname = "reflex-process"; - version = "0.3.1.1"; - sha256 = "15f9qn5rx6dwjnkhg5szhagxsj7vnh3bh4ad7j4jsi87m627mlj2"; + version = "0.3.1.2"; + sha256 = "0casszkah49b6n36ymh5ffyhbz1161z5vrlpwisn1r1wb68idm3j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -240494,8 +240018,8 @@ self: { }: mkDerivation { pname = "reflex-vty"; - version = "0.3.0.0"; - sha256 = "1c4v2i54i0a4dq8ywkxax33wz4wzyf4hw5vn2s5hy75m78hq8g6i"; + version = "0.3.1.1"; + sha256 = "0yzp0lvhadh6164k8lmm5464r3x72951vvg4ii4kf848bjxh7iw6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -240666,8 +240190,8 @@ self: { }: mkDerivation { pname = "refurb"; - version = "0.2.3.0"; - sha256 = "09p9i0l59f34k12pbxvi50bxpj2d864n96fr79mq41xm0bhygsjb"; + version = "0.3.0.2"; + sha256 = "09yzk37f2sbmygva12splnxj3z6sy35mz9b6s7w82s1jbvy16zgr"; libraryHaskellDepends = [ ansi-wl-pprint base bytestring classy-prelude composite-base composite-opaleye dlist exceptions fast-logger lens monad-control @@ -240685,6 +240209,7 @@ self: { description = "Tools for maintaining a database"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "reg-alloc" = callPackage @@ -240785,8 +240310,8 @@ self: { pname = "regex-applicative-text"; version = "0.1.0.1"; sha256 = "1ng2qhk4mvpzl8fx91ig7ldv09v9aqdsvn6yl9yjapc6h0ghb4xh"; - revision = "6"; - editedCabalFile = "16a2d8d84gzbjbvs7pc7sz5bi7rz2s5c57gkwi0vf5lmscgjy25h"; + revision = "7"; + editedCabalFile = "0v4k5hvqcabgiiycn4xayg9kahwifqg4nc0m1wkm3ixcywwg8i88"; libraryHaskellDepends = [ base regex-applicative text ]; description = "regex-applicative on text"; license = lib.licenses.bsd3; @@ -241120,9 +240645,7 @@ self: { testHaskellDepends = [ base bytestring tasty tasty-hunit ]; description = "Bindings to Rust's regex library"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.sternenseemann ]; - broken = true; }) {inherit (pkgs) rure;}; "regex-tdfa" = callPackage @@ -241546,6 +241069,37 @@ self: { broken = true; }) {}; + "registry_0_6_0_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph + , MonadRandom, mtl, multimap, protolude, random, resourcet + , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog + , tasty-th, template-haskell, text, transformers-base, universum + , unliftio + }: + mkDerivation { + pname = "registry"; + version = "0.6.0.0"; + sha256 = "1nspxg5aks9ayk6jzybddr0gb2cs9mbjllvrw8q2v7145bf54b72"; + libraryHaskellDepends = [ + base containers exceptions hashable mmorph mtl multimap protolude + resourcet semigroupoids semigroups template-haskell text + transformers-base unliftio + ]; + testHaskellDepends = [ + async base bytestring containers directory exceptions generic-lens + hashable hedgehog io-memoize mmorph MonadRandom mtl multimap + protolude random resourcet semigroupoids semigroups tasty + tasty-discover tasty-hedgehog tasty-th template-haskell text + transformers-base universum unliftio + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling components"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "registry-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hedgehog , protolude, registry, registry-hedgehog, tasty, template-haskell @@ -241569,6 +241123,30 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "registry-aeson_0_3_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hedgehog + , protolude, registry, registry-hedgehog, string-qq, tasty + , template-haskell, text, time, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "registry-aeson"; + version = "0.3.0.0"; + sha256 = "1248mszp2wcj9v2djnfliqqhkmsvixwh6j9qwcjj00wvdb7lmzad"; + libraryHaskellDepends = [ + aeson base bytestring containers protolude registry + template-haskell text transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hedgehog protolude registry + registry-hedgehog string-qq tasty template-haskell text time + transformers unordered-containers vector + ]; + description = "Aeson encoders / decoders"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "registry-hedgehog" = callPackage ({ mkDerivation, base, containers, hedgehog, mmorph, multimap , protolude, registry, tasty, tasty-discover, tasty-hedgehog @@ -241595,6 +241173,32 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "registry-hedgehog_0_8_0_0" = callPackage + ({ mkDerivation, base, containers, hedgehog, mmorph, multimap + , protolude, registry, tasty, tasty-discover, tasty-hedgehog + , tasty-th, template-haskell, text, transformers, universum + , unordered-containers + }: + mkDerivation { + pname = "registry-hedgehog"; + version = "0.8.0.0"; + sha256 = "1nf06yb4kn04b9cmfc7gs4h4b1p952if6x3wyb7ybbpjnhm2k2jw"; + libraryHaskellDepends = [ + base containers hedgehog mmorph multimap protolude registry tasty + tasty-discover tasty-hedgehog tasty-th template-haskell text + transformers universum unordered-containers + ]; + testHaskellDepends = [ + base containers hedgehog mmorph multimap protolude registry tasty + tasty-discover tasty-hedgehog tasty-th template-haskell text + transformers universum unordered-containers + ]; + testToolDepends = [ tasty-discover ]; + description = "utilities to work with Hedgehog generators and `registry`"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "registry-hedgehog-aeson" = callPackage ({ mkDerivation, aeson, base, containers, hedgehog, mmorph , multimap, protolude, registry, registry-hedgehog, scientific @@ -241623,6 +241227,34 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "registry-hedgehog-aeson_0_3_0_0" = callPackage + ({ mkDerivation, aeson, base, containers, hedgehog, mmorph + , multimap, protolude, registry, registry-hedgehog, scientific + , tasty, tasty-discover, tasty-hedgehog, tasty-th, template-haskell + , text, transformers, universum, unordered-containers, vector + }: + mkDerivation { + pname = "registry-hedgehog-aeson"; + version = "0.3.0.0"; + sha256 = "08k8vdc4hmqnsci2bvacrizlfb98a2yp7h3p5ad8dqn2yhinlbrf"; + libraryHaskellDepends = [ + aeson base containers hedgehog mmorph multimap protolude registry + scientific tasty tasty-discover tasty-hedgehog tasty-th + template-haskell text transformers universum unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base containers hedgehog mmorph multimap protolude registry + registry-hedgehog scientific tasty tasty-discover tasty-hedgehog + tasty-th template-haskell text transformers universum + unordered-containers vector + ]; + testToolDepends = [ tasty-discover ]; + description = "Hedgehog generators for Aeson"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "registry-messagepack" = callPackage ({ mkDerivation, base, containers, msgpack, protolude, registry , registry-hedgehog, tasty, template-haskell, text, time @@ -241630,8 +241262,8 @@ self: { }: mkDerivation { pname = "registry-messagepack"; - version = "0.3.1.0"; - sha256 = "0v1cwgcvs31vpwxpbrbbhfvql7ch99ifs47008wrcdvmahb9h9qz"; + version = "0.4.0.0"; + sha256 = "0xqjw7cav0asdbfar5b60vf785mqqjzaffs8pi7addjk2dyd10dx"; libraryHaskellDepends = [ base containers msgpack protolude registry template-haskell text transformers vector @@ -241670,6 +241302,31 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "registry-options_0_2_0_0" = callPackage + ({ mkDerivation, base, boxes, bytestring, containers, directory + , hedgehog, HsYAML, multimap, protolude, registry + , registry-hedgehog, tasty, template-haskell, text, th-lift, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "registry-options"; + version = "0.2.0.0"; + sha256 = "1qwiabl7w25ji2pnx2wmh57q7w0bvsdi51ibczx90xn1y4y8j6wm"; + libraryHaskellDepends = [ + base boxes bytestring containers HsYAML multimap protolude registry + template-haskell text th-lift transformers unordered-containers + vector + ]; + testHaskellDepends = [ + base boxes bytestring containers directory hedgehog HsYAML multimap + protolude registry registry-hedgehog tasty template-haskell text + th-lift time transformers unordered-containers vector + ]; + description = "application options parsing"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "regress" = callPackage ({ mkDerivation, ad, base, vector }: mkDerivation { @@ -241852,33 +241509,6 @@ self: { }) {}; "rel8" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bytestring - , case-insensitive, comonad, containers, contravariant, hasql - , hasql-transaction, hedgehog, mmorph, opaleye, pretty - , product-profunctors, profunctors, scientific, semialign - , semigroupoids, tasty, tasty-hedgehog, text, these, time - , tmp-postgres, transformers, uuid - }: - mkDerivation { - pname = "rel8"; - version = "1.3.1.0"; - sha256 = "0r1pbci7zl01v485bgbn90m07qrqdzkcpj4mykkdxxla9zlj2m39"; - libraryHaskellDepends = [ - aeson base bifunctors bytestring case-insensitive comonad - contravariant hasql opaleye pretty product-profunctors profunctors - scientific semialign semigroupoids text these time uuid - ]; - testHaskellDepends = [ - base bytestring case-insensitive containers hasql hasql-transaction - hedgehog mmorph scientific tasty tasty-hedgehog text time - tmp-postgres transformers uuid - ]; - description = "Hey! Hey! Can u rel8?"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.sternenseemann ]; - }) {}; - - "rel8_1_4_0_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring , case-insensitive, comonad, containers, contravariant, hasql , hasql-transaction, hedgehog, mmorph, opaleye, pretty @@ -241902,7 +241532,6 @@ self: { ]; description = "Hey! Hey! Can u rel8?"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.sternenseemann ]; }) {}; @@ -241935,8 +241564,6 @@ self: { ]; description = "Sensible RLP encoding"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "relation" = callPackage @@ -241957,6 +241584,8 @@ self: { testToolDepends = [ doctest-discover hspec-discover ]; description = "A data structure representing Relations on Sets"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "relational-postgresql8" = callPackage @@ -242263,27 +241892,6 @@ self: { }) {}; "relude" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , doctest, ghc-prim, Glob, hashable, hedgehog, mtl, stm, text - , transformers, unordered-containers - }: - mkDerivation { - pname = "relude"; - version = "1.0.0.1"; - sha256 = "0cw9a1gfvias4hr36ywdizhysnzbzxy20fb3jwmqmgjy40lzxp2g"; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-prim hashable mtl stm text - transformers unordered-containers - ]; - testHaskellDepends = [ - base bytestring containers doctest Glob hedgehog text - ]; - benchmarkHaskellDepends = [ base criterion unordered-containers ]; - description = "Safe, performant, user-friendly and lightweight Haskell Standard Library"; - license = lib.licenses.mit; - }) {}; - - "relude_1_1_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty-bench, text , transformers, unordered-containers @@ -242304,7 +241912,6 @@ self: { ]; description = "Safe, performant, user-friendly and lightweight Haskell Standard Library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "remark" = callPackage @@ -242740,6 +242347,7 @@ self: { ]; description = "Perform fft with repa via FFTW"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "repa-flow" = callPackage @@ -243164,40 +242772,6 @@ self: { }) {}; "req" = callPackage - ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder - , bytestring, case-insensitive, connection, exceptions, hspec - , hspec-core, hspec-discover, http-api-data, http-client - , http-client-tls, http-types, modern-uri, monad-control, mtl - , QuickCheck, retry, template-haskell, text, time, transformers - , transformers-base, unliftio-core - }: - mkDerivation { - pname = "req"; - version = "3.10.0"; - sha256 = "176zl3ihmp8iz4fwfi5dalmiz658dis0hxni6bqzqgnaxhd0230w"; - revision = "2"; - editedCabalFile = "147q0jkfrg066lnl20gzv5rk6d9jdwyvaip2y4am5hkrvcg3v9z8"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson authenticate-oauth base blaze-builder bytestring - case-insensitive connection exceptions http-api-data http-client - http-client-tls http-types modern-uri monad-control mtl retry - template-haskell text time transformers transformers-base - unliftio-core - ]; - testHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive hspec - hspec-core http-client http-types modern-uri monad-control mtl - QuickCheck retry template-haskell text time - ]; - testToolDepends = [ hspec-discover ]; - doCheck = false; - description = "HTTP client library"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.maralorn ]; - }) {}; - - "req_3_13_0" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder , bytestring, case-insensitive, connection, containers, exceptions , hspec, hspec-core, hspec-discover, http-api-data, http-client @@ -243228,7 +242802,6 @@ self: { doCheck = false; description = "HTTP client library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.maralorn ]; }) {}; @@ -243375,6 +242948,8 @@ self: { ]; description = "Scrap your qualified import clutter"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "requirements" = callPackage @@ -243415,17 +242990,6 @@ self: { }) {}; "rerebase" = callPackage - ({ mkDerivation, rebase }: - mkDerivation { - pname = "rerebase"; - version = "1.15.0.3"; - sha256 = "0jxlssdxgh5ldgkdpmhpk8vy5fxmq95171b3jl57r9m2f7zqrcd2"; - libraryHaskellDepends = [ rebase ]; - description = "Reexports from \"base\" with a bunch of other standard libraries"; - license = lib.licenses.mit; - }) {}; - - "rerebase_1_16_1" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; @@ -243434,34 +242998,9 @@ self: { libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "reroute" = callPackage - ({ mkDerivation, base, criterion, deepseq, graph-core, hashable - , hspec, http-api-data, hvect, mtl, random, regex-compat, text - , unordered-containers, vector - }: - mkDerivation { - pname = "reroute"; - version = "0.6.0.0"; - sha256 = "1jvh5ngpf1w4y9b1ipx1c65q8gmwsajp8k5ha0sjn89hbc8cp48y"; - libraryHaskellDepends = [ - base deepseq hashable http-api-data hvect mtl text - unordered-containers - ]; - testHaskellDepends = [ - base hspec hvect mtl text unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base criterion deepseq graph-core hashable http-api-data hvect mtl - random regex-compat text unordered-containers vector - ]; - description = "abstract implementation of typed and untyped web routing"; - license = lib.licenses.mit; - }) {}; - - "reroute_0_7_0_0" = callPackage ({ mkDerivation, base, criterion, deepseq, graph-core, hashable , hspec, http-api-data, hvect, mtl, random, regex-compat, text , unordered-containers, vector @@ -243483,7 +243022,6 @@ self: { ]; description = "abstract implementation of typed and untyped web routing"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "rescue" = callPackage @@ -243515,6 +243053,8 @@ self: { ]; description = "More understandable exceptions"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "reserve" = callPackage @@ -243541,7 +243081,6 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "reserve"; - broken = true; }) {}; "reservoir" = callPackage @@ -243580,6 +243119,7 @@ self: { executableHaskellDepends = [ base comfort-array lapack ]; description = "Compute total resistance of a cube of resistors"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "resistor-cube"; }) {}; @@ -243740,7 +243280,6 @@ self: { ]; description = "Fork of resource-pool, with a MonadCatchIO constraint"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "resource-pool-fork-avanov" = callPackage @@ -244005,8 +243544,8 @@ self: { }: mkDerivation { pname = "rest-rewrite"; - version = "0.4.0"; - sha256 = "0vvb4jk0s699h4dcdls1yxzyaja1gwpqdchfy5wbg0fybfw94pr5"; + version = "0.4.1"; + sha256 = "0h9s6s9wv8fgs6xi2fqdycybjl8si0w50mlk1zc62dmjdzwxy8dx"; libraryHaskellDepends = [ base containers hashable monad-loops mtl parsec process QuickCheck text time unordered-containers @@ -244316,10 +243855,9 @@ self: { description = "RethinkDB driver for Haskell"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; - "retrie" = callPackage + "retrie_1_1_0_0" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , data-default, deepseq, directory, filepath, ghc, ghc-exactprint , ghc-paths, haskell-src-exts, HUnit, list-t, mtl @@ -244348,9 +243886,10 @@ self: { ]; description = "A powerful, easy-to-use codemodding tool for Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; - "retrie_1_2_0_1" = callPackage + "retrie" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , data-default, deepseq, directory, exceptions, filepath, ghc , ghc-exactprint, ghc-paths, haskell-src-exts, HUnit, list-t, mtl @@ -244359,10 +243898,8 @@ self: { }: mkDerivation { pname = "retrie"; - version = "1.2.0.1"; - sha256 = "1n3g9wr45xz1q2mhlj1r2709rqakczrvd7x6vxh7iapz43f69c6x"; - revision = "2"; - editedCabalFile = "0h6r4jg9mnqwvlsl3s6yl2zvhkwr8pdypbzvky4kwz4zvc03j5ql"; + version = "1.2.1.1"; + sha256 = "1axz2kdp6ljwiy8zvj33r6dbhgcglf0qlcq4s5f4bx4djsqwgavl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -244380,7 +243917,6 @@ self: { ]; description = "A powerful, easy-to-use codemodding tool for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "retroclash-lib" = callPackage @@ -244401,6 +243937,7 @@ self: { ]; description = "Code shared across the code samples in the book \"Retrocomputing with Clash\""; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "retroclash-sim" = callPackage @@ -244420,6 +243957,7 @@ self: { ]; description = "High-level simulators from the book \"Retrocomputing with Clash\""; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "retry" = callPackage @@ -244549,6 +244087,8 @@ self: { libraryHaskellDepends = [ base containers contiguous deepseq ]; description = "reversed lists/snoc lists"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "reversi" = callPackage @@ -244919,33 +244459,59 @@ self: { }: mkDerivation { pname = "rhine"; - version = "0.8.0.1"; - sha256 = "07cw0xlj0nwbx0wjb3k4hpw5y6ksp25c1fa8xrrbaqv2jspv7z75"; + version = "0.8.1"; + sha256 = "15yklhx5gv8z60ky9ck2rkc9yb9m5jbziwp49a8gk0s03ii8scrz"; libraryHaskellDepends = [ base containers deepseq dunai free MonadRandom random simple-affine-space time time-domain transformers vector-sized ]; description = "Functional Reactive Programming with type-level clocks"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.turion ]; + broken = true; }) {}; "rhine-gloss" = callPackage ({ mkDerivation, base, dunai, gloss, rhine, transformers }: mkDerivation { pname = "rhine-gloss"; - version = "0.8.0.1"; - sha256 = "0qpza2n84illhlmqsz2xqj5k6a3jxb1kb9qhw6gz5fh4p4k8jqyl"; + version = "0.8.1"; + sha256 = "1lai9ii3q069zf49ls6cfdgjgq6njybxax45dqzqnxd59p0p9rrm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai gloss rhine transformers ]; executableHaskellDepends = [ base ]; description = "Gloss backend for Rhine"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "rhine-gloss-gears"; maintainers = [ lib.maintainers.turion ]; }) {}; + "rhine-terminal" = callPackage + ({ mkDerivation, base, dunai, exceptions, hspec, rhine, stm + , terminal, text, time, transformers + }: + mkDerivation { + pname = "rhine-terminal"; + version = "0.8.1"; + sha256 = "1fmmzy8qdyk9c1vv2l2n0xs0f1fw46mcgyzmid60wrgw90h02sp7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base dunai exceptions rhine terminal time transformers + ]; + executableHaskellDepends = [ base rhine terminal text time ]; + testHaskellDepends = [ + base exceptions hspec rhine stm terminal text time transformers + ]; + description = "Terminal backend for Rhine"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "rhine-terminal-simple"; + }) {}; + "rhythm-game-tutorial" = callPackage ({ mkDerivation, base, call, containers, lens, mtl, objective , split @@ -245063,7 +244629,6 @@ self: { description = "Static site generator based on Shake"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rib-core" = callPackage @@ -245085,6 +244650,8 @@ self: { ]; description = "Static site generator based on Shake"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ribbit" = callPackage @@ -245277,11 +244844,10 @@ self: { }: mkDerivation { pname = "ridley"; - version = "0.3.4.0"; - sha256 = "0ml6hcngszn6jnk0qdilxzjzjsn4i36bvr98g61dai5589892j86"; + version = "0.3.4.1"; + sha256 = "03y25hcmh38psf5gs28aa21ibkcg16d3kk2xmv073v50b14dxysr"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; libraryHaskellDepends = [ async auto-update base containers ekg-core ekg-prometheus-adapter exceptions inline-c katip microlens microlens-th mtl process @@ -245508,8 +245074,8 @@ self: { }: mkDerivation { pname = "rio-prettyprint"; - version = "0.1.2.0"; - sha256 = "0xql9rjd0b8vyfllb9h8j7nxbrnrvz9kkclzlb3wln10l9pi5v03"; + version = "0.1.3.0"; + sha256 = "0zlr8wnh38i3dxxfva91q9cwcsvqx0alf9fscn4c4545qhzw7a02"; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal array base Cabal colour mtl path rio text @@ -245518,6 +245084,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "rio-prettyprint_0_1_4_0" = callPackage + ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array + , base, Cabal, colour, mtl, path, rio, text + }: + mkDerivation { + pname = "rio-prettyprint"; + version = "0.1.4.0"; + sha256 = "0dagrbs9ssqh5mcr9fcaiqhc8vyr3aqxwxxpcd4j0bqvfcjhkbkz"; + libraryHaskellDepends = [ + aeson annotated-wl-pprint ansi-terminal array base Cabal colour mtl + path rio text + ]; + description = "Pretty-printing for RIO"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "rio-process-pool" = callPackage ({ mkDerivation, async, atomic-primops, base, containers, criterion , data-default, hashable, HUnit, mtl, QuickCheck, rio, tasty @@ -245824,8 +245407,6 @@ self: { ]; description = "A data type of run-length-encoded lists"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rlglue" = callPackage @@ -245998,22 +245579,32 @@ self: { }) {}; "roboservant" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hedgehog, mtl - , servant, servant-client, servant-flatten, servant-server - , string-conversions + ({ mkDerivation, aeson, base, bytestring, containers, dependent-map + , dependent-sum, hashable, hspec, hspec-core, hspec-wai + , http-api-data, http-client, http-types, lifted-base + , markdown-unlit, monad-control, mtl, random, servant + , servant-client, servant-flatten, servant-server + , string-conversions, text, time, unordered-containers, vinyl, wai + , warp }: mkDerivation { pname = "roboservant"; - version = "0.1.0.2"; - sha256 = "1dbzwczmjms6phzf3r6igy1q33gkwsdirdabd2rr0i2qp0lynshv"; + version = "0.1.0.3"; + sha256 = "1qcxhmppvpbibzq6mmqzz891pmi9c6cjjvxjyn8vlhvydgklh6x4"; libraryHaskellDepends = [ - base bytestring containers hedgehog mtl servant servant-client - servant-flatten servant-server string-conversions + base bytestring containers dependent-map dependent-sum hashable + http-types lifted-base monad-control mtl random servant + servant-client servant-flatten servant-server string-conversions + text time unordered-containers vinyl ]; testHaskellDepends = [ - aeson base bytestring containers hedgehog mtl servant + aeson base bytestring containers dependent-map dependent-sum + hashable hspec hspec-core hspec-wai http-api-data http-client + http-types lifted-base monad-control mtl random servant servant-client servant-flatten servant-server string-conversions + text time unordered-containers vinyl wai warp ]; + testToolDepends = [ markdown-unlit ]; description = "Automatic session-aware servant testing"; license = lib.licenses.bsd3; }) {}; @@ -246105,6 +245696,28 @@ self: { ]; description = "Implementation of the ROC National ID standard"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "roc-id_0_2_0_0" = callPackage + ({ mkDerivation, base, hspec, MonadRandom, Only, QuickCheck, text + , vector-sized + }: + mkDerivation { + pname = "roc-id"; + version = "0.2.0.0"; + sha256 = "1gng9rw9z9zmrkk68q8zf95w3d05yaglk2hp17jvnaw8qxfs3mvp"; + libraryHaskellDepends = [ + base MonadRandom Only text vector-sized + ]; + testHaskellDepends = [ + base hspec MonadRandom Only QuickCheck text vector-sized + ]; + description = "Implementation of the ROC (Taiwan) National ID standard"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rock" = callPackage @@ -246209,7 +245822,9 @@ self: { ]; description = "Sci-fi roguelike game. Client application."; license = "unknown"; + hydraPlatforms = lib.platforms.none; mainProgram = "roguestar"; + broken = true; }) {}; "roguestar-engine" = callPackage @@ -246316,8 +245931,8 @@ self: { ({ mkDerivation, base, optparse-applicative, rollbar-client }: mkDerivation { pname = "rollbar-cli"; - version = "0.1.0"; - sha256 = "1fspvwhgng251m5paps2nj3x73c1bms4s9y202nbdnil0wb1wdlf"; + version = "1.0.0"; + sha256 = "17lhvd4b4jfiy577jf00zw36y01xih792ylwrpw0ih1ljj90n14z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246338,8 +245953,8 @@ self: { }: mkDerivation { pname = "rollbar-client"; - version = "0.1.0"; - sha256 = "18ca2mrvl7kn226jnrv2yaqwanx6spf0sg034asp5bwnhn15fvb9"; + version = "1.0.0"; + sha256 = "0jpd2cizqm17f7645s5l3nbnjmc2qprww4hr5nwdi0z22kqvvqia"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246387,8 +246002,8 @@ self: { }: mkDerivation { pname = "rollbar-wai"; - version = "0.1.0"; - sha256 = "19a1pngqprnmpl4547vssbha4nzjj9930ln4qyv8yk4skqkvny4j"; + version = "1.0.0"; + sha256 = "0s8lnm99af4n3496axvxl05sj5g79i9gfwpgk35h4dvjqdf6kvzb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246411,8 +246026,8 @@ self: { }: mkDerivation { pname = "rollbar-yesod"; - version = "0.1.0"; - sha256 = "1azz0braw91mcw3gibixgpa6bd6z76k8q742qzai3xz1pivdf09f"; + version = "1.0.0"; + sha256 = "1hiaiks0qw692932hpliddk56zrz984nq7bfqh9k5ia4ymik1zbn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246472,6 +246087,8 @@ self: { ]; description = "Parsing and pretty printing of Roman numerals"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "romkan" = callPackage @@ -246904,6 +246521,8 @@ self: { testHaskellDepends = [ base long-double ]; description = "Correctly-rounded arbitrary-precision floating-point arithmetic"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;}; "rounded-hw" = callPackage @@ -247603,6 +247222,8 @@ self: { ]; description = "Parsing and manipulation of rtorrent state file contents"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rts-loader" = callPackage @@ -247906,6 +247527,7 @@ self: { description = "Look up class instances at runtime"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rustls" = callPackage @@ -248029,8 +247651,8 @@ self: { }: mkDerivation { pname = "s-cargot"; - version = "0.1.4.0"; - sha256 = "0bay3ids11acs0b95gn99s6m93x3d8hl45yf008lv4wcxwaq77sd"; + version = "0.1.5.0"; + sha256 = "06y2hrf6ncnf37w3g1gphfcqxsbln62jkpww8x5r0qq6f2cgj2z1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers parsec text ]; @@ -248049,6 +247671,8 @@ self: { testHaskellDepends = [ base HUnit parsec s-cargot text ]; description = "Enables let-binding and let-expansion for s-cargot defined S-expressions"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "s-expression" = callPackage @@ -248142,21 +247766,6 @@ self: { }) {}; "safe-coloured-text" = callPackage - ({ mkDerivation, base, bytestring, text, validity - , validity-bytestring, validity-text - }: - mkDerivation { - pname = "safe-coloured-text"; - version = "0.1.0.0"; - sha256 = "1fcqwllpbp9x1r1bvyry6bmp2s9rp8rlr3i94hdiydc71hpl7a0w"; - libraryHaskellDepends = [ - base bytestring text validity validity-bytestring validity-text - ]; - description = "Safely output coloured text"; - license = lib.licenses.mit; - }) {}; - - "safe-coloured-text_0_2_0_1" = callPackage ({ mkDerivation, base, bytestring, text, validity , validity-bytestring, validity-text }: @@ -248169,7 +247778,6 @@ self: { ]; description = "Safely output coloured text"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "safe-coloured-text-gen" = callPackage @@ -248233,17 +247841,6 @@ self: { }) {}; "safe-coloured-text-terminfo" = callPackage - ({ mkDerivation, base, safe-coloured-text, terminfo }: - mkDerivation { - pname = "safe-coloured-text-terminfo"; - version = "0.0.0.0"; - sha256 = "0f94zzmanmxplkcg1s954rq00ppv69icyjpzr5s0g6c14zp1k85b"; - libraryHaskellDepends = [ base safe-coloured-text terminfo ]; - description = "Safely output coloured text"; - license = lib.licenses.mit; - }) {}; - - "safe-coloured-text-terminfo_0_1_0_0" = callPackage ({ mkDerivation, base, safe-coloured-text, terminfo }: mkDerivation { pname = "safe-coloured-text-terminfo"; @@ -248252,7 +247849,6 @@ self: { libraryHaskellDepends = [ base safe-coloured-text terminfo ]; description = "Safely output coloured text"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "safe-coupling" = callPackage @@ -248389,9 +247985,9 @@ self: { "safe-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, dlist - , generic-arbitrary, hashable, quickcheck-instances, scientific - , tasty, tasty-hunit, tasty-quickcheck, temporary, text, time - , unordered-containers, uuid, uuid-types, vector + , hashable, quickcheck-instances, scientific, tasty, tasty-hunit + , tasty-quickcheck, temporary, text, time, unordered-containers + , uuid, uuid-types, vector }: mkDerivation { pname = "safe-json"; @@ -248405,7 +248001,7 @@ self: { uuid-types vector ]; testHaskellDepends = [ - aeson base bytestring containers dlist generic-arbitrary hashable + aeson base bytestring containers dlist hashable quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck temporary text time unordered-containers uuid uuid-types vector ]; @@ -248552,6 +248148,8 @@ self: { ]; description = "Instances from the xmlbf library for the safe-money library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "safe-numeric" = callPackage @@ -248630,6 +248228,8 @@ self: { testHaskellDepends = [ base ]; description = "Use RecordWildCards safely"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "safecopy" = callPackage @@ -248740,6 +248340,8 @@ self: { ]; description = "Write output to disk atomically"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "safepath" = callPackage @@ -248932,6 +248534,8 @@ self: { ]; description = "Configuration (re)Loader and Parser"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "salak-toml" = callPackage @@ -248955,7 +248559,6 @@ self: { description = "Configuration Loader for toml"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "salak-yaml" = callPackage @@ -248977,28 +248580,10 @@ self: { ]; description = "Configuration Loader for yaml"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "saltine" = callPackage - ({ mkDerivation, base, bytestring, hashable, libsodium, profunctors - , QuickCheck, semigroups, test-framework - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "saltine"; - version = "0.1.1.1"; - sha256 = "1bgr6vrmw18qr8akabxz6w3hwhlqi6zsnr23n70hkvwvcap1lnx7"; - libraryHaskellDepends = [ base bytestring hashable profunctors ]; - libraryPkgconfigDepends = [ libsodium ]; - testHaskellDepends = [ - base bytestring QuickCheck semigroups test-framework - test-framework-quickcheck2 - ]; - description = "Cryptography that's easy to digest (NaCl/libsodium bindings)"; - license = lib.licenses.mit; - }) {inherit (pkgs) libsodium;}; - - "saltine_0_2_0_1" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hashable , libsodium, profunctors, QuickCheck, semigroups, test-framework , test-framework-quickcheck2, text @@ -249021,7 +248606,6 @@ self: { benchmarkSystemDepends = [ libsodium ]; description = "Cryptography that's easy to digest (NaCl/libsodium bindings)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libsodium;}; "saltine-quickcheck" = callPackage @@ -249178,8 +248762,8 @@ self: { ({ mkDerivation, base, QuickCheck, storable-record }: mkDerivation { pname = "sample-frame"; - version = "0.0.3"; - sha256 = "0ivj0bcnqqc805np62bdpvh8v4ykmw86ph5rp7k54bbv9wd31bsv"; + version = "0.0.4"; + sha256 = "105hbd7s870vcjx49gk395craa4slcrngara8q3zfwn1cdpig49c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base QuickCheck storable-record ]; @@ -249191,8 +248775,8 @@ self: { ({ mkDerivation, base, numeric-prelude, sample-frame }: mkDerivation { pname = "sample-frame-np"; - version = "0.0.4.1"; - sha256 = "091nz5w5511xl8hp2q8dfvs4jz15nkhz22rr97zga0vmn0hpdnxi"; + version = "0.0.5"; + sha256 = "0h02bn5zr13agpv2wg4sp6hjlid25ylny8xswrk42pzp0jsph8mn"; libraryHaskellDepends = [ base numeric-prelude sample-frame ]; description = "Orphan instances for types from sample-frame and numericprelude"; license = lib.licenses.bsd3; @@ -249350,8 +248934,8 @@ self: { }: mkDerivation { pname = "sandwich"; - version = "0.1.1.2"; - sha256 = "1flac21bgxq07xq5ax9ga7xm1bg2bwld88msbginqxycx21dvcdq"; + version = "0.1.2.0"; + sha256 = "0g1qyhp0w8gxyv60phm1apvq1p7cx7z6f9ijjx67gh7pk9mmlbzw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249465,8 +249049,8 @@ self: { }: mkDerivation { pname = "sandwich-webdriver"; - version = "0.1.1.0"; - sha256 = "01y8jy2fvph9kmh42zwnf8y9rca82arn2a6wgh3mzylfijni74lj"; + version = "0.1.2.0"; + sha256 = "146pck1kj5p8h6x8bv6iriicrjxsi0jbpirmscjhc4gg8nd0fmxm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249495,7 +249079,6 @@ self: { ]; description = "Sandwich integration with Selenium WebDriver"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "sandwich-webdriver-exe"; }) {}; @@ -249512,6 +249095,21 @@ self: { broken = true; }) {}; + "sarif" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, text + , uuid-types + }: + mkDerivation { + pname = "sarif"; + version = "0.1"; + sha256 = "17i9fkh2vm5ywi8h4b2h0f7hfqr484kg1dqrhj563a5idw4jqi0v"; + libraryHaskellDepends = [ + aeson base bytestring containers text uuid-types + ]; + description = "SARIF implementation for Haskell"; + license = lib.licenses.mit; + }) {}; + "sarsi" = callPackage ({ mkDerivation, ansi-terminal, async, attoparsec, base, binary , bytestring, Cabal, containers, cryptonite, directory, filepath @@ -249808,6 +249406,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "sayable" = callPackage + ({ mkDerivation, base, bytestring, exceptions, prettyprinter, text + }: + mkDerivation { + pname = "sayable"; + version = "1.0.2.0"; + sha256 = "041qjk1giqrsfis410r491c3b2s36ngsk64ihzpjb788xbr86adx"; + libraryHaskellDepends = [ + base bytestring exceptions prettyprinter text + ]; + description = "Data structures, classes and operators for constructing context-adjusted pretty output"; + license = lib.licenses.isc; + }) {}; + "sbp" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit @@ -249817,8 +249429,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "4.1.6"; - sha256 = "0ph1bn95bxpmfs2xvbgj7kpz3ji6jf65ykah5srmhqgbw21d1wl7"; + version = "4.9.0"; + sha256 = "14p0a23kmn9z9l8rm9q94zgyx5p0wnjrgf51shk2magjg055llkb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249835,7 +249447,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_4_9_0" = callPackage + "sbp_4_10_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -249844,8 +249456,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "4.9.0"; - sha256 = "14p0a23kmn9z9l8rm9q94zgyx5p0wnjrgf51shk2magjg055llkb"; + version = "4.10.0"; + sha256 = "1mhnqiqi6yv3mn0rcwiq5k79a2zxcpqp4284ziqrcjwnhjxd2cnf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249910,42 +249522,10 @@ self: { description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) z3;}; "sbv" = callPackage - ({ mkDerivation, array, async, base, bench-show, bytestring - , containers, deepseq, directory, doctest, filepath, gauge, Glob - , hlint, libBF, mtl, pretty, process, QuickCheck, random, silently - , syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck - , template-haskell, text, time, transformers, uniplate, z3 - }: - mkDerivation { - pname = "sbv"; - version = "8.17"; - sha256 = "0l9dwydrjipgq3cbv0g6y820mi7lf5lcn3hidl6a60zzdrkfyxhd"; - revision = "1"; - editedCabalFile = "18jjnxxq9bh5raxw3khgkx14wq4fv1kfd59lhh9v55z59sjaydiy"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array async base containers deepseq directory filepath libBF mtl - pretty process QuickCheck random syb template-haskell text time - transformers uniplate - ]; - testHaskellDepends = [ - base bytestring containers directory doctest filepath Glob hlint - mtl QuickCheck random tasty tasty-golden tasty-hunit - tasty-quickcheck - ]; - testSystemDepends = [ z3 ]; - benchmarkHaskellDepends = [ - base bench-show containers deepseq directory filepath gauge mtl - process random silently syb text time - ]; - description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) z3;}; - - "sbv_9_0" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, directory, filepath, hlint, libBF, mtl, pretty, process , QuickCheck, random, syb, tasty, tasty-bench, tasty-golden @@ -249973,6 +249553,38 @@ self: { description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) z3;}; + + "sbv_9_1" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , deepseq, directory, filepath, hlint, libBF, mtl, pretty, process + , QuickCheck, random, syb, tasty, tasty-bench, tasty-golden + , tasty-hunit, tasty-quickcheck, template-haskell, text, time + , transformers, uniplate, z3 + }: + mkDerivation { + pname = "sbv"; + version = "9.1"; + sha256 = "0wkpx73blwg629l4y9vjjlhbk4qa1zzddc4z8qvida62qwcdxw6w"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array async base containers deepseq directory filepath libBF mtl + pretty process QuickCheck random syb template-haskell text time + transformers uniplate + ]; + testHaskellDepends = [ + base bytestring containers directory filepath hlint mtl process + QuickCheck random tasty tasty-golden tasty-hunit tasty-quickcheck + ]; + testSystemDepends = [ z3 ]; + benchmarkHaskellDepends = [ + base deepseq filepath process random tasty tasty-bench time + ]; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) z3;}; "sbvPlugin" = callPackage @@ -249993,7 +249605,6 @@ self: { description = "Formally prove properties of Haskell programs using SBV/SMT"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sc2-lowlevel" = callPackage @@ -250242,8 +249853,8 @@ self: { }: mkDerivation { pname = "scalpel-search"; - version = "0.1.0.0"; - sha256 = "0qq8q9z3s37wcc6iwygn2hfh72k5kak93vmsvl3wn0k04lrivg60"; + version = "0.1.0.1"; + sha256 = "166pillw3pkvdi3qrcdvb6rd442ddfvb3dh7nxhkv012j6163flz"; libraryHaskellDepends = [ base scalpel-core tagsoup text uri ]; testHaskellDepends = [ base hspec scalpel scalpel-core tagsoup text uri @@ -250432,7 +250043,6 @@ self: { description = "A Haskell library for writing SCGI programs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "schedevr" = callPackage @@ -250451,6 +250061,7 @@ self: { description = "Marge schedules and show EVR"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "schedule" = callPackage @@ -250472,8 +250083,6 @@ self: { ]; description = "Pure deterministic scheduled computations"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "schedule-planner" = callPackage @@ -251050,21 +250659,19 @@ self: { "scotty" = callPackage ({ mkDerivation, aeson, async, base, base-compat-batteries , blaze-builder, bytestring, case-insensitive, data-default-class - , directory, exceptions, fail, hspec, hspec-discover, hspec-wai - , http-types, lifted-base, lucid, monad-control, mtl, nats, network + , directory, exceptions, hspec, hspec-discover, hspec-wai + , http-types, lifted-base, lucid, monad-control, mtl, network , regex-compat, text, transformers, transformers-base , transformers-compat, wai, wai-extra, warp, weigh }: mkDerivation { pname = "scotty"; - version = "0.12"; - sha256 = "1lpggpdzgjk23mq7aa64yylds5dbm4ynhcvbarqihjxabvh7xmz1"; - revision = "9"; - editedCabalFile = "0d61dgx6wq682mz8ryq2a10v1z4yi0dik8b5psi0ragl2qip191j"; + version = "0.12.1"; + sha256 = "0jnv2k37yv7hbm21w356ml4b14avlwh8yyzwwwfrwpbn6zzk6ahy"; libraryHaskellDepends = [ aeson base base-compat-batteries blaze-builder bytestring - case-insensitive data-default-class exceptions fail http-types - monad-control mtl nats network regex-compat text transformers + case-insensitive data-default-class exceptions http-types + monad-control mtl network regex-compat text transformers transformers-base transformers-compat wai wai-extra warp ]; testHaskellDepends = [ @@ -251215,6 +250822,7 @@ self: { libraryHaskellDepends = [ base haxl scotty text ]; description = "Combine scotty and haxl"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "scotty-params-parser" = callPackage @@ -251586,6 +251194,8 @@ self: { testHaskellDepends = [ base hspec ]; description = "This package provides functions for relocate an item within a list"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "scrypt" = callPackage @@ -251636,13 +251246,15 @@ self: { }) {}; "scubature" = callPackage - ({ mkDerivation, array, base, containers, ilist, matrix, vector }: + ({ mkDerivation, array, base, containers, hspray, ilist, matrix + , numeric-prelude, vector + }: mkDerivation { pname = "scubature"; - version = "1.0.0.0"; - sha256 = "1wp17l4k7yh7b3r3x2piinki4p03lp6bsbpqryah1zwy3hrpv06c"; + version = "1.1.0.0"; + sha256 = "1rzq2lr09705ydhvjvag9phmpvjr55crh4hjdhl3lgd9c58dmxja"; libraryHaskellDepends = [ - array base containers ilist matrix vector + array base containers hspray ilist matrix numeric-prelude vector ]; description = "Multidimensional integration over simplices"; license = lib.licenses.gpl3Only; @@ -251759,27 +251371,6 @@ self: { }) {}; "sdl2" = callPackage - ({ mkDerivation, base, bytestring, deepseq, exceptions, linear - , SDL2, StateVar, text, transformers, vector, weigh - }: - mkDerivation { - pname = "sdl2"; - version = "2.5.3.0"; - sha256 = "08l24cb92spnx3bn26bj0z2cszpsawhaa9vvhblvsr3d6z76065q"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring exceptions linear StateVar text transformers vector - ]; - librarySystemDepends = [ SDL2 ]; - libraryPkgconfigDepends = [ SDL2 ]; - testHaskellDepends = [ base deepseq linear vector weigh ]; - description = "Both high- and low-level bindings to the SDL library (version 2.0.6+)."; - license = lib.licenses.bsd3; - }) {inherit (pkgs) SDL2;}; - - "sdl2_2_5_4_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, linear , SDL2, StateVar, text, transformers, vector, weigh }: @@ -251787,8 +251378,8 @@ self: { pname = "sdl2"; version = "2.5.4.0"; sha256 = "1g35phifz49kxk48s8jmgglxhxl79cbzc1cg2qlgk0vdpxpin8ym"; - revision = "1"; - editedCabalFile = "19kr714da3lp064h1ky1bxwgkcrjy2ks5qby6214fj99dg7rxipr"; + revision = "2"; + editedCabalFile = "1yxzq4gb6ig3d94lc76i5d50fa0j1fxr1wdlmgwhkvlfd4xnh6sg"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -251800,7 +251391,6 @@ self: { testHaskellDepends = [ base deepseq linear vector weigh ]; description = "Both high- and low-level bindings to the SDL library (version 2.0.6+)."; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) SDL2;}; "sdl2-cairo" = callPackage @@ -252005,6 +251595,8 @@ self: { libraryToolDepends = [ cpphs ]; description = "Simple Data Processing"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sdp-binary" = callPackage @@ -252016,6 +251608,7 @@ self: { libraryHaskellDepends = [ base binary sdp ]; description = "Binary instances for SDP"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "sdp-deepseq" = callPackage @@ -252027,6 +251620,7 @@ self: { libraryHaskellDepends = [ base deepseq sdp ]; description = "DeepSeq SDP extension"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "sdp-hashable" = callPackage @@ -252038,6 +251632,7 @@ self: { libraryHaskellDepends = [ base hashable sdp ]; description = "Hashable instances for SDP"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "sdp-io" = callPackage @@ -252049,6 +251644,7 @@ self: { libraryHaskellDepends = [ base fmr sdp ]; description = "SDP IO extension"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "sdp-quickcheck" = callPackage @@ -252068,6 +251664,7 @@ self: { ]; description = "SDP QuickCheck support"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "sdp4bytestring" = callPackage @@ -252088,6 +251685,7 @@ self: { ]; description = "SDP wrapper for ByteString"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "sdp4text" = callPackage @@ -252106,6 +251704,7 @@ self: { ]; description = "SDP wrapper for Text"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "sdp4unordered" = callPackage @@ -252119,6 +251718,7 @@ self: { ]; description = "SDP classes for unordered containers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "sdp4vector" = callPackage @@ -252137,6 +251737,7 @@ self: { ]; description = "SDP wrapper for Vector"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "sdr" = callPackage @@ -252270,8 +251871,6 @@ self: { testHaskellDepends = [ base directory doctest filepath ]; description = "Infinite search in finite time with Hilbert's epsilon"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "search-algorithms" = callPackage @@ -252531,7 +252130,9 @@ self: { testToolDepends = [ tasty-discover ]; description = "Securely allocated and deallocated memory"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "checkpw"; + broken = true; }) {}; "secure-sockets" = callPackage @@ -252639,8 +252240,6 @@ self: { libraryHaskellDepends = [ aeson base bytestring selda text ]; description = "JSON support for the Selda database library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "selda-postgresql" = callPackage @@ -252658,6 +252257,7 @@ self: { description = "PostgreSQL backend for the Selda database EDSL"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "selda-sqlite" = callPackage @@ -253035,19 +252635,6 @@ self: { }) {}; "semigroups" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "semigroups"; - version = "0.19.2"; - sha256 = "0h1sl3i6k8csy5zkkpy65rxzds9wg577z83aaakybr3n1gcv4855"; - revision = "2"; - editedCabalFile = "0pprwlsipdsshr2h83bk0xjkhq2bw88m9fn44fiyas3habg25ajf"; - libraryHaskellDepends = [ base ]; - description = "Anything that associates"; - license = lib.licenses.bsd3; - }) {}; - - "semigroups_0_20" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "semigroups"; @@ -253056,7 +252643,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Anything that associates"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "semigroups-actions" = callPackage @@ -253088,6 +252674,8 @@ self: { ]; description = "Semilattices"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "semiring" = callPackage @@ -253254,6 +252842,8 @@ self: { pname = "sensei"; version = "0.6.2"; sha256 = "168znkrlciywsqpgbssnz2n2w1w6240j1cxk83bpzlflg7q934ps"; + revision = "1"; + editedCabalFile = "0i4k8zdyvv3ypwqg2x5s4p0dgszpgb6g8wc0s9zi05fyzhizpi4s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -253442,6 +253032,7 @@ self: { description = "SmartyPants for Korean language"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "separated" = callPackage @@ -253674,6 +253265,8 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "Sequential numbers that allow arbitrarily inserting numbers - for containers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sequor" = callPackage @@ -253826,8 +253419,6 @@ self: { testHaskellDepends = [ base bytestring HUnit ]; description = "Cross platform serial port library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "serokell-util" = callPackage @@ -254853,6 +254444,7 @@ self: { description = "Servant support for Server-Sent events"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "servant-examples" = callPackage @@ -255073,7 +254665,6 @@ self: { description = "automatical derivation of querying functions for servant webservices"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-hmac-auth" = callPackage @@ -255178,6 +254769,7 @@ self: { description = "Generate HTTP2 clients from Servant API descriptions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "servant-iCalendar" = callPackage @@ -255194,6 +254786,8 @@ self: { ]; description = "Servant support for iCalendar"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "servant-jquery" = callPackage @@ -255213,6 +254807,7 @@ self: { description = "Automatically derive (jquery) javascript functions to query servant webservices"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "servant-js" = callPackage @@ -255238,7 +254833,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Automatically derive javascript functions to query servant webservices"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-jsonrpc" = callPackage @@ -255597,10 +255191,8 @@ self: { }: mkDerivation { pname = "servant-openapi3"; - version = "2.0.1.5"; - sha256 = "0zcyqga4hbdyk34368108vv9vavzdhv26xphas7yppada2sshfay"; - revision = "1"; - editedCabalFile = "0bscnxbw1zd0f7ycjr54kxfdcxzndgbxpamc75r1yzly262xrc1b"; + version = "2.0.1.6"; + sha256 = "1hxz3n6l5l8p9s58sjilrn4lv1z17kfik0xdh05v5v1bzf0j2aij"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -255615,6 +255207,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "servant-options" = callPackage @@ -255715,8 +255308,6 @@ self: { ]; description = "Utilities for using servant in a polysemy stack"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-pool" = callPackage @@ -256386,7 +255977,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "servant-streamly-example"; - broken = true; }) {}; "servant-subscriber" = callPackage @@ -256469,8 +256059,8 @@ self: { pname = "servant-swagger-ui"; version = "0.3.5.4.5.0"; sha256 = "12w75z23bnygyr3ki9w3zfy9nhxyjawf9pyzhfg6rp2mq3nji9gg"; - revision = "2"; - editedCabalFile = "05g4gnvr8ljg5mszan5cr9zzi40p6d8sr7343mm2yc3ps45vy9g1"; + revision = "3"; + editedCabalFile = "0qspb55lvavfsyqjjjyyax9gqzp8yq9r13nvzj3qnsipjgw2irln"; libraryHaskellDepends = [ aeson base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core text @@ -256488,8 +256078,8 @@ self: { pname = "servant-swagger-ui-core"; version = "0.3.5"; sha256 = "0ckvrwrb3x39hfl2hixcj3fhibh0vqsh6y7n1lsm25yvzfrg02zd"; - revision = "4"; - editedCabalFile = "16183mrmxipa3l3ffpibsrr41mbi2iikw66y80hplmnl6jjhnyzd"; + revision = "5"; + editedCabalFile = "1v80wydj605b1la1pa5b4l6c3ba86x2dlpnravvhmx32mkkxk7v2"; libraryHaskellDepends = [ aeson base blaze-markup bytestring http-media servant servant-blaze servant-server text transformers transformers-compat wai-app-static @@ -256582,6 +256172,25 @@ self: { transformers ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "servant-typed-error" = callPackage + ({ mkDerivation, aeson, base, mtl, servant, servant-client + , servant-server, sop-core + }: + mkDerivation { + pname = "servant-typed-error"; + version = "0.1.2.0"; + sha256 = "0bzn0ilq94bghm96dq08hyfcjkf72hg49527ix1sy52d0bym3xmm"; + libraryHaskellDepends = [ + aeson base mtl servant servant-client servant-server sop-core + ]; + description = "Typed error wrapper for Servant"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "servant-typescript" = callPackage @@ -256661,7 +256270,6 @@ self: { license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; mainProgram = "servant-util-examples"; - broken = true; }) {}; "servant-util-beam-pg" = callPackage @@ -256793,6 +256401,25 @@ self: { ]; description = "Servant support for the XML Content-Type"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "servant-xml_1_0_2" = callPackage + ({ mkDerivation, base, bytestring, http-media, servant, xmlbf + , xmlbf-xeno + }: + mkDerivation { + pname = "servant-xml"; + version = "1.0.2"; + sha256 = "07ancw5dypcxqc48g9zn8vn597hj174aq5akzyr650pwz0dvwsfk"; + libraryHaskellDepends = [ + base bytestring http-media servant xmlbf xmlbf-xeno + ]; + description = "Servant support for the XML Content-Type"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "servant-xstatic" = callPackage @@ -257002,6 +256629,8 @@ self: { ]; description = "Storage backend for serversession using acid-state"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "serversession-backend-persistent" = callPackage @@ -257137,6 +256766,8 @@ self: { ]; description = "JSON to Sql"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "servius" = callPackage @@ -257631,8 +257262,8 @@ self: { }: mkDerivation { pname = "sexpresso"; - version = "1.2.1.0"; - sha256 = "18di6krrrclilp74fazwlsfcq3jym9mmya8q0x2vm2cdgbpjm8mi"; + version = "1.2.2.0"; + sha256 = "1lzh70zx5lnjbz0h95icdl06lmcig8d093frk46fdydgzl3z9mgw"; libraryHaskellDepends = [ base bifunctors containers megaparsec recursion-schemes text ]; @@ -257674,6 +257305,8 @@ self: { librarySystemDepends = [ libsndfile openal ]; description = "minimal bindings to the audio module of sfml"; license = "unknown"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;}; "sfmt" = callPackage @@ -257707,9 +257340,7 @@ self: { testHaskellDepends = [ base ]; description = "A command line tool to convert TrueType/OpenType fonts to WOFF format"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "sfnt2woff"; - broken = true; }) {inherit (pkgs) zlib;}; "sgd" = callPackage @@ -257934,7 +257565,6 @@ self: { description = "Functional GPU programming - DSEL & compiler"; license = "unknown"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "shady-graphics" = callPackage @@ -258004,22 +257634,21 @@ self: { ]; description = "Utilities for building ATS projects with shake"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "shake-bench" = callPackage - ({ mkDerivation, aeson, base, Chart, Chart-diagrams + ({ mkDerivation, aeson, base, bytestring, Chart, Chart-diagrams , diagrams-contrib, diagrams-core, diagrams-lib, diagrams-svg , directory, extra, filepath, lens, lens-aeson, mtl, shake, text }: mkDerivation { pname = "shake-bench"; - version = "0.1.1.0"; - sha256 = "1p2xa2kxfvzy2c188i9czr5w4jck4sxw2jb7s9dc1b5xf1a4bi01"; + version = "0.2.0.0"; + sha256 = "0jyx1pwj4wh80026ndxz7dapp7hw1v21z9bpd1073g73h7l5kw91"; libraryHaskellDepends = [ - aeson base Chart Chart-diagrams diagrams-contrib diagrams-core - diagrams-lib diagrams-svg directory extra filepath lens lens-aeson - mtl shake text + aeson base bytestring Chart Chart-diagrams diagrams-contrib + diagrams-core diagrams-lib diagrams-svg directory extra filepath + lens lens-aeson mtl shake text ]; description = "Build rules for historical benchmarking"; license = lib.licenses.asl20; @@ -258069,8 +257698,23 @@ self: { ]; description = "Shake library for use with cabal"; license = lib.licenses.bsd3; + }) {}; + + "shake-cabal_0_2_2_3" = callPackage + ({ mkDerivation, base, binary, Cabal, composition-prelude, deepseq + , directory, filepath, hashable, shake + }: + mkDerivation { + pname = "shake-cabal"; + version = "0.2.2.3"; + sha256 = "0gl0yiimbwcrhbh24bgm6dm3nqz4ldzgm73k1fg9sms4r2pr15hy"; + libraryHaskellDepends = [ + base binary Cabal composition-prelude deepseq directory filepath + hashable shake + ]; + description = "Shake library for use with cabal"; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "shake-cabal-build" = callPackage @@ -258253,7 +257897,6 @@ self: { description = "Shake File Pack Rule"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "shake-path" = callPackage @@ -258610,9 +258253,7 @@ self: { ]; description = "physics engine and other tools for 2D shapes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "shapes-bench"; - broken = true; }) {}; "shapes-demo" = callPackage @@ -258632,7 +258273,6 @@ self: { ]; description = "demos for the 'shapes' package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "shapes-demo"; }) {}; @@ -259053,19 +258693,18 @@ self: { }) {}; "shh" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , directory, doctest, filepath, markdown-unlit, mtl, process, split - , stringsearch, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, temporary, unix, utf8-string + ({ mkDerivation, async, base, bytestring, Cabal, cabal-doctest + , containers, deepseq, directory, doctest, filepath, markdown-unlit + , mtl, process, PyF, split, stringsearch, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, unix, utf8-string }: mkDerivation { pname = "shh"; - version = "0.7.2.0"; - sha256 = "0rcjvkpxdwvhgn7i1dindhbskr8kwgm977kxgi2xcv398c71014y"; - revision = "1"; - editedCabalFile = "054bjhpkni3nr6zsilj77gdgb2yw5s1gzm257zz4kigpjjjndr0a"; + version = "0.7.2.1"; + sha256 = "1p46q07mdk9w6agm5ggy34r62fqw6zlx4d32pkby852piy7aknnv"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base bytestring containers deepseq directory filepath mtl process split stringsearch template-haskell unix utf8-string @@ -259074,8 +258713,8 @@ self: { async base bytestring deepseq directory temporary unix ]; testHaskellDepends = [ - async base bytestring directory doctest filepath tasty tasty-hunit - tasty-quickcheck utf8-string + async base bytestring directory doctest filepath PyF tasty + tasty-hunit tasty-quickcheck utf8-string ]; testToolDepends = [ markdown-unlit ]; description = "Simple shell scripting from Haskell"; @@ -259087,10 +258726,8 @@ self: { ({ mkDerivation, base, hostname, shh, tasty, time }: mkDerivation { pname = "shh-extras"; - version = "0.1.0.1"; - sha256 = "0w4ddjszs0lrpr4zcggcwb80bg3yd8lr628jngmh4a05ypv3hxkk"; - revision = "2"; - editedCabalFile = "1sfj2li0p0bq1dmk85i74jmgcz28vb2q151d16rcjzx8x07kyrq4"; + version = "0.1.0.2"; + sha256 = "0yax761d0xgc8nqg8h7y69fb1mwf88w73sznh3kffhlaladavskx"; libraryHaskellDepends = [ base hostname shh time ]; testHaskellDepends = [ base tasty ]; description = "Utility functions for using shh"; @@ -259333,6 +258970,8 @@ self: { ]; description = "Additional ShortByteString API"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "shortcircuit" = callPackage @@ -259496,10 +259135,8 @@ self: { }: mkDerivation { pname = "shower"; - version = "0.2.0.2"; - sha256 = "0flad49vvqww2pbf6j8557szffd7wb3z375avhvzwqyklimwipgn"; - revision = "1"; - editedCabalFile = "0d5vfb65lq6f36lagsf89dj45gs68dyv6cc6lqxz0c23bv91qarc"; + version = "0.2.0.3"; + sha256 = "0bxg88jbg5pj1nm48c1s04dl7l5psq35jsw60y3v1xpnszx95r1r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base megaparsec pretty ]; @@ -259935,9 +259572,7 @@ self: { ]; description = "Calculate expressions involving significant figures"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; mainProgram = "significant-figures-cli"; - broken = true; }) {}; "signify-hs" = callPackage @@ -259961,6 +259596,7 @@ self: { ]; description = "A Haskell clone of OpenBSD signify"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "signify-hs"; }) {}; @@ -260228,8 +259864,8 @@ self: { ({ mkDerivation, base, bytestring, Cabal, directory, filepath }: mkDerivation { pname = "simple-cabal"; - version = "0.1.3"; - sha256 = "035h20sz2hg2xc1k5ds1q367fa10px936dlhj3yxkydp3wprqr7x"; + version = "0.1.3.1"; + sha256 = "08cg8c8zw1gxz1m75695c5x5g3wxa47rnqrn5ws23da9krzy4762"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ]; @@ -260369,8 +260005,6 @@ self: { benchmarkHaskellDepends = [ base criterion mtl transformers ]; description = "A simple effect system that integrates with MTL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "simple-enumeration" = callPackage @@ -260564,6 +260198,7 @@ self: { description = "Logging effect to plug into the simple-effects framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "simple-ltl" = callPackage @@ -260686,8 +260321,8 @@ self: { }: mkDerivation { pname = "simple-parser"; - version = "0.12.0"; - sha256 = "1g8ik221kfzjb3bndxghk42ki7hhs4xbwxq8arc66hsnynjxi7rs"; + version = "0.12.1"; + sha256 = "0izlhj9jilwj7zilav8ygnz5k6zbz65q2s1yyjsx62b9mfl9skqs"; libraryHaskellDepends = [ base bytestring containers errata exceptions mmorph mtl nonempty-containers scientific text text-builder @@ -261440,6 +261075,8 @@ self: { testHaskellDepends = [ base ]; description = "Like singletons, but much smaller"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "singleton-bool" = callPackage @@ -261495,6 +261132,20 @@ self: { }) {}; "singletons" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "singletons"; + version = "3.0.1"; + sha256 = "0lqg9wxh02z2sikpy88asm8g4sfrvyb66b7p76irsij31h0cxbnk"; + revision = "1"; + editedCabalFile = "0n3jr9jqz50ygaw80a9cx3g09w7w8bdlq9ssyap0a4990yxl8fbx"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Basic singleton types and definitions"; + license = lib.licenses.bsd3; + }) {}; + + "singletons_3_0_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "singletons"; @@ -261504,6 +261155,7 @@ self: { testHaskellDepends = [ base ]; description = "Basic singleton types and definitions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "singletons-base" = callPackage @@ -261513,8 +261165,10 @@ self: { }: mkDerivation { pname = "singletons-base"; - version = "3.0"; - sha256 = "0syrh4f9rs4g643c90md1vqrpr6p8h8g8sh4x3j2dld12yvrw4wn"; + version = "3.1"; + sha256 = "1bsfbdbfwiq2nis3r95x06r0q9iypyz4hkvmgvk56bwj6421k7kd"; + revision = "1"; + editedCabalFile = "12p0xzmrkn2bjz6wf9i291bh47s9c0ziz6cvvja65vnzwd8l60ry"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base pretty singletons singletons-th template-haskell text @@ -261569,16 +261223,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "singletons-presburger_0_7_1_0" = callPackage + ({ mkDerivation, base, ghc, ghc-typelits-presburger, mtl + , reflection, singletons, singletons-base + }: + mkDerivation { + pname = "singletons-presburger"; + version = "0.7.1.0"; + sha256 = "1qzjbbscykcvbbl8ifkr6nvm5fnqqzr8ddgq1blcm811lmi0g926"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base ghc ghc-typelits-presburger mtl reflection singletons + singletons-base + ]; + description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "singletons-th" = callPackage ({ mkDerivation, base, containers, ghc-boot-th, mtl, singletons , syb, template-haskell, th-desugar, th-orphans, transformers }: mkDerivation { pname = "singletons-th"; - version = "3.0"; - sha256 = "1c0w7sg0lbpizrzns4g55wxsk5jm8wlqw0w9rz4jzqwy15byb572"; - revision = "1"; - editedCabalFile = "11mmccdqxplqz7mp1brxpr9hqnkqkhbwnp32mihz4ird0k8gwqij"; + version = "3.1"; + sha256 = "1mhx7sadw7zxaf7qhryrhi4fiyf9v3jcaplkh1syaa7b4725dm7a"; + revision = "2"; + editedCabalFile = "19ac6s4k6yv0lfrhkmgpf000k32rpm91lngs4955158792pa6fi6"; libraryHaskellDepends = [ base containers ghc-boot-th mtl singletons syb template-haskell th-desugar th-orphans transformers @@ -261689,6 +261362,8 @@ self: { ]; description = "siphash: a fast short input PRF"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "siphon" = callPackage @@ -261884,8 +261559,8 @@ self: { }: mkDerivation { pname = "sized"; - version = "1.0.0.1"; - sha256 = "1ayj3fzr4l4l5wmkqnv4h4fxgivmjgamq3wdlpixlwy43wbmf3fy"; + version = "1.0.0.2"; + sha256 = "0l6miv6dw0j5fdkiig7a8akhphrpxs8ls6xdakzpbk53bdh0093n"; libraryHaskellDepends = [ base constraints containers deepseq equational-reasoning ghc-typelits-knownnat ghc-typelits-presburger hashable lens @@ -262184,8 +261859,8 @@ self: { }: mkDerivation { pname = "sketch-frp-copilot"; - version = "1.0.4"; - sha256 = "0drqv0aj7hx0h2z8wz487f0xi62pjgrljxhw3x5wdjxyh6zr43ba"; + version = "1.0.6"; + sha256 = "1hxz51vx1a1p0v8sajv2ch6y261lm4s9z5fvp5w86qygsd1zy2px"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language mtl optparse-applicative @@ -262195,6 +261870,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "skew-list" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, hashable + , indexed-traversable, QuickCheck, ral, strict, tasty, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "skew-list"; + version = "0.1"; + sha256 = "1j0rc1s3mpf933wl4fifik62d68hx1py8g8wwxz69ynfhjhf9fa2"; + libraryHaskellDepends = [ + base deepseq hashable indexed-traversable QuickCheck strict + ]; + testHaskellDepends = [ + base indexed-traversable QuickCheck tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base containers criterion ral vector ]; + description = "Random access lists: skew binary"; + license = lib.licenses.bsd3; + }) {}; + "skews" = callPackage ({ mkDerivation, async, base, bytestring, deque, envy, hspec , network, websockets @@ -262209,6 +261905,8 @@ self: { ]; description = "A very quick-and-dirty WebSocket server"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "skip-list" = callPackage @@ -262275,84 +261973,32 @@ self: { }) {}; "skylighting" = callPackage - ({ mkDerivation, base, binary, blaze-html, bytestring, containers - , pretty-show, skylighting-core, text - }: - mkDerivation { - pname = "skylighting"; - version = "0.12.3.1"; - sha256 = "08wml20cphj5idv5f20cz0jx7n8f037gy7x5axak83sbd98k71nw"; - configureFlags = [ "-fexecutable" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary containers skylighting-core - ]; - executableHaskellDepends = [ - base blaze-html bytestring containers pretty-show text - ]; - description = "syntax highlighting library"; - license = lib.licenses.gpl2Only; - mainProgram = "skylighting"; - }) {}; - - "skylighting_0_13_1_1" = callPackage ({ mkDerivation, base, binary, blaze-html, bytestring, containers , pretty-show, skylighting-core, skylighting-format-ansi - , skylighting-format-blaze-html, skylighting-format-latex, text + , skylighting-format-blaze-html, skylighting-format-context + , skylighting-format-latex, text }: mkDerivation { pname = "skylighting"; - version = "0.13.1.1"; - sha256 = "01awb174z27iygjssrsgvrq8lapq7282vs4bf5cxdbkjcpncil4b"; + version = "0.13.2"; + sha256 = "0dh4k39ddqca5px2d06ni8n9x3mifvkwd5i16077l472dwjcs879"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary containers skylighting-core skylighting-format-ansi - skylighting-format-blaze-html skylighting-format-latex + skylighting-format-blaze-html skylighting-format-context + skylighting-format-latex ]; executableHaskellDepends = [ base blaze-html bytestring containers pretty-show text ]; description = "syntax highlighting library"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; mainProgram = "skylighting"; }) {}; "skylighting-core" = callPackage - ({ mkDerivation, aeson, ansi-terminal, attoparsec, base - , base64-bytestring, binary, blaze-html, bytestring - , case-insensitive, colour, containers, criterion, Diff, directory - , filepath, mtl, pretty-show, QuickCheck, safe, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string - , xml-conduit - }: - mkDerivation { - pname = "skylighting-core"; - version = "0.12.3.1"; - sha256 = "08svbbfw27zhlblglagxqvsppkdfibqjnx331jdbfrlj0a9pi5h8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal attoparsec base base64-bytestring binary - blaze-html bytestring case-insensitive colour containers directory - filepath mtl safe text transformers utf8-string xml-conduit - ]; - testHaskellDepends = [ - aeson base bytestring containers Diff directory filepath - pretty-show QuickCheck tasty tasty-golden tasty-hunit - tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ - base containers criterion filepath text - ]; - description = "syntax highlighting library"; - license = lib.licenses.bsd3; - }) {}; - - "skylighting-core_0_13_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , bytestring, case-insensitive, colour, containers, criterion, Diff , directory, filepath, mtl, pretty-show, QuickCheck, safe, tasty @@ -262361,8 +262007,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.13.1.1"; - sha256 = "0cr9crylkawr1dg1aj55mbngn71nih16kfiblxi1gvizgxcrvdys"; + version = "0.13.2"; + sha256 = "0iwzfgynj3l8rnvvrl4kg0i1n31rz15da8cf1943gw1vcfh6w585"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -262380,7 +262026,6 @@ self: { ]; description = "syntax highlighting library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "skylighting-extensions" = callPackage @@ -262415,8 +262060,6 @@ self: { ]; description = "ANSI formatter for skylighting syntax highlighting library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "skylighting-format-blaze-html" = callPackage @@ -262434,6 +262077,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "skylighting-format-context" = callPackage + ({ mkDerivation, base, containers, skylighting-core, text }: + mkDerivation { + pname = "skylighting-format-context"; + version = "0.1.0.1"; + sha256 = "1d4nf16wl2l4r627qnph09x21xwcq03r7bznqm08d4di1z241xv0"; + libraryHaskellDepends = [ base containers skylighting-core text ]; + description = "ConTeXt formatter for skylighting syntax highlighting library"; + license = lib.licenses.bsd3; + }) {}; + "skylighting-format-latex" = callPackage ({ mkDerivation, base, containers, skylighting-core, text }: mkDerivation { @@ -262456,6 +262110,8 @@ self: { ]; description = "Lucid support for Skylighting"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "skylighting-modding" = callPackage @@ -262622,31 +262278,40 @@ self: { }) {}; "slack-web" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, errors, fakepull - , hashable, hspec, http-api-data, http-client, http-client-tls - , megaparsec, mtl, QuickCheck, quickcheck-instances, scientific - , servant, servant-client, servant-client-core, text, time - , transformers, unordered-containers + ({ mkDerivation, aeson, aeson-pretty, base, base16-bytestring + , bytestring, classy-prelude, containers, cryptonite + , data-default-class, deepseq, either, errors, fakepull + , generic-arbitrary, hashable, hspec, hspec-core, hspec-discover + , hspec-golden, http-api-data, http-client, http-client-tls + , megaparsec, mono-traversable, mtl, pretty-simple, QuickCheck + , quickcheck-instances, refined, scientific, servant + , servant-client, servant-client-core, string-conversions + , string-variants, template-haskell, text, th-compat, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "slack-web"; - version = "0.4.0.0"; - sha256 = "1l6vls3c941gfvmx11l7xqj1vnngxk5las3pjdw45c93cqfzin74"; + version = "1.6.1.0"; + sha256 = "08cs3y9q76mj0xjfxphm2nnmngcxhdqmdqimxph82143hs4g8qh7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base containers deepseq errors hashable http-api-data - http-client http-client-tls megaparsec mtl scientific servant - servant-client servant-client-core text time transformers - unordered-containers + aeson base base16-bytestring bytestring classy-prelude containers + cryptonite data-default-class deepseq either errors hashable + http-api-data http-client http-client-tls megaparsec + mono-traversable mtl refined scientific servant servant-client + servant-client-core string-conversions string-variants text time + transformers unordered-containers vector ]; testHaskellDepends = [ - aeson base fakepull hspec QuickCheck quickcheck-instances text time + aeson aeson-pretty base bytestring classy-prelude fakepull + generic-arbitrary hspec hspec-core hspec-golden mtl pretty-simple + QuickCheck quickcheck-instances string-conversions string-variants + template-haskell text th-compat time ]; + testToolDepends = [ hspec-discover ]; description = "Bindings for the Slack web API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "slate" = callPackage @@ -262685,8 +262350,8 @@ self: { }: mkDerivation { pname = "slave-thread"; - version = "1.1.0.1"; - sha256 = "05hz0qglxg889l3b0sw9f79xqssw70fd62a766xcvj7aalmrc32i"; + version = "1.1.0.2"; + sha256 = "1pbffrmwd975as495b5b4ad59rajgq1dmbvmp07zfb2rmwhpr5n8"; libraryHaskellDepends = [ base deferred-folds focus foldl stm-containers ]; @@ -262696,8 +262361,6 @@ self: { ]; description = "A fundamental solution to ghost threads and silent exceptions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sleep" = callPackage @@ -262767,16 +262430,14 @@ self: { }: mkDerivation { pname = "slick"; - version = "1.1.2.2"; - sha256 = "0q6q496cvrsc4gnksihib0dr80cjg0n9vy69h2ani2ax0g75fzqd"; + version = "1.2.0.0"; + sha256 = "1a1k723x0q9i43lvzagqar9fcaprni77r158la09kmmxzdmbzsl2"; libraryHaskellDepends = [ aeson base bytestring directory extra mustache pandoc shake text unordered-containers ]; description = "A quick & easy static site builder built with shake and pandoc"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "slidemews" = callPackage @@ -262797,6 +262458,7 @@ self: { license = "GPL"; hydraPlatforms = lib.platforms.none; mainProgram = "slidemews"; + broken = true; }) {}; "slim" = callPackage @@ -262975,7 +262637,9 @@ self: { testHaskellDepends = [ base hspec text text-icu ]; description = "Clean URI slugs for Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "slugger"; + broken = true; }) {}; "slugify" = callPackage @@ -262991,33 +262655,11 @@ self: { testToolDepends = [ hspec-discover ]; description = "Convert text into slugs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "slynx" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, containers - , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix - , mwc-random, optparse-applicative, statistics, text, transformers - , vector - }: - mkDerivation { - pname = "slynx"; - version = "0.6.1.1"; - sha256 = "14yn94hl6nlbwa1hk1mgkgckcmb6bvfk2pa3847h98g19bz7qfw4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring containers elynx-markov elynx-seq - elynx-tools elynx-tree hmatrix mwc-random optparse-applicative - statistics text transformers vector - ]; - executableHaskellDepends = [ base ]; - description = "Handle molecular sequences"; - license = lib.licenses.gpl3Plus; - mainProgram = "slynx"; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - - "slynx_0_7_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix , matrices, optparse-applicative, random, statistics, text @@ -263037,7 +262679,6 @@ self: { executableHaskellDepends = [ base ]; description = "Handle molecular sequences"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; mainProgram = "slynx"; maintainers = [ lib.maintainers.dschrempf ]; }) {}; @@ -263361,6 +263002,8 @@ self: { ]; description = "Combinators for Maybe types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "smash-aeson" = callPackage @@ -263372,6 +263015,7 @@ self: { libraryHaskellDepends = [ aeson base smash unordered-containers ]; description = "Aeson support for the smash library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "smash-lens" = callPackage @@ -263384,6 +263028,7 @@ self: { testHaskellDepends = [ base ]; description = "Optics for the `smash` library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "smash-microlens" = callPackage @@ -263396,6 +263041,7 @@ self: { testHaskellDepends = [ base ]; description = "Optics for the `smash` library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "smash-optics" = callPackage @@ -263407,6 +263053,7 @@ self: { libraryHaskellDepends = [ base optics-core smash ]; description = "Optics for the `smash` library using `optics-core`"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "smawk" = callPackage @@ -263651,6 +263298,79 @@ self: { license = lib.licenses.bsd3; }) {}; + "smtlib-backends" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "smtlib-backends"; + version = "0.2"; + sha256 = "0p77m8f937zsnkxwc44pwhbm2dghbvw7f0xr867f07b1kzl6vpdk"; + revision = "1"; + editedCabalFile = "169qn41nvl5lcx41rhyj64nf7pxqabqh53f83m8wc0ydnim7jdc1"; + libraryHaskellDepends = [ base bytestring ]; + description = "Low-level functions for SMT-LIB-based interaction with SMT solvers"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "smtlib-backends-process" = callPackage + ({ mkDerivation, async, base, bytestring, data-default + , smtlib-backends, smtlib-backends-tests, tasty, tasty-hunit + , typed-process + }: + mkDerivation { + pname = "smtlib-backends-process"; + version = "0.2"; + sha256 = "11jcx0ixf0yd9wjc77xvfsr1hvb5awr1wxvl18y54jdlkff8qfzz"; + revision = "1"; + editedCabalFile = "1shxanngvq2xfxqcxa4pkk5r570fbajvbrnwal0xnrljnf1rrfv5"; + libraryHaskellDepends = [ + async base bytestring data-default smtlib-backends typed-process + ]; + testHaskellDepends = [ + base bytestring data-default smtlib-backends smtlib-backends-tests + tasty tasty-hunit typed-process + ]; + description = "An SMT-LIB backend running solvers as external processes"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "smtlib-backends-tests" = callPackage + ({ mkDerivation, base, smtlib-backends, tasty, tasty-hunit }: + mkDerivation { + pname = "smtlib-backends-tests"; + version = "0.2"; + sha256 = "14n5qdan4kbcc9h1agdnvc4hbaycmpm2srdx0c19g76iwc3598c8"; + libraryHaskellDepends = [ base smtlib-backends tasty tasty-hunit ]; + description = "Testing SMT-LIB backends"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "smtlib-backends-z3" = callPackage + ({ mkDerivation, base, bytestring, containers, gomp, inline-c + , smtlib-backends, smtlib-backends-tests, tasty, tasty-hunit, z3 + }: + mkDerivation { + pname = "smtlib-backends-z3"; + version = "0.2"; + sha256 = "0ar2ian2ap2zwq7x2vr4pf2ilkhfdkxl23mc4kga0hrq2n0nknf0"; + revision = "1"; + editedCabalFile = "1j38qi4025krwcqylkvv4n1vn2jh376ib6a9ii2sjz9k18xwnmin"; + libraryHaskellDepends = [ + base bytestring containers inline-c smtlib-backends + ]; + librarySystemDepends = [ gomp z3 ]; + testHaskellDepends = [ + base bytestring smtlib-backends smtlib-backends-tests tasty + tasty-hunit + ]; + description = "An SMT-LIB backend implemented using Z3's C API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) gomp; inherit (pkgs) z3;}; + "smtlib2" = callPackage ({ mkDerivation, base, constraints, containers, dependent-map , dependent-sum, mtl, template-haskell @@ -263937,6 +263657,8 @@ self: { pname = "snap"; version = "1.1.3.1"; sha256 = "1zq7yz5w9ms8zm5z4c05awkdarqbmb7pp13y9c1x04qfd5ba4c47"; + revision = "2"; + editedCabalFile = "16rkb05mrvi7binynawkshsvikdvxqrv8bxxjcgs4k30arx39cz5"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist fail filepath hashable @@ -264007,6 +263729,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "snap-auth-cli"; + broken = true; }) {}; "snap-blaze" = callPackage @@ -264030,7 +263753,6 @@ self: { description = "blaze-html-clay integration for Snap"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snap-configuration-utilities" = callPackage @@ -264062,8 +263784,8 @@ self: { pname = "snap-core"; version = "1.0.5.0"; sha256 = "0hf671g7h4nikfvi05q3mmcxhfcsh874dkansssn0mc68k9fsak4"; - revision = "2"; - editedCabalFile = "14cvxfyq4d0sjyyj1qxphzywgq63kxmc4bcgwfd6hphqd60h2p35"; + revision = "3"; + editedCabalFile = "02r6plphl4vqig3xap9amdib0qjd98nqpn5jhy6hsbiwh3p7cy9b"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -264194,6 +263916,8 @@ self: { ]; description = "Snap dynamic loader"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "snap-loader-static" = callPackage @@ -264267,8 +263991,8 @@ self: { pname = "snap-server"; version = "1.1.2.0"; sha256 = "0w4yv9a5ilpma0335ariwap2iscmdbaaif88lq3cm7px910nyc4j"; - revision = "1"; - editedCabalFile = "0ijwp0s976cpb4nny8l7vpf5xny6k8dy2xb1rya1l2x5yzj7hlrj"; + revision = "2"; + editedCabalFile = "0dzsn3y7jnha1jbp0n5igjrg4cb8kggps798rlix60d66iy8r1l2"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -264377,6 +264101,7 @@ self: { description = "Snap Framework utilities"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "snap-web-routes" = callPackage @@ -264474,6 +264199,7 @@ self: { description = "Provides an Acid-State backend for the Auth Snaplet"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "snaplet-coffee" = callPackage @@ -264492,6 +264218,7 @@ self: { description = "CoffeeScript for Snap, auto-compilation and pre-compilation"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "snaplet-css-min" = callPackage @@ -264796,6 +264523,7 @@ self: { description = "mysql-simple snaplet for the Snap Framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "snaplet-oauth" = callPackage @@ -264920,6 +264648,7 @@ self: { description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "snaplet-redis" = callPackage @@ -265099,8 +264828,6 @@ self: { ]; description = "sqlite-simple snaplet for the Snap Framework"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-sqlite-simple-jwt-auth" = callPackage @@ -265121,6 +264848,7 @@ self: { description = "Snaplet for JWT authentication with snaplet-sqlite-simple"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "snaplet-stripe" = callPackage @@ -265221,6 +264949,8 @@ self: { ]; description = "Bindings to the Google Snappy library for fast compression/decompression"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) snappy;}; "snappy-conduit" = callPackage @@ -265233,7 +264963,6 @@ self: { description = "Conduit bindings for Snappy (see snappy package)"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snappy-framing" = callPackage @@ -265245,6 +264974,7 @@ self: { libraryHaskellDepends = [ array base binary bytestring snappy ]; description = "Snappy Framing Format in Haskell"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; }) {}; "snappy-iteratee" = callPackage @@ -265271,6 +265001,7 @@ self: { ]; description = "Lazy bytestring compression and decompression"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "sndfile-enumerators" = callPackage @@ -265451,19 +265182,19 @@ self: { "snowchecked" = callPackage ({ mkDerivation, base, bytestring, data-default, deepseq, hedgehog - , text, text-conversions, time, wide-word + , text, text-conversions, time, unliftio, wide-word }: mkDerivation { pname = "snowchecked"; - version = "0.0.1.2"; - sha256 = "1dxj23aa2gacf5gjb53bqvy7rfv12b5y8aqijvvj436lzabrlarc"; + version = "0.0.2.0"; + sha256 = "0n0pi92mjyg2jk0h1jbiyj8ib6jzgnkzfmnvrz41r6gd189hkn7a"; libraryHaskellDepends = [ base bytestring data-default deepseq text text-conversions time wide-word ]; testHaskellDepends = [ base bytestring data-default deepseq hedgehog text text-conversions - time wide-word + time unliftio wide-word ]; description = "A checksummed variation on Twitter's Snowflake UID generation algorithm"; license = lib.licenses.asl20; @@ -265820,10 +265551,8 @@ self: { }: mkDerivation { pname = "sockets"; - version = "0.5.0.0"; - sha256 = "0pxrdxmiqyp5xs24sp22b4rldhzm1rahkdq5lc24m30g4p609xa3"; - revision = "1"; - editedCabalFile = "1ji60m0wj3jwdfwdjaxzic41rwdnq72m9xspn64f66c872lx137d"; + version = "0.6.1.0"; + sha256 = "0isnl0vzdm95fgpjpib6ivgwma8acyqc41020lqa3bdzx82whcsy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -265841,6 +265570,7 @@ self: { description = "High-level network sockets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sockets-and-pipes" = callPackage @@ -265853,8 +265583,8 @@ self: { pname = "sockets-and-pipes"; version = "0.3"; sha256 = "0hlq64nh7iw7brn11j7xhy1zcmk0iczarg7ig7z2i7ny11czi73l"; - revision = "1"; - editedCabalFile = "15jp7k379madgg5rd3rzlnz3502114yzd1yiwcrvmcj6bdhcnrf9"; + revision = "4"; + editedCabalFile = "0b7vn23r6v6s9lc2ghajbw3ci2h4wm7i07rsrwk3i4fdkp3g7dd2"; libraryHaskellDepends = [ aeson ascii async attoparsec base blaze-html bytestring containers directory filepath list-transformer network network-simple relude @@ -265890,7 +265620,6 @@ self: { description = "A small websocket backend provider"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "socks" = callPackage @@ -265968,7 +265697,6 @@ self: { ]; description = "Generate CSV Exports of your Solana Staking Rewards"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "solana-staking-csvs"; }) {}; @@ -265983,6 +265711,8 @@ self: { libraryHaskellDepends = [ base time ]; description = "Simple library for solar calculations"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "solga" = callPackage @@ -266087,20 +265817,6 @@ self: { }) {}; "some" = callPackage - ({ mkDerivation, base, deepseq }: - mkDerivation { - pname = "some"; - version = "1.0.3"; - sha256 = "0w3syapwz9v916zf1i4f8vxymdfg7syc2cpxgnqr018pbswzxrk2"; - revision = "2"; - editedCabalFile = "1w3snkgqhrgi2x2bdny9i7a9ybmal3asrh6g6kg8v86kq1gyr34k"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base ]; - description = "Existential type: Some"; - license = lib.licenses.bsd3; - }) {}; - - "some_1_0_4_1" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { pname = "some"; @@ -266110,7 +265826,6 @@ self: { testHaskellDepends = [ base ]; description = "Existential type: Some"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "some-dict-of" = callPackage @@ -266145,7 +265860,6 @@ self: { license = "GPL"; hydraPlatforms = lib.platforms.none; mainProgram = "svdump"; - broken = true; }) {}; "sop-core" = callPackage @@ -266342,6 +266056,7 @@ self: { ]; description = "Approximate a song from other pieces of sound"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "sound-collage"; }) {}; @@ -266356,7 +266071,6 @@ self: { executableHaskellDepends = [ base containers parseargs WAVE ]; description = "Audio delay line"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "delay"; }) {}; @@ -266371,7 +266085,6 @@ self: { executableHaskellDepends = [ base split WAVE ]; description = "sound generator"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "soundgen"; }) {}; @@ -266497,6 +266210,7 @@ self: { libraryPkgconfigDepends = [ sox ]; description = "Write, read, convert audio signals using libsox"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) sox;}; "soyuz" = callPackage @@ -266669,7 +266383,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "A simple programming and debugging environment"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; + badPlatforms = lib.platforms.darwin; mainProgram = "spade"; }) {}; @@ -266867,6 +266581,8 @@ self: { pname = "sparse-linear-algebra"; version = "0.3.1"; sha256 = "1jfwydr0pzph932h7jvnmp1d8qqrhxsq7rbb6cjbmga55s5pfqn7"; + revision = "1"; + editedCabalFile = "0fi80wlzzmrqsc02g2zlb9skkfgkyws0v16n223j88jjr90vxmxa"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers exceptions hspec mtl primitive QuickCheck @@ -266987,7 +266703,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "spartacon"; - broken = true; }) {}; "spata" = callPackage @@ -267020,6 +266735,7 @@ self: { ]; description = "3d math including quaternions/euler angles/dcms and utility functions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "spatial-rotations" = callPackage @@ -267649,7 +267365,6 @@ self: { description = "B-Splines, other splines, and NURBS"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "splint" = callPackage @@ -267661,6 +267376,8 @@ self: { libraryHaskellDepends = [ base containers ghc hlint stm ]; description = "HLint as a GHC source plugin"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "split" = callPackage @@ -267716,6 +267433,7 @@ self: { ]; description = "Split a big audio file into pieces at positions of silence"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "split-record"; }) {}; @@ -267757,22 +267475,6 @@ self: { }) {testu01 = null;}; "splitmix-distributions" = callPackage - ({ mkDerivation, base, containers, erf, exceptions, hspec, mtl - , splitmix, transformers - }: - mkDerivation { - pname = "splitmix-distributions"; - version = "0.9.0.0"; - sha256 = "0y6v93kgbldkf9pznrfy8848njy7cln7bd3nrx2b7dmrz6yd4rpz"; - libraryHaskellDepends = [ - base containers erf exceptions mtl splitmix transformers - ]; - testHaskellDepends = [ base erf hspec mtl splitmix transformers ]; - description = "Random samplers for some common distributions, based on splitmix"; - license = lib.licenses.bsd3; - }) {}; - - "splitmix-distributions_1_0_0" = callPackage ({ mkDerivation, base, containers, erf, exceptions, hspec, mtl , splitmix, transformers }: @@ -267786,7 +267488,6 @@ self: { testHaskellDepends = [ base erf hspec mtl splitmix transformers ]; description = "Random samplers for some common distributions, based on splitmix"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "splitter" = callPackage @@ -268011,7 +267712,6 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "sproxy"; - broken = true; }) {}; "sproxy-web" = callPackage @@ -268039,7 +267739,6 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "sproxy-web"; - broken = true; }) {}; "sproxy2" = callPackage @@ -268065,6 +267764,7 @@ self: { ]; description = "Secure HTTP proxy for authenticating users via OAuth2"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "sproxy2"; }) {}; @@ -268272,24 +267972,25 @@ self: { "sqlite-easy" = callPackage ({ mkDerivation, base, bytestring, direct-sqlite, hspec - , hspec-discover, migrant-core, resource-pool, text + , hspec-discover, migrant-core, mtl, resource-pool, text, unliftio + , unliftio-core }: mkDerivation { pname = "sqlite-easy"; - version = "0.1.0.0"; - sha256 = "0i971dvfsdxpm6chxbc53flcw8gyk45nsp8pm0q2avl8p9sab05f"; - revision = "1"; - editedCabalFile = "0b3sa10mk3c2gjpsgdnylb3iqpwycfnhpscqhi68s0vfvq2ph9w8"; + version = "0.2.0.1"; + sha256 = "03sgw1g1iqkf1rv3dz5y9jh7z6iripx8dz9cs5ixznislsxkmg5l"; libraryHaskellDepends = [ - base bytestring direct-sqlite migrant-core resource-pool text + base bytestring direct-sqlite migrant-core mtl resource-pool text + unliftio-core ]; testHaskellDepends = [ - base direct-sqlite hspec hspec-discover text + base direct-sqlite hspec hspec-discover text unliftio ]; testToolDepends = [ hspec-discover ]; description = "A primitive yet easy to use sqlite library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sqlite-simple" = callPackage @@ -268332,13 +268033,12 @@ self: { }: mkDerivation { pname = "sqlite-simple-interpolate"; - version = "0.1"; - sha256 = "0cjkk3zy3kasddkicwy8wklcj7i6bg779b82f1liaimsiwnmjpf3"; - revision = "1"; - editedCabalFile = "04dpspiia4mlpwfpdnsnyb24qsvy7da25rcbbyxyavadz3ri44hm"; + version = "0.1.1"; + sha256 = "1vi43mm6lwdpsq0r2gs7nsrn4g88r3q4d8g5gmm7al8ziz9c39vq"; libraryHaskellDepends = [ base haskell-src-meta mtl parsec sqlite-simple template-haskell ]; + testHaskellDepends = [ base sqlite-simple ]; description = "Interpolated SQLite queries via quasiquotation"; license = lib.licenses.bsd3; }) {}; @@ -268423,8 +268123,8 @@ self: { }: mkDerivation { pname = "squeal-postgresql"; - version = "0.9.0.0"; - sha256 = "1gd421zkpd5lg1dl94297dslq43pjl274ahdd947jjvgr6gr193n"; + version = "0.9.1.0"; + sha256 = "0jy2324j4jrv8nc7dks4286vmr2llbb8v7b32zqlrwndgyy41kkp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -268449,6 +268149,7 @@ self: { ]; description = "Squeal PostgreSQL Library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "example"; maintainers = [ lib.maintainers.erictapen ]; }) {}; @@ -268467,6 +268168,7 @@ self: { ]; description = "LTree extension for Squeal"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "squeal-postgresql-uuid-ossp" = callPackage @@ -268478,6 +268180,7 @@ self: { libraryHaskellDepends = [ base squeal-postgresql ]; description = "UUID OSSP extension for Squeal"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "squeather" = callPackage @@ -268547,7 +268250,6 @@ self: { description = "Module limbo"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "srcinst" = callPackage @@ -268638,6 +268340,8 @@ self: { ]; description = "Dhall Encoder/Decoder for SRT"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "srt-formatting" = callPackage @@ -268656,6 +268360,25 @@ self: { license = lib.licenses.mit; }) {}; + "srv" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , raw-strings-qq, wai, wai-app-static, warp, warp-tls, yaml + }: + mkDerivation { + pname = "srv"; + version = "0.1.0.0"; + sha256 = "0bbiz8n8v8lscxzxdhqwppyvrsvapk5xilm35kah1bp0rs8mi1w0"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base bytestring containers directory raw-strings-qq wai + wai-app-static warp warp-tls yaml + ]; + description = "A simple web server for local usage"; + license = lib.licenses.asl20; + mainProgram = "srv"; + }) {}; + "sscan" = callPackage ({ mkDerivation, async, base, brick, directory, filepath, microlens , microlens-th, process, temporary, text, time, vty @@ -269044,8 +268767,8 @@ self: { pname = "stack"; version = "2.9.1"; sha256 = "01020dx89m07qmjs58vs2kidhkzq3106md08w6c65bzxvlf6kcwk"; - revision = "3"; - editedCabalFile = "1i0ddb17kzxvlv3xpgyi3acsi21h6iadwwv21ih063cdk9ilysxg"; + revision = "4"; + editedCabalFile = "1ixa4k1jcsrq8i6zd5g483sp86kp87i2bifd5vfvpjyfzayb1n3d"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -269118,6 +268841,103 @@ self: { maintainers = [ lib.maintainers.cdepillabout ]; }) {}; + "stack_2_9_3" = callPackage + ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array + , async, attoparsec, base, base64-bytestring, bytestring, Cabal + , casa-client, casa-types, colour, conduit, conduit-extra + , containers, cryptonite, cryptonite-conduit, deepseq, directory + , echo, exceptions, extra, file-embed, filelock, filepath, fsnotify + , generic-deriving, hackage-security, hashable, hi-file-parser + , hpack, hpc, hspec, hspec-discover, http-client, http-client-tls + , http-conduit, http-download, http-types, memory, microlens + , mintty, mono-traversable, mtl, mustache, neat-interpolation + , network-uri, open-browser, optparse-applicative, pantry, path + , path-io, persistent, persistent-sqlite, persistent-template + , pretty, primitive, process, project-template, QuickCheck, random + , raw-strings-qq, retry, rio, rio-prettyprint, semigroups + , smallcheck, split, stm, streaming-commons, tar, template-haskell + , temporary, text, text-metrics, th-reify-many, time, tls + , transformers, typed-process, unicode-transforms, unix + , unix-compat, unliftio, unordered-containers, vector, yaml + , zip-archive, zlib + }: + mkDerivation { + pname = "stack"; + version = "2.9.3"; + sha256 = "1p7j05cm9y3vbj5wkcjsia65agfzyd2r8r1fvd4l4qnx4yr0qw64"; + configureFlags = [ + "-fdisable-git-info" "-fhide-dependency-versions" + "-fsupported-build" + ]; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal filepath ]; + libraryHaskellDepends = [ + aeson annotated-wl-pprint ansi-terminal array async attoparsec base + base64-bytestring bytestring Cabal casa-client casa-types colour + conduit conduit-extra containers cryptonite cryptonite-conduit + deepseq directory echo exceptions extra file-embed filelock + filepath fsnotify generic-deriving hackage-security hashable + hi-file-parser hpack hpc http-client http-client-tls http-conduit + http-download http-types memory microlens mintty mono-traversable + mtl mustache neat-interpolation network-uri open-browser + optparse-applicative pantry path path-io persistent + persistent-sqlite persistent-template pretty primitive process + project-template random retry rio rio-prettyprint semigroups split + stm streaming-commons tar template-haskell temporary text + text-metrics th-reify-many time tls transformers typed-process + unicode-transforms unix unix-compat unliftio unordered-containers + vector yaml zip-archive zlib + ]; + executableHaskellDepends = [ + aeson annotated-wl-pprint ansi-terminal array async attoparsec base + base64-bytestring bytestring Cabal casa-client casa-types colour + conduit conduit-extra containers cryptonite cryptonite-conduit + deepseq directory echo exceptions extra file-embed filelock + filepath fsnotify generic-deriving hackage-security hashable + hi-file-parser hpack hpc http-client http-client-tls http-conduit + http-download http-types memory microlens mintty mono-traversable + mtl mustache neat-interpolation network-uri open-browser + optparse-applicative pantry path path-io persistent + persistent-sqlite persistent-template pretty primitive process + project-template random retry rio rio-prettyprint semigroups split + stm streaming-commons tar template-haskell temporary text + text-metrics th-reify-many time tls transformers typed-process + unicode-transforms unix unix-compat unliftio unordered-containers + vector yaml zip-archive zlib + ]; + testHaskellDepends = [ + aeson annotated-wl-pprint ansi-terminal array async attoparsec base + base64-bytestring bytestring Cabal casa-client casa-types colour + conduit conduit-extra containers cryptonite cryptonite-conduit + deepseq directory echo exceptions extra file-embed filelock + filepath fsnotify generic-deriving hackage-security hashable + hi-file-parser hpack hpc hspec http-client http-client-tls + http-conduit http-download http-types memory microlens mintty + mono-traversable mtl mustache neat-interpolation network-uri + open-browser optparse-applicative pantry path path-io persistent + persistent-sqlite persistent-template pretty primitive process + project-template QuickCheck random raw-strings-qq retry rio + rio-prettyprint semigroups smallcheck split stm streaming-commons + tar template-haskell temporary text text-metrics th-reify-many time + tls transformers typed-process unicode-transforms unix unix-compat + unliftio unordered-containers vector yaml zip-archive zlib + ]; + testToolDepends = [ hspec-discover ]; + doCheck = false; + preCheck = "export HOME=$TMPDIR"; + postInstall = '' + exe=$out/bin/stack + mkdir -p $out/share/bash-completion/completions + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack + ''; + description = "The Haskell Tool Stack"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "stack"; + maintainers = [ lib.maintainers.cdepillabout ]; + }) {}; + "stack-all" = callPackage ({ mkDerivation, aeson, base, cached-json-file, config-ini , directory, extra, filepath, http-query, process, simple-cmd @@ -269225,7 +269045,6 @@ self: { license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; mainProgram = "shc"; - broken = true; }) {}; "stack-lib" = callPackage @@ -269900,34 +269719,39 @@ self: { ]; description = "Program to fold GHC prof files into flamegraph input"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "stackcollapse-ghc"; + broken = true; }) {}; "stackctl" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-pretty, amazonka , amazonka-cloudformation, amazonka-core, amazonka-ec2 , amazonka-lambda, amazonka-sts, base, Blammo, bytestring, cfn-flip - , conduit, containers, errors, exceptions, extra, fast-logger - , filepath, Glob, hspec, lens, lens-aeson, monad-logger - , optparse-applicative, resourcet, rio, text, time, unliftio - , unliftio-core, unordered-containers, uuid, yaml + , conduit, containers, envparse, errors, exceptions, extra + , filepath, Glob, hspec, lens, lens-aeson, monad-logger, mtl + , optparse-applicative, QuickCheck, resourcet, rio, semigroups + , text, time, unliftio, unliftio-core, unordered-containers, uuid + , yaml }: mkDerivation { pname = "stackctl"; - version = "1.1.0.3"; - sha256 = "0vvhvyvc6dz8l0df3f14qiy5851n2mv45gvjyz1cq94f44higfjw"; + version = "1.3.0.0"; + sha256 = "1a97xkbvcvr7r85b4xrzdijap3zw02j0rqxix3ld9ns907mkdq2n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing aeson-pretty amazonka amazonka-cloudformation amazonka-core amazonka-ec2 amazonka-lambda amazonka-sts base Blammo - bytestring cfn-flip conduit containers errors exceptions extra - fast-logger filepath Glob lens lens-aeson monad-logger - optparse-applicative resourcet rio text time unliftio unliftio-core - unordered-containers uuid yaml + bytestring cfn-flip conduit containers envparse errors exceptions + extra filepath Glob lens lens-aeson monad-logger mtl + optparse-applicative resourcet rio semigroups text time unliftio + unliftio-core unordered-containers uuid yaml ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec yaml ]; + testHaskellDepends = [ + aeson base bytestring hspec mtl QuickCheck yaml + ]; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "stackctl"; @@ -269978,6 +269802,8 @@ self: { ]; description = "GHC.Generics style staged generics"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "stagen" = callPackage @@ -270487,8 +270313,8 @@ self: { }: mkDerivation { pname = "statistics"; - version = "0.16.1.0"; - sha256 = "000rkq5niabbdq0adca81rd19pgazvbnpww8cakhxdh5frf2lj78"; + version = "0.16.1.2"; + sha256 = "15yr0w25dqaqz16635qxkxvr6nj6mkjj9pl7wzw5yr3pn84xjryq"; libraryHaskellDepends = [ aeson async base binary data-default-class deepseq dense-linear-algebra math-functions mwc-random parallel primitive @@ -270846,6 +270672,19 @@ self: { broken = true; }) {}; + "stdcxx" = callPackage + ({ mkDerivation, base, fficxx, fficxx-runtime, template-haskell }: + mkDerivation { + pname = "stdcxx"; + version = "0.7.0.0"; + sha256 = "0r2zm4y1rwpv5pwnlqc51hy746j6hnvhj44vagyxij6ja7xhqxsg"; + libraryHaskellDepends = [ + base fficxx fficxx-runtime template-haskell + ]; + description = "Binding to Standard Template Library C++"; + license = lib.licenses.bsd2; + }) {}; + "stdf" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring , containers, data-binary-ieee754, split, text, time, unix-time @@ -270914,38 +270753,37 @@ self: { }) {}; "steeloverseer" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring - , containers, directory, exceptions, filepath, fsnotify, hspec - , managed, mtl, optparse-applicative, process, regex-tdfa - , semigroups, stm, streaming, text, unix, yaml + ({ mkDerivation, aeson, aeson-compat, ansi-terminal, async, base + , bytestring, containers, directory, exceptions, filepath, fsnotify + , hspec, hspec-discover, managed, mtl, optparse-applicative + , process, regex-tdfa, semigroups, stm, streaming, text, unix, yaml }: mkDerivation { pname = "steeloverseer"; - version = "2.1.0.0"; - sha256 = "1l2pfk6fdnc2ssmcjmwj8w5wfk6ra4n880nbxr670kzrlnr2vqg1"; - revision = "1"; - editedCabalFile = "0vb2k7c02gmnn03zq84pb9ycsl8nkahkddwzn3nh0jsgb2jc9pln"; + version = "2.1.0.1"; + sha256 = "1zz30i6icz3pghrvcyvp8xfzdf3zn3zwqc53chpksb8mkm26fngp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal async base bytestring containers exceptions - fsnotify managed mtl process regex-tdfa semigroups stm streaming - text unix yaml + aeson aeson-compat ansi-terminal async base bytestring containers + exceptions fsnotify managed mtl process regex-tdfa semigroups stm + streaming text unix yaml ]; + libraryToolDepends = [ hspec-discover ]; executableHaskellDepends = [ - async base bytestring directory exceptions filepath fsnotify - managed mtl optparse-applicative regex-tdfa semigroups stm + aeson-compat async base bytestring directory exceptions filepath + fsnotify managed mtl optparse-applicative regex-tdfa semigroups stm streaming text yaml ]; + executableToolDepends = [ hspec-discover ]; testHaskellDepends = [ - async base bytestring exceptions fsnotify hspec managed mtl - regex-tdfa semigroups stm streaming text yaml + aeson-compat async base bytestring exceptions fsnotify hspec + managed mtl regex-tdfa semigroups stm streaming text yaml ]; + testToolDepends = [ hspec-discover ]; description = "A file watcher and development tool"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "sos"; - broken = true; }) {}; "stego-uuid" = callPackage @@ -271124,6 +270962,7 @@ self: { testHaskellDepends = [ base hspec mtl stm stm-queue ]; description = "A simplistic actor model based on STM"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "stm-channelize" = callPackage @@ -271287,6 +271126,8 @@ self: { testHaskellDepends = [ base hspec stm ]; description = "A library for constructing incremental computations"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "stm-io-hooks" = callPackage @@ -271361,6 +271202,8 @@ self: { ]; description = "An implementation of a real-time concurrent queue"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "stm-queue-extras" = callPackage @@ -271423,6 +271266,7 @@ self: { testHaskellDepends = [ async base QuickCheck random Unique ]; description = "STM wrapper around Control.Concurrent.Supply."; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "stm-tlist" = callPackage @@ -271546,20 +271390,21 @@ self: { }) {}; "stooq-api" = callPackage - ({ mkDerivation, aeson, base, bytestring, lens, stringsearch, text - , time, utf8-string, vector, wreq + ({ mkDerivation, base, bytestring, cassava, lens, text, time + , utf8-string, vector, wreq }: mkDerivation { pname = "stooq-api"; - version = "0.3.1.0"; - sha256 = "0a2hnhrb00h52z0717zbx1ha4i5aixps0b9n3sw7svdjvz3dygkp"; + version = "0.4.1.0"; + sha256 = "0kjkccqwfr9bdlca8mw7ryw0jr88zs9ap9s9f2idzbdqdqavidiq"; libraryHaskellDepends = [ - aeson base bytestring lens stringsearch text time utf8-string - vector wreq + base bytestring cassava lens text time utf8-string vector wreq ]; doHaddock = false; description = "A simple wrapper around stooq.pl API for downloading market data."; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "stopwatch" = callPackage @@ -271695,6 +271540,8 @@ self: { ]; description = "Fast, packed, strict storable arrays with a list interface like ByteString"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "storablevector-carray" = callPackage @@ -271706,6 +271553,7 @@ self: { libraryHaskellDepends = [ base carray storablevector utility-ht ]; description = "Conversion between storablevector and carray"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "storablevector-streamfusion" = callPackage @@ -271781,6 +271629,8 @@ self: { pname = "store-core"; version = "0.4.4.4"; sha256 = "0h21wp51phbwk9ajblqaqzx1hk9c58gkihmycjn0hj299kxly80y"; + revision = "1"; + editedCabalFile = "04jv0y5k9iscw8ac72rbycmcscadnjsv2rjgwj6x0r2bymvdq00g"; libraryHaskellDepends = [ base bytestring ghc-prim primitive text transformers ]; @@ -272062,7 +271912,6 @@ self: { description = "Programmatically edit MIDI event streams via ALSA"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "streaming" = callPackage @@ -272493,6 +272342,8 @@ self: { pname = "streaming-postgresql-simple"; version = "0.2.0.5"; sha256 = "1gaj099hxdvyzmzz6z0s1kzv3qqv3py609jz7cp2j3f6497dhdqa"; + revision = "1"; + editedCabalFile = "11c8gc25bzqxa4mxj0shry5hhhll8i3yv6bspznl1d7gz3pxhrp4"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq postgresql-simple resourcet safe-exceptions streaming transformers @@ -272569,8 +272420,6 @@ self: { libraryPkgconfigDepends = [ zlib ]; description = "http, attoparsec, pipes and other utilities for the streaming libraries"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) zlib;}; "streaming-wai" = callPackage @@ -272668,6 +272517,8 @@ self: { testSystemDepends = [ archive ]; description = "Stream data from archives using the streamly library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {archive = null;}; "streamly-binary" = callPackage @@ -272697,8 +272548,8 @@ self: { pname = "streamly-bytestring"; version = "0.1.4"; sha256 = "1qwgrxm2x46951si18sbmqhq4fik26l07kmspv23m9q3drn0mklc"; - revision = "3"; - editedCabalFile = "0jbiq6g025qyhvl05f0shvnak4jnpxngzjz1n73c8hnjb47kzc21"; + revision = "4"; + editedCabalFile = "1mzrj7bkmvz27svxjaknrgvxwvz9zpw0ifvpvdbi7idlfmh01mqa"; libraryHaskellDepends = [ base bytestring streamly ]; testHaskellDepends = [ base bytestring directory filepath hspec hspec-discover @@ -272710,6 +272561,8 @@ self: { ]; description = "Library for streamly and bytestring interoperation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "streamly-cassava" = callPackage @@ -272795,6 +272648,8 @@ self: { testSystemDepends = [ lmdb ]; description = "Stream data to or from LMDB databases using the streamly library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) lmdb;}; "streamly-lz4" = callPackage @@ -272835,6 +272690,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Posix related streaming APIs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "streamly-process" = callPackage @@ -272874,15 +272730,15 @@ self: { }) {}; "streams" = callPackage - ({ mkDerivation, adjunctions, base, comonad, distributive - , semigroupoids, semigroups + ({ mkDerivation, adjunctions, base, boring, comonad, distributive + , semigroupoids }: mkDerivation { pname = "streams"; - version = "3.3"; - sha256 = "0h2fjlcsqnwwsqdk371m6drb119rx76b122mmwkd7zl3d86zhcr9"; + version = "3.3.1"; + sha256 = "11aggnf2pcjhhm8h69dhgysg64kyzpw9d493mh2lkcc7w4v4wcig"; libraryHaskellDepends = [ - adjunctions base comonad distributive semigroupoids semigroups + adjunctions base boring comonad distributive semigroupoids ]; description = "Various Haskell 2010 stream comonads"; license = lib.licenses.bsd3; @@ -272940,6 +272796,8 @@ self: { ]; description = "Core components of \"strelka\""; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "strelka-wai" = callPackage @@ -272956,6 +272814,7 @@ self: { ]; description = "WAI compatibility layer for \"strelka\""; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "strict" = callPackage @@ -273020,40 +272879,40 @@ self: { "strict-containers" = callPackage ({ mkDerivation, array, base, base-orphans, binary, ChasingBottoms , containers, deepseq, hashable, HUnit, indexed-traversable - , primitive, QuickCheck, random, strict, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2, transformers + , nothunks, primitive, QuickCheck, random, strict, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, transformers , unordered-containers, vector, vector-binary-instances }: mkDerivation { pname = "strict-containers"; - version = "0.1"; - sha256 = "0rb5mhz1f1g79c7c85q6pnars7qs3qzyl2gsc48p9sd2739q5nzs"; + version = "0.2"; + sha256 = "128aw17c2m3rh2v23c2vdgk7f7rk11plwkzq2carrm1x5nvhrki7"; libraryHaskellDepends = [ array base binary containers deepseq hashable indexed-traversable - primitive strict unordered-containers vector + primitive strict template-haskell unordered-containers vector vector-binary-instances ]; testHaskellDepends = [ - array base base-orphans ChasingBottoms containers deepseq hashable - HUnit primitive QuickCheck random tasty tasty-hunit - tasty-quickcheck template-haskell test-framework - test-framework-hunit test-framework-quickcheck2 transformers - unordered-containers vector + array base base-orphans ChasingBottoms containers deepseq HUnit + nothunks primitive QuickCheck random tasty tasty-hunit + tasty-quickcheck template-haskell transformers vector ]; description = "Strict containers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "strict-containers-lens" = callPackage ({ mkDerivation, base, hashable, lens, strict-containers }: mkDerivation { pname = "strict-containers-lens"; - version = "0.1"; - sha256 = "0162vqkwm9z1pyizvs76fbraw6z43w8j1k7ag25l9lv67gydl4c1"; + version = "0.2"; + sha256 = "08m4brq8sbdi44cw3klakaw3dax3y9x94kxniv8w6dyqmf5as38w"; libraryHaskellDepends = [ base hashable lens strict-containers ]; description = "Strict containers - Lens instances"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "strict-containers-serialise" = callPackage @@ -273062,13 +272921,14 @@ self: { }: mkDerivation { pname = "strict-containers-serialise"; - version = "0.1"; - sha256 = "17hsb90awsrgp83nkzjyr51wz7z5v4fii862arqfjkjqm6scb4d3"; + version = "0.2"; + sha256 = "10y0pcvxidq39z284ffac4sl6yg6cq00x1mmdnwcbaxiq8xhm3hk"; libraryHaskellDepends = [ base cborg hashable serialise strict-containers ]; description = "Strict containers - Serialise instances"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "strict-data" = callPackage @@ -273122,6 +272982,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "strict-impl-params" = callPackage + ({ mkDerivation, base, ghc, ghc-prim, template-haskell }: + mkDerivation { + pname = "strict-impl-params"; + version = "1.0.0"; + sha256 = "0qbc5vk8079vcwxj8sgy696jd629arsws92bcv3vcavnkvzz696c"; + libraryHaskellDepends = [ base ghc ghc-prim template-haskell ]; + description = "Plugin for making top-level implicit parameters strict"; + license = lib.licenses.mit; + }) {}; + "strict-io" = callPackage ({ mkDerivation, base, deepseq, extensible-exceptions }: mkDerivation { @@ -273350,6 +273221,8 @@ self: { pname = "string-conversions"; version = "0.4.0.1"; sha256 = "150rdank90h7v08x0wq4dffjbxv2daf5v9sqfs5mab76kinwxg26"; + revision = "1"; + editedCabalFile = "1g3wxx579mhs2icxngi78pvjfybbk606a6vgns88pg6ws5hrvx4s"; libraryHaskellDepends = [ base bytestring text utf8-string ]; testHaskellDepends = [ base bytestring deepseq hspec QuickCheck quickcheck-instances text @@ -273399,10 +273272,8 @@ self: { }: mkDerivation { pname = "string-interpolate"; - version = "0.3.1.2"; - sha256 = "0gmph9mikqq8hch9wjyyx6dxfxwhmdfrwsrxkvbk7i24lvi19hhp"; - revision = "1"; - editedCabalFile = "1nrpng7r59a25z4qns8vy26rvp1wgn5f4bs8ism40q66ags8f2ad"; + version = "0.3.2.0"; + sha256 = "1sdd472rvykrqkv76745vavpycvb0dzcaxs3yw9dfczaxaz16xws"; libraryHaskellDepends = [ base bytestring haskell-src-exts haskell-src-meta split template-haskell text text-conversions utf8-string @@ -273562,18 +273433,25 @@ self: { }) {}; "string-variants" = callPackage - ({ mkDerivation, aeson, base, bytestring, mono-traversable - , QuickCheck, refined, refinery, string-conversions - , template-haskell, text + ({ mkDerivation, aeson, base, bytestring, hedgehog, hspec + , hspec-core, hspec-discover, hspec-expectations, hspec-hedgehog + , HUnit, mono-traversable, QuickCheck, refined, refinery + , string-conversions, template-haskell, text }: mkDerivation { pname = "string-variants"; - version = "0.1.0.2"; - sha256 = "0lrcjx3ci2kd2347klkwz01cf8mhzfk91sl7301q44cf8fg42az4"; + version = "0.2.0.0"; + sha256 = "0rzxvqv6waggspqbph4n0q249v0h615965rqlbbhv8a3p87kmdcd"; libraryHaskellDepends = [ aeson base bytestring mono-traversable QuickCheck refined refinery string-conversions template-haskell text ]; + testHaskellDepends = [ + aeson base bytestring hedgehog hspec hspec-core hspec-expectations + hspec-hedgehog HUnit mono-traversable QuickCheck refined refinery + string-conversions template-haskell text + ]; + testToolDepends = [ hspec-discover ]; description = "Constrained text newtypes"; license = lib.licenses.mit; }) {}; @@ -273646,6 +273524,8 @@ self: { libraryHaskellDepends = [ base bytestring text ]; description = "Functions for working with strings, including Text, ByteString, etc"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "stringsearch" = callPackage @@ -273787,6 +273667,7 @@ self: { description = "Unofficial Stripe client"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "stripe-http-client" = callPackage @@ -273862,8 +273743,6 @@ self: { ]; description = "Unofficial Stripe servant types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stripe-signature" = callPackage @@ -273988,6 +273867,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Strongly typed paths in Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "strongswan-sql" = callPackage @@ -274030,10 +273911,8 @@ self: { }: mkDerivation { pname = "strongweak"; - version = "0.3.1"; - sha256 = "1n46qw6hkdfbsfpyhpkalkw19fx152925hnpwmm2gr0rjzvwyn2p"; - revision = "2"; - editedCabalFile = "004as88cns3s5jk1c4467g0jdvqp6f9q9xf29cbx0x9d6b911v8x"; + version = "0.3.2"; + sha256 = "1xmqacfv4xqx1v7xdiflmc4am9366jhpdv1r7hldmh1ihw7jkfc3"; libraryHaskellDepends = [ base either prettyprinter refined vector vector-sized ]; @@ -274044,8 +273923,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Convert between strong and weak representations of types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.raehik ]; }) {}; "strptime" = callPackage @@ -274193,8 +274071,10 @@ self: { ]; description = "Structured editing Emacs mode for Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "structured-haskell-mode"; maintainers = [ lib.maintainers.peti ]; + broken = true; }) {}; "structured-mongoDB" = callPackage @@ -274405,7 +274285,7 @@ self: { "stylish-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , directory, file-embed, filepath, ghc-lib-parser + , directory, file-embed, filepath, ghc, ghc-boot, ghc-boot-th , ghc-lib-parser-ex, HsYAML, HsYAML-aeson, HUnit, mtl , optparse-applicative, random, regex-tdfa, strict, syb , test-framework, test-framework-hunit, text @@ -274416,6 +274296,40 @@ self: { sha256 = "17w92v0qnwj7m6yqdq5cxbr04xiz0yfnnyx5q54218wdl7n5lf6d"; isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers directory file-embed + filepath ghc ghc-boot ghc-boot-th ghc-lib-parser-ex HsYAML + HsYAML-aeson mtl regex-tdfa syb text + ]; + executableHaskellDepends = [ + aeson base bytestring Cabal containers directory file-embed + filepath ghc ghc-boot ghc-boot-th ghc-lib-parser-ex HsYAML + HsYAML-aeson mtl optparse-applicative regex-tdfa strict syb text + ]; + testHaskellDepends = [ + aeson base bytestring Cabal containers directory file-embed + filepath ghc ghc-boot ghc-boot-th ghc-lib-parser-ex HsYAML + HsYAML-aeson HUnit mtl random regex-tdfa syb test-framework + test-framework-hunit text + ]; + description = "Haskell code prettifier"; + license = lib.licenses.bsd3; + mainProgram = "stylish-haskell"; + }) {}; + + "stylish-haskell_0_14_4_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, file-embed, filepath, ghc-lib-parser + , ghc-lib-parser-ex, HsYAML, HsYAML-aeson, HUnit, mtl + , optparse-applicative, random, regex-tdfa, strict, syb + , test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "stylish-haskell"; + version = "0.14.4.0"; + sha256 = "0y0vfz5vkvw0wzcsw2ym3nix0v3pwjw2vas0qv3lrhdvn3ba9gb7"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base bytestring Cabal containers directory file-embed filepath ghc-lib-parser ghc-lib-parser-ex HsYAML HsYAML-aeson mtl @@ -274433,6 +274347,7 @@ self: { ]; description = "Haskell code prettifier"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "stylish-haskell"; }) {}; @@ -274655,8 +274570,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Allows to split lists into sublists with some patterns by quantity"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "submark" = callPackage @@ -274678,7 +274591,9 @@ self: { ]; description = "Extract a part from CommonMark/Markdown docs"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "submark"; + broken = true; }) {}; "subnet" = callPackage @@ -274804,6 +274719,8 @@ self: { pname = "successors"; version = "0.1.0.3"; sha256 = "15pydjb9f7ycjclv5qq0ll8iaf8vpb6241ja858vkkfpz4rsciyv"; + revision = "1"; + editedCabalFile = "10vsqfgpzrc1mr27956s0r84hy37vz2dvq7klskn74qisnhv52kz"; libraryHaskellDepends = [ base ]; description = "An applicative functor to manage successors"; license = lib.licenses.mit; @@ -274973,18 +274890,22 @@ self: { testHaskellDepends = [ base hspec template-haskell ]; description = "Library for reducing the boilerplate involved with sum types"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "summer" = callPackage ({ mkDerivation, base, generics-sop, profunctors, vector }: mkDerivation { pname = "summer"; - version = "0.3.7.1"; - sha256 = "0g745i3ms1i6qz428aln33hczvgn1zg79xd0n94h696x397d7zs5"; + version = "0.3.7.2"; + sha256 = "0dqjvq1h116x3pbmi27nlgwp6sq5w8d6clcvbw9nlb85cn6awr4y"; libraryHaskellDepends = [ base generics-sop profunctors vector ]; testHaskellDepends = [ base ]; description = "An implementation of extensible products and sums"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "summoner" = callPackage @@ -275054,6 +274975,7 @@ self: { description = "A Haskell interface to SUMP-compatible logic analyzers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sundown" = callPackage @@ -275452,26 +275374,23 @@ self: { ({ mkDerivation, base, supply-chain-core }: mkDerivation { pname = "supply-chain"; - version = "0.0.0.0"; - sha256 = "12rdx593ivps3khxpvq0r1kc99jhzvc0qfkdxa7jdy0qn22fi3dx"; + version = "0.0.0.1"; + sha256 = "0g7hfbzqwrl30bkrk1pxiriyg2xdzv5ia77mba58sv7g0bacjz2a"; libraryHaskellDepends = [ base supply-chain-core ]; description = "Composable request-response pipelines"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "supply-chain-core" = callPackage - ({ mkDerivation, base, tasty, tasty-hedgehog, tasty-hunit }: + ({ mkDerivation, base, hspec }: mkDerivation { pname = "supply-chain-core"; - version = "0.0.0.0"; - sha256 = "17ih0pvfk0xzr30q9094gf8ry8pvnannr92hvk86z7j514nv6q9h"; + version = "0.0.0.1"; + sha256 = "18x9g2qacvyar4ckv4giaxxdkwn8prrl2xyzgd7p6h8pzb5xbjzz"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base tasty tasty-hedgehog tasty-hunit ]; + testHaskellDepends = [ base hspec ]; description = "Composable request-response pipelines"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "surjective" = callPackage @@ -275613,7 +275532,9 @@ self: { executableToolDepends = [ alex happy ]; description = "SystemVerilog to Verilog conversion"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "sv2v"; + broken = true; }) {}; "svfactor" = callPackage @@ -275681,8 +275602,8 @@ self: { ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }: mkDerivation { pname = "svg-icons"; - version = "2.5.0.1"; - sha256 = "0iwrs53n6f4l2fqybamghbk5ha1w8vspiha6cnjx49hzljsjz738"; + version = "2.6.0.0"; + sha256 = "13vsyv1bnxp45mllfrai09n4f5a131l8v77jbf2vy4f0wzmpswpm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -275795,7 +275716,9 @@ self: { ]; description = "A tool to prune unused symbols from icon SVG files"; license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; mainProgram = "svgsym"; + broken = true; }) {}; "svgutils" = callPackage @@ -276137,8 +276060,8 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.10.2.0"; - sha256 = "162sq6k9ylzlnqj4l9plykvhhrkc7sc08bza6az5cadfvnqlham8"; + version = "0.10.3.0"; + sha256 = "0qn3nmgxiyvvxv1hxdc6lgc5q8n53kj8lmdzvvjnq4q8s5mh5lhn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -276152,7 +276075,7 @@ self: { test-framework test-framework-hunit text time ]; description = "A semantic web toolkit"; - license = lib.licenses.lgpl21Only; + license = lib.licenses.lgpl21Plus; mainProgram = "Swish"; }) {}; @@ -276349,6 +276272,7 @@ self: { description = "A modern testing framework for Haskell with good defaults and advanced testing features"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sydtest-aeson" = callPackage @@ -276662,12 +276586,12 @@ self: { }: mkDerivation { pname = "sydtest-webdriver"; - version = "0.0.0.0"; - sha256 = "030qv68sb075lqwz449yvliwg356ggn3ab90zcad6hc6hyz8x3vp"; + version = "0.0.0.1"; + sha256 = "1rf12cg494z302bd7yanylzayakqj8xwbj8blb0f512wvfy63cia"; libraryHaskellDepends = [ - aeson base http-client http-types monad-control mtl network - network-uri path path-io port-utils sydtest sydtest-typed-process - sydtest-wai transformers-base typed-process webdriver + aeson base http-client monad-control mtl network network-uri path + path-io port-utils sydtest sydtest-typed-process sydtest-wai + transformers-base typed-process webdriver ]; testHaskellDepends = [ base http-types network-uri sydtest sydtest-wai wai @@ -277019,8 +276943,6 @@ self: { ]; description = "Streaming support through pipes for symantic-http"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "symantic-http-server" = callPackage @@ -277636,7 +277558,6 @@ self: { description = "Audio signal processing coded in Haskell"; license = "GPL"; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "synthesizer-alsa" = callPackage @@ -277660,6 +277581,7 @@ self: { description = "Control synthesizer effects via ALSA/MIDI"; license = lib.licenses.gpl3Only; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; }) {}; "synthesizer-core" = callPackage @@ -277672,10 +277594,8 @@ self: { }: mkDerivation { pname = "synthesizer-core"; - version = "0.8.2.1"; - sha256 = "1sdvqabxlgiqqb3kppxwyvmkmvcqrmrzicbmcmy6mr5c4npjxffj"; - revision = "1"; - editedCabalFile = "1c3l83qrdn3nxpp0gsr06iz9praw37c2j9zjj15pxd8in73mb74a"; + version = "0.8.3"; + sha256 = "0a12qmr7fdlz5mbrki9nd1fl07670hll3wrdpp1apvf6zd36h7mn"; libraryHaskellDepends = [ array base binary bytestring containers deepseq event-list explicit-exception filepath non-empty non-negative numeric-prelude @@ -277694,6 +277614,7 @@ self: { ]; description = "Audio signal processing coded in Haskell: Low level part"; license = "GPL"; + hydraPlatforms = lib.platforms.none; }) {}; "synthesizer-dimensional" = callPackage @@ -277703,8 +277624,8 @@ self: { }: mkDerivation { pname = "synthesizer-dimensional"; - version = "0.8.1"; - sha256 = "0a8frn0k4dc0kh71arcqpc1z4dilr8c7yqpp6j80llh12lrcp6f4"; + version = "0.8.1.1"; + sha256 = "0giaa6v2yvb0amvdzdv5bq7dsns9pgbzv7sgjdi4a4zy0x4gmhc4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -277714,6 +277635,7 @@ self: { ]; description = "Audio signal processing with static physical dimensions"; license = "GPL"; + hydraPlatforms = lib.platforms.none; }) {}; "synthesizer-filter" = callPackage @@ -277730,6 +277652,7 @@ self: { ]; description = "Audio signal processing coded in Haskell: Filter networks"; license = "GPL"; + hydraPlatforms = lib.platforms.none; }) {}; "synthesizer-inference" = callPackage @@ -277808,6 +277731,7 @@ self: { ]; description = "Render audio signals from MIDI files or realtime messages"; license = "GPL"; + hydraPlatforms = lib.platforms.none; }) {}; "sys-auth-smbclient" = callPackage @@ -278200,8 +278124,8 @@ self: { }: mkDerivation { pname = "systemd-socket-activation"; - version = "1.0.0.1"; - sha256 = "1czps42qaxghg3mbr7v847j1yqgk79lbx1b5dmi5mnyg3869dq81"; + version = "1.0.0.2"; + sha256 = "1shqkxa8wgnx3bndy3qgykb4l0jsrp4qpwahgy9r6n98a1idbx0v"; libraryHaskellDepends = [ base containers network text transformers unix ]; @@ -278410,7 +278334,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "tableaux.cgi"; - broken = true; }) {}; "tables" = callPackage @@ -278627,6 +278550,8 @@ self: { ]; description = "alternative package for processing of tag soups"; license = "GPL"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tagged" = callPackage @@ -278986,6 +278911,7 @@ self: { ]; description = "Black magic tagsoup"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "tagstew"; }) {}; @@ -279651,7 +279577,9 @@ self: { testToolDepends = [ tasty-discover ]; description = "A command-line kanban board/task manager"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "taskell"; + broken = true; }) {}; "taskpool" = callPackage @@ -279679,8 +279607,8 @@ self: { }: mkDerivation { pname = "taskwarrior"; - version = "0.6.0.3"; - sha256 = "177ylpifmij5lld5xqy8fpfcm5w8ng2fh5hckr3m5z638kk3q10z"; + version = "0.6.0.4"; + sha256 = "0m6h0ra868n7azxdj00sbhv2i9r5wr5rs10cyrzda7ss5n94aq8v"; libraryHaskellDepends = [ aeson base bytestring containers process random text time uuid ]; @@ -279695,17 +279623,16 @@ self: { }) {}; "tasty" = callPackage - ({ mkDerivation, ansi-terminal, base, clock, containers - , optparse-applicative, stm, tagged, transformers, unbounded-delays - , unix, wcwidth + ({ mkDerivation, ansi-terminal, base, containers + , optparse-applicative, stm, tagged, transformers, unix }: mkDerivation { pname = "tasty"; - version = "1.4.2.3"; - sha256 = "1inhrayiqhd3k14b9cnjcv5kdxb95sgk8b0ibbf37z4dlalsf569"; + version = "1.4.3"; + sha256 = "006bf4gyc30i2gvb17hj1mzrh1kwnwf7l050x3f72wi6c2axl87l"; libraryHaskellDepends = [ - ansi-terminal base clock containers optparse-applicative stm tagged - transformers unbounded-delays unix wcwidth + ansi-terminal base containers optparse-applicative stm tagged + transformers unix ]; description = "Modern and extensible testing framework"; license = lib.licenses.mit; @@ -279760,8 +279687,38 @@ self: { }: mkDerivation { pname = "tasty-autocollect"; - version = "0.3.1.0"; - sha256 = "0cvg7010hxrixpz013fb8ky5jgvvqf3l8x8kiwj0b3a31v8lk82d"; + version = "0.3.2.0"; + sha256 = "1f2z08zclnz8kvxs67a1r1qfdb2j8nfjnvsj4434sl59inl6s9vx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory filepath ghc tasty + tasty-expected-failure template-haskell text transformers + ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ + base bytestring containers directory explainable-predicates + filepath tasty tasty-golden tasty-hunit tasty-quickcheck temporary + text typed-process + ]; + description = "Autocollection of tasty tests"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "tasty-autocollect"; + broken = true; + }) {}; + + "tasty-autocollect_0_4_0" = callPackage + ({ mkDerivation, base, bytestring, containers, directory + , explainable-predicates, filepath, ghc, tasty + , tasty-expected-failure, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, text, transformers + , typed-process + }: + mkDerivation { + pname = "tasty-autocollect"; + version = "0.4.0"; + sha256 = "1nq5zaf3ly7n4mqprdgvgw2ixdxk7qdrl108ppncid43dfj560ik"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -279826,8 +279783,8 @@ self: { }: mkDerivation { pname = "tasty-checklist"; - version = "1.0.4.0"; - sha256 = "1zfmd6q4z7gw2i1avcxkgqwjkwh0gzzfmrh6czwc57qnvnaaki4x"; + version = "1.0.5.0"; + sha256 = "0661qpzdb9bdjd7k0j6lhfgnmkdcf3xjv66q6lfcvsdw2nvvp48n"; libraryHaskellDepends = [ base exceptions parameterized-utils text ]; @@ -279837,20 +279794,10 @@ self: { ]; description = "Check multiple items during a tasty test"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; }) {}; "tasty-dejafu" = callPackage - ({ mkDerivation, base, dejafu, random, tagged, tasty }: - mkDerivation { - pname = "tasty-dejafu"; - version = "2.0.0.9"; - sha256 = "0cqm88aihaf2y25m129r4dg80a7h9q1gj6pjbg1yd6wb2lxd6zga"; - libraryHaskellDepends = [ base dejafu random tagged tasty ]; - description = "Deja Fu support for the Tasty test framework"; - license = lib.licenses.mit; - }) {}; - - "tasty-dejafu_2_1_0_0" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; @@ -279859,31 +279806,29 @@ self: { libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-discover" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , Glob, hedgehog, hspec, hspec-core, tasty, tasty-golden - , tasty-hedgehog, tasty-hspec, tasty-hunit, tasty-quickcheck - , tasty-smallcheck + ({ mkDerivation, base, containers, directory, filepath, Glob + , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit + , tasty-quickcheck, tasty-smallcheck }: mkDerivation { pname = "tasty-discover"; - version = "4.2.4"; - sha256 = "1v6ndsvz9f04gv3m41a2yqprpa7xz8d00vkws25a9n7b7h3wvj4x"; + version = "4.2.2"; + sha256 = "1j95njl3ml7cfxnwv0i17ijca84fgyrjs2cfw4g5yh1m4x2zvg34"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers directory filepath Glob tasty + base containers directory filepath Glob ]; executableHaskellDepends = [ base containers directory filepath Glob ]; testHaskellDepends = [ - base bytestring containers directory filepath Glob hedgehog hspec - hspec-core tasty tasty-golden tasty-hedgehog tasty-hspec - tasty-hunit tasty-quickcheck tasty-smallcheck + base containers directory filepath Glob hedgehog tasty + tasty-hedgehog tasty-hspec tasty-hunit tasty-quickcheck + tasty-smallcheck ]; description = "Test discovery for the tasty framework"; license = lib.licenses.mit; @@ -280002,8 +279947,8 @@ self: { pname = "tasty-grading-system"; version = "0.1.0.0"; sha256 = "1r72gbylmv466naxkqsf56wlkp5kzhvyq0w3k7g47hs1rlslllmp"; - revision = "2"; - editedCabalFile = "1kr1113k6a0d8yd51lvl1689wdbq2lb2fp44rl6jzdaizxvj360f"; + revision = "4"; + editedCabalFile = "1h80pf2p13f33gl803xyg6znf1ychci9jqcl13xdxai1asb331hq"; libraryHaskellDepends = [ aeson base containers directory filepath generic-deriving mtl stm tagged tasty text @@ -280040,10 +279985,8 @@ self: { }: mkDerivation { pname = "tasty-hedgehog"; - version = "1.1.0.0"; - sha256 = "0cy49z8n124xh2ra2482vfy5if1n6d9lbdjma2zg1mxfj0k0zyfb"; - revision = "3"; - editedCabalFile = "1i7i2yws3bdmsg2hl7dh65zvh9sna3gnlv0l4m1sqqdx5dji1a3w"; + version = "1.3.1.0"; + sha256 = "1iq452mvd9wc9pfmjsmm848jwp3cvsk1faf2mlr21vcs0yaxvq3m"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -280134,8 +280077,8 @@ self: { pname = "tasty-hspec"; version = "1.2.0.1"; sha256 = "0ibl2xi6mmqad2mriz67nb7pjwwvjik385amp24j9kc7a7zkx091"; - revision = "1"; - editedCabalFile = "0a6r4gzxzp6n90z0nif7ha7p7am57hs48i54i2y4z9kgjv6lnvll"; + revision = "2"; + editedCabalFile = "0qyp20khzr6ingdjmmwlhlklc26257wds56cn2pwss3yf1j5blv1"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -280144,6 +280087,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "tasty-hspec_1_2_0_3" = callPackage + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "tasty-hspec"; + version = "1.2.0.3"; + sha256 = "150dvscaa0sv5pjsd74mmnp9f0jmz09qs24swz73wwjzrzmnypcx"; + libraryHaskellDepends = [ + base hspec hspec-core QuickCheck tasty tasty-quickcheck + tasty-smallcheck + ]; + description = "Hspec support for the Tasty test framework"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-html" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers, filepath , generic-deriving, mtl, semigroups, stm, tagged, tasty, text @@ -280292,6 +280252,8 @@ self: { ]; description = "JSON reporter for the tasty testing framework"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tasty-kat" = callPackage @@ -280549,8 +280511,8 @@ self: { }: mkDerivation { pname = "tasty-sugar"; - version = "2.0.0.1"; - sha256 = "0rgq5k9vv72c5826acpfscjfszvyi5bms5wjbw7bs0izimqw7b1j"; + version = "2.0.1.0"; + sha256 = "1mngpdfafdxsnczi9hzvg4awg1y845srrk3f19lmnig6f70kg23h"; libraryHaskellDepends = [ base containers directory filemanip filepath kvitable logict microlens mtl optparse-applicative parallel prettyprinter tasty @@ -280563,7 +280525,6 @@ self: { doHaddock = false; description = "Tests defined by Search Using Golden Answer References"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-tap" = callPackage @@ -280750,7 +280711,6 @@ self: { description = "tcache using Amazon Web Services as default persistence mechanism"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tccli" = callPackage @@ -280902,6 +280862,7 @@ self: { description = "Test framework wrapper"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tdigest" = callPackage @@ -281125,6 +281086,7 @@ self: { ]; description = "Bleeding edge prelude"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "technique" = callPackage @@ -281206,6 +281168,7 @@ self: { description = "Telegram Bot API binding"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "telegram" = callPackage @@ -281279,31 +281242,6 @@ 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-api, servant-multipart-client - , split, stm, template-haskell, text, time, transformers - , unordered-containers - }: - mkDerivation { - pname = "telegram-bot-simple"; - version = "0.4.5"; - sha256 = "0c2j0dmx6j15c8csmv64zc3m7qnbvnf5aqan7qjc8d5yfzbxr4nr"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - 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-api servant-multipart-client split stm - template-haskell text time transformers unordered-containers - ]; - description = "Easy to use library for building Telegram bots"; - license = lib.licenses.bsd3; - }) {}; - - "telegram-bot-simple_0_6" = 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 @@ -281313,8 +281251,8 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.6"; - sha256 = "1f4nfh32v5l60p2bqifg5dl311p86lis51na7hri074w0p3kg6ki"; + version = "0.6.1"; + sha256 = "01rxkgzfvqxgnxlcw70rhs84ygvccydlki827f3icqwfpm7cn6vn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -281327,7 +281265,6 @@ self: { ]; description = "Easy to use library for building Telegram bots"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "telegram-raw-api" = callPackage @@ -281757,7 +281694,6 @@ self: { description = "library to make electronic music, brings together temporal-music-notation and csound-expression packages"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "temporal-media" = callPackage @@ -282202,6 +282138,7 @@ self: { ]; description = "Encoder and decoder for the TensorFlow \"TFRecords\" format"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "tensorflow-records-conduit" = callPackage @@ -282218,6 +282155,7 @@ self: { ]; description = "Conduit wrappers for TensorFlow.Records."; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "tensorflow-test" = callPackage @@ -282265,35 +282203,17 @@ self: { testHaskellDepends = [ base containers HUnit QuickCheck ]; description = "Term Rewriting Library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "termbox" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "termbox"; - version = "0.3.0"; - sha256 = "1vi2ssylwvc6xqnhpnvc9q9c70glbf6s63rmyblc53g4qra2wkah"; - revision = "1"; - editedCabalFile = "1d0sv2ycizpy0fsn0v4n2bbziyr56y2md8qnqmr0bx1rkriz67li"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - description = "termbox bindings"; - license = lib.licenses.bsd3; - }) {}; - - "termbox_1_1_0" = callPackage ({ mkDerivation, base, termbox-bindings-hs }: mkDerivation { pname = "termbox"; - version = "1.1.0"; - sha256 = "0m2g3w0a0kc0a692r2mdflp1q96nycpwg80zf6lsb0z1xqvycypy"; + version = "1.1.0.1"; + sha256 = "0fwixvyf80gkj1l8r4v4vrmpilz0f02hqhpx0f93rbwaaadxqrd3"; libraryHaskellDepends = [ base termbox-bindings-hs ]; description = "termbox"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "termbox-banana" = callPackage @@ -282305,8 +282225,6 @@ self: { libraryHaskellDepends = [ base reactive-banana termbox ]; description = "termbox + reactive-banana"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "termbox-bindings" = callPackage @@ -282360,8 +282278,6 @@ self: { libraryHaskellDepends = [ base ki termbox ]; description = "termbox + The Elm Architecture"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "termcolor" = callPackage @@ -282507,47 +282423,6 @@ self: { }) {}; "termonad" = callPackage - ({ mkDerivation, adjunctions, aeson, base, Cabal, cabal-doctest - , classy-prelude, colour, constraints, containers, data-default - , directory, distributive, doctest, dyre, file-embed, filepath - , focuslist, genvalidity-containers, genvalidity-hspec, gi-gdk - , gi-gio, gi-glib, gi-gtk, gi-pango, gi-vte, gtk3, haskell-gi-base - , hedgehog, inline-c, lens, mono-traversable, pcre2, pretty-simple - , QuickCheck, tasty, tasty-hedgehog, tasty-hspec, template-haskell - , text, transformers, unordered-containers, vte_291, xml-conduit - , xml-html-qq, yaml - }: - mkDerivation { - pname = "termonad"; - version = "4.2.0.1"; - sha256 = "0qsjgx3742z21qg1cbw2mp8gaqvb2rnp4ds90s82vf9s1ps2dkqm"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - adjunctions aeson base classy-prelude colour constraints containers - data-default directory distributive dyre file-embed filepath - focuslist gi-gdk gi-gio gi-glib gi-gtk gi-pango gi-vte - haskell-gi-base inline-c lens mono-traversable pretty-simple - QuickCheck text transformers unordered-containers xml-conduit - xml-html-qq yaml - ]; - libraryPkgconfigDepends = [ gtk3 pcre2 vte_291 ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base doctest genvalidity-containers genvalidity-hspec hedgehog lens - QuickCheck tasty tasty-hedgehog tasty-hspec template-haskell - ]; - description = "Terminal emulator configurable in Haskell"; - license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; - mainProgram = "termonad"; - maintainers = [ lib.maintainers.cdepillabout ]; - }) {inherit (pkgs) gtk3; inherit (pkgs) pcre2; - vte_291 = pkgs.vte;}; - - "termonad_4_4_0_0" = callPackage ({ mkDerivation, adjunctions, aeson, base, Cabal, cabal-doctest , classy-prelude, colour, constraints, containers, data-default , directory, distributive, doctest, dyre, file-embed, filepath @@ -282583,7 +282458,6 @@ self: { description = "Terminal emulator configurable in Haskell"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "termonad"; maintainers = [ lib.maintainers.cdepillabout ]; }) {inherit (pkgs) gtk3; inherit (pkgs) pcre2; @@ -283457,28 +283331,6 @@ self: { }) {}; "texmath" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, process, split, syb, temporary, text - , utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.12.4"; - sha256 = "1k7hh75jzgysh7b7jkvy4w07dbkvm5fcc5hkkixz6xzrp2fvnws3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec split syb text xml - ]; - testHaskellDepends = [ - base bytestring directory filepath process temporary text - utf8-string xml - ]; - description = "Conversion between math formats"; - license = lib.licenses.gpl2Only; - }) {}; - - "texmath_0_12_5_4" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pandoc-types, parsec, pretty-show, split, syb, tagged, tasty , tasty-golden, text, xml @@ -283498,7 +283350,6 @@ self: { ]; description = "Conversion between math formats"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "texrunner" = callPackage @@ -283586,19 +283437,6 @@ self: { }) {}; "text-ansi" = callPackage - ({ mkDerivation, base, text }: - mkDerivation { - pname = "text-ansi"; - version = "0.1.1"; - sha256 = "1vcrsg7v8n6znh1pd9kbm20bc6dg3zijd3xjdjljadf15vfkd5f6"; - revision = "4"; - editedCabalFile = "0x7d9fgh2mvr0phb20s76k5wl6pl59r667jhkaqfbf88xz44j04k"; - libraryHaskellDepends = [ base text ]; - description = "Text styling for ANSI terminals"; - license = lib.licenses.bsd3; - }) {}; - - "text-ansi_0_2_1" = callPackage ({ mkDerivation, base, text, text-builder }: mkDerivation { pname = "text-ansi"; @@ -283607,7 +283445,6 @@ self: { libraryHaskellDepends = [ base text text-builder ]; description = "Text styling for ANSI terminals"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "text-ascii" = callPackage @@ -283641,27 +283478,6 @@ self: { }) {}; "text-builder" = callPackage - ({ mkDerivation, base-prelude, bytestring, criterion, QuickCheck - , quickcheck-instances, rerebase, tasty, tasty-hunit - , tasty-quickcheck, text, text-builder-dev - }: - mkDerivation { - pname = "text-builder"; - version = "0.6.6.5"; - sha256 = "145m3v5fpisz04dwd3pwnak8mvsnc60rw92br4q946kymfifb7kj"; - libraryHaskellDepends = [ - base-prelude bytestring text text-builder-dev - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "An efficient strict text builder"; - license = lib.licenses.mit; - }) {}; - - "text-builder_0_6_7" = callPackage ({ mkDerivation, base, bytestring, criterion, QuickCheck , quickcheck-instances, rerebase, tasty, tasty-hunit , tasty-quickcheck, text, text-builder-dev @@ -283678,41 +283494,17 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "An efficient strict text builder"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "text-builder-dev" = callPackage - ({ mkDerivation, base, bytestring, criterion, deferred-folds - , QuickCheck, quickcheck-instances, rerebase, split, tasty - , tasty-hunit, tasty-quickcheck, text, text-conversions, tostring - , transformers - }: - mkDerivation { - pname = "text-builder-dev"; - version = "0.2.1"; - sha256 = "0jrzs4dcm2zq5gsn4lbmrasrsk31rs0z6n3vgs514x7p3fdv6lpj"; - libraryHaskellDepends = [ - base bytestring deferred-folds split text text-conversions tostring - transformers - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "Edge of developments for \"text-builder\""; - license = lib.licenses.mit; - }) {}; - - "text-builder-dev_0_3_3" = callPackage ({ mkDerivation, base, bytestring, criterion, deferred-folds , isomorphism-class, QuickCheck, quickcheck-instances, rerebase , split, tasty, tasty-hunit, tasty-quickcheck, text, transformers }: mkDerivation { pname = "text-builder-dev"; - version = "0.3.3"; - sha256 = "0h88yxj0w7ycpmzxyxnxkrz05dmi902dv9v8mxlx7nrr8idxss74"; + version = "0.3.3.2"; + sha256 = "1bsm4yl22mpzggcnh908ccw9mvg3prckydwxxqa4rfj4k8hy4x7m"; libraryHaskellDepends = [ base bytestring deferred-folds isomorphism-class split text transformers @@ -283724,7 +283516,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "Edge of developments for \"text-builder\""; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "text-builder-linear" = callPackage @@ -283745,18 +283536,17 @@ self: { }) {}; "text-compression" = callPackage - ({ mkDerivation, base, bytestring, containers, massiv, mtl, text }: + ({ mkDerivation, base, bytestring, containers, mtl, parallel, text + }: mkDerivation { pname = "text-compression"; - version = "0.1.0.7"; - sha256 = "0sxzcdfx2v0870w130vkw6iyg5w0k8vvkz7fj3b50kr4wl9wypb4"; + version = "0.1.0.25"; + sha256 = "1lppagp2xkgn2hib71jp0p4jwl0ps415cnvjlhxfhfm0zp3pm6ys"; libraryHaskellDepends = [ - base bytestring containers massiv mtl text + base bytestring containers mtl parallel text ]; description = "A text compression library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "text-containers" = callPackage @@ -283840,10 +283630,10 @@ self: { }: mkDerivation { pname = "text-format"; - version = "0.3.2"; - sha256 = "1qxs8xyjk8nzzzam62lqqml9s0p08m749jri0lfaa844mnw3frij"; - revision = "2"; - editedCabalFile = "05findgw709h930wshaq514maxarjyjhsam6pkyzq83iz1yc2gra"; + version = "0.3.2.1"; + sha256 = "1q4ijzd8fsc4g2fi53448hhjg0wlgy9kdc1226kkqrnq1dg9nlm9"; + revision = "1"; + editedCabalFile = "15xiwzsfgwvhph9b2r8rkwpzfgymqqjm7d5jjjqzyxjqj73pdami"; libraryHaskellDepends = [ array base double-conversion ghc-prim integer-gmp old-locale text time transformers @@ -283910,28 +283700,6 @@ self: { }) {}; "text-icu" = callPackage - ({ mkDerivation, array, base, bytestring, deepseq, directory - , ghc-prim, HUnit, icu, QuickCheck, random, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "text-icu"; - version = "0.7.1.0"; - sha256 = "0s9gcd9lcrhk92ydhizyk0vbpf542ipc4hj60fa02b2g2x9q93ij"; - revision = "2"; - editedCabalFile = "0s0n9l682ffigfqbzb1adw63pj9iyvalv45kp9kxqwbj5yibblbc"; - libraryHaskellDepends = [ base bytestring deepseq text ]; - librarySystemDepends = [ icu ]; - 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; - }) {inherit (pkgs) icu;}; - - "text-icu_0_8_0_2" = callPackage ({ mkDerivation, array, base, bytestring, deepseq, directory , ghc-prim, HUnit, icu, icu-i18n, QuickCheck, random , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -283951,7 +283719,6 @@ self: { ]; description = "Bindings to the ICU library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) icu; icu-i18n = null;}; "text-icu-normalized" = callPackage @@ -283995,6 +283762,8 @@ self: { ]; description = "ICU transliteration"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) icu;}; "text-json-qq" = callPackage @@ -284078,8 +283847,6 @@ self: { ]; description = "Monadic parsing combinator library with attention to locations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "text-loc" = callPackage @@ -284265,8 +284032,8 @@ self: { }: mkDerivation { pname = "text-regex-replace"; - version = "0.1.1.4"; - sha256 = "19n7zwnrm4da8ifhwlqwrx969pni0njj5f69j30gp71fi9ihjgsb"; + version = "0.1.1.5"; + sha256 = "0jb45mn1szjdg2m46ig2mgd1yfvywpr566zwf0rmw60bmc4zdnhl"; libraryHaskellDepends = [ attoparsec base text text-icu ]; testHaskellDepends = [ base hspec QuickCheck smallcheck text text-icu @@ -284291,8 +284058,6 @@ self: { testHaskellDepends = [ base base-unicode-symbols hspec lens text ]; description = "Marking text regions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "text-register-machine" = callPackage @@ -284325,8 +284090,8 @@ self: { }: mkDerivation { pname = "text-replace"; - version = "0.1.0.2"; - sha256 = "13c0iz17x0snfhv6nmwns79j601aqnc8pvxrbn3gz7sprxwf330j"; + version = "0.1.0.3"; + sha256 = "17pxhf42r5f2zm74jivkwljsz5vyjzvvdln00jlvhryrg7vb3dah"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers text ]; @@ -284340,22 +284105,6 @@ self: { }) {}; "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-rope_0_2" = callPackage ({ mkDerivation, base, deepseq, random, tasty, tasty-bench , tasty-quickcheck, text, vector }: @@ -284369,7 +284118,6 @@ self: { benchmarkHaskellDepends = [ base random tasty-bench text ]; description = "Text lines and ropes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "text-short" = callPackage @@ -284396,38 +284144,6 @@ self: { }) {}; "text-show" = callPackage - ({ mkDerivation, array, base, base-compat-batteries, base-orphans - , bifunctors, bytestring, bytestring-builder, containers, criterion - , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim - , hspec, hspec-discover, QuickCheck, quickcheck-instances - , template-haskell, text, th-abstraction, th-lift, transformers - , transformers-compat - }: - mkDerivation { - pname = "text-show"; - version = "3.9.7"; - sha256 = "1zc47qh38jmg19fdki9isjcq4v115w2q61dnmxkypahhgiaqgkb3"; - revision = "1"; - editedCabalFile = "0dm0ziv02wcwlgzp58kfa4i05xbq9v82ay6kjnzrf0n3z3pdpxbm"; - libraryHaskellDepends = [ - array base base-compat-batteries bifunctors bytestring - bytestring-builder containers generic-deriving ghc-boot-th ghc-prim - template-haskell text th-abstraction th-lift transformers - transformers-compat - ]; - testHaskellDepends = [ - array base base-compat-batteries base-orphans bytestring - bytestring-builder deriving-compat generic-deriving ghc-prim hspec - QuickCheck quickcheck-instances template-haskell text transformers - transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; - description = "Efficient conversion of values into Text"; - license = lib.licenses.bsd3; - }) {}; - - "text-show_3_10" = callPackage ({ mkDerivation, array, base, base-compat-batteries, base-orphans , bifunctors, bytestring, bytestring-builder, containers, criterion , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim @@ -284455,46 +284171,10 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; description = "Efficient conversion of values into Text"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "text-show-instances" = callPackage - ({ mkDerivation, base, base-compat-batteries, bifunctors, binary - , containers, directory, generic-deriving, ghc-boot-th, ghc-prim - , haskeline, hpc, hspec, hspec-discover, old-locale, old-time - , pretty, QuickCheck, quickcheck-instances, random, scientific - , semigroups, tagged, template-haskell, terminfo, text, text-short - , text-show, th-orphans, time, transformers, transformers-compat - , unix, unordered-containers, vector, xhtml - }: - mkDerivation { - pname = "text-show-instances"; - version = "3.8.6"; - sha256 = "1jg1wsjnp6q68nsynwzw26s4akr0d9a4frd9dvnddalm2c6vdwaz"; - revision = "1"; - editedCabalFile = "1xikz6yviivafckm6ri0abm60z2qkgmqkc7gnjxhicfhbnnqpbbi"; - libraryHaskellDepends = [ - base base-compat-batteries bifunctors binary containers directory - ghc-boot-th haskeline hpc old-locale old-time pretty random - scientific semigroups tagged template-haskell terminfo text - text-short text-show time transformers transformers-compat unix - unordered-containers vector xhtml - ]; - testHaskellDepends = [ - base base-compat-batteries bifunctors binary containers directory - generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec - old-locale old-time pretty QuickCheck quickcheck-instances random - scientific tagged template-haskell terminfo text-short text-show - th-orphans time transformers transformers-compat unix - unordered-containers vector xhtml - ]; - testToolDepends = [ hspec-discover ]; - description = "Additional instances for text-show"; - license = lib.licenses.bsd3; - }) {}; - - "text-show-instances_3_9_2" = callPackage - ({ mkDerivation, base, base-compat-batteries, bifunctors, binary + ({ mkDerivation, aeson, base, base-compat, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim , haskeline, hpc, hspec, hspec-discover, old-locale, old-time , pretty, QuickCheck, quickcheck-instances, random, scientific @@ -284504,17 +284184,17 @@ self: { }: mkDerivation { pname = "text-show-instances"; - version = "3.9.2"; - sha256 = "1j1mcmw9l7hfmvhmv083bssc2w6zbvibaq3w4c7g7a2vxxcqwh3y"; + version = "3.9.4"; + sha256 = "154smhpc3l2h1iacdsywzirkv19w493yajhsiqg9pqmmiii7kwr5"; libraryHaskellDepends = [ - base base-compat-batteries bifunctors binary containers directory + aeson base base-compat bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random scientific semigroups tagged template-haskell terminfo text - text-short text-show time transformers transformers-compat unix - unordered-containers uuid-types vector xhtml + text-short text-show time transformers unix unordered-containers + uuid-types vector xhtml ]; testHaskellDepends = [ - base base-compat-batteries bifunctors binary containers directory + aeson base base-compat bifunctors binary containers directory generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec old-locale old-time pretty QuickCheck quickcheck-instances random scientific tagged template-haskell terminfo text-short text-show @@ -284524,7 +284204,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "text-stream-decode" = callPackage @@ -284595,6 +284274,8 @@ self: { ]; description = "UTF-7 encoding/decoding for Data.Text"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "text-utf8" = callPackage @@ -284666,19 +284347,6 @@ self: { }) {}; "text-zipper" = callPackage - ({ mkDerivation, base, deepseq, hspec, QuickCheck, text, vector }: - mkDerivation { - pname = "text-zipper"; - version = "0.11"; - sha256 = "07l1pyx93gv95cn1wh1di129axhm9sqsn4znykliacv60ld854ys"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base deepseq text vector ]; - testHaskellDepends = [ base hspec QuickCheck text ]; - description = "A text editor zipper library"; - license = lib.licenses.bsd3; - }) {}; - - "text-zipper_0_12" = callPackage ({ mkDerivation, base, deepseq, hspec, QuickCheck, text, vector }: mkDerivation { pname = "text-zipper"; @@ -284689,7 +284357,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck text ]; description = "A text editor zipper library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "text-zipper-monad" = callPackage @@ -285032,10 +284699,8 @@ self: { }: mkDerivation { pname = "th-desugar"; - version = "1.12"; - sha256 = "1bp47jpif299kbm27zhjaw1nhl12daa09vsc8f0jracq0jhxi3iv"; - revision = "1"; - editedCabalFile = "1dh5j70f5gxfj6kyw7zc9hxv21ilpj408r9chixngxf82b30ic69"; + version = "1.13.1"; + sha256 = "03k2kfbzfc87kibzbpp3s1l5xb0ww2vvwj9ngh0qapxm28a01rz3"; libraryHaskellDepends = [ base containers ghc-prim mtl ordered-containers syb template-haskell th-abstraction th-lift th-orphans @@ -285261,8 +284926,8 @@ self: { }: mkDerivation { pname = "th-lego"; - version = "0.3.0.1"; - sha256 = "092q1mg38lkam0bcw4i1m14563j8z9l9hcqjp0sfsclkylamh23c"; + version = "0.3.0.2"; + sha256 = "1w7z6g0sfn23yaqjpylnf1kpwyyf9ka17f0bqvlxcd3b739ajg8z"; libraryHaskellDepends = [ base template-haskell template-haskell-compat-v0208 text ]; @@ -285274,6 +284939,21 @@ self: { license = lib.licenses.mit; }) {}; + "th-letrec" = callPackage + ({ mkDerivation, base, containers, some, template-haskell + , transformers + }: + mkDerivation { + pname = "th-letrec"; + version = "0.1"; + sha256 = "0z9j8a7p9m5kp3zzia593zbzfmqc6himrzzjfk7nplv6vfh36yah"; + libraryHaskellDepends = [ + base containers some template-haskell transformers + ]; + description = "Implicit (recursive) let insertion"; + license = lib.licenses.bsd3; + }) {}; + "th-lift" = callPackage ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction }: @@ -285451,8 +285131,8 @@ self: { }: mkDerivation { pname = "th-test-utils"; - version = "1.1.1"; - sha256 = "03qpszfhb58nmm673zhbkvsmw1ynjr2h19qpggyay2fk5zgq7n3q"; + version = "1.2.1"; + sha256 = "1vk5fj66w7smq4yc614ixh7s78n3djggpzcxmakyxfz01vz20gay"; libraryHaskellDepends = [ base template-haskell th-orphans transformers ]; @@ -285464,26 +285144,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "th-test-utils_1_2_0" = callPackage - ({ mkDerivation, base, bytestring, tasty, tasty-golden, tasty-hunit - , template-haskell, th-orphans, transformers - }: - mkDerivation { - pname = "th-test-utils"; - version = "1.2.0"; - sha256 = "0p5j5mgjqwvkw0rcxlfkcflyqdz972ls70lprn38yjb32v3l8ncf"; - libraryHaskellDepends = [ - base template-haskell th-orphans transformers - ]; - testHaskellDepends = [ - base bytestring tasty tasty-golden tasty-hunit template-haskell - th-orphans transformers - ]; - description = "Utility functions for testing Template Haskell code"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "th-to-exp" = callPackage ({ mkDerivation, base, hspec, template-haskell }: mkDerivation { @@ -285620,7 +285280,6 @@ self: { ]; description = "Minimalistic actor library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "themoviedb" = callPackage @@ -285929,8 +285588,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A simplified implementation of Erlang/OTP like supervisor over thread"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "thread-utils-context" = callPackage @@ -285998,6 +285655,7 @@ self: { ]; description = "Manage concurrently operating threads without having to spark them"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "threadmanager" = callPackage @@ -286096,7 +285754,9 @@ self: { ]; description = "A graphical tool for profiling parallel Haskell programs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "threadscope"; + broken = true; }) {}; "threefish" = callPackage @@ -286144,10 +285804,8 @@ self: { }: mkDerivation { pname = "threepenny-gui"; - version = "0.9.1.0"; - sha256 = "00sjkfa9qfnnwqfdw68yb8hq6nm1y5qv9896rzn5aachr7mlfpx2"; - revision = "7"; - editedCabalFile = "0lf7w1kxnd0wwqwrq2svbki1cbzwl9ggvfl1bvxvhg1qrw0avqbd"; + version = "0.9.4.0"; + sha256 = "08jqa01pp6b300ic0xcn687i0a0kvz76bgym3dchk9n75m6hvc4f"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -286192,7 +285850,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "threepenny-flexbox-exe"; - broken = true; }) {}; "thrift" = callPackage @@ -286327,6 +285984,8 @@ self: { libraryHaskellDepends = [ base bytestring gd ]; description = "generate thumbnail image"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "thumbnail-plus" = callPackage @@ -286399,8 +286058,6 @@ self: { ]; description = "A faster time library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tianbar" = callPackage @@ -286511,7 +286168,9 @@ self: { testHaskellDepends = [ base QuickCheck text ]; description = "A basic implementation of a personal ticket management system"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "ticket-manager"; + broken = true; }) {}; "tickle" = callPackage @@ -286549,34 +286208,6 @@ self: { }) {}; "tidal" = callPackage - ({ mkDerivation, async, base, bifunctors, bytestring, clock, colour - , containers, criterion, deepseq, exceptions, hint, hosc, microspec - , mtl, network, parsec, primitive, random, text, transformers - , weigh - }: - mkDerivation { - pname = "tidal"; - version = "1.7.10"; - sha256 = "0vfymixr66sj6zsadkbcx0yx722f2d3q6cic4c91cswxssfqfrhc"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bifunctors bytestring clock colour containers deepseq - exceptions hosc mtl network parsec primitive random text - transformers - ]; - executableHaskellDepends = [ async base exceptions hint ]; - testHaskellDepends = [ - base containers deepseq hosc microspec parsec - ]; - benchmarkHaskellDepends = [ base criterion weigh ]; - description = "Pattern language for improvised music"; - license = lib.licenses.gpl3Only; - mainProgram = "tidal"; - }) {}; - - "tidal_1_9_2" = callPackage ({ mkDerivation, base, bytestring, clock, colour, containers , criterion, deepseq, exceptions, hosc, microspec, mtl, network , parsec, primitive, random, text, tidal-link, transformers, weigh @@ -286596,6 +286227,28 @@ self: { benchmarkHaskellDepends = [ base criterion weigh ]; description = "Pattern language for improvised music"; license = lib.licenses.gpl3Only; + }) {}; + + "tidal_1_9_3" = callPackage + ({ mkDerivation, base, bytestring, clock, colour, containers + , criterion, deepseq, exceptions, hosc, microspec, mtl, network + , parsec, primitive, random, text, tidal-link, transformers, weigh + }: + mkDerivation { + pname = "tidal"; + version = "1.9.3"; + sha256 = "1p3k65rgxjv701nk30jqf614bk1zmblyq0vlishzza2cdld5rhbc"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring clock colour containers deepseq exceptions hosc mtl + network parsec primitive random text tidal-link transformers + ]; + testHaskellDepends = [ + base containers deepseq hosc microspec parsec + ]; + benchmarkHaskellDepends = [ base criterion weigh ]; + description = "Pattern language for improvised music"; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; }) {}; @@ -286645,6 +286298,7 @@ self: { description = "Serial support for tidal"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tidal-vis" = callPackage @@ -286712,7 +286366,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "tiger"; - broken = true; }) {}; "tight-apply" = callPackage @@ -286781,7 +286434,9 @@ self: { ]; description = "A program for generating LaTeX code of string diagrams"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "tikzsd"; + broken = true; }) {}; "tile" = callPackage @@ -286892,6 +286547,7 @@ self: { libraryHaskellDepends = [ base time ]; description = "A library for time domains and durations"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.turion ]; }) {}; "time-extras" = callPackage @@ -287467,7 +287123,9 @@ self: { ]; description = "A tool for visualizing time series from log files"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "tplot"; + broken = true; }) {}; "timeprint" = callPackage @@ -287483,20 +287141,6 @@ self: { }) {}; "timer-wheel" = callPackage - ({ mkDerivation, atomic-primops, base, psqueues, vector }: - mkDerivation { - pname = "timer-wheel"; - version = "0.3.0"; - sha256 = "16v663mcsj0h17x4jriq50dps3m3f8wqcsm19kl48vrs7f4mp07s"; - revision = "3"; - editedCabalFile = "1lgavl752g968ki042dxha8d28dm8zfs8mzm5zl8xk4p0wi1iwdv"; - libraryHaskellDepends = [ atomic-primops base psqueues vector ]; - testHaskellDepends = [ base ]; - description = "A timer wheel"; - license = lib.licenses.bsd3; - }) {}; - - "timer-wheel_0_4_0_1" = callPackage ({ mkDerivation, array, atomic-primops, base, ki, psqueues }: mkDerivation { pname = "timer-wheel"; @@ -287506,30 +287150,9 @@ self: { testHaskellDepends = [ base ]; description = "A timer wheel"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "timerep" = callPackage - ({ mkDerivation, attoparsec, base, monoid-subclasses, QuickCheck - , tasty, tasty-hunit, tasty-quickcheck, text, time - }: - mkDerivation { - pname = "timerep"; - version = "2.0.1.0"; - sha256 = "1l67gbfjydq0xapry5k9pwzxmp6z7ixzyvwshnszryspcckagxif"; - revision = "1"; - editedCabalFile = "1sk6bd6d0qvfbhn8b8na2m2z784gcbmxmgm1i6xcfbb8bls7bx7q"; - libraryHaskellDepends = [ - attoparsec base monoid-subclasses text time - ]; - testHaskellDepends = [ - base QuickCheck tasty tasty-hunit tasty-quickcheck text time - ]; - description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)"; - license = lib.licenses.bsd3; - }) {}; - - "timerep_2_1_0_0" = callPackage ({ mkDerivation, attoparsec, base, monoid-subclasses, QuickCheck , tasty, tasty-hunit, tasty-quickcheck, text, time }: @@ -287545,7 +287168,6 @@ self: { ]; description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "timers" = callPackage @@ -287567,10 +287189,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "timers-tick"; - version = "0.5.0.1"; - sha256 = "1kv646l77bzjgs2v39axsi405zvapwks1vj4ff341r5agpwrfqlc"; - revision = "1"; - editedCabalFile = "1qsmzkm0k14z06czpbjgkbzb1liws3iass0rwsi5wp5i62jkhczs"; + version = "0.5.0.2"; + sha256 = "0jhzv5h5jwjgcskimfrvaiv5544czkyngxw9bsjdmxk0y1v698vr"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "tick based timers"; @@ -287850,7 +287470,6 @@ self: { license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; mainProgram = "tintin"; - broken = true; }) {}; "tiny-scheduler" = callPackage @@ -287880,6 +287499,7 @@ self: { description = "TinyMesh - communicating with auto-meshing sensor network"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tinyXml" = callPackage @@ -287949,6 +287569,8 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Simplistic logging using fast-logger"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tinytemplate" = callPackage @@ -288424,31 +288046,6 @@ self: { }) {}; "tlynx" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bytestring - , comonad, containers, data-default-class, elynx-tools, elynx-tree - , mwc-random, optparse-applicative, parallel, primitive, statistics - , text, transformers, vector - }: - mkDerivation { - pname = "tlynx"; - version = "0.6.1.1"; - sha256 = "1q59gfk9i4ghm5gyw104isn0f3ws73n12a9hv6xhs6c3rfl8spr9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async attoparsec base bytestring comonad containers - data-default-class elynx-tools elynx-tree mwc-random - optparse-applicative parallel primitive statistics text - transformers vector - ]; - executableHaskellDepends = [ base ]; - description = "Handle phylogenetic trees"; - license = lib.licenses.gpl3Plus; - mainProgram = "tlynx"; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - - "tlynx_0_7_0_1" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , comonad, containers, data-default-class, elynx-tools, elynx-tree , optparse-applicative, parallel, random, statistics, text @@ -288468,7 +288065,6 @@ self: { executableHaskellDepends = [ base ]; description = "Handle phylogenetic trees"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; mainProgram = "tlynx"; maintainers = [ lib.maintainers.dschrempf ]; }) {}; @@ -288550,8 +288146,8 @@ self: { }: mkDerivation { pname = "tmp-proc"; - version = "0.5.1.2"; - sha256 = "0fisalws4qz4y3dagmra4mxns6b5ljf3szf907kdf34v4lysf8j0"; + version = "0.5.1.3"; + sha256 = "050inff8y97bzf4ajnqrxgcblj0cq0khcp1y35vwbwgm3al2l21p"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -288599,8 +288195,8 @@ self: { }: mkDerivation { pname = "tmp-proc-postgres"; - version = "0.5.2.1"; - sha256 = "0vd8ag23brrbcgfsjpi5cg0fm5crlww8mmg2cpiyqhih370qivxr"; + version = "0.5.2.2"; + sha256 = "1h8c5rv4i85z173mx2d2bw2ipzwjs04lrlc45249l26f6p4nlr9p"; libraryHaskellDepends = [ base bytestring postgresql-simple text tmp-proc ]; @@ -288610,8 +288206,6 @@ self: { ]; description = "Shows how to run a PostgreSQL database as a tmp proc"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tmp-proc-rabbitmq" = callPackage @@ -288628,8 +288222,6 @@ self: { ]; description = "Shows how to run RabbitMQ as a tmp proc"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tmp-proc-redis" = callPackage @@ -288646,8 +288238,6 @@ self: { ]; description = "Shows how to run redis as a tmp proc"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tmp-proc-zipkin" = callPackage @@ -288666,8 +288256,6 @@ self: { ]; description = "Shows how to run redis as a tmp proc"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tmpl" = callPackage @@ -288807,13 +288395,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "todo"; - version = "0.2.0.2"; - sha256 = "1gh2jdrxph0x9cc03kk8xxjyicivwcqfs9qv2nfr7mn570cmjrmw"; + version = "0.2.0.3"; + sha256 = "1ilnslggrca8arjibgn44xh8m36ywwcbqi5h538h7cp669lnyxz9"; libraryHaskellDepends = [ base ]; - description = "A todo bottom"; + description = "A replacement for undefined that gives warnings"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "todos" = callPackage @@ -289133,8 +288719,6 @@ self: { libraryHaskellDepends = [ base OpenAL stm vector ]; description = "Easy to use library for audio programming"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "toml" = callPackage @@ -289172,19 +288756,18 @@ self: { }) {}; "toml-reader" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , directory, megaparsec, parser-combinators, process, tasty - , tasty-golden, tasty-hunit, text, time, unordered-containers - , vector + ({ mkDerivation, aeson, base, bytestring, containers, directory + , megaparsec, parser-combinators, process, tasty, tasty-golden + , tasty-hunit, text, time, unordered-containers, vector }: mkDerivation { pname = "toml-reader"; - version = "0.1.0.0"; - sha256 = "06gxp8pzh8cdrifg5n0mhlnrslrx7k235sz2ldpy60x7vz7qywv9"; - revision = "2"; - editedCabalFile = "0ga0nc2n3irk0iy7ih90vww1cyaydn5sz7bpk7bz21ncny3g9fyg"; + version = "0.2.0.0"; + sha256 = "0pajlx405cbb7c5bcq3r8hgqlmn16nqvraskplq9n9cc5xhw04xk"; + revision = "1"; + editedCabalFile = "0v03ssaa4kqa0i3wvl460028qhvlzfsqrqk6vbgcvsw6vxsnbh80"; libraryHaskellDepends = [ - base containers deepseq megaparsec parser-combinators text time + base containers megaparsec parser-combinators text time ]; testHaskellDepends = [ aeson base bytestring containers directory process tasty @@ -289213,8 +288796,6 @@ self: { ]; description = "Alternative parser for TOML values produced by the toml-reader package"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tomland" = callPackage @@ -289584,6 +289165,7 @@ self: { license = "GPL"; hydraPlatforms = lib.platforms.none; mainProgram = "topkata"; + broken = true; }) {}; "topograph" = callPackage @@ -289704,6 +289286,8 @@ self: { ]; description = "Dense and sparse total maps"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "touched" = callPackage @@ -290423,12 +290007,12 @@ self: { mainProgram = "Benchmark"; }) {}; - "transformers_0_6_0_4" = callPackage + "transformers_0_6_0_6" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "transformers"; - version = "0.6.0.4"; - sha256 = "1jw9c89yri37hsai6jgckfdana1gqjr15xnanxzm3vahvgcb5f1s"; + version = "0.6.0.6"; + sha256 = "1savf7rjhji0lcx7fv0gz7ci6dn1sycdgh5flqr63y31spbj4q3w"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = lib.licenses.bsd3; @@ -290477,20 +290061,11 @@ self: { libraryHaskellDepends = [ base mmorph transformers ]; description = "Bifunctors over monad transformers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "transformers-compat" = callPackage - ({ mkDerivation, base, ghc-prim, transformers }: - mkDerivation { - pname = "transformers-compat"; - version = "0.6.6"; - sha256 = "1yd936az31g9995frc84g05rrb5b7w59ajssc5183lp6wm8h4bky"; - libraryHaskellDepends = [ base ghc-prim transformers ]; - description = "A small compatibility shim for the transformers library"; - license = lib.licenses.bsd3; - }) {}; - - "transformers-compat_0_7_2" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "transformers-compat"; @@ -290499,7 +290074,6 @@ self: { libraryHaskellDepends = [ base ghc-prim transformers ]; description = "A small compatibility shim for the transformers library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "transformers-compose" = callPackage @@ -291118,6 +290692,8 @@ self: { libraryHaskellDepends = [ base ]; description = "Non-Determinism Monad for Tree Search"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tree-render-text" = callPackage @@ -291659,6 +291235,7 @@ self: { description = "Various trie implementations in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "trifecta" = callPackage @@ -291874,8 +291451,6 @@ self: { testHaskellDepends = [ base containers template-haskell time ]; description = "Template Haskell hack to violate module abstractions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "truelevel" = callPackage @@ -291889,7 +291464,6 @@ self: { executableHaskellDepends = [ base containers parseargs WAVE ]; description = "Audio file compressor-limiter"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "truelevel"; }) {}; @@ -291931,8 +291505,6 @@ self: { testHaskellDepends = [ base binary containers cropty merge text ]; description = "An implementation of a trust chain"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "truthful" = callPackage @@ -292225,22 +291797,6 @@ self: { }) {}; "ttc" = callPackage - ({ mkDerivation, base, bytestring, tasty, tasty-hunit - , template-haskell, text - }: - mkDerivation { - pname = "ttc"; - version = "1.1.1.1"; - sha256 = "1zk4iavn51s89m35w7fwi7z9c5gkz98f8phv5bp4f9ajirmhn6r1"; - libraryHaskellDepends = [ base bytestring template-haskell text ]; - testHaskellDepends = [ - base bytestring tasty tasty-hunit template-haskell text - ]; - description = "Textual Type Classes"; - license = lib.licenses.mit; - }) {}; - - "ttc_1_2_0_0" = callPackage ({ mkDerivation, base, bytestring, tasty, tasty-hunit , template-haskell, text }: @@ -292256,7 +291812,6 @@ self: { ]; description = "Textual Type Classes"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ttl-hashtables" = callPackage @@ -292279,6 +291834,8 @@ self: { ]; description = "Extends hashtables so that entries added can be expired after a TTL"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ttn" = callPackage @@ -292455,12 +292012,14 @@ self: { ({ mkDerivation, base, ghc-prim, hspec, template-haskell }: mkDerivation { pname = "tuple-append"; - version = "0.1.2.0"; - sha256 = "0fiq5v8y5plzw1rmsv7hh951fnz45r714p38nrql940pp7qyh9rj"; + version = "0.2.0.0"; + sha256 = "18516636w3bgwvymdbzw1971fhja7lrpwx78nz5n67qq23il7rrq"; libraryHaskellDepends = [ base ghc-prim template-haskell ]; testHaskellDepends = [ base ghc-prim hspec ]; description = "A package to append items and tuples into new tuples"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tuple-append-instances" = callPackage @@ -292476,6 +292035,7 @@ self: { ]; description = "Extra instances for the typeclasses in the tuple-append package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "tuple-gen" = callPackage @@ -292674,7 +292234,6 @@ self: { description = "An implementation of Turing Machine and Automaton"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "turkish-deasciifier" = callPackage @@ -293099,6 +292658,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "twhs"; + broken = true; }) {}; "twidge" = callPackage @@ -293225,8 +292785,8 @@ self: { }: mkDerivation { pname = "twirp"; - version = "0.2.0.1"; - sha256 = "05np0zvnvy8wrm9lirrkwhd0n8f44j4xwr6lrywxxy9r00mx8bbl"; + version = "0.2.2.0"; + sha256 = "1n69f1pwcw0ig7j92yi94hh50c5jyn03bc7y5gybw2ajz412iz2h"; libraryHaskellDepends = [ aeson base bytestring http-media http-types proto-lens proto-lens-jsonpb proto-lens-runtime servant text wai @@ -293284,8 +292844,8 @@ self: { }: mkDerivation { pname = "twitchapi"; - version = "0.0.3"; - sha256 = "1wbkix4cmkzgg5mz6d721107nra00dr00nhigq55wkzhnpf39lbz"; + version = "0.0.4"; + sha256 = "0mbsajf5sz305ym0j3wlilvw74qpd3rn0pr9l9cvwb8lvbwvbyb8"; libraryHaskellDepends = [ aeson base bytestring hoauth2 http-client text time timerep uri-bytestring @@ -293348,7 +292908,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Twitter API package with conduit interface and Streaming API support"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "twitter-enumerator" = callPackage @@ -293412,8 +292971,6 @@ self: { ]; description = "Twitter JSON parser and types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "twitter-types-lens" = callPackage @@ -293429,7 +292986,6 @@ self: { ]; description = "Twitter JSON types (lens powered)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "tx" = callPackage @@ -293739,10 +293295,8 @@ self: { }: mkDerivation { pname = "type-errors"; - version = "0.2.0.0"; - sha256 = "1d1fi4ij18q39rpibc056mgvly75zqixkba4l8bn307c62f50k8p"; - revision = "3"; - editedCabalFile = "0ig8qd2g8rd5n78039xhbq7n8r514f8kvbh0mgajav2a5lp549s1"; + version = "0.2.0.1"; + sha256 = "0ds1y5gjjgd2g3dsn8bfcviy6zv8nvmyaifysmb7ckggdfg3cdym"; libraryHaskellDepends = [ base first-class-families syb template-haskell th-abstraction ]; @@ -293764,6 +293318,8 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Combinators for writing pretty type errors easily"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "type-fun" = callPackage @@ -293904,18 +293460,6 @@ self: { }) {}; "type-level-kv-list" = callPackage - ({ mkDerivation, base, doctest, Glob }: - mkDerivation { - pname = "type-level-kv-list"; - version = "1.1.0"; - sha256 = "0wvxgxp7rlqbf2crcpb9pbzl3k47i7pc16ih4zfwgv88j7jk5w2g"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest Glob ]; - description = "A module for hash map like object with type level keys"; - license = lib.licenses.mit; - }) {}; - - "type-level-kv-list_2_0_0" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "type-level-kv-list"; @@ -293925,7 +293469,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Type level Key-Value list"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "type-level-kv-list-esqueleto" = callPackage @@ -293937,8 +293480,19 @@ self: { libraryHaskellDepends = [ base esqueleto text type-level-kv-list ]; description = "Make Esqueleto handy with type-level-kv-list"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + }) {}; + + "type-level-kv-list-persistent" = callPackage + ({ mkDerivation, base, persistent, text, type-level-kv-list }: + mkDerivation { + pname = "type-level-kv-list-persistent"; + version = "0.2.0.0"; + sha256 = "1n9niak3d4vnrpfsr7ydnbphlgviqwwzrnjg84grjx0rfm2ffxy2"; + libraryHaskellDepends = [ + base persistent text type-level-kv-list + ]; + description = "Make Persistent Raw SQL handy with type-level-kv-list"; + license = lib.licenses.mit; }) {}; "type-level-natural-number" = callPackage @@ -294003,6 +293557,8 @@ self: { libraryHaskellDepends = [ base ghc-prim ]; description = "Type-level sets and finite maps (with value-level counterparts)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "type-level-tf" = callPackage @@ -294071,6 +293627,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "type-natural_1_2_0_1" = callPackage + ({ mkDerivation, base, constraints, equational-reasoning, ghc + , ghc-typelits-knownnat, ghc-typelits-natnormalise + , ghc-typelits-presburger, integer-logarithms, QuickCheck + , quickcheck-instances, tasty, tasty-discover, tasty-hunit + , tasty-quickcheck, template-haskell + }: + mkDerivation { + pname = "type-natural"; + version = "1.2.0.1"; + sha256 = "0ygv8s36k4f11fr0wrz7wryj5b3a3j8pxzbz1h4r1w4ij15krd8x"; + libraryHaskellDepends = [ + base constraints equational-reasoning ghc ghc-typelits-knownnat + ghc-typelits-natnormalise ghc-typelits-presburger + integer-logarithms template-haskell + ]; + testHaskellDepends = [ + base equational-reasoning integer-logarithms QuickCheck + quickcheck-instances tasty tasty-discover tasty-hunit + tasty-quickcheck template-haskell + ]; + testToolDepends = [ tasty-discover ]; + description = "Type-level natural and proofs of their properties"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "type-of-html" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim @@ -294112,6 +293695,8 @@ self: { pname = "type-operators"; version = "0.2.0.0"; sha256 = "1cm3vfarjpwm885i5w5mjyg1ibg9bm5q34hbacpl3c9q9l1vwl4j"; + revision = "1"; + editedCabalFile = "0ws1bj412r79r3pak7nz2bzhl5r8rxhp9l0kdh2mnbnj286vfwdn"; libraryHaskellDepends = [ base ghc-prim ]; description = "Various type-level operators"; license = lib.licenses.bsd3; @@ -294171,8 +293756,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "Support functions to work with type representations"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "type-rig" = callPackage @@ -294184,8 +293767,6 @@ self: { libraryHaskellDepends = [ base invariant ]; description = "Classes for the rig (sums and products) of types"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "type-safe-avl" = callPackage @@ -294199,6 +293780,8 @@ self: { libraryHaskellDepends = [ base ]; description = "Type safe BST and AVL trees"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "type-sets" = callPackage @@ -294364,8 +293947,6 @@ self: { ]; description = "Mock functions and expressions anywhere"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "typeable-th" = callPackage @@ -294395,8 +293976,22 @@ self: { testHaskellDepends = [ base containers ghc ghc-tcplugins-extra ]; description = "Simple type check plugin which calculate addition, subtraction and less-or-equal-than"; license = lib.licenses.bsd3; + }) {}; + + "typecheck-plugin-nat-simple_0_1_0_9" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra }: + mkDerivation { + pname = "typecheck-plugin-nat-simple"; + version = "0.1.0.9"; + sha256 = "0ada389g1zmprwj2injmx49dcj8z6n1vxbbii4c6327mvw39ay0w"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra + ]; + testHaskellDepends = [ base containers ghc ghc-tcplugins-extra ]; + description = "Simple type check plugin which calculate addition, subtraction and less-or-equal-than"; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "typed-admin" = callPackage @@ -294541,6 +294136,7 @@ self: { executableHaskellDepends = [ base diagrams-lib text ]; description = "Typed and composable spreadsheets"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; @@ -294652,7 +294248,6 @@ self: { description = "Typed frontend to TensorFlow and higher-order deep learning"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "typedquery" = callPackage @@ -294732,6 +294327,7 @@ self: { description = "Solve type equalities using custom type-level rewrite rules"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "typelevel-tensor" = callPackage @@ -294775,6 +294371,8 @@ self: { libraryHaskellDepends = [ base dependent-sum ]; description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "typenums" = callPackage @@ -294879,8 +294477,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.9.0.1"; - sha256 = "10965lqb2f2fk5zyzdvk72bc9ja9kl17fqpb9b96pazw74qjm7a5"; + version = "0.9.1.1"; + sha256 = "0g04zr6nd7fsbj6xjvr151kbq2j1hmm9fdnj4mlh26s0gacbpv7w"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -295114,8 +294712,8 @@ self: { }: mkDerivation { pname = "tzdata"; - version = "0.2.20221028.0"; - sha256 = "1cm18g2fv8r11picmq2rf4hz77j2dgx6r6cdamdsq1ap0hv2jdqv"; + version = "0.2.20221129.0"; + sha256 = "1fclrprpm9cgdyvcaninrxz428n2562sanabik0yayikppdpagcc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers deepseq vector @@ -295803,6 +295401,7 @@ self: { description = "Opinionated Haskell Interoperability"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "unbound" = callPackage @@ -295895,6 +295494,8 @@ self: { libraryHaskellDepends = [ base ghc-prim ]; description = "All the standard sum types but strict and unboxed as possible"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "unboxed-containers" = callPackage @@ -296015,8 +295616,6 @@ self: { ]; description = "Manipulating numbers with inherent experimental/measurement uncertainty"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unconstrained" = callPackage @@ -296100,8 +295699,6 @@ self: { ]; description = "Class of data structures that can be unfolded"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unfoldable-restricted" = callPackage @@ -296118,17 +295715,14 @@ self: { ]; description = "An alternative to the Unfoldable typeclass"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "unfork" = callPackage ({ mkDerivation, async, base, safe-exceptions, stm }: mkDerivation { pname = "unfork"; - version = "1.0.0.0"; - sha256 = "0k770q549f1rcdhx21nb6n1van00za2wv50angdw5gkxihzczcjq"; - revision = "1"; - editedCabalFile = "1vwlyyrczrkma8ggzn29b6vwfbq51h3m1si1jfh6v5c99vajr33y"; + version = "1.0.0.1"; + sha256 = "0rg2aklr77ba3k1kbd57p42jj0w23rc7rir1iczfskcdj7ki2rjm"; libraryHaskellDepends = [ async base safe-exceptions stm ]; description = "Make any action thread safe"; license = lib.licenses.asl20; @@ -296333,19 +295927,16 @@ self: { license = lib.licenses.asl20; }) {}; - "unicode-data_0_4_0" = callPackage - ({ mkDerivation, base, deepseq, hspec, hspec-discover, tasty - , tasty-bench - }: + "unicode-data_0_4_0_1" = callPackage + ({ mkDerivation, base, deepseq, hspec, tasty, tasty-bench }: mkDerivation { pname = "unicode-data"; - version = "0.4.0"; - sha256 = "09s1chc7g9sgvjxs6ld5m4vrkm1shf7401ywffjrx1xfdjidb428"; + version = "0.4.0.1"; + sha256 = "1030n3h11hk1rbq0fdbpry3aclz6yz8bki2abjvbwh0rh2kdx99p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; - testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base deepseq tasty tasty-bench ]; description = "Access Unicode Character Database (UCD)"; license = lib.licenses.asl20; @@ -296373,16 +295964,15 @@ self: { }) {}; "unicode-data-scripts" = callPackage - ({ mkDerivation, base, deepseq, hspec, hspec-discover, tasty - , tasty-bench, unicode-data + ({ mkDerivation, base, deepseq, hspec, tasty, tasty-bench + , unicode-data }: mkDerivation { pname = "unicode-data-scripts"; - version = "0.2.0"; - sha256 = "13igfgjqkkh5az5cxkqlp51ix34d9m8hgsjqc342hcbbal51zc82"; + version = "0.2.0.1"; + sha256 = "0kpa2g59w9yiyl3adak7k0g9wnkwzv97c82x7bsrqvk23bdljxc0"; libraryHaskellDepends = [ base unicode-data ]; testHaskellDepends = [ base hspec unicode-data ]; - testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base deepseq tasty tasty-bench unicode-data ]; @@ -296426,6 +296016,8 @@ self: { ]; description = "Unicode General Category Database"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "unicode-names" = callPackage @@ -296535,12 +296127,12 @@ self: { }: mkDerivation { pname = "unicode-tricks"; - version = "0.11.0.0"; - sha256 = "0f1r8s69if5hjqy1p13b30f8wnbc52sya4zdcw3krwvmizwqq3dh"; + version = "0.12.1.0"; + sha256 = "139hrmxqw1f4gchv8wlyy3x1xfwcv5zzpdz0f3b6xm6v4zbwy101"; libraryHaskellDepends = [ base containers data-default deepseq hashable QuickCheck text ]; - testHaskellDepends = [ base hashable hspec QuickCheck ]; + testHaskellDepends = [ base hashable hspec QuickCheck text ]; testToolDepends = [ hspec-discover ]; description = "Functions to work with unicode blocks more convenient"; license = lib.licenses.bsd3; @@ -296750,8 +296342,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "union-angle" = callPackage @@ -296784,8 +296374,8 @@ self: { pname = "union-find"; version = "0.2"; sha256 = "1v7hj42j9w6jlzi56jg8rh4p58gfs1c5dx30wd1qqvn0p0mnihp6"; - revision = "1"; - editedCabalFile = "13cwjh03n82sgshbk4fdlvhc0pb3v979sdcdrpvnpjdqmvcprs92"; + revision = "2"; + editedCabalFile = "0izwkqzf8dc0v6djz5dxgc3xwvn6pl006x10j27sv21i0xsz9f0z"; libraryHaskellDepends = [ base containers transformers ]; description = "Efficient union and equivalence testing of sets"; license = lib.licenses.bsd3; @@ -297351,8 +296941,7 @@ self: { }) {}; "universe-base" = callPackage - ({ mkDerivation, base, containers, ghc-prim, QuickCheck, tagged - , transformers + ({ mkDerivation, base, containers, QuickCheck, tagged, transformers }: mkDerivation { pname = "universe-base"; @@ -297360,9 +296949,7 @@ self: { sha256 = "0lnvjpndqj7kk3f95dmpa62ax0m243h8iy7ghcsd2db4nyczx7f5"; revision = "3"; editedCabalFile = "0hnd5vxsncwyjsindfmsvp9jbixanhmzczhrmd8s8g6imgb0mzyk"; - libraryHaskellDepends = [ - base containers ghc-prim tagged transformers - ]; + libraryHaskellDepends = [ base containers tagged transformers ]; testHaskellDepends = [ base containers QuickCheck ]; description = "A class for finite and recursively enumerable types"; license = lib.licenses.bsd3; @@ -297487,31 +297074,6 @@ self: { }) {}; "universum" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, doctest - , gauge, ghc-prim, Glob, hashable, hedgehog, microlens - , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog - , text, transformers, unordered-containers, utf8-string, vector - }: - mkDerivation { - pname = "universum"; - version = "1.7.3"; - sha256 = "1dhdj72anj3r50idzn45l63zdwkckmbvll65rkwbsn4jj7pd033d"; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-prim hashable microlens - microlens-mtl mtl safe-exceptions stm text transformers - unordered-containers utf8-string vector - ]; - testHaskellDepends = [ - base bytestring doctest Glob hedgehog tasty tasty-hedgehog text - ]; - benchmarkHaskellDepends = [ - base containers gauge text unordered-containers - ]; - description = "Custom prelude used in Serokell"; - license = lib.licenses.mit; - }) {}; - - "universum_1_8_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, gauge , ghc-prim, hashable, hedgehog, microlens, microlens-mtl, mtl , safe-exceptions, stm, tasty, tasty-discover, tasty-hedgehog, text @@ -297535,7 +297097,6 @@ self: { ]; description = "Custom prelude used in Serokell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "unix_2_8_0_0" = callPackage @@ -297782,6 +297343,8 @@ self: { ]; description = "Typeclass for monads that can be unlifted to arbitrary base monads"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "unlift-stm" = callPackage @@ -297974,28 +297537,6 @@ self: { }) {}; "unordered-containers" = callPackage - ({ mkDerivation, base, bytestring, ChasingBottoms, containers - , deepseq, hashable, hashmap, HUnit, mtl, QuickCheck, random, tasty - , tasty-bench, tasty-hunit, tasty-quickcheck, template-haskell - }: - mkDerivation { - pname = "unordered-containers"; - version = "0.2.17.0"; - sha256 = "05ss6ys9gp7dx93glhrm19fxdl916m7yaqxi6p06ibka1dp3m7n4"; - libraryHaskellDepends = [ base deepseq hashable template-haskell ]; - testHaskellDepends = [ - base ChasingBottoms containers hashable HUnit QuickCheck random - tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base bytestring containers deepseq hashable hashmap mtl random - tasty-bench - ]; - description = "Efficient hashing-based container types"; - license = lib.licenses.bsd3; - }) {}; - - "unordered-containers_0_2_19_1" = callPackage ({ mkDerivation, base, bytestring, ChasingBottoms, containers , deepseq, hashable, hashmap, HUnit, mtl, nothunks, QuickCheck , random, tasty, tasty-bench, tasty-hunit, tasty-quickcheck @@ -298018,7 +297559,6 @@ self: { ]; description = "Efficient hashing-based container types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "unordered-containers-rematch" = callPackage @@ -298141,13 +297681,13 @@ self: { "unpacked-maybe-numeric" = callPackage ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes - , wide-word + , wide-word, word-compat }: mkDerivation { pname = "unpacked-maybe-numeric"; - version = "0.1.2.0"; - sha256 = "08cm7121c2ddj2fqfjhqjs3y1yskzcsxjq2q8pbq1ndicmlrw1b0"; - libraryHaskellDepends = [ base primitive wide-word ]; + version = "0.1.2.1"; + sha256 = "0chb52gff3zm6f6p7dp5j6p7vpgmmirx0sfqbswx69w9jsf6p8bk"; + libraryHaskellDepends = [ base primitive wide-word word-compat ]; testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "maybes of numeric values with fewer indirections"; license = lib.licenses.bsd3; @@ -298159,6 +297699,8 @@ self: { pname = "unpacked-maybe-text"; version = "0.1.0.0"; sha256 = "10mc9kjjqf82ddi586g5r6h065znhj9s0ih9w800yw4xl65ygayv"; + revision = "1"; + editedCabalFile = "0g24c223yxsvkzk0y78q9qn94xxvmw088ihwk3rrd2q3l2nax4rw"; libraryHaskellDepends = [ base bytestring text-short ]; description = "optional text that unpacks well"; license = lib.licenses.bsd3; @@ -298291,6 +297833,8 @@ self: { libraryHaskellDepends = [ base ghc ]; description = "Unsatisfiable type class"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "unscramble" = callPackage @@ -298464,8 +298008,8 @@ self: { }: mkDerivation { pname = "update-nix-fetchgit"; - version = "0.2.9"; - sha256 = "0wdw03pl5bx8vsi3kg4l902ah2l1v4x8922g9malyqyh3bvqfham"; + version = "0.2.11"; + sha256 = "07wabhr8hfz4f504wfi9achrl9h6iqn5sphkqfrydzfj7p7nyn9f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -299027,6 +298571,7 @@ self: { ]; description = "Painfully simple URL deployment"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "urn" = callPackage @@ -299378,14 +298923,15 @@ self: { }) {}; "utf8-light" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim }: + ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover + }: mkDerivation { pname = "utf8-light"; - version = "0.4.2"; - sha256 = "0rwyc5z331yfnm4hpx0sph6i1zvkd1z10vvglhnp0vc9wy644k0q"; - revision = "1"; - editedCabalFile = "08fwf4pchlrmqrk78wijncrkvv0kssl1140xm9cfl7rd2y97cs7n"; + version = "0.4.4.0"; + sha256 = "0415hapndlsnzvmm3bk2fl42h4vn1izky7jb3lbby3mzzzd8d1fx"; libraryHaskellDepends = [ base bytestring ghc-prim ]; + testHaskellDepends = [ base bytestring ghc-prim hspec ]; + testToolDepends = [ hspec-discover ]; description = "Unicode"; license = lib.licenses.bsd3; }) {}; @@ -299692,6 +299238,7 @@ self: { executableHaskellDepends = [ base uuagc-cabal ]; description = "Attribute Grammar System of Universiteit Utrecht"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "uuagc"; }) {}; @@ -299733,6 +299280,8 @@ self: { ]; description = "Cabal plugin for UUAGC"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "uuagc-diagrams" = callPackage @@ -299925,7 +299474,9 @@ self: { testHaskellDepends = [ base Cabal HUnit text ]; description = "Tweak .cabal files"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.berberman ]; + broken = true; }) {}; "uvector" = callPackage @@ -300616,8 +300167,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "var-monad"; - version = "0.2.0.0"; - sha256 = "12l536ca32dhvylp3kizq664lsfysmc5r0hqzs50aqrbx8db40ji"; + version = "0.2.0.1"; + sha256 = "1k1v503ww56chlxy9a9vh3w5rh047l3q97si1bi3x1575b1sppm2"; libraryHaskellDepends = [ base stm ]; description = "The VarMonad typeclass, generalizing types of references"; license = lib.licenses.asl20; @@ -300872,7 +300423,6 @@ self: { description = "Common types and instances for Vaultaire"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vcache" = callPackage @@ -301189,8 +300739,8 @@ self: { }) {}; "vector_0_13_0_0" = callPackage - ({ mkDerivation, base, base-orphans, deepseq, HUnit, primitive - , QuickCheck, random, tasty, tasty-bench, tasty-hunit + ({ mkDerivation, base, base-orphans, deepseq, doctest, HUnit + , primitive, QuickCheck, random, tasty, tasty-bench, tasty-hunit , tasty-inspection-testing, tasty-quickcheck, template-haskell , transformers, vector-stream }: @@ -301202,7 +300752,7 @@ self: { editedCabalFile = "12cwdaqsy9dv7j7cwq6r6kdyfxqiya8khm6ccaabjhhpa2aqwljl"; libraryHaskellDepends = [ base deepseq primitive vector-stream ]; testHaskellDepends = [ - base base-orphans HUnit primitive QuickCheck random tasty + base base-orphans doctest HUnit primitive QuickCheck random tasty tasty-hunit tasty-inspection-testing tasty-quickcheck template-haskell transformers ]; @@ -301272,8 +300822,8 @@ self: { pname = "vector-binary-instances"; version = "0.2.5.2"; sha256 = "0kgmlb4rf89b18d348cf2k06xfhdpamhmvq7iz5pab5014hknbmp"; - revision = "2"; - editedCabalFile = "149gn5n722r2skj5w46av3944fbw3882qkaydq7asm6zx5kc0nj6"; + revision = "3"; + editedCabalFile = "0av0k2gn90mf5ai74575bd368x73ljnr7xlkwsqmrs6zdzkw0i83"; libraryHaskellDepends = [ base binary vector ]; testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; benchmarkHaskellDepends = [ @@ -301437,8 +300987,8 @@ self: { }: mkDerivation { pname = "vector-extras"; - version = "0.2.7.1"; - sha256 = "1a8aak9v68qmrx719w782ww7accn7bk11gnca3d2lvbzw793dl4q"; + version = "0.2.8"; + sha256 = "1xnz733p9p66693hb31fmq2cfsy2rwyw1b0915p7y5my1d8dxyzi"; libraryHaskellDepends = [ base containers deferred-folds foldl hashable unordered-containers vector @@ -301634,6 +301184,8 @@ self: { pname = "vector-sized"; version = "1.5.0"; sha256 = "13h4qck1697iswd9f8w17fpjc6yhl2pgrvay7pb22j2h3mgaxpjl"; + revision = "1"; + editedCabalFile = "0y088b8fdhjrghi203n11ip4x2j4632c8rz6a5hx8azmdz2giiph"; libraryHaskellDepends = [ adjunctions base binary comonad deepseq distributive finite-typelits hashable indexed-list-literals primitive vector @@ -301810,6 +301362,7 @@ self: { ]; description = "GIS Vector Tiles, as defined by Mapbox"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "vega-view" = callPackage @@ -301829,7 +301382,9 @@ self: { ]; description = "Easily view Vega or Vega-Lite visualizations"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "vegaview"; + broken = true; }) {}; "velma" = callPackage @@ -301849,9 +301404,7 @@ self: { testHaskellDepends = [ base Cabal filepath hspec text ]; description = "Automatically add files to exposed-modules and other-modules"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "velma"; - broken = true; }) {}; "venzone" = callPackage @@ -302045,7 +301598,6 @@ self: { license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "verismith"; - broken = true; }) {}; "verset" = callPackage @@ -302054,13 +301606,15 @@ self: { }: mkDerivation { pname = "verset"; - version = "0.0.1.7"; - sha256 = "12bbadznnp4pksy1yb7lw4zniksnaz7ipmfyji0ak6b0bqfh74s2"; + version = "0.0.1.8"; + sha256 = "19l5ck1l1528f7mqks5c6n314cyzrw5qk2ddg77s6y6lv5sm4kv3"; libraryHaskellDepends = [ base bytestring containers extra mtl safe text time uuid ]; description = "Small alternative prelude"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "versioning" = callPackage @@ -302073,6 +301627,8 @@ self: { testHaskellDepends = [ aeson base bytestring hspec ]; description = "Type-safe data versioning"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "versioning-servant" = callPackage @@ -302094,7 +301650,6 @@ self: { description = "Servant combinators for the versioning library"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "versions" = callPackage @@ -302119,22 +301674,24 @@ self: { "vessel" = callPackage ({ mkDerivation, aeson, aeson-gadt-th, base, base-orphans - , bifunctors, constraints, constraints-extras, containers - , dependent-map, dependent-monoidal-map, dependent-sum + , bifunctors, commutative-semigroups, 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.1.0"; - sha256 = "04pvn5rs3pgi917m0rsfmjxc035ns8sd79vza72qh0skvsg81pq6"; + version = "0.3.0.0"; + sha256 = "1vqbrz8g9r43q6rqall6xhw6f4c56fj6lwp6cz0758fr7n4n3mqa"; libraryHaskellDepends = [ - 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 + aeson aeson-gadt-th base base-orphans bifunctors + commutative-semigroups 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; @@ -302182,6 +301739,8 @@ self: { ]; description = "A Python str.format() like formatter"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "vformat-aeson" = callPackage @@ -302205,7 +301764,6 @@ self: { description = "Extend vformat to Aeson datatypes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vformat-time" = callPackage @@ -302220,6 +301778,7 @@ self: { testHaskellDepends = [ base time vformat ]; description = "Extend vformat to time datatypes"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "vfr-waypoints" = callPackage @@ -302276,7 +301835,9 @@ self: { ]; description = "A pager for grep"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "vgrep"; + broken = true; }) {}; "vhd" = callPackage @@ -302495,28 +302056,6 @@ self: { }) {}; "vinyl" = 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.13.3"; - sha256 = "0mlk94n3s4ah8y9w9vcrk1n7gnsm19d1iijk9da4219dwrkaax2l"; - 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; - }) {}; - - "vinyl_0_14_3" = callPackage ({ mkDerivation, aeson, array, base, criterion, deepseq, ghc-prim , hspec, lens, lens-aeson, linear, microlens, mtl, mwc-random , primitive, should-not-typecheck, tagged, text @@ -302536,7 +302075,6 @@ self: { ]; description = "Extensible Records"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "vinyl-generics" = callPackage @@ -302554,6 +302092,7 @@ self: { ]; description = "Convert plain records to vinyl (and vice versa), generically"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "vinyl-gl" = callPackage @@ -302815,7 +302354,9 @@ self: { ]; description = "Visualize CBN reduction"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "visualize-cbn"; + broken = true; }) {}; "vitrea" = callPackage @@ -303053,6 +302594,7 @@ self: { ]; description = "Reading of Vorbis comments from Ogg Vorbis files"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "vowpal-utils" = callPackage @@ -303204,43 +302746,6 @@ self: { broken = true; }) {inherit (pkgs) vte;}; - "vty" = callPackage - ({ mkDerivation, ansi-terminal, base, binary, blaze-builder - , bytestring, Cabal, containers, deepseq, directory, filepath - , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl - , parallel, parsec, QuickCheck, quickcheck-assertions, random - , smallcheck, stm, string-qq, terminfo, test-framework - , test-framework-hunit, test-framework-smallcheck, text - , transformers, unix, utf8-string, vector - }: - mkDerivation { - pname = "vty"; - version = "5.33"; - sha256 = "0qsx4lwlkp6mwyr7rm1r9dg5ic1lc1awqgyag0nj1qgj2gnv6nc9"; - revision = "1"; - editedCabalFile = "1in66nd2xkb6mxxzazny900pz1xj83iqsql42c0rwk72chnnb8cd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base binary blaze-builder bytestring containers - deepseq directory filepath hashable microlens microlens-mtl - microlens-th mtl parallel parsec stm terminfo text transformers - unix utf8-string vector - ]; - executableHaskellDepends = [ - base containers directory filepath microlens microlens-mtl mtl - ]; - testHaskellDepends = [ - base blaze-builder bytestring Cabal containers deepseq HUnit - microlens microlens-mtl mtl QuickCheck quickcheck-assertions random - smallcheck stm string-qq terminfo test-framework - test-framework-hunit test-framework-smallcheck text unix - utf8-string vector - ]; - description = "A simple terminal UI library"; - license = lib.licenses.bsd3; - }) {}; - "vty_5_35_1" = callPackage ({ mkDerivation, ansi-terminal, base, binary, blaze-builder , bytestring, Cabal, containers, deepseq, directory, filepath @@ -303254,6 +302759,8 @@ self: { pname = "vty"; version = "5.35.1"; sha256 = "062dpz8fxrnggzpl041zpbph0xj56jki98ajm2s78dldg5vy0c9k"; + revision = "1"; + editedCabalFile = "1zqcvgqhcij92241g20zn3c3a4033biid3f3cqg05q1ygrmznxb5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -303277,7 +302784,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "vty_5_37" = callPackage + "vty" = callPackage ({ mkDerivation, ansi-terminal, base, binary, blaze-builder , bytestring, Cabal, containers, deepseq, directory, filepath , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl @@ -303310,7 +302817,6 @@ self: { ]; description = "A simple terminal UI library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "vty-examples" = callPackage @@ -303394,8 +302900,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.23"; - sha256 = "0859b2nq2rifaa0xjwfv1shdc501xynd8w84dv93xkqil932ax98"; + version = "3.24.3"; + sha256 = "00ral8nlksr37xqdmy0wb4r3f67g81fd8xx4glw4zj07jqlk4pm3"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -303429,8 +302935,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.5.10.1"; - sha256 = "0jr5pl13plmg1fm2ai4f24c0lviazjinqrrafxb948ajrlwm8la1"; + version = "0.5.10.2"; + sha256 = "1qn5k5p83p3lprksmscnb4ylychgfvfryvag9hkin3y2bzr8qwpm"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers dependent-map dependent-sum extra @@ -303828,38 +303334,6 @@ self: { }) {}; "wai-extra" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , bytestring, call-stack, case-insensitive, containers, cookie - , data-default-class, directory, fast-logger, hspec, http-types - , http2, HUnit, iproute, network, resourcet, streaming-commons - , temporary, text, time, transformers, unix, vault, wai, wai-logger - , word8, zlib - }: - mkDerivation { - pname = "wai-extra"; - version = "3.1.12.1"; - sha256 = "1ya4m0c2p3wxzjlmk3yasc3pm61z309hzry9d39lj5wqv93a4wn6"; - revision = "2"; - editedCabalFile = "139iqd6fqqj9xlpnbgva8y3wvakp2lyndk4bkvq46pq2xir4gqkf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring bytestring call-stack - case-insensitive containers cookie data-default-class directory - fast-logger http-types http2 HUnit iproute network resourcet - streaming-commons text time transformers unix vault wai wai-logger - word8 - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive cookie directory fast-logger - hspec http-types http2 HUnit iproute resourcet temporary text time - transformers wai zlib - ]; - description = "Provides some basic WAI handlers and middleware"; - license = lib.licenses.mit; - }) {}; - - "wai-extra_3_1_13_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , bytestring, call-stack, case-insensitive, containers, cookie , data-default-class, directory, fast-logger, hspec, hspec-discover @@ -303890,7 +303364,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Provides some basic WAI handlers and middleware"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "wai-feature-flags" = callPackage @@ -303927,6 +303400,7 @@ self: { ]; description = "Run CGI apps on WAI"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "wai-git-http" = callPackage @@ -304027,8 +303501,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Wrap WAI applications to run on AWS Lambda"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wai-handler-launch" = callPackage @@ -304215,14 +303687,15 @@ self: { }: mkDerivation { pname = "wai-log"; - version = "0.3.0.0"; - sha256 = "0mgby05lq9j31ssyk2yp6mghqwgpffkki7pygday1lmg130n8n74"; + version = "0.4.0.1"; + sha256 = "02lrbvl1rj3jmm9z2mjrkss0lz7jz8xx6cknznd2i4rhirl1vlhr"; libraryHaskellDepends = [ aeson base bytestring http-types log-base string-conversions text time uuid wai ]; description = "A logging middleware for WAI applications"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "wai-logger" = callPackage @@ -304579,6 +304052,7 @@ self: { ]; description = "Route to different middlewares based on the incoming Accept header"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "wai-middleware-crowd" = callPackage @@ -305020,6 +304494,7 @@ self: { ]; description = "Route Wai middlewares based on HTTP verbs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "wai-predicates" = callPackage @@ -305047,17 +304522,6 @@ self: { }) {}; "wai-rate-limit" = callPackage - ({ mkDerivation, base, http-types, wai }: - mkDerivation { - pname = "wai-rate-limit"; - version = "0.2.0.0"; - sha256 = "1jxg6sdbzx20dlxwbjw4b5x9qc1hsx2hzqxgzks3wlj6jc8ar4rx"; - libraryHaskellDepends = [ base http-types wai ]; - description = "Rate limiting as WAI middleware"; - license = lib.licenses.mit; - }) {}; - - "wai-rate-limit_0_3_0_0" = callPackage ({ mkDerivation, base, http-types, time-units, wai }: mkDerivation { pname = "wai-rate-limit"; @@ -305066,7 +304530,6 @@ self: { libraryHaskellDepends = [ base http-types time-units wai ]; description = "Rate limiting as WAI middleware"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "wai-rate-limit-postgres" = callPackage @@ -305164,6 +304627,7 @@ self: { ]; description = "WAI middleware for path-based request routing with captures"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; }) {}; "wai-router" = callPackage @@ -305233,24 +304697,6 @@ self: { }) {}; "wai-saml2" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, c14n - , cryptonite, data-default-class, http-types, mtl, text, time - , vault, wai, wai-extra, x509, x509-store, xml-conduit - }: - mkDerivation { - pname = "wai-saml2"; - version = "0.2.1.3"; - sha256 = "1q1il1lwzinpyhkqrg62hwh7kbb2dyhrlynpzhc9kps00kfxg8zw"; - libraryHaskellDepends = [ - base base64-bytestring bytestring c14n cryptonite - data-default-class http-types mtl text time vault wai wai-extra - x509 x509-store xml-conduit - ]; - description = "SAML2 assertion validation as WAI middleware"; - license = lib.licenses.mit; - }) {}; - - "wai-saml2_0_3_0_1" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, c14n , cryptonite, data-default-class, filepath, http-types, mtl , pretty-show, tasty, tasty-golden, text, time, vault, wai @@ -305273,7 +304719,6 @@ self: { ]; description = "SAML2 assertion validation as WAI middleware"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "wai-secure-cookies" = callPackage @@ -305333,7 +304778,6 @@ self: { description = "An alternative session middleware for WAI"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wai-session-clientsession" = callPackage @@ -305551,6 +304995,7 @@ self: { transformers wai wai-websockets websockets ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "wai-util" = callPackage @@ -305742,44 +305187,12 @@ self: { ]; description = "A parser for the Web Archive (WARC) format"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "warc-export"; + broken = true; }) {}; "warp" = callPackage - ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, directory, gauge - , ghc-prim, hashable, hspec, hspec-discover, http-client, http-date - , http-types, http2, HUnit, iproute, network, process, QuickCheck - , simple-sendfile, stm, streaming-commons, text, time, time-manager - , unix, unix-compat, unliftio, vault, wai, word8, x509 - }: - mkDerivation { - pname = "warp"; - version = "3.3.21"; - sha256 = "0vrzsj1spa5ygplqpkl4nflqxqbvy641dsjij64ix3n6rzhgqxcg"; - libraryHaskellDepends = [ - array auto-update base bsb-http-chunked bytestring case-insensitive - containers ghc-prim hashable http-date http-types http2 iproute - network simple-sendfile stm streaming-commons text time-manager - unix unix-compat unliftio vault wai word8 x509 - ]; - testHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers directory ghc-prim hashable hspec - http-client http-date http-types http2 HUnit iproute network - process QuickCheck simple-sendfile stm streaming-commons text time - time-manager unix unix-compat unliftio vault wai word8 x509 - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers gauge hashable http-date - http-types network time-manager unix unix-compat unliftio x509 - ]; - description = "A fast, light-weight web server for WAI applications"; - license = lib.licenses.mit; - }) {}; - - "warp_3_3_23" = callPackage ({ mkDerivation, array, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, gauge , ghc-prim, hashable, hspec, hspec-discover, http-client, http-date @@ -305811,7 +305224,6 @@ self: { ]; description = "A fast, light-weight web server for WAI applications"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -305849,7 +305261,6 @@ self: { description = "A minimal gRPC server on top of Warp"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "warp-quic" = callPackage @@ -305902,25 +305313,6 @@ self: { }) {}; "warp-tls" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, data-default-class - , network, streaming-commons, tls, tls-session-manager, unliftio - , wai, warp - }: - mkDerivation { - pname = "warp-tls"; - version = "3.3.2"; - sha256 = "0b9viw26ymzq4q8snfddz3w59sqcf5ankxnw6f99iacxjhk6zs6m"; - revision = "1"; - editedCabalFile = "0r4g0j4kcz9rx776mp8hqd06k8b2k7kxd4qjavh2ay6wcplfl0bl"; - libraryHaskellDepends = [ - base bytestring cryptonite data-default-class network - streaming-commons tls tls-session-manager unliftio wai warp - ]; - description = "HTTP over TLS support for Warp via the TLS package"; - license = lib.licenses.mit; - }) {}; - - "warp-tls_3_3_4" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, streaming-commons, tls, tls-session-manager, unliftio , wai, warp @@ -305935,7 +305327,6 @@ self: { ]; description = "HTTP over TLS support for Warp via the TLS package"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "warp-tls-uid" = callPackage @@ -306466,7 +305857,6 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "web-rep-example"; - broken = true; }) {}; "web-routes" = callPackage @@ -306948,7 +306338,6 @@ self: { license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; mainProgram = "testcloud"; - broken = true; }) {}; "webcrank" = callPackage @@ -307025,10 +306414,8 @@ self: { }: mkDerivation { pname = "webdriver"; - version = "0.9.0.1"; - sha256 = "1w6z95swrz5ijmcxh0x3i521kpxqfp6pxgqfqwix7fc4jy450n8k"; - revision = "1"; - editedCabalFile = "04bl53yr1144a3nv9avqjvhl20q0qc5gik6p7cd2naz3i5hfvid1"; + version = "0.10.0.0"; + sha256 = "02vm6wncjzcxmakabnjklkybcyylksfkpj1za541rrjv448zi7qj"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring call-stack data-default-class directory directory-tree exceptions filepath @@ -307038,8 +306425,6 @@ self: { ]; description = "a Haskell client for the Selenium WebDriver protocol"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "webdriver-angular" = callPackage @@ -307062,6 +306447,7 @@ self: { description = "Webdriver actions to assist with testing a webpage which uses Angular.Js"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "webdriver-snoy" = callPackage @@ -307209,9 +306595,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Pipes wrapper of Webex Teams List API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "webex-teams-pipes-exe"; - broken = true; }) {}; "webfinger-client" = callPackage @@ -307267,6 +306651,7 @@ self: { ]; description = "Composable, type-safe library to build HTTP API servers"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; }) {}; "webgear-server" = callPackage @@ -307333,6 +306718,7 @@ self: { ]; description = "webfont generator"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "webify"; maintainers = [ lib.maintainers.erictapen ]; }) {}; @@ -307578,6 +306964,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "websockets-json" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, websockets }: + mkDerivation { + pname = "websockets-json"; + version = "1.0.0"; + sha256 = "1kiicrf7gksggjy0pd5z0kbpg5xxfklabcwp1fhzwk468m3nnsah"; + libraryHaskellDepends = [ + aeson base bytestring exceptions websockets + ]; + description = "Extras for working with websockets & JSON"; + license = lib.licenses.mpl20; + }) {}; + "websockets-rpc" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , exceptions, hashable, monad-control, mtl, QuickCheck @@ -307604,7 +307003,6 @@ self: { description = "Simple streaming RPC mechanism using WebSockets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "websockets-simple" = callPackage @@ -307629,6 +307027,7 @@ self: { ]; description = "Composable websockets clients"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "websockets-simple-extra" = callPackage @@ -307639,6 +307038,7 @@ self: { sha256 = "1ckni1imxh4k1nxivvj9p1mffzvdmyjc20nas8b90dkkxblgnk1j"; libraryHaskellDepends = [ base mtl websockets-simple ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "websockets-snap" = callPackage @@ -307649,6 +307049,8 @@ self: { pname = "websockets-snap"; version = "0.10.3.1"; sha256 = "1hpszqb61xhbgfvxd6g56kdfxsyi14q7xh12jbdnyycbfijb9bqk"; + revision = "1"; + editedCabalFile = "08rz1l4f84gcp2a2rsihk6zl3jm2x4igr13fwv2y8m5agsvd2lhy"; libraryHaskellDepends = [ base bytestring bytestring-builder io-streams mtl snap-core snap-server websockets @@ -307775,8 +307177,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "2.4.0"; - sha256 = "1lwg1a4i7gb0l58bsyn1sg2q31ns79ldw4nv6hbnh4rqq1rv7vx4"; + version = "2.4.1"; + sha256 = "1z17w8q0s1pgqrxx7f1zijy1j4fwl8x2f5r9y11i0vcsqlx12pi9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -307888,8 +307290,8 @@ self: { }: mkDerivation { pname = "welford-online-mean-variance"; - version = "0.1.0.2"; - sha256 = "041z3vgbnv2q6a9w80rjws3y0lwb56z1ws2ic8pyx79dvjb0y55q"; + version = "0.1.0.4"; + sha256 = "0nzr6krkaa39h9v25hbagnw1f2g45dqrv8ifhvh16m4k7xf17xla"; libraryHaskellDepends = [ base cereal deepseq vector ]; testHaskellDepends = [ base cereal deepseq QuickCheck tasty tasty-discover @@ -308212,7 +307614,6 @@ self: { ]; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "why3" = callPackage @@ -308236,16 +307637,16 @@ self: { }) {}; "wide-word" = callPackage - ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hedgehog - , primitive, QuickCheck, quickcheck-classes, semirings + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hashable + , hedgehog, primitive, QuickCheck, quickcheck-classes, semirings }: mkDerivation { pname = "wide-word"; - version = "0.1.1.2"; - sha256 = "10sj7nca2sba74bkiicnp95xrfq2j1al93ggw3z24982nm9x3j8r"; - revision = "4"; - editedCabalFile = "150ikl5cf15lbk383pv1w8smpwbp0dzc0vby653fbzm8a2svcx76"; - libraryHaskellDepends = [ base deepseq primitive ]; + version = "0.1.4.0"; + sha256 = "1jajlkcbymf0jqmcbn46x3yxqxjslzdcnp1v582jjpa2glibsnf0"; + libraryHaskellDepends = [ + base deepseq ghc-prim hashable primitive + ]; testHaskellDepends = [ base bytestring ghc-prim hedgehog primitive QuickCheck quickcheck-classes semirings @@ -308302,8 +307703,8 @@ self: { }: mkDerivation { pname = "wikicfp-scraper"; - version = "0.1.0.12"; - sha256 = "03l8ggnnkq7gx5qf9rrng50wb5cabyam8vrs2bnrm02gcgjx89sx"; + version = "0.1.0.13"; + sha256 = "17gsx48zx2zzf755bapr4gv1h3kiyy4ni332i2a7fs14h08qh764"; libraryHaskellDepends = [ attoparsec base bytestring scalpel-core text time ]; @@ -308340,8 +307741,8 @@ self: { }: mkDerivation { pname = "wild-bind"; - version = "0.1.2.8"; - sha256 = "1ag0lwh5pii8z356sii2zm2i7qyk9q9j7ivc3x0fkvz6p5gk1aj1"; + version = "0.1.2.9"; + sha256 = "1jnknyf3lwc0bk50llpqh3mpvn78h36f6h359z9sbwacxpsr8526"; libraryHaskellDepends = [ base containers semigroups text transformers ]; @@ -308393,8 +307794,8 @@ self: { }: mkDerivation { pname = "wild-bind-x11"; - version = "0.2.0.14"; - sha256 = "0qxzv4xvqqm7xcz17a3h1pgc3g84dp3676vb40yi9dfxdwag3xxs"; + version = "0.2.0.15"; + sha256 = "14yxm16cqmmrx6sag8xjnwzwhcyqbmpx0vhslny2r0b5bmnjn2dn"; libraryHaskellDepends = [ base containers fold-debounce mtl semigroups stm text transformers wild-bind X11 @@ -308585,6 +307986,7 @@ self: { ]; description = "Fast binary io-streams adapter"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "wireguard-hs" = callPackage @@ -308664,8 +308066,8 @@ self: { }: mkDerivation { pname = "witch"; - version = "1.0.2.0"; - sha256 = "1vmn412w11dc1qgw12g0wa6v0miggicgdd7ndml4k4b04sdqbdhq"; + version = "1.1.6.0"; + sha256 = "0bhrf3c3djchi2y0rcz015g34a4g8f1pfc8r89kpqbf2pfd8gw73"; libraryHaskellDepends = [ base bytestring containers tagged template-haskell text time ]; @@ -308677,26 +308079,6 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "witch_1_1_2_0" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit, tagged - , template-haskell, text, time, transformers - }: - mkDerivation { - pname = "witch"; - version = "1.1.2.0"; - sha256 = "1ahikszzypycjilz0749wwcfppk8xdc1n4q97nxbf33h13jpaxax"; - libraryHaskellDepends = [ - base bytestring containers tagged template-haskell text time - ]; - testHaskellDepends = [ - base bytestring containers HUnit tagged text time transformers - ]; - description = "Convert values from one type into another"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.maralorn ]; - }) {}; - "with-index" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -308821,8 +308203,6 @@ self: { libraryHaskellDepends = [ base constraints containers countable ]; description = "values that witness types"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "witty" = callPackage @@ -308973,6 +308353,8 @@ self: { ]; description = "Wadler/Leijen pretty printer supporting colorful console output"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "wl-pprint-extras" = callPackage @@ -309717,6 +309099,8 @@ self: { ]; description = "LOGO-like Turtle graphics with a monadic interface"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "wp-archivebot" = callPackage @@ -309765,8 +309149,8 @@ self: { pname = "wrapped"; version = "0.1.0.1"; sha256 = "00fvammhn4dlna5d1dc8lpwrdrigj9cnlyi8scwslibr6bjsjzfp"; - revision = "3"; - editedCabalFile = "1z7p0kx98yn3jwpghhs1360r4pvrg1vvj66p8w6npvbb5nv6z99j"; + revision = "4"; + editedCabalFile = "103b654pm0figxqjb6bchi975q2rf0r7y2zhygic86j2089k3fcl"; libraryHaskellDepends = [ base ]; description = "Newtypes to carry DerivingVia instances"; license = lib.licenses.asl20; @@ -309778,8 +309162,8 @@ self: { pname = "wrapped-generic-default"; version = "0.1.0.1"; sha256 = "10hbz8m98cw8lr2xj0wkc017pnypagb11ss1ihpp6lnc4w1hpj3f"; - revision = "3"; - editedCabalFile = "0hax0aq1sbjhmr62y9wf04k9c0zd3vj1drk3dkmlvbxmnxhdix87"; + revision = "4"; + editedCabalFile = "1zyrdx018xz6xqpw0x3nz98nx9zw4kpr5l8c1q3fdk9jw2afa5sq"; libraryHaskellDepends = [ base data-default-class wrapped ]; description = "A Generic instance of Default"; license = lib.licenses.asl20; @@ -310322,7 +309706,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "wsjtx-dump-udp"; - broken = true; }) {}; "wss-client" = callPackage @@ -310341,6 +309724,8 @@ self: { testHaskellDepends = [ base bytestring envy hspec skews text ]; description = "A-little-higher-level WebSocket client"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "wstunnel" = callPackage @@ -310351,8 +309736,8 @@ self: { }: mkDerivation { pname = "wstunnel"; - version = "0.4.1.0"; - sha256 = "022x4g1ya5676v7q0q3rzwn6rzlnz74f8xwwp3mnvyih025cx770"; + version = "0.5.1.0"; + sha256 = "10iac65sg2h6azj99gpz8p9hxs38sf675mq1f83rrjvc5zanhm2c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -310436,6 +309821,7 @@ self: { ]; description = "Code for the dice chain problem"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "wumpus-basic" = callPackage @@ -310922,8 +310308,8 @@ self: { ({ mkDerivation, base, containers, mtl, pretty, xml }: mkDerivation { pname = "xcb-types"; - version = "0.11.0"; - sha256 = "1yhf1gh23ccvhkx8xbmiaa24r1mrilyvq3fwa15h8imf7qfvmr6x"; + version = "0.12.0"; + sha256 = "0w3q0qclpjdy51jdd761ykz48l5sm3q6jjy8igaf3yhsdzzg79fw"; libraryHaskellDepends = [ base containers mtl pretty xml ]; description = "Parses XML files used by the XCB project"; license = lib.licenses.bsd3; @@ -310937,8 +310323,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.12.1"; - sha256 = "0qpbm9jncpj7jy9xsbl1xy84mw2kmnfbd0m7g0qng80cifzvkqhi"; + version = "1.2.0"; + sha256 = "0xsjr73ayld2ra40715hk319cc353vpiv2xpv58cvwfdh76n5nsy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -311034,21 +310420,21 @@ self: { }) {}; "xdg-basedir-compliant" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, filepath - , hspec, path, polysemy, polysemy-plugin, polysemy-zoo, QuickCheck - , split + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, hspec, path, polysemy, polysemy-plugin, polysemy-zoo + , QuickCheck, split }: mkDerivation { pname = "xdg-basedir-compliant"; - version = "1.1.0"; - sha256 = "15m38hhfa5bx5nsp7xmwjv4xk3rzw0ci1mnx8hivi7j7yk8xwc5s"; + version = "1.2.0"; + sha256 = "1sqr202bi12acchvnj44n12bf4ay9k6w8yqysnzy35sfl373cch5"; libraryHaskellDepends = [ - base bytestring directory filepath path polysemy polysemy-plugin - polysemy-zoo split + base bytestring containers directory filepath path polysemy + polysemy-plugin polysemy-zoo split ]; testHaskellDepends = [ - aeson base bytestring directory filepath hspec path polysemy - polysemy-plugin polysemy-zoo QuickCheck split + aeson base bytestring containers directory filepath hspec path + polysemy polysemy-plugin polysemy-zoo QuickCheck split ]; description = "XDG Basedir"; license = lib.licenses.bsd3; @@ -311959,8 +311345,8 @@ self: { }: mkDerivation { pname = "xml-parser"; - version = "0.1.1"; - sha256 = "06a8pci3jr3mdrsh8708i61rqd2rsgqyf86s269ycca6xlbrgwzh"; + version = "0.1.1.1"; + sha256 = "13af7yfxn1m7clhzxsbkd6q1nr8dslv39w4hvyhca0l7adplyyw3"; libraryHaskellDepends = [ attoparsec base bytestring containers hashable text text-builder transformers unordered-containers xml-conduit @@ -312040,7 +311426,9 @@ self: { benchmarkHaskellDepends = [ base gauge protolude ]; description = "XML pretty printer"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; mainProgram = "xml-prettify"; + broken = true; }) {}; "xml-push" = callPackage @@ -312135,6 +311523,8 @@ self: { ]; description = "Parse XML from bytes"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "xml-to-json" = callPackage @@ -312304,17 +311694,18 @@ self: { }) {}; "xmlbf" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, QuickCheck - , quickcheck-instances, selective, tasty, tasty-hunit - , tasty-quickcheck, text, transformers, unordered-containers + ({ mkDerivation, base, bytestring, containers, deepseq, exceptions + , mmorph, mtl, QuickCheck, quickcheck-instances, selective, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers }: mkDerivation { pname = "xmlbf"; - version = "0.6.1"; - sha256 = "0xhpg10bqmv9cd4sw0vf2vvvyyas3xd36lwarbh5l78hylmibnlf"; + version = "0.7"; + sha256 = "0zqim6cz8wlvhzxpk5q8wk69a6vm4z9j0pyr1jkhd495gphzkysy"; libraryHaskellDepends = [ - base bytestring containers deepseq selective text transformers - unordered-containers + base bytestring containers deepseq exceptions mmorph mtl selective + text transformers unordered-containers ]; testHaskellDepends = [ base bytestring QuickCheck quickcheck-instances tasty tasty-hunit @@ -312325,42 +311716,38 @@ self: { }) {}; "xmlbf-xeno" = callPackage - ({ mkDerivation, base, bytestring, html-entities, QuickCheck - , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text - , unordered-containers, xeno, xmlbf + ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim + , html-entities, tasty, tasty-hunit, text, unordered-containers + , xeno, xml, xmlbf }: mkDerivation { pname = "xmlbf-xeno"; - version = "0.2"; - sha256 = "1x33885kjddmc39p2jxafypcgpm5fajdxzdd6l9z5bpihlpgk7ig"; + version = "0.2.2"; + sha256 = "1ls45fqyvss387mcz5gppnal9pf4kmnqd8dzr6caaxzdd5ckxi3h"; libraryHaskellDepends = [ base bytestring html-entities text unordered-containers xeno xmlbf ]; - testHaskellDepends = [ - base bytestring QuickCheck quickcheck-instances tasty tasty-hunit - tasty-quickcheck text unordered-containers xmlbf + testHaskellDepends = [ base tasty tasty-hunit xmlbf ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq ghc-prim xml ]; description = "xeno backend support for the xmlbf library"; license = lib.licenses.asl20; }) {}; "xmlbf-xmlhtml" = callPackage - ({ mkDerivation, base, bytestring, html-entities, QuickCheck - , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text - , unordered-containers, xmlbf, xmlhtml + ({ mkDerivation, base, bytestring, html-entities, tasty + , tasty-hunit, text, unordered-containers, xmlbf, xmlhtml }: mkDerivation { pname = "xmlbf-xmlhtml"; - version = "0.2"; - sha256 = "1h2w98jdr3r9isbl5g39gd3fxlm4vqib15grqgarhx2gj1k9vlxd"; + version = "0.2.2"; + sha256 = "0d93ywr70qmjd2yd33b5k8b5n1l01cj1clbm93hq6sfjjnw4cyi0"; libraryHaskellDepends = [ base bytestring html-entities text unordered-containers xmlbf xmlhtml ]; - testHaskellDepends = [ - base bytestring QuickCheck quickcheck-instances tasty tasty-hunit - tasty-quickcheck text unordered-containers xmlbf - ]; + testHaskellDepends = [ base tasty tasty-hunit xmlbf ]; description = "xmlhtml backend support for the xmlbf library"; license = lib.licenses.asl20; }) {}; @@ -312395,10 +311782,8 @@ self: { }: mkDerivation { pname = "xmlhtml"; - version = "0.2.5.2"; - sha256 = "1p2v1cj9jjwbqyb0fyv2201zd7ljz5d46qg5kwy7rz2bchbqd0b4"; - revision = "4"; - editedCabalFile = "1q4f9pvyrkrw793kvd1lxzpzf49h2rs8zdmmhsli487sllflghnq"; + version = "0.2.5.3"; + sha256 = "0nvwrl4cw7hfsbndmxdmzs3cs35hs01bja6hrjrc8fairaaif2rf"; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-builder containers parsec text unordered-containers @@ -312478,8 +311863,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.45"; - sha256 = "0p64z535lk338f247gvddc6c4326xs41ar817whdvzj2910pyn86"; + version = "0.46"; + sha256 = "0glpiq7c0qwfcxnc2flgzj7afm5m1a9ghzwwcq7f8q27m21kddrd"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -312543,7 +311928,10 @@ self: { description = "A tiling window manager"; license = lib.licenses.bsd3; mainProgram = "xmonad"; - maintainers = [ lib.maintainers.peti ]; + maintainers = [ + lib.maintainers.dschrempf lib.maintainers.ivanbrennan + lib.maintainers.peti + ]; }) {}; "xmonad-bluetilebranch" = callPackage @@ -312589,7 +311977,10 @@ self: { ]; description = "Community-maintained extensions for xmonad"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.peti ]; + maintainers = [ + lib.maintainers.dschrempf lib.maintainers.ivanbrennan + lib.maintainers.peti + ]; }) {}; "xmonad-contrib-bluetilebranch" = callPackage @@ -312985,7 +312376,6 @@ self: { description = "Data types for programs for xournal file format"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xpathdsv" = callPackage @@ -313041,7 +312431,6 @@ self: { license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; mainProgram = "xrefcheck"; - broken = true; }) {}; "xsact" = callPackage @@ -313089,6 +312478,8 @@ self: { libraryHaskellDepends = [ base HUnit QuickCheck uniplate vector ]; description = "cryptanalysis of Blizzard's broken SHA-1 implementation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "xslt" = callPackage @@ -313111,10 +312502,8 @@ self: { }: mkDerivation { pname = "xss-sanitize"; - version = "0.3.7"; - sha256 = "1wnzx5nv8p4ppphcvjp6x8wna0kpw9jn85gn1qbhjqhrl5nqy1vw"; - revision = "1"; - editedCabalFile = "15kd3yxs219g4rxnq7qlr2zhjv930b33aynq0nbzhw94bff6qb66"; + version = "0.3.7.1"; + sha256 = "1lmmyh28mb1k44m63m7qx6iy4x2fgqq5srmky47dsm0fby9iag1h"; libraryHaskellDepends = [ attoparsec base containers css-text network-uri tagsoup text utf8-string @@ -313158,8 +312547,6 @@ self: { ]; description = "Automatic generation of XStaticFile"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xtc" = callPackage @@ -313200,8 +312587,6 @@ self: { ]; description = "turtle like LOGO"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xxhash" = callPackage @@ -313219,6 +312604,8 @@ self: { ]; description = "A Haskell implementation of the xxHash algorithm"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "xxhash-ffi" = callPackage @@ -313965,8 +313352,6 @@ self: { ]; description = "Flexible declarative YAML parsing toolkit"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yaml2owl" = callPackage @@ -314033,8 +313418,8 @@ self: { pname = "yampa-canvas"; version = "0.2.3"; sha256 = "0a1pq1psmc4490isr19z4prnqq1w3374vkfmzpw9s20s2p6k5y7r"; - revision = "8"; - editedCabalFile = "1lnvj9fgwb11my92sk1k0kws3aan6d9r2airpfviv5b9bb0ylpqm"; + revision = "9"; + editedCabalFile = "0cl5bnki5a5dfr6jv5957c7svvgnvgf5zr6c6adha639z98l1fmq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -314122,8 +313507,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.13.7"; - sha256 = "04i1rzbc8v60s1qdnz42g8anm2xc6w28i47jkakqlpxlcii3zlcy"; + version = "0.14"; + sha256 = "1w2p15j1fh2xv460xc40w7li2mvv4nwqqys1xhr9zpby2cdkc39h"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -314203,8 +313588,8 @@ self: { }: mkDerivation { pname = "yapb"; - version = "0.2.6"; - sha256 = "1gdmnhafr7i4f4zxsiq3yw2kzlxrir9vygf2g41war9wnd9mfq8p"; + version = "0.2.7"; + sha256 = "1hdmyf2qg5bp9qq7b509mjvqbg3434bl8mfiyarccplzy8169f1k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -314237,8 +313622,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Yet another records libraries"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yarn-lock" = callPackage @@ -314296,7 +313679,9 @@ self: { ]; description = "Convert yarn.lock files to nix expressions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.sternenseemann ]; + broken = true; }) {}; "yarr" = callPackage @@ -314350,7 +313735,6 @@ self: { description = "Yet another string interpolator"; license = lib.licenses.cc0; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yate" = callPackage @@ -315060,25 +314444,35 @@ self: { "yesod-auth-lti13" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring - , bytestring, containers, cryptonite, http-client, http-conduit - , jose-jwt, load-env, lti13, microlens, oidc-client - , safe-exceptions, text, time, warp, yesod, yesod-auth, yesod-core + , bytestring, containers, cryptonite, data-default, file-embed + , hspec, hspec-discover, http-client, http-conduit, http-types + , jose-jwt, load-env, lti13, microlens, mtl, oidc-client + , QuickCheck, template-haskell, text, th-utilities, time + , transformers, unliftio, wai, warp, yesod, yesod-auth, yesod-core + , yesod-test }: mkDerivation { pname = "yesod-auth-lti13"; - version = "0.2.0.3"; - sha256 = "06xlpdirr7s4l9a9sxydn7vj0z9dy600yn6nmccv042awkdg5l0f"; + version = "0.3.0.0"; + sha256 = "1mi8fvynayw1wf17mrk11vdisi7r585bf8v0d73x7yq3f1b43qfa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring containers - cryptonite http-client http-conduit jose-jwt load-env lti13 - microlens oidc-client safe-exceptions text time warp yesod + cryptonite http-client http-conduit http-types jose-jwt load-env + lti13 microlens oidc-client text time unliftio warp yesod yesod-auth yesod-core ]; + testHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring containers + cryptonite data-default file-embed hspec http-client http-conduit + http-types jose-jwt load-env lti13 microlens mtl oidc-client + QuickCheck template-haskell text th-utilities time transformers + unliftio wai warp yesod yesod-auth yesod-core yesod-test + ]; + testToolDepends = [ hspec-discover ]; description = "A yesod-auth plugin for LTI 1.3"; license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-auth-nopassword" = callPackage @@ -315105,16 +314499,14 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth"; - version = "1.6.0.3"; - sha256 = "0y57d5y0l0fzmk6zxrpf2xf8y00hp2i0lk3xh5sqlb77a57r109s"; + version = "1.6.1"; + sha256 = "0gyjcrm8yhqd2zripv050p0jnlxl88czbqar2crr4gxq8na5pn20"; libraryHaskellDepends = [ authenticate-oauth base bytestring text unliftio yesod-auth yesod-core yesod-form ]; description = "OAuth Authentication for Yesod"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-auth-oauth2" = callPackage @@ -316088,6 +315480,8 @@ self: { ]; description = "A middleware for building CSP headers on the fly"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yesod-newsfeed" = callPackage @@ -317062,7 +316456,6 @@ self: { description = "Yi editor core library"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-dynamic-configuration" = callPackage @@ -317091,6 +316484,7 @@ self: { libraryHaskellDepends = [ base containers split yi-language ]; description = "Simple mapping from colour names used in emacs to Color"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "yi-frontend-pango" = callPackage @@ -317268,6 +316662,8 @@ self: { ]; description = "Collection of language-related Yi libraries"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yi-misc-modes" = callPackage @@ -317567,6 +316963,8 @@ self: { libraryHaskellDepends = [ base free mtl ]; description = "A truly tiny monadic parsing library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yoda" = callPackage @@ -317639,6 +317037,8 @@ self: { executableHaskellDepends = [ base bytestring process utility-ht ]; description = "Upload video to YouTube via YouTube API"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yql" = callPackage @@ -318030,8 +317430,8 @@ self: { }: mkDerivation { pname = "zenacy-html"; - version = "2.0.4"; - sha256 = "05jy3w7a94ns52w4a1p6xhcph09p2zzqmvncf47db9wwq6xl5ad2"; + version = "2.0.7"; + sha256 = "1468haqjgmnh6drf5cfk42v0x80pr3a9asap8l6m1l4pwy531wkh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -318062,8 +317462,8 @@ self: { }: mkDerivation { pname = "zenacy-unicode"; - version = "1.0.1"; - sha256 = "1l03zr1j6h1h15rnz6mk731g5ib1h3x59b3aqm30i0kd2h28g0vw"; + version = "1.0.2"; + sha256 = "0v9zsiqm07gmyqa3c3caak2lfi8z499xmj0xa3lyx8s2nd6aficn"; libraryHaskellDepends = [ base bytestring vector word8 ]; testHaskellDepends = [ base bytestring HUnit test-framework test-framework-hunit text @@ -318212,8 +317612,8 @@ self: { }: mkDerivation { pname = "zephyr-copilot"; - version = "1.0.4"; - sha256 = "112xjv3lmnnxi6imwj9p0i2nn0gbc6dgai0yq8kc6iy1qpg478w5"; + version = "1.0.6"; + sha256 = "0lakan23rddv8rlrd5h7jzc3g59h22hpdbjgabn4v76aaxpk3rga"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative sketch-frp-copilot temporary @@ -318233,6 +317633,8 @@ self: { libraryHaskellDepends = [ base semigroups ]; description = "Semigroups with absorption"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "zerobin" = callPackage @@ -318254,6 +317656,7 @@ self: { ]; description = "Post to 0bin services"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "zerobin"; }) {}; @@ -318315,6 +317718,7 @@ self: { description = "Bindings to ZeroMQ 3.x"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) zeromq;}; "zeromq4-clone-pattern" = callPackage @@ -318703,8 +318107,8 @@ self: { pname = "zip"; version = "1.7.2"; sha256 = "1c5pr3hv11dpn4ybd4742qkpqmvb9l3l7xmzlsf65wm2p8071dvj"; - revision = "2"; - editedCabalFile = "0gacj2fp0yg45l5vxby0n03lza91zfykk74p6a2r3abrfmvw7kq8"; + revision = "3"; + editedCabalFile = "0q72y8qsz1y01rlmi3chdb0p06qng7ffzv0ylmiqqn36f9qjl405"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -318747,6 +318151,27 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) which;}; + "zip-cmd" = callPackage + ({ mkDerivation, base, bytestring, filepath, optparse-applicative + , shellwords, text, time, zip + }: + mkDerivation { + pname = "zip-cmd"; + version = "1.0.1"; + sha256 = "18jhhzhbr4bh14b5kw7f2bxwrcnq0590v25f81wrqkvmbb2mzwmz"; + revision = "1"; + editedCabalFile = "0f2k4xxvpzf33bn6nab3fqimkc2gaywl8hbadnhavlbyrg5fdhpn"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring filepath optparse-applicative shellwords text time + zip + ]; + description = "Simple CLI tool for the haskell zip library"; + license = lib.licenses.bsd3; + mainProgram = "zip-cmd"; + }) {}; + "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra , digest, directory, filepath, hpc, HUnit, mtl, old-time, resourcet @@ -318773,24 +318198,26 @@ self: { "zip-stream" = callPackage ({ mkDerivation, base, binary, binary-conduit, bytestring, conduit - , conduit-extra, digest, directory, exceptions, filepath, mtl - , primitive, resourcet, text, time, transformers, transformers-base - , zlib + , conduit-extra, deepseq, digest, directory, exceptions, filepath + , hspec, mtl, primitive, resourcet, text, time, transformers + , transformers-base, zlib }: mkDerivation { pname = "zip-stream"; - version = "0.2.1.0"; - sha256 = "0fx8kj0ijm3555grhdns7agmi084584fh1v0mvkm4x696h1zzvli"; + version = "0.2.2.0"; + sha256 = "1z9q6j5zh4crvgk4v2p9s6qww74ifmcj7ngxxkpnkv8h81xjcdjk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary binary-conduit bytestring conduit conduit-extra digest - exceptions mtl primitive resourcet text time transformers-base zlib + base binary binary-conduit bytestring conduit conduit-extra deepseq + digest exceptions mtl primitive resourcet text time + transformers-base zlib ]; executableHaskellDepends = [ base bytestring conduit conduit-extra directory filepath resourcet text time transformers ]; + testHaskellDepends = [ base bytestring conduit hspec text time ]; description = "ZIP archive streaming using conduits"; license = lib.licenses.bsd3; }) {}; @@ -319010,6 +318437,8 @@ self: { libraryHaskellDepends = [ base bytestring profunctors zlib ]; description = "Lenses for zlib"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "zm" = callPackage @@ -319033,7 +318462,6 @@ self: { description = "Language independent, reproducible, absolute types"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "zmcat" = callPackage @@ -319226,8 +318654,8 @@ self: { }: mkDerivation { pname = "zoovisitor"; - version = "0.2.1.0"; - sha256 = "1vh20sjq305f7nkphprqby19cbd7w395yixq92w3mplsz9cx6h0n"; + version = "0.2.1.1"; + sha256 = "02hhscjj1rql1xn08x1dh5lppsvrs059wh2psxz5i2glwc7jgd9a"; libraryHaskellDepends = [ base Z-Data Z-IO ]; librarySystemDepends = [ zookeeper_mt ]; testHaskellDepends = [ async base hspec uuid Z-Data ]; @@ -319459,7 +318887,9 @@ self: { testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; description = "A zuul client library"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; mainProgram = "zuul-cli"; + broken = true; }) {}; "zxcvbn-c" = callPackage diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index 5f7e127c0b4d..ebaba1a22fa6 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -109,8 +109,9 @@ rec { */ dontCheck = overrideCabal (drv: { doCheck = false; }); - /* doBenchmark enables dependency checking, compilation and execution + /* doBenchmark enables dependency checking and compilation for benchmarks listed in the package description file. + Benchmarks are, however, not executed at the moment. */ doBenchmark = overrideCabal (drv: { doBenchmark = true; }); /* dontBenchmark disables dependency checking, compilation and execution @@ -355,7 +356,7 @@ rec { */ triggerRebuild = i: overrideCabal (drv: { postUnpack = ": trigger rebuild ${toString i}"; }); - /* Override the sources for the package and optionaly the version. + /* Override the sources for the package and optionally the version. This also takes of removing editedCabalFile. */ overrideSrc = { src, version ? null }: drv: diff --git a/pkgs/development/haskell-modules/lib/default.nix b/pkgs/development/haskell-modules/lib/default.nix index 581e9aa1016f..ffd9ac057890 100644 --- a/pkgs/development/haskell-modules/lib/default.nix +++ b/pkgs/development/haskell-modules/lib/default.nix @@ -279,7 +279,7 @@ rec { */ triggerRebuild = drv: i: compose.triggerRebuild i drv; - /* Override the sources for the package and optionaly the version. + /* Override the sources for the package and optionally the version. This also takes of removing editedCabalFile. */ overrideSrc = drv: src: compose.overrideSrc src drv; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 843d1a9694c3..5b9546e7505f 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -33,7 +33,7 @@ # `self` as second, and returns a set of haskell packages package-set -, # The final, fully overriden package set usable with the nixpkgs fixpoint +, # The final, fully overridden package set usable with the nixpkgs fixpoint # overriding functionality extensible-self }: @@ -73,7 +73,7 @@ let mkDerivation = makeOverridable mkDerivationImpl; - # manualArgs are the arguments that were explictly passed to `callPackage`, like: + # manualArgs are the arguments that were explicitly passed to `callPackage`, like: # # callPackage foo { bar = null; }; # @@ -93,8 +93,9 @@ let # Converts a returned function to a functor attribute set if necessary ensureAttrs = v: if builtins.isFunction v then { __functor = _: v; } else v; - # this wraps the `drv` function to add a `overrideScope` function to the result. + # this wraps the `drv` function to add `scope` and `overrideScope` to the result. drvScope = allArgs: ensureAttrs (drv allArgs) // { + inherit scope; overrideScope = f: let newScope = mkScope (fix' (extends f scope.__unfix__)); # note that we have to be careful here: `allArgs` includes the auto-arguments that @@ -161,17 +162,13 @@ let src = "${component}/${name}.cabal"; }; - # Adds a nix file as an input to the haskell derivation it - # produces. This is useful for callHackage / callCabal2nix to - # prevent the generated default.nix from being garbage collected - # (requiring it to be frequently rebuilt), which can be an - # annoyance. + # Adds a nix file derived from cabal2nix in the passthru of the derivation it + # produces. This is useful to debug callHackage / callCabal2nix by looking at + # the content of the nix file pointed by `cabal2nixDeriver`. + # However, it does not keep a reference to that file, which may be garbage + # collected, which may be an annoyance. callPackageKeepDeriver = src: args: overrideCabal (orig: { - preConfigure = '' - # Generated from ${src} - ${orig.preConfigure or ""} - ''; passthru = orig.passthru or {} // { # When using callCabal2nix or callHackage, it is often useful # to debug a failure by inspecting the Nix expression diff --git a/pkgs/development/haskell-modules/patches/cachix.patch b/pkgs/development/haskell-modules/patches/cachix.patch deleted file mode 100755 index 21f1496933a7..000000000000 --- a/pkgs/development/haskell-modules/patches/cachix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/Cachix/Client/OptionsParser.hs -+++ b/src/Cachix/Client/OptionsParser.hs -@@ -15,7 +15,7 @@ - import qualified Cachix.Client.URI as URI - import qualified Cachix.Deploy.OptionsParser as DeployOptions - import Options.Applicative --import Protolude hiding (toS) -+import Protolude hiding (option, toS) - import Protolude.Conv - import qualified URI.ByteString as URI diff --git a/pkgs/development/haskell-modules/patches/haskell-ci-optparse-applicative-0.17-ShellCheck-0.8.patch b/pkgs/development/haskell-modules/patches/haskell-ci-optparse-applicative-0.17-ShellCheck-0.8.patch new file mode 100644 index 000000000000..c1e1663627f7 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/haskell-ci-optparse-applicative-0.17-ShellCheck-0.8.patch @@ -0,0 +1,54 @@ +From 0cc6f0f8de1776d0b5851459d22a0997dfd735ce Mon Sep 17 00:00:00 2001 +From: Oleg Grenrus +Date: Wed, 25 May 2022 14:09:49 +0300 +Subject: [PATCH] Use ShellCheck-0.8.0 and optparse-applicative-0.17 + +Adapted from 0cc6f0f8de1776d0b5851459d22a0997dfd735ce to apply on top of +haskell-ci-0.14.3. + +Co-Authored-By: sternenseemann + +--- + haskell-ci.cabal | 4 ++-- + src/HaskellCI/GitHub.hs | 7 ++++--- + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/haskell-ci.cabal b/haskell-ci.cabal +index 273bd422..6848402c 100644 +--- a/haskell-ci.cabal ++++ b/haskell-ci.cabal +@@ -167,14 +167,14 @@ library haskell-ci-internal + , ini ^>=0.4.1 + , lattices ^>=2 + , network-uri ^>=2.6.1.0 +- , optparse-applicative ^>=0.16.1.0 ++ , optparse-applicative ^>=0.17.0.0 + , temporary ^>=1.3 + , unordered-containers ^>=0.2.10.0 + , zinza ^>=0.2 + + -- ShellCheck. Would need newer transformers for older GHC + if flag(shellcheck) +- build-depends: ShellCheck ==0.7.2 ++ build-depends: ShellCheck ==0.8.0 + + executable haskell-ci + main-is: Main.hs +diff --git a/src/HaskellCI/GitHub.hs b/src/HaskellCI/GitHub.hs +index f1a402e6..a2c6e4f6 100644 +--- a/src/HaskellCI/GitHub.hs ++++ b/src/HaskellCI/GitHub.hs +@@ -653,9 +653,10 @@ makeGitHub _argv config@Config {..} gitconfig prj jobs@JobVersions {..} = do + setup hvrppa ghcup + | allGHCUP = traverse_ liftSh ghcup + | not anyGHCUP = traverse_ liftSh hvrppa +- -- 2192: ${{ ...}} will match (ShellCheck think it doesn't) +- -- 2129: individual redirects +- | otherwise = sh' [2193, 2129] $ unlines $ ++ -- SC2192: ${{ ...}} will match (ShellCheck think it doesn't) ++ -- SC2129: individual redirects ++ -- SC2296: Parameter expansions can't start with {. Double check syntax. -- ${{ }} in YAML templating. ++ | otherwise = sh' [2193, 2129, 2296] $ unlines $ + [ "if [ \"${{ matrix.setup-method }}\" = ghcup ]; then" + ] ++ + [ " " ++ shToString s diff --git a/pkgs/development/haskell-modules/patches/hevm-update-deps.patch b/pkgs/development/haskell-modules/patches/hevm-update-deps.patch deleted file mode 100644 index e4a37fc0f4c2..000000000000 --- a/pkgs/development/haskell-modules/patches/hevm-update-deps.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff --git a/hevm.cabal b/hevm.cabal -index cf36961e..3b31f595 100644 ---- a/hevm.cabal -+++ b/hevm.cabal -@@ -71,6 +71,10 @@ library - -Wall -Wno-deprecations - extra-libraries: - secp256k1, ff -+ if os(darwin) -+ extra-libraries: c++ -+ else -+ extra-libraries: stdc++ - c-sources: - ethjet/tinykeccak.c, ethjet/ethjet.c - cxx-sources: -@@ -88,7 +92,7 @@ library - transformers >= 0.5.6 && < 0.6, - tree-view >= 0.5 && < 0.6, - abstract-par >= 0.3.3 && < 0.4, -- aeson >= 1.5.6 && < 1.6, -+ aeson >= 2.0 && < 2.1, - bytestring >= 0.10.8 && < 0.11, - scientific >= 0.3.6 && < 0.4, - binary >= 0.8.6 && < 0.9, -@@ -97,7 +101,7 @@ library - vector >= 0.12.1 && < 0.13, - ansi-wl-pprint >= 0.6.9 && < 0.7, - base16-bytestring >= 1.0.0 && < 2.0, -- brick >= 0.58 && < 0.63, -+ brick >= 0.58 && < 0.69, - megaparsec >= 9.0.0 && < 10.0, - mtl >= 2.2.2 && < 2.3, - directory >= 1.3.3 && < 1.4, -@@ -105,13 +109,13 @@ library - vty >= 5.25.1 && < 5.34, - cereal >= 0.5.8 && < 0.6, - cryptonite >= 0.27 && <= 0.29, -- memory >= 0.14.18 && < 0.16, -+ memory >= 0.14.18 && < 0.20, - data-dword >= 0.3.1 && < 0.4, - fgl >= 5.7.0 && < 5.8, - free >= 5.1.3 && < 5.2, - haskeline >= 0.8.0 && < 0.9, - process >= 1.6.5 && < 1.7, -- lens >= 4.17.1 && < 4.20, -+ lens >= 4.17.1 && < 5.1, - lens-aeson >= 1.0.2 && < 1.2, - monad-par >= 0.3.5 && < 0.4, - multiset >= 0.3.4 && < 0.4, -@@ -124,7 +128,6 @@ library - sbv >= 8.9, - semver-range >= 0.2.7 && < 0.3, - temporary >= 1.3 && < 1.4, -- text-format >= 0.3.2 && < 0.4, - witherable >= 0.3.5 && < 0.5, - wreq >= 0.5.3 && < 0.6, - regex-tdfa >= 1.2.3 && < 1.4, -@@ -190,7 +193,6 @@ executable hevm - sbv, - temporary, - text, -- text-format, - unordered-containers, - vector, - vty -diff --git a/src/EVM/Solidity.hs b/src/EVM/Solidity.hs -index b7d0f36b..4e9d6892 100644 ---- a/src/EVM/Solidity.hs -+++ b/src/EVM/Solidity.hs -@@ -70,6 +70,7 @@ import Control.Monad - import Control.Lens hiding (Indexed, (.=)) - import qualified Data.String.Here as Here - import Data.Aeson hiding (json) -+import qualified Data.Aeson.KeyMap as KeyMap - import Data.Aeson.Types - import Data.Aeson.Lens - import Data.Scientific -@@ -714,8 +715,8 @@ astIdMap = foldMap f - f :: Value -> Map Int Value - f (Array x) = foldMap f x - f v@(Object x) = -- let t = foldMap f (HMap.elems x) -- in case HMap.lookup "id" x of -+ let t = foldMap f (KeyMap.elems x) -+ in case KeyMap.lookup "id" x of - Nothing -> t - Just (Number i) -> t <> Map.singleton (round i) v - Just _ -> t -diff --git a/src/EVM/SymExec.hs b/src/EVM/SymExec.hs -index 5bbf1c03..b828098e 100644 ---- a/src/EVM/SymExec.hs -+++ b/src/EVM/SymExec.hs -@@ -40,8 +40,8 @@ type EquivalenceResult = ProofResult ([VM], [VM]) VM () - - -- | Convenience functions for generating large symbolic byte strings - sbytes32, sbytes128, sbytes256, sbytes512, sbytes1024 :: Query ([SWord 8]) --sbytes32 = toBytes <$> freshVar_ @ (WordN 256) --sbytes128 = toBytes <$> freshVar_ @ (WordN 1024) -+sbytes32 = toBytes <$> freshVar_ @(WordN 256) -+sbytes128 = toBytes <$> freshVar_ @(WordN 1024) - sbytes256 = liftA2 (++) sbytes128 sbytes128 - sbytes512 = liftA2 (++) sbytes256 sbytes256 - sbytes1024 = liftA2 (++) sbytes512 sbytes512 -diff --git a/src/EVM/Types.hs b/src/EVM/Types.hs -index fdd2368d..1dc29e83 100644 ---- a/src/EVM/Types.hs -+++ b/src/EVM/Types.hs -@@ -434,17 +434,17 @@ readN s = fromIntegral (read s :: Integer) - readNull :: Read a => a -> String -> a - readNull x = fromMaybe x . Text.Read.readMaybe - --wordField :: JSON.Object -> Text -> JSON.Parser W256 -+wordField :: JSON.Object -> Key -> JSON.Parser W256 - wordField x f = ((readNull 0) . Text.unpack) - <$> (x .: f) - --addrField :: JSON.Object -> Text -> JSON.Parser Addr -+addrField :: JSON.Object -> Key -> JSON.Parser Addr - addrField x f = (read . Text.unpack) <$> (x .: f) - --addrFieldMaybe :: JSON.Object -> Text -> JSON.Parser (Maybe Addr) -+addrFieldMaybe :: JSON.Object -> Key -> JSON.Parser (Maybe Addr) - addrFieldMaybe x f = (Text.Read.readMaybe . Text.unpack) <$> (x .: f) - --dataField :: JSON.Object -> Text -> JSON.Parser ByteString -+dataField :: JSON.Object -> Key -> JSON.Parser ByteString - dataField x f = hexText <$> (x .: f) - - toWord512 :: W256 -> Word512 diff --git a/pkgs/development/haskell-modules/patches/lambdabot-core-ghc9.patch b/pkgs/development/haskell-modules/patches/lambdabot-core-ghc9.patch deleted file mode 100644 index 87a112b82173..000000000000 --- a/pkgs/development/haskell-modules/patches/lambdabot-core-ghc9.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff --git a/lambdabot-core.cabal b/lambdabot-core.cabal -index 861a28b..87175a3 100644 ---- a/lambdabot-core.cabal -+++ b/lambdabot-core.cabal -@@ -19,7 +19,7 @@ homepage: https://wiki.haskell.org/Lambdabot - - build-type: Simple - cabal-version: >= 1.10 --tested-with: GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.4 -+tested-with: GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.4, GHC == 9.0.2 - - extra-source-files: AUTHORS.md - COMMENTARY.md -@@ -89,9 +89,8 @@ library - network-bsd >= 2.7 && < 2.9, - parsec >= 3, - prim-uniq >= 0.2 && < 0.4, -- random >= 1, -- random-fu >= 0.2.6.2, -- random-source >= 0.3, -+ random >= 1.2, -+ random-fu >= 0.3.0.0, - regex-tdfa >= 1.1 && < 1.4, - SafeSemaphore >= 0.9, - split >= 0.2, -diff --git a/src/Lambdabot/Bot.hs b/src/Lambdabot/Bot.hs -index 1b0de2e..833fb4c 100644 ---- a/src/Lambdabot/Bot.hs -+++ b/src/Lambdabot/Bot.hs -@@ -1,6 +1,5 @@ - {-# LANGUAGE GADTs #-} - {-# LANGUAGE ScopedTypeVariables #-} --{-# LANGUAGE TemplateHaskell #-} - -- | The guts of lambdabot. - -- - -- The LB/Lambdabot monad -@@ -37,7 +36,6 @@ import Control.Monad.Error - import Control.Monad.Reader - import Control.Monad.State - import qualified Data.Map as M --import Data.Random.Source - import qualified Data.Set as S - - ------------------------------------------------------------------------ -@@ -136,17 +134,3 @@ ircPrivmsg who msg = do - ircPrivmsg' :: Nick -> String -> LB () - ircPrivmsg' who "" = ircPrivmsg' who " " - ircPrivmsg' who msg = send $ privmsg who msg -- -------------------------------------------------------------------------- -- --monadRandom [d| -- -- instance MonadRandom LB where -- getRandomWord8 = liftIO getRandomWord8 -- getRandomWord16 = liftIO getRandomWord16 -- getRandomWord32 = liftIO getRandomWord32 -- getRandomWord64 = liftIO getRandomWord64 -- getRandomDouble = liftIO getRandomDouble -- getRandomNByteInteger n = liftIO (getRandomNByteInteger n) -- -- |] -diff --git a/src/Lambdabot/Util.hs b/src/Lambdabot/Util.hs -index effdf71..259699b 100644 ---- a/src/Lambdabot/Util.hs -+++ b/src/Lambdabot/Util.hs -@@ -23,14 +23,15 @@ module Lambdabot.Util ( - randomSuccessMsg - ) where - -+import Control.Concurrent.Lifted - import Control.Monad.Trans -+import Control.Monad.Trans.Control - import Data.Char - import Data.List - import Data.Random --import Control.Concurrent.Lifted --import Control.Monad.Trans.Control - import Lambdabot.Config - import Lambdabot.Config.Core -+import System.Random.Stateful (newIOGenM, newStdGen) - - ------------------------------------------------------------------------ - -@@ -63,7 +64,9 @@ listToStr conj (item:items) = - - -- | Pick a random element of the list. - random :: MonadIO m => [a] -> m a --random = io . sample . randomElement -+random l = do -+ g <- newIOGenM =<< newStdGen -+ sampleFrom g (randomElement l) - - ------------------------------------------------------------------------ - diff --git a/pkgs/development/haskell-modules/patches/lambdabot-novelty-plugins-ghc9.patch b/pkgs/development/haskell-modules/patches/lambdabot-novelty-plugins-ghc9.patch deleted file mode 100644 index 009951f90e07..000000000000 --- a/pkgs/development/haskell-modules/patches/lambdabot-novelty-plugins-ghc9.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/lambdabot-novelty-plugins.cabal b/lambdabot-novelty-plugins.cabal -index 69c8447..50a35f6 100644 ---- a/lambdabot-novelty-plugins.cabal -+++ b/lambdabot-novelty-plugins.cabal -@@ -36,7 +36,7 @@ homepage: https://wiki.haskell.org/Lambdabot - - build-type: Simple - cabal-version: >= 1.10 --tested-with: GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.4 -+tested-with: GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.4, GHC == 9.0.2 - - source-repository head - type: git -@@ -71,7 +71,8 @@ library - lambdabot-core >= 5.3 && < 5.4, - misfortune >= 0.1, - process >= 1.1, -- random-fu >= 0.2.6.2, -+ random >= 1.2, -+ random-fu >= 0.3.0.0, - regex-tdfa >= 1.1, - - -- runtime dependencies -diff --git a/src/Lambdabot/Plugin/Novelty/Numberwang.hs b/src/Lambdabot/Plugin/Novelty/Numberwang.hs -index ae41eb4..8321a14 100644 ---- a/src/Lambdabot/Plugin/Novelty/Numberwang.hs -+++ b/src/Lambdabot/Plugin/Novelty/Numberwang.hs -@@ -7,7 +7,9 @@ import Control.Monad - import Data.Random - import Data.Random.Distribution.Poisson - import Lambdabot.Plugin -+import Lambdabot.Util - import Numeric -+import System.Random.Stateful (newIOGenM, newStdGen) - - - data NumberwangState = State -@@ -23,7 +25,9 @@ conDist = poisson (32 :: Double) - - numberwangPlugin :: Module NumberwangState - numberwangPlugin = newModule -- { moduleDefState = sample (State <$> cmdDist <*> conDist) -+ { moduleDefState = do -+ g <- newIOGenM =<< newStdGen -+ sampleFrom g (State <$> cmdDist <*> conDist) - , moduleCmds = return - [ (command "numberwang") - { help = say "@numberwang : Determines if it is Numberwang." -@@ -61,7 +65,8 @@ checkNumberwang :: (MonadLBState m, LBState m ~ NumberwangState) => - checkNumberwang cmd l = withState cmd $ \ n setN nDist -> do - if n <= l - then do -- setN =<< lb (sample nDist) -+ g <- newIOGenM =<< newStdGen -+ setN =<< sampleFrom g nDist - return True - else do - setN (n - l) diff --git a/pkgs/development/haskell-modules/patches/mbox-time-1.10.patch b/pkgs/development/haskell-modules/patches/mbox-time-1.10.patch new file mode 100644 index 000000000000..f72b8483b339 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/mbox-time-1.10.patch @@ -0,0 +1,52 @@ +diff -rN -u old-mbox/Data/MBox/String.hs new-mbox/Data/MBox/String.hs +--- old-mbox/Data/MBox/String.hs 2022-11-22 19:14:52.332543098 +0100 ++++ new-mbox/Data/MBox/String.hs 2022-11-22 19:14:52.332543098 +0100 +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + + ----------------------------------------------------------------------------- + {- | +@@ -31,7 +32,11 @@ + -- | Reads a date header as a UTCTime + parseDateHeader :: String -> Maybe UTCTime + parseDateHeader header = listToMaybe . catMaybes $ map tryParse formats where ++#if MIN_VERSION_time(1,9,0) ++ tryParse f = parseTimeM True LC.defaultTimeLocale f header ++#else + tryParse f = parseTime LC.defaultTimeLocale f header ++#endif + formats = + [ "%a, %_d %b %Y %T %z" + , "%a, %_d %b %Y %T %Z" +diff -rN -u old-mbox/Data/MBox.hs new-mbox/Data/MBox.hs +--- old-mbox/Data/MBox.hs 2022-11-22 19:14:52.332543098 +0100 ++++ new-mbox/Data/MBox.hs 2022-11-22 19:14:52.332543098 +0100 +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + {-# LANGUAGE ViewPatterns #-} + + ----------------------------------------------------------------------------- +@@ -34,7 +35,11 @@ + parseDateHeader :: T.Text -> Maybe UTCTime + parseDateHeader txt = listToMaybe . catMaybes $ map tryParse formats where + header = T.unpack txt ++#if MIN_VERSION_time(1,9,0) ++ tryParse f = parseTimeM True LC.defaultTimeLocale f header ++#else + tryParse f = parseTime LC.defaultTimeLocale f header ++#endif + formats = + [ "%a, %_d %b %Y %T %z" + , "%a, %_d %b %Y %T %Z" +diff -rN -u old-mbox/mbox.cabal new-mbox/mbox.cabal +--- old-mbox/mbox.cabal 2022-11-22 19:14:52.332543098 +0100 ++++ new-mbox/mbox.cabal 2022-11-22 19:14:52.332543098 +0100 +@@ -13,7 +13,7 @@ + Cabal-Version: >= 1.6 + + library +- build-depends: base >= 4, base < 6, safe, time < 1.9, time-locale-compat, text ++ build-depends: base >= 4, base < 6, safe, time, time-locale-compat, text + exposed-modules: Data.MBox, Data.MBox.String + ghc-options: -Wall + diff --git a/pkgs/development/haskell-modules/patches/recursion-schemes-128.patch b/pkgs/development/haskell-modules/patches/recursion-schemes-128.patch deleted file mode 100644 index a40efc6f6334..000000000000 --- a/pkgs/development/haskell-modules/patches/recursion-schemes-128.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/recursion-schemes.cabal b/recursion-schemes.cabal -index c35f2c6..e692ade 100644 ---- a/recursion-schemes.cabal -+++ b/recursion-schemes.cabal -@@ -93,6 +93,7 @@ library - Paths_recursion_schemes - - ghc-options: -Wall -+ ghc-prof-options: -DPROFILING_ENABLED - if impl(ghc >= 8.6) - ghc-options: -Wno-star-is-type - default-language: Haskell2010 -diff --git a/src/Data/Functor/Foldable/TH.hs b/src/Data/Functor/Foldable/TH.hs -index b3d5ac8..d4ef0e4 100644 ---- a/src/Data/Functor/Foldable/TH.hs -+++ b/src/Data/Functor/Foldable/TH.hs -@@ -1,4 +1,7 @@ - {-# LANGUAGE CPP, PatternGuards, Rank2Types #-} -+#if defined(PROFILING_ENABLED) -+{-# OPTIONS_GHC -O0 #-} -+#endif - module Data.Functor.Foldable.TH - ( MakeBaseFunctor(..) - , BaseRules diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index c478c875540d..77ccd301b43f 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -4,6 +4,8 @@ # platform that has NCG support , useLLVM ? false , withHoogle ? false +# Whether to install `doc` outputs for GHC and all included libraries. +, installDocumentation ? true , hoogleWithPackages , postBuild ? "" , ghcLibdir ? null # only used by ghcjs, when resolving plugins @@ -54,7 +56,11 @@ let else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; - paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages); + paths = lib.concatLists ( + builtins.map + (pkg: [ pkg ] ++ lib.optionals installDocumentation [ (lib.getOutput "doc" pkg) ]) + (lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages)) + ); hasLibraries = lib.any (x: x.isHaskellLibrary) paths; # CLang is needed on Darwin for -fllvm to work: # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm @@ -71,7 +77,9 @@ symlinkJoin { # if such a feature is needed, the real compiler name should be saved # as a dedicated drv attribute, like `compiler-name` name = ghc.name + "-with-packages"; - paths = paths ++ [ghc]; + paths = paths + ++ [ ghc ] + ++ lib.optionals installDocumentation [ (lib.getOutput "doc" ghc) ]; nativeBuildInputs = [ makeWrapper ]; postBuild = '' # wrap compiler executables with correct env variables @@ -161,8 +169,8 @@ symlinkJoin { ''} $out/bin/${ghcCommand}-pkg check '' + postBuild; + preferLocalBuild = true; passthru = { - preferLocalBuild = true; inherit (ghc) version meta; # Inform users about backwards incompatibilities with <= 21.05 diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index e42f26f0bdaf..9953eaa3144c 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, callPackage, fetchFromGitHub, runCommandLocal, makeWrapper, substituteAll , sbcl, bash, which, perl, hostname -, openssl, glucose, minisat, abc-verifier, z3, python2 +, openssl, glucose, minisat, abc-verifier, z3, python3 , certifyBooks ? true } @ args: @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { which perl hostname # Some of the books require one or more of these external tools: glucose minisat abc-verifier libipasir - z3 (python2.withPackages (ps: [ ps.z3 ])) + z3 (python3.withPackages (ps: [ ps.z3 ])) ]; # NOTE: Parallel building can be memory-intensive depending on the number of diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 2b4dcddff093..00aada39652d 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -160,7 +160,7 @@ resholve.mkDerivation rec { passthru.tests.upstream = bats.unresholved.overrideAttrs (old: { name = "${bats.name}-tests"; dontInstall = true; # just need the build directory - installCheckInputs = [ + nativeInstallCheckInputs = [ ncurses parallel # skips some tests if it can't detect flock # skips some tests if it can't detect diff --git a/pkgs/development/interpreters/bic/default.nix b/pkgs/development/interpreters/bic/default.nix index c27270f7a95e..31b539a3ff3e 100644 --- a/pkgs/development/interpreters/bic/default.nix +++ b/pkgs/development/interpreters/bic/default.nix @@ -38,5 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hexagonal-sun/bic"; platforms = platforms.unix; maintainers = with maintainers; [ hexagonal-sun ]; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/interpreters/boron/default.nix b/pkgs/development/interpreters/boron/default.nix index 249a39c58f3a..e40ca2b5b4dc 100644 --- a/pkgs/development/interpreters/boron/default.nix +++ b/pkgs/development/interpreters/boron/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://urlan.sourceforge.net/boron/"; + homepage = "https://urlan.sourceforge.net/boron/"; description = "Scripting language and C library useful for building DSLs"; license = licenses.lgpl3Plus; platforms = platforms.linux; diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index f45dda4088fa..bd07f3ca7ede 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -4,10 +4,15 @@ , genBytecode ? false , bqn-path ? null , mbqn-source ? null +, enableReplxx ? false + # No support for macOS' .dylib on the CBQN side +, enableLibcbqn ? stdenv.hostPlatform.isLinux , libffi +, pkg-config }: let + # TODO: these submodules should be separated libraries cbqn-bytecode-files = fetchFromGitHub { name = "cbqn-bytecode-files"; owner = "dzaima"; @@ -15,20 +20,31 @@ let rev = "3df8ae563a626ff7ae0683643092f0c3bc2481e5"; hash = "sha256:0rh9qp1bdm9aa77l0kn9n4jdy08gl6l7898lncskxiq9id6xvyb8"; }; + replxx-submodule = fetchFromGitHub { + name = "replxx-submodule"; + owner = "dzaima"; + repo = "replxx"; + rev = "ba94c293caad52486df8712e808783df9a8f4501"; + hash = "sha256-pMLvURksj/5k5b6BTwWxjomoROMOE5+GRjyaoqu/iYE="; + }; in assert genBytecode -> ((bqn-path != null) && (mbqn-source != null)); stdenv.mkDerivation rec { pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone"; - version = "0.pre+date=2022-10-04"; + version = "0.pre+date=2022-11-27"; src = fetchFromGitHub { owner = "dzaima"; repo = "CBQN"; - rev = "abcb575a537712763e9e53b6cb0eb415346b00e6"; - hash = "sha256:05gqw2ppcykv36ji8mkp8mq502q84vk9algp9c2d3z495xqy8rn6"; + rev = "49c0d9a355698f54fff2c0caa177e2b341fabb45"; + hash = "sha256-jm2ZzFxhr9o4nFR2rjYJz/4GH+WFnfU4QDovrOPI3jQ="; }; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ libffi ]; @@ -41,22 +57,36 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" + ] + ++ lib.optional enableReplxx "REPLXX=1"; + + buildFlags = [ + # interpreter binary + "o3" + ] ++ lib.optionals enableLibcbqn [ + # embeddable interpreter as a shared lib + "shared-o3" ]; preBuild = '' # Purity: avoids git downloading bytecode files - touch src/gen/customRuntime + mkdir -p build/bytecodeLocal/gen '' + (if genBytecode then '' - ${bqn-path} genRuntime ${mbqn-source} + ${bqn-path} ./build/genRuntime ${mbqn-source} build/bytecodeLocal/ '' else '' - cp ${cbqn-bytecode-files}/src/gen/{compiles,explain,formatter,runtime0,runtime1,src} src/gen/ + cp ${cbqn-bytecode-files}/src/gen/{compiles,explain,formatter,runtime0,runtime1,src} build/bytecodeLocal/gen/ '') - # Need to adjust ld flags for darwin manually - # https://github.com/dzaima/CBQN/issues/26 - + lib.optionalString stdenv.hostPlatform.isDarwin '' - makeFlagsArray+=(LD_LIBS="-ldl -lffi") + + lib.optionalString enableReplxx '' + cp -r ${replxx-submodule} build/replxxLocal/ ''; + outputs = [ + "out" + ] ++ lib.optionals enableLibcbqn [ + "lib" + "dev" + ]; + installPhase = '' runHook preInstall @@ -65,7 +95,12 @@ stdenv.mkDerivation rec { # note guard condition for case-insensitive filesystems [ -e $out/bin/bqn ] || ln -s $out/bin/BQN $out/bin/bqn [ -e $out/bin/cbqn ] || ln -s $out/bin/BQN $out/bin/cbqn - + '' + + lib.optionalString enableLibcbqn '' + install -Dm644 include/bqnffi.h -t "$dev/include" + install -Dm755 libcbqn${stdenv.hostPlatform.extensions.sharedLibrary} -t "$lib/lib" + '' + + '' runHook postInstall ''; diff --git a/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix b/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix index 83d4a08e33dc..1390eebe44ef 100644 --- a/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix +++ b/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { pname = "bqn"; - version = "0.pre+date=2022-10-03"; + version = "0.pre+date=2022-11-24"; src = fetchFromGitHub { owner = "mlochbaum"; repo = "BQN"; - rev = "1518205cceeb1fef27c584d24e92b189ffd234f4"; - hash = "sha256:1pyk331ymbs2fv9jxmbv28yvk9mr2mcni1dsja6fzkk1jrd767hy"; + rev = "976bd82fb0e830876cca117c302c8a19048033a4"; + hash = "sha256:1nhn30ypc2zvq58b3zi66ypc9wv3v8cryn43cqihazc1lq8qxqdw"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index 4a8b639071ab..f6aeeb7fc489 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { fixupPhase = '' wrapProgram "$out/bin/chibi-scheme" \ - --prefix CHIBI_MODULE_PATH : "$out/share/chibi:$out/lib/chibi" + --prefix CHIBI_MODULE_PATH : "$out/share/chibi:$out/lib/chibi" \ + ${lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib"} for f in chibi-doc chibi-ffi snow-chibi; do substituteInPlace "$out/bin/$f" \ diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 22ec5806d5be..d50ed8ff0520 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "1.0.165"; + version = "1.1.172"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-sFLJVNyx0IFfPjxbYzSthRdF77sRHeNGFXHzKH22HfY="; + sha256 = "sha256-mdcG4zKC9zX0J2S2lWCvFdFFr5sOxfOe9/iPzvEyImM="; }; executable = "bb"; @@ -30,7 +30,7 @@ buildGraalvmNativeImage rec { set -euo pipefail readonly latest_version="$(curl \ - ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ + ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ -s "https://api.github.com/repos/babashka/babashka/releases/latest" \ | jq -r '.tag_name')" diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 78095d6d9d31..95b7d611fa94 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.11.1.1200"; + version = "1.11.1.1208"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-296cS91Ct9paZ9h5VItFKOSQPOc+4mwylia2Fl1Xthw="; + sha256 = "sha256-bn9uNM46oYc0wxJJ8HMGbE8/2mnYxm/p9S6MhYfhcQM="; }; nativeBuildInputs = [ @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { # `jq -r '.[0].name'` results in `v0.0` readonly latest_version="$(curl \ - ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ + ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ -s "https://api.github.com/repos/clojure/brew-install/tags" \ | jq -r '.[1].name')" diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index cddb773ec168..489d3b0128d9 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -15,10 +15,14 @@ stdenv.mkDerivation rec { substituteInPlace setup.ml --replace js_of_ocaml.ocamlbuild js_of_ocaml-ocamlbuild ''; - buildInputs = [ which ] ++ (with ocamlPackages; [ - ocaml findlib ocamlbuild menhir js_of_ocaml js_of_ocaml-ocamlbuild + strictDeps = true; + + nativeBuildInputs = [ which ] ++ (with ocamlPackages; [ + ocaml findlib ocamlbuild menhir ]); + buildInputs = with ocamlPackages; [ js_of_ocaml js_of_ocaml-ocamlbuild ]; + doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/interpreters/elixir/1.14.nix b/pkgs/development/interpreters/elixir/1.14.nix index cd03a0cc33aa..bedc3054eb17 100644 --- a/pkgs/development/interpreters/elixir/1.14.nix +++ b/pkgs/development/interpreters/elixir/1.14.nix @@ -1,8 +1,8 @@ { mkDerivation }: mkDerivation { - version = "1.14.2"; - sha256 = "sha256-ABS+tXWm0vP3jb4ixWSi84Ltya7LHAuEkGMuAoZqHPA="; - # https://hexdocs.pm/elixir/1.14.2/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp + version = "1.14.3"; + sha256 = "sha256-8rkuyAQAZdaKFXnSMaIPwbgoHnPs+nJ+mdbqcqYNeE4="; + # https://hexdocs.pm/elixir/1.14.3/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "23"; } diff --git a/pkgs/development/interpreters/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix index af767bf9f494..89faebdde128 100644 --- a/pkgs/development/interpreters/erlang/R23.nix +++ b/pkgs/development/interpreters/erlang/R23.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "23.3.4.17"; - sha256 = "sha256-GJicQqQbtD/eG/1t9C/l3hVsRV8fJOgaSCU0/kSHZLY="; + version = "23.3.4.18"; + sha256 = "sha256-sxNVu/52kOMFKQYPLi5uXnR1mYTF2KlHUo4T7kh0KoY="; } diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index 2dea38b77d98..58df443f96ac 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "24.3.4.5"; - sha256 = "sha256-MGmuge79Dh/HXF+tkvubM979K0At5v1B1RhM5Koy8oY="; + version = "24.3.4.8"; + sha256 = "sha256-NwnGqFEhVi96fEPLKoAqJgvWNZEsRGtE/3HP0eRthuA="; } diff --git a/pkgs/development/interpreters/erlang/R25.nix b/pkgs/development/interpreters/erlang/R25.nix index 885dd13efef7..b2ad0846cd68 100644 --- a/pkgs/development/interpreters/erlang/R25.nix +++ b/pkgs/development/interpreters/erlang/R25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.1.2"; - sha256 = "0fn6zyqrgyiznyghkhygak524f3clc3kz91rarq8cqn3r920dmg9"; + version = "25.2.2"; + sha256 = "HfEh2IhifFe/gQ4sK99uBnmUGvNCeJ2mlTQf7IzenEs="; } diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 7237d09817ff..59e2286f84ee 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -21,7 +21,7 @@ , parallelBuild ? false , systemd , wxSupport ? true -, systemdSupport ? stdenv.isLinux # systemd support in epmd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd # systemd support in epmd # updateScript deps , writeScript , common-updater-scripts @@ -128,6 +128,8 @@ stdenv.mkDerivation ({ ++ optional wxSupport "--enable-wx" ++ optional systemdSupport "--enable-systemd" ++ optional stdenv.isDarwin "--enable-darwin-64bit" + # make[3]: *** [yecc.beam] Segmentation fault: 11 + ++ optional (stdenv.isDarwin && stdenv.isx86_64) "--disable-jit" ++ configureFlags; # install-docs will generate and install manpages and html docs diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 24c271ee7192..eab1f90e5f32 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-sdvBAmINl/3Hv9gnPVruI5lCuSu1VQ9swY0GNJrsEVk="; + sha256 = "sha256-gREAtCh4jerqxhwNslXIXRMLkoj0RlhbIwQXbb8LVws="; }; - cargoSha256 = "sha256-wKoseZTAZOeT0LEHTlnO5cMpYx6sinnQkEVXCYXupAY="; + cargoSha256 = "sha256-xuxWOVSUJVQvSDA5xhFBjdO/ODLA4fzEnzG9p0DRF2Q="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index 86dc7d666d2b..31492620cb9f 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "shirok"; repo = pname; - rev = "release${lib.replaceChars [ "." ] [ "_" ] version}"; + rev = "release${lib.replaceStrings [ "." ] [ "_" ] version}"; sha256 = "0ki1w7sa10ivmg51sqjskby0gsznb0d3738nz80x589033km5hmb"; }; diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index afad1c7a29ff..de0b8479f1ca 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -25,11 +25,11 @@ let in builder rec { pname = "guile"; - version = "3.0.8"; + version = "3.0.9"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-2qcGClbygE6bdMjX5/6L7tErQ6qyeJo4WFGD/MF7ihM="; + sha256 = "sha256-GiYlrHKyNm6VeS8/51j9Lfd1tARKkKSpeHMm5mwNdQ0="; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/interpreters/hashlink/default.nix b/pkgs/development/interpreters/hashlink/default.nix index 1af48cba55ab..dc5f153c5ee1 100644 --- a/pkgs/development/interpreters/hashlink/default.nix +++ b/pkgs/development/interpreters/hashlink/default.nix @@ -7,7 +7,7 @@ , libjpeg_turbo , libuv , libvorbis -, mbedtls +, mbedtls_2 , openal , pcre , SDL2 @@ -17,17 +17,15 @@ stdenv.mkDerivation rec { pname = "hashlink"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "HaxeFoundation"; repo = "hashlink"; rev = version; - sha256 = "AiUGhTxz4Pkrks4oE+SAuAQPMuC5T2B6jo3Jd3sNrkQ="; + sha256 = "lpHW0JWxbLtOBns3By56ZBn47CZsDzwOFBuW9MlERrE="; }; - patches = [ ./hashlink.patch ]; - makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ @@ -37,7 +35,7 @@ stdenv.mkDerivation rec { libpng libuv libvorbis - mbedtls + mbedtls_2 openal pcre SDL2 diff --git a/pkgs/development/interpreters/hashlink/hashlink.patch b/pkgs/development/interpreters/hashlink/hashlink.patch deleted file mode 100644 index 20d4eedd5a8a..000000000000 --- a/pkgs/development/interpreters/hashlink/hashlink.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -107,6 +107,7 @@ LIBFLAGS += -L/opt/libjpeg-turbo/lib64 - endif - - LIBOPENAL = -lopenal -+LIBOPENGL = -lGL - RELEASE_NAME = linux - - endif ---- a/libs/sdl/gl.c -+++ b/libs/sdl/gl.c -@@ -7,7 +7,7 @@ - # include - # define HL_GLES - #elif defined(HL_MAC) --# include -+# include - # include - # define glBindImageTexture(...) hl_error("Not supported on OSX") - # define glDispatchCompute(...) hl_error("Not supported on OSX") ---- a/libs/sdl/sdl.c -+++ b/libs/sdl/sdl.c -@@ -7,7 +7,7 @@ - # include - # include - #elif defined(HL_MAC) --# include -+# include - #else - # include - #endif diff --git a/pkgs/development/interpreters/ivy/default.nix b/pkgs/development/interpreters/ivy/default.nix index 81ddfbf23888..434b49527714 100644 --- a/pkgs/development/interpreters/ivy/default.nix +++ b/pkgs/development/interpreters/ivy/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-pb/dJfEXz13myT6XadCg0kKd+n9bcHNBc84ES+hDw2Y="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; subPackages = [ "." ]; diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index 5e67986ac105..2da499352b3e 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { bc ]; + patches = [ + ./fix-install-path.patch + ]; + dontConfigure = true; # emulating build_all.sh configuration variables diff --git a/pkgs/development/interpreters/j/fix-install-path.patch b/pkgs/development/interpreters/j/fix-install-path.patch new file mode 100644 index 000000000000..08f3f98962c9 --- /dev/null +++ b/pkgs/development/interpreters/j/fix-install-path.patch @@ -0,0 +1,10 @@ +--- a/jlibrary/bin/profile.ijs 2022-11-23 18:45:50.049675025 +0100 ++++ b/jlibrary/bin/profile.ijs 2022-11-23 18:47:43.798532581 +0100 +@@ -13,6 +13,7 @@ + fhs=. (FHS"_)^:(0=4!:0<'FHS')(5=systype)*.0=#1!:0 B -> C, # C can import package A propagated by B @@ -114,7 +114,7 @@ let nativeBuildInputs = [ wrapLua luarocks - ] ++ lib.optionals doCheck ([ luarocksCheckHook ] ++ self.checkInputs); + ] ++ lib.optionals doCheck ([ luarocksCheckHook ] ++ self.nativeCheckInputs); buildInputs = buildInputs ++ (map (d: d.dep) externalDeps'); diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 933f42eb26e3..139dd09e72a3 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -1,5 +1,5 @@ # similar to interpreters/python/default.nix -{ stdenv, lib, callPackage, fetchurl, fetchpatch, makeBinaryWrapper }: +{ stdenv, lib, callPackage, fetchFromGitHub, fetchurl, fetchpatch, makeBinaryWrapper }: let @@ -8,7 +8,6 @@ let # copied from python passthruFun = { executable - , sourceVersion , luaversion , packageOverrides , luaOnBuildForBuild @@ -24,14 +23,14 @@ let # - imports lua-packages.nix # - adds spliced package sets to the package set # - applies overrides from `packageOverrides` - ({ lua, overrides, callPackage, splicePackages, newScope }: let + ({ lua, overrides, callPackage, makeScopeWithSplicing }: let luaPackagesFun = callPackage ../../../top-level/lua-packages.nix { lua = self; }; generatedPackages = if (builtins.pathExists ../../lua-modules/generated-packages.nix) then (final: prev: callPackage ../../lua-modules/generated-packages.nix { inherit (final) callPackage; } final prev) else (final: prev: {}); - overridenPackages = callPackage ../../lua-modules/overrides.nix { }; + overriddenPackages = callPackage ../../lua-modules/overrides.nix { }; otherSplices = { selfBuildBuild = luaOnBuildForBuild.pkgs; @@ -44,12 +43,10 @@ let extra = spliced0: {}; extensions = lib.composeManyExtensions [ generatedPackages - overridenPackages + overriddenPackages overrides ]; - in lib.makeScopeWithSplicing - splicePackages - newScope + in makeScopeWithSplicing otherSplices keep extra @@ -67,7 +64,7 @@ let withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;}; pkgs = luaPackages; interpreter = "${self}/bin/${executable}"; - inherit executable luaversion sourceVersion; + inherit executable luaversion; luaOnBuild = luaOnBuildForHost.override { inherit packageOverrides; self = luaOnBuild; }; tests = callPackage ./tests { inherit (luaPackages) wrapLua; }; @@ -80,7 +77,7 @@ in rec { lua5_4 = callPackage ./interpreter.nix { self = lua5_4; - sourceVersion = { major = "5"; minor = "4"; patch = "4"; }; + version = "5.4.4"; hash = "sha256-Fkx4SWU7gK5nvsS3RzuIS/XMjS3KBWU0dewu0nuev2E="; makeWrapper = makeBinaryWrapper; inherit passthruFun; @@ -112,7 +109,7 @@ rec { lua5_3 = callPackage ./interpreter.nix { self = lua5_3; - sourceVersion = { major = "5"; minor = "3"; patch = "6"; }; + version = "5.3.6"; hash = "0q3d8qhd7p0b7a4mh9g7fxqksqfs6mr1nav74vq26qvkp2dxcpzw"; makeWrapper = makeBinaryWrapper; inherit passthruFun; @@ -129,7 +126,7 @@ rec { lua5_2 = callPackage ./interpreter.nix { self = lua5_2; - sourceVersion = { major = "5"; minor = "2"; patch = "4"; }; + version = "5.2.4"; hash = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"; makeWrapper = makeBinaryWrapper; inherit passthruFun; @@ -146,7 +143,7 @@ rec { lua5_1 = callPackage ./interpreter.nix { self = lua5_1; - sourceVersion = { major = "5"; minor = "1"; patch = "5"; }; + version = "5.1.5"; hash = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; makeWrapper = makeBinaryWrapper; inherit passthruFun; @@ -156,12 +153,16 @@ rec { luajit_2_0 = import ../luajit/2.0.nix { self = luajit_2_0; - inherit callPackage lib passthruFun; + inherit callPackage fetchFromGitHub lib passthruFun; }; luajit_2_1 = import ../luajit/2.1.nix { self = luajit_2_1; - inherit callPackage passthruFun; + inherit callPackage fetchFromGitHub passthruFun; }; + luajit_openresty = import ../luajit/openresty.nix { + self = luajit_openresty; + inherit callPackage fetchFromGitHub passthruFun; + }; } diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index c265785b8d85..59afff379449 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -9,19 +9,19 @@ , pkgsBuildTarget , pkgsHostHost , pkgsTargetTarget -, sourceVersion +, version , hash , passthruFun , patches ? [] , postConfigure ? null , postBuild ? null , staticOnly ? stdenv.hostPlatform.isStatic -, luaAttr ? "lua${sourceVersion.major}_${sourceVersion.minor}" +, luaAttr ? "lua${lib.versions.major version}_${lib.versions.minor version}" } @ inputs: let luaPackages = self.pkgs; - luaversion = with sourceVersion; "${major}.${minor}"; + luaversion = lib.versions.majorMinor version; plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux" else if (stdenv.isLinux && lib.versionAtLeast self.luaversion "5.4") then "linux-readline" @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { pname = "lua"; - version = "${luaversion}.${sourceVersion.patch}"; + inherit version; src = fetchurl { url = "https://www.lua.org/ftp/${pname}-${version}.tar.gz"; @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { inputs' = lib.filterAttrs (n: v: ! lib.isDerivation v && n != "passthruFun") inputs; override = attr: let lua = attr.override (inputs' // { self = lua; }); in lua; in passthruFun rec { - inherit self luaversion packageOverrides luaAttr sourceVersion; + inherit self luaversion packageOverrides luaAttr; executable = "lua"; luaOnBuildForBuild = override pkgsBuildBuild.${luaAttr}; luaOnBuildForHost = override pkgsBuildHost.${luaAttr}; diff --git a/pkgs/development/interpreters/lua-5/wrap-lua.nix b/pkgs/development/interpreters/lua-5/wrap-lua.nix index 049afcd6116d..c9ef151bea3c 100644 --- a/pkgs/development/interpreters/lua-5/wrap-lua.nix +++ b/pkgs/development/interpreters/lua-5/wrap-lua.nix @@ -7,10 +7,10 @@ # defined in trivial-builders.nix # imported as wrapLua in lua-packages.nix and passed to build-lua-derivation to be used as buildInput makeSetupHook { + name = "wrap-lua-hook"; deps = makeWrapper; substitutions.executable = lua.interpreter; substitutions.lua = lua; substitutions.LuaPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths; substitutions.LuaCPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths; } ./wrap.sh - diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index 3df2ac457c07..78abb742c407 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,13 +1,18 @@ -{ self, callPackage, lib, passthruFun }: +{ self, callPackage, fetchFromGitHub, lib, passthruFun }: + callPackage ./default.nix { - sourceVersion = { major = "2"; minor = "0"; patch = "5"; }; - inherit self passthruFun; version = "2.0.5-2022-09-13"; - rev = "46e62cd963a426e83a60f691dcbbeb742c7b3ba2"; - isStable = true; - hash = "sha256-/XR9+6NjXs2TrUVKJNkH2h970BkDNFqMDJTWcy/bswU="; + + src = fetchFromGitHub { + owner = "LuaJIT"; + repo = "LuaJIT"; + rev = "46e62cd963a426e83a60f691dcbbeb742c7b3ba2"; + hash = "sha256-/XR9+6NjXs2TrUVKJNkH2h970BkDNFqMDJTWcy/bswU="; + }; + extraMeta = { # this isn't precise but it at least stops the useless Hydra build platforms = with lib; filter (p: !hasPrefix "aarch64-" p) (platforms.linux ++ platforms.darwin); }; + inherit self passthruFun; } diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index d2233f15819f..8efb86ab0174 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,9 +1,14 @@ -{ self, callPackage, passthruFun }: +{ self, callPackage, fetchFromGitHub, passthruFun }: + callPackage ./default.nix { - sourceVersion = { major = "2"; minor = "1"; patch = "0"; }; - inherit self passthruFun; version = "2.1.0-2022-10-04"; - rev = "6c4826f12c4d33b8b978004bc681eb1eef2be977"; - isStable = false; - hash = "sha256-GMgoSVHrfIuLdk8mW9XgdemNFsAkkQR4wiGGjaAXAKg="; + + src = fetchFromGitHub { + owner = "LuaJIT"; + repo = "LuaJIT"; + rev = "6c4826f12c4d33b8b978004bc681eb1eef2be977"; + hash = "sha256-GMgoSVHrfIuLdk8mW9XgdemNFsAkkQR4wiGGjaAXAKg="; + }; + + inherit self passthruFun; } diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 2d47b0395c36..8596e379e710 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -2,10 +2,8 @@ , stdenv , fetchFromGitHub , buildPackages -, isStable -, hash -, rev , version +, src , extraMeta ? { } , callPackage , self @@ -15,7 +13,6 @@ , pkgsBuildTarget , pkgsHostHost , pkgsTargetTarget -, sourceVersion , passthruFun , enableFFI ? true , enableJIT ? true @@ -28,7 +25,13 @@ , enableAPICheck ? false , enableVMAssertions ? false , useSystemMalloc ? false -, luaAttr ? "luajit_${sourceVersion.major}_${sourceVersion.minor}" +# Upstream generates randomized string id's by default for security reasons +# https://github.com/LuaJIT/LuaJIT/issues/626. Deterministic string id's should +# never be needed for correctness (that should be fixed in the lua code), +# but may be helpful when you want to embed jit-compiled raw lua blobs in +# binaries that you want to be reproducible. +, deterministicStringIds ? false +, luaAttr ? "luajit_${lib.versions.major version}_${lib.versions.minor version}" } @ inputs: assert enableJITDebugModule -> enableJIT; assert enableGDBJITSupport -> enableJIT; @@ -47,16 +50,21 @@ let ++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT" ++ optional enableAPICheck "-DLUAJIT_USE_APICHECK" ++ optional enableVMAssertions "-DLUAJIT_USE_ASSERT" + ++ optional deterministicStringIds "-DLUAJIT_SECURITY_STRID=0" ; + + # LuaJIT requires build for 32bit architectures to be build on x86 not x86_64 + # TODO support also other build architectures. The ideal way would be to use + # stdenv_32bit but that doesn't work due to host platform mismatch: + # https://github.com/NixOS/nixpkgs/issues/212494 + buildStdenv = if buildPackages.stdenv.isx86_64 && stdenv.is32bit + then buildPackages.pkgsi686Linux.buildPackages.stdenv + else buildPackages.stdenv; + in stdenv.mkDerivation rec { pname = "luajit"; - inherit version; - src = fetchFromGitHub { - owner = "LuaJIT"; - repo = "LuaJIT"; - inherit hash rev; - }; + inherit version src; luaversion = "5.1"; @@ -78,7 +86,7 @@ stdenv.mkDerivation rec { } >> src/luaconf.h ''; - configurePhase = false; + dontConfigure = true; buildInputs = lib.optional enableValgrindSupport valgrind; @@ -89,8 +97,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "DEFAULT_CC=cc" "CROSS=${stdenv.cc.targetPrefix}" - # TODO: when pointer size differs, we would need e.g. -m32 - "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" + "HOST_CC=${buildStdenv.cc}/bin/cc" ] ++ lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)"; enableParallelBuilding = true; NIX_CFLAGS_COMPILE = XCFLAGS; @@ -98,8 +105,9 @@ stdenv.mkDerivation rec { postInstall = '' ( cd "$out/include"; ln -s luajit-*/* . ) ln -s "$out"/bin/luajit-* "$out"/bin/lua - '' + lib.optionalString (!isStable) '' - ln -s "$out"/bin/luajit-* "$out"/bin/luajit + if [[ ! -e "$out"/bin/luajit ]]; then + ln -s "$out"/bin/luajit* "$out"/bin/luajit + fi ''; LuaPathSearchPaths = luaPackages.luaLib.luaPathList; @@ -113,7 +121,7 @@ stdenv.mkDerivation rec { inputs' = lib.filterAttrs (n: v: ! lib.isDerivation v && n != "passthruFun") inputs; override = attr: let lua = attr.override (inputs' // { self = lua; }); in lua; in passthruFun rec { - inherit self luaversion packageOverrides luaAttr sourceVersion; + inherit self luaversion packageOverrides luaAttr; executable = "lua"; luaOnBuildForBuild = override pkgsBuildBuild.${luaAttr}; luaOnBuildForHost = override pkgsBuildHost.${luaAttr}; @@ -124,9 +132,13 @@ stdenv.mkDerivation rec { meta = with lib; { description = "High-performance JIT compiler for Lua 5.1"; - homepage = "http://luajit.org"; + homepage = "https://luajit.org/"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; + badPlatforms = [ + "riscv64-linux" "riscv64-linux" # See https://github.com/LuaJIT/LuaJIT/issues/628 + "powerpc64le-linux" # `#error "No support for PPC64"` + ]; maintainers = with maintainers; [ thoughtpolice smironov vcunat lblasc ]; } // extraMeta; } diff --git a/pkgs/development/interpreters/luajit/openresty.nix b/pkgs/development/interpreters/luajit/openresty.nix new file mode 100644 index 000000000000..372d9233bf1f --- /dev/null +++ b/pkgs/development/interpreters/luajit/openresty.nix @@ -0,0 +1,14 @@ +{ self, callPackage, fetchFromGitHub, passthruFun }: + +callPackage ./default.nix rec { + version = "2.1-20220915"; + + src = fetchFromGitHub { + owner = "openresty"; + repo = "luajit2"; + rev = "v${version}"; + hash = "sha256-kMHE4iQtm2CujK9TVut1jNhY2QxYP514jfBsxOCyd4s="; + }; + + inherit self passthruFun; +} diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index 03fd14d03dd6..0f88c7331140 100644 --- a/pkgs/development/interpreters/luau/default.nix +++ b/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.554"; + version = "0.560"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - sha256 = "sha256-BgCeLvMwMPsXIopSO2OH50SPqwZ4Ehqmog+3DydJ3vU="; + hash = "sha256-tGZ9gy/RqkVP/pXyMd2XgdVc2oekZfpsdDgAB3+rv9s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index 9c6c64f73913..e83a724d25d2 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ASCII databases (set.mm and others) are also included in this derivation. ''; homepage = "http://us.metamath.org"; - downloadPage = "http://us.metamath.org/#downloads"; + downloadPage = "https://us.metamath.org/#downloads"; license = licenses.gpl2Plus; maintainers = [ maintainers.taneb ]; platforms = platforms.all; diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index 062647416b15..1c0db241c1c8 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -1,14 +1,24 @@ -{ lib, stdenv, fetchurl, readline }: +{ lib, stdenv, fetchurl, fetchpatch, readline }: stdenv.mkDerivation rec { pname = "mujs"; - version = "1.2.0"; + version = "1.3.2"; src = fetchurl { url = "https://mujs.com/downloads/mujs-${version}.tar.xz"; - sha256 = "sha256-ZpdtHgajUnVKI0Kvc9Guy7U8x82uK2jNoBO33c+SMjM="; + sha256 = "sha256-SIZZP8aIsM3M0x5ey+Wv560b7iOqaeZnuHGv1d/GQMM="; }; + patches = lib.optionals stdenv.isDarwin [ + (fetchpatch { + # ld: library not found for -l:libmujs.a + name = "darwin-failures.patch"; + url = "https://git.ghostscript.com/?p=mujs.git;a=patch;h=d592c785c0b2f9fea982ac3fe7b88fdd7c4817fc"; + sha256 = "sha256-/57A7S65LWZFyQIGe+LtqDMu85K1N/hbztXB+/nCDJk="; + revert = true; + }) + ]; + buildInputs = [ readline ]; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/development/interpreters/nelua/default.nix new file mode 100644 index 000000000000..8030980b7788 --- /dev/null +++ b/pkgs/development/interpreters/nelua/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, luaPackages }: + +stdenv.mkDerivation { + pname = "nelua"; + version = "unstable-2023-01-21"; + + src = fetchFromGitHub { + owner = "edubart"; + repo = "nelua-lang"; + rev = "d10cc61bc54050b07874a8597f8df20534885105"; + hash = "sha256-HyNYqhPCQVBJqEcAUUXfvycXE8tWIMIUJJMTIV48ne8="; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + nativeCheckInputs = [ luaPackages.luacheck ]; + + doCheck = true; + + meta = with lib; { + description = "Minimal, efficient, statically-typed and meta-programmable systems programming language heavily inspired by Lua, which compiles to C and native code"; + homepage = "https://nelua.io/"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/interpreters/nextflow/default.nix b/pkgs/development/interpreters/nextflow/default.nix index 7f96a29039a6..1d3d1070fc71 100644 --- a/pkgs/development/interpreters/nextflow/default.nix +++ b/pkgs/development/interpreters/nextflow/default.nix @@ -2,25 +2,35 @@ , stdenv , fetchurl , makeWrapper -, jre +, openjdk17 , wget , which , gnused , gawk , coreutils +, buildFHSUserEnv }: +let + nextflow = stdenv.mkDerivation rec { pname = "nextflow"; - version = "22.04.5"; + version = "22.10.6"; src = fetchurl { url = "https://github.com/nextflow-io/nextflow/releases/download/v${version}/nextflow-${version}-all"; - sha256 = "sha256-Lpxb0lGR/oiPzj6j+lySZwiRgkRgPgyjK7FX0BSejm4="; + hash = "sha256-zeYsKxWRnzr0W6CD+yjoAXwCN/AbN5P4HhH1oftnrjY="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre wget which gnused gawk coreutils ]; + nativeBuildInputs = [ + makeWrapper + openjdk17 + wget + which + gnused + gawk + coreutils + ]; dontUnpack = true; @@ -34,7 +44,9 @@ stdenv.mkDerivation rec { ''; postFixup = '' - wrapProgram $out/bin/nextflow --prefix PATH : ${lib.makeBinPath buildInputs} + wrapProgram $out/bin/nextflow \ + --prefix PATH : ${lib.makeBinPath nativeBuildInputs} \ + --set JAVA_HOME ${openjdk17.home} ''; meta = with lib; { @@ -53,4 +65,13 @@ stdenv.mkDerivation rec { mainProgram = "nextflow"; platforms = platforms.unix; }; -} +}; +in +if stdenv.isLinux then + buildFHSUserEnv + { + name = "nextflow"; + targetPkgs = pkgs: [ nextflow ]; + runScript = "nextflow"; + } +else nextflow diff --git a/pkgs/development/interpreters/ngn-k/default.nix b/pkgs/development/interpreters/ngn-k/default.nix index dfd6b17f65fa..0a24bbdfe0f7 100644 --- a/pkgs/development/interpreters/ngn-k/default.nix +++ b/pkgs/development/interpreters/ngn-k/default.nix @@ -3,24 +3,26 @@ , stdenvNoLibs , fetchFromGitea , runtimeShell -, doCheck ? stdenv.hostPlatform == stdenv.buildPlatform +, doCheck ? withLibc && stdenv.hostPlatform == stdenv.buildPlatform +, withLibc ? true }: let - # k itself is compiled with -ffreestanding, but tests require a libc - useStdenv = if doCheck then stdenv else stdenvNoLibs; + # k itself can be compiled with -ffreestanding, but tests require a libc; + # if we want to build k-libc we need a libc obviously + useStdenv = if withLibc || doCheck then stdenv else stdenvNoLibs; in useStdenv.mkDerivation { pname = "ngn-k"; - version = "unstable-2021-12-17"; + version = "unstable-2022-11-28"; src = fetchFromGitea { domain = "codeberg.org"; owner = "ngn"; repo = "k"; - rev = "26f83645e9ed4798b43390fb9dcdfa0ab8245a8f"; - sha256 = "sha256-VcJcLcL1C8yQH6xvpKR0R0gMrhSfsU4tW+Yy0rGdSSw="; + rev = "e5138f182a8ced07dd240e3fe58274130842a85d"; + sha256 = "1pn416znrdndb8iccprzx4zicmsx8c6i9dm3wq5z3jg8nan53p69"; }; patches = [ @@ -28,21 +30,25 @@ useStdenv.mkDerivation { ]; postPatch = '' - patchShebangs a19/a.sh a20/a.sh a21/a.sh dy/a.sh e/a.sh + patchShebangs --build a19/a.sh a20/a.sh a21/a.sh dy/a.sh e/a.sh # don't use hardcoded /bin/sh - for f in repl.k m.c;do + for f in repl.k repl-bg.k m.c;do substituteInPlace "$f" --replace "/bin/sh" "${runtimeShell}" done ''; makeFlags = [ "-e" ]; - buildFlags = [ "k" "libk.so" ]; + buildFlags = [ + (if withLibc then "k-libc" else "k") + "libk.so" + ]; checkTarget = "t"; inherit doCheck; outputs = [ "out" "dev" "lib" ]; + # TODO(@sternenseemann): package bulgarian translation installPhase = '' runHook preInstall install -Dm755 k "$out/bin/k" @@ -59,6 +65,6 @@ useStdenv.mkDerivation { homepage = "https://codeberg.org/ngn/k"; license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.sternenseemann ]; - platforms = [ "x86_64-linux" "x86_64-freebsd" ]; + platforms = [ "x86_64-linux" "x86_64-freebsd13" ]; }; } diff --git a/pkgs/development/interpreters/ngn-k/repl-license-path.patch b/pkgs/development/interpreters/ngn-k/repl-license-path.patch index 6b5d1e4fb6ae..17b998db187e 100644 --- a/pkgs/development/interpreters/ngn-k/repl-license-path.patch +++ b/pkgs/development/interpreters/ngn-k/repl-license-path.patch @@ -1,10 +1,13 @@ +diff --git a/repl.k b/repl.k +index 4c023467..10414162 100755 --- a/repl.k +++ b/repl.k -@@ -1,6 +1,6 @@ - #!k - `1:"ngn/k, (c) 2019-2021 ngn, GNU AGPLv3. type \\ for more info\n",repl.prompt:," " --repl.cmds:(,"a")!{`1:1:repl.joinpath[repl.dirname`argv 0]"LICENSE";} -+repl.cmds:(,"a")!{`1:1:repl.joinpath[repl.dirname`argv 0]"../share/ngn-k/LICENSE";} - repl.dirname:{$[#x:"/"/-1_"/"\x;x;,"."]} - repl.joinpath:{$[x~,".";y;"/"~*|x;x,y;x,"/",y]} - repl.fmt:{$[x~(::);"";(`A~@x)&1<#x;"(",("\n "/`k'x),")\n";`k[x],"\n"]} +@@ -2,7 +2,7 @@ + `1:"ngn/k, (c) 2019-2022 ngn, GNU AGPLv3. type \\ for more info\n" + \d repl + `1:prompt:," " /use 0x0720 for emacs integration +-cmds:(,"a")!{`1:1:joinpath[dirname`argv 0]"LICENSE";} ++cmds:(,"a")!{`1:1:joinpath[dirname`argv 0]"../share/ngn-k/LICENSE";} + dirname:{$[#x:"/"/-1_"/"\x;x;,"."]} + joinpath:{$[x~,".";y;"/"~*|x;x,y;x,"/",y]} + fmt:{$[x~(::);"";(`A~@x)&1<#x;"(",("\n "/`k'x),")\n";`k[x],"\n"]} diff --git a/pkgs/development/interpreters/nickel/default.nix b/pkgs/development/interpreters/nickel/default.nix index 01b7fd54106c..91200030f631 100644 --- a/pkgs/development/interpreters/nickel/default.nix +++ b/pkgs/development/interpreters/nickel/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "nickel"; - version = "0.2.1"; + version = "0.3.1"; src = fetchFromGitHub { owner = "tweag"; repo = pname; rev = "refs/tags/${version}"; # because pure ${version} doesn't work - hash = "sha256-Sf0UJAfUtP7oU31VkVqCtdRmfjaHV34gYeUPNsTmQvo="; + hash = "sha256-bUUQP7ze0j8d+VEckexDOferAgAHdKZbdKR3q0TNOeE="; }; - cargoSha256 = "sha256-oY4PYMZBN5+nsARHV+A5D7a6fUt9UMHBn83ONgaQp8E="; + cargoSha256 = "sha256-E8eIUASjCIVsZhptbU41VfK8bFmA4FTT3LVagLrgUso="; meta = with lib; { homepage = "https://nickel-lang.org/"; @@ -27,6 +27,7 @@ rustPlatform.buildRustPackage rec { that are then fed to another system. It is designed to have a simple, well-understood core: it is in essence JSON with functions. ''; + changelog = "https://github.com/tweag/nickel/blob/${version}/RELEASES.md"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; }; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 8f0cd0e6a226..dff3e4101d55 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -29,7 +29,7 @@ , blas, lapack # These two should use the same lapack and blas as the above , qrupdate, arpack, suitesparse ? null -# If set to true, the above 5 deps are overriden to use the blas and lapack +# If set to true, the above 5 deps are overridden to use the blas and lapack # with 64 bit indexes support. If all are not compatible, the build will fail. , use64BitIdx ? false , libwebp @@ -82,7 +82,7 @@ let ; qrupdate' = qrupdate.override { # If use64BitIdx is false, this override doesn't evaluate to a new - # derivation, as blas and lapack are not overriden. + # derivation, as blas and lapack are not overridden. blas = blas'; lapack = lapack'; }; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 4d95ebf2052b..e8db13a6474b 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -12,8 +12,6 @@ assert (enableCrypt -> (libxcrypt != null)); # cgit) that are needed here should be included directly in Nixpkgs as # files. -with lib; - let libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr"; @@ -33,10 +31,19 @@ let strictDeps = true; # TODO: Add a "dev" output containing the header files. outputs = [ "out" "man" "devdoc" ] ++ - optional crossCompiling "mini"; + lib.optional crossCompiling "mini"; setOutputFlags = false; - propagatedBuildInputs = lib.optional enableCrypt libxcrypt; + # On FreeBSD, if Perl is built with threads support, having + # libxcrypt available will result in a build failure, because + # perl.h will get conflicting definitions of struct crypt_data + # from libc's unistd.h and libxcrypt's crypt.h. + # + # FreeBSD Ports has the same issue building the perl port if + # the libxcrypt port has been installed. + # + # Without libxcrypt, Perl will still find FreeBSD's crypt functions. + propagatedBuildInputs = lib.optional (enableCrypt && !stdenv.isFreeBSD) libxcrypt; disallowedReferences = [ stdenv.cc ]; @@ -48,9 +55,9 @@ let # Enable TLS/SSL verification in HTTP::Tiny by default ./http-tiny-verify-ssl-by-default.patch ] - ++ optional stdenv.isSunOS ./ld-shared.patch - ++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] - ++ optional crossCompiling ./MakeMaker-cross.patch; + ++ lib.optional stdenv.isSunOS ./ld-shared.patch + ++ lib.optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] + ++ lib.optional crossCompiling ./MakeMaker-cross.patch; # This is not done for native builds because pwd may need to come from # bootstrap tools when building bootstrap perl. @@ -84,18 +91,18 @@ let "-Dlocincpth=${libcInc}/include" "-Dloclibpth=${libcLib}/lib" ] - ++ optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ] - ++ optional stdenv.isSunOS "-Dcc=gcc" - ++ optional enableThreading "-Dusethreads" - ++ optional (!enableCrypt) "-A clear:d_crypt_r" - ++ optional stdenv.hostPlatform.isStatic "--all-static" - ++ optionals (!crossCompiling) [ + ++ lib.optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ] + ++ lib.optional stdenv.isSunOS "-Dcc=gcc" + ++ lib.optional enableThreading "-Dusethreads" + ++ lib.optional (!enableCrypt) "-A clear:d_crypt_r" + ++ lib.optional stdenv.hostPlatform.isStatic "--all-static" + ++ lib.optionals (!crossCompiling) [ "-Dprefix=${placeholder "out"}" "-Dman1dir=${placeholder "out"}/share/man/man1" "-Dman3dir=${placeholder "out"}/share/man/man3" ]; - configureScript = optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; + configureScript = lib.optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; dontAddStaticConfigureFlags = true; @@ -129,9 +136,9 @@ let OLD_ZLIB = False GZIP_OS_CODE = AUTO_DETECT EOF - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" - '' + optionalString (!enableThreading) '' + '' + lib.optionalString (!enableThreading) '' # We need to do this because the bootstrap doesn't have a static libpthread sed -i 's,\(libswanted.*\)pthread,\1,g' Configure ''; @@ -174,7 +181,7 @@ let }" /no-such-path \ --replace "${stdenv.cc}" /no-such-path \ --replace "$man" /no-such-path - '' + optionalString crossCompiling + '' + lib.optionalString crossCompiling '' mkdir -p $mini/lib/perl5/cross_perl/${version} for dir in cnf/{stub,cpan}; do @@ -198,7 +205,7 @@ let "$mini/lib/perl5/cross_perl/${version}:$out/lib/perl5/${version}:$out/lib/perl5/${version}/$runtimeArch" ''; # */ - meta = { + meta = with lib; { homepage = "https://www.perl.org/"; description = "The standard implementation of the Perl 5 programmming language"; license = licenses.artistic1; @@ -206,7 +213,7 @@ let platforms = platforms.all; priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; - } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { + } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { crossVersion = "c876045741f5159318085d2737b0090f35a842ca"; # June 5, 2022 perl-cross-src = fetchFromGitHub { diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 3012158a1c6e..37277baae814 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.25"; - hash = "sha256-CdcWvOtbPbdtkCOxDBaB674EDlH0wY39Nfn/i3O7z4w="; + version = "8.0.27"; + hash = "sha256-X9iCsUN3wVjBtVzGrOkfuMGbd8WW1YMa0ST7u8kC28g="; }); in diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 4b98f318062a..6cfda280d3ef 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.12"; - hash = "sha256-+H1z6Rf6z3jee83lP8L6pNTb4Eh6lAbhq2jIro8z6wM="; + version = "8.1.14"; + hash = "sha256-FMqZMz3WBKUEojaJRkhaw103nE2pbSjcUV1+tQLf+jI="; }); in diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 72816da1d4b1..41627582dc83 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -1,17 +1,9 @@ { callPackage, lib, stdenv, fetchurl, ... }@_args: let - hash = "sha256-sbT8sIwle3OugXxqLZO3jKXlrOQsX1iH7WRH8G+nv8Y="; - base = callPackage ./generic.nix (_args // { - version = "8.2.0"; - phpAttrsOverrides = attrs: attrs // { - src = fetchurl { - url = "https://downloads.php.net/~sergey/php-8.2.0RC6.tar.xz"; - inherit hash; - }; - }; - inherit hash; + version = "8.2.1"; + hash = "sha256-ddb482WZPsDR2cYoHUVX5v7sWiYZSkaLiwFFnRd++yk="; }); in diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 96ba56e00b92..b8ceac621a61 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -27,6 +27,10 @@ let , system-sendmail , valgrind , xcbuild + , writeShellScript + , common-updater-scripts + , curl + , jq , version , hash @@ -48,7 +52,7 @@ let , cgotoSupport ? false , embedSupport ? false , ipv6Support ? true - , systemdSupport ? stdenv.isLinux + , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , valgrindSupport ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind , ztsSupport ? apxs2Support }@args: @@ -300,6 +304,19 @@ let outputs = [ "out" "dev" ]; passthru = { + updateScript = + let + script = writeShellScript "php${lib.versions.major version}${lib.versions.minor version}-update-script" '' + set -o errexit + PATH=${lib.makeBinPath [ common-updater-scripts curl jq ]} + new_version=$(curl --silent "https://www.php.net/releases/active" | jq --raw-output '."${lib.versions.major version}"."${lib.versions.majorMinor version}".version') + update-source-version "$UPDATE_NIX_ATTR_PATH.unwrapped" "$new_version" "--file=$1" + ''; + in [ + script + # Passed as an argument so that update.nix can ensure it does not become a store path. + (./. + "/${lib.versions.majorMinor version}.nix") + ]; buildEnv = mkBuildEnv { } [ ]; withExtensions = mkWithExtensions { } [ ]; overrideAttrs = diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 8e3e868fad93..b85f99a7b52d 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }: -with lib; stdenv.mkDerivation rec { pname = "picoLisp"; @@ -9,11 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0l51x98bn1hh6kv40sdgp0x09pzg5i8yxbcjvm9n5bxsd6bbk5w2"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [openssl] ++ optional stdenv.is64bit jdk; + buildInputs = [openssl] ++ lib.optional stdenv.is64bit jdk; patchPhase = '' sed -i "s/which java/command -v java/g" mkAsm - ${optionalString stdenv.isAarch32 '' + ${lib.optionalString stdenv.isAarch32 '' sed -i s/-m32//g Makefile cat >>Makefile < -Date: Wed, 15 Jul 2020 13:51:00 +0200 -Subject: [PATCH] bpo-39017: Avoid infinite loop in the tarfile module - (GH-21454) - -Avoid infinite loop when reading specially crafted TAR files using the tarfile module -(CVE-2019-20907). ---- - Lib/tarfile.py | 2 ++ - -diff --git a/Lib/tarfile.py b/Lib/tarfile.py -index e2b60532f6..6769066cab 100755 ---- a/Lib/tarfile.py -+++ b/Lib/tarfile.py -@@ -1249,6 +1249,8 @@ class TarInfo(object): - - length, keyword = match.groups() - length = int(length) -+ if length == 0: -+ raise InvalidHeaderError("invalid header") - value = buf[match.end(2) + 1:match.start(1) + length - 1] - - # Normally, we could just use "utf-8" as the encoding and "strict" diff --git a/pkgs/development/interpreters/python/cpython/2.7/CVE-2021-23336.patch b/pkgs/development/interpreters/python/cpython/2.7/CVE-2021-23336.patch deleted file mode 100644 index 760d0e7eed8e..000000000000 --- a/pkgs/development/interpreters/python/cpython/2.7/CVE-2021-23336.patch +++ /dev/null @@ -1,390 +0,0 @@ -From e7b005c05dbdbce967a409abd71641281a8604bf Mon Sep 17 00:00:00 2001 -From: Senthil Kumaran -Date: Mon, 15 Feb 2021 11:16:43 -0800 -Subject: [PATCH 24/26] [3.6] bpo-42967: only use '&' as a query string - separator (GH-24297) (GH-24532) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -bpo-42967: [security] Address a web cache-poisoning issue reported in -urllib.parse.parse_qsl(). - -urllib.parse will only us "&" as query string separator by default -instead of both ";" and "&" as allowed in earlier versions. An optional -argument seperator with default value "&" is added to specify the -separator. - -Co-authored-by: Éric Araujo -Co-authored-by: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com> -Co-authored-by: Adam Goldschmidt - -Rebased for Python 2.7 by Michał Górny ---- - Doc/library/cgi.rst | 7 +++- - Doc/library/urlparse.rst | 23 ++++++++++- - Lib/cgi.py | 20 +++++++--- - Lib/test/test_cgi.py | 29 +++++++++++--- - Lib/test/test_urlparse.py | 38 +++++++++---------- - Lib/urlparse.py | 22 ++++++++--- - .../2021-02-14-15-59-16.bpo-42967.YApqDS.rst | 1 + - 7 files changed, 100 insertions(+), 40 deletions(-) - create mode 100644 Misc/NEWS.d/next/Security/2021-02-14-15-59-16.bpo-42967.YApqDS.rst - -diff --git a/Doc/library/cgi.rst b/Doc/library/cgi.rst -index ecd62c8c01..b85cdd8b61 100644 ---- a/Doc/library/cgi.rst -+++ b/Doc/library/cgi.rst -@@ -285,10 +285,10 @@ These are useful if you want more control, or if you want to employ some of the - algorithms implemented in this module in other circumstances. - - --.. function:: parse(fp[, environ[, keep_blank_values[, strict_parsing]]]) -+.. function:: parse(fp[, environ[, keep_blank_values[, strict_parsing]]], separator="&") - - Parse a query in the environment or from a file (the file defaults to -- ``sys.stdin`` and environment defaults to ``os.environ``). The *keep_blank_values* and *strict_parsing* parameters are -+ ``sys.stdin`` and environment defaults to ``os.environ``). The *keep_blank_values*, *strict_parsing* and *separator* parameters are - passed to :func:`urlparse.parse_qs` unchanged. - - -@@ -316,6 +316,9 @@ algorithms implemented in this module in other circumstances. - Note that this does not parse nested multipart parts --- use - :class:`FieldStorage` for that. - -+ .. versionchanged:: 3.6.13 -+ Added the *separator* parameter. -+ - - .. function:: parse_header(string) - -diff --git a/Doc/library/urlparse.rst b/Doc/library/urlparse.rst -index 0989c88c30..2f8e4c5a44 100644 ---- a/Doc/library/urlparse.rst -+++ b/Doc/library/urlparse.rst -@@ -136,7 +136,7 @@ The :mod:`urlparse` module defines the following functions: - now raise :exc:`ValueError`. - - --.. function:: parse_qs(qs[, keep_blank_values[, strict_parsing[, max_num_fields]]]) -+.. function:: parse_qs(qs[, keep_blank_values[, strict_parsing[, max_num_fields]]], separator='&') - - Parse a query string given as a string argument (data of type - :mimetype:`application/x-www-form-urlencoded`). Data are returned as a -@@ -157,6 +157,9 @@ The :mod:`urlparse` module defines the following functions: - read. If set, then throws a :exc:`ValueError` if there are more than - *max_num_fields* fields read. - -+ The optional argument *separator* is the symbol to use for separating the -+ query arguments. It defaults to ``&``. -+ - Use the :func:`urllib.urlencode` function to convert such dictionaries into - query strings. - -@@ -166,7 +169,14 @@ The :mod:`urlparse` module defines the following functions: - .. versionchanged:: 2.7.16 - Added *max_num_fields* parameter. - --.. function:: parse_qsl(qs[, keep_blank_values[, strict_parsing[, max_num_fields]]]) -+ .. versionchanged:: 2.7.18-gentoo -+ Added *separator* parameter with the default value of ``&``. Earlier -+ Python versions allowed using both ``;`` and ``&`` as query parameter -+ separator. This has been changed to allow only a single separator key, -+ with ``&`` as the default separator. -+ -+ -+.. function:: parse_qsl(qs[, keep_blank_values[, strict_parsing[, max_num_fields]]], separator='&') - - Parse a query string given as a string argument (data of type - :mimetype:`application/x-www-form-urlencoded`). Data are returned as a list of -@@ -186,6 +196,9 @@ The :mod:`urlparse` module defines the following functions: - read. If set, then throws a :exc:`ValueError` if there are more than - *max_num_fields* fields read. - -+ The optional argument *separator* is the symbol to use for separating the -+ query arguments. It defaults to ``&``. -+ - Use the :func:`urllib.urlencode` function to convert such lists of pairs into - query strings. - -@@ -195,6 +208,12 @@ The :mod:`urlparse` module defines the following functions: - .. versionchanged:: 2.7.16 - Added *max_num_fields* parameter. - -+ .. versionchanged:: 2.7.18-gentoo -+ Added *separator* parameter with the default value of ``&``. Earlier -+ Python versions allowed using both ``;`` and ``&`` as query parameter -+ separator. This has been changed to allow only a single separator key, -+ with ``&`` as the default separator. -+ - .. function:: urlunparse(parts) - - Construct a URL from a tuple as returned by ``urlparse()``. The *parts* argument -diff --git a/Lib/cgi.py b/Lib/cgi.py -index 5b903e0347..9d0848b6b1 100755 ---- a/Lib/cgi.py -+++ b/Lib/cgi.py -@@ -121,7 +121,8 @@ log = initlog # The current logging function - # 0 ==> unlimited input - maxlen = 0 - --def parse(fp=None, environ=os.environ, keep_blank_values=0, strict_parsing=0): -+def parse(fp=None, environ=os.environ, keep_blank_values=0, -+ strict_parsing=0, separator='&'): - """Parse a query in the environment or from a file (default stdin) - - Arguments, all optional: -@@ -140,6 +141,9 @@ def parse(fp=None, environ=os.environ, keep_blank_values=0, strict_parsing=0): - strict_parsing: flag indicating what to do with parsing errors. - If false (the default), errors are silently ignored. - If true, errors raise a ValueError exception. -+ -+ separator: str. The symbol to use for separating the query arguments. -+ Defaults to &. - """ - if fp is None: - fp = sys.stdin -@@ -171,7 +175,8 @@ def parse(fp=None, environ=os.environ, keep_blank_values=0, strict_parsing=0): - else: - qs = "" - environ['QUERY_STRING'] = qs # XXX Shouldn't, really -- return urlparse.parse_qs(qs, keep_blank_values, strict_parsing) -+ return urlparse.parse_qs(qs, keep_blank_values, strict_parsing, -+ separator=separator) - - - # parse query string function called from urlparse, -@@ -395,7 +400,7 @@ class FieldStorage: - - def __init__(self, fp=None, headers=None, outerboundary="", - environ=os.environ, keep_blank_values=0, strict_parsing=0, -- max_num_fields=None): -+ max_num_fields=None, separator='&'): - """Constructor. Read multipart/* until last part. - - Arguments, all optional: -@@ -430,6 +435,7 @@ class FieldStorage: - self.keep_blank_values = keep_blank_values - self.strict_parsing = strict_parsing - self.max_num_fields = max_num_fields -+ self.separator = separator - if 'REQUEST_METHOD' in environ: - method = environ['REQUEST_METHOD'].upper() - self.qs_on_post = None -@@ -613,7 +619,8 @@ class FieldStorage: - if self.qs_on_post: - qs += '&' + self.qs_on_post - query = urlparse.parse_qsl(qs, self.keep_blank_values, -- self.strict_parsing, self.max_num_fields) -+ self.strict_parsing, self.max_num_fields, -+ separator=self.separator) - self.list = [MiniFieldStorage(key, value) for key, value in query] - self.skip_lines() - -@@ -629,7 +636,8 @@ class FieldStorage: - query = urlparse.parse_qsl(self.qs_on_post, - self.keep_blank_values, - self.strict_parsing, -- self.max_num_fields) -+ self.max_num_fields, -+ separator=self.separator) - self.list.extend(MiniFieldStorage(key, value) - for key, value in query) - FieldStorageClass = None -@@ -649,7 +657,7 @@ class FieldStorage: - headers = rfc822.Message(self.fp) - part = klass(self.fp, headers, ib, - environ, keep_blank_values, strict_parsing, -- max_num_fields) -+ max_num_fields, separator=self.separator) - - if max_num_fields is not None: - max_num_fields -= 1 -diff --git a/Lib/test/test_cgi.py b/Lib/test/test_cgi.py -index 743c2afbd4..f414faa23b 100644 ---- a/Lib/test/test_cgi.py -+++ b/Lib/test/test_cgi.py -@@ -61,12 +61,9 @@ parse_strict_test_cases = [ - ("", ValueError("bad query field: ''")), - ("&", ValueError("bad query field: ''")), - ("&&", ValueError("bad query field: ''")), -- (";", ValueError("bad query field: ''")), -- (";&;", ValueError("bad query field: ''")), - # Should the next few really be valid? - ("=", {}), - ("=&=", {}), -- ("=;=", {}), - # This rest seem to make sense - ("=a", {'': ['a']}), - ("&=a", ValueError("bad query field: ''")), -@@ -81,8 +78,6 @@ parse_strict_test_cases = [ - ("a=a+b&b=b+c", {'a': ['a b'], 'b': ['b c']}), - ("a=a+b&a=b+a", {'a': ['a b', 'b a']}), - ("x=1&y=2.0&z=2-3.%2b0", {'x': ['1'], 'y': ['2.0'], 'z': ['2-3.+0']}), -- ("x=1;y=2.0&z=2-3.%2b0", {'x': ['1'], 'y': ['2.0'], 'z': ['2-3.+0']}), -- ("x=1;y=2.0;z=2-3.%2b0", {'x': ['1'], 'y': ['2.0'], 'z': ['2-3.+0']}), - ("Hbc5161168c542333633315dee1182227:key_store_seqid=400006&cuyer=r&view=bustomer&order_id=0bb2e248638833d48cb7fed300000f1b&expire=964546263&lobale=en-US&kid=130003.300038&ss=env", - {'Hbc5161168c542333633315dee1182227:key_store_seqid': ['400006'], - 'cuyer': ['r'], -@@ -188,6 +183,30 @@ class CgiTests(unittest.TestCase): - self.assertEqual(expect[k], v) - self.assertItemsEqual(expect.values(), d.values()) - -+ def test_separator(self): -+ parse_semicolon = [ -+ ("x=1;y=2.0", {'x': ['1'], 'y': ['2.0']}), -+ ("x=1;y=2.0;z=2-3.%2b0", {'x': ['1'], 'y': ['2.0'], 'z': ['2-3.+0']}), -+ (";", ValueError("bad query field: ''")), -+ (";;", ValueError("bad query field: ''")), -+ ("=;a", ValueError("bad query field: 'a'")), -+ (";b=a", ValueError("bad query field: ''")), -+ ("b;=a", ValueError("bad query field: 'b'")), -+ ("a=a+b;b=b+c", {'a': ['a b'], 'b': ['b c']}), -+ ("a=a+b;a=b+a", {'a': ['a b', 'b a']}), -+ ] -+ for orig, expect in parse_semicolon: -+ env = {'QUERY_STRING': orig} -+ fs = cgi.FieldStorage(separator=';', environ=env) -+ if isinstance(expect, dict): -+ for key in expect.keys(): -+ expect_val = expect[key] -+ self.assertIn(key, fs) -+ if len(expect_val) > 1: -+ self.assertEqual(fs.getvalue(key), expect_val) -+ else: -+ self.assertEqual(fs.getvalue(key), expect_val[0]) -+ - def test_log(self): - cgi.log("Testing") - -diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py -index 86c4a0595c..0b2107339a 100644 ---- a/Lib/test/test_urlparse.py -+++ b/Lib/test/test_urlparse.py -@@ -24,16 +24,20 @@ parse_qsl_test_cases = [ - ("&a=b", [('a', 'b')]), - ("a=a+b&b=b+c", [('a', 'a b'), ('b', 'b c')]), - ("a=1&a=2", [('a', '1'), ('a', '2')]), -- (";", []), -- (";;", []), -- (";a=b", [('a', 'b')]), -- ("a=a+b;b=b+c", [('a', 'a b'), ('b', 'b c')]), -- ("a=1;a=2", [('a', '1'), ('a', '2')]), -- (b";", []), -- (b";;", []), -- (b";a=b", [(b'a', b'b')]), -- (b"a=a+b;b=b+c", [(b'a', b'a b'), (b'b', b'b c')]), -- (b"a=1;a=2", [(b'a', b'1'), (b'a', b'2')]), -+ (b"", []), -+ (b"&", []), -+ (b"&&", []), -+ (b"=", [(b'', b'')]), -+ (b"=a", [(b'', b'a')]), -+ (b"a", [(b'a', b'')]), -+ (b"a=", [(b'a', b'')]), -+ (b"&a=b", [(b'a', b'b')]), -+ (b"a=a+b&b=b+c", [(b'a', b'a b'), (b'b', b'b c')]), -+ (b"a=1&a=2", [(b'a', b'1'), (b'a', b'2')]), -+ (";a=b", [(';a', 'b')]), -+ ("a=a+b;b=b+c", [('a', 'a b;b=b c')]), -+ (b";a=b", [(b';a', b'b')]), -+ (b"a=a+b;b=b+c", [(b'a', b'a b;b=b c')]), - ] - - parse_qs_test_cases = [ -@@ -57,16 +61,10 @@ parse_qs_test_cases = [ - (b"&a=b", {b'a': [b'b']}), - (b"a=a+b&b=b+c", {b'a': [b'a b'], b'b': [b'b c']}), - (b"a=1&a=2", {b'a': [b'1', b'2']}), -- (";", {}), -- (";;", {}), -- (";a=b", {'a': ['b']}), -- ("a=a+b;b=b+c", {'a': ['a b'], 'b': ['b c']}), -- ("a=1;a=2", {'a': ['1', '2']}), -- (b";", {}), -- (b";;", {}), -- (b";a=b", {b'a': [b'b']}), -- (b"a=a+b;b=b+c", {b'a': [b'a b'], b'b': [b'b c']}), -- (b"a=1;a=2", {b'a': [b'1', b'2']}), -+ (";a=b", {';a': ['b']}), -+ ("a=a+b;b=b+c", {'a': ['a b;b=b c']}), -+ (b";a=b", {b';a': [b'b']}), -+ (b"a=a+b;b=b+c", {b'a':[ b'a b;b=b c']}), - ] - - class UrlParseTestCase(unittest.TestCase): -diff --git a/Lib/urlparse.py b/Lib/urlparse.py -index 798b467b60..6c32727fce 100644 ---- a/Lib/urlparse.py -+++ b/Lib/urlparse.py -@@ -382,7 +382,8 @@ def unquote(s): - append(item) - return ''.join(res) - --def parse_qs(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None): -+def parse_qs(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None, -+ separator='&'): - """Parse a query given as a string argument. - - Arguments: -@@ -402,17 +403,22 @@ def parse_qs(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None): - - max_num_fields: int. If set, then throws a ValueError if there - are more than n fields read by parse_qsl(). -+ -+ separator: str. The symbol to use for separating the query arguments. -+ Defaults to &. -+ - """ - dict = {} - for name, value in parse_qsl(qs, keep_blank_values, strict_parsing, -- max_num_fields): -+ max_num_fields, separator=separator): - if name in dict: - dict[name].append(value) - else: - dict[name] = [value] - return dict - --def parse_qsl(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None): -+def parse_qsl(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None, -+ separator='&'): - """Parse a query given as a string argument. - - Arguments: -@@ -432,17 +438,23 @@ def parse_qsl(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None): - max_num_fields: int. If set, then throws a ValueError if there - are more than n fields read by parse_qsl(). - -+ separator: str. The symbol to use for separating the query arguments. -+ Defaults to &. -+ - Returns a list, as G-d intended. - """ -+ if not separator or (not isinstance(separator, (str, bytes))): -+ raise ValueError("Separator must be of type string or bytes.") -+ - # If max_num_fields is defined then check that the number of fields - # is less than max_num_fields. This prevents a memory exhaustion DOS - # attack via post bodies with many fields. - if max_num_fields is not None: -- num_fields = 1 + qs.count('&') + qs.count(';') -+ num_fields = 1 + qs.count(separator) - if max_num_fields < num_fields: - raise ValueError('Max number of fields exceeded') - -- pairs = [s2 for s1 in qs.split('&') for s2 in s1.split(';')] -+ pairs = [s1 for s1 in qs.split(separator)] - r = [] - for name_value in pairs: - if not name_value and not strict_parsing: -diff --git a/Misc/NEWS.d/next/Security/2021-02-14-15-59-16.bpo-42967.YApqDS.rst b/Misc/NEWS.d/next/Security/2021-02-14-15-59-16.bpo-42967.YApqDS.rst -new file mode 100644 -index 0000000000..f08489b414 ---- /dev/null -+++ b/Misc/NEWS.d/next/Security/2021-02-14-15-59-16.bpo-42967.YApqDS.rst -@@ -0,0 +1 @@ -+Fix web cache poisoning vulnerability by defaulting the query args separator to ``&``, and allowing the user to choose a custom separator. --- -2.31.1 - diff --git a/pkgs/development/interpreters/python/cpython/2.7/CVE-2021-3177.patch b/pkgs/development/interpreters/python/cpython/2.7/CVE-2021-3177.patch deleted file mode 100644 index 6c0ae468461f..000000000000 --- a/pkgs/development/interpreters/python/cpython/2.7/CVE-2021-3177.patch +++ /dev/null @@ -1,181 +0,0 @@ -From fab838b2ee7cfb9037c24f0f18dfe01aa379b3f7 Mon Sep 17 00:00:00 2001 -From: Benjamin Peterson -Date: Mon, 18 Jan 2021 15:11:46 -0600 -Subject: [3.6] closes bpo-42938: Replace snprintf with Python unicode - formatting in ctypes param reprs. (GH-24250) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -(cherry picked from commit 916610ef90a0d0761f08747f7b0905541f0977c7) - -Co-authored-by: Benjamin Peterson -Rebased for Python 2.7 by Michał Górny ---- - Lib/ctypes/test/test_parameters.py | 43 +++++++++++++++++++ - .../2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst | 2 + - Modules/_ctypes/callproc.c | 49 +++++++++++----------- - 3 files changed, 69 insertions(+), 25 deletions(-) - create mode 100644 Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst - -diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py -index 23c1b6e225..3456882ccb 100644 ---- a/Lib/ctypes/test/test_parameters.py -+++ b/Lib/ctypes/test/test_parameters.py -@@ -206,6 +206,49 @@ class SimpleTypesTestCase(unittest.TestCase): - with self.assertRaises(ZeroDivisionError): - WorseStruct().__setstate__({}, b'foo') - -+ def test_parameter_repr(self): -+ from ctypes import ( -+ c_bool, -+ c_char, -+ c_wchar, -+ c_byte, -+ c_ubyte, -+ c_short, -+ c_ushort, -+ c_int, -+ c_uint, -+ c_long, -+ c_ulong, -+ c_longlong, -+ c_ulonglong, -+ c_float, -+ c_double, -+ c_longdouble, -+ c_char_p, -+ c_wchar_p, -+ c_void_p, -+ ) -+ self.assertRegexpMatches(repr(c_bool.from_param(True)), r"^$") -+ self.assertEqual(repr(c_char.from_param('a')), "") -+ self.assertRegexpMatches(repr(c_wchar.from_param('a')), r"^$") -+ self.assertEqual(repr(c_byte.from_param(98)), "") -+ self.assertEqual(repr(c_ubyte.from_param(98)), "") -+ self.assertEqual(repr(c_short.from_param(511)), "") -+ self.assertEqual(repr(c_ushort.from_param(511)), "") -+ self.assertRegexpMatches(repr(c_int.from_param(20000)), r"^$") -+ self.assertRegexpMatches(repr(c_uint.from_param(20000)), r"^$") -+ self.assertRegexpMatches(repr(c_long.from_param(20000)), r"^$") -+ self.assertRegexpMatches(repr(c_ulong.from_param(20000)), r"^$") -+ self.assertRegexpMatches(repr(c_longlong.from_param(20000)), r"^$") -+ self.assertRegexpMatches(repr(c_ulonglong.from_param(20000)), r"^$") -+ self.assertEqual(repr(c_float.from_param(1.5)), "") -+ self.assertEqual(repr(c_double.from_param(1.5)), "") -+ self.assertEqual(repr(c_double.from_param(1e300)), "") -+ self.assertRegexpMatches(repr(c_longdouble.from_param(1.5)), r"^$") -+ self.assertRegexpMatches(repr(c_char_p.from_param(b'hihi')), "^$") -+ self.assertRegexpMatches(repr(c_wchar_p.from_param('hihi')), "^$") -+ self.assertRegexpMatches(repr(c_void_p.from_param(0x12)), r"^$") -+ - ################################################################ - - if __name__ == '__main__': -diff --git a/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst -new file mode 100644 -index 0000000000..7df65a156f ---- /dev/null -+++ b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst -@@ -0,0 +1,2 @@ -+Avoid static buffers when computing the repr of :class:`ctypes.c_double` and -+:class:`ctypes.c_longdouble` values. -diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c -index 066fefc0cc..421addf353 100644 ---- a/Modules/_ctypes/callproc.c -+++ b/Modules/_ctypes/callproc.c -@@ -460,50 +460,51 @@ PyCArg_dealloc(PyCArgObject *self) - static PyObject * - PyCArg_repr(PyCArgObject *self) - { -- char buffer[256]; - switch(self->tag) { - case 'b': - case 'B': -- sprintf(buffer, "", -+ return PyString_FromFormat("", - self->tag, self->value.b); -- break; - case 'h': - case 'H': -- sprintf(buffer, "", -+ return PyString_FromFormat("", - self->tag, self->value.h); -- break; - case 'i': - case 'I': -- sprintf(buffer, "", -+ return PyString_FromFormat("", - self->tag, self->value.i); -- break; - case 'l': - case 'L': -- sprintf(buffer, "", -+ return PyString_FromFormat("", - self->tag, self->value.l); -- break; - - #ifdef HAVE_LONG_LONG - case 'q': - case 'Q': -- sprintf(buffer, -+ return PyString_FromFormat( - "", - self->tag, self->value.q); -- break; - #endif - case 'd': -- sprintf(buffer, "", -- self->tag, self->value.d); -- break; -- case 'f': -- sprintf(buffer, "", -- self->tag, self->value.f); -- break; -- -+ case 'f': { -+ PyObject *f = PyFloat_FromDouble((self->tag == 'f') ? self->value.f : self->value.d); -+ if (f == NULL) { -+ return NULL; -+ } -+ PyObject *r = PyObject_Repr(f); -+ if (r == NULL) { -+ Py_DECREF(f); -+ return NULL; -+ } -+ PyObject *result = PyString_FromFormat( -+ "", self->tag, PyString_AsString(r)); -+ Py_DECREF(r); -+ Py_DECREF(f); -+ return result; -+ } - case 'c': -- sprintf(buffer, "", -+ return PyString_FromFormat("", - self->tag, self->value.c); -- break; - - /* Hm, are these 'z' and 'Z' codes useful at all? - Shouldn't they be replaced by the functionality of c_string -@@ -512,16 +513,14 @@ PyCArg_repr(PyCArgObject *self) - case 'z': - case 'Z': - case 'P': -- sprintf(buffer, "", -+ return PyString_FromFormat("", - self->tag, self->value.p); - break; - - default: -- sprintf(buffer, "", -+ return PyString_FromFormat("", - self->tag, self); -- break; - } -- return PyString_FromString(buffer); - } - - static PyMemberDef PyCArgType_members[] = { --- -cgit v1.2.3 - diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 30b7732ed51e..2971981eba1f 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , bzip2 , expat , libffi @@ -31,6 +31,10 @@ , rebuildBytecode ? true , reproducibleBuild ? false , enableOptimizations ? false +, strip2to3 ? false +, stripConfig ? false +, stripIdlelib ? false +, stripTests ? false , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" }: @@ -50,8 +54,6 @@ assert lib.assertMsg (reproducibleBuild -> (!enableOptimizations)) assert lib.assertMsg (reproducibleBuild -> (!rebuildBytecode)) "Deterministic builds are not achieved when (default unoptimized) bytecode is created."; -with lib; - let buildPackages = pkgsBuildHost; inherit (passthru) pythonForBuild; @@ -79,8 +81,12 @@ let version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; - src = fetchurl { - url = with sourceVersion; "https://www.python.org/ftp/python/${major}.${minor}.${patch}/Python-${version}.tar.xz"; + # ActiveState is a fork of cpython that includes fixes for security + # issues after its EOL + src = fetchFromGitHub { + owner = "ActiveState"; + repo = "cpython"; + rev = "v${version}"; inherit sha256; }; @@ -119,22 +125,15 @@ let # Backport from CPython 3.8 of a good list of tests to run for PGO. ./profile-task.patch - # Patch is likely to go away in the next release (if there is any) - ./CVE-2019-20907.patch - - ./CVE-2021-3177.patch - - ./CVE-2021-23336.patch - # The workaround is for unittests on Win64, which we don't support. # It does break aarch64-darwin, which we do support. See: # * https://bugs.python.org/issue35523 # * https://github.com/python/cpython/commit/e6b247c8e524 ../3.7/no-win64-workaround.patch - ] ++ optionals (x11Support && stdenv.isDarwin) [ + ] ++ lib.optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ # Disable the use of ldconfig in ctypes.util.find_library (since # ldconfig doesn't work on NixOS), and don't use @@ -146,7 +145,7 @@ let # Fix ctypes.util.find_library with gcc10. ./find_library-gcc10.patch - ] ++ optionals stdenv.hostPlatform.isCygwin [ + ] ++ lib.optionals stdenv.hostPlatform.isCygwin [ ./2.5.2-ctypes-util-find_library.patch ./2.5.2-tkinter-x11.patch ./2.6.2-ssl-threads.patch @@ -157,7 +156,7 @@ let ./2.7.3-dylib.patch ./2.7.3-getpath-exe-extension.patch ./2.7.3-no-libm.patch - ] ++ optionals hasDistutilsCxxPatch [ + ] ++ lib.optionals hasDistutilsCxxPatch [ # Patch from http://bugs.python.org/issue1222585 adapted to work with # `patch -p1' and with a last hunk removed @@ -165,7 +164,7 @@ let # only works for GCC and Apple Clang. This makes distutils to call C++ # compiler when needed. ./python-2.7-distutils-C++.patch - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ ./cross-compile.patch ]; @@ -174,32 +173,31 @@ let for i in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace $i /no-such-path done - '' + optionalString (stdenv ? cc && stdenv.cc.libc != null) '' + '' + lib.optionalString (stdenv ? cc && stdenv.cc.libc != null) '' for i in Lib/plat-*/regen; do substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/ done - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' substituteInPlace Lib/multiprocessing/__init__.py \ --replace 'os.popen(comm)' 'os.popen("${coreutils}/bin/nproc")' ''; - configureFlags = optionals enableOptimizations [ + configureFlags = lib.optionals enableOptimizations [ "--enable-optimizations" - ] ++ optionals (!static) [ + ] ++ lib.optionals (!static) [ "--enable-shared" ] ++ [ "--with-threads" - "--enable-unicode=ucs${toString ucsEncoding}" - ] ++ optionals (stdenv.hostPlatform.isCygwin || stdenv.hostPlatform.isAarch64) [ "--with-system-ffi" - ] ++ optionals stdenv.hostPlatform.isCygwin [ "--with-system-expat" + "--enable-unicode=ucs${toString ucsEncoding}" + ] ++ lib.optionals stdenv.hostPlatform.isCygwin [ "ac_cv_func_bind_textdomain_codeset=yes" - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "--disable-toolbox-glue" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "PYTHON_FOR_BUILD=${getBin buildPackages.python}/bin/python" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "PYTHON_FOR_BUILD=${lib.getBin buildPackages.python}/bin/python" "ac_cv_buggy_getaddrinfo=no" # Assume little-endian IEEE 754 floating point when cross compiling "ac_cv_little_endian_double=yes" @@ -223,26 +221,23 @@ let ] # Never even try to use lchmod on linux, # don't rely on detecting glibc-isms. - ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no" - ++ optional static "LDFLAGS=-static"; + ++ lib.optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no" + ++ lib.optional static "LDFLAGS=-static"; strictDeps = true; buildInputs = - optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ - [ bzip2 openssl zlib ] - ++ optional (stdenv.hostPlatform.isCygwin || stdenv.hostPlatform.isAarch64) libffi - ++ optional stdenv.hostPlatform.isCygwin expat - ++ [ db gdbm ncurses sqlite readline ] - ++ optionals x11Support [ tcl tk libX11 ] - ++ optional (stdenv.isDarwin && configd != null) configd; + lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ + [ bzip2 openssl zlib libffi expat db gdbm ncurses sqlite readline ] + ++ lib.optionals x11Support [ tcl tk libX11 ] + ++ lib.optional (stdenv.isDarwin && configd != null) configd; nativeBuildInputs = [ autoreconfHook ] - ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc buildPackages.python ]; mkPaths = paths: { - C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths; - LIBRARY_PATH = makeLibraryPath paths; + C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" paths; + LIBRARY_PATH = lib.makeLibraryPath paths; }; # Python 2.7 needs this @@ -261,13 +256,13 @@ in with passthru; stdenv.mkDerivation ({ LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; - NIX_CFLAGS_COMPILE = optionalString (stdenv.targetPlatform.system == "x86_64-darwin") "-msse2" - + optionalString stdenv.hostPlatform.isMusl " -DTHREAD_STACK_SIZE=0x100000"; + NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.targetPlatform.system == "x86_64-darwin") "-msse2" + + lib.optionalString stdenv.hostPlatform.isMusl " -DTHREAD_STACK_SIZE=0x100000"; DETERMINISTIC_BUILD = 1; setupHook = python-setup-hook sitePackages; - postPatch = optionalString (x11Support && (tix != null)) '' + postPatch = lib.optionalString (x11Support && (tix != null)) '' substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; @@ -294,18 +289,18 @@ in with passthru; stdenv.mkDerivation ({ # Determinism: Windows installers were not deterministic. # We're also not interested in building Windows installers. find "$out" -name 'wininst*.exe' | xargs -r rm -f - '' + optionalString stripBytecode '' + '' + lib.optionalString stripBytecode '' # Determinism: deterministic bytecode # First we delete all old bytecode. find $out -name "*.pyc" -delete - '' + optionalString rebuildBytecode '' + '' + lib.optionalString rebuildBytecode '' # We build 3 levels of optimized bytecode. Note the default level, without optimizations, # is not reproducible yet. https://bugs.python.org/issue29708 # Not creating bytecode will result in a large performance loss however, so we do build it. find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i - find $out -name "*.py" | ${pythonForBuildInterpreter} -O -m compileall -q -f -x "lib2to3" -i - find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - - '' + optionalString stdenv.hostPlatform.isCygwin '' + '' + lib.optionalString stdenv.hostPlatform.isCygwin '' cp libpython2.7.dll.a $out/lib ''; @@ -314,6 +309,16 @@ in with passthru; stdenv.mkDerivation ({ postFixup = '' # Include a sitecustomize.py file. Note it causes an error when it's in postInstall with 2.7. cp ${../../sitecustomize.py} $out/${sitePackages}/sitecustomize.py + '' + lib.optionalString strip2to3 '' + rm -R $out/bin/2to3 $out/lib/python*/lib2to3 + '' + lib.optionalString stripConfig '' + rm -R $out/bin/python*-config $out/lib/python*/config* + '' + lib.optionalString stripIdlelib '' + # Strip IDLE + rm -R $out/bin/idle* $out/lib/python*/idlelib + '' + lib.optionalString stripTests '' + # Strip tests + rm -R $out/lib/python*/test $out/lib/python*/**/test{,s} ''; enableParallelBuilding = true; @@ -334,9 +339,15 @@ in with passthru; stdenv.mkDerivation ({ ''; license = lib.licenses.psfl; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ fridh ]; - # Higher priority than Python 3.x so that `/bin/python` points to `/bin/python2` - # in case both 2 and 3 are installed. - priority = -100; + maintainers = with lib.maintainers; [ fridh thiagokokada ]; + knownVulnerabilities = [ + "Python 2.7 has reached its end of life after 2020-01-01. See https://www.python.org/doc/sunset-python-2/." + # Quote: That means that we will not improve it anymore after that day, + # even if someone finds a security problem in it. You should upgrade to + # Python 3 as soon as you can. [..] So, in 2008, we announced that we + # would sunset Python 2 in 2015, and asked people to upgrade before + # then. Some did, but many did not. So, in 2014, we extended that + # sunset till 2020. + ]; }; } // crossCompileEnv) diff --git a/pkgs/development/interpreters/python/cpython/3.10/asyncio-deprecation.patch b/pkgs/development/interpreters/python/cpython/3.10/asyncio-deprecation.patch new file mode 100644 index 000000000000..656e4eb6a4cb --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.10/asyncio-deprecation.patch @@ -0,0 +1,598 @@ +REVERT https://github.com/python/cpython/commit/300d812fd1c4d9244e71de0d228cc72439d312a7 +--- b/Doc/library/asyncio-eventloop.rst ++++ a/Doc/library/asyncio-eventloop.rst +@@ -43,12 +43,10 @@ + + Get the current event loop. + ++ If there is no current event loop set in the current OS thread, ++ the OS thread is main, and :func:`set_event_loop` has not yet ++ been called, asyncio will create a new event loop and set it as the ++ current one. +- When called from a coroutine or a callback (e.g. scheduled with +- call_soon or similar API), this function will always return the +- running event loop. +- +- If there is no running event loop set, the function will return +- the result of ``get_event_loop_policy().get_event_loop()`` call. + + Because this function has rather complex behavior (especially + when custom event loop policies are in use), using the +@@ -60,14 +58,10 @@ + event loop. + + .. deprecated:: 3.10 ++ Emits a deprecation warning if there is no running event loop. ++ In future Python releases, this function may become an alias of ++ :func:`get_running_loop` and will accordingly raise a ++ :exc:`RuntimeError` if there is no running event loop. +- Deprecation warning is emitted if there is no current event loop. +- In Python 3.12 it will be an error. +- +- .. note:: +- In Python versions 3.10.0--3.10.8 this function +- (and other functions which used it implicitly) emitted a +- :exc:`DeprecationWarning` if there was no running event loop, even if +- the current loop was set. + + .. function:: set_event_loop(loop) + +reverted: +--- b/Doc/library/asyncio-llapi-index.rst ++++ a/Doc/library/asyncio-llapi-index.rst +@@ -19,7 +19,7 @@ + - The **preferred** function to get the running event loop. + + * - :func:`asyncio.get_event_loop` ++ - Get an event loop instance (current or via the policy). +- - Get an event loop instance (running or current via the current policy). + + * - :func:`asyncio.set_event_loop` + - Set the event loop as current via the current policy. +reverted: +--- b/Doc/library/asyncio-policy.rst ++++ a/Doc/library/asyncio-policy.rst +@@ -112,11 +112,6 @@ + + On Windows, :class:`ProactorEventLoop` is now used by default. + +- .. deprecated:: 3.10.9 +- :meth:`get_event_loop` now emits a :exc:`DeprecationWarning` if there +- is no current event loop set and a new event loop has been implicitly +- created. In Python 3.12 it will be an error. +- + + .. class:: WindowsSelectorEventLoopPolicy + +reverted: +--- b/Lib/asyncio/events.py ++++ a/Lib/asyncio/events.py +@@ -650,21 +650,6 @@ + if (self._local._loop is None and + not self._local._set_called and + threading.current_thread() is threading.main_thread()): +- stacklevel = 2 +- try: +- f = sys._getframe(1) +- except AttributeError: +- pass +- else: +- while f: +- module = f.f_globals.get('__name__') +- if not (module == 'asyncio' or module.startswith('asyncio.')): +- break +- f = f.f_back +- stacklevel += 1 +- import warnings +- warnings.warn('There is no current event loop', +- DeprecationWarning, stacklevel=stacklevel) + self.set_event_loop(self.new_event_loop()) + + if self._local._loop is None: +@@ -778,13 +763,12 @@ + + + def _get_event_loop(stacklevel=3): +- # This internal method is going away in Python 3.12, left here only for +- # backwards compatibility with 3.10.0 - 3.10.8 and 3.11.0. +- # Similarly, this method's C equivalent in _asyncio is going away as well. +- # See GH-99949 for more details. + current_loop = _get_running_loop() + if current_loop is not None: + return current_loop ++ import warnings ++ warnings.warn('There is no current event loop', ++ DeprecationWarning, stacklevel=stacklevel) + return get_event_loop_policy().get_event_loop() + + +reverted: +--- b/Lib/test/test_asyncio/test_base_events.py ++++ a/Lib/test/test_asyncio/test_base_events.py +@@ -752,7 +752,7 @@ + def test_env_var_debug(self): + code = '\n'.join(( + 'import asyncio', ++ 'loop = asyncio.get_event_loop()', +- 'loop = asyncio.new_event_loop()', + 'print(loop.get_debug())')) + + # Test with -E to not fail if the unit test was run with +reverted: +--- b/Lib/test/test_asyncio/test_events.py ++++ a/Lib/test/test_asyncio/test_events.py +@@ -2561,9 +2561,8 @@ + def test_get_event_loop(self): + policy = asyncio.DefaultEventLoopPolicy() + self.assertIsNone(policy._local._loop) ++ ++ loop = policy.get_event_loop() +- with self.assertWarns(DeprecationWarning) as cm: +- loop = policy.get_event_loop() +- self.assertEqual(cm.filename, __file__) + self.assertIsInstance(loop, asyncio.AbstractEventLoop) + + self.assertIs(policy._local._loop, loop) +@@ -2577,10 +2576,7 @@ + policy, "set_event_loop", + wraps=policy.set_event_loop) as m_set_event_loop: + ++ loop = policy.get_event_loop() +- with self.assertWarns(DeprecationWarning) as cm: +- loop = policy.get_event_loop() +- self.addCleanup(loop.close) +- self.assertEqual(cm.filename, __file__) + + # policy._local._loop must be set through .set_event_loop() + # (the unix DefaultEventLoopPolicy needs this call to attach +@@ -2614,8 +2610,7 @@ + + def test_set_event_loop(self): + policy = asyncio.DefaultEventLoopPolicy() ++ old_loop = policy.get_event_loop() +- old_loop = policy.new_event_loop() +- policy.set_event_loop(old_loop) + + self.assertRaises(AssertionError, policy.set_event_loop, object()) + +@@ -2728,11 +2723,15 @@ + asyncio.set_event_loop_policy(Policy()) + loop = asyncio.new_event_loop() + ++ with self.assertWarns(DeprecationWarning) as cm: ++ with self.assertRaises(TestError): ++ asyncio.get_event_loop() ++ self.assertEqual(cm.warnings[0].filename, __file__) +- with self.assertRaises(TestError): +- asyncio.get_event_loop() + asyncio.set_event_loop(None) ++ with self.assertWarns(DeprecationWarning) as cm: ++ with self.assertRaises(TestError): ++ asyncio.get_event_loop() ++ self.assertEqual(cm.warnings[0].filename, __file__) +- with self.assertRaises(TestError): +- asyncio.get_event_loop() + + with self.assertRaisesRegex(RuntimeError, 'no running'): + asyncio.get_running_loop() +@@ -2746,11 +2745,16 @@ + loop.run_until_complete(func()) + + asyncio.set_event_loop(loop) ++ with self.assertWarns(DeprecationWarning) as cm: ++ with self.assertRaises(TestError): ++ asyncio.get_event_loop() ++ self.assertEqual(cm.warnings[0].filename, __file__) ++ +- with self.assertRaises(TestError): +- asyncio.get_event_loop() + asyncio.set_event_loop(None) ++ with self.assertWarns(DeprecationWarning) as cm: ++ with self.assertRaises(TestError): ++ asyncio.get_event_loop() ++ self.assertEqual(cm.warnings[0].filename, __file__) +- with self.assertRaises(TestError): +- asyncio.get_event_loop() + + finally: + asyncio.set_event_loop_policy(old_policy) +@@ -2774,8 +2778,10 @@ + self.addCleanup(loop2.close) + self.assertEqual(cm.warnings[0].filename, __file__) + asyncio.set_event_loop(None) ++ with self.assertWarns(DeprecationWarning) as cm: ++ with self.assertRaisesRegex(RuntimeError, 'no current'): ++ asyncio.get_event_loop() ++ self.assertEqual(cm.warnings[0].filename, __file__) +- with self.assertRaisesRegex(RuntimeError, 'no current'): +- asyncio.get_event_loop() + + with self.assertRaisesRegex(RuntimeError, 'no running'): + asyncio.get_running_loop() +@@ -2789,11 +2795,15 @@ + loop.run_until_complete(func()) + + asyncio.set_event_loop(loop) ++ with self.assertWarns(DeprecationWarning) as cm: ++ self.assertIs(asyncio.get_event_loop(), loop) ++ self.assertEqual(cm.warnings[0].filename, __file__) +- self.assertIs(asyncio.get_event_loop(), loop) + + asyncio.set_event_loop(None) ++ with self.assertWarns(DeprecationWarning) as cm: ++ with self.assertRaisesRegex(RuntimeError, 'no current'): ++ asyncio.get_event_loop() ++ self.assertEqual(cm.warnings[0].filename, __file__) +- with self.assertRaisesRegex(RuntimeError, 'no current'): +- asyncio.get_event_loop() + + finally: + asyncio.set_event_loop_policy(old_policy) +reverted: +--- b/Lib/test/test_asyncio/test_futures.py ++++ a/Lib/test/test_asyncio/test_futures.py +@@ -145,8 +145,10 @@ + self.assertTrue(f.cancelled()) + + def test_constructor_without_loop(self): ++ with self.assertWarns(DeprecationWarning) as cm: ++ with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'): ++ self._new_future() ++ self.assertEqual(cm.warnings[0].filename, __file__) +- with self.assertRaisesRegex(RuntimeError, 'no current event loop'): +- self._new_future() + + def test_constructor_use_running_loop(self): + async def test(): +@@ -156,10 +158,12 @@ + self.assertIs(f.get_loop(), self.loop) + + def test_constructor_use_global_loop(self): ++ # Deprecated in 3.10 +- # Deprecated in 3.10, undeprecated in 3.11.1 + asyncio.set_event_loop(self.loop) + self.addCleanup(asyncio.set_event_loop, None) ++ with self.assertWarns(DeprecationWarning) as cm: ++ f = self._new_future() ++ self.assertEqual(cm.warnings[0].filename, __file__) +- f = self._new_future() + self.assertIs(f._loop, self.loop) + self.assertIs(f.get_loop(), self.loop) + +@@ -495,8 +499,10 @@ + return (arg, threading.get_ident()) + ex = concurrent.futures.ThreadPoolExecutor(1) + f1 = ex.submit(run, 'oi') ++ with self.assertWarns(DeprecationWarning) as cm: ++ with self.assertRaises(RuntimeError): ++ asyncio.wrap_future(f1) ++ self.assertEqual(cm.warnings[0].filename, __file__) +- with self.assertRaisesRegex(RuntimeError, 'no current event loop'): +- asyncio.wrap_future(f1) + ex.shutdown(wait=True) + + def test_wrap_future_use_running_loop(self): +@@ -511,14 +517,16 @@ + ex.shutdown(wait=True) + + def test_wrap_future_use_global_loop(self): ++ # Deprecated in 3.10 +- # Deprecated in 3.10, undeprecated in 3.11.1 + asyncio.set_event_loop(self.loop) + self.addCleanup(asyncio.set_event_loop, None) + def run(arg): + return (arg, threading.get_ident()) + ex = concurrent.futures.ThreadPoolExecutor(1) + f1 = ex.submit(run, 'oi') ++ with self.assertWarns(DeprecationWarning) as cm: ++ f2 = asyncio.wrap_future(f1) ++ self.assertEqual(cm.warnings[0].filename, __file__) +- f2 = asyncio.wrap_future(f1) + self.assertIs(self.loop, f2._loop) + ex.shutdown(wait=True) + +reverted: +--- b/Lib/test/test_asyncio/test_streams.py ++++ a/Lib/test/test_asyncio/test_streams.py +@@ -747,8 +747,10 @@ + self.assertEqual(data, b'data') + + def test_streamreader_constructor_without_loop(self): ++ with self.assertWarns(DeprecationWarning) as cm: ++ with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'): ++ asyncio.StreamReader() ++ self.assertEqual(cm.warnings[0].filename, __file__) +- with self.assertRaisesRegex(RuntimeError, 'no current event loop'): +- asyncio.StreamReader() + + def test_streamreader_constructor_use_running_loop(self): + # asyncio issue #184: Ensure that StreamReaderProtocol constructor +@@ -762,17 +764,21 @@ + def test_streamreader_constructor_use_global_loop(self): + # asyncio issue #184: Ensure that StreamReaderProtocol constructor + # retrieves the current loop if the loop parameter is not set ++ # Deprecated in 3.10 +- # Deprecated in 3.10, undeprecated in 3.11.1 + self.addCleanup(asyncio.set_event_loop, None) + asyncio.set_event_loop(self.loop) ++ with self.assertWarns(DeprecationWarning) as cm: ++ reader = asyncio.StreamReader() ++ self.assertEqual(cm.warnings[0].filename, __file__) +- reader = asyncio.StreamReader() + self.assertIs(reader._loop, self.loop) + + + def test_streamreaderprotocol_constructor_without_loop(self): + reader = mock.Mock() ++ with self.assertWarns(DeprecationWarning) as cm: ++ with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'): ++ asyncio.StreamReaderProtocol(reader) ++ self.assertEqual(cm.warnings[0].filename, __file__) +- with self.assertRaisesRegex(RuntimeError, 'no current event loop'): +- asyncio.StreamReaderProtocol(reader) + + def test_streamreaderprotocol_constructor_use_running_loop(self): + # asyncio issue #184: Ensure that StreamReaderProtocol constructor +@@ -786,11 +792,13 @@ + def test_streamreaderprotocol_constructor_use_global_loop(self): + # asyncio issue #184: Ensure that StreamReaderProtocol constructor + # retrieves the current loop if the loop parameter is not set ++ # Deprecated in 3.10 +- # Deprecated in 3.10, undeprecated in 3.11.1 + self.addCleanup(asyncio.set_event_loop, None) + asyncio.set_event_loop(self.loop) + reader = mock.Mock() ++ with self.assertWarns(DeprecationWarning) as cm: ++ protocol = asyncio.StreamReaderProtocol(reader) ++ self.assertEqual(cm.warnings[0].filename, __file__) +- protocol = asyncio.StreamReaderProtocol(reader) + self.assertIs(protocol._loop, self.loop) + + def test_multiple_drain(self): +reverted: +--- b/Lib/test/test_asyncio/test_tasks.py ++++ a/Lib/test/test_asyncio/test_tasks.py +@@ -210,8 +210,10 @@ + + a = notmuch() + self.addCleanup(a.close) ++ with self.assertWarns(DeprecationWarning) as cm: ++ with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'): ++ asyncio.ensure_future(a) ++ self.assertEqual(cm.warnings[0].filename, __file__) +- with self.assertRaisesRegex(RuntimeError, 'no current event loop'): +- asyncio.ensure_future(a) + + async def test(): + return asyncio.ensure_future(notmuch()) +@@ -221,10 +223,12 @@ + self.assertTrue(t.done()) + self.assertEqual(t.result(), 'ok') + ++ # Deprecated in 3.10 +- # Deprecated in 3.10.0, undeprecated in 3.10.9 + asyncio.set_event_loop(self.loop) + self.addCleanup(asyncio.set_event_loop, None) ++ with self.assertWarns(DeprecationWarning) as cm: ++ t = asyncio.ensure_future(notmuch()) ++ self.assertEqual(cm.warnings[0].filename, __file__) +- t = asyncio.ensure_future(notmuch()) + self.assertIs(t._loop, self.loop) + self.loop.run_until_complete(t) + self.assertTrue(t.done()) +@@ -243,8 +247,10 @@ + + a = notmuch() + self.addCleanup(a.close) ++ with self.assertWarns(DeprecationWarning) as cm: ++ with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'): ++ asyncio.ensure_future(a) ++ self.assertEqual(cm.warnings[0].filename, __file__) +- with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'): +- asyncio.ensure_future(a) + + async def test(): + return asyncio.ensure_future(notmuch()) +@@ -254,10 +260,12 @@ + self.assertTrue(t.done()) + self.assertEqual(t.result(), 'ok') + ++ # Deprecated in 3.10 +- # Deprecated in 3.10.0, undeprecated in 3.10.9 + asyncio.set_event_loop(self.loop) + self.addCleanup(asyncio.set_event_loop, None) ++ with self.assertWarns(DeprecationWarning) as cm: ++ t = asyncio.ensure_future(notmuch()) ++ self.assertEqual(cm.warnings[0].filename, __file__) +- t = asyncio.ensure_future(notmuch()) + self.assertIs(t._loop, self.loop) + self.loop.run_until_complete(t) + self.assertTrue(t.done()) +@@ -1480,8 +1488,10 @@ + self.addCleanup(a.close) + + futs = asyncio.as_completed([a]) ++ with self.assertWarns(DeprecationWarning) as cm: ++ with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'): ++ list(futs) ++ self.assertEqual(cm.warnings[0].filename, __file__) +- with self.assertRaisesRegex(RuntimeError, 'no current event loop'): +- list(futs) + + def test_as_completed_coroutine_use_running_loop(self): + loop = self.new_test_loop() +@@ -1497,14 +1507,17 @@ + loop.run_until_complete(test()) + + def test_as_completed_coroutine_use_global_loop(self): ++ # Deprecated in 3.10 +- # Deprecated in 3.10.0, undeprecated in 3.10.9 + async def coro(): + return 42 + + loop = self.new_test_loop() + asyncio.set_event_loop(loop) + self.addCleanup(asyncio.set_event_loop, None) ++ futs = asyncio.as_completed([coro()]) ++ with self.assertWarns(DeprecationWarning) as cm: ++ futs = list(futs) ++ self.assertEqual(cm.warnings[0].filename, __file__) +- futs = list(asyncio.as_completed([coro()])) + self.assertEqual(len(futs), 1) + self.assertEqual(loop.run_until_complete(futs[0]), 42) + +@@ -1974,8 +1987,10 @@ + + inner = coro() + self.addCleanup(inner.close) ++ with self.assertWarns(DeprecationWarning) as cm: ++ with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'): ++ asyncio.shield(inner) ++ self.assertEqual(cm.warnings[0].filename, __file__) +- with self.assertRaisesRegex(RuntimeError, 'no current event loop'): +- asyncio.shield(inner) + + def test_shield_coroutine_use_running_loop(self): + async def coro(): +@@ -1989,13 +2004,15 @@ + self.assertEqual(res, 42) + + def test_shield_coroutine_use_global_loop(self): ++ # Deprecated in 3.10 +- # Deprecated in 3.10.0, undeprecated in 3.10.9 + async def coro(): + return 42 + + asyncio.set_event_loop(self.loop) + self.addCleanup(asyncio.set_event_loop, None) ++ with self.assertWarns(DeprecationWarning) as cm: ++ outer = asyncio.shield(coro()) ++ self.assertEqual(cm.warnings[0].filename, __file__) +- outer = asyncio.shield(coro()) + self.assertEqual(outer._loop, self.loop) + res = self.loop.run_until_complete(outer) + self.assertEqual(res, 42) +@@ -2933,7 +2950,7 @@ + self.assertIsNone(asyncio.current_task(loop=self.loop)) + + def test_current_task_no_running_loop_implicit(self): ++ with self.assertRaises(RuntimeError): +- with self.assertRaisesRegex(RuntimeError, 'no running event loop'): + asyncio.current_task() + + def test_current_task_with_implicit_loop(self): +@@ -3097,8 +3114,10 @@ + return asyncio.gather(*args, **kwargs) + + def test_constructor_empty_sequence_without_loop(self): ++ with self.assertWarns(DeprecationWarning) as cm: ++ with self.assertRaises(RuntimeError): ++ asyncio.gather() ++ self.assertEqual(cm.warnings[0].filename, __file__) +- with self.assertRaisesRegex(RuntimeError, 'no current event loop'): +- asyncio.gather() + + def test_constructor_empty_sequence_use_running_loop(self): + async def gather(): +@@ -3111,10 +3130,12 @@ + self.assertEqual(fut.result(), []) + + def test_constructor_empty_sequence_use_global_loop(self): ++ # Deprecated in 3.10 +- # Deprecated in 3.10.0, undeprecated in 3.10.9 + asyncio.set_event_loop(self.one_loop) + self.addCleanup(asyncio.set_event_loop, None) ++ with self.assertWarns(DeprecationWarning) as cm: ++ fut = asyncio.gather() ++ self.assertEqual(cm.warnings[0].filename, __file__) +- fut = asyncio.gather() + self.assertIsInstance(fut, asyncio.Future) + self.assertIs(fut._loop, self.one_loop) + self._run_loop(self.one_loop) +@@ -3202,8 +3223,10 @@ + self.addCleanup(gen1.close) + gen2 = coro() + self.addCleanup(gen2.close) ++ with self.assertWarns(DeprecationWarning) as cm: ++ with self.assertRaises(RuntimeError): ++ asyncio.gather(gen1, gen2) ++ self.assertEqual(cm.warnings[0].filename, __file__) +- with self.assertRaisesRegex(RuntimeError, 'no current event loop'): +- asyncio.gather(gen1, gen2) + + def test_constructor_use_running_loop(self): + async def coro(): +@@ -3217,14 +3240,16 @@ + self.one_loop.run_until_complete(fut) + + def test_constructor_use_global_loop(self): ++ # Deprecated in 3.10 +- # Deprecated in 3.10.0, undeprecated in 3.10.9 + async def coro(): + return 'abc' + asyncio.set_event_loop(self.other_loop) + self.addCleanup(asyncio.set_event_loop, None) + gen1 = coro() + gen2 = coro() ++ with self.assertWarns(DeprecationWarning) as cm: ++ fut = asyncio.gather(gen1, gen2) ++ self.assertEqual(cm.warnings[0].filename, __file__) +- fut = asyncio.gather(gen1, gen2) + self.assertIs(fut._loop, self.other_loop) + self.other_loop.run_until_complete(fut) + +reverted: +--- b/Lib/test/test_asyncio/test_unix_events.py ++++ a/Lib/test/test_asyncio/test_unix_events.py +@@ -1740,8 +1740,7 @@ + + def test_child_watcher_replace_mainloop_existing(self): + policy = self.create_policy() ++ loop = policy.get_event_loop() +- loop = policy.new_event_loop() +- policy.set_event_loop(loop) + + # Explicitly setup SafeChildWatcher, + # default ThreadedChildWatcher has no _loop property +reverted: +--- b/Lib/test/test_coroutines.py ++++ a/Lib/test/test_coroutines.py +@@ -2319,8 +2319,7 @@ + def test_unawaited_warning_during_shutdown(self): + code = ("import asyncio\n" + "async def f(): pass\n" ++ "asyncio.gather(f())\n") +- "async def t(): asyncio.gather(f())\n" +- "asyncio.run(t())\n") + assert_python_ok("-c", code) + + code = ("import sys\n" +reverted: +--- b/Modules/_asynciomodule.c ++++ a/Modules/_asynciomodule.c +@@ -332,6 +332,13 @@ + return loop; + } + ++ if (PyErr_WarnEx(PyExc_DeprecationWarning, ++ "There is no current event loop", ++ stacklevel)) ++ { ++ return NULL; ++ } ++ + policy = PyObject_CallNoArgs(asyncio_get_event_loop_policy); + if (policy == NULL) { + return NULL; +@@ -3085,11 +3092,6 @@ + return get_event_loop(1); + } + +-// This internal method is going away in Python 3.12, left here only for +-// backwards compatibility with 3.10.0 - 3.10.8 and 3.11.0. +-// Similarly, this method's Python equivalent in asyncio.events is going +-// away as well. +-// See GH-99949 for more details. + /*[clinic input] + _asyncio._get_event_loop + stacklevel: int = 3 diff --git a/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.12/no-ldconfig.patch similarity index 88% rename from pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch rename to pkgs/development/interpreters/python/cpython/3.12/no-ldconfig.patch index 4324fc5ea61f..ca6a76d0ffd9 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch +++ b/pkgs/development/interpreters/python/cpython/3.12/no-ldconfig.patch @@ -1,17 +1,17 @@ -From ba458f33f335b217d078fdce56e9c6f9f93adb49 Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk -Date: Mon, 28 Aug 2017 09:24:06 +0200 -Subject: [PATCH] Don't use ldconfig +From 5330b6af9f832af59aa5c61d9ef6971053a8e709 Mon Sep 17 00:00:00 2001 +From: Jonathan Ringer +Date: Mon, 9 Nov 2020 10:24:35 -0800 +Subject: [PATCH] CPython: Don't use ldconfig --- - Lib/ctypes/util.py | 78 ++-------------------------------------------- - 1 file changed, 2 insertions(+), 76 deletions(-) + Lib/ctypes/util.py | 77 ++-------------------------------------------- + 1 file changed, 2 insertions(+), 75 deletions(-) diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 0c2510e..79635a8 100644 +index 0c2510e161..7fb98af308 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py -@@ -100,54 +100,7 @@ elif os.name == "posix": +@@ -100,53 +100,7 @@ def _is_elf(filename): return thefile.read(4) == elf_header def _findLib_gcc(name): @@ -62,12 +62,11 @@ index 0c2510e..79635a8 100644 - if not _is_elf(file): - continue - return os.fsdecode(file) -- + return None + if sys.platform == "sunos5": - # use /usr/ccs/bin/dump on solaris -@@ -268,34 +221,7 @@ elif os.name == "posix": +@@ -268,34 +222,7 @@ def find_library(name, is64 = False): else: def _findSoname_ldconfig(name): @@ -104,5 +103,5 @@ index 0c2510e..79635a8 100644 def _findLib_ld(name): # See issue #9998 for why this is needed -- -2.30.0 +2.33.1 diff --git a/pkgs/development/interpreters/python/cpython/3.5/force_bytecode_determinism.patch b/pkgs/development/interpreters/python/cpython/3.5/force_bytecode_determinism.patch deleted file mode 100644 index c263cdbff4db..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.5/force_bytecode_determinism.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/Lib/py_compile.py -+++ b/Lib/py_compile.py -@@ -139,3 +139,4 @@ - source_stats = loader.path_stats(file) -+ source_mtime = 1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'] - bytecode = importlib._bootstrap_external._code_to_bytecode( -- code, source_stats['mtime'], source_stats['size']) -+ code, source_mtime, source_stats['size']) ---- a/Lib/importlib/_bootstrap_external.py -+++ b/Lib/importlib/_bootstrap_external.py -@@ -485,5 +485,5 @@ - if source_stats is not None: - try: -- source_mtime = int(source_stats['mtime']) -+ source_mtime = 1 - except KeyError: - pass diff --git a/pkgs/development/interpreters/python/cpython/3.5/ld_library_path.patch b/pkgs/development/interpreters/python/cpython/3.5/ld_library_path.patch deleted file mode 100644 index 013c2d266eff..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.5/ld_library_path.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 918201682127ed8a270a4bd1a448b490019e4ada Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk -Date: Thu, 14 Sep 2017 10:00:31 +0200 -Subject: [PATCH] ctypes.util: support LD_LIBRARY_PATH - -Backports support for LD_LIBRARY_PATH from 3.6 ---- - Lib/ctypes/util.py | 26 +++++++++++++++++++++++++- - 1 file changed, 25 insertions(+), 1 deletion(-) - -diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index e9957d7951..9926f6c881 100644 ---- a/Lib/ctypes/util.py -+++ b/Lib/ctypes/util.py -@@ -219,8 +219,32 @@ elif os.name == "posix": - def _findSoname_ldconfig(name): - return None - -+ def _findLib_ld(name): -+ # See issue #9998 for why this is needed -+ expr = r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name) -+ cmd = ['ld', '-t'] -+ libpath = os.environ.get('LD_LIBRARY_PATH') -+ if libpath: -+ for d in libpath.split(':'): -+ cmd.extend(['-L', d]) -+ cmd.extend(['-o', os.devnull, '-l%s' % name]) -+ result = None -+ try: -+ p = subprocess.Popen(cmd, stdout=subprocess.PIPE, -+ stderr=subprocess.PIPE, -+ universal_newlines=True) -+ out, _ = p.communicate() -+ res = re.search(expr, os.fsdecode(out)) -+ if res: -+ result = res.group(0) -+ except Exception as e: -+ pass # result will be None -+ return result -+ - def find_library(name): -- return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name)) -+ # See issue #9998 -+ return _findSoname_ldconfig(name) or \ -+ _get_soname(_findLib_gcc(name) or _findLib_ld(name)) - - ################################################################ - # test code --- -2.14.1 - diff --git a/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch deleted file mode 100644 index 9718b1d8dceb..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 590c46bb04f79ab611b2f8fd682dd7e43a01f268 Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk -Date: Mon, 28 Aug 2017 09:24:06 +0200 -Subject: [PATCH] Don't use ldconfig and speed up uuid load - ---- - Lib/ctypes/util.py | 70 ++---------------------------------------------------- - Lib/uuid.py | 49 -------------------------------------- - 2 files changed, 2 insertions(+), 117 deletions(-) - -diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 7684eab81d..e9957d7951 100644 ---- a/Lib/ctypes/util.py -+++ b/Lib/ctypes/util.py -@@ -95,46 +95,7 @@ elif os.name == "posix": - import re, tempfile - - def _findLib_gcc(name): -- # Run GCC's linker with the -t (aka --trace) option and examine the -- # library name it prints out. The GCC command will fail because we -- # haven't supplied a proper program with main(), but that does not -- # matter. -- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) -- -- c_compiler = shutil.which('gcc') -- if not c_compiler: -- c_compiler = shutil.which('cc') -- if not c_compiler: -- # No C compiler available, give up -- return None -- -- temp = tempfile.NamedTemporaryFile() -- try: -- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] -- -- env = dict(os.environ) -- env['LC_ALL'] = 'C' -- env['LANG'] = 'C' -- try: -- proc = subprocess.Popen(args, -- stdout=subprocess.PIPE, -- stderr=subprocess.STDOUT, -- env=env) -- except OSError: # E.g. bad executable -- return None -- with proc: -- trace = proc.stdout.read() -- finally: -- try: -- temp.close() -- except FileNotFoundError: -- # Raised if the file was already removed, which is the normal -- # behaviour of GCC if linking fails -- pass -- res = re.search(expr, trace) -- if not res: -- return None -- return os.fsdecode(res.group(0)) -+ return None - - - if sys.platform == "sunos5": -@@ -256,34 +217,7 @@ elif os.name == "posix": - else: - - def _findSoname_ldconfig(name): -- import struct -- if struct.calcsize('l') == 4: -- machine = os.uname().machine + '-32' -- else: -- machine = os.uname().machine + '-64' -- mach_map = { -- 'x86_64-64': 'libc6,x86-64', -- 'ppc64-64': 'libc6,64bit', -- 'sparc64-64': 'libc6,64bit', -- 's390x-64': 'libc6,64bit', -- 'ia64-64': 'libc6,IA-64', -- } -- abi_type = mach_map.get(machine, 'libc6') -- -- # XXX assuming GLIBC's ldconfig (with option -p) -- regex = os.fsencode( -- '\s+(lib%s\.[^\s]+)\s+\(%s' % (re.escape(name), abi_type)) -- try: -- with subprocess.Popen(['/sbin/ldconfig', '-p'], -- stdin=subprocess.DEVNULL, -- stderr=subprocess.DEVNULL, -- stdout=subprocess.PIPE, -- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: -- res = re.search(regex, p.stdout.read()) -- if res: -- return os.fsdecode(res.group(1)) -- except OSError: -- pass -+ return None - - def find_library(name): - return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name)) -diff --git a/Lib/uuid.py b/Lib/uuid.py -index e96e7e034c..31160ace95 100644 ---- a/Lib/uuid.py -+++ b/Lib/uuid.py -@@ -455,58 +455,9 @@ def _netbios_getnode(): - continue - return int.from_bytes(bytes, 'big') - --# Thanks to Thomas Heller for ctypes and for his help with its use here. - --# If ctypes is available, use it to find system routines for UUID generation. --# XXX This makes the module non-thread-safe! - _uuid_generate_time = _UuidCreate = None --try: -- import ctypes, ctypes.util -- import sys - -- # The uuid_generate_* routines are provided by libuuid on at least -- # Linux and FreeBSD, and provided by libc on Mac OS X. -- _libnames = ['uuid'] -- if not sys.platform.startswith('win'): -- _libnames.append('c') -- for libname in _libnames: -- try: -- lib = ctypes.CDLL(ctypes.util.find_library(libname)) -- except Exception: -- continue -- if hasattr(lib, 'uuid_generate_time'): -- _uuid_generate_time = lib.uuid_generate_time -- break -- del _libnames -- -- # The uuid_generate_* functions are broken on MacOS X 10.5, as noted -- # in issue #8621 the function generates the same sequence of values -- # in the parent process and all children created using fork (unless -- # those children use exec as well). -- # -- # Assume that the uuid_generate functions are broken from 10.5 onward, -- # the test can be adjusted when a later version is fixed. -- if sys.platform == 'darwin': -- import os -- if int(os.uname().release.split('.')[0]) >= 9: -- _uuid_generate_time = None -- -- # On Windows prior to 2000, UuidCreate gives a UUID containing the -- # hardware address. On Windows 2000 and later, UuidCreate makes a -- # random UUID and UuidCreateSequential gives a UUID containing the -- # hardware address. These routines are provided by the RPC runtime. -- # NOTE: at least on Tim's WinXP Pro SP2 desktop box, while the last -- # 6 bytes returned by UuidCreateSequential are fixed, they don't appear -- # to bear any relationship to the MAC address of any network device -- # on the box. -- try: -- lib = ctypes.windll.rpcrt4 -- except: -- lib = None -- _UuidCreate = getattr(lib, 'UuidCreateSequential', -- getattr(lib, 'UuidCreate', None)) --except: -- pass - - def _unixdll_getnode(): - """Get the hardware address on Unix using ctypes.""" --- -2.14.1 - diff --git a/pkgs/development/interpreters/python/cpython/3.5/profile-task.patch b/pkgs/development/interpreters/python/cpython/3.5/profile-task.patch deleted file mode 100644 index 39d5587379ca..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.5/profile-task.patch +++ /dev/null @@ -1,21 +0,0 @@ -Backport from CPython 3.8 of a good list of tests to run for PGO. - -Upstream commit: - https://github.com/python/cpython/commit/4e16a4a31 - -Upstream discussion: - https://bugs.python.org/issue36044 - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 00fdd21ce..713dc1e53 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -259,7 +259,7 @@ TCLTK_LIBS= - # The task to run while instrumented when building the profile-opt target. - # We exclude unittests with -x that take a rediculious amount of time to - # run in the instrumented training build or do not provide much value. --PROFILE_TASK=-m test.regrtest --pgo -x test_asyncore test_gdb test_multiprocessing_fork test_multiprocessing_forkserver test_multiprocessing_main_handling test_multiprocessing_spawn test_subprocess -+PROFILE_TASK=-m test.regrtest --pgo test_array test_base64 test_binascii test_binop test_bisect test_bytes test_bz2 test_cmath test_codecs test_collections test_complex test_dataclasses test_datetime test_decimal test_difflib test_embed test_float test_fstring test_functools test_generators test_hashlib test_heapq test_int test_itertools test_json test_long test_lzma test_math test_memoryview test_operator test_ordered_dict test_pickle test_pprint test_re test_set test_sqlite test_statistics test_struct test_tabnanny test_time test_unicode test_xml_etree test_xml_etree_c - - # report files for gcov / lcov coverage report - COVERAGE_INFO= $(abs_builddir)/coverage.info diff --git a/pkgs/development/interpreters/python/cpython/3.5/python-3.x-distutils-C++.patch b/pkgs/development/interpreters/python/cpython/3.5/python-3.x-distutils-C++.patch deleted file mode 100644 index 01356020b394..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.5/python-3.x-distutils-C++.patch +++ /dev/null @@ -1,237 +0,0 @@ -Source: https://bugs.python.org/file47046/python-3.x-distutils-C++.patch ---- a/Lib/distutils/cygwinccompiler.py -+++ b/Lib/distutils/cygwinccompiler.py -@@ -125,8 +125,10 @@ - # dllwrap 2.10.90 is buggy - if self.ld_version >= "2.10.90": - self.linker_dll = "gcc" -+ self.linker_dll_cxx = "g++" - else: - self.linker_dll = "dllwrap" -+ self.linker_dll_cxx = "dllwrap" - - # ld_version >= "2.13" support -shared so use it instead of - # -mdll -static -@@ -140,9 +142,13 @@ - self.set_executables(compiler='gcc -mcygwin -O -Wall', - compiler_so='gcc -mcygwin -mdll -O -Wall', - compiler_cxx='g++ -mcygwin -O -Wall', -+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', - linker_exe='gcc -mcygwin', - linker_so=('%s -mcygwin %s' % -- (self.linker_dll, shared_option))) -+ (self.linker_dll, shared_option)), -+ linker_exe_cxx='g++ -mcygwin', -+ linker_so_cxx=('%s -mcygwin %s' % -+ (self.linker_dll_cxx, shared_option))) - - # cygwin and mingw32 need different sets of libraries - if self.gcc_version == "2.91.57": -@@ -166,8 +172,12 @@ - raise CompileError(msg) - else: # for other files use the C-compiler - try: -- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError as msg: - raise CompileError(msg) - -@@ -302,9 +312,14 @@ - self.set_executables(compiler='gcc -O -Wall', - compiler_so='gcc -mdll -O -Wall', - compiler_cxx='g++ -O -Wall', -+ compiler_so_cxx='g++ -mdll -O -Wall', - linker_exe='gcc', - linker_so='%s %s %s' - % (self.linker_dll, shared_option, -+ entry_point), -+ linker_exe_cxx='g++', -+ linker_so_cxx='%s %s %s' -+ % (self.linker_dll_cxx, shared_option, - entry_point)) - # Maybe we should also append -mthreads, but then the finished - # dlls need another dll (mingwm10.dll see Mingw32 docs) ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -184,9 +184,11 @@ - _osx_support.customize_compiler(_config_vars) - _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' - -- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ -- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', -- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') -+ (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ -+ get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') -+ -+ cxxflags = cflags - - if 'CC' in os.environ: - newcc = os.environ['CC'] -@@ -201,19 +204,27 @@ - cxx = os.environ['CXX'] - if 'LDSHARED' in os.environ: - ldshared = os.environ['LDSHARED'] -+ if 'LDCXXSHARED' in os.environ: -+ ldcxxshared = os.environ['LDCXXSHARED'] - if 'CPP' in os.environ: - cpp = os.environ['CPP'] - else: - cpp = cc + " -E" # not always - if 'LDFLAGS' in os.environ: - ldshared = ldshared + ' ' + os.environ['LDFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] - if 'CFLAGS' in os.environ: -- cflags = opt + ' ' + os.environ['CFLAGS'] -+ cflags = os.environ['CFLAGS'] - ldshared = ldshared + ' ' + os.environ['CFLAGS'] -+ if 'CXXFLAGS' in os.environ: -+ cxxflags = os.environ['CXXFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] - if 'CPPFLAGS' in os.environ: - cpp = cpp + ' ' + os.environ['CPPFLAGS'] - cflags = cflags + ' ' + os.environ['CPPFLAGS'] -+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] - ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] - if 'AR' in os.environ: - ar = os.environ['AR'] - if 'ARFLAGS' in os.environ: -@@ -222,13 +233,17 @@ - archiver = ar + ' ' + ar_flags - - cc_cmd = cc + ' ' + cflags -+ cxx_cmd = cxx + ' ' + cxxflags - compiler.set_executables( - preprocessor=cpp, - compiler=cc_cmd, - compiler_so=cc_cmd + ' ' + ccshared, -- compiler_cxx=cxx, -+ compiler_cxx=cxx_cmd, -+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, - linker_so=ldshared, - linker_exe=cc, -+ linker_so_cxx=ldcxxshared, -+ linker_exe_cxx=cxx, - archiver=archiver) - - compiler.shared_lib_extension = shlib_suffix ---- a/Lib/distutils/unixccompiler.py -+++ b/Lib/distutils/unixccompiler.py -@@ -52,14 +52,17 @@ - # are pretty generic; they will probably have to be set by an outsider - # (eg. using information discovered by the sysconfig about building - # Python extensions). -- executables = {'preprocessor' : None, -- 'compiler' : ["cc"], -- 'compiler_so' : ["cc"], -- 'compiler_cxx' : ["cc"], -- 'linker_so' : ["cc", "-shared"], -- 'linker_exe' : ["cc"], -- 'archiver' : ["ar", "-cr"], -- 'ranlib' : None, -+ executables = {'preprocessor' : None, -+ 'compiler' : ["cc"], -+ 'compiler_so' : ["cc"], -+ 'compiler_cxx' : ["c++"], -+ 'compiler_so_cxx' : ["c++"], -+ 'linker_so' : ["cc", "-shared"], -+ 'linker_exe' : ["cc"], -+ 'linker_so_cxx' : ["c++", "-shared"], -+ 'linker_exe_cxx' : ["c++"], -+ 'archiver' : ["ar", "-cr"], -+ 'ranlib' : None, - } - - if sys.platform[:6] == "darwin": -@@ -108,12 +111,19 @@ - - def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): - compiler_so = self.compiler_so -+ compiler_so_cxx = self.compiler_so_cxx - if sys.platform == 'darwin': - compiler_so = _osx_support.compiler_fixup(compiler_so, - cc_args + extra_postargs) -+ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, -+ cc_args + extra_postargs) - try: -- self.spawn(compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError as msg: - raise CompileError(msg) - -@@ -171,22 +181,16 @@ - ld_args.extend(extra_postargs) - self.mkpath(os.path.dirname(output_filename)) - try: -- if target_desc == CCompiler.EXECUTABLE: -- linker = self.linker_exe[:] -+ if target_lang == "c++": -+ if target_desc == CCompiler.EXECUTABLE: -+ linker = self.linker_exe_cxx[:] -+ else: -+ linker = self.linker_so_cxx[:] - else: -- linker = self.linker_so[:] -- if target_lang == "c++" and self.compiler_cxx: -- # skip over environment variable settings if /usr/bin/env -- # is used to set up the linker's environment. -- # This is needed on OSX. Note: this assumes that the -- # normal and C++ compiler have the same environment -- # settings. -- i = 0 -- if os.path.basename(linker[0]) == "env": -- i = 1 -- while '=' in linker[i]: -- i += 1 -- linker[i] = self.compiler_cxx[i] -+ if target_desc == CCompiler.EXECUTABLE: -+ linker = self.linker_exe[:] -+ else: -+ linker = self.linker_so[:] - - if sys.platform == 'darwin': - linker = _osx_support.compiler_fixup(linker, ld_args) ---- a/Lib/_osx_support.py -+++ b/Lib/_osx_support.py -@@ -14,13 +14,13 @@ - # configuration variables that may contain universal build flags, - # like "-arch" or "-isdkroot", that may need customization for - # the user environment --_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', -- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', -- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', -- 'PY_CORE_CFLAGS') -+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', -+ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', -+ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS') - - # configuration variables that may contain compiler calls --_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') -+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') - - # prefix added to original configuration variable names - _INITPRE = '_OSX_SUPPORT_INITIAL_' ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -538,7 +538,7 @@ - *\ -s*|s*) quiet="-q";; \ - *) quiet="";; \ - esac; \ -- $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ -+ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \ - _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ - $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build diff --git a/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch deleted file mode 100644 index b73f62b97ec5..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/setup.py b/setup.py -index 2779658..902d0eb 100644 ---- a/setup.py -+++ b/setup.py -@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext): - # Rather than complicate the code below, detecting and building - # AquaTk is a separate method. Only one Tkinter will be built on - # Darwin - either AquaTk, if it is found, or X11 based Tk. -- if (host_platform == 'darwin' and -- self.detect_tkinter_darwin(inc_dirs, lib_dirs)): -- return - - # Assume we haven't found any of the libraries or include files - # The versions with dots are used on Unix, and the versions without -@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext): - if dir not in include_dirs: - include_dirs.append(dir) - -- # Check for various platform-specific directories -- if host_platform == 'sunos5': -- include_dirs.append('/usr/openwin/include') -- added_lib_dirs.append('/usr/openwin/lib') -- elif os.path.exists('/usr/X11R6/include'): -- include_dirs.append('/usr/X11R6/include') -- added_lib_dirs.append('/usr/X11R6/lib64') -- added_lib_dirs.append('/usr/X11R6/lib') -- elif os.path.exists('/usr/X11R5/include'): -- include_dirs.append('/usr/X11R5/include') -- added_lib_dirs.append('/usr/X11R5/lib') -- else: -- # Assume default location for X11 -- include_dirs.append('/usr/X11/include') -- added_lib_dirs.append('/usr/X11/lib') -- - # If Cygwin, then verify that X is installed before proceeding - if host_platform == 'cygwin': - x11_inc = find_file('X11/Xlib.h', [], include_dirs) -@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext): - if host_platform in ['aix3', 'aix4']: - libs.append('ld') - -- # Finally, link with the X11 libraries (not appropriate on cygwin) -- if host_platform != "cygwin": -- libs.append('X11') -- - ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], - define_macros=[('WITH_APPINIT', 1)] + defs, - include_dirs = include_dirs, diff --git a/pkgs/development/interpreters/python/cpython/3.6/find_library.patch b/pkgs/development/interpreters/python/cpython/3.6/find_library.patch deleted file mode 100644 index 97fb66662d03..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.6/find_library.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 9b5a023a5dc3127da15253f7acad71019395ebe1 Mon Sep 17 00:00:00 2001 -From: Pablo Galindo -Date: Thu, 8 Oct 2020 19:50:37 +0100 -Subject: [PATCH] [3.7] bpo-41976: Fix the fallback to gcc of - ctypes.util.find_library when using gcc>9 (GH-22598). (GH-22601) - -(cherry picked from commit 27ac19cca2c639caaf6fedf3632fe6beb265f24f) - -Co-authored-by: Pablo Galindo ---- - Lib/ctypes/test/test_find.py | 12 ++++++- - Lib/ctypes/util.py | 32 +++++++++++++++---- - .../2020-10-08-18-22-28.bpo-41976.Svm0wb.rst | 3 ++ - 3 files changed, 39 insertions(+), 8 deletions(-) - create mode 100644 Misc/NEWS.d/next/Library/2020-10-08-18-22-28.bpo-41976.Svm0wb.rst - -diff --git a/Lib/ctypes/test/test_find.py b/Lib/ctypes/test/test_find.py -index b99fdcba7b28f..92ac1840ad7d4 100644 ---- a/Lib/ctypes/test/test_find.py -+++ b/Lib/ctypes/test/test_find.py -@@ -1,4 +1,5 @@ - import unittest -+import unittest.mock - import os.path - import sys - import test.support -@@ -72,7 +73,7 @@ def test_shell_injection(self): - - @unittest.skipUnless(sys.platform.startswith('linux'), - 'Test only valid for Linux') --class LibPathFindTest(unittest.TestCase): -+class FindLibraryLinux(unittest.TestCase): - def test_find_on_libpath(self): - import subprocess - import tempfile -@@ -111,6 +112,15 @@ def test_find_on_libpath(self): - # LD_LIBRARY_PATH) - self.assertEqual(find_library(libname), 'lib%s.so' % libname) - -+ def test_find_library_with_gcc(self): -+ with unittest.mock.patch("ctypes.util._findSoname_ldconfig", lambda *args: None): -+ self.assertNotEqual(find_library('c'), None) -+ -+ def test_find_library_with_ld(self): -+ with unittest.mock.patch("ctypes.util._findSoname_ldconfig", lambda *args: None), \ -+ unittest.mock.patch("ctypes.util._findLib_gcc", lambda *args: None): -+ self.assertNotEqual(find_library('c'), None) -+ - - if __name__ == "__main__": - unittest.main() -diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 97973bce001d9..0c2510e1619c8 100644 ---- a/Lib/ctypes/util.py -+++ b/Lib/ctypes/util.py -@@ -93,6 +93,12 @@ def find_library(name): - # Andreas Degert's find functions, using gcc, /sbin/ldconfig, objdump - import re, tempfile - -+ def _is_elf(filename): -+ "Return True if the given file is an ELF file" -+ elf_header = b'\x7fELF' -+ with open(filename, 'br') as thefile: -+ return thefile.read(4) == elf_header -+ - def _findLib_gcc(name): - # Run GCC's linker with the -t (aka --trace) option and examine the - # library name it prints out. The GCC command will fail because we -@@ -299,17 +312,22 @@ def _findLib_ld(name): - stderr=subprocess.PIPE, - universal_newlines=True) - out, _ = p.communicate() -- res = re.search(expr, os.fsdecode(out)) -- if res: -- result = res.group(0) -- except Exception as e: -+ res = re.findall(expr, os.fsdecode(out)) -+ for file in res: -+ # Check if the given file is an elf file: gcc can report -+ # some files that are linker scripts and not actual -+ # shared objects. See bpo-41976 for more details -+ if not _is_elf(file): -+ continue -+ return os.fsdecode(file) -+ except Exception: - pass # result will be None - return result - - def find_library(name): - # See issue #9998 - return _findSoname_ldconfig(name) or \ -- _get_soname(_findLib_gcc(name) or _findLib_ld(name)) -+ _get_soname(_findLib_gcc(name)) or _get_soname(_findLib_ld(name)) - - ################################################################ - # test code -diff --git a/Misc/NEWS.d/next/Library/2020-10-08-18-22-28.bpo-41976.Svm0wb.rst b/Misc/NEWS.d/next/Library/2020-10-08-18-22-28.bpo-41976.Svm0wb.rst -new file mode 100644 -index 0000000000000..c8b3fc771845e ---- /dev/null -+++ b/Misc/NEWS.d/next/Library/2020-10-08-18-22-28.bpo-41976.Svm0wb.rst -@@ -0,0 +1,3 @@ -+Fixed a bug that was causing :func:`ctypes.util.find_library` to return -+``None`` when triying to locate a library in an environment when gcc>=9 is -+available and ``ldconfig`` is not. Patch by Pablo Galindo diff --git a/pkgs/development/interpreters/python/cpython/3.6/fix-finding-headers-when-cross-compiling.patch b/pkgs/development/interpreters/python/cpython/3.6/fix-finding-headers-when-cross-compiling.patch deleted file mode 100644 index d324d10b39fc..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.6/fix-finding-headers-when-cross-compiling.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 45dfbbb4f5b67ab83e4365564ea569334e979f8e Mon Sep 17 00:00:00 2001 -From: Ben Wolsieffer -Date: Fri, 25 Sep 2020 16:49:16 -0400 -Subject: [PATCH] Fix finding headers when cross compiling - -When cross-compiling third-party extensions, get_python_inc() may be called to -return the path to Python's headers. However, it uses the sys.prefix or -sys.exec_prefix of the build Python, which returns incorrect paths when -cross-compiling (paths pointing to build system headers). - -To fix this, we use the INCLUDEPY and CONFINCLUDEPY conf variables, which can -be configured to point at host Python by setting _PYTHON_SYSCONFIGDATA_NAME. -The existing behavior is maintained on non-POSIX platforms or if a prefix is -manually specified. ---- - Lib/distutils/sysconfig.py | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 2bcd1dd288..567375e488 100644 ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -84,8 +84,6 @@ def get_python_inc(plat_specific=0, prefix=None): - If 'prefix' is supplied, use it instead of sys.base_prefix or - sys.base_exec_prefix -- i.e., ignore 'plat_specific'. - """ -- if prefix is None: -- prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX - if os.name == "posix": - if python_build: - # Assume the executable is in the build directory. The -@@ -98,9 +96,17 @@ def get_python_inc(plat_specific=0, prefix=None): - else: - incdir = os.path.join(get_config_var('srcdir'), 'Include') - return os.path.normpath(incdir) -- python_dir = 'python' + get_python_version() + build_flags -- return os.path.join(prefix, "include", python_dir) -+ if prefix is None: -+ if plat_specific: -+ return get_config_var('CONFINCLUDEPY') -+ else: -+ return get_config_var('INCLUDEPY') -+ else: -+ python_dir = 'python' + get_python_version() + build_flags -+ return os.path.join(prefix, "include", python_dir) - elif os.name == "nt": -+ if prefix is None: -+ prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX - return os.path.join(prefix, "include") - else: - raise DistutilsPlatformError( --- -2.28.0 - diff --git a/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch deleted file mode 100644 index 0f829860a5b7..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 105621b99cc30615c79b5aa3d12d6732e14b0d59 Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk -Date: Mon, 28 Aug 2017 09:24:06 +0200 -Subject: [PATCH] Don't use ldconfig and speed up uuid load - ---- - Lib/ctypes/util.py | 70 ++---------------------------------------------------- - Lib/uuid.py | 48 ------------------------------------- - 2 files changed, 2 insertions(+), 116 deletions(-) - -diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 339ae8aa8a..2944985c30 100644 ---- a/Lib/ctypes/util.py -+++ b/Lib/ctypes/util.py -@@ -85,46 +85,7 @@ elif os.name == "posix": - import re, tempfile - - def _findLib_gcc(name): -- # Run GCC's linker with the -t (aka --trace) option and examine the -- # library name it prints out. The GCC command will fail because we -- # haven't supplied a proper program with main(), but that does not -- # matter. -- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) -- -- c_compiler = shutil.which('gcc') -- if not c_compiler: -- c_compiler = shutil.which('cc') -- if not c_compiler: -- # No C compiler available, give up -- return None -- -- temp = tempfile.NamedTemporaryFile() -- try: -- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] -- -- env = dict(os.environ) -- env['LC_ALL'] = 'C' -- env['LANG'] = 'C' -- try: -- proc = subprocess.Popen(args, -- stdout=subprocess.PIPE, -- stderr=subprocess.STDOUT, -- env=env) -- except OSError: # E.g. bad executable -- return None -- with proc: -- trace = proc.stdout.read() -- finally: -- try: -- temp.close() -- except FileNotFoundError: -- # Raised if the file was already removed, which is the normal -- # behaviour of GCC if linking fails -- pass -- res = re.search(expr, trace) -- if not res: -- return None -- return os.fsdecode(res.group(0)) -+ return None - - - if sys.platform == "sunos5": -@@ -246,34 +207,7 @@ elif os.name == "posix": - else: - - def _findSoname_ldconfig(name): -- import struct -- if struct.calcsize('l') == 4: -- machine = os.uname().machine + '-32' -- else: -- machine = os.uname().machine + '-64' -- mach_map = { -- 'x86_64-64': 'libc6,x86-64', -- 'ppc64-64': 'libc6,64bit', -- 'sparc64-64': 'libc6,64bit', -- 's390x-64': 'libc6,64bit', -- 'ia64-64': 'libc6,IA-64', -- } -- abi_type = mach_map.get(machine, 'libc6') -- -- # XXX assuming GLIBC's ldconfig (with option -p) -- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' -- regex = os.fsencode(regex % (re.escape(name), abi_type)) -- try: -- with subprocess.Popen(['/sbin/ldconfig', '-p'], -- stdin=subprocess.DEVNULL, -- stderr=subprocess.DEVNULL, -- stdout=subprocess.PIPE, -- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: -- res = re.search(regex, p.stdout.read()) -- if res: -- return os.fsdecode(res.group(1)) -- except OSError: -- pass -+ return None - - def _findLib_ld(name): - # See issue #9998 for why this is needed -diff --git a/Lib/uuid.py b/Lib/uuid.py -index 200c800b34..31160ace95 100644 ---- a/Lib/uuid.py -+++ b/Lib/uuid.py -@@ -455,57 +455,9 @@ def _netbios_getnode(): - continue - return int.from_bytes(bytes, 'big') - --# Thanks to Thomas Heller for ctypes and for his help with its use here. - --# If ctypes is available, use it to find system routines for UUID generation. --# XXX This makes the module non-thread-safe! - _uuid_generate_time = _UuidCreate = None --try: -- import ctypes, ctypes.util -- import sys - -- # The uuid_generate_* routines are provided by libuuid on at least -- # Linux and FreeBSD, and provided by libc on Mac OS X. -- _libnames = ['uuid'] -- if not sys.platform.startswith('win'): -- _libnames.append('c') -- for libname in _libnames: -- try: -- lib = ctypes.CDLL(ctypes.util.find_library(libname)) -- except Exception: -- continue -- if hasattr(lib, 'uuid_generate_time'): -- _uuid_generate_time = lib.uuid_generate_time -- break -- del _libnames -- -- # The uuid_generate_* functions are broken on MacOS X 10.5, as noted -- # in issue #8621 the function generates the same sequence of values -- # in the parent process and all children created using fork (unless -- # those children use exec as well). -- # -- # Assume that the uuid_generate functions are broken from 10.5 onward, -- # the test can be adjusted when a later version is fixed. -- if sys.platform == 'darwin': -- if int(os.uname().release.split('.')[0]) >= 9: -- _uuid_generate_time = None -- -- # On Windows prior to 2000, UuidCreate gives a UUID containing the -- # hardware address. On Windows 2000 and later, UuidCreate makes a -- # random UUID and UuidCreateSequential gives a UUID containing the -- # hardware address. These routines are provided by the RPC runtime. -- # NOTE: at least on Tim's WinXP Pro SP2 desktop box, while the last -- # 6 bytes returned by UuidCreateSequential are fixed, they don't appear -- # to bear any relationship to the MAC address of any network device -- # on the box. -- try: -- lib = ctypes.windll.rpcrt4 -- except: -- lib = None -- _UuidCreate = getattr(lib, 'UuidCreateSequential', -- getattr(lib, 'UuidCreate', None)) --except: -- pass - - def _unixdll_getnode(): - """Get the hardware address on Unix using ctypes.""" --- -2.14.1 - diff --git a/pkgs/development/interpreters/python/cpython/3.6/profile-task.patch b/pkgs/development/interpreters/python/cpython/3.6/profile-task.patch deleted file mode 100644 index df55da3a4132..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.6/profile-task.patch +++ /dev/null @@ -1,21 +0,0 @@ -Backport from CPython 3.8 of a good list of tests to run for PGO. - -Upstream commit: - https://github.com/python/cpython/commit/4e16a4a31 - -Upstream discussion: - https://bugs.python.org/issue36044 - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 00fdd21ce..713dc1e53 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -259,7 +259,7 @@ TCLTK_LIBS= - # The task to run while instrumented when building the profile-opt target. - # We exclude unittests with -x that take a rediculious amount of time to - # run in the instrumented training build or do not provide much value. --PROFILE_TASK=-m test.regrtest --pgo -+PROFILE_TASK=-m test.regrtest --pgo test_array test_base64 test_binascii test_binop test_bisect test_bytes test_bz2 test_cmath test_codecs test_collections test_complex test_dataclasses test_datetime test_decimal test_difflib test_embed test_float test_fstring test_functools test_generators test_hashlib test_heapq test_int test_itertools test_json test_long test_lzma test_math test_memoryview test_operator test_ordered_dict test_pickle test_pprint test_re test_set test_sqlite test_statistics test_struct test_tabnanny test_time test_unicode test_xml_etree test_xml_etree_c - - # report files for gcov / lcov coverage report - COVERAGE_INFO= $(abs_builddir)/coverage.info diff --git a/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch deleted file mode 100644 index b73f62b97ec5..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/setup.py b/setup.py -index 2779658..902d0eb 100644 ---- a/setup.py -+++ b/setup.py -@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext): - # Rather than complicate the code below, detecting and building - # AquaTk is a separate method. Only one Tkinter will be built on - # Darwin - either AquaTk, if it is found, or X11 based Tk. -- if (host_platform == 'darwin' and -- self.detect_tkinter_darwin(inc_dirs, lib_dirs)): -- return - - # Assume we haven't found any of the libraries or include files - # The versions with dots are used on Unix, and the versions without -@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext): - if dir not in include_dirs: - include_dirs.append(dir) - -- # Check for various platform-specific directories -- if host_platform == 'sunos5': -- include_dirs.append('/usr/openwin/include') -- added_lib_dirs.append('/usr/openwin/lib') -- elif os.path.exists('/usr/X11R6/include'): -- include_dirs.append('/usr/X11R6/include') -- added_lib_dirs.append('/usr/X11R6/lib64') -- added_lib_dirs.append('/usr/X11R6/lib') -- elif os.path.exists('/usr/X11R5/include'): -- include_dirs.append('/usr/X11R5/include') -- added_lib_dirs.append('/usr/X11R5/lib') -- else: -- # Assume default location for X11 -- include_dirs.append('/usr/X11/include') -- added_lib_dirs.append('/usr/X11/lib') -- - # If Cygwin, then verify that X is installed before proceeding - if host_platform == 'cygwin': - x11_inc = find_file('X11/Xlib.h', [], include_dirs) -@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext): - if host_platform in ['aix3', 'aix4']: - libs.append('ld') - -- # Finally, link with the X11 libraries (not appropriate on cygwin) -- if host_platform != "cygwin": -- libs.append('X11') -- - ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], - define_macros=[('WITH_APPINIT', 1)] + defs, - include_dirs = include_dirs, diff --git a/pkgs/development/interpreters/python/cpython/3.7/fix-hardcoded-path-checking-for-rpmbuild.patch b/pkgs/development/interpreters/python/cpython/3.7/fix-hardcoded-path-checking-for-rpmbuild.patch deleted file mode 100644 index bb3d992612d3..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.7/fix-hardcoded-path-checking-for-rpmbuild.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a612c481f6116955d420db5ae1fe4c1eb93eb2f2 Mon Sep 17 00:00:00 2001 -From: Marcin Niemira -Date: Sun, 9 Jun 2019 07:05:06 +1000 -Subject: [PATCH] bpo-11122: fix hardcoded path checking for rpmbuild in - bdist_rpm.py (GH-10594) (cherry picked from commit - 45a14942c969ed508b35abd5e116cb18f84ce5b4) - -Co-authored-by: Marcin Niemira ---- - Lib/distutils/command/bdist_rpm.py | 5 +---- - .../next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst | 1 + - 2 files changed, 2 insertions(+), 4 deletions(-) - create mode 100644 Misc/NEWS.d/next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst - -diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py -index 20ca7ac6dcffa..74381cc69a6ce 100644 ---- a/Lib/distutils/command/bdist_rpm.py -+++ b/Lib/distutils/command/bdist_rpm.py -@@ -309,10 +309,7 @@ def run(self): - - # build package - log.info("building RPMs") -- rpm_cmd = ['rpm'] -- if os.path.exists('/usr/bin/rpmbuild') or \ -- os.path.exists('/bin/rpmbuild'): -- rpm_cmd = ['rpmbuild'] -+ rpm_cmd = ['rpmbuild'] - - if self.source_only: # what kind of RPMs? - rpm_cmd.append('-bs') diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index e84b4918afb8..005858d31ef6 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -7,6 +7,7 @@ , mailcap, mimetypesSupport ? true , ncurses , openssl +, openssl_legacy , readline , sqlite , tcl ? null, tk ? null, tix ? null, libX11 ? null, xorgproto ? null, x11Support ? false @@ -76,6 +77,10 @@ assert lib.assertMsg (reproducibleBuild -> (!rebuildBytecode)) with lib; let + # some python packages need legacy ciphers, so we're using openssl 3, but with that config + # null check for Minimal + openssl' = if openssl != null then openssl_legacy else null; + buildPackages = pkgsBuildHost; inherit (passthru) pythonForBuild; @@ -116,7 +121,7 @@ let ]; buildInputs = filter (p: p != null) ([ - zlib bzip2 expat xz libffi gdbm sqlite readline ncurses openssl ] + zlib bzip2 expat xz libffi libxcrypt gdbm sqlite readline ncurses openssl' ] ++ optionals x11Support [ tcl tk libX11 xorgproto ] ++ optionals (bluezSupport && stdenv.isLinux) [ bluez ] ++ optionals stdenv.isDarwin [ configd ]) @@ -166,16 +171,27 @@ let else if isx86_32 then "i386" else parsed.cpu.name; pythonAbiName = - # python's build doesn't differentiate between musl and glibc in its - # abi detection, our wrapper should match. - if stdenv.hostPlatform.isMusl then - replaceStrings [ "musl" ] [ "gnu" ] parsed.abi.name - else parsed.abi.name; + # python's build doesn't support every gnu, and doesn't + # differentiate between musl and glibc, so we list those supported in + # here: + # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L724 + # Note: this is an approximation, as it doesn't take into account the CPU + # family, or the nixpkgs abi naming conventions. + if elem parsed.abi.name [ + "gnux32" + "gnueabihf" + "gnueabi" + "gnuabin32" + "gnuabi64" + "gnuspe" + ] + then parsed.abi.name + else "gnu"; multiarch = if isDarwin then "darwin" else "${multiarchCpu}-${parsed.kernel.name}-${pythonAbiName}"; - abiFlags = optionalString (isPy36 || isPy37) "m"; + abiFlags = optionalString isPy37 "m"; # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L78 pythonSysconfigdataName = "_sysconfigdata_${abiFlags}_${parsed.kernel.name}_${multiarch}"; @@ -209,7 +225,19 @@ in with passthru; stdenv.mkDerivation { substituteInPlace setup.py --replace /Library/Frameworks /no-such-path ''; - patches = [ + patches = optionals (version == "3.10.9") [ + # https://github.com/python/cpython/issues/100160 + ./3.10/asyncio-deprecation.patch + ] ++ optionals (version == "3.11.1") [ + # https://github.com/python/cpython/issues/100160 + (fetchpatch { + name = "asyncio-deprecation-3.11.patch"; + url = "https://github.com/python/cpython/commit/3fae04b10e2655a20a3aadb5e0d63e87206d0c67.diff"; + revert = true; + excludes = [ "Misc/NEWS.d/*" ]; + sha256 = "sha256-PmkXf2D9trtW1gXZilRIWgdg2Y47JfELq1z4DuG3wJY="; + }) + ] ++ [ # Disable the use of ldconfig in ctypes.util.find_library (since # ldconfig doesn't work on NixOS), and don't use # ctypes.util.find_library during the loading of the uuid module @@ -223,46 +251,21 @@ in with passthru; stdenv.mkDerivation { ] ++ optionals mimetypesSupport [ # Make the mimetypes module refer to the right file ./mimetypes.patch - ] ++ optionals (isPy35 || isPy36) [ - # Determinism: Write null timestamps when compiling python files. - ./3.5/force_bytecode_determinism.patch - ] ++ optionals isPy35 [ - # Backports support for LD_LIBRARY_PATH from 3.6 - ./3.5/ld_library_path.patch - ] ++ optionals (isPy35 || isPy36 || isPy37) [ - # Backport a fix for discovering `rpmbuild` command when doing `python setup.py bdist_rpm` to 3.5, 3.6, 3.7. - # See: https://bugs.python.org/issue11122 - ./3.7/fix-hardcoded-path-checking-for-rpmbuild.patch - # The workaround is for unittests on Win64, which we don't support. - # It does break aarch64-darwin, which we do support. See: - # * https://bugs.python.org/issue35523 - # * https://github.com/python/cpython/commit/e6b247c8e524 - ./3.7/no-win64-workaround.patch ] ++ optionals (pythonAtLeast "3.7" && pythonOlder "3.11") [ # Fix darwin build https://bugs.python.org/issue34027 ./3.7/darwin-libutil.patch ] ++ optionals (pythonAtLeast "3.11") [ ./3.11/darwin-libutil.patch - ] ++ optionals (pythonOlder "3.8") [ - # Backport from CPython 3.8 of a good list of tests to run for PGO. - ( - if isPy36 || isPy37 then - ./3.6/profile-task.patch - else - ./3.5/profile-task.patch - ) ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.isDarwin) [ # Stop checking for TCL/TK in global macOS locations ./3.9/darwin-tcl-tk.patch - ] ++ optionals (isPy3k && hasDistutilsCxxPatch) [ + ] ++ optionals (isPy3k && hasDistutilsCxxPatch && pythonOlder "3.12") [ # Fix for http://bugs.python.org/issue1222585 # Upstream distutils is calling C compiler to compile C++ code, which # only works for GCC and Apple Clang. This makes distutils to call C++ # compiler when needed. ( - if isPy35 then - ./3.5/python-3.x-distutils-C++.patch - else if pythonAtLeast "3.7" && pythonOlder "3.11" then + if pythonAtLeast "3.7" && pythonOlder "3.11" then ./3.7/python-3.x-distutils-C++.patch else if pythonAtLeast "3.11" then ./3.11/python-3.x-distutils-C++.patch @@ -272,19 +275,11 @@ in with passthru; stdenv.mkDerivation { sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2"; } ) - ] ++ [ + ] ++ optionals (pythonOlder "3.12") [ # LDSHARED now uses $CC instead of gcc. Fixes cross-compilation of extension modules. ./3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch # Use sysconfigdata to find headers. Fixes cross-compilation of extension modules. - ( - if isPy36 then - ./3.6/fix-finding-headers-when-cross-compiling.patch - else - ./3.7/fix-finding-headers-when-cross-compiling.patch - ) - ] ++ optionals (isPy36) [ - # Backport a fix for ctypes.util.find_library. - ./3.6/find_library.patch + ./3.7/fix-finding-headers-when-cross-compiling.patch ]; postPatch = '' @@ -297,15 +292,17 @@ in with passthru; stdenv.mkDerivation { substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; - CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs); - LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs); - LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"}"; - NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) ({ - "glibc" = "-lgcc_s"; - "musl" = "-lgcc_eh"; - }."${stdenv.hostPlatform.libc}" or ""); - # Determinism: We fix the hashes of str, bytes and datetime objects. - PYTHONHASHSEED=0; + env = { + CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs); + LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs); + LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"}"; + NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) ({ + "glibc" = "-lgcc_s"; + "musl" = "-lgcc_eh"; + }."${stdenv.hostPlatform.libc}" or ""); + # Determinism: We fix the hashes of str, bytes and datetime objects. + PYTHONHASHSEED=0; + }; configureFlags = [ "--without-ensurepip" @@ -322,8 +319,11 @@ in with passthru; stdenv.mkDerivation { "--with-threads" ] ++ optionals (sqlite != null && isPy3k) [ "--enable-loadable-sqlite-extensions" - ] ++ optionals (openssl != null) [ - "--with-openssl=${openssl.dev}" + ] ++ optionals (openssl' != null) [ + "--with-openssl=${openssl'.dev}" + ] ++ optionals (libxcrypt != null) [ + "CFLAGS=-I${libxcrypt}/include" + "LIBS=-L${libxcrypt}/lib" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_buggy_getaddrinfo=no" # Assume little-endian IEEE 754 floating point when cross compiling @@ -349,14 +349,11 @@ in with passthru; stdenv.mkDerivation { # Never even try to use lchmod on linux, # don't rely on detecting glibc-isms. "ac_cv_func_lchmod=no" - ] ++ optionals (libxcrypt != null) [ - "CFLAGS=-I${libxcrypt}/include" - "LIBS=-L${libxcrypt}/lib" ] ++ optionals tzdataSupport [ "--with-tzpath=${tzdata}/share/zoneinfo" ] ++ optional static "LDFLAGS=-static"; - preConfigure = '' + preConfigure = optionalString (pythonOlder "3.12") '' for i in /usr /sw /opt /pkg; do # improve purity substituteInPlace ./setup.py --replace $i /no-such-path done @@ -488,7 +485,7 @@ in with passthru; stdenv.mkDerivation { # Enforce that we don't have references to the OpenSSL -dev package, which we # explicitly specify in our configure flags above. disallowedReferences = - lib.optionals (openssl != null && !static) [ openssl.dev ] + lib.optionals (openssl' != null && !static) [ openssl'.dev ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Ensure we don't have references to build-time packages. # These typically end up in shebangs. @@ -502,7 +499,15 @@ in with passthru; stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homepage = "http://python.org"; + homepage = "https://www.python.org"; + changelog = let + majorMinor = lib.versions.majorMinor version; + dashedVersion = lib.replaceStrings [ "." "a" ] [ "-" "-alpha-" ] version; + in + if sourceVersion.suffix == "" then + "https://docs.python.org/release/${version}/whatsnew/changelog.html" + else + "https://docs.python.org/${majorMinor}/whatsnew/changelog.html#python-${dashedVersion}"; description = "A high-level dynamically-typed programming language"; longDescription = '' Python is a remarkably powerful dynamic programming language that diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix deleted file mode 100644 index 2e399aa52fcd..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - pname = "python37-docs-html"; - version = "3.7.2"; - - src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-html.tar.bz2"; - sha256 = "19wbrawpdam09fmyipfy92sxwn1rl93v8jkfqsfx028qhvzf0422"; - }; - installPhase = '' - mkdir -p $out/share/doc/python37 - cp -R ./ $out/share/doc/python37/html - ''; - meta = { - maintainers = [ ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix deleted file mode 100644 index 9879a26be525..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - pname = "python37-docs-pdf-a4"; - version = "3.7.2"; - - src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-pdf-a4.tar.bz2"; - sha256 = "0vdx762m30hjaabn6w88awcj2qpbz0b6z59zn9wmamd35k59lfba"; - }; - installPhase = '' - mkdir -p $out/share/doc/python37 - cp -R ./ $out/share/doc/python37/pdf-a4 - ''; - meta = { - maintainers = [ ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix deleted file mode 100644 index 7c58c45776e7..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - pname = "python37-docs-pdf-letter"; - version = "3.7.2"; - - src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-pdf-letter.tar.bz2"; - sha256 = "17g57vlyvqx0k916q84q2pcx7y8myw0fda9fvg9kh0ph930c837x"; - }; - installPhase = '' - mkdir -p $out/share/doc/python37 - cp -R ./ $out/share/doc/python37/pdf-letter - ''; - meta = { - maintainers = [ ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix deleted file mode 100644 index 641e4913f65a..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - pname = "python37-docs-text"; - version = "3.7.2"; - - src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-text.tar.bz2"; - sha256 = "0h50rlr8jclwfxa106b42q2vn2ynp219c4zsy5qz65n5m3b7y1g2"; - }; - installPhase = '' - mkdir -p $out/share/doc/python37 - cp -R ./ $out/share/doc/python37/text - ''; - meta = { - maintainers = [ ]; - }; -} diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 12f9c50535d0..0f0a3f5e6746 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -5,9 +5,8 @@ , db , lib , libffiBoot -, newScope +, makeScopeWithSplicing , pythonPackagesExtensions -, splicePackages , stdenv }: @@ -37,8 +36,12 @@ stdenv ]; providesSetupHook = lib.attrByPath [ "provides" "setupHook"] false; - valid = value: !((lib.isDerivation value) && !((pythonPackages.hasPythonModule value) || (providesSetupHook value))) || (lib.elem value exceptions); - func = name: value: if (valid value) then value else throw "${name} should use `buildPythonPackage` or `toPythonModule` if it is to be part of the Python packages set."; + valid = value: pythonPackages.hasPythonModule value || providesSetupHook value || lib.elem value exceptions; + func = name: value: + if lib.isDerivation value then + lib.extendDerivation (valid value || throw "${name} should use `buildPythonPackage` or `toPythonModule` if it is to be part of the Python packages set.") {} value + else + value; in lib.mapAttrs func items; in ensurePythonModules (callPackage # Function that when called @@ -71,9 +74,7 @@ overrides ]); aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super); - in lib.makeScopeWithSplicing - splicePackages - newScope + in makeScopeWithSplicing otherSplices keep extra @@ -84,13 +85,12 @@ }); in rec { isPy27 = pythonVersion == "2.7"; - isPy35 = pythonVersion == "3.5"; - isPy36 = pythonVersion == "3.6"; isPy37 = pythonVersion == "3.7"; isPy38 = pythonVersion == "3.8"; isPy39 = pythonVersion == "3.9"; isPy310 = pythonVersion == "3.10"; isPy311 = pythonVersion == "3.11"; + isPy312 = pythonVersion == "3.12"; isPy2 = lib.strings.substring 0 1 pythonVersion == "2"; isPy3 = lib.strings.substring 0 1 pythonVersion == "3"; isPy3k = isPy3; @@ -121,19 +121,19 @@ sourceVersion = { major = "3"; minor = "9"; - patch = "15"; + patch = "16"; suffix = ""; }; - sha256 = "sha256-Etr/aAlSjZ9hVCFpUEI8njDw5HM2y1fGqgtDh91etLI="; + sha256 = "sha256-It3cCZJG3SdgZlVh6K23OU6gzEOnJoTGSA+TgPd4ZDk="; }; python310 = { sourceVersion = { major = "3"; minor = "10"; - patch = "8"; + patch = "9"; suffix = ""; }; - sha256 = "sha256-ajDs3lnEcEgBPrWmWMm13sJ3ID0nk2Z/V433Zx9/A/M="; + sha256 = "sha256-WuA+MIJgFkuro5kh/bTb+ObQPYI1qTnUWCsz8LXkaoM="; }; }; @@ -145,22 +145,9 @@ in { major = "2"; minor = "7"; patch = "18"; - suffix = ""; + suffix = ".6"; # ActiveState's Python 2 extended support }; - sha256 = "0hzgxl94hnflis0d6m4szjx0b52gah7wpmcg5g00q7am6xwhwb5n"; - inherit (darwin) configd; - inherit passthruFun; - }; - - python37 = callPackage ./cpython { - self = __splicedPackages.python37; - sourceVersion = { - major = "3"; - minor = "7"; - patch = "15"; - suffix = ""; - }; - sha256 = "sha256-WRFHWgesK1PXRuiKBxavbStHNJQZGRNuoNM/ucdblxQ="; + sha256 = "sha256-+I0QOBkuTHMIQz71lgNn1X1vjPsjJMtFbgC0xcGTwWY="; inherit (darwin) configd; inherit passthruFun; }; @@ -170,10 +157,10 @@ in { sourceVersion = { major = "3"; minor = "8"; - patch = "15"; + patch = "16"; suffix = ""; }; - sha256 = "sha256-URT8eRiipeIOtarGlrMMNvQSxu8ksT9cnrngVpgtlVA="; + sha256 = "sha256-2F27N3QTJHPYCB3LFY80oQzK16kLlsflDqS7YfXORWI="; inherit (darwin) configd; inherit passthruFun; }; @@ -195,10 +182,23 @@ in { sourceVersion = { major = "3"; minor = "11"; - patch = "0"; + patch = "1"; suffix = ""; }; - sha256 = "sha256-pX3ILXc1hhe6ZbmEHO4eO0QfOGw3id3AZ27KB38pUcM="; + sha256 = "sha256-hYeRkvLP/VbLFsCSkFlJ6/Pl45S392RyNSljeQHftY8="; + inherit (darwin) configd; + inherit passthruFun; + }; + + python312 = callPackage ./cpython { + self = __splicedPackages.python312; + sourceVersion = { + major = "3"; + minor = "12"; + patch = "0"; + suffix = "a3"; + }; + sha256 = "sha256-G2SzB14KkkGXTlgOCbCckRehxOK+aYA5IB7x2Kc0U9E="; inherit (darwin) configd; inherit passthruFun; }; @@ -238,13 +238,13 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "9"; + patch = "11"; }; - sha256 = "sha256-ObCXKVb2VIzlgoAZ264SUDwy1svpGivs+I0+QsxSGXs="; + sha256 = "sha256-ERevtmgx2k6m852NIIR4enRon9AineC+MB+e2bJVCTw="; pythonVersion = "2.7"; db = db.override { dbmSupport = !stdenv.isDarwin; }; - python = __splicedPackages.python27; + python = __splicedPackages.pythonInterpreters.pypy27_prebuilt; inherit passthruFun; inherit (darwin) libunwind; inherit (darwin.apple_sdk.frameworks) Security; @@ -255,13 +255,13 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "9"; + patch = "11"; }; - sha256 = "sha256-Krqh6f4ewOIzyfvDd6DI6aBjQICo9PMOtomDAfZhjBI="; + sha256 = "sha256-sPMWb7Klqt/VzrnbXN1feSmg7MygK0omwNrgSS98qOo="; pythonVersion = "3.9"; db = db.override { dbmSupport = !stdenv.isDarwin; }; - python = __splicedPackages.python27; + python = __splicedPackages.pypy27; inherit passthruFun; inherit (darwin) libunwind; inherit (darwin.apple_sdk.frameworks) Security; @@ -270,24 +270,26 @@ in { pypy38 = __splicedPackages.pypy39.override { self = __splicedPackages.pythonInterpreters.pypy38; pythonVersion = "3.8"; - sha256 = "sha256-W12dklbxKhKa+DhOL1gb36s7wPu+OgpIDZwdLpVJDrE="; - }; - pypy37 = __splicedPackages.pypy39.override { - self = __splicedPackages.pythonInterpreters.pypy37; - pythonVersion = "3.7"; - sha256 = "sha256-cEJhY7GU7kYAmYbuptlCYJij/7VS2c29PfqmSkc3P0k="; + sha256 = "sha256-TWdpv8pzc06GZv1wUDt86wam4lkRDmFzMbs4mcpOYFg="; }; + pypy37 = throw "pypy37 has been removed from nixpkgs since it is no longer supported upstream"; # Added 2023-01-04 + pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix { # Not included at top-level self = __splicedPackages.pythonInterpreters.pypy27_prebuilt; sourceVersion = { major = "7"; minor = "3"; - patch = "9"; + patch = "11"; }; - sha256 = "sha256-FyqSiwCWp+ALfVj1I/VzAMNcPef4IkkeKnvIRTdcI/g="; # linux64 + sha256 = { + aarch64-linux = "sha256-6pJNod7+kyXvdg4oiwT5hGFOQFWA9TIetqXI9Tm9QVo="; + x86_64-linux = "sha256-uo7ZWKkFwHNaTP/yh1wlCJlU3AIOCH2YKw/6W52jFs0="; + aarch64-darwin = "sha256-zFaWq0+TzTSBweSZC13t17pgrAYC+hiQ02iImmxb93E="; + x86_64-darwin = "sha256-Vt7unCJkD1aGw1udZP2xzjq9BEWD5AePCxccov0qGY4="; + }.${stdenv.system}; pythonVersion = "2.7"; inherit passthruFun; }; @@ -298,15 +300,20 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "9"; + patch = "11"; }; - sha256 = "sha256-RoGMs9dLlrNHh1SDQ9Jm4lYrUx3brzMDg7qTD/GTDtU="; # linux64 + sha256 = { + aarch64-linux = "sha256-CRddxlLtiV2Y6a1j0haBK/PufjmNkAqb+espBrqDArk="; + x86_64-linux = "sha256-1QYXLKEQcSdBdddOnFgcMWZDLQF5sDZHDjuejSDq5YE="; + aarch64-darwin = "sha256-ka11APGjlTHb76CzRaPc/5J/+ZcWVOjS6e98WuMR9X4="; + x86_64-darwin = "sha256-0z9AsgcJmHJYWv1xhzV1ym6mOKJ9gjvGISOMWuglQu0="; + }.${stdenv.system}; pythonVersion = "3.9"; inherit passthruFun; }; - rustpython = callPackage ./rustpython/default.nix { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + rustpython = darwin.apple_sdk_11_0.callPackage ./rustpython/default.nix { + inherit (darwin.apple_sdk_11_0.frameworks) SystemConfiguration; }; }) diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index d30876aa9fde..08dc3ea61ab7 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -93,7 +93,7 @@ in { makePythonHook { name = "python-imports-check-hook.sh"; substitutions = { - inherit pythonCheckInterpreter; + inherit pythonCheckInterpreter pythonSitePackages; }; } ./python-imports-check-hook.sh) {}; diff --git a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh index f8ca84cd573a..7172ac498545 100644 --- a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh @@ -6,6 +6,7 @@ pythonImportsCheckPhase () { if [ -n "$pythonImportsCheck" ]; then echo "Check whether the following modules can be imported: $pythonImportsCheck" + export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH" ( cd $out && eval "@pythonCheckInterpreter@ -c 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ[\"pythonImportsCheck\"].split()))'" ) fi } diff --git a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh index ae386ca859f4..ca67fa9beabf 100644 --- a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh +++ b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh @@ -57,7 +57,7 @@ installSphinxPhase() { else # shellcheck disable=2154 - docdir="${doc:-$out}/share/doc/${pname}" + docdir="${doc:-$out}/share/doc/${name}" mkdir -p "$docdir" diff --git a/pkgs/development/interpreters/python/manylinux/default.nix b/pkgs/development/interpreters/python/manylinux/default.nix index a44ead23752b..04f077961807 100644 --- a/pkgs/development/interpreters/python/manylinux/default.nix +++ b/pkgs/development/interpreters/python/manylinux/default.nix @@ -65,7 +65,7 @@ let manylinux1Libs = getLibOutputs(manylinux2010Libs // (with pkgs; { "libpanelw.so.5" = ncurses5; "libncursesw.so.5" = ncurses5; - "libcrypt.so.1" = glibc; + "libcrypt.so.1" = libxcrypt; })); in { diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index bdb4969bf164..b1f35cc2fb13 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -39,6 +39,7 @@ # Dependencies needed for running the checkPhase. # These are added to buildInputs when doCheck = true. , checkInputs ? [] +, nativeCheckInputs ? [] # propagate build dependencies so in case we have A -> B -> C, # C can import package A propagated by B @@ -100,12 +101,6 @@ , ... } @ attrs: - -# Keep extra attributes from `attrs`, e.g., `patchPhase', etc. -if disabled -then throw "${name} not supported for interpreter ${python.executable}" -else - let inherit (python) stdenv; @@ -113,8 +108,9 @@ let name_ = name; + # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ - "disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" + "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" "disabledTestPaths" "outputs" ]) // { @@ -169,13 +165,14 @@ let # Python packages don't have a checkPhase, only an installCheckPhase doCheck = false; doInstallCheck = attrs.doCheck or true; - installCheckInputs = [ + nativeInstallCheckInputs = [ ] ++ lib.optionals (format == "setuptools") [ # Longer-term we should get rid of this and require # users of this function to set the `installCheckPhase` or # pass in a hook that sets it. setuptoolsCheckHook - ] ++ checkInputs; + ] ++ nativeCheckInputs; + installCheckInputs = checkInputs; postFixup = lib.optionalString (!dontWrapPythonPrograms) '' wrapPythonPrograms @@ -202,4 +199,7 @@ let passthru.updateScript = let filename = builtins.head (lib.splitString ":" self.meta.position); in attrs.passthru.updateScript or [ update-python-libraries filename ]; -in lib.extendDerivation true passthru self +in lib.extendDerivation + (disabled -> throw "${name} not supported for interpreter ${python.executable}") + passthru + self diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index c0c11b121af7..6fad25ee8d63 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, substituteAll, fetchurl , zlib ? null, zlibSupport ? true, bzip2, pkg-config, libffi, libunwind, Security -, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 +, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, libX11 , self, gdbm, db, xz , python-setup-hook # For the Python package set @@ -19,11 +19,9 @@ assert zlibSupport -> zlib != null; -with lib; - let - isPy3k = substring 0 1 pythonVersion == "3"; - isPy39OrNewer = versionAtLeast pythonVersion "3.9"; + isPy3k = (lib.versions.major pythonVersion) == "3"; + isPy39OrNewer = lib.versionAtLeast pythonVersion "3.9"; passthru = passthruFun { inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; @@ -53,26 +51,24 @@ in with passthru; stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db - ] ++ optionals isPy3k [ + bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl libX11 gdbm db + ] ++ lib.optionals isPy3k [ xz - ] ++ optionals (stdenv ? cc && stdenv.cc.libc != null) [ + ] ++ lib.optionals (stdenv ? cc && stdenv.cc.libc != null) [ stdenv.cc.libc - ] ++ optionals zlibSupport [ + ] ++ lib.optionals zlibSupport [ zlib - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ libunwind Security ]; - hardeningDisable = optional stdenv.isi686 "pic"; - # Remove bootstrap python from closure dontPatchShebangs = true; disallowedReferences = [ python ]; - C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" buildInputs; - LIBRARY_PATH = makeLibraryPath buildInputs; - LD_LIBRARY_PATH = makeLibraryPath (filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); + C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" buildInputs; + LIBRARY_PATH = lib.makeLibraryPath buildInputs; + LD_LIBRARY_PATH = lib.makeLibraryPath (builtins.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); patches = [ ./dont_fetch_vendored_deps.patch @@ -96,14 +92,47 @@ in with passthru; stdenv.mkDerivation rec { substituteInPlace lib_pypy/pypy_tools/build_cffi_imports.py \ --replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES" - substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" + substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" \ + --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; buildPhase = '' + runHook preBuild + ${pythonForPypy.interpreter} rpython/bin/rpython \ --make-jobs="$NIX_BUILD_CORES" \ -Ojit \ --batch pypy/goal/targetpypystandalone.py + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,include,lib,${executable}-c} + + cp -R {include,lib_pypy,lib-python,${executable}-c} $out/${executable}-c + cp lib${executable}-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ + ln -s $out/${executable}-c/${executable}-c $out/bin/${executable} + ${lib.optionalString isPy39OrNewer "ln -s $out/bin/${executable} $out/bin/pypy3"} + + # other packages expect to find stuff according to libPrefix + ln -s $out/${executable}-c/include $out/include/${libPrefix} + ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix} + + # Include a sitecustomize.py file + cp ${../sitecustomize.py} $out/lib/${libPrefix}/${sitePackages}/sitecustomize.py + + runHook postInstall + ''; + + preFixup = lib.optionalString (stdenv.isDarwin) '' + install_name_tool -change @rpath/lib${executable}-c.dylib $out/lib/lib${executable}-c.dylib $out/bin/${executable} + '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + mkdir -p $out/${executable}-c/pypy/bin + mv $out/bin/${executable} $out/${executable}-c/pypy/bin/${executable} + ln -s $out/${executable}-c/pypy/bin/${executable} $out/bin/${executable} ''; setupHook = python-setup-hook sitePackages; @@ -117,12 +146,12 @@ in with passthru; stdenv.mkDerivation rec { "test_shutil" # disable socket because it has two actual network tests that fail "test_socket" - ] ++ optionals (!isPy3k) [ + ] ++ lib.optionals (!isPy3k) [ # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com) "test_urllib2net" "test_urllibnet" "test_urllib2_localnet" - ] ++ optionals isPy3k [ + ] ++ lib.optionals isPy3k [ # disable asyncio due to https://github.com/NixOS/nix/issues/1238 "test_asyncio" # disable os due to https://github.com/NixOS/nixpkgs/issues/10496 @@ -140,30 +169,25 @@ in with passthru; stdenv.mkDerivation rec { export TERM="xterm"; export HOME="$TMPDIR"; - ${pythonForPypy.interpreter} ./pypy/test_all.py --pypy=./${executable}-c -k 'not (${concatStringsSep " or " disabledTests})' lib-python + ${pythonForPypy.interpreter} ./pypy/test_all.py --pypy=./${executable}-c -k 'not (${lib.concatStringsSep " or " disabledTests})' lib-python ''; - installPhase = '' - mkdir -p $out/{bin,include,lib,${executable}-c} - - cp -R {include,lib_pypy,lib-python,${executable}-c} $out/${executable}-c - cp lib${executable}-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ - ln -s $out/${executable}-c/${executable}-c $out/bin/${executable} - ${optionalString isPy39OrNewer "ln -s $out/bin/${executable}-c $out/bin/pypy3"} - - # other packages expect to find stuff according to libPrefix - ln -s $out/${executable}-c/include $out/include/${libPrefix} - ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix} - - ${lib.optionalString stdenv.isDarwin '' - install_name_tool -change @rpath/libpypy${optionalString isPy3k "3"}-c.dylib $out/lib/libpypy${optionalString isPy3k "3"}-c.dylib $out/bin/${executable} - ''} - - # verify cffi modules - $out/bin/${executable} -c ${if isPy3k then "'import tkinter;import sqlite3;import curses;import lzma'" else "'import Tkinter;import sqlite3;import curses'"} - - # Include a sitecustomize.py file - cp ${../sitecustomize.py} $out/lib/${libPrefix}/${sitePackages}/sitecustomize.py + # verify cffi modules + doInstallCheck = true; + installCheckPhase = let + modules = [ + "curses" + "sqlite3" + ] ++ lib.optionals (!isPy3k) [ + "Tkinter" + ] ++ lib.optionals isPy3k [ + "tkinter" + "lzma" + ]; + imports = lib.concatMapStringsSep "; " (x: "import ${x}") modules; + in '' + echo "Testing whether we can import modules" + $out/bin/${executable} -c '${imports}' ''; inherit passthru; @@ -173,7 +197,7 @@ in with passthru; stdenv.mkDerivation rec { homepage = "http://pypy.org/"; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; - platforms = [ "aarch64-linux" "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; maintainers = with maintainers; [ andersk ]; }; } diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 69de6e94e378..a25ab8a78221 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -1,18 +1,20 @@ { lib , stdenv , fetchurl +, autoPatchelfHook , python-setup-hook , self -, which # Dependencies , bzip2 -, sqlite -, zlib -, openssl , expat +, gdbm , ncurses6 +, sqlite , tcl-8_5 , tk-8_5 +, tcl-8_6 +, tk-8_6 +, zlib # For the Python package set , packageOverrides ? (self: super: {}) , sourceVersion @@ -24,8 +26,6 @@ # This version of PyPy is primarily added to speed-up translation of # our PyPy source build when developing that expression. -with lib; - let isPy3k = majorVersion == "3"; passthru = passthruFun rec { @@ -46,56 +46,86 @@ let pname = "${passthru.executable}_prebuilt"; version = with sourceVersion; "${major}.${minor}.${patch}"; - majorVersion = substring 0 1 pythonVersion; + majorVersion = lib.versions.major pythonVersion; - deps = [ - bzip2 - sqlite - zlib - openssl - expat - ncurses6 - tcl-8_5 - tk-8_5 - ]; + downloadUrls = { + aarch64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-aarch64.tar.bz2"; + x86_64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; + aarch64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_arm64.tar.bz2"; + x86_64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_x86_64.tar.bz2"; + }; in with passthru; stdenv.mkDerivation { inherit pname version; src = fetchurl { - url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; + url = downloadUrls.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); inherit sha256; }; - buildInputs = [ which ]; + buildInputs = [ + bzip2 + expat + gdbm + ncurses6 + sqlite + zlib + ] ++ lib.optionals stdenv.isLinux [ + tcl-8_5 + tk-8_5 + ] ++ lib.optionals stdenv.isDarwin [ + tcl-8_6 + tk-8_6 + ]; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; installPhase = '' + runHook preInstall + mkdir -p $out echo "Moving files to $out" mv -t $out bin include lib - - mv $out/bin/libpypy*-c.so $out/lib/ - - rm $out/bin/*.debug - - echo "Patching binaries" - interpreter=$(patchelf --print-interpreter $(readlink -f $(which patchelf))) - patchelf --set-interpreter $interpreter \ - --set-rpath $out/lib \ - $out/bin/pypy* - - pushd $out - - find ./lib -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \; - find ./lib -name "*.so" -exec patchelf --set-rpath ${lib.makeLibraryPath deps}:$out/lib {} \; + mv $out/bin/libpypy*-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ + ${lib.optionalString stdenv.isLinux '' + rm $out/bin/*.debug + ''} echo "Removing bytecode" - find . -name "__pycache__" -type d -depth -exec rm -rf {} \; - popd + find . -name "__pycache__" -type d -depth -delete # Include a sitecustomize.py file cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py + runHook postInstall + ''; + + preFixup = lib.optionalString stdenv.isLinux '' + find $out/{lib,lib_pypy*} -name "*.so" \ + -exec patchelf \ + --replace-needed libtinfow.so.6 libncursesw.so.6 \ + --replace-needed libgdbm.so.4 libgdbm_compat.so.4 {} \; + '' + lib.optionalString stdenv.isDarwin '' + install_name_tool \ + -change \ + @rpath/lib${libPrefix}-c.dylib \ + $out/lib/lib${libPrefix}-c.dylib \ + $out/bin/${executable} + install_name_tool \ + -change \ + @rpath/lib${libPrefix}-c.dylib \ + $out/lib/lib${libPrefix}-c.dylib \ + $out/bin/${libPrefix} + install_name_tool \ + -change \ + /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \ + ${tcl-8_6}/lib/libtcl8.6.dylib \ + $out/lib/${libPrefix}/_tkinter/*.so + install_name_tool \ + -change \ + /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \ + ${tk-8_6}/lib/libtk8.6.dylib \ + $out/lib/${libPrefix}/_tkinter/*.so ''; doInstallCheck = true; @@ -106,12 +136,12 @@ in with passthru; stdenv.mkDerivation { "ssl" "sys" "curses" - ] ++ optionals (!isPy3k) [ + ] ++ lib.optionals (!isPy3k) [ "Tkinter" - ] ++ optionals isPy3k [ + ] ++ lib.optionals isPy3k [ "tkinter" ]; - imports = concatMapStringsSep "; " (x: "import ${x}") modules; + imports = lib.concatMapStringsSep "; " (x: "import ${x}") modules; in '' echo "Testing whether we can import modules" $out/bin/${executable} -c '${imports}' @@ -128,7 +158,7 @@ in with passthru; stdenv.mkDerivation { homepage = "http://pypy.org/"; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; - platforms = [ "x86_64-linux" ]; + platforms = lib.mapAttrsToList (arch: _: arch) downloadUrls; }; } diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index 877a00efa483..a95e0c2f651e 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -1,16 +1,20 @@ { lib , stdenv , fetchurl +, autoPatchelfHook , python-setup-hook , self -, which # Dependencies , bzip2 -, zlib , expat +, gdbm , ncurses6 +, sqlite , tcl-8_5 , tk-8_5 +, tcl-8_6 +, tk-8_6 +, zlib # For the Python package set , packageOverrides ? (self: super: {}) , sourceVersion @@ -22,8 +26,6 @@ # This version of PyPy is primarily added to speed-up translation of # our PyPy source build when developing that expression. -with lib; - let isPy3k = majorVersion == "3"; passthru = passthruFun { @@ -44,54 +46,82 @@ let pname = "${passthru.executable}_prebuilt"; version = with sourceVersion; "${major}.${minor}.${patch}"; - majorVersion = substring 0 1 pythonVersion; + majorVersion = lib.versions.major pythonVersion; - deps = [ - bzip2 - zlib - expat - ncurses6 - tcl-8_5 - tk-8_5 - ]; + downloadUrls = { + aarch64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-aarch64.tar.bz2"; + x86_64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; + aarch64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_arm64.tar.bz2"; + x86_64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_x86_64.tar.bz2"; + }; in with passthru; stdenv.mkDerivation { inherit pname version; src = fetchurl { - url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; + url = downloadUrls.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); inherit sha256; }; - buildInputs = [ which ]; + buildInputs = [ + bzip2 + expat + gdbm + ncurses6 + sqlite + zlib + ] ++ lib.optionals stdenv.isLinux [ + tcl-8_5 + tk-8_5 + ] ++ lib.optionals stdenv.isDarwin [ + tcl-8_6 + tk-8_6 + ]; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; installPhase = '' + runHook preInstall + mkdir -p $out/lib echo "Moving files to $out" mv -t $out bin include lib-python lib_pypy site-packages - mv lib/libffi.so.6* $out/lib/ - - mv $out/bin/libpypy*-c.so $out/lib/ - - rm $out/bin/*.debug - - echo "Patching binaries" - interpreter=$(patchelf --print-interpreter $(readlink -f $(which patchelf))) - patchelf --set-interpreter $interpreter \ - --set-rpath $out/lib \ - $out/bin/pypy* - - pushd $out - find {lib,lib_pypy*} -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \; - find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${lib.makeLibraryPath deps}:$out/lib {} \; + mv $out/bin/libpypy*-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ + ${lib.optionalString stdenv.isLinux '' + mv lib/libffi.so.6* $out/lib/ + rm $out/bin/*.debug + ''} echo "Removing bytecode" - find . -name "__pycache__" -type d -depth -exec rm -rf {} \; - popd + find . -name "__pycache__" -type d -depth -delete # Include a sitecustomize.py file cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py + runHook postInstall + ''; + + preFixup = lib.optionalString (stdenv.isLinux) '' + find $out/{lib,lib_pypy*} -name "*.so" \ + -exec patchelf \ + --replace-needed libtinfow.so.6 libncursesw.so.6 \ + --replace-needed libgdbm.so.4 libgdbm_compat.so.4 {} \; + '' + lib.optionalString (stdenv.isDarwin) '' + install_name_tool \ + -change \ + @rpath/lib${executable}-c.dylib \ + $out/lib/lib${executable}-c.dylib \ + $out/bin/${executable} + install_name_tool \ + -change \ + /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \ + ${tcl-8_6}/lib/libtcl8.6.dylib \ + $out/lib_pypy/_tkinter/*.so + install_name_tool \ + -change \ + /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \ + ${tk-8_6}/lib/libtk8.6.dylib \ + $out/lib_pypy/_tkinter/*.so ''; doInstallCheck = true; @@ -102,12 +132,12 @@ in with passthru; stdenv.mkDerivation { "ssl" "sys" "curses" - ] ++ optionals (!isPy3k) [ + ] ++ lib.optionals (!isPy3k) [ "Tkinter" - ] ++ optionals isPy3k [ + ] ++ lib.optionals isPy3k [ "tkinter" ]; - imports = concatMapStringsSep "; " (x: "import ${x}") modules; + imports = lib.concatMapStringsSep "; " (x: "import ${x}") modules; in '' echo "Testing whether we can import modules" $out/bin/${executable} -c '${imports}' @@ -124,7 +154,7 @@ in with passthru; stdenv.mkDerivation { homepage = "http://pypy.org/"; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; - platforms = [ "x86_64-linux" ]; + platforms = lib.mapAttrsToList (arch: _: arch) downloadUrls; }; } diff --git a/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch b/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch index 15d03830e07e..cf1bcddeba6b 100644 --- a/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch +++ b/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch @@ -1,14 +1,18 @@ --- a/lib_pypy/_tkinter/tklib_build.py +++ b/lib_pypy/_tkinter/tklib_build.py -@@ -17,19 +17,14 @@ elif sys.platform == 'win32': +@@ -17,23 +17,14 @@ elif sys.platform == 'win32': incdirs = [] linklibs = ['tcl85', 'tk85'] libdirs = [] -elif sys.platform == 'darwin': - # homebrew +- homebrew = os.environ.get('HOMEBREW_PREFIX', '') - incdirs = ['/usr/local/opt/tcl-tk/include'] - linklibs = ['tcl8.6', 'tk8.6'] -- libdirs = ['/usr/local/opt/tcl-tk/lib'] +- libdirs = [] +- if homebrew: +- incdirs.append(homebrew + '/include') +- libdirs.append(homebrew + '/opt/tcl-tk/lib') else: # On some Linux distributions, the tcl and tk libraries are # stored in /usr/include, so we must check this case also diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index a63ece3c2369..d5b02223fd6c 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -8,11 +8,11 @@ self: let inherit (self) callPackage; - inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit (python.passthru) isPy27 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; namePrefix = python.libPrefix + "-"; - # Derivations built with `buildPythonPackage` can already be overriden with `override`, `overrideAttrs`, and `overrideDerivation`. + # Derivations built with `buildPythonPackage` can already be overridden with `override`, `overrideAttrs`, and `overrideDerivation`. # This function introduces `overridePythonAttrs` and it overrides the call to `buildPythonPackage`. makeOverridablePythonPackage = f: origArgs: let @@ -41,8 +41,6 @@ let # See build-setupcfg/default.nix for documentation. buildSetupcfg = import ../../../build-support/build-setupcfg self; - fetchPypi = callPackage ./fetchpypi.nix { }; - # Check whether a derivation provides a Python module. hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; @@ -87,9 +85,9 @@ let in { inherit lib pkgs stdenv; - inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit (python.passthru) isPy27 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; inherit buildPythonPackage buildPythonApplication; - inherit fetchPypi; + inherit (pkgs) fetchPypi; inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf; inherit toPythonModule toPythonApplication; inherit buildSetupcfg; diff --git a/pkgs/development/interpreters/python/rustpython/default.nix b/pkgs/development/interpreters/python/rustpython/default.nix index 645b1de2d76b..e3e2ca8c18cd 100644 --- a/pkgs/development/interpreters/python/rustpython/default.nix +++ b/pkgs/development/interpreters/python/rustpython/default.nix @@ -24,21 +24,12 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; meta = with lib; { description = "Python 3 interpreter in written Rust"; homepage = "https://rustpython.github.io"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; - - # TODO: Remove once nixpkgs uses newer SDKs that supports '*at' functions. - # Probably macOS SDK 10.13 or later. Check the current version in - # .../os-specific/darwin/apple-sdk/default.nix - # - # From the build logs: - # - # > Undefined symbols for architecture x86_64: "_utimensat" - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/development/interpreters/python/setup-hook.nix b/pkgs/development/interpreters/python/setup-hook.nix index 29ce079317f0..8cfb9dd46784 100644 --- a/pkgs/development/interpreters/python/setup-hook.nix +++ b/pkgs/development/interpreters/python/setup-hook.nix @@ -6,7 +6,9 @@ let hook = ./setup-hook.sh; in runCommand "python-setup-hook.sh" { strictDeps = true; - inherit sitePackages; + env = { + inherit sitePackages; + }; } '' cp ${hook} hook.sh substituteAllInPlace hook.sh 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 07a72a3f2eca..feb44bef0790 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 @@ -248,7 +248,7 @@ FORMATS = { } def _determine_fetcher(text): - # Count occurences of fetchers. + # Count occurrences of fetchers. nfetchers = sum(text.count('src = {}'.format(fetcher)) for fetcher in FETCHERS.keys()) if nfetchers == 0: raise ValueError("no fetcher.") diff --git a/pkgs/development/interpreters/python/wrap-python.nix b/pkgs/development/interpreters/python/wrap-python.nix index 29fc6cf820b2..83da013bfd2d 100644 --- a/pkgs/development/interpreters/python/wrap-python.nix +++ b/pkgs/development/interpreters/python/wrap-python.nix @@ -3,9 +3,8 @@ , makePythonHook , makeWrapper }: -with lib; - makePythonHook { + name = "wrap-python-hook"; deps = makeWrapper; substitutions.sitePackages = python.sitePackages; substitutions.executable = python.interpreter; @@ -19,7 +18,7 @@ makePythonHook { mkStringSkipper = labelNum: quote: let label = "q${toString labelNum}"; - isSingle = elem quote [ "\"" "'\"'\"'" ]; + isSingle = lib.elem quote [ "\"" "'\"'\"'" ]; endQuote = if isSingle then "[^\\\\]${quote}" else quote; in '' /^[a-z]?${quote}/ { @@ -45,8 +44,8 @@ makePythonHook { :r /\\$|,$/{N;br} /__future__|^ |^ *(#.*)?$/{n;br} - ${concatImapStrings mkStringSkipper quoteVariants} - /^[^# ]/i ${replaceStrings ["\n"] [";"] preamble} + ${lib.concatImapStrings mkStringSkipper quoteVariants} + /^[^# ]/i ${lib.replaceStrings ["\n"] [";"] preamble} } ''; } ./wrap.sh diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 41e196d00fb5..577f4c0fcf2c 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -136,7 +136,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = with lib; { - broken = stdenv.isDarwin; description = "A programmable programming language"; longDescription = '' Racket is a full-spectrum programming language. It goes beyond diff --git a/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch b/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch index 38cd7f52e237..98e2cb102db9 100644 --- a/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch +++ b/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch @@ -5,6 +5,6 @@ (void - (if remove? -+ (if #t ++ (begin (remove-signature file) (add-ad-hoc-signature file))) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 3af1b408b3d6..cfdeac264cbd 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.14.2"; + version = "0.14.6"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-+U9K6PRcWbs5JzlJudcpCCk3zHkqE8L1Sq/wkf68jyY="; + sha256 = "sha256-3FRzqHbzNhmYg3wRvajMzTWB7lOlgrxwQvvnB3fggGM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index dc7594da17d9..57d1e6d84fe1 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -187,11 +187,24 @@ let sed -i '/CC_VERSION_MESSAGE/d' $rbConfig '' } + + # Allow to override compiler. This is important for cross compiling as + # we need to set a compiler that is different from the build one. + awk -i inplace -F' = ' \ + ' # operate on the line starting with + /^ CONFIG\["CC"\]/ { + # replace the right hand side + sub($2, "ENV[\"CC\"] || \"1\"") + }; { print }' "$rbConfig" + # test that the line isn't mangled in case upstream made the above unnecessary + grep -qx ' CONFIG\["CC"\] = ENV\["CC"\] || "1"' "$rbConfig" + # Remove unnecessary external intermediate files created by gems - extMakefiles=$(find $out/lib/ruby/gems -name Makefile) + extMakefiles=$(find $out/${passthru.gemPath} -name Makefile) for makefile in $extMakefiles; do make -C "$(dirname "$makefile")" distclean done + find "$out/${passthru.gemPath}" -name gem_make.out -delete # Bundler tries to create this directory mkdir -p $out/nix-support cat > $out/nix-support/setup-hook < in SDL_opengles.h. - ++ optional openglSupport libGL + ++ lib.optional openglSupport libGL # Propagated for #include and in SDL_syswm.h. - ++ optionals x11Support [ libX11 xorgproto ]; + ++ lib.optionals x11Support [ libX11 xorgproto ]; - 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 ] - ++ optionals drmSupport [ libdrm mesa ]; + dlopenBuildInputs = lib.optionals alsaSupport [ alsa-lib audiofile ] + ++ lib.optional dbusSupport dbus + ++ lib.optional libdecorSupport libdecor + ++ lib.optional pipewireSupport pipewire + ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional udevSupport udev + ++ lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] + ++ lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] + ++ lib.optionals drmSupport [ libdrm mesa ]; buildInputs = [ libiconv ] ++ dlopenBuildInputs - ++ optional ibusSupport ibus - ++ optional fcitxSupport fcitx - ++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; + ++ lib.optional ibusSupport ibus + ++ lib.optional fcitxSupport fcitx + ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; enableParallelBuilding = true; 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"; + ] ++ lib.optional (!x11Support) "--without-x" + ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" + ++ lib.optional stdenv.targetPlatform.isWindows "--disable-video-opengles" + ++ lib.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` @@ -156,9 +154,9 @@ stdenv.mkDerivation rec { # list the symbols used in this way. postFixup = let - rpath = makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs); + rpath = lib.makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs); in - optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") '' + lib.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" diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/pkgs/development/libraries/SDL_Pango/default.nix index 7c90092fe8dd..e24af838c65e 100644 --- a/pkgs/development/libraries/SDL_Pango/default.nix +++ b/pkgs/development/libraries/SDL_Pango/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Connects the Pango rendering engine to SDL"; license = licenses.lgpl21Plus; platforms = platforms.all; - homepage = "http://sdlpango.sourceforge.net/"; + homepage = "https://sdlpango.sourceforge.net/"; maintainers = with maintainers; [ puckipedia ]; }; } diff --git a/pkgs/development/libraries/SDL_compat/default.nix b/pkgs/development/libraries/SDL_compat/default.nix index d0cb80fb6b4b..ff5d2649aa0a 100644 --- a/pkgs/development/libraries/SDL_compat/default.nix +++ b/pkgs/development/libraries/SDL_compat/default.nix @@ -6,6 +6,7 @@ , SDL2 , libiconv , Cocoa +, autoSignDarwinBinariesHook , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , openglSupport ? libGLSupported , libGL @@ -27,7 +28,8 @@ stdenv.mkDerivation rec { hash = "sha256-8b9rFI4iRpBJqeJ2KRJ9vRyv9gYwa9jRWCuXRfA3x50="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config ] + ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; propagatedBuildInputs = [ SDL2 ] ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Cocoa ] diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 442d289de791..41d84184c165 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0ijljhs0v99dj6y27hc10z6qchyp8gdp4199y6jzngy6dzxlzsvw"; }; + # SDL_gfx.pc refers to sdl.pc and some SDL_gfx headers import SDL.h + propagatedBuildInputs = [ SDL ]; buildInputs = [ SDL ] ; configureFlags = [ "--disable-mmx" ] diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/development/libraries/SDL_stretch/default.nix index e6318b84859e..99f86dd258b3 100644 --- a/pkgs/development/libraries/SDL_stretch/default.nix +++ b/pkgs/development/libraries/SDL_stretch/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Stretch Functions For SDL"; - homepage = "http://sdl-stretch.sourceforge.net/"; + homepage = "https://sdl-stretch.sourceforge.net/"; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 3ec220ca80de..f358a59ad62d 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -6,10 +6,12 @@ , bison , flex , pkg-config -, xlibsWrapper +, libXext , libXmu , libXpm , libXp +, libXt +, xorgproto }: stdenv.mkDerivation rec { @@ -22,8 +24,8 @@ stdenv.mkDerivation rec { }; dontUseImakeConfigure = true; nativeBuildInputs = [ pkg-config bison flex imake gccmakedep ]; - buildInputs = [ libXpm libXp ]; - propagatedBuildInputs = [ xlibsWrapper libXmu ]; + buildInputs = [ libXext libXpm libXp ]; + propagatedBuildInputs = [ libXmu libXt xorgproto ]; meta = with lib; { description = "3D widget set based on the Athena Widget set"; diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 612aa472b025..2e617ef9e0ad 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.8"; + version = "7.0.11"; src = fetchurl { url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "sha256-bZQKtNIdTzCbwE3T/fF7e/1CETG4S42Hq8S9RDxCZdw="; + sha256 = "sha256-r+LRiu/u1qMcbrjkSr8ErnemX6zvhgvc5cLWu8AQhww="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ada/spark2014/default.nix b/pkgs/development/libraries/ada/spark2014/default.nix index 1e6157cfb9a2..d928dddfc8df 100644 --- a/pkgs/development/libraries/ada/spark2014/default.nix +++ b/pkgs/development/libraries/ada/spark2014/default.nix @@ -5,7 +5,6 @@ , gnatcoll-core , gprbuild , python3 -, why3 , ocaml , ocamlPackages , makeWrapper @@ -53,11 +52,9 @@ stdenv.mkDerivation rec { make setup ''; - postInstall = '' + installPhase = '' + make install-all cp -a ./install/. $out - # help gnatprove to locate why3server - wrapProgram "$out/bin/gnatprove" \ - --prefix PATH : "${why3}/lib/why3" ''; meta = with lib; { diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index cb0c8025ddfa..e82c3c8dfe77 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "3.7.19"; + version = "3.7.20"; pname = "afflib"; src = fetchFromGitHub { owner = "sshock"; repo = "AFFLIBv3"; rev = "v${version}"; - sha256 = "1qs843yi33yqbp0scqirn753lxzg762rz6xy2h3f8f77fijqj2qb"; + sha256 = "sha256-xkqBfTftzn+rgeuoaKfHP7vQmy4VZuaCq8VFlfZTUE4="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix index 11ed0f1b28b7..97b2230f0311 100644 --- a/pkgs/development/libraries/aften/default.nix +++ b/pkgs/development/libraries/aften/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification"; - homepage = "http://aften.sourceforge.net/"; + homepage = "https://aften.sourceforge.net/"; license = licenses.lgpl21Only; platforms = platforms.unix; maintainers = with maintainers; [ emilytrau ]; diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix index 4cbbf5305094..a69edded5b3d 100644 --- a/pkgs/development/libraries/agda/cubical/default.nix +++ b/pkgs/development/libraries/agda/cubical/default.nix @@ -1,25 +1,25 @@ -{ lib, mkDerivation, fetchFromGitHub, ghc, glibcLocales }: +{ lib, mkDerivation, fetchFromGitHub, ghc }: mkDerivation rec { pname = "cubical"; - version = "0.4prec3e097a"; + version = "0.4"; src = fetchFromGitHub { repo = pname; owner = "agda"; - rev = "c3e097a98c84083550fa31101346bd42a0501add"; - sha256 = "101cni2a9xvia1mglb94z61jm8xk9r5kc1sn44cri0qsmk1zbqxs"; + rev = "v${version}"; + hash = "sha256-bnHz5uZXZnn1Zd36tq/veA4yT7dhJ1c+AYpgdDfSRzE="; }; - LC_ALL = "en_US.UTF-8"; - - preConfigure = ''export AGDA_EXEC=agda''; + LC_ALL = "C.UTF-8"; # The cubical library has several `Everything.agda` files, which are # compiled through the make file they provide. - nativeBuildInputs = [ ghc glibcLocales ]; + nativeBuildInputs = [ ghc ]; buildPhase = '' + runHook preBuild make + runHook postBuild ''; meta = with lib; { @@ -28,6 +28,6 @@ mkDerivation rec { homepage = src.meta.homepage; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ alexarice ryanorendorff ]; + maintainers = with maintainers; [ alexarice ryanorendorff ncfavier ]; }; } diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 667d334c9026..c7bc4894e15b 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "sha256-QnqUD8KmMDmEZ1REoKN70SwVICOdyGPZsB/lU9nojj4="; + sha256 = "sha256-8dQhOQN0t2Y2kC2wOpQUqbu6Woy4DUmiLqXjf1D+mxE="; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 954628986e46..4fd87c69d71d 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -1,4 +1,5 @@ { stdenv +, callPackage , lib , fetchRepoProject , writeScript @@ -24,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2022.Q3.5"; + version = "2022.Q4.4"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "YY9/njuzGONqAtbM54OGGvC1V73JyL+IHkLSZs4JSYs="; + sha256 = "sha256-MKU7bfjrvH4M2kON2tr5463nYjN1xoGAknsC9YmklEc="; }; buildInputs = [ @@ -67,6 +68,7 @@ in stdenv.mkDerivation rec { xorg.libX11 xorg.libxcb xorg.libxshmfence + zlib ]; cmakeDir = "../drivers/xgl"; @@ -102,6 +104,8 @@ in stdenv.mkDerivation rec { setHash "$hash" ''; + passthru.impureTests = { amdvlk = callPackage ./test.nix {}; }; + meta = with lib; { description = "AMD Open Source Driver For Vulkan"; homepage = "https://github.com/GPUOpen-Drivers/AMDVLK"; diff --git a/pkgs/development/libraries/amdvlk/test.nix b/pkgs/development/libraries/amdvlk/test.nix new file mode 100644 index 000000000000..e76e6dce9eaf --- /dev/null +++ b/pkgs/development/libraries/amdvlk/test.nix @@ -0,0 +1,49 @@ +{ lib, makeImpureTest, coreutils, amdvlk, vulkan-tools }: +makeImpureTest { + name = "amdvlk"; + testedPackage = "amdvlk"; + + sandboxPaths = [ "/sys" "/dev/dri" ]; + + nativeBuildInputs = [ vulkan-tools ]; + + VK_ICD_FILENAMES = "${amdvlk}/share/vulkan/icd.d/amd_icd64.json"; + XDG_RUNTIME_DIR = "/tmp"; + + # AMDVLK needs access to /dev/dri/card0 (or another card), but normally it is rw-rw---- + # Change the permissions to be rw for everyone + prepareRunCommands = '' + function reset_perms() + { + # Reset permissions to previous state + for card in /dev/dri/card*; do + sudo ${coreutils}/bin/chmod "0''${cardPerms[$card]}" $card + done + } + + # Save permissions on /dev/dri/card* + declare -A cardPerms + for card in /dev/dri/card*; do + cardPerms[$card]=$(stat -c "%a" $card) + done + + sudo ${coreutils}/bin/chmod o+rw /dev/dri/card* + trap reset_perms EXIT + ''; + + testScript = '' + # Check that there is at least one card with write-access + if ! ls -l /dev/dri/card* | cut -b8-9 | grep -q rw; then + echo 'AMDVLK needs rw access to /dev/dri/card0 or a fitting card, please run `sudo chmod o+rw /dev/dri/card*`' + exit 1 + fi + + vulkaninfo --summary + echo "Checking version" + vulkaninfo --summary | grep '= ${amdvlk.version}' + ''; + + meta = with lib.maintainers; { + maintainers = [ Flakebi ]; + }; +} diff --git a/pkgs/development/libraries/aml/default.nix b/pkgs/development/libraries/aml/default.nix index 392dae609c0b..1a6900d298c6 100644 --- a/pkgs/development/libraries/aml/default.nix +++ b/pkgs/development/libraries/aml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aml"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WhhjK9uzKyvnzpGtAWXXo0upfZTPINHVk0qmzNXwobE="; + sha256 = "sha256-BX+MRqvnwwLPhz22m0gfJ2EkW31KQEi/YTgOCMcQk2Q="; }; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 4a47ec61645e..74f83a30a502 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "amtk"; - version = "5.6.0"; + version = "5.6.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "89uHl0Qqm4UGKs0LPheskSWgtIfhQhbQmwOwiEGCDrk="; + sha256 = "1QEVuFyHKqwpaTS17nJqP6FWxvWtltJ+Dt0Kpa0XMig="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { checkPhase = '' export NO_AT_BRIDGE=1 ${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs ''; diff --git a/pkgs/development/libraries/antic/default.nix b/pkgs/development/libraries/antic/default.nix new file mode 100644 index 000000000000..5a8e00d90f5a --- /dev/null +++ b/pkgs/development/libraries/antic/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, mpir +, gmp +, mpfr +, flint +}: + +stdenv.mkDerivation rec { + pname = "antic"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "flintlib"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-bQ2VvCS+lGro5qxs+qBz3RpUenxQTmTr+lm9BFZWYts="; + }; + + buildInputs = [ mpir gmp mpfr flint ]; + + configureFlags = [ + "--with-gmp=${gmp}" + "--with-mpir=${mpir}" + "--with-mpfr=${mpfr}" + "--with-flint=${flint}" + ]; + + enableParallelBuilding = true; + + doCheck = true; + + meta = with lib; { + description = "An algebraic number theory library"; + homepage = "https://github.com/flintlib/antic"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ smasher164 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index fd2ba8bc7392..9b1962501629 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.17.2"; + version = "5.17.3"; src = fetchurl { - sha256 = "sha256-QhY4ckDvOOkS+IFixS4mEo8PctFZEIUtEusKeEWBkZU="; + sha256 = "sha256-pMxMOi8TZwfCxpbzuz7iqG2+/xueteI3sU7cDF5aMo8="; 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 68453c56942b..3d10053d645c 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -28,9 +28,6 @@ stdenv.mkDerivation rec { pname = "appstream"; version = "0.15.5"; - # 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" "installedTests" ]; diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 909965bb0688..594ecfbdb306 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -10,8 +10,6 @@ assert sslSupport -> openssl != null; assert bdbSupport -> db != null; assert ldapSupport -> openldap != null; -with lib; - stdenv.mkDerivation rec { pname = "apr-util"; version = "1.6.1"; @@ -22,21 +20,21 @@ stdenv.mkDerivation rec { }; patches = [ ./fix-libxcrypt-build.patch ] - ++ optional stdenv.isFreeBSD ./include-static-dependencies.patch; + ++ lib.optional stdenv.isFreeBSD ./include-static-dependencies.patch; NIX_CFLAGS_LINK = [ "-lcrypt" ]; outputs = [ "out" "dev" ]; outputBin = "dev"; - nativeBuildInputs = [ makeWrapper ] ++ optional stdenv.isFreeBSD autoreconfHook; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isFreeBSD autoreconfHook; configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] - ++ optional (!stdenv.isCygwin) "--with-crypto" - ++ optional sslSupport "--with-openssl=${openssl.dev}" - ++ optional bdbSupport "--with-berkeley-db=${db.dev}" - ++ optional ldapSupport "--with-ldap=ldap" - ++ optionals stdenv.isCygwin + ++ lib.optional (!stdenv.isCygwin) "--with-crypto" + ++ lib.optional sslSupport "--with-openssl=${openssl.dev}" + ++ lib.optional bdbSupport "--with-berkeley-db=${db.dev}" + ++ lib.optional ldapSupport "--with-ldap=ldap" + ++ lib.optionals stdenv.isCygwin [ "--without-pgsql" "--without-sqlite2" "--without-sqlite3" "--without-freetds" "--without-berkeley-db" "--without-crypto" ] ; @@ -53,10 +51,10 @@ stdenv.mkDerivation rec { ''; propagatedBuildInputs = [ apr expat libiconv libxcrypt ] - ++ optional sslSupport openssl - ++ optional bdbSupport db - ++ optional ldapSupport openldap - ++ optional stdenv.isFreeBSD cyrus_sasl; + ++ lib.optional sslSupport openssl + ++ lib.optional bdbSupport db + ++ lib.optional ldapSupport openldap + ++ lib.optional stdenv.isFreeBSD cyrus_sasl; postInstall = '' for f in $out/lib/*.la $out/lib/apr-util-1/*.la $dev/bin/apu-1-config; do diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix index d2488b8700ea..d065e3f7f47f 100644 --- a/pkgs/development/libraries/aqbanking/sources.nix +++ b/pkgs/development/libraries/aqbanking/sources.nix @@ -1,9 +1,9 @@ { # https://www.aquamaniac.de/rdm/projects/gwenhywfar/files gwenhywfar = { - version = "5.9.0"; - hash = "sha256-6Ix9M4Ojy75Gyzsimfcd+55vpWX1oWaLQpc5HIdLDhI="; - releaseId = "415"; + version = "5.10.1"; + hash = "sha256-ovYKnd5don5X4OXvX4kx9JXB1UGtkKhB4rYjFWVUcWA="; + releaseId = "465"; }; # https://www.aquamaniac.de/rdm/projects/libchipcard/files diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix index 1a09ed84a1cb..f4fc2101e72b 100644 --- a/pkgs/development/libraries/argp-standalone/default.nix +++ b/pkgs/development/libraries/argp-standalone/default.nix @@ -1,62 +1,25 @@ -{ lib, stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, meson, ninja }: -let - patch-argp-fmtstream = fetchpatch { - name = "patch-argp-fmtstream.h"; - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/b5f0ad3/argp-standalone/patch-argp-fmtstream.h"; - sha256 = "5656273f622fdb7ca7cf1f98c0c9529bed461d23718bc2a6a85986e4f8ed1cb8"; - }; - - patch-throw-in-funcdef = fetchpatch { - name = "argp-standalone-1.3-throw-in-funcdef.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/argp-standalone/files/argp-standalone-1.3-throw-in-funcdef.patch?id=409d0e2a9c9c899fb1fb04cc808fe0aff3f745ca"; - sha256 = "0b2b4l1jkvmnffl22jcn4ydzxy2i7fnmmnfim12f0yg5pb8fs43c"; - }; - - patch-shared = fetchpatch { - name = "argp-standalone-1.3-shared.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/argp-standalone/files/argp-standalone-1.3-shared.patch?id=409d0e2a9c9c899fb1fb04cc808fe0aff3f745ca"; - sha256 = "1xx2zdc187a1m2x6c1qs62vcrycbycw7n0q3ks2zkxpaqzx2dgkw"; - }; -in stdenv.mkDerivation rec { pname = "argp-standalone"; - version = "1.3"; + version = "1.5.0"; - src = fetchurl { - url = "https://www.lysator.liu.se/~nisse/misc/argp-standalone-${version}.tar.gz"; - sha256 = "dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be"; + src = fetchFromGitHub { + owner = "argp-standalone"; + repo = "argp-standalone"; + rev = version; + sha256 = "jWnoWVnUVDQlsC9ru7oB9PdtZuyCCNqGnMqF/f2m0ZY="; }; - patches = - lib.optionals stdenv.hostPlatform.isDarwin [ patch-argp-fmtstream ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ patch-throw-in-funcdef patch-shared ]; - - patchFlags = lib.optional stdenv.hostPlatform.isDarwin "-p0"; - - # For currently unknown reason, `-fPIC` has to be passed explicitly, otherwise - # downstream software like `elfutils` will get `recompile errors like: - # libargp.a(argp-help.o): relocation R_X86_64_PC32 against symbol `program_invocation_short_name' can not be used when making a shared object; recompile with -fPIC - # It seems that nixpkgs's on-by-default `-fPIC` is not in effect here. - preConfigure = lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline -fPIC'"; - - postInstall = '' - mkdir -p $out/lib $out/include - cp libargp.a $out/lib - cp argp.h $out/include - ''; + nativeBuildInputs = [ meson ninja ]; doCheck = true; - makeFlags = [ "AR:=$(AR)" ]; - - enableParallelBuilding = true; - meta = with lib; { - homepage = "https://www.lysator.liu.se/~nisse/misc/"; - description = "Standalone version of arguments parsing functions from GLIBC"; - platforms = with platforms; darwin ++ linux; + homepage = "https://github.com/argp-standalone/argp-standalone"; + description = "Standalone version of arguments parsing functions from Glibc"; + platforms = platforms.unix; maintainers = with maintainers; [ amar1729 ]; - license = licenses.gpl2; + license = licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 95e89f660cca..2b07d3a87a64 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 = "11.4.2"; + version = "11.4.3"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-5oYBNPGsllbGoczHTHS3X4xZZqyGEoQfL78Mkc459Ok="; + sha256 = "sha256-h2AyY2ZJiK9B2iyk82IF426kepKB+mz9RjEV83l6HaI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 2ce613c78534..5c60723309b7 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -65,6 +65,17 @@ let hash = "sha256-cO5t/mgsbBhbSefx8EMGTyxmgTjhZ8mFujkFQ3p/JS0="; }; + aws-sdk-cpp-arrow = aws-sdk-cpp.override { + apis = [ + "cognito-identity" + "config" + "identity-management" + "s3" + "sts" + "transfer" + ]; + }; + in stdenv.mkDerivation rec { pname = "arrow-cpp"; @@ -144,7 +155,7 @@ stdenv.mkDerivation rec { grpc openssl protobuf - ] ++ lib.optionals enableS3 [ aws-sdk-cpp openssl ] + ] ++ lib.optionals enableS3 [ aws-sdk-cpp-arrow openssl ] ++ lib.optionals enableGcs [ crc32c curl @@ -205,7 +216,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF" - ++ lib.optional enableS3 "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp}/include/aws/core/Aws.h"; + ++ lib.optional enableS3 "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h" + ++ lib.optionals enableGcs [ "-DCMAKE_CXX_STANDARD=${grpc.cxxStandard}" ]; doInstallCheck = true; ARROW_TEST_DATA = lib.optionalString doInstallCheck "${arrow-testing}/data"; @@ -229,7 +241,7 @@ stdenv.mkDerivation rec { in lib.optionalString doInstallCheck "-${builtins.concatStringsSep ":" filteredTests}"; __darwinAllowLocalNetworking = true; - installCheckInputs = [ perl which sqlite ] ++ lib.optional enableS3 minio; + nativeInstallCheckInputs = [ perl which sqlite ] ++ lib.optional enableS3 minio; installCheckPhase = let excludedTests = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix index 8bcc12ae2b3a..cb9f1eb30246 100644 --- a/pkgs/development/libraries/asio/generic.nix +++ b/pkgs/development/libraries/asio/generic.nix @@ -2,8 +2,6 @@ , version, sha256, ... }: -with lib; - stdenv.mkDerivation { pname = "asio"; inherit version; @@ -17,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ openssl ]; - meta = { + meta = with lib; { homepage = "http://asio.sourceforge.net/"; description = "Cross-platform C++ library for network and low-level I/O programming"; license = licenses.boost; diff --git a/pkgs/development/libraries/asmjit/default.nix b/pkgs/development/libraries/asmjit/default.nix new file mode 100644 index 000000000000..9f4bd193b82c --- /dev/null +++ b/pkgs/development/libraries/asmjit/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, cmake +, ninja +, lib +}: + +stdenv.mkDerivation { + name = "asmjit"; + version = "unstable-2022-11-10"; + + src = fetchFromGitHub { + owner = "asmjit"; + repo = "asmjit"; + rev = "0c03ed2f7497441ac0de232bda2e6b8cc041b2dc"; + hash = "sha256-CfTtdgb+ZCLHwCRa+t2O4CG9rhHgqPLcfHDqLBvI9Tg="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + strictDeps = true; + + meta = with lib; { + description = "Machine code generation for C++"; + longDescription = '' + AsmJit is a lightweight library for machine code generation written in + C++ language. It can generate machine code for X86, X86_64, and AArch64 + architectures and supports baseline instructions and all recent + extensions. + ''; + homepage = "https://asmjit.com/"; + license = licenses.zlib; + maintainers = with maintainers; [ nikstur ]; + }; +} diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 74caec57c2d8..ea8a2133c82b 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -1,7 +1,5 @@ {lib, stdenv, fetchurl, aspell, which, writeScript}: -with lib; - /* HOWTO: * Add some of these to your profile or systemPackages. @@ -105,7 +103,7 @@ let homepage = "http://ftp.gnu.org/gnu/aspell/dict/0index.html"; } // (args.meta or {}); - } // lib.optionalAttrs (stdenv.isDarwin && elem language [ "is" "nb" ]) { + } // lib.optionalAttrs (stdenv.isDarwin && lib.elem language [ "is" "nb" ]) { # tar: Cannot open: Illegal byte sequence unpackPhase = '' runHook preUnpack @@ -115,7 +113,7 @@ let runHook postUnpack ''; - postPatch = getAttr language { + postPatch = lib.getAttr language { is = '' cp icelandic.alias íslenska.alias sed -i 's/ .slenska\.alias/ íslenska.alias/g' Makefile.pre @@ -137,7 +135,7 @@ let preBuild = '' # Aspell can't handle multiple data-dirs # Copy everything we might possibly need - ${concatMapStringsSep "\n" (p: '' + ${lib.concatMapStringsSep "\n" (p: '' cp -a ${p}/lib/aspell/* . '') ([ aspell ] ++ langInputs)} export ASPELL_CONF="data-dir $(pwd)" diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 804c97ffd747..81d9e54de435 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -1,29 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, zlib }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, zlib +}: stdenv.mkDerivation rec { pname = "assimp"; - version = "5.1.3"; + version = "5.2.5"; outputs = [ "out" "lib" "dev" ]; src = fetchFromGitHub{ owner = "assimp"; repo = "assimp"; rev = "v${version}"; - hash = "sha256-GNSfaP8O5IsjGwtC3DFaV4OiMMUXIcmHmz+5TCT/HP8="; + hash = "sha256-vQx+PaET5mlvvIGHk6pEnZvM3qw8DiC3hd1Po6OAHxQ="; }; - patches = [ - # Fix include directory with split outputs - # https://github.com/assimp/assimp/pull/4337 - (fetchpatch { - url = "https://github.com/assimp/assimp/commit/5dcaf445c3da079cf43890a0688428a7e1de0b30.patch"; - sha256 = "sha256-KwqTAoDPkhFq469+VaUuGoqfymu2bWLG9W3BvFvyU5I="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ boost zlib ]; + cmakeFlags = [ "-DASSIMP_BUILD_ASSIMP_TOOLS=ON" ]; + meta = with lib; { description = "A library to import various 3D model formats"; homepage = "https://www.assimp.org/"; diff --git a/pkgs/development/libraries/audio/cubeb/default.nix b/pkgs/development/libraries/audio/cubeb/default.nix index 7fc7f87a20ae..baad8a1efd64 100644 --- a/pkgs/development/libraries/audio/cubeb/default.nix +++ b/pkgs/development/libraries/audio/cubeb/default.nix @@ -1,14 +1,28 @@ { lib, stdenv, fetchFromGitHub , cmake , pkg-config +, alsa-lib , jack2 -, pulseaudio +, libpulseaudio , sndio , speexdsp -, lazyLoad ? true +, AudioUnit +, CoreAudio +, CoreServices +, lazyLoad ? !stdenv.isDarwin }: -stdenv.mkDerivation { +assert lib.assertMsg (stdenv.isDarwin -> !lazyLoad) "cubeb: lazyLoad is inert on Darwin"; + +let + backendLibs = [ + alsa-lib + jack2 + libpulseaudio + sndio + ]; + +in stdenv.mkDerivation { pname = "cubeb"; version = "unstable-2022-10-18"; @@ -24,12 +38,10 @@ stdenv.mkDerivation { pkg-config ]; - buildInputs = [ - jack2 - pulseaudio - sndio - speexdsp - ]; + buildInputs = [ speexdsp ] ++ ( + if stdenv.isDarwin then [ AudioUnit CoreAudio CoreServices ] + else backendLibs + ); cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" @@ -43,14 +55,14 @@ stdenv.mkDerivation { passthru = { # For downstream users when lazyLoad is true - backendLibs = [ jack2 pulseaudio sndio speexdsp ]; + backendLibs = lib.optionals lazyLoad backendLibs; }; meta = with lib; { description = "Cross platform audio library"; homepage = "https://github.com/mozilla/cubeb"; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ zhaofengli ]; }; } diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix index 720823852b02..fa390eaaa588 100644 --- a/pkgs/development/libraries/audio/libbs2b/default.nix +++ b/pkgs/development/libraries/audio/libbs2b/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = "http://bs2b.sourceforge.net/"; + homepage = "https://bs2b.sourceforge.net/"; description = "Bauer stereophonic-to-binaural DSP library"; license = lib.licenses.mit; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/audio/libkeyfinder/default.nix b/pkgs/development/libraries/audio/libkeyfinder/default.nix index 0a48dc479045..0742297cb69f 100644 --- a/pkgs/development/libraries/audio/libkeyfinder/default.nix +++ b/pkgs/development/libraries/audio/libkeyfinder/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ fftw ]; - checkInputs = [ catch2 ]; + nativeCheckInputs = [ catch2 ]; doCheck = true; diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index 414634f07070..9822640f8d67 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python2, wafHook }: +{ lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "lvtk"; @@ -11,14 +11,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-6IoyhBig3Nvc4Y8F0w8b1up6sn8O2RmoUVaBQ//+Aaw="; }; - nativeBuildInputs = [ pkg-config python2 wafHook ]; + nativeBuildInputs = [ pkg-config python3 wafHook ]; buildInputs = [ boost gtkmm2 lv2 ]; enableParallelBuilding = true; - # Fix including the boost libraries during linking postPatch = '' + # Fix including the boost libraries during linking sed -i '/target[ ]*= "ttl2c"/ ilib=["boost_system"],' tools/wscript_build + + # don't use bundled waf + rm waf + + # remove (useless) python2 based print + sed -e '/print/d' -i wscript ''; wafConfigureFlags = [ 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 deleted file mode 100644 index e13dda549705..000000000000 --- a/pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index 097f1b3ff479..000000000000 --- a/pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 98c088ed5495..f52800e2e70c 100644 --- a/pkgs/development/libraries/audio/roc-toolkit/default.nix +++ b/pkgs/development/libraries/audio/roc-toolkit/default.nix @@ -8,21 +8,24 @@ libuv, openfecSupport ? true, openfec, + speexdsp, libunwindSupport ? true, libunwind, pulseaudioSupport ? true, - libpulseaudio + libpulseaudio, + soxSupport ? true, + sox }: stdenv.mkDerivation rec { pname = "roc-toolkit"; - version = "0.1.5"; + version = "0.2.1"; src = fetchFromGitHub { owner = "roc-streaming"; repo = "roc-toolkit"; rev = "v${version}"; - sha256 = "sha256:1pld340zfch4p3qaf5anrspq7vmxrgf9ddsdsq92pk49axaaz19w"; + sha256 = "sha256-W8PiI5W1T6pNaYzR4u6fPtkP8DKq/Z85Kq/WF5dXVxo="; }; nativeBuildInputs = [ @@ -32,20 +35,19 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = [ + propagatedBuildInputs = [ libuv - libunwind - openfec - libpulseaudio - ]; + speexdsp + ] ++ lib.optional openfecSupport openfec + ++ lib.optional libunwindSupport libunwind + ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional soxSupport sox; sconsFlags = [ "--build=${stdenv.buildPlatform.config}" "--host=${stdenv.hostPlatform.config}" - "--prefix=${placeholder "out"}" - "--disable-sox" - "--disable-doc" - "--disable-tests" ] ++ + "--prefix=${placeholder "out"}" ] ++ + lib.optional (!soxSupport) "--disable-sox" ++ lib.optional (!libunwindSupport) "--disable-libunwind" ++ lib.optional (!pulseaudioSupport) "--disable-pulseaudio" ++ (if (!openfecSupport) @@ -56,10 +58,8 @@ 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 + ./fix-pkgconfig-installation.patch ]; meta = with lib; { diff --git a/pkgs/development/libraries/audio/roc-toolkit/fix-pkgconfig-installation.patch b/pkgs/development/libraries/audio/roc-toolkit/fix-pkgconfig-installation.patch new file mode 100644 index 000000000000..8c6982f1f7c1 --- /dev/null +++ b/pkgs/development/libraries/audio/roc-toolkit/fix-pkgconfig-installation.patch @@ -0,0 +1,13 @@ +diff --git a/src/SConscript b/src/SConscript +index b59f67a7..9f16e0a2 100644 +--- a/src/SConscript ++++ b/src/SConscript +@@ -141,7 +141,7 @@ if not GetOption('disable_shared') or GetOption('enable_static') or GetOption('e + desc='Real-time audio streaming over the network.', + url='https://roc-streaming.org', + version=env['ROC_VERSION']) +- env.AddDistFile(env['PKG_CONFIG_PATH'], pc_file) ++ env.AddDistFile(os.path.join(env['ROC_SYSTEM_LIBDIR'], 'pkgconfig'), pc_file) + + if GetOption('enable_examples'): + examples_env = subenvs.examples.Clone() diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index ac10472e014e..3dc3bb5dacdc 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -1,16 +1,11 @@ { stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python3, serd, sord, sratom , wafHook -, withQt4 ? true, qt4 ? null -, withQt5 ? false, qt5 ? null }: - -# I haven't found an XOR operator in nix... -assert withQt4 || withQt5; -assert !(withQt4 && withQt5); +, withQt5 ? true, qt5 ? null +}: stdenv.mkDerivation rec { pname = "suil"; version = "0.10.6"; - name = "${pname}-qt${if withQt4 then "4" else "5"}-${version}"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; @@ -19,8 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ gtk2 lv2 serd sord sratom ] - ++ (lib.optionals withQt4 [ qt4 ]) - ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); + ++ lib.optionals withQt5 (with qt5; [ qtbase qttools ]); dontWrapQtApps = true; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index fe9ce9a42dcb..2d2fd4f57716 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -6,6 +6,7 @@ , libdaemon , dbus , perlPackages +, libpcap , expat , gettext , glib @@ -13,8 +14,8 @@ , libevent , nixosTests , gtk3Support ? false -, gtk3 ? null -, qt5 ? null +, gtk3 +, qt5 , qt5Support ? false , withLibdnssdCompat ? false , python ? null @@ -63,7 +64,9 @@ stdenv.mkDerivation rec { ] ++ (with perlPackages; [ perl XMLParser - ]) ++ lib.optionals gtk3Support [ + ]) ++ lib.optionals stdenv.isFreeBSD [ + libpcap + ] ++ lib.optionals gtk3Support [ gtk3 ] ++ lib.optionals qt5Support [ qt5 @@ -86,7 +89,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--runstatedir=/run" "--sysconfdir=/etc" - "--with-distro=none" + "--with-distro=${with stdenv.hostPlatform; if isBSD then parsed.kernel.name else "none"}" # A systemd unit is provided by the avahi-daemon NixOS module "--with-systemdsystemunitdir=no" ] ++ lib.optionals withLibdnssdCompat [ diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index e901d8887bd4..2a7bc10304c1 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.21"; + version = "0.6.22"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-RVwSSr0EgVnZt/uUAldWQdjBw6/L+CHUutWcinysvNw="; + sha256 = "sha256-crqoUXPf+2/bhKvvw6fiKNqozVqczbf+aSlK390/w/Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 235c328da85e..b7d1eb244ea8 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.8.5"; + version = "0.8.9"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kAwcVB39rcS59I2qJhYc7Xr3mXMWtKfN45jo+8BNHwA="; + sha256 = "sha256-zaX97qFJ/YcjEq6mQqtT6SHIEeRxGgDkAvN72Vjxe98="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix index 9450156ea139..12c012d09b90 100644 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-event-stream"; - version = "0.2.15"; + version = "0.2.18"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-X0ExfVop/YjFmR8TrIejg76MOTMngdUruT7uy0BibrU="; + sha256 = "sha256-zsPhZHguOky55fz2m5xu4H42/pWATGJEHyoK0fZLybc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix index 4f9a46820b08..08ce799ffbe6 100644 --- a/pkgs/development/libraries/aws-c-http/default.nix +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.6.27"; + version = "0.7.3"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - sha256 = "sha256-prDQemFMIt33fna44tAaKlnblO4t5UU0vS6qyJKgJxk="; + sha256 = "sha256-n4BTiqxFz9eOTgh4o78TN2QgCIUbE2Z4jDq27HNORLo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 3f3ade4065e1..d5562d89f50f 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.13.11"; + version = "0.13.14"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3HNfEZ/PMHLhPp7boYyY/x5wXN9Eg+G1400q1riG2oI="; + sha256 = "sha256-3ROSBjRvl036dslLZF5WgdBnlRvafrNaRzt65wfnk0s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix index d364d8e9ac96..aab3dec12396 100644 --- a/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "aws-c-mqtt"; - version = "0.7.13"; + version = "0.8.4"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - sha256 = "sha256-m0PJTJ+yZdJ4zU25g6H80jURPPU7wHuePcgfN6y8SKU="; + sha256 = "sha256-33D+XcNH5e8ty/rckuJFMMP7xG0IhG5wl8Thvu9b7hM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index 0692c5ef7abb..cb77bade69aa 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.1.51"; + version = "0.2.2"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - sha256 = "sha256-10SDOl0XoALdSxJWHDLDkvX7rArUQKXjjXfAECFy/Vw="; + sha256 = "sha256-hPb9KTq/+OrUlE5EtmE6PYvtxsEmBb8K9ab7CAaELNo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index d820b0c71930..bfbc163c1623 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.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pSUSJTbwKYF2GsJG8DhLxxsv1ssp+/1c2gMY4dXbdFQ="; + sha256 = "sha256-yoViXJuM9UQMcn8W0CcWkCXroBLXjAestr+oqWHi5hQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index efe8129d3b4f..5fb65ffa1811 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -69,7 +69,6 @@ stdenv.mkDerivation rec { rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp # Includes aws-c-auth private headers, so only works with submodule build rm aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp - '' + lib.optionalString stdenv.hostPlatform.isMusl '' # TestRandomURLMultiThreaded fails rm aws-cpp-sdk-core-tests/http/HttpClientTest.cpp '' + lib.optionalString stdenv.isi686 '' @@ -92,6 +91,8 @@ stdenv.mkDerivation rec { # propagation is needed for Security.framework to be available when linking propagatedBuildInputs = [ aws-crt-cpp ]; + # Ensure the linker is using atomic when compiling for RISC-V, otherwise fails + LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; cmakeFlags = [ "-DBUILD_DEPS=OFF" diff --git a/pkgs/development/libraries/bash/bash-preexec/default.nix b/pkgs/development/libraries/bash/bash-preexec/default.nix index fcdf5619047b..166b73b1daf6 100644 --- a/pkgs/development/libraries/bash/bash-preexec/default.nix +++ b/pkgs/development/libraries/bash/bash-preexec/default.nix @@ -12,7 +12,7 @@ in stdenvNoCC.mkDerivation { sha256 = "sha256-+FU5n7EkY78X5nUiW3WN9+6Bf6oiPjsG2MSRCleooFs="; }; - checkInputs = [ bats ]; + nativeCheckInputs = [ bats ]; dontConfigure = true; doCheck = true; diff --git a/pkgs/development/libraries/bashup-events/generic.nix b/pkgs/development/libraries/bashup-events/generic.nix index bf46dcd8def2..f8a17f3bb11e 100644 --- a/pkgs/development/libraries/bashup-events/generic.nix +++ b/pkgs/development/libraries/bashup-events/generic.nix @@ -49,7 +49,7 @@ resholve.mkDerivation rec { ''; inherit doCheck; - checkInputs = [ bash ]; + nativeCheckInputs = [ bash ]; checkPhase = '' runHook preCheck @@ -68,7 +68,7 @@ resholve.mkDerivation rec { }; inherit doInstallCheck; - installCheckInputs = [ bash ]; + nativeInstallCheckInputs = [ bash ]; installCheckPhase = '' runHook preInstallCheck ${installCheck "${bash}/bin/bash"} diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 6c1c2cdefb9c..97072fc4ad33 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -2,14 +2,14 @@ , cmake , bc-decaf , fetchFromGitLab -, mbedtls +, mbedtls_2 , lib , stdenv }: stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "5.1.17"; + version = "5.2.16"; nativeBuildInputs = [ cmake @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # Vendored by BC bc-decaf - mbedtls + mbedtls_2 ]; src = fetchFromGitLab { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-p1rpFFMCYG/c35lqQT673j/Uicxe+PLhaktQfM6uF8Y="; + hash = "sha256-M2apFibqSKp8ojXl82W+vQb7CUxdbWsmw8PLL/ByYuM="; }; # Do not build static libraries diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index 0f251f73e81b..eb0ea3c94b28 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "5.1.12"; + version = "5.2.12"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-ZxO0Y4R04T+3K+08fEJ9krWfYSodQLrjBZYbGrKOrXI="; + sha256 = "sha256-Q5FJ1Nh61woyXN7BVTZGNGXOVhcZXakLWcxaavPpgeY="; }; buildInputs = [ bctoolbox belr ]; diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 22817feadeda..152572c6b16a 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -4,22 +4,22 @@ , fetchFromGitLab , lib , libantlr3c -, mbedtls +, mbedtls_2 , stdenv , zlib }: stdenv.mkDerivation rec { pname = "belle-sip"; - version = "linphone-4.4.1"; + version = "5.2.16"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; owner = "public"; group = "BC"; repo = pname; - rev = "44d5977570280763ee1fecdb920736715bad58a3"; - sha256 = "sha256-w++v3YlDZfpCHAbUQA/RftjRNGkz9J/zYoxZqRgtvnA="; + rev = version; + sha256 = "sha256-LMbQz22ENTT27jr9tGakzNjidC5nfCuLDMZ6sFwtRKI="; }; nativeBuildInputs = [ cmake ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "-Wno-error=stringop-overflow" ]; - propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox belr ]; + propagatedBuildInputs = [ libantlr3c mbedtls_2 bctoolbox belr ]; meta = with lib; { homepage = "https://linphone.org/technical-corner/belle-sip"; diff --git a/pkgs/development/libraries/bencode/default.nix b/pkgs/development/libraries/bencode/default.nix index 8b75e877e0ad..478f7306a59d 100644 --- a/pkgs/development/libraries/bencode/default.nix +++ b/pkgs/development/libraries/bencode/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "bencode"; - version = "0.5.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "fbdtemme"; repo = "bencode"; - rev = "v${version}"; - hash = "sha256-ePbQ6oTumQ+T5TOb+ReaOYa8Q3lvcMBZ6jTMoquTngg="; + rev = version; + hash = "sha256-zpxvADZfYTUdlNLMZJSCanPL40EGl9BBCxR7oDhvOTw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/blaze/default.nix b/pkgs/development/libraries/blaze/default.nix new file mode 100644 index 000000000000..d09f5083a948 --- /dev/null +++ b/pkgs/development/libraries/blaze/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchFromBitbucket +, cmake +, blas +, lapack-reference +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "blaze"; + version = "3.8.1"; + + src = fetchFromBitbucket { + owner = "blaze-lib"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-fe6J0aquk4j+b11Sq+ihagWA/LMTYnAgIHbaDCZacP0="; + }; + + strictDeps = true; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + blas + lapack-reference + ]; + + meta = with lib; { + description = "high performance C++ math library"; + homepage = "https://bitbucket.org/blaze-lib/blaze"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ Madouura ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index 2b5e5a4addca..d48669845485 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -1,10 +1,12 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch +, cmake , pkg-config , gfortran , texinfo -, python2 +, python3 , boost # Select SIMD alignment width (in bytes) for vectorization. , simdWidth ? 1 @@ -23,35 +25,37 @@ let in stdenv.mkDerivation rec { pname = "blitz++"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "blitzpp"; repo = "blitz"; - rev = "1.0.1"; - sha256 = "0nq84vwvvbq7m0my6h835ijfw53bxdp42qjc6kjhk436888qy9rh"; + rev = version; + hash = "sha256-wZDg+4lCd9iHvxuQQE/qs58NorkxZ0+mf+8PKQ57CDE="; }; - nativeBuildInputs = [ pkg-config python2 texinfo ]; + patches = [ + # https://github.com/blitzpp/blitz/pull/180 + (fetchpatch { + name = "use-cmake-install-full-dir.patch"; + url = "https://github.com/blitzpp/blitz/commit/020f1d768c7fa3265cec244dc28f3dc8572719c5.patch"; + hash = "sha256-8hYFNyWrejjIWPN/HzIOphD4Aq6Soe0FFUBmwV4tpWQ="; + }) + ]; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + texinfo + ]; + buildInputs = [ gfortran texinfo boost ]; - configureFlags = - [ - "--enable-shared" - "--disable-static" - "--enable-fortran" - "--enable-optimize" - "--with-pic=yes" - "--enable-html-docs" - "--disable-doxygen" - "--disable-dot" - "--disable-latex-docs" - "--enable-simd-width=${toString simdWidth}" - "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.out}/lib" - ] ++ optional enablePadding "--enable-array-length-padding" - ++ optional enableSerialization "--enable-serialization" - ++ optional stdenv.is64bit "--enable-64bit"; + cmakeFlags = optional enablePadding "-DARRAY_LENGTH_PADDING=ON" + ++ optional enableSerialization "-DENABLE_SERIALISATION=ON" + ++ optional stdenv.is64bit "-DBZ_FULLY64BIT=ON"; + # FIXME ++ optional doCheck "-DBUILD_TESTING=ON"; # skip broken library name detection ax_boost_user_serialization_lib = lib.optionalString stdenv.isDarwin "boost_serialization"; @@ -59,12 +63,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; inherit doCheck; - checkTarget = "check-testsuite check-examples"; meta = with lib; { description = "Fast multi-dimensional array library for C++"; homepage = "https://sourceforge.net/projects/blitz/"; - license = licenses.lgpl3; + license = with licenses; [ artistic2 /* or */ bsd3 /* or */ lgpl3Plus ]; platforms = platforms.unix; maintainers = with maintainers; [ ToxicFrog ]; longDescription = '' diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index f1e537943f58..47fc87af143b 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { ''; # have to link to static gcc lib on aarch64-linux explicitly + # https://github.com/NixOS/nixpkgs/issues/201254 NIX_LDFLAGS = lib.optionalString (with stdenv.targetPlatform; isAarch64 && isLinux) "-lgcc"; buildPhase = '' diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 34e26f547093..de5aff6c3b6e 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, autoreconfHook # doc: https://github.com/ivmai/bdwgc/blob/v8.2.2/doc/README.macros (LARGE_CONFIG) , enableLargeConfig ? false , enableMmap ? true @@ -36,14 +35,14 @@ stdenv.mkDerivation (finalAttrs: { # don't forget to disable the fix (and if the next release does # not fix the problem the test failure will be a reminder to # extend the set of versions requiring the workaround). - makeFlags = if (stdenv.hostPlatform.isPower64 && + makeFlags = lib.optionals (stdenv.hostPlatform.isPower64 && finalAttrs.version == "8.2.2") - then [ + [ # do not use /proc primitives to track dirty bits; see: # https://github.com/ivmai/bdwgc/issues/479#issuecomment-1279687537 # https://github.com/ivmai/bdwgc/blob/54522af853de28f45195044dadfd795c4e5942aa/include/private/gcconfig.h#L741 "CFLAGS_EXTRA=-DNO_SOFT_VDB" - ] else null; + ]; # `gctest` fails under emulation on aarch64-darwin doCheck = !(stdenv.isDarwin && stdenv.isx86_64); diff --git a/pkgs/development/libraries/boost/1.81.nix b/pkgs/development/libraries/boost/1.81.nix new file mode 100644 index 000000000000..2376255303e2 --- /dev/null +++ b/pkgs/development/libraries/boost/1.81.nix @@ -0,0 +1,14 @@ +{ callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.81.0"; + + src = fetchurl { + urls = [ + "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_81_0.html + sha256 = "71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa"; + }; +}) diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix index d6eaa8dff818..b0e310973cff 100644 --- a/pkgs/development/libraries/boost/default.nix +++ b/pkgs/development/libraries/boost/default.nix @@ -16,8 +16,6 @@ let } ); in { - boost159 = makeBoost ./1.59.nix; - boost160 = makeBoost ./1.60.nix; boost165 = makeBoost ./1.65.nix; boost166 = makeBoost ./1.66.nix; boost167 = makeBoost ./1.67.nix; @@ -33,4 +31,5 @@ in { boost178 = makeBoost ./1.78.nix; boost179 = makeBoost ./1.79.nix; boost180 = makeBoost ./1.80.nix; + boost181 = makeBoost ./1.81.nix; } diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index b6ab49e4b4d9..4c6ba700457f 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -13,6 +13,7 @@ , enableStatic ? !enableShared , enablePython ? false , enableNumpy ? false +, enableIcu ? stdenv.hostPlatform == stdenv.buildPlatform , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) , patches ? [] , boostBuildPatches ? [] @@ -33,20 +34,19 @@ assert enableNumpy -> enablePython; # Boost <1.69 can't be built on linux with clang >8, because pth was removed assert with lib; (stdenv.isLinux && toolset == "clang" && versionAtLeast stdenv.cc.version "8.0.0") -> versionAtLeast version "1.69"; -with lib; let - variant = concatStringsSep "," - (optional enableRelease "release" ++ - optional enableDebug "debug"); + variant = lib.concatStringsSep "," + (lib.optional enableRelease "release" ++ + lib.optional enableDebug "debug"); - threading = concatStringsSep "," - (optional enableSingleThreaded "single" ++ - optional enableMultiThreaded "multi"); + threading = lib.concatStringsSep "," + (lib.optional enableSingleThreaded "single" ++ + lib.optional enableMultiThreaded "multi"); - link = concatStringsSep "," - (optional enableShared "shared" ++ - optional enableStatic "static"); + link = lib.concatStringsSep "," + (lib.optional enableShared "shared" ++ + lib.optional enableStatic "static"); runtime-link = if enableShared then "shared" else "static"; @@ -60,16 +60,16 @@ let # [0]: https://github.com/boostorg/build/commit/0ef40cb86728f1cd804830fef89a6d39153ff632 # [1]: https://github.com/boostorg/build/commit/316e26ca718afc65d6170029284521392524e4f8 jobs = - if versionOlder version "1.58" then + if lib.versionOlder version "1.58" then "$(($NIX_BUILD_CORES<=64 ? $NIX_BUILD_CORES : 64))" - else if versionOlder version "1.65" then + else if lib.versionOlder version "1.65" then "$(($NIX_BUILD_CORES<=256 ? $NIX_BUILD_CORES : 256))" else "$NIX_BUILD_CORES"; needUserConfig = stdenv.hostPlatform != stdenv.buildPlatform || useMpi || (stdenv.isDarwin && enableShared); - b2Args = concatStringsSep " " ([ + b2Args = lib.concatStringsSep " " ([ "--includedir=$dev/include" "--libdir=$out/lib" "-j${jobs}" @@ -81,12 +81,12 @@ let "-sEXPAT_LIBPATH=${expat.out}/lib" # TODO: make this unconditional - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform || + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform || # required on mips; see 61d9f201baeef4c4bb91ad8a8f5f89b747e0dfe4 - (stdenv.hostPlatform.isMips && versionAtLeast version "1.79")) [ + (stdenv.hostPlatform.isMips && lib.versionAtLeast version "1.79")) [ "address-model=${toString stdenv.hostPlatform.parsed.cpu.bits}" "architecture=${if stdenv.hostPlatform.isMips64 - then if versionOlder version "1.78" then "mips1" else "mips" + then if lib.versionOlder version "1.78" then "mips1" else "mips" else if stdenv.hostPlatform.parsed.cpu.name == "s390x" then "s390x" else toString stdenv.hostPlatform.parsed.cpu.family}" "binary-format=${toString stdenv.hostPlatform.parsed.kernel.execFormat.name}" @@ -99,13 +99,13 @@ let else if stdenv.hostPlatform.isMips32 then "o32" else if stdenv.hostPlatform.isMips64n64 then "n64" else "sysv"}" - ] ++ optional (link != "static") "runtime-link=${runtime-link}" - ++ optional (variant == "release") "debug-symbols=off" - ++ optional (toolset != null) "toolset=${toolset}" - ++ optional (!enablePython) "--without-python" - ++ optional needUserConfig "--user-config=user-config.jam" - ++ optional (stdenv.buildPlatform.isDarwin && stdenv.hostPlatform.isLinux) "pch=off" - ++ optionals (stdenv.hostPlatform.libc == "msvcrt") [ + ] ++ lib.optional (link != "static") "runtime-link=${runtime-link}" + ++ lib.optional (variant == "release") "debug-symbols=off" + ++ lib.optional (toolset != null) "toolset=${toolset}" + ++ lib.optional (!enablePython) "--without-python" + ++ lib.optional needUserConfig "--user-config=user-config.jam" + ++ lib.optional (stdenv.buildPlatform.isDarwin && stdenv.hostPlatform.isLinux) "pch=off" + ++ lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ "threadapi=win32" ] ++ extraB2Args ); @@ -120,38 +120,38 @@ stdenv.mkDerivation { patchFlags = []; patches = patches - ++ optional stdenv.isDarwin ./darwin-no-system-python.patch + ++ lib.optional stdenv.isDarwin ./darwin-no-system-python.patch # Fix boost-context segmentation faults on ppc64 due to ABI violation - ++ optional (versionAtLeast version "1.61" && - versionOlder version "1.71") (fetchpatch { + ++ lib.optional (lib.versionAtLeast version "1.61" && + lib.versionOlder version "1.71") (fetchpatch { url = "https://github.com/boostorg/context/commit/2354eca9b776a6739112833f64754108cc0d1dc5.patch"; sha256 = "067m4bjpmcanqvg28djax9a10avmdwhlpfx6gn73kbqqq70dnz29"; 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") + ++ lib.optional (lib.versionAtLeast version "1.65" && lib.versionOlder version "1.67") (fetchpatch { url = "https://github.com/boostorg/mpl/commit/f48fd09d021db9a28bd7b8452c175897e1af4485.patch"; sha256 = "15d2a636hhsb1xdyp44x25dyqfcaws997vnp9kl1mhzvxjzz7hb0"; stripLen = 1; }) - ++ optional (versionAtLeast version "1.65" && versionOlder version "1.70") (fetchpatch { + ++ lib.optional (lib.versionAtLeast version "1.65" && lib.versionOlder version "1.70") (fetchpatch { # support for Mips64n64 appeared in boost-context 1.70; this patch won't apply to pre-1.65 cleanly url = "https://github.com/boostorg/context/commit/e3f744a1862164062d579d1972272d67bdaa9c39.patch"; sha256 = "sha256-qjQy1b4jDsIRrI+UYtcguhvChrMbGWO0UlEzEJHYzRI="; stripLen = 1; extraPrefix = "libs/context/"; }) - ++ optional (versionAtLeast version "1.70" && versionOlder version "1.73") ./cmake-paths.patch - ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch - ++ optional (version == "1.77.0") (fetchpatch { + ++ lib.optional (lib.versionAtLeast version "1.70" && lib.versionOlder version "1.73") ./cmake-paths.patch + ++ lib.optional (lib.versionAtLeast version "1.73") ./cmake-paths-173.patch + ++ lib.optional (version == "1.77.0") (fetchpatch { url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; relative = "include"; sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; }); - meta = { + meta = with lib; { homepage = "http://boost.org/"; description = "Collection of C++ libraries"; license = licenses.boost; @@ -174,7 +174,7 @@ stdenv.mkDerivation { inherit boostBuildPatches; }; - preConfigure = optionalString useMpi '' + preConfigure = lib.optionalString useMpi '' cat << EOF >> user-config.jam using mpi : ${mpi}/bin/mpiCC ; EOF @@ -182,7 +182,7 @@ stdenv.mkDerivation { # On darwin we need to add the `$out/lib` to the libraries' rpath explicitly, # otherwise the dynamic linker is unable to resolve the reference to @rpath # when the boost libraries want to load each other at runtime. - + optionalString (stdenv.isDarwin && enableShared) '' + + lib.optionalString (stdenv.isDarwin && enableShared) '' cat << EOF >> user-config.jam using clang-darwin : : ${stdenv.cc.targetPrefix}c++ : "-rpath $out/lib/" @@ -195,7 +195,7 @@ stdenv.mkDerivation { # uniform way for clang and gcc (which works thanks to our cc-wrapper). # We pass toolset later which will make b2 invoke everything in the right # way -- the other toolset in user-config.jam will be ignored. - + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' cat << EOF >> user-config.jam using gcc : cross : ${stdenv.cc.targetPrefix}c++ : $AR @@ -207,6 +207,15 @@ stdenv.mkDerivation { $RANLIB ; EOF + '' + # b2 needs to be explicitly told how to find Python when cross-compiling + + lib.optionalString enablePython '' + cat << EOF >> user-config.jam + using python : : ${python.interpreter} + : ${python}/include/python${python.pythonVersion} + : ${python}/lib + ; + EOF ''; NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin @@ -215,11 +224,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; nativeBuildInputs = [ which boost-build ] - ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ expat zlib bzip2 libiconv ] - ++ optional (stdenv.hostPlatform == stdenv.buildPlatform) icu - ++ optionals enablePython [ libxcrypt python ] - ++ optional enableNumpy python.pkgs.numpy; + ++ lib.optional enableIcu icu + ++ lib.optionals enablePython [ libxcrypt python ] + ++ lib.optional enableNumpy python.pkgs.numpy; configureScript = "./bootstrap.sh"; configurePlatforms = []; @@ -229,9 +238,8 @@ stdenv.mkDerivation { "--includedir=$(dev)/include" "--libdir=$(out)/lib" "--with-bjam=b2" # prevent bootstrapping b2 in configurePhase - ] ++ optional enablePython "--with-python=${python.interpreter}" - ++ optional (toolset != null) "--with-toolset=${toolset}" - ++ [ (if stdenv.hostPlatform == stdenv.buildPlatform then "--with-icu=${icu.dev}" else "--without-icu") ]; + ] ++ lib.optional (toolset != null) "--with-toolset=${toolset}" + ++ [ (if enableIcu then "--with-icu=${icu.dev}" else "--without-icu") ]; buildPhase = '' runHook preBuild @@ -256,7 +264,7 @@ stdenv.mkDerivation { # Make boost header paths relative so that they are not runtime dependencies cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ -exec sed '1s/^\xef\xbb\xbf//;1i#line 1 "{}"' -i '{}' \; - '' + optionalString (stdenv.hostPlatform.libc == "msvcrt") '' + '' + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt") '' $RANLIB "$out/lib/"*.a ''; diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index efcb64a7fd5c..61c2a27f3d85 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -20,7 +20,7 @@ buildGoModule { nativeBuildInputs = [ cmake ninja perl ]; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = null; # hack to get both go and cmake configure phase # (if we use postConfigure then cmake will loop runHook postConfigure) diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix index 6987b6c35f0a..52f29287f8ea 100644 --- a/pkgs/development/libraries/botan/2.0.nix +++ b/pkgs/development/libraries/botan/2.0.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix (args // { baseVersion = "2.19"; - revision = "2"; - sha256 = "sha256-OvXxdhXGtc2Lgy0mn7bLTVTsZPnrCd2/Gt1Qk5QbTXU="; + revision = "3"; + sha256 = "sha256-2uBH85nFpH8IfbXT2dno8RrkmF0UySjXHaGv+AGALVU="; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 3e5884c6c99a..71ac20c4f31b 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { ln -s botan-*.pc botan.pc || true ''; + doCheck = true; + meta = with lib; { description = "Cryptographic algorithms library"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/boxfort/default.nix b/pkgs/development/libraries/boxfort/default.nix index 57504dfd3a6c..855f86a3c36f 100644 --- a/pkgs/development/libraries/boxfort/default.nix +++ b/pkgs/development/libraries/boxfort/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patchShebangs ci/isdir.py ''; - checkInputs = with python3Packages; [ cram ]; + nativeCheckInputs = with python3Packages; [ cram ]; doCheck = true; diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index b73c11893edf..9c1b8ac81cf0 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -2,11 +2,11 @@ tcl.mkTclDerivation rec { pname = "bwidget"; - version = "1.9.14"; + version = "1.9.16"; src = fetchurl { url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; - sha256 = "0wm6hk3rnqhnn2cyw24drqwbfnysp6jyfi8lc1vih5k704a955lf"; + sha256 = "sha256-v+ADY3S4QpPSNiCn9t2oZXGBPQx63+2YPB8zflzoGuA="; }; dontBuild = true; diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 3a6ef0e3562d..4bccc0c5cf2f 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "5.1.12"; + version = "5.2.16"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-GsHVuNXzLkbKUaHtnyXAr7bR9Emc55zcmKt3RGjCMtA="; + hash = "sha256-nrnGmJxAeobejS6zdn5Z/kOFOxyepZcxW/G4nXAt2DY="; }; buildInputs = [ bctoolbox sqlite ]; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index f922a7ed2e9f..c1e7b52c0403 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -5,19 +5,16 @@ , xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12 , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux) -, libGL ? null # libGLU libGL is no longer a big dependency +, libGL # libGLU libGL is no longer a big dependency , pdfSupport ? true , darwin }: -assert glSupport -> x11Support && libGL != null; - let - version = "1.16.0"; inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "cairo"; - inherit version; + version = "1.16.0"; src = fetchurl { url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; @@ -137,7 +134,6 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A 2D graphics library with support for multiple output devices"; - longDescription = '' Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X @@ -149,11 +145,8 @@ in stdenv.mkDerivation rec { media while taking advantage of display hardware acceleration when available (e.g., through the X Render Extension). ''; - homepage = "http://cairographics.org/"; - license = with licenses; [ lgpl2Plus mpl10 ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/calcium/default.nix b/pkgs/development/libraries/calcium/default.nix new file mode 100644 index 000000000000..f73ee91b4f77 --- /dev/null +++ b/pkgs/development/libraries/calcium/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, mpir +, gmp +, mpfr +, flint +, arb +, antic +}: + +stdenv.mkDerivation rec { + pname = "calcium"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "fredrik-johansson"; + repo = pname; + rev = version; + sha256 = "sha256-Ony2FGMnWyNqD7adGeiDtysHNZ4ClMvQ1ijVPSHJmyc="; + }; + + buildInputs = [ mpir gmp mpfr flint arb antic ]; + + configureFlags = [ + "--with-gmp=${gmp}" + "--with-mpir=${mpir}" + "--with-mpfr=${mpfr}" + "--with-flint=${flint}" + "--with-arb=${arb}" + "--with-antic=${antic}" + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "A C library for exact computation with real and complex numbers"; + homepage = "https://fredrikj.net/calcium/"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ smasher164 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index 9af591db120e..fda33fa16460 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "capnproto"; - version = "0.10.2"; + version = "0.10.3"; # release tarballs are missing some ekam rules src = fetchFromGitHub { owner = "capnproto"; repo = "capnproto"; rev = "v${version}"; - sha256 = "sha256-vBp4CAfPpd7/hdGk7JBxMTjtFFvXx16ODOfqDd8bAjc="; + sha256 = "sha256-QrBSIKDwVlG8AIE/F4tnRq14xdhT05NKsBMldWzQQFo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix index bbbdb88b50ec..38b025d8dda4 100644 --- a/pkgs/development/libraries/catch2/3.nix +++ b/pkgs/development/libraries/catch2/3.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "3.2.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - hash = "sha256-duUafkOy0pxhRj84pm7nkfhJnLIygVnFmFAJIyx0JEY="; + hash = "sha256-JVxBYhKTejc8lfqgxz5Ig5G9H90YuIcGAUopGJG/3Dg="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ python3 ]; diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index 2700a9cbad84..27b7b9b9c8c3 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -2,23 +2,18 @@ stdenv.mkDerivation rec { pname = "cdk"; - version ="5.0-20210109"; - - buildInputs = [ - ncurses - ]; + version = "5.0-20221025"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz" "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz" ]; - sha256 = "sha256-xBbJh793tPGycD18XkM7qUWMi+Uma/RUy/gBrYfnKTY="; + hash = "sha256-A8z6Icn8PWHd0P2hnaVFNZBVu+71ociC37n/SPN0avI="; }; - patches = [ - # Proposed upstream as https://lists.gnu.org/archive/html/bug-ncurses/2021-12/msg00004.html - ./parallel.patch + buildInputs = [ + ncurses ]; enableParallelBuilding = true; @@ -26,8 +21,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Curses development kit"; homepage = "https://invisible-island.net/cdk/"; - license = licenses.bsdOriginal ; - maintainers = [ maintainers.raskin ]; + changelog = "https://invisible-island.net/cdk/CHANGES"; + license = licenses.mit; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/cdk/parallel.patch b/pkgs/development/libraries/cdk/parallel.patch deleted file mode 100644 index 729c71e96aff..000000000000 --- a/pkgs/development/libraries/cdk/parallel.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -296,7 +296,9 @@ LIB_OBJECT = @LIB_OBJECT@ - - all sources :: $(AUTO_SRC) - --$(OBJECTS) : include/cdk_config.h -+# make sure we generate all headers before trying -+# to build first source file. -+$(OBJECTS) : $(MY_HDR) - - # - # Standard library directive. diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix index ba3366198c2c..cb302f3381ca 100644 --- a/pkgs/development/libraries/cegui/default.nix +++ b/pkgs/development/libraries/cegui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, ogre, freetype, boost, expat }: +{ lib, stdenv, fetchurl, cmake, ogre, freetype, boost, expat, libiconv }: stdenv.mkDerivation rec { pname = "cegui"; @@ -10,12 +10,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ ogre freetype boost expat ]; + buildInputs = [ ogre freetype boost expat ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; + + cmakeFlags = lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DCMAKE_OSX_ARCHITECTURES=arm64"; meta = with lib; { homepage = "http://cegui.org.uk/"; description = "C++ Library for creating GUIs"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index f5c000f2271e..a5119f4a7f65 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -18,23 +18,15 @@ assert runTests -> gflags != null; stdenv.mkDerivation rec { pname = "ceres-solver"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { url = "http://ceres-solver.org/ceres-solver-${version}.tar.gz"; - sha256 = "00vng9vnmdb1qga01m0why90m0041w7bn6kxa2h4m26aflfqla8h"; + sha256 = "sha256-99dO7N4K7XW/xR7EjJHQH+Fqa/FrzhmHpwcyhnAeL8Y="; }; outputs = [ "out" "dev" ]; - patches = [ - # Enable GNUInstallDirs, see: https://github.com/ceres-solver/ceres-solver/pull/706 - (fetchpatch { - url = "https://github.com/ceres-solver/ceres-solver/commit/4998c549396d36a491f1c0638fe57824a40bcb0d.patch"; - sha256 = "sha256-mF6Zh2fDVzg2kD4nI2dd9rp4NpvPErmwfdYo5JaBmCA="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = lib.optional runTests gflags; propagatedBuildInputs = [ eigen glog ] diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index 5929c9dcbd3b..d21c0243bf3d 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.5"; + version = "0.8.8"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; rev = "v${version}"; - sha256 = "sha256-PJHDZXc0DD/d+K/4uouv5F8gAf1sE5e3jLkGILPMpnI="; + sha256 = "sha256-BzZb8NDgf1NnkZaaxs+0YlVuYod/uiWJxA3geaYN7e0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cgreen/default.nix b/pkgs/development/libraries/cgreen/default.nix index 164a010669dc..b677bf69fe6a 100644 --- a/pkgs/development/libraries/cgreen/default.nix +++ b/pkgs/development/libraries/cgreen/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cgreen"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "cgreen-devs"; repo = "cgreen"; rev = version; - sha256 = "sha256-BXch/V73a35Y6MqUlmR8mDp3ttwEAQTnqDC+ygLbIPY="; + sha256 = "sha256-uyw5beBZ3MnDyaxBWIDGl/L/0yv0ROafXwgxhQ+A+n4="; }; postPatch = '' diff --git a/pkgs/development/libraries/charls/default.nix b/pkgs/development/libraries/charls/default.nix new file mode 100644 index 000000000000..e7b8a54820e3 --- /dev/null +++ b/pkgs/development/libraries/charls/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "charls"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "team-charls"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-l0qcJeQfRqpwR7vNmYZx00kGlPkK7nEYuslydjxj7ss="; + }; + + postPatch = '' + substituteInPlace src/charls-template.pc \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + + # note this only runs some basic tests, not the full test suite, + # but the recommended `charlstest -unittest` fails with an inscrutable C++ IO error + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/team-charls/charls"; + description = "A JPEG-LS library implementation in C++"; + maintainers = with maintainers; [ bcdarwin ]; + license = licenses.bsd3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 3fd1016994e4..98acd0530e85 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.1.6"; + version = "3.2.0"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - hash = "sha256-NZwivsTYgirZXuS25buGHL3uk75shRGMH4c3YdS7Mgg="; + hash = "sha256-laLi3ks5r0C61LDoCEgVqmqZ7/C18qQKxPm4zmQrw78="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/libraries/cjose/default.nix b/pkgs/development/libraries/cjose/default.nix index 972b3dee441c..1158fa01cfbd 100644 --- a/pkgs/development/libraries/cjose/default.nix +++ b/pkgs/development/libraries/cjose/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; buildInputs = [ jansson openssl ]; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; configureFlags = [ "--with-jansson=${jansson}" diff --git a/pkgs/development/libraries/clang-ocl/default.nix b/pkgs/development/libraries/clang-ocl/default.nix index 198a2a20af1e..8053b672d366 100644 --- a/pkgs/development/libraries/clang-ocl/default.nix +++ b/pkgs/development/libraries/clang-ocl/default.nix @@ -1,44 +1,42 @@ { lib , stdenv , fetchFromGitHub +, rocmUpdateScript , cmake , rocm-cmake , rocm-device-libs -, clang }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clang-ocl"; - rocmVersion = "5.3.1"; - version = rocmVersion; + version = "5.4.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "clang-ocl"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-uMSvcVJj+me2E+7FsXZ4l4hTcK6uKEegXpkHGcuist0="; }; nativeBuildInputs = [ cmake rocm-cmake - clang ]; - buildInputs = [ - rocm-device-libs - ]; + buildInputs = [ rocm-device-libs ]; - cmakeFlags = [ - "-DCMAKE_C_COMPILER=clang" - "-DCMAKE_CXX_COMPILER=clang++" - ]; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "OpenCL compilation with clang compiler"; homepage = "https://github.com/RadeonOpenCompute/clang-ocl"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; - broken = rocmVersion != clang.version; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; -} +}) diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index 991fb2b41d50..1a05eededc7c 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pcre }: +{ lib, stdenv, fetchurl, autoreconfHook, pcre }: stdenv.mkDerivation rec { pname = "classads"; @@ -9,12 +9,17 @@ stdenv.mkDerivation rec { sha256 = "1czgj53gnfkq3ncwlsrwnr4y91wgz35sbicgkp4npfrajqizxqnd"; }; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ pcre ]; configureFlags = [ "--enable-namespace" "--enable-flexible-member" ]; + # error: use of undeclared identifier 'finite'; did you mean 'isfinite'? + NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite"; + meta = { homepage = "http://www.cs.wisc.edu/condor/classad/"; description = "The Classified Advertisements library provides a generic means for matching resources"; diff --git a/pkgs/development/libraries/clfft/default.nix b/pkgs/development/libraries/clfft/default.nix index db18bce72be8..8af7a57e6555 100644 --- a/pkgs/development/libraries/clfft/default.nix +++ b/pkgs/development/libraries/clfft/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }: +{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost, opencl-clhpp, ocl-icd, darwin }: +let + inherit (darwin.apple_sdk.frameworks) OpenCL; +in stdenv.mkDerivation rec { pname = "clfft"; version = "2.12.2"; @@ -7,15 +10,24 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "clMathLibraries"; repo = "clFFT"; - rev = "refs/tags/v${version}"; - sha256 = "134vb6214hn00qy84m4djg4hqs6hw19gkp8d0wlq8gb9m3mfx7na"; + rev = "v${version}"; + hash = "sha256-yp7u6qhpPYQpBw3d+VLg0GgMyZONVII8BsBCEoRZm4w="; }; sourceRoot = "source/src"; + postPatch = '' + sed -i '/-m64/d;/-m32/d' CMakeLists.txt + ''; + nativeBuildInputs = [ cmake ]; - buildInputs = [ fftw fftwFloat boost166 opencl-clhpp ocl-icd ]; + buildInputs = [ fftw fftwFloat boost ] + ++ lib.optionals stdenv.isLinux [ opencl-clhpp ocl-icd ] + ++ lib.optionals stdenv.isDarwin [ OpenCL ]; + + # https://github.com/clMathLibraries/clFFT/issues/237 + CXXFLAGS = "-std=c++98"; meta = with lib; { description = "Library containing FFT functions written in OpenCL"; @@ -25,7 +37,7 @@ stdenv.mkDerivation rec { ''; license = licenses.asl20; homepage = "http://clmathlibraries.github.io/clFFT/"; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ chessai ]; }; } diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 71e32e074c8f..e00cda47da6d 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome, gdk-pixbuf }: +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "clutter-gst"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "17czmpl92dzi4h3rn5rishk015yi3jwiw29zv8qan94xcmnbssgy"; }; + patches = [ + # Add patch from Arch Linux to fix corrupted display with Cheese + # https://gitlab.gnome.org/GNOME/cheese/-/issues/51 + # https://github.com/archlinux/svntogit-packages/tree/packages/clutter-gst/trunk + (fetchpatch { + url = "https://github.com/archlinux/svntogit-packages/raw/c4dd0bbda35aa603ee790676f6e15541f71b6d36/trunk/0001-video-sink-Remove-RGBx-BGRx-support.patch"; + sha256 = "sha256-k1fCiM/u7q81UrDYgbqhN/C+q9DVQ+qOyq6vmA3hbSQ="; + }) + ]; + propagatedBuildInputs = [ clutter gtk3 glib cogl gdk-pixbuf ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/cmark-gfm/default.nix b/pkgs/development/libraries/cmark-gfm/default.nix index 3459f2a849b0..b88766952ee1 100644 --- a/pkgs/development/libraries/cmark-gfm/default.nix +++ b/pkgs/development/libraries/cmark-gfm/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cmark-gfm"; - version = "0.29.0.gfm.6"; + version = "0.29.0.gfm.9"; src = fetchFromGitHub { owner = "github"; repo = "cmark-gfm"; rev = version; - sha256 = "sha256-ekHY5EGSrJrQwlXNjKpyj7k0Bzq1dYPacRsfNZ8K+lk="; + sha256 = "sha256-goQtLaiLCyEqVItPfH3e/pFroQWZuVT5oxLs1/GwdoU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index f2945116e7ef..830791f6fb31 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cmark"; - version = "0.30.2"; + version = "0.30.3"; src = fetchFromGitHub { - owner = "jgm"; + owner = "commonmark"; repo = pname; rev = version; - sha256 = "sha256-IkNybUe/XYwAvPowym3aqfVyvNdw2t/brRjhOrjVRpA="; + sha256 = "sha256-/7TzaZYP8lndkfRPgCpBbazUBytVLXxqWHYktIsGox0="; }; nativeBuildInputs = [ cmake ]; @@ -29,9 +29,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "CommonMark parsing and rendering library and program in C"; - homepage = "https://github.com/jgm/cmark"; + homepage = "https://github.com/commonmark/cmark"; + changelog = "https://github.com/commonmark/cmark/raw/${version}/changelog.txt"; maintainers = [ maintainers.michelk ]; - platforms = platforms.unix; + platforms = platforms.all; license = licenses.bsd2; }; } diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix index 9bfbc410c007..ed78f4f9ec84 100644 --- a/pkgs/development/libraries/cmocka/default.nix +++ b/pkgs/development/libraries/cmocka/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, cmake }: +{ fetchurl, fetchpatch, lib, stdenv, cmake }: stdenv.mkDerivation rec { pname = "cmocka"; @@ -10,6 +10,14 @@ stdenv.mkDerivation rec { sha256 = "1dm8pdvkyfa8dsbz9bpq7wwgixjij4sii9bbn5sgvqjm5ljdik7h"; }; + patches = [ + (fetchpatch { + name = "musl-uintptr.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/cmocka/musl_uintptr.patch?id=6a15dd0d0ba9cc354a621fb359ca5e315ff2eabd"; + sha256 = "sha256-fhb2Tax30kRTGuaKvzSzglSd/ntxiNeGFJt5I8poa24="; + }) + ]; + nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/pkgs/development/libraries/coeurl/default.nix b/pkgs/development/libraries/coeurl/default.nix index 40712e8beddd..4d04abee3adc 100644 --- a/pkgs/development/libraries/coeurl/default.nix +++ b/pkgs/development/libraries/coeurl/default.nix @@ -11,17 +11,18 @@ stdenv.mkDerivation rec { pname = "coeurl"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitLab { domain = "nheko.im"; owner = "nheko-reborn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+FIxi019+jnjpo4NhBQ4tb3ObLrEStMN5YD+MrTLa2E="; + hash = "sha256-sN+YSddUOdnJLcnHyWdjNm1PpxCwnkwiqSvyrwUrg6w="; }; nativeBuildInputs = [ ninja pkg-config meson ]; + buildInputs = [ libevent curl spdlog ]; meta = with lib; { diff --git a/pkgs/development/libraries/composable_kernel/default.nix b/pkgs/development/libraries/composable_kernel/default.nix index 9efb60814a8d..8b0ac955810e 100644 --- a/pkgs/development/libraries/composable_kernel/default.nix +++ b/pkgs/development/libraries/composable_kernel/default.nix @@ -1,91 +1,118 @@ { lib , stdenv , fetchFromGitHub +, unstableGitUpdater +, runCommand , cmake , rocm-cmake , hip , openmp -, gtest ? null +, clang-tools-extra +, gtest , buildTests ? false , buildExamples ? false -, gpuTargets ? null # gpuTargets = [ "gfx803" "gfx900" "gfx1030" ... ] +, gpuTargets ? [ ] # gpuTargets = [ "gfx803" "gfx900" "gfx1030" ... ] }: -assert buildTests -> gtest != null; +let + # This is now over 3GB, to allow hydra caching we separate it + ck = stdenv.mkDerivation (finalAttrs: { + pname = "composable_kernel"; + version = "unstable-2023-01-16"; -# Several tests seem to either not compile or have a race condition -# Undefined reference to symbol '_ZTIN7testing4TestE' -# Try removing this next update -assert buildTests == false; + outputs = [ + "out" + ] ++ lib.optionals buildTests [ + "test" + ] ++ lib.optionals buildExamples [ + "example" + ]; -stdenv.mkDerivation rec { - pname = "composable_kernel"; - version = "unstable-2022-11-02"; + # ROCm 5.6 should release composable_kernel as stable with a tag in the future + src = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "composable_kernel"; + rev = "80e05267417f948e4f7e63c0fe807106d9a0c0ef"; + hash = "sha256-+c0E2UtlG/abweLwCWWjNHDO5ZvSIVKwwwettT9mqR4="; + }; - outputs = [ - "out" - ] ++ lib.optionals buildTests [ - "test" - ] ++ lib.optionals buildExamples [ - "example" - ]; + nativeBuildInputs = [ + cmake + rocm-cmake + hip + clang-tools-extra + ]; - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "composable_kernel"; - rev = "79aa3fb1793c265c59d392e916baa851a55521c8"; - hash = "sha256-vIfMdvRYCTqrjMGSb7gQfodzLw2wf3tGoCAa5jtfbvw="; - }; + buildInputs = [ + openmp + ]; - nativeBuildInputs = [ - cmake - rocm-cmake - hip - ]; + cmakeFlags = [ + "-DCMAKE_C_COMPILER=hipcc" + "-DCMAKE_CXX_COMPILER=hipcc" + ] ++ lib.optionals (gpuTargets != [ ]) [ + "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" + "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" + ] ++ lib.optionals buildTests [ + "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names + ]; - buildInputs = [ - openmp - ] ++ lib.optionals buildTests [ - gtest - ]; + # No flags to build selectively it seems... + postPatch = lib.optionalString (!buildTests) '' + substituteInPlace CMakeLists.txt \ + --replace "add_subdirectory(test)" "" + '' + lib.optionalString (!buildExamples) '' + substituteInPlace CMakeLists.txt \ + --replace "add_subdirectory(example)" "" + ''; - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - ] ++ lib.optionals (gpuTargets != null) [ - "-DGPU_TARGETS=${lib.strings.concatStringsSep ";" gpuTargets}" - ]; + postInstall = lib.optionalString buildTests '' + mkdir -p $test/bin + mv $out/bin/test_* $test/bin + '' + lib.optionalString buildExamples '' + mkdir -p $example/bin + mv $out/bin/example_* $example/bin + ''; - # No flags to build selectively it seems... - postPatch = '' - substituteInPlace test/CMakeLists.txt \ - --replace "include(googletest)" "" + passthru.updateScript = unstableGitUpdater { }; - substituteInPlace CMakeLists.txt \ - --replace "enable_testing()" "" - '' + lib.optionalString (!buildTests) '' - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(test)" "" - '' + lib.optionalString (!buildExamples) '' - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(example)" "" + meta = with lib; { + description = "Performance portable programming model for machine learning tensor operators"; + homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + }; + }); + + ckProfiler = runCommand "ckProfiler" { preferLocalBuild = true; } '' + cp -a ${ck}/bin/ckProfiler $out ''; +in stdenv.mkDerivation { + inherit (ck) pname version outputs src passthru meta; + + dontUnpack = true; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall - postInstall = '' mkdir -p $out/bin - mv bin/ckProfiler $out/bin + cp -as ${ckProfiler} $out/bin/ckProfiler + cp -an ${ck}/* $out '' + lib.optionalString buildTests '' - mkdir -p $test/bin - mv bin/test_* $test/bin + cp -a ${ck.test} $test '' + lib.optionalString buildExamples '' - mkdir -p $example/bin - mv bin/example_* $example/bin + cp -a ${ck.example} $example + '' + '' + runHook postInstall ''; - meta = with lib; { - description = "Performance portable programming model for machine learning tensor operators"; - homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; - }; + # Fix paths + preFixup = '' + substituteInPlace $out/lib/cmake/composable_kernel/*.cmake \ + --replace "${ck}" "$out" + ''; } diff --git a/pkgs/development/libraries/coost/default.nix b/pkgs/development/libraries/coost/default.nix new file mode 100644 index 000000000000..5d692edd434e --- /dev/null +++ b/pkgs/development/libraries/coost/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, gitUpdater +, withCurl ? true, withOpenSSL ? true }: + +stdenv.mkDerivation rec { + pname = "coost"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "idealvin"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-qpJh1yl0lYYszNHGo5Jkbzal2hnVzg7UUxiyg/Grva8="; + }; + + postPatch = '' + substituteInPlace cmake/coost.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \ + ''; + + nativeBuildInputs = [ cmake ]; + buildInputs = lib.optional withCurl curl ++ lib.optional withOpenSSL openssl; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ] + ++ lib.optional withCurl "-DWITH_LIBCURL=ON" + ++ lib.optional withOpenSSL "-DWITH_OPENSSL=ON"; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "A tiny boost library in C++11"; + homepage = "https://github.com/idealvin/coost"; + license = licenses.mit; + maintainers = with maintainers; [ candyc1oud ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/cpp-jwt/default.nix b/pkgs/development/libraries/cpp-jwt/default.nix new file mode 100644 index 000000000000..c2c24238b150 --- /dev/null +++ b/pkgs/development/libraries/cpp-jwt/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, cmake, openssl, gtest, nlohmann_json }: + +stdenv.mkDerivation rec { + pname = "cpp-jwt"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "arun11299"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-5hVsFanTCT/uLLXrnb2kMvmL6qs9RXVkvxdWaT6m4mk="; + }; + + cmakeFlags = [ + "-DCPP_JWT_USE_VENDORED_NLOHMANN_JSON=OFF" + "-DCPP_JWT_BUILD_EXAMPLES=OFF" + ]; + + nativeBuildInputs = [ cmake gtest ]; + + buildInputs = [ openssl nlohmann_json ]; + + doCheck = true; + + meta = { + description = "JSON Web Token library for C++"; + homepage = "https://github.com/arun11299/cpp-jwt"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 385cfb81a56d..9cea13e6596e 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - checkInputs = [ cppunit ]; + nativeCheckInputs = [ cppunit ]; # Otherwise, tests fail since the resulting shared object libc++utilities.so is only available in PWD of the make files preCheck = '' checkFlagsArray+=( diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index e0f9ed599123..718c73fd3f5f 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, cmake, pcre, zlib, python2, openssl }: +{ lib, stdenv, fetchurl, cmake, pcre, zlib, python3, openssl }: stdenv.mkDerivation rec { pname = "cppcms"; - version = "1.2.1"; + version = "2.0.0.beta2"; src = fetchurl { - url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2"; - sha256 = "0lmcdjzicmzhnr8pa0q3f5lgapz2cnh9w0dr56i4kj890iqwgzhh"; + url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2"; + sha256 = "sha256-aXAxx9FB/dIVxr5QkLZuIQamO7PlLwnugSDo78bAiiE="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ pcre zlib python2 openssl ]; + buildInputs = [ pcre zlib python3 openssl ]; strictDeps = true; @@ -21,9 +21,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://cppcms.com"; description = "High Performance C++ Web Framework"; - platforms = platforms.linux ; - license = licenses.lgpl3; + platforms = platforms.linux; + license = licenses.mit; maintainers = [ maintainers.juliendehos ]; }; } - diff --git a/pkgs/development/libraries/criterion/default.nix b/pkgs/development/libraries/criterion/default.nix index eb2a1d6c6ec4..9b3304f6012f 100644 --- a/pkgs/development/libraries/criterion/default.nix +++ b/pkgs/development/libraries/criterion/default.nix @@ -27,10 +27,9 @@ stdenv.mkDerivation rec { libffi ]; - checkInputs = with python3Packages; [ cram ]; + nativeCheckInputs = with python3Packages; [ cram ]; doCheck = true; - checkTarget = "test"; postPatch = '' patchShebangs ci/isdir.py src/protocol/gen-pb.py diff --git a/pkgs/development/libraries/crocoddyl/default.nix b/pkgs/development/libraries/crocoddyl/default.nix new file mode 100644 index 000000000000..2a8267f9d6b9 --- /dev/null +++ b/pkgs/development/libraries/crocoddyl/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, example-robot-data +, pinocchio +, pythonSupport ? false +, python3Packages +}: + +stdenv.mkDerivation rec { + pname = "crocoddyl"; + version = "1.9.0"; + + src = fetchFromGitHub { + owner = "loco-3d"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-IQ+8ZZXVTTRFa4uGetpylRab4P9MSTU2YtytYA3z6ys="; + fetchSubmodules = true; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ]; + + propagatedBuildInputs = lib.optionals (!pythonSupport) [ + example-robot-data + pinocchio + ] ++ lib.optionals pythonSupport [ + python3Packages.example-robot-data + python3Packages.pinocchio + ]; + + cmakeFlags = lib.optionals (!pythonSupport) [ + "-DBUILD_EXAMPLES=OFF" + "-DBUILD_PYTHON_INTERFACE=OFF" + ]; + + meta = with lib; { + description = "Crocoddyl optimal control library"; + homepage = "https://github.com/loco-3d/crocoddyl"; + license = licenses.bsd3; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index a31a4472e1c4..b0568e3c355e 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "crypto++"; - version = "8.6.0"; + version = "8.7.0"; underscoredVersion = lib.strings.replaceStrings ["."] ["_"] version; src = fetchFromGitHub { owner = "weidai11"; repo = "cryptopp"; rev = "CRYPTOPP_${underscoredVersion}"; - hash = "sha256-a3TYaK34WvKEXN7LKAfGwQ3ZL6a3k/zMZyyVfnkQqO4="; + hash = "sha256-KtZXW7+J9a4uKHnK8sqj5WVaIjG3d6tzBBDxa7Wv4AE="; }; outputs = [ "out" "dev" ]; @@ -49,11 +49,6 @@ 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 = with lib; { description = "A free C++ class library of cryptographic schemes"; diff --git a/pkgs/development/libraries/ctre/default.nix b/pkgs/development/libraries/ctre/default.nix index b91c00930ae0..2b3631a565da 100644 --- a/pkgs/development/libraries/ctre/default.nix +++ b/pkgs/development/libraries/ctre/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ctre"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { owner = "hanickadot"; repo = "compile-time-regular-expressions"; rev = "v${version}"; - hash = "sha256-KqYBSY45x8FDQ0YgjrKoZdOiuhf33gv5w160/dSsSsg="; + hash = "sha256-pO6PW4oZsCA2xaMCsaJz2Bu203zyMUkbjO3OOBEbSiw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/development/libraries/cutee/default.nix index 748d495063de..07e2b7cbcee2 100644 --- a/pkgs/development/libraries/cutee/default.nix +++ b/pkgs/development/libraries/cutee/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ Unit Testing Easy Environment"; - homepage = "http://www.codesink.org/cutee_unit_testing.html"; + homepage = "https://www.codesink.org/cutee_unit_testing.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/cxx-rs/Cargo.lock b/pkgs/development/libraries/cxx-rs/Cargo.lock index 6714e2f8a474..70bd50ec869f 100644 --- a/pkgs/development/libraries/cxx-rs/Cargo.lock +++ b/pkgs/development/libraries/cxx-rs/Cargo.lock @@ -8,12 +8,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - [[package]] name = "bitflags" version = "1.3.2" @@ -22,9 +16,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" dependencies = [ "jobserver", ] @@ -37,31 +31,29 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clang-ast" -version = "0.1.7" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c380e0de48337007dfc91b09eb75f567f5f08209437857fbaabbaf2e77e830" +checksum = "52a6edb6daf3175c637a7c78e46cde7729af8d07d43f36935680a88fd55c0f1c" dependencies = [ "serde", ] [[package]] name = "clap" -version = "3.2.14" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54635806b078b7925d6e36810b1755f2a4b5b4d57560432c1ecf60bcbe10602b" +checksum = "aa91278560fc226a5d9d736cc21e485ff9aad47d26b8ffe1f54cba868b684b9f" dependencies = [ "bitflags", "clap_lex", - "indexmap", "strsim", - "textwrap", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" dependencies = [ "os_str_bytes", ] @@ -87,7 +79,7 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.72" +version = "1.0.86" dependencies = [ "cc", "cxx-build", @@ -102,10 +94,11 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.72" +version = "1.0.86" dependencies = [ "cc", "codespan-reporting", + "cxx", "cxx-gen", "once_cell", "pkg-config", @@ -117,7 +110,7 @@ dependencies = [ [[package]] name = "cxx-gen" -version = "0.7.72" +version = "0.7.86" dependencies = [ "codespan-reporting", "proc-macro2", @@ -136,7 +129,7 @@ dependencies = [ [[package]] name = "cxxbridge-cmd" -version = "1.0.72" +version = "1.0.86" dependencies = [ "clap", "codespan-reporting", @@ -147,11 +140,11 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.72" +version = "1.0.86" [[package]] name = "cxxbridge-macro" -version = "1.0.72" +version = "1.0.86" dependencies = [ "clang-ast", "cxx", @@ -174,15 +167,15 @@ dependencies = [ [[package]] name = "dissimilar" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c97b9233581d84b8e1e689cdd3a47b6f69770084fc246e86a7f78b0d9c1d4a5" +checksum = "bd5f0c7e4bd266b8ab2550e6238d2e74977c23c15536ac7be45e9c95e2e3fbbb" [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "miniz_oxide", @@ -190,52 +183,36 @@ dependencies = [ [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "indexmap" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -dependencies = [ - "autocfg", - "hashbrown", -] +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "itoa" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "jobserver" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" dependencies = [ "libc", ] [[package]] name = "libc" -version = "0.2.126" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "link-cplusplus" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cae2cd7ba2f3f63938b9c724475dfb7b9861b545a90324476324ed21dbc8c8" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ "cc", ] @@ -252,81 +229,81 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.5.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] [[package]] name = "once_cell" -version = "1.13.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "os_str_bytes" -version = "6.2.0" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "proc-macro2" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] [[package]] name = "rustversion" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c8ad4f0c00e1eb5bc7614d236a7f1300e3dbd76b68cac8e06fb00b015ad8d8" +checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" [[package]] name = "ryu" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "scratch" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96311ef4a16462c757bb6a39152c40f58f31cd2602a40fceb937e2bc34e6cbab" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" [[package]] name = "serde" -version = "1.0.140" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.140" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -335,9 +312,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.82" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ "itoa", "ryu", @@ -352,9 +329,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.98" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -370,26 +347,20 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "textwrap" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" - [[package]] name = "toml" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" dependencies = [ "serde", ] [[package]] name = "trybuild" -version = "1.0.63" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "764b9e244b482a9b81bde596aa37aa6f1347bf8007adab25e59f901b32b4e0a0" +checksum = "f1212c215a87a183687a7cc7065901b1a98da6b37277d51a1b5faedbb4efd4f3" dependencies = [ "dissimilar", "glob", @@ -403,15 +374,15 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.2" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "winapi" diff --git a/pkgs/development/libraries/cxx-rs/default.nix b/pkgs/development/libraries/cxx-rs/default.nix index 4294cdd646f7..253e70635043 100644 --- a/pkgs/development/libraries/cxx-rs/default.nix +++ b/pkgs/development/libraries/cxx-rs/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cxx-rs"; - version = "1.0.72"; + version = "1.0.86"; src = fetchFromGitHub { owner = "dtolnay"; repo = "cxx"; rev = version; - sha256 = "sha256-+OumeLSgz8kLQKhEc3icCk1q+X+S7Xt+XtAlkx8iguU="; + sha256 = "sha256-bysuvCapesU/HaNfTfMUas7g3clf8299HmCChpd7abY="; }; cargoLock = { diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index 3b8d470d17f0..273bfef3190c 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { sourceRoot = "source/python"; - checkInputs = [ python3Packages.ply ]; + nativeCheckInputs = [ python3Packages.ply ]; preCheck = '' cd ../ diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index db23009b8fa9..883b30c6a576 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -2,7 +2,6 @@ , pam, libxcrypt, fixDarwinDylibNames, autoreconfHook, enableLdap ? false , buildPackages, pruneLibtoolFiles, nixosTests }: -with lib; stdenv.mkDerivation rec { pname = "cyrus-sasl"; version = "2.1.28"; @@ -50,7 +49,7 @@ stdenv.mkDerivation rec { inherit (nixosTests) parsedmarc postfix; }; - meta = { + meta = with lib; { homepage = "https://www.cyrusimap.org/sasl"; description = "Library for adding authentication support to connection-based protocols"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 2cd6463d5c21..20856f2ad9b8 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -3,7 +3,7 @@ , fetchurl , pkg-config , expat -, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal , systemdMinimal , audit , libapparmor @@ -108,7 +108,6 @@ stdenv.mkDerivation rec { passthru = { dbus-launch = "${dbus.lib}/bin/dbus-launch"; - daemon = dbus.out; }; meta = with lib; { diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index a5879011697b..e4333f4c2800 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "-Dgtk_doc=${lib.boolToString (!isCross)}" # gtk-doc does do some gobject introspection, which doesn't yet cross-compile. ] ++ lib.optional isCross "-Dvapi=false"; - checkInputs = [ + nativeCheckInputs = [ dbus # for dbus-daemon ]; diff --git a/pkgs/development/libraries/directx-headers/default.nix b/pkgs/development/libraries/directx-headers/default.nix new file mode 100644 index 000000000000..3ac15bb85e24 --- /dev/null +++ b/pkgs/development/libraries/directx-headers/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja }: +stdenv.mkDerivation rec { + pname = "directx-headers"; + version = "1.608.2"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "DirectX-Headers"; + rev = "v${version}"; + hash = "sha256-F0riTDJpydqe4yhE9GKSSvnRI0Sl3oY2sOP+H/vDHG0="; + }; + + nativeBuildInputs = [ meson ninja ]; + + # tests require WSL2 + mesonFlags = [ "-Dbuild-test=false" ]; + + meta = with lib; { + description = "Official D3D12 headers from Microsoft"; + homepage = "https://github.com/microsoft/DirectX-Headers"; + license = licenses.mit; + maintainers = with maintainers; [ k900 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/discord-gamesdk/default.nix b/pkgs/development/libraries/discord-gamesdk/default.nix new file mode 100644 index 000000000000..513eebe7124f --- /dev/null +++ b/pkgs/development/libraries/discord-gamesdk/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchzip +, autoPatchelfHook +}: + +stdenv.mkDerivation rec { + pname = "discord-gamesdk"; + version = "3.2.1"; + + src = fetchzip { + url = "https://dl-game-sdk.discordapp.net/${version}/discord_game_sdk.zip"; + sha256 = "sha256-83DgL9y3lHLLJ8vgL3EOVk2Tjcue64N+iuDj/UpSdLc="; + stripRoot = false; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + installPhase = + let + processor = stdenv.hostPlatform.uname.processor; + sharedLibrary = stdenv.hostPlatform.extensions.sharedLibrary; + in + '' + runHook preInstall + + install -Dm555 lib/${processor}/discord_game_sdk${sharedLibrary} $out/lib/discord_game_sdk${sharedLibrary} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://discord.com/developers/docs/game-sdk/sdk-starter-guide"; + description = "Library to allow other programs to interact with the Discord desktop application"; + license = licenses.unfree; + maintainers = with maintainers; [ tomodachi94 ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "x86_64-windows" ]; + }; +} diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 748e1e756cb3..cb7b7466d053 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -1,22 +1,22 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv -, raft-canonical, sqlite-replication }: +, raft-canonical, sqlite, lxd }: stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.9.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "canonical"; repo = pname; - rev = "v${version}"; - sha256 = "0zalsvr0vy7632nhm96a29lrfy18iqsmbxpyz2lvq80mrjlbrzsn"; + rev = "refs/tags/v${version}"; + hash = "sha256-x76f9Sw3BMgWSY7DLIqDjbggp/qVu8mJBtf4znTz9hA="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; buildInputs = [ libuv raft-canonical.dev - sqlite-replication + sqlite ]; enableParallelBuilding = true; @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; + passthru.tests = { + inherit lxd; + }; + meta = with lib; { description = '' Expose a SQLite database over the network and replicate it across a @@ -33,7 +37,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://dqlite.io/"; license = licenses.asl20; - maintainers = with maintainers; [ joko ]; + maintainers = with maintainers; [ joko adamcstephens ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/development/libraries/draco/default.nix index 1d6a2b4da91c..ab354b836b6a 100644 --- a/pkgs/development/libraries/draco/default.nix +++ b/pkgs/development/libraries/draco/default.nix @@ -43,9 +43,7 @@ stdenv.mkDerivation rec { "-DDRACO_TINYGLTF_PATH=${tinygltf}" ]; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Library for compressing and decompressing 3D geometric meshes and point clouds"; diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index de4aaf32d980..0eca838dfce8 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib +{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib, fetchpatch # optional but of negligible size , openssl, brotli, c-ares # optional databases @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "drogon"; - version = "1.8.1"; + version = "1.8.3"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${version}"; - sha256 = "sha256-XzSJABYuZaYlNL12bi0ykQ1OyNsvB1AQiSTBPWiTNYU="; + sha256 = "sha256-I3f/8TMGm1G4CFMJJLyiVYso9yTHjeLefS5eaGySvC4="; fetchSubmodules = true; }; @@ -43,6 +43,12 @@ stdenv.mkDerivation rec { # this part of the test would normally fail because it attempts to configure a CMake project that uses find_package on itself # this patch makes drogon and trantor visible to the test ./fix_find_package.patch + + # see https://github.com/drogonframework/drogon/issues/1491 + (fetchpatch { + url = "https://github.com/drogonframework/drogon/commit/7d87d7e0b264ce53aa5ee006fb022d3516c9d666.patch"; + sha256 = "sha256-C4zH9oNMfhkaeVNvZuBuzu1v2vNgg/t+YPitbrmHg+Y="; + }) ]; # modifying PATH here makes drogon_ctl visible to the test diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 654c58ba694d..8d95bedf0223 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-XCEX2VCynbMUP5xsxWq8PlHnfrBfES5c2fuu2jhM+tI="; + sha256 = "sha256-no4fcukEpzKmh2i41sdXGDljGhEDkzk3rYBATqlq6Gw="; }; patches = [ ./version.patch ]; diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix index 3197e3abed9e..75841b5d0d71 100644 --- a/pkgs/development/libraries/dyncall/default.nix +++ b/pkgs/development/libraries/dyncall/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "dyncall"; - version = "1.3"; + version = "1.4"; src = fetchurl { url = "https://www.dyncall.org/r${version}/dyncall-${version}.tar.gz"; - # https://www.dyncall.org/r1.3/SHA256 - sha256 = "sha256-q/Ys/DHr1/IWWNqhNwp3gcxRQxYrwIaDhKwH3vnj05A="; + # https://www.dyncall.org/r1.4/SHA256 + sha256 = "sha256-FEN9u+87bckkg/ZQfq+CWrl5ZKie7K6Ms0emvsnDKq4="; }; # XXX: broken tests, failures masked, lets avoid crashing a bunch for now :) diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 2b2ffbea31e2..15a056edb691 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -22,9 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" ]; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://troglobit.com/projects/editline/"; diff --git a/pkgs/development/libraries/elfio/default.nix b/pkgs/development/libraries/elfio/default.nix index 5bf4f3a33308..13bdbe735d63 100644 --- a/pkgs/development/libraries/elfio/default.nix +++ b/pkgs/development/libraries/elfio/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - checkInputs = [ boost ]; + nativeCheckInputs = [ boost ]; cmakeFlags = [ "-DELFIO_BUILD_TESTS=ON" ]; diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index 11e8ac1309f6..de54bb746bd6 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -18,13 +18,13 @@ assert blas.isILP64 == scalapack.isILP64; stdenv.mkDerivation rec { pname = "elpa"; - version = "2022.05.001"; + version = "2022.11.001"; passthru = { inherit (blas) isILP64; }; src = fetchurl { url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz"; - sha256 = "sha256-IH5vJtZTL7cDc6/D7z04JVITr2He9lnCXa06MOT8o4s="; + sha256 = "sha256-NeOX18CvlbtDvHvvf/8pQlwdpAD6DNhq6NO9L/L52Zk="; }; patches = [ diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index fb8db3a218e6..e4509d058dae 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.4"; + version = "3.13.5"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "sha256-WmblxU1kHiC8+hYAfUDcbJ1/e80f1LcKX8qCwgaBwGc="; + sha256 = "sha256-tfM4SGOFVBG0pQK9B/iN2xDaW3yjefnTtsoUad75m80="; }; postPatch = '' diff --git a/pkgs/development/libraries/enchant/1.x.nix b/pkgs/development/libraries/enchant/1.x.nix deleted file mode 100644 index 172d6747aa1c..000000000000 --- a/pkgs/development/libraries/enchant/1.x.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, aspell, pkg-config, glib, hunspell, hspell }: - -stdenv.mkDerivation rec { - version = "1.6.1"; - pname = "enchant"; - - src = fetchurl { - url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${pname}-${version}.tar.gz"; - sha256 = "1xg3m7mniyqyff8qv46jbfwgchb6di6qxdjnd5sfir7jzv0dkw5y"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ aspell glib hunspell hspell ]; - - meta = with lib; { - description = "Generic spell checking library"; - homepage = "https://abiword.github.io/enchant"; - platforms = platforms.unix; - badPlatforms = [ "x86_64-darwin" ]; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index eaa80586f475..e3975dd0c31e 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nuspell ]; - checkInputs = [ + nativeCheckInputs = [ unittest-cpp ]; diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index 6f8861086396..c52d327c611a 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.11.0"; + version = "3.11.1"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - sha256 = "sha256-urB1oU4Riuo9+DKmMf317bqF4hTcm/zsSLn5fpZY27o="; + sha256 = "sha256-/ZvMyhvnlu/5z4UHhPe8WMXmSA45Kjbr6bRqyVJH310="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index 8d45a7186e74..c0119cbfac32 100644 --- a/pkgs/development/libraries/ethash/default.nix +++ b/pkgs/development/libraries/ethash/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmake ]; - checkInputs = [ + nativeCheckInputs = [ gbenchmark gtest ]; diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/development/libraries/example-robot-data/default.nix new file mode 100644 index 000000000000..08a650dbca00 --- /dev/null +++ b/pkgs/development/libraries/example-robot-data/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pythonSupport ? false +, python3Packages +}: + +stdenv.mkDerivation rec { + pname = "example-robot-data"; + version = "4.0.3"; + + src = fetchFromGitHub { + owner = "Gepetto"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-rxVyka8tcF/CmGTVNyh3FPR1LVa6JOAN+9zjElgqCak="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = lib.optionals pythonSupport [ + python3Packages.pinocchio + ]; + + cmakeFlags = lib.optionals (!pythonSupport) [ + "-DBUILD_PYTHON_INTERFACE=OFF" + ]; + + meta = with lib; { + description = "Set of robot URDFs for benchmarking and developed examples."; + homepage = "https://github.com/Gepetto/example-robot-data"; + license = licenses.bsd3; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index 3586a674904b..d17ca4ea751e 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }: +{ lib, stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }: stdenv.mkDerivation rec { pname = "exempi"; @@ -21,9 +21,11 @@ stdenv.mkDerivation rec { doCheck = stdenv.isLinux && stdenv.is64bit; dontDisableStatic = doCheck; + enableParallelBuilding = true; + meta = with lib; { description = "An implementation of XMP (Adobe's Extensible Metadata Platform)"; - homepage = "https://libopenraw.freedesktop.org/wiki/Exempi/"; + homepage = "https://libopenraw.freedesktop.org/exempi/"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 1e671c7b2e7d..436d3cdf3ad1 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.27.5"; + version = "0.27.6"; outputs = [ "out" "lib" "dev" "doc" "man" "static" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; - sha256 = "sha256-5kdzw/YzpYldfHjUSPOzu3gW2TPgxt8Oxs0LZDFphgA="; + sha256 = "sha256-Ddy605EQhsATzmdhN3Zq+2ksYMrHEfucA+IqezYmjo4="; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { zlib ]; - checkInputs = [ + nativeCheckInputs = [ libxml2.bin python3 which @@ -62,9 +62,6 @@ stdenv.mkDerivation rec { doCheck = true; - # Test setup found by inspecting ${src}/.travis/run.sh; problems without cmake. - checkTarget = "tests"; - preCheck = '' patchShebangs ../test/ mkdir ../test/tmp diff --git a/pkgs/development/libraries/exprtk/default.nix b/pkgs/development/libraries/exprtk/default.nix new file mode 100644 index 000000000000..3e109956c674 --- /dev/null +++ b/pkgs/development/libraries/exprtk/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "exprtk"; + version = "unstable-2021-12-31"; + + src = fetchFromGitHub { + owner = "ArashPartow"; + repo = "exprtk"; + rev = "806c519c91fd08ba4fa19380dbf3f6e42de9e2d1"; + hash = "sha256-5/k+y3gNJeggfwXmtAVqmaiV+BXX+WKtWwZWcQSrQDM="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dm644 exprtk.hpp "$out/include/exprtk.hpp" + runHook postInstall + ''; + + meta = with lib; { + description = "The C++ Mathematical Expression Toolkit Library"; + homepage = "https://www.partow.net/programming/exprtk/index.html"; + license = licenses.mit; + maintainers = with maintainers; [ anselmschueler ]; + }; +} diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index dbc56572d537..42f1f8db59bb 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -5,7 +5,6 @@ assert mp4v2Support -> (mp4v2 != null); -with lib; stdenv.mkDerivation rec { pname = "faac"; version = "1.30"; @@ -16,19 +15,19 @@ stdenv.mkDerivation rec { }; configureFlags = [ ] - ++ optional mp4v2Support "--with-external-mp4v2" - ++ optional drmSupport "--enable-drm"; + ++ lib.optional mp4v2Support "--with-external-mp4v2" + ++ lib.optional drmSupport "--enable-drm"; hardeningDisable = [ "format" ]; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ] - ++ optional mp4v2Support mp4v2; + ++ lib.optional mp4v2Support mp4v2; enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Open source MPEG-4 and MPEG-2 AAC encoder"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index e62a90fcd2bf..f72e6f4f9543 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -11,7 +11,6 @@ , vlc }: -with lib; stdenv.mkDerivation rec { pname = "faad2"; version = "2.10.1"; @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { }; configureFlags = [] - ++ optional drmSupport "--with-drm"; + ++ lib.optional drmSupport "--with-drm"; nativeBuildInputs = [ autoreconfHook ]; @@ -34,7 +33,7 @@ stdenv.mkDerivation rec { ocaml-faad = ocamlPackages.faad; }; - meta = { + meta = with lib; { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; homepage = "https://sourceforge.net/projects/faac/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/fancypp/default.nix b/pkgs/development/libraries/fancypp/default.nix new file mode 100644 index 000000000000..f93ab77c63de --- /dev/null +++ b/pkgs/development/libraries/fancypp/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "fancypp"; + version = "unstable-2021-04-08"; + + src = fetchFromGitHub { + owner = "Curve"; + repo = "fancypp"; + rev = "ede7f712a08f7c66ff4a5590ad94a477c48850a5"; + sha256 = "sha256-E2JsQnvrqrZFYo+xBJr7xDCoPnRQftqUjjBpZzFvIic="; + }; + + # Header-only library. + dontBuild = true; + + installPhase = '' + mkdir "$out" + cp -r include "$out" + ''; + + meta = with lib; { + description = "Tiny C++ Library for terminal colors and more!"; + homepage = "https://github.com/Curve/fancypp"; + maintainers = with maintainers; [ aidalgol ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index bd179c6ee739..f0c692499571 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "22.08"; + version = "23.02"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-ZGyLP7dsVDKPCGA/6MNSEifd1rOcYqLdcEXYIQxrgtE="; + sha256 = "sha256-ycBwkFPzmOMG3umsznVtmE4MXunqCdjPpHgV73T/PMY="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index 5090df411c2f..7b988a9ad86c 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -13,10 +13,6 @@ let "grapheme" "run" ]; - - # Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54 - mesonFeatureFlag = feature: flag: - "-D${feature}=${if flag then "enabled" else "disabled"}"; in stdenv.mkDerivation rec { @@ -36,11 +32,11 @@ stdenv.mkDerivation rec { buildInputs = [ freetype fontconfig pixman tllist ] ++ lib.optionals (withShapingTypes != []) [ harfbuzz ] ++ lib.optionals (builtins.elem "run" withShapingTypes) [ utf8proc ]; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; mesonBuildType = "release"; mesonFlags = builtins.map (t: - mesonFeatureFlag "${t}-shaping" (lib.elem t withShapingTypes) + lib.mesonEnable "${t}-shaping" (lib.elem t withShapingTypes) ) availableShapingTypes; doCheck = true; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 4645e168451b..7dadbcb39502 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Eztc2jUyKRVUiZkYEh+IFHkDuPIy+Gx3ZW/MsuOVaMc="; }; - checkInputs = [ + nativeCheckInputs = [ gmpxx ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config - ] ++ lib.optionals doCheck checkInputs; + ] ++ lib.optionals doCheck nativeCheckInputs; buildInputs = [ givaro blas lapack ]; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index e4c6d4b013c6..a8acf7a7ce61 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -84,6 +84,7 @@ , libmysofa ? null # HRTF support via SOFAlizer #, libnut ? null # NUT (de)muxer, native (de)muser exists , libogg ? null # Ogg container used by vorbis & theora +, libopenmpt ? null # Tracked music files decoder , libopus ? null # Opus de/encoder , librsvg ? null # SVG protocol , libssh ? null # SFTP protocol @@ -154,7 +155,7 @@ * Darwin frameworks */ , Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox -, VideoDecodeAcceleration +, VideoDecodeAcceleration, VideoToolbox }: /* Maintainer notes: @@ -364,6 +365,7 @@ stdenv.mkDerivation rec { (enableFeature (libmodplug != null) "libmodplug") (enableFeature (libmysofa != null) "libmysofa") #(enableFeature (libnut != null) "libnut") + (enableFeature (libopenmpt != null) "libopenmpt") (enableFeature (libopus != null) "libopus") (enableFeature (librsvg != null) "librsvg") (enableFeature (srt != null) "libsrt") @@ -440,7 +442,7 @@ stdenv.mkDerivation rec { buildInputs = [ 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 + libogg libopenmpt libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libxcb libXv libXext libxml2 xz openal ocl-icd opencl-headers openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore zeromq4 zimg zlib openh264 @@ -454,7 +456,7 @@ stdenv.mkDerivation rec { ++ optional (nvdec || nvenc) nv-codec-headers ++ optional cuda-llvm clang ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation - MediaToolbox VideoDecodeAcceleration + MediaToolbox VideoDecodeAcceleration VideoToolbox libiconv ]; buildFlags = [ "all" ] diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index e37e90d553a3..ac88df930768 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -1,15 +1,8 @@ -{ callPackage, fetchpatch, ... }@args: +{ callPackage, ... }@args: callPackage ./generic.nix (rec { - version = "4.4.2"; + version = "4.4.3"; branch = version; - sha256 = "sha256-+YpIJSDEdQdSGpB5FNqp77wThOBZG1r8PaGKqJfeKUg="; + sha256 = "sha256-M7jC281TD+HbVxBBU0Vgm0yiJ70NoeOpMy27DxH9Jzo="; - patches = [ - # SDL2 recently changed their versioning - (fetchpatch { - url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=e5163b1d34381a3319214a902ef1df923dd2eeba"; - hash = "sha256-nLhP2+34cj5EgpnUrePZp60nYAxmbhZAEDfay4pBVk0="; - }) - ]; } // args) diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index bfe8f80032dd..381bb7b2984c 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, ffmpeg, cmake, libpng, pkg-config, libjpeg +{ fetchFromGitHub, lib, stdenv, ffmpeg-headless, cmake, libpng, pkg-config, libjpeg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ ffmpeg libpng libjpeg ]; + buildInputs = [ ffmpeg-headless libpng libjpeg ]; cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ]; # https://github.com/dirkvdb/ffmpegthumbnailer/issues/215 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { This thumbnailer was designed to be as fast and lightweight as possible. The only dependencies are ffmpeg and libpng. "; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl2Plus; maintainers = [ maintainers.jagajaga ]; }; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 4f3d685c1fa4..c5edb5926209 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -14,9 +14,7 @@ , withDoc ? stdenv.cc.isGNU }: -with lib; - -assert elem precision [ "single" "double" "long-double" "quad-precision" ]; +assert lib.elem precision [ "single" "double" "long-double" "quad-precision" ]; stdenv.mkDerivation rec { pname = "fftw-${precision}"; @@ -31,36 +29,36 @@ stdenv.mkDerivation rec { }; outputs = [ "out" "dev" "man" ] - ++ optional withDoc "info"; # it's dev-doc only + ++ lib.optional withDoc "info"; # it's dev-doc only outputBin = "dev"; # fftw-wisdom nativeBuildInputs = [ gfortran ]; - buildInputs = optionals stdenv.cc.isClang [ + buildInputs = lib.optionals stdenv.cc.isClang [ # TODO: This may mismatch the LLVM version sin the stdenv, see #79818. llvmPackages.openmp - ] ++ optional enableMpi mpi; + ] ++ lib.optional enableMpi mpi; configureFlags = [ "--enable-shared" "--enable-threads" ] - ++ optional (precision != "double") "--enable-${precision}" + ++ lib.optional (precision != "double") "--enable-${precision}" # all x86_64 have sse2 # however, not all float sizes fit - ++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2" - ++ optional enableAvx "--enable-avx" - ++ optional enableAvx2 "--enable-avx2" - ++ optional enableAvx512 "--enable-avx512" - ++ optional enableFma "--enable-fma" + ++ lib.optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2" + ++ lib.optional enableAvx "--enable-avx" + ++ lib.optional enableAvx2 "--enable-avx2" + ++ lib.optional enableAvx512 "--enable-avx512" + ++ lib.optional enableFma "--enable-fma" ++ [ "--enable-openmp" ] - ++ optional enableMpi "--enable-mpi" + ++ lib.optional enableMpi "--enable-mpi" # doc generation causes Fortran wrapper generation which hard-codes gcc - ++ optional (!withDoc) "--disable-doc"; + ++ lib.optional (!withDoc) "--disable-doc"; enableParallelBuilding = true; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; meta = with lib; { description = "Fastest Fourier Transform in the West library"; diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 88f7f6701b34..ad883b12e4eb 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "flatbuffers"; - version = "22.10.26"; + version = "22.11.23"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - sha256 = "sha256-Kub076FkWwHNlphGtTx2c3Jojv8otKLo492uN6Oq1F0="; + sha256 = "sha256-I41bslYoSGPNm1+Xpf4kHFDnIqLN8vg5cEqbFIpDT5A="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index d79923c0f81a..14e6abd90065 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -54,14 +54,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "flatpak"; - version = "1.14.0"; + version = "1.14.1"; # 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/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-jidpc3cOok3fJZetSuzTa5g5PmvekeSOF0OqymfyeBU="; # Taken from https://github.com/flatpak/flatpak/releases/ + sha256 = "sha256-CjyCM0MBjMWJhrbIJUVgnIzb8Pul8B2IMHvRSstd058="; # Taken from https://github.com/flatpak/flatpak/releases/ }; patches = [ @@ -89,10 +89,6 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/NixOS/nixpkgs/issues/53441 ./unset-env-vars.patch - # Do not clear XDG_DATA_DIRS in fish shell - # https://github.com/flatpak/flatpak/pull/5123 - ./no-breaking-fish.patch - # The icon validator needs to access the gdk-pixbuf loaders in the Nix store # and cannot bind FHS paths since those are not available on NixOS. finalAttrs.passthru.icon-validator-patch @@ -144,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: { ostree ]; - checkInputs = [ + nativeCheckInputs = [ valgrind ]; diff --git a/pkgs/development/libraries/flatpak/no-breaking-fish.patch b/pkgs/development/libraries/flatpak/no-breaking-fish.patch deleted file mode 100644 index 2a67aead1201..000000000000 --- a/pkgs/development/libraries/flatpak/no-breaking-fish.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/profile/flatpak.fish -+++ b/profile/flatpak.fish -@@ -1,7 +1,7 @@ - if type -q flatpak - # Set XDG_DATA_DIRS to include Flatpak installations - -- set -x --path XDG_DATA_DIRS -+ set -x --path XDG_DATA_DIRS $XDG_DATA_DIRS - - set -q XDG_DATA_DIRS[1]; or set XDG_DATA_DIRS /usr/local/share /usr/share - set -q XDG_DATA_HOME; or set -l XDG_DATA_HOME $HOME/.local/share diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 76107e1e0702..5f810ecbe5ed 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -42,11 +42,6 @@ let }; in { - fmt_7 = generic { - version = "7.1.3"; - sha256 = "08hyv73qp2ndbs0isk8pspsphdzz5qh8czl3wgyxy3mmif9xdg29"; - }; - fmt_8 = generic { version = "8.1.1"; sha256 = "sha256-leb2800CwdZMJRWF5b1Y9ocK0jXpOX/nwo95icDf308="; diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 0471283ef00c..57e90cd87f07 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { sqlite ]; - checkInputs = [ + nativeCheckInputs = [ dbus (python3.withPackages (pp: with pp; [ python-dbusmock @@ -119,6 +119,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/Folks"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.gnu ++ platforms.linux; # arbitrary choice + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 1c132b8742c5..323a9a2f8b46 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2022.11.07.00"; + version = "2022.11.28.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-RzVJuhyLZe5KGnNYUxkiAeYdQf4Amm8cAlV/12kmTj4="; + sha256 = "sha256-TI3uMlkssKtTvxqj9Et12aAjbHoV9FVBvrZr7oCFlIo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/fox/clang.patch b/pkgs/development/libraries/fox/clang.patch deleted file mode 100644 index 0ca2ebf0d8da..000000000000 --- a/pkgs/development/libraries/fox/clang.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/FXReactor.cpp b/src/FXReactor.cpp -index 1ecdb45..9058a30 100644 ---- a/src/FXReactor.cpp -+++ b/src/FXReactor.cpp -@@ -452,7 +452,7 @@ FXint FXReactor::processActiveHandles(FXTime block,FXuint flags){ - } - - // Normal case -- if(0<=hand){ -+ if(0==hand){ - - // Any handles active? - if(0 util-linuxMinimal != null; @@ -32,7 +31,7 @@ assert stdenv.isLinux -> util-linuxMinimal != null; # $out/bin/gtester-report' to postInstall if this is solved /* * Use --enable-installed-tests for GNOME-related packages, - and use them as a separately installed tests runned by Hydra + and use them as a separately installed tests run by Hydra (they should test an already installed package) https://wiki.gnome.org/GnomeGoals/InstalledTests * Support org.freedesktop.Application, including D-Bus activation from desktop files @@ -56,11 +55,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.74.1"; + version = "2.74.3"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "CrmBYY0dtHhF5WQXsNfBI/gaNCeyuck/Wkb/W7uWSWQ="; + sha256 = "6bxB7NlpDZvGqXDMc4ARm4KOW2pLFsOTxjiz3CuHy8s="; }; patches = lib.optionals stdenv.isDarwin [ @@ -68,6 +67,19 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./quark_init_on_demand.patch ./gobject_init_on_demand.patch + + # Fix error about missing sentinel in glib/tests/cxx.cpp + # These two commits are part of already merged glib MRs 3033 and 3031: + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3033 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/0ca5254c5d92aec675b76b4bfa72a6885cde6066.patch"; + sha256 = "OfD5zO/7JIgOMLc0FAgHV9smWugFJuVPHCn9jTsMQJg="; + }) + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3031 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/7dc19632f3115e3f517c6bc80436fe72c1dcdeb4.patch"; + sha256 = "v28Yk+R0kN9ssIcvJudRZ4vi30rzQEE8Lsd1kWp5hbM="; + }) ] ++ [ ./glib-appinfo-watch.patch ./schema-override-variable.patch @@ -106,12 +118,18 @@ stdenv.mkDerivation (finalAttrs: { # https://gitlab.gnome.org/GNOME/glib/-/issues/820 ./skip-timer-test.patch - # Fix infinite loop (e.g. in gnome-keyring) - # https://github.com/NixOS/nixpkgs/pull/197754#issuecomment-1312805358 - # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3039 + # GVariant security fixes + # https://discourse.gnome.org/t/multiple-fixes-for-gvariant-normalisation-issues-in-glib/12835 (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/glib/-/commit/2a36bb4b7e46f9ac043561c61f9a790786a5440c.patch"; - sha256 = "b77Hxt6WiLxIGqgAj9ZubzPWrWmorcUOEe/dp01BcXA="; + url = "https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3126.patch"; + sha256 = "CNCxouYy8xNHt4eJtPZ2eOi9b0SxzI2DkklNfQMk3d8="; + }) + + # Menu model security fix + # https://discourse.gnome.org/t/fixes-for-gdbusmenumodel-crashes-in-glib/12846 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/4f4d770a1e40f719d5a310cffdac29cbb4e20c11.patch"; + sha256 = "+S44AnC86HfbMwkRe1ll54IK9pLxaFD3LqiVhPelnXI="; }) ]; @@ -152,12 +170,12 @@ stdenv.mkDerivation (finalAttrs: { perl python3 gettext + libxslt + docbook_xsl ] ++ lib.optionals buildDocs [ gtk-doc - docbook_xsl docbook_xml_dtd_45 libxml2 - libxslt ]; propagatedBuildInputs = [ zlib libffi gettext libiconv ]; @@ -170,6 +188,9 @@ stdenv.mkDerivation (finalAttrs: { "-Ddevbindir=${placeholder "dev"}/bin" ] ++ lib.optionals (!stdenv.isDarwin) [ "-Dman=true" # broken on Darwin + ] ++ lib.optionals stdenv.isFreeBSD [ + "-Db_lundef=false" + "-Dxattr=false" ]; NIX_CFLAGS_COMPILE = toString [ @@ -235,7 +256,7 @@ stdenv.mkDerivation (finalAttrs: { done ''; - checkInputs = [ tzdata desktop-file-utils shared-mime-info ]; + nativeCheckInputs = [ tzdata desktop-file-utils shared-mime-info ]; preCheck = lib.optionalString finalAttrs.doCheck or config.doCheckByDefault or false '' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/glib-${finalAttrs.version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" @@ -244,7 +265,7 @@ stdenv.mkDerivation (finalAttrs: { export XDG_RUNTIME_HOME="$TMP" export HOME="$TMP" export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share" - export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" + export G_TEST_DBUS_DAEMON="${dbus}/bin/dbus-daemon" export PATH="$PATH:$(pwd)/gobject" echo "PATH=$PATH" ''; @@ -266,60 +287,23 @@ stdenv.mkDerivation (finalAttrs: { packageName = "glib"; versionPolicy = "odd-unstable"; }; - /* - can be used as part of an update script to automatically create a patch - hardcoding the path of all gsettings schemas in C code. - For example: - passthru = { - hardcodeGsettingsPatch = glib.mkHardcodeGsettingsPatch { - inherit src; - glib-schema-to-var = { - ... - }; - }; - updateScript = - let - updateSource = ...; - patch = _experimental-update-script-combinators.copyAttrOutputToFile "evolution-ews.hardcodeGsettingsPatch" ./hardcode-gsettings.patch; - in - _experimental-update-script-combinators.sequence [ - updateSource - patch - ]; - }; - } - takes as input a mapping from schema path to variable name. - For example `{ "org.gnome.evolution" = "EVOLUTION_SCHEMA_PATH"; }` - hardcodes looking for `org.gnome.evolution` into `@EVOLUTION_SCHEMA_PATH@`. - All schemas must be listed. - */ - mkHardcodeGsettingsPatch = { src, glib-schema-to-var }: - runCommand - "hardcode-gsettings.patch" - { + mkHardcodeGsettingsPatch = + { + src, + glib-schema-to-var, + }: + builtins.trace + "glib.mkHardcodeGsettingsPatch is deprecated, please use makeHardcodeGsettingsPatch instead" + (makeHardcodeGsettingsPatch { inherit src; - nativeBuildInputs = [ - git - coccinelle - python3 # For patch script - ]; - } - '' - unpackPhase - cd "''${sourceRoot:-.}" - set -x - cp ${builtins.toFile "glib-schema-to-var.json" (builtins.toJSON glib-schema-to-var)} ./glib-schema-to-var.json - git init - git add -A - spatch --sp-file "${./hardcode-gsettings.cocci}" --dir . --in-place - git diff > "$out" - ''; + schemaIdToVariableMapping = glib-schema-to-var; + }); }; meta = with lib; { description = "C library of programming buildings blocks"; - homepage = "https://www.gtk.org/"; + homepage = "https://wiki.gnome.org/Projects/GLib"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]); platforms = platforms.unix; diff --git a/pkgs/development/libraries/glib/hardcode-gsettings.cocci b/pkgs/development/libraries/glib/hardcode-gsettings.cocci deleted file mode 100644 index bedacf846bc4..000000000000 --- a/pkgs/development/libraries/glib/hardcode-gsettings.cocci +++ /dev/null @@ -1,70 +0,0 @@ -/** - * Since Nix does not have a standard location like /usr/share, - * where GSettings system could look for schemas, we need to point the software to a correct location somehow. - * For executables, we handle this using wrappers but this is not an option for libraries like e-d-s. - * Instead, we hardcode the schema path when creating the settings. - * A schema path (ie org.gnome.evolution) can be replaced by @EVOLUTION_SCHEMA_PATH@ - * which is then replaced at build time by substituteAll. - * The mapping is provided in a json file ./glib-schema-to-var.json - */ - -@initialize:python@ -@@ -import json - -cpp_constants = {} - -def register_cpp_constant(const_name, val): - cpp_constants[const_name] = val.strip() - -def resolve_cpp_constant(const_name): - return cpp_constants.get(const_name, const_name) - -with open("./glib-schema-to-var.json") as mapping_file: - schema_to_var = json.load(mapping_file); - -def get_schema_directory(schema_path): - # Sometimes the schema id is referenced using C preprocessor #define constant in the same file - # let’s try to resolve it first. - schema_path = resolve_cpp_constant(schema_path.strip()).strip('"') - if schema_path in schema_to_var: - return f'"@{schema_to_var[schema_path]}@"' - raise Exception(f"Unknown schema path {schema_path!r}, please add it to ./glib-schema-to-var.json") - - -@find_cpp_constants@ -identifier const_name; -expression val; -@@ - -#define const_name val - -@script:python record_cpp_constants depends on find_cpp_constants@ -const_name << find_cpp_constants.const_name; -val << find_cpp_constants.val; -@@ - -register_cpp_constant(const_name, val) - - -@depends on ever record_cpp_constants || never record_cpp_constants@ -// We want to run after #define constants have been collected but even if there are no #defines. -expression SCHEMA_PATH; -expression settings; -// Coccinelle does not like autocleanup macros in + sections, -// let’s use fresh id with concatenation to produce the code as a string. -fresh identifier schema_source_decl = "g_autoptr(GSettingsSchemaSource) " ## "schema_source"; -fresh identifier schema_decl = "g_autoptr(GSettingsSchema) " ## "schema"; -fresh identifier SCHEMA_DIRECTORY = script:python(SCHEMA_PATH) { get_schema_directory(SCHEMA_PATH) }; -@@ --settings = g_settings_new(SCHEMA_PATH); -+{ -+ schema_source_decl; -+ schema_decl; -+ schema_source = g_settings_schema_source_new_from_directory(SCHEMA_DIRECTORY, -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, SCHEMA_PATH, FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+} diff --git a/pkgs/development/libraries/glibc/2.35-master.patch.gz b/pkgs/development/libraries/glibc/2.35-master.patch.gz index 24939e1c0899..7b8423c5b61b 100644 Binary files a/pkgs/development/libraries/glibc/2.35-master.patch.gz and b/pkgs/development/libraries/glibc/2.35-master.patch.gz differ diff --git a/pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch b/pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch deleted file mode 100644 index ce18b874c427..000000000000 --- a/pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure -index cace758c01..38fe7fe0b0 100644 ---- a/sysdeps/unix/sysv/linux/configure -+++ b/sysdeps/unix/sysv/linux/configure -@@ -69,7 +69,7 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kernel header at least $minimum_kernel" >&5 - $as_echo_n "checking for kernel header at least $minimum_kernel... " >&6; } - decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`; --abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; -+abinum=`echo "2.6.32.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include -diff --git a/sysdeps/unix/sysv/linux/configure.ac b/sysdeps/unix/sysv/linux/configure.ac -index 13abda0a51..6abc12eaed 100644 ---- a/sysdeps/unix/sysv/linux/configure.ac -+++ b/sysdeps/unix/sysv/linux/configure.ac -@@ -50,7 +50,7 @@ fi - AC_MSG_CHECKING(for kernel header at least $minimum_kernel) - changequote(,)dnl - decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`; --abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; -+abinum=`echo "2.6.32.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; - changequote([,])dnl - AC_TRY_COMPILE([#include - #if LINUX_VERSION_CODE < $decnum -diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h -index 823cd8224d..482caaeeec 100644 ---- a/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ b/sysdeps/unix/sysv/linux/dl-osinfo.h -@@ -39,7 +39,7 @@ - GLRO(dl_osversion) = version; \ - \ - /* Now we can test with the required version. */ \ -- if (__LINUX_KERNEL_VERSION > 0 && version < __LINUX_KERNEL_VERSION) \ -+ if (__LINUX_KERNEL_VERSION > 0 && version < __LINUX_KERNEL_VERSION && version != 0x020620) \ - /* Not sufficent. */ \ - FATAL ("FATAL: kernel too old\n"); \ - } \ diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 83cde0774949..780a3e091daf 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -37,7 +37,6 @@ , profilingLibraries ? false , withGd ? false , withLibcrypt ? false -, meta , extraBuildInputs ? [] , extraNativeBuildInputs ? [] , ... @@ -45,7 +44,7 @@ let version = "2.35"; - patchSuffix = "-163"; + patchSuffix = "-224"; sha256 = "sha256-USNzL2tnzNMZMF79OZlx1YWSEivMKmUYob0lEN0M9S4="; in @@ -54,9 +53,6 @@ assert withGd -> gd != null && libpng != null; stdenv.mkDerivation ({ version = version + patchSuffix; - linuxHeaders = if withLinuxHeaders then linuxHeaders else null; - - inherit (stdenv) is64bit; enableParallelBuilding = true; @@ -86,36 +82,6 @@ stdenv.mkDerivation ({ patch extends the search path by "/run/current-system/sw/bin". */ ./fix_path_attribute_in_getconf.patch - /* Allow running with RHEL 6 -like kernels. The patch adds an exception - for glibc to accept 2.6.32 and to tag the ELFs as 2.6.32-compatible - (otherwise the loader would refuse libc). - Note that glibc will fully work only on their heavily patched kernels - and we lose early mismatch detection on 2.6.32. - - On major glibc updates we should check that the patched kernel supports - all the required features. ATM it's verified up to glibc-2.26-131. - # HOWTO: check glibc sources for changes in kernel requirements - git log -p glibc-2.25.. sysdeps/unix/sysv/linux/x86_64/kernel-features.h sysdeps/unix/sysv/linux/kernel-features.h - # get kernel sources (update the URL) - mkdir tmp && cd tmp - curl http://vault.centos.org/6.9/os/Source/SPackages/kernel-2.6.32-696.el6.src.rpm | rpm2cpio - | cpio -idmv - tar xf linux-*.bz2 - # check syscall presence, for example - less linux-*?/arch/x86/kernel/syscall_table_32.S - */ - ./allow-kernel-2.6.32.patch - - /* Provide a fallback for missing prlimit64 syscall on RHEL 6 -like - kernels. - - This patch is maintained by @veprbl. If it gives you trouble, feel - free to ping me, I'd be happy to help. - */ - (fetchurl { - url = "https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/patches/glibc-reinstate-prlimit64-fallback.patch?id=eab07e78b691ae7866267fc04d31c7c3ad6b0eeb"; - sha256 = "091bk3kyrx1gc380gryrxjzgcmh1ajcj8s2rjhp2d2yzd5mpd5ps"; - }) - ./fix-x64-abi.patch /* https://github.com/NixOS/nixpkgs/pull/137601 */ @@ -172,7 +138,7 @@ stdenv.mkDerivation ({ # Enable Intel Control-flow Enforcement Technology (CET) support "--enable-cet" ] ++ lib.optionals withLinuxHeaders [ - "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26 + "--enable-kernel=3.10.0" # RHEL 7 and derivatives, seems oldest still supported kernel ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ (lib.flip lib.withFeature "fp" (stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft")) @@ -202,10 +168,14 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ bison python3Minimal ] ++ extraNativeBuildInputs; buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ] ++ extraBuildInputs; - # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to - # prevent a retained dependency on the bootstrap tools in the stdenv-linux - # bootstrap. - BASH_SHELL = "/bin/sh"; + env = { + linuxHeaders = if withLinuxHeaders then linuxHeaders else ""; + inherit (stdenv) is64bit; + # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to + # prevent a retained dependency on the bootstrap tools in the stdenv-linux + # bootstrap. + BASH_SHELL = "/bin/sh"; + }; # Used by libgcc, elf-header, and others to determine ABI passthru = { inherit version; minorRelease = version; }; @@ -291,9 +261,5 @@ stdenv.mkDerivation ({ maintainers = with maintainers; [ eelco ma27 ]; platforms = platforms.linux; - } // meta; -} - -// lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { - preInstall = null; # clobber the native hook + } // (args.meta or {}); }) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 791ac47536f9..9193404d0123 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -14,16 +14,17 @@ let ]; in -callPackage ./common.nix { inherit stdenv; } { - pname = "glibc" + lib.optionalString withGd "-gd"; - - inherit withLinuxHeaders profilingLibraries withGd withLibcrypt; +(callPackage ./common.nix { inherit stdenv; } { + inherit withLinuxHeaders withGd profilingLibraries withLibcrypt; + pname = "glibc" + lib.optionalString withGd "-gd"; +}).overrideAttrs(previousAttrs: { # Note: # Things you write here override, and do not add to, # the values in `common.nix`. # (For example, if you define `patches = [...]` here, it will - # override the patches in `common.nix`.) + # override the patches in `common.nix` -- so instead you should + # write `patches = (previousAttrs.patches or []) ++ [ ... ]`. NIX_NO_SELF_RPATH = true; @@ -74,12 +75,20 @@ callPackage ./common.nix { inherit stdenv; } { # - dejagnu: during linux bootstrap tcl SIGSEGVs # - clang-wrapper in cross-compilation # Last attempt: https://github.com/NixOS/nixpkgs/pull/36948 - preInstall = '' - if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then + preInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + if [ -f ${lib.getLib stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then mkdir -p $out/lib - cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 + cp ${lib.getLib stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 # the .so It used to be a symlink, but now it is a script - cp -a ${stdenv.cc.cc}/lib/libgcc_s.so $out/lib/libgcc_s.so + cp -a ${lib.getLib stdenv.cc.cc}/lib/libgcc_s.so $out/lib/libgcc_s.so + # wipe out reference to previous libc it was built against + chmod +w $out/lib/libgcc_s.so.1 + # rely on default RUNPATHs of the binary and other libraries + # Do no force-pull wrong glibc. + patchelf --remove-rpath $out/lib/libgcc_s.so.1 + # 'patchelf' does not remove the string itself. Wipe out + # string reference to avoid possible link to bootstrapTools + ${buildPackages.nukeReferences}/bin/nuke-refs $out/lib/libgcc_s.so.1 fi ''; @@ -153,5 +162,6 @@ callPackage ./common.nix { inherit stdenv; } { separateDebugInfo = true; - meta.description = "The GNU C Library"; - } + meta = (previousAttrs.meta or {}) // { description = "The GNU C Library"; }; +}) + diff --git a/pkgs/development/libraries/glibc/locales-builder.sh b/pkgs/development/libraries/glibc/locales-builder.sh index d732e208fa22..d91f936c937b 100644 --- a/pkgs/development/libraries/glibc/locales-builder.sh +++ b/pkgs/development/libraries/glibc/locales-builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi # Glibc cannot have itself in its RPATH. export NIX_NO_SELF_RPATH=1 diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 4e8503b48438..a64bb0967aa7 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; # There are some non-thread safe tests that can fail enableParallelChecking = false; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; GTEST_FILTER = let diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index f50704bcb65c..8fc57d865fd7 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -4,7 +4,6 @@ , idnSupport ? true, libidn }: -with lib; stdenv.mkDerivation rec{ pname = "gloox"; @@ -16,11 +15,11 @@ stdenv.mkDerivation rec{ }; buildInputs = [ ] - ++ optional zlibSupport zlib - ++ optional sslSupport openssl - ++ optional idnSupport libidn; + ++ lib.optional zlibSupport zlib + ++ lib.optional sslSupport openssl + ++ lib.optional idnSupport libidn; - meta = { + meta = with lib; { description = "A portable high-level Jabber/XMPP library for C++"; homepage = "http://camaya.net/gloox"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix index f5575bd20c8f..2a953fa702cb 100644 --- a/pkgs/development/libraries/gmime/2.nix +++ b/pkgs/development/libraries/gmime/2.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --replace /bin/mkdir mkdir ''; - checkInputs = [ gnupg ]; + nativeCheckInputs = [ gnupg ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 4ec99d2e18f3..6816c108160a 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { --replace /bin/rm rm ''; - checkInputs = [ gnupg ]; + nativeCheckInputs = [ gnupg ]; doCheck = true; diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index 50e26b4c1327..e809ed926eda 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -71,6 +71,8 @@ let self = stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; badPlatforms = [ "x86_64-darwin" ]; + # never built on aarch64-darwin, aarch64-linux since first introduction in nixpkgs + broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); }; }; in self diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index c83a4785ebea..e4fb89d054da 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -80,6 +80,8 @@ let self = stdenv.mkDerivation rec { platforms = platforms.all; badPlatforms = [ "x86_64-darwin" ]; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; }; in self diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix index 6b58b171f7d3..fd58e6b77ad2 100644 --- a/pkgs/development/libraries/gnome-desktop/default.nix +++ b/pkgs/development/libraries/gnome-desktop/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "43"; + version = "43.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-PW4VMxdIYVdZaqOAL4dnZBTFcHOPRQqUoEH+iDVCCmk="; + sha256 = "sha256-Mq+NvD2afVg1aafw1/GPlYGNXbnuj5LZEjpkexXqyMc="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 5344534aec5d..43eb7a2ff301 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -87,6 +87,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + separateDebugInfo = true; + passthru = { updateScript = gnome.updateScript { versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix index e8fd3ca7e2c2..cc6f3b2ecde3 100644 --- a/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/pkgs/development/libraries/gnome-video-effects/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A collection of GStreamer effects to be used in different GNOME Modules"; homepage = "https://wiki.gnome.org/Projects/GnomeVideoEffects"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = teams.gnome.members; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index d95a00b6ee6b..1bdd6890ab21 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, buildPackages, fetchurl, pciutils , gitUpdater }: -with lib; - stdenv.mkDerivation rec { pname = "gnu-efi"; version = "3.0.15"; @@ -32,5 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/gnu-efi/"; license = licenses.bsd3; platforms = platforms.linux; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index ec109cbee8dc..4ab8cbbf9650 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { (python3.withPackages pythonModules) ]; - checkInputs = lib.optionals stdenv.isDarwin [ + nativeCheckInputs = lib.optionals stdenv.isDarwin [ cctools # for otool ]; diff --git a/pkgs/development/libraries/gobject-introspection/wrapper.nix b/pkgs/development/libraries/gobject-introspection/wrapper.nix index d59cbe6faffa..53b1a35f8212 100644 --- a/pkgs/development/libraries/gobject-introspection/wrapper.nix +++ b/pkgs/development/libraries/gobject-introspection/wrapper.nix @@ -19,89 +19,87 @@ let # passing this stdenv to `targetPackages...` breaks due to splicing not working in `.override`` argsForTarget = builtins.removeAttrs args [ "stdenv" ]; - overridenUnwrappedGir = gobject-introspection-unwrapped.override args; + overriddenUnwrappedGir = gobject-introspection-unwrapped.override args; # if we have targetPackages.gobject-introspection then propagate that overridenTargetUnwrappedGir = if targetPackages ? gobject-introspection-unwrapped then targetPackages.gobject-introspection-unwrapped.override argsForTarget - else overridenUnwrappedGir; + else overriddenUnwrappedGir; in # wrap both pkgsCrossX.buildPackages.gobject-introspection and {pkgs,pkgsSomethingExecutableOnBuildSystem).buildPackages.gobject-introspection if (!stdenv.hostPlatform.canExecute stdenv.targetPlatform) && stdenv.targetPlatform.emulatorAvailable buildPackages then - stdenv.mkDerivation - (builtins.removeAttrs overridenUnwrappedGir.drvAttrs [ "name" ] # so we can get a fresh name generated from the pname - // { + overriddenUnwrappedGir.overrideAttrs + (previousAttrs: + { - inherit (overridenUnwrappedGir) meta; + pname = "gobject-introspection-wrapped"; + passthru = previousAttrs.passthru // { + unwrapped = overriddenUnwrappedGir; + }; + dontStrip = true; + depsTargetTargetPropagated = [ overridenTargetUnwrappedGir ]; + buildCommand = '' + eval fixupPhase + ${lib.concatMapStrings (output: '' + mkdir -p ${"$" + "${output}"} + ${lib.getExe buildPackages.xorg.lndir} ${overriddenUnwrappedGir.${output}} ${"$" + "${output}"} + '') overriddenUnwrappedGir.outputs} + + cp $dev/bin/g-ir-compiler $dev/bin/.g-ir-compiler-wrapped + cp $dev/bin/g-ir-scanner $dev/bin/.g-ir-scanner-wrapped + + ( + rm "$dev/bin/g-ir-compiler" + rm "$dev/bin/g-ir-scanner" + export bash="${buildPackages.bash}" + export emulator=${lib.escapeShellArg (stdenv.targetPlatform.emulator buildPackages)} + export emulatorwrapper="$dev/bin/g-ir-scanner-qemuwrapper" + export buildlddtree="${buildPackages.pax-utils}/bin/lddtree" + + export targetgir="${lib.getDev overridenTargetUnwrappedGir}" + + substituteAll "${./wrappers/g-ir-compiler.sh}" "$dev/bin/g-ir-compiler" + substituteAll "${./wrappers/g-ir-scanner.sh}" "$dev/bin/g-ir-scanner" + substituteAll "${./wrappers/g-ir-scanner-lddwrapper.sh}" "$dev/bin/g-ir-scanner-lddwrapper" + substituteAll "${./wrappers/g-ir-scanner-qemuwrapper.sh}" "$dev/bin/g-ir-scanner-qemuwrapper" + chmod +x $dev/bin/g-ir-compiler + chmod +x $dev/bin/g-ir-scanner* + ) + '' + # when cross-compiling and using the wrapper then when a package looks up the g_ir_X + # variable with pkg-config they'll get the host version which can't be run + # override the variable to use the absolute path to g_ir_X in PATH which can be run + + '' + cat >> $dev/nix-support/setup-hook <<-'EOF' + override-pkg-config-gir-variables() { + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER="$(type -p g-ir-scanner)" + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER="$(type -p g-ir-compiler)" + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE="$(type -p g-ir-generate)" + export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER + export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER + export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE + } + + preConfigureHooks+=(override-pkg-config-gir-variables) + EOF + ''; + }) +else + overriddenUnwrappedGir.overrideAttrs (previousAttrs: + { pname = "gobject-introspection-wrapped"; - passthru = overridenUnwrappedGir.passthru // { - unwrapped = overridenUnwrappedGir; + passthru = previousAttrs.passthru // { + unwrapped = overriddenUnwrappedGir; }; - phases = [ "fixupPhase" ]; # don't remove, it is valid to set phases here. dontStrip = true; depsTargetTargetPropagated = [ overridenTargetUnwrappedGir ]; - postFixup = '' + buildCommand = '' + eval fixupPhase ${lib.concatMapStrings (output: '' mkdir -p ${"$" + "${output}"} - ${lib.getExe buildPackages.xorg.lndir} ${gobject-introspection-unwrapped.${output}} ${"$" + "${output}"} - '') gobject-introspection-unwrapped.outputs} - - cp $dev/bin/g-ir-compiler $dev/bin/.g-ir-compiler-wrapped - cp $dev/bin/g-ir-scanner $dev/bin/.g-ir-scanner-wrapped - - ( - rm "$dev/bin/g-ir-compiler" - rm "$dev/bin/g-ir-scanner" - export bash="${buildPackages.bash}" - export emulator=${lib.escapeShellArg (stdenv.targetPlatform.emulator buildPackages)} - export emulatorwrapper="$dev/bin/g-ir-scanner-qemuwrapper" - export buildlddtree="${buildPackages.pax-utils}/bin/lddtree" - - export targetgir="${lib.getDev overridenTargetUnwrappedGir}" - - substituteAll "${./wrappers/g-ir-compiler.sh}" "$dev/bin/g-ir-compiler" - substituteAll "${./wrappers/g-ir-scanner.sh}" "$dev/bin/g-ir-scanner" - substituteAll "${./wrappers/g-ir-scanner-lddwrapper.sh}" "$dev/bin/g-ir-scanner-lddwrapper" - substituteAll "${./wrappers/g-ir-scanner-qemuwrapper.sh}" "$dev/bin/g-ir-scanner-qemuwrapper" - chmod +x $dev/bin/g-ir-compiler - chmod +x $dev/bin/g-ir-scanner* - ) - '' - # when cross-compiling and using the wrapper then when a package looks up the g_ir_X - # variable with pkg-config they'll get the host version which can't be run - # override the variable to use the absolute path to g_ir_X in PATH which can be run - + '' - cat >> $dev/nix-support/setup-hook <<-'EOF' - override-pkg-config-gir-variables() { - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER="$(type -p g-ir-scanner)" - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER="$(type -p g-ir-compiler)" - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE="$(type -p g-ir-generate)" - export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER - export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER - export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE - } - - preConfigureHooks+=(override-pkg-config-gir-variables) - EOF + ${lib.getExe buildPackages.xorg.lndir} ${overriddenUnwrappedGir.${output}} ${"$" + "${output}"} + '') overriddenUnwrappedGir.outputs} ''; }) -else - stdenv.mkDerivation (builtins.removeAttrs overridenUnwrappedGir.drvAttrs [ "name" ] # so we can get a fresh name generated from the pname - // { - inherit (overridenUnwrappedGir) meta; - pname = "gobject-introspection-wrapped"; - passthru = overridenUnwrappedGir.passthru // { - unwrapped = overridenUnwrappedGir; - }; - phases = [ "fixupPhase" ]; # don't remove, it is valid to set phases here. - dontStrip = true; - depsTargetTargetPropagated = [ overridenTargetUnwrappedGir ]; - postFixup = '' - ${lib.concatMapStrings (output: '' - mkdir -p ${"$" + "${output}"} - ${lib.getExe buildPackages.xorg.lndir} ${gobject-introspection-unwrapped.${output}} ${"$" + "${output}"} - '') gobject-introspection-unwrapped.outputs} - ''; - }) diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 9e2585d7ee03..1bd0d69ea6d7 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goffice"; - version = "0.10.53"; + version = "0.10.54"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "J/1YeW+qHNTMASDDTqhTFaCJHscfVbxnk8FOzxaKP1c="; + sha256 = "WDXNnVPmT3UmLAOZZu/fTYj0Vvyx8IeM5NEIgqUK1aA="; }; nativeBuildInputs = [ pkg-config intltool ]; diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index fb2929a72f16..1e5271d47709 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -18,37 +18,31 @@ , staticOnly ? stdenv.hostPlatform.isStatic }: let - googleapisRev = "d4f3468ef85278428005ed555b3a85db91551ee6"; + googleapisRev = "13d5b3f3f9412f38427c8ad48068f04ad1ee9808"; googleapis = fetchFromGitHub { + name = "googleapis-src"; owner = "googleapis"; repo = "googleapis"; rev = googleapisRev; - hash = "sha256-sIQVFQhE3Ae6ia45apzdgtwzglMM4hFZ8efNAhMO5ZY="; + hash = "sha256-SiU7N1EQ/7LWhUwgf4c0CBfUzNGiLe4sSbbJmJF3sao="; }; excludedTests = builtins.fromTOML (builtins.readFile ./skipped_tests.toml); in stdenv.mkDerivation rec { pname = "google-cloud-cpp"; - version = "1.38.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-cpp"; rev = "v${version}"; - sha256 = "sha256-kobOkohWIDTQaaihhoh/25tZUNv+CjKFwj2xQqO52bA="; + sha256 = "sha256-o8aURM8fvxn0FZjuqJGclq9Brss8LOFZzD0FV2j/lUc="; }; postPatch = '' substituteInPlace external/googleapis/CMakeLists.txt \ - --replace "https://github.com/googleapis/googleapis/archive/\''${GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}" - - # https://github.com/googleapis/google-cloud-cpp/issues/8992 - for file in external/googleapis/config.pc.in google/cloud/{,*/}config.pc.in; do - substituteInPlace "$file" \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_BINDIR@ @CMAKE_INSTALL_FULL_BINDIR@ - done + --replace "https://github.com/googleapis/googleapis/archive/\''${_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}" + sed -i '/https:\/\/storage.googleapis.com\/cloud-cpp-community-archive\/com_google_googleapis/d' external/googleapis/CMakeLists.txt ''; nativeBuildInputs = [ @@ -59,7 +53,7 @@ stdenv.mkDerivation rec { # 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 + # when doInstallCheck is true, these deps are added to nativeInstallCheckInputs gbenchmark gtest ]; @@ -112,7 +106,7 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - installCheckInputs = lib.optionals doInstallCheck [ + nativeInstallCheckInputs = lib.optionals doInstallCheck [ gbenchmark gtest ]; @@ -123,6 +117,7 @@ stdenv.mkDerivation rec { # this adds a good chunk of time to the build "-DBUILD_TESTING:BOOL=ON" "-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES:BOOL=OFF" + "-DCMAKE_CXX_STANDARD=${grpc.cxxStandard}" ] ++ lib.optionals (apis != [ "*" ]) [ "-DGOOGLE_CLOUD_CPP_ENABLE=${lib.concatStringsSep ";" apis}" ]; diff --git a/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml b/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml index 8cbe766862b2..71529bfb4550 100644 --- a/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml +++ b/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml @@ -13,6 +13,7 @@ whole = [ "bigtable_read_sync_vs_async_benchmark", "bigtable_scan_throughput_benchmark", "bigtable_table_sample_rows_integration_test", + "common_grpc_utils_internal_grpc_impersonate_service_account_integration_test", "iam_iam_credentials_integration_test", "iam_iam_integration_test", "logging_quickstart", @@ -48,6 +49,7 @@ whole = [ "storage_curl_request_integration_test", "storage_curl_resumable_upload_session_integration_test", "storage_curl_sign_blob_integration_test", + "storage_decompressive_transcoding_integration_test", "storage_grpc_integration_test", "storage_key_file_integration_test", "storage_minimal_iam_credentials_rest_integration_test", @@ -84,13 +86,13 @@ whole = [ "storage_throughput_experiment_test", "storage_tracing_integration_test", "storage_unified_credentials_integration_test", - "common_grpc_utils_internal_grpc_impersonate_service_account_integration_test" ] cases = [ "BackupExtraIntegrationTest.CreateBackupWithExpiredVersionTime", "BackupExtraIntegrationTest.BackupWithExpiredVersionTime", "BackupExtraIntegrationTest.BackupWithFutureVersionTime", "BackupExtraIntegrationTest.CreateBackupWithFutureVersionTime", + "BlockingPublisherIntegrationTest.Basic", "DatabaseAdminClientTest.CreateWithEncryptionKey", "DatabaseAdminClientTest.CreateWithNonexistentEncryptionKey", "DatabaseAdminClientTest.DatabaseBasicCRUD", @@ -98,12 +100,16 @@ cases = [ "DatabaseAdminClientTest.VersionRetentionPeriodCreateFailure", "DatabaseAdminClientTest.VersionRetentionPeriodUpdate", "DatabaseAdminClientTest.VersionRetentionPeriodUpdateFailure", + "ErrorParsingIntegrationTest.FailureContainsErrorInfo", + "GrpcServiceAccountIntegrationTest.GetServiceAccount", + "GrpcBucketMetadataIntegrationTest.ObjectMetadataCRUD", "InstanceAdminClientTest.InstanceConfig", "InstanceAdminClientTest.InstanceIam", "InstanceAdminClientTest.InstanceReadOperations", "LoggingIntegrationTest.ListMonitoredResourceDescriptors", "LoggingIntegrationTest.WriteLogEntries", "ObjectFileMultiThreadedTest.Download", + "ObjectReadLargeIntegrationTest.LimitedMemoryGrowth", "SubscriberIntegrationTest.FireAndForget", "SubscriberIntegrationTest.PublishOrdered", "SubscriberIntegrationTest.PublishPullAck", diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index c4f7770ae8c3..002d07cc33b7 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/gperftools/gperftools"; description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; - platforms = with platforms; linux ++ darwin; + platforms = platforms.all; license = licenses.bsd3; maintainers = with maintainers; [ vcunat ]; }; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 8470c62a8906..050adad77cab 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { qtbase ]; - checkInputs = [ + nativeCheckInputs = [ which ]; diff --git a/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/pkgs/development/libraries/graphene-hardened-malloc/default.nix index 3d4af9db19ce..65498357b5d0 100644 --- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -19,7 +19,7 @@ lib.fix (self: stdenv.mkDerivation rec { }; doCheck = true; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; # these tests cover use as a build-time-linked library checkPhase = '' make test diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index baf42430c299..1ad814e2b954 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { glib ]; - checkInputs = [ + nativeCheckInputs = [ mutest ]; @@ -100,9 +100,7 @@ stdenv.mkDerivation rec { installedTests = nixosTests.installed-tests.graphene; }; - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 3858ac7c437f..8a3a936b1453 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.50.0"; # N.B: if you change this, please update: + version = "1.51.1"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-h79Ptx17tIMFpaaid4UGzbGDztee9JctfsEcetfude0="; + hash = "sha256-o1C35mtA2lTGgugCKAQyRDNlCnutoJ1ol/DInJNobnc="; fetchSubmodules = true; }; @@ -62,13 +62,9 @@ stdenv.mkDerivation rec { "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_ABSL_PROVIDER=package" "-DBUILD_SHARED_LIBS=ON" + "-DCMAKE_CXX_STANDARD=${passthru.cxxStandard}" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc" - ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0") [ - # Needs to be compiled with -std=c++11 for clang < 11. Interestingly this is - # only an issue with the useLLVM stdenv, not the darwin stdenv… - # https://github.com/grpc/grpc/issues/26473#issuecomment-860885484 - "-DCMAKE_CXX_STANDARD=11" ]; # CMake creates a build directory by default, this conflicts with the @@ -91,6 +87,17 @@ stdenv.mkDerivation rec { enableParallelBuilds = true; + passthru.cxxStandard = + let + # Needs to be compiled with -std=c++11 for clang < 11. Interestingly this is + # only an issue with the useLLVM stdenv, not the darwin stdenv… + # https://github.com/grpc/grpc/issues/26473#issuecomment-860885484 + useLLVMAndOldCC = (stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0"; + # With GCC 9 (current aarch64-linux) it fails with c++17 but OK with c++14. + useOldGCC = !(stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "10"; + in + (if useLLVMAndOldCC then "11" else if useOldGCC then "14" else "17"); + passthru.tests = { inherit (python3.pkgs) grpcio-status grpcio-tools; inherit arrow-cpp; diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index cbfddde09a02..c1003a6e33f6 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-ebho47mXbcSE1ZspygroiXvpbOTTbTKu1dk1p6Mwd1k="; }; + # This is actually bug in musl. It is already fixed in trunc and + # this patch won't be necessary with musl > 1.2.3. + # + # https://git.musl-libc.org/cgit/musl/commit/?id=b50eb8c36c20f967bd0ed70c0b0db38a450886ba + patches = lib.optional stdenv.hostPlatform.isMusl ./gsasl.patch; + buildInputs = [ libidn libkrb5 ]; configureFlags = [ "--with-gssapi-impl=mit" ]; diff --git a/pkgs/development/libraries/gsasl/gsasl.patch b/pkgs/development/libraries/gsasl/gsasl.patch new file mode 100644 index 000000000000..572d3034967e --- /dev/null +++ b/pkgs/development/libraries/gsasl/gsasl.patch @@ -0,0 +1,21 @@ +GNU libc and Musl libc have different ideas what + + strverscmp("UNKNOWN", "2.2.0") + +should return. Hopefully nobody depend on this particular behaviour in +practice. + +--- a/tests/version.c 1970-01-01 00:00:00.000000000 -0000 ++++ b/tests/version.c 1970-01-01 00:00:00.000000000 -0000 +@@ -111,11 +111,5 @@ + exit_code = EXIT_FAILURE; + } + +- if (gsasl_check_version ("UNKNOWN")) +- { +- printf ("FAIL: gsasl_check_version (UNKNOWN)\n"); +- exit_code = EXIT_FAILURE; +- } +- + return exit_code; + } diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index ecf2d0e5ba5c..ff2217b6e36d 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "1.0.20"; src = fetchurl { - url = "http://www.quut.com/gsm/${pname}-${version}.tar.gz"; + url = "https://www.quut.com/gsm/${pname}-${version}.tar.gz"; sha256 = "sha256-YxXDhRi4HomcP8LtRjzGI68pxcIxpIwTeyQwIjSukL8="; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lossy speech compression codec"; - homepage = "http://www.quut.com/gsm/"; + homepage = "https://www.quut.com/gsm/"; license = licenses.bsd2; maintainers = with maintainers; [ codyopel raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gssdp/1.6.nix b/pkgs/development/libraries/gssdp/1.6.nix index 19c46d4776c4..80b518ab27b8 100644 --- a/pkgs/development/libraries/gssdp/1.6.nix +++ b/pkgs/development/libraries/gssdp/1.6.nix @@ -6,6 +6,7 @@ , pkg-config , gobject-introspection , vala +, pandoc , gi-docgen , python3 , libsoup_3 @@ -16,14 +17,14 @@ stdenv.mkDerivation rec { pname = "gssdp"; - version = "1.6.1"; + version = "1.6.2"; outputs = [ "out" "dev" ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0r4KbiWREJpuQlhRFhpKU7xUtPBqAhTHlwVmMpvVYzA="; + sha256 = "QQs3be7O2YNrV/SI+ABS/koU+J4HWxzszyjlH0kPn7k="; }; nativeBuildInputs = [ @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { pkg-config gobject-introspection vala + pandoc gi-docgen python3 ]; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index e9f324b24533..1d2ae340a806 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -323,6 +323,11 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs \ scripts/extract-release-date-from-doap-file.py + + # upstream bumps this version check one minor version at a time + # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/subprojects/gst-plugins-bad/ext/opencv/meson.build#L74 + substituteInPlace ext/opencv/meson.build \ + --replace '< 4.7.0' '< 5.0.0' ''; # This package has some `_("string literal")` string formats diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index dac712e82387..395708c2a680 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -79,17 +79,16 @@ stdenv.mkDerivation rec { libjpeg tremor libGL + pango ] ++ lib.optionals (!stdenv.isDarwin) [ libvisual ] ++ lib.optionals stdenv.isDarwin [ - pango OpenGL ] ++ lib.optionals enableAlsa [ alsa-lib ] ++ lib.optionals enableX11 [ libXext libXv - pango ] ++ lib.optionals enableWayland [ wayland wayland-protocols diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index e7b72fc34e0c..1cd9eed123c5 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -163,7 +163,7 @@ stdenv.mkDerivation rec { # fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''" doCheck = false; - # must be explicitely set since 5590e365 + # must be explicitly set since 5590e365 dontWrapQtApps = true; meta = with lib; { diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index a76805d8d1fb..acd2cae6abfc 100644 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { }; }; - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" ]; diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index ba7950d72561..92a126bd7e8f 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -9,11 +9,12 @@ , wayland , gtk3 , gobject-introspection +, vala }: stdenv.mkDerivation rec { pname = "gtk-layer-shell"; - version = "0.7.0"; + version = "0.8.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # for demo @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${version}"; - sha256 = "sha256-0S1WBpxXpWoMOecJQS6FKEXRZdw4E5hrjURPyhkxiMc="; + sha256 = "sha256-Z7jPYLKgkwMNXu80aaZ2vNj57LbN+X2XqlTTq6l0wTE="; }; nativeBuildInputs = [ @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { gtk-doc docbook-xsl-nons docbook_xml_dtd_43 + vala ]; buildInputs = [ diff --git a/pkgs/development/libraries/gtk-sharp/builder.sh b/pkgs/development/libraries/gtk-sharp/builder.sh index 4b8f757540b5..73914495d6d4 100644 --- a/pkgs/development/libraries/gtk-sharp/builder.sh +++ b/pkgs/development/libraries/gtk-sharp/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup genericBuild diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 396366324d3a..23680c9b6757 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -1,5 +1,5 @@ { config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg -, gdk-pixbuf, xlibsWrapper, gobject-introspection +, gdk-pixbuf, gobject-introspection , xineramaSupport ? stdenv.isLinux , cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups , gdktarget ? if stdenv.isDarwin then "quartz" else "x11" @@ -7,8 +7,6 @@ , fetchpatch, buildPackages }: -with lib; - let gtkCleanImmodulesCache = substituteAll { @@ -44,7 +42,7 @@ stdenv.mkDerivation rec { patches = [ ./patches/2.0-immodules.cache.patch ./patches/gtk2-theme-paths.patch - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ (fetchpatch { url = "https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776"; sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r"; @@ -54,13 +52,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with xorg; [ glib cairo pango gdk-pixbuf atk ] - ++ optionals (stdenv.isLinux || stdenv.isDarwin) [ + ++ lib.optionals (stdenv.isLinux || stdenv.isDarwin) [ libXrandr libXrender libXcomposite libXi libXcursor ] - ++ optionals stdenv.isDarwin [ xlibsWrapper libXdamage ] - ++ optional xineramaSupport libXinerama - ++ optionals cupsSupport [ cups ] - ++ optionals stdenv.isDarwin [ AppKit Cocoa ]; + ++ lib.optionals stdenv.isDarwin [ libXdamage ] + ++ lib.optional xineramaSupport libXinerama + ++ lib.optionals cupsSupport [ cups ] + ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa ]; preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then '' MACOSX_DEPLOYMENT_TARGET=10.16 @@ -69,7 +67,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gdktarget=${gdktarget}" "--with-xinput=yes" - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "--disable-glibtest" "--disable-introspection" "--disable-visibility" @@ -94,7 +92,7 @@ stdenv.mkDerivation rec { inherit gdktarget; }; - meta = { + meta = with lib; { description = "A multi-platform toolkit for creating graphical user interfaces"; homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index c06aa9469937..1533f59b4aec 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.34"; + version = "3.24.36"; outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "sha256-28afkN3IIbjRRB8AN03B2kMjour6kHjmHtvl7u+oUuw="; + sha256 = "sha256-J6bvFXdDNQyAf/6lm6odcCJtvt6CpelT/9WOpgWf5pE="; }; patches = [ @@ -110,7 +110,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection libxkbcommon (libepoxy.override { inherit x11Support; }) isocodes @@ -134,6 +133,8 @@ stdenv.mkDerivation rec { libSM libXcomposite libXcursor + libXdamage + libXfixes libXi libXrandr libXrender diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index ac4b0b34794e..11d00dfa1c05 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.8.2"; + version = "4.8.3"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "hbehYLbgLq+k59OPBG+HIPq1N9P+c8AchkMzqYOmkqk="; + sha256 = "s2L5aNCFtNPZNA1NOMcGN33tnVN05pSitrfmKS48unQ="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/gtkextra/default.nix b/pkgs/development/libraries/gtkextra/default.nix index 4c2f739cd965..ed860b7dde3f 100644 --- a/pkgs/development/libraries/gtkextra/default.nix +++ b/pkgs/development/libraries/gtkextra/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 glib cairo atk pango libtiff libpng libjpeg ]; meta = with lib; { - homepage = "http://gtkextra.sourceforge.net/"; + homepage = "https://gtkextra.sourceforge.net/"; description = "GtkExtra is a useful set of widgets for creating GUI's for GTK+."; license = licenses.lgpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index b12ff45a3a19..ffb2e123c87b 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { pangomm_2_48 ]; - checkInputs = lib.optionals (!stdenv.isDarwin)[ + nativeCheckInputs = lib.optionals (!stdenv.isDarwin)[ xvfb-run ]; diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index dce589dd6474..447e7d061fdb 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool perl gobject-introspection vala ]; - checkInputs = [ xvfb-run dbus ]; + nativeCheckInputs = [ xvfb-run dbus ]; buildInputs = [ atk cairo glib pango libxml2 gettext ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { NO_AT_BRIDGE=1 \ XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ make check ''; diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index f3414c39270a..95e6e8d2e107 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { shared-mime-info ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run dbus ]; @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --no-rebuild --print-errorlogs runHook postCheck diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index d3b1cc42a12f..849c3caf2672 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch2 , meson , ninja , pkg-config @@ -23,13 +24,13 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "5.6.1"; + version = "5.6.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ZZ2cydA0oRTwfn4TTugNd97ASXyxUWrlNpEZwvy52hY="; + sha256 = "HxRsFW8TWmBJnZeeNXfJm24VoRFEV2er5iGbs0xUXHc="; }; patches = [ @@ -37,6 +38,13 @@ stdenv.mkDerivation rec { # but not from its own datadr (it assumes it will be in XDG_DATA_DIRS). # Since this is not generally true with Nix, let’s add $out/share unconditionally. ./4.x-nix_share_path.patch + + # Add Nix syntax highlighting. + # https://gitlab.gnome.org/GNOME/gtksourceview/-/merge_requests/303 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/2cc7fd079f9fc8b593c727c68a2c783c82299562.patch"; + sha256 = "bTYWjEDpdbnUxcYNKl2YtSLfYlMfcbQSSYQjhixOGS8="; + }) ]; nativeBuildInputs = [ @@ -65,7 +73,7 @@ stdenv.mkDerivation rec { shared-mime-info ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run dbus ]; @@ -86,10 +94,12 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ - xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - meson test --no-rebuild --print-errorlogs + env \ + XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ + GTK_A11Y=none \ + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus}/share/dbus-1/session.conf \ + meson test --no-rebuild --print-errorlogs runHook postCheck ''; diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index d3a1a178856b..3c7a6a3b3b23 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://gtkspell.sourceforge.net/"; + homepage = "https://gtkspell.sourceforge.net/"; description = "Word-processor-style highlighting GtkTextView widget"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index 6f48ba4e2668..9c5c2b614fa2 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -1,4 +1,16 @@ -{lib, stdenv, fetchurl, gtk2, aspell, pkg-config, enchant, intltool}: +{ stdenv +, lib +, fetchurl +, fetchpatch +, autoreconfHook +, docbook_xsl +, gtk-doc +, intltool +, pkg-config +, aspell +, enchant +, gtk2 +}: stdenv.mkDerivation rec { pname = "gtkspell"; @@ -9,8 +21,28 @@ stdenv.mkDerivation rec { sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; }; - nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [aspell gtk2 enchant]; + patches = [ + # Build with enchant 2 + # https://github.com/archlinux/svntogit-packages/tree/packages/gtkspell/trunk + (fetchpatch { + url = "https://github.com/archlinux/svntogit-packages/raw/17fb30b5196db378c18e7c115f28e97b962b95ff/trunk/enchant-2.diff"; + sha256 = "0d9409bnapwzwhnfpz3dvl6qalskqa4lzmhrmciazsypbw3ry5rf"; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + docbook_xsl + gtk-doc + intltool + pkg-config + ]; + + buildInputs = [ + aspell + enchant + gtk2 + ]; meta = with lib; { description = "Word-processor-style highlighting and replacement of misspelled words"; diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix index 31380b5ab793..641ebbf9f08d 100644 --- a/pkgs/development/libraries/gtkspellmm/default.nix +++ b/pkgs/development/libraries/gtkspellmm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ binding for the gtkspell library"; - homepage = "http://gtkspell.sourceforge.net/"; + homepage = "https://gtkspell.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 815dfb634c9f..5aa8aca6ffb3 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://gts.sourceforge.net/"; + homepage = "https://gts.sourceforge.net/"; license = lib.licenses.lgpl2Plus; description = "GNU Triangulated Surface Library"; diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix index 0e4afedc369f..9145420ad252 100644 --- a/pkgs/development/libraries/gupnp/1.6.nix +++ b/pkgs/development/libraries/gupnp/1.6.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.6.1"; + version = "1.6.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-hTgUUtKvlbjhSyTUqYljPQ2DzYjRJy8nzLJBbMyDbUc="; + sha256 = "sha256-T09Biwe4EWTfH3q2EuKOTAFsLQhbik85+XlF+LFe4kg="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index af24e46efe2a..4d6546f0e5be 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, substituteAll, meson, ninja, pkg-config, gettext, gobject-introspection , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, python3 -, glib, systemd, libusb1, vala, hwdata +, glib, libusb1, vala, hwdata }: let @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 gobject-introspection vala ]; - buildInputs = [ systemd glib ]; + buildInputs = [ glib ]; propagatedBuildInputs = [ libusb1 ]; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index d80d7f82bfd9..c4604a28a41e 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch2 , meson , ninja , pkg-config @@ -44,13 +45,23 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.50.2"; + version = "1.50.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "A9crjBXvQ4EQ8M9Fe1ZVJmyLUV0EErMPTVXPoNoGrF4="; + sha256 = "aJcRnpe7FgKdJ3jhpaVKamWSYx+LLzoqHepO8rAYA/0="; }; + patches = [ + # Hardcode the ssh path again. + # https://gitlab.gnome.org/GNOME/gvfs/-/issues/465 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/gvfs/-/commit/8327383e262e1e7f32750a8a2d3dd708195b0f53.patch"; + hash = "sha256-ReD7qkezGeiJHyo9jTqEQNBjECqGhV9nSD+dYYGZWJ8="; + revert = true; + }) + ]; + postPatch = '' # patchShebangs requires executable file chmod +x meson_post_install.py @@ -131,6 +142,8 @@ stdenv.mkDerivation rec { doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'" doInstallCheck = doCheck; + separateDebugInfo = true; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/hamlib/4.nix b/pkgs/development/libraries/hamlib/4.nix index 474db9891aa7..b199bb27397b 100644 --- a/pkgs/development/libraries/hamlib/4.nix +++ b/pkgs/development/libraries/hamlib/4.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "hamlib"; - version = "4.4"; + version = "4.5.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-i/AQewcfUvCFh/OOLe6KeEjeE0NDWzJvj2bZXh+KJIc="; + sha256 = "sha256-Wg+eky/+LTlx4HtUSqYr7D5JTnP/HOPKM/oNiOGZsGE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 5e892c1681c2..782823cd6748 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , pkg-config , glib , freetype @@ -29,20 +30,13 @@ , qt5 }: -let - version = "5.2.0"; - inherit (lib) optional optionals optionalString; - mesonFeatureFlag = feature: flag: - "-D${feature}=${if flag then "enabled" else "disabled"}"; -in - -stdenv.mkDerivation { - pname = "harfbuzz${optionalString withIcu "-icu"}"; - inherit version; +stdenv.mkDerivation rec { + pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; + version = "6.0.0"; src = fetchurl { url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"; - sha256 = "0b4lpkidwx0lf8slczjji652yll6g5zgmm5lmisnb4s7gf8r8nkk"; + sha256 = "HRAQoXUdB21SkeQzwThQKnlNZ5p0mNEmjuIeLUoUDrQ="; }; postPatch = '' @@ -61,12 +55,12 @@ stdenv.mkDerivation { # and is not part of the library. # Cairo causes transitive (build) dependencies on various X11 or other # GUI-related libraries, so it shouldn't be re-added lightly. - (mesonFeatureFlag "cairo" false) + (lib.mesonEnable "cairo" false) # chafa is only used in a development utility, not in the library - (mesonFeatureFlag "chafa" false) - (mesonFeatureFlag "coretext" withCoreText) - (mesonFeatureFlag "graphite" withGraphite2) - (mesonFeatureFlag "icu" withIcu) + (lib.mesonEnable "chafa" false) + (lib.mesonEnable "coretext" withCoreText) + (lib.mesonEnable "graphite" withGraphite2) + (lib.mesonEnable "icu" withIcu) ]; depsBuildBuild = [ @@ -85,20 +79,20 @@ stdenv.mkDerivation { docbook_xml_dtd_43 ]; - buildInputs = [ glib freetype gobject-introspection ] + buildInputs = [ glib freetype ] ++ lib.optionals withCoreText [ ApplicationServices CoreText ]; - propagatedBuildInputs = optional withGraphite2 graphite2 - ++ optionals withIcu [ icu harfbuzz ]; + propagatedBuildInputs = lib.optional withGraphite2 graphite2 + ++ lib.optionals withIcu [ icu harfbuzz ]; doCheck = true; # Slightly hacky; some pkgs expect them in a single directory. - postFixup = optionalString withIcu '' + postFixup = lib.optionalString withIcu '' rm "$out"/lib/libharfbuzz.* "$dev/lib/pkgconfig/harfbuzz.pc" ln -s {'${harfbuzz.out}',"$out"}/lib/libharfbuzz.la ln -s {'${harfbuzz.dev}',"$dev"}/lib/pkgconfig/harfbuzz.pc - ${optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.isDarwin '' ln -s {'${harfbuzz.out}',"$out"}/lib/libharfbuzz.dylib ln -s {'${harfbuzz.out}',"$out"}/lib/libharfbuzz.0.dylib ''} diff --git a/pkgs/development/libraries/highfive/default.nix b/pkgs/development/libraries/highfive/default.nix index 3ddba9e327db..769da9546e49 100644 --- a/pkgs/development/libraries/highfive/default.nix +++ b/pkgs/development/libraries/highfive/default.nix @@ -12,13 +12,13 @@ assert mpiSupport -> mpi != null; stdenv.mkDerivation rec { pname = "highfive${lib.optionalString mpiSupport "-mpi"}"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "BlueBrain"; repo = "HighFive"; rev = "v${version}"; - sha256 = "sha256-jo/yGcDnT/L/CMU3XpuhyzlBgvMxgNm9Y1qSVwZJihA="; + sha256 = "sha256-rUuhhoVH4Jdve7eY0M5THWtoHoIluiujfQwfTYULEiQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/hipblas/default.nix b/pkgs/development/libraries/hipblas/default.nix new file mode 100644 index 000000000000..e72c2eac1f86 --- /dev/null +++ b/pkgs/development/libraries/hipblas/default.nix @@ -0,0 +1,100 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-cmake +, hip +, gfortran +, rocblas +, rocsolver +, gtest +, lapack-reference +, buildTests ? false +, buildBenchmarks ? false +, buildSamples ? false +}: + +# Can also use cuBLAS +stdenv.mkDerivation (finalAttrs: { + pname = "hipblas"; + version = "5.4.2"; + + outputs = [ + "out" + ] ++ lib.optionals buildTests [ + "test" + ] ++ lib.optionals buildBenchmarks [ + "benchmark" + ] ++ lib.optionals buildSamples [ + "sample" + ]; + + src = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "hipBLAS"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-mSZCq8UaiffMzWVflW1nAX6CQZ1DqwWJaSIzKslZSEk="; + }; + + nativeBuildInputs = [ + cmake + rocm-cmake + hip + gfortran + ]; + + buildInputs = [ + rocblas + rocsolver + ] ++ lib.optionals buildTests [ + gtest + ] ++ lib.optionals (buildTests || buildBenchmarks) [ + lapack-reference + ]; + + cmakeFlags = [ + "-DCMAKE_C_COMPILER=hipcc" + "-DCMAKE_CXX_COMPILER=hipcc" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals buildTests [ + "-DBUILD_CLIENTS_TESTS=ON" + ] ++ lib.optionals buildBenchmarks [ + "-DBUILD_CLIENTS_BENCHMARKS=ON" + ] ++ lib.optionals buildSamples [ + "-DBUILD_CLIENTS_SAMPLES=ON" + ]; + + postInstall = lib.optionalString buildTests '' + mkdir -p $test/bin + mv $out/bin/hipblas-test $test/bin + '' + lib.optionalString buildBenchmarks '' + mkdir -p $benchmark/bin + mv $out/bin/hipblas-bench $benchmark/bin + '' + lib.optionalString buildSamples '' + mkdir -p $sample/bin + mv $out/bin/example-* $sample/bin + '' + lib.optionalString (buildTests || buildBenchmarks || buildSamples) '' + rmdir $out/bin + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "ROCm BLAS marshalling library"; + homepage = "https://github.com/ROCmSoftwarePlatform/hipBLAS"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + # Fixed in develop branch by using C++17 and related refactor + broken = versions.minor finalAttrs.version != versions.minor hip.version || buildTests || buildBenchmarks || buildSamples; + }; +}) diff --git a/pkgs/development/libraries/hipcub/default.nix b/pkgs/development/libraries/hipcub/default.nix index facb890a3eb7..58436bb8a822 100644 --- a/pkgs/development/libraries/hipcub/default.nix +++ b/pkgs/development/libraries/hipcub/default.nix @@ -1,27 +1,21 @@ { lib , stdenv , fetchFromGitHub +, rocmUpdateScript , cmake , rocm-cmake -, rocm-runtime -, rocm-device-libs -, rocm-comgr , rocprim , hip -, gtest ? null -, gbenchmark ? null +, gtest +, gbenchmark , buildTests ? false , buildBenchmarks ? false }: -assert buildTests -> gtest != null; -assert buildBenchmarks -> gbenchmark != null; - # CUB can also be used as a backend instead of rocPRIM. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hipcub"; - rocmVersion = "5.3.1"; - version = "2.12.0-${rocmVersion}"; + version = "5.4.2"; outputs = [ "out" @@ -34,8 +28,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "hipCUB"; - rev = "rocm-${rocmVersion}"; - hash = "sha256-/GMZKbMD1sZQCM2FulM9jiJQ8ByYZinn0C8d/deFh0g="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-ctt7jbVqHNHcOm/Lhg0IFbMZ6JChnMylG7fJgZtzFuM="; }; nativeBuildInputs = [ @@ -45,9 +39,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - rocm-runtime - rocm-device-libs - rocm-comgr rocprim ] ++ lib.optionals buildTests [ gtest @@ -79,11 +70,18 @@ stdenv.mkDerivation rec { rmdir $out/bin ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + meta = with lib; { description = "Thin wrapper library on top of rocPRIM or CUB"; homepage = "https://github.com/ROCmSoftwarePlatform/hipCUB"; license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ Madouura ]; - broken = rocmVersion != hip.version; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor hip.version; }; -} +}) diff --git a/pkgs/development/libraries/hipfft/default.nix b/pkgs/development/libraries/hipfft/default.nix new file mode 100644 index 000000000000..0fdd217c476e --- /dev/null +++ b/pkgs/development/libraries/hipfft/default.nix @@ -0,0 +1,107 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-cmake +, hip +, git +, rocfft +, gtest +, boost +, fftw +, fftwFloat +, openmp +, buildTests ? false +, buildBenchmarks ? false +, buildSamples ? false +}: + +# Can also use cuFFT +stdenv.mkDerivation (finalAttrs: { + pname = "hipfft"; + version = "5.4.2"; + + outputs = [ + "out" + ] ++ lib.optionals buildTests [ + "test" + ] ++ lib.optionals buildBenchmarks [ + "benchmark" + ] ++ lib.optionals buildSamples [ + "sample" + ]; + + src = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "hipFFT"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-yDtm9J0wqH6zo4HcgQbqhvwbzbOiJPQ48gJ2gC8PvjA="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + hip + git + cmake + rocm-cmake + ]; + + buildInputs = [ + rocfft + ] ++ lib.optionals (buildTests || buildBenchmarks || buildSamples) [ + gtest + boost + fftw + fftwFloat + openmp + ]; + + cmakeFlags = [ + "-DCMAKE_C_COMPILER=hipcc" + "-DCMAKE_CXX_COMPILER=hipcc" + "-DCMAKE_MODULE_PATH=${hip}/lib/cmake/hip" + "-DHIP_ROOT_DIR=${hip}" + "-DHIP_PATH=${hip}" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals buildTests [ + "-DBUILD_CLIENTS_TESTS=ON" + ] ++ lib.optionals buildBenchmarks [ + "-DBUILD_CLIENTS_RIDER=ON" + ] ++ lib.optionals buildSamples [ + "-DBUILD_CLIENTS_SAMPLES=ON" + ]; + + postInstall = lib.optionalString buildTests '' + mkdir -p $test/bin + mv $out/bin/hipfft-test $test/bin + '' + lib.optionalString buildBenchmarks '' + mkdir -p $benchmark/bin + mv $out/bin/hipfft-rider $benchmark/bin + '' + lib.optionalString buildSamples '' + mkdir -p $sample/bin + mv clients/staging/hipfft_* $sample/bin + patchelf $sample/bin/hipfft_* --shrink-rpath --allowed-rpath-prefixes /nix/store + '' + lib.optionalString (buildTests || buildBenchmarks) '' + rmdir $out/bin + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "FFT marshalling library"; + homepage = "https://github.com/ROCmSoftwarePlatform/hipFFT"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor hip.version; + }; +}) diff --git a/pkgs/development/libraries/hipfort/default.nix b/pkgs/development/libraries/hipfort/default.nix new file mode 100644 index 000000000000..66b2a8a6033e --- /dev/null +++ b/pkgs/development/libraries/hipfort/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-cmake +, gfortran +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hipfort"; + version = "5.4.2"; + + src = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "hipfort"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-cXzNOvWIU388AU5hzLwmIGaX5DvzIJJCvgkP2BA4jao="; + }; + + nativeBuildInputs = [ + cmake + rocm-cmake + gfortran + ]; + + cmakeFlags = [ + "-DHIPFORT_COMPILER=${gfortran}/bin/gfortran" + "-DHIPFORT_AR=${gfortran.cc}/bin/gcc-ar" + "-DHIPFORT_RANLIB=${gfortran.cc}/bin/gcc-ranlib" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; + + postPatch = '' + patchShebangs bin + + substituteInPlace bin/hipfc bin/mymcpu \ + --replace "/bin/cat" "cat" + + substituteInPlace bin/CMakeLists.txt \ + --replace "/bin/mkdir" "mkdir" \ + --replace "/bin/cp" "cp" \ + --replace "/bin/sed" "sed" \ + --replace "/bin/chmod" "chmod" \ + --replace "/bin/ln" "ln" + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Fortran interfaces for ROCm libraries"; + homepage = "https://github.com/ROCmSoftwarePlatform/hipfort"; + license = with licenses; [ mit ]; # mitx11 + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + }; +}) diff --git a/pkgs/development/libraries/hipsolver/default.nix b/pkgs/development/libraries/hipsolver/default.nix new file mode 100644 index 000000000000..04db8f4217d3 --- /dev/null +++ b/pkgs/development/libraries/hipsolver/default.nix @@ -0,0 +1,100 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-cmake +, hip +, gfortran +, rocblas +, rocsolver +, gtest +, lapack-reference +, buildTests ? false +, buildBenchmarks ? false +, buildSamples ? false +}: + +# Can also use cuSOLVER +stdenv.mkDerivation (finalAttrs: { + pname = "hipsolver"; + version = "5.4.2"; + + outputs = [ + "out" + ] ++ lib.optionals buildTests [ + "test" + ] ++ lib.optionals buildBenchmarks [ + "benchmark" + ] ++ lib.optionals buildSamples [ + "sample" + ]; + + src = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "hipSOLVER"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-p9hgKqRALLItv/HTpVlTsu+m9wlwCBYPYnJcm8StIao="; + }; + + nativeBuildInputs = [ + cmake + rocm-cmake + hip + gfortran + ]; + + buildInputs = [ + rocblas + rocsolver + ] ++ lib.optionals buildTests [ + gtest + ] ++ lib.optionals (buildTests || buildBenchmarks) [ + lapack-reference + ]; + + cmakeFlags = [ + "-DCMAKE_C_COMPILER=hipcc" + "-DCMAKE_CXX_COMPILER=hipcc" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals buildTests [ + "-DBUILD_CLIENTS_TESTS=ON" + ] ++ lib.optionals buildBenchmarks [ + "-DBUILD_CLIENTS_BENCHMARKS=ON" + ] ++ lib.optionals buildSamples [ + "-DBUILD_CLIENTS_SAMPLES=ON" + ]; + + postInstall = lib.optionalString buildTests '' + mkdir -p $test/bin + mv $out/bin/hipsolver-test $test/bin + '' + lib.optionalString buildBenchmarks '' + mkdir -p $benchmark/bin + mv $out/bin/hipsolver-bench $benchmark/bin + '' + lib.optionalString buildSamples '' + mkdir -p $sample/bin + mv clients/staging/example-* $sample/bin + patchelf $sample/bin/example-* --shrink-rpath --allowed-rpath-prefixes /nix/store + '' + lib.optionalString (buildTests || buildBenchmarks) '' + rmdir $out/bin + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "ROCm SOLVER marshalling library"; + homepage = "https://github.com/ROCmSoftwarePlatform/hipSOLVER"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor hip.version; + }; +}) diff --git a/pkgs/development/libraries/hipsparse/default.nix b/pkgs/development/libraries/hipsparse/default.nix index cf3fab40cef8..0252c57aefc9 100644 --- a/pkgs/development/libraries/hipsparse/default.nix +++ b/pkgs/development/libraries/hipsparse/default.nix @@ -1,46 +1,37 @@ { lib , stdenv , fetchFromGitHub +, rocmUpdateScript , cmake , rocm-cmake -, rocm-runtime -, rocm-device-libs -, rocm-comgr , rocsparse , hip , gfortran , git -, fetchzip ? null -, gtest ? null +, gtest +, openmp , buildTests ? false +, buildSamples ? false }: -assert buildTests -> fetchzip != null; -assert buildTests -> gtest != null; - # This can also use cuSPARSE as a backend instead of rocSPARSE -let - matrices = lib.optionalAttrs buildTests import ./deps.nix { - inherit fetchzip; - mirror1 = "https://sparse.tamu.edu/MM"; - mirror2 = "https://www.cise.ufl.edu/research/sparse/MM"; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hipsparse"; - rocmVersion = "5.3.1"; - version = "2.3.1-${rocmVersion}"; + version = "5.4.2"; outputs = [ "out" ] ++ lib.optionals buildTests [ "test" + ] ++ lib.optionals buildSamples [ + "sample" ]; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "hipSPARSE"; - rev = "rocm-${rocmVersion}"; - hash = "sha256-Phcihat774ZSAe1QetE/GSZzGlnCnvS9GwsHBHCaD4c="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-JWjmMvqIm4in1aPq2UgYmL0eWjrrRBiU6vH3FnCZZ40="; }; nativeBuildInputs = [ @@ -51,17 +42,18 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - rocm-runtime - rocm-device-libs - rocm-comgr rocsparse git ] ++ lib.optionals buildTests [ gtest + ] ++ lib.optionals (buildTests || buildSamples) [ + openmp ]; cmakeFlags = [ + "-DCMAKE_C_COMPILER=hipcc" "-DCMAKE_CXX_COMPILER=hipcc" + "-DBUILD_CLIENTS_SAMPLES=${if buildSamples then "ON" else "OFF"}" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" @@ -79,25 +71,25 @@ in stdenv.mkDerivation rec { '' + lib.optionalString buildTests '' mkdir -p matrices - ln -s ${matrices.matrix-01}/*.mtx matrices - ln -s ${matrices.matrix-02}/*.mtx matrices - ln -s ${matrices.matrix-03}/*.mtx matrices - ln -s ${matrices.matrix-04}/*.mtx matrices - ln -s ${matrices.matrix-05}/*.mtx matrices - ln -s ${matrices.matrix-06}/*.mtx matrices - ln -s ${matrices.matrix-07}/*.mtx matrices - ln -s ${matrices.matrix-08}/*.mtx matrices - ln -s ${matrices.matrix-09}/*.mtx matrices - ln -s ${matrices.matrix-10}/*.mtx matrices - ln -s ${matrices.matrix-11}/*.mtx matrices - ln -s ${matrices.matrix-12}/*.mtx matrices - ln -s ${matrices.matrix-13}/*.mtx matrices - ln -s ${matrices.matrix-14}/*.mtx matrices - ln -s ${matrices.matrix-15}/*.mtx matrices - ln -s ${matrices.matrix-16}/*.mtx matrices - ln -s ${matrices.matrix-17}/*.mtx matrices - ln -s ${matrices.matrix-18}/*.mtx matrices - ln -s ${matrices.matrix-19}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-01}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-02}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-03}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-04}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-05}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-06}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-07}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-08}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-09}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-10}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-11}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-12}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-13}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-14}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-15}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-16}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-17}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-18}/*.mtx matrices + ln -s ${rocsparse.passthru.matrices.matrix-19}/*.mtx matrices # Not used by the original cmake, causes an error rm matrices/*_b.mtx @@ -120,13 +112,25 @@ in stdenv.mkDerivation rec { mv $out/bin/hipsparse-test $test/bin mv /build/source/matrices $test rmdir $out/bin + '' + lib.optionalString buildSamples '' + mkdir -p $sample/bin + mv clients/staging/example_* $sample/bin + patchelf --set-rpath $out/lib:${lib.makeLibraryPath ( + finalAttrs.buildInputs ++ [ hip gfortran.cc ])} $sample/bin/example_* ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + meta = with lib; { description = "ROCm SPARSE marshalling library"; homepage = "https://github.com/ROCmSoftwarePlatform/hipSPARSE"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; - broken = rocmVersion != hip.version; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor hip.version; }; -} +}) diff --git a/pkgs/development/libraries/hipsparse/deps.nix b/pkgs/development/libraries/hipsparse/deps.nix deleted file mode 100644 index d70df67e2b78..000000000000 --- a/pkgs/development/libraries/hipsparse/deps.nix +++ /dev/null @@ -1,177 +0,0 @@ -{ fetchzip -, mirror1 -, mirror2 -}: - -{ - matrix-01 = fetchzip { - sha256 = "sha256-AHur5ZIDZTFRrO2GV0ieXrffq4KUiGWiZ59pv0fUtEQ="; - - urls = [ - "${mirror1}/SNAP/amazon0312.tar.gz" - "${mirror2}/SNAP/amazon0312.tar.gz" - ]; - }; - - matrix-02 = fetchzip { - sha256 = "sha256-0rSxaN4lQcdaCLsvlgicG70FXUxXeERPiEmQ4MzbRdE="; - - urls = [ - "${mirror1}/Muite/Chebyshev4.tar.gz" - "${mirror2}/Muite/Chebyshev4.tar.gz" - ]; - }; - - matrix-03 = fetchzip { - sha256 = "sha256-hDzDWDUnHEyFedX/tMNq83ZH8uWyM4xtZYUUAD3rizo="; - - urls = [ - "${mirror1}/FEMLAB/sme3Dc.tar.gz" - "${mirror2}/FEMLAB/sme3Dc.tar.gz" - ]; - }; - - matrix-04 = fetchzip { - sha256 = "sha256-GmN2yOt/MoX01rKe05aTyB3ypUP4YbQGOITZ0BqPmC0="; - - urls = [ - "${mirror1}/Williams/webbase-1M.tar.gz" - "${mirror2}/Williams/webbase-1M.tar.gz" - ]; - }; - - matrix-05 = fetchzip { - sha256 = "sha256-gQNjfVyWzNM9RwImJGhkhahRmZz74LzDs1oijL7mI7k="; - - urls = [ - "${mirror1}/Williams/mac_econ_fwd500.tar.gz" - "${mirror2}/Williams/mac_econ_fwd500.tar.gz" - ]; - }; - - matrix-06 = fetchzip { - sha256 = "sha256-87cdZjntNcTuz5BtO59irhcuRbPllWSbhCEX3Td02qc="; - - urls = [ - "${mirror1}/Williams/mc2depi.tar.gz" - "${mirror2}/Williams/mc2depi.tar.gz" - ]; - }; - - matrix-07 = fetchzip { - sha256 = "sha256-WRamuJX3D8Tm+k0q67RjUDG3DeNAxhKiaPkk5afY5eU="; - - urls = [ - "${mirror1}/Bova/rma10.tar.gz" - "${mirror2}/Bova/rma10.tar.gz" - ]; - }; - - matrix-08 = fetchzip { - sha256 = "sha256-5dhkm293Mc3lzakKxHy5W5XIn4Rw+gihVh7gyrjEHXo="; - - urls = [ - "${mirror1}/JGD_BIBD/bibd_22_8.tar.gz" - "${mirror2}/JGD_BIBD/bibd_22_8.tar.gz" - ]; - }; - - matrix-09 = fetchzip { - sha256 = "sha256-czjLWCjXAjZCk5TGYHaEkwSAzQu3TQ3QyB6eNKR4G88="; - - urls = [ - "${mirror1}/Hamm/scircuit.tar.gz" - "${mirror2}/Hamm/scircuit.tar.gz" - ]; - }; - - matrix-10 = fetchzip { - sha256 = "sha256-bYuLnJViAIcIejAkh69/bsNAVIDU4wfTLtD+nmHd6FM="; - - urls = [ - "${mirror1}/Sandia/ASIC_320k.tar.gz" - "${mirror2}/Sandia/ASIC_320k.tar.gz" - ]; - }; - - matrix-11 = fetchzip { - sha256 = "sha256-aDwn8P1khYjo2Agbq5m9ZBInJUxf/knJNvyptt0fak0="; - - urls = [ - "${mirror1}/GHS_psdef/bmwcra_1.tar.gz" - "${mirror2}/GHS_psdef/bmwcra_1.tar.gz" - ]; - }; - - matrix-12 = fetchzip { - sha256 = "sha256-8OJqA/byhlAZd869TPUzZFdsOiwOoRGfKyhM+RMjXoY="; - - urls = [ - "${mirror1}/HB/nos1.tar.gz" - "${mirror2}/HB/nos1.tar.gz" - ]; - }; - - matrix-13 = fetchzip { - sha256 = "sha256-FS0rKqmg+uHwsM/yGfQLBdd7LH/rUrdutkNGBD/Mh1I="; - - urls = [ - "${mirror1}/HB/nos2.tar.gz" - "${mirror2}/HB/nos2.tar.gz" - ]; - }; - - matrix-14 = fetchzip { - sha256 = "sha256-DANnlrNJikrI7Pst9vRedtbuxepyHmCIu2yhltc4Qcs="; - - urls = [ - "${mirror1}/HB/nos3.tar.gz" - "${mirror2}/HB/nos3.tar.gz" - ]; - }; - - matrix-15 = fetchzip { - sha256 = "sha256-21mUgqjWGUfYgiWwSrKh9vH8Vdt3xzcefmqYNYRpxiY="; - - urls = [ - "${mirror1}/HB/nos4.tar.gz" - "${mirror2}/HB/nos4.tar.gz" - ]; - }; - - matrix-16 = fetchzip { - sha256 = "sha256-FOuXvGqBBFNkVS6cexmkluret54hCfCOdK+DOZllE4c="; - - urls = [ - "${mirror1}/HB/nos5.tar.gz" - "${mirror2}/HB/nos5.tar.gz" - ]; - }; - - matrix-17 = fetchzip { - sha256 = "sha256-+7NI1rA/qQxYPpjXKHvAaCZ+LSaAJ4xuJvMRMBEUYxg="; - - urls = [ - "${mirror1}/HB/nos6.tar.gz" - "${mirror2}/HB/nos6.tar.gz" - ]; - }; - - matrix-18 = fetchzip { - sha256 = "sha256-q3NxJjbwGGcFiQ9nhWfUKgZmdVwCfPmgQoqy0AqOsNc="; - - urls = [ - "${mirror1}/HB/nos7.tar.gz" - "${mirror2}/HB/nos7.tar.gz" - ]; - }; - - matrix-19 = fetchzip { - sha256 = "sha256-0GAN6qmVfD+tprIigzuUUUwm5KVhkN9X65wMEvFltDY="; - - urls = [ - "${mirror1}/DNVS/shipsec1.tar.gz" - "${mirror2}/DNVS/shipsec1.tar.gz" - ]; - }; -} diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 85ca439b88fc..650fd5bb6df1 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper -, perlPackages, libxml2, libintl }: +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper, perlPackages +, ocamlPackages, libxml2, libintl +}: stdenv.mkDerivation rec { pname = "hivex"; @@ -12,13 +13,22 @@ stdenv.mkDerivation rec { patches = [ ./hivex-syms.patch ]; - nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; + postPatch = '' + substituteInPlace ocaml/Makefile.am \ + --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib' + ''; + + strictDeps = true; + nativeBuildInputs = [ autoreconfHook makeWrapper perlPackages.perl pkg-config ] + ++ (with ocamlPackages; [ ocaml findlib ]); buildInputs = [ libxml2 ] ++ (with perlPackages; [ perl IOStringy ]) ++ lib.optionals stdenv.isDarwin [ libintl ]; + enableParallelBuilding = true; + postInstall = '' wrapProgram $out/bin/hivexregedit \ --set PERL5LIB "$out/${perlPackages.perl.libPrefix}" \ @@ -30,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Windows registry hive extraction library"; - license = licenses.lgpl2; + license = licenses.lgpl2Only; homepage = "https://github.com/libguestfs/hivex"; maintainers = with maintainers; [offline]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/hmat-oss/default.nix b/pkgs/development/libraries/hmat-oss/default.nix index 3455cf250ce6..01fe1c0a41ca 100644 --- a/pkgs/development/libraries/hmat-oss/default.nix +++ b/pkgs/development/libraries/hmat-oss/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "hmat-oss"; - version = "1.7.1"; + version = "1.8.1"; src = fetchFromGitHub { owner = "jeromerobert"; repo = "hmat-oss"; rev = "refs/tags/${version}"; - sha256 = "sha256-Xc8AbeyEtM6R5I4HdgF4XR5/b8ZYBOv34kY1xrYk/Jw="; + sha256 = "sha256-N6VSQeq2BS/PLcMbyIn/OQfd45zyJJHuOD5bho2nue8="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/hotpatch/default.nix b/pkgs/development/libraries/hotpatch/default.nix index 84803159a2b3..66be524a86ca 100644 --- a/pkgs/development/libraries/hotpatch/default.nix +++ b/pkgs/development/libraries/hotpatch/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH=$(pwd)/src make test ''; + patches = [ ./no-loader-test.patch ]; + meta = with lib; { description = "Hot patching executables on Linux using .so file injection"; homepage = src.meta.homepage; diff --git a/pkgs/development/libraries/hotpatch/no-loader-test.patch b/pkgs/development/libraries/hotpatch/no-loader-test.patch new file mode 100644 index 000000000000..5bc975bb848a --- /dev/null +++ b/pkgs/development/libraries/hotpatch/no-loader-test.patch @@ -0,0 +1,25 @@ +diff --git a/test/loader.c b/test/loader.c +index 4e3dfdc..7f98d94 100644 +--- a/test/loader.c ++++ b/test/loader.c +@@ -54,20 +54,6 @@ int main(int argc, char **argv) + assert(ret < 0); + ret = ld_find_library(maps, mapnum, "libc", false, NULL, 6); + assert(ret >= 0); +-#if __WORDSIZE == 64 +- ret = ld_find_library(maps, mapnum, "/lib64/ld-linux-x86-64.so.2", +- true, NULL, 6); +- assert(ret >= 0); +- ret = ld_find_library(maps, mapnum, "/lib/ld-linux-x86-64.so.2", +- false, NULL, 6); +-#else +- ret = ld_find_library(maps, mapnum, "/lib/ld-linux.so.2", +- true, NULL, 6); +- assert(ret >= 0); +- ret = ld_find_library(maps, mapnum, "/lib32/ld-linux.so.2", +- false, NULL, 6); +-#endif +- assert(ret < 0); + ld_free_maps(maps, mapnum); + return 0; + } diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix index 6c35126143ec..b69c903adf08 100644 --- a/pkgs/development/libraries/howard-hinnant-date/default.nix +++ b/pkgs/development/libraries/howard-hinnant-date/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { license = licenses.mit; description = "A date and time library based on the C++11/14/17 header"; homepage = "https://github.com/HowardHinnant/date"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ r-burns ]; }; } diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix index 221ec7622ff4..41e86b275fe4 100644 --- a/pkgs/development/libraries/htmlcxx/default.nix +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libiconv }: +{ lib, stdenv, fetchurl, autoreconfHook, libiconv }: stdenv.mkDerivation rec { pname = "htmlcxx"; @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-XTj5OM9N+aKYpTRq8nGV//q/759GD8KgIjPLz6j8dcg="; }; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libiconv ]; patches = [ ./ptrdiff.patch @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://htmlcxx.sourceforge.net/"; + homepage = "https://htmlcxx.sourceforge.net/"; description = "A simple non-validating css1 and html parser for C++"; license = licenses.lgpl2; platforms = platforms.all; diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix new file mode 100644 index 000000000000..5e6cef2aff67 --- /dev/null +++ b/pkgs/development/libraries/httplib/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "httplib"; + version = "0.11.4"; + + src = fetchFromGitHub { + owner = "yhirose"; + repo = "cpp-httplib"; + rev = "v${version}"; + hash = "sha256-RTC2Q8T5tvi27BuZuH++wmKZ3bvIHL09S4F8YeO5Fbg="; + }; + + # Header-only library. + dontBuild = true; + + installPhase = '' + mkdir -p "$out/include" + cp -r httplib.h "$out/include" + ''; + + meta = with lib; { + description = "A C++ header-only HTTP/HTTPS server and client library"; + homepage = "https://github.com/yhirose/cpp-httplib"; + changelog = "https://github.com/yhirose/cpp-httplib/releases/tag/v${version}"; + maintainers = with maintainers; [ aidalgol ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index 8b82af586704..66441a911607 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "hunspell"; repo = "hunspell"; rev = "v${version}"; - sha256 = "sha256-YSJztik0QTZFNR8k8Xu1hakyE16NziDavYVkEUCbtGM="; + sha256 = "sha256-J1kgNUElRO63mtU62qU7asf7hht9oyplMIO9I/E6BPU="; }; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/development/libraries/hunspell/wrapper.nix b/pkgs/development/libraries/hunspell/wrapper.nix index d67fe2301039..01987ab71858 100644 --- a/pkgs/development/libraries/hunspell/wrapper.nix +++ b/pkgs/development/libraries/hunspell/wrapper.nix @@ -1,10 +1,9 @@ { stdenv, lib, hunspell, makeWrapper, dicts ? [] }: -with lib; let - searchPath = makeSearchPath "share/hunspell" dicts; + searchPath = lib.makeSearchPath "share/hunspell" dicts; in stdenv.mkDerivation { - name = (appendToName "with-dicts" hunspell).name; + name = (lib.appendToName "with-dicts" hunspell).name; nativeBuildInputs = [ makeWrapper ]; buildCommand = '' makeWrapper ${hunspell.bin}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${lib.escapeShellArg searchPath} diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 308120f194d9..426f87047cd6 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,18 +1,18 @@ { lib, stdenv, fetchurl, pkg-config, expat, ncurses, pciutils, numactl -, x11Support ? false, libX11 ? null, cairo ? null +, x11Support ? false +, libX11 +, cairo +, enableCuda ? false +, cudaPackages }: -assert x11Support -> libX11 != null && cairo != null; - -with lib; - stdenv.mkDerivation rec { pname = "hwloc"; - version = "2.8.0"; + version = "2.9.0"; src = fetchurl { - url = "https://www.open-mpi.org/software/hwloc/v${versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2"; - sha256 = "sha256-NIpy/NSMMqgj7h2hSa6ZIgPnrQM1SeZK7W6m7rAfQsE="; + url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2"; + sha256 = "sha256-IHDpY1lqJCG5r47KQ73sET7hEHqvfMtHXU03Z6iFaIc="; }; configureFlags = [ @@ -23,32 +23,27 @@ stdenv.mkDerivation rec { # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. nativeBuildInputs = [ pkg-config ]; - # Filter out `null' inputs. This allows users to `.override' the - # derivation and set optional dependencies to `null'. - buildInputs = lib.filter (x: x != null) - ([ expat ncurses ] - ++ (optionals x11Support [ cairo libX11 ]) - ++ (optionals stdenv.isLinux [ numactl ])); + buildInputs = [ expat ncurses ] + ++ lib.optionals x11Support [ cairo libX11 ] + ++ lib.optionals stdenv.isLinux [ numactl ] + ++ lib.optional enableCuda cudaPackages.cudatoolkit; - propagatedBuildInputs = - # Since `libpci' appears in `hwloc.pc', it must be propagated. - optional stdenv.isLinux pciutils; + # Since `libpci' appears in `hwloc.pc', it must be propagated. + propagatedBuildInputs = lib.optional stdenv.isLinux pciutils; enableParallelBuilding = true; - postInstall = - optionalString (stdenv.isLinux && numactl != null) - '' if [ -d "${numactl}/lib64" ] - then - numalibdir="${numactl}/lib64" - else - numalibdir="${numactl}/lib" - test -d "$numalibdir" - fi + postInstall = lib.optionalString stdenv.isLinux '' + if [ -d "${numactl}/lib64" ]; then + numalibdir="${numactl}/lib64" + else + numalibdir="${numactl}/lib" + test -d "$numalibdir" + fi - sed -i "$lib/lib/libhwloc.la" \ - -e "s|-lnuma|-L$numalibdir -lnuma|g" - ''; + sed -i "$lib/lib/libhwloc.la" \ + -e "s|-lnuma|-L$numalibdir -lnuma|g" + ''; # Checks disabled because they're impure (hardware dependent) and # fail on some build machines. @@ -56,7 +51,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "doc" "man" ]; - meta = { + meta = with lib; { description = "Portable abstraction of hierarchical architectures for high-performance computing"; longDescription = '' hwloc provides a portable abstraction (across OS, @@ -73,7 +68,6 @@ stdenv.mkDerivation rec { gather information about the hardware, bind processes, and much more. ''; - # https://www.open-mpi.org/projects/hwloc/license.php license = licenses.bsd3; homepage = "https://www.open-mpi.org/projects/hwloc/"; diff --git a/pkgs/development/libraries/icu/63.nix b/pkgs/development/libraries/icu/63.nix index 07684d8db818..19838763f5b4 100644 --- a/pkgs/development/libraries/icu/63.nix +++ b/pkgs/development/libraries/icu/63.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot }: +{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot, buildRootOnly ? false }: import ./base.nix { version = "63.1"; @@ -11,4 +11,4 @@ import ./base.nix { }) ]; patchFlags = [ "-p3" ]; -} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot; } +} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot buildRootOnly; } diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index e1b2ccda3552..a714e758bd88 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -9,7 +9,7 @@ let baseAttrs = { src = fetchurl { - url = "https://github.com/unicode-org/icu/releases/download/release-${lib.replaceChars [ "." ] [ "-" ] version}/icu4c-${lib.replaceChars [ "." ] [ "_" ] version}-src.tgz"; + url = "https://github.com/unicode-org/icu/releases/download/release-${lib.replaceStrings [ "." ] [ "-" ] version}/icu4c-${lib.replaceStrings [ "." ] [ "_" ] version}-src.tgz"; inherit sha256; }; diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 4220922567db..3ebba3c50d0f 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 && stdenv.mkDerivation rec { pname = "igraph"; - version = "0.10.2"; + version = "0.10.4"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - hash = "sha256-6zX9hyz/8H7r+wzpVwz8jDMfd3nqit3pT+wlP0C40Rg="; + hash = "sha256-LsTOxUktGZcp46Ec9QH3+9C+VADMYTZZCjKF1gp36xk="; }; postPatch = '' diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index 1cc0e3b3342f..f656288443bc 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.89"; + version = "1.89.2"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-nD65+yI0IR5XwUalAKH8q8kLhZBal0sPkJ1Wyf4UGq0="; + sha256 = "sha256-NJRDVNnOCJ0lfxSXxzVpSo2m6DCppgdoRRGDYoRcajs="; }; dontBuild = true; diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix deleted file mode 100644 index dc26eaf1001a..000000000000 --- a/pkgs/development/libraries/imlib/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, giflib -, libX11 -, libXext -, libjpeg -, libpng -, libtiff -, xorgproto -}: - -stdenv.mkDerivation rec { - pname = "imlib"; - version = "1.9.15"; - - src = fetchurl { - url = "https://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/${pname}-${version}.tar.gz"; - hash = "sha256-o4mQb38hgK7w4czb5lEoIH3VkuyAbIQWYP2S+7bv8j0="; - }; - - patches = [ - (fetchpatch { - name = "CVE-2007-3568.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-bpp16-CVE-2007-3568.patch"; - sha256 = "0lxfibi094gki39sq1w4p0hcx25xlk0875agbhjkjngzx862wvbg"; - }) - - # The following two patches fix the build with recent giflib. - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-giflib51-1.patch?id=c6d0ed89ad5653421f21cbf3b3d40fd9a1361828"; - sha256 = "0jynlhxcyjiwnz1m8j48xwz4z5csgyg03jfjc8xgpvvcyid4m65l"; - }) - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-giflib51-2.patch?id=c6d0ed89ad5653421f21cbf3b3d40fd9a1361828"; - sha256 = "164x7rd992930rqllmr89p5ahfmbz37ipi8x0igd8gkvc8a4fd5x"; - }) - ]; - - configureFlags = [ - "--disable-shm" - "--x-includes=${libX11.dev}/include" - "--x-libraries=${libX11.out}/lib" - ]; - - buildInputs = [ - libjpeg - libXext - libX11 - xorgproto - libtiff - giflib - libpng - ]; - - meta = with lib; { - description = "An image loading and rendering library for X11"; - platforms = platforms.unix; - license = with licenses; [ gpl2Only lgpl2Only ]; - }; -} diff --git a/pkgs/development/libraries/impy/default.nix b/pkgs/development/libraries/impy/default.nix index 1f5d9070dd37..6d148dd14639 100644 --- a/pkgs/development/libraries/impy/default.nix +++ b/pkgs/development/libraries/impy/default.nix @@ -1,27 +1,28 @@ { lib, stdenv , fetchFromGitHub -, cmake +, meson +, ninja , pkg-config , libpng , zlib , giflib , libjpeg -, SDL2 }: stdenv.mkDerivation rec { pname = "impy"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "bcampbell"; repo = "impy"; rev = "v${version}"; - sha256 = "1h45xjms56radhknspyx17a12dpnm7xgqm1x1chy42aw5ic8b5qf"; + sha256 = "sha256-0bHm3jawYgcIeF2COALWlypX7kvPw1hifB/W+TKcC4M="; }; nativeBuildInputs = [ - cmake + meson + ninja pkg-config ]; @@ -30,7 +31,6 @@ stdenv.mkDerivation rec { zlib giflib libjpeg - SDL2 ]; meta = with lib; { diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index 0a57b3c26fff..4234e56edd70 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -30,7 +30,7 @@ tcl.mkTclDerivation rec { outputs = [ "out" "dev" "man" ]; meta = with lib; { - homepage = "http://incrtcl.sourceforge.net/"; + homepage = "https://incrtcl.sourceforge.net/"; description = "Object Oriented Enhancements for Tcl/Tk"; license = licenses.tcltk; platforms = platforms.unix; diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix index f75ade98c6d8..9fe3575b7bc2 100644 --- a/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/pkgs/development/libraries/indicator-application/gtk2.nix @@ -3,8 +3,6 @@ , glib, dbus-glib, json-glib , gtk2, libindicator-gtk2, libdbusmenu-gtk2, libappindicator-gtk2 }: -with lib; - stdenv.mkDerivation rec { pname = "indicator-application-gtk2"; version = "12.10.0.1"; @@ -45,7 +43,7 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; - meta = { + meta = with lib; { description = "Indicator to take menus from applications and place them in the panel (GTK 2 library for Xfce/LXDE)"; homepage = "https://launchpad.net/indicators-gtk2"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 3a00d87bf6ac..0fa807ebe799 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -2,21 +2,28 @@ , stdenv , fetchFromGitHub , cmake +# for passthru.tests +, intel-compute-runtime +, intel-media-driver }: stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.0"; + version = "22.3.3"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-ZJQ4KLKWA9SIXqKffU/uxUU+aXgfDdxQ5Wejgcfowgs="; + sha256 = "sha256-ghCB9wrjixAX06KUYZUEL1Tq6fKSH7pqe3Ti1y/+a2U="; }; nativeBuildInputs = [ cmake ]; + passthru.tests = { + inherit intel-compute-runtime intel-media-driver; + }; + meta = with lib; { homepage = "https://github.com/intel/gmmlib"; license = licenses.mit; diff --git a/pkgs/development/libraries/intel-media-driver/32bit.patch b/pkgs/development/libraries/intel-media-driver/32bit.patch deleted file mode 100644 index ddeeea66e3b8..000000000000 --- a/pkgs/development/libraries/intel-media-driver/32bit.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/media_softlet/linux/common/ddi/media_libva_util_next.cpp b/media_softlet/linux/common/ddi/media_libva_util_next.cpp -index 66fab63de..a2cdf79d7 100644 ---- a/media_softlet/linux/common/ddi/media_libva_util_next.cpp -+++ b/media_softlet/linux/common/ddi/media_libva_util_next.cpp -@@ -2195,8 +2195,8 @@ void MediaLibvaUtilNext::MediaPrintFps() - - int64_t diff = (tv2.tv_sec - m_tv1.tv_sec)*1000000 + tv2.tv_usec - m_tv1.tv_usec; - float fps = m_frameCountFps / (diff / 1000000.0); -- DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11lu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000)); -- sprintf(temp,"FPS:%6.4f, Interval:%11lu\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000)); -+ DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11llu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000)); -+ sprintf(temp,"FPS:%6.4f, Interval:%11llu\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000)); - - MOS_ZeroMemory(fpsFileName,LENGTH_OF_FPS_FILE_NAME); - sprintf(fpsFileName, FPS_FILE_NAME); -@@ -2213,4 +2213,4 @@ void MediaLibvaUtilNext::MediaPrintFps() - pthread_mutex_unlock(&m_fpsMutex); - return; - } --#endif -\ No newline at end of file -+#endif diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 4f5f8fc28613..7b948943345e 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "22.6.3"; + version = "22.6.4"; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "sha256-lQg+L64DW2ZIBeJRimNkba7EL+SM4jSnX9PWIx4j2AY="; + sha256 = "sha256-0Il51cWqgJwtsnsltHey5Sp+7RYUpqo4GtTRzrzw09A="; }; patches = [ @@ -33,10 +33,6 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/master/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; sha256 = "sha256-f4M0CPtAVf5l2ZwfgTaoPw7sPuAP/Uxhm5JSHEGhKT0="; }) - ] ++ lib.optional stdenv.is32bit [ - # fix compilation on i686-linux but also breaks x86_64 - # a similar issue got fixed in https://github.com/intel/media-driver/pull/1493 but thats to much C magic for me - ./32bit.patch ]; cmakeFlags = [ @@ -44,6 +40,7 @@ stdenv.mkDerivation rec { "-DLIBVA_DRIVERS_PATH=${placeholder "out"}/lib/dri" # Works only on hosts with suitable CPUs. "-DMEDIA_RUN_TEST_SUITE=OFF" + "-DMEDIA_BUILD_FATAL_WARNINGS=OFF" ]; NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; @@ -73,6 +70,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; [ jfrankenau SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 665fdb3f93e3..5e6f628aa68e 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,20 +3,20 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "22.5.4"; + version = "22.6.5"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-f9b0+BWUlekMM0huPdJ5Ms4tYr/ipgfLiQ310FQKAXA="; + sha256 = "sha256-W+lDqGZAenhRZ7tf4qfDNik/3rFNDM0DGSK/CdNRb8g="; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libdrm libva libpciaccess libX11 libXau libXdmcp libpthreadstubs ]; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; cmakeFlags = [ "-DBUILD_SAMPLES=OFF" diff --git a/pkgs/development/libraries/itk/5.2.x.nix b/pkgs/development/libraries/itk/5.2.x.nix new file mode 100644 index 000000000000..e50f2bbca494 --- /dev/null +++ b/pkgs/development/libraries/itk/5.2.x.nix @@ -0,0 +1,5 @@ +import ./generic.nix rec { + version = "5.2.1"; + rev = "v${version}"; + sourceSha256 = "sha256-KaVe9FMGm4ZVMpwAT12fA67T0qZS3ZueiI8z85+xSwE="; +} diff --git a/pkgs/development/libraries/itk/5.x.nix b/pkgs/development/libraries/itk/5.x.nix index e50f2bbca494..765b464e46a1 100644 --- a/pkgs/development/libraries/itk/5.x.nix +++ b/pkgs/development/libraries/itk/5.x.nix @@ -1,5 +1,5 @@ import ./generic.nix rec { - version = "5.2.1"; + version = "5.3.0"; rev = "v${version}"; - sourceSha256 = "sha256-KaVe9FMGm4ZVMpwAT12fA67T0qZS3ZueiI8z85+xSwE="; + sourceSha256 = "sha256-+qCd8Jzpl5fEPTUpLyjjFBkfgCn3+Lf4pi8QnjCwofs="; } diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix index 0d742b393b1d..78f4d56bfac6 100644 --- a/pkgs/development/libraries/itk/generic.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { substituteInPlace CMake/ITKSetStandardCompilerFlags.cmake \ --replace "-march=corei7" "" \ --replace "-mtune=native" "" + substituteInPlace Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/libopenjp2.pc.cmake.in \ + --replace "@OPENJPEG_INSTALL_LIB_DIR@" "@OPENJPEG_INSTALL_FULL_LIB_DIR@" ln -sr ${itkGenericLabelInterpolatorSrc} Modules/External/ITKGenericLabelInterpolator ln -sr ${itkAdaptiveDenoisingSrc} Modules/External/ITKAdaptiveDenoising ''; @@ -52,6 +54,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake xz makeWrapper ]; buildInputs = [ libX11 libuuid vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + # Due to ITKVtkGlue=ON and the additional dependencies needed to configure VTK 9 + # (specifically libGL and libX11 on Linux), + # it's now seemingly necessary for packages that configure ITK to + # also include configuration deps of VTK, even if VTK is not required or available. + # These deps were propagated from VTK 9 in https://github.com/NixOS/nixpkgs/pull/206935, + # so we simply propagate them again from ITK. + # This admittedly is a hack and seems like an issue with VTK 9's CMake configuration. + propagatedBuildInputs = vtk.propagatedBuildInputs; postInstall = '' wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin" diff --git a/pkgs/development/libraries/itk/unstable.nix b/pkgs/development/libraries/itk/unstable.nix deleted file mode 100644 index bb64d4afca9a..000000000000 --- a/pkgs/development/libraries/itk/unstable.nix +++ /dev/null @@ -1,5 +0,0 @@ -import ./generic.nix { - version = "unstable-2022-07-02"; - rev = "5e7aea957c82b67d4364b2b88999805616e3b01d"; - sourceSha256 = "sha256-tjkoaHCuVdvgE6X+7Kb8mt9oxINWs4R0xD9cxdEeYKk="; -} diff --git a/pkgs/development/libraries/itktcl/default.nix b/pkgs/development/libraries/itktcl/default.nix index 66039c61b4d5..b6a4788075f7 100644 --- a/pkgs/development/libraries/itktcl/default.nix +++ b/pkgs/development/libraries/itktcl/default.nix @@ -29,7 +29,7 @@ tcl.mkTclDerivation rec { outputs = [ "out" "dev" "man" ]; meta = with lib; { - homepage = "http://incrtcl.sourceforge.net/"; + homepage = "https://incrtcl.sourceforge.net/"; description = "Mega-widget toolkit for incr Tk"; license = licenses.tcltk; platforms = platforms.unix; diff --git a/pkgs/development/libraries/jabcode/default.nix b/pkgs/development/libraries/jabcode/default.nix index bc4df3f99ba5..dba1fba20df6 100644 --- a/pkgs/development/libraries/jabcode/default.nix +++ b/pkgs/development/libraries/jabcode/default.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { pname = "jabcode-${subproject}"; - version = "unstable-2021-02-16"; + version = "unstable-2022-06-17"; src = fetchFromGitHub { repo = "jabcode"; owner = "jabcode"; - rev = "e342b647525fa294127930d836b54a6b21957cdc"; - sha256 = "04ngw5aa43q7kxfn1v8drmir2i2qakvq0ni0lgf0zw8150mww52x"; + rev = "ee0e4c88b9f3c1da46d6f679ee8b69c547907c20"; + hash = "sha256-GjRkDWefQFdT4i9hRcQhYsY4beMUIXxy38I5lsQytyA="; }; nativeBuildInputs = diff --git a/pkgs/development/libraries/jarowinkler-cpp/default.nix b/pkgs/development/libraries/jarowinkler-cpp/default.nix index 0cbfdcea6447..fb19f998423b 100644 --- a/pkgs/development/libraries/jarowinkler-cpp/default.nix +++ b/pkgs/development/libraries/jarowinkler-cpp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "-DJARO_WINKLER_BUILD_TESTING=ON" ]; - checkInputs = [ + nativeCheckInputs = [ catch2_3 ]; diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix index 0a121d923146..053d06f34a6e 100644 --- a/pkgs/development/libraries/java/commons/bcel/default.nix +++ b/pkgs/development/libraries/java/commons/bcel/default.nix @@ -1,18 +1,18 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "5.2"; + version = "6.6.1"; pname = "commons-bcel"; src = fetchurl { - url = "mirror://apache/commons/bcel/binaries/bcel-${version}.tar.gz"; - sha256 = "13ppnd6afljdjq21jpn4ik2h1yxq8k2kg21ghi0lyb1yap1rd7k6"; + url = "mirror://apache/commons/bcel/binaries/bcel-${version}-bin.tar.gz"; + sha256 = "sha256-bwbERZqnmXD2LzGilDZYsr7BPQoTeZDwDU/8/AjAdP4="; }; installPhase = '' tar xf ${src} mkdir -p $out/share/java - cp bcel-5.2.jar $out/share/java/ + cp bcel-${version}.jar $out/share/java/ ''; meta = { diff --git a/pkgs/development/libraries/java/commons/daemon/default.nix b/pkgs/development/libraries/java/commons/daemon/default.nix index e41c475c829d..dbecabec2d51 100644 --- a/pkgs/development/libraries/java/commons/daemon/default.nix +++ b/pkgs/development/libraries/java/commons/daemon/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.3.3"; pname = "commons-daemon"; src = fetchurl { url = "mirror://apache/commons/daemon/binaries/commons-daemon-${version}-bin.tar.gz"; - sha256 = "sha256-EaQ4wy32GX1MGByCqo811WblqZgsNSw3psr94lrxEqw="; + sha256 = "sha256-FVWmj20LiigRvfK82363Wy8/ie9+wlIlRx49AwQnhOA="; }; installPhase = '' diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index b5d93069cf8f..deb895da7d9c 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "hsqldb"; version = "2.7.1"; - underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version); + underscoreMajMin = lib.replaceStrings ["."] ["_"] (lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; diff --git a/pkgs/development/libraries/java/jffi/default.nix b/pkgs/development/libraries/java/jffi/default.nix index ef1445da9903..aa130bc43346 100644 --- a/pkgs/development/libraries/java/jffi/default.nix +++ b/pkgs/development/libraries/java/jffi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jffi"; - version = "1.3.9"; + version = "1.3.10"; src = fetchFromGitHub { owner = "jnr"; repo = "jffi"; rev = "jffi-${version}"; - sha256 = "sha256-VjZYhMbad+AesANG06umRzqMWj+Ebzu59TYK7Tm/bFo="; + sha256 = "sha256-2Y0l1bDr/f3vxwRjDX62xeC5pUmIbk4XH5prh8c91As="; }; nativeBuildInputs = [ jdk ant texinfo pkg-config ]; diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index 484f9017ae70..4ff3e69c34ce 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -28,7 +28,7 @@ let meta = with lib; { inherit description license; - homepage = "http://saxon.sourceforge.net/"; + homepage = "https://saxon.sourceforge.net/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ rvl ]; platforms = platforms.all; @@ -44,7 +44,7 @@ in { sha256 = "0l5y3y2z4wqgh80f26dwwxwncs8v3nkz3nidv14z024lmk730vs3"; }; description = "XSLT 1.0 processor"; - # http://saxon.sourceforge.net/saxon6.5.3/conditions.html + # https://saxon.sourceforge.net/saxon6.5.3/conditions.html license = lib.licenses.mpl10; java = jre8; }; diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index 6513a761609e..a00399497e22 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = true; meta = { diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index ccff068e1da2..537ab60fda1c 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -1,5 +1,6 @@ { ffmpeg_5-full , nv-codec-headers-11 +, chromaprint , fetchFromGitHub , lib }: @@ -8,17 +9,21 @@ nv-codec-headers = nv-codec-headers-11; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "5.1.2-4"; + version = "5.1.2-7"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-yzaS50sPgyRRLnvzaOiKOEaHKL3Yuf89KsHyPebjoL8="; + sha256 = "sha256-OWSixz1QjWthykO55wMAlywe2ihFLugzLH1qg4Qbe3I="; }; + buildInputs = old.buildInputs ++ [ chromaprint ]; + configureFlags = old.configureFlags ++ [ + "--extra-version=Jellyfin" "--disable-ptx-compression" # https://github.com/jellyfin/jellyfin/issues/7944#issuecomment-1156880067 + "--enable-chromaprint" ]; postPatch = '' diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index c505dc6db55a..420f414da6f7 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { }) ]; - # see the comment on stripPrefix - configureFlags = [] - ++ lib.optional stripPrefix "--with-jemalloc-prefix=" + configureFlags = + # see the comment on stripPrefix + lib.optional stripPrefix "--with-jemalloc-prefix=" ++ lib.optional disableInitExecTls "--disable-initial-exec-tls" # jemalloc is unable to correctly detect transparent hugepage support on # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://jemalloc.net"; + homepage = "https://jemalloc.net/"; description = "General purpose malloc(3) implementation"; longDescription = '' malloc(3)-compatible memory allocator that emphasizes fragmentation diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 9885384e00e1..efac3690851e 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -49,8 +49,6 @@ stdenv.mkDerivation rec { fixDarwinDylibNames ]; - buildInputs = [ gobject-introspection ]; - propagatedBuildInputs = [ glib ]; diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index da8e89f93565..618aee498466 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = { - homepage = "http://judy.sourceforge.net/"; + homepage = "https://judy.sourceforge.net/"; license = lib.licenses.lgpl21Plus; description = "State-of-the-art C library that implements a sparse dynamic array"; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix index 06499e151ba1..e6768dc0fa50 100644 --- a/pkgs/development/libraries/jxrlib/default.nix +++ b/pkgs/development/libraries/jxrlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, fixDarwinDylibNames }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "jxrlib"; @@ -13,21 +13,25 @@ stdenv.mkDerivation rec { sha256 = "0rk3hbh00nw0wgbfbqk1szrlfg3yq7w6ar16napww3nrlm9cj65w"; }; - postPatch = '' - substituteInPlace Makefile \ - --replace "cc" "$CC" - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile \ - --replace '-shared' '-dynamiclib -undefined dynamic_lookup' \ - --replace '.so' '.dylib' - ''; + patches = [ + (fetchpatch { + url = "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/df96f9b9c1fbe9cdc97589c337f8a948bc81c4d0/debian/patches/usecmake.patch"; + sha256 = "sha256-BpCToLgA5856PZk5mXlwAy3Oh9aYP/2wvu2DXDTqufM="; + }) + (fetchpatch { + url = "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/6c88037293aff8d5bc8a76ea32b36781c430ede3/debian/patches/bug803743.patch"; + sha256 = "sha256-omIGa+ZrWjaH/IkBn4jgjufF/HEDKw69anVCX4hw+xQ="; + }) + (fetchpatch { + url = "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/b23d49062ec6a9b2739c9dade86be525a72fc807/debian/patches/pkg-config.patch"; + sha256 = "sha256-ZACaXEi+rbKIFBHtSBheyFfqV2HYsKKrT+SmTShyUhg="; + }) + ]; - nativeBuildInputs = [ python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ]; strictDeps = true; - makeFlags = [ "DIR_INSTALL=$(out)" "SHARED=1" ]; - meta = with lib; { description = "Implementation of the JPEG XR image codec standard"; homepage = "https://jxrlib.codeplex.com"; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index ca4f9eaa782c..c3d88103c2e3 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.100/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.102/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix index ee6a33a83225..522e3a2a5de3 100644 --- a/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix @@ -2,12 +2,12 @@ mkDerivation, extra-cmake-modules, qtbase, qtx11extras, - wayland, plasma-wayland-protocols + wayland, wayland-protocols, plasma-wayland-protocols }: mkDerivation { pname = "kidletime"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras wayland plasma-wayland-protocols ]; + buildInputs = [ qtx11extras wayland wayland-protocols plasma-wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index c6ae8457517c..3edab9894b95 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/attica-5.100.0.tar.xz"; - sha256 = "1j1m7ps6rgjn8n363p0i32syxskzxjcmv255csbc1hgj6yb6cxxf"; - name = "attica-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/attica-5.102.0.tar.xz"; + sha256 = "1xph3l4if2vv2gdv9wjk0ls38g77jdzg3j81fyng8pvxsl32z1yv"; + name = "attica-5.102.0.tar.xz"; }; }; baloo = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/baloo-5.100.0.tar.xz"; - sha256 = "123fl16cxrascngw2cv8y78nf68bby3xa53vc0bxwm7yhixycfzr"; - name = "baloo-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/baloo-5.102.0.tar.xz"; + sha256 = "0y6xc7dihzrcmpb75p8206832kz108l6irdzjv4m0pm0qdj3kb6x"; + name = "baloo-5.102.0.tar.xz"; }; }; bluez-qt = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/bluez-qt-5.100.0.tar.xz"; - sha256 = "1fn23r80jiyif9qxzs0n1jwwvdb3vnfksg54xksxa5v57wnwqjxi"; - name = "bluez-qt-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/bluez-qt-5.102.0.tar.xz"; + sha256 = "0023nhlsniqkkzqjif22fk1hrlzpmigdnc8v4v5z0qf488b0pyf3"; + name = "bluez-qt-5.102.0.tar.xz"; }; }; breeze-icons = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/breeze-icons-5.100.0.tar.xz"; - sha256 = "1nya1m220q68asf2qrgxdbag1gawipy8ydlgympk1nzxa9linb6h"; - name = "breeze-icons-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/breeze-icons-5.102.0.tar.xz"; + sha256 = "1673fjh2q5388764rkkjs5v7jsswr71xdw582irwwz4zic5dkcrd"; + name = "breeze-icons-5.102.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/extra-cmake-modules-5.100.0.tar.xz"; - sha256 = "1if02s5kb9s4wawyz7rln2k46905ms3xrxg1kkvdii73pgkkqmil"; - name = "extra-cmake-modules-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/extra-cmake-modules-5.102.0.tar.xz"; + sha256 = "16vz555f5dmj0prpdr9sbla44gkdmzrlb1k51qmfwip0m2sswngj"; + name = "extra-cmake-modules-5.102.0.tar.xz"; }; }; frameworkintegration = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/frameworkintegration-5.100.0.tar.xz"; - sha256 = "18755r0l3r0q96g6zfz2g9lbf3isx865vhz4z39qblmm13jm97cm"; - name = "frameworkintegration-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/frameworkintegration-5.102.0.tar.xz"; + sha256 = "00qr6n4h8fgm3vy64plj5762wyfanglh8r8qljvpk9jll74wm01d"; + name = "frameworkintegration-5.102.0.tar.xz"; }; }; kactivities = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kactivities-5.100.0.tar.xz"; - sha256 = "14m8dbpn6lxdjlv87ir5wa42s9zb1ipqkj33gbijdagsza0xvc8k"; - name = "kactivities-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kactivities-5.102.0.tar.xz"; + sha256 = "1kl1la4a4zagy7h1sf4l0wdwzg53v28z70sv73dwd6869dmmwygr"; + name = "kactivities-5.102.0.tar.xz"; }; }; kactivities-stats = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kactivities-stats-5.100.0.tar.xz"; - sha256 = "15iry0vaq76ng5wadb4pq4drkccivnjh5bncf4bnjg58wby1zi95"; - name = "kactivities-stats-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kactivities-stats-5.102.0.tar.xz"; + sha256 = "06v2qrd6g20028skh9dq2csw0nggf05qh8w8nz0zvx8q2q2fszhh"; + name = "kactivities-stats-5.102.0.tar.xz"; }; }; kapidox = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kapidox-5.100.0.tar.xz"; - sha256 = "0fgn1qfqa80q4nb8wnvmprsc9gc8axs3n13fk4p01zw6bfmc1938"; - name = "kapidox-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kapidox-5.102.0.tar.xz"; + sha256 = "0jalyq3nzms4j55kqxmqbjyvbrdw0k1142mjpds24xjb87wgj1rq"; + name = "kapidox-5.102.0.tar.xz"; }; }; karchive = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/karchive-5.100.0.tar.xz"; - sha256 = "16wnzvmm74lzf9xs78d2gilipxgg29z9ja3i04li59zc1ixm1bpm"; - name = "karchive-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/karchive-5.102.0.tar.xz"; + sha256 = "0jnqrxpyfqwamq8gim270y5zg6l7inlplc50xdvig5dr0f4d1v20"; + name = "karchive-5.102.0.tar.xz"; }; }; kauth = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kauth-5.100.0.tar.xz"; - sha256 = "0vcgfzkgpk35x14gdprlbzpvcmbx695jqdc8ril23firzrdj1191"; - name = "kauth-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kauth-5.102.0.tar.xz"; + sha256 = "093c1rzgw3rh8ka1q5hdxnn56mxzrrn7v3r3yinr6cy0xif0c4ld"; + name = "kauth-5.102.0.tar.xz"; }; }; kbookmarks = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kbookmarks-5.100.0.tar.xz"; - sha256 = "1bl4brkn3am2nchjcnvxzwswmdp1mb4y644djhvrf6hbz7pghv13"; - name = "kbookmarks-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kbookmarks-5.102.0.tar.xz"; + sha256 = "1jg99z75bdkckahzia17ilbcfvnnamqg9ra0gx2lk1hlhzffi7ls"; + name = "kbookmarks-5.102.0.tar.xz"; }; }; kcalendarcore = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kcalendarcore-5.100.0.tar.xz"; - sha256 = "0mxzqpwanjrczm5b99a7id7bgxgxzif6lrvmfffcrr7pz84j8330"; - name = "kcalendarcore-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kcalendarcore-5.102.0.tar.xz"; + sha256 = "0s2m1d15py39nqagh1abprq6r099mdcci8sm28hp2c2cjwsr7xbk"; + name = "kcalendarcore-5.102.0.tar.xz"; }; }; kcmutils = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kcmutils-5.100.0.tar.xz"; - sha256 = "0kyp8p3svnyn7pkgm4ww1lc0dznrjfvhyc89bd3ahy2b3kvcjymw"; - name = "kcmutils-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kcmutils-5.102.0.tar.xz"; + sha256 = "1fiszfpay1cnyqhfyhl4mpw9j8jmknfisxgwqvd61qfa622ryhxj"; + name = "kcmutils-5.102.0.tar.xz"; }; }; kcodecs = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kcodecs-5.100.0.tar.xz"; - sha256 = "18qcwjhyrxh4sjakq515agpzh7mk4yr6f9fw1kwiwvc44ydbgs2m"; - name = "kcodecs-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kcodecs-5.102.0.tar.xz"; + sha256 = "15k3rlbjb2dji8n7bxb4d8nc7cs7618fhv8x5k50x6kbx867rx88"; + name = "kcodecs-5.102.0.tar.xz"; }; }; kcompletion = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kcompletion-5.100.0.tar.xz"; - sha256 = "11j51byll5ffyl2swif84sq1a751991vdic49rrj0wwwmndrss33"; - name = "kcompletion-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kcompletion-5.102.0.tar.xz"; + sha256 = "1jgr8an283l9d1zhl3cqpp66d90bscfv186jan01r8wan69awy2v"; + name = "kcompletion-5.102.0.tar.xz"; }; }; kconfig = { - version = "5.100.1"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kconfig-5.100.1.tar.xz"; - sha256 = "1nl2ibqxgjd2zppiibnsvdpp5ci8ydz8i685gfgji3jfsx8pkfwb"; - name = "kconfig-5.100.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kconfig-5.102.0.tar.xz"; + sha256 = "0cxc2gfank22yzflxdjr766xn4lr2ij9b5v23g9y1mwfsc2ng3pn"; + name = "kconfig-5.102.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kconfigwidgets-5.100.0.tar.xz"; - sha256 = "14ahwlnnyf2dv3ik6cwa6n7cwxm5wqhiwws6y9w2ff1724vqg0g8"; - name = "kconfigwidgets-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kconfigwidgets-5.102.0.tar.xz"; + sha256 = "19vs2ydlw76v44xyzhfgl70dw0qan2g5z3dq0hzljf5pkc8mhr6p"; + name = "kconfigwidgets-5.102.0.tar.xz"; }; }; kcontacts = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kcontacts-5.100.0.tar.xz"; - sha256 = "0jw8qvw0sv73pw3n51n9dvhlwfjbcz3cf065sqy949bm6q43l1p5"; - name = "kcontacts-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kcontacts-5.102.0.tar.xz"; + sha256 = "04xi28mk5i0l1jgvw0dbapjnk2c6j1y1fxldhhapg722kiw9566y"; + name = "kcontacts-5.102.0.tar.xz"; }; }; kcoreaddons = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kcoreaddons-5.100.0.tar.xz"; - sha256 = "140pbjg38d9fcddi2ifq6y19aqbf6njs4dvqy0ad56widww6ivfz"; - name = "kcoreaddons-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kcoreaddons-5.102.0.tar.xz"; + sha256 = "0j09lb6lbyv5hvvw57i0s5pmd24cywzv9ncrd1chnbk0jcczkqw2"; + name = "kcoreaddons-5.102.0.tar.xz"; }; }; kcrash = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kcrash-5.100.0.tar.xz"; - sha256 = "0a572bc4c6ngllwfkg58sqjsjddn0a8x5mn0isrq0fdynbfyjxhs"; - name = "kcrash-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kcrash-5.102.0.tar.xz"; + sha256 = "1i6jm2jgvqrm95dqdml0w0z9jc9j9n7h48y8zck7s3vaww1v7a67"; + name = "kcrash-5.102.0.tar.xz"; }; }; kdav = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kdav-5.100.0.tar.xz"; - sha256 = "094fwz3iphz56nbjjyw62n3lxw1mfp10jkcn95qx8n1m20f4bnbf"; - name = "kdav-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kdav-5.102.0.tar.xz"; + sha256 = "0prr27mv7mhcynvkp9kzk7a1xiawilvafvzv3a6xdkr5w91741bf"; + name = "kdav-5.102.0.tar.xz"; }; }; kdbusaddons = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kdbusaddons-5.100.0.tar.xz"; - sha256 = "1cr40a96l5adr3xascw9ivlgy8h3nmh7y9fcnw47xmdclcvm2xg0"; - name = "kdbusaddons-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kdbusaddons-5.102.0.tar.xz"; + sha256 = "1lqskn739bix5fp1s40gb7fch66pa9bmlwxzfg9lyqa5xmpfxfzi"; + name = "kdbusaddons-5.102.0.tar.xz"; }; }; kdeclarative = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kdeclarative-5.100.0.tar.xz"; - sha256 = "05s0p35jph316mnzc0ldmxjccda8fwpas9libza14gsv6rrcndbn"; - name = "kdeclarative-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kdeclarative-5.102.0.tar.xz"; + sha256 = "0xvwr1mjviwixbs2i8yh3b37ds4jcgvfrv2z366dld40shs65m0a"; + name = "kdeclarative-5.102.0.tar.xz"; }; }; kded = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kded-5.100.0.tar.xz"; - sha256 = "1klv9ml1ckadf5dp1gx25g33pcd66xlpjb8njr6ygycyqxgiln6j"; - name = "kded-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kded-5.102.0.tar.xz"; + sha256 = "0fjnb9wgpir91jwvl9dbnbvcf3c94l63vjs6ylvcd2w8lxasyxb7"; + name = "kded-5.102.0.tar.xz"; }; }; kdelibs4support = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/portingAids/kdelibs4support-5.100.0.tar.xz"; - sha256 = "1ckkwfzg4ga79bgd5g22cdals720b55nc40n3grjhzw1ksy05ac2"; - name = "kdelibs4support-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/portingAids/kdelibs4support-5.102.0.tar.xz"; + sha256 = "0s823mcwg7l72aq55q8vh48pyp3apk3hm87jh9lc1ijg9frgcgk4"; + name = "kdelibs4support-5.102.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/portingAids/kdesignerplugin-5.100.0.tar.xz"; - sha256 = "1hhddi8zmjbgvy51gwrrjrawdfp9g7n2k14rnw135q423nyfaq8c"; - name = "kdesignerplugin-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/portingAids/kdesignerplugin-5.102.0.tar.xz"; + sha256 = "1nn2f0jln4qni2gaq0anchrv42fcf83m22ag9r3c4sy7vxr8irbc"; + name = "kdesignerplugin-5.102.0.tar.xz"; }; }; kdesu = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kdesu-5.100.0.tar.xz"; - sha256 = "1cgn1wznk4i8la5n03qajc38pggm162ybfdb2ya109zq7nnqkn1g"; - name = "kdesu-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kdesu-5.102.0.tar.xz"; + sha256 = "0ps88rvvzagpw4qp4nj86wknyhm9mmdlkhs0i7cywf53pdr37afh"; + name = "kdesu-5.102.0.tar.xz"; }; }; kdewebkit = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/portingAids/kdewebkit-5.100.0.tar.xz"; - sha256 = "10gl34a9zb5nad21nwqvj1fipxxckfdy7myr8bxlqkjqll0jiv15"; - name = "kdewebkit-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/portingAids/kdewebkit-5.102.0.tar.xz"; + sha256 = "137j897admfp5d8g1x1g5x9h4nmsp6padi17nx4y350kriyhxkkv"; + name = "kdewebkit-5.102.0.tar.xz"; }; }; kdnssd = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kdnssd-5.100.0.tar.xz"; - sha256 = "1fkjhkv7qgjr3lgfwvvhqbrigca8hw9fdw6531xqr97slwxiqxb3"; - name = "kdnssd-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kdnssd-5.102.0.tar.xz"; + sha256 = "10awmh1j05hlg957ih7a1shapl6fgp1ma5b7qvbsp4fi5nh2k985"; + name = "kdnssd-5.102.0.tar.xz"; }; }; kdoctools = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kdoctools-5.100.0.tar.xz"; - sha256 = "0ar7lw6s7qzswf1k80xl9px5g9agl5zi7daaswppqjrpn7pwksa0"; - name = "kdoctools-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kdoctools-5.102.0.tar.xz"; + sha256 = "11g671mlva00fk7yfym5a73sfjdy0zkhh3a7h4zv0s763nnmkg13"; + name = "kdoctools-5.102.0.tar.xz"; }; }; kemoticons = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kemoticons-5.100.0.tar.xz"; - sha256 = "0qs5w5wc1ljmhvly08k0569kyy6c51ldi3080ka9hpasdxlpy4y4"; - name = "kemoticons-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kemoticons-5.102.0.tar.xz"; + sha256 = "0arligy3i9qcqx9kapv692nz8dl1kimfv03392z3w3qqdwlpc9v5"; + name = "kemoticons-5.102.0.tar.xz"; }; }; kfilemetadata = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kfilemetadata-5.100.0.tar.xz"; - sha256 = "0cbiaq9ivdf7pjjh47m65zxrzr1r776ycjzzkkwfc7n27lb0rckg"; - name = "kfilemetadata-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kfilemetadata-5.102.0.tar.xz"; + sha256 = "0kv33rqp3wshhmv2pdayggxlxal6ihjam2als3d9a5hm1h5kz2fc"; + name = "kfilemetadata-5.102.0.tar.xz"; }; }; kglobalaccel = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kglobalaccel-5.100.0.tar.xz"; - sha256 = "1wm2j8hsgwfp8zv4mi0l9rg3qlnk74l1cnkgid3sd02c7vrlx6y3"; - name = "kglobalaccel-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kglobalaccel-5.102.0.tar.xz"; + sha256 = "1l2mk7192wdb1qv62fqk9w1w6zbsmfr822gr5azg6nnzv4gdvadm"; + name = "kglobalaccel-5.102.0.tar.xz"; }; }; kguiaddons = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kguiaddons-5.100.0.tar.xz"; - sha256 = "00ix7gfp5c4ph4q2f3cig1bxjvc8pnwg8psy5fxix24xxm1n7qaw"; - name = "kguiaddons-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kguiaddons-5.102.0.tar.xz"; + sha256 = "1awgfnxmvghh70ldnpb1759wmy1i6rwsp3nggdj2ncdbdbgj04sv"; + name = "kguiaddons-5.102.0.tar.xz"; }; }; kholidays = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kholidays-5.100.0.tar.xz"; - sha256 = "076ax7p579180vr66dqjzv43ny1cz56s4w61g6d5s6v18w9n7i2g"; - name = "kholidays-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kholidays-5.102.0.tar.xz"; + sha256 = "01rznsqxg7crljzy0lcal6r03qvfg8qrh0zigh26073rdn56g5d1"; + name = "kholidays-5.102.0.tar.xz"; }; }; khtml = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/portingAids/khtml-5.100.0.tar.xz"; - sha256 = "0h8wb1n0yfc2729rpnx3n52ky3zprfkbgk2rr85k3dax79pcv9a0"; - name = "khtml-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/portingAids/khtml-5.102.0.tar.xz"; + sha256 = "0az046m9n954cb70iqgx2isspbc0zb89fw97nhmw9szgfsliy8ab"; + name = "khtml-5.102.0.tar.xz"; }; }; ki18n = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/ki18n-5.100.0.tar.xz"; - sha256 = "008gndw3cp45hkm7klfipm54k1kdglj8sb2hkkvfz4b5p3bg2qyy"; - name = "ki18n-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/ki18n-5.102.0.tar.xz"; + sha256 = "0iwz3jwaqlbja338gkq7sz7f8sw2rp37grkqpvx62274qflq1qww"; + name = "ki18n-5.102.0.tar.xz"; }; }; kiconthemes = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kiconthemes-5.100.0.tar.xz"; - sha256 = "1fahg11v02757iiwc4nkwnnhf9d7jfa6ryx5l5i2sjg7c4xwqblh"; - name = "kiconthemes-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kiconthemes-5.102.0.tar.xz"; + sha256 = "1q1fij7vn5b34k99cz4x58b5b8a04vrlkdckc8bxbbccpvy5xkyh"; + name = "kiconthemes-5.102.0.tar.xz"; }; }; kidletime = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kidletime-5.100.0.tar.xz"; - sha256 = "1i3p3cfvcl3li45nn63r6vwi7sk3rbkd9crd5z686gm6z0nidw5l"; - name = "kidletime-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kidletime-5.102.0.tar.xz"; + sha256 = "159grvvw7zdp2hkiq20iz9zy8ilq6mfr3dmyq51pfq9741nd88qf"; + name = "kidletime-5.102.0.tar.xz"; }; }; kimageformats = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kimageformats-5.100.0.tar.xz"; - sha256 = "09w8fg321lzmavsid0a4yf6hwa9clhihfbvpkdl0kb60alyjbdfb"; - name = "kimageformats-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kimageformats-5.102.0.tar.xz"; + sha256 = "1d29dnjca0fgwi5ri6x4gqgsp8h4x5yidf7ifnpf7qyhwm22r2x6"; + name = "kimageformats-5.102.0.tar.xz"; }; }; kinit = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kinit-5.100.0.tar.xz"; - sha256 = "1kpjbd20dv2zazcn275p1fwgvnq1pjpkkf0mp4bwk95vrvcjs4c9"; - name = "kinit-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kinit-5.102.0.tar.xz"; + sha256 = "03pzsnis8lpsglry5iwkwfvn6fnn82rdxn6pac1cs0jhxwhg9fdc"; + name = "kinit-5.102.0.tar.xz"; }; }; kio = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kio-5.100.0.tar.xz"; - sha256 = "1dkwdmjc41zq1j0kl38zzag0hckk6fgy5prg5kcid05k5v9qi1q8"; - name = "kio-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kio-5.102.0.tar.xz"; + sha256 = "0sviiq3axsxlf2nvxm0ccazbp7fw4dvky3dd87p82rng3v01g53a"; + name = "kio-5.102.0.tar.xz"; }; }; kirigami2 = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kirigami2-5.100.0.tar.xz"; - sha256 = "1pq16p69k7g963ah5ilr8mjplzrgarqky7i6rxgm5knfqpq0l26n"; - name = "kirigami2-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kirigami2-5.102.0.tar.xz"; + sha256 = "1ckmk0p0x5ymma3q5nkja3h6qz439qdxq0vchljg5yazxpiki08p"; + name = "kirigami2-5.102.0.tar.xz"; }; }; kitemmodels = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kitemmodels-5.100.0.tar.xz"; - sha256 = "1n1iis3xjmvlfgrwv61cpif63pk2wca8g168iscijvpkhihn49x3"; - name = "kitemmodels-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kitemmodels-5.102.0.tar.xz"; + sha256 = "19iqg7lbln0h1fkssa2jj58c9j04lvwwbbzrq11ds1wzjvw77xsj"; + name = "kitemmodels-5.102.0.tar.xz"; }; }; kitemviews = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kitemviews-5.100.0.tar.xz"; - sha256 = "06pzlcrjbfahhp8diirmvf2xl7a2bj4x34fp1yax9pjnx44i2vcw"; - name = "kitemviews-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kitemviews-5.102.0.tar.xz"; + sha256 = "1c31qm059y7j0hskrbhm57qh6g2mm04qfjqbhili9qflp03fl69y"; + name = "kitemviews-5.102.0.tar.xz"; }; }; kjobwidgets = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kjobwidgets-5.100.0.tar.xz"; - sha256 = "00rilxsbbhl52j9bfzk60hlqrka9hahli0p6fmd8m6m452czjqnk"; - name = "kjobwidgets-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kjobwidgets-5.102.0.tar.xz"; + sha256 = "1r6xfi4hwfj9hn1hmgniyx17z3b1himh0fmc6bd45b89jzdvmqcl"; + name = "kjobwidgets-5.102.0.tar.xz"; }; }; kjs = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/portingAids/kjs-5.100.0.tar.xz"; - sha256 = "1bn23bq1g1774dvak5mq9xmndxjkwmsiyjkxc93byfwi52xrswk1"; - name = "kjs-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/portingAids/kjs-5.102.0.tar.xz"; + sha256 = "14w523kv5jfp4hzfbkawsf5pljahihj8jxkyjk5r707nrbnqzd3w"; + name = "kjs-5.102.0.tar.xz"; }; }; kjsembed = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/portingAids/kjsembed-5.100.0.tar.xz"; - sha256 = "1w2cfckd6r68jmvqcfiw326s3zl4l2j3pz19p12v01vlrh4lr1m7"; - name = "kjsembed-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/portingAids/kjsembed-5.102.0.tar.xz"; + sha256 = "179gr69n0v39lbxi95w1ckk20505h4zqhxsqmy6fjs9vxc3zja5s"; + name = "kjsembed-5.102.0.tar.xz"; }; }; kmediaplayer = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/portingAids/kmediaplayer-5.100.0.tar.xz"; - sha256 = "002ahd1d39m22cy5xd2vvps4ib4cncfwzmqdnki9sh76gsmlpb52"; - name = "kmediaplayer-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/portingAids/kmediaplayer-5.102.0.tar.xz"; + sha256 = "0kmy4x9bi29nnd8sixrcdk4bhffh880a2p6pdcfz6sqp1i7n8v6s"; + name = "kmediaplayer-5.102.0.tar.xz"; }; }; knewstuff = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/knewstuff-5.100.0.tar.xz"; - sha256 = "19fz50jqrs467qm5qvc6iadw7kb1za6ncc2vnhax6j59h5xn2bn3"; - name = "knewstuff-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/knewstuff-5.102.0.tar.xz"; + sha256 = "127w4vfpinq7lm6ckszfisyw7mjzs9v6s2ga4xyd6y7lzyf33gz5"; + name = "knewstuff-5.102.0.tar.xz"; }; }; knotifications = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/knotifications-5.100.0.tar.xz"; - sha256 = "18z6cb1s6nra7cyj121knj50brmyyp9a7qdwyd101rfj1d7k08ds"; - name = "knotifications-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/knotifications-5.102.0.tar.xz"; + sha256 = "1y5sjzx9nyamalwl08y5krxajj0rvhhqgfdyavwkqbr30jpnmklk"; + name = "knotifications-5.102.0.tar.xz"; }; }; knotifyconfig = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/knotifyconfig-5.100.0.tar.xz"; - sha256 = "1ads4yy08441a8hfbig4413p2qyw07b0gpxm3pzw3958y32a9d8x"; - name = "knotifyconfig-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/knotifyconfig-5.102.0.tar.xz"; + sha256 = "05s8nzc7a01w3rxjb9jg7d98v4rd2dnncpmmv7ap209z10i09qh8"; + name = "knotifyconfig-5.102.0.tar.xz"; }; }; kpackage = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kpackage-5.100.0.tar.xz"; - sha256 = "11969rqkwf14gjk3vx2lzd3snirnv3fry5yh6jwnc17vjiz6b35j"; - name = "kpackage-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kpackage-5.102.0.tar.xz"; + sha256 = "0mas3dq39lcij3nva0vmqrggm5b43grmmmszfjqd7hrmgpm93n43"; + name = "kpackage-5.102.0.tar.xz"; }; }; kparts = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kparts-5.100.0.tar.xz"; - sha256 = "0vy8j5p0icxdlsvdlmbrvkbp50f3qnb7fqnvdg544d2lp7x1v5k8"; - name = "kparts-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kparts-5.102.0.tar.xz"; + sha256 = "07vgc4fpwzkiylvlhniph7apggl563ma1hbnig9w1gkbwssyxjip"; + name = "kparts-5.102.0.tar.xz"; }; }; kpeople = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kpeople-5.100.0.tar.xz"; - sha256 = "1q9yxfrs9rhwzykah3909lv9qfly13jdirya4m4j34azbqfiahqg"; - name = "kpeople-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kpeople-5.102.0.tar.xz"; + sha256 = "1wi08waz3jv1bz6yf8hbnkyx3k80hdgnwvq0s3hsr3hsaal46dv2"; + name = "kpeople-5.102.0.tar.xz"; }; }; kplotting = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kplotting-5.100.0.tar.xz"; - sha256 = "1lsi6yk7fpdji9qb2hdy2qqcp050cgckg8xmg1kmv551g6x13r7m"; - name = "kplotting-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kplotting-5.102.0.tar.xz"; + sha256 = "1qq8m4wc9zz4s6l7myarryn2z7kj89rk51knjnq7kkibhbhwwsqy"; + name = "kplotting-5.102.0.tar.xz"; }; }; kpty = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kpty-5.100.0.tar.xz"; - sha256 = "0h5l72klg78wy0z29zay5zyivgff8jb2v0hfw2akrfblwwdmc27j"; - name = "kpty-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kpty-5.102.0.tar.xz"; + sha256 = "0f57fvljv7vmd89yyzbnj8lnafp495j3ial6dmh7wxfmbifw75gz"; + name = "kpty-5.102.0.tar.xz"; }; }; kquickcharts = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kquickcharts-5.100.0.tar.xz"; - sha256 = "1b5ddbcgxasjyhzabbqcvlb4q04zp7yiqifk7gdigjvxx15dxwrz"; - name = "kquickcharts-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kquickcharts-5.102.0.tar.xz"; + sha256 = "0w4h3jz5ki38y54papms2j1z57b0vna7ac89diffbld04aigjr40"; + name = "kquickcharts-5.102.0.tar.xz"; }; }; kross = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/portingAids/kross-5.100.0.tar.xz"; - sha256 = "0jpnnvajxyzki221agl1ai15bj6xrylg69ymwxn70pcdp30wsvxj"; - name = "kross-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/portingAids/kross-5.102.0.tar.xz"; + sha256 = "0hdbz4ki5ccjpsi8m1x31v9k6c4kl63ak4pfnqllaxjlmpz6yyw3"; + name = "kross-5.102.0.tar.xz"; }; }; krunner = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/krunner-5.100.0.tar.xz"; - sha256 = "0mn0b2rvkb0c743vn4xxi1f8mcb5gb9vjnksiw88jgfy4qrmal3q"; - name = "krunner-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/krunner-5.102.0.tar.xz"; + sha256 = "0gvbmb8j7pqah1lvjcykr6i00q8zhybnc6b7x0ajndlqll72qzff"; + name = "krunner-5.102.0.tar.xz"; }; }; kservice = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kservice-5.100.0.tar.xz"; - sha256 = "1vq4hnyfpj1ax19zgly7vcqvysxdc7wyyycmhrn6982l24d14gdk"; - name = "kservice-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kservice-5.102.0.tar.xz"; + sha256 = "1plsv4bbmq7xq3y1cnqzvm85wjxp4ivlwnd4snis55ch2qpqcqvh"; + name = "kservice-5.102.0.tar.xz"; }; }; ktexteditor = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/ktexteditor-5.100.0.tar.xz"; - sha256 = "1rbyaamgrnga6k39q646xfi81ic5dar9wa5wcacp9d17m6zqry51"; - name = "ktexteditor-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/ktexteditor-5.102.0.tar.xz"; + sha256 = "1kvki86rnkabrjbgkf7jbrj8lrn83nb4gw9j4h5jmyiam8ybkj2w"; + name = "ktexteditor-5.102.0.tar.xz"; }; }; ktextwidgets = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/ktextwidgets-5.100.0.tar.xz"; - sha256 = "109j8zpnpiw9h0arh2ll3ql7czyv65lva4hwa626wk6589nc82vn"; - name = "ktextwidgets-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/ktextwidgets-5.102.0.tar.xz"; + sha256 = "1cipla0shfqpkx2gvvsxncsx4h9bc4zf078p1r9kf3v57pfdr0jc"; + name = "ktextwidgets-5.102.0.tar.xz"; }; }; kunitconversion = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kunitconversion-5.100.0.tar.xz"; - sha256 = "06ql3ijlha0gib31mwc7r260vy3dcxi6nrz5jylv9blzvcq8qnqw"; - name = "kunitconversion-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kunitconversion-5.102.0.tar.xz"; + sha256 = "11wdgzw5rsd0zbi24c6qvyavlx3hrnifq89ajyx1dpfsm1n21md3"; + name = "kunitconversion-5.102.0.tar.xz"; }; }; kwallet = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kwallet-5.100.0.tar.xz"; - sha256 = "101fhgrgjqsxdqxzraw4a8gn5dvv2nb6xxfwi9gdjdjva5zzbg9b"; - name = "kwallet-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kwallet-5.102.0.tar.xz"; + sha256 = "10q9ckqybxdk14y7gy0fzaharz62axd965g17b0x18z9ln0g04d3"; + name = "kwallet-5.102.0.tar.xz"; }; }; kwayland = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kwayland-5.100.0.tar.xz"; - sha256 = "119ggvny15x65z2i4d7x6bh01a9wif1h5jq4rppcm7mwczmhjg91"; - name = "kwayland-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kwayland-5.102.0.tar.xz"; + sha256 = "1k5109pjl4fdsiqw4dzg8pl8nw4y59gbgf8cn6w2wp1b42kz89l6"; + name = "kwayland-5.102.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kwidgetsaddons-5.100.0.tar.xz"; - sha256 = "07sa914xmkrm0bb3r7rnzkn9aw1rzlgbkzmakwyw0v569yb166f7"; - name = "kwidgetsaddons-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kwidgetsaddons-5.102.0.tar.xz"; + sha256 = "1lnnn8y2d72qpiq76mr9vk4037a6g59x1cjyvrpxymb3k0i9gmji"; + name = "kwidgetsaddons-5.102.0.tar.xz"; }; }; kwindowsystem = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kwindowsystem-5.100.0.tar.xz"; - sha256 = "1csghc0b4jr4nfwicz29bp9lxr69iw52ghbdqi0a0jn9lnx4xck9"; - name = "kwindowsystem-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kwindowsystem-5.102.0.tar.xz"; + sha256 = "1qb8mb9mgqwdbrd2g4r7x7f2qfmdm54i77r2157n7by9j6j9n36r"; + name = "kwindowsystem-5.102.0.tar.xz"; }; }; kxmlgui = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kxmlgui-5.100.0.tar.xz"; - sha256 = "19cfavf2qqy6kzc5p30s05pp92fphnaja11arnaks0vd0m9hbvky"; - name = "kxmlgui-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/kxmlgui-5.102.0.tar.xz"; + sha256 = "06hk6j8hsc05cy6d8i3a6xjxxzwrvshjb3ij6ji1yvcbmfs2rrrp"; + name = "kxmlgui-5.102.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/portingAids/kxmlrpcclient-5.100.0.tar.xz"; - sha256 = "0fnfkka872w1bjyh3cscmcj8cfmwybj016x1zph7yxwpnbmzyimr"; - name = "kxmlrpcclient-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/portingAids/kxmlrpcclient-5.102.0.tar.xz"; + sha256 = "06bjxi3k9q3n261rsc0qil5zzf4lxqfizd9b0jny8ygvvjs9han4"; + name = "kxmlrpcclient-5.102.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/modemmanager-qt-5.100.0.tar.xz"; - sha256 = "0x7l80hkxhf7b45h2kwlchd04763rcai06cjk1s88mzcl6s419fy"; - name = "modemmanager-qt-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/modemmanager-qt-5.102.0.tar.xz"; + sha256 = "195p7xmc8fzywna6j9ppaajqav27prjkl8slwggnsyjbh5bb3a76"; + name = "modemmanager-qt-5.102.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/networkmanager-qt-5.100.0.tar.xz"; - sha256 = "0pv3daiywmw0jjzd4px3g2d1ifkd63dm7zq3r77kl2ibxwk2yqfn"; - name = "networkmanager-qt-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/networkmanager-qt-5.102.0.tar.xz"; + sha256 = "12q7fkhpidyyxa4byb88vsrkahgr4l2x3s9zylknb60cy86qpp69"; + name = "networkmanager-qt-5.102.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/oxygen-icons5-5.100.0.tar.xz"; - sha256 = "1s81jz9ndjzyvn7gps1jr5wbxmirb986cx1665lk6zgk577x8q80"; - name = "oxygen-icons5-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/oxygen-icons5-5.102.0.tar.xz"; + sha256 = "05mwijl3day3vm8gs085cg3g04xi1x8ypwd87nc80jw7pz1m7mf4"; + name = "oxygen-icons5-5.102.0.tar.xz"; }; }; plasma-framework = { - version = "5.100.1"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/plasma-framework-5.100.1.tar.xz"; - sha256 = "18ddniihbj26gz3lqh36xghwdszwgazkvpgr1bghb8bk0y90m52k"; - name = "plasma-framework-5.100.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/plasma-framework-5.102.0.tar.xz"; + sha256 = "14al5i40bpjw73wk0by9ca88s26hbns7msa4kil6zinzh8pvbkfk"; + name = "plasma-framework-5.102.0.tar.xz"; }; }; prison = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/prison-5.100.0.tar.xz"; - sha256 = "10wlrcfqgbk88w2xr7wi2kjkkk8lcyiqqvav07r13f34hgpsdj9h"; - name = "prison-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/prison-5.102.0.tar.xz"; + sha256 = "1iw14s4hf2ap8qfrj7kf5xicsz78b4lwydg58ymv6z70jcl329nn"; + name = "prison-5.102.0.tar.xz"; }; }; purpose = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/purpose-5.100.0.tar.xz"; - sha256 = "0bskd3qmzsqlr8xjagx7d5cpy4s5lhf2z7p5wgn0axfb8jvva3iw"; - name = "purpose-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/purpose-5.102.0.tar.xz"; + sha256 = "1a50nx7ldgx3gaqfh0k8lc6fx2ww7k07glg2qah5crwlwqxv70iw"; + name = "purpose-5.102.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/qqc2-desktop-style-5.100.0.tar.xz"; - sha256 = "09igdk79v0rv2kiv259zzvqinqqhhqq64l5wj2xcc5b9vpnvyyx9"; - name = "qqc2-desktop-style-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/qqc2-desktop-style-5.102.0.tar.xz"; + sha256 = "1c6mgfq4lznm69a5z6cycc17hlp5j96635rasksxgsnib7mvzwfq"; + name = "qqc2-desktop-style-5.102.0.tar.xz"; }; }; solid = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/solid-5.100.0.tar.xz"; - sha256 = "10s64js1hwda9zd7y91yq5f7x1h0z7n0khf9m3rmqmi4kpnr76cd"; - name = "solid-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/solid-5.102.0.tar.xz"; + sha256 = "0cmik9c9s3nhqd5imkj4m9510whsf55nmw85xjsrnlh0fk6d7qq6"; + name = "solid-5.102.0.tar.xz"; }; }; sonnet = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/sonnet-5.100.0.tar.xz"; - sha256 = "068y78y8n5yrnxs4kicxhjfx6mhvr5r15z8nxjpm63chhn9jprz4"; - name = "sonnet-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/sonnet-5.102.0.tar.xz"; + sha256 = "04dci8l0v3v3s8fgn39sk67dbz44ah8qj5yvl5zn1xpwcfvj3ahf"; + name = "sonnet-5.102.0.tar.xz"; }; }; syndication = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/syndication-5.100.0.tar.xz"; - sha256 = "13gkkl5yczsdg4yfxvasza286l6k6876p35b1jzhw0ysjxdh8j65"; - name = "syndication-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/syndication-5.102.0.tar.xz"; + sha256 = "1w08fn43hr4mnff62kzay4rblxbg4p6fghcp5bnziaddl0jpr799"; + name = "syndication-5.102.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/syntax-highlighting-5.100.0.tar.xz"; - sha256 = "1d2c86a1k824f44gzzm138pkz21mk788xp2hnq1xcanlsa3r99z0"; - name = "syntax-highlighting-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/syntax-highlighting-5.102.0.tar.xz"; + sha256 = "03zjf58y9n6fq3zhybp86fqh65vxk2i4pqrrv4lwm6wz9pj289rg"; + name = "syntax-highlighting-5.102.0.tar.xz"; }; }; threadweaver = { - version = "5.100.0"; + version = "5.102.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/threadweaver-5.100.0.tar.xz"; - sha256 = "0dap8iihilqy2v9jy1s00j05qqrjj67n6v0yg4ix0lay2kqjwnh3"; - name = "threadweaver-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.102/threadweaver-5.102.0.tar.xz"; + sha256 = "1jxn1mf7xz3j9lz69kgcrqam87fxzyxp250vzl9hrs26jvw7lagr"; + name = "threadweaver-5.102.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 792d4b102f4d..e4a61a3c0731 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -4,7 +4,6 @@ , CoreFoundation, Security, SystemConfiguration }: -with lib; stdenv.mkDerivation rec { pname = "heimdal"; version = "7.8.0"; @@ -22,9 +21,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config python3 perl bison flex texinfo ] ++ (with perlPackages; [ JSON ]); - buildInputs = optionals (stdenv.isLinux) [ libcap_ng ] + buildInputs = lib.optionals (stdenv.isLinux) [ libcap_ng ] ++ [ db sqlite openssl libedit openldap pam] - ++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ]; + ++ lib.optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ]; ## ugly, X should be made an option configureFlags = [ @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { "--with-berkeley-db" "--with-berkeley-db-include=${db.dev}/include" "--with-openldap=${openldap.dev}" - ] ++ optionals (stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.isLinux) [ "--with-capng" ]; @@ -91,7 +90,7 @@ stdenv.mkDerivation rec { # hx_locl.h:67:25: fatal error: pkcs10_asn1.h: No such file or directory #enableParallelBuilding = true; - meta = { + meta = with lib; { description = "An implementation of Kerberos 5 (and some more stuff)"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index fc8fb7398701..22b29151caa5 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -1,6 +1,13 @@ { lib, stdenv, fetchurl, pkg-config, perl, bison, bootstrap_cmds , openssl, openldap, libedit, keyutils + +# for passthru.tests +, bind +, curl , nixosTests +, openssh +, postgresql +, python3 # Extra Arguments , type ? "" @@ -19,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "${type}krb5"; - version = "1.20"; + version = "1.20.1"; src = fetchurl { url = "https://kerberos.org/dist/krb5/${lib.versions.majorMinor version}/krb5-${version}.tar.gz"; - sha256 = "sha256-fgIr3TyFGDAXP5+qoAaiMKDg/a1MlT6Fv/S/DaA24S8"; + sha256 = "sha256-cErtSbGetacXizSyhzYg7CmdsIdS1qhXT5XUGHmriFE="; }; outputs = [ "out" "dev" ]; @@ -92,6 +99,13 @@ stdenv.mkDerivation rec { passthru = { implementation = "krb5"; - tests = { inherit (nixosTests) kerberos; }; + tests = { + inherit (nixosTests) kerberos; + inherit (python3.pkgs) requests-credssp; + bind = bind.override { enableGSSAPI = true; }; + curl = curl.override { gssSupport = true; }; + openssh = openssh.override { withKerberos = true; }; + postgresql = postgresql.override { gssSupport = true; }; + }; }; } diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index ee1b4fb8ce8a..e4318ebe6193 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,28 +1,29 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome -, gtk-doc, gtk2, python2Packages, lua, gobject-introspection +, gtk-doc, gtk2, lua, gobject-introspection }: -let - inherit (python2Packages) python pygtk; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "keybinder"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "engla"; repo = "keybinder"; rev = "v${version}"; - sha256 = "sha256-q/+hqhvXIknT+/5oENcWSr1OuF00kaZlXFUP1fdCMlk="; + sha256 = "sha256-elL6DZtzCwAtoyGZYP0jAma6tHPks2KAtrziWtBENGU="; }; nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [ libtool gnome.gnome-common gtk-doc gtk2 - python pygtk lua gobject-introspection + lua gobject-introspection ]; + configureFlags = [ "--disable-python" ]; + preConfigure = '' - ./autogen.sh --prefix="$out" + ./autogen.sh --prefix="$out" $configureFlags ''; meta = with lib; { @@ -36,8 +37,6 @@ in stdenv.mkDerivation rec { * A C library, ``libkeybinder`` * Gobject-Introspection (gir) generated bindings * Lua bindings, ``lua-keybinder`` - * Python bindings, ``python-keybinder`` - * An ``examples`` directory with programs in C, Lua, Python and Vala. ''; homepage = "https://github.com/engla/keybinder/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index 8ff7b9332476..37c007db20b4 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ opencl-headers ]; meta = with lib; { - description = "Offical Khronos OpenCL ICD Loader"; + description = "Official Khronos OpenCL ICD Loader"; homepage = "https://github.com/KhronosGroup/OpenCL-ICD-Loader"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/development/libraries/kirigami-addons/default.nix b/pkgs/development/libraries/kirigami-addons/default.nix index 3ccde40b751b..fec795c5748f 100644 --- a/pkgs/development/libraries/kirigami-addons/default.nix +++ b/pkgs/development/libraries/kirigami-addons/default.nix @@ -12,14 +12,14 @@ mkDerivation rec { pname = "kirigami-addons"; - version = "0.4"; + version = "0.6"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3RPOab10kLcMVBngcRILDXbhOBI/BhjkMZqWVC0IPlM="; + sha256 = "sha256-RUu/0O/YRVRsRYeASfW8UQ/Ql2VbLOdVySVo9/hAmLw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/kissfft/default.nix b/pkgs/development/libraries/kissfft/default.nix index abc96a40a970..503cad45fd9e 100644 --- a/pkgs/development/libraries/kissfft/default.nix +++ b/pkgs/development/libraries/kissfft/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ py (if datatype == "float" then fftwFloat else fftw) ]; diff --git a/pkgs/development/libraries/kompute/default.nix b/pkgs/development/libraries/kompute/default.nix index 0b79bd7e56a2..ced30a87dbfa 100644 --- a/pkgs/development/libraries/kompute/default.nix +++ b/pkgs/development/libraries/kompute/default.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { url = "https://github.com/KomputeProject/kompute/commit/9a791b161dd58ca927fe090f65fa2b0e5e85e7ca.diff"; sha256 = "OtFTN8sgPlyiMmVzUnqzCkVMKj6DWxbCXtYwkRdEprY="; }) + (fetchpatch { + name = "enum-class-fix-for-fmt-8-x.patch"; + url = "https://github.com/KomputeProject/kompute/commit/f731f2e55c7aaaa804111106c3e469f9a642d4eb.patch"; + sha256 = "sha256-scTCYqkgKQnH27xzuY4FVbiwRuwBvChmLPPU7ZUrrL0="; + }) ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index 0145bcf20c5c..d5e72109ba88 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "kpmcore"; # NOTE: When changing this version, also change the version of `partition-manager`. - version = "22.08.0"; + version = "22.12.1"; src = fetchurl { url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-Ws20hKX2iDdke5yBBKXukVUD4OnLf1OmwlhW+jUXL24="; + hash = "sha256-ZJ179jHCLEB0kFMWfCe+U6c7k7yZ3MztwqAcUd25t40="; }; patches = [ diff --git a/pkgs/development/libraries/kronosnet/default.nix b/pkgs/development/libraries/kronosnet/default.nix index fb9c5c57eca1..7fb8520348a2 100644 --- a/pkgs/development/libraries/kronosnet/default.nix +++ b/pkgs/development/libraries/kronosnet/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "kronosnet"; - version = "1.23"; + version = "1.25"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-+uQXV5tOLsBPFzfFHqwV1Oz4+KwZMkdjO8zfIljV+ro="; + sha256 = "sha256-NEmkgKTm+R4lzqjbQTyQ6TDpjoTQtMKiTpzn25HUfYk="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index 674defc42e2a..506be9193228 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -11,7 +11,6 @@ , debugSupport ? false # Debugging (disables optimizations) }: -with lib; stdenv.mkDerivation rec { pname = "lame"; version = "3.100"; @@ -25,24 +24,24 @@ stdenv.mkDerivation rec { outputMan = "out"; nativeBuildInputs = [ ] - ++ optional nasmSupport nasm; + ++ lib.optional nasmSupport nasm; buildInputs = [ ] #++ optional efenceSupport libefence #++ optional mp3xSupport gtk1 - ++ optional sndfileFileIOSupport libsndfile; + ++ lib.optional sndfileFileIOSupport libsndfile; configureFlags = [ - (enableFeature nasmSupport "nasm") - (enableFeature cpmlSupport "cpml") + (lib.enableFeature nasmSupport "nasm") + (lib.enableFeature cpmlSupport "cpml") #(enableFeature efenceSupport "efence") (if sndfileFileIOSupport then "--with-fileio=sndfile" else "--with-fileio=lame") - (enableFeature analyzerHooksSupport "analyzer-hooks") - (enableFeature decoderSupport "decoder") - (enableFeature frontendSupport "frontend") - (enableFeature frontendSupport "dynamic-frontends") + (lib.enableFeature analyzerHooksSupport "analyzer-hooks") + (lib.enableFeature decoderSupport "decoder") + (lib.enableFeature frontendSupport "frontend") + (lib.enableFeature frontendSupport "dynamic-frontends") #(enableFeature mp3xSupport "mp3x") - (enableFeature mp3rtpSupport "mp3rtp") + (lib.enableFeature mp3rtpSupport "mp3rtp") (if debugSupport then "--enable-debug=alot" else "") ]; @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { sed -i '/lame_init_old/d' include/libmp3lame.sym ''; - meta = { + meta = with lib; { description = "A high quality MPEG Audio Layer III (MP3) encoder"; homepage = "http://lame.sourceforge.net"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index ba0c5e606ffc..1e696b1175a4 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "ac_cv_func_realloc_0_nonnull=yes" ]; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; doCheck = false; # fails. missing some files postInstall = '' diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index fe5c23b36105..4b84584d53e2 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.8"; + version = "1.12.9"; src = fetchFromGitHub { - sha256 = "sha256-5xcwktlwgP9Ltild4BliaGJBqlheDLSTKQLZjzK+nGk="; + sha256 = "sha256-TuiOAinJsQWJVJiaS8kWk4Pl+hn521f4ooJ2p+eR6mk="; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/lemon-graph/default.nix b/pkgs/development/libraries/lemon-graph/default.nix index 04f0514781bf..81c21bb68d69 100644 --- a/pkgs/development/libraries/lemon-graph/default.nix +++ b/pkgs/development/libraries/lemon-graph/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - doCheck = true; + # error: no viable conversion from ... + doCheck = !stdenv.isDarwin; meta = with lib; { homepage = "https://lemon.cs.elte.hu/trac/lemon"; @@ -23,6 +24,5 @@ stdenv.mkDerivation rec { license = licenses.boost; maintainers = with maintainers; [ trepetti ]; platforms = platforms.all; - broken = stdenv.isAarch64 || stdenv.isDarwin; }; } diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index a889e5358a50..efd65c1695d4 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, glib, zlib, libpng, cmake, libxml2, python3 }: let - version = "0.3.95"; + version = "0.3.3"; pname = "lensfun"; # Fetch a more recent version of the repo containing a more recent lens @@ -9,8 +9,8 @@ let lensfunDatabase = fetchFromGitHub { owner = "lensfun"; repo = "lensfun"; - rev = "4672d765a17bfef7bc994ca7008cb717c61045d5"; - sha256 = "00x35xhpn55j7f8qzakb6wl1ccbljg1gqjb93jl9w3mha2bzsr41"; + rev = "ec9412d27d5fa8f377848a59c768b12c243cb80d"; + sha256 = "sha256-/u/3oQzac/dQrgFaiYvzT5uQ108XarkXnA2DByA5sic="; }; in @@ -21,16 +21,34 @@ stdenv.mkDerivation { owner = "lensfun"; repo = "lensfun"; rev = "v${version}"; - sha256 = "0isli0arns8bmxqpbr1jnbnqh5wvspixdi51adm671f9ngng7x5r"; + sha256 = "0ixf0f7qv0mc7zrw9w1sb60w833g4rqrfj8cjxwzv2vimqcksccz"; }; + patches = [ + (fetchpatch { + name = "fix-compilation-with-clang.patch"; + url = "https://github.com/lensfun/lensfun/commit/5c2065685a22f19f8138365c0e5acf0be8329c02.patch"; + sha256 = "sha256-tAOCNL37pKE7hfQCu+hUTKLFnRHWF5Dplqf+GaucG+4="; + }) + ]; + # replace database with a more recent snapshot + # the mastr branch uses version 2 profiles, while 0.3.3 requires version 1 profiles, + # so we run the conversion tool the project provides, + # then untar the verson 1 profiles into the source dir before we build prePatch = '' - rm -R ./data/db - cp -R ${lensfunDatabase}/data/db ./data + rm -R data/db + python3 ${lensfunDatabase}/tools/lensfun_convert_db_v2_to_v1.py $TMPDIR ${lensfunDatabase}/data/db + mkdir -p data/db + tar xvf $TMPDIR/db/version_1.tar -C data/db + date +%s > data/db/timestamp.txt ''; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake pkg-config + python3 python3.pkgs.lxml # For the db converison + ]; + buildInputs = [ glib zlib libpng ]; cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ]; diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 27d2d5e30de4..448a22f54997 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ giflib libjpeg libpng libtiff libwebp openjpeg zlib ]; enableParallelBuilding = true; - checkInputs = [ which gnuplot ]; + nativeCheckInputs = [ which gnuplot ]; # Fails on pngio_reg for unknown reason doCheck = false; # !stdenv.isDarwin; diff --git a/pkgs/development/libraries/lerc/default.nix b/pkgs/development/libraries/lerc/default.nix index 99e18a76bf60..f7bba5125a72 100644 --- a/pkgs/development/libraries/lerc/default.nix +++ b/pkgs/development/libraries/lerc/default.nix @@ -1,12 +1,13 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake }: stdenv.mkDerivation rec { pname = "lerc"; - version = "3.0"; + version = "4.0.0"; outputs = [ "out" "dev" ]; @@ -14,9 +15,18 @@ stdenv.mkDerivation rec { owner = "esri"; repo = "lerc"; rev = "v${version}"; - hash = "sha256-QO5+ouQy5nOcAgvxMeBDoSBP+G3ClDjXipnkuSIDcP0="; + hash = "sha256-IHY9QtNYsxPz/ksxRMZGHleT+/bawfTYNVRSTAuYQ7Y="; }; + patches = [ + # https://github.com/Esri/lerc/pull/227 + (fetchpatch { + name = "use-cmake-install-full-dir.patch"; + url = "https://github.com/Esri/lerc/commit/5462ca7f7dfb38c65e16f5abfd96873af177a0f8.patch"; + hash = "sha256-qaNR3QwLe0AB6vu1nXOh9KhlPdWM3DmgCJj4d0VdOUk="; + }) + ]; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix index dc0c8c0ed741..a5c37dd0f04f 100644 --- a/pkgs/development/libraries/lesstif/default.nix +++ b/pkgs/development/libraries/lesstif/default.nix @@ -1,4 +1,15 @@ -{lib, stdenv, fetchurl, xlibsWrapper, libXp, libXau}: +{ lib +, stdenv +, fetchurl +, freetype +, fontconfig +, libICE +, libX11 +, libXp +, libXau +, libXext +, libXt +}: stdenv.mkDerivation rec { pname = "lesstif"; @@ -7,8 +18,18 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/lesstif/${pname}-${version}.tar.bz2"; sha256 = "1qzpxjjf7ri1jzv71mvq5m9g8hfaj5yzwp30rwxlm6n2b24a6jpb"; }; - buildInputs = [xlibsWrapper]; - propagatedBuildInputs = [libXp libXau]; + buildInputs = [ + freetype + fontconfig + libICE + libX11 + libXext + libXt + ]; + propagatedBuildInputs = [ + libXau + libXp + ]; # These patches fix a number of later issues - in particular the # render_table_crash shows up in 'arb'. The same patches appear diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix new file mode 100644 index 000000000000..89684080f9f0 --- /dev/null +++ b/pkgs/development/libraries/level-zero/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, addOpenGLRunpath, cmake }: + +stdenv.mkDerivation rec { + pname = "level-zero"; + version = "1.9.4"; + + src = fetchFromGitHub { + owner = "oneapi-src"; + repo = "level-zero"; + rev = "v${version}"; + sha256 = "sha256-4AQnMMKo4BvajfhhKmhTZA0snKPnO4WjOuZAeiWU5PY="; + }; + + nativeBuildInputs = [ cmake addOpenGLRunpath ]; + + postFixup = '' + addOpenGLRunpath $out/lib/libze_loader.so + ''; + + meta = with lib; { + homepage = "https://www.oneapi.io/"; + description = "oneAPI Level Zero Specification Headers and Loader"; + license = licenses.mit; + maintainers = [ maintainers.ziguana ]; + }; +} + diff --git a/pkgs/development/libraries/lib2geom/default.nix b/pkgs/development/libraries/lib2geom/default.nix index 72d21ed0d2c4..2b99c7bdaf12 100644 --- a/pkgs/development/libraries/lib2geom/default.nix +++ b/pkgs/development/libraries/lib2geom/default.nix @@ -1,4 +1,5 @@ { stdenv +, fetchpatch , fetchFromGitLab , cmake , ninja @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { pname = "lib2geom"; - version = "1.2"; + version = "1.2.2"; outputs = [ "out" "dev" ]; @@ -22,9 +23,19 @@ stdenv.mkDerivation rec { owner = "inkscape"; repo = "lib2geom"; rev = "refs/tags/${version}"; - sha256 = "sha256-SNo5YT7o29zdxkHLuy9MT88qBg/U1Wwa3BWShF5ACTc="; + sha256 = "sha256-xkUxcAk8KJkL482R7pvgmCT+5I8aUMm/q25pvK3ZPuY="; }; + patches = [ + # Fixed upstream, remove when the new version releases: + # https://gitlab.com/inkscape/lib2geom/-/issues/49 + (fetchpatch { + name = "expect-double-eq-in-choose-test.patch"; + url = "https://gitlab.com/inkscape/lib2geom/-/commit/5b7c75dd3841cb415f163f0a81f556c57d3e0a83.patch"; + sha256 = "RMgwJkylrGFTTrqBzqs5j2LMSLsHhcE/UT1pKBZnU50="; + }) + ]; + nativeBuildInputs = [ cmake ninja @@ -39,7 +50,7 @@ stdenv.mkDerivation rec { double-conversion ]; - checkInputs = [ + nativeCheckInputs = [ gtest ]; diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/development/libraries/lib3ds/default.nix index 78ee4172b57a..791d2ab523d0 100644 --- a/pkgs/development/libraries/lib3ds/default.nix +++ b/pkgs/development/libraries/lib3ds/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files"; - homepage = "http://lib3ds.sourceforge.net/"; + homepage = "https://lib3ds.sourceforge.net/"; license = "LGPL"; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix index 8b9190fc8274..e7172b493c79 100644 --- a/pkgs/development/libraries/libHX/default.nix +++ b/pkgs/development/libraries/libHX/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://libhx.sourceforge.net/"; + homepage = "https://libhx.sourceforge.net/"; longDescription = '' libHX is a C library (with some C++ bindings available) that provides data structures and functions commonly needed, such as maps, deques, linked lists, string formatting diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 5d0f2ff56846..3fd247dc4e82 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "libLAS"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; + patches = [ + (fetchpatch { + name = "aarch64-darwin.patch"; + url = "https://github.com/libLAS/libLAS/commit/ded463732db1f9baf461be6f3fe5b8bb683c41cd.patch"; + sha256 = "sha256-aWMpazeefDHE9OzuLR3FJ8+oXeGhEsk1igEm6j2DUnw="; + }) + ]; + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ boost gdal libgeotiff libtiff LASzip2 ]; diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/development/libraries/libabigail/default.nix index 844a30cc89aa..46929cee9a46 100644 --- a/pkgs/development/libraries/libabigail/default.nix +++ b/pkgs/development/libraries/libabigail/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { libxml2 ]; - checkInputs = [ + nativeCheckInputs = [ python3 ]; diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index c60390f4f4e7..7b08005133ad 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.2.0"; + version = "1.2.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-3lH7Vi9M8k+GSrCpvruRpLrIpMoOakKbcJlaAc/FK+U="; + hash = "sha256-FJmH/DTTn01UlATgxC0d7vrpVLwAot6Y4cZralQz2nU="; }; depsBuildBuild = [ @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { gtk4 ]; - checkInputs = [ + nativeCheckInputs = [ gnome.adwaita-icon-theme ] ++ lib.optionals (!stdenv.isDarwin) [ xvfb-run @@ -109,6 +109,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { + changelog = "https://gitlab.gnome.org/GNOME/libadwaita/-/blob/${src.rev}/NEWS"; description = "Library to help with developing UI for mobile devices using GTK/GNOME"; homepage = "https://gitlab.gnome.org/GNOME/libadwaita"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index c055a6bce193..c9d396bf2e37 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.18"; + version = "4.3.19"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "sha256-cjxzBw2tjZROx5xzdhzZjGNJQe3tC9fHOhF/+uSM+CY="; + sha256 = "sha256-YyWpXh/8gNYTiGAJWr8lRPhstBD0eEVRBg8IlYk8o3w="; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 8ca2acc11c71..9df992a5763d 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -2,17 +2,15 @@ { stdenv, fetchgit, lib , pkg-config, autoreconfHook -, glib, dbus-glib, gtkVersion ? "3" -, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null -, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null +, glib, dbus-glib +, gtkVersion ? "3" +, gtk2, libindicator-gtk2, libdbusmenu-gtk2 +, gtk3, libindicator-gtk3, libdbusmenu-gtk3 , gtk-doc, vala, gobject-introspection -, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null +, monoSupport ? false, mono, gtk-sharp-2_0 }: -with lib; - - -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; in "libappindicator-${postfix}"; version = "12.10.1+20.10.20200706.1"; @@ -35,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus-glib ] ++ (if gtkVersion == "2" - then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] + then [ libindicator-gtk2 ] ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ] else [ libindicator-gtk3 ]); preAutoreconf = '' @@ -56,7 +54,7 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; - meta = { + meta = with lib; { description = "A library to allow applications to export a menu into the Unity Menu bar"; homepage = "https://launchpad.net/libappindicator"; license = with licenses; [ lgpl21 lgpl3 ]; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 066ea8b60ddc..c8f050c300ce 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , acl , attr , autoreconfHook @@ -22,44 +23,48 @@ , cmake , nix , samba +, buildPackages }: +let + autoreconfHook = buildPackages.autoreconfHook269; +in assert xarSupport -> libxml2 != null; - -stdenv.mkDerivation rec { +(stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; - rev = "v${version}"; - hash = "sha256-G4wL5DDbX0FqaA4cnOlVLZ25ObN8dNsRtxyas29tpDA="; + rev = "v${finalAttrs.version}"; + hash = "sha256-wQbA6vlXH8pnpY7LJLkjrRFEBpcaPR1SqxnK71UVwxg="; }; - postPatch = '' + outputs = [ "out" "lib" "dev" ]; + + postPatch = let + skipTestPaths = [ + # test won't work in nix sandbox + "libarchive/test/test_write_disk_perms.c" + # the filesystem does not necessarily have sparse capabilities + "libarchive/test/test_sparse_basic.c" + # the filesystem does not necessarily have hardlink capabilities + "libarchive/test/test_write_disk_hardlink.c" + # access-time-related tests flakey on some systems + "cpio/test/test_option_a.c" + "cpio/test/test_option_t.c" + ]; + removeTest = testPath: '' + substituteInPlace Makefile.am --replace "${testPath}" "" + rm "${testPath}" + ''; + in '' substituteInPlace Makefile.am --replace '/bin/pwd' "$(type -P pwd)" - declare -a skip_test_paths=( - # test won't work in nix sandbox - 'libarchive/test/test_write_disk_perms.c' - # can't be sure builder will have sparse-capable fs - 'libarchive/test/test_sparse_basic.c' - # can't even be sure builder will have hardlink-capable fs - 'libarchive/test/test_write_disk_hardlink.c' - # access-time-related tests flakey on some systems - 'cpio/test/test_option_a.c' - 'cpio/test/test_option_t.c' - ) - - for test_path in "''${skip_test_paths[@]}" ; do - substituteInPlace Makefile.am --replace "$test_path" "" - rm "$test_path" - done + ${lib.concatStringsSep "\n" (map removeTest skipTestPaths)} ''; - outputs = [ "out" "lib" "dev" ]; - nativeBuildInputs = [ autoreconfHook pkg-config @@ -105,7 +110,7 @@ stdenv.mkDerivation rec { includes implementations of the common tar, cpio, and zcat command-line tools that use the libarchive library. ''; - changelog = "https://github.com/libarchive/libarchive/releases/tag/v${version}"; + changelog = "https://github.com/libarchive/libarchive/releases/tag/v${finalAttrs.version}"; license = licenses.bsd3; maintainers = with maintainers; [ jcumming AndersonTorres ]; platforms = platforms.all; @@ -114,4 +119,16 @@ stdenv.mkDerivation rec { passthru.tests = { inherit cmake nix samba; }; -} +})).overrideAttrs(previousAttrs: + assert previousAttrs.version == "3.6.2"; + lib.optionalAttrs stdenv.hostPlatform.isStatic { + patches = [ + # fixes static linking; upstream in releases after 3.6.2 + # https://github.com/libarchive/libarchive/pull/1825 merged upstream + (fetchpatch { + name = "001-only-add-iconv-to-pc-file-if-needed.patch"; + url = "https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch"; + hash = "sha256-lb+zwWSH6/MLUIROvu9I/hUjSbb2jOWO755WC/r+lbY="; + }) + ]; + }) diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix index 19ca4fab4013..4eb28fb02fe2 100644 --- a/pkgs/development/libraries/libargon2/default.nix +++ b/pkgs/development/libraries/libargon2/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { license = with licenses; [ asl20 cc0 ]; maintainers = with maintainers; [ taeer olynch ]; mainProgram = "argon2"; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libargs/default.nix b/pkgs/development/libraries/libargs/default.nix index 3b27df772117..79572e430013 100644 --- a/pkgs/development/libraries/libargs/default.nix +++ b/pkgs/development/libraries/libargs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "args"; - version = "6.3.0"; + version = "6.4.6"; src = fetchFromGitHub { owner = "Taywee"; repo = pname; rev = version; - sha256 = "sha256-fEM9KNqqxYbafMcHCW46Y//8Hrvd7gZrCIQhH5lhpFc="; + sha256 = "sha256-2gH3h3QAl0+XVULt/fR2UUGKNIxTUmnRRdxPOFdpVy4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 118238f5f5a9..7ed461516cc0 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -8,7 +8,6 @@ assert fontconfigSupport -> fontconfig != null; -with lib; stdenv.mkDerivation rec { pname = "libass"; version = "0.16.0"; @@ -19,18 +18,18 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (enableFeature fontconfigSupport "fontconfig") - (enableFeature rasterizerSupport "rasterizer") - (enableFeature largeTilesSupport "large-tiles") + (lib.enableFeature fontconfigSupport "fontconfig") + (lib.enableFeature rasterizerSupport "rasterizer") + (lib.enableFeature largeTilesSupport "large-tiles") ]; nativeBuildInputs = [ pkg-config yasm ]; buildInputs = [ freetype fribidi harfbuzz ] - ++ optional fontconfigSupport fontconfig - ++ optional stdenv.isDarwin libiconv; + ++ lib.optional fontconfigSupport fontconfig + ++ lib.optional stdenv.isDarwin libiconv; - meta = { + meta = with lib; { description = "Portable ASS/SSA subtitle renderer"; homepage = "https://github.com/libass/libass"; license = licenses.isc; diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix index 2ac90a11f086..4dfc5713af7e 100644 --- a/pkgs/development/libraries/libavc1394/default.nix +++ b/pkgs/development/libraries/libavc1394/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libraw1394 }: +{ lib, stdenv, fetchurl, pkg-config, libraw1394, argp-standalone }: stdenv.mkDerivation rec { pname = "libavc1394"; @@ -9,9 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0lsv46jdqvdx5hx92v0z2cz3yh6212pz9gk0k3513sbaa04zzcbw"; }; + buildInputs = lib.optional stdenv.hostPlatform.isMusl argp-standalone; nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libraw1394 ]; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-largp"; + meta = { description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set"; homepage = "https://sourceforge.net/projects/libavc1394/"; diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix index 64e1657bcba4..dca45186d4ce 100644 --- a/pkgs/development/libraries/libavif/default.nix +++ b/pkgs/development/libraries/libavif/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "libavif"; - version = "0.10.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EGu2avkqQXHFX4gKWsVfVdQN99f4J7Hm86C0sAhuP1Y="; + sha256 = "sha256-mUi0DU99XV3FzUZ8/9uJZU+W3fc6Bk6+y6Z78IRZ9Qs="; }; # reco: encode libaom slowest but best, decode dav1d fastest diff --git a/pkgs/development/libraries/libax25/default.nix b/pkgs/development/libraries/libax25/default.nix new file mode 100644 index 000000000000..7388a728f5f0 --- /dev/null +++ b/pkgs/development/libraries/libax25/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchurl +, glibc +}: + +stdenv.mkDerivation rec { + pname = "libax25"; + version = "0.0.12-rc5"; + + buildInputs = [ glibc ] ++ lib.optional stdenv.hostPlatform.isStatic [ glibc.static ]; + + # Due to recent unsolvable administrative domain problems with linux-ax25.org, + # the new domain is linux-ax25.in-berlin.de + src = fetchurl { + url = "https://linux-ax25.in-berlin.de/pub/ax25-lib/libax25-${version}.tar.gz"; + hash = "sha256-vxV5GVDOHr38N/512ArZpnZ+a7FTbXBNpoSJkc9DI98="; + }; + + configureFlags = [ "--sysconfdir=/etc" ]; + + LDFLAGS = lib.optionals stdenv.hostPlatform.isStatic [ "-static-libgcc" "-static" ]; + + meta = with lib; { + description = "AX.25 library for hamradio applications"; + homepage = "https://linux-ax25.in-berlin.de/wiki/Main_Page"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ sarcasticadmin ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libayatana-indicator/default.nix b/pkgs/development/libraries/libayatana-indicator/default.nix index f58b0b273fb9..39a6305c6de0 100644 --- a/pkgs/development/libraries/libayatana-indicator/default.nix +++ b/pkgs/development/libraries/libayatana-indicator/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libayatana-indicator"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "libayatana-indicator"; rev = version; - sha256 = "sha256-Bi+whbODdJMSQ6iiIrHAwht1Efi83icerT7ubQvE5n0="; + sha256 = "sha256-tOZcrcuZowqDg/LRYTY6PCxKnpEd67k4xAHrIKupunI="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix index b142a0a41565..a461f5039aa7 100644 --- a/pkgs/development/libraries/libb2/default.nix +++ b/pkgs/development/libraries/libb2/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, libtool +, pkg-config +}: stdenv.mkDerivation rec { pname = "libb2"; @@ -7,18 +13,19 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "BLAKE2"; repo = "libb2"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "0qj8aaqvfcavj1vj5asm4pqm03ap7q8x4c2fy83cqggvky0frgya"; }; - preConfigure = '' - patchShebangs autogen.sh - ./autogen.sh - ''; + nativeBuildInputs = [ + autoreconfHook + libtool + pkg-config + ]; configureFlags = lib.optional stdenv.hostPlatform.isx86 "--enable-fat=yes"; - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; + enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/development/libraries/libbaseencode/default.nix b/pkgs/development/libraries/libbaseencode/default.nix index fdd5dbd1cb33..7cd4b173c9b7 100644 --- a/pkgs/development/libraries/libbaseencode/default.nix +++ b/pkgs/development/libraries/libbaseencode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libbaseencode"; - version = "1.0.14"; + version = "1.0.15"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cSiinuIc/qONuy9ZVsmsF4DiN1VUL43ZAXffCiIGgkY="; + sha256 = "sha256-WiE+ZMX4oZieER1pu43aSWytkxfkQdX+S3JI98XPpL4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libbde/default.nix b/pkgs/development/libraries/libbde/default.nix index 7134ddd3f746..4bef9748701c 100644 --- a/pkgs/development/libraries/libbde/default.nix +++ b/pkgs/development/libraries/libbde/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libbde"; - version = "20220121"; + version = "20221031"; src = fetchurl { url = "https://github.com/libyal/libbde/releases/download/${version}/${pname}-alpha-${version}.tar.gz"; - sha256 = "sha256-dnSMuTm/nMiZ6t2rbhDqGpp/e9xt5Msz2In8eiuTjC8="; + sha256 = "sha256-uMbwofboePCFWlxEOdRbZK7uZuj0MZC/qusWuu0Bm7g="; }; buildInputs = [ fuse ncurses python3 ]; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index f987e7c6497f..bc10d06b846c 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -11,27 +11,13 @@ stdenv.mkDerivation rec { pname = "libbluray"; - version = "1.3.2"; + version = "1.3.4"; src = fetchurl { url = "https://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-RWgU258Hwe7N736ED8uyCXbvgU34dUKL+4Hs9FhR8XA="; + hash = "sha256-R4/9aKD13ejvbKmJt/A1taCiLFmRQuXNP/ewO76+Xys="; }; - patches = [ - ./BDJ-JARFILE-path.patch - (fetchpatch { - name = "Initial-support-for-Java-18.patch"; - url = "https://code.videolan.org/videolan/libbluray/-/commit/3187c3080096e107f0a27eed1843232b58342577.patch"; - hash = "sha256-2TSciAoPzELkgmFGB38h1RgynOCJueyCL8hIADxAPHo="; - }) - (fetchpatch { - name = "bd-j-BDJSecurityManager-Change-setSecurityManager-de.patch"; - url = "https://code.videolan.org/videolan/libbluray/-/commit/9a2d23d049760ef9cc9661ff90011a84d90368f1.patch"; - hash = "sha256-xCc2h5ocXCqnpVMPQaybT2Ncs2YOzifQ0mlCCUhYlc8="; - }) - ]; - nativeBuildInputs = [ pkg-config autoreconfHook ] ++ lib.optionals withJava [ ant ]; diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/development/libraries/libcamera/default.nix index ff7cd7a193e3..d03783f2fd90 100644 --- a/pkgs/development/libraries/libcamera/default.nix +++ b/pkgs/development/libraries/libcamera/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { pname = "libcamera"; - version = "0.0.1"; + version = "0.0.3"; src = fetchgit { url = "https://git.libcamera.org/libcamera/libcamera.git"; rev = "v${version}"; - hash = "sha256-u5FnfXBCjwSp8QBrH8KIkVGV32/9pff41ZWjWXOwuMI="; + hash = "sha256-0/wvH07bJRKFwYnOARRJNzH8enIX3TNnWQnJdfpfvgE="; }; postPatch = '' diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index 9473c4823fc4..7abbd944ed01 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -1,22 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, cmake, cmocka }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, cmocka -stdenv.mkDerivation rec { +# for passthru.tests +, libfido2 +, mysql80 +, openssh +, systemd +}: + +stdenv.mkDerivation (finalAttrs: { pname = "libcbor"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "PJK"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Wp/48yQA17mf/dTgeMcMDvPpKOPkfLhQkCnzgGLpLtk="; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-YJSIZ7o191/0QJf1fH6LUYykS2pvP17knSeRO2WcDeM="; }; nativeBuildInputs = [ cmake ]; - checkInputs = [ cmocka ]; - doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DBUILD_SHARED_LIBS=on" + ] ++ lib.optional finalAttrs.doCheck "-DWITH_TESTS=ON"; - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_SHARED_LIBS=on" ]; + # 2 tests are not 32-bit clean: overflow size_t: + # https://github.com/PJK/libcbor/issues/263 + doCheck = + !stdenv.hostPlatform.is32bit + && (!stdenv.hostPlatform.isStatic) + && stdenv.hostPlatform == stdenv.buildPlatform; + nativeCheckInputs = [ cmocka ]; + + passthru.tests = { + inherit libfido2 mysql80; + openssh = (openssh.override { withFIDO = true; }); + systemd = (systemd.override { + withFido2 = true; + withCryptsetup = true; + }); + }; meta = with lib; { description = "CBOR protocol implementation for C and others"; @@ -24,4 +52,4 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; -} +}) diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index 4848f5fcc265..11a0c259dfdb 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim"; }; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = [ libiconv ]; configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C library to access data on a CDDB server (freedb.org)"; - homepage = "http://libcddb.sourceforge.net/"; + homepage = "https://libcddb.sourceforge.net/"; license = licenses.lgpl2Plus; mainProgram = "cddb_query"; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 546573c62306..aacb7555a4b6 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation rec { url = "https://savannah.gnu.org/patch/download.php?file_id=52179"; sha256 = "1v15gxhpi4bgcr12pb3d9c3hiwj0drvc832vic7sham34lhjmcbb"; }) + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + (fetchpatch { + name = "musl-realpath-test.patch"; + url = "https://git.alpinelinux.org/aports/plain/community/libcdio/disable-broken-test.patch?id=058a8695c12ae13b40c981ee98809352490b6155"; + includes = [ "test/driver/realpath.c" ]; + sha256 = "sha256-6j2bjMed2l+TFZ5emjCcozzF/kkGA8FVifJB8U7QceU="; + }) ]; postPatch = '' @@ -24,8 +31,10 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config help2man ]; - buildInputs = [ libcddb ncurses ] - ++ lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ]; + buildInputs = [ libcddb libiconv ncurses ] + ++ lib.optionals stdenv.isDarwin [ Carbon IOKit ]; + + enableParallelBuilding = true; doCheck = !stdenv.isDarwin; @@ -39,6 +48,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/libcdio/"; license = licenses.gpl2Plus; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 34440d67818d..1eda49ad3f97 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,5 +1,4 @@ { fetchurl -, fetchpatch , lib , stdenv , meson @@ -23,25 +22,15 @@ stdenv.mkDerivation rec { pname = "libchamplain"; - version = "0.12.20"; + version = "0.12.21"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0rihpb0npqpihqcdz4w03rq6xl7jdckfqskvv9diq2hkrnzv8ch2"; + sha256 = "qRXNFyoMUpRMVXn8tGg/ioeMVxv16SglS12v78cn5ac="; }; - patches = lib.optionals withLibsoup3 [ - # Port to libsoup3 - # https://gitlab.gnome.org/GNOME/libchamplain/-/merge_requests/13 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libchamplain/-/commit/1cbaf3193c2b38e447fbc383d4c455c3dcac6db8.patch"; - excludes = [ ".gitlab-ci.yml" ]; - sha256 = "uk38gExnUgeUKwhDsqRU77hGWhJ+8fG5dSiV2MAWLFk="; - }) - ]; - - outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ meson ninja @@ -68,6 +57,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" "-Dvapi=true" + (lib.mesonBool "libsoup3" withLibsoup3) ]; passthru = { diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix index c6b7841ca400..7cfa864fc06f 100644 --- a/pkgs/development/libraries/libchewing/default.nix +++ b/pkgs/development/libraries/libchewing/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Intelligent Chinese phonetic input method"; - homepage = "http://chewing.im/"; + homepage = "https://chewing.im/"; license = licenses.lgpl21Only; maintainers = [ maintainers.ericsagnes ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index 177189f765a2..09f9d8b420b9 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { strictDeps = true; doCheck = true; - checkInputs = [ python3.pkgs.numpy ]; + nativeCheckInputs = [ python3.pkgs.numpy ]; meta = with lib; { description = "General GTO integrals for quantum chemistry"; diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index a53450e11773..647079ae2fb4 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -7,13 +7,13 @@ in stdenv.mkDerivation rec { pname = "libclc"; - version = "12.0.1"; + version = "15.0.7"; src = fetchFromGitHub { owner = "llvm"; repo = "llvm-project"; rev = "llvmorg-${version}"; - sha256 = "08s5w2db9imb2yaqsvxs6pg21csi1cf6wa35rf8x6q07mam7j8qv"; + sha256 = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s="; }; sourceRoot = "source/libclc"; diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix index 919ddcd3f066..41c5565482fe 100644 --- a/pkgs/development/libraries/libcollectdclient/default.nix +++ b/pkgs/development/libraries/libcollectdclient/default.nix @@ -1,5 +1,4 @@ { lib, collectd }: -with lib; collectd.overrideAttrs (oldAttrs: { pname = "libcollectdclient"; diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index dd5472849fd9..f7d064e0de38 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dontUseQmakeConfigure = true; configureFlags = [ "-config" "release" ] - # Build mixes up dylibs/frameworks if one is not explicitely specified. + # Build mixes up dylibs/frameworks if one is not explicitly specified. ++ lib.optionals stdenv.isDarwin [ "-config" "qt_framework" ]; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index d94a0e1d78bd..5c06808f67c3 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, # this also disables building tests. + # on static windows cross-compile they fail to build + doCheck ? with stdenv.hostPlatform; !(isWindows && isStatic) +}: stdenv.mkDerivation rec { pname = "libconfig"; @@ -9,15 +15,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-VFFm1srAN3RDgdHpzFpUBQlOe/rRakEWmbz/QLuzHuc="; }; - doCheck = true; + inherit doCheck; - configureFlags = lib.optional (stdenv.targetPlatform.isWindows || stdenv.hostPlatform.isStatic) "--disable-examples"; + configureFlags = lib.optional (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isStatic) "--disable-examples" + ++ lib.optional (!doCheck) "--disable-tests"; + + cmakeFlags = lib.optionals (!doCheck) [ "-DBUILD_TESTS:BOOL=OFF" ]; meta = with lib; { homepage = "http://www.hyperrealm.com/libconfig"; description = "A simple library for processing structured configuration files"; license = licenses.lgpl3; maintainers = [ maintainers.goibhniu ]; - platforms = with platforms; linux ++ darwin ++ windows; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix index 7545fe9617cc..91a5a2f26f87 100644 --- a/pkgs/development/libraries/libconfuse/default.nix +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, flex }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, flex +}: stdenv.mkDerivation rec { pname = "libconfuse"; @@ -11,6 +17,18 @@ stdenv.mkDerivation rec { owner = "martinh"; }; + patches = [ + (fetchpatch { + name = "CVE-2022-40320.patch"; + urls = [ + "https://sources.debian.org/data/main/libc/libconfuse/3.3-3/debian/patches/CVE-2022-40320.patch" + # files on sources.debian.org can disappear + "https://web.archive.org/web/20230107133212/https://sources.debian.org/data/main/libc/libconfuse/3.3-3/debian/patches/CVE-2022-40320.patch" + ]; + sha256 = "sha256-ftfE9JFz4nyRSOb2xHb9BAtgWn5Yv2WLm4RegDLtiBw="; + }) + ]; + postPatch = '' substituteInPlace tests/Makefile.am \ --replace 'TESTS += empty_string' "" \ diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/development/libraries/libcotp/default.nix index 6fb7b3879c20..4baa712b6803 100644 --- a/pkgs/development/libraries/libcotp/default.nix +++ b/pkgs/development/libraries/libcotp/default.nix @@ -1,17 +1,22 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libgcrypt, libbaseencode }: +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libgcrypt }: stdenv.mkDerivation rec { pname = "libcotp"; - version = "1.2.6"; + version = "2.0.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AMLnUFLDL592zcbVN8yaQeOJQWDLUUG+6aKh4paPGlE="; + sha256 = "sha256-99Uw/BMk2bLj+/FZd7MwrRw62XcCroO9yNWdtH5AFpE="; }; - buildInputs = [ libbaseencode libgcrypt ]; + postPatch = lib.optionalString stdenv.cc.isClang '' + substituteInPlace CMakeLists.txt \ + --replace "add_link_options(-Wl," "# add_link_options(-Wl," + ''; + + buildInputs = [ libgcrypt ]; nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { @@ -19,5 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/paolostivanin/libcotp"; license = licenses.asl20; maintainers = with maintainers; [ alexbakker ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index a1d75d65aa63..50fc23aa5f10 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.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "sha256-nGZHAp2ajGHNHjfKTAQrQSlBmyufzP9V8/vRO6S8Ui0="; + sha256 = "sha256-kg/dVarfmDibZXLGY4zXfReNQ1DC4T/3g54g8zxNmEs="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index 227dfd77f463..0b03ec6ee0b2 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { a file pointer. For handling of the parsed data a convenient API is available. ''; - homepage = "https://sourceforge.net/projects/libcue/"; - license = licenses.gpl2; + homepage = "https://github.com/lipnitsk/libcue"; + license = licenses.gpl2Only; maintainers = with maintainers; [ astsmtl ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libcxxrt/default.nix b/pkgs/development/libraries/libcxxrt/default.nix new file mode 100644 index 000000000000..e981945ccbd3 --- /dev/null +++ b/pkgs/development/libraries/libcxxrt/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, cmake, unstableGitUpdater }: + +stdenv.mkDerivation { + pname = "libcxxrt"; + version = "unstable-2022-08-08"; + + src = fetchFromGitHub { + owner = "libcxxrt"; + repo = "libcxxrt"; + rev = "a0f7f5c139a7daf71de0de201b6c405d852b1dc1"; + sha256 = "6ErOhlD6pOudbTkFTlI2hjBuYT3QuzEiL33/mLnw1aI="; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + mkdir -p $out/include $out/lib + cp ../src/cxxabi.h $out/include + cp lib/libcxxrt${stdenv.hostPlatform.extensions.library} $out/lib + ''; + + passthru = { + libName = "cxxrt"; + updateScript = unstableGitUpdater { }; + }; + + meta = with lib; { + homepage = "https://github.com/libcxxrt/libcxxrt"; + description = "Implementation of the Code Sourcery C++ ABI"; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.all; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/libraries/libdatovka/default.nix b/pkgs/development/libraries/libdatovka/default.nix new file mode 100644 index 000000000000..aca25f73eddb --- /dev/null +++ b/pkgs/development/libraries/libdatovka/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, autoreconfHook +, pkg-config +, fetchurl +, expat +, gpgme +, libgcrypt +, libxml2 +, libxslt +, gnutls +, curl +, docbook_xsl +}: + +stdenv.mkDerivation rec { + pname = "libdatovka"; + version = "0.2.1"; + + src = fetchurl { + url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${version}/libdatovka-v${version}.tar.gz"; + sha256 = "sha256-687d8ZD9zfMeo62YWCW5Kc0CXkKClxtbbwXR51pPwBE="; + }; + + patches = [ + ./libdatovka-deprecated-fn-curl.patch + ]; + + configureFlags = [ + "--with-docbook-xsl-stylesheets=${docbook_xsl}/xml/xsl/docbook" + ]; + + buildInputs = [ pkg-config autoreconfHook expat gpgme libgcrypt libxml2 libxslt gnutls curl docbook_xsl ]; + + meta = with lib; { + description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system"; + homepage = "https://gitlab.nic.cz/datovka/libdatovka"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.ovlach ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libdatovka/libdatovka-deprecated-fn-curl.patch b/pkgs/development/libraries/libdatovka/libdatovka-deprecated-fn-curl.patch new file mode 100644 index 000000000000..b63f850c7d71 --- /dev/null +++ b/pkgs/development/libraries/libdatovka/libdatovka-deprecated-fn-curl.patch @@ -0,0 +1,11 @@ +--- libdatovka-v0.2.1/configure.ac 2021-11-03 13:33:03.000000000 +0100 ++++ libdatovka-v0.2.1-patched/configure.ac 2023-01-18 11:44:25.647566474 +0100 +@@ -46,6 +46,8 @@ + [Define if you want include debugging code]) + ) + ++CFLAGS="${CFLAGS} -Wno-error=deprecated-declarations" ++ + AC_CHECK_DECL([_WIN32]) + AM_CONDITIONAL([WIN32], [test "$ac_cv_have_decl__WIN32" = "yes"]) + diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index aa808d5b4aa8..ec616b4a5fab 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { checkPhase = '' xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs ''; diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 79e063826f8b..461a3c0b7bbd 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, libdbi +# TODO: migrate away from overriding packages to null , libmysqlclient ? null , sqlite ? null , postgresql ? null }: -with lib; stdenv.mkDerivation rec { pname = "libdbi-drivers"; version = "0.9.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"; }; - buildInputs = [ libdbi sqlite postgresql ] ++ optional (libmysqlclient != null) libmysqlclient; + buildInputs = [ libdbi sqlite postgresql ] ++ lib.optional (libmysqlclient != null) libmysqlclient; postPatch = '' sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure; @@ -27,15 +27,15 @@ stdenv.mkDerivation rec { "--enable-libdbi" "--with-dbi-incdir=${libdbi}/include" "--with-dbi-libdir=${libdbi}/lib" - ] ++ optionals (libmysqlclient != null) [ + ] ++ lib.optionals (libmysqlclient != null) [ "--with-mysql" - "--with-mysql-incdir=${getDev libmysqlclient}/include/mysql" + "--with-mysql-incdir=${lib.getDev libmysqlclient}/include/mysql" "--with-mysql-libdir=${libmysqlclient}/lib/mysql" - ] ++ optionals (sqlite != null) [ + ] ++ lib.optionals (sqlite != null) [ "--with-sqlite3" "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite" "--with-sqlite3-libdir=${sqlite.out}/lib/sqlite" - ] ++ optionals (postgresql != null) [ + ] ++ lib.optionals (postgresql != null) [ "--with-pgsql" "--with-pgsql_incdir=${postgresql}/include" "--with-pgsql_libdir=${postgresql.lib}/lib" @@ -54,10 +54,11 @@ stdenv.mkDerivation rec { rm -rf $out/var ''; - meta = { - homepage = "http://libdbi-drivers.sourceforge.net/"; + meta = with lib; { + homepage = "https://libdbi-drivers.sourceforge.net/"; description = "Database drivers for libdbi"; platforms = platforms.all; license = licenses.lgpl21; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix index ffbc3f671007..f0cb74cb86d0 100644 --- a/pkgs/development/libraries/libdbi/default.nix +++ b/pkgs/development/libraries/libdbi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://libdbi.sourceforge.net/"; + homepage = "https://libdbi.sourceforge.net/"; description = "DB independent interface to DB"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 0b5531d70c54..7b0fca858399 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -2,9 +2,8 @@ , pkg-config, intltool , glib, dbus-glib, json-glib , gobject-introspection, vala -, gtkVersion ? null, gtk2 ? null, gtk3 ? null }: - -with lib; +, gtkVersion ? null, gtk2, gtk3 +}: stdenv.mkDerivation rec { pname = "libdbusmenu-${if gtkVersion == null then "glib" else "gtk${gtkVersion}"}"; @@ -19,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus-glib json-glib - ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); + ] ++ lib.optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); postPatch = '' for f in {configure,ltmain.sh,m4/libtool.m4}; do @@ -40,7 +39,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" (if gtkVersion == null then "--disable-gtk" else "--with-gtk=${gtkVersion}") "--disable-scrollkeeper" - ] ++ optional (gtkVersion != "2") "--disable-dumper"; + ] ++ lib.optional (gtkVersion != "2") "--disable-dumper"; doCheck = false; # generates shebangs in check phase, too lazy to fix @@ -50,7 +49,7 @@ stdenv.mkDerivation rec { "typelibdir=${placeholder "out"}/lib/girepository-1.0" ]; - meta = { + meta = with lib; { description = "Library for passing menu structures across DBus"; homepage = "https://launchpad.net/dbusmenu"; license = with licenses; [ gpl3 lgpl21 lgpl3 ]; diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix index d054e223cf0d..18b8d6ba5d6f 100644 --- a/pkgs/development/libraries/libde265/default.nix +++ b/pkgs/development/libraries/libde265/default.nix @@ -6,7 +6,6 @@ # for passthru.tests , imagemagick -, imagemagick6 , libheif , imlib2Full , gst_all_1 @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.tests = { - inherit imagemagick imagemagick6 libheif imlib2Full; + inherit imagemagick libheif imlib2Full; inherit (gst_all_1) gst-plugins-bad; }; diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index f2671e0dc76b..7d8b1c95698a 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.101.0"; + version = "1.107.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-EhFxun80s5tNZT4d7vbszTfHbYK9X3PohsQl20wRzlg="; + hash = "sha256-fjiS7GZy1BLgmxu4LFOWgucORcVx+9KleQcga+hRkSY="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-8uu4i4WfW9pmdLAWWUU1QP09B1/ws+DeVf8baYfikw4="; + hash = "sha256-7XhSI/C0GEmsaL0UupvufB1bfPGbzSQJH720Y4/Do3o="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { libiconv ]; - checkInputs = with rustPlatform; [ + nativeCheckInputs = with rustPlatform; [ cargoCheckHook ]; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index a79e5371c01b..35637512e0a5 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,23 +1,37 @@ -{ lib, stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, libGL -, libX11, pkg-config, OpenGL +{ lib +, stdenv +, fetchurl +, libjpeg +, libpng +, libmng +, lcms1 +, libtiff +, openexr +, libGL +, libX11 +, pkg-config +, OpenGL +, runtimeShell +, withXorg ? true }: stdenv.mkDerivation rec { - pname = "libdevil"; version = "1.7.8"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://sourceforge/openil/DevIL-${version}.tar.gz"; sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"; }; - outputs = [ "out" "dev" ]; - - buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr libGL libX11 ] - ++ lib.optionals stdenv.isDarwin [ OpenGL ]; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr ] + ++ lib.optionals withXorg [ libX11 libGL ] + ++ lib.optionals stdenv.isDarwin [ OpenGL ]; + configureFlags = [ "--enable-ILU" "--enable-ILUT" ]; preConfigure = '' @@ -31,29 +45,29 @@ stdenv.mkDerivation rec { sed -i '/RESTRICT_KEYWORD/d' include/IL/config.h ''; - patches = - [ ( fetchurl { + patches = [ + (fetchurl { url = "https://sources.debian.org/data/main/d/devil/1.7.8-10/debian/patches/03_CVE-2009-3994.diff"; sha256 = "0qkx2qfv02igbrmsn6z5a3lbrbwjfh3rb0c2sj54wy0j1f775hbc"; - } ) - ./ftbfs-libpng15.patch - ./il_endian.h.patch - ]; + }) + ./ftbfs-libpng15.patch + ./il_endian.h.patch + ]; enableParallelBuilding = true; postPatch = '' for a in test/Makefile.in test/format_test/format_checks.sh.in ; do substituteInPlace $a \ - --replace /bin/bash ${stdenv.shell} + --replace /bin/bash ${runtimeShell} done ''; meta = with lib; { - homepage = "http://openil.sourceforge.net/"; + homepage = "https://openil.sourceforge.net/"; description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; license = licenses.lgpl2; platforms = platforms.mesaPlatforms; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 7d34388aea39..c160e7602ce5 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.14.10"; + version = "3.14.12"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - hash = "sha256-n/+R4ho1Qcft3YSKE12oxZjbFHAsUDwoLFNuk5GXf5c="; + hash = "sha256-82AH18KcrkD7mHDy+2c9v7E3Kj7Cb7jCoLfmo09D8PU="; }; nativeBuildInputs = [ cmake pkg-config xxd ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for creating DigiDoc signature files"; - homepage = "http://www.id.ee/"; + homepage = "https://www.id.ee/"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = [ maintainers.jagajaga ]; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index 3021aced93f6..7a073b143b93 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "http://musicbrainz.org/doc/libdiscid"; maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libdmapsharing/default.nix b/pkgs/development/libraries/libdmapsharing/default.nix index c9759d76246e..e469283ae7ca 100644 --- a/pkgs/development/libraries/libdmapsharing/default.nix +++ b/pkgs/development/libraries/libdmapsharing/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { libsoup ]; - checkInputs = [ + nativeCheckInputs = [ libgee check gtk3 @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { "--enable-gtk-doc" ]; - # Cannot disable tests here or `check` from checkInputs would not be included. + # Cannot disable tests here or `check` from nativeCheckInputs would not be included. # Cannot disable building the tests or docs will not build: # https://gitlab.gnome.org/GNOME/libdmapsharing/-/issues/49 doCheck = true; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 354b73f80507..83a426a2afa4 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.113"; + version = "2.4.114"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-f9frKWf2O+tGBvItUOJ32ZNIDQXvdd2Iqb2OZ3Mj5eE="; + sha256 = "sha256-MEnPhDpH0S5e7vvDvjSW14L6CfQjRr8Lfe/j0eWY0CY="; }; outputs = [ "out" "dev" "bin" ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { the Mesa drivers, the X drivers, libva and similar projects. ''; license = licenses.mit; - platforms = platforms.unix; + platforms = lib.subtractLists platforms.darwin platforms.unix; maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 886caaada47b..bec3bba51e6e 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, strace, which }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, strace, which }: stdenv.mkDerivation rec { pname = "libeatmydata"; @@ -11,7 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0sx803h46i81h67xbpd3c7ky0nhaw4gij214nsx4lqig70223v9r"; }; - patches = [ ./find-shell-lib.patch ]; + patches = [ + ./find-shell-lib.patch + + # Fixes "error: redefinition of 'open'" on musl + (fetchpatch { + url = "https://raw.githubusercontent.com/void-linux/void-packages/861ac185a6b60134292ff93d40e40b5391d0aa8e/srcpkgs/libeatmydata/patches/musl.patch"; + stripLen = 1; + sha256 = "sha256-yfMfISbYL7r/R2C9hYPjvGcpUB553QSiW0rMrxG11Oo="; + }) + ]; patchFlags = [ "-p0" ]; diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix deleted file mode 100644 index d4a8b8f6f219..000000000000 --- a/pkgs/development/libraries/libelf-freebsd/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, fetchsvn, stdenv, gnum4, tet }: - -stdenv.mkDerivation (rec { - version = "3258"; - pname = "libelf-freebsd"; - - src = fetchsvn { - url = "svn://svn.code.sf.net/p/elftoolchain/code/trunk"; - rev = (lib.strings.toInt version); - name = "elftoolchain-${version}"; - sha256 = "1rcmddjanlsik0b055x8k914r9rxs8yjsvslia2nh1bhzf1lxmqz"; - }; - - buildInputs = [ gnum4 tet ]; - - buildPhase = '' - PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:$PATH # use BSD install(1) instead of coreutils and make(1) instead of GNU Make - cp -vr ${tet} test/tet/tet3.8 - chmod -R a+w test/tet/tet3.8 - make libelf - ''; - - installPhase = '' - cp -vr libelf $out - cp -vr common/. $out/ - ''; - - meta = { - description = "Essential compilation tools and libraries for building and analyzing ELF based program images"; - - homepage = "https://sourceforge.net/p/elftoolchain/wiki/Home/"; - - license = lib.licenses.bsd2; - - platforms = lib.platforms.freebsd; - maintainers = [ ]; - }; -}) diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 07873f4197e3..4002146d4d5c 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchurl, autoreconfHook, gettext, netbsd +, fetchurl, autoreconfHook, gettext, freebsd, netbsd }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -42,11 +42,14 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = - if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] else [ gettext ] + (if stdenv.hostPlatform.isFreeBSD then [ freebsd.gencat ] + else if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] + else [ gettext ]) # Need to regenerate configure script with newer version in order to pass - # "mr_cv_target_elf=yes", but `autoreconfHook` brings in `makeWrapper` - # which doesn't work with the bootstrapTools bash, so can only do this - # for cross builds when `stdenv.shell` is a newer bash. + # "mr_cv_target_elf=yes" and determine integer sizes correctly when + # cross-compiling, but `autoreconfHook` brings in `makeWrapper` which + # doesn't work with the bootstrapTools bash, so can only do this for + # cross builds when `stdenv.shell` is a newer bash. ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) autoreconfHook; meta = { diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index 348fbfee7b84..196ac1afaae5 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -56,10 +56,13 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optionalString x11Support ''-DLIBGL_PATH="${getLib libGL}/lib"''; - # cgl_epoxy_api fails in darwin sandbox and on Hydra (because it's headless?) + # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?) preCheck = lib.optionalString stdenv.isDarwin '' substituteInPlace ../test/meson.build \ --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" + '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + substituteInPlace ../test/meson.build \ + --replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" ''; doCheck = true; diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 29762e231f2d..3df4a8f91e3c 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv, substituteAll , libtool, gettext, zlib, bzip2, flac, libvorbis , exiv2, libgsf, rpm, pkg-config -, gstreamerSupport ? true, gst_all_1 ? null +, gstreamerSupport ? true, gst_all_1 # ^ Needed e.g. for proper id3 and FLAC support. # Set to `false` to decrease package closure size by about 87 MB (53%). , gstPlugins ? (gst: [ gst.gst-plugins-base gst.gst-plugins-good ]) @@ -12,12 +12,9 @@ # wrapProgram $out/bin/extract --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" # ''; # See also . -, gtkSupport ? true, glib ? null, gtk3 ? null -, videoSupport ? true, ffmpeg ? null, libmpeg2 ? null}: - -assert gstreamerSupport -> gst_all_1 != null && builtins.isList (gstPlugins gst_all_1); -assert gtkSupport -> glib != null && gtk3 != null; -assert videoSupport -> ffmpeg != null && libmpeg2 != null; +, gtkSupport ? true, glib, gtk3 +, videoSupport ? true, ffmpeg, libmpeg2 +}: stdenv.mkDerivation rec { pname = "libextractor"; diff --git a/pkgs/development/libraries/libfabric/default.nix b/pkgs/development/libraries/libfabric/default.nix index baa33a51eef9..35ad72f8c7e9 100644 --- a/pkgs/development/libraries/libfabric/default.nix +++ b/pkgs/development/libraries/libfabric/default.nix @@ -1,9 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, libpsm2 -, enablePsm2 ? (stdenv.isx86_64 && stdenv.isLinux) }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, autoreconfHook +, enablePsm2 ? (stdenv.isx86_64 && stdenv.isLinux) +, libpsm2 +, enableOpx ? (stdenv.isx86_64 && stdenv.isLinux) +, libuuid +, numactl +}: stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.15.1"; + version = "1.17.0"; enableParallelBuilding = true; @@ -11,14 +20,17 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uL3L9k9yqdZXQmR1zi8OEIGLAZ8cf7EBnlDhetaMA08="; + sha256 = "sha256-tXfAn8hkasA2UuA4/8dOE3EcORyJo/A33TtSNdzDXD8="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = lib.optional enablePsm2 libpsm2; + buildInputs = lib.optionals enableOpx [ libuuid numactl ] ++ lib.optional enablePsm2 [ libpsm2 ]; - configureFlags = [ (if enablePsm2 then "--enable-psm2=${libpsm2}" else "--disable-psm2") ]; + configureFlags = [ + (if enablePsm2 then "--enable-psm2=${libpsm2}" else "--disable-psm2") + (if enableOpx then "--enable-opx" else "--disable-opx") + ]; meta = with lib; { homepage = "https://ofiwg.github.io/libfabric/"; diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index 7ac48a705a80..ac501c660b02 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation"; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; meta = with lib; { description = "Report faked system time to programs without having to change the system-wide time"; diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix index 30e5aa0cfa91..07de21a4120c 100644 --- a/pkgs/development/libraries/libffcall/default.nix +++ b/pkgs/development/libraries/libffcall/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libffcall"; - version = "2.2"; + version = "2.4"; src = fetchurl { url = "mirror://gnu/libffcall/libffcall-${version}.tar.gz"; - sha256 = "sha256-6/o3+XtslPrCTs8xk/n8gpUXz4Gu6awtGRr5k9c8t0c="; + sha256 = "sha256-jvaZIdvcBrxbuQUTYiY3p7g6cfMfW6N3vp2P2PV5EsI="; }; enableParallelBuilding = false; @@ -24,5 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/libffcall/"; license = licenses.gpl2Plus; platforms = platforms.unix; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/libraries/libffi/3.3.nix b/pkgs/development/libraries/libffi/3.3.nix index a1e2ff8c5888..b6837c6523f7 100644 --- a/pkgs/development/libraries/libffi/3.3.nix +++ b/pkgs/development/libraries/libffi/3.3.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { inherit doCheck; - checkInputs = [ dejagnu ]; + nativeCheckInputs = [ dejagnu ]; meta = with lib; { description = "A foreign function call interface library"; @@ -60,5 +60,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ armeenm ]; platforms = platforms.all; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 02721ff8d9be..2031f175eab8 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -51,12 +51,10 @@ stdenv.mkDerivation rec { inherit doCheck; - checkInputs = [ dejagnu ]; + nativeCheckInputs = [ dejagnu ]; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 9d1c2f27b3b6..67b49b55c7d7 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.39.1"; + version = "0.41.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-89bA3yjzP1LPJTywP8UVeXUq5NrvKqxzRaa9feYjpsU="; + hash = "sha256-rCodDYKOpgB4fOoefuUNIfDTvZFSzs5hh7ivyQBiKqA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 1def54a3aed2..457a4bc466a7 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { "-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d" ]; - installCheckInputs = [ + nativeInstallCheckInputs = [ (python3.withPackages (p: with p; [ pygobject3 ])) ]; diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index 5dd007f59754..f1466dd5a9f5 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libnfc, openssl +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libnfc, openssl , libobjc ? null , IOKit, Security }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libnfc openssl ] ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; meta = with lib; { diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index e19a9764bdf9..75c9beea9b98 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { "-DLINK_PYTHON_LIBRARY=${onOff pythonSupport}" "-DPYTHON_BINDINGS=${onOff pythonSupport}" "-DDOCUMENTATION=${onOff docSupport}" + ] ++ lib.optionals pythonSupport [ "-DPYTHON_EXECUTABLE=${python3.pythonForBuild.interpreter}" "-DPYTHON_LIBRARY=${python3}/lib/libpython${python3.pythonVersion}${stdenv.hostPlatform.extensions.sharedLibrary}" ]; diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix index 2cd6c55fdbdd..69166ab33feb 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.25"; + version = "1.1.32"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-yr9FJd1+yJdP3vXHbuaaL5UmXGnKxR319LzXs76LBwk="; + sha256 = "sha256-/sOshlPcqKEdH5muusXg6Q9QfSgRYyCJMmtRM5mT/kQ="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix index c02c6116e648..1f551ec9b4b1 100644 --- a/pkgs/development/libraries/libgda/6.x.nix +++ b/pkgs/development/libraries/libgda/6.x.nix @@ -50,6 +50,12 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/57f618a3b2a3758ee3dcbf9bbdc566122dd8566d.patch"; sha256 = "pyfymUd61m1kHaGyMbUQMma+szB8mlqGWwcFBBQawf8="; }) + + (fetchpatch { + name = "CVE-2021-39359.patch"; + url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/bebdffb4de586fb43fd07ac549121f4b22f6812d.patch"; + sha256 = "sha256-UjHP1nhb5n6TOdaMdQeE2s828T4wv/0ycG3FAk+I1QA="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index e29482a34d4e..1ef0a397c8e7 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -37,6 +37,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/9859479884fad5f39e6c37e8995e57c28b11b1b9.diff"; sha256 = "158sncc5bg9lkri1wb0i1ri1nhx4c34rzi47gbfkwphlp7qd4qqv"; }) + (fetchpatch { + name = "CVE-2021-39359.patch"; + url = "https://src.fedoraproject.org/rpms/libgda5/raw/72bb769f12e861e27e883dac5fab34f1ba4bd97e/f/bebdffb4de586fb43fd07ac549121f4b22f6812d.patch"; + sha256 = "sha256-hIKuY5NEqOzntdlLb541bA4xZU5ypTRmV1u765K6KbM="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index 35b3fef3087d..e6808b47ab09 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libgit2"; - version = "1.5.0"; + version = "1.5.1"; # also check the following packages for updates: python3.pkgs.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "sha256-lXFQo+tt56BFoPgdkTfz6WdIngeotTm+8cAGcBP6XqY="; + sha256 = "sha256-KzBMwpqn6wUFhgB3KDclBS0BvZSVcasM5AG/y+L91xM="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 46a3d9e40308..bf43bb1b50e4 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { # https://gitlab.freedesktop.org/glvnd/libglvnd#libglvnd: changelog = "https://gitlab.freedesktop.org/glvnd/libglvnd/-/tags/v${version}"; license = with licenses; [ mit bsd1 bsd3 gpl3Only asl20 ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 4f687d41dd6e..fcd7946a1351 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -37,13 +37,21 @@ in stdenv.mkDerivation (rec { nativeBuildInputs = [ gettext ]; postConfigure = - lib.optionalString stdenv.isSunOS # For some reason, /bin/sh on OpenIndiana leads to this at the end of the # `config.status' run: # ./config.status[1401]: shift: (null): bad number # (See .) # Thus, re-run it with Bash. - "${stdenv.shell} config.status"; + lib.optionalString stdenv.isSunOS '' + ${stdenv.shell} config.status + '' + # ./configure errorneous decides to use weak symbols on pkgsStatic, + # which, together with other defines results in locking functions in + # src/posix-lock.c to be no-op, causing tests/t-lock.c to fail. + + lib.optionalString stdenv.hostPlatform.isStatic '' + sed '/USE_POSIX_THREADS_WEAK/ d' config.h + echo '#undef USE_POSIX_THREADS_WEAK' >> config.h + ''; doCheck = true; # not cross diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix index 16595a12eb50..faa478b568c7 100644 --- a/pkgs/development/libraries/libgringotts/default.nix +++ b/pkgs/development/libraries/libgringotts/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A small library to encapsulate data in an encrypted structure"; - homepage = "http://libgringotts.sourceforge.net/"; + homepage = "https://libgringotts.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index b567a99d455d..172e3a2a2c78 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { zlib ]; - checkInputs = [ + nativeCheckInputs = [ perl ]; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index 517655080988..bfe0726c4543 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -7,6 +7,7 @@ , gobject-introspection , gnome , gtk-doc +, deterministic-uname }: stdenv.mkDerivation rec { @@ -21,6 +22,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + # uname output embedded in https://gitlab.gnome.org/GNOME/libgtop/-/blob/master/src/daemon/Makefile.am + deterministic-uname pkg-config gtk-doc perl diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix index 2c2b09b44923..18f2a563a75d 100644 --- a/pkgs/development/libraries/libhandy/0.x.nix +++ b/pkgs/development/libraries/libhandy/0.x.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ gnome-desktop gtk3 libxml2 ]; - checkInputs = [ dbus xvfb-run hicolor-icon-theme ]; + nativeCheckInputs = [ dbus xvfb-run hicolor-icon-theme ]; mesonFlags = [ "-Dgtk_doc=true" @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { "-Dintrospection=enabled" ]; - doCheck = true; + doCheck = !stdenv.isDarwin; checkPhase = '' NO_AT_BRIDGE=1 \ XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs ''; @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://source.puri.sm/Librem5/libhandy"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index de3bdad3e8df..ced064e70f82 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.8.0"; + version = "1.8.1"; outputs = [ "out" @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-bCVCwFeJJLDCm3rmy0TrJt846wHW1e89fQsIJXYyMOg="; + sha256 = "sha256-N2a5qIH+BljMYIBFOiIZCGw/bb2CBp3kCbirP1mUinA="; }; depsBuildBuild = [ @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { glade ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run at-spi2-atk at-spi2-core diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index 0c84cb7e0b18..96b8e3c02937 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -13,11 +13,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-HlT/78LUiTkRUB2jHmYrnQY+bBiv4stcZlMyUnelSpc="; }; - patchPhase = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile --replace "gcc" "cc" - substituteInPlace Makefile --replace "-arch i386" "" + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace "-arch x86_64" "-arch ${stdenv.hostPlatform.darwinArch}" ''; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + installPhase = '' mkdir -p $out/{bin,lib,include/hdhomerun} install -Dm444 libhdhomerun${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 45c04b857f76..5d008f394e8f 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -10,6 +10,7 @@ , libpng , libjpeg , libaom +, gdk-pixbuf # for passthru.tests , gimp @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { pname = "libheif"; - version = "1.14.0"; + version = "1.14.2"; outputs = [ "bin" "out" "dev" "man" ]; @@ -29,14 +30,30 @@ stdenv.mkDerivation rec { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "sha256-MvCiVAHM9C/rxeh6f9Bd13GECc2ladEP7Av7y3eWDcY="; + sha256 = "sha256-JwPeSNUc++z6RfMe0qAuXdekzLWR/MCmsT+Ykvp9a/s="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ dav1d rav1e libde265 x265 libpng libjpeg libaom ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + dav1d + rav1e + libde265 + x265 + libpng + libjpeg + libaom + gdk-pixbuf + ]; enableParallelBuilding = true; + # Fix installation path for gdk-pixbuf module + PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${placeholder "out"}/${gdk-pixbuf.moduleDir}"; + passthru.tests = { inherit gimp imagemagick imlib2Full imv vips; }; diff --git a/pkgs/development/libraries/libhwy/default.nix b/pkgs/development/libraries/libhwy/default.nix index 43b2e93d8270..66f273ba3f28 100644 --- a/pkgs/development/libraries/libhwy/default.nix +++ b/pkgs/development/libraries/libhwy/default.nix @@ -1,33 +1,23 @@ -{ lib, stdenv, cmake, ninja, gtest, fetchpatch, fetchFromGitHub }: +{ lib, stdenv, cmake, ninja, gtest, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libhwy"; - version = "0.15.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "google"; repo = "highway"; rev = version; - sha256 = "sha256-v2HyyHtBydr7QiI83DW1yRv2kWjUOGxFT6mmdrN9XPo="; + hash = "sha256-CHzDLzOnu/QfejWiRKE9I5UUyRxoEooNtYVe8FQwu7c="; }; - patches = [ - # Remove on next release - # https://github.com/google/highway/issues/460 - (fetchpatch { - name = "hwy-add-missing-includes.patch"; - url = "https://github.com/google/highway/commit/8ccab40c2f931aca6004d175eec342cc60f6baec.patch"; - sha256 = "sha256-wlp5gIvK2+OlKtsZwxq/pXTbESkUtimHXaYDjcBzmQ0="; - }) - ]; - nativeBuildInputs = [ cmake ninja ]; # Required for case-insensitive filesystems ("BUILD" exists) dontUseCmakeBuildDir = true; cmakeFlags = let - libExt = stdenv.hostPlatform.extensions.library; + libExt = stdenv.hostPlatform.extensions.sharedLibrary; in [ "-GNinja" "-DCMAKE_INSTALL_LIBDIR=lib" @@ -37,6 +27,8 @@ stdenv.mkDerivation rec { "-DGTEST_INCLUDE_DIR=${lib.getDev gtest}/include" "-DGTEST_LIBRARY=${lib.getLib gtest}/lib/libgtest${libExt}" "-DGTEST_MAIN_LIBRARY=${lib.getLib gtest}/lib/libgtest_main${libExt}" + ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ + "-DHWY_CMAKE_ARM7=ON" ]; # hydra's darwin machines run into https://github.com/libjxl/libjxl/issues/408 diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 760fc88e98ec..230cd3fc9196 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; - installCheckInputs = [ + nativeInstallCheckInputs = [ # running libical-glib tests (python3.pythonForBuild.withPackages (pkgs: with pkgs; [ pygobject3 diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index 57786cad761f..c8c9d8bf5103 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ID3 tag manipulation library"; - homepage = "http://mad.sourceforge.net/"; + homepage = "https://mad.sourceforge.net/"; license = licenses.gpl2; maintainers = [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 724778999f5f..9d7babd01dd2 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -5,8 +5,6 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -with lib; - stdenv.mkDerivation rec { pname = "libidn2"; version = "2.3.2"; @@ -20,14 +18,14 @@ stdenv.mkDerivation rec { # Beware: non-bootstrap libidn2 is overridden by ./hack.nix outputs = [ "bin" "dev" "out" "info" "devdoc" ]; - patches = optional stdenv.isDarwin ./fix-error-darwin.patch; + patches = lib.optional stdenv.isDarwin ./fix-error-darwin.patch; enableParallelBuilding = true; # The above patch causes the documentation to be regenerated, so the # documentation tools are required. - nativeBuildInputs = optionals stdenv.isDarwin [ help2man texinfo ]; - buildInputs = [ libunistring ] ++ optional stdenv.isDarwin libiconv; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ help2man texinfo ]; + buildInputs = [ libunistring ] ++ lib.optional stdenv.isDarwin libiconv; depsBuildBuild = [ buildPackages.stdenv.cc ]; meta = { diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix index d1f14664344d..1e076389a069 100644 --- a/pkgs/development/libraries/libime/default.nix +++ b/pkgs/development/libraries/libime/default.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "libime"; - version = "1.0.14"; + version = "1.0.15"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - sha256 = "sha256-O89Op2dxuhGgCxuy2GLI0waCgDreJKNQ5tTvsx/0/fk="; + sha256 = "sha256-QZxXhrrSkxe7bDY7V7Ns5YZaaYJiEnGmHgGLstGMBzc="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix index d06657b0081d..99b6542fa3e8 100644 --- a/pkgs/development/libraries/libindicator/default.nix +++ b/pkgs/development/libraries/libindicator/default.nix @@ -1,8 +1,6 @@ { stdenv, fetchurl, lib, file -, pkg-config -, gtkVersion ? "3", gtk2 ? null, gtk3 ? null }: - -with lib; +, pkg-config, glib +, gtkVersion ? "3", gtk2, gtk3 }: stdenv.mkDerivation rec { pname = "libindicator-gtk${gtkVersion}"; @@ -13,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f"; }; - nativeBuildInputs = [ pkg-config ]; + strictDeps = true; + + nativeBuildInputs = [ pkg-config glib ]; buildInputs = [ (if gtkVersion == "2" then gtk2 else gtk3) ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 8 out of 8 tests - meta = { + meta = with lib; { description = "A set of symbols and convenience functions for Ayatana indicators"; homepage = "https://launchpad.net/libindicator"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/libinklevel/default.nix b/pkgs/development/libraries/libinklevel/default.nix index f9c711df7043..0179009be3f9 100644 --- a/pkgs/development/libraries/libinklevel/default.nix +++ b/pkgs/development/libraries/libinklevel/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { project is to create a vendor independent API for retrieving the ink level of a printer connected to a Linux or FreeBSD box. ''; - homepage = "http://libinklevel.sourceforge.net/"; + homepage = "https://libinklevel.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.freebsd; maintainers = with maintainers; [ samb96 ]; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 5d5e90770f45..83034b8dd620 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { udev ]; - checkInputs = [ + nativeCheckInputs = [ check valgrind ]; diff --git a/pkgs/development/libraries/libinsane/default.nix b/pkgs/development/libraries/libinsane/default.nix index 51ce6808f5dd..cafa99ed77d5 100644 --- a/pkgs/development/libraries/libinsane/default.nix +++ b/pkgs/development/libraries/libinsane/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ sane-backends glib ]; - checkInputs = [ cunit valgrind ]; + nativeCheckInputs = [ cunit valgrind ]; doCheck = true; diff --git a/pkgs/development/libraries/libint/default.nix b/pkgs/development/libraries/libint/default.nix index dd5b26244a97..2fbe553c39da 100644 --- a/pkgs/development/libraries/libint/default.nix +++ b/pkgs/development/libraries/libint/default.nix @@ -1,12 +1,115 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool -, python3, perl, gmpxx, mpfr, boost, eigen, gfortran, cmake +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, python3 +, perl +, gmpxx +, mpfr +, boost +, eigen +, gfortran +, cmake , enableFMA ? stdenv.hostPlatform.fmaSupport , enableFortran ? true +, enableSSE ? (!enableFortran) && stdenv.hostPlatform.isx86_64 + + # Maximum angular momentum of basis functions + # 7 is required for def2/J auxiliary basis on 3d metals upwards +, maxAm ? 7 + + # ERI derivative order for 4-, 3- and 2-centre ERIs. + # 2nd derivatives are defaults and allow gradients Hessians with density fitting + # Setting them to zero disables derivatives. +, eriDeriv ? 2 +, eri3Deriv ? 2 +, eri2Deriv ? 2 + + # Angular momentum for derivatives of ERIs. Takes a list of length $DERIV_ORD+1. + # Starting from index 0, each index i specifies the supported angular momentum + # for the derivative order i, e.g. [6,5,4] supports ERIs for l=6, their first + # derivatives for l=5 and their second derivatives for l=4. +, eriAm ? (builtins.genList (i: maxAm - 1 - i) (eriDeriv + 1)) +, eri3Am ? (builtins.genList (i: maxAm - i) (eri2Deriv + 1)) +, eri2Am ? (builtins.genList (i: maxAm - i) (eri2Deriv + 1)) + + # Same as above for optimised code. Higher optimisations take a long time. +, eriOptAm ? (builtins.genList (i: maxAm - 3 - i) (eriDeriv + 1)) +, eri3OptAm ? (builtins.genList (i: maxAm - 3 - i) (eri2Deriv + 1)) +, eri2OptAm ? (builtins.genList (i: maxAm - 3 - i) (eri2Deriv + 1)) + + # One-Electron integrals of all kinds including multipole integrals. + # Libint does not build them and their derivatives by default. +, enableOneBody ? false +, oneBodyDerivOrd ? 2 +, multipoleOrd ? 4 # Maximum order of multipole integrals, 4=octopoles + + # Whether to enable generic code if angular momentum is unsupported +, enableGeneric ? true + + # Support integrals over contracted Gaussian +, enableContracted ? true + + # Spherical harmonics/Cartesian orbital conventions +, cartGaussOrd ? "standard" # Ordering of Cartesian basis functions, "standard" is CCA +, shGaussOrd ? "standard" # Ordering of spherical harmonic basis functions. "standard" is -l to +l, "guassian" is 0, 1, -1, 2, -2, ... +, shellSet ? "standard" +, eri3PureSh ? false # Transformation of 3-centre ERIs into spherical harmonics +, eri2PureSh ? false # Transformation of 2-centre ERIs into spherical harmonics }: +# Check that Fortran bindings are not used together with SIMD real type +assert (if enableFortran then !enableSSE else true); + +# Check that a possible angular momentum for basis functions is used +assert (maxAm >= 1 && maxAm <= 8); + +# Check for valid derivative order in ERIs +assert (eriDeriv >= 0 && eriDeriv <= 4); +assert (eri2Deriv >= 0 && eri2Deriv <= 4); +assert (eri3Deriv >= 0 && eri3Deriv <= 4); + +# Ensure valid arguments for generated angular momenta in ERI derivatives are used. +assert ( + builtins.length eriAm == eriDeriv + 1 && + builtins.foldl' (a: b: a && b) true (builtins.map (a: a <= maxAm && a >= 0) eriAm) +); +assert ( + builtins.length eri3Am == eriDeriv + 1 && + builtins.foldl' (a: b: a && b) true (builtins.map (a: a <= maxAm && a >= 0) eri3Am) +); +assert ( + builtins.length eri2Am == eriDeriv + 1 && + builtins.foldl' (a: b: a && b) true (builtins.map (a: a <= maxAm && a >= 0) eri2Am) +); + +# Ensure valid arguments for generated angular momenta in optimised ERI derivatives are used. +assert ( + builtins.length eriOptAm == eriDeriv + 1 && + builtins.foldl' (a: b: a && b) true (builtins.map (a: a <= maxAm && a >= 0) eriOptAm) +); +assert ( + builtins.length eri3OptAm == eriDeriv + 1 && + builtins.foldl' (a: b: a && b) true (builtins.map (a: a <= maxAm && a >= 0) eri3OptAm) +); +assert ( + builtins.length eri2OptAm == eriDeriv + 1 && + builtins.foldl' (a: b: a && b) true (builtins.map (a: a <= maxAm && a >= 0) eri2OptAm) +); + +# Ensure a valid derivative order for one-electron integrals +assert (oneBodyDerivOrd >= 0 && oneBodyDerivOrd <= 4); + +# Check that valid basis shell orders are used, see https://github.com/evaleev/libint/wiki +assert (builtins.elem cartGaussOrd [ "standard" "intv3" "gamess" "orca" "bagel" ]); +assert (builtins.elem shGaussOrd [ "standard" "gaussian" ]); +assert (builtins.elem shellSet [ "standard" "orca" ]); + let pname = "libint"; - version = "2.7.1"; + version = "2.7.2"; meta = with lib; { description = "Library for the evaluation of molecular integrals of many-body operators over Gaussian functions"; @@ -23,7 +126,7 @@ let owner = "evaleev"; repo = pname; rev = "v${version}"; - sha256 = "5nSeyT1DhFsA76Dt3dqYfhfBYD+iTl34O3lVeH6+OVw="; + hash = "sha256-lX+DVnhdOb8d7MX9umf33y88CNiGb3TYYlMZtQXfx+8="; }; # Replace hardcoded "/bin/rm" with normal "rm" @@ -52,23 +155,36 @@ let buildInputs = [ boost eigen ]; - preConfigure = "./autogen.sh"; + configureFlags = with lib; [ + "--with-max-am=${builtins.toString maxAm}" + "--with-eri-max-am=${concatStringsSep "," (builtins.map builtins.toString eriAm)}" + "--with-eri3-max-am=${concatStringsSep "," (builtins.map builtins.toString eri3Am)}" + "--with-eri2-max-am=${concatStringsSep "," (builtins.map builtins.toString eri2Am)}" + "--with-eri-opt-am=${concatStringsSep "," (builtins.map builtins.toString eriOptAm)}" + "--with-eri3-opt-am=${concatStringsSep "," (builtins.map builtins.toString eri3OptAm)}" + "--with-eri2-opt-am=${concatStringsSep "," (builtins.map builtins.toString eri2OptAm)}" + "--with-cartgauss-ordering=${cartGaussOrd}" + "--with-shgauss-ordering=${shGaussOrd}" + "--with-shell-set=${shellSet}" + ] + ++ optional enableFMA "--enable-fma" + ++ optional (eriDeriv > 0) "--enable-eri=${builtins.toString eriDeriv}" + ++ optional (eri2Deriv > 0) "--enable-eri2=${builtins.toString eri2Deriv}" + ++ optional (eri3Deriv > 0) "--enable-eri3=${builtins.toString eri3Deriv}" + ++ lists.optionals enableOneBody [ + "--enable-1body=${builtins.toString oneBodyDerivOrd}" + "--enable-1body-property-derivs" + ] + ++ optional (multipoleOrd > 0) "--with-multipole-max-order=${builtins.toString multipoleOrd}" + ++ optional enableGeneric "--enable-generic" + ++ optional enableContracted "--enable-contracted-ints" + ++ optional eri3PureSh "--enable-eri3-pure-sh" + ++ optional eri2PureSh "--enable-eri2-pure-sh" + ; - configureFlags = [ - "--enable-eri=2" - "--enable-eri3=2" - "--enable-eri2=2" - "--with-eri-max-am=7,5,4" - "--with-eri-opt-am=3" - "--with-eri3-max-am=7" - "--with-eri2-max-am=7" - "--with-g12-max-am=5" - "--with-g12-opt-am=3" - "--with-g12dkh-max-am=5" - "--with-g12dkh-opt-am=3" - "--enable-contracted-ints" - "--enable-shared" - ] ++ lib.optional enableFMA "--enable-fma"; + preConfigure = '' + ./autogen.sh + ''; makeFlags = [ "export" ]; @@ -98,11 +214,9 @@ let # AVX support is advertised, but does not work in 2.6 (possibly in 2.7). # Fortran interface is incompatible with changing the LIBINT2_REALTYPE. cmakeFlags = [ - (if enableFortran - then "-DENABLE_FORTRAN=ON" - else "-DLIBINT2_REALTYPE=libint2::simd::VectorSSEDouble" - ) - ]; + "-DLIBINT2_SHGAUSS_ORDERING=${shGaussOrd}" + ] ++ lib.optional enableFortran "-DENABLE_FORTRAN=ON" + ++ lib.optional enableSSE "-DLIBINT2_REALTYPE=libint2::simd::VectorSSEDouble"; # Can only build in the source-tree. A lot of preprocessing magic fails otherwise. dontUseCmakeBuildDir = true; @@ -110,4 +224,5 @@ let inherit meta; }; -in codeComp +in +codeComp diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix index 8b0c35e0d148..ce9932102852 100644 --- a/pkgs/development/libraries/libipfix/default.nix +++ b/pkgs/development/libraries/libipfix/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { - homepage = "http://libipfix.sourceforge.net/"; + homepage = "https://libipfix.sourceforge.net/"; description = "The libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index 9a1c728bd55d..c5e0c55854e6 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ file protobufc ]; meta = with lib; { - homepage = "http://libivykis.sourceforge.net/"; + homepage = "https://libivykis.sourceforge.net/"; description = '' A thin wrapper over various OS'es implementation of I/O readiness notification facilities diff --git a/pkgs/development/libraries/libjwt/default.nix b/pkgs/development/libraries/libjwt/default.nix index a81b60c425ec..025d040cddae 100644 --- a/pkgs/development/libraries/libjwt/default.nix +++ b/pkgs/development/libraries/libjwt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libjwt"; - version = "1.13.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "benmcollins"; repo = "libjwt"; rev = "v${version}"; - sha256 = "sha256-hS10Ecq0VVuYLDrBu4x+Y2mz6eeJV1SvnqttgbiQbi0="; + sha256 = "sha256-fdMrJaD0jq4aQtxNLUvPVP6dWMwp3Mz4TuW2zX6r7QA="; }; buildInputs = [ jansson openssl ]; diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix index 567d985fd3d4..700223cd1a79 100644 --- a/pkgs/development/libraries/libjxl/default.nix +++ b/pkgs/development/libraries/libjxl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libjxl"; - version = "0.6.1"; + version = "0.7.0"; outputs = [ "out" "dev" ]; @@ -29,44 +29,17 @@ stdenv.mkDerivation rec { owner = "libjxl"; repo = "libjxl"; rev = "v${version}"; - sha256 = "sha256-fTK5hyU9PZ6nigMsfzVugwviihgAXfEcLF+l+n5h+54="; + sha256 = "sha256-9DBLQ/gMyy2ZUm7PCWYJ7XOzkgQM0cAewJZzMNo8UPs="; # There are various submodules in `third_party/`. fetchSubmodules = true; }; patches = [ - # present in master, see https://github.com/libjxl/libjxl/pull/1403 + # present in master (fetchpatch { - name = "prefixless-pkg-config.patch"; - url = "https://github.com/libjxl/libjxl/commit/0b906564bfbfd8507d61c5d6a447f545f893227c.patch"; - sha256 = "1g5c6lrsmgxb9j64pjy8lbdgbvw834m5jyfivy9ppmd8iiv0kkq4"; - }) - - # present in master, remove after 0.7? - (fetchpatch { - name = "fix-link-lld-macho.patch"; - url = "https://github.com/libjxl/libjxl/commit/88fe3fff3dc70c72405f57c69feffd9823930034.patch"; - sha256 = "1419fyiq4srpj72cynwyvqy8ldi7vn9asvkp5fsbmiqkyhb15jpk"; - }) - - # "robust statistics" have been removed in upstream mainline as they are - # conidered to cause "interoperability problems". sure enough the tests - # fail with precision issues on aarch64. - (fetchpatch { - name = "remove-robust-and-descriptive-statistics.patch"; - url = "https://github.com/libjxl/libjxl/commit/204f87a5e4d684544b13900109abf040dc0b402b.patch"; - sha256 = "sha256-DoAaYWLmQ+R9GZbHMTYGe0gBL9ZesgtB+2WhmbARna8="; - }) - - # fix build with asciidoc wrapped in shell script - (fetchpatch { - url = "https://github.com/libjxl/libjxl/commit/b8ec58c58c6281987f42ebec892f513824c0cc0e.patch"; - hash = "sha256-g8U+YVhLfgSHJ+PWJgvVOI66+FElJSC8IgSRodNnsMw="; - }) - (fetchpatch { - url = "https://github.com/libjxl/libjxl/commit/ca8e276aacf63a752346a6a44ba673b0af993237.patch"; - excludes = [ "AUTHORS" ]; - hash = "sha256-9VXy1LdJ0JhYbCGPNMySpnGLBxUrr8BYzE+oU3LnUGw="; + name = "fix-test-failure-on-ia64-ppc64-riscv64"; + url = "https://github.com/libjxl/libjxl/commit/bb8eac5d6acec223e44cf8cc72ae02f0816de311.patch"; + hash = "sha256-DuUCStWEquhWo7bOss0RgZ7ouYE4FpWrIMFywYR424s="; }) ]; @@ -136,12 +109,17 @@ stdenv.mkDerivation rec { # * the `gimp` one, which allows GIMP to load jpeg-xl files # "-DJPEGXL_ENABLE_PLUGINS=ON" ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - "-DJPEGXL_STATIC=ON" + "-DJPEGXL_STATIC=ON" + ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ + "-DJPEGXL_FORCE_NEON=ON" ]; LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; + CXXFLAGS = lib.optionalString stdenv.hostPlatform.isAarch32 "-mfp16-format=ieee"; - doCheck = !stdenv.hostPlatform.isi686; + # FIXME x86_64-darwin: + # https://github.com/NixOS/nixpkgs/pull/204030#issuecomment-1352768690 + doCheck = with stdenv; !(hostPlatform.isi686 || isDarwin && isx86_64); meta = with lib; { homepage = "https://github.com/libjxl/libjxl"; diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index 779f6790c558..c931489057e7 100644 --- a/pkgs/development/libraries/libkrun/default.nix +++ b/pkgs/development/libraries/libkrun/default.nix @@ -15,21 +15,21 @@ stdenv.mkDerivation rec { pname = "libkrun"; - version = "1.3.0"; + version = "1.5.0"; src = if stdenv.isLinux then fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-qVyEqiqaQ8wfZhL5u+Bsaa1yXlgHUitSj5bo7FJ5Y8c="; + hash = "sha256-3WYxGpZ3uRbnh/VEDVSNOxp25SE7GQgC5t3ROuKNRE0="; } else fetchurl { url = "https://github.com/containers/libkrun/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; - hash = "sha256-RBqeGUhB6Sdt+JujyQBW/76mZwnT0LNs9AMYr8+OCVU="; + hash = "sha256-T1nYzrzxEJaVBnI00CQPKoT2OYJxdW7y6WNkabNsQYI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-jxSzhj1iU8qY+sZEVCYTaUqpaA4egjJi9qxrapASQF0="; + hash = "sha256-Clb6PNwLuzx42Qr1tgpjG1WHq9NcDr2bbfnyp4UVVLU="; }; nativeBuildInputs = with rustPlatform; [ @@ -61,5 +61,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/containers/libkrun"; license = licenses.asl20; maintainers = with maintainers; [ nickcao ]; + platforms = libkrunfw.meta.platforms; + sourceProvenance = with sourceTypes; lib.optionals stdenv.isDarwin [ binaryNativeCode ]; }; } diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix index 8769cf6913ba..13090776405a 100644 --- a/pkgs/development/libraries/libkrunfw/default.nix +++ b/pkgs/development/libraries/libkrunfw/default.nix @@ -13,26 +13,28 @@ assert sevVariant -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "libkrunfw"; - version = "3.3.0"; + version = "3.9.0"; src = if stdenv.isLinux then fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-ay+E5AgJeA0i3T4JDosDawwtezDGquzAvYEWHGbPidg="; + hash = "sha256-hpVE7g6V3nquZ3R5fQCcfRWuFDHJ3rgisezwdsDMaGg="; } else fetchurl { url = "https://github.com/containers/libkrunfw/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; - hash = "sha256-9Wp93PC+PEqUpWHIe6BUnfDMpFvYL8rGGjTU2nWSUVY="; + hash = "sha256-moZ2LYLhZDb8Y8jgWbdgK6SbJ8lY8f356d5vKHc/54Q="; }; kernelSrc = fetchurl { - url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.59.tar.xz"; - hash = "sha256-5t3GQgVzQNsGs7khwrMb/tLGETWejxRMPlz5w6wzvMs="; + url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.6.tar.xz"; + hash = "sha256-Pk2OVh2lcDogWujXsr7WxcZPxCme68v9IEgeY7V9XuM="; }; preBuild = '' substituteInPlace Makefile \ --replace 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s $(kernelSrc) $(KERNEL_TARBALL)' \ + --replace 'tar xf $(KERNEL_TARBALL)' \ + 'tar xf $(KERNEL_TARBALL); sed -i "s|/usr/bin/env bash|$(SHELL)|" $(KERNEL_SOURCES)/scripts/check-local-export' \ --replace 'gcc' '$(CC)' ''; @@ -51,6 +53,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/containers/libkrunfw"; license = with licenses; [ lgpl2Only lgpl21Only ]; maintainers = with maintainers; [ nickcao ]; - platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-darwin" ]; + sourceProvenance = with sourceTypes; lib.optionals stdenv.isDarwin [ binaryNativeCode ]; }; } diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 5bfb0d029cdf..d7f5aa24c155 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libksba"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { url = "mirror://gnupg/libksba/libksba-${version}.tar.bz2"; - sha256 = "fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971"; + hash = "sha256-P3LGjbMJceu/FDZ1J3GUI/Ck1fgQP8n0ocAan6RA3lw="; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix index 015121811710..634e52b97ab6 100644 --- a/pkgs/development/libraries/libksi/default.nix +++ b/pkgs/development/libraries/libksi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libksi"; - version = "3.20.3025"; + version = "3.21.3075"; src = fetchFromGitHub { owner = "Guardtime"; repo = pname; rev = "v${version}"; - sha256 = "0cagysr8j92r6g7f0mwrlkpn9xz9ncz2v3jymh47j3ljxmfbagpz"; + sha256 = "sha256-JEdjy91+8xJPNzjkumadT05SxcvtM551+SjLN1SQcAU="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 10c2bfb272c8..fe3ddba36b86 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -15,11 +15,12 @@ , lib , stdenv , xercesc +, zxing-cpp }: stdenv.mkDerivation rec { pname = "liblinphone"; - version = "5.1.22"; + version = "5.2.17"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -27,10 +28,14 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-hTyp/fUA1+7J1MtqX33kH8Vn1XNjx51Wy5REvrpdJTY="; + hash = "sha256-zxp+jcClfKm+VsylRtydF2rlDCkO+sa9vw8GpwAfKHM="; }; - patches = [ ./use-normal-jsoncpp.patch ]; + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace "jsoncpp_object" "jsoncpp" \ + --replace "jsoncpp_static" "jsoncpp" + ''; cmakeFlags = [ "-DENABLE_STATIC=NO" # Do not build static libraries @@ -52,6 +57,7 @@ stdenv.mkDerivation rec { (python3.withPackages (ps: [ ps.pystache ps.six ])) sqlite xercesc + zxing-cpp ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch b/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch deleted file mode 100644 index 4685b327ecd3..000000000000 --- a/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch +++ /dev/null @@ -1,57 +0,0 @@ -From ea6901c9ed0f804bd2d6d09e514610518c2f4f09 Mon Sep 17 00:00:00 2001 -From: Lorenz Brun -Date: Fri, 18 Mar 2022 17:36:22 +0100 -Subject: [PATCH] Use normal jsoncpp - ---- - src/CMakeLists.txt | 6 +++--- - tester/CMakeLists.txt | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 5cd87fe9a..822b2151e 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI) - if (XCODE) - list(APPEND LINK_LIBS jsoncpp_static) - else() -- list(APPEND LINK_LIBS jsoncpp_object) -+ list(APPEND LINK_LIBS jsoncpp) - endif() - endif() - -@@ -592,7 +592,7 @@ if(ENABLE_STATIC) - if (XCODE) - target_link_libraries(linphone PRIVATE jsoncpp_static) - else() -- target_link_libraries(linphone PRIVATE jsoncpp_object) -+ target_link_libraries(linphone PRIVATE jsoncpp) - endif() - endif() - -@@ -646,7 +646,7 @@ if(ENABLE_SHARED) - if (XCODE) - target_link_libraries(linphone PRIVATE jsoncpp_static) - else() -- target_link_libraries(linphone PRIVATE jsoncpp_object) -+ target_link_libraries(linphone PRIVATE jsoncpp) - endif() - endif() - -diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt -index b97042678..b4c5a5794 100644 ---- a/tester/CMakeLists.txt -+++ b/tester/CMakeLists.txt -@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI) - if (XCODE) - list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_static) - else() -- list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_object) -+ list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp) - endif() - endif() - --- -2.25.1 - diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 33ec04734f5b..da724aaac9b4 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.23.0"; + version = "3.24.0"; outputs = [ "out" "dev" "info" "doc" ] # configure: WARNING: cannot generate manual pages while cross compiling @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "sha256-jXNhHzydWaMhFbEKoFHyZ77GCvAqxyT3P0xIAgFlTzY="; + sha256 = "sha256-QSrCQhP3t+WPyBQPLJbZEaDCjXD8Lo6IAGKHsbL2S1o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix index 953a6d03e5e6..cdd6a7b2ec50 100644 --- a/pkgs/development/libraries/libmcrypt/default.nix +++ b/pkgs/development/libraries/libmcrypt/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl, darwin, disablePosixThreads ? false }: -with lib; - stdenv.mkDerivation rec { pname = "libmcrypt"; version = "2.5.8"; @@ -11,15 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4"; }; - buildInputs = optional stdenv.isDarwin darwin.cctools; + buildInputs = lib.optional stdenv.isDarwin darwin.cctools; - configureFlags = optionals disablePosixThreads + configureFlags = lib.optionals disablePosixThreads [ "--disable-posix-threads" ]; meta = { description = "Replacement for the old crypt() package and crypt(1) command, with extensions"; homepage = "http://mcrypt.sourceforge.net"; license = "GPL"; - platforms = platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libmilter/darwin.patch b/pkgs/development/libraries/libmilter/darwin.patch index be46662d6b38..9bad640450c6 100644 --- a/pkgs/development/libraries/libmilter/darwin.patch +++ b/pkgs/development/libraries/libmilter/darwin.patch @@ -13,16 +13,16 @@ Fix build issues on Darwin. define(`confLDOPTS', `${Extra_LD_Flags}') --- a/sendmail/sendmail.h 2020-05-18 14:51:17.000000000 +0200 +++ b/sendmail/sendmail.h 2020-05-18 14:51:00.000000000 +0200 -@@ -104,7 +104,11 @@ - # endif /* NETX25 */ +@@ -122,7 +122,11 @@ + # endif - # if NAMED_BIND --# include -+# ifdef __APPLE__ -+# include -+# else -+# include -+# endif - # ifdef NOERROR - # undef NOERROR /* avoid conflict */ - # endif /* NOERROR */ + #if NAMED_BIND +-# include ++# ifdef __APPLE__ ++# include ++# else ++# include ++# endif + # ifdef NOERROR + # undef NOERROR /* avoid conflict */ + # endif diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index 38788b3c964b..ee92235adacc 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmilter"; - version = "8.15.2"; + version = "8.17.1"; src = fetchurl { url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.${version}.tar.gz"; - sha256 = "0fdl9ndmspqspdlmghzxlaqk56j3yajk52d7jxcg21b7sxglpy94"; + sha256 = "sha256-BLx2tsiG5tERvn/Y2qMrjOABKKKItrUuBnvCnzhUpuY="; }; buildPhase = '' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sh Build -f ./a.m4 ''; - patches = [ ./install.patch ./sharedlib.patch ./glibc-2.30.patch ./darwin.patch ]; + patches = [ ./install.patch ./sharedlib.patch ./darwin.patch ]; nativeBuildInputs = [ m4 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/libraries/libmilter/glibc-2.30.patch b/pkgs/development/libraries/libmilter/glibc-2.30.patch deleted file mode 100644 index e72ec9911e37..000000000000 --- a/pkgs/development/libraries/libmilter/glibc-2.30.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/libmilter/sm_gethost.c b/libmilter/sm_gethost.c -index 2423c34..f00468c 100644 ---- a/libmilter/sm_gethost.c -+++ b/libmilter/sm_gethost.c -@@ -52,16 +52,8 @@ sm_getipnodebyname(name, family, flags, err) - bool resv6 = true; - struct hostent *h; - -- if (family == AF_INET6) -- { -- /* From RFC2133, section 6.1 */ -- resv6 = bitset(RES_USE_INET6, _res.options); -- _res.options |= RES_USE_INET6; -- } - SM_SET_H_ERRNO(0); -- h = gethostbyname(name); -- if (family == AF_INET6 && !resv6) -- _res.options &= ~RES_USE_INET6; -+ h = gethostbyname2(name, family); - - /* the function is supposed to return only the requested family */ - if (h != NULL && h->h_addrtype != family) -diff --git a/sendmail/conf.c b/sendmail/conf.c -index c73334e..500dafb 100644 ---- a/sendmail/conf.c -+++ b/sendmail/conf.c -@@ -4243,16 +4243,8 @@ sm_getipnodebyname(name, family, flags, err) - # else /* HAS_GETHOSTBYNAME2 */ - bool resv6 = true; - -- if (family == AF_INET6) -- { -- /* From RFC2133, section 6.1 */ -- resv6 = bitset(RES_USE_INET6, _res.options); -- _res.options |= RES_USE_INET6; -- } - SM_SET_H_ERRNO(0); -- h = gethostbyname(name); -- if (!resv6) -- _res.options &= ~RES_USE_INET6; -+ h = gethostbyname2(name, family); - - /* the function is supposed to return only the requested family */ - if (h != NULL && h->h_addrtype != family) diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix index 1ce3b0d4a007..72fdbc4c0219 100644 --- a/pkgs/development/libraries/libmodbus/default.nix +++ b/pkgs/development/libraries/libmodbus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmodbus"; - version = "3.1.8"; + version = "3.1.10"; src = fetchFromGitHub { owner = "stephane"; repo = "libmodbus"; rev = "v${version}"; - hash = "sha256-rIsMTSyctPZmIh6hFeL3MxyNzey0+iOc2lbBKTkE7To="; + hash = "sha256-e2lB5D41a5MOmz9M90ZXfIltSOxNDOrQUpRNU2yYd1k="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix index 3f4f89c0a25c..c4fa6fcd7ce7 100644 --- a/pkgs/development/libraries/libmodplug/default.nix +++ b/pkgs/development/libraries/libmodplug/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MOD playing library"; - homepage = "http://modplug-xmms.sourceforge.net/"; + homepage = "https://modplug-xmms.sourceforge.net/"; license = licenses.publicDomain; platforms = platforms.unix; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 8421a2503070..481f12e17526 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libmpc"; - version = "1.2.1"; # to avoid clash with the MPD client + version = "1.3.1"; # to avoid clash with the MPD client src = fetchurl { url = "mirror://gnu/mpc/mpc-${version}.tar.gz"; - sha256 = "0n846hqfqvmsmim7qdlms0qr86f1hck19p12nq3g3z2x74n3sl0p"; + sha256 = "sha256-q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg="; }; strictDeps = true; diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix index 86e8932c04d7..f2bc1619987c 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 = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.c"; rev = "v${version}"; - sha256 = "sha256-mdOvJkCdJ2QEsVUdxVCpIDLn4+6JM6OeJfasJxqqID8="; + sha256 = "sha256-L/RS/M0TQJEMXRvdwo03st1VAlIlJ/fCmTvx+0+gCGE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index 304fb49f0274..360aba08e709 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libiconv ]; meta = with lib; { - homepage = "http://natspec.sourceforge.net/"; + homepage = "https://natspec.sourceforge.net/"; description = "A library intended to smooth national specificities in using of programs"; platforms = platforms.unix; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix index cbfc06bc81c5..d9beee7933fa 100644 --- a/pkgs/development/libraries/libnfs/default.nix +++ b/pkgs/development/libraries/libnfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "libnfs"; @@ -13,7 +13,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=tautological-compare"; + patches = [ + # Fixes 100% CPU usage in multi-threaded mode + (fetchpatch { + url = "https://github.com/sahlberg/libnfs/commit/34d6fe37e986da5b0ced86cd028a88e482537d5a.patch"; + sha256 = "sha256-i7mi+TVdkLb4MztT5Ic/Q8XBIWk9lo8v5bNjHOr6LaI="; + }) + # Fixes deprecation warnings on macOS + (fetchpatch { + url = "https://github.com/sahlberg/libnfs/commit/f6631c54a7b0385988f11357bf96728a6d7345b9.patch"; + sha256 = "sha256-xLRZ9J1vr04n//gNv9ljUBt5LHUGBRRVIXJCMlFbHFI="; + }) + ]; + + configureFlags = [ + "--enable-pthread" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix index 48edfbfce2c0..7a9e0580e37e 100644 --- a/pkgs/development/libraries/libnixxml/default.nix +++ b/pkgs/development/libraries/libnixxml/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { glib nix ]; - checkInputs = [ + nativeCheckInputs = [ nix ]; diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index dd14504bf8b6..b7dddd16672c 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libofx"; - version = "0.10.7"; + version = "0.10.9"; src = fetchFromGitHub { owner = "LibOFX"; repo = pname; rev = version; - sha256 = "sha256-zbSVmduEH7iO/8N6hEpQQMUYDVG6CaNycGOl5bd6fsw="; + sha256 = "sha256-KOQrEAt1jHrOpPQ7QbGUADe0i7sQXNH2fblPRzT0EIg="; }; preConfigure = "./autogen.sh"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Opensource implementation of the Open Financial eXchange specification"; - homepage = "http://libofx.sourceforge.net/"; + homepage = "https://libofx.sourceforge.net/"; license = "LGPL"; platforms = lib.platforms.unix; maintainers = [ ]; diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index 62fa4f10aa41..4291b3668039 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix" # errors - configureFlags = lib.optional stdenv.isDarwin "--build=x86_64"; + configureFlags = lib.optional (stdenv.isDarwin && stdenv.isx86_64) "--build=x86_64"; # fixes a cast in inline asm: easier than patching buildFlags = lib.optional stdenv.isDarwin "CFLAGS=-fheinous-gnu-extensions"; diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index e49473b79ede..67d9ec29b207 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { doCheck = false; # fails - # Fix for #40213, probably permanent, because upstream doesn't seem to be - # developed anymore. Alternatively, gcc7Stdenv could be used. - NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds -Wno-error=stringop-overflow=8"; + NIX_CFLAGS_COMPILE = + if stdenv.cc.isGNU then "-Wno-error=array-bounds -Wno-error=stringop-overflow=8" + else "-Wno-error=absolute-value -Wno-error=enum-conversion -Wno-error=logical-not-parentheses -Wno-error=non-literal-null-conversion"; meta = with lib; { - homepage = "https://sourceforge.net/projects/omxil/"; + homepage = "https://omxil.sourceforge.net/"; description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/liboqs/default.nix b/pkgs/development/libraries/liboqs/default.nix new file mode 100644 index 000000000000..908554a679df --- /dev/null +++ b/pkgs/development/libraries/liboqs/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, openssl +, enableStatic ? stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation rec { + pname = "liboqs"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "open-quantum-safe"; + repo = pname; + rev = version; + sha256 = "sha256-cwrTHj/WFDZ9Ez2FhjpRhEx9aC5xBnh7HR/9T+zUpZc="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if enableStatic then "OFF" else "ON"}" + "-DOQS_DIST_BUILD=ON" + "-DOQS_BUILD_ONLY_LIB=ON" + ]; + + dontFixCmake = true; # fix CMake file will give an error + + meta = with lib; { + description = "C library for prototyping and experimenting with quantum-resistant cryptography"; + homepage = "https://openquantumsafe.org"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ candyc1oud ]; + }; +} diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 032589336237..801b74869509 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libxml2 libxslt ]; - checkInputs = [ + nativeCheckInputs = [ check curl perl diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index 01cdc96e39cd..d86755837b4a 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.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; rev = "v${version}"; - sha256 = "sha256-IPdaBT6hRNHo8kuOsiKdyiQkRxA/l+44U3qGGG89BTo="; + sha256 = "sha256-R7kOhQFfGYuHNkIZV4BTE+WKjHnCJwKeIWjCJNrvyTQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libosmscout/default.nix b/pkgs/development/libraries/libosmscout/default.nix index 76a1ba534b71..8452ccffe389 100644 --- a/pkgs/development/libraries/libosmscout/default.nix +++ b/pkgs/development/libraries/libosmscout/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { meta = with lib; { description = "Simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data"; - homepage = "http://libosmscout.sourceforge.net/"; + homepage = "https://libosmscout.sourceforge.net/"; license = licenses.lgpl3Plus; maintainers = [ maintainers.Thra11 ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index 70a433ddc280..69eb2fb63394 100644 --- a/pkgs/development/libraries/libp11/default.nix +++ b/pkgs/development/libraries/libp11/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { inherit openssl; }; + meta = with lib; { description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier"; homepage = "https://github.com/OpenSC/libp11"; diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index 0130af664597..772f3ff719d5 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; meta = { - homepage = "http://parchive.sourceforge.net/"; + homepage = "https://parchive.sourceforge.net/"; license = lib.licenses.gpl2Plus; description = "A library for using Parchives (parity archive volume sets)"; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index f3d3587c14fa..312e1dbf87cd 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,6 +1,14 @@ -{ lib, stdenv, fetchurl, flex, bison, bluez, pkg-config, withBluez ? false }: - -with lib; +{ lib +, stdenv +, fetchurl +, flex +, bison +, bluez +, libxcrypt +, pkg-config +, withBluez ? false +, withRemote ? false +}: stdenv.mkDerivation rec { pname = "libpcap"; @@ -11,16 +19,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-7ShfSsyvBTRPkJdXV7Pb/ncrpB0cQBwmSLf6RbcRvdQ="; }; + buildInputs = lib.optionals withRemote [ libxcrypt ]; + nativeBuildInputs = [ flex bison ] - ++ optionals withBluez [ bluez.dev pkg-config ]; + ++ lib.optionals withBluez [ bluez.dev pkg-config ]; # We need to force the autodetection because detection doesn't # work in pure build environments. configureFlags = [ "--with-pcap=${if stdenv.isLinux then "linux" else "bpf"}" - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "--disable-universal" - ] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) + ] ++ lib.optionals withRemote [ + "--enable-remote" + ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "ac_cv_linux_vers=2" ]; postInstall = '' @@ -29,7 +41,7 @@ stdenv.mkDerivation rec { fi ''; - meta = { + meta = with lib; { homepage = "https://www.tcpdump.org"; description = "Packet Capture Library"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/development/libraries/libpg_query/default.nix index 663a119224b9..254e5ca51e99 100644 --- a/pkgs/development/libraries/libpg_query/default.nix +++ b/pkgs/development/libraries/libpg_query/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpg_query"; - version = "13-2.2.0"; + version = "15-4.1.0"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; rev = version; - sha256 = "sha256-gEkcv/j8ySUYmM9lx1hRF/SmuQMYVHwZAIYOaCQWAFs="; + hash = "sha256-uZdszDE0UJVeegU1bi0ISYooC4ztNv7W4UQ2gWIjrH8="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index 73d97a476559..754ac2097b95 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -7,7 +7,6 @@ , vulkan-headers , vulkan-loader , shaderc -, glslang , lcms2 , libepoxy , libGL @@ -38,7 +37,6 @@ stdenv.mkDerivation rec { vulkan-headers vulkan-loader shaderc - glslang lcms2 libepoxy libGL @@ -50,6 +48,7 @@ stdenv.mkDerivation rec { "-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml" "-Ddemos=false" # Don't build and install the demo programs "-Dd3d11=disabled" # Disable the Direct3D 11 based renderer + "-Dglslang=disabled" # rely on shaderc for GLSL compilation instead ] ++ lib.optionals stdenv.isDarwin [ "-Dunwind=disabled" # libplacebo doesn’t build with `darwin.libunwind` ]; diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/development/libraries/libplctag/default.nix index df209993bb10..de71d021d015 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.5.4"; + version = "2.5.5"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-RQlT+G0aSHHETyJaWKhGFdBLSv0qoZsavggv/ubeSQA="; + sha256 = "sha256-eWtQaYUWZNQYQOUXnbUfjrtpoO6CnNJ8WjlowA49sG0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 2293dfc00a0c..b757d20b71d5 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,20 +3,20 @@ assert zlib != null; let - patchVersion = "1.6.37"; + patchVersion = "1.6.39"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - sha256 = "1dh0250mw9b2hx7cdmnb2blk7ddl49n6vx8zz7jdmiwxy38v4fw2"; + hash = "sha256-SsS26roAzeISxI22XLlCkQc/68oixcef2ocJFQLoDP0="; }; whenPatched = lib.optionalString apngSupport; in stdenv.mkDerivation rec { pname = "libpng" + whenPatched "-apng"; - version = "1.6.37"; + version = "1.6.39"; src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; - sha256 = "1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh"; + hash = "sha256-H0aWznC07l+F8eFiPcEimyEAKfpLeu5XPfPiunsDaTc="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; @@ -32,8 +32,9 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; homepage = "http://www.libpng.org/pub/png/libpng.html"; + changelog = "https://github.com/glennrp/libpng/blob/v1.6.39/CHANGES"; license = licenses.libpng2; platforms = platforms.all; - maintainers = [ maintainers.vcunat ]; + maintainers = with maintainers; [ vcunat ]; }; } diff --git a/pkgs/development/libraries/libpqxx/6.nix b/pkgs/development/libraries/libpqxx/6.nix index c9e55fd9c019..1c2a98fcb3c9 100644 --- a/pkgs/development/libraries/libpqxx/6.nix +++ b/pkgs/development/libraries/libpqxx/6.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A C++ library to access PostgreSQL databases"; - homepage = "http://pqxx.org/development/libpqxx/"; + homepage = "https://pqxx.org/development/libpqxx/"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.eelco ]; diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index d0116a742d26..235021769310 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A C++ library to access PostgreSQL databases"; - homepage = "http://pqxx.org/development/libpqxx/"; + homepage = "https://pqxx.org/development/libpqxx/"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.eelco ]; diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix index abc65130fc3a..fade2a9194ae 100644 --- a/pkgs/development/libraries/libpwquality/default.nix +++ b/pkgs/development/libraries/libpwquality/default.nix @@ -15,7 +15,7 @@ assert enablePython -> !stdenv.hostPlatform.isStatic; stdenv.mkDerivation rec { pname = "libpwquality"; - version = "1.4.4"; + version = "1.4.5"; outputs = [ "out" "dev" "lib" "man" ] ++ lib.optionals enablePython [ "py" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "libpwquality"; repo = "libpwquality"; rev = "${pname}-${version}"; - sha256 = "sha256-7gAzrx5VP1fEBwAt6E5zGM8GyuPRR+JxYifYfirY+U8="; + sha256 = "sha256-YjvHzd4iEBvg+qHOVJ7/y9HqyeT+QDalNE/jdNM9BNs="; }; patches = [ diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 9c5d295e6edb..29cccbd5708e 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "4.4.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-/TgsGlO8RJ3L+2425odye365QqBzCHrr1Z4zUj+Ld8I="; + sha256 = "sha256-ipnWrh3L+wp6Qaw9UQVBVHLJvzrpyPFnKbi0U5zlxWU="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index c2d91b1d5b73..10f4b43f9890 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -17,8 +17,6 @@ , libva }: -with lib; - mkDerivation rec { pname = "libqtav"; version = "unstable-2020-09-10"; @@ -64,7 +62,7 @@ mkDerivation rec { stripDebugList = [ "lib" "libexec" "bin" "qml" ]; - meta = { + meta = with lib; { description = "A multimedia playback framework based on Qt + FFmpeg"; #license = licenses.lgpl21; # For the libraries / headers only. license = licenses.gpl3; # With the examples (under bin) and most likely some of the optional dependencies used. diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index 0f75c8d1f4e5..4d029ec8030f 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -1,23 +1,22 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, qtmultimedia }: +{ mkDerivation, lib, fetchFromGitHub, cmake, olm, openssl, qtmultimedia, qtkeychain }: mkDerivation rec { pname = "libquotient"; - version = "0.6.11"; + version = "0.7.1"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - sha256 = "sha256-FPtxeZOfChIPi4e/h/eZkByH1QL3Fn0OJxe0dnMcTRw="; + hash = "sha256-3xnv1dcyeX3Kl5EH2Tlf6nXobLG1zXsFmYstnvmSAXA="; }; - buildInputs = [ qtmultimedia ]; + buildInputs = [ olm openssl qtmultimedia qtkeychain ]; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - # we need libqtolm for this - "-DQuotient_ENABLE_E2EE=OFF" + "-DQuotient_ENABLE_E2EE=ON" ]; # https://github.com/quotient-im/libQuotient/issues/551 @@ -28,7 +27,7 @@ mkDerivation rec { ''; meta = with lib; { - description = "A Qt5 library to write cross-platform clients for Matrix"; + description = "A Qt5/Qt6 library to write cross-platform clients for Matrix"; homepage = "https://matrix.org/docs/projects/sdk/quotient"; license = licenses.lgpl21; maintainers = with maintainers; [ colemickens ]; diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix index b7e528301e8f..bc0ae86aec35 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-2022-03-23"; + version = "unstable-2022-06-16"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "c4fd1b8986c6d6d4ae5cd51e65a8bbeb495dfa4e"; - hash = "sha256-sAfpfq7C9HXVS7ym3UFIO6bpEIWFCOfVCSN2n5q1RNg="; + rev = "54fd97ae4066a10b6b02089bc769ceed328737e0"; + hash = "sha512-f7tBgIykcIdkwcFjBKk5ooD/5Bsyrd/0OFr7LNCwWFYeE4DH3XA7UR7YjArkwqUVCVBByr82EOaacw0g1blOkw=="; }; patches = [ diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index fd0f6d2ce6d1..8d935bb08530 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rvf $out/share/gtk-doc"; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; doCheck = false; # fails with "No testsuite plan file sparql-query-plan.ttl could be created in build/..." doInstallCheck = false; # fails with "rasqal-config does not support (--help|--version)" diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/development/libraries/libredwg/default.nix index ad7a7e5473e9..8a01ace46415 100644 --- a/pkgs/development/libraries/libredwg/default.nix +++ b/pkgs/development/libraries/libredwg/default.nix @@ -1,21 +1,46 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, texinfo, pcre2 -, enablePython ? false, python ? null, swig, libxml2, ncurses +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, writeShellScript +, pkg-config +, texinfo +, pcre2 +, swig +, libxml2 +, ncurses +, enablePython ? false +, python ? null }: let isPython3 = enablePython && python.pythonAtLeast "3"; in stdenv.mkDerivation rec { pname = "libredwg"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "LibreDWG"; repo = pname; rev = version; - sha256 = "sha256-CZZ5/uCls2tY3PKmD+hBBvp7d7KX8nZuCPf03sa4iXc="; + sha256 = "sha256-s9aiOKSM7+3LJNE+jRrEMcL1QKRWrlTKbwO7oL9VhuE="; fetchSubmodules = true; }; + postPatch = let + printVersion = writeShellScript "print-version" '' + echo ${lib.escapeShellArg version} + ''; + in '' + # avoid git dependency + cp ${printVersion} build-aux/git-version-gen + ''; + + preConfigure = lib.optionalString (stdenv.isDarwin && enablePython) '' + # prevent configure picking up stack_size from distutils.sysconfig + export PYTHON_EXTRA_LDFLAGS=" " + ''; + nativeBuildInputs = [ autoreconfHook pkg-config texinfo ] ++ lib.optional enablePython swig; @@ -31,10 +56,9 @@ stdenv.mkDerivation rec { doCheck = true; # the "xmlsuite" test requires the libxml2 c library as well as the python module - checkInputs = lib.optionals enablePython [ libxml2 libxml2.dev ]; + nativeCheckInputs = lib.optionals enablePython [ libxml2 libxml2.dev ]; meta = with lib; { - broken = stdenv.isDarwin && stdenv.isAarch64; description = "Free implementation of the DWG file format"; homepage = "https://savannah.gnu.org/projects/libredwg/"; maintainers = with maintainers; [ tweber ]; diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 6c7bdeec0bdf..f343c4383c4a 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, zlib, openssl, libre }: stdenv.mkDerivation rec { - version = "2.9.0"; + version = "2.10.0"; pname = "librem"; src = fetchFromGitHub { owner = "baresip"; repo = "rem"; rev = "v${version}"; - sha256 = "sha256-HiVM/opZuR7Gkt421ps+nKiiKERG8sUD8qBLIMGNCJI="; + sha256 = "sha256-wyzpx0WjQLA8UKx4S6QOETMehf51Af5napZsxMXttmM="; }; buildInputs = [ zlib openssl libre ]; makeFlags = [ diff --git a/pkgs/development/libraries/librest/1.0.nix b/pkgs/development/libraries/librest/1.0.nix index cbd525d40b0e..fec622752f8c 100644 --- a/pkgs/development/libraries/librest/1.0.nix +++ b/pkgs/development/libraries/librest/1.0.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch , fetchurl , meson , ninja @@ -24,6 +25,18 @@ stdenv.mkDerivation rec { sha256 = "kmalwQ7OOD4ZPft/+we1CcwfUVIauNrXavlu0UISwuM="; }; + patches = [ + # Pick up MR 30 (https://gitlab.gnome.org/GNOME/librest/-/merge_requests/30) to fix GOA crashes with libsoup 3 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/librest/-/commit/fbad64abe28a96f591a30e3a5d3189c10172a414.patch"; + hash = "sha256-r8+h84Y/AdM1IOMRcBVwDvfqapqOY8ZtRXdOIQvFR9w="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/librest/-/commit/8049048a0f7d52b3f4101c7123797fed099d4cc8.patch"; + hash = "sha256-AMhHKzzOoTIlkRwN4KfUwdhxlqvtRgiVjKRfnG7KZwc="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -58,6 +71,8 @@ stdenv.mkDerivation rec { moveToOutput "share/doc" "$devdoc" ''; + separateDebugInfo = true; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 6877f9ab7b3f..7daa4ad19e57 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc, - libyamlcpp, gtest, capnproto, pkg-config, plugins ? [ ] }: + yaml-cpp, gtest, capnproto, pkg-config, plugins ? [ ] }: let copySinglePlugin = plug: "cp -r ${plug} plugins/${plug.name}"; @@ -10,18 +10,18 @@ let in stdenv.mkDerivation rec { pname = "librime"; - version = "1.7.3"; + version = "1.8.3"; src = fetchFromGitHub { owner = "rime"; repo = pname; rev = version; - sha256 = "sha256-GzNMwyJR9PgJN0eGYbnBW6LS3vo4SUVLdyNG9kcEE18="; + sha256 = "sha256-tPuDDVV4ZeBva/oHcw0rNjkzYmCtT2vLCdwCukBM28w="; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gtest capnproto ] + buildInputs = [ boost glog leveldb marisa opencc yaml-cpp gtest capnproto ] ++ plugins; # for propagated build inputs preConfigure = copyPlugins; diff --git a/pkgs/development/libraries/librsb/default.nix b/pkgs/development/libraries/librsb/default.nix index 691975b1af4e..cc80655c1f99 100644 --- a/pkgs/development/libraries/librsb/default.nix +++ b/pkgs/development/libraries/librsb/default.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation rec { make cleanall ''; - checkInputs = [ + nativeCheckInputs = [ octave ]; checkTarget = "tests"; meta = with lib; { - homepage = "http://librsb.sourceforge.net/"; + homepage = "https://librsb.sourceforge.net/"; description = "Shared memory parallel sparse matrix and sparse BLAS library"; longDescription = '' Library for sparse matrix computations featuring the Recursive Sparse diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 1d2954eb74fc..a60da602e070 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -15,7 +15,7 @@ , rustPlatform , rustc , rust -, cargo +, cargo-auditable-cargo-wrapper , gi-docgen , python3Packages , gnome @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { gdk-pixbuf pkg-config rustc - cargo + cargo-auditable-cargo-wrapper python3Packages.docutils vala rustPlatform.cargoSetupHook @@ -87,10 +87,7 @@ stdenv.mkDerivation rec { configureFlags = [ (lib.enableFeature withIntrospection "introspection") - - # Vapi does not build on MacOS. - # https://github.com/NixOS/nixpkgs/pull/117081#issuecomment-827782004 - (lib.enableFeature (withIntrospection && !stdenv.isDarwin) "vala") + (lib.enableFeature withIntrospection "vala") "--enable-always-build-tests" ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic" diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 0594e9e6e20b..cc9778a3ba7d 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Implementation of the rsync remote-delta algorithm"; - homepage = "http://librsync.sourceforge.net/"; + homepage = "https://librsync.sourceforge.net/"; license = licenses.lgpl2Plus; mainProgram = "rdiff"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 7cea80696a92..e68603c490c4 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - checkInputs = [ util-linuxMinimal which ]; + nativeCheckInputs = [ util-linuxMinimal which ]; doCheck = true; # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. @@ -32,9 +32,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 24a34a92f3c1..fd2cadf1602d 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { glib ]; - checkInputs = [ + nativeCheckInputs = [ python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { runHook preCheck dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs runHook postCheck diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix index ef56f936dccf..810047394e30 100644 --- a/pkgs/development/libraries/libshumate/default.nix +++ b/pkgs/development/libraries/libshumate/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libshumate"; - version = "1.0.2"; + version = "1.0.3"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libshumate"; rev = version; - sha256 = "zmPsWdTbM+T50X0BsVTn1Aw/5N6sL5hIQiRG5WSG1eg="; + sha256 = "gT6jpFN0mkSdDs+8GQa0qKuL5KLzxanBMGwA4EATW7Y="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { gtk4 ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run ]; @@ -61,7 +61,10 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - HOME=$TMPDIR xvfb-run meson test --print-errorlogs + env \ + HOME="$TMPDIR" \ + GTK_A11Y=none \ + xvfb-run meson test --print-errorlogs runHook postCheck ''; diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 26ee6c2413d4..84d0f01c1549 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libsidplayfp"; - version = "2.4.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-o9VPOX50QTp3gVNv2MEizrm4WxW6mOBi8eiuyoe2XZQ="; + sha256 = "sha256-e+blEdO2KA/noW9pq56qZ0/vvtqQwiDbBJoQR0cQeds="; }; postPatch = '' @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ unittest-cpp ]; + nativeCheckInputs = [ unittest-cpp ]; enableParallelBuilding = true; @@ -60,9 +60,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/development/libraries/libsigcxx/3.0.nix b/pkgs/development/libraries/libsigcxx/3.0.nix index f6a796f2561d..ab36b271b3ae 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.2.0"; + version = "3.4.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "jNy5huPwp8W0R0qjyDPWduYkaVCfSJkRDd8RjwQIJlE="; + sha256 = "AuJjD/tc6TzVLDhCNSHf5wYzKIY6bpbUHXZaYRa4cH4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix index f20f80c28429..9f0496262f2a 100644 --- a/pkgs/development/libraries/libsignon-glib/default.nix +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -43,9 +43,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix index 0eb0045fbe68..54360cad4ed9 100644 --- a/pkgs/development/libraries/libsnark/default.nix +++ b/pkgs/development/libraries/libsnark/default.nix @@ -7,7 +7,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; - cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" "-DWITH_SUPERCOP=OFF" ]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin || !stdenv.hostPlatform.isx86) [ "-DWITH_SUPERCOP=OFF" ] + ++ lib.optionals (!stdenv.hostPlatform.isx86) [ "-DCURVE=ALT_BN128" ]; src = fetchFromGitHub { rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; @@ -18,7 +20,6 @@ stdenv.mkDerivation rec { }; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "C++ library for zkSNARKs"; homepage = "https://github.com/scipr-lab/libsnark"; license = licenses.mit; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 7267b7d99b2f..99e1a35a80e4 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,33 +1,38 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config , zlib, xz, bzip2, zchunk, zstd -, expat, rpm, db }: +, expat +, withRpm ? !stdenv.isDarwin, rpm +, db +}: stdenv.mkDerivation rec { - version = "0.7.22"; + version = "0.7.23"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-rqWQJz3gZuhcNblyFWiYCC17miNY8F5xguAJwDk3xFE="; + sha256 = "sha256-i1g4arr8rII9SzdyITD6xS9CAVN6zP73gFwnZdkc5os="; }; cmakeFlags = [ "-DENABLE_COMPLEX_DEPS=true" - "-DENABLE_RPMMD=true" - "-DENABLE_RPMDB=true" - "-DENABLE_PUBKEY=true" - "-DENABLE_RPMDB_BYRPMHEADER=true" "-DENABLE_LZMA_COMPRESSION=true" "-DENABLE_BZIP2_COMPRESSION=true" "-DENABLE_ZSTD_COMPRESSION=true" "-DENABLE_ZCHUNK_COMPRESSION=true" "-DWITH_SYSTEM_ZCHUNK=true" + ] ++ lib.optionals withRpm [ + "-DENABLE_PUBKEY=true" + "-DENABLE_RPMDB=true" + "-DENABLE_RPMDB_BYRPMHEADER=true" + "-DENABLE_RPMMD=true" ]; nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ zlib xz bzip2 zchunk zstd expat rpm db ]; + buildInputs = [ zlib xz bzip2 zchunk zstd expat db ] + ++ lib.optional withRpm rpm; meta = with lib; { description = "A free package dependency solver"; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index df753b55b08c..91b4a42d54ed 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection sqlite libpsl glib.out diff --git a/pkgs/development/libraries/libspectrum/default.nix b/pkgs/development/libraries/libspectrum/default.nix index c373f7c24ff3..3dda20ab6128 100644 --- a/pkgs/development/libraries/libspectrum/default.nix +++ b/pkgs/development/libraries/libspectrum/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "http://fuse-emulator.sourceforge.net/libspectrum.php"; + homepage = "https://fuse-emulator.sourceforge.net/libspectrum.php"; description = "ZX Spectrum input and output support library"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix index 203f2768e37b..b7bef2973523 100644 --- a/pkgs/development/libraries/libspf2/default.nix +++ b/pkgs/development/libraries/libspf2/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }: -with lib; - stdenv.mkDerivation rec { pname = "libspf2"; version = "2.2.12"; @@ -35,7 +33,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with lib; { description = "Implementation of the Sender Policy Framework for SMTP " + "authorization (Helsinki Systems fork)"; homepage = "https://github.com/helsinki-systems/libspf2"; diff --git a/pkgs/development/libraries/libspnav/default.nix b/pkgs/development/libraries/libspnav/default.nix index f6908aa3314f..d67b12a726b4 100644 --- a/pkgs/development/libraries/libspnav/default.nix +++ b/pkgs/development/libraries/libspnav/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://spacenav.sourceforge.net/"; + homepage = "https://spacenav.sourceforge.net/"; description = "Device driver and SDK for 3Dconnexion 3D input devices"; longDescription = "A free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libspng/default.nix b/pkgs/development/libraries/libspng/default.nix index 077b414a665d..3925c8fb53d4 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.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "randy408"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GgrTWC/cesDlEh2J6StCyKiLRk62xfy2+E4lnmJMLGs="; + sha256 = "sha256-t5qVhRxepl1rOQk/F5GhcvU1nk9oGb+kWXmybP+iAfY="; }; doCheck = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - checkInputs = [ + nativeCheckInputs = [ cmake libpng ]; diff --git a/pkgs/development/libraries/libsv/default.nix b/pkgs/development/libraries/libsv/default.nix new file mode 100644 index 000000000000..fb319bf30f34 --- /dev/null +++ b/pkgs/development/libraries/libsv/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "libsv"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "uael"; + repo = "sv"; + rev = "v${version}"; + sha256 = "sha256-icvGQi6FNSZXNGs2oLiUKu6rrVsWcXh1r91kycGjnwY="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Public domain cross-platform semantic versioning in C99"; + homepage = "https://github.com/uael/sv"; + license = licenses.unlicense; + maintainers = with maintainers; [ candyc1oud ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix index ce7cb6bfd1ee..47ca65e8490e 100644 --- a/pkgs/development/libraries/libtap/default.nix +++ b/pkgs/development/libraries/libtap/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, cmake, perl }: -with lib; stdenv.mkDerivation rec { pname = "libtap"; diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix index 3e5b4cd23e9d..c6c89ecb4f08 100644 --- a/pkgs/development/libraries/libtar/default.nix +++ b/pkgs/development/libraries/libtar/default.nix @@ -18,10 +18,24 @@ stdenv.mkDerivation rec { inherit sha256; }; in [ - (fp "no_static_buffers" "0yv90bhvqjj0v650gzn8fbzhdhzx5z0r1lh5h9nv39wnww435bd0") + (fetchpatch { + name = "no_static_buffers.patch"; + url = "https://src.fedoraproject.org/rpms/libtar/raw/e25b692fc7ceaa387dafb865b472510754f51bd2/f/libtar-1.2.20-no-static-buffer.patch"; + sha256 = "sha256-QcWOgdkNlALb+YDVneT1zCNAMf4d8IUm2kUUUy2VvJs="; + }) (fp "no_maxpathlen" "11riv231wpbdb1cm4nbdwdsik97wny5sxcwdgknqbp61ibk572b7") (fp "CVE-2013-4420" "0d010190bqgr2ggy02qwxvjaymy9a22jmyfwdfh4086v876cbxpq") (fp "th_get_size-unsigned-int" "1ravbs5yrfac98mnkrzciw9hd2fxq4dc07xl3wx8y2pv1bzkwm41") + (fetchpatch { + name = "CVE-2021-33643_CVE-2021-33644.patch"; + url = "https://src.fedoraproject.org/rpms/libtar/raw/e25b692fc7ceaa387dafb865b472510754f51bd2/f/libtar-1.2.20-CVE-2021-33643-CVE-2021-33644.patch"; + sha256 = "sha256-HdjotTvKJNntkdcV+kR08Ht/MyNeB6qUT0qo67BBOVA="; + }) + (fetchpatch { + name = "CVE-2021-33645_CVE-2021-33646_CVE-2021-33640.patch"; + url = "https://src.fedoraproject.org/rpms/libtar/raw/e25b692fc7ceaa387dafb865b472510754f51bd2/f/libtar-1.2.20-CVE-2021-33645-CVE-2021-33646.patch"; + sha256 = "sha256-p9DEFAL5Y+Ldy5c9Wj9h/BSg4TDxIxCjCQJD+wGQ7oI="; + }) ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 1e88218aa0d4..0e0030558dba 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { }) ]; + configureFlags = [ "--disable-examples" ]; + outputs = [ "out" "dev" "devdoc" ]; outputDoc = "devdoc"; diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix index 8e94275babfd..05aff273400e 100644 --- a/pkgs/development/libraries/libthreadar/default.nix +++ b/pkgs/development/libraries/libthreadar/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://libthreadar.sourceforge.net/"; + homepage = "https://libthreadar.sourceforge.net/"; description = "A C++ library that provides several classes to manipulate threads"; longDescription = '' Libthreadar is a C++ library providing a small set of C++ classes to manipulate diff --git a/pkgs/development/libraries/libticables2/default.nix b/pkgs/development/libraries/libticables2/default.nix index f22d7b796e15..d3f2e86a964f 100644 --- a/pkgs/development/libraries/libticables2/default.nix +++ b/pkgs/development/libraries/libticables2/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , pkg-config , autoreconfHook , glib @@ -15,6 +16,15 @@ stdenv.mkDerivation rec { sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc"; }; + patches = [ + (fetchpatch { + name = "add-support-for-aarch64-macos-target-triple.patch"; + url = "https://github.com/debrouxl/tilibs/commit/ef41c51363b11521460f33e8c332db7b0a9ca085.patch"; + stripLen = 2; + sha256 = "sha256-oTR1ACEZI0fjErpnFXTCnfLT1mo10Ypy0q0D8NOPNsM="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 82f3b97f6f05..892ed71583d3 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,9 +1,10 @@ { lib, stdenv -, fetchurl -, fetchpatch +, fetchFromGitLab +, nix-update-script , autoreconfHook , pkg-config +, sphinx , libdeflate , libjpeg @@ -18,16 +19,17 @@ , gdal , openimageio , freeimage -, imlib }: stdenv.mkDerivation rec { pname = "libtiff"; - version = "4.4.0"; + version = "4.5.0"; - src = fetchurl { - url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; - sha256 = "1vdbk3sc497c58kxmp02irl6nqkfm9rjs3br7g59m59qfnrj6wli"; + src = fetchFromGitLab { + owner = "libtiff"; + repo = "libtiff"; + rev = "v${version}"; + hash = "sha256-KG6rB940JMjFUTAgtkzg+Zh75gylPY6Q7/4gEbL0Hcs="; }; patches = [ @@ -36,27 +38,6 @@ 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-34526.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/275735d0354e39c0ac1dc3c0db2120d6f31d1990.patch"; - sha256 = "sha256-faKsdJjvQwNdkAKjYm4vubvZvnULt9zz4l53zBFr67s="; - }) - (fetchpatch { - name = "CVE-2022-2953.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/48d6ece8389b01129e7d357f0985c8f938ce3da3.patch"; - sha256 = "sha256-h9hulV+dnsUt/2Rsk4C1AKdULkvweM2ypIJXYQ3BqQU="; - }) - (fetchpatch { - name = "CVE-2022-3626.CVE-2022-3627.CVE-2022-3597.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/236b7191f04c60d09ee836ae13b50f812c841047.patch"; - excludes = [ "doc/tools/tiffcrop.rst" ]; - sha256 = "sha256-L2EMmmfMM4oEYeLapO93wvNS+HlO0yXsKxijXH+Wuas="; - }) - (fetchpatch { - name = "CVE-2022-3598.CVE-2022-3570.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/cfbb883bf6ea7bedcb04177cc4e52d304522fdff.patch"; - sha256 = "sha256-SLq2+JaDEUOPZ5mY4GPB6uwhQOG5cD4qyL5o9i8CVVs="; - }) ]; postPatch = '' @@ -66,14 +47,15 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; postFixup = '' - moveToOutput include/tif_dir.h $dev_private moveToOutput include/tif_config.h $dev_private + moveToOutput include/tif_dir.h $dev_private + moveToOutput include/tif_hash_set.h $dev_private moveToOutput include/tiffiop.h $dev_private ''; # If you want to change to a different build system, please make # sure cross-compilation works first! - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config sphinx ]; propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection) @@ -83,9 +65,12 @@ stdenv.mkDerivation rec { doCheck = true; - passthru.tests = { - inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage imlib; - inherit (python3Packages) pillow imread; + passthru = { + tests = { + inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage; + inherit (python3Packages) pillow imread; + }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/development/libraries/libtiff/headers.patch b/pkgs/development/libraries/libtiff/headers.patch index e1c681502b33..e0ef9f3478a6 100644 --- a/pkgs/development/libraries/libtiff/headers.patch +++ b/pkgs/development/libraries/libtiff/headers.patch @@ -2,15 +2,16 @@ diff --git i/libtiff/Makefile.am w/libtiff/Makefile.am index 44522b62..d66e5948 100644 --- i/libtiff/Makefile.am +++ w/libtiff/Makefile.am -@@ -36,8 +36,11 @@ EXTRA_DIST = \ +@@ -36,8 +36,12 @@ EXTRA_DIST = \ tiffconf.h.cmake.in - + libtiffinclude_HEADERS = \ + tif_config.h \ + tif_dir.h \ ++ tif_hash_set.h \ tiff.h \ tiffio.h \ + tiffiop.h \ tiffvers.h - + if HAVE_CXX diff --git a/pkgs/development/libraries/libtiff/rename-version.patch b/pkgs/development/libraries/libtiff/rename-version.patch index 30601c0f04ee..ddd33ad49045 100644 --- a/pkgs/development/libraries/libtiff/rename-version.patch +++ b/pkgs/development/libraries/libtiff/rename-version.patch @@ -6,15 +6,15 @@ TODO \ - VERSION + VERSION.txt - + EXTRA_DIST = \ cmake \ -@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test man html - +@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test doc + release: - (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) + (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) - (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) + (rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) - (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) - + (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) + pkgconfigdir = $(libdir)/pkgconfig diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index 936c92bf7c5d..929e62ca2b89 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool libtommath ]; postPatch = '' - substituteInPlace makefile.shared --replace "LT:=glibtool" "LT:=libtool" + substituteInPlace makefile.shared --replace "LIBTOOL:=glibtool" "LIBTOOL:=libtool" ''; preBuild = '' @@ -36,9 +36,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "https://www.libtom.net/LibTomCrypt/"; description = "A fairly comprehensive, modular and portable cryptographic toolkit"; + homepage = "https://www.libtom.net/LibTomCrypt/"; + changelog = "https://github.com/libtom/libtomcrypt/raw/v${version}/changes"; license = with licenses; [ publicDomain wtfpl ]; - platforms = platforms.linux; + maintainers = with maintainers; [ ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index 058ae5242315..827e78c81971 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { makefile = "makefile.shared"; + NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-DTARGET_OS_IPHONE=0"; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index d4812c6f0823..5efd3a5c3c7a 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -49,7 +49,6 @@ in stdenv.mkDerivation { ]; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://libtorrent.org/"; description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 65a68ffc08cd..59bfabefce75 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; doCheck = true; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; postInstall = '' substituteInPlace $out/lib/pkgconfig/toxcore.pc \ diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 6b39995f39b9..389aa7c283f2 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uchardet"; - version = "0.0.7"; + version = "0.0.8"; outputs = [ "bin" "out" "man" "dev" ]; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "1ca51sryhryqz82v4d0graaiqqq5w2f33a9gj83b910xmq499irz"; + sha256 = "sha256-6Xpgz8AKHBR6Z0sJe7FCKr2fp4otnOPz/cwueKNKxfA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libucl/default.nix b/pkgs/development/libraries/libucl/default.nix index e65d0d475ff9..9ba96644102e 100644 --- a/pkgs/development/libraries/libucl/default.nix +++ b/pkgs/development/libraries/libucl/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "libucl"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "vstakhov"; repo = pname; rev = version; - sha256 = "1h52ldxankyhbbm1qbqz1f2q0j03c1b4mig7343bs3mc6fpm18gf"; + sha256 = "sha256-rpTc0gq8HquDow4NEkRSjyESEMrv8dAhX98yKKu/Fsk="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/development/libraries/libucontext/default.nix b/pkgs/development/libraries/libucontext/default.nix new file mode 100644 index 000000000000..1ce0e443b352 --- /dev/null +++ b/pkgs/development/libraries/libucontext/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "libucontext"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "kaniini"; + repo = pname; + rev = "v${version}"; + hash = "sha256-fk3ZKkp3dsyeF6SOWSccr5MkKEwS4AAuosD/h+6wjSw="; + }; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = with lib; { + homepage = "https://github.com/kaniini/libucontext"; + description = "ucontext implementation featuring glibc-compatible ABI"; + license = licenses.isc; + platforms = platforms.linux; + maintainers = [ maintainers.yuka ]; + }; +} diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix index 7dee1d6b1eca..f740bd82bb73 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 = "5.0"; + version = "5.1"; src = let rev_version = lib.replaceStrings ["."] ["_"] version; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "adah1972"; repo = pname; rev = "libunibreak_${rev_version}"; - sha256 = "sha256-ju+DNCzwD+y/ebLVBU96iNpE1Wt7/K0qLcZHzWGzrWQ="; + sha256 = "sha256-hjgT5DCQ6KFXKlxk9LLzxGHz6B71X/3Ot7ipK3KY85A="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index 72027b85ed43..086ca28676b3 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -3,7 +3,6 @@ , gtk-doc, docbook_xml_dtd_45, docbook_xsl , libxslt, libxml2 }: -with lib; stdenv.mkDerivation rec { majorVer = "3.0"; @@ -23,8 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://wiki.gnome.org/Attic/LibUnique"; description = "A library for writing single instance applications"; - license = licenses.lgpl21; - maintainers = [ maintainers.AndersonTorres ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.AndersonTorres ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 89ca036eeed4..6f05307381a0 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { homepage = "https://www.nongnu.org/libunwind"; description = "A portable and efficient API to determine the call-chain of a program"; maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; - badPlatforms = [ "riscv32-linux" ]; + # https://github.com/libunwind/libunwind#libunwind + platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd13" "i686-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "x86_64-freebsd13" "x86_64-linux" "x86_64-solaris" ]; license = licenses.mit; }; } diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 120b5d9c61ae..8eab8d6beeef 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-EhP9nxsLdNp94rt0M1t2CY25c4/sXTzcB8DFJPNPwDI="; }; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; preCheck = "patchShebangs tests/unit"; doCheck = true; diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index f7f1633ed446..326ee3028158 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , autoreconfHook @@ -8,6 +9,7 @@ , libobjc , IOKit , Security +, withExamples ? false , withStatic ? false }: @@ -31,12 +33,20 @@ stdenv.mkDerivation rec { dontDisableStatic = withStatic; - configureFlags = lib.optional (!enableUdev) "--disable-udev"; + configureFlags = + lib.optional (!enableUdev) "--disable-udev" + ++ lib.optional (withExamples) "--enable-examples-build"; preFixup = lib.optionalString enableUdev '' sed 's,-ludev,-L${lib.getLib udev}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; + postInstall = lib.optionalString withExamples '' + mkdir -p $out/{bin,sbin,examples/bin} + cp -r examples/.libs/* $out/examples/bin + ln -s $out/examples/bin/fxload $out/sbin/fxload + ''; + meta = with lib; { homepage = "https://libusb.info/"; description = "cross-platform user-mode USB device library"; @@ -45,6 +55,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.all; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ prusnak ]; + maintainers = with maintainers; [ prusnak realsnick ]; }; } diff --git a/pkgs/development/libraries/libutempter/default.nix b/pkgs/development/libraries/libutempter/default.nix index 3b63ef9386b3..717418e686b4 100644 --- a/pkgs/development/libraries/libutempter/default.nix +++ b/pkgs/development/libraries/libutempter/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, lib, glib }: -with lib; - stdenv.mkDerivation rec { pname = "libutempter"; version = "1.2.1"; @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { "mandir=\${out}/share/man" ]; - meta = { + meta = with lib; { homepage = "https://github.com/altlinux/libutempter"; description = "Interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files"; longDescription = '' diff --git a/pkgs/development/libraries/libva/1.nix b/pkgs/development/libraries/libva/1.nix index 5197420783a1..63be647f015a 100644 --- a/pkgs/development/libraries/libva/1.nix +++ b/pkgs/development/libraries/libva/1.nix @@ -8,6 +8,7 @@ , libdrm , libXfixes , wayland +, wayland-scanner , libffi , libGL , mesa @@ -17,6 +18,7 @@ stdenv.mkDerivation rec { pname = "libva" + lib.optionalString minimal "-minimal"; + # nixpkgs-update: no auto update version = "1.8.3"; src = fetchFromGitHub { @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config wayland-scanner ]; buildInputs = [ libdrm ] ++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ]; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 0ded7e20088e..9f958efe71b3 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -3,18 +3,24 @@ , minimal ? false, libva-minimal , libX11, libXext, libXfixes, wayland, libffi, libGL , mesa +# for passthru.tests +, intel-compute-runtime , intel-media-driver +, ffmpeg +, mpv +, vaapiIntel +, vlc }: stdenv.mkDerivation rec { pname = "libva" + lib.optionalString minimal "-minimal"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "sha256-HTwJQpDND4PjiNpUjHtTgkQdkahm2BUe71UDRQpvo6M="; + sha256 = "sha256-Vw62xgWzaaWKQWIZDYpVpOgEUQGUNToImEAo6lwiFFU="; }; outputs = [ "dev" "out" ]; @@ -31,7 +37,9 @@ stdenv.mkDerivation rec { ]; passthru.tests = { - inherit intel-media-driver; + # other drivers depending on libva and selected application users. + # Please get a confirmation from the maintainer before adding more applications. + inherit intel-compute-runtime intel-media-driver vaapiIntel mpv vlc; }; meta = with lib; { diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index ce060c66a35b..a46af497a55d 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.15.0"; + version = "2.17.1"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "sha256-oElqJqOa/Q+2NE6gZS2tJnFJfalP6HsuUduk8cbuy84="; + sha256 = "sha256-xsKOoDVt6L3L+6uBrKo/pyeHvQ4GgH312WKesT8XVLs="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/development/libraries/libvarlink/default.nix b/pkgs/development/libraries/libvarlink/default.nix index 6bd397ff0d1a..9e4b96a9d798 100644 --- a/pkgs/development/libraries/libvarlink/default.nix +++ b/pkgs/development/libraries/libvarlink/default.nix @@ -36,9 +36,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; passthru = { - updateScript = nix-update-script { - attrPath = finalAttrs.pname; - }; + updateScript = nix-update-script { }; tests = { version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix index c8af82d04917..4efe91096576 100644 --- a/pkgs/development/libraries/libversion/default.nix +++ b/pkgs/development/libraries/libversion/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "libversion"; - version = "3.0.1"; + version = "3.0.3"; src = fetchFromGitHub { owner = "repology"; repo = "libversion"; rev = version; - sha256 = "13x5djdpv6aryxsbw6a3b6vwzi9f4aa3gn9dqb7axzppggayawyk"; + hash = "sha256-REmXD0NFd7Af01EU/f2IGoTKiju6ErTI7WUinvrAzaA="; }; nativeBuildInputs = [ cmake ]; - doCheck = true; checkTarget = "test"; + doCheck = true; meta = with lib; { description = "Advanced version string comparison library"; diff --git a/pkgs/development/libraries/libverto/default.nix b/pkgs/development/libraries/libverto/default.nix new file mode 100644 index 000000000000..d161f2b92b2b --- /dev/null +++ b/pkgs/development/libraries/libverto/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, glib +, libev +, libevent +, pkg-config +, glibSupport ? true +, libevSupport ? true +, libeventSupport ? true +}: + +let + inherit (lib) optional; +in +stdenv.mkDerivation (finalAttrs: { + pname = "libverto"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "latchset"; + repo = "libverto"; + rev = finalAttrs.version; + hash = "sha256-csoJ0WdKyrza8kBSMKoaItKvcbijI6Wl8nWCbywPScQ="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = + optional glibSupport glib + ++ optional libevSupport libev + ++ optional libeventSupport libevent; + + meta = with lib; { + homepage = "https://github.com/latchset/libverto"; + description = "Asynchronous event loop abstraction library"; + longDescription = '' + Libverto exists to solve an important problem: many applications and + libraries are unable to write asynchronous code because they are unable to + pick an event loop. This is particularly true of libraries who want to be + useful to many applications who use loops that do not integrate with one + another or which use home-grown loops. libverto provides a loop-neutral + async api which allows the library to expose asynchronous interfaces and + offload the choice of the main loop to the application. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix index f7c85b292a66..733a75e5fc90 100644 --- a/pkgs/development/libraries/libvgm/default.nix +++ b/pkgs/development/libraries/libvgm/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "libvgm"; - version = "unstable-2022-08-02"; + version = "unstable-2023-01-18"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "0e349256338144205303a1495ddc788a854be1eb"; - sha256 = "FNNPiIfBUxkwgEbiFebPGn6ZIxv3ypDefcOzC6r94hE="; + rev = "c250212538dd48d3965826ad7fe669bb0f348cbd"; + sha256 = "5XHdPtadfsfzkeeOpa5NPrWarHBHeKvmr7p0m31URDc="; }; outputs = [ diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 8f84cd0eab80..566a1c1b83fa 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -5,21 +5,23 @@ , meson , ninja , pkg-config -, gobject-introspection , gettext -, gtk-doc -, docbook-xsl-nons , vala , libcap_ng , libvirt , libxml2 +, withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform +, gobject-introspection +, withDocs ? stdenv.hostPlatform == stdenv.buildPlatform +, gtk-doc +, docbook-xsl-nons }: stdenv.mkDerivation rec { pname = "libvirt-glib"; version = "4.0.0"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] ++ lib.optional withDocs "devdoc"; src = fetchurl { url = "https://libvirt.org/sources/glib/${pname}-${version}.tar.xz"; @@ -39,22 +41,35 @@ stdenv.mkDerivation rec { ninja pkg-config gettext - gtk-doc - docbook-xsl-nons vala gobject-introspection + ] ++ lib.optionals withIntrospection [ + gobject-introspection + ] ++ lib.optionals withDocs [ + gtk-doc + docbook-xsl-nons ]; - buildInputs = (lib.optionals stdenv.isLinux [ - libcap_ng - ]) ++ [ + buildInputs = [ libvirt libxml2 + ] ++ lib.optionals stdenv.isLinux [ + libcap_ng + ] ++ lib.optionals withIntrospection [ gobject-introspection ]; strictDeps = true; + # The build system won't let us build with docs or introspection + # unless we're building natively, but will still do a mandatory + # check for the dependencies for those things unless we explicitly + # disable the options. + mesonFlags = [ + (lib.mesonEnable "docs" withDocs) + (lib.mesonEnable "introspection" withIntrospection) + ]; + # https://gitlab.com/libvirt/libvirt-glib/-/issues/4 NIX_CFLAGS_COMPILE = [ "-Wno-error=pointer-sign" ]; 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 0945f21211dc..75d2ac1f0873 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 @@ -230,7 +230,7 @@ diff --git a/src/network/meson.build b/src/network/meson.build index b5eff0c3ab..a0f26d624e 100644 --- a/src/network/meson.build +++ b/src/network/meson.build -@@ -73,11 +73,11 @@ if conf.has('WITH_NETWORK') +@@ -73,11 +73,11 @@ 'in_file': files('virtnetworkd.init.in'), } virt_install_dirs += [ @@ -247,7 +247,7 @@ index b5eff0c3ab..a0f26d624e 100644 ] configure_file( -@@ -85,12 +85,12 @@ if conf.has('WITH_NETWORK') +@@ -85,12 +85,12 @@ input: 'default.xml.in', output: '@BASENAME@', copy: true, install: true, @@ -256,7 +256,7 @@ index b5eff0c3ab..a0f26d624e 100644 ) meson.add_install_script( - meson_python_prog.path(), python3_prog.path(), meson_install_symlink_prog.path(), + meson_python_prog.full_path(), python3_prog.full_path(), meson_install_symlink_prog.full_path(), - confdir / 'qemu' / 'networks' / 'autostart', + install_prefix + confdir / 'qemu' / 'networks' / 'autostart', '../default.xml', 'default.xml', @@ -305,7 +305,7 @@ diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 39f0f615cc..5f6f30f82b 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build -@@ -175,24 +175,24 @@ if conf.has('WITH_QEMU') +@@ -200,25 +200,25 @@ if conf.has('WITH_QEMU') endif virt_install_dirs += [ @@ -326,6 +326,7 @@ index 39f0f615cc..5f6f30f82b 100644 - localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', - runstatedir / 'libvirt' / 'qemu', - runstatedir / 'libvirt' / 'qemu' / 'dbus', +- runstatedir / 'libvirt' / 'qemu' / 'passt', - runstatedir / 'libvirt' / 'qemu' / 'slirp', - runstatedir / 'libvirt' / 'qemu' / 'swtpm', + install_prefix + confdir / 'qemu', @@ -345,6 +346,7 @@ index 39f0f615cc..5f6f30f82b 100644 + install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', + install_prefix + runstatedir / 'libvirt' / 'qemu', + install_prefix + runstatedir / 'libvirt' / 'qemu' / 'dbus', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'passt', + install_prefix + runstatedir / 'libvirt' / 'qemu' / 'slirp', + install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ] diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index a8f612678d04..734f96850c5d 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -42,7 +42,7 @@ , attr ? null , audit ? null , dmidecode ? null -, fuse ? null +, fuse3 ? null , kmod ? null , libapparmor ? null , libcap_ng ? null @@ -77,13 +77,11 @@ , zfs }: -with lib; - let inherit (stdenv) isDarwin isLinux isx86_64; - binPath = makeBinPath ([ + binPath = lib.makeBinPath ([ dnsmasq - ] ++ optionals isLinux [ + ] ++ lib.optionals isLinux [ bridge-utils dmidecode dnsmasq @@ -95,10 +93,10 @@ let numad pmutils systemd - ] ++ optionals enableIscsi [ + ] ++ lib.optionals enableIscsi [ libiscsi openiscsi - ] ++ optionals enableZfs [ + ] ++ lib.optionals enableZfs [ zfs ]); in @@ -114,13 +112,13 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # # SysVirt in - version = "8.8.0"; + version = "9.0.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-p7z+paiSeIm2cWnc6n9Hrd++BDmccGj+EOhqHNsJiXw="; + sha256 = "sha256-YnkgTl6C3QkvMBGm95JgWmWaP4mAECe9B0wwjOx94p8="; fetchSubmodules = true; }; @@ -148,17 +146,17 @@ stdenv.mkDerivation rec { substituteInPlace meson.build \ --replace "'dbus-daemon'," "'${lib.getBin dbus}/bin/dbus-daemon'," - '' + optionalString isLinux '' + '' + lib.optionalString isLinux '' sed -i 's,define PARTED "parted",define PARTED "${parted}/bin/parted",' \ src/storage/storage_backend_disk.c \ src/storage/storage_util.c - '' + optionalString isDarwin '' + '' + lib.optionalString isDarwin '' sed -i '/qemucapabilitiestest/d' tests/meson.build sed -i '/vircryptotest/d' tests/meson.build sed -i '/domaincapstest/d' tests/meson.build sed -i '/qemufirmwaretest/d' tests/meson.build sed -i '/qemuvhostusertest/d' tests/meson.build - '' + optionalString (isDarwin && isx86_64) '' + '' + lib.optionalString (isDarwin && isx86_64) '' sed -i '/qemucaps2xmltest/d' tests/meson.build sed -i '/qemuhotplugtest/d' tests/meson.build sed -i '/virnetdaemontest/d' tests/meson.build @@ -178,9 +176,9 @@ stdenv.mkDerivation rec { perl perlPackages.XMLXPath ] - ++ optional (!isDarwin) rpcsvc-proto + ++ lib.optional (!isDarwin) rpcsvc-proto # NOTE: needed for rpcgen - ++ optional isDarwin darwin.developer_cmds; + ++ lib.optional isDarwin darwin.developer_cmds; buildInputs = [ bash @@ -197,11 +195,11 @@ stdenv.mkDerivation rec { readline xhtml1 yajl - ] ++ optionals isLinux [ + ] ++ lib.optionals isLinux [ acl attr audit - fuse + fuse3 libapparmor libcap_ng libnl @@ -213,17 +211,17 @@ stdenv.mkDerivation rec { parted systemd util-linux - ] ++ optionals isDarwin [ + ] ++ lib.optionals isDarwin [ AppKit Carbon gmp libiconv ] - ++ optionals enableCeph [ ceph ] - ++ optionals enableGlusterfs [ glusterfs ] - ++ optionals enableIscsi [ libiscsi openiscsi ] - ++ optionals enableXen [ xen ] - ++ optionals enableZfs [ zfs ]; + ++ lib.optionals enableCeph [ ceph ] + ++ lib.optionals enableGlusterfs [ glusterfs ] + ++ lib.optionals enableIscsi [ libiscsi openiscsi ] + ++ lib.optionals enableXen [ xen ] + ++ lib.optionals enableZfs [ zfs ]; preConfigure = let @@ -341,13 +339,14 @@ stdenv.mkDerivation rec { 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 'PARALLEL_SHUTDOWN=0' 'PARALLEL_SHUTDOWN=''${PARALLEL_SHUTDOWN:-0}' \ --replace "$out/bin" '${gettext}/bin' \ --replace 'lock/subsys' 'lock' \ --replace 'gettext.sh' 'gettext.sh # Added in nixpkgs: gettext() { "${gettext}/bin/gettext" "$@"; } ' - '' + optionalString isLinux '' + '' + lib.optionalString isLinux '' for f in $out/lib/systemd/system/*.service ; do substituteInPlace $f --replace /bin/kill ${coreutils}/bin/kill done @@ -371,9 +370,10 @@ stdenv.mkDerivation rec { passthru.tests.libvirtd = nixosTests.libvirtd; - meta = { - homepage = "https://libvirt.org/"; + meta = with lib; { description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux and other OSes"; + homepage = "https://libvirt.org/"; + changelog = "https://gitlab.com/libvirt/libvirt/-/raw/v${version}/NEWS.rst"; license = licenses.lgpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ fpletz globin lovesegfault ]; diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index 36fd026eeedd..cbcba106b83d 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -10,8 +10,6 @@ libvirt, xenSupport ? true }: -with lib; - stdenv.mkDerivation rec { pname = "libvmi"; version = "0.12.0"; @@ -24,16 +22,16 @@ stdenv.mkDerivation rec { sha256 = "0wbi2nasb1gbci6cq23g6kq7i10rwi1y7r44rl03icr5prqjpdyv"; }; - buildInputs = [ glib libvirt json_c ] ++ (optional xenSupport xen); + buildInputs = [ glib libvirt json_c ] ++ (lib.optional xenSupport xen); nativeBuildInputs = [ autoreconfHook bison flex pkg-config ]; - configureFlags = optional (!xenSupport) "--disable-xen"; + configureFlags = lib.optional (!xenSupport) "--disable-xen"; # libvmi uses dlopen() for the xen libraries, however autoPatchelfHook doesn't work here - postFixup = optionalString xenSupport '' + postFixup = lib.optionalString xenSupport '' libvmi="$out/lib/libvmi.so.${libVersion}" oldrpath=$(patchelf --print-rpath "$libvmi") - patchelf --set-rpath "$oldrpath:${makeLibraryPath [ xen ]}" "$libvmi" + patchelf --set-rpath "$oldrpath:${lib.makeLibraryPath [ xen ]}" "$libvmi" ''; meta = with lib; { diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index c111a81b0ccb..7f3f945d6fde 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "libvncserver"; - version = "0.9.13"; + version = "0.9.14"; outputs = [ "out" "dev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "LibVNC"; repo = "libvncserver"; rev = "LibVNCServer-${version}"; - sha256 = "sha256-gQT/M2u4nWQ0MfO2gWAqY0ZJc7V9eGczGzcsxKmG4H8="; + sha256 = "sha256-kqVZeCTp+Z6BtB6nzkwmtkJ4wtmjlSQBg05lD02cVvQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index d78a08852521..d82bf42bef61 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -41,6 +41,25 @@ let inherit (stdenv) is64bit isMips isDarwin isCygwin; inherit (lib) enableFeature optional optionals; + + # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) + # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure + # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 + darwinVersion = + /**/ if stdenv.hostPlatform.osxMinVersion == "10.10" then "14" + else if stdenv.hostPlatform.osxMinVersion == "10.9" then "13" + else if stdenv.hostPlatform.osxMinVersion == "10.8" then "12" + else if stdenv.hostPlatform.osxMinVersion == "10.7" then "11" + else if stdenv.hostPlatform.osxMinVersion == "10.6" then "10" + else if stdenv.hostPlatform.osxMinVersion == "10.5" then "9" + else "8"; + + kernel = + # Build system doesn't understand BSD, so pretend to be Linux. + /**/ if stdenv.isBSD then "linux" + else if stdenv.isDarwin then "darwin${darwinVersion}" + else stdenv.hostPlatform.parsed.kernel.name; + in assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; @@ -144,20 +163,8 @@ stdenv.mkDerivation rec { (enableFeature (experimentalSpatialSvcSupport || experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) "experimental") - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) - # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure - # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 - "--force-target=${stdenv.hostPlatform.parsed.cpu.name}-${stdenv.hostPlatform.parsed.kernel.name}${ - if stdenv.hostPlatform.isDarwin then - if stdenv.hostPlatform.osxMinVersion == "10.10" then "14" - else if stdenv.hostPlatform.osxMinVersion == "10.9" then "13" - else if stdenv.hostPlatform.osxMinVersion == "10.8" then "12" - else if stdenv.hostPlatform.osxMinVersion == "10.7" then "11" - else if stdenv.hostPlatform.osxMinVersion == "10.6" then "10" - else if stdenv.hostPlatform.osxMinVersion == "10.5" then "9" - else "8" - else ""}-gcc" + ] ++ optionals (stdenv.isBSD || stdenv.hostPlatform != stdenv.buildPlatform) [ + "--force-target=${stdenv.hostPlatform.parsed.cpu.name}-${kernel}-gcc" (if stdenv.hostPlatform.isCygwin then "--enable-static-msvcrt" else "") ] # Experimental features ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix index 1f1973b10274..ca16063cca6b 100644 --- a/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/pkgs/development/libraries/libvterm-neovim/default.nix @@ -17,8 +17,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl libtool ]; - makeFlags = [ "PREFIX=$(out)" ] - ++ lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "LIBTOOL=${libtool}/bin/libtool" + "PREFIX=$(out)" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix index 066dcb4f34f4..f1e217f2b3e5 100644 --- a/pkgs/development/libraries/libvterm/default.nix +++ b/pkgs/development/libraries/libvterm/default.nix @@ -9,17 +9,26 @@ stdenv.mkDerivation rec { sha256 = "10gaqygmmwp0cwk3j8qflri5caf8vl3f7pwfl2svw5whv8wkn0k2"; }; - patchPhase = '' - sed -i -e s@/usr@$out@ -e /ldconfig/d Makefile + preInstall = '' + mkdir -p $out/include $out/lib ''; - preInstall = '' - mkdir -p $out/include - mkdir -p $out/lib + postPatch = '' + substituteInPlace Makefile \ + --replace "gcc" "${stdenv.cc.targetPrefix}cc" \ + --replace "ldconfig" "" \ + --replace "/usr" "$out" + + makeFlagsArray+=("PKG_CFG=`${stdenv.cc.targetPrefix}pkg-config --cflags glib-2.0`") ''; + # For headers + propagatedBuildInputs = [ glib ]; + + strictDeps = true; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib ncurses ]; + buildInputs = [ ncurses ]; meta = with lib; { homepage = "http://libvterm.sourceforge.net/"; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 13ad9eb29c2e..dff7abc7dd53 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "libwebp"; - version = "1.2.4"; + version = "1.3.0"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - hash = "sha256-XX6qOWlIl8TqOQMiGpmmDVKwQnM1taG6lrqq1ZFVk5s="; + hash = "sha256-nhXkq+qKpaa75YQB/W/cRozslTIFPdXeqj1y6emQeHk="; }; configureFlags = [ diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 0b8d8d8e5817..a535763b8c19 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { hash = "sha256-why8LAcc4XN0JdTJ1JoNWijKENL5mOHBsi9K4wpYr2c="; }; + outputs = [ "out" "dev" ]; + buildInputs = [ openssl zlib libuv ]; nativeBuildInputs = [ cmake ]; @@ -31,10 +33,23 @@ stdenv.mkDerivation rec { "-DDISABLE_WERROR=ON" "-DLWS_BUILD_HASH=no_hash" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON" - ++ lib.optional withExternalPoll "-DLWS_WITH_EXTERNAL_POLL=ON"; + ++ lib.optional withExternalPoll "-DLWS_WITH_EXTERNAL_POLL=ON" + ++ ( + if stdenv.hostPlatform.isStatic then + [ "-DLWS_WITH_SHARED=OFF" ] + else + [ "-DLWS_WITH_STATIC=OFF" "-DLWS_LINK_TESTAPPS_DYNAMIC=ON" ] + ); postInstall = '' - rm -r ${placeholder "out"}/share/libwebsockets-test-server + # Fix path that will be incorrect on move to "dev" output. + substituteInPlace "$out/lib/cmake/libwebsockets/LibwebsocketsTargets-release.cmake" \ + --replace "\''${_IMPORT_PREFIX}" "$out" + + # The package builds a few test programs that are not usually necessary. + # Move those to the dev output. + moveToOutput "bin/libwebsockets-test-*" "$dev" + moveToOutput "share/libwebsockets-test-*" "$dev" ''; # $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index e955fee57207..e6d598b54bac 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "WMF library from wvWare"; - homepage = "http://wvware.sourceforge.net/libwmf.html"; + homepage = "https://wvware.sourceforge.net/libwmf.html"; downloadPage = "https://github.com/caolanm/libwmf/releases"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index 1f54c2c2fb1a..47755e18e223 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library for importing and exporting WordPerfect documents"; - homepage = "http://libwpd.sourceforge.net/"; + homepage = "https://libwpd.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 7dd7153bae9f..597370ad0e57 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; meta = with lib; { - homepage = "http://libwps.sourceforge.net/"; + homepage = "https://libwps.sourceforge.net/"; description = "Microsoft Works document format import filter library"; platforms = platforms.unix; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index 1706653c7131..c8cbf8aa6c10 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 = "6.0.0"; + version = "6.1.0"; src = fetchFromGitLab { owner = "libxc"; repo = "libxc"; rev = version; - hash = "sha256-g1BjqzSVauDrzxIqqU2kLl6RFs6/oe2VthtndbnJQCc="; + hash = "sha256-PqKqZbL9Y7lKu7tKo+DfAhoEeFSsYWEcwiFX41VhRIs="; }; nativeBuildInputs = [ perl cmake gfortran ]; diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index 8fe6a7ee0a99..86bb12ee3d1f 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libxcrypt"; - version = "4.4.30"; + version = "4.4.33"; src = fetchurl { url = "https://github.com/besser82/libxcrypt/releases/download/v${version}/libxcrypt-${version}.tar.xz"; - sha256 = "sha256-s2Z/C6hdqtavJGukCQ++UxY62TyLaioSV9IqeLt87ro="; + hash = "sha256-6HrPnGUsVzpHE9VYIVn5jzBdVu1fdUzmT1fUGU1rOm8="; }; outputs = [ diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index ca7feb996f7e..ed936a9d0377 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.4.1"; + version = "1.5.0"; src = fetchurl { url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; - sha256 = "0fbb2dyjvf71p42y2jmwdcylsvj03w52f5rb23c2d00rwahhfg4l"; + sha256 = "sha256-Vg8RxLu8oQ9JXz7306aqTKYrT4+wtS59RZ0Yom5G4Bc="; }; outputs = [ "out" "dev" "doc" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ++ lib.optional withWaylandTools wayland-scanner; buildInputs = [ xkeyboard_config libxcb libxml2 ] ++ lib.optionals withWaylandTools [ wayland wayland-protocols ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; mesonFlags = [ "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb" diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index cdce45e11fe4..3fa295279f0c 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl +{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl , glib, isocodes, gobject-introspection , withDoc ? (stdenv.buildPlatform == stdenv.hostPlatform) }: @@ -13,7 +13,14 @@ stdenv.mkDerivation rec { sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a"; }; - patches = [ ./honor-XKB_CONFIG_ROOT.patch ]; + patches = [ + ./honor-XKB_CONFIG_ROOT.patch + ] ++ lib.optionals stdenv.isDarwin [ + (fetchpatch { + url = "https://gitlab.freedesktop.org/archived-projects/libxklavier/-/commit/1387c21a788ec1ea203c8392ea1460fc29d83f70.patch"; + sha256 = "sha256-fyWu7sVfDv/ozjhLSLCVsv+iNFawWgJqHUsQHHSkQn4="; + }) + ]; outputs = [ "out" "dev" ] ++ lib.optionals withDoc [ "devdoc" ]; @@ -38,6 +45,6 @@ stdenv.mkDerivation rec { description = "Library providing high-level API for X Keyboard Extension known as XKB"; homepage = "http://freedesktop.org/wiki/Software/LibXklavier"; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index a2f506de0133..5d9b50e7251c 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , minizip , python3 , zlib @@ -9,23 +8,15 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "sha256-Ef1CipwUEJW/VYx/q98lN0PSxj8c3DbIuql8qU6mTRs="; + hash = "sha256-fC03LwZIUkEsAs9TN0n2z0iSOGPAtVCeuW5rxC7Ek7Q="; }; - patches = [ - # https://github.com/jmcnamara/libxlsxwriter/pull/357 - (fetchpatch { - url = "https://github.com/jmcnamara/libxlsxwriter/commit/723629976ede5e6ec9b03ef970381fed06ef95f0.patch"; - sha256 = "14aw698b5svvbhvadc2vr71isck3k02zdv8xjsa7c33n8331h20g"; - }) - ]; - nativeBuildInputs = [ python3.pkgs.pytest ]; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 16c29647a7c4..717ef7c70bde 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://libxmlplusplus.sourceforge.net/"; + homepage = "https://libxmlplusplus.sourceforge.net/"; description = "C++ wrapper for the libxml2 XML parser library"; license = licenses.lgpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index b3ff59ad41e1..02c990ae3547 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://libxmlplusplus.sourceforge.net/"; + homepage = "https://libxmlplusplus.sourceforge.net/"; description = "C++ wrapper for the libxml2 XML parser library, version 3"; license = licenses.lgpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix index 47dfcab5a499..7fc14677ed7f 100644 --- a/pkgs/development/libraries/libxmp/default.nix +++ b/pkgs/development/libraries/libxmp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Extended module player library"; - homepage = "http://xmp.sourceforge.net/"; + homepage = "https://xmp.sourceforge.net/"; longDescription = '' Libxmp is a library that renders module files to PCM data. It supports over 90 mainstream and obscure module formats including Protracker (MOD), diff --git a/pkgs/development/libraries/libyaml-cpp/0.3.0.nix b/pkgs/development/libraries/libyaml-cpp/0.3.0.nix deleted file mode 100644 index e379c3472679..000000000000 --- a/pkgs/development/libraries/libyaml-cpp/0.3.0.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "libyaml-cpp"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "jbeder"; - repo = "yaml-cpp"; - rev = "release-${version}"; - sha256 = "sha256-pmgcULTXhl83+Wc8ZsGebnJ1t0XybHhUEJxDnEZE5x8="; - }; - - # implement https://github.com/jbeder/yaml-cpp/commit/52a1378e48e15d42a0b755af7146394c6eff998c - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'option(YAML_BUILD_SHARED_LIBS "Build Shared Libraries" OFF)' \ - 'option(YAML_BUILD_SHARED_LIBS "Build yaml-cpp shared library" ''${BUILD_SHARED_LIBS})' - ''; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "A YAML parser and emitter for C++"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix deleted file mode 100644 index 9b30ce19b1d8..000000000000 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "libyaml-cpp"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "jbeder"; - repo = "yaml-cpp"; - rev = "yaml-cpp-${version}"; - sha256 = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk="; - }; - - patches = [ - # https://github.com/jbeder/yaml-cpp/issues/774 - # https://github.com/jbeder/yaml-cpp/pull/1037 - (fetchpatch { - url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch"; - sha256 = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM="; - }) - # TODO: Remove with the next release, when https://github.com/jbeder/yaml-cpp/pull/1058 is available - (fetchpatch { - name = "libyaml-cpp-Fix-pc-paths-for-absolute-GNUInstallDirs.patchj"; - url = "https://github.com/jbeder/yaml-cpp/commit/328d2d85e833be7cb5a0ab246cc3f5d7e16fc67a.patch"; - sha256 = "12g5h7lxzd5v16ykay03zww5g28j3k69k228yr3v8fnmyv2spkfl"; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "A YAML parser and emitter for C++"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/libraries/libyang/default.nix b/pkgs/development/libraries/libyang/default.nix index 2bf595aae1ba..fa7d125f91b4 100644 --- a/pkgs/development/libraries/libyang/default.nix +++ b/pkgs/development/libraries/libyang/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libyang"; - version = "2.1.4"; + version = "2.1.30"; src = fetchFromGitHub { owner = "CESNET"; repo = "libyang"; rev = "v${version}"; - sha256 = "sha256-qmJHCADFqxjnxdDYxGmgZId3pxxgB8kw2UGBwYGauOc="; + sha256 = "sha256-EtAm6VbxTDNOEna5zCnGW23CPWlAxe4LpWwXmLPvo/Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix index f34834ae3166..a4f358fa546b 100644 --- a/pkgs/development/libraries/libytnef/default.nix +++ b/pkgs/development/libraries/libytnef/default.nix @@ -1,7 +1,5 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook }: -with lib; - stdenv.mkDerivation rec { pname = "libytnef"; version = "2.0"; @@ -15,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = { + meta = with lib; { inherit (src.meta) homepage; description = "Yeraze's TNEF Stream Reader - for winmail.dat files"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libyuv/default.nix b/pkgs/development/libraries/libyuv/default.nix index d0d692ed9815..f4415b51f810 100644 --- a/pkgs/development/libraries/libyuv/default.nix +++ b/pkgs/development/libraries/libyuv/default.nix @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg ]; - NIX_CFLAGS_LINK = lib.optional stdenv.isDarwin "-ljpeg"; + patches = [ + ./link-library-against-libjpeg.patch + ]; meta = with lib; { homepage = "https://chromium.googlesource.com/libyuv/libyuv"; diff --git a/pkgs/development/libraries/libyuv/link-library-against-libjpeg.patch b/pkgs/development/libraries/libyuv/link-library-against-libjpeg.patch new file mode 100644 index 000000000000..d0f3d2968462 --- /dev/null +++ b/pkgs/development/libraries/libyuv/link-library-against-libjpeg.patch @@ -0,0 +1,11 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 636531ee..af1b0e4e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,6 +39,7 @@ INCLUDE ( FindJPEG ) + if (JPEG_FOUND) + include_directories( ${JPEG_INCLUDE_DIR} ) + target_link_libraries( yuvconvert ${JPEG_LIBRARY} ) ++ target_link_libraries( ${ly_lib_shared} ${JPEG_LIBRARY} ) + add_definitions( -DHAVE_JPEG ) + endif() diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index 986f27e27c89..cfd4d38ac574 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "3.2.2"; + version = "3.2.3"; pname = "libzdb"; src = fetchurl { url = "https://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; - sha256 = "1blmy7228649iscwlldrc1ldf31nhps1ps9xfv44ms0yxqhlw7nm"; + sha256 = "sha256-oZV4Jvq3clSE/Ft0eApqfQ2Lf14uVNJuEGs5ngqGvrA="; }; buildInputs = [ sqlite ]; diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index 1c7aa8c54b72..a0c99457d47b 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.39"; + version = "0.4.40"; pname = "libzen"; src = fetchurl { url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; - sha256 = "1rwaxmid9iv65n0y6xlcyxxydsvihjni9ldxpg6pbqz43amp49xx"; + sha256 = "sha256-VUPixFIUudnwuk9D3uYdApbh/58UJ+1sh53dG2K59p4="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libzim/default.nix b/pkgs/development/libraries/libzim/default.nix index 0296c6a5a564..1787af0a4014 100644 --- a/pkgs/development/libraries/libzim/default.nix +++ b/pkgs/development/libraries/libzim/default.nix @@ -5,43 +5,54 @@ , meson , ninja , pkg-config +, python3 +, xapian , xz , zstd }: stdenv.mkDerivation rec { pname = "libzim"; - version = "8.0.1"; + version = "8.1.0"; src = fetchFromGitHub { owner = "openzim"; repo = pname; - rev = version; - sha256 = "sha256-IehJe+25aDuMbOuC3Hwnkip2djqlTSIs51yZ/zw1L9Y="; + rev = "refs/tags/${version}"; + hash = "sha256-ab7UUF+I0/xaGChvdjylEQRHLOjmtg/wk+/JEGehGLE="; }; nativeBuildInputs = [ ninja meson pkg-config + python3 ]; buildInputs = [ icu - xz zstd ]; + propagatedBuildInputs = [ + xapian + xz + ]; + + postPatch = '' + patchShebangs scripts + ''; + mesonFlags = [ # Tests are located at https://github.com/openzim/zim-testing-suite # "...some tests need up to 16GB of memory..." "-Dtest_data_dir=none" - "-Dwith_xapian=false" ]; meta = with lib; { description = "Reference implementation of the ZIM specification"; homepage = "https://github.com/openzim/libzim"; + changelog = "https://github.com/openzim/libzim/releases/tag/${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 5f8c71fa6aa3..8398c80d50f3 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -1,32 +1,34 @@ -{ lib, stdenv, fetchurl, libopcodes }: - -with lib; -stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchurl +, libopcodes +}: +stdenv.mkDerivation (finalAttrs: { pname = "lightning"; - version = "2.1.3"; + version = "2.2.0"; src = fetchurl { - url = "mirror://gnu/lightning/${pname}-${version}.tar.gz"; - sha256 = "1jgxbq2cm51dzi3zhz38mmgwdcgs328mfl8iviw8dxn6dn36p1gd"; + url = "mirror://gnu/lightning/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + hash = "sha256-TjmE/xzPC6MKmFIR1A/FwGsl8BTr3z2A0P49DIDdfA4="; }; - checkInputs = [ libopcodes ]; + nativeCheckInputs = [ libopcodes ]; doCheck = true; - meta = { + meta = with lib; { homepage = "https://www.gnu.org/software/lightning/"; description = "Run-time code generation library"; longDescription = '' - GNU lightning is a library that generates assembly language code - at run-time; it is very fast, making it ideal for Just-In-Time - compilers, and it abstracts over the target CPU, as it exposes - to the clients a standardized RISC instruction set inspired by - the MIPS and SPARC chips. + GNU lightning is a library that generates assembly language code at + run-time; it is very fast, making it ideal for Just-In-Time compilers, and + it abstracts over the target CPU, as it exposes to the clients a + standardized RISC instruction set inspired by the MIPS and SPARC chips. ''; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; license = licenses.lgpl3Plus; - platforms = lib.platforms.all; + platforms = platforms.unix; + broken = stdenv.isDarwin; # failing tests }; -} +}) diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index 55d3bcdd511a..dc679b4ba549 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "lime"; - version = "5.1.61"; + version = "5.2.6"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-cgc3123UvOzasBp/ImzXjt1JCkdqwPLnnk0PiStVcB8="; + sha256 = "sha256-WQ6AcJpQSvWR5m2edVNji5u6ZiS4QOH45vQN2q+39NU="; }; buildInputs = [ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "End-to-end encryption library for instant messaging. Part of the Linphone project."; - homepage = "http://www.linphone.org/technical-corner/lime"; + homepage = "https://www.linphone.org/technical-corner/lime"; license = licenses.gpl3Only; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index 29fa134ba69d..094800fcc00e 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "liquid-dsp"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "jgaeddert"; repo = "liquid-dsp"; rev = "v${version}"; - sha256 = "0mr86z37yycrqwbrmsiayi1vqrgpjq0pn1c3p1qrngipkw45jnn0"; + sha256 = "sha256-EvCxBwzpi3riSBhlHr6MmIUYKTCp02y5gz7pDJCEC1Q="; }; configureFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ]; diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index f6b9e1d9dbdb..1e1ec46739eb 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -22,11 +22,11 @@ let in stdenv.mkDerivation rec { pname = "lirc"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { url = "mirror://sourceforge/lirc/${pname}-${version}.tar.bz2"; - sha256 = "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb"; + sha256 = "sha256-PUTsgnSIHPJi8WCAVkHwgn/8wgreDYXn5vO5Dg09Iio="; }; patches = [ @@ -66,9 +66,7 @@ stdenv.mkDerivation rec { strictDeps = true; - nativeBuildInputs = [ autoreconfHook help2man libxslt pythonEnv ]; - - depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook help2man libxslt pythonEnv pkg-config ]; buildInputs = [ alsa-lib systemd libusb-compat-0_1 libftdi1 libICE libSM libX11 ]; diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 6b5f6410d54f..1e6311692a05 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "live555"; - version = "2022.07.14"; + version = "2023.01.19"; src = fetchurl { urls = [ @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" ]; - sha256 = "sha256-VrWkBmLdP0MYfiFit3Mtkv7Ti8dWPmrndrbKo+BpRCA="; + sha256 = "sha256-p8ZJE/f3AHxf3CnqgR48p4HyYicbPkKv3UvBBB2G+pk="; }; nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix index f7a10d9c31d3..18ef21f26a2e 100644 --- a/pkgs/development/libraries/log4cpp/default.nix +++ b/pkgs/development/libraries/log4cpp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://log4cpp.sourceforge.net/"; + homepage = "https://log4cpp.sourceforge.net/"; description = "A logging framework for C++ patterned after Apache log4j"; license = licenses.lgpl21Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 08a348505006..7755692d2c04 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/39cd44bd54e918d25ee464477992ad0dc234dcba.patch"; sha256 = "sha256-PP6ENNhPJMWrYDlTnr156XV8d5aX/VNX8v4vvi9ZiWo"; }) + (fetchpatch { + name = "fix-visibility-on-mac.patch"; + url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/bc436842227aea561b68c6ae89fbd1fdefcac7b3.patch"; + sha256 = "sha256-/S7tFZ4ht5p0cv036xF2NKZQwExbPaGINyWZiUg/lS4="; + }) ]; postPatch = '' @@ -47,6 +52,6 @@ stdenv.mkDerivation rec { description = "C++ port of the popular Java Lucene search engine"; homepage = "https://github.com/luceneplusplus/LucenePlusPlus"; license = with lib.licenses; [ asl20 lgpl3Plus ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix index bc2661548888..bb0c61ba1251 100644 --- a/pkgs/development/libraries/lyra/default.nix +++ b/pkgs/development/libraries/lyra/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lyra"; - version = "1.6"; + version = "1.6.1"; src = fetchFromGitHub { owner = "bfgroup"; repo = "lyra"; rev = version; - sha256 = "sha256-5k4b1JVrGDmT65tSWo6AkqvNpN+6n8wZgqEuXLL7stI="; + sha256 = "sha256-tS2SPLiKaL8C35AmOXyJPstFUfynkE/A53rurqiySbI="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/development/libraries/mac/default.nix index 7445d283c6f4..f2eb23423251 100644 --- a/pkgs/development/libraries/mac/default.nix +++ b/pkgs/development/libraries/mac/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "APE codec and decompressor"; - homepage = "http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"; + homepage = "https://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/development/libraries/mapbox-gl-qml/default.nix b/pkgs/development/libraries/mapbox-gl-qml/default.nix index a9a2ad64d7ad..1d068a90d3b3 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 = "2.0.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "rinigus"; repo = "mapbox-gl-qml"; rev = version; - hash = "sha256-EVZbQXV8pI0QTqFDTTynVglsqX1O5oK0Pl5Y/wp+/q0="; + hash = "sha256-zZcD85nOZZ067FRvSuzE8lr2gyuVxpcZGp44D4ayc3Q="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/maplibre-gl-native/default.nix b/pkgs/development/libraries/maplibre-gl-native/default.nix index c680f6822b5d..568f3fbe64e2 100644 --- a/pkgs/development/libraries/maplibre-gl-native/default.nix +++ b/pkgs/development/libraries/maplibre-gl-native/default.nix @@ -13,14 +13,14 @@ mkDerivation rec { pname = "maplibre-gl-native"; - version = "unstable-2022-04-07"; + version = "2.0.1"; src = fetchFromGitHub { owner = "maplibre"; repo = "maplibre-gl-native"; - rev = "225f8a4bfe7ad30fd59d693c1fb3ca0ba70d2806"; + rev = "qt-v${version}"; fetchSubmodules = true; - hash = "sha256-NLtpi+bDLTHlnzMZ4YFQyF5B1xt9lzHyZPvEQLlBAnY="; + hash = "sha256-g5J873U/6mrl27iquPl3BdEGhMxkOdfP15dHr27wa48="; }; patches = [ @@ -61,6 +61,5 @@ mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ dotlambda ]; platforms = platforms.linux; - broken = lib.versionOlder qtbase.version "5.15"; }; } diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index 609033e22ead..3221f2950c17 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state"; - homepage = "http://martyr.sourceforge.net/"; + homepage = "https://martyr.sourceforge.net/"; license = lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index c92c712e1500..a1aee4dd8f51 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.22"; + version = "1.5.23"; src = fetchurl { url = "mirror://sourceforge/matio/${pname}-${version}.tar.gz"; - sha256 = "sha256-gMPR4iLhFXaLV7feZAo30O58t6O9A52z6pQecfxSBMM="; + sha256 = "sha256-n5Hq5mHfRupTwxGhstz/cgUQlbAjxhLXy/wJQGyfTW4="; }; meta = with lib; { diff --git a/pkgs/development/libraries/maui-core/default.nix b/pkgs/development/libraries/maui-core/default.nix new file mode 100644 index 000000000000..4b9491ed9c32 --- /dev/null +++ b/pkgs/development/libraries/maui-core/default.nix @@ -0,0 +1,44 @@ +{ lib +, pkgs +, mkDerivation +, libcanberra +, pulseaudio +, fetchFromGitHub +, cmake +, extra-cmake-modules +, kio +, kidletime +}: + +mkDerivation rec { + pname = "maui-core"; + version = "0.5.6"; + + src = fetchFromGitHub { + owner = "Nitrux"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-58ja76N7LrJ0f/SsNMYr7Z9hdW60PwsNlTkHQ+NEdUM="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kidletime + kio + libcanberra + pulseaudio + ]; + + meta = with lib; { + description = "Core libraries to manage the desktop to be shared between Maui Settings and Cask"; + homepage = "https://github.com/Nitrux/maui-core"; + # Missing license information https://github.com/Nitrux/maui-core/issues/1 + license = licenses.unfree; + maintainers = with maintainers; [ onny ]; + }; + +} diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix new file mode 100644 index 000000000000..e577b9183c27 --- /dev/null +++ b/pkgs/development/libraries/mbedtls/2.nix @@ -0,0 +1,6 @@ +{ callPackage }: + +callPackage ./generic.nix { + version = "2.28.2"; + hash = "sha256-rbWvPrFoY31QyW/TbMndPXTzAJS6qT/bo6J0IL6jRvQ="; +} diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix new file mode 100644 index 000000000000..55293b6ecd49 --- /dev/null +++ b/pkgs/development/libraries/mbedtls/3.nix @@ -0,0 +1,6 @@ +{ callPackage }: + +callPackage ./generic.nix { + version = "3.3.0"; + hash = "sha256-yb5migP5Tcw99XHFzJkCct4f5R6ztxPR43VQcfTGRtE="; +} diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/generic.nix similarity index 54% rename from pkgs/development/libraries/mbedtls/default.nix rename to pkgs/development/libraries/mbedtls/generic.nix index 4fa4a5c4503f..adc46adb75fb 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/generic.nix @@ -1,4 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv +, version +, hash , fetchFromGitHub , cmake @@ -11,17 +14,13 @@ stdenv.mkDerivation rec { pname = "mbedtls"; - # Auto updates are disabled due to repology listing dev releases as release - # versions. See - # * https://github.com/NixOS/nixpkgs/pull/119838#issuecomment-822100428 - # * https://github.com/NixOS/nixpkgs/commit/0ee02a9d42b5fe1825b0f7cee7a9986bb4ba975d - version = "2.28.0"; # nixpkgs-update: no auto update + inherit version; src = fetchFromGitHub { - owner = "ARMmbed"; + owner = "Mbed-TLS"; repo = "mbedtls"; rev = "${pname}-${version}"; - sha256 = "sha256-VDoIUBaK2e0E5nkwU1u3Wvxc+s6OzBSdIeHsJKJuZ2g="; + inherit hash; }; nativeBuildInputs = [ cmake ninja perl python3 ]; @@ -33,17 +32,22 @@ stdenv.mkDerivation rec { perl scripts/config.pl set MBEDTLS_THREADING_PTHREAD # POSIX thread wrapper layer for the threading layer. ''; - cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ - "-Wno-error=format" - "-Wno-error=format-truncation" + cmakeFlags = [ + "-DUSE_SHARED_MBEDTLS_LIBRARY=${if stdenv.hostPlatform.isStatic then "off" else "on"}" + + # Avoid a dependency on jsonschema and jinja2 by not generating source code + # using python. In releases, these generated files are already present in + # the repository and do not need to be regenerated. See: + # https://github.com/Mbed-TLS/mbedtls/releases/tag/v3.3.0 below "Requirement changes". + "-DGEN_FILES=off" ]; meta = with lib; { - homepage = "https://tls.mbed.org/"; + homepage = "https://www.trustedfirmware.org/projects/mbed-tls/"; + changelog = "https://github.com/Mbed-TLS/mbedtls/blob/${pname}-${version}/ChangeLog"; description = "Portable cryptographic and TLS library, formerly known as PolarSSL"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ raphaelr ]; }; } diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 8ca137e66119..23059b91e7c0 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -1,27 +1,40 @@ -{ lib, stdenv, fetchurl, boost, llvmPackages }: +{ lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + boost, + llvmPackages, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mdds"; - version = "2.0.2"; + version = "2.0.3"; - src = fetchurl { - url = "https://kohei.us/files/${pname}/src/${pname}-${version}.tar.bz2"; - sha256 = "sha256-EyEfLy44fvO3TXOh3O5Soa1c4G34+OZkdnnfknijEWo="; + src = fetchFromGitLab { + owner = "mdds"; + repo = "mdds"; + rev = finalAttrs.version; + hash = "sha256-Y9uBJKM34UTEj/3c1w69QHhvwFcMNlAohEco0O0B+xI="; }; - postInstall = '' - mkdir -p "$out/lib/pkgconfig" - cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig" - ''; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; - checkInputs = [ boost ]; + nativeCheckInputs = [ boost ]; + + postInstall = '' + mkdir -p $out/lib/ + mv $out/share/pkgconfig $out/lib/ + ''; meta = with lib; { homepage = "https://gitlab.com/mdds/mdds"; - description = "A collection of multi-dimensional data structure and indexing algorithm"; - platforms = platforms.all; + description = "A collection of multi-dimensional data structure and indexing algorithms"; + changelog = "https://gitlab.com/mdds/mdds/-/blob/${finalAttrs.version}/CHANGELOG"; license = licenses.mit; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.unix; }; -} +}) +# TODO: multi-output diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index bb5bc566bc1d..fade17507ca4 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "5.1.20"; + version = "5.2.16"; dontWrapQtApps = true; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-u8YqF5BzyYIF9+XB90Eu6DlwXuu1FDOJUzxebj0errU="; + hash = "sha256-K4EBZC3zuLKF9Qw4i24f0hYKlOgRM7MR4Ck2ZoTYi6I="; }; patches = [ @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications. Part of the Linphone project"; - homepage = "http://www.linphone.org/technical-corner/mediastreamer2"; + homepage = "https://www.linphone.org/technical-corner/mediastreamer2"; license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 54c1e8acf041..56fa74e5c0c5 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -6,11 +6,58 @@ , libelf, libvdpau , libglvnd, libunwind , vulkan-loader, glslang -, galliumDrivers ? ["auto"] -# upstream Mesa defaults to only enabling swrast (aka lavapipe) on aarch64 for some reason, so force building the others -, vulkanDrivers ? [ "auto" ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ "broadcom" "freedreno" "panfrost" ] +, galliumDrivers ? + if stdenv.isLinux then + [ + "d3d12" # WSL emulated GPU (aka Dozen) + "kmsro" # helper driver for display-only devices + "nouveau" # Nvidia + "radeonsi" # new AMD (GCN+) + "r300" # very old AMD + "r600" # less old AMD + "swrast" # software renderer (aka LLVMPipe) + "svga" # VMWare virtualized GPU + "virgl" # QEMU virtualized GPU (aka VirGL) + "zink" # generic OpenGL over Vulkan, experimental + ] + ++ lib.optionals stdenv.isAarch64 [ + "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs) + "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) + "lima" # ARM Mali 4xx + "panfrost" # ARM Mali Midgard and up (T/G series) + "tegra" # Nvidia Tegra SoCs + "v3d" # Broadcom VC5 (Raspberry Pi 4) + "vc4" # Broadcom VC4 (Raspberry Pi 0-3) + ] ++ lib.optionals stdenv.isx86_64 [ + "iris" # new Intel, could work on non-x86_64 with PCIe cards, but doesn't build as of 22.3.4 + "crocus" # Intel legacy, x86_64 only + ] + else [ "auto" ] +, vulkanDrivers ? + if stdenv.isLinux then + [ + "amd" # AMD (aka RADV) + "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen) + "swrast" # software renderer (aka Lavapipe) + ] + ++ lib.optionals (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") [ + # QEMU virtualized GPU (aka VirGL) + # Requires ATOMIC_INT_LOCK_FREE == 2. + "virtio-experimental" + ] + ++ lib.optionals stdenv.isAarch64 [ + "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D) + "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) + "imagination-experimental" # PowerVR Rogue (currently N/A) + "panfrost" # ARM Mali Midgard and up (T/G series) + ] + ++ lib.optionals stdenv.isx86_64 [ + "intel" # Intel (aka ANV), could work on non-x86_64 with PCIe cards, but doesn't build as of 22.3.4 + "intel_hasvk" # Intel Haswell/Broadwell, experimental, x86_64 only + ] + else [ "auto" ] , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] -, vulkanLayers ? lib.optionals (!stdenv.isDarwin) [ "device-select" "overlay" ] # No Vulkan support on Darwin +, vulkanLayers ? lib.optionals (!stdenv.isDarwin) [ "device-select" "overlay" "intel-nullhw" ] # No Vulkan support on Darwin , OpenGL, Xplugin , withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light && !valgrind-light.meta.broken, valgrind-light , enableGalliumNine ? stdenv.isLinux @@ -19,6 +66,12 @@ , enablePatentEncumberedCodecs ? true , libclc , jdupes +, rustc +, rust-bindgen +, spirv-llvm-translator +, zstd +, directx-headers +, udev }: /** Packaging design: @@ -32,14 +85,29 @@ - libOSMesa is in $osmesa (~4 MB) */ -with lib; - let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "22.2.3"; - branch = versions.major version; + version = "22.3.4"; + branch = lib.versions.major version; + withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm; + + # Align all the Mesa versions used. Required to prevent explosions when + # two different LLVMs are loaded in the same process. + # FIXME: these should really go into some sort of versioned LLVM package set + rust-bindgen' = rust-bindgen.override { + rust-bindgen-unwrapped = rust-bindgen.unwrapped.override { + clang = llvmPackages.clang; + }; + }; + spirv-llvm-translator' = spirv-llvm-translator.override { + inherit (llvmPackages) llvm; + }; + + haveWayland = lib.elem "wayland" eglPlatforms; + haveZink = lib.elem "zink" galliumDrivers; + haveDozen = (lib.elem "d3d12" galliumDrivers) || (lib.elem "microsoft-experimental" vulkanDrivers); self = stdenv.mkDerivation { pname = "mesa"; inherit version; @@ -52,7 +120,7 @@ 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 = "ee7d026f7b1991dbae0861d359b671145c3a86f2a731353b885d2ea2d5c098d6"; + sha256 = "37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593"; }; # TODO: @@ -81,7 +149,15 @@ self = stdenv.mkDerivation { outputs = [ "out" "dev" "drivers" ] ++ lib.optional enableOSMesa "osmesa" ++ lib.optional stdenv.isLinux "driversdev" - ++ lib.optional enableOpenCL "opencl"; + ++ lib.optional enableOpenCL "opencl" + # the Dozen drivers depend on libspirv2dxil, but link it statically, and + # libspirv2dxil itself is pretty chonky, so relocate it to its own output + # in case anything wants to use it at some point + ++ lib.optional haveDozen "spirv2dxil"; + + # FIXME: this fixes rusticl/iris segfaulting on startup, _somehow_. + # Needs more investigating. + separateDebugInfo = true; preConfigure = '' PATH=${llvmPackages.libllvm.dev}/bin:$PATH @@ -99,66 +175,73 @@ self = stdenv.mkDerivation { "-Ddisk-cache-key=${placeholder "drivers"}" "-Ddri-search-path=${libglvnd.driverLink}/lib/dri" - "-Dplatforms=${concatStringsSep "," eglPlatforms}" - "-Dgallium-drivers=${concatStringsSep "," galliumDrivers}" - "-Dvulkan-drivers=${concatStringsSep "," vulkanDrivers}" + "-Dplatforms=${lib.concatStringsSep "," eglPlatforms}" + "-Dgallium-drivers=${lib.concatStringsSep "," galliumDrivers}" + "-Dvulkan-drivers=${lib.concatStringsSep "," vulkanDrivers}" "-Ddri-drivers-path=${placeholder "drivers"}/lib/dri" "-Dvdpau-libs-path=${placeholder "drivers"}/lib/vdpau" - "-Dxvmc-libs-path=${placeholder "drivers"}/lib" "-Domx-libs-path=${placeholder "drivers"}/lib/bellagio" "-Dva-libs-path=${placeholder "drivers"}/lib/dri" "-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d" - "-Dgallium-nine=${boolToString enableGalliumNine}" # Direct3D in Wine - "-Dosmesa=${boolToString enableOSMesa}" # used by wine + + "-Dgallium-nine=${lib.boolToString enableGalliumNine}" # Direct3D in Wine + "-Dosmesa=${lib.boolToString enableOSMesa}" # used by wine "-Dmicrosoft-clc=disabled" # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) # To enable non-mesa gbm backends to be found (e.g. Nvidia) "-Dgbm-backends-path=${libglvnd.driverLink}/lib/gbm:${placeholder "out"}/lib/gbm" - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ "-Dglvnd=true" - ] ++ optionals enableOpenCL [ - "-Dgallium-opencl=icd" # Enable the gallium OpenCL frontend + + # Enable RT for Intel hardware + "-Dintel-clc=enabled" + ] ++ lib.optionals enableOpenCL [ + # Clover, old OpenCL frontend + "-Dgallium-opencl=icd" + "-Dopencl-spirv=true" + + # Rusticl, new OpenCL frontend + "-Dgallium-rusticl=true" "-Drust_std=2021" "-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib" - ] ++ optional enablePatentEncumberedCodecs + ] ++ lib.optional enablePatentEncumberedCodecs "-Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec" - ++ optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}"; + ++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}"; buildInputs = with xorg; [ expat llvmPackages.libllvm libglvnd xorgproto libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr libffi libvdpau libelf libXvMC libpthreadstubs openssl /*or another sha1 provider*/ - ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] - ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] + zstd + ] ++ lib.optionals haveWayland [ wayland wayland-protocols ] + ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal udev ] ++ lib.optionals stdenv.isDarwin [ libunwind ] - ++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped ] + ++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped rustc rust-bindgen' spirv-llvm-translator' ] ++ lib.optional withValgrind valgrind-light - # Mesa will not build zink when gallium-drivers=auto - ++ lib.optional (elem "zink" galliumDrivers) vulkan-loader; + ++ lib.optional haveZink vulkan-loader + ++ lib.optional haveDozen directx-headers; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson pkg-config ninja intltool bison flex file - python3Packages.python python3Packages.Mako + python3Packages.python python3Packages.Mako python3Packages.ply jdupes glslang - ] ++ lib.optionals (elem "wayland" eglPlatforms) [ - wayland-scanner - ]; + ] ++ lib.optional haveWayland wayland-scanner; propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm - ] ++ optional stdenv.isLinux libdrm - ++ optionals stdenv.isDarwin [ OpenGL Xplugin ]; + ] ++ lib.optional withLibdrm libdrm + ++ lib.optionals stdenv.isDarwin [ OpenGL Xplugin ]; doCheck = false; postInstall = '' # Some installs don't have any drivers so this directory is never created. mkdir -p $drivers $osmesa - '' + optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' mkdir -p $drivers/lib if [ -n "$(shopt -s nullglob; echo "$out/lib/libxatracker"*)" -o -n "$(shopt -s nullglob; echo "$out/lib/libvulkan_"*)" ]; then @@ -183,17 +266,17 @@ self = stdenv.mkDerivation { for js in $drivers/share/vulkan/icd.d/*.json; do substituteInPlace "$js" --replace "$out" "$drivers" done - '' + optionalString enableOpenCL '' + '' + lib.optionalString enableOpenCL '' # Move OpenCL stuff mkdir -p $opencl/lib mv -t "$opencl/lib/" \ $out/lib/gallium-pipe \ - $out/lib/libMesaOpenCL* + $out/lib/lib*OpenCL* - # We construct our own .icd file that contains an absolute path. - rm -r $out/etc/OpenCL + # We construct our own .icd files that contain absolute paths. mkdir -p $opencl/etc/OpenCL/vendors/ echo $opencl/lib/libMesaOpenCL.so > $opencl/etc/OpenCL/vendors/mesa.icd + echo $opencl/lib/libRusticlOpenCL.so > $opencl/etc/OpenCL/vendors/rusticl.icd '' + lib.optionalString enableOSMesa '' # move libOSMesa to $osmesa, as it's relatively big mkdir -p $osmesa/lib @@ -203,9 +286,13 @@ self = stdenv.mkDerivation { for js in $drivers/share/vulkan/{im,ex}plicit_layer.d/*.json; do substituteInPlace "$js" --replace '"libVkLayer_' '"'"$drivers/lib/libVkLayer_" done + '' + lib.optionalString haveDozen '' + mkdir -p $spirv2dxil/{bin,lib} + mv -t $spirv2dxil/lib $out/lib/libspirv_to_dxil* + mv -t $spirv2dxil/bin $out/bin/spirv2dxil ''; - postFixup = optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.isLinux '' # set the default search path for DRI drivers; used e.g. by X server substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace "$drivers" "${libglvnd.driverLink}" [ -f "$dev/lib/pkgconfig/d3d.pc" ] && substituteInPlace "$dev/lib/pkgconfig/d3d.pc" --replace "$drivers" "${libglvnd.driverLink}" @@ -236,16 +323,21 @@ self = stdenv.mkDerivation { done ''; - NIX_CFLAGS_COMPILE = optionals stdenv.isDarwin [ "-fno-common" ] ++ lib.optionals enableOpenCL [ + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-fno-common" ] ++ lib.optionals enableOpenCL [ "-UPIPE_SEARCH_DIR" "-DPIPE_SEARCH_DIR=\"${placeholder "opencl"}/lib/gallium-pipe\"" + + # Work around regression from https://github.com/NixOS/nixpkgs/pull/210004 + # TODO(trofi): remove + "--sysroot=/" ]; passthru = { - inherit libdrm; inherit (libglvnd) driverLink; inherit llvmPackages; + libdrm = if withLibdrm then libdrm else null; + tests = lib.optionalAttrs stdenv.isLinux { devDoesNotDependOnLLVM = stdenv.mkDerivation { name = "mesa-dev-does-not-depend-on-llvm"; @@ -257,7 +349,7 @@ self = stdenv.mkDerivation { }; }; - meta = { + meta = with lib; { description = "An open source 3D graphics library"; longDescription = '' The Mesa project began as an open-source implementation of the OpenGL diff --git a/pkgs/development/libraries/mesa/opencl.patch b/pkgs/development/libraries/mesa/opencl.patch index d220239770d5..fb4da5cf7a0a 100644 --- a/pkgs/development/libraries/mesa/opencl.patch +++ b/pkgs/development/libraries/mesa/opencl.patch @@ -1,5 +1,18 @@ +diff --git a/meson.build b/meson.build +index 172c64a7c70..05961e56926 100644 +--- a/meson.build ++++ b/meson.build +@@ -1900,7 +1900,7 @@ endif + + dep_clang = null_dep + if with_clc +- llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir') ++ llvm_libdir = get_option('clang-libdir') + + dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false) + diff --git a/meson_options.txt b/meson_options.txt -index b8f753e2e1a..2163e3ab7ee 100644 +index 6f307018815..ab84eb1006c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -18,6 +18,12 @@ @@ -16,56 +29,38 @@ index b8f753e2e1a..2163e3ab7ee 100644 'platforms', type : 'array', diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build -index 14df6b86f7f..adcd5110342 100644 +index db3586bd7fb..4d914206d21 100644 --- a/src/gallium/targets/opencl/meson.build +++ b/src/gallium/targets/opencl/meson.build -@@ -30,6 +30,7 @@ if with_ld_version_script +@@ -39,7 +39,8 @@ if dep_llvm.version().version_compare('>=10.0.0') + polly_isl_dep = cpp.find_library('PollyISL', dirs : llvm_libdir, required : false) endif - llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir') +-dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false) +clang_libdir = get_option('clang-libdir') - opencl_libname = with_opencl_icd ? 'MesaOpenCL' : 'OpenCL' ++dep_clang = cpp.find_library('clang-cpp', dirs : clang_libdir, required : false) - polly_dep = null_dep -@@ -60,19 +61,19 @@ else - endif - if not (dep_clang.found() and dep_clang_usable) - dep_clang = [ -- cpp.find_library('clangCodeGen', dirs : llvm_libdir), -- cpp.find_library('clangFrontendTool', dirs : llvm_libdir), -- cpp.find_library('clangFrontend', dirs : llvm_libdir), -- cpp.find_library('clangDriver', dirs : llvm_libdir), -- cpp.find_library('clangSerialization', dirs : llvm_libdir), -- cpp.find_library('clangParse', dirs : llvm_libdir), -- cpp.find_library('clangSema', dirs : llvm_libdir), -- cpp.find_library('clangAnalysis', dirs : llvm_libdir), -- cpp.find_library('clangAST', dirs : llvm_libdir), -- cpp.find_library('clangASTMatchers', dirs : llvm_libdir), -- cpp.find_library('clangEdit', dirs : llvm_libdir), -- cpp.find_library('clangLex', dirs : llvm_libdir), -- cpp.find_library('clangBasic', dirs : llvm_libdir), -+ cpp.find_library('clangCodeGen', dirs : clang_libdir), -+ cpp.find_library('clangFrontendTool', dirs : clang_libdir), -+ cpp.find_library('clangFrontend', dirs : clang_libdir), -+ cpp.find_library('clangDriver', dirs : clang_libdir), -+ cpp.find_library('clangSerialization', dirs : clang_libdir), -+ cpp.find_library('clangParse', dirs : clang_libdir), -+ cpp.find_library('clangSema', dirs : clang_libdir), -+ cpp.find_library('clangAnalysis', dirs : clang_libdir), -+ cpp.find_library('clangAST', dirs : clang_libdir), -+ cpp.find_library('clangASTMatchers', dirs : clang_libdir), -+ cpp.find_library('clangEdit', dirs : clang_libdir), -+ cpp.find_library('clangLex', dirs : clang_libdir), -+ cpp.find_library('clangBasic', dirs : clang_libdir), - polly_dep, polly_isl_dep, - ] - # check clang once more -@@ -112,7 +113,7 @@ if with_opencl_icd + # meson will return clang-cpp from system dirs if it's not found in llvm_libdir + linker_rpath_arg = '-Wl,--rpath=@0@'.format(llvm_libdir) +@@ -123,7 +124,7 @@ if with_opencl_icd + configuration : _config, input : 'mesa.icd.in', output : 'mesa.icd', - install : true, -- install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), -+ install_dir : join_paths(get_option('prefix'), 'etc', 'OpenCL', 'vendors'), +- install : true, ++ install : false, + install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), ) - if meson.version().version_compare('>= 0.58') +diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build +index a968dee52db..69475cf3133 100644 +--- a/src/gallium/targets/rusticl/meson.build ++++ b/src/gallium/targets/rusticl/meson.build +@@ -58,7 +58,7 @@ configure_file( + configuration : _config, + input : 'rusticl.icd.in', + output : 'rusticl.icd', +- install : true, ++ install : false, + install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), + ) + diff --git a/pkgs/development/libraries/migraphx/default.nix b/pkgs/development/libraries/migraphx/default.nix new file mode 100644 index 000000000000..27caa1f94137 --- /dev/null +++ b/pkgs/development/libraries/migraphx/default.nix @@ -0,0 +1,162 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, pkg-config +, cmake +, rocm-cmake +, hip +, clang-tools-extra +, cppcheck +, openmp +, rocblas +, rocmlir +, miopengemm +, miopen +, protobuf +, half +, nlohmann_json +, msgpack +, sqlite +, oneDNN +, blaze +, texlive +, doxygen +, sphinx +, docutils +, ghostscript +, python3Packages +, buildDocs ? false +, buildTests ? false +}: + +let + latex = lib.optionalAttrs buildDocs texlive.combine { + inherit (texlive) scheme-small + latexmk + tex-gyre + fncychap + wrapfig + capt-of + framed + needspace + tabulary + varwidth + titlesec + epstopdf; + }; +in stdenv.mkDerivation (finalAttrs: { + pname = "migraphx"; + version = "5.4.2"; + + outputs = [ + "out" + ] ++ lib.optionals buildDocs [ + "doc" + ] ++ lib.optionals buildTests [ + "test" + ]; + + src = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "AMDMIGraphX"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-UDhm+j9qs4Rk81C1PE4kkacytfY2StYbfsCOtFL+p6s="; + }; + + nativeBuildInputs = [ + pkg-config + cmake + rocm-cmake + hip + clang-tools-extra + cppcheck + python3Packages.python + ] ++ lib.optionals buildDocs [ + latex + doxygen + sphinx + docutils + ghostscript + python3Packages.sphinx-rtd-theme + python3Packages.breathe + ]; + + buildInputs = [ + openmp + rocblas + rocmlir + miopengemm + miopen + protobuf + half + nlohmann_json + msgpack + sqlite + oneDNN + blaze + python3Packages.pybind11 + python3Packages.onnx + ]; + + cmakeFlags = [ + "-DCMAKE_POLICY_DEFAULT_CMP0079=NEW" + # "-DCMAKE_C_COMPILER=hipcc" + # "-DCMAKE_CXX_COMPILER=hipcc" + "-DMIGRAPHX_ENABLE_GPU=OFF" # GPU compilation is broken, don't know why + "-DMIGRAPHX_ENABLE_CPU=ON" + "-DMIGRAPHX_ENABLE_FPGA=ON" + "-DMIGRAPHX_ENABLE_MLIR=ON" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; + + postPatch = '' + patchShebangs tools + + substituteInPlace src/targets/gpu/CMakeLists.txt \ + --replace "CMAKE_CXX_COMPILER MATCHES \".*clang\\\+\\\+\$\"" "TRUE" + '' + lib.optionalString (!buildDocs) '' + substituteInPlace CMakeLists.txt \ + --replace "add_subdirectory(doc)" "" + '' + lib.optionalString (!buildTests) '' + substituteInPlace CMakeLists.txt \ + --replace "add_subdirectory(test)" "" + ''; + + # Unfortunately, it seems like we have to call make on this manually + preInstall = lib.optionalString buildDocs '' + export HOME=$(mktemp -d) + make -j$NIX_BUILD_CORES doc + cd ../doc/pdf + make -j$NIX_BUILD_CORES + cd - + ''; + + postInstall = lib.optionalString buildDocs '' + mv ../doc/html $out/share/doc/migraphx + mv ../doc/pdf/MIGraphX.pdf $out/share/doc/migraphx + '' + lib.optionalString buildTests '' + mkdir -p $test/bin + mv bin/test_* $test/bin + patchelf $test/bin/test_* --shrink-rpath --allowed-rpath-prefixes /nix/store + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "AMD's graph optimization engine"; + homepage = "https://github.com/ROCmSoftwarePlatform/AMDMIGraphX"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor hip.version; + }; +}) diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix index 3a15f6b1aaf3..9f7e8ee59177 100644 --- a/pkgs/development/libraries/mimalloc/default.nix +++ b/pkgs/development/libraries/mimalloc/default.nix @@ -7,16 +7,16 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "2.0.7"; + version = "2.0.9"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h3+awCdlZaGCkavBeQfJsKgOZX4MHB3quPIfTlj6pDw="; + sha256 = "sha256-0gX0rEOWT6Lp5AyRyrK5GPTBvAqc5SxSaNJOc5GIgKc="; }; - doCheck = true; + doCheck = !stdenv.hostPlatform.isStatic; preCheck = let ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' @@ -24,7 +24,11 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ninja ]; - cmakeFlags = [ "-DMI_INSTALL_TOPLEVEL=ON" ] ++ lib.optionals secureBuild [ "-DMI_SECURE=ON" ]; + cmakeFlags = [ "-DMI_INSTALL_TOPLEVEL=ON" ] + ++ lib.optionals secureBuild [ "-DMI_SECURE=ON" ] + ++ lib.optionals stdenv.hostPlatform.isStatic [ "-DMI_BUILD_SHARED=OFF" ] + ++ lib.optionals (!doCheck) [ "-DMI_BUILD_TESTS=OFF" ] + ; postInstall = let rel = lib.versions.majorMinor version; diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix index 5a965c3d7d92..668b2fdf10c9 100644 --- a/pkgs/development/libraries/mimetic/default.nix +++ b/pkgs/development/libraries/mimetic/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MIME handling library"; - homepage = "http://www.codesink.org/mimetic_mime_library.html"; + homepage = "https://www.codesink.org/mimetic_mime_library.html"; license = licenses.mit; maintainers = with maintainers; [ leenaars]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/minilibx/default.nix b/pkgs/development/libraries/minilibx/default.nix new file mode 100644 index 000000000000..0551993e438a --- /dev/null +++ b/pkgs/development/libraries/minilibx/default.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +, libX11 +, libXext +, unstableGitUpdater +}: + +stdenv.mkDerivation { + pname = "minilibx"; + version = "unstable-2021-10-30"; + + src = fetchFromGitHub { + owner = "42Paris"; + repo = "minilibx-linux"; + rev = "7dc53a411a7d4ae286c60c6229bd1e395b0efb82"; + hash = "sha256-aRYMpaPC7dC6EHmmXugvwcQnaizRCQZKFcQX0K2MLM4="; + }; + + outputs = [ "out" "dev" "man" ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + buildInputs = [ + libX11 + libXext + ]; + + dontConfigure = true; + + makefile = "Makefile.mk"; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{include,lib} + cp mlx*.h $out/include + cp libmlx*.a $out/lib + installManPage man/man*/* + + runHook postInstall + ''; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + + meta = with lib; { + description = "A simple X-Window (X11R6) programming API in C"; + homepage = "https://github.com/42Paris/minilibx-linux"; + license = licenses.bsd2; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix new file mode 100644 index 000000000000..5f7dc56ed7f8 --- /dev/null +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, gtest +, pkg-config +, zlib +, bzip2 +, xz +, zstd +, openssl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "minizip-ng"; + version = "3.0.7"; + + src = fetchFromGitHub { + owner = "zlib-ng"; + repo = finalAttrs.pname; + rev = finalAttrs.version; + sha256 = "sha256-m/zSVx8vYzLA23Cusd1p/ZSGd1mV3gM6UqDnmEXqpq4="; + }; + + patches = [ + (fetchpatch { + name = "find-system-gtest.patch"; + url = "https://github.com/zlib-ng/minizip-ng/commit/be23c8d3b7e2cb5ba619e60517cad277ee510fb7.patch"; + sha256 = "sha256-azwrGj6kgTyTepGAmOlxDOFOwJKQE5J2bwUIn6sgKUY="; + }) + + # otherwise signing unit tests fail + (fetchpatch { + name = "disable-mz-signing-by-default.patch"; + url = "https://github.com/zlib-ng/minizip-ng/commit/60649ada97581afc0bc2fffc50ce402ff1e6df5d.patch"; + sha256 = "sha256-bHGM4H8RPYkfAjxcS1bPohR9IFOFT0Mx4Mg34UnnD+w="; + }) + ]; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ zlib bzip2 xz zstd openssl ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" + "-DMZ_OPENSSL=ON" + "-DMZ_BUILD_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + ] ++ lib.optionals stdenv.isDarwin [ + # missing header file + "-DMZ_LIBCOMP=OFF" + ]; + + postInstall = '' + # make lib findable as libminizip-ng even if compat is enabled + for ext in so dylib a ; do + if [ -e $out/lib/libminizip.$ext ] && [ ! -e $out/lib/libminizip-ng.$ext ]; then + ln -s $out/lib/libminizip.$ext $out/lib/libminizip-ng.$ext + fi + done + if [ ! -e $out/include/minizip-ng ]; then + ln -s $out/include $out/include/minizip-ng + fi + ''; + + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + nativeCheckInputs = [ gtest ]; + enableParallelChecking = false; + + meta = with lib; { + description = "Fork of the popular zip manipulation library found in the zlib distribution"; + homepage = "https://github.com/zlib-ng/minizip-ng"; + license = licenses.zlib; + maintainers = with maintainers; [ gebner ris ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/minizip2/default.nix b/pkgs/development/libraries/minizip2/default.nix deleted file mode 100644 index 591bb8c8dc3a..000000000000 --- a/pkgs/development/libraries/minizip2/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, bzip2, xz, zstd, openssl }: - -stdenv.mkDerivation rec { - pname = "minizip"; - version = "2.10.6"; - - src = fetchFromGitHub { - owner = "nmoinvaz"; - repo = pname; - rev = version; - sha256 = "sha256-OAm4OZeQdP2Q/UKYI9bR7OV9RmLmYF/j2NpK5TPoE60="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=YES" - "-DMZ_OPENSSL=ON" - ]; - - buildInputs = [ zlib bzip2 xz zstd openssl ]; - - meta = with lib; { - description = "Compression library implementing the deflate compression method found in gzip and PKZIP"; - homepage = "https://github.com/nmoinvaz/minizip"; - license = licenses.zlib; - maintainers = with maintainers; [ gebner ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/miopen/default.nix b/pkgs/development/libraries/miopen/default.nix new file mode 100644 index 000000000000..b11477145ab4 --- /dev/null +++ b/pkgs/development/libraries/miopen/default.nix @@ -0,0 +1,188 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, rocmUpdateScript +, pkg-config +, cmake +, rocm-cmake +, rocblas +, rocmlir +, hip +, clang-tools-extra +, clang-ocl +, llvm +, miopengemm +, composable_kernel +, half +, boost +, sqlite +, bzip2 +, nlohmann_json +, texlive +, doxygen +, sphinx +, zlib +, gtest +, rocm-comgr +, python3Packages +, buildDocs ? true +, buildTests ? false +, fetchKDBs ? true +, useOpenCL ? false +}: + +let + latex = lib.optionalAttrs buildDocs texlive.combine { + inherit (texlive) scheme-small + latexmk + tex-gyre + fncychap + wrapfig + capt-of + framed + needspace + tabulary + varwidth + titlesec; + }; + + kdbs = lib.optionalAttrs fetchKDBs import ./deps.nix { + inherit fetchurl; + mirror = "https://repo.radeon.com/rocm/miopen-kernel/rel-5.0"; + }; +in stdenv.mkDerivation (finalAttrs: { + pname = "miopen"; + version = "5.4.2"; + + outputs = [ + "out" + ] ++ lib.optionals buildDocs [ + "doc" + ] ++ lib.optionals buildTests [ + "test" + ]; + + src = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "MIOpen"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-GfXPCXiVJVve3d8sQCQcFLb/vEnKkVEn7xYUhHkEEVI="; + }; + + nativeBuildInputs = [ + pkg-config + cmake + rocm-cmake + hip + clang-tools-extra + ]; + + buildInputs = [ + llvm + rocblas + rocmlir + clang-ocl + miopengemm + composable_kernel + half + boost + sqlite + bzip2 + nlohmann_json + ] ++ lib.optionals buildDocs [ + latex + doxygen + sphinx + python3Packages.sphinx-rtd-theme + python3Packages.breathe + python3Packages.myst-parser + ] ++ lib.optionals buildTests [ + zlib + ]; + + cmakeFlags = [ + "-DMIOPEN_USE_MIOPENGEMM=ON" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals (!useOpenCL) [ + "-DCMAKE_C_COMPILER=hipcc" + "-DCMAKE_CXX_COMPILER=hipcc" + "-DMIOPEN_BACKEND=HIP" + ] ++ lib.optionals useOpenCL [ + "-DMIOPEN_BACKEND=OpenCL" + ] ++ lib.optionals buildTests [ + "-DBUILD_TESTS=ON" + "-DMIOPEN_TEST_ALL=ON" + "-DMIOPEN_TEST_GFX900=ON" + "-DMIOPEN_TEST_GFX906=ON" + "-DMIOPEN_TEST_GFX908=ON" + "-DMIOPEN_TEST_GFX90A=ON" + "-DMIOPEN_TEST_GFX103X=ON" + "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "enable_testing()" "" \ + --replace "MIOPEN_HIP_COMPILER MATCHES \".*clang\\\\+\\\\+$\"" "true" \ + --replace "set(MIOPEN_TIDY_ERRORS ALL)" "" # error: missing required key 'key' + '' + lib.optionalString buildTests '' + substituteInPlace test/gtest/CMakeLists.txt \ + --replace "enable_testing()" "" + '' + lib.optionalString (!buildTests) '' + substituteInPlace CMakeLists.txt \ + --replace "add_subdirectory(test)" "" + '' + lib.optionalString fetchKDBs '' + ln -sf ${kdbs.gfx1030_36} src/kernels/gfx1030_36.kdb + ln -sf ${kdbs.gfx900_56} src/kernels/gfx900_56.kdb + ln -sf ${kdbs.gfx900_64} src/kernels/gfx900_64.kdb + ln -sf ${kdbs.gfx906_60} src/kernels/gfx906_60.kdb + ln -sf ${kdbs.gfx906_64} src/kernels/gfx906_64.kdb + ln -sf ${kdbs.gfx90878} src/kernels/gfx90878.kdb + ln -sf ${kdbs.gfx90a68} src/kernels/gfx90a68.kdb + ln -sf ${kdbs.gfx90a6e} src/kernels/gfx90a6e.kdb + ''; + + # Unfortunately, it seems like we have to call make on these manually + postBuild = lib.optionalString buildDocs '' + export HOME=$(mktemp -d) + make -j$NIX_BUILD_CORES doc + '' + lib.optionalString buildTests '' + make -j$NIX_BUILD_CORES check + ''; + + postInstall = '' + rm $out/bin/install_precompiled_kernels.sh + '' + lib.optionalString buildDocs '' + mv ../doc/html $out/share/doc/miopen-${if useOpenCL then "opencl" else "hip"} + mv ../doc/pdf/miopen.pdf $out/share/doc/miopen-${if useOpenCL then "opencl" else "hip"} + '' + lib.optionalString buildTests '' + mkdir -p $test/bin + mv bin/test_* $test/bin + patchelf --set-rpath $out/lib:${lib.makeLibraryPath (finalAttrs.buildInputs ++ + [ hip rocm-comgr ])} $test/bin/* + '' + lib.optionalString fetchKDBs '' + # Apparently gfx1030_40 wasn't generated so the developers suggest just renaming gfx1030_36 to it + # Should be fixed in the next miopen kernel generation batch + ln -s ${kdbs.gfx1030_36} $out/share/miopen/db/gfx1030_40.kdb + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Machine intelligence library for ROCm"; + homepage = "https://github.com/ROCmSoftwarePlatform/MIOpen"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor hip.version; + }; +}) diff --git a/pkgs/development/libraries/miopen/deps.nix b/pkgs/development/libraries/miopen/deps.nix new file mode 100644 index 000000000000..e88b61ad974c --- /dev/null +++ b/pkgs/development/libraries/miopen/deps.nix @@ -0,0 +1,45 @@ +{ fetchurl +, mirror +}: + +{ + gfx1030_36 = fetchurl { + sha256 = "sha256-zEXDLkRWAHS15LDA5IRyqG5rO7HHPBiVgPlQ8JjSqNc="; + url = "${mirror}/gfx1030_36.kdb"; + }; + + gfx900_56 = fetchurl { + sha256 = "sha256-ZTqUPhVKcQzjO6bxykvZMJk1VZh31dRVs+XqcxEtmeI="; + url = "${mirror}/gfx900_56.kdb"; + }; + + gfx900_64 = fetchurl { + sha256 = "sha256-ZTqUPhVKcQzjO6bxykvZMJk1VZh31dRVs+XqcxEtmeI="; + url = "${mirror}/gfx900_64.kdb"; + }; + + gfx906_60 = fetchurl { + sha256 = "sha256-U6pDo8ICfs6fVIEqRziWeE5/4Vzvu41JkcRVn3ou1e4="; + url = "${mirror}/gfx906_60.kdb"; + }; + + gfx906_64 = fetchurl { + sha256 = "sha256-U6pDo8ICfs6fVIEqRziWeE5/4Vzvu41JkcRVn3ou1e4="; + url = "${mirror}/gfx906_64.kdb"; + }; + + gfx90878 = fetchurl { + sha256 = "sha256-r7DRhNH+jHUXAu64b9vWsZzGD4w5oSHnxH0l2RN0qlQ="; + url = "${mirror}/gfx90878.kdb"; + }; + + gfx90a68 = fetchurl { + sha256 = "sha256-NT//zIPTbzsPJyaVycxwU6BcMTzGc/d+Z4Ab9FImDko="; + url = "${mirror}/gfx90a68.kdb"; + }; + + gfx90a6e = fetchurl { + sha256 = "sha256-ENZHbf+/MGYgSTpALKh2meuZPNhH5bG+WrW/jzvGpBs="; + url = "${mirror}/gfx90a6e.kdb"; + }; +} diff --git a/pkgs/development/libraries/miopengemm/default.nix b/pkgs/development/libraries/miopengemm/default.nix index 9330530389e9..d363f524f199 100644 --- a/pkgs/development/libraries/miopengemm/default.nix +++ b/pkgs/development/libraries/miopengemm/default.nix @@ -1,28 +1,22 @@ { lib , stdenv , fetchFromGitHub +, rocmUpdateScript , cmake , rocm-cmake , rocm-opencl-runtime -, clang -, texlive ? null -, doxygen ? null -, sphinx ? null -, python3Packages ? null -, openblas ? null -, buildDocs ? false +, texlive +, doxygen +, sphinx +, openblas +, python3Packages +, buildDocs ? true , buildTests ? false , buildBenchmarks ? false }: -assert buildDocs -> texlive != null; -assert buildDocs -> doxygen != null; -assert buildDocs -> sphinx != null; -assert buildDocs -> python3Packages != null; -assert buildTests -> openblas != null; - let - latex = lib.optionalAttrs buildDocs (texlive.combine { + latex = lib.optionalAttrs buildDocs texlive.combine { inherit (texlive) scheme-small latexmk tex-gyre @@ -34,16 +28,15 @@ let tabulary varwidth titlesec; - }); -in stdenv.mkDerivation rec { + }; +in stdenv.mkDerivation (finalAttrs: { pname = "miopengemm"; - rocmVersion = "5.3.1"; - version = rocmVersion; + version = "5.4.2"; outputs = [ "out" ] ++ lib.optionals buildDocs [ - "docs" + "doc" ] ++ lib.optionals buildTests [ "test" ] ++ lib.optionals buildBenchmarks [ @@ -53,14 +46,13 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "MIOpenGEMM"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-AiRzOMYRA/0nbQomyq4oOEwNZdkPYWRA2W6QFlctvFc="; }; nativeBuildInputs = [ cmake rocm-cmake - clang ]; buildInputs = [ @@ -69,15 +61,13 @@ in stdenv.mkDerivation rec { latex doxygen sphinx - python3Packages.sphinx_rtd_theme + python3Packages.sphinx-rtd-theme python3Packages.breathe ] ++ lib.optionals buildTests [ openblas ]; cmakeFlags = [ - "-DCMAKE_C_COMPILER=clang" - "-DCMAKE_CXX_COMPILER=clang++" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" @@ -103,27 +93,31 @@ in stdenv.mkDerivation rec { make examples ''; - postInstall = lib.optionalString buildTests '' + postInstall = lib.optionalString buildDocs '' + mv ../doc/html $out/share/doc/miopengemm + mv ../doc/pdf/miopengemm.pdf $out/share/doc/miopengemm + '' + lib.optionalString buildTests '' mkdir -p $test/bin find tests -executable -type f -exec mv {} $test/bin \; - patchelf --set-rpath ${lib.makeLibraryPath buildInputs}:$out/lib $test/bin/* + patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib $test/bin/* '' + lib.optionalString buildBenchmarks '' mkdir -p $benchmark/bin find examples -executable -type f -exec mv {} $benchmark/bin \; - patchelf --set-rpath ${lib.makeLibraryPath buildInputs}:$out/lib $benchmark/bin/* + patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib $benchmark/bin/* ''; - postFixup = lib.optionalString buildDocs '' - mkdir -p $docs/share/doc/miopengemm - mv ../doc/html $docs/share/doc/miopengemm - mv ../doc/pdf/miopengemm.pdf $docs/share/doc/miopengemm - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "OpenCL general matrix multiplication API for ROCm"; homepage = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; - broken = rocmVersion != clang.version; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; -} +}) diff --git a/pkgs/development/libraries/mitama-cpp-result/default.nix b/pkgs/development/libraries/mitama-cpp-result/default.nix new file mode 100644 index 000000000000..9ae718de4db5 --- /dev/null +++ b/pkgs/development/libraries/mitama-cpp-result/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mitama-cpp-result"; + version = "9.3.0"; + + src = fetchFromGitHub { + owner = "LoliGothick"; + repo = "mitama-cpp-result"; + rev = "v${finalAttrs.version}"; + hash = "sha256-CWYVPpmPIZZTsqXKh+Ft3SlQ4C9yjUof1mJ8Acn5kmM="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + homepage = "https://github.com/LoliGothick/mitama-cpp-result"; + description = "A Library that provides `result` and `maybe` and monadic functions for them"; + longDescription = '' + mitama-cpp-result is the C++17 libraries for error handling without exceptions. + + mitama-cpp-result provides `result`, `maybe`, and associated monadic functions + (like Result and Option in Programming Language Rust). + ''; + license = licenses.mit; + maintainers = with maintainers; [ ken-matsui ]; + platforms = platforms.unix; + }; +}) +# TODO [ ken-matsui ]: tests diff --git a/pkgs/development/libraries/mlib/default.nix b/pkgs/development/libraries/mlib/default.nix index 4f9c44e15c4f..1960d1e8a202 100644 --- a/pkgs/development/libraries/mlib/default.nix +++ b/pkgs/development/libraries/mlib/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mlib"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "P-p-H-d"; repo = pname; rev = "V${version}"; - hash = "sha256-LoDw9nQdEtXuTs0wncScrc2+Z7BW61ps5ee9OfQE4M0="; + hash = "sha256-obQD3TWuGCAs5agnaiJF5Rasn8J283H/cdvKCCAzcB8="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=$(out)" ]; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index bd83e1caf572..f57ac10468b7 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_4, frei0r, libjack2, libdv, libsamplerate, libexif , libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 -, gtk2, gitUpdater, libebur128 +, gtk2, gitUpdater, libebur128, rubberband , jack2, ladspa-sdk, swig, which, ncurses , enablePython ? false, python3 }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL ffmpeg_4 frei0r libjack2 libdv libsamplerate libvorbis libxml2.dev movit sox libexif gtk2 fftw libebur128 opencv4 SDL2 jack2 - ladspa-sdk + ladspa-sdk rubberband ] ++ lib.optional enablePython ncurses; nativeBuildInputs = [ pkg-config makeWrapper which ] diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index dad94c29d724..c2d4e6aa56d8 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -16,23 +16,24 @@ , qtsvg , fftw , vid-stab -, opencv3 +, opencv4 , ladspa-sdk , gitUpdater , ladspaPlugins +, rubberband , mkDerivation , which }: mkDerivation rec { pname = "mlt"; - version = "7.8.0"; + version = "7.12.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "sha256-r8lvzz083WWlDtjvlsPwvOgplx2lPPkDDf3t0G9PqAQ="; + sha256 = "sha256-Y7lbfwA0lkQB3PjYQIQaQ0BeXGcgyCmMnDqqZJ8zUaA="; }; buildInputs = [ @@ -50,9 +51,10 @@ mkDerivation rec { sox fftw vid-stab - opencv3 + opencv4 ladspa-sdk ladspaPlugins + rubberband ]; nativeBuildInputs = [ cmake which pkg-config ]; @@ -62,6 +64,7 @@ mkDerivation rec { cmakeFlags = [ # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" + "-DMOD_OPENCV=ON" ]; qtWrapperArgs = [ diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index e1eaa1d924b7..225ce967080d 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.4"; + version = "1.0.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "6VTAm0MJp++T4TtpJgrNxXOMkHR36zgbeLseQU7m29g="; + sha256 = "cFxtKfQRaim95ONs/BsEbJK274xtrk6uyFAYdH5tpao="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 8b5753b3aca9..ecb247de0ba4 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -1,19 +1,36 @@ -{ lib, stdenv, fetchzip, perl, pkg-config, libbson -, openssl, which, zlib, snappy +{ + lib, + stdenv, + fetchzip, + cmake, + pkg-config, + perl, + openssl, + zlib, + cyrus_sasl, + libbson, + snappy, }: - stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.8.0"; + version = "1.23.1"; src = fetchzip { url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"; sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8"; }; - nativeBuildInputs = [ pkg-config which perl ]; - buildInputs = [ openssl zlib ]; - propagatedBuildInputs = [ libbson snappy ]; + # https://github.com/NixOS/nixpkgs/issues/25585 + preFixup = ''rm -rf "$(pwd)" ''; + + nativeBuildInputs = [cmake pkg-config perl]; + buildInputs = [openssl zlib cyrus_sasl]; + propagatedBuildInputs = [libbson snappy]; + + # -DMONGOC_TEST_USE_CRYPT_SHARED=OFF + # The `mongodl.py` script is causing issues, and you also need to disabled sandboxing for it. However, it is used only to run some tests. + # https://www.mongodb.com/community/forums/t/problem-downloading-crypt-shared-when-installing-the-mongodb-c-driver/189370 + cmakeFlags = ["-DCMAKE_BUILD_TYPE=Release" "-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF" "-DMONGOC_TEST_USE_CRYPT_SHARED=OFF"]; enableParallelBuilding = true; @@ -22,6 +39,7 @@ stdenv.mkDerivation rec { homepage = "http://mongoc.org"; license = licenses.asl20; mainProgram = "mongoc-stat"; + maintainers = with maintainers; [archer-65]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix index f99bd8f2630e..92d0098fc984 100644 --- a/pkgs/development/libraries/motif/default.nix +++ b/pkgs/development/libraries/motif/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, libtool -, xlibsWrapper, xbitmaps, libXrender, libXmu, libXt +, xbitmaps, libXext, libXft, libXrender, libXmu, libXt , expat, libjpeg, libpng, libiconv , flex , libXp, libXau @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool - xlibsWrapper xbitmaps libXrender libXmu libXt + xbitmaps libXext libXft libXrender libXmu libXt expat libjpeg libpng libiconv ]; diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index fe0049c1f384..b00b3517313e 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -2,29 +2,17 @@ stdenv.mkDerivation rec { pname = "mp4v2"; - version = "4.1.3"; + version = "5.0.1"; src = fetchFromGitHub { # 2020-06-20: THE current upstream, maintained and used in distros fork. owner = "TechSmith"; repo = "mp4v2"; rev = "Release-ThirdParty-MP4v2-${version}"; - sha256 = "053a0lgy819sbz92cfkq0vmkn2ky39bva554pj4ypky1j6vs04fv"; + sha256 = "sha256-OP+oVTH9pqYfHtYL1Kjrs1qey/J40ijLi5Gu8GJnvSY="; }; - patches = [ - (fetchurl { - # 2020-06-19: NOTE: # Fix build with C++11 - # Close when https://github.com/TechSmith/mp4v2/pull/36 merged/closed. - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/203f5a72bc97ffe089b424c47b07dd9eaea35713/trunk/libmp4v2-c++11.patch"; - sha256 = "0sbn0il7lmk77yrjyb4f0a3z3h8gsmdkscvz5n9hmrrrhrwf672w"; - }) - ] ++ lib.optionals stdenv.cc.isClang [ - # unbreak build with Clang≥6 (C++14 by default). Based on https://reviews.freebsd.org/rP458678 - ./fix-build-clang.patch - ]; - - NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=narrowing"; # `faac' expects `mp4.h'. postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h"; diff --git a/pkgs/development/libraries/mpdecimal/default.nix b/pkgs/development/libraries/mpdecimal/default.nix new file mode 100644 index 000000000000..5fa03b7083e2 --- /dev/null +++ b/pkgs/development/libraries/mpdecimal/default.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "mpdecimal"; + version = "2.5.1"; + outputs = [ "out" "doc" ]; + + src = fetchurl { + url = "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-${version}.tar.gz"; + hash = "sha256-n5zUwEH5m1xJ/7e1nZ8S2VtoPYhYVgiqVqYwdmeysh8="; + }; + + configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ]; + + meta = { + description = "Library for arbitrary precision decimal floating point arithmetic"; + + longDescription = '' + libmpdec is a fast C/C++ library for correctly-rounded arbitrary + precision decimal floating point arithmetic. It is a complete + implementation of Mike Cowlishaw/IBM's General Decimal Arithmetic + Specification. The full specification is available here: + + http://speleotrove.com/decimal/ + + libmpdec will - with minor restrictions - also conform to the IEEE + 754-2008 Standard for Floating-Point Arithmetic, provided that the + appropriate context parameters are set. + + libmpdec++ is a complete implementation of the General Decimal Arithmetic + Specification. libmpdec++ is mostly a header library around libmpdec's C + functions. + ''; + + homepage = "https://www.bytereef.org/mpdecimal/index.html"; + + downloadPage = "https://www.bytereef.org/mpdecimal/download.html"; + + changelog = "https://www.bytereef.org/mpdecimal/changelog.html"; + + license = lib.licenses.bsd2; + + maintainers = with lib.maintainers; [ kaction ]; + + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index bf1625cf2f9f..e0a33e27c12c 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, gmp }: +{ lib +, stdenv +, fetchurl +, gmp +, writeScript +}: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -6,15 +11,15 @@ # files. stdenv.mkDerivation rec { - version = "4.1.0"; + version = "4.2.0"; pname = "mpfr"; src = fetchurl { urls = [ - #"https://www.mpfr.org/${name}/${name}.tar.xz" + "https://www.mpfr.org/${pname}-${version}/${pname}-${version}.tar.xz" "mirror://gnu/mpfr/${pname}-${version}.tar.xz" ]; - sha256 = "0zwaanakrqjf84lfr5hfsdr7hncwv9wj0mchlr7cmxigfgqs760c"; + hash = "sha256-BqN43xNQEkjBsttaqXeiyBJq6Emp2be+JUb7Spwm2ZM="; }; outputs = [ "out" "dev" "doc" "info" ]; @@ -31,6 +36,20 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + updateScript = writeScript "update-mpfr" '' + #!/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 'GNU MPFR version 4.1.1' + new_version="$(curl -s https://www.mpfr.org/mpfr-current/ | + pcregrep -o1 'GNU MPFR version ([0-9.]+)')" + update-source-version ${pname} "$new_version" + ''; + }; + meta = { homepage = "https://www.mpfr.org/"; description = "Library for multiple-precision floating-point arithmetic"; diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 14dddf1f29fd..c4d26e009275 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.3"; + version = "4.1"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "sha256-F0BuqQpu1OzVvjnJ3cv6yTQ+arT3esToxevko+O2xQE="; + sha256 = "sha256-ix7GO8RMfKoq+7RXvFs81KcNvka6unABI9Z8SNxatqA="; }; configureFlags = [ diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index b7d31066de1a..8ccad867ea89 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -1,9 +1,11 @@ -{ lib, stdenv, fetchurl, m4, which, yasm }: +{ lib, stdenv, fetchurl, m4, which, yasm, buildPackages }: stdenv.mkDerivation rec { pname = "mpir"; version = "3.0.0"; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ m4 which yasm ]; src = fetchurl { diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index 4a510762f7f0..9e6a45e2975a 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, evdev-proto }: stdenv.mkDerivation rec { pname = "mtdev"; @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1q700h9dqcm3zl6c3gj0qxxjcx6ibw2c51wjijydhwdcm26v5mqm"; }; + buildInputs = lib.optional stdenv.hostPlatform.isFreeBSD evdev-proto; + meta = with lib; { - homepage = "http://bitmath.org/code/mtdev/"; + homepage = "https://bitmath.org/code/mtdev/"; description = "Multitouch Protocol Translation Library"; longDescription = '' The mtdev is a stand-alone library which transforms all variants of @@ -20,6 +22,6 @@ stdenv.mkDerivation rec { See the kernel documentation for further details. ''; license = licenses.mit; - platforms = platforms.linux; + platforms = with platforms; freebsd ++ linux; }; } diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 7f4585c640e1..a3b829a754a8 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -1,26 +1,28 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , cmake , pkg-config -, openssl -, olm -, spdlog -, nlohmann_json , coeurl -, libevent , curl +, libevent +, nlohmann_json +, olm +, openssl +, re2 +, spdlog }: stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.8.2"; + version = "0.9.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "sha256-x2c+wZWAWYoKxSqEezoInw3SwcGo9dQNDvuq7racLBA="; + hash = "sha256-34iwYn9EOAl2c9UWERyzgwlZ+539jW9FygNYwgZ7ClU="; }; postPatch = '' @@ -39,16 +41,21 @@ stdenv.mkDerivation rec { cmake pkg-config ]; + buildInputs = [ - spdlog - nlohmann_json - openssl - olm coeurl - libevent curl + libevent + nlohmann_json + olm + openssl + re2 + spdlog ]; + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + meta = with lib; { description = "Client API library for the Matrix protocol."; homepage = "https://github.com/Nheko-Reborn/mtxclient"; diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix index f213f39c06d3..910a25134989 100644 --- a/pkgs/development/libraries/muparser/default.nix +++ b/pkgs/development/libraries/muparser/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "muparser"; version = "2.2.3"; - url-version = lib.replaceChars ["."] ["_"] version; + url-version = lib.replaceStrings ["."] ["_"] version; src = fetchurl { url = "mirror://sourceforge/muparser/muparser_v${url-version}.zip"; diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index 740c1fec8834..b49f9ca6e2de 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -1,9 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, libX11, cmake, ois, freetype, libuuid, - boost, pkg-config, withOgre ? false, ogre ? null, libGL, libGLU ? null } : +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, boost +, freetype +, libuuid +, ois +, withOgre ? false +, ogre +, libGL +, libGLU +, libX11 +, Cocoa +}: let renderSystem = if withOgre then "3" else "4"; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "mygui"; version = "3.4.0"; @@ -14,17 +29,42 @@ in stdenv.mkDerivation rec { sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w"; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libX11 ois freetype libuuid boost ] - ++ (if withOgre then [ ogre ] else [ libGL libGLU ]); + patches = [ + ./disable-framework.patch + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + boost + freetype + libuuid + ois + ] ++ lib.optionals withOgre [ + ogre + ] ++ lib.optionals (!withOgre && stdenv.isLinux) [ + libGL + libGLU + ] ++ lib.optionals stdenv.isLinux [ + libX11 + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + ]; # Tools are disabled due to compilation failures. - cmakeFlags = [ "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" ]; + cmakeFlags = [ + "-DMYGUI_BUILD_TOOLS=OFF" + "-DMYGUI_BUILD_DEMOS=OFF" + "-DMYGUI_RENDERSYSTEM=${renderSystem}" + ]; meta = with lib; { homepage = "http://mygui.info/"; description = "Library for creating GUIs for games and 3D applications"; license = licenses.lgpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/mygui/disable-framework.patch b/pkgs/development/libraries/mygui/disable-framework.patch new file mode 100644 index 000000000000..502e58ac3625 --- /dev/null +++ b/pkgs/development/libraries/mygui/disable-framework.patch @@ -0,0 +1,19 @@ +diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake +index bba3f91..8f4f351 100644 +--- a/CMake/Utils/MyGUIConfigTargets.cmake ++++ b/CMake/Utils/MyGUIConfigTargets.cmake +@@ -477,14 +477,6 @@ function(mygui_config_lib PROJECTNAME) + if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel") + # add GCC visibility flags to shared library build + set_target_properties(${PROJECTNAME} PROPERTIES COMPILE_FLAGS "${MYGUI_GCC_VISIBILITY_FLAGS}") +- if (APPLE) +- # deal with Mac OS X's framework system +- set_target_properties(${PROJECTNAME} PROPERTIES FRAMEWORK TRUE) +- set_target_properties(${PROJECTNAME} PROPERTIES PUBLIC_HEADER "${${PROJECTNAME}_HEADERS}") +- set_target_properties(${PROJECTNAME} PROPERTIES OUTPUT_NAME ${PROJECTNAME}) +- set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE) +- set_target_properties(${PROJECTNAME} PROPERTIES INSTALL_NAME_DIR "@executable_path/../Frameworks") +- endif (APPLE) + endif () + endif (MYGUI_STATIC) + mygui_install_target(${PROJECTNAME} "") diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 5ee10c854a55..880f5d50a042 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -49,15 +49,11 @@ stdenv.mkDerivation rec { printf %s 'https://AnotherFoxGuy.com/CMakeCM::modules/JoinPaths.cmake.1' > JoinPaths.cmake.whence )''; - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace src/Makefile \ - --replace -Wl,-soname, -Wl,-install_name,$out/lib/ - ''; - meta = with lib; { description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; homepage = "https://github.com/RigsOfRods/socketw"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix index 2c4312d6498d..4683940b9cc6 100644 --- a/pkgs/development/libraries/mythes/default.nix +++ b/pkgs/development/libraries/mythes/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ncurses pkg-config perl ]; meta = { - homepage = "http://hunspell.sourceforge.net/"; + homepage = "https://hunspell.sourceforge.net/"; description = "Thesaurus library from Hunspell project"; license = lib.licenses.bsd3; inherit (hunspell.meta) platforms; diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 9d90e399ca77..46861f216c88 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }: +{ lib, stdenv, fetchFromGitHub, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils, libtool }: stdenv.mkDerivation rec { pname = "nco"; - version = "5.0.6"; + version = "5.1.4"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = version; - sha256 = "sha256-LmxHgSBBqXK5M4KOthd8R+H5EY3O5lueb2gnw5mK8Xw="; + sha256 = "sha256-M2GP92SIs4B92Re8McGKIIjQJ+qXAr/TwDtFKcH/zsk="; }; nativeBuildInputs = [ flex which antlr2 ]; @@ -22,14 +22,16 @@ stdenv.mkDerivation rec { --replace "/bin/mv" "${coreutils}/bin/mv" ''; + makeFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${libtool}/bin/libtool" ]; + enableParallelBuilding = true; meta = with lib; { description = "NetCDF Operator toolkit"; longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5"; - homepage = "http://nco.sourceforge.net/"; + homepage = "https://nco.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ bzizou ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 2cfe41956a4b..4caf05ef3cfe 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -11,16 +11,12 @@ }: stdenv.mkDerivation rec { - ver = "6.3"; - # We pick fresh intermediate release to get a fix for CVE-2022-29458 - # which was fixed in 20220416 patchset. - patchver = "20220507"; - version = "${ver}-p${patchver}"; + version = "6.4"; pname = "ncurses" + lib.optionalString (abiVersion == "5") "-abi5-compat"; src = fetchurl { - url = "https://invisible-island.net/archives/ncurses/current/ncurses-${ver}-${patchver}.tgz"; - sha256 = "02y4n4my5qqhw3fdhdjv1zc9xpyglzlzmzjwq2zcwbwv738255ja"; + url = "https://invisible-island.net/archives/ncurses/ncurses-${version}.tar.gz"; + hash = "sha256-aTEoPZrIfFBz8wtikMTHXyFjK7T8NgOsgQCBK+0kgVk="; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index 410ede638c06..ee05d2606def 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://named-data.net/"; - description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; + description = "A Named Data Networking (NDN) or Content Centric Networking (CCN) abstraction"; longDescription = '' ndn-cxx is a C++ library, implementing Named Data Networking (NDN) primitives that can be used to implement various NDN applications. diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index aeade2f22c14..0b4426f1a2a7 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -1,20 +1,52 @@ -{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja -, pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml, mesa, ffmpeg +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, aml +, ffmpeg +, gnutls +, libjpeg_turbo +, mesa +, pixman +, zlib }: stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.5.4"; + version = "0.6.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IZUCNHhlDhq0KlUjkp3Yh5ysJsThlGw1FLHSaFe4Z0Q="; + sha256 = "sha256-3hNdgfAJGJkMXdB86+u3bKwrvXoMei1YCFXDG4ObkU4="; }; - nativeBuildInputs = [ meson pkg-config ninja ]; - buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml mesa ffmpeg ]; + strictDeps = true; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + aml + ffmpeg + gnutls + libjpeg_turbo + mesa + pixman + zlib + ]; + + mesonFlags = [ + (lib.mesonBool "tests" true) + ]; + + doCheck = true; meta = with lib; { description = "A VNC server library"; diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index 698a8152a445..82d0e8c132d0 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; buildInputs = [ netcdf hdf5 curl ]; - doCheck = true; + # 10 - cxx4_test_filter (Failed) + # Setting Filter....Caught unexpected exception. + doCheck = false; enableParallelChecking = false; meta = { diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 76478bc80c65..188dd586797b 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { ''; doCheck = !(mpiSupport || (stdenv.isDarwin && stdenv.isAarch64)); - checkInputs = [ unzip ]; + nativeCheckInputs = [ unzip ]; preCheck = '' export HOME=$TEMP diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 8e3264dcbc51..2fae8135124e 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -31,11 +31,11 @@ assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.49.0"; + version = "1.51.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-LNTbfXX3FJQVMknL6UoJLaTG7NdCQPirGM9kTZ1l9u4="; + sha256 = "sha256-6z6m9bYMbT7b8GXgT0NOjtYpGlyxoHkZxBcwqx/MAOA="; }; outputs = [ "bin" "out" "dev" "lib" ] @@ -58,11 +58,14 @@ stdenv.mkDerivation rec { "--disable-examples" (lib.enableFeature enableApp "app") ] ++ lib.optionals (enableAsioLib) [ "--enable-asio-lib" "--with-boost-libdir=${boost}/lib" ] - ++ lib.optionals (enablePython) [ "--with-cython=${python3Packages.cython}/bin/cython" ]; + ++ lib.optionals (enablePython) [ + "--enable-python-bindings" + "--with-cython=${python3Packages.cython}/bin/cython" + ]; # Unit tests require CUnit and setting TZDIR environment variable doCheck = enableTests; - checkInputs = lib.optionals (enableTests) [ cunit tzdata ]; + nativeCheckInputs = lib.optionals (enableTests) [ cunit tzdata ]; preCheck = lib.optionalString (enableTests) '' export TZDIR=${tzdata}/share/zoneinfo ''; @@ -82,6 +85,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit curl libsoup; + python-nghttp2 = python3Packages.nghttp2; }; meta = with lib; { diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index 3638422bb0cd..af83fb29c01e 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -5,19 +5,19 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LSHhvRTzqpGJcyK3KoZZjbZVggXpgDEEVpp8gMoaE7U="; + sha256 = "sha256-Zexcfkf8Br3wduUpM3tcS68fEVO6reNxYSB3X3qUWKg="; }; outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ autoreconfHook pkg-config file ]; - checkInputs = [ cunit ncurses ]; + nativeCheckInputs = [ cunit ncurses ]; preConfigure = '' substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index 0611bccbf402..d6cacc0aa7f7 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -7,20 +7,20 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.11.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u6orYF/VzXpcUdCitPawoet3KAhXlTQ2giR5eTQkrLY="; + sha256 = "sha256-nUUbGNxr2pGiEoYbArHppNE29rki9SM/3MZWMS9HmqY="; }; outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc; - checkInputs = [ cunit ncurses ]; + nativeCheckInputs = [ cunit ncurses ]; cmakeFlags = [ "-DENABLE_STATIC_LIB=OFF" diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index 6d623a308f0c..ef73f06e34a1 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.10.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - sha256 = "sha256-zDiJlwcDTLCU+WpJ6Jz6tve4oV+XMRYOtppC2fj/HgU="; + sha256 = "sha256-rKEF5R1GubgFiblmdTqh26PxTRxIqXUJHxj0Qwd3N00="; }; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; - checkInputs = [ cunit ] + nativeCheckInputs = [ cunit ] ++ lib.optional stdenv.isDarwin ncurses; passthru.tests = knot-dns.passthru.tests; # the only consumer so far diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 70699db418ad..3c8244c75532 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -24,7 +24,8 @@ in stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBuildTests=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DJSON_BuildTests=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DJSON_FastTests=ON" "-DJSON_MultipleHeaders=ON" ] ++ lib.optional finalAttrs.doCheck "-DJSON_TestDataDirectory=${testData}"; diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix index a0a5ddfa9c2d..67c640ddb265 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.8"; + version = "3.0.9"; src = fetchFromGitHub { owner = "dankamongmen"; repo = "notcurses"; rev = "v${version}"; - sha256 = "sha256-5SNWk1iKDNbyoo413Qvzl2bGaR5Lb+q/UPbPQg7YvRU="; + sha256 = "sha256-8SJeqLcV4xp968YgGsJccsgpB5wwaJDaoWsaYxf8upM="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix index 2a3b25bc5827..c3f04cf6b15b 100644 --- a/pkgs/development/libraries/nss/esr.nix +++ b/pkgs/development/libraries/nss/esr.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "3.79.2"; - hash = "sha256-hwcHDI74CgYp2vhQyKspKQ6T/O55f6g/cZvb9z1np4E="; + version = "3.79.3"; + hash = "sha256-8fhrlMe832xWYTYVMnZE7MV20W8sMX+5hHDcAcWYSA4="; } diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index a2e44f40227f..e1b6abc5b253 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -103,7 +103,14 @@ stdenv.mkDerivation rec { runHook postBuild ''; - NIX_CFLAGS_COMPILE = "-Wno-error -DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\" " + lib.optionalString stdenv.hostPlatform.is64bit "-DNSS_USE_64=1"; + NIX_CFLAGS_COMPILE = [ + "-Wno-error" + "-DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\"" + ] ++ lib.optionals stdenv.hostPlatform.is64bit [ + "-DNSS_USE_64=1" + ] ++ lib.optionals stdenv.hostPlatform.isILP32 [ + "-DNS_PTR_LE_32=1" # See RNG_RandomUpdate() in drdbg.c + ]; installPhase = '' runHook preInstall diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 56d6c0e47103..6f3e73639b9e 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.85"; - hash = "sha256-r9nWRRCxFU3rvWyrNXHp/2SjNziY4DSD5Mhc2toT0pc="; + version = "3.87"; + hash = "sha256-aKGJRJbT0Vi6vHX4pd2j9Vt8FWBXOTbjsQGhD6SsFS0="; } diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix index 391f96734d23..9a6d9c7194cf 100644 --- a/pkgs/development/libraries/ntbtls/default.nix +++ b/pkgs/development/libraries/ntbtls/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ntbtls"; - version = "0.2.0"; + version = "0.3.1"; src = fetchurl { url = "mirror://gnupg/ntbtls/ntbtls-${version}.tar.bz2"; - sha256 = "sha256-ZJ/nSjEdE+Q7FrJuuqkWZd22MpJbc5AlkurD7TBRnhc="; + sha256 = "sha256-iSIYH+9SO3e3FiXlYuTWlTInjqu9GLx0V52+FBNXKbo="; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/development/libraries/ntirpc/default.nix index 95003a0b00ef..4526814c3780 100644 --- a/pkgs/development/libraries/ntirpc/default.nix +++ b/pkgs/development/libraries/ntirpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ntirpc"; - version = "4.1"; + version = "4.3"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "ntirpc"; rev = "v${version}"; - sha256 = "sha256-RTuWj795YrXVo3TIiEr3Dy/QmSL5Ch0VVc4gRlDhNTM="; + sha256 = "sha256-P9+t9dTiEKjloulypWPJ4sXWWemq9zPUH/Kctvq1SUQ="; }; postPatch = '' diff --git a/pkgs/development/libraries/nuraft/default.nix b/pkgs/development/libraries/nuraft/default.nix index 232fdfc512f0..d8a56a7a5bfe 100644 --- a/pkgs/development/libraries/nuraft/default.nix +++ b/pkgs/development/libraries/nuraft/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuraft"; - version = "1.3.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "eBay"; repo = "NuRaft"; rev = "v${version}"; - sha256 = "sha256-Fyy9B5CXyMcDSOdqaeJ4ejo1svM90ESXuNL0rzsTZpE="; + sha256 = "sha256-puO8E7tSLqB0oq/NlzEZqQgIZKm7ZUb4HhR0XuI9dco="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/nuspell/wrapper.nix b/pkgs/development/libraries/nuspell/wrapper.nix index 64108c33b7c1..b3a929545f24 100644 --- a/pkgs/development/libraries/nuspell/wrapper.nix +++ b/pkgs/development/libraries/nuspell/wrapper.nix @@ -1,10 +1,10 @@ { stdenv, lib, nuspell, makeWrapper, dicts ? [] }: -with lib; + let - searchPath = makeSearchPath "share/hunspell" dicts; + searchPath = lib.makeSearchPath "share/hunspell" dicts; in stdenv.mkDerivation { - name = (appendToName "with-dicts" nuspell).name; + name = (lib.appendToName "with-dicts" nuspell).name; nativeBuildInputs = [ makeWrapper ]; buildCommand = '' makeWrapper ${nuspell}/bin/nuspell $out/bin/nuspell --prefix DICPATH : ${lib.escapeShellArg searchPath} diff --git a/pkgs/development/libraries/nv-codec-headers/11_x.nix b/pkgs/development/libraries/nv-codec-headers/11_x.nix index 284905cd4aa3..fba333ff6dbe 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.1"; + version = "11.1.5.2"; src = fetchgit { url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; rev = "n${version}"; - sha256 = "sha256-yTOKLjyYLxT/nI1FBOMwHpkDhfuua3+6Z5Mpb7ZrRhU="; + sha256 = "sha256-KzaqwpzISHB7tSTruynEOJmSlJnAFK2h7/cRI/zkNPk="; }; makeFlags = [ diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index 3554457d3f27..ca09af9ef233 100644 --- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "nvidia-vaapi-driver"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "elFarto"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c74XJW9e8sgjBuTpZQOgIvgEoP73aQlx6beE6bChYfw="; + sha256 = "sha256-RMFkClaWoFNeSglV5otS/rzI6JNQMiAHDzH3DoEHA5I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index 211821e084cc..f82a67b76e1c 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ode"; - version = "0.16.2"; + version = "0.16.3"; src = fetchurl { url = "https://bitbucket.org/odedevs/${pname}/downloads/${pname}-${version}.tar.gz"; - sha256 = "08hgh4gqdk77jcw8b7gq2mwsfg4a5v5y0j7g42bxiqhmn3ffnsmj"; + sha256 = "sha256-x0Hb9Jv8Rozilkgk5bw/kG6pVrGuNZTFDTUcOD8DxBM="; }; meta = with lib; { diff --git a/pkgs/development/libraries/ogdf/default.nix b/pkgs/development/libraries/ogdf/default.nix index bee64afd2900..e88fc796ba77 100644 --- a/pkgs/development/libraries/ogdf/default.nix +++ b/pkgs/development/libraries/ogdf/default.nix @@ -2,31 +2,29 @@ stdenv.mkDerivation rec { pname = "ogdf"; - version = "2020.02"; + version = "2022.02"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "catalpa-202002"; - sha256 = "0drrs8zh1097i5c60z9g658vs9k1iinkav8crlwk722ihfm1vxqd"; + rev = "dogwood-202202"; + sha256 = "sha256-zkQ6sS0EUmiigv3T7To+tG3XbFbR3XEbFo15oQ0bWf0="; }; nativeBuildInputs = [ cmake doxygen ]; - cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-fPIC" ]; - - # Without disabling hardening for format, the build fails with - # the following error. - #> /build/source/src/coin/CoinUtils/CoinMessageHandler.cpp:766:35: error: format not a string literal and no format arguments [-Werror=format-security] - #> 766 | sprintf(messageOut_,format_+2); - hardeningDisable = [ "format" ]; + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-fPIC" + "-DBUILD_SHARED_LIBS=ON" + "-DOGDF_WARNING_ERRORS=OFF" + ]; meta = with lib; { description = "Open Graph Drawing Framework/Open Graph algorithms and Data structure Framework"; homepage = "http://www.ogdf.net"; license = licenses.gpl2; maintainers = [ maintainers.ianwookim ]; - platforms = platforms.i686 ++ platforms.x86_64; + platforms = platforms.all; longDescription = '' OGDF stands both for Open Graph Drawing Framework (the original name) and Open Graph algorithms and Data structures Framework. diff --git a/pkgs/development/libraries/ogre/1.10.x.nix b/pkgs/development/libraries/ogre/1.10.x.nix index cd65630879ef..73f15b744bf5 100644 --- a/pkgs/development/libraries/ogre/1.10.x.nix +++ b/pkgs/development/libraries/ogre/1.10.x.nix @@ -1,50 +1,110 @@ -{ fetchurl, stdenv, lib -, cmake, libGLU, libGL -, freetype, freeimage, zziplib, xorgproto, libXrandr -, libXaw, freeglut, libXt, libpng, boost, ois -, libX11, libXmu, libSM, pkg-config -, libXxf86vm, libICE +{ lib +, stdenv +, fetchurl +, fetchpatch +, cmake +, pkg-config +, boost +, freeimage +, freetype +, libpng +, ois +, zziplib +, freeglut +, libGL +, libGLU +, libICE +, libSM +, libX11 +, libXaw +, libXmu +, libXrandr , libXrender -, withNvidiaCg ? false, nvidia_cg_toolkit -, withSamples ? false }: +, libXt +, libXxf86vm +, xorgproto +, darwin +, withNvidiaCg ? false +, nvidia_cg_toolkit +, withSamples ? false +}: +let + inherit (darwin.apple_sdk.frameworks) AGL Cocoa; +in stdenv.mkDerivation rec { pname = "ogre"; version = "1.10.11"; src = fetchurl { - url = "https://bitbucket.org/sinbad/ogre/get/v${lib.replaceStrings ["."] ["-"] version}.tar.gz"; - sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a"; + url = "https://bitbucket.org/sinbad/ogre/get/v${lib.replaceStrings ["."] ["-"] version}.tar.gz"; + sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a"; }; - # fix for ARM. sys/sysctl.h has moved in later glibcs, and - # https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't - # needed anyway. - postPatch = '' - substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \ - --replace '#include ' "" - ''; + patches = [ + # aarch64-darwin support + (fetchpatch { + url = "https://github.com/OGRECave/ogre/commit/bd5fbe3482c56e58c6c3b3bf439b1eab8c1be258.patch"; + includes = [ "OgreMain/include/OgrePlatform*.h" ]; + sha256 = "sha256-ELeCklQkltz7DeDaGl78Jk1H3Wdfu8fMUiMZaJM4s/Y="; + }) + (fetchpatch { + url = "https://github.com/OGRECave/ogre/commit/0873244cc06b613ca2afbcb5522fe9ef89f111c5.patch"; + sha256 = "sha256-xGvlMB55B2rdthxNMIM5iFf9p/6zuE8bGL9P04qtweQ="; + }) + # aarch64-linux support + (fetchpatch { + name = "fix-build-on-aarch64-linux.patch"; + url = "https://github.com/OGRECave/ogre/commit/8ec086e9bc2e24fab373b514c572483b69071d69.patch"; + sha256 = "sha256-22wlJPZ7lRIPAMqvpI/2YI0neQjGi1UXt8y5zNSpxCw="; + }) + ]; - cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] - ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") - ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") - ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = - [ libGLU libGL - freetype freeimage zziplib xorgproto libXrandr - libXaw freeglut libXt libpng boost ois - libX11 libXmu libSM - libXxf86vm libICE - libXrender - ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; + buildInputs = [ + boost + freeimage + freetype + libpng + ois + zziplib + ] ++ lib.optionals stdenv.isLinux [ + freeglut + libGL + libGLU + libICE + libSM + libX11 + libXaw + libXmu + libXrandr + libXrender + libXt + libXxf86vm + xorgproto + ] ++ lib.optionals stdenv.isDarwin [ + AGL + Cocoa + ] ++ lib.optionals withNvidiaCg [ + nvidia_cg_toolkit + ]; + + cmakeFlags = [ + "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE" + "-DOGRE_BUILD_SAMPLES=${toString withSamples}" + ] ++ lib.optionals stdenv.isDarwin [ + "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE" + ]; meta = { - description = "A 3D engine"; + description = "3D Object-Oriented Graphics Rendering Engine"; homepage = "https://www.ogre3d.org/"; - maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ raskin wegank ]; + platforms = lib.platforms.unix; license = lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 2017d5435ea4..63174807829e 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -1,29 +1,34 @@ -{ fetchFromGitHub +{ lib , stdenv -, lib +, fetchFromGitHub , cmake -, libGLU -, libGL -, freetype -, freeimage -, zziplib -, xorgproto -, libXrandr -, libXaw -, freeglut -, libXt -, libpng -, boost -, ois -, libX11 -, libXmu -, libSM , pkg-config -, libXxf86vm -, libICE , unzip -, libXrender , SDL2 +, boost +, freeimage +, freetype +, libpng +, ois +, pugixml +, zziplib + # linux +, freeglut +, libGL +, libGLU +, libICE +, libSM +, libX11 +, libXaw +, libXmu +, libXrandr +, libXrender +, libXt +, libXxf86vm +, xorgproto + # darwin +, Cocoa + # optional , withNvidiaCg ? false , nvidia_cg_toolkit , withSamples ? false @@ -31,59 +36,63 @@ stdenv.mkDerivation rec { pname = "ogre"; - version = "1.12.1"; + version = "13.6.1"; src = fetchFromGitHub { owner = "OGRECave"; repo = "ogre"; rev = "v${version}"; - sha256 = "sha256-FHW0+DZhw6MLlhjh4DRYhA+6vBBXMN9K6GEVoR6P5kM="; + hash = "sha256-UG/vwLE80Ski9NwMj9E5+PoLU6rSCdJrSmQOmmFv66U="; }; - # fix for ARM. sys/sysctl.h has moved in later glibcs, and - # https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't - # needed anyway. - postPatch = '' - substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \ - --replace '#include ' "" - ''; + nativeBuildInputs = [ + cmake + pkg-config + unzip + ]; - cmakeFlags = [ "-DOGRE_BUILD_DEPENDENCIES=OFF" "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] - ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") - ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") - ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; + buildInputs = [ + SDL2 + boost + freeimage + freetype + libpng + ois + pugixml + zziplib + ] ++ lib.optionals stdenv.isLinux [ + freeglut + libGL + libGLU + libICE + libSM + libX11 + libXaw + libXmu + libXrandr + libXrender + libXt + libXxf86vm + xorgproto + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + ] ++ lib.optionals withNvidiaCg [ + nvidia_cg_toolkit + ]; - - nativeBuildInputs = [ cmake unzip pkg-config ]; - buildInputs = - [ - libGLU - libGL - freetype - freeimage - zziplib - xorgproto - libXrandr - libXaw - freeglut - libXt - libpng - boost - ois - libX11 - libXmu - libSM - libXxf86vm - libICE - libXrender - SDL2 - ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; + cmakeFlags = [ + "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE" + "-DOGRE_BUILD_DEPENDENCIES=OFF" + "-DOGRE_BUILD_SAMPLES=${toString withSamples}" + ] ++ lib.optionals stdenv.isDarwin [ + "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE" + ]; meta = { - description = "A 3D engine"; + description = "3D Object-Oriented Graphics Rendering Engine"; homepage = "https://www.ogre3d.org/"; - maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ raskin wegank ]; + platforms = lib.platforms.unix; license = lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index 2edbc35aa899..0a384b03bb2a 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -2,18 +2,23 @@ stdenv.mkDerivation rec { pname = "ois"; - version = "1.5"; + version = "1.5.1"; src = fetchFromGitHub { owner = "wgois"; repo = "OIS"; rev = "v${version}"; - sha256 = "0g8krgq5bdx2rw7ig0xva4kqv4x815672i7z6lljp3n8847wmypa"; + sha256 = "sha256-ir6p+Tzf8L5VOW/rsG4yelsth7INbhABO2T7pfMHcFo="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libX11 ] ++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ]; + buildInputs = lib.optionals stdenv.isLinux [ libX11 ] + ++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; meta = with lib; { description = "Object-oriented C++ input system"; diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 8220ac503e38..68ae7e79b690 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.13"; + version = "3.2.14"; src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = pname; rev = version; - sha256 = "sha256-s1OleVRvJRFvN9MwXT7lAjDjyHkbIkbpl/F8P/91oaU="; + sha256 = "sha256-Bcdl3myzWZb8vu3crYDKt8hEXD9QcZGOphT2KIZ+R14="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index f5e5a2e03d2c..fd47a05a1bc9 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -21,6 +21,15 @@ stdenv.mkDerivation rec { # Tests fail on some Hydra builders, because they do not support SSE4.2. doCheck = false; + # Fixup bad cmake paths + postInstall = '' + substituteInPlace $out/lib/cmake/dnnl/dnnl-config.cmake \ + --replace "\''${PACKAGE_PREFIX_DIR}/" "" + + substituteInPlace $out/lib/cmake/dnnl/dnnl-targets.cmake \ + --replace "\''${_IMPORT_PREFIX}/" "" + ''; + meta = with lib; { description = "oneAPI Deep Neural Network Library (oneDNN)"; homepage = "https://01.org/oneDNN"; diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index bc084829e7bb..3062c3cb4e11 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -1,16 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - pname = "onig"; + pname = "oniguruma"; version = "6.9.8"; - src = fetchFromGitHub { - owner = "kkos"; - repo = "oniguruma"; - rev = "v${version}"; - sha256 = "sha256-8aFZdhh6ovLCR0A17rvWq/Oif66rSMnHcCYHjClNElw="; + # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages + src = fetchurl { + url = "https://github.com/kkos/oniguruma/releases/download/v${version}/onig-${version}.tar.gz"; + sha256 = "sha256-KM1iwUZGI8eRBWX7HMqqAQSy/osSvNZG6B9ztHU1IT4="; }; + outputs = [ "dev" "lib" "out" ]; + outputBin = "dev"; # onig-config + nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--enable-posix-api=yes" ]; @@ -18,7 +20,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/kkos/oniguruma"; description = "Regular expressions library"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ artturin ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 48da747c3020..f01899290035 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -14,6 +14,7 @@ , nlohmann_json , boost , oneDNN +, abseil-cpp_202111 , gtest , pythonSupport ? false , nsync @@ -27,23 +28,15 @@ assert pythonSupport -> lib.versionOlder protobuf.version "3.20"; -let - # prefetch abseil - # Note: keep URL in sync with `cmake/external/abseil-cpp.cmake` - abseil = fetchurl { - url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.zip"; - sha256 = "sha256-pFZ/8C+spnG5XjHTFbqxi0K2xvGmDpHG6oTlohQhEsI="; - }; -in stdenv.mkDerivation rec { pname = "onnxruntime"; - version = "1.12.1"; + version = "1.13.1"; src = fetchFromGitHub { owner = "microsoft"; repo = "onnxruntime"; rev = "v${version}"; - sha256 = "sha256-wwllEemiHTp9aJcCd1gsTS4WUVMp5wW+4i/+6DzmAeM="; + sha256 = "sha256-paaeq6QeiOzwiibbz0GkYZxEI/V80lvYNYTm6AuyAXQ="; fetchSubmodules = true; }; @@ -51,8 +44,8 @@ stdenv.mkDerivation rec { # Use dnnl from nixpkgs instead of submodules (fetchpatch { name = "system-dnnl.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/system-dnnl.diff?h=python-onnxruntime&id=0185531906bda3a9aba93bbb0f3dcfeb0ae671ad"; - sha256 = "sha256-58RBrQnAWNtc/1pmFs+PkZ6qCsL1LfMY3P0exMKzotA="; + url = "https://aur.archlinux.org/cgit/aur.git/plain/system-dnnl.diff?h=python-onnxruntime&id=9c392fb542979981fe0026e0fe3cc361a5f00a36"; + sha256 = "sha256-+kedzJHLFU1vMbKO9cn8fr+9A5+IxIuiqzOfR2AfJ0k="; }) ]; @@ -80,6 +73,7 @@ stdenv.mkDerivation rec { nsync python3Packages.numpy python3Packages.pybind11 + python3Packages.packaging ]; # TODO: build server, and move .so's to lib output @@ -98,6 +92,7 @@ stdenv.mkDerivation rec { "-Donnxruntime_USE_PREINSTALLED_EIGEN=ON" "-Donnxruntime_USE_MPI=ON" "-Deigen_SOURCE_PATH=${eigen.src}" + "-DFETCHCONTENT_SOURCE_DIR_ABSEIL_CPP=${abseil-cpp_202111.src}" "-Donnxruntime_USE_DNNL=YES" ] ++ lib.optionals pythonSupport [ "-Donnxruntime_ENABLE_PYTHON=ON" @@ -106,15 +101,12 @@ stdenv.mkDerivation rec { doCheck = true; postPatch = '' - substituteInPlace cmake/external/abseil-cpp.cmake \ - --replace "${abseil.url}" "${abseil}" - substituteInPlace cmake/libonnxruntime.pc.cmake.in \ --replace '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_ ''; postBuild = lib.optionalString pythonSupport '' - ${python3Packages.python.interpreter} ../setup.py bdist_wheel + python ../setup.py bdist_wheel ''; postInstall = '' diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 5c262a3680c5..2934558b5875 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, - pkg-config, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb, + pkg-config, fontconfig, freetype, expat, freeimage, vtk_8, gl2ps, tbb, OpenCL, Cocoa }: -with lib; stdenv.mkDerivation rec { pname = "opencascade-oce"; version = "0.18.3"; @@ -17,10 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = [ - libGL libGLU libXmu freetype fontconfig expat freeimage vtk + libGL libGLU libXmu freetype fontconfig expat freeimage vtk_8 gl2ps tbb ] - ++ optionals stdenv.isDarwin [OpenCL Cocoa] + ++ lib.optionals stdenv.isDarwin [OpenCL Cocoa] ; cmakeFlags = [ @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { "-DOCE_WITH_GL2PS=ON" "-DOCE_MULTITHREAD_LIBRARY=TBB" ] - ++ optionals stdenv.isDarwin ["-DOCE_OSX_USE_COCOA=ON" "-DOCE_WITH_OPENCL=ON"]; + ++ lib.optionals stdenv.isDarwin ["-DOCE_OSX_USE_COCOA=ON" "-DOCE_WITH_OPENCL=ON"]; patches = [ # Use fontconfig instead of hardcoded directory list @@ -56,7 +55,7 @@ stdenv.mkDerivation rec { --replace FONTCONFIG_LIBRARIES FONTCONFIG_LINK_LIBRARIES ''; - meta = { + meta = with lib; { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; homepage = "https://github.com/tpaviot/oce"; maintainers = [ maintainers.viric ]; diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index f4897331c938..58307198f727 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -4,10 +4,8 @@ , fetchpatch , cmake , git - , llvmPackages_11 , spirv-llvm-translator - , buildWithPatches ? true }: @@ -16,32 +14,25 @@ let inherit spirv-llvm-translator; }; - inherit (lib) getVersion; - - addPatches = component: pkg: - with builtins; with lib; - let path = "${passthru.patchesOut}/${component}"; - in pkg.overrideAttrs (super: { - postPatch = (if super ? postPatch then super.postPatch + "\n" else "") + '' - for p in ${path}/* - do - patch -p1 -i "$p" - done - ''; - }); + addPatches = component: pkg: pkg.overrideAttrs (oldAttrs: { + postPatch = oldAttrs.postPatch or "" + '' + for p in ${passthru.patchesOut}/${component}/*; do + patch -p1 -i "$p" + done + ''; + }); passthru = rec { - spirv-llvm-translator = llvmPkgs.spirv-llvm-translator; + spirv-llvm-translator = llvmPkgs.spirv-llvm-translator.override { llvm = llvmPackages_11.llvm; }; llvm = addPatches "llvm" llvmPkgs.llvm; libclang = addPatches "clang" llvmPkgs.libclang; clang-unwrapped = libclang.out; - clang = llvmPkgs.clang.override { cc = clang-unwrapped; }; - patchesOut = stdenv.mkDerivation rec { + patchesOut = stdenv.mkDerivation { pname = "opencl-clang-patches"; inherit (library) version src patches; # Clang patches assume the root is the llvm root dir @@ -62,14 +53,13 @@ let }; library = let - inherit (llvmPkgs) llvm; + inherit (llvmPackages_11) llvm; inherit (if buildWithPatches then passthru else llvmPkgs) libclang spirv-llvm-translator; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "opencl-clang"; version = "unstable-2022-03-16"; - inherit passthru; src = fetchFromGitHub { owner = "intel"; @@ -79,8 +69,8 @@ let }; patches = [ - # Build script tries to find Clang OpenCL headers under ${llvm} - # Work around it by specifying that directory manually. + # Build script tries to find Clang OpenCL headers under ${llvm} + # Work around it by specifying that directory manually. ./opencl-headers-dir.patch ]; @@ -96,19 +86,21 @@ let buildInputs = [ libclang llvm spirv-llvm-translator ]; cmakeFlags = [ - "-DPREFERRED_LLVM_VERSION=${getVersion llvm}" - "-DOPENCL_HEADERS_DIR=${libclang.lib}/lib/clang/${getVersion libclang}/include/" + "-DPREFERRED_LLVM_VERSION=${lib.getVersion llvm}" + "-DOPENCL_HEADERS_DIR=${libclang.lib}/lib/clang/${lib.getVersion libclang}/include/" "-DLLVMSPIRV_INCLUDED_IN_LLVM=OFF" "-DSPIRV_TRANSLATOR_DIR=${spirv-llvm-translator}" ]; + inherit passthru; + meta = with lib; { homepage = "https://github.com/intel/opencl-clang/"; description = "A clang wrapper library with an OpenCL-oriented API and the ability to compile OpenCL C kernels to SPIR-V modules"; license = licenses.ncsa; platforms = platforms.all; - maintainers = with maintainers; [ gloaming ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; }; in diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix index 7622ebbe43eb..0355b9977448 100644 --- a/pkgs/development/libraries/opencolorio/1.x.nix +++ b/pkgs/development/libraries/opencolorio/1.x.nix @@ -26,14 +26,19 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_EXTERNAL_LCMS=ON" "-DUSE_EXTERNAL_TINYXML=ON" - # External libyamlcpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517 + # External yaml-cpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517 "-DUSE_EXTERNAL_YAML=OFF" ] ++ lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON" ++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF" ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DCMAKE_OSX_ARCHITECTURES=arm64"; postInstall = '' - mkdir -p $bin/bin; mv $out/bin $bin/ + moveToOutput bin "$bin" + moveToOutput cmake "$dev" + mv $out/OpenColorIOConfig.cmake $dev/cmake/ + + substituteInPlace "$dev/cmake/OpenColorIO-release.cmake" \ + --replace "$out/bin" "$bin/bin" ''; meta = with lib; { diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 53a37da01fd6..3d8a5588043f 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -4,10 +4,11 @@ , fetchpatch , cmake , expat -, libyamlcpp +, yaml-cpp , ilmbase , pystring , imath +, minizip-ng # Only required on Linux , glew , freeglut @@ -21,19 +22,18 @@ # Build apps , buildApps ? true # Utility applications , lcms2 -, openimageio2 -, openexr +, openexr_3 }: stdenv.mkDerivation rec { pname = "opencolorio"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenColorIO"; rev = "v${version}"; - sha256 = "sha256-e1PpWjjfSjtgN9Rs/+lsA45Z9S4y4T6nqrJ02DZ4vjs="; + sha256 = "sha256-l5UUysHdP/gb4Mn5A64XEoHOkthl6Mlb95CuI0l4vXQ="; }; patches = [ @@ -43,34 +43,46 @@ stdenv.mkDerivation rec { revert = true; sha256 = "sha256-0DF+lwi2nfkUFG0wYvL3HYbhZS6SqGtPWoOabrFS1Eo="; }) + (fetchpatch { + name = "pkg-config-absolute-path.patch"; + url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/332462e7f5051b7e26ee3d8c22890cd5e71e7c30.patch"; + sha256 = "sha256-7xHALhnOkKszgFBgPIbiZQaORnEJ+1M6RyoZdFgjElM="; + }) ]; + postPatch = lib.optionalString stdenv.isDarwin '' + # these tests don't like being run headless on darwin. no builtin + # way of skipping tests so this is what we're reduced to. + substituteInPlace tests/cpu/Config_tests.cpp \ + --replace 'OCIO_ADD_TEST(Config, virtual_display)' 'static void _skip_virtual_display()' \ + --replace 'OCIO_ADD_TEST(Config, virtual_display_with_active_displays)' 'static void _skip_virtual_display_with_active_displays()' + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ expat - libyamlcpp + yaml-cpp ilmbase pystring imath + minizip-ng ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ] ++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ] - ++ lib.optionals buildApps [ lcms2 openimageio2 openexr ]; + ++ lib.optionals buildApps [ + lcms2 + openexr_3 + ]; - cmakeFlags = [ - "-DOCIO_INSTALL_EXT_PACKAGES=NONE" - ] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" - ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; + cmakeFlags = [ + "-DOCIO_INSTALL_EXT_PACKAGES=NONE" + # GPU test fails with: freeglut (GPU tests): failed to open display '' + "-DOCIO_BUILD_GPU_TESTS=OFF" + ] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" + ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; - # TODO Investigate this: Python and GPU tests fail to load libOpenColorIO.so.2.0 - # doCheck = true; - - # https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1649 - postPatch = '' - substituteInPlace src/OpenColorIO/CMakeLists.txt \ - --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} \ - --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} - ''; + # precision issues on non-x86 + doCheck = stdenv.isx86_64; meta = with lib; { homepage = "https://opencolorio.org"; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 56b022d03b9b..59a74a66730d 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -22,7 +22,7 @@ , enablePython ? false, pythonPackages ? null , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 -, enableVtk ? false, vtk +, enableVtk ? false, vtk_8 , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableTesseract ? false, tesseract, leptonica @@ -188,7 +188,7 @@ stdenv.mkDerivation { ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 - ++ lib.optional enableVtk vtk + ++ lib.optional enableVtk vtk_8 ++ lib.optional enableJPEG libjpeg ++ lib.optional enablePNG libpng ++ lib.optional enableTIFF libtiff diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 664f39c0c6cd..5afc209922b5 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -14,6 +14,7 @@ , config , ocl-icd , buildPackages +, qimgv , enableJPEG ? true , libjpeg @@ -47,7 +48,7 @@ , enableGtk3 ? false , gtk3 , enableVtk ? false -, vtk +, vtk_8 , enableFfmpeg ? true , ffmpeg , enableGStreamer ? true @@ -76,20 +77,20 @@ }: let - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "sha256-zPkMc6xEDZU5TlBH3LAzvB17XgocSPeHVMG/U6kfpxg="; + sha256 = "sha256-jUeGsu8+jzzCnIFbVMCW8DcUeGv/t1yCY/WXyW+uGDI="; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "sha256-hjRqT7V4Sz7t4IEy89F5M+b0x2ObBbqF8GWLKhWFXtE="; + sha256 = "sha256-meya0J3RdOIeMM46e/6IOVwrKn3t/c0rhwP2WQaybkE="; }; # Contrib must be built in order to enable Tesseract support: @@ -252,7 +253,7 @@ stdenv.mkDerivation { ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5 ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 - ++ lib.optional enableVtk vtk + ++ lib.optional enableVtk vtk_8 ++ lib.optional enableJPEG libjpeg ++ lib.optional enablePNG libpng ++ lib.optional enableTIFF libtiff @@ -365,7 +366,12 @@ stdenv.mkDerivation { popd ''; - passthru = lib.optionalAttrs enablePython { pythonPath = [ ]; }; + passthru = { + tests = { + inherit qimgv; + inherit (gst_all_1) gst-plugins-bad; + } // lib.optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; }; + } // lib.optionalAttrs enablePython { pythonPath = [ ]; }; meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 22c5fca76a48..00b5d624153a 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "trusteddomainproject"; repo = "OpenDKIM"; - rev = "rel-opendkim-${lib.replaceChars ["."] ["-"] version}"; + rev = "rel-opendkim-${lib.replaceStrings ["."] ["-"] version}"; sha256 = "0nx3in8sa6xna4vfacj8g60hfzk61jpj2ldag80xzxip9c3rd2pw"; }; diff --git a/pkgs/development/libraries/openfec/default.nix b/pkgs/development/libraries/openfec/default.nix index 2a0588a71ebd..a908b4980dad 100644 --- a/pkgs/development/libraries/openfec/default.nix +++ b/pkgs/development/libraries/openfec/default.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { find $dev/include -type f -a ! -iname '*.h' -delete install -D -m755 -t $out/lib ../bin/Release/libopenfec${so} + '' + lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libopenfec${so} $out/lib/libopenfec${so} + '' + '' ln -s libopenfec${so} $out/lib/libopenfec${so}.1 ''; diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/development/libraries/openimageio/1.x.nix similarity index 59% rename from pkgs/applications/graphics/openimageio/default.nix rename to pkgs/development/libraries/openimageio/1.x.nix index e5262ab98d0a..62dd3f4cc2c9 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/1.x.nix @@ -44,5 +44,34 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.unix; + knownVulnerabilities = [ + # all discovered in 2.x but there is no reason to + # believe that these or similar vulnerabilties aren't + # present in the totally unmaintained 1.x branch + "CVE-2022-36354" + "CVE-2022-38143" + "CVE-2022-41639" + "CVE-2022-41649" + "CVE-2022-41684" + "CVE-2022-41794" + "CVE-2022-41837" + "CVE-2022-41838" + "CVE-2022-41977" + "CVE-2022-41981" + "CVE-2022-41988" + "CVE-2022-41999" + "CVE-2022-43592" + "CVE-2022-43593" + "CVE-2022-43594" + "CVE-2022-43595" + "CVE-2022-43596" + "CVE-2022-43597" + "CVE-2022-43598" + "CVE-2022-43599" + "CVE-2022-43600" + "CVE-2022-43601" + "CVE-2022-43602" + "CVE-2022-43603" + ]; }; } diff --git a/pkgs/applications/graphics/openimageio/2539_backport.patch b/pkgs/development/libraries/openimageio/2539_backport.patch similarity index 100% rename from pkgs/applications/graphics/openimageio/2539_backport.patch rename to pkgs/development/libraries/openimageio/2539_backport.patch diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/development/libraries/openimageio/default.nix similarity index 67% rename from pkgs/applications/graphics/openimageio/2.x.nix rename to pkgs/development/libraries/openimageio/default.nix index d6b710595a31..88d99a0fae76 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , boost , cmake , giflib @@ -7,7 +8,7 @@ , libjpeg , libpng , libtiff -, opencolorio_1 +, opencolorio , openexr , robin-map , unzip @@ -16,15 +17,23 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.2.17.0"; + version = "2.4.6.1"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; - rev = "Release-${version}"; - sha256 = "0jqpb1zci911wdm928addsljxx8zsh0gzbhv9vbw6man4wi93h6h"; + rev = "v${version}"; + sha256 = "sha256-oBICukkborxXFHXyM2rIn5qSbCWECjwDQI9MUg13IRU="; }; + patches = [ + (fetchpatch { + name = "arm-fix-signed-unsigned-simd-mismatch.patch"; + url = "https://github.com/OpenImageIO/oiio/commit/726c51181a2888b0bd1edbef5ac8451e9cc3f893.patch"; + hash = "sha256-G4vexf0OHZ/sbcRob5X92tajkmAv72ok8rcVQtIE9XE="; + }) + ]; + outputs = [ "bin" "out" "dev" "doc" ]; nativeBuildInputs = [ @@ -39,7 +48,7 @@ stdenv.mkDerivation rec { libjpeg libpng libtiff - opencolorio_1 + opencolorio openexr robin-map fmt @@ -58,7 +67,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.openimageio.org"; + homepage = "https://openimageio.org"; description = "A library and tools for reading and writing images"; license = licenses.bsd3; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 5db0a7c8bfa9..ad4654d88b3e 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -38,7 +38,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - cyrus_sasl + (cyrus_sasl.override { + inherit openssl; + }) db libsodium libtool @@ -92,8 +94,6 @@ stdenv.mkDerivation rec { preCheck = '' substituteInPlace tests/scripts/all \ --replace "/bin/rm" "rm" - # fails saying "SASL(-1): generic failure: internal error: failed to init cipher 'rc4'" - rm tests/scripts/test076-authid-rewrite ''; doCheck = true; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index f2392bb00726..1a9a5deb0d9a 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchurl, gfortran, perl, libnl +{ lib, stdenv, fetchurl, fetchpatch, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin , libpsm2, libfabric, pmix, ucx # Enable CUDA support -, cudaSupport ? false, cudatoolkit ? null +, cudaSupport ? false, cudatoolkit # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -18,8 +18,6 @@ , fortranSupport ? true }: -assert !cudaSupport || cudatoolkit != null; - let cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -34,6 +32,14 @@ in stdenv.mkDerivation rec { sha256 = "03ckngrff1cl0l81vfvrfhp99rbgk7s0633kr1l468yibwbjx4cj"; }; + patches = [ + (fetchpatch { + name = "RDMA-osc-perform-CAS-in-shared-memory-if-possible.patch"; + url = "https://github.com/open-mpi/ompi/pull/10513/commits/0512c135a77a0278e5288e0e119dce24c95ebed4.patch"; + sha256 = "sha256-K1Gc+hBUkTPY1WqLP6JWo623EUhkoL4ONrqPVDNfFuE="; + }) + ]; + postPatch = '' patchShebangs ./ diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 885fbb058bd1..3a6a7b57c40f 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -23,7 +23,7 @@ sdlSupport ? false, SDL2, restSupport ? false, asio, withApps ? false, - withExamples ? false, fltk, wxGTK30-gtk3, + withExamples ? false, fltk, wxGTK30, }: stdenv.mkDerivation rec { @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ++ lib.optional luaSupport lua ++ lib.optional sdlSupport SDL2 ++ lib.optional restSupport asio - ++ lib.optionals withExamples [ fltk wxGTK30-gtk3 ] + ++ lib.optionals withExamples [ fltk wxGTK30 ] ++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ] ++ lib.optional (restSupport || colladaSupport) boost ; diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix index 1eec70be6aca..5bd2fd070985 100644 --- a/pkgs/development/libraries/openslp/default.nix +++ b/pkgs/development/libraries/openslp/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ttuegel ]; license = licenses.bsd3; platforms = platforms.all; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch b/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch new file mode 100644 index 000000000000..2acedda0e3a4 --- /dev/null +++ b/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch @@ -0,0 +1,36 @@ +From 7725e7bfe6f2ce8146b6552b44e0d226be7638e7 Mon Sep 17 00:00:00 2001 +From: Pauli +Date: Fri, 11 Nov 2022 09:40:19 +1100 +Subject: [PATCH] x509: fix double locking problem + +This reverts commit 9aa4be691f5c73eb3c68606d824c104550c053f7 and removed the +redundant flag setting. + +Fixes #19643 + +Fixes LOW CVE-2022-3996 + +Reviewed-by: Dmitry Belyavskiy +Reviewed-by: Tomas Mraz +(Merged from https://github.com/openssl/openssl/pull/19652) + +(cherry picked from commit 4d0340a6d2f327700a059f0b8f954d6160f8eef5) +--- + crypto/x509/pcy_map.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c +index 05406c6493fc..60dfd1e3203b 100644 +--- a/crypto/x509/pcy_map.c ++++ b/crypto/x509/pcy_map.c +@@ -73,10 +73,6 @@ int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps) + + ret = 1; + bad_mapping: +- if (ret == -1 && CRYPTO_THREAD_write_lock(x->lock)) { +- x->ex_flags |= EXFLAG_INVALID_POLICY; +- CRYPTO_THREAD_unlock(x->lock); +- } + sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free); + return ret; + diff --git a/pkgs/development/libraries/openssl/3.0/legacy.cnf b/pkgs/development/libraries/openssl/3.0/legacy.cnf new file mode 100644 index 000000000000..a6485a8c3796 --- /dev/null +++ b/pkgs/development/libraries/openssl/3.0/legacy.cnf @@ -0,0 +1,395 @@ +# Taken from OpenSSL 3.0.7 and modified according to: https://wiki.openssl.org/index.php/OpenSSL_3.0#Programming_in_OpenSSL_3.0 +# +# OpenSSL example configuration file. +# See doc/man5/config.pod for more info. +# +# This is mostly being used for generation of certificate requests, +# but may be used for auto loading of providers + +# Note that you can include other files from the main configuration +# file using the .include directive. +#.include filename + +# This definition stops the following lines choking if HOME isn't +# defined. +HOME = . + + # Use this in order to automatically load providers. +openssl_conf = openssl_init + +# Comment out the next line to ignore configuration errors +config_diagnostics = 1 + +# Extra OBJECT IDENTIFIER info: +# oid_file = $ENV::HOME/.oid +oid_section = new_oids + +# To use this configuration file with the "-extfile" option of the +# "openssl x509" utility, name here the section containing the +# X.509v3 extensions to use: +# extensions = +# (Alternatively, use a configuration file that has only +# X.509v3 extensions in its main [= default] section.) + +[ new_oids ] +# We can add new OIDs in here for use by 'ca', 'req' and 'ts'. +# Add a simple OID like this: +# testoid1=1.2.3.4 +# Or use config file substitution like this: +# testoid2=${testoid1}.5.6 + +# Policies used by the TSA examples. +tsa_policy1 = 1.2.3.4.1 +tsa_policy2 = 1.2.3.4.5.6 +tsa_policy3 = 1.2.3.4.5.7 + +# For FIPS +# Optionally include a file that is generated by the OpenSSL fipsinstall +# application. This file contains configuration data required by the OpenSSL +# fips provider. It contains a named section e.g. [fips_sect] which is +# referenced from the [provider_sect] below. +# Refer to the OpenSSL security policy for more information. +# .include fipsmodule.cnf + +[openssl_init] +providers = provider_sect + +# List of providers to load +[provider_sect] +default = default_sect +legacy = legacy_sect + +# The fips section name should match the section name inside the +# included fipsmodule.cnf. +# fips = fips_sect + +# If no providers are activated explicitly, the default one is activated implicitly. +# See man 7 OSSL_PROVIDER-default for more details. +# +# If you add a section explicitly activating any other provider(s), you most +# probably need to explicitly activate the default provider, otherwise it +# becomes unavailable in openssl. As a consequence applications depending on +# OpenSSL may not work correctly which could lead to significant system +# problems including inability to remotely access the system. +[default_sect] +activate = 1 + +[legacy_sect] +activate = 1 + +#################################################################### +[ ca ] +default_ca = CA_default # The default ca section + +#################################################################### +[ CA_default ] + +dir = ./demoCA # Where everything is kept +certs = $dir/certs # Where the issued certs are kept +crl_dir = $dir/crl # Where the issued crl are kept +database = $dir/index.txt # database index file. +#unique_subject = no # Set to 'no' to allow creation of + # several certs with same subject. +new_certs_dir = $dir/newcerts # default place for new certs. + +certificate = $dir/cacert.pem # The CA certificate +serial = $dir/serial # The current serial number +crlnumber = $dir/crlnumber # the current crl number + # must be commented out to leave a V1 CRL +crl = $dir/crl.pem # The current CRL +private_key = $dir/private/cakey.pem# The private key + +x509_extensions = usr_cert # The extensions to add to the cert + +# Comment out the following two lines for the "traditional" +# (and highly broken) format. +name_opt = ca_default # Subject Name options +cert_opt = ca_default # Certificate field options + +# Extension copying option: use with caution. +# copy_extensions = copy + +# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs +# so this is commented out by default to leave a V1 CRL. +# crlnumber must also be commented out to leave a V1 CRL. +# crl_extensions = crl_ext + +default_days = 365 # how long to certify for +default_crl_days= 30 # how long before next CRL +default_md = default # use public key default MD +preserve = no # keep passed DN ordering + +# A few difference way of specifying how similar the request should look +# For type CA, the listed attributes must be the same, and the optional +# and supplied fields are just that :-) +policy = policy_match + +# For the CA policy +[ policy_match ] +countryName = match +stateOrProvinceName = match +organizationName = match +organizationalUnitName = optional +commonName = supplied +emailAddress = optional + +# For the 'anything' policy +# At this point in time, you must list all acceptable 'object' +# types. +[ policy_anything ] +countryName = optional +stateOrProvinceName = optional +localityName = optional +organizationName = optional +organizationalUnitName = optional +commonName = supplied +emailAddress = optional + +#################################################################### +[ req ] +default_bits = 2048 +default_keyfile = privkey.pem +distinguished_name = req_distinguished_name +attributes = req_attributes +x509_extensions = v3_ca # The extensions to add to the self signed cert + +# Passwords for private keys if not present they will be prompted for +# input_password = secret +# output_password = secret + +# This sets a mask for permitted string types. There are several options. +# default: PrintableString, T61String, BMPString. +# pkix : PrintableString, BMPString (PKIX recommendation before 2004) +# utf8only: only UTF8Strings (PKIX recommendation after 2004). +# nombstr : PrintableString, T61String (no BMPStrings or UTF8Strings). +# MASK:XXXX a literal mask value. +# WARNING: ancient versions of Netscape crash on BMPStrings or UTF8Strings. +string_mask = utf8only + +# req_extensions = v3_req # The extensions to add to a certificate request + +[ req_distinguished_name ] +countryName = Country Name (2 letter code) +countryName_default = AU +countryName_min = 2 +countryName_max = 2 + +stateOrProvinceName = State or Province Name (full name) +stateOrProvinceName_default = Some-State + +localityName = Locality Name (eg, city) + +0.organizationName = Organization Name (eg, company) +0.organizationName_default = Internet Widgits Pty Ltd + +# we can do this but it is not needed normally :-) +#1.organizationName = Second Organization Name (eg, company) +#1.organizationName_default = World Wide Web Pty Ltd + +organizationalUnitName = Organizational Unit Name (eg, section) +#organizationalUnitName_default = + +commonName = Common Name (e.g. server FQDN or YOUR name) +commonName_max = 64 + +emailAddress = Email Address +emailAddress_max = 64 + +# SET-ex3 = SET extension number 3 + +[ req_attributes ] +challengePassword = A challenge password +challengePassword_min = 4 +challengePassword_max = 20 + +unstructuredName = An optional company name + +[ usr_cert ] + +# These extensions are added when 'ca' signs a request. + +# This goes against PKIX guidelines but some CAs do it and some software +# requires this to avoid interpreting an end user certificate as a CA. + +basicConstraints=CA:FALSE + +# This is typical in keyUsage for a client certificate. +# keyUsage = nonRepudiation, digitalSignature, keyEncipherment + +# PKIX recommendations harmless if included in all certificates. +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid,issuer + +# This stuff is for subjectAltName and issuerAltname. +# Import the email address. +# subjectAltName=email:copy +# An alternative to produce certificates that aren't +# deprecated according to PKIX. +# subjectAltName=email:move + +# Copy subject details +# issuerAltName=issuer:copy + +# This is required for TSA certificates. +# extendedKeyUsage = critical,timeStamping + +[ v3_req ] + +# Extensions to add to a certificate request + +basicConstraints = CA:FALSE +keyUsage = nonRepudiation, digitalSignature, keyEncipherment + +[ v3_ca ] + + +# Extensions for a typical CA + + +# PKIX recommendation. + +subjectKeyIdentifier=hash + +authorityKeyIdentifier=keyid:always,issuer + +basicConstraints = critical,CA:true + +# Key usage: this is typical for a CA certificate. However since it will +# prevent it being used as an test self-signed certificate it is best +# left out by default. +# keyUsage = cRLSign, keyCertSign + +# Include email address in subject alt name: another PKIX recommendation +# subjectAltName=email:copy +# Copy issuer details +# issuerAltName=issuer:copy + +# DER hex encoding of an extension: beware experts only! +# obj=DER:02:03 +# Where 'obj' is a standard or added object +# You can even override a supported extension: +# basicConstraints= critical, DER:30:03:01:01:FF + +[ crl_ext ] + +# CRL extensions. +# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL. + +# issuerAltName=issuer:copy +authorityKeyIdentifier=keyid:always + +[ proxy_cert_ext ] +# These extensions should be added when creating a proxy certificate + +# This goes against PKIX guidelines but some CAs do it and some software +# requires this to avoid interpreting an end user certificate as a CA. + +basicConstraints=CA:FALSE + +# This is typical in keyUsage for a client certificate. +# keyUsage = nonRepudiation, digitalSignature, keyEncipherment + +# PKIX recommendations harmless if included in all certificates. +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid,issuer + +# This stuff is for subjectAltName and issuerAltname. +# Import the email address. +# subjectAltName=email:copy +# An alternative to produce certificates that aren't +# deprecated according to PKIX. +# subjectAltName=email:move + +# Copy subject details +# issuerAltName=issuer:copy + +# This really needs to be in place for it to be a proxy certificate. +proxyCertInfo=critical,language:id-ppl-anyLanguage,pathlen:3,policy:foo + +#################################################################### +[ tsa ] + +default_tsa = tsa_config1 # the default TSA section + +[ tsa_config1 ] + +# These are used by the TSA reply generation only. +dir = ./demoCA # TSA root directory +serial = $dir/tsaserial # The current serial number (mandatory) +crypto_device = builtin # OpenSSL engine to use for signing +signer_cert = $dir/tsacert.pem # The TSA signing certificate + # (optional) +certs = $dir/cacert.pem # Certificate chain to include in reply + # (optional) +signer_key = $dir/private/tsakey.pem # The TSA private key (optional) +signer_digest = sha256 # Signing digest to use. (Optional) +default_policy = tsa_policy1 # Policy if request did not specify it + # (optional) +other_policies = tsa_policy2, tsa_policy3 # acceptable policies (optional) +digests = sha1, sha256, sha384, sha512 # Acceptable message digests (mandatory) +accuracy = secs:1, millisecs:500, microsecs:100 # (optional) +clock_precision_digits = 0 # number of digits after dot. (optional) +ordering = yes # Is ordering defined for timestamps? + # (optional, default: no) +tsa_name = yes # Must the TSA name be included in the reply? + # (optional, default: no) +ess_cert_id_chain = no # Must the ESS cert id chain be included? + # (optional, default: no) +ess_cert_id_alg = sha1 # algorithm to compute certificate + # identifier (optional, default: sha1) + +[insta] # CMP using Insta Demo CA +# Message transfer +server = pki.certificate.fi:8700 +# proxy = # set this as far as needed, e.g., http://192.168.1.1:8080 +# tls_use = 0 +path = pkix/ + +# Server authentication +recipient = "/C=FI/O=Insta Demo/CN=Insta Demo CA" # or set srvcert or issuer +ignore_keyusage = 1 # potentially needed quirk +unprotected_errors = 1 # potentially needed quirk +extracertsout = insta.extracerts.pem + +# Client authentication +ref = 3078 # user identification +secret = pass:insta # can be used for both client and server side + +# Generic message options +cmd = ir # default operation, can be overridden on cmd line with, e.g., kur + +# Certificate enrollment +subject = "/CN=openssl-cmp-test" +newkey = insta.priv.pem +out_trusted = insta.ca.crt +certout = insta.cert.pem + +[pbm] # Password-based protection for Insta CA +# Server and client authentication +ref = $insta::ref # 3078 +secret = $insta::secret # pass:insta + +[signature] # Signature-based protection for Insta CA +# Server authentication +trusted = insta.ca.crt # does not include keyUsage digitalSignature + +# Client authentication +secret = # disable PBM +key = $insta::newkey # insta.priv.pem +cert = $insta::certout # insta.cert.pem + +[ir] +cmd = ir + +[cr] +cmd = cr + +[kur] +# Certificate update +cmd = kur +oldcert = $insta::certout # insta.cert.pem + +[rr] +# Certificate revocation +cmd = rr +oldcert = $insta::certout # insta.cert.pem diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 35ce5345d6a6..4c322997963a 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -7,6 +7,8 @@ # This will cause c_rehash to refer to perl via the environment, but otherwise # will produce a perfectly functional openssl binary and library. , withPerl ? stdenv.hostPlatform == stdenv.buildPlatform +# path to openssl.cnf file. will be placed in $etc/etc/ssl/openssl.cnf to replace the default +, conf ? null , removeReferencesTo }: @@ -85,28 +87,24 @@ let x86_64-linux = "./Configure linux-x86_64"; x86_64-solaris = "./Configure solaris64-x86_64-gcc"; riscv64-linux = "./Configure linux64-riscv64"; - mipsel-linux = "./Configure linux-mips32"; - mips64el-linux = - if stdenv.hostPlatform.isMips64n64 - then "./Configure linux64-mips64" - else if stdenv.hostPlatform.isMips64n32 - then "./Configure linux-mips64" - else throw "unsupported ABI for ${stdenv.hostPlatform.system}"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" - else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_64 - then "./Configure BSD-x86_64" - else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_32 - then "./Configure BSD-x86" + lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") "-elf" else if stdenv.hostPlatform.isBSD - then "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" + then if stdenv.hostPlatform.isx86_64 then "./Configure BSD-x86_64" + else if stdenv.hostPlatform.isx86_32 + then "./Configure BSD-x86" + lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") "-elf" + else "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" else if stdenv.hostPlatform.isMinGW then "./Configure mingw${lib.optionalString (stdenv.hostPlatform.parsed.cpu.bits != 32) (toString stdenv.hostPlatform.parsed.cpu.bits)}" else if stdenv.hostPlatform.isLinux - then "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" + then if stdenv.hostPlatform.isx86_64 then "./Configure linux-x86_64" + else if stdenv.hostPlatform.isMips32 then "./Configure linux-mips32" + else if stdenv.hostPlatform.isMips64n32 then "./Configure linux-mips64" + else if stdenv.hostPlatform.isMips64n64 then "./Configure linux64-mips64" + else "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" else if stdenv.hostPlatform.isiOS then "./Configure ios${toString stdenv.hostPlatform.parsed.cpu.bits}-cross" else @@ -193,6 +191,8 @@ let rm -r $etc/etc/ssl/misc rmdir $etc/etc/ssl/{certs,private} + + ${lib.optionalString (conf != null) "cat ${conf} > $etc/etc/ssl/openssl.cnf"} ''; postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) '' @@ -241,6 +241,9 @@ in { (if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch) + + # Remove with 3.0.8 release + ./3.0/CVE-2022-3996.patch ]; withDocs = true; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 026465c97ae8..46bbc079aeb8 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; - rev = "v${lib.replaceChars ["."] ["_"] version}"; + rev = "v${lib.replaceStrings ["."] ["_"] version}"; sha256 = "sha256-ejxQ5mGIIrEa/rAfkTrRbIRerrAvEPoWn7e0lIqS1JQ="; }; diff --git a/pkgs/development/libraries/openturns/default.nix b/pkgs/development/libraries/openturns/default.nix index ae95a45dd392..4c80c4b9ac81 100644 --- a/pkgs/development/libraries/openturns/default.nix +++ b/pkgs/development/libraries/openturns/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , swig , boost @@ -34,6 +35,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-QeapH937yGnK6oD+rgIERePxz6ooxGpOx6x9LyFDt2A="; }; + patches = [ + # Fix build with primesieve 11, https://github.com/openturns/openturns/pull/2187 + # Remove with next version update. + (fetchpatch { + url = "https://github.com/openturns/openturns/commit/a85061f89a5763061467beac516c1355fe81b9be.patch"; + hash = "sha256-z28ipBuX3b5UFEnKuDfp+kMI5cUcwXVz/8WZHlICnvE="; + }) + ]; + nativeBuildInputs = [ cmake ] ++ lib.optional enablePython python3Packages.sphinx; buildInputs = [ swig diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index f2b95bd07e3c..214149edad94 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -3,19 +3,29 @@ stdenv.mkDerivation rec { pname = "openvdb"; - version = "9.1.0"; + version = "10.0.1"; + + outputs = [ "out" "dev" ]; src = fetchFromGitHub { - owner = "dreamworksanimation"; + owner = "AcademySoftwareFoundation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "sha256-OP1xCR1YW60125mhhrW5+8/4uk+EBGIeoWGEU9OiIGY="; + sha256 = "sha256-kaf5gpGYVWinmnRwR/IafE1SJcwmP2psfe/UZdtH1Og="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ]; + cmakeFlags = [ "-DOPENVDB_CORE_STATIC=OFF" ]; + + postFixup = '' + substituteInPlace $dev/lib/cmake/OpenVDB/FindOpenVDB.cmake \ + --replace \''${OPENVDB_LIBRARYDIR} $out/lib \ + --replace \''${OPENVDB_INCLUDEDIR} $dev/include + ''; + meta = with lib; { description = "An open framework for voxel"; homepage = "https://www.openvdb.org"; diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index 446952b30051..4df98d28fd09 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "openwsman"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "Openwsman"; repo = "openwsman"; rev = "v${version}"; - sha256 = "sha256-/fSVzpGPObMkJIu7j6eR6A7Gtf2jttoPhcSayBvn3IU="; + sha256 = "sha256-CH2pqWs64Dznim3IljmsthKEQfACVlaAKQ/07MgryHo="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/optparse-bash/default.nix b/pkgs/development/libraries/optparse-bash/default.nix index 811458ed187c..f14512c5272a 100644 --- a/pkgs/development/libraries/optparse-bash/default.nix +++ b/pkgs/development/libraries/optparse-bash/default.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation { doCheck = true; - checkInputs = [ bash ]; + nativeCheckInputs = [ bash ]; # `#!/usr/bin/env` isn't okay for OfBorg # Need external bash to run diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix index abe45b63372f..4ea4692a14a7 100644 --- a/pkgs/development/libraries/orcania/default.nix +++ b/pkgs/development/libraries/orcania/default.nix @@ -1,18 +1,18 @@ { lib, stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; - version = "2.3.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QAq/6MGVj+iBHLElHuqokF1v3LU1TZ9hVVJE1s3y6f0="; + sha256 = "sha256-xF6QIXfsI+6WqshcG74/J98MgjSkYjRkTW64zeH6DDY="; }; nativeBuildInputs = [ cmake ]; - checkInputs = [ check subunit ]; + nativeCheckInputs = [ check subunit ]; cmakeFlags = [ "-DBUILD_ORCANIA_TESTING=on" ]; diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index e896717644aa..4a0edf08a7e8 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "ortp"; - version = "5.1.55"; + version = "5.2.16"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-FsPbpKkC1qhsZ4QBRzyV64H+lo/802qlaggDGCgbPlw="; + hash = "sha256-zGguzrWXSjjrJdFnlAeC6U6w10BucXjeUg7/2D4OxM4="; }; # Do not build static libraries diff --git a/pkgs/development/libraries/paho-mqtt-c/default.nix b/pkgs/development/libraries/paho-mqtt-c/default.nix index 37a829088d81..836f9fe625df 100644 --- a/pkgs/development/libraries/paho-mqtt-c/default.nix +++ b/pkgs/development/libraries/paho-mqtt-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "paho.mqtt.c"; - version = "1.3.11"; + version = "1.3.12"; src = fetchFromGitHub { owner = "eclipse"; repo = "paho.mqtt.c"; rev = "v${version}"; - hash = "sha256-TGCWA9tOOx0rCb/XQWqLFbXb9gOyGS8u6o9fvSRS6xI="; + hash = "sha256-LxyMbMA6Antt8Uu4jCvmvYT9+Vm4ZUVz4XXFdd0O7Kk="; }; postPatch = '' diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 3beeaa67321e..662437659147 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "pango"; - version = "1.50.11"; + version = "1.50.12"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "iAD4Etie5hOIGIcDID86eHiWPCL4aVqvH6ChoUKNF64="; + sha256 = "yu+W0nu+eSpr6ScnxzRo2DKxPaV8gHHvebnfae4Fj+M="; }; depsBuildBuild = [ @@ -47,7 +47,6 @@ stdenv.mkDerivation rec { buildInputs = [ fribidi libthai - gobject-introspection ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Carbon diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix index 95acc77922ee..04aa6c7afbc9 100644 --- a/pkgs/development/libraries/pcg-c/default.nix +++ b/pkgs/development/libraries/pcg-c/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchzip }: -with lib; - stdenv.mkDerivation rec { version = "0.94"; pname = "pcg-c"; @@ -31,8 +29,8 @@ stdenv.mkDerivation rec { algorithms for random number generation. Unlike many general-purpose RNGs, they are also hard to predict. ''; - platforms = platforms.unix; - maintainers = [ maintainers.linus ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.linus ]; broken = stdenv.isi686; # https://github.com/imneme/pcg-c/issues/11 }; } diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index bbc2bd8cc6f3..385288ffdcbc 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -6,7 +6,7 @@ , qhull , flann , boost -, vtk +, vtk_8 , eigen , pkg-config , qtbase @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { libpng libtiff qhull - vtk + vtk_8 ]; cmakeFlags = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index c4bbcf2ddfd6..8bc1055279fa 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -3,9 +3,7 @@ , variant ? null }: -with lib; - -assert elem variant [ null "cpp" "pcre16" "pcre32" ]; +assert lib.elem variant [ null "cpp" "pcre16" "pcre32" ]; stdenv.mkDerivation rec { pname = "pcre" @@ -21,11 +19,11 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "doc" "man" ]; # Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51 - configureFlags = optional (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit=auto" ++ [ + configureFlags = lib.optional (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit=auto" ++ [ "--enable-unicode-properties" "--disable-cpp" ] - ++ optional (variant != null) "--enable-${variant}"; + ++ lib.optional (variant != null) "--enable-${variant}"; # https://bugs.exim.org/show_bug.cgi?id=2173 patches = [ ./stacksize-detection.patch ]; @@ -40,7 +38,7 @@ stdenv.mkDerivation rec { postFixup = '' moveToOutput bin/pcre-config "$dev" - '' + optionalString (variant != null) '' + '' + lib.optionalString (variant != null) '' ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.{so.*.*.*,*dylib,*a} ''; @@ -57,7 +55,7 @@ stdenv.mkDerivation rec { PCRE library is free, even for building proprietary software. ''; - platforms = platforms.all; - maintainers = with maintainers; [ ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 226b92ccfdd3..82fc33670bc5 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "pcre2"; - version = "10.40"; + version = "10.42"; src = fetchurl { url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2"; - hash = "sha256-FOS4PEeDkz3BfpZDGOYyT3yuG8ddjzx5vGlp8AwVnWg="; + hash = "sha256-jTbNjLbqKkwrs1j/ZBGwx4hjOipF2rvxrrS3AdG16EA="; }; configureFlags = [ diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index 7e903a3d6b8b..16f9fb2e1a2d 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -11,6 +11,7 @@ , enableE57 ? lib.meta.availableOn stdenv.hostPlatform libe57format , libe57format , libgeotiff +, libtiff , libxml2 , postgresql , tiledb @@ -21,13 +22,13 @@ stdenv.mkDerivation rec { pname = "pdal"; - version = "2.4.0"; + version = "2.4.3"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; rev = version; - sha256 = "sha256-w9Fu4Op6OdaxdvOUM+glpJUEZq//EwRD2lqzYrMXk8w="; + sha256 = "sha256-9TQlhuGSTnHsTlJos9Hwnyl1CxI0tXLZdqsaGdp6WIE="; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { hdf5-cpp LASzip libgeotiff + libtiff libxml2 postgresql tiledb diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index 73c27e9d8c1b..3ef63aa2c35e 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -3,8 +3,6 @@ , debug ? false }: -with lib; - stdenv.mkDerivation rec { pname = "phonon-backend-gstreamer"; version = "4.10.0"; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 877bf973194a..4966e379aeca 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -12,8 +12,6 @@ , debug ? false }: -with lib; - let soname = "phonon4qt5"; buildsystemdir = "share/cmake/${soname}"; diff --git a/pkgs/development/libraries/physics/clhep/default.nix b/pkgs/development/libraries/physics/clhep/default.nix index a3b85e36796e..a8d853a23b04 100644 --- a/pkgs/development/libraries/physics/clhep/default.nix +++ b/pkgs/development/libraries/physics/clhep/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "clhep"; - version = "2.4.6.0"; + version = "2.4.6.3"; src = fetchurl { url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz"; - hash = "sha256-6NFt67hM7SjkDproR4nPWgra1F+SE/usPOdYPgbKp7E="; + hash = "sha256-/NAH8RsQukryjQJyIrYxSNDrRP96CC7uNTvfkh+caEo="; }; prePatch = '' diff --git a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index d9e88c4293ac..049cfcb04d5a 100644 --- a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix +++ b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ perl lhapdf.pdf_sets.CT10nlo ]; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index ccc96a1aed3d..58fc0c07cd5b 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -29,7 +29,7 @@ # For enableQt, enableXM, enableOpenGLX11, enableRaytracerX11. , libGLU, libGL -, xlibsWrapper +, libXext , libXmu # For enablePython @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { ]; dontWrapQtApps = true; # no binaries - buildInputs = [ libGLU xlibsWrapper libXmu ] + buildInputs = [ libGLU libXext libXmu ] ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ] ++ lib.optionals enablePython [ boost_python python3 ]; diff --git a/pkgs/development/libraries/physics/geant4/tests.nix b/pkgs/development/libraries/physics/geant4/tests.nix index 83afee6089d4..7d68780e2eb2 100644 --- a/pkgs/development/libraries/physics/geant4/tests.nix +++ b/pkgs/development/libraries/physics/geant4/tests.nix @@ -8,7 +8,7 @@ nativeBuildInputs = [ cmake ]; buildInputs = [ geant4 ]; - checkInputs = with geant4.data; [ + nativeCheckInputs = with geant4.data; [ G4EMLOW G4ENSDFSTATE G4PARTICLEXS diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix index c3171c589ee4..027100379bc9 100644 --- a/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, cmake, coreutils, python, root }: +{ lib +, stdenv +, fetchurl +, cmake +, coreutils +, python +, root +}: let pythonVersion = with lib.versions; "${major python.version}${minor python.version}"; @@ -16,9 +23,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-zQ91yA91VJxZzCqCns52Acd96Xyypat1eQysjh1YUDI="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ root_py ] - ++ lib.optional withPython python; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + root_py + ] + ++ lib.optional withPython python; + + # error: invalid version number in 'MACOSX_DEPLOYMENT_TARGET=11.0' + preConfigure = lib.optionalString (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' + MACOSX_DEPLOYMENT_TARGET=10.16 + ''; cmakeFlags = [ "-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}" diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index c26aba66515b..60b5a0b581dc 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lhapdf"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "sha256-YIonU0VeBnqZQLXBa8hqtsR+LHSbyd0ZeWmW60NSsv0="; + sha256 = "sha256-V0Nc1pXilwZdU+ab0pCQdlyTSTa2qXX/jFWXZvIjA1k="; }; # The Apple SDK only exports locale_t from xlocale.h whereas glibc diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix index f84c1bda32d3..e7ecefb59c24 100644 --- a/pkgs/development/libraries/physics/nlojet/default.nix +++ b/pkgs/development/libraries/physics/nlojet/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { ./nlojet_clang_fix.patch ]; + # error: no member named 'finite' in the global namespace; did you mean simply 'finite'? + NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite"; + meta = { homepage = "http://www.desy.de/~znagy/Site/NLOJet++.html"; license = lib.licenses.gpl2; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index adef606be546..7f2e97814f05 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }: +{ lib, stdenv, fetchurl, autoreconfHook, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }: stdenv.mkDerivation rec { pname = "thepeg"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { hash = "sha256-8hRzGXp2H8MpF7CKjSTSv6+T/1fzRB/WBdqZrJ3l1Qs="; }; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ]; configureFlags = [ diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 5424ad73787c..f1f4a5ed8cbb 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,19 +1,40 @@ -{ lib, stdenv, fetchurl, fetchpatch, python, root, makeWrapper, zlib, withRootSupport ? false }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, python +, root +, makeWrapper +, zlib +, withRootSupport ? false +}: stdenv.mkDerivation rec { pname = "yoda"; - version = "1.9.6"; + version = "1.9.7"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - hash = "sha256-IVI/ova2yPM0iVnzqUhzSpMMollR08kZC0Qk4Tc18qQ="; + hash = "sha256-jQe7BNy3k2SFhxihggNFLY2foAAp+pQjnq+oUpAyuP8="; }; - nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; - buildInputs = [ python ] - ++ (with python.pkgs; [ numpy matplotlib ]) - ++ lib.optional withRootSupport root; - propagatedBuildInputs = [ zlib ]; + nativeBuildInputs = with python.pkgs; [ + cython + makeWrapper + ]; + + buildInputs = [ + python + ] ++ (with python.pkgs; [ + numpy + matplotlib + ]) ++ lib.optionals withRootSupport [ + root + ]; + + propagatedBuildInputs = [ + zlib + ]; enableParallelBuilding = true; @@ -31,13 +52,15 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; doInstallCheck = true; + installCheckTarget = "check"; - meta = { + meta = with lib; { description = "Provides small set of data analysis (specifically histogramming) classes"; - license = lib.licenses.gpl3Only; + license = licenses.gpl3Only; homepage = "https://yoda.hepforge.org"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ veprbl ]; + changelog = "https://gitlab.com/hepcedar/yoda/-/blob/yoda-${version}/ChangeLog"; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/development/libraries/pinocchio/default.nix new file mode 100644 index 000000000000..df42dea81a5c --- /dev/null +++ b/pkgs/development/libraries/pinocchio/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, eigen +, urdfdom +, pythonSupport ? false +, python3Packages +}: + +stdenv.mkDerivation rec { + pname = "pinocchio"; + version = "2.6.15"; + + src = fetchFromGitHub { + owner = "stack-of-tasks"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-bnm5nbb0mKw76k2J2Qi04n7bmfzadtqV/AmnWSzbb+0="; + }; + + # error: use of undeclared identifier '__sincos' + postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + substituteInPlace src/math/sincos.hpp \ + --replace "__APPLE__" "0" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ]; + + propagatedBuildInputs = [ + urdfdom + ] ++ lib.optionals (!pythonSupport) [ + boost + eigen + ] ++ lib.optionals pythonSupport [ + python3Packages.boost + python3Packages.eigenpy + ]; + + cmakeFlags = lib.optionals (!pythonSupport) [ + "-DBUILD_PYTHON_INTERFACE=OFF" + ]; + + meta = with lib; { + description = "A fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives"; + homepage = "https://github.com/stack-of-tasks/pinocchio"; + license = licenses.bsd2; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 6110d459ecca..8da35364e2b8 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -3,7 +3,6 @@ , buildPackages , fetchFromGitLab , fetchpatch -, removeReferencesTo , python3 , meson , ninja @@ -20,20 +19,18 @@ , libjack2 , libusb1 , udev -, libva , libsndfile , vulkan-headers , vulkan-loader , webrtc-audio-processing , ncurses -, readline81 # meson can't find <7 as those versions don't have a .pc file +, readline # meson can't find <7 as those versions don't have a .pc file , lilv , makeFontsConf , callPackage , nixosTests , withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind , valgrind -, withMediaSession ? true , libcameraSupport ? true , libcamera , libdrm @@ -71,7 +68,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.60"; + version = "0.3.65"; outputs = [ "out" @@ -89,7 +86,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-HDE2QAV2jnEJCqgiGx4TVP4ceeKAqwd4P3OYw6auNAM="; + sha256 = "sha256-O5nu58QFlOPTaN4qNi50Wp9acxM6dWNy63BD+AnVl5w="; }; patches = [ @@ -106,24 +103,11 @@ let # Place SPA data files in lib output to avoid dependency cycles ./0095-spa-data-dir.patch - # Following are backported patches as recommended by upstream. - # FIXME: remove in 0.3.61 - # fix tdesktop with pw-pulse + # backport a fix to actually install the new module + # FIXME: remove after 0.3.66 (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b720da771efa950cf380101bed42d5d5ee177908.diff"; - hash = "sha256-p/BvatnbEJAMLQUUOECKAK7FppaNp9ei3FHjAw2spM8="; - }) - - # fix a crash when quickly switching Bluetooth profiles - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/bf3516ba0496b644b3944b114253f23964178897.diff"; - hash = "sha256-LqasplS/azCPekslJQPTd9MZkUcRqA0ks94FtwyY3GA="; - }) - - # fix no sound in VMs (Pipewire on the guest) - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b46d8a8c921a8da6883610ad4b68da95bf59b59e.diff"; - hash = "sha256-2VHBwXbzUAGP/fG4xxoFLHSb9oXQK1BPuNv3zAV8cEg="; + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/fba7083f8ceb210c7c20aceafeb5c9a8767cf705.patch"; + hash = "sha256-aZQ4OzK0B5YPq+jQNygxPE0coG2qB0ukbYzyI8E24XM="; }) ]; @@ -146,7 +130,7 @@ let libsndfile lilv ncurses - readline81 + readline udev vulkan-headers vulkan-loader @@ -163,7 +147,7 @@ let ++ lib.optionals x11Support [ libcanberra xorg.libX11 xorg.libXfixes ]; # Valgrind binary is required for running one optional test. - checkInputs = lib.optional withValgrind valgrind; + nativeCheckInputs = lib.optional withValgrind valgrind; mesonFlags = [ "-Ddocs=enabled" @@ -261,7 +245,7 @@ let homepage = "https://pipewire.org/"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ jtojnar kranzes ]; + maintainers = with maintainers; [ jtojnar kranzes k900 ]; }; }; diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index 5770866ebbed..6502ff090317 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.4.12"; + version = "0.4.13"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - sha256 = "sha256-2qM6sX807v/3DZXTuBvUSGV8+cPB87rWYb+HTDCm3kw="; + sha256 = "sha256-Zz8N6OPwZ4Dwaygiy46C3sN9zPGC12+55S/qns+S+h4="; }; nativeBuildInputs = [ @@ -71,9 +71,7 @@ stdenv.mkDerivation rec { "-Dsysconfdir=/etc" ]; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "A modular session / policy manager for PipeWire"; diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix index 74e4f6c5100d..d749744d51ed 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.9.0"; + version = "1.10.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-pCdbmoVHFvpe2cK6LWl98rB0n8RaKK2WXmjQqjbF1Mg="; + sha256 = "sha256-MZSIZ8mgRhPm3g0jrfy8Ws7N3vCzn5hrNF7GwZcnNv4="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 49c50ed7bdc5..b420c17c8888 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { # XXX: The author doesn't use the orthodox SF way to store tarballs. - url = "http://plib.sourceforge.net/dist/${pname}-${version}.tar.gz"; + url = "https://plib.sourceforge.net/dist/${pname}-${version}.tar.gz"; sha256 = "0cha71mflpa10vh2l7ipyqk67dq2y0k5xbafwdks03fwdyzj4ns8"; }; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; - homepage = "http://plib.sourceforge.net/"; + homepage = "https://plib.sourceforge.net/"; platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix index 7791973bb127..1f16ba86b3ba 100644 --- a/pkgs/development/libraries/pmix/default.nix +++ b/pkgs/development/libraries/pmix/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "pmix"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { repo = "openpmix"; owner = "openpmix"; rev = "v${version}"; - sha256 = "sha256-w3j4zgEAn6RxIHAvy0B3MPFTV46ocCvc0Z36tN1T+rc="; + sha256 = "sha256-79zTZm549VRsqeziCuBT6l4jTJ6D/gZaMAvgHZm7jn4="; }; postPatch = '' diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 32571d9e9abc..5c67eb1b65db 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -21,7 +21,7 @@ , docbook_xml_dtd_412 , gtk-doc , coreutils -, useSystemd ? stdenv.isLinux +, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal , systemdMinimal , elogind # A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault). @@ -37,7 +37,7 @@ let in stdenv.mkDerivation rec { pname = "polkit"; - version = "121"; + version = "122"; outputs = [ "bin" "dev" "out" ]; # small man pages in $bin @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { owner = "polkit"; repo = "polkit"; rev = version; - sha256 = "Lj7KSGILc6CBsNqPO0G0PNt6ClikbRG45E8FZbb46yY="; + sha256 = "fLY8i8h4McAnwVt8dLOqbyHM7v3SkbWqATz69NkUudU="; }; patches = [ @@ -57,14 +57,6 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/7ba07551dfcd4ef9a87b8f0d9eb8b91fabcb41b3.patch"; sha256 = "ebbLILncq1hAZTBMsLm+vDGw6j0iQ0crGyhzyLZQgKA="; }) - # Make netgroup support optional (musl does not have it) - # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10 - # NOTE: Remove after the next release - (fetchpatch { - name = "make-innetgr-optional.patch"; - url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/b57deee8178190a7ecc75290fa13cf7daabc2c66.patch"; - sha256 = "8te6gatT9Fp+fIT05fQBym5mEwHeHfaUNUNEMfSbtLc="; - }) ]; depsBuildBuild = [ @@ -112,14 +104,14 @@ stdenv.mkDerivation rec { glib # in .pc Requires ]; - checkInputs = [ + nativeCheckInputs = [ dbus ]; mesonFlags = [ "--datadir=${system}/share" "--sysconfdir=/etc" - "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "-Dpolkitd_user=polkituser" #TODO? config.ids.uids.polkituser "-Dos_type=redhat" # only affects PAM includes "-Dtests=${lib.boolToString doCheck}" @@ -152,7 +144,7 @@ stdenv.mkDerivation rec { --replace /bin/false ${coreutils}/bin/false ''; - postConfigure = lib.optionalString (!stdenv.hostPlatform.isMusl) '' + postConfigure = lib.optionalString doCheck '' # Unpacked by meson chmod +x subprojects/mocklibc-1.0/bin/mocklibc patchShebangs subprojects/mocklibc-1.0/bin/mocklibc @@ -175,7 +167,7 @@ stdenv.mkDerivation rec { rsync --archive "${DESTDIR}${system}"/* "$out" rm --recursive "${DESTDIR}${system}"/* rmdir --parents --ignore-fail-on-non-empty "${DESTDIR}${system}" - for o in $outputs; do + for o in $(getAllOutputNames); do rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")" rm --recursive "${DESTDIR}/''${!o}" done diff --git a/pkgs/development/libraries/presage/default.nix b/pkgs/development/libraries/presage/default.nix index 5f03a425dcc0..b3c3c21e3046 100644 --- a/pkgs/development/libraries/presage/default.nix +++ b/pkgs/development/libraries/presage/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { tinyxml ]; - checkInputs = [ + nativeCheckInputs = [ cppunit ]; diff --git a/pkgs/development/libraries/process-cpp/default.nix b/pkgs/development/libraries/process-cpp/default.nix new file mode 100644 index 000000000000..f73f72e4545d --- /dev/null +++ b/pkgs/development/libraries/process-cpp/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitLab +, cmake +, boost +, properties-cpp +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "process-cpp"; + version = "unstable-2021-05-11"; + + src = fetchFromGitLab { + domain = "gitlab.com"; + owner = "ubports"; + repo = "development/core/lib-cpp/process-cpp"; + rev = "ee6d99a3278343f5fdcec7ed3dad38763e257310"; + sha256 = "sha256-jDYXKCzrg/ZGFC2xpyfkn/f7J3t0cdOwHK2mLlYWNN0="; + }; + + postPatch = '' + # Excludes tests from tainting nativeBuildInputs with their dependencies when not being run + # Tests fail upon verifying OOM score adjustment via /proc//oom_score + # [ RUN ] LinuxProcess.adjusting_proc_oom_score_adj_works + # /build/source/tests/linux_process_test.cpp:83: Failure + # Value of: is_approximately_equal(oom_score.value, core::posix::linux::proc::process::OomScoreAdj::max_value()) + # Actual: false (333 > 10) + # Expected: true + sed -i '/tests/d' CMakeLists.txt + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + boost + properties-cpp + ]; + + meta = with lib; { + description = "A simple convenience library for handling processes in C++11"; + homepage = "https://gitlab.com/ubports/development/core/lib-cpp/process-cpp"; + license = with licenses; [ gpl3Only lgpl3Only ]; + maintainers = with maintainers; [ onny ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/proj/7.nix b/pkgs/development/libraries/proj/7.nix index 95c02febdabc..4e1ade0bd56b 100644 --- a/pkgs/development/libraries/proj/7.nix +++ b/pkgs/development/libraries/proj/7.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite libtiff curl ]; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; cmakeFlags = [ "-DUSE_EXTERNAL_GTEST=ON" diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 2e1000ef5e64..1dc4a3a838b5 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -5,6 +5,7 @@ , cmake , pkg-config , buildPackages +, callPackage , sqlite , libtiff , curl @@ -13,15 +14,15 @@ , python3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "proj"; - version = "9.1.0"; + version = "9.1.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = version; - hash = "sha256-Upsp72RorV+5PFPHOK3zCJgVTRZ6fSVVFRope8Bp8/M="; + hash = "sha256-yw7eSm64qFFt9egJWKVyVo0e7xQRSmfUY7pk6Cwvwdk="; }; patches = [ @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite libtiff curl nlohmann_json ]; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; cmakeFlags = [ "-DUSE_EXTERNAL_GTEST=ON" @@ -62,6 +63,7 @@ stdenv.mkDerivation rec { passthru.tests = { python = python3.pkgs.pyproj; + proj = callPackage ./tests.nix { proj = finalAttrs.finalPackage; }; }; meta = with lib; { @@ -71,4 +73,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/libraries/proj/tests.nix b/pkgs/development/libraries/proj/tests.nix new file mode 100644 index 000000000000..38126f06dd4d --- /dev/null +++ b/pkgs/development/libraries/proj/tests.nix @@ -0,0 +1,11 @@ +{ runCommand, proj }: + +let + inherit (proj) pname; +in +runCommand "${pname}-tests" { meta.timeout = 60; } + '' + ${proj}/bin/projinfo EPSG:4326 \ + | grep '+proj=longlat +datum=WGS84 +no_defs +type=crs' + touch $out + '' diff --git a/pkgs/development/libraries/protobuf/3.17.nix b/pkgs/development/libraries/protobuf/3.17.nix index d869b9ce76ef..36198b5d337b 100644 --- a/pkgs/development/libraries/protobuf/3.17.nix +++ b/pkgs/development/libraries/protobuf/3.17.nix @@ -1,6 +1,6 @@ -{ callPackage, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3.nix { +callPackage ./generic-v3.nix ({ version = "3.17.3"; sha256 = "08644kaxhpjs38q5q4fp01yr0wakg1ijha4g3lzp2ifg7y3c465d"; -} +} // args) diff --git a/pkgs/development/libraries/protobuf/3.19.nix b/pkgs/development/libraries/protobuf/3.19.nix index c62e4d46ce8b..7ee378d8ed3b 100644 --- a/pkgs/development/libraries/protobuf/3.19.nix +++ b/pkgs/development/libraries/protobuf/3.19.nix @@ -1,6 +1,6 @@ -{ callPackage, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3.nix { +callPackage ./generic-v3.nix ({ version = "3.19.6"; sha256 = "sha256-+ul9F8tyrwk2p25Dd9ragqwpYzdxdeGjpXhLAwKYWfM="; -} +} // args) diff --git a/pkgs/development/libraries/protobuf/3.20.nix b/pkgs/development/libraries/protobuf/3.20.nix index 818e65639e57..bae3550f8f05 100644 --- a/pkgs/development/libraries/protobuf/3.20.nix +++ b/pkgs/development/libraries/protobuf/3.20.nix @@ -1,6 +1,6 @@ -{ callPackage, abseil-cpp, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3.nix { +callPackage ./generic-v3.nix ({ version = "3.20.3"; sha256 = "sha256-u/1Yb8+mnDzc3OwirpGESuhjkuKPgqDAvlgo3uuzbbk="; -} +} // args) diff --git a/pkgs/development/libraries/protobuf/3.21.nix b/pkgs/development/libraries/protobuf/3.21.nix index 6ba9ca31aba6..fe85be8cf022 100644 --- a/pkgs/development/libraries/protobuf/3.21.nix +++ b/pkgs/development/libraries/protobuf/3.21.nix @@ -1,6 +1,6 @@ -{ callPackage, abseil-cpp, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3-cmake.nix { - version = "3.21.8"; - sha256 = "sha256-cSNHX18CvMmydpYWqfe6WWk9rGxIlFfY/85rfSyznU4="; -} +callPackage ./generic-v3-cmake.nix ({ + version = "3.21.12"; + sha256 = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; +} // args) diff --git a/pkgs/development/libraries/protobuf/3.8.nix b/pkgs/development/libraries/protobuf/3.8.nix index 2ea03643b3ae..fe5ad4b4e02f 100644 --- a/pkgs/development/libraries/protobuf/3.8.nix +++ b/pkgs/development/libraries/protobuf/3.8.nix @@ -1,6 +1,6 @@ -{ callPackage, ... }: +{ callPackage, ... } @ args: -callPackage ./generic-v3.nix { +callPackage ./generic-v3.nix ({ version = "3.8.0"; sha256 = "0vll02a6k46k720wfh25sl4hdai0130s3ix2l1wh6j1lm9pi7bm8"; -} +} // args) diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/development/libraries/protobufc/default.nix index 28c15f0ef45e..dc3b2c92f191 100644 --- a/pkgs/development/libraries/protobufc/default.nix +++ b/pkgs/development/libraries/protobufc/default.nix @@ -1,5 +1,12 @@ -{ lib, stdenv, fetchFromGitHub -, autoreconfHook, pkg-config, protobuf, zlib +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, pkg-config +, protobuf +, zlib +, buildPackages }: stdenv.mkDerivation rec { @@ -13,15 +20,25 @@ stdenv.mkDerivation rec { hash = "sha256-TJCLzxozuZ8ynrBQ2lKyk03N+QA/lbOwywUjDUdTlbM="; }; + patches = [ + # https://github.com/protobuf-c/protobuf-c/pull/534 + (fetchpatch { + url = "https://github.com/protobuf-c/protobuf-c/commit/a6c9ea5207aeac61c57b446ddf5a6b68308881d8.patch"; + hash = "sha256-wTb8+YbvrCrOVpgthI5SJdG/CpQcOzCX4Bv47FPY804="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ protobuf zlib ]; + PROTOC = lib.getExe buildPackages.protobuf; + meta = with lib; { homepage = "https://github.com/protobuf-c/protobuf-c/"; description = "C bindings for Google's Protocol Buffers"; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/pkgs/development/libraries/pslib/default.nix b/pkgs/development/libraries/pslib/default.nix index b3439b7ee96f..94dead43a43e 100644 --- a/pkgs/development/libraries/pslib/default.nix +++ b/pkgs/development/libraries/pslib/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A C-library for generating multi page PostScript documents"; - homepage = "http://pslib.sourceforge.net/"; + homepage = "https://pslib.sourceforge.net/"; changelog = "https://sourceforge.net/p/pslib/git/ci/master/tree/pslib/ChangeLog"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/psol/default.nix b/pkgs/development/libraries/psol/default.nix index 270c24dc01f4..6bbe426fb544 100644 --- a/pkgs/development/libraries/psol/default.nix +++ b/pkgs/development/libraries/psol/default.nix @@ -1,5 +1,19 @@ -{ callPackage }: -callPackage ./generic.nix {} { +{ fetchzip, lib }: + +fetchzip rec { + pname = "psol"; version = "1.13.35.2"; # Latest stable, 2018-02-05 - sha256 = "0xi2srf9gx0x2sz9r45zb35k2n0iv457if1lqzvbanls3f935cmr"; + + url = "https://dl.google.com/dl/page-speed/psol/${version}-x64.tar.gz"; + sha256 = "0xi2srf9gx0x2sz9r45zb35k2n0iv457if1lqzvbanls3f935cmr"; + + meta = with lib; { + description = "PageSpeed Optimization Libraries"; + homepage = "https://developers.google.com/speed/pagespeed/psol"; + license = licenses.asl20; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + # WARNING: This only works with Linux because the pre-built PSOL binary is only supplied for Linux. + # TODO: Build PSOL from source to support more platforms. + platforms = platforms.linux; + }; } diff --git a/pkgs/development/libraries/psol/generic.nix b/pkgs/development/libraries/psol/generic.nix deleted file mode 100644 index 8f312fe9dbc8..000000000000 --- a/pkgs/development/libraries/psol/generic.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ fetchzip, lib }: -{ version, sha256 }: -{ inherit version; } // fetchzip { - inherit sha256; - name = "psol-${version}"; - url = "https://dl.google.com/dl/page-speed/psol/${version}-x64.tar.gz"; - - meta = { - description = "PageSpeed Optimization Libraries"; - homepage = "https://developers.google.com/speed/pagespeed/psol"; - license = lib.licenses.asl20; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - # WARNING: This only works with Linux because the pre-built PSOL binary is only supplied for Linux. - # TODO: Build PSOL from source to support more platforms. - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/pstreams/default.nix b/pkgs/development/libraries/pstreams/default.nix index bb9b6bc9c84b..2baa3b355023 100644 --- a/pkgs/development/libraries/pstreams/default.nix +++ b/pkgs/development/libraries/pstreams/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { POSIX.2 functions popen(3) and pclose(3), using C++ iostreams instead of C's stdio library. ''; - homepage = "http://pstreams.sourceforge.net/"; - downloadPage = "http://pstreams.sourceforge.net/download/"; + homepage = "https://pstreams.sourceforge.net/"; + downloadPage = "https://pstreams.sourceforge.net/download/"; maintainers = with maintainers; [ arthur ]; license = licenses.boost; platforms = platforms.all; diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index a09abc539c92..403c90357755 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ]; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; preConfigure = '' # Enable long long support (required for filezilla) diff --git a/pkgs/development/libraries/pxlib/default.nix b/pkgs/development/libraries/pxlib/default.nix index 4b6b9ada7ab7..6b31ef3257dd 100644 --- a/pkgs/development/libraries/pxlib/default.nix +++ b/pkgs/development/libraries/pxlib/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library to read and write Paradox files"; - homepage = "http://pxlib.sourceforge.net/"; + homepage = "https://pxlib.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.winpat ]; diff --git a/pkgs/development/libraries/py3c/default.nix b/pkgs/development/libraries/py3c/default.nix index c3eb3bfd1a1d..f4d2aa95a2e8 100644 --- a/pkgs/development/libraries/py3c/default.nix +++ b/pkgs/development/libraries/py3c/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { pname = "py3c"; @@ -24,11 +24,12 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ - python2 + nativeCheckInputs = [ python3 ]; + checkTarget = "test-python"; + meta = with lib; { homepage = "https://github.com/encukou/py3c"; description = "Python 2/3 compatibility layer for C extensions"; diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index 2be89b3b7534..f0b7c8478e08 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -1,26 +1,43 @@ -{ lib, stdenv, fetchurl, python, qmake, +{ lib, stdenv, fetchFromGitHub, fetchpatch, python, qmake, qtwebengine, qtxmlpatterns, qttools, unzip }: stdenv.mkDerivation rec { - version = "3.2"; pname = "python-qt"; + version = "3.3.0"; - src = fetchurl { - url="mirror://sourceforge/pythonqt/PythonQt${version}.zip"; - sha256="13hzprk58m3yj39sj0xn6acg8796lll1256mpd81kw0z3yykyl8c"; + src = fetchFromGitHub { + owner = "MeVisLab"; + repo = "pythonqt"; + rev = "v${version}"; + hash = "sha256-zbQ6X4Q2/QChaw3GAz/aVBj2JjWEz52YuPuHbBz935k="; }; + patches = [ + (fetchpatch { + name = "remove-unneeded-pydebug-include.patch"; + url = "https://github.com/MeVisLab/pythonqt/commit/a93104dea4d9c79351276ec963e931ca617625ec.patch"; + includes = [ "src/PythonQt.cpp" ]; + hash = "sha256-Tc4+6dIdvrda/z3Nz1s9Xz+ZWJLV2BQh8i552UynSI0="; + }) + ]; + + # https://github.com/CsoundQt/CsoundQt/blob/develop/BUILDING.md#pythonqt + postPatch = '' + substituteInPlace build/python.prf \ + --replace "unix:PYTHON_VERSION=2.7" "unix:PYTHON_VERSION=${python.pythonVersion}" + ''; + hardeningDisable = [ "all" ]; nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools unzip ]; buildInputs = [ python ]; - qmakeFlags = [ "PythonQt.pro" - "INCLUDEPATH+=${python}/include/python3.6" - "PYTHON_PATH=${python}/bin" - "PYTHON_LIB=${python}/lib"]; + qmakeFlags = [ + "PythonQt.pro" + "PYTHON_DIR=${python}" + ]; dontWrapQtApps = true; @@ -36,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications"; - homepage = "http://pythonqt.sourceforge.net/"; + homepage = "https://pythonqt.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.all; maintainers = with maintainers; [ hlolli ]; diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index b85a3ad8c7a7..67d916dd14ee 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "qca-qt5"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; - sha256 = "sha256-a2lYgafj/ZX3Oq7m6uq5b2rRflFenCs9SzJy14Yv9cQ="; + sha256 = "sha256-kffZFqs2kr9ZkfClU7+BUxYb/doUvQBdSAorTjhDYug="; }; buildInputs = [ openssl qtbase ]; @@ -26,8 +26,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ttuegel ]; license = licenses.lgpl21Plus; platforms = with platforms; unix; - # until macOS SDK supports Qt 5.15, 2.3.2 is the highest version of qca-qt5 - # that works on darwin - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix index 7fcbd489b4c9..4a288702e2f2 100644 --- a/pkgs/development/libraries/qcoro/default.nix +++ b/pkgs/development/libraries/qcoro/default.nix @@ -11,13 +11,13 @@ gcc11Stdenv.mkDerivation rec { pname = "qcoro"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "danvratil"; repo = "qcoro"; rev = "v${version}"; - sha256 = "sha256-6kRWBzspwsO0Q6/8gQUr69DJjmkPa3lWrKTmSgVn6V4="; + sha256 = "cHd2CwzP4oD/gy9qsDWIMgvlfBQq1p9C4G7JNAs4XW4="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index cc8ddf43c021..b32414f855d0 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -1,19 +1,22 @@ -{ mkDerivation +{ stdenv , lib , fetchFromGitHub , nix-update-script , cmake , pkg-config , adwaita-qt +, adwaita-qt6 , glib , gtk3 , qtbase +, qtwayland , pantheon , substituteAll , gsettings-desktop-schemas +, useQt6 ? false }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qgnomeplatform"; version = "0.8.4"; @@ -38,21 +41,28 @@ mkDerivation rec { ]; buildInputs = [ - adwaita-qt glib gtk3 qtbase + qtwayland + ] ++ lib.optionals (!useQt6) [ + adwaita-qt + ] ++ lib.optionals useQt6 [ + adwaita-qt6 ]; + # Qt setup hook complains about missing `wrapQtAppsHook` otherwise. + dontWrapQtApps = true; + cmakeFlags = [ "-DGLIB_SCHEMAS_DIR=${glib.getSchemaPath gsettings-desktop-schemas}" "-DQT_PLUGINS_DIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" + ] ++ lib.optionals useQt6 [ + "-DUSE_QT6=true" ]; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index 7ab0d8c1ae7e..4308b46c5c1f 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight data-interchange format"; - homepage = "http://qjson.sourceforge.net/"; + homepage = "https://qjson.sourceforge.net/"; license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 05c1a4c0d486..9a0be5169d11 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 = "11.1.1"; + version = "11.2.0"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "v${version}"; - hash = "sha256-m0yMOaWX9LqSCrUdx62zXZ73xXH/iW6x7bXkz1Fm8zA="; + hash = "sha256-AkLuclDm9qjVbpFqenlbgTWt/GAWzOj9d1lqgt6aPNo="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix index 57ccfd382f7b..14a9b9904d9a 100644 --- a/pkgs/development/libraries/qrencode/default.nix +++ b/pkgs/development/libraries/qrencode/default.nix @@ -12,12 +12,16 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL2 libpng ] ++ lib.optionals stdenv.isDarwin [ libiconv libobjc ]; + + buildInputs = [ libiconv libpng ] + ++ lib.optionals stdenv.isDarwin [ libobjc ]; configureFlags = [ "--with-tests" ]; + nativeCheckInputs = [ SDL2 ]; + doCheck = true; checkPhase = '' @@ -33,13 +37,11 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://fukuchi.org/works/qrencode/"; description = "C library for encoding data in a QR Code symbol"; - longDescription = '' Libqrencode is a C library for encoding data in a QR Code symbol, a kind of 2D symbology that can be scanned by handy terminals such as a mobile phone with CCD. ''; - license = licenses.lgpl21Plus; maintainers = with maintainers; [ adolfogc yana ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix deleted file mode 100644 index a93c2b67d43f..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ /dev/null @@ -1,249 +0,0 @@ -/* - -# Updates - -Before a major version update, make a copy of this directory. (We like to -keep the old version around for a short time after major updates.) Add a -top-level attribute to `top-level/all-packages.nix`. - -1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. -2. From the top of the Nixpkgs tree, run - `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION`. -3. Check that the new packages build correctly. -4. Commit the changes and open a pull request. - -*/ - -{ newScope -, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper -, bison, cups ? null, harfbuzz, libGL, perl -, gstreamer, gst-plugins-base, gtk3, dconf -, darwin -, buildPackages - - # options -, developerBuild ? false -, decryptSslTraffic ? false -, debug ? false -}: - -let - - qtCompatVersion = srcs.qtbase.version; - - mirror = "https://download.qt.io"; - srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // { - # Community port of the now unmaintained upstream qtwebkit. - qtwebkit = rec { - src = fetchFromGitHub { - owner = "qtwebkit"; - repo = "qtwebkit"; - rev = "qtwebkit-${version}"; - sha256 = "11lc5sk10d9cyg8jqkbgkqiap72b9rax7hy61nm90zw9749y2yfg"; - }; - version = "5.212.0-alpha4"; - }; - }; - - patches = { - qtbase = [ - ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch - ./qtbase.patch.d/0002-qtbase-mac.patch - ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch - - # Patch framework detection to support X.framework/X.tbd, - # extending the current support for X.framework/X. - ./qtbase.patch.d/0015-qtbase-tbd-frameworks.patch - - ./qtbase.patch.d/0003-qtbase-mkspecs.patch - ./qtbase.patch.d/0004-qtbase-replace-libdir.patch - ./qtbase.patch.d/0005-qtbase-cmake.patch - ./qtbase.patch.d/0006-qtbase-gtk3.patch - ./qtbase.patch.d/0007-qtbase-xcursor.patch - ./qtbase.patch.d/0008-qtbase-xcompose.patch - ./qtbase.patch.d/0009-qtbase-tzdir.patch - ./qtbase.patch.d/0010-qtbase-qtpluginpath.patch - ./qtbase.patch.d/0011-qtbase-assert.patch - ./qtbase.patch.d/0012-fix-header_module.patch - - # Ensure -I${includedir} is added to Cflags in pkg-config files. - # See https://github.com/NixOS/nixpkgs/issues/52457 - ./qtbase.patch.d/0014-qtbase-pkg-config.patch - - # Make Qt applications work on macOS Big Sur even if they're - # built with an older version of the macOS SDK (<10.14). This - # issue is fixed in 5.12.11, but it requires macOS SDK 10.13 to - # build. See https://bugreports.qt.io/browse/QTBUG-87014 for - # more info. - (fetchpatch { - name = "big_sur_layer_backed_views.patch"; - url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=c5d904639dbd690a36306e2b455610029704d821"; - sha256 = "0crkw3j1iwdc1pbf5dhar0b4q3h5gs2q1sika8m12y02yk3ns697"; - }) - ]; - qtdeclarative = [ - ./qtdeclarative.patch - # prevent headaches from stale qmlcache data - ./qtdeclarative-default-disable-qmlcache.patch - ]; - qtlocation = [ ./qtlocation-gcc-9.patch ]; - qtscript = [ ./qtscript.patch ]; - qtserialport = [ ./qtserialport.patch ]; - qtwebengine = [ - # glibc 2.34 compat - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch"; - sha256 = "sha256-CJxN6sTvWdPVEwSkr0zpPrjyhUIi6tYSWb8ZyO0sY2o="; - excludes = [ - "src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc" - ]; - }) - ./qtwebengine-no-build-skip.patch - # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/707 - # https://bugreports.qt.io/browse/QTBUG-77037 - (fetchpatch { - name = "fix-build-with-pulseaudio-13.0.patch"; - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/fc77d6b3d5ec74e421b58f199efceb2593cbf951/trunk/qtbug-77037-workaround.patch"; - sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am"; - }) - - ./qtwebengine-darwin-no-platform-check.patch - ./qtwebengine-darwin-fix-failed-static-assertion.patch - ]; - qtwebkit = [ - (fetchpatch { - name = "qtwebkit-bison-3.7-build.patch"; - url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; - sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; - }) - (fetchpatch { - name = "qtwebkit-glib-2.68.patch"; - 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 - - ./qtwebkit-darwin-no-readline.patch - ./qtwebkit-darwin-no-qos-classes.patch - ]; - qttools = [ ./qttools.patch ]; - }; - - addPackages = self: with self; - let - qtModule = - import ../qtModule.nix - { - inherit perl; - inherit lib; - # Use a variant of mkDerivation that does not include wrapQtApplications - # to avoid cyclic dependencies between Qt modules. - mkDerivation = - import ../mkDerivation.nix - { inherit lib; inherit debug; wrapQtAppsHook = null; } - stdenv.mkDerivation; - } - { inherit self srcs patches; }; - - callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; - in { - - inherit callPackage qtCompatVersion qtModule srcs; - - mkDerivationWith = - import ../mkDerivation.nix - { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; - - mkDerivation = mkDerivationWith stdenv.mkDerivation; - - qtbase = callPackage ../modules/qtbase.nix { - inherit (srcs.qtbase) src version; - patches = patches.qtbase; - inherit bison cups harfbuzz libGL; - withGtk3 = !stdenv.isDarwin; inherit dconf gtk3; - inherit debug developerBuild decryptSslTraffic; - inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth - CoreLocation CoreServices DiskArbitration Foundation OpenGL MetalKit IOKit; - inherit (darwin) libobjc; - }; - - qt3d = callPackage ../modules/qt3d.nix {}; - qtcharts = callPackage ../modules/qtcharts.nix {}; - qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; - qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; - qtdoc = callPackage ../modules/qtdoc.nix {}; - qtgamepad = callPackage ../modules/qtgamepad.nix { - inherit (darwin.apple_sdk.frameworks) GameController; - }; - qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; - qtimageformats = callPackage ../modules/qtimageformats.nix {}; - qtlocation = callPackage ../modules/qtlocation.nix {}; - qtmacextras = callPackage ../modules/qtmacextras.nix {}; - qtmultimedia = callPackage ../modules/qtmultimedia.nix { - inherit gstreamer gst-plugins-base; - }; - qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; - qtquick1 = null; - qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; - qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; - qtscript = callPackage ../modules/qtscript.nix {}; - qtsensors = callPackage ../modules/qtsensors.nix {}; - qtserialbus = callPackage ../modules/qtserialbus.nix {}; - qtserialport = callPackage ../modules/qtserialport.nix {}; - qtspeech = callPackage ../modules/qtspeech.nix {}; - qtsvg = callPackage ../modules/qtsvg.nix {}; - qtscxml = callPackage ../modules/qtscxml.nix {}; - qttools = callPackage ../modules/qttools.nix {}; - qttranslations = callPackage ../modules/qttranslations.nix {}; - qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; - qtwayland = callPackage ../modules/qtwayland.nix {}; - qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; - qtwebengine = callPackage ../modules/qtwebengine.nix { - inherit (darwin) cctools libobjc libunwind xnu; - inherit (darwin.apple_sdk.libs) sandbox; - inherit (darwin.apple_sdk.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit - ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication; - }; - qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; - qtwebkit = callPackage ../modules/qtwebkit.nix { - inherit (darwin) ICU; - inherit (darwin.apple_sdk.frameworks) OpenGL; - }; - qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; - qtwebview = callPackage ../modules/qtwebview.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation WebKit; - }; - qtx11extras = callPackage ../modules/qtx11extras.nix {}; - qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; - - env = callPackage ../qt-env.nix {}; - full = env "qt-full-${qtbase.version}" ([ - qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad qtgraphicaleffects - qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 - qtscript qtsensors qtserialport qtsvg qttools qttranslations - qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets - qtwebview qtx11extras qtxmlpatterns - ] ++ lib.optional (!stdenv.isDarwin) qtwayland - ++ lib.optional (stdenv.isDarwin) qtmacextras); - - qmake = makeSetupHook { - deps = [ self.qtbase.dev ]; - substitutions = { - inherit debug; - fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; - }; - } ../hooks/qmake-hook.sh; - - wrapQtAppsHook = makeSetupHook { - deps = [ self.qtbase.dev buildPackages.makeWrapper ] - ++ lib.optional stdenv.isLinux self.qtwayland.dev; - } ../hooks/wrap-qt-apps-hook.sh; - }; - -in lib.makeScope newScope addPackages diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh deleted file mode 100644 index 6d2cf551dd5b..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/fetch.sh +++ /dev/null @@ -1,2 +0,0 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.10/submodules/ \ - -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch deleted file mode 100644 index 6646e1e0b2be..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch +++ /dev/null @@ -1,387 +0,0 @@ -diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index b77494ec..470c38e7 100644 ---- a/mkspecs/common/mac.conf -+++ b/mkspecs/common/mac.conf -@@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \ - - QMAKE_FIX_RPATH = install_name_tool -id - --QMAKE_LFLAGS_RPATH = -Wl,-rpath, -+QMAKE_LFLAGS_RPATH = - QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip - - QMAKE_LFLAGS_REL_RPATH = -diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index d052808c..b80ec1e8 100644 ---- a/mkspecs/features/mac/default_post.prf -+++ b/mkspecs/features/mac/default_post.prf -@@ -68,208 +68,6 @@ qt { - } - } - --# Add the same default rpaths as Xcode does for new projects. --# This is especially important for iOS/tvOS/watchOS where no other option is possible. --!no_default_rpath { -- QMAKE_RPATHDIR += @executable_path/../Frameworks -- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks --} -- --# Don't pass -headerpad_max_install_names when using Bitcode. --# In that case the linker emits a warning stating that the flag is ignored when --# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). --# Using this flag is also unnecessary in practice on UIKit platforms since they --# are sandboxed, and only UIKit platforms support bitcode to begin with. --!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD -- --app_extension_api_only { -- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION --} -- --macx-xcode { -- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO -- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ -- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO -- else: \ -- qmake_pkginfo_typeinfo.value = "????" -- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo -- -- bundle_version = $$VERSION -- isEmpty(bundle_version): bundle_version = 1.0.0 -- -- l = $$split(bundle_version, '.') 0 0 # make sure there are at least three -- VER_MAJ = $$member(l, 0, 0) -- VER_MIN = $$member(l, 1, 1) -- VER_PAT = $$member(l, 2, 2) -- unset(l) -- -- qmake_full_version.name = QMAKE_FULL_VERSION -- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} -- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version -- -- qmake_short_version.name = QMAKE_SHORT_VERSION -- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} -- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version -- -- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { -- debug_information_format.name = DEBUG_INFORMATION_FORMAT -- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT -- debug_information_format.build = debug -- QMAKE_MAC_XCODE_SETTINGS += debug_information_format -- } -- -- QMAKE_XCODE_ARCHS = -- -- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" -- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_device -- -- simulator { -- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" -- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_simulator -- } -- -- only_active_arch.name = ONLY_ACTIVE_ARCH -- only_active_arch.value = YES -- only_active_arch.build = debug -- QMAKE_MAC_XCODE_SETTINGS += only_active_arch --} else { -- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS -- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS -- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS -- -- isEmpty(VALID_ARCHS): \ -- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") -- -- single_arch: VALID_ARCHS = $$first(VALID_ARCHS) -- -- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) -- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) -- -- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS -- -- arch_flags = $(EXPORT_ARCH_ARGS) -- -- QMAKE_CFLAGS += $$arch_flags -- QMAKE_CXXFLAGS += $$arch_flags -- QMAKE_LFLAGS += $$arch_flags -- -- QMAKE_PCH_ARCHS = $$VALID_ARCHS -- -- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET -- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET -- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET -- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET -- -- # If we're doing a simulator and device build, device and simulator -- # architectures use different paths and flags for the sysroot and -- # deployment target switch, so we must multiplex them across multiple -- # architectures using -Xarch. Otherwise we fall back to the simple path. -- # This is not strictly necessary, but results in cleaner command lines -- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit -- # individual rules to a different set of architecture(s) from the overall -- # build (such as machtest in QtCore). -- simulator:device { -- QMAKE_XARCH_CFLAGS = -- QMAKE_XARCH_LFLAGS = -- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS -- -- for (arch, VALID_ARCHS) { -- contains(VALID_SIMULATOR_ARCHS, $$arch) { -- sdk = $$simulator.sdk -- version_identifier = $$simulator.deployment_identifier -- } else { -- sdk = $$device.sdk -- version_identifier = $$device.deployment_identifier -- } -- -- version_min_flags = \ -- -Xarch_$${arch} \ -- -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -isysroot$$xcodeSDKInfo(Path, $$sdk) -- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -isysroot$$xcodeSDKInfo(Path, $$sdk) -- -- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) -- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) -- -- QMAKE_EXTRA_VARIABLES += \ -- QMAKE_XARCH_CFLAGS_$${arch} \ -- QMAKE_XARCH_LFLAGS_$${arch} -- } -- -- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) -- } else { -- simulator: \ -- version_identifier = $$simulator.deployment_identifier -- else: \ -- version_identifier = $$device.deployment_identifier -- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag -- QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag -- QMAKE_LFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag -- } -- -- # Enable precompiled headers for multiple architectures -- QMAKE_CFLAGS_USE_PRECOMPILE = -- for (arch, VALID_ARCHS) { -- icc_pch_style: \ -- use_flag = "-pch-use " -- else: \ -- use_flag = -include -- -- # Only use Xarch with multi-arch, as the option confuses ccache -- count(VALID_ARCHS, 1, greaterThan): \ -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- -Xarch_$${arch} -- -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} -- } -- icc_pch_style { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} -- QMAKE_CFLAGS_USE_PRECOMPILE = -- } else { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- } -- -- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} --} -- --!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) { -- # Explicit SDK version has been set, respect that -- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version --} -- --cache(QMAKE_XCODE_DEVELOPER_PATH, stash) --!isEmpty(QMAKE_XCODE_VERSION): \ -- cache(QMAKE_XCODE_VERSION, stash) -- --QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() -- --xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER --xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX --isEmpty(xcode_product_bundle_identifier_setting.value): \ -- xcode_product_bundle_identifier_setting.value = "com.yourcompany" --xcode_product_bundle_target = $$QMAKE_BUNDLE --isEmpty(xcode_product_bundle_target): \ -- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} --xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" --QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting -- - !macx-xcode { - generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS - generate_xcode_project.target = xcodeproj -diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561..3b01424e 100644 ---- a/mkspecs/features/mac/default_pre.prf -+++ b/mkspecs/features/mac/default_pre.prf -@@ -1,60 +1,2 @@ - CONFIG = asset_catalogs rez $$CONFIG - load(default_pre) -- --isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { -- # Get path of Xcode's Developer directory -- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") -- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") -- -- # Make sure Xcode path is valid -- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") --} -- --isEmpty(QMAKE_XCODEBUILD_PATH): \ -- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") -- --!isEmpty(QMAKE_XCODEBUILD_PATH) { -- # Make sure Xcode is set up properly -- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ -- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") -- -- isEmpty(QMAKE_XCODE_VERSION) { -- # Extract Xcode version using xcodebuild -- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") -- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) -- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") -- unset(xcode_version) -- } --} -- --isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { -- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist -- exists($$QMAKE_XCODE_PREFERENCES_FILE): \ -- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") -- -- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ -- cache(QMAKE_TARGET_BUNDLE_PREFIX) --} -- --QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon -- --# Make the default debug info format for static debug builds --# DWARF instead of DWARF with dSYM. This cuts down build times --# for application debug builds significantly, as Xcode doesn't --# have to pull out all the DWARF info from the Qt static libs --# and put it into a dSYM file. We don't need that dSYM file in --# the first place, since the information is available in the --# object files inside the archives (static libraries). --macx-xcode:qtConfig(static): \ -- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf -- --# This variable is used by the xcode_dynamic_library_suffix --# feature, which allows Xcode to choose the Qt libraries to link to --# at build time, depending on the current Xcode SDK and configuration. --QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX -- --xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP --xcode_copy_phase_strip_setting.value = NO --QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk -index c40f58c9..e69de29b 100644 ---- a/mkspecs/features/mac/sdk.mk -+++ b/mkspecs/features/mac/sdk.mk -@@ -1,25 +0,0 @@ -- --ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) -- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1 -- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) -- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) -- # We don't want to complain about out of date SDK unless the target needs to be remade. -- # This covers use-cases such as running 'make check' after moving the build to a -- # computer without Xcode or with a different Xcode version. -- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) -- ifeq ($(TARGET_UP_TO_DATE),0) -- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) -- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) -- else ifneq ($(CURRENT_MAC_SDK_VERSION),) -- $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) -- else -- $(info Unknown error resolving current platform SDK version.) -- endif -- $(info This requires a fresh build. Please wipe the build directory completely,) -- $(info including any .qmake.stash and .qmake.cache files generated by qmake.) -- $(error ^) -- endif -- endif --endif -diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 3a9c2778..e69de29b 100644 ---- a/mkspecs/features/mac/sdk.prf -+++ b/mkspecs/features/mac/sdk.prf -@@ -1,61 +0,0 @@ -- --isEmpty(QMAKE_MAC_SDK): \ -- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") -- --contains(QMAKE_MAC_SDK, .*/.*): \ -- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") -- --defineReplace(xcodeSDKInfo) { -- info = $$1 -- equals(info, "Path"): \ -- infoarg = --show-sdk-path -- equals(info, "PlatformPath"): \ -- infoarg = --show-sdk-platform-path -- equals(info, "SDKVersion"): \ -- infoarg = --show-sdk-version -- sdk = $$2 -- isEmpty(sdk): \ -- sdk = $$QMAKE_MAC_SDK -- -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { -- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null") -- # --show-sdk-platform-path won't work for Command Line Tools; this is fine -- # only used by the XCTest backend to testlib -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \ -- error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg") -- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) -- } -- -- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) --} -- --QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) --QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) --QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) -- --isEmpty(QMAKE_EXPORT_INCDIR_OPENGL) { -- QMAKE_EXPORT_INCDIR_OPENGL = $$QMAKE_INCDIR_OPENGL -- sysrootified = -- for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val -- QMAKE_INCDIR_OPENGL = $$sysrootified --} -- --QMAKESPEC_NAME = $$basename(QMAKESPEC) -- --# Resolve SDK version of various tools --for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) { -- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} -- !isEmpty($$tool_variable) { -- $$tool = $$eval($$tool_variable) -- next() -- } -- -- value = $$eval($$tool) -- isEmpty(value): next() -- -- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") -- isEmpty(sysrooted): next() -- -- $$tool = $$sysrooted $$member(value, 1, -1) -- cache($$tool_variable, set stash, $$tool) --} diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch deleted file mode 100644 index 9f0c66651844..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 203c9338dc92c2c36007cfe6633387348976637e Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:37:15 -0500 -Subject: [PATCH 02/12] qtbase-mac - ---- - src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++-- - src/testlib/qappletestlogger.cpp | 2 +- - src/testlib/qappletestlogger_p.h | 2 +- - src/testlib/qtestcase.cpp | 2 +- - src/testlib/qtestlog.cpp | 2 +- - src/testlib/qtestlog_p.h | 2 +- - 6 files changed, 19 insertions(+), 7 deletions(-) - -diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h -index f96e7358..650946b7 100644 ---- a/src/corelib/kernel/qcore_mac_p.h -+++ b/src/corelib/kernel/qcore_mac_p.h -@@ -212,7 +212,7 @@ private: - - // -------------------------------------------------------------------------- - --#if !defined(QT_BOOTSTRAPPED) -+#if 0 - - QT_END_NAMESPACE - #include -@@ -290,7 +290,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); - - #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); - --#endif // !defined(QT_BOOTSTRAPPED) -+#else // !defined(QT_BOOTSTRAPPED) -+ -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) -+ -+#define QT_APPLE_LOG_ACTIVITY2(...) -+#define QT_APPLE_LOG_ACTIVITY1(...) -+#define QT_APPLE_LOG_ACTIVITY(...) -+ -+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) -+ -+#endif - - // ------------------------------------------------------------------------- - -diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp -index dfeadebd..2a74330c 100644 ---- a/src/testlib/qappletestlogger.cpp -+++ b/src/testlib/qappletestlogger.cpp -@@ -43,7 +43,7 @@ - - QT_BEGIN_NAMESPACE - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - - using namespace QTestPrivate; - -diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h -index 62c6d95c..f8e0a3b7 100644 ---- a/src/testlib/qappletestlogger_p.h -+++ b/src/testlib/qappletestlogger_p.h -@@ -57,7 +57,7 @@ - - QT_BEGIN_NAMESPACE - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - class QAppleTestLogger : public QAbstractTestLogger - { - public: -diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp -index 0c935a1f..22f2d75d 100644 ---- a/src/testlib/qtestcase.cpp -+++ b/src/testlib/qtestcase.cpp -@@ -850,7 +850,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml) - - bool addFallbackLogger = !explicitLoggerRequested; - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - // Any explicitly requested loggers will be added by now, so we can check if they use stdout - const bool safeToAddAppleLogger = !AppleUnifiedLogger::willMirrorToStderr() || !QTestLog::loggerUsingStdout(); - if (safeToAddAppleLogger && QAppleTestLogger::debugLoggingEnabled()) { -diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp -index 57bb7d95..33fb8162 100644 ---- a/src/testlib/qtestlog.cpp -+++ b/src/testlib/qtestlog.cpp -@@ -460,7 +460,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename) - case QTestLog::TAP: - logger = new QTapTestLogger(filename); - break; --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - case QTestLog::Apple: - logger = new QAppleTestLogger; - break; -diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h -index e63e89a7..213b6945 100644 ---- a/src/testlib/qtestlog_p.h -+++ b/src/testlib/qtestlog_p.h -@@ -68,7 +68,7 @@ class Q_TESTLIB_EXPORT QTestLog - public: - enum LogMode { - Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - , Apple - #endif - #if defined(HAVE_XCTEST) --- -2.23.0 - diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0003-qtbase-mkspecs.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0003-qtbase-mkspecs.patch deleted file mode 100644 index 506397bc6056..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0003-qtbase-mkspecs.patch +++ /dev/null @@ -1,491 +0,0 @@ -From 9ffbcc5e362d17aea3e3d67e43cd3cd993e987eb Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Mon, 12 Apr 2021 20:05:25 +0200 -Subject: [PATCH 03/12] qtbase-mkspecs - ---- - mkspecs/features/create_cmake.prf | 53 ++++-------- - .../data/cmake/Qt5BasicConfig.cmake.in | 80 +------------------ - mkspecs/features/qml_module.prf | 2 +- - mkspecs/features/qml_plugin.prf | 2 +- - mkspecs/features/qt_app.prf | 2 +- - mkspecs/features/qt_build_paths.prf | 4 +- - mkspecs/features/qt_docs.prf | 10 +-- - mkspecs/features/qt_example_installs.prf | 2 +- - mkspecs/features/qt_functions.prf | 27 ++++--- - mkspecs/features/qt_installs.prf | 22 ++--- - mkspecs/features/qt_plugin.prf | 2 +- - 11 files changed, 53 insertions(+), 153 deletions(-) - -diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 02e5775983..3782949d32 100644 ---- a/mkspecs/features/create_cmake.prf -+++ b/mkspecs/features/create_cmake.prf -@@ -21,7 +21,7 @@ load(cmake_functions) - # at cmake time whether package has been found via a symlink, and correct - # that to an absolute path. This is only done for installations to - # the /usr or / prefix. --CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS]) -+CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$NIX_OUTPUT_OUT/lib/) - contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR - - CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake -@@ -70,45 +70,20 @@ split_incpath { - $$cmake_extra_source_includes.output - } - --CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { -- CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/ -- CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True --} -+CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/ -+CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True - --CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_LIB_DIR,"^\\.\\./.*") { -- CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ -- CMAKE_LIB_DIR_IS_ABSOLUTE = True --} else { -- CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS]) -- # We need to go up another two levels because the CMake files are -- # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} -- CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" --} -+CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/ -+CMAKE_BIN_DIR_IS_ABSOLUTE = True - --CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_BIN_DIR, "^\\.\\./.*") { -- CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ -- CMAKE_BIN_DIR_IS_ABSOLUTE = True --} -+CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ -+CMAKE_LIB_DIR_IS_ABSOLUTE = True - --CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") { -- CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/ -- CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True --} -- --win32:!static:!staticlib { -- CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX]) -- contains(CMAKE_DLL_DIR, "^\\.\\./.*") { -- CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ -- CMAKE_DLL_DIR_IS_ABSOLUTE = True -- } --} else { -- CMAKE_DLL_DIR = $$CMAKE_LIB_DIR -- CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE --} -+CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/ -+CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True -+ -+CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/ -+CMAKE_DLL_DIR_IS_ABSOLUTE = True - - static|staticlib:CMAKE_STATIC_TYPE = true - -@@ -188,7 +163,7 @@ contains(CONFIG, plugin) { - cmake_target_file - - cmake_qt5_plugin_file.files = $$cmake_target_file.output -- cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} -+ cmake_qt5_plugin_file.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} - INSTALLS += cmake_qt5_plugin_file - - return() -@@ -334,7 +309,7 @@ exists($$cmake_macros_file.input) { - cmake_qt5_module_files.files += $$cmake_macros_file.output - } - --cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} -+cmake_qt5_module_files.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} - - # We are generating cmake files. Most developers of Qt are not aware of cmake, - # so we require automatic tests to be available. The only module which should -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index c729892889..c60ef16e64 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) - message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") - endif() - --!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) --!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) --set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") --!!ELSE --get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) --# Use original install prefix when loaded through a --# cross-prefix symbolic link such as /lib -> /usr/lib. --get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) --get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) --if(_realCurr STREQUAL _realOrig) -- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) --else() -- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) --endif() --unset(_realOrig) --unset(_realCurr) --unset(_IMPORT_PREFIX) --!!ENDIF --!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) --get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) --!!ELSE --set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") --!!ENDIF -- - !!IF !equals(TEMPLATE, aux) - # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. - set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") -@@ -52,11 +28,7 @@ endmacro() - macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - --!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") --!!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") --!!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES - \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" -@@ -69,11 +41,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI - ) - - !!IF !isEmpty(CMAKE_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") --!!ELSE - set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") --!!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) - if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -@@ -89,24 +57,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - !!IF !no_module_headers - !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) - set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" -+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" -+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" - ) - !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" -- ) --!!ELSE -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") --!!ENDIF --!!ELSE --!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) -- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") --!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" -+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" -+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" - ) - !!ELSE - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -122,7 +79,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") - !!ENDIF - !!ENDIF --!!ENDIF - !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) - include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) - !!ENDIF -@@ -272,25 +228,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) - !!IF isEmpty(CMAKE_DEBUG_TYPE) - !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) - !!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS --!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" --!!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" --!!ENDIF - AND EXISTS --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) - !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() -@@ -309,25 +253,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) - !!IF isEmpty(CMAKE_RELEASE_TYPE) - !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) - !!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS --!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" --!!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" --!!ENDIF - AND EXISTS --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) - !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() -@@ -346,11 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - --!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") --!!ELSE - set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") --!!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) - set_target_properties(Qt5::${Plugin} PROPERTIES - \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf -index 57cfec78b3..5cbd7c52ef 100644 ---- a/mkspecs/features/qml_module.prf -+++ b/mkspecs/features/qml_module.prf -@@ -51,7 +51,7 @@ builtin_resources { - # Install rules - qmldir.base = $$qmldir_path - qmldir.files = $$qmldir_file --qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH -+qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH - INSTALLS += qmldir - - qmlfiles.base = $$_PRO_FILE_PWD_ -diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf -index ad8ecdf5f1..804634b22e 100644 ---- a/mkspecs/features/qml_plugin.prf -+++ b/mkspecs/features/qml_plugin.prf -@@ -50,7 +50,7 @@ load(qt_build_paths) - - DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH - --target.path = $$[QT_INSTALL_QML]/$$TARGETPATH -+target.path = $$NIX_OUTPUT_QML/$$TARGETPATH - INSTALLS += target - - # Some final setup -diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index 8354f30eea..62028fef8e 100644 ---- a/mkspecs/features/qt_app.prf -+++ b/mkspecs/features/qt_app.prf -@@ -30,7 +30,7 @@ host_build:force_bootstrap { - target.path = $$[QT_HOST_BINS] - } else { - !build_pass:qtConfig(debug_and_release): CONFIG += release -- target.path = $$[QT_INSTALL_BINS] -+ target.path = $$NIX_OUTPUT_BIN/bin - CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable - } - INSTALLS += target -diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf -index 3bb3823a8e..655b7b7db8 100644 ---- a/mkspecs/features/qt_build_paths.prf -+++ b/mkspecs/features/qt_build_paths.prf -@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \ - !force_independent { - # If the module is not built independently, everything ends up in qtbase. - # This is the case in non-prefix builds, except for selected modules. -- MODULE_BASE_OUTDIR = $$[QT_HOST_PREFIX] -- MODULE_QMAKE_OUTDIR = $$[QT_HOST_PREFIX] -+ MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT -+ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT - } -diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf -index 3b74cd4dd5..6bfbbe6e2d 100644 ---- a/mkspecs/features/qt_docs.prf -+++ b/mkspecs/features/qt_docs.prf -@@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR - - QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) - !build_online_docs: \ -- QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS]) -+ QDOC += -installdir $$shell_quote($$NIX_OUTPUT_DOC) - PREP_DOC_INDEXES = - DOC_INDEXES = - !isEmpty(QTREPOS) { -@@ -64,8 +64,8 @@ DOC_INDEXES = - DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) - } else { - prepare_docs: \ -- PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) -- DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) -+ PREP_DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) -+ DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) - } - - qtattributionsscanner.target = qtattributionsscanner -@@ -88,12 +88,12 @@ prepare_docs { - qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) - - inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR -- inst_html_docs.path = $$[QT_INSTALL_DOCS] -+ inst_html_docs.path = $$NIX_OUTPUT_DOC - inst_html_docs.CONFIG += no_check_exist directory no_default_install no_build - INSTALLS += inst_html_docs - - inst_qch_docs.files = $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch -- inst_qch_docs.path = $$[QT_INSTALL_DOCS] -+ inst_qch_docs.path = $$NIX_OUTPUT_DOC - inst_qch_docs.CONFIG += no_check_exist no_default_install no_build - INSTALLS += inst_qch_docs - -diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 43b58817fe..e635b8f67a 100644 ---- a/mkspecs/features/qt_example_installs.prf -+++ b/mkspecs/features/qt_example_installs.prf -@@ -88,7 +88,7 @@ sourcefiles += \ - $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ - $$DBUS_ADAPTORS $$DBUS_INTERFACES - addInstallFiles(sources.files, $$sourcefiles) --sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase -+sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase - INSTALLS += sources - - check_examples { -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 1903e509c8..1dc117a388 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -69,19 +69,22 @@ defineTest(qtHaveModule) { - defineTest(qtPrepareTool) { - cmd = $$eval(QT_TOOL.$${2}.binary) - isEmpty(cmd) { -- cmd = $$[QT_HOST_BINS]/$$2 -- exists($${cmd}.pl) { -- $${1}_EXE = $${cmd}.pl -- cmd = perl -w $$system_path($${cmd}.pl) -- } else: contains(QMAKE_HOST.os, Windows) { -- $${1}_EXE = $${cmd}.exe -- cmd = $$system_path($${cmd}.exe) -- } else:contains(QMAKE_HOST.os, Darwin) { -- BUNDLENAME = $${cmd}.app/Contents/MacOS/$$2 -- exists($$BUNDLENAME) { -- cmd = $$BUNDLENAME -+ cmd = $$system("command -v $${2}") -+ isEmpty(cmd) { -+ cmd = $$system("command -v $${2}.pl") -+ !isEmpty(cmd) { -+ $${1}_EXE = $$cmd -+ cmd = perl -w $$system_path($${cmd}) -+ } else: contains(QMAKE_HOST.os, Windows) { -+ cmd = $$system("command -v $${2}.exe") -+ $${1}_EXE = $$cmd -+ } else: contains(QMAKE_HOST.os, Darwin) { -+ cmd = $$system("command -v $${2}.app") -+ !isEmpty(cmd) { -+ cmd = $${cmd}/Contents/MacOS/$${2} -+ $${1}_EXE = $$cmd -+ } - } -- $${1}_EXE = $$cmd - } else { - $${1}_EXE = $$cmd - } -diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf -index 1ebca17366..b784441da0 100644 ---- a/mkspecs/features/qt_installs.prf -+++ b/mkspecs/features/qt_installs.prf -@@ -12,16 +12,10 @@ - #library - !qt_no_install_library { - win32 { -- host_build: \ -- dlltarget.path = $$[QT_HOST_BINS] -- else: \ -- dlltarget.path = $$[QT_INSTALL_BINS] -+ dlltarget.path = $$NIX_OUTPUT_BIN/bin - INSTALLS += dlltarget - } -- host_build: \ -- target.path = $$[QT_HOST_LIBS] -- else: \ -- target.path = $$[QT_INSTALL_LIBS] -+ target.path = $$NIX_OUTPUT_OUT/lib - !static: target.CONFIG = no_dll - INSTALLS += target - } -@@ -29,35 +23,35 @@ - #headers - qt_install_headers { - gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES -- gen_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME -+ gen_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME - INSTALLS += gen_headers - - targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES -- targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME -+ targ_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME - INSTALLS += targ_headers - - private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES -- private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private -+ private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private - generated_privates: \ - private_headers.CONFIG += no_check_exist - INSTALLS += private_headers - - qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES -- qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa -+ qpa_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa - INSTALLS += qpa_headers - } - - #module - qt_install_module { - !isEmpty(MODULE_PRI) { -- pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules -+ pritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules - pritarget.files = $$MODULE_PRI - INSTALLS += pritarget - } else: isEmpty(MODULE_PRIVATE_PRI) { - warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.") - } - !isEmpty(MODULE_PRIVATE_PRI) { -- privpritarget.path = $$[QT_HOST_DATA]/mkspecs/modules -+ privpritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules - privpritarget.files = $$MODULE_PRIVATE_PRI - INSTALLS += privpritarget - } -diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf -index 40528a65e2..903f795284 100644 ---- a/mkspecs/features/qt_plugin.prf -+++ b/mkspecs/features/qt_plugin.prf -@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { - } - } - --target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE -+target.path = $$NIX_OUTPUT_PLUGIN/$$PLUGIN_TYPE - INSTALLS += target - - TARGET = $$qt5LibraryTarget($$TARGET) --- -2.29.3 - diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0004-qtbase-replace-libdir.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0004-qtbase-replace-libdir.patch deleted file mode 100644 index f2cf54880d4a..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0004-qtbase-replace-libdir.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 492f6555bb09f207c83387441f0f23ba4602dfff Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 18 Sep 2019 05:39:50 -0500 -Subject: [PATCH 04/12] qtbase-replace-libdir - ---- - mkspecs/features/qt_common.prf | 20 ++------------------ - mkspecs/features/qt_module.prf | 5 +---- - 2 files changed, 3 insertions(+), 22 deletions(-) - -diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index caecb68a84..d3aa3ba570 100644 ---- a/mkspecs/features/qt_common.prf -+++ b/mkspecs/features/qt_common.prf -@@ -30,32 +30,16 @@ contains(TEMPLATE, .*lib) { - rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* - else: \ - rplbase = $$MODULE_BASE_OUTDIR -- host_build { -- qqt_libdir = \$\$\$\$[QT_HOST_LIBS] -- qt_libdir = $$[QT_HOST_LIBS] -- } else { -- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] -- qt_libdir = $$[QT_INSTALL_LIBS] -- } -+ qt_libdir = $$NIX_OUTPUT_OUT/lib - contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { -- lib_replace0.match = $$rplbase/lib/ -- lib_replace0.replace = $$qqt_libdir/ -- lib_replace0.CONFIG = path -- QMAKE_PRL_INSTALL_REPLACE += lib_replace0 - lib_replace.match = "[^ ']*$$rplbase/lib" - lib_replace.replace = - } else { - lib_replace.match = $$rplbase/lib -- lib_replace.replace = $$qqt_libdir -+ lib_replace.replace = $$qt_libdir - } - lib_replace.CONFIG = path - QMAKE_PRL_INSTALL_REPLACE += lib_replace -- !equals(qt_libdir, $$rplbase/lib) { -- qtlibdir_replace.match = $$qt_libdir -- qtlibdir_replace.replace = $$qqt_libdir -- qtlibdir_replace.CONFIG = path -- QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace -- } - } - - # The remainder of this file must not apply to host tools/libraries, -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index ee7de22059..9015b30d73 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -303,10 +303,7 @@ load(qt_targets) - } - !lib_bundle:unix { - CONFIG += create_libtool -- host_build: \ -- QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS] -- else: \ -- QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]" -+ QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib - !isEmpty(lib_replace0.match) { - ltlib_replace0.match = $$lib_replace0.match - ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/ --- -2.23.GIT - diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0005-qtbase-cmake.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0005-qtbase-cmake.patch deleted file mode 100644 index 64a88f300d84..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0005-qtbase-cmake.patch +++ /dev/null @@ -1,194 +0,0 @@ -From 6f53835deae80b28ec5c1c9a5c0294bbcc87f91b Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:34:28 -0500 -Subject: [PATCH 05/12] qtbase-cmake - ---- - mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +- - mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in | 4 ++-- - src/corelib/Qt5CoreConfigExtras.cmake.in | 10 +++++----- - src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in | 2 +- - .../Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in | 2 +- - src/dbus/Qt5DBusConfigExtras.cmake.in | 12 ++---------- - src/gui/Qt5GuiConfigExtras.cmake.in | 6 +++--- - src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- - 8 files changed, 16 insertions(+), 24 deletions(-) - -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index c60ef16e64..e354ab9156 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -278,7 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - -- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") -+ set(imported_location \"${PLUGIN_LOCATION}\") - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) - set_target_properties(Qt5::${Plugin} PROPERTIES - \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -index 5baf0fdb10..3583745aea 100644 ---- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -@@ -2,10 +2,10 @@ - add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED) - - !!IF !isEmpty(CMAKE_RELEASE_TYPE) --_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") -+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\") - !!ENDIF - !!IF !isEmpty(CMAKE_DEBUG_TYPE) --_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") -+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\") - !!ENDIF - - list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) -diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index e0652fdcf9..450b2a2d28 100644 ---- a/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) - add_executable(Qt5::qmake IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) - add_executable(Qt5::moc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) - add_executable(Qt5::rcc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -116,7 +116,7 @@ if (NOT TARGET Qt5::WinMain) - !!IF !isEmpty(CMAKE_RELEASE_TYPE) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ENDIF -@@ -130,7 +130,7 @@ if (NOT TARGET Qt5::WinMain) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -index c357237d0e..6f0c75de3c 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -index 706304cf34..546420f6ad 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d947159e2..b36865fc48 100644 ---- a/src/dbus/Qt5DBusConfigExtras.cmake.in -+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in -@@ -2,11 +2,7 @@ - if (NOT TARGET Qt5::qdbuscpp2xml) - add_executable(Qt5::qdbuscpp2xml IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") - _qt5_DBus_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qdbuscpp2xml PROPERTIES -@@ -17,11 +13,7 @@ endif() - if (NOT TARGET Qt5::qdbusxml2cpp) - add_executable(Qt5::qdbusxml2cpp IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") - _qt5_DBus_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qdbusxml2cpp PROPERTIES -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 84dbbfebd4..8ad0720c5c 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in -@@ -2,7 +2,7 @@ - !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) - - !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) --set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") -+set(Qt5Gui_EGL_INCLUDE_DIRS \"$$NIX_OUTPUT_DEV/$$CMAKE_INCLUDE_DIR/QtANGLE\") - !!ELSE - set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") - !!ENDIF -@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO - set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ set(imported_location \"$$NIX_OUTPUT_OUT/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ENDIF - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ELSE - set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ENDIF -diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index 99d87e2e46..a4eab2aa72 100644 ---- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in -+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) - add_executable(Qt5::uic IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ENDIF --- -2.23.GIT - diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0006-qtbase-gtk3.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0006-qtbase-gtk3.patch deleted file mode 100644 index ed1c61e76787..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0006-qtbase-gtk3.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 5bf1785809baf6be7fb5904ce6cefdb761f2c278 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:35:33 -0500 -Subject: [PATCH 06/12] qtbase-gtk3 - ---- - src/plugins/platformthemes/gtk3/main.cpp | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp -index fb1c425d8e..bb8bab9795 100644 ---- a/src/plugins/platformthemes/gtk3/main.cpp -+++ b/src/plugins/platformthemes/gtk3/main.cpp -@@ -39,6 +39,7 @@ - - #include - #include "qgtk3theme.h" -+#include - - QT_BEGIN_NAMESPACE - -@@ -54,8 +55,22 @@ public: - QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) - { - Q_UNUSED(params); -- if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) -+ if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) { -+ -+#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS -+ QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':'); -+ XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS); -+ qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':'))); -+#endif -+ -+#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES -+ QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':'); -+ GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES); -+ qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':'))); -+#endif -+ - return new QGtk3Theme; -+ } - - return 0; - } --- -2.23.GIT - diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0007-qtbase-xcursor.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0007-qtbase-xcursor.patch deleted file mode 100644 index 2fd9e9509d63..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0007-qtbase-xcursor.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 35e80f303ae6a6c4c53ba8eb3d84574cc03d68d8 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:35:58 -0500 -Subject: [PATCH 07/12] qtbase-xcursor - ---- - src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp -index fbadab4d50..c83ce0af5b 100644 ---- a/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -317,10 +317,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) - #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) - static bool function_ptrs_not_initialized = true; - if (function_ptrs_not_initialized) { -- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); -+ QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1); - bool xcursorFound = xcursorLib.load(); - if (!xcursorFound) { // try without the version number -- xcursorLib.setFileName(QLatin1String("Xcursor")); -+ xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR)); - xcursorFound = xcursorLib.load(); - } - if (xcursorFound) { --- -2.23.GIT - diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0008-qtbase-xcompose.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0008-qtbase-xcompose.patch deleted file mode 100644 index af45be94fecb..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0008-qtbase-xcompose.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b7c1c103ba04e76ae498f87ca9ef2c4e09e36d7e Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:36:10 -0500 -Subject: [PATCH 08/12] qtbase-xcompose - ---- - .../compose/generator/qtablegenerator.cpp | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -index b5a0a5bbeb..6c20305f4d 100644 ---- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations() - m_possibleLocations.reserve(7); - if (qEnvironmentVariableIsSet("QTCOMPOSE")) - m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); -- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale")); - m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale")); - m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale")); -+ m_possibleLocations.append(QLatin1String(NIXPKGS_QTCOMPOSE)); - } - - QString TableGenerator::findComposeFile() --- -2.23.GIT - diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0009-qtbase-tzdir.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0009-qtbase-tzdir.patch deleted file mode 100644 index 03466b69afbe..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0009-qtbase-tzdir.patch +++ /dev/null @@ -1,51 +0,0 @@ -From db9686362ae34e02538e449e0edfe3d61065b2e9 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:36:25 -0500 -Subject: [PATCH 09/12] qtbase-tzdir - ---- - src/corelib/tools/qtimezoneprivate_tz.cpp | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - -diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp -index 57bc000af5..d7d8119682 100644 ---- a/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ b/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -77,7 +77,11 @@ typedef QHash QTzTimeZoneHash; - // Parse zone.tab table, assume lists all installed zones, if not will need to read directories - static QTzTimeZoneHash loadTzTimeZones() - { -- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); -+ // Try TZDIR first, in case we're running on NixOS. -+ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); -+ // Fallback to traditional paths in case we are not on NixOS. -+ if (!QFile::exists(path)) -+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); - if (!QFile::exists(path)) - path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); - -@@ -656,12 +660,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) - if (!tzif.open(QIODevice::ReadOnly)) - return; - } else { -- // Open named tz, try modern path first, if fails try legacy path -- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ // Try TZDIR first, in case we're running on NixOS -+ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); - if (!tzif.open(QIODevice::ReadOnly)) { -- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -- if (!tzif.open(QIODevice::ReadOnly)) -- return; -+ // Open named tz, try modern path first, if fails try legacy path -+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) { -+ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) -+ return; -+ } - } - } - --- -2.23.GIT - diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0010-qtbase-qtpluginpath.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0010-qtbase-qtpluginpath.patch deleted file mode 100644 index 2c03521286a6..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0010-qtbase-qtpluginpath.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a3aaebda6d4b302cd202c21e306c55d3715e9b0d Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:36:41 -0500 -Subject: [PATCH 10/12] qtbase-qtpluginpath - ---- - src/corelib/kernel/qcoreapplication.cpp | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index db6546028a..cc97c46004 100644 ---- a/src/corelib/kernel/qcoreapplication.cpp -+++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -2694,6 +2694,15 @@ QStringList QCoreApplication::libraryPaths() - QStringList *app_libpaths = new QStringList; - coreappdata()->app_libpaths.reset(app_libpaths); - -+ // Add library paths derived from PATH -+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); -+ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); -+ for (const QString &path: paths) { -+ if (!path.isEmpty()) { -+ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); -+ } -+ } -+ - QString libPathEnv = qEnvironmentVariable("QT_PLUGIN_PATH"); - if (!libPathEnv.isEmpty()) { - QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts); --- -2.23.GIT - diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0011-qtbase-assert.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0011-qtbase-assert.patch deleted file mode 100644 index b4e0ab762298..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0011-qtbase-assert.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4f93027de0e9b825c4b7853d583e9b02a0443c6b Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:37:04 -0500 -Subject: [PATCH 11/12] qtbase-assert - ---- - src/testlib/qtestassert.h | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h -index 6498ea84ef..d821ced7fc 100644 ---- a/src/testlib/qtestassert.h -+++ b/src/testlib/qtestassert.h -@@ -44,10 +44,13 @@ - - QT_BEGIN_NAMESPACE - -- -+#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) -+#define QTEST_ASSERT(cond) do { } while ((false) && (cond)) -+#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond)) -+#else - #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) -- - #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) -+#endif - - QT_END_NAMESPACE - --- -2.23.GIT - diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0012-fix-header_module.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0012-fix-header_module.patch deleted file mode 100644 index 1e2c68688b04..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0012-fix-header_module.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 821db0c3056a813e2d0d36fbb2c7361df5559b05 Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Mon, 30 Sep 2019 20:15:40 -0500 -Subject: [PATCH 12/12] fix header_module - ---- - mkspecs/features/qt_module.prf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 9015b30d73..7347c791b4 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -84,7 +84,7 @@ header_module { - CONFIG += qt_no_install_library - - # Allow creation of .prl, .la and .pc files. -- target.path = $$[QT_INSTALL_LIBS] -+ target.path = $$NIX_OUTPUT_OUT/lib - target.CONFIG += dummy_install - INSTALLS += target - } else { --- -2.23.GIT - diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0013-define-kiosurfacesuccess.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0013-define-kiosurfacesuccess.patch deleted file mode 100644 index a43a46d8a69b..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0013-define-kiosurfacesuccess.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm -index a367487e..c3aeca1d 100644 ---- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm -+++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm -@@ -49,6 +49,11 @@ - // but was only added in the 10.14 SDK, so declare it just in case. - extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space); - -+// Introduced in 10.13: http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.13/IOSurface.html -+#if !defined(kIOSurfaceSuccess) -+#define kIOSurfaceSuccess KERN_SUCCESS -+#endif -+ - QT_BEGIN_NAMESPACE - - Q_LOGGING_CATEGORY(lcQpaIOSurface, "qt.qpa.backingstore.iosurface"); diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0014-qtbase-pkg-config.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0014-qtbase-pkg-config.patch deleted file mode 100644 index 90caaea1cf4d..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0014-qtbase-pkg-config.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp ---- a/qmake/generators/makefile.cpp -+++ b/qmake/generators/makefile.cpp -@@ -3390,8 +3390,7 @@ MakefileGenerator::writePkgConfigFile() - << varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ") - // << varGlue("DEFINES","-D"," -D"," ") - ; -- if (!project->values("QMAKE_DEFAULT_INCDIRS").contains(includeDir)) -- t << "-I${includedir}"; -+ t << "-I${includedir}"; - if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle") - && libDir != QLatin1String("/Library/Frameworks")) { - t << " -F${libdir}"; - diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0015-qtbase-tbd-frameworks.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0015-qtbase-tbd-frameworks.patch deleted file mode 100644 index 8a5939978a6b..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0015-qtbase-tbd-frameworks.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 84dbbfebd4..615bfed124 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in -@@ -119,6 +119,10 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) - if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") - set(Qt5Gui_${_cmake_lib_name}_LIBRARY) - endif() -+ set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}.tbd") -+ if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") -+ set(Qt5Gui_${_cmake_lib_name}_LIBRARY) -+ endif() - !!ENDIF - if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY) - # The above find_library call doesn\'t work for finding diff --git a/pkgs/development/libraries/qt-5/5.12/qtdeclarative-default-disable-qmlcache.patch b/pkgs/development/libraries/qt-5/5.12/qtdeclarative-default-disable-qmlcache.patch deleted file mode 100644 index e9c3b7e22842..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtdeclarative-default-disable-qmlcache.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp -index 9e5bc0b0..9219def6 100644 ---- a/src/qml/qml/qqmltypeloader.cpp -+++ b/src/qml/qml/qqmltypeloader.cpp -@@ -2151,7 +2151,7 @@ void QQmlTypeData::unregisterCallback(TypeDataCallback *callback) - - bool QQmlTypeData::tryLoadFromDiskCache() - { -- if (disableDiskCache() && !forceDiskCache()) -+ if (!forceDiskCache()) - return false; - - if (isDebugging()) -@@ -2658,7 +2658,7 @@ void QQmlTypeData::compile(const QQmlRefPointer &typeNameCach - return; - } - -- const bool trySaveToDisk = (!disableDiskCache() || forceDiskCache()) && !m_document->jsModule.debugMode && !typeRecompilation; -+ const bool trySaveToDisk = (forceDiskCache()) && !m_document->jsModule.debugMode && !typeRecompilation; - if (trySaveToDisk) { - QString errorString; - if (m_compiledData->saveToDisk(url(), &errorString)) { -@@ -3014,7 +3014,7 @@ QQmlRefPointer QQmlScriptBlob::scriptData() const - - void QQmlScriptBlob::dataReceived(const SourceCodeData &data) - { -- if (!disableDiskCache() || forceDiskCache()) { -+ if (forceDiskCache()) { - QQmlRefPointer unit = QV4::Compiler::Codegen::createUnitForLoading(); - QString error; - if (unit->loadFromDisk(url(), data.sourceTimeStamp(), &error)) { -@@ -3077,7 +3077,7 @@ void QQmlScriptBlob::dataReceived(const SourceCodeData &data) - qmlGenerator.generate(irUnit); - } - -- if ((!disableDiskCache() || forceDiskCache()) && !isDebugging()) { -+ if ((forceDiskCache()) && !isDebugging()) { - QString errorString; - if (unit->saveToDisk(url(), &errorString)) { - QString error; diff --git a/pkgs/development/libraries/qt-5/5.12/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.12/qtdeclarative.patch deleted file mode 100644 index 8f5b5d4790fb..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtdeclarative.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp -index 005db4248..685c5b1b2 100644 ---- a/src/qml/qml/qqmlimport.cpp -+++ b/src/qml/qml/qqmlimport.cpp -@@ -1760,6 +1760,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); - addImportPath(installImportsPath); - -+ // Add import paths derived from PATH -+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); -+ const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX); -+ for (const QString &path: paths) { -+ if (!path.isEmpty()) { -+ addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir)); -+ } -+ } -+ - // env import paths - if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { - const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH"); -diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf -index 537eaf62e..e21de58f6 100644 ---- a/tools/qmlcachegen/qmlcache.prf -+++ b/tools/qmlcachegen/qmlcache.prf -@@ -26,7 +26,7 @@ defineReplace(qmlCacheOutputFileName) { - } - - qmlcacheinst.base = $$QMLCACHE_DESTDIR --qmlcacheinst.path = $$[QT_INSTALL_QML]/$$TARGETPATH -+qmlcacheinst.path = $$NIX_OUTPUT_QML/$$TARGETPATH - qmlcacheinst.CONFIG = no_check_exist - - qmlcachegen.input = CACHEGEN_FILES diff --git a/pkgs/development/libraries/qt-5/5.12/qtlocation-gcc-9.patch b/pkgs/development/libraries/qt-5/5.12/qtlocation-gcc-9.patch deleted file mode 100644 index 1791313e5603..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtlocation-gcc-9.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp -index d475c38..c1710a6 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp -@@ -5,6 +5,7 @@ - #include - - #include -+#include - - namespace mbgl { - -diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp -index 97bfe91..56d3e17 100644 ---- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp -+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp -@@ -1,3 +1,4 @@ -+#include - #include - - namespace mbgl { diff --git a/pkgs/development/libraries/qt-5/5.12/qtscript.patch b/pkgs/development/libraries/qt-5/5.12/qtscript.patch deleted file mode 100644 index 5508dec1280e..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtscript.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -index 1f6d25e..087c3fb 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -@@ -81,7 +81,7 @@ - #include - #elif PLATFORM(GTK) - #include --typedef struct _GMutex GMutex; -+typedef union _GMutex GMutex; - typedef struct _GCond GCond; - #endif - diff --git a/pkgs/development/libraries/qt-5/5.12/qtserialport.patch b/pkgs/development/libraries/qt-5/5.12/qtserialport.patch deleted file mode 100644 index f25524e80bcf..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtserialport.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h -index af2dab2..8e17f64 100644 ---- a/src/serialport/qtudev_p.h -+++ b/src/serialport/qtudev_p.h -@@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN - inline bool resolveSymbols(QLibrary *udevLibrary) - { - if (!udevLibrary->isLoaded()) { -+#ifdef NIXPKGS_LIBUDEV -+ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1); -+#else - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); -+#endif - if (!udevLibrary->load()) { -+#ifdef NIXPKGS_LIBUDEV -+ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0); -+#else - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); -+#endif - if (!udevLibrary->load()) { - qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); - return false; diff --git a/pkgs/development/libraries/qt-5/5.12/qttools.patch b/pkgs/development/libraries/qt-5/5.12/qttools.patch deleted file mode 100644 index 8ae12198ca25..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qttools.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/macdeployqt/shared/shared.cpp -+++ b/src/macdeployqt/shared/shared.cpp -@@ -1241,6 +1241,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf - if (!QFile(qmlImportScannerPath).exists()) - qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner"; - -+#ifdef NIXPKGS_QMLIMPORTSCANNER -+ // Fallback: Nixpkgs hardcoded path -+ if (!QFile(qmlImportScannerPath).exists()) -+ qmlImportScannerPath = NIXPKGS_QMLIMPORTSCANNER; -+#endif -+ - // Verify that we found a qmlimportscanner binary - if (!QFile(qmlImportScannerPath).exists()) { - LogError() << "qmlimportscanner not found at" << qmlImportScannerPath; diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-fix-failed-static-assertion.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-fix-failed-static-assertion.patch deleted file mode 100644 index 510e25f56a4d..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-fix-failed-static-assertion.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix a following build error: - -In file included from ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:7: -../../3rdparty/chromium/base/bind.h:59:3: error: static_assert failed "Bound argument |i| of type |Arg| cannot be forwarded as |Unwrapped| to the bound functor, which declares it as |Param|." - static_assert( - ^ -../../3rdparty/chromium/base/bind.h:91:7: note: in instantiation of template class 'base::internal::AssertConstructible<1, long, long, const long &, NSError *>' requested here - : AssertConstructible, Unwrapped, Params>... { - ^ -../../3rdparty/chromium/base/bind.h:213:27: note: in instantiation of template class 'base::internal::AssertBindArgsValidity, base::internal::TypeList, long>, base::internal::TypeList, base::internal::TypeList >' requested here - static_assert(internal::AssertBindArgsValidity< - ^ -../../3rdparty/chromium/base/bind.h:242:16: note: in instantiation of function template specialization 'base::BindRepeating, long>' requested here - return base::BindRepeating(std::forward(functor), - ^ -../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:211:15: note: in instantiation of function template specialization 'base::Bind, long>' requested here - base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, - ^ - -Resurrected from https://github.com/NixOS/nixpkgs/blob/ddcf01bca6c7a7a7f096bec836a1e6a707ad473d/pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patch because the same problem is present in 5.12 when compiling on macOS. - ---- a/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm -+++ b/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm -@@ -209,7 +209,7 @@ void BluetoothRemoteGattCharacteristicMac::WriteRemoteCharacteristic( - base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, - base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, -- weak_ptr_factory_.GetWeakPtr(), nil)); -+ weak_ptr_factory_.GetWeakPtr(), nullptr)); - } - } diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch deleted file mode 100644 index cd2343e42ca3..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/configure.pri b/configure.pri -index 897bea540..6f834c202 100644 ---- a/configure.pri -+++ b/configure.pri -@@ -269,7 +269,7 @@ defineReplace(webEngineGetMacOSVersion) { - } - - defineReplace(webEngineGetMacOSSDKVersion) { -- value = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version ProductVersion 2>/dev/null") -+ value = $$system("xcrun --show-sdk-version") - return($$value) - } - -diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf -index 35eb6b89c..7eed640a5 100644 ---- a/mkspecs/features/platform.prf -+++ b/mkspecs/features/platform.prf -@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { - } else:osx { - # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 - !isMinXcodeVersion(8, 3, 3) { -- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") -- return(false) - } - !clang|intel_icc { - skipBuild("Qt WebEngine on macOS requires Clang.") -@@ -54,8 +52,6 @@ defineTest(isPlatformSupported) { - return(false) - } - !isMinOSXSDKVersion(10, 12): { -- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") -- return(false) - } - } else { - skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") -@@ -111,7 +107,7 @@ defineTest(isMinOSXSDKVersion) { - requested_minor = $$2 - requested_patch = $$3 - isEmpty(requested_patch): requested_patch = 0 -- WEBENGINE_OSX_SDK_PRODUCT_VERSION = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version ProductVersion 2>/dev/null") -+ WEBENGINE_OSX_SDK_PRODUCT_VERSION = $$system("xcrun --show-sdk-version") - export(WEBENGINE_OSX_SDK_PRODUCT_VERSION) - isEmpty(WEBENGINE_OSX_SDK_PRODUCT_VERSION) { - skipBuild("Could not resolve SDK product version for \'$$QMAKE_MAC_SDK\'.") -diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri -index 7b77a8bf7..0e1284ee4 100644 ---- a/src/core/config/mac_osx.pri -+++ b/src/core/config/mac_osx.pri -@@ -5,7 +5,7 @@ load(functions) - # otherwise query for it. - QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) - isEmpty(QMAKE_MAC_SDK_VERSION) { -- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") -+ QMAKE_MAC_SDK_VERSION = $$system("xcrun --show-sdk-version") - isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") - } - -@@ -14,11 +14,6 @@ isEmpty(QMAKE_MAC_SDK_VERSION) { - QMAKE_MAC_SDK_VERSION_MAJOR_MINOR = $$section(QMAKE_MAC_SDK_VERSION, ".", 0, 1) - - QMAKE_CLANG_DIR = "/usr" --QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX) --!isEmpty(QMAKE_CLANG_PATH) { -- clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../") -- exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir --} - - QMAKE_CLANG_PATH = "$${QMAKE_CLANG_DIR}/bin/clang++" - message("Using clang++ from $${QMAKE_CLANG_PATH}") diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-no-build-skip.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-no-build-skip.patch deleted file mode 100644 index f332d5e1bb2b..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtwebengine-no-build-skip.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/qtwebengine.pro b/qtwebengine.pro ---- a/qtwebengine.pro -+++ b/qtwebengine.pro -@@ -5,7 +5,7 @@ runConfigure() - - !isEmpty(skipBuildReason) { - SUBDIRS = -- log($${skipBuildReason}$${EOL}) -+ error($${skipBuildReason}$${EOL}) - log(QtWebEngine will not be built.$${EOL}) - } - diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-qos-classes.patch b/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-qos-classes.patch deleted file mode 100644 index a7087f517623..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-qos-classes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake ---- a/Source/cmake/OptionsQt.cmake -+++ b/Source/cmake/OptionsQt.cmake -@@ -683,7 +683,6 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG) - endif () - - if (APPLE) -- SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1) - endif () - - if (ENABLE_MATHML) diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-readline.patch b/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-readline.patch deleted file mode 100644 index 26d189d86019..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-readline.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt ---- a/Source/JavaScriptCore/shell/CMakeLists.txt -+++ b/Source/JavaScriptCore/shell/CMakeLists.txt -@@ -9,7 +9,6 @@ set(JSC_LIBRARIES - ) - - if (WTF_OS_MAC_OS_X) -- list(APPEND JSC_LIBRARIES edit) - endif () - - if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC") -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -563,7 +563,6 @@ - #if PLATFORM(IOS) - - #define HAVE_NETWORK_EXTENSION 1 --#define HAVE_READLINE 1 - #if USE(APPLE_INTERNAL_SDK) - #define USE_CFNETWORK 1 - #endif -@@ -650,7 +649,6 @@ - #define HAVE_MADV_DONTNEED 1 - #define HAVE_MERGESORT 1 - #define HAVE_PTHREAD_SETNAME_NP 1 --#define HAVE_READLINE 1 - #define HAVE_SYS_TIMEB_H 1 - - #if !PLATFORM(GTK) && !PLATFORM(QT) -diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake ---- a/Source/WTF/wtf/PlatformMac.cmake -+++ b/Source/WTF/wtf/PlatformMac.cmake -@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED) - - find_library(COCOA_LIBRARY Cocoa) - find_library(COREFOUNDATION_LIBRARY CoreFoundation) --find_library(READLINE_LIBRARY Readline) - list(APPEND WTF_LIBRARIES - ${COREFOUNDATION_LIBRARY} - ${COCOA_LIBRARY} -- ${READLINE_LIBRARY} - libicucore.dylib - ) - diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebkit-icu68.patch b/pkgs/development/libraries/qt-5/5.12/qtwebkit-icu68.patch deleted file mode 100644 index 73463d7567a3..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtwebkit-icu68.patch +++ /dev/null @@ -1,170 +0,0 @@ -Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 - -In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31: -Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE' - ucnv_setFallback(m_converterICU, TRUE); - ^ -In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40: -In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27: -Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE' - isAccessible = TRUE; - ^ -Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE' - isAccessible = FALSE; - ^ -Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE' - isAccessible = TRUE; - ^ -Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE' - isAccessible = FALSE; - ^ -In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41: -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42: -Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ - ---- a/Source/WebCore/platform/text/TextCodecICU.cpp -+++ b/Source/WebCore/platform/text/TextCodecICU.cpp -@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const - m_converterICU = ucnv_open(m_canonicalConverterName, &err); - ASSERT(U_SUCCESS(err)); - if (m_converterICU) -- ucnv_setFallback(m_converterICU, TRUE); -+ ucnv_setFallback(m_converterICU, true); - } - - int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) ---- a/Source/WebCore/platform/text/icu/UTextProvider.h -+++ b/Source/WebCore/platform/text/icu/UTextProvider.h -@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < std::numeric_limits::max()); - text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { - text->chunkOffset = text->chunkLength; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } else { -@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < std::numeric_limits::max()); - text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex <= 0 && !text->chunkNativeStart) { - text->chunkOffset = 0; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } ---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp -+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp -@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i - if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { - // Already inside the buffer. Set the new offset. - uText->chunkOffset = static_cast(index - uText->chunkNativeStart); -- return TRUE; -+ return true; - } - if (index >= length && uText->chunkNativeLimit == length) { - // Off the end of the buffer, but we can't get it. - uText->chunkOffset = static_cast(index - uText->chunkNativeStart); -- return FALSE; -+ return false; - } - } else { - if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { - // Already inside the buffer. Set the new offset. - uText->chunkOffset = static_cast(index - uText->chunkNativeStart); -- return TRUE; -+ return true; - } - if (!index && !uText->chunkNativeStart) { - // Already at the beginning; can't go any farther. - uText->chunkOffset = 0; -- return FALSE; -+ return false; - } - } - -@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i - - uText->nativeIndexingLimit = uText->chunkLength; - -- return TRUE; -+ return true; - } - - static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) -@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe - static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); - UBool isAccessible; - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text - ASSERT(newContext == UTextProviderContext::PriorContext); - textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) ---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp -+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp -@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng - static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); - UBool isAccessible; - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, - ASSERT(newContext == UTextProviderContext::PriorContext); - textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.12/qtwebkit.patch deleted file mode 100644 index b94a4b76cbab..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtwebkit.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Source/WebKit2/PlatformQt.cmake b/Source/WebKit2/PlatformQt.cmake ---- a/Source/WebKit2/PlatformQt.cmake -+++ b/Source/WebKit2/PlatformQt.cmake -@@ -261,6 +261,7 @@ - list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES - ${GLIB_INCLUDE_DIRS} - ${GSTREAMER_INCLUDE_DIRS} -+ ${GSTREAMER_PBUTILS_INCLUDE_DIRS} - ${Qt5Quick_INCLUDE_DIRS} - ${Qt5Quick_PRIVATE_INCLUDE_DIRS} - ${SQLITE_INCLUDE_DIR} - diff --git a/pkgs/development/libraries/qt-5/5.12/srcs.nix b/pkgs/development/libraries/qt-5/5.12/srcs.nix deleted file mode 100644 index 03f8973766a9..000000000000 --- a/pkgs/development/libraries/qt-5/5.12/srcs.nix +++ /dev/null @@ -1,326 +0,0 @@ -# DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/5.12 -{ fetchurl, mirror }: - -{ - qt3d = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qt3d-everywhere-src-5.12.10.tar.xz"; - sha256 = "1fnhdy0vwh1npq04pw3lzb15rsp0nx8wh57c8lvz9jn945xwc3vd"; - name = "qt3d-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtactiveqt = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtactiveqt-everywhere-src-5.12.10.tar.xz"; - sha256 = "0lf96ziba5g8izwcjzzaf4n2j336j6627rb3dzwvmsdkd9168zax"; - name = "qtactiveqt-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtandroidextras = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtandroidextras-everywhere-src-5.12.10.tar.xz"; - sha256 = "0blapv4jd80wcvzp96zxlrsyca7lwax17y6yij1d14a51353hrnc"; - name = "qtandroidextras-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtbase = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtbase-everywhere-src-5.12.10.tar.xz"; - sha256 = "0h39r3irahdms4gidg5l4a1kr7kagc4bd0y02sapg3njwrsg3240"; - name = "qtbase-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtcanvas3d = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtcanvas3d-everywhere-src-5.12.10.tar.xz"; - sha256 = "0pbxw89m2s19yk2985c49msd7s1mapydka9b7nzg9phs9nrzvf1m"; - name = "qtcanvas3d-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtcharts = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtcharts-everywhere-src-5.12.10.tar.xz"; - sha256 = "0cndm8llvfl9jdzn34b886gxgxwsibb24amhblh96cadhhkpwadc"; - name = "qtcharts-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtconnectivity = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtconnectivity-everywhere-src-5.12.10.tar.xz"; - sha256 = "19l816zfpx87vwzj18mbib5x3mb9hy1msacpy8i9bagfw9p0i6c0"; - name = "qtconnectivity-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtdatavis3d = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtdatavis3d-everywhere-src-5.12.10.tar.xz"; - sha256 = "1ximhph17kkh40v2ksk51lq21mbjs2ajyf5l32ckhc7n7bmaryb6"; - name = "qtdatavis3d-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtdeclarative = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtdeclarative-everywhere-src-5.12.10.tar.xz"; - sha256 = "05la1zlijcaargfh4ljnmxvvksdwzl409wl7w3m96kwm8s370mmf"; - name = "qtdeclarative-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtdoc = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtdoc-everywhere-src-5.12.10.tar.xz"; - sha256 = "0ljc29hnn8knncvq8hsk0rdcwrxbsk1ywlprknkvyb4pggp9rkp6"; - name = "qtdoc-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtgamepad = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtgamepad-everywhere-src-5.12.10.tar.xz"; - sha256 = "1bs50wghy3n8af656angkkkaac0swkq3mfllg3dkjg236ngzdhdh"; - name = "qtgamepad-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtgraphicaleffects = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtgraphicaleffects-everywhere-src-5.12.10.tar.xz"; - sha256 = "0hnsb757ircqmid34d0cxbh0mi4qnil22k5ka9a1b8xy00ydkfky"; - name = "qtgraphicaleffects-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtimageformats = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtimageformats-everywhere-src-5.12.10.tar.xz"; - sha256 = "1bh38xp4v914ksg91p9pij1gsdzs3y7sn7diy3d7wn5i039syn0i"; - name = "qtimageformats-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtlocation = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtlocation-everywhere-src-5.12.10.tar.xz"; - sha256 = "1czg0z69ilnxp1sqk0jawlnyp2gx87yb57g8dwjznqxxvaq744dc"; - name = "qtlocation-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtmacextras = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtmacextras-everywhere-src-5.12.10.tar.xz"; - sha256 = "0mh9p3f1f22pj4i8yxnn56amy53dapmcikza04ll4fvx5hy340v8"; - name = "qtmacextras-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtmultimedia = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtmultimedia-everywhere-src-5.12.10.tar.xz"; - sha256 = "0g50jzhwbrl5r0lmfz5ffpkp54mf0zfc8m884x51yn2bnngg366c"; - name = "qtmultimedia-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtnetworkauth = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtnetworkauth-everywhere-src-5.12.10.tar.xz"; - sha256 = "12n3xqlskrk2mbcgz5p613sx219j6rmpq8yn7p97xdv7li61gzl2"; - name = "qtnetworkauth-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtpurchasing = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtpurchasing-everywhere-src-5.12.10.tar.xz"; - sha256 = "1azdg03vxyk140i9z93x0zzlazbmd3qrqxgwk747jsd1ibns9ddy"; - name = "qtpurchasing-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtquickcontrols = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtquickcontrols-everywhere-src-5.12.10.tar.xz"; - sha256 = "1cy9vjl9zf95frnydzljqwbx3is8p8w27kdgszvmb67p6xkpblk7"; - name = "qtquickcontrols-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtquickcontrols2 = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtquickcontrols2-everywhere-src-5.12.10.tar.xz"; - sha256 = "0541n8n012d0xwxrfznv1jwh28d35mdx6cl8jadsaxaspgwz4vb3"; - name = "qtquickcontrols2-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtremoteobjects = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtremoteobjects-everywhere-src-5.12.10.tar.xz"; - sha256 = "147p0xdi22xz2d3501ig78bs97gbyz8ccyhn6dhbw2yalx33gma6"; - name = "qtremoteobjects-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtscript = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtscript-everywhere-src-5.12.10.tar.xz"; - sha256 = "1cfcfwq4shr6yphgwq2jnvgzjjqjrz10qnzr7dccksmfg3i0ad02"; - name = "qtscript-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtscxml = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtscxml-everywhere-src-5.12.10.tar.xz"; - sha256 = "057zchhm1s5ly2a685y4105pgmzgqp1jkkf9w0ca8xd05z4clb4r"; - name = "qtscxml-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtsensors = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtsensors-everywhere-src-5.12.10.tar.xz"; - sha256 = "10f00njvc7kwjci0g4g3pibl9ra798iplvj2ymql3zppxqqdq25m"; - name = "qtsensors-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtserialbus = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtserialbus-everywhere-src-5.12.10.tar.xz"; - sha256 = "0zd0crs2nrsvncj070fl05g0nm3j5bf16g54c7m9603b6q7bryrx"; - name = "qtserialbus-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtserialport = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtserialport-everywhere-src-5.12.10.tar.xz"; - sha256 = "0anndf6pyssiygj0kk2j80vwil2z0765gccs87djhsni1xvk3n9r"; - name = "qtserialport-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtspeech = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtspeech-everywhere-src-5.12.10.tar.xz"; - sha256 = "11fycm604r1xswb9dg1g568jxd68zd9m2dzfy4qda6sr4mdaj6jg"; - name = "qtspeech-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtsvg = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtsvg-everywhere-src-5.12.10.tar.xz"; - sha256 = "0jrkz8y225g93pznsvc1icanxxc5cfm23ic2y6rprqaqw77z9zxm"; - name = "qtsvg-everywhere-src-5.12.10.tar.xz"; - }; - }; - qttools = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qttools-everywhere-src-5.12.10.tar.xz"; - sha256 = "0v339a1w3kqvfl8hcds032g8zafp8d4c1b2rzihpq6y4mbksdkxh"; - name = "qttools-everywhere-src-5.12.10.tar.xz"; - }; - }; - qttranslations = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qttranslations-everywhere-src-5.12.10.tar.xz"; - sha256 = "1pjkkkkjvs9harz70sir67yf3i528vyn1shmi09hlzlb23nmipp1"; - name = "qttranslations-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtvirtualkeyboard = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtvirtualkeyboard-everywhere-src-5.12.10.tar.xz"; - sha256 = "0afw3lj5cg3zj0hzxlhz5l7s1j2y491yxwylc4vchbqjpyvsadgg"; - name = "qtvirtualkeyboard-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtwayland = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwayland-everywhere-src-5.12.10.tar.xz"; - sha256 = "1bs61xmc4l03w21wkrxx0llfg5bbnq5ij7w0bnfkx3rk0vncy0q6"; - name = "qtwayland-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtwebchannel = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebchannel-everywhere-src-5.12.10.tar.xz"; - sha256 = "1jmprqgavqwknnnl6qp0psxz7bc69ivxhm7y4qci95vpx9k5yjg8"; - name = "qtwebchannel-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtwebengine = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebengine-everywhere-src-5.12.10.tar.xz"; - sha256 = "16zbyfc7qy9f20anfrdi25f6nf1j7zw8kps60mqb18nfjw411d50"; - name = "qtwebengine-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtwebglplugin = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebglplugin-everywhere-src-5.12.10.tar.xz"; - sha256 = "0nhim67rl9dbshnarismnd54qzks8v14a08h8qi7x0dm9bj9ij7q"; - name = "qtwebglplugin-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtwebsockets = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebsockets-everywhere-src-5.12.10.tar.xz"; - sha256 = "0p74ds53d3a30i7pq85b9ql9i4z1p0yyanhmaizw2bv9225py4jr"; - name = "qtwebsockets-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtwebview = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebview-everywhere-src-5.12.10.tar.xz"; - sha256 = "07pz7wfhyijfdlxnaqpn4hwgvpglma6dfmkcb8xw6hfhg30riaxd"; - name = "qtwebview-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtwinextras = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwinextras-everywhere-src-5.12.10.tar.xz"; - sha256 = "1x5k0z0p94zppqsw2fz8ki9v5abf0crzva16wllznn89ylqjyn0j"; - name = "qtwinextras-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtx11extras = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtx11extras-everywhere-src-5.12.10.tar.xz"; - sha256 = "0xk10iynkfs31vgpadrmw30k4s1hlnggxy2f3q988qyqd37dh5h8"; - name = "qtx11extras-everywhere-src-5.12.10.tar.xz"; - }; - }; - qtxmlpatterns = { - version = "5.12.10"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtxmlpatterns-everywhere-src-5.12.10.tar.xz"; - sha256 = "1qg09yxagz36sry03kv3swwfjc8lrik1asjk2lxlpzzcl2q95lbv"; - name = "qtxmlpatterns-everywhere-src-5.12.10.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix deleted file mode 100644 index 808562772f9e..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ /dev/null @@ -1,248 +0,0 @@ -/* - -# Updates - -Before a major version update, make a copy of this directory. (We like to -keep the old version around for a short time after major updates.) Add a -top-level attribute to `top-level/all-packages.nix`. - -1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. -2. From the top of the Nixpkgs tree, run - `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION`. -3. Check that the new packages build correctly. -4. Commit the changes and open a pull request. - -*/ - -{ newScope -, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper -, bison, cups ? null, harfbuzz, libGL, perl -, gstreamer, gst-plugins-base, gtk3, dconf -, darwin -, buildPackages - - # options -, developerBuild ? false -, decryptSslTraffic ? false -, debug ? false -}: - -let - - qtCompatVersion = srcs.qtbase.version; - - mirror = "https://download.qt.io"; - srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // { - # qtwebkit does not have an official release tarball on the qt mirror and is - # mostly maintained by the community. - qtwebkit = rec { - src = fetchFromGitHub { - owner = "qt"; - repo = "qtwebkit"; - rev = "v${version}"; - sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg"; - }; - version = "5.212.0-alpha4"; - }; - }; - - patches = { - qtbase = lib.optionals stdenv.isDarwin [ - ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch - - # Downgrade minimal required SDK to 10.12 - ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch - ./qtbase.patch.d/qtbase-sdk-10.12-mac.patch - - # Patch framework detection to support X.framework/X.tbd, - # extending the current support for X.framework/X. - ./qtbase.patch.d/0012-qtbase-tbd-frameworks.patch - ] ++ [ - ./qtbase.patch.d/0003-qtbase-mkspecs.patch - ./qtbase.patch.d/0004-qtbase-replace-libdir.patch - ./qtbase.patch.d/0005-qtbase-cmake.patch - ./qtbase.patch.d/0006-qtbase-gtk3.patch - ./qtbase.patch.d/0007-qtbase-xcursor.patch - ./qtbase.patch.d/0008-qtbase-tzdir.patch - ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch - ./qtbase.patch.d/0010-qtbase-assert.patch - ./qtbase.patch.d/0011-fix-header_module.patch - ]; - qtdeclarative = [ - ./qtdeclarative.patch - # prevent headaches from stale qmlcache data - ./qtdeclarative-default-disable-qmlcache.patch - ]; - qtlocation = [ ./qtlocation-gcc-9.patch ]; - qtscript = [ ./qtscript.patch ]; - qtserialport = [ ./qtserialport.patch ]; - qtwebengine = [ - # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599 - (fetchpatch { - name = "qtwebengine-bison-3.7-build.patch"; - url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599"; - sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy"; - stripLen = 1; - extraPrefix = "src/3rdparty/"; - }) - # Fix build with GCC 10 (part 1): https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=fad3e27b - (fetchpatch { - name = "qtwebengine-gcc10-part1.patch"; - url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=fad3e27bfb50d1e23a07577f087a826b5e00bb1d"; - sha256 = "0c55j9zww8jyif6wl7jy1qqidgw9fdhiyfjgzhzi85r716m4pwwd"; - stripLen = 1; - extraPrefix = "src/3rdparty/"; - }) - # Fix build with GCC 10 (part 2): https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=193c5bed - (fetchpatch { - name = "qtwebengine-gcc10-part2.patch"; - url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=193c5bed1cff123e21b7e6d12f464d6709ace2e3"; - sha256 = "1jb6s32ara6l4rbn4h3gg95mzv8sd8dl1zpjaqwywf1w7p8ymk86"; - stripLen = 1; - extraPrefix = "src/3rdparty/"; - }) - - # glibc 2.34 compat - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/4cef673b2dd01ce85ce7a841cf352104bbe79668/f/qtwebengine-everywhere-5.15.2-SIGSTKSZ.patch"; - sha256 = "sha256-2D0/FL4PBL4p6ccd6JoDAGqNtLs2aeE1OdM+PJItock="; - }) - ] ++ lib.optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; - qtwebkit = [ - (fetchpatch { - name = "qtwebkit-bison-3.7-build.patch"; - url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; - sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; - }) - (fetchpatch { - name = "qtwebkit-glib-2.68.patch"; - 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 [ - ./qtwebkit-darwin-no-readline.patch - ./qtwebkit-darwin-no-qos-classes.patch - ]; - qttools = [ ./qttools.patch ]; - }; - - addPackages = self: with self; - let - qtModule = - import ../qtModule.nix - { - inherit perl; - inherit lib; - # Use a variant of mkDerivation that does not include wrapQtApplications - # to avoid cyclic dependencies between Qt modules. - mkDerivation = - import ../mkDerivation.nix - { inherit lib; inherit debug; wrapQtAppsHook = null; } - stdenv.mkDerivation; - } - { inherit self srcs patches; }; - - callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; - in { - - inherit callPackage qtCompatVersion qtModule srcs; - - mkDerivationWith = - import ../mkDerivation.nix - { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; - - mkDerivation = mkDerivationWith stdenv.mkDerivation; - - qtbase = callPackage ../modules/qtbase.nix { - inherit (srcs.qtbase) src version; - patches = patches.qtbase; - inherit bison cups harfbuzz libGL; - withGtk3 = !stdenv.isDarwin; inherit dconf gtk3; - inherit debug developerBuild decryptSslTraffic; - inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth - CoreLocation CoreServices DiskArbitration Foundation OpenGL MetalKit IOKit; - inherit (darwin) libobjc; - }; - - qt3d = callPackage ../modules/qt3d.nix {}; - qtcharts = callPackage ../modules/qtcharts.nix {}; - qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; - qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; - qtdoc = callPackage ../modules/qtdoc.nix {}; - qtgamepad = callPackage ../modules/qtgamepad.nix { - inherit (darwin.apple_sdk.frameworks) GameController; - }; - qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; - qtimageformats = callPackage ../modules/qtimageformats.nix {}; - qtlocation = callPackage ../modules/qtlocation.nix {}; - qtlottie = callPackage ../modules/qtlottie.nix {}; - qtmacextras = callPackage ../modules/qtmacextras.nix {}; - qtmultimedia = callPackage ../modules/qtmultimedia.nix { - inherit gstreamer gst-plugins-base; - }; - qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; - qtquick1 = null; - qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; - qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; - qtscript = callPackage ../modules/qtscript.nix {}; - qtsensors = callPackage ../modules/qtsensors.nix {}; - qtserialbus = callPackage ../modules/qtserialbus.nix {}; - qtserialport = callPackage ../modules/qtserialport.nix {}; - qtspeech = callPackage ../modules/qtspeech.nix {}; - qtsvg = callPackage ../modules/qtsvg.nix {}; - qtscxml = callPackage ../modules/qtscxml.nix {}; - qttools = callPackage ../modules/qttools.nix {}; - qttranslations = callPackage ../modules/qttranslations.nix {}; - qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; - qtwayland = callPackage ../modules/qtwayland.nix {}; - qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; - qtwebengine = callPackage ../modules/qtwebengine.nix { - inherit (darwin) cctools libobjc libunwind xnu; - inherit (darwin.apple_sdk.libs) sandbox; - inherit (darwin.apple_sdk.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit - ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication; - }; - qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; - qtwebkit = callPackage ../modules/qtwebkit.nix { - inherit (darwin) ICU; - inherit (darwin.apple_sdk.frameworks) OpenGL; - }; - qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; - qtwebview = callPackage ../modules/qtwebview.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation WebKit; - }; - qtx11extras = callPackage ../modules/qtx11extras.nix {}; - qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; - - env = callPackage ../qt-env.nix {}; - full = env "qt-full-${qtbase.version}" ([ - qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects - qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 - qtscript qtsensors qtserialport qtsvg qttools qttranslations - qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets - qtwebview qtx11extras qtxmlpatterns qtlottie - ] ++ lib.optional (!stdenv.isDarwin) qtwayland - ++ lib.optional (stdenv.isDarwin) qtmacextras); - - qmake = makeSetupHook { - deps = [ self.qtbase.dev ]; - substitutions = { - inherit debug; - fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; - }; - } ../hooks/qmake-hook.sh; - - wrapQtAppsHook = makeSetupHook { - deps = [ self.qtbase.dev buildPackages.makeWrapper ] - ++ lib.optional stdenv.isLinux self.qtwayland.dev; - } ../hooks/wrap-qt-apps-hook.sh; - }; - -in lib.makeScope newScope addPackages diff --git a/pkgs/development/libraries/qt-5/5.14/fetch.sh b/pkgs/development/libraries/qt-5/5.14/fetch.sh deleted file mode 100644 index ca0073afbbb4..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/fetch.sh +++ /dev/null @@ -1,2 +0,0 @@ -WGET_ARGS=( https://download.qt.io/archive/qt/5.14/5.14.2/submodules/ \ - -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch deleted file mode 100644 index dbd6b3663443..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch +++ /dev/null @@ -1,490 +0,0 @@ -From 87c81a31d65862a2f32fdc575cfb47b7a46bfae7 Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Mon, 12 Apr 2021 20:05:25 +0200 -Subject: [PATCH 03/10] qtbase-mkspecs - ---- - mkspecs/features/create_cmake.prf | 51 +++--------- - .../data/cmake/Qt5BasicConfig.cmake.in | 80 +------------------ - mkspecs/features/qml_module.prf | 2 +- - mkspecs/features/qml_plugin.prf | 2 +- - mkspecs/features/qt_app.prf | 2 +- - mkspecs/features/qt_build_paths.prf | 4 +- - mkspecs/features/qt_docs.prf | 10 +-- - mkspecs/features/qt_example_installs.prf | 2 +- - mkspecs/features/qt_functions.prf | 27 ++++--- - mkspecs/features/qt_installs.prf | 22 ++--- - mkspecs/features/qt_plugin.prf | 2 +- - 11 files changed, 52 insertions(+), 152 deletions(-) - -diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 0e71fd0015..ba071d9a70 100644 ---- a/mkspecs/features/create_cmake.prf -+++ b/mkspecs/features/create_cmake.prf -@@ -21,7 +21,7 @@ load(cmake_functions) - # at cmake time whether package has been found via a symlink, and correct - # that to an absolute path. This is only done for installations to - # the /usr or / prefix. --CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS]) -+CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$NIX_OUTPUT_OUT/lib/) - contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR - - CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake -@@ -77,45 +77,20 @@ split_incpath { - $$cmake_extra_source_includes.output - } - --CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { -- CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/ -- CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True --} -+CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/ -+CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True - --CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_LIB_DIR,"^\\.\\./.*") { -- CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ -- CMAKE_LIB_DIR_IS_ABSOLUTE = True --} else { -- CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS]) -- # We need to go up another two levels because the CMake files are -- # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} -- CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" --} -+CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/ -+CMAKE_BIN_DIR_IS_ABSOLUTE = True - --CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_BIN_DIR, "^\\.\\./.*") { -- CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ -- CMAKE_BIN_DIR_IS_ABSOLUTE = True --} -+CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ -+CMAKE_LIB_DIR_IS_ABSOLUTE = True - --CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") { -- CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/ -- CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True --} -+CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/ -+CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True - --win32:!static:!staticlib { -- CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX]) -- contains(CMAKE_DLL_DIR, "^\\.\\./.*") { -- CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ -- CMAKE_DLL_DIR_IS_ABSOLUTE = True -- } --} else { -- CMAKE_DLL_DIR = $$CMAKE_LIB_DIR -- CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE --} -+CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/ -+CMAKE_DLL_DIR_IS_ABSOLUTE = True - - static|staticlib:CMAKE_STATIC_TYPE = true - -@@ -258,7 +233,7 @@ contains(CONFIG, plugin) { - - cmake_qt5_plugin_file.files = $$cmake_target_file.output - static|staticlib: cmake_qt5_plugin_file.files += $$cmake_qt5_plugin_import_file.output -- cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} -+ cmake_qt5_plugin_file.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} - INSTALLS += cmake_qt5_plugin_file - - return() -@@ -396,7 +371,7 @@ exists($$cmake_macros_file.input) { - cmake_qt5_module_files.files += $$cmake_macros_file.output - } - --cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} -+cmake_qt5_module_files.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} - - # We are generating cmake files. Most developers of Qt are not aware of cmake, - # so we require automatic tests to be available. The only module which should -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 1099a761ce..87679b7e68 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) - message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") - endif() - --!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) --!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) --set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") --!!ELSE --get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) --# Use original install prefix when loaded through a --# cross-prefix symbolic link such as /lib -> /usr/lib. --get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) --get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) --if(_realCurr STREQUAL _realOrig) -- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) --else() -- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) --endif() --unset(_realOrig) --unset(_realCurr) --unset(_IMPORT_PREFIX) --!!ENDIF --!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) --get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) --!!ELSE --set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") --!!ENDIF -- - !!IF !equals(TEMPLATE, aux) - # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. - set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") -@@ -146,11 +122,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI - IsDebugAndRelease) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - --!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") --!!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") --!!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) - set(_deps - ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} -@@ -210,11 +182,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI - !!ENDIF - - !!IF !isEmpty(CMAKE_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") --!!ELSE - set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") --!!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) - if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -@@ -230,24 +198,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - !!IF !no_module_headers - !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) - set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" -+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" -+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" - ) - !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" -- ) --!!ELSE -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") --!!ENDIF --!!ELSE --!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) -- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") --!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" -+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, .,0, 0)/Headers/$$VERSION/\" -+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, .,0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" - ) - !!ELSE - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -263,7 +220,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") - !!ENDIF - !!ENDIF --!!ENDIF - !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) - include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) - !!ENDIF -@@ -465,25 +421,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) - !!IF isEmpty(CMAKE_DEBUG_TYPE) - !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) - !!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS --!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" --!!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" --!!ENDIF - AND EXISTS --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) - !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() -@@ -502,25 +446,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) - !!IF isEmpty(CMAKE_RELEASE_TYPE) - !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) - !!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS --!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" --!!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" --!!ENDIF - AND EXISTS --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) - !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() -@@ -542,11 +474,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - IsDebugAndRelease) - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - --!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") --!!ELSE - set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") --!!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) - set_target_properties(Qt5::${Plugin} PROPERTIES - \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf -index c0b50416c9..cabe39b22e 100644 ---- a/mkspecs/features/qml_module.prf -+++ b/mkspecs/features/qml_module.prf -@@ -51,7 +51,7 @@ builtin_resources { - # Install rules - qmldir.base = $$qmldir_path - qmldir.files = $$qmldir_file --qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH -+qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH - - qmlfiles.base = $$_PRO_FILE_PWD_ - qmlfiles.files = $$fq_aux_qml_files -diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf -index f1c5658b04..029595e721 100644 ---- a/mkspecs/features/qml_plugin.prf -+++ b/mkspecs/features/qml_plugin.prf -@@ -50,7 +50,7 @@ load(qt_build_paths) - - DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH - --target.path = $$[QT_INSTALL_QML]/$$TARGETPATH -+target.path = $$NIX_OUTPUT_QML/$$TARGETPATH - INSTALLS += target - - # Some final setup -diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index 8354f30eea..62028fef8e 100644 ---- a/mkspecs/features/qt_app.prf -+++ b/mkspecs/features/qt_app.prf -@@ -30,7 +30,7 @@ host_build:force_bootstrap { - target.path = $$[QT_HOST_BINS] - } else { - !build_pass:qtConfig(debug_and_release): CONFIG += release -- target.path = $$[QT_INSTALL_BINS] -+ target.path = $$NIX_OUTPUT_BIN/bin - CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable - } - INSTALLS += target -diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf -index 3bb3823a8e..655b7b7db8 100644 ---- a/mkspecs/features/qt_build_paths.prf -+++ b/mkspecs/features/qt_build_paths.prf -@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \ - !force_independent { - # If the module is not built independently, everything ends up in qtbase. - # This is the case in non-prefix builds, except for selected modules. -- MODULE_BASE_OUTDIR = $$[QT_HOST_PREFIX] -- MODULE_QMAKE_OUTDIR = $$[QT_HOST_PREFIX] -+ MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT -+ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT - } -diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf -index 095bf15dac..4cc977bea5 100644 ---- a/mkspecs/features/qt_docs.prf -+++ b/mkspecs/features/qt_docs.prf -@@ -65,7 +65,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR - - QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) - !build_online_docs: \ -- QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS]) -+ QDOC += -installdir $$shell_quote($$NIX_OUTPUT_DOC) - PREP_DOC_INDEXES = - DOC_INDEXES = - !isEmpty(QTREPOS) { -@@ -84,8 +84,8 @@ DOC_INDEXES = - DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) - } else { - prepare_docs: \ -- PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) -- DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) -+ PREP_DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) -+ DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) - } - - qtattributionsscanner.target = qtattributionsscanner -@@ -108,12 +108,12 @@ prepare_docs { - qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) - - inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR -- inst_html_docs.path = $$[QT_INSTALL_DOCS] -+ inst_html_docs.path = $$NIX_OUTPUT_DOC - inst_html_docs.CONFIG += no_check_exist directory no_default_install no_build - INSTALLS += inst_html_docs - - inst_qch_docs.files = $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch -- inst_qch_docs.path = $$[QT_INSTALL_DOCS] -+ inst_qch_docs.path = $$NIX_OUTPUT_DOC - inst_qch_docs.CONFIG += no_check_exist no_default_install no_build - INSTALLS += inst_qch_docs - -diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 72b47bce27..d59e949e78 100644 ---- a/mkspecs/features/qt_example_installs.prf -+++ b/mkspecs/features/qt_example_installs.prf -@@ -90,7 +90,7 @@ sourcefiles += \ - $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ - $$DBUS_ADAPTORS $$DBUS_INTERFACES - addInstallFiles(sources.files, $$sourcefiles) --sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase -+sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase - INSTALLS += sources - - check_examples { -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 7777e615bd..b0c6880a74 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -87,19 +87,22 @@ defineTest(qtHaveModule) { - defineTest(qtPrepareTool) { - cmd = $$eval(QT_TOOL.$${2}.binary) - isEmpty(cmd) { -- cmd = $$[QT_HOST_BINS]/$$2 -- exists($${cmd}.pl) { -- $${1}_EXE = $${cmd}.pl -- cmd = perl -w $$system_path($${cmd}.pl) -- } else: contains(QMAKE_HOST.os, Windows) { -- $${1}_EXE = $${cmd}.exe -- cmd = $$system_path($${cmd}.exe) -- } else:contains(QMAKE_HOST.os, Darwin) { -- BUNDLENAME = $${cmd}.app/Contents/MacOS/$$2 -- exists($$BUNDLENAME) { -- cmd = $$BUNDLENAME -+ cmd = $$system("command -v $${2}") -+ isEmpty(cmd) { -+ cmd = $$system("command -v $${2}.pl") -+ !isEmpty(cmd) { -+ $${1}_EXE = $$cmd -+ cmd = perl -w $$system_path($${cmd}) -+ } else: contains(QMAKE_HOST.os, Windows) { -+ cmd = $$system("command -v $${2}.exe") -+ $${1}_EXE = $$cmd -+ } else: contains(QMAKE_HOST.os, Darwin) { -+ cmd = $$system("command -v $${2}.app") -+ !isEmpty(cmd) { -+ cmd = $${cmd}/Contents/MacOS/$${2} -+ $${1}_EXE = $$cmd -+ } - } -- $${1}_EXE = $$cmd - } else { - $${1}_EXE = $$cmd - } -diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf -index 1ebca17366..a8f958eae8 100644 ---- a/mkspecs/features/qt_installs.prf -+++ b/mkspecs/features/qt_installs.prf -@@ -12,16 +12,10 @@ - #library - !qt_no_install_library { - win32 { -- host_build: \ -- dlltarget.path = $$[QT_HOST_BINS] -- else: \ -- dlltarget.path = $$[QT_INSTALL_BINS] -+ dlltarget.path = $$NIX_OUTPUT_BIN/bin - INSTALLS += dlltarget - } -- host_build: \ -- target.path = $$[QT_HOST_LIBS] -- else: \ -- target.path = $$[QT_INSTALL_LIBS] -+ target.path = $$NIX_OUTPUT_OUT/lib - !static: target.CONFIG = no_dll - INSTALLS += target - } -@@ -29,35 +23,35 @@ - #headers - qt_install_headers { - gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES -- gen_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME -+ gen_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME - INSTALLS += gen_headers - - targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES -- targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME -+ targ_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME - INSTALLS += targ_headers - - private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES -- private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private -+ private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private - generated_privates: \ - private_headers.CONFIG += no_check_exist - INSTALLS += private_headers - - qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES -- qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa -+ qpa_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa - INSTALLS += qpa_headers - } - - #module - qt_install_module { - !isEmpty(MODULE_PRI) { -- pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules -+ pritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules - pritarget.files = $$MODULE_PRI - INSTALLS += pritarget - } else: isEmpty(MODULE_PRIVATE_PRI) { - warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.") - } - !isEmpty(MODULE_PRIVATE_PRI) { -- privpritarget.path = $$[QT_HOST_DATA]/mkspecs/modules -+ privpritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules - privpritarget.files = $$MODULE_PRIVATE_PRI - INSTALLS += privpritarget - } -diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf -index 573d717eea..024c624cb6 100644 ---- a/mkspecs/features/qt_plugin.prf -+++ b/mkspecs/features/qt_plugin.prf -@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { - } - } - --target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE -+target.path = $$NIX_OUTPUT_PLUGIN/$$PLUGIN_TYPE - INSTALLS += target - - qt_libinfix_plugins: TARGET = $$TARGET$$QT_LIBINFIX --- -2.29.3 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch deleted file mode 100644 index 86ea2e75d9be..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 1cae0c31c9849615190ee175ebf929b3aca13fe0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Milan=20P=C3=A4ssler?= -Date: Sat, 4 Apr 2020 00:27:41 +0200 -Subject: [PATCH 04/10] qtbase-replace-libdir - ---- - mkspecs/features/qt_common.prf | 20 ++------------------ - mkspecs/features/qt_module.prf | 5 +---- - 2 files changed, 3 insertions(+), 22 deletions(-) - -diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index c24f2c6062..0d72ce7286 100644 ---- a/mkspecs/features/qt_common.prf -+++ b/mkspecs/features/qt_common.prf -@@ -31,32 +31,16 @@ contains(TEMPLATE, .*lib) { - rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* - else: \ - rplbase = $$MODULE_BASE_OUTDIR -- host_build { -- qqt_libdir = \$\$\$\$[QT_HOST_LIBS] -- qt_libdir = $$[QT_HOST_LIBS] -- } else { -- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] -- qt_libdir = $$[QT_INSTALL_LIBS] -- } -+ qt_libdir = $$NIX_OUTPUT_OUT/lib - contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { -- lib_replace0.match = $$rplbase/lib/ -- lib_replace0.replace = $$qqt_libdir/ -- lib_replace0.CONFIG = path -- QMAKE_PRL_INSTALL_REPLACE += lib_replace0 - lib_replace.match = "[^ ']*$$rplbase/lib" - lib_replace.replace = - } else { - lib_replace.match = $$rplbase/lib -- lib_replace.replace = $$qqt_libdir -+ lib_replace.replace = $$qt_libdir - } - lib_replace.CONFIG = path - QMAKE_PRL_INSTALL_REPLACE += lib_replace -- !equals(qt_libdir, $$rplbase/lib) { -- qtlibdir_replace.match = $$qt_libdir -- qtlibdir_replace.replace = $$qqt_libdir -- qtlibdir_replace.CONFIG = path -- QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace -- } - } - - # The remainder of this file must not apply to host tools/libraries, -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 828a9621b9..b9e5d35026 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -305,10 +305,7 @@ load(qt_targets) - } - !lib_bundle:unix { - CONFIG += create_libtool -- host_build: \ -- QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS] -- else: \ -- QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]" -+ QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib - !isEmpty(lib_replace0.match) { - ltlib_replace0.match = $$lib_replace0.match - ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/ --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch deleted file mode 100644 index 85a729563417..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch +++ /dev/null @@ -1,194 +0,0 @@ -From 7e93d1330e1f8c8cd68334201ad100b8c05c9ab5 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:34:28 -0500 -Subject: [PATCH 05/10] qtbase-cmake - ---- - mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +- - mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in | 4 ++-- - src/corelib/Qt5CoreConfigExtras.cmake.in | 10 +++++----- - src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in | 2 +- - .../Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in | 2 +- - src/dbus/Qt5DBusConfigExtras.cmake.in | 12 ++---------- - src/gui/Qt5GuiConfigExtras.cmake.in | 6 +++--- - src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- - 8 files changed, 16 insertions(+), 24 deletions(-) - -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 87679b7e68..57060e6470 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -474,7 +474,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - IsDebugAndRelease) - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - -- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") -+ set(imported_location \"${PLUGIN_LOCATION}\") - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) - set_target_properties(Qt5::${Plugin} PROPERTIES - \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -index 7b70cfed09..e700cfa539 100644 ---- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -@@ -53,10 +53,10 @@ set_property(TARGET Qt5::$$CMAKE_PLUGIN_NAME PROPERTY INTERFACE_SOURCES - !!ENDIF - - !!IF !isEmpty(CMAKE_RELEASE_TYPE) --_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) -+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) - !!ENDIF - !!IF !isEmpty(CMAKE_DEBUG_TYPE) --_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) -+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) - !!ENDIF - - list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) -diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 9b672327ef..319ba94d6d 100644 ---- a/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) - add_executable(Qt5::qmake IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) - add_executable(Qt5::moc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) - add_executable(Qt5::rcc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -118,7 +118,7 @@ if (NOT TARGET Qt5::WinMain) - !!IF !isEmpty(CMAKE_RELEASE_TYPE) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ENDIF -@@ -132,7 +132,7 @@ if (NOT TARGET Qt5::WinMain) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -index c357237d0e..6f0c75de3c 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -index 706304cf34..546420f6ad 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d947159e2..b36865fc48 100644 ---- a/src/dbus/Qt5DBusConfigExtras.cmake.in -+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in -@@ -2,11 +2,7 @@ - if (NOT TARGET Qt5::qdbuscpp2xml) - add_executable(Qt5::qdbuscpp2xml IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") - _qt5_DBus_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qdbuscpp2xml PROPERTIES -@@ -17,11 +13,7 @@ endif() - if (NOT TARGET Qt5::qdbusxml2cpp) - add_executable(Qt5::qdbusxml2cpp IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") - _qt5_DBus_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qdbusxml2cpp PROPERTIES -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 84dbbfebd4..8ad0720c5c 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in -@@ -2,7 +2,7 @@ - !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) - - !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) --set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") -+set(Qt5Gui_EGL_INCLUDE_DIRS \"$$NIX_OUTPUT_DEV/$$CMAKE_INCLUDE_DIR/QtANGLE\") - !!ELSE - set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") - !!ENDIF -@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO - set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ set(imported_location \"$$NIX_OUTPUT_OUT/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ENDIF - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ELSE - set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ENDIF -diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index 99d87e2e46..a4eab2aa72 100644 ---- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in -+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) - add_executable(Qt5::uic IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ENDIF --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch deleted file mode 100644 index 6ce0e5d0c433..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 1ad04525cdd342e3c8a750323fb3a61b93fee753 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:35:33 -0500 -Subject: [PATCH 06/10] qtbase-gtk3 - ---- - src/plugins/platformthemes/gtk3/main.cpp | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp -index fb1c425d8e..bb8bab9795 100644 ---- a/src/plugins/platformthemes/gtk3/main.cpp -+++ b/src/plugins/platformthemes/gtk3/main.cpp -@@ -39,6 +39,7 @@ - - #include - #include "qgtk3theme.h" -+#include - - QT_BEGIN_NAMESPACE - -@@ -54,8 +55,22 @@ public: - QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) - { - Q_UNUSED(params); -- if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) -+ if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) { -+ -+#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS -+ QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':'); -+ XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS); -+ qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':'))); -+#endif -+ -+#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES -+ QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':'); -+ GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES); -+ qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':'))); -+#endif -+ - return new QGtk3Theme; -+ } - - return 0; - } --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch deleted file mode 100644 index 6a92a9528303..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch +++ /dev/null @@ -1,29 +0,0 @@ -From cc953cc3f736fabef1f5c211964f30be719fb35e Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:35:58 -0500 -Subject: [PATCH 07/10] qtbase-xcursor - ---- - src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp -index fbadab4d50..c83ce0af5b 100644 ---- a/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -317,10 +317,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) - #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) - static bool function_ptrs_not_initialized = true; - if (function_ptrs_not_initialized) { -- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); -+ QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1); - bool xcursorFound = xcursorLib.load(); - if (!xcursorFound) { // try without the version number -- xcursorLib.setFileName(QLatin1String("Xcursor")); -+ xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR)); - xcursorFound = xcursorLib.load(); - } - if (xcursorFound) { --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch deleted file mode 100644 index 71653a0e36e0..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 882343ea200fe28810bf217a820816affe885a39 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:36:25 -0500 -Subject: [PATCH 08/10] qtbase-tzdir - ---- - src/corelib/time/qtimezoneprivate_tz.cpp | 31 +++++++++++++++--------- - 1 file changed, 19 insertions(+), 12 deletions(-) - -diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp -index 3c2695a789..e75735f88f 100644 ---- a/src/corelib/time/qtimezoneprivate_tz.cpp -+++ b/src/corelib/time/qtimezoneprivate_tz.cpp -@@ -75,7 +75,11 @@ typedef QHash QTzTimeZoneHash; - // Parse zone.tab table, assume lists all installed zones, if not will need to read directories - static QTzTimeZoneHash loadTzTimeZones() - { -- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); -+ // Try TZDIR first, in case we're running on NixOS. -+ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); -+ // Fallback to traditional paths in case we are not on NixOS. -+ if (!QFile::exists(path)) -+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); - if (!QFile::exists(path)) - path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); - -@@ -658,20 +662,23 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) - if (!tzif.open(QIODevice::ReadOnly)) - return; - } else { -- // Open named tz, try modern path first, if fails try legacy path -- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ // Try TZDIR first, in case we're running on NixOS -+ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); - if (!tzif.open(QIODevice::ReadOnly)) { -- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); - if (!tzif.open(QIODevice::ReadOnly)) { -- // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ -- const QByteArray zoneInfo = ianaId.split(',').at(0); -- const char *begin = zoneInfo.constBegin(); -- if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() -- && (begin == zoneInfo.constEnd() -- || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { -- m_id = m_posixRule = ianaId; -+ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) { -+ // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ -+ const QByteArray zoneInfo = ianaId.split(',').at(0); -+ const char *begin = zoneInfo.constBegin(); -+ if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() -+ && (begin == zoneInfo.constEnd() -+ || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { -+ m_id = m_posixRule = ianaId; -+ } -+ return; - } -- return; - } - } - } --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch deleted file mode 100644 index 009fe14838e7..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- qtbase-everywhere-src-5.14.2/src/corelib/kernel/qcoreapplication.cpp 2020-03-27 10:49:31.000000000 +0100 -+++ qtbase-everywhere-src-5.14.2/src/corelib/kernel/qcoreapplication.cpp.patched 2020-05-09 15:03:03.968084088 +0200 -@@ -2691,6 +2691,16 @@ - QStringList *app_libpaths = new QStringList; - coreappdata()->app_libpaths.reset(app_libpaths); - -+ // Add library paths derived from PATH -+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); -+ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); -+ for (const QString &path: paths) { -+ if (!path.isEmpty()) { -+ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); -+ } -+ } -+ -+ - auto setPathsFromEnv = [&](QString libPathEnv) { - if (!libPathEnv.isEmpty()) { - QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts); diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch deleted file mode 100644 index e10f97607326..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c8893a4e0a1b46796e39b4a338358fdb45685cba Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:37:04 -0500 -Subject: [PATCH 09/10] qtbase-assert - ---- - src/testlib/qtestassert.h | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h -index 6498ea84ef..d821ced7fc 100644 ---- a/src/testlib/qtestassert.h -+++ b/src/testlib/qtestassert.h -@@ -44,10 +44,13 @@ - - QT_BEGIN_NAMESPACE - -- -+#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) -+#define QTEST_ASSERT(cond) do { } while ((false) && (cond)) -+#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond)) -+#else - #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) -- - #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) -+#endif - - QT_END_NAMESPACE - --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch deleted file mode 100644 index 4358097dddf2..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4c488fdb457e63924383fb7f8ad45bed3df49480 Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Mon, 30 Sep 2019 20:15:40 -0500 -Subject: [PATCH 10/10] fix header_module - ---- - mkspecs/features/qt_module.prf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 16b39031bc..1ac3d6fe59 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -84,7 +84,7 @@ header_module { - CONFIG += qt_no_install_library - - # Allow creation of .prl, .la and .pc files. -- target.path = $$[QT_INSTALL_LIBS] -+ target.path = $$NIX_OUTPUT_OUT/lib - target.CONFIG += dummy_install - INSTALLS += target - } else { --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch deleted file mode 100644 index 8a5939978a6b..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 84dbbfebd4..615bfed124 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in -@@ -119,6 +119,10 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) - if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") - set(Qt5Gui_${_cmake_lib_name}_LIBRARY) - endif() -+ set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}.tbd") -+ if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") -+ set(Qt5Gui_${_cmake_lib_name}_LIBRARY) -+ endif() - !!ENDIF - if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY) - # The above find_library call doesn\'t work for finding diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0013-define-kiosurfacesuccess.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0013-define-kiosurfacesuccess.patch deleted file mode 100644 index a43a46d8a69b..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0013-define-kiosurfacesuccess.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm -index a367487e..c3aeca1d 100644 ---- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm -+++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm -@@ -49,6 +49,11 @@ - // but was only added in the 10.14 SDK, so declare it just in case. - extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space); - -+// Introduced in 10.13: http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.13/IOSurface.html -+#if !defined(kIOSurfaceSuccess) -+#define kIOSurfaceSuccess KERN_SUCCESS -+#endif -+ - QT_BEGIN_NAMESPACE - - Q_LOGGING_CATEGORY(lcQpaIOSurface, "qt.qpa.backingstore.iosurface"); diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/qtbase-sdk-10.12-mac.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/qtbase-sdk-10.12-mac.patch deleted file mode 100644 index b2dff5aba8f6..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/qtbase-sdk-10.12-mac.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf ---- a/mkspecs/common/macx.conf -+++ b/mkspecs/common/macx.conf -@@ -10,7 +10,7 @@ QMAKE_APPLE_DEVICE_ARCHS = x86_64 - - # Should be 10.15, but as long as the CI builds with - # older SDKs we have to keep this. --QT_MAC_SDK_VERSION_MIN = 10.14 -+QT_MAC_SDK_VERSION_MIN = 10.12 - - QT_MAC_SDK_VERSION_MAX = 10.15 - -diff --git a/src/corelib/kernel/qcore_mac_objc.mm b/src/corelib/kernel/qcore_mac_objc.mm ---- a/src/corelib/kernel/qcore_mac_objc.mm -+++ b/src/corelib/kernel/qcore_mac_objc.mm -@@ -142,16 +142,10 @@ QMacAutoReleasePool::QMacAutoReleasePool() - - #ifdef QT_DEBUG - void *poolFrame = nullptr; -- if (__builtin_available(macOS 10.14, iOS 12.0, tvOS 12.0, watchOS 5.0, *)) { -- void *frame; -- if (backtrace_from_fp(__builtin_frame_address(0), &frame, 1)) -- poolFrame = frame; -- } else { - static const int maxFrames = 3; - void *callstack[maxFrames]; - if (backtrace(callstack, maxFrames) == maxFrames) - poolFrame = callstack[maxFrames - 1]; -- } - - if (poolFrame) { - Dl_info info; -diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp ---- a/src/gui/rhi/qrhi.cpp -+++ b/src/gui/rhi/qrhi.cpp -@@ -4050,7 +4050,7 @@ QRhi *QRhi::create(Implementation impl, QRhiInitParams *params, Flags flags, QRh - #endif - case Metal: - //#ifdef Q_OS_DARWIN --#ifdef Q_OS_MACOS -+#if 0 - r->d = new QRhiMetal(static_cast(params), - static_cast(importDevice)); - break; -diff --git a/src/gui/rhi/rhi.pri b/src/gui/rhi/rhi.pri ---- a/src/gui/rhi/rhi.pri -+++ b/src/gui/rhi/rhi.pri -@@ -44,7 +44,7 @@ win32 { - } - - # darwin { --macos { -+false { - HEADERS += \ - rhi/qrhimetal_p.h \ - rhi/qrhimetal_p_p.h -diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm ---- a/src/plugins/platforms/cocoa/qcocoadrag.mm -+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm -@@ -134,7 +134,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) - NSImage *nsimage = qt_mac_create_nsimage(pm); - [nsimage setSize:NSSizeFromCGSize(pmDeviceIndependentSize.toCGSize())]; - -- QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND); -+ QMacPasteboard dragBoard((CFStringRef) NSDragPboard, QMacInternalPasteboardMime::MIME_DND); - m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy")); - dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest); - -@@ -145,7 +145,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) - CGFloat flippedY = pmDeviceIndependentSize.height() - hotSpot.y(); - event_location.y -= flippedY; - NSSize mouseOffset_unused = NSMakeSize(0.0, 0.0); -- NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag]; -+ NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard]; - - [theWindow dragImage:nsimage - at:event_location diff --git a/pkgs/development/libraries/qt-5/5.14/qtdeclarative-default-disable-qmlcache.patch b/pkgs/development/libraries/qt-5/5.14/qtdeclarative-default-disable-qmlcache.patch deleted file mode 100644 index 8ef5ef53dea3..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtdeclarative-default-disable-qmlcache.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp -index 6c12de92..fc67dc07 100644 ---- a/src/qml/qml/qqmltypeloader.cpp -+++ b/src/qml/qml/qqmltypeloader.cpp -@@ -705,7 +705,7 @@ bool QQmlTypeLoader::Blob::isDebugging() const - - bool QQmlTypeLoader::Blob::diskCacheEnabled() const - { -- return (!disableDiskCache() || forceDiskCache()) && !isDebugging(); -+ return (forceDiskCache()) && !isDebugging(); - } - - bool QQmlTypeLoader::Blob::qmldirDataAvailable(const QQmlRefPointer &data, QList *errors) diff --git a/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch deleted file mode 100644 index 8f5b5d4790fb..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp -index 005db4248..685c5b1b2 100644 ---- a/src/qml/qml/qqmlimport.cpp -+++ b/src/qml/qml/qqmlimport.cpp -@@ -1760,6 +1760,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); - addImportPath(installImportsPath); - -+ // Add import paths derived from PATH -+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); -+ const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX); -+ for (const QString &path: paths) { -+ if (!path.isEmpty()) { -+ addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir)); -+ } -+ } -+ - // env import paths - if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { - const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH"); -diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf -index 537eaf62e..e21de58f6 100644 ---- a/tools/qmlcachegen/qmlcache.prf -+++ b/tools/qmlcachegen/qmlcache.prf -@@ -26,7 +26,7 @@ defineReplace(qmlCacheOutputFileName) { - } - - qmlcacheinst.base = $$QMLCACHE_DESTDIR --qmlcacheinst.path = $$[QT_INSTALL_QML]/$$TARGETPATH -+qmlcacheinst.path = $$NIX_OUTPUT_QML/$$TARGETPATH - qmlcacheinst.CONFIG = no_check_exist - - qmlcachegen.input = CACHEGEN_FILES diff --git a/pkgs/development/libraries/qt-5/5.14/qtlocation-gcc-9.patch b/pkgs/development/libraries/qt-5/5.14/qtlocation-gcc-9.patch deleted file mode 100644 index 1791313e5603..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtlocation-gcc-9.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp -index d475c38..c1710a6 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp -@@ -5,6 +5,7 @@ - #include - - #include -+#include - - namespace mbgl { - -diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp -index 97bfe91..56d3e17 100644 ---- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp -+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp -@@ -1,3 +1,4 @@ -+#include - #include - - namespace mbgl { diff --git a/pkgs/development/libraries/qt-5/5.14/qtscript.patch b/pkgs/development/libraries/qt-5/5.14/qtscript.patch deleted file mode 100644 index 5508dec1280e..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtscript.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -index 1f6d25e..087c3fb 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -@@ -81,7 +81,7 @@ - #include - #elif PLATFORM(GTK) - #include --typedef struct _GMutex GMutex; -+typedef union _GMutex GMutex; - typedef struct _GCond GCond; - #endif - diff --git a/pkgs/development/libraries/qt-5/5.14/qtserialport.patch b/pkgs/development/libraries/qt-5/5.14/qtserialport.patch deleted file mode 100644 index f25524e80bcf..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtserialport.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h -index af2dab2..8e17f64 100644 ---- a/src/serialport/qtudev_p.h -+++ b/src/serialport/qtudev_p.h -@@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN - inline bool resolveSymbols(QLibrary *udevLibrary) - { - if (!udevLibrary->isLoaded()) { -+#ifdef NIXPKGS_LIBUDEV -+ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1); -+#else - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); -+#endif - if (!udevLibrary->load()) { -+#ifdef NIXPKGS_LIBUDEV -+ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0); -+#else - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); -+#endif - if (!udevLibrary->load()) { - qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); - return false; diff --git a/pkgs/development/libraries/qt-5/5.14/qttools.patch b/pkgs/development/libraries/qt-5/5.14/qttools.patch deleted file mode 100644 index 8ae12198ca25..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qttools.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/macdeployqt/shared/shared.cpp -+++ b/src/macdeployqt/shared/shared.cpp -@@ -1241,6 +1241,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf - if (!QFile(qmlImportScannerPath).exists()) - qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner"; - -+#ifdef NIXPKGS_QMLIMPORTSCANNER -+ // Fallback: Nixpkgs hardcoded path -+ if (!QFile(qmlImportScannerPath).exists()) -+ qmlImportScannerPath = NIXPKGS_QMLIMPORTSCANNER; -+#endif -+ - // Verify that we found a qmlimportscanner binary - if (!QFile(qmlImportScannerPath).exists()) { - LogError() << "qmlimportscanner not found at" << qmlImportScannerPath; diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.14/qtwebengine-darwin-no-platform-check.patch deleted file mode 100644 index 546e753144d0..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtwebengine-darwin-no-platform-check.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf ---- a/mkspecs/features/platform.prf -+++ b/mkspecs/features/platform.prf -@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { - } else:osx { - # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 - !isMinXcodeVersion(8, 3, 3) { -- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") -- return(false) - } - !clang|intel_icc { - skipBuild("Qt WebEngine on macOS requires Clang.") -@@ -54,8 +52,6 @@ defineTest(isPlatformSupported) { - return(false) - } - !isMinOSXSDKVersion(10, 12): { -- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") -- return(false) - } - } else { - skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") -diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri ---- a/src/core/config/mac_osx.pri -+++ b/src/core/config/mac_osx.pri -@@ -5,8 +5,6 @@ load(functions) - # otherwise query for it. - QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) - isEmpty(QMAKE_MAC_SDK_VERSION) { -- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") -- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") - } - - QMAKE_CLANG_DIR = "/usr" diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-qos-classes.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-qos-classes.patch deleted file mode 100644 index a7087f517623..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-qos-classes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake ---- a/Source/cmake/OptionsQt.cmake -+++ b/Source/cmake/OptionsQt.cmake -@@ -683,7 +683,6 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG) - endif () - - if (APPLE) -- SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1) - endif () - - if (ENABLE_MATHML) diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch deleted file mode 100644 index 4871032f6f2c..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt ---- a/Source/JavaScriptCore/shell/CMakeLists.txt -+++ b/Source/JavaScriptCore/shell/CMakeLists.txt -@@ -9,7 +9,6 @@ set(JSC_LIBRARIES - ) - - if (WTF_OS_MAC_OS_X) -- list(APPEND JSC_LIBRARIES edit) - endif () - - if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC") -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -563,7 +563,6 @@ - #if PLATFORM(IOS) - - #define HAVE_NETWORK_EXTENSION 1 --#define HAVE_READLINE 1 - #if USE(APPLE_INTERNAL_SDK) - #define USE_CFNETWORK 1 - #endif -@@ -650,7 +649,6 @@ - #define HAVE_MADV_DONTNEED 1 - #define HAVE_MERGESORT 1 - #define HAVE_PTHREAD_SETNAME_NP 1 --#define HAVE_READLINE 1 - #define HAVE_SYS_TIMEB_H 1 - - #if !PLATFORM(GTK) && !PLATFORM(QT) diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebkit-icu68.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit-icu68.patch deleted file mode 100644 index 73463d7567a3..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtwebkit-icu68.patch +++ /dev/null @@ -1,170 +0,0 @@ -Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 - -In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31: -Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE' - ucnv_setFallback(m_converterICU, TRUE); - ^ -In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40: -In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27: -Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE' - isAccessible = TRUE; - ^ -Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE' - isAccessible = FALSE; - ^ -Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE' - isAccessible = TRUE; - ^ -Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE' - isAccessible = FALSE; - ^ -In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41: -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ -In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42: -Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE' - return FALSE; - ^ -Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE' - return TRUE; - ^ - ---- a/Source/WebCore/platform/text/TextCodecICU.cpp -+++ b/Source/WebCore/platform/text/TextCodecICU.cpp -@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const - m_converterICU = ucnv_open(m_canonicalConverterName, &err); - ASSERT(U_SUCCESS(err)); - if (m_converterICU) -- ucnv_setFallback(m_converterICU, TRUE); -+ ucnv_setFallback(m_converterICU, true); - } - - int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) ---- a/Source/WebCore/platform/text/icu/UTextProvider.h -+++ b/Source/WebCore/platform/text/icu/UTextProvider.h -@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < std::numeric_limits::max()); - text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { - text->chunkOffset = text->chunkLength; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } else { -@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < std::numeric_limits::max()); - text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex <= 0 && !text->chunkNativeStart) { - text->chunkOffset = 0; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } ---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp -+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp -@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i - if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { - // Already inside the buffer. Set the new offset. - uText->chunkOffset = static_cast(index - uText->chunkNativeStart); -- return TRUE; -+ return true; - } - if (index >= length && uText->chunkNativeLimit == length) { - // Off the end of the buffer, but we can't get it. - uText->chunkOffset = static_cast(index - uText->chunkNativeStart); -- return FALSE; -+ return false; - } - } else { - if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { - // Already inside the buffer. Set the new offset. - uText->chunkOffset = static_cast(index - uText->chunkNativeStart); -- return TRUE; -+ return true; - } - if (!index && !uText->chunkNativeStart) { - // Already at the beginning; can't go any farther. - uText->chunkOffset = 0; -- return FALSE; -+ return false; - } - } - -@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i - - uText->nativeIndexingLimit = uText->chunkLength; - -- return TRUE; -+ return true; - } - - static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) -@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe - static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); - UBool isAccessible; - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text - ASSERT(newContext == UTextProviderContext::PriorContext); - textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) ---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp -+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp -@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng - static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); - UBool isAccessible; - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, - ASSERT(newContext == UTextProviderContext::PriorContext); - textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit.patch deleted file mode 100644 index b94a4b76cbab..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtwebkit.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Source/WebKit2/PlatformQt.cmake b/Source/WebKit2/PlatformQt.cmake ---- a/Source/WebKit2/PlatformQt.cmake -+++ b/Source/WebKit2/PlatformQt.cmake -@@ -261,6 +261,7 @@ - list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES - ${GLIB_INCLUDE_DIRS} - ${GSTREAMER_INCLUDE_DIRS} -+ ${GSTREAMER_PBUTILS_INCLUDE_DIRS} - ${Qt5Quick_INCLUDE_DIRS} - ${Qt5Quick_PRIVATE_INCLUDE_DIRS} - ${SQLITE_INCLUDE_DIR} - diff --git a/pkgs/development/libraries/qt-5/5.14/srcs.nix b/pkgs/development/libraries/qt-5/5.14/srcs.nix deleted file mode 100644 index b5b6eb1a32c6..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/srcs.nix +++ /dev/null @@ -1,342 +0,0 @@ -# DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/5.14 -{ fetchurl, mirror }: - -{ - qt3d = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qt3d-everywhere-src-5.14.2.tar.xz"; - sha256 = "9da82f1cc4b7d416d31ec96224c59d221473a48f6e579eef978f7d2e3932c674"; - name = "qt3d-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtactiveqt = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtactiveqt-everywhere-src-5.14.2.tar.xz"; - sha256 = "b53517d5d128719773a2941ba52da10acd7aa3149948862bc08c98f5b64152a9"; - name = "qtactiveqt-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtandroidextras = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtandroidextras-everywhere-src-5.14.2.tar.xz"; - sha256 = "4a8fd92b5c49a663cf0bd492804eaf1574d11137e2cbdd41d6bf5fad0c3c4d76"; - name = "qtandroidextras-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtbase = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.2.tar.xz"; - sha256 = "48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a"; - name = "qtbase-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtcharts = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtcharts-everywhere-src-5.14.2.tar.xz"; - sha256 = "adb25203ea748d886cc3d8993c20def702115eccea311594592058134ba83bb7"; - name = "qtcharts-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtconnectivity = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtconnectivity-everywhere-src-5.14.2.tar.xz"; - sha256 = "abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28"; - name = "qtconnectivity-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtdatavis3d = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtdatavis3d-everywhere-src-5.14.2.tar.xz"; - sha256 = "723c03db2d2805b1be4ca534ac7bc867a1a21894d33a7e9261a382f3fa9d0e20"; - name = "qtdatavis3d-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtdeclarative = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtdeclarative-everywhere-src-5.14.2.tar.xz"; - sha256 = "a3c4617adc9760347c93d2eb6c25d22f620cd22f44afa0494eb499a805831650"; - name = "qtdeclarative-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtdoc = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtdoc-everywhere-src-5.14.2.tar.xz"; - sha256 = "5a55cdb55af35eb222d06179567851c175f24a3732f7dee5be073df4a893172b"; - name = "qtdoc-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtgamepad = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtgamepad-everywhere-src-5.14.2.tar.xz"; - sha256 = "f77daadb4755cf760e11812264259fb103396fd1b06df1e06b5df162081c8d03"; - name = "qtgamepad-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtgraphicaleffects = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz"; - sha256 = "487a7f858244a08264363733055a8cf8b00e77c658c5608cc462817d15e4b50f"; - name = "qtgraphicaleffects-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtimageformats = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtimageformats-everywhere-src-5.14.2.tar.xz"; - sha256 = "733eca0165c15e046b106039c989dac7f6bc2ecf215396d965ed065369264f8c"; - name = "qtimageformats-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtlocation = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtlocation-everywhere-src-5.14.2.tar.xz"; - sha256 = "c37708bc396f6dac397b49a6a268d5edb39e1c8296ca2337ce9e80bde04775cc"; - name = "qtlocation-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtlottie = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtlottie-everywhere-src-5.14.2.tar.xz"; - sha256 = "55d1392dc92cbec11263084360075dc5fc3fdc25c1969adfbdec84299b285978"; - name = "qtlottie-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtmacextras = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtmacextras-everywhere-src-5.14.2.tar.xz"; - sha256 = "d12587b46c84a7822194fc3ccf46f7c18ff3b31566d3dde4f5fe772f1d8776e5"; - name = "qtmacextras-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtmultimedia = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtmultimedia-everywhere-src-5.14.2.tar.xz"; - sha256 = "7acd8ede6835314206e407b35b668f0add67544577fb51fe67afb03137fb9fe9"; - name = "qtmultimedia-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtnetworkauth = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtnetworkauth-everywhere-src-5.14.2.tar.xz"; - sha256 = "4f00513dd18598487d02187b80b54c669662cf8a8f2573858c7f9282d7b9265e"; - name = "qtnetworkauth-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtpurchasing = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtpurchasing-everywhere-src-5.14.2.tar.xz"; - sha256 = "69b087001e8fcec5bb49ca333d5f44e6b7eb09f76421dc792fc9cd76dee9e851"; - name = "qtpurchasing-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtquick3d = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquick3d-everywhere-src-5.14.2.tar.xz"; - sha256 = "0640696d501f2b0bf57f64e98f30bfa3e1cc19c11c0e05e43d4fdb0d20488b2e"; - name = "qtquick3d-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtquickcontrols = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquickcontrols-everywhere-src-5.14.2.tar.xz"; - sha256 = "d55def1dd4ee1250bd6a4e76849f4e362368b6411c2216d5f669c761216d4461"; - name = "qtquickcontrols-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtquickcontrols2 = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquickcontrols2-everywhere-src-5.14.2.tar.xz"; - sha256 = "faf7d349d8f4a8db36cd3c62a5724bcf689300f2fdb7dc1ea034392aab981560"; - name = "qtquickcontrols2-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtquicktimeline = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquicktimeline-everywhere-src-5.14.2.tar.xz"; - sha256 = "83a45d0998cbc77f8094854a477ab1ac0838ae7fd822563d995df40149893a9e"; - name = "qtquicktimeline-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtremoteobjects = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtremoteobjects-everywhere-src-5.14.2.tar.xz"; - sha256 = "a6a601c4f4aab6fe41a462dae57033819f697e3317240a382cee45c08be614d6"; - name = "qtremoteobjects-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtscript = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtscript-everywhere-src-5.14.2.tar.xz"; - sha256 = "e9fd487ccb3cbf00e86b0b803aa79e9f6bbe7a337b8e97d069e040c3e0789bfe"; - name = "qtscript-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtscxml = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtscxml-everywhere-src-5.14.2.tar.xz"; - sha256 = "030cea352a56074f577200f967ef37c959b2767127de61f766f59b0d99763790"; - name = "qtscxml-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtsensors = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtsensors-everywhere-src-5.14.2.tar.xz"; - sha256 = "bccfca6910b0383d8f65823496ff5011abed2fa8fd446b4b27333d0fd7bb8c61"; - name = "qtsensors-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtserialbus = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtserialbus-everywhere-src-5.14.2.tar.xz"; - sha256 = "0b7762175a649a40c4dd619c5de61d772235dc86099343278e2c3229d0836a91"; - name = "qtserialbus-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtserialport = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtserialport-everywhere-src-5.14.2.tar.xz"; - sha256 = "a6d977dd723ad4d3368b5163691405b8852f809974a96ec54103494e834aea21"; - name = "qtserialport-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtspeech = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtspeech-everywhere-src-5.14.2.tar.xz"; - sha256 = "5e9e8ea62f0207ba894df1e136df0af9fc5443c7817d28c39f0ea2bbae9ec6da"; - name = "qtspeech-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtsvg = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtsvg-everywhere-src-5.14.2.tar.xz"; - sha256 = "c7d7faa01a3e7a6e4d38fafcec5529a488258218749779e6fa0e09a21173b5a1"; - name = "qtsvg-everywhere-src-5.14.2.tar.xz"; - }; - }; - qttools = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qttools-everywhere-src-5.14.2.tar.xz"; - sha256 = "5bb0cf7832b88eb6bc9d4289f98307eb14b16a453ad6cf42cca13c4fe1a053c5"; - name = "qttools-everywhere-src-5.14.2.tar.xz"; - }; - }; - qttranslations = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qttranslations-everywhere-src-5.14.2.tar.xz"; - sha256 = "2088ebee9f5dd0336c9fd11436899a95b7ce0141ce072290de1e8f315d82d1a6"; - name = "qttranslations-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtvirtualkeyboard = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz"; - sha256 = "364f3338563e617e7c964a37170b415b546c5f82965e781271f9dada3e3868d7"; - name = "qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwayland = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwayland-everywhere-src-5.14.2.tar.xz"; - sha256 = "d31633ca718fb407cf70870613d45d0ed80aa04c058586ac3036bae1aff7832a"; - name = "qtwayland-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwebchannel = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebchannel-everywhere-src-5.14.2.tar.xz"; - sha256 = "7d1dc8441523638c3d455c7d408ec65aebc073acab80e24063865f929231f874"; - name = "qtwebchannel-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwebengine = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebengine-everywhere-src-5.14.2.tar.xz"; - sha256 = "e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947"; - name = "qtwebengine-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwebglplugin = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebglplugin-everywhere-src-5.14.2.tar.xz"; - sha256 = "eb4118910b65d03d8448658ac1646e860d337e59b82d6575beda21824e313417"; - name = "qtwebglplugin-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwebsockets = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebsockets-everywhere-src-5.14.2.tar.xz"; - sha256 = "f06e62b18313fe1b40a35566e79645de4a8e7ac9f7717d1d98a06c5b49afca84"; - name = "qtwebsockets-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwebview = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebview-everywhere-src-5.14.2.tar.xz"; - sha256 = "c61f9213ee84fd7408898c0194468208ffb51af9d257e87e6b53daf24f65ff4b"; - name = "qtwebview-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwinextras = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwinextras-everywhere-src-5.14.2.tar.xz"; - sha256 = "980f1bc31b37c8597c0bac55f69ecf00d1677218ce82f7bc3933236cb6d907f2"; - name = "qtwinextras-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtx11extras = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtx11extras-everywhere-src-5.14.2.tar.xz"; - sha256 = "be9a84a03a2ee81771215264e5dff7a996d04be6192b8cdaa1d41e319a81545a"; - name = "qtx11extras-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtxmlpatterns = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtxmlpatterns-everywhere-src-5.14.2.tar.xz"; - sha256 = "219a876665345e3801baff71f31f30f5495c1cb9ab23fbbd27602632c80fcfb7"; - name = "qtxmlpatterns-everywhere-src-5.14.2.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 616bf22ff13a..2829bb0be027 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -9,7 +9,7 @@ Check for any minor version changes. { newScope , lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper -, bison, cups ? null, harfbuzz, libGL, perl +, bison, cups ? null, harfbuzz, libGL, perl, python3 , gstreamer, gst-plugins-base, gtk3, dconf , darwin , buildPackages @@ -30,16 +30,6 @@ let qtbase = lib.optionals stdenv.isDarwin [ ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch - # Downgrade minimal required SDK to 10.12 - ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch - ./qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch - ./qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch - ./qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch - ./qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch - ./qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch - ./qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch - ./qtbase.patch.d/qtbase-sdk-10.12-mac.patch - # Patch framework detection to support X.framework/X.tbd, # extending the current support for X.framework/X. ./qtbase.patch.d/0012-qtbase-tbd-frameworks.patch @@ -63,9 +53,21 @@ let ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; - qtwebengine = lib.optionals stdenv.isDarwin [ + qtwebengine = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a6f16c6daea3b5a1f7bc9f175d1645922c131563/qt5/qt5-webengine-python3.patch"; + hash = "sha256-rUSDwTucXVP3Obdck7LRTeKZ+JYQSNhQ7+W31uHZ9yM="; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/7ae178a617d1e0eceb742557e63721af949bd28a/qt5/qt5-webengine-chromium-python3.patch"; + stripLen = 1; + extraPrefix = "src/3rdparty/"; + hash = "sha256-MZGYeMdGzwypfKoSUaa56K3inbcGRx7he/+AFyk5ekA="; + }) + ] ++ lib.optionals stdenv.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch + ./qtwebengine-darwin-checks.patch ]; qtwebkit = [ (fetchpatch { @@ -125,9 +127,10 @@ let inherit bison cups harfbuzz libGL; withGtk3 = !stdenv.isDarwin; inherit dconf gtk3; inherit developerBuild decryptSslTraffic; - inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth + inherit (darwin.apple_sdk_11_0.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL MetalKit IOKit; - inherit (darwin) libobjc; + libobjc = darwin.apple_sdk_11_0.objc4; + xcbuild = darwin.apple_sdk_11_0.xcodebuild; }; qt3d = callPackage ../modules/qt3d.nix {}; @@ -136,7 +139,7 @@ let qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; qtgamepad = callPackage ../modules/qtgamepad.nix { - inherit (darwin.apple_sdk.frameworks) GameController; + inherit (darwin.apple_sdk_11_0.frameworks) GameController; }; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {}; @@ -164,19 +167,28 @@ let qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; qtwebengine = callPackage ../modules/qtwebengine.nix { inherit (srcs.qtwebengine) version; - inherit (darwin) cctools libobjc libunwind xnu; - inherit (darwin.apple_sdk.libs) sandbox; - inherit (darwin.apple_sdk.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit - ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication; + python = python3; + postPatch = '' + # update catapult for python3 compatibility + rm -r src/3rdparty/chromium/third_party/catapult + cp -r ${srcs.catapult} src/3rdparty/chromium/third_party/catapult + ''; + inherit (darwin) cctools xnu; + inherit (darwin.apple_sdk_11_0) libpm libunwind; + inherit (darwin.apple_sdk_11_0.libs) sandbox; + inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit + ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication + MediaPlayer MediaAccessibility SecurityInterface Vision CoreML; + libobjc = darwin.apple_sdk_11_0.objc4; }; qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; qtwebkit = callPackage ../modules/qtwebkit.nix { inherit (darwin) ICU; - inherit (darwin.apple_sdk.frameworks) OpenGL; + inherit (darwin.apple_sdk_11_0.frameworks) OpenGL; }; qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; qtwebview = callPackage ../modules/qtwebview.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation WebKit; + inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation WebKit; }; qtx11extras = callPackage ../modules/qtx11extras.nix {}; qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; @@ -192,6 +204,7 @@ let ++ lib.optional (stdenv.isDarwin) qtmacextras); qmake = makeSetupHook { + name = "qmake-hook"; deps = [ self.qtbase.dev ]; substitutions = { inherit debug; @@ -200,6 +213,7 @@ let } ../hooks/qmake-hook.sh; wrapQtAppsHook = makeSetupHook { + name = "wrap-qt5-apps-hook"; deps = [ self.qtbase.dev buildPackages.makeWrapper ] ++ lib.optional stdenv.isLinux self.qtwayland.dev; } ../hooks/wrap-qt-apps-hook.sh; diff --git a/pkgs/development/libraries/qt-5/5.15/fetch.sh b/pkgs/development/libraries/qt-5/5.15/fetch.sh index dcada3649078..7225b432c574 100755 --- a/pkgs/development/libraries/qt-5/5.15/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.15/fetch.sh @@ -10,7 +10,7 @@ srcs="${here}/srcs-generated.json" while read -r module; do if [[ -z "$module" ]]; then continue; fi url="https://invent.kde.org/qt/qt/${module}.git" - nix-prefetch-git --url $url --rev refs/heads/kde/5.15 \ + nix-prefetch-git --url $url --rev refs/heads/kde/5.15 --fetch-submodules \ | jq "{key: \"${module}\", value: {url,rev,sha256}}" done < "$modules" | jq -s 'from_entries' > "${srcs}.tmp" diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch index faf0b643fdba..9d2a47c7c348 100644 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch @@ -27,7 +27,7 @@ index 61bea952b2..9909dae726 100644 QMAKE_LFLAGS_REL_RPATH = diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 92a9112bca..b80ec1e801 100644 +index abc6d82ade..59b94fe5b6 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -1,9 +1,5 @@ @@ -62,7 +62,7 @@ index 92a9112bca..b80ec1e801 100644 - - !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) { - warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\ -- "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_MINOR_VERSION}.") +- "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_VERSION}.") - warning("This is an unsupported configuration. You may experience build issues," \ - "and by using") - warning("the $$QMAKE_MAC_SDK_VERSION SDK you are opting in to new features" \ @@ -77,7 +77,7 @@ index 92a9112bca..b80ec1e801 100644 } !no_objective_c:CONFIG += objective_c -@@ -73,212 +39,6 @@ qt { +@@ -73,230 +39,6 @@ qt { } } @@ -103,6 +103,19 @@ index 92a9112bca..b80ec1e801 100644 - QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -} - +-macos { +- !isEmpty(QMAKE_APPLE_DEVICE_ARCHS) { +- # If the user has requested a specific set of architectures, +- # build all of those by default, but limited to only those. +- CONFIG -= only_active_arch +- } else { +- # Otherwise allow building all of the architectures available +- # in Qt, but only build the active arch (unless the user has +- # manually overridden this via CONFIG -= only_active_arch). +- QMAKE_APPLE_DEVICE_ARCHS = $$QT_ARCHS +- } +-} +- -macx-xcode { - qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO - !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ @@ -158,15 +171,20 @@ index 92a9112bca..b80ec1e801 100644 - simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS - VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS - -- isEmpty(VALID_ARCHS): \ -- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") -- - single_arch: VALID_ARCHS = $$first(VALID_ARCHS) - -- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) -- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) +- macos { +- only_active_arch: DEFAULT_ARCHS = $$system("uname -m") +- else: DEFAULT_ARCHS = $$VALID_ARCHS +- } - -- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS +- ARCHS = $(filter $(EXPORT_VALID_ARCHS), \ +- $(if $(ARCHS), $(ARCHS), \ +- $(if $(EXPORT_DEFAULT_ARCHS), $(EXPORT_DEFAULT_ARCHS), \ +- $(EXPORT_VALID_ARCHS)))) +- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ARCHS), $(EXPORT_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) +- +- QMAKE_EXTRA_VARIABLES += VALID_ARCHS DEFAULT_ARCHS ARCHS ARCH_ARGS - - arch_flags = $(EXPORT_ARCH_ARGS) - @@ -291,11 +309,12 @@ index 92a9112bca..b80ec1e801 100644 generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS generate_xcode_project.target = xcodeproj diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a5..3b01424e67 100644 +index 2c91ba6679..a6ab233825 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf -@@ -1,60 +1,2 @@ - CONFIG = asset_catalogs rez $$CONFIG +@@ -21,61 +21,3 @@ macos { + } + load(default_pre) - -isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch index 98738656114d..bdb6a3616567 100644 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch @@ -8,11 +8,11 @@ Subject: [PATCH 11/11] fix header_module 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index b9e5d35026..9924271042 100644 +index 0b2a30d159..37271e09d9 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -84,7 +84,7 @@ header_module { - CONFIG += qt_no_install_library + qt_no_install_library # Allow creation of .prl, .la and .pc files. - target.path = $$[QT_INSTALL_LIBS] @@ -20,6 +20,3 @@ index b9e5d35026..9924271042 100644 target.CONFIG += dummy_install INSTALLS += target } else { --- -2.25.4 - diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patch deleted file mode 100644 index a43a46d8a69b..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm -index a367487e..c3aeca1d 100644 ---- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm -+++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm -@@ -49,6 +49,11 @@ - // but was only added in the 10.14 SDK, so declare it just in case. - extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space); - -+// Introduced in 10.13: http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.13/IOSurface.html -+#if !defined(kIOSurfaceSuccess) -+#define kIOSurfaceSuccess KERN_SUCCESS -+#endif -+ - QT_BEGIN_NAMESPACE - - Q_LOGGING_CATEGORY(lcQpaIOSurface, "qt.qpa.backingstore.iosurface"); diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch index 8ef1b08a5b88..f0809f8f9a3f 100644 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch @@ -86,18 +86,6 @@ index 0cf1f31b60d..042319a2aa3 100644 +include(clang-mac.conf) load(qt_config) -diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf -index d16b77acb8e..4ba0a8eaa36 100644 ---- a/mkspecs/common/macx.conf -+++ b/mkspecs/common/macx.conf -@@ -6,7 +6,6 @@ QMAKE_PLATFORM += macos osx macx - QMAKE_MAC_SDK = macosx - - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13 --QMAKE_APPLE_DEVICE_ARCHS = x86_64 - - # Should be 10.15, but as long as the CI builds with - # older SDKs we have to keep this. diff --git a/mkspecs/macx-clang/Info.plist.app b/mkspecs/macx-clang-arm64/Info.plist.app similarity index 100% rename from mkspecs/macx-clang/Info.plist.app diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch deleted file mode 100644 index de75ecbd0c17..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f156c35975e7844d2369ec5a6633ee40ec56f17a Mon Sep 17 00:00:00 2001 -From: Dmitry Kalinkin -Date: Mon, 7 Dec 2020 12:32:29 -0500 -Subject: [PATCH 1/6] Revert "QCocoaDrag - set image only on the first drag - item" - -This reverts commit 7ee9bfc158a290776f622f62d0202220c6d159bc. ---- - src/plugins/platforms/cocoa/qcocoadrag.mm | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) - -diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm -index 4bd1b129bd..a506126c72 100644 ---- a/src/plugins/platforms/cocoa/qcocoadrag.mm -+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm -@@ -217,18 +217,13 @@ bool QCocoaDrag::maybeDragMultipleItems() - // 0. We start from URLs, which can be actually in a list (thus technically - // only ONE item in the pasteboard. The fact it's only one does not help, we are - // still getting an exception because of the number of items/images mismatch ... -- // We only set the image for the first item and nil for the rest, the image already -- // contains a combined picture for all urls we drag. -- auto imageOrNil = dragImage; - for (const auto &qtUrl : qtUrls) { - NSURL *nsUrl = qtUrl.toNSURL(); - auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:nsUrl] autorelease]; - const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y, - dragImage.size.width, - dragImage.size.height); -- -- [newItem setDraggingFrame:itemFrame contents:imageOrNil]; -- imageOrNil = nil; -+ [newItem setDraggingFrame:itemFrame contents:dragImage]; - [dragItems addObject:newItem]; - } - // 1. Repeat for non-url items, if any: -@@ -237,7 +232,7 @@ bool QCocoaDrag::maybeDragMultipleItems() - const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y, - dragImage.size.width, - dragImage.size.height); -- [newItem setDraggingFrame:itemFrame contents:imageOrNil]; -+ [newItem setDraggingFrame:itemFrame contents:dragImage]; - [dragItems addObject:newItem]; - } - --- -2.21.0 - diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch deleted file mode 100644 index ee3a2d9f5a4d..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9aaac67e3c3bf40ef3efc3b07b1655f72c8c54aa Mon Sep 17 00:00:00 2001 -From: Dmitry Kalinkin -Date: Mon, 7 Dec 2020 12:32:31 -0500 -Subject: [PATCH 2/6] Revert "QCocoaDrag::drag - make sure clipboard is ours - and populated" - -This reverts commit 720e2e0c92ca6635c5f05f318770a70cf653c1c7. ---- - src/plugins/platforms/cocoa/qcocoadrag.mm | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm -index a506126c72..c6ee4323ce 100644 ---- a/src/plugins/platforms/cocoa/qcocoadrag.mm -+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm -@@ -131,10 +131,6 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) - m_drag = o; - m_executed_drop_action = Qt::IgnoreAction; - -- QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND); -- m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy")); -- dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest); -- - if (maybeDragMultipleItems()) - return m_executed_drop_action; - -@@ -143,6 +139,10 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) - NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()]; - Q_ASSERT(dragImage); - -+ QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND); -+ m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy")); -+ dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest); -+ - NSPoint event_location = [m_lastEvent locationInWindow]; - NSWindow *theWindow = [m_lastEvent window]; - Q_ASSERT(theWindow); --- -2.21.0 - diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch deleted file mode 100644 index 55211fca64c7..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d1626c55d10537274c6f365855342a1c619a4c3a Mon Sep 17 00:00:00 2001 -From: Dmitry Kalinkin -Date: Mon, 7 Dec 2020 12:32:32 -0500 -Subject: [PATCH 3/6] Revert "QCocoaDrag::maybeDragMultipleItems - fix - erroneous size check" - -This reverts commit b8a03411784803c07ecc1f769860756d6fdc04cd. ---- - src/plugins/platforms/cocoa/qcocoadrag.mm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm -index c6ee4323ce..ab6863a432 100644 ---- a/src/plugins/platforms/cocoa/qcocoadrag.mm -+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm -@@ -187,7 +187,7 @@ bool QCocoaDrag::maybeDragMultipleItems() - const auto &qtUrls = m_drag->mimeData()->urls(); - NSPasteboard *dragBoard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag]; - -- if (qtUrls.size() <= 1) { -+ if (int(dragBoard.pasteboardItems.count) == 1 && qtUrls.size() <= 1) { - // Good old -dragImage: works perfectly for this ... - return false; - } --- -2.21.0 - diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch deleted file mode 100644 index ee9b80ca6ed4..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch +++ /dev/null @@ -1,194 +0,0 @@ -From d5c155a9f3ff38e28ac073f6df43175724ebc290 Mon Sep 17 00:00:00 2001 -From: Dmitry Kalinkin -Date: Mon, 7 Dec 2020 12:32:34 -0500 -Subject: [PATCH 4/6] Revert "QCocoaDrag - avoid using the deprecated API if - possible" - -This reverts commit 8481a9fc974a1f1dd44a9f82decb18fe2290689f. ---- - src/plugins/platforms/cocoa/qcocoadrag.h | 6 -- - src/plugins/platforms/cocoa/qcocoadrag.mm | 90 ------------------- - .../platforms/cocoa/qnsview_dragging.mm | 9 +- - 3 files changed, 1 insertion(+), 104 deletions(-) - -diff --git a/src/plugins/platforms/cocoa/qcocoadrag.h b/src/plugins/platforms/cocoa/qcocoadrag.h -index 975741c270..5a5b985c6e 100644 ---- a/src/plugins/platforms/cocoa/qcocoadrag.h -+++ b/src/plugins/platforms/cocoa/qcocoadrag.h -@@ -48,8 +48,6 @@ - #include - #include - --#include -- - QT_BEGIN_NAMESPACE - - class QCocoaDrag : public QPlatformDrag -@@ -71,15 +69,11 @@ public: - void setLastMouseEvent(NSEvent *event, NSView *view); - - void setAcceptedAction(Qt::DropAction act); -- void exitDragLoop(); - private: - QDrag *m_drag; - NSEvent *m_lastEvent; - NSView *m_lastView; - Qt::DropAction m_executed_drop_action; -- QEventLoop internalDragLoop; -- -- bool maybeDragMultipleItems(); - - QPixmap dragPixmap(QDrag *drag, QPoint &hotSpot) const; - }; -diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm -index ab6863a432..b4a16ab912 100644 ---- a/src/plugins/platforms/cocoa/qcocoadrag.mm -+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm -@@ -44,9 +44,6 @@ - #include - #endif - #include --#include -- --#include - - QT_BEGIN_NAMESPACE - -@@ -131,9 +128,6 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) - m_drag = o; - m_executed_drop_action = Qt::IgnoreAction; - -- if (maybeDragMultipleItems()) -- return m_executed_drop_action; -- - QPoint hotSpot = m_drag->hotSpot(); - QPixmap pm = dragPixmap(m_drag, hotSpot); - NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()]; -@@ -164,95 +158,11 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) - return m_executed_drop_action; - } - --bool QCocoaDrag::maybeDragMultipleItems() --{ -- Q_ASSERT(m_drag && m_drag->mimeData()); -- Q_ASSERT(m_executed_drop_action == Qt::IgnoreAction); -- -- if (QOperatingSystemVersion::current() < QOperatingSystemVersion::MacOSMojave) { -- // -dragImage: stopped working in 10.14 first. -- return false; -- } -- -- const QMacAutoReleasePool pool; -- -- NSWindow *theWindow = [m_lastEvent window]; -- Q_ASSERT(theWindow); -- -- if (![theWindow.contentView respondsToSelector:@selector(draggingSession:sourceOperationMaskForDraggingContext:)]) -- return false; -- -- auto *sourceView = static_cast*>(theWindow.contentView); -- -- const auto &qtUrls = m_drag->mimeData()->urls(); -- NSPasteboard *dragBoard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag]; -- -- if (int(dragBoard.pasteboardItems.count) == 1 && qtUrls.size() <= 1) { -- // Good old -dragImage: works perfectly for this ... -- return false; -- } -- -- std::vector nonUrls; -- for (NSPasteboardItem *item in dragBoard.pasteboardItems) { -- bool isUrl = false; -- for (NSPasteboardType type in item.types) { -- using NSStringRef = NSString *; -- if ([type isEqualToString:NSStringRef(kUTTypeFileURL)]) { -- isUrl = true; -- break; -- } -- } -- -- if (!isUrl) -- nonUrls.push_back(item); -- } -- -- QPoint hotSpot = m_drag->hotSpot(); -- const auto pixmap = dragPixmap(m_drag, hotSpot); -- NSImage *dragImage = [NSImage imageFromQImage:pixmap.toImage()]; -- Q_ASSERT(dragImage); -- -- NSMutableArray *dragItems = [[[NSMutableArray alloc] init] autorelease]; -- const NSPoint itemLocation = m_drag->hotSpot().toCGPoint(); -- // 0. We start from URLs, which can be actually in a list (thus technically -- // only ONE item in the pasteboard. The fact it's only one does not help, we are -- // still getting an exception because of the number of items/images mismatch ... -- for (const auto &qtUrl : qtUrls) { -- NSURL *nsUrl = qtUrl.toNSURL(); -- auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:nsUrl] autorelease]; -- const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y, -- dragImage.size.width, -- dragImage.size.height); -- [newItem setDraggingFrame:itemFrame contents:dragImage]; -- [dragItems addObject:newItem]; -- } -- // 1. Repeat for non-url items, if any: -- for (auto *pbItem : nonUrls) { -- auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:pbItem] autorelease]; -- const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y, -- dragImage.size.width, -- dragImage.size.height); -- [newItem setDraggingFrame:itemFrame contents:dragImage]; -- [dragItems addObject:newItem]; -- } -- -- [sourceView beginDraggingSessionWithItems:dragItems event:m_lastEvent source:sourceView]; -- internalDragLoop.exec(); -- return true; --} -- - void QCocoaDrag::setAcceptedAction(Qt::DropAction act) - { - m_executed_drop_action = act; - } - --void QCocoaDrag::exitDragLoop() --{ -- if (internalDragLoop.isRunning()) -- internalDragLoop.exit(); --} -- -- - QPixmap QCocoaDrag::dragPixmap(QDrag *drag, QPoint &hotSpot) const - { - const QMimeData* data = drag->mimeData(); -diff --git a/src/plugins/platforms/cocoa/qnsview_dragging.mm b/src/plugins/platforms/cocoa/qnsview_dragging.mm -index 978d73f7d9..463e3c5579 100644 ---- a/src/plugins/platforms/cocoa/qnsview_dragging.mm -+++ b/src/plugins/platforms/cocoa/qnsview_dragging.mm -@@ -232,10 +232,6 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin - if (!target) - return; - -- auto *nativeDrag = QCocoaIntegration::instance()->drag(); -- Q_ASSERT(nativeDrag); -- nativeDrag->exitDragLoop(); -- - QPoint windowPoint = QPointF::fromCGPoint([self convertPoint:sender.draggingLocation fromView:nil]).toPoint(); - - qCDebug(lcQpaMouse) << QEvent::DragLeave << self << "at" << windowPoint; -@@ -294,12 +294,7 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin - if (!target) - return; - -- QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag(); -- Q_ASSERT(nativeDrag); -- nativeDrag->exitDragLoop(); -- // for internal drag'n'drop, don't override the action the drop event accepted -- if (!nativeDrag->currentDrag()) -- nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation)); -+ QCocoaIntegration::instance()->drag(); - - // Qt starts drag-and-drop on a mouse button press event. Cococa in - // this case won't send the matching release event, so we have to --- -2.21.0 - diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch deleted file mode 100644 index f93f80055982..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e55ca5d08b29e67b699dc217abcb65e4a7655f72 Mon Sep 17 00:00:00 2001 -From: Dmitry Kalinkin -Date: Mon, 7 Dec 2020 12:32:37 -0500 -Subject: [PATCH 5/6] Revert "macOS: Fix use of deprecated NSOffState" - -This reverts commit 6a0995525d306a1fa224adcbcb9f0ae1fc7d01bd. ---- - src/plugins/styles/mac/qmacstyle_mac.mm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm -index d1febd81d4..b5e6e60ec0 100644 ---- a/src/plugins/styles/mac/qmacstyle_mac.mm -+++ b/src/plugins/styles/mac/qmacstyle_mac.mm -@@ -3955,7 +3955,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter - pbCell = static_cast(pb.cell); - oldPosition = pbCell.arrowPosition; - pbCell.arrowPosition = NSPopUpNoArrow; -- if (pb.state == NSControlStateValueOff) { -+ if (pb.state == NSOffState) { - // NSPopUpButton in this state is smaller. - rAdjusted.origin.x -= 3; - rAdjusted.size.width += 6; --- -2.21.0 - diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch deleted file mode 100644 index b5c634aff76b..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 3ce5e752c66307f905fdf732b102a396d9248fbb Mon Sep 17 00:00:00 2001 -From: Dmitry Kalinkin -Date: Mon, 7 Dec 2020 13:22:02 -0500 -Subject: [PATCH 6/6] git checkout v5.15.0 -- - src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm - ---- - .../cocoa/qcocoacolordialoghelper.mm | 50 +++++++++---------- - 1 file changed, 25 insertions(+), 25 deletions(-) - -diff --git a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm -index 5ad1f9d7bb..c9fa035d87 100644 ---- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm -+++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm -@@ -180,34 +180,34 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate); - - - (void)updateQtColor - { -- // Discard the color space and pass the color components to QColor. This -- // is a good option as long as QColor is color-unmanaged: we preserve the -- // exact RGB value from the color picker, which is predictable. Further, -- // painting with the color will reproduce the same color on-screen, as -- // long as the the same screen is used for selecting the color. -- NSColor *componentColor = [[mColorPanel color] colorUsingType:NSColorTypeComponentBased]; -- switch (componentColor.colorSpace.colorSpaceModel) -- { -- case NSColorSpaceModelGray: { -- CGFloat white = 0, alpha = 0; -- [componentColor getWhite:&white alpha:&alpha]; -- mQtColor.setRgbF(white, white, white, alpha); -- } break; -- case NSColorSpaceModelRGB: { -- CGFloat red = 0, green = 0, blue = 0, alpha = 0; -- [componentColor getRed:&red green:&green blue:&blue alpha:&alpha]; -- mQtColor.setRgbF(red, green, blue, alpha); -- } break; -- case NSColorSpaceModelCMYK: { -+ NSColor *color = [mColorPanel color]; -+ NSString *colorSpaceName = [color colorSpaceName]; -+ if (colorSpaceName == NSDeviceCMYKColorSpace) { - CGFloat cyan = 0, magenta = 0, yellow = 0, black = 0, alpha = 0; -- [componentColor getCyan:&cyan magenta:&magenta yellow:&yellow black:&black alpha:&alpha]; -+ [color getCyan:&cyan magenta:&magenta yellow:&yellow black:&black alpha:&alpha]; - mQtColor.setCmykF(cyan, magenta, yellow, black, alpha); -- } break; -- default: -- qWarning("QNSColorPanelDelegate: Unsupported color space model"); -- break; -+ } else if (colorSpaceName == NSCalibratedRGBColorSpace || colorSpaceName == NSDeviceRGBColorSpace) { -+ CGFloat red = 0, green = 0, blue = 0, alpha = 0; -+ [color getRed:&red green:&green blue:&blue alpha:&alpha]; -+ mQtColor.setRgbF(red, green, blue, alpha); -+ } else if (colorSpaceName == NSNamedColorSpace) { -+ NSColor *tmpColor = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; -+ CGFloat red = 0, green = 0, blue = 0, alpha = 0; -+ [tmpColor getRed:&red green:&green blue:&blue alpha:&alpha]; -+ mQtColor.setRgbF(red, green, blue, alpha); -+ } else { -+ NSColorSpace *colorSpace = [color colorSpace]; -+ if ([colorSpace colorSpaceModel] == NSCMYKColorSpaceModel && [color numberOfComponents] == 5){ -+ CGFloat components[5]; -+ [color getComponents:components]; -+ mQtColor.setCmykF(components[0], components[1], components[2], components[3], components[4]); -+ } else { -+ NSColor *tmpColor = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; -+ CGFloat red = 0, green = 0, blue = 0, alpha = 0; -+ [tmpColor getRed:&red green:&green blue:&blue alpha:&alpha]; -+ mQtColor.setRgbF(red, green, blue, alpha); -+ } - } -- - if (mHelper) - emit mHelper->currentColorChanged(mQtColor); - } --- -2.21.0 - diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patch deleted file mode 100644 index 3638268de7af..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf ---- a/mkspecs/common/macx.conf -+++ b/mkspecs/common/macx.conf -@@ -10,7 +10,7 @@ QMAKE_APPLE_DEVICE_ARCHS = x86_64 - - # Should be 10.15, but as long as the CI builds with - # older SDKs we have to keep this. --QT_MAC_SDK_VERSION_MIN = 10.14 -+QT_MAC_SDK_VERSION_MIN = 10.12 - - QT_MAC_SDK_VERSION_MAX = 10.15 - -diff --git a/src/corelib/kernel/qcore_mac.mm b/src/corelib/kernel/qcore_mac.mm ---- a/src/corelib/kernel/qcore_mac.mm -+++ b/src/corelib/kernel/qcore_mac.mm -@@ -261,16 +261,10 @@ QMacAutoReleasePool::QMacAutoReleasePool() - - #ifdef QT_DEBUG - void *poolFrame = nullptr; -- if (__builtin_available(macOS 10.14, iOS 12.0, tvOS 12.0, watchOS 5.0, *)) { -- void *frame; -- if (backtrace_from_fp(__builtin_frame_address(0), &frame, 1)) -- poolFrame = frame; -- } else { - static const int maxFrames = 3; - void *callstack[maxFrames]; - if (backtrace(callstack, maxFrames) == maxFrames) - poolFrame = callstack[maxFrames - 1]; -- } - - if (poolFrame) { - Dl_info info; -diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp ---- a/src/gui/rhi/qrhi.cpp -+++ b/src/gui/rhi/qrhi.cpp -@@ -4251,7 +4251,7 @@ QRhi *QRhi::create(Implementation impl, QRhiInitParams *params, Flags flags, QRh - break; - #endif - case Metal: --#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) -+#if 0 - r->d = new QRhiMetal(static_cast(params), - static_cast(importDevice)); - break; -diff --git a/src/gui/rhi/rhi.pri b/src/gui/rhi/rhi.pri ---- a/src/gui/rhi/rhi.pri -+++ b/src/gui/rhi/rhi.pri -@@ -43,7 +43,7 @@ win32 { - LIBS += -ld3d11 -ldxgi -ldxguid - } - --macos|ios { -+false { - HEADERS += \ - rhi/qrhimetal_p.h \ - rhi/qrhimetal_p_p.h -diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm ---- a/src/plugins/platforms/cocoa/qcocoadrag.mm -+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm -@@ -133,7 +133,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) - NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()]; - Q_ASSERT(dragImage); - -- QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND); -+ QMacPasteboard dragBoard((CFStringRef) NSDragPboard, QMacInternalPasteboardMime::MIME_DND); - m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy")); - dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest); - -@@ -144,7 +144,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) - CGFloat flippedY = dragImage.size.height - hotSpot.y(); - event_location.y -= flippedY; - NSSize mouseOffset_unused = NSMakeSize(0.0, 0.0); -- NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag]; -+ NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard]; - - [theWindow dragImage:dragImage - at:event_location diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patch new file mode 100644 index 000000000000..0d4154837829 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patch @@ -0,0 +1,29 @@ +diff --git a/configure.pri b/configure.pri +index e072961f0..ac0861c01 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -442,24 +442,6 @@ defineTest(qtwebengine_isWindowsPlatformSupported) { + } + + defineTest(qtwebengine_isMacOsPlatformSupported) { +- !qtwebengine_isMinXcodeVersion(10, 0, 0) { +- qtwebengine_platformError("requires at least version 10.0.0, but using Xcode version $${QMAKE_XCODE_VERSION}.") +- return(false) +- } +- !clang|intel_icc { +- qtwebengine_platformError("requires Clang.") +- return(false) +- } +- # We require macOS 10.13 (darwin version 17.0.0) or newer. +- darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0) +- lessThan(darwin_major_version, 17) { +- qtwebengine_platformError("requires macOS version 10.13 or newer.") +- return(false) +- } +- !qtwebengine_isMinOSXSDKVersion(10, 13): { +- qtwebengine_platformError("requires a macOS SDK version of 10.13 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") +- return(false) +- } + return(true) + } + diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch index 44df09299251..86663ee80b57 100644 --- a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch +++ b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch @@ -1,28 +1,3 @@ -diff a/configure.pri b/configure.pri ---- a/configure.pri -+++ b/configure.pri -@@ -439,8 +439,6 @@ defineTest(qtwebengine_isWindowsPlatformSupported) { - - defineTest(qtwebengine_isMacOsPlatformSupported) { - !qtwebengine_isMinXcodeVersion(10, 0, 0) { -- qtwebengine_platformError("requires at least version 10.0.0, but using Xcode version $${QMAKE_XCODE_VERSION}.") -- return(false) - } - !clang|intel_icc { - qtwebengine_platformError("requires Clang.") -@@ -449,12 +447,6 @@ defineTest(qtwebengine_isMacOsPlatformSupported) { - # We require macOS 10.13 (darwin version 17.0.0) or newer. - darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0) - lessThan(darwin_major_version, 17) { -- qtwebengine_platformError("requires macOS version 10.13 or newer.") -- return(false) -- } -- !qtwebengine_isMinOSXSDKVersion(10, 13): { -- qtwebengine_platformError("requires a macOS SDK version of 10.13 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") -- return(false) - } - return(true) - } diff a/src/buildtools/config/mac_osx.pri b/src/buildtools/config/mac_osx.pri --- a/src/buildtools/config/mac_osx.pri +++ b/src/buildtools/config/mac_osx.pri 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 4639bf53a52f..3f6c616c3948 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -1,207 +1,207 @@ { "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", - "rev": "0ff905d194e273e04e95b72dbbfd4e58193ecbaa", - "sha256": "1jv4xjxdr6xbm4q8fk0ijhl845qnnhxqmwkzqg2ssxdn015iabj9" + "rev": "c3c7e6ebc29cce466d954f72f340a257d76b5ec2", + "sha256": "13ixg0gx7sp90k0db2xn7r2rj1w3zw3vs84pav0v8fwfvph9ki98" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", - "rev": "80b43bfe4109820fb7feddb4a16e227a03bc1c4e", - "sha256": "1m3c0znrm63b2wbz7vghxrh22lxdp1s7bwc00qfwhgjn1ajyrp71" + "rev": "2334cafc110c4e63bec3a5c7abdcd67e5e5ee754", + "sha256": "0p7pydqsrws5x9l74y37ldffd3yz4riyizl8669x6y6hj6177yd3" }, "qtandroidextras": { "url": "https://invent.kde.org/qt/qt/qtandroidextras.git", - "rev": "3f8c9f144acbe921a759d261e1314614793f89e0", - "sha256": "1k680n1gvj55i0yb7zrlbai4w3mvhhcbbpmcgm1wlv29rg268gi4" + "rev": "7ede0a6c555518a3fecba8930d5e4d9c58875d0d", + "sha256": "0nvdrbqm469iikkvzwjni3zb7dxwpy3x161m9yly4irklixhxkzh" }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "51258629f2cf37fff8406bf705d79c07fc7135ca", - "sha256": "0wsjw7wc493kx6w954plmd5y8qsshbd5wqxdwj350gnv48n63g2k" + "rev": "fa8dee92201448cc4eaa92f222b93d0b044d8ea5", + "sha256": "16b0q0anlgmfzbdm0jyakb8cxikrr295pj7avzny26x9609lzqga" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", - "rev": "055c6d6e49c5ea369990e7078fd534392a0ba6b9", - "sha256": "0r07yjdlxzk34br905da5kcm6xda50907nrffkw99683ix9y64ag" + "rev": "e30be213e483f2d6f3c40af0cbdc11a8e92e2026", + "sha256": "0vn1xh40lxa6vi87vr6qpskli2vh47mxi3d5srhf8rark0m51lf4" }, "qtconnectivity": { "url": "https://invent.kde.org/qt/qt/qtconnectivity.git", - "rev": "6796953f92a1d3af30d0676e56ec5dfd82199611", - "sha256": "16zh10rm2b4sk9mn4r4sfp2mzvrxlz4nqj8bpiy055mplz5day39" + "rev": "056294c0493f814c3951ef57e5d0656efe643fb5", + "sha256": "0byzmd7azrx06xmd8dsapjljpc9wwnsr39jjccbapjl5rfxywipw" }, "qtdatavis3d": { "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git", - "rev": "8e1a57efa1ba3eabbf44098ce6ede3d130c57b5d", - "sha256": "19v7la492414d0qzqdqnbhpxpg0hsqll6ixhv4jrckvdaqv7iqxz" + "rev": "9f0f50ebef04d5ac5ed0ee2a3a71e7748fce3005", + "sha256": "151650nqq29m99cbf7ac02vxzw4ivm4spr4kd2ss3gwhfxby3zgj" }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "959b1ac3b7c699ef67ec81155e6e1e579d4e1df7", - "sha256": "0f8l214x38hdn768jjfy31pqdjgya6221k38vidnfap522qs1fcm" + "rev": "05c3f4921d81fb1b0eb497515c24ae56221d1e0a", + "sha256": "0101bbpnrj4rp51dcnn2gjcq7vw55g4c8y4lmg2nd5g69whmkl1c" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", - "rev": "e3e926a66f0a4ffbf82f0df1a5f570d759faad4f", - "sha256": "1ji5qn9bhyz30z12dvh97xxi3ga9b4lymdc7kmzmcd37y56q9s5c" + "rev": "79d6ef693b6241db4a86a90943c02180c4944214", + "sha256": "0ldskh9dd8qwa96nz1q5sbb8r2jdfcxvq589dyw87m3gpb8v16qq" }, "qtgamepad": { "url": "https://invent.kde.org/qt/qt/qtgamepad.git", - "rev": "ce0202d67bf1ab2bb887f58122b20eab5b6c1d5d", - "sha256": "11c24b2pzjcv14xix96fghyx3j3kw6rmhh499wqwc0qy5mjb6kpw" + "rev": "ad63dc64f4bdafb503f7015d04e8849cef5d99b4", + "sha256": "06ag3cmg56f4z9pc3ix9lddz5ydx48pf438xc2l1z3x4wxbkfbsy" }, "qtgraphicaleffects": { "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git", - "rev": "a2b1600300cda89804d48ec90e0068a075fecc8b", - "sha256": "0ca666260mvvlf551076840pvh9r67v2bhmf0yf1xp06rxc205zq" + "rev": "4119e4e6dc94447d773a01c1d6e4de0fefb9235a", + "sha256": "0sdywxrbjzz9qmrywd54hqqssv59b9mlvra16hjxfd0di50brab2" }, "qtimageformats": { "url": "https://invent.kde.org/qt/qt/qtimageformats.git", - "rev": "adbc372b890ed90f006a6c4f3ca56bf0cba477ef", - "sha256": "05v47ba06lmhrmm9ivnfnxzv9qdhyx2bbx2lkqjfwax2czmnf81j" + "rev": "abe44c0f526e499668b1131c5990d9b571f99c46", + "sha256": "0llw5lsw368vzsc7dnjy3ahxny8qzb7yz3aakgsbd5glk3dgr4i4" }, "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", - "rev": "f920a6cc2931402023840c223fce2fed321e28ea", - "sha256": "08r6h5d120x6lnzrjwscvv1dbjf720mg508wkyf8f999xncmp0yi" + "rev": "f991e28cb0a670597f1955585c76ce8a26ce9e4b", + "sha256": "0bvxjciisq2hixhbxxs68zdwfdyvljy8iq48rnwpynqsdrhh5rma" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", - "rev": "8bb9237e4e1462f405d931a8a513ed4c27632d9e", - "sha256": "1qd86wrvf3487s3f39m6pvcipa5s7zhn99kbfnmrhg0q35cr2816" + "rev": "56f94cb8e2da9801ada7aa06f86ccf807f5a4ed8", + "sha256": "1pyshl395qmf84h5lyw3rgn3gmz98sm1dq003jvr74w9i746hszf" }, "qtmacextras": { "url": "https://invent.kde.org/qt/qt/qtmacextras.git", - "rev": "e7d4c37810976b6a1730d842cbca04b66ca7de30", - "sha256": "01kxc4185kb3pq2dfcjyl3n765gjwpf9l2r4q6gncy5v75a2y700" + "rev": "bc397be87f9b02e8279cfe2fc9b893c9f95219b9", + "sha256": "1dr8a7sv00dmk1hc6kzs93rhvjk2wkxx0mxl7riafdzxzyajcl7n" }, "qtmultimedia": { "url": "https://invent.kde.org/qt/qt/qtmultimedia.git", - "rev": "f3dc18968c437c993886d3bfb668b62344a10860", - "sha256": "0li29bvvjcck1y4zhhc6imxa8ip3988yv2zz5k6anyasb0ywbip8" + "rev": "0d7cc33ac1404758886acef4f804b788c6774e98", + "sha256": "1ra9iv4pjcgz98927lkbpw494qf1jxsg4vbzxsxi247q2d1dkwzi" }, "qtnetworkauth": { "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git", - "rev": "f34ac77b5955126be60faa2b801be2d19dff896f", - "sha256": "1ip0sp70q4mircngs77p2m8njh8aw6f1q1w6f7nm0i2vkydpqfy2" + "rev": "f082a4c84c54e888b8d023ba68b7085551403425", + "sha256": "03sd0a58b8z340in4avk6lqqa9qzkzkaxnk2yn1a270sxrsq6y0l" }, "qtpurchasing": { "url": "https://invent.kde.org/qt/qt/qtpurchasing.git", - "rev": "25ead89b0834f669e0a193e6d6cf2da25d33a452", - "sha256": "1jx44zr8kpjjg92by6sb9p5nqkadsqdhprngdbzyvxzhh1bplg1h" + "rev": "9dfea35b04dcb52d02d7a2883df88d89ba9999ef", + "sha256": "0swliqwzz3b297z7y6sr79ijgv3914s2g9ymq77plxglfdrnm74j" }, "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", - "rev": "95f52cb212f66e6022661fb7f2eb81a8c21e9f22", - "sha256": "0j508pc4fyz7gi9bjmyq4i0q9kmfhcckgwp38wcvgr6xm83f224n" + "rev": "47defc8b33b7bdf1dbf289b65b301fba2def9b1c", + "sha256": "0kfwkxln3yz0c5rd1kfjmw0y2drwm1gg2s7f52kajfvg4274ha9c" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", - "rev": "c7dae5f6041d6c076311f2d8ed13fcfe3598be70", - "sha256": "1fxvhrikjywh7gbz4lyivkvmsfnlqb7sd7r5rzqg6xi61x7i3fm4" + "rev": "18977875d16e22ad68a1dc2d7ee0a9c9f873c941", + "sha256": "0n3930zzvp4s6m715rvx1bjh2s2fg7cadjs2hq6bc8k9mwlqibk1" }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "5465566a4ad9f6f9758bed304153f0c7fec3437b", - "sha256": "03qayykxd07fwp5m1s7dwjvdcv45m3v6zia9k6ipif2bbjbi4dyd" + "rev": "56ce8233382a091a8476c831edd416b5f704ae4f", + "sha256": "1h68s2fdgn1pbf5hsk6c8v4icz8c4cpbxv8iirz22yhlzabc3hdm" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", - "rev": "e2438e010a98d731317c10a64c095e0282b51ab0", - "sha256": "0bbj0blxz3zbz03a85drwysshl0qib0fl46ln22ll52819qw111v" + "rev": "4cd0142a30bfa5eef47c720ac24dd73e12764806", + "sha256": "13vhlgxq8ap796p3y9c3kj645p0370bqjwm5hkz13pazm15sbc9z" }, "qtremoteobjects": { "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git", - "rev": "5f2a598a9134167a0da2efcbf1249fc167ae3750", - "sha256": "1c3cg8fq681wrqk2xhajym1l9f8vfsffc8g0xp06m7lp11hr9bmq" + "rev": "929c7ad0676f084b9ecc469cd47a307596923cb3", + "sha256": "0l94k9fdzk96j40gab2l5n4lmadzaqhvbg8s3m5f3v4im00xa2x9" }, "qtscript": { "url": "https://invent.kde.org/qt/qt/qtscript.git", - "rev": "b169b3e6ac1f9d66834ad61fbe35d3e25ff204bc", - "sha256": "01nfg53ixlggam5id16n1lc9n2anclrk6prvawi2fhpcnw4dpdza" + "rev": "4d8e4bd20b7100b0b7192547b19c3c239aaf7034", + "sha256": "1pvihbjjmczby4934lir3h3kq0rqcvxnbw2vdkl9lhkds3lm0qhf" }, "qtscxml": { "url": "https://invent.kde.org/qt/qt/qtscxml.git", - "rev": "e1faea1db52b91d90ef64dd57eb6529e323b5526", - "sha256": "1j1ckm2jca0h8zyfyq3kzf0dwp8jw9xwlpg7f7qi5dd8wd9dncmi" + "rev": "0c93f94a44e2dce7eed9d17d4976b0c1e14be7bb", + "sha256": "1vvzvin23ws6njhyg93s2dlkxb9p50mkipc611lsx7971gv1wih0" }, "qtsensors": { "url": "https://invent.kde.org/qt/qt/qtsensors.git", - "rev": "5f1f73fdba8906f58c4554cbef9c1a72edcf0230", - "sha256": "0y7zyx9br4scbgkja5smkmyhlb6snqhir8mypsgdc4kllnbr4wkh" + "rev": "6add85fa1a234a7e1943ba175c6fc799ccbae48e", + "sha256": "1k02x3wzczwg7cqh6hav31akdsz9kk8s0vryd3q7zfrhqy9m88sh" }, "qtserialbus": { "url": "https://invent.kde.org/qt/qt/qtserialbus.git", - "rev": "180cb13048a24510f9a1b20796772d27da762bdd", - "sha256": "1s7y7rdicb50aa2kfsl74y0dm1qd2kd6fncyqaq55w0rn95fks87" + "rev": "ced5c7223d037aece1e7f37d4314f388252de025", + "sha256": "009ajdry6lvf9pifzm2zl0w5zhkmrrxm53mjf9s76jqrsi6yqk30" }, "qtserialport": { "url": "https://invent.kde.org/qt/qt/qtserialport.git", - "rev": "966cf2a2077a8470715894363ad46ea7df0665fa", - "sha256": "1a3f3fhwblifgsn3x6qhx4fmpxp458q4x8vp3jdxmynnkfiigafp" + "rev": "e2851096dc6f6a7cfa635d69ea950b382e3658ab", + "sha256": "071g8d9i3wi8rqqy4lxpp3z25a55pd2xwsy3r8v0a6s6y5g5lcpf" }, "qtspeech": { "url": "https://invent.kde.org/qt/qt/qtspeech.git", - "rev": "d32f4a479d38a11f547598004b975f4356424a16", - "sha256": "1n0f2pym6kl0fh5iqrln7z45hwmw8bha5s7bzswsihrq6zxkca4f" + "rev": "255845e2b2e605363762be25932d92fc10d32749", + "sha256": "0apyk2z9r7i54sh0zgbs8vfncc4jrcrzzvi3q14d105pkhrschp9" }, "qtsvg": { "url": "https://invent.kde.org/qt/qt/qtsvg.git", - "rev": "83296f10ebdb9a666b11dc69f3a148c38b9c425c", - "sha256": "0gifl43lnddp0shbyhmijlm2qpqj6fp2xip96nxn1ql3g70f9kyv" + "rev": "a7a0f2491334e8cb4ef5731f5eb741f3f7b9af76", + "sha256": "13zpzvwqv61dsd74s92nf46rhaw2rw3hl8m6d313wjlaaqi95ln6" }, "qttools": { "url": "https://invent.kde.org/qt/qt/qttools.git", - "rev": "c4750dd02070ce246ff98cc5d137193825043912", - "sha256": "0zryql6g77hdqsh10gzmw9n8ibki35b5jvh96gjl29yrvan9w5v7" + "rev": "090e526e713d01eac34c64e4a09ad961c612febf", + "sha256": "1zrxv9wdnqayn5hhblwyqyrdn8mj7x2ks2f4qsr2w3cdidcjjz7y" }, "qttranslations": { "url": "https://invent.kde.org/qt/qt/qttranslations.git", - "rev": "c38edd3a5501bcd53132e1e4abb7d25a98e0e1a9", - "sha256": "0if1mx6jic67pzv1p0xqb5fknfbawvzxw7fx90hc4kkrwjm73q7m" + "rev": "af8cd030fed6a47cc1e8727e7ee5445e037bf712", + "sha256": "14fx3r9s3p16rhv9fyrwnv6bn24nvh5xnjwcw1mb04c44ddb9r86" }, "qtvirtualkeyboard": { "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git", - "rev": "8aebadb96c1e57ba89bba2e5962399f676207a32", - "sha256": "0hygidp8l580d10c1g6pgdxd3g6lza0dkgfm6bd2kjrigg71fzh0" + "rev": "5f66c9571303170f07954f73b09cad4cee1ce5d0", + "sha256": "0jzl7a2zr83nd9sskmz9fk2w2spn3v821j0l7kcp2hxydgyhk8v3" }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "4b43f2dc58e71732ebdbe1eaf4392272bc692e6d", - "sha256": "157wqyh9wv9kn8671l7dhnv3a4glmqpisqk0vdgnx19b6jdxymvj" + "rev": "f6a1e838e371dc90272c62daeea597fe487dec3e", + "sha256": "0v8vcs4jl24h754ilg9dm4qq1q24fk9mmnanpqk1q102ymmz2rac" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", - "rev": "4e35fe9429920067c17596986b486fb1c1e95db0", - "sha256": "1j74hfrrrb1irchlgqclbk3zjgg98clndfw576psa3zm8xg3szin" + "rev": "f8949655ccfacc2d34cfb0af23c540db84a2b9e5", + "sha256": "1303hghvk6avshb7imnkv24qv1ij5d3nbljba20l6v6dsr7zg7ba" }, "qtwebglplugin": { "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git", - "rev": "3087cdd0758258163299602550f7d4e72edf2a80", - "sha256": "19gsc842njdgmiqhkl7xqqry1d40phjwixzajzphv4s5vmcbxn5w" + "rev": "655be6c5406f8ba42acaca363fc55d78a6198733", + "sha256": "08biydqk1lhjzvrgl3zhbrrgnjcy611pmh9scyw42avdvj2qzpc2" }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "594477769ecac4032ba116196493f3ba3db1aaed", - "sha256": "102r5jam8kc46bjlxf3jdjsr1jzdj5vfwmf4yypbhihwz436z791" + "rev": "90f3590c3c49a0820462af9a778dd13d8df42244", + "sha256": "1dxc3imh8455vy3pggrzjflb2v5382q9ha2fwplybxawld9wdw45" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", - "rev": "b1605fea61a6bbb599b720c54282bc8ddb0aacf0", - "sha256": "158hiqrshblw3axpryv0lqk74691njdc8qmdxbz28hzaaq6rxj5n" + "rev": "dfd86e07019488954cddcf2ba314df3cd0c01c0c", + "sha256": "1crph9sdmxxs0787il86j2dv6k3qylmy8a83hfzczcjcx3pwcf7a" }, "qtwinextras": { "url": "https://invent.kde.org/qt/qt/qtwinextras.git", - "rev": "2a04b162451460ffc208c2c27acce16a18f763ce", - "sha256": "17h5bd94jhwqgzlb5w75rfgb3v0jkg6fm79kd0byzp7bvp7i7ibj" + "rev": "48318520a4031167c4c0ad559e1a11b2f4c053d6", + "sha256": "04smnp9pl3szizdp05dz7qmdgg8sk57d3r40sdy7v9zwi4lwaqi4" }, "qtx11extras": { "url": "https://invent.kde.org/qt/qt/qtx11extras.git", - "rev": "9134cdba9386e408ce2ffe515ca0c3f6f6c66685", - "sha256": "03qs1griqx3bccaqas8mifbj4f4bhwfzc3f6knws3zy3mc9l8qzq" + "rev": "e44c85e8643f2724109993a7b9eaf0dff3530fec", + "sha256": "1vs1013zxw54xfmkpid99p5f38hlqds172vija7xjyjaww7j7y3b" }, "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", - "rev": "b798a0f0265538a9dd12b5c7e4dad84ba8e1db4e", - "sha256": "1lh9rci7bqrjw912blns369qs76c7lywnxmmmlhchrhk9l89ailk" + "rev": "3199d91de3f38e5ece3d36bcefe2c33b2c014f3f", + "sha256": "1l6babh2cjqwaqk12cqpkkl2qy909b1fd84p0ab19raw419ncawz" } } diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix index 35d8eae1abb3..19f36c337e5c 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -1,7 +1,7 @@ { lib, fetchgit, fetchFromGitHub }: let - version = "5.15.7"; + version = "5.15.8"; overrides = {}; mk = name: args: @@ -14,7 +14,7 @@ let fetchgit { inherit (args) url rev sha256; fetchLFS = false; - fetchSubmodules = false; + fetchSubmodules = true; deepClone = false; leaveDotGit = false; }; @@ -34,6 +34,12 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) version = "5.212.0-alpha4"; }; + catapult = fetchgit { + url = "https://chromium.googlesource.com/catapult"; + rev = "5eedfe23148a234211ba477f76fc2ea2e8529189"; + hash = "sha256-LPfBCEB5tJOljXpptsNk0sHGtJf/wIRL7fccN79Nh6o="; + }; + qtwebengine = let branchName = "5.15.11"; diff --git a/pkgs/development/libraries/qt-5/modules/qt3d.nix b/pkgs/development/libraries/qt-5/modules/qt3d.nix index 63a516476f27..918eba5b7107 100644 --- a/pkgs/development/libraries/qt-5/modules/qt3d.nix +++ b/pkgs/development/libraries/qt-5/modules/qt3d.nix @@ -1,7 +1,9 @@ -{ qtModule, qtbase, qtdeclarative }: +{ lib, stdenv, qtModule, qtbase, qtdeclarative }: qtModule { pname = "qt3d"; qtInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; + # error: use of undeclared identifier 'stat64' + NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat"; } diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index db1367f6fba5..44f72701854c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -9,12 +9,12 @@ , dbus, fontconfig, freetype, glib, harfbuzz, icu, libdrm, libX11, libXcomposite , libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng , libxcb -, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev, xcbutil +, libxkbcommon, libxml2, libxslt, openssl, pcre2, sqlite, udev, xcbutil , xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm , zlib, at-spi2-core # optional dependencies , cups ? null, libmysqlclient ? null, postgresql ? null -, withGtk3 ? false, dconf ? null, gtk3 ? null +, withGtk3 ? false, dconf, gtk3 # options , libGLSupported ? !stdenv.isDarwin @@ -26,12 +26,7 @@ , decryptSslTraffic ? false }: -assert withGtk3 -> dconf != null; -assert withGtk3 -> gtk3 != null; - let - compareVersion = v: builtins.compareVersions version v; - qmakeCacheName = if compareVersion "5.12.4" < 0 then ".qmake.cache" else ".qmake.stash"; debugSymbols = debug || developerBuild; in @@ -48,7 +43,7 @@ stdenv.mkDerivation { # Image formats libjpeg libpng - (if compareVersion "5.9.0" < 0 then pcre16 else pcre2) + pcre2 ] ++ ( if stdenv.isDarwin then [ # TODO: move to buildInputs, this should not be propagated. @@ -119,7 +114,7 @@ stdenv.mkDerivation { # https://bugs.gentoo.org/803470 sed -i 's/-lpthread/-pthread/' mkspecs/common/linux.conf src/corelib/configure.json - '' + lib.optionalString (compareVersion "5.15.0" >= 0) '' + patchShebangs ./bin '' + ( if stdenv.isDarwin then '' @@ -149,22 +144,18 @@ stdenv.mkDerivation { setOutputFlags = false; preConfigure = '' export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - ${lib.optionalString (compareVersion "5.9.0" < 0) '' - # We need to set LD to CXX or otherwise we get nasty compile errors - export LD=$CXX - ''} NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\"" # paralellize compilation of qtmake, which happens within ./configure export MAKEFLAGS+=" -j$NIX_BUILD_CORES" - '' + lib.optionalString (compareVersion "5.15.0" >= 0) '' + ./bin/syncqt.pl -version $version ''; postConfigure = '' qmakeCacheInjectNixOutputs() { - local cache="$1/${qmakeCacheName}" + local cache="$1/.qmake.stash" echo "qmakeCacheInjectNixOutputs: $cache" if ! [ -f "$cache" ]; then echo >&2 "qmakeCacheInjectNixOutputs: WARNING: $cache does not exist" @@ -187,7 +178,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = toString ([ "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"'' - ''-D${if compareVersion "5.11.0" >= 0 then "LIBRESOLV_SO" else "NIXPKGS_LIBRESOLV"}="${stdenv.cc.libc.out}/lib/libresolv"'' + ''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"'' ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' ++ lib.optional stdenv.isLinux "-DUSE_X11" @@ -195,14 +186,10 @@ stdenv.mkDerivation { # ignore "is only available on macOS 10.12.2 or newer" in obj-c code "-Wno-error=unguarded-availability" ] - ++ lib.optionals ((compareVersion "5.15.0" >= 0) && stdenv.isDarwin) [ - # .moc/moc_qprintdialog.cpp:96:31: error: no member named '_q_togglePageSetCombo' in 'QPrintDialogPrivate' - "-DQ_OS_MAC" - ] ++ lib.optionals withGtk3 [ + ++ lib.optionals withGtk3 [ ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"'' - ] - ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC"); + ] ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC"); prefixKey = "-prefix "; @@ -236,18 +223,14 @@ stdenv.mkDerivation { "-L" "${icu.out}/lib" "-I" "${icu.dev}/include" "-pch" - ] ++ lib.optional debugSymbols "-debug" - ++ lib.optionals (compareVersion "5.11.0" < 0) [ - "-qml-debug" - ] ++ lib.optionals (compareVersion "5.9.0" < 0) [ - "-c++11" - "-no-reduce-relocations" - ] ++ lib.optionals developerBuild [ + ] + ++ lib.optional debugSymbols "-debug" + ++ lib.optionals developerBuild [ "-developer-build" "-no-warnings-are-errors" ] ++ (if (!stdenv.hostPlatform.isx86_64) then [ "-no-sse2" - ] else lib.optionals (compareVersion "5.9.0" >= 0) [ + ] else [ "-sse2" "${lib.optionalString (!stdenv.hostPlatform.sse3Support) "-no"}-sse3" "${lib.optionalString (!stdenv.hostPlatform.ssse3Support) "-no"}-ssse3" @@ -281,7 +264,7 @@ stdenv.mkDerivation { "-make tools" ''-${lib.optionalString (!buildExamples) "no"}make examples'' ''-${lib.optionalString (!buildTests) "no"}make tests'' - ] ++ lib.optional (compareVersion "5.15.0" < 0) "-v" + ] ++ ( if stdenv.isDarwin then [ "-no-fontconfig" @@ -289,9 +272,8 @@ stdenv.mkDerivation { "-qt-libpng" "-no-framework" ] else [ - "-${lib.optionalString (compareVersion "5.9.0" < 0) "no-"}rpath" - ] ++ lib.optional (compareVersion "5.15.0" < 0) "-system-xcb" - ++ [ + "-rpath" + ] ++ [ "-xcb" "-qpa xcb" "-L" "${libX11.out}/lib" @@ -306,20 +288,11 @@ stdenv.mkDerivation { ''-${lib.optionalString (cups == null) "no-"}cups'' "-dbus-linked" "-glib" - ] ++ lib.optional (compareVersion "5.15.0" < 0) "-system-libjpeg" - ++ [ + ] ++ [ "-system-libpng" ] ++ lib.optional withGtk3 "-gtk" - ++ lib.optional (compareVersion "5.9.0" >= 0) "-inotify" - ++ lib.optionals (compareVersion "5.10.0" >= 0) [ - # Without these, Qt stops working on kernels < 3.17. See: - # https://github.com/NixOS/nixpkgs/issues/38832 - "-no-feature-renameat2" - "-no-feature-getentropy" - ] ++ lib.optionals (compareVersion "5.12.1" < 0) [ - # use -xkbcommon and -xkbcommon-evdev for versions before 5.12.1 - "-system-xkbcommon" - "-xkbcommon-evdev" + ++ [ + "-inotify" ] ++ lib.optionals (cups != null) [ "-L" "${cups.lib}/lib" "-I" "${cups.dev}/include" @@ -371,12 +344,6 @@ stdenv.mkDerivation { license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; platforms = platforms.unix; - # Qt5 is broken on aarch64-darwin - # the build ends up with the following error: - # error: unknown target CPU 'armv8.3-a+crypto+sha2+aes+crc+fp16+lse+simd+ras+rdm+rcpc' - # note: valid target CPU values are: nocona, core2, penryn, ..., znver1, znver2, x86-64 - # it seems the qmake/cmake passes x86_64 as preferred architecture somewhere - broken = stdenv.isDarwin && stdenv.isAarch64 && (compareVersion "5.15.3" < 0); }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/pkgs/development/libraries/qt-5/modules/qtwayland.nix index 10e18b3b9844..c7b61ab11f4b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwayland.nix @@ -11,14 +11,14 @@ qtModule { # wrapped executables from `wrapQtAppsHook` (see comment in patch for further # context). Beware: shared among different Qt5 versions. ./qtwayland-app_id.patch - ] ++ lib.optional (lib.versionAtLeast qtbase.version "5.15") + # Backport of https://codereview.qt-project.org/c/qt/qtwayland/+/388338 # Pulled from Fedora as they modified it to not apply to KDE as Plasma 5.x # doesn't behave properly with the patch applied. See the discussion at # https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/39 for details - # This patch won't apply to versions before 5.15. (fetchpatch { url = "https://src.fedoraproject.org/rpms/qt5-qtwayland/raw/46376bb00d4c3dd3db2e82ad7ca5301ce16ea4ab/f/0080-Client-set-constraint-adjustments-for-popups-in-xdg.patch"; sha256 = "sha256-XP+noYCk8fUdA0ItCqMjV7lSXDlNdB7Az9q7NRpupHc="; - }); + }) + ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 120caae9a440..6e4fb476d491 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -1,7 +1,7 @@ { qtModule , qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel -, bison, flex, git, gperf, ninja, pkg-config, python2, which +, bison, flex, git, gperf, ninja, pkg-config, python, which , nodejs, qtbase, perl , xorg, libXcursor, libXScrnSaver, libXrandr, libXtst @@ -14,9 +14,10 @@ , systemd , enableProprietaryCodecs ? true , gn -, cctools, libobjc, libunwind, sandbox, xnu +, cctools, libobjc, libpm, libunwind, sandbox, xnu , ApplicationServices, AVFoundation, Foundation, ForceFeedback, GameController, AppKit , ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication +, MediaPlayer, MediaAccessibility, SecurityInterface, Vision, CoreML , cups, openbsm, runCommand, xcbuild, writeScriptBin , ffmpeg_4 ? null , lib, stdenv, fetchpatch @@ -24,13 +25,14 @@ , qtCompatVersion , pipewireSupport ? stdenv.isLinux , pipewire_0_2 +, postPatch ? "" }: qtModule { pname = "qtwebengine"; qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; nativeBuildInputs = [ - bison flex git gperf ninja pkg-config python2 which gn nodejs + bison flex git gperf ninja pkg-config python which gn nodejs ] ++ lib.optional stdenv.isDarwin xcbuild; doCheck = true; outputs = [ "bin" "dev" "out" ]; @@ -79,30 +81,26 @@ qtModule { sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc - '' + lib.optionalString stdenv.isDarwin ( - (if (lib.versionAtLeast qtCompatVersion "5.14") then '' + '' + lib.optionalString stdenv.isDarwin ('' substituteInPlace src/buildtools/config/mac_osx.pri \ --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"' - '' else '' - substituteInPlace src/core/config/mac_osx.pri \ - --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"' - '') - # Following is required to prevent a build error: - # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it - + '' + + # Following is required to prevent a build error: + # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ --replace '$sysroot/usr' "${xnu}" - '' - # Apple has some secret stuff they don't share with OpenBSM - + (if (lib.versionAtLeast qtCompatVersion "5.14") then '' - substituteInPlace src/3rdparty/chromium/base/mac/mach_port_rendezvous.cc \ - --replace "audit_token_to_pid(request.trailer.msgh_audit)" "request.trailer.msgh_audit.val[5]" - substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/mach/mach_message.cc \ - --replace "audit_token_to_pid(audit_trailer->msgh_audit)" "audit_trailer->msgh_audit.val[5]" - '' else '' - substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ - --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" - '')); + + # Apple has some secret stuff they don't share with OpenBSM + substituteInPlace src/3rdparty/chromium/base/mac/mach_port_rendezvous.cc \ + --replace "audit_token_to_pid(request.trailer.msgh_audit)" "request.trailer.msgh_audit.val[5]" + substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/mach/mach_message.cc \ + --replace "audit_token_to_pid(audit_trailer->msgh_audit)" "audit_trailer->msgh_audit.val[5]" + + # ld: warning: directory not found for option '-L/nix/store/...-xcodebuild-0.1.2-pre/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/usr/lib' + # ld: fatal warning(s) induced error (-fatal_warnings) + substituteInPlace src/3rdparty/chromium/build/config/compiler/BUILD.gn \ + --replace "-Wl,-fatal_warnings" "" + '') + postPatch; NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit @@ -113,20 +111,6 @@ qtModule { "-march=westmere" ] ++ lib.optionals stdenv.cc.isClang [ "-Wno-elaborated-enum-base" - ] ++ 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 - # /nix/store/xxx-apple-framework-CoreData/Library/Frameworks/CoreData.framework/Headers/NSEntityDescription.h:51:7: - # error: pointer to non-const type 'id' with no explicit ownership - # id** _kvcPropertyAccessors; - # - # TODO remove when new Apple SDK is in - # - "-fno-objc-arc" ]; preConfigure = '' @@ -138,7 +122,7 @@ qtModule { ''; qmakeFlags = [ "--" "-system-ffmpeg" ] - ++ lib.optional (pipewireSupport && (lib.versionAtLeast qtCompatVersion "5.15")) "-webengine-webrtc-pipewire" + ++ lib.optional pipewireSupport "-webengine-webrtc-pipewire" ++ lib.optional enableProprietaryCodecs "-proprietary-codecs"; propagatedBuildInputs = [ @@ -172,7 +156,7 @@ qtModule { xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst xorg.libXcomposite xorg.libXdamage libdrm xorg.libxkbfile - ] ++ lib.optionals (pipewireSupport && (lib.versionAtLeast qtCompatVersion "5.15")) [ + ] ++ lib.optionals pipewireSupport [ # Pipewire pipewire_0_2 ] @@ -197,6 +181,11 @@ qtModule { Quartz Cocoa LocalAuthentication + MediaPlayer + MediaAccessibility + SecurityInterface + Vision + CoreML openbsm libunwind @@ -204,6 +193,7 @@ qtModule { buildInputs = lib.optionals stdenv.isDarwin [ cups + libpm sandbox # `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py` @@ -230,7 +220,7 @@ qtModule { [Paths] Prefix = .. EOF - '' + lib.optionalString (lib.versions.majorMinor qtCompatVersion == "5.15") '' + # Fix for out-of-sync QtWebEngine and Qt releases (since 5.15.3) sed 's/${lib.head (lib.splitString "-" version)} /${qtCompatVersion} /' -i "$out"/lib/cmake/*/*Config.cmake ''; @@ -255,13 +245,9 @@ qtModule { (isMips && isLittleEndian)))) (map (plat: plat.system)) ]; + broken = stdenv.isDarwin && stdenv.isx86_64; # This build takes a long time; particularly on slow architectures timeout = 24 * 3600; - # we are still stuck with MacOS SDK 10.12 on x86_64-darwin - # and qtwebengine 5.14+ requires at least SDK 10.14 - # (qtwebengine 5.12 is fine with SDK 10.12) - # on aarch64-darwin we are already at MacOS SDK 11.0 - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 76f3481386f3..cc2644edd4e6 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -19,35 +19,21 @@ let ''; buildInputs = [ perl ]; }; - usingAnnulenWebkitFork = lib.versionAtLeast qtbase.version "5.11.0"; in qtModule { pname = "qtwebkit"; - qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ] - ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia - ++ lib.optional usingAnnulenWebkitFork qtwebchannel; - buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ] - ++ lib.optionals stdenv.isDarwin [ ICU OpenGL ] - ++ lib.optional usingAnnulenWebkitFork hyphen; - nativeBuildInputs = [ - bison flex gdb gperf perl pkg-config python38 ruby - ] ++ lib.optional usingAnnulenWebkitFork cmake; + qtInputs = [ qtbase qtdeclarative qtlocation qtsensors qtwebchannel ] + ++ lib.optional stdenv.isDarwin qtmultimedia; + buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base hyphen ] + ++ lib.optionals stdenv.isDarwin [ ICU OpenGL ]; + nativeBuildInputs = [ bison flex gdb gperf perl pkg-config python38 ruby cmake ]; - cmakeFlags = lib.optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ] + cmakeFlags = [ "-DPORT=Qt" ] ++ lib.optionals stdenv.isDarwin [ "-DQt5Multimedia_DIR=${lib.getDev qtmultimedia}/lib/cmake/Qt5Multimedia" "-DQt5MultimediaWidgets_DIR=${lib.getDev qtmultimedia}/lib/cmake/Qt5MultimediaWidgets" "-DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF" - ]); - - # QtWebKit overrides qmake's default_pre and default_post features, - # so its custom qmake files must be found first at the front of QMAKEPATH. - preConfigure = lib.optionalString (!usingAnnulenWebkitFork) '' - QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" - fixQtBuiltinPaths . '*.pr?' - # Fix hydra's "Log limit exceeded" - export qmakeFlags="$qmakeFlags CONFIG+=silent" - ''; + ]; NIX_CFLAGS_COMPILE = [ # with gcc7 this warning blows the log over Hydra's limit diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index b2409b1398f0..b09521e34e3c 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -23,6 +23,7 @@ , gtk3 , dconf , libglvnd +, darwin , buildPackages # options @@ -43,7 +44,7 @@ let addPackages = self: with self; let - callPackage = self.newScope { inherit qtModule srcs; }; + callPackage = self.newScope ({ inherit qtModule stdenv srcs; }); in { @@ -53,9 +54,17 @@ let withGtk3 = true; inherit (srcs.qtbase) src version; inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake; + inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation AppKit GSS MetalKit; patches = [ + ./patches/qtbase-qmake-mkspecs-mac.patch ./patches/qtbase-qmake-pkg-config.patch ./patches/qtbase-tzdir.patch + # Remove symlink check causing build to bail out and fail. + # https://gitlab.kitware.com/cmake/cmake/-/issues/23251 + (fetchpatch { + url = "https://github.com/Homebrew/formula-patches/raw/c363f0edf9e90598d54bc3f4f1bacf95abbda282/qt/qt_internal_check_if_path_has_symlinks.patch"; + sha256 = "sha256-Gv2L8ymZSbJxcmUijKlT2NnkIB3bVH9D7YSsDX2noTU="; + }) ]; }; env = callPackage ./qt-env.nix {}; @@ -90,7 +99,9 @@ let qt3d = callPackage ./modules/qt3d.nix { }; qt5compat = callPackage ./modules/qt5compat.nix { }; qtcharts = callPackage ./modules/qtcharts.nix { }; - qtconnectivity = callPackage ./modules/qtconnectivity.nix { }; + qtconnectivity = callPackage ./modules/qtconnectivity.nix { + inherit (darwin.apple_sdk_11_0.frameworks) PCSC; + }; qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { }; qtdeclarative = callPackage ./modules/qtdeclarative.nix { }; qtdoc = callPackage ./modules/qtdoc.nix { }; @@ -100,6 +111,7 @@ let qtlottie = callPackage ./modules/qtlottie.nix { }; qtmultimedia = callPackage ./modules/qtmultimedia.nix { inherit gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi; + inherit (darwin.apple_sdk_11_0.frameworks) VideoToolbox; }; qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { }; qtpositioning = callPackage ./modules/qtpositioning.nix { }; @@ -107,7 +119,9 @@ let qtserialbus = callPackage ./modules/qtserialbus.nix { }; qtserialport = callPackage ./modules/qtserialport.nix { }; qtshadertools = callPackage ./modules/qtshadertools.nix { }; - qtspeech = callPackage ./modules/qtspeech.nix { }; + qtspeech = callPackage ./modules/qtspeech.nix { + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa; + }; qtquick3d = callPackage ./modules/qtquick3d.nix { }; qtquick3dphysics = callPackage ./modules/qtquick3dphysics.nix { }; qtquicktimeline = callPackage ./modules/qtquicktimeline.nix { }; @@ -121,13 +135,17 @@ let qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; qtwebengine = callPackage ./modules/qtwebengine.nix { }; qtwebsockets = callPackage ./modules/qtwebsockets.nix { }; - qtwebview = callPackage ./modules/qtwebview.nix { }; + qtwebview = callPackage ./modules/qtwebview.nix { + inherit (darwin.apple_sdk_11_0.frameworks) WebKit; + }; wrapQtAppsHook = makeSetupHook { + name = "wrap-qt6-apps-hook"; deps = [ buildPackages.makeWrapper ]; } ./hooks/wrap-qt-apps-hook.sh; qmake = makeSetupHook { + name = "qmake6-hook"; deps = [ self.qtbase.dev ]; substitutions = { inherit debug; diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh index 139eeeb5aa62..c0be8aee8374 100644 --- a/pkgs/development/libraries/qt-6/fetch.sh +++ b/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.4/6.4.1/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 436fe4633075..6da193bbd5fc 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -18,12 +18,12 @@ , ccache , xmlstarlet , libproxy -, xlibsWrapper , xorg , zstd , double-conversion , util-linux , systemd +, systemdSupport ? stdenv.isLinux , libb2 , md4c , mtdev @@ -32,7 +32,6 @@ , libsepol , vulkan-headers , vulkan-loader -, valgrind , libthai , libdrm , libdatrie @@ -71,6 +70,13 @@ , at-spi2-core , unixODBC , unixODBCDrivers + # darwin +, xcbuild +, AGL +, AVFoundation +, AppKit +, GSS +, MetalKit # optional dependencies , cups , libmysqlclient @@ -79,7 +85,7 @@ , dconf , gtk3 # options -, libGLSupported ? true +, libGLSupported ? stdenv.isLinux , libGL , debug ? false , developerBuild ? false @@ -111,13 +117,20 @@ stdenv.mkDerivation rec { pcre2 pcre libproxy - xlibsWrapper zstd double-conversion - util-linux - systemd libb2 md4c + dbus + glib + # unixODBC drivers + unixODBCDrivers.psql + unixODBCDrivers.sqlite + unixODBCDrivers.mariadb + ] ++ lib.optionals systemdSupport [ + systemd + ] ++ lib.optionals stdenv.isLinux [ + util-linux mtdev lksctp-tools libselinux @@ -128,9 +141,6 @@ stdenv.mkDerivation rec { libthai libdrm libdatrie - valgrind - dbus - glib udev # Text rendering fontconfig @@ -152,16 +162,21 @@ stdenv.mkDerivation rec { xorg.libXtst xorg.xcbutilcursor libepoxy - ] ++ (with unixODBCDrivers; [ - psql - sqlite - mariadb - ]) ++ lib.optional libGLSupported libGL; + ] ++ lib.optionals stdenv.isDarwin [ + AGL + AVFoundation + AppKit + GSS + MetalKit + ] ++ lib.optional libGLSupported libGL; buildInputs = [ python3 at-spi2-core + ] ++ lib.optionals (!stdenv.isDarwin) [ libinput + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + AppKit ] ++ lib.optional withGtk3 gtk3 ++ lib.optional developerBuild gdb @@ -180,6 +195,8 @@ stdenv.mkDerivation rec { # https://bugreports.qt.io/browse/QTBUG-97568 postPatch = '' substituteInPlace src/corelib/CMakeLists.txt --replace /bin/ls ${coreutils}/bin/ls + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/QtAutoDetect.cmake --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" ''; fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh; @@ -197,14 +214,23 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DINSTALL_PLUGINSDIR=${qtPluginPrefix}" "-DINSTALL_QMLDIR=${qtQmlPrefix}" - "-DQT_FEATURE_journald=ON" - "-DQT_FEATURE_sctp=ON" "-DQT_FEATURE_libproxy=ON" "-DQT_FEATURE_system_sqlite=ON" - "-DQT_FEATURE_vulkan=ON" "-DQT_FEATURE_openssl_linked=ON" + ] ++ lib.optionals (!stdenv.isDarwin) [ + "-DQT_FEATURE_sctp=ON" + "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}" + "-DQT_FEATURE_vulkan=ON" + ] ++ lib.optionals stdenv.isDarwin [ + # build as a set of dynamic libraries + "-DFEATURE_framework=OFF" ]; + NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ + # Undefined symbols for architecture arm64: "___gss_c_nt_hostbased_service_oid_desc" + "-framework GSS" + ]); + outputs = [ "out" "dev" ]; postInstall = '' @@ -227,6 +253,11 @@ stdenv.mkDerivation rec { "bin/qdbusxml2cpp" "bin/qlalr" "bin/qmake" + "bin/qmake6" + "bin/qt-cmake" + "bin/qt-cmake-private" + "bin/qt-cmake-private-install.cmake" + "bin/qt-cmake-standalone-test" "bin/rcc" "bin/syncqt.pl" "bin/uic" @@ -240,14 +271,21 @@ stdenv.mkDerivation rec { # Move development tools to $dev moveQtDevTools - moveToOutput bin "$dev" moveToOutput libexec "$dev" # fixup .pc file (where to find 'moc' etc.) - sed -i "$dev/lib/pkgconfig/Qt6Core.pc" \ - -e "/^bindir=/ c bindir=$dev/bin" + if [ -f "$dev/lib/pkgconfig/Qt6Core.pc" ]; then + sed -i "$dev/lib/pkgconfig/Qt6Core.pc" \ + -e "/^bindir=/ c bindir=$dev/bin" \ + -e "/^libexecdir=/ c libexecdir=$dev/libexec" + fi patchShebangs $out $dev + + # QTEST_ASSERT and other macros keeps runtime reference to qtbase.dev + if [ -f "$dev/include/QtTest/qtestassert.h" ]; then + substituteInPlace "$dev/include/QtTest/qtestassert.h" --replace "__FILE__" "__BASE_FILE__" + fi ''; dontStrip = debugSymbols; @@ -259,6 +297,6 @@ stdenv.mkDerivation rec { description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ milahu nickcao LunNova ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix index 33fbd7231548..c62f13167fb1 100644 --- a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix @@ -5,11 +5,13 @@ , qtdeclarative , bluez , pkg-config +, PCSC }: qtModule { pname = "qtconnectivity"; qtInputs = [ qtbase qtdeclarative ]; - buildInputs = [ bluez ]; nativeBuildInputs = [ pkg-config ]; + buildInputs = lib.optionals stdenv.isLinux [ bluez ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ PCSC ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix index 76231f866efe..fcb699298fe9 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix @@ -36,8 +36,4 @@ qtModule { "bin/qmlscene" "bin/qmltestrunner" ]; - - NIX_CFLAGS_COMPILE = [ - "-fmacro-prefix-map=${qtbase.dev}=qtbase.dev" - ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index bfd33cadf395..96ea3d18bab6 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -17,12 +17,21 @@ , elfutils , libunwind , orc +, VideoToolbox }: qtModule { pname = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative qtsvg qtshadertools ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libpulseaudio elfutils libunwind alsa-lib wayland orc ]; - propagatedBuildInputs = [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ]; + buildInputs = [ libunwind orc ] + ++ lib.optionals stdenv.isLinux [ libpulseaudio elfutils alsa-lib wayland ]; + propagatedBuildInputs = [ gstreamer gst-plugins-base gst-plugins-good gst-libav ] + ++ lib.optionals stdenv.isLinux [ gst-vaapi ] + ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; + + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin + "-include AudioToolbox/AudioToolbox.h"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin + "-framework AudioToolbox"; } diff --git a/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix b/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix index 5ace804fe4c5..94e6cb9920c5 100644 --- a/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix +++ b/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix @@ -1,4 +1,6 @@ { qtModule +, lib +, stdenv , qtbase , qtquick3d }: @@ -6,4 +8,6 @@ qtModule { pname = "qtquick3dphysics"; qtInputs = [ qtbase qtquick3d ]; + NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) + "-faligned-allocation"; } diff --git a/pkgs/development/libraries/qt-6/modules/qtserialport.nix b/pkgs/development/libraries/qt-6/modules/qtserialport.nix index 96b7a25bb3b4..2d23ae17cc5f 100644 --- a/pkgs/development/libraries/qt-6/modules/qtserialport.nix +++ b/pkgs/development/libraries/qt-6/modules/qtserialport.nix @@ -10,5 +10,5 @@ qtModule { pname = "qtserialport"; qtInputs = [ qtbase ]; nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ udev ]; + propagatedBuildInputs = lib.optionals stdenv.isLinux [ udev ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtspeech.nix b/pkgs/development/libraries/qt-6/modules/qtspeech.nix index 64f1e2c14a8e..ec713bc98c68 100644 --- a/pkgs/development/libraries/qt-6/modules/qtspeech.nix +++ b/pkgs/development/libraries/qt-6/modules/qtspeech.nix @@ -1,15 +1,19 @@ { qtModule +, lib +, stdenv , qtbase , qtmultimedia , pkg-config , flite , alsa-lib , speechd +, Cocoa }: qtModule { pname = "qtspeech"; qtInputs = [ qtbase qtmultimedia ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ flite alsa-lib speechd ]; + buildInputs = lib.optionals stdenv.isLinux [ flite alsa-lib speechd ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Cocoa ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qttools.nix b/pkgs/development/libraries/qt-6/modules/qttools.nix index b1cf5dd2c146..16a7fc0c89d3 100644 --- a/pkgs/development/libraries/qt-6/modules/qttools.nix +++ b/pkgs/development/libraries/qt-6/modules/qttools.nix @@ -3,9 +3,42 @@ , lib , qtbase , qtdeclarative +, cups +, substituteAll }: qtModule { pname = "qttools"; qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ cups ]; + patches = [ + ../patches/qttools-paths.patch + ]; + NIX_CFLAGS_COMPILE = [ + "-DNIX_OUTPUT_DEV=\"${placeholder "dev"}\"" + ]; + + devTools = [ + "bin/qcollectiongenerator" + "bin/linguist" + "bin/assistant" + "bin/qdoc" + "bin/lconvert" + "bin/designer" + "bin/qtattributionsscanner" + "bin/lrelease" + "bin/lrelease-pro" + "bin/pixeltool" + "bin/lupdate" + "bin/lupdate-pro" + "bin/qtdiag" + "bin/qhelpgenerator" + "bin/qtplugininfo" + "bin/qthelpconverter" + "bin/lprodump" + "bin/qdistancefieldgenerator" + ] ++ lib.optionals stdenv.isDarwin [ + "bin/macdeployqt" + ]; + } diff --git a/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix b/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix index bb868dc61829..9c53f11e1a3c 100644 --- a/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix +++ b/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix @@ -11,5 +11,4 @@ qtModule { qtInputs = [ qtbase qtdeclarative qtsvg ]; propagatedBuildInputs = [ hunspell ]; nativeBuildInputs = [ pkg-config ]; - outputs = [ "out" ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index 3ac23d28a798..e28cdb438e5e 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -4,13 +4,12 @@ , qtdeclarative , wayland , pkg-config -, xlibsWrapper , libdrm }: qtModule { pname = "qtwayland"; qtInputs = [ qtbase qtdeclarative ]; - buildInputs = [ wayland xlibsWrapper libdrm ]; + buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwebview.nix b/pkgs/development/libraries/qt-6/modules/qtwebview.nix index ba784f73ad45..1e7c42397792 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebview.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebview.nix @@ -3,9 +3,12 @@ , qtModule , qtdeclarative , qtwebengine +, WebKit }: qtModule { pname = "qtwebview"; - qtInputs = [ qtdeclarative qtwebengine ]; + qtInputs = [ qtdeclarative ] + ++ lib.optionals (!stdenv.isDarwin) [ qtwebengine ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ WebKit ]; } diff --git a/pkgs/development/libraries/qt-6/patches/cmake.patch b/pkgs/development/libraries/qt-6/patches/cmake.patch index 1fb2ea26c35d..84192f669696 100644 --- a/pkgs/development/libraries/qt-6/patches/cmake.patch +++ b/pkgs/development/libraries/qt-6/patches/cmake.patch @@ -1,4 +1,4 @@ -commit 4f497c358e0386b65df1c1d636aadf72f8647134 +commit bd8f6ecea0663bdd150aa48941cbd47d25874396 Author: Nick Cao Date: Tue Apr 19 13:49:59 2022 +0800 @@ -13,10 +13,10 @@ Date: Tue Apr 19 13:49:59 2022 +0800 generated cmake files to point to the corrected pathes. diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx -index 8b0f64e23b..03291e2ee2 100644 +index 5a33349b19..677a6084d6 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx -@@ -6,6 +6,7 @@ +@@ -7,6 +7,7 @@ #include #include #include @@ -24,7 +24,7 @@ index 8b0f64e23b..03291e2ee2 100644 #include -@@ -325,9 +326,23 @@ static void prefixItems(std::string& exportDirs) +@@ -330,9 +331,21 @@ static void prefixItems(std::string& exportDirs) for (std::string const& e : entries) { exportDirs += sep; sep = ";"; @@ -35,8 +35,6 @@ index 8b0f64e23b..03291e2ee2 100644 + if (std::getenv("dev")) { + if (cmHasLiteralPrefix(e, "include") || cmHasLiteralPrefix(e, "./include")) { + exportDirs += std::getenv("dev"); -+ } else if (cmHasLiteralPrefix(e, "bin") || cmHasLiteralPrefix(e, "./bin")) { -+ exportDirs += std::getenv("dev"); + } else if (cmHasLiteralPrefix(e, "mkspecs") || cmHasLiteralPrefix(e, "./mkspecs")) { + exportDirs += std::getenv("dev"); + } else if (cmHasLiteralPrefix(e, "libexec") || cmHasLiteralPrefix(e, "./libexec")) { @@ -52,18 +50,18 @@ index 8b0f64e23b..03291e2ee2 100644 exportDirs += e; } diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx -index 4a3c565bce..5afa9e5e50 100644 +index adccdfeece..ba248305bd 100644 --- a/Source/cmExportInstallFileGenerator.cxx +++ b/Source/cmExportInstallFileGenerator.cxx -@@ -5,6 +5,7 @@ +@@ -6,6 +6,7 @@ #include #include #include +#include #include "cmExportSet.h" - #include "cmGeneratedFileStream.h" -@@ -263,7 +264,7 @@ void cmExportInstallFileGenerator::LoadConfigFiles(std::ostream& os) + #include "cmFileSet.h" +@@ -266,7 +267,7 @@ void cmExportInstallFileGenerator::LoadConfigFiles(std::ostream& os) void cmExportInstallFileGenerator::ReplaceInstallPrefix(std::string& input) { @@ -72,7 +70,7 @@ index 4a3c565bce..5afa9e5e50 100644 } bool cmExportInstallFileGenerator::GenerateImportFileConfig( -@@ -381,9 +382,24 @@ void cmExportInstallFileGenerator::SetImportLocationProperty( +@@ -382,9 +383,22 @@ void cmExportInstallFileGenerator::SetImportLocationProperty( // Construct the installed location of the target. std::string dest = itgen->GetDestination(config); std::string value; @@ -83,8 +81,6 @@ index 4a3c565bce..5afa9e5e50 100644 + if (std::getenv("dev")) { + if (cmHasLiteralPrefix(dest, "include") || cmHasLiteralPrefix(dest, "./include")) { + value = std::getenv("dev"); -+ } else if (cmHasLiteralPrefix(dest, "bin") || cmHasLiteralPrefix(dest, "./bin")) { -+ value = std::getenv("dev"); + } else if (cmHasLiteralPrefix(dest, "mkspecs") || cmHasLiteralPrefix(dest, "./mkspecs")) { + value = std::getenv("dev"); + } else if (cmHasLiteralPrefix(dest, "libexec") || cmHasLiteralPrefix(dest, "./libexec")) { @@ -100,10 +96,10 @@ index 4a3c565bce..5afa9e5e50 100644 value += dest; value += "/"; diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx -index 840f5112d6..7bb4ab41aa 100644 +index f988e54a19..cc5c7ac9fd 100644 --- a/Source/cmGeneratorExpression.cxx +++ b/Source/cmGeneratorExpression.cxx -@@ -197,7 +197,22 @@ static void prefixItems(const std::string& content, std::string& result, +@@ -192,7 +192,20 @@ static void prefixItems(const std::string& content, std::string& result, sep = ";"; if (!cmSystemTools::FileIsFullPath(e) && cmGeneratorExpression::Find(e) != 0) { @@ -111,8 +107,6 @@ index 840f5112d6..7bb4ab41aa 100644 + if (std::getenv("dev")) { + if (cmHasLiteralPrefix(e, "include") || cmHasLiteralPrefix(e, "./include")) { + result += std::getenv("dev"); -+ } else if (cmHasLiteralPrefix(e, "bin") || cmHasLiteralPrefix(e, "./bin")) { -+ result += std::getenv("dev"); + } else if (cmHasLiteralPrefix(e, "mkspecs") || cmHasLiteralPrefix(e, "./mkspecs")) { + result += std::getenv("dev"); + } else if (cmHasLiteralPrefix(e, "libexec") || cmHasLiteralPrefix(e, "./libexec")) { diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-6/patches/qtbase-qmake-mkspecs-mac.patch similarity index 78% rename from pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch rename to pkgs/development/libraries/qt-6/patches/qtbase-qmake-mkspecs-mac.patch index 0f38ce0d7f61..0830a4432bf2 100644 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch +++ b/pkgs/development/libraries/qt-6/patches/qtbase-qmake-mkspecs-mac.patch @@ -1,20 +1,5 @@ -From a5848991db270ffdd9f2fa05220475bb3194d12f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Milan=20P=C3=A4ssler?= -Date: Fri, 3 Apr 2020 21:07:58 +0200 -Subject: [PATCH 01/10] qtbase-mkspecs-mac - ---- - mkspecs/common/mac.conf | 2 +- - mkspecs/features/mac/default_post.prf | 206 -------------------------- - mkspecs/features/mac/default_pre.prf | 58 -------- - mkspecs/features/mac/sdk.mk | 25 ---- - mkspecs/features/mac/sdk.prf | 61 -------- - 5 files changed, 1 insertion(+), 351 deletions(-) - delete mode 100644 mkspecs/features/mac/sdk.mk - delete mode 100644 mkspecs/features/mac/sdk.prf - diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b2..9909dae726 100644 +index 61bea952..9909dae7 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ @@ -27,10 +12,58 @@ index 61bea952b2..9909dae726 100644 QMAKE_LFLAGS_REL_RPATH = diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index ba163efc18..b80ec1e801 100644 +index 09db1764..aadfce87 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf -@@ -68,212 +68,6 @@ qt { +@@ -1,9 +1,5 @@ + load(default_post) + +-# Recompute SDK version in case the user set it explicitly +-sdk_version = $$QMAKE_MAC_SDK_VERSION +-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) +- + contains(TEMPLATE, .*app) { + !macx-xcode:if(isEmpty(BUILDS)|build_pass) { + # Detect changes to the platform SDK +@@ -15,37 +11,6 @@ contains(TEMPLATE, .*app) { + + QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) + } +- +- # Detect incompatible SDK versions +- +- isEmpty(QT_MAC_SDK_VERSION_MIN): \ +- QT_MAC_SDK_VERSION_MIN = $$QT_MAC_SDK_VERSION +- +- !versionAtLeast(QMAKE_MAC_SDK_VERSION, $$QT_MAC_SDK_VERSION_MIN): \ +- warning("Qt requires at least version $$QT_MAC_SDK_VERSION_MIN of the platform SDK," \ +- "you're building against version $${QMAKE_MAC_SDK_VERSION}. Please upgrade.") +- +- !isEmpty(QT_MAC_SDK_VERSION_MAX) { +- # For Qt developers only +- !isEmpty($$list($$(QT_MAC_SDK_NO_VERSION_CHECK))): \ +- CONFIG += sdk_no_version_check +- +- QMAKE_MAC_SDK_MAJOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\\d+)(\\.\\d+)(\\.\\d+)?", \\1) +- +- !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) { +- warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\ +- "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_VERSION}.") +- warning("This is an unsupported configuration. You may experience build issues," \ +- "and by using") +- warning("the $$QMAKE_MAC_SDK_VERSION SDK you are opting in to new features" \ +- "that Qt has not been prepared for.") +- +- warning("Please downgrade the SDK you use to build your app to version" \ +- "$$QT_MAC_SDK_VERSION_MAX, or configure") +- warning("with CONFIG+=sdk_no_version_check when running qmake" \ +- "to silence this warning.") +- } +- } + } + + !no_objective_c:CONFIG += objective_c +@@ -73,234 +38,6 @@ qt { } } @@ -56,6 +89,19 @@ index ba163efc18..b80ec1e801 100644 - QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -} - +-macos { +- !isEmpty(QMAKE_APPLE_DEVICE_ARCHS) { +- # If the user has requested a specific set of architectures, +- # build all of those by default, but limited to only those. +- CONFIG -= only_active_arch +- } else { +- # Otherwise allow building all of the architectures available +- # in Qt, but only build the active arch (unless the user has +- # manually overridden this via CONFIG -= only_active_arch). +- QMAKE_APPLE_DEVICE_ARCHS = $$QT_ARCHS +- } +-} +- -macx-xcode { - qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO - !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ @@ -111,15 +157,20 @@ index ba163efc18..b80ec1e801 100644 - simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS - VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS - -- isEmpty(VALID_ARCHS): \ -- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") -- - single_arch: VALID_ARCHS = $$first(VALID_ARCHS) - -- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) -- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) +- macos { +- only_active_arch: DEFAULT_ARCHS = $$system("uname -m") +- else: DEFAULT_ARCHS = $$VALID_ARCHS +- } - -- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS +- ARCHS = $(filter $(EXPORT_VALID_ARCHS), \ +- $(if $(ARCHS), $(ARCHS), \ +- $(if $(EXPORT_DEFAULT_ARCHS), $(EXPORT_DEFAULT_ARCHS), \ +- $(EXPORT_VALID_ARCHS)))) +- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ARCHS), $(EXPORT_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) +- +- QMAKE_EXTRA_VARIABLES += VALID_ARCHS DEFAULT_ARCHS ARCHS ARCH_ARGS - - arch_flags = $(EXPORT_ARCH_ARGS) - @@ -151,9 +202,11 @@ index ba163efc18..b80ec1e801 100644 - contains(VALID_SIMULATOR_ARCHS, $$arch) { - sdk = $$simulator.sdk - version_identifier = $$simulator.deployment_identifier +- platform_identifier = $$simulator.sdk - } else { - sdk = $$device.sdk - version_identifier = $$device.deployment_identifier +- platform_identifier = $$device.sdk - } - - version_min_flags = \ @@ -164,7 +217,7 @@ index ba163efc18..b80ec1e801 100644 - -isysroot$$xcodeSDKInfo(Path, $$sdk) - QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ - -Xarch_$${arch} \ -- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk) +- -isysroot$$xcodeSDKInfo(Path, $$sdk) - - QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) - QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) @@ -180,15 +233,17 @@ index ba163efc18..b80ec1e801 100644 - } else { - simulator { - version_identifier = $$simulator.deployment_identifier +- platform_identifier = $$simulator.sdk - sysroot_path = $$xcodeSDKInfo(Path, $$simulator.sdk) - } else { - version_identifier = $$device.deployment_identifier +- platform_identifier = $$device.sdk - sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) - } - version_min_flag = -m$${version_identifier}-version-min=$$deployment_target - QMAKE_CFLAGS += -isysroot $$sysroot_path $$version_min_flag - QMAKE_CXXFLAGS += -isysroot $$sysroot_path $$version_min_flag -- QMAKE_LFLAGS += -Wl,-syslibroot,$$sysroot_path $$version_min_flag +- QMAKE_LFLAGS += -isysroot $$sysroot_path $$version_min_flag - } - - # Enable precompiled headers for multiple architectures @@ -244,7 +299,7 @@ index ba163efc18..b80ec1e801 100644 generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS generate_xcode_project.target = xcodeproj diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a5..3b01424e67 100644 +index e3534561..3b01424e 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf @@ -1,60 +1,2 @@ @@ -309,12 +364,13 @@ index e3534561a5..3b01424e67 100644 -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk +index a32ceacb..e69de29b 100644 --- a/mkspecs/features/mac/sdk.mk +++ b/mkspecs/features/mac/sdk.mk -@@ -1,25 +0,0 @@ +@@ -1,27 +0,0 @@ - -ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) -- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1 +- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>/dev/null - CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) - ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) - # We don't want to complain about out of date SDK unless the target needs to be remade. @@ -327,21 +383,22 @@ diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk - else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) - $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) - else ifneq ($(CURRENT_MAC_SDK_VERSION),) -- $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) +- $(info The $(EXPORT_QMAKE_MAC_SDK) platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) - else - $(info Unknown error resolving current platform SDK version.) - endif -- $(info This requires a fresh build. Please wipe the build directory completely,) -- $(info including any .qmake.stash and .qmake.cache files generated by qmake.) +- $(info This requires a fresh build of your project. Please wipe the build directory) +- ifneq ($(EXPORT__QMAKE_STASH_),) +- $(info including the qmake cache in $(EXPORT__QMAKE_STASH_)) +- endif - $(error ^) - endif - endif -endif diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -deleted file mode 100644 -index 3a9c2778bb..0000000000 +index 3a9c2778..e69de29b 100644 --- a/mkspecs/features/mac/sdk.prf -+++ /dev/null ++++ b/mkspecs/features/mac/sdk.prf @@ -1,61 +0,0 @@ - -isEmpty(QMAKE_MAC_SDK): \ @@ -404,6 +461,13 @@ index 3a9c2778bb..0000000000 - $$tool = $$sysrooted $$member(value, 1, -1) - cache($$tool_variable, set stash, $$tool) -} --- -2.25.1 - +diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf +index df191eb1..e69de29b 100644 +--- a/mkspecs/features/mac/toolchain.prf ++++ b/mkspecs/features/mac/toolchain.prf +@@ -1,5 +0,0 @@ +-# Ensure that we process sdk.prf first, as it will update QMAKE_CXX, +-# which the default path determination uses. +-sdk: load(sdk) +- +-load(toolchain) diff --git a/pkgs/development/libraries/qt-6/patches/qttools-paths.patch b/pkgs/development/libraries/qt-6/patches/qttools-paths.patch new file mode 100644 index 000000000000..9a0acb70b0f4 --- /dev/null +++ b/pkgs/development/libraries/qt-6/patches/qttools-paths.patch @@ -0,0 +1,27 @@ +diff --git a/src/linguist/shared/runqttool.cpp b/src/linguist/shared/runqttool.cpp +index d355b9dc..94fef33f 100644 +--- a/src/linguist/shared/runqttool.cpp ++++ b/src/linguist/shared/runqttool.cpp +@@ -20,9 +20,21 @@ class FMT { + Q_DECLARE_TR_FUNCTIONS(Linguist) + }; + ++static QString qtBasePath(QLibraryInfo::LibraryPath location) ++{ ++ switch (location) { ++ case QLibraryInfo::BinariesPath: ++ return QLatin1String(NIX_OUTPUT_DEV) + QLatin1String("/bin"); ++ case QLibraryInfo::LibraryExecutablesPath: ++ return QLatin1String(NIX_OUTPUT_DEV) + QLatin1String("/libexec"); ++ default: ++ return QLibraryInfo::path(location); ++ } ++} ++ + static QString qtToolFilePath(const QString &toolName, QLibraryInfo::LibraryPath location) + { +- QString filePath = QLibraryInfo::path(location) + QLatin1Char('/') + toolName; ++ QString filePath = qtBasePath(location) + QLatin1Char('/') + toolName; + #ifdef Q_OS_WIN + filePath.append(QLatin1String(".exe")); + #endif diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix index 5f6d429edf58..28180d3b0ca3 100644 --- a/pkgs/development/libraries/qt-6/qtModule.nix +++ b/pkgs/development/libraries/qt-6/qtModule.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (args // { postInstall = '' if [ ! -z "$dev" ]; then mkdir "$dev" - for dir in bin libexec mkspecs + for dir in libexec mkspecs do moveToOutput "$dir" "$dev" done @@ -83,6 +83,6 @@ stdenv.mkDerivation (args // { description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ milahu nickcao ]; - platforms = platforms.linux; + platforms = platforms.unix; } // (args.meta or { }); }) diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix index a9d5239dd0b8..a9a70fdb430e 100644 --- a/pkgs/development/libraries/qt-6/srcs.nix +++ b/pkgs/development/libraries/qt-6/srcs.nix @@ -4,283 +4,283 @@ { qt3d = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qt3d-everywhere-src-6.4.1.tar.xz"; - sha256 = "1654hx04k6vdifjp5kr4sj6jm8qy8m8vna7yalmb3l55pr1k5dg4"; - name = "qt3d-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qt3d-everywhere-src-6.4.2.tar.xz"; + sha256 = "0hbkld6ys78xvd2npbnbajdqiyjjskzfi7xp43kp60l4sg1j8v25"; + name = "qt3d-everywhere-src-6.4.2.tar.xz"; }; }; qt5compat = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qt5compat-everywhere-src-6.4.1.tar.xz"; - sha256 = "0cfh5z0kw75k2p3sca9d5gdfxvh93719prh2njg1nd6n8pp379fl"; - name = "qt5compat-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qt5compat-everywhere-src-6.4.2.tar.xz"; + sha256 = "14mpqj9ci31nn2n68czmxqdiikkg5iw7vqiksyvm2nwqirf507zm"; + name = "qt5compat-everywhere-src-6.4.2.tar.xz"; }; }; qtactiveqt = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtactiveqt-everywhere-src-6.4.1.tar.xz"; - sha256 = "118ivyzh6xk92ak2qf0294n1fzziy2mxp2xgkblh801d3nbg7kql"; - name = "qtactiveqt-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtactiveqt-everywhere-src-6.4.2.tar.xz"; + sha256 = "1ky5gp251r4lslc2wnmiy44p231zrqmdgb73m28kl9ii9rn0wg8j"; + name = "qtactiveqt-everywhere-src-6.4.2.tar.xz"; }; }; qtbase = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtbase-everywhere-src-6.4.1.tar.xz"; - sha256 = "1bjgy9x75y82702xkv3bhxh3q9i37ny4fv3njb5zgj7rq0fdfajk"; - name = "qtbase-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtbase-everywhere-src-6.4.2.tar.xz"; + sha256 = "0paj0p3j3nvdcp9xnpzrsjxcyy6fr9wslav2kaj7hj5kvg7cd2x8"; + name = "qtbase-everywhere-src-6.4.2.tar.xz"; }; }; qtcharts = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtcharts-everywhere-src-6.4.1.tar.xz"; - sha256 = "0rwglk5g0k1x0vjb8j5r4fqaa7m31aykh42f18svkjpz3kbbrs6y"; - name = "qtcharts-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtcharts-everywhere-src-6.4.2.tar.xz"; + sha256 = "1am9s1wahbfz1gvv5db31b8aw6k86wzyp8n3s6bwyw48ikhc19x1"; + name = "qtcharts-everywhere-src-6.4.2.tar.xz"; }; }; qtconnectivity = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtconnectivity-everywhere-src-6.4.1.tar.xz"; - sha256 = "1qxvixv95wkb7h6ch1q39pxs7cidph6kyddz91qgxr2gznz5s3wv"; - name = "qtconnectivity-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtconnectivity-everywhere-src-6.4.2.tar.xz"; + sha256 = "1bypqp6szqp6wp5npyqv585qk2760iwl4pyadx6lqaz476r496wc"; + name = "qtconnectivity-everywhere-src-6.4.2.tar.xz"; }; }; qtdatavis3d = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtdatavis3d-everywhere-src-6.4.1.tar.xz"; - sha256 = "00ddsv4inbsqbgc7lc163j8fqx9r156xzsrilh9papidfm7yvrm9"; - name = "qtdatavis3d-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtdatavis3d-everywhere-src-6.4.2.tar.xz"; + sha256 = "1m145mxgx1hgd8c3kdnjblvq50a8hycihn0a1ibc1y3a3phpp4l3"; + name = "qtdatavis3d-everywhere-src-6.4.2.tar.xz"; }; }; qtdeclarative = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtdeclarative-everywhere-src-6.4.1.tar.xz"; - sha256 = "1zjdd2ndaywl7wgl9q94a1qwin5p45l2838lqhkdm3ckvdgli35g"; - name = "qtdeclarative-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtdeclarative-everywhere-src-6.4.2.tar.xz"; + sha256 = "1ggm612fv7ahizd0c2ip9rai31srv2ypsxjvz2hbr72fvs1xkgd4"; + name = "qtdeclarative-everywhere-src-6.4.2.tar.xz"; }; }; qtdoc = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtdoc-everywhere-src-6.4.1.tar.xz"; - sha256 = "198gl45c6m1gxn13aic65xgy94in1b1hy255jq6pi44m36brspbn"; - name = "qtdoc-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtdoc-everywhere-src-6.4.2.tar.xz"; + sha256 = "178kp7jkam2j5slccv3xkfi21ah9q1kj44kh71kg8sgc7v3fn7sa"; + name = "qtdoc-everywhere-src-6.4.2.tar.xz"; }; }; qthttpserver = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qthttpserver-everywhere-src-6.4.1.tar.xz"; - sha256 = "1xib6q8ji64kq2r5y6qqig0090irjwi25vzpy8528wv5a3i0yxah"; - name = "qthttpserver-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qthttpserver-everywhere-src-6.4.2.tar.xz"; + sha256 = "1i8bkcz08ya53mvgilwxifr8sfpa599fxmc21cicqxypcx1a9cql"; + name = "qthttpserver-everywhere-src-6.4.2.tar.xz"; }; }; qtimageformats = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtimageformats-everywhere-src-6.4.1.tar.xz"; - sha256 = "1rjd8mi8z864gqaa849kc4xppbjjr2yddcgahx16z3psn8zfg1ay"; - name = "qtimageformats-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtimageformats-everywhere-src-6.4.2.tar.xz"; + sha256 = "01qpw7pbk6q3vqradjvcry0yp1jk67fx8mkra3ang6kpw2d9jpzw"; + name = "qtimageformats-everywhere-src-6.4.2.tar.xz"; }; }; qtlanguageserver = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtlanguageserver-everywhere-src-6.4.1.tar.xz"; - sha256 = "1j2xd4r9ngdi5nq35bycxx9jc7bngjlrxa0cs8cjgl7zkj3wsmg3"; - name = "qtlanguageserver-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtlanguageserver-everywhere-src-6.4.2.tar.xz"; + sha256 = "04d83hjbfgapzsfqm6zmqm8jjplih0k2psx35c1vnzqaxz36cgkl"; + name = "qtlanguageserver-everywhere-src-6.4.2.tar.xz"; }; }; qtlottie = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtlottie-everywhere-src-6.4.1.tar.xz"; - sha256 = "0b59xd5nx4c2mhdl79fzbyz25n8bkdbh8h43l8lp3an15y08bdya"; - name = "qtlottie-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtlottie-everywhere-src-6.4.2.tar.xz"; + sha256 = "0mhwvv8n3y0j0x471qprg5d18d8js9ic6c1s6xdwx590qxlqik5c"; + name = "qtlottie-everywhere-src-6.4.2.tar.xz"; }; }; qtmultimedia = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtmultimedia-everywhere-src-6.4.1.tar.xz"; - sha256 = "1bxs1n22yplds2f60h2j25aw9ibhhgprg9np3ybr0q3f08xd91n0"; - name = "qtmultimedia-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtmultimedia-everywhere-src-6.4.2.tar.xz"; + sha256 = "0xn7fa4z4mm8pzvd2hyms6jrgwjpcql02a0fcs71r4fsxbg70avz"; + name = "qtmultimedia-everywhere-src-6.4.2.tar.xz"; }; }; qtnetworkauth = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtnetworkauth-everywhere-src-6.4.1.tar.xz"; - sha256 = "08kmkpjm34bkbiz54zm4p9mjr9fjzx2kjf0fkhay0lz3iljp0sl3"; - name = "qtnetworkauth-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtnetworkauth-everywhere-src-6.4.2.tar.xz"; + sha256 = "1vn28x83079zdf41lrmrdxclg0cif09cfyvmswxlj2kxjnyigayy"; + name = "qtnetworkauth-everywhere-src-6.4.2.tar.xz"; }; }; qtpositioning = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtpositioning-everywhere-src-6.4.1.tar.xz"; - sha256 = "12yip3awqwcx3fqr8jl64bvp3scvi9pbzyjzk0pm2f6r3kl14qbh"; - name = "qtpositioning-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtpositioning-everywhere-src-6.4.2.tar.xz"; + sha256 = "10pgkag7bjhh1yxq3fm2szch17q1fmh2xly926rgayl7pbsvl0bz"; + name = "qtpositioning-everywhere-src-6.4.2.tar.xz"; }; }; qtquick3d = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtquick3d-everywhere-src-6.4.1.tar.xz"; - sha256 = "11881pfia0nwjxsgy2789s01qcvi9x4rhfcckxfzl4819pxw1nx6"; - name = "qtquick3d-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtquick3d-everywhere-src-6.4.2.tar.xz"; + sha256 = "19r655jinshg210ik1mann57ic92bvr52gd3xqy5c06wlrn3ngcm"; + name = "qtquick3d-everywhere-src-6.4.2.tar.xz"; }; }; qtquick3dphysics = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtquick3dphysics-everywhere-src-6.4.1.tar.xz"; - sha256 = "1fxd3d8x0sgwqsvwv61m0kg4pd9gz99gqkgqd3schdhlcwgaim0x"; - name = "qtquick3dphysics-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtquick3dphysics-everywhere-src-6.4.2.tar.xz"; + sha256 = "14fc4fzcpx4phqf768cavkwxxzhccz7hgif4g5a6xcirdimzhyp8"; + name = "qtquick3dphysics-everywhere-src-6.4.2.tar.xz"; }; }; qtquicktimeline = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtquicktimeline-everywhere-src-6.4.1.tar.xz"; - sha256 = "0p6yb3qg9i7774kvwcj8i56ab9vkifi5d92y2w8v9s25g31pspzk"; - name = "qtquicktimeline-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtquicktimeline-everywhere-src-6.4.2.tar.xz"; + sha256 = "0plsy3pz589hrzjz717vmpsy60rl7hf9sl519qsjldkqyjvsp21h"; + name = "qtquicktimeline-everywhere-src-6.4.2.tar.xz"; }; }; qtremoteobjects = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtremoteobjects-everywhere-src-6.4.1.tar.xz"; - sha256 = "1jvsvfj8bdqxfc0vhihgmvglck0zk5nl487kbbjyhkgia1v37m98"; - name = "qtremoteobjects-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtremoteobjects-everywhere-src-6.4.2.tar.xz"; + sha256 = "04l88akwawyippzc4j82wd4vn801fl6iibppxrld1m9001j56g2q"; + name = "qtremoteobjects-everywhere-src-6.4.2.tar.xz"; }; }; qtscxml = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtscxml-everywhere-src-6.4.1.tar.xz"; - sha256 = "13mvih36shrjhpp1z3kqlyzgyh35gkx3a12rzh0yff4gmp5y9w6j"; - name = "qtscxml-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtscxml-everywhere-src-6.4.2.tar.xz"; + sha256 = "0zsfylzbh3hwjii6l4y1ha524qrby3piyylnh4jfsjrrb4sd9c0k"; + name = "qtscxml-everywhere-src-6.4.2.tar.xz"; }; }; qtsensors = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtsensors-everywhere-src-6.4.1.tar.xz"; - sha256 = "1qpr6g424dpy2xccfyrkf5v2rszczq5p73lzk79s8g95fl33yzk6"; - name = "qtsensors-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtsensors-everywhere-src-6.4.2.tar.xz"; + sha256 = "0mp6gq3mlinmagb3gd4kr3zwibygzd91k7lwljmlr7x353zijmj5"; + name = "qtsensors-everywhere-src-6.4.2.tar.xz"; }; }; qtserialbus = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtserialbus-everywhere-src-6.4.1.tar.xz"; - sha256 = "12y4pd87k1y044rfppnmv0zdfmqx42ng0hixhzblr8fbvvwh494g"; - name = "qtserialbus-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtserialbus-everywhere-src-6.4.2.tar.xz"; + sha256 = "06xz91yn2vwybdwn8jgz6ymlbrdmpjsdwj07lnd8j9vkgiji6h30"; + name = "qtserialbus-everywhere-src-6.4.2.tar.xz"; }; }; qtserialport = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtserialport-everywhere-src-6.4.1.tar.xz"; - sha256 = "1yl25cv0ajfjswg8jgkf4jwwsasr5g7sgsc3fb3zsaz6cd8cw2hx"; - name = "qtserialport-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtserialport-everywhere-src-6.4.2.tar.xz"; + sha256 = "1yj08d810l4drsnhav3mych4p5b2dz5qrpn3nf20301pj28rav9k"; + name = "qtserialport-everywhere-src-6.4.2.tar.xz"; }; }; qtshadertools = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtshadertools-everywhere-src-6.4.1.tar.xz"; - sha256 = "012525kfnnkprgzgncqkzmif3z9k1qa6hfpscbsqg3084s1p9hbb"; - name = "qtshadertools-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtshadertools-everywhere-src-6.4.2.tar.xz"; + sha256 = "05x24v12jjh3fyr5wrxy7n33vqp00y10kyznrfs2r72f9pwbyrgs"; + name = "qtshadertools-everywhere-src-6.4.2.tar.xz"; }; }; qtspeech = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtspeech-everywhere-src-6.4.1.tar.xz"; - sha256 = "0jbv6r953r884wfnxrrcvf44xpvc7d8kzjd3lqv4y234748hsrih"; - name = "qtspeech-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtspeech-everywhere-src-6.4.2.tar.xz"; + sha256 = "1jwlnh640qk602nn5zslrxmp87ph87fyp6jcysmh1xfn6j6rzjd9"; + name = "qtspeech-everywhere-src-6.4.2.tar.xz"; }; }; qtsvg = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtsvg-everywhere-src-6.4.1.tar.xz"; - sha256 = "1rcwrsdq9412qq9ilfs54yjz7ih8a6r8mbwx7y4dnrqmjk2lalsy"; - name = "qtsvg-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtsvg-everywhere-src-6.4.2.tar.xz"; + sha256 = "0503b63zxqrakw33283lq8fm85asmpckibkyxpc22dkrn4yayimp"; + name = "qtsvg-everywhere-src-6.4.2.tar.xz"; }; }; qttools = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qttools-everywhere-src-6.4.1.tar.xz"; - sha256 = "0cq99c79p90yv3vlb3xbzamgx7qn4s9fb2gdnjyizhh4dcn5c84y"; - name = "qttools-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qttools-everywhere-src-6.4.2.tar.xz"; + sha256 = "0s3chbap59allfkj825yi07wqcg9x10shgidabpsbr44c68qf4x3"; + name = "qttools-everywhere-src-6.4.2.tar.xz"; }; }; qttranslations = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qttranslations-everywhere-src-6.4.1.tar.xz"; - sha256 = "04kal5b3bplylf33kjc8f7kc4x801qj5qrpsjs609ljnsbqwdns4"; - name = "qttranslations-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qttranslations-everywhere-src-6.4.2.tar.xz"; + sha256 = "15n4m6r279wqy9834iwc3n98nbyjbf9y2c7pzrr4nq6208ajkq5v"; + name = "qttranslations-everywhere-src-6.4.2.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtvirtualkeyboard-everywhere-src-6.4.1.tar.xz"; - sha256 = "089v5nxfvrglp9ilaayxls8mhdbrq80z38m2agmw147m8d8dspy2"; - name = "qtvirtualkeyboard-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtvirtualkeyboard-everywhere-src-6.4.2.tar.xz"; + sha256 = "0a2gd8s7jrc56n4b743ln1qdvvl820cprp2zrbx6x28pdq7q6g4w"; + name = "qtvirtualkeyboard-everywhere-src-6.4.2.tar.xz"; }; }; qtwayland = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwayland-everywhere-src-6.4.1.tar.xz"; - sha256 = "1mgjd6qbz0m2kq9bcdn6mnypfjycwdfyna6z7dhj1m61s52id5lw"; - name = "qtwayland-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtwayland-everywhere-src-6.4.2.tar.xz"; + sha256 = "0pqkpvc21h3gkr8x7nxylxgksj046xgmqpc1nhvidasiyw51mkr4"; + name = "qtwayland-everywhere-src-6.4.2.tar.xz"; }; }; qtwebchannel = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwebchannel-everywhere-src-6.4.1.tar.xz"; - sha256 = "1abw58yccjhgwjrry56mih0vnxlg69dc10vfyi8grqy543qikgid"; - name = "qtwebchannel-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtwebchannel-everywhere-src-6.4.2.tar.xz"; + sha256 = "11xxpvf53g63dxd6i6bzp4as4wc5pc6xlh3w7drnrwh94lmpnr86"; + name = "qtwebchannel-everywhere-src-6.4.2.tar.xz"; }; }; qtwebengine = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwebengine-everywhere-src-6.4.1.tar.xz"; - sha256 = "10m763yq39jn6k02bqax6mhgbc0bpnmfmxj4wkw5b67ks48w0n9c"; - name = "qtwebengine-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtwebengine-everywhere-src-6.4.2.tar.xz"; + sha256 = "1j8rl5r981xdqh2sqzlw5md4z14h42f8sgjjfgpdkj0wim8lbagz"; + name = "qtwebengine-everywhere-src-6.4.2.tar.xz"; }; }; qtwebsockets = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwebsockets-everywhere-src-6.4.1.tar.xz"; - sha256 = "093ssssws3w1cjacjzp9j80n7b9y7i87yp8ibshshgj0avm8jxsk"; - name = "qtwebsockets-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtwebsockets-everywhere-src-6.4.2.tar.xz"; + sha256 = "09n64yjlkd6kcg4hk0j4f85spi1k3kanfvx50c0w486vh9sqbkvi"; + name = "qtwebsockets-everywhere-src-6.4.2.tar.xz"; }; }; qtwebview = { - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwebview-everywhere-src-6.4.1.tar.xz"; - sha256 = "15rqka6pyvi33cmizdjfhc2k5ldd1pykmc4nfx826drar6y32a27"; - name = "qtwebview-everywhere-src-6.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtwebview-everywhere-src-6.4.2.tar.xz"; + sha256 = "0wpkn9pwbq3bn2yjxhvrmwb32rakknzgxbf8ybxwcly12la9chm6"; + name = "qtwebview-everywhere-src-6.4.2.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index 9dbc2491ad95..40e7e1549140 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isDarwin '' # Fix darwin build substituteInPlace pbfplugin.pro \ + --replace '$$PROTOBUF/include' '${protobuf}/include' \ --replace '$$PROTOBUF/lib/libprotobuf-lite.a' '${protobuf}/lib/libprotobuf-lite.dylib' ''; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 09f0d05dd59d..b52837aa1705 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "1.0.4"; + version = "1.0.7"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - hash = "sha256-chdtcx73mfr/b1P3yVevx0m7HkMFzEYG7YLuhSyG7rk="; + hash = "sha256-Ys77z5BoeQEOYe1h5ITEuVtVn6Uug9zQjrCBxLQOrSs="; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 322ca7266747..f50f47413b4a 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "35PrC4UZJJJgDUMv/xoz4R9HA9hidZ9HmXSgte6B+a8="; + sha256 = "Ys77z5BoeQEOYe1h5ITEuVtVn6Uug9zQjrCBxLQOrSs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/quantlib/default.nix b/pkgs/development/libraries/quantlib/default.nix new file mode 100644 index 000000000000..d2cda30b5da7 --- /dev/null +++ b/pkgs/development/libraries/quantlib/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +}: + +stdenv.mkDerivation rec { + pname = "quantlib"; + version = "1.29"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "lballabio"; + repo = "QuantLib"; + rev = "QuantLib-v${version}"; + sha256 = "sha256-TpVn3zPru/GtdNqDH45YdOkm7fkJzv/qay9SY3J6Jiw="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost ]; + + meta = with lib; { + description = "A free/open-source library for quantitative finance"; + homepage = "https://quantlib.org"; + platforms = platforms.unix; + license = licenses.bsd3; + maintainers = with maintainers; [ candyc1oud ]; + }; +} diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index 16ad5f3534df..f43a91766524 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { pname = "quarto"; - version = "1.1.251"; + version = "1.2.313"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-linux-amd64.tar.gz"; - sha256 = "sha256-VEYUEI4xzQPXlyTbCThAW2npBCZNPDJ5x2cWnkNz7RE="; + sha256 = "sha256-l8i/s9OuG9Fz+i1PcdSqP9X8stY6LTUcIfdE2gaePac="; }; nativeBuildInputs = [ @@ -27,6 +27,13 @@ stdenv.mkDerivation rec { ./fix-deno-path.patch ]; + postPatch = '' + # Compat for Deno >=1.26 + substituteInPlace bin/quarto.js \ + --replace 'Deno.setRaw(stdin.rid, ' 'Deno.stdin.setRaw(' \ + --replace 'Deno.setRaw(Deno.stdin.rid, ' 'Deno.stdin.setRaw(' + ''; + dontStrip = true; preFixup = '' diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 610f408e4419..31bcdc374d7a 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; + outputs = [ "out" "dev" ]; + meta = with lib; { description = "Provides access to ZIP archives from Qt programs"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix index 1a4fcca9d9b0..440d52d08f81 100644 --- a/pkgs/development/libraries/quesoglc/default.nix +++ b/pkgs/development/libraries/quesoglc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { provides Unicode support and is designed to be easily ported to any platform that supports both FreeType and the OpenGL API. ''; - homepage = "http://quesoglc.sourceforge.net/"; + homepage = "https://quesoglc.sourceforge.net/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/qxlsx/default.nix b/pkgs/development/libraries/qxlsx/default.nix index b077b77517b8..6251689d0e23 100644 --- a/pkgs/development/libraries/qxlsx/default.nix +++ b/pkgs/development/libraries/qxlsx/default.nix @@ -7,24 +7,18 @@ stdenv.mkDerivation rec { pname = "qxlsx"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "QtExcel"; repo = "QXlsx"; rev = "v${version}"; - hash = "sha256-01G7eJRrnee/acEeobYAYMY+93y+I0ASOTVRGuO+IcA="; + hash = "sha256-T+PUeml4O6uwY6DCAsBer4gDo+nrSGGus+yQv02CJcE="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase ]; - # Don't force Qt definitions onto users: https://github.com/QtExcel/QXlsx/commit/8e83402d - postPatch = '' - substituteInPlace QXlsx/CMakeLists.txt \ - --replace 'target_compile_definitions(QXlsx PUBLIC' 'target_compile_definitions(QXlsx PRIVATE' - ''; - preConfigure = '' cd QXlsx ''; diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index 72da2a34e752..e2dd81b13877 100644 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv, lz4 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv, lz4, lxd }: stdenv.mkDerivation rec { pname = "raft-canonical"; - version = "0.11.2"; + version = "0.17.1"; src = fetchFromGitHub { owner = "canonical"; repo = "raft"; - rev = "v${version}"; - sha256 = "050dwy34jh8dihfwfm0r1by2i3sy9crapipp9idw32idm79y4izb"; + rev = "refs/tags/v${version}"; + hash = "sha256-P6IYl6xcsqXw1ilt6HYw757FL2syy1XePBVGbPAlz6Q="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Ignore broken test, likely not causing huge breakage - # (https://github.com/canonical/raft/issues/292) - postPatch = '' - substituteInPlace test/integration/test_uv_tcp_connect.c --replace \ - "TEST(tcp_connect, closeDuringHandshake, setUp, tearDownDeps, 0, NULL)" \ - "TEST(tcp_connect, closeDuringHandshake, setUp, tearDownDeps, MUNIT_TEST_OPTION_TODO, NULL)" - ''; + patches = [ + # network tests either hang indefinitely, or fail outright + ./disable-net-tests.patch + + # missing dir check is flaky + ./disable-missing-dir-test.patch + ]; preConfigure = '' substituteInPlace configure --replace /usr/bin/ " " @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; + passthru.tests = { + inherit lxd; + }; + meta = with lib; { description = '' Fully asynchronous C implementation of the Raft consensus protocol @@ -46,6 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/canonical/raft"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ wucke13 ]; + maintainers = with maintainers; [ wucke13 adamcstephens ]; }; } diff --git a/pkgs/development/libraries/raft-canonical/disable-missing-dir-test.patch b/pkgs/development/libraries/raft-canonical/disable-missing-dir-test.patch new file mode 100644 index 000000000000..ddfec9b22e14 --- /dev/null +++ b/pkgs/development/libraries/raft-canonical/disable-missing-dir-test.patch @@ -0,0 +1,23 @@ +diff --git a/test/unit/test_uv_fs.c b/test/unit/test_uv_fs.c +index 638c39c..c8758d2 100644 +--- a/test/unit/test_uv_fs.c ++++ b/test/unit/test_uv_fs.c +@@ -40,18 +40,6 @@ TEST(UvFsCheckDir, exists, DirSetUp, DirTearDown, 0, NULL) + return MUNIT_OK; + } + +-/* If the directory doesn't exist, it an error is returned. */ +-TEST(UvFsCheckDir, doesNotExist, DirSetUp, DirTearDown, 0, NULL) +-{ +- const char *parent = data; +- char errmsg[RAFT_ERRMSG_BUF_SIZE]; +- char dir[128]; +- sprintf(errmsg, "%s/sub", parent); +- sprintf(errmsg, "directory '%s' does not exist", dir); +- CHECK_DIR_ERROR(dir, RAFT_NOTFOUND, errmsg); +- return MUNIT_OK; +-} +- + /* If the process can't access the directory, an error is returned. */ + TEST(UvFsCheckDir, permissionDenied, NULL, NULL, 0, NULL) + { diff --git a/pkgs/development/libraries/raft-canonical/disable-net-tests.patch b/pkgs/development/libraries/raft-canonical/disable-net-tests.patch new file mode 100644 index 000000000000..7c8be29feafd --- /dev/null +++ b/pkgs/development/libraries/raft-canonical/disable-net-tests.patch @@ -0,0 +1,16 @@ +diff --git a/Makefile.am b/Makefile.am +index 2137932..93abdb6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -198,11 +198,7 @@ test_integration_uv_SOURCES = \ + test/integration/test_uv_bootstrap.c \ + test/integration/test_uv_load.c \ + test/integration/test_uv_recover.c \ +- test/integration/test_uv_recv.c \ +- test/integration/test_uv_send.c \ + test/integration/test_uv_set_term.c \ +- test/integration/test_uv_tcp_connect.c \ +- test/integration/test_uv_tcp_listen.c \ + test/integration/test_uv_snapshot_put.c \ + test/integration/test_uv_truncate.c \ + test/integration/test_uv_work.c diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 9adfa1a9eb83..d1524024dd4e 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,19 +7,15 @@ stdenv.mkDerivation rec { pname = "rapidfuzz-cpp"; - version = "1.10.1"; + version = "1.10.4"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${version}"; - hash = "sha256-c9ESzsDcoUw5XAEZDHdG8jazjI5Oyqic1gaT0qGQsbI="; + hash = "sha256-I7MdeLs+J5a57ypgUJIW0/pSFPzK4nZA4ZrVRdKX7J4="; }; - patches = [ - ./dont-fetch-project-options.patch - ]; - nativeBuildInputs = [ cmake ]; @@ -33,7 +29,7 @@ stdenv.mkDerivation rec { "-include algorithm" ]; - checkInputs = [ + nativeCheckInputs = [ catch2_3 ]; diff --git a/pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch b/pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch deleted file mode 100644 index ab88c530d400..000000000000 --- a/pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 5ba4464..ad72319 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -12,39 +12,10 @@ else() - FetchContent_MakeAvailable(Catch2) - endif() - --# include aminya & jason turner's C++ best practices recommended cmake project utilities --include(FetchContent) --FetchContent_Declare(_project_options URL https://github.com/aminya/project_options/archive/refs/tags/v0.20.0.zip) --FetchContent_MakeAvailable(_project_options) --include(${_project_options_SOURCE_DIR}/Index.cmake) -- --project_options( -- # ENABLE_CACHE -- # ENABLE_CONAN -- WARNINGS_AS_ERRORS -- # ENABLE_CPPCHECK -- # ENABLE_CLANG_TIDY -- # ENABLE_INCLUDE_WHAT_YOU_USE -- # ENABLE_COVERAGE -- # ENABLE_PCH -- # PCH_HEADERS -- # ENABLE_DOXYGEN -- # ENABLE_IPO -- # ENABLE_USER_LINKER -- # ENABLE_BUILD_WITH_TIME_TRACE -- # ENABLE_UNITY -- # ENABLE_SANITIZER_ADDRESS -- # ENABLE_SANITIZER_LEAK -- # ENABLE_SANITIZER_UNDEFINED_BEHAVIOR -- # ENABLE_SANITIZER_THREAD -- # ENABLE_SANITIZER_MEMORY -- # CLANG_WARNINGS "-Weverything" --) -- - function(rapidfuzz_add_test test) - add_executable(test_${test} tests-${test}.cpp) - target_link_libraries(test_${test} ${PROJECT_NAME}) -- target_link_libraries(test_${test} Catch2::Catch2WithMain project_warnings) -+ target_link_libraries(test_${test} Catch2::Catch2WithMain) - add_test(NAME ${test} COMMAND test_${test}) - endfunction() - -diff --git a/test/distance/CMakeLists.txt b/test/distance/CMakeLists.txt -index 2a70054..7a43c88 100644 ---- a/test/distance/CMakeLists.txt -+++ b/test/distance/CMakeLists.txt -@@ -1,7 +1,7 @@ - function(rapidfuzz_add_test test) - add_executable(test_${test} tests-${test}.cpp) - target_link_libraries(test_${test} ${PROJECT_NAME}) -- target_link_libraries(test_${test} Catch2::Catch2WithMain project_warnings) -+ target_link_libraries(test_${test} Catch2::Catch2WithMain) - add_test(NAME ${test} COMMAND test_${test}) - endfunction() - diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index ac2d7e0b5f55..b67824b5cc55 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -5,6 +5,7 @@ , pkg-config , cmake , gtest +, valgrind }: stdenv.mkDerivation rec { @@ -36,25 +37,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; - cmakeFlags = [ - "-DGTEST_SOURCE_DIR=${gtest.dev}/include" - ] ++ lib.optionals (!doCheck) [ - "-DRAPIDJSON_BUILD_TESTS=OFF" - ]; + # for tests, adding gtest to checkInputs does not work + # https://github.com/NixOS/nixpkgs/pull/212200 + buildInputs = [ gtest ]; + cmakeFlags = [ "-DGTEST_SOURCE_DIR=${gtest.dev}/include" ]; - checkInputs = [ - gtest - ]; - - checkPhase = '' - runHook preCheck - - ctest -E '.*valgrind.*' - - runHook postCheck - ''; - - doCheck = !stdenv.hostPlatform.isStatic; + nativeCheckInputs = [ valgrind ]; + doCheck = !stdenv.hostPlatform.isStatic && !stdenv.isDarwin; meta = with lib; { description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/development/libraries/rapidxml/default.nix index e5ae16087cbd..3a353b7a2bda 100644 --- a/pkgs/development/libraries/rapidxml/default.nix +++ b/pkgs/development/libraries/rapidxml/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast XML DOM-style parser in C++"; - homepage = "http://rapidxml.sourceforge.net/"; + homepage = "https://rapidxml.sourceforge.net/"; license = licenses.boost; platforms = platforms.unix; maintainers = with maintainers; [ cpages ]; diff --git a/pkgs/development/libraries/rccl/default.nix b/pkgs/development/libraries/rccl/default.nix index 440705b2c017..d941cb19998e 100644 --- a/pkgs/development/libraries/rccl/default.nix +++ b/pkgs/development/libraries/rccl/default.nix @@ -1,24 +1,19 @@ { lib , stdenv , fetchFromGitHub +, rocmUpdateScript , cmake , rocm-cmake -, rocm-runtime -, rocm-device-libs -, rocm-comgr , rocm-smi , hip , gtest -, chrpath ? null +, chrpath , buildTests ? false }: -assert buildTests -> chrpath != null; - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rccl"; - rocmVersion = "5.3.1"; - version = "2.12.10-${rocmVersion}"; + version = "5.4.2"; outputs = [ "out" @@ -29,8 +24,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rccl"; - rev = "rocm-${rocmVersion}"; - hash = "sha256-whRXGD8oINDYhFs8+hEWKWoGNqacGlyy7xi8peA8Qsk="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-hQTzaiPMo5FAVScmxV0iNhy80uJ1xvx/kzlbfwROOs4="; }; nativeBuildInputs = [ @@ -40,9 +35,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - rocm-runtime - rocm-device-libs - rocm-comgr rocm-smi gtest ] ++ lib.optionals buildTests [ @@ -74,11 +66,18 @@ stdenv.mkDerivation rec { rmdir $out/bin ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + meta = with lib; { description = "ROCm communication collectives library"; homepage = "https://github.com/ROCmSoftwarePlatform/rccl"; license = with licenses; [ bsd2 bsd3 ]; - maintainers = with maintainers; [ Madouura ]; - broken = rocmVersion != hip.version; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor hip.version; }; -} +}) diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index 857da102bb8c..dafc91e6dcfa 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "re2"; - version = "2022-06-01"; + version = "2022-12-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - hash = "sha256-UontAjOXpnPcOgoFHjf+1WSbCR7h58/U7nn4meT200Y="; + hash = "sha256-RmPXfavSKVnnl/RJ5aTjc/GbkPz+EXiFg1n5e4s6wjw="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/readline/8.1.nix b/pkgs/development/libraries/readline/8.2.nix similarity index 85% rename from pkgs/development/libraries/readline/8.1.nix rename to pkgs/development/libraries/readline/8.2.nix index 35835c1a1436..0fedcdc9397f 100644 --- a/pkgs/development/libraries/readline/8.1.nix +++ b/pkgs/development/libraries/readline/8.2.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "readline"; - version = "8.1p${toString (builtins.length upstreamPatches)}"; + version = "8.2p${toString (builtins.length upstreamPatches)}"; src = fetchurl { url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz"; - sha256 = "00ibp0n9crbwx15k9vvckq5wsipw98b1px8pd8i34chy2gpb9kpq"; + sha256 = "sha256-P+txcfFqhO6CyhijbXub4QmlLAT0kqBTMx19EJUAfDU="; }; outputs = [ "out" "dev" "man" "doc" "info" ]; @@ -20,15 +20,15 @@ stdenv.mkDerivation rec { (let patch = nr: sha256: fetchurl { - url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline81-${nr}"; + url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline82-${nr}"; inherit sha256; }; in - import ./readline-8.1-patches.nix patch); + import ./readline-8.2-patches.nix patch); patches = [ ./link-against-ncurses.patch - ./no-arch_only-6.3.patch + ./no-arch_only-8.2.patch ] ++ upstreamPatches; @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dtzWill ]; platforms = platforms.unix; - branch = "8.1"; + branch = "8.2"; }; } diff --git a/pkgs/development/libraries/readline/no-arch_only-8.2.patch b/pkgs/development/libraries/readline/no-arch_only-8.2.patch new file mode 100644 index 000000000000..06f01ec0891f --- /dev/null +++ b/pkgs/development/libraries/readline/no-arch_only-8.2.patch @@ -0,0 +1,13 @@ +diff -ru -x '*~' readline-6.3-orig/support/shobj-conf readline-6.3/support/shobj-conf +--- support/shobj-conf 2014-02-24 03:06:29.000000000 +0100 ++++ support/shobj-conf 2014-07-22 11:18:52.000000000 +0200 +@@ -159,9 +159,6 @@ + # Darwin 8 == Mac OS X 10.4; Mac OS X 10.N == Darwin N+4 + *) + case "${host_os}" in +- darwin[89]*|darwin1[012]*) +- SHOBJ_ARCHFLAGS= +- ;; + *) # Mac OS X 10.9 (Mavericks) and later + SHOBJ_ARCHFLAGS= + # for 32 and 64bit universal library diff --git a/pkgs/development/libraries/readline/readline-8.1-patches.nix b/pkgs/development/libraries/readline/readline-8.1-patches.nix deleted file mode 100644 index b2aaadf0e9b5..000000000000 --- a/pkgs/development/libraries/readline/readline-8.1-patches.nix +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -(patch "001" "0i4ikdqgcjnb40y2ss3lm09rq56zih5rzma3bib50dk3d1d4cak8") -(patch "002" "1p15sfx5xg5k4lam12lyd0givk7dfjddqpnb1jdp3c4clray0nz5") -] diff --git a/pkgs/development/libraries/readline/readline-8.2-patches.nix b/pkgs/development/libraries/readline/readline-8.2-patches.nix new file mode 100644 index 000000000000..48d2bd14badb --- /dev/null +++ b/pkgs/development/libraries/readline/readline-8.2-patches.nix @@ -0,0 +1,5 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +(patch "001" "1xxgfgr6hn3ads8m8xsrdi1kbx1f3s69k0danpd9x4haqhg7zydv") +] diff --git a/pkgs/development/libraries/redis-plus-plus/default.nix b/pkgs/development/libraries/redis-plus-plus/default.nix index 61e593d28c93..b064297afdd1 100644 --- a/pkgs/development/libraries/redis-plus-plus/default.nix +++ b/pkgs/development/libraries/redis-plus-plus/default.nix @@ -8,13 +8,13 @@ assert enableShared || enableStatic; stdenv.mkDerivation rec { pname = "redis-plus-plus"; - version = "1.3.5"; + version = "1.3.7"; src = fetchFromGitHub { owner = "sewenew"; repo = "redis-plus-plus"; rev = version; - sha256 = "sha256-5tjadh3Ku7lrJn4tbi8TjTH6N0+QB2ER9xuO51cK/LU="; + sha256 = "sha256-QCNN85syxw2EGPdyTV3bL0txcHl7t2YhsKwK9lgnexY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index c6669edbc164..58863d6e2642 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "resolv_wrapper"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { url = "mirror://samba/cwrap/resolv_wrapper-${version}.tar.gz"; - sha256 = "sha256-Rgrn/V5TSFvn3ZmlXFki8csWNrnoghmB1JrRZQfIoHQ="; + sha256 = "sha256-+8MPd9o+EuzU72bM9at34LdEkwzNiQYkBAgvkoqOwuA="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/rlottie/default.nix b/pkgs/development/libraries/rlottie/default.nix index 6f641bd6a600..8cc4e3504408 100644 --- a/pkgs/development/libraries/rlottie/default.nix +++ b/pkgs/development/libraries/rlottie/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config ]; + NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-U__ARM_NEON__"; + meta = with lib; { homepage = "https://github.com/Samsung/rlottie"; description = "A platform independent standalone c++ library for rendering vector based animations and art in realtime"; diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/development/libraries/robin-map/default.nix index c0d2e73f94e6..b4c865dbd11b 100644 --- a/pkgs/development/libraries/robin-map/default.nix +++ b/pkgs/development/libraries/robin-map/default.nix @@ -1,24 +1,28 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake }: stdenv.mkDerivation rec { pname = "robin-map"; - version = "1.0.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "Tessil"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-4OW7PHow+O7R4t5+6iPV3E+1+6XPhqxrL1LQZitmCzQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-axVMJHTnGW2c4kGcYhEEAvKbVKYA2oxiYfwjiz7xh6Q="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; meta = with lib; { - homepage = "https://github.com/Tessil/robin-map"; description = "C++ implementation of a fast hash map and hash set using robin hood hashing"; + homepage = "https://github.com/Tessil/robin-map"; + changelog = "https://github.com/Tessil/robin-map/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/rocalution/default.nix b/pkgs/development/libraries/rocalution/default.nix new file mode 100644 index 000000000000..27d6f01c6bf9 --- /dev/null +++ b/pkgs/development/libraries/rocalution/default.nix @@ -0,0 +1,115 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-cmake +, rocblas +, rocsparse +, rocprim +, rocrand +, hip +, git +, openmp +, openmpi +, gtest +, buildTests ? false +, buildBenchmarks ? false +, buildSamples ? false +, gpuTargets ? [ ] # gpuTargets = [ "gfx803" "gfx900:xnack-" "gfx906:xnack-" ... ] +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rocalution"; + version = "5.4.2"; + + outputs = [ + "out" + ] ++ lib.optionals buildTests [ + "test" + ] ++ lib.optionals buildBenchmarks [ + "benchmark" + ] ++ lib.optionals buildSamples [ + "sample" + ]; + + src = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "rocALUTION"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-jovhodhNa7tr1bSqpZCKI/9xF7Ie96JB+giqAEfis2k="; + }; + + nativeBuildInputs = [ + cmake + rocm-cmake + hip + git + ]; + + buildInputs = [ + rocblas + rocsparse + rocprim + rocrand + openmp + openmpi + ] ++ lib.optionals buildTests [ + gtest + ]; + + cmakeFlags = [ + "-DCMAKE_CXX_COMPILER=hipcc" + "-DROCM_PATH=${hip}" + "-DHIP_ROOT_DIR=${hip}" + "-DSUPPORT_HIP=ON" + "-DSUPPORT_OMP=ON" + "-DSUPPORT_MPI=ON" + "-DBUILD_CLIENTS_SAMPLES=${if buildSamples then "ON" else "OFF"}" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals (gpuTargets != [ ]) [ + "-DAMDGPU_TARGETS=${lib.strings.concatStringsSep ";" gpuTargets}" + ] ++ lib.optionals buildTests [ + "-DBUILD_CLIENTS_TESTS=ON" + ] ++ lib.optionals buildBenchmarks [ + "-DBUILD_CLIENTS_BENCHMARKS=ON" + ]; + + postInstall = lib.optionalString buildTests '' + mkdir -p $test/bin + mv $out/bin/rocalution-test $test/bin + '' + lib.optionalString buildBenchmarks '' + mkdir -p $benchmark/bin + mv $out/bin/rocalution-bench $benchmark/bin + '' + lib.optionalString buildSamples '' + mkdir -p $sample/bin + mv clients/staging/* $sample/bin + rm $sample/bin/rocalution-test || true + rm $sample/bin/rocalution-bench || true + + patchelf --set-rpath \ + $out/lib:${lib.makeLibraryPath (finalAttrs.buildInputs ++ [ hip ])} \ + $sample/bin/* + '' + lib.optionalString (buildTests || buildBenchmarks) '' + rmdir $out/bin + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Iterative sparse solvers for ROCm"; + homepage = "https://github.com/ROCmSoftwarePlatform/rocALUTION"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor hip.version; + }; +}) diff --git a/pkgs/development/libraries/rocblas/default.nix b/pkgs/development/libraries/rocblas/default.nix index fd9b895c076c..ce76d92301f0 100644 --- a/pkgs/development/libraries/rocblas/default.nix +++ b/pkgs/development/libraries/rocblas/default.nix @@ -1,21 +1,19 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch +, rocmUpdateScript , cmake , rocm-cmake -, rocm-runtime -, rocm-device-libs -, rocm-comgr , hip , python3 -, tensile ? null -, msgpack ? null -, libxml2 ? null -, llvm ? null -, python3Packages ? null -, gtest ? null -, gfortran ? null +, tensile +, msgpack +, libxml2 +, gtest +, gfortran +, openmp +, amd-blis +, python3Packages , buildTensile ? true , buildTests ? false , buildBenchmarks ? false @@ -27,41 +25,25 @@ , gpuTargets ? [ "all" ] }: -assert buildTensile -> tensile != null; -assert buildTensile -> msgpack != null; -assert buildTensile -> libxml2 != null; -assert buildTensile -> llvm != null; -assert buildTensile -> python3Packages != null; -assert buildTests -> gtest != null; -assert buildTests -> gfortran != null; - -# Tests and benchmarks are a can of worms that I will tackle in a different PR -# It involves completely rewriting the amd-blis derivation -assert buildTests == false; -assert buildBenchmarks == false; - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocblas"; - rocmVersion = "5.3.1"; - version = "2.45.0-${rocmVersion}"; + version = "5.4.2"; + + outputs = [ + "out" + ] ++ lib.optionals buildTests [ + "test" + ] ++ lib.optionals buildBenchmarks [ + "benchmark" + ]; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocBLAS"; - rev = "rocm-${rocmVersion}"; - hash = "sha256-GeeICEI1dNE6D+nUUlBtUncLkPowAa5n+bsy160EtaU="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-4art8/KwH2KDLwSYcyzn/m/xwdg5wQQvgHks73aB+60="; }; - # We currently need this patch due to faulty toolchain includes - # See: https://github.com/ROCmSoftwarePlatform/rocBLAS/issues/1277 - patches = [ - (fetchpatch { - name = "only-std_norm-from-rocblas_complex.patch"; - url = "https://github.com/ROCmSoftwarePlatform/rocBLAS/commit/44b99c6df26002139ca9ec68ee1fc8899c7b001f.patch"; - hash = "sha256-vSZkVYY951fqfOThKFqnYBasWMblS6peEJZ6sFMCk9k="; - }) - ]; - nativeBuildInputs = [ cmake rocm-cmake @@ -69,26 +51,26 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - rocm-runtime - rocm-device-libs - rocm-comgr python3 ] ++ lib.optionals buildTensile [ msgpack libxml2 - llvm - python3Packages.pyyaml python3Packages.msgpack ] ++ lib.optionals buildTests [ gtest + ] ++ lib.optionals (buildTests || buildBenchmarks) [ gfortran + openmp + amd-blis + ] ++ lib.optionals (buildTensile || buildTests || buildBenchmarks) [ + python3Packages.pyyaml ]; cmakeFlags = [ "-DCMAKE_C_COMPILER=hipcc" "-DCMAKE_CXX_COMPILER=hipcc" "-Dpython=python3" - "-DAMDGPU_TARGETS=${lib.strings.concatStringsSep ";" gpuTargets}" + "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" "-DBUILD_WITH_TENSILE=${if buildTensile then "ON" else "OFF"}" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 @@ -108,12 +90,12 @@ stdenv.mkDerivation rec { "-DBUILD_CLIENTS_TESTS=ON" ] ++ lib.optionals buildBenchmarks [ "-DBUILD_CLIENTS_BENCHMARKS=ON" + ] ++ lib.optionals (buildTests || buildBenchmarks) [ + "-DCMAKE_CXX_FLAGS=-I${amd-blis}/include/blis" ]; # Tensile REALLY wants to write to the nix directory if we include it normally - # We need to manually fixup the path so tensile will generate .co and .dat files postPatch = lib.optionalString buildTensile '' - export PATH=${llvm}/bin:$PATH cp -a ${tensile} tensile chmod +w -R tensile @@ -126,11 +108,30 @@ stdenv.mkDerivation rec { --replace "virtualenv_install(\''${Tensile_TEST_LOCAL_PATH})" "" ''; + postInstall = lib.optionalString buildTests '' + mkdir -p $test/bin + cp -a $out/bin/* $test/bin + rm $test/bin/*-bench || true + '' + lib.optionalString buildBenchmarks '' + mkdir -p $benchmark/bin + cp -a $out/bin/* $benchmark/bin + rm $benchmark/bin/*-test || true + '' + lib.optionalString (buildTests || buildBenchmarks ) '' + rm -rf $out/bin + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + meta = with lib; { description = "BLAS implementation for ROCm platform"; homepage = "https://github.com/ROCmSoftwarePlatform/rocBLAS"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; - broken = rocmVersion != hip.version; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor hip.version; }; -} +}) diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 325e7a9105fe..b6a7b113d0a8 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -1,19 +1,20 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch -, writeScript +, rocmUpdateScript , rocm-comgr }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocclr"; - version = "5.3.1"; + version = "5.4.2"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; - rev = "rocm-${version}"; - hash = "sha256-dmL9krI/gHGQdOZ53+bQ7WjKcmJ+fZZP0lzF8ITLT4E="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-tYFoGafOsJYnRQaOLAaFix6tPD0QPTidOtOicPxP2Vk="; }; patches = [ @@ -26,37 +27,38 @@ stdenv.mkDerivation rec { }) ]; - prePatch = '' + postPatch = '' substituteInPlace device/comgrctx.cpp \ --replace "libamd_comgr.so" "${rocm-comgr}/lib/libamd_comgr.so" ''; - buildPhase = ""; + dontConfigure = true; + dontBuild = true; installPhase = '' runHook preInstall mkdir -p $out - cp -r * $out/ + cp -a * $out/ runHook postInstall ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl -sL "https://api.github.com/repos/ROCm-Developer-Tools/ROCclr/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" - update-source-version rocclr "$version" - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "Source package of the Radeon Open Compute common language runtime"; homepage = "https://github.com/ROCm-Developer-Tools/ROCclr"; license = licenses.mit; - maintainers = with maintainers; [ lovesegfault Flakebi ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; # rocclr seems to have some AArch64 ifdefs, but does not seem # to be supported yet by the build infrastructure. Recheck in # the future. platforms = [ "x86_64-linux" ]; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; -} +}) diff --git a/pkgs/development/libraries/rocdbgapi/default.nix b/pkgs/development/libraries/rocdbgapi/default.nix new file mode 100644 index 000000000000..7a2afc79f541 --- /dev/null +++ b/pkgs/development/libraries/rocdbgapi/default.nix @@ -0,0 +1,100 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-cmake +, git +, rocm-comgr +, rocm-runtime +, texlive +, doxygen +, graphviz +, buildDocs ? true +}: + +let + latex = lib.optionalAttrs buildDocs texlive.combine { + inherit (texlive) scheme-small + latexmk + varwidth + multirow + hanging + adjustbox + collectbox + stackengine + enumitem + alphalph + wasysym + sectsty + tocloft + newunicodechar + etoc + helvetic + wasy + courier; + }; +in stdenv.mkDerivation (finalAttrs: { + pname = "rocdbgapi"; + version = "5.4.2"; + + outputs = [ + "out" + ] ++ lib.optionals buildDocs [ + "doc" + ]; + + src = fetchFromGitHub { + owner = "ROCm-Developer-Tools"; + repo = "ROCdbgapi"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-KoFa6JzoEPT5/ns9X/hMfu8bOh29HD9n2qGJ3gzhiBA="; + }; + + nativeBuildInputs = [ + cmake + rocm-cmake + git + ] ++ lib.optionals buildDocs [ + latex + doxygen + graphviz + ]; + + buildInputs = [ + rocm-comgr + rocm-runtime + ]; + + # Unfortunately, it seems like we have to call make on this manually + postBuild = lib.optionalString buildDocs '' + export HOME=$(mktemp -d) + make -j$NIX_BUILD_CORES doc + ''; + + postInstall = '' + substituteInPlace $out/lib/cmake/amd-dbgapi/amd-dbgapi-config.cmake \ + --replace "/build/source/build/" "" + + substituteInPlace $out/lib/cmake/amd-dbgapi/amd-dbgapi-targets.cmake \ + --replace "/build/source/build" "$out" + '' + lib.optionalString buildDocs '' + mv $out/share/html/amd-dbgapi $doc/share/doc/amd-dbgapi/html + rmdir $out/share/html + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Debugger support for control of execution and inspection state"; + homepage = "https://github.com/ROCm-Developer-Tools/ROCdbgapi"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + }; +}) diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix index d2596c064010..6e5795cd3043 100644 --- a/pkgs/development/libraries/rocfft/default.nix +++ b/pkgs/development/libraries/rocfft/default.nix @@ -1,115 +1,173 @@ { lib , stdenv , fetchFromGitHub +, rocmUpdateScript +, runCommand , cmake , rocm-cmake -, rocm-runtime -, rocm-device-libs -, rocm-comgr +, rocrand , hip +, openmp , sqlite , python3 -, gtest ? null -, boost ? null -, fftw ? null -, fftwFloat ? null -, llvmPackages ? null +, gtest +, boost +, fftw +, fftwFloat , buildTests ? false , buildBenchmarks ? false }: -assert buildTests -> gtest != null; -assert buildBenchmarks -> fftw != null; -assert buildBenchmarks -> fftwFloat != null; -assert (buildTests || buildBenchmarks) -> boost != null; -assert (buildTests || buildBenchmarks) -> llvmPackages != null; +let + # This is over 3GB, to allow hydra caching we separate it + rf = stdenv.mkDerivation (finalAttrs: { + pname = "rocfft"; + version = "5.4.2"; -stdenv.mkDerivation rec { - pname = "rocfft"; - rocmVersion = "5.3.1"; - version = "1.0.18-${rocmVersion}"; + outputs = [ + "out" + ] ++ lib.optionals buildTests [ + "test" + ] ++ lib.optionals buildBenchmarks [ + "benchmark" + ]; - outputs = [ - "out" - ] ++ lib.optionals buildTests [ - "test" - ] ++ lib.optionals buildBenchmarks [ - "benchmark" - ]; + src = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "rocFFT"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-NsYeEoBQ/0z31ZQ32l7N+qavWEVkH37snkTHntot7nE="; + }; - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "rocFFT"; - rev = "rocm-${rocmVersion}"; - hash = "sha256-jb2F1fRe+YLloYJ/KtzrptUDhmdBDBtddeW/g55owKM="; - }; + nativeBuildInputs = [ + cmake + rocm-cmake + hip + ]; - nativeBuildInputs = [ - cmake - rocm-cmake - hip - ]; + buildInputs = [ + sqlite + python3 + ] ++ lib.optionals buildTests [ + gtest + ] ++ lib.optionals (buildTests || buildBenchmarks) [ + rocrand + boost + fftw + fftwFloat + openmp + ]; - buildInputs = [ - rocm-runtime - rocm-device-libs - rocm-comgr - sqlite - python3 - ] ++ lib.optionals buildTests [ - gtest - ] ++ lib.optionals (buildTests || buildBenchmarks) [ - boost - fftw - fftwFloat - llvmPackages.openmp - ]; + propogatedBuildInputs = lib.optionals buildTests [ + fftw + fftwFloat + ]; - propogatedBuildInputs = lib.optionals buildTests [ - fftw - fftwFloat - ]; + cmakeFlags = [ + "-DCMAKE_C_COMPILER=hipcc" + "-DCMAKE_CXX_COMPILER=hipcc" + "-DUSE_HIP_CLANG=ON" + "-DSQLITE_USE_SYSTEM_PACKAGE=ON" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals buildTests [ + "-DBUILD_CLIENTS_TESTS=ON" + ] ++ lib.optionals buildBenchmarks [ + "-DBUILD_CLIENTS_RIDER=ON" + "-DBUILD_CLIENTS_SAMPLES=ON" + ]; - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-DUSE_HIP_CLANG=ON" - "-DSQLITE_USE_SYSTEM_PACKAGE=ON" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ] ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_RIDER=ON" - "-DBUILD_CLIENTS_SAMPLES=ON" - ]; + postInstall = lib.optionalString buildTests '' + mkdir -p $test/{bin,lib/fftw} + cp -a $out/bin/* $test/bin + ln -s ${fftw}/lib/libfftw*.so $test/lib/fftw + ln -s ${fftwFloat}/lib/libfftw*.so $test/lib/fftw + rm -r $out/lib/fftw + rm $test/bin/{rocfft_rtc_helper,*-rider} || true + '' + lib.optionalString buildBenchmarks '' + mkdir -p $benchmark/bin + cp -a $out/bin/* $benchmark/bin + rm $benchmark/bin/{rocfft_rtc_helper,*-test} || true + '' + lib.optionalString (buildTests || buildBenchmarks ) '' + mv $out/bin/rocfft_rtc_helper $out + rm -r $out/bin/* + mv $out/rocfft_rtc_helper $out/bin + ''; - postInstall = lib.optionalString buildTests '' - mkdir -p $test/{bin,lib/fftw} - cp -a $out/bin/* $test/bin - ln -s ${fftw}/lib/libfftw*.so $test/lib/fftw - ln -s ${fftwFloat}/lib/libfftw*.so $test/lib/fftw - rm -r $out/lib/fftw - rm $test/bin/{rocfft_rtc_helper,*-rider} || true - '' + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - cp -a $out/bin/* $benchmark/bin - rm $benchmark/bin/{rocfft_rtc_helper,*-test} || true - '' + lib.optionalString (buildTests || buildBenchmarks ) '' - mv $out/bin/rocfft_rtc_helper $out - rm -r $out/bin/* - mv $out/rocfft_rtc_helper $out/bin + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "FFT implementation for ROCm "; + homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor hip.version; + }; + }); + + rf-zero = runCommand "librocfft-device-0.so.0.1" { preferLocalBuild = true; } '' + cp -a ${rf}/lib/$name $out ''; - meta = with lib; { - description = "FFT implementation for ROCm "; - homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; - broken = rocmVersion != hip.version; - hydraPlatforms = [ ]; # rocFFT produces an extremely large output - }; + rf-one = runCommand "librocfft-device-1.so.0.1" { preferLocalBuild = true; } '' + cp -a ${rf}/lib/$name $out + ''; + + rf-two = runCommand "librocfft-device-2.so.0.1" { preferLocalBuild = true; } '' + cp -a ${rf}/lib/$name $out + ''; + + rf-three = runCommand "librocfft-device-3.so.0.1" { preferLocalBuild = true; } '' + cp -a ${rf}/lib/$name $out + ''; +in stdenv.mkDerivation { + inherit (rf) pname version outputs src passthru meta; + + dontUnpack = true; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp -as ${rf-zero} $out/lib/${rf-zero.name} + cp -as ${rf-one} $out/lib/${rf-one.name} + cp -as ${rf-two} $out/lib/${rf-two.name} + cp -as ${rf-three} $out/lib/${rf-three.name} + cp -an ${rf}/* $out + '' + lib.optionalString buildTests '' + cp -a ${rf.test} $test + '' + lib.optionalString buildBenchmarks '' + cp -a ${rf.benchmark} $benchmark + '' + '' + runHook postInstall + ''; + + # Fix paths + preFixup = '' + substituteInPlace $out/include/*.h $out/rocfft/include/*.h \ + --replace "${rf}" "$out" + + patchelf --set-rpath \ + $(patchelf --print-rpath $out/lib/librocfft.so | sed 's,${rf}/lib,'"$out/lib"',') \ + $out/lib/librocfft.so + '' + lib.optionalString buildTests '' + patchelf --set-rpath \ + $(patchelf --print-rpath $test/bin/rocfft-test | sed 's,${rf}/lib,'"$out/lib"',') \ + $test/bin/rocfft-test + '' + lib.optionalString buildBenchmarks '' + patchelf --set-rpath \ + $(patchelf --print-rpath $benchmark/bin/rocfft-rider | sed 's,${rf}/lib,'"$out/lib"',') \ + $benchmark/bin/rocfft-rider + ''; } diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index c915a3df521f..057baafdc610 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -11,17 +11,18 @@ , enableJemalloc ? false, jemalloc , enableLite ? false , enableShared ? !stdenv.hostPlatform.isStatic +, sse42Support ? stdenv.hostPlatform.sse4_2Support }: stdenv.mkDerivation rec { pname = "rocksdb"; - version = "7.7.3"; + version = "7.9.2"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Np3HPTZYzyoPOKL0xgsLzcvOkceFiEQd+1nyGbg4BHo="; + sha256 = "sha256-5P7IqJ14EZzDkbjaBvbix04ceGGdlWBuVFH/5dpD5VM="; }; nativeBuildInputs = [ cmake ninja ]; @@ -30,6 +31,11 @@ stdenv.mkDerivation rec { buildInputs = lib.optional enableJemalloc jemalloc; + outputs = [ + "out" + "tools" + ]; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move" + lib.optionalString stdenv.cc.isClang "-Wno-error=unused-private-field -faligned-allocation"; @@ -40,6 +46,7 @@ stdenv.mkDerivation rec { "-DWITH_BENCHMARK_TOOLS=0" "-DWITH_TESTS=1" "-DWITH_TOOLS=0" + "-DWITH_CORE_TOOLS=1" "-DWITH_BZ2=1" "-DWITH_LZ4=1" "-DWITH_SNAPPY=1" @@ -48,9 +55,7 @@ stdenv.mkDerivation rec { "-DWITH_GFLAGS=0" "-DUSE_RTTI=1" "-DROCKSDB_INSTALL_ON_WINDOWS=YES" # harmless elsewhere - (lib.optional - (stdenv.hostPlatform.isx86 && stdenv.hostPlatform.isLinux) - "-DFORCE_SSE42=1") + (lib.optional sse42Support "-DFORCE_SSE42=1") (lib.optional enableLite "-DROCKSDB_LITE=1") "-DFAIL_ON_WARNINGS=${if stdenv.hostPlatform.isMinGW then "NO" else "YES"}" ] ++ lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0"; @@ -58,6 +63,15 @@ stdenv.mkDerivation rec { # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]" hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "format"; + preInstall = '' + mkdir -p $tools/bin + cp tools/{ldb,sst_dump} $tools/bin/ + '' + lib.optionalString stdenv.isDarwin '' + ls -1 $tools/bin/* | xargs -I{} install_name_tool -change "@rpath/librocksdb.7.dylib" $out/lib/librocksdb.dylib {} + '' + lib.optionalString (stdenv.isLinux && enableShared) '' + ls -1 $tools/bin/* | xargs -I{} patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib {} + ''; + # Old version doesn't ship the .pc file, new version puts wrong paths in there. postFixup = '' if [ -f "$out"/lib/pkgconfig/rocksdb.pc ]; then diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 032584fa2599..8ec90b1f1e27 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -1,44 +1,56 @@ -{ lib, stdenv, fetchFromGitHub, writeScript, cmake, clang, rocm-device-libs, llvm }: +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-cmake +, rocm-device-libs +, libxml2 +}: -stdenv.mkDerivation rec { +let + llvmNativeTarget = + if stdenv.isx86_64 then "X86" + else if stdenv.isAarch64 then "AArch64" + else throw "Unsupported ROCm LLVM platform"; +in stdenv.mkDerivation (finalAttrs: { pname = "rocm-comgr"; - version = "5.3.1"; + version = "5.4.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; - rev = "rocm-${version}"; - hash = "sha256-LQyMhqcWm8zqt6138fnT7EOq/F8bG3Iuf04PTemVQmg="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-qLsrBTeSop7lIQv8gZDwgpvGZJOAq90zsvMi1QpfbAs="; }; - sourceRoot = "source/lib/comgr"; + patches = [ ./cmake.patch ]; + sourceRoot = "${finalAttrs.src.name}/lib/comgr"; - nativeBuildInputs = [ cmake ]; - - buildInputs = [ clang rocm-device-libs llvm ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=${clang}/bin/clang" - "-DCMAKE_CXX_COMPILER=${clang}/bin/clang++" - "-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm" - "-DLLD_INCLUDE_DIRS=${llvm}/include" - "-DLLVM_TARGETS_TO_BUILD=\"AMDGPU;X86\"" + nativeBuildInputs = [ + cmake + rocm-cmake ]; - patches = [ ./cmake.patch ]; + buildInputs = [ + rocm-device-libs + libxml2 + ]; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-CompilerSupport/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rocm-comgr "$version" - ''; + cmakeFlags = [ "-DLLVM_TARGETS_TO_BUILD=AMDGPU;X86" ]; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "APIs for compiling and inspecting AMDGPU code objects"; homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr"; license = licenses.ncsa; - maintainers = with maintainers; [ lovesegfault Flakebi ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; -} +}) diff --git a/pkgs/development/libraries/rocm-core/default.nix b/pkgs/development/libraries/rocm-core/default.nix new file mode 100644 index 000000000000..9f1a4ab4ccf5 --- /dev/null +++ b/pkgs/development/libraries/rocm-core/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, runCommand +, substituteAll +, cmake +}: + +let + rocm_version = with lib; concatStrings (intersperse "0" (splitString "." stdenv.cc.version)); +in stdenv.mkDerivation (finalAttrs: { + pname = "rocm-core"; + version = stdenv.cc.version; + + # Based on https://github.com/rocm-arch/rocm-arch/tree/ad0b15690d403e5822db062ffff4db3912de6669/rocm-core + src = let + rocm_major = lib.versions.major finalAttrs.version; + rocm_minor = lib.versions.minor finalAttrs.version; + rocm_patch = lib.versions.patch finalAttrs.version; + + cmake_lists = substituteAll { + inherit rocm_version; + src = ./src/CMakeLists.txt; + }; + + version_c = substituteAll { + inherit rocm_major rocm_minor rocm_patch; + src = ./src/rocm_version.c; + }; + + version_h = substituteAll { + inherit rocm_major rocm_minor rocm_patch; + src = ./src/rocm_version.h; + }; + in runCommand "rocm-core-${finalAttrs.version}-source" { preferLocalBuild = true; } '' + mkdir -p $out/rocm-core + ln -s ${cmake_lists} $out/CMakeLists.txt + ln -s ${version_c} $out/rocm_version.c + ln -s ${version_h} $out/rocm-core/rocm_version.h + ''; + + nativeBuildInputs = [ cmake ]; + + postInstall = '' + mkdir -p $out/include + cp -a ../rocm-core $out/include + ln -s $out/include/rocm-core/rocm_version.h $out/include + ln -s $out/lib/librocm-core.so.1.0.${rocm_version} $out/lib/librocm-core.so.1 + ''; + + meta = with lib; { + description = "ROCm core"; + homepage = "https://docs.amd.com"; + license = with licenses; [ ncsa ]; # See src/rocm_version.h + maintainers = teams.rocm.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/development/libraries/rocm-core/src/CMakeLists.txt b/pkgs/development/libraries/rocm-core/src/CMakeLists.txt new file mode 100644 index 000000000000..b2d9fc1f53b8 --- /dev/null +++ b/pkgs/development/libraries/rocm-core/src/CMakeLists.txt @@ -0,0 +1,5 @@ +cmake_minimum_required(VERSION 3.23) +project(rocm-core) +add_library(rocm-core SHARED rocm_version.c) +set_target_properties(rocm-core PROPERTIES VERSION "1.0.@rocm_version@") +install(TARGETS rocm-core LIBRARY DESTINATION lib) diff --git a/pkgs/development/libraries/rocm-core/src/rocm_version.c b/pkgs/development/libraries/rocm-core/src/rocm_version.c new file mode 100644 index 000000000000..a35dfc6a72c8 --- /dev/null +++ b/pkgs/development/libraries/rocm-core/src/rocm_version.c @@ -0,0 +1,10 @@ +#include "rocm-core/rocm_version.h" + +VerErrors getROCmVersion(unsigned int *Major, unsigned int *Minor, + unsigned int *Patch) { + *Major = @rocm_major@; + *Minor = @rocm_minor@; + *Patch = @rocm_patch@; + + return 0; +} diff --git a/pkgs/development/libraries/rocm-core/src/rocm_version.h b/pkgs/development/libraries/rocm-core/src/rocm_version.h new file mode 100644 index 000000000000..d112a68b8653 --- /dev/null +++ b/pkgs/development/libraries/rocm-core/src/rocm_version.h @@ -0,0 +1,82 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// The University of Illinois/NCSA +// Open Source License (NCSA) +// +// Copyright (c) 2014-2021, Advanced Micro Devices, Inc. All rights reserved. +// +// Developed by: +// +// AMD Research and AMD HSA Software Development +// +// Advanced Micro Devices, Inc. +// +// www.amd.com +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal with the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// - Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimers. +// - Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimers in +// the documentation and/or other materials provided with the distribution. +// - Neither the names of Advanced Micro Devices, Inc, +// nor the names of its contributors may be used to endorse or promote +// products derived from this Software without specific prior written +// permission. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS WITH THE SOFTWARE. +// +//////////////////////////////////////////////////////////////////////////////// + + +#ifndef _ROCM_VERSION_H_ +#define _ROCM_VERSION_H_ + + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + + +#define ROCM_VERSION_MAJOR @rocm_major@ +#define ROCM_VERSION_MINOR @rocm_minor@ +#define ROCM_VERSION_PATCH @rocm_patch@ + + +typedef enum { + VerSuccess=0, + VerIncorrecPararmeters, + VerValuesNotDefined, + VerErrorMAX //This should always be last value in the enumerations +} VerErrors; + + +// API for getting the verion +// Return val : VerErros : API execution status. The parameters are valid only when the exetution status is SUCCESS==0 +VerErrors getROCmVersion(unsigned int* Major, unsigned int* Minor, unsigned int* Patch) __attribute__((nonnull)) ; +// Usage : +// int mj=0,mn=0,p=0,ret=0; +// ret=getROCMVersion(&mj,&mn,&p); +// if(ret !=VerSuccess ) // error occured +// +// check for the values and +// + + +#ifdef __cplusplus +} // end extern "C" block +#endif + +#endif //_ROCM_VERSION_H_ header guard diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index d9ada30e155d..3fba6da7f537 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -1,46 +1,50 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript , cmake -, clang -, llvm +, rocm-cmake +, libxml2 }: -stdenv.mkDerivation rec { +let + llvmNativeTarget = + if stdenv.isx86_64 then "X86" + else if stdenv.isAarch64 then "AArch64" + else throw "Unsupported ROCm LLVM platform"; +in stdenv.mkDerivation (finalAttrs: { pname = "rocm-device-libs"; - version = "5.3.1"; + version = "5.4.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; - rev = "rocm-${version}"; - hash = "sha256-rKMe0B/pkDek/ZU37trnJNa8aqvlwxobPb1+VTx/bJU="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-8gxvgy2GlROxM5qKtZVu5Lxa1FmTIVlBTpfp8rxhNhk="; }; - nativeBuildInputs = [ cmake ]; - - buildInputs = [ clang llvm ]; - - cmakeFlags = [ - "-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm;${llvm}/lib/cmake/clang" - "-DLLVM_TARGETS_TO_BUILD='AMDGPU;X86'" - "-DCLANG=${clang}/bin/clang" - ]; - patches = [ ./cmake.patch ]; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-Device-Libs/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rocm-device-libs "$version" - ''; + nativeBuildInputs = [ + cmake + rocm-cmake + ]; + + buildInputs = [ libxml2 ]; + cmakeFlags = [ "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" ]; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "Set of AMD-specific device-side language runtime libraries"; homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs"; license = licenses.ncsa; - maintainers = with maintainers; [ lovesegfault Flakebi ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; -} +}) diff --git a/pkgs/development/libraries/rocm-opencl-icd/default.nix b/pkgs/development/libraries/rocm-opencl-icd/default.nix index 9b0f7ab9f81f..4602d3646e47 100644 --- a/pkgs/development/libraries/rocm-opencl-icd/default.nix +++ b/pkgs/development/libraries/rocm-opencl-icd/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, rocm-opencl-runtime }: +{ lib +, stdenv +, callPackage +, rocm-opencl-runtime +}: stdenv.mkDerivation rec { pname = "rocm-opencl-icd"; @@ -11,10 +15,12 @@ stdenv.mkDerivation rec { echo "${rocm-opencl-runtime}/lib/libamdocl64.so" > $out/etc/OpenCL/vendors/amdocl64.icd ''; + passthru.impureTests = { rocm-opencl = callPackage ./test.nix { }; }; + meta = with lib; { description = "OpenCL ICD definition for AMD GPUs using the ROCm stack"; license = licenses.mit; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocm-opencl-icd/test.nix b/pkgs/development/libraries/rocm-opencl-icd/test.nix new file mode 100644 index 000000000000..398a4818e7c3 --- /dev/null +++ b/pkgs/development/libraries/rocm-opencl-icd/test.nix @@ -0,0 +1,19 @@ +{ lib, makeImpureTest, clinfo, rocm-opencl-icd, rocm-smi }: +makeImpureTest { + name = "rocm-opencl"; + testedPackage = "rocm-opencl-icd"; + + nativeBuildInputs = [ clinfo rocm-smi ]; + + OCL_ICD_VENDORS = "${rocm-opencl-icd}/etc/OpenCL/vendors/"; + + testScript = '' + # Test fails if the number of platforms is 0 + clinfo | grep -E 'Number of platforms * [1-9]' + rocm-smi | grep -A1 GPU + ''; + + meta = with lib; { + maintainers = teams.rocm.members; + }; +} diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index cfbcab461d18..114245b7d715 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -1,57 +1,41 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript , addOpenGLRunpath , cmake -, rocm-cmake -, clang -, glew -, libglvnd -, libX11 -, llvm -, mesa -, numactl -, python3 -, rocclr , rocm-comgr -, rocm-device-libs , rocm-runtime -, rocm-thunk +, rocclr +, glew +, libX11 +, numactl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocm-opencl-runtime"; - version = "5.3.1"; + version = "5.4.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; - rev = "rocm-${version}"; - hash = "sha256-QvAF25Zfq9d1M/KIsr2S+Ggxzqw/MQ2OVcm9ZNfjTa8="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-E1+Y/fgp5b+7H1LN+O1fwVi0/XRCgvsiSxTY3u/q+8I="; }; - nativeBuildInputs = [ cmake rocm-cmake ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ - clang - glew - libglvnd - libX11 - llvm - mesa - numactl - python3 rocm-comgr - rocm-device-libs rocm-runtime - rocm-thunk + glew + libX11 + numactl ]; cmakeFlags = [ - "-DAMD_OPENCL_PATH=${src}" + "-DAMD_OPENCL_PATH=${finalAttrs.src}" "-DROCCLR_PATH=${rocclr}" - "-DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rocm/opencl" ]; dontStrip = true; @@ -68,18 +52,18 @@ stdenv.mkDerivation rec { --replace 'ICD_VENDOR_PATH' '"${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors/"' ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-OpenCL-Runtime/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" - update-source-version rocm-opencl-runtime "$version" - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "OpenCL runtime for AMD GPUs, part of the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"; license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ acowley lovesegfault Flakebi ]; + maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; -} +}) diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index cc08149ce287..345a8c8d25d6 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -1,36 +1,46 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub -, writeScript -, addOpenGLRunpath -, cmake +, rocmUpdateScript , pkg-config +, cmake , xxd -, elfutils -, libdrm -, llvm -, numactl , rocm-device-libs -, rocm-thunk }: +, rocm-thunk +, libelf +, libdrm +, numactl +, valgrind +, libxml2 +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocm-runtime"; - version = "5.3.1"; + version = "5.4.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; - rev = "rocm-${version}"; - hash = "sha256-26E7vA2JlC50zmpaQfDrFMlgjAqmfTdp9/A8g5caDqI="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-JkTXTQmdESHSFbA6HZdMK3pYEApz9aoAlMzdXayzdyY="; }; - sourceRoot = "source/src"; + sourceRoot = "${finalAttrs.src.name}/src"; - nativeBuildInputs = [ cmake pkg-config xxd ]; + nativeBuildInputs = [ + pkg-config + cmake + xxd + ]; - buildInputs = [ elfutils libdrm llvm numactl ]; - - cmakeFlags = [ "-DCMAKE_PREFIX_PATH=${rocm-thunk}" ]; + buildInputs = [ + rocm-thunk + libelf + libdrm + numactl + valgrind + libxml2 + ]; postPatch = '' patchShebangs image/blit_src/create_hsaco_ascii_file.sh @@ -45,20 +55,22 @@ stdenv.mkDerivation rec { ''; fixupPhase = '' - rm -rf $out/hsa + rm -rf $out/hsa/* + ln -s $out/{include,lib} $out/hsa ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCR-Runtime/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rocm-runtime "$version" - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "Platform runtime for ROCm"; homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ lovesegfault Flakebi ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; -} +}) diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index 5a7167e61671..a083f57722db 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -1,53 +1,58 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, writeScript -, cmake +, rocmUpdateScript , pkg-config +, cmake +, rocm-cmake , libdrm , numactl +, valgrind }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocm-thunk"; - version = "5.3.1"; + version = "5.4.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; - rev = "rocm-${version}"; - hash = "sha256-cM78Bx6uYsxhvdqSVNgmqOUYQnUJVCA7mNpRNNSFv6k="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-EU5toaKzVeZpdm/YhaQ0bXq0eoYwYQ5qGLUJzxgZVjE="; }; - preConfigure = '' - export cmakeFlags="$cmakeFlags " - ''; + nativeBuildInputs = [ + pkg-config + cmake + rocm-cmake + ]; - nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + libdrm + numactl + valgrind + ]; - buildInputs = [ libdrm numactl ]; + cmakeFlags = [ + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; - # https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/issues/75 - postPatch = '' - substituteInPlace libhsakmt.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - - postInstall = '' - cp -r $src/include $out - ''; - - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCT-Thunk-Interface/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" - update-source-version rocm-thunk "$version" - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "Radeon open compute thunk interface"; homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"; license = with licenses; [ bsd2 mit ]; - maintainers = with maintainers; [ lovesegfault Flakebi ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; -} +}) diff --git a/pkgs/development/libraries/rocmlir/default.nix b/pkgs/development/libraries/rocmlir/default.nix index bf4234a21503..b8dee1385436 100644 --- a/pkgs/development/libraries/rocmlir/default.nix +++ b/pkgs/development/libraries/rocmlir/default.nix @@ -1,42 +1,106 @@ { lib , stdenv , fetchFromGitHub +, rocmUpdateScript , cmake +, ninja , hip +, rocminfo +, git +, libxml2 +, libedit +, zlib +, ncurses , python3 +, buildRockCompiler ? false }: -stdenv.mkDerivation rec { +# Theoretically, we could have our MLIR have an output +# with the source and built objects so that we can just +# use it as the external LLVM repo for this +let + llvmNativeTarget = + if stdenv.isx86_64 then "X86" + else if stdenv.isAarch64 then "AArch64" + else throw "Unsupported ROCm LLVM platform"; +in stdenv.mkDerivation (finalAttrs: { pname = "rocmlir"; - rocmVersion = "5.3.1"; - # For some reason they didn't add a tag for 5.3.1, should be compatible, change to rocmVersion later - version = "5.3.0"; + version = "5.4.1"; + + outputs = [ + "out" + ] ++ lib.optionals (!buildRockCompiler) [ + "external" + ]; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocMLIR"; - rev = "rocm-${version}"; # change to rocmVersion later - hash = "sha256-s/5gAH5vh2tgATZemPP66juQFDg8BR2sipzX2Q6pOOQ="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-MokE7Ej8mLHTQeLYvKr7PPlsNG6ul91fqfXDlGu5JpI="; }; nativeBuildInputs = [ cmake + ninja + ] ++ lib.optionals (!buildRockCompiler) [ hip ]; buildInputs = [ + git + libxml2 + libedit python3 ]; - cmakeFlags = [ - "-DBUILD_FAT_LIBMLIRMIOPEN=ON" + propagatedBuildInputs = [ + zlib + ncurses ]; + cmakeFlags = [ + "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" + "-DLLVM_ENABLE_ZLIB=ON" + "-DLLVM_ENABLE_TERMINFO=ON" + ] ++ lib.optionals buildRockCompiler [ + "-DBUILD_FAT_LIBROCKCOMPILER=ON" + ] ++ lib.optionals (!buildRockCompiler) [ + "-DROCM_PATH=${rocminfo}" + "-DROCM_TEST_CHIPSET=gfx000" + ]; + + dontBuild = true; + doCheck = true; + + # Certain libs aren't being generated, try enabling tests next update + checkTarget = if buildRockCompiler + then "librockCompiler" + else "check-mlir-miopen-build-only"; + + postInstall = let + libPath = lib.makeLibraryPath [ zlib ncurses hip stdenv.cc.cc ]; + in lib.optionals (!buildRockCompiler) '' + mkdir -p $external/lib + cp -a external/llvm-project/llvm/lib/{*.a*,*.so*} $external/lib + patchelf --set-rpath $external/lib:$out/lib:${libPath} $external/lib/*.so* + patchelf --set-rpath $out/lib:$external/lib:${libPath} $out/{bin/*,lib/*.so*} + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + page = "tags?per_page=2"; + filter = ".[1].name | split(\"-\") | .[1]"; + }; + meta = with lib; { description = "MLIR-based convolution and GEMM kernel generator"; homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ Madouura ]; - broken = rocmVersion != hip.version; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; -} +}) diff --git a/pkgs/development/libraries/rocprim/default.nix b/pkgs/development/libraries/rocprim/default.nix index 97b8daf8a7b1..119153187f9f 100644 --- a/pkgs/development/libraries/rocprim/default.nix +++ b/pkgs/development/libraries/rocprim/default.nix @@ -1,25 +1,19 @@ { lib , stdenv , fetchFromGitHub +, rocmUpdateScript , cmake , rocm-cmake -, rocm-runtime -, rocm-device-libs -, rocm-comgr , hip -, gtest ? null -, gbenchmark ? null +, gtest +, gbenchmark , buildTests ? false , buildBenchmarks ? false }: -assert buildTests -> gtest != null; -assert buildBenchmarks -> gbenchmark != null; - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocprim"; - rocmVersion = "5.3.1"; - version = "2.11.0-${rocmVersion}"; + version = "5.4.2"; outputs = [ "out" @@ -32,8 +26,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocPRIM"; - rev = "rocm-${rocmVersion}"; - hash = "sha256-aapvj9bwwlg7VJfnH1PVR8DulMcJh1xR6B4rPPGU6Q4="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-VGTrMllQguIJKexdQNXC07KX7TxU/e5oT6VZdlSRcQY="; }; nativeBuildInputs = [ @@ -42,11 +36,7 @@ stdenv.mkDerivation rec { hip ]; - buildInputs = [ - rocm-runtime - rocm-device-libs - rocm-comgr - ] ++ lib.optionals buildTests [ + buildInputs = lib.optionals buildTests [ gtest ] ++ lib.optionals buildBenchmarks [ gbenchmark @@ -75,11 +65,18 @@ stdenv.mkDerivation rec { rmdir $out/bin ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + meta = with lib; { description = "ROCm parallel primitives"; homepage = "https://github.com/ROCmSoftwarePlatform/rocPRIM"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; - broken = rocmVersion != hip.version; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor hip.version; }; -} +}) diff --git a/pkgs/development/libraries/rocprofiler/0000-dont-require-hsa_amd_aqlprofile.patch b/pkgs/development/libraries/rocprofiler/0000-dont-require-hsa_amd_aqlprofile.patch new file mode 100644 index 000000000000..b70163b08e48 --- /dev/null +++ b/pkgs/development/libraries/rocprofiler/0000-dont-require-hsa_amd_aqlprofile.patch @@ -0,0 +1,20 @@ +diff --git a/src/util/hsa_rsrc_factory.cpp b/src/util/hsa_rsrc_factory.cpp +index 643ff16..c08d98f 100644 +--- a/src/util/hsa_rsrc_factory.cpp ++++ b/src/util/hsa_rsrc_factory.cpp +@@ -127,15 +127,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool initialize_hsa) : initialize_hsa_(initialize + if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR); + if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR); + +- // Get AqlProfile API table +- aqlprofile_api_ = {0}; +-#ifdef ROCP_LD_AQLPROFILE +- status = LoadAqlProfileLib(&aqlprofile_api_); +-#else +- status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_); +-#endif +- CHECK_STATUS("aqlprofile API table load failed", status); +- + // Get Loader API table + loader_api_ = {0}; + status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_LOADER, 1, sizeof(loader_api_), &loader_api_); diff --git a/pkgs/development/libraries/rocprofiler/default.nix b/pkgs/development/libraries/rocprofiler/default.nix new file mode 100644 index 000000000000..7dbde6e1633e --- /dev/null +++ b/pkgs/development/libraries/rocprofiler/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-runtime +, rocm-thunk +, roctracer +, numactl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rocprofiler"; + version = "5.4.2"; + + src = fetchFromGitHub { + owner = "ROCm-Developer-Tools"; + repo = "rocprofiler"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-CpD/+soMN8WTeSb5X7dsnZ596PMkw+4EVsVSvFtKCak="; + }; + + patches = [ ./0000-dont-require-hsa_amd_aqlprofile.patch ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + rocm-thunk + rocm-runtime + numactl + ]; + + cmakeFlags = [ + "-DPROF_API_HEADER_PATH=${roctracer.src}/inc/ext" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; + + postPatch = '' + patchShebangs bin test + + substituteInPlace cmake_modules/env.cmake \ + --replace "FATAL_ERROR \"AQL_PROFILE" "WARNING \"AQL_PROFILE" + ''; + + postInstall = '' + patchelf --set-rpath $out/lib:${lib.makeLibraryPath finalAttrs.buildInputs} $out/lib/rocprofiler/librocprof-tool.so + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Profiling with perf-counters and derived metrics"; + homepage = "https://github.com/ROCm-Developer-Tools/rocprofiler"; + license = with licenses; [ mit ]; # mitx11 + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + }; +}) diff --git a/pkgs/development/libraries/rocr-debug-agent/default.nix b/pkgs/development/libraries/rocr-debug-agent/default.nix new file mode 100644 index 000000000000..4361ffec3454 --- /dev/null +++ b/pkgs/development/libraries/rocr-debug-agent/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, hip +, git +, rocdbgapi +, rocm-runtime +, elfutils +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rocr-debug-agent"; + version = "5.4.2"; + + src = fetchFromGitHub { + owner = "ROCm-Developer-Tools"; + repo = "rocr_debug_agent"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-5l6svWSWCxVoyr1zJabxbt5rXQMtdZtHrf9gS2PcRKc="; + }; + + nativeBuildInputs = [ + cmake + hip + git + ]; + + buildInputs = [ + rocdbgapi + rocm-runtime + elfutils + ]; + + cmakeFlags = [ + "-DCMAKE_MODULE_PATH=${hip}/lib/cmake/hip" + "-DHIP_ROOT_DIR=${hip}" + "-DHIP_PATH=${hip}" + ]; + + # Weird install target + postInstall = '' + rm -rf $out/src + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Library that provides some debugging functionality for ROCr"; + homepage = "https://github.com/ROCm-Developer-Tools/rocr_debug_agent"; + license = with licenses; [ ncsa ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor hip.version; + }; +}) diff --git a/pkgs/development/libraries/rocrand/default.nix b/pkgs/development/libraries/rocrand/default.nix new file mode 100644 index 000000000000..1b83ba1e28dd --- /dev/null +++ b/pkgs/development/libraries/rocrand/default.nix @@ -0,0 +1,85 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-cmake +, hip +, gtest +, gbenchmark +, buildTests ? false +, buildBenchmarks ? false +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rocrand"; + version = "5.4.2"; + + outputs = [ + "out" + ] ++ lib.optionals buildTests [ + "test" + ] ++ lib.optionals buildBenchmarks [ + "benchmark" + ]; + + src = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "rocRAND"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-5kqVLUINYk8WjnRJ+LqUiCPjLIHcbvIL0Z6BRsj9hvY="; + fetchSubmodules = true; # For inline hipRAND + }; + + nativeBuildInputs = [ + cmake + rocm-cmake + hip + ]; + + buildInputs = lib.optionals buildTests [ + gtest + ] ++ lib.optionals buildBenchmarks [ + gbenchmark + ]; + + cmakeFlags = [ + "-DCMAKE_C_COMPILER=hipcc" + "-DCMAKE_CXX_COMPILER=hipcc" + "-DHIP_ROOT_DIR=${hip}" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals buildTests [ + "-DBUILD_TEST=ON" + ] ++ lib.optionals buildBenchmarks [ + "-DBUILD_BENCHMARK=ON" + ]; + + postInstall = lib.optionalString buildTests '' + mkdir -p $test/bin + mv $out/bin/test_* $test/bin + '' + lib.optionalString buildBenchmarks '' + mkdir -p $benchmark/bin + mv $out/bin/benchmark_* $benchmark/bin + '' + lib.optionalString (buildTests || buildBenchmarks) '' + rmdir $out/bin + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Generate pseudo-random and quasi-random numbers"; + homepage = "https://github.com/ROCmSoftwarePlatform/rocRAND"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor hip.version; + }; +}) diff --git a/pkgs/development/libraries/rocsolver/default.nix b/pkgs/development/libraries/rocsolver/default.nix new file mode 100644 index 000000000000..d753779be0c5 --- /dev/null +++ b/pkgs/development/libraries/rocsolver/default.nix @@ -0,0 +1,93 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-cmake +, rocblas +, hip +, fmt +, gtest +, gfortran +, lapack-reference +, buildTests ? false +, buildBenchmarks ? false +, gpuTargets ? [ ] # gpuTargets = [ "gfx803" "gfx900" "gfx906:xnack-" ] +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rocsolver"; + version = "5.4.2"; + + outputs = [ + "out" + ] ++ lib.optionals buildTests [ + "test" + ] ++ lib.optionals buildBenchmarks [ + "benchmark" + ]; + + src = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "rocSOLVER"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-UHUcA9CVPuYFpE2DTvRrRMMj51yNPo5wMTKnByL2RTg="; + }; + + nativeBuildInputs = [ + cmake + rocm-cmake + hip + ] ++ lib.optionals (buildTests || buildBenchmarks) [ + gfortran + ]; + + buildInputs = [ + rocblas + fmt + ] ++ lib.optionals buildTests [ + gtest + ] ++ lib.optionals (buildTests || buildBenchmarks) [ + lapack-reference + ]; + + cmakeFlags = [ + "-DCMAKE_CXX_COMPILER=hipcc" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals (gpuTargets != [ ]) [ + "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" + ] ++ lib.optionals buildTests [ + "-DBUILD_CLIENTS_TESTS=ON" + ] ++ lib.optionals buildBenchmarks [ + "-DBUILD_CLIENTS_BENCHMARKS=ON" + ]; + + postInstall = lib.optionalString buildTests '' + mkdir -p $test/bin + mv $out/bin/rocsolver-test $test/bin + '' + lib.optionalString buildBenchmarks '' + mkdir -p $benchmark/bin + mv $out/bin/rocsolver-bench $benchmark/bin + '' + lib.optionalString (buildTests || buildBenchmarks) '' + rmdir $out/bin + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "ROCm LAPACK implementation"; + homepage = "https://github.com/ROCmSoftwarePlatform/rocSOLVER"; + license = with licenses; [ bsd2 ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor hip.version; + }; +}) diff --git a/pkgs/development/libraries/rocsparse/default.nix b/pkgs/development/libraries/rocsparse/default.nix index f6321d4e08a3..9255e4f38f4a 100644 --- a/pkgs/development/libraries/rocsparse/default.nix +++ b/pkgs/development/libraries/rocsparse/default.nix @@ -1,38 +1,24 @@ { lib , stdenv , fetchFromGitHub +, fetchzip +, rocmUpdateScript , cmake , rocm-cmake -, rocm-runtime -, rocm-device-libs -, rocm-comgr , rocprim , hip , gfortran , git -, fetchzip ? null -, gtest ? null -, boost ? null -, python3Packages ? null +, gtest +, boost +, python3Packages , buildTests ? false , buildBenchmarks ? false # Seems to depend on tests }: -assert (buildTests || buildBenchmarks) -> fetchzip != null; -assert (buildTests || buildBenchmarks) -> gtest != null; -assert (buildTests || buildBenchmarks) -> boost != null; -assert (buildTests || buildBenchmarks) -> python3Packages != null; - -let - matrices = lib.optionalAttrs (buildTests || buildBenchmarks) import ./deps.nix { - inherit fetchzip; - mirror1 = "https://sparse.tamu.edu/MM"; - mirror2 = "https://www.cise.ufl.edu/research/sparse/MM"; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocsparse"; - rocmVersion = "5.3.1"; - version = "2.3.2-${rocmVersion}"; + version = "5.4.2"; outputs = [ "out" @@ -45,8 +31,8 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocSPARSE"; - rev = "rocm-${rocmVersion}"; - hash = "sha256-1069oBrIpZ4M9CAkzoQ9a5j3WlCXErirTbgTUZuT6b0="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-paibzXYvRnd+4yYvteLf7EYmqeqWDc7BoDByfSMrhYo="; }; nativeBuildInputs = [ @@ -57,9 +43,6 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - rocm-runtime - rocm-device-libs - rocm-comgr rocprim git ] ++ lib.optionals (buildTests || buildBenchmarks) [ @@ -88,30 +71,30 @@ in stdenv.mkDerivation rec { postPatch = lib.optionalString (buildTests || buildBenchmarks) '' mkdir -p matrices - ln -s ${matrices.matrix-01}/*.mtx matrices - ln -s ${matrices.matrix-02}/*.mtx matrices - ln -s ${matrices.matrix-03}/*.mtx matrices - ln -s ${matrices.matrix-04}/*.mtx matrices - ln -s ${matrices.matrix-05}/*.mtx matrices - ln -s ${matrices.matrix-06}/*.mtx matrices - ln -s ${matrices.matrix-07}/*.mtx matrices - ln -s ${matrices.matrix-08}/*.mtx matrices - ln -s ${matrices.matrix-09}/*.mtx matrices - ln -s ${matrices.matrix-10}/*.mtx matrices - ln -s ${matrices.matrix-11}/*.mtx matrices - ln -s ${matrices.matrix-12}/*.mtx matrices - ln -s ${matrices.matrix-13}/*.mtx matrices - ln -s ${matrices.matrix-14}/*.mtx matrices - ln -s ${matrices.matrix-15}/*.mtx matrices - ln -s ${matrices.matrix-16}/*.mtx matrices - ln -s ${matrices.matrix-17}/*.mtx matrices - ln -s ${matrices.matrix-18}/*.mtx matrices - ln -s ${matrices.matrix-19}/*.mtx matrices - ln -s ${matrices.matrix-20}/*.mtx matrices - ln -s ${matrices.matrix-21}/*.mtx matrices - ln -s ${matrices.matrix-22}/*.mtx matrices - ln -s ${matrices.matrix-23}/*.mtx matrices - ln -s ${matrices.matrix-24}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-01}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-02}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-03}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-04}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-05}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-06}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-07}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-08}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-09}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-10}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-11}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-12}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-13}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-14}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-15}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-16}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-17}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-18}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-19}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-20}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-21}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-22}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-23}/*.mtx matrices + ln -s ${finalAttrs.passthru.matrices.matrix-24}/*.mtx matrices # Not used by the original cmake, causes an error rm matrices/*_b.mtx @@ -138,11 +121,26 @@ in stdenv.mkDerivation rec { rmdir $out/bin ''; + passthru = { + matrices = import ./deps.nix { + inherit fetchzip; + mirror1 = "https://sparse.tamu.edu/MM"; + mirror2 = "https://www.cise.ufl.edu/research/sparse/MM"; + }; + + updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + }; + meta = with lib; { description = "ROCm SPARSE implementation"; homepage = "https://github.com/ROCmSoftwarePlatform/rocSPARSE"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; - broken = rocmVersion != hip.version; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor hip.version; }; -} +}) diff --git a/pkgs/development/libraries/rocthrust/default.nix b/pkgs/development/libraries/rocthrust/default.nix index 99e582791769..a9a4c9836673 100644 --- a/pkgs/development/libraries/rocthrust/default.nix +++ b/pkgs/development/libraries/rocthrust/default.nix @@ -1,44 +1,33 @@ { lib , stdenv , fetchFromGitHub +, rocmUpdateScript , cmake , rocm-cmake -, rocm-runtime -, rocm-device-libs -, rocm-comgr , rocprim , hip -, gtest ? null +, gtest , buildTests ? false , buildBenchmarks ? false }: -assert buildTests -> gtest != null; - -# Doesn't seem to work, thousands of errors compiling with no clear fix -# Is this an upstream issue? We don't seem to be missing dependencies -assert buildTests == false; -assert buildBenchmarks == false; - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocthrust"; - rocmVersion = "5.3.1"; - version = "2.16.0-${rocmVersion}"; + version = "5.4.2"; - # Comment out these outputs until tests/benchmarks are fixed (upstream?) - # outputs = [ - # "out" - # ] ++ lib.optionals buildTests [ - # "test" - # ] ++ lib.optionals buildBenchmarks [ - # "benchmark" - # ]; + outputs = [ + "out" + ] ++ lib.optionals buildTests [ + "test" + ] ++ lib.optionals buildBenchmarks [ + "benchmark" + ]; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocThrust"; - rev = "rocm-${rocmVersion}"; - hash = "sha256-cT0VyEVz86xR6qubAY2ncTxtCRTwXrNTWcFyf3mV+y0="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-3OcJUL6T1HJz6TQb1//lumsTxqfwbWbQ4lGuZoKmqbY="; }; nativeBuildInputs = [ @@ -48,11 +37,7 @@ stdenv.mkDerivation rec { hip ]; - buildInputs = [ - rocm-runtime - rocm-device-libs - rocm-comgr - ] ++ lib.optionals buildTests [ + buildInputs = lib.optionals buildTests [ gtest ]; @@ -68,24 +53,32 @@ stdenv.mkDerivation rec { "-DBUILD_TEST=ON" ] ++ lib.optionals buildBenchmarks [ "-DBUILD_BENCHMARKS=ON" + ] ++ lib.optionals (buildTests || buildBenchmarks) [ + "-DCMAKE_CXX_FLAGS=-Wno-deprecated-builtins" # Too much spam ]; - # Comment out these outputs until tests/benchmarks are fixed (upstream?) - # postInstall = lib.optionalString buildTests '' - # mkdir -p $test/bin - # mv $out/bin/test_* $test/bin - # '' + lib.optionalString buildBenchmarks '' - # mkdir -p $benchmark/bin - # mv $out/bin/benchmark_* $benchmark/bin - # '' + lib.optionalString (buildTests || buildBenchmarks) '' - # rmdir $out/bin - # ''; + postInstall = lib.optionalString buildTests '' + mkdir -p $test/bin + mv $out/bin/{test_*,*.hip} $test/bin + '' + lib.optionalString buildBenchmarks '' + mkdir -p $benchmark/bin + mv $out/bin/benchmark_* $benchmark/bin + '' + lib.optionalString (buildTests || buildBenchmarks) '' + rm -rf $out/bin + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "ROCm parallel algorithm library"; homepage = "https://github.com/ROCmSoftwarePlatform/rocThrust"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ Madouura ]; - broken = rocmVersion != hip.version; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor hip.version; }; -} +}) diff --git a/pkgs/development/libraries/roctracer/default.nix b/pkgs/development/libraries/roctracer/default.nix new file mode 100644 index 000000000000..ee844bb417ba --- /dev/null +++ b/pkgs/development/libraries/roctracer/default.nix @@ -0,0 +1,101 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, clang +, hip +, rocm-device-libs +, rocprofiler +, libxml2 +, doxygen +, graphviz +, gcc-unwrapped +, rocm-runtime +, python3Packages +, buildDocs ? false # Nothing seems to be generated, so not making the output +, buildTests ? false +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "roctracer"; + version = "5.4.2"; + + outputs = [ + "out" + ] ++ lib.optionals buildDocs [ + "doc" + ] ++ lib.optionals buildTests [ + "test" + ]; + + src = fetchFromGitHub { + owner = "ROCm-Developer-Tools"; + repo = "roctracer"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-5vYUNczylB2ehlvhq1u/H8KUXt8ku2E+jawKrKsU7LY="; + }; + + nativeBuildInputs = [ + cmake + clang + hip + ] ++ lib.optionals buildDocs [ + doxygen + graphviz + ]; + + buildInputs = [ + rocm-device-libs + rocprofiler + libxml2 + python3Packages.python + python3Packages.cppheaderparser + ]; + + cmakeFlags = [ + "-DCMAKE_MODULE_PATH=${hip}/hip/cmake" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; + + postPatch = '' + export HIP_DEVICE_LIB_PATH=${rocm-device-libs}/amdgcn/bitcode + '' + lib.optionalString (!buildTests) '' + substituteInPlace CMakeLists.txt \ + --replace "add_subdirectory(test)" "" + ''; + + # Tests always fail, probably need GPU + # doCheck = buildTests; + + postInstall = lib.optionalString buildDocs '' + mkdir -p $doc + '' + lib.optionalString buildTests '' + mkdir -p $test/bin + # Not sure why this is an install target + find $out/test -executable -type f -exec mv {} $test/bin \; + rm $test/bin/{*.sh,*.py} + patchelf --set-rpath $out/lib:${lib.makeLibraryPath ( + finalAttrs.buildInputs ++ [ hip gcc-unwrapped.lib rocm-runtime ])} $test/bin/* + rm -rf $out/test + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Tracer callback/activity library"; + homepage = "https://github.com/ROCm-Developer-Tools/roctracer"; + license = with licenses; [ mit ]; # mitx11 + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor hip.version; + }; +}) diff --git a/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch b/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch new file mode 100644 index 000000000000..cee603679758 --- /dev/null +++ b/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch @@ -0,0 +1,31 @@ +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index e1160bb..2a5462e 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -30,26 +30,6 @@ cmake_dependent_option( ROCWMMA_BUILD_VALIDATION_TESTS "Build validation tests" + cmake_dependent_option( ROCWMMA_BUILD_BENCHMARK_TESTS "Build benchmarking tests" OFF "ROCWMMA_BUILD_TESTS" OFF ) + cmake_dependent_option( ROCWMMA_BUILD_EXTENDED_TESTS "Build extended test parameter coverage" OFF "ROCWMMA_BUILD_TESTS" OFF ) + +-# Test/benchmark requires additional dependencies +-include( FetchContent ) +- +-FetchContent_Declare( +- googletest +- GIT_REPOSITORY https://github.com/google/googletest.git +- GIT_TAG 609281088cfefc76f9d0ce82e1ff6c30cc3591e5 +-) +-FetchContent_GetProperties(googletest) +-if(NOT googletest_POPULATED) +- # Fetch the content using default details +- FetchContent_Populate(googletest) +- # Save the shared libs setting, then force to static libs +- set(BUILD_SHARED_LIBS_OLD ${BUILD_SHARED_LIBS}) +- set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Build SHARED libraries" FORCE) +- # Add gtest targets as static libs +- add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) +- # Restore shared libs setting +- set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_OLD} CACHE INTERNAL "Build SHARED libraries" FORCE) +-endif() + + set(ROCWMMA_TEST_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) + set(ROCWMMA_COMMON_TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/hip_device.cpp diff --git a/pkgs/development/libraries/rocwmma/default.nix b/pkgs/development/libraries/rocwmma/default.nix new file mode 100644 index 000000000000..611f881e866b --- /dev/null +++ b/pkgs/development/libraries/rocwmma/default.nix @@ -0,0 +1,146 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-cmake +, hip +, openmp +, gtest +, rocblas +, texlive +, doxygen +, sphinx +, python3Packages +, buildDocs ? true +, buildTests ? false +, buildExtendedTests ? false +, buildBenchmarks ? false +, buildSamples ? false +, gpuTargets ? [ ] # gpuTargets = [ "gfx908:xnack-" "gfx90a:xnack-" "gfx90a:xnack+" ... ] +}: + +let + latex = lib.optionalAttrs buildDocs texlive.combine { + inherit (texlive) scheme-small + latexmk + tex-gyre + fncychap + wrapfig + capt-of + framed + needspace + tabulary + varwidth + titlesec; + }; +in stdenv.mkDerivation (finalAttrs: { + pname = "rocwmma"; + version = "5.4.2"; + + outputs = [ + "out" + ] ++ lib.optionals buildDocs [ + "doc" + ] ++ lib.optionals (buildTests || buildBenchmarks) [ + "test" + ] ++ lib.optionals buildBenchmarks [ + "benchmark" + ] ++ lib.optionals buildSamples [ + "sample" + ]; + + src = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "rocWMMA"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-HUJPb6IahBgl/v+W4kXludBTNAjRm8k6v0jxKAX+qZM="; + }; + + patches = lib.optionals (buildTests || buildBenchmarks) [ + ./0000-dont-fetch-googletest.patch + ]; + + nativeBuildInputs = [ + cmake + rocm-cmake + hip + ]; + + buildInputs = [ + openmp + ] ++ lib.optionals (buildTests || buildBenchmarks) [ + gtest + rocblas + ] ++ lib.optionals buildDocs [ + latex + doxygen + sphinx + python3Packages.sphinx-rtd-theme + python3Packages.breathe + ]; + + cmakeFlags = [ + "-DCMAKE_CXX_COMPILER=hipcc" + "-DROCWMMA_BUILD_TESTS=${if buildTests || buildBenchmarks then "ON" else "OFF"}" + "-DROCWMMA_BUILD_VALIDATION_TESTS=ON" + "-DROCWMMA_BUILD_SAMPLES=${if buildSamples then "ON" else "OFF"}" + "-DROCWMMA_VALIDATE_WITH_ROCBLAS=ON" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals (gpuTargets != [ ]) [ + "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" + ] ++ lib.optionals buildExtendedTests [ + "-DROCWMMA_BUILD_EXTENDED_TESTS=ON" + ] ++ lib.optionals buildBenchmarks [ + "-DROCWMMA_BUILD_BENCHMARK_TESTS=ON" + "-DROCWMMA_BENCHMARK_WITH_ROCBLAS=ON" + ]; + + postPatch = lib.optionalString buildDocs '' + patchShebangs docs/*.sh + ''; + + # Unfortunately, it seems like we have to call make on this manually + # -DROCWMMA_BUILD_DOCS=ON is invalid, despite being on the README + postBuild = lib.optionalString buildDocs '' + export HOME=$(mktemp -d) + ../docs/run_doc.sh + ''; + + postInstall = lib.optionalString buildDocs '' + mv ../docs/source/_build/html $out/share/doc/rocwmma + mv ../docs/source/_build/latex/rocWMMA.pdf $out/share/doc/rocwmma + '' + lib.optionalString (buildTests || buildBenchmarks) '' + mkdir -p $test/bin + mv $out/bin/{*_test,*-validate} $test/bin + '' + lib.optionalString buildBenchmarks '' + mkdir -p $benchmark/bin + mv $out/bin/*-bench $benchmark/bin + '' + lib.optionalString buildSamples '' + mkdir -p $sample/bin + mv $out/bin/sgemmv $sample/bin + mv $out/bin/simple_gemm $sample/bin + mv $out/bin/simple_dlrm $sample/bin + '' + lib.optionalString (buildTests || buildBenchmarks || buildSamples) '' + rm -rf $out/bin + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Mixed precision matrix multiplication and accumulation"; + homepage = "https://github.com/ROCmSoftwarePlatform/rocWMMA"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor hip.version; + }; +}) diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix index e5fb04626836..4655d54ab98e 100644 --- a/pkgs/development/libraries/rote/default.nix +++ b/pkgs/development/libraries/rote/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ncurses as well so that you may render the virtual screen to the real screen when you need to. ''; - homepage = "http://rote.sourceforge.net/"; + homepage = "https://rote.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index d22f59271fec..f9a12322c47b 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.28"; + version = "1.3.34"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RkOP+et8wFb44NLqkizXB68U0NRKKvhDl4PyQWz2m6A="; + sha256 = "sha256-CaVo2OxfB7ImMOgPuyvKQFbTeEm3PqD8CV96jUEZ8U0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix index e7e8dd04b071..8a6b72f52130 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.1.0"; + version = "4.2.0"; src = fetchurl { url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${version}.tar.gz"; - sha256 = "sha256-s2fGldKDGVjnFmkhw7NW1d+lGx7O5QW5dBa6OdG2wXo="; + sha256 = "sha256-66U9Gz9uNFYyuwmnt1LsfO09Y+xRU6hIOA84gMXWGIk="; }; buildInputs = [ bzip2 zlib ]; diff --git a/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/pkgs/development/libraries/science/astronomy/wcslib/default.nix index 32b3d5b5624a..bea05468cedc 100644 --- a/pkgs/development/libraries/science/astronomy/wcslib/default.nix +++ b/pkgs/development/libraries/science/astronomy/wcslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wcslib"; - version = "7.11"; + version = "7.12"; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Rr77/fUM1JU4lmdqfVcAlNx2YeKulnewkuf7E87j2l8="; + sha256 = "sha256-nPjeUOEJqX+gRRHUER6NFL0KRAdxMqz3PmzwAp/pa9Q="; }; nativeBuildInputs = [ flex ]; diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix index d4610d60415b..06dc203aa2fb 100644 --- a/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "6.0.0.1"; + version = "7.0.0"; pname = "papi"; src = fetchurl { url = "https://bitbucket.org/icl/papi/get/papi-${lib.replaceStrings ["."] ["-"] version}-t.tar.gz"; - sha256 = "1jd67yadyffzxwsqlylsi0bx8ishb0cgj2ziz1wdslaz6ylvyf9j"; + sha256 = "sha256-MxiOzfBxLmzsUg4jo2VHThyGE0/WYD3ZEBrq3WRjXGU="; }; setSourceRoot = '' diff --git a/pkgs/development/libraries/science/biology/edlib/default.nix b/pkgs/development/libraries/science/biology/edlib/default.nix new file mode 100644 index 000000000000..b8ea4a55291a --- /dev/null +++ b/pkgs/development/libraries/science/biology/edlib/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "edlib"; + version = "unstable-2021-08-20"; + + src = fetchFromGitHub { + owner = "Martinsos"; + repo = pname; + rev = "f8afceb49ab0095c852e0b8b488ae2c88e566afd"; + hash = "sha256-P/tFbvPBtA0MYCNDabW+Ypo3ltwP4S+6lRDxwAZ1JFo="; + }; + + nativeBuildInputs = [ cmake ]; + + doCheck = true; + checkPhase = '' + runHook preCheck + bin/runTests + runHook postCheck + ''; + + meta = with lib; { + homepage = "https://martinsos.github.io/edlib"; + description = "Lightweight, fast C/C++ library for sequence alignment using edit distance"; + maintainers = with maintainers; [ bcdarwin ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index 84762414fef9..0344559f8a8f 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,25 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, itk, Cocoa }: stdenv.mkDerivation rec { pname = "elastix"; - version = "5.0.1"; + version = "5.1.0"; src = fetchFromGitHub { - owner = "SuperElastix"; - repo = pname; - rev = version; - sha256 = "1mx8kkak2d3ibfrxrh8jkmh2zkdlgl9h578wiw3617zcwaa97bxw"; + owner = "SuperElastix"; + repo = pname; + rev = version; + hash = "sha256-wFeLU8IwiF43a9TAvecQG+QMw88PQZdJ8sI1Zz3ZeXc="; }; - patches = [ - (fetchpatch { - name = "install-executables.patch"; # https://github.com/SuperElastix/elastix/issues/305 - url = "https://github.com/SuperElastix/elastix/commit/8e26cdc0d66f6030c7be085fdc424d84d4fc7546.patch"; - sha256 = "12y9wbpi9jlarnw6fk4iby97jxvx5g4daq9zqblbcmn51r134bj5"; - }) - ]; - - nativeBuildInputs = [ cmake python3 ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ itk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; doCheck = !stdenv.isDarwin; # usual dynamic linker issues diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index d2615b391ffc..de419dc3d575 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python3, vtk, zlib, tbb }: +{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python3, vtk_8, zlib, tbb }: stdenv.mkDerivation rec { version = "2.0.0"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake gtest ]; - buildInputs = [ boost eigen python3 vtk zlib tbb ]; + buildInputs = [ boost eigen python3 vtk_8 zlib tbb ]; meta = with lib; { homepage = "https://github.com/BioMedIA/MIRTK"; diff --git a/pkgs/development/libraries/science/chemistry/openmm/default.nix b/pkgs/development/libraries/science/chemistry/openmm/default.nix index 16bb94246e42..cd105a1133d0 100644 --- a/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -6,10 +6,14 @@ , fftwSinglePrec , doxygen , swig -, python3Packages, enablePython ? false -, opencl-headers, ocl-icd, enableOpencl ? false -, clang, enableClang ? true -, cudatoolkit, enableCuda ? false +, enablePython ? false +, python3Packages +, enableOpencl ? true +, opencl-headers +, ocl-icd +, enableCuda ? false +, cudaPackages +, addOpenGLRunpath }: stdenv.mkDerivation rec { @@ -31,11 +35,17 @@ stdenv.mkDerivation rec { serialization/tests/TestSerializeIntegrator.cpp ''; - nativeBuildInputs = [ cmake gfortran swig doxygen python3Packages.python ]; + nativeBuildInputs = [ + cmake + gfortran + swig + doxygen + python3Packages.python + ] ++ lib.optional enableCuda addOpenGLRunpath; buildInputs = [ fftwSinglePrec ] ++ lib.optionals enableOpencl [ ocl-icd opencl-headers ] - ++ lib.optional enableCuda cudatoolkit; + ++ lib.optional enableCuda cudaPackages.cudatoolkit; propagatedBuildInputs = lib.optionals enablePython (with python3Packages; [ python @@ -54,32 +64,36 @@ stdenv.mkDerivation rec { "-DOPENMM_BUILD_SHARED_LIB=ON" ] ++ lib.optionals enablePython [ "-DOPENMM_BUILD_PYTHON_WRAPPERS=ON" - ] ++ lib.optionals enableClang [ - "-DCMAKE_C_COMPILER=${clang}/bin/clang" - "-DCMAKE_CXX_COMPILER=${clang}/bin/clang++" ] ++ lib.optionals enableOpencl [ "-DOPENMM_BUILD_OPENCL_LIB=ON" "-DOPENMM_BUILD_AMOEBA_OPENCL_LIB=ON" "-DOPENMM_BUILD_DRUDE_OPENCL_LIB=ON" "-DOPENMM_BUILD_RPMD_OPENCL_LIB=ON" ] ++ lib.optionals enableCuda [ - "-DCUDA_SDK_ROOT_DIR=${cudatoolkit}" + "-DCUDA_SDK_ROOT_DIR=${cudaPackages.cudatoolkit}" "-DOPENMM_BUILD_AMOEBA_CUDA_LIB=ON" "-DOPENMM_BUILD_CUDA_LIB=ON" "-DOPENMM_BUILD_DRUDE_CUDA_LIB=ON" "-DOPENMM_BUILD_RPMD_CUDA_LIB=ON" - "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib64/stubs" + "-DCMAKE_LIBRARY_PATH=${cudaPackages.cudatoolkit}/lib64/stubs" ]; postInstall = lib.strings.optionalString enablePython '' - export OPENMM_LIB_PATH=$out/lib - export OPENMM_INCLUDE_PATH=$out/include - cd python - ${python3Packages.python.interpreter} setup.py build - ${python3Packages.python.interpreter} setup.py install --prefix=$out + export OPENMM_LIB_PATH=$out/lib + export OPENMM_INCLUDE_PATH=$out/include + cd python + ${python3Packages.python.interpreter} setup.py build + ${python3Packages.python.interpreter} setup.py install --prefix=$out + ''; + + postFixup = '' + for lib in $out/lib/plugins/*CUDA.so $out/lib/plugins/*Cuda*.so; do + addOpenGLRunpath "$lib" + done ''; - doCheck = true; + # Couldn't get CUDA to run properly in the sandbox + doCheck = !enableCuda && !enableOpencl; meta = with lib; { description = "Toolkit for molecular simulation using high performance GPU code"; diff --git a/pkgs/development/libraries/science/electronics/qcsxcad/default.nix b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix index a20f6973384a..0fcf4a6c04e6 100644 --- a/pkgs/development/libraries/science/electronics/qcsxcad/default.nix +++ b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix @@ -4,7 +4,7 @@ , cmake , csxcad , tinyxml -, vtkWithQt5 +, vtk_8_withQt5 , qtbase }: @@ -33,7 +33,7 @@ mkDerivation { buildInputs = [ csxcad tinyxml - vtkWithQt5 + vtk_8_withQt5 qtbase ]; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index bdb386b9fe5c..a418df7050eb 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { eigen ] ++ lib.optional useMpi mpi; - checkInputs = lib.optional useMpi openssh; + nativeCheckInputs = lib.optional useMpi openssh; doCheck = true; diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 84a4486b6e3a..ed899a02aa78 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake, gfortran -# Wether to build with ILP64 interface +# Whether to build with ILP64 interface , blas64 ? false }: diff --git a/pkgs/development/libraries/science/math/bonmin/default.nix b/pkgs/development/libraries/science/math/bonmin/default.nix index 9526a6250184..7f494b245c30 100644 --- a/pkgs/development/libraries/science/math/bonmin/default.nix +++ b/pkgs/development/libraries/science/math/bonmin/default.nix @@ -47,5 +47,7 @@ stdenv.mkDerivation rec { license = licenses.epl10; platforms = platforms.unix; maintainers = with maintainers; [ aanderse ]; + # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix index 142641398f56..6ec28ba1c226 100644 --- a/pkgs/development/libraries/science/math/brial/default.nix +++ b/pkgs/development/libraries/science/math/brial/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - version = "1.2.11"; + version = "1.2.12"; pname = "brial"; src = fetchFromGitHub { owner = "BRiAl"; repo = "BRiAl"; rev = version; - sha256 = "sha256-GkaeBggOCiIWNBZoIaCvAcqGDRc/whTOqPZbGpAxWIk="; + sha256 = "sha256-y6nlqRBJRWohGDAKe/F37qBP1SgtFHR1HD+erFJReOM="; }; # FIXME package boost-test and enable checks diff --git a/pkgs/development/libraries/science/math/clmagma/default.nix b/pkgs/development/libraries/science/math/clmagma/default.nix index fe9fc540902d..c5efbb757df8 100644 --- a/pkgs/development/libraries/science/math/clmagma/default.nix +++ b/pkgs/development/libraries/science/math/clmagma/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl, gfortran, opencl-headers, clblas, ocl-icd, mkl, intel-ocl }: -with lib; - let incfile = builtins.toFile "make.inc.custom" '' CC = g++ diff --git a/pkgs/development/libraries/science/math/faiss/tests.nix b/pkgs/development/libraries/science/math/faiss/tests.nix index fcf57a8bc9fd..fdc8d9259e27 100644 --- a/pkgs/development/libraries/science/math/faiss/tests.nix +++ b/pkgs/development/libraries/science/math/faiss/tests.nix @@ -21,7 +21,7 @@ buildPythonPackage { "test_contrib.py" ]; - checkInputs = [ + nativeCheckInputs = [ faiss pytestCheckHook scipy diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/development/libraries/science/math/itpp/default.nix index c3ff2aeebfb4..b5e2f4b80d3b 100644 --- a/pkgs/development/libraries/science/math/itpp/default.nix +++ b/pkgs/development/libraries/science/math/itpp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "IT++ is a C++ library of mathematical, signal processing and communication classes and functions"; - homepage = "http://itpp.sourceforge.net/"; + homepage = "https://itpp.sourceforge.net/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ andrew-d ]; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 05470f61dd3e..b9563346ada4 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "liblapack"; - version = "3.10.1"; + version = "3.11"; src = fetchFromGitHub { owner = "Reference-LAPACK"; repo = "lapack"; rev = "v${version}"; - sha256 = "07wwydw72gl4fhfqcyc8sbz7ynm0i23pggyfqn0r9a29g7qh8bqs"; + sha256 = "sha256-AYD78u70y8cY19hmM/aDjQEzxO8u9lPWhCFxRe5cqXI="; }; nativeBuildInputs = [ gfortran cmake ]; @@ -30,7 +30,11 @@ stdenv.mkDerivation rec { "-DCBLAS=ON" "-DBUILD_TESTING=ON" ] ++ lib.optional shared "-DBUILD_SHARED_LIBS=ON" - ++ lib.optional blas64 "-DBUILD_INDEX64=ON"; + ++ lib.optional blas64 "-DBUILD_INDEX64=ON" + # Tries to run host platform binaries during the build + # Will likely be disabled by default in 3.12, see: + # https://github.com/Reference-LAPACK/lapack/issues/757 + ++ lib.optional (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) "-DTEST_FORTRAN_COMPILER=OFF"; passthru = { inherit blas64; }; diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index f9b454a6f115..34c1b7ad8440 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -17,7 +17,7 @@ let # this derivation. However, we should ensure on version bumps # that the CUDA toolkit for `passthru.tests` is still # up-to-date. - version = "1.12.1"; + version = "1.13.1"; device = if cudaSupport then "cuda" else "cpu"; srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; @@ -93,6 +93,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "C++ API of the PyTorch machine learning framework"; homepage = "https://pytorch.org/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; # Includes CUDA and Intel MKL, but redistributions of the binary are not limited. # https://docs.nvidia.com/cuda/eula/index.html # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html diff --git a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix index 0b5b4d05c0f6..5d5c795b6ede 100644 --- a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix +++ b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix @@ -1,36 +1,19 @@ version : builtins.getAttr version { - "1.10.0" = { + "1.13.1" = { x86_64-darwin-cpu = { - name = "libtorch-macos-1.10.0.zip"; - url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-1.10.0.zip"; - hash = "sha256-HSisxHs466c6XwvZEbkV/1kVNBzJOy3uVw9Bh497Vk8="; + name = "libtorch-macos-1.13.1.zip"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-1.13.1.zip"; + hash = "sha256-2ITO1hO3qb4lEHO7xV6Dn6bhxI4Ia2TLulqs2LM7+vY="; }; x86_64-linux-cpu = { - name = "libtorch-cxx11-abi-shared-with-deps-1.10.0-cpu.zip"; - url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.10.0%2Bcpu.zip"; - hash = "sha256-wAtA+AZx3HjaFbsrbyfkSXjYM0BP8H5HwCgyHbgJXJ0="; + name = "libtorch-cxx11-abi-shared-with-deps-1.13.1-cpu.zip"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.13.1%2Bcpu.zip"; + hash = "sha256-AXmlrtGNMVOYbQfvAQDUALlK1F0bMGNdm6RBtVuNvbo="; }; x86_64-linux-cuda = { - name = "libtorch-cxx11-abi-shared-with-deps-1.10.0-cu113.zip"; - url = "https://download.pytorch.org/libtorch/cu113/libtorch-cxx11-abi-shared-with-deps-1.10.0%2Bcu113.zip"; - hash = "sha256-jPylK4j0V8SEQ8cZU+O22P7kQ28wanIB0GkBzRGyTj8="; - }; - }; - "1.12.1" = { - x86_64-darwin-cpu = { - name = "libtorch-macos-1.12.1.zip"; - url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-1.12.1.zip"; - hash = "sha256-HSisxHs466c6XwvZEbkV/1kVNBzJOy3uVw9Bh497Vk8="; - }; - x86_64-linux-cpu = { - name = "libtorch-cxx11-abi-shared-with-deps-1.12.1-cpu.zip"; - url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.12.1%2Bcpu.zip"; - hash = "sha256-bHhC0WTli9vDJv56TaT6iA/d8im9zRkK1TlBuqkh4Wg="; - }; - x86_64-linux-cuda = { - name = "libtorch-cxx11-abi-shared-with-deps-1.12.1-cu116.zip"; - url = "https://download.pytorch.org/libtorch/cu116/libtorch-cxx11-abi-shared-with-deps-1.12.1%2Bcu116.zip"; - hash = "sha256-YRcusDhrHYwIFOzt7vOuUlc11VyEUjIcBzjWEyi/874="; + name = "libtorch-cxx11-abi-shared-with-deps-1.13.1-cu116.zip"; + url = "https://download.pytorch.org/libtorch/cu116/libtorch-cxx11-abi-shared-with-deps-1.13.1%2Bcu116.zip"; + hash = "sha256-CujIDlE9VqUuhSJcvUO6IlDWjmjEt54sMAJ4ZRjuziw="; }; }; } diff --git a/pkgs/development/libraries/science/math/libtorch/prefetch.sh b/pkgs/development/libraries/science/math/libtorch/prefetch.sh index 26b24198e235..5c6d60ae8b20 100755 --- a/pkgs/development/libraries/science/math/libtorch/prefetch.sh +++ b/pkgs/development/libraries/science/math/libtorch/prefetch.sh @@ -6,7 +6,7 @@ set -eou pipefail version=$1 bucket="https://download.pytorch.org/libtorch" -CUDA_VERSION=cu113 +CUDA_VERSION=cu116 url_and_key_list=( "x86_64-darwin-cpu $bucket/cpu/libtorch-macos-${version}.zip libtorch-macos-${version}.zip" diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix index 2a46e22b60d2..214f27046527 100644 --- a/pkgs/development/libraries/science/math/m4rie/default.nix +++ b/pkgs/development/libraries/science/math/m4rie/default.nix @@ -35,5 +35,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = teams.sage.members; platforms = platforms.unix; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index 05d7d4fa1842..b7223690f435 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -1,68 +1,75 @@ -{ lib, stdenv, fetchurl, cmake, gfortran, ninja, cudaPackages, libpthreadstubs, lapack, blas }: - -let - inherit (cudaPackages) cudatoolkit; -in - -assert let majorIs = lib.versions.major cudatoolkit.version; - in majorIs == "9" || majorIs == "10" || majorIs == "11"; +{ lib +, stdenv +, fetchurl +, cmake +, ninja +, gfortran +, libpthreadstubs +, lapack +, blas +, cudaPackages +, hip +, hipblas +, hipsparse +, openmp +, useCUDA ? true +, useROCM ? false +, gpuTargets ? [ ] +}: let + inherit (cudaPackages) cudatoolkit cudaFlags; +in stdenv.mkDerivation (finalAttrs: { + pname = "magma"; version = "2.6.2"; - # We define a specific set of CUDA compute capabilities here, - # because CUDA 11 does not support compute capability 3.0. Also, - # we use it to enable newer capabilities that are not enabled - # by magma by default. The list of supported architectures - # can be found in magma's top-level CMakeLists.txt. - cudaCapabilities = rec { - cuda9 = [ - "Kepler" # 3.0, 3.5 - "Maxwell" # 5.0 - "Pascal" # 6.0 - "Volta" # 7.0 - ]; - - cuda10 = [ - "Turing" # 7.5 - ] ++ cuda9; - - cuda11 = [ - "sm_35" # sm_30 is not supported by CUDA 11 - "Maxwell" # 5.0 - "Pascal" # 6.0 - "Volta" # 7.0 - "Turing" # 7.5 - "Ampere" # 8.0 - ]; - }; - - capabilityString = lib.strings.concatStringsSep "," - cudaCapabilities."cuda${lib.versions.major cudatoolkit.version}"; - -in stdenv.mkDerivation { - pname = "magma"; - inherit version; src = fetchurl { - url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; + name = "magma-${finalAttrs.version}.tar.gz"; + url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${finalAttrs.version}.tar.gz"; hash = "sha256-dbVU2rAJA+LRC5cskT5Q5/iMvGLzrkMrWghsfk7aCnE="; - name = "magma-${version}.tar.gz"; }; - nativeBuildInputs = [ gfortran cmake ninja ]; + nativeBuildInputs = [ + cmake + ninja + gfortran + ]; - buildInputs = [ cudatoolkit libpthreadstubs lapack blas ]; + buildInputs = [ + libpthreadstubs + lapack + blas + ] ++ lib.optionals useCUDA [ + cudatoolkit + ] ++ lib.optionals useROCM [ + hip + hipblas + hipsparse + openmp + ]; - cmakeFlags = [ "-DGPU_TARGET=${capabilityString}" ]; + cmakeFlags = lib.optionals useCUDA [ + "-DCMAKE_C_COMPILER=${cudatoolkit.cc}/bin/gcc" + "-DCMAKE_CXX_COMPILER=${cudatoolkit.cc}/bin/g++" + "-DMAGMA_ENABLE_CUDA=ON" + "-DGPU_TARGET=${builtins.concatStringsSep "," cudaFlags.cudaRealArchs}" + ] ++ lib.optionals useROCM [ + "-DCMAKE_C_COMPILER=${hip}/bin/hipcc" + "-DCMAKE_CXX_COMPILER=${hip}/bin/hipcc" + "-DMAGMA_ENABLE_HIP=ON" + "-DGPU_TARGET=${builtins.concatStringsSep "," (if gpuTargets == [ ] then hip.gpuTargets else gpuTargets)}" + ]; + + buildFlags = [ + "magma" + "magma_sparse" + ]; doCheck = false; - preConfigure = '' - export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ - ''; - - enableParallelBuilding=true; - buildFlags = [ "magma" "magma_sparse" ]; + passthru = { + inherit cudatoolkit; + }; meta = with lib; { description = "Matrix Algebra on GPU and Multicore Architectures"; @@ -70,7 +77,7 @@ in stdenv.mkDerivation { homepage = "http://icl.cs.utk.edu/magma/index.html"; platforms = platforms.unix; maintainers = with maintainers; [ tbenst ]; + # CUDA and ROCm are mutually exclusive + broken = useCUDA && useROCM || useCUDA && versionOlder cudatoolkit.version "9"; }; - - passthru.cudatoolkit = cudatoolkit; -} +}) diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 559d8094b287..9becf229c9ef 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -21,46 +21,47 @@ let # Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details: # https://github.com/matthewbauer/undmg/issues/4 - mklVersion = if stdenvNoCC.isDarwin then "2019.3" else "2021.1.1"; - rel = if stdenvNoCC.isDarwin then "199" else "52"; + mklVersion = if stdenvNoCC.isDarwin then "2019.3" else "2023.0.0"; + rel = if stdenvNoCC.isDarwin then "199" else "25398"; # Intel openmp uses its own versioning. - openmpVersion = if stdenvNoCC.isDarwin then "19.0.3" else "19.1.3"; - openmpRel = "189"; + openmpVersion = if stdenvNoCC.isDarwin then "19.0.3" else "2023.0.0"; + openmpRel = "25370"; # Thread Building Blocks release. - tbbRel = "119"; + tbbVersion = if stdenvNoCC.isDarwin then "2019.3" else "2021.8.0"; + tbbRel = "25334"; shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary; oneapi-mkl = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm"; - hash = "sha256-G2Y7iX3UN2YUJhxcMM2KmhONf0ls9owpGlOo8hHOfqA="; + hash = "sha256-fiL5TDmQHB+OQb1ERcoDQFpUutpsPe+AqIbMoa85nEk="; }; oneapi-mkl-common = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-${mklVersion}-${mklVersion}-${rel}.noarch.rpm"; - hash = "sha256-HrMt2OcPIRxM8EL8SPjYTyuHJnC7RhPFUrvLhRH+7vc="; + hash = "sha256-AFayUxybi48SgR2mX6mxkNECconIXm1/TWelvE4aqX0="; }; oneapi-mkl-common-devel = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-devel-${mklVersion}-${mklVersion}-${rel}.noarch.rpm"; - hash = "sha256-XDE2WFJzEcpujFmO2AvqQdipZMvKB6/G+ksBe2sE438="; + hash = "sha256-riyIO2xWuvTSzfXgB+K6NSKqWLRmxKSnGZaH5nYTYPk="; }; oneapi-mkl-devel = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-devel-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm"; - hash = "sha256-GhUJZ0Vr/ZXp10maie29/5ryU7zzX3F++wRCuuFcE0s="; + hash = "sha256-2IK0t47FaPNp7Oq9LJ5ZdLmlFFjQluWrh+nhvi8MCd8="; }; oneapi-openmp = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-openmp-${mklVersion}-${mklVersion}-${openmpRel}.x86_64.rpm"; - hash = "sha256-yP2c4aQAFNRffjLoIZgWXLcNXbiez8smsgu2wXitefU="; + hash = "sha256-grzVFWqt3Vpwb5K3Bur+sJz8pdKxZ4ISJXF5YAPrwmk="; }; oneapi-tbb = fetchurl { - url = "https://yum.repos.intel.com/oneapi/intel-oneapi-tbb-${mklVersion}-${mklVersion}-${tbbRel}.x86_64.rpm"; - hash = "sha256-K1BvhGoGVU2Zwy5vg2ZvJWBrSdh5uQwo0znt5039X0A="; + url = "https://yum.repos.intel.com/oneapi/intel-oneapi-tbb-${tbbVersion}-${tbbVersion}-${tbbRel}.x86_64.rpm"; + hash = "sha256-8hIoRfV36XVElKCqP9UmCkjLCs3l0ZKCHxg+yxNIHc0="; }; in stdenvNoCC.mkDerivation ({ @@ -128,23 +129,23 @@ in stdenvNoCC.mkDerivation ({ done # License - install -Dm0655 -t $out/share/doc/mkl opt/intel/oneapi/mkl/2021.1.1/licensing/en/license.txt + install -Dm0655 -t $out/share/doc/mkl opt/intel/oneapi/mkl/${mklVersion}/licensing/license.txt # Dynamic libraries mkdir -p $out/lib cp -a opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib - cp -a opt/intel/oneapi/compiler/2021.1.1/linux/compiler/lib/intel64_lin/*.so* $out/lib - cp -a opt/intel/oneapi/tbb/2021.1.1/lib/intel64/gcc4.8/*.so* $out/lib + cp -a opt/intel/oneapi/compiler/${mklVersion}/linux/compiler/lib/intel64_lin/*.so* $out/lib + cp -a opt/intel/oneapi/tbb/${tbbVersion}/lib/intel64/gcc4.8/*.so* $out/lib # Headers cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/ '' + (if enableStatic then '' install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.a - install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/2021.1.1/tools/pkgconfig/*.pc + install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/tools/pkgconfig/*.pc '' else '' cp opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib - install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/2021.1.1/tools/pkgconfig/*dynamic*.pc + install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/lib/pkgconfig/*dynamic*.pc '') + '' # Setup symlinks for blas / lapack ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt} diff --git a/pkgs/development/libraries/science/math/mongoose/default.nix b/pkgs/development/libraries/science/math/mongoose/default.nix index 7dd52f3b663d..c7348c9e4a98 100644 --- a/pkgs/development/libraries/science/math/mongoose/default.nix +++ b/pkgs/development/libraries/science/math/mongoose/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, fetchpatch , cmake }: @@ -16,15 +18,27 @@ stdenv.mkDerivation rec { sha256 = "0ymwd4n8p8s0ndh1vcbmjcsm0x2cc2b7v3baww5y6as12873bcrh"; }; + patches = [ + # TODO: remove on next release + (fetchpatch { + name = "add-an-option-to-disable-coverage.patch"; + url = "https://github.com/ScottKolo/Mongoose/commit/39f4a0059ff7bad5bffa84369f31839214ac7877.patch"; + sha256 = "sha256-V8lCq22ixCCzLmKtW6bUL8cvJFZzdgYoA4BFs4xYd3c="; + }) + ]; + nativeBuildInputs = [ cmake ]; + # ld: file not found: libclang_rt.profile_osx.a + cmakeFlags = lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DENABLE_COVERAGE=OFF"; + meta = with lib; { description = "Graph Coarsening and Partitioning Library"; homepage = "https://github.com/ScottKolo/Mongoose"; - license = licenses.gpl3; - maintainers = with maintainers; []; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wegank ]; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index f3ec52f6a5d7..0477f859eef5 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -32,8 +32,6 @@ , python3 }: -with lib; - let blas64_ = blas64; in let @@ -121,7 +119,7 @@ let blas64 = if blas64_ != null then blas64_ - else hasPrefix "x86_64" stdenv.hostPlatform.system; + else lib.hasPrefix "x86_64" stdenv.hostPlatform.system; # Convert flag values to format OpenBLAS's build expects. # `toString` is almost what we need other than bools, # which we need to map {true -> 1, false -> 0} @@ -129,7 +127,7 @@ let mkMakeFlagValue = val: if !builtins.isBool val then toString val else if val then "1" else "0"; - mkMakeFlagsFromConfig = mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}"); + mkMakeFlagsFromConfig = lib.mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}"); shlibExt = stdenv.hostPlatform.extensions.sharedLibrary; diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 30feab0c9bf6..983c4e129685 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { python.pkgs.protobuf python.pkgs.numpy ]; - checkInputs = [ + nativeCheckInputs = [ python.pkgs.matplotlib python.pkgs.pandas python.pkgs.virtualenv diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index e847d1decd24..ae95fefe0e63 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -67,11 +67,6 @@ 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; diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index c0abcf6da659..0d553376288f 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ]; - checkInputs = [ openssh ]; + nativeCheckInputs = [ openssh ]; buildInputs = [ blas lapack ]; propagatedBuildInputs = [ mpi ]; hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix index cf2346bad271..a15b3512aec3 100644 --- a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix +++ b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix @@ -6,7 +6,6 @@ , fetchpatch , fetchurl , flatbuffers -, hostPlatform , lib , zlib }: @@ -160,7 +159,7 @@ stdenv.mkDerivation rec { mkdir "$out" # copy the static lib and binaries into the output dir - cp -r ./tensorflow/lite/tools/make/gen/linux_${hostPlatform.uname.processor}/{bin,lib} "$out" + cp -r ./tensorflow/lite/tools/make/gen/linux_${stdenv.hostPlatform.uname.processor}/{bin,lib} "$out" find ./tensorflow/lite -type f -name '*.h' | while read f; do path="$out/include/''${f/.\//}" diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index 3ec97e4a288e..13344db9ebc3 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - # Tuning (either autotuning or with hand-written paramters) is possible + # Tuning (either autotuning or with hand-written parameters) is possible # but not implemented here. # It seems buggy anyways (see homepage). buildFlags = [ "all" "${libbasename}${libext}" ]; diff --git a/pkgs/development/libraries/science/networking/ns-3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix index 9f80470eff2c..0eba41234fd5 100644 --- a/pkgs/development/libraries/science/networking/ns-3/default.nix +++ b/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -101,11 +101,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" "strictoverflow"]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "http://www.nsnam.org"; license = licenses.gpl3; description = "A discrete time event network simulator"; platforms = with platforms; unix; maintainers = with maintainers; [ teto rgrunbla ]; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/pkgs/development/libraries/semver-cpp/default.nix b/pkgs/development/libraries/semver-cpp/default.nix new file mode 100644 index 000000000000..966f170eaad0 --- /dev/null +++ b/pkgs/development/libraries/semver-cpp/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "semver-cpp"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "Neargye"; + repo = "semver"; + rev = "v${version}"; + sha256 = "sha256-nRWmY/GJtSkPJIW7i7/eIr/YtfyvYhJVZBRIDXUC7xg="; + }; + + # Header-only library. + dontBuild = true; + + installPhase = '' + mkdir "$out" + cp -r include "$out" + ''; + + meta = with lib; { + description = "Semantic Versioning for modern C++"; + homepage = "https://github.com/Neargye/semver"; + maintainers = with maintainers; [ aidalgol ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index a4b096cee39b..263060f7676a 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -1,18 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, breakpad, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, curl +, breakpad +, pkg-config +}: stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - sha256 = "sha256-zSu6jcls1PtoSZNp6VGnXrXS5ViiY6ZghPYWaVwPVtw="; + hash = "sha256-qRtr+Og75eowKJjezRSGlRp9Ps2A75zY80IqZMRa4Sw="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ curl breakpad ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + curl + breakpad + ]; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DSENTRY_BREAKPAD_SYSTEM=On" @@ -20,7 +35,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/getsentry/sentry-native"; - description = "Sentry SDK for C, C++ and native applications."; + description = "Sentry SDK for C, C++ and native applications"; + changelog = "https://github.com/getsentry/sentry-native/blob/${version}/CHANGELOG.md"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ wheelsandmetal ]; diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index a29706aefc48..41c0c3217a49 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -5,7 +5,6 @@ , freetype , cmake , static ? stdenv.hostPlatform.isStatic -, libgcc }: stdenv.mkDerivation rec { @@ -19,9 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ freetype ] - # On aarch64-darwin libgcc won't even build currently, and it doesn't seem needed. - ++ lib.optionals (with stdenv; !cc.isGNU && !(isDarwin && isAarch64)) [ libgcc ]; + buildInputs = [ freetype ]; patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ]; diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 5a4e82d815fc..9f04cee3869a 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,20 +2,26 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-Ub0gHxnc4ljVqbAWuFJYBuhA4FjX4ypg1gaPXUrcWkE="; + sha256 = "sha256-gIRfmCCkDokUhBKsQnWx8jQtfoYBgY65IS+tdmgeaYE="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DSIMDJSON_DEVELOPER_MODE=OFF" - ] ++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF"; + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + "-DBUILD_SHARED_LIBS=OFF" + ] ++ lib.optionals (with stdenv.hostPlatform; isPower && isBigEndian) [ + # Assume required CPU features are available, since otherwise we + # just get a failed build. + "-DCMAKE_CXX_FLAGS=-mpower8-vector" + ]; meta = with lib; { homepage = "https://simdjson.org/"; diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index 649c1dbae27a..5fe290f04f2c 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.3.14"; + version = "2020.3.17"; 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-NbpHn1e9+TD+9/iSFBw16/CQMXYx3D/aSDhkSGdBT3Q="; + sha256 = "sha256-TF6c0Nz/G9MRwkYKpgEjC9gKvbrsdRtVnB1xR3SfN3w="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index 71a3b7ffee72..a09ac168ba46 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "simpleitk"; - version = "2.1.1.2"; + version = "2.2.1"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "SimpleITK"; repo = "SimpleITK"; rev = "v${version}"; - sha256 = "sha256-sokJXOz6p+0eTeps5Tt24pjB3u+L1s6mDlaWN7K9m3g="; + hash = "sha256-0YxmixUTXpjegZQv7DDCNTWFTH8QEWqQQszee7aQ5EI="; }; nativeBuildInputs = [ cmake swig4 ]; diff --git a/pkgs/development/libraries/smokegen/default.nix b/pkgs/development/libraries/smokegen/default.nix index 643ae1064db7..2a93965aeb39 100644 --- a/pkgs/development/libraries/smokegen/default.nix +++ b/pkgs/development/libraries/smokegen/default.nix @@ -1,16 +1,18 @@ -{ pkgs, lib, ... }: +{ stdenv, lib, cmake, qt4, fetchzip }: -pkgs.stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "smokegen"; - version = "v4.14.3"; - src = pkgs.fetchzip { - url = "https://invent.kde.org/unmaintained/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; + version = "4.14.3"; + + src = fetchzip { + url = "https://invent.kde.org/unmaintained/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz"; hash = "sha256-finsoruPeJZLawIjNUJ25Pq54eaCByfALVraNQJPk7c="; }; - buildInputs = [ pkgs.cmake pkgs.qt4 ]; - buildPhase = '' - cmake . - ''; + + strictDeps = true; + nativeBuildInputs = [ cmake qt4 ]; + buildInputs = [ qt4 ]; + meta = with lib; { description = "A general purpose C++ parser with a plugin infrastructure"; homepage = "https://invent.kde.org/unmaintained/smokegen"; diff --git a/pkgs/development/libraries/smokeqt/default.nix b/pkgs/development/libraries/smokeqt/default.nix index 145a9f243bb3..1c427b8abb70 100644 --- a/pkgs/development/libraries/smokeqt/default.nix +++ b/pkgs/development/libraries/smokeqt/default.nix @@ -1,16 +1,22 @@ -{ pkgs, lib, ... }: +{ stdenv, lib, cmake, qt4, smokegen, fetchzip }: -pkgs.stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "smokeqt"; - version = "v4.14.3"; - src = pkgs.fetchzip { - url = "https://invent.kde.org/unmaintained/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; + version = "4.14.3"; + + src = fetchzip { + url = "https://invent.kde.org/unmaintained/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz"; hash = "sha256-8FiEGF8gduVw5I/bi2wExGUWmjIjYEhWpjpXKJGBNMg="; }; + + strictDeps = true; + nativeBuildInputs = [ cmake smokegen ]; + buildInputs = [ qt4 ]; + cmakeFlags = [ "-DCMAKE_CXX_STANDARD=98" ]; - buildInputs = [ pkgs.cmake pkgs.qt4 pkgs.smokegen ]; + meta = with lib; { description = "Bindings for the Qt libraries"; homepage = "https://invent.kde.org/unmaintained/smokeqt"; diff --git a/pkgs/development/libraries/snap7/default.nix b/pkgs/development/libraries/snap7/default.nix index 3419c4c6c2a6..f83ee00d04fd 100644 --- a/pkgs/development/libraries/snap7/default.nix +++ b/pkgs/development/libraries/snap7/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://snap7.sourceforge.net/"; + homepage = "https://snap7.sourceforge.net/"; description = "Step7 Open Source Ethernet Communication Suite"; license = licenses.lgpl3; maintainers = with maintainers; [ freezeboy ]; diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix index 142081da0153..154924922ad0 100644 --- a/pkgs/development/libraries/soci/default.nix +++ b/pkgs/development/libraries/soci/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Database access library for C++"; - homepage = "http://soci.sourceforge.net/"; + homepage = "https://soci.sourceforge.net/"; license = licenses.boost; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 19dfb62002e2..f0f9596f95dd 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "socket_wrapper"; - version = "1.3.4"; + version = "1.4.0"; src = fetchurl { url = "mirror://samba/cwrap/socket_wrapper-${version}.tar.gz"; - sha256 = "sha256-dmYeXGXbe05WiT2ZDrH4aCmymDjj8SqrZyEc3d0Uf0Y="; + sha256 = "sha256-IGQQBSyh8hjZuymmRtU4FI2n7FyYmP28Nun9eorvAHY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index 6a54c2a80755..bd4dc73c1e5d 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.9"; + version = "1.13.12"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xF2LFbxGhA/gF7Z2LX3WYq3nXOLi0ARGGR4Dd3PCftk="; + sha256 = "sha256-2K5Lt2zk5MXKD9zIQ2pBt2IRx/H1Zg/S70dsrpI2mTM="; }; buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/development/libraries/sope/default.nix index 83442035d7b4..1a6a9770362e 100644 --- a/pkgs/development/libraries/sope/default.nix +++ b/pkgs/development/libraries/sope/default.nix @@ -1,24 +1,23 @@ { gnustep, lib, fetchFromGitHub , libxml2, openssl , openldap, mariadb, libmysqlclient, postgresql }: -with lib; gnustep.stdenv.mkDerivation rec { pname = "sope"; - version = "5.7.0"; + version = "5.8.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOPE-${version}"; - sha256 = "sha256-mS685NOB6IN3a5tE3yr+VUq55Ouc5af9aJ2wTfGsAlo="; + hash = "sha256-sXIpKdJ5930+W+FsxQ8DZOq/49XWMM1zV8dIzbQdcbc="; }; hardeningDisable = [ "format" ]; nativeBuildInputs = [ gnustep.make ]; - buildInputs = flatten ([ gnustep.base libxml2 openssl ] - ++ optional (openldap != null) openldap - ++ optionals (mariadb != null) [ libmysqlclient mariadb ] - ++ optional (postgresql != null) postgresql); + buildInputs = lib.flatten ([ gnustep.base libxml2 openssl ] + ++ lib.optional (openldap != null) openldap + ++ lib.optionals (mariadb != null) [ libmysqlclient mariadb ] + ++ lib.optional (postgresql != null) postgresql); postPatch = '' # Exclude NIX_ variables @@ -30,9 +29,9 @@ gnustep.stdenv.mkDerivation rec { ''; configureFlags = [ "--prefix=" "--disable-debug" "--enable-xml" "--with-ssl=ssl" ] - ++ optional (openldap != null) "--enable-openldap" - ++ optional (mariadb != null) "--enable-mysql" - ++ optional (postgresql != null) "--enable-postgresql"; + ++ lib.optional (openldap != null) "--enable-openldap" + ++ lib.optional (mariadb != null) "--enable-mysql" + ++ lib.optional (postgresql != null) "--enable-postgresql"; # Yes, this is ugly. preFixup = '' @@ -40,7 +39,7 @@ gnustep.stdenv.mkDerivation rec { rm -rf $out/nix/store ''; - meta = { + meta = with lib; { description = "An extensive set of frameworks which form a complete Web application server environment"; license = licenses.publicDomain; homepage = "https://github.com/inverse-inc/sope"; diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index 318ead830f9b..c337edfa0917 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "soundtouch"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "soundtouch"; repo = "soundtouch"; rev = version; - sha256 = "10znckb8mrnmvwj7vq12732al873qhqw27fpb5f8r0bkjdpcj3vr"; + sha256 = "sha256-+RprzCn0NCueHhDkk2Lgg7Ihw8JDzu25eIVoVZwF+BA="; }; nativeBuildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 021246d73028..962d056ce7dd 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { src = ./fix-paths.patch; utillinux = util-linux; }) - ] ++ lib.optionals espeak.mbrolaSupport [ + ] ++ lib.optionals (withEspeak && espeak.mbrolaSupport) [ # Replace FHS paths. (substituteAll { src = ./fix-mbrola-paths.patch; diff --git a/pkgs/development/libraries/speedtest-exporter/default.nix b/pkgs/development/libraries/speedtest-exporter/default.nix new file mode 100644 index 000000000000..51ab1ac33d03 --- /dev/null +++ b/pkgs/development/libraries/speedtest-exporter/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "speedtest-exporter"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "nlamirault"; + repo = "speedtest_exporter"; + rev = "v${version}"; + hash = "sha256-WIMDv63sHyZVw3Ct5LFXCIufj7sU2H81n+hT/NiPMeQ="; + }; + + vendorHash = "sha256-Lm73pZzdNZv7J+vKrtQXxm4HiAuB9lugKT/oanmD0HM="; + + meta = with lib; { + description = "Prometheus exporter for Speedtest metrics"; + homepage = "https://github.com/nlamirault/speedtest_exporter"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + mainProgram = "speedtest_exporter"; + }; +} diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 2564162c3bf1..2111b23a6f75 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -23,6 +23,7 @@ , libusb1 , lz4 , meson +, mesonEmulatorHook , ninja , openssl , perl @@ -36,6 +37,7 @@ , usbredir , vala , wayland-protocols +, wayland-scanner , zlib , withPolkit ? stdenv.isLinux }: @@ -82,6 +84,10 @@ stdenv.mkDerivation rec { "# meson.add_install_script('../build-aux/setcap-or-suid'," ''; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ docbook_xsl gettext @@ -95,6 +101,10 @@ stdenv.mkDerivation rec { python3.pkgs.pyparsing python3.pkgs.six vala + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + mesonEmulatorHook + ] ++ lib.optionals stdenv.isLinux [ + wayland-scanner ]; propagatedBuildInputs = [ @@ -118,6 +128,7 @@ stdenv.mkDerivation rec { pixman spice-protocol usbredir + vala zlib ] ++ lib.optionals withPolkit [ polkit @@ -137,6 +148,8 @@ stdenv.mkDerivation rec { "-Dpolkit=disabled" ] ++ lib.optionals (!stdenv.isLinux) [ "-Dlibcap-ng=disabled" + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + "-Dcoroutine=gthread" # Fixes "Function missing:makecontext" ]; meta = with lib; { diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index d1c854f0cfb2..78dc373d4ab6 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.231.0"; + version = "1.3.236.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "sdk-${version}"; - hash = "sha256-lUWgZYGPu+IaLUrbtyC7R0o3Hq/q7C7BE8r7DAsiC30="; + hash = "sha256-eWI1MyIWxcg1JepRsnHBmitehDigDa+dR8kXvIkYejY="; }; nativeBuildInputs = [ cmake ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit (src.meta) homepage; description = "Machine-readable components of the Khronos SPIR-V Registry"; + homepage = "https://github.com/KhronosGroup/SPIRV-Headers"; license = licenses.mit; maintainers = [ maintainers.ralith ]; }; diff --git a/pkgs/development/libraries/sptk/default.nix b/pkgs/development/libraries/sptk/default.nix index 6b62b831cb98..078d07a62825 100644 --- a/pkgs/development/libraries/sptk/default.nix +++ b/pkgs/development/libraries/sptk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sptk"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "sp-nitech"; repo = "SPTK"; rev = "v${version}"; - hash = "sha256-Be3Pbg+vt/P3FplZN7yBL+HVq/BmzaBcwKOBsbH7r9g="; + hash = "sha256-t8XVdKrrewfqefUnEz5xHgRHF0NThNQD1KGPMLOO/o8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index 7a6b53cb9bf3..bd8bb5fb56dd 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -1,19 +1,42 @@ -{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, buildPackages, readline, ncurses, zlib, sqlite }: +{ lib +, stdenv +, fetchFromGitHub +, openssl +, tcl +, installShellFiles +, buildPackages +, readline +, ncurses +, zlib +, sqlite +}: stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.5.2"; + version = "4.5.3"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "sha256-EUm4akVWUiK8U6Je1uWMo8KLQLsk57kOFCCU5Uajjt8="; + hash = "sha256-yo7bB6xgF23Hdur25fprSFgbuxNclseUCdq3DFAfIK8="; }; - nativeBuildInputs = [ installShellFiles tcl ]; - buildInputs = [ readline ncurses openssl zlib ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ + installShellFiles + tcl + ]; + + buildInputs = [ + readline + ncurses + openssl + zlib + ]; + + depsBuildBuild = [ + buildPackages.stdenv.cc + ]; configureFlags = [ "--enable-threadsafe" @@ -35,9 +58,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://www.zetetic.net/sqlcipher/"; + changelog = "https://github.com/sqlcipher/sqlcipher/blob/v${version}/CHANGELOG.md"; description = "SQLite extension that provides 256 bit AES encryption of database files"; - platforms = platforms.unix; + homepage = "https://www.zetetic.net/sqlcipher/"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/sqlite/archive-version.nix b/pkgs/development/libraries/sqlite/archive-version.nix index 75d70680fbf9..601bb6a5889f 100644 --- a/pkgs/development/libraries/sqlite/archive-version.nix +++ b/pkgs/development/libraries/sqlite/archive-version.nix @@ -1,11 +1,9 @@ lib: version: -with lib; - let - fragments = splitVersion version; - major = head fragments; - minor = concatMapStrings (fixedWidthNumber 2) (tail fragments); + fragments = lib.splitVersion version; + major = lib.head fragments; + minor = lib.concatMapStrings (lib.fixedWidthNumber 2) (lib.tail fragments); in major + minor + "00" diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 085e330bed48..f4654a843f6b 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, zlib, readline, ncurses # for tests -, python3Packages, sqldiff, sqlite-analyzer +, python3Packages, sqldiff, sqlite-analyzer, tracker # uses readline & ncurses for a better interactive experience if set to true , interactive ? false @@ -9,34 +9,32 @@ , enableDeserialize ? false }: -with lib; - let archiveVersion = import ./archive-version.nix lib; in stdenv.mkDerivation rec { - pname = "sqlite${optionalString interactive "-interactive"}"; - version = "3.39.4"; + pname = "sqlite${lib.optionalString interactive "-interactive"}"; + version = "3.40.1"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2022/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "sha256-8x1EW0jmfihM8gZxfMFwq2PL5P1/eagnk7dyKF54/bs="; + sha256 = "sha256-LF3qIH+lCNdlrx72ILY33LBlcq+m8B8IFb1bv4ZLM9k="; }; outputs = [ "bin" "dev" "out" ]; separateDebugInfo = stdenv.isLinux; - buildInputs = [ zlib ] ++ optionals interactive [ readline ncurses ]; + buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ]; # required for aarch64 but applied for all arches for simplicity preConfigure = '' patchShebangs configure ''; - configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline"; + configureFlags = [ "--enable-threadsafe" ] ++ lib.optional interactive "--enable-readline"; NIX_CFLAGS_COMPILE = toString ([ "-DSQLITE_ENABLE_COLUMN_METADATA" @@ -91,10 +89,10 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (python3Packages) sqlalchemy; - inherit sqldiff sqlite-analyzer; + inherit sqldiff sqlite-analyzer tracker; }; - meta = { + meta = with lib; { description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; downloadPage = "https://sqlite.org/download.html"; homepage = "https://www.sqlite.org/"; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 4467f38b0479..bb0a1a7d7393 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.39.4"; + version = "3.40.1"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2022/sqlite-src-${archiveVersion version}.zip"; - sha256 = "sha256-AtlsbM+BGrm2ORnvcX9+UqRQxCDga9Ep+0g81ww7O7o="; + sha256 = "sha256-UGQSaqUNsgw1V4thK1bDEpQlwFBu1NFhDvpKDwG9+NA="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/sqlitecpp/default.nix b/pkgs/development/libraries/sqlitecpp/default.nix index 81843628d42b..f4b2ee9e9a95 100644 --- a/pkgs/development/libraries/sqlitecpp/default.nix +++ b/pkgs/development/libraries/sqlitecpp/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "sqlitecpp"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "SRombauts"; repo = pname; rev = version; - sha256 = "sha256-Z1c2lQZ0UltcIf9dTnumZPhke4uEmsjg/Ygppvx3kxY="; + sha256 = "sha256-uVvlW95UD1dhJfNuKgo7XvbdXrHl95OhaEpWfn0RH/E="; }; nativeBuildInputs = [ cmake ]; - checkInputs = [ cppcheck ]; + nativeCheckInputs = [ cppcheck ]; buildInputs = [ sqlite gtest ]; doCheck = true; diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix index 2e1a96eebbde..97e55a03033a 100644 --- a/pkgs/development/libraries/srt/default.nix +++ b/pkgs/development/libraries/srt/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, openssl }: -with lib; stdenv.mkDerivation rec { pname = "srt"; version = "1.5.1"; @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { "-UCMAKE_INSTALL_LIBDIR" ]; - meta = { + meta = with lib; { description = "Secure, Reliable, Transport"; homepage = "https://github.com/Haivision/srt"; license = licenses.mpl20; diff --git a/pkgs/development/libraries/stargate-libcds/default.nix b/pkgs/development/libraries/stargate-libcds/default.nix index 409d9e820fce..b74f19e1959a 100644 --- a/pkgs/development/libraries/stargate-libcds/default.nix +++ b/pkgs/development/libraries/stargate-libcds/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { PLAT_FLAGS = lib.optionalString stdenv.isx86_64 "-mfpmath=sse -mssse3"; patches = [ - # Remove unecessary tests (valgrind, coverage) + # Remove unnecessary tests (valgrind, coverage) ./Makefile.patch # Fix for building on darwin diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix index 9cc61d200086..61c30ebcf033 100644 --- a/pkgs/development/libraries/subunit/default.nix +++ b/pkgs/development/libraries/subunit/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "subunit"; - version = "1.4.0"; + version = "1.4.2"; src = fetchurl { url = "https://launchpad.net/subunit/trunk/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "1h7i5ifcx20qkya24j11nbwa829klw7dvnlljdgivgvcx6b20y80"; + hash = "sha256-hlOOv6kIC97w7ICVsuXeWrsUbVu3tCSzEVKUHXYG2dI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 367b7d999eee..7868214e6cd7 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "6.4.1"; + version = "6.5.0"; outputs = [ "out" "examples" ]; src = fetchurl { url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz"; - hash = "sha256-e/EKjSkgWRrz+6LbklSOka1g63JBqyM1CpsbxR4F6NA="; + hash = "sha256-TguZjf8pKiYX4Xlgm1ObUR64CDb1+qz4AOaIqIYohQI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/swift-corelibs-libdispatch/default.nix b/pkgs/development/libraries/swift-corelibs-libdispatch/default.nix deleted file mode 100644 index 76cc0d3e30ef..000000000000 --- a/pkgs/development/libraries/swift-corelibs-libdispatch/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, clangStdenv -, fetchFromGitHub -, cmake -, ninja -, libbsd -, libsystemtap -}: - -let - version = "5.5"; -in clangStdenv.mkDerivation { - pname = "swift-corelibs-libdispatch"; - inherit version; - - outputs = [ "out" "dev" "man" ]; - - src = fetchFromGitHub { - owner = "apple"; - repo = "swift-corelibs-libdispatch"; - rev = "swift-${version}-RELEASE"; - sha256 = "sha256-MbLgmS6qRSRT+2dGqbYTNb5MTM4Wz/grDXFk1kup+jk="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - libbsd - libsystemtap - ]; - - meta = { - description = "Grand Central Dispatch"; - homepage = "https://github.com/apple/swift-corelibs-libdispatch"; - platforms = lib.platforms.linux; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.cmm ]; - }; -} diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index 848fd57336ee..c779e16cbbb3 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "swiften"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; - sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; + url = "http://swift.im/git/swift/snapshot/swift-${version}.tar.bz2"; + hash = "sha256-aj+T6AevtR8birbsj+83nfzFC6cf72q+7nwSM0jaZrA="; }; patches = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - sconsPackages.scons_3_1_2 + sconsPackages.scons_latest ]; buildInputs = [ @@ -65,6 +65,10 @@ stdenv.mkDerivation rec { postPatch = '' # Ensure bundled dependencies cannot be used. rm -rf 3rdParty + + find . \( \ + -name '*.py' -o -name SConscript -o -name SConstruct \ + \) -exec 2to3 -w {} + ''; installTargets = "${placeholder "out"}"; diff --git a/pkgs/development/libraries/ta-lib/default.nix b/pkgs/development/libraries/ta-lib/default.nix new file mode 100644 index 000000000000..57e3f34bc646 --- /dev/null +++ b/pkgs/development/libraries/ta-lib/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: + +stdenv.mkDerivation rec { + name = "ta-lib"; + version = "0.4.0"; + src = fetchFromGitHub { + owner = "rafa-dot-el"; + repo = "talib"; + rev = "${version}"; + sha256 = "sha256-bIzN8f9ZiOLaVzGAXcZUHUh/v9z1U+zY+MnyjJr1lSw="; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + hardeningDisable = [ "format" ]; + + meta = with lib; { + description = + "TA-Lib is a library that provides common functions for the technical analysis of financial market data."; + homepage = "https://ta-lib.org/"; + license = lib.licenses.bsd3; + + platforms = platforms.linux; + maintainers = with maintainers; [ rafael ]; + }; +} diff --git a/pkgs/development/libraries/tagparser/default.nix b/pkgs/development/libraries/tagparser/default.nix index 06f316522217..8eb57c5441f1 100644 --- a/pkgs/development/libraries/tagparser/default.nix +++ b/pkgs/development/libraries/tagparser/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "tagparser"; - version = "11.5.0"; + version = "11.5.1"; src = fetchFromGitHub { owner = "Martchus"; repo = "tagparser"; rev = "v${version}"; - hash = "sha256-qgopl32cFQFQTYu9WBOzPeU69J8K49SREX7X0Pw7Als="; + hash = "sha256-6HvPbbDsHIYyTs0M5M8TkgqyAz0QtgRjuNJhYWFjNG4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/taskflow/default.nix b/pkgs/development/libraries/taskflow/default.nix index dd2f8fb39144..cde327c550eb 100644 --- a/pkgs/development/libraries/taskflow/default.nix +++ b/pkgs/development/libraries/taskflow/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "taskflow"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "taskflow"; repo = "taskflow"; rev = "v${version}"; - hash = "sha256-5bTTV/WAxslHQ+hvATtUUA1h3MuNzwVTlYMbD/sINRM="; + hash = "sha256-UUWJENGn60YQdUSQ55uL+/3xt/JUsVuKnqm/ef7wPVM="; }; patches = [ diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix index c24768bbbdc8..cdb2b5193291 100644 --- a/pkgs/development/libraries/tclap/default.nix +++ b/pkgs/development/libraries/tclap/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://tclap.sourceforge.net/"; + homepage = "https://tclap.sourceforge.net/"; description = "Templatized C++ Command Line Parser Library"; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix index 3c814e17207c..829015e8ebba 100644 --- a/pkgs/development/libraries/tclx/default.nix +++ b/pkgs/development/libraries/tclx/default.nix @@ -17,7 +17,7 @@ tcl.mkTclDerivation rec { ''; meta = { - homepage = "http://tclx.sourceforge.net/"; + homepage = "https://tclx.sourceforge.net/"; description = "Tcl extensions"; license = lib.licenses.tcltk; maintainers = with lib.maintainers; [ kovirobi ]; diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index afbdc374ce49..575d8f4c4e0c 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "tdlib"; - version = "1.8.7"; + version = "1.8.10"; src = fetchFromGitHub { owner = "tdlib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "a7a17b34b3c8fd3f7f6295f152746beb68f34d83"; - sha256 = "sha256:0a5609knn7rmiiblz315yrvc9f2r207l2nl6brjy5bnhjdspmzs6"; + rev = "93c42f6d7c1209937431469f80427d48907f1b8d"; + hash = "sha256-vdaVnC26txUBp8rlqx1CdLHlNlack3XXYdfFal1VLh4="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index accc02499d46..605da19f77fc 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config python ]; propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ]; buildInputs = [ dbus-glib ]; - checkInputs = [ dbus.daemon dbus-python ]; + nativeCheckInputs = [ dbus dbus-python ]; # No point in building tests if they are not run # On 0.9.7, they do not even build with QT4 diff --git a/pkgs/development/libraries/tensile/default.nix b/pkgs/development/libraries/tensile/default.nix index d957ea749441..c6117167855f 100644 --- a/pkgs/development/libraries/tensile/default.nix +++ b/pkgs/development/libraries/tensile/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, rocmUpdateScript , buildPythonPackage , pyyaml , msgpack @@ -9,14 +10,13 @@ buildPythonPackage rec { pname = "tensile"; - rocmVersion = "5.3.1"; - version = "4.34.0-${rocmVersion}"; + version = "5.4.2"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "Tensile"; - rev = "rocm-${rocmVersion}"; - hash = "sha256-QWt/zzBrZKM8h3MTnbLX4vN3p6cCQvo67U1C2yqAQxw="; + rev = "rocm-${version}"; + hash = "sha256-W6yr6mptfsiJSSzPCImgqI1EmsUv+l99SjqkoZsOjag="; }; buildInputs = [ @@ -25,10 +25,18 @@ buildPythonPackage rec { pandas ]; + passthru.updateScript = rocmUpdateScript { + name = pname; + owner = src.owner; + repo = src.repo; + }; + meta = with lib; { description = "GEMMs and tensor contractions"; homepage = "https://github.com/ROCmSoftwarePlatform/Tensile"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor version != versions.minor stdenv.cc.version; }; } diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index 259d59646556..3b228b6c6250 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "tepl"; - version = "6.2.0"; + version = "6.4.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "jNaGXCw4GIdgyzjK4z3J4KiI+tGNCwTx1V5laqmJqEQ="; + sha256 = "XlayBmnQzwX6HWS1jIw0LFkVgSLcUYEA0JPVnfm4cyE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/the-foundation/default.nix b/pkgs/development/libraries/the-foundation/default.nix index 95c8653a4663..95ea916e09b9 100644 --- a/pkgs/development/libraries/the-foundation/default.nix +++ b/pkgs/development/libraries/the-foundation/default.nix @@ -10,16 +10,16 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "the-foundation"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitea { domain = "git.skyjake.fi"; owner = "skyjake"; repo = "the_Foundation"; - rev = "v${version}"; - hash = "sha256-IHwWJryG4HcrW9Bf8KJrisCrbF86RBQj6Xl1HTmcr6k="; + rev = "v${finalAttrs.version}"; + hash = "sha256-wPFBKc20/ED58RFpDhmPnlSHCf3FG5sD2ubQOl5NF+o="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 19ebadd895f1..bb71b7ca9093 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { doxygen ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - checkInputs = [ + nativeCheckInputs = [ gtest ]; diff --git a/pkgs/development/libraries/tinygltf/default.nix b/pkgs/development/libraries/tinygltf/default.nix index d0f5d0add698..65cd814c1e6c 100644 --- a/pkgs/development/libraries/tinygltf/default.nix +++ b/pkgs/development/libraries/tinygltf/default.nix @@ -6,21 +6,19 @@ }: stdenv.mkDerivation rec { - version = "2.6.3"; + version = "2.8.2"; pname = "tinygltf"; src = fetchFromGitHub { owner = "syoyo"; repo = "tinygltf"; rev = "v${version}"; - sha256 = "sha256-IyezvHzgLRyc3z8HdNsQMqDEhP+Ytw0stFNak3C8lTo="; + sha256 = "sha256-0O+Vfsd1omCXeSGdjLZ29yTutC+527NCIBm6hU3qKj4="; }; nativeBuildInputs = [ cmake ]; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Header only C++11 tiny glTF 2.0 library"; diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix index c576405bb3b6..93500e17b7d4 100644 --- a/pkgs/development/libraries/tinyxml-2/default.nix +++ b/pkgs/development/libraries/tinyxml-2/default.nix @@ -2,17 +2,25 @@ stdenv.mkDerivation rec { pname = "tinyxml-2"; - version = "6.0.0"; + version = "9.0.0"; src = fetchFromGitHub { repo = "tinyxml2"; owner = "leethomason"; rev = version; - sha256 = "031fmhpah449h3rkyamzzdpzccrrfrvjb4qn6vx2vjm47jwc54qv"; + sha256 = "sha256-AQQOctXi7sWIH/VOeSUClX6hlm1raEQUOp+VoPjLM14="; }; nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly + # (setting it to an absolute path causes include files to go to $out/$out/include, + # because the absolute path is interpreted with root at $out). + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; + meta = { description = "A simple, small, efficient, C++ XML parser"; homepage = "https://www.grinninglizard.com/tinyxml2/index.html"; diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index b017b3eb6618..80b93823df94 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -52,7 +52,7 @@ tcl.mkTclDerivation { meta = with lib; { description = "A widget library for Tcl/Tk"; - homepage = "http://tix.sourceforge.net/"; + homepage = "https://tix.sourceforge.net/"; platforms = platforms.all; license = with licenses; [ bsd2 # tix diff --git a/pkgs/development/libraries/tkrzw/default.nix b/pkgs/development/libraries/tkrzw/default.nix index 4ede98f75099..db963e5d8623 100644 --- a/pkgs/development/libraries/tkrzw/default.nix +++ b/pkgs/development/libraries/tkrzw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, nimPackages }: stdenv.mkDerivation rec { pname = "tkrzw"; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { doCheck = false; # memory intensive + passthru.tests.nim = nimPackages.tkrzw; meta = with lib; { description = "A set of implementations of DBM"; homepage = "https://dbmx.net/tkrzw/"; diff --git a/pkgs/development/libraries/toml11/default.nix b/pkgs/development/libraries/toml11/default.nix new file mode 100644 index 000000000000..641b72aa1e8c --- /dev/null +++ b/pkgs/development/libraries/toml11/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "toml11"; + version = "3.7.1"; + + src = fetchFromGitHub { + owner = "ToruNiina"; + repo = "toml11"; + rev = "v${finalAttrs.version}"; + hash = "sha256-HnhXBvIjo1JXhp+hUQvjs83t5IBVbNN6o3ZGhB4WESQ="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + homepage = "https://github.com/ToruNiina/toml11"; + description = "TOML for Modern C++"; + longDescription = '' + toml11 is a C++11 (or later) header-only toml parser/encoder depending + only on C++ standard library. + + - It is compatible to the latest version of TOML v1.0.0. + - It is one of the most TOML standard compliant libraries, tested with + the language agnostic test suite for TOML parsers by BurntSushi. + - It shows highly informative error messages. + - It has configurable container. You can use any random-access containers + and key-value maps as backend containers. + - It optionally preserves comments without any overhead. + - It has configurable serializer that supports comments, inline tables, + literal strings and multiline strings. + - It supports user-defined type conversion from/into toml values. + - It correctly handles UTF-8 sequences, with or without BOM, both on posix + and Windows. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +}) +# TODO [ AndersonTorres ]: tests diff --git a/pkgs/development/libraries/tomlcpp/0001-missing-headers.diff b/pkgs/development/libraries/tomlcpp/0001-missing-headers.diff deleted file mode 100644 index 3559facf3b54..000000000000 --- a/pkgs/development/libraries/tomlcpp/0001-missing-headers.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur old-source/tomlcpp.hpp new-source/tomlcpp.hpp ---- tomlcpp/tomlcpp.hpp 1969-12-31 21:00:01.000000000 -0300 -+++ tomlcpp/tomlcpp.hpp 2022-04-14 12:50:14.269775437 -0300 -@@ -25,6 +25,11 @@ - #ifndef TOML_HPP - #define TOML_HPP - -+#include -+#include -+#include -+#include -+ - struct toml_table_t; - struct toml_array_t; - diff --git a/pkgs/development/libraries/tomlcpp/default.nix b/pkgs/development/libraries/tomlcpp/default.nix index 96559f04541b..f782719f2b63 100644 --- a/pkgs/development/libraries/tomlcpp/default.nix +++ b/pkgs/development/libraries/tomlcpp/default.nix @@ -1,24 +1,16 @@ -{ lib -, stdenv -, fetchFromGitHub -}: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "tomlcpp"; - version = "0.pre+date=2022-05-01"; + version = "0.pre+date=2022-06-25"; src = fetchFromGitHub { owner = "cktan"; repo = pname; - rev = "59fcc6dc89fb3f4130a2865e41e1fa5b8c502e45"; - hash = "sha256-Uc6R5KnGIZXY0EJgFM4Xi7Jtxcu6l8yGh5xgFZPoJDM="; + rev = "4212f1fccf530e276a2e1b63d3f99fbfb84e86a4"; + hash = "sha256-PM3gURXhyTZr59BWuLHvltjKOlKUSBT9/rqTeX5V//k="; }; - patches = [ - # Self-explaining - ./0001-missing-headers.diff - ]; - dontConfigure = true; installFlags = [ diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 34a545d7996a..61cd2e0b489b 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cmocka ]; - checkInputs = [ + nativeCheckInputs = [ cmocka which openssl procps_pkg iproute2 ibm-sw-tpm2 ]; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 55793719dd81..59aa84b9518a 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.4.1"; + version = "3.4.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "L84OyF+3YXyLKIfCJ5d0DV3shOwDbbdNbCCLurXFjCQ="; + sha256 = "jk85dkcmQbZI0PjyDeuuGxYpyltWC4YW4RfSnXVvvus="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 40744f987c8e..9027c14de90c 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "3.4.1"; + version = "3.4.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "6p1BqfucK0KtgPwsgjJ7XHE9WUyWmwnhpJvmP7dPT64="; + sha256 = "Tm3xQqT3BIePypjrtaIkdQ5epUaqKqq6pyanNUC9FzE="; }; postPatch = '' @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection glib libxml2 sqlite @@ -117,7 +116,7 @@ stdenv.mkDerivation rec { runHook preCheck dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test \ --timeout-multiplier 2 \ --print-errorlogs diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix index d31294411856..a489f679c6ce 100644 --- a/pkgs/development/libraries/tsocks/default.nix +++ b/pkgs/development/libraries/tsocks/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Transparent SOCKS v4 proxying library"; - homepage = "http://tsocks.sourceforge.net/"; + homepage = "https://tsocks.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 1d34c21d3842..6b7f58bcd6da 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "umockdev"; - version = "0.17.13"; + version = "0.17.16"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-bG6/bmIJtqSXRuDZGkSNAntUJxurgu1woTLs8pTKE88="; + sha256 = "sha256-T0BbjOkhn4EX2GBezYFbiUHNgp2uEbSiaxpJ/36jriY="; }; patches = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { libpcap ]; - checkInputs = [ + nativeCheckInputs = [ python3 which usbutils @@ -83,6 +83,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://github.com/martinpitt/umockdev"; + changelog = "https://github.com/martinpitt/umockdev/releases/tag/${version}"; description = "Mock hardware devices for creating unit tests"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ flokli ]; diff --git a/pkgs/development/libraries/umockdev/hardcode-paths.patch b/pkgs/development/libraries/umockdev/hardcode-paths.patch index 91f1e928ec60..75a5c014a996 100644 --- a/pkgs/development/libraries/umockdev/hardcode-paths.patch +++ b/pkgs/development/libraries/umockdev/hardcode-paths.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 2ed9027..1f6bbf2 100644 +index 15d9e5d..a1906dd 100644 --- a/meson.build +++ b/meson.build -@@ -38,6 +38,7 @@ g_ir_compiler = find_program('g-ir-compiler', required: false) +@@ -44,6 +44,7 @@ g_ir_compiler = find_program('g-ir-compiler', required: false) conf.set('PACKAGE_NAME', meson.project_name()) conf.set_quoted('VERSION', meson.project_version()) @@ -10,7 +10,7 @@ index 2ed9027..1f6bbf2 100644 # glibc versions somewhere between 2.28 and 2.34 if cc.has_function('__fxstatat', prefix: '#include ') -@@ -148,7 +149,7 @@ hacked_gir = custom_target('UMockdev-1.0 hacked gir', +@@ -156,7 +157,7 @@ hacked_gir = custom_target('UMockdev-1.0 hacked gir', if g_ir_compiler.found() umockdev_typelib = custom_target('UMockdev-1.0 typelib', @@ -31,28 +31,28 @@ index 5269dd0..a2ec46d 100644 } diff --git a/src/umockdev-record.vala b/src/umockdev-record.vala -index 8434d32..68c7f8e 100644 +index bf0e644..ff5ea59 100644 --- a/src/umockdev-record.vala +++ b/src/umockdev-record.vala -@@ -435,7 +435,7 @@ main (string[] args) +@@ -444,7 +444,7 @@ main (string[] args) preload = ""; else preload = preload + ":"; -- Environment.set_variable("LD_PRELOAD", preload + "libumockdev-preload.so.0", true); -+ Environment.set_variable("LD_PRELOAD", preload + Config.LIBDIR + "/libumockdev-preload.so.0", true); +- checked_setenv("LD_PRELOAD", preload + "libumockdev-preload.so.0"); ++ checked_setenv("LD_PRELOAD", preload + Config.LIBDIR + "/libumockdev-preload.so.0"); try { root_dir = DirUtils.make_tmp("umockdev.XXXXXX"); diff --git a/src/umockdev-run.vala b/src/umockdev-run.vala -index 9a1ba10..6df2522 100644 +index 7b0753e..66b778b 100644 --- a/src/umockdev-run.vala +++ b/src/umockdev-run.vala @@ -95,7 +95,7 @@ main (string[] args) preload = ""; else preload = preload + ":"; -- Environment.set_variable ("LD_PRELOAD", preload + "libumockdev-preload.so.0", true); -+ Environment.set_variable ("LD_PRELOAD", preload + Config.LIBDIR + "/libumockdev-preload.so.0", true); +- checked_setenv ("LD_PRELOAD", preload + "libumockdev-preload.so.0"); ++ checked_setenv ("LD_PRELOAD", preload + Config.LIBDIR + "/libumockdev-preload.so.0"); var testbed = new UMockdev.Testbed (); diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix index 88759c67e0ee..89adbc102578 100644 --- a/pkgs/development/libraries/unicorn/default.nix +++ b/pkgs/development/libraries/unicorn/default.nix @@ -9,21 +9,15 @@ stdenv.mkDerivation rec { pname = "unicorn"; - version = "2.0.1"; + version = "2.0.1.post1"; src = fetchFromGitHub { owner = "unicorn-engine"; repo = pname; rev = version; - hash = "sha256-D8kwrHo58zksVjB13VtzoVqmz++FRfJ4zI2CT+YeBVE="; + hash = "sha256-Jz5C35rwnDz0CXcfcvWjkwScGNQO1uijF7JrtZhM7mI="; }; - patches = [ - # Fix compilation on aarch64-darwin - # See https://github.com/unicorn-engine/unicorn/issues/1730 - ./tests_unit_endian_aarch64.patch - ]; - nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/development/libraries/unicorn/tests_unit_endian_aarch64.patch b/pkgs/development/libraries/unicorn/tests_unit_endian_aarch64.patch deleted file mode 100644 index 722f4c229e7e..000000000000 --- a/pkgs/development/libraries/unicorn/tests_unit_endian_aarch64.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/tests/unit/endian.h b/tests/unit/endian.h -index 5bc86308..b455899e 100644 ---- a/tests/unit/endian.h -+++ b/tests/unit/endian.h -@@ -54,6 +54,7 @@ - || defined(_POWER) || defined(__powerpc__) \ - || defined(__ppc__) || defined(__hpux) || defined(__hppa) \ - || defined(_MIPSEB) || defined(_POWER) \ -+ || defined(__ARMEB__) || defined(__AARCH64EB__) \ - || defined(__s390__) - # define BOOST_BIG_ENDIAN - # define BOOST_BYTE_ORDER 4321 -@@ -63,6 +64,7 @@ - || defined(_M_ALPHA) || defined(__amd64) \ - || defined(__amd64__) || defined(_M_AMD64) \ - || defined(__x86_64) || defined(__x86_64__) \ -+ || defined(__ARMEL__) || defined(__AARCH64EL__) \ - || defined(_M_X64) || defined(__bfin__) - - # define BOOST_LITTLE_ENDIAN diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix index d185d32c816f..6f27a71b3ee4 100644 --- a/pkgs/development/libraries/unittest-cpp/default.nix +++ b/pkgs/development/libraries/unittest-cpp/default.nix @@ -1,7 +1,5 @@ {lib, stdenv, fetchFromGitHub, cmake}: -with lib; - stdenv.mkDerivation rec { pname = "unittest-cpp"; version = "2.0.0"; @@ -20,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/unittest-cpp/unittest-cpp"; description = "Lightweight unit testing framework for C++"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = []; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index 2ab717782e51..2c424157bb41 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "unixODBC"; - version = "2.3.9"; + version = "2.3.11"; src = fetchurl { urls = [ "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz" "http://www.unixodbc.org/${pname}-${version}.tar.gz" ]; - sha256 = "sha256-UoM+rD1oHIsMmlpl8uvXRbOpZPII/HSPl35EAVoxsgc="; + sha256 = "sha256-2eVcjnEYNH48ZshzOIVtrRUWtJD7fHVsFWKiwmfHO1w="; }; configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 1e5149683d4c..16b7c1aa0242 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -20,11 +20,10 @@ }; meta = with lib; { - broken = stdenv.isDarwin; description = "Official PostgreSQL ODBC Driver"; homepage = "https://odbc.postgresql.org/"; license = licenses.lgpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; }; @@ -47,7 +46,9 @@ preConfigure = '' # we don't want to build a .pkg - sed -i 's/ADD_SUBDIRECTORY(osxinstall)//g' CMakeLists.txt + substituteInPlace CMakeLists.txt \ + --replace "IF(APPLE)" "IF(0)" \ + --replace "CMAKE_SYSTEM_NAME MATCHES AIX" "APPLE" ''; cmakeFlags = [ @@ -62,7 +63,6 @@ }; meta = with lib; { - broken = stdenv.isDarwin; description = "MariaDB ODBC database driver"; homepage = "https://downloads.mariadb.org/connector-odbc/"; license = licenses.gpl2; @@ -126,11 +126,10 @@ }; meta = with lib; { - broken = stdenv.isDarwin; description = "ODBC driver for SQLite"; homepage = "http://www.ch-werner.de/sqliteodbc"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ vlstill ]; }; }; diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index dc808c529af1..01ab983e1d6e 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "-DURIPARSER_BUILD_DOCS=OFF" ] ++ lib.optional (!doCheck) "-DURIPARSER_BUILD_TESTS=OFF"; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; doCheck = stdenv.buildPlatform == stdenv.hostPlatform; meta = with lib; { diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix index 4e0130fe07f4..147248ee3461 100644 --- a/pkgs/development/libraries/utf8cpp/default.nix +++ b/pkgs/development/libraries/utf8cpp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "utf8cpp"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "nemtrif"; repo = "utfcpp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-L58OMNrKd1+yco0V/jpOfWgDr0K1y8jOJ3TasUMRw0k="; + sha256 = "sha256-PnHbbjsryRwMMu517ta18qNgwOM6hRnVmXmR3fzS1+4="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix index f6c6e378421b..f697e8c7a125 100644 --- a/pkgs/development/libraries/uthash/default.nix +++ b/pkgs/development/libraries/uthash/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; doCheck = true; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; checkTarget = "all"; preCheck = "cd tests"; diff --git a/pkgs/development/libraries/uthenticode/default.nix b/pkgs/development/libraries/uthenticode/default.nix index 06579c2d4731..c98d9f930d38 100644 --- a/pkgs/development/libraries/uthenticode/default.nix +++ b/pkgs/development/libraries/uthenticode/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_EXTERNAL_GTEST=1" ]; nativeBuildInputs = [ cmake ]; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; buildInputs = [ pe-parse openssl ]; doCheck = true; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index c3f04eae4ddf..7ca5080cb74c 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -105,6 +105,10 @@ stdenv.mkDerivation rec { --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \ 'false' ''} + ${lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + substituteInPlace build/config/compiler/BUILD.gn \ + --replace "-Wl,-fatal_warnings" "" + ''} touch build/config/gclient_args.gni ''; diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 0aa6fc39baad..3a88e3bd04b4 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "60"; + version = "61"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = "R${version}"; - sha256 = "sha256-E1uHNcGxBrwg00tNnY3qH6BpvXtBEGkX7QFy0aMLSnA="; + sha256 = "sha256-JJWq706GLywUO5voYKzxcOvMWF4/NXEbqOrj5uG4DWw="; }; patches = [ diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix index 2e13f2f46ffa..50eaddda890e 100644 --- a/pkgs/development/libraries/vc/0.7.nix +++ b/pkgs/development/libraries/vc/0.7.nix @@ -22,11 +22,12 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "Library for multiprecision complex arithmetic with exact rounding"; homepage = "https://github.com/VcDevel/Vc"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix index d8c83bf54a8a..8b86df2e1c10 100644 --- a/pkgs/development/libraries/vcg/default.nix +++ b/pkgs/development/libraries/vcg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vcg"; - version = "1.0.1"; + version = "2022.02"; src = fetchFromGitHub { owner = "cnr-isti-vclab"; repo = "vcglib"; - rev = "v${version}"; - sha256 = "0jh8jc8rn7rci8qr3q03q574fk2hsc3rllysck41j8xkr3rmxz2f"; + rev = version; + sha256 = "sha256-XCjbVlgE0C9UagPj4fraA7BNsM6ONKo66aKQ87gQOfE="; }; propagatedBuildInputs = [ eigen ]; diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 1cff63d17831..81abbf8c40c5 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "virglrenderer"; - version = "0.10.3"; + version = "0.10.4"; src = fetchurl { url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2"; - sha256 = "uKHxPhKAMwg3E1GeTJNryd8K/nYQnx8r1eB3uME6LUQ="; + sha256 = "sha256-qqvnko2sN4bdm9+F0PVjDW5FsiL5k3UAfjPSTqG+73c="; }; buildInputs = [ libGLU libepoxy libX11 libdrm mesa ]; diff --git a/pkgs/development/libraries/vk-bootstrap/default.nix b/pkgs/development/libraries/vk-bootstrap/default.nix index 8b7ce6cd930a..ef76d6db9dbc 100644 --- a/pkgs/development/libraries/vk-bootstrap/default.nix +++ b/pkgs/development/libraries/vk-bootstrap/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "vk-bootstrap"; - version = "0.5"; + version = "0.6"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "charles-lunarg"; repo = "vk-bootstrap"; rev = "v${version}"; - sha256 = "sha256-rKyfUWfRYiVNzLWh6y44ASHW4j+yabY0kZTdZi8j2Dc="; + sha256 = "sha256-T24SCJSGta4yuK58NcQnMeiO3sg9P9/O3kaFJFO/eOE="; }; postPatch = '' diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index cc0049ef756c..2c2774521762 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -16,9 +16,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "dev" "py" ]; - nativeBuildInputs = [ autoconf automake libtool pkg-config gettext swig autoreconfHook ]; + strictDeps = true; - buildInputs = [ glib cryptsetup nss util-linux gpgme ncurses ]; + nativeBuildInputs = [ autoreconfHook gettext gpgme pkg-config swig ]; + + buildInputs = [ glib cryptsetup nss util-linux ncurses ]; configureFlags = [ "--with-gpgme-prefix=${gpgme.dev}" diff --git a/pkgs/development/libraries/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix deleted file mode 100644 index 59f1a2cd673a..000000000000 --- a/pkgs/development/libraries/vte/2.90.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk3, ncurses, gobject-introspection }: - -stdenv.mkDerivation rec { - pname = "vte"; - version = "0.36.3"; - - src = fetchurl { - url = "mirror://gnome/sources/vte/${lib.versions.majorMinor version}/vte-${version}.tar.xz"; - sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; - }; - - nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ gobject-introspection glib gtk3 ncurses ]; - - configureFlags = [ "--enable-introspection" ]; - - enableParallelBuilding = true; - - postInstall = '' - substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses" - ''; - - meta = with lib; { - homepage = "https://www.gnome.org/"; - description = "A library implementing a terminal emulator widget for GTK"; - longDescription = '' - VTE is a library (libvte) implementing a terminal emulator widget for - GTK, and a minimal sample application (vte) using that. Vte is - mainly used in gnome-terminal, but can also be used to embed a - console/terminal in games, editors, IDEs, etc. VTE supports Unicode and - character set conversion, as well as emulating any terminal known to - the system's terminfo database. - ''; - license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 07ec683bf05a..715755bb9480 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -24,19 +24,19 @@ , zlib , icu , systemd -, systemdSupport ? stdenv.hostPlatform.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , nixosTests }: stdenv.mkDerivation rec { pname = "vte"; - version = "0.70.1"; + version = "0.70.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-H0YBy/6lMCuWkCIIyPGF5bGLJZtTWLyTzzkr9ZhxxbY="; + sha256 = "sha256-TRW0OA3j9WTVfqvQBjicQHxwXfWwxwAw/cwklxozTYA="; }; patches = [ @@ -48,6 +48,13 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd"; sha256 = "FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU="; }) + + # Fix copying text with GTK 4. + # https://gitlab.gnome.org/GNOME/vte/-/issues/2584 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/vte/-/commit/ddb2c8ae0baf3b73d77d1f6ce6142e92faa632af.patch"; + hash = "sha256-5Eu0EH0MBJqJUZ6d5bVe5+hl4Z/Gd3Yltz0VAQK7ogY="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/vtk/9.x.nix b/pkgs/development/libraries/vtk/9.x.nix index 3a5032efdce3..7f7fc22f549b 100644 --- a/pkgs/development/libraries/vtk/9.x.nix +++ b/pkgs/development/libraries/vtk/9.x.nix @@ -1,5 +1,5 @@ import ./generic.nix { majorVersion = "9.2"; - minorVersion = "2"; - sourceSha256 = "sha256-HFsKK+cfrJb/SDGvaeNQ96DqMWiYH3kMAAcJ3PkSEHU="; + minorVersion = "5"; + sourceSha256 = "sha256-Eo1gG6qYDpjuA0IHl0sz+zjSyYq5z0pXVu/bCe1sCUk="; } diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 555e7d0a45de..35f3a1725d4f 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -2,16 +2,16 @@ { stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff , fetchpatch , enableQt ? false, qtbase, qtx11extras, qttools, qtdeclarative, qtEnv -, enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given." +, enablePython ? false, python ? throw "vtk: Python support requested, but no python interpreter was given." # Darwin support -, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL +, AGL, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL , ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }: let inherit (lib) optionalString optionals optional; - pythonMajor = lib.substring 0 1 pythonInterpreter.pythonVersion; + pythonMajor = lib.substring 0 1 python.pythonVersion; in stdenv.mkDerivation rec { pname = "vtk${optionalString enableQt "-qvtk"}"; @@ -30,12 +30,11 @@ in stdenv.mkDerivation rec { else [ (qtEnv "qvtk-qt-env" [ qtx11extras qttools qtdeclarative ]) ]) ++ optionals stdenv.isLinux [ libGLU - libGL - libX11 xorgproto libXt ] ++ optionals stdenv.isDarwin [ xpc + AGL Cocoa CoreServices DiskArbitration @@ -49,9 +48,11 @@ in stdenv.mkDerivation rec { OpenGL GLUT ] ++ optionals enablePython [ - pythonInterpreter + python ]; - propagatedBuildInputs = optionals stdenv.isDarwin [ libobjc ]; + propagatedBuildInputs = optionals stdenv.isDarwin [ libobjc ] + ++ optionals stdenv.isLinux [ libX11 libGL ]; + # see https://github.com/NixOS/nixpkgs/pull/178367#issuecomment-1238827254 patches = map fetchpatch patchesToFetch; @@ -89,6 +90,13 @@ in stdenv.mkDerivation rec { sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c ''; + postInstall = optionalString enablePython '' + substitute \ + ${./vtk.egg-info} \ + $out/${python.sitePackages}/vtk-${version}.egg-info \ + --subst-var-by VTK_VER "${version}" + ''; + 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/vtk/vtk.egg-info b/pkgs/development/libraries/vtk/vtk.egg-info new file mode 100644 index 000000000000..a244450ad767 --- /dev/null +++ b/pkgs/development/libraries/vtk/vtk.egg-info @@ -0,0 +1,4 @@ +Metadata-Version: 2.1 +Version: @VTK_VER@ +Summary: VTK is an open-source toolkit for 3D computer graphics, image processing, and visualization +Platform: UNKNOWN diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 47cdccf41fc1..8f1202088e58 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.231.0"; + version = "1.3.236.0"; nativeBuildInputs = [ cmake ]; @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - hash = "sha256-EoD48jBoJmIet4BDC6bYxOsKK2358SZ/NcZeM61q/5g="; + hash = "sha256-b1q9QugFH4lieS8CTOyZ3uoQ7bd44G8NPEwRtUPD+24="; }; meta = with lib; { description = "Vulkan Header files and API registry"; homepage = "https://www.lunarg.com"; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; 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 27c1423d94e5..8d38f725a64d 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.3.231.0"; + version = "1.3.236.0"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "sdk-${version}"; - hash = "sha256-HWaa3JT0znhvqbvZdcsAwy8Dr6HDQp4rgpVmMOuCo0s="; + hash = "sha256-Y6OakowZlb40ZatITQCFBK/qSZqSdgTNew1XUFD/jMo="; }); patches = [ ./fix-pkgconfig.patch ]; diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 878271b43178..098dc64cf154 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }: stdenv.mkDerivation rec { pname = "vxl"; - version = "3.3.2"; + version = "3.5.0"; src = fetchFromGitHub { owner = "vxl"; repo = "vxl"; rev = "v${version}"; - sha256 = "0qmqrijl14xlsbd77jk9ygg44h3lqzpswia6yif1iia6smqccjsr"; + sha256 = "sha256-4kMpIrywEZzt0JH95LHeDLrDneii0R/Uw9GsWkvED+E="; }; nativeBuildInputs = [ cmake unzip ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ Libraries for Computer Vision Research and Implementation"; - homepage = "http://vxl.sourceforge.net/"; + homepage = "https://vxl.sourceforge.net/"; license = "VXL License"; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix index e6d8a98b5335..0fc513b68f46 100644 --- a/pkgs/development/libraries/waffle/default.nix +++ b/pkgs/development/libraries/waffle/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A cross-platform C library that allows one to defer selection of an OpenGL API and window system until runtime"; - homepage = "http://www.waffle-gl.org/"; + homepage = "https://www.waffle-gl.org/"; license = licenses.bsd2; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ Flakebi ]; diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index 9448041c5e76..d978e911c3a8 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -1,14 +1,23 @@ -{ stdenv, buildPackages, fetchFromGitHub, lib }: +{ stdenv +, buildPackages +, fetchFromGitHub +, lib +, firefox-unwrapped +, firefox-esr-unwrapped +}: -stdenv.mkDerivation { +let pname = "wasilibc"; - version = "unstable-2022-04-12"; + version = "17"; +in +stdenv.mkDerivation { + inherit pname version; src = buildPackages.fetchFromGitHub { owner = "WebAssembly"; repo = "wasi-libc"; - rev = "a279514a6ef30cd8ee1469345b33172fcbc8d52d"; - sha256 = "0a9ldas8p7jg7jlkhb9wdiw141z7vfz6p18mnmxnnnna7bp1y3fz"; + rev = "refs/tags/wasi-sdk-${version}"; + hash = "sha256-h2X78icCmnn6Y6baOxp8Xm7F2+RZZgaV2fszzi2q/iA="; fetchSubmodules = true; }; @@ -29,7 +38,10 @@ stdenv.mkDerivation { "SYSROOT_LIB:=$SYSROOT_LIB" "SYSROOT_INC:=$SYSROOT_INC" "SYSROOT_SHARE:=$SYSROOT_SHARE" + # https://bugzilla.mozilla.org/show_bug.cgi?id=1773200 + "BULK_MEMORY_SOURCES:=" ) + ''; enableParallelBuilding = true; @@ -41,11 +53,16 @@ stdenv.mkDerivation { ln -s $share/share/undefined-symbols.txt $out/lib/wasi.imports ''; + passthru.tests = { + inherit firefox-unwrapped firefox-esr-unwrapped; + }; + meta = with lib; { + changelog = "https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-${version}"; description = "WASI libc implementation for WebAssembly"; homepage = "https://wasi.dev"; platforms = platforms.wasi; - maintainers = with maintainers; [ matthewbauer ]; + maintainers = with maintainers; [ matthewbauer rvolosatovs ]; license = with licenses; [ asl20 mit llvm-exception ]; }; } diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 67d8bccf51f0..2836faf6bc79 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = [ libiconv ]; # autogen.sh:9 preAutoreconf = "cp ${gettext}/share/gettext/config.rpath ."; diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index c9d0a7ad3b7c..8d229678a3c8 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -8,7 +8,7 @@ , wayland-scanner , expat , libxml2 -, withLibraries ? stdenv.isLinux +, withLibraries ? true , libffi , withDocumentation ? withLibraries && stdenv.hostPlatform == stdenv.buildPlatform , graphviz-nox @@ -48,8 +48,9 @@ stdenv.mkDerivation rec { separateDebugInfo = true; mesonFlags = [ - "-Dlibraries=${lib.boolToString withLibraries}" "-Ddocumentation=${lib.boolToString withDocumentation}" + "-Dlibraries=${lib.boolToString withLibraries}" + "-Dtests=${lib.boolToString withLibraries}" ]; depsBuildBuild = [ @@ -95,6 +96,8 @@ stdenv.mkDerivation rec { EOF ''; + passthru = { inherit withLibraries; }; + meta = with lib; { description = "Core Wayland window system code and protocol"; longDescription = '' @@ -109,8 +112,6 @@ stdenv.mkDerivation rec { license = licenses.mit; # Expat version platforms = if withLibraries then platforms.linux else platforms.unix; maintainers = with maintainers; [ primeos codyopel qyliss ]; - # big sur doesn't support gcc stdenv and wayland doesn't build with clang - broken = stdenv.isDarwin; }; passthru.version = version; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 34b5d4ff3c6e..f9dc3c4e8073 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.27"; + version = "1.31"; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform && wayland.withLibraries; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; - hash = "sha256-kEbxCkJdTioAlloDrPtrP7V1pWUDrHLCuGghxpZTN1w="; + hash = "sha256-oH+nIu2HZ27AINhncUvJovJMRk2nORLzlwbu71IZ4jg="; }; postPatch = lib.optionalString doCheck '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja wayland-scanner ]; - checkInputs = [ python3 wayland ]; + nativeCheckInputs = [ python3 wayland ]; mesonFlags = [ "-Dtests=${lib.boolToString doCheck}" ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://gitlab.freedesktop.org/wayland/wayland-protocols"; license = lib.licenses.mit; # Expat version - platforms = lib.platforms.linux; + platforms = lib.platforms.all; maintainers = with lib.maintainers; [ primeos ]; }; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index d226270c7954..4e22df60f533 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -63,12 +63,12 @@ , addOpenGLRunpath , enableGeoLocation ? true , withLibsecret ? true -, systemdSupport ? stdenv.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.38.2"; + version = "2.38.3"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-8+uCiZZR9YO02Zys0Wr3hKGncQ/OnntoB71szekJ/j4="; + hash = "sha256-QfAB0e1EjGk2s5Sp8g5GQO6/g6fwgmLfKFBPdBBgSlo="; }; patches = lib.optionals stdenv.isLinux [ @@ -223,11 +223,6 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs . - '' + lib.optionalString stdenv.isDarwin '' - # It needs malloc_good_size. - sed 22i'#include ' -i Source/WTF/wtf/FastMalloc.h - # needs CCCryptorStatus. - sed 43i'#include ' -i Source/WTF/wtf/RandomDevice.cpp ''; postFixup = '' diff --git a/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch b/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch index d502958f4f1a..9be2d74af1bd 100644 --- a/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch +++ b/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch @@ -1,16 +1,17 @@ -diff -ru old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp ---- old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-09 04:47:07.000000000 -0400 -+++ webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-20 21:14:10.537921173 -0400 -@@ -724,6 +724,12 @@ - "--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64", +diff --git a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp +index 0a201fe176..fa3690c12a 100644 +--- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp ++++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp +@@ -819,6 +819,12 @@ GRefPtr bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces + sandboxArgs.append("--unshare-ipc"); + } - "--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR, ++ // Nix Directories ++ sandboxArgs.appendVector(Vector({ "--ro-bind", "@storeDir@", "@storeDir@" })); ++ sandboxArgs.appendVector(Vector({ "--ro-bind-try", "/run/current-system", "/run/current-system" })); ++ sandboxArgs.appendVector(Vector({ "--ro-bind-try", "@driverLink@/lib", "@driverLink@/lib" })); ++ sandboxArgs.appendVector(Vector({ "--ro-bind-try", "@driverLink@/share", "@driverLink@/share" })); + -+ // Nix Directories -+ "--ro-bind", "@storeDir@", "@storeDir@", -+ "--ro-bind", "/run/current-system", "/run/current-system", -+ "--ro-bind-try", "@driverLink@/lib", "@driverLink@/lib", -+ "--ro-bind-try", "@driverLink@/share", "@driverLink@/share", - }; - // We would have to parse ld config files for more info. - bindPathVar(sandboxArgs, "LD_LIBRARY_PATH"); + #if ENABLE(DEVELOPER_MODE) + const char* execDirectory = g_getenv("WEBKIT_EXEC_PATH"); + if (execDirectory) { diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 88dd403a31fd..5e8adaf0c425 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { WildMIDI is a simple software midi player which has a core softsynth library that can be use with other applications. ''; - homepage = "http://wildmidi.sourceforge.net/"; + homepage = "https://wildmidi.sourceforge.net/"; # The library is LGPLv3, the wildmidi executable is GPLv3 license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index 69fc38c9a74e..28f66b8d31cf 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -5,7 +5,6 @@ , gperftools ? null, leveldb ? null }: -with lib; let shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; @@ -32,26 +31,26 @@ stdenv.mkDerivation rec { buildInputs = [ optLz4 optSnappy optZlib optBzip2 optDb optGperftools optLeveldb ]; configureFlags = [ - (withFeature false "attach") - (withFeatureAs true "builtins" "") - (enableFeature (optBzip2 != null) "bzip2") - (enableFeature false "diagnostic") - (enableFeature false "java") - (enableFeature (optLeveldb != null) "leveldb") - (enableFeature false "python") - (enableFeature (optSnappy != null) "snappy") - (enableFeature (optLz4 != null) "lz4") - (enableFeature (optGperftools != null) "tcmalloc") - (enableFeature (optZlib != null) "zlib") - (withFeatureAs (optDb != null) "berkeleydb" optDb) - (withFeature false "helium") + (lib.withFeature false "attach") + (lib.withFeatureAs true "builtins" "") + (lib.enableFeature (optBzip2 != null) "bzip2") + (lib.enableFeature false "diagnostic") + (lib.enableFeature false "java") + (lib.enableFeature (optLeveldb != null) "leveldb") + (lib.enableFeature false "python") + (lib.enableFeature (optSnappy != null) "snappy") + (lib.enableFeature (optLz4 != null) "lz4") + (lib.enableFeature (optGperftools != null) "tcmalloc") + (lib.enableFeature (optZlib != null) "zlib") + (lib.withFeatureAs (optDb != null) "berkeleydb" optDb) + (lib.withFeature false "helium") ]; preConfigure = '' ./autogen.sh ''; - meta = { + meta = with lib; { homepage = "http://wiredtiger.com/"; description = ""; license = licenses.gpl2; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 761e97784013..9d03d193d81c 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -121,8 +121,8 @@ rec { }; wlroots_0_16 = generic { - version = "0.16.0"; - hash = "sha256-k7BFx1xvvsdCXNWX0XeZYwv8H/myk4p42i2Y6vjILqM="; + version = "0.16.1"; + hash = "sha256-UyPN7zmytre4emwx/ztZ4JefXHwixPV6UEEqnhSLbIY="; extraBuildInputs = [ vulkan-loader ]; extraNativeBuildInputs = [ glslang ]; extraPatch = '' diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 580af7235e05..b77ec4d3c4a8 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "5.5.3"; + version = "5.5.4"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - hash = "sha256-d8DDyEsK35WK7c0udZI5HxQLO+mbod8hlbSoa3IWWS0="; + hash = "sha256-sR/Gjk50kLej5oJzDH1I6/V+7OIRiwtyeg5tEE3fmHk="; }; postPatch = '' @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ]; doCheck = true; - checkInputs = [ openssl ]; + nativeCheckInputs = [ openssl ]; postInstall = '' # fix recursive cycle: diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh index 86f2719537cd..c3ad173b0933 100644 --- a/pkgs/development/libraries/wtk/builder.sh +++ b/pkgs/development/libraries/wtk/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup mkdir unzipped diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index f5672167336e..7b018c89f50d 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -7,10 +7,12 @@ , pango , pkg-config , wxGTK -# darwin deps -, Cocoa +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation rec { pname = "wxSVG"; version = "1.5.24"; @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.isDarwin Cocoa; meta = with lib; { - homepage = "http://wxsvg.sourceforge.net/"; + homepage = "https://wxsvg.sourceforge.net/"; description = "A SVG manipulation library built with wxWidgets"; longDescription = '' wxSVG is C++ library to create, manipulate and render Scalable Vector diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 3b1c9ff22e8f..b610e903ba30 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.9.0"; + version = "4.9.1"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-9WnXaMpKzqJhdfT7ScOhULbOwJsmuiS0IpYDArWq82s="; + hash = "sha256-n7m94QdQf0s5I9z8ScpCu+r2h7XOKO2F1OX44IjdBn4="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/wxwidgets/wxGTK30.nix b/pkgs/development/libraries/wxwidgets/wxGTK30.nix index 3b848f788c10..b60e1f486dc8 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK30.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK30.nix @@ -3,8 +3,6 @@ , expat , fetchFromGitHub , gst_all_1 -, withGtk2 ? true -, gtk2 , gtk3 , libGL , libGLU @@ -34,11 +32,6 @@ , WebKit }: -assert withGtk2 -> (!withWebKit); - -let - gtk = if withGtk2 then gtk2 else gtk3; -in stdenv.mkDerivation rec { pname = "wxwidgets"; version = "3.0.5.1"; @@ -60,7 +53,7 @@ stdenv.mkDerivation rec { libjpeg_turbo zlib ] ++ lib.optionals stdenv.isLinux [ - gtk + gtk3 libSM libXinerama libXxf86vm @@ -148,7 +141,6 @@ stdenv.mkDerivation rec { }; passthru = { - inherit gtk; inherit compat26 compat28 unicode; }; } diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 1f4e41315453..543c6fb4e055 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -2,6 +2,7 @@ , stdenv , expat , fetchFromGitHub +, fetchpatch , fetchurl , gnome2 , gst_all_1 @@ -61,6 +62,16 @@ stdenv.mkDerivation rec { hash = "sha256-k6td/8pF7ad7+gVm7L0jX79fHKwR7/qrOBpSFggyaI0="; }; + # Workaround for pkgsMusl.wxGTK32 failing as: + # "./src/unix/uilocale.cpp:650:37: error: ‘_NL_IDENTIFICATION_TERRITORY’ was not declared in this scope" + # On upgrade, please test building wxwidgets for pkgsMusl, and remove this patch if unnecessary. + patches = lib.optional stdenv.hostPlatform.isMusl [ + (fetchpatch { + url = "https://github.com/wxWidgets/wxWidgets/commit/1faf1796b23b2503296d9b1e9ad39047d633f8c9.patch"; + sha256 = "sha256-0FbfzGzzkriLD2iDcRcBXgYqjHtxFsmSlhGE5d18/bo="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index b4a7777b8911..b63b0101d54b 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -34,7 +34,8 @@ let (mkFlag ppaSupport "ENABLE_PPA") (mkFlag vtuneSupport "ENABLE_VTUNE") (mkFlag werrorSupport "WARNINGS_AS_ERRORS") - ]; + # Potentially riscv cross could be fixed by providing the correct CMAKE_SYSTEM_PROCESSOR flag + ] ++ lib.optional (isCross && stdenv.hostPlatform.isRiscV) "-DENABLE_ASSEMBLY=OFF"; cmakeStaticLibFlags = [ "-DHIGH_BIT_DEPTH=ON" diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 700fa1d13dd1..3c0a555dd978 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -26,7 +26,7 @@ let nativeBuildInputs = [ autoreconfHook ]; doCheck = true; - AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git + env.AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git patches = lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix index 11d73a9decb7..25dd7fdad7ef 100644 --- a/pkgs/development/libraries/xavs/default.nix +++ b/pkgs/development/libraries/xavs/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "AVS encoder and decoder"; - homepage = "http://xavs.sourceforge.net/"; + homepage = "https://xavs.sourceforge.net/"; license = licenses.lgpl2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/development/libraries/xcb-imdkit/default.nix b/pkgs/development/libraries/xcb-imdkit/default.nix index b2e56c8193b5..a976368243af 100644 --- a/pkgs/development/libraries/xcb-imdkit/default.nix +++ b/pkgs/development/libraries/xcb-imdkit/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "xcb-imdkit"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "fcitx"; repo = "xcb-imdkit"; rev = version; - sha256 = "sha256-IPuTRSgmrnCJRgGWcE4JRaxd0sGCcHrKRnn2B1OdDMU="; + sha256 = "sha256-WSJBEB6VHRYUkzXr7frdLLpKihuS00ZUINW7e4oYOlY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/development/libraries/xdg-dbus-proxy/default.nix index b027c95a7e4b..cc7406b11463 100644 --- a/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { glib ]; - checkInputs = [ + nativeCheckInputs = [ dbus ]; diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index e54f764f9a50..903de4d9a232 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "I9xQgiE3lNb2vRodO5R1y40lqoOKzALskrVePidant4="; + sha256 = "8eyWeoiJ3b/GlqGVfmkf2/uS7FnOpRNgbfxwWjclw8w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 438940f3bac6..2cadab4a6742 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal"; - version = "1.15.0"; + version = "1.16.0"; outputs = [ "out" "installedTests" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "flatpak"; repo = "xdg-desktop-portal"; rev = finalAttrs.version; - sha256 = "sha256-Kw3zJeGwPfw1fDo8HsgYmrpgCk/PUvWZPRloKJNAJVc="; + sha256 = "sha256-5VNauinTvZrSaQzyP/quL/3p2RPcTJUDLscEQMJpvYA="; }; patches = [ diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index f5109a1ebd6a..c7509bc43ab5 100644 --- a/pkgs/development/libraries/xercesc/default.nix +++ b/pkgs/development/libraries/xercesc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "xerces-c"; - version = "3.2.3"; + version = "3.2.4"; src = fetchurl { url = "mirror://apache/xerces/c/3/sources/${pname}-${version}.tar.gz"; - sha256 = "0zicsydx6s7carwr7q0csgkg1xncibd6lfp5chg2v2gvn54zr5pv"; + sha256 = "sha256-PY7Bx/lOOP7g5Mpa0eHZ2yPL86ELumJva0r6Le2v5as="; }; # Disable SSE2 extensions on platforms for which they are not enabled by default diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index b4d668d5fba1..bf2825b5967e 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -15,14 +15,14 @@ assert ncclSupport -> cudaSupport; stdenv.mkDerivation rec { pname = "xgboost"; - version = "1.5.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "dmlc"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-h7zcHCOxe1h7HRB6idtjf4HUBEoHC4V2pqbN9hpe00g="; + hash = "sha256-unTss2byytG8KUQfg5s34YpRuHHDLo7D/ZickHhz1AE="; }; nativeBuildInputs = [ @@ -55,6 +55,8 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out cp -r ../include $out + cp -r ../dmlc-core/include/dmlc $out/include + cp -r ../rabit/include/rabit $out/include install -Dm755 ../lib/${libname} $out/lib/${libname} install -Dm755 ../xgboost $out/bin/xgboost runHook postInstall @@ -65,6 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dmlc/xgboost"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar nviets ]; }; } diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index aab4542ac383..263b6cd59590 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with lib; { - homepage = "http://xine.sourceforge.net/"; + homepage = "https://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/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix deleted file mode 100644 index 5340306de79a..000000000000 --- a/pkgs/development/libraries/xlibs-wrapper/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{lib, stdenv, packages}: - -stdenv.mkDerivation { - name = "xlibs-wrapper"; - - dontBuild = true; - - installPhase = "mkdir -p $out"; - unpackPhase = "sourceRoot=."; - - propagatedBuildInputs = packages; - - preferLocalBuild = true; - - # For compatability with XFree86. - passthru.buildClientLibs = true; - - meta = { - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix index 2cb64fe6eb24..6e002a28543f 100644 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A lightweight RPC library based on XML and HTTP"; - homepage = "http://xmlrpc-c.sourceforge.net/"; + homepage = "https://xmlrpc-c.sourceforge.net/"; # /doc/COPYING also lists "Expat license", # "ABYSS Web Server License" and "Python 1.5.2 License" license = licenses.bsd3; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 7f3dc9d60945..92b662ac4484 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; - checkInputs = [ nss.tools ]; + nativeCheckInputs = [ nss.tools ]; preCheck = '' substituteInPlace tests/testrun.sh \ --replace 'timestamp=`date +%Y%m%d_%H%M%S`' 'timestamp=19700101_000000' \ diff --git a/pkgs/development/libraries/xsimd/default.nix b/pkgs/development/libraries/xsimd/default.nix index 7d0af99645ec..db8cc787dee4 100644 --- a/pkgs/development/libraries/xsimd/default.nix +++ b/pkgs/development/libraries/xsimd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTS=ON" ]; doCheck = true; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; checkTarget = "xtest"; GTEST_FILTER = let diff --git a/pkgs/development/libraries/xtensor/default.nix b/pkgs/development/libraries/xtensor/default.nix index 3503c6894efe..45c1ce936a6e 100644 --- a/pkgs/development/libraries/xtensor/default.nix +++ b/pkgs/development/libraries/xtensor/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTS=ON" ]; doCheck = true; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; checkTarget = "xtest"; # https://github.com/xtensor-stack/xtensor/issues/2542 diff --git a/pkgs/development/libraries/xtl/default.nix b/pkgs/development/libraries/xtl/default.nix index fb50105cffa2..694f6511f0c5 100644 --- a/pkgs/development/libraries/xtl/default.nix +++ b/pkgs/development/libraries/xtl/default.nix @@ -2,17 +2,18 @@ , stdenv , fetchFromGitHub , cmake +, doctest , gtest }: stdenv.mkDerivation rec { pname = "xtl"; - version = "0.7.2"; + version = "0.7.5"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xtl"; rev = version; - sha256 = "177ym67sz544wdylksfkkpi6bqn34kagycfnb3cv0nkmpipqj9lg"; + hash = "sha256-Vc1VKOWmG1sAw3UQpNJAhm9PvXSqJ0iO2qLjP6/xjtI="; }; nativeBuildInputs = [ cmake ]; @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTS=ON" ]; doCheck = true; - checkInputs = [ gtest ]; + nativeCheckInputs = [ doctest ]; checkTarget = "xtest"; meta = with lib; { diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index 57f2403cfe3f..82520572c376 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchurl, yasm, autoconf, automake, libtool }: -with lib; stdenv.mkDerivation rec { pname = "xvidcore"; version = "1.3.7"; @@ -13,7 +12,7 @@ stdenv.mkDerivation rec { preConfigure = '' # Configure script is not in the root of the source directory cd build/generic - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # Undocumented darwin hack substituteInPlace configure --replace "-no-cpp-precomp" "" ''; @@ -21,22 +20,22 @@ stdenv.mkDerivation rec { configureFlags = [ ] # Undocumented darwin hack (assembly is probably disabled due to an # issue with nasm, however yasm is now used) - ++ optional stdenv.isDarwin "--enable-macosx_module --disable-assembly"; + ++ lib.optional stdenv.isDarwin "--enable-macosx_module --disable-assembly"; nativeBuildInputs = [ ] - ++ optional (!stdenv.isDarwin) yasm; + ++ lib.optional (!stdenv.isDarwin) yasm; buildInputs = [ ] # Undocumented darwin hack - ++ optionals stdenv.isDarwin [ autoconf automake libtool ]; + ++ lib.optionals stdenv.isDarwin [ autoconf automake libtool ]; # Don't remove static libraries (e.g. 'libs/*.a') on darwin. They're needed to # compile ffmpeg (and perhaps other things). - postInstall = optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.isDarwin) '' rm $out/lib/*.a ''; - meta = { + meta = with lib; { description = "MPEG-4 video codec for PC"; homepage = "https://www.xvid.com/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/development/libraries/xylib/default.nix index f7d7eed7e70e..ab2e3792eeab 100644 --- a/pkgs/development/libraries/xylib/default.nix +++ b/pkgs/development/libraries/xylib/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }: +{ lib +, stdenv +, fetchurl +, boost +, zlib +, bzip2 +, wxGTK32 +}: stdenv.mkDerivation rec { pname = "xylib"; @@ -9,12 +16,17 @@ stdenv.mkDerivation rec { sha256 = "1iqfrfrk78mki5csxysw86zm35ag71w0jvim0f12nwq1z8rwnhdn"; }; - buildInputs = [ boost zlib bzip2 wxGTK30 ]; + buildInputs = [ + boost + zlib + bzip2 + wxGTK32 + ]; meta = with lib; { description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods"; license = licenses.lgpl21; - homepage = "http://xylib.sourceforge.net/"; + homepage = "https://xylib.sourceforge.net/"; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/development/libraries/yaml-cpp/0.3.0.nix b/pkgs/development/libraries/yaml-cpp/0.3.0.nix new file mode 100644 index 000000000000..fad3397b74b6 --- /dev/null +++ b/pkgs/development/libraries/yaml-cpp/0.3.0.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "yaml-cpp"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "jbeder"; + repo = "yaml-cpp"; + rev = "release-${version}"; + hash = "sha256-pmgcULTXhl83+Wc8ZsGebnJ1t0XybHhUEJxDnEZE5x8="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DYAML_CPP_BUILD_TOOLS=${lib.boolToString doCheck}" + "-DBUILD_SHARED_LIBS=${lib.boolToString (!stdenv.hostPlatform.isStatic)}" + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + meta = with lib; { + description = "A YAML parser and emitter for C++"; + homepage = "https://github.com/jbeder/yaml-cpp"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ OPNA2608 ]; + }; +} diff --git a/pkgs/development/libraries/yaml-cpp/default.nix b/pkgs/development/libraries/yaml-cpp/default.nix new file mode 100644 index 000000000000..c9468b10b99b --- /dev/null +++ b/pkgs/development/libraries/yaml-cpp/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, gitUpdater +, cmake +, fetchpatch +}: + +stdenv.mkDerivation rec { + pname = "yaml-cpp"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "jbeder"; + repo = "yaml-cpp"; + rev = "yaml-cpp-${version}"; + hash = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk="; + }; + + patches = [ + # https://github.com/jbeder/yaml-cpp/issues/774 + # https://github.com/jbeder/yaml-cpp/pull/1037 + (fetchpatch { + name = "yaml-cpp-Fix-generated-cmake-config.patch"; + url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch"; + hash = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM="; + }) + # TODO: Remove with the next release, when https://github.com/jbeder/yaml-cpp/pull/1058 is available + (fetchpatch { + name = "yaml-cpp-Fix-pc-paths-for-absolute-GNUInstallDirs.patch"; + url = "https://github.com/jbeder/yaml-cpp/commit/328d2d85e833be7cb5a0ab246cc3f5d7e16fc67a.patch"; + hash = "sha256-1M2rxfbVOrRH9kiImcwcEolXOP8DeDW9Cbu03+mB5Yk="; + }) + ]; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DYAML_CPP_BUILD_TOOLS=false" + "-DYAML_BUILD_SHARED_LIBS=${lib.boolToString (!stdenv.hostPlatform.isStatic)}" + "-DINSTALL_GTEST=false" + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + passthru.updateScript = gitUpdater { + rev-prefix = "yaml-cpp-"; + }; + + meta = with lib; { + description = "A YAML parser and emitter for C++"; + homepage = "https://github.com/jbeder/yaml-cpp"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ OPNA2608 ]; + }; +} diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix index 9ab0f5db747e..43b181fc348f 100644 --- a/pkgs/development/libraries/yder/default.nix +++ b/pkgs/development/libraries/yder/default.nix @@ -6,7 +6,7 @@ , systemd , check , subunit -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ orcania ] ++ lib.optional withSystemd systemd; - checkInputs = [ check subunit ]; + nativeCheckInputs = [ check subunit ]; cmakeFlags = [ "-DBUILD_YDER_TESTING=on" diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix index b72820c77a68..d8c29e56aaab 100644 --- a/pkgs/development/libraries/yojimbo/default.nix +++ b/pkgs/development/libraries/yojimbo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }: +{ lib, stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls_2 }: stdenv.mkDerivation { pname = "yojimbo"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ premake5 doxygen ]; - propagatedBuildInputs = [ libsodium mbedtls ]; + propagatedBuildInputs = [ libsodium mbedtls_2 ]; postBuild = '' premake5 docs diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index 815326e53838..c05ba6d0cff0 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -11,20 +11,15 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-/gtkw020pybUDUeYydXgJ4PLvdOqZ0RbrLOfNMDaCmA="; + hash = "sha256-YzCEQuG38lVhCwZznhIyny6Yya8iNuhdqgYBz9OhGOc="; }; - # unbreak on darwin by finding argp-standalone, based on the patch from - # buildroot: - # https://github.com/buildroot/buildroot/raw/master/package/zchunk/0001-meson-fix-argp-standalone-wrap-and-find_library.patch - patches = lib.optional stdenv.isDarwin ./0001-meson-fix-argp-standalone.patch; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 3050525c2a29..f62dec911d81 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "bin" "dev" ]; doCheck = true; - checkInputs = with python3.pkgs; [ passlib ]; + nativeCheckInputs = with python3.pkgs; [ passlib ]; checkPhase = with lib; let # these tests require network access so we need to skip them. brokenTests = map escapeRegex [ diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 475ebc7517e5..f7b0ab31d83c 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Scaling, colorspace conversion and dithering library"; homepage = "https://github.com/sekrit-twc/zimg"; license = licenses.wtfpl; - platforms = platforms.linux ++ platforms.darwin; + platforms = with platforms; unix ++ windows; maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix index 56438f8e1735..15161b17c2a5 100644 --- a/pkgs/development/libraries/zimlib/default.nix +++ b/pkgs/development/libraries/zimlib/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dtest_data_dir=${testData}" ]; - checkInputs = [ + nativeCheckInputs = [ gtest ]; diff --git a/pkgs/development/libraries/zmusic/default.nix b/pkgs/development/libraries/zmusic/default.nix new file mode 100644 index 000000000000..1b5ac51b120d --- /dev/null +++ b/pkgs/development/libraries/zmusic/default.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, alsa-lib +, cmake +, fluidsynth +, libsndfile +, mpg123 +, ninja +, pkg-config +, soundfont-fluid +, zlib +}: + +stdenv.mkDerivation rec { + pname = "zmusic"; + version = "1.1.11"; + + src = fetchFromGitHub { + owner = "ZDoom"; + repo = "ZMusic"; + rev = version; + hash = "sha256-QvP8ranwBs8VupBie4vrHdm517OOpCuV3Rbjeb/L9PY="; + }; + + outputs = [ "out" "dev" ]; + + patches = [ + (fetchpatch { + name = "system-fluidsynth.patch"; + url = "https://git.alpinelinux.org/aports/plain/testing/zmusic/system-fluidsynth.patch?id=59bac94da374cb01bc2a0e49d9e9287812fa1ac0"; + hash = "sha256-xKaqiNk1Kt9yNLB22IVmSEtGeOtxrCi7YtFCmhNr0MI="; + }) + ]; + + postPatch = '' + substituteInPlace source/mididevices/music_fluidsynth_mididevice.cpp \ + --replace "/usr/share/sounds/sf2" "${soundfont-fluid}/share/soundfonts" \ + --replace "FluidR3_GM.sf2" "FluidR3_GM2-2.sf2" + ''; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + + buildInputs = [ + alsa-lib + fluidsynth + libsndfile + mpg123 + zlib + ]; + + meta = with lib; { + description = "GZDoom's music system as a standalone library"; + homepage = "https://github.com/ZDoom/ZMusic"; + license = with licenses; [ + free + gpl3Plus + lgpl21Plus + lgpl3Plus + ]; + platforms = platforms.linux; + maintainers = with maintainers; [ azahi lassulus ]; + }; +} diff --git a/pkgs/development/libraries/zxing-cpp/default.nix b/pkgs/development/libraries/zxing-cpp/default.nix index b9d61e5af626..bcddfa96552f 100644 --- a/pkgs/development/libraries/zxing-cpp/default.nix +++ b/pkgs/development/libraries/zxing-cpp/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pkg-config , cmake +, python3 }: stdenv.mkDerivation rec { @@ -37,6 +38,10 @@ stdenv.mkDerivation rec { --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ ''; + passthru.tests = { + inherit (python3.pkgs) zxing_cpp; + }; + meta = with lib; { homepage = "https://github.com/nu-book/zxing-cpp"; description = "C++ port of zxing (a Java barcode image processing library)"; diff --git a/pkgs/development/libraries/zydis/default.nix b/pkgs/development/libraries/zydis/default.nix index 7009123a4528..e889d92273ef 100644 --- a/pkgs/development/libraries/zydis/default.nix +++ b/pkgs/development/libraries/zydis/default.nix @@ -1,30 +1,52 @@ { lib , stdenv , fetchFromGitHub +, callPackage , cmake +, python3 }: +let + zycore = callPackage ./zycore.nix { + inherit stdenv fetchFromGitHub cmake; + }; +in stdenv.mkDerivation rec { pname = "zydis"; - version = "3.2.1"; + version = "4.0.0"; src = fetchFromGitHub { owner = "zyantific"; repo = "zydis"; rev = "v${version}"; - fetchSubmodules = true; - sha256 = "sha256-FB7hGQ9vI3ZE376iROEpdtZm91IiccBhtAFa94JgnUY="; + hash = "sha256-/no/8FNa5LlwhZMSMao4/cwZk6GlamLjqr+isbh6tEI="; }; - nativeBuildInputs = [ - cmake + nativeBuildInputs = [ cmake ]; + buildInputs = [ zycore ]; + cmakeFlags = [ + "-DZYAN_SYSTEM_ZYCORE=ON" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; + doCheck = true; + nativeCheckInputs = [ python3 ]; + checkPhase = '' + pushd ../tests + python3 ./regression.py test ../build/ZydisInfo + python3 ./regression_encoder.py \ + ../build/Zydis{Fuzz{ReEncoding,Encoder},TestEncoderAbsolute} + popd + ''; + + passthru = { inherit zycore; }; + meta = with lib; { homepage = "https://zydis.re/"; description = "Fast and lightweight x86/x86-64 disassembler library"; license = licenses.mit; - maintainers = with maintainers; [ jbcrail AndersonTorres ]; + maintainers = with maintainers; [ jbcrail AndersonTorres athre0z ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/zydis/zycore.nix b/pkgs/development/libraries/zydis/zycore.nix new file mode 100644 index 000000000000..c0ad668d1227 --- /dev/null +++ b/pkgs/development/libraries/zydis/zycore.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "zycore"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "zyantific"; + repo = "zycore-c"; + rev = "v${version}"; + hash = "sha256-kplUgrYecymGxz92tEU6H+NNtcN/Ao/tmmqdVo2c7HA="; + }; + + nativeBuildInputs = [ cmake ]; + + # The absolute paths set by the Nix CMake build manager confuse + # Zycore's config generation (which appends them to the package path). + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; +} diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 90758db16edd..c4c20f207a41 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -76,6 +76,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ lgpl2Plus mpl11 ]; maintainers = with maintainers; [ AndersonTorres ]; - platforms = python3.meta.platforms; + platforms = platforms.unix; }; } diff --git a/pkgs/development/lisp-modules-new/lisp-packages.nix b/pkgs/development/lisp-modules-new/lisp-packages.nix index aebcfdb1878e..78dd34ccdced 100644 --- a/pkgs/development/lisp-modules-new/lisp-packages.nix +++ b/pkgs/development/lisp-modules-new/lisp-packages.nix @@ -40,6 +40,7 @@ let removeSuffix hasInfix optionalString + makeBinPath makeLibraryPath makeSearchPath recurseIntoAttrs @@ -249,6 +250,12 @@ let then pkgs.applyPatches { inherit (args) src patches; } else args.src; patches = []; + + # make sure that propagated build-inputs from lispLibs are propagated + propagatedBuildInputs = lib.unique + (builtins.concatLists + (lib.catAttrs "propagatedBuildInputs" + (builtins.concatLists [[args] lispLibs nativeLibs javaLibs]))); }))); # Build the set of lisp packages using `lisp` @@ -353,7 +360,9 @@ let --prefix LD_LIBRARY_PATH : "${o.LD_LIBRARY_PATH}" \ --prefix LD_LIBRARY_PATH : "${makeLibraryPath o.nativeLibs}" \ --prefix CLASSPATH : "${o.CLASSPATH}" \ - --prefix CLASSPATH : "${makeSearchPath "share/java/*" o.javaLibs}" + --prefix CLASSPATH : "${makeSearchPath "share/java/*" o.javaLibs}" \ + --prefix PATH : "${makeBinPath (o.buildInputs or [])}" \ + --prefix PATH : "${makeBinPath (o.propagatedBuildInputs or [])}" ''; }); diff --git a/pkgs/development/lisp-modules-new/patches/cl-sat.glucose-binary-from-PATH-if-present.patch b/pkgs/development/lisp-modules-new/patches/cl-sat.glucose-binary-from-PATH-if-present.patch new file mode 100644 index 000000000000..6a0d2d07666b --- /dev/null +++ b/pkgs/development/lisp-modules-new/patches/cl-sat.glucose-binary-from-PATH-if-present.patch @@ -0,0 +1,27 @@ +From 2040fcab5a7be2f28add46a1412bef62ac5ccf11 Mon Sep 17 00:00:00 2001 +From: Maximilian Marx +Date: Thu, 24 Nov 2022 20:00:33 +0100 +Subject: [PATCH] Use glucose binary from PATH if present + +--- + src/package.lisp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/package.lisp b/src/package.lisp +index b6e26ac..bdb2581 100644 +--- a/src/package.lisp ++++ b/src/package.lisp +@@ -13,7 +13,9 @@ + (defvar *glucose-home* (asdf:system-relative-pathname :cl-sat.glucose "glucose-syrup/")) + + (defun glucose-binary (&optional (*glucose-home* *glucose-home*)) +- (merge-pathnames "simp/glucose_static" *glucose-home*)) ++ (if (trivial-package-manager:which "glucose") ++ "glucose" ++ (merge-pathnames "simp/glucose_static" *glucose-home*))) + + (defmethod solve ((input pathname) (solver (eql :glucose)) &rest options &key debug &allow-other-keys) + (remf options :debug) +-- +2.36.2 + diff --git a/pkgs/development/lisp-modules-new/ql.nix b/pkgs/development/lisp-modules-new/ql.nix index 07dd90feb302..aa04a8dce2e2 100644 --- a/pkgs/development/lisp-modules-new/ql.nix +++ b/pkgs/development/lisp-modules-new/ql.nix @@ -9,42 +9,29 @@ let # FIXME: automatically add nativeLibs based on conditions signalled + # Try to keep this list sorted extras = { + cffi-libffi = pkg: { + nativeBuildInputs = [ libffi ]; + nativeLibs = [ libffi ]; + }; "cl+ssl" = pkg: { nativeLibs = [ openssl_1_1 ]; }; + "cl-ana.hdf-cffi" = pkg: { + nativeBuildInputs = [ pkgs.hdf5 ]; + nativeLibs = [ pkgs.hdf5 ]; + NIX_LDFLAGS = [ "-lhdf5" ]; + }; + cl-async-ssl = pkg: { + nativeLibs = [ openssl_1_1 ]; + }; cl-cffi-gtk-glib = pkg: { nativeLibs = [ glib ]; }; cl-cffi-gtk-cairo = pkg: { nativeLibs = [ cairo ]; }; - cl-cairo2 = pkg: { - nativeLibs = [ cairo ]; - }; - cl-cairo2-xlib = pkg: { - nativeLibs = [ gtk2-x11 ]; - }; - cl-freetype2 = pkg: { - nativeLibs = [ freetype ]; - nativeBuildInputs = [ freetype ]; - patches = [ ./patches/cl-freetype2-fix-grovel-includes.patch ]; - }; - cl-pango = pkg: { - nativeLibs = [ pango ]; - }; - cl-gtk2-gdk = pkg: { - nativeLibs = [ gtk2-x11 ]; - }; - cl-gtk2-glib = pkg: { - nativeLibs = [ glib ]; - }; - cl-gtk2-pango = pkg: { - nativeLibs = [ pango ]; - }; - cl-rsvg2 = pkg: { - nativeLibs = [ librsvg ]; - }; cl-cffi-gtk-gdk = pkg: { nativeLibs = [ gtk3 ]; }; @@ -54,53 +41,66 @@ let cl-cffi-gtk-pango = pkg: { nativeLibs = [ pango ]; }; + cl-cairo2 = pkg: { + nativeLibs = [ cairo ]; + }; + cl-cairo2-xlib = pkg: { + nativeLibs = [ gtk2-x11 ]; + }; + cl-devil = pkg: { + nativeBuildInputs = [ pkgs.libdevil ]; + nativeLibs = [ pkgs.libdevil ]; + }; + cl-freetype2 = pkg: { + nativeLibs = [ freetype ]; + nativeBuildInputs = [ freetype ]; + patches = [ ./patches/cl-freetype2-fix-grovel-includes.patch ]; + }; + cl-glfw = pkg: { + nativeLibs = [ glfw ]; + }; + cl-glfw-opengl-core = pkg: { + nativeLibs = [ libGL ]; + }; + cl-glfw3 = pkg: { + nativeLibs = [ glfw ]; + }; + cl-glu = pkg: { + nativeLibs = [ libGLU ]; + }; + cl-glut = pkg: { + nativeLibs = [ freeglut ]; + }; cl-gobject-introspection = pkg: { nativeLibs = [ glib gobject-introspection ]; }; - cl-mysql = pkg: { - nativeLibs = [ mariadb.client ]; + cl-gtk2-gdk = pkg: { + nativeLibs = [ gtk2-x11 ]; }; - clsql-postgresql = pkg: { - nativeLibs = [ postgresql.lib ]; + cl-gtk2-glib = pkg: { + nativeLibs = [ glib ]; }; - clsql-sqlite3 = pkg: { - nativeLibs = [ sqlite ]; - }; - cl-webkit2 = pkg: { - nativeLibs = [ webkitgtk ]; - }; - dbd-mysql = pkg: { - nativeLibs = [ mariadb.client ]; - }; - lla = pkg: { - nativeLibs = [ openblas ]; - }; - cffi-libffi = pkg: { - nativeBuildInputs = [ libffi ]; - nativeLibs = [ libffi ]; - }; - cl-rabbit = pkg: { - nativeBuildInputs = [ rabbitmq-c ]; - nativeLibs = [ rabbitmq-c ]; - }; - trivial-ssh-libssh2 = pkg: { - nativeLibs = [ libssh2 ]; - }; - mssql = pkg: { - nativeLibs = [ freetds ]; - }; - sqlite = pkg: { - nativeLibs = [ sqlite ]; - }; - cl-libuv = pkg: { - nativeBuildInputs = [ libuv ]; - nativeLibs = [ libuv ]; + cl-gtk2-pango = pkg: { + nativeLibs = [ pango ]; }; cl-liballegro = pkg: { # build doesnt fail without this, but fails on runtime # weird... nativeLibs = [ allegro5 ]; }; + cl-libuv = pkg: { + nativeBuildInputs = [ libuv ]; + nativeLibs = [ libuv ]; + }; + cl-libxml2 = pkg: { + nativeLibs = [ pkgs.libxml2 ]; + }; + cl-libyaml = pkg: { + nativeLibs = [ pkgs.libyaml ]; + }; + cl-mysql = pkg: { + nativeLibs = [ mariadb.client ]; + }; cl-ode = pkg: { nativeLibs = let ode' = ode.overrideAttrs (o: { @@ -111,68 +111,76 @@ let }); in [ ode' ]; }; - classimp = pkg: { - nativeLibs = [ assimp ]; - }; - sdl2 = pkg: { - nativeLibs = [ SDL2 ]; - }; - lispbuilder-sdl-cffi = pkg: { - nativeLibs = [ SDL ]; - }; cl-opengl = pkg: { nativeLibs = [ libGL ]; }; - cl-glu = pkg: { - nativeLibs = [ libGLU ]; + cl-pango = pkg: { + nativeLibs = [ pango ]; }; - cl-glut = pkg: { - nativeLibs = [ freeglut ]; - }; - cl-glfw = pkg: { - nativeLibs = [ glfw ]; - }; - cl-glfw-opengl-core = pkg: { - nativeLibs = [ libGL ]; - }; - cl-glfw3 = pkg: { - nativeLibs = [ glfw ]; - }; - lev = pkg: { - nativeLibs = [ libev ]; + cl-rabbit = pkg: { + nativeBuildInputs = [ rabbitmq-c ]; + nativeLibs = [ rabbitmq-c ]; }; cl-rdkafka = pkg: { nativeBuildInputs = [ rdkafka ]; nativeLibs = [ rdkafka ]; }; - cl-async-ssl = pkg: { - nativeLibs = [ openssl_1_1 ]; + cl-readline = pkg: { + nativeLibs = [ pkgs.readline ]; }; - osicat = pkg: { - LD_LIBRARY_PATH = "${pkg}/posix/"; + cl-rsvg2 = pkg: { + nativeLibs = [ librsvg ]; + }; + "cl-sat.glucose" = pkg: { + propagatedBuildInputs = [ pkgs.glucose ]; + patches = [ ./patches/cl-sat.glucose-binary-from-PATH-if-present.patch ]; + + }; + "cl-sat.minisat" = pkg: { + propagatedBuildInputs = [ pkgs.minisat ]; + }; + cl-webkit2 = pkg: { + nativeLibs = [ webkitgtk ]; + }; + classimp = pkg: { + nativeLibs = [ assimp ]; + }; + clsql-postgresql = pkg: { + nativeLibs = [ postgresql.lib ]; + }; + clsql-sqlite3 = pkg: { + nativeLibs = [ sqlite ]; + }; + dbd-mysql = pkg: { + nativeLibs = [ mariadb.client ]; + }; + gsll = pkg: { + nativeBuildInputs = [ pkgs.gsl ]; + nativeLibs = [ pkgs.gsl ]; }; iolib = pkg: { nativeBuildInputs = [ libfixposix ]; nativeLibs = [ libfixposix ]; systems = [ "iolib" "iolib/os" "iolib/pathnames" ]; }; - "cl-ana.hdf-cffi" = pkg: { - nativeBuildInputs = [ pkgs.hdf5 ]; - nativeLibs = [ pkgs.hdf5 ]; - NIX_LDFLAGS = [ "-lhdf5" ]; + lev = pkg: { + nativeLibs = [ libev ]; }; - gsll = pkg: { - nativeBuildInputs = [ pkgs.gsl ]; - nativeLibs = [ pkgs.gsl ]; + lispbuilder-sdl-cffi = pkg: { + nativeLibs = [ SDL ]; }; - cl-libyaml = pkg: { - nativeLibs = [ pkgs.libyaml ]; + lla = pkg: { + nativeLibs = [ openblas ]; }; - cl-libxml2 = pkg: { - nativeLibs = [ pkgs.libxml2 ]; + mssql = pkg: { + nativeLibs = [ freetds ]; }; - cl-readline = pkg: { - nativeLibs = [ pkgs.readline ]; + osicat = pkg: { + LD_LIBRARY_PATH = "${pkg}/posix/"; + }; + png = pkg: { + nativeBuildInputs = [ pkgs.libpng ]; + nativeLibs = [ pkgs.libpng ]; }; pzmq = pkg: { nativeBuildInputs = [ pkgs.zeromq ]; @@ -190,6 +198,22 @@ let nativeBuildInputs = [ pkgs.zeromq ]; nativeLibs = [ pkgs.zeromq ]; }; + sdl2 = pkg: { + nativeLibs = [ SDL2 ]; + }; + sqlite = pkg: { + nativeLibs = [ sqlite ]; + }; + trivial-package-manager = pkg: { + propagatedBuildInputs = [ pkgs.which ]; + }; + trivial-ssh-libssh2 = pkg: { + nativeLibs = [ libssh2 ]; + }; + zmq = pkg: { + nativeBuildInputs = [ pkgs.zeromq ]; + nativeLibs = [ pkgs.zeromq ]; + }; }; qlpkgs = diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 57f616e088dd..31891967df4f 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -224,17 +224,17 @@ cldr = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast }: buildLuarocksPackage { pname = "cldr"; - version = "0.2.0-0"; + version = "0.3.0-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/cldr-0.2.0-0.rockspec"; - sha256 = "1vjwrlrdy10bacn0324fvs4sx85xryyg7npw2mp1k9kmasfr8r1s"; + url = "mirror://luarocks/cldr-0.3.0-0.rockspec"; + sha256 = "1fnr8k713w21v7hc64s4w5lgcgnbphq3gm69pisc2s4wq2fkija1"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/alerque/cldr-lua.git", - "rev": "51e4760838c0a83ef1a76d0a0fb2e9f964069a50", - "date": "2022-04-16T14:46:14+03:00", - "path": "/nix/store/7jziz15bjm27zw9i3arrxprglakz8n4d-cldr-lua", - "sha256": "1i22mcs50z99850j47gkgwyf0ahl4yh1732b4x3davjwy2fwak1x", + "rev": "4602a7859535ca198ddfaba73a02f9bce3e81025", + "date": "2022-12-06T12:36:06+03:00", + "path": "/nix/store/3xgwqd2pica8301sbfrw4bmv0xm2wzx5-cldr-lua", + "sha256": "0hlfb115qhamczzskvckxczf9dpp8cv8h6vz7zgdl2n025ik9dp4", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -368,6 +368,38 @@ buildLuarocksPackage { }; }) {}; +cyan = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, argparse, luafilesystem, tl +}: +buildLuarocksPackage { + pname = "cyan"; + version = "0.2.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/cyan-0.2.0-1.rockspec"; + sha256 = "06v9arib8slcllqxxx0a1z7wqmb184v7klrisvkdqqhpbrry7ys5"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/teal-language/cyan", + "rev": "d2048e73fec6c693a90b189c63db47006cbae699", + "date": "2022-08-21T17:11:18-05:00", + "path": "/nix/store/gz58lng3g8hflqgl6xsnmzkjika0ncvx-cyan", + "sha256": "119slbsvl39r2c51gvv9yvnsda0x9yvbrxnm2nzz2pnwh3ry50qc", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + propagatedBuildInputs = [ argparse luafilesystem tl ]; + + meta = { + homepage = "https://github.com/teal-language/cyan"; + description = "A build system for the Teal language"; + license.fullName = "MIT"; + }; +}) {}; + cyrussasl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit, lua }: @@ -392,7 +424,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/JorjBauer/lua-cyrussasl"; + homepage = "https://github.com/JorjBauer/lua-cyrussasl"; description = "Cyrus SASL library for Lua 5.1+"; license.fullName = "BSD"; }; @@ -407,10 +439,10 @@ buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/astoff/digestif", - "rev": "95b13ba7ed33605406353b200920ece08868d5a8", - "date": "2022-07-03T13:41:35+02:00", - "path": "/nix/store/k8y6gk4pqri76657c2sy4j4bkyh30jz5-digestif", - "sha256": "12pksz1l84iml7ng6yhywf0fyy8lclmcn2jjkdrh994lb7q9ya99", + "rev": "f1b4202928a49e8c20f84ed14deafd0f6b798e2f", + "date": "2022-12-07T18:12:23+01:00", + "path": "/nix/store/ss4kfahp9gnz2y826fr5w6dqxyxs25sn-digestif", + "sha256": "1jb8h7yks8bp74jpq85sz69d2k69vhp6gliajz8ximl3hbhdq17i", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -424,7 +456,7 @@ buildLuarocksPackage { meta = { homepage = "https://github.com/astoff/digestif/"; description = "A code analyzer for TeX"; - license.fullName = "MIT"; + license.fullName = "GPLv3+ and other free licenses"; }; }) {}; @@ -546,10 +578,10 @@ buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lewis6991/gitsigns.nvim", - "rev": "56e01cb0ea52635854e97bd2dd2587c8ebfab978", - "date": "2022-10-16T16:50:37+01:00", - "path": "/nix/store/yrm4xpi43x2sijw8gamvlfgqnyd7j19l-gitsigns.nvim", - "sha256": "0rdfnw2pr0hjxlw7bfjfvbh7lll4ba8ymp5nxq58d0jq01lzsxkr", + "rev": "2ab3bdf0a40bab53033048c6be75bda86316b55d", + "date": "2022-12-19T14:51:38+00:00", + "path": "/nix/store/hdjmih6vd3707wdfvycnvq1ig2q349xx-gitsigns.nvim", + "sha256": "13j5cmrd54cx9d8rirmys01xgmf90ylc3wb5dzmsdjc7hy0viha2", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -561,7 +593,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/lewis6991/gitsigns.nvim"; + homepage = "https://github.com/lewis6991/gitsigns.nvim"; description = "Git signs written in pure lua"; license.fullName = "MIT/X11"; }; @@ -693,10 +725,10 @@ buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/stevedonovan/LDoc.git", - "rev": "71dd5edbda829cd87b312956f4eae1ff8133fb14", - "date": "2022-06-17T13:41:29+03:00", - "path": "/nix/store/ywgvf4a5bdh7b7jzx8xgibch0a9kr9d2-LDoc", - "sha256": "0wwr28fl46y84p78bxaw9wsb7b4x7hmjywfdx5d70axh0amnlyrv", + "rev": "01d648f4ad50c3d14f2acadee6acb26beda56990", + "date": "2022-11-18T00:01:45+01:00", + "path": "/nix/store/m7vvl2b5k69jrb88d0y60f2y4ryazkp9-LDoc", + "sha256": "1kl0ba9mnd7nksakzb3vwr0hkkkgyk92v93r2w9xnrq879dhy5mm", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -1006,7 +1038,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/rrthomas/lrexlib"; + homepage = "https://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (GNU flavour)."; license.fullName = "MIT/X11"; }; @@ -1039,7 +1071,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/rrthomas/lrexlib"; + homepage = "https://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (PCRE flavour)."; maintainers = with lib.maintainers; [ vyp ]; license.fullName = "MIT/X11"; @@ -1073,7 +1105,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/rrthomas/lrexlib"; + homepage = "https://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (POSIX flavour)."; license.fullName = "MIT/X11"; }; @@ -1084,17 +1116,17 @@ lua-cjson = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast }: buildLuarocksPackage { pname = "lua-cjson"; - version = "2.1.0.6-1"; + version = "2.1.0.10-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-cjson-2.1.0.6-1.rockspec"; - sha256 = "1x6dk17lwmgkafpki99yl1hlypchbrxr9sxqafrmx7wwvzbz6q11"; + url = "mirror://luarocks/lua-cjson-2.1.0.10-1.rockspec"; + sha256 = "05sp7rq72x4kdkyid1ch0yyscwsi5wk85d2hj6xwssz3h8n8drdg"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/openresty/lua-cjson", - "rev": "a03094c5473d9a9764bb486fbe5e99a62d166dae", - "date": "2018-04-19T12:03:43-07:00", - "path": "/nix/store/qdpqx2g0xi1c9fknzxx280mcdq6fi8rw-lua-cjson", - "sha256": "0i2sjsi6flax1k0bm647yijgmc02jznq9bn88mj71pgii79pfjhw", + "rev": "96e6e0ce67ed070a52223c1e9518c9018b1ce376", + "date": "2021-12-10T20:19:58+08:00", + "path": "/nix/store/1ac8lz6smfa8zqfipqfsg749l9rw4ly9-lua-cjson", + "sha256": "03hdsv7d77mggis58k8fmlpbh1d544m0lfqyl9rpjcqkiqs1qvza", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -1139,7 +1171,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/antirez/lua-cmsgpack"; + homepage = "https://github.com/antirez/lua-cmsgpack"; description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3"; license.fullName = "Two-clause BSD"; }; @@ -1233,17 +1265,17 @@ lua-protobuf = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast }: buildLuarocksPackage { pname = "lua-protobuf"; - version = "0.4.0-1"; + version = "0.4.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-protobuf-0.4.0-1.rockspec"; - sha256 = "053r6z37847wm1xaxv5rwplmdqkp507qawgd382z0l7m05f06ls9"; + url = "mirror://luarocks/lua-protobuf-0.4.1-1.rockspec"; + sha256 = "0b395lhby26drb8dzf2gn2avlwvxmnaqmqx5m4g3ik7dmmn7p09i"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/starwing/lua-protobuf.git", - "rev": "832facd266366cd86ee9bf41d35327255d0033f2", - "date": "2022-07-27T14:34:12+08:00", - "path": "/nix/store/g68x4cbi6ssd5zak14r5cbi7k88d3ml9-lua-protobuf", - "sha256": "0ynfq0va4w8zlr67ld6v9nmi5mnvchfygd8h5jbwk2vzlj9hg2yw", + "rev": "2a2b0b95117642ad9470bfe0add7dd6ce82f3869", + "date": "2022-11-29T21:34:24+08:00", + "path": "/nix/store/8yjzfj6gy8nkz1dxf0bmy8afwiv8gsjr-lua-protobuf", + "sha256": "0c1vjji0nj9lznsxw5gbnhab0ibs69298yrsn5yky0hhz8mmx5nr", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -1365,17 +1397,17 @@ lua-resty-openssl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit}: buildLuarocksPackage { pname = "lua-resty-openssl"; - version = "0.8.13-1"; + version = "0.8.15-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-openssl-0.8.13-1.rockspec"; - sha256 = "12wd4v2pc3ppnr64109nx4sh33clwllfbp11mmg1c1n2w13fz578"; + url = "mirror://luarocks/lua-resty-openssl-0.8.15-1.rockspec"; + sha256 = "1i5nvii1wjgs28lcg8gk1axh394fz773br23jppa7rcan7lvrs4j"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/fffonion/lua-resty-openssl.git", - "rev": "3293e301f6c3818b780f1a818eacc9b78960b274", - "date": "2022-10-14T16:38:23+08:00", - "path": "/nix/store/ykj5yj8sj9rc5122gg7dcnq723fsxjq5-lua-resty-openssl", - "sha256": "0hkhy8x34z9m7wsqxrrc4vfqw0dbjhq36pjkqcq391vlsvzxhx5h", + "rev": "fadbea797bed4227269128a14fdabd4dee7cc486", + "date": "2022-10-28T12:17:38+08:00", + "path": "/nix/store/a6qqhb2p408mldvm1rqya09rjn04bbkj-lua-resty-openssl", + "sha256": "0w03fggfnqch6q90lwsig803i3rv74vsdxlfdbfb4si2yssjyxsz", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -1537,7 +1569,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/brimworks/lua-yajl"; + homepage = "https://github.com/brimworks/lua-yajl"; description = "Integrate the yajl JSON library with Lua."; maintainers = with lib.maintainers; [ pstn ]; license.fullName = "MIT/X11"; @@ -1635,17 +1667,17 @@ luacheck = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast }: buildLuarocksPackage { pname = "luacheck"; - version = "1.0.0-1"; + version = "1.1.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luacheck-1.0.0-1.rockspec"; - sha256 = "0q5kqix5n016piqhasp4h22srz1lzp96cjls4fgsbirjn87gsnxv"; + url = "mirror://luarocks/luacheck-1.1.0-1.rockspec"; + sha256 = "1r8d02x0hw28rd5p2gr7sf503lczjxv6qk1q66b375ibx6smpyza"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/luacheck.git", - "rev": "4d2979930245415e556a7c9f47b63ea038afcfee", - "date": "2022-08-24T12:50:43+03:00", - "path": "/nix/store/kfqdn4v9nzqqdw02fri10ic7v61r99n7-luacheck", - "sha256": "1dkqcaf0yrbcwbjiqbpdksj39sj8rbkd8432q568dgq2z5y9khcf", + "rev": "fcbdeacad00e643e0d78c56b9ba6d8b3c7fa584f", + "date": "2022-12-19T20:51:56+03:00", + "path": "/nix/store/srzi8dfrbb9gby9lc7r4sndzzrpzd7nm-luacheck", + "sha256": "0bkbcxadlf0j59lyvadp7hs7l107blkci15i0hrbi72bx18hj99h", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -1987,22 +2019,56 @@ buildLuarocksPackage { }; }) {}; +lualdap = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { + pname = "lualdap"; + version = "1.3.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lualdap-1.3.0-1.rockspec"; + sha256 = "0b51sm0fz4kiim20w538v31k9g20wq3msxdkh17drkr60ab25sc8"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/lualdap/lualdap", + "rev": "be380f5d98f779c813a4fb4ae1400262366fc8d4", + "date": "2021-06-05T15:49:42+02:00", + "path": "/nix/store/99sy73yz6sidqhkl0kwdsd7r853aw38n-lualdap", + "sha256": "133d8br5f24z03ni38m0czrqfz0mr0ksdrc1g73rawpmiqarpps8", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = with lua; (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://lualdap.github.io/lualdap/"; + description = "A Lua interface to the OpenLDAP library"; + maintainers = with lib.maintainers; [ aanderse ]; + license.fullName = "MIT"; + }; +}) {}; + lualogging = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit, luasocket }: buildLuarocksPackage { pname = "lualogging"; - version = "1.7.0-1"; + version = "1.8.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lualogging-1.7.0-1.rockspec"; - sha256 = "1h6zrhp3jvx4257gkskg8b6kd7pm6pd9wzhqb20vllyhj5vfb53h"; + url = "mirror://luarocks/lualogging-1.8.0-1.rockspec"; + sha256 = "0q1719r8lg8rnql809ylm6dbnja85f6nwyqir6f9giq3kcbvnsaq"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/lualogging.git", - "rev": "540df4424165b622d7c408b1f9d2d3420a5206e8", - "date": "2022-09-21T22:50:18+02:00", - "path": "/nix/store/69jb23b1gv0pcb20jwan342zzp0zjw1f-lualogging", - "sha256": "1rwbf593qx67cbk45vm155d7ws1y0xgxmwca508l8clq7d6rv3x0", + "rev": "1c6fcf5f68e4d0324c5977f1a27083c06f4d1b8f", + "date": "2022-10-22T09:15:52+02:00", + "path": "/nix/store/yi5v7b8jyplgylsjamjg9c0iswjpzrfj-lualogging", + "sha256": "17y84wrbijfm1z91p8i41ijq9py69qn0k6c5in9yl2mha7s1vndh", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2054,7 +2120,7 @@ buildLuarocksPackage { sha256 = "0hx6my54axjcb3bklr991wji374qq6mwa3ily6dvb72vi2534nwz"; }).outPath; src = fetchzip { - url = "http://github.com/luaposix/luaposix/archive/v34.1.1.zip"; + url = "https://github.com/luaposix/luaposix/archive/v34.1.1.zip"; sha256 = "0863r8c69yx92lalj174qdhavqmcs2cdimjim6k55qj9yn78v9zl"; }; @@ -2062,7 +2128,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ bit32 lua ]; meta = { - homepage = "http://github.com/luaposix/luaposix/"; + homepage = "https://github.com/luaposix/luaposix/"; description = "Lua bindings for POSIX"; maintainers = with lib.maintainers; [ vyp lblasc ]; license.fullName = "MIT/X11"; @@ -2297,7 +2363,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/bluebird75/luaunit"; + homepage = "https://github.com/bluebird75/luaunit"; description = "A unit testing framework for Lua"; maintainers = with lib.maintainers; [ lockejan ]; license.fullName = "BSD"; @@ -2309,10 +2375,10 @@ luautf8 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast }: buildLuarocksPackage { pname = "luautf8"; - version = "0.1.4-1"; + version = "0.1.5-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luautf8-0.1.4-1.rockspec"; - sha256 = "1pa91djyymhzfqnlc559v9wgk5l0m40wq0hnlnf841w6h5aj4fra"; + url = "mirror://luarocks/luautf8-0.1.5-1.rockspec"; + sha256 = "0b2fzb3ignpb028j35np3mkkydg73dpm0lqr4z89gzy2gfjm0iy7"; }).outPath; src = fetchurl { url = "https://github.com/starwing/luautf8/archive/refs/tags/0.1.4.tar.gz"; @@ -2323,7 +2389,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/starwing/luautf8"; + homepage = "https://github.com/starwing/luautf8"; description = "A UTF-8 support module for Lua"; maintainers = with lib.maintainers; [ pstn ]; license.fullName = "MIT"; @@ -2372,10 +2438,10 @@ buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/rktjmp/lush.nvim", - "rev": "fca6940b754812746c9758cc512cc97dcdb47de0", - "date": "2022-10-17T06:32:03+11:00", - "path": "/nix/store/aybmp713rb8qa0crm94hgzjcqdvjjv8f-lush.nvim", - "sha256": "1q8jzyxdxlif7sjxjqs8x696q1734saca5g05gqhvv5d23287hrn", + "rev": "4cc81a12731fbefce1582a940b755691eb3eb6d1", + "date": "2022-12-16T22:20:07+11:00", + "path": "/nix/store/2h8v2ff1bha580jzyrhhwa9lnj98f327-lush.nvim", + "sha256": "0zwb9d8makr9k20cdf7fajhk3frbh4n4p1zajxig0f3ws867zjqx", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2385,7 +2451,7 @@ buildLuarocksPackage { disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - checkInputs = [ moonscript ]; + nativeCheckInputs = [ moonscript ]; meta = { homepage = "https://github.com/rktjmp/lush.nvim"; @@ -2451,21 +2517,21 @@ lyaml = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast }: buildLuarocksPackage { pname = "lyaml"; - version = "6.2.7-1"; + version = "6.2.8-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lyaml-6.2.7-1.rockspec"; - sha256 = "0m5bnzg24nyk35gcn4rydgzk0ysk1f6rslxwxd0w3drl1bg64zja"; + url = "mirror://luarocks/lyaml-6.2.8-1.rockspec"; + sha256 = "0d0h70kjl5fkq589y1sx8qy8as002dhcf88pf60pghvch002ryi1"; }).outPath; src = fetchzip { - url = "http://github.com/gvvaughan/lyaml/archive/v6.2.7.zip"; - sha256 = "1qfvk610xgglyv9n2dp0cnh21f20q2zkl941qsv9qcbnm2f03vna"; + url = "https://github.com/gvvaughan/lyaml/archive/v6.2.8.zip"; + sha256 = "0r3jjsd8x2fs1aanki0s1mvpznl16f32c1qfgmicy0icgy5xfch0"; }; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/gvvaughan/lyaml"; + homepage = "https://github.com/gvvaughan/lyaml"; description = "libYAML binding for Lua"; maintainers = with lib.maintainers; [ lblasc ]; license.fullName = "MIT/X11"; @@ -2539,10 +2605,10 @@ buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/leafo/moonscript.git", - "rev": "b7efcd131046ed921ae1075d7c0f6a3b64a570f7", - "date": "2021-03-18T11:51:52-07:00", - "path": "/nix/store/xijbk0bgjpxjgmvscbqnghj4r3zdzgxl-moonscript", - "sha256": "14xx6pij0djblfv3g2hi0xlljh7h0yrbb03f4x90q5j66v693gx7", + "rev": "a0108328373d5f3f1aefb98341aa895dd75a1b2a", + "date": "2022-11-04T13:38:05-07:00", + "path": "/nix/store/js597jw44cdfq154a7bpqba99ninzsqh-moonscript", + "sha256": "02ig93c1dzrbs64mz40bkzz3p93fdxm6m0i7gfqwiickybr9wd97", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2614,10 +2680,10 @@ buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/hrsh7th/nvim-cmp", - "rev": "e94d3489311f941788756953df23ca84f83eec95", - "date": "2022-10-16T18:29:26+09:00", - "path": "/nix/store/jplbdkkgdbwxm930wyvxs6ghbljvh47g-nvim-cmp", - "sha256": "1v6iw2bqaqxzspl239jw3aqj64mc9sq2xxibvll7rmxxgv2mgyb5", + "rev": "8bbaeda725d5db6e4e1be2867a64b43bf547cf06", + "date": "2022-12-15T20:27:02+09:00", + "path": "/nix/store/bd3da1ahlp53p3b12780h2x29amr8a3h-nvim-cmp", + "sha256": "1ldbvspz6aam78d47ldpa7bv4z419bzsk5nhli75mz0vzidfvrw5", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2644,10 +2710,10 @@ buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/penlight.git", - "rev": "d5958e242b95984a278c39c63fadc5ef1258978b", - "date": "2022-08-14T10:06:20+02:00", - "path": "/nix/store/91nha43c2gdjyn8146fn9zfghlgvvdzz-penlight", - "sha256": "0bvc1a3g41mx8wlaq4ig3cl568rsysyggsr00hf7bi0ygf529sny", + "rev": "b101290c532c2901764de57367d3f2b84127286d", + "date": "2022-10-23T07:52:51+03:00", + "path": "/nix/store/k2jh5076dwb8dp6h05vbdj9jpa87gl1f-penlight", + "sha256": "10pb55cfqrpc9a112pvldkanh63s8dww452gl2rkjnrsh9b9gw4b", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2657,7 +2723,7 @@ buildLuarocksPackage { disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua luafilesystem ]; - checkInputs = [ busted ]; + nativeCheckInputs = [ busted ]; meta = { homepage = "https://lunarmodules.github.io/penlight"; @@ -2676,10 +2742,10 @@ buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/nvim-lua/plenary.nvim", - "rev": "4b7e52044bbb84242158d977a50c4cbcd85070c7", - "date": "2022-10-01T09:05:53+02:00", - "path": "/nix/store/hkj69cqq4qg3d98irg8wszgl7i1bg6lv-plenary.nvim", - "sha256": "11815h0h2mf5ym282ghk7xav90635r88qbgaflpgbyk2banl31wl", + "rev": "9d81624fbcedd3dd43b38d7e13a1e7b3f873d8cd", + "date": "2023-01-06T19:47:51+01:00", + "path": "/nix/store/r6a56xvn5dkrsnswpg7297ihdfc1qsgy-plenary.nvim", + "sha256": "0y3qn0rwlwp720517lwg35f09b30b591hprbvb6hgvn1waw2ljzc", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2691,7 +2757,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua luassert ]; meta = { - homepage = "http://github.com/nvim-lua/plenary.nvim"; + homepage = "https://github.com/nvim-lua/plenary.nvim"; description = "lua functions you don't want to write "; license.fullName = "MIT/X11"; }; @@ -2747,7 +2813,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua luaposix ]; meta = { - homepage = "http://pjb.com.au/comp/lua/readline.html"; + homepage = "https://pjb.com.au/comp/lua/readline.html"; description = "Interface to the readline library"; license.fullName = "MIT/X11"; }; @@ -2801,7 +2867,7 @@ buildLuarocksPackage { disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - checkInputs = [ busted ]; + nativeCheckInputs = [ busted ]; meta = { homepage = "https://lunarmodules.github.io/say"; @@ -2868,7 +2934,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; propagatedBuildInputs = [ luv ]; - checkInputs = [ plenary-nvim ]; + nativeCheckInputs = [ plenary-nvim ]; meta = { homepage = "https://github.com/tami5/sqlite.lua"; @@ -2963,6 +3029,38 @@ buildLuarocksPackage { }; }) {}; +teal-language-server = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, cyan, dkjson, luafilesystem +}: +buildLuarocksPackage { + pname = "teal-language-server"; + version = "dev-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/teal-language-server-dev-1.rockspec"; + sha256 = "01l44c6bknz7ff9xqgich31hlb0yk4ms5k1hs4rhm3cs95s5vlzc"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://git@github.com/teal-language/teal-language-server.git", + "rev": "38266ed482ef4b7e51d9cf149f4c75103fd0cefc", + "date": "2022-11-22T12:51:28-06:00", + "path": "/nix/store/3wzza2p2c9ylcj8ihv4xmkgljkwgs0z6-teal-language-server", + "sha256": "0q50a9f4gskx80mifpg9lf5haxsiw53b9lik398ijbkym4mfg2sz", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + propagatedBuildInputs = [ cyan dkjson luafilesystem ]; + + meta = { + homepage = "https://github.com/teal-language/teal-language-server"; + description = "A language server for the Teal language"; + license.fullName = "MIT"; + }; +}) {}; + tl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit, argparse, compat53, luafilesystem , dkjson}: @@ -2987,7 +3085,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; propagatedBuildInputs = [ argparse compat53 luafilesystem ]; - checkInputs = [ dkjson ]; + nativeCheckInputs = [ dkjson ]; meta = { homepage = "https://github.com/teal-language/tl"; diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index 183a958b4e1f..7f07c6602dac 100644 --- a/pkgs/development/lua-modules/generic/default.nix +++ b/pkgs/development/lua-modules/generic/default.nix @@ -2,6 +2,7 @@ { disabled ? false , propagatedBuildInputs ? [ ] +, makeFlags ? [ ] , ... } @ attrs: @@ -9,18 +10,16 @@ if disabled then throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}" else toLuaModule (lua.stdenv.mkDerivation ( - { + attrs // { + name = "lua${lua.luaversion}-" + attrs.pname + "-" + attrs.version; + makeFlags = [ "PREFIX=$(out)" - "LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}" "LUA_INC=-I${lua}/include" - ]; - } - // - attrs - // - { - name = "lua${lua.luaversion}-" + attrs.pname + "-" + attrs.version; + "LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}" + "LUA_VERSION=${lua.luaversion}" + ] ++ makeFlags; + propagatedBuildInputs = propagatedBuildInputs ++ [ lua # propagate it for its setup-hook ]; diff --git a/pkgs/development/lua-modules/nfd/default.nix b/pkgs/development/lua-modules/nfd/default.nix index ab6e1b83d79b..148b074666e8 100644 --- a/pkgs/development/lua-modules/nfd/default.nix +++ b/pkgs/development/lua-modules/nfd/default.nix @@ -1,5 +1,5 @@ -{ fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib -, substituteAll, zenity }: +{ stdenv, fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib +, substituteAll, zenity, AppKit }: buildLuarocksPackage { pname = "nfd"; @@ -25,6 +25,8 @@ buildLuarocksPackage { extraVariables.LUA_LIBDIR = "${lua}/lib"; nativeBuildInputs = [ pkg-config ]; + buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; + fixupPhase = '' find $out -name nfd_zenity.so -execdir mv {} nfd.so \; ''; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 5becc91699bf..419842a09677 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -27,7 +27,8 @@ , mariadb , mpfr , neovim-unwrapped -, openssl_1_1 +, openldap +, openssl , pcre , pkg-config , postgresql @@ -73,8 +74,8 @@ with prev; cqueues = (prev.luaLib.overrideLuarocks prev.cqueues (drv: { externalDeps = [ - { name = "CRYPTO"; dep = openssl_1_1; } - { name = "OPENSSL"; dep = openssl_1_1; } + { name = "CRYPTO"; dep = openssl; } + { name = "OPENSSL"; dep = openssl; } ]; disabled = luaOlder "5.1" || luaAtLeast "5.4"; })).overrideAttrs (oa: rec { @@ -329,11 +330,16 @@ with prev; disabled = luaOlder "5.1" || luaAtLeast "5.4" || isLuaJIT; }); + lualdap = prev.luaLib.overrideLuarocks prev.lualdap (drv: { + externalDeps = [ + { name = "LDAP"; dep = openldap; } + ]; + }); + luaossl = prev.luaLib.overrideLuarocks prev.luaossl (drv: { externalDeps = [ - # https://github.com/wahern/luaossl/pull/199 - { name = "CRYPTO"; dep = openssl_1_1; } - { name = "OPENSSL"; dep = openssl_1_1; } + { name = "CRYPTO"; dep = openssl; } + { name = "OPENSSL"; dep = openssl; } ]; }); @@ -345,7 +351,7 @@ with prev; luasec = prev.luaLib.overrideLuarocks prev.luasec (drv: { externalDeps = [ - { name = "OPENSSL"; dep = openssl_1_1; } + { name = "OPENSSL"; dep = openssl; } ]; }); @@ -377,7 +383,7 @@ with prev; ]; }); - lush-nvim = prev.luaLib.overrideLuarocks prev.lush-nvim (drv: rec { + lush-nvim = prev.luaLib.overrideLuarocks prev.lush-nvim (drv: { doCheck = false; }); @@ -399,10 +405,9 @@ with prev; patches = [ ./luuid.patch ]; - postConfigure = let inherit (prev.luuid) version pname; in - '' - sed -Ei ''${rockspecFilename} -e 's|lua >= 5.2|lua >= 5.1,|' - ''; + postConfigure = '' + sed -Ei ''${rockspecFilename} -e 's|lua >= 5.2|lua >= 5.1,|' + ''; }); @@ -493,11 +498,11 @@ with prev; sqlite = prev.luaLib.overrideLuarocks prev.sqlite (drv: { doCheck = true; - checkInputs = [ final.plenary-nvim neovim-unwrapped ]; + nativeCheckInputs = [ final.plenary-nvim neovim-unwrapped ]; # we override 'luarocks test' because otherwise neovim doesn't find/load the plenary plugin checkPhase = '' - export LIBSQLITE="${sqlite.out}/lib/libsqlite3.so" + export LIBSQLITE="${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}" export HOME="$TMPDIR"; nvim --headless -i NONE \ diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 52efc4f1fc3f..a7e9a69ff3ad 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.179"; + version = "0.6.202"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vU4pEVH6y72Z8H3QgrgxTp0tofAOMGUnez3Q343EOXw="; + sha256 = "sha256-H16CNJ8ztcwGDoH4dZ66/HbpNVEe+pYpKJcFpjW2wCs="; }; - vendorSha256 = "sha256-uaLoh1VhJAT5liGqL77DLhAWviy5Ci8B16LuzCWuek8="; + vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; CGO_ENABLED = 0; subPackages = [ "." ]; diff --git a/pkgs/development/misc/datafusion/default.nix b/pkgs/development/misc/datafusion/default.nix index a2e90dab6125..f048839292b6 100644 --- a/pkgs/development/misc/datafusion/default.nix +++ b/pkgs/development/misc/datafusion/default.nix @@ -1,35 +1,38 @@ -{ stdenv -, lib +{ lib , rustPlatform , fetchFromGitHub +, stdenv +, darwin }: -let - pname = "datafusion-cli"; - version = "unstable-2022-04-08"; -in -rustPlatform.buildRustPackage { - inherit pname version; - # TODO the crate has been yanked so not the best source - # the repo is a workspace with a lock inside a subdirectory, making - # compilation from github source not straightforward - # re-evaluate strategy on release after 7.0.0 +rustPlatform.buildRustPackage rec { + pname = "datafusion-cli"; + version = "15.0.0"; + src = fetchFromGitHub { owner = "apache"; repo = "arrow-datafusion"; - rev = "9cbde6d0e30fd29f59b0a16e309bdb0843cc7c64"; - sha256 = "sha256-XXd9jvWVivOBRS0PVOU9F4RQ6MrS/q78JF4S6Htd67w="; + rev = version; + sha256 = "sha256-s+gQoczTesJGOpz4W5hBPDdxo4eQnf+D10+V2kx65Io="; }; sourceRoot = "source/datafusion-cli"; - cargoSha256 = "sha256-Q0SjVofl1+sex15sSU9s7PgKeHG2b0gJPSqz7YZFOVs="; + cargoSha256 = "sha256-w+/5Ig+U8y4nwu7QisnZvc3UlZaEU/kovV6birOWndE="; + + buildInputs = lib.optional stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + checkFlags = [ + # fails even outside the Nix sandbox + "--skip=object_storage::tests::s3_region_validation" + ]; meta = with lib; { - broken = stdenv.isDarwin; description = "cli for Apache Arrow DataFusion"; homepage = "https://arrow.apache.org/datafusion"; + changelog = "https://github.com/apache/arrow-datafusion/blob/${version}/datafusion/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/misc/haskell/hasura/kriti-lang.nix b/pkgs/development/misc/haskell/hasura/kriti-lang.nix index 7e22aff40d7b..17362f05dd0d 100644 --- a/pkgs/development/misc/haskell/hasura/kriti-lang.nix +++ b/pkgs/development/misc/haskell/hasura/kriti-lang.nix @@ -38,4 +38,8 @@ mkDerivation { ]; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ lassulus ]; + + # Does not compile with ghc-9.2 + hydraPlatforms = lib.platforms.none; + broken = true; } diff --git a/pkgs/development/misc/haskell/hasura/pool.nix b/pkgs/development/misc/haskell/hasura/pool.nix index 48954114a4a1..c03b1fb88121 100644 --- a/pkgs/development/misc/haskell/hasura/pool.nix +++ b/pkgs/development/misc/haskell/hasura/pool.nix @@ -17,7 +17,7 @@ mkDerivation { vector ]; testHaskellDepends = [ base hspec ]; - homepage = "http://github.com/bos/pool"; + homepage = "https://github.com/bos/pool"; description = "A high-performance striped resource pooling implementation"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ lassulus ]; diff --git a/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix index 5c0b6b0eecb3..28f2c7e812b0 100644 --- a/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix +++ b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix @@ -7,8 +7,8 @@ mkDerivation { src = fetchFromGitHub { owner = "hercules-ci"; repo = "optparse-applicative"; - rev = "9e2968c09a7c5b29d04578dc68d81ce5aec0591e"; - sha256 = "sha256-11MnpQjmR89gW5WY5BwsPhpk/LwSIxEEhIa4LLiCbBc="; + rev = "3d20deefbef2e66d3c075facc5d01c1aede34f3c"; + sha256 = "sha256-FnFbPvy5iITT7rAjZBBUNQdo3UDP2z8iLg0MiIdXMdo="; }; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat diff --git a/pkgs/development/misc/msp430/mspds/binary.nix b/pkgs/development/misc/msp430/mspds/binary.nix index 5b64ec328ae6..3558599c2de0 100644 --- a/pkgs/development/misc/msp430/mspds/binary.nix +++ b/pkgs/development/misc/msp430/mspds/binary.nix @@ -1,9 +1,7 @@ { stdenv, lib, fetchurl, unzip, autoPatchelfHook }: -with lib; - let - archPostfix = optionalString (stdenv.is64bit && !stdenv.isDarwin) "_64"; + archPostfix = lib.optionalString (stdenv.is64bit && !stdenv.isDarwin) "_64"; in stdenv.mkDerivation rec { pname = "msp-debug-stack-bin"; version = "3.15.1.1"; @@ -26,7 +24,7 @@ in stdenv.mkDerivation rec { install -Dm0644 -t $out/include Inc/*.h ''; - meta = { + meta = with lib; { description = "Unfree binary release of the TI MSP430 FET debug driver"; homepage = "https://www.ti.com/tool/MSPDS"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/development/misc/msp430/mspds/default.nix b/pkgs/development/misc/msp430/mspds/default.nix index 891e7d980b4a..ec0ac507a46d 100644 --- a/pkgs/development/misc/msp430/mspds/default.nix +++ b/pkgs/development/misc/msp430/mspds/default.nix @@ -6,11 +6,10 @@ , libusb1 ? null }: -with lib; assert stdenv.isLinux -> libusb1 != null; let - hidapiDriver = optionalString stdenv.isLinux "-libusb"; + hidapiDriver = lib.optionalString stdenv.isLinux "-libusb"; in stdenv.mkDerivation { pname = "msp-debug-stack"; @@ -33,7 +32,7 @@ in stdenv.mkDerivation { preBuild = '' rm ThirdParty/src/pugixml.cpp rm ThirdParty/include/pugi{config,xml}.hpp - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' makeFlagsArray+=(OUTNAME="-install_name ") ''; @@ -44,9 +43,9 @@ in stdenv.mkDerivation { nativeBuildInputs = [ unzip ]; buildInputs = [ boost hidapi pugixml ] - ++ optional stdenv.isLinux libusb1; + ++ lib.optional stdenv.isLinux libusb1; - meta = { + meta = with lib; { description = "TI MSP430 FET debug driver"; homepage = "https://www.ti.com/tool/MSPDS"; license = licenses.bsd3; diff --git a/pkgs/development/misc/resholve/README.md b/pkgs/development/misc/resholve/README.md index 28fbfbb707ef..18d98f364f28 100644 --- a/pkgs/development/misc/resholve/README.md +++ b/pkgs/development/misc/resholve/README.md @@ -94,8 +94,9 @@ resholve.mkDerivation rec { ## Basic `resholve.writeScript` and `resholve.writeScriptBin` examples -Both of these functions have the same basic API. This example is a little -trivial for now. If you have a real usage that you find helpful, please PR it. +Both of these functions have the same basic API. The examples are a little +trivial, so I'll also link to some real-world examples: +- [shell.nix from abathur/tdverpy](https://github.com/abathur/tdverpy/blob/e1f956df3ed1c7097a5164e0c85b178772e277f5/shell.nix#L6-L13) ```nix resholvedScript = resholve.writeScript "name" { @@ -183,6 +184,7 @@ handle any potential problems it encounters with directives. There are currently scripts from using the latest current-system symlinks.) - resolve commands in a variable definition - resolve an absolute command path from inputs as if it were a bare reference + - force resholve to resolve known security wrappers 3. `keep` directives tell resholve not to raise an error (i.e., ignore) something it would usually object to. Common examples: - variables used as/within the first word of a command @@ -190,7 +192,7 @@ handle any potential problems it encounters with directives. There are currently - dynamic (variable) arguments to commands known to accept/run other commands > NOTE: resholve has a (growing) number of directives detailed in `man resholve` -> via `nixpkgs.resholve`. +> via `nixpkgs.resholve` (though protections against run-time use of python2 in nixpkgs mean you'll have to set `NIXPKGS_ALLOW_INSECURE=1` to pull resholve into nix-shell). Each of these 3 types is represented by its own attrset, where you can think of the key as a scope. The value should be: @@ -250,8 +252,23 @@ with some rules (internal to resholve) for locating sub-executions in some of the more common commands. - "execer" lore identifies whether an executable can, cannot, - or might execute its arguments. Every "can" or "might" verdict requires - either built-in rules for finding the executable, or human triage. + or might execute its arguments. Every "can" or "might" verdict requires: + - an update to the matching rules in [binlore](https://github.com/abathur/binlore) + if there's absolutely no exec in the executable and binlore just lacks + rules for understanding this + - an override in [binlore](https://github.com/abathur/binlore) if there is + exec but it isn't actually under user control + - a parser in [resholve](https://github.com/abathur/resholve) capable of + isolating the exec'd words if the command does have exec under user + control + - overriding the execer lore for the executable if manual triage indicates + that all of the invocations in the current package don't include any + commands that the executable would exec + - if manual triage turns up any commands that would be exec'd, use some + non-resholve tool to patch/substitute/replace them before or after you + run resholve on them (if before, you may need to also add keep directives + for these absolute paths) + - "wrapper" lore maps shell exec wrappers to the programs they exec so that resholve can substitute an executable's verdict for its wrapper's. diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix index b2ee3c1d1b57..74f45f8ed3cc 100644 --- a/pkgs/development/misc/resholve/default.nix +++ b/pkgs/development/misc/resholve/default.nix @@ -1,21 +1,54 @@ -{ callPackage +{ lib +, pkgs +, pkgsBuildHost , ... }: let + removeKnownVulnerabilities = pkg: pkg.overrideAttrs (old: { + meta = (old.meta or { }) // { knownVulnerabilities = [ ]; }; + }); + # We are removing `meta.knownVulnerabilities` from `python27`, + # and setting it in `resholve` itself. + python27' = (removeKnownVulnerabilities pkgsBuildHost.python27).override { + self = python27'; + pkgsBuildHost = pkgsBuildHost // { python27 = python27'; }; + # strip down that python version as much as possible + openssl = null; + bzip2 = null; + readline = null; + ncurses = null; + gdbm = null; + sqlite = null; + rebuildBytecode = false; + stripBytecode = true; + strip2to3 = true; + stripConfig = true; + stripIdlelib = true; + stripTests = true; + enableOptimizations = false; + }; + callPackage = lib.callPackageWith (pkgs // { python27 = python27'; }); source = callPackage ./source.nix { }; deps = callPackage ./deps.nix { }; in rec { + # not exposed in all-packages + resholveBuildTimeOnly = removeKnownVulnerabilities resholve; # resholve itself resholve = callPackage ./resholve.nix { inherit (source) rSrc version; inherit (deps.oil) oildev; + inherit (deps) configargparse; inherit resholve-utils; + # used only in tests + resholve = resholveBuildTimeOnly; }; # funcs to validate and phrase invocations of resholve # and use those invocations to build packages resholve-utils = callPackage ./resholve-utils.nix { - inherit resholve; + # we can still use resholve-utils without triggering a security warn + # this is safe since we will only use `resholve` at build time + resholve = resholveBuildTimeOnly; }; } diff --git a/pkgs/development/misc/resholve/deps.nix b/pkgs/development/misc/resholve/deps.nix index 604bfa872c25..ef0ebaa670c1 100644 --- a/pkgs/development/misc/resholve/deps.nix +++ b/pkgs/development/misc/resholve/deps.nix @@ -1,4 +1,7 @@ -{ callPackage +{ lib +, callPackage +, fetchFromGitHub +, python27 , ... }: @@ -14,5 +17,64 @@ rec { # binlore = callPackage ./binlore.nix { }; - oil = callPackage ./oildev.nix { }; + oil = callPackage ./oildev.nix { + inherit python27; + inherit six; + inherit typing; + }; + configargparse = python27.pkgs.buildPythonPackage rec { + pname = "configargparse"; + version = "1.5.3"; + + src = fetchFromGitHub { + owner = "bw2"; + repo = "ConfigArgParse"; + rev = "v${version}"; + sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz"; + }; + + doCheck = false; + + pythonImportsCheck = [ "configargparse" ]; + + meta = with lib; { + description = "A drop-in replacement for argparse"; + homepage = "https://github.com/bw2/ConfigArgParse"; + license = licenses.mit; + }; + }; + six = python27.pkgs.buildPythonPackage rec { + pname = "six"; + version = "1.16.0"; + + src = python27.pkgs.fetchPypi { + inherit pname version; + sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"; + }; + + doCheck = false; + + meta = { + description = "A Python 2 and 3 compatibility library"; + homepage = "https://pypi.python.org/pypi/six/"; + license = lib.licenses.mit; + }; + }; + typing = python27.pkgs.buildPythonPackage rec { + pname = "typing"; + version = "3.10.0.0"; + + src = python27.pkgs.fetchPypi { + inherit pname version; + sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"; + }; + + doCheck = false; + + meta = with lib; { + description = "Backport of typing module to Python versions older than 3.5"; + homepage = "https://docs.python.org/3/library/typing.html"; + license = licenses.psfl; + }; + }; } diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix index 00855e7f7bcc..de3ac08ec99d 100644 --- a/pkgs/development/misc/resholve/oildev.nix +++ b/pkgs/development/misc/resholve/oildev.nix @@ -1,6 +1,6 @@ { lib , stdenv -, python27Packages +, python27 , callPackage , fetchFromGitHub , makeWrapper @@ -9,10 +9,11 @@ , # py-yajl deps git , # oil deps - readline -, cmark + cmark , file , glibcLocales +, six +, typing }: rec { @@ -32,14 +33,14 @@ rec { ''; }; - py-yajl = python27Packages.buildPythonPackage rec { + py-yajl = python27.pkgs.buildPythonPackage rec { pname = "oil-pyyajl-unstable"; - version = "2019-12-05"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "oilshell"; repo = "py-yajl"; - rev = "eb561e9aea6e88095d66abcc3990f2ee1f5339df"; - sha256 = "17hcgb7r7cy8r1pwbdh8di0nvykdswlqj73c85k6z8m0filj3hbh"; + rev = "72686b0e2e9d13d3ce5fefe47ecd607c540c90a3"; + hash = "sha256-H3GKN0Pq1VFD5+SWxm8CXUVO7zAyj/ngKVmDaG/aRT4="; fetchSubmodules = true; }; # just for submodule IIRC @@ -51,16 +52,16 @@ rec { (or accepting all of the patches we need to do so). This creates one without disturbing upstream too much. */ - oildev = python27Packages.buildPythonPackage rec { + oildev = python27.pkgs.buildPythonPackage rec { pname = "oildev-unstable"; version = "2021-07-14"; src = fetchFromGitHub { owner = "oilshell"; repo = "oil"; - # rev == present HEAD of release/0.8.12 - rev = "799c0703d1da86cb80d1f5b163edf9369ad77cf1"; - hash = "sha256-QNSISr719ycZ1Z0quxHWzCb3IvHGj9TpogaYz20hDM4="; + # rev == present HEAD of release/0.14.0 + rev = "3d0427e222f7e42ae7be90c706d7fde555efca2e"; + hash = "sha256-XMoNkBEEmD6AwNSu1uSh3OcWLfy4/ADtRckn/Pj2cP4="; /* It's not critical to drop most of these; the primary target is @@ -71,16 +72,16 @@ rec { hash on rev updates. Command will fail w/o and not print hash. */ postFetch = '' - rm -rf Python-2.7.13 benchmarks metrics py-yajl rfc gold web testdata services demo devtools cpp + rm -rf $out/{Python-2.7.13,metrics,py-yajl,rfc,gold,web,testdata,services,demo,devtools} ''; }; - # patch to support a python package, pass tests on macOS, etc. + # patch to support a python package, pass tests on macOS, drop deps, etc. patchSrc = fetchFromGitHub { owner = "abathur"; repo = "nix-py-dev-oil"; - rev = "v0.8.12.2"; - hash = "sha256-+dVxzPKMGNKFE+7Ggzx9iWjjvwW2Ow3UqmjjUud9Mqo="; + rev = "v0.14.0.0"; + hash = "sha256-U6uR8G6yB2xwuDE/fznco23mVFSVdCxPUNdCRYz4Mj8="; }; patches = [ "${patchSrc}/0001-add_setup_py.patch" @@ -89,13 +90,18 @@ rec { "${patchSrc}/0006-disable_failing_libc_tests.patch" "${patchSrc}/0007-namespace_via_init.patch" "${patchSrc}/0009-avoid_nix_arch64_darwin_toolchain_bug.patch" + "${patchSrc}/0010-disable-line-input.patch" + "${patchSrc}/0011-disable-fanos.patch" + "${patchSrc}/0012-disable-doc-cmark.patch" ]; - buildInputs = [ readline cmark py-yajl ]; + configureFlags = [ + "--without-readline" + ]; nativeBuildInputs = [ re2c file makeWrapper ]; - propagatedBuildInputs = with python27Packages; [ six typing ]; + propagatedBuildInputs = [ six typing py-yajl ]; doCheck = true; @@ -104,7 +110,12 @@ rec { ''; postPatch = '' - patchShebangs asdl build core doctools frontend native oil_lang + patchShebangs asdl build core doctools frontend pyext oil_lang + substituteInPlace pyext/fastlex.c --replace '_gen/frontend' '../_gen/frontend' + substituteInPlace core/main_loop.py --replace 'import fanos' '# import fanos' + rm cpp/stdlib.h # keep modules from finding the wrong stdlib? + # work around hard parse failure documented in oilshell/oil#1468 + substituteInPlace osh/cmd_parse.py --replace 'elif self.c_id == Id.Op_LParen' 'elif False' ''; /* @@ -118,8 +129,17 @@ rec { # See earlier note on glibcLocales TODO: verify needed? LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; - # not exhaustive; just a spot-check for now - pythonImportsCheck = [ "oil" "oil._devbuild" ]; + # not exhaustive; sample what resholve uses as a sanity check + pythonImportsCheck = [ + "oil" + "oil.asdl" + "oil.core" + "oil.frontend" + "oil._devbuild" + "oil._devbuild.gen.id_kind_asdl" + "oil._devbuild.gen.syntax_asdl" + "oil.tools.osh2oil" + ]; meta = { license = with lib.licenses; [ diff --git a/pkgs/development/misc/resholve/resholve-utils.nix b/pkgs/development/misc/resholve/resholve-utils.nix index 26bf492d23ab..a903b674eb33 100644 --- a/pkgs/development/misc/resholve/resholve-utils.nix +++ b/pkgs/development/misc/resholve/resholve-utils.nix @@ -129,6 +129,7 @@ rec { ) ) )} + '' + lib.optionalString (partialSolution.interpreter != "none") '' ${partialSolution.interpreter} -n $out ''; }; @@ -146,6 +147,7 @@ rec { ) ) } + '' + lib.optionalString (partialSolution.interpreter != "none") '' ${partialSolution.interpreter} -n $out/bin/${name} ''; }; @@ -181,6 +183,7 @@ rec { src = unresholved; inherit version pname; buildInputs = [ resholve ]; + disallowedReferences = [ resholve ]; # retain a reference to the base passthru = unresholved.passthru // { diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 435cca919da6..28a0e401cf5d 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -1,16 +1,18 @@ { lib , stdenv , callPackage -, python27Packages +, python27 , installShellFiles , rSrc , version , oildev +, configargparse , binlore +, resholve , resholve-utils }: -python27Packages.buildPythonApplication { +python27.pkgs.buildPythonApplication { pname = "resholve"; inherit version; src = rSrc; @@ -19,7 +21,7 @@ python27Packages.buildPythonApplication { propagatedBuildInputs = [ oildev - python27Packages.configargparse + configargparse ]; postPatch = '' @@ -40,7 +42,7 @@ python27Packages.buildPythonApplication { passthru = { inherit (resholve-utils) mkDerivation phraseSolution writeScript writeScriptBin; - tests = callPackage ./test.nix { inherit rSrc binlore; }; + tests = callPackage ./test.nix { inherit rSrc binlore python27 resholve; }; }; meta = with lib; { @@ -49,5 +51,10 @@ python27Packages.buildPythonApplication { license = with licenses; [ mit ]; maintainers = with maintainers; [ abathur ]; platforms = platforms.all; + knownVulnerabilities = [ '' + resholve depends on python27 (EOL). While it's safe to + run on trusted input in the build sandbox, you should + avoid running it on untrusted input. + '' ]; }; } diff --git a/pkgs/development/misc/resholve/source.nix b/pkgs/development/misc/resholve/source.nix index fa3b9c80e31d..70182722bde4 100644 --- a/pkgs/development/misc/resholve/source.nix +++ b/pkgs/development/misc/resholve/source.nix @@ -3,7 +3,7 @@ }: rec { - version = "0.8.1"; + version = "0.9.0"; rSrc = # local build -> `make ci`; `make clean` to restore # return to remote source @@ -14,6 +14,6 @@ rec { owner = "abathur"; repo = "resholve"; rev = "v${version}"; - hash = "sha256-EVrv4Lj9GQa3g18BRQjC0wCxzsfsn4Ka1iq5Ouu1cII="; + hash = "sha256-FRdCeeC2c3bMEXekEyilgW0PwFfUWGstZ5mXdmRPM5w="; }; } diff --git a/pkgs/development/misc/resholve/test.nix b/pkgs/development/misc/resholve/test.nix index 2b8a3ec3d296..9096a9249a4d 100644 --- a/pkgs/development/misc/resholve/test.nix +++ b/pkgs/development/misc/resholve/test.nix @@ -127,7 +127,7 @@ rec { ''; doCheck = true; buildInputs = [ resholve ]; - checkInputs = [ coreutils bats python27 ]; + nativeCheckInputs = [ coreutils bats python27 ]; # LOGLEVEL="DEBUG"; # default path @@ -179,4 +179,11 @@ rec { echo "Hello" file . ''; + resholvedScriptBinNone = resholve.writeScriptBin "resholved-script-bin" { + inputs = [ file ]; + interpreter = "none"; + } '' + echo "Hello" + file . + ''; } diff --git a/pkgs/development/misc/rpiboot/default.nix b/pkgs/development/misc/rpiboot/default.nix index 35fb41d0a8da..8930648cdaaa 100644 --- a/pkgs/development/misc/rpiboot/default.nix +++ b/pkgs/development/misc/rpiboot/default.nix @@ -1,17 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, libusb1 }: +{ lib, stdenv, fetchFromGitHub, libusb1, pkg-config }: stdenv.mkDerivation rec { pname = "rpiboot"; - version = "2021.07.01"; + version = "20221215-105525"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "usbboot"; - rev = "v${version}"; - sha256 = "sha256-BkNyYCrasfiRs7CbJa7tCo2k70TLGcXkOX+zGPyZGGE="; + rev = version; + hash = "sha256-Y77IrDblXmnpZleJ3zTyiGDYLZ7gNxASXpqUzwS1NCU="; }; - nativeBuildInputs = [ libusb1 ]; + buildInputs = [ libusb1 ]; + nativeBuildInputs = [ pkg-config ]; patchPhase = '' sed -i "s@/usr/@$out/@g" main.c @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/raspberrypi/usbboot"; description = "Utility to boot a Raspberry Pi CM/CM3/CM4/Zero over USB"; license = licenses.asl20; - maintainers = with maintainers; [ cartr ]; + maintainers = with maintainers; [ cartr flokli ]; platforms = [ "aarch64-linux" "aarch64-darwin" "armv7l-linux" "armv6l-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/mobile/androidenv/README.md b/pkgs/development/mobile/androidenv/README.md index 159265abb480..04cb157dba56 100644 --- a/pkgs/development/mobile/androidenv/README.md +++ b/pkgs/development/mobile/androidenv/README.md @@ -4,3 +4,12 @@ 2. `./mkrepo.sh` 3. Check the `repo.json` diff for new stable versions of `tools`, `platform-tools`, `build-tools`, `emulator` and/or `ndk` 4. Update the relevant argument defaults in `compose-android-packages.nix` + +# How to run tests +You may need to make yourself familiar with [tests](https://nixos.org/manual/nixpkgs/stable/#var-meta-tests), and [Writing larger package tests](https://nixos.org/manual/nixpkgs/stable/#ssec-package-tests-writing) in the Manual, then run tests locally with: + +```shell +$ export NIXPKGS_ALLOW_UNFREE=1 +$ cd path/to/nixpkgs +$ nix-build -A androidenv.test-suite.tests +``` diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index 6f4b32b486ba..7e34c34607eb 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -16,7 +16,7 @@ let extraArgs = removeAttrs args ([ "name" ] ++ builtins.attrNames androidSdkFormalArgs); in stdenv.mkDerivation ({ - name = lib.replaceChars [" "] [""] name; # Android APKs may contain white spaces in their names, but Nix store paths cannot + name = lib.replaceStrings [" "] [""] name; # Android APKs may contain white spaces in their names, but Nix store paths cannot ANDROID_HOME = "${androidsdk}/libexec/android-sdk"; buildInputs = [ jdk ant ]; buildPhase = '' diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 1f1316d8fb6b..018298d322e8 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,10 +1,10 @@ -{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgs_i686}: +{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall}: deployAndroidPackage { inherit package os; nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (os == "linux") [ autoPatchelfHook ]; - buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 pkgs.libcxx ]; + buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgsi686Linux.glibc pkgsi686Linux.zlib pkgsi686Linux.ncurses5 pkgs.libcxx ]; patchInstructions = '' ${lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib @@ -19,6 +19,8 @@ deployAndroidPackage { wrapProgram $PWD/mainDexClasses \ --prefix PATH : ${pkgs.jdk8}/bin ''} - ''; + + cd $out/libexec/android-sdk + '' + postInstall; noAuditTmpdir = true; # The checker script gets confused by the build-tools path that is incorrectly identified as a reference to /build } diff --git a/pkgs/development/mobile/androidenv/cmdline-tools.nix b/pkgs/development/mobile/androidenv/cmdline-tools.nix new file mode 100644 index 000000000000..b3ca1c171b65 --- /dev/null +++ b/pkgs/development/mobile/androidenv/cmdline-tools.nix @@ -0,0 +1,39 @@ +{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, stdenv, cmdLineToolsVersion, postInstall}: + +deployAndroidPackage { + name = "androidsdk"; + inherit package os; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + + patchInstructions = '' + ${lib.optionalString (os == "linux") '' + # Auto patch all binaries + autoPatchelf . + ''} + + # Strip double dots from the root path + export ANDROID_SDK_ROOT="$out/libexec/android-sdk" + + # Wrap all scripts that require JAVA_HOME + find $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin -maxdepth 1 -type f -executable | while read program; do + if grep -q "JAVA_HOME" $program; then + wrapProgram $program --prefix PATH : ${pkgs.jdk11}/bin \ + --prefix ANDROID_SDK_ROOT : $ANDROID_SDK_ROOT + fi + done + + # Wrap sdkmanager script + wrapProgram $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin/sdkmanager \ + --prefix PATH : ${lib.makeBinPath [ pkgs.jdk11 ]} \ + --add-flags "--sdk_root=$ANDROID_SDK_ROOT" + + # Patch all script shebangs + patchShebangs $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin + + cd $ANDROID_SDK_ROOT + ${postInstall} + ''; + + meta.license = lib.licenses.unfree; +} diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 217922886df8..75f393b3f9e2 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -1,12 +1,13 @@ -{ requireFile, autoPatchelfHook, pkgs, pkgsHostHost, pkgs_i686 +{ callPackage, stdenv, lib, fetchurl, ruby, writeText , licenseAccepted ? false }: -{ toolsVersion ? "26.1.1" -, platformToolsVersion ? "33.0.2" -, buildToolsVersions ? [ "32.0.0" ] +{ cmdLineToolsVersion ? "8.0" +, toolsVersion ? "26.1.1" +, platformToolsVersion ? "33.0.3" +, buildToolsVersions ? [ "33.0.1" ] , includeEmulator ? false -, emulatorVersion ? "31.3.7" +, emulatorVersion ? "31.3.14" , platformVersions ? [] , includeSources ? false , includeSystemImages ? false @@ -14,7 +15,7 @@ , abiVersions ? [ "armeabi-v7a" "arm64-v8a" ] , cmakeVersions ? [ ] , includeNDK ? false -, ndkVersion ? "24.0.8215888" +, ndkVersion ? "25.1.8937393" , ndkVersions ? [ndkVersion] , useGoogleAPIs ? false , useGoogleTVAddOns ? false @@ -25,9 +26,6 @@ }: let - inherit (pkgs) stdenv lib fetchurl; - inherit (pkgs.buildPackages) makeWrapper unzip; - # Determine the Android os identifier from Nix's system identifier os = if stdenv.system == "x86_64-linux" then "linux" else if stdenv.system == "x86_64-darwin" then "macosx" @@ -35,7 +33,7 @@ let # Uses mkrepo.rb to create a repo spec. mkRepoJson = { packages ? [], images ? [], addons ? [] }: let - mkRepoRuby = (pkgs.ruby.withPackages (pkgs: with pkgs; [ slop nokogiri ])); + mkRepoRuby = (ruby.withPackages (pkgs: with pkgs; [ slop nokogiri ])); mkRepoRubyArguments = lib.lists.flatten [ (builtins.map (package: ["--packages" "${package}"]) packages) (builtins.map (image: ["--images" "${image}"]) images) @@ -115,26 +113,60 @@ let ] ++ extraLicenses); in rec { - deployAndroidPackage = import ./deploy-androidpackage.nix { - inherit stdenv unzip; + deployAndroidPackages = callPackage ./deploy-androidpackages.nix { + inherit stdenv lib mkLicenses; }; + deployAndroidPackage = ({package, os ? null, buildInputs ? [], patchInstructions ? "", meta ? {}, ...}@args: + let + extraParams = removeAttrs args [ "package" "os" "buildInputs" "patchInstructions" ]; + in + deployAndroidPackages ({ + inherit os buildInputs meta; + packages = [ package ]; + patchesInstructions = { "${package.name}" = patchInstructions; }; + } // extraParams + )); - platform-tools = import ./platform-tools.nix { - inherit deployAndroidPackage autoPatchelfHook pkgs lib; + platform-tools = callPackage ./platform-tools.nix { + inherit deployAndroidPackage; os = if stdenv.system == "aarch64-darwin" then "macosx" else os; # "macosx" is a universal binary here package = packages.platform-tools.${platformToolsVersion}; }; + tools = callPackage ./tools.nix { + inherit deployAndroidPackage os; + package = packages.tools.${toolsVersion}; + + postInstall = '' + ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }} + ${linkPlugin { name = "patcher"; plugin = patcher; }} + ${linkPlugin { name = "emulator"; plugin = emulator; }} + ''; + }; + + patcher = callPackage ./patcher.nix { + inherit deployAndroidPackage os; + package = packages.patcher."1"; + }; + build-tools = map (version: - import ./build-tools.nix { - inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686 lib; + callPackage ./build-tools.nix { + inherit deployAndroidPackage os; package = packages.build-tools.${version}; + + postInstall = '' + ${linkPlugin { name = "tools"; plugin = tools; check = toolsVersion != null; }} + ''; } ) buildToolsVersions; - emulator = import ./emulator.nix { - inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686 lib; + emulator = callPackage ./emulator.nix { + inherit deployAndroidPackage os; package = packages.emulator.${emulatorVersion}; + + postInstall = '' + ${linkSystemImages { images = system-images; check = includeSystemImages; }} + ''; }; platforms = map (version: @@ -171,16 +203,16 @@ rec { ) platformVersions); cmake = map (version: - import ./cmake.nix { - inherit deployAndroidPackage os autoPatchelfHook pkgs lib stdenv; + callPackage ./cmake.nix { + inherit deployAndroidPackage os; package = packages.cmake.${version}; } ) cmakeVersions; # Creates a NDK bundle. makeNdkBundle = ndkVersion: - import ./ndk-bundle { - inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgsHostHost lib platform-tools stdenv; + callPackage ./ndk-bundle { + inherit deployAndroidPackage os platform-tools; package = packages.ndk-bundle.${ndkVersion} or packages.ndk.${ndkVersion}; }; @@ -231,9 +263,19 @@ rec { # Function that automatically links a plugin for which only one version exists linkPlugin = {name, plugin, check ? true}: lib.optionalString check '' - ln -s ${plugin}/libexec/android-sdk/* ${name} + ln -s ${plugin}/libexec/android-sdk/${name} ${name} ''; + linkSystemImages = { images, check }: lib.optionalString check '' + mkdir -p system-images + ${lib.concatMapStrings (system-image: '' + apiVersion=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*)) + type=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*/*)) + mkdir -p system-images/$apiVersion/$type + ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type/* system-images/$apiVersion/$type + '') images} + ''; + # Links all plugins related to a requested platform linkPlatformPlugins = {name, plugins, check}: lib.optionalString check '' @@ -253,12 +295,16 @@ rec { ${lib.concatMapStringsSep "\n" (str: " - ${str}") licenseNames} by setting nixpkgs config option 'android_sdk.accept_license = true;'. - '' else import ./tools.nix { - inherit deployAndroidPackage requireFile packages toolsVersion autoPatchelfHook makeWrapper os pkgs pkgs_i686 lib; + '' else callPackage ./cmdline-tools.nix { + inherit deployAndroidPackage os cmdLineToolsVersion; + + package = packages.cmdline-tools.${cmdLineToolsVersion}; postInstall = '' # Symlink all requested plugins ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }} + ${linkPlugin { name = "tools"; plugin = tools; check = toolsVersion != null; }} + ${linkPlugin { name = "patcher"; plugin = patcher; }} ${linkPlugins { name = "build-tools"; plugins = build-tools; }} ${linkPlugin { name = "emulator"; plugin = emulator; check = includeEmulator; }} ${linkPlugins { name = "platforms"; plugins = platforms; }} @@ -266,17 +312,7 @@ rec { ${linkPlugins { name = "cmake"; plugins = cmake; }} ${linkNdkPlugins { name = "ndk-bundle"; rootName = "ndk"; plugins = ndk-bundles; }} ${linkNdkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }} - - ${lib.optionalString includeSystemImages '' - mkdir -p system-images - ${lib.concatMapStrings (system-image: '' - apiVersion=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*)) - type=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*/*)) - mkdir -p system-images/$apiVersion/$type - ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type/* system-images/$apiVersion/$type - '') system-images} - ''} - + ${linkSystemImages { images = system-images; check = includeSystemImages; }} ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleAPIs; }} ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleTVAddOns; }} @@ -297,18 +333,16 @@ rec { # Expose common executables in bin/ mkdir -p $out/bin - find $PWD/tools -not -path '*/\.*' -type f -executable -mindepth 1 -maxdepth 1 | while read i - do + + for i in ${platform-tools}/bin/*; do ln -s $i $out/bin done - find $PWD/tools/bin -not -path '*/\.*' -type f -executable -mindepth 1 -maxdepth 1 | while read i - do + for i in ${emulator}/bin/*; do ln -s $i $out/bin done - for i in ${platform-tools}/bin/* - do + find $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin -type f -executable | while read i; do ln -s $i $out/bin done @@ -317,7 +351,7 @@ rec { ${lib.concatMapStrings (licenseName: let licenseHashes = builtins.concatStringsSep "\n" (mkLicenseHashes licenseName); - licenseHashFile = pkgs.writeText "androidenv-${licenseName}" licenseHashes; + licenseHashFile = writeText "androidenv-${licenseName}" licenseHashes; in '' ln -s ${licenseHashFile} licenses/${licenseName} diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index a13b98cf945c..9bd9fb9a543b 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -1,21 +1,17 @@ -{ config, pkgs ? import {}, pkgsHostHost ? pkgs.pkgsHostHost -, pkgs_i686 ? import { system = "i686-linux"; } +{ config, pkgs ? import {} , licenseAccepted ? config.android_sdk.accept_license or false }: rec { - composeAndroidPackages = import ./compose-android-packages.nix { - inherit (pkgs) requireFile autoPatchelfHook; - inherit pkgs pkgsHostHost pkgs_i686 licenseAccepted; + composeAndroidPackages = pkgs.callPackage ./compose-android-packages.nix { + inherit licenseAccepted; }; - buildApp = import ./build-app.nix { - inherit (pkgs) stdenv lib jdk ant gnumake gawk; + buildApp = pkgs.callPackage ./build-app.nix { inherit composeAndroidPackages; }; - emulateApp = import ./emulate-app.nix { - inherit (pkgs) stdenv lib runtimeShell; + emulateApp = pkgs.callPackage ./emulate-app.nix { inherit composeAndroidPackages; }; @@ -23,4 +19,6 @@ rec { platformVersions = [ "28" ]; abiVersions = [ "x86" "x86_64"]; }; + + test-suite = pkgs.callPackage ./test-suite.nix {}; } diff --git a/pkgs/development/mobile/androidenv/deploy-androidpackage.nix b/pkgs/development/mobile/androidenv/deploy-androidpackage.nix deleted file mode 100644 index f23558ebc5c4..000000000000 --- a/pkgs/development/mobile/androidenv/deploy-androidpackage.nix +++ /dev/null @@ -1,46 +0,0 @@ -{stdenv, unzip}: -{package, os ? null, buildInputs ? [], patchInstructions ? "", meta ? {}, ...}@args: - -let - extraParams = removeAttrs args [ "package" "os" "buildInputs" "patchInstructions" ]; -in -stdenv.mkDerivation ({ - pname = package.name; - version = package.revision; - src = if os != null && builtins.hasAttr os package.archives then package.archives.${os} else package.archives.all; - buildInputs = [ unzip ] ++ buildInputs; - preferLocalBuild = true; - - # Most Android Zip packages have a root folder, but some don't. We unpack - # the zip file in a folder and we try to discover whether it has a single root - # folder. If this is the case, we adjust the current working folder. - unpackPhase = '' - mkdir extractedzip - cd extractedzip - unpackFile "$src" - if [ "$(find . -mindepth 1 -maxdepth 1 -type d | wc -l)" -eq 1 ] - then - cd "$(find . -mindepth 1 -maxdepth 1 -type d)" - fi - sourceRoot="$PWD" - ''; - - installPhase = '' - packageBaseDir=$out/libexec/android-sdk/${package.path} - mkdir -p $packageBaseDir - cd $packageBaseDir - cp -a $sourceRoot/* . - ${patchInstructions} - ''; - - # We never attempt to strip. This is not required since we're doing binary - # deployments. Moreover, some executables that have been patched with patchelf - # may not work any longer after they have been stripped. - dontStrip = true; - dontPatchELF = true; - dontAutoPatchelf = true; - - meta = { - description = package.displayName; - } // meta; -} // extraParams) diff --git a/pkgs/development/mobile/androidenv/deploy-androidpackages.nix b/pkgs/development/mobile/androidenv/deploy-androidpackages.nix new file mode 100644 index 000000000000..aaedae1eb4bf --- /dev/null +++ b/pkgs/development/mobile/androidenv/deploy-androidpackages.nix @@ -0,0 +1,116 @@ +{stdenv, lib, unzip, mkLicenses}: +{packages, os ? null, nativeBuildInputs ? [], buildInputs ? [], patchesInstructions ? {}, meta ? {}, ...}@args: + +let + extraParams = removeAttrs args [ "packages" "os" "buildInputs" "nativeBuildInputs" "patchesInstructions" ]; + sortedPackages = builtins.sort (x: y: builtins.lessThan x.name y.name) packages; + + mkXmlAttrs = attrs: + lib.concatStrings (lib.mapAttrsToList (name: value: " ${name}=\"${value}\"") attrs); + mkXmlValues = attrs: + lib.concatStrings (lib.mapAttrsToList (name: value: + let + tag = builtins.head (builtins.match "([^:]+).*" name); + in + if builtins.typeOf value == "string" then "<${tag}>${value}" else mkXmlDoc name value + ) attrs); + mkXmlDoc = name: doc: + let + tag = builtins.head (builtins.match "([^:]+).*" name); + hasXmlAttrs = builtins.hasAttr "element-attributes" doc; + xmlValues = removeAttrs doc [ "element-attributes" ]; + hasXmlValues = builtins.length (builtins.attrNames xmlValues) > 0; + in + if hasXmlAttrs && hasXmlValues then "<${tag}${mkXmlAttrs doc.element-attributes}>${mkXmlValues xmlValues }" + else if hasXmlAttrs && !hasXmlValues then "<${tag}${mkXmlAttrs doc.element-attributes}/>" + else if !hasXmlAttrs && hasXmlValues then "<${tag}>${mkXmlValues xmlValues}" + else "<${tag}/>"; + mkXmlPackage = package: '' + + + ${lib.concatStringsSep "---" (mkLicenses package.license)} + + ${mkXmlDoc "type-details" package.type-details} + ${mkXmlDoc "revision" package.revision-details} + ${lib.optionalString (lib.hasAttrByPath [ "dependencies" ] package) + (mkXmlDoc "dependencies" package.dependencies) + } + ${package.displayName} + + + + ''; +in +stdenv.mkDerivation ({ + inherit buildInputs; + pname = lib.concatMapStringsSep "-" (package: package.name) sortedPackages; + version = lib.concatMapStringsSep "-" (package: package.revision) sortedPackages; + src = map (package: + if os != null && builtins.hasAttr os package.archives then package.archives.${os} else package.archives.all + ) packages; + nativeBuildInputs = [ unzip ] ++ nativeBuildInputs; + preferLocalBuild = true; + + unpackPhase = '' + buildDir=$PWD + i=0 + for srcArchive in $src; do + extractedZip="extractedzip-$i" + i=$((i+1)) + cd "$buildDir" + mkdir "$extractedZip" + cd "$extractedZip" + unpackFile "$srcArchive" + done + ''; + + installPhase = lib.concatStrings (lib.imap0 (i: package: '' + cd $buildDir/extractedzip-${toString i} + + # Most Android Zip packages have a root folder, but some don't. We unpack + # the zip file in a folder and we try to discover whether it has a single root + # folder. If this is the case, we adjust the current working folder. + if [ "$(find . -mindepth 1 -maxdepth 1 -type d | wc -l)" -eq 1 ]; then + cd "$(find . -mindepth 1 -maxdepth 1 -type d)" + fi + extractedZip="$PWD" + + packageBaseDir=$out/libexec/android-sdk/${package.path} + mkdir -p $packageBaseDir + cd $packageBaseDir + cp -a $extractedZip/* . + ${patchesInstructions.${package.name}} + + if [ ! -f $packageBaseDir/package.xml ]; then + cat << EOF > $packageBaseDir/package.xml + ${mkXmlPackage package} + EOF + fi + '') packages); + + # Some executables that have been patched with patchelf may not work any longer after they have been stripped. + dontStrip = true; + dontPatchELF = true; + dontAutoPatchelf = true; + + meta = { + description = lib.concatMapStringsSep "\n" (package: package.displayName) packages; + } // meta; +} // extraParams) diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index f68d51c75c3f..273cc3d8a8a5 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -1,4 +1,4 @@ -{ deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgs_i686 }: +{ deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall }: deployAndroidPackage { inherit package os; @@ -13,7 +13,7 @@ deployAndroidPackage { zlib ncurses5 stdenv.cc.cc - pkgs_i686.glibc + pkgsi686Linux.glibc expat freetype nss @@ -47,6 +47,15 @@ deployAndroidPackage { ]} \ --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \ --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale + + mkdir -p $out/bin + cd $out/bin + find $out/libexec/android-sdk/emulator -type f -executable -mindepth 1 -maxdepth 1 | while read i; do + ln -s $i + done + + cd $out/libexec/android-sdk + ${postInstall} ''; dontMoveLib64 = true; } diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix index 074dfc001e68..8c51ba09e53c 100644 --- a/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/pkgs/development/mobile/androidenv/examples/shell.nix @@ -6,12 +6,15 @@ url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz"; sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy"; }), - pkgs ? import nixpkgsSource {}, - pkgs_i686 ? import nixpkgsSource { system = "i686-linux"; },*/ + pkgs ? import nixpkgsSource { + config.allowUnfree = true; + }, + */ # If you want to use the in-tree version of nixpkgs: - pkgs ? import ../../../../.. {}, - pkgs_i686 ? import ../../../../.. { system = "i686-linux"; }, + pkgs ? import ../../../../.. { + config.allowUnfree = true; + }, config ? pkgs.config }: @@ -22,18 +25,18 @@ let # versions may be used in multiple places in this Nix expression. android = { versions = { - tools = "26.1.1"; - platformTools = "31.0.2"; + cmdLineToolsVersion = "8.0"; + platformTools = "33.0.3"; buildTools = "30.0.3"; ndk = [ - "22.1.7171670" - "21.3.6528147" # LTS NDK + "25.1.8937393" # LTS NDK + "24.0.8215888" ]; - cmake = "3.18.1"; - emulator = "30.6.3"; + cmake = "3.22.1"; + emulator = "31.3.14"; }; - platforms = ["23" "24" "25" "26" "27" "28" "29" "30"]; + platforms = ["23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33"]; abis = ["armeabi-v7a" "arm64-v8a"]; extras = ["extras;google;gcm"]; }; @@ -46,18 +49,18 @@ let }; androidEnv = pkgs.callPackage "${androidEnvNixpkgs}/pkgs/development/mobile/androidenv" { - inherit config pkgs pkgs_i686; + inherit config pkgs; licenseAccepted = true; };*/ # Otherwise, just use the in-tree androidenv: androidEnv = pkgs.callPackage ./.. { - inherit config pkgs pkgs_i686; + inherit config pkgs; licenseAccepted = true; }; androidComposition = androidEnv.composeAndroidPackages { - toolsVersion = android.versions.tools; + cmdLineToolsVersion = android.versions.cmdLineToolsVersion; platformToolsVersion = android.versions.platformTools; buildToolsVersions = [android.versions.buildTools]; platformVersions = android.platforms; @@ -135,11 +138,55 @@ pkgs.mkShell rec { # Write out local.properties for Android Studio. cat < local.properties -# This file was automatically generated by nix-shell. -sdk.dir=$ANDROID_SDK_ROOT -ndk.dir=$ANDROID_NDK_ROOT -cmake.dir=$cmake_root -EOF + # This file was automatically generated by nix-shell. + sdk.dir=$ANDROID_SDK_ROOT + ndk.dir=$ANDROID_NDK_ROOT + cmake.dir=$cmake_root + EOF ''; + + passthru.tests = { + sdkmanager-licenses-test = pkgs.runCommand "sdkmanager-licenses-test" { + buildInputs = [ androidSdk jdk ]; + } '' + if [[ ! "$(sdkmanager --licenses)" =~ "All SDK package licenses accepted." ]]; then + echo "At least one of SDK package licenses are not accepted." + exit 1 + fi + touch $out + ''; + + sdkmanager-packages-test = pkgs.runCommand "sdkmanager-packages-test" { + buildInputs = [ androidSdk jdk ]; + } '' + output="$(sdkmanager --list)" + installed_packages_section=$(echo "''${output%%Available Packages*}" | awk 'NR>4 {print $1}') + + packages=( + "build-tools;30.0.3" "ndk-bundle" "platform-tools" \ + "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" \ + "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" \ + "platforms;android-31" "platforms;android-32" "platforms;android-33" \ + "sources;android-23" "sources;android-24" "sources;android-25" "sources;android-26" \ + "sources;android-27" "sources;android-28" "sources;android-29" "sources;android-30" \ + "sources;android-31" "sources;android-32" "sources;android-33" \ + "system-images;android-28;google_apis_playstore;arm64-v8a" \ + "system-images;android-29;google_apis_playstore;arm64-v8a" \ + "system-images;android-30;google_apis_playstore;arm64-v8a" \ + "system-images;android-31;google_apis_playstore;arm64-v8a" \ + "system-images;android-32;google_apis_playstore;arm64-v8a" \ + "system-images;android-33;google_apis_playstore;arm64-v8a" + ) + + for package in "''${packages[@]}"; do + if [[ ! $installed_packages_section =~ "$package" ]]; then + echo "$package package was not installed." + exit 1 + fi + done + + touch "$out" + ''; + }; } diff --git a/pkgs/development/mobile/androidenv/mkrepo.rb b/pkgs/development/mobile/androidenv/mkrepo.rb index 208a544c90f6..fa813301558f 100644 --- a/pkgs/development/mobile/androidenv/mkrepo.rb +++ b/pkgs/development/mobile/androidenv/mkrepo.rb @@ -17,6 +17,9 @@ end # Returns a system image URL for a given system image name. def image_url value, dir + if dir == "default" + dir = "android" + end if value && value.start_with?('http') value elsif value @@ -26,6 +29,49 @@ def image_url value, dir end end +# Returns a JSON with the data and structure of the input XML +def to_json_collector doc + json = {} + index = 0 + doc.element_children.each { |node| + if node.children.length == 1 and node.children.first.text? + json["#{node.name}:#{index}"] ||= node.content + index += 1 + next + end + json["#{node.name}:#{index}"] ||= to_json_collector node + index += 1 + } + element_attributes = {} + doc.attribute_nodes.each do |attr| + if attr.name == "type" + type = attr.value.split(':', 2).last + case attr.value + when 'generic:genericDetailsType' + element_attributes["xsi:type"] ||= "ns5:#{type}" + when 'addon:extraDetailsType' + element_attributes["xsi:type"] ||= "ns8:#{type}" + when 'addon:mavenType' + element_attributes["xsi:type"] ||= "ns8:#{type}" + when 'sdk:platformDetailsType' + element_attributes["xsi:type"] ||= "ns11:#{type}" + when 'sdk:sourceDetailsType' + element_attributes["xsi:type"] ||= "ns11:#{type}" + when 'sys-img:sysImgDetailsType' + element_attributes["xsi:type"] ||= "ns12:#{type}" + when 'addon:addonDetailsType' then + element_attributes["xsi:type"] ||= "ns8:#{type}" + end + else + element_attributes[attr.name] ||= attr.value + end + end + if !element_attributes.empty? + json['element-attributes'] ||= element_attributes + end + json +end + # Returns a tuple of [type, revision, revision components] for a package node. def package_revision package type_details = package.at_css('> type-details') @@ -145,7 +191,7 @@ def fixup value else [k, v] end - end.sort {|(k1, v1), (k2, v2)| k1 <=> k2}] + end.sort {|(k1, v1), (k2, v2)| k1 <=> k2 }] end # Normalize the specified license text. @@ -154,6 +200,7 @@ def normalize_license license license = license.dup license.gsub!(/([^\n])\n([^\n])/m, '\1 \2') license.gsub!(/ +/, ' ') + license.strip! license end @@ -185,7 +232,12 @@ def parse_package_xml doc display_name = text package.at_css('> display-name') uses_license = package.at_css('> uses-license') uses_license &&= uses_license['ref'] + obsolete ||= package['obsolete'] + type_details = to_json_collector package.at_css('> type-details') + revision_details = to_json_collector package.at_css('> revision') archives = package_archives(package) {|url| repo_url url} + dependencies_xml = package.at_css('> dependencies') + dependencies = to_json_collector dependencies_xml if dependencies_xml target = (packages[name] ||= {}) target = (target[revision] ||= {}) @@ -195,6 +247,10 @@ def parse_package_xml doc target['revision'] ||= revision target['displayName'] ||= display_name target['license'] ||= uses_license if uses_license + target['obsolete'] ||= obsolete if obsolete == 'true' + target['type-details'] ||= type_details + target['revision-details'] ||= revision_details + target['dependencies'] ||= dependencies if dependencies target['archives'] ||= {} merge target['archives'], archives end @@ -214,11 +270,17 @@ def parse_image_xml doc display_name = text package.at_css('> display-name') uses_license = package.at_css('> uses-license') uses_license &&= uses_license['ref'] + obsolete &&= package['obsolete'] + type_details = to_json_collector package.at_css('> type-details') + revision_details = to_json_collector package.at_css('> revision') archives = package_archives(package) {|url| image_url url, components[-2]} + dependencies_xml = package.at_css('> dependencies') + dependencies = to_json_collector dependencies_xml if dependencies_xml target = images components.each do |component| - target = (target[component] ||= {}) + target[component] ||= {} + target = target[component] end target['name'] ||= "system-image-#{revision}" @@ -226,6 +288,10 @@ def parse_image_xml doc target['revision'] ||= revision target['displayName'] ||= display_name target['license'] ||= uses_license if uses_license + target['obsolete'] ||= obsolete if obsolete + target['type-details'] ||= type_details + target['revision-details'] ||= revision_details + target['dependencies'] ||= dependencies if dependencies target['archives'] ||= {} merge target['archives'], archives end @@ -245,7 +311,12 @@ def parse_addon_xml doc display_name = text package.at_css('> display-name') uses_license = package.at_css('> uses-license') uses_license &&= uses_license['ref'] + obsolete &&= package['obsolete'] + type_details = to_json_collector package.at_css('> type-details') + revision_details = to_json_collector package.at_css('> revision') archives = package_archives(package) {|url| repo_url url} + dependencies_xml = package.at_css('> dependencies') + dependencies = to_json_collector dependencies_xml if dependencies_xml case type when 'addon:addonDetailsType' @@ -274,6 +345,10 @@ def parse_addon_xml doc target['revision'] ||= revision target['displayName'] ||= display_name target['license'] ||= uses_license if uses_license + target['obsolete'] ||= obsolete if obsolete + target['type-details'] ||= type_details + target['revision-details'] ||= revision_details + target['dependencies'] ||= dependencies if dependencies target['archives'] ||= {} merge target['archives'], archives end @@ -281,8 +356,18 @@ def parse_addon_xml doc [licenses, addons, extras] end +def merge_recursively a, b + a.merge!(b) {|key, a_item, b_item| + if a_item.is_a?(Hash) && b_item.is_a?(Hash) + merge_recursively(a_item, b_item) + else + a[key] = b_item + end + } +end + def merge dest, src - dest.merge! src + merge_recursively dest, src end opts = Slop.parse do |o| @@ -300,19 +385,19 @@ result = { } opts[:packages].each do |filename| - licenses, packages = parse_package_xml(Nokogiri::XML(File.open(filename))) + licenses, packages = parse_package_xml(Nokogiri::XML(File.open(filename)) { |conf| conf.noblanks }) merge result[:licenses], licenses merge result[:packages], packages end opts[:images].each do |filename| - licenses, images = parse_image_xml(Nokogiri::XML(File.open(filename))) + licenses, images = parse_image_xml(Nokogiri::XML(File.open(filename)) { |conf| conf.noblanks }) merge result[:licenses], licenses merge result[:images], images end opts[:addons].each do |filename| - licenses, addons, extras = parse_addon_xml(Nokogiri::XML(File.open(filename))) + licenses, addons, extras = parse_addon_xml(Nokogiri::XML(File.open(filename)) { |conf| conf.noblanks }) merge result[:licenses], licenses merge result[:addons], addons merge result[:extras], extras diff --git a/pkgs/development/mobile/androidenv/patcher.nix b/pkgs/development/mobile/androidenv/patcher.nix new file mode 100644 index 000000000000..9fd112063cb8 --- /dev/null +++ b/pkgs/development/mobile/androidenv/patcher.nix @@ -0,0 +1,9 @@ +{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs, stdenv}: + +deployAndroidPackage { + inherit package os; + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + patchInstructions = lib.optionalString (os == "linux") '' + autoPatchelf $packageBaseDir/bin + ''; +} diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 52443486bbb6..eed3b896bfca 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -2,7 +2,9 @@ deployAndroidPackage { inherit package os; - buildInputs = lib.optionals (os == "linux") [ autoPatchelfHook pkgs.glibc pkgs.zlib pkgs.ncurses5 ]; + nativeBuildInputs = lib.optionals (os == "linux") [ autoPatchelfHook ]; + buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ]; + patchInstructions = lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib64 autoPatchelf --no-recurse $packageBaseDir/lib64 diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json index bf69c67820b0..0a4a733a49e0 100644 --- a/pkgs/development/mobile/androidenv/repo.json +++ b/pkgs/development/mobile/androidenv/repo.json @@ -14,7 +14,42 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-10", - "revision": "10" + "revision": "10", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "10", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "11": { @@ -31,7 +66,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-11", - "revision": "11" + "revision": "11", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "11", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "12": { @@ -48,7 +111,42 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-12", - "revision": "12" + "revision": "12", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "12", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "google_tv_addon": { "archives": [ @@ -63,7 +161,26 @@ "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-12", - "revision": "12" + "revision": "12", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "12", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "tag:3": { + "display:1": "Google TV Addon", + "id:0": "google_tv_addon" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "13": { @@ -80,7 +197,42 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-13", - "revision": "13" + "revision": "13", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "13", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "google_tv_addon": { "archives": [ @@ -95,7 +247,26 @@ "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-13", - "revision": "13" + "revision": "13", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "13", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "tag:3": { + "display:1": "Google TV Addon", + "id:0": "google_tv_addon" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "14": { @@ -112,7 +283,42 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-14", - "revision": "14" + "revision": "14", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "14", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "15": { @@ -129,7 +335,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-15", - "revision": "15" + "revision": "15", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "15", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "16": { @@ -146,7 +394,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-16", - "revision": "16" + "revision": "16", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "api-level:0": "16", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "17": { @@ -163,7 +453,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-17", - "revision": "17" + "revision": "17", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "api-level:0": "17", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "18": { @@ -180,7 +512,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-18", - "revision": "18" + "revision": "18", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "api-level:0": "18", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "19": { @@ -197,7 +571,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-19", - "revision": "19" + "revision": "19", + "revision-details": { + "major:0": "20" + }, + "type-details": { + "api-level:0": "19", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "21": { @@ -214,7 +630,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-21", - "revision": "21" + "revision": "21", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "21", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "22": { @@ -231,7 +689,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-22", - "revision": "22" + "revision": "22", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "22", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "23": { @@ -248,7 +748,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-23", - "revision": "23" + "revision": "23", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "23", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "24": { @@ -265,7 +807,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-24", - "revision": "24" + "revision": "24", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "24", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "25": { @@ -282,7 +866,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-25", - "revision": "25" + "revision": "25", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "23", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "3": { @@ -299,7 +925,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-3", - "revision": "3" + "revision": "3", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "3", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "4": { @@ -316,7 +970,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-4", - "revision": "4" + "revision": "4", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "4", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "5": { @@ -333,7 +1015,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-5", - "revision": "5" + "revision": "5", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "5", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "6": { @@ -350,7 +1060,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-6", - "revision": "6" + "revision": "6", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "6", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "7": { @@ -367,7 +1105,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-7", - "revision": "7" + "revision": "7", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "7", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "8": { @@ -384,7 +1150,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-8", - "revision": "8" + "revision": "8", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "8", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "9": { @@ -401,7 +1195,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-9", - "revision": "9" + "revision": "9", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "9", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -419,7 +1241,21 @@ "license": "android-sdk-license", "name": "extras-android-m2repository", "path": "extras/android/m2repository", - "revision": "47.0.0" + "revision": "47.0.0", + "revision-details": { + "major:0": "47", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;google;Android_Emulator_Hypervisor_Driver": { "archives": [ @@ -434,7 +1270,21 @@ "license": "android-sdk-license", "name": "extras-google-Android_Emulator_Hypervisor_Driver", "path": "extras/google/Android_Emulator_Hypervisor_Driver", - "revision": "1.8.0" + "revision": "1.8.0", + "revision-details": { + "major:0": "1", + "micro:2": "0", + "minor:1": "8" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google LLC.", + "id:0": "google" + } + } }, "extras;google;admob_ads_sdk": { "archives": [ @@ -449,7 +1299,19 @@ "license": "android-sdk-license", "name": "extras-google-admob_ads_sdk", "path": "extras/google/admob_ads_sdk", - "revision": "11" + "revision": "11", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;analytics_sdk_v2": { "archives": [ @@ -464,7 +1326,19 @@ "license": "android-sdk-license", "name": "extras-google-analytics_sdk_v2", "path": "extras/google/analytics_sdk_v2", - "revision": "3" + "revision": "3", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;gcm": { "archives": [ @@ -479,7 +1353,19 @@ "license": "android-sdk-license", "name": "extras-google-gcm", "path": "extras/google/gcm", - "revision": "3" + "revision": "3", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;google_play_services": { "archives": [ @@ -490,11 +1376,30 @@ "url": "https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google Play services", "license": "android-sdk-license", "name": "extras-google-google_play_services", "path": "extras/google/google_play_services", - "revision": "49" + "revision": "49", + "revision-details": { + "major:0": "49" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;google_play_services_froyo": { "archives": [ @@ -509,7 +1414,19 @@ "license": "android-sdk-license", "name": "extras-google-google_play_services_froyo", "path": "extras/google/google_play_services_froyo", - "revision": "12" + "revision": "12", + "revision-details": { + "major:0": "12" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;instantapps": { "archives": [ @@ -524,7 +1441,21 @@ "license": "android-sdk-license", "name": "extras-google-instantapps", "path": "extras/google/instantapps", - "revision": "1.9.0" + "revision": "1.9.0", + "revision-details": { + "major:0": "1", + "micro:2": "0", + "minor:1": "9" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;m2repository": { "archives": [ @@ -535,11 +1466,30 @@ "url": "https://dl.google.com/android/repository/google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google Repository", "license": "android-sdk-license", "name": "extras-google-m2repository", "path": "extras/google/m2repository", - "revision": "58" + "revision": "58", + "revision-details": { + "major:0": "58" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;market_apk_expansion": { "archives": [ @@ -554,7 +1504,19 @@ "license": "android-sdk-license", "name": "extras-google-market_apk_expansion", "path": "extras/google/market_apk_expansion", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;market_licensing": { "archives": [ @@ -569,7 +1531,20 @@ "license": "android-sdk-license", "name": "extras-google-market_licensing", "path": "extras/google/market_licensing", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": { + }, + "id:0": "google" + } + } }, "extras;google;simulators": { "archives": [ @@ -584,7 +1559,19 @@ "license": "android-sdk-license", "name": "extras-google-simulators", "path": "extras/google/simulators", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;usb_driver": { "archives": [ @@ -599,7 +1586,19 @@ "license": "android-sdk-license", "name": "extras-google-usb_driver", "path": "extras/google/usb_driver", - "revision": "13" + "revision": "13", + "revision-details": { + "major:0": "13" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;webdriver": { "archives": [ @@ -614,7 +1613,19 @@ "license": "android-sdk-license", "name": "extras-google-webdriver", "path": "extras/google/webdriver", - "revision": "2" + "revision": "2", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0": { "archives": [ @@ -629,7 +1640,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4": { "archives": [ @@ -644,7 +1667,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8": { "archives": [ @@ -659,7 +1694,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1": { "archives": [ @@ -674,7 +1721,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2": { "archives": [ @@ -689,7 +1748,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta2", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3": { "archives": [ @@ -704,7 +1775,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta3", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta3", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4": { "archives": [ @@ -719,7 +1802,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta4", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5": { "archives": [ @@ -734,7 +1829,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta5", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta5", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1": { "archives": [ @@ -749,7 +1856,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.1", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2": { "archives": [ @@ -764,7 +1883,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0": { "archives": [ @@ -775,11 +1906,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4": { "archives": [ @@ -790,11 +1940,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" + } + } + }, "displayName": "com.android.support.constraint:constraint-layout:1.0.0-alpha4", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8": { "archives": [ @@ -805,11 +1974,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0-alpha8", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta1": { "archives": [ @@ -820,11 +2008,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta1.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0-beta1", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta1", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta2": { "archives": [ @@ -835,11 +2042,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta2.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0-beta2", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta2", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta3": { "archives": [ @@ -850,11 +2076,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta3.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0-beta3", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta3", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta3", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta4": { "archives": [ @@ -865,11 +2110,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta4.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0-beta4", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta4", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta5": { "archives": [ @@ -880,11 +2144,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta5.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0-beta5", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta5", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta5", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1": { "archives": [ @@ -895,11 +2178,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.1.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.1", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.1", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2": { "archives": [ @@ -910,15 +2212,110 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.2.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.2", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.2", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } } }, "images": { "10": { + "default": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "8537616a7add47cce24c60f18bc2429e3dc90ae3", + "size": 67927049, + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-10_r05.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-10-default-armeabi-v7a", + "path": "system-images/android-10/default/armeabi-v7a", + "revision": "10-default-armeabi-v7a", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "10", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "a166d5ccbb165e1dd5464fbfeec30a61f77790d8", + "size": 75386095, + "url": "https://dl.google.com/android/repository/sys-img/android/x86-10_r05.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-10-default-x86", + "path": "system-images/android-10/default/x86", + "revision": "10-default-x86", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "10", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + } + }, "google_apis": { "armeabi-v7a": { "archives": [ @@ -929,11 +2326,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-10_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-10-google_apis-armeabi-v7a", "path": "system-images/android-10/google_apis/armeabi-v7a", - "revision": "10-google_apis-armeabi-v7a" + "revision": "10-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "10", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -944,11 +2366,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-10_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-10-google_apis-x86", "path": "system-images/android-10/google_apis/x86", - "revision": "10-google_apis-x86" + "revision": "10-google_apis-x86", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "10", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -960,18 +2407,109 @@ "os": "all", "sha1": "d8991b0c06b18d7d6ed4169d67460ee1add6661b", "size": 99621822, - "url": "https://dl.google.com/android/repository/sys-img/default/sysimg_armv7a-14_r02.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip" } ], "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-14-default-armeabi-v7a", "path": "system-images/android-14/default/armeabi-v7a", - "revision": "14-default-armeabi-v7a" + "revision": "14-default-armeabi-v7a", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "14", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } } }, "15": { + "default": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "03d7ed95a9d3b107e3f2e5b166d017ea12529e70", + "size": 102452069, + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r05.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-15-default-armeabi-v7a", + "path": "system-images/android-15/default/armeabi-v7a", + "revision": "15-default-armeabi-v7a", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "15", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "61381aef3fd0cdc8255cb3298072a920c80186ca", + "size": 116030933, + "url": "https://dl.google.com/android/repository/sys-img/android/x86-15_r07.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-15-default-x86", + "path": "system-images/android-15/default/x86", + "revision": "15-default-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "15", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + } + }, "google_apis": { "armeabi-v7a": { "archives": [ @@ -982,11 +2520,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-15_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-15-google_apis-armeabi-v7a", "path": "system-images/android-15/google_apis/armeabi-v7a", - "revision": "15-google_apis-armeabi-v7a" + "revision": "15-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "15", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -997,15 +2560,146 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-15_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-15-google_apis-x86", "path": "system-images/android-15/google_apis/x86", - "revision": "15-google_apis-x86" + "revision": "15-google_apis-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "15", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, "16": { + "default": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "69b944b0d5a18c8563fa80d7d229af64890f724e", + "size": 118646340, + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-16_r06.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-16-default-armeabi-v7a", + "path": "system-images/android-16/default/armeabi-v7a", + "revision": "16-default-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "16", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "mips": { + "archives": [ + { + "os": "all", + "sha1": "67943c54fb3943943ffeb05fdd39c0b753681f6e", + "size": 122482530, + "url": "https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip" + } + ], + "displayName": "MIPS System Image", + "license": "mips-android-sysimage-license", + "name": "system-image-16-default-mips", + "path": "system-images/android-16/default/mips", + "revision": "16-default-mips", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "mips", + "api-level:0": "16", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "ee6718e7556c8f8bd8d3f470b34f2c5dbf9bcff4", + "size": 135305313, + "url": "https://dl.google.com/android/repository/sys-img/android/x86-16_r07.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-16-default-x86", + "path": "system-images/android-16/default/x86", + "revision": "16-default-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "16", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + } + }, "google_apis": { "armeabi-v7a": { "archives": [ @@ -1016,11 +2710,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-16_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-16-google_apis-armeabi-v7a", "path": "system-images/android-16/google_apis/armeabi-v7a", - "revision": "16-google_apis-armeabi-v7a" + "revision": "16-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "16", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1031,15 +2750,149 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-16_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-16-google_apis-x86", "path": "system-images/android-16/google_apis/x86", - "revision": "16-google_apis-x86" + "revision": "16-google_apis-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "16", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, "17": { + "default": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "a18a3fd0958ec4ef52507f58e414fc5c7dfd59d6", + "size": 124437041, + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r06.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-17-default-armeabi-v7a", + "path": "system-images/android-17/default/armeabi-v7a", + "revision": "17-default-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "17", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "mips": { + "archives": [ + { + "os": "all", + "sha1": "f0c6e153bd584c29e51b5c9723cfbf30f996a05d", + "size": 131781761, + "url": "https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip" + } + ], + "displayName": "MIPS System Image", + "license": "mips-android-sysimage-license", + "name": "system-image-17-default-mips", + "path": "system-images/android-17/default/mips", + "revision": "17-default-mips", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "mips", + "api-level:0": "17", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "1ad5ffb51e31f5fe9fa47411fed2c2ade9a33865", + "size": 194811128, + "url": "https://dl.google.com/android/repository/sys-img/android/x86-17_r07.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-17-default-x86", + "path": "system-images/android-17/default/x86", + "revision": "17-default-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "17", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "default" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, "google_apis": { "armeabi-v7a": { "archives": [ @@ -1050,11 +2903,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-17_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-17-google_apis-armeabi-v7a", "path": "system-images/android-17/google_apis/armeabi-v7a", - "revision": "17-google_apis-armeabi-v7a" + "revision": "17-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "17", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1065,15 +2943,116 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-17_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-17-google_apis-x86", "path": "system-images/android-17/google_apis/x86", - "revision": "17-google_apis-x86" + "revision": "17-google_apis-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "17", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, "18": { + "default": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "580b583720f7de671040d5917c8c9db0c7aa03fd", + "size": 130590545, + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r05.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-18-default-armeabi-v7a", + "path": "system-images/android-18/default/armeabi-v7a", + "revision": "18-default-armeabi-v7a", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "18", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "7a4ced4d9b0ab48047825491b4072dc2eb9b610e", + "size": 150097655, + "url": "https://dl.google.com/android/repository/sys-img/android/x86-18_r04.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-18-default-x86", + "path": "system-images/android-18/default/x86", + "revision": "18-default-x86", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "18", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + } + }, "google_apis": { "armeabi-v7a": { "archives": [ @@ -1084,11 +3063,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-18_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-18-google_apis-armeabi-v7a", "path": "system-images/android-18/google_apis/armeabi-v7a", - "revision": "18-google_apis-armeabi-v7a" + "revision": "18-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "18", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1099,15 +3103,116 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-18_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-18-google_apis-x86", "path": "system-images/android-18/google_apis/x86", - "revision": "18-google_apis-x86" + "revision": "18-google_apis-x86", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "18", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, "19": { + "default": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa", + "size": 159871567, + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-19-default-armeabi-v7a", + "path": "system-images/android-19/default/armeabi-v7a", + "revision": "19-default-armeabi-v7a", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "19", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "2ac82153aae97f7eae4c5a0761224fe04321d03d", + "size": 185886274, + "url": "https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-19-default-x86", + "path": "system-images/android-19/default/x86", + "revision": "19-default-x86", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "19", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + } + }, "google_apis": { "armeabi-v7a": { "archives": [ @@ -1118,11 +3223,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-19_r40.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-19-google_apis-armeabi-v7a", "path": "system-images/android-19/google_apis/armeabi-v7a", - "revision": "19-google_apis-armeabi-v7a" + "revision": "19-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "40" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "19", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1133,16 +3263,277 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-19_r40.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-19-google_apis-x86", "path": "system-images/android-19/google_apis/x86", - "revision": "19-google_apis-x86" + "revision": "19-google_apis-x86", + "revision-details": { + "major:0": "40" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "19", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, "21": { + "android-tv": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "b63e28a47f11b639dd94981a458b7abfa89ac331", + "size": 249428246, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-21_r03.zip" + } + ], + "displayName": "Android TV ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-21-android-tv-armeabi-v7a", + "path": "system-images/android-21/android-tv/armeabi-v7a", + "revision": "21-android-tv-armeabi-v7a", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "2f8a1988188d6abfd6c6395baeb4471a034dc1e8", + "size": 268946785, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-21_r03.zip" + } + ], + "displayName": "Android TV Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-21-android-tv-x86", + "path": "system-images/android-21/android-tv/x86", + "revision": "21-android-tv-x86", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } + } + }, + "default": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "c4375f1b4b4cd21a8617660e25f621cedcbd8332", + "size": 211426314, + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-21_r04.zip" + } + ], + "displayName": "ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-21-default-arm64-v8a", + "path": "system-images/android-21/default/arm64-v8a", + "revision": "21-default-arm64-v8a", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "8c606f81306564b65e41303d2603e4c42ded0d10", + "size": 187163871, + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-21-default-armeabi-v7a", + "path": "system-images/android-21/default/armeabi-v7a", + "revision": "21-default-armeabi-v7a", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "00f0eb0a1003efe3316347f762e20a85d8749cff", + "size": 208212529, + "url": "https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-21-default-x86", + "path": "system-images/android-21/default/x86", + "revision": "21-default-x86", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "9078a095825a69e5e215713f0866c83cef65a342", + "size": 292623982, + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-21-default-x86_64", + "path": "system-images/android-21/default/x86_64", + "revision": "21-default-x86_64", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + } + }, "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "bad07917816ba029ddb09ce0836e4aac4a460d4d", + "size": 297671829, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-21_r32.zip" + } + ], + "displayName": "Google APIs ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-21-google_apis-arm64-v8a", + "path": "system-images/android-21/google_apis/arm64-v8a", + "revision": "21-google_apis-arm64-v8a", + "revision-details": { + "major:0": "32" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, "armeabi-v7a": { "archives": [ { @@ -1152,11 +3543,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-21_r32.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-21-google_apis-armeabi-v7a", "path": "system-images/android-21/google_apis/armeabi-v7a", - "revision": "21-google_apis-armeabi-v7a" + "revision": "21-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "32" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1167,11 +3583,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-21_r32.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-21-google_apis-x86", "path": "system-images/android-21/google_apis/x86", - "revision": "21-google_apis-x86" + "revision": "21-google_apis-x86", + "revision-details": { + "major:0": "32" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -1182,16 +3623,248 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-21_r32.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-21-google_apis-x86_64", "path": "system-images/android-21/google_apis/x86_64", - "revision": "21-google_apis-x86_64" + "revision": "21-google_apis-x86_64", + "revision-details": { + "major:0": "32" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, "22": { + "android-tv": { + "x86": { + "archives": [ + { + "os": "all", + "sha1": "c78efd5a155622eb490be9d326f5783993375c35", + "size": 293118949, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-22_r03.zip" + } + ], + "displayName": "Android TV Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-22-android-tv-x86", + "path": "system-images/android-22/android-tv/x86", + "revision": "22-android-tv-x86", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } + } + }, + "default": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "703e27a9a4fb7a6e763cb7d713b89e5249a8fc99", + "size": 219124634, + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-22_r02.zip" + } + ], + "displayName": "ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-22-default-arm64-v8a", + "path": "system-images/android-22/default/arm64-v8a", + "revision": "22-default-arm64-v8a", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1", + "size": 194596267, + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-22-default-armeabi-v7a", + "path": "system-images/android-22/default/armeabi-v7a", + "revision": "22-default-armeabi-v7a", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e", + "size": 214268954, + "url": "https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-22-default-x86", + "path": "system-images/android-22/default/x86", + "revision": "22-default-x86", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4", + "size": 299976630, + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-22-default-x86_64", + "path": "system-images/android-22/default/x86_64", + "revision": "22-default-x86_64", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + } + }, "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "fd62e99e278f337fd58cadd37bf4f4c1998c8297", + "size": 382307460, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-22_r26.zip" + } + ], + "displayName": "Google APIs ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-22-google_apis-arm64-v8a", + "path": "system-images/android-22/google_apis/arm64-v8a", + "revision": "22-google_apis-arm64-v8a", + "revision-details": { + "major:0": "26" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, "armeabi-v7a": { "archives": [ { @@ -1201,11 +3874,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-22_r26.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-22-google_apis-armeabi-v7a", "path": "system-images/android-22/google_apis/armeabi-v7a", - "revision": "22-google_apis-armeabi-v7a" + "revision": "22-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "26" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1216,11 +3914,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-22_r26.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-22-google_apis-x86", "path": "system-images/android-22/google_apis/x86", - "revision": "22-google_apis-x86" + "revision": "22-google_apis-x86", + "revision-details": { + "major:0": "26" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -1231,15 +3954,250 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-22_r26.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-22-google_apis-x86_64", "path": "system-images/android-22/google_apis/x86_64", - "revision": "22-google_apis-x86_64" + "revision": "22-google_apis-x86_64", + "revision-details": { + "major:0": "26" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, "23": { + "android-tv": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "bd84678ae8caf71d584f5210e866b2807e7b4b52", + "size": 304269268, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-23_r12.zip" + } + ], + "displayName": "Android TV ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-23-android-tv-armeabi-v7a", + "path": "system-images/android-23/android-tv/armeabi-v7a", + "revision": "23-android-tv-armeabi-v7a", + "revision-details": { + "major:0": "12" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "094575ec634a662115a7a4c2b63d1743dfbca43c", + "size": 340921232, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-23_r21.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Android TV Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-23-android-tv-x86", + "path": "system-images/android-23/android-tv/x86", + "revision": "23-android-tv-x86", + "revision-details": { + "major:0": "21" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } + } + }, + "default": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "ac18f3bd717e02804eee585e029f5dbc1a2616bf", + "size": 253807785, + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-23_r07.zip" + } + ], + "displayName": "ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-23-default-arm64-v8a", + "path": "system-images/android-23/default/arm64-v8a", + "revision": "23-default-arm64-v8a", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d", + "size": 238333358, + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-23-default-armeabi-v7a", + "path": "system-images/android-23/default/armeabi-v7a", + "revision": "23-default-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb", + "size": 260804863, + "url": "https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-23-default-x86", + "path": "system-images/android-23/default/x86", + "revision": "23-default-x86", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "7cbc291483ca07dc67b71268c5f08a5755f50f51", + "size": 365009313, + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-23-default-x86_64", + "path": "system-images/android-23/default/x86_64", + "revision": "23-default-x86_64", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + } + }, "google_apis": { "arm64-v8a": { "archives": [ @@ -1254,7 +4212,25 @@ "license": "android-sdk-license", "name": "system-image-23-google_apis-arm64-v8a", "path": "system-images/android-23/google_apis/arm64-v8a", - "revision": "23-google_apis-arm64-v8a" + "revision": "23-google_apis-arm64-v8a", + "revision-details": { + "major:0": "33" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "armeabi-v7a": { "archives": [ @@ -1265,11 +4241,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-23_r33.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-23-google_apis-armeabi-v7a", "path": "system-images/android-23/google_apis/armeabi-v7a", - "revision": "23-google_apis-armeabi-v7a" + "revision": "23-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "33" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1280,11 +4281,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-23_r33.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-23-google_apis-x86", "path": "system-images/android-23/google_apis/x86", - "revision": "23-google_apis-x86" + "revision": "23-google_apis-x86", + "revision-details": { + "major:0": "33" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -1295,15 +4321,343 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-23_r33.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-23-google_apis-x86_64", "path": "system-images/android-23/google_apis/x86_64", - "revision": "23-google_apis-x86_64" + "revision": "23-google_apis-x86_64", + "revision-details": { + "major:0": "33" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, "24": { + "android-tv": { + "x86": { + "archives": [ + { + "os": "all", + "sha1": "ef7890e565f4e3544fd23613b437d4418fb10f99", + "size": 398227164, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-24_r22.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Android TV Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-24-android-tv-x86", + "path": "system-images/android-24/android-tv/x86", + "revision": "24-android-tv-x86", + "revision-details": { + "major:0": "22" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } + } + }, + "default": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "e88ebdf4533efa0370603ee4ab0e7834e0cc364f", + "size": 305854153, + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r09.zip" + } + ], + "displayName": "ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-24-default-arm64-v8a", + "path": "system-images/android-24/default/arm64-v8a", + "revision": "24-default-arm64-v8a", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "e22c47afd06398b35f2705ca2e7fa85323351568", + "size": 782997866, + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-24-default-armeabi-v7a", + "path": "system-images/android-24/default/armeabi-v7a", + "revision": "24-default-armeabi-v7a", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "c1cae7634b0216c0b5990f2c144eb8ca948e3511", + "size": 313489224, + "url": "https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-24-default-x86", + "path": "system-images/android-24/default/x86", + "revision": "24-default-x86", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "f6559e1949a5879f31a9662f4f0e50ad60181684", + "size": 419261998, + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-24-default-x86_64", + "path": "system-images/android-24/default/x86_64", + "revision": "24-default-x86_64", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + } + }, + "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "d264adca13330b5e50665ab44726e4fecc1ddd1f", + "size": 709604485, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-24_r29.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Google APIs ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-24-google_apis-arm64-v8a", + "path": "system-images/android-24/google_apis/arm64-v8a", + "revision": "24-google_apis-arm64-v8a", + "revision-details": { + "major:0": "27" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "74505c33546fb9f6722fb7aa8fc1472777b924ff", + "size": 889204295, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-24_r27.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Google APIs Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-24-google_apis-x86", + "path": "system-images/android-24/google_apis/x86", + "revision": "24-google_apis-x86", + "revision-details": { + "major:0": "27" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "46d09c0723b77ddba00f2281099a2c44a88ac971", + "size": 1119800108, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-24_r27.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Google APIs Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-24-google_apis-x86_64", + "path": "system-images/android-24/google_apis/x86_64", + "revision": "24-google_apis-x86_64", + "revision-details": { + "major:0": "27" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, "google_apis_playstore": { "x86": { "archives": [ @@ -1314,15 +4668,413 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-24_r19.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-24-google_apis_playstore-x86", "path": "system-images/android-24/google_apis_playstore/x86", - "revision": "24-google_apis_playstore-x86" + "revision": "24-google_apis_playstore-x86", + "revision-details": { + "major:0": "19" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, "25": { + "android-tv": { + "x86": { + "archives": [ + { + "os": "all", + "sha1": "faae592bc991001b1880a8198d729b25855cc34b", + "size": 438201093, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-25_r16.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Android TV Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-25-android-tv-x86", + "path": "system-images/android-25/android-tv/x86", + "revision": "25-android-tv-x86", + "revision-details": { + "major:0": "16" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } + } + }, + "android-wear": { + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "76d3568a4e08023047af7d13025a35c9bf1d7e5c", + "size": 377841195, + "url": "https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-25_r03.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Android Wear ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-25-android-wear-armeabi-v7a", + "path": "system-images/android-25/android-wear/armeabi-v7a", + "revision": "25-android-wear-armeabi-v7a", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android Wear", + "id:0": "android-wear" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "693fce7b487a65491a4e88e9f740959688c9dbe6", + "size": 397826706, + "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86-25_r03.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Android Wear Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-25-android-wear-x86", + "path": "system-images/android-25/android-wear/x86", + "revision": "25-android-wear-x86", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android Wear", + "id:0": "android-wear" + } + } + } + }, + "default": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "b39d359623323a1b4906c071dec396040016ea73", + "size": 308416103, + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-25_r02.zip" + } + ], + "displayName": "ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-25-default-arm64-v8a", + "path": "system-images/android-25/default/arm64-v8a", + "revision": "25-default-arm64-v8a", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f", + "size": 316695942, + "url": "https://dl.google.com/android/repository/sys-img/android/x86-25_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-25-default-x86", + "path": "system-images/android-25/default/x86", + "revision": "25-default-x86", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "7093d7b39216020226ff430a3b7b81c94d31ad37", + "size": 422702097, + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-25_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-25-default-x86_64", + "path": "system-images/android-25/default/x86_64", + "revision": "25-default-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } + } + }, + "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "23162a2123e9e5cd5a7e930f8ca867676e83c0df", + "size": 740445031, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-25_r20.zip" + } + ], + "displayName": "Google APIs ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-25-google_apis-arm64-v8a", + "path": "system-images/android-25/google_apis/arm64-v8a", + "revision": "25-google_apis-arm64-v8a", + "revision-details": { + "major:0": "20" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "armeabi-v7a": { + "archives": [ + { + "os": "all", + "sha1": "a6f7c491e3bb937523dddfa287e07d785934e8a1", + "size": 952973150, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-25_r18.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Google APIs ARM EABI v7a System Image", + "license": "android-sdk-license", + "name": "system-image-25-google_apis-armeabi-v7a", + "path": "system-images/android-25/google_apis/armeabi-v7a", + "revision": "25-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "18" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "93872600c58521c8a67dc44c8e17cff4def009f3", + "size": 1013657090, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-25_r18.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Google APIs Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-25-google_apis-x86", + "path": "system-images/android-25/google_apis/x86", + "revision": "25-google_apis-x86", + "revision-details": { + "major:0": "18" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "0da7b5bca8ff5deff45b942f61f081e038271ba6", + "size": 1298264628, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-25_r18.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Google APIs Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-25-google_apis-x86_64", + "path": "system-images/android-25/google_apis/x86_64", + "revision": "25-google_apis-x86_64", + "revision-details": { + "major:0": "18" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, "google_apis_playstore": { "x86": { "archives": [ @@ -1333,15 +5085,388 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-25_r09.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-25-google_apis_playstore-x86", "path": "system-images/android-25/google_apis_playstore/x86", - "revision": "25-google_apis_playstore-x86" + "revision": "25-google_apis_playstore-x86", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, "26": { + "android-tv": { + "x86": { + "archives": [ + { + "os": "all", + "sha1": "f908b3c81a03513a756c17a197faecfc91e437df", + "size": 401675862, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-26_r14.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" + } + } + }, + "displayName": "Android TV Intel x86 Atom System Image", + "license": "android-sdk-preview-license", + "name": "system-image-26-android-tv-x86", + "path": "system-images/android-26/android-tv/x86", + "revision": "26-android-tv-x86", + "revision-details": { + "major:0": "14" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } + } + }, + "android-wear": { + "x86": { + "archives": [ + { + "os": "all", + "sha1": "fbffa91b936ca18fcc1e0bab2b52a8b0835cbb1c", + "size": 370311037, + "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86-26_r04.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Android Wear Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-26-android-wear-x86", + "path": "system-images/android-26/android-wear/x86", + "revision": "26-android-wear-x86", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android Wear", + "id:0": "android-wear" + } + } + } + }, + "default": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "c3199baf49790fc65f90f7ce734435d5778f6a30", + "size": 328910124, + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-26_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, + "displayName": "ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-26-default-arm64-v8a", + "path": "system-images/android-26/default/arm64-v8a", + "revision": "26-default-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "e613d6e0da668e30daf547f3c6627a6352846f90", + "size": 350195807, + "url": "https://dl.google.com/android/repository/sys-img/android/x86-26_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-26-default-x86", + "path": "system-images/android-26/default/x86", + "revision": "26-default-x86", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "432f149c048bffce7f9de526ec65b336daf7a0a3", + "size": 474178332, + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-26_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-26-default-x86_64", + "path": "system-images/android-26/default/x86_64", + "revision": "26-default-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + } + }, + "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "75fe6f36cf0854270876543641da53887961a63b", + "size": 732225522, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-26_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, + "displayName": "Google APIs ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-26-google_apis-arm64-v8a", + "path": "system-images/android-26/google_apis/arm64-v8a", + "revision": "26-google_apis-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "edac36ae459ebc974aac4b51b67b7356fa099f5b", + "size": 805108564, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-26_r16.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" + } + } + }, + "displayName": "Google APIs Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-26-google_apis-x86", + "path": "system-images/android-26/google_apis/x86", + "revision": "26-google_apis-x86", + "revision-details": { + "major:0": "16" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "0eb13cc91cf164b617eaf85e4030289cb18189de", + "size": 980740438, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-26_r16.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" + } + } + }, + "displayName": "Google APIs Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-26-google_apis-x86_64", + "path": "system-images/android-26/google_apis/x86_64", + "revision": "26-google_apis-x86_64", + "revision-details": { + "major:0": "16" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, "google_apis_playstore": { "x86": { "archives": [ @@ -1352,15 +5477,300 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-26_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-preview-license", "name": "system-image-26-google_apis_playstore-x86", "path": "system-images/android-26/google_apis_playstore/x86", - "revision": "26-google_apis_playstore-x86" + "revision": "26-google_apis_playstore-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, "27": { + "android-tv": { + "x86": { + "archives": [ + { + "os": "all", + "sha1": "b7d2a9349cdb1da9dafbd42de7378f6f1933d193", + "size": 410757280, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-27_r09.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Android TV Intel x86 Atom System Image", + "license": "android-sdk-preview-license", + "name": "system-image-27-android-tv-x86", + "path": "system-images/android-27/android-tv/x86", + "revision": "27-android-tv-x86", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } + } + }, + "default": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "cb01199edae33ce375c6d8e08aea08911ff0d583", + "size": 331796092, + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-27_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, + "displayName": "ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-27-default-arm64-v8a", + "path": "system-images/android-27/default/arm64-v8a", + "revision": "27-default-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "4ec990fac7b62958decd12e18a4cd389dfe7c582", + "size": 360984187, + "url": "https://dl.google.com/android/repository/sys-img/android/x86-27_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-27-default-x86", + "path": "system-images/android-27/default/x86", + "revision": "27-default-x86", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "2878261011a59ca3de29dc5b457a495fdb268d60", + "size": 491675204, + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-27_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-27-default-x86_64", + "path": "system-images/android-27/default/x86_64", + "revision": "27-default-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + } + }, + "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "a7ae177097205090fee9801349575cea0dd9f606", + "size": 730343967, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-27_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, + "displayName": "Google APIs ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-27-google_apis-arm64-v8a", + "path": "system-images/android-27/google_apis/arm64-v8a", + "revision": "27-google_apis-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "0a130cad4f6d42c305a61265dc6c738e9e2b45c4", + "size": 807298593, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-27_r11.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "27", + "micro:2": "7", + "minor:1": "1" + } + } + }, + "displayName": "Google APIs Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-27-google_apis-x86", + "path": "system-images/android-27/google_apis/x86", + "revision": "27-google_apis-x86", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, "google_apis_playstore": { "x86": { "archives": [ @@ -1371,15 +5781,374 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-27_r03.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-27-google_apis_playstore-x86", "path": "system-images/android-27/google_apis_playstore/x86", - "revision": "27-google_apis_playstore-x86" + "revision": "27-google_apis_playstore-x86", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, "28": { + "android-tv": { + "x86": { + "archives": [ + { + "os": "all", + "sha1": "4c13edca32c1abb899a0702fe6972087712bcb78", + "size": 475216948, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-28_r10.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Android TV Intel x86 Atom System Image", + "license": "android-sdk-preview-license", + "name": "system-image-28-android-tv-x86", + "path": "system-images/android-28/android-tv/x86", + "revision": "28-android-tv-x86", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } + } + }, + "android-wear": { + "x86": { + "archives": [ + { + "os": "all", + "sha1": "3dd75066e95327baf8991915a043e53e06a2cfb5", + "size": 682327945, + "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86-28_r09.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Wear OS Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-28-android-wear-x86", + "path": "system-images/android-28/android-wear/x86", + "revision": "28-android-wear-x86", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Wear OS", + "id:0": "android-wear" + } + } + } + }, + "default": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "4de0491612ca12097be7deb76af835ebabadefca", + "size": 425671679, + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-28_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, + "displayName": "ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-28-default-arm64-v8a", + "path": "system-images/android-28/default/arm64-v8a", + "revision": "28-default-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "ce03c42d80c0fc6dc47f6455dbee7aa275d02780", + "size": 437320152, + "url": "https://dl.google.com/android/repository/sys-img/android/x86-28_r04.zip" + } + ], + "displayName": "Intel x86 Atom System Image", + "license": "android-sdk-preview-license", + "name": "system-image-28-default-x86", + "path": "system-images/android-28/default/x86", + "revision": "28-default-x86", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0", + "size": 564792723, + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-28_r04.zip" + } + ], + "displayName": "Intel x86 Atom_64 System Image", + "license": "android-sdk-preview-license", + "name": "system-image-28-default-x86_64", + "path": "system-images/android-28/default/x86_64", + "revision": "28-default-x86_64", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + } + }, + "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "3360092d11284a9f2d7146847932a426c438b372", + "size": 856031756, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-28_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, + "displayName": "Google APIs ARM 64 v8a System Image", + "license": "android-sdk-arm-dbt-license", + "name": "system-image-28-google_apis-arm64-v8a", + "path": "system-images/android-28/google_apis/arm64-v8a", + "revision": "28-google_apis-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "e0541ac9b783ab91a00054e133bda340a2b9c757", + "size": 994434707, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-28_r12.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "29", + "micro:2": "12", + "minor:1": "1" + } + } + }, + "displayName": "Google APIs Intel x86 Atom System Image", + "license": "android-sdk-arm-dbt-license", + "name": "system-image-28-google_apis-x86", + "path": "system-images/android-28/google_apis/x86", + "revision": "28-google_apis-x86", + "revision-details": { + "major:0": "12" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "1d93bd994e29c4e9bbe71fd9c278addc5418cbee", + "size": 1102721597, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-28_r11.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "29", + "micro:2": "12", + "minor:1": "1" + } + } + }, + "displayName": "Google APIs Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-28-google_apis-x86_64", + "path": "system-images/android-28/google_apis/x86_64", + "revision": "28-google_apis-x86_64", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, "google_apis_playstore": { "arm64-v8a": { "archives": [ @@ -1390,11 +6159,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-28_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis_playstore-arm64-v8a", "path": "system-images/android-28/google_apis_playstore/arm64-v8a", - "revision": "28-google_apis_playstore-arm64-v8a" + "revision": "28-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google ARM64-V8a Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1405,11 +6204,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r09.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "27", + "micro:2": "7", + "minor:1": "1" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86", "path": "system-images/android-28/google_apis_playstore/x86", - "revision": "28-google_apis_playstore-x86" + "revision": "28-google_apis_playstore-x86", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -1420,15 +6254,372 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-28_r08.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "27", + "micro:2": "7", + "minor:1": "1" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86_64", "path": "system-images/android-28/google_apis_playstore/x86_64", - "revision": "28-google_apis_playstore-x86_64" + "revision": "28-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, "29": { + "android-tv": { + "x86": { + "archives": [ + { + "os": "all", + "sha1": "736c2f6c79493b5ee4ca0d2531a25c9eb7f9c7ab", + "size": 590809630, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-29_r03.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, + "displayName": "Android TV Intel x86 Atom System Image", + "license": "android-sdk-preview-license", + "name": "system-image-29-android-tv-x86", + "path": "system-images/android-29/android-tv/x86", + "revision": "29-android-tv-x86", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } + } + }, + "default": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "fa0d67d7430fcc84b2fe2508ea81e92ac644e264", + "size": 498049256, + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-29_r08.zip" + } + ], + "displayName": "ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-29-default-arm64-v8a", + "path": "system-images/android-29/default/arm64-v8a", + "revision": "29-default-arm64-v8a", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + }, + "x86": { + "archives": [ + { + "os": "windows", + "sha1": "cc4fa13e49cb2e93770d4f2e90ea1dd2a81e315b", + "size": 516543600, + "url": "https://dl.google.com/android/repository/sys-img/android/x86-29_r08-windows.zip" + }, + { + "os": "macosx", + "sha1": "cc4fa13e49cb2e93770d4f2e90ea1dd2a81e315b", + "size": 516543600, + "url": "https://dl.google.com/android/repository/sys-img/android/x86-29_r08-darwin.zip" + }, + { + "os": "linux", + "sha1": "cc4fa13e49cb2e93770d4f2e90ea1dd2a81e315b", + "size": 516543600, + "url": "https://dl.google.com/android/repository/sys-img/android/x86-29_r08-linux.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "9", + "minor:1": "1" + } + } + }, + "displayName": "Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-29-default-x86", + "path": "system-images/android-29/default/x86", + "revision": "29-default-x86", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "windows", + "sha1": "e4b798d6fcddff90d528d74ef22ce3dd4a2ca798", + "size": 689676765, + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-29_r08-windows.zip" + }, + { + "os": "macosx", + "sha1": "e4b798d6fcddff90d528d74ef22ce3dd4a2ca798", + "size": 689676765, + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-29_r08-darwin.zip" + }, + { + "os": "linux", + "sha1": "e4b798d6fcddff90d528d74ef22ce3dd4a2ca798", + "size": 689676765, + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-29_r08-linux.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "9", + "minor:1": "1" + } + } + }, + "displayName": "Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-29-default-x86_64", + "path": "system-images/android-29/default/x86_64", + "revision": "29-default-x86_64", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + } + }, + "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "e5938d570019150135c3bdf39442d103ea8aca86", + "size": 1169015927, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-29_r12.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "2", + "minor:1": "8" + } + } + }, + "displayName": "Google APIs ARM 64 v8a System Image", + "license": "android-sdk-arm-dbt-license", + "name": "system-image-29-google_apis-arm64-v8a", + "path": "system-images/android-29/google_apis/arm64-v8a", + "revision": "29-google_apis-arm64-v8a", + "revision-details": { + "major:0": "12" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "8dc45a7406b922116f2121f6826868c2e7087389", + "size": 1133056400, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-29_r12.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "2", + "minor:1": "8" + } + } + }, + "displayName": "Google APIs Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-29-google_apis-x86", + "path": "system-images/android-29/google_apis/x86", + "revision": "29-google_apis-x86", + "revision-details": { + "major:0": "12" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "8392b93dc05c380bb0e6b2375ba318c14b263b37", + "size": 1313280930, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-29_r12.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "2", + "minor:1": "8" + } + } + }, + "displayName": "Google APIs Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-29-google_apis-x86_64", + "path": "system-images/android-29/google_apis/x86_64", + "revision": "29-google_apis-x86_64", + "revision-details": { + "major:0": "12" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, "google_apis_playstore": { "arm64-v8a": { "archives": [ @@ -1445,11 +6636,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-29_r09-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "2", + "minor:1": "8" + } + } + }, "displayName": "Google Play ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis_playstore-arm64-v8a", "path": "system-images/android-29/google_apis_playstore/arm64-v8a", - "revision": "29-google_apis_playstore-arm64-v8a" + "revision": "29-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1472,11 +6693,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-29_r08-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "9", + "minor:1": "1" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86", "path": "system-images/android-29/google_apis_playstore/x86", - "revision": "29-google_apis_playstore-x86" + "revision": "29-google_apis_playstore-x86", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -1499,15 +6755,391 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-29_r08-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "9", + "minor:1": "1" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86_64", "path": "system-images/android-29/google_apis_playstore/x86_64", - "revision": "29-google_apis_playstore-x86_64" + "revision": "29-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, "30": { + "android-tv": { + "x86": { + "archives": [ + { + "os": "all", + "sha1": "f4151d2390fc015ddb2a7715bea9bc69a5ee0b4e", + "size": 699304963, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-30_r04.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, + "displayName": "Android TV Intel x86 Atom System Image", + "license": "android-sdk-preview-license", + "name": "system-image-30-android-tv-x86", + "path": "system-images/android-30/android-tv/x86", + "revision": "30-android-tv-x86", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } + } + }, + "android-wear": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "4096b210414f609e5f83bd846b6f77700ef23ac4", + "size": 768213685, + "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-30_r11.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Wear OS 3 ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-30-android-wear-arm64-v8a", + "path": "system-images/android-30/android-wear/arm64-v8a", + "revision": "30-android-wear-arm64-v8a", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Wear OS 3", + "id:0": "android-wear" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "e528d54306411a56ea2391557c95d4654d949d3c", + "size": 856620801, + "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86-30_r11.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Wear OS 3 Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-30-android-wear-x86", + "path": "system-images/android-30/android-wear/x86", + "revision": "30-android-wear-x86", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Wear OS 3", + "id:0": "android-wear" + } + } + } + }, + "default": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "2462af138023fbbd1114421818890884d4ebceab", + "size": 548363604, + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-30_r01.zip" + } + ], + "displayName": "ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-30-default-arm64-v8a", + "path": "system-images/android-30/default/arm64-v8a", + "revision": "30-default-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "e08119b65d2c188ef69f127028eb4c8cc632cd8f", + "size": 676379913, + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-30_r10.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "29", + "micro:2": "11", + "minor:1": "1" + } + } + }, + "displayName": "Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-30-default-x86_64", + "path": "system-images/android-30/default/x86_64", + "revision": "30-default-x86_64", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + } + }, + "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "14393e29f2b1021d4bfece3a1cb29af745e95dac", + "size": 1244095258, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-30_r11.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "0", + "minor:1": "8" + } + } + }, + "displayName": "Google APIs ARM 64 v8a System Image", + "license": "android-sdk-arm-dbt-license", + "name": "system-image-30-google_apis-arm64-v8a", + "path": "system-images/android-30/google_apis/arm64-v8a", + "revision": "30-google_apis-arm64-v8a", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "a23869f790fd42dddc83c47be1d1827fbebb7869", + "size": 650472769, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-30_r10.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "4", + "minor:1": "0" + } + } + }, + "displayName": "Google APIs Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-30-google_apis-x86", + "path": "system-images/android-30/google_apis/x86", + "revision": "30-google_apis-x86", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "8ec579d5fe31804dd80132f1678655bfc015609b", + "size": 1438274971, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-30_r11.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "0", + "minor:1": "8" + } + } + }, + "displayName": "Google APIs Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-30-google_apis-x86_64", + "path": "system-images/android-30/google_apis/x86_64", + "revision": "30-google_apis-x86_64", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, "google_apis_playstore": { "arm64-v8a": { "archives": [ @@ -1524,11 +7156,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r10-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "0", + "minor:1": "8" + } + } + }, "displayName": "Google Play ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-arm64-v8a", "path": "system-images/android-30/google_apis_playstore/arm64-v8a", - "revision": "30-google_apis_playstore-arm64-v8a" + "revision": "30-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1551,11 +7213,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-30_r09-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "4", + "minor:1": "0" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-30-google_apis_playstore-x86", "path": "system-images/android-30/google_apis_playstore/x86", - "revision": "30-google_apis_playstore-x86" + "revision": "30-google_apis_playstore-x86", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -1578,15 +7275,330 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-30_r10-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "4", + "minor:1": "0" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-x86_64", "path": "system-images/android-30/google_apis_playstore/x86_64", - "revision": "30-google_apis_playstore-x86_64" + "revision": "30-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, "31": { + "android-tv": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "e8cec4080464d516e3f863d943c24055155f29bf", + "size": 763104604, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-31_r04.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, + "displayName": "Android TV ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-31-android-tv-arm64-v8a", + "path": "system-images/android-31/android-tv/arm64-v8a", + "revision": "31-android-tv-arm64-v8a", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "8c0b848019afade7f2a8ddb5c361178f63ec86ca", + "size": 772250386, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-31_r04.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, + "displayName": "Android TV Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-31-android-tv-x86", + "path": "system-images/android-31/android-tv/x86", + "revision": "31-android-tv-x86", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } + } + }, + "default": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "1052df2d0afc8fe57138db19d5ebd82d10c607da", + "size": 635481190, + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-31_r03.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "7", + "minor:1": "2" + } + } + }, + "displayName": "ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-31-default-arm64-v8a", + "path": "system-images/android-31/default/arm64-v8a", + "revision": "31-default-arm64-v8a", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "1200d6983af477fd6439f11cc5cabf9866bc4a16", + "size": 657244568, + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-31_r03.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "7", + "minor:1": "2" + } + } + }, + "displayName": "Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-31-default-x86_64", + "path": "system-images/android-31/default/x86_64", + "revision": "31-default-x86_64", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + } + }, + "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "afdec4698b61bfbcf8471eff418951d7183c7b55", + "size": 1415899601, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-31_r10.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "7", + "minor:1": "2" + } + } + }, + "displayName": "Google APIs ARM 64 v8a System Image", + "license": "android-sdk-arm-dbt-license", + "name": "system-image-31-google_apis-arm64-v8a", + "path": "system-images/android-31/google_apis/arm64-v8a", + "revision": "31-google_apis-arm64-v8a", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "05a74ff8509fb76cbfd14b2e3307addad5c4d0df", + "size": 1458104208, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-31_r11.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "7", + "minor:1": "2" + } + } + }, + "displayName": "Google APIs Intel x86 Atom_64 System Image", + "license": "android-sdk-preview-license", + "name": "system-image-31-google_apis-x86_64", + "path": "system-images/android-31/google_apis/x86_64", + "revision": "31-google_apis-x86_64", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, "google_apis_playstore": { "arm64-v8a": { "archives": [ @@ -1603,11 +7615,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r09-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "7", + "minor:1": "2" + } + } + }, "displayName": "Google Play ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-arm64-v8a", "path": "system-images/android-31/google_apis_playstore/arm64-v8a", - "revision": "31-google_apis_playstore-arm64-v8a" + "revision": "31-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -1618,15 +7665,102 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r09.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-x86_64", "path": "system-images/android-31/google_apis_playstore/x86_64", - "revision": "31-google_apis_playstore-x86_64" + "revision": "31-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, "32": { + "google_apis": { + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "9727f570164b062e820d6e62edabc96d125027f6", + "size": 1471221547, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-32_r03.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, + "displayName": "Google APIs Intel x86 Atom_64 System Image", + "license": "android-sdk-preview-license", + "name": "system-image-32-google_apis-x86_64", + "path": "system-images/android-32/google_apis/x86_64", + "revision": "32-google_apis-x86_64", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "32", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, "google_apis_playstore": { "arm64-v8a": { "archives": [ @@ -1643,11 +7777,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-32_r03-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis_playstore-arm64-v8a", "path": "system-images/android-32/google_apis_playstore/arm64-v8a", - "revision": "32-google_apis_playstore-arm64-v8a" + "revision": "32-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "32", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -1670,85 +7839,352 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-32_r03-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-preview-license", "name": "system-image-32-google_apis_playstore-x86_64", "path": "system-images/android-32/google_apis_playstore/x86_64", - "revision": "32-google_apis_playstore-x86_64" + "revision": "32-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "32", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, "33": { - "google_apis_playstore": { - "arm64-v8a": { - "archives": [ - { - "os": "macosx", - "sha1": "0b850a4f317d7a6abe854a6845705c9ca4437764", - "size": 1492105537, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r05-darwin.zip" - }, - { - "os": "linux", - "sha1": "0b850a4f317d7a6abe854a6845705c9ca4437764", - "size": 1492105537, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r05-linux.zip" - } - ], - "displayName": "Google Play ARM 64 v8a System Image", - "license": "android-sdk-arm-dbt-license", - "name": "system-image-33-google_apis_playstore-arm64-v8a", - "path": "system-images/android-33/google_apis_playstore/arm64-v8a", - "revision": "33-google_apis_playstore-arm64-v8a" - }, - "x86_64": { - "archives": [ - { - "os": "all", - "sha1": "ed2931ebef4f7bedff8610254748d6496ce5d3c4", - "size": 1496628942, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-33_r05.zip" - } - ], - "displayName": "Google Play Intel x86 Atom_64 System Image", - "license": "android-sdk-preview-license", - "name": "system-image-33-google_apis_playstore-x86_64", - "path": "system-images/android-33/google_apis_playstore/x86_64", - "revision": "33-google_apis_playstore-x86_64" - } - } - }, - "Tiramisu": { "android-tv": { "arm64-v8a": { "archives": [ { "os": "all", - "sha1": "4b70bed5ffb28162cdde7852e0597d957910270d", - "size": 840304267, - "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-Tiramisu_r03.zip" + "sha1": "41b75155961eb506b492e60e8fba590ad7baa02c", + "size": 828027584, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-33_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, "displayName": "Android TV ARM 64 v8a System Image", "license": "android-sdk-license", - "name": "system-image-Tiramisu-android-tv-arm64-v8a", - "path": "system-images/android-Tiramisu/android-tv/arm64-v8a", - "revision": "Tiramisu-android-tv-arm64-v8a" + "name": "system-image-33-android-tv-arm64-v8a", + "path": "system-images/android-33/android-tv/arm64-v8a", + "revision": "33-android-tv-arm64-v8a", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } }, "x86": { "archives": [ { "os": "all", - "sha1": "547a24d9dec83e11486ef4ea45848d9fa99f35c2", - "size": 832895525, - "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-Tiramisu_r03.zip" + "sha1": "ec3fe6a450ed6aa5fec2703fca68648e7813094f", + "size": 817908695, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-33_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-license", - "name": "system-image-Tiramisu-android-tv-x86", - "path": "system-images/android-Tiramisu/android-tv/x86", - "revision": "Tiramisu-android-tv-x86" + "name": "system-image-33-android-tv-x86", + "path": "system-images/android-33/android-tv/x86", + "revision": "33-android-tv-x86", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } + } + }, + "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "8e7733de150ad1a912d63f90a11a1de705b5ddcf", + "size": 1619645676, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-33_r08.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, + "displayName": "Google APIs ARM 64 v8a System Image", + "license": "android-sdk-arm-dbt-license", + "name": "system-image-33-google_apis-arm64-v8a", + "path": "system-images/android-33/google_apis/arm64-v8a", + "revision": "33-google_apis-arm64-v8a", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "6f5210b87ca249aa6ea2a25bb6d5598c19fa9372", + "size": 1510438727, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-33_r08.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, + "displayName": "Google APIs Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-33-google_apis-x86_64", + "path": "system-images/android-33/google_apis/x86_64", + "revision": "33-google_apis-x86_64", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, + "google_apis_playstore": { + "arm64-v8a": { + "archives": [ + { + "os": "macosx", + "sha1": "831cfe87d12eb5dd9d107ca2dfb203d52ca7b217", + "size": 1582091204, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r07-darwin.zip" + }, + { + "os": "linux", + "sha1": "831cfe87d12eb5dd9d107ca2dfb203d52ca7b217", + "size": 1582091204, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r07-linux.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, + "displayName": "Google Play ARM 64 v8a System Image", + "license": "android-sdk-arm-dbt-license", + "name": "system-image-33-google_apis_playstore-arm64-v8a", + "path": "system-images/android-33/google_apis_playstore/arm64-v8a", + "revision": "33-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "b7491eecf45556bd96f7b7a80c020b18a8a7df0d", + "size": 1481773028, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-33_r07.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, + "displayName": "Google Play Intel x86 Atom_64 System Image", + "license": "android-sdk-license", + "name": "system-image-33-google_apis_playstore-x86_64", + "path": "system-images/android-33/google_apis_playstore/x86_64", + "revision": "33-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1758,37 +8194,109 @@ "archives": [ { "os": "macosx", - "sha1": "4653d7aa2dbd2629c3afc1c700284de0f7791bb2", - "size": 1514681298, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-TiramisuPrivacySandbox_r05-darwin.zip" + "sha1": "069cdb5926cef729c8f14897cdc70e47acfe6736", + "size": 1489462208, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-TiramisuPrivacySandbox_r08-darwin.zip" }, { "os": "linux", - "sha1": "4653d7aa2dbd2629c3afc1c700284de0f7791bb2", - "size": 1514681298, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-TiramisuPrivacySandbox_r05-linux.zip" + "sha1": "069cdb5926cef729c8f14897cdc70e47acfe6736", + "size": 1489462208, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-TiramisuPrivacySandbox_r08-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a", "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/arm64-v8a", - "revision": "TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a" + "revision": "TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:4": "arm64-v8a", + "api-level:0": "33", + "codename:1": "TiramisuPrivacySandbox", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ { "os": "all", - "sha1": "2a4ea6ce714155ea8ddfea26cf61ad219f32c02a", - "size": 1519169526, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-TiramisuPrivacySandbox_r05.zip" + "sha1": "7ae1658d066353e9f079afe694bdc17c446c0c88", + "size": 1493513570, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-TiramisuPrivacySandbox_r08.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-preview-license", "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-x86_64", "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64", - "revision": "TiramisuPrivacySandbox-google_apis_playstore-x86_64" + "revision": "TiramisuPrivacySandbox-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:4": "x86_64", + "api-level:0": "33", + "codename:1": "TiramisuPrivacySandbox", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } } @@ -1816,7 +8324,7 @@ "Intel Corporation Internal Evaluation License Agreement for x86 Android* System Images for Android Software Development Kit (SDK) This Internal Evaluation License Agreement (this \"Agreement\") is entered into by and between Intel and you (as an individual developer or a legal entity -- identified below as Recipient). Intel shall provide the Evaluation Software to Recipient as described in accordance with the Internal Evaluation License Terms and Conditions.\n\nDefinitions. These terms shall have the following meanings:\n\n\"Intel\" or \"INTEL\" Intel Corporation With an Address of: 2200 Mission College Blvd. Santa Clara, CA 95052 Office of the General Counsel Mail Stop: RNB-4-51 Attn: Software and Services Group Legal\n\n\"Evaluation Software\" The x86 Android* emulator system images for Android Software Development Kit (SDK), as provided by Intel.\n\nINTERNAL EVALUATION LICENSE TERMS AND CONDITIONS\n\n1. DEFINITIONS.\n\n1.1 Additional Defined Terms. \"Agreement\", \"Evaluation Software\", \"Intel\", \"Non-disclosure Agreement\", \"Recipient\", and \"Effective Date\" shall have the meanings ascribed to them on the signature page(s) of this Agreement.\n\n1.2 Evaluation Materials means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications and other related materials) related to the Evaluation Software.\n\n1.3 \"Open Source Software\" means any software that requires as a condition of use, modification and/or distribution of such software that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL).\n\n1.4 \"Pre-Release Materials\" means \"alpha\" or \"beta\" designated pre-release features, which may not be fully functional, which Intel may substantially modify in producing any production version of the Evaluation Materials and/or is still under development by Intel and/or Intel’s suppliers.\n\n2. PURPOSE. Intel desires to provide the Evaluation Materials to Recipient solely for Recipient's internal evaluation of the Evaluation Software and other Intel products, to evaluate the desirability of cooperating with Intel in developing products based on the Evaluation Software and/or to advise Intel as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute or make commercial use of the Evaluation Materials or any modifications to the Evaluation Materials. THE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT AN INTEL SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERICAL VERSION OF THE EVALUATION SOFTWARE.\n\n3. TITLE. Title to the Evaluation Materials remains with Intel or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement.\n\n4. LICENSE. Intel grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above. Unless otherwise communicated in writing by Intel to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a \"Release\") the license grant in this Section 4 and the Evaluation Period shall apply to each Release. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software not provided to Recipient in source code form. EXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT.\n\n5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from Intel. Intel and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it.\n\n6. MODIFICATIONS. This Agreement does NOT obligate Recipient to provide Intel with comments or suggestions regarding Evaluation Materials. However, should Recipient provide Intel with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) Intel products or processes which may embody the Evaluation Materials, Recipient grants to Intel a non-exclusive, irrevocable, worldwide, royalty-free license, with the right to sublicense Intel’s licensees and customers, under Recipient intellectual property rights, the rights to use and disclose such comments and suggestions in any manner Intel chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of Intel’s and its sublicensee’s products embodying such comments and suggestions in any manner and via any media Intel chooses, without reference to the source.\n\n7. WARRANTY DISCLAIMER. INTEL AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT. THE EVALUATION MATERIALS ARE PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND.\n\n8. LIMITATION OF LIABILITY. INTEL AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR ANY SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE. INTEL AND ITS SUPPLIERS DISCLAIM ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS RELATING TO THE EVALUATION MATERIALS.\n\n9. EXPIRATION. Intel may terminate this Agreement immediately after a breach by Recipient.\n\n10. GENERAL.\n\n10.1 Controlling Law. Any claims arising under or relating to this Agreement shall be governed by the internal substantive laws of the State of Delaware or federal courts located in Delaware, without regard to principles of conflict of laws. Each party hereby agrees to jurisdiction and venue in the courts of the State of Delaware for all disputes and litigation arising under or relating to this Agreement. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts.\n\n10.2 Remedies. Recipient acknowledges that any disclosure, commercialization, or public use of the Evaluation Materials would cause irreparable injury to Intel and consents to the grant of an injunction by any court of competent jurisdiction in the event of a threatened breach.\n\n10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without Intel’s express prior written consent, shall be null and void. Intel may assign this Agreement, and its rights and obligations hereunder, in its sole discretion.\n\n10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and Intel and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and Intel with respect to the subject matter hereof. This Agreement supersedes any and all \"click-to-accept\" or shrink-wrapped licenses, in hard-copy or electronic form, embedded in or included with the Evaluation Materials. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed by duly authorized representatives of Recipient and Intel. Without limiting the foregoing, terms and conditions on any purchase orders or similar materials submitted by Recipient to Intel, and any terms contained in Intel’s standard acknowledgment form that are in conflict with these terms, shall be of no force or effect.\n\n10.5 Severability. In the event that any provision of this Agreement shall be unenforceable or invalid under any applicable law or be so held by applicable court decision, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such provision shall be changed and interpreted so as to best accomplish the objectives of such unenforceable or invalid provision within the limits of applicable law or applicable court decisions.\n\n10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other approval from the U.S. Department of Commerce or any other agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is \"deemed\" to take place when information is released to a foreign national wherever located.\n\n10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments and (iv) Intel can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . Intel is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person.\n\n10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header provided with Evaluation Software. Additional detail may be provided (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement. ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED POSSIBLY WITH FAULTS" ], "mips-android-sysimage-license": [ - "MIPS Technologies, Inc. (“MIPS”) Internal Evaluation License Agreement for MIPS Android™ System Images for Android Software Development Kit (SDK): This Internal Evaluation License Agreement (this \"Agreement\") is entered into by and between MIPS and you (as an individual developer or a legal entity -- identified below as “Recipient”). MIPS shall make the Evaluation Software available to Recipient as described in accordance with the terms and conditions set forth below.\n\nBy clicking on the “Accept” button, downloading, installing, or otherwise using the Evaluation Materials (defined below), you agree to be bound by the terms of this Agreement effective as of the date you click “Accept” (the “Effective Date”), and if doing so on behalf of an entity, you represent that you are authorized to bind the entity to the terms and conditions of this Agreement. If you do not agree to be bound by the terms and conditions of this Agreement, do not download, install, or use the Evaluation Materials.\n\n1. DEFINITIONS. These terms shall have the following meanings:\n\n1.1 “MIPS” shall mean MIPS Technologies, Inc., a Delaware corporation having a principal place of business at: 955 East Arques Ave., Sunnyvale, CA 94085\n\n1.2 “Evaluation Software” shall mean MIPS Android™ emulator system images for Android Software Development Kit (SDK), as made available to Recipient.\n\n1.3 “Evaluation Materials\" means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications, reference manuals, and other related materials) related to the Evaluation Software as made available to Recipient.\n\n1.4 “Open Source Software” means any software that requires (as a condition of use, modification and/or distribution of such software) that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL).\n\n1.5 “Pre-Release Materials” means “alpha” or “beta” designated pre-release features, which may not be fully functional, which MIPS may substantially modify in producing any production version of the Evaluation Materials, and/or which is still under development by MIPS and/or MIPS’ suppliers.\n\n2. PURPOSE. MIPS desires to make the Evaluation Materials available to Recipient solely for Recipient's internal evaluation of the Evaluation Software to evaluate the desirability of cooperating with MIPS in developing products that are compatible with the Evaluation Software and/or to advise MIPS as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute, modify (except to facilitate the above-mentioned internal evaluation), or make commercial use of the Evaluation Materials or any modifications of the Evaluation Materials.\n\nTHE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE MODIFIED (EXCEPT TO FACILITATE THE INTERNAL EVALUATION) OR DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT A MIPS SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERCIAL VERSION OF THE EVALUATION SOFTWARE.\n\n3. TITLE. Title to the Evaluation Materials remains with MIPS or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement.\n\n4. LICENSE. MIPS grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above and only for a period beginning on the Effective Date and extending to the first anniversary of the Effective Date (the “Evaluation Period”). Unless otherwise communicated in writing by MIPS to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a “Release”) the license grant in this Section 4 and the Evaluation Period shall apply to each Release, in which case the Evaluation Period shall begin on the date that the Release is made generally available and continue to the first anniversary of such date. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software that is not provided to Recipient in source code form.\n\n\nEXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER MIPS INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT. OTHER THAN AS EXPLICITLY SET FORTH IN PARAGRAPH 2 ABOVE, NO RIGHT TO COPY, TO REPRODUCE, TO MODIFY, OR TO CREATE DERIVATIVE WORKS OF, THE EVALUATION MATERIALS IS GRANTED HEREIN.\n\n5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from MIPS. MIPS and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it.\n\n6. MODIFICATIONS. This Agreement does not obligate Recipient to provide MIPS with comments or suggestions regarding Evaluation Materials. However, should Recipient provide MIPS with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) MIPS products or processes which may embody the Evaluation Materials, then Recipient agrees to grant and hereby grants to MIPS a non-exclusive, irrevocable, worldwide, fully paid-up, royalty-free license, with the right to sublicense MIPS’ licensees and customers, under Recipient’s Intellectual property rights, to use and disclose such comments and suggestions in any manner MIPS chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of MIPS’ and its sublicensee’s products embodying such comments and suggestions in any manner and via any media MIPS chooses, without reference to the source.\n\n7. WARRANTY DISCLAIMER. MIPS AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT WITH RESPECT TO THIRD PARTY INTELLECTUAL PROPERTY. RECIPIENT ACKNOWLEDGES AND AGREES THAT THE EVALUATION MATERIALS ARE PROVIDED “AS IS,” WITHOUT WARRANTY OF ANY KIND.\n\n8. LIMITATION OF LIABILITY. MIPS AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR FOR ANY DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED OR ALLEGED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE, INCLUDING WITHOUT LIMITATION, UNDER TORT OR OTHER LEGAL THEORY. MIPS AND ITS SUPPLIERS DISCLAIM ANY AND ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS OF ANY KIND RELATING TO THE EVALUATION MATERIALS.\n\n9. EXPIRATION. MIPS may terminate this Agreement immediately after a breach by Recipient or otherwise at MIPS’ reasonable discretion and upon five (5) business days’ notice to Recipient.\n\n10. GENERAL.\n\n10.1 Controlling Law. This Agreement shall be governed by California law excluding its choice of law rules. With the exception of MIPS’ rights to enforce its intellectual property rights and any confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, all disputes and any claims arising under or relating to this Agreement shall be subject to the exclusive jurisdiction and venue of the state and federal courts located in Santa Clara County, California. Each party hereby agrees to jurisdiction and venue in the courts set forth in the preceding sentence. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts.\n\n10.2 Remedies. Recipient acknowledges and agrees that any breach of confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, as well as any disclosure, commercialization, or public use of the Evaluation Materials, would cause irreparable injury to MIPS, and therefore Recipient agrees to consent to, and hereby consents to, the grant of an injunction by any court of competent jurisdiction in the event of an actual or threatened breach.\n\n10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights, obligations, or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without MIPS’ express prior written consent, shall be ineffective, null and void. MIPS may freely assign this Agreement, and its rights and obligations hereunder, in its sole discretion.\n\n10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and MIPS and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and MIPS with respect to the subject matter hereof. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed or otherwise accepted by duly authorized representatives of Recipient and MIPS.\n\n10.5 Severability. In the event that any provision of this Agreement is finally adjudicated to be unenforceable or invalid under any applicable law, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such unenforceable or invalid provision shall be interpreted so as to best accomplish the objectives of such provision within the limits of applicable law or applicable court decisions.\n\n10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other necessary approval from the U.S. Department of Commerce or any other governing agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all applicable laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is \"deemed\" to take place when information is released to a foreign national wherever located.\n\n10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments or may not be suitable for certain applications and (iv) MIPS can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . MIPS is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person.\n\nANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS” AND “AS AVAILABLE”, POSSIBLY WITH FAULTS, AND WITHOUT REPRESENTATION OR WARRANTY OF ANY KIND.\n\n10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header as indicated in the Evaluation Software. Additional detail may be available (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement.\n" + "MIPS Technologies, Inc. (“MIPS”) Internal Evaluation License Agreement for MIPS Android™ System Images for Android Software Development Kit (SDK): This Internal Evaluation License Agreement (this \"Agreement\") is entered into by and between MIPS and you (as an individual developer or a legal entity -- identified below as “Recipient”). MIPS shall make the Evaluation Software available to Recipient as described in accordance with the terms and conditions set forth below.\n\nBy clicking on the “Accept” button, downloading, installing, or otherwise using the Evaluation Materials (defined below), you agree to be bound by the terms of this Agreement effective as of the date you click “Accept” (the “Effective Date”), and if doing so on behalf of an entity, you represent that you are authorized to bind the entity to the terms and conditions of this Agreement. If you do not agree to be bound by the terms and conditions of this Agreement, do not download, install, or use the Evaluation Materials.\n\n1. DEFINITIONS. These terms shall have the following meanings:\n\n1.1 “MIPS” shall mean MIPS Technologies, Inc., a Delaware corporation having a principal place of business at: 955 East Arques Ave., Sunnyvale, CA 94085\n\n1.2 “Evaluation Software” shall mean MIPS Android™ emulator system images for Android Software Development Kit (SDK), as made available to Recipient.\n\n1.3 “Evaluation Materials\" means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications, reference manuals, and other related materials) related to the Evaluation Software as made available to Recipient.\n\n1.4 “Open Source Software” means any software that requires (as a condition of use, modification and/or distribution of such software) that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL).\n\n1.5 “Pre-Release Materials” means “alpha” or “beta” designated pre-release features, which may not be fully functional, which MIPS may substantially modify in producing any production version of the Evaluation Materials, and/or which is still under development by MIPS and/or MIPS’ suppliers.\n\n2. PURPOSE. MIPS desires to make the Evaluation Materials available to Recipient solely for Recipient's internal evaluation of the Evaluation Software to evaluate the desirability of cooperating with MIPS in developing products that are compatible with the Evaluation Software and/or to advise MIPS as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute, modify (except to facilitate the above-mentioned internal evaluation), or make commercial use of the Evaluation Materials or any modifications of the Evaluation Materials.\n\nTHE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE MODIFIED (EXCEPT TO FACILITATE THE INTERNAL EVALUATION) OR DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT A MIPS SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERCIAL VERSION OF THE EVALUATION SOFTWARE.\n\n3. TITLE. Title to the Evaluation Materials remains with MIPS or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement.\n\n4. LICENSE. MIPS grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above and only for a period beginning on the Effective Date and extending to the first anniversary of the Effective Date (the “Evaluation Period”). Unless otherwise communicated in writing by MIPS to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a “Release”) the license grant in this Section 4 and the Evaluation Period shall apply to each Release, in which case the Evaluation Period shall begin on the date that the Release is made generally available and continue to the first anniversary of such date. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software that is not provided to Recipient in source code form.\n\n\nEXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER MIPS INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT. OTHER THAN AS EXPLICITLY SET FORTH IN PARAGRAPH 2 ABOVE, NO RIGHT TO COPY, TO REPRODUCE, TO MODIFY, OR TO CREATE DERIVATIVE WORKS OF, THE EVALUATION MATERIALS IS GRANTED HEREIN.\n\n5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from MIPS. MIPS and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it.\n\n6. MODIFICATIONS. This Agreement does not obligate Recipient to provide MIPS with comments or suggestions regarding Evaluation Materials. However, should Recipient provide MIPS with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) MIPS products or processes which may embody the Evaluation Materials, then Recipient agrees to grant and hereby grants to MIPS a non-exclusive, irrevocable, worldwide, fully paid-up, royalty-free license, with the right to sublicense MIPS’ licensees and customers, under Recipient’s Intellectual property rights, to use and disclose such comments and suggestions in any manner MIPS chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of MIPS’ and its sublicensee’s products embodying such comments and suggestions in any manner and via any media MIPS chooses, without reference to the source.\n\n7. WARRANTY DISCLAIMER. MIPS AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT WITH RESPECT TO THIRD PARTY INTELLECTUAL PROPERTY. RECIPIENT ACKNOWLEDGES AND AGREES THAT THE EVALUATION MATERIALS ARE PROVIDED “AS IS,” WITHOUT WARRANTY OF ANY KIND.\n\n8. LIMITATION OF LIABILITY. MIPS AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR FOR ANY DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED OR ALLEGED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE, INCLUDING WITHOUT LIMITATION, UNDER TORT OR OTHER LEGAL THEORY. MIPS AND ITS SUPPLIERS DISCLAIM ANY AND ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS OF ANY KIND RELATING TO THE EVALUATION MATERIALS.\n\n9. EXPIRATION. MIPS may terminate this Agreement immediately after a breach by Recipient or otherwise at MIPS’ reasonable discretion and upon five (5) business days’ notice to Recipient.\n\n10. GENERAL.\n\n10.1 Controlling Law. This Agreement shall be governed by California law excluding its choice of law rules. With the exception of MIPS’ rights to enforce its intellectual property rights and any confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, all disputes and any claims arising under or relating to this Agreement shall be subject to the exclusive jurisdiction and venue of the state and federal courts located in Santa Clara County, California. Each party hereby agrees to jurisdiction and venue in the courts set forth in the preceding sentence. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts.\n\n10.2 Remedies. Recipient acknowledges and agrees that any breach of confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, as well as any disclosure, commercialization, or public use of the Evaluation Materials, would cause irreparable injury to MIPS, and therefore Recipient agrees to consent to, and hereby consents to, the grant of an injunction by any court of competent jurisdiction in the event of an actual or threatened breach.\n\n10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights, obligations, or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without MIPS’ express prior written consent, shall be ineffective, null and void. MIPS may freely assign this Agreement, and its rights and obligations hereunder, in its sole discretion.\n\n10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and MIPS and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and MIPS with respect to the subject matter hereof. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed or otherwise accepted by duly authorized representatives of Recipient and MIPS.\n\n10.5 Severability. In the event that any provision of this Agreement is finally adjudicated to be unenforceable or invalid under any applicable law, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such unenforceable or invalid provision shall be interpreted so as to best accomplish the objectives of such provision within the limits of applicable law or applicable court decisions.\n\n10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other necessary approval from the U.S. Department of Commerce or any other governing agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all applicable laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is \"deemed\" to take place when information is released to a foreign national wherever located.\n\n10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments or may not be suitable for certain applications and (iv) MIPS can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . MIPS is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person.\n\nANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS” AND “AS AVAILABLE”, POSSIBLY WITH FAULTS, AND WITHOUT REPRESENTATION OR WARRANTY OF ANY KIND.\n\n10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header as indicated in the Evaluation Software. Additional detail may be available (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement." ] }, "packages": { @@ -1842,11 +8350,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r17-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 17", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/17.0.0", - "revision": "17.0.0" + "revision": "17.0.0", + "revision-details": { + "major:0": "17", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "18.0.1": { "archives": [ @@ -1869,11 +8395,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r18.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 18.0.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/18.0.1", - "revision": "18.0.1" + "revision": "18.0.1", + "revision-details": { + "major:0": "18", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "18.1.0": { "archives": [ @@ -1896,11 +8440,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r18.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 18.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/18.1.0", - "revision": "18.1.0" + "revision": "18.1.0", + "revision-details": { + "major:0": "18", + "micro:2": "0", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "18.1.1": { "archives": [ @@ -1923,11 +8485,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r18.1.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 18.1.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/18.1.1", - "revision": "18.1.1" + "revision": "18.1.1", + "revision-details": { + "major:0": "18", + "micro:2": "1", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.0.0": { "archives": [ @@ -1950,11 +8530,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r19-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 19", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/19.0.0", - "revision": "19.0.0" + "revision": "19.0.0", + "revision-details": { + "major:0": "19", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.0.1": { "archives": [ @@ -1977,11 +8575,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r19.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 19.0.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/19.0.1", - "revision": "19.0.1" + "revision": "19.0.1", + "revision-details": { + "major:0": "19", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.0.2": { "archives": [ @@ -2004,11 +8620,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r19.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 19.0.2", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/19.0.2", - "revision": "19.0.2" + "revision": "19.0.2", + "revision-details": { + "major:0": "19", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.0.3": { "archives": [ @@ -2031,11 +8665,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r19.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 19.0.3", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/19.0.3", - "revision": "19.0.3" + "revision": "19.0.3", + "revision-details": { + "major:0": "19", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.1.0": { "archives": [ @@ -2058,11 +8710,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r19.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 19.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/19.1.0", - "revision": "19.1.0" + "revision": "19.1.0", + "revision-details": { + "major:0": "19", + "micro:2": "0", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.0": { "archives": [ @@ -2085,11 +8754,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r20-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 20", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/20.0.0", - "revision": "20.0.0" + "revision": "20.0.0", + "revision-details": { + "major:0": "20", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.0": { "archives": [ @@ -2112,11 +8798,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r21-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 21", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/21.0.0", - "revision": "21.0.0" + "revision": "21.0.0", + "revision-details": { + "major:0": "21", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.1": { "archives": [ @@ -2139,11 +8843,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r21.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 21.0.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/21.0.1", - "revision": "21.0.1" + "revision": "21.0.1", + "revision-details": { + "major:0": "21", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.2": { "archives": [ @@ -2166,11 +8888,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r21.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 21.0.2", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/21.0.2", - "revision": "21.0.2" + "revision": "21.0.2", + "revision-details": { + "major:0": "21", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.0": { "archives": [ @@ -2193,11 +8933,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r21.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 21.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/21.1.0", - "revision": "21.1.0" + "revision": "21.1.0", + "revision-details": { + "major:0": "21", + "micro:2": "0", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.1": { "archives": [ @@ -2220,11 +8978,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r21.1.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 21.1.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/21.1.1", - "revision": "21.1.1" + "revision": "21.1.1", + "revision-details": { + "major:0": "21", + "micro:2": "1", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.2": { "archives": [ @@ -2247,11 +9023,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r21.1.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 21.1.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/21.1.2", - "revision": "21.1.2" + "revision": "21.1.2", + "revision-details": { + "major:0": "21", + "micro:2": "2", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.0.0": { "archives": [ @@ -2274,11 +9067,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r22-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 22", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/22.0.0", - "revision": "22.0.0" + "revision": "22.0.0", + "revision-details": { + "major:0": "22", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.0.1": { "archives": [ @@ -2301,11 +9112,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r22.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 22.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/22.0.1", - "revision": "22.0.1" + "revision": "22.0.1", + "revision-details": { + "major:0": "22", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.0": { "archives": [ @@ -2328,11 +9156,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r23-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 23", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/23.0.0", - "revision": "23.0.0" + "revision": "23.0.0", + "revision-details": { + "major:0": "23", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.1": { "archives": [ @@ -2355,11 +9201,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r23.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 23.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.1", - "revision": "23.0.1" + "revision": "23.0.1", + "revision-details": { + "major:0": "23", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.2": { "archives": [ @@ -2382,11 +9245,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r23.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 23.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.2", - "revision": "23.0.2" + "revision": "23.0.2", + "revision-details": { + "major:0": "23", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.3": { "archives": [ @@ -2409,11 +9289,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r23.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 23.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.3", - "revision": "23.0.3" + "revision": "23.0.3", + "revision-details": { + "major:0": "23", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.0": { "archives": [ @@ -2436,11 +9333,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r24-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 24", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.0", - "revision": "24.0.0" + "revision": "24.0.0", + "revision-details": { + "major:0": "24", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.1": { "archives": [ @@ -2463,11 +9377,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r24.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 24.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.1", - "revision": "24.0.1" + "revision": "24.0.1", + "revision-details": { + "major:0": "24", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.2": { "archives": [ @@ -2490,11 +9421,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r24.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 24.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.2", - "revision": "24.0.2" + "revision": "24.0.2", + "revision-details": { + "major:0": "24", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.3": { "archives": [ @@ -2517,11 +9465,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r24.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 24.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.3", - "revision": "24.0.3" + "revision": "24.0.3", + "revision-details": { + "major:0": "24", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.0": { "archives": [ @@ -2544,11 +9509,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r25-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 25", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.0", - "revision": "25.0.0" + "revision": "25.0.0", + "revision-details": { + "major:0": "25", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.1": { "archives": [ @@ -2571,11 +9553,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r25.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 25.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.1", - "revision": "25.0.1" + "revision": "25.0.1", + "revision-details": { + "major:0": "25", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.2": { "archives": [ @@ -2598,11 +9597,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r25.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 25.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.2", - "revision": "25.0.2" + "revision": "25.0.2", + "revision-details": { + "major:0": "25", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.3": { "archives": [ @@ -2625,11 +9641,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r25.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 25.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.3", - "revision": "25.0.3" + "revision": "25.0.3", + "revision-details": { + "major:0": "25", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "26.0.0": { "archives": [ @@ -2652,11 +9685,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r26-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 26", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.0", - "revision": "26.0.0" + "revision": "26.0.0", + "revision-details": { + "major:0": "26", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "26.0.1": { "archives": [ @@ -2679,11 +9729,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r26.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 26.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.1", - "revision": "26.0.1" + "revision": "26.0.1", + "revision-details": { + "major:0": "26", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "26.0.2": { "archives": [ @@ -2706,11 +9773,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r26.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 26.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.2", - "revision": "26.0.2" + "revision": "26.0.2", + "revision-details": { + "major:0": "26", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "26.0.3": { "archives": [ @@ -2733,11 +9817,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r26.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 26.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.3", - "revision": "26.0.3" + "revision": "26.0.3", + "revision-details": { + "major:0": "26", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "27.0.0": { "archives": [ @@ -2760,11 +9861,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r27-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 27", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.0", - "revision": "27.0.0" + "revision": "27.0.0", + "revision-details": { + "major:0": "27", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "27.0.1": { "archives": [ @@ -2787,11 +9905,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r27.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 27.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.1", - "revision": "27.0.1" + "revision": "27.0.1", + "revision-details": { + "major:0": "27", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "27.0.2": { "archives": [ @@ -2814,11 +9949,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r27.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 27.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.2", - "revision": "27.0.2" + "revision": "27.0.2", + "revision-details": { + "major:0": "27", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "27.0.3": { "archives": [ @@ -2841,11 +9993,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r27.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 27.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.3", - "revision": "27.0.3" + "revision": "27.0.3", + "revision-details": { + "major:0": "27", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "28.0.0": { "archives": [ @@ -2868,11 +10037,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r28-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 28", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.0", - "revision": "28.0.0" + "revision": "28.0.0", + "revision-details": { + "major:0": "28", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "28.0.0-rc1": { "archives": [ @@ -2895,11 +10081,30 @@ "url": "https://dl.google.com/android/repository/build-tools_r28-rc1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 28-rc1", "license": "android-sdk-preview-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/28.0.0-rc1", - "revision": "28.0.0-rc1" + "revision": "28.0.0-rc1", + "revision-details": { + "major:0": "28", + "micro:2": "0", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "28.0.0-rc2": { "archives": [ @@ -2922,11 +10127,30 @@ "url": "https://dl.google.com/android/repository/build-tools_r28-rc2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 28-rc2", "license": "android-sdk-preview-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/28.0.0-rc2", - "revision": "28.0.0-rc2" + "revision": "28.0.0-rc2", + "revision-details": { + "major:0": "28", + "micro:2": "0", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "28.0.1": { "archives": [ @@ -2949,11 +10173,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r28.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 28.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.1", - "revision": "28.0.1" + "revision": "28.0.1", + "revision-details": { + "major:0": "28", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "28.0.2": { "archives": [ @@ -2976,11 +10217,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r28.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 28.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.2", - "revision": "28.0.2" + "revision": "28.0.2", + "revision-details": { + "major:0": "28", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "28.0.3": { "archives": [ @@ -3003,11 +10261,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r28.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 28.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.3", - "revision": "28.0.3" + "revision": "28.0.3", + "revision-details": { + "major:0": "28", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.0": { "archives": [ @@ -3030,11 +10305,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r29-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.0", - "revision": "29.0.0" + "revision": "29.0.0", + "revision-details": { + "major:0": "29", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.0-rc1": { "archives": [ @@ -3057,11 +10349,30 @@ "url": "https://dl.google.com/android/repository/build-tools_r29-rc1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29-rc1", "license": "android-sdk-preview-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/29.0.0-rc1", - "revision": "29.0.0-rc1" + "revision": "29.0.0-rc1", + "revision-details": { + "major:0": "29", + "micro:2": "0", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.0-rc2": { "archives": [ @@ -3084,11 +10395,30 @@ "url": "https://dl.google.com/android/repository/build-tools_r29-rc2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29-rc2", "license": "android-sdk-preview-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/29.0.0-rc2", - "revision": "29.0.0-rc2" + "revision": "29.0.0-rc2", + "revision-details": { + "major:0": "29", + "micro:2": "0", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.0-rc3": { "archives": [ @@ -3111,11 +10441,30 @@ "url": "https://dl.google.com/android/repository/build-tools_r29-rc3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29-rc3", "license": "android-sdk-preview-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/29.0.0-rc3", - "revision": "29.0.0-rc3" + "revision": "29.0.0-rc3", + "revision-details": { + "major:0": "29", + "micro:2": "0", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.1": { "archives": [ @@ -3138,11 +10487,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r29.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.1", - "revision": "29.0.1" + "revision": "29.0.1", + "revision-details": { + "major:0": "29", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.2": { "archives": [ @@ -3165,11 +10531,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r29.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.2", - "revision": "29.0.2" + "revision": "29.0.2", + "revision-details": { + "major:0": "29", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.3": { "archives": [ @@ -3192,11 +10575,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r29.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.3", - "revision": "29.0.3" + "revision": "29.0.3", + "revision-details": { + "major:0": "29", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "30.0.0": { "archives": [ @@ -3219,11 +10619,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r30-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 30", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.0", - "revision": "30.0.0" + "revision": "30.0.0", + "revision-details": { + "major:0": "30", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "30.0.1": { "archives": [ @@ -3246,11 +10663,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r30.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 30.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.1", - "revision": "30.0.1" + "revision": "30.0.1", + "revision-details": { + "major:0": "30", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "30.0.2": { "archives": [ @@ -3273,11 +10707,28 @@ "url": "https://dl.google.com/android/repository/efbaa277338195608aa4e3dbd43927e97f60218c.build-tools_r30.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 30.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.2", - "revision": "30.0.2" + "revision": "30.0.2", + "revision-details": { + "major:0": "30", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "30.0.3": { "archives": [ @@ -3300,11 +10751,28 @@ "url": "https://dl.google.com/android/repository/f6d24b187cc6bd534c6c37604205171784ac5621.build-tools_r30.0.3-macosx.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 30.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.3", - "revision": "30.0.3" + "revision": "30.0.3", + "revision-details": { + "major:0": "30", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "31.0.0": { "archives": [ @@ -3331,7 +10799,17 @@ "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/31.0.0", - "revision": "31.0.0" + "revision": "31.0.0", + "revision-details": { + "major:0": "31", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "32.0.0": { "archives": [ @@ -3358,7 +10836,17 @@ "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/32.0.0", - "revision": "32.0.0" + "revision": "32.0.0", + "revision-details": { + "major:0": "32", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "32.1.0-rc1": { "archives": [ @@ -3385,7 +10873,18 @@ "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/32.1.0-rc1", - "revision": "32.1.0-rc1" + "revision": "32.1.0-rc1", + "revision-details": { + "major:0": "32", + "micro:2": "0", + "minor:1": "1", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "33.0.0": { "archives": [ @@ -3412,7 +10911,54 @@ "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.0", - "revision": "33.0.0" + "revision": "33.0.0", + "revision-details": { + "major:0": "33", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "33.0.1": { + "archives": [ + { + "os": "linux", + "sha1": "fefb393b82814feb94f88147827cbc918cf992b0", + "size": 56003178, + "url": "https://dl.google.com/android/repository/build-tools_r33.0.1-linux.zip" + }, + { + "os": "macosx", + "sha1": "d091bee94295480891ca679e7b2004fe6198d05f", + "size": 60027237, + "url": "https://dl.google.com/android/repository/build-tools_r33.0.1-macosx.zip" + }, + { + "os": "windows", + "sha1": "710918f38f8fa7595320f4d29db5910770993f63", + "size": 55631116, + "url": "https://dl.google.com/android/repository/build-tools_r33.0.1-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 33.0.1", + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/33.0.1", + "revision": "33.0.1", + "revision-details": { + "major:0": "33", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "cmake": { @@ -3441,7 +10987,17 @@ "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.10.2.4988404", - "revision": "3.10.2" + "revision": "3.10.2", + "revision-details": { + "major:0": "3", + "micro:2": "2", + "minor:1": "10" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "3.18.1": { "archives": [ @@ -3468,7 +11024,17 @@ "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.18.1", - "revision": "3.18.1" + "revision": "3.18.1", + "revision-details": { + "major:0": "3", + "micro:2": "1", + "minor:1": "18" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "3.22.1": { "archives": [ @@ -3492,10 +11058,20 @@ } ], "displayName": "CMake 3.22.1", - "license": "android-sdk-preview-license", + "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.22.1", - "revision": "3.22.1" + "revision": "3.22.1", + "revision-details": { + "major:0": "3", + "micro:2": "1", + "minor:1": "22" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "3.6.4111459": { "archives": [ @@ -3522,7 +11098,17 @@ "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.6.4111459", - "revision": "3.6.4111459" + "revision": "3.6.4111459", + "revision-details": { + "major:0": "3", + "micro:2": "4111459", + "minor:1": "6" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "cmdline-tools": { @@ -3551,7 +11137,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/1.0", - "revision": "1.0" + "revision": "1.0", + "revision-details": { + "major:0": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "2.0": { "archives": [ @@ -3577,8 +11172,18 @@ "displayName": "Android SDK Command-line Tools", "license": "android-sdk-license", "name": "cmdline-tools", + "obsolete": "true", "path": "cmdline-tools/2.0", - "revision": "2.0" + "revision": "2.0", + "revision-details": { + "major:0": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "2.1": { "archives": [ @@ -3605,7 +11210,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/2.1", - "revision": "2.1" + "revision": "2.1", + "revision-details": { + "major:0": "2", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "3.0": { "archives": [ @@ -3632,7 +11246,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/3.0", - "revision": "3.0" + "revision": "3.0", + "revision-details": { + "major:0": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "4.0": { "archives": [ @@ -3659,7 +11282,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/4.0", - "revision": "4.0" + "revision": "4.0", + "revision-details": { + "major:0": "4", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "5.0": { "archives": [ @@ -3686,7 +11318,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/5.0", - "revision": "5.0" + "revision": "5.0", + "revision-details": { + "major:0": "5", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "6.0": { "archives": [ @@ -3713,7 +11354,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/6.0", - "revision": "6.0" + "revision": "6.0", + "revision-details": { + "major:0": "6", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "7.0": { "archives": [ @@ -3740,120 +11390,189 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/7.0", - "revision": "7.0" - } - }, - "emulator": { - "31.2.10": { + "revision": "7.0", + "revision-details": { + "major:0": "7", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "8.0": { "archives": [ { "os": "linux", - "sha1": "1f2c3ddeb2c9ac4feef5946098a0a710d08e9c6d", - "size": 276337904, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-8420304.zip" - }, - { - "os": "windows", - "sha1": "206491b5c4e531b2c66dc80402702b9fa1a64c2a", - "size": 345300871, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-8420304.zip" + "sha1": "09b65ebc5aa9c5011fec9416d22711ce7ffc2260", + "size": 120916547, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip" }, { "os": "macosx", - "sha1": "677b6a00c145eb8bf4306daeb2231c8efd507177", - "size": 313876814, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-8420304.zip" + "sha1": "089eedfc62371040f9e027835d5114178fc0e658", + "size": 120916533, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-9123335_latest.zip" + }, + { + "os": "windows", + "sha1": "d1511ce5b61e5988b3de4b83062f0a570671074f", + "size": 120895407, + "url": "https://dl.google.com/android/repository/commandlinetools-win-9123335_latest.zip" } ], + "displayName": "Android SDK Command-line Tools", + "license": "android-sdk-license", + "name": "cmdline-tools", + "path": "cmdline-tools/8.0", + "revision": "8.0", + "revision-details": { + "major:0": "8", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + } + }, + "emulator": { + "31.3.10": { + "archives": [ + { + "os": "macosx", + "sha1": "4a35a2702f9138653cd1b67d04e01ffa65fb37bc", + "size": 347308456, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-8807927.zip" + }, + { + "os": "linux", + "sha1": "43df6ed553b89e1553d588251526aae8f79da214", + "size": 293822881, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-8807927.zip" + }, + { + "os": "windows", + "sha1": "52f8bfa4a09074e607d393302fe8a627846a18e9", + "size": 380246403, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-8807927.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android Emulator", "license": "android-sdk-license", "name": "emulator", "path": "emulator", - "revision": "31.2.10" + "revision": "31.3.10", + "revision-details": { + "major:0": "31", + "micro:2": "10", + "minor:1": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, - "31.3.8": { + "31.3.14": { "archives": [ - { - "os": "macosx", - "sha1": "7214e8384c97a7c9875142149d3bf9c940e9b5a0", - "size": 347222379, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-8598121.zip" - }, { "os": "linux", - "sha1": "0f781977a6cc5377b64444121ff75a513841a4fa", - "size": 293782881, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-8598121.zip" + "sha1": "b5ab96ebffc6ea6816a5b0e9474859463b21ab78", + "size": 293826836, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-9322596.zip" }, { "os": "windows", - "sha1": "b4f30bad4e68da41cc9bd44965259b2111a011a1", - "size": 380151866, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-8598121.zip" + "sha1": "632eba430f67abeddcf15ceb0a872b25fdbb7e62", + "size": 381130167, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-9322596.zip" + }, + { + "os": "macosx", + "sha1": "00e8685beffbe19f803cd5d698fbe6406b5ee6f3", + "size": 347313356, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-9322596.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Android Emulator", + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "31.3.14", + "revision-details": { + "major:0": "31", + "micro:2": "14", + "minor:1": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "32.1.8": { + "archives": [ + { + "os": "macosx", + "sha1": "13cadd038b401fdfa04e4af153a7f696ccd422cc", + "size": 309314692, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-9310560.zip" + }, + { + "os": "linux", + "sha1": "7d82689a73aacdd56684d7134dc88cc3537fb911", + "size": 270158359, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-9310560.zip" + }, + { + "os": "windows", + "sha1": "8324aeb3bd74a214978252c51574b40cdb56b4ba", + "size": 333001267, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-9310560.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android Emulator", "license": "android-sdk-preview-license", "name": "emulator", "path": "emulator", - "revision": "31.3.8" - }, - "31.3.9": { - "archives": [ - { - "os": "macosx", - "sha1": "6e7b549113252728cfe0992d58e8cb1790dce9d6", - "size": 347241742, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-8700579.zip" - }, - { - "os": "linux", - "sha1": "1c1a7ef65476d3de34f19455a0093cb68e8e90f7", - "size": 293801439, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-8700579.zip" - }, - { - "os": "windows", - "sha1": "ea834211b199a7fcf6b6758a53c4594d01b44ab9", - "size": 380168712, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-8700579.zip" + "revision": "32.1.8", + "revision-details": { + "major:0": "32", + "micro:2": "8", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" } - ], - "displayName": "Android Emulator", - "license": "android-sdk-license", - "name": "emulator", - "path": "emulator", - "revision": "31.3.9" + } } }, "extras": { - "1.1": { - "archives": [ - { - "os": "linux", - "sha1": "18632007ecb843b4fc69babd521a9b061868534b", - "size": 1307393, - "url": "https://dl.google.com/android/repository/desktop-head-unit-linux_r01.1.zip" - }, - { - "os": "macosx", - "sha1": "ccb64105888ba61ab06f20ad1ba97c71d440a421", - "size": 2299061, - "url": "https://dl.google.com/android/repository/desktop-head-unit-macosx_r01.1.zip" - }, - { - "os": "windows", - "sha1": "f26d80a84020b40e24f8a99873dea6a9c7978f10", - "size": 2615480, - "url": "https://dl.google.com/android/repository/desktop-head-unit-windows_r01.1.zip" - } - ], - "displayName": "Android Auto Desktop Head Unit Emulator", - "license": "android-sdk-license", - "name": "extras", - "path": "extras/google/auto", - "revision": "1.1" - }, "2.0": { "archives": [ { @@ -3879,7 +11598,52 @@ "license": "android-sdk-license", "name": "extras", "path": "extras/google/auto", - "revision": "2.0" + "revision": "2.0", + "revision-details": { + "major:0": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "2.1": { + "archives": [ + { + "os": "macosx", + "sha1": "4f8a3d3e32b27de1fc190d149039842e76a55bdd", + "size": 7797329, + "url": "https://dl.google.com/android/repository/desktop-head-unit-darwin-x64_r02.1.zip" + }, + { + "os": "linux", + "sha1": "5d87eb87a1421e59d528eac1f5cdd406c0b39f51", + "size": 6927985, + "url": "https://dl.google.com/android/repository/desktop-head-unit-linux-x64_r02.1.zip" + }, + { + "os": "windows", + "sha1": "c27bf84e59dda7b79315b6ca2a314063feffd6ac", + "size": 7012059, + "url": "https://dl.google.com/android/repository/desktop-head-unit-windows-x64_r02.1.zip" + } + ], + "displayName": "Android Auto Desktop Head Unit Emulator", + "license": "android-sdk-license", + "name": "extras", + "path": "extras/google/auto", + "revision": "2.1", + "revision-details": { + "major:0": "2", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "ndk": { @@ -3904,11 +11668,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r16b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 16.1.4479499", "license": "android-sdk-license", "name": "ndk", "path": "ndk/16.1.4479499", - "revision": "16.1.4479499" + "revision": "16.1.4479499", + "revision-details": { + "major:0": "16", + "micro:2": "4479499", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "17.2.4988734": { "archives": [ @@ -3931,11 +11712,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r17c-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 17.2.4988734", "license": "android-sdk-license", "name": "ndk", "path": "ndk/17.2.4988734", - "revision": "17.2.4988734" + "revision": "17.2.4988734", + "revision-details": { + "major:0": "17", + "micro:2": "4988734", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "18.1.5063045": { "archives": [ @@ -3958,11 +11756,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r18b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 18.1.5063045", "license": "android-sdk-license", "name": "ndk", "path": "ndk/18.1.5063045", - "revision": "18.1.5063045" + "revision": "18.1.5063045", + "revision-details": { + "major:0": "18", + "micro:2": "5063045", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.0.5232133": { "archives": [ @@ -3985,11 +11800,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 19.0.5232133", "license": "android-sdk-license", "name": "ndk", + "obsolete": "true", "path": "ndk/19.0.5232133", - "revision": "19.0.5232133" + "revision": "19.0.5232133", + "revision-details": { + "major:0": "19", + "micro:2": "5232133", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.2.5345600": { "archives": [ @@ -4012,11 +11845,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r19c-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 19.2.5345600", "license": "android-sdk-license", "name": "ndk", "path": "ndk/19.2.5345600", - "revision": "19.2.5345600" + "revision": "19.2.5345600", + "revision-details": { + "major:0": "19", + "micro:2": "5345600", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.5392854-rc2": { "archives": [ @@ -4039,11 +11889,30 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 20.0.5392854", "license": "android-sdk-preview-license", "name": "ndk", + "obsolete": "true", "path": "ndk/20.0.5392854", - "revision": "20.0.5392854-rc2" + "revision": "20.0.5392854-rc2", + "revision-details": { + "major:0": "20", + "micro:2": "5392854", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.5471264-rc3": { "archives": [ @@ -4066,11 +11935,30 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 20.0.5471264", "license": "android-sdk-preview-license", "name": "ndk", + "obsolete": "true", "path": "ndk/20.0.5471264", - "revision": "20.0.5471264-rc3" + "revision": "20.0.5471264-rc3", + "revision-details": { + "major:0": "20", + "micro:2": "5471264", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.5594570": { "archives": [ @@ -4093,11 +11981,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 20.0.5594570", "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.0.5594570", - "revision": "20.0.5594570" + "revision": "20.0.5594570", + "revision-details": { + "major:0": "20", + "micro:2": "5594570", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.1.5948944": { "archives": [ @@ -4120,11 +12025,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 20.1.5948944", "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.1.5948944", - "revision": "20.1.5948944" + "revision": "20.1.5948944", + "revision-details": { + "major:0": "20", + "micro:2": "5948944", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.6011959-rc2": { "archives": [ @@ -4147,11 +12069,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.0.6011959", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.0.6011959", - "revision": "21.0.6011959-rc2" + "revision": "21.0.6011959-rc2", + "revision-details": { + "major:0": "21", + "micro:2": "6011959", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.6113669": { "archives": [ @@ -4174,11 +12114,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.0.6113669", "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.0.6113669", - "revision": "21.0.6113669" + "revision": "21.0.6113669", + "revision-details": { + "major:0": "21", + "micro:2": "6113669", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6210238-rc1": { "archives": [ @@ -4201,11 +12158,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.1.6210238", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6210238", - "revision": "21.1.6210238-rc1" + "revision": "21.1.6210238-rc1", + "revision-details": { + "major:0": "21", + "micro:2": "6210238", + "minor:1": "1", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6273396-rc2": { "archives": [ @@ -4228,11 +12203,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.1.6273396", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6273396", - "revision": "21.1.6273396-rc2" + "revision": "21.1.6273396-rc2", + "revision-details": { + "major:0": "21", + "micro:2": "6273396", + "minor:1": "1", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6352462": { "archives": [ @@ -4255,11 +12248,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.1.6352462", "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.1.6352462", - "revision": "21.1.6352462" + "revision": "21.1.6352462", + "revision-details": { + "major:0": "21", + "micro:2": "6352462", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6363665-rc3": { "archives": [ @@ -4282,11 +12292,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.1.6363665", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6363665", - "revision": "21.1.6363665-rc3" + "revision": "21.1.6363665-rc3", + "revision-details": { + "major:0": "21", + "micro:2": "6363665", + "minor:1": "1", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.2.6472646": { "archives": [ @@ -4309,11 +12337,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21c-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.2.6472646", "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.2.6472646", - "revision": "21.2.6472646" + "revision": "21.2.6472646", + "revision-details": { + "major:0": "21", + "micro:2": "6472646", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.3.6528147": { "archives": [ @@ -4336,11 +12381,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21d-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.3.6528147", "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.3.6528147", - "revision": "21.3.6528147" + "revision": "21.3.6528147", + "revision-details": { + "major:0": "21", + "micro:2": "6528147", + "minor:1": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.4.7075529": { "archives": [ @@ -4363,11 +12425,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21e-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.4.7075529", "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.4.7075529", - "revision": "21.4.7075529" + "revision": "21.4.7075529", + "revision-details": { + "major:0": "21", + "micro:2": "7075529", + "minor:1": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.0.6917172-rc1": { "archives": [ @@ -4390,11 +12469,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 22.0.6917172", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/22.0.6917172", - "revision": "22.0.6917172-rc1" + "revision": "22.0.6917172-rc1", + "revision-details": { + "major:0": "22", + "micro:2": "6917172", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.0.7026061": { "archives": [ @@ -4417,11 +12514,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r22-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 22.0.7026061", "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.0.7026061", - "revision": "22.0.7026061" + "revision": "22.0.7026061", + "revision-details": { + "major:0": "22", + "micro:2": "7026061", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.1.7171670": { "archives": [ @@ -4444,11 +12558,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r22b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 22.1.7171670", "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.1.7171670", - "revision": "22.1.7171670" + "revision": "22.1.7171670", + "revision-details": { + "major:0": "22", + "micro:2": "7171670", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7123448-rc1": { "archives": [ @@ -4471,11 +12602,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta1-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7123448", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7123448", - "revision": "23.0.7123448-rc1" + "revision": "23.0.7123448-rc1", + "revision-details": { + "major:0": "23", + "micro:2": "7123448", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7196353-rc2": { "archives": [ @@ -4498,11 +12647,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7196353", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7196353", - "revision": "23.0.7196353-rc2" + "revision": "23.0.7196353-rc2", + "revision-details": { + "major:0": "23", + "micro:2": "7196353", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7272597-rc3": { "archives": [ @@ -4525,11 +12692,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta3-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7272597", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7272597", - "revision": "23.0.7272597-rc3" + "revision": "23.0.7272597-rc3", + "revision-details": { + "major:0": "23", + "micro:2": "7272597", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7344513-rc4": { "archives": [ @@ -4552,11 +12737,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7344513", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7344513", - "revision": "23.0.7344513-rc4" + "revision": "23.0.7344513-rc4", + "revision-details": { + "major:0": "23", + "micro:2": "7344513", + "minor:1": "0", + "preview:3": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7421159-rc5": { "archives": [ @@ -4579,11 +12782,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta5-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7421159", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7421159", - "revision": "23.0.7421159-rc5" + "revision": "23.0.7421159-rc5", + "revision-details": { + "major:0": "23", + "micro:2": "7421159", + "minor:1": "0", + "preview:3": "5" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7530507-rc6": { "archives": [ @@ -4606,11 +12827,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta6-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7530507", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7530507", - "revision": "23.0.7530507-rc6" + "revision": "23.0.7530507-rc6", + "revision-details": { + "major:0": "23", + "micro:2": "7530507", + "minor:1": "0", + "preview:3": "6" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7599858": { "archives": [ @@ -4633,11 +12872,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7599858", "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.0.7599858", - "revision": "23.0.7599858" + "revision": "23.0.7599858", + "revision-details": { + "major:0": "23", + "micro:2": "7599858", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.1.7779620": { "archives": [ @@ -4660,11 +12916,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23b-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.1.7779620", "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.1.7779620", - "revision": "23.1.7779620" + "revision": "23.1.7779620", + "revision-details": { + "major:0": "23", + "micro:2": "7779620", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.2.8568313": { "archives": [ @@ -4687,11 +12960,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23c-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.2.8568313", "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.2.8568313", - "revision": "23.2.8568313" + "revision": "23.2.8568313", + "revision-details": { + "major:0": "23", + "micro:2": "8568313", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.7856742-rc1": { "archives": [ @@ -4714,11 +13004,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r24-beta1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 24.0.7856742", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7856742", - "revision": "24.0.7856742-rc1" + "revision": "24.0.7856742-rc1", + "revision-details": { + "major:0": "24", + "micro:2": "7856742", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.7956693-rc2": { "archives": [ @@ -4741,11 +13049,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r24-beta2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 24.0.7956693", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7956693", - "revision": "24.0.7956693-rc2" + "revision": "24.0.7956693-rc2", + "revision-details": { + "major:0": "24", + "micro:2": "7956693", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.8079956-rc3": { "archives": [ @@ -4768,11 +13094,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r24-rc1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 24.0.8079956", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.8079956", - "revision": "24.0.8079956-rc3" + "revision": "24.0.8079956-rc3", + "revision-details": { + "major:0": "24", + "micro:2": "8079956", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.8215888": { "archives": [ @@ -4795,11 +13139,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r24-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 24.0.8215888", "license": "android-sdk-license", "name": "ndk", "path": "ndk/24.0.8215888", - "revision": "24.0.8215888" + "revision": "24.0.8215888", + "revision-details": { + "major:0": "24", + "micro:2": "8215888", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.8151533-rc1": { "archives": [ @@ -4822,11 +13183,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r25-beta1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 25.0.8151533", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8151533", - "revision": "25.0.8151533-rc1" + "revision": "25.0.8151533-rc1", + "revision-details": { + "major:0": "25", + "micro:2": "8151533", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.8221429-rc2": { "archives": [ @@ -4849,11 +13228,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r25-beta2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 25.0.8221429", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8221429", - "revision": "25.0.8221429-rc2" + "revision": "25.0.8221429-rc2", + "revision-details": { + "major:0": "25", + "micro:2": "8221429", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.8355429-rc3": { "archives": [ @@ -4876,11 +13273,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r25-beta3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 25.0.8355429", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8355429", - "revision": "25.0.8355429-rc3" + "revision": "25.0.8355429-rc3", + "revision-details": { + "major:0": "25", + "micro:2": "8355429", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.8528842-rc4": { "archives": [ @@ -4903,11 +13318,117 @@ "url": "https://dl.google.com/android/repository/android-ndk-r25-beta4-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 25.0.8528842", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8528842", - "revision": "25.0.8528842-rc4" + "revision": "25.0.8528842-rc4", + "revision-details": { + "major:0": "25", + "micro:2": "8528842", + "minor:1": "0", + "preview:3": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "25.0.8775105": { + "archives": [ + { + "os": "macosx", + "sha1": "8c54514c62f635dbbc161e30e21f16bcd22526df", + "size": 716557039, + "url": "https://dl.google.com/android/repository/android-ndk-r25-darwin.zip" + }, + { + "os": "linux", + "sha1": "9fce956edb6abd5aca42acf6bbfb21a90a67f75b", + "size": 530938532, + "url": "https://dl.google.com/android/repository/android-ndk-r25-linux.zip" + }, + { + "os": "windows", + "sha1": "1da93e7da5803dd8ef47e9283ec2c7b98d34b8da", + "size": 467387858, + "url": "https://dl.google.com/android/repository/android-ndk-r25-windows.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "NDK (Side by side) 25.0.8775105", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/25.0.8775105", + "revision": "25.0.8775105", + "revision-details": { + "major:0": "25", + "micro:2": "8775105", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "25.1.8937393": { + "archives": [ + { + "os": "macosx", + "sha1": "248f96de6713cbec8707ee2262d3cf08d14d9fde", + "size": 716592117, + "url": "https://dl.google.com/android/repository/android-ndk-r25b-darwin.zip" + }, + { + "os": "linux", + "sha1": "e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb", + "size": 530975885, + "url": "https://dl.google.com/android/repository/android-ndk-r25b-linux.zip" + }, + { + "os": "windows", + "sha1": "b2e9b5ab2e1434a65ffd85780891878cf5c6fd92", + "size": 467422601, + "url": "https://dl.google.com/android/repository/android-ndk-r25b-windows.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "NDK (Side by side) 25.1.8937393", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/25.1.8937393", + "revision": "25.1.8937393", + "revision-details": { + "major:0": "25", + "micro:2": "8937393", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "ndk-bundle": { @@ -4932,11 +13453,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r16b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "16.1.4479499" + "revision": "16.1.4479499", + "revision-details": { + "major:0": "16", + "micro:2": "4479499", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "17.2.4988734": { "archives": [ @@ -4959,11 +13497,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r17c-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "17.2.4988734" + "revision": "17.2.4988734", + "revision-details": { + "major:0": "17", + "micro:2": "4988734", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "18.1.5063045": { "archives": [ @@ -4986,11 +13541,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r18b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "18.1.5063045" + "revision": "18.1.5063045", + "revision-details": { + "major:0": "18", + "micro:2": "5063045", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.0.5232133": { "archives": [ @@ -5013,11 +13585,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", + "obsolete": "true", "path": "ndk-bundle", - "revision": "19.0.5232133" + "revision": "19.0.5232133", + "revision-details": { + "major:0": "19", + "micro:2": "5232133", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.2.5345600": { "archives": [ @@ -5040,11 +13630,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r19c-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "19.2.5345600" + "revision": "19.2.5345600", + "revision-details": { + "major:0": "19", + "micro:2": "5345600", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.5392854-rc2": { "archives": [ @@ -5067,11 +13674,30 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", + "obsolete": "true", "path": "ndk-bundle", - "revision": "20.0.5392854-rc2" + "revision": "20.0.5392854-rc2", + "revision-details": { + "major:0": "20", + "micro:2": "5392854", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.5471264-rc3": { "archives": [ @@ -5094,11 +13720,30 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", + "obsolete": "true", "path": "ndk-bundle", - "revision": "20.0.5471264-rc3" + "revision": "20.0.5471264-rc3", + "revision-details": { + "major:0": "20", + "micro:2": "5471264", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.5594570": { "archives": [ @@ -5121,11 +13766,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "20.0.5594570" + "revision": "20.0.5594570", + "revision-details": { + "major:0": "20", + "micro:2": "5594570", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.1.5948944": { "archives": [ @@ -5148,11 +13810,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "20.1.5948944" + "revision": "20.1.5948944", + "revision-details": { + "major:0": "20", + "micro:2": "5948944", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.6011959-rc2": { "archives": [ @@ -5175,11 +13854,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.0.6011959-rc2" + "revision": "21.0.6011959-rc2", + "revision-details": { + "major:0": "21", + "micro:2": "6011959", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.6113669": { "archives": [ @@ -5202,11 +13899,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.0.6113669" + "revision": "21.0.6113669", + "revision-details": { + "major:0": "21", + "micro:2": "6113669", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6210238-rc1": { "archives": [ @@ -5229,11 +13943,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.1.6210238-rc1" + "revision": "21.1.6210238-rc1", + "revision-details": { + "major:0": "21", + "micro:2": "6210238", + "minor:1": "1", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6273396-rc2": { "archives": [ @@ -5256,11 +13988,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.1.6273396-rc2" + "revision": "21.1.6273396-rc2", + "revision-details": { + "major:0": "21", + "micro:2": "6273396", + "minor:1": "1", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6352462": { "archives": [ @@ -5283,11 +14033,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.1.6352462" + "revision": "21.1.6352462", + "revision-details": { + "major:0": "21", + "micro:2": "6352462", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6363665-rc3": { "archives": [ @@ -5310,11 +14077,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.1.6363665-rc3" + "revision": "21.1.6363665-rc3", + "revision-details": { + "major:0": "21", + "micro:2": "6363665", + "minor:1": "1", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.2.6472646": { "archives": [ @@ -5337,11 +14122,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21c-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.2.6472646" + "revision": "21.2.6472646", + "revision-details": { + "major:0": "21", + "micro:2": "6472646", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.3.6528147": { "archives": [ @@ -5364,11 +14166,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21d-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.3.6528147" + "revision": "21.3.6528147", + "revision-details": { + "major:0": "21", + "micro:2": "6528147", + "minor:1": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.4.7075529": { "archives": [ @@ -5391,11 +14210,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21e-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.4.7075529" + "revision": "21.4.7075529", + "revision-details": { + "major:0": "21", + "micro:2": "7075529", + "minor:1": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.0.6917172-rc1": { "archives": [ @@ -5418,11 +14254,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "22.0.6917172-rc1" + "revision": "22.0.6917172-rc1", + "revision-details": { + "major:0": "22", + "micro:2": "6917172", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.0.7026061": { "archives": [ @@ -5445,11 +14299,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r22-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "22.0.7026061" + "revision": "22.0.7026061", + "revision-details": { + "major:0": "22", + "micro:2": "7026061", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.1.7171670": { "archives": [ @@ -5472,11 +14343,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r22b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "22.1.7171670" + "revision": "22.1.7171670", + "revision-details": { + "major:0": "22", + "micro:2": "7171670", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7123448-rc1": { "archives": [ @@ -5499,11 +14387,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta1-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "23.0.7123448-rc1" + "revision": "23.0.7123448-rc1", + "revision-details": { + "major:0": "23", + "micro:2": "7123448", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7196353-rc2": { "archives": [ @@ -5526,11 +14432,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "23.0.7196353-rc2" + "revision": "23.0.7196353-rc2", + "revision-details": { + "major:0": "23", + "micro:2": "7196353", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7272597-rc3": { "archives": [ @@ -5553,11 +14477,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta3-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "23.0.7272597-rc3" + "revision": "23.0.7272597-rc3", + "revision-details": { + "major:0": "23", + "micro:2": "7272597", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7344513-rc4": { "archives": [ @@ -5580,11 +14522,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "23.0.7344513-rc4" + "revision": "23.0.7344513-rc4", + "revision-details": { + "major:0": "23", + "micro:2": "7344513", + "minor:1": "0", + "preview:3": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "patcher": { @@ -5601,36 +14561,54 @@ "license": "android-sdk-license", "name": "patcher", "path": "patcher/v4", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "platform-tools": { - "33.0.2": { + "33.0.3": { "archives": [ { "os": "macosx", - "sha1": "9b5661e0c18a2e5b6935e2b96bcc7be580cd6dcd", - "size": 13038676, - "url": "https://dl.google.com/android/repository/platform-tools_r33.0.2-darwin.zip" + "sha1": "250da3216e4c93ccd2612dcec0b64c2668354b09", + "size": 12767128, + "url": "https://dl.google.com/android/repository/platform-tools_r33.0.3-darwin.zip" }, { "os": "linux", - "sha1": "6bf4f747ad929b02378b44ce083b4502d26109c7", - "size": 7406632, - "url": "https://dl.google.com/android/repository/platform-tools_r33.0.2-linux.zip" + "sha1": "deb43a0f9eaccd16a47937367ef3b53db3db8d10", + "size": 7505569, + "url": "https://dl.google.com/android/repository/platform-tools_r33.0.3-linux.zip" }, { "os": "windows", - "sha1": "2d7599f59b54f02c4ecd33d656091a3c1e55ad9c", - "size": 6304111, - "url": "https://dl.google.com/android/repository/platform-tools_r33.0.2-windows.zip" + "sha1": "6028a80149c0ccde2db22d69e7fe84a352d852a2", + "size": 5642796, + "url": "https://dl.google.com/android/repository/platform-tools_r33.0.3-windows.zip" } ], "displayName": "Android SDK Platform-Tools", "license": "android-sdk-license", "name": "platform-tools", "path": "platform-tools", - "revision": "33.0.2" + "revision": "33.0.3", + "revision-details": { + "major:0": "33", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "platforms": { @@ -5647,7 +14625,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-10", - "revision": "10" + "revision": "10", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "10", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "11": { "archives": [ @@ -5662,7 +14656,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-11", - "revision": "11" + "revision": "11", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "11", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "12": { "archives": [ @@ -5677,7 +14687,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-12", - "revision": "12" + "revision": "12", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "12", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "13": { "archives": [ @@ -5692,7 +14718,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-13", - "revision": "13" + "revision": "13", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "13", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "14": { "archives": [ @@ -5707,7 +14749,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-14", - "revision": "14" + "revision": "14", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "api-level:0": "14", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "15": { "archives": [ @@ -5722,7 +14780,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-15", - "revision": "15" + "revision": "15", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "api-level:0": "15", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "16": { "archives": [ @@ -5737,7 +14811,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-16", - "revision": "16" + "revision": "16", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "api-level:0": "16", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "17": { "archives": [ @@ -5752,7 +14842,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-17", - "revision": "17" + "revision": "17", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "17", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "18": { "archives": [ @@ -5767,7 +14873,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-18", - "revision": "18" + "revision": "18", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "18", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "19": { "archives": [ @@ -5782,7 +14904,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-19", - "revision": "19" + "revision": "19", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "api-level:0": "19", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "2": { "archives": [ @@ -5808,8 +14946,25 @@ "displayName": "Android SDK Platform 2", "license": "android-sdk-license", "name": "platforms", + "obsolete": "true", "path": "platforms/android-2", - "revision": "2" + "revision": "2", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "2", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "20": { "archives": [ @@ -5824,7 +14979,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-20", - "revision": "20" + "revision": "20", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "20", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "21": { "archives": [ @@ -5839,7 +15010,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-21", - "revision": "21" + "revision": "21", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "21", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "22": { "archives": [ @@ -5854,7 +15041,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-22", - "revision": "22" + "revision": "22", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "22", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "14" + } + } + } }, "23": { "archives": [ @@ -5869,7 +15072,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-23", - "revision": "23" + "revision": "23", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "23", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "16" + } + } + } }, "24": { "archives": [ @@ -5884,7 +15103,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-24", - "revision": "24" + "revision": "24", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "24", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "16" + } + } + } }, "25": { "archives": [ @@ -5899,7 +15134,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-25", - "revision": "25" + "revision": "25", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "25", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "16" + } + } + } }, "26": { "archives": [ @@ -5914,7 +15165,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-26", - "revision": "26" + "revision": "26", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "26", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "27": { "archives": [ @@ -5929,7 +15196,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-27", - "revision": "27" + "revision": "27", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "27", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "28": { "archives": [ @@ -5944,7 +15227,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-28", - "revision": "28" + "revision": "28", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "api-level:0": "28", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "29": { "archives": [ @@ -5959,7 +15258,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-29", - "revision": "29" + "revision": "29", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "api-level:0": "29", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "3": { "archives": [ @@ -5985,8 +15300,25 @@ "displayName": "Android SDK Platform 3", "license": "android-sdk-license", "name": "platforms", + "obsolete": "true", "path": "platforms/android-3", - "revision": "3" + "revision": "3", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "api-level:0": "3", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "30": { "archives": [ @@ -6001,7 +15333,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-30", - "revision": "30" + "revision": "30", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "30", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "31": { "archives": [ @@ -6016,7 +15364,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-31", - "revision": "31" + "revision": "31", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "31", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "32": { "archives": [ @@ -6031,22 +15395,54 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-32", - "revision": "32" + "revision": "32", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "32", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "33": { "archives": [ { "os": "all", - "sha1": "298f5800e37f3c089ab0eb58d4f6aef4058b689b", - "size": 67324871, - "url": "https://dl.google.com/android/repository/platform-33_r01.zip" + "sha1": "eef99bd4617e80da85187a183eba356d787100d9", + "size": 67334130, + "url": "https://dl.google.com/android/repository/platform-33_r02.zip" } ], "displayName": "Android SDK Platform 33", "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-33", - "revision": "33" + "revision": "33", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "33", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "4": { "archives": [ @@ -6072,8 +15468,25 @@ "displayName": "Android SDK Platform 4", "license": "android-sdk-license", "name": "platforms", + "obsolete": "true", "path": "platforms/android-4", - "revision": "4" + "revision": "4", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "4", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "5": { "archives": [ @@ -6099,8 +15512,25 @@ "displayName": "Android SDK Platform 5", "license": "android-sdk-license", "name": "platforms", + "obsolete": "true", "path": "platforms/android-5", - "revision": "5" + "revision": "5", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "5", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "6": { "archives": [ @@ -6126,8 +15556,25 @@ "displayName": "Android SDK Platform 6", "license": "android-sdk-license", "name": "platforms", + "obsolete": "true", "path": "platforms/android-6", - "revision": "6" + "revision": "6", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "6", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "7": { "archives": [ @@ -6142,7 +15589,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-7", - "revision": "7" + "revision": "7", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "7", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "8": { "archives": [ @@ -6157,7 +15620,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-8", - "revision": "8" + "revision": "8", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "8", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "9": { "archives": [ @@ -6172,22 +15651,53 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-9", - "revision": "9" + "revision": "9", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "9", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "TiramisuPrivacySandbox": { "archives": [ { "os": "all", - "sha1": "8dd74a564f71c8381f5230682c5da291d230cc81", - "size": 67918949, - "url": "https://dl.google.com/android/repository/platform-TiramisuPrivacySandbox_r03.zip" + "sha1": "07f3eb84b8f237e61744967d7aee1225efba25e6", + "size": 67975400, + "url": "https://dl.google.com/android/repository/platform-TiramisuPrivacySandbox_r08.zip" } ], "displayName": "Android SDK Platform TiramisuPrivacySandbox", "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-TiramisuPrivacySandbox", - "revision": "TiramisuPrivacySandbox" + "revision": "TiramisuPrivacySandbox", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "api-level:0": "33", + "codename:1": "TiramisuPrivacySandbox", + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } } }, "skiaparser": { @@ -6216,7 +15726,15 @@ "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/3", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "3": { "archives": [ @@ -6243,7 +15761,15 @@ "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/2", - "revision": "3" + "revision": "3", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "6": { "archives": [ @@ -6270,7 +15796,15 @@ "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/1", - "revision": "6" + "revision": "6", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "sources": { @@ -6286,8 +15820,20 @@ "displayName": "Sources for Android 14", "license": "android-sdk-license", "name": "sources", + "obsolete": "true", "path": "sources/android-14", - "revision": "14" + "revision": "14", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "14", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "15": { "archives": [ @@ -6302,7 +15848,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-15", - "revision": "15" + "revision": "15", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "15", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "16": { "archives": [ @@ -6317,7 +15874,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-16", - "revision": "16" + "revision": "16", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "16", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "17": { "archives": [ @@ -6332,7 +15900,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-17", - "revision": "17" + "revision": "17", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "17", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "18": { "archives": [ @@ -6347,7 +15926,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-18", - "revision": "18" + "revision": "18", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "18", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "19": { "archives": [ @@ -6362,7 +15952,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-19", - "revision": "19" + "revision": "19", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "19", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "20": { "archives": [ @@ -6377,7 +15978,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-20", - "revision": "20" + "revision": "20", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "20", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "21": { "archives": [ @@ -6392,7 +16004,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-21", - "revision": "21" + "revision": "21", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "21", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "22": { "archives": [ @@ -6407,7 +16030,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-22", - "revision": "22" + "revision": "22", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "22", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "23": { "archives": [ @@ -6422,7 +16056,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-23", - "revision": "23" + "revision": "23", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "23", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "24": { "archives": [ @@ -6437,7 +16082,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-24", - "revision": "24" + "revision": "24", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "24", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "25": { "archives": [ @@ -6452,7 +16108,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-25", - "revision": "25" + "revision": "25", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "25", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "26": { "archives": [ @@ -6467,7 +16134,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-26", - "revision": "26" + "revision": "26", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "26", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "27": { "archives": [ @@ -6482,7 +16160,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-27", - "revision": "27" + "revision": "27", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "27", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "28": { "archives": [ @@ -6497,7 +16186,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-28", - "revision": "28" + "revision": "28", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "28", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "29": { "archives": [ @@ -6512,7 +16212,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-29", - "revision": "29" + "revision": "29", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "29", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "30": { "archives": [ @@ -6527,7 +16238,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-30", - "revision": "30" + "revision": "30", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "30", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "31": { "archives": [ @@ -6542,7 +16264,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-31", - "revision": "31" + "revision": "31", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "31", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "32": { "archives": [ @@ -6557,7 +16290,44 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-32", - "revision": "32" + "revision": "32", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "32", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } + }, + "33": { + "archives": [ + { + "os": "all", + "sha1": "dd9819363bb213e378bb9d84b4c5fe8d8091c219", + "size": 49205616, + "url": "https://dl.google.com/android/repository/sources-33_r01.zip" + } + ], + "displayName": "Sources for Android 33", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-33", + "revision": "33", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "33", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } } }, "tools": { @@ -6582,11 +16352,42 @@ "url": "https://dl.google.com/android/repository/sdk-tools-windows-4333796.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + } + }, + "dependency:2": { + "element-attributes": { + "path": "platform-tools" + }, + "min-revision:0": { + "major:0": "20" + } + } + }, "displayName": "Android SDK Tools", "license": "android-sdk-license", "name": "tools", + "obsolete": "true", "path": "tools", - "revision": "26.1.1" + "revision": "26.1.1", + "revision-details": { + "major:0": "26", + "micro:2": "1", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } } } diff --git a/pkgs/development/mobile/androidenv/test-suite.nix b/pkgs/development/mobile/androidenv/test-suite.nix new file mode 100644 index 000000000000..d063b73ccb40 --- /dev/null +++ b/pkgs/development/mobile/androidenv/test-suite.nix @@ -0,0 +1,16 @@ +{ stdenv, callPackage }: +let + examples-shell = callPackage ./examples/shell.nix {}; +in +stdenv.mkDerivation { + name = "androidenv-test-suite"; + + src = ./.; + + dontConfigure = true; + dontBuild = true; + + passthru.tests = { } // examples-shell.passthru.tests; + + meta.timeout = 60; +} diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix index f535672d35ea..091b94489479 100644 --- a/pkgs/development/mobile/androidenv/tools.nix +++ b/pkgs/development/mobile/androidenv/tools.nix @@ -1,26 +1,42 @@ -{deployAndroidPackage, requireFile, lib, packages, toolsVersion, autoPatchelfHook, makeWrapper, os, pkgs, pkgs_i686, postInstall ? ""}: +{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, postInstall}: -if toolsVersion == "26.0.1" then import ./tools/26.nix { - inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall; - package = { - name = "tools"; - path = "tools"; - revision = "26.0.1"; - archives = { - linux = requireFile { - url = "https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip"; - sha256 = "185yq7qwxflw24ccm5d6zziwlc9pxmsm3f54pm9p7xm0ik724kj4"; - }; - macosx = requireFile { - url = "https://dl.google.com/android/repository/sdk-tools-darwin-3859397.zip"; - sha256 = "1ycx9gzdaqaw6n19yvxjawywacavn1jc6sadlz5qikhgfr57b0aa"; - }; - }; - }; -} else if toolsVersion == "26.1.1" then import ./tools/26.nix { - inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall; - package = packages.tools.${toolsVersion}; -} else import ./tools/25.nix { - inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall; - package = packages.tools.${toolsVersion}; +deployAndroidPackage { + name = "androidsdk"; + inherit os package; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optionals (os == "linux") [ autoPatchelfHook ]; + buildInputs = lib.optional (os == "linux") ( + (with pkgs; [ glibc freetype fontconfig fontconfig.lib]) + ++ (with pkgs.xorg; [ libX11 libXrender libXext ]) + ++ (with pkgsi686Linux; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ]) + ); + + patchInstructions = '' + ${lib.optionalString (os == "linux") '' + # Auto patch all binaries + autoPatchelf . + ''} + + # Wrap all scripts that require JAVA_HOME + for i in bin; do + find $i -maxdepth 1 -type f -executable | while read program; do + if grep -q "JAVA_HOME" $program; then + wrapProgram $PWD/$program --prefix PATH : ${pkgs.jdk8}/bin + fi + done + done + + # Wrap monitor script + wrapProgram $PWD/monitor \ + --prefix PATH : ${pkgs.jdk8}/bin \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with pkgs; [ xorg.libX11 xorg.libXtst ])} + + # Patch all script shebangs + patchShebangs . + + cd $out/libexec/android-sdk + ${postInstall} + ''; + + meta.license = lib.licenses.unfree; } diff --git a/pkgs/development/mobile/androidenv/tools/25.nix b/pkgs/development/mobile/androidenv/tools/25.nix deleted file mode 100644 index 82642e04280b..000000000000 --- a/pkgs/development/mobile/androidenv/tools/25.nix +++ /dev/null @@ -1,62 +0,0 @@ -{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgs_i686, postInstall ? ""}: - -deployAndroidPackage { - name = "androidsdk"; - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXext pkgs.xorg.libXdamage pkgs.xorg.libxcb pkgs.xorg.libXfixes pkgs.xorg.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ]; - inherit package os; - - patchInstructions = '' - ${lib.optionalString (os == "linux") '' - # Auto patch all binaries - addAutoPatchelfSearchPath $PWD/lib64 - addAutoPatchelfSearchPath $PWD/lib64/libstdc++ - addAutoPatchelfSearchPath $PWD/lib64/qt/lib - addAutoPatchelfSearchPath $PWD/lib - addAutoPatchelfSearchPath $PWD/lib/libstdc++ - autoPatchelf . - ''} - - # Wrap all scripts that require JAVA_HOME - for i in bin - do - find $i -maxdepth 1 -type f -executable | while read program - do - if grep -q "JAVA_HOME" $program - then - wrapProgram $PWD/$program --prefix PATH : ${pkgs.jdk8}/bin - fi - done - done - - # Wrap programs that require java - for i in draw9patch jobb lint screenshot2 - do - wrapProgram $PWD/$i \ - --prefix PATH : ${pkgs.jdk8}/bin - done - - # Wrap programs that require java and SWT - for i in android ddms hierarchyviewer monitor monkeyrunner traceview uiautomatorviewer - do - wrapProgram $PWD/$i \ - --prefix PATH : ${pkgs.jdk8}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]} - done - - ${lib.optionalString (os == "linux") '' - wrapProgram $PWD/emulator \ - --prefix PATH : ${pkgs.file}/bin:${pkgs.glxinfo}/bin:${pkgs.pciutils}/bin \ - --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \ - --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale - ''} - - # Patch all script shebangs - patchShebangs . - - cd .. - ${postInstall} - ''; - - meta.license = lib.licenses.unfree; -} diff --git a/pkgs/development/mobile/androidenv/tools/26.nix b/pkgs/development/mobile/androidenv/tools/26.nix deleted file mode 100644 index 2f4f88a75975..000000000000 --- a/pkgs/development/mobile/androidenv/tools/26.nix +++ /dev/null @@ -1,45 +0,0 @@ -{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgs_i686, postInstall ? ""}: - -deployAndroidPackage { - name = "androidsdk"; - inherit os package; - nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals (os == "linux") [ autoPatchelfHook ]; - buildInputs = lib.optional (os == "linux") ( - (with pkgs; [ glibc freetype fontconfig fontconfig.lib]) - ++ (with pkgs.xorg; [ libX11 libXrender libXext ]) - ++ (with pkgs_i686; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ]) - ); - - patchInstructions = '' - ${lib.optionalString (os == "linux") '' - # Auto patch all binaries - autoPatchelf . - ''} - - # Wrap all scripts that require JAVA_HOME - for i in bin - do - find $i -maxdepth 1 -type f -executable | while read program - do - if grep -q "JAVA_HOME" $program - then - wrapProgram $PWD/$program --prefix PATH : ${pkgs.jdk8}/bin - fi - done - done - - # Wrap monitor script - wrapProgram $PWD/monitor \ - --prefix PATH : ${pkgs.jdk8}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]} - - # Patch all script shebangs - patchShebangs . - - cd .. - ${postInstall} - ''; - - meta.license = lib.licenses.unfree; -} diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix index 1c3e6f1a8f3c..0df241ad3787 100644 --- a/pkgs/development/mobile/maestro/default.nix +++ b/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.11.3"; + version = "1.21.3"; src = fetchurl { - url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro-${version}.zip"; - sha256 = "0hjsrwp6d1k68p0qhn7v9689ihy06ssnfpi8dj61jw6r64c234m4"; + url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; + sha256 = "1sphkzknz4lidj3vxzvq31x6k6si32smn2yylibccv4p4hjwvn68"; }; dontUnpack = true; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir $out unzip $src -d $out - mv $out/maestro-$version/* $out - rm -rf $out/maestro-$version + mv $out/maestro/* $out + rm -rf $out/maestro ''; postFixup = '' @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://maestro.mobile.dev/"; license = licenses.asl20; platforms = lib.platforms.all; + changelog = "https://github.com/mobile-dev-inc/maestro/blob/main/CHANGELOG.md"; maintainers = with maintainers; [ SubhrajyotiSen ]; }; } diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 82a264e702de..e4c3062cf531 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -34,7 +34,7 @@ let extraArgs = removeAttrs args [ "name" "preRebuild" "androidsdkArgs" "xcodewrapperArgs" ]; in stdenv.mkDerivation ({ - name = lib.replaceChars [" "] [""] name; + name = lib.replaceStrings [" "] [""] name; buildInputs = [ nodejs titanium alloy python which file jdk ]; diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index ae8416c8d769..4bef0ba2db0e 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -53,7 +53,7 @@ let extraArgs = removeAttrs args ([ "name" "scheme" "xcodeFlags" "release" "certificateFile" "certificatePassword" "provisioningProfile" "signMethod" "generateIPA" "generateXCArchive" "enableWirelessDistribution" "installURL" "bundleId" "version" ] ++ builtins.attrNames xcodewrapperFormalArgs); in stdenv.mkDerivation ({ - name = lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed + name = lib.replaceStrings [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed buildPhase = '' # Be sure that the Xcode wrapper has priority over everything else. # When using buildInputs this does not seem to be the case. diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index ea0502eb9818..ca6806d43b99 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -9,7 +9,7 @@ let xcodewrapper = composeXcodeWrapper xcodewrapperArgs; in stdenv.mkDerivation { - name = lib.replaceChars [" "] [""] name; + name = lib.replaceStrings [" "] [""] name; buildCommand = '' mkdir -p $out/bin cat > $out/bin/run-test-simulator << "EOF" diff --git a/pkgs/development/nim-packages/asynctools/default.nix b/pkgs/development/nim-packages/asynctools/default.nix new file mode 100644 index 000000000000..54893d00a980 --- /dev/null +++ b/pkgs/development/nim-packages/asynctools/default.nix @@ -0,0 +1,20 @@ +{ lib, buildNimPackage, fetchFromGitHub, astpatternmatching }: + +buildNimPackage rec { + pname = "asynctools"; + version = "unstable-2021-07-06"; + + src = fetchFromGitHub { + owner = "cheatfate"; + repo = "asynctools"; + rev = "84ced6d002789567f2396c75800ffd6dff2866f7"; + hash = "sha256-mrO+WeSzCBclqC2UNCY+IIv7Gs8EdTDaTeSgXy3TgNM="; + }; + + meta = with lib; { + description = "Various asynchronous tools for Nim language"; + homepage = "https://github.com/cheatfate/asynctools"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/nim-packages/base32/default.nix b/pkgs/development/nim-packages/base32/default.nix new file mode 100644 index 000000000000..543c63754bc6 --- /dev/null +++ b/pkgs/development/nim-packages/base32/default.nix @@ -0,0 +1,18 @@ +{ lib, buildNimPackage, fetchFromGitHub }: + +buildNimPackage rec { + pname = "base32"; + version = "0.1.3"; + src = fetchFromGitHub { + owner = "OpenSystemsLab"; + repo = "${pname}.nim"; + rev = version; + hash = "sha256-BsDly13xsY2bu4N9LGHB0OGej/JhAx3B01TDdF0M8Jk="; + }; + doCheck = true; + meta = src.meta // { + description = "Base32 library for Nim"; + maintainers = with lib.maintainers; [ ehmry ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/nim-packages/base45/default.nix b/pkgs/development/nim-packages/base45/default.nix new file mode 100644 index 000000000000..b63f3073e774 --- /dev/null +++ b/pkgs/development/nim-packages/base45/default.nix @@ -0,0 +1,19 @@ +{ lib, buildNimPackage, fetchFromSourcehut }: + +buildNimPackage rec { + pname = "base45"; + version = "20230124"; + src = fetchFromSourcehut { + owner = "~ehmry"; + repo = pname; + rev = version; + hash = "sha256-9he+14yYVGt2s1IuRLPRsv23xnJzERkWRvIHr3PxFYk="; + }; + doCheck = true; + meta = src.meta // { + description = "Base45 library for Nim"; + license = lib.licenses.unlicense; + mainProgram = pname; + maintainers = with lib.maintainers; [ ehmry ]; + }; +} diff --git a/pkgs/development/nim-packages/c2nim/default.nix b/pkgs/development/nim-packages/c2nim/default.nix index 408e4fbee96e..c748883dbbc8 100644 --- a/pkgs/development/nim-packages/c2nim/default.nix +++ b/pkgs/development/nim-packages/c2nim/default.nix @@ -2,13 +2,13 @@ buildNimPackage rec { pname = "c2nim"; - version = "0.9.18"; + version = "0.9.19"; nimBinOnly = true; src = fetchFromGitHub { owner = "nim-lang"; repo = pname; rev = version; - hash = "sha256-127ux36mfC+PnS2HIQffw+z0TSvzdQXnKRxqYV3XahU="; + hash = "sha256-E8sAhTFIWAnlfWyuvqK8h8g7Puf5ejLEqgLNb5N17os="; }; meta = with lib; src.meta // { diff --git a/pkgs/development/nim-packages/cbor/default.nix b/pkgs/development/nim-packages/cbor/default.nix new file mode 100644 index 000000000000..9302ca7a97e2 --- /dev/null +++ b/pkgs/development/nim-packages/cbor/default.nix @@ -0,0 +1,21 @@ +{ lib, buildNimPackage, fetchFromSourcehut }: + +buildNimPackage rec { + pname = "cbor"; + version = "20221007"; + src = fetchFromSourcehut { + owner = "~ehmry"; + repo = "nim_${pname}"; + rev = version; + hash = "sha256-zFkYsXFRAiBrfz3VNML3l+rYrdJmczl0bfZcJSbHHbM="; + }; + doCheck = true; + meta = with lib; + src.meta // { + description = + "Concise Binary Object Representation decoder and encoder (RFC8949)"; + license = licenses.unlicense; + maintainers = [ maintainers.ehmry ]; + mainProgram = "cbordiag"; + }; +} diff --git a/pkgs/development/nim-packages/fetch-nimble/builder.sh b/pkgs/development/nim-packages/fetch-nimble/builder.sh index 693ab339408e..bc2f9bfc94f1 100644 --- a/pkgs/development/nim-packages/fetch-nimble/builder.sh +++ b/pkgs/development/nim-packages/fetch-nimble/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup export HOME=$NIX_BUILD_TOP diff --git a/pkgs/development/nim-packages/getdns/default.nix b/pkgs/development/nim-packages/getdns/default.nix new file mode 100644 index 000000000000..035770da98be --- /dev/null +++ b/pkgs/development/nim-packages/getdns/default.nix @@ -0,0 +1,25 @@ +{ lib, buildNimPackage, fetchFromSourcehut, pkg-config, getdns }: + +buildNimPackage rec { + pname = "getdns"; + version = "20221222"; + src = fetchFromSourcehut { + owner = "~ehmry"; + repo = pname + "-nim"; + rev = version; + hash = "sha256-y7yzY1PcodIK2kC9409FuTpLn0TsWHGiEPnrULrob+k="; + }; + + propagatedNativeBuildInputs = [ pkg-config ]; + propagatedBuildInputs = [ getdns ]; + + doCheck = true; + checkPhase = "nim c tests/test_example_synchronous"; + # The test requires network but check if it builds. + + meta = { + inherit (getdns.meta) homepage license platforms; + description = "Nim wrapper over the getdns library"; + maintainers = with lib.maintainers; [ ehmry ]; + }; +} diff --git a/pkgs/development/nim-packages/nimSHA2/default.nix b/pkgs/development/nim-packages/nimSHA2/default.nix new file mode 100644 index 000000000000..812b179b5d70 --- /dev/null +++ b/pkgs/development/nim-packages/nimSHA2/default.nix @@ -0,0 +1,18 @@ +{ lib, buildNimPackage, fetchFromGitHub }: + +buildNimPackage rec { + pname = "nimSHA2"; + version = "unstable-2021-09-09"; + src = fetchFromGitHub { + owner = "jangko"; + repo = pname; + rev = "b8f666069dff1ed0c5142dd1ca692f0e71434716"; + hash = "sha256-Wqb3mQ7638UOTze71mf6WMyGiw9qTwhbJiGGb+9OR2k="; + }; + doCheck = true; + meta = src.meta // { + description = "Secure Hash Algorithm 2"; + maintainers = with lib.maintainers; [ ehmry ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/nim-packages/npeg/default.nix b/pkgs/development/nim-packages/npeg/default.nix new file mode 100644 index 000000000000..552449b7102a --- /dev/null +++ b/pkgs/development/nim-packages/npeg/default.nix @@ -0,0 +1,18 @@ +{ lib, buildNimPackage, fetchFromGitHub }: + +buildNimPackage rec { + pname = "npeg"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "zevv"; + repo = pname; + rev = version; + hash = "sha256-EN3wTSa+WveO7V29A2lJgWLwIlHzQE8t7T2m4u7niMc="; + }; + doCheck = true; + meta = src.meta // { + description = "NPeg is a pure Nim pattern matching library"; + maintainers = with lib.maintainers; [ ehmry ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/nim-packages/taps/default.nix b/pkgs/development/nim-packages/taps/default.nix new file mode 100644 index 000000000000..4bf8f247977e --- /dev/null +++ b/pkgs/development/nim-packages/taps/default.nix @@ -0,0 +1,19 @@ +{ lib, buildNimPackage, fetchFromSourcehut, getdns }: + +buildNimPackage rec { + pname = "taps"; + version = "20221228"; + src = fetchFromSourcehut { + owner = "~ehmry"; + repo = "nim_${pname}"; + rev = version; + hash = "sha256-0EjMP5pIPJg4/3nzj6ECC68f709TS06OrJlTZ0tavEo="; + }; + propagatedBuildInputs = [ getdns ]; + doCheck = false; + meta = src.meta // { + description = "Transport Services Interface"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.ehmry ]; + }; +} diff --git a/pkgs/development/nim-packages/tkrzw/default.nix b/pkgs/development/nim-packages/tkrzw/default.nix new file mode 100644 index 000000000000..1988260ac485 --- /dev/null +++ b/pkgs/development/nim-packages/tkrzw/default.nix @@ -0,0 +1,21 @@ +{ lib, buildNimPackage, fetchFromSourcehut, pkg-config, tkrzw }: + +buildNimPackage rec { + pname = "tkrzw"; + version = "20220922"; + src = fetchFromSourcehut { + owner = "~ehmry"; + repo = "nim-${pname}"; + rev = version; + hash = "sha256-66rUuK+wUrqs1QYjteZcaIrfg+LHQNcR+XM+EtVuGsA="; + }; + propagatedNativeBuildInputs = [ pkg-config ]; + propagatedBuildInputs = [ tkrzw ]; + doCheck = true; + meta = with lib; + src.meta // { + description = "Nim wrappers over some of the Tkrzw C++ library"; + license = lib.licenses.apsl20; + maintainers = with lib.maintainers; [ ehmry ]; + }; +} diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index aef704b3a66d..b571cb585ee8 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -4,6 +4,7 @@ # Packages that provide multiple executables where one is clearly the `mainProgram`. "@antfu/ni" = "ni"; "@electron-forge/cli" = "electron-forge"; + "@microsoft/rush" = "rush"; "@squoosh/cli" = "squoosh-cli"; "@webassemblyjs/cli-1.11.1" = "wasm2wast"; coffee-script = "coffee"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index f9bb0b1a82f1..5869a0e1726a 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -1,6 +1,5 @@ [ "@angular/cli" -, "@ansible/ansible-language-server" , "@antfu/ni" , "@antora/cli" , "@antora/site-generator-default" @@ -12,6 +11,7 @@ , "@forge/cli" , "@google/clasp" , "@medable/mdctl-cli" +, "@microsoft/rush" , "@nerdwallet/shepherd" , "@nestjs/cli" , "@squoosh/cli" @@ -117,7 +117,6 @@ , "csslint" , "dat" , "degit" -, {"deltachat-desktop": "../../applications/networking/instant-messengers/deltachat-desktop"} , "dhcp" , "diagnostic-languageserver" , "dockerfile-language-server-nodejs" @@ -184,7 +183,6 @@ , "insect" , "intelephense" , "ionic" -, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v15.6.3.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" @@ -250,7 +248,6 @@ , "patch-package" , "peerflix" , "peerflix-server" -, {"photoprism-frontend": "../../servers/photoprism"} , "pkg" , "pm2" , "pnpm" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f5af5c140e0f..6b11be178ff8 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -31,13 +31,13 @@ let sha512 = "ULSIYPy4ZPM301dfCxRz0l2GJjOwIo/PqmWonIu1bLml7UmnVQmH+juJcoyXp6E8gIRRNAjGYftJnNQlfy4vPg=="; }; }; - "@adobe/css-tools-4.0.1" = { + "@adobe/css-tools-4.1.0" = { name = "_at_adobe_slash_css-tools"; packageName = "@adobe/css-tools"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.0.1.tgz"; - sha512 = "+u76oB43nOHrF4DDWRLWDCtci7f3QJoEBigemIdIeTi1ODqjx6Tad9NCVnPRwewWlKkVab5PlK8DCtPTyX7S8g=="; + url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.1.0.tgz"; + sha512 = "mMVJ/j/GbZ/De4ZHWbQAQO1J6iVnjtZLc9WEdkUQb8S/Bu2cAF2bETXUgMAdvMG3/ngtKmcNBe+Zms9bg6jnQQ=="; }; }; "@akryum/winattr-3.0.0" = { @@ -94,13 +94,13 @@ let sha512 = "K7EO1cd89xNdwctQaR2bY9aQFDArSIrYGSWSDCnqG7RKIZ1J+XASkKVylW9NCIeVcguD6Qemxai8ZFCWg9lLFg=="; }; }; - "@alexbosworth/fiat-1.0.3" = { + "@alexbosworth/fiat-1.0.4" = { name = "_at_alexbosworth_slash_fiat"; packageName = "@alexbosworth/fiat"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@alexbosworth/fiat/-/fiat-1.0.3.tgz"; - sha512 = "M1OE/iyK+H77lrOEZz93f9QIi7B4RaD66O3ICRv24ECDbZogddwPWwG9HK9QDJvdGPlni67PYu8krpzEsTvFPg=="; + url = "https://registry.npmjs.org/@alexbosworth/fiat/-/fiat-1.0.4.tgz"; + sha512 = "MNjRwLfb8o3jDxJea4kAcocGo0opUoGq1U/eJ+OEBxPu1BtSNme/ih758Qma7Z2vOrknhU6isbHiXIXg7vNPAw=="; }; }; "@alexbosworth/html2unicode-1.1.5" = { @@ -148,76 +148,58 @@ let sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; }; }; - "@angular-devkit/architect-0.1402.8" = { + "@angular-devkit/architect-0.1501.3" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1402.8"; + version = "0.1501.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1402.8.tgz"; - sha512 = "z3HXPBi3h3y+D04NNA/5lVaUCMF+dkE/75bCqg4DG3FqV0i0dh4hozjKtWgX6xuoJ8AJlDfrJSaBCvjsog+Jhg=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1501.3.tgz"; + sha512 = "+hvesYUgChdAkBcWSO2pseIGBzRDAATyIw36UBwOmYkL7wM65TEXpspbo5ZIfU1M/l7X/lHzDXLTzCMfb0Qxbg=="; }; }; - "@angular-devkit/core-14.2.1" = { + "@angular-devkit/core-15.0.4" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "14.2.1"; + version = "15.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-14.2.1.tgz"; - sha512 = "lW8oNGuJqr4r31FWBjfWQYkSXdiOHBGOThIEtHvUVBKfPF/oVrupLueCUgBPel+NvxENXdo93uPsqHN7bZbmsQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-15.0.4.tgz"; + sha512 = "4ITpRAevd652SxB+qNesIQ9qfbm7wT5UBU5kJOPPwGL77I21g8CQpkmV1n5VSacPvC9Zbz90feOWexf7w7JzcA=="; }; }; - "@angular-devkit/core-14.2.2" = { + "@angular-devkit/core-15.1.3" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "14.2.2"; + version = "15.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-14.2.2.tgz"; - sha512 = "ofDhTmJqoAkmkJP0duwUaCxDBMxPlc+AWYwgs3rKKZeJBb0d+tchEXHXevD5bYbbRfXtnwM+Vye2XYHhA4nWAA=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.3.tgz"; + sha512 = "biuS+DceyZEqcE/cLvndtslqn3Q6uCmJ0RLpACikH6ESYorvk+A91H0ofuGue6HB/2CUN/F+mPSr7sWVI1W9sA=="; }; }; - "@angular-devkit/core-14.2.8" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "14.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-14.2.8.tgz"; - sha512 = "30nDq2PH91X7T42xXFBlTiXTBG143z0BL8IUgpVCxTFYwxgPbtV4bcXTkiBgh1FL/usZcHa0Bd/64wxmFOpYwA=="; - }; - }; - "@angular-devkit/schematics-14.2.1" = { + "@angular-devkit/schematics-15.0.4" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "14.2.1"; + version = "15.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-14.2.1.tgz"; - sha512 = "0U18FwDYt4zROBPrvewH6iBTkf2ozVHN4/gxUb9jWrqVw8mPU5AWc/iYxQLHBSinkr2Egjo1H/i9aBqgJSeh3g=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.0.4.tgz"; + sha512 = "/gXiLFS0+xFdx6wPoBpe/c6/K9I5edMpaASqPf4XheKtrsSvL+qTlIi3nsbfItzOiDXbaBmlbxGfkMHz/yg0Ig=="; }; }; - "@angular-devkit/schematics-14.2.2" = { + "@angular-devkit/schematics-15.1.3" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "14.2.2"; + version = "15.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-14.2.2.tgz"; - sha512 = "90hseNg1yQ2AR+lVr/NByZRHnYAlzCL6hr9p9q1KPHxA3Owo04yX6n6dvR/xf27hCopXInXKPsasR59XCx5ZOQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.1.3.tgz"; + sha512 = "IXZ56/5uFnHqnLq+80JhmFx5mflyW8LgS/8Tr2l5DYVA71Fh3b1q+vGrEZB1X2zPoFeDOGAxv3Fi+kmjcz1GZg=="; }; }; - "@angular-devkit/schematics-14.2.8" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "14.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-14.2.8.tgz"; - sha512 = "L5GEgueZV4vqZy9Ar0zxVJOHK/4ttF1nPjW4Ut1vRFJGxsHFVEpxq5eGBf2JYSiOhqmFYc6GnJOxA6C4xAIHjA=="; - }; - }; - "@angular-devkit/schematics-cli-14.2.2" = { + "@angular-devkit/schematics-cli-15.0.4" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; - version = "14.2.2"; + version = "15.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-14.2.2.tgz"; - sha512 = "timCty5tO1A5VOcy8nVJ+jL98i6+ct5/Hg+4rQxc3J6agmmNL9fALboJBEz1ckTt7MewlGtrpohMMy+YGhuWOg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-15.0.4.tgz"; + sha512 = "rEzkpjiQcJqCgbZ1Ns8jn1BL4724jcj+YFS7Qw5d4v6yQYA8iSLz12HDTH0TiNEv7u5S55fYuRz2QreI0QUT8A=="; }; }; "@antora/asciidoc-loader-3.1.2" = { @@ -382,6 +364,15 @@ let sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; + "@apidevtools/json-schema-ref-parser-9.1.2" = { + name = "_at_apidevtools_slash_json-schema-ref-parser"; + packageName = "@apidevtools/json-schema-ref-parser"; + version = "9.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.1.2.tgz"; + sha512 = "r1w81DpR+KyRWd3f+rk6TNqMgedmAxZP5v5KWlXQWlgMUUtyEJch0DKEci1SorPMiSeM8XPl7MZ3miJ60JIpQg=="; + }; + }; "@apidevtools/openapi-schemas-2.1.0" = { name = "_at_apidevtools_slash_openapi-schemas"; packageName = "@apidevtools/openapi-schemas"; @@ -418,6 +409,24 @@ let sha512 = "Wqo1oSHNUj/jxmsVp4iR3I480p6qdqHikn38lKrFhfzcDJ7lwd7Ck7cHRl4JE81tWNArl77xhnG/OkZhxKBYOw=="; }; }; + "@apollo/protobufjs-1.2.7" = { + name = "_at_apollo_slash_protobufjs"; + packageName = "@apollo/protobufjs"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.7.tgz"; + sha512 = "Lahx5zntHPZia35myYDBRuF58tlwPskwHc5CWBZC/4bMKB6siTBWwtMrkqXcsNwQiFSzSx5hKdRPUmemrEp3Gg=="; + }; + }; + "@apollo/usage-reporting-protobuf-4.0.2" = { + name = "_at_apollo_slash_usage-reporting-protobuf"; + packageName = "@apollo/usage-reporting-protobuf"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@apollo/usage-reporting-protobuf/-/usage-reporting-protobuf-4.0.2.tgz"; + sha512 = "GfE8aDqi/lAFut95pjH9IRvH0zGsQ5G/2lYL0ZLZfML7ArX+A4UVHFANQcPCcUYGE6bI6OPhLekg4Vsjf6B1cw=="; + }; + }; "@apollo/utils.dropunuseddefinitions-1.1.0" = { name = "_at_apollo_slash_utils.dropunuseddefinitions"; packageName = "@apollo/utils.dropunuseddefinitions"; @@ -427,13 +436,13 @@ let sha512 = "jU1XjMr6ec9pPoL+BFWzEPW7VHHulVdGKMkPAMiCigpVIT11VmCbnij0bWob8uS3ODJ65tZLYKAh/55vLw2rbg=="; }; }; - "@apollo/utils.keyvaluecache-1.0.1" = { + "@apollo/utils.keyvaluecache-1.0.2" = { name = "_at_apollo_slash_utils.keyvaluecache"; packageName = "@apollo/utils.keyvaluecache"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-1.0.1.tgz"; - sha512 = "nLgYLomqjVimEzQ4cdvVQkcryi970NDvcRVPfd0OPeXhBfda38WjBq+WhQFk+czSHrmrSp34YHBxpat0EtiowA=="; + url = "https://registry.npmjs.org/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-1.0.2.tgz"; + sha512 = "p7PVdLPMnPzmXSQVEsy27cYEjVON+SH/Wb7COyW3rQN8+wJgT1nv9jZouYtztWW8ZgTkii5T6tC9qfoDREd4mg=="; }; }; "@apollo/utils.logger-1.0.1" = { @@ -481,13 +490,13 @@ let sha512 = "E41rDUzkz/cdikM5147d8nfCFVKovXxKBcjvLEQ7bjZm/cg9zEcXvS6vFY8ugTubI3fn6zoqo0CyU8zT+BGP9w=="; }; }; - "@apollo/utils.usagereporting-1.0.0" = { + "@apollo/utils.usagereporting-1.0.1" = { name = "_at_apollo_slash_utils.usagereporting"; packageName = "@apollo/utils.usagereporting"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/utils.usagereporting/-/utils.usagereporting-1.0.0.tgz"; - sha512 = "5PL7hJMkTPmdo3oxPtigRrIyPxDk/ddrUryHPDaezL1lSFExpNzsDd2f1j0XJoHOg350GRd3LyD64caLA2PU1w=="; + url = "https://registry.npmjs.org/@apollo/utils.usagereporting/-/utils.usagereporting-1.0.1.tgz"; + sha512 = "6dk+0hZlnDbahDBB2mP/PZ5ybrtCJdLMbeNJD+TJpKyZmSY6bA3SjI8Cr2EM9QA+AdziywuWg+SgbWUF3/zQqQ=="; }; }; "@apollographql/apollo-tools-0.5.4" = { @@ -535,13 +544,13 @@ let sha512 = "TmB2K5UfpDpSbCNBBntXzKHcAk2EA3/P68jmWvmJvglVUdkO9V6kTAuXVe12+h6C4GK0ndwuCrHHtEVcL5t6pQ=="; }; }; - "@astrojs/compiler-0.27.2" = { + "@astrojs/compiler-0.31.4" = { name = "_at_astrojs_slash_compiler"; packageName = "@astrojs/compiler"; - version = "0.27.2"; + version = "0.31.4"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-0.27.2.tgz"; - sha512 = "VG4X87cUkcmT40HqEwShQzUgl0VSnVTszobbmnhAOkHzdoWMxhwAm61A2o5fEsv6eEK8M0lW/fGwkSofYM5GcQ=="; + url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-0.31.4.tgz"; + sha512 = "6bBFeDTtPOn4jZaiD3p0f05MEGQL9pw2Zbfj546oFETNmjJFWO3nzHz6/m+P53calknCvyVzZ5YhoBLIvzn5iw=="; }; }; "@asyncapi/specs-3.2.1" = { @@ -553,85 +562,85 @@ let sha512 = "FO+EteK+Gk3zwumrBw6frpp9cJ4oQL5++hBBpfM81w16e9KaiA4sKrzvQsvVjifoZZHNvVEX4D2zoz9i8CLccQ=="; }; }; - "@aws-crypto/crc32-2.0.0" = { + "@aws-crypto/crc32-3.0.0" = { name = "_at_aws-crypto_slash_crc32"; packageName = "@aws-crypto/crc32"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-2.0.0.tgz"; - sha512 = "TvE1r2CUueyXOuHdEigYjIZVesInd9KN+K/TFFNfkkxRThiNxO6i4ZqqAVMoEjAamZZ1AA8WXJkjCz7YShHPQA=="; + url = "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-3.0.0.tgz"; + sha512 = "IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA=="; }; }; - "@aws-crypto/crc32c-2.0.0" = { + "@aws-crypto/crc32c-3.0.0" = { name = "_at_aws-crypto_slash_crc32c"; packageName = "@aws-crypto/crc32c"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-2.0.0.tgz"; - sha512 = "vF0eMdMHx3O3MoOXUfBZry8Y4ZDtcuskjjKgJz8YfIDjLStxTZrYXk+kZqtl6A0uCmmiN/Eb/JbC/CndTV1MHg=="; + url = "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-3.0.0.tgz"; + sha512 = "ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w=="; }; }; - "@aws-crypto/ie11-detection-2.0.2" = { + "@aws-crypto/ie11-detection-3.0.0" = { name = "_at_aws-crypto_slash_ie11-detection"; packageName = "@aws-crypto/ie11-detection"; - version = "2.0.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-2.0.2.tgz"; - sha512 = "5XDMQY98gMAf/WRTic5G++jfmS/VLM0rwpiOpaainKi4L0nqWMSB1SzsrEG5rjFZGYN6ZAefO+/Yta2dFM0kMw=="; + url = "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz"; + sha512 = "341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q=="; }; }; - "@aws-crypto/sha1-browser-2.0.0" = { + "@aws-crypto/sha1-browser-3.0.0" = { name = "_at_aws-crypto_slash_sha1-browser"; packageName = "@aws-crypto/sha1-browser"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-2.0.0.tgz"; - sha512 = "3fIVRjPFY8EG5HWXR+ZJZMdWNRpwbxGzJ9IH9q93FpbgCH8u8GHRi46mZXp3cYD7gealmyqpm3ThZwLKJjWJhA=="; + url = "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-3.0.0.tgz"; + sha512 = "NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw=="; }; }; - "@aws-crypto/sha256-browser-2.0.0" = { + "@aws-crypto/sha256-browser-3.0.0" = { name = "_at_aws-crypto_slash_sha256-browser"; packageName = "@aws-crypto/sha256-browser"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-2.0.0.tgz"; - sha512 = "rYXOQ8BFOaqMEHJrLHul/25ckWH6GTJtdLSajhlqGMx0PmSueAuvboCuZCTqEKlxR8CQOwRarxYMZZSYlhRA1A=="; + url = "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz"; + sha512 = "8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ=="; }; }; - "@aws-crypto/sha256-js-2.0.0" = { + "@aws-crypto/sha256-js-3.0.0" = { name = "_at_aws-crypto_slash_sha256-js"; packageName = "@aws-crypto/sha256-js"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-2.0.0.tgz"; - sha512 = "VZY+mCY4Nmrs5WGfitmNqXzaE873fcIZDu54cbaDaaamsaTOP1DBImV9F4pICc3EHjQXujyE8jig+PFCaew9ig=="; + url = "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz"; + sha512 = "PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ=="; }; }; - "@aws-crypto/supports-web-crypto-2.0.2" = { + "@aws-crypto/supports-web-crypto-3.0.0" = { name = "_at_aws-crypto_slash_supports-web-crypto"; packageName = "@aws-crypto/supports-web-crypto"; - version = "2.0.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-2.0.2.tgz"; - sha512 = "6mbSsLHwZ99CTOOswvCRP3C+VCWnzBf+1SnbWxzzJ9lR0mA0JnY2JEAhp8rqmTE0GPFy88rrM27ffgp62oErMQ=="; + url = "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz"; + sha512 = "06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg=="; }; }; - "@aws-crypto/util-2.0.2" = { + "@aws-crypto/util-3.0.0" = { name = "_at_aws-crypto_slash_util"; packageName = "@aws-crypto/util"; - version = "2.0.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/util/-/util-2.0.2.tgz"; - sha512 = "Lgu5v/0e/BcrZ5m/IWqzPUf3UYFTy/PpeED+uc9SWUR1iZQL8XXbGQg10UfllwwBryO3hFF5dizK+78aoXC1eA=="; + url = "https://registry.npmjs.org/@aws-crypto/util/-/util-3.0.0.tgz"; + sha512 = "2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w=="; }; }; - "@aws-sdk/abort-controller-3.201.0" = { + "@aws-sdk/abort-controller-3.257.0" = { name = "_at_aws-sdk_slash_abort-controller"; packageName = "@aws-sdk/abort-controller"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.201.0.tgz"; - sha512 = "xJ984k+CKlGjBmvNarzM8Y+b6X4L1Zt0TycQmVBJq7fAr/ju9l13pQIoXR5WlDIW1FkGeVczF5Nu6fN46SCORQ=="; + url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.257.0.tgz"; + sha512 = "ekWy391lOerS0ZECdhp/c+X7AToJIpfNrCPjuj3bKr+GMQYckGsYsdbm6AUD4sxBmfvuaQmVniSXWovaxwcFcQ=="; }; }; "@aws-sdk/chunked-blob-reader-3.188.0" = { @@ -643,202 +652,211 @@ let sha512 = "zkPRFZZPL3eH+kH86LDYYXImiClA1/sW60zYOjse9Pgka+eDJlvBN6hcYxwDEKjcwATYiSRR1aVQHcfCinlGXg=="; }; }; - "@aws-sdk/chunked-blob-reader-native-3.204.0" = { + "@aws-sdk/chunked-blob-reader-native-3.208.0" = { name = "_at_aws-sdk_slash_chunked-blob-reader-native"; packageName = "@aws-sdk/chunked-blob-reader-native"; - version = "3.204.0"; + version = "3.208.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-3.204.0.tgz"; - sha512 = "ejJntS6usQpKKwisIaK4yYjo8DKEPpk7eJ7fJCw0r4WmIa7xN3amZISP4TrnKa401nWxbfzd40Wh/R5p75JMNQ=="; + url = "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-3.208.0.tgz"; + sha512 = "JeOZ95PW+fJ6bbuqPySYqLqHk1n4+4ueEEraJsiUrPBV0S1ZtyvOGHcnGztKUjr2PYNaiexmpWuvUve9K12HRA=="; }; }; - "@aws-sdk/client-s3-3.204.0" = { + "@aws-sdk/client-s3-3.259.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.204.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.204.0.tgz"; - sha512 = "TtaOQ0ArmqV23Ie/FUChMIdAT5ebg5FSSimN3X2SFVmXRt9c9N73X/gLHKqzf30Dgsl7M/w9O6jFtlbvANjBmA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.259.0.tgz"; + sha512 = "yZy7oTTqPAn5H1SxbsynzVRr6kSf5hJQYl00P1dpzsAjTJmRzV4CdHwUxsBkyfUeC6u324iJi9zir1v8HHgUJw=="; }; }; - "@aws-sdk/client-sso-3.204.0" = { + "@aws-sdk/client-sso-3.259.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.204.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.204.0.tgz"; - sha512 = "AECcNrcAQxV/Jlu8ogshRaYwt2jayx0omQJs/SXj70mWxmbk4MQnb+DqJIpPpOKBHaza/xlC2TKS1RzkiuZxyw=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.259.0.tgz"; + sha512 = "TKi9Lj0zqxsrQWOZ+e4WchNDtLDz6B+ahMzYDIOFlglDPPEzbZE//PBMZCba/AAIe6U3xaUQSnni+4mNbRLg7Q=="; }; }; - "@aws-sdk/client-sts-3.204.0" = { + "@aws-sdk/client-sso-oidc-3.259.0" = { + name = "_at_aws-sdk_slash_client-sso-oidc"; + packageName = "@aws-sdk/client-sso-oidc"; + version = "3.259.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.259.0.tgz"; + sha512 = "TKpUX55qLM35sQXx96VnB/ZcQCcBxVU/0j0wqL8Hij+blD7fy6KrGGJPORzRphmFg8Ehf1IoCivFxrQwLrjZ6A=="; + }; + }; + "@aws-sdk/client-sts-3.259.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.204.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.204.0.tgz"; - sha512 = "Tp6FqENRw31XK5r5hul1JXnQgHBhbbXhoMebyFih6/zjpATaqg0bnV6tpww4yPi3uc+yDGXKw2/tDroSsyTsRA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.259.0.tgz"; + sha512 = "LXqua4FoXxR30sM4BSwmPI6x0YmDTw6yQhxQQXA5hrx+YwUf8CSpa0K6Xwfv8M5+zP0uHfY1iVxx/rnT8FOEmA=="; }; }; - "@aws-sdk/config-resolver-3.201.0" = { + "@aws-sdk/config-resolver-3.259.0" = { name = "_at_aws-sdk_slash_config-resolver"; packageName = "@aws-sdk/config-resolver"; - version = "3.201.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.201.0.tgz"; - sha512 = "6YLIel7OGMGi+r8XC1A54cQJRIpx/NJ4fBALy44zFpQ+fdJUEmw4daUf1LECmAQiPA2Pr/hD0nBtX+wiiTf5/g=="; + url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.259.0.tgz"; + sha512 = "gViMRsc4Ye6+nzJ0OYTZIT8m4glIAdtugN2Sr/t6P2iJW5X0bSL/EcbcHBgsve1lHjeGPeyzVkT7UnyGOZ5Z/A=="; }; }; - "@aws-sdk/credential-provider-env-3.201.0" = { + "@aws-sdk/credential-provider-env-3.257.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.201.0.tgz"; - sha512 = "g2MJsowzFhSsIOITUjYp7EzWFeHINjEP526Uf+5z2/p2kxQVwYYWZQK7j+tPE2Bk3MEjGOCmVHbbE7IFj0rNHw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.257.0.tgz"; + sha512 = "GsmBi5Di6hk1JAi1iB6/LCY8o+GmlCvJoB7wuoVmXI3VxRVwptUVjuj8EtJbIrVGrF9dSuIRPCzUoSuzEzYGlg=="; }; }; - "@aws-sdk/credential-provider-imds-3.201.0" = { + "@aws-sdk/credential-provider-imds-3.259.0" = { name = "_at_aws-sdk_slash_credential-provider-imds"; packageName = "@aws-sdk/credential-provider-imds"; - version = "3.201.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.201.0.tgz"; - sha512 = "i8U2k3/L3iUWJJ1GSlwVBMfLQ2OTUT97E8yJi/xz5GavYuPOsUQWQe4fp7WGQivxh+AqybXAGFUCYub6zfUqag=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.259.0.tgz"; + sha512 = "yCxoYWZAaDrCUEWxRfrpB0Mp1cFgJEMYW8T6GIb/+DQ5QLpZmorgaVD/j90QXupqFrR5tlxwuskBIkdD2E9YNg=="; }; }; - "@aws-sdk/credential-provider-ini-3.204.0" = { + "@aws-sdk/credential-provider-ini-3.259.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.204.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.204.0.tgz"; - sha512 = "ddtaS0ya5lgZZwfuJ/FuniroreLJ6yDgPAasol/rla9U5EU0qUEK1+6PX463exghUGjYfTqxdrKXhGYZfuEoIw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.259.0.tgz"; + sha512 = "/sjZv+XvcSMnvDTsau0cHxMFcbz4f4ksvgu10JQ1PpcH5CPQJviDJjZRzzijcOuMZ3SOO0skyuYU6tjY18cgIg=="; }; }; - "@aws-sdk/credential-provider-node-3.204.0" = { + "@aws-sdk/credential-provider-node-3.259.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.204.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.204.0.tgz"; - sha512 = "kGbR5JE90zBGDS4cIz7tlUklMMeOm5oc5ES74YStLUacpQKwzVcHmDG8aT2DCONS/wEYysOIs5LygHurOJ/+Ww=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.259.0.tgz"; + sha512 = "7doM6hCPTZD0H+A7VtElLY4Ztuhg3MbjoHs00TyPZNCym7f/AKmKi9Exiw1tGgxTJkfn/SzcAWz+TyqMP078ow=="; }; }; - "@aws-sdk/credential-provider-process-3.201.0" = { + "@aws-sdk/credential-provider-process-3.257.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.201.0.tgz"; - sha512 = "jTK3HSZgNj/hVrWb0wuF/cPUWSJYoRI/80fnN55o6QLS8WWIgOI8o2PNeVTAT5OrKioSoN4fgKTeUm3DZy3npQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.257.0.tgz"; + sha512 = "xK8uYeNXaclaBCGrLi4z2pxPRngqLf5BM5jg2fn57zqvlL9V5gJF972FehrVBL0bfp1/laG0ZJtD2K2sapyWAw=="; }; }; - "@aws-sdk/credential-provider-sso-3.204.0" = { + "@aws-sdk/credential-provider-sso-3.259.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.204.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.204.0.tgz"; - sha512 = "iS884Gda99x4zmdCK3XxFcceve4wB+wudpeTUm2wwX9AGrSzoUnLWqNXv/R8UAMAsKANaWMBkqv/bsHpsEitZw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.259.0.tgz"; + sha512 = "cz+8aNKxvZ8ikd0JDcB9MZredOJNRZkbco8QAM0gXfy6ziyX+23oU8+aekZljDzQR5QNRouvMz1KKmBxZLpNyg=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.201.0" = { + "@aws-sdk/credential-provider-web-identity-3.257.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.201.0.tgz"; - sha512 = "U54bqhYaClPVZfswgknhlICp3BAtKXpOgHQCUF8cko5xUgbL4lVgd1rC3lWviGFMQAaTIF3QOXyEouemxr3VXw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.257.0.tgz"; + sha512 = "Cm0uvRv4JuIbD0Kp3W0J/vwjADIyCx8HoZi5yg+QIi5nilocuTQ3ajvLeuPVSvFvdy+yaxSc5FxNXquWt7Mngw=="; }; }; - "@aws-sdk/eventstream-codec-3.201.0" = { + "@aws-sdk/eventstream-codec-3.258.0" = { name = "_at_aws-sdk_slash_eventstream-codec"; packageName = "@aws-sdk/eventstream-codec"; - version = "3.201.0"; + version = "3.258.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.201.0.tgz"; - sha512 = "lz0FFzOMXvVdy47GnRk+niK+L7MxUZITvK7UUOL6u++JB+54jS+EsD9iLSNhM5qoR9vCiFjabBhkPz9Ml6bdmw=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.258.0.tgz"; + sha512 = "DTd6aggICXOH74tBQEliwLbeoXRbQ3uROBWYl7DdrbAemzHACDFzPCXXa9MTJMZcq3Tva8/E/3bv1fXuU/xkAA=="; }; }; - "@aws-sdk/eventstream-serde-browser-3.201.0" = { + "@aws-sdk/eventstream-serde-browser-3.258.0" = { name = "_at_aws-sdk_slash_eventstream-serde-browser"; packageName = "@aws-sdk/eventstream-serde-browser"; - version = "3.201.0"; + version = "3.258.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.201.0.tgz"; - sha512 = "3/rZRBTxikj1Uyo8NDdaXey9zy7Xck/rKjykpBMbUYr4lnvXZDGQ0ie4/EMz+k5UbRsZgP46KdJo2ThgwTBvdw=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.258.0.tgz"; + sha512 = "bRcNxDrBFd0UsrLh88kwpvGDHjVupZP3gPJ5b7wseCuuWJzp56/7hNI97IywgARta91rcaf4K147VxFkSNaVlw=="; }; }; - "@aws-sdk/eventstream-serde-config-resolver-3.201.0" = { + "@aws-sdk/eventstream-serde-config-resolver-3.257.0" = { name = "_at_aws-sdk_slash_eventstream-serde-config-resolver"; packageName = "@aws-sdk/eventstream-serde-config-resolver"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.201.0.tgz"; - sha512 = "dUpqO5yX1TdAShIuyBuWMiW7DWj9adtoeAzFvqPyQMXRFTPDQcggSelfoaXGcvUQUfcNZDUbCoigU23f+xmk6Q=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.257.0.tgz"; + sha512 = "YbUETgkcFqPJmwcBozHbx3Xloh7mPk9SunNB+Ndy8egwV3L/jNZnEzZnPOtWbD10AXSuJvSbGQ8+l4FblRqZqw=="; }; }; - "@aws-sdk/eventstream-serde-node-3.201.0" = { + "@aws-sdk/eventstream-serde-node-3.258.0" = { name = "_at_aws-sdk_slash_eventstream-serde-node"; packageName = "@aws-sdk/eventstream-serde-node"; - version = "3.201.0"; + version = "3.258.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.201.0.tgz"; - sha512 = "h7YYPKrPIRjsAq8PnpkAmmwnz2UofHr98BCFtw/eAIFVLZ8lzQbi1kI+dAmwPSlY1L59tgXakmJ6cGvtsDdG5w=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.258.0.tgz"; + sha512 = "KvuitKB3fK1ZjWcB+U6d8JNv0WJtE1zvW5DXI/OabzaIR4i/LNis7469EwTsEkTqG3mV3wUa6cBA6kBSJWTVeA=="; }; }; - "@aws-sdk/eventstream-serde-universal-3.201.0" = { + "@aws-sdk/eventstream-serde-universal-3.258.0" = { name = "_at_aws-sdk_slash_eventstream-serde-universal"; packageName = "@aws-sdk/eventstream-serde-universal"; - version = "3.201.0"; + version = "3.258.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.201.0.tgz"; - sha512 = "Iq7sofa2Ns/ToseL8/m0PwIO5PHY800K4fi3i+6P1JA0bpZxmvkA/bfn+WCLvcB7sNluasqETHNxGs6DgNteIA=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.258.0.tgz"; + sha512 = "woHNrBp8YSIaf3mcRJA0SyKFnjeLX2fRudLZq9wd555Zz/U7f45AuZOpXlU66tIZiYJI1xm32VRSIYfpIwXI+A=="; }; }; - "@aws-sdk/fetch-http-handler-3.204.0" = { + "@aws-sdk/fetch-http-handler-3.257.0" = { name = "_at_aws-sdk_slash_fetch-http-handler"; packageName = "@aws-sdk/fetch-http-handler"; - version = "3.204.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.204.0.tgz"; - sha512 = "TfIhWYQ4CTjrD+FSuBcKMSVrqq8GCwqCfUyalWmSKo4JIFhN5OxUnOFb1/ecE/TJX+YgZ65w4qhVJVHHmh229Q=="; + url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.257.0.tgz"; + sha512 = "zOF+RzQ+wfF7tq7tGUdPcqUTh3+k2f8KCVJE07A8kCopVq4nBu4NH6Eq29Tjpwdya3YlKvE+kFssuQRRRRex+Q=="; }; }; - "@aws-sdk/hash-blob-browser-3.204.0" = { + "@aws-sdk/hash-blob-browser-3.257.0" = { name = "_at_aws-sdk_slash_hash-blob-browser"; packageName = "@aws-sdk/hash-blob-browser"; - version = "3.204.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.204.0.tgz"; - sha512 = "Et0Nic7jnrYtqQt97JMPGkKJ3CFaulW70vFElDypV+TURsuxelweANQfrHsurk+xvHLHakMG5glAVHgyONtXZg=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.257.0.tgz"; + sha512 = "3Nrcci3pCCc0ZILMGa/oUMq9le6nhvgCoVxFy5skYs/mQu4QnA8HcK0u4bTueW41rBj0ZW6BHLk/2SmigIkjCQ=="; }; }; - "@aws-sdk/hash-node-3.201.0" = { + "@aws-sdk/hash-node-3.257.0" = { name = "_at_aws-sdk_slash_hash-node"; packageName = "@aws-sdk/hash-node"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.201.0.tgz"; - sha512 = "WJsMZg5/TMoWnLM+0NuwLwFzHsi89Bi9J1Dt7JdJHXFLoEZV54FEz1PK/Sq5NOldhVljpXQwWOB2dHA2wxFztg=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.257.0.tgz"; + sha512 = "W/USUuea5Ep3OJ2U7Ve8/5KN1YsDun2WzOFUxc1PyxXP5pW6OgC15/op0e+bmWPG851clvp5S8ZuroUr3aKi3Q=="; }; }; - "@aws-sdk/hash-stream-node-3.201.0" = { + "@aws-sdk/hash-stream-node-3.257.0" = { name = "_at_aws-sdk_slash_hash-stream-node"; packageName = "@aws-sdk/hash-stream-node"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.201.0.tgz"; - sha512 = "nagsIlflHlFNswa6XQfpH7/G0OkKu8t2BhZ5NnNzPCx56kcY2asztwBTEeRJEGu8FaaHhUXbVuWi746AK6PHSQ=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.257.0.tgz"; + sha512 = "A24+EI0sO+IYO78sQPY4vVx7vzToc6XAobQqowmBJ6GXXILK72d3MR3NVbm0lmcS4Dh6MVZEFQD/DCyKvj2C7g=="; }; }; - "@aws-sdk/invalid-dependency-3.201.0" = { + "@aws-sdk/invalid-dependency-3.257.0" = { name = "_at_aws-sdk_slash_invalid-dependency"; packageName = "@aws-sdk/invalid-dependency"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.201.0.tgz"; - sha512 = "f/zgntOfIozNyKSaG9dvHjjBaR3y20kYNswMYkSuCM2NIT5LpyHiiq5I11TwaocatUFcDztWpcsv7vHpIgI5Ig=="; + url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.257.0.tgz"; + sha512 = "T68SAPRNMEhpke0wlxURgogL7q0B8dfqZsSeS20BVR/lksJxLse9+pbmCDxiu1RrXoEIsEwl5rbLN+Hw8BFFYw=="; }; }; "@aws-sdk/is-array-buffer-3.201.0" = { @@ -850,337 +868,328 @@ let sha512 = "UPez5qLh3dNgt0DYnPD/q0mVJY84rA17QE26hVNOW3fAji8W2wrwrxdacWOxyXvlxWsVRcKmr+lay1MDqpAMfg=="; }; }; - "@aws-sdk/md5-js-3.204.0" = { + "@aws-sdk/md5-js-3.258.0" = { name = "_at_aws-sdk_slash_md5-js"; packageName = "@aws-sdk/md5-js"; - version = "3.204.0"; + version = "3.258.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.204.0.tgz"; - sha512 = "RXiCvi58Xl2ja9bmd5iFVZyzhGVzBdlLC7uu8Ug9IbF++6muBJ2WdjMkhoMsi5GXqs6238rX3rRt3dLVGKEIqA=="; + url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.258.0.tgz"; + sha512 = "aLdZ43sEiT68p7YYPHwKsWU1WDC8Wf8UQfb4pzbvhYNgr5VxN46AtbWTKxLAqK2adKS4FnbyX2i66fINg2dHdw=="; }; }; - "@aws-sdk/middleware-bucket-endpoint-3.201.0" = { + "@aws-sdk/middleware-bucket-endpoint-3.259.0" = { name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; packageName = "@aws-sdk/middleware-bucket-endpoint"; - version = "3.201.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.201.0.tgz"; - sha512 = "ZZp3YwkEaPqrdL46WzYOMWdBixaVDG0crCdoyBNw/3cI+4bFcsgFp369mqDDmRj3cuJKV4QNSRjlr2ElTz65dQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.259.0.tgz"; + sha512 = "eY4Bf7ZeiYK2c2XQ5IU0TDneEYSnZbaFk+ysgAkNmGoLKBhybXiKy7Dh8djB3uXeNtsZ+fZaazWmsU2kxf6Ntg=="; }; }; - "@aws-sdk/middleware-content-length-3.201.0" = { + "@aws-sdk/middleware-content-length-3.257.0" = { name = "_at_aws-sdk_slash_middleware-content-length"; packageName = "@aws-sdk/middleware-content-length"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.201.0.tgz"; - sha512 = "p4G9AtdrKO8A3Z4RyZiy0isEYwuge7bQRBS7UzcGkcIOhJONq2pcM+gRZYz+NWvfYYNWUg5uODsFQfU8342yKg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.257.0.tgz"; + sha512 = "yiawbV2azm6QnMY1L2ypG8PDRdjOcEIvFmT0T7y0F49rfbKJOu21j1ONAoCkLrINK6kMqcD5JSQLVCoURxiTxQ=="; }; }; - "@aws-sdk/middleware-endpoint-3.201.0" = { + "@aws-sdk/middleware-endpoint-3.257.0" = { name = "_at_aws-sdk_slash_middleware-endpoint"; packageName = "@aws-sdk/middleware-endpoint"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.201.0.tgz"; - sha512 = "F3JlXo5GusbeZR956hA9VxmDxUeg77Xh6o8fveAE2+G4Bjcb1iq9jPNlw6A14vDj3oTKenv2LLnjL2OIfl6hRA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.257.0.tgz"; + sha512 = "RQNQe/jeVuWZtXXfcOm+e3qMFICY6ERsXUrbt0rjHgvajZCklcrRJgxJSCwrcS7Le3nl9azFPMAMj9L7uSK28g=="; }; }; - "@aws-sdk/middleware-expect-continue-3.201.0" = { + "@aws-sdk/middleware-expect-continue-3.257.0" = { name = "_at_aws-sdk_slash_middleware-expect-continue"; packageName = "@aws-sdk/middleware-expect-continue"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.201.0.tgz"; - sha512 = "tpNLdHpwgWAvoMicUARld5MwQ2B6iKGW6vN1Z1si9LTJWGtu8ZXAWACuUDLxC+6A1mDkAcbEc7oy4ABjFldUqA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.257.0.tgz"; + sha512 = "7HSRA2Ta0fTq9Ewznp6fYG7CYOoqr5TeqEhKL1HyFb5i6YmsCiz88JKNJTllD5O7uFcd7Td/fJ66pK4JttfaaQ=="; }; }; - "@aws-sdk/middleware-flexible-checksums-3.201.0" = { + "@aws-sdk/middleware-flexible-checksums-3.259.0" = { name = "_at_aws-sdk_slash_middleware-flexible-checksums"; packageName = "@aws-sdk/middleware-flexible-checksums"; - version = "3.201.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.201.0.tgz"; - sha512 = "InmDcMeaBu1QQ9oS+85eq+hJWTZjYUe9QK2f6S035Tka9FBee4kI8eU61ImNit5FsFsw+POcVGmjYukeXsB4QA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.259.0.tgz"; + sha512 = "DwY3+cWaONvzJSVYQncfX+ZnoPnLVA7LfgR0mrgcvVZJFrqCr1lJeUmJOmE2/kcOQefPfSbKB/L4BP6vg2EUMQ=="; }; }; - "@aws-sdk/middleware-host-header-3.201.0" = { + "@aws-sdk/middleware-host-header-3.257.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.201.0.tgz"; - sha512 = "7KNzdV7nFcKAoahvgGAlzsOq9FFDsU5h3w2iPtVdJhz6ZRDH/2v6WFeUCji+UNZip36gFfMPivoO8Y5smb5r/A=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.257.0.tgz"; + sha512 = "gEi9AJdJfRfU8Qr6HK1hfhxTzyV3Giq4B/h7um99hIFAT/GCg9xiPvAOKPo6UeuiKEv3b7RpSL4s6cBvnJMJBA=="; }; }; - "@aws-sdk/middleware-location-constraint-3.201.0" = { + "@aws-sdk/middleware-location-constraint-3.257.0" = { name = "_at_aws-sdk_slash_middleware-location-constraint"; packageName = "@aws-sdk/middleware-location-constraint"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.201.0.tgz"; - sha512 = "3QL6rM/7Qw0rIqRRI7hQJ6YupR1EXbyhrGQC5nMoZSZ/dQkGkYQLQJmwQDc4yadkJEGE8E1k2yQN0dF65PnJDA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.257.0.tgz"; + sha512 = "pmm5rJR5aatXG0kC0KPBxkgoNn/ePcyVIYHGMEuJXRJm3ENy569QAH9UZeMFjprp3uuAbkqItQbY3MP8TYvuYA=="; }; }; - "@aws-sdk/middleware-logger-3.201.0" = { + "@aws-sdk/middleware-logger-3.257.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.201.0.tgz"; - sha512 = "kYLsa9x3oUJxYU7V5KOO50Kl7b0kk+I4ltkrdarLvvXcVI7ZXmWHzHLT2dkUhj8S0ceVdi0FYHVPJ3GoE8re4A=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.257.0.tgz"; + sha512 = "8RDXW/VbMKBsXDfcCLmROZcWKyrekyiPa3J1aIaBy0tq9o4xpGoXw/lwwIrNVvISAFslb57rteup34bfn6ta6w=="; }; }; - "@aws-sdk/middleware-recursion-detection-3.201.0" = { + "@aws-sdk/middleware-recursion-detection-3.257.0" = { name = "_at_aws-sdk_slash_middleware-recursion-detection"; packageName = "@aws-sdk/middleware-recursion-detection"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.201.0.tgz"; - sha512 = "NGOr+n559ZcJLdFoJR8LNGdrOJFIp2BTuWEDYeicNdNb0bETTXrkzcfT1BRhV9CWqCDmjFvjdrzbhS0cw/UUGA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.257.0.tgz"; + sha512 = "rUCih6zHh8k9Edf5N5Er4s508FYbwLM0MWTD2axzlj9TjLqEQ9OKED3wHaLffXSDzodd3oTAfJCLPbWQyoZ3ZQ=="; }; }; - "@aws-sdk/middleware-retry-3.201.0" = { + "@aws-sdk/middleware-retry-3.259.0" = { name = "_at_aws-sdk_slash_middleware-retry"; packageName = "@aws-sdk/middleware-retry"; - version = "3.201.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.201.0.tgz"; - sha512 = "4jQjSKCpSc4oB1X9nNq4FbIAwQrr+mvmUSmg/oe2Llf42Ak1G9gg3rNTtQdfzA/wNMlL4ZFfF5Br+uz06e1hnQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.259.0.tgz"; + sha512 = "pVh1g8e84MAi7eVtWLiiiCtn82LzxOP7+LxTRHatmgIeN22yGQBZILliPDJypUPvDYlwxI1ekiK+oPTcte0Uww=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.201.0" = { + "@aws-sdk/middleware-sdk-s3-3.257.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.201.0.tgz"; - sha512 = "IZGFWevHMQnyDnJTK2MponaSuFbHkj7z7MYX964hC0qoJEfED+rYPYIhUIPjZm5RiQq34MDQPWHLkNQLf9HnPg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.257.0.tgz"; + sha512 = "l9KRlUgsDKV1MB3zfttX/syhIBsG5Z3VVslz6EW09eSqZVreCudW3TMdyeLemup57xC2veEpkgVj8igiXd/LVQ=="; }; }; - "@aws-sdk/middleware-sdk-sts-3.201.0" = { + "@aws-sdk/middleware-sdk-sts-3.257.0" = { name = "_at_aws-sdk_slash_middleware-sdk-sts"; packageName = "@aws-sdk/middleware-sdk-sts"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.201.0.tgz"; - sha512 = "clZuXcoN0mAP4JH5C6pW5+0tdF25+fpFJqE7GNRjjH/NYNk6ImVI0Kq2espEWwVBuaS0/chTDK3b+pK8YOWdhw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.257.0.tgz"; + sha512 = "d6IJCLRi3O2tm4AFK60WNhIwmMmspj1WzKR1q1TaoPzoREPG2xg+Am18wZBRkCyYuRPPrbizmkvAmAJiUolMAw=="; }; }; - "@aws-sdk/middleware-serde-3.201.0" = { + "@aws-sdk/middleware-serde-3.257.0" = { name = "_at_aws-sdk_slash_middleware-serde"; packageName = "@aws-sdk/middleware-serde"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.201.0.tgz"; - sha512 = "Z7AzIuqEDvsZmp80zeT1oYxsoB8uQZby20Z8kF6/vNoq3sIzaGf/wHeNn0p+Vgo2auGSbZcVUZKoDptQLSLwIQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.257.0.tgz"; + sha512 = "/JasfXPWFq24mnCrx9fxW/ISBSp07RJwhsF14qzm8Qy3Z0z470C+QRM6otTwAkYuuVt1wuLjja5agq3Jtzq7dQ=="; }; }; - "@aws-sdk/middleware-signing-3.201.0" = { + "@aws-sdk/middleware-signing-3.257.0" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.201.0.tgz"; - sha512 = "08ri5+mB28tva9RjVIXFcUP5lRTx+Pj8C2HYqF2GL5H3uAo+h3RQ++fEG1uwUMLf7tCEFivcw6SHA1KmCnB7+w=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.257.0.tgz"; + sha512 = "hCH3D83LHmm6nqmtNrGTWZCVjsQXrGHIXbd17/qrw7aPFvcAhsiiCncGFP+XsUXEKa2ZqcSNMUyPrx69ofNRZQ=="; }; }; - "@aws-sdk/middleware-ssec-3.201.0" = { + "@aws-sdk/middleware-ssec-3.257.0" = { name = "_at_aws-sdk_slash_middleware-ssec"; packageName = "@aws-sdk/middleware-ssec"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.201.0.tgz"; - sha512 = "o1OUjVhtXeFbNyNijw4NPu/2xcA2SqqGNg0e5TP0j4HKfZ1S/QVKVCenx+9dlwlElW0tAQxL4bsNGNWOar3FTA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.257.0.tgz"; + sha512 = "YcZrKeZk/0bsFvnTqp2rcF+6BSmeLTA65ZtyNNP2hh7Imaxg3kAQcueOJBeK4YP/5nU7a1mtt/4Q8BqbIjc41g=="; }; }; - "@aws-sdk/middleware-stack-3.201.0" = { + "@aws-sdk/middleware-stack-3.257.0" = { name = "_at_aws-sdk_slash_middleware-stack"; packageName = "@aws-sdk/middleware-stack"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.201.0.tgz"; - sha512 = "lqHYSBP5FBxzA5w5XiYYYpfXabFzleXonqRkqZts1tapNJ4sOd+itiKG8JoNP7LDOwJ8qxNW/a33/gQeh3wkwQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.257.0.tgz"; + sha512 = "awg2F0SvwACBaw4HIObK8pQGfSqAc4Vy+YFzWSfZNVC35oRO6RsRdKHVU99lRC0LrT2Ptmfghl2DMPSrRDbvlQ=="; }; }; - "@aws-sdk/middleware-user-agent-3.201.0" = { + "@aws-sdk/middleware-user-agent-3.257.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.201.0.tgz"; - sha512 = "/rYZ93WN1gDJudXis/0382CEoTqRa4qZJA608u2EPWs5aiMocUrm7pjH5XvKm2OYX8K/lyaMSBvL2OTIMzXGaQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.257.0.tgz"; + sha512 = "37rt75LZyD0UWpbcFuxEGqwF3DZKSixQPl7AsDe6q3KtrO5gGQB+diH5vbY0txNNYyv5IK9WMwvY73mVmoWRmw=="; }; }; - "@aws-sdk/node-config-provider-3.201.0" = { + "@aws-sdk/node-config-provider-3.259.0" = { name = "_at_aws-sdk_slash_node-config-provider"; packageName = "@aws-sdk/node-config-provider"; - version = "3.201.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.201.0.tgz"; - sha512 = "JO0K2qPTYn+pPC7g8rWr1oueg9CqGCkYbINuAuz79vjToOLUQnZT9GiFm7QADe6J6RT1oGEKRQabNaJnp8cFpQ=="; + url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.259.0.tgz"; + sha512 = "DUOqr71oonBvM6yKPdhDBmraqgXHCFrVWFw7hc5ZNxL2wS/EsbKfGPJp+C+SUgpn1upIWPNnh/bNoLAbBkcLsA=="; }; }; - "@aws-sdk/node-http-handler-3.201.0" = { + "@aws-sdk/node-http-handler-3.257.0" = { name = "_at_aws-sdk_slash_node-http-handler"; packageName = "@aws-sdk/node-http-handler"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.201.0.tgz"; - sha512 = "bWjXBd4WCiQcV4PwY+eFnlz9tZ4UiqfiJteav4MDt8YWkVlsVnR8RutmVSm3KZZjO2tJNSrla0ZWBebkNnI/Xg=="; + url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.257.0.tgz"; + sha512 = "8KnWHVVwaGKyTlkTU9BSOAiSovNDoagxemU2l10QqBbzUCVpljCUMUkABEGRJ1yoQCl6DJ7RtNkAyZ8Ne/E15A=="; }; }; - "@aws-sdk/property-provider-3.201.0" = { + "@aws-sdk/property-provider-3.257.0" = { name = "_at_aws-sdk_slash_property-provider"; packageName = "@aws-sdk/property-provider"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.201.0.tgz"; - sha512 = "lVMP75VsYHIW04uYbkjA0I8Bb7b+aEj6PBBLdFoA22S0uCeJOD42OSr2Gtg2fToDGO7LQJw/K2D+LMCYKfZ3vQ=="; + url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.257.0.tgz"; + sha512 = "3rUbRAcF0GZ5PhDiXhS4yREfZ5hOEtvYEa9S/19OdM5eoypOaLU5XnFcCKfnccSP8SkdgpJujzxOMRWNWadlAQ=="; }; }; - "@aws-sdk/protocol-http-3.201.0" = { + "@aws-sdk/protocol-http-3.257.0" = { name = "_at_aws-sdk_slash_protocol-http"; packageName = "@aws-sdk/protocol-http"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.201.0.tgz"; - sha512 = "RdOc1elWFpj8MogxG87nkhtylw0a+OD7W8WFM+Gw4yJMkl7cwW42VIBFfb0+KCGZfIQltIeSLRvfe3WvVPyo7Q=="; + url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.257.0.tgz"; + sha512 = "xt7LGOgZIvbLS3418AYQLacOqx+mo5j4mPiIMz7f6AaUg+/fBUgESVsncKDqxbEJVwwCXSka8Ca0cntJmoeMSw=="; }; }; - "@aws-sdk/querystring-builder-3.201.0" = { + "@aws-sdk/querystring-builder-3.257.0" = { name = "_at_aws-sdk_slash_querystring-builder"; packageName = "@aws-sdk/querystring-builder"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.201.0.tgz"; - sha512 = "FgQnVHpYR19w/HmHEgWpykCn9tdogW0n45Ins6LBCo2aImDf9kBATD4xgN/F2rtogGuLGgu5LIIMHIOj1Tzs/w=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.257.0.tgz"; + sha512 = "mZHWLP7XIkzx1GIXO5WfX/iJ+aY9TWs02RE9FkdL2+by0HEMR65L3brQTbU1mIBJ7BjaPwYH24dljUOSABX7yg=="; }; }; - "@aws-sdk/querystring-parser-3.201.0" = { + "@aws-sdk/querystring-parser-3.257.0" = { name = "_at_aws-sdk_slash_querystring-parser"; packageName = "@aws-sdk/querystring-parser"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.201.0.tgz"; - sha512 = "vS9Ljbqrwi0sIKYxgyZYJUN1AcE291hvuqwty9etgD2w/26SbWiMhjIW/fXJUOZjUvGKkYCpbivJYSzAGAuWfQ=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.257.0.tgz"; + sha512 = "UDrE1dEwWrWT8dG2VCrGYrPxCWOkZ1fPTPkjpkR4KZEdQDZBqU5gYZF2xPj8Nz7pjQVHFuW2wFm3XYEk56GEjg=="; }; }; - "@aws-sdk/s3-request-presigner-3.204.0" = { + "@aws-sdk/s3-request-presigner-3.259.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.204.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.204.0.tgz"; - sha512 = "Jii3HgvImzhUvUZiwb/KAD9bxQvdDYcTNFT0WsPupA36Ewcadk7yeeBeoOXtFsYqVmgVV/Hlt8sF2E9kBDfpzw=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.259.0.tgz"; + sha512 = "1qoVZk/HEnnfsbcsbBa5Y/P34T2wI209+VyEtPQzzmZbBJvOONKWySk2sAS+AJO2ZjZZur/sUS61wteuklDZEA=="; }; }; - "@aws-sdk/service-error-classification-3.201.0" = { + "@aws-sdk/service-error-classification-3.257.0" = { name = "_at_aws-sdk_slash_service-error-classification"; packageName = "@aws-sdk/service-error-classification"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.201.0.tgz"; - sha512 = "Pfcfmurgq8UpM0rXco6FVblcruqN4Mo3TW8/yaXrbctWpmdNT/8v19fffQIIgk94TU8Vf/nPJ7E5DXL7MZr4Fw=="; + url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.257.0.tgz"; + sha512 = "FAyR0XsueGkkqDtkP03cTJQk52NdQ9sZelLynmmlGPUP75LApRPvFe1riKrou6+LsDbwVNVffj6mbDfIcOhaOw=="; }; }; - "@aws-sdk/shared-ini-file-loader-3.201.0" = { + "@aws-sdk/shared-ini-file-loader-3.257.0" = { name = "_at_aws-sdk_slash_shared-ini-file-loader"; packageName = "@aws-sdk/shared-ini-file-loader"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.201.0.tgz"; - sha512 = "Pbxk0TXep0yI8MnK7Prly6JuBm5Me9AITav8/zPEgTZ3fMhXhQhhiuQcuTCI9GeosSzoiu8VvK53oPtBZZFnXQ=="; + url = "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.257.0.tgz"; + sha512 = "HNjC1+Wx3xHiJc+CP14GhIdVhfQGSjroAsWseRxAhONocA9Fl1ZX4hx7+sA5c9nOoMVOovi6ivJ/6lCRPTDRrQ=="; }; }; - "@aws-sdk/signature-v4-3.201.0" = { + "@aws-sdk/signature-v4-3.257.0" = { name = "_at_aws-sdk_slash_signature-v4"; packageName = "@aws-sdk/signature-v4"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.201.0.tgz"; - sha512 = "zEHoG1/hzJq169slggkPy1SN9YPWI78Bbe/MvHGYmCmQDspblu60JSBIbAatNqAxAmcWKc2HqpyGKjCkMG94ZA=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.257.0.tgz"; + sha512 = "aLQQN59X/D0+ShzPD3Anj5ntdMA/RFeNLOUCDyDvremViGi6yxUS98usQ/8bG5Rq0sW2GGMdbFUFmrDvqdiqEQ=="; }; }; - "@aws-sdk/signature-v4-crt-3.201.0" = { + "@aws-sdk/signature-v4-crt-3.257.0" = { name = "_at_aws-sdk_slash_signature-v4-crt"; packageName = "@aws-sdk/signature-v4-crt"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.201.0.tgz"; - sha512 = "msjr54b3/8FuWApGQ8Sk1GLIbcbiTX68ihhJTY7URc+mvnuVOq7Q6bbhxksgTLVoe2naq6lX0H5wPRplAsbuNA=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.257.0.tgz"; + sha512 = "FHM/QulXKxCpAVmAgGduHLps6HAQHZvhY7nnWY+G2Q1S6+d8ijZeaG0fAl7bpZW6FrBbijkWEZV+F7p+V/AHqQ=="; }; }; - "@aws-sdk/signature-v4-multi-region-3.201.0" = { + "@aws-sdk/signature-v4-multi-region-3.257.0" = { name = "_at_aws-sdk_slash_signature-v4-multi-region"; packageName = "@aws-sdk/signature-v4-multi-region"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.201.0.tgz"; - sha512 = "5lVYYcWDwZd/q0mYPGn4zht08nIeeACYCM8HKYMwF7Qzcrne+RM0F4GU1ZWoId1pxjiX+xQSOUEeskx3A5wUtg=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.257.0.tgz"; + sha512 = "4ZyJp6my6F6R8jG+zlIR+Sw3W2vZcBTcpzAnSAHI0UBWjx5/buiKU5QY7oj29H3pESDD7DovZinD7TtHvMNoZw=="; }; }; - "@aws-sdk/smithy-client-3.201.0" = { + "@aws-sdk/smithy-client-3.257.0" = { name = "_at_aws-sdk_slash_smithy-client"; packageName = "@aws-sdk/smithy-client"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.201.0.tgz"; - sha512 = "cL87Jgxczee8YFkWGWKQ2Ze0vjn4+eCa1kDvEYMCOQvNujTuFgatXLgije5a7nVkSnL9WLoIP7Y7fsBGrKfMnQ=="; + url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.257.0.tgz"; + sha512 = "Vy/en+llpslHG6WZ2yuN+On6u7p2hROEURwAST/lpReAwBETjbsxylkWvP8maeGKQ54u9uC6lIZAOJut2I3INw=="; }; }; - "@aws-sdk/types-3.201.0" = { + "@aws-sdk/token-providers-3.259.0" = { + name = "_at_aws-sdk_slash_token-providers"; + packageName = "@aws-sdk/token-providers"; + version = "3.259.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.259.0.tgz"; + sha512 = "61lbk+vjlHBtNK7ZOTdR0rgk9dQ6++tklHpXZY3AQWAl3xx6K4y00HsyAtcP6k24s8B356QwXlrQJrQY5nnkQQ=="; + }; + }; + "@aws-sdk/types-3.257.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.201.0.tgz"; - sha512 = "RCQj2pQyHD330Jd4c5CHJ87k2ZqC3Mmtl6nhwH1dy3vbnGUpc3q+3yinOKoTAY934kIa7ia32Y/2EjuyHxaj1A=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.257.0.tgz"; + sha512 = "LmqXuBQBGeaGi/3Rp7XiEX1B5IPO2UUfBVvu0wwGqVsmstT0SbOVDZGPmxygACbm64n+PRx3uTSDefRfoiWYZg=="; }; }; - "@aws-sdk/url-parser-3.201.0" = { + "@aws-sdk/url-parser-3.257.0" = { name = "_at_aws-sdk_slash_url-parser"; packageName = "@aws-sdk/url-parser"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.201.0.tgz"; - sha512 = "V15aqj0tj4Y79VpuIdHUvX4Nvn4hYPB0RAn/qg5CCComIl0doLOirAQtW1MOBOyctdRlD9Uv7d1QdPLzJZMHjQ=="; + url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.257.0.tgz"; + sha512 = "Qe/AcFe/NFZHa6cN2afXEQn9ehXxh57dWGdRjfjd2lQqNV4WW1R2pl2Tm1ZJ1dwuCNLJi4NHLMk8lrD3QQ8rdg=="; }; }; - "@aws-sdk/util-arn-parser-3.201.0" = { + "@aws-sdk/util-arn-parser-3.208.0" = { name = "_at_aws-sdk_slash_util-arn-parser"; packageName = "@aws-sdk/util-arn-parser"; - version = "3.201.0"; + version = "3.208.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.201.0.tgz"; - sha512 = "FNZsr9ofEf3Ybglgj8ElhuXnHnSFCF1ctT/zGPwNc+7XTMROO36uPIxP22J/GTyMpf4Bx48rXs8JTFvu3P3hig=="; + url = "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.208.0.tgz"; + sha512 = "QV4af+kscova9dv4VuHOgH8wEr/IIYHDGcnyVtkUEqahCejWr1Kuk+SBK0xMwnZY5LSycOtQ8aeqHOn9qOjZtA=="; }; }; - "@aws-sdk/util-base64-3.202.0" = { + "@aws-sdk/util-base64-3.208.0" = { name = "_at_aws-sdk_slash_util-base64"; packageName = "@aws-sdk/util-base64"; - version = "3.202.0"; + version = "3.208.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-base64/-/util-base64-3.202.0.tgz"; - sha512 = "0QlvxCSU2CITeR/x87zls9ma+CkN3EXRGM3M5XnHWaneDI9K+O2uPpAbDfLh0SBJyO0AfIMn7Vh/BvnNNPEDpg=="; - }; - }; - "@aws-sdk/util-base64-browser-3.188.0" = { - name = "_at_aws-sdk_slash_util-base64-browser"; - packageName = "@aws-sdk/util-base64-browser"; - version = "3.188.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-base64-browser/-/util-base64-browser-3.188.0.tgz"; - sha512 = "qlH+5NZBLiyKziL335BEPedYxX6j+p7KFRWXvDQox9S+s+gLCayednpK+fteOhBenCcR9fUZOVuAPScy1I8qCg=="; - }; - }; - "@aws-sdk/util-base64-node-3.201.0" = { - name = "_at_aws-sdk_slash_util-base64-node"; - packageName = "@aws-sdk/util-base64-node"; - version = "3.201.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-base64-node/-/util-base64-node-3.201.0.tgz"; - sha512 = "ydZqNpB3l5kiicInpPDExPb5xHI7uyVIa1vMupnuIrJ412iNb0F2+K8LlFynzw6fSJShVKnqFcWOYRA96z1iIw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-base64/-/util-base64-3.208.0.tgz"; + sha512 = "PQniZph5A6N7uuEOQi+1hnMz/FSOK/8kMFyFO+4DgA1dZ5pcKcn5wiFwHkcTb/BsgVqQa3Jx0VHNnvhlS8JyTg=="; }; }; "@aws-sdk/util-body-length-browser-3.188.0" = { @@ -1192,76 +1201,76 @@ let sha512 = "8VpnwFWXhnZ/iRSl9mTf+VKOX9wDE8QtN4bj9pBfxwf90H1X7E8T6NkiZD3k+HubYf2J94e7DbeHs7fuCPW5Qg=="; }; }; - "@aws-sdk/util-body-length-node-3.201.0" = { + "@aws-sdk/util-body-length-node-3.208.0" = { name = "_at_aws-sdk_slash_util-body-length-node"; packageName = "@aws-sdk/util-body-length-node"; - version = "3.201.0"; + version = "3.208.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.201.0.tgz"; - sha512 = "q+gwQoLn/DOwirb2hgZJeEwo1D3vLhoD6FfSV42Ecfvtb4jHnWReWMHguujfCubuDgZCrMEvYQzuocS75HHsbA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.208.0.tgz"; + sha512 = "3zj50e5g7t/MQf53SsuuSf0hEELzMtD8RX8C76f12OSRo2Bca4FLLYHe0TZbxcfQHom8/hOaeZEyTyMogMglqg=="; }; }; - "@aws-sdk/util-buffer-from-3.201.0" = { + "@aws-sdk/util-buffer-from-3.208.0" = { name = "_at_aws-sdk_slash_util-buffer-from"; packageName = "@aws-sdk/util-buffer-from"; - version = "3.201.0"; + version = "3.208.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.201.0.tgz"; - sha512 = "s6Wjltd9vU+vR3n0pqSPmNDcrrkrVTdV4t7x2zz3nDsFKTI77iVNafDmuaUlOA/bIlpjCJqaWecoVrZmEKeR7A=="; + url = "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.208.0.tgz"; + sha512 = "7L0XUixNEFcLUGPeBF35enCvB9Xl+K6SQsmbrPk1P3mlV9mguWSDQqbOBwY1Ir0OVbD6H/ZOQU7hI/9RtRI0Zw=="; }; }; - "@aws-sdk/util-config-provider-3.201.0" = { + "@aws-sdk/util-config-provider-3.208.0" = { name = "_at_aws-sdk_slash_util-config-provider"; packageName = "@aws-sdk/util-config-provider"; - version = "3.201.0"; + version = "3.208.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.201.0.tgz"; - sha512 = "cCRJlnRRP8vrLJomzJRBIyiyohsjJKmnIaQ9t0tAhGCywZbyjx6TlpYRZYfVWo+MwdF1Pi8ZScTrFPW0JuBOIQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.208.0.tgz"; + sha512 = "DSRqwrERUsT34ug+anlMBIFooBEGwM8GejC7q00Y/9IPrQy50KnG5PW2NiTjuLKNi7pdEOlwTSEocJE15eDZIg=="; }; }; - "@aws-sdk/util-create-request-3.201.0" = { + "@aws-sdk/util-create-request-3.257.0" = { name = "_at_aws-sdk_slash_util-create-request"; packageName = "@aws-sdk/util-create-request"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.201.0.tgz"; - sha512 = "bzOy/hW/j6lIn5ulXwcOHKfA1BrlqLXOIt95ZdT6TCsi+sXFACAS9ns0mrEUTMPXCLGEQM6lIW0tVmh9a1BMSg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.257.0.tgz"; + sha512 = "2s1/LuNtauhwULdYTDMlLCKKmaYZTO8AcAVGOU5n8rCe9eQYWV77xITcf0iB7ilKq/nXBstIpYsbuldq4AIqXQ=="; }; }; - "@aws-sdk/util-defaults-mode-browser-3.201.0" = { + "@aws-sdk/util-defaults-mode-browser-3.257.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-browser"; packageName = "@aws-sdk/util-defaults-mode-browser"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.201.0.tgz"; - sha512 = "skRMAM+xrV/sDvvtHC81ExEKQEiZFaRrRdUT39fBX1SpGnFTo2wpv7XK+rAW2XopGgnLPytXLQD97Kub79o4zA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.257.0.tgz"; + sha512 = "nkfK+MNacVd3Px/fcAvU0hDeh+r7d+RLLt3sJ5Zc0gGd+i3OQEP58V8QzR9PYMvUvSvGQP16fQVQHSbRZtuWyQ=="; }; }; - "@aws-sdk/util-defaults-mode-node-3.201.0" = { + "@aws-sdk/util-defaults-mode-node-3.259.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-node"; packageName = "@aws-sdk/util-defaults-mode-node"; - version = "3.201.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.201.0.tgz"; - sha512 = "9N5LXRhxigbkbEcjQ4nNXHuQxp0VFlbc2/5wbcuPjIKX/OROiQI4mYQ6nuSKk7eku5sNFb9FtEHeD/RZo8od6Q=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.259.0.tgz"; + sha512 = "wRiiwT7ayIcTYGHUg/Ho9UN/Kd4V37OAxP2IbkG9rPZJNuvtKopQJhUSMDERXaMQ47dG5US8G4YVYJIEO4cKgw=="; }; }; - "@aws-sdk/util-endpoints-3.202.0" = { + "@aws-sdk/util-endpoints-3.257.0" = { name = "_at_aws-sdk_slash_util-endpoints"; packageName = "@aws-sdk/util-endpoints"; - version = "3.202.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.202.0.tgz"; - sha512 = "sNees5uDp7nfEbvzaA1DAHqoEvEb9ZOkdNH5gcj/FMBETbr00YtsuXsTZogTHQsX/otRTiudZBE3iH7R4SLSAQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.257.0.tgz"; + sha512 = "3bvmRn5XGYzPPWjLuvHBKdJOb+fijnb8Ungu9bfXnTYFsng/ndHUWeHC22O/p8w3OWoRYUIMaZHxdxe27BFozg=="; }; }; - "@aws-sdk/util-format-url-3.201.0" = { + "@aws-sdk/util-format-url-3.257.0" = { name = "_at_aws-sdk_slash_util-format-url"; packageName = "@aws-sdk/util-format-url"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.201.0.tgz"; - sha512 = "hoGPnhB7qRbTMf0o1vUtG+q1Bu7YTOZEt8yMA9tjC6b4Je3ZWGu4+Tx+d6zUTPt06n37Ek7oDIsU8KG/hcRYew=="; + url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.257.0.tgz"; + sha512 = "Q/c1BLoEZLvnjagAE0nQryhQlFoC/a8ZrXJn4XljWPeFcFAVLpCoSzcTbQM1N4oQvDIgMvl5gBeGzp0BiW30QA=="; }; }; "@aws-sdk/util-hex-encoding-3.201.0" = { @@ -1273,40 +1282,49 @@ let sha512 = "7t1vR1pVxKx0motd3X9rI3m/xNp78p3sHtP5yo4NP4ARpxyJ0fokBomY8ScaH2D/B+U5o9ARxldJUdMqyBlJcA=="; }; }; - "@aws-sdk/util-locate-window-3.201.0" = { + "@aws-sdk/util-locate-window-3.208.0" = { name = "_at_aws-sdk_slash_util-locate-window"; packageName = "@aws-sdk/util-locate-window"; - version = "3.201.0"; + version = "3.208.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.201.0.tgz"; - sha512 = "hPJgifWh/rADabLAk1C9xXA2B3O4NUmbU58KgBRgC1HksiiHGFVZObB5fkBH8US/XV2jwORkpSf4OhretXQuKg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.208.0.tgz"; + sha512 = "iua1A2+P7JJEDHVgvXrRJSvsnzG7stYSGQnBVphIUlemwl6nN5D+QrgbjECtrbxRz8asYFHSzhdhECqN+tFiBg=="; }; }; - "@aws-sdk/util-middleware-3.201.0" = { + "@aws-sdk/util-middleware-3.257.0" = { name = "_at_aws-sdk_slash_util-middleware"; packageName = "@aws-sdk/util-middleware"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.201.0.tgz"; - sha512 = "iAitcEZo17IyKn4ku1IBgtomr25esu5OuSRjw5Or4bNOeqXB0w50cItf/9qft8LIhbvBEAUtNAYXvqNzvhTZdQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.257.0.tgz"; + sha512 = "F9ieon8B8eGVs5tyZtAIG3DZEObDvujkspho0qRbUTHUosM0ylJLsMU800fmC/uRHLRrZvb/RSp59+kNDwSAMw=="; }; }; - "@aws-sdk/util-stream-browser-3.204.0" = { + "@aws-sdk/util-retry-3.257.0" = { + name = "_at_aws-sdk_slash_util-retry"; + packageName = "@aws-sdk/util-retry"; + version = "3.257.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-retry/-/util-retry-3.257.0.tgz"; + sha512 = "l9TOsOAYtZxwW3q5fQKW4rsD9t2HVaBfQ4zBamHkNTfB4vBVvCnz4oxkvSvA2MlxCA6am+K1K/oj917Tpqk53g=="; + }; + }; + "@aws-sdk/util-stream-browser-3.258.0" = { name = "_at_aws-sdk_slash_util-stream-browser"; packageName = "@aws-sdk/util-stream-browser"; - version = "3.204.0"; + version = "3.258.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.204.0.tgz"; - sha512 = "LH+Th/Oww6icUvqVbL5Y+R4mUGUuwLRWpiOJnK8/Ufyw7JMEvHZOGXPIAtXmEB1t+0gTVVDCP0Z0y6ItINlGtA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.258.0.tgz"; + sha512 = "MCAxHL3Hz/+eU4LZk0ZbLWAIUueH/jHpSbrloxZ3Dil2RL3w6NSJd5gE8zS7gs1B/eMcE600Brf5xSDR8kA5HA=="; }; }; - "@aws-sdk/util-stream-node-3.201.0" = { + "@aws-sdk/util-stream-node-3.257.0" = { name = "_at_aws-sdk_slash_util-stream-node"; packageName = "@aws-sdk/util-stream-node"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.201.0.tgz"; - sha512 = "RWU+ZJHKL4lYZBeNIpHo5EuNaYRDkJeytP8cbBQn+wuzDz19mGF2uikK+JaQdNd5HG9lovDP66SJ8gJ0WBnwNw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.257.0.tgz"; + sha512 = "UlLEerQCNejNulYmGXm/4X463n8n21foA2d6kgJ4AUSMWWhoRBjfwrM4gI7tA30zh9U81d6xbUtoOQTqKVtMTw=="; }; }; "@aws-sdk/util-uri-escape-3.201.0" = { @@ -1318,49 +1336,49 @@ let sha512 = "TeTWbGx4LU2c5rx0obHeDFeO9HvwYwQtMh1yniBz00pQb6Qt6YVOETVQikRZ+XRQwEyCg/dA375UplIpiy54mA=="; }; }; - "@aws-sdk/util-user-agent-browser-3.201.0" = { + "@aws-sdk/util-user-agent-browser-3.257.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.201.0.tgz"; - sha512 = "iL2gyz7GuUVtZcMZpqvfxdFrl9hc28qpagymmJ/w2yhN86YNPHdK8Sx1Yo6VxNGVDCCWGb7tHXf7VP+U4Yv/Lg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.257.0.tgz"; + sha512 = "YdavWK6/8Cw6mypEgysGGX/dT9p9qnzFbnN5PQsUY+JJk2Nx8fKFydjGiQ+6rWPeW17RAv9mmbboh9uPVWxVlw=="; }; }; - "@aws-sdk/util-user-agent-node-3.201.0" = { + "@aws-sdk/util-user-agent-node-3.259.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.201.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.201.0.tgz"; - sha512 = "6lhhvwB3AZSISnYQpDGdlyTrzfYK2P9QYjy7vZEBRd9TSOaggiFICXe03ZvZfVOSeg0EInlMKn1fIHzPUHRuHQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.259.0.tgz"; + sha512 = "R0VTmNs+ySDDebU98BUbsLyeIM5YmAEr9esPpy15XfSy3AWmAeru8nLlztdaLilHZzLIDzvM2t7NGk/FzZFCvA=="; }; }; - "@aws-sdk/util-utf8-browser-3.188.0" = { + "@aws-sdk/util-utf8-3.254.0" = { + name = "_at_aws-sdk_slash_util-utf8"; + packageName = "@aws-sdk/util-utf8"; + version = "3.254.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-utf8/-/util-utf8-3.254.0.tgz"; + sha512 = "14Kso/eIt5/qfIBmhEL9L1IfyUqswjSTqO2mY7KOzUZ9SZbwn3rpxmtkhmATkRjD7XIlLKaxBkI7tU9Zjzj8Kw=="; + }; + }; + "@aws-sdk/util-utf8-browser-3.259.0" = { name = "_at_aws-sdk_slash_util-utf8-browser"; packageName = "@aws-sdk/util-utf8-browser"; - version = "3.188.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.188.0.tgz"; - sha512 = "jt627x0+jE+Ydr9NwkFstg3cUvgWh56qdaqAMDsqgRlKD21md/6G226z/Qxl7lb1VEW2LlmCx43ai/37Qwcj2Q=="; + url = "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz"; + sha512 = "UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw=="; }; }; - "@aws-sdk/util-utf8-node-3.201.0" = { - name = "_at_aws-sdk_slash_util-utf8-node"; - packageName = "@aws-sdk/util-utf8-node"; - version = "3.201.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-utf8-node/-/util-utf8-node-3.201.0.tgz"; - sha512 = "A+bJFR/1rHYOJg137E69L1sX0I+LH+xf9ZjMXG9BVO0hSo7yDPoJVpHrzTJyOc3tuRITjIGBv9Qi4TKcoOSi1A=="; - }; - }; - "@aws-sdk/util-waiter-3.201.0" = { + "@aws-sdk/util-waiter-3.257.0" = { name = "_at_aws-sdk_slash_util-waiter"; packageName = "@aws-sdk/util-waiter"; - version = "3.201.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.201.0.tgz"; - sha512 = "NE8+BkPDXq86oyVr9EKN1s+iN8GID8mhj6DbtEZKZES3fJ36xH7MldRylgCewgv1Qpd1W00M4c/mVvUx3zp7sg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.257.0.tgz"; + sha512 = "Fr6of3EDOcXVDs5534o7VsJMXdybB0uLy2LzeFAVSwGOY3geKhIquBAiUDqCVu9B+iTldrC0rQ9NIM7ZSpPG8w=="; }; }; "@aws-sdk/xml-builder-3.201.0" = { @@ -1408,13 +1426,22 @@ let sha512 = "HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ=="; }; }; - "@azure/core-client-1.6.1" = { + "@azure/core-client-1.7.0" = { name = "_at_azure_slash_core-client"; packageName = "@azure/core-client"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.6.1.tgz"; - sha512 = "mZ1MSKhZBYoV8GAWceA+PEJFWV2VpdNSpxxcj1wjIAOi00ykRuIQChT99xlQGZWLY3/NApWhSImlFwsmCEs4vA=="; + url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.0.tgz"; + sha512 = "fgaLVlF3xGg8JAt7Hl7vkKIJcCAA9NpsvIvb44qaEOW6CaJ+IaHKL7oWe5+oGOVR+y/z2Gd2joyvslqwDvRfTw=="; + }; + }; + "@azure/core-http-2.3.1" = { + name = "_at_azure_slash_core-http"; + packageName = "@azure/core-http"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.3.1.tgz"; + sha512 = "cur03BUwV0Tbv81bQBOLafFB02B6G++K6F2O3IMl8pSE2QlXm3cu11bfyBNlDUKi5U+xnB3GC63ae3athhkx6Q=="; }; }; "@azure/core-http-compat-1.3.0" = { @@ -1426,13 +1453,13 @@ let sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA=="; }; }; - "@azure/core-lro-2.4.0" = { + "@azure/core-lro-2.5.0" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.4.0.tgz"; - sha512 = "F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ=="; + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.0.tgz"; + sha512 = "Vsd5Sl04RG/p5ui/p0dAFMov5I/W4dmRjOrtWGXVs4vY/hNMPefiFH7cZEOr+1u0XrBKkpvt634IyUUD9bVRuQ=="; }; }; "@azure/core-paging-1.4.0" = { @@ -1444,13 +1471,22 @@ let sha512 = "tabFtZTg8D9XqZKEfNUOGh63SuYeOxmvH4GDcOJN+R1bZWZ1FZskctgY9Pmuwzhn+0Xvq9rmimK9hsvtLkeBsw=="; }; }; - "@azure/core-rest-pipeline-1.10.0" = { + "@azure/core-rest-pipeline-1.10.1" = { name = "_at_azure_slash_core-rest-pipeline"; packageName = "@azure/core-rest-pipeline"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.0.tgz"; - sha512 = "m6c4iAalfaf6sytOOQhLKFprEHSkSjQuRgkW7MTMnAN+GENDDL4XZJp7WKFnq9VpKUE+ggq+rp5xX9GI93lumw=="; + url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz"; + sha512 = "Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA=="; + }; + }; + "@azure/core-tracing-1.0.0-preview.13" = { + name = "_at_azure_slash_core-tracing"; + packageName = "@azure/core-tracing"; + version = "1.0.0-preview.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz"; + sha512 = "KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ=="; }; }; "@azure/core-tracing-1.0.1" = { @@ -1498,13 +1534,13 @@ let sha512 = "aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g=="; }; }; - "@azure/msal-browser-2.30.0" = { + "@azure/msal-browser-2.32.2" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.30.0"; + version = "2.32.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.30.0.tgz"; - sha512 = "4Y9+rjJiTFP7KEmuq1btmIrBgk0ImNyKsXj6A6NHZALd1X0M6W7L7kxpH6F+d1tEkMv8bYnZdn7IcauXbL8Llw=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.2.tgz"; + sha512 = "1YqGzXtPG3QrZPFBKaMWr2WQdukDj+PelqUCv351+p+hlw/AhdRrb8haY73/iqkhT6Cdrbnh7sL4gikVsF4O1g=="; }; }; "@azure/msal-common-7.6.0" = { @@ -1516,22 +1552,40 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-node-1.14.2" = { - name = "_at_azure_slash_msal-node"; - packageName = "@azure/msal-node"; - version = "1.14.2"; + "@azure/msal-common-9.1.1" = { + name = "_at_azure_slash_msal-common"; + packageName = "@azure/msal-common"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.2.tgz"; - sha512 = "t3whVhhLdZVVeDEtUPD2Wqfa8BDi3EDMnpWp8dbuRW0GhUpikBfs4AQU0Fe6P9zS87n9LpmUTLrIcPEEuzkvfA=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.1.1.tgz"; + sha512 = "we9xR8lvu47fF0h+J8KyXoRy9+G/fPzm3QEa2TrdR3jaVS3LKAyE2qyMuUkNdbVkvzl8Zr9f7l+IUSP22HeqXw=="; }; }; - "@babel/cli-7.19.3" = { + "@azure/msal-node-1.14.6" = { + name = "_at_azure_slash_msal-node"; + packageName = "@azure/msal-node"; + version = "1.14.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.6.tgz"; + sha512 = "em/qqFL5tLMxMPl9vormAs13OgZpmQoJbiQ/GlWr+BA77eCLoL+Ehr5xRHowYo+LFe5b+p+PJVkRvT+mLvOkwA=="; + }; + }; + "@azure/storage-blob-12.11.0" = { + name = "_at_azure_slash_storage-blob"; + packageName = "@azure/storage-blob"; + version = "12.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.11.0.tgz"; + sha512 = "na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg=="; + }; + }; + "@babel/cli-7.20.7" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.19.3"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.19.3.tgz"; - sha512 = "643/TybmaCAe101m2tSVHi9UKpETXP9c/Ff4mD2tAwkdP6esKIfaauZFc67vGEM6r9fekbEGid+sZhbEnSe3dg=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.20.7.tgz"; + sha512 = "WylgcELHB66WwQqItxNILsMlaTd8/SO6SgTTjMp4uCI7P4QyH1r3nqgFmO3BfM4AtfniHgFMH3EpYFj/zynBkQ=="; }; }; "@babel/code-frame-7.10.4" = { @@ -1561,13 +1615,13 @@ let sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.20.1" = { + "@babel/compat-data-7.20.14" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.20.1"; + version = "7.20.14"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz"; - sha512 = "EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.14.tgz"; + sha512 = "0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw=="; }; }; "@babel/core-7.0.0" = { @@ -1579,31 +1633,13 @@ let sha512 = "nrvxS5u6QUN5gLl1GEakIcmOeoUHT1/gQtdMRq18WFURJ5osn4ppJLVSseMQo4zVWKJfBTF4muIYijXUnKlRLQ=="; }; }; - "@babel/core-7.20.2" = { + "@babel/core-7.20.12" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.20.2"; + version = "7.20.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.20.2.tgz"; - sha512 = "w7DbG8DtMrJcFOi4VrLm+8QM4az8Mo+PuLBKLp2zrYRCow8W/f9xiXm5sN53C8HksCyDQwCKha9JiDoIyPjT2g=="; - }; - }; - "@babel/core-7.9.0" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz"; - sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; - }; - }; - "@babel/eslint-parser-7.19.1" = { - name = "_at_babel_slash_eslint-parser"; - packageName = "@babel/eslint-parser"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz"; - sha512 = "AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz"; + sha512 = "XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg=="; }; }; "@babel/generator-7.18.2" = { @@ -1615,13 +1651,13 @@ let sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; }; }; - "@babel/generator-7.20.2" = { + "@babel/generator-7.20.14" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.20.2"; + version = "7.20.14"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.2.tgz"; - sha512 = "SD75PMIK6i9H8G/tfGvB4KKl4Nw6Ssos9nGgYwxbgyTP0iX/Z55DveoH86rmUB/YHTQQ+ZC0F7xxaY8l2OF44Q=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz"; + sha512 = "AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -1642,31 +1678,31 @@ let sha512 = "yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw=="; }; }; - "@babel/helper-compilation-targets-7.20.0" = { + "@babel/helper-compilation-targets-7.20.7" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.20.0"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz"; - sha512 = "0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz"; + sha512 = "4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.20.2" = { + "@babel/helper-create-class-features-plugin-7.20.12" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.20.2"; + version = "7.20.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.2.tgz"; - sha512 = "k22GoYRAHPYr9I+Gvy2ZQlAe5mGy8BqWst2wRt8cwIufWTxrsVshhIBvYNqC80N0GSFWTsqRVexOtfzlgOEDvA=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz"; + sha512 = "9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.19.0" = { + "@babel/helper-create-regexp-features-plugin-7.20.5" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.19.0"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz"; - sha512 = "htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz"; + sha512 = "m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w=="; }; }; "@babel/helper-define-polyfill-provider-0.3.3" = { @@ -1714,13 +1750,13 @@ let sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; }; }; - "@babel/helper-member-expression-to-functions-7.18.9" = { + "@babel/helper-member-expression-to-functions-7.20.7" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.18.9"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz"; - sha512 = "RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz"; + sha512 = "9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw=="; }; }; "@babel/helper-module-imports-7.18.6" = { @@ -1732,13 +1768,13 @@ let sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.20.2" = { + "@babel/helper-module-transforms-7.20.11" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.20.2"; + version = "7.20.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz"; - sha512 = "zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz"; + sha512 = "uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg=="; }; }; "@babel/helper-optimise-call-expression-7.18.6" = { @@ -1768,13 +1804,13 @@ let sha512 = "dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA=="; }; }; - "@babel/helper-replace-supers-7.19.1" = { + "@babel/helper-replace-supers-7.20.7" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.19.1"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz"; - sha512 = "T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz"; + sha512 = "vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A=="; }; }; "@babel/helper-simple-access-7.20.2" = { @@ -1831,22 +1867,22 @@ let sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; }; }; - "@babel/helper-wrap-function-7.19.0" = { + "@babel/helper-wrap-function-7.20.5" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.19.0"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz"; - sha512 = "txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz"; + sha512 = "bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q=="; }; }; - "@babel/helpers-7.20.1" = { + "@babel/helpers-7.20.13" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.20.1"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.1.tgz"; - sha512 = "J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz"; + sha512 = "nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg=="; }; }; "@babel/highlight-7.18.6" = { @@ -1858,13 +1894,22 @@ let sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/node-7.20.2" = { + "@babel/node-7.20.7" = { name = "_at_babel_slash_node"; packageName = "@babel/node"; - version = "7.20.2"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/node/-/node-7.20.2.tgz"; - sha512 = "s4zKG8fccCpqXEXxSkzE8vAREefRneatdGfNQDPqikTTpQmWF4Bt1OTZ9r8GghKJSeNEgRJwbI5ZSmGBQLvAEQ=="; + url = "https://registry.npmjs.org/@babel/node/-/node-7.20.7.tgz"; + sha512 = "AQt3gVcP+fpFuoFn4FmIW/+5JovvEoA9og4Y1LrRw0pv3jkl4tujZMMy3X/3ugjLrEy3k1aNywo3JIl3g+jVXQ=="; + }; + }; + "@babel/parser-7.16.4" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.16.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz"; + sha512 = "6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng=="; }; }; "@babel/parser-7.18.4" = { @@ -1876,13 +1921,13 @@ let sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="; }; }; - "@babel/parser-7.20.2" = { + "@babel/parser-7.20.13" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.20.2"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.2.tgz"; - sha512 = "afk318kh2uKbo7BEj2QtEi8HVCGrwHUffrYDy7dgVcSa2j9lY3LDjPzcyGdpX7xgm35aWqvciZJ4WKmdF/SxYg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.13.tgz"; + sha512 = "gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { @@ -1894,22 +1939,22 @@ let sha512 = "Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" = { + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.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.18.9"; + version = "7.20.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.18.9.tgz"; - sha512 = "AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz"; + sha512 = "sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.20.1" = { + "@babel/plugin-proposal-async-generator-functions-7.20.7" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.20.1"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz"; - sha512 = "Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz"; + sha512 = "xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA=="; }; }; "@babel/plugin-proposal-class-properties-7.0.0" = { @@ -1930,22 +1975,22 @@ let sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; }; }; - "@babel/plugin-proposal-class-static-block-7.18.6" = { + "@babel/plugin-proposal-class-static-block-7.20.7" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.18.6"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz"; - sha512 = "+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.20.7.tgz"; + sha512 = "AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ=="; }; }; - "@babel/plugin-proposal-decorators-7.20.2" = { + "@babel/plugin-proposal-decorators-7.20.13" = { name = "_at_babel_slash_plugin-proposal-decorators"; packageName = "@babel/plugin-proposal-decorators"; - version = "7.20.2"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.2.tgz"; - sha512 = "nkBH96IBmgKnbHQ5gXFrcmez+Z9S2EIDKDQGp005ROqBigc88Tky4rzCnlP/lnlj245dCEQl4/YyV0V1kYh5dw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.13.tgz"; + sha512 = "7T6BKHa9Cpd7lCueHBBzP0nkXNina+h5giOZw+a8ZpMfPFY19VjJAjIxyFHuWkhCWgL6QMqRiY/wB1fLXzm6Mw=="; }; }; "@babel/plugin-proposal-dynamic-import-7.18.6" = { @@ -1984,13 +2029,13 @@ let sha512 = "lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.18.9" = { + "@babel/plugin-proposal-logical-assignment-operators-7.20.7" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.18.9"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz"; - sha512 = "128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz"; + sha512 = "y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug=="; }; }; "@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" = { @@ -2020,13 +2065,13 @@ let sha512 = "14fhfoPcNu7itSen7Py1iGN0gEm87hX/B+8nZPqkdmANyyYWYMY2pjA3r8WXbWVKMzfnSNS0xY8GVS0IjXi/iw=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.20.2" = { + "@babel/plugin-proposal-object-rest-spread-7.20.7" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.20.2"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz"; - sha512 = "Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz"; + sha512 = "d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.18.6" = { @@ -2038,13 +2083,13 @@ let sha512 = "Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.18.9" = { + "@babel/plugin-proposal-optional-chaining-7.20.7" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.18.9"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz"; - sha512 = "v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz"; + sha512 = "T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ=="; }; }; "@babel/plugin-proposal-private-methods-7.18.6" = { @@ -2056,13 +2101,13 @@ let sha512 = "nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA=="; }; }; - "@babel/plugin-proposal-private-property-in-object-7.18.6" = { + "@babel/plugin-proposal-private-property-in-object-7.20.5" = { name = "_at_babel_slash_plugin-proposal-private-property-in-object"; packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.18.6"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz"; - sha512 = "9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz"; + sha512 = "Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ=="; }; }; "@babel/plugin-proposal-unicode-property-regex-7.18.6" = { @@ -2263,22 +2308,22 @@ let sha512 = "rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ=="; }; }; - "@babel/plugin-transform-arrow-functions-7.18.6" = { + "@babel/plugin-transform-arrow-functions-7.20.7" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.18.6"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz"; - sha512 = "9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz"; + sha512 = "3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ=="; }; }; - "@babel/plugin-transform-async-to-generator-7.18.6" = { + "@babel/plugin-transform-async-to-generator-7.20.7" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.18.6"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz"; - sha512 = "ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz"; + sha512 = "Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q=="; }; }; "@babel/plugin-transform-block-scoped-functions-7.18.6" = { @@ -2290,40 +2335,40 @@ let sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.20.2" = { + "@babel/plugin-transform-block-scoping-7.20.14" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.20.2"; + version = "7.20.14"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz"; - sha512 = "y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.14.tgz"; + sha512 = "sMPepQtsOs5fM1bwNvuJJHvaCfOEQfmc01FGw0ELlTpTJj5Ql/zuNRRldYhAPys4ghXdBIQJbRVYi44/7QflQQ=="; }; }; - "@babel/plugin-transform-classes-7.20.2" = { + "@babel/plugin-transform-classes-7.20.7" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.20.2"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz"; - sha512 = "9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.7.tgz"; + sha512 = "LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ=="; }; }; - "@babel/plugin-transform-computed-properties-7.18.9" = { + "@babel/plugin-transform-computed-properties-7.20.7" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.18.9"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz"; - sha512 = "+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz"; + sha512 = "Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ=="; }; }; - "@babel/plugin-transform-destructuring-7.20.2" = { + "@babel/plugin-transform-destructuring-7.20.7" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.20.2"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz"; - sha512 = "mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz"; + sha512 = "Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA=="; }; }; "@babel/plugin-transform-dotall-regex-7.18.6" = { @@ -2398,31 +2443,31 @@ let sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA=="; }; }; - "@babel/plugin-transform-modules-amd-7.19.6" = { + "@babel/plugin-transform-modules-amd-7.20.11" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.19.6"; + version = "7.20.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz"; - sha512 = "uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz"; + sha512 = "NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.19.6" = { + "@babel/plugin-transform-modules-commonjs-7.20.11" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.19.6"; + version = "7.20.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz"; - sha512 = "8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz"; + sha512 = "S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.19.6" = { + "@babel/plugin-transform-modules-systemjs-7.20.11" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.19.6"; + version = "7.20.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz"; - sha512 = "fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz"; + sha512 = "vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw=="; }; }; "@babel/plugin-transform-modules-umd-7.18.6" = { @@ -2434,13 +2479,13 @@ let sha512 = "dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.19.1" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.20.5" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.19.1"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz"; - sha512 = "oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz"; + sha512 = "mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA=="; }; }; "@babel/plugin-transform-new-target-7.18.6" = { @@ -2461,13 +2506,13 @@ let sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="; }; }; - "@babel/plugin-transform-parameters-7.20.1" = { + "@babel/plugin-transform-parameters-7.20.7" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.20.1"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.1.tgz"; - sha512 = "nDvKLrAvl+kf6BOy1UJ3MGwzzfTMgppxwiD2Jb4LO3xjYyZq30oQzDNJbCQpMdG9+j2IXHoiMrw5Cm/L6ZoxXQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz"; + sha512 = "WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA=="; }; }; "@babel/plugin-transform-property-literals-7.18.6" = { @@ -2488,13 +2533,13 @@ let sha512 = "TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA=="; }; }; - "@babel/plugin-transform-react-jsx-7.19.0" = { + "@babel/plugin-transform-react-jsx-7.20.13" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.19.0"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz"; - sha512 = "UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.13.tgz"; + sha512 = "MmTZx/bkUrfJhhYAYt3Urjm+h8DQGrPrnKQ94jLo7NLuOU+T89a7IByhKmrb8SKhrIYIQ0FN0CHMbnFRen4qNw=="; }; }; "@babel/plugin-transform-react-jsx-development-7.18.6" = { @@ -2533,13 +2578,13 @@ let sha512 = "I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ=="; }; }; - "@babel/plugin-transform-regenerator-7.18.6" = { + "@babel/plugin-transform-regenerator-7.20.5" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.18.6"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz"; - sha512 = "poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz"; + sha512 = "kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ=="; }; }; "@babel/plugin-transform-reserved-words-7.18.6" = { @@ -2578,13 +2623,13 @@ let sha512 = "eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw=="; }; }; - "@babel/plugin-transform-spread-7.19.0" = { + "@babel/plugin-transform-spread-7.20.7" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.19.0"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz"; - sha512 = "RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz"; + sha512 = "ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw=="; }; }; "@babel/plugin-transform-sticky-regex-7.18.6" = { @@ -2614,13 +2659,13 @@ let sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw=="; }; }; - "@babel/plugin-transform-typescript-7.20.2" = { + "@babel/plugin-transform-typescript-7.20.13" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.20.2"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.2.tgz"; - sha512 = "jvS+ngBfrnTUBfOQq8NfGnSbF9BrqlR6hjJ2yVxMkmO5nL/cdifNbI30EfjRlN4g5wYWNnMPyj5Sa6R1pbLeag=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.13.tgz"; + sha512 = "O7I/THxarGcDZxkgWKMUrk7NK1/WbHAg3Xx86gqS6x9MTrNL6AwIluuZ96ms4xeDe6AVx6rjHbWHP7x26EPQBA=="; }; }; "@babel/plugin-transform-unicode-escapes-7.18.10" = { @@ -2740,22 +2785,22 @@ let sha512 = "7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA=="; }; }; - "@babel/runtime-7.19.4" = { + "@babel/runtime-7.12.1" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.19.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.4.tgz"; - sha512 = "EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz"; + sha512 = "J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA=="; }; }; - "@babel/runtime-7.20.1" = { + "@babel/runtime-7.20.13" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.20.1"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz"; - sha512 = "mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz"; + sha512 = "gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA=="; }; }; "@babel/runtime-7.9.0" = { @@ -2776,15 +2821,6 @@ let sha512 = "Yww0jXgolNtkhcK+Txo5JN+DjBpNmmAtD7G99HOebhEjBzjnACG09Tip9C8lSOF6PrhA56OeJWeOZduNJaKxBA=="; }; }; - "@babel/runtime-corejs3-7.20.1" = { - name = "_at_babel_slash_runtime-corejs3"; - packageName = "@babel/runtime-corejs3"; - version = "7.20.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.1.tgz"; - sha512 = "CGulbEDcg/ND1Im7fUNRZdGXmX2MTWVVZacQi/6DiKE5HNwZ3aVTm5PV4lO8HHz0B2h8WQyvKKjbX5XgTtydsg=="; - }; - }; "@babel/template-7.0.0" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; @@ -2794,22 +2830,22 @@ let sha512 = "VLQZik/G5mjYJ6u19U3W2u7eM+rA/NGzH+GtHDFFkLTKLW66OasFrxZ/yK7hkyQcswrmvugFyZpDFRW0DjcjCw=="; }; }; - "@babel/template-7.18.10" = { + "@babel/template-7.20.7" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.18.10"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz"; - sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz"; + sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; }; - "@babel/traverse-7.20.1" = { + "@babel/traverse-7.20.13" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.20.1"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz"; - sha512 = "d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.13.tgz"; + sha512 = "kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ=="; }; }; "@babel/types-7.18.4" = { @@ -2821,130 +2857,112 @@ let sha512 = "ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw=="; }; }; - "@babel/types-7.20.2" = { + "@babel/types-7.20.7" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.20.2"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz"; - sha512 = "FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz"; + sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg=="; }; }; - "@blueprintjs/colors-4.1.8" = { - name = "_at_blueprintjs_slash_colors"; - packageName = "@blueprintjs/colors"; - version = "4.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.1.8.tgz"; - sha512 = "J3N3PIBlmZS7+br+8KkR0yilGp74Fwp8SXfs0Bf4OGgLcqrBixqCqAs+YnpS2iOV0m2D22cZc8YsnPVdx0kH7w=="; - }; - }; - "@blueprintjs/core-4.11.6" = { - name = "_at_blueprintjs_slash_core"; - packageName = "@blueprintjs/core"; - version = "4.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/core/-/core-4.11.6.tgz"; - sha512 = "elgJ3BIT1007O5A+5KRM8+tIw6sy64h02tv4bQ1azjB+8DknZoSPakYlGKHLNezsh+h3u5EHPDVcskJQ+zxn7A=="; - }; - }; - "@blueprintjs/icons-4.10.0" = { - name = "_at_blueprintjs_slash_icons"; - packageName = "@blueprintjs/icons"; - version = "4.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.10.0.tgz"; - sha512 = "YMj+Cfd23zJK3aAFWtlIno2ysZi6Zl8HIbXmeouX7TwriB5H48JThWTCYS5trWZ9v57kzOJ/FALONFeZltgPxw=="; - }; - }; - "@bmewburn/js-beautify-1.13.0" = { + "@bmewburn/js-beautify-1.14.7" = { name = "_at_bmewburn_slash_js-beautify"; packageName = "@bmewburn/js-beautify"; - version = "1.13.0"; + version = "1.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@bmewburn/js-beautify/-/js-beautify-1.13.0.tgz"; - sha512 = "m68Sgw8XrbIWNIVk/LBqR2KrGqs7EniEbUqcmZaFLhyDjA873ns+TjVEi7cGxEaTXdq6l1mJ7L566NrEgPWBvA=="; + url = "https://registry.npmjs.org/@bmewburn/js-beautify/-/js-beautify-1.14.7.tgz"; + sha512 = "+s+Lw9+SesDdh4TsZyTRn6dCohzv3ioiR4YEXR8bQ+nl8J0Cz9oy+i/7vfrlLTD47/v1O8WsitR8wqL6epeevw=="; }; }; - "@bmewburn/minidom-1.0.1" = { - name = "_at_bmewburn_slash_minidom"; - packageName = "@bmewburn/minidom"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@bmewburn/minidom/-/minidom-1.0.1.tgz"; - sha512 = "T8sxd/2JQWdzQbeLMhTQ1nGj/oUl2h2EEqHeGy3a3LMY9L9J9NuXYco7xiu17hHuo7joPPzCnPg+2xLtQ/tg2g=="; - }; - }; - "@bmewburn/turndown-5.0.3" = { - name = "_at_bmewburn_slash_turndown"; - packageName = "@bmewburn/turndown"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@bmewburn/turndown/-/turndown-5.0.3.tgz"; - sha512 = "tf6pg5b2Y5nQ206VkUWR7EWBAg/W+T+ABxmWniDIVEfCpLuIQF4D7KbxGr399TC/JlbsCl5k3QJUwSKpqROQKQ=="; - }; - }; - "@bmewburn/turndown-plugin-gfm-1.0.2" = { - name = "_at_bmewburn_slash_turndown-plugin-gfm"; - packageName = "@bmewburn/turndown-plugin-gfm"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@bmewburn/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.2.tgz"; - sha512 = "uy9L0ic7IHBzCptXVkA66Zl4G1sG5M8Rir7uFqI/wQY4uUhzueZKemk/ROQ01Ty0wQFVrluEki4hwKJJRMAiwg=="; - }; - }; - "@bmewburn/vscode-html-languageserver-1.3.0" = { + "@bmewburn/vscode-html-languageserver-1.9.0" = { name = "_at_bmewburn_slash_vscode-html-languageserver"; packageName = "@bmewburn/vscode-html-languageserver"; - version = "1.3.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bmewburn/vscode-html-languageserver/-/vscode-html-languageserver-1.3.0.tgz"; - sha512 = "WUwXC5pOHNuSzFUpzh0KpbuTfAtbPAU5DLKdYIWhWSrs4iof7Qxq25dkWfiA6Ksp/AmM2tnCTLDWaU7AxpCQOQ=="; + url = "https://registry.npmjs.org/@bmewburn/vscode-html-languageserver/-/vscode-html-languageserver-1.9.0.tgz"; + sha512 = "yzZ6OK0W7frfoCqvl0s3KeVUUB22wYs74Qu3Y+VGgvW7yvq5m0M82RZQWghKdtLyQejc4469QlmhQsJmCF7ULg=="; }; }; - "@braintree/sanitize-url-6.0.1" = { + "@braintree/sanitize-url-6.0.2" = { name = "_at_braintree_slash_sanitize-url"; packageName = "@braintree/sanitize-url"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-6.0.1.tgz"; - sha512 = "zr9Qs9KFQiEvMWdZesjcmRJlUck5NR+eKGS1uyKk+oYTWwlYrsoPEi6VmG6/TzBD1hKCGEimrhTgGS6hvn/xIQ=="; + url = "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-6.0.2.tgz"; + sha512 = "Tbsj02wXCbqGmzdnXNk0SOF19ChhRU70BsroIi4Pm6Ehp56in6vch94mfbdQ17DozxkL3BAVjbZ4Qc1a0HFRAg=="; }; }; - "@cdktf/hcl2cdk-0.13.3" = { + "@cdktf/cli-core-0.15.2" = { + name = "_at_cdktf_slash_cli-core"; + packageName = "@cdktf/cli-core"; + version = "0.15.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.15.2.tgz"; + sha512 = "uiOqLik/s6LETazIOkHhwReSiBlw7sPYWGaJ/VU1btmbaVbVBpHKrLY/Nr7Vf8kRN80WsboBDAgaX4RQYpYu3Q=="; + }; + }; + "@cdktf/commons-0.15.2" = { + name = "_at_cdktf_slash_commons"; + packageName = "@cdktf/commons"; + version = "0.15.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.15.2.tgz"; + sha512 = "4uVx5L+FJV+G5zoC545MmFSPohUWy/x3Iq9UGW/kf4U7xkVE9oYHeupEc7TSLXp54vPcze+VCuYvgLWtO5Lzpg=="; + }; + }; + "@cdktf/hcl2cdk-0.15.2" = { name = "_at_cdktf_slash_hcl2cdk"; packageName = "@cdktf/hcl2cdk"; - version = "0.13.3"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.13.3.tgz"; - sha512 = "pGCylbXGR0V5koS14VCRgfPTJmL7glFJz8ZYmkmm2kCqRMoHrbUb9pJLpIotJd8zULEvmF/LSxCBUK8nhhgo8w=="; + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.15.2.tgz"; + sha512 = "LF++X2n4XOuLR2boBNzv/ihRt9ZySO3feYndRdusLtgOC3HppbTKjwlS7+2xHyH2/DYZYKMWps2gtAsqhYa4IA=="; }; }; - "@cdktf/hcl2json-0.13.3" = { + "@cdktf/hcl2json-0.15.2" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.13.3"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.13.3.tgz"; - sha512 = "h6k4hNUhzADf+l9dyAzLQVAORedOadI66Lg4NnLejyXxLdomDeVcGxNWWkctqCZFQmWxzci85XZq8fjsL9N+sQ=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.15.2.tgz"; + sha512 = "f98sMnJEFmo2bSrMbkNGtg8gfE9sP6wBLu5G5u7qLkR747wtF0eA7mYc2751XMyeGDwAP1IwetlG5zOpENuW0g=="; }; }; - "@cdktf/provider-generator-0.13.3" = { + "@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.10" = { + name = "_at_cdktf_slash_node-pty-prebuilt-multiarch"; + packageName = "@cdktf/node-pty-prebuilt-multiarch"; + version = "0.10.1-pre.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@cdktf/node-pty-prebuilt-multiarch/-/node-pty-prebuilt-multiarch-0.10.1-pre.10.tgz"; + sha512 = "5ysQrHJvqYLYg407KvaDNu+xx68ZGaqeF0SohXe5e4yNqJhPFPUQ536rkReQcPc2yZiF5PDmmvf5T9MOacHpSQ=="; + }; + }; + "@cdktf/provider-generator-0.15.2" = { name = "_at_cdktf_slash_provider-generator"; packageName = "@cdktf/provider-generator"; - version = "0.13.3"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.13.3.tgz"; - sha512 = "vTtJp0KmaBYVwypaINLJzSddtfzhWAJIVLfhUU0LVUG+fkWQmN7110reqTHVVewkAW3AR4ZAOpjGd15tlIbp7Q=="; + url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.15.2.tgz"; + sha512 = "153jtaorRZsdWy3Wt56rOlTi7SoNXNWo3hl4By4v585T1WDFMa/NIsT8qBibLrJmiwmnHyh4r5KRjrn1KQpi1Q=="; }; }; - "@chemzqm/neovim-5.8.0" = { + "@chemzqm/msgpack-lite-0.1.29" = { + name = "_at_chemzqm_slash_msgpack-lite"; + packageName = "@chemzqm/msgpack-lite"; + version = "0.1.29"; + src = fetchurl { + url = "https://registry.npmjs.org/@chemzqm/msgpack-lite/-/msgpack-lite-0.1.29.tgz"; + sha512 = "WbOT869c9BBLTpd51tQaFQRxwQZGaFzaaz03/df8zvXpHW8Xkfvw5u9SBxYuf+noJqeRKQxXsLWzeipMj2p3bQ=="; + }; + }; + "@chemzqm/neovim-5.9.5" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; - version = "5.8.0"; + version = "5.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.8.0.tgz"; - sha512 = "1yn2tQLv7ztw+pTDhmXJWrNPegXq5IUBwev/D7bs3yRBPWm3zCfbNAiI1MFnLh7/Ik2JJEtnC5HV6bkxzTppqA=="; + url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.9.5.tgz"; + sha512 = "m7lZj00lP1fNMzXITOV1uNdsYXjsmMbFB7Sl8OXfhRWYDQuBr6EPNzIzAonzIcmvTA2JNs8WMq0ZU76XXzpP6w=="; }; }; "@chinachu/aribts-1.3.5-mirakurun.17" = { @@ -2974,139 +2992,139 @@ let sha512 = "ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="; }; }; - "@commitlint/config-validator-17.1.0" = { + "@commitlint/config-validator-17.4.0" = { name = "_at_commitlint_slash_config-validator"; packageName = "@commitlint/config-validator"; - version = "17.1.0"; + version = "17.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-17.1.0.tgz"; - sha512 = "Q1rRRSU09ngrTgeTXHq6ePJs2KrI+axPTgkNYDWSJIuS1Op4w3J30vUfSXjwn5YEJHklK3fSqWNHmBhmTR7Vdg=="; + url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-17.4.0.tgz"; + sha512 = "Sa/+8KNpDXz4zT4bVbz2fpFjvgkPO6u2V2fP4TKgt6FjmOw2z3eEX859vtfeaTav/ukBw0/0jr+5ZTZp9zCBhA=="; }; }; - "@commitlint/ensure-17.0.0" = { + "@commitlint/ensure-17.4.0" = { name = "_at_commitlint_slash_ensure"; packageName = "@commitlint/ensure"; - version = "17.0.0"; + version = "17.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-17.0.0.tgz"; - sha512 = "M2hkJnNXvEni59S0QPOnqCKIK52G1XyXBGw51mvh7OXDudCmZ9tZiIPpU882p475Mhx48Ien1MbWjCP1zlyC0A=="; + url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-17.4.0.tgz"; + sha512 = "7oAxt25je0jeQ/E0O/M8L3ADb1Cvweu/5lc/kYF8g/kXatI0wxGE5La52onnAUAWeWlsuvBNar15WcrmDmr5Mw=="; }; }; - "@commitlint/execute-rule-17.0.0" = { + "@commitlint/execute-rule-17.4.0" = { name = "_at_commitlint_slash_execute-rule"; packageName = "@commitlint/execute-rule"; - version = "17.0.0"; + version = "17.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-17.0.0.tgz"; - sha512 = "nVjL/w/zuqjCqSJm8UfpNaw66V9WzuJtQvEnCrK4jDw6qKTmZB+1JQ8m6BQVZbNBcwfYdDNKnhIhqI0Rk7lgpQ=="; + url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-17.4.0.tgz"; + sha512 = "LIgYXuCSO5Gvtc0t9bebAMSwd68ewzmqLypqI2Kke1rqOqqDbMpYcYfoPfFlv9eyLIh4jocHWwCK5FS7z9icUA=="; }; }; - "@commitlint/format-17.0.0" = { + "@commitlint/format-17.4.0" = { name = "_at_commitlint_slash_format"; packageName = "@commitlint/format"; - version = "17.0.0"; + version = "17.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/format/-/format-17.0.0.tgz"; - sha512 = "MZzJv7rBp/r6ZQJDEodoZvdRM0vXu1PfQvMTNWFb8jFraxnISMTnPBWMMjr2G/puoMashwaNM//fl7j8gGV5lA=="; + url = "https://registry.npmjs.org/@commitlint/format/-/format-17.4.0.tgz"; + sha512 = "Z2bWAU5+f1YZh9W76c84J8iLIWIvvm+mzqogTz0Nsc1x6EHW0Z2gI38g5HAjB0r0I3ZjR15IDEJKhsxyblcyhA=="; }; }; - "@commitlint/is-ignored-17.2.0" = { + "@commitlint/is-ignored-17.4.2" = { name = "_at_commitlint_slash_is-ignored"; packageName = "@commitlint/is-ignored"; - version = "17.2.0"; + version = "17.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.2.0.tgz"; - sha512 = "rgUPUQraHxoMLxiE8GK430HA7/R2vXyLcOT4fQooNrZq9ERutNrP6dw3gdKLkq22Nede3+gEHQYUzL4Wu75ndg=="; + url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.4.2.tgz"; + sha512 = "1b2Y2qJ6n7bHG9K6h8S4lBGUl6kc7mMhJN9gy1SQfUZqe92ToDjUTtgNWb6LbzR1X8Cq4SEus4VU8Z/riEa94Q=="; }; }; - "@commitlint/lint-17.2.0" = { + "@commitlint/lint-17.4.2" = { name = "_at_commitlint_slash_lint"; packageName = "@commitlint/lint"; - version = "17.2.0"; + version = "17.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/lint/-/lint-17.2.0.tgz"; - sha512 = "N2oLn4Dj672wKH5qJ4LGO+73UkYXGHO+NTVUusGw83SjEv7GjpqPGKU6KALW2kFQ/GsDefSvOjpSi3CzWHQBDg=="; + url = "https://registry.npmjs.org/@commitlint/lint/-/lint-17.4.2.tgz"; + sha512 = "HcymabrdBhsDMNzIv146+ZPNBPBK5gMNsVH+el2lCagnYgCi/4ixrHooeVyS64Fgce2K26+MC7OQ4vVH8wQWVw=="; }; }; - "@commitlint/load-17.2.0" = { + "@commitlint/load-17.4.2" = { name = "_at_commitlint_slash_load"; packageName = "@commitlint/load"; - version = "17.2.0"; + version = "17.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/load/-/load-17.2.0.tgz"; - sha512 = "HDD57qSqNrk399R4TIjw31AWBG8dBjNj1MrDKZKmC/wvimtnIFlqzcu1+sxfXIOHj/+M6tcMWDtvknGUd7SU+g=="; + url = "https://registry.npmjs.org/@commitlint/load/-/load-17.4.2.tgz"; + sha512 = "Si++F85rJ9t4hw6JcOw1i2h0fdpdFQt0YKwjuK4bk9KhFjyFkRxvR3SB2dPaMs+EwWlDrDBGL+ygip1QD6gmPw=="; }; }; - "@commitlint/message-17.2.0" = { + "@commitlint/message-17.4.2" = { name = "_at_commitlint_slash_message"; packageName = "@commitlint/message"; - version = "17.2.0"; + version = "17.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/message/-/message-17.2.0.tgz"; - sha512 = "/4l2KFKxBOuoEn1YAuuNNlAU05Zt7sNsC9H0mPdPm3chOrT4rcX0pOqrQcLtdMrMkJz0gC7b3SF80q2+LtdL9Q=="; + url = "https://registry.npmjs.org/@commitlint/message/-/message-17.4.2.tgz"; + sha512 = "3XMNbzB+3bhKA1hSAWPCQA3lNxR4zaeQAQcHj0Hx5sVdO6ryXtgUBGGv+1ZCLMgAPRixuc6en+iNAzZ4NzAa8Q=="; }; }; - "@commitlint/parse-17.2.0" = { + "@commitlint/parse-17.4.2" = { name = "_at_commitlint_slash_parse"; packageName = "@commitlint/parse"; - version = "17.2.0"; + version = "17.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/parse/-/parse-17.2.0.tgz"; - sha512 = "vLzLznK9Y21zQ6F9hf8D6kcIJRb2haAK5T/Vt1uW2CbHYOIfNsR/hJs0XnF/J9ctM20Tfsqv4zBitbYvVw7F6Q=="; + url = "https://registry.npmjs.org/@commitlint/parse/-/parse-17.4.2.tgz"; + sha512 = "DK4EwqhxfXpyCA+UH8TBRIAXAfmmX4q9QRBz/2h9F9sI91yt6mltTrL6TKURMcjUVmgaB80wgS9QybNIyVBIJA=="; }; }; - "@commitlint/read-17.2.0" = { + "@commitlint/read-17.4.2" = { name = "_at_commitlint_slash_read"; packageName = "@commitlint/read"; - version = "17.2.0"; + version = "17.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/read/-/read-17.2.0.tgz"; - sha512 = "bbblBhrHkjxra3ptJNm0abxu7yeAaxumQ8ZtD6GIVqzURCETCP7Dm0tlVvGRDyXBuqX6lIJxh3W7oyKqllDsHQ=="; + url = "https://registry.npmjs.org/@commitlint/read/-/read-17.4.2.tgz"; + sha512 = "hasYOdbhEg+W4hi0InmXHxtD/1favB4WdwyFxs1eOy/DvMw6+2IZBmATgGOlqhahsypk4kChhxjAFJAZ2F+JBg=="; }; }; - "@commitlint/resolve-extends-17.1.0" = { + "@commitlint/resolve-extends-17.4.0" = { name = "_at_commitlint_slash_resolve-extends"; packageName = "@commitlint/resolve-extends"; - version = "17.1.0"; + version = "17.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-17.1.0.tgz"; - sha512 = "jqKm00LJ59T0O8O4bH4oMa4XyJVEOK4GzH8Qye9XKji+Q1FxhZznxMV/bDLyYkzbTodBt9sL0WLql8wMtRTbqQ=="; + url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-17.4.0.tgz"; + sha512 = "3JsmwkrCzoK8sO22AzLBvNEvC1Pmdn/65RKXzEtQMy6oYMl0Snrq97a5bQQEFETF0VsvbtUuKttLqqgn99OXRQ=="; }; }; - "@commitlint/rules-17.2.0" = { + "@commitlint/rules-17.4.2" = { name = "_at_commitlint_slash_rules"; packageName = "@commitlint/rules"; - version = "17.2.0"; + version = "17.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/rules/-/rules-17.2.0.tgz"; - sha512 = "1YynwD4Eh7HXZNpqG8mtUlL2pSX2jBy61EejYJv4ooZPcg50Ak7LPOyD3a9UZnsE76AXWFBz+yo9Hv4MIpAa0Q=="; + url = "https://registry.npmjs.org/@commitlint/rules/-/rules-17.4.2.tgz"; + sha512 = "OGrPsMb9Fx3/bZ64/EzJehY9YDSGWzp81Pj+zJiY+r/NSgJI3nUYdlS37jykNIugzazdEXfMtQ10kmA+Kx2pZQ=="; }; }; - "@commitlint/to-lines-17.0.0" = { + "@commitlint/to-lines-17.4.0" = { name = "_at_commitlint_slash_to-lines"; packageName = "@commitlint/to-lines"; - version = "17.0.0"; + version = "17.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-17.0.0.tgz"; - sha512 = "nEi4YEz04Rf2upFbpnEorG8iymyH7o9jYIVFBG1QdzebbIFET3ir+8kQvCZuBE5pKCtViE4XBUsRZz139uFrRQ=="; + url = "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-17.4.0.tgz"; + sha512 = "LcIy/6ZZolsfwDUWfN1mJ+co09soSuNASfKEU5sCmgFCvX5iHwRYLiIuoqXzOVDYOy7E7IcHilr/KS0e5T+0Hg=="; }; }; - "@commitlint/top-level-17.0.0" = { + "@commitlint/top-level-17.4.0" = { name = "_at_commitlint_slash_top-level"; packageName = "@commitlint/top-level"; - version = "17.0.0"; + version = "17.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/top-level/-/top-level-17.0.0.tgz"; - sha512 = "dZrEP1PBJvodNWYPOYiLWf6XZergdksKQaT6i1KSROLdjf5Ai0brLOv5/P+CPxBeoj3vBxK4Ax8H1Pg9t7sHIQ=="; + url = "https://registry.npmjs.org/@commitlint/top-level/-/top-level-17.4.0.tgz"; + sha512 = "/1loE/g+dTTQgHnjoCy0AexKAEFyHsR2zRB4NWrZ6lZSMIxAhBJnmCqwao7b4H8888PsfoTBCLBYIw8vGnej8g=="; }; }; - "@commitlint/types-17.0.0" = { + "@commitlint/types-17.4.0" = { name = "_at_commitlint_slash_types"; packageName = "@commitlint/types"; - version = "17.0.0"; + version = "17.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/types/-/types-17.0.0.tgz"; - sha512 = "hBAw6U+SkAT5h47zDMeOu3HSiD0SODw4Aq7rRNh1ceUmL7GyLKYhPbUvlRWqZ65XjBLPHZhFyQlRaPNz8qvUyQ=="; + url = "https://registry.npmjs.org/@commitlint/types/-/types-17.4.0.tgz"; + sha512 = "2NjAnq5IcxY9kXtUeO2Ac0aPpvkuOmwbH/BxIm36XXK5LtWFObWJWjXOA+kcaABMrthjWu6la+FUpyYFMHRvbA=="; }; }; "@cronvel/get-pixels-3.4.1" = { @@ -3118,49 +3136,49 @@ let sha512 = "gB5C5nDIacLUdsMuW8YsM9SzK3vaFANe4J11CVXpovpy7bZUGrcJKmc6m/0gWG789pKr6XSZY2aEetjFvSRw5g=="; }; }; - "@cspell/cspell-bundled-dicts-6.14.0" = { + "@cspell/cspell-bundled-dicts-6.19.2" = { name = "_at_cspell_slash_cspell-bundled-dicts"; packageName = "@cspell/cspell-bundled-dicts"; - version = "6.14.0"; + version = "6.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.14.0.tgz"; - sha512 = "GItmbgKcqMUiNKy2Z3xPGEyS8Tu1DXrJCyj9uQD4J+MPQeirZfLb1wSNsZsVTTmRQm8eTZ/m73X95l8Ekfqm2A=="; + url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.19.2.tgz"; + sha512 = "dbzMGK1JHRTUJ8Pkw/EYbj02RMYhM1/vfrAzgRpqogj83m0cfBC/0IHELkVIl3taC1KdFZ1XHXPp7310LZ6+ww=="; }; }; - "@cspell/cspell-pipe-6.14.0" = { + "@cspell/cspell-pipe-6.19.2" = { name = "_at_cspell_slash_cspell-pipe"; packageName = "@cspell/cspell-pipe"; - version = "6.14.0"; + version = "6.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-6.14.0.tgz"; - sha512 = "8dZZst6jZ7ELrNV1JqHNb7EnlXZTjgRYl6C+3PrC30/XUkMubBUj9nncLQH+M1ZUVpSN1ErbnTPOpbCllZ8tvQ=="; + url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-6.19.2.tgz"; + sha512 = "OS+hUdSXU8408OjzBl1EgQ0R4OCXSFAthkN2nqByuQvIa2Ho0yRtXB9BgGCwfcAaffNzdLyTzzQsHhLjjRO0gg=="; }; }; - "@cspell/cspell-service-bus-6.14.0" = { + "@cspell/cspell-service-bus-6.19.2" = { name = "_at_cspell_slash_cspell-service-bus"; packageName = "@cspell/cspell-service-bus"; - version = "6.14.0"; + version = "6.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-6.14.0.tgz"; - sha512 = "p8sgtPfWm0UozKr4wPK/JK/IRqQZVJmA5O4YHaFYx3CHK4F7Lki0v6octds8ks9b3bP7KyVX+zix61y1LcCUQw=="; + url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-6.19.2.tgz"; + sha512 = "PVv8q1y2KtuYIXd7tbWujJHNrIgd93k5aOEB9ffIMrrw1MhDFnuuB1l4rDN83zykLlab2dWPU29zhaGnH/EtMw=="; }; }; - "@cspell/cspell-types-6.14.0" = { + "@cspell/cspell-types-6.19.2" = { name = "_at_cspell_slash_cspell-types"; packageName = "@cspell/cspell-types"; - version = "6.14.0"; + version = "6.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-6.14.0.tgz"; - sha512 = "QHl/M02JeqvIvBJsH4U6OMV6B210QaHYfau8RapbZi1xqVdWuO9UQ44Z180AG41Y8a7T41pi5QWCQVB2s1WA+w=="; + url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-6.19.2.tgz"; + sha512 = "Eyivx0MAuYdOAOXrNC/oksMx5QL9NBi9Vvb+7CWPJSFk7p66B5sjcxAz6ujZcQ1WVBLoAqL75BoIqF+lgma9aA=="; }; }; - "@cspell/dict-ada-3.0.0" = { + "@cspell/dict-ada-4.0.1" = { name = "_at_cspell_slash_dict-ada"; packageName = "@cspell/dict-ada"; - version = "3.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-3.0.0.tgz"; - sha512 = "jpUVex0JTMGIQC/+T/GglLRpimmvH8HUcpf3gC+bS1ZcVGzyWQo5clevxYbz2MBVoLxSMZiqPoqB5dt/vAOTwQ=="; + url = "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-4.0.1.tgz"; + sha512 = "/E9o3nHrXOhYmQE43deKbxZcR3MIJAsa+66IzP9TXGHheKEx8b9dVMVVqydDDH8oom1H0U20NRPtu6KRVbT9xw=="; }; }; "@cspell/dict-aws-1.0.14" = { @@ -3190,13 +3208,13 @@ let sha512 = "kJIqQ+FD2TCSgaaP5XLEDgy222+pVWTc+VhveNO++gnTWU3BCVjkD5LjfW7g/CmGONnz+nwXDueWspProaSdJw=="; }; }; - "@cspell/dict-bash-3.0.0" = { + "@cspell/dict-bash-4.1.1" = { name = "_at_cspell_slash_dict-bash"; packageName = "@cspell/dict-bash"; - version = "3.0.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-3.0.0.tgz"; - sha512 = "bQl6mk1SrcmrDL+F4XTeZtW2JnqgNJx5pNX6PIfWe5QA+J2blLlYbwDQOvjovpZEirwy8iqQmu//6bKjaDu1ow=="; + url = "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-4.1.1.tgz"; + sha512 = "8czAa/Mh96wu2xr0RXQEGMTBUGkTvYn/Pb0o+gqOO1YW+poXGQc3gx0YPqILDryP/KCERrNvkWUJz3iGbvwC2A=="; }; }; "@cspell/dict-companies-1.0.40" = { @@ -3208,13 +3226,13 @@ let sha512 = "Aw07qiTroqSST2P5joSrC4uOA05zTXzI2wMb+me3q4Davv1D9sCkzXY0TGoC2vzhNv5ooemRi9KATGaBSdU1sw=="; }; }; - "@cspell/dict-companies-3.0.3" = { + "@cspell/dict-companies-3.0.6" = { name = "_at_cspell_slash_dict-companies"; packageName = "@cspell/dict-companies"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.0.3.tgz"; - sha512 = "qBWdwA97HdnLbxPLOUTZ+/mg9eYhi14hM7PEUM1PZ004MEIxQHum0IQpypKAwP3teR1KEsyxEPHp8v24Dw45Zg=="; + url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.0.6.tgz"; + sha512 = "6rWuwZxPisn/MP41DzBtChVgbz9b6HSjBH3X0s3k7zlBaxrw6xFAZGKH9KGFSPTiV+WD9j+IIn2/ITXERGjNLA=="; }; }; "@cspell/dict-cpp-1.1.40" = { @@ -3226,13 +3244,13 @@ let sha512 = "sscfB3woNDNj60/yGXAdwNtIRWZ89y35xnIaJVDMk5TPMMpaDvuk0a34iOPIq0g4V+Y8e3RyAg71SH6ADwSjGw=="; }; }; - "@cspell/dict-cpp-4.0.0" = { + "@cspell/dict-cpp-4.0.1" = { name = "_at_cspell_slash_dict-cpp"; packageName = "@cspell/dict-cpp"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-4.0.0.tgz"; - sha512 = "NrCmer14tTSbPs1TwqyCjFEmWCBw0UFvAn4O3pdWuxktArHxRJ5vUQOoL2Gus2H9s3ihhOJZkcuJ47Kd21E7BQ=="; + url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-4.0.1.tgz"; + sha512 = "mD6mn0XFCqHCz2j6p/7OQm3yNFn1dlQq6vip1pLynvNWDRz5yKYDVRUQCTEORT7ThS0dLpI4BjCX84YUKNhibA=="; }; }; "@cspell/dict-cryptocurrencies-1.0.10" = { @@ -3262,13 +3280,13 @@ let sha512 = "nub+ZCiTgmT87O+swI+FIAzNwaZPWUGckJU4GN402wBq420V+F4ZFqNV7dVALJrGaWH7LvADRtJxi6cZVHJKeA=="; }; }; - "@cspell/dict-csharp-4.0.1" = { + "@cspell/dict-csharp-4.0.2" = { name = "_at_cspell_slash_dict-csharp"; packageName = "@cspell/dict-csharp"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-csharp/-/dict-csharp-4.0.1.tgz"; - sha512 = "BkfT6S790FcyWLTWYBwkj9dKxuNz4pHFDrj9GFrmqXd2HWzfSa944S0NJhal42TnW30JJljQY5P1ZYau+s2Pbg=="; + url = "https://registry.npmjs.org/@cspell/dict-csharp/-/dict-csharp-4.0.2.tgz"; + sha512 = "1JMofhLK+4p4KairF75D3A924m5ERMgd1GvzhwK2geuYgd2ZKuGW72gvXpIV7aGf52E3Uu1kDXxxGAiZ5uVG7g=="; }; }; "@cspell/dict-css-1.0.13" = { @@ -3280,22 +3298,22 @@ let sha512 = "HU8RbFRoGanFH85mT01Ot/Ay48ixr/gG25VPLtdq56QTrmPsw79gxYm/5Qay16eQbpoPIxaj5CAWNam+DX4GbA=="; }; }; - "@cspell/dict-css-3.0.0" = { + "@cspell/dict-css-4.0.2" = { name = "_at_cspell_slash_dict-css"; packageName = "@cspell/dict-css"; - version = "3.0.0"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-3.0.0.tgz"; - sha512 = "GNg4EMhP+8yVr3AuebBMUxsb/otCz2DS8rTp2M5Fo1179uwpjMfPqLezFxH+YaiA3vgBiwajdrl/0ZGn44qBRw=="; + url = "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-4.0.2.tgz"; + sha512 = "0NxBcB36b1Jy23Tf5YLrD8+PvBhE3FgBci3rwtw2DEqVigEX6uodecfoh9I4kcU8PZlVsDujrUfwgzYCWh/feQ=="; }; }; - "@cspell/dict-dart-2.0.0" = { + "@cspell/dict-dart-2.0.1" = { name = "_at_cspell_slash_dict-dart"; packageName = "@cspell/dict-dart"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-dart/-/dict-dart-2.0.0.tgz"; - sha512 = "p7vHszsu2uJt+F04gvNy1e5okypFfVEYHBWgpOV/Jrvs0F5A+gUzFTG2Ix9b1jkCigAULYKQkIGue+qlhSoK5Q=="; + url = "https://registry.npmjs.org/@cspell/dict-dart/-/dict-dart-2.0.1.tgz"; + sha512 = "YRuDX9k2qPSWDEsM26j8o7KMvaZ0DXc74ijK/VRwaksm1CBRPBW289pe2TE2K7y4SJjTKXgQ9urOVlozeQDpuA=="; }; }; "@cspell/dict-django-1.0.26" = { @@ -3307,22 +3325,22 @@ let sha512 = "mn9bd7Et1L2zuibc08GVHTiD2Go3/hdjyX5KLukXDklBkq06r+tb0OtKtf1zKodtFDTIaYekGADhNhA6AnKLkg=="; }; }; - "@cspell/dict-django-3.0.0" = { + "@cspell/dict-django-4.0.1" = { name = "_at_cspell_slash_dict-django"; packageName = "@cspell/dict-django"; - version = "3.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-django/-/dict-django-3.0.0.tgz"; - sha512 = "Ag6ecPokb12RcAwD9eOvKl5G2l4h5aOQl36mipqINLc+NPtIGVN3qa2FBg3hHeS6OvIDwCZ/LQ/zz5xbBhakhg=="; + url = "https://registry.npmjs.org/@cspell/dict-django/-/dict-django-4.0.1.tgz"; + sha512 = "q3l7OH39qzeN2Y64jpY39SEAqki5BUzPTypnhzM40yT+LOGSWqSh9Ix5UecejtXPDVrD8vML+m7Bp5070h52HQ=="; }; }; - "@cspell/dict-docker-1.1.3" = { + "@cspell/dict-docker-1.1.5" = { name = "_at_cspell_slash_dict-docker"; packageName = "@cspell/dict-docker"; - version = "1.1.3"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-docker/-/dict-docker-1.1.3.tgz"; - sha512 = "Iz7EQGnLBgnnmzCC8iLQ7JssCCQlCjZLiCs0qhooETWLifob3nzsI9AVBh3gkYLhISLIIjBpfa4LTknskT7LzA=="; + url = "https://registry.npmjs.org/@cspell/dict-docker/-/dict-docker-1.1.5.tgz"; + sha512 = "SNEohOScQ+0+y9dp/jKTx60OOJQrf5es5BJ32gh5Ck3jKXNo4wd9KLgPOmQMUpencb5SGjrBsC4rr1fyfCwytg=="; }; }; "@cspell/dict-dotnet-1.0.32" = { @@ -3334,13 +3352,13 @@ let sha512 = "9H9vXrgJB4KF8xsyTToXO53cXD33iyfrpT4mhCds+YLUw3P3x3E9myszgJzshnrxYBvQZ+QMII57Qr6SjZVk4Q=="; }; }; - "@cspell/dict-dotnet-3.0.1" = { + "@cspell/dict-dotnet-4.0.1" = { name = "_at_cspell_slash_dict-dotnet"; packageName = "@cspell/dict-dotnet"; - version = "3.0.1"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-3.0.1.tgz"; - sha512 = "Flruqsmhwrm1K2+HKsA4I6aywmsM5QnCddFb8FIQLgluyuTss6Hs1Xj380+k3PeU/wAg4xNTD7f6b4xxZLbfjw=="; + url = "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-4.0.1.tgz"; + sha512 = "l11TqlUX8cDgsE/1Zrea1PqLn63s20MY3jKWMbQVB5DMDPDO2f8Pukckkwxq5p/cxDABEjuGzfF1kTX3pAakBw=="; }; }; "@cspell/dict-elixir-1.0.26" = { @@ -3352,13 +3370,13 @@ let sha512 = "hz1yETUiRJM7yjN3mITSnxcmZaEyaBbyJhpZPpg+cKUil+xhHeZ2wwfbRc83QHGmlqEuDWbdCFqKSpCDJYpYhg=="; }; }; - "@cspell/dict-elixir-3.0.0" = { + "@cspell/dict-elixir-4.0.1" = { name = "_at_cspell_slash_dict-elixir"; packageName = "@cspell/dict-elixir"; - version = "3.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-3.0.0.tgz"; - sha512 = "DJxGMNfcT1ieYupyzq7GNSIJEkdJAnpEoL58R54bf2mxRfC02Uu2sIcKWJO18ozOn3jgOY408TxOCEc8bz39jw=="; + url = "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-4.0.1.tgz"; + sha512 = "IejBqiTTWSXpvBm6yg4qUfnJR0LwbUUCJcK5wXOMKEJitu3yDfrT9GPc6NQJXgokbg9nBjEyxVIzNcLgx2x3/Q=="; }; }; "@cspell/dict-en-gb-1.1.33" = { @@ -3379,13 +3397,13 @@ let sha512 = "UPwR4rfiJCxnS+Py+EK9E4AUj3aPZE4p/yBRSHN+5aBQConlI0lLDtMceH5wlupA/sQTU1ERZGPJA9L96jVSyQ=="; }; }; - "@cspell/dict-en_us-4.0.0" = { + "@cspell/dict-en_us-4.2.0" = { name = "_at_cspell_slash_dict-en_us"; packageName = "@cspell/dict-en_us"; - version = "4.0.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.0.0.tgz"; - sha512 = "ZqWPm0cdC/3KdhWWHojti7/gfH5/JIzyGqI2zlmibz/jpR5Z0IzsW71xQCuU3KpNaYU1Frfivk0m34yicm1JFw=="; + url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.2.0.tgz"; + sha512 = "n5hz8vQ6FAp4f+ZW/raN/f4G69V1LrhNZ7kgXM+Nirmkrz16oXmd1defTulbd7yf2T2XU8DmsrTnkuRG9mSQKw=="; }; }; "@cspell/dict-filetypes-1.1.8" = { @@ -3433,13 +3451,22 @@ let sha512 = "Mbi+zWdiP9yzL+X4YD9Tgcm5YQ95Ql+Y3vF2LRnOY6g2QWaijTRN1rgksVuxzpFqHi//+bx2uoUb0XEKBYDi8g=="; }; }; - "@cspell/dict-fullstack-3.0.0" = { + "@cspell/dict-fullstack-3.1.1" = { name = "_at_cspell_slash_dict-fullstack"; packageName = "@cspell/dict-fullstack"; - version = "3.0.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-3.0.0.tgz"; - sha512 = "BMQRTaeReLufjMwgWqqwPdrXQ7jkVGTv7/YvOLsHFZvcAP3eM7WqX+rvdXckLhJmuuzbceFRDKs5F/9Ig2x/tQ=="; + url = "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-3.1.1.tgz"; + sha512 = "w2n3QvqEiufmvlBuNduury/pySrhfOcWFfCvvpUXTJvWbfRVGkt6ANZuTuy3/7Z2q4GYUqsd139te4Q8m0jRHQ=="; + }; + }; + "@cspell/dict-gaming-terms-1.0.4" = { + name = "_at_cspell_slash_dict-gaming-terms"; + packageName = "@cspell/dict-gaming-terms"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-gaming-terms/-/dict-gaming-terms-1.0.4.tgz"; + sha512 = "hbDduNXlk4AOY0wFxcDMWBPpm34rpqJBeqaySeoUH70eKxpxm+dvjpoRLJgyu0TmymEICCQSl6lAHTHSDiWKZg=="; }; }; "@cspell/dict-git-2.0.0" = { @@ -3460,13 +3487,13 @@ let sha512 = "qq3Cjnx2U1jpeWAGJL1GL0ylEhUMqyaR36Xij6Y6Aq4bViCRp+HRRqk0x5/IHHbOrti45h3yy7ii1itRFo+Xkg=="; }; }; - "@cspell/dict-golang-4.0.0" = { + "@cspell/dict-golang-5.0.1" = { name = "_at_cspell_slash_dict-golang"; packageName = "@cspell/dict-golang"; - version = "4.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-4.0.0.tgz"; - sha512 = "XxKINt3dmpixrmAcxVdP545eh0S6vmaGbddZyzIWzQlwoIE0b98l3AvtcdhCyYxbvcKAcZ+pkf+t2zGTnMvQug=="; + url = "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-5.0.1.tgz"; + sha512 = "djsJC7OVKUpFdRm/aqBJEUSGP3kw/MDhAt7udYegnyQt2WjL3ZnVoG7r5eOEhPEEKzWVBYoi6UKSNpdQEodlbg=="; }; }; "@cspell/dict-haskell-1.0.13" = { @@ -3478,13 +3505,13 @@ let sha512 = "kvl8T84cnYRPpND/P3D86P6WRSqebsbk0FnMfy27zo15L5MLAb3d3MOiT1kW3vEWfQgzUD7uddX/vUiuroQ8TA=="; }; }; - "@cspell/dict-haskell-3.0.0" = { + "@cspell/dict-haskell-4.0.1" = { name = "_at_cspell_slash_dict-haskell"; packageName = "@cspell/dict-haskell"; - version = "3.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-haskell/-/dict-haskell-3.0.0.tgz"; - sha512 = "vVreZvGp9M8UcF/3fJAl/99M3NkcH0ik19xnFTsp4RWhy7+Ar/yCXo8251sSBtwL4TdR+0BHXdXKb2PYZ2UFdQ=="; + url = "https://registry.npmjs.org/@cspell/dict-haskell/-/dict-haskell-4.0.1.tgz"; + sha512 = "uRrl65mGrOmwT7NxspB4xKXFUenNC7IikmpRZW8Uzqbqcu7ZRCUfstuVH7T1rmjRgRkjcIjE4PC11luDou4wEQ=="; }; }; "@cspell/dict-html-1.1.9" = { @@ -3496,13 +3523,13 @@ let sha512 = "vvnYia0tyIS5Fdoz+gEQm77MGZZE66kOJjuNpIYyRHCXFAhWdYz3SmkRm6YKJSWSvuO+WBJYTKDvkOxSh3Fx/w=="; }; }; - "@cspell/dict-html-4.0.0" = { + "@cspell/dict-html-4.0.2" = { name = "_at_cspell_slash_dict-html"; packageName = "@cspell/dict-html"; - version = "4.0.0"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-html/-/dict-html-4.0.0.tgz"; - sha512 = "UQRolrzTTMS3Ja1qkrdERnqG04qqwqp4vbMV+BLKvR0oiibfH56Dfnx/qz/C5KgFLc48GLGXLALjgCiHtPjPiA=="; + url = "https://registry.npmjs.org/@cspell/dict-html/-/dict-html-4.0.2.tgz"; + sha512 = "BskOE2K3AtGLkcjdJmo+H6/fjdfDP4XYAsEGXpB26rvdnXAnGEstE/Q8Do6UfJCvgOVYCpdUZLcMIEpoTy7QhQ=="; }; }; "@cspell/dict-html-symbol-entities-1.0.23" = { @@ -3532,13 +3559,22 @@ let sha512 = "LcOg9srYLDoNGd8n3kbfDBlZD+LOC9IVcnFCdua1b/luCHNVmlgBx7e677qPu7olpMYOD5TQIVW2OmM1+/6MFA=="; }; }; - "@cspell/dict-java-5.0.2" = { + "@cspell/dict-java-5.0.4" = { name = "_at_cspell_slash_dict-java"; packageName = "@cspell/dict-java"; - version = "5.0.2"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-5.0.2.tgz"; - sha512 = "HWgdp8plZOdYjOkndwmgHGVxoewylZcl886PqSL6TMcDshyI0+2nePft31nIuALRvt7HL8IX++DM1uk4UfY4kg=="; + url = "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-5.0.4.tgz"; + sha512 = "43VrLOLcBxavv6eyL4BpsnHrhVOgyYYeJqQRJG5XKObcpWy3+Lpadj58CfTVOr7M/Je3pUpd4tvsUhf/lWXMVA=="; + }; + }; + "@cspell/dict-k8s-1.0.0" = { + name = "_at_cspell_slash_dict-k8s"; + packageName = "@cspell/dict-k8s"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-k8s/-/dict-k8s-1.0.0.tgz"; + sha512 = "XqIql+nd2DiuPuL+qPc24bN/L1mZY75kAYcuMBMW5iYgBoivkiVOg7br/aofX3ApajvHDln6tNkPZhmhsOg6Ww=="; }; }; "@cspell/dict-latex-1.0.25" = { @@ -3550,13 +3586,13 @@ let sha512 = "cEgg91Migqcp1SdVV7dUeMxbPDhxdNo6Fgq2eygAXQjIOFK520FFvh/qxyBvW90qdZbIRoU2AJpchyHfGuwZFA=="; }; }; - "@cspell/dict-latex-3.0.0" = { + "@cspell/dict-latex-3.1.0" = { name = "_at_cspell_slash_dict-latex"; packageName = "@cspell/dict-latex"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-latex/-/dict-latex-3.0.0.tgz"; - sha512 = "QsRWj+Jll4ueVbce8ofKa743oQ2exmbVNZN70MaMbmu8PSbjW2+Rj3OdExVStesANMj7qc20inS/TgPr8DrInQ=="; + url = "https://registry.npmjs.org/@cspell/dict-latex/-/dict-latex-3.1.0.tgz"; + sha512 = "XD5S3FY0DrYiun2vm/KKOkeaD30LXp9v5EzVTVQvmxqQrQh0HvOT3TFD7lgKbyzZaG7E+l3wS94uwwm80cOmuw=="; }; }; "@cspell/dict-lorem-ipsum-1.0.22" = { @@ -3586,13 +3622,13 @@ let sha512 = "YiHDt8kmHJ8nSBy0tHzaxiuitYp+oJ66ffCYuFWTNB3//Y0SI4OGHU3omLsQVeXIfCeVrO4DrVvRDoCls9B5zQ=="; }; }; - "@cspell/dict-lua-3.0.0" = { + "@cspell/dict-lua-4.0.0" = { name = "_at_cspell_slash_dict-lua"; packageName = "@cspell/dict-lua"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-lua/-/dict-lua-3.0.0.tgz"; - sha512 = "WOhSCgS5wMxkGQJ8siB90iTB9ElquJB7FeqYSbJqqs6cUwH8G7MM/CEDPL6h7vCo0+v3GuxQ8yKWDSUcUhz9Lg=="; + url = "https://registry.npmjs.org/@cspell/dict-lua/-/dict-lua-4.0.0.tgz"; + sha512 = "aQPyc/nP67tOlW6ACpio9Q5mZ/Z1hqwXC5rt5tkoQ2GsnCqeyIXDrX0CN+RGK53Lj4P02Jz/dPxs/nX8eDUFsw=="; }; }; "@cspell/dict-node-1.0.12" = { @@ -3604,13 +3640,13 @@ let sha512 = "RPNn/7CSkflAWk0sbSoOkg0ORrgBARUjOW3QjB11KwV1gSu8f5W/ij/S50uIXtlrfoBLqd4OyE04jyON+g/Xfg=="; }; }; - "@cspell/dict-node-4.0.1" = { + "@cspell/dict-node-4.0.2" = { name = "_at_cspell_slash_dict-node"; packageName = "@cspell/dict-node"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-node/-/dict-node-4.0.1.tgz"; - sha512 = "4EmT5yZFitdwnG0hYEd+Ek19zzD81Bp+n7w0kglZKldS5AvapwW6GM/SAps5YMQQc5zZMi+bMgV7NIzapREqUg=="; + url = "https://registry.npmjs.org/@cspell/dict-node/-/dict-node-4.0.2.tgz"; + sha512 = "FEQJ4TnMcXEFslqBQkXa5HposMoCGsiBv2ux4IZuIXgadXeHKHUHk60iarWpjhzNzQLyN2GD7NoRMd12bK3Llw=="; }; }; "@cspell/dict-npm-1.0.16" = { @@ -3622,13 +3658,13 @@ let sha512 = "RwkuZGcYBxL3Yux3cSG/IOWGlQ1e9HLCpHeyMtTVGYKAIkFAVUnGrz20l16/Q7zUG7IEktBz5O42kAozrEnqMQ=="; }; }; - "@cspell/dict-npm-4.0.1" = { + "@cspell/dict-npm-5.0.3" = { name = "_at_cspell_slash_dict-npm"; packageName = "@cspell/dict-npm"; - version = "4.0.1"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-4.0.1.tgz"; - sha512 = "jNKImVG5ZX+Pp6PhbSR3TmC9+0ROx09dGhSgUsZyvXV5CGEr+OQGJtNL98TGwU3pP2Xjc++qnHA/XPwB5WvLfA=="; + url = "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.0.3.tgz"; + sha512 = "fEX67zIJISbS3gXVk/y/ZUvDIVtjc/CYJK7Mz0iTVrmlCKnLiD41lApe8v4g/12eE7hLfx/sfCXDrUWyzXVq1A=="; }; }; "@cspell/dict-php-1.0.25" = { @@ -3640,13 +3676,13 @@ let sha512 = "RoBIP5MRdByyPaXcznZMfOY1JdCMYPPLua5E9gkq0TJO7bX5mC9hyAKfYBSWVQunZydd82HZixjb5MPkDFU1uw=="; }; }; - "@cspell/dict-php-3.0.3" = { + "@cspell/dict-php-3.0.4" = { name = "_at_cspell_slash_dict-php"; packageName = "@cspell/dict-php"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-3.0.3.tgz"; - sha512 = "7dvXdPTfbIF2xEob9w94/eV5SU8BkYoN0R7EQghXi0fcF7T1unK+JwDgfoEs6wqApB5aCVYwguiaj8HGX2IRIQ=="; + url = "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-3.0.4.tgz"; + sha512 = "QX6zE/ZfnT3O5lSwV8EPVh8Va39ds34gSNNR8I4GWiuDpKcTkZPFi4OLoP3Tlhbl/3G0Ha35OkSDLvZfu8mnkA=="; }; }; "@cspell/dict-powershell-1.0.19" = { @@ -3658,22 +3694,22 @@ let sha512 = "zF/raM/lkhXeHf4I43OtK0gP9rBeEJFArscTVwLWOCIvNk21MJcNoTYoaGw+c056+Q+hJL0psGLO7QN+mxYH1A=="; }; }; - "@cspell/dict-powershell-3.0.0" = { + "@cspell/dict-powershell-4.0.0" = { name = "_at_cspell_slash_dict-powershell"; packageName = "@cspell/dict-powershell"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-3.0.0.tgz"; - sha512 = "pkztY9Ak4oc33q+Qxcn9/CTOKo4N8YIRRE6v67WwQOncA5QIJfcOPUrjfR3Z8SpzElXhu3s9qtWWSqbCy6qmcA=="; + url = "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-4.0.0.tgz"; + sha512 = "1Lbm+3+Sx63atl4MM3lPeCUc90JjRyKP9+exmy2cQimXNju9ngtuDWwapHUnhQ47qnzrsBY4ydm36KCfJarXJA=="; }; }; - "@cspell/dict-public-licenses-2.0.0" = { + "@cspell/dict-public-licenses-2.0.1" = { name = "_at_cspell_slash_dict-public-licenses"; packageName = "@cspell/dict-public-licenses"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.0.tgz"; - sha512 = "NdMHnS6xiYJKlzVoTV5CBhMiDpXMZ/PDcvXiOpxeR50xkjR18O/XFP4f4eDZpxGiBSUCMFRWf4JjILJ04Rpcfg=="; + url = "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.1.tgz"; + sha512 = "NZNwzkL5BqKddepDxvX/Qbji378Mso1TdnV4RFAN8hJoo6dSR0fv2TTI/Y0i/YWBmfmQGyTpEztBXtAw4qgjiA=="; }; }; "@cspell/dict-python-1.0.38" = { @@ -3685,22 +3721,22 @@ let sha512 = "KuyOQaby9NID/pn7EkXilpUxjVIvvyLzhr7BPsDS6FcvUE8Yhss6bJowEDHSv6pa+W2387phoqbDf2rTicquAA=="; }; }; - "@cspell/dict-python-4.0.0" = { + "@cspell/dict-python-4.0.1" = { name = "_at_cspell_slash_dict-python"; packageName = "@cspell/dict-python"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.0.0.tgz"; - sha512 = "MC6CKbYOly3Ig25ZnhlCzPbE/QozqfQv4VYW6HcoMQ5IbHu33ddf2lzkZ89qTXlxsF5NT5qfZEkQYHYuhuL6AQ=="; + url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.0.1.tgz"; + sha512 = "1wtUgyaTqRiQY0/fryk0oW22lcxNUnZ5DwteTzfatMdbgR0OHXTlHbI8vYxpHLWalSoch7EpLsnaymG+fOrt8g=="; }; }; - "@cspell/dict-r-2.0.0" = { + "@cspell/dict-r-2.0.1" = { name = "_at_cspell_slash_dict-r"; packageName = "@cspell/dict-r"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-r/-/dict-r-2.0.0.tgz"; - sha512 = "rdt1cKc3VL2uXJ2X088gRhTFreN/MkJWK1jccW1EWdFHLzDwhKfrlAkoLCp0paD6HvmloLQ+eSR09D58DdsYfA=="; + url = "https://registry.npmjs.org/@cspell/dict-r/-/dict-r-2.0.1.tgz"; + sha512 = "KCmKaeYMLm2Ip79mlYPc8p+B2uzwBp4KMkzeLd5E6jUlCL93Y5Nvq68wV5fRLDRTf7N1LvofkVFWfDcednFOgA=="; }; }; "@cspell/dict-ruby-1.0.15" = { @@ -3712,13 +3748,13 @@ let sha512 = "I76hJA///lc1pgmDTGUFHN/O8KLIZIU/8TgIYIGI6Ix/YzSEvWNdQYbANn6JbCynS0X+7IbZ2Ft+QqvmGtIWuA=="; }; }; - "@cspell/dict-ruby-3.0.0" = { + "@cspell/dict-ruby-4.0.1" = { name = "_at_cspell_slash_dict-ruby"; packageName = "@cspell/dict-ruby"; - version = "3.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-3.0.0.tgz"; - sha512 = "sA98T8Y1Pmq3RStVkO14E8vTWkq6JUn8c8PldiMyYgV0yfQgwhQfFAzlSfF3Gg2B0VkIdqt2et2SPN7f9wp7fQ=="; + url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-4.0.1.tgz"; + sha512 = "p9nLDsffPadPLLwdLQj4Gk0IsZ64iCSxnSCaeFXslFiD17FtJVh1YMHP7KE9M73u22Hprq+a1Yw25/xp6Tkt3g=="; }; }; "@cspell/dict-rust-1.0.23" = { @@ -3730,13 +3766,13 @@ let sha512 = "lR4boDzs79YD6+30mmiSGAMMdwh7HTBAPUFSB0obR3Kidibfc3GZ+MHWZXay5dxZ4nBKM06vyjtanF9VJ8q1Iw=="; }; }; - "@cspell/dict-rust-3.0.0" = { + "@cspell/dict-rust-4.0.0" = { name = "_at_cspell_slash_dict-rust"; packageName = "@cspell/dict-rust"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-3.0.0.tgz"; - sha512 = "L1T1IBsYJZVDmfOGAbVLcpc6arWxRRCSJYvHSwEDBGrNuMyJ4jx/NvBEz5crcKf4vVKgwVlXgzQlJJZ8AVxU9w=="; + url = "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-4.0.0.tgz"; + sha512 = "nzJsgLR6/JXtM41Cr5FG89r8sBKW6aFjvCqPxeaBJYLAL0JuvsVUcd16rW2lTsdbx5J8yUQDD7mgCZFk6merJQ=="; }; }; "@cspell/dict-scala-1.0.21" = { @@ -3748,13 +3784,13 @@ let sha512 = "5V/R7PRbbminTpPS3ywgdAalI9BHzcEjEj9ug4kWYvBIGwSnS7T6QCFCiu+e9LvEGUqQC+NHgLY4zs1NaBj2vA=="; }; }; - "@cspell/dict-scala-3.0.0" = { + "@cspell/dict-scala-4.0.0" = { name = "_at_cspell_slash_dict-scala"; packageName = "@cspell/dict-scala"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-3.0.0.tgz"; - sha512 = "sIiCQDIMMnNns/fzD61z5npbh5pypaKq07Orqe0+eRfdQpika8iRSGUGFHVbtdd1JzB1DyTCV2e8OwdaQiXqJQ=="; + url = "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-4.0.0.tgz"; + sha512 = "ugdjt66/Ah34yF3u3DUNjCHXnBqIuxUUfdeBobbGxfm29CNgidrISV1NUh+xi8tPynMzSTpGbBiArFBH6on5XQ=="; }; }; "@cspell/dict-software-terms-1.0.48" = { @@ -3766,31 +3802,40 @@ let sha512 = "pfF3Ys2gRffu5ElqkH7FQMDMi/iZMyOzpGMb3FSH0PJ2AnRQ5rRNWght1h2L36YxvXl0mWVaFrrfwiOyRIc8ZQ=="; }; }; - "@cspell/dict-software-terms-3.0.5" = { + "@cspell/dict-software-terms-3.1.1" = { name = "_at_cspell_slash_dict-software-terms"; packageName = "@cspell/dict-software-terms"; - version = "3.0.5"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.0.5.tgz"; - sha512 = "xZVcX1zsIUbLvUc/RX+YgJRvbHaGMcdkRR+Vw8UoLjmhnT0yXWLds5uwRwAVjlQIrIcHylfDWuG70Cq5nmJHfA=="; + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.1.1.tgz"; + sha512 = "11vzKnocWDEUnwh03ea5Pr0vfMkGgUvDsAAjNQmnXVzDMYIjPVbttrRy54pEfBv0/RxtDFR0lDKFUAcdyjPX2w=="; }; }; - "@cspell/dict-sql-2.0.0" = { + "@cspell/dict-sql-2.0.1" = { name = "_at_cspell_slash_dict-sql"; packageName = "@cspell/dict-sql"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.0.0.tgz"; - sha512 = "J3X8VSgWpc/4McQEs138abtBw/SO3Z+vGaYi5X7XV1pKPBxjupHTTNQHSS/HWUDmVWj6fR3OV+ZGptcmvv3Clg=="; + url = "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.0.1.tgz"; + sha512 = "7fvVcvy751cl31KMD5j04yMGq2UKj018/1hx3FNtdUI9UuUTMvhBrTAqHEEemR3ZeIC9i/5p5SQjwQ13bn04qw=="; }; }; - "@cspell/dict-swift-2.0.0" = { + "@cspell/dict-svelte-1.0.2" = { + name = "_at_cspell_slash_dict-svelte"; + packageName = "@cspell/dict-svelte"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-svelte/-/dict-svelte-1.0.2.tgz"; + sha512 = "rPJmnn/GsDs0btNvrRBciOhngKV98yZ9SHmg8qI6HLS8hZKvcXc0LMsf9LLuMK1TmS2+WQFAan6qeqg6bBxL2Q=="; + }; + }; + "@cspell/dict-swift-2.0.1" = { name = "_at_cspell_slash_dict-swift"; packageName = "@cspell/dict-swift"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-swift/-/dict-swift-2.0.0.tgz"; - sha512 = "VStJ0fKPPNIXKmxJrbGH6vKNtJCwAnQatfSH0fVj+Unf3QHHlmuLKRG0cN0aVgEIolpRkxNXJcSB3CPbYr0Xhw=="; + url = "https://registry.npmjs.org/@cspell/dict-swift/-/dict-swift-2.0.1.tgz"; + sha512 = "gxrCMUOndOk7xZFmXNtkCEeroZRnS2VbeaIPiymGRHj5H+qfTAzAKxtv7jJbVA3YYvEzWcVE2oKDP4wcbhIERw=="; }; }; "@cspell/dict-typescript-1.0.20" = { @@ -3802,13 +3847,13 @@ let sha512 = "yIuGeeZtQA2gqpGefGjZqBl8iGJpIYWz0QzDqsscNi2qfSnLsbjM0RkRbTehM8y9gGGe7xfgUP5adxceJa5Krg=="; }; }; - "@cspell/dict-typescript-3.0.1" = { + "@cspell/dict-typescript-3.1.0" = { name = "_at_cspell_slash_dict-typescript"; packageName = "@cspell/dict-typescript"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.0.1.tgz"; - sha512 = "nKEtOpj+rJNIUK268/mCFDCIv1MWFdK1efm9YL4q1q3NHT+qCKhkXoA0eG8k4AaDIpsvebB8CgNIYFPxY92r4A=="; + url = "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.1.0.tgz"; + sha512 = "4hdLlQMOYrUbGfJg2cWnbsBUevObwgL76TLVC0rwnrkSwzOxAxiGaG39VtRMvgAAe2lX6L+jka3fy0MmxzFOHw=="; }; }; "@cspell/dict-vue-3.0.0" = { @@ -3820,6 +3865,15 @@ let sha512 = "niiEMPWPV9IeRBRzZ0TBZmNnkK3olkOPYxC1Ny2AX4TGlYRajcW0WUtoSHmvvjZNfWLSg2L6ruiBeuPSbjnG6A=="; }; }; + "@cspell/strong-weak-map-6.19.2" = { + name = "_at_cspell_slash_strong-weak-map"; + packageName = "@cspell/strong-weak-map"; + version = "6.19.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-6.19.2.tgz"; + sha512 = "0P2f1JNGw+lEyqz0jxj1ob+772HgbQEIrXXuWF9vQXKdYx0kVzkSNVAUGZjqWiO+ieGFJVr0pqHA+wGcIx1VAQ=="; + }; + }; "@cspotcode/source-map-consumer-0.8.0" = { name = "_at_cspotcode_slash_source-map-consumer"; packageName = "@cspotcode/source-map-consumer"; @@ -3847,139 +3901,13 @@ let sha512 = "IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="; }; }; - "@csstools/postcss-cascade-layers-1.1.1" = { - name = "_at_csstools_slash_postcss-cascade-layers"; - packageName = "@csstools/postcss-cascade-layers"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz"; - sha512 = "+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA=="; - }; - }; - "@csstools/postcss-color-function-1.1.1" = { - name = "_at_csstools_slash_postcss-color-function"; - packageName = "@csstools/postcss-color-function"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz"; - sha512 = "Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw=="; - }; - }; - "@csstools/postcss-font-format-keywords-1.0.1" = { - name = "_at_csstools_slash_postcss-font-format-keywords"; - packageName = "@csstools/postcss-font-format-keywords"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz"; - sha512 = "ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg=="; - }; - }; - "@csstools/postcss-hwb-function-1.0.2" = { - name = "_at_csstools_slash_postcss-hwb-function"; - packageName = "@csstools/postcss-hwb-function"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz"; - sha512 = "YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w=="; - }; - }; - "@csstools/postcss-ic-unit-1.0.1" = { - name = "_at_csstools_slash_postcss-ic-unit"; - packageName = "@csstools/postcss-ic-unit"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz"; - sha512 = "Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw=="; - }; - }; - "@csstools/postcss-is-pseudo-class-2.0.7" = { - name = "_at_csstools_slash_postcss-is-pseudo-class"; - packageName = "@csstools/postcss-is-pseudo-class"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz"; - sha512 = "7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA=="; - }; - }; - "@csstools/postcss-nested-calc-1.0.0" = { - name = "_at_csstools_slash_postcss-nested-calc"; - packageName = "@csstools/postcss-nested-calc"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz"; - sha512 = "JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ=="; - }; - }; - "@csstools/postcss-normalize-display-values-1.0.1" = { - name = "_at_csstools_slash_postcss-normalize-display-values"; - packageName = "@csstools/postcss-normalize-display-values"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz"; - sha512 = "jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw=="; - }; - }; - "@csstools/postcss-oklab-function-1.1.1" = { - name = "_at_csstools_slash_postcss-oklab-function"; - packageName = "@csstools/postcss-oklab-function"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz"; - sha512 = "nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA=="; - }; - }; - "@csstools/postcss-progressive-custom-properties-1.3.0" = { - name = "_at_csstools_slash_postcss-progressive-custom-properties"; - packageName = "@csstools/postcss-progressive-custom-properties"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz"; - sha512 = "ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA=="; - }; - }; - "@csstools/postcss-stepped-value-functions-1.0.1" = { - name = "_at_csstools_slash_postcss-stepped-value-functions"; - packageName = "@csstools/postcss-stepped-value-functions"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz"; - sha512 = "dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ=="; - }; - }; - "@csstools/postcss-text-decoration-shorthand-1.0.0" = { - name = "_at_csstools_slash_postcss-text-decoration-shorthand"; - packageName = "@csstools/postcss-text-decoration-shorthand"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz"; - sha512 = "c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw=="; - }; - }; - "@csstools/postcss-trigonometric-functions-1.0.2" = { - name = "_at_csstools_slash_postcss-trigonometric-functions"; - packageName = "@csstools/postcss-trigonometric-functions"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz"; - sha512 = "woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og=="; - }; - }; - "@csstools/postcss-unset-value-1.0.2" = { - name = "_at_csstools_slash_postcss-unset-value"; - packageName = "@csstools/postcss-unset-value"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz"; - sha512 = "c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g=="; - }; - }; - "@csstools/selector-specificity-2.0.2" = { + "@csstools/selector-specificity-2.1.1" = { name = "_at_csstools_slash_selector-specificity"; packageName = "@csstools/selector-specificity"; - version = "2.0.2"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz"; - sha512 = "IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg=="; + url = "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.1.1.tgz"; + sha512 = "jwx+WCqszn53YHOfvFMJJRd/B2GqkCBt+1MJSG6o5/s8+ytHMvDZXsJgUEWLk12UnLd7HYKac4BYU5i/Ron1Cw=="; }; }; "@cycle/dom-18.3.0" = { @@ -4045,22 +3973,13 @@ let sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="; }; }; - "@deltachat/message_parser_wasm-0.4.0" = { - name = "_at_deltachat_slash_message_parser_wasm"; - packageName = "@deltachat/message_parser_wasm"; - version = "0.4.0"; + "@devexpress/error-stack-parser-2.0.6" = { + name = "_at_devexpress_slash_error-stack-parser"; + packageName = "@devexpress/error-stack-parser"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@deltachat/message_parser_wasm/-/message_parser_wasm-0.4.0.tgz"; - sha512 = "lnFkj1nwYUU09Ee7udBkci61aUltv7TsgqhPmh812nvr18yw+/gYmZM9tvD8qPkGVU1tgbQ36Iruv+QWmLUFUw=="; - }; - }; - "@deltachat/react-qr-reader-4.0.0" = { - name = "_at_deltachat_slash_react-qr-reader"; - packageName = "@deltachat/react-qr-reader"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@deltachat/react-qr-reader/-/react-qr-reader-4.0.0.tgz"; - sha512 = "MdsQTo1Q18IUP3yMADQHDeWlVCq9p+LV96+dKCyNSBffaZ/5nE4J+Rbldd9QjPyVL615Hp4m9cubVfk/iAIjyA=="; + url = "https://registry.npmjs.org/@devexpress/error-stack-parser/-/error-stack-parser-2.0.6.tgz"; + sha512 = "fneVypElGUH6Be39mlRZeAu00pccTlf4oVuzf9xPJD1cdEqI8NyAiQua/EW7lZdrbMUbgyXcJmfKPefhYius3A=="; }; }; "@devicefarmer/adbkit-3.2.3" = { @@ -4144,112 +4063,94 @@ let sha512 = "BOLrAX8IWHRXu1siZocwLguKJPEUv7cr+rG8tI4hvHgMdIsBWHJlLeB8EjuUVnIURFrUiM49lVKn8DRrECmngw=="; }; }; - "@electron-forge/async-ora-6.0.0" = { - name = "_at_electron-forge_slash_async-ora"; - packageName = "@electron-forge/async-ora"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0.tgz"; - sha512 = "qRbdJRvpxpmSzoNh0YzsYFR7cKsgMwI4hRbaL8qstYHs4bvEzvtmrLLEUpfGM6rh0a3AAZDC67PbOBT0dhGLLw=="; - }; - }; - "@electron-forge/core-6.0.0" = { + "@electron-forge/core-6.0.4" = { name = "_at_electron-forge_slash_core"; packageName = "@electron-forge/core"; - version = "6.0.0"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0.tgz"; - sha512 = "EIHzle+n7fyOGQQyhL6hlyy6akzrVUVWXcYcYBlF+kI7MdonvJxQvtebiJBItX1gd4E4Fqe2fHi5ufk3ghqhlQ=="; + url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.4.tgz"; + sha512 = "l3OiXB/9ebtZZtcQAbofaTmivQUqUVv8TKoxQ8GJbH48Eyk//mphbo7hDC5kb5Tyd0UedMOM9MxJrYjnd6jRnA=="; }; }; - "@electron-forge/core-utils-6.0.0" = { + "@electron-forge/core-utils-6.0.4" = { name = "_at_electron-forge_slash_core-utils"; packageName = "@electron-forge/core-utils"; - version = "6.0.0"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/core-utils/-/core-utils-6.0.0.tgz"; - sha512 = "JX9COxf+V7py7V8QjX4aQySDLx2RceujNB1omXKm7fdfwItYVhimKz9QBfDwG8q5+K2nbCRSfpAbIEOuhUBl6Q=="; + url = "https://registry.npmjs.org/@electron-forge/core-utils/-/core-utils-6.0.4.tgz"; + sha512 = "nOCjmm8Qr/bYkVNfEiXSk/LKjtv6iBrKcyhKIanNM3n7MJRuTH0ksvuajFBqg+V+EHplMb7y6acDvI+TTRDUxg=="; }; }; - "@electron-forge/maker-base-6.0.0" = { + "@electron-forge/maker-base-6.0.4" = { name = "_at_electron-forge_slash_maker-base"; packageName = "@electron-forge/maker-base"; - version = "6.0.0"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0.tgz"; - sha512 = "zT4NQzJ4zjlKwmRtY/HeKcd/eP+R2vtYvpen5z6vuqY12+jubGgRoGyot4VT0nN5p46gcofGW/Y6aPEuND4ORg=="; + url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.4.tgz"; + sha512 = "qJJ2oPFlyt6u/H67WLfZL0JclSpFj4VwxPfwxqNL/HcwXULJcOeat7oqJLY9UKBE4U2j+++xbA3LSoPAErroIg=="; }; }; - "@electron-forge/plugin-base-6.0.0" = { + "@electron-forge/plugin-base-6.0.4" = { name = "_at_electron-forge_slash_plugin-base"; packageName = "@electron-forge/plugin-base"; - version = "6.0.0"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0.tgz"; - sha512 = "0PVEz0cFL0KKlBfyCaLVKfdOkdaSlJu+vl3oGLZoDVyOw3wNu5Tk2o84gKgkgtZ1jZTH3dmxUhimdWSMYl0QYA=="; + url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.4.tgz"; + sha512 = "iILzbFzmUIGggsTNL9PO1ma6e4OuuhKunNnOkpkoyg6jIaz8Oh1WSHhOALMztlBn2FhreabZnBRy7JsvHVDXlg=="; }; }; - "@electron-forge/publisher-base-6.0.0" = { + "@electron-forge/publisher-base-6.0.4" = { name = "_at_electron-forge_slash_publisher-base"; packageName = "@electron-forge/publisher-base"; - version = "6.0.0"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0.tgz"; - sha512 = "Aa6Xf00BQwxlyXpuismOtOt6XezP8CURWRnj1WN2kvSJDkLSzFwJqppHUIdz1htRx65h0H+uyaaCb2WlaWivMg=="; + url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.4.tgz"; + sha512 = "0C86jnOSTo0z/W58zRx6BijuR4lscB0F6yXaBCFA5xaJ8+fVIsgz29kmVlLrp+YFRgatDCljvk+1+qVRM/Mfpg=="; }; }; - "@electron-forge/shared-types-6.0.0" = { + "@electron-forge/shared-types-6.0.4" = { name = "_at_electron-forge_slash_shared-types"; packageName = "@electron-forge/shared-types"; - version = "6.0.0"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0.tgz"; - sha512 = "FN+158+EvSzbL/ZGwsLxeUbYOJm8bhHCLbR7SPAmKwn/X2P8pVj4HuhiROkqdiuU4kUDmrOg/LgObODofyvIKw=="; + url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.4.tgz"; + sha512 = "lILLKcGZqfJYVI1x6RssVh37E934rCOaSdBQ9I7LypdfI2NWL+5PLLoUqvXbok1V28m3/O5JrXdigwEIZdhjzQ=="; }; }; - "@electron-forge/template-base-6.0.0" = { + "@electron-forge/template-base-6.0.4" = { name = "_at_electron-forge_slash_template-base"; packageName = "@electron-forge/template-base"; - version = "6.0.0"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0.tgz"; - sha512 = "jFFS7U6T6owLGZ9uB1m7KgAzWrG1QG0cg/0XK2OijpgRJuTy3O/qUzAf7IhdwxT7CARMq2vLq6yMbTYb/0tQ7Q=="; + url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.4.tgz"; + sha512 = "23/b0n+ls0+c2+OG1XrHROk6i3PseONLJY3tcR42uFaP/yGZL8nJfgXE2qTKBwUyFQ0tCgUAD3a4vYkMPLKrwg=="; }; }; - "@electron-forge/template-webpack-6.0.0" = { + "@electron-forge/template-webpack-6.0.4" = { name = "_at_electron-forge_slash_template-webpack"; packageName = "@electron-forge/template-webpack"; - version = "6.0.0"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0.tgz"; - sha512 = "o7gUO8zdUyvkcQ9nlBd20F9nDErO5Hd75Tk9GCXPQ4nQuEEZnUp+mzd5j+bzmSaidjFfVCfz1hXzwko5fch34g=="; + url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.4.tgz"; + sha512 = "mrzNzkhsLfD20y/vfTYVBFSkptmgSEwqn4zh4vnzP9tzAJ4eMbvhfVtkK/XQfm8ZspPjs+RZSzRrRNo+e0iEaw=="; }; }; - "@electron-forge/template-webpack-typescript-6.0.0" = { + "@electron-forge/template-webpack-typescript-6.0.4" = { name = "_at_electron-forge_slash_template-webpack-typescript"; packageName = "@electron-forge/template-webpack-typescript"; - version = "6.0.0"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-webpack-typescript/-/template-webpack-typescript-6.0.0.tgz"; - sha512 = "lhWZIqLHPt7gffdfTl0mg5YLh6nUgcNxpzW8Osctstc7XM2eF0CK09Gbi6d/E2MPIK911zrTSqsvBkYXWCUprQ=="; + url = "https://registry.npmjs.org/@electron-forge/template-webpack-typescript/-/template-webpack-typescript-6.0.4.tgz"; + sha512 = "Z9fJ0JfZw9w5OVZgy0qVGapGMQqfaLyQSHzEfm2HQdGGJrHkeXJkMn8Yd1E8h5EPMb3jF5tHRw3VopelzcPQxQ=="; }; }; - "@electron/asar-3.2.2" = { + "@electron/asar-3.2.3" = { name = "_at_electron_slash_asar"; packageName = "@electron/asar"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/asar/-/asar-3.2.2.tgz"; - sha512 = "32fMU68x8a6zvxtC1IC/BhPDKTh8rQjdmwEplj3CDpnkcwBzZVN9v/8cK0LJqQ0FOQQVZW8BWZ1S6UU53TYR4w=="; - }; - }; - "@electron/get-1.14.1" = { - name = "_at_electron_slash_get"; - packageName = "@electron/get"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron/get/-/get-1.14.1.tgz"; - sha512 = "BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw=="; + url = "https://registry.npmjs.org/@electron/asar/-/asar-3.2.3.tgz"; + sha512 = "wmOfE6szYyqZhRIiLH+eyZEp+bGcJI0OD/SCvSUrfBE0jvauyGYO2ZhpWxmNCcDojKu5DYrsVqT5BOCZZ01XIg=="; }; }; "@electron/get-2.0.2" = { @@ -4270,13 +4171,13 @@ let sha512 = "9oRzT56rKh5bspk3KpAVF8lPKHYQrBnRwcgiOeR0hdilVEQmszDaAu0IPCPrwwzJN0ugNs0rRboTreHMt/6mBQ=="; }; }; - "@electron/osx-sign-1.0.1" = { + "@electron/osx-sign-1.0.4" = { name = "_at_electron_slash_osx-sign"; packageName = "@electron/osx-sign"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.0.1.tgz"; - sha512 = "WkUcva+qkt809bI6uxxEG/uOWfl8HAw0m8aPijpKmGMIpZ1CWWB808YG6aY3wckUO86xZdmiOsUJTM4keLhY8A=="; + url = "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.0.4.tgz"; + sha512 = "xfhdEcIOfAZg7scZ9RQPya1G1lWo8/zMCwUXAulq0SfY7ONIW+b9qGyKdMyuMctNYwllrIS+vmxfijSfjeh97g=="; }; }; "@electron/rebuild-3.2.10" = { @@ -4288,13 +4189,13 @@ let sha512 = "SUBM6Mwi3yZaDFQjZzfGKpYTtOp9m60glounwX6tfGeVc/ZOl4jbquktUcyy7gYSLDWFLtKkftkY2xgMJZLQgg=="; }; }; - "@electron/universal-1.3.3" = { + "@electron/universal-1.3.4" = { name = "_at_electron_slash_universal"; packageName = "@electron/universal"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/universal/-/universal-1.3.3.tgz"; - sha512 = "79yc61D5QWaQpia+sLQbIIi5iVoV4y9HtgOTlE0fYT0xoyg+ChwndBl4a0Q7yJfDsqq+/nLEPE655F0bTpDiCg=="; + url = "https://registry.npmjs.org/@electron/universal/-/universal-1.3.4.tgz"; + sha512 = "BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg=="; }; }; "@emmetio/abbreviation-2.2.3" = { @@ -4396,22 +4297,220 @@ let sha512 = "uZbcXi0zbmKC/050p3gJnne5Qdzw8vkXIv+c2BW0Lsc1ji1SkrxbKPUy5Efr0blbTu1SL8w4eyfpnSdPg3G0Qg=="; }; }; - "@esbuild/android-arm-0.15.13" = { + "@esbuild/android-arm-0.15.18" = { name = "_at_esbuild_slash_android-arm"; packageName = "@esbuild/android-arm"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.13.tgz"; - sha512 = "RY2fVI8O0iFUNvZirXaQ1vMvK0xhCcl0gqRj74Z6yEiO1zAUa7hbsdwZM1kzqbxHK7LFyMizipfXT3JME+12Hw=="; + url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz"; + sha512 = "5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw=="; }; }; - "@esbuild/linux-loong64-0.15.13" = { + "@esbuild/android-arm-0.16.17" = { + name = "_at_esbuild_slash_android-arm"; + packageName = "@esbuild/android-arm"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz"; + sha512 = "N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw=="; + }; + }; + "@esbuild/android-arm64-0.16.17" = { + name = "_at_esbuild_slash_android-arm64"; + packageName = "@esbuild/android-arm64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz"; + sha512 = "MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg=="; + }; + }; + "@esbuild/android-x64-0.16.17" = { + name = "_at_esbuild_slash_android-x64"; + packageName = "@esbuild/android-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.17.tgz"; + sha512 = "a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ=="; + }; + }; + "@esbuild/darwin-arm64-0.16.17" = { + name = "_at_esbuild_slash_darwin-arm64"; + packageName = "@esbuild/darwin-arm64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz"; + sha512 = "/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w=="; + }; + }; + "@esbuild/darwin-x64-0.16.17" = { + name = "_at_esbuild_slash_darwin-x64"; + packageName = "@esbuild/darwin-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz"; + sha512 = "2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg=="; + }; + }; + "@esbuild/freebsd-arm64-0.16.17" = { + name = "_at_esbuild_slash_freebsd-arm64"; + packageName = "@esbuild/freebsd-arm64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz"; + sha512 = "mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw=="; + }; + }; + "@esbuild/freebsd-x64-0.16.17" = { + name = "_at_esbuild_slash_freebsd-x64"; + packageName = "@esbuild/freebsd-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz"; + sha512 = "8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug=="; + }; + }; + "@esbuild/linux-arm-0.16.17" = { + name = "_at_esbuild_slash_linux-arm"; + packageName = "@esbuild/linux-arm"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz"; + sha512 = "iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ=="; + }; + }; + "@esbuild/linux-arm64-0.16.17" = { + name = "_at_esbuild_slash_linux-arm64"; + packageName = "@esbuild/linux-arm64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz"; + sha512 = "7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g=="; + }; + }; + "@esbuild/linux-ia32-0.16.17" = { + name = "_at_esbuild_slash_linux-ia32"; + packageName = "@esbuild/linux-ia32"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz"; + sha512 = "kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg=="; + }; + }; + "@esbuild/linux-loong64-0.15.18" = { name = "_at_esbuild_slash_linux-loong64"; packageName = "@esbuild/linux-loong64"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.13.tgz"; - sha512 = "+BoyIm4I8uJmH/QDIH0fu7MG0AEx9OXEDXnqptXCwKOlOqZiS4iraH1Nr7/ObLMokW3sOCeBNyD68ATcV9b9Ag=="; + url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz"; + sha512 = "L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ=="; + }; + }; + "@esbuild/linux-loong64-0.16.17" = { + name = "_at_esbuild_slash_linux-loong64"; + packageName = "@esbuild/linux-loong64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz"; + sha512 = "dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ=="; + }; + }; + "@esbuild/linux-mips64el-0.16.17" = { + name = "_at_esbuild_slash_linux-mips64el"; + packageName = "@esbuild/linux-mips64el"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz"; + sha512 = "ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw=="; + }; + }; + "@esbuild/linux-ppc64-0.16.17" = { + name = "_at_esbuild_slash_linux-ppc64"; + packageName = "@esbuild/linux-ppc64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz"; + sha512 = "dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g=="; + }; + }; + "@esbuild/linux-riscv64-0.16.17" = { + name = "_at_esbuild_slash_linux-riscv64"; + packageName = "@esbuild/linux-riscv64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz"; + sha512 = "ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw=="; + }; + }; + "@esbuild/linux-s390x-0.16.17" = { + name = "_at_esbuild_slash_linux-s390x"; + packageName = "@esbuild/linux-s390x"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz"; + sha512 = "gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w=="; + }; + }; + "@esbuild/linux-x64-0.16.17" = { + name = "_at_esbuild_slash_linux-x64"; + packageName = "@esbuild/linux-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz"; + sha512 = "mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw=="; + }; + }; + "@esbuild/netbsd-x64-0.16.17" = { + name = "_at_esbuild_slash_netbsd-x64"; + packageName = "@esbuild/netbsd-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz"; + sha512 = "/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA=="; + }; + }; + "@esbuild/openbsd-x64-0.16.17" = { + name = "_at_esbuild_slash_openbsd-x64"; + packageName = "@esbuild/openbsd-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz"; + sha512 = "2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg=="; + }; + }; + "@esbuild/sunos-x64-0.16.17" = { + name = "_at_esbuild_slash_sunos-x64"; + packageName = "@esbuild/sunos-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz"; + sha512 = "xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw=="; + }; + }; + "@esbuild/win32-arm64-0.16.17" = { + name = "_at_esbuild_slash_win32-arm64"; + packageName = "@esbuild/win32-arm64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz"; + sha512 = "ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw=="; + }; + }; + "@esbuild/win32-ia32-0.16.17" = { + name = "_at_esbuild_slash_win32-ia32"; + packageName = "@esbuild/win32-ia32"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz"; + sha512 = "WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig=="; + }; + }; + "@esbuild/win32-x64-0.16.17" = { + name = "_at_esbuild_slash_win32-x64"; + packageName = "@esbuild/win32-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz"; + sha512 = "y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q=="; }; }; "@eslint/eslintrc-0.4.3" = { @@ -4423,13 +4522,13 @@ let sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; }; - "@eslint/eslintrc-1.3.3" = { + "@eslint/eslintrc-1.4.1" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "1.3.3"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz"; - sha512 = "uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz"; + sha512 = "XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA=="; }; }; "@esm2cjs/cacheable-lookup-7.0.0" = { @@ -4441,31 +4540,31 @@ let sha512 = "5HzrA5N0lSMtx2RdXfD9Z4HUFaRGwVOFs7jsFG8jDivoZjYYwZFsSqvA17TaNZYFcwBrkSCqHlxDu2YDpjjUBA=="; }; }; - "@esm2cjs/cacheable-request-10.2.2" = { + "@esm2cjs/cacheable-request-10.2.5" = { name = "_at_esm2cjs_slash_cacheable-request"; packageName = "@esm2cjs/cacheable-request"; - version = "10.2.2"; + version = "10.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/cacheable-request/-/cacheable-request-10.2.2.tgz"; - sha512 = "Le2lPwq0AJkT6dpzfN6D8I7GnDS5nWVkgzJWqmLxOPbeNir2d1i30jOdeUrZFS3bVaJUGhot7VioBOe8uTfRHg=="; + url = "https://registry.npmjs.org/@esm2cjs/cacheable-request/-/cacheable-request-10.2.5.tgz"; + sha512 = "fen7CINhjqLjNCVtleKzDJxc1P0gLMR4KXEq5dh1CxkHZ2X8KvM0km1DwdAuLRRBusmPwgj6jqZDDtPZpIOi5Q=="; }; }; - "@esm2cjs/form-data-encoder-2.1.3" = { + "@esm2cjs/form-data-encoder-2.1.4" = { name = "_at_esm2cjs_slash_form-data-encoder"; packageName = "@esm2cjs/form-data-encoder"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/form-data-encoder/-/form-data-encoder-2.1.3.tgz"; - sha512 = "gX11zQAutacDK2URqivqRQ3KUzWqxgjjVcamIvM9i+oS2Qf0QVZoBiVv34E3Nmjf+IYNBjXpOlwiyc9F1vni1A=="; + url = "https://registry.npmjs.org/@esm2cjs/form-data-encoder/-/form-data-encoder-2.1.4.tgz"; + sha512 = "HfuSoCMEgT5oHOwnN+o0f4Kzm+vBvRtddzJFFbLmawzPlFr3Djh2DHVDa2XpJCON4vjmd6RObd9R/oa0MvCLjg=="; }; }; - "@esm2cjs/got-12.5.2" = { + "@esm2cjs/got-12.5.3" = { name = "_at_esm2cjs_slash_got"; packageName = "@esm2cjs/got"; - version = "12.5.2"; + version = "12.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/got/-/got-12.5.2.tgz"; - sha512 = "BADfmu71GA9RYWx0pEWwzpaJO4Xcx0XTST2UeeHhsO0S12Bsf/6OJ9jdtKlQDM/VoYp4DkbMhL5SH54w2uMGRg=="; + url = "https://registry.npmjs.org/@esm2cjs/got/-/got-12.5.3.tgz"; + sha512 = "eI+5wDoF5bV4juELczVb65i+dFVPoQCq0XsnnBudzClQUYV+oScXVKt+LrToXO/1Vimfvt+EZoNmuwdQjz+Kkg=="; }; }; "@esm2cjs/http-timer-5.0.1" = { @@ -4504,13 +4603,13 @@ let sha512 = "v0OcLK+2AmkCaUVirWNu+e8j8xd8jRIXhC/VbpFp4AkVXGovFspCmwx26IluxXiz8vHckP4uLy/GzMatiEqdLg=="; }; }; - "@esm2cjs/normalize-url-7.2.0" = { + "@esm2cjs/normalize-url-8.0.0" = { name = "_at_esm2cjs_slash_normalize-url"; packageName = "@esm2cjs/normalize-url"; - version = "7.2.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/normalize-url/-/normalize-url-7.2.0.tgz"; - sha512 = "K1y4qR6p3PVE01NPvsozNHWTiCuD44XGk+lmri8N/t0GjfMIFsgVYvHRUoVKB/f4o/f0egQvaThLlEaSN+ELsA=="; + url = "https://registry.npmjs.org/@esm2cjs/normalize-url/-/normalize-url-8.0.0.tgz"; + sha512 = "9lrM8Q0ANSfM7ziVpNXEDKrVYcU4M3xIAUZWcvH9bY0fINBCkew1YBU1C1otfNoFDCERvCH0AkO70wkePdQwQw=="; }; }; "@esm2cjs/p-cancelable-3.0.0" = { @@ -4549,6 +4648,15 @@ let sha512 = "VIQ3pvevlVGC1uzQ7JxCQH3VFmzmC8ASXk35oKq4+VaLBZioKJR/eXk8C7GD8OgajnNByClo/rEsku1fqMTNSw=="; }; }; + "@ewoudenberg/difflib-0.1.0" = { + name = "_at_ewoudenberg_slash_difflib"; + packageName = "@ewoudenberg/difflib"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@ewoudenberg/difflib/-/difflib-0.1.0.tgz"; + sha512 = "OU5P5mJyD3OoWYMWY+yIgwvgNS9cFAU10f+DDuvtogcWQOoJIsQ4Hy2McSfUfhKjq8L0FuWVb4Rt7kgA+XK86A=="; + }; + }; "@exodus/schemasafe-1.0.0-rc.9" = { name = "_at_exodus_slash_schemasafe"; packageName = "@exodus/schemasafe"; @@ -4585,31 +4693,31 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/cli-0.4.6" = { + "@expo/cli-0.4.11" = { name = "_at_expo_slash_cli"; packageName = "@expo/cli"; - version = "0.4.6"; + version = "0.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/cli/-/cli-0.4.6.tgz"; - sha512 = "TGgw3cA+6xzdpVrT8Ym8lc1wrOlaEzUD33wLndU3BjpdVIcgwxG4YKkUVU0GgdcVrb/sP5LDZtdVZi2s0KDClw=="; + url = "https://registry.npmjs.org/@expo/cli/-/cli-0.4.11.tgz"; + sha512 = "L9Ci9RBh0aPFEDF1AjDYPk54OgeUJIKzxF3lRgITm+lQpI3IEKjAc9LaYeQeO1mlZMUQmPkHArF8iyz1eOeVoQ=="; }; }; - "@expo/code-signing-certificates-0.0.2" = { + "@expo/code-signing-certificates-0.0.5" = { name = "_at_expo_slash_code-signing-certificates"; packageName = "@expo/code-signing-certificates"; - version = "0.0.2"; + version = "0.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/code-signing-certificates/-/code-signing-certificates-0.0.2.tgz"; - sha512 = "vnPHFjwOqxQ1VLztktY+fYCfwvLzjqpzKn09rchcQE7Sdf0wtW5fFtIZBEFOOY5wasp8tXSnp627zrAwazPHzg=="; + url = "https://registry.npmjs.org/@expo/code-signing-certificates/-/code-signing-certificates-0.0.5.tgz"; + sha512 = "BNhXkY1bblxKZpltzAx98G2Egj9g1Q+JRcvR7E99DOj862FTCX+ZPsAUtPTr7aHxwtrL7+fL3r0JSmM9kBm+Bw=="; }; }; - "@expo/code-signing-certificates-0.0.3" = { - name = "_at_expo_slash_code-signing-certificates"; - packageName = "@expo/code-signing-certificates"; - version = "0.0.3"; + "@expo/config-6.0.20" = { + name = "_at_expo_slash_config"; + packageName = "@expo/config"; + version = "6.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/code-signing-certificates/-/code-signing-certificates-0.0.3.tgz"; - sha512 = "rHOUnsLaceOcdC8wUhkG+SuBJDbj/Nf/7kbBZH6ZbHzn22x92ZII/clIYOxt7C5P0xfeUwYKa7pRuZm6ut5k/g=="; + url = "https://registry.npmjs.org/@expo/config/-/config-6.0.20.tgz"; + sha512 = "m2T1/hB4TyLkQElOUwOajn/7gBcPaGyfVwoVsuJMEh0yrNvNFtXP+nl87Cm53g5q+VyfwJUgbewPQ3j/UXkI6Q=="; }; }; "@expo/config-6.0.24" = { @@ -4621,15 +4729,6 @@ let sha512 = "OcACI1md1Yo5TQmUxxueJ/RaTlR2Mgl6KswTFOYCL1XJERF/jjAx95zhWXH+JQGdlM0yB0vqM6vB6GbUFRvLxA=="; }; }; - "@expo/config-7.0.1" = { - name = "_at_expo_slash_config"; - packageName = "@expo/config"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-7.0.1.tgz"; - sha512 = "4lu0wr45XXJ2MXiLAm2+fmOyy/jjqF3NuDm92fO6nuulRzEEvTP4w3vsibJ690rT81ohtvhpruKhkRs0wSjKWA=="; - }; - }; "@expo/config-7.0.3" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; @@ -4639,6 +4738,15 @@ let sha512 = "joVtB5o+NF40Tmsdp65UzryRtbnCuMbXkVO4wJnNJO4aaK0EYLdHCYSewORVqNcDfGN0LphQr8VTG2npbd9CJA=="; }; }; + "@expo/config-plugins-4.1.1" = { + name = "_at_expo_slash_config-plugins"; + packageName = "@expo/config-plugins"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-4.1.1.tgz"; + sha512 = "lo3tVxRhwM9jfxPHJcURsH5WvU26kX12h5EB3C7kjVhgdQPLkvT8Jk8Cx0KSL8MXKcry2xQvZ2uuwWLkMeplJw=="; + }; + }; "@expo/config-plugins-4.1.5" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; @@ -4648,15 +4756,6 @@ let sha512 = "RVvU40RtZt12HavuDAe+LDIq9lHj7sheOfMEHdmpJ/uTA8pgvkbc56XF6JHQD+yRr6+uhhb+JnAasGq49dsQbw=="; }; }; - "@expo/config-plugins-5.0.1" = { - name = "_at_expo_slash_config-plugins"; - packageName = "@expo/config-plugins"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-5.0.1.tgz"; - sha512 = "1OfnsOrfeSkB0VZfT01UjQ5Uq6p+yYbq8yNkj0e99K/6NLHpyvIxj+5tZIV0nQXgkOcqBIABL2uA7lwB8CkaBQ=="; - }; - }; "@expo/config-plugins-5.0.4" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; @@ -4666,6 +4765,15 @@ let sha512 = "vzUcVpqOMs3h+hyRdhGwk+eGIOhXa5xYdd92yO17RMNHav3v/+ekMbs7XA2c3lepMO8Yd4/5hqmRw9ZTL6jGzg=="; }; }; + "@expo/config-types-44.0.0" = { + name = "_at_expo_slash_config-types"; + packageName = "@expo/config-types"; + version = "44.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/config-types/-/config-types-44.0.0.tgz"; + sha512 = "d+gpdKOAhqaD5RmcMzGgKzNtvE1w+GCqpFQNSXLliYlXjj+Tv0eL8EPeAdPtvke0vowpPFwd5McXLA90dgY6Jg=="; + }; + }; "@expo/config-types-45.0.0" = { name = "_at_expo_slash_config-types"; packageName = "@expo/config-types"; @@ -4675,15 +4783,6 @@ let sha512 = "/QGhhLWyaGautgEyU50UJr5YqKJix5t77ePTwreOVAhmZH+ff3nrrtYTTnccx+qF08ZNQmfAyYMCD3rQfzpiJA=="; }; }; - "@expo/config-types-46.0.2" = { - name = "_at_expo_slash_config-types"; - packageName = "@expo/config-types"; - version = "46.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-types/-/config-types-46.0.2.tgz"; - sha512 = "PXkmOgNwRyBfgVT1HmFZhfh3Qm7WKKyV6mk3/5HJ/LzPh1t+Zs2JrWX8U2YncTLV1QzV7nV8tnkyvszzqnZEzQ=="; - }; - }; "@expo/config-types-47.0.0" = { name = "_at_expo_slash_config-types"; packageName = "@expo/config-types"; @@ -4702,49 +4801,40 @@ let sha512 = "kqr71GAXzBVmjT+qSmqckBKY6Y9lFf4Oy1S4aVygx72CNgyzVTw4CPqT5RsNhcvQEEdACgarczDbPnNkmrm7GQ=="; }; }; - "@expo/dev-server-0.1.122" = { + "@expo/dev-server-0.1.124" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.122"; + version = "0.1.124"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.122.tgz"; - sha512 = "nUx1yFYVLVXVLW7+bOz2O4OWfwdp1WVGpcZpKRC38yPkXkAVCaWrK6p0muWZJJb7Nm0sXfDiMdsudxZFNIKFmQ=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.124.tgz"; + sha512 = "iHczVcf+rgWupCY/3b3ePIizNtzsy1O/w8jdKv3bKvoOfXiVIVOo4KGiVDpAJOahKiMOsRlbKeemB8OLNKzdSA=="; }; }; - "@expo/devcert-1.0.0" = { + "@expo/devcert-1.1.0" = { name = "_at_expo_slash_devcert"; packageName = "@expo/devcert"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/devcert/-/devcert-1.0.0.tgz"; - sha512 = "cahGyQCmpZmHpn2U04NR9KwsOIZy7Rhsw8Fg4q+A6563lIJxbkrgPnxq/O3NQAh3ohEvOXOOnoFx0b4yycCkpQ=="; + url = "https://registry.npmjs.org/@expo/devcert/-/devcert-1.1.0.tgz"; + sha512 = "ghUVhNJQOCTdQckSGTHctNp/0jzvVoMMkVh+6SHn+TZj8sU15U/npXIDt8NtQp0HedlPaCgkVdMu8Sacne0aEA=="; }; }; - "@expo/eas-build-job-0.2.96" = { + "@expo/eas-build-job-0.2.102" = { name = "_at_expo_slash_eas-build-job"; packageName = "@expo/eas-build-job"; - version = "0.2.96"; + version = "0.2.102"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-0.2.96.tgz"; - sha512 = "Y8jeEEwzU/GfYNSq+5Snbl5NFpXSgqtRCvPIpWUWka0XsPf4qhU9e6iWjOJboi5VbQIAQfZbXMjW/OZByjT/OA=="; + url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-0.2.102.tgz"; + sha512 = "1gav4gHhZCnRDIscd0/sat/fjts543QmexiWXUWDv15uzCxx/NnewN13tcmOwMV0K3Z3agOlJLRPN2t6UvIMAg=="; }; }; - "@expo/eas-json-2.6.0" = { + "@expo/eas-json-3.3.2" = { name = "_at_expo_slash_eas-json"; packageName = "@expo/eas-json"; - version = "2.6.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-2.6.0.tgz"; - sha512 = "DnamwAlsnWd8a7mPR5a6a6bYUSlKwAm2dw5/5Xl5G69OPjzkAZ1xdIqoJ018KubfoI92DgMKNX3l1ojOAEcvGw=="; - }; - }; - "@expo/image-utils-0.3.20" = { - name = "_at_expo_slash_image-utils"; - packageName = "@expo/image-utils"; - version = "0.3.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.20.tgz"; - sha512 = "NgF/80XENyCS+amwC0P6uk1fauEtUq7gijD19jvl2xknJaADq8M2dMCRHwWMVOXosr2v46f3Z++G/NjmyOVS7A=="; + url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-3.3.2.tgz"; + sha512 = "O85CbdCXUjzUOyXITpVT7qnnIqdRaaEiaY7gCeYYW4c9KUO0fNobiePKBAYTFzoSJMt5bJT9jkwKNk3dML8zkQ=="; }; }; "@expo/image-utils-0.3.21" = { @@ -4774,6 +4864,15 @@ let sha512 = "nhUVvW0TrRE4jtWzHQl8TR4ox7kcmrc2I0itaeJGjxF5A54uk7avgA0wRt7jP1rdvqQo1Ke1lXyLYREdhN9tPw=="; }; }; + "@expo/json-file-8.2.35" = { + name = "_at_expo_slash_json-file"; + packageName = "@expo/json-file"; + version = "8.2.35"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.35.tgz"; + sha512 = "cQFLGSNRRFbN9EIhVDpMCYuzXbrHUOmKEqitBR+nrU6surjKGsOsN9Ubyn/L/LAGlFvT293E4XY5zsOtJyiPZQ=="; + }; + }; "@expo/json-file-8.2.36" = { name = "_at_expo_slash_json-file"; packageName = "@expo/json-file"; @@ -4783,6 +4882,15 @@ let sha512 = "tOZfTiIFA5KmMpdW9KF7bc6CFiGjb0xnbieJhTGlHrLL+ps2G0OkqmuZ3pFEXBOMnJYUVpnSy++52LFxvpa5ZQ=="; }; }; + "@expo/json-file-8.2.37" = { + name = "_at_expo_slash_json-file"; + packageName = "@expo/json-file"; + version = "8.2.37"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.37.tgz"; + sha512 = "YaH6rVg11JoTS2P6LsW7ybS2CULjf40AbnAHw2F1eDPuheprNjARZMnyHFPkKv7GuxCy+B9GPcbOKgc4cgA80Q=="; + }; + }; "@expo/metro-config-0.3.18" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; @@ -4792,13 +4900,13 @@ let sha512 = "DWtwV67kD8X2uOKIs5QyHlHD+6L6RAgudZZDBmu433ZvL62HAUYfjEi3+i0jeMiUqN85o1vbXg6xqWnBCpS50g=="; }; }; - "@expo/metro-config-0.5.1" = { + "@expo/metro-config-0.5.2" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.5.1.tgz"; - sha512 = "Rvy4ZFgKNDfXO401z2OQF8fWbPj1lLVDL4GF1aqCIhCDHCKrezbwB0xejpcUyndJRCxBL2BMAM+P24t6cKv9Fw=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.5.2.tgz"; + sha512 = "W1qsZPA5BXuRBkNLydKBYQ1+ubObhOK0gk2Fpc+XnhW+UUIHC9sDR5pZRYGNSnDDc3rG8y7c32UzSW9nlK+mog=="; }; }; "@expo/multipart-body-parser-1.1.0" = { @@ -4828,6 +4936,15 @@ let sha512 = "PGk34uz4XDyhoNIlPh2D+BDsiXYuW2jXavTiax8d32uvHlRO6FN0cAsqlWD6fx3H2hRn8cU/leTuc4M7pYovCQ=="; }; }; + "@expo/package-manager-0.0.57" = { + name = "_at_expo_slash_package-manager"; + packageName = "@expo/package-manager"; + version = "0.0.57"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.57.tgz"; + sha512 = "Y4RpSL9EqaPF+Vd2GrK6r7Xx7Dv0Xdq3AGAD9C0KwV21WqP/scj/dpjxFY+ABwmdhNsFzYXb8fmDyh4tiKenPQ=="; + }; + }; "@expo/pkcs12-0.0.8" = { name = "_at_expo_slash_pkcs12"; packageName = "@expo/pkcs12"; @@ -4846,31 +4963,31 @@ let sha512 = "+48gRqUiz65R21CZ/IXa7RNBXgAI/uPSdvJqoN9x1hfL44DNbUoWHgHiEXTx7XelcATpDwNTz6sHLfy0iNqf+w=="; }; }; - "@expo/plist-0.0.19" = { + "@expo/plist-0.0.20" = { name = "_at_expo_slash_plist"; packageName = "@expo/plist"; - version = "0.0.19"; + version = "0.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/plist/-/plist-0.0.19.tgz"; - sha512 = "9+GdsnLOZ475bITOSwU6MxIXukYHS3yTVCK2+cSDMyb9h2NuBwpnHFJGFUqcg9HcA6fbmyhGnNpPD3vk7zqWFQ=="; + url = "https://registry.npmjs.org/@expo/plist/-/plist-0.0.20.tgz"; + sha512 = "UXQ4LXCfTZ580LDHGJ5q62jSTwJFFJ1GqBu8duQMThiHKWbMJ+gajJh6rsB6EJ3aLUr9wcauxneL5LVRFxwBEA=="; }; }; - "@expo/plugin-help-5.1.16" = { + "@expo/plugin-help-5.1.22" = { name = "_at_expo_slash_plugin-help"; packageName = "@expo/plugin-help"; - version = "5.1.16"; + version = "5.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/plugin-help/-/plugin-help-5.1.16.tgz"; - sha512 = "4yuVUoLgUz5tbPRu7dxKE5nP+1UHYXb4t9QmeoNg/8kIrdBH6OquW0wxre45T3zUrMq5+YYuTAvoPYuAhF1XWA=="; + url = "https://registry.npmjs.org/@expo/plugin-help/-/plugin-help-5.1.22.tgz"; + sha512 = "FhLc5Ukcxb6vZvWgge/aW0pEUb1bGkN1GQBEan8NlJfVYj/uhvgmcPu1fvihwARdcLCOeoQgUVbUX5Tu/SBABg=="; }; }; - "@expo/plugin-warn-if-update-available-2.4.0" = { + "@expo/plugin-warn-if-update-available-2.5.0" = { name = "_at_expo_slash_plugin-warn-if-update-available"; packageName = "@expo/plugin-warn-if-update-available"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/plugin-warn-if-update-available/-/plugin-warn-if-update-available-2.4.0.tgz"; - sha512 = "+tRZJUNeybjy2xnncGk4puZBWbiRIEG1n+RVYPD/SQXpz1YCnZlcXByTT13GB3WABmy0xF87kFeBxoCoYQuIsQ=="; + url = "https://registry.npmjs.org/@expo/plugin-warn-if-update-available/-/plugin-warn-if-update-available-2.5.0.tgz"; + sha512 = "DNq+7mkAQFjOGGNDVwcWvr1/6FPvBrDAkhR92ul3cNaLmZ36WxnnQ/HEUUUEj0gMjwiPEER4mBqC4auMsbBp9g=="; }; }; "@expo/prebuild-config-4.0.3" = { @@ -4882,22 +4999,13 @@ let sha512 = "ZRMn0a9Wo/coKXLMvizUytqtG5pniUHaBMSS28yFTcGVvyDJh2nFVkBf9po52mSkbm9rGp/Pev6GAf57m6S2BA=="; }; }; - "@expo/prebuild-config-5.0.3" = { + "@expo/prebuild-config-5.0.7" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; - version = "5.0.3"; + version = "5.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-5.0.3.tgz"; - sha512 = "G4j1H3WFjRaiQ+FgFNULrnIm7RsQyjc4xp6lLTP2ydBv79wO3x8wAdeZvaZh7eOkfu9BESpQzACT1uuJTag5jg=="; - }; - }; - "@expo/prebuild-config-5.0.6" = { - name = "_at_expo_slash_prebuild-config"; - packageName = "@expo/prebuild-config"; - version = "5.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-5.0.6.tgz"; - sha512 = "umHVsle+inPFPt+GMWRjZhkHwNbbaXpiEKbRnWKweInaXEZa9R9qt8gLyzniaREnw+/cEAIgL1znrKmNk4lUfQ=="; + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-5.0.7.tgz"; + sha512 = "D+TBpJUHe4+oTGFPb4o0rrw/h1xxc6wF+abJnbDHUkhnaeiHkE2O3ByS7FdiZ2FT36t0OKqeSKG/xFwWT3m1Ew=="; }; }; "@expo/results-1.0.0" = { @@ -4972,13 +5080,13 @@ let sha512 = "TI+l71+5aSKnShYclFa14Kum+hQMZ86b95SH6tQUG3qZEmLTarvWpKwqtTwQKqvlJSJrpFiSFu3eCuZokY6zWA=="; }; }; - "@expo/webpack-config-0.17.3" = { + "@expo/webpack-config-18.0.1" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.17.3"; + version = "18.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.17.3.tgz"; - sha512 = "EcnHHmMscC7mL7qGQpXoSSpOrXbyfnMErUfqaBVjMYz7I4xVvoPQqiM13v4JXnz9TnZHDxD9t7+VSa9hPJVssA=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-18.0.1.tgz"; + sha512 = "0C+wjmmQ0usySdhtzeRp0yYuf9zkUZ/kNgA6AHQ9N7eG4JIr0DM1c87g119smxcJTbd8N+//mv5znPxSJqBqmg=="; }; }; "@expo/xcpretty-4.2.2" = { @@ -5098,157 +5206,148 @@ let sha512 = "P4ZMRFxVMnfMsOyTfBM/+nkTodLeOUfXNPo+X1bKEWBiZxRErqX/IHS5sLA0yAH8XmtKZcL7Cu6M26ztGcQYxw=="; }; }; - "@flatten-js/interval-tree-1.0.19" = { - name = "_at_flatten-js_slash_interval-tree"; - packageName = "@flatten-js/interval-tree"; - version = "1.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@flatten-js/interval-tree/-/interval-tree-1.0.19.tgz"; - sha512 = "E+uCpmzAP6EL1L0VDligIg2oUnwbzhSMRXts8Ct7OQ+i+dFEgefExcKnTwGFa+MUZGYAIKHBoUWo/f/lhqc1Ew=="; - }; - }; - "@fluentui/date-time-utilities-8.5.2" = { + "@fluentui/date-time-utilities-8.5.4" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "8.5.2"; + version = "8.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.5.2.tgz"; - sha512 = "u540ACUdnC+Jms1DIHkho80eJmoCg/LtAzR4a/1Tum6PicxWv59UYp9Ba7qFbIw+mrjWnwX/2ZmBpqTy9Rgn7w=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.5.4.tgz"; + sha512 = "PHLrbKs/s80xVkvFLQkaYb78a9nRUlohj8FCDBFQ8F1qPJj3iVH1RuSLyTiCIRJy/v1hW6KMEIXqLu/EoMefXw=="; }; }; - "@fluentui/dom-utilities-2.2.2" = { + "@fluentui/dom-utilities-2.2.4" = { name = "_at_fluentui_slash_dom-utilities"; packageName = "@fluentui/dom-utilities"; - version = "2.2.2"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.2.2.tgz"; - sha512 = "puklLc6Jvg279OGagqkSfuHML6ckBhw3gJakdvIZHKeJiduh+34U4Finl3K24yBSXzG2WsN+LwLTd1Vcociy+g=="; + url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.2.4.tgz"; + sha512 = "X4fN5zbvAETw9LE8bw9x5otKcpS3A3cB9wn/BookbTD4hkBESx06SzmX/WdabFq7qqbDqbURiQMpmdGUUlLsqw=="; }; }; - "@fluentui/font-icons-mdl2-8.5.2" = { + "@fluentui/font-icons-mdl2-8.5.7" = { name = "_at_fluentui_slash_font-icons-mdl2"; packageName = "@fluentui/font-icons-mdl2"; - version = "8.5.2"; + version = "8.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.5.2.tgz"; - sha512 = "qDbZNiXVPx6X/Z2MpU3Oa2kWNSrk5+mG8ZRdH/thD7iwnV4l6DtBctNyXK/Cjq4EpG3eQQra8LBVxwOyDt0GqA=="; + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.5.7.tgz"; + sha512 = "IAZ4nLWW6JDzGsCAymLS7ncaxWpQDY48K8650IfIlcsdhxv027joQEgd+HiIIImgusMl+OS9nAQE04a68mE6Zw=="; }; }; - "@fluentui/foundation-legacy-8.2.22" = { + "@fluentui/foundation-legacy-8.2.27" = { name = "_at_fluentui_slash_foundation-legacy"; packageName = "@fluentui/foundation-legacy"; - version = "8.2.22"; + version = "8.2.27"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.22.tgz"; - sha512 = "wyv5KxmgG/Qivd0eUkQ4mpAdy3caPV9WrPd10MMw/0TGyCCrzq7+REZYVilRy1+VWQspQxWxRH7Kex9+LqPlKA=="; + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.27.tgz"; + sha512 = "KIK7N6thJ9EzwQBLysavdsJHt6mnsA1O2ZHLI9d4yDQlx17EVa0aXrdsSNgqfa1czya3OmBDVQMFR2gqy38voQ=="; }; }; - "@fluentui/keyboard-key-0.4.2" = { + "@fluentui/keyboard-key-0.4.4" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; - version = "0.4.2"; + version = "0.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.4.2.tgz"; - sha512 = "6WdMrnFpY94uWefUGGRqO4WiS6R+Kso6/FR95SxXMuS6kfnjGJCHzywFGZcN5OU1fX067Zna4aPQ/nDwYMgBPw=="; + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.4.4.tgz"; + sha512 = "nx0bQ9B5QtUym9a21ig5eHPt2T6EWaqrleFb37d6ImikP6xVXUHrWQJFuVS1CSg0n63KOPsmh1QvAUfxfmyLhw=="; }; }; - "@fluentui/merge-styles-8.5.3" = { + "@fluentui/merge-styles-8.5.5" = { name = "_at_fluentui_slash_merge-styles"; packageName = "@fluentui/merge-styles"; - version = "8.5.3"; + version = "8.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.5.3.tgz"; - sha512 = "bHWftN3zTp1bbBfmAEH8YK9UURWj2mffw7b7VaW2Og1qxwv3GMSza1cyv/d3EVqpMJ8AVwFv3mbi9p1ieMN9mw=="; + url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.5.5.tgz"; + sha512 = "+cyN28iRAn8BWlZkMSEWzXpsJJiy3wWFxdJx5UnvU3iLK1slwog94inJak/BmnQKk3dFXK9vVPtDp2s3l+2/hg=="; }; }; - "@fluentui/react-8.100.0" = { + "@fluentui/react-8.104.8" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "8.100.0"; + version = "8.104.8"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-8.100.0.tgz"; - sha512 = "zdMTJgZEg0NCDLcchlFOnDP1krm7Qel7uUSjfYm5MGS/rK08o9dgpwzjAwjEukGkIZ/Q3C4DZQablVdV/CpW+A=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.104.8.tgz"; + sha512 = "FVpyhZwPfpkHcP9d7Q5lQ7PPeSD2tLPaWGCGNhPHBsD0BS/A5Sv1+XN2LN1E+wbJUIvKrdVfxoWmUqDaNlpZjg=="; }; }; - "@fluentui/react-focus-8.8.8" = { + "@fluentui/react-focus-8.8.13" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.8.8"; + version = "8.8.13"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.8.8.tgz"; - sha512 = "N4JmmduWk50tIGTH6kYTDa1HJfJ9qzGztbmo7HEh+gzHLwHDkL0GOV5+VWfwPuBcUqD1eKP4fz/e/gCBswBShg=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.8.13.tgz"; + sha512 = "Y9RlqjJdWB7of/GJt/M8Ezf5tP2JSFjfEqe7W6Ttjr7wxiZZr4X8hJISWOksPSzvWyc0CT5J9uPEX0IWBHFsFQ=="; }; }; - "@fluentui/react-hooks-8.6.12" = { + "@fluentui/react-hooks-8.6.15" = { name = "_at_fluentui_slash_react-hooks"; packageName = "@fluentui/react-hooks"; - version = "8.6.12"; + version = "8.6.15"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.6.12.tgz"; - sha512 = "zjxOgBMNgg0RRmlB/lfGvApvVxwLfVqwQF5BtKe9DHWGXV7B1Pz9IrYOZ+vI6Mup3eqBAcnU01AURU8PG5RT/g=="; + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.6.15.tgz"; + sha512 = "oh1OdXAUwPyhMRum8TU2/C8V4hb69qGFTh/XYzyfiAwa0UzODszq/LoaDyVThEJEi5OBPdeuXturAvgqCT8kNw=="; }; }; - "@fluentui/react-portal-compat-context-9.0.3" = { + "@fluentui/react-portal-compat-context-9.0.4" = { name = "_at_fluentui_slash_react-portal-compat-context"; packageName = "@fluentui/react-portal-compat-context"; - version = "9.0.3"; + version = "9.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-portal-compat-context/-/react-portal-compat-context-9.0.3.tgz"; - sha512 = "XZczqvKJflK6jFv6RekFXzZFnxvd1tBbIsRFs6JMX8zNqMO7ZQJ6Yfee5LLs6HnZE5BKowE7jIUMOTH9yOmyJg=="; + url = "https://registry.npmjs.org/@fluentui/react-portal-compat-context/-/react-portal-compat-context-9.0.4.tgz"; + sha512 = "qw2lmkxZ2TmgC0pB2dvFyrzVffxBdpCx1BdWRaF+MRGUlTxRtqfybSx3Edsqa6NMewc3J0ThLMFdVFBQ5Yafqw=="; }; }; - "@fluentui/react-window-provider-2.2.3" = { + "@fluentui/react-window-provider-2.2.5" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; - version = "2.2.3"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.2.3.tgz"; - sha512 = "uJztbyMu7x/cSYnJ0Rbmult/t22zFnQG20Jtlhmh5/g+M8QiF/T7xz9dkNe4Hon4KmpqnZpd8ds4nmX0fwxODg=="; + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.2.5.tgz"; + sha512 = "uct8xpHLFoECeoM8xRsw98yrxLV1MY2rA/Ml0M65JSWREdDUk+btgu7HLZp4QV/GpfPvP1WiNFLSLhrZFSnIAg=="; }; }; - "@fluentui/set-version-8.2.2" = { + "@fluentui/set-version-8.2.4" = { name = "_at_fluentui_slash_set-version"; packageName = "@fluentui/set-version"; - version = "8.2.2"; + version = "8.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.2.2.tgz"; - sha512 = "Vg20KZ0ufgWjxx6GFbqC5wiVxXZDUWgNT0r0By/Eyj4bUSb1jG6lmf5z1oY1dUX0YS6Cp5e6GnvbNdXg5E7orA=="; + url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.2.4.tgz"; + sha512 = "v12VUrpThYcJESFrnu3LdL7/s957hoSCJ3t8C014Hp2IOmk3dnZRZJymf1k/RAOXztS4w9dF2Zhs8uP31qwcZw=="; }; }; - "@fluentui/style-utilities-8.8.1" = { + "@fluentui/style-utilities-8.9.0" = { name = "_at_fluentui_slash_style-utilities"; packageName = "@fluentui/style-utilities"; - version = "8.8.1"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.8.1.tgz"; - sha512 = "asOdSI9+9qgnvpriRuAluREM94iyJJOONA+yZvJiYkVttgFRt77xWrabFjuEbX4pPCmqHhmA0d7dz8zPKgV7cA=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.9.0.tgz"; + sha512 = "n64tj38ndvT9WSwzt3tQl5MuOaRQmRBzfv7GM2dCjJ6CblWHpSV8jRXX44RnkOFr/QRCrq+gv8sEveXKsyRtag=="; }; }; - "@fluentui/theme-2.6.17" = { + "@fluentui/theme-2.6.21" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "2.6.17"; + version = "2.6.21"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.17.tgz"; - sha512 = "9pxMhOugX3bwY86TresiR6UQNszylD4oiVCAj5s5li7zGos+psdOMrmz9LykIEn1mbAofT/XvRCYfiKECtHEpA=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.21.tgz"; + sha512 = "jqPOo375pt1bQ4WuzP2GP5gfgeBK/PDHUf4+DxDTZ9y0TXp8KxV4jCp5Rq2rnVYlXi51JQ2Y+snFtMDcMTyfRQ=="; }; }; - "@fluentui/utilities-8.13.2" = { + "@fluentui/utilities-8.13.5" = { name = "_at_fluentui_slash_utilities"; packageName = "@fluentui/utilities"; - version = "8.13.2"; + version = "8.13.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.13.2.tgz"; - sha512 = "0AHJBMyYVI7vFChXdPynFf32IYB2y6z4EB5ACzW8UkPFrwkHncbj5pPPE24MCbV7jYR49YrHn9eLY38B+H4iiw=="; + url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.13.5.tgz"; + sha512 = "YusKxwTEQmsJidEWxn8blf5ehBmBDMZDrOjQkSX4piCvi/57MfigQZ57L3Bdic8kDKsabVtS1IVMHLZzGy4zcQ=="; }; }; - "@forge/api-2.8.0" = { + "@forge/api-2.10.0" = { name = "_at_forge_slash_api"; packageName = "@forge/api"; - version = "2.8.0"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/api/-/api-2.8.0.tgz"; - sha512 = "C4ZQWKwn/Hy863gJ2Zjg7TjK0ZPggjin96/fXsTKp5xl3LXvZ5NUkyQ5mfbV7ufGUuC21/9/AS9+co+IIZOBHA=="; + url = "https://registry.npmjs.org/@forge/api/-/api-2.10.0.tgz"; + sha512 = "o8xmjOUIJcQfGAiaKdpowO2FNdm74icD+KT0SdnMXCQ7wToLUcJE4K4vSFoebBov+HGRAQphnmlC/KbgkgWXFQ=="; }; }; "@forge/auth-0.0.1" = { @@ -5269,22 +5368,22 @@ let sha512 = "+GFtFqBhFzwKaKmeEfw1jWQgZJNX4q11CCx1fSPFJB49Fdjb7k3lx74jAyzHlX0UWnm6DMK+/cYT7j5t6G9LfA=="; }; }; - "@forge/bundler-4.0.0" = { + "@forge/bundler-4.3.0" = { name = "_at_forge_slash_bundler"; packageName = "@forge/bundler"; - version = "4.0.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/bundler/-/bundler-4.0.0.tgz"; - sha512 = "2hqHE5jR030bjAG5XHfmeGxVTM76qAI3eu0XWKxEBj4rGiIg1p4VOptq3d3OUvU+yq9pKX0sd6tQRayUWLfc2Q=="; + url = "https://registry.npmjs.org/@forge/bundler/-/bundler-4.3.0.tgz"; + sha512 = "S1XXXYpaiKXRdNV0Eqv4e6uyc1m+lwvnwRUZKoUsP5tpdBTUPNTT3W0jckKYtpCkHueuwh5BM/J4B9LGp7PpWQ=="; }; }; - "@forge/cli-shared-3.2.2" = { + "@forge/cli-shared-3.5.1" = { name = "_at_forge_slash_cli-shared"; packageName = "@forge/cli-shared"; - version = "3.2.2"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.2.2.tgz"; - sha512 = "ij6N9//qE8vV39UbXS1UIliEDgt0AeDTBkBGhUscKwA3xktDEXLl/Rel5BOnBPVLHLR6ztCIe3TROLQKaLdzEA=="; + url = "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.5.1.tgz"; + sha512 = "a88bF0v8+H/JKRpPVamfdoi0Bd59vWbAy0LISrmfcE18chCQKHEeZ4ZzOI5KDII4QxXIGc7hWzxJ0aGhQyNKIQ=="; }; }; "@forge/egress-1.1.1" = { @@ -5296,31 +5395,31 @@ let sha512 = "ycnIIOKyurzchlocjjvTwqtQNsCF98XRT+YvwVwZWwKZ0OmSzPcXPZImrIFw3dF1qySwRwRL31R0xZ1HYUEs8w=="; }; }; - "@forge/lint-3.2.8" = { + "@forge/lint-3.2.13" = { name = "_at_forge_slash_lint"; packageName = "@forge/lint"; - version = "3.2.8"; + version = "3.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/lint/-/lint-3.2.8.tgz"; - sha512 = "CYY6lSOUdTW9Sfp0AclyiGoKP9s5XfiL9yT7nv2UKkA1VxUQSJzGW1oW9MJcH3uFJ9oZWulYBcF7Fft/MAebcQ=="; + url = "https://registry.npmjs.org/@forge/lint/-/lint-3.2.13.tgz"; + sha512 = "kP0s77zmdyT3qWGL0auScWCU0WTaOCS6tTErpbp94IUO3yruiyLMoTLrtKdbefuFbkTLPv7vFkeXkcK7et2/tw=="; }; }; - "@forge/manifest-4.4.1" = { + "@forge/manifest-4.6.0" = { name = "_at_forge_slash_manifest"; packageName = "@forge/manifest"; - version = "4.4.1"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/manifest/-/manifest-4.4.1.tgz"; - sha512 = "F7uLzYs+aMTHBGHJKoHaIPTeeGIpmOrnpoOKTLLLuzBNO16cXtEOo5veyNUelmQ3z1GuH1tKYOQdKc047o6M9Q=="; + url = "https://registry.npmjs.org/@forge/manifest/-/manifest-4.6.0.tgz"; + sha512 = "wmARdfQAZlqfmPXjgL8pbEzcXi/oYoyy7Eh5mH4k4NEa5rii/rwg9gz7S7Q1sFhUEdDOBjYgkonmUUc2X48DcQ=="; }; }; - "@forge/storage-1.3.0" = { + "@forge/storage-1.3.1" = { name = "_at_forge_slash_storage"; packageName = "@forge/storage"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/storage/-/storage-1.3.0.tgz"; - sha512 = "Tje/X+KY8i/u624YoxiOY+zP5sQc6rqo+vXA//nmIFGx0yWlPhUNf6ft7fFJrFe2JGpqgtNgfo3AjspveyMkzg=="; + url = "https://registry.npmjs.org/@forge/storage/-/storage-1.3.1.tgz"; + sha512 = "BU1qU0R08FH68MynaF409sp6mt3Ps8+XxyMk4Lsh9PYwYxMOpz5ynczv/DY0331G2n0LMBS1nVsJ9q88PFxI/Q=="; }; }; "@forge/util-1.2.0" = { @@ -5341,31 +5440,40 @@ let sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; }; }; - "@gitbeaker/core-35.7.0" = { + "@gitbeaker/core-35.8.0" = { name = "_at_gitbeaker_slash_core"; packageName = "@gitbeaker/core"; - version = "35.7.0"; + version = "35.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/core/-/core-35.7.0.tgz"; - sha512 = "1N9QcHElYa1NuLhX9mJJ6tnL7wbCsK8Naj2kLXwNC4qyEcDhMiJDnI3YoqNIXSzPTufoNUAbgIsc/h/JmO17/A=="; + url = "https://registry.npmjs.org/@gitbeaker/core/-/core-35.8.0.tgz"; + sha512 = "l/LgTmPFeUBnqyxU/VbFmqKsanCITBBMp7A0yXVbiTQCvNWSV6JJyUL3ILR3q825RRU/AzRm40FFli0AgBpXTw=="; }; }; - "@gitbeaker/node-35.7.0" = { + "@gitbeaker/node-35.8.0" = { name = "_at_gitbeaker_slash_node"; packageName = "@gitbeaker/node"; - version = "35.7.0"; + version = "35.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/node/-/node-35.7.0.tgz"; - sha512 = "zh215EUloAxj2gwTHevBVypEiiwQR0WsFLGPWJwY+yUFJVQRcya+3mcsDbxgCLAk00wwhrTVYyNppvmoYbEZNg=="; + url = "https://registry.npmjs.org/@gitbeaker/node/-/node-35.8.0.tgz"; + sha512 = "n8xbGemNs3aZb7gaYsEya0FKxemjyAJ4UyaF2MWM6mrj5rCnL3Y9Siko2rT/AuSJwjx82Z7BdKxV9QH/ihqjOQ=="; }; }; - "@gitbeaker/requester-utils-35.7.0" = { + "@gitbeaker/requester-utils-35.8.0" = { name = "_at_gitbeaker_slash_requester-utils"; packageName = "@gitbeaker/requester-utils"; - version = "35.7.0"; + version = "35.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-35.7.0.tgz"; - sha512 = "SDYKhL+XUrslpVwUumkCf4I4Ubf+lvzdghCYPwBt/og5kZIorFVbHCxRmtr5bO+iC9nrVNfg24sdoe51vDGn1w=="; + url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-35.8.0.tgz"; + sha512 = "d/cseQQUvj1V02jXo6HBpuMarf6e6GdrxEaiWrjAiS2nDEQFRGxDGtPHzqgU84aN11nEBFnFa0vaSMqcZG/+9w=="; + }; + }; + "@glideapps/ts-necessities-2.1.2" = { + name = "_at_glideapps_slash_ts-necessities"; + packageName = "@glideapps/ts-necessities"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@glideapps/ts-necessities/-/ts-necessities-2.1.2.tgz"; + sha512 = "tLjfhinr6doUBcWi7BWnkT2zT6G5UhiZftsiIH6xVvykeXE+FU7Wr0MyqwmqideWlDD5rG+VjVLptLviGo04CA=="; }; }; "@google-cloud/paginator-4.0.1" = { @@ -5404,13 +5512,13 @@ let sha512 = "j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="; }; }; - "@google-cloud/pubsub-3.2.1" = { + "@google-cloud/pubsub-3.3.0" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-3.2.1.tgz"; - sha512 = "TcGPqNkCYNwM3LTWBYjdryv1WQX2a4H52gaL9IAMZCp1i28r90syWjZoFhcUObowb3v3StTCL6a9YlPef4LY3g=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-3.3.0.tgz"; + sha512 = "pypP7JYqKnVOO7wES71TkyxQD7UluWMc/7zH5wFZ6ycLRfonLvO1XBBS3Hcg4ltMEjBlYxRC6ODbzYLfuZm9/g=="; }; }; "@grammarly/sdk-1.11.0" = { @@ -5422,13 +5530,13 @@ let sha512 = "/LDNozZ+6qTS0yqMXo/ki6yJqTVx2s6ncOM/m/t4PjqeXrN8ejTwoiNDoDVZq18bsHjZBPP4o03M2goFYWJCHA=="; }; }; - "@grammyjs/types-2.10.0" = { + "@grammyjs/types-2.11.2" = { name = "_at_grammyjs_slash_types"; packageName = "@grammyjs/types"; - version = "2.10.0"; + version = "2.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/@grammyjs/types/-/types-2.10.0.tgz"; - sha512 = "3w5z6UUgbFldLa1N5GP09BTiFZLDNaq2xFxPVtKeaIuKg2WY7mDDgraDE2CfSxl79RnNWMp4WNKX21E9Z6mtMg=="; + url = "https://registry.npmjs.org/@grammyjs/types/-/types-2.11.2.tgz"; + sha512 = "qglunvUIL8mz/TS0vqdcg2uABwM34UkSkUQcZVWjxWH34c9ptsMvY3zO0n9P0eLBaRLV4BwnD8MBx35BN2FFNw=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -5458,13 +5566,13 @@ let sha512 = "IuR2SB2MnC2ztA/XeTMTfWcA0Wy7ZH5u+nDkDNLAdX+AaSyDnsQS35sCmHqG0VOGTl7rzoyBWLCKGwSJplgtwg=="; }; }; - "@graphql-tools/batch-execute-8.5.10" = { + "@graphql-tools/batch-execute-8.5.15" = { name = "_at_graphql-tools_slash_batch-execute"; packageName = "@graphql-tools/batch-execute"; - version = "8.5.10"; + version = "8.5.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.5.10.tgz"; - sha512 = "f3b/UPvscQ4NaSmSQIeZPNFhpZ9xb3AftKKSn9NzsUp3vxz0d8tymBVn28f51oqiqN9BMDpCH9P8TZrKpH1//Q=="; + url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.5.15.tgz"; + sha512 = "qb12M8XCK6SBJmZDS8Lzd4PVJFsIwNUkYmFuqcTiBqOI/WsoDlQDZI++ghRpGcusLkL9uzcIOTT/61OeHhsaLg=="; }; }; "@graphql-tools/delegate-7.1.5" = { @@ -5476,22 +5584,49 @@ let sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g=="; }; }; - "@graphql-tools/delegate-9.0.14" = { + "@graphql-tools/delegate-9.0.23" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "9.0.14"; + version = "9.0.23"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-9.0.14.tgz"; - sha512 = "yKwNQl10fOdKxSk5yBoKnSjq1oumf4QYVinV9niD9KVow6j0dONtaiAYvhzaQwN/Xwwi7oADFACmKRtphlhFTw=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-9.0.23.tgz"; + sha512 = "pTmC2ZUGRp/j4bwQRccZV+J2ETMeHYF9RmEXHHdj0S7/LOpyfFE3mGvRV2+n6MzXpPCPp+mh037LWF+q4wLcJw=="; }; }; - "@graphql-tools/executor-0.0.6" = { + "@graphql-tools/executor-0.0.12" = { name = "_at_graphql-tools_slash_executor"; packageName = "@graphql-tools/executor"; + version = "0.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/executor/-/executor-0.0.12.tgz"; + sha512 = "bWpZcYRo81jDoTVONTnxS9dDHhEkNVjxzvFCH4CRpuyzD3uL+5w3MhtxIh24QyWm4LvQ4f+Bz3eMV2xU2I5+FA=="; + }; + }; + "@graphql-tools/executor-graphql-ws-0.0.7" = { + name = "_at_graphql-tools_slash_executor-graphql-ws"; + packageName = "@graphql-tools/executor-graphql-ws"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-0.0.7.tgz"; + sha512 = "C6EExKoukn4vu3BbvlqsqtC91F4pTLPDZvRceYjpFzTCQSGFSjfrxQGP/haGlemXVRpIDxBy7wpXoQlsF8UmFA=="; + }; + }; + "@graphql-tools/executor-http-0.1.1" = { + name = "_at_graphql-tools_slash_executor-http"; + packageName = "@graphql-tools/executor-http"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-0.1.1.tgz"; + sha512 = "bFE6StI7CJEIYGRkAnTYxutSV4OtC1c4MQU3nStOYZZO7KmzIgEQZ4ygPSPrRb+jtRsMCBEqPqlYOD4Rq02aMw=="; + }; + }; + "@graphql-tools/executor-legacy-ws-0.0.6" = { + name = "_at_graphql-tools_slash_executor-legacy-ws"; + packageName = "@graphql-tools/executor-legacy-ws"; version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor/-/executor-0.0.6.tgz"; - sha512 = "2KIj1grRb1Lni97xgX1ryekcjU/WTMC1ZdPpnd0nYrBWs/C4Nv4UMNP7E/Tr8za8zlrsESvEUbpLHsBRiQsGxA=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-0.0.6.tgz"; + sha512 = "L1hRuSvBUCNerYDhfeSZXFeqliDlnNXa3fDHTp7efI3Newpbevqa19Fm0mVzsCL7gqIKOwzrPORwh7kOVE/vew=="; }; }; "@graphql-tools/graphql-file-loader-6.2.7" = { @@ -5503,22 +5638,22 @@ let sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/graphql-file-loader-7.5.9" = { + "@graphql-tools/graphql-file-loader-7.5.14" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "7.5.9"; + version = "7.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.5.9.tgz"; - sha512 = "hEvWFLOG8JGsguWWdHqaFvj0xqwQu4KhqAKEjmIBq4vipVKLcmcjvOM56S0fv/dtn5pcKp9ZOZAxgncYVJ1hzw=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.5.14.tgz"; + sha512 = "JGer4g57kq4wtsvqv8uZsT4ZG1lLsz1x5yHDfSj2OxyiWw2f1jFkzgby7Ut3H2sseJiQzeeDYZcbm06qgR32pg=="; }; }; - "@graphql-tools/import-6.7.10" = { + "@graphql-tools/import-6.7.15" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.7.10"; + version = "6.7.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.7.10.tgz"; - sha512 = "6L19Ep0pP5wWywq9/jwCt2FdCJnEnyrxkmRkSRdYoTEmOFz5xrsfhyUfWl8ibx34gWzVYhCDOX1bN43zsLCbDA=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.7.15.tgz"; + sha512 = "WNhvauAt2I2iUg+JdQK5oQebKLXqUZWe8naP13K1jOkbTQT7hK3P/4I9AaVmzt0KXRJW5Uow3RgdHZ7eUBKVsA=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -5530,13 +5665,13 @@ let sha512 = "CnfwBSY5926zyb6fkDBHnlTblHnHI4hoBALFYXnrg0Ev4yWU8B04DZl/pBRUc459VNgO2x8/mxGIZj2hPJG1EA=="; }; }; - "@graphql-tools/json-file-loader-7.4.10" = { + "@graphql-tools/json-file-loader-7.4.15" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "7.4.10"; + version = "7.4.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.4.10.tgz"; - sha512 = "/njUvIW/zdSr70eWDfDQNDXp2UQLe+YKFRLMZkpuISrw5cdvGaMepwpr0Yz6kFnHGwB6wSYLH25LkRAzpiKz+g=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.4.15.tgz"; + sha512 = "pH+hbsDetcEpj+Tmi7ZRUkxzJez2DLdSQuvK5Qi38FX/Nz/5nZKRfW9nqIptGYbuS9+2JPrt9WWNn1aGtegIFQ=="; }; }; "@graphql-tools/load-6.2.4" = { @@ -5548,13 +5683,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/load-7.8.4" = { + "@graphql-tools/load-7.8.10" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "7.8.4"; + version = "7.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.8.4.tgz"; - sha512 = "swS3sJx/gVpSw1CfI18zSwLlTFbN6PVlkfaLZJ8VN3d/3C+ESff553LLleXGgzOY9X0H1x3VHZeAR2+HUCrbbw=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.8.10.tgz"; + sha512 = "Mc1p7ZSxrW5yGG3BLQnhiL8RPG0HdxFVoHV7fpx2adp4o1V7BzDjKRSbCnAxShA1wA4n8wbA+n7NTC0edi4eNA=="; }; }; "@graphql-tools/merge-6.2.17" = { @@ -5575,22 +5710,22 @@ let sha512 = "BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg=="; }; }; - "@graphql-tools/merge-8.3.10" = { + "@graphql-tools/merge-8.3.16" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.3.10"; + version = "8.3.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.10.tgz"; - sha512 = "/hSg69JwqEA+t01wQmMGKPuaJ9VJBSz6uAXhbNNrTBJu8bmXljw305NVXM49pCwDKFVUGtbTqYrBeLcfT3RoYw=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.16.tgz"; + sha512 = "In0kcOZcPIpYOKaqdrJ3thdLPE7TutFnL9tbrHUy2zCinR2O/blpRC48jPckcs0HHrUQ0pGT4HqvzMkZUeEBAw=="; }; }; - "@graphql-tools/mock-8.7.10" = { + "@graphql-tools/mock-8.7.16" = { name = "_at_graphql-tools_slash_mock"; packageName = "@graphql-tools/mock"; - version = "8.7.10"; + version = "8.7.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.7.10.tgz"; - sha512 = "PuRGfk6TQger7EfE08yO3+QCAcZ6nYo3kyoEmTPc27w4yiqKCwZIyD8vegzl/EQphEourjaOhO149te6qNEUeQ=="; + url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.7.16.tgz"; + sha512 = "g1BcIk6OKeqDwezbn6QOQ+UkbzfZDvcolomXOoGTaE+KNw5JV9EKKIt1COyWtKeNrwtIdPPBS/zcLAqOw1MUdQ=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -5611,13 +5746,13 @@ let sha512 = "0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg=="; }; }; - "@graphql-tools/schema-9.0.8" = { + "@graphql-tools/schema-9.0.14" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "9.0.8"; + version = "9.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-9.0.8.tgz"; - sha512 = "PnES7sNkhQ/FdPQhP7cup0OIzwzQh+nfjklilU7YJzE209ACIyEQtxoNCfvPW5eV6hc9bWsBQeI3Jm4mMtwxNA=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-9.0.14.tgz"; + sha512 = "U6k+HY3Git+dsOEhq+dtWQwYg2CAgue8qBvnBXoKu5eEeH284wymMUoNm0e4IycOgMCJANVhClGEBIkLRu3FQQ=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -5629,13 +5764,13 @@ let sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw=="; }; }; - "@graphql-tools/url-loader-7.16.11" = { + "@graphql-tools/url-loader-7.17.4" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "7.16.11"; + version = "7.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.16.11.tgz"; - sha512 = "krovI7b+1NNtHe7cOMUQCp3Ib/rt70ru5fXMe2v16Rran2mPedMn8eq2V7K2jKnBKteMX4cjuxHdrpBJ7wGh8A=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.17.4.tgz"; + sha512 = "nB2fhkn4LTYjU2qoTOBZYmWQRVYsCI0K2LScwD49QVMNAPWthg/lHao4hFUe70aTInT8oquvl8d0rIb7fRWOvA=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -5683,13 +5818,13 @@ let sha512 = "pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg=="; }; }; - "@graphql-tools/utils-9.0.1" = { + "@graphql-tools/utils-9.1.4" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "9.0.1"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-9.0.1.tgz"; - sha512 = "z6FimVa5E44bHKmqK0/uMp9hHvHo2Tkt9A5rlLb40ReD/8IFKehSXLzM4b2N1vcP7mSsbXIdDK9Aoc8jT/he1Q=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-9.1.4.tgz"; + sha512 = "hgIeLt95h9nQgQuzbbdhuZmh+8WV7RZ/6GbTj6t3IU4Zd2zs9yYJ2jgW/krO587GMOY8zCwrjNOMzD40u3l7Vg=="; }; }; "@graphql-tools/wrap-7.0.8" = { @@ -5701,13 +5836,13 @@ let sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg=="; }; }; - "@graphql-tools/wrap-9.2.10" = { + "@graphql-tools/wrap-9.3.2" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "9.2.10"; + version = "9.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-9.2.10.tgz"; - sha512 = "K21XFLxcZ6JJGRzmzylY/HvoQ6eJU0o6J8ZLR828M/HVGKQgbK7qhn+AZrZKqBjFeZfBQojx8SzWDJPUmv8oEw=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-9.3.2.tgz"; + sha512 = "jqBMJZyKFATxWA3alPhGRWh/ZluaPWrXFumXRaqAwK9QdCAxM24jG8Kmy3FrTfeyxNqDyzDlHZobtwwDKurm5g=="; }; }; "@graphql-typed-document-node/core-3.1.1" = { @@ -5719,42 +5854,6 @@ let sha512 = "NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg=="; }; }; - "@grpc/grpc-js-1.6.11" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.6.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.6.11.tgz"; - sha512 = "e/adiPjUxf5cKYiAlV4m+0jJS4k6g2w78X7WTZB3ISOBzcCwm+cwjB2dSRfBHbu46inGGzQMmWAmsgYLg8yT5g=="; - }; - }; - "@grpc/grpc-js-1.6.12" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.6.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.6.12.tgz"; - sha512 = "JmvQ03OTSpVd9JTlj/K3IWHSz4Gk/JMLUTtW7Zb0KvO1LcOYGATh5cNuRYzCAeDR3O8wq+q8FZe97eO9MBrkUw=="; - }; - }; - "@grpc/grpc-js-1.7.0" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.7.0.tgz"; - sha512 = "wvKxal+40Xx11DXO2q5PfY3UiE25iwTb8SOz6A9IJII/V7d19x2ex0he+GJfVW0JZCaBjCPSjUB0yU9Ecm4WCw=="; - }; - }; - "@grpc/grpc-js-1.7.2" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.7.2.tgz"; - sha512 = "MqqbVynbe3VUSnApFW/dpkDaa9T1ASqRnMWeSPGFO/Ro98R7XUDLacfeBa7RaSI1iFu9GYk5gBKARf0zipFe4w=="; - }; - }; "@grpc/grpc-js-1.7.3" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -5764,22 +5863,31 @@ let sha512 = "H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog=="; }; }; - "@grpc/proto-loader-0.7.2" = { - name = "_at_grpc_slash_proto-loader"; - packageName = "@grpc/proto-loader"; - version = "0.7.2"; + "@grpc/grpc-js-1.8.1" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.2.tgz"; - sha512 = "jCdyLIT/tdQ1zhrbTQnJNK5nbDf0GoBpy5jVNywBzzMDF+Vs6uEaHnfz46dMtDxkvwrF2hzk5Z67goliceH0sA=="; + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.1.tgz"; + sha512 = "mdqYADWl/9Kb75XLstt6pvBnS1DpxSDFRKrbadkY1ymUd29hq49nP6tLcL7a7qLydgqFCpjNwa2RsyrqB3MsXA=="; }; }; - "@grpc/proto-loader-0.7.3" = { + "@grpc/grpc-js-1.8.4" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.4.tgz"; + sha512 = "oaETBotls7FTBpySg5dhyUCyXSxSeCMmkBBXHXG1iw57MiNoB6D7VRhkrXYbwyHM3Q3Afjp4KlsBX0Zb+ELZXw=="; + }; + }; + "@grpc/proto-loader-0.7.4" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.3.tgz"; - sha512 = "5dAvoZwna2Py3Ef96Ux9jIkp3iZ62TUsV00p3wVBPNX5K178UbNi8Q7gQVqwXT1Yq9RejIGG9G2IPEo93T6RcA=="; + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.4.tgz"; + sha512 = "MnWjkGwqQ3W8fx94/c1CwqLsNmHHv2t0CFn+9++6+cDphC1lolpg9M2OU0iebIjK//pBNX9e94ho+gjx6vz39w=="; }; }; "@gulp-sourcemaps/identity-map-2.0.1" = { @@ -5872,13 +5980,13 @@ let sha512 = "foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg=="; }; }; - "@heroku-cli/color-1.1.14" = { + "@heroku-cli/color-1.1.16" = { name = "_at_heroku-cli_slash_color"; packageName = "@heroku-cli/color"; - version = "1.1.14"; + version = "1.1.16"; src = fetchurl { - url = "https://registry.npmjs.org/@heroku-cli/color/-/color-1.1.14.tgz"; - sha512 = "2JYy//YE2YINTe21hpdVMBNc7aYFkgDeY9JUz/BCjFZmYLn0UjGaCc4BpTcMGXNJwuqoUenw2WGOFGHsJqlIDw=="; + url = "https://registry.npmjs.org/@heroku-cli/color/-/color-1.1.16.tgz"; + sha512 = "97bYxNaDe/+GCUAKu0V2qudQmR3NFRnv3SrQd2FTtOAa9OWKwkvoBs2WzT7MkNwP4DIpYL6W/e3CSfShfhzEMw=="; }; }; "@homebridge/ciao-1.1.5" = { @@ -5890,13 +5998,13 @@ let sha512 = "ZI9tcbPfX2d8oP1PNeLzrZLXISAIDUtJQWk4JVVJKCxktC6tQ3JyWXT9t1FbB5xtl82M1jdCgyAbWbjhUtRWcA=="; }; }; - "@hpcc-js/wasm-1.16.1" = { + "@hpcc-js/wasm-1.16.6" = { name = "_at_hpcc-js_slash_wasm"; packageName = "@hpcc-js/wasm"; - version = "1.16.1"; + version = "1.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-1.16.1.tgz"; - sha512 = "izJM0Rgx60SEw11UcEfqmqCRovcogPOpHyilFLUxZhgLmvRhf+r8sYsw95vgTpp0E4tzseMM/x3WkthDeS/HeQ=="; + url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-1.16.6.tgz"; + sha512 = "heqfVIqFifmjEaUiHW6ZHLHZ4fQ8EFFhYlNJWFB/F/gHsjKEuBih0bNbSHkdh0opuKNwqfGvLqNXpoNbbec69g=="; }; }; "@httptoolkit/websocket-stream-6.0.1" = { @@ -5908,22 +6016,13 @@ let sha512 = "A0NOZI+Glp3Xgcz6Na7i7o09+/+xm2m0UCU8gdtM2nIv6/cjLmhMZMqehSpTlgbx9omtLmV8LVqOskPEyWnmZQ=="; }; }; - "@humanwhocodes/config-array-0.10.7" = { + "@humanwhocodes/config-array-0.11.8" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; - version = "0.10.7"; + version = "0.11.8"; src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz"; - sha512 = "MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w=="; - }; - }; - "@humanwhocodes/config-array-0.11.7" = { - name = "_at_humanwhocodes_slash_config-array"; - packageName = "@humanwhocodes/config-array"; - version = "0.11.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz"; - sha512 = "kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw=="; + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz"; + sha512 = "UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g=="; }; }; "@humanwhocodes/config-array-0.5.0" = { @@ -5998,15 +6097,6 @@ let sha512 = "TvRRRd//a3q+JhpSh5PaHJfnP4oLM/0eZikyDh2Z+eaJpIZP+vZwdlpPd10neTsPq1zfJX8weRjYLFHNpoMZVg=="; }; }; - "@hypnosphi/create-react-context-0.3.1" = { - name = "_at_hypnosphi_slash_create-react-context"; - packageName = "@hypnosphi/create-react-context"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@hypnosphi/create-react-context/-/create-react-context-0.3.1.tgz"; - sha512 = "V1klUed202XahrWJLLOT3EXNeCpFHCcJntdFGI15ntCwau+jfT386w7OFTMaCqOgXUH1fa0w/I1oZs+i/Rfr0A=="; - }; - }; "@iarna/toml-2.2.5" = { name = "_at_iarna_slash_toml"; packageName = "@iarna/toml"; @@ -6214,6 +6304,285 @@ let sha512 = "Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw=="; }; }; + "@jimp/bmp-0.16.2" = { + name = "_at_jimp_slash_bmp"; + packageName = "@jimp/bmp"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.16.2.tgz"; + sha512 = "4g9vW45QfMoGhLVvaFj26h4e7cC+McHUQwyFQmNTLW4FfC1OonN9oUr2m/FEDGkTYKR7aqdXR5XUqqIkHWLaFw=="; + }; + }; + "@jimp/core-0.16.2" = { + name = "_at_jimp_slash_core"; + packageName = "@jimp/core"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/core/-/core-0.16.2.tgz"; + sha512 = "dp7HcyUMzjXphXYodI6PaXue+I9PXAavbb+AN+1XqFbotN22Z12DosNPEyy+UhLY/hZiQQqUkEaJHkvV31rs+w=="; + }; + }; + "@jimp/custom-0.16.2" = { + name = "_at_jimp_slash_custom"; + packageName = "@jimp/custom"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/custom/-/custom-0.16.2.tgz"; + sha512 = "GtNwOs4hcVS2GIbqRUf42rUuX07oLB92cj7cqxZb0ZGWwcwhnmSW0TFLAkNafXmqn9ug4VTpNvcJSUdiuECVKg=="; + }; + }; + "@jimp/gif-0.16.2" = { + name = "_at_jimp_slash_gif"; + packageName = "@jimp/gif"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/gif/-/gif-0.16.2.tgz"; + sha512 = "TMdyT9Q0paIKNtT7c5KzQD29CNCsI/t8ka28jMrBjEK7j5RRTvBfuoOnHv7pDJRCjCIqeUoaUSJ7QcciKic6CA=="; + }; + }; + "@jimp/jpeg-0.16.2" = { + name = "_at_jimp_slash_jpeg"; + packageName = "@jimp/jpeg"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.16.2.tgz"; + sha512 = "BW5gZydgq6wdIwHd+3iUNgrTklvoQc/FUKSj9meM6A0FU21lUaansRX5BDdJqHkyXJLnnlDGwDt27J+hQuBAVw=="; + }; + }; + "@jimp/plugin-blit-0.16.2" = { + name = "_at_jimp_slash_plugin-blit"; + packageName = "@jimp/plugin-blit"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.16.2.tgz"; + sha512 = "Z31rRfV80gC/r+B/bOPSVVpJEWXUV248j7MdnMOFLu4vr8DMqXVo9jYqvwU/s4LSTMAMXqm4Jg6E/jQfadPKAg=="; + }; + }; + "@jimp/plugin-blur-0.16.2" = { + name = "_at_jimp_slash_plugin-blur"; + packageName = "@jimp/plugin-blur"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.16.2.tgz"; + sha512 = "ShkJCAzRI+1fAKPuLLgEkixpSpVmKTYaKEFROUcgmrv9AansDXGNCupchqVMTdxf8zPyW8rR1ilvG3OJobufLQ=="; + }; + }; + "@jimp/plugin-circle-0.16.2" = { + name = "_at_jimp_slash_plugin-circle"; + packageName = "@jimp/plugin-circle"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.16.2.tgz"; + sha512 = "6T4z/48F4Z5+YwAVCLOvXQcyGmo0E3WztxCz6XGQf66r4JJK78+zcCDYZFLMx0BGM0091FogNK4QniP8JaOkrA=="; + }; + }; + "@jimp/plugin-color-0.16.2" = { + name = "_at_jimp_slash_plugin-color"; + packageName = "@jimp/plugin-color"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.16.2.tgz"; + sha512 = "6oBV0g0J17/7E+aTquvUsgSc85nUbUi+64tIK5eFIDzvjhlqhjGNJYlc46KJMCWIs61qRJayQoZdL/iT/iQuGQ=="; + }; + }; + "@jimp/plugin-contain-0.16.2" = { + name = "_at_jimp_slash_plugin-contain"; + packageName = "@jimp/plugin-contain"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.16.2.tgz"; + sha512 = "pLcxO3hVN3LCEhMNvpZ9B7xILHVlS433Vv16zFFJxLRqZdYvPLsc+ZzJhjAiHHuEjVblQrktHE3LGeQwGJPo0w=="; + }; + }; + "@jimp/plugin-cover-0.16.2" = { + name = "_at_jimp_slash_plugin-cover"; + packageName = "@jimp/plugin-cover"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.16.2.tgz"; + sha512 = "gzWM7VvYeI8msyiwbUZxH+sGQEgO6Vd6adGxZ0CeKX00uQOe5lDzxb1Wjx7sHcJGz8a/5fmAuwz7rdDtpDUbkw=="; + }; + }; + "@jimp/plugin-crop-0.16.2" = { + name = "_at_jimp_slash_plugin-crop"; + packageName = "@jimp/plugin-crop"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.16.2.tgz"; + sha512 = "qCd3hfMEE+Z2EuuyXewgXRTtKJGIerWzc1zLEJztsUkPz5i73IGgkOL+mrNutZwGaXZbm+8SwUaGb46sxAO6Tw=="; + }; + }; + "@jimp/plugin-displace-0.16.2" = { + name = "_at_jimp_slash_plugin-displace"; + packageName = "@jimp/plugin-displace"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.16.2.tgz"; + sha512 = "6nXdvNNjCdD95v2o3/jPeur903dz08lG4Y8gmr5oL2yVv9LSSbMonoXYrR/ASesdyXqGdXJLU4NL+yZs4zUqbQ=="; + }; + }; + "@jimp/plugin-dither-0.16.2" = { + name = "_at_jimp_slash_plugin-dither"; + packageName = "@jimp/plugin-dither"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.16.2.tgz"; + sha512 = "DERpIzy21ZanMkVsD0Tdy8HQLbD1E41OuvIzaMRoW4183PA6AgGNlrQoFTyXmzjy6FTy1SxaQgTEdouInAWZ9Q=="; + }; + }; + "@jimp/plugin-fisheye-0.16.2" = { + name = "_at_jimp_slash_plugin-fisheye"; + packageName = "@jimp/plugin-fisheye"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.16.2.tgz"; + sha512 = "Df7PsGIwiIpQu3EygYCnaJyTfOwvwtYV3cmYJS7yFLtdiFUuod+hlSo5GkwEPLAy+QBxhUbDuUqnsWo4NQtbiQ=="; + }; + }; + "@jimp/plugin-flip-0.16.2" = { + name = "_at_jimp_slash_plugin-flip"; + packageName = "@jimp/plugin-flip"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.16.2.tgz"; + sha512 = "+2uC8ioVQUr06mnjSWraskz2L33nJHze35LkQ8ZNsIpoZLkgvfiWatqAs5bj+1jGI/9kxoCFAaT1Is0f+a4/rw=="; + }; + }; + "@jimp/plugin-gaussian-0.16.2" = { + name = "_at_jimp_slash_plugin-gaussian"; + packageName = "@jimp/plugin-gaussian"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.16.2.tgz"; + sha512 = "2mnuDSg4ZEH8zcJig7DZZf4st/cYmQ5UYJKP76iGhZ+6JDACk6uejwAgT5xHecNhkVAaXMdCybA2eknH/9OE1w=="; + }; + }; + "@jimp/plugin-invert-0.16.2" = { + name = "_at_jimp_slash_plugin-invert"; + packageName = "@jimp/plugin-invert"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.16.2.tgz"; + sha512 = "xFvHbVepTY/nus+6yXiYN1iq+UBRkT0MdnObbiQPstUrAsz0Imn6MWISsnAyMvcNxHGrxaxjuU777JT/esM0gg=="; + }; + }; + "@jimp/plugin-mask-0.16.2" = { + name = "_at_jimp_slash_plugin-mask"; + packageName = "@jimp/plugin-mask"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.16.2.tgz"; + sha512 = "AbdO85xxhfgEDdxYKpUotEI9ixiCMaIpfYHD5a5O/VWeimz2kuwhcrzlHGiyq1kKAgRcl0WEneTCZAHVSyvPKA=="; + }; + }; + "@jimp/plugin-normalize-0.16.2" = { + name = "_at_jimp_slash_plugin-normalize"; + packageName = "@jimp/plugin-normalize"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.16.2.tgz"; + sha512 = "+ItBWFwmB0Od7OfOtTYT1gm543PpHUgU8/DN55z83l1JqS0OomDJAe7BmCppo2405TN6YtVm/csXo7p4iWd/SQ=="; + }; + }; + "@jimp/plugin-print-0.16.2" = { + name = "_at_jimp_slash_plugin-print"; + packageName = "@jimp/plugin-print"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.16.2.tgz"; + sha512 = "ifTGEeJ5UZTCiqC70HMeU3iXk/vsOmhWiwVGOXSFXhFeE8ZpDWvlmBsrMYnRrJGuaaogHOIrrQPI+kCdDBSBIQ=="; + }; + }; + "@jimp/plugin-resize-0.16.2" = { + name = "_at_jimp_slash_plugin-resize"; + packageName = "@jimp/plugin-resize"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.16.2.tgz"; + sha512 = "gE4N9l6xuwzacFZ2EPCGZCJ/xR+aX2V7GdMndIl/6kYIw5/eib1SFuF9AZLvIPSFuE1FnGo8+vT0pr++SSbhYg=="; + }; + }; + "@jimp/plugin-rotate-0.16.2" = { + name = "_at_jimp_slash_plugin-rotate"; + packageName = "@jimp/plugin-rotate"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.16.2.tgz"; + sha512 = "/CTEYkR1HrgmnE0VqPhhbBARbDAfFX590LWGIpxcYIYsUUGQCadl+8Qo4UX13FH0Nt8UHEtPA+O2x08uPYg9UA=="; + }; + }; + "@jimp/plugin-scale-0.16.2" = { + name = "_at_jimp_slash_plugin-scale"; + packageName = "@jimp/plugin-scale"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.16.2.tgz"; + sha512 = "3inuxfrlquyLaqFdiiiQNJUurR0WbvN5wAf1qcYX2LubG1AG8grayYD6H7XVoxfUGTZXh1kpmeirEYlqA2zxcw=="; + }; + }; + "@jimp/plugin-shadow-0.16.2" = { + name = "_at_jimp_slash_plugin-shadow"; + packageName = "@jimp/plugin-shadow"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.16.2.tgz"; + sha512 = "Q0aIs2/L6fWMcEh9Ms73u34bT1hyUMw/oxaVoIzOLo6/E8YzCs2Bi63H0/qaPS0MQpEppI++kvosPbblABY79w=="; + }; + }; + "@jimp/plugin-threshold-0.16.2" = { + name = "_at_jimp_slash_plugin-threshold"; + packageName = "@jimp/plugin-threshold"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.16.2.tgz"; + sha512 = "gyOwmBgjtMPvcuyOhkP6dOGWbQdaTfhcBRN22mYeI/k/Wh/Zh1OI21F6eKLApsVRmg15MoFnkrCz64RROC34sw=="; + }; + }; + "@jimp/plugins-0.16.2" = { + name = "_at_jimp_slash_plugins"; + packageName = "@jimp/plugins"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.16.2.tgz"; + sha512 = "zCvYtCgctmC0tkYEu+y+kSwSIZBsNznqJ3/3vkpzxdyjd6wCfNY5Qc/68MPrLc1lmdeGo4cOOTYHG7Vc6myzRw=="; + }; + }; + "@jimp/png-0.16.2" = { + name = "_at_jimp_slash_png"; + packageName = "@jimp/png"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/png/-/png-0.16.2.tgz"; + sha512 = "sFOtOSz/tzDwXEChFQ/Nxe+0+vG3Tj0eUxnZVDUG/StXE9dI8Bqmwj3MIa0EgK5s+QG3YlnDOmlPUa4JqmeYeQ=="; + }; + }; + "@jimp/tiff-0.16.2" = { + name = "_at_jimp_slash_tiff"; + packageName = "@jimp/tiff"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.16.2.tgz"; + sha512 = "ADcdqmtZF+U2YoaaHTzFX8D6NFpmN4WZUT0BPMerEuY7Cq8QoLYU22z2h034FrVW+Rbi1b3y04sB9iDiQAlf2w=="; + }; + }; + "@jimp/types-0.16.2" = { + name = "_at_jimp_slash_types"; + packageName = "@jimp/types"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/types/-/types-0.16.2.tgz"; + sha512 = "0Ue5Sq0XnDF6TirisWv5E+8uOnRcd8vRLuwocJOhF76NIlcQrz+5r2k2XWKcr3d+11n28dHLXW5TKSqrUopxhA=="; + }; + }; + "@jimp/utils-0.16.2" = { + name = "_at_jimp_slash_utils"; + packageName = "@jimp/utils"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/utils/-/utils-0.16.2.tgz"; + sha512 = "XENrPvmigiXZQ8E2nxJqO6UVvWBLzbNwyYi3Y8Q1IECoYhYI3kgOQ0fmy4G269Vz1V0omh1bNmC42r4OfXg1Jg=="; + }; + }; "@joplin/fork-htmlparser2-4.1.41" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; @@ -6367,13 +6736,13 @@ let sha512 = "3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="; }; }; - "@js-joda/core-5.4.2" = { + "@js-joda/core-5.5.2" = { name = "_at_js-joda_slash_core"; packageName = "@js-joda/core"; - version = "5.4.2"; + version = "5.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@js-joda/core/-/core-5.4.2.tgz"; - sha512 = "QIDIZ9a0NfDStgD47VaTgwiPjlw1p4QPLwjOB/9+/DqIztoQopPNNAd+HdtQMHgE+ibP3dJacd8/TVL/A1RaaA=="; + url = "https://registry.npmjs.org/@js-joda/core/-/core-5.5.2.tgz"; + sha512 = "retLUN4TwCJ0QJDi9OCJwYVaXAz93NeOkEtEQL98M2bykBOxmURlP0YlfsuE46kItOOVZIWRYC3KsSLhQ1R2Qw=="; }; }; "@jsdevtools/ono-7.1.3" = { @@ -6385,13 +6754,13 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsdoc/salty-0.2.1" = { + "@jsdoc/salty-0.2.3" = { name = "_at_jsdoc_slash_salty"; packageName = "@jsdoc/salty"; - version = "0.2.1"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.1.tgz"; - sha512 = "JXwylDNSHa549N9uceDYu8D4GMXwSo3H8CCPYEQqxhhHpxD28+lRl2b3bS/caaPj5w1YD3SWtrficJNTnUjGpg=="; + url = "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.3.tgz"; + sha512 = "bbtCxCkxcnWhi50I+4Lj6mdz9w3pOXOgEQrID8TCZ/DF51fW7M9GCQW2y45SpBDdHd1Eirm1X/Cf6CkAAe8HPg=="; }; }; "@jsep-plugin/regex-1.0.3" = { @@ -6412,40 +6781,49 @@ let sha512 = "qtLGzCNzPVJ3kdH6/zoLWDPjauHIKiLSBAR71Wa0+PWvGA8wODUQvRgxtpUA5YqAYL3CQ8S4qXhd/9WuWTZirg=="; }; }; - "@jsii/check-node-1.70.0" = { + "@jsii/check-node-1.73.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.70.0"; + version = "1.73.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.70.0.tgz"; - sha512 = "lebc8VgekEEStNn1K/khkRzs41sjC88tBE0xEkjDpsFNBMXNuek8I9dkaFbjQ9c+P0TsOa17JJUMLxjgCtjW5A=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.73.0.tgz"; + sha512 = "oneDKgjplUw2Ivk78iAb9lCsAasxkuQ6Ii15qzXsw16CPSRCqQlE78lUVV7pr+rxx/vQDWBAa8ycRbuVghC6TQ=="; }; }; - "@jsii/spec-1.70.0" = { + "@jsii/spec-1.73.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.70.0"; + version = "1.73.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.70.0.tgz"; - sha512 = "2l09VaZvT8OLRMwtVm+JxzrzpO6+eR4Scn9B8+zvE9NptX5jN+X68V0VngDuWTJqHs7ntbYCmHQDWuLm0bPr1A=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.73.0.tgz"; + sha512 = "h0BeA6WQfxvYl5BaacmlvB5bAIdhlgf9SInJljxtERn2eYN+VjgMyU/1iv0Ww4Lp71xMGL96bmfXpdlFgRQFEg=="; }; }; - "@juggle/resize-observer-3.4.0" = { - name = "_at_juggle_slash_resize-observer"; - packageName = "@juggle/resize-observer"; - version = "3.4.0"; + "@json2csv/formatters-6.1.2" = { + name = "_at_json2csv_slash_formatters"; + packageName = "@json2csv/formatters"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.4.0.tgz"; - sha512 = "dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA=="; + url = "https://registry.npmjs.org/@json2csv/formatters/-/formatters-6.1.2.tgz"; + sha512 = "l8i5EdQvHZHrtSgRFEXMkRnIn8CBopT/ecZSIyPKuee9+pm/Sxcb/r/N2jQWARnOQc7uyqQWAtpPpxU7HhZ2tg=="; }; }; - "@koa/multer-3.0.0" = { + "@json2csv/plainjs-6.1.2" = { + name = "_at_json2csv_slash_plainjs"; + packageName = "@json2csv/plainjs"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@json2csv/plainjs/-/plainjs-6.1.2.tgz"; + sha512 = "XNcBd6W4G5mlP6ZL13idEx21diQAM5AJgIe78RxRfZctWRppaZrtpiGTzhc/sNv7UM1FpfO/aa5wel4+aQW7MQ=="; + }; + }; + "@koa/multer-3.0.2" = { name = "_at_koa_slash_multer"; packageName = "@koa/multer"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@koa/multer/-/multer-3.0.0.tgz"; - sha512 = "y+OQBmex5D1jIl723gAEUYcAWPEicIXppaAKw/zCMfpllQ08ZNweDPwoCLxEoatqd5pCu2XG6V8dl67JRq3RJw=="; + url = "https://registry.npmjs.org/@koa/multer/-/multer-3.0.2.tgz"; + sha512 = "Q6WfPpE06mJWyZD1fzxM6zWywaoo+zocAn2YA9QYz4RsecoASr1h/kSzG0c5seDpFVKCMZM9raEfuM7XfqbRLw=="; }; }; "@koa/router-10.1.1" = { @@ -6475,15 +6853,6 @@ let sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; }; }; - "@lcdp/offline-plugin-5.1.1" = { - name = "_at_lcdp_slash_offline-plugin"; - packageName = "@lcdp/offline-plugin"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lcdp/offline-plugin/-/offline-plugin-5.1.1.tgz"; - sha512 = "TjLyneaRVHBNyzHHXeDfpejMqNYPZqs/hZqgEwPH5bgqDgh348dId/rOAHWkiGtujgv4ZejWZNM4derv0Mjdqw=="; - }; - }; "@ledgerhq/devices-5.51.1" = { name = "_at_ledgerhq_slash_devices"; packageName = "@ledgerhq/devices"; @@ -6493,13 +6862,13 @@ let sha512 = "4w+P0VkbjzEXC7kv8T1GJ/9AVaP9I6uasMZ/JcdwZBS3qwvKo5A5z9uGhP5c7TvItzcmPb44b5Mw2kT+WjUuAA=="; }; }; - "@ledgerhq/devices-7.0.3" = { + "@ledgerhq/devices-7.0.7" = { name = "_at_ledgerhq_slash_devices"; packageName = "@ledgerhq/devices"; - version = "7.0.3"; + version = "7.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/devices/-/devices-7.0.3.tgz"; - sha512 = "URlcgq6yKklWxj35nIu/eTF0UpGLGUOp69xp8uHeyoMK2wqVC0GNGeD2MvKyJ+ul83edqMEI98GycA98Y7trsg=="; + url = "https://registry.npmjs.org/@ledgerhq/devices/-/devices-7.0.7.tgz"; + sha512 = "PZ9TtaTGBYUm/g0qNKPbECZt7DDNvqM3ILS5wAtOMna2cBR+mrywUGXrkjuOWlHpuqZ8wenaAKveQBbzF2ba8w=="; }; }; "@ledgerhq/errors-5.50.0" = { @@ -6511,13 +6880,13 @@ let sha512 = "gu6aJ/BHuRlpU7kgVpy2vcYk6atjB4iauP2ymF7Gk0ez0Y/6VSMVSJvubeEQN+IV60+OBK0JgeIZG7OiHaw8ow=="; }; }; - "@ledgerhq/errors-6.11.1" = { + "@ledgerhq/errors-6.12.3" = { name = "_at_ledgerhq_slash_errors"; packageName = "@ledgerhq/errors"; - version = "6.11.1"; + version = "6.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.11.1.tgz"; - sha512 = "HT1PFvNrejcN5z3ba6xikacIdHWMkjBeE9U5FFoGHhaKBKGjC74mnCeEo0/oJunyuVId+9mhGnv6lrBl6Mkqdg=="; + url = "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.12.3.tgz"; + sha512 = "djiMSgB/7hnK3aLR/c5ZMMivxjcI7o2+y3VKcsZZpydPoVf9+FXqeJPRfOwmJ0JxbQ//LinUfWpIfHew8LkaVw=="; }; }; "@ledgerhq/hw-transport-5.51.1" = { @@ -6529,31 +6898,31 @@ let sha512 = "6wDYdbWrw9VwHIcoDnqWBaDFyviyjZWv6H9vz9Vyhe4Qd7TIFmbTl/eWs6hZvtZBza9K8y7zD8ChHwRI4s9tSw=="; }; }; - "@ledgerhq/hw-transport-6.27.6" = { + "@ledgerhq/hw-transport-6.27.10" = { name = "_at_ledgerhq_slash_hw-transport"; packageName = "@ledgerhq/hw-transport"; - version = "6.27.6"; + version = "6.27.10"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.27.6.tgz"; - sha512 = "DRGUsB8WfbeEPuU42nAtwYpA5D6Bq3q1CvC2VjDinkukLcf6XMc22YUJl9mxt+h+/cLTU1Ff/pz+fqYqeELLEA=="; + url = "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.27.10.tgz"; + sha512 = "3cmwQZsiRKe6VcHA1kAtC8+Wt0xjCa9Y0TO/Ns2k4BmEhIlG143I4H1dJntkX6XhDpE1pK9Xn2niBQsTTeGhqA=="; }; }; - "@ledgerhq/hw-transport-node-hid-6.27.6" = { + "@ledgerhq/hw-transport-node-hid-6.27.10" = { name = "_at_ledgerhq_slash_hw-transport-node-hid"; packageName = "@ledgerhq/hw-transport-node-hid"; - version = "6.27.6"; + version = "6.27.10"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.27.6.tgz"; - sha512 = "ZQGKTydb3niMfGBrhbYR7zDiykOadiXRj05qfrjkCvvLXEq3KkUy8WnhfoSQEgaQpOx+i4SUJwzzfAih5eP3GA=="; + url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.27.10.tgz"; + sha512 = "+08Js51ED1OvnqS+qMnC0bxTYVQ1X3GBvKXRbh3w2IOAdp7ji8srD2VnSe1fz2iXJ19OR7KZL5quRpcv+TOWQw=="; }; }; - "@ledgerhq/hw-transport-node-hid-noevents-6.27.6" = { + "@ledgerhq/hw-transport-node-hid-noevents-6.27.10" = { name = "_at_ledgerhq_slash_hw-transport-node-hid-noevents"; packageName = "@ledgerhq/hw-transport-node-hid-noevents"; - version = "6.27.6"; + version = "6.27.10"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.27.6.tgz"; - sha512 = "9WvUBUhk0eRSZjXgEsdNVGkxHuDLoh6fR1PJIeXKHgC8dzTREYrGKytx8ECqO5OPotXeAZURC3yB00XZrKIupw=="; + url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.27.10.tgz"; + sha512 = "IyZO88VJubSnfDePSiOG83Ly1n7xfvvErtf7ESQxFhwCrkObkUczQDarYo8XJLCJBDuRr2UgiOfb/yAZrlf+vA=="; }; }; "@ledgerhq/hw-transport-u2f-5.36.0-deprecated" = { @@ -6610,544 +6979,544 @@ let sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="; }; }; - "@lerna/add-6.0.1" = { + "@lerna/add-6.4.1" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-6.0.1.tgz"; - sha512 = "cCQIlMODhi3KYyTDOp2WWL4Kj2dKK+MmCiaSf+USrbSWPVVXQGn5Eb11XOMUfYYq3Ula75sWL2urtYwuu8IbmA=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-6.4.1.tgz"; + sha512 = "YSRnMcsdYnQtQQK0NSyrS9YGXvB3jzvx183o+JTH892MKzSlBqwpBHekCknSibyxga1HeZ0SNKQXgsHAwWkrRw=="; }; }; - "@lerna/bootstrap-6.0.1" = { + "@lerna/bootstrap-6.4.1" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-6.0.1.tgz"; - sha512 = "a3DWchHFOiRmDN24VTdmTxKvAqw6Msp8pDCWXq4rgOQSFxqyYECd8BYvmy8dTW6LcC4EG0HqTGRguuEaKCasOw=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-6.4.1.tgz"; + sha512 = "64cm0mnxzxhUUjH3T19ZSjPdn28vczRhhTXhNAvOhhU0sQgHrroam1xQC1395qbkV3iosSertlu8e7xbXW033w=="; }; }; - "@lerna/changed-6.0.1" = { + "@lerna/changed-6.4.1" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-6.0.1.tgz"; - sha512 = "b0KzqpNv25ZxH9M/7jtDQaXWUBhVzBVJ8DQ4PjjeoulOCQ+mA9tNQr8UVmeU1UZiaNtNz6Hcy55vyvVvNe07VA=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-6.4.1.tgz"; + sha512 = "Z/z0sTm3l/iZW0eTSsnQpcY5d6eOpNO0g4wMOK+hIboWG0QOTc8b28XCnfCUO+33UisKl8PffultgoaHMKkGgw=="; }; }; - "@lerna/check-working-tree-6.0.1" = { + "@lerna/check-working-tree-6.4.1" = { name = "_at_lerna_slash_check-working-tree"; packageName = "@lerna/check-working-tree"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-6.0.1.tgz"; - sha512 = "9Ti1EuE3IiJUvvAtFk+Xr9Uw6KehT78ghnI4f/hi4uew5q0Mf2+DMaBNexbhOTpRFBeIq4ucDFhiN091pNkUNw=="; + url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-6.4.1.tgz"; + sha512 = "EnlkA1wxaRLqhJdn9HX7h+JYxqiTK9aWEFOPqAE8lqjxHn3RpM9qBp1bAdL7CeUk3kN1lvxKwDEm0mfcIyMbPA=="; }; }; - "@lerna/child-process-6.0.1" = { + "@lerna/child-process-6.4.1" = { name = "_at_lerna_slash_child-process"; packageName = "@lerna/child-process"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-6.0.1.tgz"; - sha512 = "5smM8Or/RQkHysNFrUYdrCYlhpr3buNpCYU7T2DPYzOWRPm+X5rCvt/dDOcS3UgYT2jEyS86S5Y7pK2X7eXtmg=="; + url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-6.4.1.tgz"; + sha512 = "dvEKK0yKmxOv8pccf3I5D/k+OGiLxQp5KYjsrDtkes2pjpCFfQAMbmpol/Tqx6w/2o2rSaRrLsnX8TENo66FsA=="; }; }; - "@lerna/clean-6.0.1" = { + "@lerna/clean-6.4.1" = { name = "_at_lerna_slash_clean"; packageName = "@lerna/clean"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/clean/-/clean-6.0.1.tgz"; - sha512 = "ZaWPzzYNkJM7Ib2GWPLSELVBf5nRCGOGBtR9DSLKAore0Me876JLgi4h2R+Y2PVyCvT1kmoQKAclnjxdZbCONA=="; + url = "https://registry.npmjs.org/@lerna/clean/-/clean-6.4.1.tgz"; + sha512 = "FuVyW3mpos5ESCWSkQ1/ViXyEtsZ9k45U66cdM/HnteHQk/XskSQw0sz9R+whrZRUDu6YgYLSoj1j0YAHVK/3A=="; }; }; - "@lerna/cli-6.0.1" = { + "@lerna/cli-6.4.1" = { name = "_at_lerna_slash_cli"; packageName = "@lerna/cli"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/cli/-/cli-6.0.1.tgz"; - sha512 = "AuAnUXkBGdts/rmHltrkZucYy11OwYPb/4HM3zxLeq4O30w2ocZIytkOtSkuVKOMPWBZR8b37fNuZBzvxe5OmA=="; + url = "https://registry.npmjs.org/@lerna/cli/-/cli-6.4.1.tgz"; + sha512 = "2pNa48i2wzFEd9LMPKWI3lkW/3widDqiB7oZUM1Xvm4eAOuDWc9I3RWmAUIVlPQNf3n4McxJCvsZZ9BpQN50Fg=="; }; }; - "@lerna/collect-uncommitted-6.0.1" = { + "@lerna/collect-uncommitted-6.4.1" = { name = "_at_lerna_slash_collect-uncommitted"; packageName = "@lerna/collect-uncommitted"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-6.0.1.tgz"; - sha512 = "qPqwmIlSlf8XBJnqMc+6pz6qXQ0Pfjil70FB2IPvoWbfrLvMI6K3I/AXeub9X5fj5HYqNs1XtwhWHJcMFpJddw=="; + url = "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-6.4.1.tgz"; + sha512 = "5IVQGhlLrt7Ujc5ooYA1Xlicdba/wMcDSnbQwr8ufeqnzV2z4729pLCVk55gmi6ZienH/YeBPHxhB5u34ofE0Q=="; }; }; - "@lerna/collect-updates-6.0.1" = { + "@lerna/collect-updates-6.4.1" = { name = "_at_lerna_slash_collect-updates"; packageName = "@lerna/collect-updates"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-6.0.1.tgz"; - sha512 = "OwRcLqD1N5znlZM/Ctf031RDkodHVO62byiD35AbHGoGM2EI2TSYyIbqnJ8QsQJMB05/KhIBndL8Mpcdle7/rg=="; + url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-6.4.1.tgz"; + sha512 = "pzw2/FC+nIqYkknUHK9SMmvP3MsLEjxI597p3WV86cEDN3eb1dyGIGuHiKShtjvT08SKSwpTX+3bCYvLVxtC5Q=="; }; }; - "@lerna/command-6.0.1" = { + "@lerna/command-6.4.1" = { name = "_at_lerna_slash_command"; packageName = "@lerna/command"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/command/-/command-6.0.1.tgz"; - sha512 = "V9w8M7pMU7KztxaL0+fetTSQYTa12bhTl86ll9VjlgYZ5qUAXk9E42Y8hbVThyYtHEhkRnIMinkWsmH/9YKU/A=="; + url = "https://registry.npmjs.org/@lerna/command/-/command-6.4.1.tgz"; + sha512 = "3Lifj8UTNYbRad8JMP7IFEEdlIyclWyyvq/zvNnTS9kCOEymfmsB3lGXr07/AFoi6qDrvN64j7YSbPZ6C6qonw=="; }; }; - "@lerna/conventional-commits-6.0.1" = { + "@lerna/conventional-commits-6.4.1" = { name = "_at_lerna_slash_conventional-commits"; packageName = "@lerna/conventional-commits"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-6.0.1.tgz"; - sha512 = "6oIGEZKy1GpooW28C0aEDkZ/rVkqpX44knP8Jyb5//1054QogqPhGC5q6J0lZxyhun8dQkpF6XTHlIintI8xow=="; + url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-6.4.1.tgz"; + sha512 = "NIvCOjStjQy5O8VojB7/fVReNNDEJOmzRG2sTpgZ/vNS4AzojBQZ/tobzhm7rVkZZ43R9srZeuhfH9WgFsVUSA=="; }; }; - "@lerna/create-6.0.1" = { + "@lerna/create-6.4.1" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-6.0.1.tgz"; - sha512 = "VuTdvBJDzvAaMBYoKTRMBQC+nfwnihxdA/ekUqBD+W8MMsqPLCGCneyl7JK9RaSSib/10LyRDEmfo79UAndcgQ=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-6.4.1.tgz"; + sha512 = "qfQS8PjeGDDlxEvKsI/tYixIFzV2938qLvJohEKWFn64uvdLnXCamQ0wvRJST8p1ZpHWX4AXrB+xEJM3EFABrA=="; }; }; - "@lerna/create-symlink-6.0.1" = { + "@lerna/create-symlink-6.4.1" = { name = "_at_lerna_slash_create-symlink"; packageName = "@lerna/create-symlink"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-6.0.1.tgz"; - sha512 = "ZmLx9SP5De6u1xkD7Z6gMMFuyLKCb+2bodreFe7ryOVP3cOLbmNOmgMgj+gtUgIwIv7BDwX3qFWlPY6B3VW3hQ=="; + url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-6.4.1.tgz"; + sha512 = "rNivHFYV1GAULxnaTqeGb2AdEN2OZzAiZcx5CFgj45DWXQEGwPEfpFmCSJdXhFZbyd3K0uiDlAXjAmV56ov3FQ=="; }; }; - "@lerna/describe-ref-6.0.1" = { + "@lerna/describe-ref-6.4.1" = { name = "_at_lerna_slash_describe-ref"; packageName = "@lerna/describe-ref"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-6.0.1.tgz"; - sha512 = "PcTVt4qgAXUPBtWHyqixtwE/eXe56+DFRnfTcJlb4x5F7LJ+7VNpdR/81qfP89Xj10U5IjELXbXmriz1KMwhfw=="; + url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-6.4.1.tgz"; + sha512 = "MXGXU8r27wl355kb1lQtAiu6gkxJ5tAisVJvFxFM1M+X8Sq56icNoaROqYrvW6y97A9+3S8Q48pD3SzkFv31Xw=="; }; }; - "@lerna/diff-6.0.1" = { + "@lerna/diff-6.4.1" = { name = "_at_lerna_slash_diff"; packageName = "@lerna/diff"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/diff/-/diff-6.0.1.tgz"; - sha512 = "/pGXH9txA8wX1YJ/KOBXzx0Z2opADBW4HKPCxxHAu+6dTGMbKABDljVT5Np3UpfIrAGDE5fTuf0aGL4vkKUWrg=="; + url = "https://registry.npmjs.org/@lerna/diff/-/diff-6.4.1.tgz"; + sha512 = "TnzJsRPN2fOjUrmo5Boi43fJmRtBJDsVgwZM51VnLoKcDtO1kcScXJ16Od2Xx5bXbp5dES5vGDLL/USVVWfeAg=="; }; }; - "@lerna/exec-6.0.1" = { + "@lerna/exec-6.4.1" = { name = "_at_lerna_slash_exec"; packageName = "@lerna/exec"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/exec/-/exec-6.0.1.tgz"; - sha512 = "x9puoI3091Alp45w7XOGRxThOw45p+tWGPR5TBCEQiiH7f8eF9Dc4WX5HXf31ooK6NmD40eKPYhBgy8oQnJY9w=="; + url = "https://registry.npmjs.org/@lerna/exec/-/exec-6.4.1.tgz"; + sha512 = "KAWfuZpoyd3FMejHUORd0GORMr45/d9OGAwHitfQPVs4brsxgQFjbbBEEGIdwsg08XhkDb4nl6IYVASVTq9+gA=="; }; }; - "@lerna/filter-options-6.0.1" = { + "@lerna/filter-options-6.4.1" = { name = "_at_lerna_slash_filter-options"; packageName = "@lerna/filter-options"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-6.0.1.tgz"; - sha512 = "6KxbBI/2skRl/yQdjugQ1PWrSLq19650z8mltF0HT7B686fj7LlDNtESFOtY6iZ8IPqKBkIavOP0DPmJZd7Szw=="; + url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-6.4.1.tgz"; + sha512 = "efJh3lP2T+9oyNIP2QNd9EErf0Sm3l3Tz8CILMsNJpjSU6kO43TYWQ+L/ezu2zM99KVYz8GROLqDcHRwdr8qUA=="; }; }; - "@lerna/filter-packages-6.0.1" = { + "@lerna/filter-packages-6.4.1" = { name = "_at_lerna_slash_filter-packages"; packageName = "@lerna/filter-packages"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-6.0.1.tgz"; - sha512 = "2bKhexeF07Urs2b0xYX2OgYUN0EzmS2FSgvw0KT6He48PGOkqgJjU7PIiWdPyOvZdukwm07qXTmJZulAHftceA=="; + url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-6.4.1.tgz"; + sha512 = "LCMGDGy4b+Mrb6xkcVzp4novbf5MoZEE6ZQF1gqG0wBWqJzNcKeFiOmf352rcDnfjPGZP6ct5+xXWosX/q6qwg=="; }; }; - "@lerna/get-npm-exec-opts-6.0.1" = { + "@lerna/get-npm-exec-opts-6.4.1" = { name = "_at_lerna_slash_get-npm-exec-opts"; packageName = "@lerna/get-npm-exec-opts"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-6.0.1.tgz"; - sha512 = "y2T+ODP8HNzHQn1ldrrPW+n823fGsN2sY0r78yURFxYZnxA9ZINyQ6IAejo5LqHrYN8Qhr++0RHo2tUisIHdKg=="; + url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-6.4.1.tgz"; + sha512 = "IvN/jyoklrWcjssOf121tZhOc16MaFPOu5ii8a+Oy0jfTriIGv929Ya8MWodj75qec9s+JHoShB8yEcMqZce4g=="; }; }; - "@lerna/get-packed-6.0.1" = { + "@lerna/get-packed-6.4.1" = { name = "_at_lerna_slash_get-packed"; packageName = "@lerna/get-packed"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-6.0.1.tgz"; - sha512 = "Z/5J5vbjdeGqZcPvUSiszvyizHdsTRiFlpPORWK3YfIsHllUB7QZnVHLg92UnSJrpPE0O1gH+k6ByhhR+3qEdA=="; + url = "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-6.4.1.tgz"; + sha512 = "uaDtYwK1OEUVIXn84m45uPlXShtiUcw6V9TgB3rvHa3rrRVbR7D4r+JXcwVxLGrAS7LwxVbYWEEO/Z/bX7J/Lg=="; }; }; - "@lerna/github-client-6.0.1" = { + "@lerna/github-client-6.4.1" = { name = "_at_lerna_slash_github-client"; packageName = "@lerna/github-client"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/github-client/-/github-client-6.0.1.tgz"; - sha512 = "UA7V3XUunJnrfCL2eyW9QsCjBWShv4dCRGUITXmpQJrNIMZIqVbBJzqN9LVHDNc/hEVZGt0EjtHWdpFCgD4ypg=="; + url = "https://registry.npmjs.org/@lerna/github-client/-/github-client-6.4.1.tgz"; + sha512 = "ridDMuzmjMNlcDmrGrV9mxqwUKzt9iYqCPwVYJlRYrnE3jxyg+RdooquqskVFj11djcY6xCV2Q2V1lUYwF+PmA=="; }; }; - "@lerna/gitlab-client-6.0.1" = { + "@lerna/gitlab-client-6.4.1" = { name = "_at_lerna_slash_gitlab-client"; packageName = "@lerna/gitlab-client"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-6.0.1.tgz"; - sha512 = "yyaBKf/OqBAau6xDk1tnMjfkxRpC/j3OwUyXFFGfJFSulWRHpbHoFSfvIgOn/hkjAr9FfHC7TXItRg8qdm38Wg=="; + url = "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-6.4.1.tgz"; + sha512 = "AdLG4d+jbUvv0jQyygQUTNaTCNSMDxioJso6aAjQ/vkwyy3fBJ6FYzX74J4adSfOxC2MQZITFyuG+c9ggp7pyQ=="; }; }; - "@lerna/global-options-6.0.1" = { + "@lerna/global-options-6.4.1" = { name = "_at_lerna_slash_global-options"; packageName = "@lerna/global-options"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-6.0.1.tgz"; - sha512 = "vzjDI3Bg2NR+cSgfjHWax2bF1HmQYjJF2tmZlT/hJbwhaVMIEnhzHnJ9Yycmm98cdV77xEMlbmk5YD7xgFdG2w=="; + url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-6.4.1.tgz"; + sha512 = "UTXkt+bleBB8xPzxBPjaCN/v63yQdfssVjhgdbkQ//4kayaRA65LyEtJTi9rUrsLlIy9/rbeb+SAZUHg129fJg=="; }; }; - "@lerna/has-npm-version-6.0.1" = { + "@lerna/has-npm-version-6.4.1" = { name = "_at_lerna_slash_has-npm-version"; packageName = "@lerna/has-npm-version"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-6.0.1.tgz"; - sha512 = "ol1onJaauMXK0cQsfRX2rvbhNRyNBY9Ne5trrRjfMROa7Tnr8c3I4+aKQs7m4z1JdWaGBV4xBH+NSZ/esPuaWA=="; + url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-6.4.1.tgz"; + sha512 = "vW191w5iCkwNWWWcy4542ZOpjKYjcP/pU3o3+w6NM1J3yBjWZcNa8lfzQQgde2QkGyNi+i70o6wIca1o0sdKwg=="; }; }; - "@lerna/import-6.0.1" = { + "@lerna/import-6.4.1" = { name = "_at_lerna_slash_import"; packageName = "@lerna/import"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/import/-/import-6.0.1.tgz"; - sha512 = "GrTtIWUCnDf+FqRjenV2OKWU+khoZj0h/etgfXus45PBO2+V/SkkzIY4xof23XphiydUYrSrYtwx2i1aEmk3Wg=="; + url = "https://registry.npmjs.org/@lerna/import/-/import-6.4.1.tgz"; + sha512 = "oDg8g1PNrCM1JESLsG3rQBtPC+/K9e4ohs0xDKt5E6p4l7dc0Ib4oo0oCCT/hGzZUlNwHxrc2q9JMRzSAn6P/Q=="; }; }; - "@lerna/info-6.0.1" = { + "@lerna/info-6.4.1" = { name = "_at_lerna_slash_info"; packageName = "@lerna/info"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/info/-/info-6.0.1.tgz"; - sha512 = "QEW7JtJjoR1etUrcft7BnrwPZFHE2JPmt2DoSvSmLISLyy+HlmdXHK+p6Ej3g1ql8gS0GWCacgwmlRZ27CDp5A=="; + url = "https://registry.npmjs.org/@lerna/info/-/info-6.4.1.tgz"; + sha512 = "Ks4R7IndIr4vQXz+702gumPVhH6JVkshje0WKA3+ew2qzYZf68lU1sBe1OZsQJU3eeY2c60ax+bItSa7aaIHGw=="; }; }; - "@lerna/init-6.0.1" = { + "@lerna/init-6.4.1" = { name = "_at_lerna_slash_init"; packageName = "@lerna/init"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/init/-/init-6.0.1.tgz"; - sha512 = "zOMrSij09LSAVUUujpD3y32wkHp8dQ+/dVCp4USlfcGfI+kIPc5prkYCGDO8dEcqkze0pMfDMF23pVNvAf9g7w=="; + url = "https://registry.npmjs.org/@lerna/init/-/init-6.4.1.tgz"; + sha512 = "CXd/s/xgj0ZTAoOVyolOTLW2BG7uQOhWW4P/ktlwwJr9s3c4H/z+Gj36UXw3q5X1xdR29NZt7Vc6fvROBZMjUQ=="; }; }; - "@lerna/link-6.0.1" = { + "@lerna/link-6.4.1" = { name = "_at_lerna_slash_link"; packageName = "@lerna/link"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/link/-/link-6.0.1.tgz"; - sha512 = "VXZ77AWsJCycTu219ZLUHyRzMd5hgivLk5ZyBD1s/emArFvdEmGLscj2RXn3P3w/951b+DNG2Zbi6nek0iJ6DA=="; + url = "https://registry.npmjs.org/@lerna/link/-/link-6.4.1.tgz"; + sha512 = "O8Rt7MAZT/WT2AwrB/+HY76ktnXA9cDFO9rhyKWZGTHdplbzuJgfsGzu8Xv0Ind+w+a8xLfqtWGPlwiETnDyrw=="; }; }; - "@lerna/list-6.0.1" = { + "@lerna/list-6.4.1" = { name = "_at_lerna_slash_list"; packageName = "@lerna/list"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/list/-/list-6.0.1.tgz"; - sha512 = "M9Vneh866E1nlpU88rcUMLR+XTVi3VY0fLPr1OqXdYF+eTe6RkEHUQj8HIk94Rnt02HsWc4+FO31T4i5sf+PaA=="; + url = "https://registry.npmjs.org/@lerna/list/-/list-6.4.1.tgz"; + sha512 = "7a6AKgXgC4X7nK6twVPNrKCiDhrCiAhL/FE4u9HYhHqw9yFwyq8Qe/r1RVOkAOASNZzZ8GuBvob042bpunupCw=="; }; }; - "@lerna/listable-6.0.1" = { + "@lerna/listable-6.4.1" = { name = "_at_lerna_slash_listable"; packageName = "@lerna/listable"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/listable/-/listable-6.0.1.tgz"; - sha512 = "+xEByVX0sbnBW3EBu3XCg71Bz9/dahncmCjNK0kVnZLnQZzfULCndaQeSt+f9KO0VCs8h1tnXdo2uLPm4lThnw=="; + url = "https://registry.npmjs.org/@lerna/listable/-/listable-6.4.1.tgz"; + sha512 = "L8ANeidM10aoF8aL3L/771Bb9r/TRkbEPzAiC8Iy2IBTYftS87E3rT/4k5KBEGYzMieSKJaskSFBV0OQGYV1Cw=="; }; }; - "@lerna/log-packed-6.0.1" = { + "@lerna/log-packed-6.4.1" = { name = "_at_lerna_slash_log-packed"; packageName = "@lerna/log-packed"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-6.0.1.tgz"; - sha512 = "HTJdZzfBbb5jyk/QU2O6o+yaWRwLoaPruhK+Q3ESTzQ2mlNCr0CI4UKWDcWURWx0EsVsYqsoUHuPZInpIHqCnA=="; + url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-6.4.1.tgz"; + sha512 = "Pwv7LnIgWqZH4vkM1rWTVF+pmWJu7d0ZhVwyhCaBJUsYbo+SyB2ZETGygo3Z/A+vZ/S7ImhEEKfIxU9bg5lScQ=="; }; }; - "@lerna/npm-conf-6.0.1" = { + "@lerna/npm-conf-6.4.1" = { name = "_at_lerna_slash_npm-conf"; packageName = "@lerna/npm-conf"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-6.0.1.tgz"; - sha512 = "VjxODCnl6QJGoQ8z8AWEID1GO9CtCr2yRyn6NoRdBOTYmzI5KhBBM+nWmyMSOUe0EZI+K5j04/GRzKHg2KXTAQ=="; + url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-6.4.1.tgz"; + sha512 = "Q+83uySGXYk3n1pYhvxtzyGwBGijYgYecgpiwRG1YNyaeGy+Mkrj19cyTWubT+rU/kM5c6If28+y9kdudvc7zQ=="; }; }; - "@lerna/npm-dist-tag-6.0.1" = { + "@lerna/npm-dist-tag-6.4.1" = { name = "_at_lerna_slash_npm-dist-tag"; packageName = "@lerna/npm-dist-tag"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-6.0.1.tgz"; - sha512 = "jJKDgnhj6xGqSWGcbwdcbPtoo2m4mHRwqu8iln9e3TMOEyUO9aA4uvd0/18tEAsboOMiLUhhcQ8709iKv21ZEA=="; + url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-6.4.1.tgz"; + sha512 = "If1Hn4q9fn0JWuBm455iIZDWE6Fsn4Nv8Tpqb+dYf0CtoT5Hn+iT64xSiU5XJw9Vc23IR7dIujkEXm2MVbnvZw=="; }; }; - "@lerna/npm-install-6.0.1" = { + "@lerna/npm-install-6.4.1" = { name = "_at_lerna_slash_npm-install"; packageName = "@lerna/npm-install"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-6.0.1.tgz"; - sha512 = "saDJSyhhl/wxgZSzRx2/pr0wsMR+hZpdhLGd1lZgo5XzLq3ogK+BxPFz3AK3xhRnNaMq96gDQ3xmeetoV53lwQ=="; + url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-6.4.1.tgz"; + sha512 = "7gI1txMA9qTaT3iiuk/8/vL78wIhtbbOLhMf8m5yQ2G+3t47RUA8MNgUMsq4Zszw9C83drayqesyTf0u8BzVRg=="; }; }; - "@lerna/npm-publish-6.0.1" = { + "@lerna/npm-publish-6.4.1" = { name = "_at_lerna_slash_npm-publish"; packageName = "@lerna/npm-publish"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-6.0.1.tgz"; - sha512 = "hgzF9fOfp010z7PJtqNLxNXiHr6u4UDVwiX8g22rhJKBh9Ekrq7N9NS3mF0l+RcleRU/jJKYtZ0Ci3fICaaRUg=="; + url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-6.4.1.tgz"; + sha512 = "lbNEg+pThPAD8lIgNArm63agtIuCBCF3umxvgTQeLzyqUX6EtGaKJFyz/6c2ANcAuf8UfU7WQxFFbOiolibXTQ=="; }; }; - "@lerna/npm-run-script-6.0.1" = { + "@lerna/npm-run-script-6.4.1" = { name = "_at_lerna_slash_npm-run-script"; packageName = "@lerna/npm-run-script"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-6.0.1.tgz"; - sha512 = "K+D4LEoVRuBoKRImprkVRHIORu0xouX+c6yI1B93KWHKJ60H8qCeB0gQkA30pFALx3qG07bXVnFmfK9SGQXD3Q=="; + url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-6.4.1.tgz"; + sha512 = "HyvwuyhrGqDa1UbI+pPbI6v+wT6I34R0PW3WCADn6l59+AyqLOCUQQr+dMW7jdYNwjO6c/Ttbvj4W58EWsaGtQ=="; }; }; - "@lerna/otplease-6.0.1" = { + "@lerna/otplease-6.4.1" = { name = "_at_lerna_slash_otplease"; packageName = "@lerna/otplease"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/otplease/-/otplease-6.0.1.tgz"; - sha512 = "RrP8GtfE9yz37GuuCFqddR3mVIQc1ulUpAaaDNK4AOTb7gM0aCsTN7V2gCGBk1zdIsBuvNvNqt5jpWm4U6/EAA=="; + url = "https://registry.npmjs.org/@lerna/otplease/-/otplease-6.4.1.tgz"; + sha512 = "ePUciFfFdythHNMp8FP5K15R/CoGzSLVniJdD50qm76c4ATXZHnGCW2PGwoeAZCy4QTzhlhdBq78uN0wAs75GA=="; }; }; - "@lerna/output-6.0.1" = { + "@lerna/output-6.4.1" = { name = "_at_lerna_slash_output"; packageName = "@lerna/output"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/output/-/output-6.0.1.tgz"; - sha512 = "4jZ3fgaCbnsTZ353/lXE/3w20Cge6G3iUoESVip+JE2yhZ8rWgPISG8RFR0YGEtSgq2yC9AgGnGlvmOnAc4SAQ=="; + url = "https://registry.npmjs.org/@lerna/output/-/output-6.4.1.tgz"; + sha512 = "A1yRLF0bO+lhbIkrryRd6hGSD0wnyS1rTPOWJhScO/Zyv8vIPWhd2fZCLR1gI2d/Kt05qmK3T/zETTwloK7Fww=="; }; }; - "@lerna/pack-directory-6.0.1" = { + "@lerna/pack-directory-6.4.1" = { name = "_at_lerna_slash_pack-directory"; packageName = "@lerna/pack-directory"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-6.0.1.tgz"; - sha512 = "vNgS5Rs7s6khOYuHE5nTds0VDfHBH8YNGvV1s0yGAg/Zkivi7bOTs8jDQFiYhQX3HOTC1/85BLhGQ3zcDHlrew=="; + url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-6.4.1.tgz"; + sha512 = "kBtDL9bPP72/Nl7Gqa2CA3Odb8CYY1EF2jt801f+B37TqRLf57UXQom7yF3PbWPCPmhoU+8Fc4RMpUwSbFC46Q=="; }; }; - "@lerna/package-6.0.1" = { + "@lerna/package-6.4.1" = { name = "_at_lerna_slash_package"; packageName = "@lerna/package"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package/-/package-6.0.1.tgz"; - sha512 = "vCwyiLVJ4K3SR6KZleglq1dUXIiYGmk3b+NrFWP/Z3dhVE0C+RqgxSsAS4aaUNMSO2KSI0dBdce7BT/D+FdpIQ=="; + url = "https://registry.npmjs.org/@lerna/package/-/package-6.4.1.tgz"; + sha512 = "TrOah58RnwS9R8d3+WgFFTu5lqgZs7M+e1dvcRga7oSJeKscqpEK57G0xspvF3ycjfXQwRMmEtwPmpkeEVLMzA=="; }; }; - "@lerna/package-graph-6.0.1" = { + "@lerna/package-graph-6.4.1" = { name = "_at_lerna_slash_package-graph"; packageName = "@lerna/package-graph"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-6.0.1.tgz"; - sha512 = "OMppRWpfSaI6HO/Tc5FVpNefgOsCc3/DzaMLme6QTTpbEwD3EhvQ3Xx0MgsGMPdmZhWp/WOoAJsVRnLa+l03gg=="; + url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-6.4.1.tgz"; + sha512 = "fQvc59stRYOqxT3Mn7g/yI9/Kw5XetJoKcW5l8XeqKqcTNDURqKnN0qaNBY6lTTLOe4cR7gfXF2l1u3HOz0qEg=="; }; }; - "@lerna/prerelease-id-from-version-6.0.1" = { + "@lerna/prerelease-id-from-version-6.4.1" = { name = "_at_lerna_slash_prerelease-id-from-version"; packageName = "@lerna/prerelease-id-from-version"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-6.0.1.tgz"; - sha512 = "aZBs/FinztKjNXlk0cW99FpABynZzZwlmJuW4h9nMrQPgWoaDAERfImbefIH/lcpxdRuuGtClyZUFBOSq8ppfg=="; + url = "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-6.4.1.tgz"; + sha512 = "uGicdMFrmfHXeC0FTosnUKRgUjrBJdZwrmw7ZWMb5DAJGOuTzrvJIcz5f0/eL3XqypC/7g+9DoTgKjX3hlxPZA=="; }; }; - "@lerna/profiler-6.0.1" = { + "@lerna/profiler-6.4.1" = { name = "_at_lerna_slash_profiler"; packageName = "@lerna/profiler"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/profiler/-/profiler-6.0.1.tgz"; - sha512 = "vZrgF5pDhYWY/Gx7MjtyOgTVMA6swDV2+xPZwkvRD1Z0XpWEIn5d79zRN/1SBpdMNozC7Lj++1oEbCGNWhy/ow=="; + url = "https://registry.npmjs.org/@lerna/profiler/-/profiler-6.4.1.tgz"; + sha512 = "dq2uQxcu0aq6eSoN+JwnvHoAnjtZAVngMvywz5bTAfzz/sSvIad1v8RCpJUMBQHxaPtbfiNvOIQgDZOmCBIM4g=="; }; }; - "@lerna/project-6.0.1" = { + "@lerna/project-6.4.1" = { name = "_at_lerna_slash_project"; packageName = "@lerna/project"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/project/-/project-6.0.1.tgz"; - sha512 = "/n2QuAEgImbwUqrJND15FxYu29p/mLTUpL/8cSg6IUlOQRFyXteESRyl8A2Ex7Wj00FMbtB13vgbmTdkTgKL0A=="; + url = "https://registry.npmjs.org/@lerna/project/-/project-6.4.1.tgz"; + sha512 = "BPFYr4A0mNZ2jZymlcwwh7PfIC+I6r52xgGtJ4KIrIOB6mVKo9u30dgYJbUQxmSuMRTOnX7PJZttQQzSda4gEg=="; }; }; - "@lerna/prompt-6.0.1" = { + "@lerna/prompt-6.4.1" = { name = "_at_lerna_slash_prompt"; packageName = "@lerna/prompt"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-6.0.1.tgz"; - sha512 = "faR7oVdHBO3QTJ6o9kUEDPpyjCftd/CCa1rAC6q8f3vlLfCPrTym0qT+DcOBFGpDQh4m2dmGfJZgpXIVi6bMbg=="; + url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-6.4.1.tgz"; + sha512 = "vMxCIgF9Vpe80PnargBGAdS/Ib58iYEcfkcXwo7mYBCxEVcaUJFKZ72FEW8rw+H5LkxBlzrBJyfKRoOe0ks9gQ=="; }; }; - "@lerna/publish-6.0.1" = { + "@lerna/publish-6.4.1" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-6.0.1.tgz"; - sha512 = "xIleRwCuPHtShNSPc6RDH33Z+EO1E4O0LOhPq5qTwanNPYh5eL6bDHBsox44BbMD9dhhI4PUrqIGTu3AoKdDxg=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-6.4.1.tgz"; + sha512 = "/D/AECpw2VNMa1Nh4g29ddYKRIqygEV1ftV8PYXVlHpqWN7VaKrcbRU6pn0ldgpFlMyPtESfv1zS32F5CQ944w=="; }; }; - "@lerna/pulse-till-done-6.0.1" = { + "@lerna/pulse-till-done-6.4.1" = { name = "_at_lerna_slash_pulse-till-done"; packageName = "@lerna/pulse-till-done"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-6.0.1.tgz"; - sha512 = "DK5Ylh/O7Vzn9ObEggvoHdLxc1hiXsDZ4fUvSmi50kc5QrMrk+xo6OyPgIaDBhYxj6lm3TQ1KkvWnRgiEynKAg=="; + url = "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-6.4.1.tgz"; + sha512 = "efAkOC1UuiyqYBfrmhDBL6ufYtnpSqAG+lT4d/yk3CzJEJKkoCwh2Hb692kqHHQ5F74Uusc8tcRB7GBcfNZRWA=="; }; }; - "@lerna/query-graph-6.0.1" = { + "@lerna/query-graph-6.4.1" = { name = "_at_lerna_slash_query-graph"; packageName = "@lerna/query-graph"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-6.0.1.tgz"; - sha512 = "X8Z63Ax5a9nXgNBG+IAXEdCL4MG88akr7L4mBvKiTPrK5VgP46YzuZSaSoPI8bU67MlWBkSYQWAJJ5t0HEtKTw=="; + url = "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-6.4.1.tgz"; + sha512 = "gBGZLgu2x6L4d4ZYDn4+d5rxT9RNBC+biOxi0QrbaIq83I+JpHVmFSmExXK3rcTritrQ3JT9NCqb+Yu9tL9adQ=="; }; }; - "@lerna/resolve-symlink-6.0.1" = { + "@lerna/resolve-symlink-6.4.1" = { name = "_at_lerna_slash_resolve-symlink"; packageName = "@lerna/resolve-symlink"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-6.0.1.tgz"; - sha512 = "btosycLN+2lpqou6pz0Oeq4XIKHDIn0NvdnuCBLxtuBOBNIkdlx5QWKCtZ31GYKbCUt55w1DSGL64kfVuejVQQ=="; + url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-6.4.1.tgz"; + sha512 = "gnqltcwhWVLUxCuwXWe/ch9WWTxXRI7F0ZvCtIgdfOpbosm3f1g27VO1LjXeJN2i6ks03qqMowqy4xB4uMR9IA=="; }; }; - "@lerna/rimraf-dir-6.0.1" = { + "@lerna/rimraf-dir-6.4.1" = { name = "_at_lerna_slash_rimraf-dir"; packageName = "@lerna/rimraf-dir"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-6.0.1.tgz"; - sha512 = "rBFkwrxEQWFfZV5IMiPfGVubOquvOTNsPJPUf5tZoPAqKHXVQi5iYZGB65VG8JA7eFenZxh5mVErX2gtWFh1Ew=="; + url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-6.4.1.tgz"; + sha512 = "5sDOmZmVj0iXIiEgdhCm0Prjg5q2SQQKtMd7ImimPtWKkV0IyJWxrepJFbeQoFj5xBQF7QB5jlVNEfQfKhD6pQ=="; }; }; - "@lerna/run-6.0.1" = { + "@lerna/run-6.4.1" = { name = "_at_lerna_slash_run"; packageName = "@lerna/run"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run/-/run-6.0.1.tgz"; - sha512 = "F1vvpaevsWCjaQs3NlBegH54izm3cO3Qbg/cRRzPZMK4Jo7gE1ddL7+zCIq0zGt6aeVqRGBOtUMk4SvNGkzI4w=="; + url = "https://registry.npmjs.org/@lerna/run/-/run-6.4.1.tgz"; + sha512 = "HRw7kS6KNqTxqntFiFXPEeBEct08NjnL6xKbbOV6pXXf+lXUQbJlF8S7t6UYqeWgTZ4iU9caIxtZIY+EpW93mQ=="; }; }; - "@lerna/run-lifecycle-6.0.1" = { + "@lerna/run-lifecycle-6.4.1" = { name = "_at_lerna_slash_run-lifecycle"; packageName = "@lerna/run-lifecycle"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-6.0.1.tgz"; - sha512 = "gC7rnV3mrgFFIM8GlHc3d22ovYHoExu9CuIAxN26CVrMq7iEYxWoxYvweqVANsCHR7CVbs+dsDx8/TP1pQG8wg=="; + url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-6.4.1.tgz"; + sha512 = "42VopI8NC8uVCZ3YPwbTycGVBSgukJltW5Saein0m7TIqFjwSfrcP0n7QJOr+WAu9uQkk+2kBstF5WmvKiqgEA=="; }; }; - "@lerna/run-topologically-6.0.1" = { + "@lerna/run-topologically-6.4.1" = { name = "_at_lerna_slash_run-topologically"; packageName = "@lerna/run-topologically"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-6.0.1.tgz"; - sha512 = "p4J9RvOUyDUjQ21tDh7Durci9YnuBu3T8WXD8xu5ZwcxVnawK1h5B8kP4V1R5L/jwNqkXsAnlLwikPVGQ5Iptw=="; + url = "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-6.4.1.tgz"; + sha512 = "gXlnAsYrjs6KIUGDnHM8M8nt30Amxq3r0lSCNAt+vEu2sMMEOh9lffGGaJobJZ4bdwoXnKay3uER/TU8E9owMw=="; }; }; - "@lerna/symlink-binary-6.0.1" = { + "@lerna/symlink-binary-6.4.1" = { name = "_at_lerna_slash_symlink-binary"; packageName = "@lerna/symlink-binary"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-6.0.1.tgz"; - sha512 = "TcwxDMgU9w+hGl0EeYihPytVRKV0KTeZZW4Bq6NEtjTCIIuKWxZjcY5ocxW22i6BClBvfFAJqkf+e+i3Nixlhg=="; + url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-6.4.1.tgz"; + sha512 = "poZX90VmXRjL/JTvxaUQPeMDxFUIQvhBkHnH+dwW0RjsHB/2Tu4QUAsE0OlFnlWQGsAtXF4FTtW8Xs57E/19Kw=="; }; }; - "@lerna/symlink-dependencies-6.0.1" = { + "@lerna/symlink-dependencies-6.4.1" = { name = "_at_lerna_slash_symlink-dependencies"; packageName = "@lerna/symlink-dependencies"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-6.0.1.tgz"; - sha512 = "ImyqjLjMBu0ORGO9gYHr9oDgN/5QeeGuELtYNweLS5vMNSH1dokQW9fqZSrgfCJPbxeCizBcDTi/Knqg17ebkA=="; + url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-6.4.1.tgz"; + sha512 = "43W2uLlpn3TTYuHVeO/2A6uiTZg6TOk/OSKi21ujD7IfVIYcRYCwCV+8LPP12R3rzyab0JWkWnhp80Z8A2Uykw=="; }; }; - "@lerna/temp-write-6.0.1" = { + "@lerna/temp-write-6.4.1" = { name = "_at_lerna_slash_temp-write"; packageName = "@lerna/temp-write"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/temp-write/-/temp-write-6.0.1.tgz"; - sha512 = "9eklYncDnwTnGF9o14GOrZU05ZK5n6/x5XYRQHbuLfK5T9pmOiUyl6sO1613cZygUMaWHHi7BLtBPiw2CklqXQ=="; + url = "https://registry.npmjs.org/@lerna/temp-write/-/temp-write-6.4.1.tgz"; + sha512 = "7uiGFVoTyos5xXbVQg4bG18qVEn9dFmboXCcHbMj5mc/+/QmU9QeNz/Cq36O5TY6gBbLnyj3lfL5PhzERWKMFg=="; }; }; - "@lerna/timer-6.0.1" = { + "@lerna/timer-6.4.1" = { name = "_at_lerna_slash_timer"; packageName = "@lerna/timer"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/timer/-/timer-6.0.1.tgz"; - sha512 = "FLoga8iprKmRkh9jO+LP4Bm7MZLO4wNHM4LML4Dlh9CPwcIOWTteI8wSgRXvEJpt33IRIoPOUnfL3iHh8WwaYA=="; + url = "https://registry.npmjs.org/@lerna/timer/-/timer-6.4.1.tgz"; + sha512 = "ogmjFTWwRvevZr76a2sAbhmu3Ut2x73nDIn0bcwZwZ3Qc3pHD8eITdjs/wIKkHse3J7l3TO5BFJPnrvDS7HLnw=="; }; }; - "@lerna/validation-error-6.0.1" = { + "@lerna/validation-error-6.4.1" = { name = "_at_lerna_slash_validation-error"; packageName = "@lerna/validation-error"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-6.0.1.tgz"; - sha512 = "kjAxfFY1pDltwoCTvMQCbnpBwMXBFuvE4hdi8qePhBQ1Lf0PlTOI4ZqMFIkaTud+oujzysDXraTJbYTjc+C+zw=="; + url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-6.4.1.tgz"; + sha512 = "fxfJvl3VgFd7eBfVMRX6Yal9omDLs2mcGKkNYeCEyt4Uwlz1B5tPAXyk/sNMfkKV2Aat/mlK5tnY13vUrMKkyA=="; }; }; - "@lerna/version-6.0.1" = { + "@lerna/version-6.4.1" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-6.0.1.tgz"; - sha512 = "d/addeHVsRFWx3fb/XZIh6f23KuEC9Fn3ytpaMzA8rlLF3Nob1opIR98ZfUz7Nf+skpIV1QiIbXdJTZzIKvd9g=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-6.4.1.tgz"; + sha512 = "1/krPq0PtEqDXtaaZsVuKev9pXJCkNC1vOo2qCcn6PBkODw/QTAvGcUi0I+BM2c//pdxge9/gfmbDo1lC8RtAQ=="; }; }; - "@lerna/write-log-file-6.0.1" = { + "@lerna/write-log-file-6.4.1" = { name = "_at_lerna_slash_write-log-file"; packageName = "@lerna/write-log-file"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-6.0.1.tgz"; - sha512 = "fJGDE8rlE35DwKSqV8M1VV2xw/vQlgwTwURjNOMvd1Ar23Aa9CkJC4XAwc9uUgIku34IsWUM8MNbw9ClSsJaqw=="; + url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-6.4.1.tgz"; + sha512 = "LE4fueQSDrQo76F4/gFXL0wnGhqdG7WHVH8D8TrKouF2Afl4NHltObCm4WsSMPjcfciVnZQFfx1ruxU4r/enHQ=="; }; }; "@lezer/common-0.15.12" = { @@ -7312,87 +7681,6 @@ let sha512 = "1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg=="; }; }; - "@mapbox/extent-0.4.0" = { - name = "_at_mapbox_slash_extent"; - packageName = "@mapbox/extent"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/extent/-/extent-0.4.0.tgz"; - sha512 = "MSoKw3qPceGuupn04sdaJrFeLKvcSETVLZCGS8JA9x6zXQL3FWiKaIXYIZEDXd5jpXpWlRxinCZIN49yRy0C9A=="; - }; - }; - "@mapbox/geojson-coords-0.0.2" = { - name = "_at_mapbox_slash_geojson-coords"; - packageName = "@mapbox/geojson-coords"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/geojson-coords/-/geojson-coords-0.0.2.tgz"; - sha512 = "YuVzpseee/P1T5BWyeVVPppyfmuXYHFwZHmybkqaMfu4BWlOf2cmMGKj2Rr92MwfSTOCSUA0PAsVGRG8akY0rg=="; - }; - }; - "@mapbox/geojson-extent-1.0.1" = { - name = "_at_mapbox_slash_geojson-extent"; - packageName = "@mapbox/geojson-extent"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/geojson-extent/-/geojson-extent-1.0.1.tgz"; - sha512 = "hh8LEO3djT4fqfr8sSC6wKt+p0TMiu+KOLMBUiFOyj+zGq7+IXwQGl0ppCVDkyzCewyd9LoGe9zAvDxXrLfhLw=="; - }; - }; - "@mapbox/geojson-normalize-0.0.1" = { - name = "_at_mapbox_slash_geojson-normalize"; - packageName = "@mapbox/geojson-normalize"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/geojson-normalize/-/geojson-normalize-0.0.1.tgz"; - sha512 = "82V7YHcle8lhgIGqEWwtXYN5cy0QM/OHq3ypGhQTbvHR57DF0vMHMjjVSQKFfVXBe/yWCBZTyOuzvK7DFFnx5Q=="; - }; - }; - "@mapbox/geojson-rewind-0.5.2" = { - name = "_at_mapbox_slash_geojson-rewind"; - packageName = "@mapbox/geojson-rewind"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz"; - sha512 = "tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA=="; - }; - }; - "@mapbox/geojson-types-1.0.2" = { - name = "_at_mapbox_slash_geojson-types"; - packageName = "@mapbox/geojson-types"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/geojson-types/-/geojson-types-1.0.2.tgz"; - sha512 = "e9EBqHHv3EORHrSfbR9DqecPNn+AmuAoQxV6aL8Xu30bJMJR1o8PZLZzpk1Wq7/NfCbuhmakHTPYRhoqLsXRnw=="; - }; - }; - "@mapbox/jsonlint-lines-primitives-2.0.2" = { - name = "_at_mapbox_slash_jsonlint-lines-primitives"; - packageName = "@mapbox/jsonlint-lines-primitives"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz"; - sha512 = "rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ=="; - }; - }; - "@mapbox/mapbox-gl-supported-1.5.0" = { - name = "_at_mapbox_slash_mapbox-gl-supported"; - packageName = "@mapbox/mapbox-gl-supported"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.5.0.tgz"; - sha512 = "/PT1P6DNf7vjEEiPkVIRJkvibbqWtqnyGaBz3nfRdcxclNSnSdaLU5tfAgcD7I8Yt5i+L19s406YLl1koLnLbg=="; - }; - }; - "@mapbox/mapbox-gl-supported-2.0.1" = { - name = "_at_mapbox_slash_mapbox-gl-supported"; - packageName = "@mapbox/mapbox-gl-supported"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.1.tgz"; - sha512 = "HP6XvfNIzfoMVfyGjBckjiAOQK9WfX0ywdLubuPMPv+Vqf5fj0uCbgBQYpiqcWZT6cbyyRnTSXDheT1ugvF6UQ=="; - }; - }; "@mapbox/node-pre-gyp-1.0.10" = { name = "_at_mapbox_slash_node-pre-gyp"; packageName = "@mapbox/node-pre-gyp"; @@ -7402,85 +7690,13 @@ let sha512 = "4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA=="; }; }; - "@mapbox/point-geometry-0.1.0" = { - name = "_at_mapbox_slash_point-geometry"; - packageName = "@mapbox/point-geometry"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz"; - sha512 = "6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ=="; - }; - }; - "@mapbox/tiny-sdf-1.2.5" = { - name = "_at_mapbox_slash_tiny-sdf"; - packageName = "@mapbox/tiny-sdf"; - version = "1.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-1.2.5.tgz"; - sha512 = "cD8A/zJlm6fdJOk6DqPUV8mcpyJkRz2x2R+/fYcWDYG3oWbG7/L7Yl/WqQ1VZCjnL9OTIMAn6c+BC5Eru4sQEw=="; - }; - }; - "@mapbox/tiny-sdf-2.0.5" = { - name = "_at_mapbox_slash_tiny-sdf"; - packageName = "@mapbox/tiny-sdf"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-2.0.5.tgz"; - sha512 = "OhXt2lS//WpLdkqrzo/KwB7SRD8AiNTFFzuo9n14IBupzIMa67yGItcK7I2W9D8Ghpa4T04Sw9FWsKCJG50Bxw=="; - }; - }; - "@mapbox/unitbezier-0.0.0" = { - name = "_at_mapbox_slash_unitbezier"; - packageName = "@mapbox/unitbezier"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz"; - sha512 = "HPnRdYO0WjFjRTSwO3frz1wKaU649OBFPX3Zo/2WZvuRi6zMiRGui8SnPQiQABgqCf8YikDe5t3HViTVw1WUzA=="; - }; - }; - "@mapbox/unitbezier-0.0.1" = { - name = "_at_mapbox_slash_unitbezier"; - packageName = "@mapbox/unitbezier"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.1.tgz"; - sha512 = "nMkuDXFv60aBr9soUG5q+GvZYL+2KZHVvsqFCzqnkGEf46U2fvmytHaEVc1/YZbiLn8X+eR3QzX1+dwDO1lxlw=="; - }; - }; - "@mapbox/vector-tile-1.3.1" = { - name = "_at_mapbox_slash_vector-tile"; - packageName = "@mapbox/vector-tile"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz"; - sha512 = "MCEddb8u44/xfQ3oD+Srl/tNcQoqTw3goGk2oLsrFxOTc3dUp+kAnby3PvAeeBYSMSjSPD1nd1AJA6W49WnoUw=="; - }; - }; - "@mapbox/whoots-js-3.1.0" = { - name = "_at_mapbox_slash_whoots-js"; - packageName = "@mapbox/whoots-js"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz"; - sha512 = "Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q=="; - }; - }; - "@mark.probst/typescript-json-schema-0.32.0" = { + "@mark.probst/typescript-json-schema-0.55.0" = { name = "_at_mark.probst_slash_typescript-json-schema"; packageName = "@mark.probst/typescript-json-schema"; - version = "0.32.0"; + version = "0.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mark.probst/typescript-json-schema/-/typescript-json-schema-0.32.0.tgz"; - sha512 = "OoD+5D7Mka80FIcmvPyuAKV7g5Of5S04R74S4DTAG8pr9REDWySUh9pOloro7SNFwWt/+2f90wyP+DtGHykVfg=="; - }; - }; - "@mark.probst/unicode-properties-1.1.0" = { - name = "_at_mark.probst_slash_unicode-properties"; - packageName = "@mark.probst/unicode-properties"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@mark.probst/unicode-properties/-/unicode-properties-1.1.0.tgz"; - sha512 = "7AQsO0hMmpqDledV7AhBuSYqYPFsKP9PaltMecX9nlnsyFxqtsqUg9/pvB2L/jxvskrDrNkdKYz2KTbQznCtng=="; + url = "https://registry.npmjs.org/@mark.probst/typescript-json-schema/-/typescript-json-schema-0.55.0.tgz"; + sha512 = "jI48mSnRgFQxXiE/UTUCVCpX8lK3wCFKLF1Ss2aEreboKNuLQGt3e0/YFqWVHe/WENxOaqiJvwOz+L/SrN2+qQ=="; }; }; "@mdi/font-6.5.95" = { @@ -7492,157 +7708,157 @@ let sha512 = "ES5rj6J39FUkHe/b3C9SJs8bqIungYhuU7rBINTBaHOv/Ce4RCb3Gw08CZVl32W33UEkgRkzyWaIedV4at+QHg=="; }; }; - "@mdn/browser-compat-data-5.2.6" = { + "@mdn/browser-compat-data-5.2.29" = { name = "_at_mdn_slash_browser-compat-data"; packageName = "@mdn/browser-compat-data"; - version = "5.2.6"; + version = "5.2.29"; src = fetchurl { - url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.2.6.tgz"; - sha512 = "KJfP6iTcVX+R5OSC4NOIF4V9fTyifcjwmdkOk7UzsaWxkF21rc6KhGlohqiSRVEynidGO1EEyyYf/PD3jsM1gA=="; + url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.2.29.tgz"; + sha512 = "bEBrkTWbDAs/PB4IdRg4CtU750oBRytXHK/wC2oIDkgKZqnt76nACSooQQuHF11mK5k43f/IgFUMO5t5quRPVA=="; }; }; - "@medable/mdctl-api-1.0.67" = { + "@medable/mdctl-api-1.0.68" = { name = "_at_medable_slash_mdctl-api"; packageName = "@medable/mdctl-api"; - version = "1.0.67"; + version = "1.0.68"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-api/-/mdctl-api-1.0.67.tgz"; - sha512 = "hQOK4tvxGMqoENVg6eSrqsyPldHRZ6LV5KCTGWfJ4gPXnn8snsYqs8PDRqReDpaOxlSI717xtYXKrGIzdYy52g=="; + url = "https://registry.npmjs.org/@medable/mdctl-api/-/mdctl-api-1.0.68.tgz"; + sha512 = "XQ0NM1IpYKYStn2I3o1KIiIoBU0iYr/DAV1XTLNmhYkMbXATlPCq7Bnw857xKnr5iaKQ5Wtx8xwI/W+1MH7ong=="; }; }; - "@medable/mdctl-api-driver-1.0.67" = { + "@medable/mdctl-api-driver-1.0.68" = { name = "_at_medable_slash_mdctl-api-driver"; packageName = "@medable/mdctl-api-driver"; - version = "1.0.67"; + version = "1.0.68"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-api-driver/-/mdctl-api-driver-1.0.67.tgz"; - sha512 = "xtkY6Z7YTY/B5GgRnfx3HApKen7ceIQVk8qDSCJCgaV32A3GCI+jWDet+driwUTOLnm9KnZXx/J8kioFasGG8w=="; + url = "https://registry.npmjs.org/@medable/mdctl-api-driver/-/mdctl-api-driver-1.0.68.tgz"; + sha512 = "qNhBzKujy7FR3CAzko2qJXk5DVrjZzyvHabaHaDZDK7qSoxXbzacTwDJg/pnC2hUTXS22TpJIDkzPHuufK5SIA=="; }; }; - "@medable/mdctl-axon-tools-1.0.67" = { + "@medable/mdctl-axon-tools-1.0.68" = { name = "_at_medable_slash_mdctl-axon-tools"; packageName = "@medable/mdctl-axon-tools"; - version = "1.0.67"; + version = "1.0.68"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-axon-tools/-/mdctl-axon-tools-1.0.67.tgz"; - sha512 = "uQr/zD6EoiiXh254a3mAZxAKHpavwdYuIxKTmIXcm1I1ajiLW742jfjcJqBcLAQhGSQu5ozPQywTxqRjJ945qA=="; + url = "https://registry.npmjs.org/@medable/mdctl-axon-tools/-/mdctl-axon-tools-1.0.68.tgz"; + sha512 = "2C6sn7kXck8A5GooUadNtcViA5C194rKXHh/odmRcw8MrCY+B6ei9QD+EnI/6BgIWcj4MZmHrvOfmmVqzzRc/Q=="; }; }; - "@medable/mdctl-core-1.0.67" = { + "@medable/mdctl-core-1.0.68" = { name = "_at_medable_slash_mdctl-core"; packageName = "@medable/mdctl-core"; - version = "1.0.67"; + version = "1.0.68"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-core/-/mdctl-core-1.0.67.tgz"; - sha512 = "tmNH4qFRuhFZV1YoCL9pi4ekRBsSI5fLwzOYgVyqvW5DXEuITnx0HBiJw2s4tnQQLIl5X6VeurPO3laAniebRQ=="; + url = "https://registry.npmjs.org/@medable/mdctl-core/-/mdctl-core-1.0.68.tgz"; + sha512 = "Zqu1aeGIkp8bzq/pBlANYEJTMkRE6RVkchvxGAI4P+pKtEDwFlud76ezzlwda6dkN9AvrVb0HWYqgIizTmztAw=="; }; }; - "@medable/mdctl-core-schemas-1.0.67" = { + "@medable/mdctl-core-schemas-1.0.68" = { name = "_at_medable_slash_mdctl-core-schemas"; packageName = "@medable/mdctl-core-schemas"; - version = "1.0.67"; + version = "1.0.68"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-core-schemas/-/mdctl-core-schemas-1.0.67.tgz"; - sha512 = "COQaa4qDIcL+gFLyjMxfAQYULS3G+xv+uxlRPWmSe7DDL9W4v1y2QI1uJ20Zy6hrvBIR8GAnK7tFs0DqTBo6cA=="; + url = "https://registry.npmjs.org/@medable/mdctl-core-schemas/-/mdctl-core-schemas-1.0.68.tgz"; + sha512 = "9vnNutnIWhSO4iInYsyfmcUDde+TkPYrFCvDarN25Mj7Xv+SQiOAwSDTB+KYSJD2Nz/SHL8WJeT5YAh1L66KHA=="; }; }; - "@medable/mdctl-core-utils-1.0.67" = { + "@medable/mdctl-core-utils-1.0.68" = { name = "_at_medable_slash_mdctl-core-utils"; packageName = "@medable/mdctl-core-utils"; - version = "1.0.67"; + version = "1.0.68"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-core-utils/-/mdctl-core-utils-1.0.67.tgz"; - sha512 = "KWrrNJ4EutLU7peCfT04TdVuNN8yPftTD4dEQc97NDpFyI9uEQ78nr5fdmMXhwxUG5ZNFRz+ujPIb+/dqAW6Bg=="; + url = "https://registry.npmjs.org/@medable/mdctl-core-utils/-/mdctl-core-utils-1.0.68.tgz"; + sha512 = "6Sy5H9mIwmfTKkfv6EH0O4lnsobRAMz/y8kWaRKwjMwQcARm8TTZKO4UCsZgK3Oph5/VqPYP1mP1YqUmKyoAqg=="; }; }; - "@medable/mdctl-credentials-provider-keychain-1.0.67" = { + "@medable/mdctl-credentials-provider-keychain-1.0.68" = { name = "_at_medable_slash_mdctl-credentials-provider-keychain"; packageName = "@medable/mdctl-credentials-provider-keychain"; - version = "1.0.67"; + version = "1.0.68"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-keychain/-/mdctl-credentials-provider-keychain-1.0.67.tgz"; - sha512 = "hs8o5YnlLeWPtrHsgyRWC/qywEEbw6Xs/DnilS6ZLAXZNE0o76tLKWWOmXbYOmaHJBONtsoS+F+hz0EezcKTfw=="; + url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-keychain/-/mdctl-credentials-provider-keychain-1.0.68.tgz"; + sha512 = "B+QCznxeZrZSZbAulbRLZIWVsLd1sFVMgNISW3b4l417ZAPYRzYOra36AMIJhbwE/jOE0fDSd00j7ymGJzrx+Q=="; }; }; - "@medable/mdctl-credentials-provider-pouchdb-1.0.67" = { + "@medable/mdctl-credentials-provider-pouchdb-1.0.68" = { name = "_at_medable_slash_mdctl-credentials-provider-pouchdb"; packageName = "@medable/mdctl-credentials-provider-pouchdb"; - version = "1.0.67"; + version = "1.0.68"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-pouchdb/-/mdctl-credentials-provider-pouchdb-1.0.67.tgz"; - sha512 = "o4uPvDaCJg80DSRgXXZVJxiPiucGv37vE6WV85EcYz6eZGU43p5H6ZpWOCUNHUnDSAVZsW3YvfMQQ8lIfYr2zQ=="; + url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-pouchdb/-/mdctl-credentials-provider-pouchdb-1.0.68.tgz"; + sha512 = "ohvFzZ6KiH/xlQ8Rc62DxTW62rhYEki4fqLAF668hQvz951YS9diB44TCGyuqcdojwJ2CH+RrbAwT52DEKJBIg=="; }; }; - "@medable/mdctl-docs-1.0.67" = { + "@medable/mdctl-docs-1.0.68" = { name = "_at_medable_slash_mdctl-docs"; packageName = "@medable/mdctl-docs"; - version = "1.0.67"; + version = "1.0.68"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-docs/-/mdctl-docs-1.0.67.tgz"; - sha512 = "NEAHrDu5o/P38jIMRxZv7QaFRQkuIJUQOhvr9ci7NUmaH7fkIEcVpzipR59lxGXzsGnFtjMqpQfsWtIlg+0U+w=="; + url = "https://registry.npmjs.org/@medable/mdctl-docs/-/mdctl-docs-1.0.68.tgz"; + sha512 = "jIYBRpXnGNz/k93L4U1+fz3aov+lf/eszJt1TTsnarg2yWb5BUWbsILbP48StX/ZN2RybSEiCseUePWnlhHDLg=="; }; }; - "@medable/mdctl-export-adapter-console-1.0.67" = { + "@medable/mdctl-export-adapter-console-1.0.68" = { name = "_at_medable_slash_mdctl-export-adapter-console"; packageName = "@medable/mdctl-export-adapter-console"; - version = "1.0.67"; + version = "1.0.68"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-console/-/mdctl-export-adapter-console-1.0.67.tgz"; - sha512 = "9xBn1tPGspPHm8ouIK8OTa2uLwbeIMp9fLNeg+VdFcRAwxKpCQP5m0jeRaLtsm1tgVQh97R4n+muQIZBwBD70g=="; + url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-console/-/mdctl-export-adapter-console-1.0.68.tgz"; + sha512 = "K1LIGRL7OLbY9+cqlUbK4w63TSwEaXMd4VrYo8H7mh8PytpTOoGHyessWCfGizDzpfBeI/c8zzN8ZDvO+u3cKA=="; }; }; - "@medable/mdctl-export-adapter-tree-1.0.67" = { + "@medable/mdctl-export-adapter-tree-1.0.68" = { name = "_at_medable_slash_mdctl-export-adapter-tree"; packageName = "@medable/mdctl-export-adapter-tree"; - version = "1.0.67"; + version = "1.0.68"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-tree/-/mdctl-export-adapter-tree-1.0.67.tgz"; - sha512 = "hFxaE8Br9EE61/Uyrvrb4tiFcW+CAEk5+ICqCYu0Gu4WO/CLVvHS9vakdlV4gL9HJMm/nNKYyDwdZI1yPLOiPg=="; + url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-tree/-/mdctl-export-adapter-tree-1.0.68.tgz"; + sha512 = "jbuVDVn86+/pq9h9hdfa/jtNUXZdazr9rdCWOjLbi/0ZVkk484vEFEoqw6V7abfSI82PI/J+xzMiEnf9us0/9Q=="; }; }; - "@medable/mdctl-import-adapter-1.0.67" = { + "@medable/mdctl-import-adapter-1.0.68" = { name = "_at_medable_slash_mdctl-import-adapter"; packageName = "@medable/mdctl-import-adapter"; - version = "1.0.67"; + version = "1.0.68"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-import-adapter/-/mdctl-import-adapter-1.0.67.tgz"; - sha512 = "tWuRXRgE1SKySMTBiz3yb6NYAmmaVQ+nM6vNyzitho8uXImK5hXHZm0vT9rz6DmipYBB7xI5y3eFDDbxHNiswQ=="; + url = "https://registry.npmjs.org/@medable/mdctl-import-adapter/-/mdctl-import-adapter-1.0.68.tgz"; + sha512 = "vQ+6dW8o9pykza+ExJodwaMigUudcj2eCS3rF4Fx4m0k18dazuaBqg46WVtjY4M/9IEktR3A9GM8vUlbCjsqLw=="; }; }; - "@medable/mdctl-manifest-1.0.67" = { + "@medable/mdctl-manifest-1.0.68" = { name = "_at_medable_slash_mdctl-manifest"; packageName = "@medable/mdctl-manifest"; - version = "1.0.67"; + version = "1.0.68"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-manifest/-/mdctl-manifest-1.0.67.tgz"; - sha512 = "Hr++Ms9o6XnnA71YEeF+e0jC8GAvmPmh96yFI/wkOuPPMD2iNtnB2VMZNglHLTLQoznJUTN/ay2SJpeTvKyucw=="; + url = "https://registry.npmjs.org/@medable/mdctl-manifest/-/mdctl-manifest-1.0.68.tgz"; + sha512 = "dRmQurCFESPHt5jJvrVLl0lYskKRktCcwaMt8LW7MOfvbOLH00HScpcZGodX48ys4iJlteMkaheu/c8cD7bIZA=="; }; }; - "@medable/mdctl-node-utils-1.0.67" = { + "@medable/mdctl-node-utils-1.0.68" = { name = "_at_medable_slash_mdctl-node-utils"; packageName = "@medable/mdctl-node-utils"; - version = "1.0.67"; + version = "1.0.68"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-node-utils/-/mdctl-node-utils-1.0.67.tgz"; - sha512 = "RYO+kY4L7vfDPA4slDLqUWlGoHeKM6z/1gJTJPy3Q4ydELFbZVbexeY0bJIDRKiw0Z1XgN3g/gMvCagZb+sePw=="; + url = "https://registry.npmjs.org/@medable/mdctl-node-utils/-/mdctl-node-utils-1.0.68.tgz"; + sha512 = "yYzGJFgd4mahGZ5cwFOkYEwUdAzyB7CMj3mYzS4dXWAlYORQHIcD7kIHGh+RC0QzPoSQAT5TMmTiicFeMwvSrQ=="; }; }; - "@medable/mdctl-sandbox-1.0.67" = { + "@medable/mdctl-sandbox-1.0.68" = { name = "_at_medable_slash_mdctl-sandbox"; packageName = "@medable/mdctl-sandbox"; - version = "1.0.67"; + version = "1.0.68"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-sandbox/-/mdctl-sandbox-1.0.67.tgz"; - sha512 = "0ANnrJUsBEay0Z6kdBdgL/mobXIhnTgMEuCK2y+StlW6D60MX4yNYnZN6+B8umhKtrYa9yVzOxQQpGb/qMaFEQ=="; + url = "https://registry.npmjs.org/@medable/mdctl-sandbox/-/mdctl-sandbox-1.0.68.tgz"; + sha512 = "2Jwk4v9CFGC9iXzOrP1BDHL1yAySjpgtIPjnTg1TlhUMEpJIEFA0ezFRIJTYGFbRx1wvF1FAH8GE+0G/gEgVeA=="; }; }; - "@medable/mdctl-secrets-1.0.67" = { + "@medable/mdctl-secrets-1.0.68" = { name = "_at_medable_slash_mdctl-secrets"; packageName = "@medable/mdctl-secrets"; - version = "1.0.67"; + version = "1.0.68"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-secrets/-/mdctl-secrets-1.0.67.tgz"; - sha512 = "0FQ73UQCI4HSRIX7rZ+BMmKisua4hPlVTk1a+Mr2p5CLN14lshfShIRN8LUc722Oy0xz/e96oBNnGdNxeo92Ug=="; + url = "https://registry.npmjs.org/@medable/mdctl-secrets/-/mdctl-secrets-1.0.68.tgz"; + sha512 = "2uD8pHWjV1tWeFpwkzHb970Xf2yhO4e217umCd+KO4klzEgqk7/7YteGOOewDwHo6ICyySek3+bdwtGC6H4Isg=="; }; }; "@medv/blessed-2.0.1" = { @@ -7654,6 +7870,15 @@ let sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q=="; }; }; + "@microsoft/applicationinsights-web-snippet-1.0.1" = { + name = "_at_microsoft_slash_applicationinsights-web-snippet"; + packageName = "@microsoft/applicationinsights-web-snippet"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@microsoft/applicationinsights-web-snippet/-/applicationinsights-web-snippet-1.0.1.tgz"; + sha512 = "2IHAOaLauc8qaAitvWS+U931T+ze+7MNWrDHY47IENP5y2UA0vqJDu67kWZDdpCN1fFC77sfgfB+HV7SrKshnQ=="; + }; + }; "@microsoft/fetch-event-source-2.0.1" = { name = "_at_microsoft_slash_fetch-event-source"; packageName = "@microsoft/fetch-event-source"; @@ -7672,175 +7897,184 @@ let sha512 = "W+IzEBw8a6LOOfRJM02dTT7BDZijxm+Z7lhtOAz1+y9vQm1Kdz9jlAO+qCEKsfxtUOmKilW8DIRqFw2aUgKeGg=="; }; }; - "@miniflare/cache-2.10.0" = { + "@microsoft/rush-lib-5.89.1" = { + name = "_at_microsoft_slash_rush-lib"; + packageName = "@microsoft/rush-lib"; + version = "5.89.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.89.1.tgz"; + sha512 = "yOzZ6LY0OkAp9pUB3mVA8wjWsQ1bnRRrBYpmho5/Cy3TM6cUgjdPUhEzpx4THbu8lcYtdvJ10Ivki4V1rI6Qdg=="; + }; + }; + "@miniflare/cache-2.11.0" = { name = "_at_miniflare_slash_cache"; packageName = "@miniflare/cache"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/cache/-/cache-2.10.0.tgz"; - sha512 = "nzEqFVPnD7Yf0HMDv7gCPpf4NSXfjhc+zg3gSwUS4Dad5bWV10B1ujTZW6HxQulW3CBHIg616mTjXIiaimVuEQ=="; + url = "https://registry.npmjs.org/@miniflare/cache/-/cache-2.11.0.tgz"; + sha512 = "L/kc9AzidPwFuk2fwHpAEePi0kNBk6FWUq3ln+9beRCDrPEpfVrDRFpNleF1NFZz5//oeVMuo8F0IVUQGzR7+Q=="; }; }; - "@miniflare/cli-parser-2.10.0" = { + "@miniflare/cli-parser-2.11.0" = { name = "_at_miniflare_slash_cli-parser"; packageName = "@miniflare/cli-parser"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/cli-parser/-/cli-parser-2.10.0.tgz"; - sha512 = "NAiCtqlHTUKCmV+Jl9af+ixGmMhiGhIyIfr/vCdbismNEBxEsrQGg3sQYTNfvCkdHtODurQqayQreFq21OuEow=="; + url = "https://registry.npmjs.org/@miniflare/cli-parser/-/cli-parser-2.11.0.tgz"; + sha512 = "JUmyRzEGAS6CouvXJwBh8p44onfw3KRpfq5JGXEuHModOGjTp6li7PQyCTNPV2Hv/7StAXWnTFGXeAqyDHuTig=="; }; }; - "@miniflare/core-2.10.0" = { + "@miniflare/core-2.11.0" = { name = "_at_miniflare_slash_core"; packageName = "@miniflare/core"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/core/-/core-2.10.0.tgz"; - sha512 = "Jx1M5oXQua0jzsJVdZSq07baVRmGC/6JkglrPQGAlZ7gQ1sunVZzq9fjxFqj0bqfEuYS0Wy6+lvK4rOAHISIjw=="; + url = "https://registry.npmjs.org/@miniflare/core/-/core-2.11.0.tgz"; + sha512 = "UFMFiCG0co36VpZkgFrSBnrxo71uf1x+cjlzzJi3khmMyDlnLu4RuIQsAqvKbYom6fi3G9Q8lTgM7JuOXFyjhw=="; }; }; - "@miniflare/d1-2.10.0" = { + "@miniflare/d1-2.11.0" = { name = "_at_miniflare_slash_d1"; packageName = "@miniflare/d1"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/d1/-/d1-2.10.0.tgz"; - sha512 = "mOYZSmpTthH0tmFTQ+O9G0Q+iDAd7oiUtoIBianlKa9QiqYAoO7EBUPy6kUgDHXapOcN5Ri1u3J5UTpxXvw3qg=="; + url = "https://registry.npmjs.org/@miniflare/d1/-/d1-2.11.0.tgz"; + sha512 = "aDdBVQZ2C0Zs3+Y9ZbRctmuQxozPfpumwJ/6NG6fBadANvune/hW7ddEoxyteIEU9W3IgzVj8s4by4VvasX90A=="; }; }; - "@miniflare/durable-objects-2.10.0" = { + "@miniflare/durable-objects-2.11.0" = { name = "_at_miniflare_slash_durable-objects"; packageName = "@miniflare/durable-objects"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/durable-objects/-/durable-objects-2.10.0.tgz"; - sha512 = "gU45f52gveFtCasm0ixYnt0mHI1lHrPomtmF+89oZGKBzOqUfO5diDs6wmoRSnovOWZCwtmwQGRoorAQN7AmoA=="; + url = "https://registry.npmjs.org/@miniflare/durable-objects/-/durable-objects-2.11.0.tgz"; + sha512 = "0cKJaMgraTEU1b4kqK8cjD2oTeOjA6QU3Y+lWiZT/k1PMHZULovrSFnjii7qZ8npf4VHSIN6XYPxhyxRyEM65Q=="; }; }; - "@miniflare/html-rewriter-2.10.0" = { + "@miniflare/html-rewriter-2.11.0" = { name = "_at_miniflare_slash_html-rewriter"; packageName = "@miniflare/html-rewriter"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/html-rewriter/-/html-rewriter-2.10.0.tgz"; - sha512 = "hCdG99L8+Ros4dn3B5H37PlQPBH0859EoRslzNTd4jzGIkwdiawpJvrvesL8056GjbUjeJN1zh7OPBRuMgyGLw=="; + url = "https://registry.npmjs.org/@miniflare/html-rewriter/-/html-rewriter-2.11.0.tgz"; + sha512 = "olTqmuYTHnoTNtiA0vjQ/ixRfbwgPzDrAUbtXDCYW45VFbHfDVJrJGZX3Jg0HpSlxy86Zclle1SUxGbVDzxsBg=="; }; }; - "@miniflare/http-server-2.10.0" = { + "@miniflare/http-server-2.11.0" = { name = "_at_miniflare_slash_http-server"; packageName = "@miniflare/http-server"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/http-server/-/http-server-2.10.0.tgz"; - sha512 = "cm6hwkONucll93yoY8dteMp//Knvmb7n6zAgeHrtuNYKn//lAL6bRY//VLTttrMmfWxZFi1C7WpOeCv8Mn6/ug=="; + url = "https://registry.npmjs.org/@miniflare/http-server/-/http-server-2.11.0.tgz"; + sha512 = "sMLcrDFzqqAvnQmAUH0hRTo8sBjW79VZYfnIH5FAGSGcKX6kdAGs9RStdYZ4CftQCBAEQScX0KBsMx5FwJRe9Q=="; }; }; - "@miniflare/kv-2.10.0" = { + "@miniflare/kv-2.11.0" = { name = "_at_miniflare_slash_kv"; packageName = "@miniflare/kv"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/kv/-/kv-2.10.0.tgz"; - sha512 = "3+u1lO77FnlS0lQ6b1VgM1E/ZgQ/zy/FU+SdBG5LUOIiv3x522VYHOApeJLnSEo0KtZUB22Ni0fWQM6DgpaREg=="; + url = "https://registry.npmjs.org/@miniflare/kv/-/kv-2.11.0.tgz"; + sha512 = "3m9dL2HBBN170V1JvwjjucR5zl4G3mlcsV6C1E7A2wLl2Z2TWvIx/tSY9hrhkD96dFnejwJ9qmPMbXMMuynhjg=="; }; }; - "@miniflare/queues-2.10.0" = { + "@miniflare/queues-2.11.0" = { name = "_at_miniflare_slash_queues"; packageName = "@miniflare/queues"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/queues/-/queues-2.10.0.tgz"; - sha512 = "WKdO6qI9rfS96KlCjazzPFf+qj6DPov4vONyf18+jzbRjRJh/xwWSk1/1h5A+gDPwVNG8TsNRPh9DW5OKBGNjw=="; + url = "https://registry.npmjs.org/@miniflare/queues/-/queues-2.11.0.tgz"; + sha512 = "fLHjdrNLKhn0LZM/aii/9GsAttFd+lWlGzK8HOg1R0vhfKBwEub4zntjMmOfFbDm1ntc21tdMK7n3ldUphwh5w=="; }; }; - "@miniflare/r2-2.10.0" = { + "@miniflare/r2-2.11.0" = { name = "_at_miniflare_slash_r2"; packageName = "@miniflare/r2"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/r2/-/r2-2.10.0.tgz"; - sha512 = "uC1CCWbwM1t8DdpZgrveg6+CkZLfTq+wUMqs20BC5rCT8u8UyRv6ZVRQ7pTPiswLyt1oYDTXsZJK7tjV0U0zew=="; + url = "https://registry.npmjs.org/@miniflare/r2/-/r2-2.11.0.tgz"; + sha512 = "MKuyJ/gGNsK3eWbGdygvozqcyaZhM3C6NGHvoaZwH503dwN569j5DpatTWiHGFeDeSu64VqcIsGehz05GDUaag=="; }; }; - "@miniflare/runner-vm-2.10.0" = { + "@miniflare/runner-vm-2.11.0" = { name = "_at_miniflare_slash_runner-vm"; packageName = "@miniflare/runner-vm"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/runner-vm/-/runner-vm-2.10.0.tgz"; - sha512 = "oTsHitQdQ1B1kT3G/6n9AEXsMd/sT1D8tLGzc7Xr79ZrxYxwRO0ATF3cdkxk4dUjUqg/RUqvOJV4YjJGyqvctg=="; + url = "https://registry.npmjs.org/@miniflare/runner-vm/-/runner-vm-2.11.0.tgz"; + sha512 = "bkVSuvCf5+VylqN8lTiLxIYqYcKFbl+BywZGwGQndPC/3wh42J00mM0jw4hRbvXgwuBhlUyCVpEXtYlftFFT/g=="; }; }; - "@miniflare/scheduler-2.10.0" = { + "@miniflare/scheduler-2.11.0" = { name = "_at_miniflare_slash_scheduler"; packageName = "@miniflare/scheduler"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/scheduler/-/scheduler-2.10.0.tgz"; - sha512 = "eGt2cZFE/yo585nT8xINQwdbTotZfeRIh6FUWmZkbva1i5SW0zTiOojr5a95vAGBF3TzwWGsUuzJpLhBB69a/g=="; + url = "https://registry.npmjs.org/@miniflare/scheduler/-/scheduler-2.11.0.tgz"; + sha512 = "DPdzINhdWeS99eIicGoluMsD4pLTTAWNQbgCv3CTwgdKA3dxdvMSCkNqZzQLiALzvk9+rSfj46FlH++HE7o7/w=="; }; }; - "@miniflare/shared-2.10.0" = { + "@miniflare/shared-2.11.0" = { name = "_at_miniflare_slash_shared"; packageName = "@miniflare/shared"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/shared/-/shared-2.10.0.tgz"; - sha512 = "GDSweEhJ3nNtStGm6taZGUNytM0QTQ/sjZSedAKyF1/aHRaZUcD9cuKAMgIbSpKfvgGdLMNS7Bhd8jb249TO7g=="; + url = "https://registry.npmjs.org/@miniflare/shared/-/shared-2.11.0.tgz"; + sha512 = "fWMqq3ZkWAg+k7CnyzMV/rZHugwn+/JxvVzCxrtvxzwotTN547THlOxgZe8JAP23U9BiTxOfpTfnLvFEjAmegw=="; }; }; - "@miniflare/sites-2.10.0" = { + "@miniflare/sites-2.11.0" = { name = "_at_miniflare_slash_sites"; packageName = "@miniflare/sites"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/sites/-/sites-2.10.0.tgz"; - sha512 = "1NVAT6+JS2OubL+pOOR5E/6MMddxQHWMi/yIDSumyyfXmj7Sm7n5dE1FvNPetggMP4f8+AjoyT9AYvdd1wkspQ=="; + url = "https://registry.npmjs.org/@miniflare/sites/-/sites-2.11.0.tgz"; + sha512 = "qbefKdWZUJgsdLf+kCw03sn3h/92LZgJAbkOpP6bCrfWkXlJ37EQXO4KWdhn4Ghc7A6GwU1s1I/mdB64B3AewQ=="; }; }; - "@miniflare/storage-file-2.10.0" = { + "@miniflare/storage-file-2.11.0" = { name = "_at_miniflare_slash_storage-file"; packageName = "@miniflare/storage-file"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/storage-file/-/storage-file-2.10.0.tgz"; - sha512 = "K/cRIWiTl4+Z+VO6tl4VfuYXA3NLJgvGPV+BCRYD7uTKuPYHqDMErtD1BI1I7nc3WJhwIXfzJrAR3XXhSKKWQQ=="; + url = "https://registry.npmjs.org/@miniflare/storage-file/-/storage-file-2.11.0.tgz"; + sha512 = "beWF/lTX74x7AiaSB+xQxywPSNdhtEKvqDkRui8eOJ5kqN2o4UaleLKQGgqmCw3WyHRIsckV7If1qpbNiLtWMw=="; }; }; - "@miniflare/storage-memory-2.10.0" = { + "@miniflare/storage-memory-2.11.0" = { name = "_at_miniflare_slash_storage-memory"; packageName = "@miniflare/storage-memory"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/storage-memory/-/storage-memory-2.10.0.tgz"; - sha512 = "ZATU+qZtJ9yG0umgTrOEUi9SU//YyDb8nYXMgqT4JHODYA3RTz1SyyiQSOOz589upJPdu1LN+0j8W24WGRwwxQ=="; + url = "https://registry.npmjs.org/@miniflare/storage-memory/-/storage-memory-2.11.0.tgz"; + sha512 = "s0AhPww7fq/Jz80NbPb+ffhcVRKnfPi7H1dHTRTre2Ud23EVJjAWl2gat42x8NOT/Fu3/o/7A72DWQQJqfO98A=="; }; }; - "@miniflare/storage-redis-2.10.0" = { + "@miniflare/storage-redis-2.11.0" = { name = "_at_miniflare_slash_storage-redis"; packageName = "@miniflare/storage-redis"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/storage-redis/-/storage-redis-2.10.0.tgz"; - sha512 = "Fayi8gf6eFujSO+HpB+PDfZDG2OCksqfgxbQaKo39Q7ltVNY7awY9yZO/gnSUvfByGm/JzKhjKvYc2yXnjn62w=="; + url = "https://registry.npmjs.org/@miniflare/storage-redis/-/storage-redis-2.11.0.tgz"; + sha512 = "cY/ZehxwuhGON0jjlkyKzNcSxffSJ6fJw0EkXalmrwcL3PJCpTLuBogqeZkrSOu2xSr2wk4nC45bt2loka2HoA=="; }; }; - "@miniflare/watcher-2.10.0" = { + "@miniflare/watcher-2.11.0" = { name = "_at_miniflare_slash_watcher"; packageName = "@miniflare/watcher"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/watcher/-/watcher-2.10.0.tgz"; - sha512 = "X9CFYYyszfSYDzs07KhbWC2i08Dpyh3D60fPonYZcoZAfa5h9eATHUdRGvNCdax7awYp4b8bvU8upAI//OPlMg=="; + url = "https://registry.npmjs.org/@miniflare/watcher/-/watcher-2.11.0.tgz"; + sha512 = "RUfjz2iYcsQXLcGySemJl98CJ2iierbWsPGWZhIVZI+NNhROkEy77g/Q+lvP2ATwexG3/dUSfdJ3P8aH+sI4Ig=="; }; }; - "@miniflare/web-sockets-2.10.0" = { + "@miniflare/web-sockets-2.11.0" = { name = "_at_miniflare_slash_web-sockets"; packageName = "@miniflare/web-sockets"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/web-sockets/-/web-sockets-2.10.0.tgz"; - sha512 = "W+PrapdQqNEEFeD+amENgPQWcETGDp7OEh6JAoSzCRhHA0OoMe8DG0xb5a5+2FjGW/J7FFKsv84wkURpmFT4dQ=="; + url = "https://registry.npmjs.org/@miniflare/web-sockets/-/web-sockets-2.11.0.tgz"; + sha512 = "NC8RKrmxrO0hZmwpzn5g4hPGA2VblnFTIBobmWoxuK95eW49zfs7dtE/PyFs+blsGv3CjTIjHVSQ782K+C6HFA=="; }; }; "@mischnic/json-sourcemap-0.1.0" = { @@ -7897,67 +8131,67 @@ let sha512 = "h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ=="; }; }; - "@msgpackr-extract/msgpackr-extract-darwin-arm64-2.1.2" = { + "@msgpackr-extract/msgpackr-extract-darwin-arm64-2.2.0" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-darwin-arm64"; packageName = "@msgpackr-extract/msgpackr-extract-darwin-arm64"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.1.2.tgz"; - sha512 = "TyVLn3S/+ikMDsh0gbKv2YydKClN8HaJDDpONlaZR+LVJmsxLFUgA+O7zu59h9+f9gX1aj/ahw9wqa6rosmrYQ=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.2.0.tgz"; + sha512 = "Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ=="; }; }; - "@msgpackr-extract/msgpackr-extract-darwin-x64-2.1.2" = { + "@msgpackr-extract/msgpackr-extract-darwin-x64-2.2.0" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-darwin-x64"; packageName = "@msgpackr-extract/msgpackr-extract-darwin-x64"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-2.1.2.tgz"; - sha512 = "YPXtcVkhmVNoMGlqp81ZHW4dMxK09msWgnxtsDpSiZwTzUBG2N+No2bsr7WMtBKCVJMSD6mbAl7YhKUqkp/Few=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-2.2.0.tgz"; + sha512 = "vq0tT8sjZsy4JdSqmadWVw6f66UXqUCabLmUVHZwUFzMgtgoIIQjT4VVRHKvlof3P/dMCkbMJ5hB1oJ9OWHaaw=="; }; }; - "@msgpackr-extract/msgpackr-extract-linux-arm-2.1.2" = { + "@msgpackr-extract/msgpackr-extract-linux-arm-2.2.0" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-linux-arm"; packageName = "@msgpackr-extract/msgpackr-extract-linux-arm"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-2.1.2.tgz"; - sha512 = "42R4MAFeIeNn+L98qwxAt360bwzX2Kf0ZQkBBucJ2Ircza3asoY4CDbgiu9VWklq8gWJVSJSJBwDI+c/THiWkA=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-2.2.0.tgz"; + sha512 = "SaJ3Qq4lX9Syd2xEo9u3qPxi/OB+5JO/ngJKK97XDpa1C587H9EWYO6KD8995DAjSinWvdHKRrCOXVUC5fvGOg=="; }; }; - "@msgpackr-extract/msgpackr-extract-linux-arm64-2.1.2" = { + "@msgpackr-extract/msgpackr-extract-linux-arm64-2.2.0" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-linux-arm64"; packageName = "@msgpackr-extract/msgpackr-extract-linux-arm64"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-2.1.2.tgz"; - sha512 = "vHZ2JiOWF2+DN9lzltGbhtQNzDo8fKFGrf37UJrgqxU0yvtERrzUugnfnX1wmVfFhSsF8OxrfqiNOUc5hko1Zg=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-2.2.0.tgz"; + sha512 = "hlxxLdRmPyq16QCutUtP8Tm6RDWcyaLsRssaHROatgnkOxdleMTgetf9JsdncL8vLh7FVy/RN9i3XR5dnb9cRA=="; }; }; - "@msgpackr-extract/msgpackr-extract-linux-x64-2.1.2" = { + "@msgpackr-extract/msgpackr-extract-linux-x64-2.2.0" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-linux-x64"; packageName = "@msgpackr-extract/msgpackr-extract-linux-x64"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-2.1.2.tgz"; - sha512 = "RjRoRxg7Q3kPAdUSC5EUUPlwfMkIVhmaRTIe+cqHbKrGZ4M6TyCA/b5qMaukQ/1CHWrqYY2FbKOAU8Hg0pQFzg=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-2.2.0.tgz"; + sha512 = "94y5PJrSOqUNcFKmOl7z319FelCLAE0rz/jPCWS+UtdMZvpa4jrQd+cJPQCLp2Fes1yAW/YUQj/Di6YVT3c3Iw=="; }; }; - "@msgpackr-extract/msgpackr-extract-win32-x64-2.1.2" = { + "@msgpackr-extract/msgpackr-extract-win32-x64-2.2.0" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-win32-x64"; packageName = "@msgpackr-extract/msgpackr-extract-win32-x64"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.1.2.tgz"; - sha512 = "rIZVR48zA8hGkHIK7ED6+ZiXsjRCcAVBJbm8o89OKAMTmEAQ2QvoOxoiu3w2isAaWwzgtQIOFIqHwvZDyLKCvw=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.2.0.tgz"; + sha512 = "XrC0JzsqQSvOyM3t04FMLO6z5gCuhPE6k4FXuLK5xf52ZbdvcFe1yBmo7meCew9B8G2f0T9iu9t3kfTYRYROgA=="; }; }; - "@nestjs/schematics-9.0.3" = { + "@nestjs/schematics-9.0.4" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "9.0.3"; + version = "9.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-9.0.3.tgz"; - sha512 = "kZrU/lrpVd2cnK8I3ibDb3Wi1ppl3wX3U3lVWoL+DzRRoezWKkh8upEL4q0koKmuXnsmLiu3UPxFeMOrJV7TSA=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-9.0.4.tgz"; + sha512 = "egurCfAc4e5i1r2TmeAF0UrOKejFmT5oTdv4b7HcOVPupc3QGU7CbEfGleL3mkM5AjrixTQeMxU9bJ00ttAbGg=="; }; }; "@netflix/nerror-1.1.3" = { @@ -7969,15 +8203,6 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" = { - name = "_at_nicolo-ribaudo_slash_eslint-scope-5-internals"; - packageName = "@nicolo-ribaudo/eslint-scope-5-internals"; - version = "5.1.1-v1"; - src = fetchurl { - url = "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz"; - sha512 = "54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg=="; - }; - }; "@node-ipc/js-queue-2.0.3" = { name = "_at_node-ipc_slash_js-queue"; packageName = "@node-ipc/js-queue"; @@ -8041,130 +8266,130 @@ let sha512 = "zhxmFk48QEC4coBN0G0JDHt727+BlZS2QZarWs9hLeNDBdhjlU58RY0lhDgqODu/Z3JvBmIdPhCtDcvHpe4zmw=="; }; }; - "@node-rs/crc32-1.5.1" = { + "@node-rs/crc32-1.6.0" = { name = "_at_node-rs_slash_crc32"; packageName = "@node-rs/crc32"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32/-/crc32-1.5.1.tgz"; - sha512 = "hq+gKqI4nmPwTVumCoknw3JyWzYCcwjIVOVAtdQlhueqqkvLLxXueBfA4e/6hAZwZhrGbvlccuKCil+q8yeLEw=="; + url = "https://registry.npmjs.org/@node-rs/crc32/-/crc32-1.6.0.tgz"; + sha512 = "B21ivhDp8IKhEaxOZ/H3gdtDVyFHmnHudfGMeTysLj2arRpntCIoxyL0pMXz7g4kf6FupzvNESHb8557LvCWHA=="; }; }; - "@node-rs/crc32-android-arm-eabi-1.5.1" = { + "@node-rs/crc32-android-arm-eabi-1.6.0" = { name = "_at_node-rs_slash_crc32-android-arm-eabi"; packageName = "@node-rs/crc32-android-arm-eabi"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-android-arm-eabi/-/crc32-android-arm-eabi-1.5.1.tgz"; - sha512 = "F1yUl/6arGr+zG0bxvAaJ39M15E8X7PkWBeVZzYctEvs67txCUddLY10tyuG7OQky2cVCHC7wGZZvgrnWIIqeg=="; + url = "https://registry.npmjs.org/@node-rs/crc32-android-arm-eabi/-/crc32-android-arm-eabi-1.6.0.tgz"; + sha512 = "ZxWoWfEaKJ4k9x9IRSzZwPff1xTbeTbTTWOXFgnW0myVqFRF4toGiRK3uJnj7of47SsVwjZn1XrO2snLbo77Bg=="; }; }; - "@node-rs/crc32-android-arm64-1.5.1" = { + "@node-rs/crc32-android-arm64-1.6.0" = { name = "_at_node-rs_slash_crc32-android-arm64"; packageName = "@node-rs/crc32-android-arm64"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-android-arm64/-/crc32-android-arm64-1.5.1.tgz"; - sha512 = "pdSaFLNl9qGVk/5Q6CMp89V7+W+CxHNDrN/fNVZq9VilgNrLhJW7HeQIhKa8Sa+wZ3vENP8mc79B/WbujyfA3Q=="; + url = "https://registry.npmjs.org/@node-rs/crc32-android-arm64/-/crc32-android-arm64-1.6.0.tgz"; + sha512 = "DyeB3uzMD3Ctfr3dZzLwfy6zDK5GFdaqgCElILwx7S5tMeqlEpLxeAqMFoiovq98+0G+QHhNlAikfDJWDYTmFA=="; }; }; - "@node-rs/crc32-darwin-arm64-1.5.1" = { + "@node-rs/crc32-darwin-arm64-1.6.0" = { name = "_at_node-rs_slash_crc32-darwin-arm64"; packageName = "@node-rs/crc32-darwin-arm64"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-darwin-arm64/-/crc32-darwin-arm64-1.5.1.tgz"; - sha512 = "jplUknfG4/LGr7XdcsLdM14w0yHq7zzu+80MKJFZwWzdeQBhtbXYrkY8fzp7Ih+l1Uru72R+Tx2AMNxgjBiUew=="; + url = "https://registry.npmjs.org/@node-rs/crc32-darwin-arm64/-/crc32-darwin-arm64-1.6.0.tgz"; + sha512 = "Mb4fx1EtEc163ZuuU1kOYJpgQDiKllnjX5WW0k5JFL17MwOwC2AiZfiIVxqjqDUZ6kim8Fvg3205zxNpYcy5Xw=="; }; }; - "@node-rs/crc32-darwin-x64-1.5.1" = { + "@node-rs/crc32-darwin-x64-1.6.0" = { name = "_at_node-rs_slash_crc32-darwin-x64"; packageName = "@node-rs/crc32-darwin-x64"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-darwin-x64/-/crc32-darwin-x64-1.5.1.tgz"; - sha512 = "shonLEeViiUBdl0yZ2LU3rZxmdmNGDa+nnlcO3n3fvQdk4DwQigXIBhJbV+6w1Xvjnrof4iuO9wYZoMCQDCoBw=="; + url = "https://registry.npmjs.org/@node-rs/crc32-darwin-x64/-/crc32-darwin-x64-1.6.0.tgz"; + sha512 = "lizIV4mxI5jw3vviHBLRM6Q8u0iizeIKHx2QKTEiD4b2KMZrce1kv0QAnz/RNxZ47ajRe3cp5B8KceSm8/qcng=="; }; }; - "@node-rs/crc32-freebsd-x64-1.5.1" = { + "@node-rs/crc32-freebsd-x64-1.6.0" = { name = "_at_node-rs_slash_crc32-freebsd-x64"; packageName = "@node-rs/crc32-freebsd-x64"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-freebsd-x64/-/crc32-freebsd-x64-1.5.1.tgz"; - sha512 = "adCp3Sl/b96GmCcqONCYnkgymwr1R2lFEOSIKXpwdmB0QbygqyHyt9WQTrWqESgtvMJxxFF973wFnUbSzTz6Ow=="; + url = "https://registry.npmjs.org/@node-rs/crc32-freebsd-x64/-/crc32-freebsd-x64-1.6.0.tgz"; + sha512 = "mdl9K0JixpprjfJQ3gEfyvwH4kzklqROmoDoDRX2DiF86c6KVaVVN2w33PgHXfsJo36taime2+pMaHexae+lNQ=="; }; }; - "@node-rs/crc32-linux-arm-gnueabihf-1.5.1" = { + "@node-rs/crc32-linux-arm-gnueabihf-1.6.0" = { name = "_at_node-rs_slash_crc32-linux-arm-gnueabihf"; packageName = "@node-rs/crc32-linux-arm-gnueabihf"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm-gnueabihf/-/crc32-linux-arm-gnueabihf-1.5.1.tgz"; - sha512 = "gWNtzBPBDrMBuz+nRtbp6ziJSkUo2RopwAZ1Yg6sKRjyZx4aa0DNXOxVJkr5ZQNuvopBaFet42XYqS9SuoTMrQ=="; + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm-gnueabihf/-/crc32-linux-arm-gnueabihf-1.6.0.tgz"; + sha512 = "fyyQi2qiGLqy5bMdzG+Y4p+/nRvjOG92t6qZBFmdWrcQnj0jxfPqORPNUYvSGfvDW7PgUI/+IAo8bpgNt6GbzA=="; }; }; - "@node-rs/crc32-linux-arm64-gnu-1.5.1" = { + "@node-rs/crc32-linux-arm64-gnu-1.6.0" = { name = "_at_node-rs_slash_crc32-linux-arm64-gnu"; packageName = "@node-rs/crc32-linux-arm64-gnu"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-gnu/-/crc32-linux-arm64-gnu-1.5.1.tgz"; - sha512 = "8DmoVY0acSlSz1A3aWQmvVPOHNfWCGvfocV9QTF9xdhzrJDZFCLcSFggsYAYmaFL6RDU8o8uY9DOfA+DSKdUsQ=="; + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-gnu/-/crc32-linux-arm64-gnu-1.6.0.tgz"; + sha512 = "NhFPUDz/A8C/su/kNrtG0FgtQJuxW1KwIUJySAinGVDDqSWUcKr+jeFMsYKWU331AIJW6uCMIaJowE2tQ0lnBQ=="; }; }; - "@node-rs/crc32-linux-arm64-musl-1.5.1" = { + "@node-rs/crc32-linux-arm64-musl-1.6.0" = { name = "_at_node-rs_slash_crc32-linux-arm64-musl"; packageName = "@node-rs/crc32-linux-arm64-musl"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-musl/-/crc32-linux-arm64-musl-1.5.1.tgz"; - sha512 = "bgHXkt5TMUXcD52FOtwvQh5AjSgCIXPgUclm1WuDN1MbXZXdih3fO8H1wvBerHv1L4dYfzQJxHxkDmGytDjHTw=="; + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-musl/-/crc32-linux-arm64-musl-1.6.0.tgz"; + sha512 = "N35CF21n07JkKAAEp+6E+ARrOUsk6Z5In/h16wDArTagMb+u6VxByc97G01htnb+G0ZpZ0q8MLWuH29gbypOGg=="; }; }; - "@node-rs/crc32-linux-x64-gnu-1.5.1" = { + "@node-rs/crc32-linux-x64-gnu-1.6.0" = { name = "_at_node-rs_slash_crc32-linux-x64-gnu"; packageName = "@node-rs/crc32-linux-x64-gnu"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-gnu/-/crc32-linux-x64-gnu-1.5.1.tgz"; - sha512 = "7A5b6xh8jdDzd1xVlS9mrzyvbrnWL5z9VgJy6lcm222Ae1va/uxWdQpPxhl9aqIQbvi++6nS+FfewKZUYbaZQg=="; + url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-gnu/-/crc32-linux-x64-gnu-1.6.0.tgz"; + sha512 = "6cZIh4un/IlKHJKWQS1KPbMIEkfK47cHd4m7YkwNjwXiT62hzkyfWA+D/io0L8glqUyGAcStQGv8fpRngIkdkw=="; }; }; - "@node-rs/crc32-linux-x64-musl-1.5.1" = { + "@node-rs/crc32-linux-x64-musl-1.6.0" = { name = "_at_node-rs_slash_crc32-linux-x64-musl"; packageName = "@node-rs/crc32-linux-x64-musl"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-musl/-/crc32-linux-x64-musl-1.5.1.tgz"; - sha512 = "XcW/gBkq7NiARM9XqNDK9P/ukzlRCmsD2Yp0U7eIl3lh6kYEpFynySTU5KbTu6zwAKy4ni/OdOkZFcKDkvTS1w=="; + url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-musl/-/crc32-linux-x64-musl-1.6.0.tgz"; + sha512 = "DKd2SwAsf5RJW9BHZqLW0NAKxCRFL3GDEzuUm43wn53XEcL6hmezCUtmNHOmdehIiwNyGEruBh1kekH3JPSYYw=="; }; }; - "@node-rs/crc32-win32-arm64-msvc-1.5.1" = { + "@node-rs/crc32-win32-arm64-msvc-1.6.0" = { name = "_at_node-rs_slash_crc32-win32-arm64-msvc"; packageName = "@node-rs/crc32-win32-arm64-msvc"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-win32-arm64-msvc/-/crc32-win32-arm64-msvc-1.5.1.tgz"; - sha512 = "MB1zZChv7LUvgQAW0m7RloFIIWGfzmgj63nuDkzm3ImTkL/VmJuQ3hAD4jWctWd0edX+WoZdqI9YDvggnXbUmg=="; + url = "https://registry.npmjs.org/@node-rs/crc32-win32-arm64-msvc/-/crc32-win32-arm64-msvc-1.6.0.tgz"; + sha512 = "OzO+4V426M1qIJWGkIJwbhJ38MdIA/AJvsoW3O5t/zkabtbZVNROJi2aWObxQvUmb+kowItzNj4OqcWz0ZEqMQ=="; }; }; - "@node-rs/crc32-win32-ia32-msvc-1.5.1" = { + "@node-rs/crc32-win32-ia32-msvc-1.6.0" = { name = "_at_node-rs_slash_crc32-win32-ia32-msvc"; packageName = "@node-rs/crc32-win32-ia32-msvc"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-win32-ia32-msvc/-/crc32-win32-ia32-msvc-1.5.1.tgz"; - sha512 = "OByR728WARMiPJQHnGnveQum2cXEqZqB4AsQwuaaonkFWQFVyr6HKEF9+icCtX4rnRw5GHWOGXojEGUO5FR/Iw=="; + url = "https://registry.npmjs.org/@node-rs/crc32-win32-ia32-msvc/-/crc32-win32-ia32-msvc-1.6.0.tgz"; + sha512 = "uONkPIn9Lxdq34CSJFeYvy1npzgEXMbfukoyTLikXi3TlTb+tTqRKLZtUx3/ypuRg+t3ka9iVeywFqhWfBYIFg=="; }; }; - "@node-rs/crc32-win32-x64-msvc-1.5.1" = { + "@node-rs/crc32-win32-x64-msvc-1.6.0" = { name = "_at_node-rs_slash_crc32-win32-x64-msvc"; packageName = "@node-rs/crc32-win32-x64-msvc"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-win32-x64-msvc/-/crc32-win32-x64-msvc-1.5.1.tgz"; - sha512 = "Jl3gosWZLo/VyLMWj87eqUT6nBqLsl9+7PPSF5bc7QCCayOrYEcA70zD47u3UnwK9Qae8E7318H0FhGh+W87Bw=="; + url = "https://registry.npmjs.org/@node-rs/crc32-win32-x64-msvc/-/crc32-win32-x64-msvc-1.6.0.tgz"; + sha512 = "raJJVGbP/KbffTAbIW5hl9/N4VMj9zIonskJy2xVEmo/B6TZtkjhRcaXZvgWqjVqh2SzO94HCphygD1qxT4EYw=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -8221,13 +8446,22 @@ let sha512 = "+rZ9zgL1lnbl8Xbb1NQdMjveOMwj4lIYfcDtyJHHi5x4X8jtR6m8SXooJMZy5vmFVZ8w7A2Bnd/oX9eTuU8w5A=="; }; }; - "@npmcli/config-4.2.2" = { + "@npmcli/ci-detect-1.4.0" = { + name = "_at_npmcli_slash_ci-detect"; + packageName = "@npmcli/ci-detect"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/ci-detect/-/ci-detect-1.4.0.tgz"; + sha512 = "3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q=="; + }; + }; + "@npmcli/config-6.1.1" = { name = "_at_npmcli_slash_config"; packageName = "@npmcli/config"; - version = "4.2.2"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/config/-/config-4.2.2.tgz"; - sha512 = "5GNcLd+0c4bYBnFop53+26CO5GQP0R9YcxlernohpHDWdIgzUg9I0+GEMk3sNHnLntATVU39d283A4OO+W402w=="; + url = "https://registry.npmjs.org/@npmcli/config/-/config-6.1.1.tgz"; + sha512 = "R09ig+5UGrA1lxTWMyfyUwwzR9OAtJwMHGF4opu0/ysM3nMujzVvp0DVD/BnbmcQ0w6jM4IrsCSsq6ZdcvLW/Q=="; }; }; "@npmcli/fs-1.1.1" = { @@ -8275,6 +8509,15 @@ let sha512 = "CAcd08y3DWBJqJDpfuVL0uijlq5oaXaOJEKHKc4wqrjd00gkvTZB+nFuLn+doOOKddaQS9JfqtNoFCO2LCvA3w=="; }; }; + "@npmcli/git-4.0.3" = { + name = "_at_npmcli_slash_git"; + packageName = "@npmcli/git"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/git/-/git-4.0.3.tgz"; + sha512 = "8cXNkDIbnXPVbhXMmQ7/bklCAjtmPaXfI9aEM4iH+xSuEHINLMHhlfESvVwdqmHJRJkR48vNJTSUvoF6GRPSFA=="; + }; + }; "@npmcli/installed-package-contents-1.0.7" = { name = "_at_npmcli_slash_installed-package-contents"; packageName = "@npmcli/installed-package-contents"; @@ -8284,6 +8527,15 @@ let sha512 = "9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw=="; }; }; + "@npmcli/installed-package-contents-2.0.1" = { + name = "_at_npmcli_slash_installed-package-contents"; + packageName = "@npmcli/installed-package-contents"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.1.tgz"; + sha512 = "GIykAFdOVK31Q1/zAtT5MbxqQL2vyl9mvFJv+OGu01zxbhL3p0xc8gJjdNGX1mWmUT43aEKVO2L6V/2j4TOsAA=="; + }; + }; "@npmcli/map-workspaces-2.0.4" = { name = "_at_npmcli_slash_map-workspaces"; packageName = "@npmcli/map-workspaces"; @@ -8293,6 +8545,15 @@ let sha512 = "bMo0aAfwhVwqoVM5UzX1DJnlvVvzDCHae821jv48L1EsrYwfOZChlqWYXEtto/+BkBXetPbEWgau++/brh4oVg=="; }; }; + "@npmcli/map-workspaces-3.0.1" = { + name = "_at_npmcli_slash_map-workspaces"; + packageName = "@npmcli/map-workspaces"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-3.0.1.tgz"; + sha512 = "QXwE2p5zRTP6X8Irgf/swYwwdQEalSA1GBm0IGE/86R5EJbUGgKMOP0kOjaJWJxaWPkSqyhM8N50SPxFHTfkNg=="; + }; + }; "@npmcli/metavuln-calculator-2.0.0" = { name = "_at_npmcli_slash_metavuln-calculator"; packageName = "@npmcli/metavuln-calculator"; @@ -8338,6 +8599,15 @@ let sha512 = "qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA=="; }; }; + "@npmcli/name-from-folder-2.0.0" = { + name = "_at_npmcli_slash_name-from-folder"; + packageName = "@npmcli/name-from-folder"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-2.0.0.tgz"; + sha512 = "pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg=="; + }; + }; "@npmcli/node-gyp-1.0.3" = { name = "_at_npmcli_slash_node-gyp"; packageName = "@npmcli/node-gyp"; @@ -8356,6 +8626,15 @@ let sha512 = "doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A=="; }; }; + "@npmcli/node-gyp-3.0.0" = { + name = "_at_npmcli_slash_node-gyp"; + packageName = "@npmcli/node-gyp"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz"; + sha512 = "gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA=="; + }; + }; "@npmcli/package-json-1.0.1" = { name = "_at_npmcli_slash_package-json"; packageName = "@npmcli/package-json"; @@ -8392,6 +8671,15 @@ let sha512 = "s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g=="; }; }; + "@npmcli/promise-spawn-6.0.2" = { + name = "_at_npmcli_slash_promise-spawn"; + packageName = "@npmcli/promise-spawn"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz"; + sha512 = "gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg=="; + }; + }; "@npmcli/run-script-1.8.6" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; @@ -8419,31 +8707,40 @@ let sha512 = "7dqywvVudPSrRCW5nTHpHgeWnbBtz8cFkOuKrecm6ih+oO9ciydhWt6OF7HlqupRRmB8Q/gECVdB9LMfToJbRg=="; }; }; - "@nrwl/cli-15.0.10" = { + "@npmcli/run-script-6.0.0" = { + name = "_at_npmcli_slash_run-script"; + packageName = "@npmcli/run-script"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.0.tgz"; + sha512 = "ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ=="; + }; + }; + "@nrwl/cli-15.6.3" = { name = "_at_nrwl_slash_cli"; packageName = "@nrwl/cli"; - version = "15.0.10"; + version = "15.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/cli/-/cli-15.0.10.tgz"; - sha512 = "+HtEyrSMcaNq1SNhOanKXX3oFntC0mdd5UNIkw8qipSv/7cysBch+3RUwqvnqUFRZhJejCZgFRzUp7rAD7SZ2Q=="; + url = "https://registry.npmjs.org/@nrwl/cli/-/cli-15.6.3.tgz"; + sha512 = "K4E0spofThZXMnhA6R8hkUTdfqmwSnUE2+DlD5Y3jqsvKTAgwF5U41IFkEouFZCf+dWjy0RA20bWoX48EVFtmQ=="; }; }; - "@nrwl/devkit-15.0.10" = { + "@nrwl/devkit-15.6.3" = { name = "_at_nrwl_slash_devkit"; packageName = "@nrwl/devkit"; - version = "15.0.10"; + version = "15.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-15.0.10.tgz"; - sha512 = "JPLB6kyC4L7e4D4LSWhZNrY0bCmlwyagn9ubuPPT/MWQ9LX7RWr/OL87IEHAp/kH93hYPNmwzkIXNpc30y4/GA=="; + url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-15.6.3.tgz"; + sha512 = "/JDvdzNxUM+C1PCZPCrvmFx+OfywqZdOq1GS9QR8C0VctTLG4D/SGSFD88O1SAdcbH/f1mMiBGfEYZYd23fghQ=="; }; }; - "@nrwl/tao-15.0.10" = { + "@nrwl/tao-15.6.3" = { name = "_at_nrwl_slash_tao"; packageName = "@nrwl/tao"; - version = "15.0.10"; + version = "15.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/tao/-/tao-15.0.10.tgz"; - sha512 = "8MTx+eNxJSH826IOC0LplvVR2fxFz0+VOOUORk2gq75+3jCxmW7uxcTM5WvzgtCw7lFJCvWVZASoGCVEIns6Fg=="; + url = "https://registry.npmjs.org/@nrwl/tao/-/tao-15.6.3.tgz"; + sha512 = "bDZbPIbU5Mf2BvX0q8GjPxrm1WkYyfW+gp7mLuuJth2sEpZiCr47mSwuGko/y4CKXvIX46VQcAS0pKQMKugXsg=="; }; }; "@oclif/command-1.8.0" = { @@ -8455,13 +8752,13 @@ let sha512 = "5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw=="; }; }; - "@oclif/command-1.8.20" = { + "@oclif/command-1.8.22" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; - version = "1.8.20"; + version = "1.8.22"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.20.tgz"; - sha512 = "BHM9byujY0kf0PiRorIyp99K50cA3i6Hyro0+TPpFFx+4QM+PyQ5vMHO/TG5wkEP8tIivNRs24bF8QVyJru25g=="; + url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.22.tgz"; + sha512 = "lystv7IKsWRmCv6K68jSvHrO/DILUPBDb5GZ3absTA5XTnNXTaMrcwVzTcMPfTf+gCrgIaPPD1bmbRStwfQxFw=="; }; }; "@oclif/config-1.17.0" = { @@ -8482,15 +8779,6 @@ let sha512 = "cE3qfHWv8hGRCP31j7fIS7BfCflm/BNZ2HNqHexH+fDrdF2f1D5S8VmXWLC77ffv3oDvWyvE9AZeR0RfmHCCaA=="; }; }; - "@oclif/config-1.18.5" = { - name = "_at_oclif_slash_config"; - packageName = "@oclif/config"; - version = "1.18.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.5.tgz"; - sha512 = "R6dBedaUVn5jtAh79aaRm7jezx4l3V7Im9NORlLmudz5BL1foMeuXEvnqm+bMiejyexVA+oi9mto6YKZPzo/5Q=="; - }; - }; "@oclif/config-1.18.6" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; @@ -8500,13 +8788,13 @@ let sha512 = "OWhCpdu4QqggOPX1YPZ4XVmLLRX+lhGjXV6RNA7sogOwLqlEmSslnN/lhR5dkhcWZbKWBQH29YCrB3LDPRu/IA=="; }; }; - "@oclif/core-1.19.2" = { + "@oclif/core-1.23.2" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "1.19.2"; + version = "1.23.2"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-1.19.2.tgz"; - sha512 = "n5ni/NNR6+I0IQXVGoLKdrdw6IS3WH/R/hw6WX8ERfLMZACrNSuJFD9EmBZkztyRkmiQ2L06ULazW5bJn5Shog=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-1.23.2.tgz"; + sha512 = "NdaOaUDTRc6g1yTkOAKiEVOiQhc5CNcWNXa0QF4IS4yTjNqp4DOzgtF9Dwe585nPEKzSbTBiz1wyLOa4qIHSRQ=="; }; }; "@oclif/errors-1.3.4" = { @@ -8536,13 +8824,13 @@ let sha512 = "fYaU4aDceETd89KXP+3cLyg9EHZsLD3RxF2IU9yxahhBpspWjkWi3Dy3bTgcwZ3V47BgxQaGapzJWDM33XIVDQ=="; }; }; - "@oclif/help-1.0.3" = { + "@oclif/help-1.0.5" = { name = "_at_oclif_slash_help"; packageName = "@oclif/help"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/help/-/help-1.0.3.tgz"; - sha512 = "AjjhSWFQkRb9rChEH+IRUmp0CxEacYpUbh+kQqtdCR9CDSsj2a3ibWjtMtJb4lFGAle6kVKfaal/juYe+6P5TQ=="; + url = "https://registry.npmjs.org/@oclif/help/-/help-1.0.5.tgz"; + sha512 = "77ZXqVXcd+bQ6EafN56KbL4PbNtZM/Lq4GQElekNav+CPIgPNKT3AtMTQrc0fWke6bb/BTLB+1Fu1gWgx643jQ=="; }; }; "@oclif/linewrap-1.0.0" = { @@ -8554,13 +8842,13 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.9" = { + "@oclif/parser-3.8.10" = { name = "_at_oclif_slash_parser"; packageName = "@oclif/parser"; - version = "3.8.9"; + version = "3.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.9.tgz"; - sha512 = "1j/kThdse7yHQz6+c3v8RA1I3gD6+SGt2O7IAb/MAMoxqyBrFQDabQHH2UU4eVFGMLN7U91AiYJp11zJ9LcQAg=="; + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.10.tgz"; + sha512 = "J4l/NcnfbIU84+NNdy6bxq9yJt4joFWNvpk59hq+uaQPUNtjmNJDVGuRvf6GUOxHNgRsVK1JRmd/Ez+v7Z9GqQ=="; }; }; "@oclif/plugin-autocomplete-0.1.5" = { @@ -8572,13 +8860,13 @@ let sha512 = "Afchpdd8FNfx9GaU/1D9IzyfiXvjfGybgzQ6G4GTFvPO0/hLdkXX3YyYq+SnxE6/bCrhg4pleiB+GuJACmmkEA=="; }; }; - "@oclif/plugin-autocomplete-1.3.4" = { + "@oclif/plugin-autocomplete-1.3.10" = { name = "_at_oclif_slash_plugin-autocomplete"; packageName = "@oclif/plugin-autocomplete"; - version = "1.3.4"; + version = "1.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-1.3.4.tgz"; - sha512 = "qlD1jlx/5PCGTpF7snKYDEQlLF2pcqr3P2Gw+JWyFnkrjWCLMGDnwaDL4ulruDp3sBxtKNY73sywmKJxQ8F76Q=="; + url = "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-1.3.10.tgz"; + sha512 = "oQl7ZqXhXJUOH26mDPcqcMGmcdIoK/uQPSpUBrfLa1iaQ30slTs0T7KOzg+vwKuPqIIF1nTCPuH67lE8GvUPTw=="; }; }; "@oclif/plugin-help-1.2.11" = { @@ -8617,13 +8905,13 @@ let sha512 = "60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw=="; }; }; - "@oclif/screen-3.0.3" = { + "@oclif/screen-3.0.4" = { name = "_at_oclif_slash_screen"; packageName = "@oclif/screen"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.3.tgz"; - sha512 = "KX8gMYA9ujBPOd1HFsV9e0iEx7Uoj8AG/3YsW4TtWQTg4lJvr82qNm7o/cFQfYRIt+jw7Ew/4oL4A22zOT+IRA=="; + url = "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.4.tgz"; + sha512 = "IMsTN1dXEXaOSre27j/ywGbBjrzx0FNd1XmuhCWCB9NTPrhWI1Ifbz+YLSEcstfQfocYsrbrIessxXb2oon4lA=="; }; }; "@octokit/auth-token-2.5.0" = { @@ -8635,13 +8923,13 @@ let sha512 = "r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g=="; }; }; - "@octokit/auth-token-3.0.2" = { + "@octokit/auth-token-3.0.3" = { name = "_at_octokit_slash_auth-token"; packageName = "@octokit/auth-token"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.2.tgz"; - sha512 = "pq7CwIMV1kmzkFTimdwjAINCXKTajZErLB4wMLYapR2nuB/Jpr66+05wOTZMSCBXP6n4DdDWT2W19Bm17vU69Q=="; + url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.3.tgz"; + sha512 = "/aFM2M4HVDBT/jjDBa84sJniv1t9Gm/rLkalaz9htOm+L+8JMj1k9w0CkUdcxNyNxZPlTxKPVko+m1VlM58ZVA=="; }; }; "@octokit/core-3.6.0" = { @@ -8653,13 +8941,13 @@ let sha512 = "7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q=="; }; }; - "@octokit/core-4.1.0" = { + "@octokit/core-4.2.0" = { name = "_at_octokit_slash_core"; packageName = "@octokit/core"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/core/-/core-4.1.0.tgz"; - sha512 = "Czz/59VefU+kKDy+ZfDwtOIYIkFjExOKf+HA92aiTZJ6EfWpFzYQWw0l54ji8bVmyhc+mGaLUbSUmXazG7z5OQ=="; + url = "https://registry.npmjs.org/@octokit/core/-/core-4.2.0.tgz"; + sha512 = "AgvDRUg3COpR82P7PBdGZF/NNqGmtMq2NiPqeSsDIeCfYFOZ9gddqWNQHnFdEUf+YwOj4aZYmJnlPp7OXmDIDg=="; }; }; "@octokit/endpoint-6.0.12" = { @@ -8671,13 +8959,13 @@ let sha512 = "lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA=="; }; }; - "@octokit/endpoint-7.0.3" = { + "@octokit/endpoint-7.0.5" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "7.0.3"; + version = "7.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.3.tgz"; - sha512 = "57gRlb28bwTsdNXq+O3JTQ7ERmBTuik9+LelgcLIVfYwf235VHbN9QNo4kXExtp/h8T423cR5iJThKtFYxC7Lw=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.5.tgz"; + sha512 = "LG4o4HMY1Xoaec87IqQ41TQ+glvIeTKqfjkCEmt5AIwDZJwQeVZFIEYXrYY6yLwK+pAScb9Gj4q+Nz2qSw1roA=="; }; }; "@octokit/graphql-4.8.0" = { @@ -8689,13 +8977,13 @@ let sha512 = "0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg=="; }; }; - "@octokit/graphql-5.0.4" = { + "@octokit/graphql-5.0.5" = { name = "_at_octokit_slash_graphql"; packageName = "@octokit/graphql"; - version = "5.0.4"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.4.tgz"; - sha512 = "amO1M5QUQgYQo09aStR/XO7KAl13xpigcy/kI8/N1PnZYSS69fgte+xA4+c2DISKqUZfsh0wwjc2FaCt99L41A=="; + url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.5.tgz"; + sha512 = "Qwfvh3xdqKtIznjX9lz2D458r7dJPP8l6r4GQkIdWQouZwHQK0mVT88uwiU2bdTU2OtT1uOlKpRciUWldpG0yQ=="; }; }; "@octokit/openapi-types-12.11.0" = { @@ -8707,13 +8995,13 @@ let sha512 = "VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ=="; }; }; - "@octokit/openapi-types-14.0.0" = { + "@octokit/openapi-types-16.0.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "14.0.0"; + version = "16.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-14.0.0.tgz"; - sha512 = "HNWisMYlR8VCnNurDU6os2ikx0s0VyEjDYHNS/h4cgb8DeOxQ0n72HyinUtdDVxJhFy3FWLGl0DJhfEWk3P5Iw=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz"; + sha512 = "JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -8734,13 +9022,13 @@ let sha512 = "aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw=="; }; }; - "@octokit/plugin-paginate-rest-5.0.1" = { + "@octokit/plugin-paginate-rest-6.0.0" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; - version = "5.0.1"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-5.0.1.tgz"; - sha512 = "7A+rEkS70pH36Z6JivSlR7Zqepz3KVucEFVDnSrgHXzG7WLAzYwcHZbKdfTXHwuTHbkT1vKvz7dHl1+HNf6Qyw=="; + url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.0.0.tgz"; + sha512 = "Sq5VU1PfT6/JyuXPyt04KZNVsFOSBaYOAq2QRZUwzVlI10KFvcbUo8lR258AAQL1Et60b0WuVik+zOWKLuDZxw=="; }; }; "@octokit/plugin-request-log-1.0.4" = { @@ -8761,13 +9049,13 @@ let sha512 = "8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw=="; }; }; - "@octokit/plugin-rest-endpoint-methods-6.7.0" = { + "@octokit/plugin-rest-endpoint-methods-7.0.1" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "6.7.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-6.7.0.tgz"; - sha512 = "orxQ0fAHA7IpYhG2flD2AygztPlGYNAdlzYz8yrD8NDgelPfOYoRPROfEyIe035PlxvbYrgkfUZIhSBKju/Cvw=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.0.1.tgz"; + sha512 = "pnCaLwZBudK5xCdrR823xHGNgqOzRnJ/mpC/76YPpNP7DybdsJtP7mdOwh+wYZxK5jqeQuhu59ogMI4NRlBUvA=="; }; }; "@octokit/plugin-retry-3.0.9" = { @@ -8797,13 +9085,13 @@ let sha512 = "bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A=="; }; }; - "@octokit/request-6.2.2" = { + "@octokit/request-6.2.3" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-6.2.2.tgz"; - sha512 = "6VDqgj0HMc2FUX2awIs+sM6OwLgwHvAi4KCK3mT2H2IKRt6oH9d0fej5LluF5mck1lRR/rFWN0YIDSYXYSylbw=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-6.2.3.tgz"; + sha512 = "TNAodj5yNzrrZ/VxP+H5HiYaZep0H3GU0O7PaF+fhDrt8FPrnkei9Aal/txsN/1P7V3CPiThG0tIvpPDYUsyAA=="; }; }; "@octokit/request-error-2.1.0" = { @@ -8815,13 +9103,13 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/request-error-3.0.2" = { + "@octokit/request-error-3.0.3" = { name = "_at_octokit_slash_request-error"; packageName = "@octokit/request-error"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.2.tgz"; - sha512 = "WMNOFYrSaX8zXWoJg9u/pKgWPo94JXilMLb2VManNOby9EZxrQaBe/QSC4a1TzpAlpxofg2X/jMnCyZgL6y7eg=="; + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.3.tgz"; + sha512 = "crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ=="; }; }; "@octokit/rest-18.12.0" = { @@ -8833,13 +9121,13 @@ let sha512 = "gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q=="; }; }; - "@octokit/rest-19.0.5" = { + "@octokit/rest-19.0.7" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "19.0.5"; + version = "19.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-19.0.5.tgz"; - sha512 = "+4qdrUFq2lk7Va+Qff3ofREQWGBeoTKNqlJO+FGjFP35ZahP+nBenhZiGdu8USSgmq4Ky3IJ/i4u0xbLqHaeow=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-19.0.7.tgz"; + sha512 = "HRtSfjrWmWVNp2uAkEpQnuGMJsu/+dBr47dRc5QVgsCbnIc1+GFEaoKBWkYG+zjrsHpSqcAElMio+n10c0b5JA=="; }; }; "@octokit/types-6.41.0" = { @@ -8851,13 +9139,13 @@ let sha512 = "eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg=="; }; }; - "@octokit/types-8.0.0" = { + "@octokit/types-9.0.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "8.0.0"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-8.0.0.tgz"; - sha512 = "65/TPpOJP1i3K4lBJMnWqPUJ6zuOtzhtagDvydAWbEXpbFYA0oMKKyLb95NFZZP0lSh/4b6K+DQlzvYQJQQePg=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz"; + sha512 = "LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw=="; }; }; "@opencensus/core-0.0.8" = { @@ -8905,13 +9193,40 @@ let sha512 = "qe+uWtCJetuG78KhfiQyEA+ZciC/qeECXRj+LCm4m0s98qR2wPwYHRI1u8aFbtkN6G4ZMyKN+opY++fJS5l3vg=="; }; }; - "@opentelemetry/api-1.2.0" = { + "@opentelemetry/api-1.4.0" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "1.2.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.2.0.tgz"; - sha512 = "0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.0.tgz"; + sha512 = "IgMK9i3sFGNUqPMbjABm0G26g0QCKCUBfglhQ7rQq6WcxbKfEHRcmwsoER4hZcuYqJgkYn2OeuoJIv7Jsftp7g=="; + }; + }; + "@opentelemetry/core-1.9.0" = { + name = "_at_opentelemetry_slash_core"; + packageName = "@opentelemetry/core"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.9.0.tgz"; + sha512 = "Koy1ApRUp5DB5KpOqhDk0JjO9x6QeEkmcePl8qQDsXZGF4MuHUBShXibd+J2tRNckTsvgEHi1uEuUckDgN+c/A=="; + }; + }; + "@opentelemetry/resources-1.9.0" = { + name = "_at_opentelemetry_slash_resources"; + packageName = "@opentelemetry/resources"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.9.0.tgz"; + sha512 = "zCyien0p3XWarU6zv72c/JZ6QlG5QW/hc61Nh5TSR1K9ndnljzAGrH55x4nfyQdubfoh9QxLNh9FXH0fWK6vcg=="; + }; + }; + "@opentelemetry/sdk-trace-base-1.9.0" = { + name = "_at_opentelemetry_slash_sdk-trace-base"; + packageName = "@opentelemetry/sdk-trace-base"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.9.0.tgz"; + sha512 = "glNgtJjxAIrDku8DG5Xu3nBK25rT+hkyg7yuXh8RUurp/4BcsXjMyVqpyJvb2kg+lxAX73VJBhncRKGHn9t8QQ=="; }; }; "@opentelemetry/semantic-conventions-1.3.1" = { @@ -8923,409 +9238,463 @@ let sha512 = "wU5J8rUoo32oSef/rFpOT1HIjLjAv3qIDHkw1QIhODV3OpAVHi5oVzlouozg9obUmZKtbZ0qUe/m7FP0y0yBzA=="; }; }; - "@ot-builder/bin-composite-types-1.5.4" = { + "@opentelemetry/semantic-conventions-1.9.0" = { + name = "_at_opentelemetry_slash_semantic-conventions"; + packageName = "@opentelemetry/semantic-conventions"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.9.0.tgz"; + sha512 = "po7penSfQ/Z8352lRVDpaBrd9znwA5mHGqXR7nDEiVnxkDFkBIhVf/tKeAJDIq/erFpcRowKFeCsr5eqqcSyFQ=="; + }; + }; + "@orval/angular-6.11.1" = { + name = "_at_orval_slash_angular"; + packageName = "@orval/angular"; + version = "6.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@orval/angular/-/angular-6.11.1.tgz"; + sha512 = "L1sdQ7b7cq5jtL2OBacpyQ2MwGRUcWm1U5BEJg0R+K3eWN7LfFAQk99karMEbre1C5U/s2BXh/hxmWHK24i1+A=="; + }; + }; + "@orval/axios-6.11.1" = { + name = "_at_orval_slash_axios"; + packageName = "@orval/axios"; + version = "6.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@orval/axios/-/axios-6.11.1.tgz"; + sha512 = "iemXAYoTuguCIgzK4yHRuUWNxIYk8umpI7FYNYCk+YZ1MJfWa+GAKeem9Fzb3EbmWWvlH4bNfFkXsygvorS1nw=="; + }; + }; + "@orval/core-6.11.1" = { + name = "_at_orval_slash_core"; + packageName = "@orval/core"; + version = "6.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@orval/core/-/core-6.11.1.tgz"; + sha512 = "0d8K4gmeMovYYdagRQ5pj0KsgtB8JKDYP/RjzQfr40ootAjbP6egaAjhSzogv0vfSr5GDwNPPzD+S0cK6pQsAw=="; + }; + }; + "@orval/msw-6.11.1" = { + name = "_at_orval_slash_msw"; + packageName = "@orval/msw"; + version = "6.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@orval/msw/-/msw-6.11.1.tgz"; + sha512 = "1WA9nLBhvBTu0MZ0V+UAlipNMkOmhy0vv2RfcAGrqiq8TCHkdVvVOZvrIuQkJxYkELEBAXTPfGnIzqCVwRkwiA=="; + }; + }; + "@orval/query-6.11.1" = { + name = "_at_orval_slash_query"; + packageName = "@orval/query"; + version = "6.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@orval/query/-/query-6.11.1.tgz"; + sha512 = "FV5mGQ9fpyqPJl82AkGvft2WQGr0GLyrVp7k7Nrlr0I2j+F0PByvlvtvTbS0CCXY9m9ot6tE3NDXkISZEczG4w=="; + }; + }; + "@orval/swr-6.11.1" = { + name = "_at_orval_slash_swr"; + packageName = "@orval/swr"; + version = "6.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@orval/swr/-/swr-6.11.1.tgz"; + sha512 = "Oi/cgNzFWU0ukXoq5RselfJLcoy9l+MmLpmgnqTghXewRq67q1iIc5ee5/8Kf9m36dLCfb7uk8m1i3e6F5LhwA=="; + }; + }; + "@ot-builder/bin-composite-types-1.6.1" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.5.4.tgz"; - sha512 = "BGa0e3eN9ZLfwcJWcD/htPjbBadTYse42aLItPbpVhIc2HEClFFmrtwVR1AyYIHX08Iru9P6ExK2c5JcOtAxFw=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.6.1.tgz"; + sha512 = "xYJeoZ4vJMYv8UcWMOuuhCwsO061FHgsakr81XeKXVw2iJ5DknDvNv1Q7+ss34XlXl+Cj6vXe8i86tsa1AjU4g=="; }; }; - "@ot-builder/bin-util-1.5.4" = { + "@ot-builder/bin-util-1.6.1" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.5.4.tgz"; - sha512 = "VSMqaiNu1tbdyXFJObLuhLjfwp4CgrwHBG8y2EyoG6ipyxon345tvtsSdyW71N/t2nfS4IZHxxNmgoiEyTGjew=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.6.1.tgz"; + sha512 = "k4CKNu3i+h17S1yzYi1ih1cXSCKyKWKDuQrCgV/6igMeZ8eAMnk1Y3+/eN4EXDODCa9LrYK/jZs643lfejMr9A=="; }; }; - "@ot-builder/cli-help-shower-1.5.4" = { + "@ot-builder/cli-help-shower-1.6.1" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.5.4.tgz"; - sha512 = "dgDXk5A2W+BXdscJ9V//X/oRCesFj5X8elv0Ks3hyGsb+HEnVmmpGqYD+yNvsh7DCB+VabHTRI9HIhjx52DYeA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.6.1.tgz"; + sha512 = "J3aX1FtjGN7VMWA87xPwkIrXYtCNTT60fqE6izIU8X7mpRqgJlzVgg8ePQu3dLtUqo21oH8FUDLX5z1KjwInew=="; }; }; - "@ot-builder/cli-proc-1.5.4" = { + "@ot-builder/cli-proc-1.6.1" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.5.4.tgz"; - sha512 = "9IhKDfSat06iroaGHQG8x4cpzoctoBwKu3AA6xUE5PEEb7xImcGaZ0hDaNEZGJd/yYEvatBbytzI5NAJfdvSjA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.6.1.tgz"; + sha512 = "zjXAbWIvW52/lLhMCw1STLHDiwtTV/2eF09+PGxn77PenBynw0f0+opxkL9wvrA83OEu3N2eEIK89JmRM+j89A=="; }; }; - "@ot-builder/cli-shared-1.5.4" = { + "@ot-builder/cli-shared-1.6.1" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.5.4.tgz"; - sha512 = "QALOu8sjBrVhA7rrHNX3CgQTMUokC0GHnOTMcyqep1ogLOAKPvmmM0vmqPHVrolWLoEVgKI1bs3nFfZmtZC/cA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.6.1.tgz"; + sha512 = "RXbC9TqfcSVwo0gpqm8k+F3IrwzVHX67lxu0Fv2NCX/9HzgmzzusmD7tzLIYIs9fIdF2hOOhjT9JVPyFJkkS9A=="; }; }; - "@ot-builder/common-impl-1.5.4" = { + "@ot-builder/common-impl-1.6.1" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.5.4.tgz"; - sha512 = "B6j9Fv9iXGSim7dNlZkfD5gWJ+VK57wmlb9SwNlxTI8M0JBfTaWVkajyEz+GPn4BEvVOBJ95PFnecO43K552aA=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.6.1.tgz"; + sha512 = "Sg8PegFN/CoekaRQ1hGvQJLcUREF1ugRIwjbewLRPGTHGECSIsEipq4gyVsmHSUiUSlQRwycwAsaQMB8l9amww=="; }; }; - "@ot-builder/errors-1.5.4" = { + "@ot-builder/errors-1.6.1" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.5.4.tgz"; - sha512 = "2xo+cpRrK93JLyfxORekkpslavILzX7c+AOlf754otRN8UK0rfVSNcFUifN7BobpHCaHuBgJtbYiq+zBnjMbew=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.6.1.tgz"; + sha512 = "04vPz6CI2O69Tfpby5K7dLZkRg21yQFSyAvvUJx22OU9SfDI4KTmtcwlYRwHAYBC9GFc4S+nx/+50pNZ5XJTqw=="; }; }; - "@ot-builder/io-bin-cff-1.5.4" = { + "@ot-builder/io-bin-cff-1.6.1" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.5.4.tgz"; - sha512 = "CuEbsQwDoKF2/tonyy6J+cEtY8yzPZ7aCl/+Y5X+ZdYN9BmYZ64V1W1Qyc6wEwik78fDdgzsBni15YsUCTvGnA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.6.1.tgz"; + sha512 = "Ce/nnjzL/tF2VaUEk22jBk1wM28UoJttXl3mTPzuurSxfJTpXNPkib3KqoHN1/PdesNlhqiQr2FCdx9uOyjedg=="; }; }; - "@ot-builder/io-bin-encoding-1.5.4" = { + "@ot-builder/io-bin-encoding-1.6.1" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.5.4.tgz"; - sha512 = "5O5E7941ScCmzoxtyK/KT1D3Wl3vHUWZY784no97e6udCndngPuvVI1UZck2lmLrrrn/EvNU0eJCHN7neHsSXw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.6.1.tgz"; + sha512 = "3t8Yvu0rJStgmUr4T8cSx+WMkusyfc5gL2a80UVsSzofo7RTK+MIr8bvL7b2z85pEP/DkKR/GFDGzzU1mwb0AQ=="; }; }; - "@ot-builder/io-bin-ext-private-1.5.4" = { + "@ot-builder/io-bin-ext-private-1.6.1" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.5.4.tgz"; - sha512 = "r0NEJHb+3XduOnjr9qOuTkUiOM+eJVSGZ1pvPumQXDlMJlz+VQsHop7MD1pSCKS/modXN1hKBo6BBki3gty7/A=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.6.1.tgz"; + sha512 = "QrzerNSAN5TVreNeAtO6zZpMsR2Lsq8SNtAJeChSq2n2pxPwBJJnBnDr8K3If6ykucvVb1sLCqHyjEXG2D9ReA=="; }; }; - "@ot-builder/io-bin-font-1.5.4" = { + "@ot-builder/io-bin-font-1.6.1" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.5.4.tgz"; - sha512 = "rcJ9qe0S4dBWMRXYh3Gi9lqgiW1qWCmNOAyjEoNYOcAUoXFasRuP+JNMu3sUM/Yi8eOGtkrnU2nq+T392/4nZA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.6.1.tgz"; + sha512 = "JXzKYXf8NR2DdUQ+BsdB9Eg5oM4HIYtFEr9aKHFTFY+E7MXRrkO+lPm43vOETB6+dWns9vJ4LIcyCO3MvBwQ5A=="; }; }; - "@ot-builder/io-bin-glyph-store-1.5.4" = { + "@ot-builder/io-bin-glyph-store-1.6.1" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.5.4.tgz"; - sha512 = "/lv2HLCSOlpPKctycCz+PAoUL8jZ2Ysk7XD9g2oi/eu7N5Tc9OKMQ38Xb9uR8AVSWUKb/COUcflCg3PCgwaQJA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.6.1.tgz"; + sha512 = "yWnzgzgpBcyLaDevWmd48BRifNbIEl1EaEiUfuOFT8UHxwKBZharL7RyDkgOQH1v/JiS1F/bc7+dV83SU7qHtw=="; }; }; - "@ot-builder/io-bin-layout-1.5.4" = { + "@ot-builder/io-bin-layout-1.6.1" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.5.4.tgz"; - sha512 = "5KJb4MTnpxbr9W9hCJWzYRw3OM9f6x5TeZPZMHDS1XL9L0dvq2+SxGBWjB5BgpLMpJ6mlY1LRj9FmNiFXL/CJQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.6.1.tgz"; + sha512 = "bdkBgGZ4d/ymmZxu3J5FOErn8MgdUBJDqETs8832U96sqb8aTB3vGtP0zIWB/ORuRXJNmBgPrZEa+Hi3ff51kw=="; }; }; - "@ot-builder/io-bin-metadata-1.5.4" = { + "@ot-builder/io-bin-metadata-1.6.1" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.5.4.tgz"; - sha512 = "hjg8S/Xn8Vj9wUfksGehqjFkqXfJV6OSZGg7cmJrTwhCQEIwOnD9rtzlAKhPKjrPp2eEC2hlKIzdowWsSQS0nw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.6.1.tgz"; + sha512 = "fKj2w5rXUNtOo69iY+4+I025ij+VSthpIWbp44dvQpwGHRDP2nAMZRDjdwpksKefKrHF0xUOZncoVk8cWUKnLQ=="; }; }; - "@ot-builder/io-bin-metric-1.5.4" = { + "@ot-builder/io-bin-metric-1.6.1" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.5.4.tgz"; - sha512 = "KEoSB0AswO8pfFT0rSiXUJak3K1g66ZGI50jf9GKOvK9V6nG9apOqAPwIc6ZnMAXfl9Air62dgrvF6QbL7iO+Q=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.6.1.tgz"; + sha512 = "W9qUW3Ldw7cz/MPp0NFJ0UlbccTZ0jjjLJdAJgUjRmNemnLSJINy76gJKQPcLqQzWf0g+ZaqFIBpzo2kbJFXXQ=="; }; }; - "@ot-builder/io-bin-name-1.5.4" = { + "@ot-builder/io-bin-name-1.6.1" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.5.4.tgz"; - sha512 = "pZ0TXgyr4kVMcbyVo9qjn3Epx//ykoUInZHmE3R2f6/u3NjXBvCmLM+WrbKf7fc+oBX2nkWacgkRrMf4L03P/w=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.6.1.tgz"; + sha512 = "5Ifb2iWM9CXwArQNT973YpWkClh7MxjjBJDaS2lt7WZl/CT2btBzHcZFubxxdplWloRMQQBsG+dM471BIs0gow=="; }; }; - "@ot-builder/io-bin-sfnt-1.5.4" = { + "@ot-builder/io-bin-sfnt-1.6.1" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.5.4.tgz"; - sha512 = "PbWoy8aqphUpU50hgsyB/wjscrR/OjN+P68O7fTXc/DsdyZUJP4ncetor1dOfAJf1zEOBr33VFc8rABDrFhPvw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.6.1.tgz"; + sha512 = "/dQ6XGGZMyB79kivB5ZNi2s6Q0sSPjGZNGn+Wv+S5Z1qSuoSZYE3HyQ6c2pPpmLDrats9KqxVXWFTJVEQsuYng=="; }; }; - "@ot-builder/io-bin-ttf-1.5.4" = { + "@ot-builder/io-bin-ttf-1.6.1" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.5.4.tgz"; - sha512 = "HSTw8DXhqfBWWfk9yToKHMUwSZZv3AAxt0LIaYHSo3Lr4HG2tqgTtpk62gc6hyiMR0d1U4JdYA5mbYPnSWMMdw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.6.1.tgz"; + sha512 = "K6Bf183nGPuDeGfDNTK0B2o0Ohe/HnV79tUdQxlNX0YWkehtinp5uK8BcwrBzl1oKr64HCU4/4MJzfYDzGZLPw=="; }; }; - "@ot-builder/io-bin-vtt-private-1.5.4" = { + "@ot-builder/io-bin-vtt-private-1.6.1" = { name = "_at_ot-builder_slash_io-bin-vtt-private"; packageName = "@ot-builder/io-bin-vtt-private"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.5.4.tgz"; - sha512 = "OllpfHLq63mBNxdHRuZu3UztPcBEFfA67W5S/lCQZhyay0VcMbNc/7jcRdyZXmgjkZNO+Szg82msZxookW/OBg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.6.1.tgz"; + sha512 = "kQ7YzNU7Uji6wMF7zWptHrlU8/pGuFdhQSQAUxEh/20lMh3p6gKImI+EA91TOB4WPn9K1pNYIwc4Bbg2l/KoKw=="; }; }; - "@ot-builder/ot-1.5.4" = { + "@ot-builder/ot-1.6.1" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.5.4.tgz"; - sha512 = "x/92wj1hk0MG8rmuUFwmyV5YJYEUJ6HiAgR8FPS2hQK2Ut7do5z0Ttc/eog3qBiVjnPS3Dzh1C6qLLSY3RR+mQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.6.1.tgz"; + sha512 = "QAsa5t+L2ud/Rfy7RGM47jJPVfsjhu1VSZhjqJlztjA2dYaWpesQPF5tacYuCz21UQHODdy3iumTAdugwZQYQw=="; }; }; - "@ot-builder/ot-encoding-1.5.4" = { + "@ot-builder/ot-encoding-1.6.1" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.5.4.tgz"; - sha512 = "XbEuxSkNKd8eguFv1Qut175Xl14Gja035Aci4Vw3979AtuT2QO7wDrjLhlfbn7Xob98dXcE180r7Zpc86iP53g=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.6.1.tgz"; + sha512 = "1N544+6WkMCSp06WYyWe7TvF19NbiikTeJxH0LU1VSvBOaWI5syg3G7uSPzoLTezIkCV7nE5tj+tKOC6Lr45Ng=="; }; }; - "@ot-builder/ot-ext-private-1.5.4" = { + "@ot-builder/ot-ext-private-1.6.1" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.5.4.tgz"; - sha512 = "L2L2dPhMxaqEhuDW8tMaLJnR/BAnOWvqJE16Kkm8BwLxCbVuUlznvbfLaKOQj0UmTAXhLNkOLz2ZXJ7UGBCJ7g=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.6.1.tgz"; + sha512 = "6hvBv2AGOAwJ9xOP2pHq1VLSmSggotRsyFGTOGLHSzpufSdfiWmshKPE3uw472nSQ4M3Bd+mK/WuxH1jVvogZw=="; }; }; - "@ot-builder/ot-glyphs-1.5.4" = { + "@ot-builder/ot-glyphs-1.6.1" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.5.4.tgz"; - sha512 = "mH0i6sVOseqiz84RTMZqNxFcOT+dSfShHAc4Sx9gAfelFyIWcYI8djdhWeSsdDu1n9G2mGZSpbPAH+6+ZA+7+Q=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.6.1.tgz"; + sha512 = "O4r4fEcmioDGkO3QYeKH/IZFXToRZQkX4jqFQB4yq5qUiwjLJMKfi/giVnFK5jsu73NW+Ikq1mNNmxq4QpdtRQ=="; }; }; - "@ot-builder/ot-layout-1.5.4" = { + "@ot-builder/ot-layout-1.6.1" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.5.4.tgz"; - sha512 = "XgmO0vQ0MRg3KD/T11q0KQGgUiUAjod8J6LoMMkHs0/CevP4gjJr7xf21Sy1+cjxYQ1ltY9W4u2lcTgxAmS59w=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.6.1.tgz"; + sha512 = "4Bnmr8Gz60HgGCBD0cHFeXea8cbH454oDDzfozu2t3xmE2TJV6x/xIW9MXyl+W88BOUlAOu9+hxOPkfxPvoASg=="; }; }; - "@ot-builder/ot-metadata-1.5.4" = { + "@ot-builder/ot-metadata-1.6.1" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.5.4.tgz"; - sha512 = "KegFbpqN9DBx5IgYtMnhxpjg5s1YqNK+y6lZs7lutLLY8Y8wHddhcPcaISho7/yqS0/rCy3NiYwDZd3hJF3n2g=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.6.1.tgz"; + sha512 = "ZXx0wx/cO/mivhGH5UbvfFe2QsTT74fw1N9NUCjmyupLz8og6kX//Lhj33/sjQqc9p+kBcjp9qVzL99D5tbx8A=="; }; }; - "@ot-builder/ot-name-1.5.4" = { + "@ot-builder/ot-name-1.6.1" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.5.4.tgz"; - sha512 = "qLq/atnsaBqZegvwJiTzhGxO6gVrQaohwT9V+gvNmnN/cd2V/+V+kNCOoyJM+mIphnijEAmXG5E4dqSzs+gvwA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.6.1.tgz"; + sha512 = "CdCmblvnr/M3PrQT4W0/12df5LhSQxM+eZbE64NLY7ZKekJK7C8MpSuo0lBTAduAQAczAmN3+HfQ2v1xXtBNOg=="; }; }; - "@ot-builder/ot-sfnt-1.5.4" = { + "@ot-builder/ot-sfnt-1.6.1" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.5.4.tgz"; - sha512 = "VFRA5rh23YAxckk+N1oBkt68Z2VYhZqMCh36nNBbw6C2I4P4Cqzj9I6EBncqJ+mzXnxYULx/lz+HzpHAqKMN+Q=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.6.1.tgz"; + sha512 = "jKc2TnfTvQu/958TJrZwG9MxwTRbmcRc9ZvW1MjEK9FK7OqfjxiNAUXJLZm9x2ETxW5pMnkcrkCSD2QaLpuV7w=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.5.4" = { + "@ot-builder/ot-standard-glyph-namer-1.6.1" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.5.4.tgz"; - sha512 = "TIOS1RlJKgRhuvFF8XX7Rr3nPvhw15yXJC5iVyuBJgJcoiQOQHg3gKAL0rHDXEHLU6nISL2q5iE8IJiahpP+UA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.6.1.tgz"; + sha512 = "qU5+2fzE0iana0BJQOuclGwDCA5BboJIc6e651+6SKfdg/lY+KhmdJR5IvjKSARz3c4Uk9r1bbtOjuiFAlnePQ=="; }; }; - "@ot-builder/ot-vtt-private-1.5.4" = { + "@ot-builder/ot-vtt-private-1.6.1" = { name = "_at_ot-builder_slash_ot-vtt-private"; packageName = "@ot-builder/ot-vtt-private"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.5.4.tgz"; - sha512 = "GTDN4M2MBudjSUuCSw9FVQUmOSZG5OGU2XIPBHFmUi0VwX/DNML3BwaQT7CpFh0MJHsGko+1PZOYlgENjO+tWA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.6.1.tgz"; + sha512 = "tBCs7mK3+Potn4DLEOABd1xRZLhG9X7AOASeAJwPOGBNi831DyYuODLeFIE9BKZThoP5GlbTpn5zt2w51Spy8g=="; }; }; - "@ot-builder/prelude-1.5.4" = { + "@ot-builder/prelude-1.6.1" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.5.4.tgz"; - sha512 = "A0US/TENKS5VjW6haBkMRn7VNl0NS9h9Lok4H1/s0fMdB/o5e8mOueTHCfke6wmzdPB+pQIvCvA/JYS0QBNboQ=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.6.1.tgz"; + sha512 = "EeO5vzAEpoRHrA9U39mANa5eoFk/LdS7zhSDiqe4wuDjw9MMcTlkPT1O9aKNNBWdC/ErMutM+AR5b7YWzgSFZw=="; }; }; - "@ot-builder/primitive-1.5.4" = { + "@ot-builder/primitive-1.6.1" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.5.4.tgz"; - sha512 = "aXr4ZjbqVwpmv7Yg/MXy+6TuNUqjAchtQ4Z9P3wmWRv90cY7J0wUJi6W1XLKICCYlB3PffS5fto0qi2uMu84sg=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.6.1.tgz"; + sha512 = "1NJpEeaRxrLdjA5nIr92U4DL7bfTMHJgJRIlBu2tGHYttnCOmBWqyRVA+g+prwwUR06EH8I7Dv3q042uc5Ji0A=="; }; }; - "@ot-builder/rectify-1.5.4" = { + "@ot-builder/rectify-1.6.1" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.5.4.tgz"; - sha512 = "mv1AvjDYgV9HHbMJGS2zSGBW6ngeXLxjx4fUX3csN8I+8j8X7ghcpQ0Bnk/AnR+GjEpQfSRZ4pNWoVcsGD1pSw=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.6.1.tgz"; + sha512 = "JFSO1YbH9G0pBqBk5xT01YvurUXiHH7k6daP4ceWfKp0Ch6cZCtgvxHIDvtSNxhYnlhBkBWye2+UyZSBlIu77w=="; }; }; - "@ot-builder/stat-glyphs-1.5.4" = { + "@ot-builder/stat-glyphs-1.6.1" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.5.4.tgz"; - sha512 = "bX9p/wrqKk/XQpYBwzru67XHjFYgAHsAemtgVCKSEOx795yMFJCJ/G6Nlic/4Hoia17feDcf0jy1bVrL2NkJww=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.6.1.tgz"; + sha512 = "IGZkR9QdVjPAEBXAe4qixlp4DvHioxD/bp/d+jlIUVgUGZzo/wpwUV/ktT/zjZXDdNpVSdTa/RSG5mUtWHqf8w=="; }; }; - "@ot-builder/trace-1.5.4" = { + "@ot-builder/trace-1.6.1" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.5.4.tgz"; - sha512 = "5gwLOL311REuWB+2iCNLCPAqc9SBtWHTJATy3S2Dp0SVB8h+yn+pEkW/QxGdXNyM233JKTSuHElN+fN5/8abKw=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.6.1.tgz"; + sha512 = "r18ahZoSFv2bWl9oQCDM4IT4aPr8krMjHJHj0brHoMKhrPH/iE9k+d97UaqXUd+I8ZliTfihK/AzOArjIv2ZqQ=="; }; }; - "@ot-builder/var-store-1.5.4" = { + "@ot-builder/var-store-1.6.1" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.5.4.tgz"; - sha512 = "0RL9S+OCfeQrh1eC1yh8BaQiyvdLmbCN7uBaFS5KrUz2V2XO5kQCwzz6NERETWXmieUfzFbfqyFKcBIinLTz0A=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.6.1.tgz"; + sha512 = "SHkiufkRd07hE4Y75lr013yN0TKdebCqe9VpY/W05EwFL+0DBX2w1cE8FYqiVeS2EYA2hE727BpxTJbTHcRa2Q=="; }; }; - "@ot-builder/variance-1.5.4" = { + "@ot-builder/variance-1.6.1" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.5.4.tgz"; - sha512 = "t/DabVMo+uzZgf3ZQCy5++ZVvqTgpKU+5bG/nXWSkmX8vfJz4onJh4ded9kgjcb+nmbT0j3avS91lVPq5g6hWQ=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.6.1.tgz"; + sha512 = "RQ9H+jCcshoEUOYjpaOhxSJ31uiKJ8FAOqAvd8JdmDNJAHmmQmaNINOUr+amR0bJk6GqbKnuK48Xs3+8OiAgcw=="; }; }; - "@parcel/bundler-default-2.7.0" = { + "@parcel/bundler-default-2.8.3" = { name = "_at_parcel_slash_bundler-default"; packageName = "@parcel/bundler-default"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.7.0.tgz"; - sha512 = "PU5MtWWhc+dYI9x8mguYnm9yiG6TkI7niRpxgJgtqAyGHuEyNXVBQQ0X+qyOF4D9LdankBf8uNN18g31IET2Zg=="; + url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.8.3.tgz"; + sha512 = "yJvRsNWWu5fVydsWk3O2L4yIy3UZiKWO2cPDukGOIWMgp/Vbpp+2Ct5IygVRtE22bnseW/E/oe0PV3d2IkEJGg=="; }; }; - "@parcel/cache-2.7.0" = { + "@parcel/cache-2.8.3" = { name = "_at_parcel_slash_cache"; packageName = "@parcel/cache"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.7.0.tgz"; - sha512 = "JlXNoZXcWzLKdDlfeF3dIj5Vtel5T9vtdBN72PJ+cjC4qNHk4Uwvc5sfOBELuibGN0bVu2bwY9nUgSwCiB1iIA=="; + url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.8.3.tgz"; + sha512 = "k7xv5vSQrJLdXuglo+Hv3yF4BCSs1tQ/8Vbd6CHTkOhf7LcGg6CPtLw053R/KdMpd/4GPn0QrAsOLdATm1ELtQ=="; }; }; - "@parcel/codeframe-2.7.0" = { + "@parcel/codeframe-2.8.3" = { name = "_at_parcel_slash_codeframe"; packageName = "@parcel/codeframe"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.7.0.tgz"; - sha512 = "UTKx0jejJmmO1dwTHSJuRgrO8N6PMlkxRT6sew8N6NC3Bgv6pu0EbO+RtlWt/jCvzcdLOPdIoTzj4MMZvgcMYg=="; + url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.8.3.tgz"; + sha512 = "FE7sY53D6n/+2Pgg6M9iuEC6F5fvmyBkRE4d9VdnOoxhTXtkEqpqYgX7RJ12FAQwNlxKq4suBJQMgQHMF2Kjeg=="; }; }; - "@parcel/compressor-raw-2.7.0" = { + "@parcel/compressor-raw-2.8.3" = { name = "_at_parcel_slash_compressor-raw"; packageName = "@parcel/compressor-raw"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.7.0.tgz"; - sha512 = "SCXwnOOQT6EmpusBsYWNQ/RFri+2JnKuE0gMSf2dROl2xbererX45FYzeDplWALCKAdjMNDpFwU+FyMYoVZSCQ=="; + url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.8.3.tgz"; + sha512 = "bVDsqleBUxRdKMakWSlWC9ZjOcqDKE60BE+Gh3JSN6WJrycJ02P5wxjTVF4CStNP/G7X17U+nkENxSlMG77ySg=="; }; }; - "@parcel/config-default-2.7.0" = { + "@parcel/config-default-2.8.3" = { name = "_at_parcel_slash_config-default"; packageName = "@parcel/config-default"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.7.0.tgz"; - sha512 = "ZzsLr97AYrz8c9k6qn3DlqPzifi3vbP7q3ynUrAFxmt0L4+K0H9N508ZkORYmCgaFjLIQ8Y3eWpwCJ0AewPNIg=="; + url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.8.3.tgz"; + sha512 = "o/A/mbrO6X/BfGS65Sib8d6SSG45NYrNooNBkH/o7zbOBSRQxwyTlysleK1/3Wa35YpvFyLOwgfakqCtbGy4fw=="; }; }; - "@parcel/core-2.7.0" = { + "@parcel/core-2.8.3" = { name = "_at_parcel_slash_core"; packageName = "@parcel/core"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/core/-/core-2.7.0.tgz"; - sha512 = "7yKZUdh314Q/kU/9+27ZYTfcnXS6VYHuG+iiUlIohnvUUybxLqVJhdMU9Q+z2QcPka1IdJWz4K4Xx0y6/4goyg=="; + url = "https://registry.npmjs.org/@parcel/core/-/core-2.8.3.tgz"; + sha512 = "Euf/un4ZAiClnlUXqPB9phQlKbveU+2CotZv7m7i+qkgvFn5nAGnrV4h1OzQU42j9dpgOxWi7AttUDMrvkbhCQ=="; }; }; - "@parcel/css-1.14.0" = { - name = "_at_parcel_slash_css"; - packageName = "@parcel/css"; - version = "1.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css/-/css-1.14.0.tgz"; - sha512 = "r5tJWe6NF6lesfPw1N3g7N7WUKpHqi2ONnw9wl5ccSGGIxkmgcPaPQxfvmhdjXvQnktSuIOR0HjQXVXu+/en/w=="; - }; - }; - "@parcel/diagnostic-2.7.0" = { + "@parcel/diagnostic-2.8.3" = { name = "_at_parcel_slash_diagnostic"; packageName = "@parcel/diagnostic"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.7.0.tgz"; - sha512 = "pdq/cTwVoL0n8yuDCRXFRSQHVWdmmIXPt3R3iT4KtYDYvOrMT2dLPT79IMqQkhYPANW8GuL15n/WxRngfRdkug=="; + url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.8.3.tgz"; + sha512 = "u7wSzuMhLGWZjVNYJZq/SOViS3uFG0xwIcqXw12w54Uozd6BH8JlhVtVyAsq9kqnn7YFkw6pXHqAo5Tzh4FqsQ=="; }; }; - "@parcel/events-2.7.0" = { + "@parcel/events-2.8.3" = { name = "_at_parcel_slash_events"; packageName = "@parcel/events"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/events/-/events-2.7.0.tgz"; - sha512 = "kQDwMKgZ1U4M/G17qeDYF6bW5kybluN6ajYPc7mZcrWg+trEI/oXi81GMFaMX0BSUhwhbiN5+/Vb2wiG/Sn6ig=="; + url = "https://registry.npmjs.org/@parcel/events/-/events-2.8.3.tgz"; + sha512 = "hoIS4tAxWp8FJk3628bsgKxEvR7bq2scCVYHSqZ4fTi/s0+VymEATrRCUqf+12e5H47uw1/ZjoqrGtBI02pz4w=="; }; }; "@parcel/fs-1.11.0" = { @@ -9337,40 +9706,40 @@ let sha512 = "86RyEqULbbVoeo8OLcv+LQ1Vq2PKBAvWTU9fCgALxuCTbbs5Ppcvll4Vr+Ko1AnmMzja/k++SzNAwJfeQXVlpA=="; }; }; - "@parcel/fs-2.7.0" = { + "@parcel/fs-2.8.3" = { name = "_at_parcel_slash_fs"; packageName = "@parcel/fs"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.7.0.tgz"; - sha512 = "PU5fo4Hh8y03LZgemgVREttc0wyHQUNmsJCybxTB7EjJie2CqJRumo+DFppArlvdchLwJdc9em03yQV/GNWrEg=="; + url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.8.3.tgz"; + sha512 = "y+i+oXbT7lP0e0pJZi/YSm1vg0LDsbycFuHZIL80pNwdEppUAtibfJZCp606B7HOjMAlNZOBo48e3hPG3d8jgQ=="; }; }; - "@parcel/fs-search-2.7.0" = { + "@parcel/fs-search-2.8.3" = { name = "_at_parcel_slash_fs-search"; packageName = "@parcel/fs-search"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.7.0.tgz"; - sha512 = "K1Hv25bnRpwQVA15RvcRuB8ZhfclnCHA8N8L6w7Ul1ncSJDxCIkIAc5hAubYNNYW3kWjCC2SOaEgFKnbvMllEQ=="; + url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.8.3.tgz"; + sha512 = "DJBT2N8knfN7Na6PP2mett3spQLTqxFrvl0gv+TJRp61T8Ljc4VuUTb0hqBj+belaASIp3Q+e8+SgaFQu7wLiQ=="; }; }; - "@parcel/graph-2.7.0" = { + "@parcel/graph-2.8.3" = { name = "_at_parcel_slash_graph"; packageName = "@parcel/graph"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.7.0.tgz"; - sha512 = "Q6E94GS6q45PtsZh+m+gvFRp/N1Qopxhu2sxjcWsGs5iBd6IWn2oYLWOH5iVzEjWuYpW2HkB08lH6J50O63uOA=="; + url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.8.3.tgz"; + sha512 = "26GL8fYZPdsRhSXCZ0ZWliloK6DHlMJPWh6Z+3VVZ5mnDSbYg/rRKWmrkhnr99ZWmL9rJsv4G74ZwvDEXTMPBg=="; }; }; - "@parcel/hash-2.7.0" = { + "@parcel/hash-2.8.3" = { name = "_at_parcel_slash_hash"; packageName = "@parcel/hash"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.7.0.tgz"; - sha512 = "k6bSKnIlPJMPU3yjQzfgfvF9zuJZGOAlJgzpL4BbWvdbE8BTdjzLcFn0Ujrtud94EgIkiXd22sC2HpCUWoHGdA=="; + url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.8.3.tgz"; + sha512 = "FVItqzjWmnyP4ZsVgX+G00+6U2IzOvqDtdwQIWisCcVoXJFCqZJDy6oa2qDDFz96xCCCynjRjPdQx2jYBCpfYw=="; }; }; "@parcel/logger-1.11.1" = { @@ -9382,211 +9751,211 @@ let sha512 = "9NF3M6UVeP2udOBDILuoEHd8VrF4vQqoWHEafymO1pfSoOMfxrSJZw1MfyAAIUN/IFp9qjcpDCUbDZB+ioVevA=="; }; }; - "@parcel/logger-2.7.0" = { + "@parcel/logger-2.8.3" = { name = "_at_parcel_slash_logger"; packageName = "@parcel/logger"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.7.0.tgz"; - sha512 = "qjMY/bYo38+o+OiIrTRldU9CwL1E7J72t+xkTP8QIcUxLWz5LYR0YbynZUVulmBSfqsykjjxCy4a+8siVr+lPw=="; + url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.8.3.tgz"; + sha512 = "Kpxd3O/Vs7nYJIzkdmB6Bvp3l/85ydIxaZaPfGSGTYOfaffSOTkhcW9l6WemsxUrlts4za6CaEWcc4DOvaMOPA=="; }; }; - "@parcel/markdown-ansi-2.7.0" = { + "@parcel/markdown-ansi-2.8.3" = { name = "_at_parcel_slash_markdown-ansi"; packageName = "@parcel/markdown-ansi"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.7.0.tgz"; - sha512 = "ipOX0D6FVZFEXeb/z8MnTMq2RQEIuaILY90olVIuHEFLHHfOPEn+RK3u13HA1ChF5/9E3cMD79tu6x9JL9Kqag=="; + url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.8.3.tgz"; + sha512 = "4v+pjyoh9f5zuU/gJlNvNFGEAb6J90sOBwpKJYJhdWXLZMNFCVzSigxrYO+vCsi8G4rl6/B2c0LcwIMjGPHmFQ=="; }; }; - "@parcel/namer-default-2.7.0" = { + "@parcel/namer-default-2.8.3" = { name = "_at_parcel_slash_namer-default"; packageName = "@parcel/namer-default"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.7.0.tgz"; - sha512 = "lIKMdsmi//7fepecNDYmJYzBlL91HifPsX03lJCdu1dC6q5fBs+gG0XjKKG7yPnSCw1qH/4m7drzt9+dRZYAHQ=="; + url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.8.3.tgz"; + sha512 = "tJ7JehZviS5QwnxbARd8Uh63rkikZdZs1QOyivUhEvhN+DddSAVEdQLHGPzkl3YRk0tjFhbqo+Jci7TpezuAMw=="; }; }; - "@parcel/node-resolver-core-2.7.0" = { + "@parcel/node-resolver-core-2.8.3" = { name = "_at_parcel_slash_node-resolver-core"; packageName = "@parcel/node-resolver-core"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-2.7.0.tgz"; - sha512 = "5UJQHalqMxdhJIs2hhqQzFfQpF7+NAowsRq064lYtiRvcD8wMr3OOQ9wd1iazGpFSl4JKdT7BwDU9/miDJmanQ=="; + url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-2.8.3.tgz"; + sha512 = "12YryWcA5Iw2WNoEVr/t2HDjYR1iEzbjEcxfh1vaVDdZ020PiGw67g5hyIE/tsnG7SRJ0xdRx1fQ2hDgED+0Ww=="; }; }; - "@parcel/optimizer-css-2.7.0" = { + "@parcel/optimizer-css-2.8.3" = { name = "_at_parcel_slash_optimizer-css"; packageName = "@parcel/optimizer-css"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.7.0.tgz"; - sha512 = "IfnOMACqhcAclKyOW9X9JpsknB6OShk9OVvb8EvbDTKHJhQHNNmzE88OkSI/pS3ZVZP9Zj+nWcVHguV+kvDeiQ=="; + url = "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.8.3.tgz"; + sha512 = "JotGAWo8JhuXsQDK0UkzeQB0UR5hDAKvAviXrjqB4KM9wZNLhLleeEAW4Hk8R9smCeQFP6Xg/N/NkLDpqMwT3g=="; }; }; - "@parcel/optimizer-htmlnano-2.7.0" = { + "@parcel/optimizer-htmlnano-2.8.3" = { name = "_at_parcel_slash_optimizer-htmlnano"; packageName = "@parcel/optimizer-htmlnano"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.7.0.tgz"; - sha512 = "5QrGdWS5Hi4VXE3nQNrGqugmSXt68YIsWwKRAdarOxzyULSJS3gbCiQOXqIPRJobfZjnSIcdtkyxSiCUe1inIA=="; + url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.8.3.tgz"; + sha512 = "L8/fHbEy8Id2a2E0fwR5eKGlv9VYDjrH9PwdJE9Za9v1O/vEsfl/0T/79/x129l5O0yB6EFQkFa20MiK3b+vOg=="; }; }; - "@parcel/optimizer-image-2.7.0" = { + "@parcel/optimizer-image-2.8.3" = { name = "_at_parcel_slash_optimizer-image"; packageName = "@parcel/optimizer-image"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.7.0.tgz"; - sha512 = "EnaXz5UjR67FUu0BEcqZTT9LsbB/iFAkkghCotbnbOuC5QQsloq6tw54TKU3y+R3qsjgUoMtGxPcGfVoXxZXYw=="; + url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.8.3.tgz"; + sha512 = "SD71sSH27SkCDNUNx9A3jizqB/WIJr3dsfp+JZGZC42tpD/Siim6Rqy9M4To/BpMMQIIiEXa5ofwS+DgTEiEHQ=="; }; }; - "@parcel/optimizer-svgo-2.7.0" = { + "@parcel/optimizer-svgo-2.8.3" = { name = "_at_parcel_slash_optimizer-svgo"; packageName = "@parcel/optimizer-svgo"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.7.0.tgz"; - sha512 = "IO1JV4NpfP3V7FrhsqCcV8pDQIHraFi1/ZvEJyssITxjH49Im/txKlwMiQuZZryAPn8Xb8g395Muawuk6AK6sg=="; + url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.8.3.tgz"; + sha512 = "9KQed99NZnQw3/W4qBYVQ7212rzA9EqrQG019TIWJzkA9tjGBMIm2c/nXpK1tc3hQ3e7KkXkFCQ3C+ibVUnHNA=="; }; }; - "@parcel/optimizer-terser-2.7.0" = { + "@parcel/optimizer-terser-2.8.3" = { name = "_at_parcel_slash_optimizer-terser"; packageName = "@parcel/optimizer-terser"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.7.0.tgz"; - sha512 = "07VZjIO8xsl2/WmS/qHI8lI/cpu47iS9eRpqwfZEEsdk1cfz50jhWkmFudHBxiHGMfcZ//1+DdaPg9RDBWZtZA=="; + url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.8.3.tgz"; + sha512 = "9EeQlN6zIeUWwzrzu6Q2pQSaYsYGah8MtiQ/hog9KEPlYTP60hBv/+utDyYEHSQhL7y5ym08tPX5GzBvwAD/dA=="; }; }; - "@parcel/package-manager-2.7.0" = { + "@parcel/package-manager-2.8.3" = { name = "_at_parcel_slash_package-manager"; packageName = "@parcel/package-manager"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.7.0.tgz"; - sha512 = "wmfSX1mRrTi8MeA4KrnPk/x7zGUsILCQmTo6lA4gygzAxDbM1pGuyFN8/Kt0y0SFO2lbljARtD/4an5qdotH+Q=="; + url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.8.3.tgz"; + sha512 = "tIpY5pD2lH53p9hpi++GsODy6V3khSTX4pLEGuMpeSYbHthnOViobqIlFLsjni+QA1pfc8NNNIQwSNdGjYflVA=="; }; }; - "@parcel/packager-css-2.7.0" = { + "@parcel/packager-css-2.8.3" = { name = "_at_parcel_slash_packager-css"; packageName = "@parcel/packager-css"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.7.0.tgz"; - sha512 = "44nzZwu+ssGuiFmYM6cf/Y4iChiUZ4DUzzpegnGlhXtKJKe4NHntxThJynuRZWKN2AAf48avApDpimg2jW0KDw=="; + url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.8.3.tgz"; + sha512 = "WyvkMmsurlHG8d8oUVm7S+D+cC/T3qGeqogb7sTI52gB6uiywU7lRCizLNqGFyFGIxcVTVHWnSHqItBcLN76lA=="; }; }; - "@parcel/packager-html-2.7.0" = { + "@parcel/packager-html-2.8.3" = { name = "_at_parcel_slash_packager-html"; packageName = "@parcel/packager-html"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.7.0.tgz"; - sha512 = "Zgqd7sdcY/UnR370GR0q2ilmEohUDXsO8A1F28QCJzIsR1iCB6KRUT74+pawfQ1IhXZLaaFLLYe0UWcfm0JeXg=="; + url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.8.3.tgz"; + sha512 = "OhPu1Hx1RRKJodpiu86ZqL8el2Aa4uhBHF6RAL1Pcrh2EhRRlPf70Sk0tC22zUpYL7es+iNKZ/n0Rl+OWSHWEw=="; }; }; - "@parcel/packager-js-2.7.0" = { + "@parcel/packager-js-2.8.3" = { name = "_at_parcel_slash_packager-js"; packageName = "@parcel/packager-js"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.7.0.tgz"; - sha512 = "wTRdM81PgRVDzWGXdWmqLwguWnTYWzhEDdjXpW2n8uMOu/CjHhMtogk65aaYk3GOnq6OBL/NsrmBiV/zKPj1vA=="; + url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.8.3.tgz"; + sha512 = "0pGKC3Ax5vFuxuZCRB+nBucRfFRz4ioie19BbDxYnvBxrd4M3FIu45njf6zbBYsI9eXqaDnL1b3DcZJfYqtIzw=="; }; }; - "@parcel/packager-raw-2.7.0" = { + "@parcel/packager-raw-2.8.3" = { name = "_at_parcel_slash_packager-raw"; packageName = "@parcel/packager-raw"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.7.0.tgz"; - sha512 = "jg2Zp8dI5VpIQlaeahXDCfrPN9m/DKht1NkR9P2CylMAwqCcc1Xc1RRiF0wfwcPZpPMpq1265n+4qnB7rjGBlA=="; + url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.8.3.tgz"; + sha512 = "BA6enNQo1RCnco9MhkxGrjOk59O71IZ9DPKu3lCtqqYEVd823tXff2clDKHK25i6cChmeHu6oB1Rb73hlPqhUA=="; }; }; - "@parcel/packager-svg-2.7.0" = { + "@parcel/packager-svg-2.8.3" = { name = "_at_parcel_slash_packager-svg"; packageName = "@parcel/packager-svg"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.7.0.tgz"; - sha512 = "EmJg3HpD6/xxKBjir/CdCKJZwI24iVfBuxRS9LUp3xHAIebOzVh1z6IN+i2Di5+NyRwfOFaLliL4uMa1zwbyCA=="; + url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.8.3.tgz"; + sha512 = "mvIoHpmv5yzl36OjrklTDFShLUfPFTwrmp1eIwiszGdEBuQaX7JVI3Oo2jbVQgcN4W7J6SENzGQ3Q5hPTW3pMw=="; }; }; - "@parcel/plugin-2.7.0" = { + "@parcel/plugin-2.8.3" = { name = "_at_parcel_slash_plugin"; packageName = "@parcel/plugin"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.7.0.tgz"; - sha512 = "qqgx+nnMn6/0lRc4lKbLGmhNtBiT93S2gFNB4Eb4Pfz/SxVYoW+fmml+KdfOSiZffWOAH5L6NwhyD7N8aSikzw=="; + url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.8.3.tgz"; + sha512 = "jZ6mnsS4D9X9GaNnvrixDQwlUQJCohDX2hGyM0U0bY2NWU8Km97SjtoCpWjq+XBCx/gpC4g58+fk9VQeZq2vlw=="; }; }; - "@parcel/reporter-cli-2.7.0" = { + "@parcel/reporter-cli-2.8.3" = { name = "_at_parcel_slash_reporter-cli"; packageName = "@parcel/reporter-cli"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.7.0.tgz"; - sha512 = "80gEODg8cnAmnxGVuaSVDo8JJ54P9AA2bHwSs1cIkHWlJ3BjDQb83H31bBHncJ5Kn5kQ/j+7WjlqHpTCiOR9PA=="; + url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.8.3.tgz"; + sha512 = "3sJkS6tFFzgIOz3u3IpD/RsmRxvOKKiQHOTkiiqRt1l44mMDGKS7zANRnJYsQzdCsgwc9SOP30XFgJwtoVlMbw=="; }; }; - "@parcel/reporter-dev-server-2.7.0" = { + "@parcel/reporter-dev-server-2.8.3" = { name = "_at_parcel_slash_reporter-dev-server"; packageName = "@parcel/reporter-dev-server"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.7.0.tgz"; - sha512 = "ySuou5addK8fGue8aXzo536BaEjMujDrEc1xkp4TasInXHVcA98b+SYX5NAZTGob5CxKvZQ5ylhg77zW30B+iA=="; + url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.8.3.tgz"; + sha512 = "Y8C8hzgzTd13IoWTj+COYXEyCkXfmVJs3//GDBsH22pbtSFMuzAZd+8J9qsCo0EWpiDow7V9f1LischvEh3FbQ=="; }; }; - "@parcel/resolver-default-2.7.0" = { + "@parcel/resolver-default-2.8.3" = { name = "_at_parcel_slash_resolver-default"; packageName = "@parcel/resolver-default"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.7.0.tgz"; - sha512 = "v8TvWsbLK7/q7n4gv6OrYNbW18xUx4zKbVMGZb1u4yMhzEH4HFr1D9OeoTq3jk+ximAigds8B6triQbL5exF7A=="; + url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.8.3.tgz"; + sha512 = "k0B5M/PJ+3rFbNj4xZSBr6d6HVIe6DH/P3dClLcgBYSXAvElNDfXgtIimbjCyItFkW9/BfcgOVKEEIZOeySH/A=="; }; }; - "@parcel/runtime-browser-hmr-2.7.0" = { + "@parcel/runtime-browser-hmr-2.8.3" = { name = "_at_parcel_slash_runtime-browser-hmr"; packageName = "@parcel/runtime-browser-hmr"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.7.0.tgz"; - sha512 = "PLbMLdclQeYsi2LkilZVGFV1n3y55G1jaBvby4ekedUZjMw3SWdMY2tDxgSDdFWfLCnYHJXdGUQSzGGi1kPzjA=="; + url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.8.3.tgz"; + sha512 = "2O1PYi2j/Q0lTyGNV3JdBYwg4rKo6TEVFlYGdd5wCYU9ZIN9RRuoCnWWH2qCPj3pjIVtBeppYxzfVjPEHINWVg=="; }; }; - "@parcel/runtime-js-2.7.0" = { + "@parcel/runtime-js-2.8.3" = { name = "_at_parcel_slash_runtime-js"; packageName = "@parcel/runtime-js"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.7.0.tgz"; - sha512 = "9/YUZTBNrSN2H6rbz/o1EOM0O7I3ZR/x9IDzxjJBD6Mi+0uCgCD02aedare/SNr1qgnbZZWmhpOzC+YgREcfLA=="; + url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.8.3.tgz"; + sha512 = "IRja0vNKwvMtPgIqkBQh0QtRn0XcxNC8HU1jrgWGRckzu10qJWO+5ULgtOeR4pv9krffmMPqywGXw6l/gvJKYQ=="; }; }; - "@parcel/runtime-react-refresh-2.7.0" = { + "@parcel/runtime-react-refresh-2.8.3" = { name = "_at_parcel_slash_runtime-react-refresh"; packageName = "@parcel/runtime-react-refresh"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.7.0.tgz"; - sha512 = "vDKO0rWqRzEpmvoZ4kkYUiSsTxT5NnH904BFPFxKI0wJCl6yEmPuEifmATo73OuYhP6jIP3Qfl1R4TtiDFPJ1Q=="; + url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.8.3.tgz"; + sha512 = "2v/qFKp00MfG0234OdOgQNAo6TLENpFYZMbVbAsPMY9ITiqG73MrEsrGXVoGbYiGTMB/Toer/lSWlJxtacOCuA=="; }; }; - "@parcel/runtime-service-worker-2.7.0" = { + "@parcel/runtime-service-worker-2.8.3" = { name = "_at_parcel_slash_runtime-service-worker"; packageName = "@parcel/runtime-service-worker"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.7.0.tgz"; - sha512 = "uD2pAV0yV6+e7JaWH4KVPbG+zRCrxr/OACyS9tIh+Q/R1vRmh8zGM3yhdrcoiZ7tFOnM72vd6xY11eTrUsSVig=="; + url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.8.3.tgz"; + sha512 = "/Skkw+EeRiwzOJso5fQtK8c9b452uWLNhQH1ISTodbmlcyB4YalAiSsyHCtMYD0c3/t5Sx4ZS7vxBAtQd0RvOw=="; }; }; "@parcel/source-map-2.1.1" = { @@ -9598,112 +9967,112 @@ let sha512 = "Ejx1P/mj+kMjQb8/y5XxDUn4reGdr+WyKYloBljpppUy8gs42T+BNoEOuRYqDVdgPc6NxduzIDoJS9pOFfV5Ew=="; }; }; - "@parcel/transformer-babel-2.7.0" = { + "@parcel/transformer-babel-2.8.3" = { name = "_at_parcel_slash_transformer-babel"; packageName = "@parcel/transformer-babel"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.7.0.tgz"; - sha512 = "7iklDXXnKH1530+QbI+e4kIJ+Q1puA1ulRS10db3aUJMj5GnvXGDFwhSZ7+T1ps66QHO7cVO29VlbqiRDarH1Q=="; + url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.8.3.tgz"; + sha512 = "L6lExfpvvC7T/g3pxf3CIJRouQl+sgrSzuWQ0fD4PemUDHvHchSP4SNUVnd6gOytF3Y1KpnEZIunQGi5xVqQCQ=="; }; }; - "@parcel/transformer-css-2.7.0" = { + "@parcel/transformer-css-2.8.3" = { name = "_at_parcel_slash_transformer-css"; packageName = "@parcel/transformer-css"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.7.0.tgz"; - sha512 = "J4EpWK9spQpXyNCmKK8Xnane0xW/1B/EAmfp7Fiv7g+5yUjY4ODf4KUugvE+Eb2gekPkhOKNHermO2KrX0/PFA=="; + url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.8.3.tgz"; + sha512 = "xTqFwlSXtnaYen9ivAgz+xPW7yRl/u4QxtnDyDpz5dr8gSeOpQYRcjkd4RsYzKsWzZcGtB5EofEk8ayUbWKEUg=="; }; }; - "@parcel/transformer-html-2.7.0" = { + "@parcel/transformer-html-2.8.3" = { name = "_at_parcel_slash_transformer-html"; packageName = "@parcel/transformer-html"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.7.0.tgz"; - sha512 = "wYJl5rn81W+Rlk9oQwDJcjoVsWVDKyeri84FzmlGXOsg0EYgnqOiG+3MDM8GeZjfuGe5fuoum4eqZeS0WdUHXw=="; + url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.8.3.tgz"; + sha512 = "kIZO3qsMYTbSnSpl9cnZog+SwL517ffWH54JeB410OSAYF1ouf4n5v9qBnALZbuCCmPwJRGs4jUtE452hxwN4g=="; }; }; - "@parcel/transformer-image-2.7.0" = { + "@parcel/transformer-image-2.8.3" = { name = "_at_parcel_slash_transformer-image"; packageName = "@parcel/transformer-image"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.7.0.tgz"; - sha512 = "mhi9/R5/ULhCkL2COVIKhNFoLDiZwQgprdaTJr5fnODggVxEX5o7ebFV6KNLMTEkwZUJWoB1hL0ziI0++DtoFA=="; + url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.8.3.tgz"; + sha512 = "cO4uptcCGTi5H6bvTrAWEFUsTNhA4kCo8BSvRSCHA2sf/4C5tGQPHt3JhdO0GQLPwZRCh/R41EkJs5HZ8A8DAg=="; }; }; - "@parcel/transformer-js-2.7.0" = { + "@parcel/transformer-js-2.8.3" = { name = "_at_parcel_slash_transformer-js"; packageName = "@parcel/transformer-js"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.7.0.tgz"; - sha512 = "mzerR+D4rDomUSIk5RSTa2w+DXBdXUeQrpDO74WCDdpDi1lIl8ppFpqtmU7O6y6p8QsgkmS9b0g/vhcry6CJTA=="; + url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.8.3.tgz"; + sha512 = "9Qd6bib+sWRcpovvzvxwy/PdFrLUXGfmSW9XcVVG8pvgXsZPFaNjnNT8stzGQj1pQiougCoxMY4aTM5p1lGHEQ=="; }; }; - "@parcel/transformer-json-2.7.0" = { + "@parcel/transformer-json-2.8.3" = { name = "_at_parcel_slash_transformer-json"; packageName = "@parcel/transformer-json"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.7.0.tgz"; - sha512 = "RQjuxBpYOch+kr4a0zi77KJtOLTPYRM7iq4NN80zKnA0r0dwDUCxZBtaj2l0O0o3R4MMJnm+ncP+cB7XR7dZYA=="; + url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.8.3.tgz"; + sha512 = "B7LmVq5Q7bZO4ERb6NHtRuUKWGysEeaj9H4zelnyBv+wLgpo4f5FCxSE1/rTNmP9u1qHvQ3scGdK6EdSSokGPg=="; }; }; - "@parcel/transformer-postcss-2.7.0" = { + "@parcel/transformer-postcss-2.8.3" = { name = "_at_parcel_slash_transformer-postcss"; packageName = "@parcel/transformer-postcss"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.7.0.tgz"; - sha512 = "b6RskXBWf0MjpC9qjR2dQ1ZdRnlOiKYseG5CEovWCqM218RtdydFKz7jS+5Gxkb6qBtOG7zGPONXdPe+gTILcA=="; + url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.8.3.tgz"; + sha512 = "e8luB/poIlz6jBsD1Izms+6ElbyzuoFVa4lFVLZnTAChI3UxPdt9p/uTsIO46HyBps/Bk8ocvt3J4YF84jzmvg=="; }; }; - "@parcel/transformer-posthtml-2.7.0" = { + "@parcel/transformer-posthtml-2.8.3" = { name = "_at_parcel_slash_transformer-posthtml"; packageName = "@parcel/transformer-posthtml"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.7.0.tgz"; - sha512 = "cP8YOiSynWJ1ycmBlhnnHeuQb2cwmklZ+BNyLUktj5p78kDy2de7VjX+dRNRHoW4H9OgEcSF4UEfDVVz5RYIhw=="; + url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.8.3.tgz"; + sha512 = "pkzf9Smyeaw4uaRLsT41RGrPLT5Aip8ZPcntawAfIo+KivBQUV0erY1IvHYjyfFzq1ld/Fo2Ith9He6mxpPifA=="; }; }; - "@parcel/transformer-raw-2.7.0" = { + "@parcel/transformer-raw-2.8.3" = { name = "_at_parcel_slash_transformer-raw"; packageName = "@parcel/transformer-raw"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.7.0.tgz"; - sha512 = "sDnItWCFSDez0izK1i5cgv+kXzZTbcJh4rNpVIgmE1kBLvAz608sqgcCkavb2wVJIvLesxYM+5G4p1CwkDlZ1g=="; + url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.8.3.tgz"; + sha512 = "G+5cXnd2/1O3nV/pgRxVKZY/HcGSseuhAe71gQdSQftb8uJEURyUHoQ9Eh0JUD3MgWh9V+nIKoyFEZdf9T0sUQ=="; }; }; - "@parcel/transformer-react-refresh-wrap-2.7.0" = { + "@parcel/transformer-react-refresh-wrap-2.8.3" = { name = "_at_parcel_slash_transformer-react-refresh-wrap"; packageName = "@parcel/transformer-react-refresh-wrap"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.7.0.tgz"; - sha512 = "1vRmIJzyBA1nIiXTAU6tZExq2FvJj/2F0ft6KDw8GYPv0KjmdiPo/PmaZ7JeSVOM6SdXQIQCbTmp1vkMP7DtkA=="; + url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.8.3.tgz"; + sha512 = "q8AAoEvBnCf/nPvgOwFwKZfEl/thwq7c2duxXkhl+tTLDRN2vGmyz4355IxCkavSX+pLWSQ5MexklSEeMkgthg=="; }; }; - "@parcel/transformer-svg-2.7.0" = { + "@parcel/transformer-svg-2.8.3" = { name = "_at_parcel_slash_transformer-svg"; packageName = "@parcel/transformer-svg"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.7.0.tgz"; - sha512 = "ioER37zceuuE+K6ZrnjCyMUWEnv+63hIAFResc1OXxRhyt+7kzMz9ZqK0Mt6QMLwl1dxhkLmrU41n9IxzKZuSQ=="; + url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.8.3.tgz"; + sha512 = "3Zr/gBzxi1ZH1fftH/+KsZU7w5GqkmxlB0ZM8ovS5E/Pl1lq1t0xvGJue9m2VuQqP8Mxfpl5qLFmsKlhaZdMIQ=="; }; }; - "@parcel/types-2.7.0" = { + "@parcel/types-2.8.3" = { name = "_at_parcel_slash_types"; packageName = "@parcel/types"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/types/-/types-2.7.0.tgz"; - sha512 = "+dhXVUnseTCpJvBTGMp0V6X13z6O/A/+CUtwEpMGZ8XSmZ4Gk44GvaTiBOp0bJpWG4fvCKp+UmC8PYbrDiiziw=="; + url = "https://registry.npmjs.org/@parcel/types/-/types-2.8.3.tgz"; + sha512 = "FECA1FB7+0UpITKU0D6TgGBpGxYpVSMNEENZbSJxFSajNy3wrko+zwBKQmFOLOiPcEtnGikxNs+jkFWbPlUAtw=="; }; }; "@parcel/utils-1.11.0" = { @@ -9715,13 +10084,13 @@ let sha512 = "cA3p4jTlaMeOtAKR/6AadanOPvKeg8VwgnHhOyfi0yClD0TZS/hi9xu12w4EzA/8NtHu0g6o4RDfcNjqN8l1AQ=="; }; }; - "@parcel/utils-2.7.0" = { + "@parcel/utils-2.8.3" = { name = "_at_parcel_slash_utils"; packageName = "@parcel/utils"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.7.0.tgz"; - sha512 = "jNZ5bIGg1r1RDRKi562o4kuVwnz+XJ2Ie3b0Zwrqwvgfj6AbRFIKzDd+h85dWWmcDYzKUbHp11u6VJl1u8Vapg=="; + url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.8.3.tgz"; + sha512 = "IhVrmNiJ+LOKHcCivG5dnuLGjhPYxQ/IzbnF2DKNQXWBTsYlHkJZpmz7THoeLtLliGmSOZ3ZCsbR8/tJJKmxjA=="; }; }; "@parcel/watcher-1.12.1" = { @@ -9742,13 +10111,13 @@ let sha512 = "cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg=="; }; }; - "@parcel/watcher-2.0.7" = { + "@parcel/watcher-2.1.0" = { name = "_at_parcel_slash_watcher"; packageName = "@parcel/watcher"; - version = "2.0.7"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.7.tgz"; - sha512 = "gc3hoS6e+2XdIQ4HHljDB1l0Yx2EWh/sBBtCEFNKGSMlwASWeAQsOY/fPbxOBcZ/pg0jBh4Ga+4xHlZc4faAEQ=="; + url = "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.1.0.tgz"; + sha512 = "8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw=="; }; }; "@parcel/workers-1.11.0" = { @@ -9760,22 +10129,22 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@parcel/workers-2.7.0" = { + "@parcel/workers-2.8.3" = { name = "_at_parcel_slash_workers"; packageName = "@parcel/workers"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.7.0.tgz"; - sha512 = "99VfaOX+89+RaoTSyH9ZQtkMBFZBFMvJmVJ/GeJT6QCd2wtKBStTHlaSnQOkLD/iRjJCNwV2xpZmm8YkTwV+hg=="; + url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.8.3.tgz"; + sha512 = "+AxBnKgjqVpUHBcHLWIHcjYgKIvHIpZjN33mG5LG9XXvrZiqdWvouEzqEXlVLq5VzzVbKIQQcmsvRy138YErkg=="; }; }; - "@peculiar/asn1-schema-2.3.0" = { + "@peculiar/asn1-schema-2.3.3" = { name = "_at_peculiar_slash_asn1-schema"; packageName = "@peculiar/asn1-schema"; - version = "2.3.0"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.0.tgz"; - sha512 = "DtNLAG4vmDrdSJFPe7rypkcj597chNQL7u+2dBtYo5mh7VW2+im6ke+O0NVr8W1f4re4C3F71LhoMb0Yxqa48Q=="; + url = "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.3.tgz"; + sha512 = "6GptMYDMyWBHTUKndHaDsRZUO/XMSgIns2krxcm2L7SEExRHwawFvSwNBhqNPR9HJwv3MruAiF1bhN0we6j6GQ=="; }; }; "@peculiar/json-schema-1.1.12" = { @@ -9850,13 +10219,40 @@ let sha512 = "SXsM27SGH3yTWKc2fKR4SYNxsmnvuBQ9dd6QHtEWmiZ/VqaOYPAIlS8+vMcn27YLtAEBGvNRSh3TPNvtjZgfqA=="; }; }; - "@pnpm/network.ca-file-1.0.1" = { - name = "_at_pnpm_slash_network.ca-file"; - packageName = "@pnpm/network.ca-file"; + "@pnpm/crypto.base32-hash-1.0.1" = { + name = "_at_pnpm_slash_crypto.base32-hash"; + packageName = "@pnpm/crypto.base32-hash"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.1.tgz"; - sha512 = "gkINruT2KUhZLTaiHxwCOh1O4NVnFT0wLjWFBHmTz9vpKag/C/noIMJXBxFe4F0mYpUVX2puLwAieLYFg2NvoA=="; + url = "https://registry.npmjs.org/@pnpm/crypto.base32-hash/-/crypto.base32-hash-1.0.1.tgz"; + sha512 = "pzAXNn6KxTA3kbcI3iEnYs4vtH51XEVqmK/1EiD18MaPKylhqy8UvMJK3zKG+jeP82cqQbozcTGm4yOQ8i3vNw=="; + }; + }; + "@pnpm/error-1.4.0" = { + name = "_at_pnpm_slash_error"; + packageName = "@pnpm/error"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/error/-/error-1.4.0.tgz"; + sha512 = "vxkRrkneBPVmP23kyjnYwVOtipwlSl6UfL+h+Xa3TrABJTz5rYBXemlTsU5BzST8U4pD7YDkTb3SQu+MMuIDKA=="; + }; + }; + "@pnpm/link-bins-5.3.25" = { + name = "_at_pnpm_slash_link-bins"; + packageName = "@pnpm/link-bins"; + version = "5.3.25"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/link-bins/-/link-bins-5.3.25.tgz"; + sha512 = "9Xq8lLNRHFDqvYPXPgaiKkZ4rtdsm7izwM/cUsFDc5IMnG0QYIVBXQbgwhz2UvjUotbJrvfKLJaCfA3NGBnLDg=="; + }; + }; + "@pnpm/network.ca-file-1.0.2" = { + name = "_at_pnpm_slash_network.ca-file"; + packageName = "@pnpm/network.ca-file"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz"; + sha512 = "YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA=="; }; }; "@pnpm/npm-conf-1.0.5" = { @@ -9868,6 +10264,69 @@ let sha512 = "hD8ml183638O3R6/Txrh0L8VzGOrFXgRtRDG4qQC4tONdZ5Z1M+tlUUDUvrjYdmK6G+JTBTeaCLMna11cXzi8A=="; }; }; + "@pnpm/package-bins-4.1.0" = { + name = "_at_pnpm_slash_package-bins"; + packageName = "@pnpm/package-bins"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/package-bins/-/package-bins-4.1.0.tgz"; + sha512 = "57/ioGYLBbVRR80Ux9/q2i3y8Q+uQADc3c+Yse8jr/60YLOi3jcWz13e2Jy+ANYtZI258Qc5wk2X077rp0Ly/Q=="; + }; + }; + "@pnpm/read-modules-dir-2.0.3" = { + name = "_at_pnpm_slash_read-modules-dir"; + packageName = "@pnpm/read-modules-dir"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/read-modules-dir/-/read-modules-dir-2.0.3.tgz"; + sha512 = "i9OgRvSlxrTS9a2oXokhDxvQzDtfqtsooJ9jaGoHkznue5aFCTSrNZFQ6M18o8hC03QWfnxaKi0BtOvNkKu2+A=="; + }; + }; + "@pnpm/read-package-json-4.0.0" = { + name = "_at_pnpm_slash_read-package-json"; + packageName = "@pnpm/read-package-json"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/read-package-json/-/read-package-json-4.0.0.tgz"; + sha512 = "1cr2tEwe4YU6SI0Hmg+wnsr6yxBt2iJtqv6wrF84On8pS9hx4A2PLw3CIgbwxaG0b+ur5wzhNogwl4qD5FLFNg=="; + }; + }; + "@pnpm/read-project-manifest-1.1.7" = { + name = "_at_pnpm_slash_read-project-manifest"; + packageName = "@pnpm/read-project-manifest"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/read-project-manifest/-/read-project-manifest-1.1.7.tgz"; + sha512 = "tj8ExXZeDcMmMUj7D292ETe/RiEirr1X1wpT6Zy85z2MrFYoG9jfCJpps40OdZBNZBhxbuKtGPWKVSgXD0yrVw=="; + }; + }; + "@pnpm/types-6.4.0" = { + name = "_at_pnpm_slash_types"; + packageName = "@pnpm/types"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/types/-/types-6.4.0.tgz"; + sha512 = "nco4+4sZqNHn60Y4VE/fbtlShCBqipyUO+nKRPvDHqLrecMW9pzHWMVRxk4nrMRoeowj3q0rX3GYRBa8lsHTAg=="; + }; + }; + "@pnpm/types-8.9.0" = { + name = "_at_pnpm_slash_types"; + packageName = "@pnpm/types"; + version = "8.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/types/-/types-8.9.0.tgz"; + sha512 = "3MYHYm8epnciApn6w5Fzx6sepawmsNU7l6lvIq+ER22/DPSrr83YMhU/EQWnf4lORn2YyiXFj0FJSyJzEtIGmw=="; + }; + }; + "@pnpm/write-project-manifest-1.1.7" = { + name = "_at_pnpm_slash_write-project-manifest"; + packageName = "@pnpm/write-project-manifest"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/write-project-manifest/-/write-project-manifest-1.1.7.tgz"; + sha512 = "OLkDZSqkA1mkoPNPvLFXyI6fb0enCuFji6Zfditi/CLAo9kmIhQFmEUDu4krSB8i908EljG8YwL5Xjxzm5wsWA=="; + }; + }; "@polka/url-1.0.0-next.21" = { name = "_at_polka_slash_url"; packageName = "@polka/url"; @@ -9886,31 +10345,31 @@ let sha512 = "50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="; }; }; - "@primer/octicons-17.8.0" = { + "@primer/octicons-17.10.2" = { name = "_at_primer_slash_octicons"; packageName = "@primer/octicons"; - version = "17.8.0"; + version = "17.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@primer/octicons/-/octicons-17.8.0.tgz"; - sha512 = "2OyvErMeqsJ/K1ZbQ902QowrwqXq+BMmGiL+PGqFzUQ85wmaWj+CobOwWPxBLs/xVGzacJJPt4fWcx4EMoRMkg=="; + url = "https://registry.npmjs.org/@primer/octicons/-/octicons-17.10.2.tgz"; + sha512 = "J/p2PcgT39Za4wpukbN6iUkEUvL5aE7Bs9kXBeEkrjEgc0Uu7J7B2ypwx9J0qM3m3lk2273RT5/4oGv8pfFLcg=="; }; }; - "@prisma/engines-4.5.0" = { + "@prisma/engines-4.9.0" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "4.5.0"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-4.5.0.tgz"; - sha512 = "4t9ir2SbQQr/wMCNU4YpHWp5hU14J2m3wHUZnGJPpmBF8YtkisxyVyQsKd1e6FyLTaGq8LOLhm6VLYHKqKNm+g=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-4.9.0.tgz"; + sha512 = "t1pt0Gsp+HcgPJrHFc+d/ZSAaKKWar2G/iakrE07yeKPNavDP3iVKPpfXP22OTCHZUWf7OelwKJxQgKAm5hkgw=="; }; }; - "@prisma/prisma-fmt-wasm-4.5.0-43.0362da9eebca54d94c8ef5edd3b2e90af99ba452" = { + "@prisma/prisma-fmt-wasm-4.9.0-42.ceb5c99003b99c9ee2c1d2e618e359c14aef2ea5" = { name = "_at_prisma_slash_prisma-fmt-wasm"; packageName = "@prisma/prisma-fmt-wasm"; - version = "4.5.0-43.0362da9eebca54d94c8ef5edd3b2e90af99ba452"; + version = "4.9.0-42.ceb5c99003b99c9ee2c1d2e618e359c14aef2ea5"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-4.5.0-43.0362da9eebca54d94c8ef5edd3b2e90af99ba452.tgz"; - sha512 = "MYWUyB+sk3AL/dJFdAzoGbmcYQKA3F8SzsdPUCVfH3I0FujdwbR+pabIXogOHVt8eZySiJWW7+yAWOD2GkBtoA=="; + url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-4.9.0-42.ceb5c99003b99c9ee2c1d2e618e359c14aef2ea5.tgz"; + sha512 = "G754IrVEiv0OuhD47d16Jzu3yjFzoQobP97N0nqzFnOAsJehn9KiSNiJ/DM4kp3uL+MqcJzb+YW4l8OqrBoV5A=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -10003,13 +10462,13 @@ let sha512 = "Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="; }; }; - "@putdotio/api-client-8.32.0" = { + "@putdotio/api-client-8.33.1" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; - version = "8.32.0"; + version = "8.33.1"; src = fetchurl { - url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.32.0.tgz"; - sha512 = "eo4KiXIvDKpU76VK1pQitIJ6neDd81HUCoUGcH+lAtcfN+amQVp8e9cHfYeEvYMj16sr/8wONqG1GayJP2Fr4g=="; + url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.33.1.tgz"; + sha512 = "16mQ2diUm2/smxLG0PummI3G66GY3Fqtd1D6K64knPvaZUR1bRYhEJaXHdgiQLpl2PNYZl4MCyHXJ217t2RK2w=="; }; }; "@reach/router-1.3.4" = { @@ -10039,13 +10498,13 @@ let sha512 = "EBw7Ag1hPgFzdznK2PBblc1kdlj5B5Cw3XwI9/oG7tSn85/HKy3X9xHy/8tm/eNXJYHLXHJL/pkwBpFMVVefkw=="; }; }; - "@redis/bloom-1.1.0" = { + "@redis/bloom-1.2.0" = { name = "_at_redis_slash_bloom"; packageName = "@redis/bloom"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/bloom/-/bloom-1.1.0.tgz"; - sha512 = "9QovlxmpRtvxVbN0UBcv8WfdSMudNZZTFqCsnBszcQXqaZb/TVe30ScgGEO7u1EAIacTPAo7/oCYjYAxiHLanQ=="; + url = "https://registry.npmjs.org/@redis/bloom/-/bloom-1.2.0.tgz"; + sha512 = "HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg=="; }; }; "@redis/client-1.2.0" = { @@ -10057,13 +10516,13 @@ let sha512 = "a8Nlw5fv2EIAFJxTDSSDVUT7yfBGpZO96ybZXzQpgkyLg/dxtQ1uiwTc0EGfzg1mrPjZokeBSEGTbGXekqTNOg=="; }; }; - "@redis/client-1.3.1" = { + "@redis/client-1.5.3" = { name = "_at_redis_slash_client"; packageName = "@redis/client"; - version = "1.3.1"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/client/-/client-1.3.1.tgz"; - sha512 = "FKEHpOu7Q4+cuM6VWjA54988K5jkqOxvhvj2hEGSx086lvKwXyjzO7Lya7hcirZ0/Db8FLBJN7UXsJuyoNWPJg=="; + url = "https://registry.npmjs.org/@redis/client/-/client-1.5.3.tgz"; + sha512 = "kPad3QmWyRcmFj1gnb+SkzjXBV7oPpyTJmasVA+ocgNClxqZaTJjLFReqxm9cZQiCtqZK9vrcTISNrgzQXFpLg=="; }; }; "@redis/graph-1.0.1" = { @@ -10111,13 +10570,13 @@ let sha512 = "pP+ZQRis5P21SD6fjyCeLcQdps+LuTzp2wdUbzxEmNhleighDDTD5ck8+cYof+WLec4csZX7ks+BuoMw0RaZrA=="; }; }; - "@redis/search-1.1.0" = { + "@redis/search-1.1.1" = { name = "_at_redis_slash_search"; packageName = "@redis/search"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/search/-/search-1.1.0.tgz"; - sha512 = "NyFZEVnxIJEybpy+YskjgOJRNsfTYqaPbK/Buv6W2kmFNaRk85JiqjJZA5QkRmWvGbyQYwoO5QfDi2wHskKrQQ=="; + url = "https://registry.npmjs.org/@redis/search/-/search-1.1.1.tgz"; + sha512 = "pqCXTc5e7wJJgUuJiC3hBgfoFRoPxYzwn0BEfKgejTM7M/9zP3IpUcqcjgfp8hF+LoV8rHZzcNTz7V+pEIY7LQ=="; }; }; "@redis/time-series-1.0.3" = { @@ -10129,6 +10588,15 @@ let sha512 = "OFp0q4SGrTH0Mruf6oFsHGea58u8vS/iI5+NpYdicaM+7BgqBZH8FFvNZ8rYYLrUO/QRqMq72NpXmxLVNcdmjA=="; }; }; + "@redis/time-series-1.0.4" = { + name = "_at_redis_slash_time-series"; + packageName = "@redis/time-series"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.4.tgz"; + sha512 = "ThUIgo2U/g7cCuZavucQTQzA9g9JbDDY2f64u3AbAoz/8vE2lt2U37LamDUVChhaDA3IRT9R6VvJwqnUfTJzng=="; + }; + }; "@redocly/ajv-8.11.0" = { name = "_at_redocly_slash_ajv"; packageName = "@redocly/ajv"; @@ -10138,13 +10606,13 @@ let sha512 = "9GWx27t7xWhDIR02PA18nzBdLcKQRgc46xNQvjFkrYk4UOmvKhJ/dawwiX0cCOeetN5LcaaiqQbVOWYK62SGHw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.112" = { + "@redocly/openapi-core-1.0.0-beta.122" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.112"; + version = "1.0.0-beta.122"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.112.tgz"; - sha512 = "VNJPQwLUvTtgsMrd4CAPnl6zJWvggHE50LCOhnQAReyo4Em7HAGYYo9v920HbIgZ5LCB6Y/f5QUTINrgYPaTkg=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.122.tgz"; + sha512 = "oky8yeq0Bodw+lj+jxPP4PZPdsN+Fx71N0X5PPEGzMe8zBhFnOAXMR7auA02gHz7DhOnCZ7kTNV1KcftRtSRNg=="; }; }; "@repeaterjs/repeater-3.0.4" = { @@ -10156,6 +10624,123 @@ let sha512 = "AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA=="; }; }; + "@resvg/resvg-js-2.2.0" = { + name = "_at_resvg_slash_resvg-js"; + packageName = "@resvg/resvg-js"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js/-/resvg-js-2.2.0.tgz"; + sha512 = "Btc6Bht2Y8jBlS1RqVYsPWQaL1WgeGZd/TasmQpCsh0s5Ax1Kw0zyr6DCpvlNYG6b3mNnmJ5ib44A5MIQZmrEQ=="; + }; + }; + "@resvg/resvg-js-android-arm-eabi-2.2.0" = { + name = "_at_resvg_slash_resvg-js-android-arm-eabi"; + packageName = "@resvg/resvg-js-android-arm-eabi"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.2.0.tgz"; + sha512 = "w3lAI6R5cfxGM5oxX6XhEFob4mJkkyfKm0veUQJOg65J4dznwcaJ54lGuQPfjAPhcHxSk/w+7BvFLjbbjV09qw=="; + }; + }; + "@resvg/resvg-js-android-arm64-2.2.0" = { + name = "_at_resvg_slash_resvg-js-android-arm64"; + packageName = "@resvg/resvg-js-android-arm64"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.2.0.tgz"; + sha512 = "rzo0IqUErz1GzPthmU3wB25Vvdyr6KGI+J2WqALgSqmFxJ/sDygT2/6tirb4Lp1IjbvLhzO3uA6SP/sMwcWNfw=="; + }; + }; + "@resvg/resvg-js-darwin-arm64-2.2.0" = { + name = "_at_resvg_slash_resvg-js-darwin-arm64"; + packageName = "@resvg/resvg-js-darwin-arm64"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.2.0.tgz"; + sha512 = "MHJBjUh+xlZeMXcHqGiBO5d5CcgNAd0pXXaOmQtcamfBN5oc9SCJP3z137BEN5RhE6bgz6Wl88Sv1Jh3Wn0nlA=="; + }; + }; + "@resvg/resvg-js-darwin-x64-2.2.0" = { + name = "_at_resvg_slash_resvg-js-darwin-x64"; + packageName = "@resvg/resvg-js-darwin-x64"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.2.0.tgz"; + sha512 = "y6uaW/lWgvqpoeTA2hrgPlvNS7kbduBpUfYCpmk7KzOEMBzUUssOHT+DgqlQ7SZOi01mL6DHeDpAjvzM7K4Ocw=="; + }; + }; + "@resvg/resvg-js-linux-arm-gnueabihf-2.2.0" = { + name = "_at_resvg_slash_resvg-js-linux-arm-gnueabihf"; + packageName = "@resvg/resvg-js-linux-arm-gnueabihf"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.2.0.tgz"; + sha512 = "G32NqLnuYilT3z5oD5AKXZvpD/ZPRzP1t2T0dvqQC6kBE6c5ckhdCbyT0gnnarcvMoXP+J/xh7kadEp3V8wFDg=="; + }; + }; + "@resvg/resvg-js-linux-arm64-gnu-2.2.0" = { + name = "_at_resvg_slash_resvg-js-linux-arm64-gnu"; + packageName = "@resvg/resvg-js-linux-arm64-gnu"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.2.0.tgz"; + sha512 = "R0KJCCyjFcTDFT+nAVlP/CYUMIEjxSkSJsEED9QesulCxMY/aoO52p91FgQrGjecORkASNXovlqS3HsNYbCTOg=="; + }; + }; + "@resvg/resvg-js-linux-arm64-musl-2.2.0" = { + name = "_at_resvg_slash_resvg-js-linux-arm64-musl"; + packageName = "@resvg/resvg-js-linux-arm64-musl"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.2.0.tgz"; + sha512 = "Ir83lcBsuB6YVkAVPW4AAOzYo/F9kjlx2HA/O3vCjy/Rn5u5Xf2fGANfJxfCHUCtDMcqmM4hjdF2fOzqS9fusw=="; + }; + }; + "@resvg/resvg-js-linux-x64-gnu-2.2.0" = { + name = "_at_resvg_slash_resvg-js-linux-x64-gnu"; + packageName = "@resvg/resvg-js-linux-x64-gnu"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.2.0.tgz"; + sha512 = "pH1GdShtIDF3fmQZM9NTEEdZPkNKQ+XUJb7r1jaD8gusdXeD2ejWWi/uvlsugaoMoG0tUmMZi78eVm4IjlY+gw=="; + }; + }; + "@resvg/resvg-js-linux-x64-musl-2.2.0" = { + name = "_at_resvg_slash_resvg-js-linux-x64-musl"; + packageName = "@resvg/resvg-js-linux-x64-musl"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.2.0.tgz"; + sha512 = "7n2d4gfcyLb06RE/7aMGwiiMiqeCf/Ze/fBhKs9F2L60GX6rpgDC2PGJmWBiXIwz48PifvxmBiqD9XCUH5YGoA=="; + }; + }; + "@resvg/resvg-js-win32-arm64-msvc-2.2.0" = { + name = "_at_resvg_slash_resvg-js-win32-arm64-msvc"; + packageName = "@resvg/resvg-js-win32-arm64-msvc"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.2.0.tgz"; + sha512 = "rJWhnui1+P9lakfx92zhm+HInZUU1NdvkL/G5KrFcRI8HH0rfdNHokfKknvuko4e7iUSia7kTsbuKDNe4fErtQ=="; + }; + }; + "@resvg/resvg-js-win32-ia32-msvc-2.2.0" = { + name = "_at_resvg_slash_resvg-js-win32-ia32-msvc"; + packageName = "@resvg/resvg-js-win32-ia32-msvc"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.2.0.tgz"; + sha512 = "GlckTgsrlF9PQlWcXs1EySeGaT8TAkrSGhVZPRvSv46DUpZlhyVVvKMjsvpbDfqWltFkJTEgkTJ6uravnJrEMA=="; + }; + }; + "@resvg/resvg-js-win32-x64-msvc-2.2.0" = { + name = "_at_resvg_slash_resvg-js-win32-x64-msvc"; + packageName = "@resvg/resvg-js-win32-x64-msvc"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.2.0.tgz"; + sha512 = "4coA6J+MfrpbMaPynSLmmiq3DutmvNmCcNFyjnhhnytQW7+8zbrkVZGra7fty3364LY3unZGxS878WRa/AU7tw=="; + }; + }; "@rollup/plugin-commonjs-22.0.2" = { name = "_at_rollup_slash_plugin-commonjs"; packageName = "@rollup/plugin-commonjs"; @@ -10174,6 +10759,105 @@ let sha512 = "GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg=="; }; }; + "@rollup/pluginutils-4.2.1" = { + name = "_at_rollup_slash_pluginutils"; + packageName = "@rollup/pluginutils"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz"; + sha512 = "iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ=="; + }; + }; + "@rushstack/heft-config-file-0.11.5" = { + name = "_at_rushstack_slash_heft-config-file"; + packageName = "@rushstack/heft-config-file"; + version = "0.11.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.11.5.tgz"; + sha512 = "R6kZyvoZrNmhST3nyYd53N+N4RicQVOCciiglAj6/Y44bscAKIUijAMEHF17JD1+1xAYh/G3R+XIaWLbBpZDSw=="; + }; + }; + "@rushstack/node-core-library-3.53.3" = { + name = "_at_rushstack_slash_node-core-library"; + packageName = "@rushstack/node-core-library"; + version = "3.53.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.53.3.tgz"; + sha512 = "H0+T5koi5MFhJUd5ND3dI3bwLhvlABetARl78L3lWftJVQEPyzcgTStvTTRiIM5mCltyTM8VYm6BuCtNUuxD0Q=="; + }; + }; + "@rushstack/package-deps-hash-4.0.3" = { + name = "_at_rushstack_slash_package-deps-hash"; + packageName = "@rushstack/package-deps-hash"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.0.3.tgz"; + sha512 = "dx3P51viHUuBTw2KakZ4DU8paIOPi2zuvj94TBA9Gv3XQAX6xguD+ZIa2r2P3SNPrv/KPLMVxMpAS9QneJfLsA=="; + }; + }; + "@rushstack/rig-package-0.3.17" = { + name = "_at_rushstack_slash_rig-package"; + packageName = "@rushstack/rig-package"; + version = "0.3.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.17.tgz"; + sha512 = "nxvAGeIMnHl1LlZSQmacgcRV4y1EYtgcDIrw6KkeVjudOMonlxO482PhDj3LVZEp6L7emSf6YSO2s5JkHlwfZA=="; + }; + }; + "@rushstack/rush-amazon-s3-build-cache-plugin-5.89.1" = { + name = "_at_rushstack_slash_rush-amazon-s3-build-cache-plugin"; + packageName = "@rushstack/rush-amazon-s3-build-cache-plugin"; + version = "5.89.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.89.1.tgz"; + sha512 = "TyvsweC16xNoZeFEbv4vCD4z2L6jO6GXmw+97y1ep+OVJXQzKJHPgV4Wct2i+jYjO1+cbUsqshUwyJif42UqvA=="; + }; + }; + "@rushstack/rush-azure-storage-build-cache-plugin-5.89.1" = { + name = "_at_rushstack_slash_rush-azure-storage-build-cache-plugin"; + packageName = "@rushstack/rush-azure-storage-build-cache-plugin"; + version = "5.89.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.89.1.tgz"; + sha512 = "YpF+18c/Z5YYCH9WRQ/X6lxhpxcxO8727XNWrOMBbYCIjQgPY83Dh3xGtDk8sLr2WFxJVKIetyEtHDJNh5ghGg=="; + }; + }; + "@rushstack/rush-sdk-5.89.1" = { + name = "_at_rushstack_slash_rush-sdk"; + packageName = "@rushstack/rush-sdk"; + version = "5.89.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.89.1.tgz"; + sha512 = "KSrcfycU82dI3+XIVIwiESnIXsMyvzkDHgfDexl1K+094klzYlmQBvDc8ladaUmTWs/9eRadggN/Y2xhgE7wOg=="; + }; + }; + "@rushstack/stream-collator-4.0.222" = { + name = "_at_rushstack_slash_stream-collator"; + packageName = "@rushstack/stream-collator"; + version = "4.0.222"; + src = fetchurl { + url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.0.222.tgz"; + sha512 = "oE0DzdzqdaX3xRnbqIsNSRGTWSbSKPs3irDsHAE9Fj6diftfV++7EvDMpcEcD1owN0mJTyco6VeZdRjJf1Ytqw=="; + }; + }; + "@rushstack/terminal-0.3.91" = { + name = "_at_rushstack_slash_terminal"; + packageName = "@rushstack/terminal"; + version = "0.3.91"; + src = fetchurl { + url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.3.91.tgz"; + sha512 = "m4XqR8HeffmsWR4qpYm4FpUU66vqYFJZJf8xuYO33zSkHDL5qdNjQ9yrtRJFs1mF38hMsXSHkvo2djRuf9MM5A=="; + }; + }; + "@rushstack/ts-command-line-4.13.1" = { + name = "_at_rushstack_slash_ts-command-line"; + packageName = "@rushstack/ts-command-line"; + version = "4.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.13.1.tgz"; + sha512 = "UTQMRyy/jH1IS2U+6pyzyn9xQ2iMcoUKkTcZUzOP/aaMiKlWLwCTDiBVwhw/M1crDx6apF9CwyjuWO9r1SBdJQ=="; + }; + }; "@sailshq/lodash-3.10.4" = { name = "_at_sailshq_slash_lodash"; packageName = "@sailshq/lodash"; @@ -10201,31 +10885,31 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@sap/hana-client-2.14.22" = { + "@sap/hana-client-2.15.19" = { name = "_at_sap_slash_hana-client"; packageName = "@sap/hana-client"; - version = "2.14.22"; + version = "2.15.19"; src = fetchurl { - url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.14.22.tgz"; - sha512 = "Do1VnybxssI5kAg/ti4GoEOhgU7p7R9T9/v9amzDNZMg7rC7C4LVno+x++ERTWv81pzSaSrYKkr2O/MP7OE1hA=="; + url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.15.19.tgz"; + sha512 = "DJKkAvJf8ZpkTIZlxi29d/jRvraweA2I2KIqa7eSNhXuDnau8bIQBkOhSpnhVUckR8i/W8SNYdqwiHlUm5t9Lw=="; }; }; - "@schematics/angular-14.2.8" = { + "@schematics/angular-15.1.3" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "14.2.8"; + version = "15.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-14.2.8.tgz"; - sha512 = "SuzeCpWHF9+8jey7WheM1Va0iyJrYAD88O2VT2x0NEF2PXEH63lV7BCBtE7kKurIAmXBbvTCsPyZuFKYJGDHFA=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-15.1.3.tgz"; + sha512 = "jCJ0Nq/FpoMnA63rPAhRWQJFVbS+K8NpdTHZ/7l4wx9iFtIH7khCdbp3QYMJSwZh5pEiw/NO7ouxsWo5YgapYQ=="; }; }; - "@segment/ajv-human-errors-2.1.2" = { + "@segment/ajv-human-errors-2.2.0" = { name = "_at_segment_slash_ajv-human-errors"; packageName = "@segment/ajv-human-errors"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@segment/ajv-human-errors/-/ajv-human-errors-2.1.2.tgz"; - sha512 = "d1uQndRFLRO01+xW1y5m+joxDgHf5SLJ70YCY2ArLoo2FJ50o6AoX2mEbuGvnKz/IdwnvDugm9Ti3mZQkW1OoA=="; + url = "https://registry.npmjs.org/@segment/ajv-human-errors/-/ajv-human-errors-2.2.0.tgz"; + sha512 = "nSSEprJK5HPnu/MFPTaFUX1WAmiBhMd0aa0MMykkVx6xAjie2pHudYYv+ZEhCtKSKy1DcdfCica4BpL/Bp/XSA=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -10237,13 +10921,13 @@ let sha512 = "ZMCSfztDBqwotkl848ODgVcAmN4OItEWDCkshcKz0/W6gGSQayuuCtWV/MlodFivAZD793d6UgANd6wCXUfrIw=="; }; }; - "@selderee/plugin-htmlparser2-0.6.0" = { + "@selderee/plugin-htmlparser2-0.10.0" = { name = "_at_selderee_slash_plugin-htmlparser2"; packageName = "@selderee/plugin-htmlparser2"; - version = "0.6.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.6.0.tgz"; - sha512 = "J3jpy002TyBjd4N/p6s+s90eX42H2eRhK3SbsZuvTDv977/E8p2U3zikdiehyJja66do7FlxLomZLPlvl2/xaA=="; + url = "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.10.0.tgz"; + sha512 = "gW69MEamZ4wk1OsOq1nG1jcyhXIQcnrsX5JwixVw/9xaiav8TCyjESAruu1Rz9yyInhgBXxkNwMeygKnN2uxNA=="; }; }; "@sentry/core-6.19.7" = { @@ -10255,13 +10939,13 @@ let sha512 = "tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw=="; }; }; - "@sentry/core-7.17.4" = { + "@sentry/core-7.34.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.17.4"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.17.4.tgz"; - sha512 = "U3ABSJBKGK8dJ01nEG2+qNOb6Wv7U3VqoajiZxfV4lpPWNFGCoEhiTytxBlFTOCmdUH8209zSZiWJZaDLy+TSA=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.34.0.tgz"; + sha512 = "J1oxsYZX1N0tkEcaHt/uuDqk6zOnaivyampp+EvBsUMCdemjg7rwKvawlRB0ZtBEQu3HAhi8zecm03mlpWfCDw=="; }; }; "@sentry/hub-6.19.7" = { @@ -10273,13 +10957,13 @@ let sha512 = "y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA=="; }; }; - "@sentry/integrations-7.17.4" = { + "@sentry/integrations-7.34.0" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.17.4"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.17.4.tgz"; - sha512 = "9vL0RRLuMnj0mj61THgRhDUCgTGYbRoCT6HmLGrErHjyTG3d7lUgUwTBQPgw9qYLss1uLKoEtRvcxgtW7ef0BA=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.34.0.tgz"; + sha512 = "xbWnTvG4gkKeCVpmhhdPtMbQkPO0RAfEJ8VPO5TWmUMT23ZWy2kE0gTZHtnBopy7AXxg231XxTi4fxnwgQGxEQ=="; }; }; "@sentry/minimal-6.19.7" = { @@ -10300,13 +10984,13 @@ let sha512 = "gtmRC4dAXKODMpHXKfrkfvyBL3cI8y64vEi3fDD046uqYcrWdgoQsffuBbxMAizc6Ez1ia+f0Flue6p15Qaltg=="; }; }; - "@sentry/node-7.17.4" = { + "@sentry/node-7.34.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.17.4"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.17.4.tgz"; - sha512 = "cR+Gsir9c/tzFWxvk4zXkMQy6tNRHEYixHrb88XIjZVYDqDS9l2/bKs5nJusdmaUeLtmPp5Et2o7RJyS7gvKTQ=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.34.0.tgz"; + sha512 = "VM4XeydRdgeaNTRe8kwqYg2oNPddVyY74PlCFEFnPEN1NccycNuwiFno68kNrApeqxxLlTTmzkJy0BWo16x2Yg=="; }; }; "@sentry/types-6.19.7" = { @@ -10318,13 +11002,13 @@ let sha512 = "jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg=="; }; }; - "@sentry/types-7.17.4" = { + "@sentry/types-7.34.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.17.4"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.17.4.tgz"; - sha512 = "QJj8vO4AtxuzQfJIzDnECSmoxwnS+WJsm1Ta2Cwdy+TUCBJyWpW7aIJJGta76zb9gNPGb3UcAbeEjhMJBJeRMQ=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.34.0.tgz"; + sha512 = "K+OeHIrl35PSYn6Zwqe4b8WWyAJQoI5NeWxHVkM7oQTGJ1YLG4BvLsR+UiUXnKdR5krE4EDtEA5jLsDlBEyPvw=="; }; }; "@sentry/utils-6.19.7" = { @@ -10336,13 +11020,13 @@ let sha512 = "z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA=="; }; }; - "@sentry/utils-7.17.4" = { + "@sentry/utils-7.34.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.17.4"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.17.4.tgz"; - sha512 = "ioG0ANy8uiWzig82/e7cc+6C9UOxkyBzJDi1luoQVDH6P0/PvM8GzVU+1iUVUipf8+OL1Jh09GrWnd5wLm3XNQ=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.34.0.tgz"; + sha512 = "VIHHXEBw0htzqxnU8A7WkXKvmsG2pZVqHlAn0H9W/yyFQtXMuP1j1i0NsjADB/3JXUKK83kTNWGzScXvp0o+Jg=="; }; }; "@serialport/binding-mock-10.2.2" = { @@ -10354,130 +11038,130 @@ let sha512 = "HAFzGhk9OuFMpuor7aT5G1ChPgn5qSsklTFOTUX72Rl6p0xwcSVsRtG/xaGp6bxpN7fI9D/S8THLBWbBgS6ldw=="; }; }; - "@serialport/bindings-cpp-10.7.0" = { + "@serialport/bindings-cpp-10.8.0" = { name = "_at_serialport_slash_bindings-cpp"; packageName = "@serialport/bindings-cpp"; - version = "10.7.0"; + version = "10.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/bindings-cpp/-/bindings-cpp-10.7.0.tgz"; - sha512 = "Xx1wA2UCG2loS32hxNvWJI4smCzGKhWqE85//fLRzHoGgE1lSLe3Nk7W40/ebrlGFHWRbQZmeaIF4chb2XLliA=="; + url = "https://registry.npmjs.org/@serialport/bindings-cpp/-/bindings-cpp-10.8.0.tgz"; + sha512 = "OMQNJz5kJblbmZN5UgJXLwi2XNtVLxSKmq5VyWuXQVsUIJD4l9UGHnLPqM5LD9u3HPZgDI5w7iYN7gxkQNZJUw=="; }; }; - "@serialport/bindings-interface-1.2.1" = { + "@serialport/bindings-interface-1.2.2" = { name = "_at_serialport_slash_bindings-interface"; packageName = "@serialport/bindings-interface"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/bindings-interface/-/bindings-interface-1.2.1.tgz"; - sha512 = "63Dyqz2gtryRDDckFusOYqLYhR3Hq/M4sEdbF9i/VsvDb6T+tNVgoAKUZ+FMrXXKnCSu+hYbk+MTc0XQANszxw=="; + url = "https://registry.npmjs.org/@serialport/bindings-interface/-/bindings-interface-1.2.2.tgz"; + sha512 = "CJaUd5bLvtM9c5dmO9rPBHPXTa9R2UwpkJ0wdh9JCYcbrPWsKz+ErvR0hBLeo7NPeiFdjFO4sonRljiw4d2XiA=="; }; }; - "@serialport/parser-byte-length-10.3.0" = { + "@serialport/parser-byte-length-10.5.0" = { name = "_at_serialport_slash_parser-byte-length"; packageName = "@serialport/parser-byte-length"; - version = "10.3.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-10.3.0.tgz"; - sha512 = "pJ/VoFemzKRRNDHLhFfPThwP40QrGaEnm9TtwL7o2GihEPwzBg3T0bN13ew5TpbbUYZdMpUtpm3CGfl6av9rUQ=="; + url = "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-10.5.0.tgz"; + sha512 = "eHhr4lHKboq1OagyaXAqkemQ1XyoqbLQC8XJbvccm95o476TmEdW5d7AElwZV28kWprPW68ZXdGF2VXCkJgS2w=="; }; }; - "@serialport/parser-cctalk-10.3.0" = { + "@serialport/parser-cctalk-10.5.0" = { name = "_at_serialport_slash_parser-cctalk"; packageName = "@serialport/parser-cctalk"; - version = "10.3.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-10.3.0.tgz"; - sha512 = "8ujmk8EvVbDPrNF4mM33bWvUYJOZ0wXbY3WCRazHRWvyCdL0VO0DQvW81ZqgoTpiDQZm5r8wQu9rmuemahF6vQ=="; + url = "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-10.5.0.tgz"; + sha512 = "Iwsdr03xmCKAiibLSr7b3w6ZUTBNiS+PwbDQXdKU/clutXjuoex83XvsOtYVcNZmwJlVNhAUbkG+FJzWwIa4DA=="; }; }; - "@serialport/parser-delimiter-10.3.0" = { + "@serialport/parser-delimiter-10.5.0" = { name = "_at_serialport_slash_parser-delimiter"; packageName = "@serialport/parser-delimiter"; - version = "10.3.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-10.3.0.tgz"; - sha512 = "9E4Vj6s0UbbcCCTclwegHGPYjJhdm9qLCS0lowXQDEQC5naZnbsELemMHs93nD9jHPcyx1B4oXkMnVZLxX5TYw=="; + url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-10.5.0.tgz"; + sha512 = "/uR/yT3jmrcwnl2FJU/2ySvwgo5+XpksDUR4NF/nwTS5i3CcuKS+FKi/tLzy1k8F+rCx5JzpiK+koqPqOUWArA=="; }; }; - "@serialport/parser-inter-byte-timeout-10.3.0" = { + "@serialport/parser-inter-byte-timeout-10.5.0" = { name = "_at_serialport_slash_parser-inter-byte-timeout"; packageName = "@serialport/parser-inter-byte-timeout"; - version = "10.3.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-10.3.0.tgz"; - sha512 = "wKP0QK85NHgvT6BBB1qBfKBBU4pf8kespNXAZBUYmFT+P4n8r8IZE2mqigCD+AiZcfWNQoAizwOsT/Jx/qeVig=="; + url = "https://registry.npmjs.org/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-10.5.0.tgz"; + sha512 = "WPvVlSx98HmmUF9jjK6y9mMp3Wnv6JQA0cUxLeZBgS74TibOuYG3fuUxUWGJALgAXotOYMxfXSezJ/vSnQrkhQ=="; }; }; - "@serialport/parser-packet-length-10.3.0" = { + "@serialport/parser-packet-length-10.5.0" = { name = "_at_serialport_slash_parser-packet-length"; packageName = "@serialport/parser-packet-length"; - version = "10.3.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-packet-length/-/parser-packet-length-10.3.0.tgz"; - sha512 = "bj0cWzt8YSQj/E5fRQVYdi4TsfTlZQrXlXrUwjyTsCONv8IPOHzsz+yY0fw5SEMiJtaLyqvPkCHLsttOd/zFsg=="; + url = "https://registry.npmjs.org/@serialport/parser-packet-length/-/parser-packet-length-10.5.0.tgz"; + sha512 = "jkpC/8w4/gUBRa2Teyn7URv1D7T//0lGj27/4u9AojpDVXsR6dtdcTG7b7dNirXDlOrSLvvN7aS5/GNaRlEByw=="; }; }; - "@serialport/parser-readline-10.3.0" = { + "@serialport/parser-readline-10.5.0" = { name = "_at_serialport_slash_parser-readline"; packageName = "@serialport/parser-readline"; - version = "10.3.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-10.3.0.tgz"; - sha512 = "ki3ATZ3/RAqnqGROBKE7k+OeZ0DZXZ53GTca4q71OU5RazbbNhTOBQLKLXD3v9QZXCMJdg4hGW/2Y0DuMUqMQg=="; + url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-10.5.0.tgz"; + sha512 = "0aXJknodcl94W9zSjvU+sLdXiyEG2rqjQmvBWZCr8wJZjWEtv3RgrnYiWq4i2OTOyC8C/oPK8ZjpBjQptRsoJQ=="; }; }; - "@serialport/parser-ready-10.3.0" = { + "@serialport/parser-ready-10.5.0" = { name = "_at_serialport_slash_parser-ready"; packageName = "@serialport/parser-ready"; - version = "10.3.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-10.3.0.tgz"; - sha512 = "1owywJ4p592dJyVrEJZPIh6pUZ3/y/LN6kGTDH2wxdewRUITo/sGvDy0er5i2+dJD3yuowiAz0dOHSdz8tevJA=="; + url = "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-10.5.0.tgz"; + sha512 = "QIf65LTvUoxqWWHBpgYOL+soldLIIyD1bwuWelukem2yDZVWwEjR288cLQ558BgYxH4U+jLAQahhqoyN1I7BaA=="; }; }; - "@serialport/parser-regex-10.3.0" = { + "@serialport/parser-regex-10.5.0" = { name = "_at_serialport_slash_parser-regex"; packageName = "@serialport/parser-regex"; - version = "10.3.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-10.3.0.tgz"; - sha512 = "tIogTs7CvTH+UUFnsvE7i33MSISyTPTGPWlglWYH2/5coipXY503jlaYS1YGe818wWNcSx6YAjMZRdhTWwM39w=="; + url = "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-10.5.0.tgz"; + sha512 = "9jnr9+PCxRoLjtGs7uxwsFqvho+rxuJlW6ZWSB7oqfzshEZWXtTJgJRgac/RuLft4hRlrmRz5XU40i3uoL4HKw=="; }; }; - "@serialport/parser-slip-encoder-10.3.0" = { + "@serialport/parser-slip-encoder-10.5.0" = { name = "_at_serialport_slash_parser-slip-encoder"; packageName = "@serialport/parser-slip-encoder"; - version = "10.3.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-slip-encoder/-/parser-slip-encoder-10.3.0.tgz"; - sha512 = "JI0ILF5sylWn8f0MuMzHFBix/iMUTa79/Z95KaPZYnVaEdA7h7hh/o21Jmon/26P3RJwL1SNJCjZ81zfan+LtQ=="; + url = "https://registry.npmjs.org/@serialport/parser-slip-encoder/-/parser-slip-encoder-10.5.0.tgz"; + sha512 = "wP8m+uXQdkWSa//3n+VvfjLthlabwd9NiG6kegf0fYweLWio8j4pJRL7t9eTh2Lbc7zdxuO0r8ducFzO0m8CQw=="; }; }; - "@serialport/parser-spacepacket-10.3.0" = { + "@serialport/parser-spacepacket-10.5.0" = { name = "_at_serialport_slash_parser-spacepacket"; packageName = "@serialport/parser-spacepacket"; - version = "10.3.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-spacepacket/-/parser-spacepacket-10.3.0.tgz"; - sha512 = "PDF73ClEPsClD1FEJZHNuBevDKsJCkqy/XD5+S5eA6+tY5D4HLrVgSWsg+3qqB6+dlpwf2CzHe+uO8D3teuKHA=="; + url = "https://registry.npmjs.org/@serialport/parser-spacepacket/-/parser-spacepacket-10.5.0.tgz"; + sha512 = "BEZ/HAEMwOd8xfuJSeI/823IR/jtnThovh7ils90rXD4DPL1ZmrP4abAIEktwe42RobZjIPfA4PaVfyO0Fjfhg=="; }; }; - "@serialport/stream-10.3.0" = { + "@serialport/stream-10.5.0" = { name = "_at_serialport_slash_stream"; packageName = "@serialport/stream"; - version = "10.3.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/stream/-/stream-10.3.0.tgz"; - sha512 = "7sooi5fHogYNVEJwxVdg872xO6TuMgQd2E9iRmv+o8pk/1dbBnPkmH6Ka3st1mVE+0KnIJqVlgei+ncSsqXIGw=="; + url = "https://registry.npmjs.org/@serialport/stream/-/stream-10.5.0.tgz"; + sha512 = "gbcUdvq9Kyv2HsnywS7QjnEB28g+6OGB5Z8TLP7X+UPpoMIWoUsoQIq5Kt0ZTgMoWn3JGM2lqwTsSHF+1qhniA=="; }; }; - "@serverless/dashboard-plugin-6.2.2" = { + "@serverless/dashboard-plugin-6.2.3" = { name = "_at_serverless_slash_dashboard-plugin"; packageName = "@serverless/dashboard-plugin"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-6.2.2.tgz"; - sha512 = "h3zOprpuWZCdAP7qoOKT2nboB+AaxMkGoSzOD0jIBpt9s0cXqLE2VFjR2vKn8Cvam47Qa3XYnT2/XN6tR6rZgQ=="; + url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-6.2.3.tgz"; + sha512 = "iTZhpZbiVl6G2AyfgoqxemqqpG4pUceWys3GsyZtjimnfnGd2UFBOMVUMTavLhYia7lQc4kQVuXQ+afLlkg+pQ=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -10516,13 +11200,13 @@ let sha512 = "7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw=="; }; }; - "@sideway/formula-3.0.0" = { + "@sideway/formula-3.0.1" = { name = "_at_sideway_slash_formula"; packageName = "@sideway/formula"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz"; - sha512 = "vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg=="; + url = "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz"; + sha512 = "/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg=="; }; }; "@sideway/pinpoint-2.0.0" = { @@ -10624,13 +11308,13 @@ let sha512 = "ikwHOfJF0umx1eV/JpQDMsFxODvCSdD9zdIQVDEjcTNpfofz7+PZrjfKUFkG3iQ9mSUG3BwODv0XOEvTRNdovw=="; }; }; - "@sinonjs/commons-1.8.4" = { + "@sinonjs/commons-1.8.6" = { name = "_at_sinonjs_slash_commons"; packageName = "@sinonjs/commons"; - version = "1.8.4"; + version = "1.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.4.tgz"; - sha512 = "RpmQdHVo8hCEHDVpO39zToS9jOhR6nw+/lQAzRNq9ErrGV9IeHM71XCn68svVl/euFeVW6BWX4p35gkhbOcSIQ=="; + url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz"; + sha512 = "Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ=="; }; }; "@sinonjs/fake-timers-8.1.0" = { @@ -10822,13 +11506,13 @@ let sha512 = "nty0tHUq2f1IKuFYsLM4CXLZGHdMn+X/IwEUIpeSOXt0QjMUbL0Em57iJUDzz+2MkWG83smIigNZ3fauGjqgdQ=="; }; }; - "@stoplight/json-ref-resolver-3.1.4" = { + "@stoplight/json-ref-resolver-3.1.5" = { name = "_at_stoplight_slash_json-ref-resolver"; packageName = "@stoplight/json-ref-resolver"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/json-ref-resolver/-/json-ref-resolver-3.1.4.tgz"; - sha512 = "842JVmMsi++qpDuIX+JpQvK7YY8FXEZZb+/z4xuRfStOAVEryJT/tbgGOWxniSdxEl9Eni5D/I2afMyy6BuiNw=="; + url = "https://registry.npmjs.org/@stoplight/json-ref-resolver/-/json-ref-resolver-3.1.5.tgz"; + sha512 = "uaKLITor7UF+JBtI84zs3aOWM0L79zp7w9TrBTwPtx5SLbaQQ4HadDKgX5yhFOLMApLdhwhiftF4c0GFanOxGg=="; }; }; "@stoplight/ordered-object-literal-1.0.4" = { @@ -10858,13 +11542,13 @@ let sha512 = "z46fnrvraaWMio8Y9RYYkLO+XdmtxOWpy5qNJF3CsmWua0FZ4iOTryb5Cm3GkB0wEtqxNUCBUHvoo4hS6Noyqg=="; }; }; - "@stoplight/spectral-core-1.15.1" = { + "@stoplight/spectral-core-1.16.0" = { name = "_at_stoplight_slash_spectral-core"; packageName = "@stoplight/spectral-core"; - version = "1.15.1"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.15.1.tgz"; - sha512 = "IZV8L1Hyz9759KdqJIA90W5uvurHplMmaPPIZjQzG2Bq/39kN/sbLA/Js8uOf3xB9cHBbG599t4AB+uGsI8t0g=="; + url = "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.16.0.tgz"; + sha512 = "W/NG+wV2UffwLExboqEa04/JbjGhiSTOl7GghLWYP4NKxZGaO6karP6fIxRBOnm34n1qyoZv9thsjSe92MWcDw=="; }; }; "@stoplight/spectral-formats-1.4.0" = { @@ -10876,13 +11560,13 @@ let sha512 = "j9VQukDzgqDSi26rK9LqsbXrqtkeIsPSPgEf5/sxRsmeF2bwWUhSjYXgYin4flSZ7owFZjZWQ3o0Qq3iApi2JQ=="; }; }; - "@stoplight/spectral-functions-1.7.1" = { + "@stoplight/spectral-functions-1.7.2" = { name = "_at_stoplight_slash_spectral-functions"; packageName = "@stoplight/spectral-functions"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-functions/-/spectral-functions-1.7.1.tgz"; - sha512 = "UWeUrxc1pu45ZNYKtK3OloMpkUNTPqwpmjbGUn4oEnbqrLEYu/B2oOg66EtGcadOBEsdOb7f5vaPlhUNNrpEpQ=="; + url = "https://registry.npmjs.org/@stoplight/spectral-functions/-/spectral-functions-1.7.2.tgz"; + sha512 = "f+61/FtIkQeIo+a269CeaeqjpyRsgDyIk6DGr7iS4hyuk1PPk7Uf6MNRDs9FEIBh7CpdEJ+HSHbMLwgpymWTIw=="; }; }; "@stoplight/spectral-parsers-1.0.2" = { @@ -10903,22 +11587,22 @@ let sha512 = "ah6NIB/O1EdEaEu89So3LmtbKRXPVnSElgQ7oBRE9S4/VOedSqyXn+qqMd40tGnO2CsKgZaFUYXdSEHOshpHYw=="; }; }; - "@stoplight/spectral-ruleset-bundler-1.4.0" = { + "@stoplight/spectral-ruleset-bundler-1.5.0" = { name = "_at_stoplight_slash_spectral-ruleset-bundler"; packageName = "@stoplight/spectral-ruleset-bundler"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-ruleset-bundler/-/spectral-ruleset-bundler-1.4.0.tgz"; - sha512 = "aYDI4a145IXED+6jvRjj9Ha0fnB+s54cr8KbQbPCEyhCHW1cP8UGVeOuwAfk+9C4ZIg40OuYrugN5EhA35oQtA=="; + url = "https://registry.npmjs.org/@stoplight/spectral-ruleset-bundler/-/spectral-ruleset-bundler-1.5.0.tgz"; + sha512 = "I1ZbhnJtRTi0lG6oXA1r8J6KLxoZKkNB3aSdrNJJTHoo/AccMSMhV4ey8zbLsYNsJ/9ywR5ttkBAbyGuo3Jtxg=="; }; }; - "@stoplight/spectral-ruleset-migrator-1.9.0" = { + "@stoplight/spectral-ruleset-migrator-1.9.1" = { name = "_at_stoplight_slash_spectral-ruleset-migrator"; packageName = "@stoplight/spectral-ruleset-migrator"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-ruleset-migrator/-/spectral-ruleset-migrator-1.9.0.tgz"; - sha512 = "hPSjgXsTxMQ5UV1hfkVVPknhqRjmjSnCZD5jideM4rRU5NS1fj2Pse1CiXBsRChsuAGi/2s0Ke5uuOmFFsHrxQ=="; + url = "https://registry.npmjs.org/@stoplight/spectral-ruleset-migrator/-/spectral-ruleset-migrator-1.9.1.tgz"; + sha512 = "TiH7UZIuHX+yb6EsWA9Z2ou455Wtki3z7SCkVRgd7WdzkD7O13R8ywqKoCUJ44UP7iuo1Ejnog18Rw4qJJE/fg=="; }; }; "@stoplight/spectral-rulesets-1.14.1" = { @@ -10984,6 +11668,15 @@ let sha512 = "sV+51I7WYnLJnKPn2EMWgS4EUfoP4iWEbrWwbXsj0MZCB/xOK8j6+C9fntIdOM50kpx45ZLC3s6kwKivWuqvyg=="; }; }; + "@streamparser/json-0.0.10" = { + name = "_at_streamparser_slash_json"; + packageName = "@streamparser/json"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@streamparser/json/-/json-0.0.10.tgz"; + sha512 = "juqNFdqqmY/nvsODq1Vba7PWIaqr01VcqICIrxbws97QKSQhQUMml8FqdHLmevwVpqH39H5mVXKFWiWCi1ke0w=="; + }; + }; "@stroncium/procfs-1.2.1" = { name = "_at_stroncium_slash_procfs"; packageName = "@stroncium/procfs"; @@ -11011,148 +11704,256 @@ let sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ=="; }; }; - "@swc-node/core-1.9.1" = { + "@swc-node/core-1.9.2" = { name = "_at_swc-node_slash_core"; packageName = "@swc-node/core"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@swc-node/core/-/core-1.9.1.tgz"; - sha512 = "Mh4T/PmQOpPtqw1BNvU38uWzsXbd5RJji17YBXnj7JDDE5KlTR9sSo2RKxWKDVtHbdcD1S+CtyZXA93aEWlfGQ=="; + url = "https://registry.npmjs.org/@swc-node/core/-/core-1.9.2.tgz"; + sha512 = "tInCla6NO1HEQwhIc/K7PCOu4X3ppqw5xYNEMD7i41SyRuH7yp3u8x7x2cqeAD+6IAhJ5jKDPv2QRLPz7Xt3EA=="; }; }; - "@swc-node/register-1.5.4" = { + "@swc-node/register-1.5.5" = { name = "_at_swc-node_slash_register"; packageName = "@swc-node/register"; - version = "1.5.4"; + version = "1.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@swc-node/register/-/register-1.5.4.tgz"; - sha512 = "cM5/A63bO6qLUFC4gcBnOlQO5yd8ObSdFUIp7sXf11Oq5mPVAnJy2DqjbWMUsqUaHuNk+lOIt76ie4DEseUIyA=="; + url = "https://registry.npmjs.org/@swc-node/register/-/register-1.5.5.tgz"; + sha512 = "SNpbRG8EOXShk3YAnC4suAVovYQ7oFOFdCVBA3J8hkO5qy0WHPVnlnMojTYI+8UT1CrfQ1QSUySaAARRvEdwjg=="; }; }; - "@swc-node/sourcemap-support-0.2.2" = { + "@swc-node/sourcemap-support-0.2.3" = { name = "_at_swc-node_slash_sourcemap-support"; packageName = "@swc-node/sourcemap-support"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@swc-node/sourcemap-support/-/sourcemap-support-0.2.2.tgz"; - sha512 = "PA4p7nC5LwPdEVcQXFxMTpfvizYPeMoB55nIIx+yC3FiLnyPgC2hcpUitPy5h8RRGdCZ/Mvb2ryEcVYS8nI6YA=="; + url = "https://registry.npmjs.org/@swc-node/sourcemap-support/-/sourcemap-support-0.2.3.tgz"; + sha512 = "LOC/z9HDUmTqSAF08YIRLThGGNZLdRrjcEdoQu/EANxPSVRedYgh4AiZlOX8sY8Rp1p7S/StOmZogJLuvR4mcA=="; }; }; - "@swc/core-1.3.14" = { + "@swc/core-1.3.29" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.14"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.14.tgz"; - sha512 = "LpTTrXOGS7vnbR/rHrAux7GykUWbyVmI5NbICl9iF9yeqFdGm6JjaGBhbanmG8zrQL5aFx2kMxxb92V9D1KUiw=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.29.tgz"; + sha512 = "BYDBEqQ77ASZNQYTP7PlKnMLwbHh3lhtlzD/gQP2zIK9XhqQlcy/zIcLljYDn0EOogLn3IyaUiXgAzDWoAmWMg=="; }; }; - "@swc/core-darwin-arm64-1.3.14" = { + "@swc/core-1.3.30" = { + name = "_at_swc_slash_core"; + packageName = "@swc/core"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.30.tgz"; + sha512 = "pg6GWw615EwCh4vJ5k7xll1E4WJSPeINrRvF/EPyBvNNhlXR3s6+KZevJTx3PpA5PXjprDR0aqwi0/aigSCAPA=="; + }; + }; + "@swc/core-darwin-arm64-1.3.29" = { name = "_at_swc_slash_core-darwin-arm64"; packageName = "@swc/core-darwin-arm64"; - version = "1.3.14"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.14.tgz"; - sha512 = "QFuUq3341uOCrJMIWGuo+CmRC5qZoM2lUo7o2lmv1FO1Dh9njTG85pLD83vz6y4j/F034DBGzvRgSti/Bsoccw=="; + url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.29.tgz"; + sha512 = "1RQ0MCmWOQmo3qG60vhbNaO/qMZ25lDfjhTayAzHjS1k7WyoUv3M8Em2Fip2VKJz5cN2M7MWiP5aHMotMovuaQ=="; }; }; - "@swc/core-darwin-x64-1.3.14" = { + "@swc/core-darwin-arm64-1.3.30" = { + name = "_at_swc_slash_core-darwin-arm64"; + packageName = "@swc/core-darwin-arm64"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.30.tgz"; + sha512 = "GZ4mZZbH77N8renK34A3Lkhl6x8z+c97SCbl43pn5E0Z0sifohA8WNhrtucKrUdid0svYibwotJzeFNpDtg7gQ=="; + }; + }; + "@swc/core-darwin-x64-1.3.29" = { name = "_at_swc_slash_core-darwin-x64"; packageName = "@swc/core-darwin-x64"; - version = "1.3.14"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.14.tgz"; - sha512 = "fpAjbjXimJBmxCumRB8zjEtPc0lGUi9Uvu92XH6ww6AyXvg7KQmua5P2R9tnzAm6NwTCXKkgS86cgKysAbbObw=="; + url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.29.tgz"; + sha512 = "UXiVOkt9i/mwarhHiN6o5RAi3Q7riCQTiOO2e98c/qi3SiYqbgd6kil+2gBcpVB0CGEFyyGB9rECwNBkaYe7zw=="; }; }; - "@swc/core-linux-arm-gnueabihf-1.3.14" = { + "@swc/core-darwin-x64-1.3.30" = { + name = "_at_swc_slash_core-darwin-x64"; + packageName = "@swc/core-darwin-x64"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.30.tgz"; + sha512 = "ppGrAJmKpT3vFr2vGaxXFL8JqHsb6kSAj0dVYTNYicl3c6XOjnMiNSfu6HRbdmXt0VpFHhC5L/a7Ta89mQ1sJA=="; + }; + }; + "@swc/core-linux-arm-gnueabihf-1.3.29" = { name = "_at_swc_slash_core-linux-arm-gnueabihf"; packageName = "@swc/core-linux-arm-gnueabihf"; - version = "1.3.14"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.14.tgz"; - sha512 = "3XSFlgIyDPS+x2c0IFr0AGj4NUbrWGKbkkUCpmAURII0n3YoDsYw8Ux73I8MkWxTTwDGkou8qQOXyA28kAUM4w=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.29.tgz"; + sha512 = "0B7+FoYgEE1Yg6j5EAtEpKVbHby3jnJo6Y4g0dGxecRtXUhu8TKVI4P93sj4PJ+l4XkAyzdhSsQ+ytFRsbOJ6w=="; }; }; - "@swc/core-linux-arm64-gnu-1.3.14" = { + "@swc/core-linux-arm-gnueabihf-1.3.30" = { + name = "_at_swc_slash_core-linux-arm-gnueabihf"; + packageName = "@swc/core-linux-arm-gnueabihf"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.30.tgz"; + sha512 = "XQYY/VNRnM0/779ehfMgh2poO3reOANvfzOprF8xmGK20+DxFqbMWjHhJutscQuEjLtdwk/LfgCkwmTaB1hhwg=="; + }; + }; + "@swc/core-linux-arm64-gnu-1.3.29" = { name = "_at_swc_slash_core-linux-arm64-gnu"; packageName = "@swc/core-linux-arm64-gnu"; - version = "1.3.14"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.14.tgz"; - sha512 = "r3fToDRYX76NEptAjvDg5aGrbitOgqooV37RpSTIGYd/CSNuin4cpCNFdca/Vh5lnNfal7mqdGDbG7gMruARtw=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.29.tgz"; + sha512 = "XN9axiTuiFOm+UBnDDOQV3b2OekziXHtVPBAPSEssRsNGS4uN7YvCyVAcS8GYdK7GoZ+cmoZBYwD4trir48WXw=="; }; }; - "@swc/core-linux-arm64-musl-1.3.14" = { + "@swc/core-linux-arm64-gnu-1.3.30" = { + name = "_at_swc_slash_core-linux-arm64-gnu"; + packageName = "@swc/core-linux-arm64-gnu"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.30.tgz"; + sha512 = "ME4BjMYSXana0Lfswa3aQW0rTdmR9wa1NGQ3t6MYLdBVm+76Xwe29JKlOfnI1iCCtcbRBoWy4dlhyuxW8DN7cw=="; + }; + }; + "@swc/core-linux-arm64-musl-1.3.29" = { name = "_at_swc_slash_core-linux-arm64-musl"; packageName = "@swc/core-linux-arm64-musl"; - version = "1.3.14"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.14.tgz"; - sha512 = "IivEUC+3HNSsQNCfaCDzev2CpsvWpgFReitCmj0PKIdXFRsTi78jtJiraLWnYy956j4wwZbKN0OFGkS2ekKAVg=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.29.tgz"; + sha512 = "M6eE02Dzl1efRLozitGvgjiNEee0VQInqMX4tvfpzQwqZsKNAD8/NGPeTG4763BLDHc4hnMZbnt5wncDLjFq7A=="; }; }; - "@swc/core-linux-x64-gnu-1.3.14" = { + "@swc/core-linux-arm64-musl-1.3.30" = { + name = "_at_swc_slash_core-linux-arm64-musl"; + packageName = "@swc/core-linux-arm64-musl"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.30.tgz"; + sha512 = "h3X9Pn1m5kuFSW8lJyDiMB4ELNZFJ+QxLva5GCxZDArQttkNeY4tMNWFcaG44xUXeywffrgjpXO7Yj2JGzmG4g=="; + }; + }; + "@swc/core-linux-x64-gnu-1.3.29" = { name = "_at_swc_slash_core-linux-x64-gnu"; packageName = "@swc/core-linux-x64-gnu"; - version = "1.3.14"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.14.tgz"; - sha512 = "HtwwA1Z0tE2z9fgaR5ehgY5ULbnVLHj3tayyWhIElF4EWsi6aQfCyn/oCZAcjoPKfEnJiSNBYt5gMmfK8l4mJA=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.29.tgz"; + sha512 = "t2e9byHRpxKyUsLeODlb3yKJcm8wMirsLIxjr24q5YbnChD3QUMQwA8aA9w2PWc86ihukw7Ksx3RYT7uR706HA=="; }; }; - "@swc/core-linux-x64-musl-1.3.14" = { + "@swc/core-linux-x64-gnu-1.3.30" = { + name = "_at_swc_slash_core-linux-x64-gnu"; + packageName = "@swc/core-linux-x64-gnu"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.30.tgz"; + sha512 = "vfPR8cakx5IZQSpNuXPrpkRprBdVxXsvN5JWN3fpuNVIgFFo3q8njihaItujKvePIHQwov4achfBZlm4JRitWQ=="; + }; + }; + "@swc/core-linux-x64-musl-1.3.29" = { name = "_at_swc_slash_core-linux-x64-musl"; packageName = "@swc/core-linux-x64-musl"; - version = "1.3.14"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.14.tgz"; - sha512 = "RPXilkTD8IVgpou4TNuqZJOB7kMrVJ7sm7GgHF4v1eV3xdIyvy4w5FWjXZRdwMW6iunLgQEckuOmVx0I4mrdNg=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.29.tgz"; + sha512 = "3jDzDYIyHXrXKOSnTtsN56eINbTPuVQj65D3K8+zo1o52GGwNGyCvQt2RpxNfM8+ptb4j6v7weSU8kVvbUzGTQ=="; }; }; - "@swc/core-win32-arm64-msvc-1.3.14" = { + "@swc/core-linux-x64-musl-1.3.30" = { + name = "_at_swc_slash_core-linux-x64-musl"; + packageName = "@swc/core-linux-x64-musl"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.30.tgz"; + sha512 = "jtfv8N+00E2RMTVjwfTfimeqzo0B9FmbbSkzlnLvkmV8xDAPyLmX7v/xL5YiVJRLeSrlJ7DmkCSxLzpJao73dw=="; + }; + }; + "@swc/core-win32-arm64-msvc-1.3.29" = { name = "_at_swc_slash_core-win32-arm64-msvc"; packageName = "@swc/core-win32-arm64-msvc"; - version = "1.3.14"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.14.tgz"; - sha512 = "H8Ka/ahJRs84hQCHC5ndORujbLBmi1mv+Z/m4CXpOaEX7TmeAo8nA17rrRckNvVkud9fghsKQGjkBQvJ0v7mRw=="; + url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.29.tgz"; + sha512 = "3PadPieyslG++7SQ42OApfiXtQdzFpnCv/i/UJ6gOL5d0MluNzZ2nIxD8LwXXizVdmcm8bmc0WRhK3JhvhzVJA=="; }; }; - "@swc/core-win32-ia32-msvc-1.3.14" = { + "@swc/core-win32-arm64-msvc-1.3.30" = { + name = "_at_swc_slash_core-win32-arm64-msvc"; + packageName = "@swc/core-win32-arm64-msvc"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.30.tgz"; + sha512 = "fX3T6JzS5F8JJ/UZQWrZfdml8nLuSzgA0EFKetTNa5AHh1x9ltShmlFOJ3OPpD9BKI/QcQSLxyoAjxt7NtAnaQ=="; + }; + }; + "@swc/core-win32-ia32-msvc-1.3.29" = { name = "_at_swc_slash_core-win32-ia32-msvc"; packageName = "@swc/core-win32-ia32-msvc"; - version = "1.3.14"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.14.tgz"; - sha512 = "H3ZmDXrVxrqBzzCFodwYfcXfTHE0xGNLJlLGzJ4haV6RBM3ZYIvRzDtPivDzic/VQncmPj1WpLoEDfx/7KNC8Q=="; + url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.29.tgz"; + sha512 = "tUFrHxxYz9Cfz07yGwDXdtRziC3q1ia2SHodzZ3obTpY+HQiBDHs0QO/HkbUBNF+du0vhnsgtWilnsMQDILFDQ=="; }; }; - "@swc/core-win32-x64-msvc-1.3.14" = { + "@swc/core-win32-ia32-msvc-1.3.30" = { + name = "_at_swc_slash_core-win32-ia32-msvc"; + packageName = "@swc/core-win32-ia32-msvc"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.30.tgz"; + sha512 = "m88NjTcVFHFAciWRWTW7NbeQPrzjKKBzSoSPukhjvKSWQNk5v6BBbTAKpymNGQssPn5WLarC2QlQzCwjyh1QLA=="; + }; + }; + "@swc/core-win32-x64-msvc-1.3.29" = { name = "_at_swc_slash_core-win32-x64-msvc"; packageName = "@swc/core-win32-x64-msvc"; - version = "1.3.14"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.14.tgz"; - sha512 = "/D1lhWF/DQi2M7b6jWL35NmTY0mRJ5mwTXdmjqNNWOZ8h8TXQo1A3/FDFnfIIcRUeSNdF7IeB3xInT3BI34E1w=="; + url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.29.tgz"; + sha512 = "/Z3kxMXGKlIhtkxBxsCSZl8j/qYfbA4dtW7RKv1RNxbPLbwk8k3Owhgk/Y3JeRavcUKwja1rUX5rhMjLYeN3tw=="; }; }; - "@swc/helpers-0.4.12" = { + "@swc/core-win32-x64-msvc-1.3.30" = { + name = "_at_swc_slash_core-win32-x64-msvc"; + packageName = "@swc/core-win32-x64-msvc"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.30.tgz"; + sha512 = "HsePRjbdD5XsnS8NkN+MmhtUyjF16cU3COd92DjRYKsB1rMDE51itfacBvOeZPHFV6VkrLsakubAZCMc+3d/Ag=="; + }; + }; + "@swc/helpers-0.4.14" = { name = "_at_swc_slash_helpers"; packageName = "@swc/helpers"; - version = "0.4.12"; + version = "0.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.12.tgz"; - sha512 = "R6RmwS9Dld5lNvwKlPn62+piU+WDG1sMfsnfJioXCciyko/gZ0DQ4Mqglhq1iGU1nQ/RcGkAwfMH+elMSkJH3Q=="; + url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz"; + sha512 = "4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw=="; }; }; - "@swc/wasm-1.3.14" = { + "@swc/wasm-1.3.29" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.14"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.14.tgz"; - sha512 = "Rtxx7BR8y0OcRUyAEUul079Za0ZrEsL2IKR4rCztEj14xvcwCpH6bPWhCH/oeC4W2NheJ1mbPqpDN806Jam/Sw=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.29.tgz"; + sha512 = "Tzpl541GRLyzQufasGScL9tMOzk0SsdcVX0jYpG74u6VZHqr0u62Cw6nYtRhTtkcsFsfNpg7RQM+CycyXY8Nmw=="; + }; + }; + "@swc/wasm-1.3.30" = { + name = "_at_swc_slash_wasm"; + packageName = "@swc/wasm"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.30.tgz"; + sha512 = "y5LnHLIaZ2mNmnY/b0jEJccV3eErxnIbF8K3RxqmnD4zWHsuvaOAVeQPKTK4vlM/V9ip+BUtCeFiUfnxCx8JwA=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -11191,22 +11992,31 @@ let sha512 = "/FcGQVvXAslhiC9aMG5gxKXJctg8N7XLZrP+wYrFTFccWEPZd/Xon5y7jUXpKOVSOFEA1MOKZKbPuK4ET5/T8Q=="; }; }; - "@tediousjs/connection-string-0.4.1" = { + "@tediousjs/connection-string-0.4.2" = { name = "_at_tediousjs_slash_connection-string"; packageName = "@tediousjs/connection-string"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@tediousjs/connection-string/-/connection-string-0.4.1.tgz"; - sha512 = "gr1mFN7KMOn+VviQKcrt+z1/7ttn7s9NSMFFyg5GrJylNH6JGrDDNRm7C5vE4PNwhW6hYT67QRUO44Ns2LQijg=="; + url = "https://registry.npmjs.org/@tediousjs/connection-string/-/connection-string-0.4.2.tgz"; + sha512 = "1R9UC7Qc5wief2oJL+c1+d7v1/oPBayL85u8L/jV2DzIKput1TZ8ZUjj2nxQaSfzu210zp0oFWUrYUiUs8NhBQ=="; }; }; - "@textlint/ast-node-types-12.2.2" = { + "@textlint/ast-node-types-12.6.1" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "12.2.2"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.2.2.tgz"; - sha512 = "VQAXUSGdmEajHXrMxeM9ZTS8UBJSVB0ghJFHpFfqYKlcDsjIqClSmTprY6521HoCoSLoUIGBxTC3jQyUMJFIWw=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.6.1.tgz"; + sha512 = "uzlJ+ZsCAyJm+lBi7j0UeBbj+Oy6w/VWoGJ3iHRHE5eZ8Z4iK66mq+PG/spupmbllLtz77OJbY89BYqgFyjXmA=="; + }; + }; + "@textlint/ast-node-types-13.0.4" = { + name = "_at_textlint_slash_ast-node-types"; + packageName = "@textlint/ast-node-types"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-13.0.4.tgz"; + sha512 = "6/8reOpc7csrwR8Hd+WqP75QS2akk8U7lzCAUv5cyoGga2KzWlauCC6gy4ZU/Qw8UfSU2ri7ZcX975i6KYLtwQ=="; }; }; "@textlint/ast-node-types-4.4.3" = { @@ -11218,130 +12028,238 @@ let sha512 = "qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A=="; }; }; - "@textlint/ast-tester-12.2.2" = { + "@textlint/ast-tester-12.6.1" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "12.2.2"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.2.2.tgz"; - sha512 = "l5VP2LG+cFCjVvBR3uRrXBeoElKLic2rG+tTQUsH/rywh3TeeDKsHZBk1gGz8kAHVoeEuuH7lx0Wu8AjP4AqGw=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.6.1.tgz"; + sha512 = "Gxiq6xmDR3PnX0RqRGth/Lu5fyFWoXNPfGxXTLORPFpfs8JKPh/eXGhlwc1f0v4VQzPay2KwVl6SGXvJD5qLXw=="; }; }; - "@textlint/ast-traverse-12.2.2" = { + "@textlint/ast-tester-13.0.4" = { + name = "_at_textlint_slash_ast-tester"; + packageName = "@textlint/ast-tester"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-13.0.4.tgz"; + sha512 = "i/7bNipeeWsUqpYCxwxXXUmbiUBNJCZrVSVsZgFo1llJPa/uivyRy64Wgxy725GoWr3GdhAAGI3e7gtjGrZXjg=="; + }; + }; + "@textlint/ast-traverse-12.6.1" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "12.2.2"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.2.2.tgz"; - sha512 = "ROd6W9P76DFA9hv7wCf1+Dc6aehLcsd0/3qKerQN/Luc3B2ek+/qJbGgWeAEsSBKl9LVLJhTBydmdgOAHrVjwA=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.6.1.tgz"; + sha512 = "Y/j7ip7yDuTjuIV4kTRPVnkJKfpI71U+eqXFnrM9sE2xBA9IsqzqiLQeDY+S5hhfQzmcEnZFtAP0hqrYaT6gNA=="; }; }; - "@textlint/feature-flag-12.2.2" = { + "@textlint/ast-traverse-13.0.4" = { + name = "_at_textlint_slash_ast-traverse"; + packageName = "@textlint/ast-traverse"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-13.0.4.tgz"; + sha512 = "wK1HWrONMfJBhFby9Dpu2tEj0j1JRBlk1fVxLljBzmrV31v1nMI7Q9+ZMqGAZIZD7kDMUpHvGg7OsA6KjHiLcA=="; + }; + }; + "@textlint/config-loader-13.0.4" = { + name = "_at_textlint_slash_config-loader"; + packageName = "@textlint/config-loader"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/config-loader/-/config-loader-13.0.4.tgz"; + sha512 = "LGJeHEr3DosO1NlCOR3186Pqx2e2TcWAm3fydb3MD7kp5ko2mfMlGsJzo0wQOjuRGTtMV212b3OKsdKZBFo0TA=="; + }; + }; + "@textlint/feature-flag-12.6.1" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "12.2.2"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.2.2.tgz"; - sha512 = "L0v/ZjxmdzRXygja1WiXBjA2ZczvU3cG6qkwME4JGKwUsbEa9UzpwD8i3yBoO7ISkjkMpPM5BYD3AtJgQpCuEg=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.6.1.tgz"; + sha512 = "cY/AraTLdzbwDyAhdpaXB7n1Lw6zA+k+7UaT8mmxMmjs0uYGzdMQa499I0rQatctJ6izrdZXYW0NdUQfG2ugiA=="; }; }; - "@textlint/fixer-formatter-12.2.2" = { + "@textlint/feature-flag-13.0.4" = { + name = "_at_textlint_slash_feature-flag"; + packageName = "@textlint/feature-flag"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-13.0.4.tgz"; + sha512 = "mo4AaRrSbOgYhf6p+LSwo+UbMr62dsq12vMVqEkjHZ5tm5vrWbQkC2YrtMAM0ot9AY1x6RJFJ5ZO3Qn42N0JTQ=="; + }; + }; + "@textlint/fixer-formatter-13.0.4" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "12.2.2"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.2.2.tgz"; - sha512 = "uKJScqlJvIP9ttVxSq4632kYUjeEhsqc1mLmbViFd+H+GGtrKMwhHYI4zs9/6PQQxE1sUy6dBVkh/LAjgqOaUA=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-13.0.4.tgz"; + sha512 = "Sdx65V3e8Ggs2UBt/2VoN58w85YXOlaHnAoHV7aRoqMySHOf5You4y4Amby5AeHeXeltLXz1keLwloq5UiJdsQ=="; }; }; - "@textlint/kernel-12.2.2" = { + "@textlint/kernel-12.6.1" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "12.2.2"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.2.2.tgz"; - sha512 = "rDa//HGBQh2BTcJvsgMDP1WRaVxwa57zeE6FPXUdaIA41GGKupQq9GXX8P0PcAVo9gxzOFnMrtbBw7mkQYu4hQ=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.6.1.tgz"; + sha512 = "GjNaI36pYx/boy1Xf7NPJFbS0uWHhY9y9DMMl/8ZJZoldN7XrCvJFivNdeYQxu+LTmfGGaUJoTjDpnllOs6XSQ=="; }; }; - "@textlint/linter-formatter-12.2.2" = { + "@textlint/kernel-13.0.4" = { + name = "_at_textlint_slash_kernel"; + packageName = "@textlint/kernel"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-13.0.4.tgz"; + sha512 = "lfZC2690xX7x5ZJn8kKfyx1/cD815+o5X80hbIjmhuY8pdoJgP4nqemaI/Y3Y+re/zg3YgT1PTayA6vcuxOw3g=="; + }; + }; + "@textlint/linter-formatter-13.0.4" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "12.2.2"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.2.2.tgz"; - sha512 = "R4/n02lNPqiTT1WuxBe4Lh1vUZUME020y+cD8fDn++GR4QlEcWaWWaYNz5ZDtRJ6Li9CYnc6MC6uf2jnTcmFXw=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-13.0.4.tgz"; + sha512 = "3hMOMlDIAgWPi1SXso35cqkwSzneH6qKdYGEpRejosSNTYePaY16ayRabQxPP07mx2m9X2Sa3ozrebq98Y9PXA=="; }; }; - "@textlint/markdown-to-ast-12.2.2" = { + "@textlint/markdown-to-ast-12.6.1" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "12.2.2"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.2.2.tgz"; - sha512 = "OP0cnGCzt8Bbfhn8fO/arQSHBhmuXB4maSXH8REJAtKRpTADWOrbuxAOaI9mjQ7EMTDiml02RZ9MaELQAWAsqQ=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.6.1.tgz"; + sha512 = "T0HO+VrU9VbLRiEx/kH4+gwGMHNMIGkp0Pok+p0I33saOOLyhfGvwOKQgvt2qkxzQEV2L5MtGB8EnW4r5d3CqQ=="; }; }; - "@textlint/module-interop-12.2.2" = { + "@textlint/markdown-to-ast-13.0.4" = { + name = "_at_textlint_slash_markdown-to-ast"; + packageName = "@textlint/markdown-to-ast"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-13.0.4.tgz"; + sha512 = "4Vs79pcBsFb7vzTp92K1ojhXQrNisK69e6QNVLc7sy8CdDhB4wWmP9tR783oBgvNgYrOfF5qwv8Z7ARCv+oFeg=="; + }; + }; + "@textlint/module-interop-13.0.4" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "12.2.2"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.2.2.tgz"; - sha512 = "3OVZDJ8GCgQ3V+dm5btCwhZhJUEO5xR7jEMI6i9n1/gA6yePBM4b1qT1gwYUItthNRFqy6q5x4zTx9MKqBGVGg=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-13.0.4.tgz"; + sha512 = "w63oM5dL1kbAdmg0JAcL6NU9r7x0xnsjGoimiUNx0nPZusBDjmFo18u//UwScDa3YmMYd10hQp+teAAsnsVuAg=="; }; }; - "@textlint/source-code-fixer-12.2.2" = { + "@textlint/source-code-fixer-12.6.1" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "12.2.2"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.2.2.tgz"; - sha512 = "wk/8MmF3m1U9IAqGrvR0yehHsRGDfXuVAkXSahyRmafSwn88p8oS/iY6qDjECADVXJEnuRuxOcQ1GPlKM/eFOg=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.6.1.tgz"; + sha512 = "J9UZ3uitT+T50ug5X6AoIOwn6kTl54ZmPYBPB9bmH4lwBamN7e4gT65lSweHY1D21elOkq+3bO/OAJMfQfAVHg=="; }; }; - "@textlint/text-to-ast-12.2.2" = { + "@textlint/source-code-fixer-13.0.4" = { + name = "_at_textlint_slash_source-code-fixer"; + packageName = "@textlint/source-code-fixer"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-13.0.4.tgz"; + sha512 = "C9SYHCQbgB6iJbRNtw+CUMRC7ACIqpLLMRDBw3VXyJfS4Ki9V3YZAlFvhe8kYTjeUe50skOQtDUMgvoIS5nNRA=="; + }; + }; + "@textlint/text-to-ast-12.6.1" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "12.2.2"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.2.2.tgz"; - sha512 = "LgCqy1y4oQfDws6rqYSlQaYyiIGRQHcGMT+ukbpBkwEtzzh9urbr6NIeVnHhEuZUITl+pZCHyHeKF2/RlGsn6Q=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.6.1.tgz"; + sha512 = "22tgSBaNerpwb66eCivjXmdZ3CDX2Il38vpuAGchiI+cl+sENU9dpuntxwEJdZQePX5qrkmw8XGj5kgyMF015A=="; }; }; - "@textlint/textlint-plugin-markdown-12.2.2" = { + "@textlint/text-to-ast-13.0.4" = { + name = "_at_textlint_slash_text-to-ast"; + packageName = "@textlint/text-to-ast"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-13.0.4.tgz"; + sha512 = "KfR+4uuNOYQAwayzYNQUiv7GACvcjb+8ZOpJnpmu5FymI+c3g6EayYwt4cx01fmSLeZEL8njiyP1hQi3rzaR1g=="; + }; + }; + "@textlint/textlint-plugin-markdown-12.6.1" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "12.2.2"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.2.2.tgz"; - sha512 = "ougYCuGavxCPwsFZZ/fCGzoaMxwvy2yM1siKa7Ra9chZHjxtj3y76m0QtJkboFcz/FEZV8tqh96T9Bq/4jD+nQ=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.6.1.tgz"; + sha512 = "fRKsFCL2fGeu0Bt+08FuEc2WHiI8IMDRvy6KT1pmNWO5irS4yL2/OXNknLH3erXvwcJw/hQnd5WEl4hQzS0Erw=="; }; }; - "@textlint/textlint-plugin-text-12.2.2" = { + "@textlint/textlint-plugin-markdown-13.0.4" = { + name = "_at_textlint_slash_textlint-plugin-markdown"; + packageName = "@textlint/textlint-plugin-markdown"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-13.0.4.tgz"; + sha512 = "2w0kIO3xgCMNeCxl0TuMCkOqHprpa+gKyI5EPXSy0sj6ksSHlW3hntiPI7MsMzTA90qMXhKSJQAVwYYQ6ntpTA=="; + }; + }; + "@textlint/textlint-plugin-text-12.6.1" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "12.2.2"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.2.2.tgz"; - sha512 = "0HLOr9kQRXKqEcZvIaNAnOhixNfTSpveOHBuhHepByDXkXcUrb+BJdxZzhtgVu4twBAR3qJ3KYhDE8XPHc9iDg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.6.1.tgz"; + sha512 = "ZUfG0Xb8qGymIPNp2eFTq9bHvkJo3N3Ia1Aff5W9fsgZib1/Eb55U16Sp60TjhBFns0/p7L7usBC3nd3+tB5mQ=="; }; }; - "@textlint/types-12.2.2" = { + "@textlint/textlint-plugin-text-13.0.4" = { + name = "_at_textlint_slash_textlint-plugin-text"; + packageName = "@textlint/textlint-plugin-text"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-13.0.4.tgz"; + sha512 = "wnAxJ4qQQrjur3zTiVhI6rxoO2vDV7ZCvR8i62LKzK8YyVN4tQM9P6NjiCwnZD0RaIyXTcYX6huiUBQZffmHHg=="; + }; + }; + "@textlint/types-12.6.1" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "12.2.2"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-12.2.2.tgz"; - sha512 = "fmKH9w8O3XOvIvf3cPNI7PWdJScRIiJYJ5VsoIMp/o41Hlkt5m//MObfAPYpQ/3nuXhzlB05kfRUxyj/NvcPAQ=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-12.6.1.tgz"; + sha512 = "t1SZYahu2olnF8MUhlP6qDIEDyl7WmyIaBYxQdE2qU6xUkZWXS2zIxoAT/pVgvFCzDw3KO5HhIYGVeWRp90dTg=="; }; }; - "@textlint/utils-12.2.2" = { + "@textlint/types-13.0.4" = { + name = "_at_textlint_slash_types"; + packageName = "@textlint/types"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/types/-/types-13.0.4.tgz"; + sha512 = "ZYnrp+s/MUl1IMvEu92zafLwA8x1vMFaHEZV6BGP3ELf2GZVLZYns2hGYtJse1vb/+/PYH6OCSOTZqfsGwKARg=="; + }; + }; + "@textlint/utils-12.6.1" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "12.2.2"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.2.2.tgz"; - sha512 = "74p3VWj5KlmXs+gFRJALEuUsyt/Sz4t91KQ//LAX1zNTY/aK0nk8LxipUcDZeBHArn3Gh5nf3SwlTgUZ7jvNrQ=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.6.1.tgz"; + sha512 = "HJkqYXT2FAAHDM5XLFpQLF/CEdm8c2ltMeKmPBSSty1VfPXQMi8tGPT1b58b8KWh6dVmi7w0YYB7NrquuzXOKA=="; + }; + }; + "@textlint/utils-13.0.4" = { + name = "_at_textlint_slash_utils"; + packageName = "@textlint/utils"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/utils/-/utils-13.0.4.tgz"; + sha512 = "BrSShnYFzCeIYWCTsIIe7GQcFhapQhXq6b3FdZ3CMaAz1apzTKTpukyjfL4Wdiai99XfAWFLko4sld/uWF3/KA=="; }; }; "@tokenizer/token-0.1.1" = { @@ -11488,6 +12406,15 @@ let sha512 = "veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ=="; }; }; + "@types/argparse-1.0.38" = { + name = "_at_types_slash_argparse"; + packageName = "@types/argparse"; + version = "1.0.38"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz"; + sha512 = "ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA=="; + }; + }; "@types/atob-2.1.2" = { name = "_at_types_slash_atob"; packageName = "@types/atob"; @@ -11515,13 +12442,13 @@ let sha512 = "G4yqdVlhr6YhzLXFKy5F7HtRBU8Y23+iWy7UKthMq/OSQnL1hbsoeXESQ2LY8zEDlknipDG3nRGhUC9tkwvy/w=="; }; }; - "@types/better-sqlite3-7.6.2" = { + "@types/better-sqlite3-7.6.3" = { name = "_at_types_slash_better-sqlite3"; packageName = "@types/better-sqlite3"; - version = "7.6.2"; + version = "7.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.2.tgz"; - sha512 = "RgmaapusqTq6IMAr4McMyAsC6RshYTCjXCnzwVV59WctUxC8bNPyUfT9t5F81lKcU41lLurhjqjoMHfauzfqGg=="; + url = "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.3.tgz"; + sha512 = "YS64N9SNDT/NAvou3QNdzAu3E2om/W/0dhORimtPGLef+zSK5l1vDzfsWb4xgXOgfhtOI5ZDTRxnvRPb22AIVQ=="; }; }; "@types/bn.js-5.1.1" = { @@ -11560,13 +12487,13 @@ let sha512 = "p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw=="; }; }; - "@types/cacheable-request-6.0.2" = { + "@types/cacheable-request-6.0.3" = { name = "_at_types_slash_cacheable-request"; packageName = "@types/cacheable-request"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz"; - sha512 = "B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA=="; + url = "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz"; + sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw=="; }; }; "@types/caseless-0.12.2" = { @@ -11668,13 +12595,13 @@ let sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="; }; }; - "@types/debounce-1.2.1" = { - name = "_at_types_slash_debounce"; - packageName = "@types/debounce"; - version = "1.2.1"; + "@types/cors-2.8.13" = { + name = "_at_types_slash_cors"; + packageName = "@types/cors"; + version = "2.8.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/debounce/-/debounce-1.2.1.tgz"; - sha512 = "epMsEE85fi4lfmJUH/89/iV/LI+F5CvNIvmgs5g5jYFPfhO2S/ae8WSsLOKWdwtoaZw9Q2IhJ4tQ5tFCcS/4HA=="; + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz"; + sha512 = "RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA=="; }; }; "@types/debug-4.1.7" = { @@ -11695,15 +12622,6 @@ let sha512 = "aqcrAbqT/0+ULJJ73bwKWsiFkBh3ZnAelj9u+iI5/cr4Nz3yXGf3w4glx5am6uvvgBbKinK1PAqSJs7fSKD6ig=="; }; }; - "@types/dom4-2.0.2" = { - name = "_at_types_slash_dom4"; - packageName = "@types/dom4"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/dom4/-/dom4-2.0.2.tgz"; - sha512 = "Rt4IC1T7xkCWa0OG1oSsPa0iqnxlDeQqKXZAHrQGLb7wFGncWm85MaxKUjAGejOrUynOgWlFi4c6S6IyJwoK4g=="; - }; - }; "@types/duplexify-3.6.1" = { name = "_at_types_slash_duplexify"; packageName = "@types/duplexify"; @@ -11722,15 +12640,6 @@ let sha512 = "RQul5wEfY7BjWm0sYY86cmUN/pcXWGyVxWX93DFFJvcrxax5zKlieLwA3T77xJGwNcZW0YW6CYG70p1m8xPFmA=="; }; }; - "@types/emoji-mart-3.0.9" = { - name = "_at_types_slash_emoji-mart"; - packageName = "@types/emoji-mart"; - version = "3.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/emoji-mart/-/emoji-mart-3.0.9.tgz"; - sha512 = "qdBo/2Y8MXaJ/2spKjDZocuq79GpnOhkwMHnK2GnVFa8WYFgfA+ei6sil3aeWQPCreOKIx9ogPpR5+7MaOqYAA=="; - }; - }; "@types/es-aggregate-error-1.0.2" = { name = "_at_types_slash_es-aggregate-error"; packageName = "@types/es-aggregate-error"; @@ -11839,6 +12748,24 @@ let sha512 = "TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg=="; }; }; + "@types/express-4.17.15" = { + name = "_at_types_slash_express"; + packageName = "@types/express"; + version = "4.17.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express/-/express-4.17.15.tgz"; + sha512 = "Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ=="; + }; + }; + "@types/express-4.17.16" = { + name = "_at_types_slash_express"; + packageName = "@types/express"; + version = "4.17.16"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express/-/express-4.17.16.tgz"; + sha512 = "LkKpqRZ7zqXJuvoELakaFYuETHjZkSol8EV6cNnyishutDBCCdv6+dsKPbKkCcIk57qRphOLY5sEgClw1bO3gA=="; + }; + }; "@types/express-serve-static-core-4.17.31" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; @@ -11848,6 +12775,15 @@ let sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; }; }; + "@types/express-serve-static-core-4.17.33" = { + name = "_at_types_slash_express-serve-static-core"; + packageName = "@types/express-serve-static-core"; + version = "4.17.33"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz"; + sha512 = "TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA=="; + }; + }; "@types/file-type-10.9.1" = { name = "_at_types_slash_file-type"; packageName = "@types/file-type"; @@ -11866,15 +12802,6 @@ let sha512 = "nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA=="; }; }; - "@types/geojson-7946.0.10" = { - name = "_at_types_slash_geojson"; - packageName = "@types/geojson"; - version = "7946.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz"; - sha512 = "Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA=="; - }; - }; "@types/get-stdin-5.0.1" = { name = "_at_types_slash_get-stdin"; packageName = "@types/get-stdin"; @@ -11911,15 +12838,6 @@ let sha512 = "Po8ZPCsAcPPuf5OODPEkb6cdWJ/w4BdX1veP7IIOc2WG0x1SW4GEQ1+FHKN1AMG2AePJfNUceJbh5PKtP92yRQ=="; }; }; - "@types/html-minifier-terser-5.1.2" = { - name = "_at_types_slash_html-minifier-terser"; - packageName = "@types/html-minifier-terser"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz"; - sha512 = "h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w=="; - }; - }; "@types/html-minifier-terser-6.1.0" = { name = "_at_types_slash_html-minifier-terser"; packageName = "@types/html-minifier-terser"; @@ -11956,13 +12874,13 @@ let sha512 = "rjaYQ9b9y/VFGOpqBEXRavc3jh0a+e6evAbI31tMda8VlPaSy0AZJfXsvmIe3wklc7W6C3zCSfleuMXR7NOyXw=="; }; }; - "@types/inquirer-8.2.4" = { + "@types/inquirer-8.2.5" = { name = "_at_types_slash_inquirer"; packageName = "@types/inquirer"; - version = "8.2.4"; + version = "8.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.4.tgz"; - sha512 = "Pxxx3i3AyK7vKAj3LRM/vF7ETcHKiLJ/u5CnNgbz/eYj/vB3xGAYtRxI5IKtq0hpe5iFHD22BKV3n6WHUu0k4Q=="; + url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.5.tgz"; + sha512 = "QXlzybid60YtAwfgG3cpykptRYUx2KomzNutMlWsQC64J/WG/gQSl+P4w7A21sGN0VIxRVava4rgnT7FQmFCdg=="; }; }; "@types/is-empty-1.2.1" = { @@ -12001,13 +12919,13 @@ let sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; }; }; - "@types/jquery-3.5.14" = { + "@types/jquery-3.5.16" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.5.14"; + version = "3.5.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz"; - sha512 = "X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.16.tgz"; + sha512 = "bsI7y4ZgeMkmpG9OM710RRzDFp+w4P1RGiIt30C1mSBT+ExCleeh4HObwgArnDFELmRrOpXgSYN9VF1hj+f1lw=="; }; }; "@types/js-levenshtein-1.1.1" = { @@ -12091,15 +13009,6 @@ let sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; }; }; - "@types/keyv-4.2.0" = { - name = "_at_types_slash_keyv"; - packageName = "@types/keyv"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/keyv/-/keyv-4.2.0.tgz"; - sha512 = "xoBtGl5R9jeKUhc8ZqeYaRDx04qqJ10yhhXYGmJ4Jr8qKpvMsDQQrNUvF/wUJ4klOtmJeJM+p2Xo3zp9uaC3tw=="; - }; - }; "@types/linkify-it-3.0.2" = { name = "_at_types_slash_linkify-it"; packageName = "@types/linkify-it"; @@ -12127,13 +13036,13 @@ let sha512 = "0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw=="; }; }; - "@types/lodash-4.14.188" = { + "@types/lodash-4.14.191" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.188"; + version = "4.14.191"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.188.tgz"; - sha512 = "zmEmF5OIM3rb7SbLCFYoQhO4dGt2FRM9AMkxvA3LaADOF1n8in/zGJlWji9fmafLoNyz+FoL6FE0SLtGIArD7w=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz"; + sha512 = "BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ=="; }; }; "@types/long-4.0.2" = { @@ -12145,31 +13054,13 @@ let sha512 = "MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="; }; }; - "@types/mapbox-gl-0.54.5" = { - name = "_at_types_slash_mapbox-gl"; - packageName = "@types/mapbox-gl"; - version = "0.54.5"; + "@types/lru-cache-5.1.1" = { + name = "_at_types_slash_lru-cache"; + packageName = "@types/lru-cache"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-0.54.5.tgz"; - sha512 = "h0MqA7rtP88vuMepODf1oomJLeuRAZfOiYdeGS3NYO4TMQs237TkA+bNehy7V5nfyCjPRuKrb0fnWMjncHak0g=="; - }; - }; - "@types/mapbox__point-geometry-0.1.2" = { - name = "_at_types_slash_mapbox__point-geometry"; - packageName = "@types/mapbox__point-geometry"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.2.tgz"; - sha512 = "D0lgCq+3VWV85ey1MZVkE8ZveyuvW5VAfuahVTQRpXFQTxw03SuIf1/K4UQ87MMIXVKzpFjXFiFMZzLj2kU+iA=="; - }; - }; - "@types/mapbox__vector-tile-1.3.0" = { - name = "_at_types_slash_mapbox__vector-tile"; - packageName = "@types/mapbox__vector-tile"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.0.tgz"; - sha512 = "kDwVreQO5V4c8yAxzZVQLE5tyWF+IPToAanloQaSnwfXmIcJ7cyOrv8z4Ft4y7PsLYmhWXmON8MBV8RX0Rgr8g=="; + url = "https://registry.npmjs.org/@types/lru-cache/-/lru-cache-5.1.1.tgz"; + sha512 = "ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw=="; }; }; "@types/markdown-it-12.2.3" = { @@ -12208,15 +13099,6 @@ let sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; }; }; - "@types/mime-types-2.1.1" = { - name = "_at_types_slash_mime-types"; - packageName = "@types/mime-types"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz"; - sha512 = "vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw=="; - }; - }; "@types/minimatch-3.0.5" = { name = "_at_types_slash_minimatch"; packageName = "@types/minimatch"; @@ -12325,13 +13207,13 @@ let sha512 = "Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ=="; }; }; - "@types/node-13.13.52" = { + "@types/node-12.20.24" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.52"; + version = "12.20.24"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.52.tgz"; - sha512 = "s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz"; + sha512 = "yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ=="; }; }; "@types/node-14.17.34" = { @@ -12352,6 +13234,15 @@ let sha512 = "qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg=="; }; }; + "@types/node-14.18.36" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "14.18.36"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-14.18.36.tgz"; + sha512 = "FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ=="; + }; + }; "@types/node-15.14.9" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -12370,49 +13261,31 @@ let sha512 = "ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w=="; }; }; - "@types/node-16.18.3" = { + "@types/node-16.18.11" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.18.3"; + version = "16.18.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.18.3.tgz"; - sha512 = "jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz"; + sha512 = "3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA=="; }; }; - "@types/node-18.11.2" = { + "@types/node-16.9.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.11.2"; + version = "16.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.2.tgz"; - sha512 = "BWN3M23gLO2jVG8g/XHIRFWiiV4/GckeFIqbU/C4V3xpoBBWSMk4OZomouN0wCkfQFPqgZikyLr7DOYDysIkkw=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.9.1.tgz"; + sha512 = "QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g=="; }; }; - "@types/node-18.11.7" = { + "@types/node-18.11.18" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.11.7"; + version = "18.11.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.7.tgz"; - sha512 = "LhFTglglr63mNXUSRYD8A+ZAIu5sFqNJ4Y2fPuY7UlrySJH87rRRlhtVmMHplmfk5WkoJGmDjE9oiTfyX94CpQ=="; - }; - }; - "@types/node-18.11.9" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "18.11.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz"; - sha512 = "CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg=="; - }; - }; - "@types/node-18.7.14" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "18.7.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.7.14.tgz"; - sha512 = "6bbDaETVi8oyIARulOE9qF1/Qdi/23z6emrUh0fNJRUmjznqrixD4MpGDdgOFk5Xb0m2H6Xu42JGdvAxaJR/wA=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz"; + sha512 = "DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA=="; }; }; "@types/node-6.14.13" = { @@ -12424,6 +13297,15 @@ let sha512 = "J1F0XJ/9zxlZel5ZlbeSuHW2OpabrUAqpFuC2sm2I3by8sERQ8+KCjNKUcq8QHuzpGMWiJpo9ZxeHrqrP2KzQw=="; }; }; + "@types/node-fetch-1.6.9" = { + name = "_at_types_slash_node-fetch"; + packageName = "@types/node-fetch"; + version = "1.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-1.6.9.tgz"; + sha512 = "n2r6WLoY7+uuPT7pnEtKJCmPUGyJ+cbyBR8Avnu4+m1nzz7DwBVuyIvvlBzCZ/nrpC7rIgb3D6pNavL7rFEa9g=="; + }; + }; "@types/node-fetch-2.6.2" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; @@ -12460,24 +13342,6 @@ let sha512 = "kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw=="; }; }; - "@types/parse5-6.0.3" = { - name = "_at_types_slash_parse5"; - packageName = "@types/parse5"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz"; - sha512 = "SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g=="; - }; - }; - "@types/pbf-3.0.2" = { - name = "_at_types_slash_pbf"; - packageName = "@types/pbf"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.2.tgz"; - sha512 = "EDrLIPaPXOZqDjrkzxxbX7UlJSeQVgah3i0aA4pOSzmK9zq3BIh7/MZIQxED7slJByvKM4Gc6Hypyu2lJzh3SQ=="; - }; - }; "@types/pbkdf2-3.1.0" = { name = "_at_types_slash_pbkdf2"; packageName = "@types/pbkdf2"; @@ -12532,15 +13396,6 @@ let sha512 = "FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="; }; }; - "@types/raf-3.4.0" = { - name = "_at_types_slash_raf"; - packageName = "@types/raf"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/raf/-/raf-3.4.0.tgz"; - sha512 = "taW5/WYqo36N7V39oYyHP9Ipfd5pNFvGTIQsNGj86xV88YQ7GnI30/yMfKDF7Zgin0m3e+ikX88FvImnK4RjGw=="; - }; - }; "@types/range-parser-1.2.4" = { name = "_at_types_slash_range-parser"; packageName = "@types/range-parser"; @@ -12550,67 +13405,31 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/rc-1.2.1" = { - name = "_at_types_slash_rc"; - packageName = "@types/rc"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rc/-/rc-1.2.1.tgz"; - sha512 = "+TRLFmHLnpoV0uw4O/PzqMbPT6bhQM0q2KO0l+R7M3sHYRndPpNL6kv8p7Ee9ZxgQ6noYB18/t+heQi7eijOHA=="; - }; - }; - "@types/react-17.0.52" = { + "@types/react-17.0.53" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "17.0.52"; + version = "17.0.53"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-17.0.52.tgz"; - sha512 = "vwk8QqVODi0VaZZpDXQCmEmiOuyjEFPY7Ttaw5vjM112LOq37yz1CDJGrRJwA1fYEq4Iitd5rnjd1yWAc/bT+A=="; + url = "https://registry.npmjs.org/@types/react/-/react-17.0.53.tgz"; + sha512 = "1yIpQR2zdYu1Z/dc1OxC+MA6GR240u3gcnP4l6mvj/PJiVaqHsQPmWttsvHsfnhfPbU2FuGmo0wSITPygjBmsw=="; }; }; - "@types/react-18.0.25" = { + "@types/react-18.0.27" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "18.0.25"; + version = "18.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-18.0.25.tgz"; - sha512 = "xD6c0KDT4m7n9uD4ZHi02lzskaiqcBxf4zi+tXZY98a04wvc0hi/TcCPC2FOESZi51Nd7tlUeOJY8RofL799/g=="; + url = "https://registry.npmjs.org/@types/react/-/react-18.0.27.tgz"; + sha512 = "3vtRKHgVxu3Jp9t718R9BuzoD4NcQ8YJ5XRzsSKxNDiDonD2MXIT1TmSkenxuCycZJoQT5d2vE8LwWJxBC1gmA=="; }; }; - "@types/react-dom-17.0.18" = { + "@types/react-dom-18.0.10" = { name = "_at_types_slash_react-dom"; packageName = "@types/react-dom"; - version = "17.0.18"; + version = "18.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.18.tgz"; - sha512 = "rLVtIfbwyur2iFKykP2w0pl/1unw26b5td16d5xMgp7/yjTHomkyxPYChFoCr/FtEX1lN9wY6lFj1qvKdS5kDw=="; - }; - }; - "@types/react-dom-18.0.8" = { - name = "_at_types_slash_react-dom"; - packageName = "@types/react-dom"; - version = "18.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.8.tgz"; - sha512 = "C3GYO0HLaOkk9dDAz3Dl4sbe4AKUGTCfFIZsz3n/82dPNN8Du533HzKatDxeUYWu24wJgMP1xICqkWk1YOLOIw=="; - }; - }; - "@types/react-window-1.8.5" = { - name = "_at_types_slash_react-window"; - packageName = "@types/react-window"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/react-window/-/react-window-1.8.5.tgz"; - sha512 = "V9q3CvhC9Jk9bWBOysPGaWy/Z0lxYcTXLtLipkt2cnRj1JOSFNF7wqGpkScSXMgBwC+fnVRg/7shwgddBG5ICw=="; - }; - }; - "@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.6"; - src = fetchurl { - 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=="; + url = "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.10.tgz"; + sha512 = "E42GW/JA4Qv15wQdqJq8DL4JhNpB3prJgjgapN3qJT9K2zO5IIAQh4VXvCEDupoqAwnz0cY4RlXeC/ajX5SFHg=="; }; }; "@types/request-2.48.8" = { @@ -12631,15 +13450,6 @@ let sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; }; }; - "@types/responselike-3.0.0" = { - name = "_at_types_slash_responselike"; - packageName = "@types/responselike"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/responselike/-/responselike-3.0.0.tgz"; - sha512 = "zfgGLWx5IQOTJgQPD4UfGEhapTKUPC1ra/QCG02y3GUJWrhX05bBf/EfTh3aFj2DKi7cLo+cipXLNclD27tQXQ=="; - }; - }; "@types/retry-0.12.0" = { name = "_at_types_slash_retry"; packageName = "@types/retry"; @@ -12685,6 +13495,15 @@ let sha512 = "Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w=="; }; }; + "@types/seedrandom-3.0.1" = { + name = "_at_types_slash_seedrandom"; + packageName = "@types/seedrandom"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/seedrandom/-/seedrandom-3.0.1.tgz"; + sha512 = "giB9gzDeiCeloIXDgzFBCgjj1k4WxcDrZtGl6h1IqmUPlxF+Nx8Ve+96QCyDZ/HseB/uvDsKbpib9hU5cU53pw=="; + }; + }; "@types/semver-7.3.13" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; @@ -12865,6 +13684,15 @@ let sha512 = "Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw=="; }; }; + "@types/tunnel-0.0.3" = { + name = "_at_types_slash_tunnel"; + packageName = "@types/tunnel"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.3.tgz"; + sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA=="; + }; + }; "@types/uglify-js-3.17.1" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; @@ -12901,15 +13729,6 @@ let sha512 = "wDXw9LEEUHyV+7UWy7U315nrJGJ7p1BzaCxDpEoLr789Dk1WDVMMlf3iBfbG2F8NdWnYyFbtTxUn2ZNbm1Q4LQ=="; }; }; - "@types/url-parse-1.4.8" = { - name = "_at_types_slash_url-parse"; - packageName = "@types/url-parse"; - version = "1.4.8"; - src = fetchurl { - 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"; @@ -12937,13 +13756,13 @@ let sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; }; }; - "@types/vinyl-2.0.6" = { + "@types/vinyl-2.0.7" = { name = "_at_types_slash_vinyl"; packageName = "@types/vinyl"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.6.tgz"; - sha512 = "ayJ0iOCDNHnKpKTgBG6Q6JOnHTj9zFta+3j2b8Ejza0e4cvRyMn0ZoLEmbPrTHe5YYRlDYPvPWVdV4cTaRyH7g=="; + url = "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.7.tgz"; + sha512 = "4UqPv+2567NhMQuMLdKAyK4yzrfCqwaTt6bLhHEs8PFcxbHILsrxaY63n4wgE/BRLDWDQeI+WcTmkXKExh9hQg=="; }; }; "@types/vscode-1.66.0" = { @@ -13018,40 +13837,31 @@ let sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg=="; }; }; - "@types/ws-8.5.3" = { + "@types/ws-8.5.4" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "8.5.3"; + version = "8.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz"; - sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz"; + sha512 = "zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg=="; }; }; - "@types/yargs-15.0.14" = { + "@types/yargs-15.0.15" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "15.0.14"; + version = "15.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz"; - sha512 = "yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.15.tgz"; + sha512 = "IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg=="; }; }; - "@types/yargs-16.0.4" = { + "@types/yargs-16.0.5" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "16.0.4"; + version = "16.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz"; - sha512 = "T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw=="; - }; - }; - "@types/yargs-17.0.13" = { - name = "_at_types_slash_yargs"; - packageName = "@types/yargs"; - version = "17.0.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.13.tgz"; - sha512 = "9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.5.tgz"; + sha512 = "AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ=="; }; }; "@types/yargs-parser-21.0.0" = { @@ -13090,13 +13900,13 @@ let sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg=="; }; }; - "@typescript-eslint/eslint-plugin-5.42.0" = { + "@typescript-eslint/eslint-plugin-5.49.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.42.0"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.42.0.tgz"; - sha512 = "5TJh2AgL6+wpL8H/GTSjNb4WrjKoR2rqvFxR/DDTqYNk6uXn8BJMEcncLSpMbf/XV1aS0jAjYwn98uvVCiAywQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.49.0.tgz"; + sha512 = "IhxabIpcf++TBaBa1h7jtOWyon80SXPRLDq0dVz5SLFC/eW6tofkw/O7Ar3lkx5z5U6wzbKDrl2larprp5kk5Q=="; }; }; "@typescript-eslint/experimental-utils-4.33.0" = { @@ -13117,13 +13927,13 @@ let sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA=="; }; }; - "@typescript-eslint/parser-5.42.0" = { + "@typescript-eslint/parser-5.49.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.42.0"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.42.0.tgz"; - sha512 = "Ixh9qrOTDRctFg3yIwrLkgf33AHyEIn6lhyf5cCfwwiGtkWhNpVKlEZApi3inGQR/barWnY7qY8FbGKBO7p3JA=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.49.0.tgz"; + sha512 = "veDlZN9mUhGqU31Qiv2qEp+XrJj5fgZpJ8PW30sHU+j/8/e5ruAhLaVDAeznS7A7i4ucb/s8IozpDtt9NqCkZg=="; }; }; "@typescript-eslint/scope-manager-4.33.0" = { @@ -13135,22 +13945,22 @@ let sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ=="; }; }; - "@typescript-eslint/scope-manager-5.42.0" = { + "@typescript-eslint/scope-manager-5.49.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.42.0"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.42.0.tgz"; - sha512 = "l5/3IBHLH0Bv04y+H+zlcLiEMEMjWGaCX6WyHE5Uk2YkSGAMlgdUPsT/ywTSKgu9D1dmmKMYgYZijObfA39Wow=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.49.0.tgz"; + sha512 = "clpROBOiMIzpbWNxCe1xDK14uPZh35u4QaZO1GddilEzoCLAEz4szb51rBpdgurs5k2YzPtJeTEN3qVbG+LRUQ=="; }; }; - "@typescript-eslint/type-utils-5.42.0" = { + "@typescript-eslint/type-utils-5.49.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.42.0"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.42.0.tgz"; - sha512 = "HW14TXC45dFVZxnVW8rnUGnvYyRC0E/vxXShFCthcC9VhVTmjqOmtqj6H5rm9Zxv+ORxKA/1aLGD7vmlLsdlOg=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.49.0.tgz"; + sha512 = "eUgLTYq0tR0FGU5g1YHm4rt5H/+V2IPVkP0cBmbhRyEmyGe4XvJ2YJ6sYTmONfjmdMqyMLad7SB8GvblbeESZA=="; }; }; "@typescript-eslint/types-4.33.0" = { @@ -13162,13 +13972,13 @@ let sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; }; }; - "@typescript-eslint/types-5.42.0" = { + "@typescript-eslint/types-5.49.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.42.0"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.42.0.tgz"; - sha512 = "t4lzO9ZOAUcHY6bXQYRuu+3SSYdD9TS8ooApZft4WARt4/f2Cj/YpvbTe8A4GuhT4bNW72goDMOy7SW71mZwGw=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.49.0.tgz"; + sha512 = "7If46kusG+sSnEpu0yOz2xFv5nRz158nzEXnJFCGVEHWnuzolXKwrH5Bsf9zsNlOQkyZuk0BZKKoJQI+1JPBBg=="; }; }; "@typescript-eslint/typescript-estree-4.33.0" = { @@ -13180,22 +13990,22 @@ let sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; }; }; - "@typescript-eslint/typescript-estree-5.42.0" = { + "@typescript-eslint/typescript-estree-5.49.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.42.0"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.42.0.tgz"; - sha512 = "2O3vSq794x3kZGtV7i4SCWZWCwjEtkWfVqX4m5fbUBomOsEOyd6OAD1qU2lbvV5S8tgy/luJnOYluNyYVeOTTg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.49.0.tgz"; + sha512 = "PBdx+V7deZT/3GjNYPVQv1Nc0U46dAHbIuOG8AZ3on3vuEKiPDwFE/lG1snN2eUB9IhF7EyF7K1hmTcLztNIsA=="; }; }; - "@typescript-eslint/utils-5.42.0" = { + "@typescript-eslint/utils-5.49.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.42.0"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.42.0.tgz"; - sha512 = "JZ++3+h1vbeG1NUECXQZE3hg0kias9kOtcQr3+JVQ3whnjvKuMyktJAAIj6743OeNPnGBmjj7KEmiDL7qsdnCQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.49.0.tgz"; + sha512 = "cPJue/4Si25FViIb74sHCLtM4nTSBXtLx1d3/QT6mirQ/c65bV8arBEebBJJizfq8W2YyMoPI/WWPFWitmNqnQ=="; }; }; "@typescript-eslint/visitor-keys-4.33.0" = { @@ -13207,13 +14017,13 @@ let sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; - "@typescript-eslint/visitor-keys-5.42.0" = { + "@typescript-eslint/visitor-keys-5.49.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.42.0"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.42.0.tgz"; - sha512 = "QHbu5Hf/2lOEOwy+IUw0GoSCuAzByTAWWrOTKzTzsotiUnWFpuKnXcAhC9YztAf2EElQ0VvIK+pHJUPkM0q7jg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.49.0.tgz"; + sha512 = "v9jBMjpNWyn8B6k/Mjt6VbUS4J1GvUlR4x3Y+ibnP1z7y7V4n0WRz+50DY6+Myj0UaXVSuUlHohO+eZ8IJEnkg=="; }; }; "@uphold/request-logger-2.0.0" = { @@ -13234,13 +14044,13 @@ let sha512 = "PUxhtBh7/8167HJK6WqBv6Z0piuiaZHQGYbhwpNL9aIQmLROPEdaUYkY4wh45wPQXcTpnd11l0q3Pw+TI11pdw=="; }; }; - "@urql/core-3.0.5" = { + "@urql/core-3.1.1" = { name = "_at_urql_slash_core"; packageName = "@urql/core"; - version = "3.0.5"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@urql/core/-/core-3.0.5.tgz"; - sha512 = "6/1HG+WEAcPs+hXSFnxWBTWkNUwa8dj2cHysWokMaFIbAioGtUaSdxp2q9FDMtWAIGdc640NFSt2B8itGLdoAA=="; + url = "https://registry.npmjs.org/@urql/core/-/core-3.1.1.tgz"; + sha512 = "Mnxtq4I4QeFJsgs7Iytw+HyhiGxISR6qtyk66c9tipozLZ6QVxrCiUPF2HY4BxNIabaxcp+rivadvm8NAnXj4Q=="; }; }; "@urql/exchange-retry-0.3.0" = { @@ -13261,148 +14071,175 @@ let sha512 = "UGyyGAMXzop9C/fIoe7Ij63DkPSy1uMw2jipB5dnB8R3kl80za7LYzVnA1HvBEt2ZPWfMuwez/VGLOQ7XX4bTA=="; }; }; - "@vercel/build-utils-5.5.7" = { + "@vercel/build-utils-6.0.0" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "5.5.7"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-5.5.7.tgz"; - sha512 = "F8brek8VcR3CLgcuKyXbb8k8y/KRwqO/yEV5dTUW6OZ0fGxxa+0RnaaY1UbHlCVF1Cnu+/IsMDsmsj9o1RCP5A=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-6.0.0.tgz"; + sha512 = "2AoVcDUyQCj516KrRNH92NeKI+KZGnVGjHkcb+VcXxGspYpKL/gC+AdFtC05qbgxX1e8U95Yd8ROucTftHErWw=="; }; }; - "@vercel/go-2.2.15" = { + "@vercel/gatsby-plugin-vercel-analytics-1.0.7" = { + name = "_at_vercel_slash_gatsby-plugin-vercel-analytics"; + packageName = "@vercel/gatsby-plugin-vercel-analytics"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-analytics/-/gatsby-plugin-vercel-analytics-1.0.7.tgz"; + sha512 = "j4DsneQ+oOF0Zurvisj+H2ds8s8ZEqfI4iD6xgFY9mB2UdGixhzFRjvDBH6g4pfUQXfO76K5GiA1afumGlJbwA=="; + }; + }; + "@vercel/gatsby-plugin-vercel-builder-1.0.2" = { + name = "_at_vercel_slash_gatsby-plugin-vercel-builder"; + packageName = "@vercel/gatsby-plugin-vercel-builder"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-1.0.2.tgz"; + sha512 = "zhbLVDM8wdWK1Se0aYK5kB3w/LvR8ayzYSpeWZK2rzpTPmjWNbRBjJkWtoZvL5LlE4rEcSELaci7uxXIrflEag=="; + }; + }; + "@vercel/go-2.2.31" = { name = "_at_vercel_slash_go"; packageName = "@vercel/go"; - version = "2.2.15"; + version = "2.2.31"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/go/-/go-2.2.15.tgz"; - sha512 = "GDaG7ajKPQ0G9UT0w9UCWiD31UE27ksPP8gJFVBN3I3UmgypIiSkKadAjHZTZYPVp7mLDUeOqxL9I0A/G3bx+g=="; + url = "https://registry.npmjs.org/@vercel/go/-/go-2.2.31.tgz"; + sha512 = "zDBxGi+M9AU18fNKSfZeD+hEALlIO/vQRD2kCh2f5k/Agjera6ughW0B3he+1s/M23vCDdx6N54E2j9GeTBZlQ=="; }; }; - "@vercel/hydrogen-0.0.28" = { + "@vercel/hydrogen-0.0.45" = { name = "_at_vercel_slash_hydrogen"; packageName = "@vercel/hydrogen"; - version = "0.0.28"; + version = "0.0.45"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-0.0.28.tgz"; - sha512 = "Yfb6/0xtWMlBb96Xqlt1tnOmClcc+Vq3qfSpf8Zd+OiJP7qbmgIzi1bN2s7m5t5p34boDQ4TISlQx1FsVxWH0A=="; + url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-0.0.45.tgz"; + sha512 = "ZE/1scAUiuYZTEmO3CN08mGPo6dbORR8/tGDzsF//KYjTNcsKQJ+szVRqxUH5ZbazS4F2h1+wNDM0XHwKuLbLA=="; }; }; - "@vercel/next-3.2.8" = { + "@vercel/next-3.3.19" = { name = "_at_vercel_slash_next"; packageName = "@vercel/next"; - version = "3.2.8"; + version = "3.3.19"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/next/-/next-3.2.8.tgz"; - sha512 = "LjZ83L1lnMLKJy3Et8jz4FxSAe99QdIpWdb2kHST7uiUveUX+Ke8DA32QZcszd7OObgbRxutFnC791kAqtr4og=="; + url = "https://registry.npmjs.org/@vercel/next/-/next-3.3.19.tgz"; + sha512 = "Adu3i4eHcQqLmRLCpJteilCTxfMLdr9grwk4Yq4g66xwRgkYTHiupkDN7hXThsxEBQgtotfcTUlygYYJjXvBkA=="; }; }; - "@vercel/nft-0.22.1" = { + "@vercel/nft-0.22.5" = { name = "_at_vercel_slash_nft"; packageName = "@vercel/nft"; - version = "0.22.1"; + version = "0.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.22.1.tgz"; - sha512 = "lYYZIoxRurqDOSoVIdBicGnpUIpfyaS5qVjdPq+EfI285WqtZK3NK/dyCkiyBul+X2U2OEhRyeMdXPCHGJbohw=="; + url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.22.5.tgz"; + sha512 = "mug57Wd1BL7GMj9gXMgMeKUjdqO0e4u+0QLPYMFE1rwdJ+55oPy6lp3nIBCS8gOvigT62UI4QKUL2sGqcoW4Hw=="; }; }; - "@vercel/node-2.6.1" = { + "@vercel/node-2.8.16" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "2.6.1"; + version = "2.8.16"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-2.6.1.tgz"; - sha512 = "8AXrXxx1XKMT5OpSjQ5ghzjw0HYp4Cuv6GUWJ48jPcvzmU9VC5mZvjmhzmbIT4pPHdKjKZLPy8/rHqDjqztuJg=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-2.8.16.tgz"; + sha512 = "aLuPHOm29cYjCK649/5j/zbYFXxRtNYcnNFdBd2gVg2II54SfByYIx/Tw3A6PeQmR23piBwPZMI5uEuYC0TGmA=="; }; }; - "@vercel/node-bridge-3.1.1" = { + "@vercel/node-bridge-3.1.10" = { name = "_at_vercel_slash_node-bridge"; packageName = "@vercel/node-bridge"; - version = "3.1.1"; + version = "3.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node-bridge/-/node-bridge-3.1.1.tgz"; - sha512 = "sWg2okUTj8IbeWnAaY3IKbDp3Vinj4zdt3Q11S+cRMXO+pAUbqJxmiPD5+MS0RyIVvufoNotooiitRGlgQjA5w=="; + url = "https://registry.npmjs.org/@vercel/node-bridge/-/node-bridge-3.1.10.tgz"; + sha512 = "0DQzF5pdyP+xd5f1Ss2fAO+9xIvzUhngRAPazwg4XHZE9iLkv2L+A1u3L8NYi4hoUlAAZQ5GF3txlm/oBn4tNw=="; }; }; - "@vercel/python-3.1.24" = { + "@vercel/python-3.1.41" = { name = "_at_vercel_slash_python"; packageName = "@vercel/python"; - version = "3.1.24"; + version = "3.1.41"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/python/-/python-3.1.24.tgz"; - sha512 = "rQcmxHkzCAB83BC17RoiXXdEktmR4BAnJvlItpw7UpmVoSEBjHINOvdbu2XnxG5AslcTYBTbtyn1NBPcx6NaDg=="; + url = "https://registry.npmjs.org/@vercel/python/-/python-3.1.41.tgz"; + sha512 = "xS3LY1zzuKM2wTeW9tTQqQ3gNgsstSWMO8dnxcuFnYMP8JwN4ffLSreXeJm4S5pFsn5dNyH1EckgoXWgB9TgBQ=="; }; }; - "@vercel/redwood-1.0.33" = { + "@vercel/redwood-1.0.52" = { name = "_at_vercel_slash_redwood"; packageName = "@vercel/redwood"; - version = "1.0.33"; + version = "1.0.52"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-1.0.33.tgz"; - sha512 = "7qXKa0pTn31YcLDjxBgFXM2rFftgiX6tS1nvvbP3dFrL/1SdwkfcNJLR0K3qFkiPkrWJdYBdeAIZVFnI2kyA1w=="; + url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-1.0.52.tgz"; + sha512 = "ZZ+qWdYRYfL5wKYao4/oXHxbGpoN6MJEN+YtiOSCauDfolN/7c+qFbZu4P6MdEddY4/3Kq1CRMy9z89UfPPzew=="; }; }; - "@vercel/remix-1.0.34" = { + "@vercel/remix-1.2.8" = { name = "_at_vercel_slash_remix"; packageName = "@vercel/remix"; - version = "1.0.34"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/remix/-/remix-1.0.34.tgz"; - sha512 = "xcxRitagosqSWgZPfYFgMN//MJD+i5LpPB7zsXfwuOC5La4DJ8DU0ZKJpTWAor4j0kdxQX4D54jjw3vAxap4sQ=="; + url = "https://registry.npmjs.org/@vercel/remix/-/remix-1.2.8.tgz"; + sha512 = "30Cfc+tl6L+L4+c9fGTBfS8YbCSfP/plqf+bTSHHU9wIGWmq/oKpIxInRbcT2+7oAb+EdehMDoZ1r/L7me7Dew=="; }; }; - "@vercel/routing-utils-2.1.1" = { + "@vercel/routing-utils-2.1.8" = { name = "_at_vercel_slash_routing-utils"; packageName = "@vercel/routing-utils"; - version = "2.1.1"; + version = "2.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/routing-utils/-/routing-utils-2.1.1.tgz"; - sha512 = "X5mYkJi8Zuc74bvufI6jaUfzLZJSQ/nat7WOoOgBpd4DRqfGNm7umqEe3xe7BKcuc95tnDkzR1yNjcqkkumydg=="; + url = "https://registry.npmjs.org/@vercel/routing-utils/-/routing-utils-2.1.8.tgz"; + sha512 = "rng+qyQ0VpnBjO2R7GQlpAdEx+yyvrcEp6XNe+4q6e+oW0n2H6dm6SLFEBA6B1QmHX4OTTCkq1GIiKsK6ENw4Q=="; }; }; - "@vercel/ruby-1.3.41" = { + "@vercel/ruby-1.3.57" = { name = "_at_vercel_slash_ruby"; packageName = "@vercel/ruby"; - version = "1.3.41"; + version = "1.3.57"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.3.41.tgz"; - sha512 = "Tn+j9g/VRQLVVzn1Sz1DBEvrlKkXHG+7IxuYdJ9K/+t3iKk4EheYI/lBo3aDPEszPbI0eHNsO7Bg7xWRGW0hsQ=="; + url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.3.57.tgz"; + sha512 = "AY9bhSwDPcWt20KNskpn/zGF8nP7JBkfWbddXwF0uP2Ui55b+hnBr2VjRf2qys2npOZu2O2jd70/KCOUGnkdIw=="; }; }; - "@vercel/static-build-1.0.34" = { + "@vercel/static-build-1.3.0" = { name = "_at_vercel_slash_static-build"; packageName = "@vercel/static-build"; - version = "1.0.34"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-1.0.34.tgz"; - sha512 = "nWQGn2NEst9cZAWRRjjuuLhO0x2DyhfYKHcWQYhmqhKeXObTDV4iIgMa6yxMBJVPTx5dwsKfVDIHKtNB69j22A=="; + url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-1.3.0.tgz"; + sha512 = "Ai9xpqkMCxXT8lHtyn+qE9N+fQSdlBv9ph0ldeKdc+BhDx8T91LzAoCxqT2XnNii0TIakD2k/ZI/qusqTTMe6Q=="; }; }; - "@vercel/static-config-2.0.5" = { + "@vercel/static-config-2.0.11" = { name = "_at_vercel_slash_static-config"; packageName = "@vercel/static-config"; - version = "2.0.5"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-config/-/static-config-2.0.5.tgz"; - sha512 = "f3wt+vQ3ARRR7hXHteMbrRNjH8iMETmP8f/t2HC8TpOjitjsjUKZg+3YS54AtLDEw/ZZ1s/7EG9nMK2BbU/t6g=="; + url = "https://registry.npmjs.org/@vercel/static-config/-/static-config-2.0.11.tgz"; + sha512 = "dw6CAJ7U2AcQpjZV9YfOyz2wTseSFdkT3qivBg2GjHtVyd5wdY7vkQ9seLKEckYhFx3CjQ29IhzhDND9F5oINw=="; }; }; - "@vscode/emmet-helper-2.8.4" = { + "@vscode/emmet-helper-2.8.6" = { name = "_at_vscode_slash_emmet-helper"; packageName = "@vscode/emmet-helper"; - version = "2.8.4"; + version = "2.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz"; - sha512 = "lUki5QLS47bz/U8IlG9VQ+1lfxMtxMZENmU5nu4Z71eOD5j9FK0SmYGL5NiVJg9WBWeAU0VxRADMY2Qpq7BfVg=="; + url = "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.8.6.tgz"; + sha512 = "IIB8jbiKy37zN8bAIHx59YmnIelY78CGHtThnibD/d3tQOKRY83bYVi9blwmZVUZh6l9nfkYH3tvReaiNxY9EQ=="; }; }; - "@vscode/test-electron-2.2.0" = { + "@vscode/l10n-0.0.11" = { + name = "_at_vscode_slash_l10n"; + packageName = "@vscode/l10n"; + version = "0.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.11.tgz"; + sha512 = "ukOMWnCg1tCvT7WnDfsUKQOFDQGsyR5tNgRpwmqi+5/vzU3ghdDXzvIM4IOPdSb3OeSsBNvmSL8nxIVOqi2WXA=="; + }; + }; + "@vscode/test-electron-2.2.2" = { name = "_at_vscode_slash_test-electron"; packageName = "@vscode/test-electron"; - version = "2.2.0"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.2.0.tgz"; - sha512 = "xk2xrOTMG75/hxO8OVVZ+GErv9gmdZwOD8rEHV3ty3n1Joav2yFcfrmqD6Ukref27U13LEL8gVvSHzauGAK5nQ=="; + url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.2.2.tgz"; + sha512 = "s5d2VtMySvff0UgqkJ0BMCr1es+qREE194EAodGIefq518W53ifvv69e80l9e2MrYJEqUUKwukE/w3H9o15YEw=="; }; }; "@vue/cli-overlay-4.5.19" = { @@ -13504,49 +14341,49 @@ let sha512 = "jNYQ+3z7HDZ3IR3Z3Dlo3yOPbHexpygkn2IJ7sjA62oGolnNWeF7kvpLwni18l8N5InhS66m9w31an1Fs5pCZA=="; }; }; - "@vue/compiler-core-3.2.41" = { + "@vue/compiler-core-3.2.45" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.41"; + version = "3.2.45"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.41.tgz"; - sha512 = "oA4mH6SA78DT+96/nsi4p9DX97PHcNROxs51lYk7gb9Z4BPKQ3Mh+BLn6CQZBw857Iuhu28BfMSRHAlPvD4vlw=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.45.tgz"; + sha512 = "rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A=="; }; }; - "@vue/compiler-dom-3.2.41" = { + "@vue/compiler-dom-3.2.45" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.41"; + version = "3.2.45"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.41.tgz"; - sha512 = "xe5TbbIsonjENxJsYRbDJvthzqxLNk+tb3d/c47zgREDa/PCp6/Y4gC/skM4H6PIuX5DAxm7fFJdbjjUH2QTMw=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz"; + sha512 = "tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw=="; }; }; - "@vue/compiler-sfc-2.7.13" = { + "@vue/compiler-sfc-2.7.14" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "2.7.13"; + version = "2.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.13.tgz"; - sha512 = "zzu2rLRZlgIU+OT3Atbr7Y6PG+LW4wVQpPfNRrGDH3dM9PsrcVfa+1pKb8bW467bGM3aDOvAnsYLWVpYIv3GRg=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz"; + sha512 = "aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA=="; }; }; - "@vue/compiler-sfc-3.2.41" = { + "@vue/compiler-sfc-3.2.45" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.2.41"; + version = "3.2.45"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.41.tgz"; - sha512 = "+1P2m5kxOeaxVmJNXnBskAn3BenbTmbxBxWOtBq3mQTCokIreuMULFantBUclP0+KnzNCMOvcnKinqQZmiOF8w=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz"; + sha512 = "1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q=="; }; }; - "@vue/compiler-ssr-3.2.41" = { + "@vue/compiler-ssr-3.2.45" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.2.41"; + version = "3.2.45"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.41.tgz"; - sha512 = "Y5wPiNIiaMz/sps8+DmhaKfDm1xgj6GrH99z4gq2LQenfVQcYXmHIOBcs5qPwl7jaW3SUQWjkAPKMfQemEQZwQ=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz"; + sha512 = "6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ=="; }; }; "@vue/component-compiler-utils-3.3.0" = { @@ -13585,22 +14422,22 @@ let sha512 = "LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ=="; }; }; - "@vue/reactivity-transform-3.2.41" = { + "@vue/reactivity-transform-3.2.45" = { name = "_at_vue_slash_reactivity-transform"; packageName = "@vue/reactivity-transform"; - version = "3.2.41"; + version = "3.2.45"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.41.tgz"; - sha512 = "mK5+BNMsL4hHi+IR3Ft/ho6Za+L3FA5j8WvreJ7XzHrqkPq8jtF/SMo7tuc9gHjLDwKZX1nP1JQOKo9IEAn54A=="; + url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz"; + sha512 = "BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ=="; }; }; - "@vue/shared-3.2.41" = { + "@vue/shared-3.2.45" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.41"; + version = "3.2.45"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.41.tgz"; - sha512 = "W9mfWLHmJhkfAmV+7gDjcHeAWALQtgGT3JErxULl0oz6R6+3ug91I7IErs93eCFhPCZPHBs4QJS7YWEV7A3sxw=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz"; + sha512 = "Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg=="; }; }; "@vue/web-component-wrapper-1.3.0" = { @@ -13612,15 +14449,6 @@ let sha512 = "Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA=="; }; }; - "@vvo/tzdb-6.75.0" = { - name = "_at_vvo_slash_tzdb"; - packageName = "@vvo/tzdb"; - version = "6.75.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vvo/tzdb/-/tzdb-6.75.0.tgz"; - sha512 = "36hx1wBIJD+ddu2vA3o0JL2xtR6yFbpmLm4hngd59OYtYY/0Mh6BVusUlCdayf9qVZs7UASN07+cwXAanCAuww=="; - }; - }; "@webassemblyjs/ast-1.11.1" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; @@ -14287,6 +15115,15 @@ let sha512 = "4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg=="; }; }; + "@webpack-cli/configtest-2.0.1" = { + name = "_at_webpack-cli_slash_configtest"; + packageName = "@webpack-cli/configtest"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.0.1.tgz"; + sha512 = "njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A=="; + }; + }; "@webpack-cli/info-1.5.0" = { name = "_at_webpack-cli_slash_info"; packageName = "@webpack-cli/info"; @@ -14296,6 +15133,15 @@ let sha512 = "e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ=="; }; }; + "@webpack-cli/info-2.0.1" = { + name = "_at_webpack-cli_slash_info"; + packageName = "@webpack-cli/info"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.1.tgz"; + sha512 = "fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA=="; + }; + }; "@webpack-cli/serve-1.7.0" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; @@ -14305,6 +15151,15 @@ let sha512 = "oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q=="; }; }; + "@webpack-cli/serve-2.0.1" = { + name = "_at_webpack-cli_slash_serve"; + packageName = "@webpack-cli/serve"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.1.tgz"; + sha512 = "0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw=="; + }; + }; "@webtorrent/http-node-1.3.0" = { name = "_at_webtorrent_slash_http-node"; packageName = "@webtorrent/http-node"; @@ -14314,22 +15169,22 @@ let sha512 = "GWZQKroPES4z91Ijx6zsOsb7+USOxjy66s8AoTWg0HiBBdfnbtf9aeh3Uav0MgYn4BL8Q7tVSUpd0gGpngKGEQ=="; }; }; - "@whatwg-node/fetch-0.5.1" = { + "@whatwg-node/fetch-0.6.2" = { name = "_at_whatwg-node_slash_fetch"; packageName = "@whatwg-node/fetch"; - version = "0.5.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.5.1.tgz"; - sha512 = "RBZS60EU6CbRJ370BVVKW4F9csZuGh0OQNrUDhJ0IaIFLsXsJorFCM2iwaDWZTAPMqxW1TmuVcVKJ3d/H1dV1g=="; + url = "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.6.2.tgz"; + sha512 = "fCUycF1W+bI6XzwJFnbdDuxIldfKM3w8+AzVCLGlucm0D+AQ8ZMm2j84hdcIhfV6ZdE4Y1HFVrHosAxdDZ+nPw=="; }; }; - "@withgraphite/graphite-cli-routes-0.22.0" = { + "@withgraphite/graphite-cli-routes-0.23.0" = { name = "_at_withgraphite_slash_graphite-cli-routes"; packageName = "@withgraphite/graphite-cli-routes"; - version = "0.22.0"; + version = "0.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@withgraphite/graphite-cli-routes/-/graphite-cli-routes-0.22.0.tgz"; - sha512 = "0LqJ2UMyGkZgP/cp4x89nKibX8r/XMgC+G4Xhobxq34gSOrihqHQjEvPeTiVgjX4MsH7340v8cE2y5pKX6m0aA=="; + url = "https://registry.npmjs.org/@withgraphite/graphite-cli-routes/-/graphite-cli-routes-0.23.0.tgz"; + sha512 = "+hVC6QEkIXKAWeRifpJ925dVjYSSkg/N743RGyP7oljLeI05RPLyvOJoTSs8qRjtLp4XRei+9kNbSZVbd8wKmQ=="; }; }; "@withgraphite/retype-0.3.15" = { @@ -14647,6 +15502,15 @@ let sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; }; }; + "@yarnpkg/lockfile-1.0.2" = { + name = "_at_yarnpkg_slash_lockfile"; + packageName = "@yarnpkg/lockfile"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.0.2.tgz"; + sha512 = "MqJ00WXw89ga0rK6GZkdmmgv3bAsxpJixyTthjcix73O44pBqotyU2BejBkLuIsaOBI6SEu77vAnSyLe5iIHkw=="; + }; + }; "@yarnpkg/lockfile-1.1.0" = { name = "_at_yarnpkg_slash_lockfile"; packageName = "@yarnpkg/lockfile"; @@ -14656,22 +15520,22 @@ let sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; }; - "@yarnpkg/parsers-3.0.0-rc.27" = { + "@yarnpkg/parsers-3.0.0-rc.36" = { name = "_at_yarnpkg_slash_parsers"; packageName = "@yarnpkg/parsers"; - version = "3.0.0-rc.27"; + version = "3.0.0-rc.36"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.27.tgz"; - sha512 = "qs2wZulOYVjaOS6tYOs3SsR7m/qeHwjPrB5i4JtBJELsgWrEkyL+rJH21RA+fVwttJobAYQqw5Xj5SYLaDK/bQ=="; + url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.36.tgz"; + sha512 = "PvTlgUr7WO2qDnph8tVdItbJlo9hEcGSVd8+ppn/tvcn8XZUaD1z4EgvMEZcJYZi3LmHJGzSgVZzcFE+zQiz8A=="; }; }; - "@zeit/schemas-2.21.0" = { + "@zeit/schemas-2.29.0" = { name = "_at_zeit_slash_schemas"; packageName = "@zeit/schemas"; - version = "2.21.0"; + version = "2.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-2.21.0.tgz"; - sha512 = "/J4WBTpWtQ4itN1rb3ao8LfClmVcmz2pO6oYb7Qd4h7VSqUhIbJIvrykz9Ew1WMg6eFWsKdsMHc5uPbFxqlCpg=="; + url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-2.29.0.tgz"; + sha512 = "g5QiLIfbg3pLuYUJPlisNKY+epQJTcMDsOnVNkscrDP1oi7vmJnzOANYJI/1pZcVJ6umUkBv3aFtlg1UvUHGzA=="; }; }; "@zeit/schemas-2.6.0" = { @@ -14683,6 +15547,15 @@ let sha512 = "uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg=="; }; }; + "@zkochan/cmd-shim-5.4.1" = { + name = "_at_zkochan_slash_cmd-shim"; + packageName = "@zkochan/cmd-shim"; + version = "5.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-5.4.1.tgz"; + sha512 = "odWb1qUzt0dIOEUPyWBEpFDYQPRjEMr/dbHHAfgBkVkYR9aO7Zo+I7oYWrXIxl+cKlC7+49ftPm8uJxL1MA9kw=="; + }; + }; "@zkochan/js-yaml-0.0.6" = { name = "_at_zkochan_slash_js-yaml"; packageName = "@zkochan/js-yaml"; @@ -14692,76 +15565,76 @@ let sha512 = "nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg=="; }; }; - "@zwave-js/cc-10.3.0" = { + "@zwave-js/cc-10.5.2" = { name = "_at_zwave-js_slash_cc"; packageName = "@zwave-js/cc"; - version = "10.3.0"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-10.3.0.tgz"; - sha512 = "2i6X692ZbJwWmL/SWAy9Q+Kk1P0wJY6rt2C6XiNKKN3JjGFERk8YeQBqfkZOgmw5X1VVZAKdGgd7sV4j2Ea6kA=="; + url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-10.5.2.tgz"; + sha512 = "RBuAJ6cWlhZTLDDppWx6ILmqXATN9L8lyIfjSbNIzdlJ6jzJK1sW7r+rvXlcubAOPdDBEQa2UYbCJ/PEdFdoBg=="; }; }; - "@zwave-js/config-10.3.0" = { + "@zwave-js/config-10.5.2" = { name = "_at_zwave-js_slash_config"; packageName = "@zwave-js/config"; - version = "10.3.0"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/config/-/config-10.3.0.tgz"; - sha512 = "y5ECjFiDJoTPoDwmMk/QZ/OQggoxwuwR1Ztb5ycHzZC9vpemjcqJ1MwDggoQ7VHwI2OGQwYG5bA0X6DjhAM6PA=="; + url = "https://registry.npmjs.org/@zwave-js/config/-/config-10.5.2.tgz"; + sha512 = "nnXehRQZlOSwvKOhDuLkjwkyR2dZVaNOqwxz9UKcovclIZyXV+1V2VhAxa0BeIyidDZYV/Ma2SzT4lGckW/3WQ=="; }; }; - "@zwave-js/core-10.3.0" = { + "@zwave-js/core-10.5.0" = { name = "_at_zwave-js_slash_core"; packageName = "@zwave-js/core"; - version = "10.3.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/core/-/core-10.3.0.tgz"; - sha512 = "TP8fzgCq6Nh92tMgN4s2tObMO74vp5NtoX6w3u+WmmtJVyxBf40QeWVJlvbuvpKUZt01uZ2jsnI399SibJgxYg=="; + url = "https://registry.npmjs.org/@zwave-js/core/-/core-10.5.0.tgz"; + sha512 = "l5/YwSZMMg8MeUhi8bCnS2xu1EYFO9ocY9Zl2LWXF/8xMYKqZohgxjkUg4YzbIoTyE5vGuaxVoBHqQ4iQ7xj3g=="; }; }; - "@zwave-js/host-10.3.0" = { + "@zwave-js/host-10.5.2" = { name = "_at_zwave-js_slash_host"; packageName = "@zwave-js/host"; - version = "10.3.0"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/host/-/host-10.3.0.tgz"; - sha512 = "Z61yHrC+8p7eyC/w2I81DBvD0htWLLEPHwYPRqCpoetyMqCktKseTdFzj59arRPCWIhKE8xDoiwVxjmfxRENrw=="; + url = "https://registry.npmjs.org/@zwave-js/host/-/host-10.5.2.tgz"; + sha512 = "BTbIWobUI/YYlSe35U/hDkA/zyMFtktEyLis17r/FTYZR35zcmKO/jHpwwKii/EELsxTrCJnXMh017NrhJlpKA=="; }; }; - "@zwave-js/nvmedit-10.3.0" = { + "@zwave-js/nvmedit-10.5.0" = { name = "_at_zwave-js_slash_nvmedit"; packageName = "@zwave-js/nvmedit"; - version = "10.3.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-10.3.0.tgz"; - sha512 = "0WwTxkPErfuZCKDfJyXAmpzkaNkCnYVw2GmWquavF8QRCv/N40aX7hYoVt8F3JoiPL4/V/gSNUCx6VxvlO3QRA=="; + url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-10.5.0.tgz"; + sha512 = "kXTToCLTytqdLBCfVZN1HaB7F4SrW8TVO/xMmG9D3n3yMEMaSDHRXobym9kOOb5aVwVCplASQiHwY+pL4t5R9A=="; }; }; - "@zwave-js/serial-10.3.0" = { + "@zwave-js/serial-10.5.2" = { name = "_at_zwave-js_slash_serial"; packageName = "@zwave-js/serial"; - version = "10.3.0"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-10.3.0.tgz"; - sha512 = "/WFTuDNO7VINlBpuTK/NU9U+MP9705juvlCC6ntUggzHaQVn1U6NLB72PcPvbQlZszocWq3Gv0BTfxYvMe5VzA=="; + url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-10.5.2.tgz"; + sha512 = "IqAYBhNE+LsEVSRu2UDzoM3inV2dp3JMfIJXBN8iVa/revCXTjGWOPJkqhulj74cQX9brCuA919YQ33N9hlJwA=="; }; }; - "@zwave-js/shared-10.3.0" = { + "@zwave-js/shared-10.4.0" = { name = "_at_zwave-js_slash_shared"; packageName = "@zwave-js/shared"; - version = "10.3.0"; + version = "10.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/shared/-/shared-10.3.0.tgz"; - sha512 = "3U9S8lJZQxf6aVoH7Hir4KsGnHiinJkzqaEUeOzHyxNeYoZlniIlN9QYtkc21GXFxCcEIrkhoiXbHat7R0LOKg=="; + url = "https://registry.npmjs.org/@zwave-js/shared/-/shared-10.4.0.tgz"; + sha512 = "uuLYDDNqIkagJ40piNMhljVG9OepI31/labLnivJByxGdELJnIXGRKLQ8ZKvm/5Ba8qXpEw/t7UrV2plfP/QCg=="; }; }; - "@zwave-js/testing-10.3.0" = { + "@zwave-js/testing-10.5.2" = { name = "_at_zwave-js_slash_testing"; packageName = "@zwave-js/testing"; - version = "10.3.0"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-10.3.0.tgz"; - sha512 = "8gif28+miJ6eA8VFkpmiGIDsBWhXW6EEm0t6f2ECDrKlU+mUqZzahZqcPICXDmT7RRqPB/XLoNzMWtsaK6bROQ=="; + url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-10.5.2.tgz"; + sha512 = "3Si/nerD7I9pPpgiipUZqrEJUTNeFAPnbgXG9P5mZb+uhHzbrwVVDASK9wPgjGqWx2AJffAMl2MPEknqcMEaRA=="; }; }; "CSSselect-0.4.1" = { @@ -14845,6 +15718,15 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; + "abbrev-2.0.0" = { + name = "abbrev"; + packageName = "abbrev"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz"; + sha512 = "6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ=="; + }; + }; "abort-controller-3.0.0" = { name = "abort-controller"; packageName = "abort-controller"; @@ -14863,6 +15745,15 @@ let sha512 = "JMJ5soJWP18htbbxJjG7bG6yuI6pRhgJ0scHHTfkUjf6wjP912xZWvM+A4sJK3gqd9E8fcPbDnOefbA9Th/FIQ=="; }; }; + "abstract-level-1.0.3" = { + name = "abstract-level"; + packageName = "abstract-level"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/abstract-level/-/abstract-level-1.0.3.tgz"; + sha512 = "t6jv+xHy+VYwc4xqZMn2Pa9DjcdzvzZmQGRjTFc8spIbRGHgBrEKbPq+rYXc7CCo0lxgYvSgKVg9qZAhpVQSjA=="; + }; + }; "abstract-leveldown-6.0.3" = { name = "abstract-leveldown"; packageName = "abstract-leveldown"; @@ -14890,6 +15781,15 @@ let sha512 = "TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ=="; }; }; + "abstract-leveldown-7.2.0" = { + name = "abstract-leveldown"; + packageName = "abstract-leveldown"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-7.2.0.tgz"; + sha512 = "DnhQwcFEaYsvYDnACLZhMmCWd3rkOeEvglpa4q5i/5Jlm3UIsWaxVzuXvDLFCSCWRO3yy2/+V/G7FusFgejnfQ=="; + }; + }; "abstract-logging-1.0.0" = { name = "abstract-logging"; packageName = "abstract-logging"; @@ -14998,22 +15898,13 @@ let sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; }; }; - "acorn-8.8.1" = { + "acorn-8.8.2" = { name = "acorn"; packageName = "acorn"; - version = "8.8.1"; + version = "8.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz"; - sha512 = "7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="; - }; - }; - "acorn-class-fields-0.3.7" = { - name = "acorn-class-fields"; - packageName = "acorn-class-fields"; - version = "0.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-class-fields/-/acorn-class-fields-0.3.7.tgz"; - sha512 = "jdUWSFce0fuADUljmExz4TWpPkxmRW/ZCPRqeeUzbGf0vFUcpQYbyq52l75qGd0oSwwtAepeL6hgb/naRgvcKQ=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"; + sha512 = "xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw=="; }; }; "acorn-dynamic-import-3.0.0" = { @@ -15106,42 +15997,6 @@ let sha512 = "8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A=="; }; }; - "acorn-private-class-elements-0.2.7" = { - name = "acorn-private-class-elements"; - packageName = "acorn-private-class-elements"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-private-class-elements/-/acorn-private-class-elements-0.2.7.tgz"; - sha512 = "+GZH2wOKNZOBI4OOPmzpo4cs6mW297sn6fgIk1dUI08jGjhAaEwvC39mN2gJAg2lmAQJ1rBkFqKWonL3Zz6PVA=="; - }; - }; - "acorn-private-methods-0.3.3" = { - name = "acorn-private-methods"; - packageName = "acorn-private-methods"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-private-methods/-/acorn-private-methods-0.3.3.tgz"; - sha512 = "46oeEol3YFvLSah5m9hGMlNpxDBCEkdceJgf01AjqKYTK9r6HexKs2rgSbLK81pYjZZMonhftuUReGMlbbv05w=="; - }; - }; - "acorn-stage3-4.0.0" = { - name = "acorn-stage3"; - packageName = "acorn-stage3"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-stage3/-/acorn-stage3-4.0.0.tgz"; - sha512 = "BR+LaADtA6GTB5prkNqWmlmCLYmkyW0whvSxdHhbupTaro2qBJ95fJDEiRLPUmiACGHPaYyeH9xmNJWdGfXRQw=="; - }; - }; - "acorn-static-class-features-0.2.4" = { - name = "acorn-static-class-features"; - packageName = "acorn-static-class-features"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-static-class-features/-/acorn-static-class-features-0.2.4.tgz"; - sha512 = "5X4mpYq5J3pdndLmIB0+WtFd/mKWnNYpuTlTzj32wUu/PMmEGOiayQ5UrqgwdBNiaZBtDDh5kddpP7Yg2QaQYA=="; - }; - }; "acorn-walk-6.2.0" = { name = "acorn-walk"; packageName = "acorn-walk"; @@ -15214,31 +16069,31 @@ let sha512 = "qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ=="; }; }; - "addons-linter-5.18.0" = { + "addons-linter-5.27.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "5.18.0"; + version = "5.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-5.18.0.tgz"; - sha512 = "pce7nSuf/fNesDTmiD077auB15gcWZVHSVFmmAU/mm4BpzDPJBYp5rBYVMDaLjTAsYxR6Qq1ICBN8zryso2UxQ=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-5.27.0.tgz"; + sha512 = "gDgl0FcmhZ5cs3St0qAaO9J1BoektwnY+p4dVgcvPu8WaBqH9MG2fk0gL/evCpoHSXeSw15GA87n8Y7zy7raVQ=="; }; }; - "addons-moz-compare-1.2.0" = { + "addons-moz-compare-1.3.0" = { name = "addons-moz-compare"; packageName = "addons-moz-compare"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-moz-compare/-/addons-moz-compare-1.2.0.tgz"; - sha512 = "COG8qk2/dubPqabfcoJW4E7pm2EQDI43iMrHnhlobvq/uRMEzx/PYJ1KaUZ97Vgg44R3QdRG5CvDsTRbMUHcDw=="; + url = "https://registry.npmjs.org/addons-moz-compare/-/addons-moz-compare-1.3.0.tgz"; + sha512 = "/rXpQeaY0nOKhNx00pmZXdk5Mu+KhVlL3/pSBuAYwrxRrNiTvI/9xfQI8Lmm7DMMl+PDhtfAHY/0ibTpdeoQQQ=="; }; }; - "addons-scanner-utils-8.1.0" = { + "addons-scanner-utils-8.3.0" = { name = "addons-scanner-utils"; packageName = "addons-scanner-utils"; - version = "8.1.0"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-8.1.0.tgz"; - sha512 = "wxqnmmrzZXjz4B4GZbFcR4HJxTP+pGu+C6iOjMJdmL6mgZZey/UEVJlU6XTxu8GdGv0bUoJxyIioH8XEDxy91Q=="; + url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-8.3.0.tgz"; + sha512 = "XP+2kxhZxlxiVFXVJ7lyJEuxpUS8ryrolUDqnUEnvOZ/3p8qt9hWCYSliXhI2W+Swf/hZ3F4CLAG6tBnqdxDYA=="; }; }; "addr-to-ip-port-1.5.4" = { @@ -15250,40 +16105,22 @@ let sha512 = "ByxmJgv8vjmDcl3IDToxL2yrWFrRtFpZAToY0f46XFXl8zS081t7El5MXIodwm7RC6DhHBRoOSMLFSPKCtHukg=="; }; }; - "address-1.1.2" = { + "address-1.2.2" = { name = "address"; packageName = "address"; - version = "1.1.2"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/address/-/address-1.1.2.tgz"; - sha512 = "aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA=="; + url = "https://registry.npmjs.org/address/-/address-1.2.2.tgz"; + sha512 = "4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA=="; }; }; - "address-1.2.1" = { - name = "address"; - packageName = "address"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/address/-/address-1.2.1.tgz"; - sha512 = "B+6bi5D34+fDYENiH5qOlA0cV2rAGKuWZ9LeyUUehbXy8e0VS9e498yO0Jeeh+iM+6KbfudHTFjXw2MmJD4QRA=="; - }; - }; - "adjust-sourcemap-loader-4.0.0" = { - name = "adjust-sourcemap-loader"; - packageName = "adjust-sourcemap-loader"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz"; - sha512 = "OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A=="; - }; - }; - "adm-zip-0.5.9" = { + "adm-zip-0.5.10" = { name = "adm-zip"; packageName = "adm-zip"; - version = "0.5.9"; + version = "0.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.9.tgz"; - sha512 = "s+3fXLkeeLjZ2kLjCBwQufpI5fuN+kIGBxu6530nVQZGVol0d7Y/M88/xw9HGGUcJjKf8LutN3VPRUBq6N7Ajg=="; + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz"; + sha512 = "x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ=="; }; }; "adverb-where-0.2.5" = { @@ -15457,6 +16294,15 @@ let sha512 = "wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="; }; }; + "ajv-8.12.0" = { + name = "ajv"; + packageName = "ajv"; + version = "8.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz"; + sha512 = "sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA=="; + }; + }; "ajv-8.6.3" = { name = "ajv"; packageName = "ajv"; @@ -15538,15 +16384,6 @@ let sha512 = "YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="; }; }; - "ajv-merge-patch-5.0.1" = { - name = "ajv-merge-patch"; - packageName = "ajv-merge-patch"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-merge-patch/-/ajv-merge-patch-5.0.1.tgz"; - sha512 = "0UP3aJCzfzBOkmLR+EinJDCfg6DNtprj3bVPo7JJNgUpZMKt097t9xxQOWFGRoB4JvKKIHE2qe0HkVaS/HyrjQ=="; - }; - }; "alcalzone-shared-4.0.8" = { name = "alcalzone-shared"; packageName = "alcalzone-shared"; @@ -15997,6 +16834,15 @@ let sha512 = "Ydgbey4zqUmmNN2i2OVeVHXig3PxHRbok2X6B2Sogmb92JzZUFfTL806dT7os6tBL1peXItfeFt76CP3zsoXUg=="; }; }; + "any-base-1.1.0" = { + name = "any-base"; + packageName = "any-base"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/any-base/-/any-base-1.1.0.tgz"; + sha512 = "uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg=="; + }; + }; "any-observable-0.3.0" = { name = "any-observable"; packageName = "any-observable"; @@ -16042,13 +16888,13 @@ let sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; }; }; - "anymatch-3.1.2" = { + "anymatch-3.1.3" = { name = "anymatch"; packageName = "anymatch"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"; - sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz"; + sha512 = "KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="; }; }; "ap-0.1.0" = { @@ -16150,15 +16996,6 @@ let sha512 = "aE9RDVplmkaOj/OduNmGa+0a1B5RIWI0o3zC1zLvBTVWMKTpo0ifVf11TyMkLCY+T7cnZqVqwyShziOyC3FyUw=="; }; }; - "app-module-path-2.2.0" = { - name = "app-module-path"; - packageName = "app-module-path"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/app-module-path/-/app-module-path-2.2.0.tgz"; - sha512 = "gkco+qxENJV+8vFcDiiFhuoSvRXb2a/QPqpSoWhVz829VNJfOTnELbBmPmNKFxf3xdNnw4DWCkzkDaavcX/1YQ=="; - }; - }; "app-path-2.2.0" = { name = "app-path"; packageName = "app-path"; @@ -16258,31 +17095,31 @@ let sha512 = "nMIiFleSSoO+KLW4Qr5vLor5L6LB2lt43kaiuOl4CqDRdB07T4T/N94c2M8P17C/pLKG0IVeAYrrX61b61bajw=="; }; }; - "application-config-1.0.1" = { - name = "application-config"; - packageName = "application-config"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/application-config/-/application-config-1.0.1.tgz"; - sha512 = "4/pxvg7ujMT7UD+b0OyXwlYntRnqZxjBUoA+vtYwdUA6Nxfx4rGPMaP3kQQcm1aZ9fnXl6Aw2sJy+ZID85/nug=="; - }; - }; - "application-config-path-0.1.0" = { + "application-config-path-0.1.1" = { name = "application-config-path"; packageName = "application-config-path"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/application-config-path/-/application-config-path-0.1.0.tgz"; - sha512 = "lljTpVvFteShrHuKRvweZfa9o/Nc34Y8r5/1Lqh/yyKaspRT2J3fkEiSSk1YLG8ZSVyU7yHysRy9zcDDS2aH1Q=="; + url = "https://registry.npmjs.org/application-config-path/-/application-config-path-0.1.1.tgz"; + sha512 = "zy9cHePtMP0YhwG+CfHm0bgwdnga2X3gZexpdCwEj//dpb+TKajtiC8REEUJUSq6Ab4f9cgNy2l8ObXzCXFkEw=="; }; }; - "applicationinsights-1.8.10" = { + "applicationinsights-2.3.6" = { name = "applicationinsights"; packageName = "applicationinsights"; - version = "1.8.10"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-1.8.10.tgz"; - sha512 = "ZLDA7mShh4mP2Z/HlFolmvhBPX1LfnbIWXrselyYVA7EKjHhri1fZzpu2EiWAmfbRxNBY6fRjoPJWbx5giKy4A=="; + url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-2.3.6.tgz"; + sha512 = "ZzXXpZpDRGcy6Pp5V319nDF9/+Ey7jNknEXZyaBajtC5onN0dcBem6ng5jcb3MPH2AjYWRI8XgyNEuzP/6Y5/A=="; + }; + }; + "applicationinsights-native-metrics-0.0.8" = { + name = "applicationinsights-native-metrics"; + packageName = "applicationinsights-native-metrics"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/applicationinsights-native-metrics/-/applicationinsights-native-metrics-0.0.8.tgz"; + sha512 = "3areRz2+Q1EPWbQYokfOgYXLkZyBzeReI9716nw97p697gFUfGqYgwJ5fCopftvHycW2zuRWTFJWmA70S5605A=="; }; }; "aproba-1.2.0" = { @@ -16465,13 +17302,13 @@ let sha512 = "u96dg2GcAKtpTrBdDoFIM7PjcBA+6rSP0OR94MOReNRyUECL6MtQt5XXmRr4qrftYaef9+l5hcpO5te7sML1Cg=="; }; }; - "aria-query-4.2.2" = { + "aria-query-5.1.3" = { name = "aria-query"; packageName = "aria-query"; - version = "4.2.2"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz"; - sha512 = "o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA=="; + url = "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz"; + sha512 = "R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ=="; }; }; "arib-mpeg2ts-parser-3.0.15" = { @@ -16591,15 +17428,6 @@ let sha512 = "sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q=="; }; }; - "array-back-1.0.4" = { - name = "array-back"; - packageName = "array-back"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz"; - sha512 = "1WxbZvrmyhkNoeYcizokbmh5oiOCIfyvGtcqbK3Ls1v1fKcquzxnQSceOx6tzq7jmai2kFLWIpGND2cLhH6TPw=="; - }; - }; "array-back-2.0.0" = { name = "array-back"; packageName = "array-back"; @@ -16618,6 +17446,15 @@ let sha512 = "TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q=="; }; }; + "array-back-4.0.2" = { + name = "array-back"; + packageName = "array-back"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz"; + sha512 = "NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg=="; + }; + }; "array-differ-1.0.0" = { name = "array-differ"; packageName = "array-differ"; @@ -16717,13 +17554,13 @@ let sha512 = "c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng=="; }; }; - "array-includes-3.1.5" = { + "array-includes-3.1.6" = { name = "array-includes"; packageName = "array-includes"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz"; - sha512 = "iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ=="; + url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz"; + sha512 = "sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw=="; }; }; "array-initial-1.1.0" = { @@ -16744,6 +17581,15 @@ let sha512 = "sNRaPGh9nnmdC8Zf+pT3UqP8rnWj5Hf9wiFGsX3wUQ2yVSIhO2ShFwCoceIPpB41QF6i2OEmrHmCo36xronCVA=="; }; }; + "array-iterate-2.0.1" = { + name = "array-iterate"; + packageName = "array-iterate"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-iterate/-/array-iterate-2.0.1.tgz"; + sha512 = "I1jXZMjAgCMmxT4qxXfPXa6SthSoE8h6gkSI9BGGNv8mP8G/v0blc+qFnZu6K42vTOiuME596QaLO0TP3Lk0xg=="; + }; + }; "array-last-1.3.0" = { name = "array-last"; packageName = "array-last"; @@ -16924,6 +17770,15 @@ let sha512 = "kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q=="; }; }; + "array.prototype.tosorted-1.1.1" = { + name = "array.prototype.tosorted"; + packageName = "array.prototype.tosorted"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz"; + sha512 = "pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ=="; + }; + }; "arraybuffer.slice-0.0.6" = { name = "arraybuffer.slice"; packageName = "arraybuffer.slice"; @@ -17230,13 +18085,13 @@ let sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; }; }; - "astring-1.8.3" = { + "astring-1.8.4" = { name = "astring"; packageName = "astring"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/astring/-/astring-1.8.3.tgz"; - sha512 = "sRpyiNrx2dEYIMmUXprS8nlpRg2Drs8m9ElX9vVEXaCB4XEAJhKfs7IcX0IwShjuOAjLR6wzIrgoptz1n19i1A=="; + url = "https://registry.npmjs.org/astring/-/astring-1.8.4.tgz"; + sha512 = "97a+l2LBU3Op3bBQEff79i/E4jMD2ZLFD8rHx9B6mXyB2uQwhJQYfiDqUwtfjF4QA1F2qs//N6Cw8LetMbQjcw=="; }; }; "async-0.1.22" = { @@ -17356,13 +18211,13 @@ let sha512 = "uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw=="; }; }; - "async-each-1.0.3" = { + "async-each-1.0.4" = { name = "async-each"; packageName = "async-each"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz"; - sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; + url = "https://registry.npmjs.org/async-each/-/async-each-1.0.4.tgz"; + sha512 = "qL5v0vnRtD4rxlrzLz3WMnMfTvTrMf3IK1xFCF0Q5vqXJkULhM13gO2ynE8RZMjE+bPcH0AUHgcd5BU1FtO1tA=="; }; }; "async-each-series-0.1.1" = { @@ -17374,6 +18229,15 @@ let sha512 = "p4jj6Fws4Iy2m0iCmI2am2ZNZCgbdgE+P8F/8csmn2vx7ixXrO2zGcuNsD46X5uZSVecmkEy/M06X2vG8KD6dQ=="; }; }; + "async-eventemitter-0.2.4" = { + name = "async-eventemitter"; + packageName = "async-eventemitter"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/async-eventemitter/-/async-eventemitter-0.2.4.tgz"; + sha512 = "pd20BwL7Yt1zwDFy+8MX8F1+WCT8aQeKj0kQnTrH9WaeRETlRamVhD0JtRPmrV4GfOJ2F9CvdQkZeZhnh2TuHw=="; + }; + }; "async-exit-hook-2.0.1" = { name = "async-exit-hook"; packageName = "async-exit-hook"; @@ -17509,13 +18373,13 @@ let sha512 = "eKEYj1+jDgQ15jazjmelcPGXO77pa5epzlyXyEQcwwLtnACtBTCrxaW+96uXF2j4rzIikmUtVlzXwejx6iIhWw=="; }; }; - "asyncjs-util-1.2.10" = { + "asyncjs-util-1.2.11" = { name = "asyncjs-util"; packageName = "asyncjs-util"; - version = "1.2.10"; + version = "1.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/asyncjs-util/-/asyncjs-util-1.2.10.tgz"; - sha512 = "p4U6HQUw4k/xZKrwEQO7ZuF+8/OkzAQS4iAMhFUBGtSD8p3KkKBaTBuUTEH8TWKB3ArNbrP0401TGE2vIiU7uQ=="; + url = "https://registry.npmjs.org/asyncjs-util/-/asyncjs-util-1.2.11.tgz"; + sha512 = "XPPs2Fwsj07cQ/NB8qAqYv6uqaJU9k1i2cwzHyF62PYuJynNv9Rp+ySm9mh5nQfLq/yOzlmDewFoLJIao21zNw=="; }; }; "asynckit-0.4.0" = { @@ -17662,15 +18526,6 @@ let sha512 = "JLrV3ErBNKVkmhi0celM6PJkgYEtztFnXwsNBApjinpVHtIP3g/m2ZZSOvsAe7FoByfJzDhpOXBKFbH3k2UNjw=="; }; }; - "autoprefixer-10.4.13" = { - name = "autoprefixer"; - packageName = "autoprefixer"; - version = "10.4.13"; - src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz"; - sha512 = "49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg=="; - }; - }; "autoprefixer-9.8.8" = { name = "autoprefixer"; packageName = "autoprefixer"; @@ -17698,13 +18553,13 @@ let sha512 = "d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q=="; }; }; - "aws-crt-1.14.5" = { + "aws-crt-1.15.8" = { name = "aws-crt"; packageName = "aws-crt"; - version = "1.14.5"; + version = "1.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.14.5.tgz"; - sha512 = "fxjTfNzFaG+cqpPSUDOKWtkufsQV7nq1COHIFcaomgSidbEg129kA+Ses0bJyoe6fKI7aMNIfzT9kDt7+KRn2g=="; + url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.15.8.tgz"; + sha512 = "2TLgxvcHwYaCpaZWwMTn7628Xa7mcpedE+pdGf+Vg2l6MiTrRKZ5X5YyXMqX4GvfvDB1I3EfIAi5iFxlHZ1J4w=="; }; }; "aws-sdk-1.18.0" = { @@ -17725,13 +18580,13 @@ let sha512 = "545VawhsCQ7yEx9jZKV0hTTW3FS/waycISWMvnNwqRfpU9o4FQ4DSu3je7ekn5yFKM+91dxJC+IfJgtIV8WaUw=="; }; }; - "aws-sdk-2.1248.0" = { + "aws-sdk-2.1304.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1248.0"; + version = "2.1304.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1248.0.tgz"; - sha512 = "PxSweXAmKZyhHoPOPphz2XN9/3SDdNs/HBrLn7YF6c+AnZz8VPxCPYRFbFGUTLfQmdz5Cog82tDzwgFd4KGzFQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1304.0.tgz"; + sha512 = "9mf2uafa2M9yFC5IlMe85TIc7OUo1HSProCQWzpRmAAYhcSwmfbRyt02Wtr5YSVvJJPmcSgcyI92snsQR1c3nw=="; }; }; "aws-sign2-0.6.0" = { @@ -17752,22 +18607,22 @@ let sha512 = "08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="; }; }; - "aws4-1.11.0" = { + "aws4-1.12.0" = { name = "aws4"; packageName = "aws4"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; - sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz"; + sha512 = "NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="; }; }; - "axe-core-4.5.1" = { + "axe-core-4.6.3" = { name = "axe-core"; packageName = "axe-core"; - version = "4.5.1"; + version = "4.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/axe-core/-/axe-core-4.5.1.tgz"; - sha512 = "1exVbW0X1O/HSr/WMwnaweyqcWOgZgLiVxdLG34pvSQk4NlYQr9OUy0JLwuhFfuVNQzzqgH57eYzkFBCb3bIsQ=="; + url = "https://registry.npmjs.org/axe-core/-/axe-core-4.6.3.tgz"; + sha512 = "/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg=="; }; }; "axios-0.19.2" = { @@ -17833,13 +18688,13 @@ let sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; }; }; - "axios-1.1.3" = { + "axios-1.2.6" = { name = "axios"; packageName = "axios"; - version = "1.1.3"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-1.1.3.tgz"; - sha512 = "00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA=="; + url = "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz"; + sha512 = "rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ=="; }; }; "axios-cookiejar-support-0.5.1" = { @@ -17860,15 +18715,6 @@ let sha512 = "zl7zThkh+YLSDUYwDqY1hVPndpDn4ghbB59JVhLIj19X5GJBaIts9+SI82O6D0P2wxz9uXLz+Mwnh1WkNDuXgQ=="; }; }; - "axios-mock-adapter-1.21.2" = { - name = "axios-mock-adapter"; - packageName = "axios-mock-adapter"; - version = "1.21.2"; - src = fetchurl { - url = "https://registry.npmjs.org/axios-mock-adapter/-/axios-mock-adapter-1.21.2.tgz"; - sha512 = "jzyNxU3JzB2XVhplZboUcF0YDs7xuExzoRSHXPHr+UQajaGmcTqvkkUADgkVI2WkGlpZ1zZlMVdcTMU0ejV8zQ=="; - }; - }; "axios-retry-3.2.0" = { name = "axios-retry"; packageName = "axios-retry"; @@ -17878,13 +18724,13 @@ let sha512 = "RK2cLMgIsAQBDhlIsJR5dOhODPigvel18XUv1dDXW+4k1FzebyfRk+C+orot6WPZOYFKSfhLwHPwVmTVOODQ5w=="; }; }; - "axobject-query-2.2.0" = { + "axobject-query-3.1.1" = { name = "axobject-query"; packageName = "axobject-query"; - version = "2.2.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz"; - sha512 = "Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA=="; + url = "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz"; + sha512 = "goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg=="; }; }; "azure-devops-node-api-11.2.0" = { @@ -17932,15 +18778,6 @@ let sha512 = "Law0PGtRV1JL8Y9Wpzc0d6EE0GD7LzXWCfaeWwboUMcBWNG6gvaWTK1/+BK7a4X5EmeJiGEuDDFxUsOa8RSWCw=="; }; }; - "babel-loader-8.1.0" = { - name = "babel-loader"; - packageName = "babel-loader"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz"; - sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw=="; - }; - }; "babel-loader-8.3.0" = { name = "babel-loader"; packageName = "babel-loader"; @@ -17950,15 +18787,6 @@ let sha512 = "H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q=="; }; }; - "babel-plugin-istanbul-6.1.1" = { - name = "babel-plugin-istanbul"; - packageName = "babel-plugin-istanbul"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz"; - sha512 = "Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA=="; - }; - }; "babel-plugin-jsx-pragmatic-1.0.2" = { name = "babel-plugin-jsx-pragmatic"; packageName = "babel-plugin-jsx-pragmatic"; @@ -18013,13 +18841,13 @@ let sha512 = "NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw=="; }; }; - "babel-plugin-react-native-web-0.18.10" = { + "babel-plugin-react-native-web-0.18.12" = { name = "babel-plugin-react-native-web"; packageName = "babel-plugin-react-native-web"; - version = "0.18.10"; + version = "0.18.12"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.18.10.tgz"; - sha512 = "2UiwS6G7XKJvpo0X5OFkzGjHGFuNx9J+DgEG8TEmm+X5S0z6EB59W11RDEZghdKzsQzVbs1jB+2VHBuVgjMTiw=="; + url = "https://registry.npmjs.org/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.18.12.tgz"; + sha512 = "4djr9G6fMdwQoD6LQ7hOKAm39+y12flWgovAqS1k5O8f42YQ3A1FFMyV5kKfetZuGhZO5BmNmOdRRZQ1TixtDw=="; }; }; "babel-plugin-react-require-3.0.0" = { @@ -18625,13 +19453,22 @@ let sha512 = "aVNobHnJqLiUelTaHat9DZ1qM2w0C0Eym4LPI/3JxOnSokGVdsl1T1kN7TFvsEAD8G47A6VKQ0TVHqbBnYMJlQ=="; }; }; - "better-sqlite3-7.6.2" = { + "better-path-resolve-1.0.0" = { + name = "better-path-resolve"; + packageName = "better-path-resolve"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/better-path-resolve/-/better-path-resolve-1.0.0.tgz"; + sha512 = "pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g=="; + }; + }; + "better-sqlite3-8.0.1" = { name = "better-sqlite3"; packageName = "better-sqlite3"; - version = "7.6.2"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.6.2.tgz"; - sha512 = "S5zIU1Hink2AH4xPsN0W43T1/AJ5jrPh7Oy07ocuW/AKYYY02GWzz9NH0nbSMn/gw6fDZ5jZ1QsHt1BXAwJ6Lg=="; + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.0.1.tgz"; + sha512 = "JhTZjpyapA1icCEjIZB4TSSgkGdFgpWZA2Wszg7Cf4JwJwKQmbvuNnJBeR+EYG/Z29OXvR4G//Rbg31BW/Z7Yg=="; }; }; "bevent-0.1.5" = { @@ -18733,13 +19570,13 @@ let sha512 = "t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A=="; }; }; - "bignumber.js-9.1.0" = { + "bignumber.js-9.1.1" = { name = "bignumber.js"; packageName = "bignumber.js"; - version = "9.1.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.0.tgz"; - sha512 = "4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A=="; + url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz"; + sha512 = "pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="; }; }; "bigspinner-3.1.0" = { @@ -18949,13 +19786,13 @@ let sha512 = "B/d8IADy5Y4v/CTMRWxLD8ONd2qRkF+2DbZLeIUql7PukfAiBhlGlw5qJcIU03l21qMEyvbi4PdntatH+j40vA=="; }; }; - "bit-field-1.6.0" = { + "bit-field-1.7.0" = { name = "bit-field"; packageName = "bit-field"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/bit-field/-/bit-field-1.6.0.tgz"; - sha512 = "d87uTEj4FBG4VK47iwegFKEUs5WuJjYJdrZbMio1jM7TiXfuWrAcX/B/72+UZDtVdYJgpTVFCVW482qB+siQ0g=="; + url = "https://registry.npmjs.org/bit-field/-/bit-field-1.7.0.tgz"; + sha512 = "JydkgvuMioH3Oe3mnnHFVHGBzGZJIph98d1IpotpJ7svjGmkQf8uR9k0LAY/mPEphaq+nSIrgzMs/rK9WYdzzQ=="; }; }; "bitcoin-ops-1.4.1" = { @@ -18976,22 +19813,13 @@ let sha512 = "5DcLxGUDejgNBYcieMIUfjORtUeNWl828VWLHJGVKZCb4zIS1oOySTUr0LGmcqJBQgTBz3bGbRQla4FgrdQEIQ=="; }; }; - "bitcoinjs-lib-6.0.1" = { + "bitcoinjs-lib-6.1.0" = { name = "bitcoinjs-lib"; packageName = "bitcoinjs-lib"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.0.1.tgz"; - sha512 = "x/7D4jDj/MMkmO6t3p2CSDXTqpwZ/jRsRiJDmaiXabrR9XRo7jwby8HRn7EyK1h24rKFFI7vI0ay4czl6bDOZQ=="; - }; - }; - "bitcoinjs-lib-6.0.2" = { - name = "bitcoinjs-lib"; - packageName = "bitcoinjs-lib"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.0.2.tgz"; - sha512 = "I994pGt9cL5s5OA6mkv1e8IuYcsKN2ORXnWbkqAXLNGvEnOHBhKBSvCjFl7YC2uVoJnfr/iwq7JMrq575SYO5w=="; + url = "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.1.0.tgz"; + sha512 = "eupi1FBTJmPuAZdChnzTXLv2HBqFW2AICpzXZQLniP0V9FWWeeUQSMKES6sP8isy/xO0ijDexbgkdEyFVrsuJw=="; }; }; "bitfield-0.1.0" = { @@ -19021,13 +19849,13 @@ let sha512 = "wrDhHe7LUkqaytxgbsFXoemzHRv6e8FrVNWWsQCgUfmuVYW6ke44hoGc9VdpjgfIsJ/ejmCFA8wDtDqACNAvyw=="; }; }; - "bittorrent-dht-10.0.6" = { + "bittorrent-dht-10.0.7" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; - version = "10.0.6"; + version = "10.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-10.0.6.tgz"; - sha512 = "Odmfmo36/vr0E4PWicans0fesjCfRib2daGaYfB8WHljPTO/U2820EFOA9HBhzdzekGBhBHlSPVi6Jf9vu7/yQ=="; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-10.0.7.tgz"; + sha512 = "o6elCANGteECXz82LFqG1Ov2fG4uNzfUU7pBMx9ixxKUh99ZXNrhbiNLRNN2F2vBnqKSN7SHlUW4LJ5Z2u1eKw=="; }; }; "bittorrent-dht-6.4.2" = { @@ -19048,13 +19876,13 @@ let sha512 = "dWxU2Mr2lU6jzIKgZrTsXgeXDCIcYpR1b6f2n89fn7juwPAYbNU04OgWjcQPLiNliY0filsX5CQAWntVErpk+Q=="; }; }; - "bittorrent-peerid-1.3.4" = { + "bittorrent-peerid-1.3.6" = { name = "bittorrent-peerid"; packageName = "bittorrent-peerid"; - version = "1.3.4"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-peerid/-/bittorrent-peerid-1.3.4.tgz"; - sha512 = "Xzk1FJFHmsc9H8IKFtDUkfAZIT1HW8r6UqajfZBBxWmpA1v7FsPO8xPFtnFzCqcXlPN3yi8dDmlqZCemyB7P8w=="; + url = "https://registry.npmjs.org/bittorrent-peerid/-/bittorrent-peerid-1.3.6.tgz"; + sha512 = "VyLcUjVMEOdSpHaCG/7odvCdLbAB1y3l9A2V6WIje24uV7FkJPrQrH/RrlFmKxP89pFVDEnE+YlHaFujlFIZsg=="; }; }; "bittorrent-protocol-3.5.5" = { @@ -19237,6 +20065,15 @@ let sha512 = "BF033y5fN6OCofD3vgHmNtwZWRcq9NLyyxyILx9hfMy1sXYy4ojFl765hJ2lP0YaN2fuxPaLO2Vzzoxy0FLFFA=="; }; }; + "block-iterator-1.1.1" = { + name = "block-iterator"; + packageName = "block-iterator"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/block-iterator/-/block-iterator-1.1.1.tgz"; + sha512 = "DrjdVWZemVO4iBf4tiOXjUrY5cNesjzy0t7sIiu2rdl8cOCHRxAgKjSJFc3vBZYYMMmshUAxajl8QQh/uxXTKQ=="; + }; + }; "block-stream-0.0.9" = { name = "block-stream"; packageName = "block-stream"; @@ -19336,6 +20173,15 @@ let sha512 = "epsm3Z92j5xwek9p97pVw3KbsNc0F4QnbYh+N93SpbJYuHFQQ/UAh6K+bKFGyLePH3Hudtl/Sa95Quqp0gX8IQ=="; }; }; + "bmp-js-0.1.0" = { + name = "bmp-js"; + packageName = "bmp-js"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bmp-js/-/bmp-js-0.1.0.tgz"; + sha512 = "vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw=="; + }; + }; "bmutex-0.1.6" = { name = "bmutex"; packageName = "bmutex"; @@ -19489,49 +20335,40 @@ let sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="; }; }; - "bolt01-1.2.5" = { + "bolt01-1.2.6" = { name = "bolt01"; packageName = "bolt01"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/bolt01/-/bolt01-1.2.5.tgz"; - sha512 = "QTBVMRuFfQif5Lnkq+ETuY0bRARVroa+RoeqdpKnDXTBEQf7ZABxXmEsCPA8vP0KLdX7hJByMbCTiQ+p1Vrgrg=="; + url = "https://registry.npmjs.org/bolt01/-/bolt01-1.2.6.tgz"; + sha512 = "6aFEefm/kAqMQoTJnqUvm8GtVli2D5Jri53Tcht6v9KwYy7f8uWlDDluaU3/bxynscmTSZBN5uHArn+2SwdkMQ=="; }; }; - "bolt03-1.2.14" = { + "bolt03-1.2.15" = { name = "bolt03"; packageName = "bolt03"; - version = "1.2.14"; + version = "1.2.15"; src = fetchurl { - url = "https://registry.npmjs.org/bolt03/-/bolt03-1.2.14.tgz"; - sha512 = "LhBa/3hqtSY7fBgE4FzoJXNPtE1tzxEfuWc32LQXNAwvgeWJP3tlQtNqhfPwfDFflSIysSe5N/yK/ybgd/oniA=="; + url = "https://registry.npmjs.org/bolt03/-/bolt03-1.2.15.tgz"; + sha512 = "7KQAp+lrtogthZ5UCkqhT3SBfVanGKmBnI4hYdQfcvNcGor4zZdyegUcovf7NmAXhx0c7pc0QiTjkPHFMvQ3mw=="; }; }; - "bolt07-1.8.2" = { + "bolt07-1.8.3" = { name = "bolt07"; packageName = "bolt07"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/bolt07/-/bolt07-1.8.2.tgz"; - sha512 = "jq1b/ZdMambhh+yi+pm+1PJBAnlYvQYljaBgSajvVAINHrHg32ovCBra8d0ADE3BAoj6G/tK7OSV4t/yT9A+/g=="; + url = "https://registry.npmjs.org/bolt07/-/bolt07-1.8.3.tgz"; + sha512 = "NXML2vzFmxRrdWt+wNqphU6f8FmS7tkebqDLIhfc8xKoOcGFv4Kf7WuJbKBqcfFDQVXpCpKAF7FQAgTIN2/30A=="; }; }; - "bolt09-0.2.3" = { + "bolt09-0.2.5" = { name = "bolt09"; packageName = "bolt09"; - version = "0.2.3"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/bolt09/-/bolt09-0.2.3.tgz"; - sha512 = "xEt5GE6pXB8wMIWHAoyF28k0Yt2rFqIou1LCyIeNadAOQhu/F7GTjZwreFwLl07YYkhOH23avewRt5PD8JnKKg=="; - }; - }; - "bolt09-0.2.4" = { - name = "bolt09"; - packageName = "bolt09"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/bolt09/-/bolt09-0.2.4.tgz"; - sha512 = "ulNUekEfVhJredkXxP970MrVcrbPbDYyybfagqKFa8J3/4MtkhrX1pR5DjHWeyIujEkFNLbZpo6QF/Og2gXxug=="; + url = "https://registry.npmjs.org/bolt09/-/bolt09-0.2.5.tgz"; + sha512 = "LH8wb3KbVP62SUpnwqUWqoyTUhda3JFQh4TSe6urt2mEAC0w53PSwqB4wqnHdG7QpE209Q2WQl/QH1XtVIsD3g=="; }; }; "bonjour-3.5.0" = { @@ -19543,13 +20380,13 @@ let sha512 = "RaVTblr+OnEli0r/ud8InrU7D+G0y6aJhlxaLa6Pwty4+xoxboF1BsUI45tujvRpbj9dQVoglChqonGAsjEBYg=="; }; }; - "bonjour-service-1.0.14" = { + "bonjour-service-1.1.0" = { name = "bonjour-service"; packageName = "bonjour-service"; - version = "1.0.14"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz"; - sha512 = "HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ=="; + url = "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.0.tgz"; + sha512 = "LVRinRB3k1/K0XzZ2p58COnWvkQknIY6sf0zF2rpErvcJXpMBttEPQSxK+HEXSS9VmpZlDoDnQWv8ftJT20B0Q=="; }; }; "boolbase-1.0.0" = { @@ -19588,13 +20425,13 @@ let sha512 = "yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="; }; }; - "bootstrap-5.2.2" = { + "bootstrap-5.2.3" = { name = "bootstrap"; packageName = "bootstrap"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.2.tgz"; - sha512 = "dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ=="; + url = "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz"; + sha512 = "cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ=="; }; }; "bootstrap-vue-helper-json-1.1.1" = { @@ -19633,6 +20470,15 @@ let sha512 = "AaLhxHwYVh55iOTJncV3DE5o7RakEUSSj64XXEWRTiIhlp7aDI8qR0vY/k8Uw0Z234VjZi/iG/WxfrvqYPUCww=="; }; }; + "boundary-2.0.0" = { + name = "boundary"; + packageName = "boundary"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boundary/-/boundary-2.0.0.tgz"; + sha512 = "rJKn5ooC9u8q13IMCrW0RSp31pxBCHE3y9V/tp3TdWSLf8Em3p6Di4NBpfzbJge9YjjFEsD0RtFEjtvHL5VyEA=="; + }; + }; "bower-1.8.14" = { name = "bower"; packageName = "bower"; @@ -19678,15 +20524,6 @@ let sha512 = "AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA=="; }; }; - "bowser-2.9.0" = { - name = "bowser"; - packageName = "bowser"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bowser/-/bowser-2.9.0.tgz"; - sha512 = "2ld76tuLBNFekRgmJfT2+3j5MIrP6bFict8WAIT3beq+srz1gcKNAdNKMqHqauQt63NmAa88HfP1/Ypa9Er3HA=="; - }; - }; "boxen-0.6.0" = { name = "boxen"; packageName = "boxen"; @@ -19741,6 +20578,15 @@ let sha512 = "j//dBVuyacJbvW+tvZ9HuH03fZ46QcaKvvhZickZqtB271DxJ7SNRSNxrV/dZX0085m7hISRZWbzWlJvx/rHSg=="; }; }; + "boxen-7.0.1" = { + name = "boxen"; + packageName = "boxen"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-7.0.1.tgz"; + sha512 = "8k2eH6SRAK00NDl1iX5q17RJ8rfl53TajdYxE3ssMLehbg487dEVgsad4pIsZb/QqBgYWIl6JOauMTLGX2Kpkw=="; + }; + }; "bplist-creator-0.0.6" = { name = "bplist-creator"; packageName = "bplist-creator"; @@ -19903,6 +20749,15 @@ let sha512 = "0F2z/VSnLbmEeBcUrSuDH5l0HxTXdQQzLjkmBR4cYfvg1zJrKSlmIZFqyFR8oX0NrwPhy3c3HQ6i3OxMbew4Tg=="; }; }; + "browser-or-node-2.1.1" = { + name = "browser-or-node"; + packageName = "browser-or-node"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-or-node/-/browser-or-node-2.1.1.tgz"; + sha512 = "8CVjaLJGuSKMVTxJ2DpBl5XnlNDiT4cQFeuCJJrvJmts9YrTZDizTX7PjC2s6W4x+MBGZeEY6dGMrF04/6Hgqg=="; + }; + }; "browser-pack-6.1.0" = { name = "browser-pack"; packageName = "browser-pack"; @@ -19939,22 +20794,22 @@ let sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; }; }; - "browser-sync-client-2.27.10" = { + "browser-sync-client-2.27.11" = { name = "browser-sync-client"; packageName = "browser-sync-client"; - version = "2.27.10"; + version = "2.27.11"; src = fetchurl { - url = "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.27.10.tgz"; - sha512 = "KCFKA1YDj6cNul0VsA28apohtBsdk5Wv8T82ClOZPZMZWxPj4Ny5AUbrj9UlAb/k6pdxE5HABrWDhP9+cjt4HQ=="; + url = "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.27.11.tgz"; + sha512 = "okMNfD2NasL/XD1/BclP3onXjhahisk3e/kTQ5HPDT/lLqdBqNDd6QFcjI5I1ak7na2hxKQSLjryql+7fp5gKQ=="; }; }; - "browser-sync-ui-2.27.10" = { + "browser-sync-ui-2.27.11" = { name = "browser-sync-ui"; packageName = "browser-sync-ui"; - version = "2.27.10"; + version = "2.27.11"; src = fetchurl { - url = "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.27.10.tgz"; - sha512 = "elbJILq4Uo6OQv6gsvS3Y9vRAJlWu+h8j0JDkF0X/ua+3S6SVbbiWnZc8sNOFlG7yvVGIwBED3eaYQ0iBo1Dtw=="; + url = "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.27.11.tgz"; + sha512 = "1T/Y8Pp1R68aUL7zVSFq0nxtr258xWd/nTasCAHX2M6EsGaswVOFtXsw3bKqsr35z+J+LfVfOdz1HFLYKxdgrA=="; }; }; "browserify-16.5.2" = { @@ -20065,15 +20920,6 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.14.2" = { - name = "browserslist"; - packageName = "browserslist"; - version = "4.14.2"; - src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz"; - sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; - }; - }; "browserslist-4.21.4" = { name = "browserslist"; packageName = "browserslist"; @@ -20318,15 +21164,6 @@ let sha512 = "TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="; }; }; - "buffer-builder-0.2.0" = { - name = "buffer-builder"; - packageName = "buffer-builder"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz"; - sha512 = "7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg=="; - }; - }; "buffer-crc32-0.2.1" = { name = "buffer-crc32"; packageName = "buffer-crc32"; @@ -20354,15 +21191,6 @@ let sha512 = "RgSV6InVQ9ODPdLWJ5UAqBqJBOg370Nz6ZQtRzpt6nUjc8v0St97uJ4PYC6NztqIScrAXafKM3mZPMygSe1ggA=="; }; }; - "buffer-equal-1.0.0" = { - name = "buffer-equal"; - packageName = "buffer-equal"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz"; - sha512 = "tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ=="; - }; - }; "buffer-equal-1.0.1" = { name = "buffer-equal"; packageName = "buffer-equal"; @@ -20561,6 +21389,15 @@ let sha512 = "bd1dDQhiC+bEbEfg56IdBv7faWa6OipMs/AFFFvtFnB3wAYjlwQpQRZ0pm6ZkgtfL0pILRXhKxOiQj6UzoMR7A=="; }; }; + "bufio-1.2.0" = { + name = "bufio"; + packageName = "bufio"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bufio/-/bufio-1.2.0.tgz"; + sha512 = "UlFk8z/PwdhYQTXSQQagwGAdtRI83gib2n4uy4rQnenxUM2yQi8lBDzF230BNk+3wAoZDxYRoBwVVUPgHa9MCA=="; + }; + }; "bufrw-1.3.0" = { name = "bufrw"; packageName = "bufrw"; @@ -20579,6 +21416,15 @@ let sha512 = "wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ=="; }; }; + "builtin-modules-3.1.0" = { + name = "builtin-modules"; + packageName = "builtin-modules"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz"; + sha512 = "k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw=="; + }; + }; "builtin-modules-3.3.0" = { name = "builtin-modules"; packageName = "builtin-modules"; @@ -20624,15 +21470,6 @@ let sha512 = "GtKwd/4etuk1hNeprXoESBO1RSeRYJMXKf+O0qHmWdUomLT8ysNEfX/4bZFXr3BK6eukpHiEnhY2uMtEHDM2ng=="; }; }; - "buntis-0.2.1" = { - name = "buntis"; - packageName = "buntis"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buntis/-/buntis-0.2.1.tgz"; - sha512 = "5wszfQlsqJmZrfxpPkO5yQcEoBAmfUYlXxXU/IM6PhPZ8DMnMMJQ9rvAHfe5WZmnB6E1IoJYylFfTaf1e2FJbQ=="; - }; - }; "bunyan-1.5.1" = { name = "bunyan"; packageName = "bunyan"; @@ -20705,22 +21542,22 @@ let sha512 = "8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA=="; }; }; - "bval-0.1.6" = { + "bval-0.1.7" = { name = "bval"; packageName = "bval"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/bval/-/bval-0.1.6.tgz"; - sha512 = "jxNH9gSx7g749hQtS+nTxXYz/bLxwr4We1RHFkCYalNYcj12RfbW6qYWsKu0RYiKAdFcbNoZRHmWrIuXIyhiQQ=="; + url = "https://registry.npmjs.org/bval/-/bval-0.1.7.tgz"; + sha512 = "Ohv+MV7C0xAt5DJ4u681EVCArZ+ybEpz8yPjAozBEZYmR/rp9AX9QJB9PJ0aVlzEodjr3PIKTQrZfaONP8XR9w=="; }; }; - "bweb-0.1.10" = { + "bweb-0.1.12" = { name = "bweb"; packageName = "bweb"; - version = "0.1.10"; + version = "0.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/bweb/-/bweb-0.1.10.tgz"; - sha512 = "3Kkz/rfsyAWUS+8DV5XYhwcgVN4DfDewrP+iFTcpQfdZzcF6+OypAq7dHOtXV0sW7U/3msA/sEEqz0MHZ9ERWg=="; + url = "https://registry.npmjs.org/bweb/-/bweb-0.1.12.tgz"; + sha512 = "ctj1FnoTF+7/dRiRYVVwY/6lV/NYQ5Gz8HS0LsyUxae7fMJGKx2geHHIcIXeZ5DolS49Xq9e4rh29aG/vAJrWw=="; }; }; "byte-size-7.0.1" = { @@ -20858,13 +21695,13 @@ let sha512 = "/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ=="; }; }; - "cacache-17.0.2" = { + "cacache-17.0.4" = { name = "cacache"; packageName = "cacache"; - version = "17.0.2"; + version = "17.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-17.0.2.tgz"; - sha512 = "rYUs2x4OjSgCQND7nTrh21AHIBFgd7s/ctAYvU3a8u+nK+R5YaX/SFPDYz4Azz7SGL6+6L9ZZWI4Kawpb7grzQ=="; + url = "https://registry.npmjs.org/cacache/-/cacache-17.0.4.tgz"; + sha512 = "Z/nL3gU+zTUjz5pCA5vVjYM8pmaw2kxM7JEiE0fv3w77Wj+sFbi70CrBruUWH0uNcEdvLDixFpgA2JM4F4DBjA=="; }; }; "cache-base-1.0.1" = { @@ -20939,13 +21776,13 @@ let sha512 = "+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w=="; }; }; - "cacheable-request-10.2.2" = { + "cacheable-request-10.2.5" = { name = "cacheable-request"; packageName = "cacheable-request"; - version = "10.2.2"; + version = "10.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.2.tgz"; - sha512 = "KxjQZM3UIo7/J6W4sLpwFvu1GB3Whv8NtZ8ZrUL284eiQjiXeeqWTdhixNrp/NLZ/JNuFBo6BD4ZaO8ZJ5BN8Q=="; + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.5.tgz"; + sha512 = "5RwYYCfzjNPsyJxb/QpaM0bfzx+kw5/YpDhZPm9oMIDntHFQ9YXeyV47ZvzlTE0XrrrbyO2UITJH4GF9eRLdXQ=="; }; }; "cacheable-request-2.1.4" = { @@ -21092,6 +21929,15 @@ let sha512 = "0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ=="; }; }; + "callsite-record-4.1.5" = { + name = "callsite-record"; + packageName = "callsite-record"; + version = "4.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/callsite-record/-/callsite-record-4.1.5.tgz"; + sha512 = "OqeheDucGKifjQRx524URgV4z4NaKjocGhygTptDea+DLROre4ZEecA4KXDq+P7qlGCohYVNOh3qr+y5XH5Ftg=="; + }; + }; "callsites-0.2.0" = { name = "callsites"; packageName = "callsites"; @@ -21200,13 +22046,13 @@ let sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; }; - "camelcase-7.0.0" = { + "camelcase-7.0.1" = { name = "camelcase"; packageName = "camelcase"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-7.0.0.tgz"; - sha512 = "JToIvOmz6nhGsUhAYScbo2d6Py5wojjNfoxoc2mEVLUdJ70gJK2gnd+ABY1Tc3sVMyK7QDPtN0T/XdlCQWITyQ=="; + url = "https://registry.npmjs.org/camelcase/-/camelcase-7.0.1.tgz"; + sha512 = "xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw=="; }; }; "camelcase-css-2.0.1" = { @@ -21263,15 +22109,6 @@ let sha512 = "qMKdlOfsjlezMqxkUGGMaWWs17i2HoL15tM+wtx8ld4nLrUwU58TFdvyGOz/piNP842KeO8yXvggVQSdQ828NA=="; }; }; - "camelize-1.0.0" = { - name = "camelize"; - packageName = "camelize"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz"; - sha512 = "W2lPwkBkMZwFlPCXhIlYgxu+7gC/NUlCtdK652DAJ1JdgV0sTrvuPFshNPrFa1TY2JOkLhgdeEBplB4ezEa+xg=="; - }; - }; "camelize-1.0.1" = { name = "camelize"; packageName = "camelize"; @@ -21290,31 +22127,22 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001431" = { + "caniuse-lite-1.0.30001449" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001431"; + version = "1.0.30001449"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz"; - sha512 = "zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001449.tgz"; + sha512 = "CPB+UL9XMT/Av+pJxCKGhdx+yg1hzplvFJQlJ2n68PyQGMz9L/E2zCyLdOL8uasbouTUgnPl+y0tccI/se+BEw=="; }; }; - "canvas-2.10.2" = { + "canvas-2.11.0" = { name = "canvas"; packageName = "canvas"; - version = "2.10.2"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/canvas/-/canvas-2.10.2.tgz"; - sha512 = "FSmlsip0nZ0U4Zcfht0qBJqDhlfGuevTZKE8h+dBOYrJjGvY3iqMGSzzbvkaFhvMXiVxfcMaPHS/kge++T5SKg=="; - }; - }; - "canvg-3.0.7" = { - name = "canvg"; - packageName = "canvg"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/canvg/-/canvg-3.0.7.tgz"; - sha512 = "4sq6iL5Q4VOXS3PL1BapiXIZItpxYyANVzsAKpTPS5oq4u3SKbGfUcbZh2gdLCQ3jWpG/y5wRkMlBBAJhXeiZA=="; + url = "https://registry.npmjs.org/canvas/-/canvas-2.11.0.tgz"; + sha512 = "bdTjFexjKJEwtIo0oRx8eD4G2yWoUOXP9lj279jmQ2zMnTQhT8C3512OKz3s+ZOaQlLbE7TuVvRDYDB3Llyy5g=="; }; }; "capability-0.2.5" = { @@ -21326,15 +22154,6 @@ let sha512 = "rsJZYVCgXd08sPqwmaIqjAd5SUTfonV0z/gDJ8D6cN8wQphky1kkAYEqQ+hmDxTw7UihvBfjUVUSY+DBEe44jg=="; }; }; - "capital-case-1.0.4" = { - name = "capital-case"; - packageName = "capital-case"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz"; - sha512 = "ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A=="; - }; - }; "capture-stack-trace-1.0.2" = { name = "capture-stack-trace"; packageName = "capture-stack-trace"; @@ -21416,6 +22235,15 @@ let sha512 = "2diOsC0vSSxa3QEOgoGBy9fZRHzNXatHz464Kje2OpwQ7GM5vulyrD0gLFOQ1P4rgLAFsYiSGQl4gK402nEEuA=="; }; }; + "catering-2.1.1" = { + name = "catering"; + packageName = "catering"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/catering/-/catering-2.1.1.tgz"; + sha512 = "K7Qy8O9p76sL3/3m7/zLKbRkyOlSZAgzEaLhyj2mXS8PsCud2Eo4hAb8aLtZqHh0QGqLcb9dlJSu6lHRVENm1w=="; + }; + }; "catharsis-0.9.0" = { name = "catharsis"; packageName = "catharsis"; @@ -21461,31 +22289,31 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.5.37" = { + "cdk8s-2.6.32" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.5.37"; + version = "2.6.32"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.5.37.tgz"; - sha512 = "kKR21QD5MlPYrcO8hjgRbzAo7iQFook9zsDL/i5lQ3vFne3EL51aFwPRVWtpubFLaTUmBfCxQNX49ZeidGPKuA=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.6.32.tgz"; + sha512 = "JofFfr6+qpFeUiZcVK8NwWdjgz5z4b7ZZrKSwOrbvE2g441X+EEu4F3HfWEt4q68RvdaLkvIAFZki/4k4XEp3A=="; }; }; - "cdk8s-plus-25-2.0.19" = { + "cdk8s-plus-25-2.4.3" = { name = "cdk8s-plus-25"; packageName = "cdk8s-plus-25"; - version = "2.0.19"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.0.19.tgz"; - sha512 = "aIbT9BIgplHjpouNGaZPkly9vTAc0vOHRyu5BmoLTBV4I2Tki52VeBLEDrTXkoN40UI2Btd4LVED4HZ7Y75wmA=="; + url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.4.3.tgz"; + sha512 = "oD1yQFUpazobHUOOuWOIjng0iKYkB8IGx7w4XIA7Un3jqU2jGqiRT+nEy94KidAMOBjUcJp6GPBDqrTB6K8YoQ=="; }; }; - "cdktf-0.13.3" = { + "cdktf-0.15.2" = { name = "cdktf"; packageName = "cdktf"; - version = "0.13.3"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.13.3.tgz"; - sha512 = "uDNW+vKtJRZY+NaM3vsQX8lIVOkjC6AxMgx2HI3zvTCb60wI1DfEHr5ET/UCzZfrY1vQXY8ZYNhP4rxeCzW6AA=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.15.2.tgz"; + sha512 = "1V8u4nMtcgwfHq7V7+a+VkotMDDZUk6JJQ7BKPZyraN7MfiBjkUQUQo9PYJQdRONABFugwyggjy1Aqw8dto7Vw=="; }; }; "center-align-0.1.3" = { @@ -21497,13 +22325,13 @@ let sha512 = "Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ=="; }; }; - "chai-4.3.6" = { + "chai-4.3.7" = { name = "chai"; packageName = "chai"; - version = "4.3.6"; + version = "4.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz"; - sha512 = "bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q=="; + url = "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz"; + sha512 = "HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A=="; }; }; "chai-as-promised-7.1.1" = { @@ -21614,13 +22442,13 @@ let sha512 = "Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w=="; }; }; - "chalk-5.1.2" = { + "chalk-5.2.0" = { name = "chalk"; packageName = "chalk"; - version = "5.1.2"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-5.1.2.tgz"; - sha512 = "E5CkT4jWURs1Vy5qGJye+XwCkNj7Od3Af7CP6SujMetSMkLs8Do2RWJK5yx1wamHV/op8Rz+9rltjaTQWDnEFQ=="; + url = "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz"; + sha512 = "ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA=="; }; }; "chalk-template-0.4.0" = { @@ -21641,13 +22469,13 @@ let sha512 = "g9YLQVHVZS/3F+zIicfB58vjcxopvYQRp7xHzvyDFDhXH1aRZI/JhwSAO0X5qYiQluoGnaNAU6wByD2KTxJN1A=="; }; }; - "change-case-4.1.2" = { - name = "change-case"; - packageName = "change-case"; - version = "4.1.2"; + "char-regex-1.0.2" = { + name = "char-regex"; + packageName = "char-regex"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz"; - sha512 = "bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A=="; + url = "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz"; + sha512 = "kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="; }; }; "character-entities-1.2.4" = { @@ -21749,13 +22577,13 @@ let sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; }; }; - "chardet-1.5.0" = { + "chardet-1.5.1" = { name = "chardet"; packageName = "chardet"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/chardet/-/chardet-1.5.0.tgz"; - sha512 = "Nj3VehbbFs/1ZnJJJaL3ztEf3Nu5Fs6YV/NBs6lyz/iDDHUU+X9QNk5QgPy1/5Rjtb/cGVf+NyazP7kVEJqKRg=="; + url = "https://registry.npmjs.org/chardet/-/chardet-1.5.1.tgz"; + sha512 = "0XMOtA52igKDOIfvJZJ6v0+J9yMF3IuYyEa5oFUxBXA01G6mwCNKpul3bgbFf7lmZuqwN/oyg/zQ1cGS7NyJkQ=="; }; }; "charenc-0.0.2" = { @@ -21830,13 +22658,13 @@ let sha512 = "RcdumNsM6fJZ5HHbYunqj2bpurVRGsXour3OR+SlLEHFhG6ALm54i6Osnh+OvO7kEoSBzwExpblYFH8zKQiEPw=="; }; }; - "check-ends-with-period-2.0.1" = { + "check-ends-with-period-3.0.2" = { name = "check-ends-with-period"; packageName = "check-ends-with-period"; - version = "2.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/check-ends-with-period/-/check-ends-with-period-2.0.1.tgz"; - sha512 = "ZXEB+OLEAnRu9JCt/aMHNU9Q/BNYDCJrhcQli+JN95K08rGGEMVZc+W75/op8JyKrCKk/WV8Whuo8qjLIDcPeA=="; + url = "https://registry.npmjs.org/check-ends-with-period/-/check-ends-with-period-3.0.2.tgz"; + sha512 = "/Bw+avucqqZ7PjKCVDod1QDGyZjo7Ht2701pdgcpTXzK5jI73/OUh3VR+m18jNUoJx5DSOUv0AxELZF7FYtcDA=="; }; }; "check-error-1.0.2" = { @@ -22073,15 +22901,6 @@ let sha512 = "HqsYJgIc8ljJJOqOzLphjAs79EUuWSX3nzZi2LNkzlw3GIzAeZbaSektC8iT/tKvLqZq8yl1GJu5o6doA4TRbg=="; }; }; - "chrome-finder-1.0.7" = { - name = "chrome-finder"; - packageName = "chrome-finder"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/chrome-finder/-/chrome-finder-1.0.7.tgz"; - sha512 = "Cxdl9ns86sXKMU5jIWy7rb0jX0SlWBNVV30/eBvtYCSx+GfLOM+MyODWd6gv72QONFWPbEmere8VL/xVIrTzmA=="; - }; - }; "chrome-launcher-0.15.1" = { name = "chrome-launcher"; packageName = "chrome-launcher"; @@ -22181,13 +23000,13 @@ let sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; }; - "ci-info-3.5.0" = { + "ci-info-3.7.1" = { name = "ci-info"; packageName = "ci-info"; - version = "3.5.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-3.5.0.tgz"; - sha512 = "yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw=="; + url = "https://registry.npmjs.org/ci-info/-/ci-info-3.7.1.tgz"; + sha512 = "4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w=="; }; }; "cipher-base-1.0.4" = { @@ -22289,13 +23108,13 @@ let sha512 = "EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A=="; }; }; - "clean-css-5.3.1" = { + "clean-css-5.3.2" = { name = "clean-css"; packageName = "clean-css"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz"; - sha512 = "lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg=="; + url = "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz"; + sha512 = "JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww=="; }; }; "clean-git-ref-2.0.1" = { @@ -22334,13 +23153,13 @@ let sha512 = "LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg=="; }; }; - "clean-webpack-plugin-3.0.0" = { + "clean-webpack-plugin-4.0.0" = { name = "clean-webpack-plugin"; packageName = "clean-webpack-plugin"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz"; - sha512 = "MciirUH5r+cYLGCOL5JX/ZLzOZbVr1ot3Fw+KcvbhUb6PM+yycqd9ZhIlcigQ5gl+XhppNmw3bEFuaaMNyLj3A=="; + url = "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz"; + sha512 = "WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w=="; }; }; "clear-module-4.1.2" = { @@ -22532,15 +23351,6 @@ let sha512 = "7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw=="; }; }; - "cli-table3-0.6.2" = { - name = "cli-table3"; - packageName = "cli-table3"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.2.tgz"; - sha512 = "QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw=="; - }; - }; "cli-table3-0.6.3" = { name = "cli-table3"; packageName = "cli-table3"; @@ -22964,15 +23774,6 @@ let sha512 = "2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw=="; }; }; - "cluster-key-slot-1.1.1" = { - name = "cluster-key-slot"; - packageName = "cluster-key-slot"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.1.tgz"; - sha512 = "rwHwUfXL40Chm1r08yrhU3qpUvdVlgkKNeyeGPOxnW8/SyVDvgRaed/Uz54AqWNaTCAThlj6QAs3TZcKI0xDEw=="; - }; - }; "cluster-key-slot-1.1.2" = { name = "cluster-key-slot"; packageName = "cluster-key-slot"; @@ -22991,6 +23792,15 @@ let sha512 = "7MfiQ/ijzeE2kO+WFB9bv4QP5Dn2yVaAP2acFJr4NIFy2hT4w6O4EpOTLNcohR5IPX7M4wNf/5taIqMj7UA9ug=="; }; }; + "cmd-extension-1.0.2" = { + name = "cmd-extension"; + packageName = "cmd-extension"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cmd-extension/-/cmd-extension-1.0.2.tgz"; + sha512 = "iWDjmP8kvsMdBmLTHxFaqXikO8EdFRDfim7k6vUHglY/2xJ5jLrPsnQGijdfp4U+sr/BeecG0wKm02dSIAeQ1g=="; + }; + }; "cmd-shim-2.1.0" = { name = "cmd-shim"; packageName = "cmd-shim"; @@ -23135,13 +23945,13 @@ let sha512 = "+xi2ENsvchtUNa8oBUU58gHgmyN6BEEeZ8NIEgeQ0XnC+AoyihivgZYe+OOiNi+fLy/NUowugwV5gP8XWYDm0Q=="; }; }; - "codemaker-1.70.0" = { + "codemaker-1.73.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.70.0"; + version = "1.73.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.70.0.tgz"; - sha512 = "ZiS349YLSwzoe9ZVfupMBd794x3IO4Au6JsyYCchFjbBCzU10TllLigFWSQuVKXBpaBk3I6QhaDuK+JsosDKsg=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.73.0.tgz"; + sha512 = "pgVFCAbR0Yw/qTrV/W8R7cXWJouhONMRf8sNCjmAGJyV3MFaLN4sUPdUkzYUu7LCkuHPh0nvYRlExWzrkhm7vw=="; }; }; "codepage-1.4.0" = { @@ -23342,6 +24152,15 @@ let sha512 = "ENwblkFQpqqia6b++zLD/KUWafYlVY/UNnAp7oz7LY7E924wmpye416wBOmvv/HMWzl8gL1kJlfvId/1Dg176w=="; }; }; + "colors-1.2.5" = { + name = "colors"; + packageName = "colors"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz"; + sha512 = "erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg=="; + }; + }; "colors-1.4.0" = { name = "colors"; packageName = "colors"; @@ -23423,13 +24242,13 @@ let sha512 = "GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw=="; }; }; - "comma-separated-tokens-2.0.2" = { + "comma-separated-tokens-2.0.3" = { name = "comma-separated-tokens"; packageName = "comma-separated-tokens"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.2.tgz"; - sha512 = "G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg=="; + url = "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz"; + sha512 = "Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg=="; }; }; "command-exists-1.2.9" = { @@ -23441,13 +24260,13 @@ let sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="; }; }; - "command-line-args-4.0.7" = { + "command-line-args-5.2.1" = { name = "command-line-args"; packageName = "command-line-args"; - version = "4.0.7"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/command-line-args/-/command-line-args-4.0.7.tgz"; - sha512 = "aUdPvQRAyBvQd2n7jXcsMDz68ckBJELXNzBybCHOibUWEg0mWTnaYCSRU8h9R+aNRSvDihJtssSRCiDRpLaezA=="; + url = "https://registry.npmjs.org/command-line-args/-/command-line-args-5.2.1.tgz"; + sha512 = "H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg=="; }; }; "command-line-usage-4.1.0" = { @@ -23459,13 +24278,13 @@ let sha512 = "MxS8Ad995KpdAC0Jopo/ovGIroV/m0KHwzKfXxKag6FHOkGsH8/lv5yjgablcRxCJJC0oJeUMuO/gmaq+Wq46g=="; }; }; - "command-line-usage-5.0.5" = { + "command-line-usage-6.1.3" = { name = "command-line-usage"; packageName = "command-line-usage"; - version = "5.0.5"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-5.0.5.tgz"; - sha512 = "d8NrGylA5oCXSbGoKz05FkehDAzSmIm4K03S5VDh4d5lZAtTWfc3D1RuETtuQCn8129nYfJfDdF7P/lwcz1BlA=="; + url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.3.tgz"; + sha512 = "sH5ZSPr+7UStsloltmDh7Ce5fb8XPlHyoPzTpyyMuYCtervL65+ubVZ6Q61cFtFl62UyJlc8/JwERRbAFPUqgw=="; }; }; "commander-0.6.1" = { @@ -23486,6 +24305,15 @@ let sha512 = "uoVVA5dchmxZeTMv2Qsd0vhn/RebJYsWo4all1qtrUL3BBhQFn4AQDF4PL+ZvOeK7gczXKEZaSCyMDMwFBlpBg=="; }; }; + "commander-10.0.0" = { + name = "commander"; + packageName = "commander"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-10.0.0.tgz"; + sha512 = "zS5PnTI22FIRM6ylNW8G4Ap0IEOyk62fhLSD0+uHRT9McRCLGpkVNvao4bjimpK/GShynyQkFFxHhwMcETmduA=="; + }; + }; "commander-2.0.0" = { name = "commander"; packageName = "commander"; @@ -23675,6 +24503,15 @@ let sha512 = "5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw=="; }; }; + "commander-9.5.0" = { + name = "commander"; + packageName = "commander"; + version = "9.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz"; + sha512 = "KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ=="; + }; + }; "commandpost-1.4.0" = { name = "commandpost"; packageName = "commandpost"; @@ -23783,15 +24620,6 @@ let sha512 = "zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA=="; }; }; - "compare-semver-1.1.0" = { - name = "compare-semver"; - packageName = "compare-semver"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/compare-semver/-/compare-semver-1.1.0.tgz"; - sha512 = "AENcdfhxsMCzzl+QRdOwMQeA8tZBEEacAmA4pGPoyco27G9sIaM98WNYkcToC9O0wIx1vE+1ErmaM4t0/fXhMw=="; - }; - }; "compare-version-0.1.2" = { name = "compare-version"; packageName = "compare-version"; @@ -23945,15 +24773,6 @@ let sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="; }; }; - "conf-1.4.0" = { - name = "conf"; - packageName = "conf"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-1.4.0.tgz"; - sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg=="; - }; - }; "conf-10.2.0" = { name = "conf"; packageName = "conf"; @@ -24143,15 +24962,6 @@ let sha512 = "a1gSWQBQD73krFXdUEYJom2RTFrWUL3YvXDCRkyv//GVXc79cdW9MngtRuN9ih4FDKBtfJAJId+BbDuX+1rh2w=="; }; }; - "connect-redis-3.4.2" = { - name = "connect-redis"; - packageName = "connect-redis"; - version = "3.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.4.2.tgz"; - sha512 = "ozA1Z0GDnsCJECfNyNJOqPuW3Fk43fUbKC65Sa/V9hkCBNtXsFU2xtTOVsQGUsflpywuJMgGOV4xrnKzIPFqvA=="; - }; - }; "connect-redis-6.1.3" = { name = "connect-redis"; packageName = "connect-redis"; @@ -24215,15 +25025,6 @@ let sha512 = "DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw=="; }; }; - "constant-case-3.0.4" = { - name = "constant-case"; - packageName = "constant-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz"; - sha512 = "I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ=="; - }; - }; "constantinople-3.1.2" = { name = "constantinople"; packageName = "constantinople"; @@ -24251,13 +25052,13 @@ let sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="; }; }; - "constructs-10.1.152" = { + "constructs-10.1.233" = { name = "constructs"; packageName = "constructs"; - version = "10.1.152"; + version = "10.1.233"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.1.152.tgz"; - sha512 = "yRpUKigiWWY7Awu9bomyvtilLvbVk6dyrxKlG7Pav3B5a97TXVatnsMVUHYzVf5bBZUPWBiGukT7T55ke4ybcg=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.1.233.tgz"; + sha512 = "Km1hjAx2e303J5YH64PwTxESrJZG067p3egdneoC4kgr158V9ES+i3roeBTc9hjR0zyM2GEfS6jaVUibEi9VjQ=="; }; }; "consume-http-header-1.0.0" = { @@ -24314,15 +25115,6 @@ let sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; }; }; - "content-security-policy-builder-2.1.0" = { - name = "content-security-policy-builder"; - packageName = "content-security-policy-builder"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-2.1.0.tgz"; - sha512 = "/MtLWhJVvJNkA9dVLAp6fg9LxD2gfI6R2Fi1hPmfjYXSahJJzcfvoeDOxSyp4NvxMuwWv3WMssE9o31DoULHrQ=="; - }; - }; "content-type-1.0.4" = { name = "content-type"; packageName = "content-type"; @@ -24621,13 +25413,13 @@ let sha512 = "cj09EBuObp9gZNQCzc7hByQyrs6jVGE+o9kSJmeUoj+GiPiJvi5LYqEH/Hmme4+MTLHM+Ejtq+FChpjjEnsPdQ=="; }; }; - "convict-6.2.3" = { + "convict-6.2.4" = { name = "convict"; packageName = "convict"; - version = "6.2.3"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/convict/-/convict-6.2.3.tgz"; - sha512 = "mTY04Qr7WrqiXifdeUYXr4/+Te4hPFWDvz6J2FVIKCLc2XBhq63VOSSYAKJ+unhZAYOAjmEdNswTOeHt7s++pQ=="; + url = "https://registry.npmjs.org/convict/-/convict-6.2.4.tgz"; + sha512 = "qN60BAwdMVdofckX7AlohVJ2x9UvjTNoKVXCL2LxFk1l7757EJqf1nySdMkPQer0bt8kQ5lQiyZ9/2NvrFBuwQ=="; }; }; "cookie-0.0.4" = { @@ -24738,13 +25530,13 @@ let sha512 = "X9IsySmsr1heROBZCpyEYhqJyU7CXNJoVxIlQ5bBb7DskYUx0mQ+g2f7yPYajceZeGJWHQbIfGB6j0hywV/ARQ=="; }; }; - "cookiejar-2.1.3" = { + "cookiejar-2.1.4" = { name = "cookiejar"; packageName = "cookiejar"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.3.tgz"; - sha512 = "JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ=="; + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz"; + sha512 = "LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw=="; }; }; "cookies-0.8.0" = { @@ -24801,6 +25593,15 @@ let sha512 = "3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w=="; }; }; + "copy-webpack-plugin-10.2.4" = { + name = "copy-webpack-plugin"; + packageName = "copy-webpack-plugin"; + version = "10.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz"; + sha512 = "xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg=="; + }; + }; "copy-webpack-plugin-5.1.2" = { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; @@ -24810,15 +25611,6 @@ let sha512 = "Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ=="; }; }; - "copy-webpack-plugin-6.0.4" = { - name = "copy-webpack-plugin"; - packageName = "copy-webpack-plugin"; - version = "6.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.4.tgz"; - sha512 = "zCazfdYAh3q/O4VzZFiadWGpDA2zTs6FC6D7YTHD6H1J40pzo0H4z22h1NYMCl4ArQP4CK8y/KWqPrJ4rVkZ5A=="; - }; - }; "cordova-app-hello-world-6.0.0" = { name = "cordova-app-hello-world"; packageName = "cordova-app-hello-world"; @@ -24828,40 +25620,40 @@ let sha512 = "wPZsm+fzNUwdiTRODT+fQuPV410RNmd3Buiw63vT8BPxjC+cn6Bu8emrgwrDM4pbmU5sa5Unwu3xPcbQGQ3G3g=="; }; }; - "cordova-common-4.0.2" = { + "cordova-common-4.1.0" = { name = "cordova-common"; packageName = "cordova-common"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-common/-/cordova-common-4.0.2.tgz"; - sha512 = "od7aNShyuBajzPY83mUEO8tERwwWdFklXETHiXP5Ft87CWeo/tSuwNPFztyTy8XYc74yXdogXKPTJeUHuVzB8Q=="; + url = "https://registry.npmjs.org/cordova-common/-/cordova-common-4.1.0.tgz"; + sha512 = "sYfOSfpYGQOmUDlsARUbpT/EvVKT/E+GI3zwTXt+C6DjZ7xs6ZQVHs3umHKSidjf9yVM2LLmvGFpGrGX7aGxug=="; }; }; - "cordova-create-4.0.0" = { + "cordova-create-4.1.0" = { name = "cordova-create"; packageName = "cordova-create"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-create/-/cordova-create-4.0.0.tgz"; - sha512 = "t/4zaDZ4ZsFpC7j6x7s9hR9OeEo8nD2m7rSrzV2PUEfA4BPQujkmk0AIC+5iBvjfR7+ReHOHKsY/NfB1LnMQxQ=="; + url = "https://registry.npmjs.org/cordova-create/-/cordova-create-4.1.0.tgz"; + sha512 = "8VQohB5w5WwuxurQJ+2L+lAFVhBr//kFvlxLOmF0P3SzTdfIU02pNalbOeLalC0DXD7rfBXJZOxJ+KSM5TOq+Q=="; }; }; - "cordova-fetch-3.0.1" = { + "cordova-fetch-3.1.0" = { name = "cordova-fetch"; packageName = "cordova-fetch"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-3.0.1.tgz"; - sha512 = "bxXk6H3FtGXpCtlO+XyXM4pa72azQomdurNeHbZai9eYBzA5vjyPnsgxsYcylLUc1wQFeR+XWQVfgJitx6ghEw=="; + url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-3.1.0.tgz"; + sha512 = "qOT3HlNzVWbsCZVvbkZ6PdvAG1byiK8vWG+/Z+7s+8ZB76rOYKdzMvrmmMwrTTX6nglDnz5uJ/4XjQHJB770GQ=="; }; }; - "cordova-lib-11.0.0" = { + "cordova-lib-11.1.0" = { name = "cordova-lib"; packageName = "cordova-lib"; - version = "11.0.0"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-11.0.0.tgz"; - sha512 = "3XSCIAlS060/hzxWKDrF+sMfv3PVU8bglCaL31HMCyj3YrZn1CZhqrRRrW5lwRxtz7Sh4XCxv97rNxF38uj9hg=="; + url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-11.1.0.tgz"; + sha512 = "/XM+/wFag72bD4SNSxwX8b3OWatHNNlnmJpgb5pepp2Pobb957nWyR0GPwIkKyOyszdZesWM3Vv8uH9e2Z1k2w=="; }; }; "cordova-serve-4.0.0" = { @@ -24882,40 +25674,31 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.25.3" = { + "core-js-3.27.1" = { name = "core-js"; packageName = "core-js"; - version = "3.25.3"; + version = "3.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.25.3.tgz"; - sha512 = "y1hvKXmPHvm5B7w4ln1S4uc9eV/O5+iFExSRUimnvIph11uaizFR8LFMdONN8hG3P2pipUfX4Y/fR8rAEtcHcQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.27.1.tgz"; + sha512 = "GutwJLBChfGCpwwhbYoqfv03LAfmiz7e7D/BNxzeMxwQf10GRSzqiOjx7AmtEk+heiD/JWmBuyBPgFtx0Sg1ww=="; }; }; - "core-js-3.26.0" = { + "core-js-3.27.2" = { name = "core-js"; packageName = "core-js"; - version = "3.26.0"; + version = "3.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.26.0.tgz"; - sha512 = "+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.27.2.tgz"; + sha512 = "9ashVQskuh5AZEZ1JdQWp1GqSoC1e1G87MzRqg2gIfVAQ7Qn9K+uFj8EcniUFA4P2NLZfV+TOlX1SzoKfo+s7w=="; }; }; - "core-js-compat-3.26.0" = { + "core-js-compat-3.27.2" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.26.0"; + version = "3.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz"; - sha512 = "piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A=="; - }; - }; - "core-js-pure-3.26.0" = { - name = "core-js-pure"; - packageName = "core-js-pure"; - version = "3.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.26.0.tgz"; - sha512 = "LiN6fylpVBVwT8twhhluD9TzXmZQQsr2I2eIKtWNbZI1XMfBT7CV18itaN6RA7EtQd/SDdRx/wzvAShX2HvhQA=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.27.2.tgz"; + sha512 = "welaYuF7ZtbYKGrIy7y3eb40d37rG1FvzEOfe7hSLd2iD6duMDqUhRfSvCGyC46HhR6Y8JXXdZ2lnRUMkPBpvg=="; }; }; "core-util-is-1.0.2" = { @@ -25017,6 +25800,24 @@ let sha512 = "a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ=="; }; }; + "cosmiconfig-7.1.0" = { + name = "cosmiconfig"; + packageName = "cosmiconfig"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz"; + sha512 = "AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA=="; + }; + }; + "cosmiconfig-8.0.0" = { + name = "cosmiconfig"; + packageName = "cosmiconfig"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.0.0.tgz"; + sha512 = "da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ=="; + }; + }; "cosmiconfig-toml-loader-1.0.0" = { name = "cosmiconfig-toml-loader"; packageName = "cosmiconfig-toml-loader"; @@ -25026,13 +25827,13 @@ let sha512 = "H/2gurFWVi7xXvCyvsWRLCMekl4tITJcX0QEsDMpzxtuxDyM59xLatYNg4s/k9AA/HdtCYfj2su8mgA0GSDLDA=="; }; }; - "cosmiconfig-typescript-loader-4.2.0" = { + "cosmiconfig-typescript-loader-4.3.0" = { name = "cosmiconfig-typescript-loader"; packageName = "cosmiconfig-typescript-loader"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.2.0.tgz"; - sha512 = "NkANeMnaHrlaSSlpKGyvn2R4rqUDeE/9E5YHx+b4nwo0R8dZyAqcih8/gxpCZvqWP9Vf6xuLpMSzSgdVEIM78g=="; + url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.3.0.tgz"; + sha512 = "NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q=="; }; }; "count-trailing-zeros-1.0.1" = { @@ -25152,13 +25953,13 @@ let sha512 = "gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw=="; }; }; - "create-gatsby-2.24.0" = { + "create-gatsby-3.5.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "2.24.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.24.0.tgz"; - sha512 = "1ZN9cIGlPVPoyKHrl7n+iLf0SbIu/wdWBpujV/UeoIPJpEwEwUFe5fJPUIGTJkyHC97G6ArM+5mKt3fTZiCfwQ=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-3.5.0.tgz"; + sha512 = "wRLAkmKlJZNwNqVxXCgayAdvAtUjRKP8vr9ZRt2FYXyqZQmQtzXVDn8aekDlPs720z33HBajAYa+xCvl8pZhDA=="; }; }; "create-graphback-1.0.1" = { @@ -25206,13 +26007,13 @@ let sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="; }; }; - "create-torrent-5.0.6" = { + "create-torrent-5.0.9" = { name = "create-torrent"; packageName = "create-torrent"; - version = "5.0.6"; + version = "5.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-5.0.6.tgz"; - sha512 = "T3C23ZXdgzp6GrmbR3eJ9WSzmsR2ORvsTkr2Md32zmkYyzPmZyK+BayzaZt4kAahCKaLxvpMsvtITP0/WH1Z9g=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-5.0.9.tgz"; + sha512 = "WQ/bMe+aCBSa5EonIkgw7CTM/1JnJDQuLJhA78omSWvuEbXDwaUy0rG3a+IYt+EiO+rdTLxdsBwrsn/wfWOMQA=="; }; }; "cron-parser-3.5.0" = { @@ -25440,22 +26241,22 @@ let sha512 = "pP2W2BvLrRKggS1fUk8qQw2FG8PhyV969dlwF3M0jAg/HH83n76H+KGdzGsmEut6VJFlJYQkd1ZZskjaeVWnrA=="; }; }; - "cspell-dictionary-6.14.0" = { + "cspell-dictionary-6.19.2" = { name = "cspell-dictionary"; packageName = "cspell-dictionary"; - version = "6.14.0"; + version = "6.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-6.14.0.tgz"; - sha512 = "BJ89Fv6wiXHrR1OHKq/pnuutImXKehvGI2Wb8lkxOja7GYAypXMfyJRTJ2orE5eqmRD4DI+j3s7Bhby116z+Lw=="; + url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-6.19.2.tgz"; + sha512 = "XLVIsoiy97VAtC4V3tNJkYU7CqWuSejrXIyLdzIaN4yBsC1kOrV1fwJ3vaAuSIqQauDYeST2gBIsHcDuGYEcew=="; }; }; - "cspell-gitignore-6.14.0" = { + "cspell-gitignore-6.19.2" = { name = "cspell-gitignore"; packageName = "cspell-gitignore"; - version = "6.14.0"; + version = "6.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.14.0.tgz"; - sha512 = "WaA2bwQQ87YNzRGidi4IJpiTFJFzRJx1I97h2VWkZAiz7mxmIX+RHDsUxgVsIUy3S2SH5SF4bUmZwz8DWTGAAQ=="; + url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.19.2.tgz"; + sha512 = "dPxGxakkBs5dmD+nCom6t74ejWsd6RJJkgs0sccPDFKULXAInjeKMeTraskYTg4wXqybbiuXCB2sOIdeQmNq6w=="; }; }; "cspell-glob-0.1.25" = { @@ -25467,22 +26268,22 @@ let sha512 = "/XaSHrGBpMJa+duFz3GKOWfrijrfdHT7a/XGgIcq3cymCSpOH+DPho42sl0jLI/hjM+8yv2m8aEoxRT8yVSnlg=="; }; }; - "cspell-glob-6.14.0" = { + "cspell-glob-6.19.2" = { name = "cspell-glob"; packageName = "cspell-glob"; - version = "6.14.0"; + version = "6.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.14.0.tgz"; - sha512 = "0qdqwPJ+4tXk9HwB8IHlHy+P+8OM5sbVFTr5YaC5dGoy+Tfz56Y8V7gnitrmrxcLe3lpHVxi/mHNE3N/HWc+0Q=="; + url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.19.2.tgz"; + sha512 = "raco5vbd3Exb1uQaD5Bn6aS0KpRbNM7etmn/Q2T2KSwhvH+DRSEMTAkSG3rb0+y0ixkA/Qspjt68QnYxsbFPmw=="; }; }; - "cspell-grammar-6.14.0" = { + "cspell-grammar-6.19.2" = { name = "cspell-grammar"; packageName = "cspell-grammar"; - version = "6.14.0"; + version = "6.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-6.14.0.tgz"; - sha512 = "0+W6tuHRYsFvrdh3HBTsQlYRWwv+RAok+YZaTv8ypmkMAISU13ipxL9SkEc/r/AermPd5JpJAfPNw8ZNWRVsAg=="; + url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-6.19.2.tgz"; + sha512 = "f1IswIPxHX0uQaFzmDWJtgWVd3KkFElTnxj0cgvSZs8ehEaC+/jT30q4K36oVA7jgLtdLuDXafQf9Lp2FHf9bA=="; }; }; "cspell-io-4.1.7" = { @@ -25494,13 +26295,13 @@ let sha512 = "V0/tUu9FnIS3v+vAvDT6NNa14Nc/zUNX8+YUUOfFAiDJJTdqefmvcWjOJBIMYBf3wIk9iWLmLbMM+bNHqr7DSQ=="; }; }; - "cspell-io-6.14.0" = { + "cspell-io-6.19.2" = { name = "cspell-io"; packageName = "cspell-io"; - version = "6.14.0"; + version = "6.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-io/-/cspell-io-6.14.0.tgz"; - sha512 = "KmjUQ2JrmH3/5JZtYvvjtlB4FWHwE75DrudYfnyFUTzLvVlSagNagfy5wPWTkydnRMdI23I7BOqBA+wtBydXcA=="; + url = "https://registry.npmjs.org/cspell-io/-/cspell-io-6.19.2.tgz"; + sha512 = "ZVyygx4N8cTF2HeNUXV7IpX/LXSOSCNE+W3gY4/fju1PJWh+roTf7pVDURGtMxpSV7cq44ewYA3/qCgnF8QnkA=="; }; }; "cspell-lib-4.3.12" = { @@ -25512,13 +26313,13 @@ let sha512 = "yCCb6MoW1K8Tsr/WVEQoO4dfYhH9bCsjQayccb8MlyDaNNuWJHuX+gUGHsZSXSuChSh8PrTWKXJzs13/uM977g=="; }; }; - "cspell-lib-6.14.0" = { + "cspell-lib-6.19.2" = { name = "cspell-lib"; packageName = "cspell-lib"; - version = "6.14.0"; + version = "6.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.14.0.tgz"; - sha512 = "EqC/zhG7JSiYIcbzyPngFFrj5ElK0EACILKeqO/5lMvX19TdzaLDtnhY8ZHFY5+EIuaPkj4ahAqferx1gbJaDA=="; + url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.19.2.tgz"; + sha512 = "phPyt68bKeTUZKdmnjke2ffnIJPaXLdiUFAeU0kMNk15ljkczjMR4J6WkgYCKc+SCNQjYJSS+z4nLbtQivqDxg=="; }; }; "cspell-trie-lib-4.2.8" = { @@ -25530,13 +26331,13 @@ let sha512 = "Nt3c0gxOYXIc3/yhALDukpje1BgR6guvlUKWQO2zb0r7qRWpwUw2j2YM4dWbHQeH/3Hx5ei4Braa6cMaiJ5YBw=="; }; }; - "cspell-trie-lib-6.14.0" = { + "cspell-trie-lib-6.19.2" = { name = "cspell-trie-lib"; packageName = "cspell-trie-lib"; - version = "6.14.0"; + version = "6.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-6.14.0.tgz"; - sha512 = "JY2iRwp/6/qQYmOw2B8uhYDxP7VzqSWIo8rD5lHSivQMjH7lhVnQ2LPumMTa9IEOEesCkwNM8N+krndo12Ptqg=="; + url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-6.19.2.tgz"; + sha512 = "4rfiq0FeSlLG1hBQv5DpOgsbOzNs5hGz/V6Kmv0gbqaxRZyw+8sYECqdTNDx+0OXMgSRhUrwMoCpCMyWiq7tBA=="; }; }; "cspell-util-bundle-4.1.11" = { @@ -25575,15 +26376,6 @@ let sha512 = "DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ=="; }; }; - "css-blank-pseudo-3.0.3" = { - name = "css-blank-pseudo"; - packageName = "css-blank-pseudo"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz"; - sha512 = "VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ=="; - }; - }; "css-color-keywords-1.0.0" = { name = "css-color-keywords"; packageName = "css-color-keywords"; @@ -25638,15 +26430,6 @@ let sha512 = "/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w=="; }; }; - "css-has-pseudo-3.0.4" = { - name = "css-has-pseudo"; - packageName = "css-has-pseudo"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz"; - sha512 = "Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw=="; - }; - }; "css-loader-2.1.1" = { name = "css-loader"; packageName = "css-loader"; @@ -25665,13 +26448,22 @@ let sha512 = "M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ=="; }; }; - "css-loader-6.7.1" = { + "css-loader-6.7.3" = { name = "css-loader"; packageName = "css-loader"; - version = "6.7.1"; + version = "6.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz"; - sha512 = "yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw=="; + url = "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz"; + sha512 = "qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ=="; + }; + }; + "css-minimizer-webpack-plugin-3.4.1" = { + name = "css-minimizer-webpack-plugin"; + packageName = "css-minimizer-webpack-plugin"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz"; + sha512 = "1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q=="; }; }; "css-modules-loader-core-1.1.0" = { @@ -25692,15 +26484,6 @@ let sha512 = "UNIFik2RgSbiTwIW1IsFwXWn6vs+bYdq83LKTSOsx7NJR7WII9dxewkHLltfTLVppoUApHV0118a4RZRI9FLwA=="; }; }; - "css-prefers-color-scheme-6.0.3" = { - name = "css-prefers-color-scheme"; - packageName = "css-prefers-color-scheme"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz"; - sha512 = "4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA=="; - }; - }; "css-select-1.0.0" = { name = "css-select"; packageName = "css-select"; @@ -25764,13 +26547,13 @@ let sha512 = "jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg=="; }; }; - "css-to-react-native-3.0.0" = { + "css-to-react-native-3.1.0" = { name = "css-to-react-native"; packageName = "css-to-react-native"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.0.0.tgz"; - sha512 = "Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ=="; + url = "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.1.0.tgz"; + sha512 = "AryfkFA29b4I3vG7N4kxFboq15DxwSXzhXM37XNEjwJMgjYIc8BcqfiprpAqX0zadI5PMByEIwAMzXxk5Vcc4g=="; }; }; "css-tree-1.0.0-alpha.37" = { @@ -25800,6 +26583,15 @@ let sha512 = "OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA=="; }; }; + "css-tree-2.3.1" = { + name = "css-tree"; + packageName = "css-tree"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz"; + sha512 = "6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw=="; + }; + }; "css-what-1.0.0" = { name = "css-what"; packageName = "css-what"; @@ -25845,24 +26637,6 @@ let sha512 = "Ht70DcFBh+/ekjVrYS2PlDMdSQEl3OFNmjK6lcn49HptBgilXf/Zwg4uFh9Xn0pX3Q8YOkSjIFOfK2osvdqpBw=="; }; }; - "csscolorparser-1.0.3" = { - name = "csscolorparser"; - packageName = "csscolorparser"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/csscolorparser/-/csscolorparser-1.0.3.tgz"; - sha512 = "umPSgYwZkdFoUrH5hIq5kf0wPSXiro51nPw0j2K/c83KflkPSTBGMz6NJvMB+07VlL0y7VPo6QJcDjcgKTTm3w=="; - }; - }; - "cssdb-7.1.0" = { - name = "cssdb"; - packageName = "cssdb"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cssdb/-/cssdb-7.1.0.tgz"; - sha512 = "Sd99PrFgx28ez4GHu8yoQIufc/70h9oYowDf4EjeIKi8mac9whxRjhM3IaMr6EllP6KKKWtJrMfN6C7T9tIWvQ=="; - }; - }; "cssesc-3.0.0" = { name = "cssesc"; packageName = "cssesc"; @@ -26088,13 +26862,13 @@ let sha512 = "byxnDBxM1AVF3YfmsK7Smop9/usNz7gAZYSo9eYp61TGcNXraJby1rAiLyJSt1/8Iho2qaxZOtZCOvQMXogPtg=="; }; }; - "csv-parse-5.3.1" = { + "csv-parse-5.3.3" = { name = "csv-parse"; packageName = "csv-parse"; - version = "5.3.1"; + version = "5.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-5.3.1.tgz"; - sha512 = "R4Hv6eGJNzgcKdThZ6XORbSQ873HVcNke74QIq+LbwpT90LaZ8Xzl7KKiuIP16xq/P7ofzRt0h7S0xm+fVScsw=="; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-5.3.3.tgz"; + sha512 = "kEWkAPleNEdhFNkHQpFHu9RYPogsFj3dx6bCxL847fsiLgidzWg0z/O0B1kVWMJUc5ky64zGp18LX2T3DQrOfw=="; }; }; "csv-stream-0.2.0" = { @@ -26133,15 +26907,6 @@ let sha512 = "xiEMER6E7TlTPnDxrM4eRiC6TRgjNX9xzEZ5U/Se2YJKr7Mq4pJn/2XEHjl3STcSh96GmkHPcBXLES8M29wyyg=="; }; }; - "cuint-0.2.2" = { - name = "cuint"; - packageName = "cuint"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz"; - sha512 = "d4ZVpCW31eWwCMe1YT3ur7mUDnTXbgwyzaL320DrcRT45rfjYxkt5QWLrmOJ+/UEAI2+fQgKe/fCjR8l4TpRgw=="; - }; - }; "culvert-0.1.2" = { name = "culvert"; packageName = "culvert"; @@ -26169,13 +26934,13 @@ let sha512 = "X3VvImImJ5q6w0wOgJtxAX+RC06d26egp/A/vdSxqOrsRtAA9biXAkc4PZGj/3gx0+z+gDFri6BpcpwuG1/UEw=="; }; }; - "cuss-2.0.0" = { + "cuss-2.1.0" = { name = "cuss"; packageName = "cuss"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cuss/-/cuss-2.0.0.tgz"; - sha512 = "EHbh7F4GHvgyuakXeic9wtfeEYves17MxLpgIsljCbaDil6auJVsTTLV/qwkZ58+Gu+NKmMHVQm81J3BcEqwUg=="; + url = "https://registry.npmjs.org/cuss/-/cuss-2.1.0.tgz"; + sha512 = "xqMndOHDNnwJFjqhVyMvH2ETnNN3p10C2vcndvNVc2DDDTDIAKMws3ZF/HR2q0d25eFi5sTKJPQRP/mcbhhAOA=="; }; }; "custom-error-instance-2.1.1" = { @@ -26250,31 +27015,13 @@ let sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; }; }; - "d3-5.16.0" = { + "d3-7.8.2" = { name = "d3"; packageName = "d3"; - version = "5.16.0"; + version = "7.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/d3/-/d3-5.16.0.tgz"; - sha512 = "4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw=="; - }; - }; - "d3-7.6.1" = { - name = "d3"; - packageName = "d3"; - version = "7.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/d3/-/d3-7.6.1.tgz"; - sha512 = "txMTdIHFbcpLx+8a0IFhZsbp+PfBBPt8yfbmukZTQFroKuFqIwqswF0qE5JXWefylaAVpSXFoKm3yP+jpNLFLw=="; - }; - }; - "d3-array-1.2.4" = { - name = "d3-array"; - packageName = "d3-array"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz"; - sha512 = "KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="; + url = "https://registry.npmjs.org/d3/-/d3-7.8.2.tgz"; + sha512 = "WXty7qOGSHb7HR7CfOzwN1Gw04MUOzN8qh9ZUsvwycIMb4DYMpY9xczZ6jUorGtO6bR9BPMPaueIKwiDxu9uiQ=="; }; }; "d3-array-3.1.1" = { @@ -26286,22 +27033,13 @@ let sha512 = "33qQ+ZoZlli19IFiQx4QEpf2CBEayMRzhlisJHSCsSUbDXv6ZishqS1x7uFVClKG4Wr7rZVHvaAttoLow6GqdQ=="; }; }; - "d3-array-3.2.0" = { + "d3-array-3.2.2" = { name = "d3-array"; packageName = "d3-array"; - version = "3.2.0"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-3.2.0.tgz"; - sha512 = "3yXFQo0oG3QCxbF06rMPFyGRMGJNS7NvsV1+2joOjbBE+9xvWQ8+GcMJAjRCzw06zQ3/arXeJgbPYcjUCuC+3g=="; - }; - }; - "d3-axis-1.0.12" = { - name = "d3-axis"; - packageName = "d3-axis"; - version = "1.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.12.tgz"; - sha512 = "ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ=="; + url = "https://registry.npmjs.org/d3-array/-/d3-array-3.2.2.tgz"; + sha512 = "yEEyEAbDrF8C6Ob2myOBLjwBLck1Z89jMGFee0oPsn95GqjerpaOA4ch+vc2l0FNFFwMD5N7OCSEN5eAlsUbgQ=="; }; }; "d3-axis-3.0.0" = { @@ -26313,15 +27051,6 @@ let sha512 = "IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw=="; }; }; - "d3-brush-1.1.6" = { - name = "d3-brush"; - packageName = "d3-brush"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-brush/-/d3-brush-1.1.6.tgz"; - sha512 = "7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA=="; - }; - }; "d3-brush-3.0.0" = { name = "d3-brush"; packageName = "d3-brush"; @@ -26331,15 +27060,6 @@ let sha512 = "ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ=="; }; }; - "d3-chord-1.0.6" = { - name = "d3-chord"; - packageName = "d3-chord"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.6.tgz"; - sha512 = "JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA=="; - }; - }; "d3-chord-3.0.1" = { name = "d3-chord"; packageName = "d3-chord"; @@ -26349,24 +27069,6 @@ let sha512 = "VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g=="; }; }; - "d3-collection-1.0.7" = { - name = "d3-collection"; - packageName = "d3-collection"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz"; - sha512 = "ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A=="; - }; - }; - "d3-color-1.4.1" = { - name = "d3-color"; - packageName = "d3-color"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz"; - sha512 = "p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="; - }; - }; "d3-color-2.0.0" = { name = "d3-color"; packageName = "d3-color"; @@ -26385,22 +27087,13 @@ let sha512 = "zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA=="; }; }; - "d3-contour-1.3.2" = { + "d3-contour-4.0.2" = { name = "d3-contour"; packageName = "d3-contour"; - version = "1.3.2"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/d3-contour/-/d3-contour-1.3.2.tgz"; - sha512 = "hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg=="; - }; - }; - "d3-contour-4.0.0" = { - name = "d3-contour"; - packageName = "d3-contour"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.0.tgz"; - sha512 = "7aQo0QHUTu/Ko3cP9YK9yUTxtoDEiDGwnBHyLxG5M4vqlBkO/uixMRele3nfsfj6UXOcuReVpVXzAboGraYIJw=="; + url = "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz"; + sha512 = "4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA=="; }; }; "d3-delaunay-6.0.2" = { @@ -26412,15 +27105,6 @@ let sha512 = "IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ=="; }; }; - "d3-dispatch-1.0.6" = { - name = "d3-dispatch"; - packageName = "d3-dispatch"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz"; - sha512 = "fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA=="; - }; - }; "d3-dispatch-2.0.0" = { name = "d3-dispatch"; packageName = "d3-dispatch"; @@ -26439,15 +27123,6 @@ let sha512 = "rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg=="; }; }; - "d3-drag-1.2.5" = { - name = "d3-drag"; - packageName = "d3-drag"; - version = "1.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.5.tgz"; - sha512 = "rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w=="; - }; - }; "d3-drag-2.0.0" = { name = "d3-drag"; packageName = "d3-drag"; @@ -26466,15 +27141,6 @@ let sha512 = "pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg=="; }; }; - "d3-dsv-1.2.0" = { - name = "d3-dsv"; - packageName = "d3-dsv"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.2.0.tgz"; - sha512 = "9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g=="; - }; - }; "d3-dsv-3.0.1" = { name = "d3-dsv"; packageName = "d3-dsv"; @@ -26484,15 +27150,6 @@ let sha512 = "UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q=="; }; }; - "d3-ease-1.0.7" = { - name = "d3-ease"; - packageName = "d3-ease"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.7.tgz"; - sha512 = "lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ=="; - }; - }; "d3-ease-2.0.0" = { name = "d3-ease"; packageName = "d3-ease"; @@ -26511,15 +27168,6 @@ let sha512 = "wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w=="; }; }; - "d3-fetch-1.2.0" = { - name = "d3-fetch"; - packageName = "d3-fetch"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-fetch/-/d3-fetch-1.2.0.tgz"; - sha512 = "yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA=="; - }; - }; "d3-fetch-3.0.1" = { name = "d3-fetch"; packageName = "d3-fetch"; @@ -26529,15 +27177,6 @@ let sha512 = "kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw=="; }; }; - "d3-force-1.2.1" = { - name = "d3-force"; - packageName = "d3-force"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz"; - sha512 = "HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg=="; - }; - }; "d3-force-3.0.0" = { name = "d3-force"; packageName = "d3-force"; @@ -26547,15 +27186,6 @@ let sha512 = "zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg=="; }; }; - "d3-format-1.4.5" = { - name = "d3-format"; - packageName = "d3-format"; - version = "1.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-format/-/d3-format-1.4.5.tgz"; - sha512 = "J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ=="; - }; - }; "d3-format-2.0.0" = { name = "d3-format"; packageName = "d3-format"; @@ -26574,22 +27204,13 @@ let sha512 = "YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA=="; }; }; - "d3-geo-1.12.1" = { + "d3-geo-3.1.0" = { name = "d3-geo"; packageName = "d3-geo"; - version = "1.12.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-geo/-/d3-geo-1.12.1.tgz"; - sha512 = "XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg=="; - }; - }; - "d3-geo-3.0.1" = { - name = "d3-geo"; - packageName = "d3-geo"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-geo/-/d3-geo-3.0.1.tgz"; - sha512 = "Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA=="; + url = "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.0.tgz"; + sha512 = "JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA=="; }; }; "d3-geo-projection-4.0.0" = { @@ -26601,22 +27222,13 @@ let sha512 = "p0bK60CEzph1iqmnxut7d/1kyTmm3UWtPlwdkM31AU+LW+BXazd5zJdoCn7VFxNCHXRngPHRnsNn5uGjLRGndg=="; }; }; - "d3-graphviz-4.4.0" = { + "d3-graphviz-4.5.0" = { name = "d3-graphviz"; packageName = "d3-graphviz"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-4.4.0.tgz"; - sha512 = "dpBriUvc+IntPsBu+aZfON5euuQu0wFsQqzPc6QF4AxTJScLh/R6YcR1HYw5g8FxIUy3crpjBlWntySgvps3BQ=="; - }; - }; - "d3-hierarchy-1.1.9" = { - name = "d3-hierarchy"; - packageName = "d3-hierarchy"; - version = "1.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz"; - sha512 = "j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ=="; + url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-4.5.0.tgz"; + sha512 = "qEhZB19Tv7oNV92Hys/aY+XkVCyHAzM+VjqbjJoHK5YXLC3tRtZoSFr64tdrURl8qRsKnphtvPeFpHeJAbOgSQ=="; }; }; "d3-hierarchy-3.1.2" = { @@ -26628,15 +27240,6 @@ let sha512 = "FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA=="; }; }; - "d3-interpolate-1.4.0" = { - name = "d3-interpolate"; - packageName = "d3-interpolate"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz"; - sha512 = "V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA=="; - }; - }; "d3-interpolate-2.0.1" = { name = "d3-interpolate"; packageName = "d3-interpolate"; @@ -26655,15 +27258,6 @@ let sha512 = "3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g=="; }; }; - "d3-path-1.0.9" = { - name = "d3-path"; - packageName = "d3-path"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz"; - sha512 = "VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="; - }; - }; "d3-path-2.0.0" = { name = "d3-path"; packageName = "d3-path"; @@ -26673,22 +27267,13 @@ let sha512 = "ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA=="; }; }; - "d3-path-3.0.1" = { + "d3-path-3.1.0" = { name = "d3-path"; packageName = "d3-path"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-path/-/d3-path-3.0.1.tgz"; - sha512 = "gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w=="; - }; - }; - "d3-polygon-1.0.6" = { - name = "d3-polygon"; - packageName = "d3-polygon"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-polygon/-/d3-polygon-1.0.6.tgz"; - sha512 = "k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ=="; + url = "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz"; + sha512 = "p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ=="; }; }; "d3-polygon-3.0.1" = { @@ -26700,15 +27285,6 @@ let sha512 = "3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg=="; }; }; - "d3-quadtree-1.0.7" = { - name = "d3-quadtree"; - packageName = "d3-quadtree"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.7.tgz"; - sha512 = "RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA=="; - }; - }; "d3-quadtree-3.0.1" = { name = "d3-quadtree"; packageName = "d3-quadtree"; @@ -26718,15 +27294,6 @@ let sha512 = "04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw=="; }; }; - "d3-random-1.1.2" = { - name = "d3-random"; - packageName = "d3-random"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-random/-/d3-random-1.1.2.tgz"; - sha512 = "6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ=="; - }; - }; "d3-random-3.0.1" = { name = "d3-random"; packageName = "d3-random"; @@ -26736,15 +27303,6 @@ let sha512 = "FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ=="; }; }; - "d3-scale-2.2.2" = { - name = "d3-scale"; - packageName = "d3-scale"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-scale/-/d3-scale-2.2.2.tgz"; - sha512 = "LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw=="; - }; - }; "d3-scale-4.0.2" = { name = "d3-scale"; packageName = "d3-scale"; @@ -26754,15 +27312,6 @@ let sha512 = "GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ=="; }; }; - "d3-scale-chromatic-1.5.0" = { - name = "d3-scale-chromatic"; - packageName = "d3-scale-chromatic"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz"; - sha512 = "ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg=="; - }; - }; "d3-scale-chromatic-3.0.0" = { name = "d3-scale-chromatic"; packageName = "d3-scale-chromatic"; @@ -26772,15 +27321,6 @@ let sha512 = "Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g=="; }; }; - "d3-selection-1.4.2" = { - name = "d3-selection"; - packageName = "d3-selection"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.2.tgz"; - sha512 = "SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg=="; - }; - }; "d3-selection-2.0.0" = { name = "d3-selection"; packageName = "d3-selection"; @@ -26799,49 +27339,22 @@ let sha512 = "fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ=="; }; }; - "d3-shape-1.3.7" = { + "d3-shape-3.2.0" = { name = "d3-shape"; packageName = "d3-shape"; - version = "1.3.7"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz"; - sha512 = "EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw=="; + url = "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz"; + sha512 = "SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA=="; }; }; - "d3-shape-3.1.0" = { - name = "d3-shape"; - packageName = "d3-shape"; + "d3-time-3.1.0" = { + name = "d3-time"; + packageName = "d3-time"; version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-shape/-/d3-shape-3.1.0.tgz"; - sha512 = "tGDh1Muf8kWjEDT/LswZJ8WF85yDZLvVJpYU9Nq+8+yW1Z5enxrmXOhTArlkaElU+CTn0OTVNli+/i+HP45QEQ=="; - }; - }; - "d3-time-1.1.0" = { - name = "d3-time"; - packageName = "d3-time"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz"; - sha512 = "Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="; - }; - }; - "d3-time-3.0.0" = { - name = "d3-time"; - packageName = "d3-time"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-time/-/d3-time-3.0.0.tgz"; - sha512 = "zmV3lRnlaLI08y9IMRXSDshQb5Nj77smnfpnd2LrBa/2K281Jijactokeak14QacHs/kKq0AQ121nidNYlarbQ=="; - }; - }; - "d3-time-format-2.3.0" = { - name = "d3-time-format"; - packageName = "d3-time-format"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz"; - sha512 = "guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ=="; + url = "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz"; + sha512 = "VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q=="; }; }; "d3-time-format-4.1.0" = { @@ -26853,15 +27366,6 @@ let sha512 = "dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg=="; }; }; - "d3-timer-1.0.10" = { - name = "d3-timer"; - packageName = "d3-timer"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz"; - sha512 = "B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw=="; - }; - }; "d3-timer-2.0.0" = { name = "d3-timer"; packageName = "d3-timer"; @@ -26880,15 +27384,6 @@ let sha512 = "ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA=="; }; }; - "d3-transition-1.3.2" = { - name = "d3-transition"; - packageName = "d3-transition"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-transition/-/d3-transition-1.3.2.tgz"; - sha512 = "sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA=="; - }; - }; "d3-transition-2.0.0" = { name = "d3-transition"; packageName = "d3-transition"; @@ -26907,24 +27402,6 @@ let sha512 = "ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w=="; }; }; - "d3-voronoi-1.1.4" = { - name = "d3-voronoi"; - packageName = "d3-voronoi"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.4.tgz"; - sha512 = "dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg=="; - }; - }; - "d3-zoom-1.8.3" = { - name = "d3-zoom"; - packageName = "d3-zoom"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.8.3.tgz"; - sha512 = "VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ=="; - }; - }; "d3-zoom-2.0.0" = { name = "d3-zoom"; packageName = "d3-zoom"; @@ -26952,22 +27429,13 @@ let sha512 = "+LSAiGFwQ9dRnRdOeaj7g47ZFJcOUPukAP8J3A3fuZ1g9Y44BG+P1sgApjLXTQPOzC4+7S9Wr8kXsfpINM4jpw=="; }; }; - "dagre-0.8.5" = { - name = "dagre"; - packageName = "dagre"; - version = "0.8.5"; + "dagre-d3-es-7.0.6" = { + name = "dagre-d3-es"; + packageName = "dagre-d3-es"; + version = "7.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/dagre/-/dagre-0.8.5.tgz"; - sha512 = "/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw=="; - }; - }; - "dagre-d3-0.6.4" = { - name = "dagre-d3"; - packageName = "dagre-d3"; - version = "0.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/dagre-d3/-/dagre-d3-0.6.4.tgz"; - sha512 = "e/6jXeCP7/ptlAM48clmX4xTZc5Ek6T6kagS7Oz2HrYSdqcLZFLqpAfh7ldbZRFfxCZVyh61NEPR08UQRVxJzQ=="; + url = "https://registry.npmjs.org/dagre-d3-es/-/dagre-d3-es-7.0.6.tgz"; + sha512 = "CaaE/nZh205ix+Up4xsnlGmpog5GGm81Upi2+/SBHxwNwrccBb3K51LzjZ1U6hgvOlAEUsVWf1xSTzCyKpJ6+Q=="; }; }; "damerau-levenshtein-1.0.8" = { @@ -27024,15 +27492,6 @@ let sha512 = "NxuWFXR3+HJULO6F6VprWnUQbx0MXgfEuOfz3m+pw8LYZV06SHRjcaBVvVlwH132xJq12mljySVDLcbMcFM7EA=="; }; }; - "dasherize-2.0.0" = { - name = "dasherize"; - packageName = "dasherize"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dasherize/-/dasherize-2.0.0.tgz"; - sha512 = "APql/TZ6FdLEpf2z7/X2a2zyqK8juYtqaSVqxw9mYoQ64CXkfU15AeLh8pUszT8+fnYjgm6t0aIYpWKJbnLkuA=="; - }; - }; "dat-dns-3.2.1" = { name = "dat-dns"; packageName = "dat-dns"; @@ -27150,13 +27609,13 @@ let sha512 = "WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og=="; }; }; - "data-uri-to-buffer-4.0.0" = { + "data-uri-to-buffer-4.0.1" = { name = "data-uri-to-buffer"; packageName = "data-uri-to-buffer"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz"; - sha512 = "Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA=="; + url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz"; + sha512 = "0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A=="; }; }; "data-urls-1.1.0" = { @@ -27294,13 +27753,13 @@ let sha512 = "2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA=="; }; }; - "dayjs-1.11.6" = { + "dayjs-1.11.7" = { name = "dayjs"; packageName = "dayjs"; - version = "1.11.6"; + version = "1.11.7"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.6.tgz"; - sha512 = "zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz"; + sha512 = "+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="; }; }; "dayjs-1.8.36" = { @@ -27528,6 +27987,15 @@ let sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="; }; }; + "decamelize-2.0.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz"; + sha512 = "Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg=="; + }; + }; "decamelize-4.0.0" = { name = "decamelize"; packageName = "decamelize"; @@ -27564,22 +28032,13 @@ let sha512 = "WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg=="; }; }; - "decimal.js-10.4.2" = { + "decimal.js-10.4.3" = { name = "decimal.js"; packageName = "decimal.js"; - version = "10.4.2"; + version = "10.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.2.tgz"; - sha512 = "ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA=="; - }; - }; - "decimal.js-7.5.1" = { - name = "decimal.js"; - packageName = "decimal.js"; - version = "7.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decimal.js/-/decimal.js-7.5.1.tgz"; - sha512 = "1K5Y6MykxQYfHBcFfAj2uBaLmwreq4MsjsvrlgcEOvg+X82IeeXlIVIVkBMiypksu+yo9vcYP6lfU3qTedofSQ=="; + url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz"; + sha512 = "VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="; }; }; "decko-1.2.0" = { @@ -27600,13 +28059,13 @@ let sha512 = "O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg=="; }; }; - "decode-uri-component-0.2.0" = { + "decode-uri-component-0.2.2" = { name = "decode-uri-component"; packageName = "decode-uri-component"; - version = "0.2.0"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha512 = "hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og=="; + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz"; + sha512 = "FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="; }; }; "decompress-4.2.1" = { @@ -27708,13 +28167,13 @@ let sha512 = "OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ=="; }; }; - "deep-eql-3.0.1" = { + "deep-eql-4.1.3" = { name = "deep-eql"; packageName = "deep-eql"; - version = "3.0.1"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz"; - sha512 = "+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw=="; + url = "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz"; + sha512 = "WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw=="; }; }; "deep-equal-0.2.2" = { @@ -27744,13 +28203,13 @@ let sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; }; }; - "deep-equal-2.1.0" = { + "deep-equal-2.2.0" = { name = "deep-equal"; packageName = "deep-equal"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.1.0.tgz"; - sha512 = "2pxgvWu3Alv1PoWEyVg7HS8YhGlUFUV7N5oOvfL6d+7xAmLSemMwv/c8Zv/i9KFzxV5Kt5CAvQc70fLwVuf4UA=="; + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.0.tgz"; + sha512 = "RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw=="; }; }; "deep-extend-0.2.11" = { @@ -28140,15 +28599,6 @@ let sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; }; }; - "deltachat-node-1.86.0" = { - name = "deltachat-node"; - packageName = "deltachat-node"; - version = "1.86.0"; - src = fetchurl { - url = "https://registry.npmjs.org/deltachat-node/-/deltachat-node-1.86.0.tgz"; - sha512 = "mePZbE0tyYlOj7hXrQNyvMVn2NI6/K0obP9uIxZC11iTZMhFtJVUG+O18yWOLUCsDeCIDFJnrXDUc4HRbBndWw=="; - }; - }; "denque-1.5.1" = { name = "denque"; packageName = "denque"; @@ -28176,6 +28626,15 @@ let sha512 = "/6yUWlSH0Uevjj6HWvO86rDeFzuYfzbaKDqifTEemwfwEPyBrODTb3ox/jFzqmc2+UmgJ3IDMS88BKEBh1Nm2Q=="; }; }; + "depcheck-1.4.3" = { + name = "depcheck"; + packageName = "depcheck"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/depcheck/-/depcheck-1.4.3.tgz"; + sha512 = "vy8xe1tlLFu7t4jFyoirMmOR7x7N601ubU9Gkifyr9z8rjBFtEdWHDBMqXyk6OkK+94NXutzddVXJuo0JlUQKQ=="; + }; + }; "depd-1.0.1" = { name = "depd"; packageName = "depd"; @@ -28221,6 +28680,15 @@ let sha512 = "JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg=="; }; }; + "dependency-path-9.2.8" = { + name = "dependency-path"; + packageName = "dependency-path"; + version = "9.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/dependency-path/-/dependency-path-9.2.8.tgz"; + sha512 = "S0OhIK7sIyAsph8hVH/LMCTDL3jozKtlrPx3dMQrlE2nAlXTquTT+AcOufphDMTQqLkfn4acvfiem9I1IWZ4jQ=="; + }; + }; "deprecation-2.3.1" = { name = "deprecation"; packageName = "deprecation"; @@ -28230,6 +28698,15 @@ let sha512 = "xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="; }; }; + "deps-regex-0.1.4" = { + name = "deps-regex"; + packageName = "deps-regex"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/deps-regex/-/deps-regex-0.1.4.tgz"; + sha512 = "3tzwGYogSJi8HoG93R5x9NrdefZQOXgHgGih/7eivloOq6yC6O+yoFxZnkgP661twvfILONfoKRdF9GQOGx2RA=="; + }; + }; "deps-sort-2.0.1" = { name = "deps-sort"; packageName = "deps-sort"; @@ -28365,15 +28842,6 @@ let sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; }; }; - "detect-port-alt-1.1.6" = { - name = "detect-port-alt"; - packageName = "detect-port-alt"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz"; - sha512 = "5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q=="; - }; - }; "detective-4.7.1" = { name = "detective"; packageName = "detective"; @@ -28401,22 +28869,13 @@ let sha512 = "LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A=="; }; }; - "devtools-protocol-0.0.1045489" = { + "devtools-protocol-0.0.1082910" = { name = "devtools-protocol"; packageName = "devtools-protocol"; - version = "0.0.1045489"; + version = "0.0.1082910"; src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1045489.tgz"; - sha512 = "D+PTmWulkuQW4D1NTiCRCFxF7pQPn0hgp4YyX4wAQ6xYXKOadSWPR3ENGDQ47MW/Ewc9v2rpC/UEEGahgBYpSQ=="; - }; - }; - "devtools-protocol-0.0.901419" = { - name = "devtools-protocol"; - packageName = "devtools-protocol"; - version = "0.0.901419"; - src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz"; - sha512 = "4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ=="; + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1082910.tgz"; + sha512 = "RqoZ2GmqaNxyx+99L/RemY5CkwG9D0WEfOKxekwCRXOGrDCep62ngezEJUVMq6rISYQ+085fJnWDQqGHlxVNww=="; }; }; "devtools-protocol-0.0.981744" = { @@ -28428,15 +28887,6 @@ let sha512 = "0cuGS8+jhR67Fy7qG3i3Pc7Aw494sb9yG9QgpG97SFVWwolgYjlhJg7n+UaHxOQT30d1TYu/EYe9k01ivLErIg=="; }; }; - "dezalgo-1.0.3" = { - name = "dezalgo"; - packageName = "dezalgo"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz"; - sha512 = "K7i4zNfT2kgQz3GylDw40ot9GAE47sFZ9EXHFSPP6zONLgH6kWXE0KWJchkbQJLBkRazq4APwZ4OwiFFlT95OQ=="; - }; - }; "dezalgo-1.0.4" = { name = "dezalgo"; packageName = "dezalgo"; @@ -28464,22 +28914,22 @@ let sha512 = "uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA=="; }; }; - "diagnostic-channel-0.3.1" = { + "diagnostic-channel-1.1.0" = { name = "diagnostic-channel"; packageName = "diagnostic-channel"; - version = "0.3.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-channel/-/diagnostic-channel-0.3.1.tgz"; - sha512 = "6eb9YRrimz8oTr5+JDzGmSYnXy5V7YnK5y/hd8AUDK1MssHjQKm9LlD6NSrHx4vMDF3+e/spI2hmWTviElgWZA=="; + url = "https://registry.npmjs.org/diagnostic-channel/-/diagnostic-channel-1.1.0.tgz"; + sha512 = "fwujyMe1gj6rk6dYi9hMZm0c8Mz8NDMVl2LB4iaYh3+LIAThZC8RKFGXWG0IML2OxAit/ZFRgZhMkhQ3d/bobQ=="; }; }; - "diagnostic-channel-publishers-0.4.4" = { + "diagnostic-channel-publishers-1.0.5" = { name = "diagnostic-channel-publishers"; packageName = "diagnostic-channel-publishers"; - version = "0.4.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.4.4.tgz"; - sha512 = "l126t01d2ZS9EreskvEtZPrcgstuvH3rbKy82oUhUrVmBaGx4hO9wECdl3cvZbKDYjMF3QJDB5z5dL9yWAjvZQ=="; + url = "https://registry.npmjs.org/diagnostic-channel-publishers/-/diagnostic-channel-publishers-1.0.5.tgz"; + sha512 = "dJwUS0915pkjjimPJVDnS/QQHsH0aOYhnZsLJdnZIMOrB+csj8RnZhWTuwnm8R5v3Z7OZs+ksv5luC14DGB7eg=="; }; }; "dicer-0.2.5" = { @@ -28572,13 +29022,13 @@ let sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; - "diff2html-3.4.22" = { + "diff2html-3.4.31" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.22"; + version = "3.4.31"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.22.tgz"; - sha512 = "n7b0cfjqG+NLAmxdlSRMXIGoeoK+OhCNxd/6InjjMxy3v5Gk1L5Ms5r4jziFiRBoNaB6L8lLyZ8KQ8Kv+DOgnw=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.31.tgz"; + sha512 = "bgL4kUUChpBqyFykgalwXRXbeW+zCkGmoH4Ftw6+WFP5JccBUJPNMapfX2WDEb+KOLflrE7eJwvb5r8+zutetw=="; }; }; "diff3-0.0.3" = { @@ -28599,15 +29049,6 @@ let sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; }; }; - "difflib-0.2.4" = { - name = "difflib"; - packageName = "difflib"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/difflib/-/difflib-0.2.4.tgz"; - sha512 = "9YVwmMb0wQHQNr5J9m6BSj6fk4pfGITGQOOs+D9Fl+INODWFOfvhIU1hNv6GgR1RBoC/9NJcwu77zShxV0kT7w=="; - }; - }; "diffy-2.1.0" = { name = "diffy"; packageName = "diffy"; @@ -28635,13 +29076,13 @@ let sha512 = "QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg=="; }; }; - "dir-compare-2.4.0" = { + "dir-compare-3.3.0" = { name = "dir-compare"; packageName = "dir-compare"; - version = "2.4.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/dir-compare/-/dir-compare-2.4.0.tgz"; - sha512 = "l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA=="; + url = "https://registry.npmjs.org/dir-compare/-/dir-compare-3.3.0.tgz"; + sha512 = "J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg=="; }; }; "dir-glob-2.0.0" = { @@ -28914,15 +29355,6 @@ let sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA=="; }; }; - "dom-helpers-5.2.1" = { - name = "dom-helpers"; - packageName = "dom-helpers"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz"; - sha512 = "nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA=="; - }; - }; "dom-serialize-2.2.1" = { name = "dom-serialize"; packageName = "dom-serialize"; @@ -28995,15 +29427,6 @@ let sha512 = "6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="; }; }; - "dom4-2.1.6" = { - name = "dom4"; - packageName = "dom4"; - version = "2.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/dom4/-/dom4-2.1.6.tgz"; - sha512 = "JkCVGnN4ofKGbjf5Uvc8mmxaATIErKQKSgACdBXpsQ3fY6DlIpAyWfiBSrGkttATssbDCp3psiAKWXk5gmjycA=="; - }; - }; "domain-browser-1.2.0" = { name = "domain-browser"; packageName = "domain-browser"; @@ -29103,15 +29526,6 @@ let sha512 = "eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw=="; }; }; - "domhandler-3.3.0" = { - name = "domhandler"; - packageName = "domhandler"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz"; - sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="; - }; - }; "domhandler-4.3.1" = { name = "domhandler"; packageName = "domhandler"; @@ -29139,13 +29553,22 @@ let sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="; }; }; - "dompurify-2.4.0" = { + "dompurify-2.4.1" = { name = "dompurify"; packageName = "dompurify"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-2.4.0.tgz"; - sha512 = "Be9tbQMZds4a3C6xTmz68NlMfeONA//4dOavl/1rNw50E+/QO0KVpbcU0PcaW0nsQxurXls9ZocqFxk8R2mWEA=="; + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.4.1.tgz"; + sha512 = "ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA=="; + }; + }; + "dompurify-2.4.3" = { + name = "dompurify"; + packageName = "dompurify"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.4.3.tgz"; + sha512 = "q6QaLcakcRjebxjg8/+NP+h0rPfatOgOzc46Fst9VAA3jF2ApfKBNKMzdP4DYTqtUMXSCd5pRS/8Po/OmoCHZQ=="; }; }; "domutils-1.4.3" = { @@ -29193,15 +29616,6 @@ let sha512 = "z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q=="; }; }; - "dont-sniff-mimetype-1.1.0" = { - name = "dont-sniff-mimetype"; - packageName = "dont-sniff-mimetype"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.1.0.tgz"; - sha512 = "ZjI4zqTaxveH2/tTlzS1wFp+7ncxNZaIEWYg3lzZRHkKf5zPT/MnEG6WL0BhHMJUabkh8GeU5NL5j+rEUCb7Ug=="; - }; - }; "dot-case-3.0.4" = { name = "dot-case"; packageName = "dot-case"; @@ -29337,15 +29751,6 @@ let sha512 = "UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw=="; }; }; - "double-ended-queue-2.1.0-0" = { - name = "double-ended-queue"; - packageName = "double-ended-queue"; - version = "2.1.0-0"; - src = fetchurl { - url = "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz"; - sha512 = "+BNfZ+deCo8hMNpDqDnvT+c0XpJ5cUa6mqYq89bho2Ifze4URTqRkcwR399hWoTrTkbZ/XJYDgP6rc7pRgffEQ=="; - }; - }; "downgrade-root-1.2.2" = { name = "downgrade-root"; packageName = "downgrade-root"; @@ -29562,15 +29967,6 @@ let sha512 = "vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA=="; }; }; - "earcut-2.2.4" = { - name = "earcut"; - packageName = "earcut"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz"; - sha512 = "/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ=="; - }; - }; "eastasianwidth-0.2.0" = { name = "eastasianwidth"; packageName = "eastasianwidth"; @@ -29598,15 +29994,6 @@ let sha512 = "wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w=="; }; }; - "easygettext-2.17.0" = { - name = "easygettext"; - packageName = "easygettext"; - version = "2.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/easygettext/-/easygettext-2.17.0.tgz"; - sha512 = "QmMWIu6l83SW2QuEFd4GIDrTey0qOn0haTOMt4NdPKPHEBihAqdo9HHYRDHiPg/msZSKaye7qDOLAcqHlmfo+g=="; - }; - }; "eazy-logger-3.1.0" = { name = "eazy-logger"; packageName = "eazy-logger"; @@ -29634,15 +30021,6 @@ let sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="; }; }; - "ecpair-2.0.1" = { - name = "ecpair"; - packageName = "ecpair"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ecpair/-/ecpair-2.0.1.tgz"; - sha512 = "iT3wztQMeE/nDTlfnAg8dAFUfBS7Tq2BXzq3ae6L+pWgFU0fQ3l0woTzdTBrJV3OxBjxbzjq8EQhAbEmJNWFSw=="; - }; - }; "ecpair-2.1.0" = { name = "ecpair"; packageName = "ecpair"; @@ -29751,15 +30129,6 @@ let sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; }; }; - "electron-18.3.15" = { - name = "electron"; - packageName = "electron"; - version = "18.3.15"; - src = fetchurl { - url = "https://registry.npmjs.org/electron/-/electron-18.3.15.tgz"; - sha512 = "frkBt8skyo8SmlG4TbByDxZw6/tqttRYYIBaeTBfkoG18OyD59IVwVaXXHO8UYKB5/1C2Rce0Gj6uoxlAHQHzQ=="; - }; - }; "electron-packager-17.1.1" = { name = "electron-packager"; packageName = "electron-packager"; @@ -29861,6 +30230,15 @@ let sha512 = "DlYAjELhPGbpH7qLS00H+CnoLxKxZblXuLDBwl1I8ozlQ0xITmlopiEunFmb3lYzrSD+EW7sIEw5fSoZgNiO8Q=="; }; }; + "emittery-0.10.0" = { + name = "emittery"; + packageName = "emittery"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emittery/-/emittery-0.10.0.tgz"; + sha512 = "AGvFfs+d0JKCJQ4o01ASQLGPmSCxgfU9RFXvzPvZdjKK8oscynksuJhWrSTSw7j7Ep/sZct5b5ZhYCi8S/t0HQ=="; + }; + }; "emmet-2.3.6" = { name = "emmet"; packageName = "emmet"; @@ -29870,24 +30248,6 @@ let sha512 = "pLS4PBPDdxuUAmw7Me7+TcHbykTsBKN/S9XJbUOMFQrNv9MoshzyMFK/R57JBm94/6HSL4vHnDeEmxlC82NQ4A=="; }; }; - "emoji-js-clean-4.0.0" = { - name = "emoji-js-clean"; - packageName = "emoji-js-clean"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-js-clean/-/emoji-js-clean-4.0.0.tgz"; - sha512 = "6WZ/WH61ABR/s3TZpRW+nXBSRu6xMTdZSGjNTHo1ptv1vRjwOfbzEPQp9mtgbCi1vkFsFi1SZYz/UIliVxvLwg=="; - }; - }; - "emoji-mart-3.0.1" = { - name = "emoji-mart"; - packageName = "emoji-mart"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-mart/-/emoji-mart-3.0.1.tgz"; - sha512 = "sxpmMKxqLvcscu6mFn9ITHeZNkGzIvD0BSNFE/LJESPbCA8s1jM6bCDPjWbV31xHq7JXaxgpHxLB54RCbBZSlg=="; - }; - }; "emoji-named-characters-1.0.2" = { name = "emoji-named-characters"; packageName = "emoji-named-characters"; @@ -29987,6 +30347,15 @@ let sha512 = "AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="; }; }; + "encode-registry-3.0.0" = { + name = "encode-registry"; + packageName = "encode-registry"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/encode-registry/-/encode-registry-3.0.0.tgz"; + sha512 = "2fRYji8K6FwYuQ6EPBKR/J9mcqb7kIoNqt1vGvJr3NrvKfncRiNm00Oxo6gi/YJF8R5Sp2bNFSFdGKTG0rje1Q=="; + }; + }; "encode-utf8-1.0.3" = { name = "encode-utf8"; packageName = "encode-utf8"; @@ -30086,13 +30455,13 @@ let sha512 = "b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg=="; }; }; - "engine.io-3.6.0" = { + "engine.io-3.6.1" = { name = "engine.io"; packageName = "engine.io"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-3.6.0.tgz"; - sha512 = "Kc8fo5bbg8F4a2f3HPHTEpGyq/IRIQpyeHu3H1ThR14XDD7VrLcsGBo16HUpahgp8YkHJDaU5gNxJZbuGcuueg=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.6.1.tgz"; + sha512 = "dfs8EVg/i7QjFsXxn7cCRQ+Wai1G1TlEvHhdYEi80fxn5R1vZ2K661O6v/rezj1FP234SZ14r9CmJke99iYDGg=="; }; }; "engine.io-6.0.1" = { @@ -30113,13 +30482,13 @@ let sha512 = "rqs60YwkvWTLLnfazqgZqLa/aKo+9cueVfEi/dZ8PyGyaf8TLOxj++4QMIgeG3Gn0AhrWiFXvghsoY9L9h25GA=="; }; }; - "engine.io-6.2.0" = { + "engine.io-6.2.1" = { name = "engine.io"; packageName = "engine.io"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-6.2.0.tgz"; - sha512 = "4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz"; + sha512 = "ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA=="; }; }; "engine.io-client-1.3.1" = { @@ -30185,13 +30554,13 @@ let sha512 = "x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg=="; }; }; - "engine.io-parser-5.0.4" = { + "engine.io-parser-5.0.6" = { name = "engine.io-parser"; packageName = "engine.io-parser"; - version = "5.0.4"; + version = "5.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz"; - sha512 = "+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg=="; + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz"; + sha512 = "tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw=="; }; }; "enhanced-resolve-2.3.0" = { @@ -30212,13 +30581,13 @@ let sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="; }; }; - "enhanced-resolve-5.10.0" = { + "enhanced-resolve-5.12.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "5.10.0"; + version = "5.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz"; - sha512 = "T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz"; + sha512 = "QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ=="; }; }; "enquirer-2.3.6" = { @@ -30320,15 +30689,6 @@ let sha512 = "ObFo8v4rQJAE59M69QzwloxPZtd33TpYEIjtKD1rrFDcM1Gd7IkDxEBU+HriziN6HSHQnBJi8Dmy+JWkav5HKA=="; }; }; - "env-paths-1.0.0" = { - name = "env-paths"; - packageName = "env-paths"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz"; - sha512 = "+6r/UAzikJWJPcQZpBQS+bVmjAMz2BkDP/N4n2Uz1zz8lyw1IHWUeVdh/85gs0dp5A+z76LOQhCZkR6F88mlUw=="; - }; - }; "env-paths-2.2.0" = { name = "env-paths"; packageName = "env-paths"; @@ -30474,13 +30834,13 @@ let sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="; }; }; - "es-abstract-1.20.4" = { + "es-abstract-1.21.1" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.20.4"; + version = "1.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz"; - sha512 = "0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz"; + sha512 = "QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg=="; }; }; "es-aggregate-error-1.0.9" = { @@ -30501,13 +30861,13 @@ let sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; }; }; - "es-get-iterator-1.1.2" = { + "es-get-iterator-1.1.3" = { name = "es-get-iterator"; packageName = "es-get-iterator"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz"; - sha512 = "+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ=="; + url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz"; + sha512 = "sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw=="; }; }; "es-module-lexer-0.9.3" = { @@ -30519,6 +30879,15 @@ let sha512 = "1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="; }; }; + "es-set-tostringtag-2.0.1" = { + name = "es-set-tostringtag"; + packageName = "es-set-tostringtag"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz"; + sha512 = "g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg=="; + }; + }; "es-shim-unscopables-1.0.0" = { name = "es-shim-unscopables"; packageName = "es-shim-unscopables"; @@ -30663,15 +31032,6 @@ let sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; }; }; - "esbuild-0.12.29" = { - name = "esbuild"; - packageName = "esbuild"; - version = "0.12.29"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.12.29.tgz"; - sha512 = "w/XuoBCSwepyiZtIRsKsetiLDUVGPVw1E/R3VTFSecIy8UR7Cq3SOtwKHJMFoVqqVG36aGkzh4e8BvpO1Fdc7g=="; - }; - }; "esbuild-0.14.47" = { name = "esbuild"; packageName = "esbuild"; @@ -30690,13 +31050,22 @@ let sha512 = "+CvnDitD7Q5sT7F+FM65sWkF8wJRf+j9fPcprxYV4j+ohmzVj2W7caUqH2s5kCaCJAfcAICjSlKhDCcvDpU7nw=="; }; }; - "esbuild-0.15.13" = { + "esbuild-0.15.18" = { name = "esbuild"; packageName = "esbuild"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.15.13.tgz"; - sha512 = "Cu3SC84oyzzhrK/YyN4iEVy2jZu5t2fz66HEOShHURcjSkOSAVL8C/gfUT+lDJxkVHpg8GZ10DD0rMHRPqMFaQ=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz"; + sha512 = "x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q=="; + }; + }; + "esbuild-0.16.17" = { + name = "esbuild"; + packageName = "esbuild"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz"; + sha512 = "G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg=="; }; }; "esbuild-android-64-0.14.47" = { @@ -30717,13 +31086,13 @@ let sha512 = "6FOuKTHnC86dtrKDmdSj2CkcKF8PnqkaIXqvgydqfJmqBazCPdw+relrMlhGjkvVdiiGV70rpdnyFmA65ekBCQ=="; }; }; - "esbuild-android-64-0.15.13" = { + "esbuild-android-64-0.15.18" = { name = "esbuild-android-64"; packageName = "esbuild-android-64"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.13.tgz"; - sha512 = "yRorukXBlokwTip+Sy4MYskLhJsO0Kn0/Fj43s1krVblfwP+hMD37a4Wmg139GEsMLl+vh8WXp2mq/cTA9J97g=="; + url = "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz"; + sha512 = "wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA=="; }; }; "esbuild-android-arm64-0.14.47" = { @@ -30744,13 +31113,13 @@ let sha512 = "vBtp//5VVkZWmYYvHsqBRCMMi1MzKuMIn5XDScmnykMTu9+TD9v0NMEDqQxvtFToeYmojdo5UCV2vzMQWJcJ4A=="; }; }; - "esbuild-android-arm64-0.15.13" = { + "esbuild-android-arm64-0.15.18" = { name = "esbuild-android-arm64"; packageName = "esbuild-android-arm64"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.13.tgz"; - sha512 = "TKzyymLD6PiVeyYa4c5wdPw87BeAiTXNtK6amWUcXZxkV51gOk5u5qzmDaYSwiWeecSNHamFsaFjLoi32QR5/w=="; + url = "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz"; + sha512 = "G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ=="; }; }; "esbuild-darwin-64-0.14.47" = { @@ -30771,13 +31140,13 @@ let sha512 = "YFmXPIOvuagDcwCejMRtCDjgPfnDu+bNeh5FU2Ryi68ADDVlWEpbtpAbrtf/lvFTWPexbgyKgzppNgsmLPr8PA=="; }; }; - "esbuild-darwin-64-0.15.13" = { + "esbuild-darwin-64-0.15.18" = { name = "esbuild-darwin-64"; packageName = "esbuild-darwin-64"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.13.tgz"; - sha512 = "WAx7c2DaOS6CrRcoYCgXgkXDliLnFv3pQLV6GeW1YcGEZq2Gnl8s9Pg7ahValZkpOa0iE/ojRVQ87sbUhF1Cbg=="; + url = "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz"; + sha512 = "2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg=="; }; }; "esbuild-darwin-arm64-0.14.47" = { @@ -30798,13 +31167,13 @@ let sha512 = "juYD0QnSKwAMfzwKdIF6YbueXzS6N7y4GXPDeDkApz/1RzlT42mvX9jgNmyOlWKN7YzQAYbcUEJmZJYQGdf2ow=="; }; }; - "esbuild-darwin-arm64-0.15.13" = { + "esbuild-darwin-arm64-0.15.18" = { name = "esbuild-darwin-arm64"; packageName = "esbuild-darwin-arm64"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.13.tgz"; - sha512 = "U6jFsPfSSxC3V1CLiQqwvDuj3GGrtQNB3P3nNC3+q99EKf94UGpsG9l4CQ83zBs1NHrk1rtCSYT0+KfK5LsD8A=="; + url = "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz"; + sha512 = "tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA=="; }; }; "esbuild-freebsd-64-0.14.47" = { @@ -30825,13 +31194,13 @@ let sha512 = "cLEI/aXjb6vo5O2Y8rvVSQ7smgLldwYY5xMxqh/dQGfWO+R1NJOFsiax3IS4Ng300SVp7Gz3czxT6d6qf2cw0g=="; }; }; - "esbuild-freebsd-64-0.15.13" = { + "esbuild-freebsd-64-0.15.18" = { name = "esbuild-freebsd-64"; packageName = "esbuild-freebsd-64"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.13.tgz"; - sha512 = "whItJgDiOXaDG/idy75qqevIpZjnReZkMGCgQaBWZuKHoElDJC1rh7MpoUgupMcdfOd+PgdEwNQW9DAE6i8wyA=="; + url = "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz"; + sha512 = "TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA=="; }; }; "esbuild-freebsd-arm64-0.14.47" = { @@ -30852,13 +31221,13 @@ let sha512 = "TcWVw/rCL2F+jUgRkgLa3qltd5gzKjIMGhkVybkjk6PJadYInPtgtUBp1/hG+mxyigaT7ib+od1Xb84b+L+1Mg=="; }; }; - "esbuild-freebsd-arm64-0.15.13" = { + "esbuild-freebsd-arm64-0.15.18" = { name = "esbuild-freebsd-arm64"; packageName = "esbuild-freebsd-arm64"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.13.tgz"; - sha512 = "6pCSWt8mLUbPtygv7cufV0sZLeylaMwS5Fznj6Rsx9G2AJJsAjQ9ifA+0rQEIg7DwJmi9it+WjzNTEAzzdoM3Q=="; + url = "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz"; + sha512 = "R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA=="; }; }; "esbuild-linux-32-0.14.47" = { @@ -30879,13 +31248,13 @@ let sha512 = "RFqpyC5ChyWrjx8Xj2K0EC1aN0A37H6OJfmUXIASEqJoHcntuV3j2Efr9RNmUhMfNE6yEj2VpYuDteZLGDMr0w=="; }; }; - "esbuild-linux-32-0.15.13" = { + "esbuild-linux-32-0.15.18" = { name = "esbuild-linux-32"; packageName = "esbuild-linux-32"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.13.tgz"; - sha512 = "VbZdWOEdrJiYApm2kkxoTOgsoCO1krBZ3quHdYk3g3ivWaMwNIVPIfEE0f0XQQ0u5pJtBsnk2/7OPiCFIPOe/w=="; + url = "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz"; + sha512 = "lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg=="; }; }; "esbuild-linux-64-0.14.47" = { @@ -30906,13 +31275,13 @@ let sha512 = "dxjhrqo5i7Rq6DXwz5v+MEHVs9VNFItJmHBe1CxROWNf4miOGoQhqSG8StStbDkQ1Mtobg6ng+4fwByOhoQoeA=="; }; }; - "esbuild-linux-64-0.15.13" = { + "esbuild-linux-64-0.15.18" = { name = "esbuild-linux-64"; packageName = "esbuild-linux-64"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.13.tgz"; - sha512 = "rXmnArVNio6yANSqDQlIO4WiP+Cv7+9EuAHNnag7rByAqFVuRusLbGi2697A5dFPNXoO//IiogVwi3AdcfPC6A=="; + url = "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz"; + sha512 = "hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw=="; }; }; "esbuild-linux-arm-0.14.47" = { @@ -30933,13 +31302,13 @@ let sha512 = "LsJynDxYF6Neg7ZC7748yweCDD+N8ByCv22/7IAZglIEniEkqdF4HCaa49JNDLw1UQGlYuhOB8ZT/MmcSWzcWg=="; }; }; - "esbuild-linux-arm-0.15.13" = { + "esbuild-linux-arm-0.15.18" = { name = "esbuild-linux-arm"; packageName = "esbuild-linux-arm"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.13.tgz"; - sha512 = "Ac6LpfmJO8WhCMQmO253xX2IU2B3wPDbl4IvR0hnqcPrdfCaUa2j/lLMGTjmQ4W5JsJIdHEdW12dG8lFS0MbxQ=="; + url = "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz"; + sha512 = "UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA=="; }; }; "esbuild-linux-arm64-0.14.47" = { @@ -30960,13 +31329,13 @@ let sha512 = "D9rFxGutoqQX3xJPxqd6o+kvYKeIbM0ifW2y0bgKk5HPgQQOo2k9/2Vpto3ybGYaFPCE5qTGtqQta9PoP6ZEzw=="; }; }; - "esbuild-linux-arm64-0.15.13" = { + "esbuild-linux-arm64-0.15.18" = { name = "esbuild-linux-arm64"; packageName = "esbuild-linux-arm64"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.13.tgz"; - sha512 = "alEMGU4Z+d17U7KQQw2IV8tQycO6T+rOrgW8OS22Ua25x6kHxoG6Ngry6Aq6uranC+pNWNMB6aHFPh7aTQdORQ=="; + url = "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz"; + sha512 = "54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug=="; }; }; "esbuild-linux-mips64le-0.14.47" = { @@ -30987,13 +31356,13 @@ let sha512 = "vS54wQjy4IinLSlb5EIlLoln8buh1yDgliP4CuEHumrPk4PvvP4kTRIG4SzMXm6t19N0rIfT4bNdAxzJLg2k6A=="; }; }; - "esbuild-linux-mips64le-0.15.13" = { + "esbuild-linux-mips64le-0.15.18" = { name = "esbuild-linux-mips64le"; packageName = "esbuild-linux-mips64le"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.13.tgz"; - sha512 = "47PgmyYEu+yN5rD/MbwS6DxP2FSGPo4Uxg5LwIdxTiyGC2XKwHhHyW7YYEDlSuXLQXEdTO7mYe8zQ74czP7W8A=="; + url = "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz"; + sha512 = "Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ=="; }; }; "esbuild-linux-ppc64le-0.14.47" = { @@ -31014,13 +31383,13 @@ let sha512 = "xcdd62Y3VfGoyphNP/aIV9LP+RzFw5M5Z7ja+zdpQHHvokJM7d0rlDRMN+iSSwvUymQkqZO+G/xjb4/75du8BQ=="; }; }; - "esbuild-linux-ppc64le-0.15.13" = { + "esbuild-linux-ppc64le-0.15.18" = { name = "esbuild-linux-ppc64le"; packageName = "esbuild-linux-ppc64le"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.13.tgz"; - sha512 = "z6n28h2+PC1Ayle9DjKoBRcx/4cxHoOa2e689e2aDJSaKug3jXcQw7mM+GLg+9ydYoNzj8QxNL8ihOv/OnezhA=="; + url = "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz"; + sha512 = "b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w=="; }; }; "esbuild-linux-riscv64-0.14.47" = { @@ -31041,13 +31410,13 @@ let sha512 = "syXHGak9wkAnFz0gMmRBoy44JV0rp4kVCEA36P5MCeZcxFq8+fllBC2t6sKI23w3qd8Vwo9pTADCgjTSf3L3rA=="; }; }; - "esbuild-linux-riscv64-0.15.13" = { + "esbuild-linux-riscv64-0.15.18" = { name = "esbuild-linux-riscv64"; packageName = "esbuild-linux-riscv64"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.13.tgz"; - sha512 = "+Lu4zuuXuQhgLUGyZloWCqTslcCAjMZH1k3Xc9MSEJEpEFdpsSU0sRDXAnk18FKOfEjhu4YMGaykx9xjtpA6ow=="; + url = "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz"; + sha512 = "ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg=="; }; }; "esbuild-linux-s390x-0.14.47" = { @@ -31068,13 +31437,13 @@ let sha512 = "kFAJY3dv+Wq8o28K/C7xkZk/X34rgTwhknSsElIqoEo8armCOjMJ6NsMxm48KaWY2h2RUYGtQmr+RGuUPKBhyw=="; }; }; - "esbuild-linux-s390x-0.15.13" = { + "esbuild-linux-s390x-0.15.18" = { name = "esbuild-linux-s390x"; packageName = "esbuild-linux-s390x"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.13.tgz"; - sha512 = "BMeXRljruf7J0TMxD5CIXS65y7puiZkAh+s4XFV9qy16SxOuMhxhVIXYLnbdfLrsYGFzx7U9mcdpFWkkvy/Uag=="; + url = "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz"; + sha512 = "VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ=="; }; }; "esbuild-netbsd-64-0.14.47" = { @@ -31095,13 +31464,13 @@ let sha512 = "ZZBI7qrR1FevdPBVHz/1GSk1x5GDL/iy42Zy8+neEm/HA7ma+hH/bwPEjeHXKWUDvM36CZpSL/fn1/y9/Hb+1A=="; }; }; - "esbuild-netbsd-64-0.15.13" = { + "esbuild-netbsd-64-0.15.18" = { name = "esbuild-netbsd-64"; packageName = "esbuild-netbsd-64"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.13.tgz"; - sha512 = "EHj9QZOTel581JPj7UO3xYbltFTYnHy+SIqJVq6yd3KkCrsHRbapiPb0Lx3EOOtybBEE9EyqbmfW1NlSDsSzvQ=="; + url = "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz"; + sha512 = "98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg=="; }; }; "esbuild-openbsd-64-0.14.47" = { @@ -31122,13 +31491,13 @@ let sha512 = "7R1/p39M+LSVQVgDVlcY1KKm6kFKjERSX1lipMG51NPcspJD1tmiZSmmBXoY5jhHIu6JL1QkFDTx94gMYK6vfA=="; }; }; - "esbuild-openbsd-64-0.15.13" = { + "esbuild-openbsd-64-0.15.18" = { name = "esbuild-openbsd-64"; packageName = "esbuild-openbsd-64"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.13.tgz"; - sha512 = "nkuDlIjF/sfUhfx8SKq0+U+Fgx5K9JcPq1mUodnxI0x4kBdCv46rOGWbuJ6eof2n3wdoCLccOoJAbg9ba/bT2w=="; + url = "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz"; + sha512 = "yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ=="; }; }; "esbuild-sunos-64-0.14.47" = { @@ -31149,13 +31518,13 @@ let sha512 = "HoHaCswHxLEYN8eBTtyO0bFEWvA3Kdb++hSQ/lLG7TyKF69TeSG0RNoBRAs45x/oCeWaTDntEZlYwAfQlhEtJA=="; }; }; - "esbuild-sunos-64-0.15.13" = { + "esbuild-sunos-64-0.15.18" = { name = "esbuild-sunos-64"; packageName = "esbuild-sunos-64"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.13.tgz"; - sha512 = "jVeu2GfxZQ++6lRdY43CS0Tm/r4WuQQ0Pdsrxbw+aOrHQPHV0+LNOLnvbN28M7BSUGnJnHkHm2HozGgNGyeIRw=="; + url = "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz"; + sha512 = "On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw=="; }; }; "esbuild-windows-32-0.14.47" = { @@ -31176,13 +31545,13 @@ let sha512 = "4rtwSAM35A07CBt1/X8RWieDj3ZUHQqUOaEo5ZBs69rt5WAFjP4aqCIobdqOy4FdhYw1yF8Z0xFBTyc9lgPtEg=="; }; }; - "esbuild-windows-32-0.15.13" = { + "esbuild-windows-32-0.15.18" = { name = "esbuild-windows-32"; packageName = "esbuild-windows-32"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.13.tgz"; - sha512 = "XoF2iBf0wnqo16SDq+aDGi/+QbaLFpkiRarPVssMh9KYbFNCqPLlGAWwDvxEVz+ywX6Si37J2AKm+AXq1kC0JA=="; + url = "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz"; + sha512 = "o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ=="; }; }; "esbuild-windows-64-0.14.47" = { @@ -31203,13 +31572,13 @@ let sha512 = "HoN/5HGRXJpWODprGCgKbdMvrC3A2gqvzewu2eECRw2sYxOUoh2TV1tS+G7bHNapPGI79woQJGV6pFH7GH7qnA=="; }; }; - "esbuild-windows-64-0.15.13" = { + "esbuild-windows-64-0.15.18" = { name = "esbuild-windows-64"; packageName = "esbuild-windows-64"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.13.tgz"; - sha512 = "Et6htEfGycjDrtqb2ng6nT+baesZPYQIW+HUEHK4D1ncggNrDNk3yoboYQ5KtiVrw/JaDMNttz8rrPubV/fvPQ=="; + url = "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz"; + sha512 = "qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw=="; }; }; "esbuild-windows-arm64-0.14.47" = { @@ -31230,13 +31599,13 @@ let sha512 = "JQDqPjuOH7o+BsKMSddMfmVJXrnYZxXDHsoLHc0xgmAZkOOCflRmC43q31pk79F9xuyWY45jDBPolb5ZgGOf9g=="; }; }; - "esbuild-windows-arm64-0.15.13" = { + "esbuild-windows-arm64-0.15.18" = { name = "esbuild-windows-arm64"; packageName = "esbuild-windows-arm64"; - version = "0.15.13"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.13.tgz"; - sha512 = "3bv7tqntThQC9SWLRouMDmZnlOukBhOCTlkzNqzGCmrkCJI7io5LLjwJBOVY6kOUlIvdxbooNZwjtBvj+7uuVg=="; + url = "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz"; + sha512 = "q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ=="; }; }; "esc-exit-3.0.0" = { @@ -31428,22 +31797,13 @@ let sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; }; - "eslint-8.25.0" = { + "eslint-8.32.0" = { name = "eslint"; packageName = "eslint"; - version = "8.25.0"; + version = "8.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz"; - sha512 = "DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A=="; - }; - }; - "eslint-8.27.0" = { - name = "eslint"; - packageName = "eslint"; - version = "8.27.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.27.0.tgz"; - sha512 = "0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz"; + sha512 = "nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ=="; }; }; "eslint-config-prettier-6.15.0" = { @@ -31464,24 +31824,6 @@ let sha512 = "BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew=="; }; }; - "eslint-config-prettier-8.5.0" = { - name = "eslint-config-prettier"; - packageName = "eslint-config-prettier"; - version = "8.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz"; - sha512 = "obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q=="; - }; - }; - "eslint-config-standard-17.0.0" = { - name = "eslint-config-standard"; - packageName = "eslint-config-standard"; - version = "17.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz"; - sha512 = "/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg=="; - }; - }; "eslint-formatter-pretty-4.1.0" = { name = "eslint-formatter-pretty"; packageName = "eslint-formatter-pretty"; @@ -31491,13 +31833,13 @@ let sha512 = "IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ=="; }; }; - "eslint-import-resolver-node-0.3.6" = { + "eslint-import-resolver-node-0.3.7" = { name = "eslint-import-resolver-node"; packageName = "eslint-import-resolver-node"; - version = "0.3.6"; + version = "0.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz"; - sha512 = "0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw=="; + url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz"; + sha512 = "gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA=="; }; }; "eslint-loader-2.2.1" = { @@ -31518,76 +31860,31 @@ let sha512 = "j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA=="; }; }; - "eslint-plugin-es-3.0.1" = { - name = "eslint-plugin-es"; - packageName = "eslint-plugin-es"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz"; - sha512 = "GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ=="; - }; - }; - "eslint-plugin-es-4.1.0" = { - name = "eslint-plugin-es"; - packageName = "eslint-plugin-es"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz"; - sha512 = "GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ=="; - }; - }; - "eslint-plugin-html-7.1.0" = { - name = "eslint-plugin-html"; - packageName = "eslint-plugin-html"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-7.1.0.tgz"; - sha512 = "fNLRraV/e6j8e3XYOC9xgND4j+U7b1Rq+OygMlLcMg+wI/IpVbF+ubQa3R78EjKB9njT6TQOlcK5rFKBVVtdfg=="; - }; - }; - "eslint-plugin-import-2.26.0" = { + "eslint-plugin-import-2.27.5" = { name = "eslint-plugin-import"; packageName = "eslint-plugin-import"; - version = "2.26.0"; + version = "2.27.5"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz"; - sha512 = "hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA=="; + url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz"; + sha512 = "LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow=="; }; }; - "eslint-plugin-jsx-a11y-6.6.1" = { + "eslint-plugin-jsx-a11y-6.7.1" = { name = "eslint-plugin-jsx-a11y"; packageName = "eslint-plugin-jsx-a11y"; - version = "6.6.1"; + version = "6.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz"; - sha512 = "sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q=="; + url = "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz"; + sha512 = "63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA=="; }; }; - "eslint-plugin-n-15.5.0" = { - name = "eslint-plugin-n"; - packageName = "eslint-plugin-n"; - version = "15.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.5.0.tgz"; - sha512 = "VCqQiZDpdm1Q9grnvy+XsENZoXDgTLqPHRQwgl9qFNNgTKR4YEnQOMN0pFB/9TbmrQ88jdeTnqTcNwRvjqMOtg=="; - }; - }; - "eslint-plugin-no-unsanitized-4.0.1" = { + "eslint-plugin-no-unsanitized-4.0.2" = { name = "eslint-plugin-no-unsanitized"; packageName = "eslint-plugin-no-unsanitized"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - 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-node-11.1.0" = { - name = "eslint-plugin-node"; - packageName = "eslint-plugin-node"; - version = "11.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz"; - sha512 = "oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g=="; + url = "https://registry.npmjs.org/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-4.0.2.tgz"; + sha512 = "Pry0S9YmHoz8NCEMRQh7N0Yexh2MYCNPIlrV52hTmS7qXnTghWsjXouF08bgsrrZqaW9tt1ZiK3j5NEmPE+EjQ=="; }; }; "eslint-plugin-prettier-3.4.1" = { @@ -31599,31 +31896,13 @@ let sha512 = "htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g=="; }; }; - "eslint-plugin-prettier-vue-4.2.0" = { - name = "eslint-plugin-prettier-vue"; - packageName = "eslint-plugin-prettier-vue"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-prettier-vue/-/eslint-plugin-prettier-vue-4.2.0.tgz"; - sha512 = "DA2oNRx+pZ6RM/EIHIPME4FQZifnkEROa55OWtTTUFGHpj53tcHomuxVP/kS/2MM+ul46GEK+jymK69STWDWoA=="; - }; - }; - "eslint-plugin-promise-6.1.1" = { - name = "eslint-plugin-promise"; - packageName = "eslint-plugin-promise"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz"; - sha512 = "tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig=="; - }; - }; - "eslint-plugin-react-7.31.10" = { + "eslint-plugin-react-7.32.1" = { name = "eslint-plugin-react"; packageName = "eslint-plugin-react"; - version = "7.31.10"; + version = "7.32.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.10.tgz"; - sha512 = "e4N/nc6AAlg4UKW/mXeYWd3R++qUano5/o+t+wnWxIf+bLsOaH3a4q74kX3nDjYym3VBN4HyO9nEn1GcAqgQOA=="; + url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.1.tgz"; + sha512 = "vOjdgyd0ZHBXNsmvU+785xY8Bfe57EFbTYYk8XrROzWpr9QBvpjITvAXt9xqcE6+8cjR/g1+mfumPToxsl1www=="; }; }; "eslint-plugin-react-hooks-4.6.0" = { @@ -31653,15 +31932,6 @@ let sha512 = "oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw=="; }; }; - "eslint-plugin-vue-9.7.0" = { - name = "eslint-plugin-vue"; - packageName = "eslint-plugin-vue"; - version = "9.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.7.0.tgz"; - sha512 = "DrOO3WZCZEwcLsnd3ohFwqCoipGRSTKTBTnLwdhqAbYZtzWl0o7D+D8ZhlmiZvABKTEl8AFsqH1GHGdybyoQmw=="; - }; - }; "eslint-rule-docs-1.1.235" = { name = "eslint-rule-docs"; packageName = "eslint-rule-docs"; @@ -31761,15 +32031,6 @@ let sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; }; }; - "eslint-webpack-plugin-3.2.0" = { - name = "eslint-webpack-plugin"; - packageName = "eslint-webpack-plugin"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz"; - sha512 = "avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w=="; - }; - }; "esmangle-evaluator-1.0.1" = { name = "esmangle-evaluator"; packageName = "esmangle-evaluator"; @@ -31824,15 +32085,6 @@ let sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; }; }; - "espree-9.4.0" = { - name = "espree"; - packageName = "espree"; - version = "9.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz"; - sha512 = "DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw=="; - }; - }; "espree-9.4.1" = { name = "espree"; packageName = "espree"; @@ -31959,22 +32211,22 @@ let sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; }; }; - "estree-util-is-identifier-name-2.0.1" = { + "estree-util-is-identifier-name-2.1.0" = { name = "estree-util-is-identifier-name"; packageName = "estree-util-is-identifier-name"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.0.1.tgz"; - sha512 = "rxZj1GkQhY4x1j/CSnybK9cGuMFQYFPLq0iNyopqf14aOVLFtMv7Esika+ObJWPWiOHuMOAHz3YkWoLYYRnzWQ=="; + url = "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.1.0.tgz"; + sha512 = "bEN9VHRyXAUOjkKVQVvArFym08BTWB0aJPppZZr0UNyAqWsLaVfAqP7hbaTJjzHifmB5ebnR8Wm7r7yGN/HonQ=="; }; }; - "estree-util-visit-1.2.0" = { + "estree-util-visit-1.2.1" = { name = "estree-util-visit"; packageName = "estree-util-visit"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/estree-util-visit/-/estree-util-visit-1.2.0.tgz"; - sha512 = "wdsoqhWueuJKsh5hqLw3j8lwFqNStm92VcwtAOAny8g/KS/l5Y8RISjR4k5W6skCj3Nirag/WUCMS0Nfy3sgsg=="; + url = "https://registry.npmjs.org/estree-util-visit/-/estree-util-visit-1.2.1.tgz"; + sha512 = "xbgqcrkIVbIG+lI/gzbvd9SGTJL4zqJKBFttUl5pP27KhAjtMKbX/mQXJ7qgyXpMgVy/zvpm0xoQQaGL8OloOw=="; }; }; "estree-walker-0.6.1" = { @@ -32283,15 +32535,6 @@ let sha512 = "6hULIO5fmncZ3CVTInnySP/ZC+Sqfdbkrhg79VCp5PMFjZdaGW6vA57qyK6/NRMZOVAbXxfopuGgps+cxHy1Ow=="; }; }; - "eventsource-1.1.2" = { - name = "eventsource"; - packageName = "eventsource"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/eventsource/-/eventsource-1.1.2.tgz"; - sha512 = "xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA=="; - }; - }; "eventsource-2.0.2" = { name = "eventsource"; packageName = "eventsource"; @@ -32301,15 +32544,6 @@ let sha512 = "IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA=="; }; }; - "eventsource-polyfill-0.9.6" = { - name = "eventsource-polyfill"; - packageName = "eventsource-polyfill"; - version = "0.9.6"; - src = fetchurl { - url = "https://registry.npmjs.org/eventsource-polyfill/-/eventsource-polyfill-0.9.6.tgz"; - sha512 = "LyMFp2oPDGhum2lMvkjqKZEwWd2/AoXyt8aoyftTBMWwPHNgU+2tdxhTHPluDxoz+z4gNj0uHAPR9nqevATMbg=="; - }; - }; "everyauth-0.4.5" = { name = "everyauth"; packageName = "everyauth"; @@ -32571,13 +32805,13 @@ let sha512 = "/wSgNMxFusiYRy1rd19LT2SQlIXDppHpumpWo06wxjflD1OYxDLbl6rMVw+U3bxD5Nuhex4TKqv9Aem4D0lVzQ=="; }; }; - "expo-47.0.1" = { + "expo-47.0.13" = { name = "expo"; packageName = "expo"; - version = "47.0.1"; + version = "47.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/expo/-/expo-47.0.1.tgz"; - sha512 = "8EP/0xdoyC7Q0/gRxmt04hIlVhbSY8Epapp+tz5PyqlDhmtdS4nwCEvghD4Ca1E/JFNGPMCanEsrwJkcZB3Beg=="; + url = "https://registry.npmjs.org/expo/-/expo-47.0.13.tgz"; + sha512 = "9VjjGdViCJ9NfWbUE7brkwFBDvKuA35V345vMtHFYNKoGJjXib36yitmawreMDQFv0kMTqTnzc7T2191Pod7Ng=="; }; }; "expo-application-5.0.1" = { @@ -32589,13 +32823,13 @@ let sha512 = "bThxK5zH/Lc2tkCvEXGjfM7ayvOVmPWYcWzXsMIU1RtG73TyXo4cq+73FvfDNIWn6gKS0WyMcmoPB3WXEV/jsw=="; }; }; - "expo-asset-8.6.2" = { + "expo-asset-8.7.0" = { name = "expo-asset"; packageName = "expo-asset"; - version = "8.6.2"; + version = "8.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/expo-asset/-/expo-asset-8.6.2.tgz"; - sha512 = "XqlXjkuUCEiojbHwbHPjQs1oboRz6w3eV96+9NBD+wb3EUqgAAYY2Do+IWyVCAl8UIFbFi3xzMiqk0Xm9+H8uQ=="; + url = "https://registry.npmjs.org/expo-asset/-/expo-asset-8.7.0.tgz"; + sha512 = "lkoNsHK6vf+outISB6/37SonXcAL6Buw0ycjiwQVFfpOBKpkQa+zw5wm1m3KwjH2txmR3xdIzcpWsJkgovYCvQ=="; }; }; "expo-constants-14.0.2" = { @@ -32652,22 +32886,22 @@ let sha512 = "S8qfaXCv//7tQWV9M+JKx3CF7ypYhDdSUbkUQdaVO/r8D76/aRTArY/aRw1yEfaAOzyK8C8diDToV1itl51DfQ=="; }; }; - "expo-modules-autolinking-1.0.0" = { + "expo-modules-autolinking-1.0.2" = { name = "expo-modules-autolinking"; packageName = "expo-modules-autolinking"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.0.0.tgz"; - sha512 = "MoRRkOVMoGUH/Lr8XS6UmBIZT/qrwbRt2IzUBALcM6MWZKtDn9Uct9XgMRxue82FJhRCfy9p1xZJVKHBRo4zEA=="; + url = "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.0.2.tgz"; + sha512 = "skAUXERKw1gtSw8xsvft9DE0KVhBvw4dujAtgCZoG2l513fN7ds+B5+30ZVgZATMC+EjtlmjKXzhp5QS44DCFA=="; }; }; - "expo-modules-core-1.0.0" = { + "expo-modules-core-1.1.1" = { name = "expo-modules-core"; packageName = "expo-modules-core"; - version = "1.0.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/expo-modules-core/-/expo-modules-core-1.0.0.tgz"; - sha512 = "QsIRXbnqBtEKQMWohSrKTSF4lASLt3wWbfvMywEkmF36cggxP66eRjBMRKQWQlaxORCAzpFFHiVBfZWN4WVsTw=="; + url = "https://registry.npmjs.org/expo-modules-core/-/expo-modules-core-1.1.1.tgz"; + sha512 = "+AcaYmaWphIfkBcccu65dyOhWnpOJ3+SQpoI4lI/Plg1nNjOLuBjmrdVvpiJOvkN+CqbNGsJ5Yll8LLk+C107Q=="; }; }; "expo-pwa-0.0.124" = { @@ -32769,15 +33003,6 @@ let sha512 = "rCSVtPXRmQSW8rmik/AIb2P0op6l7r1fMW538yyvTMltCO4xQEWMmobfrIxN2V1/mVrgxB8Az3reYF6yUZw37w=="; }; }; - "express-data-parser-1.2.0" = { - name = "express-data-parser"; - packageName = "express-data-parser"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/express-data-parser/-/express-data-parser-1.2.0.tgz"; - sha512 = "9FRXKal5lwI7U+pod88U3THo+a+BTierLeX/Xa9KbH/a/eDHGY5lAGF6qBjcdaf8pOoAthTS0tnoV7+sU4JphQ=="; - }; - }; "express-handlebars-3.1.0" = { name = "express-handlebars"; packageName = "express-handlebars"; @@ -32877,13 +33102,13 @@ let sha512 = "ytpHAAOQ/G5Nm7jyyEKzaoGiDhrUGPHeeJfyI2q7jii5dcPCLogf8EyWzSNcxAX8FZy1U6gfGY46SMmEhP3lMw=="; }; }; - "express-validator-6.14.2" = { + "express-validator-6.14.3" = { name = "express-validator"; packageName = "express-validator"; - version = "6.14.2"; + version = "6.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/express-validator/-/express-validator-6.14.2.tgz"; - sha512 = "8XfAUrQ6Y7dIIuy9KcUPCfG/uCbvREctrxf5EeeME+ulanJ4iiW71lWmm9r4YcKKYOCBMan0WpVg7FtHu4Z4Wg=="; + url = "https://registry.npmjs.org/express-validator/-/express-validator-6.14.3.tgz"; + sha512 = "c4b9NMdhskfcLbH/FchsSfCt4Vb14gKzcotG9zLS+VoOJDox57aGhCL+kmAu7cl+ytaSed+HD5jdJhel8DQsdg=="; }; }; "express-ws-2.0.0" = { @@ -33210,15 +33435,6 @@ let sha512 = "wdRazMMeM2pl8hq1lFG8fzix8p1VLAJunTTE2RADiFBwbUfZwybUm6IwPrmMS7qTthiayr166NoXeqWe3hfR5w=="; }; }; - "fast-clone-1.5.13" = { - name = "fast-clone"; - packageName = "fast-clone"; - version = "1.5.13"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-clone/-/fast-clone-1.5.13.tgz"; - sha512 = "0ez7coyFBQFjZtId+RJqJ+EQs61w9xARfqjqK0AD9vIUkSxWD4HvPt80+5evebZ1tTnv1GYKrPTipx7kOW5ipA=="; - }; - }; "fast-copy-3.0.0" = { name = "fast-copy"; packageName = "fast-copy"; @@ -33381,13 +33597,13 @@ let sha512 = "Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw=="; }; }; - "fast-plist-0.1.2" = { + "fast-plist-0.1.3" = { name = "fast-plist"; packageName = "fast-plist"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-plist/-/fast-plist-0.1.2.tgz"; - sha512 = "2HxzrqJhmMoxVzARjYFvkzkL2dCBB8sogU5sD8gqcZWv5UCivK9/cXM9KIPDRwU+eD3mbRDN/GhW8bO/4dtMfg=="; + url = "https://registry.npmjs.org/fast-plist/-/fast-plist-0.1.3.tgz"; + sha512 = "d9cEfo/WcOezgPLAC/8t8wGb6YOD6JTCPMw2QcG2nAdFmyY+9rTUizCTaGjIZAloWENTEUMAPpkUAIJJJ0i96A=="; }; }; "fast-readable-async-iterator-1.1.1" = { @@ -33507,13 +33723,13 @@ let sha512 = "5DtIKh6vtOmEGkYdEPNNb+mxeYCnBiKbK3s4gq52l6cX8I5QaTDWWw0Wx/iYo80fVOblSycHu1/iJeqeNxG8Jw=="; }; }; - "fastq-1.13.0" = { + "fastq-1.15.0" = { name = "fastq"; packageName = "fastq"; - version = "1.13.0"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"; - sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz"; + sha512 = "wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw=="; }; }; "fault-1.0.4" = { @@ -33543,15 +33759,6 @@ let sha512 = "36frUeNww/TF3mMCSyLMjSy0BLD+ZURrmev6M/Tf1Q+Bu8K1Bk1tHJI9Uf2+di8oxe/38Xzo37Mi4EGaekbrAg=="; }; }; - "faye-websocket-0.10.0" = { - name = "faye-websocket"; - packageName = "faye-websocket"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; - sha512 = "Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ=="; - }; - }; "faye-websocket-0.11.4" = { name = "faye-websocket"; packageName = "faye-websocket"; @@ -33642,15 +33849,6 @@ let sha512 = "BtE53+jaa7nNHT+gPdfU6cFAXOJUWDs2b5GFox8dtl6zLXmfNf/N6im69b9nqNNwDyl27mpIWX8qR7AafWzSdQ=="; }; }; - "feature-policy-0.3.0" = { - name = "feature-policy"; - packageName = "feature-policy"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/feature-policy/-/feature-policy-0.3.0.tgz"; - sha512 = "ZtijOTFN7TzCujt1fnNhfWPFPSHeZkesff9AXZj+UEjYBynWNUIYpC87Ve4wHzyexQsImicLu7WsC2LHq7/xrQ=="; - }; - }; "fecha-4.2.3" = { name = "fecha"; packageName = "fecha"; @@ -33768,6 +33966,15 @@ let sha512 = "Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA=="; }; }; + "figures-3.0.0" = { + name = "figures"; + packageName = "figures"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-3.0.0.tgz"; + sha512 = "HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g=="; + }; + }; "figures-3.2.0" = { name = "figures"; packageName = "figures"; @@ -33849,15 +34056,6 @@ let sha512 = "aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA=="; }; }; - "file-loader-6.0.0" = { - name = "file-loader"; - packageName = "file-loader"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz"; - sha512 = "/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ=="; - }; - }; "file-loader-6.2.0" = { name = "file-loader"; packageName = "file-loader"; @@ -33876,15 +34074,6 @@ let sha512 = "WhYlIPdaYeE6/Pow1Js4QwRQBVXRoRWCZxPLL/YrzUwsZHT8fZuBxP8zZHawLQ8HxwORumP+CoRVuUxkAJD0dw=="; }; }; - "file-saver-2.0.5" = { - name = "file-saver"; - packageName = "file-saver"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz"; - sha512 = "P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="; - }; - }; "file-stream-rotator-0.6.1" = { name = "file-stream-rotator"; packageName = "file-stream-rotator"; @@ -33984,6 +34173,15 @@ let sha512 = "qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ=="; }; }; + "file-type-9.0.0" = { + name = "file-type"; + packageName = "file-type"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-9.0.0.tgz"; + sha512 = "Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw=="; + }; + }; "file-uri-to-path-1.0.0" = { name = "file-uri-to-path"; packageName = "file-uri-to-path"; @@ -34056,13 +34254,13 @@ let sha512 = "hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg=="; }; }; - "filesize-10.0.5" = { + "filesize-10.0.6" = { name = "filesize"; packageName = "filesize"; - version = "10.0.5"; + version = "10.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-10.0.5.tgz"; - sha512 = "qrzyt8gLh86nsyYiC3ibI5KyIYRCWg2yqIklYrWF4a0qNfekik4OQfn7AoPJG2hRrPMSlH6fET4VEITweZAzjA=="; + url = "https://registry.npmjs.org/filesize/-/filesize-10.0.6.tgz"; + sha512 = "rzpOZ4C9vMFDqOa6dNpog92CoLYjD79dnjLk2TYDDtImRIyLTOzqojCb05Opd1WuiWjs+fshhCgTd8cl7y5t+g=="; }; }; "filesize-3.6.1" = { @@ -34074,15 +34272,6 @@ let sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; }; }; - "filesize-6.1.0" = { - name = "filesize"; - packageName = "filesize"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz"; - sha512 = "LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg=="; - }; - }; "filesize-6.4.0" = { name = "filesize"; packageName = "filesize"; @@ -34092,15 +34281,6 @@ let sha512 = "mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ=="; }; }; - "filesize-8.0.7" = { - name = "filesize"; - packageName = "filesize"; - version = "8.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz"; - sha512 = "pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ=="; - }; - }; "fill-range-2.2.4" = { name = "fill-range"; packageName = "fill-range"; @@ -34245,13 +34425,13 @@ let sha512 = "wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig=="; }; }; - "find-replace-1.0.3" = { + "find-replace-3.0.0" = { name = "find-replace"; packageName = "find-replace"; - version = "1.0.3"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/find-replace/-/find-replace-1.0.3.tgz"; - sha512 = "KrUnjzDCD9426YnCP56zGYy/eieTnhtK6Vn++j+JJzmlsWWwEkDnsyVF575spT6HJ6Ow9tlbT3TQTDsa+O4UWA=="; + url = "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz"; + sha512 = "6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ=="; }; }; "find-requires-1.0.0" = { @@ -34416,6 +34596,15 @@ let sha512 = "LNRvR4hr/S8cXXkIY5pTgVP7L3tq6LlYWcg9nWBuW7o1NMxKZo6oOVa/6GIekMGI0Iw7uC+HWimMe9u/VAeKqw=="; }; }; + "fix-esm-1.0.1" = { + name = "fix-esm"; + packageName = "fix-esm"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fix-esm/-/fix-esm-1.0.1.tgz"; + sha512 = "EZtb7wPXZS54GaGxaWxMlhd1DUDCnAg5srlYdu/1ZVeW+7wwR3Tp59nu52dXByFs3MBRq+SByx1wDOJpRvLEXw=="; + }; + }; "fkill-7.2.1" = { name = "fkill"; packageName = "fkill"; @@ -34425,13 +34614,13 @@ let sha512 = "eN9cmsIlRdq06wu3m01OOEgQf5Xh/M7REm0jfZ4eL3V3XisjXzfRq3iyqtKS+FhO6wB36FvWRiRGdeSx5KpLAQ=="; }; }; - "fkill-8.0.1" = { + "fkill-8.1.0" = { name = "fkill"; packageName = "fkill"; - version = "8.0.1"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-8.0.1.tgz"; - sha512 = "ZWAKbgy3pphXWCBfdNS03zXaS16SnTWaD1+n471XSUJ+K5kpFpzZsvRatfUqH8Jwt9wHzZIVIKS+o5Gblqo7PQ=="; + url = "https://registry.npmjs.org/fkill/-/fkill-8.1.0.tgz"; + sha512 = "XrPKdURVYoXerpYx+zhhaXrO9vHVflnGD4JhwjOwg03vKwyOH6eZ+EY69aKDD+q1EbCzviVmD+9OG9rwQy+z/A=="; }; }; "flagged-respawn-1.0.1" = { @@ -34533,22 +34722,13 @@ let sha512 = "d+9na7t9FyH8gBJoNDSi28mE4NgQVGGvxQ4aHtFRetjyh5SXjuus+V5EZaxFmFdXVemSOrx0lsgEl/ZMjnOWJA=="; }; }; - "flow-parser-0.192.0" = { + "flow-parser-0.198.2" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.192.0"; + version = "0.198.2"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.192.0.tgz"; - sha512 = "FLyei0ikf4ab9xlg+05WNmdpOODiH9XVBuw7iI9OZyjIo+cX2L2OUPTovjbWLYLlI41oGTcprbKdB/f9XwBnKw=="; - }; - }; - "flow-remove-types-2.192.0" = { - name = "flow-remove-types"; - packageName = "flow-remove-types"; - version = "2.192.0"; - src = fetchurl { - url = "https://registry.npmjs.org/flow-remove-types/-/flow-remove-types-2.192.0.tgz"; - sha512 = "EWKpgTjeajtI4XuCDtYmLZdjrBc4AjfCed8bn3wfUY7JEfno/KMr519Ev4sc/xwFqu5Qw6auWIGd9FlQrLYHMA=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.198.2.tgz"; + sha512 = "tCQzqXbRAz0ZadIhAXGwdp/xsusADo8IK9idgc/2qCK5RmazbKDGedyykfRtzWgy7Klt4f4NZxq0o/wFUg6plQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -34560,13 +34740,13 @@ let sha512 = "IZTB4kq5GK0DPp7sGQ0q/BWurGHffRtQQwVkiqDgeO6wYJLLV5ZhgNOQ65loZxxuPMKZKZcICCUnaGtlxBiR0Q=="; }; }; - "fluent-syntax-0.13.0" = { + "fluent-syntax-0.14.0" = { name = "fluent-syntax"; packageName = "fluent-syntax"; - version = "0.13.0"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.13.0.tgz"; - sha512 = "0Bk1AsliuYB550zr4JV9AYhsETsD3ELXUQzdXGJfIc1Ni/ukAfBdQInDhVMYJUaT2QxoamNslwkYF7MlOrPUwg=="; + url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.14.0.tgz"; + sha512 = "+k8uXWfRpSrE33764RbpjIKMzIX6R9EnSjFBgaA1s0Mboc3KnW9sYe0c6vjIoZQY1C4Gst1VFvAOP6YGJjTJuA=="; }; }; "flumecodec-0.0.0" = { @@ -34839,22 +35019,13 @@ let sha512 = "DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ=="; }; }; - "fork-ts-checker-webpack-plugin-4.1.6" = { + "fork-ts-checker-webpack-plugin-7.2.14" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "4.1.6"; + version = "7.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz"; - sha512 = "DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw=="; - }; - }; - "fork-ts-checker-webpack-plugin-7.2.13" = { - name = "fork-ts-checker-webpack-plugin"; - packageName = "fork-ts-checker-webpack-plugin"; - version = "7.2.13"; - src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.13.tgz"; - sha512 = "fR3WRkOb4bQdWB/y7ssDUlVdrclvwtyCUIHCfivAoYxq9dF7XfrDKbMdZIfwJ7hxIAqkYSGeU7lLJE6xrxIBdg=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.14.tgz"; + sha512 = "Tg2feh/n8k486KX0EbXVUfJj3j0xnnbKYTJw0fnIb2QdV0+lblOYZSal5ed9hARoWVwKeOC7sYE2EakSRLo5ZA=="; }; }; "fork-ts-checker-webpack-plugin-v5-5.2.1" = { @@ -34929,13 +35100,13 @@ let sha512 = "qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A=="; }; }; - "form-data-encoder-2.1.3" = { + "form-data-encoder-2.1.4" = { name = "form-data-encoder"; packageName = "form-data-encoder"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.3.tgz"; - sha512 = "KqU0nnPMgIJcCOFTNJFEA8epcseEaoox4XZffTgy8jlI6pL/5EFyR54NRG7CnCJN0biY7q52DO3MH6/sJ/TKlQ=="; + url = "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz"; + sha512 = "yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw=="; }; }; "form-urlencoded-4.5.1" = { @@ -35010,13 +35181,13 @@ let sha512 = "KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ=="; }; }; - "formidable-2.0.1" = { + "formidable-2.1.2" = { name = "formidable"; packageName = "formidable"; - version = "2.0.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-2.0.1.tgz"; - sha512 = "rjTMNbp2BpfQShhFbR3Ruk3qk2y9jKpvMW78nJgx8QKtxjDVrwbZG+wvDOmVbifHyOUOQJXxqEy6r0faRrPzTQ=="; + url = "https://registry.npmjs.org/formidable/-/formidable-2.1.2.tgz"; + sha512 = "CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g=="; }; }; "forwarded-0.1.2" = { @@ -35226,6 +35397,15 @@ let sha512 = "oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="; }; }; + "fs-extra-11.1.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "11.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz"; + sha512 = "0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw=="; + }; + }; "fs-extra-3.0.1" = { name = "fs-extra"; packageName = "fs-extra"; @@ -35325,6 +35505,15 @@ let sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; }; }; + "fs-minipass-3.0.0" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.0.tgz"; + sha512 = "EUojgQaSPy6sxcqcZgQv6TVF6jiKvurji3AxhAivs/Ep4O1UpS8TusaxpybfFHZ2skRhLqzk6WR8nqNYIMMDeA=="; + }; + }; "fs-mkdirp-stream-1.0.0" = { name = "fs-mkdirp-stream"; packageName = "fs-mkdirp-stream"; @@ -35577,22 +35766,22 @@ let sha512 = "w4n9cPWyP7aHxKxYHFQMegj7WIAsL/YX/C4Bs5Rr8s1H9M1rNtRWRsw+ovYMkXDQ5S4ZbYHsHAPmevPjPgw44w=="; }; }; - "gatsby-core-utils-3.24.0" = { + "gatsby-core-utils-4.5.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "3.24.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.24.0.tgz"; - sha512 = "P4tbcYOJ1DSYKRP4gIAR9Xta/d/AzjmsK2C6PzX7sNcGnviDKtAIoeV9sE0kNXOqBfUCez25zmAi2cq8NlaxKw=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-4.5.0.tgz"; + sha512 = "8ckCNXB7iasqLLoBTJLDzXwUcJ/cNUZVHo3+3cyMA9CLc8pfZiXtlp5qaOl0J+Q1qdorfENAnTvNEddXABfIZw=="; }; }; - "gatsby-telemetry-3.24.0" = { + "gatsby-telemetry-4.5.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "3.24.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.24.0.tgz"; - sha512 = "ioBzkmImRuyEAGtnyJgpln4LKTQ61MAjFaU+SFLVKDATcVh86rfNbD2ks5DzZgCtsP1/zVmHv2a7s4z/TQCZjA=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-4.5.0.tgz"; + sha512 = "0lus63TNQXjlr4IwCyxtW+m7eP6RkOpzLB+KJ1eohuCTVPFsmxhtr4N1Kjub/Ip0IG1RtzNA0LW0xPg7ykJa7g=="; }; }; "gauge-1.2.7" = { @@ -35685,13 +35874,13 @@ let sha512 = "x850LS5N7V1F3UcV7PoupzGsyD6iVwTVvsh3tbXfkctZnBnjW5yu5z1/3k3SehF7TyoTIe78rJs02GMMy+LF+A=="; }; }; - "gcp-metadata-5.0.1" = { + "gcp-metadata-5.2.0" = { name = "gcp-metadata"; packageName = "gcp-metadata"; - version = "5.0.1"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.0.1.tgz"; - sha512 = "jiRJ+Fk7e8FH68Z6TLaqwea307OktJpDjmYnU7/li6ziwvVvU2RlrCyQo5vkdeP94chm0kcSCOOszvmuaioq3g=="; + url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.2.0.tgz"; + sha512 = "aFhhvvNycky2QyhG+dcfEdHBF0FRbYcf39s6WNHUDysKSrbJ5vuFbjydxBcmewtXeV248GP8dWT3ByPNxsyHCw=="; }; }; "gelf-stream-1.1.1" = { @@ -35766,13 +35955,13 @@ let sha512 = "ys3h0hiteRwmY6BsvSttPmkhC0vEQHPJduANBRtH/dlDPZ0UBIb/dXy80IcckXyuQ6LKg+PloRqvGER9IS7F7g=="; }; }; - "gensequence-4.0.2" = { + "gensequence-4.0.3" = { name = "gensequence"; packageName = "gensequence"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/gensequence/-/gensequence-4.0.2.tgz"; - sha512 = "mQiFskYFPFDSUpBJ/n3ebAV2Ufu6DZGvUPXzyWYzFfJr6/DyOOZVnjx6VTWE4y0RLvYWnc5tZq5sCjzEWhRjqQ=="; + url = "https://registry.npmjs.org/gensequence/-/gensequence-4.0.3.tgz"; + sha512 = "izr+MKqJKjexkvLiPGhW96elQX8TuUR/su/xzILxjqzU1RDz1n1ZbqwDUnNFaRcq0gFR3oQfNH2JOH4Je1x/QA=="; }; }; "gensync-1.0.0-beta.2" = { @@ -35784,24 +35973,6 @@ let sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; }; - "geojson-flatten-1.1.1" = { - name = "geojson-flatten"; - packageName = "geojson-flatten"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/geojson-flatten/-/geojson-flatten-1.1.1.tgz"; - sha512 = "k/6BCd0qAt7vdqdM1LkLfAy72EsLDy0laNwX0x2h49vfYCiQkRc4PSra8DNEdJ10EKRpwEvDXMb0dBknTJuWpQ=="; - }; - }; - "geojson-vt-3.2.1" = { - name = "geojson-vt"; - packageName = "geojson-vt"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz"; - sha512 = "EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg=="; - }; - }; "get-assigned-identifiers-1.2.0" = { name = "get-assigned-identifiers"; packageName = "get-assigned-identifiers"; @@ -35865,13 +36036,13 @@ let sha512 = "Qkn9eq6tW5/q9BDVdMpB8tOHljX9OSP0jRC5TRNVA4qRc839t4g8KQaR8t0Uv0EFVL0MlyG7m/ofjEgAROtYsA=="; }; }; - "get-intrinsic-1.1.3" = { + "get-intrinsic-1.2.0" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; - sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz"; + sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="; }; }; "get-package-info-1.0.0" = { @@ -36117,6 +36288,15 @@ let sha512 = "0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng=="; }; }; + "gifwrap-0.9.4" = { + name = "gifwrap"; + packageName = "gifwrap"; + version = "0.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gifwrap/-/gifwrap-0.9.4.tgz"; + sha512 = "MDMwbhASQuVeD4JKd1fKgNgCRL3fGqMM4WaqpNhWO0JiMOAjbQdumbs4BbBZEy9/M00EHEjKN3HieVhCUlwjeQ=="; + }; + }; "git-clone-0.1.0" = { name = "git-clone"; packageName = "git-clone"; @@ -36198,6 +36378,15 @@ let sha512 = "GfoNlkMugaJIP9/2JCxa0aVbzah596hbi5oB346cJB9eos3SmfFkPWiabKrRQv9oYdJAOjwFmumaRhJw4FW04A=="; }; }; + "git-repo-info-2.1.1" = { + name = "git-repo-info"; + packageName = "git-repo-info"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/git-repo-info/-/git-repo-info-2.1.1.tgz"; + sha512 = "8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg=="; + }; + }; "git-semver-tags-4.1.1" = { name = "git-semver-tags"; packageName = "git-semver-tags"; @@ -36306,6 +36495,15 @@ let sha512 = "7TTrRjxblSI5l6adk9zd+cV5d6i1OrJSo3Vr9xdGqFLBQo0mz5P9eIfKCDJ7eekVGGFLbce0qbPSnktXV2BjDQ=="; }; }; + "giturl-1.0.1" = { + name = "giturl"; + packageName = "giturl"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/giturl/-/giturl-1.0.1.tgz"; + sha512 = "wQourBdI13n8tbjcZTDl6k+ZrCRMU6p9vfp9jknZq+zfWc8xXNztpZFM4XkPHVzHcMSUZxEMYYKZjIGkPlei6Q=="; + }; + }; "gl-matrix-2.8.1" = { name = "gl-matrix"; packageName = "gl-matrix"; @@ -36315,15 +36513,6 @@ let sha512 = "0YCjVpE3pS5XWlN3J4X7AiAx65+nqAI54LndtVFnQZB6G/FVLkZH8y8V6R3cIoOQR4pUdfwQGd1iwyoXHJ4Qfw=="; }; }; - "gl-matrix-3.4.3" = { - name = "gl-matrix"; - packageName = "gl-matrix"; - version = "3.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz"; - sha512 = "wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA=="; - }; - }; "glob-3.2.11" = { name = "glob"; packageName = "glob"; @@ -36360,6 +36549,15 @@ let sha512 = "3tbJl15hKbgLoSBcHv5WCCrrMnjdXsholv2YfBgX53Tx6IRkZIJdLDVROiFtl7WT70jbzFd8yxgwZlx1p0iQdg=="; }; }; + "glob-7.0.6" = { + name = "glob"; + packageName = "glob"; + version = "7.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; + sha512 = "f8c0rE8JiCxpa52kWPAOa3ZaYEnzofDzCQLCn3Vdk0Z5OVLq3BsRFJI4S4ykpeVW6QMGBUkMeUpoEgWnMTnw5Q=="; + }; + }; "glob-7.1.2" = { name = "glob"; packageName = "glob"; @@ -36432,6 +36630,15 @@ let sha512 = "ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ=="; }; }; + "glob-8.1.0" = { + name = "glob"; + packageName = "glob"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz"; + sha512 = "r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ=="; + }; + }; "glob-base-0.3.0" = { name = "glob-base"; packageName = "glob-base"; @@ -36441,6 +36648,15 @@ let sha512 = "ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA=="; }; }; + "glob-escape-0.0.2" = { + name = "glob-escape"; + packageName = "glob-escape"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-escape/-/glob-escape-0.0.2.tgz"; + sha512 = "L/cXYz8x7qer1HAyUQ+mbjcUsJVdpRxpAf7CwqHoNBs9vTpABlGfNN4tzkDxt+u3Z7ZncVyKlCNPtzb0R/7WbA=="; + }; + }; "glob-option-error-1.0.0" = { name = "glob-option-error"; packageName = "glob-option-error"; @@ -36594,13 +36810,13 @@ let sha512 = "MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ=="; }; }; - "global-dirs-3.0.0" = { + "global-dirs-3.0.1" = { name = "global-dirs"; packageName = "global-dirs"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz"; - sha512 = "v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA=="; + url = "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz"; + sha512 = "NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA=="; }; }; "global-https://github.com/component/global/archive/v2.0.1.tar.gz" = { @@ -36703,13 +36919,13 @@ let sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; }; }; - "globals-13.17.0" = { + "globals-13.20.0" = { name = "globals"; packageName = "globals"; - version = "13.17.0"; + version = "13.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz"; - sha512 = "1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw=="; + url = "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz"; + sha512 = "Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ=="; }; }; "globals-9.18.0" = { @@ -36766,13 +36982,22 @@ let sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; - "globby-13.1.2" = { + "globby-12.2.0" = { name = "globby"; packageName = "globby"; - version = "13.1.2"; + version = "12.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-13.1.2.tgz"; - sha512 = "LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ=="; + url = "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz"; + sha512 = "wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA=="; + }; + }; + "globby-13.1.3" = { + name = "globby"; + packageName = "globby"; + version = "13.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz"; + sha512 = "8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw=="; }; }; "globby-4.1.0" = { @@ -36883,13 +37108,13 @@ let sha512 = "YSwLaGMOgSBx9roJlNLL12c+FRiw7VECphinc6mGucphc/ZxTHgdEz6gmJqH6NOzYEd/yr64hwjom5pZ+tJVpg=="; }; }; - "goldengate-11.4.0" = { + "goldengate-12.0.2" = { name = "goldengate"; packageName = "goldengate"; - version = "11.4.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/goldengate/-/goldengate-11.4.0.tgz"; - sha512 = "52jwM8k5xzv7DhdXQDSfhoHbQsY+jY5Rwsj4fd3V7z2bSefpdxPE0SqQRcATaY7+FJpfng+tGMdG/X2IsnnUPA=="; + url = "https://registry.npmjs.org/goldengate/-/goldengate-12.0.2.tgz"; + sha512 = "FrGuJWxYqWfptGEHkXQkR4CvLOOvbJL9cgPyiGGwtRMJCuUgJHyEdhkTVjQYbOl6pdXFTR9EHd9wkXHeA6zmGw=="; }; }; "gonzales-pe-4.3.0" = { @@ -36910,13 +37135,13 @@ let sha512 = "5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA=="; }; }; - "google-auth-library-8.6.0" = { + "google-auth-library-8.7.0" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "8.6.0"; + version = "8.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-8.6.0.tgz"; - sha512 = "y6bw1yTWMVgs1vGJwBZ3uu+uIClfgxQfsEVcTNKjQeNQOVwox69+ZUgTeTAzrh+74hBqrk1gWyb9RsQVDI7seg=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-8.7.0.tgz"; + sha512 = "1M0NG5VDIvJZEnstHbRdckLZESoJwguinwN8Dhae0j2ZKIQFIV63zxm6Fo6nM4xkgqUr2bbMtV5Dgo+Hy6oo0Q=="; }; }; "google-gax-3.5.2" = { @@ -36946,15 +37171,6 @@ let sha512 = "WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ=="; }; }; - "google-protobuf-3.21.2" = { - name = "google-protobuf"; - packageName = "google-protobuf"; - version = "3.21.2"; - src = fetchurl { - url = "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.2.tgz"; - sha512 = "3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA=="; - }; - }; "googleapis-84.0.0" = { name = "googleapis"; packageName = "googleapis"; @@ -37045,13 +37261,22 @@ let sha512 = "o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ=="; }; }; - "got-12.5.2" = { + "got-11.8.6" = { name = "got"; packageName = "got"; - version = "12.5.2"; + version = "11.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-12.5.2.tgz"; - sha512 = "guHGMSEcsA5m1oPRweXUJnug0vuvlkX9wx5hzOka+ZBrBUOJHU0Z1JcNu3QE5IPGnA5aXUsQHdWOD4eJg9/v3A=="; + url = "https://registry.npmjs.org/got/-/got-11.8.6.tgz"; + sha512 = "6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g=="; + }; + }; + "got-12.5.3" = { + name = "got"; + packageName = "got"; + version = "12.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-12.5.3.tgz"; + sha512 = "8wKnb9MGU8IPGRIo+/ukTy9XLJBwDiCpIf5TVzQ9Cpol50eMTpBq2GAuDsuDIz7hTYmZgMgC1e9ydr6kSDWs3w=="; }; }; "got-3.3.1" = { @@ -37081,15 +37306,6 @@ let sha512 = "Y/K3EDuiQN9rTZhBvPRWMLXIKdeD1Rj0nzunfoi0Yyn5WBEbzxXKU9Ub2X41oZBagVWOBU3MuDonFMgPWQFnwg=="; }; }; - "got-7.1.0" = { - name = "got"; - packageName = "got"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-7.1.0.tgz"; - sha512 = "Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw=="; - }; - }; "got-8.3.2" = { name = "got"; packageName = "got"; @@ -37126,6 +37342,15 @@ let sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; }; }; + "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=="; + }; + }; "graceful-readlink-1.0.1" = { name = "graceful-readlink"; packageName = "graceful-readlink"; @@ -37153,22 +37378,13 @@ let sha512 = "vH2bsdjoJLQ33sZCquG1GyiFyK+Qk8n04NzqHLWTnY9l8lg08AGUyA8ZgeZHdi3I81nrdcGO13V9qYyP6sdshw=="; }; }; - "grammy-1.11.2" = { + "grammy-1.13.1" = { name = "grammy"; packageName = "grammy"; - version = "1.11.2"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/grammy/-/grammy-1.11.2.tgz"; - sha512 = "R6NlxOAfd3H4eMBU96ARi/kwZXzc3Z8Pj/g7cxmclPsxSXTHItRkY8eagS1Ol1l/CxCkEvQzHslIE9/dZSrqTQ=="; - }; - }; - "grammy-1.12.0" = { - name = "grammy"; - packageName = "grammy"; - version = "1.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/grammy/-/grammy-1.12.0.tgz"; - sha512 = "/2Mi4MyVPeFXjTd4v3pRK8gb/YdWFbZrj/8HTp5daQyTOx4/U95XFL0Ao+e9hf4XbL7RCOpanXaTL8+UXXcNqw=="; + url = "https://registry.npmjs.org/grammy/-/grammy-1.13.1.tgz"; + sha512 = "kAxja6QDjw5oTJOFtrqhaQlLfCco3AwO4Mb4YRdP8A+v59roJA8mgEd0S5dOgFPyn74bPp8VWaKCI+of8wnPow=="; }; }; "grant-4.7.0" = { @@ -37225,13 +37441,13 @@ let sha512 = "KNdgwG0dbVjhJqRUw0OivJ5pkUHunbk4vDatwdfITfNvPugX0xR327ZKsaOcr3snbiBJfyGu7lCrXeYp4KF8YA=="; }; }; - "graphology-types-0.24.5" = { + "graphology-types-0.24.7" = { name = "graphology-types"; packageName = "graphology-types"; - version = "0.24.5"; + version = "0.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/graphology-types/-/graphology-types-0.24.5.tgz"; - sha512 = "m8FVoj9b6MwIaTN+/AvoxXhcK5n0uSe7ZnhbQNTcjh94vzN6m5hU501LihtCfRjF35QEMVrXYOrTNO0wAR1Gxw=="; + url = "https://registry.npmjs.org/graphology-types/-/graphology-types-0.24.7.tgz"; + sha512 = "tdcqOOpwArNjEr0gNQKCXwaNCWnQJrog14nJNQPeemcLnXQUUGrsCWpWkVKt46zLjcS6/KGoayeJfHHyPDlvwA=="; }; }; "graphql-0.11.7" = { @@ -37306,22 +37522,22 @@ let sha512 = "Uiu3X7+s5c056WyrvdZVz2vG1fhAipMlYmtiCU/4Z2mX79OXDr1SqIon2MprC/pExIWJfAQZCcjYDY76fPBUQg=="; }; }; - "graphql-config-4.3.6" = { + "graphql-config-4.4.0" = { name = "graphql-config"; packageName = "graphql-config"; - version = "4.3.6"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-config/-/graphql-config-4.3.6.tgz"; - sha512 = "i7mAPwc0LAZPnYu2bI8B6yXU5820Wy/ArvmOseDLZIu0OU1UTULEuexHo6ZcHXeT9NvGGaUPQZm8NV3z79YydA=="; + url = "https://registry.npmjs.org/graphql-config/-/graphql-config-4.4.0.tgz"; + sha512 = "QUrX7R4htnTBTi83a0IlIilWVfiLEG8ANFlHRcxoZiTvOXTbgan67SUdGe1OlopbDuyNgtcy4ladl3Gvk4C36A=="; }; }; - "graphql-language-service-5.1.0" = { + "graphql-language-service-5.1.1" = { name = "graphql-language-service"; packageName = "graphql-language-service"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-5.1.0.tgz"; - sha512 = "APffigZ/l2me6soek+Yq5Us3HBwmfw4vns4QoqsTePXkK3knVO8rn0uAC6PmTyglb1pmFFPbYaRIzW4wmcnnGQ=="; + url = "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-5.1.1.tgz"; + sha512 = "gpaDT9E3+3eWhoqO4C81CGhkzr7Vp2jH/eq+ykoUbgfvMEpqhGTfCeNmrf+S4K/+4WTkAAJBsYT0/ZPZkqe/Hg=="; }; }; "graphql-language-service-interface-2.10.2" = { @@ -37342,13 +37558,13 @@ let sha512 = "duDE+0aeKLFVrb9Kf28U84ZEHhHcvTjWIT6dJbIAQJWBaDoht0D4BK9EIhd94I3DtKRc1JCJb2+70y1lvP/hiA=="; }; }; - "graphql-language-service-server-2.9.2" = { + "graphql-language-service-server-2.9.5" = { name = "graphql-language-service-server"; packageName = "graphql-language-service-server"; - version = "2.9.2"; + version = "2.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.9.2.tgz"; - sha512 = "AmgdMLNa9P6uyg1Ct1Jq+i+otAy1i0/jzzbatNdxpiznh4wQ3CTdfw2hRhg9K//EeOHvrmtDzu/Z9HtDM5R4Cw=="; + url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.9.5.tgz"; + sha512 = "u4X6mgoB5ufp64h9vT5UsFgQZ8GsbIIGLHfr/vndujlVpY+iHml9ea1o8on2c9i1LpB/ILa2zF90pJkBQgASfg=="; }; }; "graphql-language-service-types-1.8.7" = { @@ -37441,15 +37657,6 @@ let sha512 = "5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q=="; }; }; - "grid-index-1.1.0" = { - name = "grid-index"; - packageName = "grid-index"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz"; - sha512 = "HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA=="; - }; - }; "gridsome-helper-json-1.0.3" = { name = "gridsome-helper-json"; packageName = "gridsome-helper-json"; @@ -37882,6 +38089,15 @@ let sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; }; }; + "has-proto-1.0.1" = { + name = "has-proto"; + packageName = "has-proto"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz"; + sha512 = "7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="; + }; + }; "has-symbol-support-x-1.4.2" = { name = "has-symbol-support-x"; packageName = "has-symbol-support-x"; @@ -38017,6 +38233,15 @@ let sha512 = "WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg=="; }; }; + "hash-wasm-4.9.0" = { + name = "hash-wasm"; + packageName = "hash-wasm"; + version = "4.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-wasm/-/hash-wasm-4.9.0.tgz"; + sha512 = "7SW7ejyfnRxuOc7ptQHSf4LDoZaWOivfzqw+5rpcQku0nHfmicPKE51ra9BiRLAmT8+gGLestr1XroUkqdjL6w=="; + }; + }; "hash.js-1.1.7" = { name = "hash.js"; packageName = "hash.js"; @@ -38071,13 +38296,13 @@ let sha512 = "JQMW+TJe0UAIXZMjCJ4Wf6ayDV9Yv3PBDPsHD4ExBpAspJ6MOcCX+nzVF+UJVv7OqPcg852WEMSHQPoRA+FVSw=="; }; }; - "hast-util-embedded-2.0.0" = { + "hast-util-embedded-2.0.1" = { name = "hast-util-embedded"; packageName = "hast-util-embedded"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-embedded/-/hast-util-embedded-2.0.0.tgz"; - sha512 = "vEr54rDu2CheBM4nLkWbW8Rycf8HhkA/KsrDnlyKnvBTyhyO+vAG6twHnfUbiRGo56YeUBNCI4HFfHg3Wu+tig=="; + url = "https://registry.npmjs.org/hast-util-embedded/-/hast-util-embedded-2.0.1.tgz"; + sha512 = "QUdSOP1/o+/TxXtpPFXR2mUg2P+ySrmlX7QjwHZCXqMFyYk7YmcGSvqRW+4XgXAoHifdE1t2PwFaQK33TqVjSw=="; }; }; "hast-util-from-parse5-5.0.3" = { @@ -38098,13 +38323,13 @@ let sha512 = "jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA=="; }; }; - "hast-util-from-parse5-7.1.0" = { + "hast-util-from-parse5-7.1.1" = { name = "hast-util-from-parse5"; packageName = "hast-util-from-parse5"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-7.1.0.tgz"; - sha512 = "m8yhANIAccpU4K6+121KpPP55sSl9/samzQSQGpb0mTExcNh2WlvjtMwSWFhg6uqD4Rr6Nfa8N6TMypQM51rzQ=="; + url = "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-7.1.1.tgz"; + sha512 = "R6PoNcUs89ZxLJmMWsVbwSWuz95/9OriyQZ3e2ybwqGsRXzhA6gv49rgGmQvLbZuSNDv9fCg7vV7gXUsvtUFaA=="; }; }; "hast-util-has-property-1.0.4" = { @@ -38116,13 +38341,13 @@ let sha512 = "ghHup2voGfgFoHMGnaLHOjbYFACKrRh9KFttdCzMCbFoBMJXiNi2+XTrPP8+q6cDJM/RSqlCfVWrjp1H201rZg=="; }; }; - "hast-util-has-property-2.0.0" = { + "hast-util-has-property-2.0.1" = { name = "hast-util-has-property"; packageName = "hast-util-has-property"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-has-property/-/hast-util-has-property-2.0.0.tgz"; - sha512 = "4Qf++8o5v14us4Muv3HRj+Er6wTNGA/N9uCaZMty4JWvyFKLdhULrv4KE1b65AthsSO9TXSZnjuxS8ecIyhb0w=="; + url = "https://registry.npmjs.org/hast-util-has-property/-/hast-util-has-property-2.0.1.tgz"; + sha512 = "X2+RwZIMTMKpXUzlotatPzWj8bspCymtXH3cfG3iQKV+wPF53Vgaqxi/eLqGck0wKq1kS9nvoB1wchbCPEL8sg=="; }; }; "hast-util-is-body-ok-link-1.0.4" = { @@ -38152,13 +38377,13 @@ let sha512 = "oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ=="; }; }; - "hast-util-is-element-2.1.2" = { + "hast-util-is-element-2.1.3" = { name = "hast-util-is-element"; packageName = "hast-util-is-element"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-2.1.2.tgz"; - sha512 = "thjnlGAnwP8ef/GSO1Q8BfVk2gundnc2peGQqEg2kUt/IqesiGg/5mSwN2fE7nLzy61pg88NG6xV+UrGOrx9EA=="; + url = "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-2.1.3.tgz"; + sha512 = "O1bKah6mhgEq2WtVMk+Ta5K7pPMqsBBlmzysLdcwKVrqzZQ0CHqUPiIVspNhAG1rvxpvJjtGee17XfauZYKqVA=="; }; }; "hast-util-parse-selector-2.2.5" = { @@ -38170,13 +38395,13 @@ let sha512 = "7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ=="; }; }; - "hast-util-parse-selector-3.1.0" = { + "hast-util-parse-selector-3.1.1" = { name = "hast-util-parse-selector"; packageName = "hast-util-parse-selector"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-3.1.0.tgz"; - sha512 = "AyjlI2pTAZEOeu7GeBPZhROx0RHBnydkQIXlhnFzDi0qfXTmGUWoCYZtomHbrdrheV4VFUlPcfJ6LMF5T6sQzg=="; + url = "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-3.1.1.tgz"; + sha512 = "jdlwBjEexy1oGz0aJ2f4GKMaVKkA9jwjr4MjAAI22E5fM/TXVZHuS5OpONtdeIkRKqAaryQ2E9xNQxijoThSZA=="; }; }; "hast-util-phrasing-1.0.5" = { @@ -38188,13 +38413,13 @@ let sha512 = "P3uxm+8bnwcfAS/XpGie9wMmQXAQqsYhgQQKRwmWH/V6chiq0lmTy8KjQRJmYjusdMtNKGCUksdILSZy1suSpQ=="; }; }; - "hast-util-phrasing-2.0.1" = { + "hast-util-phrasing-2.0.2" = { name = "hast-util-phrasing"; packageName = "hast-util-phrasing"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-phrasing/-/hast-util-phrasing-2.0.1.tgz"; - sha512 = "Lw+gVihgE0Ye1TsToZqui0puQnHbZ0dFQe0c/Z2QJWGYRIc72DpH3UHLV8zU48sjIPord88MTSeYEbLQMp5A9g=="; + url = "https://registry.npmjs.org/hast-util-phrasing/-/hast-util-phrasing-2.0.2.tgz"; + sha512 = "yGkCfPkkfCyiLfK6KEl/orMDr/zgCnq/NaO9HfULx6/Zga5fso5eqQA5Ov/JZVqACygvw9shRYWgXNcG2ilo7w=="; }; }; "hast-util-to-nlcst-1.2.8" = { @@ -38242,13 +38467,13 @@ let sha512 = "I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A=="; }; }; - "hast-util-whitespace-2.0.0" = { + "hast-util-whitespace-2.0.1" = { name = "hast-util-whitespace"; packageName = "hast-util-whitespace"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-2.0.0.tgz"; - sha512 = "Pkw+xBHuV6xFeJprJe2BBEoDV+AvQySaz3pPDRUs5PNZEMQjpXJJueqrpcHIXxnWTcAGi/UOCgVShlkY6kLoqg=="; + url = "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-2.0.1.tgz"; + sha512 = "nAxA0v8+vXSBDt3AnRUNjyRIQ0rD+ntpbAp4LnPkumc5M9yUbSMa4XDU9Q6etY4f1Wp4bNgvc1yjiZtsTTrSng=="; }; }; "hastscript-5.1.2" = { @@ -38269,13 +38494,13 @@ let sha512 = "nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w=="; }; }; - "hastscript-7.1.0" = { + "hastscript-7.2.0" = { name = "hastscript"; packageName = "hastscript"; - version = "7.1.0"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/hastscript/-/hastscript-7.1.0.tgz"; - sha512 = "uBjaTTLN0MkCZxY/R2fWUOcu7FRtUVzKRO5P/RAfgsu3yFiMB1JWCO4AjeVkgHxAira1f2UecHK5WfS9QurlWA=="; + url = "https://registry.npmjs.org/hastscript/-/hastscript-7.2.0.tgz"; + sha512 = "TtYPq24IldU8iKoJQqvZOuhi5CyCQRAbvDOX0x1eW6rsHSxa/1i2CCiptNTotGHJ3VoHRGmqiv6/D3q113ikkw=="; }; }; "hasurl-1.0.0" = { @@ -38305,15 +38530,6 @@ let sha512 = "X8xbmTc1cbPXcQV4WkLcRMALuyoxhfpFATmyuCxJPOAvrDS4DNnsTAOmKUxMTOWU6TzrTOkxPKwIx5ZOpJVSrg=="; }; }; - "hbs-4.2.0" = { - name = "hbs"; - packageName = "hbs"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hbs/-/hbs-4.2.0.tgz"; - sha512 = "dQwHnrfWlTk5PvG9+a45GYpg0VpX47ryKF8dULVd6DtwOE6TEcYQXQ5QM6nyOx/h7v3bvEQbdn19EDAcfUAgZg=="; - }; - }; "hdb-pool-0.1.6" = { name = "hdb-pool"; packageName = "hdb-pool"; @@ -38341,15 +38557,6 @@ let sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; - "header-case-2.0.4" = { - name = "header-case"; - packageName = "header-case"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz"; - sha512 = "H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q=="; - }; - }; "headless-0.1.7" = { name = "headless"; packageName = "headless"; @@ -38386,15 +38593,6 @@ let sha512 = "n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA=="; }; }; - "helmet-3.23.3" = { - name = "helmet"; - packageName = "helmet"; - version = "3.23.3"; - src = fetchurl { - url = "https://registry.npmjs.org/helmet/-/helmet-3.23.3.tgz"; - sha512 = "U3MeYdzPJQhtvqAVBPntVgAvNSOJyagwZwyKsFdyRa8TV3pOKVFljalPOCxbw5Wwf2kncGhmP0qHjyazIdNdSA=="; - }; - }; "helmet-4.6.0" = { name = "helmet"; packageName = "helmet"; @@ -38404,24 +38602,6 @@ let sha512 = "HVqALKZlR95ROkrnesdhbbZJFi/rIVSoNq6f3jA/9u6MIbTsPh3xZwihjeI5+DO/2sOV6HMHooXcEOuwskHpTg=="; }; }; - "helmet-crossdomain-0.4.0" = { - name = "helmet-crossdomain"; - packageName = "helmet-crossdomain"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/helmet-crossdomain/-/helmet-crossdomain-0.4.0.tgz"; - sha512 = "AB4DTykRw3HCOxovD1nPR16hllrVImeFp5VBV9/twj66lJ2nU75DP8FPL0/Jp4jj79JhTfG+pFI2MD02kWJ+fA=="; - }; - }; - "helmet-csp-2.10.0" = { - name = "helmet-csp"; - packageName = "helmet-csp"; - version = "2.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.10.0.tgz"; - sha512 = "Rz953ZNEFk8sT2XvewXkYN0Ho4GEZdjAZy4stjiEQV3eN7GDxg1QKmYggH7otDyIA7uGA6XnUMVSgeJwbR5X+w=="; - }; - }; "help-me-3.0.0" = { name = "help-me"; packageName = "help-me"; @@ -38431,13 +38611,13 @@ let sha512 = "hx73jClhyk910sidBB7ERlnhMlFsJJIBqSVMFDwPN8o2v9nmp5KgLq1Xz1Bf1fCMMZ6mPrX159iG0VLy/fPMtQ=="; }; }; - "help-me-4.1.0" = { + "help-me-4.2.0" = { name = "help-me"; packageName = "help-me"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/help-me/-/help-me-4.1.0.tgz"; - sha512 = "5HMrkOks2j8Fpu2j5nTLhrBhT7VwHwELpqnSnx802ckofys5MO2SkLpgSz3dgNFHV7IYFX2igm5CM75SmuYidw=="; + url = "https://registry.npmjs.org/help-me/-/help-me-4.2.0.tgz"; + sha512 = "TAOnTB8Tz5Dw8penUuzHVrKNKlCIbwwbHnXraNJxPwf8LRtE2HlM84RYuezMFcwOJmoYOCWVDyJ8TQGxn9PgxA=="; }; }; "here-0.0.2" = { @@ -38494,15 +38674,6 @@ let sha512 = "QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g=="; }; }; - "hide-powered-by-1.1.0" = { - name = "hide-powered-by"; - packageName = "hide-powered-by"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hide-powered-by/-/hide-powered-by-1.1.0.tgz"; - sha512 = "Io1zA2yOA1YJslkr+AJlWSf2yWFkKjvkcL9Ni1XSUqnGLr/qRQe2UI3Cn/J9MsJht7yEVCe0SscY1HgVMujbgg=="; - }; - }; "hidefile-3.0.0" = { name = "hidefile"; packageName = "hidefile"; @@ -38512,6 +38683,15 @@ let sha512 = "AvJ9joE59PQPGOB78smS63K60KKpTK5GBIagupfK9Hw6zpA0JKba2D9uAnDycaI8/bN30ltHWGZVXIkQ4BU6oA=="; }; }; + "highlight-es-1.0.3" = { + name = "highlight-es"; + packageName = "highlight-es"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/highlight-es/-/highlight-es-1.0.3.tgz"; + sha512 = "s/SIX6yp/5S1p8aC/NRDC1fwEb+myGIfp8/TzZz0rtAv8fzsdX7vGl3Q1TrXCsczFq8DI3CBFBCySPClfBSdbg=="; + }; + }; "highlight.js-10.7.3" = { name = "highlight.js"; packageName = "highlight.js"; @@ -38530,13 +38710,13 @@ let sha512 = "X9VVhYKHQPPuwffO8jk4bP/FVj+ibNCy3HxZZNDXFtJrq4O5FdcdCDRIkDis5MiMnjh7UwEdHgRZJcHFYdzDdA=="; }; }; - "highlight.js-11.5.1" = { + "highlight.js-11.7.0" = { name = "highlight.js"; packageName = "highlight.js"; - version = "11.5.1"; + version = "11.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-11.5.1.tgz"; - sha512 = "LKzHqnxr4CrD2YsNoIf/o5nJ09j4yi/GcH5BnYz9UnVpZdS4ucMgvP61TDty5xJcFGRjnH4DpujkS9bHT3hq0Q=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-11.7.0.tgz"; + sha512 = "1rRqesRFhMO/PRF+G86evnyJkCgaZFOI+Z6kdj15TA18funfoqJXvgPCLSf0SWq3SRfg1j3HlDs8o4s3EGq1oQ=="; }; }; "highlight.js-8.2.0" = { @@ -38575,15 +38755,6 @@ let sha512 = "Xcx8VTw5P5+5drkXJ35YMPK7E+BO1mttZat6dgC8vnwTHKSRGhOeW4TNvWCaFM63D2XU7jWyAOPimYZHr6Oaqg=="; }; }; - "historic-readline-1.0.8" = { - name = "historic-readline"; - packageName = "historic-readline"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/historic-readline/-/historic-readline-1.0.8.tgz"; - sha512 = "+ADn1uO85HwKnhziJlTm4cvrwFv60TlFqyos75ikfE9kq4RNrLcf+uVmEePT/4d/gh9TxKmwTfpVN9fpKyJKJA=="; - }; - }; "hls.js-1.1.2" = { name = "hls.js"; packageName = "hls.js"; @@ -38593,15 +38764,6 @@ let sha512 = "ujditC4vvBmZd00RRNfNPLgFVlqEeUX4sAFv5lGhBHuql8iAZodOdlZTD3em/1zo7vyjQp12up/lCVqQk8dvxA=="; }; }; - "hls.js-1.2.5" = { - name = "hls.js"; - packageName = "hls.js"; - version = "1.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/hls.js/-/hls.js-1.2.5.tgz"; - sha512 = "1xW5PBJcQu2MsQDnqoFtCfaxxJ1hHwJHRThxDtrKRcrltTtSi4A62xgOsey+KK8MTMD6i4w5fcmBBz1U62ihvQ=="; - }; - }; "hmac-drbg-1.0.1" = { name = "hmac-drbg"; packageName = "hmac-drbg"; @@ -38719,6 +38881,15 @@ let sha512 = "xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw=="; }; }; + "hosted-git-info-6.1.1" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz"; + sha512 = "r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w=="; + }; + }; "hot-formula-parser-4.0.0" = { name = "hot-formula-parser"; packageName = "hot-formula-parser"; @@ -38773,22 +38944,13 @@ let sha512 = "A91dYTeIB6NoXG+PxTQpCCDDnfHsW9kc06Lvpu1TEe9gnd6ZFeiBoRO9JvzEv6xK7EX97/dUE8g/vBMTqTS3CA=="; }; }; - "hpkp-2.0.0" = { - name = "hpkp"; - packageName = "hpkp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hpkp/-/hpkp-2.0.0.tgz"; - sha512 = "TaZpC6cO/k3DFsjfzz1LnOobbVSq+J+7WpJxrVtN4L+8+BPQj8iBDRB2Dx49613N+e7/+ZSQ9ra+xZm7Blf4wg=="; - }; - }; - "hs-client-0.0.11" = { + "hs-client-0.0.13" = { name = "hs-client"; packageName = "hs-client"; - version = "0.0.11"; + version = "0.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/hs-client/-/hs-client-0.0.11.tgz"; - sha512 = "DunENysXNxADDs6YvTjIgFG38U+mGnlDpfEhUzHOAOnkHyYwAIm0PwYJEmJqsbLnpY31xg0lPfRV8t+Ugz+Dew=="; + url = "https://registry.npmjs.org/hs-client/-/hs-client-0.0.13.tgz"; + sha512 = "3Vm/4S0TDstbOW+OfdTeP2EQ4dolPNqMulTSr31RihwX8cX1DyT4il1Fc9STXXToXTsZuFro2WD/+1m0MWi5Ag=="; }; }; "hsl-regex-1.0.0" = { @@ -38818,15 +38980,6 @@ let sha512 = "08iL2VyCRbkQKBySkSh6m8zMUa3sADAxGVWs3Z1aPcUkTJeK0ETG4Fc27tEmQBGUAXZjIsXOZqBvacuVNSC/fQ=="; }; }; - "hsts-2.2.0" = { - name = "hsts"; - packageName = "hsts"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hsts/-/hsts-2.2.0.tgz"; - sha512 = "ToaTnQ2TbJkochoVcdXYm4HOCliNozlviNsg+X2XQLQvZNI/kCHR9rZxVYpJB3UPcHz80PgxRyWQ7PdU1r+VBQ=="; - }; - }; "html-encoding-sniffer-1.0.2" = { name = "html-encoding-sniffer"; packageName = "html-encoding-sniffer"; @@ -38890,15 +39043,6 @@ let sha512 = "ADd49pudM157uWHwHQPUSX4ssMsvR/yHIswOR5CUfBdK9g9ZYGMhVSE6KZVHJ6kCkR0gH4htsfzU6zECDNVwyw=="; }; }; - "html-loader-1.1.0" = { - name = "html-loader"; - packageName = "html-loader"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-loader/-/html-loader-1.1.0.tgz"; - sha512 = "zwLbEgy+i7sgIYTlxI9M7jwkn29IvdsV6f1y7a2aLv/w8l1RigVk0PFijBZLLFsdi2gvL8sf2VJhTjLlfnK8sA=="; - }; - }; "html-minifier-3.5.21" = { name = "html-minifier"; packageName = "html-minifier"; @@ -38908,15 +39052,6 @@ let sha512 = "LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA=="; }; }; - "html-minifier-terser-5.1.1" = { - name = "html-minifier-terser"; - packageName = "html-minifier-terser"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; - sha512 = "ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg=="; - }; - }; "html-minifier-terser-6.1.0" = { name = "html-minifier-terser"; packageName = "html-minifier-terser"; @@ -38953,13 +39088,13 @@ let sha512 = "vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg=="; }; }; - "html-to-text-8.1.1" = { + "html-to-text-9.0.3" = { name = "html-to-text"; packageName = "html-to-text"; - version = "8.1.1"; + version = "9.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/html-to-text/-/html-to-text-8.1.1.tgz"; - sha512 = "uHdOmIGMy0Z1tJdcJzhbUQm3+V+6Q8YmFYCr1+SxjjwlO2Ha9S/D2eq1P8NLjH5fTzJCLQTL9xCXZNuIwraipw=="; + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-9.0.3.tgz"; + sha512 = "hxDF1kVCF2uw4VUJ3vr2doc91pXf2D5ngKcNviSitNkhP9OMOaJkDrFIFL6RMvko7NisWTEiqGpQ9LAxcVok1w=="; }; }; "html-void-elements-1.0.5" = { @@ -38980,15 +39115,6 @@ let sha512 = "Br4ifmjQojUP4EmHnRBoUIYcZ9J7M4bTMcm7u6xoIAIuq2Nte4TzXX0533owvkQKQD1WeMTTTyD4Ni4QKxS0Bg=="; }; }; - "html-webpack-plugin-4.3.0" = { - name = "html-webpack-plugin"; - packageName = "html-webpack-plugin"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.3.0.tgz"; - sha512 = "C0fzKN8yQoVLTelcJxZfJCE+aAvQiY2VUf3UuKrR4a9k5UMWYOtpDLsaXwATbcVCnI05hUS7L9ULQHWLZhyi3w=="; - }; - }; "html-webpack-plugin-5.5.0" = { name = "html-webpack-plugin"; packageName = "html-webpack-plugin"; @@ -39025,13 +39151,13 @@ let sha512 = "jWTtP3dCd7R8x/tt9DK3pvpcQd7HDMcRPUqPxr/i9989q2k5RHIhmlRDFeyQ/LSd8IKrteG8Ce5g0Ig4eGIipg=="; }; }; - "htmlnano-2.0.2" = { + "htmlnano-2.0.3" = { name = "htmlnano"; packageName = "htmlnano"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/htmlnano/-/htmlnano-2.0.2.tgz"; - sha512 = "+ZrQFS4Ub+zd+/fWwfvoYCEGNEa0/zrpys6CyXxvZDwtL7Pl+pOtRkiujyvBQ7Lmfp7/iEPxtOFgxWA16Gkj3w=="; + url = "https://registry.npmjs.org/htmlnano/-/htmlnano-2.0.3.tgz"; + sha512 = "S4PGGj9RbdgW8LhbILNK7W9JhmYP8zmDY7KDV/8eCiJBQJlbmltp5I0gv8c5ntLljfdxxfmJ+UJVSqyH4mb41A=="; }; }; "htmlparser2-3.10.1" = { @@ -39061,15 +39187,6 @@ let sha512 = "hBxEg3CYXe+rPIua8ETe7tmG3XDn9B0edOE/e9wH2nLczxzgdu0m0aNHY+5wFZiviLWLdANPJTssa92dMcXQ5Q=="; }; }; - "htmlparser2-4.1.0" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz"; - sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q=="; - }; - }; "htmlparser2-6.1.0" = { name = "htmlparser2"; packageName = "htmlparser2"; @@ -39133,13 +39250,13 @@ let sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="; }; }; - "http-cache-semantics-4.1.0" = { + "http-cache-semantics-4.1.1" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"; + sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="; }; }; "http-call-5.3.0" = { @@ -39367,6 +39484,15 @@ let sha512 = "jCClqdnnwigYslmtfb28vPplOgoiZ0siP2Z8C5Ua+3UKbx410v+c+jT+jh1bbI4TvcEySuX0vd/CfFZFbDkJeQ=="; }; }; + "http-status-1.6.2" = { + name = "http-status"; + packageName = "http-status"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http-status/-/http-status-1.6.2.tgz"; + sha512 = "oUExvfNckrpTpDazph7kNG8sQi5au3BeTo0idaZFXEhTaJKu7GNJCLHI0rYY2wljm548MSTM+Ljj/c6anqu2zQ=="; + }; + }; "http2-client-1.3.5" = { name = "http2-client"; packageName = "http2-client"; @@ -39385,13 +39511,13 @@ let sha512 = "V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg=="; }; }; - "http2-wrapper-2.1.11" = { + "http2-wrapper-2.2.0" = { name = "http2-wrapper"; packageName = "http2-wrapper"; - version = "2.1.11"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.1.11.tgz"; - sha512 = "aNAk5JzLturWEUiuhAN73Jcbq96R7rTitAoXV54FYMatvihnpD2+6PUgU4ce3D/m5VDbw+F5CsyKSF176ptitQ=="; + url = "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.0.tgz"; + sha512 = "kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ=="; }; }; "http_ece-1.1.0" = { @@ -39520,13 +39646,13 @@ let sha512 = "un3ZAcNQGI7RzaWGZzQDH47HETM4Wrj6z6E4TId8Yeq9w5ZKUVB1nrT2jwFheTUjEmqcgTjXDc959jum+ai1kQ=="; }; }; - "humanize-string-1.0.2" = { + "humanize-string-2.1.0" = { name = "humanize-string"; packageName = "humanize-string"; - version = "1.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/humanize-string/-/humanize-string-1.0.2.tgz"; - sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w=="; + url = "https://registry.npmjs.org/humanize-string/-/humanize-string-2.1.0.tgz"; + sha512 = "sQ+hqmxyXW8Cj7iqxcQxD7oSy3+AXnIZXdUF9lQMkzaG8dtbKAB8U7lCtViMnwQ+MpdCKsO2Kiij3G6UUXq/Xg=="; }; }; "humps-2.0.1" = { @@ -39781,13 +39907,22 @@ let sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; }; }; - "ignore-5.2.0" = { + "ignore-5.1.9" = { name = "ignore"; packageName = "ignore"; - version = "5.2.0"; + version = "5.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"; - sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz"; + sha512 = "2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ=="; + }; + }; + "ignore-5.2.4" = { + name = "ignore"; + packageName = "ignore"; + version = "5.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz"; + sha512 = "MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="; }; }; "ignore-by-default-1.0.1" = { @@ -39844,6 +39979,15 @@ let sha512 = "BZh721F2Q5TwBdwpiqrBrHEdj8daj8KuMZK/DOCyqQlz1CqFhhuZWbK5ZCUnAvFJr8LaKHTaWl9ja3/a3DC2Ew=="; }; }; + "image-q-4.0.0" = { + name = "image-q"; + packageName = "image-q"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/image-q/-/image-q-4.0.0.tgz"; + sha512 = "PfJGVgIfKQJuq3s0tTDOKtztksibuUEbJQIYT3by6wctQo+Rdlh7ef4evJ5NCdxY4CfMbvFkocEwbl4BF8RlJw=="; + }; + }; "image-size-0.5.5" = { name = "image-size"; packageName = "image-size"; @@ -39943,22 +40087,13 @@ let sha512 = "yM7jo9+hvYgvdCQdqvhCNRRio0SCXc8xDPzA25SvKWa7b1WVPjLwQs1VYU5JPXjcJPTqAa5NP5dqpORGYBQ2AA=="; }; }; - "immer-8.0.1" = { + "immer-9.0.19" = { name = "immer"; packageName = "immer"; - version = "8.0.1"; + version = "9.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/immer/-/immer-8.0.1.tgz"; - sha512 = "aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA=="; - }; - }; - "immer-9.0.16" = { - name = "immer"; - packageName = "immer"; - version = "9.0.16"; - src = fetchurl { - url = "https://registry.npmjs.org/immer/-/immer-9.0.16.tgz"; - sha512 = "qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ=="; + url = "https://registry.npmjs.org/immer/-/immer-9.0.19.tgz"; + sha512 = "eY+Y0qcsB4TZKwgQzLaE/lqYMlKhv5J9dyd2RhhtGhNo2njPXDqU9XPfcNfa3MIDsdtZt5KlkIsirlo4dHsWdQ=="; }; }; "immutable-3.8.2" = { @@ -39970,13 +40105,13 @@ let sha512 = "15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg=="; }; }; - "immutable-4.1.0" = { + "immutable-4.2.2" = { name = "immutable"; packageName = "immutable"; - version = "4.1.0"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz"; - sha512 = "oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ=="; + url = "https://registry.npmjs.org/immutable/-/immutable-4.2.2.tgz"; + sha512 = "fTMKDwtbvO5tldky9QZ2fMX7slR0mYpY5nbnFWYp0fOzDhHqhgIw9KoYgxLWsoNTS9ZHGauHj18DTyEw6BK3Og=="; }; }; "import-cwd-2.1.0" = { @@ -40087,13 +40222,13 @@ let sha512 = "ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg=="; }; }; - "import-meta-resolve-2.1.0" = { + "import-meta-resolve-2.2.1" = { name = "import-meta-resolve"; packageName = "import-meta-resolve"; - version = "2.1.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-2.1.0.tgz"; - sha512 = "yG9pxkWJVTy4cmRsNWE3ztFdtFuYIV8G4N+cbCkO8b+qngkLyIUhxQFuZ0qJm67+0nUOxjMPT7nfksPKza1v2g=="; + url = "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-2.2.1.tgz"; + sha512 = "C6lLL7EJPY44kBvA80gq4uMsVFw5x3oSKfuMl1cuZ2RkI5+UJqQXgn+6hlUew0y4ig7Ypt4CObAAIzU53Nfpuw=="; }; }; "imurmurhash-0.1.4" = { @@ -40294,15 +40429,6 @@ let sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; }; }; - "ini-3.0.0" = { - name = "ini"; - packageName = "ini"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-3.0.0.tgz"; - sha512 = "TxYQaeNW/N8ymDvwAxPyRbhMBtnEwuvaTYpOQkFx1nSeusgezHniEc/l35Vo4iCq/mMiTJbpD7oYxN98hFlfmw=="; - }; - }; "ini-3.0.1" = { name = "ini"; packageName = "ini"; @@ -40366,6 +40492,15 @@ let sha512 = "uJ4nbH00MM9fjTJ5xdw0zzvtXMkeGb0WV6dzSWvFv2/+ks6FIhpkt+Ge/eLdh0Ah6Vjw5pLMyNfoHQpRDRVFbQ=="; }; }; + "ink-table-3.0.0" = { + name = "ink-table"; + packageName = "ink-table"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ink-table/-/ink-table-3.0.0.tgz"; + sha512 = "RtcYjenHKZWjnwVNQ6zSYWMOLKwkWscDAJsqUQXftyjkYho1gGrluGss87NOoIzss0IKr74lKasd6MtlQYALiA=="; + }; + }; "ink-text-input-4.0.3" = { name = "ink-text-input"; packageName = "ink-text-input"; @@ -40555,15 +40690,6 @@ let sha512 = "ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg=="; }; }; - "insight-0.10.3" = { - name = "insight"; - packageName = "insight"; - version = "0.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/insight/-/insight-0.10.3.tgz"; - sha512 = "YOncxSN6Omh+1Oqxt+OJAvJVMDKw7l6IEG0wT2cTMGxjsTcroOGW4IR926QDzxg/uZHcFZ2cZbckDWdZhc2pZw=="; - }; - }; "insight-0.11.1" = { name = "insight"; packageName = "insight"; @@ -40645,13 +40771,13 @@ let sha512 = "MAQUJuIo7Xqk8EVNP+6d3CKq9c80hi4tjIbIAT6lmGW9W6WzlHiu9PS8uSuUYU+Do+j1baiFp3H25XEVxDIG2g=="; }; }; - "install-artifact-from-github-1.3.1" = { + "install-artifact-from-github-1.3.2" = { name = "install-artifact-from-github"; packageName = "install-artifact-from-github"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/install-artifact-from-github/-/install-artifact-from-github-1.3.1.tgz"; - sha512 = "3l3Bymg2eKDsN5wQuMfgGEj2x6l5MCAv0zPL6rxHESufFVlEAKW/6oY9F1aGgvY/EgWm5+eWGRjINveL4X7Hgg=="; + url = "https://registry.npmjs.org/install-artifact-from-github/-/install-artifact-from-github-1.3.2.tgz"; + sha512 = "yCFcLvqk0yQdxx0uJz4t9Z3adDMLAYrcGYv546uRXCSvxE+GqNYhhz/KmrGcUKGI/gVLR9n/e/zM9jX/+ASMJQ=="; }; }; "int53-1.0.0" = { @@ -40699,13 +40825,13 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; - "internal-slot-1.0.3" = { + "internal-slot-1.0.4" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; - sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz"; + sha512 = "tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ=="; }; }; "internmap-2.0.3" = { @@ -40843,22 +40969,22 @@ let sha512 = "CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw=="; }; }; - "invoices-2.2.0" = { + "invoices-2.2.3" = { name = "invoices"; packageName = "invoices"; - version = "2.2.0"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/invoices/-/invoices-2.2.0.tgz"; - sha512 = "uVe0WdHGdhkKubfrH1rSC/RpFREC7D0dh1IHxEgmUhV1lhn2+1UFVUxhri4dGyklBgIi+DNzE8q3665PF8z5Vw=="; + url = "https://registry.npmjs.org/invoices/-/invoices-2.2.3.tgz"; + sha512 = "tYOmXKPsz8/jxtPDmy7HS7Z4VqQ9VK2Y3J37hhHEhU337AoL1CUlEqccTEb4nZQ36HHnFhlcKLoDz7C8W5lNdg=="; }; }; - "io-ts-2.2.19" = { + "io-ts-2.2.20" = { name = "io-ts"; packageName = "io-ts"; - version = "2.2.19"; + version = "2.2.20"; src = fetchurl { - url = "https://registry.npmjs.org/io-ts/-/io-ts-2.2.19.tgz"; - sha512 = "ED0GQwvKRr5C2jqOOJCkuJW2clnbzqFexQ8V7Qsb+VB36S1Mk/OKH7k0FjSe4mjKy9qBRA3OqgVGyFMUEKIubw=="; + url = "https://registry.npmjs.org/io-ts/-/io-ts-2.2.20.tgz"; + sha512 = "Rq2BsYmtwS5vVttie4rqrOCIfHCS9TgpRLFpKQCM1wZBBRY9nWVGmEvm2FnDbSE2un1UE39DvFpTR5UL47YDcA=="; }; }; "ioredis-4.28.5" = { @@ -40870,13 +40996,13 @@ let sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A=="; }; }; - "ioredis-5.2.4" = { + "ioredis-5.3.0" = { name = "ioredis"; packageName = "ioredis"; - version = "5.2.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ioredis/-/ioredis-5.2.4.tgz"; - sha512 = "qIpuAEt32lZJQ0XyrloCRdlEdUUNGG9i0UOk6zgzK6igyudNWqEBxfH6OlbnOOoBBvr1WB02mm8fR55CnikRng=="; + url = "https://registry.npmjs.org/ioredis/-/ioredis-5.3.0.tgz"; + sha512 = "Id9jKHhsILuIZpHc61QkagfVdUj2Rag5GzG1TGEvRNeM7dtTOjICgjC+tvqYxi//PuX2wjQ+Xjva2ONBuf92Pw=="; }; }; "iota-array-1.0.0" = { @@ -40915,13 +41041,13 @@ let sha512 = "u9YYtb1p2fWSbzpKmZ/b3QXWA+diRYPxc2c4y5lFB/MMk5WZ7wNZv8S3CFcIGVJ5XtlaCAl/FQy/D3eQ2XtdOA=="; }; }; - "ip-num-1.4.1" = { + "ip-num-1.5.0" = { name = "ip-num"; packageName = "ip-num"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ip-num/-/ip-num-1.4.1.tgz"; - sha512 = "7+S/V9JGNfJu2aYj5j1uHwL3rij1TeZO/szPTyX+us52a9h9qv9sPMlwl5Ts0T/49zTFHdz1JJeDjcHHFoyDYg=="; + url = "https://registry.npmjs.org/ip-num/-/ip-num-1.5.0.tgz"; + sha512 = "XPStGtjDEDgaJXZhteWoIYZe2SaLWOzlpqwUmcx2W8UAA3lBY9oTyNNJ3fTnnW9Y4Px9f6Qi1mUqeFb9/dTIwQ=="; }; }; "ip-regex-2.1.0" = { @@ -41068,13 +41194,13 @@ let sha512 = "kniTIJmaZYiwa17eTtWIfm0K342seyugl6vuC8DiiyiRAJWAVlLkqGCI0Im0neo0TkXw+pRcKaBPRdcKHnQJ6Q=="; }; }; - "irregular-plurals-3.3.0" = { + "irregular-plurals-3.4.0" = { name = "irregular-plurals"; packageName = "irregular-plurals"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.3.0.tgz"; - sha512 = "MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g=="; + url = "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.4.0.tgz"; + sha512 = "YXxECO/W6N9aMBVKMKKZ8TXESgq7EFrp3emCGGUcrYY1cgJIeZjoB75MTu8qi+NAKntS9NwPU8VdcQ3r6E6aWQ=="; }; }; "is-3.3.0" = { @@ -41212,6 +41338,15 @@ let sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; }; }; + "is-array-buffer-3.0.1" = { + name = "is-array-buffer"; + packageName = "is-array-buffer"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz"; + sha512 = "ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ=="; + }; + }; "is-arrayish-0.2.1" = { name = "is-arrayish"; packageName = "is-arrayish"; @@ -41518,6 +41653,15 @@ let sha512 = "0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA=="; }; }; + "is-es2016-keyword-1.0.0" = { + name = "is-es2016-keyword"; + packageName = "is-es2016-keyword"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-es2016-keyword/-/is-es2016-keyword-1.0.0.tgz"; + sha512 = "JtZWPUwjdbQ1LIo9OSZ8MdkWEve198ors27vH+RzUUvZXXZkzXCxFnlUhzWYxy5IexQSRiXVw9j2q/tHMmkVYQ=="; + }; + }; "is-expression-3.0.0" = { name = "is-expression"; packageName = "is-expression"; @@ -42463,6 +42607,15 @@ let sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; }; }; + "is-subdir-1.2.0" = { + name = "is-subdir"; + packageName = "is-subdir"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-subdir/-/is-subdir-1.2.0.tgz"; + sha512 = "2AT6j+gXe/1ueqbW6fLZJiIw3F8iXGJtt0yDrZaBhAZEG1raiTxKWU+IPqMCzQAXOUCKdA4UDMgacKH25XG2Cw=="; + }; + }; "is-supported-regexp-flag-1.0.1" = { name = "is-supported-regexp-flag"; packageName = "is-supported-regexp-flag"; @@ -42706,13 +42859,13 @@ let sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; }; }; - "is-yarn-global-0.4.0" = { + "is-yarn-global-0.4.1" = { name = "is-yarn-global"; packageName = "is-yarn-global"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.4.0.tgz"; - sha512 = "HneQBCrXGBy15QnaDfcn6OLoU8AQPAa0Qn0IeJR/QCo4E8dNZaGGwxpCwWyEBQC5QvFonP8d6t60iGpAHVAfNA=="; + url = "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.4.1.tgz"; + sha512 = "/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ=="; }; }; "is2-0.0.9" = { @@ -42832,15 +42985,6 @@ let sha512 = "S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA=="; }; }; - "isomorphic-fetch-2.2.1" = { - name = "isomorphic-fetch"; - packageName = "isomorphic-fetch"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz"; - sha512 = "9c4TNAKYXM5PRyVcwUZrF3W09nQ+sO7+jydgs4ZGW9dhsLG2VOlISJABombdQqQRXCwuYG3sYV/puGf5rp0qmA=="; - }; - }; "isomorphic-fetch-3.0.0" = { name = "isomorphic-fetch"; packageName = "isomorphic-fetch"; @@ -42904,15 +43048,6 @@ let sha512 = "0RHjbtw9QXeSYnIEY5Yrp2QZrdtz21xBDV9C/GIlY2POmgoS6a7qjkYS5siRKXScnuAj5/SPv1C3YForNCHTJA=="; }; }; - "istanbul-lib-coverage-2.0.5" = { - name = "istanbul-lib-coverage"; - packageName = "istanbul-lib-coverage"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz"; - sha512 = "8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA=="; - }; - }; "istanbul-lib-coverage-3.2.0" = { name = "istanbul-lib-coverage"; packageName = "istanbul-lib-coverage"; @@ -42940,15 +43075,6 @@ let sha512 = "BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ=="; }; }; - "istanbul-lib-instrument-5.2.1" = { - name = "istanbul-lib-instrument"; - packageName = "istanbul-lib-instrument"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz"; - sha512 = "pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg=="; - }; - }; "istanbul-lib-processinfo-2.0.3" = { name = "istanbul-lib-processinfo"; packageName = "istanbul-lib-processinfo"; @@ -42967,15 +43093,6 @@ let sha512 = "wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw=="; }; }; - "istanbul-lib-source-maps-3.0.6" = { - name = "istanbul-lib-source-maps"; - packageName = "istanbul-lib-source-maps"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz"; - sha512 = "R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw=="; - }; - }; "istanbul-lib-source-maps-4.0.1" = { name = "istanbul-lib-source-maps"; packageName = "istanbul-lib-source-maps"; @@ -43156,15 +43273,6 @@ let sha512 = "Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw=="; }; }; - "jest-worker-26.6.2" = { - name = "jest-worker"; - packageName = "jest-worker"; - version = "26.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz"; - sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; - }; - }; "jest-worker-27.5.1" = { name = "jest-worker"; packageName = "jest-worker"; @@ -43174,13 +43282,13 @@ let sha512 = "7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg=="; }; }; - "jest-worker-28.1.3" = { - name = "jest-worker"; - packageName = "jest-worker"; - version = "28.1.3"; + "jimp-0.16.2" = { + name = "jimp"; + packageName = "jimp"; + version = "0.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz"; - sha512 = "CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g=="; + url = "https://registry.npmjs.org/jimp/-/jimp-0.16.2.tgz"; + sha512 = "UpItBk81a92f8oEyoGYbO3YK4QcM0hoIyuGHmShoF9Ov63P5Qo7Q/X2xsAgnODmSuDJFOtrPtJd5GSWW4LKdOQ=="; }; }; "jimp-compact-0.16.1" = { @@ -43246,15 +43354,6 @@ let sha512 = "b2Zna/wGIyTzi0Gemg27JYUaRyTyBETw5GnqyVQMr71uojOYMrgkD2+Px3bG2ZFi7/zTUXJSDoGoBOhMixq7tg=="; }; }; - "joi-17.6.4" = { - name = "joi"; - packageName = "joi"; - version = "17.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-17.6.4.tgz"; - sha512 = "tPzkTJHZQjSFCc842QpdVpOZ9LI2txApboNUbW70qgnRB14Lzl+oWQOPdF2N4yqyiY14wBGe8lc7f/2hZxbGmw=="; - }; - }; "joi-17.7.0" = { name = "joi"; packageName = "joi"; @@ -43291,13 +43390,13 @@ let sha512 = "jnt9OC34sLXMLJ6YfPQ2ZEKrR9mB5ZbSnQb4LPaOx1c5rTzxpR33L18jjp0r75mGGTJmsil3qwN1B5IBeTnSSA=="; }; }; - "jose-4.10.0" = { + "jose-4.11.2" = { name = "jose"; packageName = "jose"; - version = "4.10.0"; + version = "4.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/jose/-/jose-4.10.0.tgz"; - sha512 = "KEhB/eLGLomWGPTb+/RNbYsTjIyx03JmbqAyIyiXBuNSa7CmNrJd5ysFhblayzs/e/vbOPMUaLnjHUMhGp4yLw=="; + url = "https://registry.npmjs.org/jose/-/jose-4.11.2.tgz"; + sha512 = "njj0VL2TsIxCtgzhO+9RRobBvws4oYyCM8TpvoUQwl/MbIM3NFJRR9+e6x0sS5xXaP1t6OCBkaBME98OV9zU5A=="; }; }; "joycon-3.1.1" = { @@ -43355,13 +43454,13 @@ let sha256 = "c1b7d85fad2ff0b6a2d1ed1140142c0450e3240a371703ad66d60cb3b5f612b6"; }; }; - "jquery-3.6.1" = { + "jquery-3.6.3" = { name = "jquery"; packageName = "jquery"; - version = "3.6.1"; + version = "3.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz"; - sha512 = "opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw=="; + url = "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz"; + sha512 = "bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="; }; }; "jquery-ui-1.13.2" = { @@ -43373,13 +43472,13 @@ let sha512 = "wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q=="; }; }; - "jquery.terminal-2.34.0" = { + "jquery.terminal-2.35.2" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.34.0"; + version = "2.35.2"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.34.0.tgz"; - sha512 = "sU22Qzb+tkOSwQiHc2fvhgrYE69/0DzGgMgmOgCHMEpTh3MpXENv2j8RWhXd8K+xZG/+Cltst4joGt4MsyT+7g=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.35.2.tgz"; + sha512 = "ZPZ1JDpDskfZVqiA2xwltTzNLXqpc6GCO0NZcZ784u0Rt/zk1cliTS9sjOMklmqvI0Z2v0xLjfIJnZDSJEKrYA=="; }; }; "js-base64-2.6.3" = { @@ -43400,13 +43499,13 @@ let sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="; }; }; - "js-base64-3.7.2" = { + "js-base64-3.7.4" = { name = "js-base64"; packageName = "js-base64"; - version = "3.7.2"; + version = "3.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.2.tgz"; - sha512 = "NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="; + url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.4.tgz"; + sha512 = "wpM/wi20Tl+3ifTyi0RdDckS4YTD4Lf953mBRrpG8547T7hInHNPEj8+ck4gB8VDcGyeAWFK++Wb/fU1BeavKQ=="; }; }; "js-beautify-1.14.7" = { @@ -43463,22 +43562,13 @@ let sha512 = "efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA=="; }; }; - "js-sdsl-4.1.4" = { + "js-sdsl-4.3.0" = { name = "js-sdsl"; packageName = "js-sdsl"; - version = "4.1.4"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz"; - sha512 = "Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw=="; - }; - }; - "js-sdsl-4.1.5" = { - name = "js-sdsl"; - packageName = "js-sdsl"; - version = "4.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz"; - sha512 = "08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q=="; + url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz"; + sha512 = "mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ=="; }; }; "js-sha256-0.9.0" = { @@ -43553,6 +43643,15 @@ let sha512 = "QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q=="; }; }; + "js-yaml-3.13.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; + }; + }; "js-yaml-3.14.0" = { name = "js-yaml"; packageName = "js-yaml"; @@ -43706,13 +43805,13 @@ let sha512 = "kYeYuos/pYp0V/V8VAoGnUc0va0UZjTjwCsldBFZNBrOi9Q5kUXrvsw6W5/lQllB7hKXBARC4HRk1Sfk4dPFtA=="; }; }; - "jsep-1.3.7" = { + "jsep-1.3.8" = { name = "jsep"; packageName = "jsep"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/jsep/-/jsep-1.3.7.tgz"; - sha512 = "NFbZTr1t13fPKw53swmZFKwBkEDWDnno7uLJk+a+Rw9tGDTkGgnGdZJ8A/o3gR1+XaAXmSsbpfIBIBgqRBZWDA=="; + url = "https://registry.npmjs.org/jsep/-/jsep-1.3.8.tgz"; + sha512 = "qofGylTGgYj9gZFsHuyWAN4jr35eJ66qJCK4eKDnldohuUoQFbU3iZn2zjvEbd9wOAhP9Wx5DsAAduTyE1PSWQ=="; }; }; "jsesc-0.5.0" = { @@ -43742,49 +43841,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.70.0" = { + "jsii-1.73.0" = { name = "jsii"; packageName = "jsii"; - version = "1.70.0"; + version = "1.73.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.70.0.tgz"; - sha512 = "RDr/D6IPhCpx5A53qIS99rtwMlDVbjt5F0frCmgalXs2DNiqIm2C8OTUGToVQUrCbX1Lx8eZBmsYWLxG0bQLcg=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.73.0.tgz"; + sha512 = "6GLXJv+XDPNPw4JRAMr6NicWgLorFcKmAZB6x+gqCnrkA6FqZlgDPohFdcqAkxE5Px9K3oAFIsnEH/xV3HuGrg=="; }; }; - "jsii-pacmak-1.70.0" = { + "jsii-pacmak-1.73.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.70.0"; + version = "1.73.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.70.0.tgz"; - sha512 = "BbfIT21BVx1QB1EBLytHxO/CeI+zseI2sp+7wA/Uzfg7U1zS7DoqvsGjZwdl0RvinIJOvkzS55vP5qY5i7btcA=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.73.0.tgz"; + sha512 = "zz3z+AoKXciKxBcmFt4PHPQPhbkjRUgN0hkrC6XhqugbpGprICtLNimU4qAQywHA+T0024TX8fnCCuymQ1sJPg=="; }; }; - "jsii-reflect-1.70.0" = { + "jsii-reflect-1.73.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.70.0"; + version = "1.73.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.70.0.tgz"; - sha512 = "1enHoO6/G5o6RB+lzbQEUkXBFoZZRGJCfgYboLcYiH0tITX/FjipeTR9Wgkh9QumwdlBlMTXuxEPyRFVjQ7jcg=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.73.0.tgz"; + sha512 = "RNnejItM5DUvTpMNBhL095Yt87a6mLWTse9rYZmR+XglJ8WdyNW8mmDftz8gq58TKr5mDVUtq5vpRApCEm0Viw=="; }; }; - "jsii-rosetta-1.70.0" = { + "jsii-rosetta-1.73.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.70.0"; + version = "1.73.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.70.0.tgz"; - sha512 = "iLfogMZ7tTP0g6iMGPHZOHCjn5+K4agb6oalFYbN8iUXVgf+DwKCOGTIN0TxNpy3YFvb4YhCWVENdYPDu/5Nvw=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.73.0.tgz"; + sha512 = "UrXBaM/7jJldrlDN2aV/vaIurIZJM4ikJtcE/ugSoAuJUW42Hpi0Qd5k9MiSaE/k+KNxRpihS+skRa2TETT3Cg=="; }; }; - "jsii-srcmak-0.1.726" = { + "jsii-srcmak-0.1.807" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.726"; + version = "0.1.807"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.726.tgz"; - sha512 = "XlchRo72VoSq9yqOlbzscPjyIQUyY5g4Gufk8D2Ku3kbKMAh3TJgPWkTOSFOwri2SU/AteEK3R/yQX+y1VhUWw=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.807.tgz"; + sha512 = "K4Sri59N7ckh1jSxjdEG386xmJERx4uJgN2CszTA/w8EFMe9cg1xcTgOKyue2Q674xlhNhQleC1ON0wUv/bu7A=="; }; }; "json-bigint-1.0.0" = { @@ -44102,6 +44201,15 @@ let sha512 = "i/J297TW6xyj7sDFa7AmBPkQvLIxWr2kKPWI26tXydnZrzVAocNqn5DMNT1Mzk0vit1V5UkRM7C1KdVNp7Lmcg=="; }; }; + "json-stable-stringify-1.0.2" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.2.tgz"; + sha512 = "eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g=="; + }; + }; "json-stable-stringify-without-jsonify-1.0.1" = { name = "json-stable-stringify-without-jsonify"; packageName = "json-stable-stringify-without-jsonify"; @@ -44138,22 +44246,13 @@ let sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; }; - "json2csv-5.0.7" = { - name = "json2csv"; - packageName = "json2csv"; - version = "5.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/json2csv/-/json2csv-5.0.7.tgz"; - sha512 = "YRZbUnyaJZLZUJSRi2G/MqahCyRv9n/ds+4oIetjDF3jWQA7AG7iSeKTiZiCNqtMZM7HDyt0e/W6lEnoGEmMGA=="; - }; - }; - "json2jsii-0.3.175" = { + "json2jsii-0.3.257" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.3.175"; + version = "0.3.257"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.175.tgz"; - sha512 = "/LmnaPlFBVo/8pnYYQqWFruYyol4qdMOuQxp70PRbXRVxsoKpyIyWhRizGuSMk08gPvNE7xmRKMjoD2UPinOSw=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.257.tgz"; + sha512 = "viB1ukEAISc2TQS2uSmyrwLm8TS/zyAhsXwSj2nNC4UU43F+j7MK0SqloosTPiJVGBgB+3iSUDaMy5Rb5BV34g=="; }; }; "json3-3.2.6" = { @@ -44165,15 +44264,6 @@ let sha512 = "KA+GHhYTLTo7Ri4DyjwUgW8kn98AYtVZtBC94qL5yD0ZSYct8/eF8qBmTNyk+gPE578bKeIL4WBq+MUyd1I26g=="; }; }; - "json3-3.3.3" = { - name = "json3"; - packageName = "json3"; - version = "3.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz"; - sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="; - }; - }; "json5-0.5.1" = { name = "json5"; packageName = "json5"; @@ -44183,22 +44273,22 @@ let sha512 = "4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw=="; }; }; - "json5-1.0.1" = { + "json5-1.0.2" = { name = "json5"; packageName = "json5"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; - sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; + url = "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz"; + sha512 = "g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA=="; }; }; - "json5-2.2.1" = { + "json5-2.2.3" = { name = "json5"; packageName = "json5"; - version = "2.2.1"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; + url = "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"; + sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; }; "json5-relaxed-0.5.4" = { @@ -44246,15 +44336,6 @@ let sha512 = "H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="; }; }; - "jsonc-parser-3.1.0" = { - name = "jsonc-parser"; - packageName = "jsonc-parser"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.1.0.tgz"; - sha512 = "DRf0QjnNeCUds3xTjKlQQ3DpJD51GvDjJfnxUVWg6PZTo2otSm+slzNAxU/35hF8/oJIKoG9slq30JYOsF2azg=="; - }; - }; "jsonc-parser-3.2.0" = { name = "jsonc-parser"; packageName = "jsonc-parser"; @@ -44435,6 +44516,15 @@ let sha512 = "XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w=="; }; }; + "jsonwebtoken-9.0.0" = { + name = "jsonwebtoken"; + packageName = "jsonwebtoken"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz"; + sha512 = "tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw=="; + }; + }; "jspath-0.3.4" = { name = "jspath"; packageName = "jspath"; @@ -44480,22 +44570,13 @@ let sha512 = "gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ=="; }; }; - "jsqr-1.4.0" = { - name = "jsqr"; - packageName = "jsqr"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsqr/-/jsqr-1.4.0.tgz"; - sha512 = "dxLob7q65Xg2DvstYkRpkYtmKm2sPJ9oFhrhmudT1dZvNFFTlroai3AWSpLey/w5vMcLBXRgOJsbXpdN9HzU/A=="; - }; - }; - "jstat-1.9.5" = { + "jstat-1.9.6" = { name = "jstat"; packageName = "jstat"; - version = "1.9.5"; + version = "1.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/jstat/-/jstat-1.9.5.tgz"; - sha512 = "cWnp4vObF5GmB2XsIEzxI/1ZTcYlcfNqxQ/9Fp5KFUa0Jf/4tO0ZkGVnqoEHDisJvYgvn5n3eWZbd2xTVJJPUQ=="; + url = "https://registry.npmjs.org/jstat/-/jstat-1.9.6.tgz"; + sha512 = "rPBkJbK2TnA8pzs93QcDDPlKcrtZWuuCo2dVR0TFLOJSxhqfWOVCSp8aV3/oSbn+4uY4yw1URtLpHQedtmXfug=="; }; }; "jstransform-10.1.0" = { @@ -44552,6 +44633,15 @@ let sha512 = "xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g=="; }; }; + "jszip-3.8.0" = { + name = "jszip"; + packageName = "jszip"; + version = "3.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jszip/-/jszip-3.8.0.tgz"; + sha512 = "cnpQrXvFSLdsR9KR5/x7zdf6c3m8IhZfZzSblFEHSqBaVwD2nvJ4CuCKLyvKvwBgZm08CgfSoiTBQLm5WW9hGw=="; + }; + }; "junk-1.0.3" = { name = "junk"; packageName = "junk"; @@ -44597,22 +44687,22 @@ let sha512 = "xtgnwBBZaLtKspGo6jDX/H0FDsHrn41mQVWhNHge7pZe6Nj2gU2izfC09O0rPU/i97iMcJFVjbecFiTAvmNhLQ=="; }; }; - "just-diff-5.1.1" = { + "just-diff-5.2.0" = { name = "just-diff"; packageName = "just-diff"; - version = "5.1.1"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/just-diff/-/just-diff-5.1.1.tgz"; - sha512 = "u8HXJ3HlNrTzY7zrYYKjNEfBlyjqhdBkoyTVdjtn7p02RJD5NvR8rIClzeGA7t+UYP1/7eAkWNLU0+P3QrEqKQ=="; + url = "https://registry.npmjs.org/just-diff/-/just-diff-5.2.0.tgz"; + sha512 = "6ufhP9SHjb7jibNFrNxyFZ6od3g+An6Ai9mhGRvcYe8UJlH0prseN64M+6ZBBUoKYHZsitDP42gAJ8+eVWr3lw=="; }; }; - "just-diff-apply-5.4.1" = { + "just-diff-apply-5.5.0" = { name = "just-diff-apply"; packageName = "just-diff-apply"; - version = "5.4.1"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-5.4.1.tgz"; - sha512 = "AAV5Jw7tsniWwih8Ly3fXxEZ06y+6p5TwQMsw0dzZ/wPKilzyDgdAnL0Ug4NNIquPUOh1vfFWEHbmXUqM5+o8g=="; + url = "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-5.5.0.tgz"; + sha512 = "OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw=="; }; }; "jwa-1.4.1" = { @@ -44750,69 +44840,6 @@ let sha512 = "fwGvRXWjaSzMed8iQHkZH41wvaoq+3tIhuIbkqBBYFuuJtWoDWqgCYTADGPqLyaLX4Ct8aP5NtAxCaxk4cfcCg=="; }; }; - "karma-6.4.1" = { - name = "karma"; - packageName = "karma"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-6.4.1.tgz"; - sha512 = "Cj57NKOskK7wtFWSlMvZf459iX+kpYIPXmkNUzP2WAFcA7nhr/ALn5R7sw3w+1udFDcpMx/tuB8d5amgm3ijaA=="; - }; - }; - "karma-chrome-launcher-3.1.1" = { - name = "karma-chrome-launcher"; - packageName = "karma-chrome-launcher"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.1.tgz"; - sha512 = "hsIglcq1vtboGPAN+DGCISCFOxW+ZVnIqhDQcCMqqCp+4dmJ0Qpq5QAjkbA0X2L9Mi6OBkHi2Srrbmm7pUKkzQ=="; - }; - }; - "karma-coverage-istanbul-reporter-3.0.3" = { - name = "karma-coverage-istanbul-reporter"; - packageName = "karma-coverage-istanbul-reporter"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-3.0.3.tgz"; - sha512 = "wE4VFhG/QZv2Y4CdAYWDbMmcAHeS926ZIji4z+FkB2aF/EposRb6DP6G5ncT/wXhqUfAb/d7kZrNKPonbvsATw=="; - }; - }; - "karma-htmlfile-reporter-0.3.8" = { - name = "karma-htmlfile-reporter"; - packageName = "karma-htmlfile-reporter"; - version = "0.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/karma-htmlfile-reporter/-/karma-htmlfile-reporter-0.3.8.tgz"; - sha512 = "Hd4c/vqPXYjdNYXeDJRMMq2DMMxPxqOR+TPeiLz2qbqO0qCCQMeXwFGhNDFr+GsvYhcOyn7maTbWusUFchS/4A=="; - }; - }; - "karma-mocha-2.0.1" = { - name = "karma-mocha"; - packageName = "karma-mocha"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/karma-mocha/-/karma-mocha-2.0.1.tgz"; - sha512 = "Tzd5HBjm8his2OA4bouAsATYEpZrp9vC7z5E5j4C5Of5Rrs1jY67RAwXNcVmd/Bnk1wgvQRou0zGVLey44G4tQ=="; - }; - }; - "karma-verbose-reporter-0.0.8" = { - name = "karma-verbose-reporter"; - packageName = "karma-verbose-reporter"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/karma-verbose-reporter/-/karma-verbose-reporter-0.0.8.tgz"; - sha512 = "wHgevIcEpfgKwR3CnWd8t1ErzWeVlctO7ZtXkKFR1inb006ogz+7ZKg95eIVOnHCYWL3Gdy1dRMOGjVP0n4MlA=="; - }; - }; - "karma-webpack-5.0.0" = { - name = "karma-webpack"; - packageName = "karma-webpack"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/karma-webpack/-/karma-webpack-5.0.0.tgz"; - sha512 = "+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA=="; - }; - }; "katex-0.13.24" = { name = "katex"; packageName = "katex"; @@ -44822,22 +44849,13 @@ let sha512 = "jZxYuKCma3VS5UuxOx/rFV1QyGSl3Uy/i0kTJF3HgQ5xMinCQVF8Zd4bMY/9aI9b9A2pjIBOsjSSm68ykTAr8w=="; }; }; - "kdbush-3.0.0" = { - name = "kdbush"; - packageName = "kdbush"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kdbush/-/kdbush-3.0.0.tgz"; - sha512 = "hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew=="; - }; - }; - "keccak-3.0.2" = { + "keccak-3.0.3" = { name = "keccak"; packageName = "keccak"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/keccak/-/keccak-3.0.2.tgz"; - sha512 = "PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ=="; + url = "https://registry.npmjs.org/keccak/-/keccak-3.0.3.tgz"; + sha512 = "JZrLIAJWuZxKbCilMpNz5Vj7Vtb4scDG3dMXLOsbzBmQGyjwE61BbW7bJkfKKCShXiQZt3T6sBgALRtmd+nZaQ=="; }; }; "keep-alive-agent-0.0.1" = { @@ -44930,13 +44948,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.5.1" = { + "keyv-4.5.2" = { name = "keyv"; packageName = "keyv"; - version = "4.5.1"; + version = "4.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.5.1.tgz"; - sha512 = "DONNzZ8b9FLIRIX8kF+JByejgBoGUD4msUvRlHnPMqTb49MwW3thKgB6yGsshzOLW0Bol6SGu5TysvSsM6apdA=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz"; + sha512 = "5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g=="; }; }; "khroma-2.0.0" = { @@ -45047,13 +45065,13 @@ let sha512 = "o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ=="; }; }; - "klona-2.0.5" = { + "klona-2.0.6" = { name = "klona"; packageName = "klona"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz"; - sha512 = "pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ=="; + url = "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz"; + sha512 = "dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA=="; }; }; "knockout-3.5.1" = { @@ -45083,13 +45101,13 @@ let sha512 = "5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg=="; }; }; - "koa-2.13.4" = { + "koa-2.14.1" = { name = "koa"; packageName = "koa"; - version = "2.13.4"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/koa/-/koa-2.13.4.tgz"; - sha512 = "43zkIKubNbnrULWlHdN5h1g3SEKXOEzoAlRsHOTFpnlDu8JlAOZSMJBLULusuXRequboiwJcj5vtYXKB3k7+2g=="; + url = "https://registry.npmjs.org/koa/-/koa-2.14.1.tgz"; + sha512 = "USJFyZgi2l0wDgqkfD27gL4YGno7TfUkcmOe6UOLFOVuN+J7FwnNu4Dydl4CUQzraM1lBAiGed0M9OVJoT0Kqw=="; }; }; "koa-bodyparser-4.3.0" = { @@ -45362,22 +45380,22 @@ let sha512 = "taeidSNMbF4AuUXjoFStT5CSTknicaKqu+0vrw7gYEMrpQgG74BEzlS0BGYmxW20JdGm2gpm7jtZ542ZG/h8tA=="; }; }; - "launchdarkly-js-sdk-common-4.3.2" = { + "launchdarkly-js-sdk-common-4.3.3" = { name = "launchdarkly-js-sdk-common"; packageName = "launchdarkly-js-sdk-common"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/launchdarkly-js-sdk-common/-/launchdarkly-js-sdk-common-4.3.2.tgz"; - sha512 = "18Dzyqjh1th7rKTnPeJcUEwV0tc07z1l9MKW3EFaanPv/XXzdBs2wzc0Nd+y1yY+CpBOiPs4pgYL4K+NHyIB6Q=="; + url = "https://registry.npmjs.org/launchdarkly-js-sdk-common/-/launchdarkly-js-sdk-common-4.3.3.tgz"; + sha512 = "COLKk6JxrP+xFrp7gQMGta19uLik/Gy2iq151lydxRfPbmWcY0BCfW/Y8uTTSjI1r4fLGdWsupIiY0ojhGXu8w=="; }; }; - "launchdarkly-node-client-sdk-2.2.1" = { + "launchdarkly-node-client-sdk-2.2.2" = { name = "launchdarkly-node-client-sdk"; packageName = "launchdarkly-node-client-sdk"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/launchdarkly-node-client-sdk/-/launchdarkly-node-client-sdk-2.2.1.tgz"; - sha512 = "GENjsB5KZUVqFNr7KVkmoSy4PkNjAOWzWVZHEuC4XJKenm5JV8xvzG92F68qm+L/cw7PtFoDZebJXRCbVu+i5w=="; + url = "https://registry.npmjs.org/launchdarkly-node-client-sdk/-/launchdarkly-node-client-sdk-2.2.2.tgz"; + sha512 = "rWXqAS6yXZ7jJdPkbJTij+HR+MbdlItczUxy2JPbSK+ofv4tOhR39ktJSKfqa3go7xwPabKSgaDRf+exP77d3w=="; }; }; "layered-graph-1.2.0" = { @@ -45515,6 +45533,15 @@ let sha512 = "kf0tHHLrpwKaBAQOhYHXgdeh2PkFuCCxWgLb1MRn67ZQVo787D2pij3mmHVZx193GIdM8xcfi8HF6AIYYnj0fQ=="; }; }; + "leac-0.6.0" = { + name = "leac"; + packageName = "leac"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/leac/-/leac-0.6.0.tgz"; + sha512 = "y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg=="; + }; + }; "lead-1.0.0" = { name = "lead"; packageName = "lead"; @@ -45587,6 +45614,15 @@ let sha512 = "OTKKOqeav2QWcERMJR7IS9CUo1sHnke2C0gkSmcR7QuEtFNLLzHQAvnMw8ykvEcv0Qtkg0p7FOwP1v9e5Smdcw=="; }; }; + "level-concat-iterator-3.1.0" = { + name = "level-concat-iterator"; + packageName = "level-concat-iterator"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/level-concat-iterator/-/level-concat-iterator-3.1.0.tgz"; + sha512 = "BWRCMHBxbIqPxJ8vHOvKUsaO0v1sLYZtjN3K2iZJsRBYtp+ONsY6Jfi6hy9K3+zolgQRryhIn2NRZjZnWJ9NmQ=="; + }; + }; "level-errors-2.0.1" = { name = "level-errors"; packageName = "level-errors"; @@ -45650,6 +45686,33 @@ let sha512 = "rXM7GYnW8gsl1vedTJIbzOrRv85c/2uCMpiiCzO2fndd06U/kUXEEU9evYn4zFggBOg36IsBW8LzqIpETwwQzg=="; }; }; + "level-supports-2.1.0" = { + name = "level-supports"; + packageName = "level-supports"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/level-supports/-/level-supports-2.1.0.tgz"; + sha512 = "E486g1NCjW5cF78KGPrMDRBYzPuueMZ6VBXHT6gC7A8UYWGiM14fGgp+s/L1oFfDWSPV/+SFkYCmZ0SiESkRKA=="; + }; + }; + "level-supports-4.0.1" = { + name = "level-supports"; + packageName = "level-supports"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/level-supports/-/level-supports-4.0.1.tgz"; + sha512 = "PbXpve8rKeNcZ9C1mUicC9auIYFyGpkV9/i6g76tLgANwWhtG2v7I4xNBUlkn3lE2/dZF3Pi0ygYGtLc4RXXdA=="; + }; + }; + "level-transcoder-1.0.1" = { + name = "level-transcoder"; + packageName = "level-transcoder"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/level-transcoder/-/level-transcoder-1.0.1.tgz"; + sha512 = "t7bFwFtsQeD8cl8NIoQ2iwxA0CL/9IFw7/9gAjOonH0PWTTiRfY7Hq+Ejbsxh86tXobDQ6IOiddjNYIfOBs06w=="; + }; + }; "leveldown-5.6.0" = { name = "leveldown"; packageName = "leveldown"; @@ -45839,130 +45902,94 @@ let sha512 = "BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA=="; }; }; - "lightning-5.20.2" = { + "lightning-7.0.3" = { name = "lightning"; packageName = "lightning"; - version = "5.20.2"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.20.2.tgz"; - sha512 = "qvrdAKbqaZhwJBRcJeVsHduZDgCZxBrTK5XLvgANXSSu4Jmnc46II+5qd4UTngUzXd65HheINPRU5zi/frkBRg=="; + url = "https://registry.npmjs.org/lightning/-/lightning-7.0.3.tgz"; + sha512 = "oGnfMICKd0cmGxHdXG6VW5Ha/TLVgHJxCCYxHHyOO0PKAAweK8yUV8d0CUfgHaV/rUybTxbQ+oRhMQ6M7yPtyg=="; }; }; - "lightning-5.21.0" = { - name = "lightning"; - packageName = "lightning"; - version = "5.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.21.0.tgz"; - sha512 = "Rha4U1yZS/SHwW/GJ+IeEaxI6vqJ1bx/upQkY5RIZNCn4YoMvqd4inQUt9GNtuLy/pXus8Bms4DL2B9DkujBKQ=="; - }; - }; - "lightning-6.2.4" = { - name = "lightning"; - packageName = "lightning"; - version = "6.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-6.2.4.tgz"; - sha512 = "cbfuQg3hnEQS3Q43MNH/PJ/oa/znVZTPNN6tIX/aoqwbIS5VU0vbJ3URMdiyYXe1UjMDHU1i4cIbV5orWL8asw=="; - }; - }; - "lightning-6.2.5" = { - name = "lightning"; - packageName = "lightning"; - version = "6.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-6.2.5.tgz"; - sha512 = "vyG+wBnoDGiL9xMmUBuKJBKrtcnQFi/fv3GK1PBpZQes5LM8IKNwxyxyNn7liILr/dXHhnlT7fCE+N+jvl/4yg=="; - }; - }; - "lightning-6.2.7" = { - name = "lightning"; - packageName = "lightning"; - version = "6.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-6.2.7.tgz"; - sha512 = "2O68CU67XWqbahWRG4Ut5OsdqzxWh3Pg2bboiGcSSBA1boRECQLvw3cpnsFZK7Sef5s4NhgslDu7bZxyrDa8pw=="; - }; - }; - "lightningcss-1.16.1" = { + "lightningcss-1.18.0" = { name = "lightningcss"; packageName = "lightningcss"; - version = "1.16.1"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.16.1.tgz"; - sha512 = "zU8OTaps3VAodmI2MopfqqOQQ4A9L/2Eo7xoTH/4fNkecy6ftfiGwbbRMTQqtIqJjRg3f927e+lnyBBPhucY1Q=="; + url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.18.0.tgz"; + sha512 = "uk10tNxi5fhZqU93vtYiQgx/8a9f0Kvtj5AXIm+VlOXY+t/DWDmCZWJEkZJmmALgvbS6aAW8or+Kq85eJ6TDTw=="; }; }; - "lightningcss-darwin-arm64-1.16.1" = { + "lightningcss-darwin-arm64-1.18.0" = { name = "lightningcss-darwin-arm64"; packageName = "lightningcss-darwin-arm64"; - version = "1.16.1"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.16.1.tgz"; - sha512 = "/J898YSAiGVqdybHdIF3Ao0Hbh2vyVVj5YNm3NznVzTSvkOi3qQCAtO97sfmNz+bSRHXga7ZPLm+89PpOM5gAg=="; + url = "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.18.0.tgz"; + sha512 = "OqjydwtiNPgdH1ByIjA1YzqvDG/OMR6L3LPN6wRl1729LB0y4Mik7L06kmZaTb+pvUHr+NmDd2KCwnlrQ4zO3w=="; }; }; - "lightningcss-darwin-x64-1.16.1" = { + "lightningcss-darwin-x64-1.18.0" = { name = "lightningcss-darwin-x64"; packageName = "lightningcss-darwin-x64"; - version = "1.16.1"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.16.1.tgz"; - sha512 = "vyKCNPRNRqke+5i078V+N0GLfMVLEaNcqIcv28hA/vUNRGk/90EDkDB9EndGay0MoPIrC2y0qE3Y74b/OyedqQ=="; + url = "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.18.0.tgz"; + sha512 = "mNiuPHj89/JHZmJMp+5H8EZSt6EL5DZRWJ31O6k3DrLLnRIQjXuXdDdN8kP7LoIkeWI5xvyD60CsReJm+YWYAw=="; }; }; - "lightningcss-linux-arm-gnueabihf-1.16.1" = { + "lightningcss-linux-arm-gnueabihf-1.18.0" = { name = "lightningcss-linux-arm-gnueabihf"; packageName = "lightningcss-linux-arm-gnueabihf"; - version = "1.16.1"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.16.1.tgz"; - sha512 = "0AJC52l40VbrzkMJz6qRvlqVVGykkR2MgRS4bLjVC2ab0H0I/n4p6uPZXGvNIt5gw1PedeND/hq+BghNdgfuPQ=="; + url = "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.18.0.tgz"; + sha512 = "S+25JjI6601HiAVoTDXW6SqH+E94a+FHA7WQqseyNHunOgVWKcAkNEc2LJvVxgwTq6z41sDIb9/M3Z9wa9lk4A=="; }; }; - "lightningcss-linux-arm64-gnu-1.16.1" = { + "lightningcss-linux-arm64-gnu-1.18.0" = { name = "lightningcss-linux-arm64-gnu"; packageName = "lightningcss-linux-arm64-gnu"; - version = "1.16.1"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.16.1.tgz"; - sha512 = "NqxYXsRvI3/Fb9AQLXKrYsU0Q61LqKz5It+Es9gidsfcw1lamny4lmlUgO3quisivkaLCxEkogaizcU6QeZeWQ=="; + url = "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.18.0.tgz"; + sha512 = "JSqh4+21dCgBecIQUet35dtE4PhhSEMyqe3y0ZNQrAJQ5kyUPSQHiw81WXnPJcOSTTpG0TyMLiC8K//+BsFGQA=="; }; }; - "lightningcss-linux-arm64-musl-1.16.1" = { + "lightningcss-linux-arm64-musl-1.18.0" = { name = "lightningcss-linux-arm64-musl"; packageName = "lightningcss-linux-arm64-musl"; - version = "1.16.1"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.16.1.tgz"; - sha512 = "VUPQ4dmB9yDQxpJF8/imtwNcbIPzlL6ArLHSUInOGxipDk1lOAklhUjbKUvlL3HVlDwD3WHCxggAY01WpFcjiA=="; + url = "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.18.0.tgz"; + sha512 = "2FWHa8iUhShnZnqhn2wfIcK5adJat9hAAaX7etNsoXJymlliDIOFuBQEsba2KBAZSM4QqfQtvRdR7m8i0I7ybQ=="; }; }; - "lightningcss-linux-x64-gnu-1.16.1" = { + "lightningcss-linux-x64-gnu-1.18.0" = { name = "lightningcss-linux-x64-gnu"; packageName = "lightningcss-linux-x64-gnu"; - version = "1.16.1"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.16.1.tgz"; - sha512 = "A40Jjnbellnvh4YF+kt047GLnUU59iLN2LFRCyWQG+QqQZeXOCzXfTQ6EJB4yvHB1mQvWOVdAzVrtEmRw3Vh8g=="; + url = "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.18.0.tgz"; + sha512 = "plCPGQJtDZHcLVKVRLnQVF2XRsIC32WvuJhQ7fJ7F6BV98b/VZX0OlX05qUaOESD9dCDHjYSfxsgcvOKgCWh7A=="; }; }; - "lightningcss-linux-x64-musl-1.16.1" = { + "lightningcss-linux-x64-musl-1.18.0" = { name = "lightningcss-linux-x64-musl"; packageName = "lightningcss-linux-x64-musl"; - version = "1.16.1"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.16.1.tgz"; - sha512 = "VZf76GxW+8mk238tpw0u9R66gBi/m0YB0TvD54oeGiOqvTZ/mabkBkbsuXTSWcKYj8DSrLW+A42qu+6PLRsIgA=="; + url = "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.18.0.tgz"; + sha512 = "na+BGtVU6fpZvOHKhnlA0XHeibkT3/46nj6vLluG3kzdJYoBKU6dIl7DSOk++8jv4ybZyFJ0aOFMMSc8g2h58A=="; }; }; - "lightningcss-win32-x64-msvc-1.16.1" = { + "lightningcss-win32-x64-msvc-1.18.0" = { name = "lightningcss-win32-x64-msvc"; packageName = "lightningcss-win32-x64-msvc"; - version = "1.16.1"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.16.1.tgz"; - sha512 = "Djy+UzlTtJMayVJU3eFuUW5Gdo+zVTNPJhlYw25tNC9HAoMCkIdSDDrGsWEdEyibEV7xwB8ySTmLuxilfhBtgg=="; + url = "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.18.0.tgz"; + sha512 = "5qeAH4RMNy2yMNEl7e5TI6upt/7xD2ZpHWH4RkT8iJ7/6POS5mjHbXWUO9Q1hhDhqkdzGa76uAdMzEouIeCyNw=="; }; }; "lilconfig-2.0.6" = { @@ -46136,13 +46163,13 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; - "listr2-5.0.5" = { + "listr2-5.0.7" = { name = "listr2"; packageName = "listr2"; - version = "5.0.5"; + version = "5.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/listr2/-/listr2-5.0.5.tgz"; - sha512 = "DpBel6fczu7oQKTXMekeprc0o3XDgGMkD7JNYyX+X0xbwK+xgrx9dcyKoXKqpLSUvAWfmoePS7kavniOcq3r4w=="; + url = "https://registry.npmjs.org/listr2/-/listr2-5.0.7.tgz"; + sha512 = "MD+qXHPmtivrHIDRwPYdfNkrzqDiuaKU/rfBcec3WMyMF3xylQj3jMq344OtvQxz7zaCFViRAeqlr2AFhPvXHw=="; }; }; "livereload-0.9.3" = { @@ -46181,94 +46208,49 @@ let sha512 = "iBA0cb13CobBSoGJLfZgnrykLlfJipDAnvtf+YwIqqzBEsTeQYsXrHaSBkaHd5wCWeabwrNvhjZoFMUrlo+eLw=="; }; }; - "ln-accounting-6.1.0" = { + "ln-accounting-6.1.3" = { name = "ln-accounting"; packageName = "ln-accounting"; - version = "6.1.0"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-6.1.0.tgz"; - sha512 = "FjMmDVigqvbBXNHmnqe5unkZEQm9/GHQ78AvdXhPQVbYwhlpbniujFBwXi1H3iixqjTjjR5zVuocq8rNvvrSqA=="; + url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-6.1.3.tgz"; + sha512 = "8eQvvZb/MiYcRUlg/iIaamWSSTLBpLidLiviqmZ3enpnliW1JIA6pgXsbfyKSWPK3bdzqPuRGnQKQevXsTAybQ=="; }; }; - "ln-service-53.22.0" = { + "ln-service-54.9.0" = { name = "ln-service"; packageName = "ln-service"; - version = "53.22.0"; + version = "54.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.22.0.tgz"; - sha512 = "qnjiTbGEAvk92xewNPmo+PT2foGcbxh8DR3dGb6GeylBS0mhkIYF5PMVUu/8Hr/h+11CksGJ+u43DEJNxmbFhA=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-54.9.0.tgz"; + sha512 = "aeuRa5B3EhCJf6RL2m2oTK7luClU90Evhqp9RRWcfxngQZc2BSbw47fav63WaoXwA/o7/3tgy6y/1bCZ5UfzgA=="; }; }; - "ln-service-53.23.0" = { - name = "ln-service"; - packageName = "ln-service"; - version = "53.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.23.0.tgz"; - sha512 = "Ds3IzMNEiAgP8auc9AfDbzr6E2Xdy/GTUcLc6m5FM66JtJBM3jM52apzod+VG1vGm9rVyHfCeem/iP4oyaNPYA=="; - }; - }; - "ln-service-54.2.3" = { - name = "ln-service"; - packageName = "ln-service"; - version = "54.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-54.2.3.tgz"; - sha512 = "JEIdi71SJTIQJ2bVq5jYu/NSvEmYkpGVm4w5yORR3CXc2BcVy1aKF8tiemZNOByLQv8j3hZcHao31Bwcz+1G1A=="; - }; - }; - "ln-service-54.2.4" = { - name = "ln-service"; - packageName = "ln-service"; - version = "54.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-54.2.4.tgz"; - sha512 = "n8OWGBQRxAf1Oqk6p77jidkkljENjkwWqElIZtRz4QLfVHpFCxhNoMOCcG5iUTt0t53P8zo3s0xzOXRPUEUT8g=="; - }; - }; - "ln-service-54.2.6" = { - name = "ln-service"; - packageName = "ln-service"; - version = "54.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-54.2.6.tgz"; - sha512 = "HEFcTdVj1nYfhkLzPKtCtBZhw+I9FB8qoJhMb4ro8cwMebRSG/lDDcIvkANfi7ccFLbRNB+M7Tk1vHRaFdQAzw=="; - }; - }; - "ln-sync-3.14.0" = { + "ln-sync-4.2.0" = { name = "ln-sync"; packageName = "ln-sync"; - version = "3.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.14.0.tgz"; - sha512 = "qLRJvl9WqcVo5cbfGeOprflN9194hf9Azd9fHikeixaziWiV1WBObR8jWE4ShQ+dZVnptd6FP8fSNRJqtq4WgA=="; - }; - }; - "ln-sync-4.0.4" = { - name = "ln-sync"; - packageName = "ln-sync"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-4.0.4.tgz"; - sha512 = "8ZJ239vnF+t3spwLTxVGr+YEq7qXLBsT/J6j2khCazGEiPz+C3O0Jo+vXGlU6+1omNphN+yl6qGkYAwJLioMDA=="; - }; - }; - "ln-sync-4.0.5" = { - name = "ln-sync"; - packageName = "ln-sync"; - version = "4.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-4.0.5.tgz"; - sha512 = "zzFK2CMBAiDlnLu/m+kpD4Oqz6YGXg4aiTbtygUOOFEBSdvHtXG4WaM2xFpKf7g4cvHGhYS6xsmMYwVepwsypA=="; - }; - }; - "ln-telegram-4.2.0" = { - name = "ln-telegram"; - packageName = "ln-telegram"; version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-4.2.0.tgz"; - sha512 = "N5sjJj1JrLWB9gA3bp6z9PpJF2EdyIsAhaBK8ZlFOaNZiNybt9hAF51S3aIyVoz3k0o7Wo07i1WyK/lNEftVYA=="; + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-4.2.0.tgz"; + sha512 = "yRQZ7nQOIa97p4vWeUo8iqGXX0nVMoROqA3PVm29RnW+AgKPk3sXtJ+LUDu+vMNkOauocrGz1vXS61Q+WNLutg=="; + }; + }; + "ln-sync-4.3.0" = { + name = "ln-sync"; + packageName = "ln-sync"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-4.3.0.tgz"; + sha512 = "DQr68yZBk9QmcSKRJ9Nto6WxB2xjRS2XcUFSQXNDWkM+r9vMFCsqNUFU5IMVt/aLiKnf4PdKQ3mhfrvbH+TMuQ=="; + }; + }; + "ln-telegram-4.6.1" = { + name = "ln-telegram"; + packageName = "ln-telegram"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-4.6.1.tgz"; + sha512 = "0zoS1dDGXKwT2ixtSxfWRJsHdcz7ap+PNoNB5KEB3vKeAR1fuGZAz1kr5lbKXGLK8Y8RaR/S/qK3hV8e5khfkg=="; }; }; "load-bmfont-1.4.1" = { @@ -46343,13 +46325,13 @@ let sha512 = "od7eKCCZ62ITvFf8nHHrIiYmgOHb4xVNDRDqxBWSaao5FZyyZVX8OmRCbwjDGPrSrgIulwPNyBsWCGnhiDC0oQ=="; }; }; - "load-plugin-5.0.0" = { + "load-plugin-5.1.0" = { name = "load-plugin"; packageName = "load-plugin"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/load-plugin/-/load-plugin-5.0.0.tgz"; - sha512 = "jTz8tvC0BTMtof27lTSV5SAOnCRT0Z++k+S3QeQ5CrF8ZAS5L2nhi3euf4ZhJyDkds+nOQGyPcFqdQZ9s8ELkg=="; + url = "https://registry.npmjs.org/load-plugin/-/load-plugin-5.1.0.tgz"; + sha512 = "Lg1CZa1CFj2CbNaxijTL6PCbzd4qGTlZov+iH2p5Xwy/ApcZJh+i6jMN2cYePouTfjJfrNu3nXFdEw8LvbjPFQ=="; }; }; "load-yaml-file-0.2.0" = { @@ -46406,40 +46388,22 @@ let sha512 = "gkD9aSEG9UGglyPcDJqY9YBTUtCLKaBK6ihD2VP1d1X60lTfFspNZNulGBBbUZLkPygy4LySYHyxBpq+VhjObQ=="; }; }; - "loader-utils-1.4.0" = { + "loader-utils-1.4.2" = { name = "loader-utils"; packageName = "loader-utils"; - version = "1.4.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz"; - sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz"; + sha512 = "I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg=="; }; }; - "loader-utils-2.0.0" = { + "loader-utils-2.0.4" = { name = "loader-utils"; packageName = "loader-utils"; - version = "2.0.0"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz"; - sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="; - }; - }; - "loader-utils-2.0.3" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz"; - sha512 = "THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A=="; - }; - }; - "loadware-2.0.0" = { - name = "loadware"; - packageName = "loadware"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loadware/-/loadware-2.0.0.tgz"; - sha512 = "PD5Yn9VFr7RTJLvIx/CBRALvE+PATUDoEedCcik49Te30LK4qU39DZPV3oxhhF9ql9NKg3kwL+kyf0NqnX9e/g=="; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz"; + sha512 = "xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw=="; }; }; "loady-0.0.5" = { @@ -47279,6 +47243,15 @@ let sha512 = "Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="; }; }; + "lodash.isempty-4.4.0" = { + name = "lodash.isempty"; + packageName = "lodash.isempty"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz"; + sha512 = "oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg=="; + }; + }; "lodash.isequal-4.5.0" = { name = "lodash.isequal"; packageName = "lodash.isequal"; @@ -47396,6 +47369,15 @@ let sha512 = "yv3cSQZmfpbIKo4Yo45B1taEvxjNvcpF1CEOc0Y6dEyvhPIfEJE3twDwPgWTPQubcSgXyBwBKG6wpQvWMDOf6Q=="; }; }; + "lodash.kebabcase-4.1.1" = { + name = "lodash.kebabcase"; + packageName = "lodash.kebabcase"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz"; + sha512 = "N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g=="; + }; + }; "lodash.keys-2.4.1" = { name = "lodash.keys"; packageName = "lodash.keys"; @@ -47459,6 +47441,15 @@ let sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; }; + "lodash.mergewith-4.6.2" = { + name = "lodash.mergewith"; + packageName = "lodash.mergewith"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz"; + sha512 = "GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ=="; + }; + }; "lodash.noop-2.4.1" = { name = "lodash.noop"; packageName = "lodash.noop"; @@ -47594,6 +47585,15 @@ let sha512 = "HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="; }; }; + "lodash.startcase-4.4.0" = { + name = "lodash.startcase"; + packageName = "lodash.startcase"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz"; + sha512 = "+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg=="; + }; + }; "lodash.support-2.4.1" = { name = "lodash.support"; packageName = "lodash.support"; @@ -47747,6 +47747,15 @@ let sha512 = "7lYL8bLopMoy4CTICbxygAUq6CdRJ36vFc80DucPueUee+d5NBRxz3FdT9Pes/HEx5mPoT9jwnsEJWz1N7uq7Q=="; }; }; + "lodash.upperfirst-4.3.1" = { + name = "lodash.upperfirst"; + packageName = "lodash.upperfirst"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz"; + sha512 = "sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg=="; + }; + }; "lodash.zip-4.2.0" = { name = "lodash.zip"; packageName = "lodash.zip"; @@ -47756,15 +47765,6 @@ let sha512 = "C7IOaBBK/0gMORRBd8OETNx3kmOkgIWIPvyDpZSCTwUrpYmgZwJkjZeOD8ww4xbOUOs4/attY+pciKvadNfFbg=="; }; }; - "log-1.4.0" = { - name = "log"; - packageName = "log"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log/-/log-1.4.0.tgz"; - sha512 = "NnLhcxIAbhdhuMU0jDG83YjAH8JQj8tXUTy54Ib+4owuXwerrYFI8+OsnK1Ez/cig8O859QK6u6g0aYph/X/zQ=="; - }; - }; "log-6.3.1" = { name = "log"; packageName = "log"; @@ -47891,13 +47891,13 @@ let sha512 = "Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw=="; }; }; - "log4js-6.7.0" = { + "log4js-6.7.1" = { name = "log4js"; packageName = "log4js"; - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-6.7.0.tgz"; - sha512 = "KA0W9ffgNBLDj6fZCq/lRbgR6ABAodRIDHrZnS48vOtfKa4PzWImb0Md1lmGCdO3n3sbCm/n1/WmrNlZ8kCI3Q=="; + url = "https://registry.npmjs.org/log4js/-/log4js-6.7.1.tgz"; + sha512 = "lzbd0Eq1HRdWM2abSD7mk6YIVY0AogGJzb/z+lqzRk+8+XJP+M6L1MS5FUSc3jjGru4dbKjEMJmqlsoYYpuivQ=="; }; }; "logform-2.4.2" = { @@ -47918,13 +47918,13 @@ let sha512 = "B1Rjay3Ye/JcythUjMt+KLiLIwOjnMJN1M5BRbDgNMsJhmn7yApbx6n1rw7cT3Fi/NA77HDM+y3y1nXvKQVB9Q=="; }; }; - "loglevel-1.8.0" = { + "loglevel-1.8.1" = { name = "loglevel"; packageName = "loglevel"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.8.0.tgz"; - sha512 = "G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz"; + sha512 = "tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg=="; }; }; "loglevel-colored-level-prefix-1.0.0" = { @@ -48026,13 +48026,13 @@ let sha512 = "vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg=="; }; }; - "longest-streak-3.0.1" = { + "longest-streak-3.1.0" = { name = "longest-streak"; packageName = "longest-streak"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/longest-streak/-/longest-streak-3.0.1.tgz"; - sha512 = "cHlYSUpL2s7Fb3394mYxwTYj8niTaNHUCLr0qdiCXQfSjfuA7CKofpX2uSwEfFDQ0EB7JcnMnm+GjbqqoinYYg=="; + url = "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz"; + sha512 = "9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g=="; }; }; "looper-2.0.0" = { @@ -48107,13 +48107,13 @@ let sha512 = "S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ=="; }; }; - "loupe-2.3.5" = { + "loupe-2.3.6" = { name = "loupe"; packageName = "loupe"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/loupe/-/loupe-2.3.5.tgz"; - sha512 = "KNGVjhsXDxvY/cYE8GNi7SBaJSfJIT+/+/8GlprqBXpoU6cSR7/RT7OBJOsoYtyxq0L3q6oIcO8tX7dbEEXr3A=="; + url = "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz"; + sha512 = "RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA=="; }; }; "lowdb-0.13.1" = { @@ -48260,6 +48260,15 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; + "lru-cache-7.13.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "7.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.13.1.tgz"; + sha512 = "CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ=="; + }; + }; "lru-cache-7.14.1" = { name = "lru-cache"; packageName = "lru-cache"; @@ -48351,31 +48360,22 @@ let sha512 = "zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="; }; }; - "luxon-1.28.0" = { + "luxon-1.28.1" = { name = "luxon"; packageName = "luxon"; - version = "1.28.0"; + version = "1.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-1.28.0.tgz"; - sha512 = "TfTiyvZhwBYM/7QdAVDh+7dBTBA29v4ik0Ce9zda3Mnf8on1S5KJI8P2jKFZ8+5C0jhmr0KwJEO/Wdpm0VeWJQ=="; + url = "https://registry.npmjs.org/luxon/-/luxon-1.28.1.tgz"; + sha512 = "gYHAa180mKrNIUJCbwpmD0aTu9kV0dREDrwNnuyFAsO1Wt0EVYSZelPnJlbj9HplzXX/YWXHFTL45kvZ53M0pw=="; }; }; - "luxon-3.0.4" = { + "luxon-3.2.1" = { name = "luxon"; packageName = "luxon"; - version = "3.0.4"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-3.0.4.tgz"; - sha512 = "aV48rGUwP/Vydn8HT+5cdr26YYQiUZ42NM6ToMoaGKwYfWbfLeRkEu1wXWMHBZT6+KyLfcbbtVcoQFCbbPjKlw=="; - }; - }; - "luxon-3.1.0" = { - name = "luxon"; - packageName = "luxon"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-3.1.0.tgz"; - sha512 = "7w6hmKC0/aoWnEsmPCu5Br54BmbmUp5GfcqBxQngRcXJ+q5fdfjEzn7dxmJh2YdDhgW8PccYtlWKSv4tQkrTQg=="; + url = "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz"; + sha512 = "QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg=="; }; }; "lzma-native-8.0.6" = { @@ -48459,13 +48459,22 @@ let sha512 = "RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="; }; }; - "magic-string-0.26.2" = { + "magic-string-0.26.7" = { name = "magic-string"; packageName = "magic-string"; - version = "0.26.2"; + version = "0.26.7"; src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.26.2.tgz"; - sha512 = "NzzlXpclt5zAbmo6h6jNc8zl2gNRGHvmsZW4IvZhTC4W7k4OlLP+S5YLussa/r3ixNT66KOQfNORlXHSOy/X4A=="; + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.26.7.tgz"; + sha512 = "hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow=="; + }; + }; + "magic-string-0.27.0" = { + name = "magic-string"; + packageName = "magic-string"; + version = "0.27.0"; + src = fetchurl { + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz"; + sha512 = "8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA=="; }; }; "magicli-0.0.5" = { @@ -48567,6 +48576,15 @@ let sha512 = "NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w=="; }; }; + "make-fetch-happen-11.0.2" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "11.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.2.tgz"; + sha512 = "5n/Pq41w/uZghpdlXAY5kIM85RgJThtTH/NYBRAZ9VUOBWV90USaQjwGrw76fZP3Lj5hl/VZjpVvOaRBMoL/2w=="; + }; + }; "make-fetch-happen-9.1.0" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; @@ -48693,24 +48711,6 @@ let sha512 = "4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w=="; }; }; - "mapbox-gl-1.13.2" = { - name = "mapbox-gl"; - packageName = "mapbox-gl"; - version = "1.13.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.13.2.tgz"; - sha512 = "CPjtWygL+f7naL+sGHoC2JQR0DG7u+9ik6WdkjjVmz2uy0kBC2l+aKfdi3ZzUR7VKSQJ6Mc/CeCN+6iVNah+ww=="; - }; - }; - "maplibre-gl-2.4.0" = { - name = "maplibre-gl"; - packageName = "maplibre-gl"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-2.4.0.tgz"; - sha512 = "csNFylzntPmHWidczfgCZpvbTSmhaWvLRj9e1ezUDBEPizGgshgm3ea1T5TCNEEBq0roauu7BPuRZjA3wO4KqA=="; - }; - }; "mapnik-reference-8.10.0" = { name = "mapnik-reference"; packageName = "mapnik-reference"; @@ -48792,13 +48792,13 @@ let sha512 = "/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA=="; }; }; - "markdown-it-anchor-8.6.5" = { + "markdown-it-anchor-8.6.6" = { name = "markdown-it-anchor"; packageName = "markdown-it-anchor"; - version = "8.6.5"; + version = "8.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.5.tgz"; - sha512 = "PI1qEHHkTNWT+X6Ip9w+paonfIQ+QZP9sCeMYi47oqhH+EsW8CrJ8J7CzV19QVOj6il8ATGbK2nTECj22ZHGvQ=="; + url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.6.tgz"; + sha512 = "jRW30YGywD2ESXDc+l17AiritL0uVaSnWsb26f+68qaW9zgbIIr1f4v2Nsvc0+s0Z2N3uX6t/yAw7BwCQ1wMsA=="; }; }; "markdown-it-deflist-2.1.0" = { @@ -48954,31 +48954,31 @@ let sha512 = "Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A=="; }; }; - "markdown-table-3.0.2" = { + "markdown-table-3.0.3" = { name = "markdown-table"; packageName = "markdown-table"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.2.tgz"; - sha512 = "y8j3a5/DkJCmS5x4dMCQL+OR0+2EAq3DOtio1COSHsmW2BGXnNCK3v12hJt1LrUz5iZH5g0LmuYOjDdI+czghA=="; + url = "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.3.tgz"; + sha512 = "Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw=="; }; }; - "markdownlint-0.26.2" = { + "markdownlint-0.27.0" = { name = "markdownlint"; packageName = "markdownlint"; - version = "0.26.2"; + version = "0.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdownlint/-/markdownlint-0.26.2.tgz"; - sha512 = "2Am42YX2Ex5SQhRq35HxYWDfz1NLEOZWWN25nqd2h3AHRKsGRE+Qg1gt1++exW792eXTrR4jCNHfShfWk9Nz8w=="; + url = "https://registry.npmjs.org/markdownlint/-/markdownlint-0.27.0.tgz"; + sha512 = "HtfVr/hzJJmE0C198F99JLaeada+646B5SaG2pVoEakLFI6iRGsvMqrnnrflq8hm1zQgwskEgqSnhDW11JBp0w=="; }; }; - "markdownlint-cli2-0.5.1" = { + "markdownlint-cli2-0.6.0" = { name = "markdownlint-cli2"; packageName = "markdownlint-cli2"; - version = "0.5.1"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.5.1.tgz"; - sha512 = "f3Nb1GF/c8YSrV/FntsCWzpa5mLFJRlO+wzEgv+lkNQjU6MZflUwc2FbyEDPTo6oVhP2VyUOkK0GkFgfuktl1w=="; + url = "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.6.0.tgz"; + sha512 = "Bv20r6WGdcHMWi8QvAFZ3CBunf4i4aYmVdTfpAvXODI/1k3f09DZZ0i0LcX9ZMhlVxjoOzbVDz1NWyKc5hwTqg=="; }; }; "markdownlint-cli2-formatter-default-0.0.3" = { @@ -48990,15 +48990,6 @@ let sha512 = "QEAJitT5eqX1SNboOD+SO/LNBpu4P4je8JlR02ug2cLQAqmIhh8IJnSK7AcaHBHhNADqdGydnPpQOpsNcEEqCw=="; }; }; - "markdownlint-rule-helpers-0.17.2" = { - name = "markdownlint-rule-helpers"; - packageName = "markdownlint-rule-helpers"; - version = "0.17.2"; - src = fetchurl { - url = "https://registry.npmjs.org/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.17.2.tgz"; - sha512 = "XaeoW2NYSlWxMCZM2B3H7YTG6nlaLfkEZWMBhr4hSPlq9MuY2sy83+Xr89jXOqZMZYjvi5nBCGoFh7hHoPKZmA=="; - }; - }; "marked-0.3.19" = { name = "marked"; packageName = "marked"; @@ -49008,13 +48999,13 @@ let sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="; }; }; - "marked-4.2.2" = { + "marked-4.2.12" = { name = "marked"; packageName = "marked"; - version = "4.2.2"; + version = "4.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-4.2.2.tgz"; - sha512 = "JjBTFTAvuTgANXx82a5vzK9JLSMoV6V3LBVn4Uhdso6t7vXrGx7g1Cd2r6NYSsxrYbQGFCMqBDhFHyK5q2UvcQ=="; + url = "https://registry.npmjs.org/marked/-/marked-4.2.12.tgz"; + sha512 = "yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw=="; }; }; "marked-terminal-5.1.1" = { @@ -49224,13 +49215,13 @@ let sha512 = "vTFXtmbbF3rgnTh3Zl3irso4LtvwUq/jaDvT2D1JqTGAwaipcS7RpTxzi6KjoRqI9n2yuAhzLDAC8xVTF3XYVQ=="; }; }; - "mdast-comment-marker-2.1.0" = { + "mdast-comment-marker-2.1.1" = { name = "mdast-comment-marker"; packageName = "mdast-comment-marker"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-2.1.0.tgz"; - sha512 = "/+Cfm8A83PjkqjQDB9iYqHESGuXlriCWAwRGPJjkYmxXrF4r6saxeUlOKNrf+SogTwg9E8uyHRCFHLG6/BAAdA=="; + url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-2.1.1.tgz"; + sha512 = "ktFfySmbRfOPiWoLkRKqkkyYkDnBVX5b5FqXwnvV1TmgVOl49ETsYK4hPKqrlM15y7AtxNDKIKwJRkZa3TWkng=="; }; }; "mdast-util-compact-2.0.1" = { @@ -49251,13 +49242,13 @@ let sha512 = "9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA=="; }; }; - "mdast-util-find-and-replace-2.2.1" = { + "mdast-util-find-and-replace-2.2.2" = { name = "mdast-util-find-and-replace"; packageName = "mdast-util-find-and-replace"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.1.tgz"; - sha512 = "SobxkQXFAdd4b5WmEakmkVoh18icjQRxGy5OWTCzgsLRm1Fu/KCtwD1HIQSsmq5ZRjVH0Ehwg6/Fn3xIUk+nKw=="; + url = "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.2.tgz"; + sha512 = "MTtdFRz/eMDHXzeK6W3dO7mXUlF82Gom4y0oOgvHhh/HXZAGvIQDUvQ0SuUx+j2tv44b8xTHOm8K/9OoRFnXKw=="; }; }; "mdast-util-footnote-0.1.7" = { @@ -49278,13 +49269,13 @@ let sha512 = "2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ=="; }; }; - "mdast-util-from-markdown-1.2.0" = { + "mdast-util-from-markdown-1.3.0" = { name = "mdast-util-from-markdown"; packageName = "mdast-util-from-markdown"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.2.0.tgz"; - sha512 = "iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q=="; + url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.3.0.tgz"; + sha512 = "HN3W1gRIuN/ZW295c7zi7g9lVBllMgZE40RxCX37wrTPWXCWtpvOZdfnuK+1WNpvZje6XuJeI3Wnb4TJEUem+g=="; }; }; "mdast-util-frontmatter-0.2.0" = { @@ -49296,13 +49287,13 @@ let sha512 = "FHKL4w4S5fdt1KjJCwB0178WJ0evnyyQr5kXTM3wrOVpytD0hrkvd+AOOjU9Td8onOejCkmZ+HQRT3CZ3coHHQ=="; }; }; - "mdast-util-frontmatter-1.0.0" = { + "mdast-util-frontmatter-1.0.1" = { name = "mdast-util-frontmatter"; packageName = "mdast-util-frontmatter"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-frontmatter/-/mdast-util-frontmatter-1.0.0.tgz"; - sha512 = "7itKvp0arEVNpCktOET/eLFAYaZ+0cNjVtFtIPxgQ5tV+3i+D4SDDTjTzPWl44LT59PC+xdx+glNTawBdF98Mw=="; + url = "https://registry.npmjs.org/mdast-util-frontmatter/-/mdast-util-frontmatter-1.0.1.tgz"; + sha512 = "JjA2OjxRqAa8wEG8hloD0uTU0kdn8kbtOWpPP94NBkfAlbxn4S8gCGf/9DwFtEeGPXrDcNXdiDjVaRdUFqYokw=="; }; }; "mdast-util-gfm-0.1.2" = { @@ -49341,13 +49332,13 @@ let sha512 = "FzopkOd4xTTBeGXhXSBU0OCDDh5lUj2rd+HQqG92Ld+jL4lpUfgX2AT2OHAVP9aEeDKp7G92fuooSZcYJA3cRg=="; }; }; - "mdast-util-gfm-footnote-1.0.1" = { + "mdast-util-gfm-footnote-1.0.2" = { name = "mdast-util-gfm-footnote"; packageName = "mdast-util-gfm-footnote"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.1.tgz"; - sha512 = "p+PrYlkw9DeCRkTVw1duWqPRHX6Ywh2BNKJQcZbCwAuP/59B0Lk9kakuAd7KbQprVO4GzdW8eS5++A9PUSqIyw=="; + url = "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.2.tgz"; + sha512 = "56D19KOGbE00uKVj3sgIykpwKL179QsVFwx/DCW0u/0+URsryacI4MAdNJl0dh+u2PSsD9FtxPFbHCzJ78qJFQ=="; }; }; "mdast-util-gfm-strikethrough-0.2.3" = { @@ -49395,13 +49386,13 @@ let sha512 = "/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A=="; }; }; - "mdast-util-gfm-task-list-item-1.0.1" = { + "mdast-util-gfm-task-list-item-1.0.2" = { name = "mdast-util-gfm-task-list-item"; packageName = "mdast-util-gfm-task-list-item"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - 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=="; + url = "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.2.tgz"; + sha512 = "PFTA1gzfp1B1UaiJVyhJZA1rm0+Tzn690frc/L8vNX1Jop4STZgOE6bxUhnzdVSB+vm2GU1tIsuQcA9bxTQpMQ=="; }; }; "mdast-util-heading-style-1.0.6" = { @@ -49449,6 +49440,15 @@ let sha512 = "7N5ihsOkAEGjFotIX9p/YPdl4TqUoMxL4ajNz7PbT89BqsdWJuBC9rvgt6wpbwTZqWWR0jKWqQbwsOWDBUZv4g=="; }; }; + "mdast-util-phrasing-3.0.1" = { + name = "mdast-util-phrasing"; + packageName = "mdast-util-phrasing"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-phrasing/-/mdast-util-phrasing-3.0.1.tgz"; + sha512 = "WmI1gTXUBJo4/ZmSk79Wcb2HcjPJBzM1nlI/OUWA8yk2X9ik3ffNbBGsU+09BFmXaL1IBb9fiuvq6/KMiNycSg=="; + }; + }; "mdast-util-to-markdown-0.6.5" = { name = "mdast-util-to-markdown"; packageName = "mdast-util-to-markdown"; @@ -49458,13 +49458,13 @@ let sha512 = "XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ=="; }; }; - "mdast-util-to-markdown-1.3.0" = { + "mdast-util-to-markdown-1.5.0" = { name = "mdast-util-to-markdown"; packageName = "mdast-util-to-markdown"; - version = "1.3.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.3.0.tgz"; - sha512 = "6tUSs4r+KK4JGTTiQ7FfHmVOaDrLQJPmpjD6wPMlHGUVXoG9Vjc3jIeP+uyBWRf8clwB2blM+W7+KrlMYQnftA=="; + url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.5.0.tgz"; + sha512 = "bbv7TPv/WC49thZPg3jXuqzuvI45IL2EVAr/KxF0BSdHsU0ceFHOmwQn6evxAh1GaoK/6GQ1wp4R4oW2+LFL/A=="; }; }; "mdast-util-to-nlcst-4.0.1" = { @@ -49503,13 +49503,13 @@ let sha512 = "AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w=="; }; }; - "mdast-util-to-string-3.1.0" = { + "mdast-util-to-string-3.1.1" = { name = "mdast-util-to-string"; packageName = "mdast-util-to-string"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz"; - sha512 = "n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA=="; + url = "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.1.tgz"; + sha512 = "tGvhT94e+cVnQt8JWE9/b3cUQZWS732TJxXHktvP+BYo62PpYD53Ls/6cC60rW21dW+txxiM4zMdc6abASvZKA=="; }; }; "mdmanifest-1.0.8" = { @@ -49539,6 +49539,15 @@ let sha512 = "aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g=="; }; }; + "mdn-data-2.0.30" = { + name = "mdn-data"; + packageName = "mdn-data"; + version = "2.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz"; + sha512 = "GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA=="; + }; + }; "mdn-data-2.0.4" = { name = "mdn-data"; packageName = "mdn-data"; @@ -49647,6 +49656,15 @@ let sha512 = "Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q=="; }; }; + "mem-8.1.1" = { + name = "mem"; + packageName = "mem"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz"; + sha512 = "qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA=="; + }; + }; "mem-fs-2.2.1" = { name = "mem-fs"; packageName = "mem-fs"; @@ -49656,40 +49674,22 @@ let sha512 = "yiAivd4xFOH/WXlUi6v/nKopBh1QLzwjFi36NK88cGt/PRXI8WeBASqY+YSjIVWvQTx3hR8zHKDBMV6hWmglNA=="; }; }; - "mem-fs-editor-9.5.0" = { + "mem-fs-editor-9.6.0" = { name = "mem-fs-editor"; packageName = "mem-fs-editor"; - version = "9.5.0"; + version = "9.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-9.5.0.tgz"; - sha512 = "7p+bBDqsSisO20YIZf2ntYvST27fFJINn7CKE21XdPUQDcLV62b/yB5sTOooQeEoiZ3rldZQ+4RfONgL/gbRoA=="; + url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-9.6.0.tgz"; + sha512 = "CsuAd+s0UPZnGzm3kQ5X7gGmVmwiX9XXRAmXj9Mbq0CJa8YWUkPqneelp0aG2g+7uiwCBHlJbl30FYtToLT3VQ=="; }; }; - "memfs-3.4.10" = { + "memfs-3.4.13" = { name = "memfs"; packageName = "memfs"; - version = "3.4.10"; + version = "3.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/memfs/-/memfs-3.4.10.tgz"; - sha512 = "0bCUP+L79P4am30yP1msPzApwuMQG23TjwlwdHeEV5MxioDR1a0AgB0T9FfggU52eJuDCq8WVwb5ekznFyWiTQ=="; - }; - }; - "memoize-one-5.2.1" = { - name = "memoize-one"; - packageName = "memoize-one"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz"; - sha512 = "zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="; - }; - }; - "memoize-one-6.0.0" = { - name = "memoize-one"; - packageName = "memoize-one"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz"; - sha512 = "rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="; + url = "https://registry.npmjs.org/memfs/-/memfs-3.4.13.tgz"; + sha512 = "omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg=="; }; }; "memoizee-0.4.15" = { @@ -49926,13 +49926,13 @@ let sha512 = "cylD/HcPXjeSVEPj4menLP0mndi6gvqmTlDq3QF4Vptn1tgc6ilgK7rdcAUA4X3RTkymXRwLuZpNncIfq1q1AA=="; }; }; - "mermaid-9.2.0" = { + "mermaid-9.3.0" = { name = "mermaid"; packageName = "mermaid"; - version = "9.2.0"; + version = "9.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-9.2.0.tgz"; - sha512 = "iWKTBjHoPUSs+mJMpZ5+K9xg97KflKjbv91Bu42yK2jjz4wX4Nt1eshi+bmmFWAhn7f2R0X55hlxxbSxdp0QYA=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-9.3.0.tgz"; + sha512 = "mGl0BM19TD/HbU/LmlaZbjBi//tojelg8P/mxD6pPZTAYaI+VawcyBdqRsoUHSc7j71PrMdJ3HBadoQNdvP5cg=="; }; }; "meros-1.1.4" = { @@ -50223,13 +50223,13 @@ let sha512 = "PpysK2S1Q/5VXi72IIapbi/jliaiOFzv7THH4amwXeYXLq3l1uo8/2Be0Ac1rEwK20MQEsGH2ltAZLNY2KI/0Q=="; }; }; - "micromark-extension-mdx-expression-1.0.3" = { + "micromark-extension-mdx-expression-1.0.4" = { name = "micromark-extension-mdx-expression"; packageName = "micromark-extension-mdx-expression"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-1.0.3.tgz"; - sha512 = "TjYtjEMszWze51NJCZmhv7MEBcgYRgb3tJeMAJ+HQCAaZHHRBaDCccqQzGizR/H4ODefP44wRTgOn2vE5I6nZA=="; + url = "https://registry.npmjs.org/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-1.0.4.tgz"; + sha512 = "TCgLxqW6ReQ3AJgtj1P0P+8ZThBTloLbeb7jNaqr6mCOLDpxUiBFE/9STgooMZttEwOQu5iEcCCa3ZSDhY9FGw=="; }; }; "micromark-extension-mdx-jsx-1.0.3" = { @@ -50286,13 +50286,13 @@ let sha512 = "CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg=="; }; }; - "micromark-factory-mdx-expression-1.0.6" = { + "micromark-factory-mdx-expression-1.0.7" = { name = "micromark-factory-mdx-expression"; packageName = "micromark-factory-mdx-expression"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-1.0.6.tgz"; - sha512 = "WRQIc78FV7KrCfjsEf/sETopbYjElh3xAmNpLkd1ODPqxEngP42eVRGbiPEQWpRV27LzqW+XVTvQAMIIRLPnNA=="; + url = "https://registry.npmjs.org/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-1.0.7.tgz"; + sha512 = "QAdFbkQagTZ/eKb8zDGqmjvgevgJH3+aQpvvKrXWxNJp3o8/l2cAbbrBd0E04r0Gx6nssPpqWIjnbHFvZu5qsQ=="; }; }; "micromark-factory-space-1.0.0" = { @@ -50385,13 +50385,13 @@ let sha512 = "U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA=="; }; }; - "micromark-util-events-to-acorn-1.2.0" = { + "micromark-util-events-to-acorn-1.2.1" = { name = "micromark-util-events-to-acorn"; packageName = "micromark-util-events-to-acorn"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-1.2.0.tgz"; - sha512 = "WWp3bf7xT9MppNuw3yPjpnOxa8cj5ACivEzXJKu0WwnjBYfzaBvIAT9KfeyI0Qkll+bfQtfftSwdgTH6QhTOKw=="; + url = "https://registry.npmjs.org/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-1.2.1.tgz"; + sha512 = "mkg3BaWlw6ZTkQORrKVBW4o9ICXPxLtGz51vml5mQpKFdo9vqIX68CAx5JhTOdjQyAHH7JFmm4rh8toSPQZUmg=="; }; }; "micromark-util-html-tag-name-1.1.0" = { @@ -50574,15 +50574,6 @@ let sha512 = "dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA=="; }; }; - "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"; @@ -50790,15 +50781,6 @@ let sha512 = "I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="; }; }; - "mini-css-extract-plugin-0.5.0" = { - name = "mini-css-extract-plugin"; - packageName = "mini-css-extract-plugin"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz"; - sha512 = "IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw=="; - }; - }; "mini-css-extract-plugin-0.9.0" = { name = "mini-css-extract-plugin"; packageName = "mini-css-extract-plugin"; @@ -50808,13 +50790,13 @@ let sha512 = "lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A=="; }; }; - "mini-css-extract-plugin-2.6.1" = { + "mini-css-extract-plugin-2.7.2" = { name = "mini-css-extract-plugin"; packageName = "mini-css-extract-plugin"; - version = "2.6.1"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz"; - sha512 = "wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg=="; + url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz"; + sha512 = "EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw=="; }; }; "mini-svg-data-uri-1.4.4" = { @@ -50835,13 +50817,13 @@ let sha512 = "LfHUYIA047rrqIZEn0gwbqbzarU5bmZ8yZ9SizeoiPwVq5cemE3foJTJZ3pCktUq/IPkKNGghFHJk1O8149mOA=="; }; }; - "miniflare-2.10.0" = { + "miniflare-2.11.0" = { name = "miniflare"; packageName = "miniflare"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/miniflare/-/miniflare-2.10.0.tgz"; - sha512 = "WPveqChVDdmDGv+wFqXjFqEZlZ5/aBlAKX37h/e4TAjl2XsK5nPfQATP8jZXwNDEC5iE29bYZymOqeZkp+t7OA=="; + url = "https://registry.npmjs.org/miniflare/-/miniflare-2.11.0.tgz"; + sha512 = "QA18I1VQXdCo4nBtPJUcUDxW8c9xbc5ex5F61jwhkGVOISSnYdEheolESmjr8MYk28xwi0XD1ozS4rLaTONd+w=="; }; }; "minilog-3.1.0" = { @@ -50934,13 +50916,22 @@ let sha512 = "nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g=="; }; }; - "minimatch-5.1.0" = { + "minimatch-5.1.2" = { name = "minimatch"; packageName = "minimatch"; - version = "5.1.0"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz"; - sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.2.tgz"; + sha512 = "bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg=="; + }; + }; + "minimatch-5.1.6" = { + name = "minimatch"; + packageName = "minimatch"; + version = "5.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"; + sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; }; "minimist-0.0.10" = { @@ -51051,13 +51042,22 @@ let sha512 = "rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ=="; }; }; - "minipass-3.3.5" = { + "minipass-3.3.6" = { name = "minipass"; packageName = "minipass"; - version = "3.3.5"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.3.5.tgz"; - sha512 = "rQ/p+KfKBkeNwo04U15i+hOwoVBVmekmm/HcfTkTN2t9pbQKCMm4eN5gFeqgrrSp/kH/7BYYhTIHOxGqzbBPaA=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz"; + sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; + }; + }; + "minipass-4.0.0" = { + name = "minipass"; + packageName = "minipass"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz"; + sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw=="; }; }; "minipass-collect-1.0.2" = { @@ -51087,6 +51087,15 @@ let sha512 = "LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA=="; }; }; + "minipass-fetch-3.0.1" = { + name = "minipass-fetch"; + packageName = "minipass-fetch"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz"; + sha512 = "t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw=="; + }; + }; "minipass-flush-1.0.5" = { name = "minipass-flush"; packageName = "minipass-flush"; @@ -51267,6 +51276,15 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; + "mkdirp-2.1.3" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.3.tgz"; + sha512 = "sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw=="; + }; + }; "mkdirp-classic-0.5.3" = { name = "mkdirp-classic"; packageName = "mkdirp-classic"; @@ -51294,22 +51312,22 @@ let sha512 = "nbj022D7cd7n6hxDuON08SQciKHSTcRSFlLfCGyIuypo4cl6Z6qJxMVlatFyS6ZbgHqOebkYm/fvwtGiKqmSwQ=="; }; }; - "mobx-6.6.2" = { + "mobx-6.7.0" = { name = "mobx"; packageName = "mobx"; - version = "6.6.2"; + version = "6.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.6.2.tgz"; - sha512 = "IOpS0bf3+hXIhDIy+CmlNMBfFpAbHS0aVHcNC+xH/TFYEKIIVDKNYRh9eKlXuVfJ1iRKAp0cRVmO145CyJAMVQ=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.7.0.tgz"; + sha512 = "1kBLBdSNG2bA522HQdbsTvwAwYf9hq9FWxmlhX7wTsJUAI54907J+ozfGW+LoYUo06vjit748g6QH1AAGLNebw=="; }; }; - "mobx-react-7.5.3" = { + "mobx-react-7.6.0" = { name = "mobx-react"; packageName = "mobx-react"; - version = "7.5.3"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/mobx-react/-/mobx-react-7.5.3.tgz"; - sha512 = "+ltotliKt4Bjn3d8taZH/VFAcRUbaASvsM8/QSvmHXcZ++RZwaFtjl9JkIosy1byaJGEDS3EFFx2InRm2VaSUw=="; + url = "https://registry.npmjs.org/mobx-react/-/mobx-react-7.6.0.tgz"; + sha512 = "+HQUNuh7AoQ9ZnU6c4rvbiVVl+wEkb9WqYsVDzGLng+Dqj1XntHu79PvEWKtSMoMj67vFp/ZPXcElosuJO8ckA=="; }; }; "mobx-react-lite-3.4.0" = { @@ -51321,15 +51339,6 @@ let sha512 = "bRuZp3C0itgLKHu/VNxi66DN/XVkQG7xtoBVWxpvC5FhAqbOCP21+nPhULjnzEqd7xBMybp6KwytdUpZKEgpIQ=="; }; }; - "mocha-10.1.0" = { - name = "mocha"; - packageName = "mocha"; - version = "10.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz"; - sha512 = "vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg=="; - }; - }; "mocha-2.5.3" = { name = "mocha"; packageName = "mocha"; @@ -51384,13 +51393,22 @@ let sha512 = "ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A=="; }; }; - "mold-source-map-0.4.0" = { + "module-error-1.0.2" = { + name = "module-error"; + packageName = "module-error"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/module-error/-/module-error-1.0.2.tgz"; + sha512 = "0yuvsqSCv8LbaOKhnsQ/T5JhyFlCYLPXK3U2sgV10zoKQwzs/MyfuQUOZQ1V/6OCOJsK/TRgNVrPuPDqtdMFtA=="; + }; + }; + "mold-source-map-0.4.1" = { name = "mold-source-map"; packageName = "mold-source-map"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/mold-source-map/-/mold-source-map-0.4.0.tgz"; - sha512 = "Y0uA/sDKVuPgLd7BmaJOai+fqzjrOlR6vZgx5cJIvturI/xOPQPgbf3X7ZbzJd6MvqQ6ucIfK8dSteFyc2Mw2w=="; + url = "https://registry.npmjs.org/mold-source-map/-/mold-source-map-0.4.1.tgz"; + sha512 = "oPowVpTm8p3jsK2AKI+NzoS6TBKv7gWY/Hj4ZNh5YWiB3S4eP54y8vSEEgVUdrqgTbjwEzIunNAVQJGRW0bakQ=="; }; }; "moment-2.29.1" = { @@ -51447,13 +51465,13 @@ let sha512 = "3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg=="; }; }; - "moment-timezone-0.5.38" = { + "moment-timezone-0.5.40" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.38"; + version = "0.5.40"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.38.tgz"; - sha512 = "nMIrzGah4+oYZPflDvLZUgoVUO4fvAqHstvG3xAUnMolWncuAiLDWNnJZj6EwJGMGfb1ZcuTFE6GI3hNOVWI/Q=="; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.40.tgz"; + sha512 = "tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg=="; }; }; "mongodb-3.7.3" = { @@ -51699,31 +51717,31 @@ let sha512 = "VoY2AaoowHZLLKyEb5FRzuhdSzXn5quGjcMKJOJHJPxp9baYZx5t6jiHUhp5aNRlqqlt+5GXQGovMLNKsrm1hg=="; }; }; - "msgpackr-1.7.2" = { + "msgpackr-1.8.2" = { name = "msgpackr"; packageName = "msgpackr"; - version = "1.7.2"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.7.2.tgz"; - sha512 = "mWScyHTtG6TjivXX9vfIy2nBtRupaiAj0HQ2mtmpmYujAmqZmaaEVPaSZ1NKLMvicaMLFzEaMk0ManxMRg8rMQ=="; + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.2.tgz"; + sha512 = "eLuPeok0DMwsGN23AvuVg32mYpx55tsQnxI87d8V1yZsdT8U5jrWhmCa1INO/joGAFQFfo/eTlM/BxVwLKbBOQ=="; }; }; - "msgpackr-extract-2.1.2" = { + "msgpackr-extract-2.2.0" = { name = "msgpackr-extract"; packageName = "msgpackr-extract"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-2.1.2.tgz"; - sha512 = "cmrmERQFb19NX2JABOGtrKdHMyI6RUyceaPBQ2iRz9GnDkjBWFjNJC0jyyoOfZl2U/LZE3tQCCQc4dlRyA8mcA=="; + url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-2.2.0.tgz"; + sha512 = "0YcvWSv7ZOGl9Od6Y5iJ3XnPww8O7WLcpYMDwX+PAA/uXLDtyw94PJv9GLQV/nnp3cWlDhMoyKZIQLrx33sWog=="; }; }; - "mssql-9.0.1" = { + "mssql-9.1.1" = { name = "mssql"; packageName = "mssql"; - version = "9.0.1"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-9.0.1.tgz"; - sha512 = "rmBEPeUgZswvcclSc4s21WJCG0xqDYBas1MSnZepzDPvtNRgkx6f/gCm52EEo2djVtIXJgRq22m7gj7floz4Ng=="; + url = "https://registry.npmjs.org/mssql/-/mssql-9.1.1.tgz"; + sha512 = "m0yTx9xzUtTvJpWJHqknUXUDPRnJXZYOOFNygnNIXn1PBkLsC/rkXQdquObd+M0ZPlBhGC00Jg28zG0wCl7VWg=="; }; }; "multer-1.4.3" = { @@ -51924,15 +51942,6 @@ let sha512 = "J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw=="; }; }; - "murmurhash-js-1.0.0" = { - name = "murmurhash-js"; - packageName = "murmurhash-js"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/murmurhash-js/-/murmurhash-js-1.0.0.tgz"; - sha512 = "TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw=="; - }; - }; "mustache-2.3.2" = { name = "mustache"; packageName = "mustache"; @@ -52095,13 +52104,13 @@ let sha512 = "Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig=="; }; }; - "mysql2-2.3.3" = { + "mysql2-3.0.1" = { name = "mysql2"; packageName = "mysql2"; - version = "2.3.3"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mysql2/-/mysql2-2.3.3.tgz"; - sha512 = "wxJUev6LgMSgACDkb/InIFxDprRa6T95+VEoR+xPvtngtccNH2dGjEB/fVZ8yg1gWv1510c9CvXuJHi5zUm0ZA=="; + url = "https://registry.npmjs.org/mysql2/-/mysql2-3.0.1.tgz"; + sha512 = "Wrh5KuE0OOlm6wRwRhE2q+C8LjwwfT3sFKVauyTwMwPbOd2i0SzxMqTZPqs90ZNAEWjot5GFywje84qVn3ITYw=="; }; }; "mz-2.7.0" = { @@ -52122,13 +52131,13 @@ let sha512 = "uH9geV4+roR1tohsrrqSOLCJ9Mh1iFcDI+9vUuydDlDxUS1UCAWUfuGb06p3dj3flzywquJNrGsQ7lHP8+4RVQ=="; }; }; - "named-placeholders-1.1.2" = { + "named-placeholders-1.1.3" = { name = "named-placeholders"; packageName = "named-placeholders"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.2.tgz"; - sha512 = "wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA=="; + url = "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.3.tgz"; + sha512 = "eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w=="; }; }; "named-regexp-0.1.1" = { @@ -52158,15 +52167,6 @@ let sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; }; }; - "nan-2.14.2" = { - name = "nan"; - packageName = "nan"; - version = "2.14.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz"; - sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="; - }; - }; "nan-2.17.0" = { name = "nan"; packageName = "nan"; @@ -52329,13 +52329,13 @@ let sha512 = "A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg=="; }; }; - "napi-macros-2.1.0" = { + "napi-macros-2.2.2" = { name = "napi-macros"; packageName = "napi-macros"; - version = "2.1.0"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/napi-macros/-/napi-macros-2.1.0.tgz"; - sha512 = "wJugWHfxRnVhV26BpJl2vyLHOXPrNBUyYJA5CTYcgbRcqHXAEJqStqpKOfBJyd0eb1VMbjdNvoeBWucpbdDrTw=="; + url = "https://registry.npmjs.org/napi-macros/-/napi-macros-2.2.2.tgz"; + sha512 = "hmEVtAGYzVQpCKdbQea4skABsdXW4RUh5t5mJ2zzqowJS2OyXZTU1KhDVFhx+NlWZ4ap9mqR9TcDO3LTTttd+g=="; }; }; "native-duplexpair-1.0.0" = { @@ -52392,13 +52392,13 @@ let sha512 = "p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q=="; }; }; - "ncjsm-4.3.1" = { + "ncjsm-4.3.2" = { name = "ncjsm"; packageName = "ncjsm"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ncjsm/-/ncjsm-4.3.1.tgz"; - sha512 = "5hy/Mr7KKLS/AFyY4Be8q0aXz8wYd2PN3cSSMBeQHfcrK6Sbd0EGoQxiNrUoKMAYhl67v4A975f6Gy1oEqfJlA=="; + url = "https://registry.npmjs.org/ncjsm/-/ncjsm-4.3.2.tgz"; + sha512 = "6d1VWA7FY31CpI4Ki97Fpm36jfURkVbpktizp8aoVViTZRQgr/0ddmlKerALSSlzfwQRBeSq1qwwVcBJK4Sk7Q=="; }; }; "nconf-0.10.0" = { @@ -52590,13 +52590,13 @@ let sha512 = "6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ=="; }; }; - "needle-3.1.0" = { + "needle-3.2.0" = { name = "needle"; packageName = "needle"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-3.1.0.tgz"; - sha512 = "gCE9weDhjVGCRqS8dwDR/D3GTAeyXLXuqp7I8EzH6DllZGXSUyxuqqLh+YX9rMAWaaTFyVAg6rHGL25dqvczKw=="; + url = "https://registry.npmjs.org/needle/-/needle-3.2.0.tgz"; + sha512 = "oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ=="; }; }; "negotiator-0.3.0" = { @@ -52843,13 +52843,13 @@ let sha512 = "R+1OJEmRl3ZOp9d8PbiRxGpnvmpi3jU+lzSqCJoLeogdEh0FYDRH1aC223qUbaKffxNTJkEfeDOeQfziw749yA=="; }; }; - "nlcst-is-literal-2.1.0" = { + "nlcst-is-literal-2.1.1" = { name = "nlcst-is-literal"; packageName = "nlcst-is-literal"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-2.1.0.tgz"; - sha512 = "jaEIXvIreWx4lfkRa+B3toTTxQgDxnECncbEQVSUVfRWxamQFbRHgxyfrt0aMnuoq5AMd3CQHl5SHGGruOUOdQ=="; + url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-2.1.1.tgz"; + sha512 = "/PyEKNHN+SrcrmnZRwszzZYbvZSN2AVD506+rfMUzyFHB0PtUmqZOdUuXmQxQeZXv6o29pT5chLjQJdC9weOCQ=="; }; }; "nlcst-normalize-2.1.5" = { @@ -52861,13 +52861,13 @@ let sha512 = "xSqTKv8IHIy3n/orD7wj81BZljLfbrTot0Pv64MYUnQUXfDbi1xDSpJR4qEmbFWyFoHsmivcOdgrK+o7ky3mcw=="; }; }; - "nlcst-normalize-3.1.0" = { + "nlcst-normalize-3.1.1" = { name = "nlcst-normalize"; packageName = "nlcst-normalize"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-3.1.0.tgz"; - sha512 = "kRWfUwtffmU26wPAJ25St5rec29PhV8F6dKaa7PxGhH3uytsGakfLyOEEm1mULzWOdfyDb03aE+OKp7h0OJuhA=="; + url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-3.1.1.tgz"; + sha512 = "Fz6DhC0dmsuqilkz0viOScT+u9UGjgUpSrzo6yOZlcQ24F/m2BuoVF72KUOKZ06dRUeWyPpCSMxI5ONop9Qptw=="; }; }; "nlcst-search-2.0.0" = { @@ -52879,13 +52879,13 @@ let sha512 = "+3xdctMFTcG+76vKAa0wObNg1EYq7IIQlZcL+HxSFXkHO1DgSPRjsPJrmelVIvMg7rk+wmBcdPEoScv/CTT1Zw=="; }; }; - "nlcst-search-3.1.0" = { + "nlcst-search-3.1.1" = { name = "nlcst-search"; packageName = "nlcst-search"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-search/-/nlcst-search-3.1.0.tgz"; - sha512 = "d+0fXxF0d5oFAeeyuoGbIYcbiixE9Xt/lsmt491jjPyabXRoIRBE0++U+G8kbDyJFRk1bMQnGFpMCzeoMlDYfQ=="; + url = "https://registry.npmjs.org/nlcst-search/-/nlcst-search-3.1.1.tgz"; + sha512 = "0KsxSqFzSYWVDTo/SPde0RYf5LVmW1eAje8rbRJm+Lev1NzrWj2bIwtXfwGvfPbCi2ABsTV8bqmGAiF/EVqVWA=="; }; }; "nlcst-to-string-2.0.4" = { @@ -52897,13 +52897,13 @@ let sha512 = "3x3jwTd6UPG7vi5k4GEzvxJ5rDA7hVUIRNHPblKuMVP9Z3xmlsd9cgLcpAMkc5uPOBna82EeshROFhsPkbnTZg=="; }; }; - "nlcst-to-string-3.1.0" = { + "nlcst-to-string-3.1.1" = { name = "nlcst-to-string"; packageName = "nlcst-to-string"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-3.1.0.tgz"; - sha512 = "Y8HQWKw/zrHTCnu2zcFBN1dV6vN0NUG7s5fkEj380G8tF3R+vA2KG+tDl2QoHVQCTHGHVXwoni2RQkDSFQb1PA=="; + url = "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-3.1.1.tgz"; + sha512 = "63mVyqaqt0cmn2VcI2aH6kxe1rLAmSROqHMA0i4qqg1tidkfExgpb0FGMikMCn86mw5dFtBtEANfmSSK7TjNHw=="; }; }; "no-case-2.3.2" = { @@ -52933,15 +52933,6 @@ let sha512 = "oUqnng1vhKLaA4GR+OzVbLuZZ7OOguKCtMHxHMiyP8+9mXidKfoCyc030LbAyNI3xcgCHHyitK3Q8wP+w6DwVQ=="; }; }; - "nocache-2.1.0" = { - name = "nocache"; - packageName = "nocache"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nocache/-/nocache-2.1.0.tgz"; - sha512 = "0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q=="; - }; - }; "node-abi-2.30.1" = { name = "node-abi"; packageName = "node-abi"; @@ -52951,22 +52942,22 @@ let sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; }; }; - "node-abi-3.28.0" = { + "node-abi-3.31.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.28.0"; + version = "3.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.28.0.tgz"; - sha512 = "fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.31.0.tgz"; + sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ=="; }; }; - "node-abort-controller-3.0.1" = { + "node-abort-controller-3.1.1" = { name = "node-abort-controller"; packageName = "node-abort-controller"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.0.1.tgz"; - sha512 = "/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw=="; + url = "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz"; + sha512 = "AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ=="; }; }; "node-addon-api-1.7.2" = { @@ -53014,6 +53005,15 @@ let sha512 = "73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ=="; }; }; + "node-addon-api-5.1.0" = { + name = "node-addon-api"; + packageName = "node-addon-api"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz"; + sha512 = "eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA=="; + }; + }; "node-api-version-0.1.4" = { name = "node-api-version"; packageName = "node-api-version"; @@ -53023,13 +53023,13 @@ let sha512 = "KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g=="; }; }; - "node-appc-1.1.5" = { + "node-appc-1.1.6" = { name = "node-appc"; packageName = "node-appc"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-appc/-/node-appc-1.1.5.tgz"; - sha512 = "2qRWyCXNRS3Vb+rnr5ZgnenAMfys3LKDVcc00WTiZjD2YQUxUwDJfOjUK7wlQQxolF8+y/8YohNRKpo78Kz/xg=="; + url = "https://registry.npmjs.org/node-appc/-/node-appc-1.1.6.tgz"; + sha512 = "ZfoHjoDLpNfXYBshztIq+aTjtlvCZF4XAE00ZYNk4u+/qAjQI+8BidCn957b69WzronQtyNw2NtnJEhsP3N7EQ=="; }; }; "node-bindgen-loader-1.0.1" = { @@ -53149,6 +53149,15 @@ let sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; }; + "node-fetch-2.6.8" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "2.6.8"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.8.tgz"; + sha512 = "RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg=="; + }; + }; "node-fetch-3.2.10" = { name = "node-fetch"; packageName = "node-fetch"; @@ -53158,6 +53167,15 @@ let sha512 = "MhuzNwdURnZ1Cp4XTazr69K0BTizsBroX7Zx3UgDSVcZYKF/6p0CBe4EUb/hLqmzVhl0UpYfgRljQ4yxE+iCxA=="; }; }; + "node-fetch-3.3.0" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.0.tgz"; + sha512 = "BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA=="; + }; + }; "node-fetch-h2-2.3.0" = { name = "node-fetch-h2"; packageName = "node-fetch-h2"; @@ -53248,13 +53266,13 @@ let sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; }; }; - "node-gyp-9.3.0" = { + "node-gyp-9.3.1" = { name = "node-gyp"; packageName = "node-gyp"; - version = "9.3.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.0.tgz"; - sha512 = "A6rJWfXFz7TQNjpldJ915WFb1LnhO4lIve3ANPbWreuEoLoKlFT3sxIepPBkLhM27crW8YmN+pjlgbasH6cH/Q=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.1.tgz"; + sha512 = "4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg=="; }; }; "node-gyp-build-4.1.1" = { @@ -53266,13 +53284,13 @@ let sha512 = "dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ=="; }; }; - "node-gyp-build-4.5.0" = { + "node-gyp-build-4.6.0" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz"; - sha512 = "2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz"; + sha512 = "NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="; }; }; "node-gyp-build-optional-packages-5.0.3" = { @@ -53284,22 +53302,22 @@ let sha512 = "k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA=="; }; }; - "node-hid-2.1.1" = { + "node-hid-2.1.2" = { name = "node-hid"; packageName = "node-hid"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-hid/-/node-hid-2.1.1.tgz"; - sha512 = "Skzhqow7hyLZU93eIPthM9yjot9lszg9xrKxESleEs05V2NcbUptZc5HFqzjOkSmL0sFlZFr3kmvaYebx06wrw=="; + url = "https://registry.npmjs.org/node-hid/-/node-hid-2.1.2.tgz"; + sha512 = "qhCyQqrPpP93F/6Wc/xUR7L8mAJW0Z6R7HMQV8jCHHksAxNDe/4z4Un/H9CpLOT+5K39OPyt9tIQlavxWES3lg=="; }; }; - "node-html-parser-1.4.9" = { + "node-html-parser-5.4.2" = { name = "node-html-parser"; packageName = "node-html-parser"; - version = "1.4.9"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.4.9.tgz"; - sha512 = "UVcirFD1Bn0O+TSmloHeHqZZCxHjvtIeGdVdGMhyZ8/PWlEiZaZ5iJzR189yKZr8p0FXN58BUeC7RHRkf/KYGw=="; + url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.4.2.tgz"; + sha512 = "RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw=="; }; }; "node-int64-0.4.0" = { @@ -53338,15 +53356,6 @@ let sha512 = "QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ=="; }; }; - "node-modules-regexp-1.0.0" = { - name = "node-modules-regexp"; - packageName = "node-modules-regexp"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz"; - sha512 = "JMaRS9L4wSRIR+6PTVEikTrq/lMGEZR43a48ETeilY0Q0iMwVnccMFrUM1k+tNzmYuIU0Vh710bCUqHX+/+ctQ=="; - }; - }; "node-notifier-10.0.1" = { name = "node-notifier"; packageName = "node-notifier"; @@ -53455,22 +53464,13 @@ let sha512 = "1J1tcV+zkCIy24n0rcJ/DSPSCziEgLGld+QBYk1rNESIo+gFyL5RMkCOcII2IrBTZF/kcDTElepMTCILXbMDfQ=="; }; }; - "node-releases-1.1.77" = { + "node-releases-2.0.8" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.77"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz"; - sha512 = "rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="; - }; - }; - "node-releases-2.0.6" = { - name = "node-releases"; - packageName = "node-releases"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz"; - sha512 = "PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz"; + sha512 = "dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="; }; }; "node-rsa-1.1.1" = { @@ -53491,15 +53491,6 @@ let sha512 = "f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ=="; }; }; - "node-sass-7.0.3" = { - name = "node-sass"; - packageName = "node-sass"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/node-sass/-/node-sass-7.0.3.tgz"; - sha512 = "8MIlsY/4dXUkJDYht9pIWBhMil3uHmE8b/AdJPjmFn1nBx9X9BASzfzmsCy0uCCb8eqI3SYYzVPDswWqSx7gjw=="; - }; - }; "node-schedule-2.1.0" = { name = "node-schedule"; packageName = "node-schedule"; @@ -53545,15 +53536,6 @@ let sha512 = "1cBMgRxdMWE8KeWCqk2RIOrvUb0XCwYfEsY5/y2NlXyq4Y/RumnOZvTj4Nbr77+Vb2C+kyBoRTdkNOS8L3d/aQ=="; }; }; - "node-storage-shim-2.0.1" = { - name = "node-storage-shim"; - packageName = "node-storage-shim"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-storage-shim/-/node-storage-shim-2.0.1.tgz"; - sha512 = "ce8enbToMe8iUHDTMCg4rdP1K0syoJrZRO0Dl9uMLPCwlc5M1HKaapV3Pqlv6/3LQNuDiYXBm4rPlj78MeUSSA=="; - }; - }; "node-swt-0.1.1" = { name = "node-swt"; packageName = "node-swt"; @@ -53779,6 +53761,15 @@ let sha512 = "ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g=="; }; }; + "nopt-7.0.0" = { + name = "nopt"; + packageName = "nopt"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-7.0.0.tgz"; + sha512 = "e6Qw1rcrGoSxEH0hQ4GBSdUjkMOtXGhGFXdNT/3ZR0S37eR9DMj5za3dEDWE6o1T3/DP8ZOsPP4MIiky0c3QeA=="; + }; + }; "normalize-newline-4.1.0" = { name = "normalize-newline"; packageName = "normalize-newline"; @@ -53815,6 +53806,15 @@ let sha512 = "EBk5QKKuocMJhB3BILuKhmaPjI8vNRSpIfO9woLC6NyHVkKKdVEdAO1mrT0ZfxNR1lKwCcTkuZfmGIFdizZ8Pg=="; }; }; + "normalize-package-data-5.0.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz"; + sha512 = "h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q=="; + }; + }; "normalize-path-1.0.0" = { name = "normalize-path"; packageName = "normalize-path"; @@ -53923,22 +53923,13 @@ let sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; }; }; - "normalize-url-7.2.0" = { + "normalize-url-8.0.0" = { name = "normalize-url"; packageName = "normalize-url"; - version = "7.2.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-7.2.0.tgz"; - sha512 = "uhXOdZry0L6M2UIo9BTt7FdpBDiAGN/7oItedQwPKh8jh31ZlvC8U9Xl/EJ3aijDHaywXTW3QbZ6LuCocur1YA=="; - }; - }; - "normalize.css-8.0.1" = { - name = "normalize.css"; - packageName = "normalize.css"; - version = "8.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize.css/-/normalize.css-8.0.1.tgz"; - sha512 = "qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg=="; + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.0.tgz"; + sha512 = "uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw=="; }; }; "now-and-later-2.0.1" = { @@ -53986,6 +53977,24 @@ let sha512 = "gZLxXdjEzE/+mOstGDqR6b0EkhJ+kM6fxM6vUuckuctuVPh80Q6pw/rSZj9s4Gex9GxWtIicO1pc8DB9KZWudw=="; }; }; + "npm-bundled-3.0.0" = { + name = "npm-bundled"; + packageName = "npm-bundled"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.0.tgz"; + sha512 = "Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ=="; + }; + }; + "npm-check-6.0.1" = { + name = "npm-check"; + packageName = "npm-check"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-check/-/npm-check-6.0.1.tgz"; + sha512 = "tlEhXU3689VLUHYEZTS/BC61vfeN2xSSZwoWDT6WLuenZTpDmGmNT5mtl15erTR0/A15ldK06/NEKg9jYJ9OTQ=="; + }; + }; "npm-conf-1.1.3" = { name = "npm-conf"; packageName = "npm-conf"; @@ -54013,13 +54022,22 @@ let sha512 = "65lUsMI8ztHCxFz5ckCEC44DRvEGdZX5usQFriauxHEwt7upv1FKaQEmAtU0YnOAdwuNWCmk64xYiQABNrEyLA=="; }; }; - "npm-keyword-5.0.0" = { + "npm-install-checks-6.0.0" = { + name = "npm-install-checks"; + packageName = "npm-install-checks"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.0.0.tgz"; + sha512 = "SBU9oFglRVZnfElwAtF14NivyulDqF1VKqqwNsFW9HDcbHMAPHpRSsVFgKuwFGq/hVvWZExz62Th0kvxn/XE7Q=="; + }; + }; + "npm-keyword-6.1.0" = { name = "npm-keyword"; packageName = "npm-keyword"; - version = "5.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-keyword/-/npm-keyword-5.0.0.tgz"; - sha512 = "v172X97DB97rF23svX7KjuImvKoGmwkdjLDQslhGde9UCjUF+ASfjFThyUZ4flubYYNQJP7fznQK8bGRBLgYzg=="; + url = "https://registry.npmjs.org/npm-keyword/-/npm-keyword-6.1.0.tgz"; + sha512 = "ghcShMAA28IPhJAP4d3T+tndUPzHmvqEfaYwLG1whi4WJ06pdhA3vqL8gXF+Jn8wiqbaRuGVfjE5VXjOgVpW4Q=="; }; }; "npm-name-6.0.1" = { @@ -54058,6 +54076,15 @@ let sha512 = "g+DPQSkusnk7HYXr75NtzkIP4+N81i3RPsGFidF3DzHd9MT9wWngmqoeg/fnHFz5MNdtG4w03s+QnhewSLTT2Q=="; }; }; + "npm-package-arg-10.1.0" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "10.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz"; + sha512 = "uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA=="; + }; + }; "npm-package-arg-6.1.0" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -54103,15 +54130,6 @@ let sha512 = "LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q=="; }; }; - "npm-package-arg-9.1.0" = { - name = "npm-package-arg"; - packageName = "npm-package-arg"; - version = "9.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-9.1.0.tgz"; - sha512 = "4J0GL+u2Nh6OnhvUKXRr2ZMG4lR8qtLp+kv7UiV00Y+nGiSxtttCyIRHCt5L5BNkXQld/RceYItau3MDOoGiBw=="; - }; - }; "npm-package-arg-9.1.2" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -54130,6 +54148,15 @@ let sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A=="; }; }; + "npm-packlist-2.1.5" = { + name = "npm-packlist"; + packageName = "npm-packlist"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.1.5.tgz"; + sha512 = "KCfK3Vi2F+PH1klYauoQzg81GQ8/GGjQRKYY6tRnpQUPKTs/1gBZSRWtTEd7jGdSn1LZL7gpAmJT+BcS55k2XQ=="; + }; + }; "npm-packlist-2.2.2" = { name = "npm-packlist"; packageName = "npm-packlist"; @@ -54157,13 +54184,13 @@ let sha512 = "263/0NGrn32YFYi4J533qzrQ/krmmrWwhKkzwTuM4f/07ug51odoaNjUexxO4vxlzURHcmYMH1QjvHjsNDKLVg=="; }; }; - "npm-packlist-7.0.2" = { + "npm-packlist-7.0.4" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "7.0.2"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.2.tgz"; - sha512 = "d2+7RMySjVXssww23rV5NuIq1NzGvM04OlI5kwnvtYKfFTAPVs6Zxmxns2HRtJEA1oNj7D/BbFXeVAOLmW3N3Q=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz"; + sha512 = "d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q=="; }; }; "npm-pick-manifest-6.1.1" = { @@ -54175,15 +54202,6 @@ let sha512 = "dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA=="; }; }; - "npm-pick-manifest-7.0.1" = { - name = "npm-pick-manifest"; - packageName = "npm-pick-manifest"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-7.0.1.tgz"; - sha512 = "IA8+tuv8KujbsbLQvselW2XQgmXWS47t3CB0ZrzsRZ82DbDfkcFunOaPm4X7qNuhMfq+FmV7hQT4iFVpHqV7mg=="; - }; - }; "npm-pick-manifest-7.0.2" = { name = "npm-pick-manifest"; packageName = "npm-pick-manifest"; @@ -54193,6 +54211,15 @@ let sha512 = "gk37SyRmlIjvTfcYl6RzDbSmS9Y4TOBXfsPnoYqTHARNgWbyDiCSMLUpmALDj4jjcTZpURiEfsSHJj9k7EV4Rw=="; }; }; + "npm-pick-manifest-8.0.1" = { + name = "npm-pick-manifest"; + packageName = "npm-pick-manifest"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz"; + sha512 = "mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA=="; + }; + }; "npm-prefix-1.2.0" = { name = "npm-prefix"; packageName = "npm-prefix"; @@ -54238,6 +54265,15 @@ let sha512 = "eukJPi++DKRTjSBRcDZSDDsGqRK3ehbxfFUcgaRd0Yp6kRwOwh2WVn0r+8rMB4nnuzvAk6rQVzl6K5CkYOmnvw=="; }; }; + "npm-registry-fetch-14.0.3" = { + name = "npm-registry-fetch"; + packageName = "npm-registry-fetch"; + version = "14.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz"; + sha512 = "YaeRbVNpnWvsGOjX2wk5s85XJ7l1qQBGAp724h8e2CZFFhMSuw9enom7K1mWVUtvXO1uUSFIAPofQK0pPN0ZcA=="; + }; + }; "npm-registry-utilities-1.0.0" = { name = "npm-registry-utilities"; packageName = "npm-registry-utilities"; @@ -54436,13 +54472,13 @@ let sha512 = "Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg=="; }; }; - "number-allocator-1.0.12" = { + "number-allocator-1.0.14" = { name = "number-allocator"; packageName = "number-allocator"; - version = "1.0.12"; + version = "1.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.12.tgz"; - sha512 = "sGB0qoQGmKimery9JubBQ9pQUr1V/LixJAk3Ygp7obZf6mpSXime8d7XHEobbIimkdZpgjkNlLt6G7LPEWFYWg=="; + url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.14.tgz"; + sha512 = "OrL44UTVAvkKdOdRQZIJpLkAdjXGTRda052sN4sO77bKEzYYqWKMBjQvrJFzqygI99gL6Z4u2xctPW1tB8ErvA=="; }; }; "number-is-nan-1.0.1" = { @@ -54508,13 +54544,13 @@ let sha512 = "90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="; }; }; - "nx-15.0.10" = { + "nx-15.6.3" = { name = "nx"; packageName = "nx"; - version = "15.0.10"; + version = "15.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/nx/-/nx-15.0.10.tgz"; - sha512 = "Uy6C/lj+gFjdNAKg2RNYEqMO7t2jxz5fYAEm6FnViDZ2Qz28l1L6V70MEvq6wgyDzSSRL0I+OPLb71tiaD9BiA=="; + url = "https://registry.npmjs.org/nx/-/nx-15.6.3.tgz"; + sha512 = "3t0A0GPLNen1yPAyE+VGZ3nkAzZYb5nfXtAcx8SHBlKq4u42yBY3khBmP1y4Og3jhIwFIj7J7Npeh8ZKrthmYQ=="; }; }; "nyc-15.1.0" = { @@ -54716,13 +54752,13 @@ let sha512 = "RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="; }; }; - "object-inspect-1.12.2" = { + "object-inspect-1.12.3" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.12.2"; + version = "1.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz"; - sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz"; + sha512 = "geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="; }; }; "object-inspect-1.4.1" = { @@ -55184,13 +55220,13 @@ let sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; }; }; - "oo-ascii-tree-1.70.0" = { + "oo-ascii-tree-1.73.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.70.0"; + version = "1.73.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.70.0.tgz"; - sha512 = "vu/NGcQKC6f3fz2C7qmDW1WP2WFK3CvG1JbweyKlnRsZrdbY0VCH9RKsNaoYUTu9tzafCZ4HWeLEkgXALQMsUg=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.73.0.tgz"; + sha512 = "bGx23QLCltdo+jrUcvnxf+2Ob7Ntsr8n7UzHPVoz0pWABSjzIzxOh2GRQa/2GebYNTqIHLnERY5Ubs/V7RVPWg=="; }; }; "open-0.0.2" = { @@ -55364,13 +55400,13 @@ let sha512 = "2AOzHAbrwdj5DNL3u+BadhfmL3mlc3mmCv6cSAsEjoMncpOOVd95JyMf0j0XUyJigJ8/ILxnhETfg35vt1pGSQ=="; }; }; - "openapi-sampler-1.3.0" = { + "openapi-sampler-1.3.1" = { name = "openapi-sampler"; packageName = "openapi-sampler"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.3.0.tgz"; - sha512 = "2QfjK1oM9Sv0q82Ae1RrUe3yfFmAyjF548+6eAeb+h/cL1Uj51TW4UezraBEvwEdzoBgfo4AaTLVFGTKj+yYDw=="; + url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.3.1.tgz"; + sha512 = "Ert9mvc2tLPmmInwSyGZS+v4Ogu9/YoZuq9oP3EdUklg2cad6+IGndP9yqJJwbgdXwZibiq5fpv6vYujchdJFg=="; }; }; "openapi-schema-validator-8.0.0" = { @@ -55418,13 +55454,13 @@ let sha512 = "HlCCs/D7wMtraNZVYR8fgqv2Fr4afWgWKVf38uwwMEdhTuVHadn+1ILYfmZV6AdejFw7ViQpjNGVRcdrN2wzFg=="; }; }; - "openapi-types-12.0.2" = { + "openapi-types-12.1.0" = { name = "openapi-types"; packageName = "openapi-types"; - version = "12.0.2"; + version = "12.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-types/-/openapi-types-12.0.2.tgz"; - sha512 = "GuTo7FyZjOIWVhIhQSWJVaws6A82sWIGyQogxxYBYKZ0NBdyP2CYSIgOwFfSB+UVoPExk/YzFpyYitHS8KVZtA=="; + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-12.1.0.tgz"; + sha512 = "XpeCy01X6L5EpP+6Hc3jWN7rMZJ+/k1lwki/kTmWzbVhdPie3jd5O2ZtedEx8Yp58icJ0osVldLMrTB/zslQXA=="; }; }; "openapi-types-7.2.3" = { @@ -55463,13 +55499,13 @@ let sha512 = "/Yvsd2D7miYB4HLJ3hOOS0+vnowQpaT75FsHzr/y5M9P4q9bwa7RcbW2YdH6KZBn8ceLbKGnHxMZ1CHliGHUFw=="; }; }; - "openapi3-ts-3.1.1" = { + "openapi3-ts-3.1.2" = { name = "openapi3-ts"; packageName = "openapi3-ts"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/openapi3-ts/-/openapi3-ts-3.1.1.tgz"; - sha512 = "lNUS87ncFqm1m8W21sbTGIeD7sydkQ4nnRUrkBiGlAzTngr50eBKU2suUXhdEk51z6m4cCgaXdB1SFgXtyn81Q=="; + url = "https://registry.npmjs.org/openapi3-ts/-/openapi3-ts-3.1.2.tgz"; + sha512 = "S8fijNOqe/ut0kEDAwHZnI7sVYqb8Q3XnISmSyXmK76jgrcf4ableI75KTY1qdksd9EI/t39Vi5M4VYKrkNKfQ=="; }; }; "opencollective-postinstall-2.0.3" = { @@ -55886,22 +55922,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.5.4" = { + "ot-builder-1.6.1" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.5.4.tgz"; - sha512 = "+GFI9JS6RfudrYmo+mlLd0irWFrtpeVq+Jrj+afvKp5f4Iubi1xArjxXcg/ItXFu3XGvvJZOdFpfnN+3KZQkuA=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.6.1.tgz"; + sha512 = "08u12lm5A2S9c16/QTHs/ZvsZhQQe8BQEkSdU1D/u9gpKccBV1jadJNJHXfkZA7N/Y1Yn0dlh274J35YHX1RNQ=="; }; }; - "otb-ttc-bundle-1.5.4" = { + "otb-ttc-bundle-1.6.1" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.5.4"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.5.4.tgz"; - sha512 = "vDxDfZjMOOWTpwT9qW5pJSS2SM3uyPcOItQczSkEhCwMet0ch+LS2CkPQrdfvsDXAhiX3nCYgEHrsNanYvn9Pw=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.6.1.tgz"; + sha512 = "UN/85A4UWU6w1fkzpLwN60nh6bxCcg8E8gtz+yhOmjOQEhZ8g40rQG2mqqoy7Dubkc1kzsehtzCjKrhzp+YWLA=="; }; }; "ow-0.21.0" = { @@ -55931,15 +55967,6 @@ let sha512 = "5rqbqfsRWNb0sukt0awwgJMlaep+8jV45S15SKKB34z4UuzjcofIfnriCBhWjZP2jbVtjt9yRl7buB6RlKsu9w=="; }; }; - "p-cancelable-0.3.0" = { - name = "p-cancelable"; - packageName = "p-cancelable"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz"; - sha512 = "RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw=="; - }; - }; "p-cancelable-0.4.1" = { name = "p-cancelable"; packageName = "p-cancelable"; @@ -55976,15 +56003,6 @@ let sha512 = "mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw=="; }; }; - "p-debounce-4.0.0" = { - name = "p-debounce"; - packageName = "p-debounce"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-debounce/-/p-debounce-4.0.0.tgz"; - sha512 = "4Ispi9I9qYGO4lueiLDhe4q4iK5ERK8reLsuzH6BPaXn53EGaua8H66PXIFGrW897hwjXp+pVLrm/DLxN0RF0A=="; - }; - }; "p-defer-1.0.0" = { name = "p-defer"; packageName = "p-defer"; @@ -56318,15 +56336,6 @@ let sha512 = "Js5XZxo6vHjB9NOYAzWDYAIyyiPvva0DWESAIWIK7uhSpGsyg5FwUPxipU/SOQx5x9EqhOh545d1jo6cVkitig=="; }; }; - "p-timeout-1.2.1" = { - name = "p-timeout"; - packageName = "p-timeout"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz"; - sha512 = "gb0ryzr+K2qFqFv6qi3khoeqMZF/+ajxQipEF6NteZVnvz9tzdsfAVj3lYtn1gAXvH5lfLwfxEII799gt/mRIA=="; - }; - }; "p-timeout-2.0.1" = { name = "p-timeout"; packageName = "p-timeout"; @@ -56399,13 +56408,13 @@ let sha512 = "RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw=="; }; }; - "p2tr-1.3.2" = { + "p2tr-1.3.3" = { name = "p2tr"; packageName = "p2tr"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/p2tr/-/p2tr-1.3.2.tgz"; - sha512 = "f61sZPiAO5fQJJ1jPCziU44mKduwbxui0C37keFRQg70pR45PG7Uvp6Seo4EM0sZU04c08vhLKI3IcMo7a+2oQ=="; + url = "https://registry.npmjs.org/p2tr/-/p2tr-1.3.3.tgz"; + sha512 = "j3M5EDh8iS1ONYu2WrFQ+w9Ap3pw8B9udXh7tHPcvjhKQDA/vt7v3JI8FEo/9R3ayTc3e/My8kSPQ8Rkns/ZMA=="; }; }; "pac-proxy-agent-4.1.0" = { @@ -56480,15 +56489,6 @@ let sha512 = "q/R5GrMek0vzgoomq6rm9OX+3PQve8sLwTirmK30YB3Cu0Bbt9OX9M/SIUnroN5BGJkzwGsFwDaRGD9EwBOlCA=="; }; }; - "package-json-5.0.0" = { - name = "package-json"; - packageName = "package-json"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-5.0.0.tgz"; - sha512 = "EeHQFFTlEmLrkIQoxbE9w0FuAWHoc1XpthDqnZ/i9keOt701cteyXwAxQFLpVqVjj3feh2TodkihjLaRUtIgLg=="; - }; - }; "package-json-6.4.0" = { name = "package-json"; packageName = "package-json"; @@ -56588,13 +56588,13 @@ let sha512 = "Gu8fU3GsvOPkak2CkbojR7vjs3k3P9cA6uazKTHdsdV0gpCEQq2opelnEv30KRQWgVzP5Vd/5umjcedma3MKtg=="; }; }; - "pacote-15.0.0" = { + "pacote-15.0.8" = { name = "pacote"; packageName = "pacote"; - version = "15.0.0"; + version = "15.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-15.0.0.tgz"; - sha512 = "YsMK5om14r2rf4Ukum5R43zKFoJe0swrsZRbG4fUfTJUxHpdMrie6+Js/jaNtn7Bq0YRL9SnAajPqz6n4wgi6g=="; + url = "https://registry.npmjs.org/pacote/-/pacote-15.0.8.tgz"; + sha512 = "UlcumB/XS6xyyIMwg/WwMAyUmga+RivB5KgkRwA1hZNtrx+0Bt41KxHCvg1kr0pZ/ZeD8qjhW4fph6VaYRCbLw=="; }; }; "pad-0.0.5" = { @@ -56624,22 +56624,13 @@ let sha512 = "8EKVBxCRSvLnsX1p2LlSFSH3c2/wuhY9/BXXWu8boL78FbVKqn2L5SpURt1x5iw6Gq8PTqJ7MdPoe5nCtX3I+g=="; }; }; - "paid-services-4.0.1" = { + "paid-services-4.3.0" = { name = "paid-services"; packageName = "paid-services"; - version = "4.0.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-4.0.1.tgz"; - sha512 = "6nKjcza/tlgZXH6iRzIfypsduOHHk5DQ/zvPc8VqB/5AubnBdEJrdmpr6ZsHWiGVZuHHbgng026+TV3n7ilSVw=="; - }; - }; - "paid-services-4.0.5" = { - name = "paid-services"; - packageName = "paid-services"; - version = "4.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-4.0.5.tgz"; - sha512 = "dhv3Zx82P6aIL9jYfj0UDpkO5Ytln31XkZZJIdK8UNU/BVm3Gmc3oBcjSe7BXLiGsJ8F97Yb+cu7+zJ03N3KPg=="; + url = "https://registry.npmjs.org/paid-services/-/paid-services-4.3.0.tgz"; + sha512 = "OhwWeWAFnklitYkobAgIqM7UlQuJdsYI9WeEsfdiVrfJau02JYwljtNMZEID1XWE7sYW3vMD3H8tsJC+fagrPQ=="; }; }; "pako-0.2.9" = { @@ -56939,13 +56930,13 @@ let sha512 = "TYKL+K98dcAWoCw/Ac1yrPviU8Trk+/gmjQVaoWEFDZmVD4KRg6c/80xKqNNFQObo2mTONgF8trzAf2UTwKafw=="; }; }; - "parse-latin-5.0.0" = { + "parse-latin-5.0.1" = { name = "parse-latin"; packageName = "parse-latin"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-latin/-/parse-latin-5.0.0.tgz"; - sha512 = "Ht+4/+AUySMS5HKGAiQpBmkFsHSoGrj6Y83flLCa5OIBdtsVkO3UD4OtboJ0O0vZiOznH02x8qlwg9KLUVXuNg=="; + url = "https://registry.npmjs.org/parse-latin/-/parse-latin-5.0.1.tgz"; + sha512 = "b/K8ExXaWC9t34kKeDV8kGXBkXZ1HCSAZRYE7HR14eA1GlXX5L8iWhs8USJNhQU9q5ci413jCKF0gOyovvyRBg=="; }; }; "parse-ms-2.1.0" = { @@ -57011,15 +57002,6 @@ let sha512 = "Eg1OuNntBMH0ojvEKSrvDSnwLmvVuUOSdylH/pSCPNMIspLlweJyIWXCE+k/5hm3cj/EBUYwmWkjhBALNP4LXQ=="; }; }; - "parse-srcset-1.0.2" = { - name = "parse-srcset"; - packageName = "parse-srcset"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz"; - sha512 = "/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q=="; - }; - }; "parse-torrent-4.1.0" = { name = "parse-torrent"; packageName = "parse-torrent"; @@ -57110,13 +57092,13 @@ let sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; }; }; - "parse5-7.1.1" = { + "parse5-7.1.2" = { name = "parse5"; packageName = "parse5"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-7.1.1.tgz"; - sha512 = "kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg=="; + url = "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz"; + sha512 = "Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw=="; }; }; "parse5-htmlparser2-tree-adapter-6.0.1" = { @@ -57146,13 +57128,13 @@ let sha512 = "W9CRvTfYQY/kbRc5Q6YTWarb/QDxdEGbd6RCP8CLUQDJV89RVHoS2A0dZYNtAcq31fulGNN4ZhAhiQQazwlKJg=="; }; }; - "parseley-0.7.0" = { + "parseley-0.11.0" = { name = "parseley"; packageName = "parseley"; - version = "0.7.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/parseley/-/parseley-0.7.0.tgz"; - sha512 = "xyOytsdDu077M3/46Am+2cGXEKM9U9QclBDv7fimY7e+BBlxh2JcBp2mgNsmkyA9uvgyTjVzDi7cP1v4hcFxbw=="; + url = "https://registry.npmjs.org/parseley/-/parseley-0.11.0.tgz"; + sha512 = "VfcwXlBWgTF+unPcr7yu3HSSA6QUdDaDnrHcytVfj5Z8azAyKBDrYnSIfeSxlrEayndNcLmrXzg+Vxbo6DWRXQ=="; }; }; "parseqs-0.0.2" = { @@ -57380,15 +57362,6 @@ let sha512 = "b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="; }; }; - "path-case-3.0.4" = { - name = "path-case"; - packageName = "path-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz"; - sha512 = "qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg=="; - }; - }; "path-dirname-1.0.2" = { name = "path-dirname"; packageName = "path-dirname"; @@ -57398,6 +57371,15 @@ let sha512 = "ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q=="; }; }; + "path-equal-1.2.5" = { + name = "path-equal"; + packageName = "path-equal"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/path-equal/-/path-equal-1.2.5.tgz"; + sha512 = "i73IctDr3F2W+bsOWDyyVm/lqsXO47aY9nsFZUjTT/aljSbkxHxxCoyZ9UUrM8jK0JVod+An+rl48RCsvWM+9g=="; + }; + }; "path-exists-2.1.0" = { name = "path-exists"; packageName = "path-exists"; @@ -57677,15 +57659,6 @@ let sha512 = "e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A=="; }; }; - "pbf-3.2.1" = { - name = "pbf"; - packageName = "pbf"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz"; - sha512 = "ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ=="; - }; - }; "pbkdf2-3.1.2" = { name = "pbkdf2"; packageName = "pbkdf2"; @@ -57695,6 +57668,15 @@ let sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="; }; }; + "peberminta-0.8.0" = { + name = "peberminta"; + packageName = "peberminta"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/peberminta/-/peberminta-0.8.0.tgz"; + sha512 = "YYEs+eauIjDH5nUEGi18EohWE0nV2QbGTqmxQcqgZ/0g+laPCQmuIqq7EBLVi9uim9zMgfJv0QBZEnQ3uHw/Tw=="; + }; + }; "peek-readable-4.1.0" = { name = "peek-readable"; packageName = "peek-readable"; @@ -57785,13 +57767,13 @@ let sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; }; }; - "pg-8.8.0" = { + "pg-8.9.0" = { name = "pg"; packageName = "pg"; - version = "8.8.0"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.8.0.tgz"; - sha512 = "UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw=="; + url = "https://registry.npmjs.org/pg/-/pg-8.9.0.tgz"; + sha512 = "ZJM+qkEbtOHRuXjmvBtOgNOXOtLSbxiMiUVMgE4rV6Zwocy03RicCVvDXgx8l4Biwo8/qORUnEqn2fdQzV7KCg=="; }; }; "pg-connection-string-2.5.0" = { @@ -57803,13 +57785,13 @@ let sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; }; }; - "pg-cursor-2.7.4" = { + "pg-cursor-2.8.0" = { name = "pg-cursor"; packageName = "pg-cursor"; - version = "2.7.4"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.7.4.tgz"; - sha512 = "CNWwOzTTZ9QvphoOL+Wg/7pmVr9GnAWBjPbuK2FRclrB4A/WRO/ssCJ9BlkzIGmmofK2M/LyokNHgsLSn+fMHA=="; + url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.8.0.tgz"; + sha512 = "LrOaEHK+R1C40e+xeri3FTRY/VKp9uTOCVsKtGB7LJ57qbeaphYvWjbVly8AesdT1GfHXYcAnVdExKhW7DKOvA=="; }; }; "pg-int8-1.0.1" = { @@ -57839,22 +57821,22 @@ let sha512 = "His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w=="; }; }; - "pg-protocol-1.5.0" = { + "pg-protocol-1.6.0" = { name = "pg-protocol"; packageName = "pg-protocol"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz"; - sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.0.tgz"; + sha512 = "M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q=="; }; }; - "pg-query-stream-4.2.4" = { + "pg-query-stream-4.3.0" = { name = "pg-query-stream"; packageName = "pg-query-stream"; - version = "4.2.4"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.2.4.tgz"; - sha512 = "Et3gTrWn4C2rj4LVioNq1QDd7aH/3mSJcBm79jZALv3wopvx9bWENtbOYZbHQ6KM+IkfFxs0JF1ZLjMDJ9/N6Q=="; + url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.3.0.tgz"; + sha512 = "+Eer4Y1e43rAaphFNu9/VJKn9nKTApFKCSwVtDjXYnuO4QYqWHOEkApmGJv8gvaU5T6fcuEtjsN24gk+Rx7X9A=="; }; }; "pg-types-1.13.0" = { @@ -57893,15 +57875,6 @@ let sha512 = "CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA=="; }; }; - "photoswipe-4.1.3" = { - name = "photoswipe"; - packageName = "photoswipe"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/photoswipe/-/photoswipe-4.1.3.tgz"; - sha512 = "89Z43IRUyw7ycTolo+AaiDn3W1EEIfox54hERmm9bI12IB9cvRfHSHez3XhAyU8XW2EAFrC+2sKMhh7SJwn0bA=="; - }; - }; "physical-cpu-count-2.0.0" = { name = "physical-cpu-count"; packageName = "physical-cpu-count"; @@ -58046,15 +58019,6 @@ let sha512 = "0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw=="; }; }; - "pino-8.6.1" = { - name = "pino"; - packageName = "pino"; - version = "8.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-8.6.1.tgz"; - sha512 = "fi+V2K98eMZjQ/uEHHSiMALNrz7HaFdKNYuyA3ZUrbH0f1e8sPFDmeRGzg7ZH2q4QDxGnJPOswmqlEaTAZeDPA=="; - }; - }; "pino-8.7.0" = { name = "pino"; packageName = "pino"; @@ -58064,6 +58028,15 @@ let sha512 = "l9sA5uPxmZzwydhMWUcm1gI0YxNnYl8MfSr2h8cwLvOAzQLBLewzF247h/vqHe3/tt6fgtXeG9wdjjoetdI/vA=="; }; }; + "pino-8.8.0" = { + name = "pino"; + packageName = "pino"; + version = "8.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pino/-/pino-8.8.0.tgz"; + sha512 = "cF8iGYeu2ODg2gIwgAHcPrtR63ILJz3f7gkogaHC/TXVVXxZgInmNYiIpDYEwgEkxZti2Se6P2W2DxlBIZe6eQ=="; + }; + }; "pino-abstract-transport-1.0.0" = { name = "pino-abstract-transport"; packageName = "pino-abstract-transport"; @@ -58082,13 +58055,13 @@ let sha512 = "iJrnjgR4FWQIXZkUF48oNgoRI9BpyMhaEmihonHeCnZ6F50ZHAS4YGfGBT/ZVNsPmd+hzkIPGzjKdY08+/yAXw=="; }; }; - "pino-std-serializers-6.0.0" = { + "pino-std-serializers-6.1.0" = { name = "pino-std-serializers"; packageName = "pino-std-serializers"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-6.0.0.tgz"; - sha512 = "mMMOwSKrmyl+Y12Ri2xhH1lbzQxwwpuru9VjyJpgFIH4asSj88F2csdMwN6+M5g1Ll4rmsYghHLQJw81tgZ7LQ=="; + url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-6.1.0.tgz"; + sha512 = "KO0m2f1HkrPe9S0ldjx7za9BJjeHqBku5Ch8JyxETxT8dEFGz1PwgrHaOQupVYitpzbFSYm7nnljxD8dik2c+g=="; }; }; "pipe-functions-1.3.0" = { @@ -58109,15 +58082,6 @@ let sha512 = "uYpoo8eO3GG37tTsPmYoM3rHOxjXd57zMr/4RwiPYyb3RyZj02rfO14D8ERFbrpuYBJCzDwPYmT23a7N3N3Cow=="; }; }; - "pirates-3.0.2" = { - name = "pirates"; - packageName = "pirates"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pirates/-/pirates-3.0.2.tgz"; - sha512 = "c5CgUJq6H2k6MJz72Ak1F5sN9n9wlSlJyEnwvpm9/y3WB4E3pHBDT2c6PEiS1vyJvq2bUxUAIu0EGf8Cx4Ic7Q=="; - }; - }; "pirates-4.0.5" = { name = "pirates"; packageName = "pirates"; @@ -58217,15 +58181,6 @@ let sha512 = "0+uijmzYcnhC0hStDjm/cl2VYdrmVVBpe7Q8k9YBojxmR5tG8mvR9/nooQq3QSXiQqORDVOTY3XqMEqJVIzkHA=="; }; }; - "pkg-up-2.0.0" = { - name = "pkg-up"; - packageName = "pkg-up"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz"; - sha512 = "fjAPuiws93rm7mPUu21RdBnkeZNrbfCFCwfAhPWY+rR3zG0ubpe5cEReHOw5fIbfmsxEV/g2kSxGTATY3Bpnwg=="; - }; - }; "pkg-up-3.1.0" = { name = "pkg-up"; packageName = "pkg-up"; @@ -58235,15 +58190,6 @@ let sha512 = "nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA=="; }; }; - "pkg-up-4.0.0" = { - name = "pkg-up"; - packageName = "pkg-up"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pkg-up/-/pkg-up-4.0.0.tgz"; - sha512 = "N4zdA4sfOe6yCv+ulPCmpnIBQ5I60xfhDr1otdBBhKte9QtEf3bhfrfkW7dTb+IQ0iEx4ZDzas0kc1o5rdWpYg=="; - }; - }; "pkginfo-0.2.3" = { name = "pkginfo"; packageName = "pkginfo"; @@ -58532,15 +58478,6 @@ let sha512 = "2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg=="; }; }; - "pofile-1.1.3" = { - name = "pofile"; - packageName = "pofile"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pofile/-/pofile-1.1.3.tgz"; - sha512 = "sk96pUvpNwDV6PLrnhr68Uu1S5NohsxqLKz0GuracgrDo40BdF/r1RhHnjakUk6Q4Z0OKIybOQ7GevLKGN1iYw=="; - }; - }; "polished-4.2.2" = { name = "polished"; packageName = "polished"; @@ -58577,15 +58514,6 @@ let sha512 = "HmfV88y4tmtR9JsLzdtNwJea+cQdGt+ozeDWdlxHbCiPcoG+/iSAnJ1mEAYdOqITgCoFIT67o3VdY684Ed3FWA=="; }; }; - "popper.js-1.16.1" = { - name = "popper.js"; - packageName = "popper.js"; - version = "1.16.1"; - src = fetchurl { - url = "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz"; - sha512 = "Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="; - }; - }; "portfinder-1.0.32" = { name = "portfinder"; packageName = "portfinder"; @@ -58649,22 +58577,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.18" = { + "postcss-8.4.21" = { name = "postcss"; packageName = "postcss"; - version = "8.4.18"; + version = "8.4.21"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz"; - sha512 = "Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA=="; - }; - }; - "postcss-attribute-case-insensitive-5.0.2" = { - name = "postcss-attribute-case-insensitive"; - packageName = "postcss-attribute-case-insensitive"; - version = "5.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz"; - sha512 = "XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz"; + sha512 = "tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg=="; }; }; "postcss-calc-7.0.5" = { @@ -58685,42 +58604,6 @@ let sha512 = "SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q=="; }; }; - "postcss-clamp-4.1.0" = { - name = "postcss-clamp"; - packageName = "postcss-clamp"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz"; - sha512 = "ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow=="; - }; - }; - "postcss-color-functional-notation-4.2.4" = { - name = "postcss-color-functional-notation"; - packageName = "postcss-color-functional-notation"; - version = "4.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz"; - sha512 = "2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg=="; - }; - }; - "postcss-color-hex-alpha-8.0.4" = { - name = "postcss-color-hex-alpha"; - packageName = "postcss-color-hex-alpha"; - version = "8.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz"; - sha512 = "nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ=="; - }; - }; - "postcss-color-rebeccapurple-7.1.1" = { - name = "postcss-color-rebeccapurple"; - packageName = "postcss-color-rebeccapurple"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz"; - sha512 = "pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg=="; - }; - }; "postcss-colormin-4.0.3" = { name = "postcss-colormin"; packageName = "postcss-colormin"; @@ -58757,42 +58640,6 @@ let sha512 = "82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA=="; }; }; - "postcss-custom-media-8.0.2" = { - name = "postcss-custom-media"; - packageName = "postcss-custom-media"; - version = "8.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz"; - sha512 = "7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg=="; - }; - }; - "postcss-custom-properties-12.1.10" = { - name = "postcss-custom-properties"; - packageName = "postcss-custom-properties"; - version = "12.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.10.tgz"; - sha512 = "U3BHdgrYhCrwTVcByFHs9EOBoqcKq4Lf3kXwbTi4hhq0qWhl/pDWq2THbv/ICX/Fl9KqeHBb8OVrTf2OaYF07A=="; - }; - }; - "postcss-custom-selectors-6.0.3" = { - name = "postcss-custom-selectors"; - packageName = "postcss-custom-selectors"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz"; - sha512 = "fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg=="; - }; - }; - "postcss-dir-pseudo-class-6.0.5" = { - name = "postcss-dir-pseudo-class"; - packageName = "postcss-dir-pseudo-class"; - version = "6.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz"; - sha512 = "eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA=="; - }; - }; "postcss-discard-comments-4.0.2" = { name = "postcss-discard-comments"; packageName = "postcss-discard-comments"; @@ -58865,24 +58712,6 @@ let sha512 = "21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw=="; }; }; - "postcss-double-position-gradients-3.1.2" = { - name = "postcss-double-position-gradients"; - packageName = "postcss-double-position-gradients"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz"; - sha512 = "GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ=="; - }; - }; - "postcss-env-function-4.0.6" = { - name = "postcss-env-function"; - packageName = "postcss-env-function"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz"; - sha512 = "kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA=="; - }; - }; "postcss-flexbugs-fixes-4.2.1" = { name = "postcss-flexbugs-fixes"; packageName = "postcss-flexbugs-fixes"; @@ -58892,42 +58721,6 @@ let sha512 = "9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ=="; }; }; - "postcss-focus-visible-6.0.4" = { - name = "postcss-focus-visible"; - packageName = "postcss-focus-visible"; - version = "6.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz"; - sha512 = "QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw=="; - }; - }; - "postcss-focus-within-5.0.4" = { - name = "postcss-focus-within"; - packageName = "postcss-focus-within"; - version = "5.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz"; - sha512 = "vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ=="; - }; - }; - "postcss-font-variant-5.0.0" = { - name = "postcss-font-variant"; - packageName = "postcss-font-variant"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz"; - sha512 = "1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA=="; - }; - }; - "postcss-gap-properties-3.0.5" = { - name = "postcss-gap-properties"; - packageName = "postcss-gap-properties"; - version = "3.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz"; - sha512 = "IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg=="; - }; - }; "postcss-html-0.36.0" = { name = "postcss-html"; packageName = "postcss-html"; @@ -58937,15 +58730,6 @@ let sha512 = "HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw=="; }; }; - "postcss-image-set-function-4.0.7" = { - name = "postcss-image-set-function"; - packageName = "postcss-image-set-function"; - version = "4.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz"; - sha512 = "9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw=="; - }; - }; "postcss-import-14.1.0" = { name = "postcss-import"; packageName = "postcss-import"; @@ -58955,24 +58739,6 @@ let sha512 = "flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw=="; }; }; - "postcss-import-15.0.0" = { - name = "postcss-import"; - packageName = "postcss-import"; - version = "15.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-import/-/postcss-import-15.0.0.tgz"; - sha512 = "Y20shPQ07RitgBGv2zvkEAu9bqvrD77C9axhj/aA1BQj4czape2MdClCExvB27EwYEJdGgKZBpKanb0t1rK2Kg=="; - }; - }; - "postcss-initial-4.0.1" = { - name = "postcss-initial"; - packageName = "postcss-initial"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz"; - sha512 = "0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ=="; - }; - }; "postcss-js-4.0.0" = { name = "postcss-js"; packageName = "postcss-js"; @@ -58982,15 +58748,6 @@ let sha512 = "77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ=="; }; }; - "postcss-lab-function-4.2.1" = { - name = "postcss-lab-function"; - packageName = "postcss-lab-function"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz"; - sha512 = "xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w=="; - }; - }; "postcss-less-3.1.4" = { name = "postcss-less"; packageName = "postcss-less"; @@ -59036,33 +58793,6 @@ let sha512 = "cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA=="; }; }; - "postcss-loader-7.0.1" = { - name = "postcss-loader"; - packageName = "postcss-loader"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.1.tgz"; - sha512 = "VRviFEyYlLjctSM93gAZtcJJ/iSkPZ79zWbN/1fSH+NisBByEiVLqpdVDrPLVSi8DX0oJo12kL/GppTBdKVXiQ=="; - }; - }; - "postcss-logical-5.0.4" = { - name = "postcss-logical"; - packageName = "postcss-logical"; - version = "5.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz"; - sha512 = "RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g=="; - }; - }; - "postcss-media-minmax-5.0.0" = { - name = "postcss-media-minmax"; - packageName = "postcss-media-minmax"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz"; - sha512 = "yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ=="; - }; - }; "postcss-media-query-parser-0.2.3" = { name = "postcss-media-query-parser"; packageName = "postcss-media-query-parser"; @@ -59315,15 +59045,6 @@ let sha512 = "0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w=="; }; }; - "postcss-nesting-10.2.0" = { - name = "postcss-nesting"; - packageName = "postcss-nesting"; - version = "10.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz"; - sha512 = "EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA=="; - }; - }; "postcss-normalize-charset-4.0.1" = { name = "postcss-normalize-charset"; packageName = "postcss-normalize-charset"; @@ -59486,15 +59207,6 @@ let sha512 = "83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA=="; }; }; - "postcss-opacity-percentage-1.1.2" = { - name = "postcss-opacity-percentage"; - packageName = "postcss-opacity-percentage"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.2.tgz"; - sha512 = "lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w=="; - }; - }; "postcss-ordered-values-4.1.2" = { name = "postcss-ordered-values"; packageName = "postcss-ordered-values"; @@ -59513,51 +59225,6 @@ let sha512 = "9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ=="; }; }; - "postcss-overflow-shorthand-3.0.4" = { - name = "postcss-overflow-shorthand"; - packageName = "postcss-overflow-shorthand"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz"; - sha512 = "otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A=="; - }; - }; - "postcss-page-break-3.0.4" = { - name = "postcss-page-break"; - packageName = "postcss-page-break"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz"; - sha512 = "1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ=="; - }; - }; - "postcss-place-7.0.5" = { - name = "postcss-place"; - packageName = "postcss-place"; - version = "7.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz"; - sha512 = "wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g=="; - }; - }; - "postcss-preset-env-7.8.2" = { - name = "postcss-preset-env"; - packageName = "postcss-preset-env"; - version = "7.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.2.tgz"; - sha512 = "rSMUEaOCnovKnwc5LvBDHUDzpGP+nrUeWZGWt9M72fBvckCi45JmnJigUr4QG4zZeOHmOCNCZnd2LKDvP++ZuQ=="; - }; - }; - "postcss-pseudo-class-any-link-7.1.6" = { - name = "postcss-pseudo-class-any-link"; - packageName = "postcss-pseudo-class-any-link"; - version = "7.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz"; - sha512 = "9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w=="; - }; - }; "postcss-reduce-initial-4.0.3" = { name = "postcss-reduce-initial"; packageName = "postcss-reduce-initial"; @@ -59594,15 +59261,6 @@ let sha512 = "2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ=="; }; }; - "postcss-replace-overflow-wrap-4.0.0" = { - name = "postcss-replace-overflow-wrap"; - packageName = "postcss-replace-overflow-wrap"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz"; - sha512 = "KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw=="; - }; - }; "postcss-reporter-7.0.5" = { name = "postcss-reporter"; packageName = "postcss-reporter"; @@ -59657,15 +59315,6 @@ let sha512 = "jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA=="; }; }; - "postcss-selector-not-6.0.1" = { - name = "postcss-selector-not"; - packageName = "postcss-selector-not"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz"; - sha512 = "1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ=="; - }; - }; "postcss-selector-parser-3.1.2" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; @@ -59684,6 +59333,15 @@ let sha512 = "IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w=="; }; }; + "postcss-selector-parser-6.0.11" = { + name = "postcss-selector-parser"; + packageName = "postcss-selector-parser"; + version = "6.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz"; + sha512 = "zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g=="; + }; + }; "postcss-selector-parser-6.0.2" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; @@ -59738,15 +59396,6 @@ let sha512 = "5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA=="; }; }; - "postcss-url-10.1.3" = { - name = "postcss-url"; - packageName = "postcss-url"; - version = "10.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-url/-/postcss-url-10.1.3.tgz"; - sha512 = "FUzyxfI5l2tKmXdYc6VTu3TWZsInayEKPbiyW+P6vmmIrrb4I6CGX0BFoewgYHLK+oIL5FECEK02REYRpBvUCw=="; - }; - }; "postcss-value-parser-3.3.1" = { name = "postcss-value-parser"; packageName = "postcss-value-parser"; @@ -59891,22 +59540,13 @@ let sha512 = "z+16RoxK3fUPgwaIgH9NGnK1HKY9XIDpydky5eQGgAFVXTCSezalv9U2jQuNV+Z9qV1fDWNzldcw4eK0SSbqKA=="; }; }; - "potpack-1.0.2" = { - name = "potpack"; - packageName = "potpack"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/potpack/-/potpack-1.0.2.tgz"; - sha512 = "choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ=="; - }; - }; - "pouchdb-abstract-mapreduce-7.3.0" = { + "pouchdb-abstract-mapreduce-7.3.1" = { name = "pouchdb-abstract-mapreduce"; packageName = "pouchdb-abstract-mapreduce"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-abstract-mapreduce/-/pouchdb-abstract-mapreduce-7.3.0.tgz"; - sha512 = "+2fVt3SDh7D776lIGbYZOsKX5js1aUyUw7iJaTGitxSdQ2ObWSTrr3SUrj5Qo1CkgPXwRM3Tdoq/53JYAa2qCA=="; + url = "https://registry.npmjs.org/pouchdb-abstract-mapreduce/-/pouchdb-abstract-mapreduce-7.3.1.tgz"; + sha512 = "0zKXVFBvrfc1KnN0ggrB762JDmZnUpePHywo9Bq3Jy+L1FnoG7fXM5luFfvv5/T0gEw+ZTIwoocZECMnESBI9w=="; }; }; "pouchdb-adapter-node-websql-7.0.0" = { @@ -59945,31 +59585,31 @@ let sha512 = "yUktdOPIPvOVouCjJN3uop+bCcpdPwePrLm9eUAZNgEYnUFu0njdx7Q0WRsZ7UJ6l75HinL5ZHk4bnvEt86FLw=="; }; }; - "pouchdb-binary-utils-7.3.0" = { + "pouchdb-binary-utils-7.3.1" = { name = "pouchdb-binary-utils"; packageName = "pouchdb-binary-utils"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-binary-utils/-/pouchdb-binary-utils-7.3.0.tgz"; - sha512 = "xvBH/XGHGcou2vkEzszJxkCc7YElfRUrkLUg51Jbdmh1mogLDUO0bU3Tj6TOIIJfRkQrU/HV+dDkMAhsil0amQ=="; + url = "https://registry.npmjs.org/pouchdb-binary-utils/-/pouchdb-binary-utils-7.3.1.tgz"; + sha512 = "crZJNfAEOnUoRk977Qtmk4cxEv6sNKllQ6vDDKgQrQLFjMUXma35EHzNyIJr1s76J77Q4sqKQAmxz9Y40yHGtw=="; }; }; - "pouchdb-changes-filter-7.3.0" = { + "pouchdb-changes-filter-7.3.1" = { name = "pouchdb-changes-filter"; packageName = "pouchdb-changes-filter"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-changes-filter/-/pouchdb-changes-filter-7.3.0.tgz"; - sha512 = "9E/EC9BP9dH9sfqUBdcWlR5HHeDdWqP82MmdEtg5c8spgxttYPwqrPfSHa7T2n55IRnaIoQbVyndmfAoz9GsOw=="; + url = "https://registry.npmjs.org/pouchdb-changes-filter/-/pouchdb-changes-filter-7.3.1.tgz"; + sha512 = "C31zsslhlxyFdlKPdZ0013Z4GIsWjoSTgptfamrPnXEtOS6EX4jLtcmiGURCIXmZlcDGKRm8qWHL3vikwITalA=="; }; }; - "pouchdb-collate-7.3.0" = { + "pouchdb-collate-7.3.1" = { name = "pouchdb-collate"; packageName = "pouchdb-collate"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-collate/-/pouchdb-collate-7.3.0.tgz"; - sha512 = "ys7rXKtEr6cfghgUjknwFJiOkITebV6JmeTybJKCzMV0r2luXu0OoPQsKVpE/wbM/3F5LxfpbFKGFpPcfGMvTA=="; + url = "https://registry.npmjs.org/pouchdb-collate/-/pouchdb-collate-7.3.1.tgz"; + sha512 = "o4gyGqDMLMSNzf6EDTr3eHaH/JRMoqRhdc+eV+oA8u00nTBtr9wD+jypVe2LbgKLJ4NWqx2qVkXiTiQdUFtsLQ=="; }; }; "pouchdb-collections-7.0.0" = { @@ -59981,22 +59621,22 @@ let sha512 = "DaoUr/vU24Q3gM6ghj0va9j/oBanPwkbhkvnqSyC3Dm5dgf5pculNxueLF9PKMo3ycApoWzHMh6N2N8KJbDU2Q=="; }; }; - "pouchdb-collections-7.3.0" = { + "pouchdb-collections-7.3.1" = { name = "pouchdb-collections"; packageName = "pouchdb-collections"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-collections/-/pouchdb-collections-7.3.0.tgz"; - sha512 = "Xr54m2+fErShXn+qAT4xwqJ+8NwddNPeTMJT4z4k1sZsrwfHmZsWbsKAyGPMF04eQaaU+7DDRMciu2VzaBUXyg=="; + url = "https://registry.npmjs.org/pouchdb-collections/-/pouchdb-collections-7.3.1.tgz"; + sha512 = "yUyDqR+OJmtwgExOSJegpBJXDLAEC84TWnbAYycyh+DZoA51Yw0+XVQF5Vh8Ii90/Ut2xo88fmrmp0t6kqom8w=="; }; }; - "pouchdb-core-7.3.0" = { + "pouchdb-core-7.3.1" = { name = "pouchdb-core"; packageName = "pouchdb-core"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-core/-/pouchdb-core-7.3.0.tgz"; - sha512 = "fpEbjrYzmZivSupl7V0Aa2vHivyJHi9gx7+d021Wxajx4br515eYcN6Whk/L0L4xgoDVKoqUwmv+XgEF8EZhwg=="; + url = "https://registry.npmjs.org/pouchdb-core/-/pouchdb-core-7.3.1.tgz"; + sha512 = "9jRZ70+4wrDohJQQ2OA8T9zzanefWf03ugGis5NJL24cpar8LjvQnceRo8X4KCQfVJr9su9LFe4L6YBqneE1VA=="; }; }; "pouchdb-errors-7.0.0" = { @@ -60008,13 +59648,13 @@ let sha512 = "dTusY8nnTw4HIztCrNl7AoGgwvS1bVf/3/97hDaGc4ytn72V9/4dK8kTqlimi3UpaurohYRnqac0SGXYP8vgXA=="; }; }; - "pouchdb-errors-7.3.0" = { + "pouchdb-errors-7.3.1" = { name = "pouchdb-errors"; packageName = "pouchdb-errors"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-errors/-/pouchdb-errors-7.3.0.tgz"; - sha512 = "dTBbIC1BbCy6J9W/Csg5xROgb3wJN3HpbgAJHHSEtAkb8oA45KZmU3ZwEpNhf0AfPuQm4XgW1936PvlDlGgJiw=="; + url = "https://registry.npmjs.org/pouchdb-errors/-/pouchdb-errors-7.3.1.tgz"; + sha512 = "Zktz4gnXEUcZcty8FmyvtYUYsHskoST05m6H5/E2gg/0mCfEXq/XeyyLkZHaZmqD0ZPS9yNmASB1VaFWEKEaDw=="; }; }; "pouchdb-extend-0.1.2" = { @@ -60026,22 +59666,22 @@ let sha512 = "aGWbcFJNQLAdv30hExdFE8fhjsoOsyxv5s1TBNPSc6noTu4MX9n0s3h+YhWyJaE75SOTFbpmimuvXx9qONjI8w=="; }; }; - "pouchdb-fetch-7.3.0" = { + "pouchdb-fetch-7.3.1" = { name = "pouchdb-fetch"; packageName = "pouchdb-fetch"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-fetch/-/pouchdb-fetch-7.3.0.tgz"; - sha512 = "8/lcg8iMDG+GVs1dHNXA4ktJSEpH71dHU3xesMJ25tNQOqfAaaWrkfz9j71ZYDDkveLYE6UjUzl/sDacu2hSjw=="; + url = "https://registry.npmjs.org/pouchdb-fetch/-/pouchdb-fetch-7.3.1.tgz"; + sha512 = "205xAtvdHRPQ4fp1h9+RmT9oQabo9gafuPmWsS9aEl3ER54WbY8Vaj1JHZGbU4KtMTYvW7H5088zLS7Nrusuag=="; }; }; - "pouchdb-find-7.3.0" = { + "pouchdb-find-7.3.1" = { name = "pouchdb-find"; packageName = "pouchdb-find"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-find/-/pouchdb-find-7.3.0.tgz"; - sha512 = "EwhnfyxCAkKf8PG4tfndTTygEmtuz+o1LiZkxfPrflfXA3m1jo1ithib0hwBYtEwEYWuZxH6B8pRZutbLoQCGA=="; + url = "https://registry.npmjs.org/pouchdb-find/-/pouchdb-find-7.3.1.tgz"; + sha512 = "AeqUfAVY1c7IFaY36BRT0vIz9r4VTKq/YOWTmiqndOZUQ/pDGxyO2fNFal6NN3PyYww0JijlD377cPvhnrhJVA=="; }; }; "pouchdb-json-7.0.0" = { @@ -60053,13 +59693,13 @@ let sha512 = "w0bNRu/7VmmCrFWMYAm62n30wvJJUT2SokyzeTyj3hRohj4GFwTRg1mSZ+iAmxgRKOFE8nzZstLG/WAB4Ymjew=="; }; }; - "pouchdb-mapreduce-utils-7.3.0" = { + "pouchdb-mapreduce-utils-7.3.1" = { name = "pouchdb-mapreduce-utils"; packageName = "pouchdb-mapreduce-utils"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-mapreduce-utils/-/pouchdb-mapreduce-utils-7.3.0.tgz"; - sha512 = "KDVSd+H2r+XWTrQfKWV71SknDDYRjYXoeWs0ZQl3xITHCcTl+fIgqyagg/XN+Zy/U9LeLPGMe2JdgPx9H8lJgw=="; + url = "https://registry.npmjs.org/pouchdb-mapreduce-utils/-/pouchdb-mapreduce-utils-7.3.1.tgz"; + sha512 = "oUMcq82+4pTGQ6dtrhgORHOVHZSr6w/5tFIUGlv7RABIDvJarL4snMawADjlpiEwPdiQ/ESG8Fqt8cxqvqsIgg=="; }; }; "pouchdb-md5-7.0.0" = { @@ -60071,13 +59711,13 @@ let sha512 = "yaSJKhLA3QlgloKUQeb2hLdT3KmUmPfoYdryfwHZuPTpXIRKTnMQTR9qCIRUszc0ruBpDe53DRslCgNUhAyTNQ=="; }; }; - "pouchdb-md5-7.3.0" = { + "pouchdb-md5-7.3.1" = { name = "pouchdb-md5"; packageName = "pouchdb-md5"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-md5/-/pouchdb-md5-7.3.0.tgz"; - sha512 = "wL04QgoKyd/L/TV5gxgcvlEyCJiZoXCOEFJklTzkdza/kBQNJGPH7i0ZhKa7Sb+AvZYoWZHddf1Zgv7rBScHkA=="; + url = "https://registry.npmjs.org/pouchdb-md5/-/pouchdb-md5-7.3.1.tgz"; + sha512 = "aDV8ui/mprnL3xmt0gT/81DFtTtJiKyn+OxIAbwKPMfz/rDFdPYvF0BmDC9QxMMzGfkV+JJUjU6at0PPs2mRLg=="; }; }; "pouchdb-merge-7.0.0" = { @@ -60089,13 +59729,13 @@ let sha512 = "tci5u6NpznQhGcPv4ho1h0miky9rs+ds/T9zQ9meQeDZbUojXNaX1Jxsb0uYEQQ+HMqdcQs3Akdl0/u0mgwPGg=="; }; }; - "pouchdb-merge-7.3.0" = { + "pouchdb-merge-7.3.1" = { name = "pouchdb-merge"; packageName = "pouchdb-merge"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-merge/-/pouchdb-merge-7.3.0.tgz"; - sha512 = "E7LmchMzwYFm6V8OBxejzARLisanpksOju2LEfuiYnotGfNDeW7MByP0qBH0/zF8BfUyyjA1cl7ByaEpsapkeQ=="; + url = "https://registry.npmjs.org/pouchdb-merge/-/pouchdb-merge-7.3.1.tgz"; + sha512 = "FeK3r35mKimokf2PQ2tUI523QWyZ4lYZ0Yd75FfSch/SPY6wIokz5XBZZ6PHdu5aOJsEKzoLUxr8CpSg9DhcAw=="; }; }; "pouchdb-promise-5.4.3" = { @@ -60107,13 +59747,13 @@ let sha512 = "7WNPDutzlYiu/mF430nrK6K/eIewwEofxcU2P9h058dYXUP3zRo0Qp0UjuYP4wYt2r0DtyFtLFciZvxnXQZdXA=="; }; }; - "pouchdb-selector-core-7.3.0" = { + "pouchdb-selector-core-7.3.1" = { name = "pouchdb-selector-core"; packageName = "pouchdb-selector-core"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-selector-core/-/pouchdb-selector-core-7.3.0.tgz"; - sha512 = "sK/cCrIGeL9ImcMhKGcwa54+bzX7Wv4hhVV+oUW3T1Nasaoxh+Muem1GuA+x1+SbTCE8y37rUg8i6DIOhX51ew=="; + url = "https://registry.npmjs.org/pouchdb-selector-core/-/pouchdb-selector-core-7.3.1.tgz"; + sha512 = "HBX+nNGXcaL9z0uNpwSMRq2GNZd3EZXW+fe9rJHS0hvJohjZL7aRJLoaXfEdHPRTNW+CpjM3Rny60eGekQdI/w=="; }; }; "pouchdb-utils-7.0.0" = { @@ -60125,13 +59765,13 @@ let sha512 = "1bnoX1KdZYHv9wicDIFdO0PLiVIMzNDUBUZ/yOJZ+6LW6niQCB8aCv09ZztmKfSQcU5nnN3fe656tScBgP6dOQ=="; }; }; - "pouchdb-utils-7.3.0" = { + "pouchdb-utils-7.3.1" = { name = "pouchdb-utils"; packageName = "pouchdb-utils"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-utils/-/pouchdb-utils-7.3.0.tgz"; - sha512 = "HH+5IXXWn/ZgVCSnrlydBMYn6MabT7RS7SNoo9w8qVH9efpZSp3eLchw6yMQNLw8LQefWmbbskiHV9VgJmSVWQ=="; + url = "https://registry.npmjs.org/pouchdb-utils/-/pouchdb-utils-7.3.1.tgz"; + sha512 = "R3hHBo1zTdTu/NFs3iqkcaQAPwhIH0gMIdfVKd5lbDYlmP26rCG5pdS+v7NuoSSFLJ4xxnaGV+Gjf4duYsJ8wQ=="; }; }; "pouchdb-wrappers-4.1.0" = { @@ -60278,13 +59918,22 @@ let sha512 = "9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA=="; }; }; - "prettier-2.7.1" = { + "prettier-2.8.1" = { name = "prettier"; packageName = "prettier"; - version = "2.7.1"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz"; - sha512 = "ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz"; + sha512 = "lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg=="; + }; + }; + "prettier-2.8.3" = { + name = "prettier"; + packageName = "prettier"; + version = "2.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz"; + sha512 = "tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw=="; }; }; "prettier-bytes-1.0.4" = { @@ -60314,22 +59963,22 @@ let sha512 = "GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="; }; }; - "prettier-plugin-astro-0.6.0" = { + "prettier-plugin-astro-0.7.2" = { name = "prettier-plugin-astro"; packageName = "prettier-plugin-astro"; - version = "0.6.0"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-0.6.0.tgz"; - sha512 = "xU67TzyGi1u/pwVbEh55AwoOfcOpsh9BtD2MpUAEVrViAcdrBDcmA9VN0edLgla7f2NYu8ntGakxTSrSNFv1mQ=="; + url = "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-0.7.2.tgz"; + sha512 = "mmifnkG160BtC727gqoimoxnZT/dwr8ASxpoGGl6EHevhfblSOeu+pwH1LAm5Qu1MynizktztFujHHaijLCkww=="; }; }; - "prettier-plugin-svelte-2.8.0" = { + "prettier-plugin-svelte-2.9.0" = { name = "prettier-plugin-svelte"; packageName = "prettier-plugin-svelte"; - version = "2.8.0"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.8.0.tgz"; - sha512 = "QlXv/U3bUszks3XYDPsk1fsaQC+fo2lshwKbcbO+lrSVdJ+40mB1BfL8OCAk1W9y4pJxpqO/4gqm6NtF3zNGCw=="; + url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.9.0.tgz"; + sha512 = "3doBi5NO4IVgaNPtwewvrgPpqAcvNv0NwJNflr76PIGgi9nf1oguQV1Hpdm9TI2ALIQVn/9iIwLpBO5UcD2Jiw=="; }; }; "prettier-tslint-0.4.2" = { @@ -60521,13 +60170,13 @@ let sha512 = "HubhG4Rb2UH8YtV4ba0Vp5bQ7L78RTONYu/ujmCu5nBI8wGv24s4E9xSKBi0N1MowRpxk76pFCpJtW0KPzOK0w=="; }; }; - "probing-3.0.0" = { + "probing-3.0.1" = { name = "probing"; packageName = "probing"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/probing/-/probing-3.0.0.tgz"; - sha512 = "JqIDSuuqXFQEowER46CWbyeYrsUgl3OjrRcKjoJZyIesrDhjqrCB483Pj1jRZjdpE2j0/e1t+W22xKDyix1BYw=="; + url = "https://registry.npmjs.org/probing/-/probing-3.0.1.tgz"; + sha512 = "Q7CstxWTyKOW3rbG7dzYMPOXjX0bvQW/Z72LnhDTNjjvh3RqF9f/VlMSqpwaZ7tA+BGUNMMunHT6pM5dQscFrw=="; }; }; "proc-log-1.0.0" = { @@ -60548,6 +60197,15 @@ let sha512 = "Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw=="; }; }; + "proc-log-3.0.0" = { + name = "proc-log"; + packageName = "proc-log"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz"; + sha512 = "++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A=="; + }; + }; "process-0.10.1" = { name = "process"; packageName = "process"; @@ -60611,13 +60269,13 @@ let sha512 = "fMyMQbKCxX51YxR7YGCzPjLsU3yDzXFkP4oi1/Mt5Ixnk7GO/7uUTj8mrCHUwuvozWzI+V7QSJR9cZYnwNOZPg=="; }; }; - "process-warning-2.0.0" = { + "process-warning-2.1.0" = { name = "process-warning"; packageName = "process-warning"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/process-warning/-/process-warning-2.0.0.tgz"; - sha512 = "+MmoAXoUX+VTHAlwns0h+kFUWFs/3FZy+ZuchkgjyOu3oioLAo2LB5aCfKPh2+P9O18i3m43tUEv3YqttSy0Ww=="; + url = "https://registry.npmjs.org/process-warning/-/process-warning-2.1.0.tgz"; + sha512 = "9C20RLxrZU/rFnxWncDkuF6O999NdIf3E1ws4B0ZeY3sRVPzWBMsYDE2lxjxhiXxg464cQTgKUGm8/i6y2YGXg=="; }; }; "progbar-1.2.1" = { @@ -60638,15 +60296,6 @@ let sha512 = "UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw=="; }; }; - "progress-2.0.1" = { - name = "progress"; - packageName = "progress"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz"; - sha512 = "OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg=="; - }; - }; "progress-2.0.3" = { name = "progress"; packageName = "progress"; @@ -60818,13 +60467,13 @@ let sha512 = "NV8aTmpwrZv+Iys54sSFOBx3tuVaOBvvrft5PNppnxy9xpU/akHbaWIril22AB22zaPgrgwKdD0KsrM0ptUtpg=="; }; }; - "promise.prototype.finally-3.1.3" = { + "promise.prototype.finally-3.1.4" = { name = "promise.prototype.finally"; packageName = "promise.prototype.finally"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.3.tgz"; - sha512 = "EXRF3fC9/0gz4qkt/f5EP5iW4kj9oFpBICNpCNOb/52+8nlHIX07FPLbi/q4qYBQ1xZqivMzTpNQSnArVASolQ=="; + url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.4.tgz"; + sha512 = "nNc3YbgMfLzqtqvO/q5DP6RR0SiHI9pUPGzyDf1q+usTwCN2kjvAnJkBb7bHe3o+fFSBPpsGMoYtaSi+LTNqng=="; }; }; "promised-temp-0.1.0" = { @@ -60899,15 +60548,6 @@ let sha512 = "aC9j+BZsRSSzEsXBNBwDnAxujdx19HycZoKgRgzWnS8eOHg1asuf9heuLprfbe739zY3IdUQx+Egv6Jn135WHA=="; }; }; - "prompts-2.4.0" = { - name = "prompts"; - packageName = "prompts"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz"; - sha512 = "awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ=="; - }; - }; "prompts-2.4.2" = { name = "prompts"; packageName = "prompts"; @@ -60989,13 +60629,13 @@ let sha512 = "YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA=="; }; }; - "property-information-6.1.1" = { + "property-information-6.2.0" = { name = "property-information"; packageName = "property-information"; - version = "6.1.1"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/property-information/-/property-information-6.1.1.tgz"; - sha512 = "hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w=="; + url = "https://registry.npmjs.org/property-information/-/property-information-6.2.0.tgz"; + sha512 = "kma4U7AFCTwpqq5twzC1YVIDXSqg6qQK6JN0smOw8fgRy1OkMi0CYSzFmsy6dnqSenamAtj0CyXMUJ1Mf6oROg=="; }; }; "proto-list-1.2.4" = { @@ -61025,15 +60665,6 @@ let sha512 = "7gkzNGmNqb0b/RcE7ubrZgOpIGEroc7dl91v/mm3R+EXnL+C+Loft4UQ3/RZ7M5U6CHS/EoTtbijPb1Q6wW6uA=="; }; }; - "protobufjs-6.10.3" = { - name = "protobufjs"; - packageName = "protobufjs"; - version = "6.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.10.3.tgz"; - sha512 = "yvAslS0hNdBhlSKckI4R1l7wunVilX66uvrjzE4MimiAt7/qw1nLpMhZrn/ObuUTM/c3Xnfl01LYMdcSJe6dwg=="; - }; - }; "protobufjs-6.11.3" = { name = "protobufjs"; packageName = "protobufjs"; @@ -61052,6 +60683,15 @@ let sha512 = "4ZPTPkXCdel3+L81yw3dG6+Kq3umdWKh7Dc7GW/CpNk4SX3hK58iPCWeCyhVTDrbkNeKrYNZ7EojM5WDaEWTLQ=="; }; }; + "protobufjs-7.2.0" = { + name = "protobufjs"; + packageName = "protobufjs"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.0.tgz"; + sha512 = "hYCqTDuII4iJ4stZqiuGCSU8xxWl5JeXYpwARGtn/tWcKCAro6h3WQz+xpsNbXW0UYqpmTQFEyFWO0G0Kjt64g=="; + }; + }; "protobufjs-cli-1.0.2" = { name = "protobufjs-cli"; packageName = "protobufjs-cli"; @@ -61070,15 +60710,6 @@ let sha512 = "daeNPuKh1NlLD1uDfbLpD+xyUTc07nEtfHwmBZmt/vH0B7VOM+JOCOpDcx9ZRpqHjAiIkGqyTDi+wfGSl17R9w=="; }; }; - "protocol-buffers-schema-3.6.0" = { - name = "protocol-buffers-schema"; - packageName = "protocol-buffers-schema"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz"; - sha512 = "TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw=="; - }; - }; "protocols-2.0.1" = { name = "protocols"; packageName = "protocols"; @@ -61178,13 +60809,13 @@ let sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA=="; }; }; - "psbt-2.7.1" = { + "psbt-2.7.2" = { name = "psbt"; packageName = "psbt"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/psbt/-/psbt-2.7.1.tgz"; - sha512 = "qFnvwdQcDoQBHHi3jYVVX+W98CRTbyeQs3RlUdAIzdEVbwBHEcv1+xhVaEJHrYiF75n7L+i6roDmZHIXT6tDSQ=="; + url = "https://registry.npmjs.org/psbt/-/psbt-2.7.2.tgz"; + sha512 = "oNKHkpTazbcCCCaFADUNbUaxirPslcgjPlf5pxg685v5VB3ol5vIl4DMf8HsNarKiDg0FDYamM/E67HfUybQOA=="; }; }; "pseudomap-1.0.2" = { @@ -61223,15 +60854,6 @@ let sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; }; }; - "pubsub-js-1.9.4" = { - name = "pubsub-js"; - packageName = "pubsub-js"; - version = "1.9.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pubsub-js/-/pubsub-js-1.9.4.tgz"; - sha512 = "hJYpaDvPH4w8ZX/0Fdf9ma1AwRgU353GfbaVfPjfJQf1KxZ2iHaHl3fAUw1qlJIR5dr4F3RzjGaWohYUEyoh7A=="; - }; - }; "pug-2.0.4" = { name = "pug"; packageName = "pug"; @@ -61898,13 +61520,13 @@ let sha512 = "+uTgIM11eTOctGHxiTgNC/50qyM6PXcf8OxG1gTQIimamqlnIIxR0LjDbLWbeU1jfzg3EArVxknUQWEs8dmArw=="; }; }; - "pull-stream-3.6.14" = { + "pull-stream-3.7.0" = { name = "pull-stream"; packageName = "pull-stream"; - version = "3.6.14"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.14.tgz"; - sha512 = "KIqdvpqHHaTUA2mCYcLG1ibEbu/LCKoJZsBWyv9lSYtPkJPBq8m3Hxa103xHi6D2thj5YXa0TqK3L3GUkwgnew=="; + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.7.0.tgz"; + sha512 = "Eco+/R004UaCK2qEDE8vGklcTG2OeZSVm1kTUQNrykEjDwcFXDZhygFDsW49DbXyJMEhHeRL3z5cRVqPAhXlIw=="; }; }; "pull-thenable-1.0.0" = { @@ -62060,13 +61682,13 @@ let sha512 = "jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="; }; }; - "punycode-2.1.1" = { + "punycode-2.3.0" = { name = "punycode"; packageName = "punycode"; - version = "2.1.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + url = "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"; + sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; }; }; "pupa-2.1.1" = { @@ -62096,15 +61718,6 @@ let sha512 = "bt48RDBy2eIwZPrkgbcwHtb51mj2nKvHOPMaSH2IsWiv7lOG9k9zhaRzpDZafrk05ajMc3cu+lSQYYOfH2DkVQ=="; }; }; - "puppeteer-10.4.0" = { - name = "puppeteer"; - packageName = "puppeteer"; - version = "10.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-10.4.0.tgz"; - sha512 = "2cP8mBoqnu5gzAVpbZ0fRaobBWZM8GEUF4I1F6WbgHrKV/rz7SX8PG2wMymZgD0wo0UBlg2FBPNxlF/xlqW6+w=="; - }; - }; "puppeteer-13.7.0" = { name = "puppeteer"; packageName = "puppeteer"; @@ -62114,22 +61727,22 @@ let sha512 = "U1uufzBjz3+PkpCxFrWzh4OrMIdIb2ztzCu0YEPfRHjHswcSwHZswnK+WdsOQJsRV8WeTg3jLhJR4D867+fjsA=="; }; }; - "puppeteer-18.2.1" = { + "puppeteer-19.6.2" = { name = "puppeteer"; packageName = "puppeteer"; - version = "18.2.1"; + version = "19.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-18.2.1.tgz"; - sha512 = "7+UhmYa7wxPh2oMRwA++k8UGVDxh3YdWFB52r9C3tM81T6BU7cuusUSxImz0GEYSOYUKk/YzIhkQ6+vc0gHbxQ=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-19.6.2.tgz"; + sha512 = "Y5OAXXwXLfJYbl0dEFg8JKIhvCGxn+UYaBW9yra9ErmIhkVroDnYusM6oYxJCt/YIfC2pQWhvhxoZyf/E5fV6w=="; }; }; - "puppeteer-core-18.2.1" = { + "puppeteer-core-19.6.2" = { name = "puppeteer-core"; packageName = "puppeteer-core"; - version = "18.2.1"; + version = "19.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-18.2.1.tgz"; - sha512 = "MRtTAZfQTluz3U2oU/X2VqVWPcR1+94nbA2V6ZrSZRVEwLqZ8eclZ551qGFQD/vD2PYqHJwWOW/fpC721uznVw=="; + url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.6.2.tgz"; + sha512 = "il7uK658MNC1FlxPABvcnv1RdpDa9CaBFHzvtEsl+9Y4tbAJKZurkegpcvWeIWcRYGiuBIVo+t+ZSh3G82CCjw=="; }; }; "purgecss-2.3.0" = { @@ -62141,13 +61754,13 @@ let sha512 = "BE5CROfVGsx2XIhxGuZAT7rTH9lLeQx/6M0P7DTXQH4IUc3BBzs9JUzt4yzGf3JrH9enkeq6YJBe9CTtkm1WmQ=="; }; }; - "purgecss-4.1.3" = { + "purgecss-5.0.0" = { name = "purgecss"; packageName = "purgecss"; - version = "4.1.3"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/purgecss/-/purgecss-4.1.3.tgz"; - sha512 = "99cKy4s+VZoXnPxaoM23e5ABcP851nC2y2GROkkjS8eJaJtlciGavd7iYAw2V84WeBqggZ12l8ef44G99HmTaw=="; + url = "https://registry.npmjs.org/purgecss/-/purgecss-5.0.0.tgz"; + sha512 = "RAnuxrGuVyLLTr8uMbKaxDRGWMgK5CCYDfRyUNNcaz5P3kGgD2b7ymQGYEyo2ST7Tl/ScwFgf5l3slKMxHSbrw=="; }; }; "push-stream-10.1.2" = { @@ -62159,13 +61772,13 @@ let sha512 = "wCDN1KkAWOMXsiV0XxH/CggHqOYeXvyn00t9Zjp5RKsLZ2rzg/lLJIMAVxYLyh79T168W3fBYcG5TRRJAlQr6g=="; }; }; - "push-stream-11.0.1" = { + "push-stream-11.2.0" = { name = "push-stream"; packageName = "push-stream"; - version = "11.0.1"; + version = "11.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/push-stream/-/push-stream-11.0.1.tgz"; - sha512 = "Cb5aOY6Z6JxjAKBmpmmzoJ+8I6pJlRjJ5WYoM2Vw3kSlClojmIXzA+FP0yglJ4ELokrqLX223frxJTnxUx0dpw=="; + url = "https://registry.npmjs.org/push-stream/-/push-stream-11.2.0.tgz"; + sha512 = "MbiU+tFKDFv6IRwxfU2pltftFiIsW6mhLT3q91EJQwZYd2A9aaytdKAnRGYCx9KAuWQ11/cClK/FvHY996WwxA=="; }; }; "push-stream-to-pull-stream-1.0.5" = { @@ -62204,13 +61817,13 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.278" = { + "pyright-1.1.291" = { name = "pyright"; packageName = "pyright"; - version = "1.1.278"; + version = "1.1.291"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.278.tgz"; - sha512 = "at3j7c1fFzB6Jl4+bpr9QPRC/+1gH2gAR/M6GIRS312CHE2JMt8FZRflTbuxEB8IfQAtR+l3YoRMoS1vqF28jw=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.291.tgz"; + sha512 = "wkSlCEhF1OwtJqHuifwxk76UMr1NPqsAbPIlCh7tiZx8VUdZs17NCGNorhyb2M+GFEvp8pod9Xyu1LXN1JL2kQ=="; }; }; "q-0.9.7" = { @@ -62357,15 +61970,6 @@ let sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; }; }; - "qs-6.2.3" = { - name = "qs"; - packageName = "qs"; - version = "6.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz"; - sha512 = "AY4g8t3LMboim0t6XWFdz6J5OuJ1ZNYu54SXihS/OMpgyCqYmcAJnWqkNSOjSjWmq3xxy+GF9uWQI2lI/7tKIA=="; - }; - }; "qs-6.3.3" = { name = "qs"; packageName = "qs"; @@ -62420,15 +62024,6 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "qs-6.9.3" = { - name = "qs"; - packageName = "qs"; - version = "6.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz"; - sha512 = "EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw=="; - }; - }; "qs-6.9.7" = { name = "qs"; packageName = "qs"; @@ -62438,6 +62033,15 @@ let sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="; }; }; + "query-ast-1.0.5" = { + name = "query-ast"; + packageName = "query-ast"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/query-ast/-/query-ast-1.0.5.tgz"; + sha512 = "JK+1ma4YDuLjvKKcz9JZ70G+CM9qEOs/l1cZzstMMfwKUabTJ9sud5jvDGrUNuv03yKUgs82bLkHXJkDyhRmBw=="; + }; + }; "query-string-1.0.1" = { name = "query-string"; packageName = "query-string"; @@ -62474,13 +62078,13 @@ let sha512 = "XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw=="; }; }; - "query-string-7.1.1" = { + "query-string-7.1.3" = { name = "query-string"; packageName = "query-string"; - version = "7.1.1"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-7.1.1.tgz"; - sha512 = "MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w=="; + url = "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz"; + sha512 = "hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg=="; }; }; "querystring-0.2.0" = { @@ -62609,15 +62213,6 @@ let sha512 = "S27GBT+F0NTRiehtbrgaSE1idUAJ5bX8dPAQTdylEyNlrdcH5X4Lz7Edz3DYzecbsCluD5zO8ZNEe04z3D3u6Q=="; }; }; - "quickselect-2.0.0" = { - name = "quickselect"; - packageName = "quickselect"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz"; - sha512 = "RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw=="; - }; - }; "quicktask-1.0.1" = { name = "quicktask"; packageName = "quicktask"; @@ -62636,6 +62231,33 @@ let sha512 = "b3w19IEXnt5auacLAbePVsqPyVQUwmuhJQrrWnVhm4pP8PAMg2U9vFHbAD9XYXXbMDjdLJs0x5NLqwTV8uFK4g=="; }; }; + "quicktype-core-21.0.4" = { + name = "quicktype-core"; + packageName = "quicktype-core"; + version = "21.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/quicktype-core/-/quicktype-core-21.0.4.tgz"; + sha512 = "JJiJ8dzBTh/l/gTNnVwKFx0g2A0CfLNzXlUxTHjdvyldXi/Jjckr+Z04calGXxlG8KunpE4G5vV+EtuFjoTIPQ=="; + }; + }; + "quicktype-graphql-input-21.0.4" = { + name = "quicktype-graphql-input"; + packageName = "quicktype-graphql-input"; + version = "21.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/quicktype-graphql-input/-/quicktype-graphql-input-21.0.4.tgz"; + sha512 = "WXHcXL2d2HLfihbJBsJvBhzDc8sAkR5cNF6Y36R9p1eY3b0PKKmdbdHSFif/SkW9HAVP0DyP8/6rskFLU5Z9KA=="; + }; + }; + "quicktype-typescript-input-21.0.4" = { + name = "quicktype-typescript-input"; + packageName = "quicktype-typescript-input"; + version = "21.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/quicktype-typescript-input/-/quicktype-typescript-input-21.0.4.tgz"; + sha512 = "Lc0dwFZUk+dRL95sjb2iNS92GsvuwVaXQQyPJ5y4RPXm15ASTdSE3U8U94ySy2QwhNOnsv23WkkCyrxDdvk0sg=="; + }; + }; "quotation-1.1.3" = { name = "quotation"; packageName = "quotation"; @@ -62987,22 +62609,13 @@ let sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; }; - "rc-config-loader-3.0.0" = { + "rc-config-loader-4.1.2" = { name = "rc-config-loader"; packageName = "rc-config-loader"; - version = "3.0.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-3.0.0.tgz"; - sha512 = "bwfUSB37TWkHfP+PPjb/x8BUjChFmmBK44JMfVnU7paisWqZl/o5k7ttCH+EQLnrbn2Aq8Fo1LAsyUiz+WF4CQ=="; - }; - }; - "rc-config-loader-4.1.1" = { - name = "rc-config-loader"; - packageName = "rc-config-loader"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.1.1.tgz"; - sha512 = "S10o85x/szboh7FOxUyU+KuED+gr9V7SEnUBOzSn+vd1K8J2MtkP1RCPWg8Sw5kkuZKr7976bFzacCM6QtAApQ=="; + url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.1.2.tgz"; + sha512 = "qKTnVWFl9OQYKATPzdfaZIbTxcHziQl92zYSxYC6umhOqyAsoj8H8Gq/+aFjAso68sBdjTz3A7omqeAkkF1MWg=="; }; }; "rc4-0.1.5" = { @@ -63041,13 +62654,13 @@ let sha512 = "xVTNGQy/dAxOolunBLmVMGZ49VUUR1s8jZUiJQb+g1sI63GAv9+a5Jas9yHvdxeUgiZkU9r3gDExDorxHzOgRA=="; }; }; - "re2-1.17.7" = { + "re2-1.18.0" = { name = "re2"; packageName = "re2"; - version = "1.17.7"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/re2/-/re2-1.17.7.tgz"; - sha512 = "X8GSuiBoVWwcjuppqSjsIkRxNUKDdjhkO9SBekQbZ2ksqWUReCy7DQPWOVpoTnpdtdz5PIpTTxTFzvJv5UMfjA=="; + url = "https://registry.npmjs.org/re2/-/re2-1.18.0.tgz"; + sha512 = "MoCYZlJ9YUgksND9asyNF2/x532daXU/ARp1UeJbQ5flMY6ryKNEhrWt85aw3YluzOJlC3vXpGgK2a1jb0b4GA=="; }; }; "react-16.14.0" = { @@ -63068,22 +62681,13 @@ let sha512 = "gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA=="; }; }; - "react-dev-utils-11.0.4" = { - name = "react-dev-utils"; - packageName = "react-dev-utils"; - version = "11.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz"; - sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; - }; - }; - "react-devtools-core-4.26.1" = { + "react-devtools-core-4.27.1" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.26.1"; + version = "4.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.26.1.tgz"; - sha512 = "r1csa5n9nABVpSdAadwTG7K+SfgRJPc/Hdx89BkV5IlA1mEGgGi3ir630ST5D/xYlJQaY3VE75YGADgpNW7HIw=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.27.1.tgz"; + sha512 = "qXhcxxDWiFmFAOq48jts9YQYe1+wVoUXzJTlY4jbaATzyio6dd6CUGu3dXBhREeVgpZ+y4kg6vFJzIOZh6vY2w=="; }; }; "react-dom-16.14.0" = { @@ -63113,15 +62717,6 @@ let sha512 = "FlsPxavEyMuR6TjVbSSywovXSEyOg6ZDj5+Z8nbsRl9EkOzAhEIcS+GLoQDC5fz/t9suhUXWmUrOBrgeUvrMxw=="; }; }; - "react-error-overlay-6.0.11" = { - name = "react-error-overlay"; - packageName = "react-error-overlay"; - version = "6.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz"; - sha512 = "/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="; - }; - }; "react-error-overlay-6.0.9" = { name = "react-error-overlay"; packageName = "react-error-overlay"; @@ -63149,13 +62744,13 @@ let sha512 = "4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw=="; }; }; - "react-hot-loader-4.13.0" = { + "react-hot-loader-4.13.1" = { name = "react-hot-loader"; packageName = "react-hot-loader"; - version = "4.13.0"; + version = "4.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.13.0.tgz"; - sha512 = "JrLlvUPqh6wIkrK2hZDfOyq/Uh/WeVEr8nc7hkn2/3Ul0sx1Kr5y4kOGNacNRoj7RhwLNcQ3Udf1KJXrqc0ZtA=="; + url = "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.13.1.tgz"; + sha512 = "ZlqCfVRqDJmMXTulUGic4lN7Ic1SXgHAFw7y/Jb7t25GBgTR0fYAJ8uY4mrpxjRyWGWmqw77qJQGnYbzCvBU7g=="; }; }; "react-is-16.13.1" = { @@ -63185,15 +62780,6 @@ let sha512 = "fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="; }; }; - "react-popper-1.3.11" = { - name = "react-popper"; - packageName = "react-popper"; - version = "1.3.11"; - src = fetchurl { - url = "https://registry.npmjs.org/react-popper/-/react-popper-1.3.11.tgz"; - sha512 = "VSA/bS+pSndSF2fiasHK/PTEEAyOpX60+H5EPAjoArr8JGm+oihu4UbrqcEBpQibJxBVCpYyjAX7abJ+7DoYVg=="; - }; - }; "react-reconciler-0.24.0" = { name = "react-reconciler"; packageName = "react-reconciler"; @@ -63239,15 +62825,6 @@ let sha512 = "PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw=="; }; }; - "react-string-replace-1.1.0" = { - name = "react-string-replace"; - packageName = "react-string-replace"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-string-replace/-/react-string-replace-1.1.0.tgz"; - sha512 = "N6RalSDFGbOHs0IJi1H611WbZsvk3ZT47Jl2JEXFbiS3kTwsdCYij70Keo/tWtLy7sfhDsYm7CwNM/WmjXIaMw=="; - }; - }; "react-tabs-3.2.3" = { name = "react-tabs"; packageName = "react-tabs"; @@ -63257,15 +62834,6 @@ let sha512 = "jx325RhRVnS9DdFbeF511z0T0WEqEoMl1uCE3LoZ6VaZZm7ytatxbum0B8bCTmaiV0KsU+4TtLGTGevCic7SWg=="; }; }; - "react-transition-group-4.4.5" = { - name = "react-transition-group"; - packageName = "react-transition-group"; - version = "4.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz"; - sha512 = "pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g=="; - }; - }; "react-universal-component-4.5.0" = { name = "react-universal-component"; packageName = "react-universal-component"; @@ -63275,42 +62843,6 @@ let sha512 = "dBUC6afvSAQhDcE4oh1eTmfU29W0O2eZhcGXnfGUTulXkU8ejuWqlJWXXrSMx5iV1H6LNgj2NJMj3BtBMfBNhA=="; }; }; - "react-virtualized-auto-sizer-1.0.7" = { - name = "react-virtualized-auto-sizer"; - packageName = "react-virtualized-auto-sizer"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.7.tgz"; - sha512 = "Mxi6lwOmjwIjC1X4gABXMJcKHsOo0xWl3E3ugOgufB8GJU+MqrtY35aBuvCYv/razQ1Vbp7h1gWJjGjoNN5pmA=="; - }; - }; - "react-window-1.8.8" = { - name = "react-window"; - packageName = "react-window"; - version = "1.8.8"; - src = fetchurl { - url = "https://registry.npmjs.org/react-window/-/react-window-1.8.8.tgz"; - sha512 = "D4IiBeRtGXziZ1n0XklnFGu7h9gU684zepqyKzgPNzrsrk7xOCxni+TCckjg2Nr/DiaEEGVVmnhYSlT2rB47dQ=="; - }; - }; - "react-window-infinite-loader-1.0.8" = { - name = "react-window-infinite-loader"; - packageName = "react-window-infinite-loader"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/react-window-infinite-loader/-/react-window-infinite-loader-1.0.8.tgz"; - sha512 = "907ZLAiZZfBHuZyiY0V7uiSL4P/rI6UQyCF9wES1cDWTeyNLgGLaxu+BZkcUW3R5tSCQcbCcWBl0jVIpYzrKGQ=="; - }; - }; - "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"; @@ -63401,6 +62933,15 @@ let sha512 = "3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w=="; }; }; + "read-package-json-2.1.2" = { + name = "read-package-json"; + packageName = "read-package-json"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz"; + sha512 = "D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA=="; + }; + }; "read-package-json-4.1.2" = { name = "read-package-json"; packageName = "read-package-json"; @@ -63419,6 +62960,15 @@ let sha512 = "BSzugrt4kQ/Z0krro8zhTwV1Kd79ue25IhNN/VtHFy1mG/6Tluyi+msc0UpwaoQzxSHa28mntAjIZY6kEgfR9Q=="; }; }; + "read-package-json-6.0.0" = { + name = "read-package-json"; + packageName = "read-package-json"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.0.tgz"; + sha512 = "b/9jxWJ8EwogJPpv99ma+QwtqB7FSl3+V6UXS7Aaay8/5VwMY50oIFooY1UKXMWpfNCM6T/PoGqa5GD1g9xf9w=="; + }; + }; "read-package-json-fast-2.0.3" = { name = "read-package-json-fast"; packageName = "read-package-json-fast"; @@ -63428,13 +62978,22 @@ let sha512 = "W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ=="; }; }; - "read-package-json-fast-3.0.1" = { + "read-package-json-fast-3.0.2" = { name = "read-package-json-fast"; packageName = "read-package-json-fast"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.1.tgz"; - sha512 = "8+HW7Yo+cjfF+md8DqsZHgats2mxf7gGYow/+2JjxrftoHFZz9v4dzd0EubzYbkNaLxrTVcnllHwklXN2+7aTQ=="; + url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz"; + sha512 = "0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw=="; + }; + }; + "read-package-tree-5.1.6" = { + name = "read-package-tree"; + packageName = "read-package-tree"; + version = "5.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.6.tgz"; + sha512 = "FCX1aT3GWyY658wzDICef4p+n0dB+ENRct8E/Qyvppj6xVpOYerBHfUu7OP5Rt1/393Tdglguf5ju5DEX4wZNg=="; }; }; "read-pkg-1.1.0" = { @@ -63563,6 +63122,15 @@ let sha512 = "TzPdVpK3xEnvsS1yCy94CiOmfzG2/MNuZjpZi64+HJxb9fVZD4nIfFFGZ9T2N/dgwOFumfacw3xCD6rXtgwn2g=="; }; }; + "read-yaml-file-2.1.0" = { + name = "read-yaml-file"; + packageName = "read-yaml-file"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-yaml-file/-/read-yaml-file-2.1.0.tgz"; + sha512 = "UkRNRIwnhG+y7hpqnycCL/xbTk7+ia9VuVTC0S+zVbwd65DI9eUpRMfsWIGrCWxTU/mi+JW8cHQCrv+zfCbEPQ=="; + }; + }; "readable-stream-1.0.2" = { name = "readable-stream"; packageName = "readable-stream"; @@ -63626,15 +63194,6 @@ let sha512 = "NkXT2AER7VKXeXtJNSaWLpWIhmtSE3K2PguaLEeWr4JILghcIKqoLt1A3wHrnpDC5+ekf8gfk1GKWkFXe4odMw=="; }; }; - "readable-stream-2.3.0" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.0.tgz"; - sha512 = "c7KMXGd4b48nN3OJ1U9qOsn6pXNzf6kLd3kdZCkg2sxAcoiufInqF0XckwEnlrcwuaYwonlNK8GQUIOC/WC7sg=="; - }; - }; "readable-stream-2.3.7" = { name = "readable-stream"; packageName = "readable-stream"; @@ -63653,13 +63212,13 @@ let sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; - "readable-stream-4.2.0" = { + "readable-stream-4.3.0" = { name = "readable-stream"; packageName = "readable-stream"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-4.2.0.tgz"; - sha512 = "gJrBHsaI3lgBoGMW/jHZsQ/o/TIWiu5ENCJG1BB7fuCKzpFM8GaS2UoBVt9NO+oI+3FcrBNbUkl3ilDe09aY4A=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-4.3.0.tgz"; + sha512 = "MuEnA0lbSi7JS8XM+WNJlWZkHAAdm7gETHdFK//Q/mChGyj2akEFtdLZh32jSdkWGbRwCW9pn6g3LWDdDeZnBQ=="; }; }; "readable-web-to-node-stream-2.0.0" = { @@ -63842,15 +63401,6 @@ let sha512 = "4xod0yBv9Cvm9MXNjrSC/mi8RjrIMMMMRUVMs3I3uOGH5nEHf4gqN1+8ziIPL50qtPSybhcLSwXu6St1TBaqTA=="; }; }; - "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=="; - }; - }; "recursive-readdir-2.2.3" = { name = "recursive-readdir"; packageName = "recursive-readdir"; @@ -63923,15 +63473,6 @@ let sha512 = "FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ=="; }; }; - "redis-2.8.0" = { - name = "redis"; - packageName = "redis"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; - sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; - }; - }; "redis-3.1.2" = { name = "redis"; packageName = "redis"; @@ -63950,13 +63491,13 @@ let sha512 = "bCR0gKVhIXFg8zCQjXEANzgI01DDixtPZgIUZHBCmwqixnu+MK3Tb2yqGjh+HCLASQVVgApiwhNkv+FoedZOGQ=="; }; }; - "redis-4.4.0" = { + "redis-4.6.2" = { name = "redis"; packageName = "redis"; - version = "4.4.0"; + version = "4.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-4.4.0.tgz"; - sha512 = "tQyFG6O9iewLxxHYRyirJNklhe2QI7M/0o8q0jk7D9Z/Cxh/7oZrQyHKyjWz0TkkCls8ool/xvhL9K8zRnkaYQ=="; + url = "https://registry.npmjs.org/redis/-/redis-4.6.2.tgz"; + sha512 = "Xoh7UyU6YnT458xA8svaZAJu6ZunKeW7Z/7GXrLWGGwhVLTsDX6pr3u7ENAoV+DHBPO+9LwIu45ClwUwpIjAxw=="; }; }; "redis-commands-1.7.0" = { @@ -63977,15 +63518,6 @@ let sha512 = "1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w=="; }; }; - "redis-parser-2.6.0" = { - name = "redis-parser"; - packageName = "redis-parser"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz"; - sha512 = "9Hdw19gwXFBJdN8ENUoNVJFRyMDFrE/ZBClPicKYDPwNPJ4ST1TedAHYNSiGKElwh2vrmRGMoJYbVdJd+WQXIw=="; - }; - }; "redis-parser-3.0.0" = { name = "redis-parser"; packageName = "redis-parser"; @@ -64022,6 +63554,15 @@ let sha512 = "j5WfFJfc9CoXv/WbwVLHq74i/hdTUpy+iNC534LxczMRP67vJeK3V9JOdnL0N1cIRbn9mYhE2yVjvvKXDxvNXQ=="; }; }; + "reduce-flatten-2.0.0" = { + name = "reduce-flatten"; + packageName = "reduce-flatten"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz"; + sha512 = "EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w=="; + }; + }; "redux-3.7.2" = { name = "redux"; packageName = "redux"; @@ -64031,13 +63572,13 @@ let sha512 = "pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A=="; }; }; - "redux-4.1.2" = { + "redux-4.2.0" = { name = "redux"; packageName = "redux"; - version = "4.1.2"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/redux/-/redux-4.1.2.tgz"; - sha512 = "SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw=="; + url = "https://registry.npmjs.org/redux/-/redux-4.2.0.tgz"; + sha512 = "oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA=="; }; }; "ref-1.3.5" = { @@ -64058,15 +63599,6 @@ let sha512 = "h2OSdAUycdqiwFBp2wB3XEFheWA/U+n/JYnhEi3584JqnCCDXIA3qDIhHH3klIHMNZwrJW+VagpxPGeSf6777Q=="; }; }; - "referrer-policy-1.2.0" = { - name = "referrer-policy"; - packageName = "referrer-policy"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.2.0.tgz"; - sha512 = "LgQJIuS6nAy1Jd88DCQRemyE3mS+ispwlqMk3b0yjZ257fI1v9c+/p6SD5gP5FGyXUIgrNOAfmyioHwZtYv2VA=="; - }; - }; "reflect-metadata-0.1.13" = { name = "reflect-metadata"; packageName = "reflect-metadata"; @@ -64130,22 +63662,22 @@ let sha512 = "odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="; }; }; - "regenerator-runtime-0.13.10" = { + "regenerator-runtime-0.13.11" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.13.10"; + version = "0.13.11"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz"; - sha512 = "KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz"; + sha512 = "kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="; }; }; - "regenerator-transform-0.15.0" = { + "regenerator-transform-0.15.1" = { name = "regenerator-transform"; packageName = "regenerator-transform"; - version = "0.15.0"; + version = "0.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz"; - sha512 = "LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg=="; + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz"; + sha512 = "knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg=="; }; }; "regex-cache-0.4.4" = { @@ -64166,15 +63698,6 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regex-parser-2.2.11" = { - name = "regex-parser"; - packageName = "regex-parser"; - version = "2.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz"; - sha512 = "jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q=="; - }; - }; "regexp-to-ast-0.3.5" = { name = "regexp-to-ast"; packageName = "regexp-to-ast"; @@ -64220,13 +63743,13 @@ let sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; }; - "regexpu-core-5.2.1" = { + "regexpu-core-5.2.2" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz"; - sha512 = "HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.2.tgz"; + sha512 = "T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw=="; }; }; "register-protocol-win32-1.1.0" = { @@ -65300,6 +64823,15 @@ let sha512 = "3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg=="; }; }; + "request-light-0.6.0" = { + name = "request-light"; + packageName = "request-light"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request-light/-/request-light-0.6.0.tgz"; + sha512 = "D3TyWnzX4Kej7ZomWbD+ZqnmzKw/otLHU4tsuhsnF3CoIBo9y0JsxkQXGAqBC4FH/y1hm/ry0/hrsVaKMCkljA=="; + }; + }; "request-oauth-0.0.3" = { name = "request-oauth"; packageName = "request-oauth"; @@ -65417,6 +64949,15 @@ let sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; + "require-package-name-2.0.1" = { + name = "require-package-name"; + packageName = "require-package-name"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-package-name/-/require-package-name-2.0.1.tgz"; + sha512 = "uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q=="; + }; + }; "require-relative-0.8.7" = { name = "require-relative"; packageName = "require-relative"; @@ -65462,13 +65003,13 @@ let sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; }; }; - "requizzle-0.2.3" = { + "requizzle-0.2.4" = { name = "requizzle"; packageName = "requizzle"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/requizzle/-/requizzle-0.2.3.tgz"; - sha512 = "YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ=="; + url = "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz"; + sha512 = "JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw=="; }; }; "reselect-4.1.7" = { @@ -65507,6 +65048,15 @@ let sha512 = "LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="; }; }; + "resolve-1.17.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; + sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; + }; + }; "resolve-1.22.1" = { name = "resolve"; packageName = "resolve"; @@ -65660,15 +65210,6 @@ let sha512 = "i1xevIst/Qa+nA9olDxLWnLk8YZbi8R/7JPbCMcgyWaFR6bKWaexgJgEB5oc2PKMjYdrHynyz0NY+if+H98t1w=="; }; }; - "resolve-protobuf-schema-2.1.0" = { - name = "resolve-protobuf-schema"; - packageName = "resolve-protobuf-schema"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz"; - sha512 = "kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ=="; - }; - }; "resolve-url-0.2.1" = { name = "resolve-url"; packageName = "resolve-url"; @@ -65678,15 +65219,6 @@ let sha512 = "ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="; }; }; - "resolve-url-loader-5.0.0" = { - name = "resolve-url-loader"; - packageName = "resolve-url-loader"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz"; - sha512 = "uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg=="; - }; - }; "resp-modifier-6.0.2" = { name = "resp-modifier"; packageName = "resp-modifier"; @@ -65696,15 +65228,6 @@ let sha512 = "U1+0kWC/+4ncRFYqQWTx/3qkfE6a4B/h3XXgmXypfa0SPZ3t7cbbaFk297PjQS/yov24R18h6OZe6iZwj3NSLw=="; }; }; - "response-time-2.3.2" = { - name = "response-time"; - packageName = "response-time"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz"; - sha512 = "MUIDaDQf+CVqflfTdQ5yam+aYCkXj1PY8fjlPDQ6ppxJlmgZb864pHtA750mayywNg8tx4rS7qH9JXd/OF+3gw=="; - }; - }; "responselike-1.0.2" = { name = "responselike"; packageName = "responselike"; @@ -65885,13 +65408,13 @@ let sha512 = "40Ym0WOgy7rRY4tR2iL01g3Y5Ql+9NBV21hycIhNX3uv+6vjaWB30NWN+tTcxNIWBJEwXHoTDMiVdAMm6ZpHVA=="; }; }; - "retext-profanities-7.2.1" = { + "retext-profanities-7.2.2" = { name = "retext-profanities"; packageName = "retext-profanities"; - version = "7.2.1"; + version = "7.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/retext-profanities/-/retext-profanities-7.2.1.tgz"; - sha512 = "VJ+opSjhmFKJnHvvqpM6/5Jxiizys9teNmQpdQgZTeUTddAGALq418/hjyvCvI1c2IGgya8pVA5pZ1b8+RMfyQ=="; + url = "https://registry.npmjs.org/retext-profanities/-/retext-profanities-7.2.2.tgz"; + sha512 = "nwrR987v3m7+JQ8wyK8oE+adqS1aYUyHyf+k6omflI/8PL9Slbp/39YieTJJvrmR0udBe2iV7aURXW5/3Uj12w=="; }; }; "rethinkdb-2.4.2" = { @@ -65966,13 +65489,13 @@ let sha512 = "xcBILK2pA9oh4SiinPEZfhP8HfrB/ha+a2fTMyl7Om2WjlDVrOQy99N2MXXlUHqGJz4qEu2duXxHJjDWuK/0xg=="; }; }; - "reveal.js-4.3.1" = { + "reveal.js-4.4.0" = { name = "reveal.js"; packageName = "reveal.js"; - version = "4.3.1"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.3.1.tgz"; - sha512 = "1kyEnWeUkaCdBdX//XXq9dtBK95ppvIlSwlHelrP8/wrX6LcsYp4HT9WTFoFEOUBfVqkm8C2aHQ367o+UKfcxw=="; + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.4.0.tgz"; + sha512 = "jIV6C9V2NEUjGzU8L6dUFGpk1KJmq7/EzP2fOW67ggc2c0Cp/PdprWxZ9Qgp46F0T2ZWDCjQ1p3Ytzy5jA6a2w=="; }; }; "reverse-http-1.3.0" = { @@ -65993,6 +65516,15 @@ let sha512 = "4LMcbvBonVhsufIwa7Po+HhK0rznNyvQxIG/14/wTm7W88eFQy1jU+T7i5afaWOQ53czEJlaI3ua9pzZtqXE0w=="; }; }; + "rfc4648-1.5.2" = { + name = "rfc4648"; + packageName = "rfc4648"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rfc4648/-/rfc4648-1.5.2.tgz"; + sha512 = "tLOizhR6YGovrEBLatX1sdcuhoSCXddw3mqNVAcKxGJ+J0hFeJ+SjeWCv5UPA/WU3YzWPPuCVYgXBKZUPGpKtg=="; + }; + }; "rfdc-1.3.0" = { name = "rfdc"; packageName = "rfdc"; @@ -66020,15 +65552,6 @@ let sha512 = "zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg=="; }; }; - "rgbcolor-1.0.1" = { - name = "rgbcolor"; - packageName = "rgbcolor"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz"; - sha512 = "9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw=="; - }; - }; "right-align-0.1.3" = { name = "right-align"; packageName = "right-align"; @@ -66101,6 +65624,15 @@ let sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; }; + "rimraf-4.1.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-4.1.2.tgz"; + sha512 = "BlIbgFryTbw3Dz6hyoWFhKk+unCcHMSkZGrTFVAx2WmttdBSonsdtRlwiuTbDqTKr+UlXIUqJVS4QT5tUzGENQ=="; + }; + }; "ripemd160-2.0.2" = { name = "ripemd160"; packageName = "ripemd160"; @@ -66281,15 +65813,6 @@ let sha512 = "OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw=="; }; }; - "rtcpeerconnection-shim-1.2.15" = { - name = "rtcpeerconnection-shim"; - packageName = "rtcpeerconnection-shim"; - version = "1.2.15"; - src = fetchurl { - url = "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.15.tgz"; - sha512 = "C6DxhXt7bssQ1nHb154lqeL0SXz5Dx4RczXZu2Aa/L1NJFnEVDxFwCBo3fqtuljhHIGceg5JKBV4XJ0gW5JKyw=="; - }; - }; "rttc-4.5.2" = { name = "rttc"; packageName = "rttc"; @@ -66380,15 +65903,6 @@ let sha512 = "cLgakCUf6PedEu15t8kbsjnwIFFR2D4RfL+W3iWFJ4iac7z4B0ZI8fxy4R3J956kAI68HclCFGL8MPoUVC3qVA=="; }; }; - "rw-0.1.4" = { - name = "rw"; - packageName = "rw"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/rw/-/rw-0.1.4.tgz"; - sha512 = "vSj3D96kMcjNyqPcp65wBRIDImGSrUuMxngNNxvw8MQaO+aQ6llzRPH7XcJy5zrpb3wU++045+Uz/IDIM684iw=="; - }; - }; "rw-1.3.3" = { name = "rw"; packageName = "rw"; @@ -66470,13 +65984,13 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; - "rxjs-7.5.7" = { + "rxjs-7.8.0" = { name = "rxjs"; packageName = "rxjs"; - version = "7.5.7"; + version = "7.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz"; - sha512 = "z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz"; + sha512 = "F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg=="; }; }; "s.color-0.0.15" = { @@ -66614,13 +66128,13 @@ let sha512 = "ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw=="; }; }; - "safe-stable-stringify-2.4.1" = { + "safe-stable-stringify-2.4.2" = { name = "safe-stable-stringify"; packageName = "safe-stable-stringify"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.1.tgz"; - sha512 = "dVHE6bMtS/bnL2mwualjc6IxEv1F+OCUpA46pKUj6F8uDbUM0jCCulPqRNPSnWwGNKx5etqMjZYdXtrm5KJZGA=="; + url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz"; + sha512 = "gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA=="; }; }; "safer-buffer-2.1.2" = { @@ -66713,94 +66227,13 @@ let sha512 = "zmXn03k3hN0KaiVTjohgkg98C3UowhL1/VSGdj4/VAAiMKGQOE80PFPxFP2Kyq0OUskPKcY5lImkhBKEHlypJA=="; }; }; - "sass-1.56.0" = { + "sass-1.57.1" = { name = "sass"; packageName = "sass"; - version = "1.56.0"; + version = "1.57.1"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.56.0.tgz"; - sha512 = "WFJ9XrpkcnqZcYuLRJh5qiV6ibQOR4AezleeEjTjMsCocYW59dEG19U3fwTTXxzi2Ed3yjPBp727hbbj53pHFw=="; - }; - }; - "sass-embedded-1.55.0" = { - name = "sass-embedded"; - packageName = "sass-embedded"; - version = "1.55.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.55.0.tgz"; - sha512 = "6AkKEyRjxz37iNwOdTOW94I33j5mxcih9Z604q1w0M1dOTKaZgtyNI67O0zb4akwZ9dVZ2VSJBXqY8/1TZRBIw=="; - }; - }; - "sass-embedded-darwin-arm64-1.55.0" = { - name = "sass-embedded-darwin-arm64"; - packageName = "sass-embedded-darwin-arm64"; - version = "1.55.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.55.0.tgz"; - sha512 = "cQ43gYDFo4xWSqG01ZmOhTyTgk/RYK7s1a4R+7VSQPhYTsd4VofAmTNw0MkLR3RzR53ziGgawA6uT/WHTm+yjg=="; - }; - }; - "sass-embedded-darwin-x64-1.55.0" = { - name = "sass-embedded-darwin-x64"; - packageName = "sass-embedded-darwin-x64"; - version = "1.55.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.55.0.tgz"; - sha512 = "ra8z++EBey01pkiwCwjWyMbf6G5xm2Uj0dUJzzsS1MI6Fw6XaesrWmYico5pnawm3rOYtKlMxkd2Y6b1Jwxy8A=="; - }; - }; - "sass-embedded-linux-arm-1.55.0" = { - name = "sass-embedded-linux-arm"; - packageName = "sass-embedded-linux-arm"; - version = "1.55.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.55.0.tgz"; - sha512 = "UIW7CaRLjHMWm64jH23n5eji/RAv8XIJ2qpFh0Ds8EJeDZmRA+qyIFHcQ805fZ22u6o0mkxq0kE4+j1XmmbBeg=="; - }; - }; - "sass-embedded-linux-arm64-1.55.0" = { - name = "sass-embedded-linux-arm64"; - packageName = "sass-embedded-linux-arm64"; - version = "1.55.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.55.0.tgz"; - sha512 = "P4zL4PnujdiSkek/g0RJjyNZcYEqSm6WFr0sSIrxe3byhGg56mWr4WJdxUNwFZ6sxyy2s0PFSjSKGmBtgEfIpw=="; - }; - }; - "sass-embedded-linux-ia32-1.55.0" = { - name = "sass-embedded-linux-ia32"; - packageName = "sass-embedded-linux-ia32"; - version = "1.55.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.55.0.tgz"; - sha512 = "9XJyAl4w5KBjR4LAXckfQKqPv9UYPmOv2HFRBwhHD1k4Dc8gZbfTCzK5wl49z5Z4z1GPvqV9ucIZceXzgJ5e6Q=="; - }; - }; - "sass-embedded-linux-x64-1.55.0" = { - name = "sass-embedded-linux-x64"; - packageName = "sass-embedded-linux-x64"; - version = "1.55.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.55.0.tgz"; - sha512 = "vd4/4/L7gZcVyxq03/MY/+rcpGgOI0ihOUpwRJLj+9CmUxvhxCSTF51/QO5CW7Z5oJSYEABA/RYlj8NPm4ZejA=="; - }; - }; - "sass-embedded-win32-ia32-1.55.0" = { - name = "sass-embedded-win32-ia32"; - packageName = "sass-embedded-win32-ia32"; - version = "1.55.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.55.0.tgz"; - sha512 = "4HxK0byJ3iIn5OECIeNVz9GcGBuQcQT6kTvI+3QSHzuKsqgQrlXOPJ3772zKD6PVwZJNFZJFf3o9w8V2VSHbTQ=="; - }; - }; - "sass-embedded-win32-x64-1.55.0" = { - name = "sass-embedded-win32-x64"; - packageName = "sass-embedded-win32-x64"; - version = "1.55.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.55.0.tgz"; - sha512 = "LWUp5YpJy0/Q+5AOVcw919jktw+OnPiM4f4j5K6MJAiaodJwrSTqRGwMa2wOWyAUpjIdka8Ygm6j+2h5HNgSNQ=="; + url = "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz"; + sha512 = "O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw=="; }; }; "sass-formatter-0.7.5" = { @@ -66821,15 +66254,6 @@ let sha512 = "VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag=="; }; }; - "sass-graph-4.0.1" = { - name = "sass-graph"; - packageName = "sass-graph"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-graph/-/sass-graph-4.0.1.tgz"; - sha512 = "5YCfmGBmxoIRYHnKK2AKzrAkCoQ8ozO+iumT8K4tXJXRVCPf+7s1/9KxTSW3Rbvf+7Y7b4FR3mWyLnQr3PHocA=="; - }; - }; "sass-loader-10.2.0" = { name = "sass-loader"; packageName = "sass-loader"; @@ -66839,15 +66263,6 @@ let sha512 = "kUceLzC1gIHz0zNJPpqRsJyisWatGYNFRmv2CKZK2/ngMJgLqxTbXwe/hJ85luyvZkgqU3VlJ33UVF2T/0g6mw=="; }; }; - "sass-loader-13.1.0" = { - name = "sass-loader"; - packageName = "sass-loader"; - version = "13.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.1.0.tgz"; - sha512 = "tZS1RJQ2n2+QNyf3CCAo1H562WjL/5AM6Gi8YcPVVoNxQX8d19mx8E+8fRrMWsyc93ZL6Q8vZDSM0FHVTJaVnQ=="; - }; - }; "sax-0.5.8" = { name = "sax"; packageName = "sax"; @@ -66992,15 +66407,6 @@ let sha512 = "g3WxHrqSWCZHGHlSrF51VXFdjImhwvH8ZO/pryFH56Qi0cDsZfylQa/t0jCzVQFNbNvM00HfHjkDPEuarKDSWQ=="; }; }; - "screenfull-5.2.0" = { - name = "screenfull"; - packageName = "screenfull"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/screenfull/-/screenfull-5.2.0.tgz"; - sha512 = "9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA=="; - }; - }; "scrypt-js-3.0.1" = { name = "scrypt-js"; packageName = "scrypt-js"; @@ -67010,6 +66416,15 @@ let sha512 = "cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA=="; }; }; + "scss-parser-1.0.6" = { + name = "scss-parser"; + packageName = "scss-parser"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/scss-parser/-/scss-parser-1.0.6.tgz"; + sha512 = "SH3TaoaJFzfAtqs3eG1j5IuHJkeEW5rKUPIjIN+ZorLAyJLHItQGnsgwHk76v25GtLtpT9IqfAcqK4vFWdiw+w=="; + }; + }; "scss-tokenizer-0.2.3" = { name = "scss-tokenizer"; packageName = "scss-tokenizer"; @@ -67019,24 +66434,6 @@ let sha512 = "dYE8LhncfBUar6POCxMTm0Ln+erjeczqEvCJib5/7XNkdw1FkUGgwMPY360FY0FgPWQxHWCx29Jl3oejyGLM9Q=="; }; }; - "scss-tokenizer-0.4.3" = { - name = "scss-tokenizer"; - packageName = "scss-tokenizer"; - version = "0.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.4.3.tgz"; - sha512 = "raKLgf1LI5QMQnG+RxHz6oK0sL3x3I4FN2UDLqgLOGO8hodECNnNh5BXn7fAyBxrA8zVzdQizQ6XjNJQ+uBwMw=="; - }; - }; - "sdp-2.12.0" = { - name = "sdp"; - packageName = "sdp"; - version = "2.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sdp/-/sdp-2.12.0.tgz"; - sha512 = "jhXqQAQVM+8Xj5EjJGVweuEzgtGWb3tmEEpl3CLP3cStInSbVHSg0QWOGQzNq8pSID4JkpeV2mPqlMDLrm0/Vw=="; - }; - }; "secp256k1-4.0.3" = { name = "secp256k1"; packageName = "secp256k1"; @@ -67082,13 +66479,13 @@ let sha512 = "AckIIV90rPDcBcglUwXPF3kg0P0qmPsPXAj6BBEENQE1p5yA1xfmDJzfi1Tappj37Pv2mVbKpL3Z1T+Nn7k1Qw=="; }; }; - "secure-json-parse-2.5.0" = { + "secure-json-parse-2.7.0" = { name = "secure-json-parse"; packageName = "secure-json-parse"; - version = "2.5.0"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.5.0.tgz"; - sha512 = "ZQruFgZnIWH+WyO9t5rWt4ZEGqCKPwhiw+YbzTwpmT9elgLrLcfuyUiSnwwjUiVy9r4VM3urtbNF1xmEh9IL2w=="; + url = "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.7.0.tgz"; + sha512 = "6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw=="; }; }; "secure-keys-1.0.0" = { @@ -67109,13 +66506,13 @@ let sha512 = "e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ=="; }; }; - "selderee-0.6.0" = { + "selderee-0.10.0" = { name = "selderee"; packageName = "selderee"; - version = "0.6.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/selderee/-/selderee-0.6.0.tgz"; - sha512 = "ibqWGV5aChDvfVdqNYuaJP/HnVBhlRGSRrlbttmlMpHcLuTqqbMH36QkSs9GEgj5M88JDYLI8eyP94JaQ8xRlg=="; + url = "https://registry.npmjs.org/selderee/-/selderee-0.10.0.tgz"; + sha512 = "DEL/RW/f4qLw/NrVg97xKaEBC8IpzIG2fvxnzCp3Z4yk4jQ3MXom+Imav9wApjxX2dfS3eW7x0DXafJr85i39A=="; }; }; "select-hose-2.0.0" = { @@ -67469,15 +66866,6 @@ let sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; }; }; - "sentence-case-3.0.4" = { - name = "sentence-case"; - packageName = "sentence-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz"; - sha512 = "8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg=="; - }; - }; "sentence-splitter-3.2.2" = { name = "sentence-splitter"; packageName = "sentence-splitter"; @@ -67559,6 +66947,15 @@ let sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; }; }; + "serialize-javascript-6.0.1" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz"; + sha512 = "owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w=="; + }; + }; "serialize-to-js-3.1.2" = { name = "serialize-to-js"; packageName = "serialize-to-js"; @@ -67568,13 +66965,13 @@ let sha512 = "owllqNuDDEimQat7EPG0tH7JjO090xKNzUtYz6X+Sk2BXDnOCilDdNLwjWeFywG9xkJul1ULvtUQa9O4pUaY0w=="; }; }; - "serialport-10.4.0" = { + "serialport-10.5.0" = { name = "serialport"; packageName = "serialport"; - version = "10.4.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/serialport/-/serialport-10.4.0.tgz"; - sha512 = "PszPM5SnFMgSXom60PkKS2A9nMlNbHkuoyRBlzdSWw9rmgOn258+V0dYbWMrETJMM+TJV32vqBzjg5MmmUMwMw=="; + url = "https://registry.npmjs.org/serialport/-/serialport-10.5.0.tgz"; + sha512 = "7OYLDsu5i6bbv3lU81pGy076xe0JwpK6b49G6RjNvGibstUqQkI+I3/X491yBGtf4gaqUdOgoU1/5KZ/XxL4dw=="; }; }; "serve-11.3.2" = { @@ -67604,6 +67001,15 @@ let sha512 = "FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w=="; }; }; + "serve-handler-6.1.5" = { + name = "serve-handler"; + packageName = "serve-handler"; + version = "6.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.5.tgz"; + sha512 = "ijPFle6Hwe8zfmBxJdE+5fta53fdIY0lHISJvuikXB3VYFafRjMRpOffSPvCYsbKyBA7pvy9oYr/BT1O3EArlg=="; + }; + }; "serve-index-1.9.1" = { name = "serve-index"; packageName = "serve-index"; @@ -67649,15 +67055,6 @@ let sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; }; }; - "server-1.0.37" = { - name = "server"; - packageName = "server"; - version = "1.0.37"; - src = fetchurl { - url = "https://registry.npmjs.org/server/-/server-1.0.37.tgz"; - sha512 = "dpIQ54z2zbhU/mA9rTaOZz/q3yeK+33Iw39xcYIeabjSVCDIxPsYCJTOTp/bqIB3fBvCWrg3SCn4z/N7SMIsPw=="; - }; - }; "server-destroy-1.0.1" = { name = "server-destroy"; packageName = "server-destroy"; @@ -67703,6 +67100,15 @@ let sha512 = "1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ=="; }; }; + "set-immediate-shim-1.0.1" = { + name = "set-immediate-shim"; + packageName = "set-immediate-shim"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"; + sha512 = "Li5AOqrZWCVA2n5kryzEmqai6bKSIvpz5oUJHPVj6+dsbD3X1ixtsY5tEnsaNpH3pFAHmG8eIHUrtEtohrg+UQ=="; + }; + }; "set-value-2.0.1" = { name = "set-value"; packageName = "set-value"; @@ -67874,15 +67280,6 @@ let sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; - "shell-quote-1.7.2" = { - name = "shell-quote"; - packageName = "shell-quote"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz"; - sha512 = "mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="; - }; - }; "shell-quote-1.7.3" = { name = "shell-quote"; packageName = "shell-quote"; @@ -68081,13 +67478,13 @@ let sha512 = "fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g=="; }; }; - "sign-addon-5.1.0" = { + "sign-addon-5.2.0" = { name = "sign-addon"; packageName = "sign-addon"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-5.1.0.tgz"; - sha512 = "fag/csbsw25WpW+G+uWE6rRImSjlfwQNjuP28fFhvXpfW+kXccxl/o1QEW+hXtTidwpysksb7Y0B8UCeMkYkSA=="; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-5.2.0.tgz"; + sha512 = "t5CZ4MSKAd3uJBUfjgWfSyKYC1pQS6BMUbgI5OytzMkTOQ9NkdkFE8bB0AJLQIGqDrNS2b1+/ghAP56iuCUE+g=="; }; }; "signal-exit-3.0.7" = { @@ -68189,13 +67586,13 @@ let sha512 = "z4qtrRuaAFJS4PUd0g+xy7aN4y+RvEt/QTJpR184lhJguBA1S/LsVlvE/CM95RsYMOFJG3NGGDjqFCzKU19S/A=="; }; }; - "simple-git-3.14.1" = { + "simple-git-3.16.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.14.1"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.14.1.tgz"; - sha512 = "1ThF4PamK9wBORVGMK9HK5si4zoGS2GpRO7tkAFObA4FZv6dKaCVHLQT+8zlgiBm6K2h+wEU9yOaFCu/SR3OyA=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.16.0.tgz"; + sha512 = "zuWYsOLEhbJRWVxpjdiXl6eyAyGo/KzVW+KFhhw9MqEEJttcq+32jTWSGyxTdf9e/YCohxRE+9xpWFj9FdiJNw=="; }; }; "simple-markdown-0.4.4" = { @@ -68270,13 +67667,13 @@ let sha512 = "HWN6oNyfvMWrwCW6CiVW5k1LUyl8neiim4Tx7v5FjvGEZM3rZpoKy3xEywrdEGvVlSzHQsaINp18eP7A7YYRiA=="; }; }; - "simple-update-notifier-1.0.7" = { + "simple-update-notifier-1.1.0" = { name = "simple-update-notifier"; packageName = "simple-update-notifier"; - version = "1.0.7"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz"; - sha512 = "BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew=="; + url = "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz"; + sha512 = "VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg=="; }; }; "simple-websocket-4.3.1" = { @@ -68405,6 +67802,15 @@ let sha512 = "3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="; }; }; + "slash-5.0.0" = { + name = "slash"; + packageName = "slash"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-5.0.0.tgz"; + sha512 = "n6KkmvKS0623igEVj3FF0OZs1gYYJ0o0Hj939yc1fyxl2xt+xYpLnzJB6xBSqOfV9ZFLEWodBBN/heZJahuIJQ=="; + }; + }; "slasp-0.0.4" = { name = "slasp"; packageName = "slasp"; @@ -68693,13 +68099,13 @@ let sha512 = "s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg=="; }; }; - "socket.io-4.5.3" = { + "socket.io-4.5.4" = { name = "socket.io"; packageName = "socket.io"; - version = "4.5.3"; + version = "4.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-4.5.3.tgz"; - sha512 = "zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.5.4.tgz"; + sha512 = "m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ=="; }; }; "socket.io-adapter-0.2.0" = { @@ -68774,13 +68180,13 @@ let sha512 = "2B9LqSunN60yV8F7S84CCEEcgbYNfrn7ejIInZtLZ7ppWtiX8rGZAjvdCvbnC8bqo/9RlCNOUsORLyskxSFP1g=="; }; }; - "socket.io-client-4.5.3" = { + "socket.io-client-4.5.4" = { name = "socket.io-client"; packageName = "socket.io-client"; - version = "4.5.3"; + version = "4.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.3.tgz"; - sha512 = "I/hqDYpQ6JKwtJOf5ikM+Qz+YujZPMEl6qBLhxiP0nX+TfXKhW4KZZG8lamrD6Y5ngjmYHreESVasVCgi5Kl3A=="; + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.4.tgz"; + sha512 = "ZpKteoA06RzkD32IbqILZ+Cnst4xewU7ZYK12aS1mzHftFFjpoMz69IuhP/nL25pJfao/amoPI527KnuhFm01g=="; }; }; "socket.io-parser-2.1.2" = { @@ -68801,22 +68207,22 @@ let sha512 = "uW3UiLVibAyleKq8r/yZe1oPO51olhY18T6HtnN0iI6RLqJfYC0YiyAFlsPw1+8I0Z1qFd8jFLTRZo2vr6ISxA=="; }; }; - "socket.io-parser-3.3.2" = { + "socket.io-parser-3.3.3" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz"; - sha512 = "FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg=="; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.3.tgz"; + sha512 = "qOg87q1PMWWTeO01768Yh9ogn7chB9zkKtQnya41Y355S0UmpXgpcrFwAgjYJxu9BdKug5r5e9YtVSeWhKBUZg=="; }; }; - "socket.io-parser-3.4.1" = { + "socket.io-parser-3.4.2" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.1.tgz"; - sha512 = "11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A=="; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.2.tgz"; + sha512 = "QFZBaZDNqZXeemwejc7D39jrq2eGK/qZuVDiMPKzZK1hLlNvjGilGt4ckfQZeVX4dGmuPzCytN9ZW1nQlEWjgA=="; }; }; "socket.io-parser-4.0.5" = { @@ -68837,31 +68243,13 @@ let sha512 = "j3kk71QLJuyQ/hh5F/L2t1goqzdTL0gvDzuhTuNSwihfuFUrcSji0qFZmJJPtG6Rmug153eOPsUizeirf1IIog=="; }; }; - "socket.io-parser-4.2.1" = { + "socket.io-parser-4.2.2" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz"; - sha512 = "V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g=="; - }; - }; - "sockette-2.0.6" = { - name = "sockette"; - packageName = "sockette"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/sockette/-/sockette-2.0.6.tgz"; - sha512 = "W6iG8RGV6Zife3Cj+FhuyHV447E6fqFM2hKmnaQrTvg3OydINV3Msj3WPFbX76blUlUxvQSMMMdrJxce8NqI5Q=="; - }; - }; - "sockjs-0.3.20" = { - name = "sockjs"; - packageName = "sockjs"; - version = "0.3.20"; - src = fetchurl { - url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz"; - sha512 = "SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA=="; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz"; + sha512 = "DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw=="; }; }; "sockjs-0.3.24" = { @@ -68873,15 +68261,6 @@ let sha512 = "GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ=="; }; }; - "sockjs-client-1.4.0" = { - name = "sockjs-client"; - packageName = "sockjs-client"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz"; - sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; - }; - }; "sockjs-client-1.6.1" = { name = "sockjs-client"; packageName = "sockjs-client"; @@ -69035,13 +68414,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-3.2.0" = { + "sonic-boom-3.2.1" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-3.2.0.tgz"; - sha512 = "SbbZ+Kqj/XIunvIAgUZRlqd6CGQYq71tRRbXR92Za8J/R3Yh4Av+TWENiSiEgnlwckYLyP0YZQWVfyNC0dzLaA=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-3.2.1.tgz"; + sha512 = "iITeTHxy3B9FGu8aVdiDXUVAcHMF9Ss0cCsAOo2HfCrmVGT3/DT5oYaeu0M/YKZDlKTvChEyPq0zI9Hf33EX6A=="; }; }; "sorcery-0.10.0" = { @@ -69053,6 +68432,15 @@ let sha512 = "R5ocFmKZQFfSTstfOtHjJuAwbpGyf9qjQa1egyhvXSbM7emjrtLXtGdZsDJDABC85YBfVvrOiGWKSYXPKdvP1g=="; }; }; + "sorcery-0.11.0" = { + name = "sorcery"; + packageName = "sorcery"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sorcery/-/sorcery-0.11.0.tgz"; + sha512 = "J69LQ22xrQB1cIFJhPfgtLuI6BpWRiWu1Y3vSsIwK/eAScqJxd/+CJlUuHQRdX2C9NGFamq+KqNywGgaThwfHw=="; + }; + }; "sort-json-2.0.1" = { name = "sort-json"; packageName = "sort-json"; @@ -69098,13 +68486,13 @@ let sha512 = "GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw=="; }; }; - "sort-on-3.0.0" = { + "sort-on-4.1.1" = { name = "sort-on"; packageName = "sort-on"; - version = "3.0.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/sort-on/-/sort-on-3.0.0.tgz"; - sha512 = "e2RHeY1iM6dT9od3RoqeJSyz3O7naNFsGy34+EFEcwghjAncuOXC2/Xwq87S4FbypqLVp6PcizYEsGEGsGIDXA=="; + url = "https://registry.npmjs.org/sort-on/-/sort-on-4.1.1.tgz"; + sha512 = "nj8myvTCEErLMMWnye61z1pV5osa7njoosoQNdylD8WyPYHoHCBQx/xn7mGJL6h4oThvGpYSIAxfm8VUr75qTQ=="; }; }; "sorted-array-functions-1.3.0" = { @@ -69206,6 +68594,15 @@ let sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="; }; }; + "source-map-loader-3.0.2" = { + name = "source-map-loader"; + packageName = "source-map-loader"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz"; + sha512 = "BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg=="; + }; + }; "source-map-resolve-0.5.3" = { name = "source-map-resolve"; packageName = "source-map-resolve"; @@ -69278,13 +68675,13 @@ let sha512 = "q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA=="; }; }; - "space-separated-tokens-2.0.1" = { + "space-separated-tokens-2.0.2" = { name = "space-separated-tokens"; packageName = "space-separated-tokens"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.1.tgz"; - sha512 = "ekwEbFp5aqSPKaqeY1PGrlGQxPNaq+Cnx4+bE2D8sciBQrHpbwoBbawqTN2+6jPs9IdWxxiUcN0K2pkczD3zmw=="; + url = "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz"; + sha512 = "PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q=="; }; }; "spark-md5-1.0.1" = { @@ -69746,13 +69143,13 @@ let sha512 = "4akFOr7u9lJEeAWLJxmwiV43DJcGV7w3ab7SjQFAFaTVyknY3rZjvXTKIVtWqUoY4xwhjwoHKYs2HDW2SoHVsA=="; }; }; - "sqlite3-5.1.2" = { + "sqlite3-5.1.4" = { name = "sqlite3"; packageName = "sqlite3"; - version = "5.1.2"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.2.tgz"; - sha512 = "D0Reg6pRWAFXFUnZKsszCI67tthFD8fGPewRddDCX6w4cYwz3MbvuwRICbL+YQjBAh9zbw+lJ/V9oC8nG5j6eg=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.4.tgz"; + sha512 = "i0UlWAzPlzX3B5XP2cYuhWQJsTtlMD6obOa1PgeEQ4DHEXUuyJkgv50I3isqZAP5oFc2T8OFvakmDh2W6I+YpA=="; }; }; "sqlite3-git+https://github.com/mapbox/node-sqlite3.git#918052b538b0effe6c4a44c74a16b2749c08a0d2" = { @@ -69792,13 +69189,13 @@ let sha512 = "MM8wDGg5BQJEj94tDrZDrX9wrC439/Eoeg3sgmVLPMjHgrAFeXAKk3tmFlCbKw5k+yOEhPXRpPlRcisQmqWVSQ=="; }; }; - "srcset-5.0.0" = { + "srcset-4.0.0" = { name = "srcset"; packageName = "srcset"; - version = "5.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/srcset/-/srcset-5.0.0.tgz"; - sha512 = "SqEZaAEhe0A6ETEa9O1IhSPC7MdvehZtCnTR0AftXk3QhY2UNgb+NApFOUPZILXk/YTDfFxMTNJOBpzrJsEdIA=="; + url = "https://registry.npmjs.org/srcset/-/srcset-4.0.0.tgz"; + sha512 = "wvLeHgcVHKO8Sc/H/5lkGreJQVeYMm9rlmt8PuR1xE31rIuXhuzznUUqAt8MqLhB3MqJdFzlNAfpcWnxiFUcPw=="; }; }; "srt2vtt-1.3.1" = { @@ -70296,13 +69693,13 @@ let sha512 = "YzAzemVrXEf1OeZUpveXLeYUT5VVw/I5gxLeyzq1aMS3pRvFvCeaGliNFjKR3VKtGXRqF9WamqKwYadIG6vStQ=="; }; }; - "ssri-10.0.0" = { + "ssri-10.0.1" = { name = "ssri"; packageName = "ssri"; - version = "10.0.0"; + version = "10.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-10.0.0.tgz"; - sha512 = "64ghGOpqW0k+jh7m5jndBGdVEoPikWwGQmBNN5ks6jyUSMymzHDTlnNHOvzp+6MmHOljr2MokUzvRksnTwG0Iw=="; + url = "https://registry.npmjs.org/ssri/-/ssri-10.0.1.tgz"; + sha512 = "WVy6di9DlPOeBWEjMScpNipeSX2jIZBGEn5Uuo8Q7aIuFEuDX0pw8RxcOjlD1TWP4obi24ki7m/13+nFpcbXrw=="; }; }; "ssri-5.3.0" = { @@ -70377,22 +69774,13 @@ let sha512 = "KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg=="; }; }; - "stack-utils-2.0.5" = { + "stack-utils-2.0.6" = { name = "stack-utils"; packageName = "stack-utils"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz"; - sha512 = "xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA=="; - }; - }; - "stackblur-canvas-2.5.0" = { - name = "stackblur-canvas"; - packageName = "stackblur-canvas"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.5.0.tgz"; - sha512 = "EeNzTVfj+1In7aSLPKDD03F/ly4RxEuF/EX0YcOG0cKoPXs+SLZxDawQbexQDBzwROs4VKLWTOaZQlZkGBFEIQ=="; + url = "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz"; + sha512 = "XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ=="; }; }; "stackframe-1.3.4" = { @@ -70638,6 +70026,15 @@ let sha512 = "GCp7vHAfpao+Qh/3Flh9DXEJ/qSi0KJwJw6zYlZOtRYXWUIpMM6mC2rIep/dK8RQqwW0KxGJIllmjPIBOGN8AA=="; }; }; + "stop-iteration-iterator-1.0.0" = { + name = "stop-iteration-iterator"; + packageName = "stop-iteration-iterator"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz"; + sha512 = "iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ=="; + }; + }; "stoppable-1.1.0" = { name = "stoppable"; packageName = "stoppable"; @@ -70764,22 +70161,13 @@ let sha512 = "Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A=="; }; }; - "stream-json-1.1.3" = { + "stream-json-1.7.5" = { name = "stream-json"; packageName = "stream-json"; - version = "1.1.3"; + version = "1.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/stream-json/-/stream-json-1.1.3.tgz"; - sha512 = "y+ChhCov2A5nDqC2aZ6HKXs3OvDlvAp0Ps3BF1P/Iv8tUZJQQsMVaSzk0WryVTVoGITKv01UYahCXMpAs7I0lQ=="; - }; - }; - "stream-json-1.7.4" = { - name = "stream-json"; - packageName = "stream-json"; - version = "1.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-json/-/stream-json-1.7.4.tgz"; - sha512 = "ja2dde1v7dOlx5/vmavn8kLrxvNfs7r2oNc5DYmNJzayDDdudyCSuTB1gFjH4XBVTIwxiMxL4i059HX+ZiouXg=="; + url = "https://registry.npmjs.org/stream-json/-/stream-json-1.7.5.tgz"; + sha512 = "NSkoVduGakxZ8a+pTPUlcGEeAGQpWL9rKJhOFCV+J/QtdQUEU5vtBgVg6eJXn8JB8RZvpbJWZGvXkhz70MLWoA=="; }; }; "stream-meter-1.0.4" = { @@ -70863,15 +70251,6 @@ let sha512 = "PS6wT2ZyyR38Cy+lE6PBEI1ZmO2HdzZoLeDGG0zZbYikCZd0dh8FUoSeFzgWLItpBYw1WJmPVRLpykRV+lAWLQ=="; }; }; - "stream-to-iterator-3.0.3" = { - name = "stream-to-iterator"; - packageName = "stream-to-iterator"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-to-iterator/-/stream-to-iterator-3.0.3.tgz"; - sha512 = "KT1EWa9Wug83efjIRA8fGaCEFblgU9yNSwoE/uXfuEb0g2LL0vbayn8p6gQ2iuxVUnrIepH0soWBjN8oUShvfg=="; - }; - }; "stream-to-promise-3.0.0" = { name = "stream-to-promise"; packageName = "stream-to-promise"; @@ -70935,13 +70314,13 @@ let sha512 = "OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ=="; }; }; - "streamroller-3.1.3" = { + "streamroller-3.1.4" = { name = "streamroller"; packageName = "streamroller"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/streamroller/-/streamroller-3.1.3.tgz"; - sha512 = "CphIJyFx2SALGHeINanjFRKQ4l7x2c+rXYJ4BMq0gd+ZK0gi4VT8b+eHe2wi58x4UayBAKx4xtHpXT/ea1cz8w=="; + url = "https://registry.npmjs.org/streamroller/-/streamroller-3.1.4.tgz"; + sha512 = "Ha1Ccw2/N5C/IF8Do6zgNe8F3jQo8MPBnMBGvX0QjNv/I97BcNRzK6/mzOpZHHK7DjMLTI3c7Xw7Y1KvdChkvw=="; }; }; "streamsearch-0.1.2" = { @@ -70962,13 +70341,13 @@ let sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; }; }; - "streamx-2.12.5" = { + "streamx-2.13.2" = { name = "streamx"; packageName = "streamx"; - version = "2.12.5"; + version = "2.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/streamx/-/streamx-2.12.5.tgz"; - sha512 = "Y+nkFw57Z5JHT3zLlqFm3GccOy2FeYdUrrqita6Dd8kr/8enPn9GKa8IYf3/DmEKfZl/E2sWoSKUnd4qhonrgg=="; + url = "https://registry.npmjs.org/streamx/-/streamx-2.13.2.tgz"; + sha512 = "+TWqixPhGDXEG9L/XczSbhfkmwAtGs3BJX5QNU6cvno+pOLKeszByWcnaTu6dg8efsTYqR8ZZuXWHhZfgrxMvA=="; }; }; "strftime-0.10.1" = { @@ -71061,15 +70440,6 @@ let sha512 = "MNCACnufWUf3pQ57O5WTBMkKhzYIaKEcUioO0XHrTMafrbBaNk4IyDOLHBv5xbXO0jLLdsYWeFjpjG2hVHRDtw=="; }; }; - "string-length-2.0.0" = { - name = "string-length"; - packageName = "string-length"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz"; - sha512 = "Qka42GGrS8Mm3SZ+7cH8UXiIWI867/b/Z/feQSpQx/rbfB8UGknGEZVaUQMOUVj+soY6NpWAxily63HI1OckVQ=="; - }; - }; "string-length-3.1.0" = { name = "string-length"; packageName = "string-length"; @@ -71079,6 +70449,15 @@ let sha512 = "Ttp5YvkGm5v9Ijagtaz1BnN+k9ObpvS0eIBblPMp2YWL8FBmi9qblQ9fexc2k/CXFgrTIteU3jAw3payCnwSTA=="; }; }; + "string-length-4.0.2" = { + name = "string-length"; + packageName = "string-length"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz"; + sha512 = "+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ=="; + }; + }; "string-natural-compare-2.0.3" = { name = "string-natural-compare"; packageName = "string-natural-compare"; @@ -71124,6 +70503,15 @@ let sha512 = "QySF2+3Rwq0SdO3s7BAp4x+c3qsClpPQ6abAmb0DGViiSBAkT5kL6JT2iyzEVP+T1SmzHrQD1TwlP9QAHCc+Sw=="; }; }; + "string-to-stream-3.0.1" = { + name = "string-to-stream"; + packageName = "string-to-stream"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-to-stream/-/string-to-stream-3.0.1.tgz"; + sha512 = "Hl092MV3USJuUCC6mfl9sPzGloA3K5VwdIeJjYIkXY/8K+mUvaeEabWJgArp+xXrsWxCajeT2pc4axbVhIZJyg=="; + }; + }; "string-width-1.0.2" = { name = "string-width"; packageName = "string-width"; @@ -71169,13 +70557,13 @@ let sha512 = "HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="; }; }; - "string.prototype.matchall-4.0.7" = { + "string.prototype.matchall-4.0.8" = { name = "string.prototype.matchall"; packageName = "string.prototype.matchall"; - version = "4.0.7"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz"; - sha512 = "f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg=="; + url = "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz"; + sha512 = "6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg=="; }; }; "string.prototype.repeat-0.2.0" = { @@ -71187,31 +70575,31 @@ let sha512 = "1BH+X+1hSthZFW+X+JaUkjkkUPwIlLEMJBLANN3hOob3RhEk5snLWNECDnYbgn/m5c5JV7Ersu1Yubaf+05cIA=="; }; }; - "string.prototype.trim-1.2.6" = { + "string.prototype.trim-1.2.7" = { name = "string.prototype.trim"; packageName = "string.prototype.trim"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.6.tgz"; - sha512 = "8lMR2m+U0VJTPp6JjvJTtGyc4FIGq9CdRt7O9p6T0e6K4vjU+OP+SQJpbe/SBmRcCUIvNUnjsbmY6lnMp8MhsQ=="; + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz"; + sha512 = "p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg=="; }; }; - "string.prototype.trimend-1.0.5" = { + "string.prototype.trimend-1.0.6" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"; - sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz"; + sha512 = "JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ=="; }; }; - "string.prototype.trimstart-1.0.5" = { + "string.prototype.trimstart-1.0.6" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"; - sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz"; + sha512 = "omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA=="; }; }; "string2compact-1.3.2" = { @@ -71232,15 +70620,6 @@ let sha512 = "ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="; }; }; - "string_decoder-1.0.3" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; - sha512 = "4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ=="; - }; - }; "string_decoder-1.1.1" = { name = "string_decoder"; packageName = "string_decoder"; @@ -71376,15 +70755,6 @@ let sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; }; - "strip-ansi-6.0.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; - sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; - }; - }; "strip-ansi-6.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -71691,6 +71061,15 @@ let sha512 = "Ap7JHfKgmH40SUjumqyKTHYHNZ8GvGQskP34ks0ElHCDEig+bYGpmXVksxPSrgcY9rkJqhVMzfeg5GIpZelfpQ=="; }; }; + "structured-source-4.0.0" = { + name = "structured-source"; + packageName = "structured-source"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/structured-source/-/structured-source-4.0.0.tgz"; + sha512 = "qGzRFNJDjFieQkl/sVOI2dUjHKRyL9dAJi2gCPGJLbJHBIkyOHxjuocpIEfbLioX+qSJpvbYdT49/YCdMznKxA=="; + }; + }; "style-loader-0.23.1" = { name = "style-loader"; packageName = "style-loader"; @@ -71700,15 +71079,6 @@ let sha512 = "XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg=="; }; }; - "style-loader-1.2.1" = { - name = "style-loader"; - packageName = "style-loader"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz"; - sha512 = "ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg=="; - }; - }; "style-loader-3.3.1" = { name = "style-loader"; packageName = "style-loader"; @@ -71835,13 +71205,13 @@ let sha512 = "lQ9w/XIOH5ZHVNuNbWW8D822r+/wBSO/d6XvtyHLF7LW4KaCIDeVbvn5DF8fGCJAUCwVhVi/h6J0NUcnylUEjg=="; }; }; - "stylus-supremacy-2.17.3" = { + "stylus-supremacy-2.17.5" = { name = "stylus-supremacy"; packageName = "stylus-supremacy"; - version = "2.17.3"; + version = "2.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/stylus-supremacy/-/stylus-supremacy-2.17.3.tgz"; - sha512 = "d/O2TtSjF8TeJSyARMSKFNyTX/ZUFOHco7wNH4axB0DhKmm2jekwPxs0CQ43kzZ1WidLgueQWBWmTZXDyEH8vQ=="; + url = "https://registry.npmjs.org/stylus-supremacy/-/stylus-supremacy-2.17.5.tgz"; + sha512 = "nanFS1zuIWe3pXJisST5myI+B90wQbAg4dvvgrjZ9pLmzZvMwRzIufMmu52T4nv6Df9430leUL/UljfbNsGQtw=="; }; }; "subarg-1.0.0" = { @@ -71889,13 +71259,13 @@ let sha512 = "dxdemxFFB0ppCLg10FTtRqH/31FNRL1y1BQv8209MK5I4CwALb7iihQg+7p65lFcIl8MHatINWBLOqpgU4Kyyw=="; }; }; - "sucrase-3.28.0" = { + "sucrase-3.29.0" = { name = "sucrase"; packageName = "sucrase"; - version = "3.28.0"; + version = "3.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/sucrase/-/sucrase-3.28.0.tgz"; - sha512 = "TK9600YInjuiIhVM3729rH4ZKPOsGeyXUwY+Ugu9eilNbdTFyHr6XcAGYbRVZPDgWj6tgI7bx95aaJjHnbffag=="; + url = "https://registry.npmjs.org/sucrase/-/sucrase-3.29.0.tgz"; + sha512 = "bZPAuGA5SdFHuzqIhTAqt9fvNEo9rESqXIG3oiKdF8K4UmkQxC4KlNL3lVyAErXp+mPvUqZ5l13qx6TrDIGf3A=="; }; }; "sudo-block-1.2.0" = { @@ -71952,6 +71322,15 @@ let sha512 = "WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ=="; }; }; + "sugarss-4.0.1" = { + name = "sugarss"; + packageName = "sugarss"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sugarss/-/sugarss-4.0.1.tgz"; + sha512 = "WCjS5NfuVJjkQzK10s8WOBY+hhDxxNt/N6ZaGwxFZ+wN3/lKKFSaaKUNecULcTTvE4urLcKaZFQD8vO0mOZujw=="; + }; + }; "sumchecker-3.0.1" = { name = "sumchecker"; packageName = "sumchecker"; @@ -72006,22 +71385,13 @@ let sha512 = "DnarpKN6Xn8e3pYlFV4Yvsj9yxLY4q5FIsUe5JvN7vjzP+YCfzXv03dTkZSD2yzrSadsNYHf0IgOUJwKjX457A=="; }; }; - "supercluster-7.1.5" = { - name = "supercluster"; - packageName = "supercluster"; - version = "7.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/supercluster/-/supercluster-7.1.5.tgz"; - sha512 = "EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg=="; - }; - }; - "superstatic-8.0.0" = { + "superstatic-9.0.2" = { name = "superstatic"; packageName = "superstatic"; - version = "8.0.0"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/superstatic/-/superstatic-8.0.0.tgz"; - sha512 = "PqlA2xuEwOlRZsknl58A/rZEmgCUcfWIFec0bn10wYE5/tbMhEbMXGHCYDppiXLXcuhGHyOp1IimM2hLqkLLuw=="; + url = "https://registry.npmjs.org/superstatic/-/superstatic-9.0.2.tgz"; + sha512 = "eKX9qubOaJbtdxn4gWhVVMXuno8cn0WPKOYgLAmLwYiHafrASXAIXHzL3Jx7w06yXiaM5e1DA2Ezeb08iV28+A=="; }; }; "supports-color-0.2.0" = { @@ -72105,13 +71475,13 @@ let sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; }; }; - "supports-color-9.2.3" = { + "supports-color-9.3.1" = { name = "supports-color"; packageName = "supports-color"; - version = "9.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-9.2.3.tgz"; - sha512 = "aszYUX/DVK/ed5rFLb/dDinVJrQjG/vmU433wtqVSD800rYsJNWxh2R3USV90aLSU+UsyQkbNeffVLzc6B6foA=="; + url = "https://registry.npmjs.org/supports-color/-/supports-color-9.3.1.tgz"; + sha512 = "knBY82pjmnIzK3NifMo3RxEIRD9E0kIzV4BKcyTZ9+9kWgLMxd4PrsTSMoFQUabgRBbF8KOLRDCyKgNV+iK44Q=="; }; }; "supports-hyperlinks-1.0.1" = { @@ -72159,31 +71529,31 @@ let sha512 = "ay4MPFjfiQzDsyTidljJLXQi22l2AwjcuamYnJWj/LdhaHdKmDJxRox52WXimdcLpMuLDtkQvv4+jEu+wu9eSw=="; }; }; - "svelte-3.52.0" = { + "svelte-3.55.1" = { name = "svelte"; packageName = "svelte"; - version = "3.52.0"; + version = "3.55.1"; src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-3.52.0.tgz"; - sha512 = "FxcnEUOAVfr10vDU5dVgJN19IvqeHQCS1zfe8vayTfis9A2t5Fhx+JDe5uv/C3j//bB1umpLJ6quhgs9xyUbCQ=="; + url = "https://registry.npmjs.org/svelte/-/svelte-3.55.1.tgz"; + sha512 = "S+87/P0Ve67HxKkEV23iCdAh/SX1xiSfjF1HOglno/YTbSTW7RniICMCofWGdJJbdjw3S+0PfFb1JtGfTXE0oQ=="; }; }; - "svelte-preprocess-4.10.7" = { + "svelte-preprocess-5.0.1" = { name = "svelte-preprocess"; packageName = "svelte-preprocess"; - version = "4.10.7"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.10.7.tgz"; - sha512 = "sNPBnqYD6FnmdBrUmBCaqS00RyCsCpj2BG58A1JBswNF7b0OKviwxqVrOL/CKyJrLSClrSeqQv5BXNg2RUbPOw=="; + url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-5.0.1.tgz"; + sha512 = "0HXyhCoc9rsW4zGOgtInylC6qj259E1hpFnJMJWTf+aIfeqh4O/QHT31KT2hvPEqQfdjmqBR/kO2JDkkciBLrQ=="; }; }; - "svelte2tsx-0.5.20" = { + "svelte2tsx-0.6.0" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.5.20"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.5.20.tgz"; - sha512 = "yNHmN/uoAnJ7d1XqVohiNA6TMFOxibHyEddUAHVt1PiLXtbwAJF3WaGYlg8QbOdoXzOVsVNCAlqRUIdULUm+OA=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.6.0.tgz"; + sha512 = "TrxfQkO7CKi8Pu2eC/FyteDCdk3OOeQV5u6z7OjYAsOhsd0ClzAKqxJdvp6xxNQLrbFzf/XvCi9Fy8MQ1MleFA=="; }; }; "sver-compat-1.5.0" = { @@ -72195,15 +71565,6 @@ let sha512 = "aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg=="; }; }; - "svg-pathdata-5.0.5" = { - name = "svg-pathdata"; - packageName = "svg-pathdata"; - version = "5.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-5.0.5.tgz"; - sha512 = "TAAvLNSE3fEhyl/Da19JWfMAdhSXTYeviXsLSoDT1UM76ADj5ndwAPX1FKQEgB/gFMPavOy6tOqfalXKUiXrow=="; - }; - }; "svg-tags-1.0.0" = { name = "svg-tags"; packageName = "svg-tags"; @@ -72213,22 +71574,13 @@ let sha512 = "ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA=="; }; }; - "svg-url-loader-8.0.0" = { - name = "svg-url-loader"; - packageName = "svg-url-loader"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/svg-url-loader/-/svg-url-loader-8.0.0.tgz"; - sha512 = "5doSXvl18hY1fGsRLdhWAU5jgzgxJ06/gc/26cpuDnN0xOz1HmmfhkpL29SSrdIvhtxQ1UwGzmk7wTT/l48mKw=="; - }; - }; - "svg2img-0.9.4" = { + "svg2img-1.0.0-beta.2" = { name = "svg2img"; packageName = "svg2img"; - version = "0.9.4"; + version = "1.0.0-beta.2"; src = fetchurl { - url = "https://registry.npmjs.org/svg2img/-/svg2img-0.9.4.tgz"; - sha512 = "1XquM9CorP9Em58gS9NjTaKpoRrIBM4gSSGSOHnoU70Y4AB3D+vILbdcHfvyGcLJ80IdYTbcpznp8NVNKkCedQ=="; + url = "https://registry.npmjs.org/svg2img/-/svg2img-1.0.0-beta.2.tgz"; + sha512 = "Tq05Q0HTXDJZM+9ub9HCPPDbui2VavugF+/H9b1Ur9ykXbPsSUPFeXFZdDlutvDsVWZO8JjHKRdT3grpNSwwSg=="; }; }; "svgo-0.6.6" = { @@ -72348,13 +71700,13 @@ let sha512 = "8z18eX8G/jbTXYzyNIaobrnD7PSN7yU/YkSasMmajrXtw0FGS64XjrKn5v37d36qmU3o1xLeuYnktshRr7uIFw=="; }; }; - "swagger-ui-dist-4.15.2" = { + "swagger-ui-dist-4.15.5" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "4.15.2"; + version = "4.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.15.2.tgz"; - sha512 = "sanLAioshpa+Q0PpPxD86uo4labSqeIxtjLoC7xoce3HTnECPoQwY7PUVOiGMZ4dnEnROZPLUTloCEM86jZc1Q=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.15.5.tgz"; + sha512 = "V3eIa28lwB6gg7/wfNvAbjwJYmDXy1Jo1POjyTzlB6wPcHiGlRxq39TSjYGVjQrUSAzpv+a7nzp7mDxgNy57xA=="; }; }; "swagger2openapi-7.0.8" = { @@ -72474,13 +71826,13 @@ let sha512 = "dJp4qg+x4JwSEW1HibAuMi0IIrBI3wuQr2GimmqB7OXR50wmwzfdusG+p39R9w3R6aFtZ2mzvxvWKQ3Bd/vx3g=="; }; }; - "synckit-0.8.4" = { + "synckit-0.8.5" = { name = "synckit"; packageName = "synckit"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/synckit/-/synckit-0.8.4.tgz"; - sha512 = "Dn2ZkzMdSX827QbowGbU/4yjWuvNaCoScLLoMo/yKbu+P4GBR6cRGKZH27k6a9bRzdqcyd1DE96pQtQ6uNkmyw=="; + url = "https://registry.npmjs.org/synckit/-/synckit-0.8.5.tgz"; + sha512 = "L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q=="; }; }; "syntax-error-1.4.0" = { @@ -72492,13 +71844,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-5.12.13" = { + "systeminformation-5.17.4" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.12.13"; + version = "5.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.12.13.tgz"; - sha512 = "2z1Ul+PDkO50yGmEGKWOPk3+TeAtTkbn6PmxqzH9D3BAN53QXgbYy6+PPJmBrszXy+X7g8uwZd1WdThKZtICcg=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.17.4.tgz"; + sha512 = "mEiIYrw7X5ABX8tJUgzbumQAuFQxNyHdZDz6+UtwNKUbKgIoZqLtug2z1spFB/LiXZne5tdPBJOlvVckbvfhiQ=="; }; }; "sywac-1.3.0" = { @@ -72546,15 +71898,6 @@ let sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; }; }; - "table-6.8.0" = { - name = "table"; - packageName = "table"; - version = "6.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.8.0.tgz"; - sha512 = "s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA=="; - }; - }; "table-6.8.1" = { name = "table"; packageName = "table"; @@ -72573,6 +71916,15 @@ let sha512 = "zTvf0mcggrGeTe/2jJ6ECkJHAQPIYEwDoqsiqBjI24mvRmQbInK5jq33fyypaCBxX08hMkfmdOqj6haT33EqWw=="; }; }; + "table-layout-1.0.2" = { + name = "table-layout"; + packageName = "table-layout"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/table-layout/-/table-layout-1.0.2.tgz"; + sha512 = "qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A=="; + }; + }; "tabtab-1.3.2" = { name = "tabtab"; packageName = "tabtab"; @@ -72619,22 +71971,22 @@ let sha512 = "y3JaeRSplks6NYQuCOj3ZFMO3j60rTwbuKCvZxsAraGYH2epusatvZ0baZYA01WsGqJBq/Dl6vOrMUJqyMj8kA=="; }; }; - "tail-2.2.4" = { + "tail-2.2.6" = { name = "tail"; packageName = "tail"; - version = "2.2.4"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/tail/-/tail-2.2.4.tgz"; - sha512 = "PX8klSxW1u3SdgDrDeewh5GNE+hkJ4h02JvHfV6YrHqWOVJ88nUdSQqtsUf/gWhgZlPAws3fiZ+F1f8euspcuQ=="; + url = "https://registry.npmjs.org/tail/-/tail-2.2.6.tgz"; + sha512 = "IQ6G4wK/t8VBauYiGPLx+d3fA5XjSVagjWV5SIYzvEvglbQjwEcukeYI68JOPpdydjxhZ9sIgzRlSmwSpphHyw=="; }; }; - "tailwindcss-3.2.2" = { + "tailwindcss-3.2.4" = { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.2.tgz"; - sha512 = "c2GtSdqg+harR4QeoTmex0Ngfg8IIHNeLQH5yr2B9uZbZR1Xt1rYbjWOWTcj3YLTZhrmZnPowoQDbSRFyZHQ5Q=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz"; + sha512 = "AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ=="; }; }; "taketalk-1.0.0" = { @@ -72673,13 +72025,13 @@ let sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="; }; }; - "tape-4.16.1" = { + "tape-4.16.2" = { name = "tape"; packageName = "tape"; - version = "4.16.1"; + version = "4.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/tape/-/tape-4.16.1.tgz"; - sha512 = "U4DWOikL5gBYUrlzx+J0oaRedm2vKLFbtA/+BRAXboGWpXO7bMP8ddxlq3Cse2bvXFQ0jZMOj6kk3546mvCdFg=="; + url = "https://registry.npmjs.org/tape/-/tape-4.16.2.tgz"; + sha512 = "TUChV+q0GxBBCEbfCYkGLkv8hDJYjMdSWdE0/Lr331sB389dsvFUHNV9ph5iQqKzt8Ss9drzcda/YeexclBFqg=="; }; }; "tar-2.2.2" = { @@ -72718,13 +72070,13 @@ let sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; }; }; - "tar-6.1.12" = { + "tar-6.1.13" = { name = "tar"; packageName = "tar"; - version = "6.1.12"; + version = "6.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.12.tgz"; - sha512 = "jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw=="; + url = "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz"; + sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; }; }; "tar-fs-1.16.3" = { @@ -72736,15 +72088,6 @@ let sha512 = "NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw=="; }; }; - "tar-fs-2.0.0" = { - name = "tar-fs"; - packageName = "tar-fs"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz"; - sha512 = "vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA=="; - }; - }; "tar-fs-2.1.1" = { name = "tar-fs"; packageName = "tar-fs"; @@ -72844,13 +72187,13 @@ let sha512 = "+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA=="; }; }; - "tedious-15.1.1" = { + "tedious-15.1.2" = { name = "tedious"; packageName = "tedious"; - version = "15.1.1"; + version = "15.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/tedious/-/tedious-15.1.1.tgz"; - sha512 = "GPnitBfhB7WMVMGuu/FipfOKDL0+r1VKyoTKQeHO/BFDFERkhaqFrcK5705da1Ze2gAvIpd/ep2y4xrvfoXXbw=="; + url = "https://registry.npmjs.org/tedious/-/tedious-15.1.2.tgz"; + sha512 = "94slmnggCX8zG6iLNnM3k6PplTguP0p7R2RWOKTXdPmK1VmTpWk4+e0J4koIMXm1jjG7sGlZ1/JlaGVAdF1OOg=="; }; }; "telegraf-3.40.0" = { @@ -72952,15 +72295,6 @@ let sha512 = "biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w=="; }; }; - "tempy-3.0.0" = { - name = "tempy"; - packageName = "tempy"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tempy/-/tempy-3.0.0.tgz"; - sha512 = "B2I9X7+o2wOaW4r/CWMkpOO9mdiTRCxXNgob6iGvPmfPWgH/KyUD6Uy5crtWBxIBe3YrNZKR2lSzv1JJKWD4vA=="; - }; - }; "term-canvas-0.0.5" = { name = "term-canvas"; packageName = "term-canvas"; @@ -73051,13 +72385,13 @@ let sha512 = "4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw=="; }; }; - "terser-5.15.1" = { + "terser-5.16.1" = { name = "terser"; packageName = "terser"; - version = "5.15.1"; + version = "5.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz"; - sha512 = "K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw=="; + url = "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz"; + sha512 = "xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -73069,15 +72403,6 @@ let sha512 = "04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw=="; }; }; - "terser-webpack-plugin-3.1.0" = { - name = "terser-webpack-plugin"; - packageName = "terser-webpack-plugin"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.1.0.tgz"; - sha512 = "cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA=="; - }; - }; "terser-webpack-plugin-5.3.6" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; @@ -73096,15 +72421,6 @@ let sha512 = "cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w=="; }; }; - "test-value-2.1.0" = { - name = "test-value"; - packageName = "test-value"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz"; - sha512 = "+1epbAxtKeXttkGFMTX9H42oqzOTufR1ceCF+GYA5aOmvaPq9wd4PUS8329fn2RRLGNeUkgRLnVpycjx8DsO2w=="; - }; - }; "text-decoding-1.0.0" = { name = "text-decoding"; packageName = "text-decoding"; @@ -73168,13 +72484,13 @@ let sha512 = "MeqZRHLuaGamUXGuVn2ivtU3LA3mLCCIO5kUGoohTCoGmCBg/+8yPhWVX9WSl9telvVd8erftjFk9Fwb2dD6rw=="; }; }; - "textlint-12.2.2" = { + "textlint-13.0.4" = { name = "textlint"; packageName = "textlint"; - version = "12.2.2"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-12.2.2.tgz"; - sha512 = "+xORGVnAceaP3+77vGuALOtnNNtexh8VK9ssAK2r3vAr0iMApSMyvGaXousbsfLiwK5L/X0X/78yJDvXwGQPjA=="; + url = "https://registry.npmjs.org/textlint/-/textlint-13.0.4.tgz"; + sha512 = "XBPK+cRMYLY3NodKoCFMncmVJRk59S+aSgkwpdNnV8VXFo1hF0EEysbwEp9s8ov0LhVO8flfd51/L+VlUFeTlg=="; }; }; "textlint-rule-helper-1.2.0" = { @@ -73186,22 +72502,22 @@ let sha512 = "yJmVbmyuUPOndKsxOijpx/G7mwybXXf4M10U2up0BeIZSN+6drUl+aSKAoC+RUHY7bG4ogLwRcmWoNG1lSrRIQ=="; }; }; - "textlint-rule-helper-2.2.3" = { + "textlint-rule-helper-2.3.0" = { name = "textlint-rule-helper"; packageName = "textlint-rule-helper"; - version = "2.2.3"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-helper/-/textlint-rule-helper-2.2.3.tgz"; - sha512 = "H499NRHVurHTFXTL+w/FI+aX6YgZD1TAFuR6kHqYDQ2ArGwkCbnRu+so+deweTFEUI4etP7EVMsrLwXP1e2Q+w=="; + url = "https://registry.npmjs.org/textlint-rule-helper/-/textlint-rule-helper-2.3.0.tgz"; + sha512 = "Ug78Saahb/qVImttL0NSFyT5/JJ5wXvOPepR2pYAjNi54BsQAAz/hAyyEgKuYeR0+yjFb0KPhby4f880X5vqHA=="; }; }; - "textlint-tester-12.2.2" = { + "textlint-tester-12.6.1" = { name = "textlint-tester"; packageName = "textlint-tester"; - version = "12.2.2"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-tester/-/textlint-tester-12.2.2.tgz"; - sha512 = "Y6t4MuoaDXx0chSpKJCbkKQWIjxFZw93gx4LG0bMCBWbkEVuaBADhXuEEzrT9Izd3kY4Nl9ihaBOnFP8LTBBjA=="; + url = "https://registry.npmjs.org/textlint-tester/-/textlint-tester-12.6.1.tgz"; + sha512 = "4O8hrXNb0BUePg+yvueWdR+ViXC8R7RgUcmo+56iU28pgqcrAjSEpz2YGpbsSF54wlyxJuP4v98whgjlEJtCmw=="; }; }; "textlint-util-to-string-3.1.1" = { @@ -73312,13 +72628,13 @@ let sha512 = "wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg=="; }; }; - "thread-stream-2.2.0" = { + "thread-stream-2.3.0" = { name = "thread-stream"; packageName = "thread-stream"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/thread-stream/-/thread-stream-2.2.0.tgz"; - sha512 = "rUkv4/fnb4rqy/gGy7VuqK6wE1+1DOCOWy4RMeaV69ZHMP11tQKZvZSip1yTgrKCMZzEMcCL/bKfHvSfDHx+iQ=="; + url = "https://registry.npmjs.org/thread-stream/-/thread-stream-2.3.0.tgz"; + sha512 = "kaDqm1DET9pp3NXwR8382WHbnpXnRkN9xGN9dQt3B2+dmXiW8X1SOwmFOxAErEQ47ObhZ96J6yhZNXuyCOL7KA=="; }; }; "thriftrw-3.12.0" = { @@ -73339,6 +72655,15 @@ let sha512 = "fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA=="; }; }; + "throat-6.0.2" = { + name = "throat"; + packageName = "throat"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/throat/-/throat-6.0.2.tgz"; + sha512 = "WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ=="; + }; + }; "throttle-1.0.3" = { name = "throttle"; packageName = "throttle"; @@ -73573,6 +72898,15 @@ let sha512 = "b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ=="; }; }; + "timm-1.7.1" = { + name = "timm"; + packageName = "timm"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/timm/-/timm-1.7.1.tgz"; + sha512 = "IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw=="; + }; + }; "timsort-0.3.0" = { name = "timsort"; packageName = "timsort"; @@ -73654,31 +72988,22 @@ let sha512 = "+CorETse1kl98xg0WAzii8DTT4ABF4R3nquhrkIbVGcw1T8JYs5Gfx9xEfGINPUZGDj9C4BmOtuKeaTtuuRolg=="; }; }; - "tinycolor2-1.4.2" = { + "tinycolor2-1.5.2" = { name = "tinycolor2"; packageName = "tinycolor2"; - version = "1.4.2"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz"; - sha512 = "vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA=="; + url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.5.2.tgz"; + sha512 = "h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg=="; }; }; - "tinyqueue-2.0.3" = { - name = "tinyqueue"; - packageName = "tinyqueue"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz"; - sha512 = "ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA=="; - }; - }; - "titleize-1.0.1" = { + "titleize-2.1.0" = { name = "titleize"; packageName = "titleize"; - version = "1.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/titleize/-/titleize-1.0.1.tgz"; - sha512 = "rUwGDruKq1gX+FFHbTl5qjI7teVO7eOe+C8IcQ7QT+1BK3eEUXJqbZcBOeaRP4FwSC/C1A5jDoIVta0nIQ9yew=="; + url = "https://registry.npmjs.org/titleize/-/titleize-2.1.0.tgz"; + sha512 = "m+apkYlfiQTKLW+sI4vqUkwMEzfgEUEYSqljx1voUE3Wz/z1ZsxyzSxvH2X8uKVrOp7QkByWt0rA6+gvhCKy6g=="; }; }; "tkwidgets-0.5.27" = { @@ -73690,15 +73015,6 @@ let sha512 = "748OLoNS77xzyVNDst906EhIX/rRVb8IVM5Cb7hkO5nyrnngx70vHtmeWVUy+e3lz3I0CgRzYSUJIt7bDQ6PAQ=="; }; }; - "tldjs-2.3.1" = { - name = "tldjs"; - packageName = "tldjs"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tldjs/-/tldjs-2.3.1.tgz"; - sha512 = "W/YVH/QczLUxVjnQhFC61Iq232NWu3TqDdO0S/MtXVz4xybejBov4ud+CIwN9aYqjOecEqIy0PscGkwpG9ZyTw=="; - }; - }; "tlds-1.203.1" = { name = "tlds"; packageName = "tlds"; @@ -73726,6 +73042,24 @@ let sha512 = "Q0TU9zh5hDs2CpRFNM7SOW3K7OSgUgJC/cMrq9t44ei4tu+G3KV8BZyIJuYVvryJHH96mKgc9WXdhgKVvGD7jg=="; }; }; + "tldts-5.7.104" = { + name = "tldts"; + packageName = "tldts"; + version = "5.7.104"; + src = fetchurl { + url = "https://registry.npmjs.org/tldts/-/tldts-5.7.104.tgz"; + sha512 = "PlziEIVPH/ogbqOhS35K6MOeD09rd9U5g2NHO5n9NZeMC1PGpXgsjQpoJ1KiRnjhZsWDkzN8EoX3xQZuz5ZyFQ=="; + }; + }; + "tldts-core-5.7.104" = { + name = "tldts-core"; + packageName = "tldts-core"; + version = "5.7.104"; + src = fetchurl { + url = "https://registry.npmjs.org/tldts-core/-/tldts-core-5.7.104.tgz"; + sha512 = "8vhSgc2nzPNT0J7XyCqcOtQ6+ySBn+gsPmj5h95YytIZ7L2Xl40paUmj0T6Uko42HegHGQxXieunHIQuABWSmQ=="; + }; + }; "tmp-0.0.29" = { name = "tmp"; packageName = "tmp"; @@ -74077,13 +73411,13 @@ let sha512 = "bPTDIA7XEjRlw6vQyt7kM/h1mg1INBsibjbujISITonx4POENZgxfyCSEXZpDhbAkluSPH4HKRKs4/YTmNLC6w=="; }; }; - "torrent-discovery-9.4.14" = { + "torrent-discovery-9.4.15" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "9.4.14"; + version = "9.4.15"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.14.tgz"; - sha512 = "IyzlrHctvqqKtN8Y2BMxNL3d2FLazs6pC2yzKOHJlXWYUFkLpZhZSaSZcAkfmZXgdjwq59N2umr1przsRDMzkA=="; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.15.tgz"; + sha512 = "71nx+TpLaF27mbsSj/tZTr588Dfk7XVzx+Rf1+nrxfXqe8qn5dIlRhgA+yY4cg8Ib69vWwkKFhAzbRqg8z42aw=="; }; }; "torrent-piece-1.1.2" = { @@ -74446,6 +73780,15 @@ let sha512 = "m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew=="; }; }; + "true-case-path-2.2.1" = { + name = "true-case-path"; + packageName = "true-case-path"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/true-case-path/-/true-case-path-2.2.1.tgz"; + sha512 = "0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q=="; + }; + }; "truncate-2.1.0" = { name = "truncate"; packageName = "truncate"; @@ -74518,13 +73861,13 @@ let sha512 = "QMTC4UFzHmu9wU2VHZEmWWE9cUajjfcdcws+Gh7FhiO+Dy0RnR1bNz0YCHqhI0yRowCE9arVnNxYHqELOy9Hjw=="; }; }; - "ts-loader-9.4.1" = { + "ts-loader-9.4.2" = { name = "ts-loader"; packageName = "ts-loader"; - version = "9.4.1"; + version = "9.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.1.tgz"; - sha512 = "384TYAqGs70rn9F0VBnh6BPTfhga7yFNdC5gXbQpDrBj9/KsT4iRkGqKXhziofHOlE2j6YEaiTYVGKKvPhGWvw=="; + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.2.tgz"; + sha512 = "OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA=="; }; }; "ts-log-2.2.5" = { @@ -74563,15 +73906,6 @@ let sha512 = "NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw=="; }; }; - "ts-node-8.9.1" = { - name = "ts-node"; - packageName = "ts-node"; - version = "8.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.9.1.tgz"; - sha512 = "yrq6ODsxEFTLz0R3BX2myf0WBCSQh9A+py8PBo1dCzWIOcvisbyH6akNKqDHMgXePF2kir5mm5JXJTH3OUJYOQ=="; - }; - }; "ts-node-9.1.1" = { name = "ts-node"; packageName = "ts-node"; @@ -74608,13 +73942,13 @@ let sha512 = "5xZugaeM3wKQPj/vrWnrtYjNh4xnIz6cGSW/smCe9OTmkh1+KvHpm7M7HLq/OnBaljf4+yKctC4AYimBi4T1/Q=="; }; }; - "tsconfck-2.0.1" = { + "tsconfck-2.0.2" = { name = "tsconfck"; packageName = "tsconfck"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfck/-/tsconfck-2.0.1.tgz"; - sha512 = "/ipap2eecmVBmBlsQLBRbUmUNFwNJV/z2E+X0FPtHNjPwroMZQ7m39RMaCywlCulBheYXgMdUlWDd9rzxwMA0Q=="; + url = "https://registry.npmjs.org/tsconfck/-/tsconfck-2.0.2.tgz"; + sha512 = "H3DWlwKpow+GpVLm/2cpmok72pwRr1YFROV3YzAmvzfGFiC1zEM/mc9b7+1XnrxuXtEbhJ7xUSIqjPFbedp7aQ=="; }; }; "tsconfig-5.0.3" = { @@ -74635,13 +73969,22 @@ let sha512 = "fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ=="; }; }; - "tsconfig-paths-4.1.0" = { + "tsconfig-paths-4.1.1" = { name = "tsconfig-paths"; packageName = "tsconfig-paths"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.0.tgz"; - sha512 = "AHx4Euop/dXFC+Vx589alFba8QItjF+8hf8LtmuiCwHyI4rHXQtOOENaM8kvYf5fR0dRChy3wzWIZ9WbB7FWow=="; + url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.1.tgz"; + sha512 = "VgPrtLKpRgEAJsMj5Q/I/mXouC6A/7eJ/X4Nuk6o0cRPwBtznYxTCU4FodbexbzH9somBPEXYi0ZkUViUpJ21Q=="; + }; + }; + "tsconfig-paths-4.1.2" = { + name = "tsconfig-paths"; + packageName = "tsconfig-paths"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.2.tgz"; + sha512 = "uhxiMgnXQp1IR622dUXI+9Ehnws7i/y6xvpZB9IbUVOPy0muvdvgXeZOn88UcGPiT98Vp3rJPTa8bFoalZ3Qhw=="; }; }; "tsconfig-paths-webpack-plugin-4.0.0" = { @@ -74716,15 +74059,6 @@ let sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; }; }; - "tslib-2.4.0" = { - name = "tslib"; - packageName = "tslib"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"; - sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; - }; - }; "tslib-2.4.1" = { name = "tslib"; packageName = "tslib"; @@ -74734,6 +74068,15 @@ let sha512 = "tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="; }; }; + "tslib-2.5.0" = { + name = "tslib"; + packageName = "tslib"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz"; + sha512 = "336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="; + }; + }; "tslint-5.20.1" = { name = "tslint"; packageName = "tslint"; @@ -74869,6 +74212,15 @@ let sha512 = "BEkXaWH7Wh7e9bd2QumhfAXk5g34+6QUmmWx+0q6ThaVOLuLUqsnkq35HQ5SBHSaxjSfSM7US5o4lhJNH7B9MA=="; }; }; + "turndown-plugin-gfm-1.0.2" = { + name = "turndown-plugin-gfm"; + packageName = "turndown-plugin-gfm"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.2.tgz"; + sha512 = "vwz9tfvF7XN/jE0dGoBei3FXWuvll78ohzCZQuOb+ZjWrs3a0XhQVomJEb2Qh4VHTPNRO4GPZh0V7VRbiWwkRg=="; + }; + }; "tus-js-client-3.0.1" = { name = "tus-js-client"; packageName = "tus-js-client"; @@ -75130,22 +74482,22 @@ let sha512 = "RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="; }; }; - "type-fest-3.1.0" = { + "type-fest-3.5.1" = { name = "type-fest"; packageName = "type-fest"; - version = "3.1.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-3.1.0.tgz"; - sha512 = "StmrZmK3eD9mDF9Vt7UhqthrDSk66O9iYl5t5a0TSoVkHjl0XZx/xuc/BRz4urAXXGHOY5OLsE0RdJFIApSFmw=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-3.5.1.tgz"; + sha512 = "70T99cpILFk2fzwuljwWxmazSphFrdOe3gRHbp6bqs71pxFBbJwFqnmkLO2lQL6aLHxHmYAnP/sL+AJWpT70jA=="; }; }; - "type-fest-3.2.0" = { + "type-fest-3.5.3" = { name = "type-fest"; packageName = "type-fest"; - version = "3.2.0"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-3.2.0.tgz"; - sha512 = "Il3wdLRzWvbAEtocgxGQA9YOoRVeVUGOMBtel5LdEpNeEAol6GJTLw8GbX6Z8EIMfvfhoOXs2bwOijtAZdK5og=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-3.5.3.tgz"; + sha512 = "V2+og4j/rWReWvaFrse3s9g2xvUv/K9Azm/xo6CjIuq7oeGqsoimC7+9/A3tfvNcbQf8RPSVj/HV81fB4DJrjA=="; }; }; "type-is-1.6.18" = { @@ -75157,6 +74509,15 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; + "typed-array-length-1.0.4" = { + name = "typed-array-length"; + packageName = "typed-array-length"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz"; + sha512 = "KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng=="; + }; + }; "typed-rest-client-1.8.9" = { name = "typed-rest-client"; packageName = "typed-rest-client"; @@ -75166,15 +74527,6 @@ let sha512 = "uSmjE38B80wjL85UFX3sTYEUlvZ1JgCRhsWj/fJ4rZ0FqDUFoIuodtiVeE+cUqiVTOKPdKrp/sdftD15MDek6g=="; }; }; - "typed-styles-0.0.7" = { - name = "typed-styles"; - packageName = "typed-styles"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.7.tgz"; - sha512 = "pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q=="; - }; - }; "typedarray-0.0.6" = { name = "typedarray"; packageName = "typedarray"; @@ -75274,15 +74626,6 @@ let sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; }; }; - "typescript-3.2.4" = { - name = "typescript"; - packageName = "typescript"; - version = "3.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz"; - sha512 = "0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="; - }; - }; "typescript-3.9.10" = { name = "typescript"; packageName = "typescript"; @@ -75319,13 +74662,13 @@ let sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; }; }; - "typescript-4.8.4" = { + "typescript-4.9.4" = { name = "typescript"; packageName = "typescript"; - version = "4.8.4"; + version = "4.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz"; - sha512 = "QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz"; + sha512 = "Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg=="; }; }; "typescript-eslint-parser-16.0.1" = { @@ -75382,13 +74725,31 @@ let sha512 = "ofhi8kjIje6npGozTip9Fr8iecmYfEbS06i0JnIg+rh51KakryWF4+jX8lLKZVhy6N+ID45WYSFCxPOdTWCzNg=="; }; }; - "typo-geom-0.12.1" = { + "typical-4.0.0" = { + name = "typical"; + packageName = "typical"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz"; + sha512 = "VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw=="; + }; + }; + "typical-5.2.0" = { + name = "typical"; + packageName = "typical"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz"; + sha512 = "dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg=="; + }; + }; + "typo-geom-0.13.0" = { name = "typo-geom"; packageName = "typo-geom"; - version = "0.12.1"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.12.1.tgz"; - sha512 = "W20RYp2OCEGMhEYayR0cAP67AUWiGRUufMs6Clul7MAmu5SpLuOG/RWk7+LkL65wsugcfhPQlFEJ231C2xHNQg=="; + url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.13.0.tgz"; + sha512 = "s7BV1wSA+kcv2kNjJXrXgl9By8BGqwRu1llbxfkv45McR/ZyxWOFXUgTMUZdUFn79UQuVc0yzKisrj8XzkR27A=="; }; }; "u2f-api-0.2.7" = { @@ -75427,13 +74788,13 @@ let sha512 = "+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ=="; }; }; - "ua-parser-js-0.7.32" = { + "ua-parser-js-0.7.33" = { name = "ua-parser-js"; packageName = "ua-parser-js"; - version = "0.7.32"; + version = "0.7.33"; src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.32.tgz"; - sha512 = "f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw=="; + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.33.tgz"; + sha512 = "s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw=="; }; }; "ua-parser-js-1.0.2" = { @@ -75652,15 +75013,6 @@ let sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; }; }; - "unbzip2-stream-1.3.3" = { - name = "unbzip2-stream"; - packageName = "unbzip2-stream"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz"; - sha512 = "fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg=="; - }; - }; "unbzip2-stream-1.4.3" = { name = "unbzip2-stream"; packageName = "unbzip2-stream"; @@ -75796,13 +75148,13 @@ let sha512 = "UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw=="; }; }; - "undici-5.12.0" = { + "undici-5.16.0" = { name = "undici"; packageName = "undici"; - version = "5.12.0"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.12.0.tgz"; - sha512 = "zMLamCG62PGjd9HHMpo05bSLvvwWOZgGeiWlN/vlqu3+lRo3elxktVGEyLMX+IO7c2eflLjcW74AlkhEZm15mg=="; + url = "https://registry.npmjs.org/undici/-/undici-5.16.0.tgz"; + sha512 = "KWBOXNv6VX+oJQhchXieUznEmnJMqgXMbs0xxH2t8q/FUAWSJvOSr/rMaZKnX5RIVq7JDn0JbP4BOnKG2SGXLQ=="; }; }; "undici-5.9.1" = { @@ -75832,13 +75184,13 @@ let sha512 = "Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ=="; }; }; - "unherit-3.0.0" = { + "unherit-3.0.1" = { name = "unherit"; packageName = "unherit"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unherit/-/unherit-3.0.0.tgz"; - sha512 = "UmvIQZGEc9qdLIQ8mv8/61n6PiMgfbOoASPKHpCvII5srShCQSa6jSjBjlZOR4bxt2XnT6uo6csmPKRi+zQ0Jg=="; + url = "https://registry.npmjs.org/unherit/-/unherit-3.0.1.tgz"; + sha512 = "akOOQ/Yln8a2sgcLj4U0Jmx0R5jpIg2IUyRrWOzmEbjBtGzBdHtSeFKgoEcoH4KYIG/Pb8GQ/BwtYm0GCq1Sqg=="; }; }; "uni-global-1.0.0" = { @@ -75877,13 +75229,22 @@ let sha512 = "5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q=="; }; }; - "unicode-match-property-value-ecmascript-2.0.0" = { + "unicode-match-property-value-ecmascript-2.1.0" = { name = "unicode-match-property-value-ecmascript"; packageName = "unicode-match-property-value-ecmascript"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz"; - sha512 = "7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="; + url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz"; + sha512 = "qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA=="; + }; + }; + "unicode-properties-1.4.1" = { + name = "unicode-properties"; + packageName = "unicode-properties"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-properties/-/unicode-properties-1.4.1.tgz"; + sha512 = "CLjCCLQ6UuMxWnbIylkisbRj31qxHPAurvena/0iwSVbQ2G1VY5/HjV0IRabOEbDHlzZlRdCrD4NhB0JtU40Pg=="; }; }; "unicode-property-aliases-ecmascript-2.1.0" = { @@ -75904,6 +75265,15 @@ let sha512 = "WgVuO0M2jDl7hVfbPgXv2LUrD81HM0bQj/bvLGiw6fJ4Zo8nNFnDrA0/hU2Te/wz6pjxCm5cxJwtLjo2eyV51Q=="; }; }; + "unicode-trie-2.0.0" = { + name = "unicode-trie"; + packageName = "unicode-trie"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-trie/-/unicode-trie-2.0.0.tgz"; + sha512 = "x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ=="; + }; + }; "unified-10.1.2" = { name = "unified"; packageName = "unified"; @@ -75967,13 +75337,13 @@ let sha512 = "qiI0GaHi/50NVrChnmZOBeB0aNhHRMG6VnjKEAikaQD/I3gxjTsDp8gycCOUxyVCJrV/Rv3y6zEWMZczO+o3Lw=="; }; }; - "unified-engine-10.0.1" = { + "unified-engine-10.1.0" = { name = "unified-engine"; packageName = "unified-engine"; - version = "10.0.1"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/unified-engine/-/unified-engine-10.0.1.tgz"; - sha512 = "lsj7VC8kNWhK87rGBhidklk4llgrEdJoOZHoQFbTZQ/fA22JqowUPM10bEf05eSZOR6UnUSrZ/mPWHrQsHGm7g=="; + url = "https://registry.npmjs.org/unified-engine/-/unified-engine-10.1.0.tgz"; + sha512 = "5+JDIs4hqKfHnJcVCxTid1yBoI/++FfF/1PFdSMpaftZZZY+qg2JFruRbf7PaIwa9KgLotXQV3gSjtY0IdcFGQ=="; }; }; "unified-engine-6.0.1" = { @@ -76228,13 +75598,13 @@ let sha512 = "fPNWewS593JSmg49HbnE86BJKuBi1/nMWhDSccBvbARfxezEuJV85EaARR9/VplveiwCoLm2kWq+DhP8TBaDpw=="; }; }; - "unist-util-inspect-7.0.1" = { + "unist-util-inspect-7.0.2" = { name = "unist-util-inspect"; packageName = "unist-util-inspect"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-7.0.1.tgz"; - sha512 = "gEPeSrsYXus8012VJ00p9uZC8D0iogtLLiHlBgvS61hU22KNKduQhMKezJm83viHlLf3TYS2y9SDEFglWPDMKw=="; + url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-7.0.2.tgz"; + sha512 = "Op0XnmHUl6C2zo/yJCwhXQSm/SmW22eDZdWP2qdf4WpGrgO1ZxFodq+5zFyeRGasFjJotAnLgfuD1jkcKqiH1Q=="; }; }; "unist-util-is-2.1.3" = { @@ -76264,13 +75634,13 @@ let sha512 = "ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg=="; }; }; - "unist-util-is-5.1.1" = { + "unist-util-is-5.2.0" = { name = "unist-util-is"; packageName = "unist-util-is"; - version = "5.1.1"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.1.1.tgz"; - sha512 = "F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ=="; + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.2.0.tgz"; + sha512 = "Glt17jWwZeyqrFqOK0pF1Ded5U3yzJnFr8CG1GMjCWTp9zDo2p+cmD6pWbZU8AgM5WU3IzRv6+rBwhzsGh6hBQ=="; }; }; "unist-util-map-1.0.5" = { @@ -76300,6 +75670,15 @@ let sha512 = "HGrj7JQo9DwZt8XFsX8UD4gGqOsIlCih9opG6Y+N11XqkBGKzHo8cvDi+MfQQgiZ7zXRUiQREYHhjOBHERTMdg=="; }; }; + "unist-util-modify-children-3.1.1" = { + name = "unist-util-modify-children"; + packageName = "unist-util-modify-children"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-3.1.1.tgz"; + sha512 = "yXi4Lm+TG5VG+qvokP6tpnk+r1EPwyYL04JWDxLvgvPV40jANh7nm3udk65OOWquvbMDe+PL9+LmkxDpTv/7BA=="; + }; + }; "unist-util-position-3.1.0" = { name = "unist-util-position"; packageName = "unist-util-position"; @@ -76309,22 +75688,22 @@ let sha512 = "w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA=="; }; }; - "unist-util-position-4.0.3" = { + "unist-util-position-4.0.4" = { name = "unist-util-position"; packageName = "unist-util-position"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.3.tgz"; - sha512 = "p/5EMGIa1qwbXjA+QgcBXaPWjSnZfQ2Sc3yBEEfgPwsEmJd8Qh+DSk3LGnmOM4S1bY2C0AjmMnB8RuEYxpPwXQ=="; + url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.4.tgz"; + sha512 = "kUBE91efOWfIVBo8xzh/uZQ7p9ffYRtUbMRZBNFYwf0RK8koUMx6dGUfwylLOKmaT2cs4wSW96QoYUSXAyEtpg=="; }; }; - "unist-util-position-from-estree-1.1.1" = { + "unist-util-position-from-estree-1.1.2" = { name = "unist-util-position-from-estree"; packageName = "unist-util-position-from-estree"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-position-from-estree/-/unist-util-position-from-estree-1.1.1.tgz"; - sha512 = "xtoY50b5+7IH8tFbkw64gisG9tMSpxDjhX9TmaJJae/XuxQ9R/Kc8Nv1eOsf43Gt4KV/LkriMy9mptDr7XLcaw=="; + url = "https://registry.npmjs.org/unist-util-position-from-estree/-/unist-util-position-from-estree-1.1.2.tgz"; + sha512 = "poZa0eXpS+/XpoQwGwl79UUdea4ol2ZuCYguVaJS4qzIOMDzbqz8a3erUCOmubSZkaOuGamb3tX790iwOIROww=="; }; }; "unist-util-remove-position-2.0.1" = { @@ -76336,13 +75715,13 @@ let sha512 = "fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA=="; }; }; - "unist-util-remove-position-4.0.1" = { + "unist-util-remove-position-4.0.2" = { name = "unist-util-remove-position"; packageName = "unist-util-remove-position"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-4.0.1.tgz"; - sha512 = "0yDkppiIhDlPrfHELgB+NLQD5mfjup3a8UYclHruTJWmY74je8g+CIFr79x5f6AkmzSwlvKLbs63hC0meOMowQ=="; + url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-4.0.2.tgz"; + sha512 = "TkBb0HABNmxzAcfLf4qsIbFbaPDvMO6wa3b3j4VcEzFVaw1LBKwnW4/sRJ/atSLSzoIg41JWEdnE7N6DIhGDGQ=="; }; }; "unist-util-stringify-position-1.1.2" = { @@ -76363,13 +75742,13 @@ let sha512 = "3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g=="; }; }; - "unist-util-stringify-position-3.0.2" = { + "unist-util-stringify-position-3.0.3" = { name = "unist-util-stringify-position"; packageName = "unist-util-stringify-position"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz"; - sha512 = "7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg=="; + url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz"; + sha512 = "k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg=="; }; }; "unist-util-to-list-of-char-0.1.3" = { @@ -76408,13 +75787,13 @@ let sha512 = "Szoh+R/Ll68QWAyQyZZpQzZQm2UPbxibDvaY8Xc9SUtYgPsDzx5AWSk++UUt2hJuow8mvwR+rG+LQLw+KsuAKA=="; }; }; - "unist-util-visit-4.1.1" = { + "unist-util-visit-4.1.2" = { name = "unist-util-visit"; packageName = "unist-util-visit"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.1.tgz"; - sha512 = "n9KN3WV9k4h1DxYR1LoajgN93wpEi/7ZplVe02IoB4gH5ctI1AaF2670BLHQYbwj+pY83gFtyeySFiyMHJklrg=="; + url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.2.tgz"; + sha512 = "MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg=="; }; }; "unist-util-visit-children-1.1.4" = { @@ -76426,6 +75805,15 @@ let sha512 = "sA/nXwYRCQVRwZU2/tQWUqJ9JSFM1X3x7JIOsIgSzrFHcfVt6NkzDtKzyxg2cZWkCwGF9CO8x4QNZRJRMK8FeQ=="; }; }; + "unist-util-visit-children-2.0.2" = { + name = "unist-util-visit-children"; + packageName = "unist-util-visit-children"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-2.0.2.tgz"; + sha512 = "+LWpMFqyUwLGpsQxpumsQ9o9DG2VGLFrpz+rpVXYIEdPy57GSy5HioC0g3bg/8WP9oCLlapQtklOzQ8uLS496Q=="; + }; + }; "unist-util-visit-parents-2.1.2" = { name = "unist-util-visit-parents"; packageName = "unist-util-visit-parents"; @@ -76453,13 +75841,13 @@ let sha512 = "1xAFJXAKpnnJl8G7K5KgU7FY55y3GcLIXqkzUj5QF/QVP7biUm0K0O2oqVkYsdjzJKifYeWn9+o6piAK2hGSHw=="; }; }; - "unist-util-visit-parents-5.1.1" = { + "unist-util-visit-parents-5.1.3" = { name = "unist-util-visit-parents"; packageName = "unist-util-visit-parents"; - version = "5.1.1"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.1.tgz"; - sha512 = "gks4baapT/kNRaWxuGkl5BIhoanZo7sC/cUT/JToSRNL1dYoXRFl75d++NkjYk4TAu2uv2Px+l8guMajogeuiw=="; + url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.3.tgz"; + sha512 = "x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg=="; }; }; "universal-analytics-0.5.3" = { @@ -76813,6 +76201,15 @@ let sha512 = "EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og=="; }; }; + "update-notifier-cjs-5.1.6" = { + name = "update-notifier-cjs"; + packageName = "update-notifier-cjs"; + version = "5.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier-cjs/-/update-notifier-cjs-5.1.6.tgz"; + sha512 = "wgxdSBWv3x/YpMzsWz5G4p4ec7JWD0HCl8W6bmNB6E5Gwo+1ym5oN4hiXpLf0mPySVEJEIsYlkshnplkg2OP9A=="; + }; + }; "upnp-device-client-1.0.2" = { name = "upnp-device-client"; packageName = "upnp-device-client"; @@ -76840,24 +76237,6 @@ let sha512 = "WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA=="; }; }; - "upper-case-2.0.2" = { - name = "upper-case"; - packageName = "upper-case"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/upper-case/-/upper-case-2.0.2.tgz"; - sha512 = "KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg=="; - }; - }; - "upper-case-first-2.0.2" = { - name = "upper-case-first"; - packageName = "upper-case-first"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz"; - sha512 = "514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg=="; - }; - }; "uri-js-3.0.2" = { name = "uri-js"; packageName = "uri-js"; @@ -76894,13 +76273,13 @@ let sha512 = "Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg=="; }; }; - "urkel-1.0.2" = { + "urkel-1.0.3" = { name = "urkel"; packageName = "urkel"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/urkel/-/urkel-1.0.2.tgz"; - sha512 = "Y5UXbgBr6pczrD08N0SYJkWjtdtTTpmZsOvuftdrEHLnTjuxwSNjKsXYLQkICTptvnHAJ2OjI6XdAxtYTyOHew=="; + url = "https://registry.npmjs.org/urkel/-/urkel-1.0.3.tgz"; + sha512 = "L2M46WWSaz1LpyUYFgnQg7WSOWtNcRx3uH+4GwHK1jbmYj6phLuIwirTVMlhfcZ0o/CWn5Y04UWLhmlvijZiDg=="; }; }; "url-0.10.3" = { @@ -76966,15 +76345,6 @@ let sha512 = "goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog=="; }; }; - "url-loader-4.1.1" = { - name = "url-loader"; - packageName = "url-loader"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz"; - sha512 = "3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA=="; - }; - }; "url-parse-1.5.10" = { name = "url-parse"; packageName = "url-parse"; @@ -77047,6 +76417,15 @@ let sha512 = "DOE84vZT2fEcl9gqCUTcnAw5ZY5Id55ikUcziSUntuEFL3pRvavg5kwDmTEUJkeCHInTlV/HexFomgYnzO5kdQ=="; }; }; + "urlpattern-polyfill-6.0.2" = { + name = "urlpattern-polyfill"; + packageName = "urlpattern-polyfill"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-6.0.2.tgz"; + sha512 = "5vZjFlH9ofROmuWmXM9yj2wljYKgWstGwe8YTyiqM7hVum/g9LyCizPZtb3UqsuppVwety9QJmfc42VggLpTgg=="; + }; + }; "urlsafe-base64-1.0.0" = { name = "urlsafe-base64"; packageName = "urlsafe-base64"; @@ -77074,15 +76453,6 @@ let sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; }; }; - "use-debounce-3.4.3" = { - name = "use-debounce"; - packageName = "use-debounce"; - version = "3.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/use-debounce/-/use-debounce-3.4.3.tgz"; - sha512 = "nxy+opOxDccWfhMl36J5BSCTpvcj89iaQk2OZWLAtBJQj7ISCtx1gh+rFbdjGfMl6vtCZf6gke/kYvrkVfHMoA=="; - }; - }; "user-home-2.0.0" = { name = "user-home"; packageName = "user-home"; @@ -77146,6 +76516,15 @@ let sha512 = "vLt1O5Pp+flcArHGIyKEQq883nBt8nN8tVBcoL0qUXj2XT1n7p70yGIq2VK98I5FdZ1YHc0wk/koOnHjnXWk1Q=="; }; }; + "utf-8-validate-6.0.2" = { + name = "utf-8-validate"; + packageName = "utf-8-validate"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-6.0.2.tgz"; + sha512 = "yd7PQEOW+EgecUzSD7XUXTyq/vREGXk7t7fzGfOvwOAr0Z64h5rfGrmkNk8+ddVmf/FrkjPPhVyYBa7fuSPVTg=="; + }; + }; "utf7-1.0.2" = { name = "utf7"; packageName = "utf7"; @@ -77200,6 +76579,15 @@ let sha512 = "Rv9/OsKlBgMlLGai2EAoVheIbdBlndMunkXH4BuU81R2+Nky24I670OdGIb+NMpCbuHGyKjk9OQ7hdyOxuNXgw=="; }; }; + "utif-2.0.1" = { + name = "utif"; + packageName = "utif"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utif/-/utif-2.0.1.tgz"; + sha512 = "Z/S1fNKCicQTf375lIP9G8Sa1H/phcysstNrrSdZKj1f9g58J4NMgb5IgiEZN9/nLMPDwF0W7hdOe9Qq2IYoLg=="; + }; + }; "util-0.10.3" = { name = "util"; packageName = "util"; @@ -77560,6 +76948,15 @@ let sha512 = "mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q=="; }; }; + "validate-npm-package-name-5.0.0" = { + name = "validate-npm-package-name"; + packageName = "validate-npm-package-name"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz"; + sha512 = "YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ=="; + }; + }; "validator-10.11.0" = { name = "validator"; packageName = "validator"; @@ -77605,6 +77002,15 @@ let sha512 = "41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg=="; }; }; + "value-or-promise-1.0.12" = { + name = "value-or-promise"; + packageName = "value-or-promise"; + version = "1.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/value-or-promise/-/value-or-promise-1.0.12.tgz"; + sha512 = "Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q=="; + }; + }; "value-or-promise-1.0.6" = { name = "value-or-promise"; packageName = "value-or-promise"; @@ -78073,13 +77479,13 @@ let sha512 = "O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA=="; }; }; - "vfile-5.3.5" = { + "vfile-5.3.6" = { name = "vfile"; packageName = "vfile"; - version = "5.3.5"; + version = "5.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/vfile/-/vfile-5.3.5.tgz"; - sha512 = "U1ho2ga33eZ8y8pkbQLH54uKqGhFJ6GYIHnnG5AhRpAh3OWjkrRHKa/KogbmQn8We+c0KVV3rTOgR9V/WowbXQ=="; + url = "https://registry.npmjs.org/vfile/-/vfile-5.3.6.tgz"; + sha512 = "ADBsmerdGBs2WYckrLBEmuETSPyTD4TuLxTrw0DvjirxW1ra4ZwkbzG8ndsv3Q57smvHxo677MHaQrY9yxH8cA=="; }; }; "vfile-find-down-1.0.0" = { @@ -78154,13 +77560,13 @@ let sha512 = "DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ=="; }; }; - "vfile-message-3.1.2" = { + "vfile-message-3.1.3" = { name = "vfile-message"; packageName = "vfile-message"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.2.tgz"; - sha512 = "QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA=="; + url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.3.tgz"; + sha512 = "0yaU+rj2gKAyEk12ffdSbBfjnnj+b1zqTBv3OQCTn8yEB02bsPizwdBPrLJjHnK+cU9EMMcUnNv938XcZIkmdA=="; }; }; "vfile-reporter-1.5.0" = { @@ -78361,13 +77767,13 @@ let sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; - "vm2-3.9.11" = { + "vm2-3.9.13" = { name = "vm2"; packageName = "vm2"; - version = "3.9.11"; + version = "3.9.13"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.11.tgz"; - sha512 = "PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.13.tgz"; + sha512 = "0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q=="; }; }; "voc-1.2.0" = { @@ -78397,13 +77803,13 @@ let sha512 = "Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="; }; }; - "vsce-2.13.0" = { + "vsce-2.15.0" = { name = "vsce"; packageName = "vsce"; - version = "2.13.0"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-2.13.0.tgz"; - sha512 = "t1otQ2lqyi5Y/G6qUl9BEc561nEIYrZbLT8k+R1SoZaKNa6gaehaLGQG5zvB524YPGZOVvbOBzAXoO7Mor1J5g=="; + url = "https://registry.npmjs.org/vsce/-/vsce-2.15.0.tgz"; + sha512 = "P8E9LAZvBCQnoGoizw65JfGvyMqNGlHdlUXD1VAuxtvYAaHBKLBdKPnpy60XKVDAkQCfmMu53g+gq9FM+ydepw=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -78424,31 +77830,13 @@ let sha512 = "jWi+297PJUUWTHwlcrZz0zIuEXuHOBJIQMapXmEzbosWGv/gMnNSAMV4hTKnl5wzxvZKZzV6j+WFdrSlKQ5qnw=="; }; }; - "vscode-css-languageservice-5.1.13" = { + "vscode-css-languageservice-6.2.3" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "5.1.13"; + version = "6.2.3"; src = fetchurl { - 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.4.2" = { - name = "vscode-css-languageservice"; - packageName = "vscode-css-languageservice"; - version = "5.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.4.2.tgz"; - sha512 = "DT7+7vfdT2HDNjDoXWtYJ0lVDdeDEdbMNdK4PKqUl2MS8g7PWt7J5G9B6k9lYox8nOfhCEjLnoNC3UKHHCR1lg=="; - }; - }; - "vscode-css-languageservice-6.1.1" = { - name = "vscode-css-languageservice"; - packageName = "vscode-css-languageservice"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.1.1.tgz"; - sha512 = "7d2NCq2plT0njAKmGZ11uof95y2fwbgq8QuToE3kX9uYQfVmejHX2/lFGKbK5AV5+Ja0L80UZoU0QspwqMKMHA=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.3.tgz"; + sha512 = "EAyhyIVHpEaf+GjtI+tVe7SekdoANfG0aubnspsQwak3Qkimn/97FpAufNyXk636ngW05pjNKAR9zyTCzo6avQ=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -78460,15 +77848,6 @@ let sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow=="; }; }; - "vscode-emmet-helper-2.6.4" = { - name = "vscode-emmet-helper"; - packageName = "vscode-emmet-helper"; - version = "2.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.6.4.tgz"; - sha512 = "fP0nunW1RUWEKGf4gqiYLOVNFFGXSRHjCl0pikxtwCFlty8WwimM+RBJ5o0aIiwerrYD30HqeaVyvDW027Sseg=="; - }; - }; "vscode-html-languageservice-2.1.12" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; @@ -78478,31 +77857,13 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-html-languageservice-4.1.1" = { + "vscode-html-languageservice-5.0.4" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; - version = "4.1.1"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.1.1.tgz"; - sha512 = "rrDyCiOgMwOPgchpPGAeLzjYVVEW/Ror2/a1BWUEI3S9+NQhA9vj4SQkzmH6g2Bq9S9SV0OQeadD+xphOf1N3w=="; - }; - }; - "vscode-html-languageservice-4.2.5" = { - name = "vscode-html-languageservice"; - packageName = "vscode-html-languageservice"; - version = "4.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.2.5.tgz"; - sha512 = "dbr10KHabB9EaK8lI0XZW7SqOsTfrNyT3Nuj0GoPi4LjGKUmMiLtsqzfedIzRTzqY+w0FiLdh0/kQrnQ0tLxrw=="; - }; - }; - "vscode-html-languageservice-5.0.2" = { - name = "vscode-html-languageservice"; - packageName = "vscode-html-languageservice"; - version = "5.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.0.2.tgz"; - sha512 = "TQmeyE14Ure/w/S+RV2IItuRWmw/i1QaS+om6t70iHCpamuTTWnACQPMSltVGm/DlbdyMquUePJREjd/h3AVkQ=="; + url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.0.4.tgz"; + sha512 = "tvrySfpglu4B2rQgWGVO/IL+skvU7kBkQotRlxA7ocSyRXOZUd6GA13XHkxo8LPe07KWjeoBlN1aVGqdfTK4xA=="; }; }; "vscode-json-languageservice-3.11.0" = { @@ -78532,13 +77893,13 @@ let sha512 = "xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA=="; }; }; - "vscode-json-languageservice-5.1.1" = { + "vscode-json-languageservice-5.1.4" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "5.1.1"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.1.1.tgz"; - sha512 = "EtAcTD6MOfyf8+MokDsAHNM7ttuZvCo077w9aMtJiyps41gkOcoBThAbXDk6Y0Oi6ki5aDs8lgY4KxYiVW/lxA=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.1.4.tgz"; + sha512 = "ROZ1ezYQUbq9b/07xYpHtZSyyhoUk3oTTGVAEr6bU1DKr8ELaz9fsDoHno34tKtHj/Tf3deQqfjQNGKdbRuvTw=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -78595,15 +77956,6 @@ let sha512 = "wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg=="; }; }; - "vscode-jsonrpc-6.1.0-next.2" = { - name = "vscode-jsonrpc"; - packageName = "vscode-jsonrpc"; - version = "6.1.0-next.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.1.0-next.2.tgz"; - sha512 = "nkiNDGI+Ytp7uj1lxHXddXCoEunhcry1D+KmVHBfUUgWT9jMF8ZJyH5KQObdF+OGAh7bXZxD/SV4uGwSCeHHWA=="; - }; - }; "vscode-jsonrpc-8.0.0-next.7" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; @@ -78622,13 +77974,13 @@ let sha512 = "RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ=="; }; }; - "vscode-jsonrpc-8.1.0-next.1" = { + "vscode-jsonrpc-8.1.0-next.7" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "8.1.0-next.1"; + version = "8.1.0-next.7"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.1.tgz"; - sha512 = "FiPG+9TuMIga3t+kkalQytwqMtJu1djI+Pq+Ut2tvAJpcNHDJ0PYdjFv5mgEvTEJLujrYwjWHVkNe+XfHPBD/w=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.7.tgz"; + sha512 = "UJlY2e4wnI+GkaNYM2TERqrNvTe0XScny7lUA4f+F+z6XI5pDJnHj6udXiGJofT/tX57d8C6fnlfgrCfF6aptQ=="; }; }; "vscode-languageclient-4.0.1" = { @@ -78721,15 +78073,6 @@ let sha512 = "60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw=="; }; }; - "vscode-languageserver-7.1.0-next.4" = { - name = "vscode-languageserver"; - packageName = "vscode-languageserver"; - version = "7.1.0-next.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.1.0-next.4.tgz"; - sha512 = "/65lxR/CuLJoOdzTjOTYUPWS7k5qzaWese4PObnWc6jwLryUrSa7DslYfaRXigh5/xr1nlaUZCcJwkpgM0wFvw=="; - }; - }; "vscode-languageserver-8.0.2" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; @@ -78739,13 +78082,13 @@ let sha512 = "bpEt2ggPxKzsAOZlXmCJ50bV7VrxwCS5BI4+egUmure/oI/t4OlFzi/YNtVvY24A2UDOZAgwFGgnZPwqSJubkA=="; }; }; - "vscode-languageserver-8.1.0-next.1" = { + "vscode-languageserver-8.1.0-next.6" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "8.1.0-next.1"; + version = "8.1.0-next.6"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.1.0-next.1.tgz"; - sha512 = "u14Rk4JgXI+7iS6AEXI2pNc1dWh/5JEXtaqa4TeBECKJlN+5242mbGBBPaHMOE7sSI1Kh66XhEMZJhPYjUfjHw=="; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.1.0-next.6.tgz"; + sha512 = "YSj9fKN0FtVW95RKjcy8UheODK4YosqiZUkEbAgJJ0uMxR1Om1dhD/+QwYUKfJX/u8KLS/qFroMNVFHoPoc2hg=="; }; }; "vscode-languageserver-protocol-3.14.1" = { @@ -78793,15 +78136,6 @@ let sha512 = "tx4DnXw9u3N7vw+bx6n2NKp6FoxoNwiP/biH83AS30I2AnTGyLd7afSeH6Oewn2E8jvB7K15bs12sMppkKOVeQ=="; }; }; - "vscode-languageserver-protocol-3.17.0-next.5" = { - name = "vscode-languageserver-protocol"; - packageName = "vscode-languageserver-protocol"; - version = "3.17.0-next.5"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.5.tgz"; - sha512 = "LFZ6WMB3iPezQAU9OnGoERzcIVKhcs0OLfD/NHcqSj3g1wgxuLUL5kSlZbbjFySQCmhzm6b0yb3hjTSeBtq1+w=="; - }; - }; "vscode-languageserver-protocol-3.17.2" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -78811,13 +78145,13 @@ let sha512 = "8kYisQ3z/SQ2kyjlNeQxbkkTNmVFoQCqkmGrzLH6A9ecPlgTbp3wDTnUNqaUxYr4vlAcloxx8zwy7G5WdguYNg=="; }; }; - "vscode-languageserver-protocol-3.17.3-next.1" = { + "vscode-languageserver-protocol-3.17.3-next.6" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.17.3-next.1"; + version = "3.17.3-next.6"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.1.tgz"; - sha512 = "vgjvPE0zox+1Fi4ljsSFJ+B3g8wGNbuAEEdulueVdv+R2VHtc06+dgxhWiG4LKPqXwjPDmiuxCnvd2xk3fzTTw=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.6.tgz"; + sha512 = "UCL2DaAOCzGFZKIAJ4wOS9BXVbeARL8GxXTW7ANnAXJg03IytNmOJcmguL6l+ht4CCdKNQbnRSJB4dh8cgDyJw=="; }; }; "vscode-languageserver-protocol-3.5.1" = { @@ -78847,13 +78181,22 @@ let sha512 = "N8bOS8i0xuQMn/y0bijyefDbOsMl6hiH6LDREYWavTLTM5jbj44EiQfStsbmAv/0eaFKkL/jf5hW7nWwBy2HBw=="; }; }; - "vscode-languageserver-textdocument-1.0.7" = { + "vscode-languageserver-textdocument-1.0.8" = { name = "vscode-languageserver-textdocument"; packageName = "vscode-languageserver-textdocument"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.7.tgz"; - sha512 = "bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg=="; + url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz"; + sha512 = "1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q=="; + }; + }; + "vscode-languageserver-textdocument-1.0.9" = { + name = "vscode-languageserver-textdocument"; + packageName = "vscode-languageserver-textdocument"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.9.tgz"; + sha512 = "NPfHVGFW2/fQEWHspr8x3PXhRgtFbuDZdl7p6ifuN3M7nk2Yjf5POr/NfDBuAiQG88DehDyJ7nGOT+p+edEtbw=="; }; }; "vscode-languageserver-types-3.14.0" = { @@ -78901,15 +78244,6 @@ let sha512 = "QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q=="; }; }; - "vscode-languageserver-types-3.17.0-next.1" = { - name = "vscode-languageserver-types"; - packageName = "vscode-languageserver-types"; - version = "3.17.0-next.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.1.tgz"; - sha512 = "VGzh06oynbYa6JbTKUbxOEZN7CYEtWhN7DK5wfzUpeCJl8X8xZX39g2PVfpqXrIEduu7dcJgK007KgnX9tHNKA=="; - }; - }; "vscode-languageserver-types-3.17.0-next.3" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -78937,6 +78271,15 @@ let sha512 = "zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA=="; }; }; + "vscode-languageserver-types-3.17.3-next.3" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.17.3-next.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3-next.3.tgz"; + sha512 = "R36Wi5sHoVc/PsAva0QGoEgw+LRCXPDKcdjFfgoVwrRdrFOdYUkvp5G4NvrPUsVT2f2qS/bSs6QiRxyjNkcR9A=="; + }; + }; "vscode-languageserver-types-3.5.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -79027,13 +78370,13 @@ let sha512 = "8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="; }; }; - "vscode-uri-3.0.6" = { + "vscode-uri-3.0.7" = { name = "vscode-uri"; packageName = "vscode-uri"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.6.tgz"; - sha512 = "fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ=="; + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.7.tgz"; + sha512 = "eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA=="; }; }; "vstream-0.1.0" = { @@ -79045,15 +78388,6 @@ let sha512 = "WHV31NZp7EP0JHFPWzhuHuo4+MaHcrTyZZucsCW+wFuF3OQ3mJsOBSfJTqkG53ZN1jdjkfxitbOFLy8pNyKyDA=="; }; }; - "vt-pbf-3.1.3" = { - name = "vt-pbf"; - packageName = "vt-pbf"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz"; - sha512 = "2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA=="; - }; - }; "vue-2.6.14" = { name = "vue"; packageName = "vue"; @@ -79063,13 +78397,13 @@ let sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; }; }; - "vue-2.7.13" = { + "vue-2.7.14" = { name = "vue"; packageName = "vue"; - version = "2.7.13"; + version = "2.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.7.13.tgz"; - sha512 = "QnM6ULTNnPmn71eUO+4hdjfBIA3H0GLsBnchnI/kS678tjI45GOUZhXd0oP/gX9isikXz1PAzSnkPspp9EUNfQ=="; + url = "https://registry.npmjs.org/vue/-/vue-2.7.14.tgz"; + sha512 = "b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ=="; }; }; "vue-class-component-7.2.6" = { @@ -79126,33 +78460,6 @@ let sha512 = "qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg=="; }; }; - "vue-eslint-parser-9.1.0" = { - name = "vue-eslint-parser"; - packageName = "vue-eslint-parser"; - version = "9.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz"; - sha512 = "NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ=="; - }; - }; - "vue-fullscreen-2.6.1" = { - name = "vue-fullscreen"; - packageName = "vue-fullscreen"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-fullscreen/-/vue-fullscreen-2.6.1.tgz"; - sha512 = "bbMJDKj2ZhsAwLcsvh8oV8WJeqAr2zxTHysvf7H8wSqaJTn5CnHXMSMbP9Tz4L/54I7jNQIdyA7VZ+EKAG+svg=="; - }; - }; - "vue-gettext-2.1.12" = { - name = "vue-gettext"; - packageName = "vue-gettext"; - version = "2.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-gettext/-/vue-gettext-2.1.12.tgz"; - sha512 = "7Kw36xtKvARp8ZafQGPK9WR6EM+dhFUikR5f0+etSkiHuvUM3yf1HsRDLYoLLdJ0AMaXxKwgekumzvCk6KX8rA=="; - }; - }; "vue-hot-reload-api-2.3.4" = { name = "vue-hot-reload-api"; packageName = "vue-hot-reload-api"; @@ -79162,31 +78469,13 @@ let sha512 = "BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="; }; }; - "vue-infinite-scroll-2.0.2" = { - name = "vue-infinite-scroll"; - packageName = "vue-infinite-scroll"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-infinite-scroll/-/vue-infinite-scroll-2.0.2.tgz"; - sha512 = "n+YghR059YmciANGJh9SsNWRi1YZEBVlODtmnb/12zI+4R72QZSWd+EuZ5mW6auEo/yaJXgxzwsuhvALVnm73A=="; - }; - }; - "vue-loader-15.10.0" = { + "vue-loader-15.10.1" = { name = "vue-loader"; packageName = "vue-loader"; - version = "15.10.0"; + version = "15.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz"; - sha512 = "VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg=="; - }; - }; - "vue-loader-plugin-1.3.0" = { - name = "vue-loader-plugin"; - packageName = "vue-loader-plugin"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-loader-plugin/-/vue-loader-plugin-1.3.0.tgz"; - sha512 = "kzWyVB81zHnkv41tAC2nQtRKDWEA3od791FWjV/JOg9TSaop6Uvt92VWIPQQ84FK2UQYP4Ah99vAaVZXSnIgYA=="; + url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz"; + sha512 = "SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA=="; }; }; "vue-loader-v16-16.8.3" = { @@ -79198,15 +78487,6 @@ let sha512 = "7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA=="; }; }; - "vue-luxon-0.10.0" = { - name = "vue-luxon"; - packageName = "vue-luxon"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-luxon/-/vue-luxon-0.10.0.tgz"; - sha512 = "edMqK3qfWNze9z7Upbkb6RSI5XFFwaU3LwD6ZPJJPBhinTg1VBH7Rn8qNi5+5GmHMcbp2ybnOWm78m5lTjznFw=="; - }; - }; "vue-onsenui-helper-json-1.0.2" = { name = "vue-onsenui-helper-json"; packageName = "vue-onsenui-helper-json"; @@ -79234,15 +78514,6 @@ let sha512 = "FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg=="; }; }; - "vue-router-3.6.5" = { - name = "vue-router"; - packageName = "vue-router"; - version = "3.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz"; - sha512 = "VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ=="; - }; - }; "vue-style-loader-4.1.3" = { name = "vue-style-loader"; packageName = "vue-style-loader"; @@ -79261,13 +78532,13 @@ let sha512 = "ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g=="; }; }; - "vue-template-compiler-2.7.13" = { + "vue-template-compiler-2.7.14" = { name = "vue-template-compiler"; packageName = "vue-template-compiler"; - version = "2.7.13"; + version = "2.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.13.tgz"; - sha512 = "jYM6TClwDS9YqP48gYrtAtaOhRKkbYmbzE+Q51gX5YDr777n7tNI/IZk4QV4l/PjQPNh/FVa/E92sh/RqKMrog=="; + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz"; + sha512 = "zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ=="; }; }; "vue-template-es2015-compiler-1.9.1" = { @@ -79279,24 +78550,6 @@ let sha512 = "4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw=="; }; }; - "vue2-filters-0.14.0" = { - name = "vue2-filters"; - packageName = "vue2-filters"; - version = "0.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vue2-filters/-/vue2-filters-0.14.0.tgz"; - sha512 = "2tFWC6gx1SVIr+6VXoufkL+bZa8Gn0/P09T/bnGjOEAGH1+eVT05bPm/VF2V/nL/HMyWkLdlvxKh9JNqpfFlyw=="; - }; - }; - "vuetify-1.5.24" = { - name = "vuetify"; - packageName = "vuetify"; - version = "1.5.24"; - src = fetchurl { - url = "https://registry.npmjs.org/vuetify/-/vuetify-1.5.24.tgz"; - sha512 = "guFOgEgZ8VpSgNXOv1QL2fOliaJBoiyNnf+bBqcXsnIppJGRlW1wyT6Ux7ZlQyphSHs+UK1aJNUjcyAtoOiHWg=="; - }; - }; "vuetify-2.5.10" = { name = "vuetify"; packageName = "vuetify"; @@ -79414,13 +78667,13 @@ let sha512 = "rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w=="; }; }; - "wasm-feature-detect-1.3.0" = { + "wasm-feature-detect-1.4.0" = { name = "wasm-feature-detect"; packageName = "wasm-feature-detect"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/wasm-feature-detect/-/wasm-feature-detect-1.3.0.tgz"; - sha512 = "w9datO3OReMouWgKOelvu1CozmLK/VbkXOtlzNTanBJpR0uBHyUwS3EYdXf5vBPoHKYS0lpuYo91rpqMNIZM9g=="; + url = "https://registry.npmjs.org/wasm-feature-detect/-/wasm-feature-detect-1.4.0.tgz"; + sha512 = "9z4Yk3SeHQdb7E4g6ywQYcUt1CHr9HFiCIA5h29rv0gmW4lCE5dnDhheiJI5qzVPSDnXHyXQPLGPyucsuIzacw=="; }; }; "watchpack-1.7.5" = { @@ -79459,13 +78712,13 @@ let sha512 = "/lRBpLn2TvEwrIW5i35ZCpb+SIq4VWq4c1yxN311we+E4eXRW7EB5nybrv4fJEuBmgqyqVkT2gtQ6Zqu+u66mA=="; }; }; - "wavedrom-2.9.1" = { + "wavedrom-3.1.1" = { name = "wavedrom"; packageName = "wavedrom"; - version = "2.9.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/wavedrom/-/wavedrom-2.9.1.tgz"; - sha512 = "IPv1bKVwh4Zo8dMMQfnNy4KFqU/v0buoPDwLkTrtHE2nr0dV4pHqryhWpqNCSUm7xTWroER+nE5xRkng96xLUA=="; + url = "https://registry.npmjs.org/wavedrom/-/wavedrom-3.1.1.tgz"; + sha512 = "+6w4AvzsD+yHVP/mEYzn2sQ1VKn0UZNEt4QeO4X74cxEt8NhZOB+fxfHrUkbArfyC32AhhbTd5ZtD8RtBChA0Q=="; }; }; "wawoff2-2.0.1" = { @@ -79594,13 +78847,22 @@ let sha512 = "flC9JJmTII9uAeeYpWF8hxDJ7bfY+leldQryetll8Nv4WgI+MXc6h7TiyAZASWl9uC9TvmfdgOjZn1DAQecb3A=="; }; }; - "web3-utils-1.8.0" = { + "web-vitals-0.2.4" = { + name = "web-vitals"; + packageName = "web-vitals"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/web-vitals/-/web-vitals-0.2.4.tgz"; + sha512 = "6BjspCO9VriYy12z356nL6JBS0GYeEcA457YyRzD+dD6XYCQ75NKhcOHUMHentOE7OcVCIXXDvOm0jKFfQG2Gg=="; + }; + }; + "web3-utils-1.8.1" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.8.0.tgz"; - sha512 = "7nUIl7UWpLVka2f09CMbKOSEvorvHnaugIabU4mj7zfMvm0tSByLcEu3eyV9qgS11qxxLuOkzBIwCstTflhmpQ=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.8.1.tgz"; + sha512 = "LgnM9p6V7rHHUGfpMZod+NST8cRfGzJ1BTXAyNo7A9cJX9LczBfSRxJp+U/GInYe9mby40t3v22AJdlELibnsQ=="; }; }; "webassemblyjs-1.11.1" = { @@ -79693,15 +78955,6 @@ let sha512 = "75WFUMblcWYcocjSLlXCb71QuGyH7egdBZu50FtBGl2Nso8CK3Ej+J7bTZz2FPFq5l6fzCisD9modB7t30ikuA=="; }; }; - "webpack-4.43.0" = { - name = "webpack"; - packageName = "webpack"; - version = "4.43.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz"; - sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; - }; - }; "webpack-4.46.0" = { name = "webpack"; packageName = "webpack"; @@ -79711,13 +78964,13 @@ let sha512 = "6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="; }; }; - "webpack-5.74.0" = { + "webpack-5.75.0" = { name = "webpack"; packageName = "webpack"; - version = "5.74.0"; + version = "5.75.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz"; - sha512 = "A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz"; + sha512 = "piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -79756,6 +79009,15 @@ let sha512 = "NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w=="; }; }; + "webpack-cli-5.0.1" = { + name = "webpack-cli"; + packageName = "webpack-cli"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.0.1.tgz"; + sha512 = "S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A=="; + }; + }; "webpack-dev-middleware-3.4.0" = { name = "webpack-dev-middleware"; packageName = "webpack-dev-middleware"; @@ -79783,15 +79045,6 @@ let sha512 = "hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA=="; }; }; - "webpack-dev-server-3.11.0" = { - name = "webpack-dev-server"; - packageName = "webpack-dev-server"; - version = "3.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz"; - sha512 = "PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg=="; - }; - }; "webpack-dev-server-3.11.3" = { name = "webpack-dev-server"; packageName = "webpack-dev-server"; @@ -79801,6 +79054,15 @@ let sha512 = "3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA=="; }; }; + "webpack-dev-server-4.11.1" = { + name = "webpack-dev-server"; + packageName = "webpack-dev-server"; + version = "4.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz"; + sha512 = "lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw=="; + }; + }; "webpack-flush-chunks-2.0.3" = { name = "webpack-flush-chunks"; packageName = "webpack-flush-chunks"; @@ -79819,15 +79081,6 @@ let sha512 = "mrG3bJGX4jgWbrpY0ghIpPgCmNhZziFMBJBmZfpIe6K/P1rWPkdkbGihbCUIufgQ8ruX4txE5/CKSeFNzDcYOw=="; }; }; - "webpack-hot-middleware-2.25.2" = { - name = "webpack-hot-middleware"; - packageName = "webpack-hot-middleware"; - version = "2.25.2"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.25.2.tgz"; - sha512 = "CVgm3NAQyfdIonRvXisRwPTUYuSbyZ6BY7782tMeUzWOO7RmVI2NaBYuCp41qyD4gYCkJyTneAJdK69A13B0+A=="; - }; - }; "webpack-log-2.0.0" = { name = "webpack-log"; packageName = "webpack-log"; @@ -79837,31 +79090,13 @@ let sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg=="; }; }; - "webpack-manifest-plugin-2.2.0" = { + "webpack-manifest-plugin-4.1.1" = { name = "webpack-manifest-plugin"; packageName = "webpack-manifest-plugin"; - version = "2.2.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-2.2.0.tgz"; - sha512 = "9S6YyKKKh/Oz/eryM1RyLVDVmy3NSPV0JXMRhZ18fJsq+AwGxUY34X54VNwkzYcEmEkDwNxuEOboCZEebJXBAQ=="; - }; - }; - "webpack-manifest-plugin-5.0.0" = { - name = "webpack-manifest-plugin"; - packageName = "webpack-manifest-plugin"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-5.0.0.tgz"; - sha512 = "8RQfMAdc5Uw3QbCQ/CBV/AXqOR8mt03B6GJmRbhWopE8GzRfEpn+k0ZuWywxW+5QZsffhmFDY1J6ohqJo+eMuw=="; - }; - }; - "webpack-md5-hash-0.0.6" = { - name = "webpack-md5-hash"; - packageName = "webpack-md5-hash"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-md5-hash/-/webpack-md5-hash-0.0.6.tgz"; - sha512 = "HrQ0AJpeXHRa3IjsgyyEfTx8EqYs5y/4x/WklSYsNDcqBixHzCkrmJV5U+4ks+sx7ycKoIdqWLdyuk913FCS+Q=="; + url = "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz"; + sha512 = "YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow=="; }; }; "webpack-merge-4.2.2" = { @@ -79945,24 +79180,6 @@ let sha512 = "UlTm7Yz4meJV0THhZMrgRTE9v/vZ0xfUoJ/eOig98TvzsqNiW+FLSv5WaZeML3uJUPrMQ6K5jo1FJJFXNCc8+g=="; }; }; - "webrtc-adapter-6.4.8" = { - name = "webrtc-adapter"; - packageName = "webrtc-adapter"; - version = "6.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-6.4.8.tgz"; - sha512 = "YM8yl545c/JhYcjGHgaCoA7jRK/KZuMwEDFeP2AcP0Auv5awEd+gZE0hXy9z7Ed3p9HvAXp8jdbe+4ESb1zxAw=="; - }; - }; - "websocket-driver-0.6.5" = { - name = "websocket-driver"; - packageName = "websocket-driver"; - version = "0.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"; - sha512 = "oBx6ZM1Gs5q2jwZuSN/Qxyy/fbgomV8+vqsmipaPKB/74hjHlKuM07jNmRhn4qa2AdUwsgxrltq+gaPsHgcl0Q=="; - }; - }; "websocket-driver-0.7.4" = { name = "websocket-driver"; packageName = "websocket-driver"; @@ -79990,13 +79207,13 @@ let sha512 = "7iZ+u28Ljw5hCnMiq0BCOeSYf0vCFQe/ORY0HgscTiKjQed8WqugpBUggJ2NTnB9fahn1kEnPRX2jf8Px5PhJw=="; }; }; - "webtorrent-1.9.1" = { + "webtorrent-1.9.7" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.9.1"; + version = "1.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.9.1.tgz"; - sha512 = "lFVMY1+GmTJlPAzEuWqQKP3/83c4bGFuJGPjI0lFRgYvUeQqxHv2Qwriz1SOK96MKuhMPKS9y4kf1CddZzoBjQ=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.9.7.tgz"; + sha512 = "N+hRuVctWviTAYem/sI6tuFP2J/Rn3/ETEh++7GnJv6Oro49kDjcPuz1W6s+vfS65xKr3Eh4HMuxf3hH82LGfg=="; }; }; "webworkify-webpack-2.1.5" = { @@ -80152,6 +79369,15 @@ let sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; + "which-3.0.0" = { + name = "which"; + packageName = "which"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-3.0.0.tgz"; + sha512 = "nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ=="; + }; + }; "which-boxed-primitive-1.0.2" = { name = "which-boxed-primitive"; packageName = "which-boxed-primitive"; @@ -80458,6 +79684,15 @@ let sha512 = "J5Zu4p0tojLde8mIOyDSsmLmcP8I3Z6wtwpTDHx1+hGcdhxcJaAmG4CFtagkb+NiN1M9Ek4b42pzMWqfc9jm8w=="; }; }; + "winston-2.4.7" = { + name = "winston"; + packageName = "winston"; + version = "2.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-2.4.7.tgz"; + sha512 = "vLB4BqzCKDnnZH9PHGoS2ycawueX4HLqENXQitvFHczhgW2vFpSOn31LZtVr1KU8YTw7DS4tM+cqyovxo8taVg=="; + }; + }; "winston-3.3.3" = { name = "winston"; packageName = "winston"; @@ -80539,13 +79774,13 @@ let sha512 = "U0IUQHKXXn6PFo9nqsHphVCE5m3IntqZNB9Jjn7EB1lrR7YTDY3YWgFvEvwniTzXSvOH/XMzAZaIfJF/LvHYXg=="; }; }; - "wonka-6.1.1" = { + "wonka-6.1.2" = { name = "wonka"; packageName = "wonka"; - version = "6.1.1"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/wonka/-/wonka-6.1.1.tgz"; - sha512 = "shBtyZ0KFvUadtnDGlTRA4mF4pgcRoyZKikdputKhmShoXWcZDvlg6CUw6Jx9nTL7Ub8QUJoIarPpxdlosg9cw=="; + url = "https://registry.npmjs.org/wonka/-/wonka-6.1.2.tgz"; + sha512 = "zNrXPMccg/7OEp9tSfFkMgTvhhowqasiSHdJ3eCZolXxVTV/aT6HUTofoZk9gwRbGoFey/Nss3JaZKUMKMbofg=="; }; }; "word-wrap-1.2.3" = { @@ -80593,6 +79828,15 @@ let sha512 = "mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw=="; }; }; + "wordwrapjs-4.0.1" = { + name = "wordwrapjs"; + packageName = "wordwrapjs"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.1.tgz"; + sha512 = "kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA=="; + }; + }; "worker-farm-1.5.2" = { name = "worker-farm"; packageName = "worker-farm"; @@ -80629,13 +79873,13 @@ let sha512 = "ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw=="; }; }; - "workerpool-6.3.0" = { + "workerpool-6.3.1" = { name = "workerpool"; packageName = "workerpool"; - version = "6.3.0"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.3.0.tgz"; - sha512 = "2rVusseHGwxEEESx/szO2SHfi982WQavL2YlWGHsZE2ynZ4gaHT7kmCXph9k9fUivKOwx7PBn6vn4nXUxxdKcw=="; + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.3.1.tgz"; + sha512 = "0x7gJm1rhpn5SPG9NENOxPtbfUZZtK/qOg6gEdSqeDBA3dTeR91RJqSPjccPRCkhNfrnnl/dWxSSj5w9CtdzNA=="; }; }; "wrap-ansi-2.1.0" = { @@ -80692,13 +79936,13 @@ let sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; }; }; - "wrap-ansi-8.0.1" = { + "wrap-ansi-8.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; - version = "8.0.1"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.0.1.tgz"; - sha512 = "QFF+ufAqhoYHvoHdajT/Po7KoXVBPXS2bgjIam5isfWJPfIOnQZ50JtUiVvCv/sjgacf3yRrt2ZKUZ/V4itN4g=="; + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz"; + sha512 = "si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ=="; }; }; "wrap-fn-0.1.5" = { @@ -80827,6 +80071,15 @@ let sha512 = "v2UQ+50TNf2rNHJ8NyWttfm/EJUBWMJcx6ZTYZr6Qp52uuegWw/lBkCtCbnYZEmPRNL61m+u67dAmGxo+HTULA=="; }; }; + "write-yaml-file-4.2.0" = { + name = "write-yaml-file"; + packageName = "write-yaml-file"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-yaml-file/-/write-yaml-file-4.2.0.tgz"; + sha512 = "LwyucHy0uhWqbrOkh9cBluZBeNVxzHjDaE9mwepZG3n3ZlbM4v3ndrFw51zW/NXYFFqP+QWZ72ihtLWTh05e4Q=="; + }; + }; "ws-0.4.31" = { name = "ws"; packageName = "ws"; @@ -80935,15 +80188,6 @@ let sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; }; - "ws-8.10.0" = { - name = "ws"; - packageName = "ws"; - version = "8.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.10.0.tgz"; - sha512 = "+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw=="; - }; - }; "ws-8.11.0" = { name = "ws"; packageName = "ws"; @@ -80953,6 +80197,15 @@ let sha512 = "HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg=="; }; }; + "ws-8.12.0" = { + name = "ws"; + packageName = "ws"; + version = "8.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz"; + sha512 = "kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig=="; + }; + }; "ws-8.2.3" = { name = "ws"; packageName = "ws"; @@ -80980,15 +80233,6 @@ let sha512 = "bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA=="; }; }; - "ws-8.9.0" = { - name = "ws"; - packageName = "ws"; - version = "8.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz"; - sha512 = "Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg=="; - }; - }; "x-default-browser-0.3.1" = { name = "x-default-browser"; packageName = "x-default-browser"; @@ -81016,15 +80260,6 @@ let sha512 = "GojqklwG8gpzOVEVki5KudKNoq7MbbjYZCbyWzEz7tyPA7eleiE0+ePwOWQQRb5fm86rD3S8Tc0tSFf3AOv50w=="; }; }; - "x-xss-protection-1.3.0" = { - name = "x-xss-protection"; - packageName = "x-xss-protection"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.3.0.tgz"; - sha512 = "kpyBI9TlVipZO4diReZMAHWtS0MMa/7Kgx8hwG/EuZLiA6sg4Ah/4TRdASHhRRN3boobzcYgFRUFSgHRge6Qhg=="; - }; - }; "x256-0.0.2" = { name = "x256"; packageName = "x256"; @@ -81097,13 +80332,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.2.55" = { + "xdl-60.0.1" = { name = "xdl"; packageName = "xdl"; - version = "59.2.55"; + version = "60.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.2.55.tgz"; - sha512 = "6XLpWpPFUsjH2gwpvCMRx4vJjszRonX1UxF8LpLYdZi0jZB1fvppweUYJjdQ8RaS62pEm3TBRq+JwB0RIFlFwA=="; + url = "https://registry.npmjs.org/xdl/-/xdl-60.0.1.tgz"; + sha512 = "L9T0faRdF8hH3LUOkYV4dJc43peV3WSYV3l+edonWbNGPdbhhVvbFgriEL9yWJrxlHmTLC/vRJ4unUXGkUTk4A=="; }; }; "xenvar-0.5.1" = { @@ -81151,15 +80386,6 @@ let sha512 = "gwwKa9TwNT8S4dimixE+k4wsOOxK6Rt7ctxGRtuZyT7bWPvJwMTbYLLDKu7WG19vKwDMqMqGkVjbLQquKDY7pw=="; }; }; - "xml-escape-1.1.0" = { - name = "xml-escape"; - packageName = "xml-escape"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xml-escape/-/xml-escape-1.1.0.tgz"; - sha512 = "B/T4sDK8Z6aUh/qNr7mjKAwwncIljFuUP+DO/D5hloYFj+90O88z8Wf7oSucZTHxBAsC1/CTP4rtx/x1Uf72Mg=="; - }; - }; "xml-js-1.6.11" = { name = "xml-js"; packageName = "xml-js"; @@ -81268,15 +80494,6 @@ let sha512 = "t3QW+VdXvxcy214Wf5Mvb+38RPW6EUG1RpMjjtG+esbAFh+/50PdXz1iGywefNl70DW2ucNWTXBw5buTgzDWyw=="; }; }; - "xmlbuilder-10.1.1" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "10.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-10.1.1.tgz"; - sha512 = "OyzrcFLL/nb6fMGHbiRDuPup9ljBycsdCypwuyg5AAHvyWzGfChJpCXMG88AGTIMFhGZ9RccFN1e6lhg3hkwKg=="; - }; - }; "xmlbuilder-11.0.1" = { name = "xmlbuilder"; packageName = "xmlbuilder"; @@ -81467,6 +80684,15 @@ let sha512 = "xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA=="; }; }; + "xregexp-4.0.0" = { + name = "xregexp"; + packageName = "xregexp"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz"; + sha512 = "PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg=="; + }; + }; "xsalsa20-1.2.0" = { name = "xsalsa20"; packageName = "xsalsa20"; @@ -81503,6 +80729,15 @@ let sha512 = "F6WF5s6xG/bm8Oxi2ETuzwGQW8yleL5I4JPxZl49m7Uw7D4LAXu+4dvUK78Uo4D863sM8auqw6+1Xmj9mFlmDQ=="; }; }; + "xstate-4.35.3" = { + name = "xstate"; + packageName = "xstate"; + version = "4.35.3"; + src = fetchurl { + url = "https://registry.npmjs.org/xstate/-/xstate-4.35.3.tgz"; + sha512 = "/vM8la6OPcmT2P4R8p37P/Pzo8fTeEjvg+lxCfQ7vTeJg6NmzPHDJ5RdlrGfojEIabMxKW22Tm2kz8oV390Awg=="; + }; + }; "xstream-11.14.0" = { name = "xstream"; packageName = "xstream"; @@ -81548,15 +80783,6 @@ let sha512 = "ibF0Or+FivM9lNrg+HGJfVX8WJqgo+kCLDc4vx6xMeTce7Aj+DLttKbxxRR/gNLSAelRc1omAPlJ77N/Jem07A=="; }; }; - "xxhashjs-0.2.2" = { - name = "xxhashjs"; - packageName = "xxhashjs"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/xxhashjs/-/xxhashjs-0.2.2.tgz"; - sha512 = "AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw=="; - }; - }; "y18n-3.2.2" = { name = "y18n"; packageName = "y18n"; @@ -81629,22 +80855,13 @@ let sha512 = "5kGSQrzDyjCk0BLuFfjkoUE9vYcoyrwZIZ+GnpOSM9vhkvPjItYiWJ1jpRSo0aU4QmsoNrFwDT4O7XS2UGcBQg=="; }; }; - "yaml-2.1.1" = { + "yaml-2.2.1" = { name = "yaml"; packageName = "yaml"; - version = "2.1.1"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz"; - sha512 = "o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw=="; - }; - }; - "yaml-2.1.3" = { - name = "yaml"; - packageName = "yaml"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-2.1.3.tgz"; - sha512 = "AacA8nRULjKMX2DvWvOAdBZMOfQlypSFkjcOcu9FalllIDJ1kvlREzcdIZmidQUqqeMv7jorHjq2HlLv/+c2lg=="; + url = "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz"; + sha512 = "e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw=="; }; }; "yaml-ast-parser-0.0.43" = { @@ -81818,15 +81035,6 @@ let sha512 = "t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA=="; }; }; - "yargs-17.6.0" = { - name = "yargs"; - packageName = "yargs"; - version = "17.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz"; - sha512 = "8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g=="; - }; - }; "yargs-17.6.2" = { name = "yargs"; packageName = "yargs"; @@ -81962,15 +81170,6 @@ let sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; }; }; - "yargs-parser-21.0.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "21.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz"; - sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="; - }; - }; "yargs-parser-21.1.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -82106,13 +81305,13 @@ let sha512 = "9Ni+uXWeFix9+1t7s1q40zZdbcpdi/OwgD4N4cVaqI+bppPciOOXQ/RSggannwZu8m8zrSWELn6/93G7308jgg=="; }; }; - "yeoman-environment-3.12.1" = { + "yeoman-environment-3.13.0" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "3.12.1"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-3.12.1.tgz"; - sha512 = "q5nC954SE4BEkWFXOwkifbelEZrza6z7vnXCC9bTWvfHjRiaG45eqzv/M6/u4l6PvB/KMmBPgMrACV2mBHE+PQ=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-3.13.0.tgz"; + sha512 = "eBPpBZCvFzx6yk17x+ZrOHp8ADDv6qHradV+SgdugaQKIy9NjEX5AkbwdTHLOgccSTkQ9rN791xvYOu6OmqjBg=="; }; }; "yeoman-generator-5.7.0" = { @@ -82214,6 +81413,15 @@ let sha512 = "7tDlwhrBG+oYFdXNOjILSurpfQyuVgkRe3hB2q8TEssamDHB7BbLWYkYO98nTn0FibfdFroFKDjndbgufAgS/Q=="; }; }; + "z-schema-5.0.5" = { + name = "z-schema"; + packageName = "z-schema"; + version = "5.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/z-schema/-/z-schema-5.0.5.tgz"; + sha512 = "D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q=="; + }; + }; "zen-observable-0.8.15" = { name = "zen-observable"; packageName = "zen-observable"; @@ -82232,13 +81440,13 @@ let sha512 = "QZWQekv6iB72Naeake9hS1KxHlotfRpe+WGNbNx5/ta+R3DNjVO2bswf63gXlWDcs+EMd7XY8HfVQyP1X6T4Zg=="; }; }; - "zeromq-5.2.8" = { + "zeromq-5.3.1" = { name = "zeromq"; packageName = "zeromq"; - version = "5.2.8"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/zeromq/-/zeromq-5.2.8.tgz"; - sha512 = "bXzsk7KOmgLSv1tC0Ms1VXBy90+Rz27ZYf27cLuldRYbpqYpuWJfxxHFhO710t22zgWBnmdUP0m3SKFpLI0u5g=="; + url = "https://registry.npmjs.org/zeromq/-/zeromq-5.3.1.tgz"; + sha512 = "4WDF9bNWWXe8OAI319bVw5dmG4BklEk8wzFGwRQxEzKb+0mgDU5J/jtyZPo0BEusVIU1+3mRQIEdT5LtQn+aAw=="; }; }; "zerr-1.0.4" = { @@ -82295,13 +81503,22 @@ let sha512 = "UzIwO92D0dSFwIRyyqAfRXICITLjF0IP8tRbEK/un7adirMssWZx8xF/1hZNE7t61knWZ+lhEuUvxlu2MO8qqA=="; }; }; - "zwave-js-10.3.0" = { + "zod-3.20.2" = { + name = "zod"; + packageName = "zod"; + version = "3.20.2"; + src = fetchurl { + url = "https://registry.npmjs.org/zod/-/zod-3.20.2.tgz"; + sha512 = "1MzNQdAvO+54H+EaK5YpyEy0T+Ejo/7YLHS93G3RnYWh5gaotGHwGeN/ZO687qEDU2y4CdStQYXVHIgrUl5UVQ=="; + }; + }; + "zwave-js-10.5.4" = { name = "zwave-js"; packageName = "zwave-js"; - version = "10.3.0"; + version = "10.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/zwave-js/-/zwave-js-10.3.0.tgz"; - sha512 = "t1hCpsFYH7ry2E1oJAnbI5PJfP+h9tczoW3fVs7LdVD9IOVKR9x3UHHlmW+H/quDUmXzwXRWb6l6t73xfKFsHw=="; + url = "https://registry.npmjs.org/zwave-js/-/zwave-js-10.5.4.tgz"; + sha512 = "Zo2aSYLYKLUca0Wxp7m1Ju83CZeAvJorKjww9MkIvR85hqi/I5QZCC0nXQ2sQb3q0171tGndtICdfsuAE7dfRg=="; }; }; "zwitch-1.0.5" = { @@ -82313,13 +81530,13 @@ let sha512 = "V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw=="; }; }; - "zwitch-2.0.2" = { + "zwitch-2.0.4" = { name = "zwitch"; packageName = "zwitch"; - version = "2.0.2"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/zwitch/-/zwitch-2.0.2.tgz"; - sha512 = "JZxotl7SxAJH0j7dN4pxsTV6ZLXoLdGME+PsjkL/DaBrVryK9kTGq06GfKrwcSOqypP+fdXGoCHE36b99fWVoA=="; + url = "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz"; + sha512 = "bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A=="; }; }; "zxcvbn-4.4.2" = { @@ -82337,37 +81554,38 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "14.2.8"; + version = "15.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-14.2.8.tgz"; - sha512 = "yJDLSlTFwQhNJlFoXCw8r8iQWNJn9bIjBSdEL0mM9px5EvSxDYGDXwiJRvionlZAL9P4u0d8XeBy3EPyFkAE5Q=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-15.1.3.tgz"; + sha512 = "gNVvyvkGZ1zKiDdWjPqCLst8iHcB1C4B2nXrr3B+/YAd1G/y87VI1aBKFlK9ulG4tkwktog5uQaut7xs48IsEQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1402.8" - sources."@angular-devkit/core-14.2.8" - sources."@angular-devkit/schematics-14.2.8" + sources."@angular-devkit/architect-0.1501.3" + sources."@angular-devkit/core-15.1.3" + sources."@angular-devkit/schematics-15.1.3" sources."@gar/promisify-1.1.3" + sources."@jridgewell/sourcemap-codec-1.4.14" sources."@npmcli/fs-2.1.2" - sources."@npmcli/git-3.0.2" - sources."@npmcli/installed-package-contents-1.0.7" + sources."@npmcli/git-4.0.3" + sources."@npmcli/installed-package-contents-2.0.1" sources."@npmcli/move-file-2.0.1" - sources."@npmcli/node-gyp-2.0.0" - sources."@npmcli/promise-spawn-3.0.0" - sources."@npmcli/run-script-4.2.1" - sources."@schematics/angular-14.2.8" + sources."@npmcli/node-gyp-3.0.0" + sources."@npmcli/promise-spawn-6.0.2" + sources."@npmcli/run-script-6.0.0" + sources."@schematics/angular-15.1.3" sources."@tootallnate/once-2.0.0" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."ajv-formats-2.1.1" sources."ansi-colors-4.1.3" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."aproba-2.0.0" sources."are-we-there-yet-3.0.1" sources."balanced-match-1.0.2" @@ -82378,11 +81596,14 @@ in sources."braces-3.0.2" sources."buffer-5.7.1" sources."builtins-5.0.1" - (sources."cacache-16.1.3" // { + (sources."cacache-17.0.4" // { dependencies = [ + sources."@npmcli/fs-3.1.0" sources."brace-expansion-2.0.1" - sources."glob-8.0.3" - sources."minimatch-5.1.0" + sources."glob-8.1.0" + sources."minimatch-5.1.6" + sources."unique-filename-3.0.0" + sources."unique-slug-4.0.0" ]; }) sources."chalk-4.1.2" @@ -82393,7 +81614,7 @@ in sources."cli-cursor-3.1.0" sources."cli-spinners-2.7.0" sources."cli-width-3.0.0" - sources."cliui-7.0.4" + sources."cliui-8.0.1" sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -82419,7 +81640,7 @@ in sources."fast-deep-equal-3.1.3" sources."figures-3.2.0" sources."fill-range-7.0.1" - sources."fs-minipass-2.1.0" + sources."fs-minipass-3.0.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" @@ -82431,17 +81652,17 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-unicode-2.0.1" - sources."hosted-git-info-5.2.1" - sources."http-cache-semantics-4.1.0" + sources."hosted-git-info-6.1.1" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - (sources."ignore-walk-5.0.1" // { + (sources."ignore-walk-6.0.0" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" ]; }) sources."imurmurhash-0.1.4" @@ -82449,11 +81670,11 @@ in sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-3.0.0" + sources."ini-3.0.1" (sources."inquirer-8.2.4" // { dependencies = [ - sources."rxjs-7.5.7" - sources."tslib-2.4.1" + sources."rxjs-7.8.0" + sources."tslib-2.5.0" ]; }) sources."ip-2.0.0" @@ -82469,48 +81690,87 @@ in sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."json-parse-even-better-errors-2.3.1" + sources."json-parse-even-better-errors-3.0.0" sources."json-schema-traverse-1.0.0" - sources."jsonc-parser-3.1.0" + sources."jsonc-parser-3.2.0" sources."jsonparse-1.3.1" sources."lodash-4.17.21" sources."log-symbols-4.1.0" sources."lru-cache-7.14.1" - sources."magic-string-0.26.2" - sources."make-fetch-happen-10.2.1" + sources."magic-string-0.27.0" + (sources."make-fetch-happen-10.2.1" // { + dependencies = [ + sources."brace-expansion-2.0.1" + sources."cacache-16.1.3" + sources."fs-minipass-2.1.0" + sources."glob-8.1.0" + sources."minimatch-5.1.6" + sources."minipass-3.3.6" + sources."ssri-9.0.1" + ]; + }) sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" - sources."minipass-3.3.5" - sources."minipass-collect-1.0.2" - sources."minipass-fetch-2.1.2" - sources."minipass-flush-1.0.5" - sources."minipass-json-stream-1.0.1" - sources."minipass-pipeline-1.2.4" - sources."minipass-sized-1.0.3" - sources."minizlib-2.1.2" + sources."minipass-4.0.0" + (sources."minipass-collect-1.0.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-fetch-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-flush-1.0.5" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-json-stream-1.0.1" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-pipeline-1.2.4" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-sized-1.0.3" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."negotiator-0.6.3" - sources."node-gyp-9.3.0" - sources."nopt-6.0.0" - sources."normalize-package-data-4.0.1" - sources."normalize-path-3.0.0" - sources."npm-bundled-1.1.2" - sources."npm-install-checks-5.0.0" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-9.1.0" - (sources."npm-packlist-5.1.3" // { + (sources."node-gyp-9.3.1" // { dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-8.0.3" - sources."minimatch-5.1.0" - sources."npm-bundled-2.0.1" - sources."npm-normalize-package-bin-2.0.0" + sources."which-2.0.2" + ]; + }) + sources."nopt-6.0.0" + sources."normalize-package-data-5.0.0" + sources."normalize-path-3.0.0" + sources."npm-bundled-3.0.0" + sources."npm-install-checks-6.0.0" + sources."npm-normalize-package-bin-3.0.0" + sources."npm-package-arg-10.1.0" + sources."npm-packlist-7.0.4" + sources."npm-pick-manifest-8.0.1" + (sources."npm-registry-fetch-14.0.3" // { + dependencies = [ + sources."make-fetch-happen-11.0.2" + sources."minipass-fetch-3.0.1" ]; }) - sources."npm-pick-manifest-7.0.1" - sources."npm-registry-fetch-13.3.1" sources."npmlog-6.0.2" sources."once-1.4.0" sources."onetime-5.1.2" @@ -82518,23 +81778,22 @@ in sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-map-4.0.0" - sources."pacote-13.6.2" + sources."pacote-15.0.8" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" sources."picomatch-2.3.1" - sources."proc-log-2.0.1" + sources."proc-log-3.0.0" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."punycode-2.1.1" - (sources."read-package-json-5.0.2" // { + sources."punycode-2.3.0" + (sources."read-package-json-6.0.0" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-8.0.3" - sources."minimatch-5.1.0" - sources."npm-normalize-package-bin-2.0.0" + sources."glob-8.1.0" + sources."minimatch-5.1.6" ]; }) - sources."read-package-json-fast-2.0.3" + sources."read-package-json-fast-3.0.2" sources."readable-stream-3.6.0" sources."readdirp-3.6.0" sources."require-directory-2.1.1" @@ -82547,7 +81806,7 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - (sources."semver-7.3.7" // { + (sources."semver-7.3.8" // { dependencies = [ sources."lru-cache-6.0.0" ]; @@ -82558,19 +81817,26 @@ in sources."socks-2.7.1" sources."socks-proxy-agent-7.0.0" sources."source-map-0.7.4" - sources."sourcemap-codec-1.4.8" 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.12" - sources."ssri-9.0.1" + sources."ssri-10.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."supports-preserve-symlinks-flag-1.0.0" sources."symbol-observable-4.0.0" - sources."tar-6.1.12" + (sources."tar-6.1.13" // { + dependencies = [ + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + ]; + }) sources."through-2.3.8" sources."tmp-0.0.33" sources."to-regex-range-5.0.1" @@ -82580,17 +81846,16 @@ in sources."unique-slug-3.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" - sources."uuid-8.3.2" sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-4.0.0" + sources."validate-npm-package-name-5.0.0" sources."wcwidth-1.0.1" - sources."which-2.0.2" + sources."which-3.0.0" sources."wide-align-1.1.5" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-17.5.1" + sources."yargs-17.6.2" sources."yargs-parser-21.1.1" ]; buildInputs = globalBuildInputs; @@ -82603,53 +81868,13 @@ in bypassCache = true; reconstructLock = true; }; - "@ansible/ansible-language-server" = nodeEnv.buildNodePackage { - name = "_at_ansible_slash_ansible-language-server"; - packageName = "@ansible/ansible-language-server"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@ansible/ansible-language-server/-/ansible-language-server-1.0.2.tgz"; - sha512 = "z23uIaj9IAdqiB6xHYNOUSrBXJQwQjywMLhKOoejuC7AECXmqLPjYm4cMgiPG3SjO6nmSIe08nq/Qfhu2Bm5ww=="; - }; - dependencies = [ - sources."@flatten-js/interval-tree-1.0.19" - sources."balanced-match-1.0.2" - sources."brace-expansion-2.0.1" - sources."fs.realpath-1.0.0" - sources."glob-8.0.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-3.0.1" - sources."lodash-4.17.21" - sources."minimatch-5.1.0" - sources."once-1.4.0" - sources."uuid-8.3.2" - 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.7" - sources."vscode-languageserver-types-3.16.0" - sources."vscode-uri-3.0.6" - sources."wrappy-1.0.2" - sources."yaml-1.10.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Ansible language server"; - homepage = "https://github.com/ansible/ansible-language-server#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@antfu/ni" = nodeEnv.buildNodePackage { name = "_at_antfu_slash_ni"; packageName = "@antfu/ni"; - version = "0.18.3"; + version = "0.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.18.3.tgz"; - sha512 = "Tjn/lApBYvQhFCw0GgJIdENOk1m6LxucvPqBnCfWQRc2tI+uxtAvJljxiSR9s5B/gtMahGBsB6Hs7H8HZIOY6Q=="; + url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.19.0.tgz"; + sha512 = "33VKTuBjoW2canoVMGa4g5oGCg7KK8UVmBBmUKzvQ+Fa69kk2YI8sqt94WCpvSWmW/yD5ZXsD9G9s689b9KwwQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -82684,7 +81909,7 @@ in sources."buffer-6.0.3" sources."colorette-2.0.19" sources."commander-9.4.1" - sources."convict-6.2.3" + sources."convict-6.2.4" sources."dateformat-4.6.3" sources."end-of-stream-1.4.4" sources."event-target-shim-5.0.1" @@ -82693,8 +81918,8 @@ in sources."fast-redact-3.1.2" sources."fast-safe-stringify-2.1.1" sources."fs.realpath-1.0.0" - sources."glob-8.0.3" - (sources."help-me-4.1.0" // { + sources."glob-8.1.0" + (sources."help-me-4.2.0" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -82704,30 +81929,30 @@ in sources."inherits-2.0.4" sources."joycon-3.1.1" sources."js-yaml-4.1.0" - sources."json5-2.2.1" + sources."json5-2.2.3" sources."lodash.clonedeep-4.5.0" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" sources."minimist-1.2.7" sources."on-exit-leak-free-2.1.0" sources."once-1.4.0" sources."pino-8.7.0" sources."pino-abstract-transport-1.0.0" sources."pino-pretty-9.1.1" - sources."pino-std-serializers-6.0.0" + sources."pino-std-serializers-6.1.0" sources."process-0.11.10" - sources."process-warning-2.0.0" + sources."process-warning-2.1.0" sources."pump-3.0.0" sources."quick-format-unescaped-4.0.4" - sources."readable-stream-4.2.0" + sources."readable-stream-4.3.0" sources."real-require-0.2.0" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-2.4.1" - sources."secure-json-parse-2.5.0" - sources."sonic-boom-3.2.0" + sources."safe-stable-stringify-2.4.2" + sources."secure-json-parse-2.7.0" + sources."sonic-boom-3.2.1" sources."split2-4.1.0" sources."string_decoder-1.3.0" sources."strip-json-comments-3.1.1" - sources."thread-stream-2.2.0" + sources."thread-stream-2.3.0" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" sources."yargs-parser-20.2.9" @@ -82796,7 +82021,7 @@ in sources."colorette-2.0.19" sources."concat-map-0.0.1" sources."convert-source-map-1.9.0" - sources."convict-6.2.3" + sources."convict-6.2.4" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."dateformat-4.6.3" @@ -82821,7 +82046,7 @@ in sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.1.3" sources."glob-parent-6.0.2" (sources."glob-stream-7.0.0" // { @@ -82835,16 +82060,16 @@ in sources."has-1.0.3" sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" - (sources."help-me-4.1.0" // { + (sources."help-me-4.2.0" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-8.0.3" - sources."minimatch-5.1.0" + sources."glob-8.1.0" + sources."minimatch-5.1.6" ]; }) sources."hpagent-1.1.0" sources."ieee754-1.2.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-absolute-1.0.0" @@ -82863,7 +82088,7 @@ in sources."joycon-3.1.1" sources."js-yaml-4.1.0" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.2.1" + sources."json5-2.2.3" (sources."lazystream-1.0.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -82899,18 +82124,18 @@ in sources."pino-8.7.0" (sources."pino-abstract-transport-1.0.0" // { dependencies = [ - sources."readable-stream-4.2.0" + sources."readable-stream-4.3.0" ]; }) (sources."pino-pretty-9.1.1" // { dependencies = [ - sources."readable-stream-4.2.0" + sources."readable-stream-4.3.0" ]; }) - sources."pino-std-serializers-6.0.0" + sources."pino-std-serializers-6.1.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" - sources."process-warning-2.0.0" + sources."process-warning-2.1.0" sources."progress-2.0.3" sources."pump-3.0.0" sources."pumpify-2.0.1" @@ -82925,19 +82150,19 @@ in sources."require-from-string-2.0.2" sources."resolve-options-1.1.0" sources."safe-buffer-5.1.2" - sources."safe-stable-stringify-2.4.1" - sources."secure-json-parse-2.5.0" + sources."safe-stable-stringify-2.4.2" + sources."secure-json-parse-2.7.0" sources."sha.js-2.4.11" sources."should-proxy-1.0.4" sources."simple-concat-1.0.1" sources."simple-get-4.0.1" - sources."sonic-boom-3.2.0" + sources."sonic-boom-3.2.1" sources."source-map-0.6.1" sources."split2-4.1.0" sources."stream-shift-1.0.1" sources."string_decoder-1.1.1" sources."strip-json-comments-3.1.1" - sources."thread-stream-2.2.0" + sources."thread-stream-2.3.0" sources."through-2.3.8" (sources."through2-2.0.5" // { dependencies = [ @@ -82988,22 +82213,26 @@ in "@astrojs/language-server" = nodeEnv.buildNodePackage { name = "_at_astrojs_slash_language-server"; packageName = "@astrojs/language-server"; - version = "0.28.1"; + version = "0.29.5"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.28.1.tgz"; - sha512 = "PhWuvsmmWziD5KFB1J84IeRoWDUgl1Gb8l7Vz6feJdQ3vjTsykT0hMpiht8wp0CtXbY+c8ee3DuV5ZFUvtI/5g=="; + url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.29.5.tgz"; + sha512 = "HRPpAicAE+nyuC7wX3f8W2HOcXgWOU+++hZk1290wQUp1SUHAziZ4VWtnqMAm9n8h4VfS09yM/cvXOtHzGd/BQ=="; }; dependencies = [ - sources."@astrojs/compiler-0.27.2" + sources."@astrojs/compiler-0.31.4" sources."@emmetio/abbreviation-2.2.3" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.17" sources."@pkgr/utils-2.3.1" - (sources."@vscode/emmet-helper-2.8.4" // { + (sources."@vscode/emmet-helper-2.8.6" // { dependencies = [ sources."vscode-uri-2.1.2" ]; }) + sources."@vscode/l10n-0.0.11" sources."cross-spawn-7.0.3" sources."define-lazy-prop-2.0.0" sources."emmet-2.3.6" @@ -83019,26 +82248,24 @@ in sources."open-8.4.0" sources."path-key-3.1.1" sources."picocolors-1.0.0" - sources."prettier-2.7.1" - sources."prettier-plugin-astro-0.6.0" + sources."prettier-2.8.3" + sources."prettier-plugin-astro-0.7.2" sources."s.color-0.0.15" sources."sass-formatter-0.7.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."source-map-0.7.4" sources."suf-log-2.5.3" - sources."synckit-0.8.4" + sources."synckit-0.8.5" sources."tiny-glob-0.2.9" - sources."tslib-2.4.1" - sources."vscode-css-languageservice-6.1.1" - sources."vscode-html-languageservice-5.0.2" + sources."tslib-2.5.0" + sources."vscode-css-languageservice-6.2.3" + sources."vscode-html-languageservice-5.0.4" sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" sources."vscode-languageserver-protocol-3.17.2" - sources."vscode-languageserver-textdocument-1.0.7" + sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-languageserver-types-3.17.2" - sources."vscode-nls-5.2.0" - sources."vscode-uri-3.0.6" + sources."vscode-uri-3.0.7" sources."which-2.0.2" ]; buildInputs = globalBuildInputs; @@ -83053,24 +82280,69 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "2022.10.0"; + version = "2023.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-2022.10.0.tgz"; - sha512 = "2Qp/A5oQqbqjH9n1xy+OoCjOx5fF4Wq48Vq0ppiGAkb1rlCHWIIw0MPxYlR9AGUkj9OyHYhkLr/UzXW0GoB/CA=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-2023.1.0.tgz"; + sha512 = "/90Op7H2EAsqbkEgJYUhgogf08m0QtS+pE5DaPcGvJDB6JNuQldRA//qmQIHPGAJiOsu6jb3/zIvRPNWEiyjsg=="; }; dependencies = [ - (sources."@koa/multer-3.0.0" // { + sources."@ampproject/remapping-2.2.0" + sources."@babel/code-frame-7.18.6" + sources."@babel/compat-data-7.20.14" + sources."@babel/core-7.20.12" + (sources."@babel/generator-7.20.14" // { + dependencies = [ + sources."@jridgewell/gen-mapping-0.3.2" + ]; + }) + sources."@babel/helper-compilation-targets-7.20.7" + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-function-name-7.19.0" + sources."@babel/helper-hoist-variables-7.18.6" + sources."@babel/helper-module-imports-7.18.6" + sources."@babel/helper-module-transforms-7.20.11" + sources."@babel/helper-plugin-utils-7.20.2" + sources."@babel/helper-simple-access-7.20.2" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-string-parser-7.19.4" + sources."@babel/helper-validator-identifier-7.19.1" + sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helpers-7.20.13" + (sources."@babel/highlight-7.18.6" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) + sources."@babel/parser-7.20.13" + sources."@babel/plugin-proposal-export-namespace-from-7.18.9" + sources."@babel/plugin-syntax-export-namespace-from-7.8.3" + sources."@babel/plugin-transform-modules-commonjs-7.20.11" + sources."@babel/template-7.20.7" + sources."@babel/traverse-7.20.13" + sources."@babel/types-7.20.7" + sources."@jridgewell/gen-mapping-0.1.1" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/set-array-1.1.2" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.17" + (sources."@koa/multer-3.0.2" // { dependencies = [ sources."multer-1.4.4" ]; }) sources."@koa/router-10.1.1" - sources."@mapbox/node-pre-gyp-1.0.10" + (sources."@mapbox/node-pre-gyp-1.0.10" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."semver-7.3.8" + sources."yallist-4.0.0" + ]; + }) sources."@tootallnate/once-1.1.2" sources."abab-2.0.6" sources."abbrev-1.1.1" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -83080,7 +82352,7 @@ in 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."ansi-styles-3.2.1" sources."append-field-1.0.0" sources."aproba-2.0.0" (sources."are-we-there-yet-2.0.0" // { @@ -83096,22 +82368,32 @@ in sources."brace-expansion-1.1.11" sources."browser-hrtime-1.1.8" sources."browser-process-hrtime-1.0.0" + sources."browserslist-4.21.4" sources."buffer-from-1.1.2" sources."bufferutil-4.0.7" sources."busboy-0.2.14" sources."bytes-3.1.2" sources."cache-content-type-1.0.1" sources."call-bind-1.0.2" - sources."canvas-2.10.2" - sources."chalk-4.1.2" + sources."caniuse-lite-1.0.30001449" + sources."canvas-2.11.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."chardet-0.7.0" sources."chownr-2.0.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."color-convert-1.9.3" + sources."color-name-1.1.3" sources."color-support-1.1.3" sources."combined-stream-1.0.8" sources."commander-7.2.0" @@ -83130,6 +82412,7 @@ in ]; }) sources."content-type-1.0.4" + sources."convert-source-map-1.9.0" (sources."cookies-0.8.0" // { dependencies = [ sources."depd-2.0.0" @@ -83145,7 +82428,7 @@ in }) sources."data-urls-2.0.0" sources."debug-4.3.4" - sources."decimal.js-10.4.2" + sources."decimal.js-10.4.3" sources."decompress-response-4.2.1" sources."deep-equal-1.0.1" sources."deep-is-0.1.4" @@ -83162,6 +82445,7 @@ in ]; }) sources."ee-first-1.1.1" + sources."electron-to-chromium-1.4.284" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { @@ -83169,6 +82453,7 @@ in sources."iconv-lite-0.6.3" ]; }) + sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."escodegen-2.0.0" @@ -83178,17 +82463,25 @@ in sources."external-editor-3.1.0" sources."fast-levenshtein-2.0.6" sources."figures-3.2.0" + sources."fix-esm-1.0.1" sources."form-data-4.0.0" sources."fresh-0.5.2" - sources."fs-minipass-2.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-3.0.2" - sources."get-intrinsic-1.1.3" + sources."gensync-1.0.0-beta.2" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" + sources."globals-11.12.0" sources."graceful-fs-4.2.10" sources."has-1.0.3" - sources."has-flag-4.0.0" + sources."has-flag-3.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" @@ -83214,12 +82507,15 @@ in sources."is-promise-2.2.2" sources."is-wsl-2.2.0" sources."isarray-0.0.1" + sources."js-tokens-4.0.0" (sources."jsdom-16.7.0" // { dependencies = [ sources."form-data-3.0.1" ]; }) + sources."jsesc-2.5.2" sources."json-stringify-safe-5.0.1" + sources."json5-2.2.3" (sources."jszip-3.10.1" // { dependencies = [ sources."isarray-1.0.0" @@ -83228,7 +82524,7 @@ in ]; }) sources."keygrip-1.1.0" - (sources."koa-2.13.4" // { + (sources."koa-2.14.1" // { dependencies = [ sources."depd-2.0.0" ]; @@ -83242,13 +82538,9 @@ in sources."lie-3.3.0" sources."lodash-4.17.21" sources."lowdb-1.0.0" - sources."lru-cache-6.0.0" + sources."lru-cache-5.1.1" sources."lunr-2.3.9" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) + sources."make-dir-3.1.0" sources."media-typer-0.3.0" sources."methods-1.1.2" sources."mime-db-1.52.0" @@ -83257,8 +82549,17 @@ in sources."mimic-response-2.1.0" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-3.3.5" - sources."minizlib-2.1.2" + (sources."minipass-4.0.0" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."mkdirp-0.5.6" sources."ms-2.1.2" (sources."multer-1.4.5-lts.1" // { @@ -83270,7 +82571,7 @@ in sources."mute-stream-0.0.8" sources."nan-2.17.0" sources."negotiator-0.6.3" - (sources."node-fetch-2.6.7" // { + (sources."node-fetch-2.6.8" // { dependencies = [ sources."tr46-0.0.3" sources."webidl-conversions-3.0.1" @@ -83278,12 +82579,13 @@ in ]; }) sources."node-forge-1.3.1" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" + sources."node-releases-2.0.8" sources."nopt-5.0.0" sources."npmlog-5.0.1" sources."nwsapi-2.2.2" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."on-finished-2.4.1" sources."once-1.4.0" sources."onetime-5.1.2" @@ -83297,12 +82599,13 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-6.2.1" + sources."picocolors-1.0.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.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."querystringify-2.2.0" (sources."raw-body-2.5.1" // { @@ -83318,15 +82621,15 @@ in sources."retry-0.12.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" - (sources."rxjs-7.5.7" // { + (sources."rxjs-7.8.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."saxes-5.0.1" - sources."semver-7.3.8" + sources."semver-6.3.0" sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."setprototypeof-1.2.0" @@ -83348,20 +82651,19 @@ in sources."string-width-4.2.3" sources."string_decoder-0.10.31" sources."strip-ansi-6.0.1" - sources."supports-color-7.2.0" + sources."supports-color-5.5.0" sources."symbol-tree-3.2.4" - (sources."tar-6.1.12" // { + (sources."tar-6.1.13" // { dependencies = [ sources."mkdirp-1.0.4" + sources."yallist-4.0.0" ]; }) sources."through-2.3.8" - (sources."tldjs-2.3.1" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tldts-5.7.104" + sources."tldts-core-5.7.104" sources."tmp-0.0.33" + sources."to-fast-properties-2.0.0" sources."toidentifier-1.0.1" sources."tough-cookie-4.1.2" sources."tr46-2.1.0" @@ -83373,6 +82675,7 @@ in sources."typedarray-0.0.6" sources."universalify-0.2.0" sources."unpipe-1.0.0" + sources."update-browserslist-db-1.0.10" sources."url-parse-1.5.10" sources."utf-8-validate-5.0.10" sources."util-deprecate-1.0.2" @@ -83390,7 +82693,7 @@ in sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."xtend-4.0.2" - sources."yallist-4.0.0" + sources."yallist-3.1.1" sources."ylru-1.3.2" sources."zxcvbn-4.4.2" ]; @@ -83407,10 +82710,10 @@ in "@commitlint/cli" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; - version = "17.2.0"; + version = "17.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/cli/-/cli-17.2.0.tgz"; - sha512 = "kd1zykcrjIKyDRftWW1E1TJqkgzeosEkv1BiYPCdzkb/g/3BrfgwZUHR1vg+HO3qKUb/0dN+jNXArhGGAHpmaQ=="; + url = "https://registry.npmjs.org/@commitlint/cli/-/cli-17.4.2.tgz"; + sha512 = "0rPGJ2O1owhpxMIXL9YJ2CgPkdrFLKZElIZHXDN8L8+qWK1DGH7Q7IelBT1pchXTYTuDlqkOTdh//aTvT3bSUA=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -83425,20 +82728,20 @@ in sources."supports-color-5.5.0" ]; }) - sources."@commitlint/config-validator-17.1.0" - sources."@commitlint/ensure-17.0.0" - sources."@commitlint/execute-rule-17.0.0" - sources."@commitlint/format-17.0.0" - sources."@commitlint/is-ignored-17.2.0" - sources."@commitlint/lint-17.2.0" - sources."@commitlint/load-17.2.0" - sources."@commitlint/message-17.2.0" - sources."@commitlint/parse-17.2.0" - sources."@commitlint/read-17.2.0" - sources."@commitlint/resolve-extends-17.1.0" - sources."@commitlint/rules-17.2.0" - sources."@commitlint/to-lines-17.0.0" - (sources."@commitlint/top-level-17.0.0" // { + sources."@commitlint/config-validator-17.4.0" + sources."@commitlint/ensure-17.4.0" + sources."@commitlint/execute-rule-17.4.0" + sources."@commitlint/format-17.4.0" + sources."@commitlint/is-ignored-17.4.2" + sources."@commitlint/lint-17.4.2" + sources."@commitlint/load-17.4.2" + sources."@commitlint/message-17.4.2" + sources."@commitlint/parse-17.4.2" + sources."@commitlint/read-17.4.2" + sources."@commitlint/resolve-extends-17.4.0" + sources."@commitlint/rules-17.4.2" + sources."@commitlint/to-lines-17.4.0" + (sources."@commitlint/top-level-17.4.0" // { dependencies = [ sources."find-up-5.0.0" sources."locate-path-6.0.0" @@ -83446,38 +82749,38 @@ in sources."p-locate-5.0.0" ]; }) - sources."@commitlint/types-17.0.0" + sources."@commitlint/types-17.4.0" sources."@cspotcode/source-map-support-0.8.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.14" - sources."@swc/core-darwin-arm64-1.3.14" - sources."@swc/core-darwin-x64-1.3.14" - sources."@swc/core-linux-arm-gnueabihf-1.3.14" - sources."@swc/core-linux-arm64-gnu-1.3.14" - sources."@swc/core-linux-arm64-musl-1.3.14" - sources."@swc/core-linux-x64-gnu-1.3.14" - sources."@swc/core-linux-x64-musl-1.3.14" - sources."@swc/core-win32-arm64-msvc-1.3.14" - sources."@swc/core-win32-ia32-msvc-1.3.14" - sources."@swc/core-win32-x64-msvc-1.3.14" - sources."@swc/wasm-1.3.14" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" sources."@types/minimist-1.2.2" - sources."@types/node-14.18.33" + sources."@types/node-18.11.18" sources."@types/normalize-package-data-2.4.1" - sources."@types/parse-json-4.0.0" sources."JSONStream-1.3.5" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."arg-4.1.3" + sources."argparse-2.0.1" sources."array-ify-1.0.0" sources."arrify-1.0.1" sources."callsites-3.1.0" @@ -83490,8 +82793,8 @@ in sources."compare-func-2.0.0" sources."conventional-changelog-angular-5.0.13" sources."conventional-commits-parser-3.2.4" - sources."cosmiconfig-7.0.1" - sources."cosmiconfig-typescript-loader-4.2.0" + sources."cosmiconfig-8.0.0" + sources."cosmiconfig-typescript-loader-4.3.0" sources."create-require-1.1.1" sources."cross-spawn-7.0.3" sources."dargs-7.0.0" @@ -83510,7 +82813,7 @@ in sources."execa-5.1.1" sources."fast-deep-equal-3.1.3" sources."find-up-4.1.0" - sources."fs-extra-10.1.0" + sources."fs-extra-11.1.0" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."get-stream-6.0.1" @@ -83539,6 +82842,7 @@ in sources."is-text-path-1.0.1" sources."isexe-2.0.0" sources."js-tokens-4.0.0" + sources."js-yaml-4.1.0" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-1.0.0" sources."jsonfile-6.1.0" @@ -83547,6 +82851,16 @@ in sources."lines-and-columns-1.2.4" sources."locate-path-5.0.0" sources."lodash-4.17.21" + sources."lodash.camelcase-4.3.0" + sources."lodash.isfunction-3.0.9" + sources."lodash.isplainobject-4.0.6" + sources."lodash.kebabcase-4.1.1" + sources."lodash.merge-4.6.2" + sources."lodash.mergewith-4.6.2" + sources."lodash.snakecase-4.1.1" + sources."lodash.startcase-4.4.0" + sources."lodash.uniq-4.5.0" + sources."lodash.upperfirst-4.3.1" sources."lru-cache-6.0.0" sources."make-error-1.3.6" sources."map-obj-4.3.0" @@ -83568,7 +82882,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-type-4.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."q-1.5.1" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { @@ -83592,7 +82906,7 @@ in sources."resolve-from-5.0.0" sources."resolve-global-1.0.0" sources."safe-buffer-5.2.1" - sources."semver-7.3.7" + sources."semver-7.3.8" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" @@ -83614,7 +82928,7 @@ in sources."trim-newlines-3.0.1" sources."ts-node-10.9.1" sources."type-fest-0.18.1" - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" @@ -83624,7 +82938,6 @@ in sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yaml-1.10.2" (sources."yargs-17.6.2" // { dependencies = [ sources."yargs-parser-21.1.1" @@ -83647,10 +82960,10 @@ in "@commitlint/config-conventional" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_config-conventional"; packageName = "@commitlint/config-conventional"; - version = "17.2.0"; + version = "17.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.2.0.tgz"; - sha512 = "g5hQqRa80f++SYS233dbDSg16YdyounMTAhVcmqtInNeY/GF3aA4st9SVtJxpeGrGmueMrU4L+BBb+6Vs5wrcg=="; + url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.4.2.tgz"; + sha512 = "JVo1moSj5eDMoql159q8zKCU8lkOhQ+b23Vl3LVVrS6PXDLQIELnJ34ChQmFVbBdSSRNAbbXnRDhosFU+wnuHw=="; }; dependencies = [ sources."array-ify-1.0.0" @@ -83674,10 +82987,10 @@ in "@emacs-eask/cli" = nodeEnv.buildNodePackage { name = "_at_emacs-eask_slash_cli"; packageName = "@emacs-eask/cli"; - version = "0.7.2"; + version = "0.7.10"; src = fetchurl { - url = "https://registry.npmjs.org/@emacs-eask/cli/-/cli-0.7.2.tgz"; - sha512 = "TJegixuQ7yuuNFSXkIxww3BTNrFbVZULi9HTnveYnG5HnB8jfTBM+QUqpCBuSEz2yrVIQGNNCRgGPmDk9KRlyg=="; + url = "https://registry.npmjs.org/@emacs-eask/cli/-/cli-0.7.10.tgz"; + sha512 = "Gwr5PsyH+JSsM3jaJLW00EqwMD151wu0v3lBa58mnbBVVXOEG6Fnynv9jE9vLzOkhAVcDH9dtCtYlurDH7/YZg=="; }; dependencies = [ sources."ansi-regex-5.0.1" @@ -83710,10 +83023,10 @@ in "@forge/cli" = nodeEnv.buildNodePackage { name = "_at_forge_slash_cli"; packageName = "@forge/cli"; - version = "6.0.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/cli/-/cli-6.0.0.tgz"; - sha512 = "GWffWsgbgFx/M22je/HMQYr9Pkh+Z0kr/ghxeTLddFkfJyykR55oeoCVzm93D3pxnce+7FXQc+LSKIVSBtY4BQ=="; + url = "https://registry.npmjs.org/@forge/cli/-/cli-6.4.1.tgz"; + sha512 = "tG2Zoq63T256wmA9BteJwFqef2qFxySHurs1WOZ4j1Dnz23w2tQLa86X0Sz3P6/43td+j74TMklPqRdu1jJIEg=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" @@ -83724,58 +83037,58 @@ in ]; }) sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.1" - sources."@babel/core-7.20.2" - (sources."@babel/generator-7.20.2" // { + sources."@babel/compat-data-7.20.14" + sources."@babel/core-7.20.12" + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; }) sources."@babel/helper-annotate-as-pure-7.18.6" - sources."@babel/helper-compilation-targets-7.20.0" - sources."@babel/helper-create-class-features-plugin-7.20.2" + sources."@babel/helper-compilation-targets-7.20.7" + sources."@babel/helper-create-class-features-plugin-7.20.12" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.18.9" + sources."@babel/helper-member-expression-to-functions-7.20.7" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.2" + sources."@babel/helper-module-transforms-7.20.11" sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.20.2" - sources."@babel/helper-replace-supers-7.19.1" + sources."@babel/helper-replace-supers-7.20.7" sources."@babel/helper-simple-access-7.20.2" sources."@babel/helper-skip-transparent-expression-wrappers-7.20.0" sources."@babel/helper-split-export-declaration-7.18.6" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.1" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.2" + sources."@babel/parser-7.20.13" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-optional-chaining-7.18.9" + sources."@babel/plugin-proposal-optional-chaining-7.20.7" sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-typescript-7.20.0" - sources."@babel/plugin-transform-react-jsx-7.19.0" - sources."@babel/plugin-transform-typescript-7.20.2" + sources."@babel/plugin-transform-react-jsx-7.20.13" + sources."@babel/plugin-transform-typescript-7.20.13" sources."@babel/preset-typescript-7.18.6" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.20.1" - sources."@babel/types-7.20.2" + sources."@babel/template-7.20.7" + sources."@babel/traverse-7.20.13" + sources."@babel/types-7.20.7" sources."@colors/colors-1.5.0" sources."@discoveryjs/json-ext-0.5.7" - sources."@forge/api-2.8.0" + sources."@forge/api-2.10.0" (sources."@forge/auth-0.0.1" // { dependencies = [ sources."tslib-1.14.1" ]; }) sources."@forge/babel-plugin-transform-ui-1.1.0" - sources."@forge/bundler-4.0.0" - (sources."@forge/cli-shared-3.2.2" // { + sources."@forge/bundler-4.3.0" + (sources."@forge/cli-shared-3.5.1" // { dependencies = [ sources."glob-7.2.3" ]; @@ -83783,12 +83096,12 @@ in (sources."@forge/egress-1.1.1" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" ]; }) - sources."@forge/lint-3.2.8" - sources."@forge/manifest-4.4.1" - sources."@forge/storage-1.3.0" + sources."@forge/lint-3.2.13" + sources."@forge/manifest-4.6.0" + sources."@forge/storage-1.3.1" sources."@forge/util-1.2.0" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -83805,6 +83118,22 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@polka/url-1.0.0-next.21" + (sources."@sentry/core-7.34.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@sentry/node-7.34.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + sources."@sentry/types-7.34.0" + (sources."@sentry/utils-7.34.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/eslint-8.4.10" @@ -83812,15 +83141,17 @@ in sources."@types/estree-0.0.51" sources."@types/html-minifier-terser-6.1.0" sources."@types/json-schema-7.0.11" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/node-fetch-2.6.2" - sources."@typescript-eslint/types-5.42.0" - (sources."@typescript-eslint/typescript-estree-5.42.0" // { + sources."@typescript-eslint/types-5.49.0" + (sources."@typescript-eslint/typescript-estree-5.49.0" // { dependencies = [ + sources."lru-cache-6.0.0" sources."semver-7.3.8" + sources."yallist-4.0.0" ]; }) - sources."@typescript-eslint/visitor-keys-5.42.0" + sources."@typescript-eslint/visitor-keys-5.49.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -83841,9 +83172,10 @@ in sources."@webpack-cli/serve-1.7.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" sources."acorn-walk-8.2.0" + sources."agent-base-6.0.2" (sources."ajv-6.12.6" // { dependencies = [ sources."fast-deep-equal-3.1.3" @@ -83880,6 +83212,7 @@ in sources."async-3.2.4" sources."asynckit-0.4.0" sources."atlassian-openapi-1.0.17" + sources."available-typed-arrays-1.0.5" sources."babel-loader-8.3.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -83926,7 +83259,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.2" sources."camel-case-4.1.2" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."case-1.6.3" sources."chainsaw-0.1.0" sources."chalk-2.4.2" @@ -83947,7 +83280,7 @@ in sources."chownr-1.1.4" sources."chrome-trace-event-1.0.3" sources."cipher-base-1.0.4" - sources."clean-css-5.3.1" + sources."clean-css-5.3.2" sources."cli-color-2.0.3" sources."cli-cursor-3.1.0" sources."cli-spinners-2.7.0" @@ -83973,6 +83306,7 @@ in sources."conf-6.2.4" sources."console-browserify-1.2.0" sources."convert-source-map-1.9.0" + sources."cookie-0.4.2" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."crc32-stream-4.0.2" @@ -83983,20 +83317,13 @@ in }) sources."create-hash-1.2.0" sources."create-hmac-1.1.7" - (sources."cross-fetch-3.1.5" // { - dependencies = [ - sources."node-fetch-2.6.7" - sources."tr46-0.0.3" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - ]; - }) + sources."cross-fetch-3.1.5" sources."cross-spawn-7.0.3" sources."crypto-browserify-3.12.0" sources."css-select-4.3.0" sources."css-what-6.1.0" sources."d-1.0.1" - sources."dayjs-1.11.6" + sources."dayjs-1.11.7" sources."debounce-fn-3.0.1" sources."debug-4.3.4" sources."decompress-response-6.0.0" @@ -84041,14 +83368,19 @@ in }) sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" - sources."encoding-0.1.13" + (sources."encoding-0.1.13" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) sources."end-of-stream-1.4.4" - sources."enhanced-resolve-5.10.0" + sources."enhanced-resolve-5.12.0" sources."entities-2.2.0" sources."env-paths-2.2.1" sources."envinfo-7.8.1" - sources."es-abstract-1.20.4" + sources."es-abstract-1.21.1" sources."es-module-lexer-0.9.3" + sources."es-set-tostringtag-2.0.1" sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."es5-ext-0.10.62" @@ -84077,7 +83409,6 @@ in }) (sources."external-editor-3.1.0" // { dependencies = [ - sources."iconv-lite-0.4.24" sources."tmp-0.0.33" ]; }) @@ -84086,11 +83417,12 @@ in sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" sources."fastest-levenshtein-1.0.16" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."figures-3.2.0" sources."fill-range-7.0.1" sources."find-cache-dir-3.3.2" sources."find-up-4.1.0" + sources."for-each-0.3.3" sources."form-data-3.0.1" sources."fp-ts-2.13.1" sources."fs-constants-1.0.0" @@ -84110,7 +83442,7 @@ in sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-folder-size-2.0.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" sources."github-from-package-0.0.0" @@ -84118,7 +83450,9 @@ in sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."globals-11.12.0" + sources."globalthis-1.0.3" sources."globby-11.1.0" + sources."gopd-1.0.1" (sources."got-9.6.0" // { dependencies = [ sources."decompress-response-3.3.0" @@ -84133,6 +83467,7 @@ in sources."has-bigints-1.0.2" sources."has-flag-3.0.0" sources."has-property-descriptors-1.0.0" + sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { @@ -84155,29 +83490,32 @@ in }) sources."html-webpack-plugin-5.5.0" sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" - sources."iconv-lite-0.6.3" + sources."http-cache-semantics-4.1.1" + sources."https-proxy-agent-5.0.1" + sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."ignore-walk-3.0.4" sources."import-local-3.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.1" sources."ini-1.3.8" - (sources."inquirer-7.3.3" // { + (sources."inquirer-8.2.5" // { 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."ora-5.4.1" sources."supports-color-7.2.0" ]; }) - sources."internal-slot-1.0.3" + sources."internal-slot-1.0.4" sources."interpret-2.2.0" - sources."io-ts-2.2.19" + sources."io-ts-2.2.20" + sources."is-array-buffer-3.0.1" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" @@ -84197,7 +83535,9 @@ in sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.10" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-weakref-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" @@ -84221,9 +83561,9 @@ in }) sources."json-schema-traverse-0.4.1" sources."json-schema-typed-7.0.3" - sources."json-stable-stringify-1.0.1" + sources."json-stable-stringify-1.0.2" sources."json-stringify-safe-5.0.1" - sources."json5-2.2.1" + sources."json5-2.2.3" sources."jsonfile-4.0.0" sources."jsonify-0.0.1" sources."jsonpointer-5.0.1" @@ -84232,12 +83572,12 @@ in sources."kind-of-6.0.3" sources."latest-version-5.1.0" sources."launchdarkly-eventsource-1.4.3" - (sources."launchdarkly-js-sdk-common-4.3.2" // { + (sources."launchdarkly-js-sdk-common-4.3.3" // { dependencies = [ sources."uuid-8.3.2" ]; }) - sources."launchdarkly-node-client-sdk-2.2.1" + sources."launchdarkly-node-client-sdk-2.2.2" (sources."lazystream-1.0.1" // { dependencies = [ sources."inherits-2.0.4" @@ -84248,7 +83588,7 @@ in }) sources."listenercount-1.0.1" sources."loader-runner-4.3.0" - sources."loader-utils-2.0.3" + sources."loader-utils-2.0.4" sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash.assignin-4.2.0" @@ -84267,14 +83607,24 @@ in sources."lodash.some-4.6.0" sources."lodash.sortby-4.7.0" sources."lodash.union-4.6.0" - sources."log-symbols-3.0.0" + (sources."log-symbols-4.1.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."lower-case-2.0.2" sources."lowercase-keys-1.0.1" - sources."lru-cache-6.0.0" + sources."lru-cache-5.1.1" sources."lru-queue-0.1.0" + sources."lru_map-0.3.3" sources."make-dir-3.1.0" sources."md5.js-1.3.5" - sources."memfs-3.4.10" + sources."memfs-3.4.13" sources."memoizee-0.4.15" sources."merge-stream-2.0.0" sources."merge2-1.4.1" @@ -84310,26 +83660,34 @@ in sources."neo-async-2.6.2" sources."next-tick-1.1.0" sources."no-case-3.0.4" - (sources."node-abi-3.28.0" // { + (sources."node-abi-3.31.0" // { dependencies = [ + sources."lru-cache-6.0.0" sources."semver-7.3.8" + sources."yallist-4.0.0" ]; }) sources."node-addon-api-4.3.0" - sources."node-fetch-2.6.1" - sources."node-gyp-build-4.5.0" + (sources."node-fetch-2.6.7" // { + dependencies = [ + sources."tr46-0.0.3" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" + ]; + }) + sources."node-gyp-build-4.6.0" (sources."node-localstorage-1.3.1" // { dependencies = [ sources."write-file-atomic-1.3.4" ]; }) sources."node-machine-id-1.1.12" - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."nth-check-2.1.1" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."object-keys-1.1.1" sources."object.assign-4.1.4" sources."omelette-0.4.17" @@ -84343,6 +83701,16 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" + (sources."log-symbols-3.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."supports-color-5.5.0" + ]; + }) sources."supports-color-7.2.0" ]; }) @@ -84385,7 +83753,7 @@ in }) sources."prebuild-install-7.1.1" sources."prepend-http-2.0.0" - sources."prettier-2.7.1" + sources."prettier-2.8.3" sources."pretty-error-4.0.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" @@ -84411,7 +83779,7 @@ in (sources."readdir-glob-1.1.2" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" ]; }) sources."rechoir-0.7.1" @@ -84433,11 +83801,7 @@ in sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - (sources."rxjs-6.6.7" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) + sources."rxjs-7.8.0" sources."safe-buffer-5.2.1" sources."safe-json-stringify-1.2.0" sources."safe-regex-test-1.0.0" @@ -84445,7 +83809,7 @@ in sources."sanitize-filename-1.6.3" sources."schema-utils-2.7.1" sources."semver-6.3.0" - sources."serialize-javascript-6.0.0" + sources."serialize-javascript-6.0.1" sources."setimmediate-1.0.5" sources."sha.js-2.4.11" sources."shallow-clone-3.0.1" @@ -84463,8 +83827,8 @@ in sources."sprintf-js-1.0.3" sources."stdin-0.0.1" sources."string-width-4.2.3" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" + sources."string.prototype.trimend-1.0.6" + sources."string.prototype.trimstart-1.0.6" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" @@ -84484,7 +83848,7 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.15.1" // { + (sources."terser-5.16.1" // { dependencies = [ sources."commander-2.20.3" ]; @@ -84513,23 +83877,25 @@ in sources."totalist-1.1.0" (sources."tr46-1.0.1" // { dependencies = [ - sources."punycode-2.1.1" + sources."punycode-2.3.0" ]; }) sources."traverse-0.3.9" sources."truncate-utf8-bytes-1.0.2" - (sources."ts-loader-9.4.1" // { + (sources."ts-loader-9.4.2" // { 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."lru-cache-6.0.0" sources."semver-7.3.8" sources."supports-color-7.2.0" + sources."yallist-4.0.0" ]; }) - sources."tslib-2.4.1" + sources."tslib-2.5.0" (sources."tsutils-3.21.0" // { dependencies = [ sources."tslib-1.14.1" @@ -84538,8 +83904,9 @@ in sources."tunnel-agent-0.6.0" sources."type-1.2.0" sources."type-fest-0.21.3" + sources."typed-array-length-1.0.4" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.8.4" + sources."typescript-4.9.4" (sources."typescript-json-schema-0.45.1" // { dependencies = [ sources."glob-7.2.3" @@ -84558,7 +83925,7 @@ in sources."update-browserslist-db-1.0.10" (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.1.1" + sources."punycode-2.3.0" ]; }) sources."urijs-1.19.11" @@ -84582,7 +83949,7 @@ in sources."watchpack-2.4.0" sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" - (sources."webpack-5.74.0" // { + (sources."webpack-5.75.0" // { dependencies = [ sources."schema-utils-3.1.1" ]; @@ -84603,6 +83970,7 @@ in sources."whatwg-url-7.1.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" + sources."which-typed-array-1.1.9" sources."wildcard-2.0.0" sources."winattr-3.0.0" (sources."wrap-ansi-7.0.0" // { @@ -84616,7 +83984,7 @@ in sources."write-file-atomic-3.0.3" sources."ws-7.5.9" sources."y18n-5.0.8" - sources."yallist-4.0.0" + sources."yallist-3.1.1" sources."yaml-1.10.2" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" @@ -84655,11 +84023,11 @@ in }) sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" - sources."@types/cacheable-request-6.0.2" + sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-4.2.0" + sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."abort-controller-3.0.0" @@ -84668,14 +84036,14 @@ in sources."ansi-escapes-4.3.2" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" 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."balanced-match-1.0.2" sources."base64-js-1.5.1" - sources."bignumber.js-9.1.0" + sources."bignumber.js-9.1.1" sources."binary-extensions-2.2.0" sources."bl-4.1.0" sources."brace-expansion-1.1.11" @@ -84735,21 +84103,21 @@ in sources."fuzzy-0.1.3" sources."gaxios-4.3.3" sources."gcp-metadata-4.3.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" 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.4" sources."googleapis-84.0.0" sources."googleapis-common-5.1.0" - sources."got-11.8.5" + sources."got-11.8.6" sources."graceful-fs-4.2.10" 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."http-cache-semantics-4.1.1" sources."http2-wrapper-1.0.3" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" @@ -84800,13 +84168,13 @@ in sources."jsonfile-6.1.0" sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.5.1" + sources."keyv-4.5.2" sources."lines-and-columns-1.2.4" sources."locate-path-7.1.1" sources."lodash-4.17.21" (sources."log-symbols-5.1.0" // { dependencies = [ - sources."chalk-5.1.2" + sources."chalk-5.2.0" sources."is-unicode-supported-1.3.0" ]; }) @@ -84820,7 +84188,7 @@ in sources."ms-2.1.2" sources."multimatch-5.0.0" sources."mute-stream-0.0.8" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."node-forge-1.3.1" sources."normalize-newline-4.1.0" (sources."normalize-package-data-3.0.3" // { @@ -84830,7 +84198,7 @@ in }) sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."once-1.4.0" sources."onetime-5.1.2" sources."open-8.4.0" @@ -84838,7 +84206,7 @@ in dependencies = [ sources."bl-5.1.0" sources."buffer-6.0.3" - sources."chalk-5.1.2" + sources."chalk-5.2.0" sources."cli-cursor-4.0.0" sources."is-interactive-2.0.0" sources."is-unicode-supported-1.3.0" @@ -84895,7 +84263,7 @@ in sources."restore-cursor-3.1.0" sources."router-ips-1.0.0" sources."run-async-2.4.1" - sources."rxjs-7.5.7" + sources."rxjs-7.8.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-6.3.0" @@ -84926,9 +84294,9 @@ in sources."type-fest-2.19.0" ]; }) - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-fest-0.21.3" - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."universalify-2.0.0" sources."url-parse-1.5.10" sources."url-template-2.0.8" @@ -84964,38 +84332,38 @@ in "@medable/mdctl-cli" = nodeEnv.buildNodePackage { name = "_at_medable_slash_mdctl-cli"; packageName = "@medable/mdctl-cli"; - version = "1.0.67"; + version = "1.0.68"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-cli/-/mdctl-cli-1.0.67.tgz"; - sha512 = "Pl9Q5rqt4hKGVcZ1/iPMj8VXY3US0UgY8JGkgm+XFUtAJ9JntN0Qj1bj1JBfPj5R7YyrZzuuDbEk4eOCd+wI/A=="; + url = "https://registry.npmjs.org/@medable/mdctl-cli/-/mdctl-cli-1.0.68.tgz"; + sha512 = "zCtMCbQxJc5k2iaB/nV+1FrGQBEfbnFh427BD7O3jR6wJjVGBIamXtVKnqYqC5Kjtam7Eb9jvusZNpRcnVcAFQ=="; }; dependencies = [ - sources."@babel/parser-7.20.2" - sources."@medable/mdctl-api-1.0.67" - sources."@medable/mdctl-api-driver-1.0.67" - sources."@medable/mdctl-axon-tools-1.0.67" - sources."@medable/mdctl-core-1.0.67" - sources."@medable/mdctl-core-schemas-1.0.67" - sources."@medable/mdctl-core-utils-1.0.67" - sources."@medable/mdctl-credentials-provider-keychain-1.0.67" - sources."@medable/mdctl-credentials-provider-pouchdb-1.0.67" - sources."@medable/mdctl-docs-1.0.67" - sources."@medable/mdctl-export-adapter-console-1.0.67" - (sources."@medable/mdctl-export-adapter-tree-1.0.67" // { + sources."@babel/parser-7.20.13" + sources."@medable/mdctl-api-1.0.68" + sources."@medable/mdctl-api-driver-1.0.68" + sources."@medable/mdctl-axon-tools-1.0.68" + sources."@medable/mdctl-core-1.0.68" + sources."@medable/mdctl-core-schemas-1.0.68" + sources."@medable/mdctl-core-utils-1.0.68" + sources."@medable/mdctl-credentials-provider-keychain-1.0.68" + sources."@medable/mdctl-credentials-provider-pouchdb-1.0.68" + sources."@medable/mdctl-docs-1.0.68" + sources."@medable/mdctl-export-adapter-console-1.0.68" + (sources."@medable/mdctl-export-adapter-tree-1.0.68" // { dependencies = [ sources."glob-7.2.3" sources."globby-10.0.2" ]; }) - sources."@medable/mdctl-import-adapter-1.0.67" - (sources."@medable/mdctl-manifest-1.0.67" // { + sources."@medable/mdctl-import-adapter-1.0.68" + (sources."@medable/mdctl-manifest-1.0.68" // { dependencies = [ sources."pluralize-8.0.0" ]; }) - sources."@medable/mdctl-node-utils-1.0.67" - sources."@medable/mdctl-sandbox-1.0.67" - sources."@medable/mdctl-secrets-1.0.67" + sources."@medable/mdctl-node-utils-1.0.68" + sources."@medable/mdctl-sandbox-1.0.68" + sources."@medable/mdctl-secrets-1.0.68" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -85005,7 +84373,7 @@ in sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" sources."@types/minimatch-5.1.2" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/tough-cookie-2.3.8" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -85041,7 +84409,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."axios-0.21.4" sources."axios-cookiejar-support-0.5.1" sources."balanced-match-1.0.2" @@ -85142,7 +84510,7 @@ in sources."dashdash-1.14.1" sources."debug-4.3.4" sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."deep-is-0.1.4" @@ -85227,7 +84595,7 @@ in sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fetch-cookie-0.11.0" (sources."figures-2.0.0" // { dependencies = [ @@ -85318,7 +84686,7 @@ in sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."ignore-walk-3.0.4" sources."immediate-3.0.6" sources."inflection-1.13.4" @@ -85413,16 +84781,12 @@ in sources."lodash.isstring-4.0.1" sources."lodash.once-4.1.1" sources."lodash.sortby-4.7.0" - (sources."map-age-cleaner-0.1.3" // { - dependencies = [ - sources."p-defer-1.0.0" - ]; - }) + sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."markdown-it-12.3.2" - sources."markdown-it-anchor-8.6.5" - sources."marked-4.2.2" + sources."markdown-it-anchor-8.6.6" + sources."marked-4.2.12" sources."md5.js-1.3.5" sources."mdurl-1.0.1" (sources."mem-4.3.0" // { @@ -85470,7 +84834,7 @@ in sources."neo-async-2.6.2" sources."nice-try-1.0.5" sources."node-abi-2.30.1" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."node-pre-gyp-0.11.0" sources."noop-fn-1.0.0" sources."noop-logger-0.1.1" @@ -85506,7 +84870,7 @@ in sources."os-locale-3.1.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."p-defer-3.0.0" + sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" sources."p-limit-2.3.0" @@ -85524,15 +84888,15 @@ in sources."pify-4.0.1" sources."pluralize-7.0.0" sources."posix-character-classes-0.1.1" - (sources."pouchdb-abstract-mapreduce-7.3.0" // { + (sources."pouchdb-abstract-mapreduce-7.3.1" // { dependencies = [ sources."buffer-from-1.1.2" sources."immediate-3.3.0" - sources."pouchdb-binary-utils-7.3.0" - sources."pouchdb-collections-7.3.0" - sources."pouchdb-errors-7.3.0" - sources."pouchdb-md5-7.3.0" - sources."pouchdb-utils-7.3.0" + sources."pouchdb-binary-utils-7.3.1" + sources."pouchdb-collections-7.3.1" + sources."pouchdb-errors-7.3.1" + sources."pouchdb-md5-7.3.1" + sources."pouchdb-utils-7.3.1" sources."spark-md5-3.0.2" sources."uuid-8.3.2" ]; @@ -85541,31 +84905,31 @@ in sources."pouchdb-adapter-utils-7.0.0" sources."pouchdb-adapter-websql-core-7.0.0" sources."pouchdb-binary-utils-7.0.0" - (sources."pouchdb-changes-filter-7.3.0" // { + (sources."pouchdb-changes-filter-7.3.1" // { dependencies = [ sources."buffer-from-1.1.2" sources."immediate-3.3.0" - sources."pouchdb-binary-utils-7.3.0" - sources."pouchdb-collections-7.3.0" - sources."pouchdb-errors-7.3.0" - sources."pouchdb-md5-7.3.0" - sources."pouchdb-utils-7.3.0" + sources."pouchdb-binary-utils-7.3.1" + sources."pouchdb-collections-7.3.1" + sources."pouchdb-errors-7.3.1" + sources."pouchdb-md5-7.3.1" + sources."pouchdb-utils-7.3.1" sources."spark-md5-3.0.2" sources."uuid-8.3.2" ]; }) - sources."pouchdb-collate-7.3.0" + sources."pouchdb-collate-7.3.1" sources."pouchdb-collections-7.0.0" - (sources."pouchdb-core-7.3.0" // { + (sources."pouchdb-core-7.3.1" // { dependencies = [ sources."buffer-from-1.1.2" sources."immediate-3.3.0" - sources."pouchdb-binary-utils-7.3.0" - sources."pouchdb-collections-7.3.0" - sources."pouchdb-errors-7.3.0" - sources."pouchdb-md5-7.3.0" - sources."pouchdb-merge-7.3.0" - sources."pouchdb-utils-7.3.0" + sources."pouchdb-binary-utils-7.3.1" + sources."pouchdb-collections-7.3.1" + sources."pouchdb-errors-7.3.1" + sources."pouchdb-md5-7.3.1" + sources."pouchdb-merge-7.3.1" + sources."pouchdb-utils-7.3.1" sources."spark-md5-3.0.2" sources."uuid-8.3.2" ]; @@ -85576,30 +84940,34 @@ in ]; }) sources."pouchdb-extend-0.1.2" - sources."pouchdb-fetch-7.3.0" - (sources."pouchdb-find-7.3.0" // { + (sources."pouchdb-fetch-7.3.1" // { + dependencies = [ + sources."node-fetch-2.6.7" + ]; + }) + (sources."pouchdb-find-7.3.1" // { dependencies = [ sources."buffer-from-1.1.2" sources."immediate-3.3.0" - sources."pouchdb-binary-utils-7.3.0" - sources."pouchdb-collections-7.3.0" - sources."pouchdb-errors-7.3.0" - sources."pouchdb-md5-7.3.0" - sources."pouchdb-utils-7.3.0" + sources."pouchdb-binary-utils-7.3.1" + sources."pouchdb-collections-7.3.1" + sources."pouchdb-errors-7.3.1" + sources."pouchdb-md5-7.3.1" + sources."pouchdb-utils-7.3.1" sources."spark-md5-3.0.2" sources."uuid-8.3.2" ]; }) sources."pouchdb-json-7.0.0" - (sources."pouchdb-mapreduce-utils-7.3.0" // { + (sources."pouchdb-mapreduce-utils-7.3.1" // { dependencies = [ sources."buffer-from-1.1.2" sources."immediate-3.3.0" - sources."pouchdb-binary-utils-7.3.0" - sources."pouchdb-collections-7.3.0" - sources."pouchdb-errors-7.3.0" - sources."pouchdb-md5-7.3.0" - sources."pouchdb-utils-7.3.0" + sources."pouchdb-binary-utils-7.3.1" + sources."pouchdb-collections-7.3.1" + sources."pouchdb-errors-7.3.1" + sources."pouchdb-md5-7.3.1" + sources."pouchdb-utils-7.3.1" sources."spark-md5-3.0.2" sources."uuid-8.3.2" ]; @@ -85607,15 +84975,15 @@ in sources."pouchdb-md5-7.0.0" sources."pouchdb-merge-7.0.0" sources."pouchdb-promise-5.4.3" - (sources."pouchdb-selector-core-7.3.0" // { + (sources."pouchdb-selector-core-7.3.1" // { dependencies = [ sources."buffer-from-1.1.2" sources."immediate-3.3.0" - sources."pouchdb-binary-utils-7.3.0" - sources."pouchdb-collections-7.3.0" - sources."pouchdb-errors-7.3.0" - sources."pouchdb-md5-7.3.0" - sources."pouchdb-utils-7.3.0" + sources."pouchdb-binary-utils-7.3.1" + sources."pouchdb-collections-7.3.1" + sources."pouchdb-errors-7.3.1" + sources."pouchdb-md5-7.3.1" + sources."pouchdb-utils-7.3.1" sources."spark-md5-3.0.2" sources."uuid-8.3.2" ]; @@ -85638,7 +85006,7 @@ in sources."promise-nodify-1.0.2" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."q-1.5.1" sources."qs-6.5.3" sources."queue-microtask-1.2.3" @@ -85662,7 +85030,7 @@ in }) sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."requizzle-0.2.3" + sources."requizzle-0.2.4" sources."resolve-1.22.1" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -85766,7 +85134,6 @@ in sources."kind-of-5.1.0" ]; }) - sources."stream-to-iterator-3.0.3" sources."string-natural-compare-2.0.3" sources."string-width-1.0.2" sources."string_decoder-1.3.0" @@ -85893,6 +85260,808 @@ in bypassCache = true; reconstructLock = true; }; + "@microsoft/rush" = nodeEnv.buildNodePackage { + name = "_at_microsoft_slash_rush"; + packageName = "@microsoft/rush"; + version = "5.89.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.89.1.tgz"; + sha512 = "i21mAr6U+fo7+td9zlJ9R0MA9sqbpcq8dkod0keiFJkzOJnzIb0y8yJAvr7rEzxKKZqXdfktI/8gBi+GTvdMig=="; + }; + dependencies = [ + (sources."@azure/abort-controller-1.1.0" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) + (sources."@azure/core-auth-1.4.0" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) + (sources."@azure/core-client-1.7.0" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) + (sources."@azure/core-http-2.3.1" // { + dependencies = [ + sources."@azure/core-tracing-1.0.0-preview.13" + (sources."@types/node-fetch-2.6.2" // { + dependencies = [ + sources."form-data-3.0.1" + ]; + }) + sources."tslib-2.5.0" + ]; + }) + (sources."@azure/core-lro-2.5.0" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) + (sources."@azure/core-paging-1.4.0" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) + (sources."@azure/core-rest-pipeline-1.10.1" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) + (sources."@azure/core-tracing-1.0.1" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) + (sources."@azure/core-util-1.1.1" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) + (sources."@azure/identity-2.1.0" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) + (sources."@azure/logger-1.0.3" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) + (sources."@azure/msal-browser-2.32.2" // { + dependencies = [ + sources."@azure/msal-common-9.1.1" + ]; + }) + sources."@azure/msal-common-7.6.0" + (sources."@azure/msal-node-1.14.6" // { + dependencies = [ + sources."@azure/msal-common-9.1.1" + ]; + }) + (sources."@azure/storage-blob-12.11.0" // { + dependencies = [ + sources."@azure/core-tracing-1.0.0-preview.13" + sources."tslib-2.5.0" + ]; + }) + sources."@babel/code-frame-7.18.6" + sources."@babel/generator-7.20.14" + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-function-name-7.19.0" + sources."@babel/helper-hoist-variables-7.18.6" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-string-parser-7.19.4" + sources."@babel/helper-validator-identifier-7.19.1" + sources."@babel/highlight-7.18.6" + sources."@babel/parser-7.16.4" + (sources."@babel/template-7.20.7" // { + dependencies = [ + sources."@babel/parser-7.20.13" + ]; + }) + (sources."@babel/traverse-7.20.13" // { + dependencies = [ + sources."@babel/parser-7.20.13" + ]; + }) + sources."@babel/types-7.20.7" + sources."@devexpress/error-stack-parser-2.0.6" + sources."@jridgewell/gen-mapping-0.3.2" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/set-array-1.1.2" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.17" + sources."@microsoft/rush-lib-5.89.1" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@opentelemetry/api-1.4.0" + sources."@pnpm/crypto.base32-hash-1.0.1" + sources."@pnpm/error-1.4.0" + sources."@pnpm/link-bins-5.3.25" + sources."@pnpm/package-bins-4.1.0" + sources."@pnpm/read-modules-dir-2.0.3" + sources."@pnpm/read-package-json-4.0.0" + (sources."@pnpm/read-project-manifest-1.1.7" // { + dependencies = [ + sources."graceful-fs-4.2.4" + ]; + }) + sources."@pnpm/types-6.4.0" + sources."@pnpm/write-project-manifest-1.1.7" + sources."@rushstack/heft-config-file-0.11.5" + (sources."@rushstack/node-core-library-3.53.3" // { + dependencies = [ + sources."import-lazy-4.0.0" + sources."resolve-1.17.0" + ]; + }) + sources."@rushstack/package-deps-hash-4.0.3" + (sources."@rushstack/rig-package-0.3.17" // { + dependencies = [ + sources."resolve-1.17.0" + ]; + }) + sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.89.1" + sources."@rushstack/rush-azure-storage-build-cache-plugin-5.89.1" + sources."@rushstack/rush-sdk-5.89.1" + sources."@rushstack/stream-collator-4.0.222" + sources."@rushstack/terminal-0.3.91" + (sources."@rushstack/ts-command-line-4.13.1" // { + dependencies = [ + sources."argparse-1.0.10" + ]; + }) + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."@tootallnate/once-2.0.0" + sources."@types/argparse-1.0.38" + sources."@types/lodash-4.14.191" + sources."@types/minimatch-3.0.5" + sources."@types/minimist-1.2.2" + sources."@types/node-12.20.24" + sources."@types/node-fetch-1.6.9" + sources."@types/normalize-package-data-2.4.1" + sources."@types/parse-json-4.0.0" + sources."@types/tunnel-0.0.3" + sources."@vue/compiler-core-3.2.45" + sources."@vue/compiler-dom-3.2.45" + sources."@vue/compiler-sfc-3.2.45" + sources."@vue/compiler-ssr-3.2.45" + sources."@vue/reactivity-transform-3.2.45" + sources."@vue/shared-3.2.45" + sources."@yarnpkg/lockfile-1.0.2" + sources."@zkochan/cmd-shim-5.4.1" + sources."agent-base-6.0.2" + sources."ansi-align-3.0.1" + (sources."ansi-escapes-4.3.2" // { + dependencies = [ + sources."type-fest-0.21.3" + ]; + }) + sources."ansi-regex-5.0.1" + sources."ansi-styles-3.2.1" + sources."any-promise-1.3.0" + sources."anymatch-3.1.3" + sources."argparse-2.0.1" + sources."array-differ-3.0.0" + sources."array-union-2.1.0" + sources."arrify-2.0.1" + sources."asap-2.0.6" + sources."asynckit-0.4.0" + sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" + sources."better-path-resolve-1.0.0" + sources."binary-extensions-2.2.0" + (sources."bl-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + (sources."boxen-5.1.2" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + sources."type-fest-0.20.2" + ]; + }) + 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."builtin-modules-3.1.0" + sources."builtins-1.0.3" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."callsite-1.0.0" + sources."callsite-record-4.1.5" + sources."callsites-3.1.0" + sources."camelcase-6.3.0" + (sources."camelcase-keys-6.2.2" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) + sources."chalk-2.4.2" + sources."chardet-0.7.0" + sources."chokidar-3.5.3" + sources."chownr-2.0.0" + sources."ci-info-2.0.0" + sources."cli-boxes-2.2.1" + sources."cli-cursor-3.1.0" + sources."cli-spinners-2.7.0" + (sources."cli-table-0.3.11" // { + dependencies = [ + sources."colors-1.0.3" + ]; + }) + sources."cli-width-3.0.0" + sources."cliui-7.0.4" + sources."clone-1.0.4" + sources."clone-response-1.0.3" + sources."cmd-extension-1.0.2" + sources."co-4.6.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."colors-1.2.5" + sources."combined-stream-1.0.8" + sources."commander-9.5.0" + sources."concat-map-0.0.1" + sources."configstore-5.0.1" + sources."core-util-is-1.0.3" + sources."cosmiconfig-7.1.0" + sources."cross-spawn-7.0.3" + sources."crypto-random-string-2.0.0" + sources."debug-4.3.4" + sources."debuglog-1.0.1" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.1" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."decompress-response-3.3.0" + sources."deep-extend-0.6.0" + sources."defaults-1.0.4" + sources."defer-to-connect-1.1.3" + sources."define-lazy-prop-2.0.0" + sources."delayed-stream-1.0.0" + (sources."depcheck-1.4.3" // { + dependencies = [ + sources."argparse-1.0.10" + sources."js-yaml-3.14.1" + ]; + }) + (sources."dependency-path-9.2.8" // { + dependencies = [ + sources."@pnpm/types-8.9.0" + ]; + }) + sources."deps-regex-0.1.4" + sources."detect-indent-6.1.0" + sources."dezalgo-1.0.4" + sources."dir-glob-3.0.1" + sources."dot-prop-5.3.0" + sources."duplexer3-0.1.5" + sources."ecdsa-sig-formatter-1.0.11" + sources."emoji-regex-8.0.0" + sources."encode-registry-3.0.0" + (sources."encoding-0.1.13" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) + sources."end-of-stream-1.4.4" + sources."error-ex-1.3.2" + sources."escalade-3.1.1" + sources."escape-goat-2.1.1" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."estree-walker-2.0.2" + sources."events-3.3.0" + sources."execa-5.1.1" + sources."external-editor-3.1.0" + sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.12" + sources."fastq-1.15.0" + sources."figures-3.0.0" + sources."fill-range-7.0.1" + sources."find-up-4.1.0" + (sources."find-yarn-workspace-root2-1.2.16" // { + dependencies = [ + sources."pkg-dir-4.2.0" + ]; + }) + sources."form-data-4.0.0" + (sources."fs-extra-7.0.1" // { + dependencies = [ + sources."universalify-0.1.2" + ]; + }) + sources."fs-minipass-2.1.0" + sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" + sources."function-bind-1.1.1" + sources."get-caller-file-2.0.5" + sources."get-stream-6.0.1" + sources."git-repo-info-2.1.1" + sources."giturl-1.0.1" + sources."glob-7.0.6" + sources."glob-escape-0.0.2" + sources."glob-parent-5.1.2" + (sources."global-dirs-3.0.1" // { + dependencies = [ + sources."ini-2.0.0" + ]; + }) + sources."global-modules-2.0.0" + (sources."global-prefix-3.0.0" // { + dependencies = [ + sources."which-1.3.1" + ]; + }) + sources."globals-11.12.0" + (sources."globby-11.1.0" // { + dependencies = [ + sources."ignore-5.2.4" + ]; + }) + (sources."got-9.6.0" // { + dependencies = [ + sources."get-stream-4.1.0" + ]; + }) + sources."graceful-fs-4.2.10" + sources."hard-rejection-2.1.0" + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."has-yarn-2.1.0" + (sources."highlight-es-1.0.3" // { + dependencies = [ + sources."js-tokens-3.0.2" + ]; + }) + sources."hosted-git-info-4.1.0" + sources."http-cache-semantics-4.1.1" + sources."http-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" + sources."human-signals-2.1.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" + sources."ignore-5.1.9" + sources."ignore-walk-3.0.4" + sources."immediate-3.0.6" + sources."immutable-4.2.2" + sources."import-fresh-3.3.0" + sources."import-lazy-2.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."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."invariant-2.2.4" + sources."is-arrayish-0.2.1" + sources."is-binary-path-2.1.0" + sources."is-ci-2.0.0" + sources."is-core-module-2.11.0" + sources."is-docker-2.2.1" + sources."is-es2016-keyword-1.0.0" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.3" + sources."is-installed-globally-0.4.0" + sources."is-interactive-1.0.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-plain-obj-2.1.0" + sources."is-stream-2.0.1" + sources."is-subdir-1.2.0" + sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" + sources."is-windows-1.0.2" + sources."is-wsl-2.2.0" + sources."is-yarn-global-0.3.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."jju-1.4.0" + sources."js-tokens-4.0.0" + (sources."js-yaml-3.13.1" // { + dependencies = [ + sources."argparse-1.0.10" + ]; + }) + sources."jsesc-2.5.2" + sources."json-buffer-3.0.0" + sources."json-parse-even-better-errors-2.3.1" + sources."json5-2.2.3" + sources."jsonfile-4.0.0" + sources."jsonpath-plus-4.0.0" + (sources."jsonwebtoken-9.0.0" // { + dependencies = [ + sources."jws-3.2.2" + ]; + }) + sources."jszip-3.8.0" + sources."jwa-1.4.1" + (sources."jws-4.0.0" // { + dependencies = [ + sources."jwa-2.0.0" + ]; + }) + sources."keyv-3.1.0" + sources."kind-of-6.0.3" + sources."latest-version-5.1.0" + sources."lie-3.3.0" + sources."lines-and-columns-1.2.4" + sources."load-json-file-6.2.0" + (sources."load-yaml-file-0.2.0" // { + dependencies = [ + sources."strip-bom-3.0.0" + ]; + }) + sources."locate-path-5.0.0" + sources."lodash-4.17.21" + sources."lodash.get-4.4.2" + sources."lodash.isequal-4.5.0" + (sources."log-symbols-4.1.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."loose-envify-1.4.0" + sources."lowercase-keys-1.0.1" + sources."lru-cache-6.0.0" + sources."magic-string-0.25.9" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."map-age-cleaner-0.1.3" + sources."map-obj-4.3.0" + sources."mem-8.1.1" + (sources."meow-9.0.0" // { + dependencies = [ + sources."type-fest-0.18.1" + ]; + }) + sources."merge-stream-2.0.0" + sources."merge2-1.4.1" + sources."micromatch-4.0.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."mimic-fn-3.1.0" + sources."mimic-response-1.0.1" + sources."min-indent-1.0.1" + sources."minimatch-3.1.2" + sources."minimist-1.2.7" + (sources."minimist-options-4.1.0" // { + dependencies = [ + sources."arrify-1.0.1" + sources."is-plain-obj-1.1.0" + ]; + }) + sources."minipass-3.3.6" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" + sources."ms-2.1.2" + sources."multimatch-5.0.0" + sources."mute-stream-0.0.8" + sources."mz-2.7.0" + sources."nanoid-3.3.4" + sources."node-emoji-1.11.0" + sources."node-fetch-2.6.7" + sources."normalize-package-data-3.0.3" + sources."normalize-path-3.0.0" + sources."normalize-url-4.5.1" + sources."npm-bundled-1.1.2" + (sources."npm-check-6.0.1" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."npm-normalize-package-bin-1.0.1" + (sources."npm-package-arg-6.1.1" // { + dependencies = [ + sources."hosted-git-info-2.8.9" + sources."semver-5.7.1" + ]; + }) + (sources."npm-packlist-2.1.5" // { + dependencies = [ + sources."glob-7.2.3" + ]; + }) + sources."npm-run-path-4.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + (sources."onetime-5.1.2" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) + sources."open-8.4.0" + (sources."ora-5.4.1" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-cancelable-1.1.0" + sources."p-defer-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-reflect-2.1.0" + sources."p-settle-4.1.1" + sources."p-try-2.2.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."pako-1.0.11" + sources."parent-module-1.0.1" + sources."parse-json-5.2.0" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" + sources."path-parse-1.0.7" + sources."path-type-4.0.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-5.0.0" // { + dependencies = [ + sources."find-up-5.0.0" + sources."locate-path-6.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + ]; + }) + sources."please-upgrade-node-3.2.0" + sources."postcss-8.4.21" + (sources."preferred-pm-3.0.3" // { + dependencies = [ + sources."find-up-5.0.0" + sources."locate-path-6.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + ]; + }) + sources."prepend-http-2.0.0" + sources."process-0.11.10" + sources."process-nextick-args-2.0.1" + sources."psl-1.9.0" + sources."pump-3.0.0" + sources."punycode-2.3.0" + sources."pupa-2.1.1" + sources."query-ast-1.0.5" + sources."querystringify-2.2.0" + sources."queue-microtask-1.2.3" + sources."quick-lru-4.0.1" + sources."ramda-0.27.2" + (sources."rc-1.2.8" // { + dependencies = [ + sources."strip-json-comments-2.0.1" + ]; + }) + (sources."rc-config-loader-4.1.2" // { + dependencies = [ + sources."js-yaml-4.1.0" + ]; + }) + (sources."read-package-json-2.1.2" // { + dependencies = [ + sources."glob-7.2.3" + sources."hosted-git-info-2.8.9" + sources."normalize-package-data-2.5.0" + sources."semver-5.7.1" + ]; + }) + sources."read-package-tree-5.1.6" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."hosted-git-info-2.8.9" + sources."normalize-package-data-2.5.0" + sources."semver-5.7.1" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + (sources."read-yaml-file-2.1.0" // { + dependencies = [ + sources."js-yaml-4.1.0" + ]; + }) + sources."readable-stream-2.3.7" + sources."readdir-scoped-modules-1.1.0" + sources."readdirp-3.6.0" + sources."redent-3.0.0" + sources."registry-auth-token-4.2.2" + sources."registry-url-5.1.0" + sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" + sources."require-package-name-2.0.1" + sources."requires-port-1.0.0" + sources."resolve-1.22.1" + sources."resolve-from-4.0.0" + sources."responselike-1.0.2" + sources."restore-cursor-3.1.0" + sources."reusify-1.0.4" + sources."rfc4648-1.5.2" + sources."run-async-2.4.1" + sources."run-parallel-1.2.0" + sources."rxjs-6.6.7" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sass-1.57.1" + sources."sax-1.2.4" + sources."scss-parser-1.0.6" + sources."semver-7.3.8" + sources."semver-compare-1.0.0" + (sources."semver-diff-3.1.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."set-immediate-shim-1.0.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-3.0.7" + sources."slash-3.0.0" + sources."sort-keys-4.2.0" + sources."source-map-0.6.1" + sources."source-map-js-1.0.2" + sources."sourcemap-codec-1.4.8" + 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.12" + sources."sprintf-js-1.0.3" + sources."ssri-8.0.1" + sources."stackframe-1.3.4" + sources."stoppable-1.1.0" + sources."strict-uri-encode-2.0.0" + sources."string-argv-0.3.1" + sources."string-width-4.2.3" + sources."string_decoder-1.1.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" + sources."strip-json-comments-3.1.1" + sources."supports-color-5.5.0" + sources."supports-preserve-symlinks-flag-1.0.0" + sources."tapable-2.2.1" + (sources."tar-6.1.13" // { + dependencies = [ + sources."minipass-4.0.0" + ]; + }) + sources."text-table-0.2.0" + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" + sources."throat-6.0.2" + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."to-fast-properties-2.0.0" + sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" + sources."tough-cookie-4.1.2" + sources."tr46-0.0.3" + sources."trim-newlines-3.0.1" + sources."true-case-path-2.2.1" + sources."tslib-1.14.1" + sources."tunnel-0.0.6" + sources."type-fest-0.6.0" + sources."typedarray-to-buffer-3.1.5" + sources."unique-string-2.0.0" + sources."universalify-0.2.0" + (sources."update-notifier-5.1.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."url-parse-1.5.10" + sources."url-parse-lax-3.0.0" + sources."util-deprecate-1.0.2" + sources."uuid-8.3.2" + sources."validate-npm-package-license-3.0.4" + sources."validate-npm-package-name-3.0.0" + sources."validator-13.7.0" + sources."wcwidth-1.0.1" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" + sources."which-2.0.2" + sources."which-pm-2.0.0" + sources."widest-line-3.1.0" + sources."wordwrap-1.0.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."wrappy-1.0.2" + sources."write-file-atomic-3.0.3" + (sources."write-yaml-file-4.2.0" // { + dependencies = [ + sources."js-yaml-4.1.0" + ]; + }) + sources."xdg-basedir-4.0.0" + 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."yaml-1.10.2" + sources."yargs-16.2.0" + sources."yargs-parser-20.2.9" + sources."yocto-queue-0.1.0" + sources."z-schema-5.0.5" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A professional solution for consolidating all your JavaScript projects in one Git repo"; + homepage = "https://rushjs.io"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "@nerdwallet/shepherd" = nodeEnv.buildNodePackage { name = "_at_nerdwallet_slash_shepherd"; packageName = "@nerdwallet/shepherd"; @@ -85921,7 +86090,7 @@ in sources."@octokit/rest-18.12.0" sources."@octokit/types-6.41.0" sources."@sideway/address-4.1.4" - sources."@sideway/formula-3.0.0" + sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" sources."@types/js-yaml-3.12.7" sources."ansi-regex-5.0.1" @@ -85966,7 +86135,7 @@ in sources."mimic-fn-2.1.0" sources."ms-2.1.2" sources."netrc-0.1.4" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."node-version-1.2.0" sources."once-1.4.0" sources."onetime-5.1.2" @@ -86009,20 +86178,20 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "9.1.5"; + version = "9.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-9.1.5.tgz"; - sha512 = "rSp26+Nv7PFtYrRSP18Gv5ZK8rRSc2SCCF5wh4SdZaVGgkxShpNq9YEfI+ik/uziN3KC5o74ppYRXGj+aHGVsA=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-9.1.9.tgz"; + sha512 = "oRiJArvQcYUJRO0jRWG99KkXuw+HafSnlfWcO4028gTDb4IanRwbl6fw4mELTEAaXAwDGOcuk8R0QY8H3muyiQ=="; }; dependencies = [ - sources."@angular-devkit/core-14.2.2" - sources."@angular-devkit/schematics-14.2.2" - (sources."@angular-devkit/schematics-cli-14.2.2" // { + sources."@angular-devkit/core-15.0.4" + sources."@angular-devkit/schematics-15.0.4" + (sources."@angular-devkit/schematics-cli-15.0.4" // { dependencies = [ sources."chalk-4.1.2" sources."inquirer-8.2.4" - sources."rxjs-7.5.7" - sources."tslib-2.4.1" + sources."rxjs-7.8.0" + sources."tslib-2.5.0" ]; }) sources."@babel/code-frame-7.18.6" @@ -86037,32 +86206,19 @@ in sources."supports-color-5.5.0" ]; }) + sources."@colors/colors-1.5.0" sources."@jridgewell/gen-mapping-0.3.2" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - (sources."@nestjs/schematics-9.0.3" // { - dependencies = [ - (sources."@angular-devkit/core-14.2.1" // { - dependencies = [ - sources."jsonc-parser-3.1.0" - ]; - }) - (sources."@angular-devkit/schematics-14.2.1" // { - dependencies = [ - sources."jsonc-parser-3.1.0" - ]; - }) - sources."jsonc-parser-3.2.0" - ]; - }) + sources."@nestjs/schematics-9.0.4" sources."@types/eslint-8.4.10" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -86081,7 +86237,7 @@ in sources."@webassemblyjs/wast-printer-1.11.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" sources."ajv-8.11.0" sources."ajv-formats-2.1.1" @@ -86095,7 +86251,7 @@ in sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" @@ -86106,21 +86262,21 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" sources."cli-cursor-3.1.0" sources."cli-spinners-2.7.0" - sources."cli-table3-0.6.2" + sources."cli-table3-0.6.3" sources."cli-width-3.0.0" sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-4.1.1" sources."concat-map-0.0.1" - sources."cosmiconfig-7.0.1" + sources."cosmiconfig-7.1.0" sources."cross-spawn-7.0.3" sources."de-indent-1.0.2" sources."deepmerge-4.2.2" @@ -86128,7 +86284,7 @@ in sources."electron-to-chromium-1.4.284" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."enhanced-resolve-5.10.0" + sources."enhanced-resolve-5.12.0" sources."error-ex-1.3.2" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -86147,12 +86303,13 @@ 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-7.2.13" // { + (sources."fork-ts-checker-webpack-plugin-7.2.14" // { dependencies = [ sources."chalk-4.1.2" + sources."fs-extra-10.1.0" ]; }) - sources."fs-extra-10.1.0" + sources."fs-extra-11.1.0" sources."fs-monkey-1.0.3" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -86196,8 +86353,8 @@ in sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-1.0.0" - sources."json5-2.2.1" - sources."jsonc-parser-3.1.0" + sources."json5-2.2.3" + sources."jsonc-parser-3.2.0" sources."jsonfile-6.1.0" sources."lines-and-columns-1.2.4" sources."loader-runner-4.3.0" @@ -86209,8 +86366,8 @@ in }) sources."lru-cache-6.0.0" sources."macos-release-2.5.0" - sources."magic-string-0.26.2" - sources."memfs-3.4.10" + sources."magic-string-0.26.7" + sources."memfs-3.4.13" sources."merge-stream-2.0.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" @@ -86219,9 +86376,9 @@ in sources."minimist-1.2.7" sources."mute-stream-0.0.8" sources."neo-async-2.6.2" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."node-emoji-1.11.0" - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."once-1.4.0" @@ -86243,7 +86400,7 @@ in sources."picomatch-2.3.1" sources."pluralize-8.0.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."randombytes-2.1.0" sources."readable-stream-3.6.0" sources."readdirp-3.6.0" @@ -86264,7 +86421,7 @@ in ]; }) sources."semver-7.3.8" - sources."serialize-javascript-6.0.0" + sources."serialize-javascript-6.0.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shelljs-0.8.5" @@ -86285,7 +86442,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-observable-4.0.0" sources."tapable-2.2.1" - (sources."terser-5.15.1" // { + (sources."terser-5.16.1" // { dependencies = [ sources."commander-2.20.3" ]; @@ -86295,7 +86452,7 @@ in sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."tree-kill-1.2.2" - sources."tsconfig-paths-4.1.0" + sources."tsconfig-paths-4.1.1" (sources."tsconfig-paths-webpack-plugin-4.0.0" // { dependencies = [ sources."chalk-4.1.2" @@ -86303,15 +86460,15 @@ in }) sources."tslib-1.14.1" sources."type-fest-0.21.3" - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."universalify-2.0.0" sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" - sources."vue-template-compiler-2.7.13" + sources."vue-template-compiler-2.7.14" sources."watchpack-2.4.0" sources."wcwidth-1.0.1" - sources."webpack-5.74.0" + sources."webpack-5.75.0" sources."webpack-node-externals-3.0.0" sources."webpack-sources-3.2.3" sources."which-2.0.2" @@ -86335,10 +86492,10 @@ in "@squoosh/cli" = nodeEnv.buildNodePackage { name = "_at_squoosh_slash_cli"; packageName = "@squoosh/cli"; - version = "0.7.2"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/@squoosh/cli/-/cli-0.7.2.tgz"; - sha512 = "uMnUWMx4S8UApO/EfPyRyvUmw+0jI9wwAfdHfGjvVg4DAIvEgsA+VWK2KOBnJiChvVd768K27g09ESzptyX93w=="; + url = "https://registry.npmjs.org/@squoosh/cli/-/cli-0.7.3.tgz"; + sha512 = "mU/iWbVWqLXX+gJJa4RBl5U4LdKYaiD9cmxW7bjyw8EEFAuMXFDGAQcq7hEvUZwoP5Em5s7sjimBPirSBJQ87g=="; }; dependencies = [ sources."@squoosh/lib-0.4.1" @@ -86360,7 +86517,7 @@ in sources."inherits-2.0.4" sources."is-interactive-1.0.0" sources."is-unicode-supported-0.1.0" - sources."json5-2.2.1" + sources."json5-2.2.3" sources."kleur-4.1.5" sources."log-symbols-4.1.0" sources."mimic-fn-2.1.0" @@ -86374,7 +86531,7 @@ in sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."util-deprecate-1.0.2" - sources."wasm-feature-detect-1.3.0" + sources."wasm-feature-detect-1.4.0" sources."wcwidth-1.0.1" sources."web-streams-polyfill-3.2.1" ]; @@ -86404,27 +86561,27 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.14" - sources."@swc/core-darwin-arm64-1.3.14" - sources."@swc/core-darwin-x64-1.3.14" - sources."@swc/core-linux-arm-gnueabihf-1.3.14" - sources."@swc/core-linux-arm64-gnu-1.3.14" - sources."@swc/core-linux-arm64-musl-1.3.14" - sources."@swc/core-linux-x64-gnu-1.3.14" - sources."@swc/core-linux-x64-musl-1.3.14" - sources."@swc/core-win32-arm64-msvc-1.3.14" - sources."@swc/core-win32-ia32-msvc-1.3.14" - sources."@swc/core-win32-x64-msvc-1.3.14" - sources."@swc/wasm-1.3.14" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."arg-5.0.2" sources."binary-extensions-2.2.0" sources."braces-3.0.2" @@ -86447,7 +86604,7 @@ in sources."glob-parent-5.1.2" ]; }) - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fsevents-2.3.2" sources."function-bind-1.1.1" @@ -86470,12 +86627,12 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-2.3.0" - sources."postcss-8.4.18" + sources."postcss-8.4.21" sources."postcss-import-14.1.0" sources."postcss-js-4.0.0" sources."postcss-load-config-3.1.4" sources."postcss-nested-6.0.0" - sources."postcss-selector-parser-6.0.10" + sources."postcss-selector-parser-6.0.11" sources."postcss-value-parser-4.2.0" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" @@ -86486,16 +86643,16 @@ in sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.2.2" + sources."tailwindcss-3.2.4" sources."to-regex-range-5.0.1" (sources."ts-node-10.9.1" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" ]; }) - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."xtend-4.0.2" @@ -86528,27 +86685,27 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.14" - sources."@swc/core-darwin-arm64-1.3.14" - sources."@swc/core-darwin-x64-1.3.14" - sources."@swc/core-linux-arm-gnueabihf-1.3.14" - sources."@swc/core-linux-arm64-gnu-1.3.14" - sources."@swc/core-linux-arm64-musl-1.3.14" - sources."@swc/core-linux-x64-gnu-1.3.14" - sources."@swc/core-linux-x64-musl-1.3.14" - sources."@swc/core-win32-arm64-msvc-1.3.14" - sources."@swc/core-win32-ia32-msvc-1.3.14" - sources."@swc/core-win32-x64-msvc-1.3.14" - sources."@swc/wasm-1.3.14" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."arg-5.0.2" sources."binary-extensions-2.2.0" sources."braces-3.0.2" @@ -86571,7 +86728,7 @@ in sources."glob-parent-5.1.2" ]; }) - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fsevents-2.3.2" sources."function-bind-1.1.1" @@ -86595,12 +86752,12 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-2.3.0" - sources."postcss-8.4.18" + sources."postcss-8.4.21" sources."postcss-import-14.1.0" sources."postcss-js-4.0.0" sources."postcss-load-config-3.1.4" sources."postcss-nested-6.0.0" - sources."postcss-selector-parser-6.0.10" + sources."postcss-selector-parser-6.0.11" sources."postcss-value-parser-4.2.0" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" @@ -86611,16 +86768,16 @@ in sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.2.2" + sources."tailwindcss-3.2.4" sources."to-regex-range-5.0.1" (sources."ts-node-10.9.1" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" ]; }) - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."xtend-4.0.2" @@ -86671,27 +86828,27 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.14" - sources."@swc/core-darwin-arm64-1.3.14" - sources."@swc/core-darwin-x64-1.3.14" - sources."@swc/core-linux-arm-gnueabihf-1.3.14" - sources."@swc/core-linux-arm64-gnu-1.3.14" - sources."@swc/core-linux-arm64-musl-1.3.14" - sources."@swc/core-linux-x64-gnu-1.3.14" - sources."@swc/core-linux-x64-musl-1.3.14" - sources."@swc/core-win32-arm64-msvc-1.3.14" - sources."@swc/core-win32-ia32-msvc-1.3.14" - sources."@swc/core-win32-x64-msvc-1.3.14" - sources."@swc/wasm-1.3.14" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."arg-5.0.2" sources."binary-extensions-2.2.0" sources."braces-3.0.2" @@ -86714,7 +86871,7 @@ in sources."glob-parent-5.1.2" ]; }) - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fsevents-2.3.2" sources."function-bind-1.1.1" @@ -86737,12 +86894,12 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-2.3.0" - sources."postcss-8.4.18" + sources."postcss-8.4.21" sources."postcss-import-14.1.0" sources."postcss-js-4.0.0" sources."postcss-load-config-3.1.4" sources."postcss-nested-6.0.0" - sources."postcss-selector-parser-6.0.10" + sources."postcss-selector-parser-6.0.11" sources."postcss-value-parser-4.2.0" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" @@ -86753,16 +86910,16 @@ in sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.2.2" + sources."tailwindcss-3.2.4" sources."to-regex-range-5.0.1" (sources."ts-node-10.9.1" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" ]; }) - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."xtend-4.0.2" @@ -86782,10 +86939,10 @@ in "@tailwindcss/typography" = nodeEnv.buildNodePackage { name = "_at_tailwindcss_slash_typography"; packageName = "@tailwindcss/typography"; - version = "0.5.7"; + version = "0.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.7.tgz"; - sha512 = "JTTSTrgZfp6Ki4svhPA4mkd9nmQ/j9EfE7SbHJ1cLtthKkpW2OxsFXzSmxbhYbEkfNIyAyhle5p4SYyKRbz/jg=="; + url = "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.9.tgz"; + sha512 = "t8Sg3DyynFysV9f4JDOVISGsjazNb48AeIYQwcL+Bsq5uf4RYL75C1giZ43KISjeDGBaTN3Kxh7Xj/vRSMJUUg=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" @@ -86795,27 +86952,27 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.14" - sources."@swc/core-darwin-arm64-1.3.14" - sources."@swc/core-darwin-x64-1.3.14" - sources."@swc/core-linux-arm-gnueabihf-1.3.14" - sources."@swc/core-linux-arm64-gnu-1.3.14" - sources."@swc/core-linux-arm64-musl-1.3.14" - sources."@swc/core-linux-x64-gnu-1.3.14" - sources."@swc/core-linux-x64-musl-1.3.14" - sources."@swc/core-win32-arm64-msvc-1.3.14" - sources."@swc/core-win32-ia32-msvc-1.3.14" - sources."@swc/core-win32-x64-msvc-1.3.14" - sources."@swc/wasm-1.3.14" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."arg-5.0.2" sources."binary-extensions-2.2.0" sources."braces-3.0.2" @@ -86838,7 +86995,7 @@ in sources."glob-parent-5.1.2" ]; }) - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fsevents-2.3.2" sources."function-bind-1.1.1" @@ -86864,7 +87021,7 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-2.3.0" - sources."postcss-8.4.18" + sources."postcss-8.4.21" sources."postcss-import-14.1.0" sources."postcss-js-4.0.0" sources."postcss-load-config-3.1.4" @@ -86880,16 +87037,16 @@ in sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.2.2" + sources."tailwindcss-3.2.4" sources."to-regex-range-5.0.1" (sources."ts-node-10.9.1" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" ]; }) - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."xtend-4.0.2" @@ -86909,10 +87066,10 @@ in "@uppy/companion" = nodeEnv.buildNodePackage { name = "_at_uppy_slash_companion"; packageName = "@uppy/companion"; - version = "4.0.5"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.0.5.tgz"; - sha512 = "Z3cItS4gS46fhWKQHV5PNZDgJv7Mmq/3apQpQZdDM0wfQkyfHZHlE5C2K51+AGvb+WgWqPHm7Hv7XgIrzxyjlw=="; + url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.2.0.tgz"; + sha512 = "ybgxZqfGlqGQu65rClEEBllT8rrnTcEPkz3Q+asjOwIzbmLZhRniKWXCNIW/Z5VPzSzg32zQsEPjFaSE1+iJxg=="; }; dependencies = [ sources."@redis/bloom-1.0.2" @@ -86923,10 +87080,10 @@ in sources."@redis/time-series-1.0.3" sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" - sources."@types/cacheable-request-6.0.2" + sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-4.2.0" - sources."@types/node-18.11.9" + sources."@types/keyv-3.1.4" + sources."@types/node-18.11.18" sources."@types/responselike-1.0.0" sources."accepts-1.3.8" sources."ansi-styles-4.3.0" @@ -86934,7 +87091,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1248.0" + sources."aws-sdk-2.1304.0" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { dependencies = [ @@ -87016,10 +87173,10 @@ in sources."fresh-0.5.2" sources."function-bind-1.1.1" sources."generic-pool-3.8.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."gopd-1.0.1" - sources."got-11.8.5" + sources."got-11.8.6" sources."graceful-fs-4.2.10" sources."grant-4.7.0" sources."has-1.0.3" @@ -87028,7 +87185,7 @@ in sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."helmet-4.6.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http2-wrapper-1.0.3" sources."iconv-lite-0.4.24" @@ -87043,7 +87200,7 @@ in sources."is-typed-array-1.1.10" sources."isarray-1.0.0" sources."jmespath-0.16.0" - sources."js-base64-3.7.2" + sources."js-base64-3.7.4" sources."json-buffer-3.0.1" (sources."jsonwebtoken-8.5.1" // { dependencies = [ @@ -87052,7 +87209,7 @@ in }) sources."jwa-1.4.1" sources."jws-3.2.2" - sources."keyv-4.5.1" + sources."keyv-4.5.2" sources."lodash._baseiteratee-4.7.0" sources."lodash._basetostring-4.12.0" sources."lodash._baseuniq-4.6.0" @@ -87072,7 +87229,7 @@ in sources."long-timeout-0.1.1" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" - sources."luxon-1.28.0" + sources."luxon-1.28.1" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" @@ -87081,7 +87238,7 @@ in sources."mime-types-2.1.35" sources."mimic-response-1.0.1" sources."moment-2.29.4" - sources."moment-timezone-0.5.38" + sources."moment-timezone-0.5.40" (sources."morgan-1.10.0" // { dependencies = [ sources."on-finished-2.3.0" @@ -87089,12 +87246,12 @@ in }) sources."ms-2.1.3" sources."negotiator-0.6.3" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."node-schedule-2.1.0" sources."normalize-url-6.1.0" sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."object-keys-1.1.1" sources."on-finished-2.4.1" sources."on-headers-1.0.2" @@ -87136,7 +87293,7 @@ in sources."semver-7.3.7" sources."send-0.18.0" sources."serialize-error-2.1.0" - sources."serialize-javascript-6.0.0" + sources."serialize-javascript-6.0.1" sources."serve-static-1.15.0" sources."setprototypeof-1.2.0" sources."side-channel-1.0.4" @@ -87188,15 +87345,12 @@ in sources."@achrinza/node-ipc-9.2.6" sources."@akryum/winattr-3.0.0" sources."@ampproject/remapping-2.2.0" - (sources."@apollo/protobufjs-1.2.6" // { - dependencies = [ - sources."@types/node-10.17.60" - ]; - }) + sources."@apollo/protobufjs-1.2.7" + sources."@apollo/usage-reporting-protobuf-4.0.2" sources."@apollo/utils.dropunuseddefinitions-1.1.0" - (sources."@apollo/utils.keyvaluecache-1.0.1" // { + (sources."@apollo/utils.keyvaluecache-1.0.2" // { dependencies = [ - sources."lru-cache-7.14.1" + sources."lru-cache-7.13.1" ]; }) sources."@apollo/utils.logger-1.0.1" @@ -87204,30 +87358,32 @@ in sources."@apollo/utils.removealiases-1.0.0" sources."@apollo/utils.sortast-1.1.0" sources."@apollo/utils.stripsensitiveliterals-1.2.0" - sources."@apollo/utils.usagereporting-1.0.0" + sources."@apollo/utils.usagereporting-1.0.1" sources."@apollographql/apollo-tools-0.5.4" sources."@apollographql/graphql-playground-html-1.6.29" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.1" - (sources."@babel/core-7.20.2" // { + sources."@babel/compat-data-7.20.14" + (sources."@babel/core-7.20.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.2" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; }) sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" - (sources."@babel/helper-compilation-targets-7.20.0" // { + (sources."@babel/helper-compilation-targets-7.20.7" // { dependencies = [ + sources."lru-cache-5.1.1" sources."semver-6.3.0" + sources."yallist-3.1.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.20.2" - sources."@babel/helper-create-regexp-features-plugin-7.19.0" + sources."@babel/helper-create-class-features-plugin-7.20.12" + sources."@babel/helper-create-regexp-features-plugin-7.20.5" (sources."@babel/helper-define-polyfill-provider-0.3.3" // { dependencies = [ sources."semver-6.3.0" @@ -87237,21 +87393,21 @@ in sources."@babel/helper-explode-assignable-expression-7.18.6" sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.18.9" + sources."@babel/helper-member-expression-to-functions-7.20.7" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.2" + sources."@babel/helper-module-transforms-7.20.11" sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.20.2" sources."@babel/helper-remap-async-to-generator-7.18.9" - sources."@babel/helper-replace-supers-7.19.1" + sources."@babel/helper-replace-supers-7.20.7" sources."@babel/helper-simple-access-7.20.2" sources."@babel/helper-skip-transparent-expression-wrappers-7.20.0" sources."@babel/helper-split-export-declaration-7.18.6" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helper-wrap-function-7.19.0" - sources."@babel/helpers-7.20.1" + sources."@babel/helper-wrap-function-7.20.5" + sources."@babel/helpers-7.20.13" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -87262,23 +87418,23 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.20.2" + sources."@babel/parser-7.20.13" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" - sources."@babel/plugin-proposal-async-generator-functions-7.20.1" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" + sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" - sources."@babel/plugin-proposal-class-static-block-7.18.6" + sources."@babel/plugin-proposal-class-static-block-7.20.7" sources."@babel/plugin-proposal-dynamic-import-7.18.6" sources."@babel/plugin-proposal-export-namespace-from-7.18.9" sources."@babel/plugin-proposal-json-strings-7.18.6" - sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" + sources."@babel/plugin-proposal-logical-assignment-operators-7.20.7" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.20.2" + sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" - sources."@babel/plugin-proposal-optional-chaining-7.18.9" + sources."@babel/plugin-proposal-optional-chaining-7.20.7" sources."@babel/plugin-proposal-private-methods-7.18.6" - sources."@babel/plugin-proposal-private-property-in-object-7.18.6" + sources."@babel/plugin-proposal-private-property-in-object-7.20.5" sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" @@ -87297,13 +87453,13 @@ in sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" sources."@babel/plugin-syntax-typescript-7.20.0" - sources."@babel/plugin-transform-arrow-functions-7.18.6" - sources."@babel/plugin-transform-async-to-generator-7.18.6" + sources."@babel/plugin-transform-arrow-functions-7.20.7" + sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.2" - sources."@babel/plugin-transform-classes-7.20.2" - sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.20.2" + sources."@babel/plugin-transform-block-scoping-7.20.14" + sources."@babel/plugin-transform-classes-7.20.7" + sources."@babel/plugin-transform-computed-properties-7.20.7" + sources."@babel/plugin-transform-destructuring-7.20.7" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -87312,23 +87468,23 @@ in sources."@babel/plugin-transform-function-name-7.18.9" sources."@babel/plugin-transform-literals-7.18.9" sources."@babel/plugin-transform-member-expression-literals-7.18.6" - sources."@babel/plugin-transform-modules-amd-7.19.6" - sources."@babel/plugin-transform-modules-commonjs-7.19.6" - sources."@babel/plugin-transform-modules-systemjs-7.19.6" + sources."@babel/plugin-transform-modules-amd-7.20.11" + sources."@babel/plugin-transform-modules-commonjs-7.20.11" + sources."@babel/plugin-transform-modules-systemjs-7.20.11" sources."@babel/plugin-transform-modules-umd-7.18.6" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.19.1" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.20.5" sources."@babel/plugin-transform-new-target-7.18.6" sources."@babel/plugin-transform-object-super-7.18.6" - sources."@babel/plugin-transform-parameters-7.20.1" + sources."@babel/plugin-transform-parameters-7.20.7" sources."@babel/plugin-transform-property-literals-7.18.6" - sources."@babel/plugin-transform-regenerator-7.18.6" + sources."@babel/plugin-transform-regenerator-7.20.5" sources."@babel/plugin-transform-reserved-words-7.18.6" sources."@babel/plugin-transform-shorthand-properties-7.18.6" - sources."@babel/plugin-transform-spread-7.19.0" + sources."@babel/plugin-transform-spread-7.20.7" sources."@babel/plugin-transform-sticky-regex-7.18.6" sources."@babel/plugin-transform-template-literals-7.18.9" sources."@babel/plugin-transform-typeof-symbol-7.18.9" - sources."@babel/plugin-transform-typescript-7.20.2" + sources."@babel/plugin-transform-typescript-7.20.13" sources."@babel/plugin-transform-unicode-escapes-7.18.10" sources."@babel/plugin-transform-unicode-regex-7.18.6" (sources."@babel/preset-env-7.20.2" // { @@ -87346,16 +87502,17 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.20.1" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.20.1" - sources."@babel/types-7.20.2" + sources."@babel/runtime-7.20.13" + sources."@babel/template-7.20.7" + sources."@babel/traverse-7.20.13" + sources."@babel/types-7.20.7" sources."@graphql-tools/merge-8.3.1" - (sources."@graphql-tools/mock-8.7.10" // { + (sources."@graphql-tools/mock-8.7.16" // { dependencies = [ - sources."@graphql-tools/merge-8.3.10" - sources."@graphql-tools/schema-9.0.8" - sources."@graphql-tools/utils-9.0.1" + sources."@graphql-tools/merge-8.3.16" + sources."@graphql-tools/schema-9.0.14" + sources."@graphql-tools/utils-9.1.4" + sources."value-or-promise-1.0.12" ]; }) sources."@graphql-tools/schema-8.5.1" @@ -87383,7 +87540,7 @@ in 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/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-0.7.0" sources."@types/accepts-1.3.5" @@ -87393,7 +87550,7 @@ in sources."@types/ejs-3.1.1" sources."@types/express-4.17.14" sources."@types/express-serve-static-core-4.17.31" - sources."@types/inquirer-8.2.4" + sources."@types/inquirer-8.2.5" (sources."@types/jscodeshift-0.7.2" // { dependencies = [ sources."ast-types-0.12.1" @@ -87402,7 +87559,7 @@ in }) sources."@types/long-4.0.2" sources."@types/mime-3.0.1" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -87416,10 +87573,10 @@ in }) sources."@vue/cli-ui-addon-webpack-5.0.8" sources."@vue/cli-ui-addon-widgets-5.0.8" - sources."@vue/compiler-core-3.2.41" - sources."@vue/compiler-dom-3.2.41" - sources."@vue/compiler-sfc-2.7.13" - sources."@vue/shared-3.2.41" + sources."@vue/compiler-core-3.2.45" + sources."@vue/compiler-dom-3.2.45" + sources."@vue/compiler-sfc-2.7.14" + sources."@vue/shared-3.2.45" sources."accepts-1.3.8" sources."aggregate-error-3.1.0" sources."ansi-align-3.0.1" @@ -87431,7 +87588,12 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."apollo-datasource-3.3.2" - sources."apollo-reporting-protobuf-3.3.3" + (sources."apollo-reporting-protobuf-3.3.3" // { + dependencies = [ + sources."@apollo/protobufjs-1.2.6" + sources."@types/node-10.17.60" + ]; + }) sources."apollo-server-core-3.11.1" sources."apollo-server-env-4.2.1" sources."apollo-server-errors-3.3.1" @@ -87506,7 +87668,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -87555,7 +87717,7 @@ in sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-compat-3.26.0" + sources."core-js-compat-3.27.2" sources."core-util-is-1.0.3" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -87570,7 +87732,7 @@ in sources."ms-2.1.2" ]; }) - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" (sources."decompress-4.2.1" // { dependencies = [ sources."pify-2.3.0" @@ -87679,14 +87841,14 @@ in }) sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fd-slicer-1.1.0" sources."figures-3.2.0" sources."file-type-8.1.0" (sources."filelist-1.0.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" ]; }) sources."filename-reserved-regex-2.0.0" @@ -87724,7 +87886,7 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.192.0" + sources."flow-parser-0.198.2" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -87743,7 +87905,7 @@ in sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-proxy-2.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -87791,7 +87953,7 @@ in sources."human-signals-2.1.0" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."import-global-0.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" @@ -87861,7 +88023,7 @@ in sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.3.1" - sources."json5-2.2.1" + sources."json5-2.2.3" sources."jsonfile-6.1.0" sources."keyv-3.0.0" sources."kind-of-6.0.3" @@ -87875,7 +88037,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.sortby-4.7.0" sources."log-symbols-4.1.0" - sources."loglevel-1.8.0" + sources."loglevel-1.8.1" sources."long-4.0.0" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" @@ -87909,17 +88071,17 @@ in sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."nice-try-1.0.5" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."node-dir-0.1.17" - sources."node-fetch-2.6.7" - sources."node-gyp-build-4.5.0" + sources."node-fetch-2.6.8" + sources."node-gyp-build-4.6.0" (sources."node-notifier-10.0.1" // { dependencies = [ sources."uuid-8.3.2" sources."which-2.0.2" ]; }) - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -87946,7 +88108,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."on-finished-2.4.1" @@ -88005,7 +88167,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-8.4.18" // { + (sources."postcss-8.4.21" // { dependencies = [ sources."nanoid-3.3.4" ]; @@ -88037,10 +88199,10 @@ in sources."recast-0.20.5" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-10.1.0" - sources."regenerator-runtime-0.13.10" - sources."regenerator-transform-0.15.0" + sources."regenerator-runtime-0.13.11" + sources."regenerator-transform-0.15.1" sources."regex-not-1.0.2" - sources."regexpu-core-5.2.1" + sources."regexpu-core-5.2.2" sources."regjsgen-0.7.1" (sources."regjsparser-0.9.1" // { dependencies = [ @@ -88061,7 +88223,7 @@ in sources."rss-parser-3.12.0" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.7" + sources."rxjs-7.8.0" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -88216,7 +88378,7 @@ in sources."toidentifier-1.0.1" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.6.0" sources."type-is-1.6.18" @@ -88224,7 +88386,7 @@ in sources."unbzip2-stream-1.4.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" + sources."unicode-match-property-value-ecmascript-2.1.0" sources."unicode-property-aliases-ecmascript-2.1.0" sources."union-value-1.0.1" sources."universalify-2.0.0" @@ -88252,7 +88414,7 @@ in sources."validate-npm-package-name-3.0.0" sources."value-or-promise-1.0.11" sources."vary-1.1.2" - sources."vue-2.7.13" + sources."vue-2.7.14" (sources."vue-codemod-0.0.5" // { dependencies = [ sources."inquirer-7.3.3" @@ -88427,13 +88589,13 @@ in }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.20.2" + sources."@babel/generator-7.20.14" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.2" - sources."@babel/template-7.18.10" - sources."@babel/types-7.20.2" + sources."@babel/parser-7.20.13" + sources."@babel/template-7.20.7" + sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.3.2" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -88514,10 +88676,10 @@ in sources."@babel/code-frame-7.18.6" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@npmcli/config-4.2.2" - sources."@npmcli/map-workspaces-2.0.4" - sources."@npmcli/name-from-folder-1.0.1" - sources."@pnpm/network.ca-file-1.0.1" + sources."@npmcli/config-6.1.1" + sources."@npmcli/map-workspaces-3.0.1" + sources."@npmcli/name-from-folder-2.0.0" + sources."@pnpm/network.ca-file-1.0.2" sources."@pnpm/npm-conf-1.0.5" sources."@sindresorhus/is-5.3.0" sources."@szmarczak/http-timer-5.0.1" @@ -88533,13 +88695,12 @@ in sources."@types/minimist-1.2.2" sources."@types/ms-0.7.31" sources."@types/nlcst-1.0.0" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/normalize-package-data-2.4.1" - sources."@types/parse5-6.0.3" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" - sources."abbrev-1.1.1" - sources."acorn-8.8.1" + sources."abbrev-2.0.0" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" (sources."ansi-align-3.0.1" // { dependencies = [ @@ -88548,13 +88709,13 @@ in }) sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" - sources."array-iterate-1.1.4" + sources."array-iterate-2.0.1" sources."arrify-1.0.1" sources."bail-2.0.2" sources."balanced-match-1.0.2" - (sources."boxen-7.0.0" // { + (sources."boxen-7.0.1" // { dependencies = [ - sources."chalk-5.1.2" + sources."chalk-5.2.0" sources."type-fest-2.19.0" ]; }) @@ -88562,8 +88723,8 @@ in sources."bubble-stream-error-1.0.0" sources."buffer-from-1.1.2" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.2" - sources."camelcase-7.0.0" + sources."cacheable-request-10.2.5" + sources."camelcase-7.0.1" (sources."camelcase-keys-8.0.2" // { dependencies = [ sources."type-fest-2.19.0" @@ -88575,12 +88736,11 @@ in sources."character-entities-html4-2.1.0" sources."character-entities-legacy-3.0.0" sources."character-reference-invalid-2.0.1" - sources."chownr-2.0.0" - sources."ci-info-3.5.0" + sources."ci-info-3.7.1" sources."cli-boxes-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."comma-separated-tokens-2.0.2" + sources."comma-separated-tokens-2.0.3" (sources."concat-stream-2.0.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -88599,7 +88759,7 @@ in sources."type-fest-1.4.0" ]; }) - sources."cuss-2.0.0" + sources."cuss-2.1.0" sources."debug-4.3.4" sources."decamelize-6.0.0" (sources."decamelize-keys-1.1.1" // { @@ -88626,13 +88786,13 @@ in sources."error-ex-1.3.2" sources."escape-goat-4.0.0" sources."escape-string-regexp-1.0.5" - sources."estree-util-is-identifier-name-2.0.1" - sources."estree-util-visit-1.2.0" + sources."estree-util-is-identifier-name-2.1.0" + sources."estree-util-visit-1.2.1" sources."event-stream-3.1.7" sources."extend-3.0.2" sources."fault-2.0.1" sources."find-up-6.3.0" - sources."form-data-encoder-2.1.3" + sources."form-data-encoder-2.1.4" sources."format-0.2.2" sources."from-0.1.7" sources."fs.realpath-1.0.0" @@ -88640,42 +88800,41 @@ in sources."get-stream-6.0.1" sources."git-diff-tree-1.1.0" sources."git-spawned-stream-1.0.1" - sources."glob-8.0.3" - (sources."global-dirs-3.0.0" // { + sources."glob-8.1.0" + (sources."global-dirs-3.0.1" // { dependencies = [ sources."ini-2.0.0" ]; }) - sources."got-12.5.2" + sources."got-12.5.3" sources."graceful-fs-4.2.10" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-yarn-3.0.0" - sources."hast-util-embedded-2.0.0" - sources."hast-util-from-parse5-7.1.0" - sources."hast-util-has-property-2.0.0" + sources."hast-util-embedded-2.0.1" + sources."hast-util-from-parse5-7.1.1" + sources."hast-util-has-property-2.0.1" sources."hast-util-is-body-ok-link-2.0.0" - sources."hast-util-is-element-2.1.2" - sources."hast-util-parse-selector-3.1.0" - sources."hast-util-phrasing-2.0.1" + sources."hast-util-is-element-2.1.3" + sources."hast-util-parse-selector-3.1.1" + sources."hast-util-phrasing-2.0.2" sources."hast-util-to-nlcst-2.2.0" sources."hast-util-to-string-2.0.0" - sources."hast-util-whitespace-2.0.0" - sources."hastscript-7.1.0" + sources."hast-util-whitespace-2.0.1" + sources."hastscript-7.2.0" sources."hosted-git-info-5.2.1" - sources."http-cache-semantics-4.1.0" - (sources."http2-wrapper-2.1.11" // { + sources."http-cache-semantics-4.1.1" + (sources."http2-wrapper-2.2.0" // { dependencies = [ sources."quick-lru-5.1.1" ]; }) - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."import-lazy-4.0.0" - sources."import-meta-resolve-2.1.0" + sources."import-meta-resolve-2.2.1" sources."imurmurhash-0.1.4" sources."indent-string-5.0.0" - sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-3.0.1" @@ -88695,46 +88854,47 @@ in sources."is-path-inside-3.0.3" sources."is-plain-obj-1.1.0" sources."is-typedarray-1.0.0" - sources."is-yarn-global-0.4.0" + sources."is-yarn-global-0.4.1" sources."isarray-0.0.1" sources."js-tokens-4.0.0" sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" - sources."keyv-4.5.1" + sources."keyv-4.5.2" sources."kind-of-6.0.3" sources."kleur-4.1.5" sources."latest-version-7.0.0" sources."limit-spawn-0.0.3" sources."lines-and-columns-1.2.4" - sources."load-plugin-5.0.0" + sources."load-plugin-5.1.0" sources."locate-path-7.1.1" - sources."longest-streak-3.0.1" + sources."longest-streak-3.1.0" sources."lowercase-keys-3.0.0" sources."lru-cache-7.14.1" sources."map-obj-4.3.0" sources."map-stream-0.1.0" - sources."markdown-table-3.0.2" - sources."mdast-comment-marker-2.1.0" - (sources."mdast-util-find-and-replace-2.2.1" // { + sources."markdown-table-3.0.3" + sources."mdast-comment-marker-2.1.1" + (sources."mdast-util-find-and-replace-2.2.2" // { dependencies = [ sources."escape-string-regexp-5.0.0" ]; }) - sources."mdast-util-from-markdown-1.2.0" - sources."mdast-util-frontmatter-1.0.0" + sources."mdast-util-from-markdown-1.3.0" + sources."mdast-util-frontmatter-1.0.1" sources."mdast-util-gfm-2.0.1" sources."mdast-util-gfm-autolink-literal-1.0.2" - sources."mdast-util-gfm-footnote-1.0.1" + sources."mdast-util-gfm-footnote-1.0.2" sources."mdast-util-gfm-strikethrough-1.0.2" sources."mdast-util-gfm-table-1.0.6" - sources."mdast-util-gfm-task-list-item-1.0.1" + sources."mdast-util-gfm-task-list-item-1.0.2" sources."mdast-util-mdx-2.0.0" sources."mdast-util-mdx-expression-1.3.1" sources."mdast-util-mdx-jsx-2.1.0" sources."mdast-util-mdxjs-esm-1.3.0" - sources."mdast-util-to-markdown-1.3.0" + sources."mdast-util-phrasing-3.0.1" + sources."mdast-util-to-markdown-1.5.0" sources."mdast-util-to-nlcst-5.2.1" - sources."mdast-util-to-string-3.1.0" + sources."mdast-util-to-string-3.1.1" sources."meow-11.0.0" sources."micromark-3.1.0" sources."micromark-core-commonmark-1.0.6" @@ -88746,14 +88906,14 @@ in 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-expression-1.0.4" 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.3" sources."micromark-factory-destination-1.0.0" sources."micromark-factory-label-1.0.2" - sources."micromark-factory-mdx-expression-1.0.6" + sources."micromark-factory-mdx-expression-1.0.7" sources."micromark-factory-space-1.0.0" sources."micromark-factory-title-1.0.2" sources."micromark-factory-whitespace-1.0.0" @@ -88764,7 +88924,7 @@ 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.2.0" + sources."micromark-util-events-to-acorn-1.2.1" sources."micromark-util-html-tag-name-1.1.0" sources."micromark-util-normalize-identifier-1.0.0" sources."micromark-util-resolve-all-1.0.0" @@ -88774,21 +88934,19 @@ in sources."micromark-util-types-1.0.2" sources."mimic-response-4.0.0" sources."min-indent-1.0.1" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" sources."minimist-1.2.7" sources."minimist-options-4.1.0" - sources."mkdirp-1.0.4" - sources."mkdirp-infer-owner-2.0.0" sources."mri-1.2.0" sources."ms-2.1.2" - sources."nlcst-is-literal-2.1.0" - sources."nlcst-normalize-3.1.0" - sources."nlcst-search-3.1.0" - sources."nlcst-to-string-3.1.0" - sources."nopt-6.0.0" + sources."nlcst-is-literal-2.1.1" + sources."nlcst-normalize-3.1.1" + sources."nlcst-search-3.1.1" + sources."nlcst-to-string-3.1.1" + sources."nopt-7.0.0" sources."normalize-package-data-4.0.1" - sources."normalize-url-7.2.0" - sources."npm-normalize-package-bin-1.0.1" + sources."normalize-url-8.0.0" + sources."npm-normalize-package-bin-3.0.0" sources."object-keys-0.4.0" sources."once-1.4.0" sources."p-cancelable-3.0.0" @@ -88802,18 +88960,19 @@ in }) sources."parse-entities-4.0.0" sources."parse-json-5.2.0" - (sources."parse-latin-5.0.0" // { + (sources."parse-latin-5.0.1" // { dependencies = [ - sources."nlcst-to-string-2.0.4" + sources."unist-util-modify-children-3.1.1" + sources."unist-util-visit-children-2.0.2" ]; }) sources."parse5-6.0.1" sources."path-exists-5.0.0" sources."pause-stream-0.0.11" sources."pluralize-8.0.0" - sources."proc-log-2.0.1" + sources."proc-log-3.0.0" sources."process-nextick-args-1.0.7" - sources."property-information-6.1.1" + sources."property-information-6.2.0" sources."proto-list-1.2.4" sources."pump-1.0.3" sources."pump-chain-1.0.0" @@ -88825,7 +88984,11 @@ in sources."ini-1.3.8" ]; }) - sources."read-package-json-fast-2.0.3" + (sources."read-package-json-fast-3.0.2" // { + dependencies = [ + sources."json-parse-even-better-errors-3.0.0" + ]; + }) (sources."read-pkg-7.1.0" // { dependencies = [ sources."hosted-git-info-4.1.0" @@ -88855,7 +89018,7 @@ in sources."responselike-3.0.0" sources."retext-english-4.1.0" sources."retext-equality-6.6.0" - sources."retext-profanities-7.2.1" + sources."retext-profanities-7.2.2" sources."sade-1.8.1" sources."safe-buffer-5.2.1" (sources."semver-7.3.8" // { @@ -88866,7 +89029,7 @@ in sources."semver-diff-4.0.0" sources."signal-exit-3.0.7" sources."sliced-1.0.1" - sources."space-separated-tokens-2.0.1" + sources."space-separated-tokens-2.0.2" (sources."spawn-to-readstream-0.1.3" // { dependencies = [ sources."through2-0.4.2" @@ -88908,17 +89071,17 @@ in sources."to-vfile-7.2.3" sources."trim-newlines-4.0.2" sources."trough-2.1.0" - sources."type-fest-3.2.0" + sources."type-fest-3.5.3" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."unherit-3.0.0" + sources."unherit-3.0.1" (sources."unified-10.1.2" // { dependencies = [ sources."is-plain-obj-4.1.0" ]; }) sources."unified-diff-4.0.1" - (sources."unified-engine-10.0.1" // { + (sources."unified-engine-10.1.0" // { dependencies = [ sources."is-plain-obj-4.1.0" sources."lines-and-columns-2.0.3" @@ -88932,31 +89095,35 @@ in ]; }) sources."unique-string-3.0.0" - sources."unist-util-inspect-7.0.1" - sources."unist-util-is-5.1.1" - sources."unist-util-modify-children-2.0.0" - sources."unist-util-position-4.0.3" - sources."unist-util-position-from-estree-1.1.1" - sources."unist-util-remove-position-4.0.1" - sources."unist-util-stringify-position-3.0.2" - sources."unist-util-visit-4.1.1" + sources."unist-util-inspect-7.0.2" + sources."unist-util-is-5.2.0" + (sources."unist-util-modify-children-2.0.0" // { + dependencies = [ + sources."array-iterate-1.1.4" + ]; + }) + sources."unist-util-position-4.0.4" + sources."unist-util-position-from-estree-1.1.2" + sources."unist-util-remove-position-4.0.2" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" sources."unist-util-visit-children-1.1.4" - sources."unist-util-visit-parents-5.1.1" + sources."unist-util-visit-parents-5.1.3" (sources."update-notifier-6.0.2" // { dependencies = [ - sources."chalk-5.1.2" + sources."chalk-5.2.0" ]; }) sources."util-deprecate-1.0.2" sources."uvu-0.5.6" sources."validate-npm-package-license-3.0.4" - sources."vfile-5.3.5" + sources."vfile-5.3.6" sources."vfile-find-up-6.0.0" sources."vfile-location-4.0.1" - sources."vfile-message-3.1.2" + sources."vfile-message-3.1.3" (sources."vfile-reporter-7.0.4" // { dependencies = [ - sources."supports-color-9.2.3" + sources."supports-color-9.3.1" ]; }) sources."vfile-sort-3.0.0" @@ -88964,7 +89131,7 @@ in sources."walk-up-path-1.0.0" sources."web-namespaces-2.0.1" sources."widest-line-4.0.1" - (sources."wrap-ansi-8.0.1" // { + (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-regex-6.0.1" sources."ansi-styles-6.2.1" @@ -88976,10 +89143,10 @@ in sources."xdg-basedir-5.1.0" sources."xtend-2.1.2" sources."yallist-4.0.0" - sources."yaml-2.1.3" + sources."yaml-2.2.1" sources."yargs-parser-21.1.1" sources."yocto-queue-1.0.0" - sources."zwitch-2.0.2" + sources."zwitch-2.0.4" ]; buildInputs = globalBuildInputs; meta = { @@ -89002,30 +89169,30 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.1" - sources."@babel/core-7.20.2" - (sources."@babel/generator-7.20.2" // { + sources."@babel/compat-data-7.20.14" + sources."@babel/core-7.20.12" + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/helper-compilation-targets-7.20.0" + sources."@babel/helper-compilation-targets-7.20.7" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.2" + sources."@babel/helper-module-transforms-7.20.11" sources."@babel/helper-simple-access-7.20.2" sources."@babel/helper-split-export-declaration-7.18.6" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.1" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.2" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.20.1" - sources."@babel/types-7.20.2" + sources."@babel/parser-7.20.13" + sources."@babel/template-7.20.7" + sources."@babel/traverse-7.20.13" + sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -89039,7 +89206,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" sources."browserslist-4.21.4" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -89055,7 +89222,7 @@ in sources."escape-string-regexp-1.0.5" (sources."filelist-1.0.4" // { dependencies = [ - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" ]; }) sources."fs-extra-5.0.0" @@ -89095,10 +89262,11 @@ in }) sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."json5-2.2.1" + sources."json5-2.2.3" sources."jsonfile-4.0.0" sources."jsonlint-1.6.3" sources."lodash-4.17.21" + sources."lru-cache-5.1.1" sources."matcher-collection-1.1.2" (sources."minimatch-3.1.2" // { dependencies = [ @@ -89107,7 +89275,7 @@ in }) sources."moment-2.29.1" sources."ms-2.1.2" - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { dependencies = [ @@ -89134,6 +89302,7 @@ in sources."which-1.3.1" sources."xml2js-0.2.8" sources."xml2tss-0.0.5" + sources."yallist-3.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -89165,7 +89334,7 @@ in sources."async-2.6.4" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."axios-0.24.0" sources."axios-digest-0.3.0" sources."bcrypt-pbkdf-1.0.2" @@ -89238,7 +89407,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.2" sources."keygrip-1.1.0" - sources."koa-2.13.4" + sources."koa-2.14.1" sources."koa-compose-4.2.0" sources."koa-convert-2.0.0" sources."koa-logger-3.2.1" @@ -89283,7 +89452,7 @@ in sources."path-to-regexp-1.8.0" sources."performance-now-2.1.0" sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."request-2.88.2" sources."require-directory-2.1.1" @@ -89350,7 +89519,7 @@ in dependencies = [ sources."@types/glob-7.2.0" sources."@types/minimatch-5.1.2" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -89435,15 +89604,15 @@ in }; dependencies = [ sources."browserslist-4.21.4" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."electron-to-chromium-1.4.284" sources."escalade-3.1.1" sources."fraction.js-4.2.0" sources."nanoid-3.3.4" - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" sources."normalize-range-0.1.2" sources."picocolors-1.0.0" - sources."postcss-8.4.18" + sources."postcss-8.4.21" sources."postcss-value-parser-4.2.0" sources."source-map-js-1.0.2" sources."update-browserslist-db-1.0.10" @@ -89474,7 +89643,7 @@ in sources."lru-cache-6.0.0" sources."minimist-1.2.7" sources."neo-async-2.6.2" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."parse-github-url-1.0.2" sources."safer-buffer-2.1.2" sources."semver-7.3.8" @@ -89499,22 +89668,24 @@ in aws-azure-login = nodeEnv.buildNodePackage { name = "aws-azure-login"; packageName = "aws-azure-login"; - version = "3.4.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-azure-login/-/aws-azure-login-3.4.0.tgz"; - sha512 = "7PXkWdq+3NL7hUmLOV1yoO6OnVNcT54UVtC6WT1gE9C9dYGG0bEL9nsZz8qiV75hvX1E6fABjw1/Q7KaXgvHfg=="; + url = "https://registry.npmjs.org/aws-azure-login/-/aws-azure-login-3.6.0.tgz"; + sha512 = "mdmR7H1P1Cqw91X5jIgiUjayvtMZAhepS/sJVLlYGsA36If1SihPQl661sJFxP7nkgTkqom4km1I+WG4m2mzsQ=="; }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/yauzl-2.10.0" + sources."acorn-8.8.2" + sources."acorn-walk-8.2.0" 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."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1248.0" // { + (sources."aws-sdk-2.1304.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -89536,8 +89707,8 @@ in sources."call-bind-1.0.2" sources."chalk-4.1.2" sources."chardet-0.7.0" - sources."cheerio-1.0.0-rc.10" - sources."cheerio-select-1.6.0" + sources."cheerio-1.0.0-rc.12" + sources."cheerio-select-2.1.0" sources."chownr-1.1.4" sources."cli-cursor-3.1.0" sources."cli-spinners-2.7.0" @@ -89545,25 +89716,31 @@ in sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-8.3.0" + sources."commander-9.5.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.3" - sources."css-select-4.3.0" + sources."cross-fetch-3.1.5" + sources."css-select-5.1.0" sources."css-what-6.1.0" sources."data-uri-to-buffer-3.0.1" sources."debug-4.3.4" sources."deep-is-0.1.4" sources."defaults-1.0.4" - sources."degenerator-2.2.0" + sources."degenerator-3.0.2" sources."depd-2.0.0" - sources."devtools-protocol-0.0.901419" - sources."dom-serializer-1.4.1" + sources."devtools-protocol-0.0.981744" + sources."dom-serializer-2.0.0" sources."domelementtype-2.3.0" - sources."domhandler-4.3.1" - sources."domutils-2.8.0" + sources."domhandler-5.0.3" + sources."domutils-3.0.1" sources."emoji-regex-8.0.0" + (sources."encoding-0.1.13" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) sources."end-of-stream-1.4.4" - sources."entities-2.2.0" + sources."entities-4.4.0" sources."escape-string-regexp-1.0.5" sources."escodegen-1.14.3" sources."esprima-4.0.1" @@ -89589,7 +89766,7 @@ in ]; }) sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."get-uri-3.0.2" sources."glob-7.2.3" @@ -89599,7 +89776,7 @@ in sources."has-flag-4.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" - sources."htmlparser2-6.1.0" + sources."htmlparser2-8.0.1" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.1" @@ -89607,7 +89784,7 @@ in sources."ieee754-1.1.13" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-2.0.0" + sources."ini-3.0.1" sources."inquirer-8.2.5" sources."ip-1.1.8" sources."is-arguments-1.1.1" @@ -89627,13 +89804,13 @@ in sources."lru-cache-5.1.1" sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" sources."mkdirp-1.0.4" + sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."netmask-2.0.2" - sources."node-fetch-2.6.1" - sources."node-gyp-build-4.5.0" + sources."node-fetch-2.6.7" + sources."node-gyp-build-4.6.0" sources."nth-check-2.1.1" sources."once-1.4.0" sources."onetime-5.1.2" @@ -89643,33 +89820,28 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."pac-proxy-agent-4.1.0" - sources."pac-resolver-4.2.0" - sources."parse5-6.0.1" - sources."parse5-htmlparser2-tree-adapter-6.0.1" + sources."pac-proxy-agent-5.0.0" + sources."pac-resolver-5.0.1" + sources."parse5-7.1.2" + sources."parse5-htmlparser2-tree-adapter-7.0.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."pend-1.2.0" sources."pkg-dir-4.2.0" sources."prelude-ls-1.1.2" - sources."progress-2.0.1" - sources."proxy-agent-4.0.1" + sources."progress-2.0.3" + sources."proxy-agent-5.0.0" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."punycode-1.3.2" - (sources."puppeteer-10.4.0" // { - dependencies = [ - sources."debug-4.3.1" - sources."https-proxy-agent-5.0.0" - ]; - }) + sources."puppeteer-13.7.0" sources."querystring-0.2.0" 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.7" + sources."rxjs-7.8.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.1" @@ -89688,19 +89860,16 @@ in 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.6" - ]; - }) + sources."tar-fs-2.1.1" sources."tar-stream-2.2.0" sources."through-2.3.8" sources."tmp-0.0.33" sources."toidentifier-1.0.1" - sources."tslib-2.4.1" + sources."tr46-0.0.3" + sources."tslib-2.5.0" sources."type-check-0.3.2" sources."type-fest-0.21.3" - (sources."unbzip2-stream-1.3.3" // { + (sources."unbzip2-stream-1.4.3" // { dependencies = [ sources."buffer-5.7.1" ]; @@ -89712,12 +89881,15 @@ in sources."util-0.12.5" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" + sources."vm2-3.9.13" sources."wcwidth-1.0.1" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-typed-array-1.1.9" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.4.6" + sources."ws-8.5.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xregexp-2.0.0" @@ -89727,7 +89899,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Use Azure AD SSO to log into the AWS CLI."; - homepage = "https://github.com/sportradar/aws-azure-login#readme"; + homepage = "https://github.com/aws-azure-login/aws-azure-login#readme"; license = "MIT"; }; production = true; @@ -89737,10 +89909,10 @@ in aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; - version = "2.50.0"; + version = "2.62.2"; src = fetchurl { - url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.50.0.tgz"; - sha512 = "55vmKTf2DZRqioumVfXn+S0H9oAbpRK3HFHY8EjZ5ykR5tq2+XiMWEZkYduX2HJhVAeHJJIS6h+Okk3smZjeqw=="; + url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.62.2.tgz"; + sha512 = "fACUQEdc43AfiqKKXUZLuHB2VADLU965hl50Fn6BhMemFmUsc+iS/GFfOwvfCUO3/iaRtsn/gk+dQ3zZ+snKRw=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -89758,10 +89930,10 @@ in awesome-lint = nodeEnv.buildNodePackage { name = "awesome-lint"; packageName = "awesome-lint"; - version = "0.18.0"; + version = "0.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/awesome-lint/-/awesome-lint-0.18.0.tgz"; - sha512 = "Jc5aV6fjaAnx5Rmgk26lSUAreSU4UAFrRdedTYK1x2yXB5348X5bHN7J0xUf70AUw5ujloYVkZPCw4mwuVXllg=="; + url = "https://registry.npmjs.org/awesome-lint/-/awesome-lint-0.18.1.tgz"; + sha512 = "BH2O+hQsUvsStpHvQeSsXHFZ27CqA0JPxu0w8y8bVW5y1hx5BdcGjxAdz+OyjlIns0Iqih44oGQ6XVrkIkAP4g=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -89859,7 +90031,7 @@ in sources."execa-1.0.0" sources."extend-3.0.2" sources."fast-glob-3.2.12" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."fs.realpath-1.0.0" @@ -89878,15 +90050,15 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."hosted-git-info-4.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."ieee754-1.2.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."indent-string-4.0.0" sources."indexed-filter-1.0.3" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."inspect-with-kind-1.0.5" - sources."irregular-plurals-3.3.0" + sources."irregular-plurals-3.4.0" sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" @@ -90176,10 +90348,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "13.4.0"; + version = "13.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-13.4.0.tgz"; - sha512 = "0SDz6JleVLPBzz68uRVIgUfNGKynEpNvWK0zV9PDP8k4PQgBar9ZCUvZVgmLw+gaatHCww7H2Ry7A0+RXWVWTg=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-13.24.0.tgz"; + sha512 = "QP3hY4Ehgjnl5mXmHuXzgU/rnRpMTlpMxr3+JytC2NTNTUTjD5NSm+jJ+fUTHfcfGa8Plos2RTTmiqamHEE7uw=="; }; dependencies = [ (sources."@alexbosworth/caporal-1.4.4" // { @@ -90188,7 +90360,7 @@ in ]; }) sources."@alexbosworth/cli-table3-0.6.1" - sources."@alexbosworth/fiat-1.0.3" + sources."@alexbosworth/fiat-1.0.4" sources."@alexbosworth/html2unicode-1.1.5" sources."@alexbosworth/node-fetch-2.6.2" (sources."@alexbosworth/prettyjson-1.2.2" // { @@ -90205,10 +90377,12 @@ in }) sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" - sources."@grammyjs/types-2.10.0" - sources."@grpc/grpc-js-1.7.0" - sources."@grpc/proto-loader-0.7.2" + sources."@grammyjs/types-2.11.2" + sources."@grpc/grpc-js-1.8.4" + sources."@grpc/proto-loader-0.7.4" sources."@handsontable/formulajs-2.0.2" + sources."@json2csv/formatters-6.1.2" + sources."@json2csv/plainjs-6.1.2" sources."@mitmaro/errors-1.0.0" sources."@mitmaro/http-authorization-header-1.0.0" sources."@protobufjs/aspromise-1.1.2" @@ -90221,20 +90395,21 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" + sources."@streamparser/json-0.0.10" sources."@types/body-parser-1.19.2" sources."@types/caseless-0.12.2" sources."@types/connect-3.4.35" - sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.31" + sources."@types/express-4.17.15" + sources."@types/express-serve-static-core-4.17.33" sources."@types/long-4.0.2" sources."@types/mime-3.0.1" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/request-2.48.8" sources."@types/serve-static-1.15.0" sources."@types/tough-cookie-4.0.2" - sources."@types/ws-8.5.3" + sources."@types/ws-8.5.4" sources."abort-controller-3.0.0" sources."accepts-1.3.8" (sources."agent-base-6.0.2" // { @@ -90243,7 +90418,7 @@ in sources."ms-2.1.2" ]; }) - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."ansi-0.3.1" sources."ansi-escapes-1.4.0" sources."ansi-regex-5.0.1" @@ -90253,7 +90428,7 @@ in sources."asciichart-1.5.25" sources."astral-regex-2.0.0" sources."async-3.2.4" - sources."asyncjs-util-1.2.10" + sources."asyncjs-util-1.2.11" sources."asynckit-0.4.0" sources."base-x-3.0.9" sources."base64-js-1.5.1" @@ -90265,7 +90440,7 @@ in sources."bip66-1.1.5" sources."bip68-1.0.4" sources."bitcoin-ops-1.4.1" - sources."bitcoinjs-lib-6.0.2" + sources."bitcoinjs-lib-6.1.0" (sources."bl-5.1.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -90273,15 +90448,11 @@ in }) sources."bluebird-3.7.2" sources."bn.js-5.2.1" - sources."body-parser-1.20.0" - sources."bolt01-1.2.5" - (sources."bolt03-1.2.14" // { - dependencies = [ - sources."bitcoinjs-lib-6.0.1" - ]; - }) - sources."bolt07-1.8.2" - sources."bolt09-0.2.3" + sources."body-parser-1.20.1" + sources."bolt01-1.2.6" + sources."bolt03-1.2.15" + sources."bolt07-1.8.3" + sources."bolt09-0.2.5" sources."bs58-4.0.1" sources."bs58check-2.1.2" sources."buffer-6.0.3" @@ -90312,7 +90483,6 @@ in sources."colors-1.4.0" sources."colorspace-1.1.4" sources."combined-stream-1.0.8" - sources."commander-6.2.1" sources."concat-stream-1.6.2" (sources."content-disposition-0.5.4" // { dependencies = [ @@ -90326,7 +90496,7 @@ in sources."cors-2.8.5" sources."create-hash-1.2.0" sources."crypto-js-4.1.1" - sources."csv-parse-5.3.1" + sources."csv-parse-5.3.3" sources."debug-2.6.9" sources."defaults-1.0.4" sources."define-property-1.0.0" @@ -90351,7 +90521,7 @@ in sources."etag-1.8.1" sources."event-target-shim-5.0.1" sources."exit-hook-1.1.1" - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ sources."safe-buffer-5.2.1" ]; @@ -90370,22 +90540,13 @@ in sources."function-bind-1.1.1" sources."gauge-1.2.7" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" - (sources."goldengate-11.4.0" // { + sources."get-intrinsic-1.2.0" + (sources."goldengate-12.0.2" // { dependencies = [ - sources."@types/node-18.7.14" - sources."ecpair-2.0.1" - sources."ln-service-53.23.0" - (sources."ln-sync-3.14.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.6.11" - sources."lightning-5.20.2" - sources."ln-service-53.22.0" - ]; - }) + sources."ln-sync-4.2.0" ]; }) - (sources."grammy-1.12.0" // { + (sources."grammy-1.13.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -90417,7 +90578,7 @@ in sources."ansi-escapes-6.0.0" sources."ansi-regex-6.0.1" sources."ansi-styles-6.2.1" - sources."chalk-5.1.2" + sources."chalk-5.2.0" sources."cli-cursor-4.0.0" sources."cli-width-4.0.0" sources."emoji-regex-9.2.2" @@ -90430,11 +90591,10 @@ in sources."string-width-5.1.2" sources."strip-ansi-7.0.1" sources."tmp-0.0.33" - sources."type-fest-3.2.0" - sources."wrap-ansi-8.0.1" + sources."wrap-ansi-8.1.0" ]; }) - sources."invoices-2.2.0" + sources."invoices-2.2.3" sources."ip-2.0.0" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" @@ -90453,82 +90613,19 @@ in sources."is-unicode-supported-1.3.0" sources."isarray-1.0.0" sources."json-schema-traverse-1.0.0" - sources."json2csv-5.0.7" - sources."jsonparse-1.3.1" - sources."jstat-1.9.5" + sources."jstat-1.9.6" sources."kind-of-6.0.3" sources."kuler-2.0.0" - (sources."lightning-5.21.0" // { + (sources."lightning-7.0.3" // { dependencies = [ - sources."@grpc/grpc-js-1.6.12" - sources."@types/node-18.7.14" - sources."ecpair-2.0.1" - ]; - }) - (sources."ln-accounting-6.1.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.7.2" - sources."@grpc/proto-loader-0.7.3" - sources."@types/express-4.17.14" - sources."@types/node-18.11.2" - sources."body-parser-1.20.1" - sources."express-4.18.2" - sources."lightning-6.2.4" - sources."ln-service-54.2.3" - sources."qs-6.11.0" - sources."safe-buffer-5.2.1" - sources."type-fest-3.1.0" - sources."ws-8.9.0" - ]; - }) - (sources."ln-service-54.2.6" // { - dependencies = [ - sources."@grpc/grpc-js-1.7.3" - sources."@grpc/proto-loader-0.7.3" - sources."@types/express-4.17.14" - sources."body-parser-1.20.1" - sources."bolt09-0.2.4" - sources."express-4.18.2" - sources."lightning-6.2.7" - sources."qs-6.11.0" - sources."safe-buffer-5.2.1" - sources."type-fest-3.1.0" - sources."ws-8.10.0" - ]; - }) - sources."ln-sync-4.0.5" - (sources."ln-telegram-4.2.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.7.2" - sources."@grpc/proto-loader-0.7.3" - sources."@types/express-4.17.14" - sources."@types/node-18.11.2" - (sources."body-parser-1.20.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."debug-4.3.4" - (sources."express-4.18.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."grammy-1.11.2" - sources."lightning-6.2.4" - sources."ln-service-54.2.3" - sources."ln-sync-4.0.4" - sources."ms-2.1.2" - sources."paid-services-4.0.1" - sources."qs-6.11.0" - sources."safe-buffer-5.2.1" - sources."table-6.8.0" - sources."type-fest-3.1.0" - sources."ws-8.9.0" + sources."@grpc/grpc-js-1.8.1" + sources."type-fest-3.5.1" ]; }) + sources."ln-accounting-6.1.3" + sources."ln-service-54.9.0" + sources."ln-sync-4.3.0" + sources."ln-telegram-4.6.1" sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.difference-4.5.0" @@ -90540,7 +90637,7 @@ in sources."lodash.uniq-4.5.0" (sources."log-symbols-5.1.0" // { dependencies = [ - sources."chalk-5.1.2" + sources."chalk-5.2.0" ]; }) (sources."logform-2.4.2" // { @@ -90549,7 +90646,7 @@ in ]; }) sources."long-4.0.0" - sources."luxon-3.0.4" + sources."luxon-3.2.1" sources."macaroon-3.0.4" sources."md5.js-1.3.5" sources."media-typer-0.3.0" @@ -90571,13 +90668,13 @@ in sources."ms-2.0.0" sources."mute-stream-0.0.6" sources."negotiator-0.6.3" - sources."node-fetch-2.6.7" - sources."node-gyp-build-4.5.0" + sources."node-fetch-2.6.8" + sources."node-gyp-build-4.6.0" sources."nofilter-3.1.0" sources."npmlog-2.0.4" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."one-time-1.0.0" @@ -90585,7 +90682,7 @@ in (sources."ora-6.1.2" // { dependencies = [ sources."ansi-regex-6.0.1" - sources."chalk-5.1.2" + sources."chalk-5.2.0" sources."cli-cursor-4.0.0" sources."onetime-5.1.2" sources."restore-cursor-4.0.0" @@ -90594,41 +90691,29 @@ in }) sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" - sources."p2tr-1.3.2" - sources."paid-services-4.0.5" + sources."p2tr-1.3.3" + (sources."paid-services-4.3.0" // { + dependencies = [ + sources."ln-sync-4.2.0" + ]; + }) sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."probing-3.0.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.7.3" - sources."@grpc/proto-loader-0.7.3" - sources."@types/express-4.17.14" - sources."@types/node-18.11.7" - sources."body-parser-1.20.1" - sources."bolt09-0.2.4" - sources."express-4.18.2" - sources."lightning-6.2.5" - sources."ln-service-54.2.4" - sources."qs-6.11.0" - sources."safe-buffer-5.2.1" - sources."type-fest-3.1.0" - sources."ws-8.10.0" - ]; - }) + sources."probing-3.0.1" sources."process-nextick-args-2.0.1" - (sources."protobufjs-7.1.2" // { + (sources."protobufjs-7.2.0" // { dependencies = [ sources."long-5.2.1" ]; }) sources."proxy-addr-2.0.7" - sources."psbt-2.7.1" - sources."punycode-2.1.1" + sources."psbt-2.7.2" + sources."punycode-2.3.0" sources."pushdata-bitcoin-1.0.1" sources."qrcode-terminal-0.12.0" - sources."qs-6.10.3" + sources."qs-6.11.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" @@ -90639,9 +90724,9 @@ in sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."rx-4.1.0" - sources."rxjs-7.5.7" + sources."rxjs-7.8.0" sources."safe-buffer-5.1.2" - sources."safe-stable-stringify-2.4.1" + sources."safe-stable-stringify-2.4.2" sources."safer-buffer-2.1.2" sources."sanitize-filename-1.6.3" (sources."send-0.18.0" // { @@ -90697,10 +90782,10 @@ in sources."tr46-0.0.3" sources."triple-beam-1.3.0" sources."truncate-utf8-bytes-1.0.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tweetnacl-1.0.3" sources."tweetnacl-util-0.15.1" - sources."type-fest-2.19.0" + sources."type-fest-3.5.3" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."typeforce-1.18.0" @@ -90735,7 +90820,7 @@ in sources."color-name-1.1.4" ]; }) - sources."ws-8.8.1" + sources."ws-8.11.0" sources."y18n-5.0.8" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" @@ -90753,82 +90838,47 @@ in bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; - version = "3.1.0"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-3.1.0.tgz"; - sha512 = "DaTlZD60S3ZldAkhch5oH1vxUn8joeFw73IOnwMwmZSlbQctaDrnP7DdDPRVrrQ3uhUQlaaOGPeJCsY/a+V6pg=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.6.1.tgz"; + sha512 = "3pzB92+0/+rrR4TdONFhOtczPLQBgobu+27/X2icnS32YzgdMJd7GMzM4V6nBZsrl5jMUY4W/0ExSVGIV3o4aw=="; }; dependencies = [ - sources."ajv-6.12.6" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" - sources."balanced-match-1.0.2" - sources."bcrypt-pbkdf-1.0.2" - sources."brace-expansion-2.0.1" - sources."caseless-0.12.0" - sources."combined-stream-1.0.8" - sources."core-util-is-1.0.2" - sources."dashdash-1.14.1" - sources."delayed-stream-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."braces-3.0.2" sources."domino-2.1.6" - sources."ecc-jsbn-0.1.2" - 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."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fs.realpath-1.0.0" + sources."encoding-0.1.13" + sources."fast-glob-3.2.12" + sources."fastq-1.15.0" + sources."fill-range-7.0.1" sources."fuzzy-search-3.2.1" - sources."getpass-0.1.7" - sources."glob-8.0.3" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."http-signature-1.2.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - 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."jsprim-1.4.2" - sources."lodash-4.17.21" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimatch-5.1.0" - sources."oauth-sign-0.9.0" - sources."once-1.4.0" - sources."performance-now-2.1.0" - sources."psl-1.9.0" - sources."punycode-2.1.1" - sources."qs-6.5.3" - sources."request-2.88.2" - sources."request-promise-core-1.1.4" - sources."request-promise-native-1.0.9" - sources."safe-buffer-5.2.1" + sources."glob-parent-5.1.2" + sources."iconv-lite-0.6.3" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.3" + sources."is-number-7.0.0" + sources."merge2-1.4.1" + sources."micromatch-4.0.5" + sources."node-fetch-2.6.8" + sources."picomatch-2.3.1" + sources."queue-microtask-1.2.3" + sources."reusify-1.0.4" + sources."run-parallel-1.2.0" sources."safer-buffer-2.1.2" - sources."sshpk-1.17.0" - sources."stealthy-require-1.1.1" - sources."tough-cookie-2.5.0" - sources."tunnel-agent-0.6.0" + sources."to-regex-range-5.0.1" + sources."tr46-0.0.3" sources."turndown-7.1.1" - sources."tweetnacl-0.14.5" - sources."uri-js-4.4.1" - sources."urijs-1.19.11" - sources."uuid-3.4.0" - sources."verror-1.10.0" sources."vscode-jsonrpc-8.0.2" - sources."vscode-languageserver-6.1.1" + sources."vscode-languageserver-8.0.2" sources."vscode-languageserver-protocol-3.17.2" - sources."vscode-languageserver-textdocument-1.0.7" + sources."vscode-languageserver-textdocument-1.0.8" sources."vscode-languageserver-types-3.17.2" sources."web-tree-sitter-0.20.7" - sources."wrappy-1.0.2" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" + sources."zod-3.20.2" ]; buildInputs = globalBuildInputs; meta = { @@ -91080,7 +91130,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."gopd-1.0.1" sources."has-1.0.3" @@ -91209,20 +91259,20 @@ in browser-sync = nodeEnv.buildNodePackage { name = "browser-sync"; packageName = "browser-sync"; - version = "2.27.10"; + version = "2.27.11"; src = fetchurl { - url = "https://registry.npmjs.org/browser-sync/-/browser-sync-2.27.10.tgz"; - sha512 = "xKm+6KJmJu6RuMWWbFkKwOCSqQOxYe3nOrFkKI5Tr/ZzjPxyU3pFShKK3tWnazBo/3lYQzN7fzjixG8fwJh1Xw=="; + url = "https://registry.npmjs.org/browser-sync/-/browser-sync-2.27.11.tgz"; + sha512 = "U5f9u97OYJH66T0MGWWzG9rOQTW6ZmDMj97vsmtqwNS03JAwdLVES8eel2lD3rvAqQCNAFqaJ74NMacBI57vJg=="; }; dependencies = [ sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.12" - sources."@types/node-18.11.9" + sources."@types/cors-2.8.13" + sources."@types/node-18.11.18" sources."accepts-1.3.8" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."async-2.6.4" sources."async-each-series-0.1.1" sources."axios-0.21.4" @@ -91232,12 +91282,13 @@ in sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browser-sync-client-2.27.10" - sources."browser-sync-ui-2.27.10" + sources."browser-sync-client-2.27.11" + sources."browser-sync-ui-2.27.11" sources."bs-recipes-1.3.4" sources."bs-snippet-injector-2.0.1" sources."bufferutil-4.0.7" sources."bytes-3.1.2" + sources."call-bind-1.0.2" sources."chalk-1.1.3" sources."chokidar-3.5.3" (sources."cliui-7.0.4" // { @@ -91269,9 +91320,9 @@ in sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - sources."engine.io-6.2.0" + sources."engine.io-6.2.1" sources."engine.io-client-6.2.3" - sources."engine.io-parser-5.0.4" + sources."engine.io-parser-5.0.6" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -91288,10 +91339,14 @@ in sources."fresh-0.5.2" sources."fs-extra-3.0.1" sources."fsevents-2.3.2" + sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.2.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.10" + sources."has-1.0.3" sources."has-ansi-2.0.0" + sources."has-symbols-1.0.3" (sources."http-errors-2.0.0" // { dependencies = [ sources."statuses-2.0.1" @@ -91326,16 +91381,17 @@ in sources."mitt-1.2.0" sources."ms-2.1.2" sources."negotiator-0.6.3" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" + sources."object-inspect-1.12.3" sources."on-finished-2.3.0" sources."openurl-1.1.1" sources."opn-5.3.0" sources."parseurl-1.3.3" sources."picomatch-2.3.1" sources."portscanner-2.2.0" - sources."qs-6.2.3" + sources."qs-6.11.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" sources."readdirp-3.6.0" @@ -91375,10 +91431,11 @@ in sources."serve-static-1.13.2" sources."server-destroy-1.0.1" sources."setprototypeof-1.2.0" - sources."socket.io-4.5.3" + sources."side-channel-1.0.4" + sources."socket.io-4.5.4" sources."socket.io-adapter-2.4.0" - sources."socket.io-client-4.5.3" - sources."socket.io-parser-4.2.1" + sources."socket.io-client-4.5.4" + sources."socket.io-parser-4.2.2" sources."statuses-1.3.1" sources."stream-throttle-0.1.3" (sources."string-width-4.2.3" // { @@ -91393,7 +91450,7 @@ in sources."tfunk-4.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."ua-parser-js-1.0.2" sources."universalify-0.1.2" sources."unpipe-1.0.0" @@ -91443,8 +91500,8 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.2" - sources."@babel/types-7.20.2" + sources."@babel/parser-7.20.13" + sources."@babel/types-7.20.7" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@popperjs/core-2.11.6" @@ -91467,7 +91524,7 @@ in sources."async-3.2.4" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."axios-0.24.0" sources."babel-walk-3.0.0-canary-5" sources."balanced-match-1.0.2" @@ -91475,7 +91532,7 @@ in sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" sources."bech32-2.0.0" - sources."bignumber.js-9.1.0" + sources."bignumber.js-9.1.1" sources."bindings-1.5.0" sources."bip174-2.1.0" sources."bip32-2.0.6" @@ -91493,7 +91550,7 @@ in sources."debug-2.6.9" ]; }) - sources."bootstrap-5.2.2" + sources."bootstrap-5.2.3" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" sources."bs58-4.0.1" @@ -91565,7 +91622,7 @@ in sources."map-obj-1.0.1" ]; }) - sources."decimal.js-10.4.2" + sources."decimal.js-10.4.3" sources."delayed-stream-1.0.0" sources."denque-1.5.1" sources."depd-2.0.0" @@ -91620,7 +91677,7 @@ in sources."fresh-0.5.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."getpass-0.1.7" sources."glob-6.0.4" sources."har-schema-2.0.0" @@ -91718,7 +91775,7 @@ in sources."normalize-package-data-3.0.3" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -91753,7 +91810,7 @@ in sources."pug-runtime-3.0.1" sources."pug-strip-comments-2.0.0" sources."pug-walk-2.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."pushdata-bitcoin-1.0.1" sources."qrcode-1.5.1" sources."qs-6.11.0" @@ -91910,7 +91967,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -91925,7 +91982,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" @@ -91972,7 +92029,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-9.4.1" + sources."commander-10.0.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -92163,7 +92220,7 @@ in sources."once-1.2.0" ]; }) - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qap-3.3.1" sources."qs-6.5.3" sources."query-string-1.0.1" @@ -92439,7 +92496,7 @@ in sources."map-obj-1.0.1" ]; }) - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."deep-extend-0.6.0" sources."define-property-2.0.2" (sources."del-3.0.0" // { @@ -92849,7 +92906,7 @@ in sources."terminal-image-0.1.2" sources."through-2.3.8" sources."timed-out-4.0.1" - sources."tinycolor2-1.4.2" + sources."tinycolor2-1.5.2" sources."tmp-0.0.33" (sources."to-object-path-0.3.0" // { dependencies = [ @@ -93006,20 +93063,20 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.1.39"; + version = "2.1.119"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.1.39.tgz"; - sha512 = "wvXer3jG5wMbkyS4SL9rcVObWR4bETFjfHbjGNQcJCY9BQaCxaU9GxiZPrsFQimKV2DXwOQJ/h1KvB+Btpd8Vw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.1.119.tgz"; + sha512 = "zz7Y0MQgJQxOXOOh/ctmjlGBGrAN1D/V8d+zvrombUIADuX0jE6CYk1zhQVQra82egzpLcxJVtH49FOKjrlXmQ=="; }; dependencies = [ - sources."@jsii/check-node-1.70.0" - sources."@jsii/spec-1.70.0" + sources."@jsii/check-node-1.73.0" + sources."@jsii/spec-1.73.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-14.18.33" + sources."@types/node-14.18.36" sources."@xmldom/xmldom-0.8.6" - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."astral-regex-2.0.0" @@ -93027,12 +93084,12 @@ in sources."braces-3.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.5.37" - sources."cdk8s-plus-25-2.0.19" + sources."cdk8s-2.6.32" + sources."cdk8s-plus-25-2.4.3" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.70.0" // { + (sources."codemaker-1.73.0" // { dependencies = [ sources."fs-extra-10.1.0" ]; @@ -93041,7 +93098,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-10.1.152" + sources."constructs-10.1.233" sources."date-format-4.0.14" sources."debug-4.3.4" sources."decamelize-5.0.1" @@ -93054,7 +93111,7 @@ in sources."escape-string-regexp-4.0.0" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.12" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flatted-3.2.7" @@ -93072,41 +93129,41 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-number-7.0.0" - (sources."jsii-1.70.0" // { + (sources."jsii-1.73.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.70.0" // { + (sources."jsii-pacmak-1.73.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.70.0" // { + (sources."jsii-reflect-1.73.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.70.0" // { + (sources."jsii-rosetta-1.73.0" // { dependencies = [ sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.726" // { + (sources."jsii-srcmak-0.1.807" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.3.175" + sources."json2jsii-0.3.257" sources."jsonfile-6.1.0" sources."locate-path-5.0.0" sources."lodash.truncate-4.4.2" - sources."log4js-6.7.0" + sources."log4js-6.7.1" sources."lower-case-2.0.2" sources."lru-cache-6.0.0" sources."mdurl-1.0.1" @@ -93116,13 +93173,13 @@ in sources."ms-2.1.2" sources."ncp-2.0.0" sources."no-case-3.0.4" - sources."oo-ascii-tree-1.70.0" + sources."oo-ascii-tree-1.73.0" 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."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" @@ -93142,19 +93199,19 @@ in sources."sort-json-2.0.1" sources."spdx-license-list-6.6.0" sources."sscaff-1.2.274" - sources."streamroller-3.1.3" + sources."streamroller-3.1.4" sources."string-width-4.2.3" sources."string.prototype.repeat-0.2.0" sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."table-6.8.1" sources."to-regex-range-5.0.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."typescript-3.9.10" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."which-module-2.0.0" - sources."workerpool-6.3.0" + sources."workerpool-6.3.1" sources."wrap-ansi-7.0.0" sources."xmlbuilder-15.1.1" sources."y18n-5.0.8" @@ -93184,29 +93241,32 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.13.3"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.13.3.tgz"; - sha512 = "2gq6oltc1m+0R4Hv0VUqNWQ5Paimg5JytQ6VK1jptHEkEuLxrN2ZIJpTAs79fqDvHt1gCxxFvXfCn361BBNBTw=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.15.2.tgz"; + sha512 = "RAwXojqBZT8evWDwYCPzXiI/usUrciBhu9sopgm9MpcX55OLZMr2/R8/ZmX/oCxrvZxwboDD18dNJpi2hyXJ7w=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.20.2" + sources."@babel/generator-7.20.14" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.2" - sources."@babel/template-7.18.10" - sources."@babel/types-7.20.2" - sources."@cdktf/hcl2cdk-0.13.3" - sources."@cdktf/hcl2json-0.13.3" - sources."@cdktf/provider-generator-0.13.3" + sources."@babel/parser-7.20.13" + sources."@babel/template-7.20.7" + sources."@babel/types-7.20.7" + sources."@cdktf/cli-core-0.15.2" + sources."@cdktf/commons-0.15.2" + sources."@cdktf/hcl2cdk-0.15.2" + sources."@cdktf/hcl2json-0.15.2" + sources."@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.10" + sources."@cdktf/provider-generator-0.15.2" sources."@jridgewell/gen-mapping-0.3.2" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - (sources."@jsii/check-node-1.70.0" // { + (sources."@jsii/check-node-1.73.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -93216,27 +93276,26 @@ in sources."supports-color-7.2.0" ]; }) - sources."@jsii/spec-1.70.0" + sources."@jsii/spec-1.73.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" + sources."@npmcli/ci-detect-1.4.0" sources."@sentry/core-6.19.7" sources."@sentry/hub-6.19.7" sources."@sentry/minimal-6.19.7" sources."@sentry/node-6.19.7" sources."@sentry/types-6.19.7" sources."@sentry/utils-6.19.7" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/node-fetch-2.6.2" sources."@types/prop-types-15.7.5" - sources."@types/react-18.0.25" + sources."@types/react-18.0.27" sources."@types/scheduler-0.16.2" - sources."@types/yargs-17.0.13" - sources."@types/yargs-parser-21.0.0" sources."@types/yoga-layout-1.9.2" sources."@xmldom/xmldom-0.8.6" sources."agent-base-6.0.2" - sources."ajv-8.11.0" + sources."ajv-8.12.0" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" @@ -93250,13 +93309,17 @@ in sources."at-least-node-1.0.0" sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" + sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" + sources."buffer-5.7.1" sources."bufferutil-4.0.7" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdktf-0.13.3" + sources."cdktf-0.15.2" sources."chalk-2.4.2" + sources."chownr-1.1.4" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" @@ -93264,7 +93327,7 @@ in sources."cliui-6.0.0" sources."clone-2.1.2" sources."code-excerpt-3.0.0" - (sources."codemaker-1.70.0" // { + (sources."codemaker-1.73.0" // { dependencies = [ sources."decamelize-5.0.1" sources."fs-extra-10.1.0" @@ -93277,7 +93340,7 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.1.152" + sources."constructs-10.1.233" sources."convert-to-spaces-1.0.2" sources."cookie-0.4.2" sources."cross-spawn-7.0.3" @@ -93285,27 +93348,35 @@ in sources."date-format-4.0.14" sources."debug-4.3.4" sources."decamelize-1.2.0" + sources."decompress-response-6.0.0" + sources."deep-extend-0.6.0" sources."deepmerge-4.2.2" sources."delayed-stream-1.0.0" sources."detect-indent-5.0.0" + sources."detect-libc-2.0.1" sources."detect-newline-2.1.0" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" + sources."end-of-stream-1.4.4" sources."entities-2.0.3" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."events-3.3.0" + sources."expand-template-2.0.3" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.12" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."figures-3.2.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flatted-3.2.7" + sources."follow-redirects-1.15.2" sources."form-data-3.0.1" + sources."fs-constants-1.0.0" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" + sources."github-from-package-0.0.0" (sources."glob-7.2.3" // { dependencies = [ sources."minimatch-3.1.2" @@ -93315,16 +93386,18 @@ in sources."graceful-fs-4.2.10" (sources."graphology-0.25.1" // { dependencies = [ - sources."graphology-types-0.24.5" + sources."graphology-types-0.24.7" ]; }) sources."graphology-types-0.21.2" sources."has-flag-3.0.0" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" + sources."ieee754-1.2.1" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."ini-1.3.8" (sources."ink-3.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -93336,6 +93409,7 @@ in ]; }) sources."ink-select-input-4.2.1" + sources."ink-table-3.0.0" sources."is-ci-2.0.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -93345,7 +93419,7 @@ in sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-1.70.0" // { + (sources."jsii-1.73.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -93363,7 +93437,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-pacmak-1.70.0" // { + (sources."jsii-pacmak-1.73.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -93379,7 +93453,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-reflect-1.70.0" // { + (sources."jsii-reflect-1.73.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -93397,7 +93471,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-rosetta-1.70.0" // { + (sources."jsii-rosetta-1.73.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -93409,7 +93483,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.726" // { + (sources."jsii-srcmak-0.1.807" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -93422,7 +93496,7 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash.isequal-4.5.0" - sources."log4js-6.7.0" + sources."log4js-6.7.1" sources."loose-envify-1.4.0" sources."lru-cache-6.0.0" sources."lru_map-0.3.3" @@ -93432,22 +93506,28 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" - (sources."minimatch-5.1.0" // { + sources."mimic-response-3.1.0" + (sources."minimatch-5.1.6" // { dependencies = [ sources."brace-expansion-2.0.1" ]; }) sources."minimist-1.2.7" + sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" + sources."nan-2.17.0" + sources."napi-build-utils-1.0.2" sources."ncp-2.0.0" - sources."node-abort-controller-3.0.1" - sources."node-fetch-2.6.7" - sources."node-gyp-build-4.5.0" + sources."node-abi-3.31.0" + sources."node-abort-controller-3.1.1" + sources."node-fetch-2.6.8" + sources."node-gyp-build-4.6.0" sources."object-assign-4.1.1" + sources."object-hash-2.2.0" sources."obliterator-2.0.4" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.70.0" + sources."oo-ascii-tree-1.73.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -93456,12 +93536,16 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."picomatch-2.3.1" - sources."prettier-2.7.1" - sources."punycode-2.1.1" + sources."prebuild-install-7.1.1" + sources."prettier-2.8.3" + sources."pump-3.0.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" + sources."rc-1.2.8" sources."react-17.0.2" - sources."react-devtools-core-4.26.1" + sources."react-devtools-core-4.27.1" sources."react-reconciler-0.26.2" + sources."readable-stream-3.6.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" @@ -93485,6 +93569,8 @@ in sources."shebang-regex-3.0.0" sources."shell-quote-1.7.4" sources."signal-exit-3.0.7" + sources."simple-concat-1.0.1" + sources."simple-get-4.0.1" (sources."slice-ansi-3.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -93494,16 +93580,20 @@ in }) sources."sort-json-2.0.1" sources."spdx-license-list-6.6.0" - (sources."stack-utils-2.0.5" // { + (sources."stack-utils-2.0.6" // { dependencies = [ sources."escape-string-regexp-2.0.0" ]; }) - sources."streamroller-3.1.3" + sources."streamroller-3.1.4" sources."string-width-4.2.3" sources."string.prototype.repeat-0.2.0" + sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" + sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" + sources."tar-fs-2.1.1" + sources."tar-stream-2.2.0" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" @@ -93514,12 +93604,14 @@ in sources."universalify-0.1.2" sources."uri-js-4.4.1" sources."utf-8-validate-5.0.10" + sources."util-deprecate-1.0.2" + sources."uuid-8.3.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-module-2.0.0" sources."widest-line-3.1.0" - sources."workerpool-6.3.0" + sources."workerpool-6.3.1" (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -93531,6 +93623,7 @@ in sources."ws-7.5.9" sources."xml-js-1.6.11" sources."xmlbuilder-15.1.1" + sources."xstate-4.35.3" sources."y18n-4.0.3" sources."yallist-4.0.0" (sources."yargs-17.6.2" // { @@ -93565,19 +93658,19 @@ in clean-css-cli = nodeEnv.buildNodePackage { name = "clean-css-cli"; packageName = "clean-css-cli"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.6.1.tgz"; - sha512 = "/StJu1YODZY6cOwkBx5FMhSoc9YmvEJXtwNN+udGg1GIKrr4PkdsCdUqC26GfdPdt5IuZnu+5y9/3mrdIJa40Q=="; + url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.6.2.tgz"; + sha512 = "GDQkr6zVqHJhO3yWTy3sA22sMCT6iUqaJuBdqZMW6oI25MtiJ2iZXDmWzErpjoRotsB+TYPTpuZSNSgaC1n4lA=="; }; dependencies = [ - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."balanced-match-1.0.2" sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."chokidar-3.5.3" - sources."clean-css-5.3.1" + sources."clean-css-5.3.2" sources."commander-7.2.0" sources."concat-map-0.0.1" sources."fill-range-7.0.1" @@ -93736,7 +93829,7 @@ in sources."commander-2.20.3" sources."cycle-1.0.3" sources."debug-4.3.4" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."encoding-0.1.13" sources."escape-string-regexp-1.0.5" sources."eyes-0.1.8" @@ -93747,12 +93840,13 @@ in sources."iconv-lite-0.6.3" sources."is-stream-1.1.0" sources."isstream-0.1.2" + sources."lodash-4.17.21" sources."lodash.sortby-4.7.0" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."node-fetch-1.7.3" sources."prompt-1.3.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."query-string-6.14.1" sources."read-1.0.7" sources."revalidator-0.1.8" @@ -93766,7 +93860,11 @@ in sources."webidl-conversions-4.0.2" sources."whatwg-fetch-3.6.2" sources."whatwg-url-7.1.0" - sources."winston-2.4.6" + (sources."winston-2.4.7" // { + dependencies = [ + sources."async-2.6.4" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -93781,10 +93879,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.26.2"; + version = "0.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.26.2.tgz"; - sha512 = "d2v66ZdMrEiWd4qBlXOWZ7faHeuWChdr+9J2PksSuJPBC7tSrfSF9KbZHsHQrUrOjCrGUHkYDVkS9D0IkK89uw=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.27.0.tgz"; + sha512 = "XNV8x2adzhenq9uh5rBRsCYvfUiLQJ3mEtj5kKgwxIDa9+kDEEfl/CVDXnx0lM2aa2f845cWCxfL9XNCejOwDQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -93834,10 +93932,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.23.4"; + version = "0.23.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.23.4.tgz"; - sha512 = "XaA+RgnSMLmGpJnXLGWZCH5sONP80uYLpzNlwObMvs0AOuN3vXsu7qTE90qc5Jt/S6RIkF+u/XGDVb/z51E12g=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.23.8.tgz"; + sha512 = "knOr++uIcb+RppNXja+JrU1heoRDiW4v3GEzApJPsEgyjAaH6sZMh/XU5upFp7OSmeX++ZLndPUeumjzQuAbOg=="; }; buildInputs = globalBuildInputs; meta = { @@ -93862,7 +93960,7 @@ in sources."dockerfile-language-server-nodejs-0.2.2" sources."dockerfile-language-service-0.1.1" sources."dockerfile-utils-0.1.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."vscode-jsonrpc-8.0.2" (sources."vscode-languageserver-7.0.0" // { dependencies = [ @@ -93909,10 +94007,10 @@ in coc-eslint = nodeEnv.buildNodePackage { name = "coc-eslint"; packageName = "coc-eslint"; - version = "1.5.8"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.5.8.tgz"; - sha512 = "EOdkh804CCouSGvbG9cRZopi+ZX3glAwwfTZPBSMkiM61qbmDtVNNoVO20gj22zUEc/tfu4df7Uh267W2hk1aA=="; + url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.6.0.tgz"; + sha512 = "TXqBCPv0w1TKHVSgzbAHPztIhVuKLbCPpWQg5QAG4dJ2R3Gufgfw57NZkRFIbfEG6nKUw+co/9stFY1af/LQuQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -93927,10 +94025,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.25.4"; + version = "0.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.25.4.tgz"; - sha512 = "2Bm+znIZxurdgYKolB93suCVQs2B5NI/6R30EkNxxkvpBFj5KYL+ST9azZmyaL8UmOs1L+Lqq8JLBtTANs428Q=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.26.1.tgz"; + sha512 = "L2qnieIfAu4Eqv6+1Cir4vO0E8AI8/8Meqc5GsYdwEiblMRGmB8XnIJoIYY7RhdS4jztw25EmLfBcj11q0JTRQ=="; }; dependencies = [ sources."@sindresorhus/chunkify-0.2.0" @@ -94026,10 +94124,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.5.3"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.5.3.tgz"; - sha512 = "wfMi4xA507oSXqXp2Ey2I3MnNZVFooSNLuIU4/JUCepW+B2o0qBGfWfogQitw8FNyMIfSLKO/IurXQaYUnA79Q=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.6.1.tgz"; + sha512 = "GUkltYI/RTAx3vUIb+lQuEoF96ByfliYokoqM/Gn4hMRtl0IE/XaxqRj71byaj9eO1boSGzqMQtpx8ju1xhWuQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -94051,9 +94149,9 @@ in }; dependencies = [ sources."isexe-2.0.0" - sources."tslib-2.4.1" - sources."vscode-languageserver-textdocument-1.0.7" - sources."vscode-uri-3.0.6" + sources."tslib-2.5.0" + sources."vscode-languageserver-textdocument-1.0.9" + sources."vscode-uri-3.0.7" sources."which-2.0.2" ]; buildInputs = globalBuildInputs; @@ -94068,10 +94166,10 @@ in coc-haxe = nodeEnv.buildNodePackage { name = "coc-haxe"; packageName = "coc-haxe"; - version = "0.11.0"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-haxe/-/coc-haxe-0.11.0.tgz"; - sha512 = "HF+Sa6NFsVH0tsEV8F6SCnKGU89sIXPeHvYwezzkb19GkTrJByLGmxfSZANN35y32FxqJDGqweTUFEqmr48FQg=="; + url = "https://registry.npmjs.org/coc-haxe/-/coc-haxe-0.16.0.tgz"; + sha512 = "fFae5P/6EC6a7EPYGjMo6Bq5IETZwMpcshk63ck+uyHrv/VsFiafQw5mlsK+7VSzr9QngBB9tl8qM0ibsR7kiQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -94109,7 +94207,7 @@ in sha512 = "NXmTfHF/TxysUeSstDyLUcfv6LlK08PnltVZCe1J7XpG/QHRRq0sjhkNqkHJVfFT/Vo2NC4lv5Bc9UIWdjGGuw=="; }; dependencies = [ - sources."typescript-4.8.4" + sources."typescript-4.9.4" ]; buildInputs = globalBuildInputs; meta = { @@ -94141,10 +94239,10 @@ in coc-java = nodeEnv.buildNodePackage { name = "coc-java"; packageName = "coc-java"; - version = "1.5.5"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.5.tgz"; - sha512 = "vJ0W7q6w+ZulC+/oxq7Shbu2MswPLg9jZSCYqi+rxq9LLSPPJ6GHsPQgQxfFX4C5yvY3GQjl8mWUT60JHbgd+g=="; + url = "https://registry.npmjs.org/coc-java/-/coc-java-1.6.0.tgz"; + sha512 = "fMEM9CUlsUODmXtmFQG+ppOqnem65X9qR+SqWndhw9LiE4NdsLsRm7pJmTT5Dz/R0AT7JaOfJeWi0gyUSSL25A=="; }; buildInputs = globalBuildInputs; meta = { @@ -94177,10 +94275,10 @@ in coc-json = nodeEnv.buildNodePackage { name = "coc-json"; packageName = "coc-json"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-json/-/coc-json-1.7.0.tgz"; - sha512 = "3JoOzhzNsECYuxLbFnXtpDMEX6FtEEvZCnFowPrE7z3v1dNj6uumwMveqdLvg4qagAPOVVV/gaddDLDQmkwb3w=="; + url = "https://registry.npmjs.org/coc-json/-/coc-json-1.8.0.tgz"; + sha512 = "xROp3Sgoa/X4CZWBFteuc+Ug5AV9/xzpCfkgjms0ZVTn7kPgXtrWtl9SXZPI/LJR+SkKSDikcnDJcx2+w5UxkA=="; }; buildInputs = globalBuildInputs; meta = { @@ -94194,10 +94292,10 @@ in coc-lists = nodeEnv.buildNodePackage { name = "coc-lists"; packageName = "coc-lists"; - version = "1.4.5"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.4.5.tgz"; - sha512 = "yudvfnZtCqReZyLqcJ03gw9zSYHDqQxuH50Otv1Vd8hcSVoSCkZ3BPyRUuQ2qhit768MBUIfO1H9L4JXofGfpA=="; + url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.5.1.tgz"; + sha512 = "tJYhsDHadL6YYEsHAUc+tFi8MYklHmPx3AcjiUHTYRAtkAyKoZb+BPpAwG8gvfSqdkCxu55eHLeJ9lGhXNztZA=="; }; buildInputs = globalBuildInputs; meta = { @@ -94230,10 +94328,10 @@ in coc-markdownlint = nodeEnv.buildNodePackage { name = "coc-markdownlint"; packageName = "coc-markdownlint"; - version = "1.26.0"; + version = "1.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.26.0.tgz"; - sha512 = "8aBF+a4GpM5tWvEk2+6uwOXQZcwZ8+ng2jNKNo8hvk1st4boFgXOwB8JImBbNTff+WqfavzXJl3OphCezx0UJA=="; + url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.27.0.tgz"; + sha512 = "sVu+bIYMvPDNFK0nTHem4+xO86mVi3+s79b/4OUrG9HcyspFfMdeh5NDQqMxNW4VFj5uBNHqLbTXrRnuK2ZjfA=="; }; buildInputs = globalBuildInputs; meta = { @@ -94254,11 +94352,13 @@ in sha512 = "zFExh1wGAZl4LXSp76NAjWORO9Tyhfw8WtALnhDv741p4tjWjVSEl6GmXTQN0U0tXz8UZ8ln2rL2OaxOdgMCTA=="; }; dependencies = [ - sources."@chemzqm/neovim-5.8.0" + sources."@chemzqm/msgpack-lite-0.1.29" + sources."@chemzqm/neovim-5.9.5" sources."@tootallnate/once-1.1.2" sources."agent-base-6.0.2" sources."arch-2.2.0" sources."async-2.6.4" + sources."available-typed-arrays-1.0.5" sources."await-semaphore-0.1.3" sources."balanced-match-1.0.2" sources."big-integer-1.6.51" @@ -94291,17 +94391,22 @@ in sources."duplexer2-0.1.4" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" - sources."es-abstract-1.20.4" + sources."es-abstract-1.21.1" + sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" - sources."event-lite-0.1.2" sources."execa-1.0.0" sources."fast-diff-1.2.0" sources."fb-watchman-2.0.2" sources."flatted-3.2.7" sources."follow-redirects-1.15.2" + sources."for-each-0.3.3" sources."fp-ts-2.13.1" sources."fs-extra-8.1.0" - sources."fs-minipass-2.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."fs.realpath-1.0.0" (sources."fstream-1.0.12" // { dependencies = [ @@ -94312,14 +94417,17 @@ in sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" sources."glob-7.2.3" + sources."globalthis-1.0.3" + sources."gopd-1.0.1" sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-bigints-1.0.2" sources."has-property-descriptors-1.0.0" + sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."http-proxy-agent-4.0.1" @@ -94330,7 +94438,8 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."int64-buffer-0.1.10" - sources."internal-slot-1.0.3" + sources."internal-slot-1.0.4" + sources."is-array-buffer-3.0.1" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" @@ -94343,6 +94452,7 @@ in sources."is-stream-1.1.0" sources."is-string-1.0.7" sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.10" sources."is-weakref-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" @@ -94357,16 +94467,19 @@ in ]; }) sources."lodash-4.17.21" - sources."log4js-6.7.0" + sources."log4js-6.7.1" sources."lru-cache-6.0.0" sources."metals-languageclient-0.4.2" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-3.3.5" - sources."minizlib-2.1.2" + sources."minipass-4.0.0" + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."msgpack-lite-0.1.26" (sources."mv-2.1.1" // { dependencies = [ sources."glob-6.0.4" @@ -94376,10 +94489,10 @@ in }) sources."ncp-2.0.0" sources."nice-try-1.0.5" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."node-int64-0.4.0" sources."npm-run-path-2.0.2" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."object-keys-1.1.1" sources."object.assign-4.1.4" sources."once-1.4.0" @@ -94387,7 +94500,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."process-nextick-args-2.0.1" - sources."promise.prototype.finally-3.1.3" + sources."promise.prototype.finally-3.1.4" sources."promisify-child-process-4.1.1" sources."pump-3.0.0" sources."rc-1.2.8" @@ -94410,9 +94523,9 @@ in sources."shell-quote-1.7.4" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."streamroller-3.1.3" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" + sources."streamroller-3.1.4" + sources."string.prototype.trimend-1.0.6" + sources."string.prototype.trimstart-1.0.6" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -94420,10 +94533,11 @@ in }) sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."tar-6.1.12" + sources."tar-6.1.13" sources."tr46-0.0.3" sources."traverse-0.3.9" - sources."tslib-2.4.1" + sources."tslib-2.5.0" + sources."typed-array-length-1.0.4" sources."unbox-primitive-1.0.2" sources."universalify-0.1.2" sources."unzipper-0.10.11" @@ -94435,13 +94549,14 @@ in sources."vscode-languageserver-types-3.15.1" ]; }) - sources."vscode-languageserver-textdocument-1.0.7" + sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-languageserver-types-3.17.2" sources."vscode-uri-2.1.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" + sources."which-typed-array-1.1.9" sources."wrappy-1.0.2" sources."yallist-4.0.0" ]; @@ -94457,10 +94572,10 @@ in coc-pairs = nodeEnv.buildNodePackage { name = "coc-pairs"; packageName = "coc-pairs"; - version = "1.4.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.4.0.tgz"; - sha512 = "vIFgI26Z/3AdwyiN5m30q7Z4jIkHIelr9p+ywmPpITOpUW+ZIdYxpIIHAUdOCbM3X2jwxA4+kN0Dn3CBOlcQ5Q=="; + url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.4.2.tgz"; + sha512 = "4qcKB1i4SdQUKv8HT+/owk+fZn4zssX4NUOEZ5IFt+hP5pb6hdWMyuJvqnH5A0+5SYQuwg5zdtQeZnneUIApfg=="; }; buildInputs = globalBuildInputs; meta = { @@ -94481,7 +94596,7 @@ in sha512 = "t/j62Sjq/eBcaN90b4KPNDuZBP3K+TomXj9RLdiJX0zE7RG2byqsxVTnVKAk9c+qE05jv16C5Zv1qv97ZKcA4g=="; }; dependencies = [ - sources."prettier-2.7.1" + sources."prettier-2.8.3" ]; buildInputs = globalBuildInputs; meta = { @@ -94496,13 +94611,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.275"; + version = "1.1.291"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.275.tgz"; - sha512 = "yk7c8ELQixTwjXnG24htMTVoWb4C1UXazhs6MiQsUjjJKsuyFntodPtpvkEDyQ3rZKlx8LNCH5g/5N9W7hP8IA=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.291.tgz"; + sha512 = "Ffl7Gynb4zqsmUelEFuB1gqV5tFGGR/+Btd8l7/YVZVZ3M2/Ur9nBa6K8+inWPMQUkZ00nQEbXGDKeOzDLDcJQ=="; }; dependencies = [ - sources."pyright-1.1.278" + sources."pyright-1.1.291" ]; buildInputs = globalBuildInputs; meta = { @@ -94543,7 +94658,7 @@ in dependencies = [ sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-protocol-3.17.2" - sources."vscode-languageserver-textdocument-1.0.7" + sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-languageserver-types-3.17.2" ]; buildInputs = globalBuildInputs; @@ -94576,10 +94691,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.69.4"; + version = "0.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.69.4.tgz"; - sha512 = "fdFjzQkQ1jklsBqxx0PhMGh/sSqQuFhQMSMd/bjtJiHfo0J6DmEPR92s8T9TLwZDnS9XDwb24W8Caky/CJnwEA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.72.0.tgz"; + sha512 = "kKbvsKyEDa+SND3mgOjdo3mGUUJwcHCt92fwZ9D7qLaE4y4SCxaHxrp3uAncaiMQUMicMT3a+5KEu0iaIXVnnQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -94605,7 +94720,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."balanced-match-1.0.2" sources."bash-language-server-3.0.3" sources."bcrypt-pbkdf-1.0.2" @@ -94626,7 +94741,7 @@ in sources."fs.realpath-1.0.0" sources."fuzzy-search-3.2.1" sources."getpass-0.1.7" - sources."glob-8.0.3" + sources."glob-8.1.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."http-signature-1.2.0" @@ -94642,12 +94757,12 @@ in sources."lodash-4.17.21" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."performance-now-2.1.0" sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."request-2.88.2" sources."request-promise-core-1.1.4" @@ -94657,7 +94772,7 @@ in sources."sshpk-1.17.0" sources."stealthy-require-1.1.1" sources."tough-cookie-2.5.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."turndown-7.1.1" sources."tweetnacl-0.14.5" @@ -94668,7 +94783,7 @@ in sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-6.1.1" sources."vscode-languageserver-protocol-3.17.2" - sources."vscode-languageserver-textdocument-1.0.7" + sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-languageserver-types-3.17.2" sources."web-tree-sitter-0.20.7" sources."wrappy-1.0.2" @@ -94703,10 +94818,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "3.1.4"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-3.1.4.tgz"; - sha512 = "IWN2gEpXz/DxyQPWYYOW8Z2Z/cOn8TeV0+s54BEArZSktRNEAKmnU8qZyqeXRMD46faog7f0zq81BHhkr8X5PQ=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-3.1.6.tgz"; + sha512 = "Py8Ka7WW4/nuJADnqASa3PNt7SzFj102aNS7t4lhIcZY8vo4X5E038X9glOKeRy07Y2r6kTD2CgBfkmCE/rTrQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -94737,10 +94852,10 @@ in coc-spell-checker = nodeEnv.buildNodePackage { name = "coc-spell-checker"; packageName = "coc-spell-checker"; - version = "1.2.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-spell-checker/-/coc-spell-checker-1.2.0.tgz"; - sha512 = "TuwqtkoDN8MvxLNC7R0932vgAVY+eRIrL4dZoWtIhgQF3WTlIAQBrgC0AHuF0v8q/QeZU8hxEqDIyfTwIKXXJw=="; + url = "https://registry.npmjs.org/coc-spell-checker/-/coc-spell-checker-1.3.2.tgz"; + sha512 = "b0uYYX706Fv6ATpsAVRyjaVBZ1kgEVmzse2BCYrNxvbgxZXgwyErMm5t8guIwAichchURjw0TWBn79tFjWB/eg=="; }; dependencies = [ sources."@cspell/dict-aws-1.0.14" @@ -94799,7 +94914,7 @@ in sources."esprima-4.0.1" sources."fs-extra-9.1.0" sources."gensequence-3.1.1" - sources."vscode-uri-3.0.6" + sources."vscode-uri-3.0.7" ]; }) (sources."cspell-trie-lib-4.2.8" // { @@ -94880,34 +94995,34 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.1" - sources."@babel/core-7.20.2" - (sources."@babel/generator-7.20.2" // { + sources."@babel/compat-data-7.20.14" + sources."@babel/core-7.20.12" + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/helper-compilation-targets-7.20.0" + sources."@babel/helper-compilation-targets-7.20.7" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.2" + sources."@babel/helper-module-transforms-7.20.11" sources."@babel/helper-simple-access-7.20.2" sources."@babel/helper-split-export-declaration-7.18.6" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.1" + sources."@babel/helpers-7.20.13" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.2" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.20.1" - sources."@babel/types-7.20.2" + sources."@babel/parser-7.20.13" + sources."@babel/template-7.20.7" + sources."@babel/traverse-7.20.13" + sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -94923,7 +95038,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.11.0" + sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -94946,7 +95061,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -94964,7 +95079,7 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."convert-source-map-1.9.0" - sources."cosmiconfig-7.0.1" + sources."cosmiconfig-7.1.0" sources."cssesc-3.0.0" sources."debug-4.3.4" sources."decamelize-1.2.0" @@ -94995,7 +95110,7 @@ in sources."fast-diff-1.2.0" sources."fast-glob-3.2.12" sources."fastest-levenshtein-1.0.16" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -95016,10 +95131,15 @@ in sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."hosted-git-info-4.1.0" + (sources."hosted-git-info-4.1.0" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" + ]; + }) sources."html-tags-3.2.0" sources."htmlparser2-3.10.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" (sources."import-fresh-3.3.0" // { dependencies = [ sources."resolve-from-4.0.0" @@ -95051,7 +95171,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.1" + sources."json5-2.2.3" sources."kind-of-6.0.3" sources."known-css-properties-0.21.0" sources."lines-and-columns-1.2.4" @@ -95060,7 +95180,7 @@ in sources."lodash.truncate-4.4.2" sources."log-symbols-4.1.0" sources."longest-streak-2.0.4" - sources."lru-cache-6.0.0" + sources."lru-cache-5.1.1" sources."map-obj-4.3.0" sources."mathml-tag-names-2.1.3" sources."mdast-util-from-markdown-0.8.5" @@ -95079,10 +95199,12 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" (sources."normalize-package-data-3.0.3" // { dependencies = [ + sources."lru-cache-6.0.0" sources."semver-7.3.8" + sources."yallist-4.0.0" ]; }) sources."normalize-range-0.1.2" @@ -95114,10 +95236,10 @@ in sources."postcss-safe-parser-4.0.2" sources."postcss-sass-0.4.4" sources."postcss-scss-2.1.1" - sources."postcss-selector-parser-6.0.10" + sources."postcss-selector-parser-6.0.11" sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.2.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { @@ -95197,13 +95319,13 @@ in sources."vscode-languageserver-types-3.16.0-next.1" ]; }) - sources."vscode-languageserver-textdocument-1.0.7" + sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-languageserver-types-3.17.2" sources."vscode-uri-2.1.2" sources."which-1.3.1" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."yallist-4.0.0" + sources."yallist-3.1.1" sources."yaml-1.10.2" sources."yargs-parser-20.2.9" sources."zwitch-1.0.5" @@ -95237,10 +95359,10 @@ in coc-sqlfluff = nodeEnv.buildNodePackage { name = "coc-sqlfluff"; packageName = "coc-sqlfluff"; - version = "0.10.6"; + version = "0.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/coc-sqlfluff/-/coc-sqlfluff-0.10.6.tgz"; - sha512 = "bPg2hpTZvsQmu2xObhOmmwxzJIcUig/53hoTHxvXl1g3DyitZEmjhH/4glJOEJdRW/ykFoek2tiK0eMTb2zauw=="; + url = "https://registry.npmjs.org/coc-sqlfluff/-/coc-sqlfluff-0.10.10.tgz"; + sha512 = "A01zt4ekd/KMOJYfRxQWIqjJBfCvi/AnRn+swtvJFZof1OdfuT+rhPjWHy7EgEj3Iwfwvg2t4XSTu6RsC4gAZw=="; }; buildInputs = globalBuildInputs; meta = { @@ -95299,7 +95421,7 @@ in sources."@taplo/lsp-0.2.4" sources."encoding-0.1.13" sources."iconv-lite-0.6.3" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."safer-buffer-2.1.2" sources."tr46-0.0.3" sources."webidl-conversions-3.0.1" @@ -95413,15 +95535,13 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "2.0.0"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-2.0.0.tgz"; - sha512 = "Xvo8s6Gt6MonuGWR92Q7l6UJj8XA5hS/DPcKmVmnoWYNqLdC/qzms9hVaZuiKr4v7Na1bNXd2ShvFEKjcPS+NA=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-2.1.3.tgz"; + sha512 = "rzom53icaFoCF7p6Ps0dHqflS8yv+hOtQw43qOS4NL3b+rnulkfNracHFzuH1n1tyQWCzLgs73cAL1pBGrkUHQ=="; }; dependencies = [ - sources."ansi-regex-6.0.1" - sources."strip-ansi-7.0.1" - sources."typescript-4.8.4" + sources."typescript-4.9.4" ]; buildInputs = globalBuildInputs; meta = { @@ -95546,10 +95666,10 @@ in 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.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globals-13.17.0" + sources."globals-13.20.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.3" @@ -95588,11 +95708,11 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" - sources."prettier-2.7.1" + sources."prettier-2.8.3" sources."progress-2.0.3" sources."pug-error-2.0.0" sources."pug-lexer-5.0.1" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."regexpp-3.2.0" sources."require-from-string-2.0.2" sources."resolve-1.22.1" @@ -95616,7 +95736,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" (sources."table-6.8.1" // { dependencies = [ - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -95632,7 +95752,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."vls-0.7.6" @@ -95660,10 +95780,10 @@ in coc-vimlsp = nodeEnv.buildNodePackage { name = "coc-vimlsp"; packageName = "coc-vimlsp"; - version = "0.12.8"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.12.8.tgz"; - sha512 = "t03LSLQgHXvlNcifKTohzNbWq3//sp8B442mwKIUFJshd+1rdMUZfgZCgisMcQjuWaQCG491VYnm/wAP4o0ifA=="; + url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.13.0.tgz"; + sha512 = "xpNefsAkE449QlJUWhUgVyUYN0WsiEjr02PCSIehOjbIpWSVSQHe2+Dj7onu4tYoHQQprbexNSbseMXO0zZ66w=="; }; buildInputs = globalBuildInputs; meta = { @@ -95833,7 +95953,7 @@ in sources."isexe-2.0.0" sources."isurl-1.0.0" sources."js2xmlparser-4.0.2" - sources."json5-2.2.1" + sources."json5-2.2.3" sources."jsonfile-4.0.0" sources."lowercase-keys-1.0.1" (sources."make-dir-1.3.0" // { @@ -95987,10 +96107,10 @@ in concurrently = nodeEnv.buildNodePackage { name = "concurrently"; packageName = "concurrently"; - version = "7.5.0"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/concurrently/-/concurrently-7.5.0.tgz"; - sha512 = "5E3mwiS+i2JYBzr5BpXkFxOnleZTMsG+WnE/dCG4/P+oiVXrbmrBwJ2ozn4SxwB2EZDrKR568X+puVohxz3/Mg=="; + url = "https://registry.npmjs.org/concurrently/-/concurrently-7.6.0.tgz"; + sha512 = "BKtRgvcJGeZ4XttiDiNcFiRlxoAeZOseqUvyYRUp/Vtd+9p1ULmeoSqGsDA+2ivdeDFpqrJvGvmI+StKfKl5hw=="; }; dependencies = [ sources."ansi-regex-5.0.1" @@ -96011,14 +96131,14 @@ in sources."is-fullwidth-code-point-3.0.0" sources."lodash-4.17.21" sources."require-directory-2.1.1" - sources."rxjs-7.5.7" + sources."rxjs-7.8.0" sources."shell-quote-1.7.4" sources."spawn-command-0.0.2" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."supports-color-8.1.1" sources."tree-kill-1.2.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" sources."yargs-17.6.2" @@ -96037,10 +96157,10 @@ in configurable-http-proxy = nodeEnv.buildNodePackage { name = "configurable-http-proxy"; packageName = "configurable-http-proxy"; - version = "4.5.3"; + version = "4.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.5.3.tgz"; - sha512 = "XNLJ5VpU1IPyJdY6iICGOiQYGbgctPYr96bXCIt2H8rkC53ewN/APAuKM/ZzW7R/l/JDBgYD7wViwddRECJNIw=="; + url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.5.4.tgz"; + sha512 = "Z6xNx7CFpvx1ojAohpcwbHG6+VOrUcCD+ct+xsCaMs1tbTubXhhQjJbDm93ZnyyGJ3maj9tUTOyUxp7mjiGk0w=="; }; dependencies = [ sources."@colors/colors-1.5.0" @@ -96070,7 +96190,7 @@ in sources."readable-stream-3.6.0" sources."requires-port-1.0.0" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-2.4.1" + sources."safe-stable-stringify-2.4.2" sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" sources."strftime-0.10.1" @@ -96312,10 +96432,10 @@ in cordova = nodeEnv.buildNodePackage { name = "cordova"; packageName = "cordova"; - version = "11.0.0"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova/-/cordova-11.0.0.tgz"; - sha512 = "Hu2YeT0naeP/1sEm/xfJYUsXN48XV6zagxbi1+4q0Ei9c5TKsIq8v4EWukvSHF4UO2pnh+9ViaDlGMcS1Wrnfg=="; + url = "https://registry.npmjs.org/cordova/-/cordova-11.1.0.tgz"; + sha512 = "CuF9wHcGLC7ef1ti1YpOy3+3Xov5n8znbOipKbHjpZUEXtYEHDv2+GuaqQB6njkHY+ZxfosrIV/BVMLpkpD8dw=="; }; dependencies = [ sources."@gar/promisify-1.1.3" @@ -96341,7 +96461,7 @@ in sources."ajv-6.12.6" (sources."ajv-formats-2.1.1" // { dependencies = [ - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -96369,7 +96489,7 @@ in sources."at-least-node-1.0.0" sources."atomically-1.7.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" @@ -96432,7 +96552,7 @@ in sources."concat-map-0.0.1" (sources."conf-10.2.0" // { dependencies = [ - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."dot-prop-6.0.1" sources."json-schema-traverse-1.0.0" ]; @@ -96448,19 +96568,19 @@ in sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."cordova-app-hello-world-6.0.0" - (sources."cordova-common-4.0.2" // { + (sources."cordova-common-4.1.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) - sources."cordova-create-4.0.0" - (sources."cordova-fetch-3.0.1" // { + sources."cordova-create-4.1.0" + (sources."cordova-fetch-3.1.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."pify-5.0.0" ]; }) - (sources."cordova-lib-11.0.0" // { + (sources."cordova-lib-11.1.0" // { dependencies = [ sources."pify-5.0.0" ]; @@ -96532,7 +96652,7 @@ in sources."fast-glob-3.2.12" sources."fast-json-parse-1.0.3" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."figures-2.0.0" sources."fill-range-7.0.1" (sources."finalhandler-1.2.0" // { @@ -96551,12 +96671,12 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-2.7.4" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-6.0.1" sources."getpass-0.1.7" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."global-dirs-3.0.0" + sources."global-dirs-3.0.1" sources."globby-11.1.0" (sources."got-9.6.0" // { dependencies = [ @@ -96572,7 +96692,7 @@ in 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-cache-semantics-4.1.1" (sources."http-errors-2.0.0" // { dependencies = [ sources."depd-2.0.0" @@ -96584,7 +96704,7 @@ in sources."human-signals-2.1.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."ignore-walk-3.0.4" sources."import-fresh-3.3.0" sources."import-lazy-2.1.0" @@ -96691,7 +96811,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-3.3.5" + sources."minipass-3.3.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" @@ -96719,7 +96839,7 @@ in sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."objectorarray-1.0.5" sources."on-finished-2.4.1" sources."on-headers-1.0.2" @@ -96762,7 +96882,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."pupa-2.1.1" sources."q-1.5.1" sources."qs-6.5.3" @@ -96852,8 +96972,12 @@ 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.12.13" - sources."tar-6.1.12" + sources."systeminformation-5.17.4" + (sources."tar-6.1.13" // { + dependencies = [ + sources."minipass-4.0.0" + ]; + }) sources."through-2.3.8" sources."tmp-0.2.1" sources."to-readable-stream-1.0.0" @@ -96927,6 +97051,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Cordova command line interface tool"; + homepage = "https://github.com/apache/cordova-cli#readme"; license = "Apache-2.0"; }; production = true; @@ -96977,18 +97102,18 @@ in sources."error-ex-1.3.2" sources."escape-string-regexp-5.0.0" sources."fast-glob-3.2.12" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."find-up-5.0.0" sources."function-bind-1.1.1" sources."glob-parent-5.1.2" - sources."globby-13.1.2" + sources."globby-13.1.3" sources."graceful-fs-4.2.10" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."hosted-git-info-4.1.0" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."indent-string-5.0.0" sources."is-arrayish-0.2.1" sources."is-core-module-2.11.0" @@ -97083,7 +97208,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -97104,7 +97229,7 @@ in sources."combine-errors-3.0.3" sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" - sources."cookiejar-2.1.3" + sources."cookiejar-2.1.4" sources."core-util-is-1.0.3" sources."cross-spawn-5.1.0" sources."cssauron-1.4.0" @@ -97136,7 +97261,7 @@ in sources."form-data-2.5.1" sources."formidable-1.2.6" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."globalthis-1.0.3" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -97173,7 +97298,7 @@ in sources."mute-stream-0.0.7" sources."next-tick-1.1.0" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."object-keys-1.1.1" sources."onetime-2.0.1" sources."os-tmpdir-1.0.2" @@ -97348,10 +97473,10 @@ in cspell = nodeEnv.buildNodePackage { name = "cspell"; packageName = "cspell"; - version = "6.14.0"; + version = "6.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell/-/cspell-6.14.0.tgz"; - sha512 = "5VZWAMcblumPfdqftTUmTioLc1oqd2l+hUOeeIIYSvj6S1gsjcrz7cezRQE4iL5vdD4op0ee/3O4nN5n/OEJVQ=="; + url = "https://registry.npmjs.org/cspell/-/cspell-6.19.2.tgz"; + sha512 = "nyrxnTcv1UzzdElZe96OMU8mxJGaLBnmPCR/HOaFE367EZD+WS5fcpoDBHC9tfD7yJv4+q5sjByYZltcV6jo0A=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -97366,55 +97491,62 @@ in sources."supports-color-5.5.0" ]; }) - sources."@cspell/cspell-bundled-dicts-6.14.0" - sources."@cspell/cspell-pipe-6.14.0" - sources."@cspell/cspell-service-bus-6.14.0" - sources."@cspell/cspell-types-6.14.0" - sources."@cspell/dict-ada-3.0.0" + sources."@cspell/cspell-bundled-dicts-6.19.2" + sources."@cspell/cspell-pipe-6.19.2" + sources."@cspell/cspell-service-bus-6.19.2" + sources."@cspell/cspell-types-6.19.2" + sources."@cspell/dict-ada-4.0.1" sources."@cspell/dict-aws-3.0.0" - sources."@cspell/dict-bash-3.0.0" - sources."@cspell/dict-companies-3.0.3" - sources."@cspell/dict-cpp-4.0.0" + sources."@cspell/dict-bash-4.1.1" + sources."@cspell/dict-companies-3.0.6" + sources."@cspell/dict-cpp-4.0.1" sources."@cspell/dict-cryptocurrencies-3.0.1" - sources."@cspell/dict-csharp-4.0.1" - sources."@cspell/dict-css-3.0.0" - sources."@cspell/dict-dart-2.0.0" - sources."@cspell/dict-django-3.0.0" - sources."@cspell/dict-docker-1.1.3" - sources."@cspell/dict-dotnet-3.0.1" - sources."@cspell/dict-elixir-3.0.0" + sources."@cspell/dict-csharp-4.0.2" + sources."@cspell/dict-css-4.0.2" + sources."@cspell/dict-dart-2.0.1" + sources."@cspell/dict-django-4.0.1" + sources."@cspell/dict-docker-1.1.5" + sources."@cspell/dict-dotnet-4.0.1" + sources."@cspell/dict-elixir-4.0.1" sources."@cspell/dict-en-gb-1.1.33" - sources."@cspell/dict-en_us-4.0.0" + sources."@cspell/dict-en_us-4.2.0" sources."@cspell/dict-filetypes-3.0.0" sources."@cspell/dict-fonts-3.0.0" - sources."@cspell/dict-fullstack-3.0.0" + sources."@cspell/dict-fullstack-3.1.1" + sources."@cspell/dict-gaming-terms-1.0.4" sources."@cspell/dict-git-2.0.0" - sources."@cspell/dict-golang-4.0.0" - sources."@cspell/dict-haskell-3.0.0" - sources."@cspell/dict-html-4.0.0" + sources."@cspell/dict-golang-5.0.1" + sources."@cspell/dict-haskell-4.0.1" + sources."@cspell/dict-html-4.0.2" sources."@cspell/dict-html-symbol-entities-4.0.0" - sources."@cspell/dict-java-5.0.2" - sources."@cspell/dict-latex-3.0.0" + sources."@cspell/dict-java-5.0.4" + sources."@cspell/dict-k8s-1.0.0" + sources."@cspell/dict-latex-3.1.0" sources."@cspell/dict-lorem-ipsum-3.0.0" - sources."@cspell/dict-lua-3.0.0" - sources."@cspell/dict-node-4.0.1" - sources."@cspell/dict-npm-4.0.1" - sources."@cspell/dict-php-3.0.3" - sources."@cspell/dict-powershell-3.0.0" - sources."@cspell/dict-public-licenses-2.0.0" - sources."@cspell/dict-python-4.0.0" - sources."@cspell/dict-r-2.0.0" - sources."@cspell/dict-ruby-3.0.0" - sources."@cspell/dict-rust-3.0.0" - sources."@cspell/dict-scala-3.0.0" - sources."@cspell/dict-software-terms-3.0.5" - sources."@cspell/dict-sql-2.0.0" - sources."@cspell/dict-swift-2.0.0" - sources."@cspell/dict-typescript-3.0.1" + sources."@cspell/dict-lua-4.0.0" + sources."@cspell/dict-node-4.0.2" + sources."@cspell/dict-npm-5.0.3" + sources."@cspell/dict-php-3.0.4" + sources."@cspell/dict-powershell-4.0.0" + sources."@cspell/dict-public-licenses-2.0.1" + sources."@cspell/dict-python-4.0.1" + sources."@cspell/dict-r-2.0.1" + sources."@cspell/dict-ruby-4.0.1" + sources."@cspell/dict-rust-4.0.0" + sources."@cspell/dict-scala-4.0.0" + sources."@cspell/dict-software-terms-3.1.1" + sources."@cspell/dict-sql-2.0.1" + sources."@cspell/dict-svelte-1.0.2" + sources."@cspell/dict-swift-2.0.1" + sources."@cspell/dict-typescript-3.1.0" sources."@cspell/dict-vue-3.0.0" - sources."@types/parse-json-4.0.0" + sources."@cspell/strong-weak-map-6.19.2" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" + sources."argparse-2.0.1" sources."array-timsort-1.0.3" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" @@ -97424,42 +97556,40 @@ in sources."clear-module-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-9.4.1" + sources."commander-10.0.0" sources."comment-json-4.2.3" sources."concat-map-0.0.1" sources."configstore-5.0.1" sources."core-util-is-1.0.3" - sources."cosmiconfig-7.0.1" + sources."cosmiconfig-8.0.0" sources."crypto-random-string-2.0.0" - sources."cspell-dictionary-6.14.0" - sources."cspell-gitignore-6.14.0" - sources."cspell-glob-6.14.0" - sources."cspell-grammar-6.14.0" - sources."cspell-io-6.14.0" - sources."cspell-lib-6.14.0" - sources."cspell-trie-lib-6.14.0" + sources."cspell-dictionary-6.19.2" + sources."cspell-gitignore-6.19.2" + sources."cspell-glob-6.19.2" + sources."cspell-grammar-6.19.2" + sources."cspell-io-6.19.2" + sources."cspell-lib-6.19.2" + sources."cspell-trie-lib-6.19.2" sources."dot-prop-5.3.0" sources."encoding-0.1.13" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."fast-equals-4.0.3" + sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" + sources."fastq-1.15.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-5.0.0" sources."flat-cache-3.0.4" sources."flatted-3.2.7" - sources."fs-extra-10.1.0" + sources."fs-extra-11.1.0" sources."fs.realpath-1.0.0" - sources."gensequence-4.0.2" + sources."gensequence-4.0.3" sources."get-stdin-8.0.0" - (sources."glob-8.0.3" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-5.1.0" - ]; - }) + sources."glob-7.2.3" + sources."glob-parent-5.1.2" sources."global-dirs-0.1.1" sources."graceful-fs-4.2.10" sources."has-flag-4.0.0" @@ -97476,10 +97606,13 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."is-arrayish-0.2.1" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-typedarray-1.0.0" sources."js-tokens-4.0.0" + sources."js-yaml-4.1.0" sources."json-parse-even-better-errors-2.3.1" sources."jsonfile-6.1.0" sources."lines-and-columns-1.2.4" @@ -97490,9 +97623,10 @@ in sources."semver-6.3.0" ]; }) + sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."minimatch-3.1.2" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."once-1.4.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" @@ -97502,14 +97636,13 @@ in sources."path-is-absolute-1.0.1" sources."path-type-4.0.0" sources."picomatch-2.3.1" + sources."queue-microtask-1.2.3" sources."repeat-string-1.6.1" sources."resolve-from-5.0.0" sources."resolve-global-1.0.0" - (sources."rimraf-3.0.2" // { - dependencies = [ - sources."glob-7.2.3" - ]; - }) + sources."reusify-1.0.4" + sources."rimraf-3.0.2" + sources."run-parallel-1.2.0" sources."safer-buffer-2.1.2" sources."semver-7.3.8" sources."signal-exit-3.0.7" @@ -97520,15 +97653,14 @@ in sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" sources."universalify-2.0.0" - sources."vscode-languageserver-textdocument-1.0.7" - sources."vscode-uri-3.0.6" + sources."vscode-languageserver-textdocument-1.0.9" + sources."vscode-uri-3.0.7" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."wrappy-1.0.2" 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; @@ -97613,7 +97745,7 @@ in sources."atob-2.1.2" sources."atomic-batcher-1.0.2" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."b4a-1.6.1" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -97722,7 +97854,7 @@ in sources."ms-2.1.2" ]; }) - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" sources."define-property-2.0.2" @@ -97881,6 +98013,7 @@ in sources."kind-of-6.0.3" sources."last-one-wins-1.0.4" sources."latest-version-3.1.0" + sources."lodash-4.17.21" sources."lodash.throttle-4.1.1" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" @@ -97917,11 +98050,11 @@ in sources."nanoresource-1.3.0" sources."nanoscheduler-1.0.3" sources."nanotiming-7.3.1" - sources."napi-macros-2.1.0" + sources."napi-macros-2.2.2" sources."neat-input-1.11.1" sources."neat-log-3.1.0" sources."nets-3.2.0" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."normalize-path-2.1.1" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" @@ -97967,7 +98100,7 @@ in sources."pseudomap-1.0.2" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."queue-tick-1.0.1" sources."random-access-file-2.2.1" @@ -98164,7 +98297,11 @@ in }) sources."which-1.3.1" sources."widest-line-2.0.1" - sources."winston-2.4.6" + (sources."winston-2.4.7" // { + dependencies = [ + sources."async-2.6.4" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" @@ -98202,694 +98339,6 @@ in bypassCache = true; reconstructLock = true; }; - "deltachat-desktop-../../applications/networking/instant-messengers/deltachat-desktop" = nodeEnv.buildNodePackage { - name = "deltachat-desktop"; - packageName = "deltachat-desktop"; - version = "1.30.1"; - src = ../../applications/networking/instant-messengers/deltachat-desktop; - dependencies = [ - sources."@ampproject/remapping-2.2.0" - sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.1" - sources."@babel/core-7.20.2" - (sources."@babel/generator-7.20.2" // { - dependencies = [ - sources."@jridgewell/gen-mapping-0.3.2" - ]; - }) - sources."@babel/helper-annotate-as-pure-7.18.6" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" - sources."@babel/helper-compilation-targets-7.20.0" - sources."@babel/helper-create-class-features-plugin-7.20.2" - sources."@babel/helper-create-regexp-features-plugin-7.19.0" - sources."@babel/helper-define-polyfill-provider-0.3.3" - sources."@babel/helper-environment-visitor-7.18.9" - sources."@babel/helper-explode-assignable-expression-7.18.6" - sources."@babel/helper-function-name-7.19.0" - sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.18.9" - sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.2" - sources."@babel/helper-optimise-call-expression-7.18.6" - sources."@babel/helper-plugin-utils-7.20.2" - sources."@babel/helper-remap-async-to-generator-7.18.9" - sources."@babel/helper-replace-supers-7.19.1" - sources."@babel/helper-simple-access-7.20.2" - sources."@babel/helper-skip-transparent-expression-wrappers-7.20.0" - sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.19.4" - sources."@babel/helper-validator-identifier-7.19.1" - sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helper-wrap-function-7.19.0" - sources."@babel/helpers-7.20.1" - sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.2" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" - sources."@babel/plugin-proposal-async-generator-functions-7.20.1" - sources."@babel/plugin-proposal-class-properties-7.18.6" - sources."@babel/plugin-proposal-class-static-block-7.18.6" - sources."@babel/plugin-proposal-dynamic-import-7.18.6" - sources."@babel/plugin-proposal-export-namespace-from-7.18.9" - sources."@babel/plugin-proposal-json-strings-7.18.6" - sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" - sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.20.2" - sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" - sources."@babel/plugin-proposal-optional-chaining-7.18.9" - sources."@babel/plugin-proposal-private-methods-7.18.6" - sources."@babel/plugin-proposal-private-property-in-object-7.18.6" - sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" - sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-import-assertions-7.20.0" - sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.18.6" - 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" - 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-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.18.6" - sources."@babel/plugin-transform-async-to-generator-7.18.6" - sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.2" - sources."@babel/plugin-transform-classes-7.20.2" - sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.20.2" - sources."@babel/plugin-transform-dotall-regex-7.18.6" - sources."@babel/plugin-transform-duplicate-keys-7.18.9" - sources."@babel/plugin-transform-exponentiation-operator-7.18.6" - sources."@babel/plugin-transform-for-of-7.18.8" - sources."@babel/plugin-transform-function-name-7.18.9" - sources."@babel/plugin-transform-literals-7.18.9" - sources."@babel/plugin-transform-member-expression-literals-7.18.6" - sources."@babel/plugin-transform-modules-amd-7.19.6" - sources."@babel/plugin-transform-modules-commonjs-7.19.6" - sources."@babel/plugin-transform-modules-systemjs-7.19.6" - sources."@babel/plugin-transform-modules-umd-7.18.6" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.19.1" - sources."@babel/plugin-transform-new-target-7.18.6" - sources."@babel/plugin-transform-object-super-7.18.6" - sources."@babel/plugin-transform-parameters-7.20.1" - sources."@babel/plugin-transform-property-literals-7.18.6" - sources."@babel/plugin-transform-react-display-name-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.19.0" - sources."@babel/plugin-transform-react-jsx-development-7.18.6" - sources."@babel/plugin-transform-react-pure-annotations-7.18.6" - sources."@babel/plugin-transform-regenerator-7.18.6" - sources."@babel/plugin-transform-reserved-words-7.18.6" - sources."@babel/plugin-transform-shorthand-properties-7.18.6" - sources."@babel/plugin-transform-spread-7.19.0" - sources."@babel/plugin-transform-sticky-regex-7.18.6" - sources."@babel/plugin-transform-template-literals-7.18.9" - sources."@babel/plugin-transform-typeof-symbol-7.18.9" - sources."@babel/plugin-transform-unicode-escapes-7.18.10" - sources."@babel/plugin-transform-unicode-regex-7.18.6" - sources."@babel/preset-env-7.20.2" - sources."@babel/preset-modules-0.1.5" - sources."@babel/preset-react-7.18.6" - sources."@babel/runtime-7.20.1" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.20.1" - sources."@babel/types-7.20.2" - sources."@blueprintjs/colors-4.1.8" - sources."@blueprintjs/core-4.11.6" - sources."@blueprintjs/icons-4.10.0" - sources."@deltachat/message_parser_wasm-0.4.0" - sources."@deltachat/react-qr-reader-4.0.0" - sources."@electron/get-1.14.1" - sources."@hypnosphi/create-react-context-0.3.1" - sources."@jridgewell/gen-mapping-0.1.1" - sources."@jridgewell/resolve-uri-3.1.0" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.17" - sources."@juggle/resize-observer-3.4.0" - sources."@mapbox/extent-0.4.0" - sources."@mapbox/geojson-coords-0.0.2" - sources."@mapbox/geojson-extent-1.0.1" - sources."@mapbox/geojson-normalize-0.0.1" - sources."@mapbox/geojson-rewind-0.5.2" - sources."@mapbox/geojson-types-1.0.2" - sources."@mapbox/jsonlint-lines-primitives-2.0.2" - sources."@mapbox/mapbox-gl-supported-1.5.0" - sources."@mapbox/point-geometry-0.1.0" - sources."@mapbox/tiny-sdf-1.2.5" - sources."@mapbox/unitbezier-0.0.0" - sources."@mapbox/vector-tile-1.3.1" - sources."@mapbox/whoots-js-3.1.0" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - sources."@types/debounce-1.2.1" - sources."@types/dom4-2.0.2" - sources."@types/emoji-mart-3.0.9" - sources."@types/geojson-7946.0.10" - sources."@types/mapbox-gl-0.54.5" - sources."@types/mime-types-2.1.1" - sources."@types/minimist-1.2.2" - sources."@types/node-14.18.33" - sources."@types/prop-types-15.7.5" - sources."@types/rc-1.2.1" - sources."@types/react-17.0.52" - sources."@types/react-dom-17.0.18" - sources."@types/react-window-1.8.5" - sources."@types/react-window-infinite-loader-1.0.6" - sources."@types/scheduler-0.16.2" - sources."@types/url-parse-1.4.8" - sources."ansi-styles-3.2.1" - (sources."anymatch-2.0.0" // { - dependencies = [ - sources."normalize-path-2.1.1" - ]; - }) - sources."application-config-1.0.1" - sources."application-config-path-0.1.0" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-each-1.0.1" - sources."array-slice-1.1.0" - sources."array-unique-0.3.2" - sources."assign-symbols-1.0.0" - sources."async-done-1.3.2" - sources."async-each-1.0.3" - sources."atob-2.1.2" - sources."babel-plugin-polyfill-corejs2-0.3.3" - sources."babel-plugin-polyfill-corejs3-0.6.0" - sources."babel-plugin-polyfill-regenerator-0.4.1" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."binary-extensions-1.13.1" - sources."bindings-1.5.0" - sources."boolean-3.2.0" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."browserslist-4.21.4" - sources."buffer-crc32-0.2.13" - sources."buffer-from-1.1.2" - sources."cache-base-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."camel-case-4.1.2" - sources."caniuse-lite-1.0.30001431" - sources."capital-case-1.0.4" - sources."chalk-2.4.2" - sources."change-case-4.1.2" - sources."chokidar-2.1.8" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."classnames-2.3.2" - sources."clone-response-1.0.3" - sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."component-emitter-1.3.0" - sources."concat-stream-1.6.2" - sources."config-chain-1.1.13" - sources."constant-case-3.0.4" - sources."convert-source-map-1.9.0" - sources."copy-descriptor-0.1.1" - sources."core-js-compat-3.26.0" - sources."core-util-is-1.0.3" - sources."csscolorparser-1.0.3" - sources."csstype-3.1.1" - sources."debounce-1.2.1" - sources."debug-4.3.4" - sources."decode-uri-component-0.2.0" - sources."decompress-response-3.3.0" - sources."deep-equal-1.1.1" - sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.3" - sources."define-properties-1.1.4" - sources."define-property-2.0.2" - sources."deltachat-node-1.86.0" - sources."detect-node-2.1.0" - sources."dom-helpers-5.2.1" - sources."dom4-2.1.6" - sources."dot-case-3.0.4" - sources."duplexer3-0.1.5" - sources."earcut-2.2.4" - (sources."electron-18.3.15" // { - dependencies = [ - sources."@types/node-16.18.3" - ]; - }) - sources."electron-to-chromium-1.4.284" - 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.1.4" - sources."es6-error-4.1.1" - sources."esbuild-0.12.29" - sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" - sources."esutils-2.0.3" - (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."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."extract-zip-1.7.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."fd-slicer-1.1.0" - sources."file-uri-to-path-1.0.0" - sources."filesize-8.0.7" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."for-in-1.0.2" - sources."for-own-1.0.0" - sources."fragment-cache-0.2.1" - sources."fs-extra-8.1.0" - sources."fsevents-1.2.13" - sources."function-bind-1.1.1" - sources."functions-have-names-1.2.3" - sources."gensync-1.0.0-beta.2" - sources."geojson-flatten-1.1.1" - sources."geojson-vt-3.2.1" - sources."get-intrinsic-1.1.3" - sources."get-stream-6.0.1" - sources."get-value-2.0.6" - sources."gl-matrix-3.4.3" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) - sources."glob-watcher-5.0.5" - (sources."global-agent-3.0.0" // { - dependencies = [ - sources."semver-7.3.8" - ]; - }) - sources."global-tunnel-ng-2.7.1" - sources."globals-11.12.0" - sources."globalthis-1.0.3" - (sources."got-9.6.0" // { - dependencies = [ - sources."get-stream-4.1.0" - ]; - }) - sources."graceful-fs-4.2.10" - sources."grid-index-1.1.0" - sources."gud-1.0.0" - sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."has-property-descriptors-1.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."kind-of-4.0.0" - ]; - }) - sources."header-case-2.0.4" - sources."http-cache-semantics-4.1.0" - sources."ieee754-1.2.1" - sources."immutable-4.1.0" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."is-accessor-descriptor-1.0.0" - sources."is-arguments-1.1.1" - sources."is-binary-path-1.0.1" - sources."is-buffer-1.1.6" - sources."is-core-module-2.11.0" - sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.5" - 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-negated-glob-1.0.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-plain-object-2.0.4" - sources."is-regex-1.1.4" - sources."is-windows-1.0.2" - sources."isarray-1.0.0" - sources."isobject-3.0.1" - sources."js-tokens-4.0.0" - sources."jsesc-2.5.2" - sources."json-buffer-3.0.0" - sources."json-stringify-safe-5.0.1" - sources."json5-2.2.1" - sources."jsonfile-4.0.0" - sources."jsqr-1.4.0" - sources."just-debounce-1.1.0" - sources."kdbush-3.0.0" - sources."keyv-3.1.0" - sources."kind-of-6.0.3" - sources."lodash-4.17.21" - sources."lodash.debounce-4.0.8" - sources."loose-envify-1.4.0" - sources."lower-case-2.0.2" - sources."lowercase-keys-1.0.1" - sources."lru-cache-6.0.0" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - (sources."mapbox-gl-1.13.2" // { - dependencies = [ - sources."rw-1.3.3" - ]; - }) - (sources."matcher-3.0.0" // { - dependencies = [ - sources."escape-string-regexp-4.0.0" - ]; - }) - sources."memoize-one-5.2.1" - sources."micromatch-3.1.10" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-response-1.0.1" - sources."minimist-1.2.7" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."mkdirp-0.5.6" - sources."moment-2.29.4" - sources."ms-2.1.2" - sources."murmurhash-js-1.0.0" - sources."nan-2.17.0" - sources."nanomatch-1.2.13" - sources."napi-macros-2.1.0" - sources."no-case-3.0.4" - sources."node-gyp-build-4.5.0" - sources."node-releases-2.0.6" - sources."normalize-path-3.0.0" - sources."normalize-url-4.5.1" - sources."normalize.css-8.0.1" - sources."npm-conf-1.1.3" - 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-is-1.1.5" - sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.defaults-1.1.0" - sources."object.pick-1.3.0" - sources."once-1.4.0" - sources."p-cancelable-1.1.0" - sources."param-case-3.0.4" - sources."pascal-case-3.1.2" - sources."pascalcase-0.1.1" - sources."path-browserify-1.0.1" - sources."path-case-3.0.4" - sources."path-dirname-1.0.2" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - sources."pbf-3.2.1" - sources."pend-1.2.0" - sources."picocolors-1.0.0" - sources."picomatch-2.3.1" - sources."pify-3.0.0" - sources."popper.js-1.16.1" - sources."posix-character-classes-0.1.1" - sources."potpack-1.0.2" - sources."prepend-http-2.0.0" - sources."process-nextick-args-2.0.1" - sources."progress-2.0.3" - sources."prop-types-15.8.1" - sources."proto-list-1.2.4" - sources."protocol-buffers-schema-3.6.0" - sources."pump-3.0.0" - sources."querystringify-2.2.0" - sources."quickselect-2.0.0" - sources."rc-1.2.8" - sources."react-17.0.2" - sources."react-dom-17.0.2" - sources."react-is-16.13.1" - sources."react-popper-1.3.11" - sources."react-string-replace-1.1.0" - sources."react-transition-group-4.4.5" - sources."react-virtualized-auto-sizer-1.0.7" - sources."react-window-1.8.8" - sources."react-window-infinite-loader-1.0.8" - sources."react-zoom-pan-pinch-2.1.3" - sources."readable-stream-2.3.7" - sources."readdirp-2.2.1" - sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.1.0" - sources."regenerator-runtime-0.13.10" - sources."regenerator-transform-0.15.0" - sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.3" - sources."regexpu-core-5.2.1" - sources."regjsgen-0.7.1" - (sources."regjsparser-0.9.1" // { - dependencies = [ - sources."jsesc-0.5.0" - ]; - }) - 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.22.1" - sources."resolve-protobuf-schema-2.1.0" - sources."resolve-url-0.2.1" - sources."responselike-1.0.2" - sources."ret-0.1.15" - sources."roarr-2.15.4" - sources."rtcpeerconnection-shim-1.2.15" - sources."rw-0.1.4" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" - (sources."sass-1.56.0" // { - dependencies = [ - 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-number-7.0.0" - sources."readdirp-3.6.0" - sources."to-regex-range-5.0.1" - ]; - }) - sources."sax-1.2.4" - sources."scheduler-0.20.2" - sources."sdp-2.12.0" - sources."semver-6.3.0" - sources."semver-compare-1.0.0" - sources."sentence-case-3.0.4" - sources."serialize-error-7.0.1" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."snake-case-3.0.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."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.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-url-0.4.1" - sources."split-string-3.1.0" - sources."sprintf-js-1.1.2" - sources."stackframe-1.3.4" - (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."stream-exhaust-1.0.2" - sources."string_decoder-1.1.1" - sources."strip-json-comments-2.0.1" - sources."sumchecker-3.0.1" - sources."supercluster-7.1.5" - sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."tinyqueue-2.0.3" - sources."to-fast-properties-2.0.0" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-readable-stream-1.0.0" - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" - sources."traverse-0.6.7" - sources."tslib-2.3.1" - sources."tunnel-0.0.6" - sources."type-fest-0.13.1" - sources."typed-styles-0.0.7" - sources."typedarray-0.0.6" - sources."typescript-4.8.4" - 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" - sources."unicode-property-aliases-ecmascript-2.1.0" - sources."union-value-1.0.1" - sources."universalify-0.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."upath-1.2.0" - sources."update-browserslist-db-1.0.10" - sources."upper-case-2.0.2" - sources."upper-case-first-2.0.2" - sources."urix-0.1.0" - sources."url-parse-1.5.10" - sources."url-parse-lax-3.0.0" - sources."use-3.1.1" - sources."use-debounce-3.4.3" - sources."util-deprecate-1.0.2" - sources."vt-pbf-3.1.3" - sources."warning-4.0.3" - sources."webrtc-adapter-6.4.8" - sources."wrappy-1.0.2" - sources."xml-js-1.6.11" - sources."yallist-4.0.0" - sources."yauzl-2.10.0" - ]; - buildInputs = globalBuildInputs; - meta = { - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; dhcp = nodeEnv.buildNodePackage { name = "dhcp"; packageName = "dhcp"; @@ -98935,7 +98384,7 @@ in sources."del-6.1.1" sources."dir-glob-3.0.1" sources."fast-glob-3.2.12" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."fs.realpath-1.0.0" @@ -98943,7 +98392,7 @@ in sources."glob-parent-5.1.2" sources."globby-11.1.0" sources."graceful-fs-4.2.10" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -98982,7 +98431,7 @@ in sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-6.1.1" sources."vscode-languageserver-protocol-3.17.2" - sources."vscode-languageserver-textdocument-1.0.7" + sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-languageserver-types-3.17.2" sources."vscode-uri-2.1.2" sources."wrappy-1.0.2" @@ -99016,7 +98465,7 @@ in sources."vscode-languageserver-types-3.17.2" ]; }) - sources."vscode-languageserver-textdocument-1.0.7" + sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-languageserver-types-3.17.0-next.3" ]; buildInputs = globalBuildInputs; @@ -99032,15 +98481,15 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.94.0"; + version = "6.96.1"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.94.0.tgz"; - sha512 = "zrtDTag8MMH0dieW4dsLB0DDIVki9viANxNtMQGKFhr4SudvC0vWe6IdxXbSK0Ynvlz+arz5JNQmLzGKO5BCGQ=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.96.1.tgz"; + sha512 = "YXsVhkOvhfSRj1oQsb+30nAX7VNEwAM8hoNV+DSz9uj+HrW4t5DWm2g7Cbc/LzpxPqFnLzp0nQCAvn84oudxMQ=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.18.33" + sources."@types/node-14.18.36" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.6" @@ -99049,7 +98498,7 @@ in sources."asynckit-0.4.0" sources."aws-sdk-2.1122.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" @@ -99077,7 +98526,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."http-signature-1.2.0" - sources."http-status-1.5.3" + sources."http-status-1.6.2" sources."ieee754-1.1.13" sources."inherits-2.0.4" sources."ini-2.0.0" @@ -99147,14 +98596,14 @@ in sources."through-2.3.8" (sources."tough-cookie-2.5.0" // { dependencies = [ - sources."punycode-2.1.1" + sources."punycode-2.3.0" ]; }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.1.1" + sources."punycode-2.3.0" ]; }) sources."url-0.10.3" @@ -99177,23 +98626,22 @@ in "@electron-forge/cli" = nodeEnv.buildNodePackage { name = "_at_electron-forge_slash_cli"; packageName = "@electron-forge/cli"; - version = "6.0.0"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0.tgz"; - sha512 = "fdv4V1anQ+CQ9efTLOHoBjrlbT4imaS6czRh7P9LV4U3eDa3B6ofp9NpvLvRE/2Mckl4oDBA5GGRsUSsUwqMkg=="; + url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.4.tgz"; + sha512 = "iyQyh0g/cSWVQs30wsAqmTmqgV8E/i9Cy/CsHwHxQlsHHcq8N61k1JlB2dpEV1Hy9Lxafql5TE3/6uI7939IEg=="; }; dependencies = [ - sources."@electron-forge/async-ora-6.0.0" - sources."@electron-forge/core-6.0.0" - sources."@electron-forge/core-utils-6.0.0" - sources."@electron-forge/maker-base-6.0.0" - sources."@electron-forge/plugin-base-6.0.0" - sources."@electron-forge/publisher-base-6.0.0" - sources."@electron-forge/shared-types-6.0.0" - sources."@electron-forge/template-base-6.0.0" - sources."@electron-forge/template-webpack-6.0.0" - sources."@electron-forge/template-webpack-typescript-6.0.0" - (sources."@electron/asar-3.2.2" // { + sources."@electron-forge/core-6.0.4" + sources."@electron-forge/core-utils-6.0.4" + sources."@electron-forge/maker-base-6.0.4" + sources."@electron-forge/plugin-base-6.0.4" + sources."@electron-forge/publisher-base-6.0.4" + sources."@electron-forge/shared-types-6.0.4" + sources."@electron-forge/template-base-6.0.4" + sources."@electron-forge/template-webpack-6.0.4" + sources."@electron-forge/template-webpack-typescript-6.0.4" + (sources."@electron/asar-3.2.3" // { dependencies = [ sources."commander-5.1.0" ]; @@ -99211,9 +98659,9 @@ in sources."fs-extra-9.1.0" ]; }) - sources."@electron/osx-sign-1.0.1" + sources."@electron/osx-sign-1.0.4" sources."@electron/rebuild-3.2.10" - (sources."@electron/universal-1.3.3" // { + (sources."@electron/universal-1.3.4" // { dependencies = [ sources."@malept/cross-spawn-promise-1.1.1" sources."fs-extra-9.1.0" @@ -99229,12 +98677,12 @@ in sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-2.0.0" - sources."@types/cacheable-request-6.0.2" + sources."@types/cacheable-request-6.0.3" sources."@types/glob-7.2.0" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-4.2.0" + sources."@types/keyv-3.1.4" sources."@types/minimatch-5.1.2" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.10.0" sources."abbrev-1.1.1" @@ -99263,26 +98711,24 @@ in sources."braces-3.0.2" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" - sources."buffer-equal-1.0.0" + sources."buffer-equal-1.0.1" sources."buffer-from-1.1.2" (sources."cacache-16.1.3" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-8.0.3" - sources."minimatch-5.1.0" + sources."glob-8.1.0" + sources."minimatch-5.1.6" ]; }) sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.2" sources."chalk-4.1.2" - sources."chardet-0.7.0" sources."chownr-2.0.0" sources."chromium-pickle-js-0.2.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.7.0" sources."cli-truncate-2.1.0" - sources."cli-width-3.0.0" sources."cliui-8.0.1" sources."clone-1.0.4" sources."clone-response-1.0.3" @@ -99290,7 +98736,6 @@ in sources."color-name-1.1.4" sources."color-support-1.1.3" sources."colorette-2.0.19" - sources."colors-1.0.3" sources."commander-4.1.1" sources."compare-version-0.1.2" sources."concat-map-0.0.1" @@ -99318,12 +98763,7 @@ in sources."depd-1.1.2" sources."detect-libc-2.0.1" sources."detect-node-2.1.0" - (sources."dir-compare-2.4.0" // { - dependencies = [ - sources."commander-2.9.0" - sources."minimatch-3.0.4" - ]; - }) + sources."dir-compare-3.3.0" sources."electron-packager-17.1.1" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" @@ -99347,16 +98787,10 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."external-editor-3.1.0" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) sources."extract-zip-2.0.1" sources."fast-glob-3.2.12" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fd-slicer-1.1.0" - sources."figures-3.2.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" sources."fill-range-7.0.1" @@ -99390,7 +98824,7 @@ in sources."gauge-4.0.4" sources."get-caller-file-2.0.5" sources."get-installed-path-2.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" (sources."get-package-info-1.0.0" // { dependencies = [ sources."debug-2.6.9" @@ -99408,9 +98842,8 @@ in ]; }) sources."globalthis-1.0.3" - sources."got-11.8.5" + sources."got-11.8.6" sources."graceful-fs-4.2.10" - sources."graceful-readlink-1.0.1" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-property-descriptors-1.0.0" @@ -99418,7 +98851,7 @@ in sources."has-unicode-2.0.1" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."http2-wrapper-1.0.3" sources."https-proxy-agent-5.0.1" @@ -99431,7 +98864,6 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."inquirer-8.2.5" sources."interpret-3.1.1" sources."ip-2.0.0" sources."is-arrayish-0.2.1" @@ -99453,8 +98885,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" sources."junk-3.1.0" - sources."keyv-4.5.1" - sources."listr2-5.0.5" + sources."keyv-4.5.2" + sources."listr2-5.0.7" sources."load-json-file-2.0.0" sources."locate-path-2.0.0" sources."lodash-4.17.21" @@ -99483,7 +98915,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-3.3.5" + sources."minipass-3.3.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-2.1.2" sources."minipass-flush-1.0.5" @@ -99492,15 +98924,14 @@ in sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.3" - sources."mute-stream-0.0.8" sources."negotiator-0.6.3" sources."nice-try-1.0.5" - sources."node-abi-3.28.0" + sources."node-abi-3.31.0" sources."node-addon-api-3.2.1" sources."node-api-version-0.1.4" - sources."node-fetch-2.6.7" - sources."node-gyp-9.3.0" - sources."node-gyp-build-4.5.0" + sources."node-fetch-2.6.8" + sources."node-gyp-9.3.1" + sources."node-gyp-build-4.6.0" sources."nopt-6.0.0" (sources."normalize-package-data-2.5.0" // { dependencies = [ @@ -99518,7 +98949,6 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."ora-5.4.1" - sources."os-tmpdir-1.0.2" sources."p-cancelable-2.1.1" sources."p-defer-1.0.0" sources."p-finally-1.0.0" @@ -99529,7 +98959,6 @@ in sources."p-try-1.0.0" sources."parse-author-2.0.0" sources."parse-json-2.2.0" - sources."parse-ms-2.1.0" sources."parse-passwd-1.0.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" @@ -99550,7 +98979,6 @@ in ]; }) sources."plist-3.0.6" - sources."pretty-ms-7.0.1" sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" @@ -99578,9 +99006,8 @@ in sources."rfdc-1.3.0" sources."rimraf-3.0.2" sources."roarr-2.15.4" - sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.7" + sources."rxjs-7.8.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" (sources."semver-7.3.8" // { @@ -99616,13 +99043,16 @@ in sources."sumchecker-3.0.1" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tar-6.1.12" + (sources."tar-6.1.13" // { + dependencies = [ + sources."minipass-4.0.0" + ]; + }) sources."through-2.3.8" - sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-fest-0.13.1" sources."unique-filename-2.0.1" sources."unique-slug-3.0.0" @@ -99668,10 +99098,10 @@ in eas-cli = nodeEnv.buildNodePackage { name = "eas-cli"; packageName = "eas-cli"; - version = "2.6.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/eas-cli/-/eas-cli-2.6.0.tgz"; - sha512 = "fblslsf7Hz6oSKAXxnXVX9Jckqxee0hlBxo1SoI4eFgDQCK8crxoNGyEg0w1q1f830Sh+CoM0uteiJIiLGiXcQ=="; + url = "https://registry.npmjs.org/eas-cli/-/eas-cli-3.4.1.tgz"; + sha512 = "YLeowqdlv7xHh7JBo3uYOjh5g2nZJFH5l6xIY/MO/f3vEEgHDltE8oXwgZ8JHzQ8n/PntyRZwffxVDsxMMS7vw=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -99687,21 +99117,27 @@ in sources."uuid-8.3.2" ]; }) - sources."@expo/code-signing-certificates-0.0.3" - (sources."@expo/config-7.0.1" // { + sources."@expo/code-signing-certificates-0.0.5" + (sources."@expo/config-7.0.3" // { dependencies = [ + sources."@expo/json-file-8.2.36" sources."semver-7.3.2" ]; }) - sources."@expo/config-plugins-5.0.1" - sources."@expo/config-types-46.0.2" - sources."@expo/eas-build-job-0.2.96" - (sources."@expo/eas-json-2.6.0" // { + (sources."@expo/config-plugins-5.0.4" // { + dependencies = [ + sources."@expo/json-file-8.2.36" + sources."@expo/plist-0.0.18" + ]; + }) + sources."@expo/config-types-47.0.0" + sources."@expo/eas-build-job-0.2.102" + (sources."@expo/eas-json-3.3.2" // { dependencies = [ sources."@babel/code-frame-7.18.6" ]; }) - (sources."@expo/image-utils-0.3.20" // { + (sources."@expo/image-utils-0.3.22" // { dependencies = [ sources."@expo/spawn-async-1.5.0" sources."fs-extra-9.0.0" @@ -99709,20 +99145,25 @@ in sources."semver-7.3.2" ]; }) - sources."@expo/json-file-8.2.36" - sources."@expo/multipart-body-parser-1.1.0" - sources."@expo/osascript-2.0.33" - sources."@expo/package-manager-0.0.56" - sources."@expo/pkcs12-0.0.8" - (sources."@expo/plist-0.0.18" // { + (sources."@expo/json-file-8.2.37" // { dependencies = [ - sources."xmlbuilder-14.0.0" + sources."json5-2.2.3" ]; }) - sources."@expo/plugin-help-5.1.16" - sources."@expo/plugin-warn-if-update-available-2.4.0" - (sources."@expo/prebuild-config-5.0.3" // { + sources."@expo/multipart-body-parser-1.1.0" + sources."@expo/osascript-2.0.33" + (sources."@expo/package-manager-0.0.57" // { dependencies = [ + sources."@expo/json-file-8.2.36" + ]; + }) + sources."@expo/pkcs12-0.0.8" + sources."@expo/plist-0.0.20" + sources."@expo/plugin-help-5.1.22" + sources."@expo/plugin-warn-if-update-available-2.5.0" + (sources."@expo/prebuild-config-5.0.7" // { + dependencies = [ + sources."@expo/json-file-8.2.36" sources."fs-extra-9.1.0" sources."semver-7.3.2" sources."universalify-2.0.0" @@ -99745,13 +99186,12 @@ in ]; }) sources."@expo/timeago.js-1.0.0" - sources."@graphql-typed-document-node/core-3.1.1" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@oclif/core-1.19.2" // { + (sources."@oclif/core-1.23.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -99763,20 +99203,20 @@ in ]; }) sources."@oclif/linewrap-1.0.0" - (sources."@oclif/plugin-autocomplete-1.3.4" // { + (sources."@oclif/plugin-autocomplete-1.3.10" // { dependencies = [ sources."fs-extra-9.1.0" sources."universalify-2.0.0" ]; }) - sources."@oclif/screen-3.0.3" + sources."@oclif/screen-3.0.4" sources."@react-native/normalize-color-2.1.0" - sources."@segment/ajv-human-errors-2.1.2" + sources."@segment/ajv-human-errors-2.2.0" sources."@segment/loosely-validate-event-2.0.0" sources."@sideway/address-4.1.4" - sources."@sideway/formula-3.0.0" + sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" - sources."@urql/core-3.0.5" + sources."@urql/core-3.1.1" sources."@urql/exchange-retry-1.0.0" sources."@xmldom/xmldom-0.7.9" sources."agent-base-6.0.2" @@ -99861,7 +99301,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."exec-async-2.2.0" - (sources."expo-modules-autolinking-1.0.0" // { + (sources."expo-modules-autolinking-1.0.2" // { dependencies = [ sources."commander-7.2.0" sources."fs-extra-9.1.0" @@ -99870,7 +99310,7 @@ in }) sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.12" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fetch-retry-4.1.1" sources."figures-3.2.0" sources."filelist-1.0.4" @@ -99883,7 +99323,11 @@ in sources."universalify-2.0.0" ]; }) - sources."fs-minipass-2.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."fs.realpath-1.0.0" sources."get-package-type-0.1.0" sources."getenv-1.0.0" @@ -99905,7 +99349,7 @@ in sources."https-proxy-agent-5.0.1" sources."hyperlinker-1.0.0" sources."iconv-lite-0.6.3" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."inflight-1.0.6" @@ -99930,13 +99374,13 @@ in }) sources."jimp-compact-0.16.1" sources."jks-js-1.1.0" - sources."joi-17.6.4" + sources."joi-17.7.0" sources."join-component-1.1.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-1.0.0" - sources."json5-1.0.1" + sources."json5-1.0.2" (sources."jsonfile-6.1.0" // { dependencies = [ sources."universalify-2.0.0" @@ -99956,14 +99400,18 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" - (sources."minimatch-5.1.0" // { + (sources."minimatch-5.1.2" // { dependencies = [ sources."brace-expansion-2.0.1" ]; }) sources."minimist-1.2.7" - sources."minipass-3.3.5" - sources."minizlib-2.1.2" + sources."minipass-4.0.0" + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."mute-stream-0.0.8" @@ -100002,7 +99450,11 @@ in sources."p-locate-5.0.0" sources."p-try-2.2.0" sources."parse-json-4.0.0" - sources."parse-png-2.1.0" + (sources."parse-png-2.1.0" // { + dependencies = [ + sources."pngjs-3.4.0" + ]; + }) (sources."password-prompt-1.1.2" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -100022,12 +99474,16 @@ in sources."p-locate-4.1.0" ]; }) - sources."plist-3.0.6" - sources."pngjs-3.4.0" + (sources."plist-3.0.6" // { + dependencies = [ + sources."xmlbuilder-15.1.1" + ]; + }) + sources."pngjs-6.0.0" sources."promise-limit-2.7.0" sources."promise-retry-2.0.1" sources."prompts-2.4.2" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qrcode-terminal-0.12.0" sources."queue-microtask-1.2.3" sources."redeyed-2.1.1" @@ -100058,7 +99514,7 @@ in sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."structured-headers-0.4.1" - sources."sucrase-3.28.0" + sources."sucrase-3.29.0" sources."sudo-prompt-9.1.1" sources."supports-color-5.5.0" (sources."supports-hyperlinks-2.3.0" // { @@ -100067,7 +99523,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."tar-6.1.11" // { + (sources."tar-6.1.13" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -100081,7 +99537,7 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."ts-interface-checker-0.1.13" - sources."tslib-2.4.0" + sources."tslib-2.4.1" sources."tunnel-agent-0.6.0" sources."turndown-7.1.1" sources."type-fest-0.3.1" @@ -100096,7 +99552,7 @@ in sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."widest-line-3.1.0" - sources."wonka-6.1.1" + sources."wonka-6.1.2" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -100116,7 +99572,7 @@ in sources."xmlbuilder-11.0.1" ]; }) - sources."xmlbuilder-15.1.1" + sources."xmlbuilder-14.0.0" sources."yallist-4.0.0" sources."yocto-queue-0.1.0" ]; @@ -100151,14 +99607,14 @@ in elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.19.1-revision10"; + version = "0.19.1-revision11"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision10.tgz"; - sha512 = "33jXpA15alVcYjX+UJOkiOmQIQxjd3c0eeg3960VyhEf8tG8O4g4B5ipMmu6KAllncrSxSQrYzKJnNJM/8ZiCg=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision11.tgz"; + sha512 = "ZUCE+YM3zNzADtZNZpm+swcL7NEJm68vEqRb+cENOp+ndQbG9nBWjSpVfpAo5Ha3rEmj/KdxjiWf2kMUCggnmQ=="; }; dependencies = [ sources."ansi-styles-4.3.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."balanced-match-1.0.2" sources."binary-extensions-2.2.0" sources."brace-expansion-2.0.1" @@ -100167,13 +99623,13 @@ in sources."chokidar-3.5.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-9.4.1" + sources."commander-9.5.0" sources."cross-spawn-7.0.3" sources."elm-solve-deps-wasm-1.0.2" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" - sources."glob-8.0.3" + sources."glob-8.1.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.10" sources."has-flag-4.0.0" @@ -100184,7 +99640,7 @@ in sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."isexe-2.0.0" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."path-key-3.1.1" @@ -100221,46 +99677,48 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.1" - (sources."@babel/core-7.20.2" // { + sources."@babel/compat-data-7.20.14" + (sources."@babel/core-7.20.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.2" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; }) sources."@babel/helper-annotate-as-pure-7.18.6" - (sources."@babel/helper-compilation-targets-7.20.0" // { + (sources."@babel/helper-compilation-targets-7.20.7" // { dependencies = [ + sources."lru-cache-5.1.1" sources."semver-6.3.0" + sources."yallist-3.1.1" ]; }) sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.2" + sources."@babel/helper-module-transforms-7.20.11" sources."@babel/helper-plugin-utils-7.20.2" sources."@babel/helper-simple-access-7.20.2" sources."@babel/helper-split-export-declaration-7.18.6" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.1" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.2" - sources."@babel/plugin-proposal-object-rest-spread-7.20.2" + sources."@babel/parser-7.20.13" + sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.20.2" - sources."@babel/plugin-transform-parameters-7.20.1" - sources."@babel/plugin-transform-react-jsx-7.19.0" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.20.1" - sources."@babel/types-7.20.2" + sources."@babel/plugin-transform-destructuring-7.20.7" + sources."@babel/plugin-transform-parameters-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.20.13" + sources."@babel/template-7.20.7" + sources."@babel/traverse-7.20.13" + sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -100269,7 +99727,7 @@ in sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/prop-types-15.7.5" - sources."@types/react-18.0.25" + sources."@types/react-18.0.27" sources."@types/scheduler-0.16.2" sources."@types/yoga-layout-1.9.2" sources."ajv-6.12.6" @@ -100294,7 +99752,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -100387,7 +99845,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.1" + sources."json5-2.2.3" sources."kind-of-6.0.3" sources."lines-and-columns-1.2.4" sources."locate-path-3.0.0" @@ -100413,8 +99871,8 @@ in sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nice-try-1.0.5" - sources."node-gyp-build-4.5.0" - sources."node-releases-2.0.6" + sources."node-gyp-build-4.6.0" + sources."node-releases-2.0.8" sources."normalize-package-data-2.5.0" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" @@ -100447,10 +99905,10 @@ in sources."pkg-up-3.1.0" sources."prop-types-15.8.1" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.26.1" + sources."react-devtools-core-4.27.1" sources."react-is-16.13.1" (sources."react-reconciler-0.26.2" // { dependencies = [ @@ -100494,7 +99952,7 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" - (sources."stack-utils-2.0.5" // { + (sources."stack-utils-2.0.6" // { dependencies = [ sources."escape-string-regexp-2.0.0" ]; @@ -100563,11 +100021,11 @@ in dependencies = [ sources."@azure/abort-controller-1.1.0" sources."@azure/core-auth-1.4.0" - sources."@azure/core-client-1.6.1" + sources."@azure/core-client-1.7.0" sources."@azure/core-http-compat-1.3.0" - sources."@azure/core-lro-2.4.0" + sources."@azure/core-lro-2.5.0" sources."@azure/core-paging-1.4.0" - (sources."@azure/core-rest-pipeline-1.10.0" // { + (sources."@azure/core-rest-pipeline-1.10.1" // { dependencies = [ sources."@tootallnate/once-2.0.0" sources."debug-4.3.4" @@ -100585,10 +100043,15 @@ in }) sources."@azure/keyvault-keys-4.6.0" sources."@azure/logger-1.0.3" - sources."@azure/msal-browser-2.30.0" - sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.14.2" // { + (sources."@azure/msal-browser-2.32.2" // { dependencies = [ + sources."@azure/msal-common-9.1.1" + ]; + }) + sources."@azure/msal-common-7.6.0" + (sources."@azure/msal-node-1.14.6" // { + dependencies = [ + sources."@azure/msal-common-9.1.1" sources."uuid-8.3.2" ]; }) @@ -100624,21 +100087,21 @@ in sources."strip-json-comments-3.1.1" ]; }) - sources."@fluentui/date-time-utilities-8.5.2" - sources."@fluentui/dom-utilities-2.2.2" - sources."@fluentui/font-icons-mdl2-8.5.2" - sources."@fluentui/foundation-legacy-8.2.22" - sources."@fluentui/keyboard-key-0.4.2" - sources."@fluentui/merge-styles-8.5.3" - sources."@fluentui/react-8.100.0" - sources."@fluentui/react-focus-8.8.8" - sources."@fluentui/react-hooks-8.6.12" - sources."@fluentui/react-portal-compat-context-9.0.3" - sources."@fluentui/react-window-provider-2.2.3" - sources."@fluentui/set-version-8.2.2" - sources."@fluentui/style-utilities-8.8.1" - sources."@fluentui/theme-2.6.17" - sources."@fluentui/utilities-8.13.2" + sources."@fluentui/date-time-utilities-8.5.4" + sources."@fluentui/dom-utilities-2.2.4" + sources."@fluentui/font-icons-mdl2-8.5.7" + sources."@fluentui/foundation-legacy-8.2.27" + sources."@fluentui/keyboard-key-0.4.4" + sources."@fluentui/merge-styles-8.5.5" + sources."@fluentui/react-8.104.8" + sources."@fluentui/react-focus-8.8.13" + sources."@fluentui/react-hooks-8.6.15" + sources."@fluentui/react-portal-compat-context-9.0.4" + sources."@fluentui/react-window-provider-2.2.5" + sources."@fluentui/set-version-8.2.4" + sources."@fluentui/style-utilities-8.9.0" + sources."@fluentui/theme-2.6.21" + sources."@fluentui/utilities-8.13.5" sources."@gar/promisify-1.1.3" (sources."@gulp-sourcemaps/identity-map-2.0.1" // { dependencies = [ @@ -100668,59 +100131,55 @@ in sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - sources."@js-joda/core-5.4.2" + sources."@js-joda/core-5.5.2" sources."@mapbox/node-pre-gyp-1.0.10" sources."@microsoft/load-themed-styles-1.10.295" - sources."@node-rs/crc32-1.5.1" - sources."@node-rs/crc32-android-arm-eabi-1.5.1" - sources."@node-rs/crc32-android-arm64-1.5.1" - sources."@node-rs/crc32-darwin-arm64-1.5.1" - sources."@node-rs/crc32-darwin-x64-1.5.1" - sources."@node-rs/crc32-freebsd-x64-1.5.1" - sources."@node-rs/crc32-linux-arm-gnueabihf-1.5.1" - sources."@node-rs/crc32-linux-arm64-gnu-1.5.1" - sources."@node-rs/crc32-linux-arm64-musl-1.5.1" - sources."@node-rs/crc32-linux-x64-gnu-1.5.1" - sources."@node-rs/crc32-linux-x64-musl-1.5.1" - sources."@node-rs/crc32-win32-arm64-msvc-1.5.1" - sources."@node-rs/crc32-win32-ia32-msvc-1.5.1" - sources."@node-rs/crc32-win32-x64-msvc-1.5.1" + sources."@node-rs/crc32-1.6.0" + sources."@node-rs/crc32-android-arm-eabi-1.6.0" + sources."@node-rs/crc32-android-arm64-1.6.0" + sources."@node-rs/crc32-darwin-arm64-1.6.0" + sources."@node-rs/crc32-darwin-x64-1.6.0" + sources."@node-rs/crc32-freebsd-x64-1.6.0" + sources."@node-rs/crc32-linux-arm-gnueabihf-1.6.0" + sources."@node-rs/crc32-linux-arm64-gnu-1.6.0" + sources."@node-rs/crc32-linux-arm64-musl-1.6.0" + sources."@node-rs/crc32-linux-x64-gnu-1.6.0" + sources."@node-rs/crc32-linux-x64-musl-1.6.0" + sources."@node-rs/crc32-win32-arm64-msvc-1.6.0" + sources."@node-rs/crc32-win32-ia32-msvc-1.6.0" + sources."@node-rs/crc32-win32-x64-msvc-1.6.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.1" sources."@npmcli/move-file-1.1.2" - sources."@redis/bloom-1.1.0" - (sources."@redis/client-1.3.1" // { - dependencies = [ - sources."cluster-key-slot-1.1.1" - ]; - }) + sources."@redis/bloom-1.2.0" + sources."@redis/client-1.5.3" sources."@redis/graph-1.1.0" sources."@redis/json-1.0.4" - sources."@redis/search-1.1.0" - sources."@redis/time-series-1.0.3" - (sources."@sap/hana-client-2.14.22" // { + sources."@redis/search-1.1.1" + sources."@redis/time-series-1.0.4" + (sources."@sap/hana-client-2.15.19" // { dependencies = [ sources."debug-3.1.0" ]; }) sources."@sindresorhus/is-0.14.0" sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.14" - sources."@swc/core-darwin-arm64-1.3.14" - sources."@swc/core-darwin-x64-1.3.14" - sources."@swc/core-linux-arm-gnueabihf-1.3.14" - sources."@swc/core-linux-arm64-gnu-1.3.14" - sources."@swc/core-linux-arm64-musl-1.3.14" - sources."@swc/core-linux-x64-gnu-1.3.14" - sources."@swc/core-linux-x64-musl-1.3.14" - sources."@swc/core-win32-arm64-msvc-1.3.14" - sources."@swc/core-win32-ia32-msvc-1.3.14" - sources."@swc/core-win32-x64-msvc-1.3.14" - sources."@swc/wasm-1.3.14" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@szmarczak/http-timer-1.1.2" - sources."@tediousjs/connection-string-0.4.1" + sources."@tediousjs/connection-string-0.4.2" sources."@tokenizer/token-0.3.0" sources."@tootallnate/once-1.1.2" sources."@tsconfig/node10-1.0.9" @@ -100731,13 +100190,12 @@ in sources."@types/component-emitter-1.2.11" sources."@types/connect-3.4.35" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.12" - sources."@types/es-aggregate-error-1.0.2" + sources."@types/cors-2.8.13" sources."@types/eslint-8.4.10" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.31" + sources."@types/express-serve-static-core-4.17.33" sources."@types/file-type-10.9.1" sources."@types/js-yaml-4.0.4" sources."@types/json-schema-7.0.11" @@ -100751,8 +100209,8 @@ in sources."@types/prop-types-15.7.5" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - sources."@types/react-18.0.25" - sources."@types/react-dom-18.0.8" + sources."@types/react-18.0.27" + sources."@types/react-dom-18.0.10" sources."@types/scheduler-0.16.2" sources."@types/serve-static-1.15.0" sources."@types/socket.io-3.0.1" @@ -100805,7 +100263,7 @@ in sources."acorn-7.4.1" (sources."acorn-import-assertions-1.8.0" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" ]; }) sources."acorn-jsx-5.3.2" @@ -100823,7 +100281,7 @@ in ]; }) sources."aggregate-error-3.1.0" - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."ajv-formats-2.1.1" (sources."ajv-keywords-3.5.2" // { dependencies = [ @@ -100905,11 +100363,12 @@ in 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-each-1.0.4" sources."async-limiter-1.0.1" sources."async-settle-1.0.0" sources."asynckit-0.4.0" sources."atob-2.1.2" + sources."available-typed-arrays-1.0.5" sources."axios-0.24.0" sources."bach-1.2.0" sources."backo2-1.0.2" @@ -100922,7 +100381,7 @@ in sources."base64-js-1.5.1" sources."base64id-2.0.0" sources."basic-auth-2.0.1" - sources."better-sqlite3-7.6.2" + sources."better-sqlite3-8.0.1" sources."bignumber.js-9.0.0" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" @@ -100954,6 +100413,7 @@ in sources."brace-expansion-1.1.11" sources."glob-7.2.3" sources."minimatch-3.1.2" + sources."minipass-3.3.6" ]; }) sources."cache-base-1.0.1" @@ -100966,7 +100426,7 @@ in sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-3.0.0" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."chalk-4.1.2" sources."chardet-0.7.0" (sources."chokidar-2.1.8" // { @@ -101080,7 +100540,7 @@ in ]; }) sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."deep-is-0.1.4" @@ -101143,15 +100603,16 @@ in sources."ws-8.2.3" ]; }) - sources."engine.io-parser-5.0.4" - sources."enhanced-resolve-5.10.0" + sources."engine.io-parser-5.0.6" + sources."enhanced-resolve-5.12.0" sources."enquirer-2.3.6" sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."error-ex-1.3.2" - sources."es-abstract-1.20.4" + sources."es-abstract-1.21.1" sources."es-aggregate-error-1.0.9" sources."es-module-lexer-0.9.3" + sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."es5-ext-0.10.62" sources."es6-iterator-2.0.3" @@ -101253,7 +100714,7 @@ in sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."figlet-1.5.2" sources."figures-3.2.0" sources."file-entry-cache-6.0.1" @@ -101289,6 +100750,7 @@ in ]; }) sources."follow-redirects-1.15.2" + sources."for-each-0.3.3" sources."for-in-1.0.2" sources."for-own-1.0.0" sources."form-data-4.0.0" @@ -101297,7 +100759,11 @@ in sources."fresh-0.5.2" sources."fs-constants-1.0.0" sources."fs-extra-8.1.0" - sources."fs-minipass-2.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."fs-mkdirp-stream-1.0.0" sources."fs-routes-9.0.3" sources."fs.realpath-1.0.0" @@ -101310,12 +100776,12 @@ in sources."generate-function-2.3.1" sources."generic-pool-3.9.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."github-from-package-0.0.0" - sources."glob-8.0.3" + sources."glob-8.1.0" sources."glob-parent-5.1.2" (sources."glob-stream-6.1.0" // { dependencies = [ @@ -101337,10 +100803,11 @@ in sources."which-1.3.1" ]; }) - sources."globals-13.17.0" + sources."globals-13.20.0" sources."globalthis-1.0.3" sources."globby-11.1.0" sources."glogg-1.0.2" + sources."gopd-1.0.1" sources."got-9.6.0" sources."graceful-fs-4.2.10" sources."gulp-4.0.2" @@ -101451,6 +100918,7 @@ in sources."has-bigints-1.0.2" sources."has-flag-4.0.0" sources."has-property-descriptors-1.0.0" + sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" @@ -101469,7 +100937,7 @@ in 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-cache-semantics-4.1.1" sources."http-errors-1.7.2" (sources."http-proxy-agent-4.0.1" // { dependencies = [ @@ -101486,7 +100954,7 @@ in sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" @@ -101495,21 +100963,22 @@ in sources."inherits-2.0.3" sources."ini-1.3.8" sources."inquirer-7.3.3" - sources."internal-slot-1.0.3" + sources."internal-slot-1.0.4" sources."interpret-1.4.0" sources."inversify-5.1.1" sources."invert-kv-1.0.0" - (sources."ioredis-5.2.4" // { + (sources."ioredis-5.3.0" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."ip-2.0.0" - sources."ip-num-1.4.1" + sources."ip-num-1.5.0" sources."ipaddr.js-1.9.1" sources."is-absolute-1.0.0" sources."is-accessor-descriptor-1.0.0" + sources."is-array-buffer-3.0.1" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-binary-path-1.0.1" @@ -101541,6 +101010,7 @@ in sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.10" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-valid-glob-1.0.0" @@ -101574,11 +101044,10 @@ in sources."eventemitter3-3.1.2" ]; }) - (sources."jsonwebtoken-8.5.1" // { + (sources."jsonwebtoken-9.0.0" // { dependencies = [ sources."jws-3.2.2" sources."ms-2.1.3" - sources."semver-5.7.1" ]; }) sources."just-debounce-1.1.0" @@ -101608,15 +101077,8 @@ in sources."loader-runner-4.3.0" sources."lodash-4.17.21" sources."lodash.defaults-4.2.0" - sources."lodash.includes-4.3.0" sources."lodash.isarguments-3.1.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.truncate-4.4.2" (sources."log4js-6.3.0" // { dependencies = [ @@ -101624,7 +101086,7 @@ in sources."ms-2.1.2" ]; }) - sources."long-4.0.0" + sources."long-5.2.1" sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" @@ -101635,7 +101097,11 @@ in ]; }) sources."make-error-1.3.6" - sources."make-fetch-happen-9.1.0" + (sources."make-fetch-happen-9.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."make-iterator-1.0.1" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -101665,15 +101131,39 @@ in sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" sources."minimist-1.2.5" - sources."minipass-3.3.5" - sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.4.1" - sources."minipass-flush-1.0.5" - sources."minipass-pipeline-1.2.4" - sources."minipass-sized-1.0.3" - sources."minizlib-2.1.2" + sources."minipass-4.0.0" + (sources."minipass-collect-1.0.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-fetch-1.4.1" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-flush-1.0.5" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-pipeline-1.2.4" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-sized-1.0.3" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) (sources."mirakurun-3.9.0-beta.26" // { dependencies = [ sources."ajv-6.12.6" @@ -101730,7 +101220,7 @@ in ]; }) sources."openapi-types-7.2.3" - sources."swagger-ui-dist-4.15.2" + sources."swagger-ui-dist-4.15.5" ]; }) (sources."mixin-deep-1.3.2" // { @@ -101755,9 +101245,9 @@ in ]; }) sources."ms-2.0.0" - (sources."mssql-9.0.1" // { + (sources."mssql-9.1.1" // { dependencies = [ - sources."commander-9.4.1" + sources."commander-9.5.0" sources."debug-4.3.4" sources."ms-2.1.2" ]; @@ -101777,17 +101267,17 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."mysql2-2.3.3" // { + (sources."mysql2-3.0.1" // { dependencies = [ sources."iconv-lite-0.6.3" + sources."lru-cache-7.14.1" sources."sqlstring-2.3.3" ]; }) sources."mz-2.7.0" - (sources."named-placeholders-1.1.2" // { + (sources."named-placeholders-1.1.3" // { dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" + sources."lru-cache-7.14.1" ]; }) sources."nan-2.17.0" @@ -101799,10 +101289,10 @@ in sources."neo-async-2.6.2" sources."next-tick-1.1.0" sources."nice-try-1.0.5" - sources."node-abi-3.28.0" - sources."node-abort-controller-3.0.1" + sources."node-abi-3.31.0" + sources."node-abort-controller-3.1.1" sources."node-addon-api-4.3.0" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" (sources."node-gyp-8.4.1" // { dependencies = [ sources."are-we-there-yet-3.0.1" @@ -101813,8 +101303,8 @@ in sources."npmlog-6.0.2" ]; }) - sources."node-gyp-build-4.5.0" - sources."node-releases-2.0.6" + sources."node-gyp-build-4.6.0" + sources."node-releases-2.0.8" sources."nopt-5.0.0" (sources."normalize-package-data-2.5.0" // { dependencies = [ @@ -101840,7 +101330,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.4" @@ -101939,9 +101429,9 @@ in sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."peek-readable-4.1.0" - sources."pg-8.8.0" + sources."pg-8.9.0" sources."pg-connection-string-2.5.0" - sources."pg-cursor-2.7.4" + sources."pg-cursor-2.8.0" sources."pg-int8-1.0.1" (sources."pg-native-3.0.1" // { dependencies = [ @@ -101952,8 +101442,8 @@ in ]; }) sources."pg-pool-3.5.2" - sources."pg-protocol-1.5.0" - sources."pg-query-stream-4.2.4" + sources."pg-protocol-1.6.0" + sources."pg-query-stream-4.3.0" sources."pg-types-2.2.0" sources."pgpass-1.0.5" sources."picocolors-0.2.1" @@ -101984,14 +101474,13 @@ in sources."promise-queue-2.2.5" sources."promise-retry-2.0.1" sources."proxy-addr-2.0.7" - sources."pseudomap-1.0.2" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ sources."pump-2.0.1" ]; }) - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.7.0" sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" @@ -102023,7 +101512,7 @@ in ]; }) sources."rechoir-0.6.2" - sources."redis-4.4.0" + sources."redis-4.6.2" sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" sources."reflect-metadata-0.1.13" @@ -102089,7 +101578,7 @@ in ]; }) sources."seq-queue-0.0.5" - sources."serialize-javascript-6.0.0" + sources."serialize-javascript-6.0.1" sources."serve-static-1.14.1" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { @@ -102179,7 +101668,11 @@ in sources."sql.js-1.8.0" sources."sqlite3-5.0.11" sources."sqlstring-2.3.1" - sources."ssri-8.0.1" + (sources."ssri-8.0.1" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."stack-trace-0.0.10" sources."standard-as-callback-2.1.0" (sources."static-extend-0.1.2" // { @@ -102212,8 +101705,8 @@ in }) sources."streamsearch-0.1.2" sources."string-width-4.2.3" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" + sources."string.prototype.trimend-1.0.6" + sources."string.prototype.trimstart-1.0.6" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" @@ -102230,9 +101723,9 @@ in sources."swagger-schema-official-2.0.0-bab6bed" sources."swagger-ui-dist-3.52.5" sources."table-6.8.1" - sources."tail-2.2.4" + sources."tail-2.2.6" sources."tapable-2.2.1" - sources."tar-6.1.12" + sources."tar-6.1.13" (sources."tar-fs-2.1.1" // { dependencies = [ sources."chownr-1.1.4" @@ -102240,7 +101733,7 @@ in }) sources."tar-stream-2.2.0" sources."tarn-3.0.2" - (sources."tedious-15.1.1" // { + (sources."tedious-15.1.2" // { dependencies = [ sources."bl-5.1.0" sources."buffer-6.0.3" @@ -102249,9 +101742,9 @@ in sources."sprintf-js-1.1.2" ]; }) - (sources."terser-5.15.1" // { + (sources."terser-5.16.1" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."commander-2.20.3" ]; }) @@ -102288,10 +101781,10 @@ in sources."ts-log-2.2.5" (sources."ts-node-10.4.0" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" ]; }) - sources."tslib-2.4.1" + sources."tslib-2.5.0" (sources."tsutils-3.21.0" // { dependencies = [ sources."tslib-1.14.1" @@ -102302,6 +101795,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."type-is-1.6.18" + sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" (sources."typeorm-0.2.38" // { dependencies = [ @@ -102376,9 +101870,9 @@ in }) sources."watchpack-2.4.0" sources."webidl-conversions-3.0.1" - (sources."webpack-5.74.0" // { + (sources."webpack-5.75.0" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" ]; }) sources."webpack-sources-3.2.3" @@ -102386,6 +101880,7 @@ in sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" sources."which-module-1.0.0" + sources."which-typed-array-1.1.9" sources."wide-align-1.1.5" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" @@ -102442,12 +101937,12 @@ in sources."@babel/code-frame-7.18.6" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.2" + sources."@babel/parser-7.20.13" (sources."@eslint/eslintrc-0.4.3" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" sources."espree-7.3.1" - sources."globals-13.17.0" + sources."globals-13.20.0" sources."ignore-4.0.6" sources."type-fest-0.20.2" ]; @@ -102490,8 +101985,8 @@ in 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.14" - sources."@types/express-serve-static-core-4.17.31" + sources."@types/express-4.17.16" + sources."@types/express-serve-static-core-4.17.33" sources."@types/glob-7.2.0" sources."@types/hls.js-0.13.3" sources."@types/http-proxy-1.17.9" @@ -102501,7 +101996,7 @@ in sources."@types/mime-3.0.1" sources."@types/minimatch-5.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" @@ -102640,18 +102135,18 @@ in sources."yallist-3.1.1" ]; }) - (sources."@vue/compiler-core-3.2.41" // { + (sources."@vue/compiler-core-3.2.45" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.2.41" - (sources."@vue/compiler-sfc-3.2.41" // { + sources."@vue/compiler-dom-3.2.45" + (sources."@vue/compiler-sfc-3.2.45" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-ssr-3.2.41" + sources."@vue/compiler-ssr-3.2.45" (sources."@vue/component-compiler-utils-3.3.0" // { dependencies = [ sources."hash-sum-1.0.2" @@ -102665,8 +102160,8 @@ in 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/reactivity-transform-3.2.41" - sources."@vue/shared-3.2.41" + sources."@vue/reactivity-transform-3.2.45" + sources."@vue/shared-3.2.45" sources."@vue/web-component-wrapper-1.3.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -102693,7 +102188,7 @@ in sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" sources."acorn-walk-7.2.0" - sources."address-1.2.1" + sources."address-1.2.2" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" @@ -102709,7 +102204,7 @@ in sources."ansi-regex-4.1.1" sources."ansi-styles-3.2.1" sources."any-promise-1.3.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."aproba-1.2.0" sources."arch-2.2.0" sources."are-we-there-yet-1.1.7" @@ -102740,7 +102235,7 @@ in sources."assign-symbols-1.0.0" sources."astral-regex-1.0.0" sources."async-2.6.4" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."async-foreach-0.1.3" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" @@ -102753,8 +102248,9 @@ in sources."source-map-0.6.1" ]; }) + sources."available-typed-arrays-1.0.5" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."axios-0.24.0" (sources."babel-code-frame-6.26.0" // { dependencies = [ @@ -102852,7 +102348,7 @@ in sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -103055,7 +102551,7 @@ in sources."map-obj-1.0.1" ]; }) - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."deep-equal-1.1.1" sources."deep-is-0.1.4" sources."deepmerge-4.2.2" @@ -103140,7 +102636,7 @@ in 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.4" + sources."engine.io-parser-5.0.6" (sources."enhanced-resolve-4.5.0" // { dependencies = [ sources."memory-fs-0.5.0" @@ -103156,8 +102652,9 @@ in sources."errno-0.1.8" sources."error-ex-1.3.2" sources."error-stack-parser-2.1.4" - sources."es-abstract-1.20.4" + sources."es-abstract-1.21.1" sources."es-array-method-boxes-properly-1.0.0" + sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."escalade-3.1.1" @@ -103187,7 +102684,7 @@ in sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" sources."flatted-3.2.7" - sources."globals-13.17.0" + sources."globals-13.20.0" sources."has-flag-4.0.0" sources."ignore-4.0.6" sources."is-fullwidth-code-point-3.0.0" @@ -103204,7 +102701,7 @@ in sources."supports-color-7.2.0" (sources."table-6.8.1" // { dependencies = [ - sources."ajv-8.11.0" + sources."ajv-8.12.0" ]; }) sources."type-check-0.4.0" @@ -103308,7 +102805,7 @@ in sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."faye-websocket-0.11.4" sources."fibers-5.0.3" sources."figgy-pudding-3.5.2" @@ -103338,6 +102835,7 @@ in sources."flatted-2.0.2" sources."flush-write-stream-1.1.1" sources."follow-redirects-1.15.2" + sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" (sources."fork-ts-checker-webpack-plugin-3.1.1" // { @@ -103388,7 +102886,7 @@ in }) sources."gaze-1.1.3" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stdin-6.0.0" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" @@ -103402,6 +102900,7 @@ in sources."type-fest-0.8.1" ]; }) + sources."globalthis-1.0.3" sources."globby-11.1.0" (sources."globule-1.3.4" // { dependencies = [ @@ -103409,6 +102908,7 @@ in sources."minimatch-3.0.8" ]; }) + sources."gopd-1.0.1" sources."graceful-fs-4.2.10" sources."gzip-size-5.1.1" sources."handle-thing-2.0.1" @@ -103425,6 +102925,7 @@ in sources."has-cors-1.1.0" sources."has-flag-3.0.0" sources."has-property-descriptors-1.0.0" + sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" @@ -103496,7 +102997,7 @@ in }) sources."ieee754-1.2.1" sources."iferr-0.1.5" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."import-cwd-2.1.0" sources."import-fresh-3.3.0" (sources."import-from-2.1.0" // { @@ -103538,7 +103039,7 @@ in sources."default-gateway-4.2.0" ]; }) - sources."internal-slot-1.0.3" + sources."internal-slot-1.0.4" sources."interpret-1.4.0" sources."inversify-6.0.1" sources."ip-1.1.8" @@ -103547,6 +103048,7 @@ in sources."is-absolute-url-2.1.0" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.1" + sources."is-array-buffer-3.0.1" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" @@ -103580,6 +103082,7 @@ in sources."is-stream-1.1.0" sources."is-string-1.0.7" sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.10" sources."is-typedarray-1.0.0" sources."is-weakref-1.0.2" sources."is-windows-1.0.2" @@ -103601,20 +103104,20 @@ in 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."json5-1.0.2" sources."jsonfile-6.1.0" sources."jsonify-0.0.1" sources."jsprim-1.4.2" sources."killable-1.0.1" sources."kind-of-6.0.3" - sources."klona-2.0.5" + sources."klona-2.0.6" sources."launch-editor-2.6.0" sources."launch-editor-middleware-2.6.0" sources."levn-0.3.0" 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."loader-utils-1.4.2" (sources."locate-path-3.0.0" // { dependencies = [ sources."path-exists-3.0.0" @@ -103629,7 +103132,7 @@ in sources."lodash.truncate-4.4.2" sources."lodash.uniq-4.5.0" sources."log-symbols-2.2.0" - sources."loglevel-1.8.0" + sources."loglevel-1.8.1" sources."lower-case-1.1.4" sources."lru-cache-6.0.0" sources."magic-string-0.25.9" @@ -103645,7 +103148,7 @@ in sources."md5.js-1.3.5" sources."mdn-data-2.0.4" sources."media-typer-0.3.0" - sources."memfs-3.4.10" + sources."memfs-3.4.13" sources."memory-fs-0.4.1" (sources."meow-9.0.0" // { dependencies = [ @@ -103689,7 +103192,7 @@ in sources."is-plain-obj-1.1.0" ]; }) - sources."minipass-3.3.5" + sources."minipass-3.3.6" sources."minizlib-2.1.2" sources."mississippi-3.0.0" (sources."mixin-deep-1.3.2" // { @@ -103720,13 +103223,13 @@ in sources."which-2.0.2" ]; }) - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" (sources."node-sass-6.0.1" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -103756,8 +103259,8 @@ in sources."nth-check-1.0.2" (sources."null-loader-4.0.1" // { dependencies = [ - sources."json5-2.2.1" - sources."loader-utils-2.0.3" + sources."json5-2.2.3" + sources."loader-utils-2.0.4" sources."schema-utils-3.1.1" ]; }) @@ -103779,7 +103282,7 @@ in ]; }) sources."object-hash-1.3.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -103849,7 +103352,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - sources."postcss-8.4.18" + sources."postcss-8.4.21" (sources."postcss-calc-7.0.5" // { dependencies = [ sources."picocolors-0.2.1" @@ -104086,7 +103589,7 @@ in sources."source-map-0.6.1" ]; }) - sources."postcss-selector-parser-6.0.10" + sources."postcss-selector-parser-6.0.11" (sources."postcss-svgo-4.0.3" // { dependencies = [ sources."picocolors-0.2.1" @@ -104127,7 +103630,7 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."q-1.5.1" sources."qs-6.5.3" sources."query-string-4.3.4" @@ -104226,8 +103729,8 @@ in }) (sources."sass-loader-10.2.0" // { dependencies = [ - sources."json5-2.2.1" - sources."loader-utils-2.0.3" + sources."json5-2.2.3" + sources."loader-utils-2.0.4" sources."schema-utils-3.1.1" ]; }) @@ -104392,8 +103895,8 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" + sources."string.prototype.trimend-1.0.6" + sources."string.prototype.trimstart-1.0.6" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -104421,9 +103924,10 @@ in sources."svgo-1.3.2" sources."table-5.4.6" sources."tapable-1.1.3" - (sources."tar-6.1.12" // { + (sources."tar-6.1.13" // { dependencies = [ sources."chownr-2.0.0" + sources."minipass-4.0.0" sources."mkdirp-1.0.4" ]; }) @@ -104484,6 +103988,7 @@ in sources."type-check-0.3.2" sources."type-fest-0.6.0" sources."type-is-1.6.18" + sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" sources."typeface-roboto-1.1.13" sources."typescript-4.4.4" @@ -104556,7 +104061,7 @@ in ]; }) sources."vue-hot-reload-api-2.3.4" - (sources."vue-loader-15.10.0" // { + (sources."vue-loader-15.10.1" // { dependencies = [ sources."hash-sum-1.0.2" ]; @@ -104568,8 +104073,8 @@ in 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.3" + sources."json5-2.2.3" + sources."loader-utils-2.0.4" sources."supports-color-7.2.0" ]; }) @@ -104587,8 +104092,8 @@ in (sources."vuetify-loader-1.7.3" // { dependencies = [ sources."file-loader-6.2.0" - sources."json5-2.2.1" - sources."loader-utils-2.0.3" + sources."json5-2.2.3" + sources."loader-utils-2.0.4" sources."schema-utils-3.1.1" ]; }) @@ -104698,6 +104203,7 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-module-2.0.0" + sources."which-typed-array-1.1.9" sources."wide-align-1.1.5" sources."word-wrap-1.2.3" sources."worker-farm-1.7.0" @@ -104770,20 +104276,20 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "8.27.0"; + version = "8.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.27.0.tgz"; - sha512 = "0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz"; + sha512 = "nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ=="; }; dependencies = [ - sources."@eslint/eslintrc-1.3.3" - sources."@humanwhocodes/config-array-0.11.7" + sources."@eslint/eslintrc-1.4.1" + sources."@humanwhocodes/config-array-0.11.8" sources."@humanwhocodes/module-importer-1.0.1" 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."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" @@ -104801,7 +104307,7 @@ in sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.27.0" + sources."eslint-8.32.0" sources."eslint-scope-7.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -104817,7 +104323,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."file-entry-cache-6.0.1" sources."find-up-5.0.0" sources."flat-cache-3.0.4" @@ -104825,10 +104331,10 @@ in sources."fs.realpath-1.0.0" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.17.0" + sources."globals-13.20.0" sources."grapheme-splitter-1.0.4" sources."has-flag-4.0.0" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -104837,7 +104343,7 @@ in sources."is-glob-4.0.3" sources."is-path-inside-3.0.3" sources."isexe-2.0.0" - sources."js-sdsl-4.1.5" + sources."js-sdsl-4.3.0" sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -104856,7 +104362,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."prelude-ls-1.2.1" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."regexpp-3.2.0" sources."resolve-from-4.0.0" @@ -104896,14 +104402,14 @@ in sha512 = "qOJ9cTi5AaH5bOgEoCkv41DJ637mHgzffbOLojwU4wadwC6qbR+OxVJRvVzH0v2XYmQOvw4eiJK7ivrr5SvzsA=="; }; dependencies = [ - sources."@eslint/eslintrc-1.3.3" - sources."@humanwhocodes/config-array-0.11.7" + sources."@eslint/eslintrc-1.4.1" + sources."@humanwhocodes/config-array-0.11.8" sources."@humanwhocodes/module-importer-1.0.1" 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."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" @@ -104926,7 +104432,7 @@ in sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.27.0" + sources."eslint-8.32.0" sources."eslint-scope-7.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -104942,7 +104448,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."file-entry-cache-6.0.1" sources."find-up-5.0.0" sources."flat-cache-3.0.4" @@ -104950,10 +104456,10 @@ in sources."fs.realpath-1.0.0" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.17.0" + sources."globals-13.20.0" sources."grapheme-splitter-1.0.4" sources."has-flag-4.0.0" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -104962,7 +104468,7 @@ in sources."is-glob-4.0.3" sources."is-path-inside-3.0.3" sources."isexe-2.0.0" - sources."js-sdsl-4.1.5" + sources."js-sdsl-4.3.0" sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -104982,7 +104488,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."prelude-ls-1.2.1" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."regexpp-3.2.0" sources."resolve-from-4.0.0" @@ -105033,35 +104539,38 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "6.0.8"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-6.0.8.tgz"; - sha512 = "ZVQ47l/wFsPgF9S68MT3mQCCq0HEH4wggnDdd3keZBHV8uhC1TvkdufOeWgbr7/uP5oKdfXEOQCXaYbJPdd69A=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-6.2.1.tgz"; + sha512 = "trFLjh02d+KqN+7ENaaMEYr2ankQLZZO93uQAzSP7eJd5VxnUBNQj96Qr0XXIy5cSffViftBsDOkmTbQA++oMw=="; }; dependencies = [ - (sources."@ampproject/remapping-2.2.0" // { - dependencies = [ - sources."@jridgewell/gen-mapping-0.1.1" - ]; - }) + sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.20.1" - (sources."@babel/core-7.9.0" // { - dependencies = [ - sources."json5-2.2.1" - sources."semver-5.7.1" - ]; - }) - sources."@babel/generator-7.20.2" - sources."@babel/helper-annotate-as-pure-7.18.6" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" - (sources."@babel/helper-compilation-targets-7.20.0" // { + sources."@babel/compat-data-7.20.14" + (sources."@babel/core-7.20.12" // { dependencies = [ + sources."@babel/code-frame-7.18.6" + sources."json5-2.2.3" sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.20.2" - sources."@babel/helper-create-regexp-features-plugin-7.19.0" + (sources."@babel/generator-7.20.14" // { + dependencies = [ + sources."@jridgewell/gen-mapping-0.3.2" + ]; + }) + sources."@babel/helper-annotate-as-pure-7.18.6" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" + (sources."@babel/helper-compilation-targets-7.20.7" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."semver-6.3.0" + sources."yallist-3.1.1" + ]; + }) + sources."@babel/helper-create-class-features-plugin-7.20.12" + sources."@babel/helper-create-regexp-features-plugin-7.20.5" (sources."@babel/helper-define-polyfill-provider-0.3.3" // { dependencies = [ sources."semver-6.3.0" @@ -105071,59 +104580,45 @@ in sources."@babel/helper-explode-assignable-expression-7.18.6" sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.18.9" + sources."@babel/helper-member-expression-to-functions-7.20.7" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.2" + sources."@babel/helper-module-transforms-7.20.11" sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.20.2" sources."@babel/helper-remap-async-to-generator-7.18.9" - sources."@babel/helper-replace-supers-7.19.1" + sources."@babel/helper-replace-supers-7.20.7" sources."@babel/helper-simple-access-7.20.2" sources."@babel/helper-skip-transparent-expression-wrappers-7.20.0" sources."@babel/helper-split-export-declaration-7.18.6" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helper-wrap-function-7.19.0" - sources."@babel/helpers-7.20.1" + sources."@babel/helper-wrap-function-7.20.5" + sources."@babel/helpers-7.20.13" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.2" + sources."@babel/parser-7.20.13" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" - (sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" // { - dependencies = [ - sources."@babel/code-frame-7.18.6" - sources."@babel/core-7.20.2" - sources."json5-2.2.1" - sources."semver-6.3.0" - ]; - }) - sources."@babel/plugin-proposal-async-generator-functions-7.20.1" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" + sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" - (sources."@babel/plugin-proposal-class-static-block-7.18.6" // { - dependencies = [ - sources."@babel/code-frame-7.18.6" - sources."@babel/core-7.20.2" - sources."json5-2.2.1" - sources."semver-6.3.0" - ]; - }) - sources."@babel/plugin-proposal-decorators-7.20.2" + sources."@babel/plugin-proposal-class-static-block-7.20.7" + sources."@babel/plugin-proposal-decorators-7.20.13" sources."@babel/plugin-proposal-dynamic-import-7.18.6" sources."@babel/plugin-proposal-export-default-from-7.18.10" sources."@babel/plugin-proposal-export-namespace-from-7.18.9" sources."@babel/plugin-proposal-json-strings-7.18.6" - sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" + sources."@babel/plugin-proposal-logical-assignment-operators-7.20.7" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.20.2" + sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" - sources."@babel/plugin-proposal-optional-chaining-7.18.9" + sources."@babel/plugin-proposal-optional-chaining-7.20.7" sources."@babel/plugin-proposal-private-methods-7.18.6" - sources."@babel/plugin-proposal-private-property-in-object-7.18.6" + sources."@babel/plugin-proposal-private-property-in-object-7.20.5" sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" @@ -105145,13 +104640,13 @@ in sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" sources."@babel/plugin-syntax-typescript-7.20.0" - sources."@babel/plugin-transform-arrow-functions-7.18.6" - sources."@babel/plugin-transform-async-to-generator-7.18.6" + sources."@babel/plugin-transform-arrow-functions-7.20.7" + sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.2" - sources."@babel/plugin-transform-classes-7.20.2" - sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.20.2" + sources."@babel/plugin-transform-block-scoping-7.20.14" + sources."@babel/plugin-transform-classes-7.20.7" + sources."@babel/plugin-transform-computed-properties-7.20.7" + sources."@babel/plugin-transform-destructuring-7.20.7" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -105160,20 +104655,20 @@ in sources."@babel/plugin-transform-function-name-7.18.9" sources."@babel/plugin-transform-literals-7.18.9" sources."@babel/plugin-transform-member-expression-literals-7.18.6" - sources."@babel/plugin-transform-modules-amd-7.19.6" - sources."@babel/plugin-transform-modules-commonjs-7.19.6" - sources."@babel/plugin-transform-modules-systemjs-7.19.6" + sources."@babel/plugin-transform-modules-amd-7.20.11" + sources."@babel/plugin-transform-modules-commonjs-7.20.11" + sources."@babel/plugin-transform-modules-systemjs-7.20.11" sources."@babel/plugin-transform-modules-umd-7.18.6" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.19.1" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.20.5" sources."@babel/plugin-transform-new-target-7.18.6" sources."@babel/plugin-transform-object-super-7.18.6" - sources."@babel/plugin-transform-parameters-7.20.1" + sources."@babel/plugin-transform-parameters-7.20.7" sources."@babel/plugin-transform-property-literals-7.18.6" sources."@babel/plugin-transform-react-display-name-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.19.0" + sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/plugin-transform-react-jsx-self-7.18.6" sources."@babel/plugin-transform-react-jsx-source-7.19.6" - sources."@babel/plugin-transform-regenerator-7.18.6" + sources."@babel/plugin-transform-regenerator-7.20.5" sources."@babel/plugin-transform-reserved-words-7.18.6" (sources."@babel/plugin-transform-runtime-7.19.6" // { dependencies = [ @@ -105181,11 +104676,11 @@ in ]; }) sources."@babel/plugin-transform-shorthand-properties-7.18.6" - sources."@babel/plugin-transform-spread-7.19.0" + sources."@babel/plugin-transform-spread-7.20.7" sources."@babel/plugin-transform-sticky-regex-7.18.6" sources."@babel/plugin-transform-template-literals-7.18.9" sources."@babel/plugin-transform-typeof-symbol-7.18.9" - sources."@babel/plugin-transform-typescript-7.20.2" + sources."@babel/plugin-transform-typescript-7.20.13" sources."@babel/plugin-transform-unicode-escapes-7.18.10" sources."@babel/plugin-transform-unicode-regex-7.18.6" (sources."@babel/preset-env-7.20.2" // { @@ -105195,35 +104690,37 @@ in }) sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.9.0" - (sources."@babel/template-7.18.10" // { + (sources."@babel/template-7.20.7" // { dependencies = [ sources."@babel/code-frame-7.18.6" ]; }) - (sources."@babel/traverse-7.20.1" // { + (sources."@babel/traverse-7.20.13" // { dependencies = [ sources."@babel/code-frame-7.18.6" ]; }) - sources."@babel/types-7.20.2" + sources."@babel/types-7.20.7" sources."@colors/colors-1.5.0" sources."@expo/apple-utils-0.0.0-alpha.31" sources."@expo/bunyan-4.0.0" - (sources."@expo/cli-0.4.6" // { + (sources."@expo/cli-0.4.11" // { dependencies = [ - sources."@babel/runtime-7.20.1" + sources."@babel/runtime-7.20.13" (sources."@expo/config-7.0.3" // { dependencies = [ + sources."@expo/json-file-8.2.36" sources."semver-7.3.2" ]; }) (sources."@expo/config-plugins-5.0.4" // { dependencies = [ + sources."@expo/json-file-8.2.36" sources."semver-7.3.8" ]; }) sources."@expo/config-types-47.0.0" - (sources."@expo/dev-server-0.1.122" // { + (sources."@expo/dev-server-0.1.124" // { dependencies = [ sources."fs-extra-9.0.0" sources."semver-7.3.2" @@ -105236,51 +104733,76 @@ in sources."tempy-0.3.0" ]; }) - sources."@expo/metro-config-0.5.1" - sources."@expo/plist-0.0.18" - (sources."@expo/prebuild-config-5.0.6" // { + (sources."@expo/metro-config-0.5.2" // { dependencies = [ + sources."@expo/json-file-8.2.36" + ]; + }) + sources."@expo/plist-0.0.18" + (sources."@expo/prebuild-config-5.0.7" // { + dependencies = [ + sources."@expo/json-file-8.2.36" sources."fs-extra-9.1.0" sources."semver-7.3.2" sources."universalify-2.0.0" ]; }) + (sources."body-parser-1.20.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."bplist-parser-0.3.2" + sources."bytes-3.1.2" + sources."depd-2.0.0" sources."form-data-3.0.1" (sources."fs-extra-8.1.0" // { dependencies = [ sources."universalify-0.1.2" ]; }) + sources."http-errors-2.0.0" sources."jsonfile-4.0.0" + sources."ms-2.0.0" sources."node-forge-1.3.1" (sources."npm-package-arg-7.0.0" // { dependencies = [ sources."semver-5.7.1" ]; }) + sources."on-finished-2.4.1" + sources."qs-6.11.0" + sources."raw-body-2.5.1" sources."semver-6.3.0" + sources."setprototypeof-1.2.0" + sources."statuses-2.0.1" sources."temp-dir-1.0.0" + sources."toidentifier-1.0.1" sources."type-fest-0.3.1" sources."universalify-1.0.0" sources."uuid-3.4.0" ]; }) - (sources."@expo/code-signing-certificates-0.0.2" // { + (sources."@expo/code-signing-certificates-0.0.5" // { dependencies = [ sources."node-forge-1.3.1" ]; }) - sources."@expo/config-6.0.24" + (sources."@expo/config-6.0.24" // { + dependencies = [ + sources."@expo/json-file-8.2.36" + ]; + }) (sources."@expo/config-plugins-4.1.5" // { dependencies = [ + sources."@expo/json-file-8.2.36" sources."@expo/plist-0.0.18" sources."semver-7.3.8" ]; }) sources."@expo/config-types-45.0.0" sources."@expo/dev-server-0.1.115" - (sources."@expo/devcert-1.0.0" // { + (sources."@expo/devcert-1.1.0" // { dependencies = [ sources."debug-3.2.7" sources."rimraf-2.7.1" @@ -105294,18 +104816,31 @@ in sources."type-fest-0.3.1" ]; }) - sources."@expo/json-file-8.2.36" - sources."@expo/metro-config-0.3.18" + (sources."@expo/json-file-8.2.37" // { + dependencies = [ + sources."json5-2.2.3" + ]; + }) + (sources."@expo/metro-config-0.3.18" // { + dependencies = [ + sources."@expo/json-file-8.2.36" + ]; + }) sources."@expo/osascript-2.0.33" (sources."@expo/package-manager-0.0.56" // { dependencies = [ + sources."@expo/json-file-8.2.36" sources."npm-package-arg-7.0.0" sources."rimraf-3.0.2" sources."semver-5.7.1" ]; }) - sources."@expo/plist-0.0.19" - sources."@expo/prebuild-config-4.0.3" + sources."@expo/plist-0.0.20" + (sources."@expo/prebuild-config-4.0.3" // { + dependencies = [ + sources."@expo/json-file-8.2.36" + ]; + }) sources."@expo/rudder-sdk-node-1.1.1" (sources."@expo/schemer-1.4.4" // { dependencies = [ @@ -105315,7 +104850,19 @@ in sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/spawn-async-1.5.0" sources."@expo/vector-icons-13.0.0" - sources."@expo/webpack-config-0.17.3" + (sources."@expo/webpack-config-18.0.1" // { + dependencies = [ + sources."@expo/config-6.0.20" + (sources."@expo/config-plugins-4.1.1" // { + dependencies = [ + sources."semver-7.3.8" + ]; + }) + sources."@expo/config-types-44.0.0" + sources."@expo/json-file-8.2.35" + sources."@expo/plist-0.0.18" + ]; + }) (sources."@expo/xcpretty-4.2.2" // { dependencies = [ sources."js-yaml-4.1.0" @@ -105326,11 +104873,17 @@ in sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jest/types-26.6.2" - sources."@jridgewell/gen-mapping-0.3.2" + sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" + (sources."@jridgewell/source-map-0.3.2" // { + dependencies = [ + sources."@jridgewell/gen-mapping-0.3.2" + ]; + }) sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" + sources."@leichtgewicht/ip-codec-2.0.4" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -105348,73 +104901,70 @@ in sources."@react-native/normalize-color-2.1.0" sources."@segment/loosely-validate-event-2.0.0" sources."@sideway/address-4.1.4" - sources."@sideway/formula-3.0.0" + sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" - sources."@types/cacheable-request-6.0.2" + sources."@trysound/sax-0.2.0" + sources."@types/body-parser-1.19.2" + sources."@types/bonjour-3.5.10" + sources."@types/cacheable-request-6.0.3" + sources."@types/connect-3.4.35" + sources."@types/connect-history-api-fallback-1.3.5" + sources."@types/eslint-8.4.10" + sources."@types/eslint-scope-3.7.4" + sources."@types/estree-0.0.51" + sources."@types/express-4.17.16" + sources."@types/express-serve-static-core-4.17.33" sources."@types/glob-7.2.0" - sources."@types/html-minifier-terser-5.1.2" + sources."@types/html-minifier-terser-6.1.0" sources."@types/http-cache-semantics-4.0.1" + sources."@types/http-proxy-1.17.9" 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.11" - sources."@types/keyv-4.2.0" + sources."@types/keyv-3.1.4" + sources."@types/mime-3.0.1" sources."@types/minimatch-5.1.2" - sources."@types/node-18.11.9" - sources."@types/q-1.5.5" + sources."@types/node-18.11.18" + sources."@types/qs-6.9.7" + sources."@types/range-parser-1.2.4" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.2" - sources."@types/source-list-map-0.1.2" - sources."@types/tapable-1.0.8" - (sources."@types/uglify-js-3.17.1" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - (sources."@types/webpack-4.41.33" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - (sources."@types/webpack-sources-3.2.0" // { - dependencies = [ - sources."source-map-0.7.4" - ]; - }) - sources."@types/yargs-15.0.14" + sources."@types/serve-index-1.9.1" + sources."@types/serve-static-1.15.0" + sources."@types/sockjs-0.3.33" + sources."@types/ws-8.5.4" + sources."@types/yargs-15.0.15" sources."@types/yargs-parser-21.0.0" sources."@urql/core-2.3.6" sources."@urql/exchange-retry-0.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."@webassemblyjs/ast-1.11.1" + sources."@webassemblyjs/floating-point-hex-parser-1.11.1" + sources."@webassemblyjs/helper-api-error-1.11.1" + sources."@webassemblyjs/helper-buffer-1.11.1" + sources."@webassemblyjs/helper-numbers-1.11.1" + sources."@webassemblyjs/helper-wasm-bytecode-1.11.1" + sources."@webassemblyjs/helper-wasm-section-1.11.1" + sources."@webassemblyjs/ieee754-1.11.1" + sources."@webassemblyjs/leb128-1.11.1" + sources."@webassemblyjs/utf8-1.11.1" + sources."@webassemblyjs/wasm-edit-1.11.1" + sources."@webassemblyjs/wasm-gen-1.11.1" + sources."@webassemblyjs/wasm-opt-1.11.1" + sources."@webassemblyjs/wasm-parser-1.11.1" + sources."@webassemblyjs/wast-printer-1.11.1" sources."@xmldom/xmldom-0.7.9" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" + sources."abab-2.0.6" sources."accepts-1.3.8" - sources."acorn-6.4.2" - sources."address-1.1.2" + sources."acorn-8.8.2" + sources."acorn-import-assertions-1.8.0" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" - sources."ajv-8.11.0" - sources."ajv-errors-1.0.1" + sources."ajv-8.12.0" sources."ajv-formats-2.1.1" (sources."ajv-keywords-3.5.2" // { dependencies = [ @@ -105422,60 +104972,30 @@ in sources."json-schema-traverse-0.4.1" ]; }) - sources."alphanum-sort-1.0.2" sources."ansi-align-3.0.1" - sources."ansi-colors-3.2.4" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" ]; }) - sources."ansi-html-0.0.7" + sources."ansi-html-community-0.0.8" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."any-promise-1.3.0" - sources."anymatch-3.1.2" - sources."application-config-path-0.1.0" - sources."aproba-1.2.0" + sources."anymatch-3.1.3" + sources."application-config-path-0.1.1" sources."arg-4.1.0" 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-2.1.0" sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" - sources."array.prototype.reduce-1.0.5" sources."arrify-2.0.1" sources."asap-2.0.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."assign-symbols-1.0.0" sources."async-1.5.2" - 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."axios-0.21.1" - (sources."babel-loader-8.1.0" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."loader-utils-1.4.0" - sources."schema-utils-2.7.1" - ]; - }) + sources."babel-loader-8.3.0" sources."babel-plugin-module-resolver-4.1.0" (sources."babel-plugin-polyfill-corejs2-0.3.3" // { dependencies = [ @@ -105484,31 +105004,23 @@ in }) sources."babel-plugin-polyfill-corejs3-0.6.0" sources."babel-plugin-polyfill-regenerator-0.4.1" - sources."babel-plugin-react-native-web-0.18.10" + sources."babel-plugin-react-native-web-0.18.12" sources."babel-preset-expo-9.2.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."better-opn-3.0.2" sources."big-integer-1.6.51" sources."big.js-5.2.2" sources."binary-extensions-2.2.0" - sources."bindings-1.5.0" - sources."bluebird-3.7.2" sources."blueimp-md5-2.19.0" - sources."bn.js-5.2.1" (sources."body-parser-1.19.0" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" ]; }) - (sources."bonjour-3.5.0" // { + (sources."bonjour-service-1.1.0" // { dependencies = [ sources."array-flatten-2.1.2" ]; @@ -105523,26 +105035,12 @@ in sources."bplist-parser-0.2.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.21.4" - sources."buffer-4.9.2" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" - sources."buffer-indexof-1.1.1" - sources."buffer-xor-1.0.3" - sources."builtin-status-codes-3.0.0" + sources."bufferutil-4.0.7" sources."builtins-1.0.3" sources."bytes-3.1.0" (sources."cacache-15.3.0" // { @@ -105551,22 +105049,14 @@ in sources."rimraf-3.0.2" ]; }) - sources."cache-base-1.0.1" sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.2" sources."call-bind-1.0.2" - sources."caller-callsite-2.0.0" - sources."caller-path-2.0.0" sources."callsite-1.0.0" - sources."callsites-2.0.0" - (sources."camel-case-4.1.2" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."camel-case-4.1.2" sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -105580,32 +105070,10 @@ in sources."chokidar-3.5.3" sources."chownr-2.0.0" sources."chrome-trace-event-1.0.3" - sources."ci-info-3.5.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."ci-info-3.7.1" + sources."clean-css-5.3.2" sources."clean-stack-2.2.0" - (sources."clean-webpack-plugin-3.0.0" // { + (sources."clean-webpack-plugin-4.0.0" // { dependencies = [ sources."array-union-1.0.2" sources."del-4.1.1" @@ -105619,34 +105087,17 @@ in sources."cli-cursor-2.1.0" sources."cli-spinners-2.7.0" sources."cli-table3-0.6.3" - (sources."cliui-5.0.0" // { - dependencies = [ - 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" - sources."strip-ansi-5.2.0" - sources."wrap-ansi-5.1.0" - ]; - }) sources."clone-1.0.4" sources."clone-response-1.0.3" - (sources."coa-2.0.2" // { - dependencies = [ - sources."chalk-2.4.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.1" + sources."colord-2.9.3" + sources."colorette-2.0.19" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" sources."commander-2.17.1" sources."commondir-1.0.1" sources."compare-versions-3.6.0" - sources."component-emitter-1.3.0" sources."component-type-1.2.1" sources."compressible-2.0.18" (sources."compression-1.7.4" // { @@ -105665,116 +105116,71 @@ in sources."ms-2.0.0" ]; }) - sources."connect-history-api-fallback-1.6.0" - sources."console-browserify-1.2.0" - sources."constants-browserify-1.0.0" + sources."connect-history-api-fallback-2.0.0" sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."convert-source-map-1.9.0" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - (sources."copy-concurrently-1.0.5" // { + (sources."copy-webpack-plugin-10.2.4" // { dependencies = [ - sources."rimraf-2.7.1" + sources."ajv-keywords-5.1.0" + sources."array-union-3.0.1" + sources."glob-parent-6.0.2" + sources."globby-12.2.0" + sources."schema-utils-4.0.0" + sources."slash-4.0.0" ]; }) - sources."copy-descriptor-0.1.1" - (sources."copy-webpack-plugin-6.0.4" // { - dependencies = [ - sources."ajv-6.12.6" - 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" // { - dependencies = [ - sources."p-limit-2.3.0" - ]; - }) - sources."pkg-dir-4.2.0" - sources."schema-utils-2.7.1" - sources."semver-6.3.0" - ]; - }) - sources."core-js-compat-3.26.0" + sources."core-js-compat-3.27.2" sources."core-util-is-1.0.3" - sources."cosmiconfig-5.2.1" - (sources."create-ecdh-4.0.4" // { + (sources."cross-fetch-3.1.5" // { dependencies = [ - sources."bn.js-4.12.0" + sources."node-fetch-2.6.7" ]; }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - sources."cross-fetch-3.1.5" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."crypt-0.0.2" - sources."crypto-browserify-3.12.0" sources."crypto-random-string-1.0.0" - sources."css-color-names-0.0.4" - sources."css-declaration-sorter-4.0.1" - (sources."css-loader-3.6.0" // { + sources."css-declaration-sorter-6.3.1" + (sources."css-loader-6.7.3" // { dependencies = [ - sources."ajv-6.12.6" - sources."camelcase-5.3.1" - sources."json-schema-traverse-0.4.1" - sources."loader-utils-1.4.0" - sources."schema-utils-2.7.1" - sources."semver-6.3.0" + sources."semver-7.3.8" ]; }) - (sources."css-select-4.3.0" // { + (sources."css-minimizer-webpack-plugin-3.4.1" // { dependencies = [ - sources."domhandler-4.3.1" - ]; - }) - sources."css-select-base-adapter-0.1.1" - (sources."css-tree-1.0.0-alpha.37" // { - dependencies = [ - sources."source-map-0.6.1" + sources."ajv-keywords-5.1.0" + sources."schema-utils-4.0.0" ]; }) + sources."css-select-4.3.0" + sources."css-tree-1.1.3" sources."css-what-6.1.0" sources."cssesc-3.0.0" - sources."cssnano-4.1.11" - 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."cssnano-5.1.14" + sources."cssnano-preset-default-5.2.13" + sources."cssnano-utils-3.1.0" + sources."csso-4.2.0" sources."dag-map-1.0.2" sources."dateformat-3.0.3" sources."debug-4.3.4" sources."decache-4.4.0" - sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.0" (sources."decompress-response-6.0.0" // { dependencies = [ sources."mimic-response-3.1.0" ]; }) - sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" sources."deepmerge-4.2.2" sources."default-gateway-4.2.0" sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" sources."define-lazy-prop-2.0.0" - sources."define-properties-1.1.4" - sources."define-property-2.0.2" (sources."del-6.1.1" // { dependencies = [ sources."rimraf-3.0.2" @@ -105782,55 +105188,21 @@ in }) sources."delayed-stream-1.0.0" sources."depd-1.1.2" - sources."des.js-1.0.1" sources."destroy-1.2.0" sources."detect-node-2.1.0" - (sources."detect-port-alt-1.1.6" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - (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."dns-packet-5.4.0" sources."dom-converter-0.2.0" - (sources."dom-serializer-1.4.1" // { - dependencies = [ - sources."domhandler-4.3.1" - ]; - }) - sources."domain-browser-1.2.0" + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" - sources."domhandler-3.3.0" + sources."domhandler-4.3.1" sources."domino-2.1.6" - (sources."domutils-2.8.0" // { - dependencies = [ - sources."domhandler-4.3.1" - ]; - }) - (sources."dot-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - sources."dot-prop-5.3.0" - sources."duplexer-0.1.2" + sources."domutils-2.8.0" + sources."dot-case-3.0.4" sources."duplexer3-0.1.5" - sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."electron-to-chromium-1.4.284" - (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" @@ -105840,23 +105212,15 @@ in ]; }) sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-4.5.0" // { - dependencies = [ - sources."memory-fs-0.5.0" - ]; - }) + sources."enhanced-resolve-5.12.0" sources."entities-2.2.0" sources."env-editor-0.4.2" sources."eol-0.9.1" - sources."errno-0.1.8" - sources."error-ex-1.3.2" - sources."es-abstract-1.20.4" - sources."es-array-method-boxes-properly-1.0.0" - sources."es-to-primitive-1.2.1" + sources."es-module-lexer-0.9.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-scope-5.1.1" sources."esprima-4.0.1" (sources."esrecurse-4.3.0" // { dependencies = [ @@ -105868,8 +105232,6 @@ in sources."etag-1.8.1" sources."eventemitter3-4.0.7" sources."events-3.3.0" - sources."eventsource-1.1.2" - sources."evp_bytestokey-1.0.3" sources."exec-async-2.2.0" (sources."execa-1.0.0" // { dependencies = [ @@ -105877,29 +105239,9 @@ in sources."is-stream-1.1.0" ]; }) - (sources."expand-brackets-2.1.4" // { + (sources."expo-47.0.13" // { 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."expo-47.0.1" // { - dependencies = [ - sources."@babel/runtime-7.20.1" + sources."@babel/runtime-7.20.13" (sources."@expo/config-7.0.3" // { dependencies = [ sources."semver-7.3.2" @@ -105907,21 +105249,23 @@ in }) sources."@expo/config-plugins-5.0.4" sources."@expo/config-types-47.0.0" + sources."@expo/json-file-8.2.36" sources."@expo/plist-0.0.18" sources."commander-7.2.0" - sources."expo-modules-autolinking-1.0.0" + sources."expo-modules-autolinking-1.0.2" sources."fs-extra-9.1.0" sources."semver-7.3.8" sources."uuid-3.4.0" ]; }) sources."expo-application-5.0.1" - sources."expo-asset-8.6.2" + sources."expo-asset-8.7.0" (sources."expo-constants-14.0.2" // { dependencies = [ sources."@expo/config-7.0.3" sources."@expo/config-plugins-5.0.4" sources."@expo/config-types-47.0.0" + sources."@expo/json-file-8.2.36" sources."@expo/plist-0.0.18" sources."semver-7.3.8" sources."uuid-3.4.0" @@ -105941,7 +105285,7 @@ in sources."fs-extra-9.1.0" ]; }) - sources."expo-modules-core-1.0.0" + sources."expo-modules-core-1.1.1" (sources."expo-pwa-0.0.124" // { dependencies = [ sources."@expo/image-utils-0.3.23" @@ -105971,36 +105315,15 @@ in sources."statuses-1.4.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-deep-equal-3.1.3" sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.13.0" - sources."faye-websocket-0.10.0" + sources."fastq-1.15.0" + sources."faye-websocket-0.11.4" sources."fbemitter-3.0.0" sources."fbjs-3.0.4" sources."fbjs-css-vars-1.0.2" sources."fetch-retry-4.1.1" - sources."figgy-pudding-3.5.2" - (sources."file-loader-6.0.0" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."schema-utils-2.7.1" - ]; - }) - sources."file-uri-to-path-1.0.0" - sources."filesize-6.1.0" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { dependencies = [ @@ -106014,194 +105337,86 @@ in sources."path-exists-3.0.0" ]; }) - sources."find-cache-dir-2.1.0" + sources."find-cache-dir-3.3.2" 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.15.2" sources."fontfaceobserver-2.3.0" - sources."for-in-1.0.2" - (sources."fork-ts-checker-webpack-plugin-4.1.6" // { - dependencies = [ - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."chalk-2.4.2" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."micromatch-3.1.10" - sources."semver-5.7.1" - sources."to-regex-range-2.1.1" - ]; - }) sources."form-data-2.5.1" sources."forwarded-0.2.0" - sources."fragment-cache-0.2.1" sources."freeport-async-2.0.0" sources."fresh-0.5.2" - sources."from2-2.3.0" (sources."fs-extra-9.0.0" // { dependencies = [ sources."universalify-1.0.0" ]; }) sources."fs-minipass-2.1.0" - sources."fs-write-stream-atomic-1.0.10" + sources."fs-monkey-1.0.3" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.5" - sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-port-3.2.0" sources."get-stream-5.2.0" - sources."get-symbol-description-1.0.0" - sources."get-value-2.0.6" sources."getenv-1.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.2" - sources."global-modules-2.0.0" - sources."global-prefix-3.0.0" + sources."glob-to-regexp-0.4.1" sources."globals-11.12.0" sources."globby-11.1.0" - sources."got-11.8.5" + sources."got-11.8.6" sources."graceful-fs-4.2.10" sources."graphql-15.8.0" - (sources."graphql-tag-2.12.6" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - sources."gzip-size-5.1.1" + sources."graphql-tag-2.12.6" sources."handle-thing-2.0.1" sources."has-1.0.3" - sources."has-bigints-1.0.2" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.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."hasbin-1.2.3" - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."hash.js-1.1.7" sources."hashids-1.1.4" sources."he-1.2.0" - sources."hex-color-regex-1.1.0" - sources."hmac-drbg-1.0.1" sources."hosted-git-info-3.0.8" 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-loader-1.1.0" // { + sources."html-entities-2.3.3" + (sources."html-minifier-terser-6.1.0" // { dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."schema-utils-2.7.1" + sources."commander-8.3.0" ]; }) - (sources."html-minifier-terser-5.1.1" // { - dependencies = [ - sources."commander-4.1.1" - ]; - }) - (sources."html-webpack-plugin-4.3.0" // { - dependencies = [ - sources."loader-utils-1.4.0" - ]; - }) - sources."htmlparser2-4.1.0" - sources."http-cache-semantics-4.1.0" + sources."html-webpack-plugin-5.5.0" + sources."htmlparser2-6.1.0" + sources."http-cache-semantics-4.1.1" sources."http-deceiver-1.2.7" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" ]; }) + sources."http-parser-js-0.5.8" sources."http-proxy-1.18.1" - (sources."http-proxy-middleware-0.19.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."to-regex-range-2.1.1" - ]; - }) + sources."http-proxy-middleware-2.0.6" sources."http2-wrapper-1.0.3" - sources."https-browserify-1.0.0" sources."https-proxy-agent-5.0.1" + sources."human-signals-2.1.0" 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."image-size-1.0.2" - sources."immer-8.0.1" - (sources."import-fresh-2.0.0" // { - dependencies = [ - sources."resolve-from-3.0.0" - ]; - }) - sources."import-local-2.0.0" + sources."icss-utils-5.1.0" + sources."ignore-5.2.4" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" - sources."indexes-of-1.0.1" sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."internal-ip-4.3.0" - sources."internal-slot-1.0.3" sources."invariant-2.2.4" - sources."ip-1.1.8" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" - sources."is-absolute-url-2.1.0" - sources."is-accessor-descriptor-1.0.0" - sources."is-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.7" - sources."is-color-stop-1.1.0" sources."is-core-module-2.11.0" - 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" @@ -106211,10 +105426,7 @@ in sources."is-glob-2.0.1" ]; }) - sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" - sources."is-number-object-1.0.7" - sources."is-obj-2.0.0" sources."is-path-cwd-2.2.0" (sources."is-path-in-cwd-2.1.0" // { dependencies = [ @@ -106222,7 +105434,7 @@ in ]; }) sources."is-path-inside-3.0.3" - sources."is-plain-object-2.0.4" + sources."is-plain-obj-3.0.0" sources."is-port-reachable-2.0.1" (sources."is-reachable-4.0.0" // { dependencies = [ @@ -106247,24 +105459,16 @@ in sources."responselike-1.0.2" ]; }) - sources."is-regex-1.1.4" - sources."is-resolvable-1.1.0" sources."is-root-2.1.0" - sources."is-shared-array-buffer-1.0.2" sources."is-stream-2.0.1" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" sources."is-valid-path-0.1.1" - sources."is-weakref-1.0.2" - sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" - (sources."jest-worker-26.6.2" // { + (sources."jest-worker-27.5.1" // { dependencies = [ sources."has-flag-4.0.0" - sources."supports-color-7.2.0" + sources."supports-color-8.1.1" ]; }) sources."jimp-compact-0.16.1" @@ -106278,7 +105482,7 @@ in }) 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-deref-sync-0.13.0" // { dependencies = [ sources."clone-2.1.2" @@ -106286,22 +105490,19 @@ in ]; }) sources."json-schema-traverse-1.0.0" - sources."json3-3.3.3" - sources."json5-1.0.1" + sources."json5-1.0.2" sources."jsonfile-6.1.0" sources."keychain-1.3.0" - sources."keyv-4.5.1" - sources."killable-1.0.1" - sources."kind-of-6.0.3" + sources."keyv-4.5.2" sources."kleur-3.0.3" - sources."last-call-webpack-plugin-3.0.0" sources."latest-version-5.1.0" sources."leven-3.1.0" + sources."lilconfig-2.0.6" sources."lines-and-columns-1.2.4" - sources."loader-runner-2.4.0" - (sources."loader-utils-2.0.3" // { + sources."loader-runner-4.3.0" + (sources."loader-utils-2.0.4" // { dependencies = [ - sources."json5-2.2.1" + sources."json5-2.2.3" ]; }) sources."locate-path-6.0.0" @@ -106315,64 +105516,40 @@ in sources."chalk-2.4.2" ]; }) - sources."loglevel-1.8.0" sources."loose-envify-1.4.0" - (sources."lower-case-2.0.2" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."lower-case-2.0.2" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" - (sources."make-dir-2.1.0" // { + (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-6.3.0" ]; }) - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" sources."md5-2.3.0" sources."md5-file-3.2.3" - sources."md5.js-1.3.5" sources."md5hex-1.0.0" - sources."mdn-data-2.0.4" + sources."mdn-data-2.0.14" sources."media-typer-0.3.0" + sources."memfs-3.4.13" sources."memory-cache-0.2.0" - sources."memory-fs-0.4.1" sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" - (sources."metro-react-native-babel-preset-0.72.3" // { - dependencies = [ - sources."@babel/code-frame-7.18.6" - sources."@babel/core-7.20.2" - sources."json5-2.2.1" - sources."semver-6.3.0" - ]; - }) - sources."microevent.ts-0.1.1" + sources."metro-react-native-babel-preset-0.72.3" 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."mimic-response-1.0.1" - (sources."mini-css-extract-plugin-0.5.0" // { + (sources."mini-css-extract-plugin-2.7.2" // { dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."loader-utils-1.4.0" - sources."schema-utils-1.0.0" + sources."ajv-keywords-5.1.0" + sources."schema-utils-4.0.0" ]; }) sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.7" sources."minipass-3.1.6" @@ -106380,25 +105557,12 @@ in sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" sources."minizlib-2.1.2" - 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" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) sources."ms-2.1.2" - sources."multicast-dns-6.2.3" - sources."multicast-dns-service-types-1.1.0" + sources."multicast-dns-7.2.5" sources."mv-2.1.1" sources."mz-2.7.0" - sources."nan-2.17.0" - sources."nanomatch-1.2.13" + sources."nanoid-3.3.4" sources."ncp-2.0.0" (sources."needle-2.9.1" // { dependencies = [ @@ -106409,21 +105573,12 @@ in sources."neo-async-2.6.2" sources."nested-error-stacks-2.0.1" sources."nice-try-1.0.5" - (sources."no-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - sources."node-fetch-2.6.7" + sources."no-case-3.0.4" + sources."node-fetch-2.6.8" sources."node-forge-0.10.0" - sources."node-html-parser-1.4.9" - (sources."node-libs-browser-2.2.1" // { - dependencies = [ - sources."path-browserify-0.0.1" - sources."punycode-1.4.1" - ]; - }) - sources."node-releases-2.0.6" + sources."node-gyp-build-4.6.0" + sources."node-html-parser-5.4.2" + sources."node-releases-2.0.8" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" (sources."npm-package-arg-6.1.0" // { @@ -106436,40 +105591,13 @@ in sources."nth-check-2.1.1" sources."nullthrows-1.1.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."kind-of-3.2.2" - ]; - }) - sources."object-inspect-1.12.2" - sources."object-is-1.1.5" - sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.assign-4.1.4" - sources."object.entries-1.1.6" - sources."object.getownpropertydescriptors-2.1.5" - sources."object.pick-1.3.0" - sources."object.values-1.1.6" + sources."object-inspect-1.12.3" 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-8.4.0" - (sources."opn-5.5.0" // { - dependencies = [ - sources."is-wsl-1.1.0" - ]; - }) - sources."optimize-css-assets-webpack-plugin-5.0.8" (sources."ora-3.4.0" // { dependencies = [ sources."ansi-regex-4.1.1" @@ -106477,7 +105605,6 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."os-browserify-0.3.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" @@ -106520,31 +105647,16 @@ in sources."semver-6.3.0" ]; }) - sources."pako-1.0.11" - sources."parallel-transform-1.2.0" - (sources."param-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - sources."parse-asn1-5.1.6" - sources."parse-json-4.0.0" + sources."param-case-3.0.4" sources."parse-png-2.1.0" - sources."parse-srcset-1.0.2" sources."parseurl-1.3.3" - (sources."pascal-case-3.1.2" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - sources."pascalcase-0.1.1" + sources."pascal-case-3.1.2" (sources."password-prompt-1.1.2" // { dependencies = [ sources."ansi-escapes-3.2.0" ]; }) sources."path-browserify-1.0.1" - sources."path-dirname-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" @@ -106552,20 +105664,18 @@ in 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."picocolors-0.2.1" + 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."pirates-4.0.5" - (sources."pkg-dir-3.0.0" // { + (sources."pkg-dir-4.2.0" // { dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" + sources."find-up-4.1.0" + sources."locate-path-5.0.0" sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" + sources."p-locate-4.1.0" ]; }) (sources."pkg-up-3.1.0" // { @@ -106583,133 +105693,43 @@ in ]; }) sources."pngjs-3.4.0" - sources."pnp-webpack-plugin-1.7.0" - (sources."portfinder-1.0.32" // { - dependencies = [ - sources."async-2.6.4" - sources."debug-3.2.7" - ]; - }) - sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.39" // { - dependencies = [ - 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-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."normalize-url-3.3.0" - 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-safe-parser-4.0.2" - sources."postcss-selector-parser-6.0.10" - (sources."postcss-svgo-4.0.3" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - sources."postcss-unique-selectors-4.0.1" + sources."postcss-8.4.21" + sources."postcss-calc-8.2.4" + sources."postcss-colormin-5.3.0" + sources."postcss-convert-values-5.1.3" + sources."postcss-discard-comments-5.1.2" + sources."postcss-discard-duplicates-5.1.0" + sources."postcss-discard-empty-5.1.1" + sources."postcss-discard-overridden-5.1.0" + sources."postcss-merge-longhand-5.1.7" + sources."postcss-merge-rules-5.1.3" + sources."postcss-minify-font-values-5.1.0" + sources."postcss-minify-gradients-5.1.1" + sources."postcss-minify-params-5.1.4" + sources."postcss-minify-selectors-5.2.1" + sources."postcss-modules-extract-imports-3.0.0" + sources."postcss-modules-local-by-default-4.0.0" + sources."postcss-modules-scope-3.0.0" + sources."postcss-modules-values-4.0.0" + sources."postcss-normalize-charset-5.1.0" + sources."postcss-normalize-display-values-5.1.0" + sources."postcss-normalize-positions-5.1.1" + sources."postcss-normalize-repeat-style-5.1.1" + sources."postcss-normalize-string-5.1.0" + sources."postcss-normalize-timing-functions-5.1.0" + sources."postcss-normalize-unicode-5.1.1" + sources."postcss-normalize-url-5.1.0" + sources."postcss-normalize-whitespace-5.1.1" + sources."postcss-ordered-values-5.1.3" + sources."postcss-reduce-initial-5.1.1" + sources."postcss-reduce-transforms-5.1.0" + sources."postcss-selector-parser-6.0.11" + sources."postcss-svgo-5.1.0" + sources."postcss-unique-selectors-5.1.1" sources."postcss-value-parser-4.2.0" sources."prepend-http-3.0.1" sources."pretty-bytes-5.6.0" - sources."pretty-error-2.1.2" + sources."pretty-error-4.0.0" (sources."pretty-format-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -106718,68 +105738,23 @@ in ]; }) sources."probe-image-size-6.0.0" - sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-7.3.1" sources."promise-inflight-1.0.1" sources."prompts-2.4.2" sources."proxy-addr-2.0.7" - sources."prr-1.0.1" - (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."punycode-2.3.0" sources."qrcode-terminal-0.11.0" sources."qs-6.7.0" - sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" sources."querystringify-2.2.0" - sources."queue-6.0.2" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" 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-dev-utils-11.0.4" // { - dependencies = [ - sources."browserslist-4.14.2" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) - sources."cross-spawn-7.0.3" - sources."escape-string-regexp-2.0.0" - sources."find-up-4.1.0" - sources."globby-11.0.1" - sources."json5-2.2.1" - sources."loader-utils-2.0.0" - sources."locate-path-5.0.0" - sources."node-releases-1.1.77" - sources."open-7.4.2" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."path-key-3.1.1" - sources."prompts-2.4.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."strip-ansi-6.0.0" - sources."which-2.0.2" - ]; - }) - sources."react-error-overlay-6.0.11" sources."react-is-17.0.2" sources."react-refresh-0.4.3" sources."read-chunk-3.2.0" @@ -106790,18 +105765,11 @@ in ]; }) sources."readdirp-3.6.0" - (sources."recursive-readdir-2.2.2" // { - dependencies = [ - sources."minimatch-3.0.4" - ]; - }) sources."regenerate-1.4.2" sources."regenerate-unicode-properties-10.1.0" - sources."regenerator-runtime-0.13.10" - sources."regenerator-transform-0.15.0" - sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.3" - sources."regexpu-core-5.2.1" + sources."regenerator-runtime-0.13.11" + sources."regenerator-transform-0.15.1" + sources."regexpu-core-5.2.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."regjsgen-0.7.1" @@ -106811,21 +105779,9 @@ in ]; }) sources."relateurl-0.2.7" - sources."remove-trailing-separator-1.1.0" sources."remove-trailing-slash-0.1.1" - (sources."renderkid-2.0.7" // { - dependencies = [ - sources."ansi-regex-2.1.1" - 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."require-directory-2.1.1" + sources."renderkid-3.0.0" sources."require-from-string-2.0.2" - sources."require-main-filename-2.0.0" (sources."requireg-0.2.2" // { dependencies = [ sources."resolve-1.7.1" @@ -106835,43 +105791,34 @@ in sources."reselect-4.1.7" sources."resolve-1.22.1" sources."resolve-alpn-1.2.1" - (sources."resolve-cwd-2.0.0" // { - dependencies = [ - sources."resolve-from-3.0.0" - ]; - }) sources."resolve-from-5.0.0" - sources."resolve-url-0.2.1" sources."responselike-2.0.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.4.5" // { dependencies = [ sources."glob-6.0.4" ]; }) - sources."ripemd160-2.0.2" sources."router-ips-1.0.0" sources."run-parallel-1.2.0" - sources."run-queue-1.0.3" sources."safe-buffer-5.2.1" sources."safe-json-stringify-1.2.0" - sources."safe-regex-1.1.0" - sources."safe-regex-test-1.0.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - (sources."schema-utils-3.1.1" // { + (sources."schema-utils-2.7.1" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" ]; }) sources."select-hose-2.0.0" - sources."selfsigned-1.10.14" + (sources."selfsigned-2.1.1" // { + dependencies = [ + sources."node-forge-1.3.1" + ]; + }) sources."semver-7.3.2" (sources."send-0.18.0" // { dependencies = [ @@ -106891,7 +105838,7 @@ in ]; }) sources."serialize-error-6.0.0" - sources."serialize-javascript-4.0.0" + sources."serialize-javascript-6.0.1" (sources."serve-index-1.9.1" // { dependencies = [ sources."debug-2.6.9" @@ -106914,18 +105861,10 @@ in sources."statuses-1.4.0" ]; }) - 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.1.1" - sources."sha.js-2.4.11" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shell-quote-1.7.2" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" (sources."simple-plist-1.4.0" // { @@ -106933,60 +105872,23 @@ in sources."bplist-parser-0.3.2" ]; }) - (sources."simple-swizzle-0.2.2" // { - dependencies = [ - sources."is-arrayish-0.3.2" - ]; - }) sources."sisteransi-1.0.5" sources."slash-3.0.0" sources."slugify-1.6.5" - (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."sockjs-0.3.20" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) - (sources."sockjs-client-1.4.0" // { - dependencies = [ - sources."debug-3.2.7" - sources."faye-websocket-0.11.4" - ]; - }) + sources."sockjs-0.3.24" 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.4.18" - sources."source-map-url-0.4.1" + sources."source-map-0.6.1" + sources."source-map-js-1.0.2" + (sources."source-map-loader-3.0.2" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) + (sources."source-map-support-0.4.18" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -106994,42 +105896,18 @@ in ]; }) sources."split-1.0.1" - sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."ssri-8.0.1" sources."stable-0.1.8" - (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-buffers-2.2.0" - sources."stream-each-1.2.3" - sources."stream-http-2.8.3" (sources."stream-parser-0.3.1" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" ]; }) - sources."stream-shift-1.0.1" sources."string-width-4.2.3" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -107037,21 +105915,12 @@ in }) sources."strip-ansi-6.0.1" sources."strip-eof-1.0.0" + sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."structured-headers-0.4.1" - (sources."style-loader-1.2.1" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."schema-utils-2.7.1" - ]; - }) - (sources."stylehacks-4.0.3" // { - dependencies = [ - sources."postcss-selector-parser-3.1.2" - ]; - }) - (sources."sucrase-3.28.0" // { + sources."style-loader-3.3.1" + sources."stylehacks-5.1.1" + (sources."sucrase-3.29.0" // { dependencies = [ sources."commander-4.1.1" ]; @@ -107065,24 +105934,15 @@ in ]; }) sources."supports-preserve-symlinks-flag-1.0.0" - (sources."svgo-1.3.2" // { + (sources."svgo-2.8.0" // { dependencies = [ - sources."chalk-2.4.2" - sources."css-select-2.1.0" - sources."css-what-3.4.2" - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.3.0" - ]; - }) - sources."domelementtype-1.3.1" - sources."domutils-1.7.0" - sources."nth-check-1.0.2" + sources."commander-7.2.0" ]; }) - sources."tapable-1.1.3" - (sources."tar-6.1.12" // { + sources."tapable-2.2.1" + (sources."tar-6.1.13" // { dependencies = [ + sources."minipass-4.0.0" sources."mkdirp-1.0.4" ]; }) @@ -107095,267 +105955,133 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-4.8.1" // { + (sources."terser-5.16.1" // { dependencies = [ sources."commander-2.20.3" - sources."source-map-0.6.1" sources."source-map-support-0.5.21" ]; }) - (sources."terser-webpack-plugin-3.1.0" // { + (sources."terser-webpack-plugin-5.3.6" // { dependencies = [ sources."ajv-6.12.6" - 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" // { - dependencies = [ - sources."p-limit-2.3.0" - ]; - }) - sources."pkg-dir-4.2.0" - sources."schema-utils-2.7.1" - sources."semver-6.3.0" - sources."source-map-0.6.1" + sources."schema-utils-3.1.1" ]; }) 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" 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-fast-properties-2.0.0" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) sources."to-readable-stream-1.0.0" - sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tr46-0.0.3" sources."traverse-0.6.7" sources."tree-kill-1.2.2" sources."ts-interface-checker-0.1.13" - sources."ts-pnp-1.2.0" - sources."tslib-1.14.1" - sources."tty-browserify-0.0.0" + sources."tslib-2.5.0" sources."turndown-7.0.0" sources."type-fest-0.12.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."ua-parser-js-0.7.32" - sources."unbox-primitive-1.0.2" + sources."ua-parser-js-0.7.33" 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" + sources."unicode-match-property-value-ecmascript-2.1.0" sources."unicode-property-aliases-ecmascript-2.1.0" - 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."unique-string-1.0.0" 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."untildify-3.0.3" - sources."upath-1.2.0" - (sources."update-browserslist-db-1.0.10" // { - dependencies = [ - sources."picocolors-1.0.0" - ]; - }) + sources."update-browserslist-db-1.0.10" sources."update-check-1.5.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-join-4.0.0" - sources."url-loader-4.1.1" sources."url-parse-1.5.10" (sources."url-parse-lax-3.0.0" // { dependencies = [ sources."prepend-http-2.0.0" ]; }) - sources."use-3.1.1" - (sources."util-0.11.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) + sources."utf-8-validate-6.0.2" sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.0" sources."utila-0.4.0" sources."utils-merge-1.0.1" sources."uuid-8.3.2" sources."valid-url-1.0.9" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" - sources."vendors-1.0.4" - sources."vm-browserify-1.1.2" - 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."watchpack-2.4.0" sources."wbuf-1.7.3" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" - (sources."webpack-4.43.0" // { + (sources."webpack-5.75.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."fill-range-4.0.0" - sources."is-number-3.0.0" - sources."is-wsl-1.1.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" - sources."micromatch-3.1.10" - sources."rimraf-2.7.1" - sources."schema-utils-1.0.0" - sources."source-map-0.6.1" - sources."ssri-6.0.2" - sources."terser-webpack-plugin-1.4.5" - sources."to-regex-range-2.1.1" - sources."yallist-3.1.1" + sources."schema-utils-3.1.1" + sources."webpack-sources-3.2.3" ]; }) - sources."webpack-dev-middleware-3.7.3" - (sources."webpack-dev-server-3.11.0" // { + (sources."webpack-dev-middleware-5.3.3" // { 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.20.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."braces-2.3.2" + sources."ajv-keywords-5.1.0" + sources."schema-utils-4.0.0" + ]; + }) + (sources."webpack-dev-server-4.11.1" // { + dependencies = [ + sources."@types/retry-0.12.0" + sources."ajv-keywords-5.1.0" + sources."body-parser-1.20.1" sources."bytes-3.1.2" - sources."chokidar-2.1.8" sources."content-disposition-0.5.4" sources."cookie-0.5.0" - sources."del-4.1.1" + sources."cross-spawn-7.0.3" + sources."debug-2.6.9" + sources."default-gateway-6.0.3" sources."depd-2.0.0" - (sources."express-4.18.2" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."fsevents-1.2.13" - sources."glob-parent-3.1.0" - sources."globby-6.1.0" + sources."execa-5.1.1" + sources."express-4.18.2" + sources."finalhandler-1.2.0" + sources."get-stream-6.0.1" sources."http-errors-2.0.0" - 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."ipaddr.js-2.0.1" + sources."mimic-fn-2.1.0" sources."ms-2.0.0" - sources."normalize-path-2.1.1" + sources."npm-run-path-4.0.1" sources."on-finished-2.4.1" - sources."p-map-2.1.0" - sources."p-retry-3.0.1" - sources."pify-2.3.0" + sources."onetime-5.1.2" + sources."p-retry-4.6.2" + sources."path-key-3.1.1" sources."qs-6.11.0" sources."raw-body-2.5.1" - sources."readdirp-2.2.1" - sources."rimraf-2.7.1" - sources."schema-utils-1.0.0" - sources."semver-6.3.0" + sources."retry-0.13.1" + sources."rimraf-3.0.2" + sources."schema-utils-4.0.0" sources."serve-static-1.15.0" sources."setprototypeof-1.2.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."statuses-2.0.1" - sources."strip-ansi-3.0.1" - sources."supports-color-6.1.0" - sources."to-regex-range-2.1.1" sources."toidentifier-1.0.1" + sources."which-2.0.2" ]; }) - (sources."webpack-log-2.0.0" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) - (sources."webpack-manifest-plugin-2.2.0" // { - dependencies = [ - sources."fs-extra-7.0.1" - sources."jsonfile-4.0.0" - sources."universalify-0.1.2" - ]; - }) - (sources."webpack-sources-1.4.3" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."websocket-driver-0.6.5" + sources."webpack-manifest-plugin-4.1.1" + sources."webpack-sources-2.3.1" + sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" sources."whatwg-url-5.0.0" sources."which-1.3.1" - sources."which-boxed-primitive-1.0.2" - sources."which-module-2.0.0" sources."widest-line-3.1.0" sources."with-open-file-0.1.7" sources."wonka-4.0.15" - 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" @@ -107365,13 +106091,13 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-6.2.2" + sources."ws-8.12.0" (sources."xcode-3.0.1" // { dependencies = [ sources."uuid-7.0.3" ]; }) - (sources."xdl-59.2.55" // { + (sources."xdl-60.0.1" // { dependencies = [ sources."bplist-parser-0.3.2" sources."minimatch-3.0.4" @@ -107384,28 +106110,8 @@ in ]; }) sources."xmlbuilder-14.0.0" - sources."xtend-4.0.2" - sources."y18n-4.0.3" sources."yallist-4.0.0" - (sources."yargs-13.3.2" // { - dependencies = [ - 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" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) - (sources."yargs-parser-13.1.2" // { - dependencies = [ - sources."camelcase-5.3.1" - ]; - }) + sources."yaml-1.10.2" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -107429,48 +106135,48 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.1" - sources."@babel/core-7.20.2" - (sources."@babel/generator-7.20.2" // { + sources."@babel/compat-data-7.20.14" + sources."@babel/core-7.20.12" + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; }) sources."@babel/helper-annotate-as-pure-7.18.6" - sources."@babel/helper-compilation-targets-7.20.0" + sources."@babel/helper-compilation-targets-7.20.7" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.2" + sources."@babel/helper-module-transforms-7.20.11" sources."@babel/helper-plugin-utils-7.20.2" sources."@babel/helper-simple-access-7.20.2" sources."@babel/helper-split-export-declaration-7.18.6" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.1" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.2" - sources."@babel/plugin-proposal-object-rest-spread-7.20.2" + sources."@babel/parser-7.20.13" + sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.20.2" - sources."@babel/plugin-transform-parameters-7.20.1" - sources."@babel/plugin-transform-react-jsx-7.19.0" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.20.1" - sources."@babel/types-7.20.2" + sources."@babel/plugin-transform-destructuring-7.20.7" + sources."@babel/plugin-transform-parameters-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.20.13" + sources."@babel/template-7.20.7" + sources."@babel/traverse-7.20.13" + sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" sources."@types/minimist-1.2.2" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/normalize-package-data-2.4.1" sources."@types/prop-types-15.7.5" - sources."@types/react-18.0.25" + sources."@types/react-18.0.27" sources."@types/scheduler-0.16.2" sources."@types/yauzl-2.10.0" sources."@types/yoga-layout-1.9.2" @@ -107498,7 +106204,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -107545,7 +106251,12 @@ in sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."hosted-git-info-4.1.0" + (sources."hosted-git-info-4.1.0" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" + ]; + }) sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" @@ -107572,13 +106283,13 @@ 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.1" + sources."json5-2.2.3" sources."kind-of-6.0.3" sources."lines-and-columns-1.2.4" sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."loose-envify-1.4.0" - sources."lru-cache-6.0.0" + sources."lru-cache-5.1.1" sources."make-dir-3.1.0" sources."map-obj-4.3.0" (sources."meow-9.0.0" // { @@ -107593,11 +106304,13 @@ in sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."node-fetch-2.6.7" - sources."node-gyp-build-4.5.0" - sources."node-releases-2.0.6" + sources."node-gyp-build-4.6.0" + sources."node-releases-2.0.8" (sources."normalize-package-data-3.0.3" // { dependencies = [ + sources."lru-cache-6.0.0" sources."semver-7.3.8" + sources."yallist-4.0.0" ]; }) sources."object-assign-4.1.1" @@ -107624,7 +106337,7 @@ in }) sources."quick-lru-4.0.1" sources."react-17.0.2" - sources."react-devtools-core-4.26.1" + sources."react-devtools-core-4.27.1" sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -107662,7 +106375,7 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" - (sources."stack-utils-2.0.5" // { + (sources."stack-utils-2.0.6" // { dependencies = [ sources."escape-string-regexp-2.0.0" ]; @@ -107697,7 +106410,7 @@ in }) sources."wrappy-1.0.2" sources."ws-7.5.9" - sources."yallist-4.0.0" + sources."yallist-3.1.1" sources."yargs-parser-20.2.9" sources."yauzl-2.10.0" sources."yoga-layout-prebuilt-1.10.0" @@ -107722,7 +106435,7 @@ in sha512 = "/1EUu9Z5ICqSOwegsl0aWI1e3yvfr0/HEw8ns9RLYmROKqihO0IaeWkcf0vqayjp7vp6gl9SoJF8yiX1soYpvA=="; }; dependencies = [ - (sources."@heroku-cli/color-1.1.14" // { + (sources."@heroku-cli/color-1.1.16" // { dependencies = [ sources."ansi-regex-4.1.1" sources."ansi-styles-3.2.1" @@ -107737,17 +106450,16 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/command-1.8.20" + sources."@oclif/command-1.8.22" sources."@oclif/config-1.18.6" sources."@oclif/errors-1.3.6" - (sources."@oclif/help-1.0.3" // { + (sources."@oclif/help-1.0.5" // { dependencies = [ - sources."@oclif/config-1.18.5" sources."wrap-ansi-6.2.0" ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.9" + sources."@oclif/parser-3.8.10" (sources."@oclif/plugin-autocomplete-0.1.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -107788,7 +106500,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" (sources."bl-4.1.0" // { @@ -107847,17 +106559,21 @@ in sources."colors-1.0.3" sources."combined-stream-1.0.8" sources."core-util-is-1.0.3" - sources."cross-fetch-3.1.5" + (sources."cross-fetch-3.1.5" // { + dependencies = [ + sources."node-fetch-2.6.7" + ]; + }) (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."csv-parse-5.3.1" + sources."csv-parse-5.3.3" sources."csv-stream-0.2.0" sources."dashdash-1.14.1" sources."debug-4.3.4" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."decompress-response-3.3.0" sources."deep-is-0.1.4" sources."defaults-1.0.4" @@ -107867,11 +106583,7 @@ in sources."duplexer3-0.1.5" sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) + sources."encoding-0.1.13" sources."escape-string-regexp-4.0.0" sources."escodegen-1.14.3" sources."esprima-4.0.1" @@ -107880,14 +106592,18 @@ in sources."execa-0.10.0" sources."exponential-backoff-3.1.0" sources."extend-3.0.2" - sources."external-editor-3.1.0" + (sources."external-editor-3.1.0" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) sources."extract-stack-1.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."faunadb-4.7.1" (sources."figures-3.2.0" // { dependencies = [ @@ -107927,9 +106643,9 @@ in sources."http-cache-semantics-3.8.1" sources."http-signature-1.2.0" sources."hyperlinker-1.0.0" - sources."iconv-lite-0.4.24" + sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."indent-string-4.0.0" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -107988,8 +106704,8 @@ in ]; }) sources."nice-try-1.0.5" - sources."node-abort-controller-3.0.1" - sources."node-fetch-2.6.7" + sources."node-abort-controller-3.1.1" + sources."node-fetch-2.6.8" sources."normalize-url-2.0.1" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" @@ -108012,10 +106728,10 @@ in sources."pify-3.0.0" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - sources."prettier-2.7.1" + sources."prettier-2.8.3" sources."process-nextick-args-2.0.1" sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."query-string-5.1.1" sources."queue-microtask-1.2.3" @@ -108034,7 +106750,7 @@ in sources."reusify-1.0.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.7" + sources."rxjs-7.8.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.8" @@ -108047,7 +106763,7 @@ in sources."sshpk-1.17.0" sources."stealthy-require-1.1.1" sources."stream-chain-2.2.5" - sources."stream-json-1.7.4" + sources."stream-json-1.7.5" sources."strict-uri-encode-1.1.0" sources."string-width-4.2.3" (sources."string_decoder-1.1.1" // { @@ -108070,7 +106786,7 @@ in sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."treeify-1.1.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -108108,34 +106824,32 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "11.16.0"; + version = "11.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-11.16.0.tgz"; - sha512 = "fT8yeco/ksIjA3fdpqWoI+v58tUCzH7YXY+WZdBq6DsbJ27EOSgVcO9uUzn7GYfWEP3A0OdsBwoi/i78RMGlkQ=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-11.21.0.tgz"; + sha512 = "9J70y9E4t80rAGs9fvtTt2jhqMUNwOch0F7uqG/OQn6rRSkKGqpnaozUkCjRCmWaQi0bM8vYxruGyD0E+sqZlw=="; }; dependencies = [ - (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { + (sources."@apidevtools/json-schema-ref-parser-9.1.2" // { dependencies = [ sources."js-yaml-4.1.0" ]; }) - sources."@babel/parser-7.20.2" + sources."@babel/parser-7.20.13" sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" - sources."@esbuild/android-arm-0.15.13" - sources."@esbuild/linux-loong64-0.15.13" sources."@gar/promisify-1.1.3" sources."@google-cloud/paginator-4.0.1" sources."@google-cloud/precise-date-3.0.1" sources."@google-cloud/projectify-3.0.0" sources."@google-cloud/promisify-2.0.4" - (sources."@google-cloud/pubsub-3.2.1" // { + (sources."@google-cloud/pubsub-3.3.0" // { dependencies = [ - sources."google-auth-library-8.6.0" + sources."google-auth-library-8.7.0" ]; }) sources."@grpc/grpc-js-1.7.3" - sources."@grpc/proto-loader-0.7.3" + sources."@grpc/proto-loader-0.7.4" sources."@jsdevtools/ono-7.1.3" (sources."@npmcli/fs-2.1.2" // { dependencies = [ @@ -108143,8 +106857,10 @@ in ]; }) sources."@npmcli/move-file-2.0.1" - sources."@opentelemetry/api-1.2.0" + sources."@opentelemetry/api-1.4.0" sources."@opentelemetry/semantic-conventions-1.3.1" + sources."@pnpm/network.ca-file-1.0.2" + sources."@pnpm/npm-conf-1.0.5" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -108155,8 +106871,6 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" - sources."@sindresorhus/is-0.14.0" - 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.11" @@ -108164,11 +106878,11 @@ in sources."@types/long-4.0.2" sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" @@ -108181,7 +106895,7 @@ in sources."ajv-6.12.6" (sources."ajv-formats-2.1.1" // { dependencies = [ - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -108190,7 +106904,7 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ansicolors-0.3.2" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."aproba-2.0.0" sources."archiver-5.3.1" (sources."archiver-utils-2.1.0" // { @@ -108212,7 +106926,7 @@ in sources."async-lock-1.3.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { @@ -108223,7 +106937,7 @@ in sources."basic-auth-connect-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.51" - sources."bignumber.js-9.1.0" + sources."bignumber.js-9.1.1" sources."binary-0.3.0" sources."binary-extensions-2.2.0" sources."bl-4.1.0" @@ -108234,10 +106948,9 @@ in sources."ms-2.0.0" ]; }) - (sources."boxen-4.2.0" // { + (sources."boxen-5.1.2" // { dependencies = [ - sources."chalk-3.0.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" ]; }) sources."brace-expansion-2.0.1" @@ -108251,20 +106964,14 @@ in sources."bytes-3.1.2" (sources."cacache-16.1.3" // { dependencies = [ - sources."glob-8.0.3" + sources."glob-8.1.0" sources."lru-cache-7.14.1" - sources."minimatch-5.1.0" - ]; - }) - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" + sources."minimatch-5.1.6" ]; }) sources."call-bind-1.0.2" sources."call-me-maybe-1.0.2" - sources."camelcase-5.3.1" + sources."camelcase-6.3.0" sources."cardinal-2.1.1" sources."caseless-0.12.0" sources."catharsis-0.9.0" @@ -108284,7 +106991,6 @@ in sources."cli-width-3.0.0" sources."cliui-7.0.4" sources."clone-1.0.4" - sources."clone-response-1.0.3" (sources."color-3.2.1" // { dependencies = [ sources."color-convert-1.9.3" @@ -108300,7 +107006,6 @@ in sources."colorspace-1.1.4" sources."combined-stream-1.0.8" sources."commander-4.1.1" - sources."compare-semver-1.1.0" sources."compress-commons-4.1.1" sources."compressible-2.0.18" (sources."compression-1.7.4" // { @@ -108312,6 +107017,11 @@ in ]; }) sources."concat-map-0.0.1" + (sources."config-chain-1.1.13" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) sources."configstore-5.0.1" (sources."connect-3.7.0" // { dependencies = [ @@ -108345,16 +107055,14 @@ in ]; }) sources."crypto-random-string-2.0.0" - sources."csv-parse-5.3.1" + sources."csv-parse-5.3.3" sources."dashdash-1.14.1" sources."data-uri-to-buffer-3.0.1" 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.4" - sources."defer-to-connect-1.1.3" sources."degenerator-3.0.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -108368,7 +107076,6 @@ in sources."string_decoder-1.1.1" ]; }) - sources."duplexer3-0.1.5" sources."duplexify-4.1.2" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" @@ -108385,27 +107092,6 @@ in sources."entities-2.1.0" sources."env-paths-2.2.1" sources."err-code-2.0.3" - sources."esbuild-0.15.13" - sources."esbuild-android-64-0.15.13" - sources."esbuild-android-arm64-0.15.13" - sources."esbuild-darwin-64-0.15.13" - sources."esbuild-darwin-arm64-0.15.13" - sources."esbuild-freebsd-64-0.15.13" - sources."esbuild-freebsd-arm64-0.15.13" - sources."esbuild-linux-32-0.15.13" - sources."esbuild-linux-64-0.15.13" - sources."esbuild-linux-arm-0.15.13" - sources."esbuild-linux-arm64-0.15.13" - sources."esbuild-linux-mips64le-0.15.13" - sources."esbuild-linux-ppc64le-0.15.13" - sources."esbuild-linux-riscv64-0.15.13" - sources."esbuild-linux-s390x-0.15.13" - sources."esbuild-netbsd-64-0.15.13" - sources."esbuild-openbsd-64-0.15.13" - sources."esbuild-sunos-64-0.15.13" - sources."esbuild-windows-32-0.15.13" - sources."esbuild-windows-64-0.15.13" - sources."esbuild-windows-arm64-0.15.13" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" @@ -108425,7 +107111,7 @@ in sources."events-listener-1.1.0" (sources."exegesis-4.1.1" // { dependencies = [ - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."json-schema-traverse-1.0.0" sources."semver-7.3.8" ]; @@ -108494,10 +107180,9 @@ in sources."function-bind-1.1.1" sources."gauge-4.0.4" sources."gaxios-5.0.2" - sources."gcp-metadata-5.0.1" + sources."gcp-metadata-5.2.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" - sources."get-stream-4.1.0" + sources."get-intrinsic-1.2.0" (sources."get-uri-3.0.2" // { dependencies = [ sources."fs-extra-8.1.0" @@ -108510,7 +107195,7 @@ in sources."glob-parent-5.1.2" sources."glob-slash-1.0.0" sources."glob-slasher-1.0.1" - sources."global-dirs-2.1.0" + sources."global-dirs-3.0.1" (sources."google-auth-library-7.14.1" // { dependencies = [ sources."gaxios-4.3.3" @@ -108521,27 +107206,21 @@ in }) (sources."google-gax-3.5.2" // { dependencies = [ - sources."google-auth-library-8.6.0" + sources."google-auth-library-8.7.0" ]; }) sources."google-p12-pem-4.0.1" - sources."got-9.6.0" sources."graceful-fs-4.2.10" sources."gtoken-6.1.2" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) sources."has-flag-4.0.0" sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" sources."heap-js-2.2.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" @@ -108555,9 +107234,9 @@ in sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.7" + sources."ini-2.0.0" sources."inquirer-8.2.5" - sources."install-artifact-from-github-1.3.1" + sources."install-artifact-from-github-1.3.2" sources."ip-1.1.8" sources."ip-regex-4.3.0" sources."ipaddr.js-1.9.1" @@ -108567,10 +107246,10 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" - sources."is-installed-globally-0.3.2" + sources."is-installed-globally-0.4.0" sources."is-interactive-1.0.0" sources."is-lambda-1.0.1" - sources."is-npm-4.0.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" @@ -108584,6 +107263,7 @@ in sources."is2-2.0.9" sources."isarray-1.0.0" sources."isexe-2.0.0" + sources."isomorphic-fetch-3.0.0" sources."isstream-0.1.2" sources."jju-1.4.0" sources."join-path-1.1.1" @@ -108596,26 +107276,24 @@ in sources."jsbn-0.1.1" sources."jsdoc-3.6.11" sources."json-bigint-1.0.0" - sources."json-buffer-3.0.0" sources."json-parse-helpfulerror-1.0.3" sources."json-ptr-3.1.1" sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" - (sources."jsonwebtoken-8.5.1" // { + (sources."jsonwebtoken-9.0.0" // { dependencies = [ sources."jwa-1.4.1" sources."jws-3.2.2" + sources."semver-7.3.8" ]; }) sources."jsprim-1.4.2" sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-3.1.0" sources."klaw-3.0.0" sources."kuler-2.0.0" - sources."latest-version-5.1.0" (sources."lazystream-1.0.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -108635,20 +107313,13 @@ in sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.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.isobject-2.4.1" sources."lodash.isplainobject-4.0.6" - sources."lodash.isstring-4.0.1" - sources."lodash.once-4.1.1" sources."lodash.snakecase-4.1.1" sources."lodash.union-4.6.0" sources."log-symbols-4.1.0" sources."logform-2.4.2" sources."long-4.0.0" - sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ @@ -108664,12 +107335,12 @@ in ]; }) sources."markdown-it-12.3.2" - sources."markdown-it-anchor-8.6.5" - sources."marked-4.2.2" + sources."markdown-it-anchor-8.6.6" + sources."marked-4.2.12" (sources."marked-terminal-5.1.1" // { dependencies = [ sources."ansi-escapes-5.0.0" - sources."chalk-5.1.2" + sources."chalk-5.2.0" sources."type-fest-1.4.0" ]; }) @@ -108681,14 +107352,13 @@ in 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.1.2" // { dependencies = [ sources."brace-expansion-1.1.11" ]; }) sources."minimist-1.2.7" - sources."minipass-3.3.5" + sources."minipass-3.3.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-2.1.2" sources."minipass-flush-1.0.5" @@ -108710,43 +107380,36 @@ in sources."netmask-2.0.2" sources."nice-try-1.0.5" sources."node-emoji-1.11.0" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."node-forge-1.3.1" - (sources."node-gyp-9.3.0" // { + (sources."node-gyp-9.3.1" // { dependencies = [ sources."semver-7.3.8" sources."which-2.0.2" ]; }) - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."nopt-6.0.0" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.1" sources."npmlog-6.0.2" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" sources."onetime-5.1.2" sources."open-6.4.0" - sources."openapi3-ts-3.1.1" + sources."openapi3-ts-3.1.2" sources."optionator-0.8.3" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" - sources."p-cancelable-1.1.0" sources."p-defer-3.0.0" sources."p-map-4.0.0" sources."pac-proxy-agent-5.0.0" sources."pac-resolver-5.0.1" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" @@ -108761,7 +107424,6 @@ in ]; }) sources."prelude-ls-1.1.2" - sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-breaker-6.0.0" @@ -108771,6 +107433,7 @@ in sources."retry-0.12.0" ]; }) + sources."proto-list-1.2.4" sources."proto3-json-serializer-1.1.0" (sources."protobufjs-7.1.2" // { dependencies = [ @@ -108779,8 +107442,8 @@ in }) (sources."protobufjs-cli-1.0.2" // { dependencies = [ - sources."glob-8.0.3" - sources."minimatch-5.1.0" + sources."glob-8.1.0" + sources."minimatch-5.1.6" sources."semver-7.3.8" ]; }) @@ -108794,26 +107457,27 @@ in sources."proxy-from-env-1.1.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."pupa-2.1.1" sources."qs-6.11.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" (sources."rc-1.2.8" // { dependencies = [ + sources."ini-1.3.8" sources."strip-json-comments-2.0.1" ]; }) - sources."re2-1.17.7" + sources."re2-1.18.0" sources."readable-stream-3.6.0" (sources."readdir-glob-1.1.2" // { dependencies = [ - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" ]; }) sources."readdirp-3.6.0" sources."redeyed-2.1.1" - sources."registry-auth-token-4.2.2" + sources."registry-auth-token-5.0.1" sources."registry-url-5.1.0" (sources."request-2.88.2" // { dependencies = [ @@ -108824,8 +107488,7 @@ in }) sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."requizzle-0.2.3" - sources."responselike-1.0.2" + sources."requizzle-0.2.4" sources."restore-cursor-3.1.0" sources."retry-0.13.1" sources."retry-request-5.0.2" @@ -108838,9 +107501,9 @@ in ]; }) sources."run-async-2.4.1" - sources."rxjs-7.5.7" + sources."rxjs-7.8.0" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-2.4.1" + sources."safe-stable-stringify-2.4.2" sources."safer-buffer-2.1.2" sources."semver-5.7.1" (sources."semver-diff-3.1.1" // { @@ -108882,53 +107545,37 @@ in sources."stack-trace-0.0.10" sources."statuses-2.0.1" sources."stream-chain-2.2.5" - sources."stream-json-1.7.4" + sources."stream-json-1.7.5" sources."stream-shift-1.0.1" - (sources."string-length-1.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."strip-ansi-3.0.1" - ]; - }) sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" - (sources."superstatic-8.0.0" // { + (sources."superstatic-9.0.2" // { dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."commander-9.4.1" - sources."escape-string-regexp-1.0.5" + sources."commander-9.5.0" sources."isarray-0.0.1" + sources."minimatch-5.1.6" sources."path-to-regexp-1.8.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - (sources."update-notifier-4.1.3" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" - sources."supports-color-7.2.0" - ]; - }) ]; }) sources."supports-color-7.2.0" sources."supports-hyperlinks-2.3.0" sources."taffydb-2.6.2" - sources."tar-6.1.12" + (sources."tar-6.1.13" // { + dependencies = [ + sources."minipass-4.0.0" + ]; + }) sources."tar-stream-2.2.0" (sources."tcp-port-used-1.0.2" // { dependencies = [ sources."debug-4.3.1" ]; }) - sources."term-size-2.2.1" sources."text-hex-1.0.0" sources."through-2.3.8" sources."tmp-0.2.1" - sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tough-cookie-2.5.0" @@ -108936,7 +107583,7 @@ in sources."tr46-0.0.3" sources."traverse-0.3.9" sources."triple-beam-1.3.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -108960,21 +107607,13 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."update-notifier-5.1.0" // { + (sources."update-notifier-cjs-5.1.6" // { dependencies = [ - sources."boxen-5.1.2" - sources."camelcase-6.3.0" - sources."global-dirs-3.0.0" - sources."ini-2.0.0" - sources."is-installed-globally-0.4.0" - sources."is-npm-5.0.0" sources."semver-7.3.8" - sources."type-fest-0.20.2" ]; }) sources."uri-js-4.4.1" sources."url-join-0.0.1" - sources."url-parse-lax-3.0.0" sources."utf-8-validate-5.0.10" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -108986,9 +107625,10 @@ in sources."core-util-is-1.0.2" ]; }) - sources."vm2-3.9.11" + sources."vm2-3.9.13" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" + sources."whatwg-fetch-3.6.2" sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."wide-align-1.1.5" @@ -109005,7 +107645,7 @@ in sources."xregexp-2.0.0" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yaml-2.1.3" + sources."yaml-2.2.1" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" sources."zip-stream-4.1.0" @@ -109139,7 +107779,7 @@ in ]; }) sources."find-up-5.0.0" - sources."fkill-8.0.1" + sources."fkill-8.1.0" sources."function-bind-1.1.1" sources."fuzzy-search-3.2.1" sources."get-stream-6.0.1" @@ -109236,7 +107876,7 @@ in sources."redent-4.0.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-7.5.7" + sources."rxjs-7.8.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.8" @@ -109262,7 +107902,7 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."trim-newlines-4.0.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-fest-0.21.3" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" @@ -109303,7 +107943,7 @@ in sources."@types/atob-2.1.2" sources."@types/bn.js-5.1.1" sources."@types/inquirer-6.5.0" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/pbkdf2-3.1.0" sources."@types/secp256k1-4.0.3" sources."@types/through-0.0.30" @@ -109319,7 +107959,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."base-x-3.0.9" sources."bcrypt-pbkdf-1.0.2" sources."binary-search-tree-0.2.5" @@ -109414,7 +108054,7 @@ in sources."jsonfile-6.1.0" sources."jsprim-1.4.2" sources."jwt-decode-2.2.0" - sources."keccak-3.0.2" + sources."keccak-3.0.3" sources."lie-3.1.1" sources."localforage-1.10.0" sources."locate-path-5.0.0" @@ -109430,8 +108070,8 @@ in sources."mute-stream-0.0.8" sources."nedb-1.8.0" sources."node-addon-api-2.0.2" - sources."node-fetch-2.6.7" - sources."node-gyp-build-4.5.0" + sources."node-fetch-2.6.8" + sources."node-gyp-build-4.6.0" (sources."number-to-bn-1.7.0" // { dependencies = [ sources."bn.js-4.11.6" @@ -109448,7 +108088,7 @@ in sources."pbkdf2-3.1.2" sources."performance-now-2.1.0" sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."querystring-0.2.1" sources."randombytes-2.1.0" @@ -109496,7 +108136,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."web3-utils-1.8.0" + sources."web3-utils-1.8.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-module-2.0.0" @@ -109555,7 +108195,7 @@ in sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" sources."async-1.5.2" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" sources."balanced-match-1.0.2" @@ -109629,15 +108269,15 @@ in sources."crypto-random-string-1.0.0" sources."cycle-1.0.3" sources."debug-2.6.9" - sources."decode-uri-component-0.2.0" - sources."deep-equal-2.1.0" + sources."decode-uri-component-0.2.2" + sources."deep-equal-2.2.0" sources."define-properties-1.1.4" sources."define-property-2.0.2" sources."director-1.2.7" sources."dot-prop-4.2.1" sources."duplexer-0.1.2" sources."enabled-2.0.0" - sources."es-get-iterator-1.1.2" + sources."es-get-iterator-1.1.3" sources."event-stream-3.3.4" sources."eventemitter2-6.4.4" (sources."expand-brackets-2.1.4" // { @@ -109687,7 +108327,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-value-2.0.6" sources."glob-7.2.3" (sources."glob-parent-3.1.0" // { @@ -109713,8 +108353,10 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" + sources."internal-slot-1.0.4" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.1" + sources."is-array-buffer-3.0.1" sources."is-arrayish-0.3.2" sources."is-bigint-1.0.4" sources."is-binary-path-1.0.1" @@ -109738,6 +108380,7 @@ in sources."is-plain-object-2.0.4" sources."is-regex-1.1.4" sources."is-set-2.0.2" + sources."is-shared-array-buffer-1.0.2" sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" @@ -109799,7 +108442,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -109847,7 +108490,7 @@ in sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."safe-stable-stringify-2.4.1" + sources."safe-stable-stringify-2.4.2" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -109910,6 +108553,7 @@ in sources."kind-of-5.1.0" ]; }) + sources."stop-iteration-iterator-1.0.0" sources."stream-combiner-0.0.4" sources."string_decoder-1.1.1" sources."strip-json-comments-2.0.1" @@ -110015,14 +108659,38 @@ in ganache = nodeEnv.buildNodePackage { name = "ganache"; packageName = "ganache"; - version = "7.5.0"; + version = "7.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/ganache/-/ganache-7.5.0.tgz"; - sha512 = "afNTJYBEaFrLPRrn7eUxH39TgnrffvHn/4T6THzQrc3rpfe4DOxw2nY2XEQxfsq1t4OqKSXtxomzyo26RZiOzw=="; + url = "https://registry.npmjs.org/ganache/-/ganache-7.7.3.tgz"; + sha512 = "dZTUHjzSuvDTMUpKaBTWJnpcWpsBUtqciA8ttdmC/r/XRXJhDa0EpypisYULhoV8tx76G08mOuM/B1vhPbh20A=="; }; dependencies = [ + sources."@types/bn.js-5.1.1" + sources."@types/lru-cache-5.1.1" + sources."@types/node-18.11.18" + sources."@types/seedrandom-3.0.1" + sources."abstract-level-1.0.3" + (sources."abstract-leveldown-7.2.0" // { + dependencies = [ + sources."level-supports-2.1.0" + ]; + }) + sources."async-2.6.4" + sources."async-eventemitter-0.2.4" + sources."base64-js-1.5.1" + sources."buffer-6.0.3" sources."bufferutil-4.0.5" - sources."node-gyp-build-4.5.0" + sources."catering-2.1.1" + sources."emittery-0.10.0" + sources."ieee754-1.2.1" + sources."is-buffer-2.0.5" + sources."level-concat-iterator-3.1.0" + sources."level-supports-4.0.1" + sources."level-transcoder-1.0.1" + sources."lodash-4.17.21" + sources."module-error-1.0.2" + sources."node-gyp-build-4.6.0" + sources."queue-microtask-1.2.3" sources."utf-8-validate-5.0.7" ]; buildInputs = globalBuildInputs; @@ -110038,60 +108706,61 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "4.24.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.24.0.tgz"; - sha512 = "l5xaLLd8DGWtUHcK3Q1RfzyEJkcGZNSa3WGkkYjEwqYRY83fMHlH/hhunStuJ+1S7ZH9Vq7kL1OgOz6S8vK6AQ=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-5.5.0.tgz"; + sha512 = "BLWk1iw7f4XCAWiRXfrINPgqBHLbCrNff7tkvAMnyJt6l2IwbwxQVA0zcZ6TRGC3mJQH+tU6JDH9OPlnW2yDsw=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.1" - (sources."@babel/core-7.20.2" // { + sources."@babel/compat-data-7.20.14" + (sources."@babel/core-7.20.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.2" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; }) sources."@babel/helper-annotate-as-pure-7.18.6" - (sources."@babel/helper-compilation-targets-7.20.0" // { + (sources."@babel/helper-compilation-targets-7.20.7" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.20.2" + sources."@babel/helper-create-class-features-plugin-7.20.12" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.18.9" + sources."@babel/helper-member-expression-to-functions-7.20.7" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.2" + sources."@babel/helper-module-transforms-7.20.11" sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.20.2" - sources."@babel/helper-replace-supers-7.19.1" + sources."@babel/helper-replace-supers-7.20.7" sources."@babel/helper-simple-access-7.20.2" + sources."@babel/helper-skip-transparent-expression-wrappers-7.20.0" sources."@babel/helper-split-export-declaration-7.18.6" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.1" + sources."@babel/helpers-7.20.13" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.2" + sources."@babel/parser-7.20.13" sources."@babel/plugin-syntax-typescript-7.20.0" - sources."@babel/plugin-transform-typescript-7.20.2" + sources."@babel/plugin-transform-typescript-7.20.13" sources."@babel/preset-typescript-7.18.6" - sources."@babel/runtime-7.20.1" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.20.1" - sources."@babel/types-7.20.2" + sources."@babel/runtime-7.20.13" + sources."@babel/template-7.20.7" + sources."@babel/traverse-7.20.13" + sources."@babel/types-7.20.7" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jridgewell/gen-mapping-0.1.1" @@ -110105,25 +108774,25 @@ in sources."@lmdb/lmdb-linux-arm64-2.5.3" sources."@lmdb/lmdb-linux-x64-2.5.3" sources."@lmdb/lmdb-win32-x64-2.5.3" - sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-2.1.2" - sources."@msgpackr-extract/msgpackr-extract-darwin-x64-2.1.2" - sources."@msgpackr-extract/msgpackr-extract-linux-arm-2.1.2" - sources."@msgpackr-extract/msgpackr-extract-linux-arm64-2.1.2" - sources."@msgpackr-extract/msgpackr-extract-linux-x64-2.1.2" - sources."@msgpackr-extract/msgpackr-extract-win32-x64-2.1.2" + sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-2.2.0" + sources."@msgpackr-extract/msgpackr-extract-darwin-x64-2.2.0" + sources."@msgpackr-extract/msgpackr-extract-linux-arm-2.2.0" + sources."@msgpackr-extract/msgpackr-extract-linux-arm64-2.2.0" + sources."@msgpackr-extract/msgpackr-extract-linux-x64-2.2.0" + sources."@msgpackr-extract/msgpackr-extract-win32-x64-2.2.0" sources."@sideway/address-4.1.4" - sources."@sideway/formula-3.0.0" + sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@turist/fetch-7.2.0" sources."@turist/time-0.0.2" - sources."@types/cacheable-request-6.0.2" + sources."@types/cacheable-request-6.0.3" sources."@types/common-tags-1.8.1" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-4.2.0" - sources."@types/node-18.11.9" + sources."@types/keyv-3.1.4" + sources."@types/node-18.11.18" sources."@types/node-fetch-2.6.2" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -110150,7 +108819,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -110187,7 +108856,7 @@ in sources."configstore-5.0.1" sources."convert-hrtime-3.0.0" sources."convert-source-map-1.9.0" - sources."create-gatsby-2.24.0" + sources."create-gatsby-3.5.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -110203,7 +108872,6 @@ in sources."mimic-response-3.1.0" ]; }) - sources."deep-extend-0.6.0" sources."defer-to-connect-2.0.1" sources."delayed-stream-1.0.0" sources."dom-converter-0.2.0" @@ -110212,7 +108880,6 @@ in sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" - sources."duplexer3-0.1.5" sources."electron-to-chromium-1.4.284" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" @@ -110220,7 +108887,6 @@ in sources."entities-2.2.0" sources."envinfo-7.8.1" sources."escalade-3.1.1" - sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" (sources."execa-5.1.1" // { dependencies = [ @@ -110240,85 +108906,70 @@ in sources."tmp-0.0.33" ]; }) - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."figures-3.2.0" sources."file-type-16.5.4" sources."find-up-4.1.0" sources."form-data-3.0.1" sources."fs-exists-cached-1.0.0" - sources."fs-extra-10.1.0" + sources."fs-extra-11.1.0" sources."fs.realpath-1.0.0" - sources."gatsby-core-utils-3.24.0" - (sources."gatsby-telemetry-3.24.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."boxen-4.2.0" - sources."camelcase-5.3.1" - 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."gatsby-core-utils-4.5.0" + sources."gatsby-telemetry-4.5.0" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" sources."git-up-7.0.0" sources."glob-7.2.3" - sources."global-dirs-3.0.0" sources."globals-11.12.0" - sources."got-11.8.5" + sources."got-11.8.6" sources."graceful-fs-4.2.10" sources."has-flag-3.0.0" - sources."has-yarn-2.1.0" - sources."hosted-git-info-3.0.8" + sources."hash-wasm-4.9.0" + (sources."hosted-git-info-3.0.8" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" + ]; + }) sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http2-wrapper-1.0.3" sources."human-signals-2.1.0" sources."iconv-lite-0.6.3" 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" sources."is-ci-2.0.0" sources."is-docker-2.2.1" sources."is-extglob-1.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-2.0.1" - sources."is-installed-globally-0.4.0" sources."is-invalid-path-0.1.0" - sources."is-npm-5.0.0" sources."is-obj-2.0.0" - sources."is-path-inside-3.0.3" sources."is-ssh-1.4.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-valid-path-0.1.1" sources."is-wsl-2.2.0" - sources."is-yarn-global-0.3.0" sources."isexe-2.0.0" sources."joi-17.7.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" sources."json-buffer-3.0.1" - sources."json5-2.2.1" + sources."json5-2.2.3" sources."jsonfile-6.1.0" - sources."keyv-4.5.1" + sources."keyv-4.5.2" sources."kleur-3.0.3" - sources."latest-version-5.1.0" sources."lmdb-2.5.3" sources."locate-path-5.0.0" sources."lock-1.1.0" sources."lodash-4.17.21" sources."lowercase-keys-2.0.0" - sources."lru-cache-6.0.0" + sources."lru-cache-5.1.1" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -110330,17 +108981,16 @@ in sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" sources."ms-2.1.2" - sources."msgpackr-1.7.2" - sources."msgpackr-extract-2.1.2" + sources."msgpackr-1.8.2" + sources."msgpackr-extract-2.2.0" sources."mute-stream-0.0.8" sources."nice-try-1.0.5" sources."node-addon-api-4.3.0" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."node-gyp-build-optional-packages-5.0.3" sources."node-object-hash-2.3.10" - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" sources."nth-check-2.1.1" @@ -110355,28 +109005,6 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."lowercase-keys-2.0.0" - ]; - }) - sources."decompress-response-3.3.0" - sources."defer-to-connect-1.1.3" - sources."get-stream-5.2.0" - sources."got-9.6.0" - sources."json-buffer-3.0.0" - sources."keyv-3.1.0" - sources."lowercase-keys-1.0.1" - sources."normalize-url-4.5.1" - sources."p-cancelable-1.1.0" - sources."responselike-1.0.2" - sources."semver-6.3.0" - ]; - }) sources."parse-path-7.0.0" sources."parse-url-8.1.0" sources."path-exists-4.0.0" @@ -110384,27 +109012,18 @@ in sources."path-key-2.0.1" sources."peek-readable-4.1.0" sources."picocolors-1.0.0" - sources."prepend-http-2.0.0" sources."pretty-error-2.1.2" sources."progress-2.0.3" sources."prompts-2.4.2" sources."proper-lockfile-4.1.2" sources."protocols-2.0.1" sources."pump-3.0.0" - sources."pupa-2.1.1" sources."quick-lru-5.1.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) sources."read-1.0.7" sources."readable-stream-3.6.0" sources."readable-web-to-node-stream-3.0.2" - sources."redux-4.1.2" - sources."regenerator-runtime-0.13.10" - sources."registry-auth-token-4.2.2" - sources."registry-url-5.1.0" + sources."redux-4.2.0" + sources."regenerator-runtime-0.13.11" (sources."renderkid-2.0.7" // { dependencies = [ sources."strip-ansi-3.0.1" @@ -110424,10 +109043,10 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.8" - (sources."semver-diff-3.1.1" // { + (sources."semver-7.3.8" // { dependencies = [ - sources."semver-6.3.0" + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" ]; }) sources."set-blocking-2.0.0" @@ -110445,14 +109064,11 @@ in }) sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" - sources."strip-json-comments-2.0.1" 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.2.1" sources."tr46-0.0.3" sources."tslib-1.14.1" @@ -110461,8 +109077,6 @@ in sources."unique-string-2.0.0" sources."universalify-2.0.0" sources."update-browserslist-db-1.0.10" - sources."update-notifier-5.1.0" - sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."utila-0.4.0" sources."weak-lru-cache-1.2.2" @@ -110482,7 +109096,7 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."y18n-4.0.3" - sources."yallist-4.0.0" + sources."yallist-3.1.1" sources."yargs-15.4.1" (sources."yargs-parser-18.1.3" // { dependencies = [ @@ -110511,10 +109125,10 @@ in generator-code = nodeEnv.buildNodePackage { name = "generator-code"; packageName = "generator-code"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/generator-code/-/generator-code-1.7.1.tgz"; - sha512 = "I+xTH4f1EqKeK+El9RD5tRVPatbfH2AuMVYBKTW+Z0S/CzF0l2R+Glbp1ymNHRbyJe9qYUB0D/G7W/tE0FKcvQ=="; + url = "https://registry.npmjs.org/generator-code/-/generator-code-1.7.2.tgz"; + sha512 = "MWUDKWKtsYNT/eNZcFYoxHPatM4aAUFjSiI19RTOozd1tDiHBkIzWY28bRcE81eanJU3HQ8Djle5hDQG04K0hg=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -110536,13 +109150,17 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@npmcli/arborist-4.3.1" sources."@npmcli/fs-1.1.1" - sources."@npmcli/git-2.1.0" + (sources."@npmcli/git-2.1.0" // { + dependencies = [ + sources."which-2.0.2" + ]; + }) sources."@npmcli/installed-package-contents-1.0.7" (sources."@npmcli/map-workspaces-2.0.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-8.0.3" - sources."minimatch-5.1.0" + sources."glob-8.1.0" + sources."minimatch-5.1.6" ]; }) sources."@npmcli/metavuln-calculator-2.0.0" @@ -110569,7 +109187,7 @@ in sources."@types/minimatch-3.0.5" sources."@types/node-15.14.9" sources."@types/normalize-package-data-2.4.1" - sources."@types/vinyl-2.0.6" + sources."@types/vinyl-2.0.7" sources."abbrev-1.1.1" sources."agent-base-6.0.2" sources."agentkeepalive-4.2.1" @@ -110635,7 +109253,11 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.3" - sources."cross-spawn-7.0.3" + (sources."cross-spawn-7.0.3" // { + dependencies = [ + sources."which-2.0.2" + ]; + }) sources."dargs-7.0.0" sources."dateformat-4.6.3" sources."debug-4.3.4" @@ -110665,13 +109287,13 @@ in ]; }) sources."fast-glob-3.2.12" - sources."fast-plist-0.1.2" - sources."fastq-1.13.0" + sources."fast-plist-0.1.3" + sources."fastq-1.15.0" sources."figures-3.2.0" (sources."filelist-1.0.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" ]; }) sources."fill-range-7.0.1" @@ -110705,14 +109327,14 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-2.8.9" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."ignore-walk-4.0.1" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" @@ -110745,8 +109367,8 @@ in sources."json-parse-even-better-errors-2.3.1" sources."json-stringify-nice-1.1.4" sources."jsonparse-1.3.1" - sources."just-diff-5.1.1" - sources."just-diff-apply-5.4.1" + sources."just-diff-5.2.0" + sources."just-diff-apply-5.5.0" sources."lines-and-columns-1.2.4" (sources."load-yaml-file-0.2.0" // { dependencies = [ @@ -110760,14 +109382,14 @@ in sources."lru-cache-6.0.0" sources."make-fetch-happen-9.1.0" sources."mem-fs-2.2.1" - sources."mem-fs-editor-9.5.0" + sources."mem-fs-editor-9.6.0" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-3.3.5" + sources."minipass-3.3.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" @@ -110781,11 +109403,12 @@ in sources."multimatch-5.0.0" sources."mute-stream-0.0.8" sources."negotiator-0.6.3" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" (sources."node-gyp-8.4.1" // { dependencies = [ sources."are-we-there-yet-3.0.1" sources."npmlog-6.0.2" + sources."which-2.0.2" ]; }) sources."nopt-5.0.0" @@ -110812,7 +109435,7 @@ in sources."@tootallnate/once-2.0.0" sources."brace-expansion-2.0.1" sources."cacache-16.1.3" - sources."glob-8.0.3" + sources."glob-8.1.0" sources."http-proxy-agent-5.0.0" sources."lru-cache-7.14.1" (sources."make-fetch-happen-10.2.1" // { @@ -110820,7 +109443,7 @@ in sources."minipass-fetch-2.1.2" ]; }) - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" sources."socks-proxy-agent-7.0.0" sources."ssri-9.0.1" sources."unique-filename-2.0.1" @@ -110888,7 +109511,7 @@ in sources."rechoir-0.6.2" sources."remove-trailing-separator-1.1.0" sources."replace-ext-1.0.1" - sources."request-light-0.5.8" + sources."request-light-0.6.0" sources."resolve-1.22.1" sources."restore-cursor-3.1.0" sources."retry-0.12.0" @@ -110896,7 +109519,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.7" + sources."rxjs-7.8.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sanitize-filename-1.6.3" @@ -110928,7 +109551,11 @@ in sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."taketalk-1.0.0" - sources."tar-6.1.12" + (sources."tar-6.1.13" // { + dependencies = [ + sources."minipass-4.0.0" + ]; + }) sources."text-table-0.2.0" sources."textextensions-5.15.0" sources."through-2.3.8" @@ -110937,7 +109564,7 @@ in sources."tr46-0.0.3" sources."treeverse-1.0.4" sources."truncate-utf8-bytes-1.0.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-fest-0.8.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" @@ -110957,14 +109584,14 @@ in sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" - sources."which-2.0.2" + sources."which-3.0.0" sources."which-pm-2.0.0" sources."wide-align-1.1.5" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-4.0.2" sources."yallist-4.0.0" - (sources."yeoman-environment-3.12.1" // { + (sources."yeoman-environment-3.13.0" // { dependencies = [ sources."escape-string-regexp-4.0.0" sources."find-up-5.0.0" @@ -111034,7 +109661,7 @@ in sources."iconv-lite-0.6.3" sources."iterall-1.3.0" sources."minimist-1.2.7" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."safer-buffer-2.1.2" sources."supports-color-5.5.0" sources."tr46-0.0.3" @@ -111140,7 +109767,7 @@ in sources."multiserver-scopes-2.0.0" sources."muxrpc-6.7.3" sources."nearley-2.20.1" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."node-polyglot-1.0.0" sources."non-private-ip-2.2.0" sources."os-homedir-1.0.2" @@ -111182,7 +109809,7 @@ in sources."pull-pushable-2.2.0" sources."pull-reader-1.3.1" sources."pull-skip-footer-0.1.0" - sources."pull-stream-3.6.14" + sources."pull-stream-3.7.0" (sources."pull-through-1.0.18" // { dependencies = [ sources."looper-3.0.0" @@ -111298,21 +109925,21 @@ in "@gitbeaker/cli" = nodeEnv.buildNodePackage { name = "_at_gitbeaker_slash_cli"; packageName = "@gitbeaker/cli"; - version = "35.7.0"; + version = "35.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-35.7.0.tgz"; - sha512 = "j6j/Mnc17h1XWH1PrjUhX5GxrZGwtqZkzn5Nxm164Al23HO5JfieWJ7Pbg2/fPIT1IRovEzeWA893dkuDxjQmg=="; + url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-35.8.0.tgz"; + sha512 = "jXC7NjiBUdEzctTTmSMd9nFhuKAIch1jqN/gHXDu0QPLmqUDnEfNGtgRf6HbJXDzi469xEk7BUy0+KHpbGvz0g=="; }; dependencies = [ - sources."@gitbeaker/core-35.7.0" - sources."@gitbeaker/node-35.7.0" - sources."@gitbeaker/requester-utils-35.7.0" + sources."@gitbeaker/core-35.8.0" + sources."@gitbeaker/node-35.8.0" + sources."@gitbeaker/requester-utils-35.8.0" sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" - sources."@types/cacheable-request-6.0.2" + sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-4.2.0" - sources."@types/node-18.11.9" + sources."@types/keyv-3.1.4" + sources."@types/node-18.11.18" sources."@types/responselike-1.0.0" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" @@ -111331,7 +109958,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" (sources."decompress-response-6.0.0" // { dependencies = [ sources."mimic-response-3.1.0" @@ -111345,24 +109972,24 @@ in sources."filter-obj-1.1.0" sources."form-data-4.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" - sources."got-11.8.5" + sources."got-11.8.6" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.3" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" 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.3.0" sources."json-buffer-3.0.1" - sources."keyv-4.5.1" + sources."keyv-4.5.2" sources."li-1.3.0" (sources."log-symbols-5.1.0" // { dependencies = [ - sources."chalk-5.1.2" + sources."chalk-5.2.0" ]; }) sources."lowercase-keys-2.0.0" @@ -111372,18 +109999,18 @@ in sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."normalize-url-6.1.0" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."once-1.4.0" sources."onetime-5.1.2" (sources."ora-6.1.2" // { dependencies = [ - sources."chalk-5.1.2" + sources."chalk-5.2.0" ]; }) sources."p-cancelable-2.1.1" sources."pump-3.0.0" sources."qs-6.11.0" - sources."query-string-7.1.1" + sources."query-string-7.1.3" sources."quick-lru-5.1.1" sources."readable-stream-3.6.0" sources."resolve-alpn-1.2.1" @@ -111416,10 +110043,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "7.0.2"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-7.0.2.tgz"; - sha512 = "XgCPvEXeKAbe0w1M5cSvUVTDWjj6h/WKdLN9GQpqVVV6WkAtgMBrPuAEzZci99jZhnzdAwobMkWUv3KRSpgHbg=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-7.0.3.tgz"; + sha512 = "SXSREEuKbxiU/FAaCxvqSNCBeMKbOw0JoilOPb7DJ1hJZclbzD/OTPcFEJWkMgnIDFcWgEew1jS9yVDt3KKD5A=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -111431,7 +110058,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) - sources."@pnpm/network.ca-file-1.0.1" + sources."@pnpm/network.ca-file-1.0.2" sources."@pnpm/npm-conf-1.0.5" sources."@sindresorhus/is-5.3.0" sources."@szmarczak/http-timer-5.0.1" @@ -111439,10 +110066,10 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."ajv-formats-2.1.1" (sources."ansi-align-3.0.1" // { dependencies = [ @@ -111460,25 +110087,24 @@ in sources."atomically-1.7.0" sources."base64-js-1.5.1" sources."bl-5.1.0" - (sources."boxen-7.0.0" // { + (sources."boxen-7.0.1" // { dependencies = [ - sources."camelcase-7.0.0" sources."type-fest-2.19.0" ]; }) sources."buffer-6.0.3" sources."bytes-3.1.2" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.2" - sources."camelcase-6.3.0" - (sources."camelcase-keys-7.0.2" // { + sources."cacheable-request-10.2.5" + sources."camelcase-7.0.1" + (sources."camelcase-keys-8.0.2" // { dependencies = [ - sources."type-fest-1.4.0" + sources."type-fest-2.19.0" ]; }) - sources."chalk-5.1.2" + sources."chalk-5.2.0" sources."chardet-0.7.0" - sources."ci-info-3.5.0" + sources."ci-info-3.7.1" sources."cli-boxes-3.0.0" sources."cli-cursor-4.0.0" sources."cli-spinners-2.7.0" @@ -111500,10 +110126,10 @@ in sources."type-fest-1.4.0" ]; }) - sources."data-uri-to-buffer-4.0.0" + sources."data-uri-to-buffer-4.0.1" sources."debounce-fn-4.0.0" sources."debug-4.3.4" - sources."decamelize-5.0.1" + sources."decamelize-6.0.0" (sources."decamelize-keys-1.1.1" // { dependencies = [ sources."decamelize-1.2.0" @@ -111545,7 +110171,7 @@ in sources."figures-5.0.0" sources."file-uri-to-path-2.0.0" sources."find-up-3.0.0" - sources."form-data-encoder-2.1.3" + sources."form-data-encoder-2.1.4" sources."formdata-polyfill-4.0.10" sources."fs-extra-8.1.0" (sources."ftp-0.3.10" // { @@ -111562,18 +110188,26 @@ in sources."data-uri-to-buffer-3.0.1" ]; }) - sources."global-dirs-3.0.0" - sources."got-12.5.2" + sources."global-dirs-3.0.1" + sources."got-12.5.3" sources."graceful-fs-4.2.10" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-yarn-3.0.0" - sources."hosted-git-info-4.1.0" - sources."http-cache-semantics-4.1.0" + (sources."hosted-git-info-5.2.1" // { + dependencies = [ + sources."lru-cache-7.14.1" + ]; + }) + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" - sources."http2-wrapper-2.1.11" + (sources."http2-wrapper-2.2.0" // { + dependencies = [ + sources."quick-lru-5.1.1" + ]; + }) sources."https-proxy-agent-5.0.1" sources."human-signals-3.0.1" sources."iconv-lite-0.4.24" @@ -111599,7 +110233,7 @@ in sources."is-stream-3.0.0" sources."is-typedarray-1.0.0" sources."is-unicode-supported-1.3.0" - sources."is-yarn-global-0.4.0" + sources."is-yarn-global-0.4.1" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."js-tokens-4.0.0" @@ -111608,7 +110242,7 @@ in sources."json-schema-traverse-1.0.0" sources."json-schema-typed-7.0.3" sources."jsonfile-4.0.0" - sources."keyv-4.5.1" + sources."keyv-4.5.2" sources."kind-of-6.0.3" sources."latest-version-7.0.0" sources."levn-0.3.0" @@ -111623,11 +110257,7 @@ in sources."lowercase-keys-3.0.0" sources."lru-cache-6.0.0" sources."map-obj-4.3.0" - (sources."meow-10.1.5" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) + sources."meow-11.0.0" sources."merge-stream-2.0.0" sources."mimic-fn-3.1.0" sources."mimic-response-4.0.0" @@ -111638,9 +110268,9 @@ in sources."mute-stream-0.0.8" sources."netmask-2.0.2" sources."node-domexception-1.0.0" - sources."node-fetch-3.2.10" - sources."normalize-package-data-3.0.3" - sources."normalize-url-7.2.0" + sources."node-fetch-3.3.0" + sources."normalize-package-data-4.0.1" + sources."normalize-url-8.0.0" (sources."npm-run-path-5.1.0" // { dependencies = [ sources."path-key-4.0.0" @@ -111675,28 +110305,29 @@ in ]; }) sources."proxy-from-env-1.1.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."pupa-3.1.0" - sources."quick-lru-5.1.1" + sources."quick-lru-6.1.1" sources."raw-body-2.5.1" (sources."rc-1.2.8" // { dependencies = [ sources."ini-1.3.8" ]; }) - (sources."read-pkg-6.0.0" // { + (sources."read-pkg-7.1.0" // { dependencies = [ - sources."type-fest-1.4.0" + sources."hosted-git-info-4.1.0" + sources."normalize-package-data-3.0.3" + sources."type-fest-2.19.0" ]; }) - (sources."read-pkg-up-8.0.0" // { + (sources."read-pkg-up-9.1.0" // { dependencies = [ - sources."find-up-5.0.0" - sources."locate-path-6.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."path-exists-4.0.0" - sources."type-fest-1.4.0" + sources."find-up-6.3.0" + sources."locate-path-7.1.1" + sources."p-limit-4.0.0" + sources."p-locate-6.0.0" + sources."type-fest-2.19.0" ]; }) sources."readable-stream-3.6.0" @@ -111708,7 +110339,7 @@ in sources."responselike-3.0.0" sources."restore-cursor-4.0.0" sources."run-async-2.4.1" - sources."rxjs-7.5.7" + sources."rxjs-7.8.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.8" @@ -111741,9 +110372,9 @@ in sources."tmp-0.0.33" sources."toidentifier-1.0.1" sources."trim-newlines-4.0.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-check-0.3.2" - sources."type-fest-3.2.0" + sources."type-fest-3.5.3" sources."typedarray-to-buffer-3.1.5" sources."unique-string-3.0.0" sources."universalify-0.1.2" @@ -111753,19 +110384,19 @@ in sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."validator-13.7.0" - sources."vm2-3.9.11" + sources."vm2-3.9.13" sources."wcwidth-1.0.1" sources."web-streams-polyfill-3.2.1" sources."which-2.0.2" sources."widest-line-4.0.1" sources."word-wrap-1.2.3" - sources."wrap-ansi-8.0.1" + sources."wrap-ansi-8.1.0" sources."write-file-atomic-3.0.3" sources."xdg-basedir-5.1.0" sources."xregexp-2.0.0" sources."yallist-4.0.0" - sources."yargs-parser-20.2.9" - sources."yocto-queue-0.1.0" + sources."yargs-parser-21.1.1" + sources."yocto-queue-1.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -111780,10 +110411,10 @@ in glob = nodeEnv.buildNodePackage { name = "glob"; packageName = "glob"; - version = "8.0.3"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz"; - sha512 = "ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ=="; + url = "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz"; + sha512 = "r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ=="; }; dependencies = [ sources."balanced-match-1.0.2" @@ -111791,7 +110422,7 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" sources."once-1.4.0" sources."wrappy-1.0.2" ]; @@ -111834,7 +110465,7 @@ in sources."concat-map-0.0.1" sources."core-util-is-1.0.3" sources."debug-3.2.7" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."decompress-4.2.1" sources."decompress-tar-4.1.1" (sources."decompress-tarbz2-4.1.1" // { @@ -111894,7 +110525,7 @@ in sources."minimist-1.2.7" sources."mkdirp-0.5.6" sources."ms-2.1.3" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."object-assign-4.1.1" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -111910,7 +110541,7 @@ in sources."kleur-3.0.3" ]; }) - sources."query-string-7.1.1" + sources."query-string-7.1.3" (sources."readable-stream-2.3.7" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -111988,7 +110619,7 @@ in sources."iconv-lite-0.6.3" sources."idb-keyval-6.2.0" sources."inversify-6.0.1" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."reflect-metadata-0.1.13" sources."safari-14-idb-fix-3.0.0" sources."safer-buffer-2.1.2" @@ -111996,7 +110627,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.7" + sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-languageserver-types-3.16.0" sources."web-tree-sitter-0.20.5" sources."webidl-conversions-3.0.1" @@ -112087,10 +110718,10 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/import-6.7.10" // { + (sources."@graphql-tools/import-6.7.15" // { dependencies = [ - sources."@graphql-tools/utils-9.0.1" - sources."tslib-2.4.1" + sources."@graphql-tools/utils-9.1.4" + sources."tslib-2.5.0" ]; }) (sources."@graphql-tools/json-file-loader-6.2.6" // { @@ -112102,7 +110733,7 @@ in }) (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) ]; @@ -112118,7 +110749,7 @@ in dependencies = [ sources."@graphql-tools/merge-8.3.1" sources."@graphql-tools/utils-8.9.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@graphql-tools/url-loader-6.10.1" // { @@ -112148,7 +110779,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-18.11.9" + sources."@types/node-18.11.18" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -112169,7 +110800,7 @@ in sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.5" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."backo2-1.0.2" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -112231,7 +110862,7 @@ in sources."dataloader-2.0.0" sources."debug-4.3.4" sources."decompress-response-3.3.0" - sources."deep-equal-2.1.0" + sources."deep-equal-2.2.0" sources."deep-extend-0.6.0" sources."defaults-1.0.4" sources."defer-to-connect-1.1.3" @@ -112243,7 +110874,7 @@ in sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-get-iterator-1.1.2" + sources."es-get-iterator-1.1.3" sources."es6-promise-3.3.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -112263,7 +110894,7 @@ in sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.1.1" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."figlet-1.5.0" sources."figures-3.2.0" sources."fill-range-7.0.1" @@ -112279,7 +110910,7 @@ in sources."function-bind-1.1.1" sources."functions-have-names-1.2.3" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -112310,12 +110941,12 @@ in sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-signature-1.2.0" sources."http2-client-1.3.5" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" (sources."import-fresh-3.3.0" // { dependencies = [ sources."resolve-from-4.0.0" @@ -112336,7 +110967,9 @@ in sources."strip-ansi-6.0.1" ]; }) + sources."internal-slot-1.0.4" sources."is-arguments-1.1.1" + sources."is-array-buffer-3.0.1" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" @@ -112353,6 +110986,7 @@ in sources."is-promise-4.0.0" sources."is-regex-1.1.4" sources."is-set-2.0.2" + sources."is-shared-array-buffer-1.0.2" sources."is-stream-1.1.0" sources."is-string-1.0.7" sources."is-symbol-1.0.4" @@ -112400,7 +111034,7 @@ in }) (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."lowercase-keys-1.0.1" @@ -112419,7 +111053,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-3.3.5" + sources."minipass-3.3.6" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" @@ -112427,13 +111061,13 @@ in sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."node-emoji-1.10.0" sources."node-fetch-2.6.1" sources."node-fetch-h2-2.3.0" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."node-readfiles-0.2.0" sources."normalize-path-2.1.1" sources."normalize-url-4.5.1" @@ -112448,7 +111082,7 @@ in sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.8" sources."oauth-sign-0.9.0" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.4" @@ -112486,7 +111120,7 @@ in sources."parse-json-5.2.0" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."passwd-user-3.0.0" @@ -112499,7 +111133,7 @@ in sources."prepend-http-2.0.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."queue-microtask-1.2.3" sources."rc-1.2.8" @@ -112539,6 +111173,7 @@ in sources."slash-3.0.0" sources."sprintf-js-1.0.3" sources."sshpk-1.17.0" + sources."stop-iteration-iterator-1.0.0" sources."string-env-interpolation-1.0.1" (sources."string-width-4.2.3" // { dependencies = [ @@ -112616,10 +111251,10 @@ in graphql-language-service-cli = nodeEnv.buildNodePackage { name = "graphql-language-service-cli"; packageName = "graphql-language-service-cli"; - version = "3.3.11"; + version = "3.3.15"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.3.11.tgz"; - sha512 = "slmNNw6eENqjm9Jd3e2EJg7xQYxriO1hz37N1a++k+exyKv81aKLkwIVV8YxjCDbFzh6pbuqUs/6j2R4cyC+zA=="; + url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.3.15.tgz"; + sha512 = "YIWyxOxvrvcXb+IzkmMEtH22Uor4SKGl6E27xaMS2IkVpZtaEgwXeN7kEPFVeSn6I3fCahdMVtfz70IL4tWGxw=="; }; dependencies = [ sources."@ardatan/sync-fetch-0.0.1" @@ -112627,41 +111262,48 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.2" + sources."@babel/parser-7.20.13" sources."@babel/polyfill-7.12.1" - sources."@babel/types-7.20.2" + sources."@babel/types-7.20.7" sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" - sources."@graphql-tools/batch-execute-8.5.10" - sources."@graphql-tools/delegate-9.0.14" - sources."@graphql-tools/executor-0.0.6" - sources."@graphql-tools/graphql-file-loader-7.5.9" - sources."@graphql-tools/import-6.7.10" - sources."@graphql-tools/json-file-loader-7.4.10" - sources."@graphql-tools/load-7.8.4" - sources."@graphql-tools/merge-8.3.10" - sources."@graphql-tools/schema-9.0.8" - sources."@graphql-tools/url-loader-7.16.11" - sources."@graphql-tools/utils-9.0.1" - sources."@graphql-tools/wrap-9.2.10" + sources."@graphql-tools/batch-execute-8.5.15" + (sources."@graphql-tools/delegate-9.0.23" // { + dependencies = [ + sources."tslib-2.4.1" + ]; + }) + sources."@graphql-tools/executor-0.0.12" + sources."@graphql-tools/executor-graphql-ws-0.0.7" + sources."@graphql-tools/executor-http-0.1.1" + sources."@graphql-tools/executor-legacy-ws-0.0.6" + sources."@graphql-tools/graphql-file-loader-7.5.14" + sources."@graphql-tools/import-6.7.15" + sources."@graphql-tools/json-file-loader-7.4.15" + sources."@graphql-tools/load-7.8.10" + sources."@graphql-tools/merge-8.3.16" + sources."@graphql-tools/schema-9.0.14" + sources."@graphql-tools/url-loader-7.17.4" + sources."@graphql-tools/utils-9.1.4" + sources."@graphql-tools/wrap-9.3.2" sources."@graphql-typed-document-node/core-3.1.1" sources."@iarna/toml-2.2.5" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@peculiar/asn1-schema-2.3.0" + sources."@peculiar/asn1-schema-2.3.3" sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.4.1" sources."@repeaterjs/repeater-3.0.4" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/parse-json-4.0.0" - sources."@types/ws-8.5.3" - sources."@vue/compiler-core-3.2.41" - sources."@vue/compiler-dom-3.2.41" - sources."@vue/compiler-sfc-3.2.41" - sources."@vue/compiler-ssr-3.2.41" - sources."@vue/reactivity-transform-3.2.41" - sources."@vue/shared-3.2.41" - sources."@whatwg-node/fetch-0.5.1" + sources."@types/ws-8.5.4" + sources."@vue/compiler-core-3.2.45" + sources."@vue/compiler-dom-3.2.45" + sources."@vue/compiler-sfc-3.2.45" + sources."@vue/compiler-ssr-3.2.45" + sources."@vue/reactivity-transform-3.2.45" + sources."@vue/shared-3.2.45" + sources."@whatwg-node/fetch-0.6.2" sources."abort-controller-3.0.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -112698,7 +111340,7 @@ in sources."event-target-shim-5.0.1" sources."extract-files-11.0.0" sources."fast-glob-3.2.12" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."form-data-encoder-1.7.2" (sources."formdata-node-4.4.1" // { @@ -112718,12 +111360,12 @@ in sources."minimatch-4.2.1" ]; }) - sources."graphql-language-service-5.1.0" - sources."graphql-language-service-server-2.9.2" + sources."graphql-language-service-5.1.1" + sources."graphql-language-service-server-2.9.5" sources."graphql-ws-5.11.2" sources."has-flag-3.0.0" sources."iconv-lite-0.6.3" - sources."ignore-5.2.0" + sources."ignore-5.2.4" (sources."import-fresh-3.3.0" // { dependencies = [ sources."resolve-from-4.0.0" @@ -112749,10 +111391,10 @@ in sources."minimatch-3.1.2" sources."mkdirp-1.0.4" sources."nanoid-3.3.4" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."node-domexception-1.0.0" - sources."node-fetch-2.6.7" - sources."node-gyp-build-4.5.0" + sources."node-fetch-2.6.8" + sources."node-gyp-build-4.6.0" sources."normalize-path-2.1.1" sources."nullthrows-1.1.1" sources."once-1.4.0" @@ -112763,11 +111405,11 @@ in sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."postcss-8.4.18" + sources."postcss-8.4.21" sources."pvtsutils-1.3.2" sources."pvutils-1.1.3" sources."queue-microtask-1.2.3" - sources."regenerator-runtime-0.13.10" + sources."regenerator-runtime-0.13.11" sources."remove-trailing-separator-1.1.0" sources."require-directory-2.1.1" sources."resolve-from-5.0.0" @@ -112788,17 +111430,18 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."ts-node-9.1.1" - sources."tslib-2.4.1" - sources."typescript-4.8.4" - sources."undici-5.12.0" + sources."tslib-2.5.0" + sources."typescript-4.9.4" + sources."undici-5.16.0" sources."unixify-1.0.0" - sources."utf-8-validate-5.0.10" - sources."value-or-promise-1.0.11" + sources."urlpattern-polyfill-6.0.2" + sources."utf-8-validate-6.0.2" + sources."value-or-promise-1.0.12" sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" sources."vscode-languageserver-protocol-3.17.2" sources."vscode-languageserver-types-3.17.2" - sources."vscode-uri-3.0.6" + sources."vscode-uri-3.0.7" sources."web-streams-polyfill-3.2.1" sources."webcrypto-core-1.7.5" sources."webidl-conversions-3.0.1" @@ -112811,7 +111454,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-8.11.0" + sources."ws-8.12.0" sources."y18n-5.0.8" sources."yaml-1.10.2" sources."yargs-16.2.0" @@ -112854,64 +111497,40 @@ in }) sources."@cronvel/get-pixels-3.4.1" sources."@cspotcode/source-map-support-0.8.1" - (sources."@graphql-tools/batch-execute-8.5.10" // { + sources."@graphql-tools/batch-execute-8.5.15" + (sources."@graphql-tools/delegate-9.0.23" // { dependencies = [ - sources."@graphql-tools/utils-9.0.1" + sources."tslib-2.4.1" ]; }) - (sources."@graphql-tools/delegate-9.0.14" // { + sources."@graphql-tools/executor-0.0.12" + (sources."@graphql-tools/executor-graphql-ws-0.0.7" // { dependencies = [ - sources."@graphql-tools/utils-9.0.1" - ]; - }) - (sources."@graphql-tools/executor-0.0.6" // { - dependencies = [ - sources."@graphql-tools/utils-9.0.1" - ]; - }) - (sources."@graphql-tools/graphql-file-loader-7.5.9" // { - dependencies = [ - sources."@graphql-tools/utils-9.0.1" - ]; - }) - (sources."@graphql-tools/import-6.7.10" // { - dependencies = [ - sources."@graphql-tools/utils-9.0.1" - ]; - }) - (sources."@graphql-tools/json-file-loader-7.4.10" // { - dependencies = [ - sources."@graphql-tools/utils-9.0.1" - ]; - }) - (sources."@graphql-tools/load-7.8.4" // { - dependencies = [ - sources."@graphql-tools/utils-9.0.1" - ]; - }) - (sources."@graphql-tools/merge-8.3.10" // { - dependencies = [ - sources."@graphql-tools/utils-9.0.1" - ]; - }) - (sources."@graphql-tools/schema-9.0.8" // { - dependencies = [ - sources."@graphql-tools/utils-9.0.1" - ]; - }) - (sources."@graphql-tools/url-loader-7.16.11" // { - dependencies = [ - sources."@graphql-tools/utils-9.0.1" sources."isomorphic-ws-5.0.0" - sources."ws-8.11.0" + sources."ws-8.12.0" ]; }) - sources."@graphql-tools/utils-8.13.1" - (sources."@graphql-tools/wrap-9.2.10" // { + sources."@graphql-tools/executor-http-0.1.1" + (sources."@graphql-tools/executor-legacy-ws-0.0.6" // { dependencies = [ - sources."@graphql-tools/utils-9.0.1" + sources."isomorphic-ws-5.0.0" + sources."ws-8.12.0" ]; }) + sources."@graphql-tools/graphql-file-loader-7.5.14" + sources."@graphql-tools/import-6.7.15" + sources."@graphql-tools/json-file-loader-7.4.15" + sources."@graphql-tools/load-7.8.10" + sources."@graphql-tools/merge-8.3.16" + sources."@graphql-tools/schema-9.0.14" + (sources."@graphql-tools/url-loader-7.17.4" // { + dependencies = [ + sources."isomorphic-ws-5.0.0" + sources."ws-8.12.0" + ]; + }) + sources."@graphql-tools/utils-9.1.4" + sources."@graphql-tools/wrap-9.3.2" sources."@graphql-typed-document-node/core-3.1.1" sources."@iarna/toml-2.2.5" sources."@jridgewell/resolve-uri-3.1.0" @@ -112924,7 +111543,7 @@ in sources."@oclif/config-1.17.0" sources."@oclif/errors-1.3.4" sources."@oclif/linewrap-1.0.0" - (sources."@oclif/parser-3.8.9" // { + (sources."@oclif/parser-3.8.10" // { dependencies = [ sources."@oclif/errors-1.3.6" ]; @@ -112949,40 +111568,40 @@ in ]; }) sources."@oclif/screen-1.0.4" - sources."@peculiar/asn1-schema-2.3.0" + sources."@peculiar/asn1-schema-2.3.3" sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.4.1" sources."@repeaterjs/repeater-3.0.4" - sources."@swc/core-1.3.14" - sources."@swc/core-darwin-arm64-1.3.14" - sources."@swc/core-darwin-x64-1.3.14" - sources."@swc/core-linux-arm-gnueabihf-1.3.14" - sources."@swc/core-linux-arm64-gnu-1.3.14" - sources."@swc/core-linux-arm64-musl-1.3.14" - sources."@swc/core-linux-x64-gnu-1.3.14" - sources."@swc/core-linux-x64-musl-1.3.14" - sources."@swc/core-win32-arm64-msvc-1.3.14" - sources."@swc/core-win32-ia32-msvc-1.3.14" - sources."@swc/core-win32-x64-msvc-1.3.14" - sources."@swc/wasm-1.3.14" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" sources."@types/json-schema-7.0.9" - sources."@types/node-18.11.9" - sources."@types/parse-json-4.0.0" - sources."@types/ws-8.5.3" - sources."@whatwg-node/fetch-0.5.1" + sources."@types/node-18.11.18" + sources."@types/ws-8.5.4" + sources."@whatwg-node/fetch-0.6.2" sources."abort-controller-3.0.0" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ansicolors-0.3.2" sources."arg-4.1.3" + sources."argparse-2.0.1" sources."array-flatten-1.1.1" sources."array-union-2.1.0" sources."asn1js-3.0.5" @@ -113031,9 +111650,9 @@ in sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."cosmiconfig-7.0.1" + sources."cosmiconfig-8.0.0" sources."cosmiconfig-toml-loader-1.0.0" - sources."cosmiconfig-typescript-loader-4.2.0" + sources."cosmiconfig-typescript-loader-4.3.0" sources."create-require-1.1.1" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -113072,7 +111691,7 @@ in sources."extract-files-11.0.0" sources."extract-stack-1.0.0" sources."fast-glob-3.2.12" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" (sources."finalhandler-1.1.1" // { dependencies = [ @@ -113093,7 +111712,7 @@ in sources."globby-11.1.0" sources."graceful-fs-4.2.10" sources."graphql-15.4.0" - sources."graphql-config-4.3.6" + sources."graphql-config-4.4.0" (sources."graphql-language-service-interface-2.10.2" // { dependencies = [ sources."graphql-16.6.0" @@ -113116,7 +111735,7 @@ in sources."http-errors-1.6.3" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.19" - sources."ignore-5.2.0" + sources."ignore-5.2.4" (sources."import-fresh-3.3.0" // { dependencies = [ sources."resolve-from-4.0.0" @@ -113140,6 +111759,7 @@ in sources."iterall-1.3.0" sources."jpeg-js-0.4.4" sources."js-tokens-4.0.0" + sources."js-yaml-4.1.0" sources."json-parse-even-better-errors-2.3.1" sources."jsonfile-4.0.0" sources."lazyness-1.2.0" @@ -113168,8 +111788,8 @@ in sources."nice-try-1.0.5" sources."node-bitmap-0.0.1" sources."node-domexception-1.0.0" - sources."node-fetch-2.6.7" - sources."node-gyp-build-4.5.0" + sources."node-fetch-2.6.8" + sources."node-gyp-build-4.6.0" sources."normalize-path-2.1.1" sources."nullthrows-1.1.1" sources."omggif-1.0.10" @@ -113248,18 +111868,19 @@ in sources."tree-kit-0.7.4" sources."treeify-1.1.0" sources."ts-node-10.9.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-is-1.6.18" - sources."typescript-4.8.4" - sources."undici-5.12.0" + sources."typescript-4.9.4" + sources."undici-5.16.0" sources."uniq-1.0.1" sources."universalify-0.1.2" sources."unixify-1.0.0" sources."unpipe-1.0.0" - sources."utf-8-validate-5.0.10" + sources."urlpattern-polyfill-6.0.2" + sources."utf-8-validate-6.0.2" sources."utils-merge-1.0.1" sources."v8-compile-cache-lib-3.0.1" - sources."value-or-promise-1.0.11" + sources."value-or-promise-1.0.12" sources."vary-1.1.2" sources."vscode-languageserver-types-3.17.2" sources."web-streams-polyfill-3.2.1" @@ -113270,9 +111891,12 @@ in sources."which-1.3.1" sources."widest-line-3.1.0" sources."wrap-ansi-7.0.0" - sources."ws-7.4.2" + (sources."ws-7.4.2" // { + dependencies = [ + sources."utf-8-validate-5.0.10" + ]; + }) sources."yallist-4.0.0" - sources."yaml-1.10.2" sources."yn-3.1.1" sources."yocto-queue-0.1.0" ]; @@ -113413,7 +112037,7 @@ in sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."has-1.0.3" sources."has-symbols-1.0.3" sources."http-errors-2.0.0" @@ -113429,7 +112053,7 @@ in sources."minimist-1.2.7" sources."ms-2.0.0" sources."negotiator-0.6.3" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."on-finished-2.4.1" sources."options-0.0.6" sources."parseurl-1.3.3" @@ -113555,10 +112179,10 @@ in sources."isarray-0.0.1" sources."lodash-4.17.21" sources."map-canvas-0.1.5" - sources."marked-4.2.2" + sources."marked-4.2.12" (sources."marked-terminal-5.1.1" // { dependencies = [ - sources."chalk-5.1.2" + sources."chalk-5.2.0" ]; }) sources."memory-streams-0.1.3" @@ -113586,7 +112210,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.12.13" + sources."systeminformation-5.17.4" sources."term-canvas-0.0.5" sources."type-fest-1.4.0" sources."wordwrap-0.0.3" @@ -113649,7 +112273,7 @@ in sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" sources."async-done-1.3.2" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."async-settle-1.0.0" sources."atob-2.1.2" sources."bach-1.2.0" @@ -113713,7 +112337,7 @@ in sources."d-1.0.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" (sources."default-compare-1.0.0" // { dependencies = [ sources."kind-of-5.1.0" @@ -113788,7 +112412,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-value-2.0.6" sources."glob-7.2.3" (sources."glob-parent-3.1.0" // { @@ -114137,7 +112761,7 @@ in sources."d-1.0.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."default-compare-1.0.0" sources."define-properties-1.1.4" sources."define-property-2.0.2" @@ -114199,7 +112823,7 @@ in sources."fragment-cache-0.2.1" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-value-2.0.6" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" @@ -114515,7 +113139,7 @@ in sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-9.4.1" + sources."commander-9.5.0" sources."concat-map-0.0.1" sources."encoding-0.1.13" sources."fs.realpath-1.0.0" @@ -114527,7 +113151,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."minimatch-3.1.2" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."safer-buffer-2.1.2" @@ -114570,7 +113194,7 @@ in sources."eventemitter3-4.0.7" sources."follow-redirects-1.15.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.3" @@ -114583,7 +113207,7 @@ in sources."minimist-1.2.7" sources."mkdirp-0.5.6" sources."ms-2.1.3" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."opener-1.5.2" sources."portfinder-1.0.32" sources."qs-6.11.0" @@ -114610,27 +113234,39 @@ in hsd = nodeEnv.buildNodePackage { name = "hsd"; packageName = "hsd"; - version = "4.0.1"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/hsd/-/hsd-4.0.1.tgz"; - sha512 = "5kb4Cp3/XjrFLmUZxl0tQxqVfmFxfrfys1sT9jmUK/Aq/tw+6/GkRGJjgrdTuzRL48zLrczOwL7/Q2e3Ufg2vA=="; + url = "https://registry.npmjs.org/hsd/-/hsd-5.0.1.tgz"; + sha512 = "G+4iLhKHEEOHYbk/VEvkVO4oNn1rVlH8N3LdsbH+sYZQo8qJTVP5Zwtz1pMa4vWLzA3mjrFSGG3nBFYoIJHpMQ=="; }; dependencies = [ sources."bcfg-0.1.7" - sources."bcrypto-5.4.0" + (sources."bcrypto-5.4.0" // { + dependencies = [ + sources."bufio-1.0.7" + ]; + }) sources."bcurl-0.2.0" sources."bdb-1.4.0" sources."bdns-0.1.5" sources."bevent-0.1.5" sources."bfile-0.2.2" - sources."bfilter-1.0.5" + (sources."bfilter-1.0.5" // { + dependencies = [ + sources."bufio-1.0.7" + ]; + }) sources."bheep-0.1.5" sources."binet-0.3.7" sources."blgr-0.2.0" sources."blru-0.1.6" sources."blst-0.1.5" sources."bmutex-0.1.6" - sources."bns-0.15.0" + (sources."bns-0.15.0" // { + dependencies = [ + sources."bufio-1.0.7" + ]; + }) sources."brq-0.1.8" sources."bs32-0.1.6" sources."bsert-0.0.10" @@ -114639,17 +113275,17 @@ in sources."btcp-0.1.5" sources."budp-0.1.6" sources."buffer-map-0.0.7" - sources."bufio-1.0.7" + sources."bufio-1.2.0" sources."bupnp-0.2.6" - sources."bval-0.1.6" - sources."bweb-0.1.10" + sources."bval-0.1.7" + sources."bweb-0.1.12" sources."goosig-0.10.0" - sources."hs-client-0.0.11" + sources."hs-client-0.0.13" sources."loady-0.0.5" sources."mrmr-0.1.10" sources."n64-0.2.10" sources."unbound-0.4.3" - sources."urkel-1.0.2" + sources."urkel-1.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -114691,10 +113327,10 @@ in hs-client = nodeEnv.buildNodePackage { name = "hs-client"; packageName = "hs-client"; - version = "0.0.11"; + version = "0.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/hs-client/-/hs-client-0.0.11.tgz"; - sha512 = "DunENysXNxADDs6YvTjIgFG38U+mGnlDpfEhUzHOAOnkHyYwAIm0PwYJEmJqsbLnpY31xg0lPfRV8t+Ugz+Dew=="; + url = "https://registry.npmjs.org/hs-client/-/hs-client-0.0.13.tgz"; + sha512 = "3Vm/4S0TDstbOW+OfdTeP2EQ4dolPNqMulTSr31RihwX8cX1DyT4il1Fc9STXXToXTsZuFro2WD/+1m0MWi5Ag=="; }; dependencies = [ sources."bcfg-0.1.7" @@ -114756,7 +113392,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."process-0.11.10" - sources."readable-stream-4.2.0" + sources."readable-stream-4.3.0" sources."sprintf-js-1.0.3" sources."tabula-1.10.0" sources."verror-1.10.1" @@ -114785,7 +113421,7 @@ in 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.33" + sources."@types/node-14.18.36" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -114795,9 +113431,9 @@ in sources."async-2.6.4" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1248.0" + sources."aws-sdk-2.1304.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."bluebird-3.7.2" @@ -114845,7 +113481,7 @@ in sources."form-data-2.3.3" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."getpass-0.1.7" sources."gopd-1.0.1" sources."har-schema-2.0.0" @@ -114909,13 +113545,13 @@ in sources."lodash.reject-4.6.0" sources."lodash.some-4.6.0" sources."lodash.uniq-4.5.0" - sources."marked-4.2.2" + sources."marked-4.2.12" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimist-1.2.7" sources."mkdirp-0.5.6" sources."moment-2.29.4" - sources."moment-timezone-0.5.38" + sources."moment-timezone-0.5.40" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."named-regexp-0.1.1" @@ -114960,7 +113596,7 @@ in sources."strip-ansi-6.0.1" (sources."tough-cookie-2.5.0" // { dependencies = [ - sources."punycode-2.1.1" + sources."punycode-2.3.0" ]; }) sources."tunnel-agent-0.6.0" @@ -114969,7 +113605,7 @@ in sources."underscore-1.12.1" (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.1.1" + sources."punycode-2.3.0" ]; }) sources."url-0.10.3" @@ -114978,9 +113614,8 @@ in sources."uuid-8.0.0" sources."verror-1.10.1" sources."which-typed-array-1.1.9" - (sources."winston-2.4.6" // { + (sources."winston-2.4.7" // { dependencies = [ - sources."async-3.2.4" sources."colors-1.0.3" ]; }) @@ -115016,11 +113651,11 @@ in dependencies = [ sources."jmp-2.0.0" sources."jp-kernel-2.0.0" - sources."nan-2.14.2" + sources."nan-2.17.0" sources."nel-1.3.0" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."uuid-3.4.0" - sources."zeromq-5.2.8" + sources."zeromq-5.3.1" ]; buildInputs = globalBuildInputs; meta = { @@ -115052,7 +113687,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."bcrypt-pbkdf-1.0.2" sources."boolbase-1.0.0" sources."camelcase-1.2.1" @@ -115184,7 +113819,7 @@ in sources."process-nextick-args-2.0.1" sources."promise-7.3.1" sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."q-1.5.1" sources."qs-6.5.3" sources."rc-1.2.8" @@ -115318,10 +113953,10 @@ in immich = nodeEnv.buildNodePackage { name = "immich"; packageName = "immich"; - version = "0.24.0"; + version = "0.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/immich/-/immich-0.24.0.tgz"; - sha512 = "ajDbwecJ46/7PzYPjWu49a7qmcskbIBMTB9Oufpb6r0LTbm7wImahFAENZlB+c1gjNdjguW2L9a85IKuamREvQ=="; + url = "https://registry.npmjs.org/immich/-/immich-0.30.0.tgz"; + sha512 = "G+Kv+tYTruxAkUL4sZet51Bee4foJS7zl2igAn80S4nZEb0ATiiQhnzaMDO6zBOfxxtsaU/CD7tlrsRI8nvHIw=="; }; dependencies = [ sources."@ffprobe-installer/darwin-arm64-5.0.1" @@ -115342,7 +113977,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.8" - sources."commander-9.4.1" + sources."commander-9.5.0" sources."cross-spawn-7.0.3" sources."delayed-stream-1.0.0" sources."duplexify-4.1.2" @@ -115385,7 +114020,7 @@ in sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."supports-color-5.5.0" - sources."systeminformation-5.12.13" + sources."systeminformation-5.17.4" sources."util-deprecate-1.0.2" sources."which-2.0.2" sources."wrappy-1.0.2" @@ -115415,7 +114050,7 @@ in sources."commander-2.11.0" sources."encoding-0.1.13" sources."iconv-lite-0.6.3" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."source-map-0.7.4" @@ -115437,56 +114072,42 @@ in insect = nodeEnv.buildNodePackage { name = "insect"; packageName = "insect"; - version = "5.7.0"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/insect/-/insect-5.7.0.tgz"; - sha512 = "rm3APOoPrf7J66Bo7bHOn0c/k/STonQ+KSdyLid9NQvSM+LTpeL9X8RnOZ3NRlz01/MgXqQ0CGAGh60kSB9Xlw=="; + url = "https://registry.npmjs.org/insect/-/insect-5.8.0.tgz"; + sha512 = "dOu/+glVyQwPh7myO5ClPykijxCdSrsFAX4bOSqvrYiI9puBZ+5U8ljTc+al4KaUrhaI0QdanzYkqL8jzS5sIw=="; }; dependencies = [ sources."@jcubic/lily-0.3.0" - sources."@types/jquery-3.5.14" + sources."@types/jquery-3.5.16" sources."@types/sizzle-2.3.3" sources."ansidec-0.3.4" sources."arch-2.2.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" sources."clipboardy-2.3.0" sources."clone-1.0.4" - sources."concat-map-0.0.1" sources."cross-spawn-6.0.5" - sources."decimal.js-7.5.1" + sources."decimal.js-10.4.3" sources."defaults-1.0.4" sources."end-of-stream-1.4.4" sources."execa-1.0.0" - sources."fs-extra-0.24.0" - sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."get-stream-4.1.0" - sources."glob-7.2.3" - sources."graceful-fs-4.2.10" - sources."historic-readline-1.0.8" sources."iconv-lite-0.6.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" sources."is-docker-2.2.1" sources."is-stream-1.1.0" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."jquery-3.6.1" - sources."jquery.terminal-2.34.0" - sources."jsonfile-2.4.0" + sources."jquery-3.6.3" + sources."jquery.terminal-2.35.2" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" - sources."minimatch-3.1.2" sources."nice-try-1.0.5" sources."npm-run-path-2.0.2" sources."once-1.4.0" sources."p-finally-1.0.0" - sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."prismjs-1.29.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" @@ -115511,26 +114132,34 @@ in intelephense = nodeEnv.buildNodePackage { name = "intelephense"; packageName = "intelephense"; - version = "1.8.2"; + version = "1.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/intelephense/-/intelephense-1.8.2.tgz"; - sha512 = "u7n8UdvFlZcE8LpGDPpc2miBD0zOd9fBMKajeF04KkVCOX7s6Ua+qK9r+zvQBjQT53O7p9XGSEVAUvB4q98b5w=="; + url = "https://registry.npmjs.org/intelephense/-/intelephense-1.9.4.tgz"; + sha512 = "iRYwXogGCu9NxWHN5UYqaKeAd9u+MDC8Mhvrwt+stRluSYWjyFqwQGVSuPStW0P8pFgSZ80mOthlA933wKRGKA=="; }; dependencies = [ - sources."@bmewburn/js-beautify-1.13.0" - sources."@bmewburn/minidom-1.0.1" - sources."@bmewburn/turndown-5.0.3" - sources."@bmewburn/turndown-plugin-gfm-1.0.2" - (sources."@bmewburn/vscode-html-languageserver-1.3.0" // { + sources."@azure/abort-controller-1.1.0" + sources."@azure/core-auth-1.4.0" + sources."@azure/core-http-2.3.1" + sources."@azure/core-tracing-1.0.0-preview.13" + sources."@azure/core-util-1.1.1" + sources."@azure/logger-1.0.3" + sources."@bmewburn/js-beautify-1.14.7" + sources."@bmewburn/vscode-html-languageserver-1.9.0" + (sources."@mapbox/node-pre-gyp-1.0.10" // { dependencies = [ - sources."vscode-languageserver-7.0.0" - sources."vscode-languageserver-types-3.16.0" - sources."vscode-uri-2.1.2" + sources."nopt-5.0.0" ]; }) + sources."@microsoft/applicationinsights-web-snippet-1.0.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" + sources."@opentelemetry/api-1.4.0" + sources."@opentelemetry/core-1.9.0" + sources."@opentelemetry/resources-1.9.0" + sources."@opentelemetry/sdk-trace-base-1.9.0" + sources."@opentelemetry/semantic-conventions-1.9.0" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -115541,12 +114170,23 @@ 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.2" - sources."@types/node-13.13.52" + sources."@selderee/plugin-htmlparser2-0.10.0" + sources."@types/node-18.11.18" + (sources."@types/node-fetch-2.6.2" // { + dependencies = [ + sources."form-data-3.0.1" + ]; + }) + sources."@types/tunnel-0.0.3" + sources."@vscode/l10n-0.0.11" sources."abbrev-1.1.1" + sources."agent-base-6.0.2" sources."ajv-6.12.6" - sources."applicationinsights-1.8.10" + sources."ansi-regex-5.0.1" + sources."applicationinsights-2.3.6" + sources."applicationinsights-native-metrics-0.0.8" + sources."aproba-2.0.0" + sources."are-we-there-yet-2.0.0" sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."async-hook-jl-1.7.6" @@ -115556,39 +114196,44 @@ in ]; }) sources."asynckit-0.4.0" - sources."at-least-node-1.0.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."balanced-match-1.0.2" sources."bcrypt-pbkdf-1.0.2" - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."caseless-0.12.0" + sources."chownr-2.0.0" (sources."cls-hooked-4.2.2" // { dependencies = [ sources."semver-5.7.1" ]; }) + sources."color-support-1.1.3" sources."combined-stream-1.0.8" sources."commander-2.20.3" sources."concat-map-0.0.1" sources."config-chain-1.1.13" + sources."console-control-strings-1.1.0" sources."continuation-local-storage-3.2.1" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" + sources."debug-4.3.4" sources."deepmerge-4.2.2" sources."delayed-stream-1.0.0" - (sources."diagnostic-channel-0.3.1" // { + sources."delegates-1.0.0" + sources."detect-libc-2.0.1" + (sources."diagnostic-channel-1.1.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."diagnostic-channel-publishers-0.4.4" - sources."discontinuous-range-1.0.0" - sources."dom-serializer-1.4.1" + sources."diagnostic-channel-publishers-1.0.5" + sources."dom-serializer-2.0.0" sources."domelementtype-2.3.0" - sources."domhandler-4.3.1" - sources."domutils-2.8.0" + sources."domhandler-5.0.3" + sources."domino-2.1.6" + sources."domutils-3.0.1" sources."ecc-jsbn-0.1.2" (sources."editorconfig-0.15.3" // { dependencies = [ @@ -115597,32 +114242,48 @@ in ]; }) sources."emitter-listener-1.1.2" - sources."entities-2.2.0" + sources."emoji-regex-8.0.0" + sources."encoding-0.1.13" + sources."entities-4.4.0" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fs-extra-9.1.0" + sources."form-data-4.0.0" + (sources."fs-extra-11.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."fs.realpath-1.0.0" + sources."gauge-3.0.2" sources."getpass-0.1.7" - sources."glob-7.2.3" + sources."glob-8.1.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.10" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."he-1.2.0" - sources."html-to-text-8.1.1" - sources."htmlparser2-6.1.0" + sources."has-unicode-2.0.1" + sources."html-to-text-9.0.3" + sources."htmlparser2-8.0.1" sources."http-signature-1.2.0" + sources."https-proxy-agent-5.0.1" + sources."iconv-lite-0.6.3" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."is-typedarray-1.0.0" @@ -115631,88 +114292,132 @@ in sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonfile-6.1.0" - sources."jsprim-1.4.2" - sources."long-4.0.0" - (sources."lru-cache-6.0.0" // { + (sources."jsonfile-6.1.0" // { dependencies = [ - sources."yallist-4.0.0" + sources."universalify-2.0.0" + ]; + }) + sources."jsprim-1.4.2" + sources."leac-0.6.0" + sources."long-5.2.1" + sources."lru-cache-7.14.1" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" ]; }) 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.7" + sources."minimatch-5.1.6" + (sources."minipass-4.0.0" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."mkdirp-1.0.4" - sources."moo-0.5.2" - sources."nearley-2.20.1" - sources."nopt-5.0.0" + sources."ms-2.1.2" + sources."nan-2.17.0" + sources."node-fetch-2.6.8" + sources."nopt-6.0.0" + sources."npmlog-5.0.1" sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" sources."once-1.4.0" - sources."parse5-5.1.1" - sources."parseley-0.7.0" + sources."parseley-0.11.0" sources."path-is-absolute-1.0.1" + sources."peberminta-0.8.0" sources."performance-now-2.1.0" sources."picomatch-2.3.1" + sources."process-0.11.10" sources."proto-list-1.2.4" - sources."protobufjs-6.10.3" + sources."protobufjs-7.1.2" sources."pseudomap-1.0.2" sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.5.3" + sources."querystringify-2.2.0" 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."readable-stream-3.6.0" + (sources."request-2.88.2" // { + dependencies = [ + sources."form-data-2.3.3" + sources."tough-cookie-2.5.0" + sources."uuid-3.4.0" + ]; + }) + sources."requires-port-1.0.0" sources."reusify-1.0.4" + (sources."rimraf-3.0.2" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."glob-7.2.3" + sources."minimatch-3.1.2" + ]; + }) 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.8" + sources."sax-1.2.4" + sources."selderee-0.10.0" + (sources."semver-7.3.8" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" + ]; + }) + sources."set-blocking-2.0.0" sources."shimmer-1.2.1" sources."sigmund-1.0.1" + sources."signal-exit-3.0.7" sources."sshpk-1.17.0" sources."stack-chain-1.3.7" + sources."string-width-4.2.3" + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.1" + (sources."tar-6.1.13" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) sources."to-regex-range-5.0.1" - sources."tough-cookie-2.5.0" + sources."tough-cookie-4.1.2" + sources."tr46-0.0.3" + sources."tslib-2.5.0" + sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" + sources."turndown-7.1.1" + sources."turndown-plugin-gfm-1.0.2" sources."tweetnacl-0.14.5" - sources."typescript-4.8.4" - sources."universalify-2.0.0" + sources."typescript-4.9.4" + sources."universalify-0.2.0" sources."uri-js-4.4.1" - sources."uuid-3.4.0" + sources."url-parse-1.5.10" + sources."util-deprecate-1.0.2" + sources."uuid-8.3.2" sources."verror-1.10.0" - (sources."vscode-css-languageservice-5.4.2" // { - dependencies = [ - sources."vscode-languageserver-types-3.17.2" - ]; - }) - (sources."vscode-html-languageservice-4.2.5" // { - dependencies = [ - sources."vscode-languageserver-types-3.17.2" - ]; - }) - sources."vscode-jsonrpc-6.0.0" - (sources."vscode-languageserver-7.1.0-next.4" // { - dependencies = [ - sources."vscode-jsonrpc-6.1.0-next.2" - sources."vscode-languageserver-protocol-3.17.0-next.5" - ]; - }) - (sources."vscode-languageserver-protocol-3.16.0" // { - dependencies = [ - sources."vscode-languageserver-types-3.16.0" - ]; - }) - sources."vscode-languageserver-textdocument-1.0.7" - sources."vscode-languageserver-types-3.17.0-next.1" + sources."vscode-css-languageservice-6.2.3" + sources."vscode-html-languageservice-5.0.4" + sources."vscode-jsonrpc-8.0.2" + sources."vscode-languageserver-8.0.2" + sources."vscode-languageserver-protocol-3.17.2" + sources."vscode-languageserver-textdocument-1.0.9" + sources."vscode-languageserver-types-3.17.2" sources."vscode-nls-5.2.0" - sources."vscode-uri-3.0.6" + sources."vscode-uri-3.0.7" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" + sources."wide-align-1.1.5" sources."wrappy-1.0.2" + sources."xml2js-0.4.23" + sources."xmlbuilder-11.0.1" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -115752,7 +114457,7 @@ in sources."ansi-styles-3.2.1" (sources."ast-types-0.13.4" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."astral-regex-2.0.0" @@ -115778,7 +114483,7 @@ in sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" - sources."cookiejar-2.1.3" + sources."cookiejar-2.1.4" sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."data-uri-to-buffer-3.0.1" @@ -115830,7 +114535,7 @@ in ]; }) sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."get-uri-3.0.2" sources."glob-7.2.3" @@ -115909,13 +114614,13 @@ in sources."mute-stream-0.0.8" sources."netmask-1.0.6" sources."nice-try-1.0.5" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" (sources."npm-run-path-2.0.2" // { dependencies = [ sources."path-key-2.0.1" ]; }) - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-7.4.2" @@ -116041,75 +114746,118 @@ in bypassCache = true; reconstructLock = true; }; - "iosevka-https://github.com/be5invis/Iosevka/archive/v15.6.3.tar.gz" = nodeEnv.buildNodePackage { + "iosevka-https://github.com/be5invis/Iosevka/archive/v17.1.0.tar.gz" = nodeEnv.buildNodePackage { name = "iosevka"; packageName = "iosevka"; - version = "15.6.3"; + version = "17.1.0"; src = fetchurl { - name = "iosevka-15.6.3.tar.gz"; - url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/refs/tags/v15.6.3"; - sha256 = "38902065a20081dd240d06a47f238d4a9e04063eb1094337538c1d37d64581c7"; + name = "iosevka-17.1.0.tar.gz"; + url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/refs/tags/v17.1.0"; + sha256 = "99900713a323b5464c232118237f2ff303dc20d5c2b1b14e4dc93fd5b7df083b"; }; dependencies = [ sources."@iarna/toml-2.2.5" sources."@msgpack/msgpack-2.8.0" - sources."@ot-builder/bin-composite-types-1.5.4" - sources."@ot-builder/bin-util-1.5.4" - sources."@ot-builder/cli-help-shower-1.5.4" - sources."@ot-builder/cli-proc-1.5.4" - sources."@ot-builder/cli-shared-1.5.4" - sources."@ot-builder/common-impl-1.5.4" - sources."@ot-builder/errors-1.5.4" - sources."@ot-builder/io-bin-cff-1.5.4" - sources."@ot-builder/io-bin-encoding-1.5.4" - sources."@ot-builder/io-bin-ext-private-1.5.4" - sources."@ot-builder/io-bin-font-1.5.4" - sources."@ot-builder/io-bin-glyph-store-1.5.4" - sources."@ot-builder/io-bin-layout-1.5.4" - sources."@ot-builder/io-bin-metadata-1.5.4" - sources."@ot-builder/io-bin-metric-1.5.4" - sources."@ot-builder/io-bin-name-1.5.4" - sources."@ot-builder/io-bin-sfnt-1.5.4" - sources."@ot-builder/io-bin-ttf-1.5.4" - sources."@ot-builder/io-bin-vtt-private-1.5.4" - sources."@ot-builder/ot-1.5.4" - sources."@ot-builder/ot-encoding-1.5.4" - sources."@ot-builder/ot-ext-private-1.5.4" - sources."@ot-builder/ot-glyphs-1.5.4" - sources."@ot-builder/ot-layout-1.5.4" - sources."@ot-builder/ot-metadata-1.5.4" - sources."@ot-builder/ot-name-1.5.4" - sources."@ot-builder/ot-sfnt-1.5.4" - sources."@ot-builder/ot-standard-glyph-namer-1.5.4" - sources."@ot-builder/ot-vtt-private-1.5.4" - sources."@ot-builder/prelude-1.5.4" - sources."@ot-builder/primitive-1.5.4" - sources."@ot-builder/rectify-1.5.4" - sources."@ot-builder/stat-glyphs-1.5.4" - sources."@ot-builder/trace-1.5.4" - sources."@ot-builder/var-store-1.5.4" - sources."@ot-builder/variance-1.5.4" + sources."@ot-builder/bin-composite-types-1.6.1" + sources."@ot-builder/bin-util-1.6.1" + sources."@ot-builder/cli-help-shower-1.6.1" + sources."@ot-builder/cli-proc-1.6.1" + sources."@ot-builder/cli-shared-1.6.1" + sources."@ot-builder/common-impl-1.6.1" + sources."@ot-builder/errors-1.6.1" + sources."@ot-builder/io-bin-cff-1.6.1" + sources."@ot-builder/io-bin-encoding-1.6.1" + sources."@ot-builder/io-bin-ext-private-1.6.1" + sources."@ot-builder/io-bin-font-1.6.1" + sources."@ot-builder/io-bin-glyph-store-1.6.1" + sources."@ot-builder/io-bin-layout-1.6.1" + sources."@ot-builder/io-bin-metadata-1.6.1" + sources."@ot-builder/io-bin-metric-1.6.1" + sources."@ot-builder/io-bin-name-1.6.1" + sources."@ot-builder/io-bin-sfnt-1.6.1" + sources."@ot-builder/io-bin-ttf-1.6.1" + sources."@ot-builder/io-bin-vtt-private-1.6.1" + sources."@ot-builder/ot-1.6.1" + sources."@ot-builder/ot-encoding-1.6.1" + sources."@ot-builder/ot-ext-private-1.6.1" + sources."@ot-builder/ot-glyphs-1.6.1" + sources."@ot-builder/ot-layout-1.6.1" + sources."@ot-builder/ot-metadata-1.6.1" + sources."@ot-builder/ot-name-1.6.1" + sources."@ot-builder/ot-sfnt-1.6.1" + sources."@ot-builder/ot-standard-glyph-namer-1.6.1" + sources."@ot-builder/ot-vtt-private-1.6.1" + sources."@ot-builder/prelude-1.6.1" + sources."@ot-builder/primitive-1.6.1" + sources."@ot-builder/rectify-1.6.1" + sources."@ot-builder/stat-glyphs-1.6.1" + sources."@ot-builder/trace-1.6.1" + sources."@ot-builder/var-store-1.6.1" + sources."@ot-builder/variance-1.6.1" sources."aglfn-1.0.2" sources."ansi-styles-4.3.0" sources."argparse-2.0.1" + sources."available-typed-arrays-1.0.5" + sources."call-bind-1.0.2" sources."chalk-4.1.2" sources."clipper-lib-6.4.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."deep-equal-2.2.0" + sources."define-properties-1.1.4" + sources."es-get-iterator-1.1.3" + sources."for-each-0.3.3" + sources."function-bind-1.1.1" + sources."functions-have-names-1.2.3" + sources."get-intrinsic-1.2.0" + sources."gopd-1.0.1" + sources."has-1.0.3" + sources."has-bigints-1.0.2" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.0" + sources."has-symbols-1.0.3" + sources."has-tostringtag-1.0.0" sources."iconv-lite-0.6.3" + sources."internal-slot-1.0.4" + sources."is-arguments-1.1.1" + sources."is-array-buffer-3.0.1" + sources."is-bigint-1.0.4" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.7" + sources."is-date-object-1.0.5" + sources."is-map-2.0.2" + sources."is-number-object-1.0.7" + sources."is-regex-1.1.4" + sources."is-set-2.0.2" + sources."is-shared-array-buffer-1.0.2" + sources."is-string-1.0.7" + sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.10" + sources."is-weakmap-2.0.1" + sources."is-weakset-2.0.2" + sources."isarray-2.0.5" sources."lru-cache-6.0.0" - sources."ot-builder-1.5.4" - sources."otb-ttc-bundle-1.5.4" + sources."object-inspect-1.12.3" + sources."object-is-1.1.5" + sources."object-keys-1.1.1" + sources."object.assign-4.1.4" + sources."ot-builder-1.6.1" + sources."otb-ttc-bundle-1.6.1" + sources."regexp.prototype.flags-1.4.3" sources."safer-buffer-2.1.2" sources."semver-7.3.8" + sources."side-channel-1.0.4" sources."spiro-3.0.0" + sources."stop-iteration-iterator-1.0.0" sources."supports-color-7.2.0" sources."toposort-2.0.2" - sources."tslib-2.4.1" - sources."typo-geom-0.12.1" - sources."uuid-8.3.2" + sources."tslib-2.5.0" + sources."typo-geom-0.13.0" + sources."uuid-9.0.0" sources."wawoff2-2.0.1" + sources."which-boxed-primitive-1.0.2" + sources."which-collection-1.0.1" + sources."which-typed-array-1.1.9" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -116138,7 +114886,7 @@ in sources."concat-map-0.0.1" (sources."filelist-1.0.4" // { dependencies = [ - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" ]; }) sources."has-flag-4.0.0" @@ -116175,7 +114923,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."bufrw-1.3.0" - sources."chai-4.3.6" + sources."chai-4.3.7" sources."chai-as-promised-7.1.1" sources."chalk-2.4.2" sources."check-error-1.0.2" @@ -116183,7 +114931,7 @@ in sources."color-name-1.1.3" sources."commander-2.20.3" sources."concat-map-0.0.1" - sources."deep-eql-3.0.1" + sources."deep-eql-4.1.3" sources."error-7.0.2" sources."escape-string-regexp-1.0.5" sources."fast-deep-equal-2.0.1" @@ -116199,7 +114947,7 @@ in sources."jaeger-client-3.19.0" sources."lodash-4.17.21" sources."long-2.4.0" - sources."loupe-2.3.5" + sources."loupe-2.3.6" sources."minimatch-3.1.2" sources."minimist-1.2.7" sources."mz-2.7.0" @@ -116255,142 +115003,143 @@ in sha512 = "5kjhOG5a2BA4KOkWsfGG0qDbVXkOoYEC9h6tb6KY1zFQTJ7bdLCeR35eyPy5ANfKmHh4tzc1A5SWcnHM8j3hNw=="; }; dependencies = [ - (sources."@aws-crypto/crc32-2.0.0" // { + (sources."@aws-crypto/crc32-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/crc32c-2.0.0" // { + (sources."@aws-crypto/crc32c-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/ie11-detection-2.0.2" // { + (sources."@aws-crypto/ie11-detection-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/sha1-browser-2.0.0" // { + (sources."@aws-crypto/sha1-browser-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/sha256-browser-2.0.0" // { + (sources."@aws-crypto/sha256-browser-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/sha256-js-2.0.0" // { + (sources."@aws-crypto/sha256-js-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/supports-web-crypto-2.0.2" // { + (sources."@aws-crypto/supports-web-crypto-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/util-2.0.2" // { + (sources."@aws-crypto/util-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/abort-controller-3.201.0" + sources."@aws-sdk/abort-controller-3.257.0" sources."@aws-sdk/chunked-blob-reader-3.188.0" - sources."@aws-sdk/chunked-blob-reader-native-3.204.0" - (sources."@aws-sdk/client-s3-3.204.0" // { + sources."@aws-sdk/chunked-blob-reader-native-3.208.0" + (sources."@aws-sdk/client-s3-3.259.0" // { dependencies = [ sources."fast-xml-parser-4.0.11" ]; }) - sources."@aws-sdk/client-sso-3.204.0" - (sources."@aws-sdk/client-sts-3.204.0" // { + sources."@aws-sdk/client-sso-3.259.0" + sources."@aws-sdk/client-sso-oidc-3.259.0" + (sources."@aws-sdk/client-sts-3.259.0" // { dependencies = [ sources."fast-xml-parser-4.0.11" ]; }) - sources."@aws-sdk/config-resolver-3.201.0" - sources."@aws-sdk/credential-provider-env-3.201.0" - sources."@aws-sdk/credential-provider-imds-3.201.0" - sources."@aws-sdk/credential-provider-ini-3.204.0" - sources."@aws-sdk/credential-provider-node-3.204.0" - sources."@aws-sdk/credential-provider-process-3.201.0" - sources."@aws-sdk/credential-provider-sso-3.204.0" - sources."@aws-sdk/credential-provider-web-identity-3.201.0" - sources."@aws-sdk/eventstream-codec-3.201.0" - sources."@aws-sdk/eventstream-serde-browser-3.201.0" - sources."@aws-sdk/eventstream-serde-config-resolver-3.201.0" - sources."@aws-sdk/eventstream-serde-node-3.201.0" - sources."@aws-sdk/eventstream-serde-universal-3.201.0" - sources."@aws-sdk/fetch-http-handler-3.204.0" - sources."@aws-sdk/hash-blob-browser-3.204.0" - sources."@aws-sdk/hash-node-3.201.0" - sources."@aws-sdk/hash-stream-node-3.201.0" - sources."@aws-sdk/invalid-dependency-3.201.0" + sources."@aws-sdk/config-resolver-3.259.0" + sources."@aws-sdk/credential-provider-env-3.257.0" + sources."@aws-sdk/credential-provider-imds-3.259.0" + sources."@aws-sdk/credential-provider-ini-3.259.0" + sources."@aws-sdk/credential-provider-node-3.259.0" + sources."@aws-sdk/credential-provider-process-3.257.0" + sources."@aws-sdk/credential-provider-sso-3.259.0" + sources."@aws-sdk/credential-provider-web-identity-3.257.0" + sources."@aws-sdk/eventstream-codec-3.258.0" + sources."@aws-sdk/eventstream-serde-browser-3.258.0" + sources."@aws-sdk/eventstream-serde-config-resolver-3.257.0" + sources."@aws-sdk/eventstream-serde-node-3.258.0" + sources."@aws-sdk/eventstream-serde-universal-3.258.0" + sources."@aws-sdk/fetch-http-handler-3.257.0" + sources."@aws-sdk/hash-blob-browser-3.257.0" + sources."@aws-sdk/hash-node-3.257.0" + sources."@aws-sdk/hash-stream-node-3.257.0" + sources."@aws-sdk/invalid-dependency-3.257.0" sources."@aws-sdk/is-array-buffer-3.201.0" - sources."@aws-sdk/md5-js-3.204.0" - sources."@aws-sdk/middleware-bucket-endpoint-3.201.0" - sources."@aws-sdk/middleware-content-length-3.201.0" - sources."@aws-sdk/middleware-endpoint-3.201.0" - sources."@aws-sdk/middleware-expect-continue-3.201.0" - sources."@aws-sdk/middleware-flexible-checksums-3.201.0" - sources."@aws-sdk/middleware-host-header-3.201.0" - sources."@aws-sdk/middleware-location-constraint-3.201.0" - sources."@aws-sdk/middleware-logger-3.201.0" - sources."@aws-sdk/middleware-recursion-detection-3.201.0" - (sources."@aws-sdk/middleware-retry-3.201.0" // { + sources."@aws-sdk/md5-js-3.258.0" + sources."@aws-sdk/middleware-bucket-endpoint-3.259.0" + sources."@aws-sdk/middleware-content-length-3.257.0" + sources."@aws-sdk/middleware-endpoint-3.257.0" + sources."@aws-sdk/middleware-expect-continue-3.257.0" + sources."@aws-sdk/middleware-flexible-checksums-3.259.0" + sources."@aws-sdk/middleware-host-header-3.257.0" + sources."@aws-sdk/middleware-location-constraint-3.257.0" + sources."@aws-sdk/middleware-logger-3.257.0" + sources."@aws-sdk/middleware-recursion-detection-3.257.0" + (sources."@aws-sdk/middleware-retry-3.259.0" // { dependencies = [ sources."uuid-8.3.2" ]; }) - sources."@aws-sdk/middleware-sdk-s3-3.201.0" - sources."@aws-sdk/middleware-sdk-sts-3.201.0" - sources."@aws-sdk/middleware-serde-3.201.0" - sources."@aws-sdk/middleware-signing-3.201.0" - sources."@aws-sdk/middleware-ssec-3.201.0" - sources."@aws-sdk/middleware-stack-3.201.0" - sources."@aws-sdk/middleware-user-agent-3.201.0" - sources."@aws-sdk/node-config-provider-3.201.0" - sources."@aws-sdk/node-http-handler-3.201.0" - sources."@aws-sdk/property-provider-3.201.0" - sources."@aws-sdk/protocol-http-3.201.0" - sources."@aws-sdk/querystring-builder-3.201.0" - sources."@aws-sdk/querystring-parser-3.201.0" - sources."@aws-sdk/s3-request-presigner-3.204.0" - sources."@aws-sdk/service-error-classification-3.201.0" - sources."@aws-sdk/shared-ini-file-loader-3.201.0" - sources."@aws-sdk/signature-v4-3.201.0" - sources."@aws-sdk/signature-v4-crt-3.201.0" - sources."@aws-sdk/signature-v4-multi-region-3.201.0" - sources."@aws-sdk/smithy-client-3.201.0" - sources."@aws-sdk/types-3.201.0" - sources."@aws-sdk/url-parser-3.201.0" - sources."@aws-sdk/util-arn-parser-3.201.0" - sources."@aws-sdk/util-base64-3.202.0" - sources."@aws-sdk/util-base64-browser-3.188.0" - sources."@aws-sdk/util-base64-node-3.201.0" + sources."@aws-sdk/middleware-sdk-s3-3.257.0" + sources."@aws-sdk/middleware-sdk-sts-3.257.0" + sources."@aws-sdk/middleware-serde-3.257.0" + sources."@aws-sdk/middleware-signing-3.257.0" + sources."@aws-sdk/middleware-ssec-3.257.0" + sources."@aws-sdk/middleware-stack-3.257.0" + sources."@aws-sdk/middleware-user-agent-3.257.0" + sources."@aws-sdk/node-config-provider-3.259.0" + sources."@aws-sdk/node-http-handler-3.257.0" + sources."@aws-sdk/property-provider-3.257.0" + sources."@aws-sdk/protocol-http-3.257.0" + sources."@aws-sdk/querystring-builder-3.257.0" + sources."@aws-sdk/querystring-parser-3.257.0" + sources."@aws-sdk/s3-request-presigner-3.259.0" + sources."@aws-sdk/service-error-classification-3.257.0" + sources."@aws-sdk/shared-ini-file-loader-3.257.0" + sources."@aws-sdk/signature-v4-3.257.0" + sources."@aws-sdk/signature-v4-crt-3.257.0" + sources."@aws-sdk/signature-v4-multi-region-3.257.0" + sources."@aws-sdk/smithy-client-3.257.0" + sources."@aws-sdk/token-providers-3.259.0" + sources."@aws-sdk/types-3.257.0" + sources."@aws-sdk/url-parser-3.257.0" + sources."@aws-sdk/util-arn-parser-3.208.0" + sources."@aws-sdk/util-base64-3.208.0" sources."@aws-sdk/util-body-length-browser-3.188.0" - sources."@aws-sdk/util-body-length-node-3.201.0" - sources."@aws-sdk/util-buffer-from-3.201.0" - sources."@aws-sdk/util-config-provider-3.201.0" - sources."@aws-sdk/util-create-request-3.201.0" - sources."@aws-sdk/util-defaults-mode-browser-3.201.0" - sources."@aws-sdk/util-defaults-mode-node-3.201.0" - sources."@aws-sdk/util-endpoints-3.202.0" - sources."@aws-sdk/util-format-url-3.201.0" + sources."@aws-sdk/util-body-length-node-3.208.0" + sources."@aws-sdk/util-buffer-from-3.208.0" + sources."@aws-sdk/util-config-provider-3.208.0" + sources."@aws-sdk/util-create-request-3.257.0" + sources."@aws-sdk/util-defaults-mode-browser-3.257.0" + sources."@aws-sdk/util-defaults-mode-node-3.259.0" + sources."@aws-sdk/util-endpoints-3.257.0" + sources."@aws-sdk/util-format-url-3.257.0" sources."@aws-sdk/util-hex-encoding-3.201.0" - sources."@aws-sdk/util-locate-window-3.201.0" - sources."@aws-sdk/util-middleware-3.201.0" - sources."@aws-sdk/util-stream-browser-3.204.0" - sources."@aws-sdk/util-stream-node-3.201.0" + sources."@aws-sdk/util-locate-window-3.208.0" + sources."@aws-sdk/util-middleware-3.257.0" + sources."@aws-sdk/util-retry-3.257.0" + sources."@aws-sdk/util-stream-browser-3.258.0" + sources."@aws-sdk/util-stream-node-3.257.0" sources."@aws-sdk/util-uri-escape-3.201.0" - sources."@aws-sdk/util-user-agent-browser-3.201.0" - sources."@aws-sdk/util-user-agent-node-3.201.0" - sources."@aws-sdk/util-utf8-browser-3.188.0" - sources."@aws-sdk/util-utf8-node-3.201.0" - sources."@aws-sdk/util-waiter-3.201.0" + sources."@aws-sdk/util-user-agent-browser-3.257.0" + sources."@aws-sdk/util-user-agent-node-3.259.0" + sources."@aws-sdk/util-utf8-3.254.0" + sources."@aws-sdk/util-utf8-browser-3.259.0" + sources."@aws-sdk/util-waiter-3.257.0" sources."@aws-sdk/xml-builder-3.201.0" - sources."@braintree/sanitize-url-6.0.1" + sources."@braintree/sanitize-url-6.0.2" sources."@cronvel/get-pixels-3.4.1" sources."@gar/promisify-1.1.3" sources."@httptoolkit/websocket-stream-6.0.1" @@ -116429,14 +115178,14 @@ in sources."gauge-3.0.2" sources."is-fullwidth-code-point-3.0.0" sources."mkdirp-1.0.4" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."npmlog-5.0.1" sources."readable-stream-3.6.0" sources."rimraf-3.0.2" sources."semver-7.3.8" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" - sources."tar-6.1.12" + sources."tar-6.1.13" sources."tr46-0.0.3" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -116455,8 +115204,8 @@ in }) sources."@tootallnate/once-1.1.2" sources."@types/nanoid-3.0.0" - sources."@types/node-18.11.9" - sources."@types/ws-8.5.3" + sources."@types/node-18.11.18" + sources."@types/ws-8.5.4" sources."abab-2.0.6" sources."abbrev-1.1.1" sources."acorn-7.4.1" @@ -116483,7 +115232,7 @@ in sources."color-name-1.1.4" ]; }) - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."aproba-2.0.0" sources."are-we-there-yet-1.0.6" sources."argparse-2.0.1" @@ -116497,13 +115246,13 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - (sources."aws-crt-1.14.5" // { + (sources."aws-crt-1.15.8" // { dependencies = [ sources."mkdirp-1.0.4" - sources."tar-6.1.12" + sources."tar-6.1.13" ]; }) - (sources."aws-sdk-2.1248.0" // { + (sources."aws-sdk-2.1304.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -116514,7 +115263,7 @@ in ]; }) sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."axios-0.24.0" sources."balanced-match-1.0.2" sources."base-64-0.1.0" @@ -116543,15 +115292,20 @@ in sources."builtin-modules-3.3.0" (sources."cacache-15.3.0" // { dependencies = [ + sources."minipass-3.3.6" sources."mkdirp-1.0.4" sources."rimraf-3.0.2" - sources."tar-6.1.12" + (sources."tar-6.1.13" // { + dependencies = [ + sources."minipass-4.0.0" + ]; + }) ]; }) sources."call-bind-1.0.2" sources."camel-case-3.0.0" sources."camelcase-2.1.1" - sources."canvas-2.10.2" + sources."canvas-2.11.0" sources."caseless-0.12.0" sources."chainsaw-0.1.0" sources."chalk-4.1.2" @@ -116606,14 +115360,13 @@ in ]; }) sources."cwise-compiler-1.1.3" - sources."d3-7.6.1" - sources."d3-array-3.2.0" + sources."d3-7.8.2" + sources."d3-array-3.2.2" sources."d3-axis-3.0.0" sources."d3-brush-3.0.0" sources."d3-chord-3.0.1" - sources."d3-collection-1.0.7" sources."d3-color-3.1.0" - sources."d3-contour-4.0.0" + sources."d3-contour-4.0.2" sources."d3-delaunay-6.0.2" sources."d3-dispatch-3.0.1" sources."d3-drag-3.0.0" @@ -116627,64 +115380,29 @@ in sources."d3-fetch-3.0.1" sources."d3-force-3.0.0" sources."d3-format-3.1.0" - sources."d3-geo-3.0.1" + sources."d3-geo-3.1.0" sources."d3-hierarchy-3.1.2" sources."d3-interpolate-3.0.1" - sources."d3-path-3.0.1" + sources."d3-path-3.1.0" sources."d3-polygon-3.0.1" sources."d3-quadtree-3.0.1" sources."d3-random-3.0.1" sources."d3-scale-4.0.2" sources."d3-scale-chromatic-3.0.0" sources."d3-selection-3.0.0" - sources."d3-shape-3.1.0" - sources."d3-time-3.0.0" + sources."d3-shape-3.2.0" + sources."d3-time-3.1.0" sources."d3-time-format-4.1.0" sources."d3-timer-3.0.1" sources."d3-transition-3.0.1" - sources."d3-voronoi-1.1.4" sources."d3-zoom-3.0.0" - sources."dagre-0.8.5" - (sources."dagre-d3-0.6.4" // { - dependencies = [ - sources."d3-5.16.0" - sources."d3-array-1.2.4" - sources."d3-axis-1.0.12" - sources."d3-brush-1.1.6" - sources."d3-chord-1.0.6" - sources."d3-color-1.4.1" - sources."d3-contour-1.3.2" - sources."d3-dispatch-1.0.6" - sources."d3-drag-1.2.5" - sources."d3-dsv-1.2.0" - sources."d3-ease-1.0.7" - sources."d3-fetch-1.2.0" - sources."d3-force-1.2.1" - sources."d3-format-1.4.5" - sources."d3-geo-1.12.1" - sources."d3-hierarchy-1.1.9" - sources."d3-interpolate-1.4.0" - sources."d3-path-1.0.9" - sources."d3-polygon-1.0.6" - sources."d3-quadtree-1.0.7" - sources."d3-random-1.1.2" - sources."d3-scale-2.2.2" - sources."d3-scale-chromatic-1.5.0" - sources."d3-selection-1.4.2" - sources."d3-shape-1.3.7" - sources."d3-time-1.1.0" - sources."d3-time-format-2.3.0" - sources."d3-timer-1.0.10" - sources."d3-transition-1.3.2" - sources."d3-zoom-1.8.3" - ]; - }) + sources."dagre-d3-es-7.0.6" sources."dashdash-1.14.1" sources."data-urls-1.1.0" sources."datauri-4.1.0" sources."debug-4.3.4" sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.4" @@ -116703,7 +115421,7 @@ in sources."domelementtype-2.3.0" sources."domexception-1.0.1" sources."domhandler-3.0.0" - sources."dompurify-2.4.0" + sources."dompurify-2.4.1" (sources."domutils-2.8.0" // { dependencies = [ sources."domhandler-4.3.1" @@ -116741,7 +115459,6 @@ in sources."expand-template-2.0.3" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-clone-1.5.13" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" @@ -116765,13 +115482,17 @@ in sources."universalify-0.1.2" ]; }) - sources."fs-minipass-2.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."fstream-1.0.12" sources."function-bind-1.1.1" sources."gauge-1.2.7" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-prototype-chain-1.0.1" sources."get-stdin-5.0.1" sources."getpass-0.1.7" @@ -116780,7 +115501,6 @@ in sources."glob-parent-5.1.2" sources."gopd-1.0.1" sources."graceful-fs-4.2.10" - sources."graphlib-2.1.8" sources."growly-1.3.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -116801,7 +115521,7 @@ in sources."html-encoding-sniffer-1.0.2" sources."html-entities-1.4.0" sources."html-minifier-3.5.21" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-1.8.1" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" @@ -116889,12 +115609,13 @@ in sources."isstream-0.1.2" sources."jmespath-0.16.0" sources."jpeg-js-0.4.4" - sources."js-sdsl-4.1.4" + sources."js-sdsl-4.3.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsbn-0.1.1" (sources."jsdom-15.2.1" // { dependencies = [ + sources."utf-8-validate-5.0.10" sources."ws-7.5.9" ]; }) @@ -116940,7 +115661,11 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-9.1.0" + (sources."make-fetch-happen-9.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) (sources."markdown-it-10.0.0" // { dependencies = [ sources."argparse-1.0.10" @@ -116970,7 +115695,7 @@ in sources."string_decoder-0.10.31" ]; }) - (sources."mermaid-9.2.0" // { + (sources."mermaid-9.3.0" // { dependencies = [ sources."uuid-9.0.0" ]; @@ -116981,13 +115706,37 @@ in sources."mimic-response-2.1.0" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-3.3.5" - sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.4.1" - sources."minipass-flush-1.0.5" - sources."minipass-pipeline-1.2.4" - sources."minipass-sized-1.0.3" - sources."minizlib-2.1.2" + sources."minipass-4.0.0" + (sources."minipass-collect-1.0.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-fetch-1.4.1" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-flush-1.0.5" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-pipeline-1.2.4" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-sized-1.0.3" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."mkdirp-0.5.6" sources."mkdirp-classic-0.5.3" sources."moment-2.29.4" @@ -116996,6 +115745,7 @@ in dependencies = [ sources."duplexify-4.1.2" sources."readable-stream-3.6.0" + sources."utf-8-validate-5.0.10" sources."ws-7.5.9" ]; }) @@ -117011,7 +115761,7 @@ in sources."negotiator-0.6.3" sources."nextgen-events-1.5.3" sources."no-case-2.3.2" - (sources."node-abi-3.28.0" // { + (sources."node-abi-3.31.0" // { dependencies = [ sources."semver-7.3.8" ]; @@ -117033,11 +115783,11 @@ in sources."semver-7.3.8" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" - sources."tar-6.1.12" + sources."tar-6.1.13" sources."which-2.0.2" ]; }) - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" (sources."node-notifier-8.0.2" // { dependencies = [ sources."semver-7.3.8" @@ -117051,7 +115801,7 @@ in sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."npmlog-1.2.1" - sources."number-allocator-1.0.12" + sources."number-allocator-1.0.14" sources."number-is-nan-1.0.1" sources."nwsapi-2.2.2" sources."oauth-sign-0.9.0" @@ -117100,7 +115850,7 @@ in sources."proper-lockfile-2.0.1" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."q-1.1.2" sources."qs-6.5.3" sources."query-string-4.3.4" @@ -117202,14 +115952,18 @@ in }) sources."splitargs-0.0.7" sources."sprintf-js-1.1.2" - (sources."sqlite3-5.1.2" // { + (sources."sqlite3-5.1.4" // { dependencies = [ sources."mkdirp-1.0.4" - sources."tar-6.1.12" + sources."tar-6.1.13" ]; }) sources."sshpk-1.17.0" - sources."ssri-8.0.1" + (sources."ssri-8.0.1" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."stream-shift-1.0.1" @@ -117288,7 +116042,7 @@ in sources."tr46-1.0.1" sources."traverse-0.3.9" sources."tree-kit-0.7.4" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -117327,7 +116081,7 @@ in }) sources."url-join-0.0.1" sources."url-parse-1.5.10" - sources."utf-8-validate-5.0.10" + sources."utf-8-validate-6.0.2" sources."util-0.12.5" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -117355,7 +116109,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-8.11.0" + sources."ws-8.12.0" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -117396,12 +116150,12 @@ in sources."config-chain-1.1.13" sources."editorconfig-0.15.3" sources."fs.realpath-1.0.0" - sources."glob-8.0.3" + sources."glob-8.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."lru-cache-4.1.5" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" sources."nopt-6.0.0" sources."once-1.4.0" sources."proto-list-1.2.4" @@ -117451,8 +116205,8 @@ in sha512 = "tzTgkklbWKrlaQL2+e3NNgLcZu3NaK2vsHRx7tyHQ+H5jcB9Gx0txSd2eJWlMC/xU1+7LQu4s58Ry0RkuaEQVg=="; }; dependencies = [ - sources."@babel/parser-7.20.2" - sources."@jsdoc/salty-0.2.1" + sources."@babel/parser-7.20.13" + sources."@jsdoc/salty-0.2.3" sources."@types/linkify-it-3.0.2" sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" @@ -117467,11 +116221,11 @@ in sources."linkify-it-3.0.3" sources."lodash-4.17.21" sources."markdown-it-12.3.2" - sources."markdown-it-anchor-8.6.5" - sources."marked-4.2.2" + sources."markdown-it-anchor-8.6.6" + sources."marked-4.2.12" sources."mdurl-1.0.1" sources."mkdirp-1.0.4" - sources."requizzle-0.2.3" + sources."requizzle-0.2.4" sources."strip-json-comments-3.1.1" sources."uc.micro-1.0.6" sources."underscore-1.13.6" @@ -117490,10 +116244,10 @@ in jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.13.5"; + version = "2.13.6"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.13.5.tgz"; - sha512 = "dB2n1w3OaQ35PLcBGIWXlszjbPZwsgZoxsg6G8PtNf2cFMC1l0fObkYLUuXqTTdi6tKw4sAjfUseTdmDMHQRcg=="; + url = "https://registry.npmjs.org/jshint/-/jshint-2.13.6.tgz"; + sha512 = "IVdB4G0NTTeQZrBoM8C5JFVLjV2KtZ9APgybDA1MK73xb09qFs0jCXyQLnCOp1cSZZZbvhq/6mfXHUTaDkffuQ=="; }; dependencies = [ sources."balanced-match-1.0.2" @@ -117563,15 +116317,15 @@ in json-diff = nodeEnv.buildNodePackage { name = "json-diff"; packageName = "json-diff"; - version = "0.9.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-diff/-/json-diff-0.9.1.tgz"; - sha512 = "Z3eMg6kbVTBr3g/IpmF6z28yL2sqi4kkIlJWDQSt0auQW2y0QFu3RmSKizvj880E/EUyNanvWY3oi/T5Z7ZA1g=="; + url = "https://registry.npmjs.org/json-diff/-/json-diff-1.0.0.tgz"; + sha512 = "9M6M60W4GUxmha6eoFhRVKF+tDw70jdqrxo3u6aqQ6/cwW6RhkSTPI0gvfCRcBwbWiUWvJo9jR6e9TZxcQdhnA=="; }; dependencies = [ + sources."@ewoudenberg/difflib-0.1.0" sources."cli-color-2.0.3" sources."d-1.0.1" - sources."difflib-0.2.4" sources."dreamopt-0.8.0" sources."es5-ext-0.10.62" sources."es6-iterator-2.0.3" @@ -117618,20 +116372,16 @@ in sources."combined-stream-1.0.8" sources."commander-4.1.1" sources."component-emitter-1.3.0" - sources."cookiejar-2.1.3" + sources."cookiejar-2.1.4" sources."debug-4.3.4" sources."delayed-stream-1.0.0" - sources."dezalgo-1.0.3" + sources."dezalgo-1.0.4" sources."esprima-4.0.1" sources."fast-safe-stringify-2.1.1" sources."form-data-4.0.0" - (sources."formidable-2.0.1" // { - dependencies = [ - sources."qs-6.9.3" - ]; - }) + sources."formidable-2.1.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."graphlib-2.1.8" sources."has-1.0.3" sources."has-symbols-1.0.3" @@ -117646,10 +116396,10 @@ in sources."mime-types-2.1.35" sources."ms-2.1.2" sources."native-promise-only-0.8.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."once-1.4.0" sources."path-loader-1.0.12" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -117736,7 +116486,7 @@ in sources."fresh-0.5.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-flag-4.0.0" @@ -117773,7 +116523,7 @@ in sources."nanoid-3.3.4" sources."negotiator-0.6.3" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."parseurl-1.3.3" @@ -117872,11 +116622,11 @@ in sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" @@ -117954,7 +116704,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."deep-extend-0.6.0" (sources."define-property-2.0.2" // { dependencies = [ @@ -118007,7 +116757,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-base-0.3.0" @@ -118158,7 +116908,7 @@ in }) ]; }) - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" (sources."object-visit-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -118197,7 +116947,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.11.0" (sources."randomatic-3.1.1" // { dependencies = [ @@ -118441,17 +117191,16 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/command-1.8.20" + sources."@oclif/command-1.8.22" sources."@oclif/config-1.18.6" sources."@oclif/errors-1.3.6" - (sources."@oclif/help-1.0.3" // { + (sources."@oclif/help-1.0.5" // { dependencies = [ - sources."@oclif/config-1.18.5" sources."wrap-ansi-6.2.0" ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.9" + sources."@oclif/parser-3.8.10" (sources."@oclif/plugin-help-3.3.1" // { dependencies = [ sources."@oclif/config-1.18.2" @@ -118464,7 +117213,7 @@ in ]; }) sources."@oclif/screen-1.0.4" - (sources."@putdotio/api-client-8.32.0" // { + (sources."@putdotio/api-client-8.33.1" // { dependencies = [ sources."axios-0.21.4" ]; @@ -118536,7 +117285,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.13.0" + sources."fastq-1.15.0" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" @@ -118548,7 +117297,7 @@ in sources."form-data-3.0.1" sources."fs-extra-8.1.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-parent-5.1.2" sources."globby-11.1.0" sources."graceful-fs-4.2.10" @@ -118557,7 +117306,7 @@ in sources."has-symbols-1.0.3" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."inquirer-7.3.3" @@ -118595,7 +117344,7 @@ in sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-downloader-helper-1.0.19" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."object-treeify-1.1.33" sources."onetime-5.1.2" sources."os-tmpdir-1.0.2" @@ -118612,7 +117361,7 @@ in sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."pkg-up-3.1.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."queue-microtask-1.2.3" sources."redeyed-2.1.1" @@ -118640,7 +117389,7 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."to-regex-range-5.0.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-2.7.2" sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" @@ -118667,10 +117416,10 @@ in katex = nodeEnv.buildNodePackage { name = "katex"; packageName = "katex"; - version = "0.16.3"; + version = "0.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.16.3.tgz"; - sha512 = "3EykQddareoRmbtNiNEDgl3IGjryyrp2eg/25fHDEnlHymIDi33bptkMv6K4EOC2LZCybLW/ZkEo6Le+EM9pmA=="; + url = "https://registry.npmjs.org/katex/-/katex-0.16.4.tgz"; + sha512 = "WudRKUj8yyBeVDI4aYMNxhx5Vhh2PjpzQw1GRu/LVGqL4m1AxwD1GcUp0IMbdJaf5zsjtj8ghP0DOQRYhroNkw=="; }; dependencies = [ sources."commander-8.3.0" @@ -118697,12 +117446,12 @@ in sources."@colors/colors-1.5.0" sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.12" - sources."@types/node-18.11.9" + sources."@types/cors-2.8.13" + sources."@types/node-18.11.18" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."balanced-match-1.0.2" sources."base64id-2.0.0" sources."binary-extensions-2.2.0" @@ -118731,13 +117480,13 @@ in sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - (sources."engine.io-6.2.0" // { + (sources."engine.io-6.2.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."engine.io-parser-5.0.4" + sources."engine.io-parser-5.0.6" sources."ent-2.2.0" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -118757,7 +117506,7 @@ in sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.10" @@ -118776,7 +117525,7 @@ in sources."isbinaryfile-4.0.10" sources."jsonfile-4.0.0" sources."lodash-4.17.21" - (sources."log4js-6.7.0" // { + (sources."log4js-6.7.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -118791,10 +117540,10 @@ in sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."negotiator-0.6.3" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."on-finished-2.4.1" sources."once-1.4.0" sources."parseurl-1.3.3" @@ -118812,14 +117561,14 @@ in sources."safer-buffer-2.1.2" sources."setprototypeof-1.2.0" sources."side-channel-1.0.4" - (sources."socket.io-4.5.3" // { + (sources."socket.io-4.5.4" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."socket.io-adapter-2.4.0" - (sources."socket.io-parser-4.2.1" // { + (sources."socket.io-parser-4.2.2" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -118827,7 +117576,7 @@ in }) sources."source-map-0.6.1" sources."statuses-2.0.1" - (sources."streamroller-3.1.3" // { + (sources."streamroller-3.1.4" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -118839,7 +117588,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."type-is-1.6.18" - sources."ua-parser-js-0.7.32" + sources."ua-parser-js-0.7.33" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."utf-8-validate-5.0.10" @@ -118873,21 +117622,21 @@ in }; dependencies = [ sources."@ampproject/remapping-2.2.0" - sources."@babel/cli-7.19.3" + sources."@babel/cli-7.20.7" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.1" - (sources."@babel/core-7.20.2" // { + sources."@babel/compat-data-7.20.14" + (sources."@babel/core-7.20.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.2" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; }) sources."@babel/helper-annotate-as-pure-7.18.6" - (sources."@babel/helper-compilation-targets-7.20.0" // { + (sources."@babel/helper-compilation-targets-7.20.7" // { dependencies = [ sources."semver-6.3.0" ]; @@ -118896,23 +117645,23 @@ in sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.2" + sources."@babel/helper-module-transforms-7.20.11" sources."@babel/helper-plugin-utils-7.20.2" sources."@babel/helper-simple-access-7.20.2" sources."@babel/helper-split-export-declaration-7.18.6" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.1" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/node-7.20.2" - sources."@babel/parser-7.20.2" + sources."@babel/node-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-syntax-jsx-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.19.0" + sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/register-7.18.9" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.20.1" - sources."@babel/types-7.20.2" + sources."@babel/template-7.20.7" + sources."@babel/traverse-7.20.13" + sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -118920,12 +117669,14 @@ in sources."@jridgewell/trace-mapping-0.3.17" (sources."@mapbox/node-pre-gyp-1.0.10" // { dependencies = [ + sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."semver-7.3.8" + sources."yallist-4.0.0" ]; }) sources."@nodelib/fs.scandir-2.1.5" @@ -118933,7 +117684,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@openpgp/hkp-client-0.0.2" sources."@openpgp/wkd-client-0.0.3" - sources."@peculiar/asn1-schema-2.3.0" + sources."@peculiar/asn1-schema-2.3.3" sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.4.1" sources."@tootallnate/once-1.1.2" @@ -118967,7 +117718,7 @@ in sources."abab-2.0.6" sources."abbrev-1.1.1" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -118987,6 +117738,7 @@ in sources."asn1js-3.0.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" + sources."available-typed-arrays-1.0.5" sources."axios-0.25.0" sources."babel-plugin-jsx-pragmatic-1.0.2" sources."babel-plugin-syntax-jsx-6.18.0" @@ -119013,10 +117765,10 @@ in sources."bufferutil-4.0.7" sources."bytes-3.1.2" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001431" - sources."canvas-2.10.2" + sources."caniuse-lite-1.0.30001449" + sources."canvas-2.11.0" sources."chalk-2.4.2" - sources."chardet-1.5.0" + sources."chardet-1.5.1" sources."chownr-2.0.0" sources."cipher-base-1.0.4" sources."cliui-7.0.4" @@ -119035,7 +117787,7 @@ in sources."convert-source-map-1.9.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" - sources."core-js-3.26.0" + sources."core-js-3.27.2" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."create-hash-1.2.0" @@ -119054,8 +117806,8 @@ in ]; }) sources."debug-4.3.4" - sources."decimal.js-10.4.2" - sources."decode-uri-component-0.2.0" + sources."decimal.js-10.4.3" + sources."decode-uri-component-0.2.2" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.4" @@ -119080,8 +117832,9 @@ in sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" - sources."es-abstract-1.20.4" + sources."es-abstract-1.21.1" sources."es-array-method-boxes-properly-1.0.0" + sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -119099,10 +117852,10 @@ in sources."ms-2.0.0" ]; }) - sources."express-validator-6.14.2" + sources."express-validator-6.14.3" sources."fast-glob-3.2.12" sources."fast-levenshtein-2.0.6" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."filter-obj-1.1.0" (sources."finalhandler-1.2.0" // { @@ -119114,6 +117867,7 @@ in sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" sources."follow-redirects-1.15.2" + sources."for-each-0.3.3" sources."form-data-3.0.1" sources."forwarded-0.2.0" sources."fresh-0.5.2" @@ -119130,7 +117884,12 @@ in sources."universalify-2.0.0" ]; }) - sources."fs-minipass-2.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."fs-readdir-recursive-1.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -119139,23 +117898,26 @@ in sources."gauge-3.0.2" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" sources."github-from-package-0.0.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globals-11.12.0" + sources."globalthis-1.0.3" (sources."globby-11.1.0" // { dependencies = [ sources."slash-3.0.0" ]; }) + sources."gopd-1.0.1" sources."graceful-fs-4.2.10" sources."growly-1.3.0" sources."has-1.0.3" sources."has-bigints-1.0.2" sources."has-flag-3.0.0" sources."has-property-descriptors-1.0.0" + sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" @@ -119167,15 +117929,16 @@ in sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."internal-slot-1.0.3" + sources."internal-slot-1.0.4" sources."into-stream-6.0.0" sources."ipaddr.js-1.9.1" sources."irc-colors-1.5.0" sources."irc-upd-0.11.0" + sources."is-array-buffer-3.0.1" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" @@ -119195,6 +117958,7 @@ in sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.10" sources."is-weakref-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" @@ -119204,13 +117968,14 @@ in (sources."jsdom-16.7.0" // { dependencies = [ sources."tr46-2.1.0" + sources."utf-8-validate-5.0.10" sources."webidl-conversions-6.1.0" sources."whatwg-url-8.7.0" sources."ws-7.5.9" ]; }) sources."jsesc-2.5.2" - sources."json5-2.2.1" + sources."json5-2.2.3" (sources."jsonfile-6.1.0" // { dependencies = [ sources."universalify-2.0.0" @@ -119221,7 +117986,7 @@ in sources."levn-0.3.0" sources."locate-path-3.0.0" sources."lodash-4.17.21" - sources."lru-cache-6.0.0" + sources."lru-cache-5.1.1" sources."ltx-3.0.0" sources."make-dir-2.1.0" sources."md5.js-1.3.5" @@ -119238,8 +118003,17 @@ in sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-3.3.5" - sources."minizlib-2.1.2" + (sources."minipass-4.0.0" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."mkdirp-1.0.4" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" @@ -119249,20 +118023,22 @@ in 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-gyp-build-4.5.0" + sources."node-fetch-2.6.8" + sources."node-gyp-build-4.6.0" (sources."node-notifier-10.0.1" // { dependencies = [ + sources."lru-cache-6.0.0" sources."semver-7.3.8" + sources."yallist-4.0.0" ]; }) - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" sources."nopt-5.0.0" sources."npmlog-5.0.1" sources."number-is-nan-1.0.1" sources."nwsapi-2.2.2" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."object-keys-1.1.1" sources."object.assign-4.1.4" sources."object.getownpropertydescriptors-2.1.5" @@ -119308,8 +118084,10 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" + sources."lru-cache-6.0.0" sources."semver-7.3.8" sources."supports-color-7.2.0" + sources."yallist-4.0.0" ]; }) (sources."prebuild-install-6.1.4" // { @@ -119333,7 +118111,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."pvtsutils-1.3.2" sources."pvutils-1.1.3" sources."qs-6.11.0" @@ -119349,7 +118127,7 @@ in }) sources."rc-1.2.8" sources."readable-stream-3.6.0" - sources."regenerator-runtime-0.13.10" + sources."regenerator-runtime-0.13.11" sources."regexp.prototype.flags-1.4.3" sources."require-directory-2.1.1" sources."requires-port-1.0.0" @@ -119401,8 +118179,8 @@ in }) sources."strict-uri-encode-2.0.0" sources."string-width-4.2.3" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" + sources."string.prototype.trimend-1.0.6" + sources."string.prototype.trimstart-1.0.6" sources."string_decoder-1.3.0" (sources."strip-ansi-6.0.1" // { dependencies = [ @@ -119413,7 +118191,11 @@ in sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-tree-3.2.4" - sources."tar-6.1.12" + (sources."tar-6.1.13" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) (sources."tar-fs-2.1.1" // { dependencies = [ sources."chownr-1.1.4" @@ -119425,16 +118207,17 @@ in sources."toidentifier-1.0.1" sources."tough-cookie-4.1.2" sources."tr46-0.0.3" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."type-check-0.3.2" sources."type-is-1.6.18" + sources."typed-array-length-1.0.4" sources."unbox-primitive-1.0.2" sources."universalify-0.2.0" sources."unpipe-1.0.0" sources."update-browserslist-db-1.0.10" sources."url-parse-1.5.10" - sources."utf-8-validate-5.0.10" + sources."utf-8-validate-6.0.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-8.3.2" @@ -119455,6 +118238,7 @@ in sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" + sources."which-typed-array-1.1.9" sources."wide-align-1.1.5" sources."word-wrap-1.2.3" (sources."wrap-ansi-7.0.0" // { @@ -119465,11 +118249,11 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-8.11.0" + sources."ws-8.12.0" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" - sources."yallist-4.0.0" + sources."yallist-3.1.1" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" ]; @@ -119486,102 +118270,52 @@ in lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; packageName = "lcov-result-merger"; - version = "3.3.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-3.3.0.tgz"; - sha512 = "Krg9p24jGaIT93RBMA8b5qLHDEiAXTavaTiEdMAZaJS93PsBKIcg/89cw/8rgeSfRuQX+I9x7h73SHFjCZ6cHg=="; + url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-4.0.0.tgz"; + sha512 = "xgyipRVKEASBjJ7urBdx4VW+ofcIoatmMBueHy2i/rt3P9MrOvv1CZ7+cVqOfWIB74RvGMGZE4MiXnWLbFwQEA=="; }; dependencies = [ + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."append-buffer-1.0.2" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."buffer-equal-1.0.1" - sources."call-bind-1.0.2" + sources."braces-3.0.2" sources."cliui-7.0.4" - sources."clone-2.1.2" - sources."clone-buffer-1.0.0" - sources."clone-stats-1.0.0" - sources."cloneable-readable-1.1.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."concat-map-0.0.1" - sources."convert-source-map-1.9.0" sources."core-util-is-1.0.3" - sources."define-properties-1.1.4" - sources."duplexify-3.7.1" sources."emoji-regex-8.0.0" - sources."end-of-stream-1.4.4" sources."escalade-3.1.1" - sources."extend-3.0.2" - sources."flush-write-stream-1.1.1" - sources."fs-mkdirp-stream-1.0.0" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."fast-glob-3.2.12" + sources."fastq-1.15.0" + sources."fill-range-7.0.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" - sources."glob-7.2.3" - sources."glob-parent-3.1.0" - sources."glob-stream-6.1.0" - sources."graceful-fs-4.2.10" - sources."has-1.0.3" - sources."has-property-descriptors-1.0.0" - sources."has-symbols-1.0.3" - sources."inflight-1.0.6" + sources."glob-parent-5.1.2" sources."inherits-2.0.4" - sources."is-absolute-1.0.0" - sources."is-buffer-1.1.6" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-3.1.0" - sources."is-negated-glob-1.0.0" - sources."is-relative-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-glob-4.0.3" + sources."is-number-7.0.0" sources."isarray-1.0.0" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."lazystream-1.0.1" - sources."lead-1.0.0" - sources."minimatch-3.1.2" - sources."normalize-path-2.1.1" - sources."now-and-later-2.0.1" - sources."object-keys-1.1.1" - sources."object.assign-4.1.4" - sources."once-1.4.0" - sources."ordered-read-streams-1.0.1" - sources."path-dirname-1.0.2" - sources."path-is-absolute-1.0.1" + sources."merge2-1.4.1" + sources."micromatch-4.0.5" + sources."picomatch-2.3.1" sources."process-nextick-args-2.0.1" - sources."pump-2.0.1" - sources."pumpify-1.5.1" + sources."queue-microtask-1.2.3" sources."readable-stream-2.3.7" - sources."remove-bom-buffer-3.0.0" - sources."remove-bom-stream-1.2.0" - sources."remove-trailing-separator-1.1.0" - sources."replace-ext-1.0.1" sources."require-directory-2.1.1" - sources."resolve-options-1.1.0" + sources."reusify-1.0.4" + sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" - sources."stream-shift-1.0.1" sources."string-width-4.2.3" sources."string_decoder-1.1.1" sources."strip-ansi-6.0.1" sources."through2-2.0.5" - sources."through2-filter-3.0.0" - sources."to-absolute-glob-2.0.2" - sources."to-through-2.0.0" - sources."unc-path-regex-0.1.2" - sources."unique-stream-2.3.1" + sources."to-regex-range-5.0.1" sources."util-deprecate-1.0.2" - sources."value-or-function-3.0.0" - sources."vinyl-2.2.1" - sources."vinyl-fs-3.0.3" - sources."vinyl-sourcemap-1.1.0" sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yargs-16.2.0" @@ -119617,7 +118351,7 @@ in sources."async-1.5.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."balanced-match-1.0.2" sources."bcrypt-pbkdf-1.0.2" sources."boolbase-1.0.0" @@ -119760,7 +118494,7 @@ in sources."prompt-1.0.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."read-1.0.7" sources."readable-stream-1.1.14" @@ -119878,7 +118612,7 @@ in sources."async-1.5.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."balanced-match-1.0.2" sources."bcrypt-pbkdf-1.0.2" sources."boolbase-1.0.0" @@ -119999,7 +118733,7 @@ in sources."prelude-ls-1.1.2" sources."prompt-1.0.0" sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."read-1.0.7" sources."readable-stream-1.1.14" @@ -120096,10 +118830,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "6.0.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-6.0.1.tgz"; - sha512 = "aNodtj1jyuEqzYmkYh+vTfRuzLkG3RZkvYxFCuLeXXzIYD5pjMHtf+1q4m03SPsZt+cElhhwkgjdg6GjihraBw=="; + url = "https://registry.npmjs.org/lerna/-/lerna-6.4.1.tgz"; + sha512 = "0t8TSG4CDAn5+vORjvTFn/ZEGyc4LOEsyBUpzcdIxODHPKM4TVOGvbW9dBs1g40PhOrQfwhHS+3fSx/42j42dQ=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -120117,39 +118851,39 @@ in sources."@gar/promisify-1.1.3" sources."@hutson/parse-repository-url-3.0.2" sources."@isaacs/string-locale-compare-1.1.0" - sources."@lerna/add-6.0.1" - sources."@lerna/bootstrap-6.0.1" - sources."@lerna/changed-6.0.1" - sources."@lerna/check-working-tree-6.0.1" - sources."@lerna/child-process-6.0.1" - sources."@lerna/clean-6.0.1" - sources."@lerna/cli-6.0.1" - sources."@lerna/collect-uncommitted-6.0.1" - sources."@lerna/collect-updates-6.0.1" - sources."@lerna/command-6.0.1" - sources."@lerna/conventional-commits-6.0.1" - (sources."@lerna/create-6.0.1" // { + sources."@lerna/add-6.4.1" + sources."@lerna/bootstrap-6.4.1" + sources."@lerna/changed-6.4.1" + sources."@lerna/check-working-tree-6.4.1" + sources."@lerna/child-process-6.4.1" + sources."@lerna/clean-6.4.1" + sources."@lerna/cli-6.4.1" + sources."@lerna/collect-uncommitted-6.4.1" + sources."@lerna/collect-updates-6.4.1" + sources."@lerna/command-6.4.1" + sources."@lerna/conventional-commits-6.4.1" + (sources."@lerna/create-6.4.1" // { dependencies = [ sources."builtins-5.0.1" sources."validate-npm-package-name-4.0.0" sources."yargs-parser-20.2.4" ]; }) - sources."@lerna/create-symlink-6.0.1" - sources."@lerna/describe-ref-6.0.1" - sources."@lerna/diff-6.0.1" - sources."@lerna/exec-6.0.1" - sources."@lerna/filter-options-6.0.1" - sources."@lerna/filter-packages-6.0.1" - sources."@lerna/get-npm-exec-opts-6.0.1" - sources."@lerna/get-packed-6.0.1" - sources."@lerna/github-client-6.0.1" - sources."@lerna/gitlab-client-6.0.1" - sources."@lerna/global-options-6.0.1" - sources."@lerna/has-npm-version-6.0.1" - sources."@lerna/import-6.0.1" - sources."@lerna/info-6.0.1" - (sources."@lerna/init-6.0.1" // { + sources."@lerna/create-symlink-6.4.1" + sources."@lerna/describe-ref-6.4.1" + sources."@lerna/diff-6.4.1" + sources."@lerna/exec-6.4.1" + sources."@lerna/filter-options-6.4.1" + sources."@lerna/filter-packages-6.4.1" + sources."@lerna/get-npm-exec-opts-6.4.1" + sources."@lerna/get-packed-6.4.1" + sources."@lerna/github-client-6.4.1" + sources."@lerna/gitlab-client-6.4.1" + sources."@lerna/global-options-6.4.1" + sources."@lerna/has-npm-version-6.4.1" + sources."@lerna/import-6.4.1" + sources."@lerna/info-6.4.1" + (sources."@lerna/init-6.4.1" // { dependencies = [ sources."detect-indent-6.1.0" sources."is-plain-obj-2.1.0" @@ -120160,23 +118894,23 @@ in sources."write-json-file-4.3.0" ]; }) - sources."@lerna/link-6.0.1" - sources."@lerna/list-6.0.1" - sources."@lerna/listable-6.0.1" - sources."@lerna/log-packed-6.0.1" - sources."@lerna/npm-conf-6.0.1" - sources."@lerna/npm-dist-tag-6.0.1" - sources."@lerna/npm-install-6.0.1" - sources."@lerna/npm-publish-6.0.1" - sources."@lerna/npm-run-script-6.0.1" - sources."@lerna/otplease-6.0.1" - sources."@lerna/output-6.0.1" - sources."@lerna/pack-directory-6.0.1" - sources."@lerna/package-6.0.1" - sources."@lerna/package-graph-6.0.1" - sources."@lerna/prerelease-id-from-version-6.0.1" - sources."@lerna/profiler-6.0.1" - (sources."@lerna/project-6.0.1" // { + sources."@lerna/link-6.4.1" + sources."@lerna/list-6.4.1" + sources."@lerna/listable-6.4.1" + sources."@lerna/log-packed-6.4.1" + sources."@lerna/npm-conf-6.4.1" + sources."@lerna/npm-dist-tag-6.4.1" + sources."@lerna/npm-install-6.4.1" + sources."@lerna/npm-publish-6.4.1" + sources."@lerna/npm-run-script-6.4.1" + sources."@lerna/otplease-6.4.1" + sources."@lerna/output-6.4.1" + sources."@lerna/pack-directory-6.4.1" + sources."@lerna/package-6.4.1" + sources."@lerna/package-graph-6.4.1" + sources."@lerna/prerelease-id-from-version-6.4.1" + sources."@lerna/profiler-6.4.1" + (sources."@lerna/project-6.4.1" // { dependencies = [ sources."detect-indent-6.1.0" sources."is-plain-obj-2.1.0" @@ -120187,26 +118921,26 @@ in sources."write-json-file-4.3.0" ]; }) - sources."@lerna/prompt-6.0.1" - sources."@lerna/publish-6.0.1" - sources."@lerna/pulse-till-done-6.0.1" - sources."@lerna/query-graph-6.0.1" - sources."@lerna/resolve-symlink-6.0.1" - sources."@lerna/rimraf-dir-6.0.1" - sources."@lerna/run-6.0.1" - sources."@lerna/run-lifecycle-6.0.1" - sources."@lerna/run-topologically-6.0.1" - sources."@lerna/symlink-binary-6.0.1" - sources."@lerna/symlink-dependencies-6.0.1" - (sources."@lerna/temp-write-6.0.1" // { + sources."@lerna/prompt-6.4.1" + sources."@lerna/publish-6.4.1" + sources."@lerna/pulse-till-done-6.4.1" + sources."@lerna/query-graph-6.4.1" + sources."@lerna/resolve-symlink-6.4.1" + sources."@lerna/rimraf-dir-6.4.1" + sources."@lerna/run-6.4.1" + sources."@lerna/run-lifecycle-6.4.1" + sources."@lerna/run-topologically-6.4.1" + sources."@lerna/symlink-binary-6.4.1" + sources."@lerna/symlink-dependencies-6.4.1" + (sources."@lerna/temp-write-6.4.1" // { dependencies = [ sources."make-dir-3.1.0" sources."semver-6.3.0" ]; }) - sources."@lerna/timer-6.0.1" - sources."@lerna/validation-error-6.0.1" - (sources."@lerna/version-6.0.1" // { + sources."@lerna/timer-6.4.1" + sources."@lerna/validation-error-6.4.1" + (sources."@lerna/version-6.4.1" // { dependencies = [ sources."detect-indent-6.1.0" sources."is-plain-obj-2.1.0" @@ -120220,7 +118954,7 @@ in sources."write-json-file-4.3.0" ]; }) - (sources."@lerna/write-log-file-6.0.1" // { + (sources."@lerna/write-log-file-6.4.1" // { dependencies = [ sources."write-file-atomic-4.0.2" ]; @@ -120248,8 +118982,8 @@ in (sources."@npmcli/map-workspaces-2.0.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-8.0.3" - sources."minimatch-5.1.0" + sources."glob-8.1.0" + sources."minimatch-5.1.6" ]; }) sources."@npmcli/metavuln-calculator-3.1.1" @@ -120259,58 +118993,57 @@ in sources."@npmcli/package-json-2.0.0" sources."@npmcli/promise-spawn-3.0.0" sources."@npmcli/run-script-4.2.1" - sources."@nrwl/cli-15.0.10" - (sources."@nrwl/devkit-15.0.10" // { + sources."@nrwl/cli-15.6.3" + (sources."@nrwl/devkit-15.6.3" // { dependencies = [ sources."semver-7.3.4" ]; }) - sources."@nrwl/tao-15.0.10" - sources."@octokit/auth-token-3.0.2" - sources."@octokit/core-4.1.0" - (sources."@octokit/endpoint-7.0.3" // { + sources."@nrwl/tao-15.6.3" + sources."@octokit/auth-token-3.0.3" + sources."@octokit/core-4.2.0" + (sources."@octokit/endpoint-7.0.5" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/graphql-5.0.4" - sources."@octokit/openapi-types-14.0.0" + sources."@octokit/graphql-5.0.5" + sources."@octokit/openapi-types-16.0.0" sources."@octokit/plugin-enterprise-rest-6.0.1" - sources."@octokit/plugin-paginate-rest-5.0.1" + sources."@octokit/plugin-paginate-rest-6.0.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-6.7.0" - (sources."@octokit/request-6.2.2" // { + sources."@octokit/plugin-rest-endpoint-methods-7.0.1" + (sources."@octokit/request-6.2.3" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/request-error-3.0.2" - sources."@octokit/rest-19.0.5" - sources."@octokit/types-8.0.0" + sources."@octokit/request-error-3.0.3" + sources."@octokit/rest-19.0.7" + sources."@octokit/types-9.0.0" sources."@parcel/watcher-2.0.4" sources."@phenomnomnominal/tsquery-4.1.1" - sources."@swc-node/core-1.9.1" - sources."@swc-node/register-1.5.4" - sources."@swc-node/sourcemap-support-0.2.2" - sources."@swc/core-1.3.14" - sources."@swc/core-darwin-arm64-1.3.14" - sources."@swc/core-darwin-x64-1.3.14" - sources."@swc/core-linux-arm-gnueabihf-1.3.14" - sources."@swc/core-linux-arm64-gnu-1.3.14" - sources."@swc/core-linux-arm64-musl-1.3.14" - sources."@swc/core-linux-x64-gnu-1.3.14" - sources."@swc/core-linux-x64-musl-1.3.14" - sources."@swc/core-win32-arm64-msvc-1.3.14" - sources."@swc/core-win32-ia32-msvc-1.3.14" - sources."@swc/core-win32-x64-msvc-1.3.14" + sources."@swc-node/core-1.9.2" + sources."@swc-node/register-1.5.5" + sources."@swc-node/sourcemap-support-0.2.3" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" sources."@tootallnate/once-2.0.0" - sources."@types/json5-0.0.29" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@yarnpkg/lockfile-1.1.0" - (sources."@yarnpkg/parsers-3.0.0-rc.27" // { + (sources."@yarnpkg/parsers-3.0.0-rc.36" // { dependencies = [ sources."argparse-1.0.10" sources."js-yaml-3.14.1" @@ -120331,7 +119064,6 @@ in }) sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.2" sources."aproba-2.0.0" sources."are-we-there-yet-3.0.1" sources."argparse-2.0.1" @@ -120343,7 +119075,7 @@ in sources."async-3.2.4" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - sources."axios-1.1.3" + sources."axios-1.2.6" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."before-after-hook-2.2.3" @@ -120353,7 +119085,6 @@ in sources."write-file-atomic-4.0.2" ]; }) - sources."binary-extensions-2.2.0" sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -120364,9 +119095,9 @@ in (sources."cacache-16.1.3" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-8.0.3" + sources."glob-8.1.0" sources."lru-cache-7.14.1" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" ]; }) sources."callsites-3.1.0" @@ -120374,7 +119105,6 @@ in sources."camelcase-keys-6.2.2" sources."chalk-4.1.2" sources."chardet-0.7.0" - sources."chokidar-3.5.3" sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."clean-stack-2.2.0" @@ -120418,7 +119148,7 @@ in sources."conventional-commits-parser-3.2.4" sources."conventional-recommended-bump-6.1.0" sources."core-util-is-1.0.3" - sources."cosmiconfig-7.0.1" + sources."cosmiconfig-7.1.0" sources."cross-spawn-7.0.3" sources."dargs-7.0.0" sources."dateformat-3.0.3" @@ -120465,12 +119195,12 @@ in ]; }) sources."fast-glob-3.2.12" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."figures-3.2.0" (sources."filelist-1.0.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" ]; }) sources."fill-range-7.0.1" @@ -120482,7 +119212,6 @@ in sources."fs-extra-9.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."gauge-4.0.4" sources."get-caller-file-2.0.5" @@ -120521,18 +119250,18 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-3.0.8" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" (sources."ignore-walk-5.0.1" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" ]; }) (sources."import-fresh-3.3.0" // { @@ -120559,7 +119288,6 @@ in sources."inquirer-8.2.5" sources."ip-2.0.0" sources."is-arrayish-0.2.1" - sources."is-binary-path-2.1.0" sources."is-ci-2.0.0" sources."is-core-module-2.11.0" sources."is-docker-2.2.1" @@ -120588,12 +119316,12 @@ in sources."json-parse-even-better-errors-2.3.1" sources."json-stringify-nice-1.1.4" sources."json-stringify-safe-5.0.1" - sources."json5-1.0.1" + sources."json5-2.2.3" sources."jsonc-parser-3.2.0" sources."jsonfile-6.1.0" sources."jsonparse-1.3.1" - sources."just-diff-5.1.1" - sources."just-diff-apply-5.4.1" + sources."just-diff-5.2.0" + sources."just-diff-apply-5.5.0" sources."kind-of-6.0.3" (sources."libnpmaccess-6.0.4" // { dependencies = [ @@ -120670,7 +119398,7 @@ in sources."arrify-1.0.1" ]; }) - sources."minipass-3.3.5" + sources."minipass-3.3.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-2.1.2" sources."minipass-flush-1.0.5" @@ -120687,9 +119415,9 @@ in sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."node-addon-api-3.2.1" - sources."node-fetch-2.6.7" - sources."node-gyp-9.3.0" - sources."node-gyp-build-4.5.0" + sources."node-fetch-2.6.8" + sources."node-gyp-9.3.1" + sources."node-gyp-build-4.6.0" sources."nopt-6.0.0" (sources."normalize-package-data-4.0.1" // { dependencies = [ @@ -120697,7 +119425,6 @@ in sources."lru-cache-7.14.1" ]; }) - sources."normalize-path-3.0.0" sources."npm-bundled-1.1.2" sources."npm-install-checks-5.0.0" sources."npm-normalize-package-bin-1.0.1" @@ -120705,8 +119432,8 @@ in (sources."npm-packlist-5.1.3" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-8.0.3" - sources."minimatch-5.1.0" + sources."glob-8.1.0" + sources."minimatch-5.1.6" sources."npm-bundled-2.0.1" sources."npm-normalize-package-bin-2.0.0" ]; @@ -120732,13 +119459,13 @@ in }) sources."npm-run-path-4.0.1" sources."npmlog-6.0.2" - (sources."nx-15.0.10" // { + (sources."nx-15.6.3" // { dependencies = [ - sources."chalk-4.1.0" sources."cli-spinners-2.6.1" sources."fast-glob-3.2.7" - sources."fs-extra-10.1.0" + sources."fs-extra-11.1.0" sources."glob-7.1.4" + sources."lines-and-columns-2.0.3" sources."minimatch-3.0.5" sources."semver-7.3.4" sources."tmp-0.2.1" @@ -120807,8 +119534,8 @@ in (sources."read-package-json-5.0.2" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-8.0.3" - sources."minimatch-5.1.0" + sources."glob-8.1.0" + sources."minimatch-5.1.6" sources."npm-normalize-package-bin-2.0.0" ]; }) @@ -120837,7 +119564,6 @@ in }) sources."readable-stream-3.6.0" sources."readdir-scoped-modules-1.1.0" - sources."readdirp-3.6.0" sources."redent-3.0.0" sources."require-directory-2.1.1" sources."resolve-1.22.1" @@ -120849,7 +119575,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.7" + sources."rxjs-7.8.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.8" @@ -120882,7 +119608,11 @@ in sources."strong-log-transformer-2.1.0" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tar-6.1.12" + (sources."tar-6.1.13" // { + dependencies = [ + sources."minipass-4.0.0" + ]; + }) sources."tar-stream-2.2.0" sources."temp-dir-1.0.0" sources."text-extensions-1.9.0" @@ -120893,16 +119623,16 @@ in sources."tr46-0.0.3" sources."treeverse-2.0.0" sources."trim-newlines-3.0.1" - (sources."tsconfig-paths-3.14.1" // { + (sources."tsconfig-paths-4.1.2" // { dependencies = [ sources."strip-bom-3.0.0" ]; }) - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."uglify-js-3.17.4" sources."unique-filename-2.0.1" sources."unique-slug-3.0.0" @@ -120966,7 +119696,7 @@ in sources."make-dir-2.1.0" sources."mime-1.6.0" sources."ms-2.1.3" - sources."needle-3.1.0" + sources."needle-3.2.0" sources."parse-node-version-1.0.1" sources."pify-4.0.1" sources."prr-1.0.1" @@ -120974,7 +119704,7 @@ in sources."sax-1.2.4" sources."semver-5.7.1" sources."source-map-0.6.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; buildInputs = globalBuildInputs; meta = { @@ -121032,7 +119762,7 @@ in sources."arr-union-3.1.0" sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."atob-2.1.2" (sources."base-0.11.2" // { dependencies = [ @@ -121077,7 +119807,7 @@ in sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."debug-2.6.9" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."define-property-2.0.2" sources."depd-2.0.0" sources."destroy-1.2.0" @@ -121365,11 +120095,11 @@ in sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."backo2-1.0.2" (sources."base-0.11.2" // { dependencies = [ @@ -121430,7 +120160,7 @@ in sources."core-util-is-1.0.3" sources."dashdash-1.14.1" sources."debug-2.6.9" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" (sources."define-property-2.0.2" // { dependencies = [ sources."isobject-3.0.1" @@ -121442,7 +120172,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-3.6.0" // { + (sources."engine.io-3.6.1" // { dependencies = [ sources."cookie-0.4.2" sources."debug-4.1.1" @@ -121488,7 +120218,7 @@ in sources."fresh-0.5.2" sources."fsevents-1.2.13" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."github-slugger-1.5.0" @@ -121602,7 +120332,7 @@ in ]; }) sources."negotiator-0.6.3" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."normalize-path-2.1.1" sources."oauth-sign-0.9.0" (sources."object-copy-0.1.0" // { @@ -121617,7 +120347,7 @@ in }) ]; }) - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" (sources."object-visit-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -121644,7 +120374,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.11.0" (sources."randomatic-3.1.1" // { dependencies = [ @@ -121770,10 +120500,10 @@ in dependencies = [ sources."debug-3.1.0" sources."isarray-2.0.1" - sources."socket.io-parser-3.3.2" + sources."socket.io-parser-3.3.3" ]; }) - (sources."socket.io-parser-3.4.1" // { + (sources."socket.io-parser-3.4.2" // { dependencies = [ sources."component-emitter-1.2.1" sources."debug-4.1.1" @@ -121931,7 +120661,7 @@ in sources."@types/commander-2.12.2" sources."@types/diff-3.5.5" sources."@types/get-stdin-5.0.1" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -122002,10 +120732,10 @@ in manta = nodeEnv.buildNodePackage { name = "manta"; packageName = "manta"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/manta/-/manta-5.3.1.tgz"; - sha512 = "dmDJIOPe+2NbouJXfuVYMbdLD8BqBPNC83D4RDXbLxhI4Cn6szoHp9OnU1jusHoftZcgMultmzTh4xFaMqtjFA=="; + url = "https://registry.npmjs.org/manta/-/manta-5.3.2.tgz"; + sha512 = "Vsgmc7hZbra1oicuHH9e5UNkcVyRJiH+Y4uvpTW3OQ60NhUAbv3V+re3ZtyN51MH3QJ9WNgkMAfR8dZ3Sv5gCw=="; }; dependencies = [ sources."ansi-regex-4.1.1" @@ -122194,10 +120924,10 @@ in markdownlint-cli = nodeEnv.buildNodePackage { name = "markdownlint-cli"; packageName = "markdownlint-cli"; - version = "0.32.2"; + version = "0.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.32.2.tgz"; - sha512 = "xmJT1rGueUgT4yGNwk6D0oqQr90UJ7nMyakXtqjgswAkEhYYqjHew9RY8wDbOmh2R270IWjuKSeZzHDEGPAUkQ=="; + url = "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.33.0.tgz"; + sha512 = "zMK1oHpjYkhjO+94+ngARiBBrRDEUMzooDHBAHtmEIJ9oYddd9l3chCReY2mPlecwH7gflQp1ApilTo+o0zopQ=="; }; dependencies = [ sources."argparse-2.0.1" @@ -122209,18 +120939,17 @@ in sources."fs.realpath-1.0.0" sources."get-stdin-9.0.0" sources."glob-8.0.3" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-3.0.1" sources."js-yaml-4.1.0" - sources."jsonc-parser-3.1.0" + sources."jsonc-parser-3.2.0" sources."linkify-it-4.0.1" sources."markdown-it-13.0.1" - sources."markdownlint-0.26.2" - sources."markdownlint-rule-helpers-0.17.2" + sources."markdownlint-0.27.0" sources."mdurl-1.0.1" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" sources."minimist-1.2.7" sources."once-1.4.0" sources."run-con-1.2.11" @@ -122241,10 +120970,10 @@ in markdownlint-cli2 = nodeEnv.buildNodePackage { name = "markdownlint-cli2"; packageName = "markdownlint-cli2"; - version = "0.5.1"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.5.1.tgz"; - sha512 = "f3Nb1GF/c8YSrV/FntsCWzpa5mLFJRlO+wzEgv+lkNQjU6MZflUwc2FbyEDPTo6oVhP2VyUOkK0GkFgfuktl1w=="; + url = "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.6.0.tgz"; + sha512 = "Bv20r6WGdcHMWi8QvAFZ3CBunf4i4aYmVdTfpAvXODI/1k3f09DZZ0i0LcX9ZMhlVxjoOzbVDz1NWyKc5hwTqg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -122255,18 +120984,18 @@ in sources."dir-glob-3.0.1" sources."entities-3.0.1" sources."fast-glob-3.2.12" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" - sources."globby-13.1.2" - sources."ignore-5.2.0" + sources."globby-13.1.3" + sources."ignore-5.2.4" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."linkify-it-4.0.1" sources."markdown-it-13.0.1" - sources."markdownlint-0.26.2" - sources."markdownlint-cli2-0.5.1" + sources."markdownlint-0.27.0" + sources."markdownlint-cli2-0.6.0" sources."markdownlint-cli2-formatter-default-0.0.3" sources."mdurl-1.0.1" sources."merge2-1.4.1" @@ -122280,7 +121009,7 @@ in sources."strip-json-comments-5.0.0" sources."to-regex-range-5.0.1" sources."uc.micro-1.0.6" - sources."yaml-2.1.1" + sources."yaml-2.2.1" ]; buildInputs = globalBuildInputs; meta = { @@ -122328,14 +121057,14 @@ in sources."link-check-5.2.0" sources."lodash-4.17.21" sources."markdown-link-extractor-3.1.0" - sources."marked-4.2.2" + sources."marked-4.2.12" sources."ms-2.1.3" - sources."needle-3.1.0" + sources."needle-3.2.0" sources."nth-check-2.1.1" - sources."parse5-7.1.1" + sources."parse5-7.1.2" sources."parse5-htmlparser2-tree-adapter-7.0.0" sources."progress-2.0.3" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."supports-color-7.2.0" @@ -122357,59 +121086,63 @@ in src = ../../applications/editors/vim/plugins/markdown-preview-nvim; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.1" + sources."@babel/compat-data-7.20.14" (sources."@babel/core-7.0.0" // { dependencies = [ sources."debug-3.2.7" ]; }) - sources."@babel/generator-7.20.2" + sources."@babel/generator-7.20.14" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" - (sources."@babel/helper-compilation-targets-7.20.0" // { + (sources."@babel/helper-compilation-targets-7.20.7" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-regexp-features-plugin-7.19.0" + sources."@babel/helper-create-regexp-features-plugin-7.20.5" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-explode-assignable-expression-7.18.6" (sources."@babel/helper-function-name-7.19.0" // { dependencies = [ - sources."@babel/template-7.18.10" + sources."@babel/template-7.20.7" ]; }) sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.18.9" + sources."@babel/helper-member-expression-to-functions-7.20.7" sources."@babel/helper-module-imports-7.18.6" - (sources."@babel/helper-module-transforms-7.20.2" // { + (sources."@babel/helper-module-transforms-7.20.11" // { dependencies = [ - sources."@babel/template-7.18.10" + sources."@babel/template-7.20.7" ]; }) sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.20.2" sources."@babel/helper-remap-async-to-generator-7.18.9" - sources."@babel/helper-replace-supers-7.19.1" + (sources."@babel/helper-replace-supers-7.20.7" // { + dependencies = [ + sources."@babel/template-7.20.7" + ]; + }) sources."@babel/helper-simple-access-7.20.2" sources."@babel/helper-skip-transparent-expression-wrappers-7.20.0" sources."@babel/helper-split-export-declaration-7.18.6" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - (sources."@babel/helper-wrap-function-7.19.0" // { + (sources."@babel/helper-wrap-function-7.20.5" // { dependencies = [ - sources."@babel/template-7.18.10" + sources."@babel/template-7.20.7" ]; }) - (sources."@babel/helpers-7.20.1" // { + (sources."@babel/helpers-7.20.13" // { dependencies = [ - sources."@babel/template-7.18.10" + sources."@babel/template-7.20.7" ]; }) sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.2" - sources."@babel/plugin-proposal-async-generator-functions-7.20.1" + sources."@babel/parser-7.20.13" + sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.0.0" sources."@babel/plugin-proposal-json-strings-7.18.6" sources."@babel/plugin-proposal-object-rest-spread-7.0.0" @@ -122422,38 +121155,42 @@ in sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" - sources."@babel/plugin-transform-arrow-functions-7.18.6" - sources."@babel/plugin-transform-async-to-generator-7.18.6" + sources."@babel/plugin-transform-arrow-functions-7.20.7" + sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.2" - sources."@babel/plugin-transform-classes-7.20.2" - sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.20.2" + sources."@babel/plugin-transform-block-scoping-7.20.14" + sources."@babel/plugin-transform-classes-7.20.7" + (sources."@babel/plugin-transform-computed-properties-7.20.7" // { + dependencies = [ + sources."@babel/template-7.20.7" + ]; + }) + sources."@babel/plugin-transform-destructuring-7.20.7" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" sources."@babel/plugin-transform-for-of-7.18.8" sources."@babel/plugin-transform-function-name-7.18.9" sources."@babel/plugin-transform-literals-7.18.9" - sources."@babel/plugin-transform-modules-amd-7.19.6" - sources."@babel/plugin-transform-modules-commonjs-7.19.6" - sources."@babel/plugin-transform-modules-systemjs-7.19.6" + sources."@babel/plugin-transform-modules-amd-7.20.11" + sources."@babel/plugin-transform-modules-commonjs-7.20.11" + sources."@babel/plugin-transform-modules-systemjs-7.20.11" sources."@babel/plugin-transform-modules-umd-7.18.6" sources."@babel/plugin-transform-new-target-7.18.6" sources."@babel/plugin-transform-object-super-7.18.6" - sources."@babel/plugin-transform-parameters-7.20.1" + sources."@babel/plugin-transform-parameters-7.20.7" sources."@babel/plugin-transform-react-display-name-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.19.0" + sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/plugin-transform-react-jsx-self-7.18.6" sources."@babel/plugin-transform-react-jsx-source-7.19.6" - sources."@babel/plugin-transform-regenerator-7.18.6" + sources."@babel/plugin-transform-regenerator-7.20.5" (sources."@babel/plugin-transform-runtime-7.0.0" // { dependencies = [ sources."resolve-1.22.1" ]; }) sources."@babel/plugin-transform-shorthand-properties-7.18.6" - sources."@babel/plugin-transform-spread-7.19.0" + sources."@babel/plugin-transform-spread-7.20.7" sources."@babel/plugin-transform-sticky-regex-7.18.6" sources."@babel/plugin-transform-template-literals-7.18.9" sources."@babel/plugin-transform-typeof-symbol-7.18.9" @@ -122471,9 +121208,10 @@ in ]; }) sources."@babel/template-7.0.0" - sources."@babel/traverse-7.20.1" - sources."@babel/types-7.20.2" - sources."@chemzqm/neovim-5.8.0" + sources."@babel/traverse-7.20.13" + sources."@babel/types-7.20.7" + sources."@chemzqm/msgpack-lite-0.1.29" + sources."@chemzqm/neovim-5.9.5" sources."@jridgewell/gen-mapping-0.3.2" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -122512,7 +121250,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."any-promise-1.3.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."aproba-1.2.0" sources."argparse-2.0.1" sources."arr-diff-4.0.0" @@ -122538,7 +121276,7 @@ in ]; }) sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."atob-2.1.2" (sources."autodll-webpack-plugin-0.4.2" // { dependencies = [ @@ -122546,6 +121284,7 @@ in sources."pkg-dir-2.0.0" ]; }) + sources."available-typed-arrays-1.0.5" sources."babel-core-7.0.0-bridge.0" (sources."babel-loader-8.0.2" // { dependencies = [ @@ -122613,7 +121352,7 @@ in }) sources."cache-base-1.0.1" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."case-sensitive-paths-webpack-plugin-2.1.2" sources."chalk-2.4.2" sources."chart.js-2.9.4" @@ -122685,7 +121424,7 @@ in sources."cyclist-1.0.1" sources."date-format-4.0.14" sources."debug-4.3.4" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."define-properties-1.1.4" sources."define-property-2.0.2" sources."del-3.0.0" @@ -122710,7 +121449,7 @@ in sources."emojis-list-2.1.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.6.0" // { + (sources."engine.io-3.6.1" // { dependencies = [ sources."debug-4.1.1" ]; @@ -122731,8 +121470,9 @@ in sources."errno-0.1.8" sources."error-ex-1.3.2" sources."error-stack-parser-2.1.4" - sources."es-abstract-1.20.4" + sources."es-abstract-1.21.1" sources."es-array-method-boxes-properly-1.0.0" + sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -122823,17 +121563,19 @@ in sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."glob-7.1.2" sources."glob-parent-5.1.2" sources."globals-11.12.0" + sources."globalthis-1.0.3" (sources."globby-6.1.0" // { dependencies = [ sources."pify-2.3.0" ]; }) + sources."gopd-1.0.1" sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -122846,6 +121588,7 @@ in sources."has-cors-1.1.0" sources."has-flag-3.0.0" sources."has-property-descriptors-1.0.0" + sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" @@ -122881,9 +121624,10 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."int64-buffer-0.1.10" - sources."internal-slot-1.0.3" + sources."internal-slot-1.0.4" sources."invariant-2.2.4" sources."is-accessor-descriptor-1.0.0" + sources."is-array-buffer-3.0.1" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" @@ -122914,6 +121658,7 @@ in sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.10" sources."is-weakref-1.0.2" sources."is-windows-1.0.2" sources."isarray-1.0.0" @@ -122945,7 +121690,7 @@ in sources."locate-path-3.0.0" sources."lodash-4.17.21" sources."log-update-2.3.0" - sources."log4js-6.7.0" + sources."log4js-6.7.1" sources."loose-envify-1.4.0" sources."lru-cache-5.1.1" sources."make-dir-1.3.0" @@ -123000,13 +121745,13 @@ in sources."neo-async-2.6.2" sources."next-7.0.3" sources."next-routes-1.4.2" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."resolve-1.22.1" @@ -123027,7 +121772,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.4" @@ -123093,7 +121838,7 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" @@ -123115,15 +121860,15 @@ in sources."reflect.ownkeys-0.2.0" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-10.1.0" - sources."regenerator-runtime-0.13.10" - (sources."regenerator-transform-0.15.0" // { + sources."regenerator-runtime-0.13.11" + (sources."regenerator-transform-0.15.1" // { dependencies = [ - sources."@babel/runtime-7.20.1" + sources."@babel/runtime-7.20.13" ]; }) sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.4.3" - sources."regexpu-core-5.2.1" + sources."regexpu-core-5.2.2" sources."regjsgen-0.7.1" (sources."regjsparser-0.9.1" // { dependencies = [ @@ -123216,10 +121961,10 @@ in sources."debug-3.1.0" sources."isarray-2.0.1" sources."ms-2.0.0" - sources."socket.io-parser-3.3.2" + sources."socket.io-parser-3.3.3" ]; }) - (sources."socket.io-parser-3.4.1" // { + (sources."socket.io-parser-3.4.2" // { dependencies = [ sources."component-emitter-1.2.1" sources."debug-4.1.1" @@ -123266,7 +122011,7 @@ in sources."stream-each-1.2.3" sources."stream-http-2.8.3" sources."stream-shift-1.0.1" - sources."streamroller-3.1.3" + sources."streamroller-3.1.4" sources."string-hash-1.1.3" (sources."string-width-2.1.1" // { dependencies = [ @@ -123274,8 +122019,8 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" + sources."string.prototype.trimend-1.0.6" + sources."string.prototype.trimstart-1.0.6" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" @@ -123310,6 +122055,7 @@ in sources."to-regex-range-2.1.1" sources."tslib-1.14.1" sources."tty-browserify-0.0.0" + sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" sources."uc.micro-1.0.6" (sources."uglify-es-3.3.10" // { @@ -123336,7 +122082,7 @@ in sources."unfetch-3.0.0" 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" + sources."unicode-match-property-value-ecmascript-2.1.0" sources."unicode-property-aliases-ecmascript-2.1.0" sources."union-value-1.0.1" sources."unique-filename-1.1.1" @@ -123410,6 +122156,7 @@ in sources."webpackbar-2.6.3" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" + sources."which-typed-array-1.1.9" sources."worker-farm-1.5.2" (sources."wrap-ansi-3.0.1" // { dependencies = [ @@ -123468,7 +122215,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."babel-code-frame-6.26.0" sources."balanced-match-1.0.2" sources."bcrypt-pbkdf-1.0.2" @@ -123603,7 +122350,7 @@ in sources."jsbn-0.1.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-1.0.2" sources."json-stringify-safe-5.0.1" sources."jsonify-0.0.1" sources."jsonpointer-5.0.1" @@ -123658,7 +122405,7 @@ in sources."process-nextick-args-2.0.1" sources."progress-1.1.8" sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."readable-stream-2.3.7" sources."readline-1.3.0" @@ -123798,15 +122545,24 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "9.1.7"; + version = "9.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-9.1.7.tgz"; - sha512 = "m7sAmOHhG6bmY1IEy+rSvyrQrKA/XIM6PFWP7w+3uW/C+uanPrIt0ieLL2NJfvfzLMkvEin1ClYE+pA6Y7Jwnw=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-9.3.0.tgz"; + sha512 = "mjMGQTJys6HfUICwESbQhdNqbJA5JiW8Fp/QvOVnlz9bwRJPVJCW85bumEYu+eyE2sDuXszCu+T6yn+Lwjbw/w=="; }; dependencies = [ - sources."@types/node-18.11.9" + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.19.1" + (sources."@babel/highlight-7.18.6" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) + sources."@types/node-18.11.18" sources."@types/yauzl-2.10.0" sources."agent-base-6.0.2" + sources."ansi-styles-3.2.1" + sources."argparse-2.0.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bl-4.1.0" @@ -123814,44 +122570,62 @@ in sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."bufferutil-4.0.7" - sources."chalk-5.1.2" + sources."callsites-3.1.0" + sources."chalk-5.2.0" sources."chownr-1.1.4" - sources."commander-9.4.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."commander-9.5.0" sources."concat-map-0.0.1" + sources."cosmiconfig-8.0.0" sources."cross-fetch-3.1.5" sources."debug-4.3.4" - sources."devtools-protocol-0.0.1045489" + sources."devtools-protocol-0.0.1082910" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" + sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" sources."extract-zip-2.0.1" sources."fd-slicer-1.1.0" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" sources."get-stream-5.2.0" sources."glob-7.2.3" + sources."has-flag-3.0.0" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" + sources."import-fresh-3.3.0" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."is-arrayish-0.2.1" + sources."js-tokens-4.0.0" + sources."js-yaml-4.1.0" + sources."json-parse-even-better-errors-2.3.1" + sources."lines-and-columns-1.2.4" sources."minimatch-3.1.2" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."node-fetch-2.6.7" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."once-1.4.0" + sources."parent-module-1.0.1" + sources."parse-json-5.2.0" sources."path-is-absolute-1.0.1" + sources."path-type-4.0.0" sources."pend-1.2.0" sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-18.2.1" - sources."puppeteer-core-18.2.1" + sources."puppeteer-19.6.2" + sources."puppeteer-core-19.6.2" sources."readable-stream-3.6.0" + sources."resolve-from-4.0.0" sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."string_decoder-1.3.0" + sources."supports-color-5.5.0" sources."tar-fs-2.1.1" sources."tar-stream-2.2.0" sources."through-2.3.8" @@ -123862,7 +122636,7 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."wrappy-1.0.2" - sources."ws-8.9.0" + sources."ws-8.11.0" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -123878,16 +122652,16 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "10.1.0"; + version = "10.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz"; - sha512 = "vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg=="; + url = "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz"; + sha512 = "IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg=="; }; dependencies = [ sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."argparse-2.0.1" sources."balanced-match-1.0.2" sources."binary-extensions-2.2.0" @@ -124000,20 +122774,16 @@ in sources."combined-stream-1.0.8" sources."commander-2.20.3" sources."component-emitter-1.3.0" - sources."cookiejar-2.1.3" + sources."cookiejar-2.1.4" sources."debug-4.3.4" sources."delayed-stream-1.0.0" - sources."dezalgo-1.0.3" + sources."dezalgo-1.0.4" sources."esprima-4.0.1" sources."fast-safe-stringify-2.1.1" sources."form-data-4.0.0" - (sources."formidable-2.0.1" // { - dependencies = [ - sources."qs-6.9.3" - ]; - }) + sources."formidable-2.1.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."graphlib-2.1.8" sources."has-1.0.3" sources."has-symbols-1.0.3" @@ -124033,10 +122803,10 @@ in sources."mime-types-2.1.35" sources."ms-2.1.2" sources."native-promise-only-0.8.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."once-1.4.0" sources."path-loader-1.0.12" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -124108,7 +122878,7 @@ in sources."log-symbols-4.1.0" sources."mimic-fn-2.1.0" sources."mute-stream-0.0.8" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."onetime-5.1.2" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" @@ -124168,11 +122938,11 @@ in sources."@jest/environment-27.5.1" sources."@jest/fake-timers-27.5.1" sources."@jest/types-27.5.1" - sources."@ledgerhq/devices-7.0.3" - sources."@ledgerhq/errors-6.11.1" - sources."@ledgerhq/hw-transport-6.27.6" - sources."@ledgerhq/hw-transport-node-hid-6.27.6" - sources."@ledgerhq/hw-transport-node-hid-noevents-6.27.6" + sources."@ledgerhq/devices-7.0.7" + sources."@ledgerhq/errors-6.12.3" + sources."@ledgerhq/hw-transport-6.27.10" + sources."@ledgerhq/hw-transport-node-hid-6.27.10" + sources."@ledgerhq/hw-transport-node-hid-noevents-6.27.10" (sources."@ledgerhq/hw-transport-u2f-5.36.0-deprecated" // { dependencies = [ sources."@ledgerhq/devices-5.51.1" @@ -124200,28 +122970,20 @@ in sources."@ledgerhq/logs-6.10.1" sources."@segment/loosely-validate-event-2.0.0" sources."@sindresorhus/is-0.14.0" - sources."@sinonjs/commons-1.8.4" + sources."@sinonjs/commons-1.8.6" 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-18.11.9" + sources."@types/node-18.11.18" sources."@types/stack-utils-2.0.1" - sources."@types/yargs-16.0.4" + sources."@types/yargs-16.0.5" sources."@types/yargs-parser-21.0.0" sources."analytics-node-6.2.0" 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."asynckit-0.4.0" sources."axios-0.27.2" @@ -124260,15 +123022,12 @@ in sources."cli-boxes-2.2.1" sources."cliui-7.0.4" sources."clone-response-1.0.3" - sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."component-type-1.2.1" 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."crypt-0.0.2" @@ -124284,9 +123043,8 @@ in sources."defer-to-connect-1.1.3" sources."define-lazy-prop-2.0.0" sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" sources."depd-2.0.0" - sources."detect-libc-1.0.3" + sources."detect-libc-2.0.1" sources."dot-prop-5.3.0" sources."duplexer3-0.1.5" sources."emoji-regex-8.0.0" @@ -124305,27 +123063,18 @@ in sources."form-data-4.0.0" 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.3" - sources."global-dirs-3.0.0" + sources."global-dirs-3.0.1" sources."got-9.6.0" sources."graceful-fs-4.2.10" 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-cache-semantics-4.1.1" (sources."http-errors-1.8.1" // { dependencies = [ sources."depd-1.1.2" @@ -124354,13 +123103,12 @@ in sources."is-wsl-2.2.0" sources."is-yarn-global-0.3.0" sources."is2-2.0.9" - 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.5.0" + sources."ci-info-3.7.1" ]; }) sources."join-component-1.1.0" @@ -124399,20 +123147,13 @@ in 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-abi-3.31.0" sources."node-addon-api-3.2.1" - sources."node-fetch-2.6.7" - sources."node-gyp-build-4.5.0" - sources."node-hid-2.1.1" + sources."node-fetch-2.6.8" + sources."node-gyp-build-4.6.0" + sources."node-hid-2.1.2" 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" @@ -124426,14 +123167,13 @@ in sources."pbkdf2-3.1.2" sources."picomatch-2.3.1" sources."platform-1.3.6" - sources."prebuild-install-6.1.4" + sources."prebuild-install-7.1.1" 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" @@ -124460,19 +123200,18 @@ in 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" // { + (sources."simple-get-4.0.1" // { dependencies = [ - sources."decompress-response-4.2.1" - sources."mimic-response-2.1.0" + sources."decompress-response-6.0.0" + sources."mimic-response-3.1.0" ]; }) sources."slash-3.0.0" - (sources."stack-utils-2.0.5" // { + (sources."stack-utils-2.0.6" // { dependencies = [ sources."escape-string-regexp-2.0.0" ]; @@ -124513,7 +123252,6 @@ in 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" @@ -124565,7 +123303,7 @@ in sources."one-time-1.0.0" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-2.4.1" + sources."safe-stable-stringify-2.4.2" sources."semver-7.3.8" sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" @@ -124612,10 +123350,10 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "9.3.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.0.tgz"; - sha512 = "A6rJWfXFz7TQNjpldJ915WFb1LnhO4lIve3ANPbWreuEoLoKlFT3sxIepPBkLhM27crW8YmN+pjlgbasH6cH/Q=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.1.tgz"; + sha512 = "4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg=="; }; dependencies = [ sources."@gar/promisify-1.1.3" @@ -124634,8 +123372,8 @@ in (sources."cacache-16.1.3" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-8.0.3" - sources."minimatch-5.1.0" + sources."glob-8.1.0" + sources."minimatch-5.1.6" ]; }) sources."chownr-2.0.0" @@ -124656,7 +123394,7 @@ in sources."glob-7.2.3" sources."graceful-fs-4.2.10" sources."has-unicode-2.0.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" @@ -124673,7 +123411,7 @@ in sources."lru-cache-7.14.1" sources."make-fetch-happen-10.2.1" sources."minimatch-3.1.2" - sources."minipass-3.3.5" + sources."minipass-3.3.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-2.1.2" sources."minipass-flush-1.0.5" @@ -124709,7 +123447,11 @@ in sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" - sources."tar-6.1.12" + (sources."tar-6.1.13" // { + dependencies = [ + sources."minipass-4.0.0" + ]; + }) sources."unique-filename-2.0.1" sources."unique-slug-3.0.0" sources."util-deprecate-1.0.2" @@ -124731,10 +123473,10 @@ in node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz"; - sha512 = "2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz"; + sha512 = "NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -124769,7 +123511,7 @@ in sources."async-0.9.2" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."balanced-match-1.0.2" sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" @@ -124833,7 +123575,7 @@ in sources."fstream-ignore-1.0.5" sources."function-bind-1.1.1" sources."gauge-2.7.4" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stdin-4.0.1" (sources."getpass-0.1.7" // { dependencies = [ @@ -124871,7 +123613,7 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.4.0" - sources."json-stable-stringify-1.0.1" + sources."json-stable-stringify-1.0.2" sources."json-stringify-safe-5.0.1" sources."jsonify-0.0.1" (sources."jsprim-1.4.2" // { @@ -124910,7 +123652,7 @@ in sources."number-is-nan-1.0.1" sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."on-finished-2.4.1" sources."once-1.4.0" sources."options-0.0.6" @@ -125157,7 +123899,7 @@ in sha512 = "B6q576kLw96eKOiqNpNJsUiwl5vRipc46T0w/LUI7O3fPAVxwu5zklIBhE6Iefj8FV1IdbLwXULESqMWlwjlGQ=="; }; dependencies = [ - sources."@babel/runtime-7.20.1" + sources."@babel/runtime-7.20.13" sources."@mapbox/node-pre-gyp-1.0.10" sources."@node-red/editor-api-3.0.2" sources."@node-red/editor-client-3.0.2" @@ -125173,10 +123915,10 @@ in sources."@node-red/util-3.0.2" sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" - sources."@types/cacheable-request-6.0.2" + sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-4.2.0" - sources."@types/node-18.11.9" + sources."@types/keyv-3.1.4" + sources."@types/node-18.11.18" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -125311,7 +124053,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-3.0.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."glob-7.2.3" sources."got-11.8.5" @@ -125327,7 +124069,7 @@ in }) sources."hpagent-1.0.0" sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http2-wrapper-1.0.3" (sources."https-proxy-agent-5.0.1" // { @@ -125345,7 +124087,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" - sources."js-sdsl-4.1.4" + sources."js-sdsl-4.3.0" sources."js-yaml-4.1.0" sources."json-buffer-3.0.1" sources."json-schema-traverse-1.0.0" @@ -125356,7 +124098,7 @@ in sources."universalify-2.0.0" ]; }) - sources."keyv-4.5.1" + sources."keyv-4.5.2" sources."leven-2.1.0" sources."lodash.clonedeep-4.5.0" sources."lowercase-keys-2.0.0" @@ -125381,7 +124123,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.7" - (sources."minipass-3.3.5" // { + (sources."minipass-3.3.6" // { dependencies = [ sources."yallist-4.0.0" ]; @@ -125416,15 +124158,15 @@ in sources."mute-stream-0.0.8" sources."negotiator-0.6.3" sources."node-addon-api-3.2.1" - sources."node-fetch-2.6.7" - sources."node-gyp-build-4.5.0" + sources."node-fetch-2.6.8" + sources."node-gyp-build-4.6.0" sources."node-red-admin-3.0.0" sources."node-watch-0.7.3" sources."nopt-5.0.0" sources."normalize-url-6.1.0" sources."npmlog-5.0.1" sources."nth-check-2.1.1" - (sources."number-allocator-1.0.12" // { + (sources."number-allocator-1.0.14" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -125432,7 +124174,7 @@ in }) sources."oauth2orize-1.11.1" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -125452,7 +124194,7 @@ in sources."pseudomap-1.0.2" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.10.3" sources."quick-lru-5.1.1" sources."random-bytes-1.0.0" @@ -125464,7 +124206,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."regenerator-runtime-0.13.10" + sources."regenerator-runtime-0.13.11" sources."reinterval-1.1.0" sources."require-from-string-2.0.2" sources."resolve-alpn-1.2.1" @@ -125515,7 +124257,7 @@ in sources."toidentifier-1.0.1" sources."tough-cookie-4.0.0" sources."tr46-0.0.3" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."uglify-js-3.16.3" @@ -125567,7 +124309,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" @@ -125596,7 +124338,11 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs-extra-0.6.4" - sources."fs-minipass-2.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."fs.extra-1.3.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -125629,8 +124375,12 @@ in sources."mime-types-2.1.35" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-3.3.5" - sources."minizlib-2.1.2" + sources."minipass-4.0.0" + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."mkdirp-0.3.5" sources."ncp-0.4.2" sources."nijs-0.0.25" @@ -125672,7 +124422,7 @@ in sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.5.3" (sources."readable-stream-2.3.7" // { dependencies = [ @@ -125704,7 +124454,7 @@ in }) sources."strip-ansi-3.0.1" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."tar-6.1.12" // { + (sources."tar-6.1.13" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -125755,7 +124505,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."balanced-match-1.0.2" sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" @@ -125780,7 +124530,7 @@ in sources."pstree.remy-1.1.8" sources."readdirp-3.6.0" sources."semver-5.7.1" - (sources."simple-update-notifier-1.0.7" // { + (sources."simple-update-notifier-1.1.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -125803,10 +124553,10 @@ in np = nodeEnv.buildNodePackage { name = "np"; packageName = "np"; - version = "7.6.2"; + version = "7.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/np/-/np-7.6.2.tgz"; - sha512 = "gExmKGKixh7ITc4Q+Lv7nfCby0CVKvzri9zN8970oKD8976T4L5dw8QWUtMcXcIjhFF6h5lbvztao/NurDbmxQ=="; + url = "https://registry.npmjs.org/np/-/np-7.6.3.tgz"; + sha512 = "GTFNvIhu/cZqzUhil/AlISCiipYeAUVx0JtyjtmumFJvWogSewUSAshFi5MSMc6BOj9C98s8NAFZiqlHb2wQPQ=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -125832,14 +124582,14 @@ in }) sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.6" - sources."@types/cacheable-request-6.0.2" + sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-4.2.0" + sources."@types/keyv-3.1.4" sources."@types/minimist-1.2.2" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" - sources."@types/responselike-3.0.0" + sources."@types/responselike-1.0.0" sources."aggregate-error-3.1.0" sources."ansi-align-3.0.1" sources."ansi-escapes-4.3.2" @@ -125860,11 +124610,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."builtins-1.0.3" - (sources."cacheable-lookup-2.0.1" // { - dependencies = [ - sources."@types/keyv-3.1.4" - ]; - }) + sources."cacheable-lookup-2.0.1" (sources."cacheable-request-7.0.2" // { dependencies = [ sources."get-stream-5.2.0" @@ -125902,7 +124648,7 @@ in sources."dot-prop-5.3.0" ]; }) - sources."cosmiconfig-7.0.1" + sources."cosmiconfig-7.1.0" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."date-fns-1.30.1" @@ -125928,7 +124674,7 @@ in sources."execa-5.1.1" sources."external-editor-3.1.0" sources."fast-glob-3.2.12" - sources."fastq-1.13.0" + sources."fastq-1.15.0" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" @@ -125961,10 +124707,10 @@ in sources."has-flag-4.0.0" sources."has-yarn-2.1.0" sources."hosted-git-info-3.0.8" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."ignore-walk-3.0.4" sources."import-fresh-3.3.0" sources."import-lazy-2.1.0" @@ -126043,7 +124789,7 @@ in sources."js-tokens-4.0.0" sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" - sources."keyv-4.5.1" + sources."keyv-4.5.2" sources."kind-of-6.0.3" sources."latest-version-5.1.0" sources."lines-and-columns-1.2.4" @@ -126294,7 +125040,7 @@ in sources."unique-string-2.0.0" (sources."update-notifier-5.1.0" // { dependencies = [ - sources."global-dirs-3.0.0" + sources."global-dirs-3.0.1" sources."ini-2.0.0" sources."is-installed-globally-0.4.0" ]; @@ -126334,10 +125080,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "8.19.3"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-8.19.3.tgz"; - sha512 = "0QjmyPtDxSyMWWD8I91QGbrgx9KzbV6C9FK1liEb/K0zppiZkr5KxXc990G+LzPwBHDfRjUBlO9T1qZ08vl9mA=="; + url = "https://registry.npmjs.org/npm/-/npm-9.4.0.tgz"; + sha512 = "eT/yB9VFgnqJjMZN++RDcKPyuvEl3iM//bfJzAa3F9+x9l/x8XJUYnHAy0K6ep4JVNTxCUAp/wgy0pBicTZr5A=="; }; buildInputs = globalBuildInputs; meta = { @@ -126352,10 +125098,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "16.3.16"; + version = "16.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.3.16.tgz"; - sha512 = "OJRfwc2+p0ZnDvZQ4FOou9ev4kI6c0Lmu+uEJjijCNUSXnf5AEpyB6+kX31HsmkDzQ10ApA4CvM1TE+rXP+R8g=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.6.3.tgz"; + sha512 = "EKhsCbBcVrPlYKzaYQtRhGv9fxpexwROcvl5HebCUNpiCSlOWrzaJvrMlwi9i9GCyJCnH+YAeBPYdqnArA390A=="; }; dependencies = [ sources."@gar/promisify-1.1.3" @@ -126363,17 +125109,13 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@npmcli/fs-2.1.2" - sources."@npmcli/git-3.0.2" - sources."@npmcli/installed-package-contents-1.0.7" + sources."@npmcli/git-4.0.3" + sources."@npmcli/installed-package-contents-2.0.1" sources."@npmcli/move-file-2.0.1" - sources."@npmcli/node-gyp-2.0.0" - sources."@npmcli/promise-spawn-3.0.0" - (sources."@npmcli/run-script-4.2.1" // { - dependencies = [ - sources."read-package-json-fast-2.0.3" - ]; - }) - sources."@pnpm/network.ca-file-1.0.1" + sources."@npmcli/node-gyp-3.0.0" + sources."@npmcli/promise-spawn-6.0.2" + sources."@npmcli/run-script-6.0.0" + sources."@pnpm/network.ca-file-1.0.2" sources."@pnpm/npm-conf-1.0.5" sources."@sindresorhus/is-5.3.0" sources."@szmarczak/http-timer-5.0.1" @@ -126391,7 +125133,7 @@ in sources."argparse-2.0.1" sources."array-union-2.1.0" sources."balanced-match-1.0.2" - (sources."boxen-7.0.0" // { + (sources."boxen-7.0.1" // { dependencies = [ sources."ansi-regex-6.0.1" sources."emoji-regex-9.2.2" @@ -126403,27 +125145,26 @@ in sources."braces-3.0.2" sources."buffer-from-1.1.2" sources."builtins-5.0.1" - (sources."cacache-17.0.2" // { + (sources."cacache-17.0.4" // { dependencies = [ sources."@npmcli/fs-3.1.0" - sources."glob-8.0.3" - sources."ssri-10.0.0" + sources."glob-8.1.0" sources."unique-filename-3.0.0" sources."unique-slug-4.0.0" ]; }) sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.2" - sources."camelcase-7.0.0" - sources."chalk-5.1.2" + sources."cacheable-request-10.2.5" + sources."camelcase-7.0.1" + sources."chalk-5.2.0" sources."chownr-2.0.0" - sources."ci-info-3.5.0" + sources."ci-info-3.7.1" sources."clean-stack-2.2.0" sources."cli-boxes-3.0.0" sources."cli-table-0.3.11" sources."color-support-1.1.3" sources."colors-1.0.3" - sources."commander-9.4.1" + sources."commander-9.5.0" sources."concat-map-0.0.1" (sources."config-chain-1.1.13" // { dependencies = [ @@ -126432,7 +125173,11 @@ in }) sources."configstore-6.0.0" sources."console-control-strings-1.1.0" - sources."cross-spawn-7.0.3" + (sources."cross-spawn-7.0.3" // { + dependencies = [ + sources."which-2.0.2" + ]; + }) (sources."crypto-random-string-4.0.0" // { dependencies = [ sources."type-fest-1.4.0" @@ -126458,12 +125203,12 @@ in sources."escape-goat-4.0.0" sources."fast-glob-3.2.12" sources."fast-memoize-2.5.2" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."find-up-5.0.0" - sources."form-data-encoder-2.1.3" + sources."form-data-encoder-2.1.4" sources."fp-and-or-0.1.3" - sources."fs-minipass-2.1.0" + sources."fs-minipass-3.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-4.0.4" @@ -126476,25 +125221,25 @@ in ]; }) sources."glob-parent-5.1.2" - (sources."global-dirs-3.0.0" // { + (sources."global-dirs-3.0.1" // { dependencies = [ sources."ini-2.0.0" ]; }) sources."globby-11.1.0" - sources."got-12.5.2" + sources."got-12.5.3" sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-unicode-2.0.1" sources."has-yarn-3.0.0" sources."hosted-git-info-5.2.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" - sources."http2-wrapper-2.1.11" + sources."http2-wrapper-2.2.0" sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."ignore-walk-6.0.0" sources."import-lazy-4.0.0" sources."imurmurhash-0.1.4" @@ -126516,17 +125261,17 @@ in sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" sources."is-typedarray-1.0.0" - sources."is-yarn-global-0.4.0" + sources."is-yarn-global-0.4.1" sources."isexe-2.0.0" sources."jju-1.4.0" sources."js-yaml-4.1.0" sources."json-buffer-3.0.1" - sources."json-parse-even-better-errors-2.3.1" + sources."json-parse-even-better-errors-3.0.0" sources."json-parse-helpfulerror-1.0.3" - sources."json5-2.2.1" + sources."json5-2.2.3" sources."jsonlines-0.1.1" sources."jsonparse-1.3.1" - sources."keyv-4.5.1" + sources."keyv-4.5.2" sources."kleur-4.1.5" sources."latest-version-7.0.0" sources."locate-path-6.0.0" @@ -126536,40 +125281,84 @@ in (sources."make-fetch-happen-10.2.1" // { dependencies = [ sources."cacache-16.1.3" - sources."glob-8.0.3" + sources."fs-minipass-2.1.0" + sources."glob-8.1.0" + sources."minipass-3.3.6" + sources."ssri-9.0.1" ]; }) sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."mimic-response-4.0.0" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" sources."minimist-1.2.7" - sources."minipass-3.3.5" - sources."minipass-collect-1.0.2" - sources."minipass-fetch-2.1.2" - sources."minipass-flush-1.0.5" - sources."minipass-json-stream-1.0.1" - sources."minipass-pipeline-1.2.4" - sources."minipass-sized-1.0.3" - sources."minizlib-2.1.2" + sources."minipass-4.0.0" + (sources."minipass-collect-1.0.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-fetch-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-flush-1.0.5" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-json-stream-1.0.1" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-pipeline-1.2.4" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-sized-1.0.3" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."negotiator-0.6.3" - sources."node-gyp-9.3.0" - sources."nopt-6.0.0" - sources."normalize-package-data-4.0.1" - sources."normalize-url-7.2.0" - sources."npm-bundled-1.1.2" - sources."npm-install-checks-5.0.0" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-9.1.2" - sources."npm-packlist-7.0.2" - (sources."npm-pick-manifest-7.0.2" // { + (sources."node-gyp-9.3.1" // { dependencies = [ - sources."npm-normalize-package-bin-2.0.0" + sources."which-2.0.2" + ]; + }) + sources."nopt-6.0.0" + (sources."normalize-package-data-5.0.0" // { + dependencies = [ + sources."hosted-git-info-6.1.1" + ]; + }) + sources."normalize-url-8.0.0" + sources."npm-bundled-3.0.0" + sources."npm-install-checks-6.0.0" + sources."npm-normalize-package-bin-3.0.0" + (sources."npm-package-arg-10.1.0" // { + dependencies = [ + sources."hosted-git-info-6.1.1" + ]; + }) + sources."npm-packlist-7.0.4" + sources."npm-pick-manifest-8.0.1" + (sources."npm-registry-fetch-14.0.3" // { + dependencies = [ + sources."make-fetch-happen-11.0.2" + sources."minipass-fetch-3.0.1" ]; }) - sources."npm-registry-fetch-13.3.1" sources."npmlog-6.0.2" sources."once-1.4.0" sources."p-cancelable-3.0.0" @@ -126577,14 +125366,14 @@ in sources."p-locate-5.0.0" sources."p-map-4.0.0" sources."package-json-8.1.0" - sources."pacote-15.0.0" + sources."pacote-15.0.8" sources."parse-github-url-1.0.2" 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."picomatch-2.3.1" - sources."proc-log-2.0.1" + sources."proc-log-3.0.0" sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" @@ -126598,19 +125387,13 @@ in sources."ini-1.3.8" ]; }) - sources."rc-config-loader-4.1.1" - (sources."read-package-json-5.0.2" // { + sources."rc-config-loader-4.1.2" + (sources."read-package-json-6.0.0" // { dependencies = [ - sources."glob-8.0.3" - sources."npm-normalize-package-bin-2.0.0" - ]; - }) - (sources."read-package-json-fast-3.0.1" // { - dependencies = [ - sources."json-parse-even-better-errors-3.0.0" - sources."npm-normalize-package-bin-3.0.0" + sources."glob-8.1.0" ]; }) + sources."read-package-json-fast-3.0.2" sources."readable-stream-3.6.0" sources."registry-auth-token-5.0.1" sources."registry-url-6.0.1" @@ -126647,12 +125430,20 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.12" - sources."ssri-9.0.1" + sources."ssri-10.0.1" 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."tar-6.1.12" + (sources."tar-6.1.13" // { + dependencies = [ + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + ]; + }) sources."to-regex-range-5.0.1" sources."type-fest-2.19.0" sources."typedarray-to-buffer-3.1.5" @@ -126663,8 +125454,8 @@ in sources."update-notifier-6.0.2" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-4.0.0" - sources."which-2.0.2" + sources."validate-npm-package-name-5.0.0" + sources."which-3.0.0" sources."wide-align-1.1.5" (sources."widest-line-4.0.1" // { dependencies = [ @@ -126674,7 +125465,7 @@ in sources."strip-ansi-7.0.1" ]; }) - (sources."wrap-ansi-8.0.1" // { + (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-regex-6.0.1" sources."emoji-regex-9.2.2" @@ -126686,7 +125477,7 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-5.1.0" sources."yallist-4.0.0" - sources."yaml-2.1.3" + sources."yaml-2.2.1" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -126732,7 +125523,7 @@ in sources."async-1.5.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" sources."combined-stream-1.0.8" @@ -126771,7 +125562,7 @@ in sources."open-8.4.0" sources."performance-now-2.1.0" sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."request-2.88.2" sources."safe-buffer-5.2.1" @@ -126839,10 +125630,10 @@ in orval = nodeEnv.buildNodePackage { name = "orval"; packageName = "orval"; - version = "6.10.2"; + version = "6.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/orval/-/orval-6.10.2.tgz"; - sha512 = "0PcbjpFbaHzBCTUaFz9a9N2rFcNa9wO94XFPTJZQxsczclMfg3uImE1BbaNFf0ItAUWZNEzveadQJTk/863G/g=="; + url = "https://registry.npmjs.org/orval/-/orval-6.11.1.tgz"; + sha512 = "3QjI9i8mp/lT+ufJQWghQyCf6vNXqKVHva2IgLL/OWEuBA8AsGPXvJvCeqzFmi+fBSC7LzpR2Mkyle7dxfycLQ=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-9.0.6" @@ -126850,8 +125641,8 @@ in sources."@apidevtools/swagger-methods-3.0.2" sources."@apidevtools/swagger-parser-10.1.0" sources."@asyncapi/specs-3.2.1" - sources."@esbuild/android-arm-0.15.13" - sources."@esbuild/linux-loong64-0.15.13" + sources."@esbuild/android-arm-0.15.18" + sources."@esbuild/linux-loong64-0.15.18" sources."@exodus/schemasafe-1.0.0-rc.9" sources."@ibm-cloud/openapi-ruleset-0.37.3" sources."@jsdevtools/ono-7.1.3" @@ -126860,6 +125651,12 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" + sources."@orval/angular-6.11.1" + sources."@orval/axios-6.11.1" + sources."@orval/core-6.11.1" + sources."@orval/msw-6.11.1" + sources."@orval/query-6.11.1" + sources."@orval/swr-6.11.1" sources."@rollup/plugin-commonjs-22.0.2" (sources."@rollup/pluginutils-3.1.0" // { dependencies = [ @@ -126873,7 +125670,7 @@ in sources."tslib-1.14.1" ]; }) - sources."@stoplight/json-ref-resolver-3.1.4" + sources."@stoplight/json-ref-resolver-3.1.5" sources."@stoplight/ordered-object-literal-1.0.4" sources."@stoplight/path-1.3.2" (sources."@stoplight/spectral-cli-6.6.0" // { @@ -126881,17 +125678,17 @@ in sources."fast-glob-3.2.7" ]; }) - (sources."@stoplight/spectral-core-1.15.1" // { + (sources."@stoplight/spectral-core-1.16.0" // { dependencies = [ sources."@stoplight/types-13.6.0" ]; }) sources."@stoplight/spectral-formats-1.4.0" - sources."@stoplight/spectral-functions-1.7.1" + sources."@stoplight/spectral-functions-1.7.2" sources."@stoplight/spectral-parsers-1.0.2" sources."@stoplight/spectral-ref-resolver-1.0.2" - sources."@stoplight/spectral-ruleset-bundler-1.4.0" - sources."@stoplight/spectral-ruleset-migrator-1.9.0" + sources."@stoplight/spectral-ruleset-bundler-1.5.0" + sources."@stoplight/spectral-ruleset-migrator-1.9.1" sources."@stoplight/spectral-rulesets-1.14.1" (sources."@stoplight/spectral-runtime-1.1.2" // { dependencies = [ @@ -126905,49 +125702,38 @@ in sources."@types/es-aggregate-error-1.0.2" sources."@types/estree-0.0.39" sources."@types/json-schema-7.0.11" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/urijs-1.19.19" sources."abort-controller-3.0.0" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."ajv-draft-04-1.0.0" sources."ajv-errors-3.0.0" sources."ajv-formats-2.1.1" - sources."ansi-escapes-4.3.2" + sources."ansi-colors-4.1.3" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."argparse-1.0.10" sources."array-union-2.1.0" sources."as-table-1.0.55" sources."ast-types-0.14.2" - sources."astring-1.8.3" + sources."astring-1.8.4" + sources."available-typed-arrays-1.0.5" sources."backslash-0.2.0" sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" - (sources."bl-4.1.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" - ]; - }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-5.7.1" sources."builtins-1.0.3" sources."bytes-3.1.2" sources."cac-6.7.14" sources."call-bind-1.0.2" sources."call-me-maybe-1.0.2" sources."chalk-4.1.2" - sources."chardet-0.7.0" sources."chokidar-3.5.3" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.7.0" - sources."cli-width-3.0.0" sources."cliui-7.0.4" sources."clone-1.0.4" sources."color-convert-2.0.1" @@ -126975,32 +125761,34 @@ in sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" + sources."enquirer-2.3.6" sources."eol-0.9.1" - sources."es-abstract-1.20.4" + sources."es-abstract-1.21.1" sources."es-aggregate-error-1.0.9" + sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."es6-promise-3.3.1" - sources."esbuild-0.15.13" - sources."esbuild-android-64-0.15.13" - sources."esbuild-android-arm64-0.15.13" - sources."esbuild-darwin-64-0.15.13" - sources."esbuild-darwin-arm64-0.15.13" - sources."esbuild-freebsd-64-0.15.13" - sources."esbuild-freebsd-arm64-0.15.13" - sources."esbuild-linux-32-0.15.13" - sources."esbuild-linux-64-0.15.13" - sources."esbuild-linux-arm-0.15.13" - sources."esbuild-linux-arm64-0.15.13" - sources."esbuild-linux-mips64le-0.15.13" - sources."esbuild-linux-ppc64le-0.15.13" - sources."esbuild-linux-riscv64-0.15.13" - sources."esbuild-linux-s390x-0.15.13" - sources."esbuild-netbsd-64-0.15.13" - sources."esbuild-openbsd-64-0.15.13" - sources."esbuild-sunos-64-0.15.13" - sources."esbuild-windows-32-0.15.13" - sources."esbuild-windows-64-0.15.13" - sources."esbuild-windows-arm64-0.15.13" + sources."esbuild-0.15.18" + sources."esbuild-android-64-0.15.18" + sources."esbuild-android-arm64-0.15.18" + sources."esbuild-darwin-64-0.15.18" + sources."esbuild-darwin-arm64-0.15.18" + sources."esbuild-freebsd-64-0.15.18" + sources."esbuild-freebsd-arm64-0.15.18" + sources."esbuild-linux-32-0.15.18" + sources."esbuild-linux-64-0.15.18" + sources."esbuild-linux-arm-0.15.18" + sources."esbuild-linux-arm64-0.15.18" + sources."esbuild-linux-mips64le-0.15.18" + sources."esbuild-linux-ppc64le-0.15.18" + sources."esbuild-linux-riscv64-0.15.18" + sources."esbuild-linux-s390x-0.15.18" + sources."esbuild-netbsd-64-0.15.18" + sources."esbuild-openbsd-64-0.15.18" + sources."esbuild-sunos-64-0.15.18" + sources."esbuild-windows-32-0.15.18" + sources."esbuild-windows-64-0.15.18" + sources."esbuild-windows-arm64-0.15.18" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."escodegen-1.14.3" @@ -127010,23 +125798,30 @@ in sources."esutils-2.0.3" sources."event-target-shim-5.0.1" sources."execa-5.1.1" - (sources."external-editor-3.1.0" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.12" sources."fast-levenshtein-2.0.6" sources."fast-memoize-2.5.2" sources."fast-safe-stringify-2.1.1" - sources."fastq-1.13.0" - sources."figures-3.2.0" + sources."fastq-1.15.0" sources."file-uri-to-path-2.0.0" sources."fill-range-7.0.1" - sources."find-up-5.0.0" + (sources."find-up-5.0.0" // { + dependencies = [ + sources."locate-path-6.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."path-exists-4.0.0" + ]; + }) + sources."for-each-0.3.3" sources."format-util-1.0.5" - sources."fs-extra-10.1.0" + (sources."fs-extra-10.1.0" // { + dependencies = [ + sources."jsonfile-6.1.0" + sources."universalify-2.0.0" + ]; + }) sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."ftp-0.3.10" @@ -127034,7 +125829,7 @@ in sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" (sources."get-source-2.0.12" // { dependencies = [ sources."data-uri-to-buffer-2.0.2" @@ -127045,19 +125840,19 @@ in (sources."get-uri-3.0.2" // { dependencies = [ sources."fs-extra-8.1.0" - sources."jsonfile-4.0.0" - sources."universalify-0.1.2" ]; }) sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globalthis-1.0.3" sources."globby-11.1.0" + sources."gopd-1.0.1" sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-bigints-1.0.2" sources."has-flag-4.0.0" sources."has-property-descriptors-1.0.0" + sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."http-errors-2.0.0" @@ -127068,21 +125863,16 @@ in (sources."ibm-openapi-validator-0.88.3" // { dependencies = [ sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" ]; }) sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."ignore-5.2.0" - sources."immer-9.0.16" + sources."ignore-5.2.4" + sources."immer-9.0.19" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."inquirer-8.2.5" - sources."internal-slot-1.0.3" + sources."internal-slot-1.0.4" sources."ip-1.1.8" + sources."is-array-buffer-3.0.1" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" @@ -127092,7 +125882,6 @@ 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-negative-zero-2.0.2" sources."is-number-7.0.0" sources."is-number-object-1.0.7" @@ -127102,12 +125891,12 @@ in sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-unicode-supported-0.1.0" + sources."is-typed-array-1.1.10" sources."is-weakref-1.0.2" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."js-yaml-3.14.1" - sources."jsep-1.3.7" + sources."jsep-1.3.8" sources."json-dup-key-validator-1.0.3" (sources."json-schema-ref-parser-5.1.3" // { dependencies = [ @@ -127116,22 +125905,22 @@ in }) sources."json-schema-traverse-1.0.0" sources."jsonc-parser-2.2.1" - sources."jsonfile-6.1.0" + sources."jsonfile-4.0.0" sources."jsonpath-plus-7.1.0" sources."jsonpointer-5.0.1" sources."jsonschema-1.4.1" sources."leven-3.1.0" sources."levn-0.3.0" - sources."locate-path-6.0.0" + sources."locate-path-3.0.0" sources."lodash-4.17.21" sources."lodash.get-4.4.2" + sources."lodash.isempty-4.4.0" sources."lodash.omit-4.5.0" sources."lodash.omitby-4.6.0" sources."lodash.topath-4.5.2" sources."lodash.uniq-4.5.0" sources."lodash.uniqby-4.7.0" sources."lodash.uniqwith-4.5.0" - sources."log-symbols-4.1.0" sources."lru-cache-5.1.1" sources."magic-string-0.25.9" sources."matcher-1.1.1" @@ -127141,53 +125930,42 @@ in sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" sources."ms-2.1.2" - sources."mute-stream-0.0.8" sources."netmask-2.0.2" (sources."nimma-0.2.2" // { dependencies = [ sources."jsonpath-plus-6.0.1" ]; }) - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."node-fetch-h2-2.3.0" sources."node-readfiles-0.2.0" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."oas-kit-common-1.0.8" - (sources."oas-linter-3.2.2" // { - dependencies = [ - sources."yaml-1.10.2" - ]; - }) - (sources."oas-resolver-2.5.6" // { - dependencies = [ - sources."yaml-1.10.2" - ]; - }) + sources."oas-linter-3.2.2" + sources."oas-resolver-2.5.6" sources."oas-schema-walker-1.1.5" - (sources."oas-validator-5.0.8" // { - dependencies = [ - sources."yaml-1.10.2" - ]; - }) - sources."object-inspect-1.12.2" + sources."oas-validator-5.0.8" + sources."object-inspect-1.12.3" sources."object-keys-1.1.1" sources."object.assign-4.1.4" sources."once-1.4.0" sources."onetime-5.1.2" sources."ono-4.0.11" - sources."openapi-types-12.0.2" - sources."openapi3-ts-3.1.1" + sources."openapi-types-12.1.0" + (sources."openapi3-ts-3.1.2" // { + dependencies = [ + sources."yaml-2.2.1" + ]; + }) sources."optionator-0.8.3" - sources."ora-5.4.1" - sources."os-tmpdir-1.0.2" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."pac-proxy-agent-5.0.0" sources."pac-resolver-5.0.1" sources."pad-2.3.0" - sources."path-exists-4.0.0" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."path-parse-1.0.7" @@ -127198,8 +125976,7 @@ in sources."printable-characters-1.0.42" sources."proxy-agent-5.0.0" sources."proxy-from-env-1.1.0" - sources."punycode-2.1.1" - sources."querystring-0.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" (sources."raw-body-2.5.1" // { dependencies = [ @@ -127215,13 +125992,9 @@ in sources."require-from-string-2.0.2" sources."reserved-0.1.2" sources."resolve-1.22.1" - sources."restore-cursor-3.1.0" sources."reusify-1.0.4" sources."rollup-2.79.1" - sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.7" - sources."safe-buffer-5.2.1" sources."safe-regex-test-1.0.0" sources."safe-stable-stringify-1.1.1" sources."safer-buffer-2.1.2" @@ -127253,57 +126026,45 @@ in sources."statuses-2.0.1" sources."string-argv-0.3.1" sources."string-width-4.2.3" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" + sources."string.prototype.trimend-1.0.6" + sources."string.prototype.trimstart-1.0.6" sources."string_decoder-0.10.31" sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."swagger2openapi-7.0.8" // { - dependencies = [ - sources."yaml-1.10.2" - ]; - }) + sources."swagger2openapi-7.0.8" sources."text-table-0.2.0" - sources."through-2.3.8" - sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tr46-0.0.3" - sources."tsconfck-2.0.1" - sources."tslib-2.4.1" + sources."tsconfck-2.0.2" + sources."tslib-2.5.0" sources."type-check-0.3.2" - sources."type-fest-0.21.3" - sources."typescript-4.8.4" + sources."typed-array-length-1.0.4" + sources."typescript-4.9.4" sources."unbox-primitive-1.0.2" - sources."universalify-2.0.0" + sources."universalify-0.1.2" sources."unpipe-1.0.0" - sources."upath-2.0.1" sources."uri-js-4.4.1" sources."urijs-1.19.11" - (sources."url-0.11.0" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) - sources."util-deprecate-1.0.2" sources."utility-types-3.10.0" sources."validate-npm-package-name-3.0.0" sources."validator-13.7.0" - sources."vm2-3.9.11" + sources."vm2-3.9.13" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" + sources."which-typed-array-1.1.9" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."xregexp-2.0.0" sources."y18n-5.0.8" sources."yallist-3.1.1" - sources."yaml-2.1.3" + sources."yaml-1.10.2" sources."yaml-js-0.2.3" sources."yargs-17.3.1" sources."yargs-parser-21.1.1" @@ -127330,27 +126091,27 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.1" - (sources."@babel/core-7.20.2" // { + sources."@babel/compat-data-7.20.14" + (sources."@babel/core-7.20.12" // { dependencies = [ - sources."json5-2.2.1" + sources."json5-2.2.3" sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.2" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; }) sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" - (sources."@babel/helper-compilation-targets-7.20.0" // { + (sources."@babel/helper-compilation-targets-7.20.7" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.20.2" - sources."@babel/helper-create-regexp-features-plugin-7.19.0" + sources."@babel/helper-create-class-features-plugin-7.20.12" + sources."@babel/helper-create-regexp-features-plugin-7.20.5" (sources."@babel/helper-define-polyfill-provider-0.3.3" // { dependencies = [ sources."semver-6.3.0" @@ -127360,39 +126121,39 @@ in sources."@babel/helper-explode-assignable-expression-7.18.6" sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.18.9" + sources."@babel/helper-member-expression-to-functions-7.20.7" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.2" + sources."@babel/helper-module-transforms-7.20.11" sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.20.2" sources."@babel/helper-remap-async-to-generator-7.18.9" - sources."@babel/helper-replace-supers-7.19.1" + sources."@babel/helper-replace-supers-7.20.7" sources."@babel/helper-simple-access-7.20.2" sources."@babel/helper-skip-transparent-expression-wrappers-7.20.0" sources."@babel/helper-split-export-declaration-7.18.6" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helper-wrap-function-7.19.0" - sources."@babel/helpers-7.20.1" + sources."@babel/helper-wrap-function-7.20.5" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.2" + sources."@babel/parser-7.20.13" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" - sources."@babel/plugin-proposal-async-generator-functions-7.20.1" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" + sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" - sources."@babel/plugin-proposal-class-static-block-7.18.6" + sources."@babel/plugin-proposal-class-static-block-7.20.7" sources."@babel/plugin-proposal-dynamic-import-7.18.6" sources."@babel/plugin-proposal-export-namespace-from-7.18.9" sources."@babel/plugin-proposal-json-strings-7.18.6" - sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" + sources."@babel/plugin-proposal-logical-assignment-operators-7.20.7" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.20.2" + sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" - sources."@babel/plugin-proposal-optional-chaining-7.18.9" + sources."@babel/plugin-proposal-optional-chaining-7.20.7" sources."@babel/plugin-proposal-private-methods-7.18.6" - sources."@babel/plugin-proposal-private-property-in-object-7.18.6" + sources."@babel/plugin-proposal-private-property-in-object-7.20.5" sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" @@ -127411,13 +126172,13 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.18.6" - sources."@babel/plugin-transform-async-to-generator-7.18.6" + sources."@babel/plugin-transform-arrow-functions-7.20.7" + sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.2" - sources."@babel/plugin-transform-classes-7.20.2" - sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.20.2" + sources."@babel/plugin-transform-block-scoping-7.20.14" + sources."@babel/plugin-transform-classes-7.20.7" + sources."@babel/plugin-transform-computed-properties-7.20.7" + sources."@babel/plugin-transform-destructuring-7.20.7" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -127426,20 +126187,20 @@ in sources."@babel/plugin-transform-function-name-7.18.9" sources."@babel/plugin-transform-literals-7.18.9" sources."@babel/plugin-transform-member-expression-literals-7.18.6" - sources."@babel/plugin-transform-modules-amd-7.19.6" - sources."@babel/plugin-transform-modules-commonjs-7.19.6" - sources."@babel/plugin-transform-modules-systemjs-7.19.6" + sources."@babel/plugin-transform-modules-amd-7.20.11" + sources."@babel/plugin-transform-modules-commonjs-7.20.11" + sources."@babel/plugin-transform-modules-systemjs-7.20.11" sources."@babel/plugin-transform-modules-umd-7.18.6" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.19.1" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.20.5" sources."@babel/plugin-transform-new-target-7.18.6" sources."@babel/plugin-transform-object-super-7.18.6" - sources."@babel/plugin-transform-parameters-7.20.1" + sources."@babel/plugin-transform-parameters-7.20.7" sources."@babel/plugin-transform-property-literals-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.19.0" - sources."@babel/plugin-transform-regenerator-7.18.6" + sources."@babel/plugin-transform-react-jsx-7.20.13" + sources."@babel/plugin-transform-regenerator-7.20.5" sources."@babel/plugin-transform-reserved-words-7.18.6" sources."@babel/plugin-transform-shorthand-properties-7.18.6" - sources."@babel/plugin-transform-spread-7.19.0" + sources."@babel/plugin-transform-spread-7.20.7" sources."@babel/plugin-transform-sticky-regex-7.18.6" sources."@babel/plugin-transform-template-literals-7.18.9" sources."@babel/plugin-transform-typeof-symbol-7.18.9" @@ -127451,10 +126212,10 @@ in ]; }) sources."@babel/preset-modules-0.1.5" - sources."@babel/runtime-7.20.1" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.20.1" - sources."@babel/types-7.20.2" + sources."@babel/runtime-7.20.13" + sources."@babel/template-7.20.7" + sources."@babel/traverse-7.20.13" + sources."@babel/types-7.20.7" sources."@iarna/toml-2.2.5" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -127513,12 +126274,13 @@ in }) sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" + sources."available-typed-arrays-1.0.5" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" (sources."babel-plugin-polyfill-corejs2-0.3.3" // { dependencies = [ sources."semver-6.3.0" @@ -127586,7 +126348,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -127612,7 +126374,7 @@ in sources."convert-source-map-1.9.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - sources."core-js-compat-3.26.0" + sources."core-js-compat-3.27.2" sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { @@ -127666,7 +126428,7 @@ in sources."data-urls-1.1.0" sources."deasync-0.1.28" sources."debug-4.3.4" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."deep-is-0.1.4" (sources."defaults-1.0.4" // { dependencies = [ @@ -127729,12 +126491,13 @@ in sources."entities-2.2.0" sources."envinfo-7.8.1" sources."error-ex-1.3.2" - (sources."es-abstract-1.20.4" // { + (sources."es-abstract-1.21.1" // { dependencies = [ - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" ]; }) sources."es-array-method-boxes-properly-1.0.0" + sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -127769,6 +126532,7 @@ in sources."file-uri-to-path-1.0.0" sources."filesize-3.6.1" sources."fill-range-4.0.0" + sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -127780,7 +126544,7 @@ in sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-port-3.2.0" sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" @@ -127793,6 +126557,8 @@ in }) sources."glob-to-regexp-0.3.0" sources."globals-11.12.0" + sources."globalthis-1.0.3" + sources."gopd-1.0.1" sources."graceful-fs-4.2.10" sources."grapheme-breaker-0.3.2" sources."har-schema-2.0.0" @@ -127806,6 +126572,7 @@ in sources."has-bigints-1.0.2" sources."has-flag-3.0.0" sources."has-property-descriptors-1.0.0" + sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" @@ -127829,10 +126596,10 @@ in sources."html-tags-1.2.0" (sources."htmlnano-0.2.9" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."posthtml-0.15.2" sources."posthtml-parser-0.7.2" - sources."terser-5.15.1" + sources."terser-5.16.1" ]; }) (sources."htmlparser2-6.1.0" // { @@ -127852,13 +126619,14 @@ in sources."indexes-of-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internal-slot-1.0.3" + sources."internal-slot-1.0.4" sources."is-absolute-url-2.1.0" (sources."is-accessor-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" ]; }) + sources."is-array-buffer-3.0.1" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-binary-path-1.0.1" @@ -127893,6 +126661,7 @@ in sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.10" sources."is-typedarray-1.0.0" sources."is-url-1.2.4" sources."is-weakref-1.0.2" @@ -127922,7 +126691,7 @@ in sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."json5-1.0.1" + sources."json5-1.0.2" sources."jsprim-1.4.2" sources."kind-of-3.2.2" sources."levn-0.3.0" @@ -127933,6 +126702,7 @@ in sources."lodash.sortby-4.7.0" sources."lodash.uniq-4.5.0" sources."log-symbols-2.2.0" + sources."lru-cache-5.1.1" sources."magic-string-0.22.5" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -127989,7 +126759,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -128090,7 +126860,7 @@ in sources."postcss-ordered-values-4.1.2" sources."postcss-reduce-initial-4.0.3" sources."postcss-reduce-transforms-4.0.2" - sources."postcss-selector-parser-6.0.10" + sources."postcss-selector-parser-6.0.11" sources."postcss-svgo-4.0.3" sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-3.3.1" @@ -128113,7 +126883,7 @@ in sources."bn.js-4.12.0" ]; }) - sources."punycode-2.1.1" + sources."punycode-2.3.0" (sources."purgecss-2.3.0" // { dependencies = [ sources."commander-5.1.0" @@ -128137,8 +126907,8 @@ in sources."readdirp-2.2.1" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-10.1.0" - sources."regenerator-runtime-0.13.10" - sources."regenerator-transform-0.15.0" + sources."regenerator-runtime-0.13.11" + sources."regenerator-transform-0.15.1" (sources."regex-not-1.0.2" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -128146,7 +126916,7 @@ in ]; }) sources."regexp.prototype.flags-1.4.3" - sources."regexpu-core-5.2.1" + sources."regexpu-core-5.2.2" sources."regjsgen-0.7.1" (sources."regjsparser-0.9.1" // { dependencies = [ @@ -128197,7 +126967,7 @@ in sources."shebang-regex-1.0.0" (sources."side-channel-1.0.4" // { dependencies = [ - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" ]; }) sources."signal-exit-3.0.7" @@ -128245,8 +127015,8 @@ in sources."stealthy-require-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" + sources."string.prototype.trimend-1.0.6" + sources."string.prototype.trimstart-1.0.6" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" (sources."stylehacks-4.0.3" // { @@ -128281,6 +127051,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" + sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" sources."unbox-primitive-1.0.2" (sources."uncss-0.17.3" // { @@ -128291,7 +127062,7 @@ in }) 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" + sources."unicode-match-property-value-ecmascript-2.1.0" sources."unicode-property-aliases-ecmascript-2.1.0" sources."unicode-trie-0.3.1" sources."union-value-1.0.1" @@ -128345,12 +127116,14 @@ in sources."whatwg-url-7.1.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" + sources."which-typed-array-1.1.9" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."ws-5.2.3" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."xtend-4.0.2" + sources."yallist-3.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -128365,10 +127138,10 @@ in parcel = nodeEnv.buildNodePackage { name = "parcel"; packageName = "parcel"; - version = "2.7.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/parcel/-/parcel-2.7.0.tgz"; - sha512 = "pRYwnivwtNP0tip8xYSo4zCB0XhLt7/gJzP1p8OovCqkmFjG9VG+GW9TcAKqMIo0ovEa9tT+/s6gY1Qy+BONGQ=="; + url = "https://registry.npmjs.org/parcel/-/parcel-2.8.3.tgz"; + sha512 = "5rMBpbNE72g6jZvkdR5gS2nyhwIXaJy8i65osOqs/+5b7zgf3eMKgjSsDrv6bhz3gzifsba6MBJiZdBckl+vnA=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -128393,86 +127166,85 @@ in sources."@lmdb/lmdb-linux-x64-2.5.2" sources."@lmdb/lmdb-win32-x64-2.5.2" sources."@mischnic/json-sourcemap-0.1.0" - sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-2.1.2" - sources."@msgpackr-extract/msgpackr-extract-darwin-x64-2.1.2" - sources."@msgpackr-extract/msgpackr-extract-linux-arm-2.1.2" - sources."@msgpackr-extract/msgpackr-extract-linux-arm64-2.1.2" - sources."@msgpackr-extract/msgpackr-extract-linux-x64-2.1.2" - sources."@msgpackr-extract/msgpackr-extract-win32-x64-2.1.2" - sources."@parcel/bundler-default-2.7.0" - sources."@parcel/cache-2.7.0" - sources."@parcel/codeframe-2.7.0" - sources."@parcel/compressor-raw-2.7.0" - sources."@parcel/config-default-2.7.0" - sources."@parcel/core-2.7.0" - sources."@parcel/css-1.14.0" - sources."@parcel/diagnostic-2.7.0" - sources."@parcel/events-2.7.0" - sources."@parcel/fs-2.7.0" - sources."@parcel/fs-search-2.7.0" - sources."@parcel/graph-2.7.0" - sources."@parcel/hash-2.7.0" - sources."@parcel/logger-2.7.0" - sources."@parcel/markdown-ansi-2.7.0" - sources."@parcel/namer-default-2.7.0" - sources."@parcel/node-resolver-core-2.7.0" - sources."@parcel/optimizer-css-2.7.0" - sources."@parcel/optimizer-htmlnano-2.7.0" - sources."@parcel/optimizer-image-2.7.0" - sources."@parcel/optimizer-svgo-2.7.0" - sources."@parcel/optimizer-terser-2.7.0" - sources."@parcel/package-manager-2.7.0" - sources."@parcel/packager-css-2.7.0" - sources."@parcel/packager-html-2.7.0" - sources."@parcel/packager-js-2.7.0" - sources."@parcel/packager-raw-2.7.0" - sources."@parcel/packager-svg-2.7.0" - sources."@parcel/plugin-2.7.0" - sources."@parcel/reporter-cli-2.7.0" - sources."@parcel/reporter-dev-server-2.7.0" - sources."@parcel/resolver-default-2.7.0" - sources."@parcel/runtime-browser-hmr-2.7.0" - sources."@parcel/runtime-js-2.7.0" - sources."@parcel/runtime-react-refresh-2.7.0" - sources."@parcel/runtime-service-worker-2.7.0" + sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-2.2.0" + sources."@msgpackr-extract/msgpackr-extract-darwin-x64-2.2.0" + sources."@msgpackr-extract/msgpackr-extract-linux-arm-2.2.0" + sources."@msgpackr-extract/msgpackr-extract-linux-arm64-2.2.0" + sources."@msgpackr-extract/msgpackr-extract-linux-x64-2.2.0" + sources."@msgpackr-extract/msgpackr-extract-win32-x64-2.2.0" + sources."@parcel/bundler-default-2.8.3" + sources."@parcel/cache-2.8.3" + sources."@parcel/codeframe-2.8.3" + sources."@parcel/compressor-raw-2.8.3" + sources."@parcel/config-default-2.8.3" + sources."@parcel/core-2.8.3" + sources."@parcel/diagnostic-2.8.3" + sources."@parcel/events-2.8.3" + sources."@parcel/fs-2.8.3" + sources."@parcel/fs-search-2.8.3" + sources."@parcel/graph-2.8.3" + sources."@parcel/hash-2.8.3" + sources."@parcel/logger-2.8.3" + sources."@parcel/markdown-ansi-2.8.3" + sources."@parcel/namer-default-2.8.3" + sources."@parcel/node-resolver-core-2.8.3" + sources."@parcel/optimizer-css-2.8.3" + sources."@parcel/optimizer-htmlnano-2.8.3" + sources."@parcel/optimizer-image-2.8.3" + sources."@parcel/optimizer-svgo-2.8.3" + sources."@parcel/optimizer-terser-2.8.3" + sources."@parcel/package-manager-2.8.3" + sources."@parcel/packager-css-2.8.3" + sources."@parcel/packager-html-2.8.3" + sources."@parcel/packager-js-2.8.3" + sources."@parcel/packager-raw-2.8.3" + sources."@parcel/packager-svg-2.8.3" + sources."@parcel/plugin-2.8.3" + sources."@parcel/reporter-cli-2.8.3" + sources."@parcel/reporter-dev-server-2.8.3" + sources."@parcel/resolver-default-2.8.3" + sources."@parcel/runtime-browser-hmr-2.8.3" + sources."@parcel/runtime-js-2.8.3" + sources."@parcel/runtime-react-refresh-2.8.3" + sources."@parcel/runtime-service-worker-2.8.3" sources."@parcel/source-map-2.1.1" - sources."@parcel/transformer-babel-2.7.0" - sources."@parcel/transformer-css-2.7.0" - (sources."@parcel/transformer-html-2.7.0" // { + sources."@parcel/transformer-babel-2.8.3" + sources."@parcel/transformer-css-2.8.3" + (sources."@parcel/transformer-html-2.8.3" // { dependencies = [ sources."posthtml-parser-0.10.2" ]; }) - sources."@parcel/transformer-image-2.7.0" - sources."@parcel/transformer-js-2.7.0" - sources."@parcel/transformer-json-2.7.0" - sources."@parcel/transformer-postcss-2.7.0" - (sources."@parcel/transformer-posthtml-2.7.0" // { + sources."@parcel/transformer-image-2.8.3" + sources."@parcel/transformer-js-2.8.3" + sources."@parcel/transformer-json-2.8.3" + sources."@parcel/transformer-postcss-2.8.3" + (sources."@parcel/transformer-posthtml-2.8.3" // { dependencies = [ sources."posthtml-parser-0.10.2" ]; }) - sources."@parcel/transformer-raw-2.7.0" - sources."@parcel/transformer-react-refresh-wrap-2.7.0" - (sources."@parcel/transformer-svg-2.7.0" // { + sources."@parcel/transformer-raw-2.8.3" + sources."@parcel/transformer-react-refresh-wrap-2.8.3" + (sources."@parcel/transformer-svg-2.8.3" // { dependencies = [ sources."posthtml-parser-0.10.2" ]; }) - sources."@parcel/types-2.7.0" - sources."@parcel/utils-2.7.0" - (sources."@parcel/watcher-2.0.7" // { + sources."@parcel/types-2.8.3" + sources."@parcel/utils-2.8.3" + (sources."@parcel/watcher-2.1.0" // { dependencies = [ sources."node-addon-api-3.2.1" ]; }) - sources."@parcel/workers-2.7.0" - sources."@swc/helpers-0.4.12" + sources."@parcel/workers-2.8.3" + sources."@swc/helpers-0.4.14" sources."@trysound/sax-0.2.0" sources."@types/parse-json-4.0.0" sources."abab-2.0.6" sources."abortcontroller-polyfill-1.7.5" - sources."acorn-8.8.1" + sources."acorn-8.8.2" (sources."acorn-globals-4.3.4" // { dependencies = [ sources."acorn-6.4.2" @@ -128487,18 +127259,19 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."balanced-match-1.0.2" sources."base-x-3.0.9" sources."bcrypt-pbkdf-1.0.2" sources."boolbase-1.0.0" - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" + sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" sources."browserslist-4.21.4" sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -128518,7 +127291,7 @@ in sources."commander-7.2.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" - sources."cosmiconfig-7.0.1" + sources."cosmiconfig-7.1.0" sources."css-declaration-sorter-6.3.1" sources."css-select-4.3.0" sources."css-tree-1.1.3" @@ -128561,19 +127334,20 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" + sources."fill-range-7.0.1" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs.realpath-1.0.0" sources."get-port-4.2.0" sources."getpass-0.1.7" - sources."glob-7.2.3" - sources."globals-13.17.0" + sources."glob-8.1.0" + sources."globals-13.20.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" sources."html-encoding-sniffer-1.0.2" sources."html-tags-1.2.0" - sources."htmlnano-2.0.2" + sources."htmlnano-2.0.3" sources."htmlparser2-7.2.0" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" @@ -128583,8 +127357,11 @@ in sources."inherits-2.0.4" sources."is-absolute-url-3.0.3" sources."is-arrayish-0.2.1" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.3" sources."is-html-1.1.0" sources."is-json-2.0.1" + sources."is-number-7.0.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."js-tokens-4.0.0" @@ -128598,18 +127375,18 @@ in sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."json5-2.2.1" + sources."json5-2.2.3" sources."jsprim-1.4.2" sources."levn-0.3.0" - sources."lightningcss-1.16.1" - sources."lightningcss-darwin-arm64-1.16.1" - sources."lightningcss-darwin-x64-1.16.1" - sources."lightningcss-linux-arm-gnueabihf-1.16.1" - sources."lightningcss-linux-arm64-gnu-1.16.1" - sources."lightningcss-linux-arm64-musl-1.16.1" - sources."lightningcss-linux-x64-gnu-1.16.1" - sources."lightningcss-linux-x64-musl-1.16.1" - sources."lightningcss-win32-x64-msvc-1.16.1" + sources."lightningcss-1.18.0" + sources."lightningcss-darwin-arm64-1.18.0" + sources."lightningcss-darwin-x64-1.18.0" + sources."lightningcss-linux-arm-gnueabihf-1.18.0" + sources."lightningcss-linux-arm64-gnu-1.18.0" + sources."lightningcss-linux-arm64-musl-1.18.0" + sources."lightningcss-linux-x64-gnu-1.18.0" + sources."lightningcss-linux-x64-musl-1.18.0" + sources."lightningcss-win32-x64-msvc-1.18.0" sources."lilconfig-2.0.6" sources."lines-and-columns-1.2.4" sources."lmdb-2.5.2" @@ -128618,16 +127395,17 @@ in sources."lodash.sortby-4.7.0" sources."lodash.uniq-4.5.0" sources."mdn-data-2.0.14" + sources."micromatch-4.0.5" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."minimatch-3.1.2" - sources."msgpackr-1.7.2" - sources."msgpackr-extract-2.1.2" + sources."minimatch-5.1.6" + sources."msgpackr-1.8.2" + sources."msgpackr-extract-2.2.0" sources."nanoid-3.3.4" sources."node-addon-api-4.3.0" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."node-gyp-build-optional-packages-5.0.3" - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" sources."normalize-url-6.1.0" sources."nth-check-2.1.1" sources."nullthrows-1.1.1" @@ -128643,8 +127421,9 @@ in sources."path-type-4.0.0" sources."performance-now-2.1.0" sources."picocolors-1.0.0" + sources."picomatch-2.3.1" sources."pn-1.1.0" - sources."postcss-8.4.18" + sources."postcss-8.4.21" sources."postcss-calc-8.2.4" sources."postcss-colormin-5.3.0" sources."postcss-convert-values-5.1.3" @@ -128670,7 +127449,7 @@ in sources."postcss-ordered-values-5.1.3" sources."postcss-reduce-initial-5.1.1" sources."postcss-reduce-transforms-5.1.0" - sources."postcss-selector-parser-6.0.10" + sources."postcss-selector-parser-6.0.11" sources."postcss-svgo-5.1.0" sources."postcss-unique-selectors-5.1.1" sources."postcss-value-parser-4.2.0" @@ -128679,16 +127458,16 @@ in sources."posthtml-render-3.0.0" sources."prelude-ls-1.1.2" sources."psl-1.9.0" - sources."punycode-2.1.1" - (sources."purgecss-4.1.3" // { + sources."punycode-2.3.0" + (sources."purgecss-5.0.0" // { dependencies = [ - sources."commander-8.3.0" + sources."commander-9.5.0" ]; }) sources."qs-6.5.3" sources."react-error-overlay-6.0.9" sources."react-refresh-0.9.0" - sources."regenerator-runtime-0.13.10" + sources."regenerator-runtime-0.13.11" sources."relateurl-0.2.7" sources."request-2.88.2" sources."request-promise-core-1.1.4" @@ -128701,7 +127480,7 @@ in sources."source-map-0.6.1" sources."source-map-js-1.0.2" sources."source-map-support-0.5.21" - sources."srcset-5.0.0" + sources."srcset-4.0.0" sources."sshpk-1.17.0" sources."stable-0.1.8" sources."stealthy-require-1.1.1" @@ -128710,22 +127489,26 @@ in sources."svgo-2.8.0" sources."symbol-tree-3.2.4" sources."term-size-2.2.1" - (sources."terser-5.15.1" // { + (sources."terser-5.16.1" // { dependencies = [ sources."commander-2.20.3" ]; }) sources."timsort-0.3.0" + sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."tr46-1.0.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."type-fest-0.20.2" (sources."uncss-0.17.3" // { dependencies = [ + sources."brace-expansion-1.1.11" sources."commander-2.20.3" + sources."glob-7.2.3" + sources."minimatch-3.1.2" sources."picocolors-0.2.1" sources."postcss-7.0.39" sources."postcss-selector-parser-6.0.2" @@ -128789,7 +127572,7 @@ in sources."async-0.9.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."babybird-0.0.1" sources."balanced-match-1.0.2" sources."bcrypt-pbkdf-1.0.2" @@ -128875,7 +127658,7 @@ in sources."gelf-stream-1.1.1" sources."gelfling-0.3.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."getpass-0.1.7" sources."glob-7.2.3" sources."graceful-fs-4.2.10" @@ -128934,7 +127717,7 @@ in sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."neo-async-2.6.2" sources."oauth-sign-0.9.0" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."object-keys-1.1.1" sources."object.assign-4.1.4" sources."on-finished-2.4.1" @@ -128956,7 +127739,7 @@ in sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."range-parser-1.2.1" (sources."raw-body-2.5.1" // { @@ -129060,14 +127843,15 @@ in patch-package = nodeEnv.buildNodePackage { name = "patch-package"; packageName = "patch-package"; - version = "6.5.0"; + version = "6.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/patch-package/-/patch-package-6.5.0.tgz"; - sha512 = "tC3EqJmo74yKqfsMzELaFwxOAu6FH6t+FzFOsnWAuARm7/n2xB5AOeOueE221eM9gtMuIKMKpF9tBy/X2mNP0Q=="; + url = "https://registry.npmjs.org/patch-package/-/patch-package-6.5.1.tgz"; + sha512 = "I/4Zsalfhc6bphmJTlrLoOcAF87jcxko4q0qsv4bGcurbr8IskEOtdnt9iCmsQVGL1B+iUhSQqweyTLJfCF9rA=="; }; dependencies = [ sources."@yarnpkg/lockfile-1.1.0" sources."ansi-styles-4.3.0" + sources."at-least-node-1.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -129079,7 +127863,7 @@ in sources."cross-spawn-6.0.5" sources."fill-range-7.0.1" sources."find-yarn-workspace-root-2.0.0" - sources."fs-extra-7.0.1" + sources."fs-extra-9.1.0" sources."fs.realpath-1.0.0" sources."glob-7.2.3" sources."graceful-fs-4.2.10" @@ -129091,7 +127875,7 @@ in sources."is-number-7.0.0" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."jsonfile-4.0.0" + sources."jsonfile-6.1.0" sources."klaw-sync-6.0.0" sources."micromatch-4.0.5" sources."minimatch-3.1.2" @@ -129111,7 +127895,7 @@ in sources."supports-color-7.2.0" sources."tmp-0.0.33" sources."to-regex-range-5.0.1" - sources."universalify-0.1.2" + sources."universalify-2.0.0" sources."which-1.3.1" sources."wrappy-1.0.2" sources."yaml-1.10.2" @@ -129226,7 +128010,7 @@ in sources."function-bind-1.1.1" sources."functions-have-names-1.2.3" sources."get-browser-rtc-1.1.0" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stdin-4.0.1" sources."glob-7.2.3" sources."graceful-fs-4.2.10" @@ -129470,7 +128254,7 @@ in sources."async-2.6.4" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."backo2-1.0.2" sources."balanced-match-1.0.2" sources."base64-arraybuffer-0.1.4" @@ -129553,7 +128337,7 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.6.0" // { + (sources."engine.io-3.6.1" // { dependencies = [ sources."cookie-0.4.2" sources."debug-4.1.1" @@ -129591,7 +128375,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-browser-rtc-1.1.0" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."getpass-0.1.7" sources."glob-7.2.3" sources."graceful-fs-4.2.10" @@ -129676,10 +128460,10 @@ in ]; }) sources."negotiator-0.6.3" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -129709,7 +128493,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."queue-microtask-1.2.3" sources."queue-tick-1.0.1" @@ -129768,10 +128552,10 @@ in dependencies = [ sources."debug-3.1.0" sources."isarray-2.0.1" - sources."socket.io-parser-3.3.2" + sources."socket.io-parser-3.3.3" ]; }) - (sources."socket.io-parser-3.4.1" // { + (sources."socket.io-parser-3.4.2" // { dependencies = [ sources."component-emitter-1.2.1" sources."debug-4.1.1" @@ -129840,1755 +128624,6 @@ in bypassCache = true; reconstructLock = true; }; - "photoprism-frontend-../../servers/photoprism" = nodeEnv.buildNodePackage { - name = "photoprism"; - packageName = "photoprism"; - version = "1.0.0"; - src = ../../servers/photoprism; - dependencies = [ - sources."@ampproject/remapping-2.2.0" - sources."@babel/cli-7.19.3" - sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.1" - (sources."@babel/core-7.20.2" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."@babel/eslint-parser-7.19.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."@babel/generator-7.20.2" // { - dependencies = [ - sources."@jridgewell/gen-mapping-0.3.2" - ]; - }) - sources."@babel/helper-annotate-as-pure-7.18.6" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" - (sources."@babel/helper-compilation-targets-7.20.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/helper-create-class-features-plugin-7.20.2" - sources."@babel/helper-create-regexp-features-plugin-7.19.0" - (sources."@babel/helper-define-polyfill-provider-0.3.3" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/helper-environment-visitor-7.18.9" - sources."@babel/helper-explode-assignable-expression-7.18.6" - sources."@babel/helper-function-name-7.19.0" - sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.18.9" - sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.2" - sources."@babel/helper-optimise-call-expression-7.18.6" - sources."@babel/helper-plugin-utils-7.20.2" - sources."@babel/helper-remap-async-to-generator-7.18.9" - sources."@babel/helper-replace-supers-7.19.1" - sources."@babel/helper-simple-access-7.20.2" - sources."@babel/helper-skip-transparent-expression-wrappers-7.20.0" - sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.19.4" - sources."@babel/helper-validator-identifier-7.19.1" - sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helper-wrap-function-7.19.0" - sources."@babel/helpers-7.20.1" - sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.2" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" - sources."@babel/plugin-proposal-async-generator-functions-7.20.1" - sources."@babel/plugin-proposal-class-properties-7.18.6" - sources."@babel/plugin-proposal-class-static-block-7.18.6" - sources."@babel/plugin-proposal-dynamic-import-7.18.6" - sources."@babel/plugin-proposal-export-namespace-from-7.18.9" - sources."@babel/plugin-proposal-json-strings-7.18.6" - sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" - sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.20.2" - sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" - sources."@babel/plugin-proposal-optional-chaining-7.18.9" - sources."@babel/plugin-proposal-private-methods-7.18.6" - sources."@babel/plugin-proposal-private-property-in-object-7.18.6" - sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" - sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-import-assertions-7.20.0" - sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" - sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-syntax-numeric-separator-7.10.4" - 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-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.18.6" - sources."@babel/plugin-transform-async-to-generator-7.18.6" - sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.2" - sources."@babel/plugin-transform-classes-7.20.2" - sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.20.2" - sources."@babel/plugin-transform-dotall-regex-7.18.6" - sources."@babel/plugin-transform-duplicate-keys-7.18.9" - sources."@babel/plugin-transform-exponentiation-operator-7.18.6" - sources."@babel/plugin-transform-for-of-7.18.8" - sources."@babel/plugin-transform-function-name-7.18.9" - sources."@babel/plugin-transform-literals-7.18.9" - sources."@babel/plugin-transform-member-expression-literals-7.18.6" - sources."@babel/plugin-transform-modules-amd-7.19.6" - sources."@babel/plugin-transform-modules-commonjs-7.19.6" - sources."@babel/plugin-transform-modules-systemjs-7.19.6" - sources."@babel/plugin-transform-modules-umd-7.18.6" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.19.1" - sources."@babel/plugin-transform-new-target-7.18.6" - sources."@babel/plugin-transform-object-super-7.18.6" - sources."@babel/plugin-transform-parameters-7.20.1" - sources."@babel/plugin-transform-property-literals-7.18.6" - sources."@babel/plugin-transform-regenerator-7.18.6" - sources."@babel/plugin-transform-reserved-words-7.18.6" - (sources."@babel/plugin-transform-runtime-7.19.6" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/plugin-transform-shorthand-properties-7.18.6" - sources."@babel/plugin-transform-spread-7.19.0" - sources."@babel/plugin-transform-sticky-regex-7.18.6" - sources."@babel/plugin-transform-template-literals-7.18.9" - sources."@babel/plugin-transform-typeof-symbol-7.18.9" - sources."@babel/plugin-transform-unicode-escapes-7.18.10" - sources."@babel/plugin-transform-unicode-regex-7.18.6" - (sources."@babel/preset-env-7.20.2" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/preset-modules-0.1.5" - sources."@babel/register-7.18.9" - sources."@babel/runtime-7.20.1" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.20.1" - sources."@babel/types-7.20.2" - sources."@colors/colors-1.5.0" - sources."@csstools/postcss-cascade-layers-1.1.1" - sources."@csstools/postcss-color-function-1.1.1" - sources."@csstools/postcss-font-format-keywords-1.0.1" - sources."@csstools/postcss-hwb-function-1.0.2" - sources."@csstools/postcss-ic-unit-1.0.1" - sources."@csstools/postcss-is-pseudo-class-2.0.7" - sources."@csstools/postcss-nested-calc-1.0.0" - sources."@csstools/postcss-normalize-display-values-1.0.1" - sources."@csstools/postcss-oklab-function-1.1.1" - sources."@csstools/postcss-progressive-custom-properties-1.3.0" - sources."@csstools/postcss-stepped-value-functions-1.0.1" - sources."@csstools/postcss-text-decoration-shorthand-1.0.0" - sources."@csstools/postcss-trigonometric-functions-1.0.2" - sources."@csstools/postcss-unset-value-1.0.2" - sources."@csstools/selector-specificity-2.0.2" - sources."@discoveryjs/json-ext-0.5.7" - (sources."@eslint/eslintrc-1.3.3" // { - dependencies = [ - sources."argparse-2.0.1" - sources."globals-13.17.0" - sources."js-yaml-4.1.0" - ]; - }) - sources."@gar/promisify-1.1.3" - sources."@humanwhocodes/config-array-0.11.7" - sources."@humanwhocodes/module-importer-1.0.1" - sources."@humanwhocodes/object-schema-1.2.1" - (sources."@istanbuljs/load-nyc-config-1.1.0" // { - dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-locate-4.1.0" - sources."path-exists-4.0.0" - ]; - }) - sources."@istanbuljs/schema-0.1.3" - sources."@jridgewell/gen-mapping-0.1.1" - sources."@jridgewell/resolve-uri-3.1.0" - sources."@jridgewell/set-array-1.1.2" - (sources."@jridgewell/source-map-0.3.2" // { - dependencies = [ - sources."@jridgewell/gen-mapping-0.3.2" - ]; - }) - sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.17" - (sources."@lcdp/offline-plugin-5.1.1" // { - dependencies = [ - sources."slash-1.0.0" - ]; - }) - sources."@mapbox/geojson-rewind-0.5.2" - sources."@mapbox/jsonlint-lines-primitives-2.0.2" - sources."@mapbox/mapbox-gl-supported-2.0.1" - sources."@mapbox/point-geometry-0.1.0" - sources."@mapbox/tiny-sdf-2.0.5" - sources."@mapbox/unitbezier-0.0.1" - sources."@mapbox/vector-tile-1.3.1" - sources."@mapbox/whoots-js-3.1.0" - sources."@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" - 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.1" // { - dependencies = [ - sources."semver-7.3.8" - ]; - }) - (sources."@npmcli/move-file-1.1.2" // { - dependencies = [ - sources."mkdirp-1.0.4" - ]; - }) - sources."@polka/url-1.0.0-next.21" - sources."@socket.io/component-emitter-3.1.0" - sources."@tootallnate/once-1.1.2" - sources."@trysound/sax-0.2.0" - sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.12" - sources."@types/eslint-7.29.0" - sources."@types/eslint-scope-3.7.4" - sources."@types/estree-1.0.0" - sources."@types/geojson-7946.0.10" - sources."@types/json-schema-7.0.11" - sources."@types/json5-0.0.29" - sources."@types/mapbox__point-geometry-0.1.2" - sources."@types/mapbox__vector-tile-1.3.0" - sources."@types/minimist-1.2.2" - sources."@types/node-18.11.9" - sources."@types/normalize-package-data-2.4.1" - sources."@types/parse-json-4.0.0" - sources."@types/pbf-3.0.2" - sources."@vue/compiler-core-3.2.41" - sources."@vue/compiler-dom-3.2.41" - sources."@vue/compiler-sfc-3.2.41" - sources."@vue/compiler-ssr-3.2.41" - (sources."@vue/component-compiler-utils-3.3.0" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."picocolors-0.2.1" - sources."postcss-7.0.39" - sources."yallist-2.1.2" - ]; - }) - sources."@vue/reactivity-transform-3.2.41" - sources."@vue/shared-3.2.41" - sources."@vvo/tzdb-6.75.0" - sources."@webassemblyjs/ast-1.11.1" - sources."@webassemblyjs/floating-point-hex-parser-1.11.1" - sources."@webassemblyjs/helper-api-error-1.11.1" - sources."@webassemblyjs/helper-buffer-1.11.1" - sources."@webassemblyjs/helper-numbers-1.11.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.11.1" - sources."@webassemblyjs/helper-wasm-section-1.11.1" - sources."@webassemblyjs/ieee754-1.11.1" - sources."@webassemblyjs/leb128-1.11.1" - sources."@webassemblyjs/utf8-1.11.1" - sources."@webassemblyjs/wasm-edit-1.11.1" - sources."@webassemblyjs/wasm-gen-1.11.1" - 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.2.0" - sources."@webpack-cli/info-1.5.0" - sources."@webpack-cli/serve-1.7.0" - sources."@xtuc/ieee754-1.2.0" - sources."@xtuc/long-4.2.2" - sources."abbrev-1.1.1" - sources."accepts-1.3.8" - sources."acorn-7.4.1" - sources."acorn-class-fields-0.3.7" - (sources."acorn-import-assertions-1.8.0" // { - dependencies = [ - sources."acorn-8.8.1" - ]; - }) - sources."acorn-jsx-5.3.2" - sources."acorn-private-class-elements-0.2.7" - sources."acorn-private-methods-0.3.3" - sources."acorn-stage3-4.0.0" - sources."acorn-static-class-features-0.2.4" - sources."acorn-walk-8.2.0" - (sources."adjust-sourcemap-loader-4.0.0" // { - dependencies = [ - sources."big.js-5.2.2" - sources."emojis-list-3.0.0" - sources."loader-utils-2.0.3" - ]; - }) - sources."after-0.8.2" - sources."agent-base-6.0.2" - (sources."agentkeepalive-4.2.1" // { - dependencies = [ - sources."depd-1.1.2" - ]; - }) - sources."aggregate-error-3.1.0" - sources."ajv-6.12.6" - (sources."ajv-formats-2.1.1" // { - dependencies = [ - sources."ajv-8.11.0" - sources."json-schema-traverse-1.0.0" - ]; - }) - sources."ajv-keywords-3.5.2" - sources."ansi-colors-4.1.1" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) - sources."ansi-html-community-0.0.8" - sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" - sources."any-promise-1.3.0" - sources."anymatch-3.1.2" - sources."app-module-path-2.2.0" - sources."aproba-2.0.0" - sources."are-we-there-yet-3.0.1" - sources."argparse-1.0.10" - sources."array-flatten-1.1.1" - sources."array-includes-3.1.5" - sources."array.prototype.flat-1.3.1" - sources."arraybuffer.slice-0.0.7" - sources."arrify-1.0.1" - sources."asap-2.0.6" - sources."asn1-0.2.6" - sources."assert-never-1.2.1" - sources."assert-plus-1.0.0" - sources."assertion-error-1.1.0" - sources."async-3.2.4" - sources."async-foreach-0.1.3" - sources."asynckit-0.4.0" - sources."autoprefixer-10.4.13" - sources."available-typed-arrays-1.0.5" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" - sources."axios-0.27.2" - sources."axios-mock-adapter-1.21.2" - (sources."babel-loader-8.3.0" // { - dependencies = [ - sources."big.js-5.2.2" - sources."emojis-list-3.0.0" - sources."find-cache-dir-3.3.2" - sources."find-up-4.1.0" - sources."loader-utils-2.0.3" - 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."semver-6.3.0" - ]; - }) - sources."babel-plugin-istanbul-6.1.1" - (sources."babel-plugin-polyfill-corejs2-0.3.3" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."babel-plugin-polyfill-corejs3-0.6.0" - sources."babel-plugin-polyfill-regenerator-0.4.1" - sources."babel-walk-3.0.0-canary-5" - 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."bcrypt-pbkdf-1.0.2" - sources."big.js-3.2.0" - sources."binary-extensions-2.2.0" - sources."blob-0.0.5" - sources."bluebird-3.7.2" - (sources."body-parser-1.20.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."boolbase-1.0.0" - sources."bowser-2.9.0" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."browser-stdout-1.3.1" - sources."browserslist-4.21.4" - sources."buffer-builder-0.2.0" - sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" - (sources."builtins-5.0.1" // { - dependencies = [ - sources."semver-7.3.8" - ]; - }) - sources."buntis-0.2.1" - sources."bytes-3.1.2" - (sources."cacache-15.3.0" // { - dependencies = [ - sources."mkdirp-1.0.4" - ]; - }) - sources."call-bind-1.0.2" - sources."callsites-3.1.0" - sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" - sources."camelize-1.0.0" - sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001431" - sources."caseless-0.12.0" - sources."chai-4.3.6" - sources."chalk-2.4.2" - sources."character-parser-2.2.0" - sources."charenc-0.0.2" - sources."check-error-1.0.2" - sources."cheerio-1.0.0-rc.10" - sources."cheerio-select-1.6.0" - (sources."chokidar-3.5.3" // { - dependencies = [ - sources."glob-parent-5.1.2" - ]; - }) - sources."chownr-2.0.0" - sources."chrome-finder-1.0.7" - sources."chrome-trace-event-1.0.3" - sources."clean-stack-2.2.0" - sources."cliui-7.0.4" - sources."clone-deep-4.0.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."color-support-1.1.3" - sources."colord-2.9.3" - sources."colorette-2.0.19" - sources."colors-1.4.0" - sources."combined-stream-1.0.8" - sources."commander-4.1.1" - sources."commondir-1.0.1" - sources."component-bind-1.0.0" - sources."component-emitter-1.3.0" - sources."component-inherit-0.0.3" - 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."connect-3.7.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."connect-redis-3.4.2" - sources."console-control-strings-1.1.0" - sources."consolidate-0.15.1" - sources."constantinople-4.0.1" - sources."content-disposition-0.5.4" - sources."content-security-policy-builder-2.1.0" - sources."content-type-1.0.4" - sources."convert-source-map-1.9.0" - sources."cookie-0.4.2" - (sources."cookie-parser-1.4.6" // { - dependencies = [ - sources."cookie-0.4.1" - ]; - }) - sources."cookie-signature-1.0.6" - sources."core-js-3.26.0" - sources."core-js-compat-3.26.0" - sources."core-util-is-1.0.2" - sources."cors-2.8.5" - sources."cosmiconfig-7.0.1" - sources."cross-env-7.0.3" - sources."cross-spawn-7.0.3" - sources."crypt-0.0.2" - sources."csrf-3.1.0" - sources."css-blank-pseudo-3.0.3" - sources."css-declaration-sorter-6.3.1" - sources."css-has-pseudo-3.0.4" - (sources."css-loader-6.7.1" // { - dependencies = [ - sources."semver-7.3.8" - ]; - }) - sources."css-prefers-color-scheme-6.0.3" - sources."css-select-4.3.0" - sources."css-tree-1.1.3" - sources."css-what-6.1.0" - sources."csscolorparser-1.0.3" - sources."cssdb-7.1.0" - sources."cssesc-3.0.0" - sources."cssnano-5.1.14" - sources."cssnano-preset-default-5.2.13" - sources."cssnano-utils-3.1.0" - sources."csso-4.2.0" - sources."csstype-3.1.1" - (sources."csurf-1.11.0" // { - dependencies = [ - sources."cookie-0.4.0" - sources."depd-1.1.2" - sources."http-errors-1.7.3" - sources."setprototypeof-1.1.1" - sources."statuses-1.5.0" - sources."toidentifier-1.0.0" - ]; - }) - sources."cuint-0.2.2" - sources."custom-event-1.0.1" - sources."dashdash-1.14.1" - sources."dasherize-2.0.0" - sources."date-format-4.0.14" - sources."de-indent-1.0.2" - sources."debug-4.3.4" - sources."decamelize-4.0.0" - (sources."decamelize-keys-1.1.1" // { - dependencies = [ - sources."decamelize-1.2.0" - sources."map-obj-1.0.1" - ]; - }) - sources."deep-eql-3.0.1" - sources."deep-extend-0.5.1" - sources."deep-is-0.1.4" - sources."define-properties-1.1.4" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."detect-libc-1.0.3" - sources."di-0.0.1" - sources."diff-5.0.0" - sources."doctrine-3.0.0" - sources."doctypes-1.1.0" - (sources."dom-serialize-2.2.1" // { - dependencies = [ - sources."void-elements-2.0.1" - ]; - }) - sources."dom-serializer-1.4.1" - sources."domelementtype-2.3.0" - sources."domhandler-4.3.1" - sources."domutils-2.8.0" - sources."dont-sniff-mimetype-1.1.0" - sources."dotenv-8.6.0" - sources."double-ended-queue-2.1.0-0" - sources."duplexer-0.1.2" - sources."earcut-2.2.4" - sources."easygettext-2.17.0" - sources."ecc-jsbn-0.1.2" - sources."ee-first-1.1.1" - sources."ejs-3.1.8" - sources."electron-to-chromium-1.4.284" - sources."emoji-regex-8.0.0" - sources."emojis-list-2.1.0" - sources."encodeurl-1.0.2" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) - sources."engine.io-6.2.0" - (sources."engine.io-client-3.5.3" // { - dependencies = [ - sources."debug-3.1.0" - sources."engine.io-parser-2.2.1" - sources."ms-2.0.0" - sources."ws-7.4.6" - ]; - }) - sources."engine.io-parser-5.0.4" - sources."enhanced-resolve-5.10.0" - sources."ent-2.2.0" - sources."entities-2.2.0" - sources."env-paths-2.2.1" - sources."envinfo-7.8.1" - sources."err-code-2.0.3" - sources."error-ex-1.3.2" - sources."es-abstract-1.20.4" - sources."es-module-lexer-0.9.3" - sources."es-shim-unscopables-1.0.0" - sources."es-to-primitive-1.2.1" - sources."escalade-3.1.1" - sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" - (sources."eslint-8.27.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."escape-string-regexp-4.0.0" - sources."eslint-scope-7.1.1" - sources."eslint-visitor-keys-3.3.0" - sources."estraverse-5.3.0" - sources."find-up-5.0.0" - sources."globals-13.17.0" - sources."has-flag-4.0.0" - sources."js-yaml-4.1.0" - sources."locate-path-6.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."path-exists-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."eslint-config-prettier-8.5.0" - sources."eslint-config-standard-17.0.0" - (sources."eslint-formatter-pretty-4.1.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."eslint-import-resolver-node-0.3.6" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - (sources."eslint-module-utils-2.7.4" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - (sources."eslint-plugin-es-4.1.0" // { - dependencies = [ - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - ]; - }) - (sources."eslint-plugin-html-7.1.0" // { - dependencies = [ - sources."dom-serializer-2.0.0" - sources."domhandler-5.0.3" - sources."domutils-3.0.1" - sources."entities-4.4.0" - sources."htmlparser2-8.0.1" - ]; - }) - (sources."eslint-plugin-import-2.26.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."doctrine-2.1.0" - sources."ms-2.0.0" - ]; - }) - (sources."eslint-plugin-n-15.5.0" // { - dependencies = [ - sources."semver-7.3.8" - ]; - }) - (sources."eslint-plugin-node-11.1.0" // { - dependencies = [ - sources."eslint-plugin-es-3.0.1" - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - sources."semver-6.3.0" - ]; - }) - (sources."eslint-plugin-prettier-vue-4.2.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."eslint-plugin-promise-6.1.1" - (sources."eslint-plugin-vue-9.7.0" // { - dependencies = [ - sources."semver-7.3.8" - ]; - }) - sources."eslint-rule-docs-1.1.235" - sources."eslint-scope-5.1.1" - sources."eslint-utils-3.0.0" - sources."eslint-visitor-keys-2.1.0" - (sources."eslint-webpack-plugin-3.2.0" // { - dependencies = [ - sources."ajv-8.11.0" - sources."ajv-keywords-5.1.0" - sources."json-schema-traverse-1.0.0" - sources."schema-utils-4.0.0" - ]; - }) - (sources."espree-9.4.1" // { - dependencies = [ - sources."acorn-8.8.1" - sources."eslint-visitor-keys-3.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."estree-walker-2.0.2" - sources."esutils-2.0.3" - sources."etag-1.8.1" - sources."eventemitter3-4.0.7" - sources."events-3.3.0" - sources."eventsource-polyfill-0.9.6" - (sources."express-4.18.2" // { - dependencies = [ - sources."cookie-0.5.0" - sources."debug-2.6.9" - sources."finalhandler-1.2.0" - sources."ms-2.0.0" - sources."path-to-regexp-0.1.7" - ]; - }) - sources."express-data-parser-1.2.0" - (sources."express-session-1.17.3" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-diff-1.2.0" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."fastest-levenshtein-1.0.16" - sources."fastq-1.13.0" - sources."feature-policy-0.3.0" - sources."fibers-5.0.3" - sources."file-entry-cache-6.0.1" - (sources."file-loader-6.2.0" // { - dependencies = [ - sources."big.js-5.2.2" - sources."emojis-list-3.0.0" - sources."loader-utils-2.0.3" - sources."schema-utils-3.1.1" - ]; - }) - sources."file-saver-2.0.5" - (sources."filelist-1.0.4" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-5.1.0" - ]; - }) - sources."fill-range-7.0.1" - (sources."finalhandler-1.1.2" // { - 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-3.0.0" - sources."flat-5.0.2" - sources."flat-cache-3.0.4" - sources."flatted-3.2.7" - sources."flow-parser-0.192.0" - (sources."flow-remove-types-2.192.0" // { - dependencies = [ - sources."pirates-3.0.2" - ]; - }) - sources."follow-redirects-1.15.2" - sources."for-each-0.3.3" - sources."foreachasync-3.0.0" - sources."forever-agent-0.6.1" - sources."form-data-4.0.0" - sources."formidable-1.2.6" - sources."forwarded-0.2.0" - sources."fraction.js-4.2.0" - sources."fresh-0.5.2" - sources."fs-extra-8.1.0" - sources."fs-minipass-2.1.0" - sources."fs-readdir-recursive-1.1.0" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" - sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.5" - sources."functions-have-names-1.2.3" - sources."gauge-4.0.4" - sources."gaze-1.1.3" - sources."gensync-1.0.0-beta.2" - sources."geojson-vt-3.2.1" - sources."get-caller-file-2.0.5" - sources."get-func-name-2.0.0" - sources."get-intrinsic-1.1.3" - sources."get-package-type-0.1.0" - sources."get-stdin-4.0.1" - sources."get-stream-6.0.1" - sources."get-symbol-description-1.0.0" - sources."getpass-0.1.7" - sources."gl-matrix-3.4.3" - sources."glob-7.2.3" - sources."glob-parent-6.0.2" - sources."glob-to-regexp-0.4.1" - (sources."global-prefix-3.0.0" // { - dependencies = [ - sources."which-1.3.1" - ]; - }) - sources."globals-11.12.0" - (sources."globule-1.3.4" // { - dependencies = [ - sources."glob-7.1.7" - sources."minimatch-3.0.8" - ]; - }) - sources."google-protobuf-3.21.2" - sources."gopd-1.0.1" - sources."graceful-fs-4.2.10" - sources."grapheme-splitter-1.0.4" - sources."gzip-size-6.0.0" - sources."handlebars-4.7.7" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."hard-rejection-2.1.0" - sources."has-1.0.3" - sources."has-bigints-1.0.2" - (sources."has-binary2-1.0.3" // { - dependencies = [ - sources."isarray-2.0.1" - ]; - }) - sources."has-cors-1.1.0" - sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."has-unicode-2.0.1" - sources."hash-sum-1.0.2" - sources."hbs-4.2.0" - sources."he-1.2.0" - sources."helmet-3.23.3" - sources."helmet-crossdomain-0.4.0" - sources."helmet-csp-2.10.0" - sources."hide-powered-by-1.1.0" - sources."hls.js-1.2.5" - sources."hosted-git-info-4.1.0" - sources."hpkp-2.0.0" - sources."hsts-2.2.0" - sources."html-entities-2.3.3" - sources."html-escaper-2.0.2" - sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" - sources."http-errors-2.0.0" - sources."http-proxy-1.18.1" - sources."http-proxy-agent-4.0.1" - sources."http-signature-1.2.0" - sources."https-proxy-agent-5.0.1" - sources."humanize-ms-1.2.1" - sources."i-0.3.7" - sources."iconv-lite-0.4.24" - sources."icss-utils-5.1.0" - sources."ieee754-1.2.1" - sources."ignore-5.2.0" - sources."immutable-4.1.0" - (sources."import-fresh-3.3.0" // { - dependencies = [ - sources."resolve-from-4.0.0" - ]; - }) - (sources."import-local-3.1.0" // { - dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-locate-4.1.0" - sources."path-exists-4.0.0" - sources."pkg-dir-4.2.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.4" - sources."ini-1.3.8" - sources."internal-slot-1.0.3" - sources."interpret-2.2.0" - sources."ip-2.0.0" - sources."ipaddr.js-1.9.1" - sources."irregular-plurals-3.3.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-2.0.5" - sources."is-callable-1.2.7" - sources."is-core-module-2.11.0" - sources."is-date-object-1.0.5" - sources."is-expression-4.0.0" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-generator-function-1.0.10" - sources."is-glob-4.0.3" - 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.7" - sources."is-path-inside-3.0.3" - sources."is-plain-obj-2.1.0" - sources."is-plain-object-2.0.4" - sources."is-promise-2.2.2" - sources."is-regex-1.1.4" - sources."is-shared-array-buffer-1.0.2" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" - sources."is-typedarray-1.0.0" - sources."is-unicode-supported-0.1.0" - sources."is-weakref-1.0.2" - sources."isarray-1.0.0" - sources."isbinaryfile-4.0.10" - sources."isexe-2.0.0" - sources."isobject-3.0.1" - sources."isstream-0.1.2" - sources."istanbul-lib-coverage-3.2.0" - (sources."istanbul-lib-instrument-5.2.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."istanbul-lib-report-3.0.0" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."make-dir-3.1.0" - sources."semver-6.3.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."istanbul-lib-source-maps-3.0.6" // { - dependencies = [ - sources."istanbul-lib-coverage-2.0.5" - sources."rimraf-2.7.1" - ]; - }) - sources."istanbul-reports-3.1.5" - (sources."jake-10.8.5" // { - 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."jest-worker-28.1.3" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-8.1.1" - ]; - }) - sources."js-base64-2.6.4" - sources."js-sdsl-4.1.5" - sources."js-stringify-1.0.2" - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."jsbn-0.1.1" - sources."jsesc-2.5.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-without-jsonify-1.0.1" - sources."json-stringify-safe-5.0.1" - sources."json5-2.2.1" - sources."jsonfile-4.0.0" - sources."jsprim-1.4.2" - sources."jstransformer-1.0.0" - sources."karma-6.4.1" - (sources."karma-chrome-launcher-3.1.1" // { - dependencies = [ - sources."which-1.3.1" - ]; - }) - sources."karma-coverage-istanbul-reporter-3.0.3" - sources."karma-htmlfile-reporter-0.3.8" - sources."karma-mocha-2.0.1" - sources."karma-verbose-reporter-0.0.8" - (sources."karma-webpack-5.0.0" // { - dependencies = [ - sources."webpack-merge-4.2.2" - ]; - }) - sources."kdbush-3.0.0" - sources."kind-of-6.0.3" - sources."klona-2.0.5" - sources."levn-0.4.1" - sources."lilconfig-2.0.6" - sources."lines-and-columns-1.2.4" - sources."loader-runner-4.3.0" - (sources."loader-utils-0.2.17" // { - dependencies = [ - sources."json5-0.5.1" - ]; - }) - sources."loadware-2.0.0" - sources."locate-path-3.0.0" - sources."lodash-4.17.21" - sources."lodash.debounce-4.0.8" - sources."lodash.memoize-4.1.2" - sources."lodash.merge-4.6.2" - sources."lodash.uniq-4.5.0" - sources."log-1.4.0" - (sources."log-symbols-4.1.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."log4js-6.7.0" - sources."loupe-2.3.5" - sources."lru-cache-6.0.0" - sources."luxon-3.1.0" - sources."magic-string-0.25.9" - sources."make-dir-2.1.0" - sources."make-fetch-happen-9.1.0" - sources."map-obj-4.3.0" - sources."maplibre-gl-2.4.0" - (sources."md5-2.3.0" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - sources."mdn-data-2.0.14" - sources."media-typer-0.3.0" - sources."memoize-one-6.0.0" - (sources."meow-9.0.0" // { - dependencies = [ - sources."decamelize-1.2.0" - sources."type-fest-0.18.1" - ]; - }) - sources."merge-descriptors-1.0.1" - sources."merge-source-map-1.1.0" - sources."merge-stream-2.0.0" - (sources."method-override-3.0.0" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) - sources."methods-1.1.2" - sources."micromatch-4.0.5" - sources."mime-2.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."min-indent-1.0.1" - (sources."mini-css-extract-plugin-2.6.1" // { - dependencies = [ - sources."ajv-8.11.0" - sources."ajv-keywords-5.1.0" - sources."json-schema-traverse-1.0.0" - sources."schema-utils-4.0.0" - ]; - }) - sources."minimatch-3.1.2" - sources."minimist-1.2.7" - (sources."minimist-options-4.1.0" // { - dependencies = [ - sources."is-plain-obj-1.1.0" - ]; - }) - sources."minipass-3.3.5" - sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.4.1" - 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-0.5.6" - (sources."mocha-10.1.0" // { - dependencies = [ - sources."argparse-2.0.1" - sources."brace-expansion-2.0.1" - sources."escape-string-regexp-4.0.0" - sources."find-up-5.0.0" - (sources."glob-7.2.0" // { - dependencies = [ - sources."minimatch-3.1.2" - ]; - }) - sources."has-flag-4.0.0" - sources."js-yaml-4.1.0" - sources."locate-path-6.0.0" - sources."minimatch-5.0.1" - sources."ms-2.1.3" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."path-exists-4.0.0" - sources."supports-color-8.1.1" - sources."yargs-parser-20.2.4" - ]; - }) - sources."mrmime-1.0.1" - sources."ms-2.1.2" - sources."murmurhash-js-1.0.0" - sources."mz-2.7.0" - sources."nan-2.17.0" - sources."nanoid-3.3.3" - sources."natural-compare-1.4.0" - sources."negotiator-0.6.3" - sources."neo-async-2.6.2" - sources."nocache-2.1.0" - (sources."node-gyp-8.4.1" // { - dependencies = [ - sources."npmlog-6.0.2" - sources."semver-7.3.8" - ]; - }) - sources."node-gyp-build-4.5.0" - sources."node-modules-regexp-1.0.0" - sources."node-releases-2.0.6" - (sources."node-sass-7.0.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."node-storage-shim-2.0.1" - sources."nopt-5.0.0" - (sources."normalize-package-data-3.0.3" // { - dependencies = [ - sources."semver-7.3.8" - ]; - }) - sources."normalize-path-3.0.0" - sources."normalize-range-0.1.2" - sources."normalize-url-6.1.0" - (sources."npmlog-5.0.1" // { - dependencies = [ - sources."are-we-there-yet-2.0.0" - sources."gauge-3.0.2" - ]; - }) - sources."nth-check-2.1.1" - sources."oauth-sign-0.9.0" - sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" - sources."object-keys-1.1.1" - sources."object.assign-4.1.4" - sources."object.values-1.1.6" - sources."on-finished-2.4.1" - sources."on-headers-1.0.2" - sources."once-1.4.0" - sources."opener-1.5.2" - sources."optionator-0.9.1" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-map-4.0.0" - sources."p-try-2.2.0" - sources."parent-module-1.0.1" - sources."parse-json-5.2.0" - sources."parse5-6.0.1" - sources."parse5-htmlparser2-tree-adapter-6.0.1" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" - sources."parseurl-1.3.3" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-to-regexp-6.2.1" - sources."path-type-4.0.0" - sources."pathval-1.1.1" - sources."pbf-3.2.1" - sources."performance-now-2.1.0" - sources."photoswipe-4.1.3" - sources."picocolors-1.0.0" - sources."picomatch-2.3.1" - sources."pify-4.0.1" - sources."pirates-4.0.5" - sources."pkg-dir-3.0.0" - sources."plur-4.0.0" - sources."pofile-1.1.3" - (sources."postcss-8.4.18" // { - dependencies = [ - sources."nanoid-3.3.4" - ]; - }) - sources."postcss-attribute-case-insensitive-5.0.2" - sources."postcss-calc-8.2.4" - sources."postcss-clamp-4.1.0" - sources."postcss-color-functional-notation-4.2.4" - sources."postcss-color-hex-alpha-8.0.4" - sources."postcss-color-rebeccapurple-7.1.1" - sources."postcss-colormin-5.3.0" - sources."postcss-convert-values-5.1.3" - sources."postcss-custom-media-8.0.2" - sources."postcss-custom-properties-12.1.10" - sources."postcss-custom-selectors-6.0.3" - sources."postcss-dir-pseudo-class-6.0.5" - sources."postcss-discard-comments-5.1.2" - sources."postcss-discard-duplicates-5.1.0" - sources."postcss-discard-empty-5.1.1" - sources."postcss-discard-overridden-5.1.0" - sources."postcss-double-position-gradients-3.1.2" - sources."postcss-env-function-4.0.6" - sources."postcss-focus-visible-6.0.4" - sources."postcss-focus-within-5.0.4" - sources."postcss-font-variant-5.0.0" - sources."postcss-gap-properties-3.0.5" - sources."postcss-image-set-function-4.0.7" - sources."postcss-import-15.0.0" - sources."postcss-initial-4.0.1" - sources."postcss-lab-function-4.2.1" - (sources."postcss-loader-7.0.1" // { - dependencies = [ - sources."semver-7.3.8" - ]; - }) - sources."postcss-logical-5.0.4" - sources."postcss-media-minmax-5.0.0" - sources."postcss-merge-longhand-5.1.7" - sources."postcss-merge-rules-5.1.3" - sources."postcss-minify-font-values-5.1.0" - sources."postcss-minify-gradients-5.1.1" - sources."postcss-minify-params-5.1.4" - sources."postcss-minify-selectors-5.2.1" - sources."postcss-modules-extract-imports-3.0.0" - sources."postcss-modules-local-by-default-4.0.0" - sources."postcss-modules-scope-3.0.0" - sources."postcss-modules-values-4.0.0" - sources."postcss-nesting-10.2.0" - sources."postcss-normalize-charset-5.1.0" - sources."postcss-normalize-display-values-5.1.0" - sources."postcss-normalize-positions-5.1.1" - sources."postcss-normalize-repeat-style-5.1.1" - sources."postcss-normalize-string-5.1.0" - sources."postcss-normalize-timing-functions-5.1.0" - sources."postcss-normalize-unicode-5.1.1" - sources."postcss-normalize-url-5.1.0" - sources."postcss-normalize-whitespace-5.1.1" - sources."postcss-opacity-percentage-1.1.2" - sources."postcss-ordered-values-5.1.3" - sources."postcss-overflow-shorthand-3.0.4" - sources."postcss-page-break-3.0.4" - sources."postcss-place-7.0.5" - sources."postcss-preset-env-7.8.2" - sources."postcss-pseudo-class-any-link-7.1.6" - sources."postcss-reduce-initial-5.1.1" - sources."postcss-reduce-transforms-5.1.0" - sources."postcss-replace-overflow-wrap-4.0.0" - sources."postcss-reporter-7.0.5" - sources."postcss-selector-not-6.0.1" - sources."postcss-selector-parser-6.0.10" - sources."postcss-svgo-5.1.0" - sources."postcss-unique-selectors-5.1.1" - (sources."postcss-url-10.1.3" // { - dependencies = [ - sources."make-dir-3.1.0" - sources."mime-2.5.2" - sources."minimatch-3.0.8" - sources."semver-6.3.0" - ]; - }) - sources."postcss-value-parser-4.2.0" - sources."potpack-1.0.2" - sources."prelude-ls-1.2.1" - sources."prettier-2.7.1" - sources."prettier-linter-helpers-1.0.0" - sources."process-nextick-args-2.0.1" - sources."promise-7.3.1" - sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" - sources."protocol-buffers-schema-3.6.0" - sources."proxy-addr-2.0.7" - sources."pseudomap-1.0.2" - sources."psl-1.9.0" - sources."pubsub-js-1.9.4" - sources."pug-3.0.2" - sources."pug-attrs-3.0.0" - sources."pug-code-gen-3.0.2" - sources."pug-error-2.0.0" - sources."pug-filters-4.0.0" - sources."pug-lexer-5.0.1" - sources."pug-linker-4.0.0" - sources."pug-load-3.0.0" - sources."pug-parser-6.0.0" - sources."pug-runtime-3.0.1" - sources."pug-strip-comments-2.0.0" - sources."pug-walk-2.0.0" - sources."punycode-2.1.1" - sources."qjobs-1.2.0" - sources."qs-6.11.0" - sources."queue-microtask-1.2.3" - sources."quick-lru-4.0.1" - sources."quickselect-2.0.0" - sources."random-bytes-1.0.0" - sources."randombytes-2.1.0" - sources."range-parser-1.2.1" - sources."raw-body-2.5.1" - (sources."read-cache-1.0.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."hosted-git-info-2.8.9" - sources."normalize-package-data-2.5.0" - sources."type-fest-0.6.0" - ]; - }) - (sources."read-pkg-up-7.0.1" // { - dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-locate-4.1.0" - sources."path-exists-4.0.0" - sources."type-fest-0.8.1" - ]; - }) - sources."readable-stream-3.6.0" - sources."readdirp-3.6.0" - sources."rechoir-0.7.1" - sources."redent-3.0.0" - sources."redis-2.8.0" - sources."redis-commands-1.7.0" - sources."redis-parser-2.6.0" - sources."referrer-policy-1.2.0" - sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.1.0" - sources."regenerator-runtime-0.13.10" - sources."regenerator-transform-0.15.0" - sources."regex-parser-2.2.11" - sources."regexp.prototype.flags-1.4.3" - sources."regexpp-3.2.0" - sources."regexpu-core-5.2.1" - sources."regjsgen-0.7.1" - (sources."regjsparser-0.9.1" // { - dependencies = [ - sources."jsesc-0.5.0" - ]; - }) - (sources."request-2.88.2" // { - dependencies = [ - sources."form-data-2.3.3" - sources."qs-6.5.3" - ]; - }) - sources."require-directory-2.1.1" - sources."require-from-string-2.0.2" - sources."requires-port-1.0.0" - sources."resolve-1.22.1" - sources."resolve-cwd-3.0.0" - sources."resolve-from-5.0.0" - sources."resolve-protobuf-schema-2.1.0" - (sources."resolve-url-loader-5.0.0" // { - dependencies = [ - sources."big.js-5.2.2" - sources."emojis-list-3.0.0" - sources."loader-utils-2.0.3" - ]; - }) - (sources."response-time-2.3.2" // { - dependencies = [ - sources."depd-1.1.2" - ]; - }) - sources."retry-0.12.0" - sources."reusify-1.0.4" - sources."rfdc-1.3.0" - sources."rimraf-3.0.2" - sources."rndm-1.2.0" - sources."run-parallel-1.2.0" - sources."rxjs-7.5.7" - sources."safe-buffer-5.2.1" - sources."safe-regex-test-1.0.0" - sources."safer-buffer-2.1.2" - sources."sass-1.56.0" - (sources."sass-embedded-1.55.0" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-8.1.1" - ]; - }) - sources."sass-embedded-darwin-arm64-1.55.0" - sources."sass-embedded-darwin-x64-1.55.0" - sources."sass-embedded-linux-arm-1.55.0" - sources."sass-embedded-linux-arm64-1.55.0" - sources."sass-embedded-linux-ia32-1.55.0" - sources."sass-embedded-linux-x64-1.55.0" - sources."sass-embedded-win32-ia32-1.55.0" - sources."sass-embedded-win32-x64-1.55.0" - (sources."sass-graph-4.0.1" // { - dependencies = [ - sources."cliui-8.0.1" - sources."yargs-17.6.2" - sources."yargs-parser-21.1.1" - ]; - }) - sources."sass-loader-13.1.0" - sources."schema-utils-2.7.1" - sources."screenfull-5.2.0" - (sources."scss-tokenizer-0.4.3" // { - dependencies = [ - sources."source-map-0.7.4" - ]; - }) - sources."semver-5.7.1" - (sources."send-0.18.0" // { - 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-6.0.0" - (sources."serve-favicon-2.5.0" // { - dependencies = [ - sources."ms-2.1.1" - sources."safe-buffer-5.1.1" - ]; - }) - (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.15.0" - (sources."server-1.0.37" // { - dependencies = [ - sources."component-emitter-1.2.1" - sources."debug-4.1.1" - sources."engine.io-3.6.0" - sources."engine.io-parser-2.2.1" - sources."isarray-2.0.1" - sources."socket.io-2.5.0" - sources."socket.io-adapter-1.1.2" - sources."socket.io-parser-3.4.1" - sources."ws-7.4.6" - ]; - }) - sources."set-blocking-2.0.0" - sources."setprototypeof-1.2.0" - sources."shallow-clone-3.0.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."side-channel-1.0.4" - sources."signal-exit-3.0.7" - sources."sirv-1.0.19" - sources."slash-2.0.0" - sources."smart-buffer-4.2.0" - sources."socket.io-4.5.3" - sources."socket.io-adapter-2.4.0" - (sources."socket.io-client-2.5.0" // { - dependencies = [ - sources."debug-3.1.0" - sources."isarray-2.0.1" - sources."ms-2.0.0" - sources."socket.io-parser-3.3.2" - ]; - }) - sources."socket.io-parser-4.2.1" - sources."sockette-2.0.6" - sources."socks-2.7.1" - sources."socks-proxy-agent-6.2.1" - sources."source-list-map-2.0.1" - sources."source-map-0.6.1" - sources."source-map-js-1.0.2" - sources."source-map-support-0.5.21" - sources."sourcemap-codec-1.4.8" - 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.12" - sources."sprintf-js-1.0.3" - sources."sshpk-1.17.0" - sources."ssri-8.0.1" - sources."stable-0.1.8" - sources."statuses-2.0.1" - (sources."stdout-stream-1.4.1" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."streamroller-3.1.3" - sources."string-width-4.2.3" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-bom-3.0.0" - sources."strip-indent-3.0.0" - sources."strip-json-comments-3.1.1" - sources."style-loader-3.3.1" - sources."stylehacks-5.1.1" - sources."supercluster-7.1.5" - sources."supports-color-5.5.0" - (sources."supports-hyperlinks-2.3.0" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."supports-preserve-symlinks-flag-1.0.0" - sources."svg-url-loader-8.0.0" - (sources."svgo-2.8.0" // { - dependencies = [ - sources."commander-7.2.0" - ]; - }) - sources."tapable-2.2.1" - (sources."tar-6.1.12" // { - dependencies = [ - sources."mkdirp-1.0.4" - ]; - }) - (sources."terser-5.15.1" // { - dependencies = [ - sources."acorn-8.8.1" - sources."commander-2.20.3" - ]; - }) - (sources."terser-webpack-plugin-5.3.6" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."jest-worker-27.5.1" - sources."schema-utils-3.1.1" - sources."supports-color-8.1.1" - ]; - }) - sources."test-exclude-6.0.0" - sources."text-table-0.2.0" - sources."thenby-1.3.4" - sources."thenify-3.3.1" - sources."thenify-all-1.6.0" - sources."tinyqueue-2.0.3" - sources."tmp-0.2.1" - sources."to-array-0.1.4" - sources."to-fast-properties-2.0.0" - sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.1" - sources."token-stream-1.0.0" - sources."totalist-1.1.0" - sources."tough-cookie-2.5.0" - sources."trim-newlines-3.0.1" - sources."true-case-path-1.0.3" - (sources."tsconfig-paths-3.14.1" // { - dependencies = [ - sources."json5-1.0.1" - ]; - }) - sources."tslib-2.4.1" - sources."tsscmp-1.0.6" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-check-0.4.0" - sources."type-detect-4.0.8" - sources."type-fest-0.20.2" - sources."type-is-1.6.18" - sources."ua-parser-js-0.7.32" - sources."uglify-js-3.17.4" - sources."uid-safe-2.1.5" - sources."unbox-primitive-1.0.2" - 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" - sources."unicode-property-aliases-ecmascript-2.1.0" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - sources."universalify-0.1.2" - sources."unpipe-1.0.0" - sources."update-browserslist-db-1.0.10" - sources."uri-js-4.4.1" - (sources."url-loader-4.1.1" // { - dependencies = [ - sources."big.js-5.2.2" - sources."emojis-list-3.0.0" - sources."loader-utils-2.0.3" - sources."schema-utils-3.1.1" - ]; - }) - sources."utf-8-validate-5.0.10" - sources."util-0.12.5" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."uuid-3.4.0" - sources."validate-npm-package-license-3.0.4" - sources."vary-1.1.2" - sources."verror-1.10.0" - sources."vlq-0.2.3" - sources."void-elements-3.1.0" - sources."vt-pbf-3.1.3" - (sources."vue-2.7.13" // { - dependencies = [ - sources."@vue/compiler-sfc-2.7.13" - ]; - }) - (sources."vue-eslint-parser-9.1.0" // { - dependencies = [ - sources."eslint-scope-7.1.1" - sources."eslint-visitor-keys-3.3.0" - sources."estraverse-5.3.0" - sources."semver-7.3.8" - ]; - }) - sources."vue-fullscreen-2.6.1" - sources."vue-gettext-2.1.12" - sources."vue-hot-reload-api-2.3.4" - sources."vue-infinite-scroll-2.0.2" - (sources."vue-loader-15.10.0" // { - dependencies = [ - sources."big.js-5.2.2" - sources."emojis-list-3.0.0" - sources."json5-1.0.1" - sources."loader-utils-1.4.0" - ]; - }) - sources."vue-loader-plugin-1.3.0" - (sources."vue-luxon-0.10.0" // { - dependencies = [ - sources."luxon-1.28.0" - ]; - }) - sources."vue-router-3.6.5" - (sources."vue-style-loader-4.1.3" // { - dependencies = [ - sources."big.js-5.2.2" - sources."emojis-list-3.0.0" - sources."json5-1.0.1" - sources."loader-utils-1.4.0" - ]; - }) - sources."vue-template-compiler-2.7.13" - sources."vue-template-es2015-compiler-1.9.1" - sources."vue2-filters-0.14.0" - sources."vuetify-1.5.24" - sources."walk-2.3.15" - sources."watchpack-2.4.0" - (sources."webpack-5.74.0" // { - dependencies = [ - sources."@types/estree-0.0.51" - sources."acorn-8.8.1" - sources."schema-utils-3.1.1" - ]; - }) - (sources."webpack-bundle-analyzer-4.7.0" // { - dependencies = [ - sources."acorn-8.8.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."commander-7.2.0" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - sources."ws-7.5.9" - ]; - }) - (sources."webpack-cli-4.10.0" // { - dependencies = [ - sources."commander-7.2.0" - ]; - }) - sources."webpack-hot-middleware-2.25.2" - (sources."webpack-manifest-plugin-5.0.0" // { - dependencies = [ - sources."webpack-sources-2.3.1" - ]; - }) - sources."webpack-md5-hash-0.0.6" - sources."webpack-merge-5.8.0" - sources."webpack-sources-3.2.3" - sources."which-2.0.2" - sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.9" - sources."wide-align-1.1.5" - sources."wildcard-2.0.0" - sources."with-7.0.2" - sources."word-wrap-1.2.3" - sources."wordwrap-1.0.0" - sources."workerpool-6.2.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."x-xss-protection-1.3.0" - sources."xml-name-validator-4.0.0" - sources."xmlbuilder-10.1.1" - sources."xmlhttprequest-ssl-1.6.3" - sources."xxhashjs-0.2.2" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - sources."yaml-1.10.2" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - (sources."yargs-unparser-2.0.0" // { - dependencies = [ - sources."camelcase-6.3.0" - ]; - }) - sources."yeast-0.1.2" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "AI-Powered Photos App"; - license = "AGPL-3.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; pkg = nodeEnv.buildNodePackage { name = "pkg"; packageName = "pkg"; @@ -131645,7 +128680,7 @@ in sources."escalade-3.1.1" sources."expand-template-2.0.3" sources."fast-glob-3.2.12" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."from2-2.3.0" sources."fs-constants-1.0.0" @@ -131671,7 +128706,7 @@ in sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."inherits-2.0.4" sources."ini-1.3.8" sources."into-stream-6.0.0" @@ -131704,7 +128739,7 @@ in sources."semver-5.7.1" ]; }) - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."node-notifier-10.0.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -131818,14 +128853,14 @@ in }) sources."@pm2/pm2-version-check-1.0.4" sources."@tootallnate/once-1.1.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" sources."amp-0.3.1" sources."amp-message-0.1.2" sources."ansi-colors-4.1.3" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" (sources."argparse-1.0.10" // { dependencies = [ sources."sprintf-js-1.0.3" @@ -131861,7 +128896,7 @@ in sources."croner-4.1.97" sources."culvert-0.1.2" sources."data-uri-to-buffer-3.0.1" - sources."dayjs-1.11.6" + sources."dayjs-1.11.7" sources."debug-4.3.4" sources."deep-is-0.1.4" sources."degenerator-3.0.2" @@ -131926,7 +128961,7 @@ in ]; }) sources."netmask-2.0.2" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."normalize-path-3.0.0" (sources."nssocket-0.6.0" // { dependencies = [ @@ -131988,10 +129023,10 @@ in sources."string_decoder-0.10.31" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.12.13" + sources."systeminformation-5.17.4" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tv4-1.3.0" sources."tx2-1.0.5" sources."type-check-0.3.2" @@ -132004,7 +129039,7 @@ in sources."async-2.6.4" ]; }) - sources."vm2-3.9.11" + sources."vm2-3.9.13" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."ws-7.4.6" @@ -132025,10 +129060,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "7.14.2"; + version = "7.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-7.14.2.tgz"; - sha512 = "NSxrIaRW07jFQQ1fPFFOA8eMfuogsMeygOKd3zaFgyJBdo1oh61jl2JjWc+w0XNzWIMG7/v9HK7nP8RTL5NO3g=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-7.26.1.tgz"; + sha512 = "l86ZNy8RZmG2aDxZVk6+vt9c8aV0tMZICQxPksRQOL5r2n92kgaIauYSFUZ+LNmPJFsbSGKpsvgOF41oiS7JWw=="; }; buildInputs = globalBuildInputs; meta = { @@ -132071,10 +129106,10 @@ in postcss = nodeEnv.buildNodePackage { name = "postcss"; packageName = "postcss"; - version = "8.4.18"; + version = "8.4.21"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz"; - sha512 = "Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz"; + sha512 = "tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg=="; }; dependencies = [ sources."nanoid-3.3.4" @@ -132094,10 +129129,10 @@ in postcss-cli = nodeEnv.buildNodePackage { name = "postcss-cli"; packageName = "postcss-cli"; - version = "10.0.0"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-10.0.0.tgz"; - sha512 = "Wjy/00wBBEgQqnSToznxLWDnATznokFGXsHtF/3G8glRZpz5KYlfHcBW/VMJmWAeF2x49zjgy4izjM3/Wx1dKA=="; + url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-10.1.0.tgz"; + sha512 = "Zu7PLORkE9YwNdvOeOVKPmWghprOtjFQU3srMUGbdz3pHJiFh7yZ4geiZFMkjMfB0mtTFR3h8RemR62rPkbOPA=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" @@ -132107,28 +129142,28 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.14" - sources."@swc/core-darwin-arm64-1.3.14" - sources."@swc/core-darwin-x64-1.3.14" - sources."@swc/core-linux-arm-gnueabihf-1.3.14" - sources."@swc/core-linux-arm64-gnu-1.3.14" - sources."@swc/core-linux-arm64-musl-1.3.14" - sources."@swc/core-linux-x64-gnu-1.3.14" - sources."@swc/core-linux-x64-musl-1.3.14" - sources."@swc/core-win32-arm64-msvc-1.3.14" - sources."@swc/core-win32-ia32-msvc-1.3.14" - sources."@swc/core-win32-x64-msvc-1.3.14" - sources."@swc/wasm-1.3.14" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.30" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.11.9" - sources."acorn-8.8.1" + sources."@types/node-18.11.18" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."arg-4.1.3" sources."binary-extensions-2.2.0" sources."braces-3.0.2" @@ -132143,16 +129178,20 @@ in sources."emoji-regex-8.0.0" sources."escalade-3.1.1" sources."fast-glob-3.2.12" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" - sources."fs-extra-10.1.0" + sources."fs-extra-11.1.0" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" sources."get-stdin-9.0.0" sources."glob-parent-5.1.2" - sources."globby-13.1.2" + (sources."globby-13.1.3" // { + dependencies = [ + sources."slash-4.0.0" + ]; + }) sources."graceful-fs-4.2.10" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -132169,7 +129208,7 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-2.3.0" - sources."postcss-8.4.18" + sources."postcss-8.4.21" sources."postcss-load-config-4.0.1" sources."postcss-reporter-7.0.5" sources."pretty-hrtime-1.0.3" @@ -132179,19 +129218,19 @@ in sources."require-directory-2.1.1" sources."reusify-1.0.4" sources."run-parallel-1.2.0" - sources."slash-4.0.0" + sources."slash-5.0.0" sources."source-map-js-1.0.2" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."thenby-1.3.4" sources."to-regex-range-5.0.1" sources."ts-node-10.9.1" - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."universalify-2.0.0" sources."v8-compile-cache-lib-3.0.1" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" - sources."yaml-2.1.3" + sources."yaml-2.2.1" sources."yargs-17.6.2" sources."yargs-parser-21.1.1" sources."yn-3.1.1" @@ -132234,7 +129273,7 @@ in sources."minimist-1.2.7" sources."mkdirp-classic-0.5.3" sources."napi-build-utils-1.0.2" - sources."node-abi-3.28.0" + sources."node-abi-3.31.0" sources."once-1.4.0" sources."pump-3.0.0" sources."rc-1.2.8" @@ -132265,10 +129304,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "2.7.1"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz"; - sha512 = "ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz"; + sha512 = "tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw=="; }; buildInputs = globalBuildInputs; meta = { @@ -132298,7 +129337,7 @@ in sources."minimist-1.2.7" sources."nanolru-1.0.0" sources."path-parse-1.0.7" - sources."prettier-2.7.1" + sources."prettier-2.8.3" sources."resolve-1.22.1" sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" @@ -132340,13 +129379,13 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "4.5.0"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-4.5.0.tgz"; - sha512 = "9Aeg4qiKlv9Wsjz4NO8k2CzRzlvS3A4FYVJ5+28sBBZ0eEwbiVOE/Jj7v6rZC1tFW2s4GSICQOAyuOjc6WsNew=="; + url = "https://registry.npmjs.org/prisma/-/prisma-4.9.0.tgz"; + sha512 = "bS96oZ5oDFXYgoF2l7PJ3Mp1wWWfLOo8B/jAfbA2Pn0Wm5Z/owBHzaMQKS3i1CzVBDWWPVnOohmbJmjvkcHS5w=="; }; dependencies = [ - sources."@prisma/engines-4.5.0" + sources."@prisma/engines-4.9.0" ]; buildInputs = globalBuildInputs; meta = { @@ -132361,38 +129400,38 @@ in "@prisma/language-server" = nodeEnv.buildNodePackage { name = "_at_prisma_slash_language-server"; packageName = "@prisma/language-server"; - version = "4.5.0"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-4.5.0.tgz"; - sha512 = "q0I9KwoK+iYknxmZRtRXoOrryR3wnGwR4m7hQNmpMYUXa45Zbs867aJI0ZALIra+GW2QEC8midJSCUF7/yGlUA=="; + url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-4.9.0.tgz"; + sha512 = "Q1KS0GoQG0284hI5CqAdfyq+oLKC7SnB9N6g6ldA7Jqs96rlFVe2Te0UW8bvA9AyG3uljmB0MjlEQDLWPFo8+A=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.1" - sources."@babel/core-7.20.2" - (sources."@babel/generator-7.20.2" // { + sources."@babel/compat-data-7.20.14" + sources."@babel/core-7.20.12" + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/helper-compilation-targets-7.20.0" + sources."@babel/helper-compilation-targets-7.20.7" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.2" + sources."@babel/helper-module-transforms-7.20.11" sources."@babel/helper-simple-access-7.20.2" sources."@babel/helper-split-export-declaration-7.18.6" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.1" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.2" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.20.1" - sources."@babel/types-7.20.2" + sources."@babel/parser-7.20.13" + sources."@babel/template-7.20.7" + sources."@babel/traverse-7.20.13" + sources."@babel/types-7.20.7" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.3" sources."@jridgewell/gen-mapping-0.1.1" @@ -132400,7 +129439,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - sources."@prisma/prisma-fmt-wasm-4.5.0-43.0362da9eebca54d94c8ef5edd3b2e90af99ba452" + sources."@prisma/prisma-fmt-wasm-4.9.0-42.ceb5c99003b99c9ee2c1d2e618e359c14aef2ea5" sources."@types/js-levenshtein-1.1.1" sources."aggregate-error-3.1.0" sources."ansi-regex-5.0.1" @@ -132413,7 +129452,7 @@ in sources."browserslist-4.21.4" sources."caching-transform-4.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."chalk-2.4.2" sources."clean-stack-2.2.0" sources."cliui-6.0.0" @@ -132471,15 +129510,16 @@ in sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."jsesc-2.5.2" - sources."json5-2.2.1" - sources."klona-2.0.5" + sources."json5-2.2.3" + sources."klona-2.0.6" sources."locate-path-5.0.0" sources."lodash.flattendeep-4.4.0" + sources."lru-cache-5.1.1" sources."make-dir-3.1.0" sources."minimatch-3.1.2" sources."ms-2.1.2" sources."node-preload-0.2.1" - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" sources."nyc-15.1.0" sources."once-1.4.0" sources."p-limit-2.3.0" @@ -132519,7 +129559,7 @@ in sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" sources."vscode-languageserver-protocol-3.17.2" - sources."vscode-languageserver-textdocument-1.0.7" + sources."vscode-languageserver-textdocument-1.0.8" sources."vscode-languageserver-types-3.17.2" sources."which-2.0.2" sources."which-module-2.0.0" @@ -132533,6 +129573,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."y18n-4.0.3" + sources."yallist-3.1.1" sources."yargs-15.4.1" sources."yargs-parser-18.1.3" ]; @@ -132755,7 +129796,7 @@ in sources."concat-stream-1.6.2" ]; }) - (sources."mold-source-map-0.4.0" // { + (sources."mold-source-map-0.4.1" // { dependencies = [ sources."through-2.2.7" ]; @@ -132880,7 +129921,7 @@ in sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" sources."vscode-languageserver-protocol-3.17.2" - sources."vscode-languageserver-textdocument-1.0.7" + sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-languageserver-types-3.17.2" sources."vscode-uri-2.1.2" sources."which-2.0.2" @@ -132985,19 +130026,19 @@ in sources."follow-redirects-1.15.2" sources."fs-extra-10.1.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."got-9.6.0" sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-symbols-1.0.3" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."https-proxy-agent-5.0.1" sources."ini-1.3.8" sources."ip-2.0.0" sources."is-docker-2.2.1" sources."is-wsl-2.2.0" - sources."js-base64-3.7.2" + sources."js-base64-3.7.4" sources."json-buffer-3.0.0" sources."jsonfile-6.1.0" sources."keyv-3.1.0" @@ -133009,9 +130050,9 @@ in sources."minimist-1.2.7" sources."moment-2.29.4" sources."ms-2.1.2" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."normalize-url-4.5.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."once-1.4.0" sources."open-8.4.0" sources."p-cancelable-1.1.0" @@ -133057,10 +130098,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.278"; + version = "1.1.291"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.278.tgz"; - sha512 = "at3j7c1fFzB6Jl4+bpr9QPRC/+1gH2gAR/M6GIRS312CHE2JMt8FZRflTbuxEB8IfQAtR+l3YoRMoS1vqF28jw=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.291.tgz"; + sha512 = "wkSlCEhF1OwtJqHuifwxk76UMr1NPqsAbPIlCh7tiZx8VUdZs17NCGNorhyb2M+GFEvp8pod9Xyu1LXN1JL2kQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -133075,223 +130116,163 @@ in quicktype = nodeEnv.buildNodePackage { name = "quicktype"; packageName = "quicktype"; - version = "15.1.0"; + version = "21.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype/-/quicktype-15.1.0.tgz"; - sha512 = "hhOXV+XxOlA8UPmjRLEEjkfOcGvKiIXE5dlxv6byz+zx7BHXsYXKZGjgkDweJYf7ta0cGixKlo1qJdZSQOljiA=="; + url = "https://registry.npmjs.org/quicktype/-/quicktype-21.0.4.tgz"; + sha512 = "zpmXft8rIemnKKA/aNmwUk21QY5GDRSNJegD3ESPBAVt1/V40lsZDF3h1oYqjYCawOjEpPOizYaxMMNhbVEL3w=="; }; dependencies = [ - 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.1" - sources."ansi-styles-3.2.1" - sources."array-back-2.0.0" + sources."@cspotcode/source-map-support-0.8.1" + sources."@glideapps/ts-necessities-2.1.2" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.9" + sources."@mark.probst/typescript-json-schema-0.55.0" + sources."@swc/core-1.3.30" + sources."@swc/core-darwin-arm64-1.3.30" + sources."@swc/core-darwin-x64-1.3.30" + sources."@swc/core-linux-arm-gnueabihf-1.3.30" + sources."@swc/core-linux-arm64-gnu-1.3.30" + sources."@swc/core-linux-arm64-musl-1.3.30" + sources."@swc/core-linux-x64-gnu-1.3.30" + sources."@swc/core-linux-x64-musl-1.3.30" + sources."@swc/core-win32-arm64-msvc-1.3.30" + sources."@swc/core-win32-ia32-msvc-1.3.30" + sources."@swc/core-win32-x64-msvc-1.3.30" + sources."@swc/wasm-1.3.30" + sources."@tsconfig/node10-1.0.9" + sources."@tsconfig/node12-1.0.11" + sources."@tsconfig/node14-1.0.3" + sources."@tsconfig/node16-1.0.3" + sources."@types/json-schema-7.0.11" + sources."@types/node-16.18.11" + sources."@types/urijs-1.19.19" + sources."abort-controller-3.0.0" + sources."acorn-8.8.2" + sources."acorn-walk-8.2.0" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."arg-4.1.3" + sources."array-back-3.1.0" sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" sources."brace-expansion-1.1.11" - sources."brfs-1.6.1" - sources."browser-or-node-1.3.0" - sources."buffer-equal-0.0.1" - sources."buffer-from-1.1.2" - sources."camelcase-5.3.1" - sources."chalk-2.4.2" - sources."cliui-4.1.0" - sources."code-point-at-1.1.0" + sources."browser-or-node-2.1.1" + sources."buffer-6.0.3" + sources."chalk-4.1.2" + sources."cliui-8.0.1" sources."collection-utils-1.0.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."command-line-args-4.0.7" - sources."command-line-usage-5.0.5" - sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."convert-source-map-1.9.0" - sources."core-util-is-1.0.3" - sources."cross-spawn-6.0.5" - sources."decamelize-1.2.0" - sources."deep-extend-0.6.0" - sources."deep-is-0.1.4" - sources."duplexer2-0.1.4" - sources."encoding-0.1.13" - sources."end-of-stream-1.4.4" - sources."escape-string-regexp-1.0.5" - sources."escodegen-1.9.1" - sources."esprima-3.1.3" - sources."estraverse-4.3.0" - sources."esutils-2.0.3" - sources."execa-1.0.0" - sources."falafel-2.2.5" - sources."fast-levenshtein-2.0.6" - (sources."find-replace-1.0.3" // { + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."command-line-args-5.2.1" + (sources."command-line-usage-6.1.3" // { dependencies = [ - sources."array-back-1.0.4" + sources."ansi-styles-3.2.1" + sources."array-back-4.0.2" + 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."typical-5.2.0" ]; }) - sources."find-up-3.0.0" + sources."concat-map-0.0.1" + sources."create-require-1.1.1" + sources."cross-fetch-3.1.5" + sources."deep-extend-0.6.0" + sources."diff-4.0.2" + sources."emoji-regex-8.0.0" + sources."encoding-0.1.13" + sources."escalade-3.1.1" + sources."escape-string-regexp-1.0.5" + sources."event-target-shim-5.0.1" + sources."events-3.3.0" + sources."find-replace-3.0.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."get-caller-file-1.0.3" - sources."get-stream-4.1.0" - sources."glob-7.1.7" + sources."get-caller-file-2.0.5" + sources."glob-7.2.3" sources."graphql-0.11.7" - sources."has-1.0.3" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."iconv-lite-0.6.3" + sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."invert-kv-2.0.0" - sources."is-core-module-2.11.0" - sources."is-fullwidth-code-point-1.0.0" - sources."is-stream-1.1.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-url-1.2.4" - sources."isarray-2.0.5" - sources."isexe-2.0.0" - (sources."isomorphic-fetch-2.2.1" // { - dependencies = [ - sources."node-fetch-1.7.3" - ]; - }) sources."iterall-1.1.3" sources."js-base64-2.6.4" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.1" - sources."lcid-2.0.0" - sources."levn-0.3.0" - sources."locate-path-3.0.0" sources."lodash-4.17.21" - sources."lodash.padend-4.6.1" - sources."magic-string-0.22.5" - sources."map-age-cleaner-0.1.3" - sources."mem-4.3.0" - (sources."merge-source-map-1.0.4" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."mimic-fn-2.1.0" + sources."lodash.camelcase-4.3.0" + sources."make-error-1.3.6" sources."minimatch-3.1.2" - sources."minimist-1.2.7" sources."moment-2.29.4" - sources."nice-try-1.0.5" sources."node-fetch-2.6.7" - sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" - sources."object-inspect-1.4.1" sources."once-1.4.0" - sources."optionator-0.8.3" - sources."os-locale-3.1.0" - sources."p-defer-1.0.0" - sources."p-finally-1.0.0" - sources."p-is-promise-2.1.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" sources."pako-1.0.11" - sources."path-exists-3.0.0" + sources."path-equal-1.2.5" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."path-parse-1.0.7" - sources."pluralize-7.0.0" - sources."prelude-ls-1.1.2" - sources."process-nextick-args-2.0.1" - sources."pump-3.0.0" - sources."quote-stream-1.0.2" - (sources."readable-stream-2.3.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-1.0.3" - ]; - }) - sources."reduce-flatten-1.0.1" + sources."pluralize-8.0.0" + sources."process-0.11.10" + sources."quicktype-core-21.0.4" + sources."quicktype-graphql-input-21.0.4" + sources."quicktype-typescript-input-21.0.4" + sources."readable-stream-4.3.0" + sources."reduce-flatten-2.0.0" sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" - sources."resolve-1.22.1" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.1" + sources."safe-stable-stringify-2.4.2" sources."safer-buffer-2.1.2" - sources."semver-5.7.1" - sources."set-blocking-2.0.0" - sources."shallow-copy-0.0.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.7" - sources."source-map-0.6.1" - (sources."static-eval-2.1.0" // { - dependencies = [ - sources."escodegen-1.14.3" - sources."esprima-4.0.1" - ]; - }) - (sources."static-module-2.2.5" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - ]; - }) 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" // { + sources."stream-json-1.7.5" + (sources."string-to-stream-3.0.1" // { dependencies = [ - sources."is-fullwidth-code-point-2.0.0" + sources."readable-stream-3.6.0" ]; }) - sources."string_decoder-1.1.1" - sources."strip-ansi-4.0.0" - sources."strip-eof-1.0.0" - sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."table-layout-0.4.5" - (sources."test-value-2.1.0" // { + 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."table-layout-1.0.2" // { dependencies = [ - sources."array-back-1.0.4" - ]; - }) - (sources."through2-2.0.5" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."array-back-4.0.2" + sources."typical-5.2.0" ]; }) sources."tiny-inflate-1.0.3" sources."tr46-0.0.3" - sources."type-check-0.3.2" - sources."typedarray-0.0.6" - sources."typescript-3.2.4" - sources."typical-2.6.1" - (sources."unicode-trie-0.3.1" // { + sources."ts-node-10.9.1" + sources."typescript-4.9.4" + sources."typical-4.0.0" + sources."unicode-properties-1.4.1" + (sources."unicode-trie-2.0.0" // { dependencies = [ sources."pako-0.2.9" ]; }) sources."urijs-1.19.11" sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" - sources."vlq-0.2.3" + sources."v8-compile-cache-lib-3.0.1" sources."webidl-conversions-3.0.1" - sources."whatwg-fetch-3.6.2" sources."whatwg-url-5.0.0" - sources."which-1.3.1" - sources."which-module-2.0.0" - sources."word-wrap-1.2.3" sources."wordwrap-1.0.0" - sources."wordwrapjs-3.0.0" - (sources."wrap-ansi-2.1.0" // { + (sources."wordwrapjs-4.0.1" // { dependencies = [ - sources."ansi-regex-2.1.1" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" + sources."typical-5.2.0" ]; }) + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."xtend-4.0.2" - sources."y18n-4.0.3" - sources."yaml-1.10.2" - sources."yargs-12.0.5" - sources."yargs-parser-11.1.1" + sources."y18n-5.0.8" + sources."yaml-2.2.1" + sources."yargs-17.6.2" + sources."yargs-parser-21.1.1" + sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; meta = { - description = "![](https://raw.githubusercontent.com/quicktype/quicktype/master/quicktype-logo.svg?sanitize=true)"; + description = "![](https://raw.githubusercontent.com/quicktype/quicktype/master/media/quicktype-logo.svg?sanitize=true)"; homepage = "https://github.com/quicktype/quicktype#readme"; license = "Apache-2.0"; }; @@ -133319,16 +130300,16 @@ in sources."colors-0.6.2" sources."concat-map-0.0.1" sources."cycle-1.0.3" - sources."deep-equal-2.1.0" + sources."deep-equal-2.2.0" sources."define-properties-1.1.4" - sources."es-get-iterator-1.1.2" + sources."es-get-iterator-1.1.3" sources."escape-string-regexp-1.0.5" sources."eyes-0.1.8" sources."for-each-0.3.3" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."gopd-1.0.1" sources."has-1.0.3" @@ -133340,7 +130321,9 @@ in sources."i-0.3.7" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."internal-slot-1.0.4" sources."is-arguments-1.1.1" + sources."is-array-buffer-3.0.1" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" @@ -133349,6 +130332,7 @@ in sources."is-number-object-1.0.7" sources."is-regex-1.1.4" sources."is-set-2.0.2" + sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-typed-array-1.1.10" @@ -133361,7 +130345,7 @@ in sources."mkdirp-0.5.6" sources."mute-stream-0.0.8" sources."ncp-0.4.2" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.4" @@ -133376,6 +130360,7 @@ in sources."semver-5.7.1" sources."side-channel-1.0.4" sources."stack-trace-0.0.10" + sources."stop-iteration-iterator-1.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."utile-0.2.1" @@ -133409,28 +130394,28 @@ in }; dependencies = [ sources."@ampproject/remapping-2.2.0" - sources."@babel/cli-7.19.3" + sources."@babel/cli-7.20.7" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.1" - (sources."@babel/core-7.20.2" // { + sources."@babel/compat-data-7.20.14" + (sources."@babel/core-7.20.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.2" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; }) sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" - (sources."@babel/helper-compilation-targets-7.20.0" // { + (sources."@babel/helper-compilation-targets-7.20.7" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.20.2" - sources."@babel/helper-create-regexp-features-plugin-7.19.0" + sources."@babel/helper-create-class-features-plugin-7.20.12" + sources."@babel/helper-create-regexp-features-plugin-7.20.5" (sources."@babel/helper-define-polyfill-provider-0.3.3" // { dependencies = [ sources."semver-6.3.0" @@ -133440,40 +130425,40 @@ in sources."@babel/helper-explode-assignable-expression-7.18.6" sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.18.9" + sources."@babel/helper-member-expression-to-functions-7.20.7" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.2" + sources."@babel/helper-module-transforms-7.20.11" sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.20.2" sources."@babel/helper-remap-async-to-generator-7.18.9" - sources."@babel/helper-replace-supers-7.19.1" + sources."@babel/helper-replace-supers-7.20.7" sources."@babel/helper-simple-access-7.20.2" sources."@babel/helper-skip-transparent-expression-wrappers-7.20.0" sources."@babel/helper-split-export-declaration-7.18.6" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helper-wrap-function-7.19.0" - sources."@babel/helpers-7.20.1" + sources."@babel/helper-wrap-function-7.20.5" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.2" + sources."@babel/parser-7.20.13" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" - sources."@babel/plugin-proposal-async-generator-functions-7.20.1" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" + sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" - sources."@babel/plugin-proposal-class-static-block-7.18.6" + sources."@babel/plugin-proposal-class-static-block-7.20.7" sources."@babel/plugin-proposal-dynamic-import-7.18.6" sources."@babel/plugin-proposal-export-default-from-7.18.10" sources."@babel/plugin-proposal-export-namespace-from-7.18.9" sources."@babel/plugin-proposal-json-strings-7.18.6" - sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" + sources."@babel/plugin-proposal-logical-assignment-operators-7.20.7" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.20.2" + sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" - sources."@babel/plugin-proposal-optional-chaining-7.18.9" + sources."@babel/plugin-proposal-optional-chaining-7.20.7" sources."@babel/plugin-proposal-private-methods-7.18.6" - sources."@babel/plugin-proposal-private-property-in-object-7.18.6" + sources."@babel/plugin-proposal-private-property-in-object-7.20.5" sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" @@ -133492,13 +130477,13 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.18.6" - sources."@babel/plugin-transform-async-to-generator-7.18.6" + sources."@babel/plugin-transform-arrow-functions-7.20.7" + sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.2" - sources."@babel/plugin-transform-classes-7.20.2" - sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.20.2" + sources."@babel/plugin-transform-block-scoping-7.20.14" + sources."@babel/plugin-transform-classes-7.20.7" + sources."@babel/plugin-transform-computed-properties-7.20.7" + sources."@babel/plugin-transform-destructuring-7.20.7" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -133506,20 +130491,20 @@ in sources."@babel/plugin-transform-function-name-7.18.9" sources."@babel/plugin-transform-literals-7.18.9" sources."@babel/plugin-transform-member-expression-literals-7.18.6" - sources."@babel/plugin-transform-modules-amd-7.19.6" - sources."@babel/plugin-transform-modules-commonjs-7.19.6" - sources."@babel/plugin-transform-modules-systemjs-7.19.6" + sources."@babel/plugin-transform-modules-amd-7.20.11" + sources."@babel/plugin-transform-modules-commonjs-7.20.11" + sources."@babel/plugin-transform-modules-systemjs-7.20.11" sources."@babel/plugin-transform-modules-umd-7.18.6" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.19.1" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.20.5" sources."@babel/plugin-transform-new-target-7.18.6" sources."@babel/plugin-transform-object-super-7.18.6" - sources."@babel/plugin-transform-parameters-7.20.1" + sources."@babel/plugin-transform-parameters-7.20.7" sources."@babel/plugin-transform-property-literals-7.18.6" sources."@babel/plugin-transform-react-display-name-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.19.0" + sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/plugin-transform-react-jsx-development-7.18.6" sources."@babel/plugin-transform-react-pure-annotations-7.18.6" - sources."@babel/plugin-transform-regenerator-7.18.6" + sources."@babel/plugin-transform-regenerator-7.20.5" sources."@babel/plugin-transform-reserved-words-7.18.6" (sources."@babel/plugin-transform-runtime-7.19.6" // { dependencies = [ @@ -133527,7 +130512,7 @@ in ]; }) sources."@babel/plugin-transform-shorthand-properties-7.18.6" - sources."@babel/plugin-transform-spread-7.19.0" + sources."@babel/plugin-transform-spread-7.20.7" sources."@babel/plugin-transform-sticky-regex-7.18.6" sources."@babel/plugin-transform-template-literals-7.18.9" sources."@babel/plugin-transform-typeof-symbol-7.18.9" @@ -133542,10 +130527,10 @@ in sources."@babel/preset-react-7.18.6" sources."@babel/preset-stage-0-7.8.3" sources."@babel/register-7.18.9" - sources."@babel/runtime-7.20.1" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.20.1" - sources."@babel/types-7.20.2" + sources."@babel/runtime-7.20.13" + sources."@babel/template-7.20.7" + sources."@babel/traverse-7.20.13" + sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -133556,11 +130541,11 @@ in sources."@types/glob-7.2.0" sources."@types/json-schema-7.0.11" sources."@types/minimatch-5.1.2" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/parse-json-4.0.0" sources."@types/prop-types-15.7.5" sources."@types/q-1.5.5" - sources."@types/react-17.0.52" + sources."@types/react-17.0.53" sources."@types/scheduler-0.16.2" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -133597,7 +130582,7 @@ in sources."ansi-html-community-0.0.8" sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."aproba-1.2.0" sources."arch-2.2.0" (sources."archive-type-4.0.0" // { @@ -133629,7 +130614,7 @@ in }) sources."assign-symbols-1.0.0" sources."async-2.6.4" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."async-limiter-1.0.1" sources."atob-2.1.2" (sources."autoprefixer-9.8.8" // { @@ -133637,6 +130622,7 @@ in sources."picocolors-0.2.1" ]; }) + sources."available-typed-arrays-1.0.5" sources."axios-0.21.4" sources."babel-core-7.0.0-bridge.0" (sources."babel-loader-8.3.0" // { @@ -133728,12 +130714,7 @@ in sources."bufferutil-4.0.7" sources."builtin-status-codes-3.0.0" sources."bytes-3.0.0" - (sources."cacache-12.0.4" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."yallist-3.1.1" - ]; - }) + sources."cacache-12.0.4" sources."cache-base-1.0.1" (sources."cacheable-request-2.1.4" // { dependencies = [ @@ -133751,7 +130732,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -133828,7 +130809,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - sources."core-js-compat-3.26.0" + sources."core-js-compat-3.27.2" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."cosmiconfig-6.0.0" @@ -133840,14 +130821,19 @@ in sources."create-hash-1.2.0" sources."create-hmac-1.1.7" sources."create-react-context-0.3.0" - sources."cross-spawn-5.1.0" + (sources."cross-spawn-5.1.0" // { + dependencies = [ + sources."lru-cache-4.1.5" + sources."yallist-2.1.2" + ]; + }) sources."crypto-browserify-3.12.0" sources."css-color-names-0.0.4" 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."json5-1.0.2" + sources."loader-utils-1.4.2" sources."postcss-value-parser-3.3.1" sources."schema-utils-1.0.0" ]; @@ -133880,7 +130866,7 @@ in sources."cyclist-1.0.1" sources."debug-4.3.4" sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" (sources."decompress-4.2.1" // { dependencies = [ (sources."make-dir-1.3.0" // { @@ -133977,7 +130963,7 @@ in sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.6.0" // { + (sources."engine.io-3.6.1" // { dependencies = [ sources."debug-4.1.1" ]; @@ -133998,8 +130984,9 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.20.4" + sources."es-abstract-1.21.1" sources."es-array-method-boxes-properly-1.0.0" + sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -134084,8 +131071,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."json5-1.0.2" + sources."loader-utils-1.4.2" sources."schema-utils-1.0.0" ]; }) @@ -134105,6 +131092,7 @@ in sources."find-up-3.0.0" sources."flush-write-stream-1.1.1" sources."follow-redirects-1.15.2" + sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -134121,7 +131109,7 @@ in sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-proxy-2.1.0" sources."get-stream-3.0.0" sources."get-symbol-description-1.0.0" @@ -134132,11 +131120,13 @@ in sources."glob-parent-5.1.2" sources."global-4.4.0" sources."globals-11.12.0" + sources."globalthis-1.0.3" (sources."globby-6.1.0" // { dependencies = [ sources."pify-2.3.0" ]; }) + sources."gopd-1.0.1" (sources."got-8.3.2" // { dependencies = [ sources."pify-3.0.0" @@ -134157,6 +131147,7 @@ in sources."has-cors-1.1.0" sources."has-flag-3.0.0" sources."has-property-descriptors-1.0.0" + sources."has-proto-1.0.1" sources."has-symbol-support-x-1.4.2" sources."has-symbols-1.0.3" sources."has-to-string-tag-x-1.4.1" @@ -134252,7 +131243,7 @@ in ]; }) sources."internal-ip-4.3.0" - sources."internal-slot-1.0.3" + sources."internal-slot-1.0.4" sources."intersection-observer-0.7.0" sources."into-stream-3.1.0" sources."invariant-2.2.4" @@ -134262,6 +131253,7 @@ in sources."is-absolute-url-2.1.0" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.1" + sources."is-array-buffer-3.0.1" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" @@ -134298,6 +131290,7 @@ in sources."is-stream-1.1.0" sources."is-string-1.0.7" sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.10" sources."is-weakref-1.0.2" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" @@ -134312,7 +131305,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."json5-2.2.1" + sources."json5-2.2.3" sources."jsonfile-4.0.0" sources."keyv-3.0.0" sources."killable-1.0.1" @@ -134320,17 +131313,17 @@ 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-2.0.3" + sources."loader-utils-2.0.4" sources."locate-path-3.0.0" sources."lodash-4.17.21" sources."lodash.debounce-4.0.8" sources."lodash.memoize-4.1.2" sources."lodash.uniq-4.5.0" - sources."loglevel-1.8.0" + sources."loglevel-1.8.1" sources."loose-envify-1.4.0" sources."lower-case-1.1.4" sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" + sources."lru-cache-5.1.1" sources."make-dir-2.1.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -134401,7 +131394,7 @@ in sources."nice-try-1.0.5" sources."no-case-2.3.2" sources."node-forge-0.10.0" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."browserify-zlib-0.2.0" @@ -134410,7 +131403,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" (sources."normalize-url-2.0.1" // { @@ -134440,7 +131433,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -134535,8 +131528,8 @@ in }) (sources."postcss-loader-3.0.0" // { dependencies = [ - sources."json5-1.0.1" - sources."loader-utils-1.4.0" + sources."json5-1.0.2" + sources."loader-utils-1.4.2" sources."schema-utils-1.0.0" ]; }) @@ -134631,7 +131624,7 @@ in sources."postcss-value-parser-3.3.1" ]; }) - sources."postcss-selector-parser-6.0.10" + sources."postcss-selector-parser-6.0.11" (sources."postcss-svgo-4.0.3" // { dependencies = [ sources."postcss-value-parser-3.3.1" @@ -134657,7 +131650,7 @@ in }) sources."pump-2.0.1" sources."pumpify-1.5.1" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."q-1.5.1" sources."qs-6.11.0" sources."query-string-5.1.1" @@ -134675,8 +131668,8 @@ in }) (sources."raw-loader-3.1.0" // { dependencies = [ - sources."json5-1.0.1" - sources."loader-utils-1.4.0" + sources."json5-1.0.2" + sources."loader-utils-1.4.2" ]; }) sources."rc-1.2.8" @@ -134684,10 +131677,8 @@ in sources."react-dom-16.14.0" sources."react-fast-compare-3.2.0" sources."react-helmet-6.1.0" - (sources."react-hot-loader-4.13.0" // { + (sources."react-hot-loader-4.13.1" // { dependencies = [ - sources."json5-1.0.1" - sources."loader-utils-1.4.0" sources."source-map-0.7.4" ]; }) @@ -134703,11 +131694,11 @@ in sources."readdirp-3.6.0" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-10.1.0" - sources."regenerator-runtime-0.13.10" - sources."regenerator-transform-0.15.0" + sources."regenerator-runtime-0.13.11" + sources."regenerator-transform-0.15.1" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.4.3" - sources."regexpu-core-5.2.1" + sources."regexpu-core-5.2.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."regjsgen-0.7.1" @@ -134874,10 +131865,10 @@ in sources."debug-3.1.0" sources."isarray-2.0.1" sources."ms-2.0.0" - sources."socket.io-parser-3.3.2" + sources."socket.io-parser-3.3.3" ]; }) - (sources."socket.io-parser-3.4.1" // { + (sources."socket.io-parser-3.4.2" // { dependencies = [ sources."debug-4.1.1" sources."isarray-2.0.1" @@ -134934,8 +131925,8 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" + sources."string.prototype.trimend-1.0.6" + sources."string.prototype.trimstart-1.0.6" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -134952,8 +131943,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."json5-1.0.2" + sources."loader-utils-1.4.2" sources."schema-utils-1.0.0" ]; }) @@ -135014,6 +132005,7 @@ in sources."tunnel-agent-0.6.0" sources."type-fest-0.21.3" sources."type-is-1.6.18" + sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" (sources."uglify-js-3.4.10" // { dependencies = [ @@ -135024,7 +132016,7 @@ in sources."unbzip2-stream-1.4.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" + sources."unicode-match-property-value-ecmascript-2.1.0" sources."unicode-property-aliases-ecmascript-2.1.0" sources."union-value-1.0.1" sources."uniq-1.0.1" @@ -135057,8 +132049,8 @@ in }) (sources."url-loader-2.3.0" // { dependencies = [ - sources."json5-1.0.1" - sources."loader-utils-1.4.0" + sources."json5-1.0.2" + sources."loader-utils-1.4.2" ]; }) sources."url-parse-1.5.10" @@ -135103,8 +132095,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."json5-1.0.2" + sources."loader-utils-1.4.2" sources."schema-utils-1.0.0" ]; }) @@ -135166,6 +132158,7 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-module-2.0.0" + sources."which-typed-array-1.1.9" sources."widest-line-2.0.1" sources."worker-farm-1.7.0" (sources."wrap-ansi-5.1.0" // { @@ -135178,7 +132171,7 @@ in sources."xmlhttprequest-ssl-1.6.3" sources."xtend-4.0.2" sources."y18n-4.0.3" - sources."yallist-2.1.2" + sources."yallist-3.1.1" sources."yaml-1.10.2" (sources."yargs-13.3.2" // { dependencies = [ @@ -135256,10 +132249,10 @@ in readability-cli = nodeEnv.buildNodePackage { name = "readability-cli"; packageName = "readability-cli"; - version = "2.4.2"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.4.2.tgz"; - sha512 = "dQ0EuULmLd65pa9H27xreYuQiNFerDQxI3weqPRHcuiFQnK0b4YNhcZHZw7w3a0YYpXVlcP6bKK/BaiUUuqBoQ=="; + url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.4.4.tgz"; + sha512 = "KNVRUT4JKrnNCkD4IuMm9zU5bkFc699lue7xT66lIhjXTARwKlBRwiSZYgx7mCKC/Zj40dw89UULFAyihnXLXQ=="; }; dependencies = [ sources."@mapbox/node-pre-gyp-1.0.10" @@ -135267,7 +132260,7 @@ in sources."@tootallnate/once-2.0.0" sources."abab-2.0.6" sources."abbrev-1.1.1" - sources."acorn-8.8.1" + sources."acorn-8.8.2" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -135284,7 +132277,7 @@ in sources."brace-expansion-1.1.11" sources."browser-process-hrtime-1.0.0" sources."bufferutil-4.0.7" - sources."canvas-2.10.2" + sources."canvas-2.11.0" sources."chownr-2.0.0" sources."cliui-8.0.1" sources."color-convert-2.0.1" @@ -135305,14 +132298,14 @@ in ]; }) sources."debug-4.3.4" - sources."decimal.js-10.4.2" + sources."decimal.js-10.4.3" sources."decompress-response-4.2.1" sources."deep-is-0.1.4" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."detect-libc-2.0.1" sources."domexception-4.0.0" - sources."dompurify-2.4.0" + sources."dompurify-2.4.3" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."escalade-3.1.1" @@ -135322,7 +132315,11 @@ in sources."esutils-2.0.3" sources."fast-levenshtein-2.0.6" sources."form-data-4.0.0" - sources."fs-minipass-2.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."fs.realpath-1.0.0" sources."gauge-3.0.2" sources."get-caller-file-2.0.5" @@ -135348,19 +132345,23 @@ in sources."mime-types-2.1.35" sources."mimic-response-2.1.0" sources."minimatch-3.1.2" - sources."minipass-3.3.5" - sources."minizlib-2.1.2" + sources."minipass-4.0.0" + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."nan-2.17.0" - (sources."node-fetch-2.6.7" // { + (sources."node-fetch-2.6.8" // { dependencies = [ sources."tr46-0.0.3" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" ]; }) - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."nopt-5.0.0" sources."npmlog-5.0.1" sources."nwsapi-2.2.2" @@ -135371,7 +132372,7 @@ in sources."path-is-absolute-1.0.1" sources."prelude-ls-1.1.2" sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."querystringify-2.2.0" sources."readable-stream-3.6.0" sources."require-directory-2.1.1" @@ -135390,13 +132391,13 @@ in sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" sources."symbol-tree-3.2.4" - sources."tar-6.1.12" + sources."tar-6.1.13" sources."tough-cookie-4.1.2" sources."tr46-3.0.0" sources."type-check-0.3.2" sources."universalify-0.2.0" sources."url-parse-1.5.10" - sources."utf-8-validate-5.0.10" + sources."utf-8-validate-6.0.2" sources."util-deprecate-1.0.2" sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-3.0.0" @@ -135408,7 +132409,7 @@ in sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-8.11.0" + sources."ws-8.12.0" sources."xml-name-validator-4.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" @@ -135436,7 +132437,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.20.2" + sources."@babel/generator-7.20.14" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.19.0" @@ -135446,11 +132447,11 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.2" - sources."@babel/runtime-7.20.1" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.20.1" - sources."@babel/types-7.20.2" + sources."@babel/parser-7.20.13" + sources."@babel/runtime-7.20.13" + sources."@babel/template-7.20.7" + sources."@babel/traverse-7.20.13" + sources."@babel/types-7.20.7" sources."@emotion/is-prop-valid-1.2.0" sources."@emotion/memoize-0.8.0" sources."@emotion/stylis-0.8.5" @@ -135463,14 +132464,14 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" sources."@redocly/ajv-8.11.0" - sources."@redocly/openapi-core-1.0.0-beta.112" + sources."@redocly/openapi-core-1.0.0-beta.122" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/eslint-8.4.10" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-14.18.33" + sources."@types/node-14.18.36" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -135488,7 +132489,7 @@ in sources."@webassemblyjs/wast-printer-1.11.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" (sources."ajv-6.12.6" // { dependencies = [ @@ -135499,7 +132500,7 @@ in sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."argparse-2.0.1" (sources."asn1.js-5.4.1" // { dependencies = [ @@ -135558,7 +132559,7 @@ in sources."call-me-maybe-1.0.2" sources."camelcase-6.3.0" sources."camelize-1.0.1" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" (sources."chalk-2.4.2" // { dependencies = [ sources."has-flag-3.0.0" @@ -135581,7 +132582,7 @@ in sources."configstore-5.0.1" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.26.0" + sources."core-js-3.27.2" sources."core-util-is-1.0.3" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -135593,7 +132594,7 @@ in sources."crypto-browserify-3.12.0" sources."crypto-random-string-2.0.0" sources."css-color-keywords-1.0.0" - sources."css-to-react-native-3.0.0" + sources."css-to-react-native-3.1.0" sources."debug-4.3.4" sources."decko-1.2.0" sources."decompress-response-3.3.0" @@ -135606,7 +132607,7 @@ in ]; }) sources."domain-browser-1.2.0" - sources."dompurify-2.4.0" + sources."dompurify-2.4.3" sources."dot-prop-5.3.0" sources."duplexer3-0.1.5" sources."electron-to-chromium-1.4.284" @@ -135619,7 +132620,7 @@ in sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" - sources."enhanced-resolve-5.10.0" + sources."enhanced-resolve-5.12.0" sources."es-module-lexer-0.9.3" sources."es6-promise-3.3.1" sources."escalade-3.1.1" @@ -135645,7 +132646,7 @@ in sources."get-stream-4.1.0" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" - sources."global-dirs-3.0.0" + sources."global-dirs-3.0.1" sources."globals-11.12.0" sources."got-9.6.0" sources."graceful-fs-4.2.10" @@ -135665,7 +132666,7 @@ in }) sources."hmac-drbg-1.0.1" sources."hoist-non-react-statics-3.3.2" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http2-client-1.3.5" sources."https-browserify-1.0.0" sources."iconv-lite-0.6.3" @@ -135711,7 +132712,7 @@ in ]; }) sources."mark.js-8.11.1" - sources."marked-4.2.2" + sources."marked-4.2.12" sources."md5.js-1.3.5" sources."merge-stream-2.0.0" (sources."miller-rabin-4.0.1" // { @@ -135724,19 +132725,19 @@ in sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" sources."minimist-1.2.7" sources."mkdirp-1.0.4" - sources."mobx-6.6.2" - sources."mobx-react-7.5.3" + sources."mobx-6.7.0" + sources."mobx-react-7.6.0" sources."mobx-react-lite-3.4.0" sources."ms-2.1.2" sources."neo-async-2.6.2" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."node-fetch-h2-2.3.0" sources."node-libs-browser-2.2.1" sources."node-readfiles-0.2.0" - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."oas-kit-common-1.0.8" @@ -135746,7 +132747,7 @@ in sources."oas-validator-5.0.8" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."openapi-sampler-1.3.0" + sources."openapi-sampler-1.3.1" sources."os-browserify-0.3.0" sources."p-cancelable-1.1.0" (sources."package-json-6.5.0" // { @@ -135805,7 +132806,7 @@ in ]; }) sources."reftools-1.1.9" - sources."regenerator-runtime-0.13.10" + sources."regenerator-runtime-0.13.11" sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" sources."require-directory-2.1.1" @@ -135822,7 +132823,7 @@ in sources."semver-6.3.0" ]; }) - sources."serialize-javascript-6.0.0" + sources."serialize-javascript-6.0.1" sources."setimmediate-1.0.5" sources."sha.js-2.4.11" sources."shallowequal-1.1.0" @@ -135853,7 +132854,7 @@ in sources."supports-color-8.1.1" sources."swagger2openapi-7.0.8" sources."tapable-2.2.1" - sources."terser-5.15.1" + sources."terser-5.16.1" sources."terser-webpack-plugin-5.3.6" sources."timers-browserify-2.0.12" sources."to-arraybuffer-1.0.1" @@ -135878,7 +132879,7 @@ in }) (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.1.1" + sources."punycode-2.3.0" ]; }) (sources."url-0.11.0" // { @@ -135897,7 +132898,7 @@ in sources."vm-browserify-1.1.2" sources."watchpack-2.4.0" sources."webidl-conversions-3.0.1" - sources."webpack-5.74.0" + sources."webpack-5.75.0" sources."webpack-sources-3.2.3" sources."whatwg-url-5.0.0" sources."widest-line-3.1.0" @@ -135940,7 +132941,7 @@ in }; dependencies = [ sources."@types/prop-types-15.7.5" - sources."@types/react-18.0.25" + sources."@types/react-18.0.27" sources."@types/scheduler-0.16.2" sources."@types/yoga-layout-1.9.2" sources."ansi-escapes-4.3.2" @@ -136096,10 +133097,10 @@ in reveal-md = nodeEnv.buildNodePackage { name = "reveal-md"; packageName = "reveal-md"; - version = "5.3.4"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/reveal-md/-/reveal-md-5.3.4.tgz"; - sha512 = "b0/HijfOPoypeHLD9hWKFTJREMDOUDvoPGftCrP0BU54R2vHL8sc+P0BaB/xRGOvFbyP/PyGCkwleiY0U8PMYg=="; + url = "https://registry.npmjs.org/reveal-md/-/reveal-md-5.4.0.tgz"; + sha512 = "dbVA4qylRP14g0s2QSiPlxUgDFsvpQhUsT0QiNKEYDWvkgS6kVtA/XPbKSp55NuUXJ66qnrsNKKa4QRWaLxLaw=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -136109,13 +133110,13 @@ in sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."async-limiter-1.0.1" sources."balanced-match-1.0.2" sources."binary-extensions-2.2.0" - (sources."body-parser-1.20.0" // { + (sources."body-parser-1.20.1" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -136172,7 +133173,7 @@ in sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -136198,19 +133199,19 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."glob-8.0.3" sources."glob-parent-5.1.2" - sources."global-dirs-3.0.0" + sources."global-dirs-3.0.1" sources."got-9.6.0" sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.3" sources."has-yarn-2.1.0" - sources."highlight.js-11.5.1" - sources."http-cache-semantics-4.1.0" + sources."highlight.js-11.7.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" (sources."https-proxy-agent-2.2.4" // { dependencies = [ @@ -136261,16 +133262,16 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-response-1.0.1" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" sources."minimist-1.2.7" sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."mustache-4.2.0" sources."negotiator-0.6.3" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."on-finished-2.4.1" sources."once-1.4.0" sources."open-8.4.0" @@ -136299,7 +133300,7 @@ in sources."ws-6.2.2" ]; }) - sources."qs-6.10.3" + sources."qs-6.11.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" (sources."rc-1.2.8" // { @@ -136316,7 +133317,7 @@ in sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" sources."responselike-1.0.2" - sources."reveal.js-4.3.1" + sources."reveal.js-4.4.0" (sources."rimraf-2.7.1" // { dependencies = [ sources."brace-expansion-1.1.11" @@ -136388,7 +133389,7 @@ in sources."xdg-basedir-4.0.0" sources."yallist-4.0.0" sources."yaml-front-matter-4.1.1" - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.1" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -136404,24 +133405,11 @@ in rimraf = nodeEnv.buildNodePackage { name = "rimraf"; packageName = "rimraf"; - version = "3.0.2"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; - sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; + url = "https://registry.npmjs.org/rimraf/-/rimraf-4.1.2.tgz"; + sha512 = "BlIbgFryTbw3Dz6hyoWFhKk+unCcHMSkZGrTFVAx2WmttdBSonsdtRlwiuTbDqTKr+UlXIUqJVS4QT5tUzGENQ=="; }; - dependencies = [ - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."concat-map-0.0.1" - sources."fs.realpath-1.0.0" - sources."glob-7.2.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."minimatch-3.1.2" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."wrappy-1.0.2" - ]; buildInputs = globalBuildInputs; meta = { description = "A deep deletion module for node (like `rm -rf`)"; @@ -136435,10 +133423,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "3.2.5"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-3.2.5.tgz"; - sha512 = "/Ha7HhVVofduy+RKWOQJrxe4Qb3xyZo+chcpYiD8SoQa4AG7llhupUtyfKSSrdBM2mWJjhM8wZwmbY23NmlIYw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-3.12.0.tgz"; + sha512 = "4MZ8kA2HNYahIjz63rzrMMRvDqQDeS9LoriJvMuV0V6zIGysP36e9t4yObUfwdT9h/szXoHQideICftcdZklWg=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -136459,9 +133447,9 @@ in version = "0.3.1059"; src = ../../applications/editors/vscode/extensions/rust-analyzer/build-deps; dependencies = [ - sources."@eslint/eslintrc-1.3.3" - sources."@hpcc-js/wasm-1.16.1" - sources."@humanwhocodes/config-array-0.11.7" + sources."@eslint/eslintrc-1.4.1" + sources."@hpcc-js/wasm-1.16.6" + sources."@humanwhocodes/config-array-0.11.8" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" sources."@nodelib/fs.scandir-2.1.5" @@ -136472,16 +133460,16 @@ in sources."@types/node-14.17.34" sources."@types/semver-7.3.13" sources."@types/vscode-1.66.0" - sources."@typescript-eslint/eslint-plugin-5.42.0" - sources."@typescript-eslint/parser-5.42.0" - sources."@typescript-eslint/scope-manager-5.42.0" - sources."@typescript-eslint/type-utils-5.42.0" - sources."@typescript-eslint/types-5.42.0" - sources."@typescript-eslint/typescript-estree-5.42.0" - sources."@typescript-eslint/utils-5.42.0" - sources."@typescript-eslint/visitor-keys-5.42.0" - sources."@vscode/test-electron-2.2.0" - sources."acorn-8.8.1" + sources."@typescript-eslint/eslint-plugin-5.49.0" + sources."@typescript-eslint/parser-5.49.0" + sources."@typescript-eslint/scope-manager-5.49.0" + sources."@typescript-eslint/type-utils-5.49.0" + sources."@typescript-eslint/types-5.49.0" + sources."@typescript-eslint/typescript-estree-5.49.0" + sources."@typescript-eslint/utils-5.49.0" + sources."@typescript-eslint/visitor-keys-5.49.0" + sources."@vscode/test-electron-2.2.2" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."agent-base-6.0.2" sources."ajv-6.12.6" @@ -136525,13 +133513,13 @@ in sources."cross-spawn-7.0.3" sources."css-select-5.1.0" sources."css-what-6.1.0" - sources."d3-7.6.1" - sources."d3-array-3.2.0" + sources."d3-7.8.2" + sources."d3-array-3.2.2" sources."d3-axis-3.0.0" sources."d3-brush-3.0.0" sources."d3-chord-3.0.1" sources."d3-color-3.1.0" - sources."d3-contour-4.0.0" + sources."d3-contour-4.0.2" sources."d3-delaunay-6.0.2" sources."d3-dispatch-3.0.1" sources."d3-drag-3.0.0" @@ -136540,8 +133528,8 @@ in sources."d3-fetch-3.0.1" sources."d3-force-3.0.0" sources."d3-format-3.1.0" - sources."d3-geo-3.0.1" - (sources."d3-graphviz-4.4.0" // { + sources."d3-geo-3.1.0" + (sources."d3-graphviz-4.5.0" // { dependencies = [ sources."d3-color-2.0.0" sources."d3-dispatch-2.0.0" @@ -136558,15 +133546,15 @@ in }) sources."d3-hierarchy-3.1.2" sources."d3-interpolate-3.0.1" - sources."d3-path-3.0.1" + sources."d3-path-3.1.0" sources."d3-polygon-3.0.1" sources."d3-quadtree-3.0.1" sources."d3-random-3.0.1" sources."d3-scale-4.0.2" sources."d3-scale-chromatic-3.0.0" sources."d3-selection-3.0.0" - sources."d3-shape-3.1.0" - sources."d3-time-3.0.0" + sources."d3-shape-3.2.0" + sources."d3-time-3.1.0" sources."d3-time-format-4.1.0" sources."d3-timer-3.0.1" sources."d3-transition-3.0.1" @@ -136597,7 +133585,7 @@ in sources."entities-4.4.0" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.27.0" // { + (sources."eslint-8.32.0" // { dependencies = [ sources."eslint-scope-7.1.1" sources."estraverse-5.3.0" @@ -136629,7 +133617,7 @@ in sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" @@ -136645,11 +133633,11 @@ in }) sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."github-from-package-0.0.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globals-13.17.0" + sources."globals-13.20.0" sources."globby-11.1.0" sources."graceful-fs-4.2.10" sources."grapheme-splitter-1.0.4" @@ -136662,7 +133650,7 @@ in sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -136676,7 +133664,7 @@ in sources."is-path-inside-3.0.3" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."js-sdsl-4.1.5" + sources."js-sdsl-4.3.0" sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -136707,10 +133695,10 @@ in sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" - sources."node-abi-3.28.0" + sources."node-abi-3.31.0" sources."node-addon-api-4.3.0" sources."nth-check-2.1.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."once-1.4.0" sources."optionator-0.9.1" sources."p-limit-3.1.0" @@ -136721,7 +133709,7 @@ in sources."semver-5.7.1" ]; }) - sources."parse5-7.1.1" + sources."parse5-7.1.2" sources."parse5-htmlparser2-tree-adapter-7.0.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -136734,7 +133722,7 @@ in sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."queue-microtask-1.2.3" (sources."rc-1.2.8" // { @@ -136779,7 +133767,7 @@ in sources."tmp-0.2.1" sources."to-regex-range-5.0.1" sources."traverse-0.3.9" - sources."tslib-2.4.1" + sources."tslib-2.5.0" (sources."tsutils-3.21.0" // { dependencies = [ sources."tslib-1.14.1" @@ -136790,7 +133778,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."typed-rest-client-1.8.9" - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.13.6" @@ -136798,7 +133786,7 @@ in sources."uri-js-4.4.1" sources."url-join-4.0.1" sources."util-deprecate-1.0.2" - (sources."vsce-2.13.0" // { + (sources."vsce-2.15.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -136848,7 +133836,7 @@ in sources."escalade-3.1.1" sources."nanoid-3.3.4" sources."picocolors-1.0.0" - sources."postcss-8.4.18" + sources."postcss-8.4.21" sources."source-map-js-1.0.2" sources."strip-json-comments-3.1.1" ]; @@ -136911,7 +133899,7 @@ in sources."formidable-1.0.11" sources."fresh-0.2.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."has-1.0.3" sources."has-symbols-1.0.3" sources."http-auth-2.0.7" @@ -136928,7 +133916,7 @@ in sources."node-uuid-1.4.1" sources."node-wsfederation-0.1.1" sources."oauth-https://github.com/ciaranj/node-oauth/tarball/master" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" (sources."openid-2.0.10" // { dependencies = [ sources."qs-6.11.0" @@ -136961,20 +133949,20 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.56.0"; + version = "1.57.1"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.56.0.tgz"; - sha512 = "WFJ9XrpkcnqZcYuLRJh5qiV6ibQOR4AezleeEjTjMsCocYW59dEG19U3fwTTXxzi2Ed3yjPBp727hbbj53pHFw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz"; + sha512 = "O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw=="; }; dependencies = [ - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" 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."immutable-4.1.0" + sources."immutable-4.2.2" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -137020,13 +134008,13 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "14.0.1"; + version = "14.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-14.0.1.tgz"; - sha512 = "tNGwxl27FwA8TbmMQqN0jTaSx8/trL532qZsJHX1VdiEIjjtMJHCs7AFS6OvtC7cTHOvmjXqt5yczejU6CV2Xg=="; + url = "https://registry.npmjs.org/serve/-/serve-14.2.0.tgz"; + sha512 = "+HOw/XK1bW8tw5iBilBz/mJLWRzM8XM6MPxL4J/dKzdxq1vfdEWSwhaR7/yS8EJp5wzvP92p1qirysJvnEtjXg=="; }; dependencies = [ - sources."@zeit/schemas-2.21.0" + sources."@zeit/schemas-2.29.0" sources."accepts-1.3.8" sources."ajv-8.11.0" (sources."ansi-align-3.0.1" // { @@ -137042,7 +134030,7 @@ in sources."boxen-7.0.0" sources."brace-expansion-1.1.11" sources."bytes-3.0.0" - sources."camelcase-7.0.0" + sources."camelcase-7.0.1" sources."chalk-5.0.1" (sources."chalk-template-0.4.0" // { dependencies = [ @@ -137085,7 +134073,7 @@ in 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.7" sources."ms-2.0.0" sources."negotiator-0.6.3" @@ -137095,14 +134083,14 @@ in sources."path-is-inside-1.0.2" sources."path-key-3.1.1" sources."path-to-regexp-2.2.1" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."range-parser-1.2.0" sources."rc-1.2.8" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."require-from-string-2.0.2" sources."safe-buffer-5.1.2" - (sources."serve-handler-6.1.3" // { + (sources."serve-handler-6.1.5" // { dependencies = [ sources."mime-db-1.33.0" sources."mime-types-2.1.18" @@ -137128,7 +134116,7 @@ in sources."vary-1.1.2" sources."which-2.0.2" sources."widest-line-4.0.1" - (sources."wrap-ansi-8.0.1" // { + (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-regex-6.0.1" sources."strip-ansi-7.0.1" @@ -137148,10 +134136,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "3.24.1"; + version = "3.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-3.24.1.tgz"; - sha512 = "v7WTprSqj0jFoKOY0BU4a7P7bOYHPsvhhxpZt8OJqYrnqyAQbnhM6GXbDimRMibsH3CNvMVWEKD+WWeimXzcHw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-3.27.0.tgz"; + sha512 = "+8EDo7x8IJxTj4KqQG71qpX7oq+EZy0NGm/04q3M5jK7L8rLowEtnzq82s93yeNSgmJSMopd3pTzuH9CCWkNMw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -137160,7 +134148,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@serverless/dashboard-plugin-6.2.2" // { + (sources."@serverless/dashboard-plugin-6.2.3" // { dependencies = [ sources."fs-extra-9.1.0" sources."open-7.4.2" @@ -137182,20 +134170,20 @@ in 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/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-4.2.0" - sources."@types/lodash-4.14.188" - sources."@types/node-18.11.9" + sources."@types/keyv-3.1.4" + sources."@types/lodash-4.14.191" + sources."@types/node-18.11.18" sources."@types/responselike-1.0.0" - sources."adm-zip-0.5.9" + sources."adm-zip-0.5.10" sources."agent-base-6.0.2" - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."ajv-formats-2.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."anymatch-3.1.3" (sources."archive-type-4.0.0" // { dependencies = [ sources."file-type-4.4.0" @@ -137214,7 +134202,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1248.0" // { + (sources."aws-sdk-2.1304.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -137260,7 +134248,7 @@ in sources."child-process-ext-2.1.1" sources."chokidar-3.5.3" sources."chownr-2.0.0" - sources."ci-info-3.5.0" + sources."ci-info-3.7.1" sources."cli-color-2.0.3" sources."cli-cursor-3.1.0" sources."cli-progress-footer-2.3.2" @@ -137289,7 +134277,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."cookiejar-2.1.3" + sources."cookiejar-2.1.4" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" (sources."crc32-stream-4.0.2" // { @@ -137307,7 +134295,7 @@ in sources."type-1.2.0" ]; }) - sources."dayjs-1.11.6" + sources."dayjs-1.11.7" sources."debug-4.3.4" (sources."decompress-4.2.1" // { dependencies = [ @@ -137351,7 +134339,7 @@ in sources."deferred-0.7.11" sources."define-lazy-prop-2.0.0" sources."delayed-stream-1.0.0" - sources."dezalgo-1.0.3" + sources."dezalgo-1.0.4" sources."dir-glob-3.0.1" sources."dotenv-16.0.3" sources."dotenv-expand-9.0.0" @@ -137382,39 +134370,39 @@ in sources."fast-glob-3.2.12" sources."fast-safe-stringify-2.1.1" sources."fastest-levenshtein-1.0.16" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fd-slicer-1.1.0" sources."figures-3.2.0" sources."file-type-16.5.4" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" - sources."filesize-10.0.5" + sources."filesize-10.0.6" sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" sources."follow-redirects-1.15.2" sources."for-each-0.3.3" sources."form-data-4.0.0" - (sources."formidable-2.0.1" // { - dependencies = [ - sources."qs-6.9.3" - ]; - }) + sources."formidable-2.1.2" sources."fs-constants-1.0.0" sources."fs-extra-10.1.0" - sources."fs-minipass-2.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."fs.realpath-1.0.0" sources."fs2-0.3.9" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stdin-8.0.0" sources."get-stream-6.0.1" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globby-11.1.0" sources."gopd-1.0.1" - sources."got-11.8.5" + sources."got-11.8.6" sources."graceful-fs-4.2.10" sources."graphlib-2.1.8" sources."has-1.0.3" @@ -137422,12 +134410,12 @@ in sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hexoid-1.0.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http2-wrapper-1.0.3" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."immediate-3.0.6" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -137471,7 +134459,7 @@ in sources."jsonfile-6.1.0" sources."jszip-3.10.1" sources."jwt-decode-2.2.0" - sources."keyv-4.5.1" + sources."keyv-4.5.2" sources."lazystream-1.0.1" sources."lie-3.3.0" sources."lodash-4.17.21" @@ -137501,24 +134489,28 @@ in sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minipass-3.3.5" - sources."minizlib-2.1.2" + sources."minipass-4.0.0" + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."native-promise-only-0.8.1" - sources."ncjsm-4.3.1" + sources."ncjsm-4.3.2" sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-dir-0.1.17" - sources."node-fetch-2.6.7" - sources."node-gyp-build-4.5.0" + sources."node-fetch-2.6.8" + sources."node-gyp-build-4.6.0" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" sources."npm-registry-utilities-1.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."once-1.4.0" sources."onetime-5.1.2" sources."open-8.4.0" @@ -137544,7 +134536,7 @@ in sources."process-utils-4.0.0" sources."promise-queue-2.2.5" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."querystring-0.2.1" sources."queue-microtask-1.2.3" @@ -137558,7 +134550,7 @@ in (sources."readdir-glob-1.1.2" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" ]; }) sources."readdirp-3.6.0" @@ -137570,7 +134562,7 @@ in sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."run-parallel-limit-1.1.0" - sources."rxjs-7.5.7" + sources."rxjs-7.8.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.1" @@ -137581,7 +134573,7 @@ in sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."simple-git-3.14.1" + sources."simple-git-3.16.0" sources."slash-3.0.0" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" @@ -137609,7 +134601,7 @@ in sources."has-flag-4.0.0" ]; }) - sources."tar-6.1.12" + sources."tar-6.1.13" (sources."tar-stream-2.2.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -137625,7 +134617,7 @@ in sources."tr46-0.0.3" sources."traverse-0.6.7" sources."trim-repeated-1.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-2.7.2" sources."type-fest-0.21.3" sources."unbzip2-stream-1.4.3" @@ -137696,7 +134688,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."base64-arraybuffer-0.1.2" sources."base64id-0.1.0" sources."bcrypt-nodejs-0.0.3" @@ -137764,7 +134756,7 @@ in sources."fresh-0.5.2" sources."from-0.1.7" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."getpass-0.1.7" sources."global-https://github.com/component/global/archive/v2.0.1.tar.gz" sources."har-schema-2.0.0" @@ -137813,7 +134805,7 @@ in sources."negotiator-0.6.3" sources."oauth-sign-0.9.0" sources."object-component-0.0.3" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."on-finished-2.4.1" sources."options-0.0.6" sources."parsejson-0.0.1" @@ -137825,7 +134817,7 @@ in sources."performance-now-2.1.0" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" @@ -137967,7 +134959,7 @@ in sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.3" sources."debug-2.6.9" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."define-property-2.0.2" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -138311,10 +135303,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.1054.0"; + version = "1.1091.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.1054.0.tgz"; - sha512 = "gRatzs9zNU5c+Z+t+qf04XjRJn/pP1f8j0HMclE95VmDwhP/nwE8Fd7Cz5PLJ7D+ehFvV3cpKX4EpGaGgZak6w=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.1091.0.tgz"; + sha512 = "NUofOS3cf4KoT0V3vS1NDC86eG86L29SIno8yIMiVvW7azOxw/IgO09oUhKzFUMXixzU0I9z6Ja+Uv0JsrMQnw=="; }; buildInputs = globalBuildInputs; meta = { @@ -138328,32 +135320,32 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "4.5.3"; + version = "4.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-4.5.3.tgz"; - sha512 = "zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.5.4.tgz"; + sha512 = "m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ=="; }; dependencies = [ sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.12" - sources."@types/node-18.11.9" + sources."@types/cors-2.8.13" + sources."@types/node-18.11.18" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."bufferutil-4.0.7" sources."cookie-0.4.2" sources."cors-2.8.5" sources."debug-4.3.4" - sources."engine.io-6.2.0" - sources."engine.io-parser-5.0.4" + sources."engine.io-6.2.1" + sources."engine.io-parser-5.0.6" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."ms-2.1.2" sources."negotiator-0.6.3" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."object-assign-4.1.1" sources."socket.io-adapter-2.4.0" - sources."socket.io-parser-4.2.1" + sources."socket.io-parser-4.2.2" sources."utf-8-validate-5.0.10" sources."vary-1.1.2" sources."ws-8.2.3" @@ -138447,7 +135439,7 @@ in sources."locate-path-6.0.0" (sources."log-symbols-5.1.0" // { dependencies = [ - sources."chalk-5.1.2" + sources."chalk-5.2.0" ]; }) sources."log-update-5.0.1" @@ -138462,7 +135454,7 @@ in sources."onetime-5.1.2" (sources."ora-6.1.2" // { dependencies = [ - sources."chalk-5.1.2" + sources."chalk-5.2.0" ]; }) sources."p-limit-3.1.0" @@ -138509,7 +135501,7 @@ in sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."wcwidth-1.0.1" - (sources."wrap-ansi-8.0.1" // { + (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-styles-6.2.1" ]; @@ -138533,10 +135525,10 @@ in sql-formatter = nodeEnv.buildNodePackage { name = "sql-formatter"; packageName = "sql-formatter"; - version = "11.0.2"; + version = "12.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-11.0.2.tgz"; - sha512 = "6QumAdGHEnI5dXEq1d0aBRP876AyA9Wp/UE7wopKNA2Mp9sKGRKVqGgoWHk4dr0J0nceesC85Y0p36qmGoNqhw=="; + url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-12.1.0.tgz"; + sha512 = "XwbFwdes2SuETEj/a0WY2MjweFFzgn5phDum4WOdWjk+aay84xXPUl9BzevB89PLykx+4d9GRdXRaiY1VHzytg=="; }; dependencies = [ sources."argparse-2.0.1" @@ -138590,10 +135582,10 @@ in sources."assign-symbols-1.0.0" (sources."async-append-only-log-3.1.4" // { dependencies = [ - sources."push-stream-11.0.1" + sources."push-stream-11.2.0" ]; }) - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."async-single-1.0.5" sources."async-write-2.1.0" sources."atob-2.1.2" @@ -138695,7 +135687,7 @@ in sources."crc-3.6.0" sources."cross-spawn-6.0.5" sources."debug-4.3.4" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" (sources."deferred-leveldown-5.3.0" // { @@ -138725,12 +135717,13 @@ in }) sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.8" - sources."es-abstract-1.20.4" - (sources."es-get-iterator-1.1.2" // { + sources."es-abstract-1.21.1" + (sources."es-get-iterator-1.1.3" // { dependencies = [ sources."isarray-2.0.5" ]; }) + sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."events-3.3.0" @@ -138763,7 +135756,7 @@ in sources."flumeview-level-3.0.14" (sources."flumeview-links-1.0.1" // { dependencies = [ - sources."deep-equal-2.1.0" + sources."deep-equal-2.2.0" sources."isarray-2.0.5" sources."map-filter-reduce-3.2.2" ]; @@ -138797,12 +135790,13 @@ in sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."glob-6.0.4" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" + sources."globalthis-1.0.3" sources."globby-4.1.0" sources."gopd-1.0.1" sources."gossip-query-2.0.2" @@ -138812,6 +135806,7 @@ in sources."has-bigints-1.0.2" sources."has-network-0.0.1" sources."has-property-descriptors-1.0.0" + sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."has-value-1.0.0" // { @@ -138841,7 +135836,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."int53-1.0.0" - sources."internal-slot-1.0.3" + sources."internal-slot-1.0.4" sources."ip-1.1.8" sources."irregular-plurals-1.4.0" (sources."is-accessor-descriptor-1.0.0" // { @@ -138852,6 +135847,7 @@ in sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" sources."is-arguments-1.1.1" + sources."is-array-buffer-3.0.1" sources."is-bigint-1.0.4" sources."is-binary-path-1.0.1" sources."is-boolean-object-1.1.2" @@ -138909,7 +135905,7 @@ in dependencies = [ sources."mkdirp-1.0.4" sources."obz-1.0.3" - sources."push-stream-11.0.1" + sources."push-stream-11.2.0" ]; }) sources."jsesc-3.0.2" @@ -139007,7 +136003,7 @@ in sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-bindgen-loader-1.0.1" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."non-private-ip-2.2.0" sources."normalize-path-2.1.1" sources."normalize-uri-1.1.3" @@ -139026,7 +136022,7 @@ in }) ]; }) - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."object-is-1.1.5" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { @@ -139111,7 +136107,7 @@ in sources."pull-reader-1.3.1" sources."pull-sink-through-0.0.0" sources."pull-sort-1.0.2" - sources."pull-stream-3.6.14" + sources."pull-stream-3.7.0" sources."pull-thenable-1.0.0" (sources."pull-through-1.0.18" // { dependencies = [ @@ -139132,7 +136128,7 @@ in sources."push-stream-10.1.2" (sources."push-stream-to-pull-stream-1.0.5" // { dependencies = [ - sources."push-stream-11.0.1" + sources."push-stream-11.2.0" ]; }) sources."queue-tick-1.0.1" @@ -139342,7 +136338,7 @@ in sources."level-6.0.1" sources."level-js-5.0.2" sources."mkdirp-1.0.4" - sources."push-stream-11.0.1" + sources."push-stream-11.2.0" sources."rimraf-3.0.2" (sources."ssb-keys-8.5.0" // { dependencies = [ @@ -139416,22 +136412,23 @@ in ]; }) sources."statistics-3.3.0" + sources."stop-iteration-iterator-1.0.0" (sources."stream-to-pull-stream-1.7.3" // { dependencies = [ sources."looper-3.0.0" ]; }) sources."string-width-1.0.2" - sources."string.prototype.trim-1.2.6" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" + sources."string.prototype.trim-1.2.7" + sources."string.prototype.trimend-1.0.6" + sources."string.prototype.trimstart-1.0.6" sources."string_decoder-1.1.1" sources."stringify-entities-1.3.2" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."tape-4.16.1" // { + (sources."tape-4.16.2" // { dependencies = [ sources."glob-7.2.3" ]; @@ -139457,6 +136454,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" + sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" sources."typedarray-to-buffer-4.0.0" sources."typedfastbitset-0.2.1" @@ -139601,13 +136599,13 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1248.0" // { + (sources."aws-sdk-2.1304.0" // { dependencies = [ sources."uuid-8.0.0" ]; }) sources."aws-sign2-0.6.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."axios-0.21.4" sources."babel-runtime-6.26.0" sources."babel-types-6.26.0" @@ -139693,7 +136691,7 @@ in ]; }) sources."cookie-signature-1.0.6" - sources."cookiejar-2.1.3" + sources."cookiejar-2.1.4" sources."cookies-0.8.0" sources."core-js-2.6.12" sources."core-util-is-1.0.2" @@ -139727,7 +136725,7 @@ in sources."depd-2.0.0" sources."deref-0.6.4" sources."destroy-1.2.0" - sources."dezalgo-1.0.3" + sources."dezalgo-1.0.4" sources."dicer-0.2.5" sources."doctypes-1.1.0" sources."drange-1.1.1" @@ -139742,7 +136740,7 @@ in sources."ejs-0.8.8" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.6.0" // { + (sources."engine.io-3.6.1" // { dependencies = [ sources."bufferutil-4.0.7" sources."cookie-0.4.2" @@ -139810,7 +136808,7 @@ in sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" (sources."getpass-0.1.7" // { dependencies = [ @@ -139898,7 +136896,7 @@ in dependencies = [ sources."esprima-4.0.1" sources."js-yaml-3.14.1" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."uri-js-3.0.2" ]; }) @@ -139906,7 +136904,7 @@ in sources."json-schema-faker-0.2.16" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."json5-1.0.1" + sources."json5-1.0.2" sources."jsonpointer-5.0.1" sources."jspath-0.3.4" (sources."jsprim-1.4.2" // { @@ -139995,7 +136993,7 @@ in sources."negotiator-0.6.3" sources."nice-try-1.0.5" sources."node-forge-0.7.6" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."node-uuid-1.4.8" sources."normalize-package-data-2.5.0" sources."npm-run-path-2.0.2" @@ -140004,7 +137002,7 @@ in sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" sources."object-hash-0.3.0" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -140107,7 +137105,7 @@ in sources."har-validator-5.1.5" sources."http-signature-1.2.0" sources."oauth-sign-0.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" @@ -140161,10 +137159,10 @@ in sources."debug-3.1.0" sources."isarray-2.0.1" sources."ms-2.0.0" - sources."socket.io-parser-3.3.2" + sources."socket.io-parser-3.3.3" ]; }) - (sources."socket.io-parser-3.4.1" // { + (sources."socket.io-parser-3.4.2" // { dependencies = [ sources."component-emitter-1.2.1" sources."debug-4.1.1" @@ -140212,11 +137210,7 @@ in dependencies = [ sources."debug-4.3.4" sources."form-data-4.0.0" - (sources."formidable-2.0.1" // { - dependencies = [ - sources."qs-6.9.3" - ]; - }) + sources."formidable-2.1.2" sources."lru-cache-6.0.0" sources."mime-2.6.0" sources."ms-2.1.2" @@ -140289,7 +137283,7 @@ in sources."unpipe-1.0.0" (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.1.1" + sources."punycode-2.3.0" ]; }) (sources."url-0.10.3" // { @@ -140322,9 +137316,9 @@ in sources."which-module-2.0.0" sources."which-typed-array-1.1.9" sources."window-size-0.1.0" - (sources."winston-2.4.6" // { + (sources."winston-2.4.7" // { dependencies = [ - sources."async-3.2.4" + sources."async-2.6.4" ]; }) sources."with-5.1.1" @@ -140404,23 +137398,23 @@ in stylelint = nodeEnv.buildNodePackage { name = "stylelint"; packageName = "stylelint"; - version = "14.14.1"; + version = "14.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-14.14.1.tgz"; - sha512 = "Jnftu+lSD8cSpcV/+Z2nfgfgFpTIS1FcujezXPngtoIQ6wtwutL22MsNE0dJuMiM1h1790g2qIjAyUZCMrX4sw=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-14.16.1.tgz"; + sha512 = "ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@csstools/selector-specificity-2.0.2" + sources."@csstools/selector-specificity-2.1.1" 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/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -140441,7 +137435,7 @@ in sources."color-name-1.1.3" sources."colord-2.9.3" sources."concat-map-0.0.1" - sources."cosmiconfig-7.0.1" + sources."cosmiconfig-7.1.0" sources."css-functions-list-3.1.0" sources."cssesc-3.0.0" sources."debug-4.3.4" @@ -140458,7 +137452,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.12" sources."fastest-levenshtein-1.0.16" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -140477,7 +137471,7 @@ in sources."has-flag-3.0.0" sources."hosted-git-info-4.1.0" sources."html-tags-3.2.0" - sources."ignore-5.2.0" + sources."ignore-5.2.4" (sources."import-fresh-3.3.0" // { dependencies = [ sources."resolve-from-4.0.0" @@ -140531,13 +137525,13 @@ in sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."postcss-8.4.18" + sources."postcss-8.4.21" sources."postcss-media-query-parser-0.2.3" sources."postcss-resolve-nested-selector-0.1.1" sources."postcss-safe-parser-6.0.0" - sources."postcss-selector-parser-6.0.10" + sources."postcss-selector-parser-6.0.11" sources."postcss-value-parser-4.2.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { @@ -140630,7 +137624,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."balanced-match-1.0.2" sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" @@ -140709,7 +137703,7 @@ in sources."performance-now-2.1.0" sources."progress-1.1.8" sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."read-1.0.5" sources."request-2.88.2" @@ -140753,38 +137747,38 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "2.9.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.9.2.tgz"; - sha512 = "DRi8HhnCiqiGR2YF9ervPGvtoYrheE09cXieCTEqeTPOTJzfoa54Py8rovIBv4bH4n5HgZYIyTQ3DDLHQLl2uQ=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.0.3.tgz"; + sha512 = "ByBFXo3bfHRGIsYEasHkdMhLkNleVfszX/Ns1oip58tPJlKdo5Ssr8kgVIuo5oq00hss8AIcdesuy0Xt0BcTvg=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.1" - sources."@babel/core-7.20.2" - (sources."@babel/generator-7.20.2" // { + sources."@babel/compat-data-7.20.14" + sources."@babel/core-7.20.12" + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/helper-compilation-targets-7.20.0" + sources."@babel/helper-compilation-targets-7.20.7" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.2" + sources."@babel/helper-module-transforms-7.20.11" sources."@babel/helper-simple-access-7.20.2" sources."@babel/helper-split-export-declaration-7.18.6" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.1" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.2" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.20.1" - sources."@babel/types-7.20.2" + sources."@babel/parser-7.20.13" + sources."@babel/template-7.20.7" + sources."@babel/traverse-7.20.13" + sources."@babel/types-7.20.7" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ sources."@jridgewell/trace-mapping-0.3.9" @@ -140798,29 +137792,29 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.14" - sources."@swc/core-darwin-arm64-1.3.14" - sources."@swc/core-darwin-x64-1.3.14" - sources."@swc/core-linux-arm-gnueabihf-1.3.14" - sources."@swc/core-linux-arm64-gnu-1.3.14" - sources."@swc/core-linux-arm64-musl-1.3.14" - sources."@swc/core-linux-x64-gnu-1.3.14" - sources."@swc/core-linux-x64-musl-1.3.14" - sources."@swc/core-win32-arm64-msvc-1.3.14" - sources."@swc/core-win32-ia32-msvc-1.3.14" - sources."@swc/core-win32-x64-msvc-1.3.14" - sources."@swc/wasm-1.3.14" + sources."@swc/core-1.3.30" + sources."@swc/core-darwin-arm64-1.3.30" + sources."@swc/core-darwin-x64-1.3.30" + sources."@swc/core-linux-arm-gnueabihf-1.3.30" + sources."@swc/core-linux-arm64-gnu-1.3.30" + sources."@swc/core-linux-arm64-musl-1.3.30" + sources."@swc/core-linux-x64-gnu-1.3.30" + sources."@swc/core-linux-x64-musl-1.3.30" + sources."@swc/core-win32-arm64-msvc-1.3.30" + sources."@swc/core-win32-ia32-msvc-1.3.30" + sources."@swc/core-win32-x64-msvc-1.3.30" + sources."@swc/wasm-1.3.30" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-styles-3.2.1" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."arg-4.1.3" sources."asap-2.0.6" sources."assert-never-1.2.1" @@ -140834,7 +137828,7 @@ in sources."buffer-crc32-0.2.13" sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -140848,7 +137842,7 @@ in sources."create-require-1.1.1" sources."css-3.0.0" sources."debug-4.3.4" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" @@ -140858,13 +137852,13 @@ in sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."fast-glob-3.2.12" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globals-11.12.0" @@ -140875,7 +137869,7 @@ in sources."has-tostringtag-1.0.0" sources."iconv-lite-0.6.3" sources."image-size-0.5.5" - sources."immutable-4.1.0" + sources."immutable-4.2.2" sources."import-fresh-3.3.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -140895,11 +137889,12 @@ in sources."js-stringify-1.0.2" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."json5-2.2.1" + sources."json5-2.2.3" sources."jstransformer-1.0.0" sources."less-4.1.3" sources."lilconfig-2.0.6" - sources."magic-string-0.25.9" + sources."lru-cache-5.1.1" + sources."magic-string-0.27.0" (sources."make-dir-2.1.0" // { dependencies = [ sources."semver-5.7.1" @@ -140916,12 +137911,12 @@ in sources."mri-1.2.0" sources."ms-2.1.2" sources."nanoid-3.3.4" - (sources."needle-3.1.0" // { + (sources."needle-3.2.0" // { dependencies = [ sources."debug-3.2.7" ]; }) - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -140932,7 +137927,7 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."postcss-8.4.18" + sources."postcss-8.4.21" sources."postcss-load-config-4.0.1" sources."promise-7.3.1" sources."prr-1.0.1" @@ -140958,14 +137953,13 @@ in sources."sade-1.8.1" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.56.0" + sources."sass-1.57.1" sources."sax-1.2.4" sources."semver-6.3.0" - sources."sorcery-0.10.0" + sources."sorcery-0.11.0" sources."source-map-0.6.1" sources."source-map-js-1.0.2" sources."source-map-resolve-0.6.0" - sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" (sources."stylus-0.55.0" // { dependencies = [ @@ -140975,28 +137969,24 @@ in sources."source-map-0.7.4" ]; }) - (sources."sugarss-2.0.0" // { - dependencies = [ - sources."picocolors-0.2.1" - sources."postcss-7.0.39" - ]; - }) + sources."sugarss-4.0.1" sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."svelte-3.52.0" - sources."svelte-preprocess-4.10.7" + sources."svelte-3.55.1" + sources."svelte-preprocess-5.0.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."token-stream-1.0.0" sources."ts-node-10.9.1" - sources."tslib-2.4.1" - sources."typescript-4.8.4" + sources."tslib-2.5.0" + sources."typescript-4.9.4" sources."update-browserslist-db-1.0.10" sources."v8-compile-cache-lib-3.0.1" sources."void-elements-3.1.0" sources."with-7.0.2" sources."wrappy-1.0.2" - sources."yaml-2.1.3" + sources."yallist-3.1.1" + sources."yaml-2.2.1" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -141012,38 +138002,38 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.14.37"; + version = "0.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.37.tgz"; - sha512 = "gTCIYsI8MasoH0DkvIj3ixGZRglTb89SxMWehoqKJMW5SF4WXcCJyLUGfX71TTUcZqZzMu9k9PlddpkdFK2AzA=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.15.3.tgz"; + sha512 = "HwPvDZGMCSBkdRD0cfEBTPfy5F3qxqcYNIyMrD0zUH9FoWy7gpEpUZVbCTZ7d5QQVst9rgNdGhzfd+O/s+3b8g=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.1" - sources."@babel/core-7.20.2" - (sources."@babel/generator-7.20.2" // { + sources."@babel/compat-data-7.20.14" + sources."@babel/core-7.20.12" + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/helper-compilation-targets-7.20.0" + sources."@babel/helper-compilation-targets-7.20.7" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.2" + sources."@babel/helper-module-transforms-7.20.11" sources."@babel/helper-simple-access-7.20.2" sources."@babel/helper-split-export-declaration-7.18.6" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.1" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.2" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.20.1" - sources."@babel/types-7.20.2" + sources."@babel/parser-7.20.13" + sources."@babel/template-7.20.7" + sources."@babel/traverse-7.20.13" + sources."@babel/types-7.20.7" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ sources."@jridgewell/trace-mapping-0.3.9" @@ -141060,29 +138050,35 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.14" - sources."@swc/core-darwin-arm64-1.3.14" - sources."@swc/core-darwin-x64-1.3.14" - sources."@swc/core-linux-arm-gnueabihf-1.3.14" - sources."@swc/core-linux-arm64-gnu-1.3.14" - sources."@swc/core-linux-arm64-musl-1.3.14" - sources."@swc/core-linux-x64-gnu-1.3.14" - sources."@swc/core-linux-x64-musl-1.3.14" - sources."@swc/core-win32-arm64-msvc-1.3.14" - sources."@swc/core-win32-ia32-msvc-1.3.14" - sources."@swc/core-win32-x64-msvc-1.3.14" - sources."@swc/wasm-1.3.14" + sources."@swc/core-1.3.30" + sources."@swc/core-darwin-arm64-1.3.30" + sources."@swc/core-darwin-x64-1.3.30" + sources."@swc/core-linux-arm-gnueabihf-1.3.30" + sources."@swc/core-linux-arm64-gnu-1.3.30" + sources."@swc/core-linux-arm64-musl-1.3.30" + sources."@swc/core-linux-x64-gnu-1.3.30" + sources."@swc/core-linux-x64-musl-1.3.30" + sources."@swc/core-win32-arm64-msvc-1.3.30" + sources."@swc/core-win32-ia32-msvc-1.3.30" + sources."@swc/core-win32-x64-msvc-1.3.30" + sources."@swc/wasm-1.3.30" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" - sources."acorn-8.8.1" + (sources."@vscode/emmet-helper-2.8.6" // { + dependencies = [ + sources."vscode-uri-2.1.2" + ]; + }) + sources."@vscode/l10n-0.0.11" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-styles-3.2.1" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."arg-4.1.3" sources."asap-2.0.6" sources."assert-never-1.2.1" @@ -141095,7 +138091,7 @@ in sources."browserslist-4.21.4" sources."buffer-crc32-0.2.13" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -141109,7 +138105,7 @@ in sources."create-require-1.1.1" sources."css-3.0.0" sources."debug-4.3.4" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."dedent-js-1.0.1" sources."detect-indent-6.1.0" sources."diff-4.0.2" @@ -141122,13 +138118,13 @@ in sources."escape-string-regexp-1.0.5" sources."estree-walker-2.0.2" sources."fast-glob-3.2.12" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globals-11.12.0" @@ -141139,7 +138135,7 @@ in sources."has-tostringtag-1.0.0" sources."iconv-lite-0.6.3" sources."image-size-0.5.5" - sources."immutable-4.1.0" + sources."immutable-4.2.2" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" @@ -141158,14 +138154,15 @@ in sources."js-stringify-1.0.2" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."json5-2.2.1" + sources."json5-2.2.3" sources."jsonc-parser-2.3.1" sources."jstransformer-1.0.0" sources."less-4.1.3" sources."lilconfig-2.0.6" sources."lodash-4.17.21" sources."lower-case-2.0.2" - sources."magic-string-0.25.9" + sources."lru-cache-5.1.1" + sources."magic-string-0.27.0" (sources."make-dir-2.1.0" // { dependencies = [ sources."semver-5.7.1" @@ -141181,13 +138178,13 @@ in sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."nanoid-3.3.4" - (sources."needle-3.1.0" // { + (sources."needle-3.2.0" // { dependencies = [ sources."debug-3.2.7" ]; }) sources."no-case-3.0.4" - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -141198,10 +138195,10 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."postcss-8.4.18" + sources."postcss-8.4.21" sources."postcss-load-config-4.0.1" - sources."prettier-2.7.1" - sources."prettier-plugin-svelte-2.8.0" + sources."prettier-2.8.1" + sources."prettier-plugin-svelte-2.9.0" sources."promise-7.3.1" sources."prr-1.0.1" sources."pug-3.0.2" @@ -141224,14 +138221,13 @@ in sources."run-parallel-1.2.0" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.56.0" + sources."sass-1.57.1" sources."sax-1.2.4" sources."semver-6.3.0" - sources."sorcery-0.10.0" + sources."sorcery-0.11.0" sources."source-map-0.6.1" sources."source-map-js-1.0.2" sources."source-map-resolve-0.6.0" - sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" (sources."stylus-0.55.0" // { dependencies = [ @@ -141241,52 +138237,33 @@ in sources."source-map-0.7.4" ]; }) - (sources."sugarss-2.0.0" // { - dependencies = [ - sources."picocolors-0.2.1" - sources."postcss-7.0.39" - ]; - }) + sources."sugarss-4.0.1" sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."svelte-3.52.0" - sources."svelte-preprocess-4.10.7" - sources."svelte2tsx-0.5.20" + sources."svelte-3.55.1" + sources."svelte-preprocess-5.0.1" + sources."svelte2tsx-0.6.0" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."token-stream-1.0.0" sources."ts-node-10.9.1" - sources."tslib-2.4.1" - sources."typescript-4.8.4" + sources."tslib-2.5.0" + sources."typescript-4.9.4" sources."update-browserslist-db-1.0.10" sources."v8-compile-cache-lib-3.0.1" sources."void-elements-3.1.0" - sources."vscode-css-languageservice-5.1.13" - (sources."vscode-emmet-helper-2.6.4" // { - dependencies = [ - sources."vscode-uri-2.1.2" - ]; - }) - sources."vscode-html-languageservice-4.1.1" - sources."vscode-jsonrpc-6.1.0-next.2" - (sources."vscode-languageserver-7.1.0-next.4" // { - dependencies = [ - sources."vscode-languageserver-protocol-3.17.0-next.5" - sources."vscode-languageserver-types-3.17.0-next.1" - ]; - }) - (sources."vscode-languageserver-protocol-3.16.0" // { - dependencies = [ - sources."vscode-jsonrpc-6.0.0" - ]; - }) - sources."vscode-languageserver-textdocument-1.0.7" - sources."vscode-languageserver-types-3.16.0" - sources."vscode-nls-5.2.0" - sources."vscode-uri-3.0.6" + sources."vscode-css-languageservice-6.2.3" + sources."vscode-html-languageservice-5.0.4" + sources."vscode-jsonrpc-8.0.2" + sources."vscode-languageserver-8.0.2" + sources."vscode-languageserver-protocol-3.17.2" + sources."vscode-languageserver-textdocument-1.0.9" + sources."vscode-languageserver-types-3.17.2" + sources."vscode-uri-3.0.7" sources."with-7.0.2" sources."wrappy-1.0.2" - sources."yaml-2.1.3" + sources."yallist-3.1.1" + sources."yaml-2.2.1" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -141302,25 +138279,30 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-3.0.0.tgz"; - sha512 = "mSqPn6RDeNqJvCeqHERlfWJjd4crP/2PgFelil9WpTwC4D3okAUopPsH3lnEyl7ONXfDVyISOihDjO0uK8YVAA=="; + url = "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz"; + sha512 = "Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ=="; }; dependencies = [ sources."@trysound/sax-0.2.0" sources."boolbase-1.0.0" sources."commander-7.2.0" sources."css-select-5.1.0" - sources."css-tree-2.2.1" + sources."css-tree-2.3.1" sources."css-what-6.1.0" - sources."csso-5.0.5" + (sources."csso-5.0.5" // { + dependencies = [ + sources."css-tree-2.2.1" + sources."mdn-data-2.0.28" + ]; + }) sources."dom-serializer-2.0.0" sources."domelementtype-2.3.0" sources."domhandler-5.0.3" sources."domutils-3.0.1" sources."entities-4.4.0" - sources."mdn-data-2.0.28" + sources."mdn-data-2.0.30" sources."nth-check-2.1.1" sources."picocolors-1.0.0" sources."source-map-js-1.0.2" @@ -141364,7 +138346,7 @@ in sources."asap-2.0.6" sources."assign-symbols-1.0.0" sources."async-1.5.2" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."balanced-match-1.0.2" @@ -141449,7 +138431,7 @@ in sources."configstore-3.1.5" sources."connect-3.7.0" sources."content-type-1.0.4" - sources."cookiejar-2.1.3" + sources."cookiejar-2.1.4" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" sources."core-util-is-1.0.3" @@ -141463,13 +138445,13 @@ in sources."crypto-random-string-1.0.0" sources."dag-map-1.0.2" sources."debug-2.6.9" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."deep-extend-0.6.0" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."depd-2.0.0" sources."destroy-1.2.0" - sources."dezalgo-1.0.3" + sources."dezalgo-1.0.4" (sources."dicer-0.2.5" // { dependencies = [ sources."isarray-0.0.1" @@ -141528,9 +138510,9 @@ in sources."finalhandler-1.1.2" sources."for-in-1.0.2" sources."form-data-4.0.0" - (sources."formidable-2.0.1" // { + (sources."formidable-2.1.2" // { dependencies = [ - sources."qs-6.9.3" + sources."qs-6.11.0" ]; }) sources."fragment-cache-0.2.1" @@ -141539,7 +138521,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."glob-7.2.3" @@ -141735,7 +138717,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."on-finished-2.3.0" @@ -141773,7 +138755,7 @@ in sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" sources."pstree.remy-1.1.8" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-4.0.0" sources."range-parser-1.2.1" (sources."raw-body-2.0.2" // { @@ -141997,10 +138979,10 @@ in tailwindcss = nodeEnv.buildNodePackage { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.2.tgz"; - sha512 = "c2GtSdqg+harR4QeoTmex0Ngfg8IIHNeLQH5yr2B9uZbZR1Xt1rYbjWOWTcj3YLTZhrmZnPowoQDbSRFyZHQ5Q=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz"; + sha512 = "AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" @@ -142010,27 +138992,27 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.14" - sources."@swc/core-darwin-arm64-1.3.14" - sources."@swc/core-darwin-x64-1.3.14" - sources."@swc/core-linux-arm-gnueabihf-1.3.14" - sources."@swc/core-linux-arm64-gnu-1.3.14" - sources."@swc/core-linux-arm64-musl-1.3.14" - sources."@swc/core-linux-x64-gnu-1.3.14" - sources."@swc/core-linux-x64-musl-1.3.14" - sources."@swc/core-win32-arm64-msvc-1.3.14" - sources."@swc/core-win32-ia32-msvc-1.3.14" - sources."@swc/core-win32-x64-msvc-1.3.14" - sources."@swc/wasm-1.3.14" + sources."@swc/core-1.3.30" + sources."@swc/core-darwin-arm64-1.3.30" + sources."@swc/core-darwin-x64-1.3.30" + sources."@swc/core-linux-arm-gnueabihf-1.3.30" + sources."@swc/core-linux-arm64-gnu-1.3.30" + sources."@swc/core-linux-arm64-musl-1.3.30" + sources."@swc/core-linux-x64-gnu-1.3.30" + sources."@swc/core-linux-x64-musl-1.3.30" + sources."@swc/core-win32-arm64-msvc-1.3.30" + sources."@swc/core-win32-ia32-msvc-1.3.30" + sources."@swc/core-win32-x64-msvc-1.3.30" + sources."@swc/wasm-1.3.30" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."arg-5.0.2" sources."binary-extensions-2.2.0" sources."braces-3.0.2" @@ -142053,7 +139035,7 @@ in sources."glob-parent-5.1.2" ]; }) - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fsevents-2.3.2" sources."function-bind-1.1.1" @@ -142076,12 +139058,12 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-2.3.0" - sources."postcss-8.4.18" + sources."postcss-8.4.21" sources."postcss-import-14.1.0" sources."postcss-js-4.0.0" sources."postcss-load-config-3.1.4" sources."postcss-nested-6.0.0" - sources."postcss-selector-parser-6.0.10" + sources."postcss-selector-parser-6.0.11" sources."postcss-value-parser-4.2.0" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" @@ -142095,12 +139077,12 @@ in sources."to-regex-range-5.0.1" (sources."ts-node-10.9.1" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" ]; }) - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."xtend-4.0.2" @@ -142141,7 +139123,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."balanced-match-1.0.2" (sources."bcrypt-pbkdf-1.0.2" // { dependencies = [ @@ -142238,8 +139220,8 @@ in sources."nan-2.17.0" sources."needle-2.9.1" sources."node-addon-api-2.0.2" - sources."node-fetch-2.6.7" - sources."node-gyp-build-4.5.0" + sources."node-fetch-2.6.8" + sources."node-gyp-build-4.6.0" (sources."node-opus-0.2.9" // { dependencies = [ sources."bindings-1.2.1" @@ -142269,7 +139251,7 @@ in sources."prism-media-0.0.4" sources."process-nextick-args-2.0.1" sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."ramda-0.25.0" sources."rc-1.2.8" @@ -142379,7 +139361,7 @@ in }; dependencies = [ sources."node-addon-api-4.3.0" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."q-1.5.1" sources."usb-1.9.2" ]; @@ -142445,10 +139427,10 @@ in terser = nodeEnv.buildNodePackage { name = "terser"; packageName = "terser"; - version = "5.15.1"; + version = "5.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz"; - sha512 = "K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw=="; + url = "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz"; + sha512 = "xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw=="; }; dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" @@ -142457,7 +139439,7 @@ in sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."buffer-from-1.1.2" sources."commander-2.20.3" sources."source-map-0.6.1" @@ -142476,41 +139458,41 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "12.2.2"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-12.2.2.tgz"; - sha512 = "+xORGVnAceaP3+77vGuALOtnNNtexh8VK9ssAK2r3vAr0iMApSMyvGaXousbsfLiwK5L/X0X/78yJDvXwGQPjA=="; + url = "https://registry.npmjs.org/textlint/-/textlint-13.0.4.tgz"; + sha512 = "XBPK+cRMYLY3NodKoCFMncmVJRk59S+aSgkwpdNnV8VXFo1hF0EEysbwEp9s8ov0LhVO8flfd51/L+VlUFeTlg=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" - sources."@textlint/ast-node-types-12.2.2" - sources."@textlint/ast-tester-12.2.2" - sources."@textlint/ast-traverse-12.2.2" - sources."@textlint/feature-flag-12.2.2" - sources."@textlint/fixer-formatter-12.2.2" - sources."@textlint/kernel-12.2.2" - sources."@textlint/linter-formatter-12.2.2" - sources."@textlint/markdown-to-ast-12.2.2" - sources."@textlint/module-interop-12.2.2" - sources."@textlint/source-code-fixer-12.2.2" - sources."@textlint/text-to-ast-12.2.2" - sources."@textlint/textlint-plugin-markdown-12.2.2" - sources."@textlint/textlint-plugin-text-12.2.2" - sources."@textlint/types-12.2.2" - sources."@textlint/utils-12.2.2" + sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/ast-tester-13.0.4" + sources."@textlint/ast-traverse-13.0.4" + sources."@textlint/config-loader-13.0.4" + sources."@textlint/feature-flag-13.0.4" + sources."@textlint/fixer-formatter-13.0.4" + sources."@textlint/kernel-13.0.4" + sources."@textlint/linter-formatter-13.0.4" + sources."@textlint/markdown-to-ast-13.0.4" + sources."@textlint/module-interop-13.0.4" + sources."@textlint/source-code-fixer-13.0.4" + sources."@textlint/text-to-ast-13.0.4" + sources."@textlint/textlint-plugin-markdown-13.0.4" + sources."@textlint/textlint-plugin-text-13.0.4" + sources."@textlint/types-13.0.4" + sources."@textlint/utils-13.0.4" sources."@types/mdast-3.0.10" sources."@types/unist-2.0.6" - sources."ajv-8.11.0" + sources."ajv-8.12.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" sources."balanced-match-1.0.2" - sources."boundary-1.0.1" + sources."boundary-2.0.0" sources."brace-expansion-1.1.11" - sources."call-bind-1.0.2" sources."ccount-1.1.0" sources."chalk-4.1.2" sources."character-entities-1.2.4" @@ -142522,9 +139504,7 @@ in sources."concat-map-0.0.1" sources."crypt-0.0.2" sources."debug-4.3.4" - sources."deep-equal-1.1.1" sources."deep-is-0.1.4" - sources."define-properties-1.1.4" sources."diff-4.0.2" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" @@ -142532,6 +139512,7 @@ in sources."esprima-4.0.1" sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" + sources."fast-equals-4.0.3" sources."fast-levenshtein-2.0.6" sources."fault-1.0.4" sources."file-entry-cache-5.0.1" @@ -142541,40 +139522,33 @@ in sources."format-0.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" sources."get-stdin-5.0.1" sources."glob-7.2.3" sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.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" sources."inherits-2.0.4" sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" - sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" sources."is-core-module-2.11.0" - sources."is-date-object-1.0.5" sources."is-decimal-1.0.4" sources."is-file-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" sources."is-utf8-0.2.1" 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.1" + sources."json5-2.2.3" sources."levn-0.4.1" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" + sources."lodash-4.17.21" sources."lodash.truncate-4.4.2" sources."longest-streak-2.0.4" sources."markdown-table-2.0.0" @@ -142608,8 +139582,6 @@ in sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."normalize-package-data-2.5.0" - sources."object-is-1.1.5" - sources."object-keys-1.1.1" sources."once-1.4.0" sources."optionator-0.9.1" sources."p-limit-1.3.0" @@ -142627,8 +139599,13 @@ in sources."pinkie-promise-2.0.1" sources."pluralize-2.0.0" sources."prelude-ls-1.2.1" - sources."punycode-2.1.1" - sources."rc-config-loader-3.0.0" + sources."punycode-2.3.0" + (sources."rc-config-loader-4.1.2" // { + dependencies = [ + sources."argparse-2.0.1" + sources."js-yaml-4.1.0" + ]; + }) sources."read-pkg-1.1.0" (sources."read-pkg-up-3.0.0" // { dependencies = [ @@ -142640,7 +139617,6 @@ in sources."strip-bom-3.0.0" ]; }) - sources."regexp.prototype.flags-1.4.3" sources."remark-footnotes-3.0.0" sources."remark-frontmatter-3.0.0" sources."remark-gfm-1.0.0" @@ -142659,7 +139635,7 @@ in 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."structured-source-4.0.0" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."table-6.8.1" @@ -142680,7 +139656,6 @@ in sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-1.0.3" - sources."xml-escape-1.1.0" sources."zwitch-1.0.5" ]; buildInputs = globalBuildInputs; @@ -142728,7 +139703,7 @@ in sources."define-properties-1.1.4" sources."function-bind-1.1.1" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."has-1.0.3" sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" @@ -142760,8 +139735,7 @@ in sources."@babel/highlight-7.18.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@textlint/ast-node-types-12.2.2" - sources."@textlint/types-12.2.2" + sources."@textlint/ast-node-types-13.0.4" sources."@types/hast-2.3.4" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" @@ -142776,7 +139750,7 @@ in sources."arrify-1.0.1" sources."bail-1.0.5" sources."balanced-match-1.0.2" - sources."boundary-1.0.1" + sources."boundary-2.0.0" (sources."boxen-4.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -142884,8 +139858,8 @@ in sources."hast-util-whitespace-1.0.4" sources."hastscript-6.0.0" sources."hosted-git-info-2.8.9" - sources."http-cache-semantics-4.1.0" - sources."ignore-5.2.0" + sources."http-cache-semantics-4.1.1" + sources."ignore-5.2.4" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" @@ -143059,11 +140033,11 @@ in sources."strip-ansi-6.0.1" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" - sources."structured-source-3.0.2" + sources."structured-source-4.0.0" sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."term-size-2.2.1" - sources."textlint-rule-helper-2.2.3" + sources."textlint-rule-helper-2.3.0" sources."through-2.3.8" (sources."through2-2.0.0" // { dependencies = [ @@ -143204,49 +140178,74 @@ in sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" sources."@textlint/ast-node-types-4.4.3" - (sources."@textlint/ast-tester-12.2.2" // { + (sources."@textlint/ast-tester-12.6.1" // { dependencies = [ - sources."@textlint/ast-node-types-12.2.2" + sources."@textlint/ast-node-types-12.6.1" ]; }) - (sources."@textlint/ast-traverse-12.2.2" // { + (sources."@textlint/ast-traverse-12.6.1" // { dependencies = [ - sources."@textlint/ast-node-types-12.2.2" + sources."@textlint/ast-node-types-12.6.1" ]; }) - sources."@textlint/feature-flag-12.2.2" - sources."@textlint/fixer-formatter-12.2.2" - (sources."@textlint/kernel-12.2.2" // { + (sources."@textlint/config-loader-13.0.4" // { dependencies = [ - sources."@textlint/ast-node-types-12.2.2" + sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/ast-tester-13.0.4" + sources."@textlint/ast-traverse-13.0.4" + sources."@textlint/feature-flag-13.0.4" + sources."@textlint/kernel-13.0.4" + sources."@textlint/source-code-fixer-13.0.4" + sources."@textlint/types-13.0.4" + sources."@textlint/utils-13.0.4" + sources."boundary-2.0.0" + sources."structured-source-4.0.0" ]; }) - sources."@textlint/linter-formatter-12.2.2" - (sources."@textlint/markdown-to-ast-12.2.2" // { + sources."@textlint/feature-flag-12.6.1" + (sources."@textlint/fixer-formatter-13.0.4" // { dependencies = [ - sources."@textlint/ast-node-types-12.2.2" - sources."unified-9.2.2" + sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/types-13.0.4" ]; }) - sources."@textlint/module-interop-12.2.2" - sources."@textlint/source-code-fixer-12.2.2" - (sources."@textlint/text-to-ast-12.2.2" // { + (sources."@textlint/kernel-12.6.1" // { dependencies = [ - sources."@textlint/ast-node-types-12.2.2" + sources."@textlint/ast-node-types-12.6.1" + sources."boundary-2.0.0" + sources."structured-source-4.0.0" ]; }) - sources."@textlint/textlint-plugin-markdown-12.2.2" - sources."@textlint/textlint-plugin-text-12.2.2" - (sources."@textlint/types-12.2.2" // { + (sources."@textlint/linter-formatter-13.0.4" // { dependencies = [ - sources."@textlint/ast-node-types-12.2.2" + sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/types-13.0.4" ]; }) - sources."@textlint/utils-12.2.2" + (sources."@textlint/markdown-to-ast-12.6.1" // { + dependencies = [ + sources."@textlint/ast-node-types-12.6.1" + ]; + }) + sources."@textlint/module-interop-13.0.4" + sources."@textlint/source-code-fixer-12.6.1" + (sources."@textlint/text-to-ast-12.6.1" // { + dependencies = [ + sources."@textlint/ast-node-types-12.6.1" + ]; + }) + sources."@textlint/textlint-plugin-markdown-12.6.1" + sources."@textlint/textlint-plugin-text-12.6.1" + (sources."@textlint/types-12.6.1" // { + dependencies = [ + sources."@textlint/ast-node-types-12.6.1" + ]; + }) + sources."@textlint/utils-12.6.1" sources."@types/mdast-3.0.10" sources."@types/structured-source-3.0.0" sources."@types/unist-2.0.6" - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."argparse-1.0.10" @@ -143280,6 +140279,7 @@ in sources."esprima-4.0.1" sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" + sources."fast-equals-4.0.3" sources."fast-levenshtein-2.0.6" sources."fault-1.0.4" sources."file-entry-cache-5.0.1" @@ -143290,7 +140290,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stdin-5.0.1" sources."glob-7.2.3" sources."graceful-fs-4.2.10" @@ -143322,10 +140322,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.1" + sources."json5-2.2.3" sources."levn-0.4.1" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" + sources."lodash-4.17.21" sources."lodash.truncate-4.4.2" sources."longest-streak-2.0.4" sources."markdown-table-2.0.0" @@ -143382,8 +140383,13 @@ in sources."pluralize-2.0.0" sources."prelude-ls-1.2.1" sources."property-information-5.6.0" - sources."punycode-2.1.1" - sources."rc-config-loader-3.0.0" + sources."punycode-2.3.0" + (sources."rc-config-loader-4.1.2" // { + dependencies = [ + sources."argparse-2.0.1" + sources."js-yaml-4.1.0" + ]; + }) sources."read-pkg-1.1.0" (sources."read-pkg-up-3.0.0" // { dependencies = [ @@ -143425,19 +140431,36 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."table-6.8.1" sources."text-table-0.2.0" - (sources."textlint-12.2.2" // { + (sources."textlint-13.0.4" // { dependencies = [ - sources."@textlint/ast-node-types-12.2.2" + sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/ast-tester-13.0.4" + sources."@textlint/ast-traverse-13.0.4" + sources."@textlint/feature-flag-13.0.4" + sources."@textlint/kernel-13.0.4" + sources."@textlint/markdown-to-ast-13.0.4" + sources."@textlint/source-code-fixer-13.0.4" + sources."@textlint/text-to-ast-13.0.4" + sources."@textlint/textlint-plugin-markdown-13.0.4" + sources."@textlint/textlint-plugin-text-13.0.4" + sources."@textlint/types-13.0.4" + sources."@textlint/utils-13.0.4" + sources."boundary-2.0.0" + sources."structured-source-4.0.0" + ]; + }) + sources."textlint-tester-12.6.1" + (sources."textlint-util-to-string-3.1.1" // { + dependencies = [ + sources."unified-8.4.2" ]; }) - sources."textlint-tester-12.2.2" - sources."textlint-util-to-string-3.1.1" sources."traverse-0.6.7" sources."trough-1.0.5" sources."try-resolve-1.0.1" sources."type-check-0.4.0" sources."typedarray-0.0.6" - sources."unified-8.4.2" + sources."unified-9.2.2" sources."unique-concat-0.2.2" sources."unist-util-is-4.1.0" sources."unist-util-map-1.0.5" @@ -143452,7 +140475,6 @@ in sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-1.0.3" - sources."xml-escape-1.1.0" sources."xtend-4.0.2" sources."zwitch-1.0.5" ]; @@ -143534,11 +140556,6 @@ in }; dependencies = [ sources."@textlint/ast-node-types-4.4.3" - (sources."@textlint/types-12.2.2" // { - dependencies = [ - sources."@textlint/ast-node-types-12.2.2" - ]; - }) sources."@types/unist-2.0.6" sources."boundary-1.0.1" sources."buffer-from-1.1.2" @@ -143551,9 +140568,11 @@ in sources."sentence-splitter-3.2.2" sources."string_decoder-1.3.0" sources."structured-source-3.0.2" - (sources."textlint-rule-helper-2.2.3" // { + (sources."textlint-rule-helper-2.3.0" // { dependencies = [ - sources."@textlint/ast-node-types-12.2.2" + sources."@textlint/ast-node-types-13.0.4" + sources."boundary-2.0.0" + sources."structured-source-4.0.0" ]; }) sources."typedarray-0.0.6" @@ -143575,13 +140594,13 @@ in textlint-rule-period-in-list-item = nodeEnv.buildNodePackage { name = "textlint-rule-period-in-list-item"; packageName = "textlint-rule-period-in-list-item"; - version = "0.3.3"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-period-in-list-item/-/textlint-rule-period-in-list-item-0.3.3.tgz"; - sha512 = "XVm7E2riBggmyMPiLPQZwXxwFngi5WozWrZqctjN43uz9GykOyrqaHACGsLou2cJqa6nwQxqxewl2OOf/G64eA=="; + url = "https://registry.npmjs.org/textlint-rule-period-in-list-item/-/textlint-rule-period-in-list-item-1.0.1.tgz"; + sha512 = "dNPa4WzePcgsz8A+CxFGQgKNZCEvjjwMCu3DFcpYB4eKuhcSISEiS/mvEO42oGAALJluYdYVZxN3yMD6XzkLBA=="; }; dependencies = [ - sources."check-ends-with-period-2.0.1" + sources."check-ends-with-period-3.0.2" sources."emoji-regex-10.2.1" ]; buildInputs = globalBuildInputs; @@ -143603,14 +140622,13 @@ in sha512 = "gO4N3OnPLvE6+fvJ1Y5m8MzDVrqMEWzW8pTGMXjL8VAXmQkD6YQ9eDMbsVN0/DzEe8tcsBqNgA/iIrQ64oECuQ=="; }; dependencies = [ - sources."@textlint/ast-node-types-12.2.2" - sources."@textlint/types-12.2.2" + sources."@textlint/ast-node-types-13.0.4" sources."@types/unist-2.0.6" - sources."boundary-1.0.1" + sources."boundary-2.0.0" sources."lodash-4.17.21" sources."split-lines-2.1.0" - sources."structured-source-3.0.2" - sources."textlint-rule-helper-2.2.3" + sources."structured-source-4.0.0" + sources."textlint-rule-helper-2.3.0" sources."unist-util-is-4.1.0" sources."unist-util-visit-2.0.3" sources."unist-util-visit-parents-3.1.1" @@ -143634,14 +140652,13 @@ in sha512 = "obQ3y0hqX6OWCrM8K5K6WSJGE4BOyNfGF6hUGPet56taTm/xzkRu8XA6vpn2GFr4zom/oMa0sBJ3OtDWCgrS/g=="; }; dependencies = [ - sources."@textlint/ast-node-types-12.2.2" - sources."@textlint/types-12.2.2" + sources."@textlint/ast-node-types-13.0.4" sources."@types/unist-2.0.6" - sources."boundary-1.0.1" + sources."boundary-2.0.0" sources."lodash-4.17.21" sources."strip-json-comments-3.1.1" - sources."structured-source-3.0.2" - sources."textlint-rule-helper-2.2.3" + sources."structured-source-4.0.0" + sources."textlint-rule-helper-2.3.0" sources."unist-util-is-4.1.0" sources."unist-util-visit-2.0.3" sources."unist-util-visit-parents-3.1.1" @@ -143665,22 +140682,29 @@ in sha512 = "F1kV06CdonOM2awtXjCSRYUsRJfDfZIujQQo4zEMqNqD6UwpkapxpZOiwcwbeaQz00+17ljbJEoGqIe2XeiU+w=="; }; dependencies = [ - sources."array-includes-3.1.5" + sources."array-includes-3.1.6" + sources."available-typed-arrays-1.0.5" sources."call-bind-1.0.2" sources."define-properties-1.1.4" - sources."es-abstract-1.20.4" + sources."es-abstract-1.21.1" + sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" + sources."for-each-0.3.3" sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" + sources."globalthis-1.0.3" + sources."gopd-1.0.1" sources."has-1.0.3" sources."has-bigints-1.0.2" sources."has-property-descriptors-1.0.0" + sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" - sources."internal-slot-1.0.3" + sources."internal-slot-1.0.4" + sources."is-array-buffer-3.0.1" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" @@ -143692,17 +140716,20 @@ in sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.10" sources."is-weakref-1.0.2" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."object-keys-1.1.1" sources."object.assign-4.1.4" sources."regexp.prototype.flags-1.4.3" sources."safe-regex-test-1.0.0" sources."side-channel-1.0.4" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" + sources."string.prototype.trimend-1.0.6" + sources."string.prototype.trimstart-1.0.6" + sources."typed-array-length-1.0.4" sources."unbox-primitive-1.0.2" sources."which-boxed-primitive-1.0.2" + sources."which-typed-array-1.1.9" ]; buildInputs = globalBuildInputs; meta = { @@ -143723,15 +140750,14 @@ in sha512 = "yvOJavJD+PgyUzvsoLDDzDtgCVBva/HNhEvsFnYVugrWz0qy2hr+/4B4wkzjro4wfPbwz20GQe5h13N4DeUEeA=="; }; dependencies = [ - sources."@babel/runtime-7.20.1" - sources."@babel/runtime-corejs3-7.20.1" - (sources."@eslint/eslintrc-1.3.3" // { + sources."@babel/runtime-7.20.13" + (sources."@eslint/eslintrc-1.4.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - (sources."@humanwhocodes/config-array-0.11.7" // { + (sources."@humanwhocodes/config-array-0.11.8" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -143742,26 +140768,27 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@textlint/ast-node-types-12.2.2" - sources."@textlint/types-12.2.2" + sources."@textlint/ast-node-types-13.0.4" sources."@types/json5-0.0.29" sources."@types/unist-2.0.6" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."adverb-where-0.2.5" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."argparse-2.0.1" - sources."aria-query-4.2.2" - sources."array-includes-3.1.5" + sources."aria-query-5.1.3" + sources."array-includes-3.1.6" sources."array.prototype.flat-1.3.1" sources."array.prototype.flatmap-1.3.1" + sources."array.prototype.tosorted-1.1.1" sources."ast-types-flow-0.0.7" - sources."axe-core-4.5.1" - sources."axobject-query-2.2.0" + sources."available-typed-arrays-1.0.5" + sources."axe-core-4.6.3" + sources."axobject-query-3.1.1" sources."balanced-match-1.0.2" - sources."boundary-1.0.1" + sources."boundary-2.0.0" sources."brace-expansion-1.1.11" sources."call-bind-1.0.2" sources."callsites-3.1.0" @@ -143770,41 +140797,33 @@ in sources."color-name-1.1.4" sources."commander-2.20.3" sources."concat-map-0.0.1" - sources."core-js-pure-3.26.0" sources."cross-spawn-7.0.3" sources."damerau-levenshtein-1.0.8" - sources."debug-2.6.9" + sources."debug-3.2.7" + sources."deep-equal-2.2.0" sources."deep-is-0.1.4" sources."define-properties-1.1.4" sources."doctrine-2.1.0" sources."e-prime-0.10.4" sources."emoji-regex-9.2.2" - sources."es-abstract-1.20.4" + sources."es-abstract-1.21.1" + sources."es-get-iterator-1.1.3" + sources."es-set-tostringtag-2.0.1" sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.27.0" // { + (sources."eslint-8.32.0" // { dependencies = [ sources."debug-4.3.4" sources."doctrine-3.0.0" sources."ms-2.1.2" ]; }) - (sources."eslint-import-resolver-node-0.3.6" // { - dependencies = [ - sources."debug-3.2.7" - sources."ms-2.1.3" - ]; - }) - (sources."eslint-module-utils-2.7.4" // { - dependencies = [ - sources."debug-3.2.7" - sources."ms-2.1.3" - ]; - }) - sources."eslint-plugin-import-2.26.0" - sources."eslint-plugin-jsx-a11y-6.6.1" - (sources."eslint-plugin-react-7.31.10" // { + sources."eslint-import-resolver-node-0.3.7" + sources."eslint-module-utils-2.7.4" + sources."eslint-plugin-import-2.27.5" + sources."eslint-plugin-jsx-a11y-6.7.1" + (sources."eslint-plugin-react-7.32.1" // { dependencies = [ sources."resolve-2.0.0-next.4" ]; @@ -143825,33 +140844,39 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."file-entry-cache-6.0.1" sources."find-up-5.0.0" sources."flat-cache-3.0.4" sources."flatted-3.2.7" + sources."for-each-0.3.3" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.17.0" + sources."globals-13.20.0" + sources."globalthis-1.0.3" + sources."gopd-1.0.1" sources."grapheme-splitter-1.0.4" sources."has-1.0.3" sources."has-bigints-1.0.2" sources."has-flag-4.0.0" sources."has-property-descriptors-1.0.0" + sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internal-slot-1.0.3" + sources."internal-slot-1.0.4" + sources."is-arguments-1.1.1" + sources."is-array-buffer-3.0.1" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" @@ -143859,21 +140884,27 @@ in sources."is-date-object-1.0.5" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" + sources."is-map-2.0.2" sources."is-negative-zero-2.0.2" sources."is-number-object-1.0.7" sources."is-path-inside-3.0.3" sources."is-regex-1.1.4" + sources."is-set-2.0.2" sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.10" + sources."is-weakmap-2.0.1" sources."is-weakref-1.0.2" + sources."is-weakset-2.0.2" + sources."isarray-2.0.5" sources."isexe-2.0.0" - sources."js-sdsl-4.1.5" + sources."js-sdsl-4.3.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-1.0.1" + sources."json5-1.0.2" sources."jsx-ast-utils-3.3.3" sources."language-subtag-registry-0.3.22" sources."language-tags-1.0.5" @@ -143883,11 +140914,12 @@ in sources."loose-envify-1.4.0" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."ms-2.0.0" + sources."ms-2.1.3" sources."natural-compare-1.4.0" sources."no-cliches-0.3.4" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" + sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.4" sources."object.entries-1.1.6" @@ -143906,10 +140938,10 @@ in sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" sources."prop-types-15.8.1" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."react-is-16.13.1" - sources."regenerator-runtime-0.13.10" + sources."regenerator-runtime-0.13.11" sources."regexp.prototype.flags-1.4.3" sources."regexpp-3.2.0" sources."resolve-1.22.1" @@ -143922,21 +140954,23 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" - sources."string.prototype.matchall-4.0.7" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" + sources."stop-iteration-iterator-1.0.0" + sources."string.prototype.matchall-4.0.8" + sources."string.prototype.trimend-1.0.6" + sources."string.prototype.trimstart-1.0.6" sources."strip-ansi-6.0.1" sources."strip-bom-3.0.0" sources."strip-json-comments-3.1.1" - sources."structured-source-3.0.2" + sources."structured-source-4.0.0" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."text-table-0.2.0" - sources."textlint-rule-helper-2.2.3" + sources."textlint-rule-helper-2.3.0" sources."too-wordy-0.3.4" sources."tsconfig-paths-3.14.1" sources."type-check-0.4.0" sources."type-fest-0.20.2" + sources."typed-array-length-1.0.4" sources."unbox-primitive-1.0.2" sources."unist-util-is-4.1.0" sources."unist-util-visit-2.0.3" @@ -143945,6 +140979,8 @@ in sources."weasel-words-0.1.1" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" + sources."which-collection-1.0.1" + sources."which-typed-array-1.1.9" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-good-1.0.8" @@ -143974,13 +141010,13 @@ in 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/cacheable-request-6.0.3" sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.12" + sources."@types/cors-2.8.13" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-4.2.0" - sources."@types/node-18.11.9" + sources."@types/keyv-3.1.4" + sources."@types/node-18.11.18" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -144003,7 +141039,7 @@ in sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."backoff-2.5.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -144040,7 +141076,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.26.0" + sources."core-js-3.27.2" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -144080,7 +141116,7 @@ in sources."ms-2.1.2" ]; }) - sources."engine.io-parser-5.0.4" + sources."engine.io-parser-5.0.6" sources."entities-2.2.0" sources."env-paths-2.2.1" sources."escape-html-1.0.3" @@ -144102,11 +141138,15 @@ in sources."form-data-2.3.3" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-minipass-2.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-3.0.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -144122,7 +141162,7 @@ in sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-1.8.1" sources."http-signature-1.2.0" sources."http2-wrapper-1.0.3" @@ -144169,7 +141209,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.5.1" + sources."keyv-4.5.2" sources."ldap-filter-0.3.3" sources."ldapjs-2.3.1" sources."linkify-it-3.0.3" @@ -144192,14 +141232,18 @@ in sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-3.3.5" - sources."minizlib-2.1.2" + sources."minipass-4.0.0" + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."mkdirp-1.0.4" sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."negotiator-0.6.3" sources."node-addon-api-4.3.0" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."node-forge-1.3.0" (sources."node-gyp-7.1.2" // { dependencies = [ @@ -144216,7 +141260,7 @@ in sources."strip-ansi-3.0.1" ]; }) - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."nopt-5.0.0" sources."normalize-url-6.1.0" sources."npmlog-5.0.1" @@ -144243,7 +141287,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.9.7" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -144253,7 +141297,7 @@ in sources."read-chunk-3.2.0" sources."readable-stream-3.6.0" sources."readable-web-to-node-stream-3.0.2" - sources."regenerator-runtime-0.13.10" + sources."regenerator-runtime-0.13.11" sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" (sources."request-2.88.2" // { @@ -144303,7 +141347,7 @@ in sources."strip-outer-1.0.1" sources."strtok3-6.3.0" sources."supports-color-7.2.0" - sources."tar-6.1.12" + sources."tar-6.1.13" sources."text-decoding-1.0.0" sources."tlds-1.228.0" sources."toidentifier-1.0.1" @@ -144311,7 +141355,7 @@ in sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -144368,13 +141412,13 @@ in 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/cacheable-request-6.0.3" sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.12" + sources."@types/cors-2.8.13" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-4.2.0" - sources."@types/node-18.11.9" + sources."@types/keyv-3.1.4" + sources."@types/node-18.11.18" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -144397,7 +141441,7 @@ in sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."backoff-2.5.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -144434,7 +141478,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.26.0" + sources."core-js-3.27.2" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -144474,7 +141518,7 @@ in sources."ms-2.1.2" ]; }) - sources."engine.io-parser-5.0.4" + sources."engine.io-parser-5.0.6" sources."entities-2.2.0" sources."env-paths-2.2.1" sources."escape-html-1.0.3" @@ -144496,11 +141540,15 @@ in sources."form-data-2.3.3" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-minipass-2.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-3.0.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -144516,7 +141564,7 @@ in sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-1.8.1" sources."http-signature-1.2.0" sources."http2-wrapper-1.0.3" @@ -144563,7 +141611,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.5.1" + sources."keyv-4.5.2" sources."ldap-filter-0.3.3" sources."ldapjs-2.3.1" sources."linkify-it-3.0.3" @@ -144586,14 +141634,18 @@ in sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-3.3.5" - sources."minizlib-2.1.2" + sources."minipass-4.0.0" + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."mkdirp-1.0.4" sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."negotiator-0.6.3" sources."node-addon-api-4.3.0" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."node-forge-1.3.0" (sources."node-gyp-7.1.2" // { dependencies = [ @@ -144610,7 +141662,7 @@ in sources."strip-ansi-3.0.1" ]; }) - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."nopt-5.0.0" sources."normalize-url-6.1.0" sources."npmlog-5.0.1" @@ -144637,7 +141689,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.9.7" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -144647,7 +141699,7 @@ in sources."read-chunk-3.2.0" sources."readable-stream-3.6.0" sources."readable-web-to-node-stream-3.0.2" - sources."regenerator-runtime-0.13.10" + sources."regenerator-runtime-0.13.11" sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" (sources."request-2.88.2" // { @@ -144697,7 +141749,7 @@ in sources."strip-outer-1.0.1" sources."strtok3-6.3.0" sources."supports-color-7.2.0" - sources."tar-6.1.12" + sources."tar-6.1.13" sources."text-decoding-1.0.0" sources."thelounge-4.3.1" sources."tlds-1.228.0" @@ -144706,7 +141758,7 @@ in sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -144789,7 +141841,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."axios-0.19.2" sources."backo2-1.0.2" sources."backoff-2.5.0" @@ -144844,7 +141896,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.26.0" + sources."core-js-3.27.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -144922,7 +141974,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-2.7.4" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -144938,7 +141990,7 @@ in sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."htmlparser2-3.10.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -145021,7 +142073,7 @@ in ]; }) sources."negotiator-0.6.3" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."semver-5.7.1" @@ -145038,7 +142090,7 @@ in sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-component-0.0.3" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."on-finished-2.3.0" sources."once-1.4.0" sources."os-homedir-1.0.2" @@ -145061,7 +142113,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" @@ -145069,7 +142121,7 @@ in sources."read-1.0.7" sources."read-chunk-3.2.0" sources."readable-stream-3.6.0" - sources."regenerator-runtime-0.13.10" + sources."regenerator-runtime-0.13.11" sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" (sources."request-2.88.2" // { @@ -145110,7 +142162,7 @@ in sources."base64-arraybuffer-0.1.5" sources."debug-4.1.1" sources."ms-2.1.3" - (sources."socket.io-parser-3.3.2" // { + (sources."socket.io-parser-3.3.3" // { dependencies = [ sources."component-emitter-1.3.0" sources."debug-3.1.0" @@ -145119,7 +142171,7 @@ in }) ]; }) - (sources."socket.io-parser-3.4.1" // { + (sources."socket.io-parser-3.4.2" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.3" @@ -145408,10 +142460,10 @@ in thelounge-theme-dracula-official = nodeEnv.buildNodePackage { name = "thelounge-theme-dracula-official"; packageName = "thelounge-theme-dracula-official"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/thelounge-theme-dracula-official/-/thelounge-theme-dracula-official-1.0.4.tgz"; - sha512 = "JrnsvHIOcDBNHI4uJDoy3+H34hvfXivFWuUjIlyYd9pzUBWSny8YCiUstm+fem45kwgbPSMTgUdh5LS6OZNoFA=="; + url = "https://registry.npmjs.org/thelounge-theme-dracula-official/-/thelounge-theme-dracula-official-1.0.6.tgz"; + sha512 = "qE766FfvCWm35vRWx686/C0RU2cbWiwKWkAZoW0BOrVarg1P+G3Dq6neQPbAE/pJTwSyAXz8N9oCdvr7knYZKw=="; }; buildInputs = globalBuildInputs; meta = { @@ -145435,10 +142487,10 @@ in sources."@sindresorhus/is-3.1.2" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" - sources."@types/cacheable-request-6.0.2" + sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-4.2.0" - sources."@types/node-18.11.9" + sources."@types/keyv-3.1.4" + sources."@types/node-18.11.18" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -145474,7 +142526,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."backo2-1.0.2" sources."backoff-2.5.0" sources."balanced-match-1.0.2" @@ -145519,7 +142571,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.26.0" + sources."core-js-3.27.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -145605,7 +142657,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-3.10.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -145653,7 +142705,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.5.1" + sources."keyv-4.5.2" sources."ldap-filter-0.3.3" sources."ldapjs-2.1.1" sources."linkify-it-3.0.2" @@ -145695,7 +142747,7 @@ in sources."tar-2.2.2" ]; }) - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."semver-5.7.1" @@ -145758,7 +142810,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.7.0" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -145768,7 +142820,7 @@ in sources."read-chunk-3.2.0" sources."readable-stream-3.6.0" sources."readable-web-to-node-stream-2.0.0" - sources."regenerator-runtime-0.13.10" + sources."regenerator-runtime-0.13.11" sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" (sources."request-2.88.2" // { @@ -145805,7 +142857,7 @@ in sources."base64-arraybuffer-0.1.5" sources."debug-4.1.1" sources."ms-2.1.3" - (sources."socket.io-parser-3.3.2" // { + (sources."socket.io-parser-3.3.3" // { dependencies = [ sources."component-emitter-1.3.0" sources."debug-3.1.0" @@ -145814,7 +142866,7 @@ in }) ]; }) - (sources."socket.io-parser-3.4.1" // { + (sources."socket.io-parser-3.4.2" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.3" @@ -145903,10 +142955,10 @@ in sources."@sindresorhus/is-3.1.2" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" - sources."@types/cacheable-request-6.0.2" + sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-4.2.0" - sources."@types/node-18.11.9" + sources."@types/keyv-3.1.4" + sources."@types/node-18.11.18" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -145942,7 +142994,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."backo2-1.0.2" sources."backoff-2.5.0" sources."balanced-match-1.0.2" @@ -145987,7 +143039,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.26.0" + sources."core-js-3.27.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -146073,7 +143125,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-3.10.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -146121,7 +143173,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.5.1" + sources."keyv-4.5.2" sources."ldap-filter-0.3.3" sources."ldapjs-2.1.1" sources."linkify-it-3.0.2" @@ -146163,7 +143215,7 @@ in sources."tar-2.2.2" ]; }) - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."semver-5.7.1" @@ -146226,7 +143278,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.7.0" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -146236,7 +143288,7 @@ in sources."read-chunk-3.2.0" sources."readable-stream-3.6.0" sources."readable-web-to-node-stream-2.0.0" - sources."regenerator-runtime-0.13.10" + sources."regenerator-runtime-0.13.11" sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" (sources."request-2.88.2" // { @@ -146273,7 +143325,7 @@ in sources."base64-arraybuffer-0.1.5" sources."debug-4.1.1" sources."ms-2.1.3" - (sources."socket.io-parser-3.3.2" // { + (sources."socket.io-parser-3.3.3" // { dependencies = [ sources."component-emitter-1.3.0" sources."debug-3.1.0" @@ -146282,7 +143334,7 @@ in }) ]; }) - (sources."socket.io-parser-3.4.1" // { + (sources."socket.io-parser-3.4.2" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.3" @@ -146524,10 +143576,10 @@ in thelounge-theme-new-morning = nodeEnv.buildNodePackage { name = "thelounge-theme-new-morning"; packageName = "thelounge-theme-new-morning"; - version = "1.0.13"; + version = "1.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/thelounge-theme-new-morning/-/thelounge-theme-new-morning-1.0.13.tgz"; - sha512 = "FTkPBm8eorl6ie5oftn1lZiAYeWK7RZ3vdrKrXOL2XJTUcB8crlOSpWfYfB7LUP3um5oUClgeO5Ojv8qiyBaPw=="; + url = "https://registry.npmjs.org/thelounge-theme-new-morning/-/thelounge-theme-new-morning-1.0.16.tgz"; + sha512 = "YKQG+Y04msf0GyairuA0z0EUXKhtX0KsIVShLQ3tkaaVx4+AF1m551tPgC/wZk8LyMacJXOow5EBNNWFgkKWxQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -146542,10 +143594,10 @@ in thelounge-theme-new-morning-compact = nodeEnv.buildNodePackage { name = "thelounge-theme-new-morning-compact"; packageName = "thelounge-theme-new-morning-compact"; - version = "1.0.6"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/thelounge-theme-new-morning-compact/-/thelounge-theme-new-morning-compact-1.0.6.tgz"; - sha512 = "Eu9Uw1fopBbIts7JahXXwmlTvg8Ax7+Y/6Jz5NTeg3nLG/S/8/GfJ7QDRSWLvtWrRm0LaZkeeXSQqaUhWWacWQ=="; + url = "https://registry.npmjs.org/thelounge-theme-new-morning-compact/-/thelounge-theme-new-morning-compact-1.0.10.tgz"; + sha512 = "5/p3szC7eXwq7x7wPlDgtlLdJ3i7WRYwgxNj5YJVLQCu+3uPVmkd1nRgc8TfTAO2jKSDeODHVkQgnISlNsXVcQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -146758,10 +143810,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.146.0"; + version = "0.149.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.146.0.tgz"; - sha512 = "1lvNfLezN6OJ9NaFAhfX4sm5e9YCzHtaRgZ1+B4C+Hv6TibRMsuBAM5/wVKzxjpYIlMymvgsHEFrrigEfXnb2A=="; + url = "https://registry.npmjs.org/three/-/three-0.149.0.tgz"; + sha512 = "tohpUxPDht0qExRLDTM8sjRLc5d9STURNrdnK3w9A+V4pxaTBfKWWT/IqtiLfg23Vfc3Z+ImNfvRw1/0CtxrkQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -146776,10 +143828,10 @@ in tiddlywiki = nodeEnv.buildNodePackage { name = "tiddlywiki"; packageName = "tiddlywiki"; - version = "5.2.3"; + version = "5.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.2.3.tgz"; - sha512 = "kf09XBI0bswr27pM6WBj/Vek4ATle83HwAtg8rPqJ8cjcC2/xX2SLEamiT8q4AAexjDDlQA05IlcPhhGtF0j6A=="; + url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.2.5.tgz"; + sha512 = "Xfq9NHxAwg2UvCimbtZWWqZyfUpVyq1w+tfb0vMrx3wyWK3VZD1hogJTN1a5qBNyvD9d+WmpZkCw/xN5smRzLQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -146802,10 +143854,10 @@ in dependencies = [ sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" - sources."@types/cacheable-request-6.0.2" + sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-4.2.0" - sources."@types/node-18.11.9" + sources."@types/keyv-3.1.4" + sources."@types/node-18.11.18" sources."@types/responselike-1.0.0" sources."@xmldom/xmldom-0.8.6" sources."ajv-6.12.6" @@ -146815,7 +143867,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."balanced-match-1.0.2" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" @@ -146857,11 +143909,11 @@ in sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.2.3" - sources."got-11.8.5" + sources."got-11.8.6" sources."graceful-fs-4.2.10" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-signature-1.2.0" sources."http2-wrapper-1.0.3" sources."humanize-0.0.9" @@ -146877,7 +143929,7 @@ in sources."jsonfile-6.1.0" sources."jsprim-1.4.2" sources."keypress-0.2.1" - sources."keyv-4.5.1" + sources."keyv-4.5.2" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."mime-db-1.52.0" @@ -146886,7 +143938,7 @@ in sources."minimatch-3.1.2" sources."minimist-1.2.7" sources."mkdirp-0.5.6" - sources."node-appc-1.1.5" + sources."node-appc-1.1.6" sources."normalize-url-6.1.0" sources."oauth-sign-0.9.0" sources."once-1.4.0" @@ -146896,7 +143948,7 @@ in sources."performance-now-2.1.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."quick-lru-5.1.1" (sources."request-2.88.2" // { @@ -146924,7 +143976,7 @@ in sources."tweetnacl-0.14.5" sources."universalify-2.0.0" sources."uri-js-4.4.1" - sources."uuid-8.3.2" + sources."uuid-9.0.0" sources."verror-1.10.0" (sources."winston-2.4.6" // { dependencies = [ @@ -146948,10 +144000,10 @@ in triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "7.15.1"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-7.15.1.tgz"; - sha512 = "K+tUAaVfg1pAD/M9tWB7JsFLv6P5I6J1oLDxLjx1SyrpSGZ5HscDR2d8p+OMuiDMFsUT1NbLSS55qhzhVuyt4A=="; + url = "https://registry.npmjs.org/triton/-/triton-7.15.3.tgz"; + sha512 = "7TyX7uCaNOa9H3YbQItJ7iHU3uwlvzufbPy0DAOA5dEr75d2pmXAfmPwyNPvGQTD8ZBOggO+J5qMjdUN6w0AKA=="; }; dependencies = [ sources."asn1-0.2.6" @@ -147139,8 +144191,8 @@ in ]; buildInputs = globalBuildInputs; meta = { - description = "Joyent Triton CLI and client (https://www.joyent.com/triton)"; - homepage = "https://github.com/joyent/node-triton"; + description = "Triton CLI and client (https://www.tritondatacenter.com/)"; + homepage = "https://github.com/TritonDataCenter/node-triton"; license = "MPL-2.0"; }; production = true; @@ -147183,7 +144235,7 @@ in sources."supports-color-2.0.0" sources."temp-0.8.4" sources."tslib-1.14.1" - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" ]; @@ -147210,30 +144262,30 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.14" - sources."@swc/core-darwin-arm64-1.3.14" - sources."@swc/core-darwin-x64-1.3.14" - sources."@swc/core-linux-arm-gnueabihf-1.3.14" - sources."@swc/core-linux-arm64-gnu-1.3.14" - sources."@swc/core-linux-arm64-musl-1.3.14" - sources."@swc/core-linux-x64-gnu-1.3.14" - sources."@swc/core-linux-x64-musl-1.3.14" - sources."@swc/core-win32-arm64-msvc-1.3.14" - sources."@swc/core-win32-ia32-msvc-1.3.14" - sources."@swc/core-win32-x64-msvc-1.3.14" - sources."@swc/wasm-1.3.14" + sources."@swc/core-1.3.30" + sources."@swc/core-darwin-arm64-1.3.30" + sources."@swc/core-darwin-x64-1.3.30" + sources."@swc/core-linux-arm-gnueabihf-1.3.30" + sources."@swc/core-linux-arm64-gnu-1.3.30" + sources."@swc/core-linux-arm64-musl-1.3.30" + sources."@swc/core-linux-x64-gnu-1.3.30" + sources."@swc/core-linux-x64-musl-1.3.30" + sources."@swc/core-win32-arm64-msvc-1.3.30" + sources."@swc/core-win32-ia32-msvc-1.3.30" + sources."@swc/core-win32-x64-msvc-1.3.30" + sources."@swc/wasm-1.3.30" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.11.9" - sources."acorn-8.8.1" + sources."@types/node-18.11.18" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" sources."create-require-1.1.1" sources."diff-4.0.2" sources."make-error-1.3.6" - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."v8-compile-cache-lib-3.0.1" sources."yn-3.1.1" ]; @@ -147271,10 +144323,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.8.4"; + version = "4.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz"; - sha512 = "QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz"; + sha512 = "Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg=="; }; buildInputs = globalBuildInputs; meta = { @@ -147289,48 +144341,11 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "2.1.0"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-2.1.0.tgz"; - sha512 = "4l/pEcIauf48Mbojqhis+HLH42HpFtNbrYgXbvaDi4Szkk3iKKZa1ydoj2qk1y6+Bp1Rq18EdubitxGhwj/flA=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-3.0.3.tgz"; + sha512 = "7FQOXbyWQOnRmOujX/Td2/mBICLuDaVdecALzwx5x7CreV5/GL8+o1KLIMvS7D3/OShV0CiRGmkNmF3Y5L/pdg=="; }; - dependencies = [ - sources."commander-9.4.1" - (sources."crypto-random-string-4.0.0" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) - sources."deepmerge-4.2.2" - sources."find-up-6.3.0" - sources."fs-extra-10.1.0" - sources."graceful-fs-4.2.10" - sources."is-stream-3.0.0" - sources."isexe-2.0.0" - sources."jsonfile-6.1.0" - sources."locate-path-7.1.1" - sources."lru-cache-6.0.0" - sources."p-debounce-4.0.0" - sources."p-limit-4.0.0" - sources."p-locate-6.0.0" - sources."path-exists-5.0.0" - sources."pkg-up-4.0.0" - sources."semver-7.3.8" - sources."temp-dir-2.0.0" - sources."tempy-3.0.0" - sources."type-fest-2.19.0" - sources."unique-string-3.0.0" - sources."universalify-2.0.0" - sources."vscode-jsonrpc-8.0.2" - sources."vscode-languageserver-8.0.2" - sources."vscode-languageserver-protocol-3.17.2" - sources."vscode-languageserver-textdocument-1.0.7" - sources."vscode-languageserver-types-3.17.2" - sources."vscode-uri-3.0.6" - sources."which-2.0.2" - sources."yallist-4.0.0" - sources."yocto-queue-1.0.0" - ]; buildInputs = globalBuildInputs; meta = { description = "Language Server Protocol (LSP) implementation for TypeScript using tsserver"; @@ -147379,24 +144394,24 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.5.22"; + version = "1.5.23"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.5.22.tgz"; - sha512 = "zLD9pr4aFn0wzP31xUyag5jpaWmjJHEBp5+xdOC5j0PgmacgKn+PloZYg2rB1rQ/zmOJTo5nOYhkNAoledz9ZA=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.5.23.tgz"; + sha512 = "3FJW6C12Cn71UiRPTUKmyUYy4qPrJjY7El8bEMqOvakn6knHMuPuM7ijOiNGm7nfKdsRY95gR7pDveqULd367w=="; }; dependencies = [ sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" - sources."@pnpm/network.ca-file-1.0.1" + sources."@pnpm/network.ca-file-1.0.2" sources."@pnpm/npm-conf-1.0.5" - sources."@primer/octicons-17.8.0" + sources."@primer/octicons-17.10.2" sources."@sindresorhus/is-5.3.0" sources."@socket.io/component-emitter-3.1.0" sources."@szmarczak/http-timer-5.0.1" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.12" + sources."@types/cors-2.8.13" sources."@types/http-cache-semantics-4.0.1" - sources."@types/node-16.18.3" + sources."@types/node-16.18.11" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -147454,7 +144469,7 @@ in sources."builtin-status-codes-3.0.0" sources."bytes-3.1.2" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.2" + sources."cacheable-request-10.2.5" sources."cached-path-relative-1.1.0" sources."call-bind-1.0.2" sources."cipher-base-1.0.4" @@ -147509,7 +144524,7 @@ in sources."destroy-1.2.0" sources."detective-5.2.1" sources."diff-5.1.0" - sources."diff2html-3.4.22" + sources."diff2html-3.4.31" (sources."diffie-hellman-5.0.3" // { dependencies = [ sources."bn.js-4.12.0" @@ -147527,13 +144542,13 @@ in sources."emoji-regex-8.0.0" sources."enabled-2.0.0" sources."encodeurl-1.0.2" - (sources."engine.io-6.2.0" // { + (sources."engine.io-6.2.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."engine.io-parser-5.0.4" + sources."engine.io-parser-5.0.6" sources."error-ex-1.3.2" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -147556,19 +144571,19 @@ in sources."finalhandler-1.2.0" sources."fn.name-1.1.0" sources."for-each-0.3.3" - sources."form-data-encoder-2.1.3" + sources."form-data-encoder-2.1.4" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-6.0.1" sources."getmac-5.20.0" sources."glob-7.2.3" sources."gopd-1.0.1" - sources."got-12.5.2" + sources."got-12.5.3" sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-symbols-1.0.3" @@ -147587,13 +144602,13 @@ in ]; }) sources."htmlescape-1.1.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" - sources."http2-wrapper-2.1.11" + sources."http2-wrapper-2.2.0" sources."https-browserify-1.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -147613,12 +144628,12 @@ in sources."is-utf8-0.2.1" sources."is-wsl-2.2.0" sources."isarray-1.0.0" - sources."jquery-3.6.1" + sources."jquery-3.6.3" sources."jquery-ui-1.13.2" sources."json-buffer-3.0.1" sources."jsonparse-1.3.1" sources."just-detect-adblock-1.1.0" - sources."keyv-4.5.1" + sources."keyv-4.5.2" sources."knockout-3.5.1" sources."kuler-2.0.0" sources."labeled-stream-splicer-2.0.2" @@ -147655,20 +144670,20 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."mkdirp-1.0.4" + sources."mkdirp-2.1.3" sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.3" sources."moment-2.29.4" sources."ms-2.0.0" sources."negotiator-0.6.3" sources."node-cache-5.1.2" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."node-watch-0.7.3" sources."nopt-1.0.10" - sources."normalize-url-7.2.0" + sources."normalize-url-8.0.0" sources."nprogress-0.2.0" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -147727,10 +144742,10 @@ in sources."resolve-1.22.1" sources."resolve-alpn-1.2.1" sources."responselike-3.0.0" - sources."rimraf-3.0.2" + sources."rimraf-4.1.2" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-2.4.1" + sources."safe-stable-stringify-2.4.2" sources."safer-buffer-2.1.2" (sources."semver-7.3.8" // { dependencies = [ @@ -147757,14 +144772,14 @@ in ]; }) sources."snapsvg-0.5.1" - (sources."socket.io-4.5.3" // { + (sources."socket.io-4.5.4" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."socket.io-adapter-2.4.0" - (sources."socket.io-parser-4.2.1" // { + (sources."socket.io-parser-4.2.2" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -147818,7 +144833,7 @@ in sources."tty-browserify-0.0.1" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."uid-safe-2.1.5" sources."umd-3.0.3" sources."undeclared-identifiers-1.1.3" @@ -147877,24 +144892,23 @@ in sources."@babel/code-frame-7.18.6" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@npmcli/config-4.2.2" - sources."@npmcli/map-workspaces-2.0.4" - sources."@npmcli/name-from-folder-1.0.1" + sources."@npmcli/config-6.1.1" + sources."@npmcli/map-workspaces-3.0.1" + sources."@npmcli/name-from-folder-2.0.0" sources."@types/concat-stream-2.0.0" sources."@types/debug-4.1.7" sources."@types/is-empty-1.2.1" sources."@types/ms-0.7.31" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" - sources."abbrev-1.1.1" + sources."abbrev-2.0.0" sources."ansi-regex-6.0.1" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" sources."buffer-from-1.1.2" sources."chalk-2.4.2" - sources."chownr-2.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-stream-2.0.0" @@ -147907,11 +144921,10 @@ in sources."find-up-6.3.0" sources."format-0.2.2" sources."fs.realpath-1.0.0" - sources."glob-8.0.3" + sources."glob-8.1.0" sources."has-flag-3.0.0" - sources."ignore-5.2.0" - sources."import-meta-resolve-2.1.0" - sources."infer-owner-1.0.4" + sources."ignore-5.2.4" + sources."import-meta-resolve-2.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-3.0.1" @@ -147920,24 +144933,26 @@ in sources."is-empty-1.2.0" sources."is-plain-obj-4.1.0" sources."js-tokens-4.0.0" - sources."json-parse-even-better-errors-2.3.1" + sources."json-parse-even-better-errors-3.0.0" sources."lines-and-columns-2.0.3" - sources."load-plugin-5.0.0" + sources."load-plugin-5.1.0" sources."locate-path-7.1.1" sources."lru-cache-6.0.0" - sources."minimatch-5.1.0" - sources."mkdirp-1.0.4" - sources."mkdirp-infer-owner-2.0.0" + sources."minimatch-5.1.6" sources."ms-2.1.2" - sources."nopt-6.0.0" - sources."npm-normalize-package-bin-1.0.1" + sources."nopt-7.0.0" + sources."npm-normalize-package-bin-3.0.0" sources."once-1.4.0" sources."p-limit-4.0.0" sources."p-locate-6.0.0" - sources."parse-json-6.0.2" + (sources."parse-json-6.0.2" // { + dependencies = [ + sources."json-parse-even-better-errors-2.3.1" + ]; + }) sources."path-exists-5.0.0" - sources."proc-log-2.0.1" - sources."read-package-json-fast-2.0.3" + sources."proc-log-3.0.0" + sources."read-package-json-fast-3.0.2" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" sources."semver-7.3.8" @@ -147948,15 +144963,15 @@ in sources."to-vfile-7.2.3" sources."trough-2.1.0" sources."typedarray-0.0.6" - sources."unified-engine-10.0.1" - sources."unist-util-inspect-7.0.1" - sources."unist-util-stringify-position-3.0.2" + sources."unified-engine-10.1.0" + sources."unist-util-inspect-7.0.2" + sources."unist-util-stringify-position-3.0.3" sources."util-deprecate-1.0.2" - sources."vfile-5.3.5" - sources."vfile-message-3.1.2" + sources."vfile-5.3.6" + sources."vfile-message-3.1.3" (sources."vfile-reporter-7.0.4" // { dependencies = [ - sources."supports-color-9.2.3" + sources."supports-color-9.3.1" ]; }) sources."vfile-sort-3.0.0" @@ -147964,12 +144979,12 @@ in sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" sources."vscode-languageserver-protocol-3.17.2" - sources."vscode-languageserver-textdocument-1.0.7" + sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-languageserver-types-3.17.2" sources."walk-up-path-1.0.0" sources."wrappy-1.0.2" sources."yallist-4.0.0" - sources."yaml-2.1.3" + sources."yaml-2.2.1" sources."yocto-queue-1.0.0" ]; buildInputs = globalBuildInputs; @@ -148001,7 +145016,7 @@ in sources."are-we-there-yet-2.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."canvas-2.10.2" + sources."canvas-2.11.0" sources."chownr-2.0.0" sources."cliui-8.0.1" sources."color-convert-2.0.1" @@ -148010,22 +145025,22 @@ in sources."commander-7.2.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."d3-array-3.2.0" + sources."d3-array-3.2.2" sources."d3-color-3.1.0" 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-3.1.0" sources."d3-geo-projection-4.0.0" sources."d3-hierarchy-3.1.2" sources."d3-interpolate-3.0.1" - sources."d3-path-3.0.1" + sources."d3-path-3.1.0" 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-shape-3.2.0" + sources."d3-time-3.1.0" sources."d3-time-format-4.1.0" sources."d3-timer-3.0.1" sources."debug-4.3.4" @@ -148036,7 +145051,11 @@ in sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."escalade-3.1.1" - sources."fs-minipass-2.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."fs.realpath-1.0.0" sources."gauge-3.0.2" sources."get-caller-file-2.0.5" @@ -148056,12 +145075,16 @@ in }) sources."mimic-response-2.1.0" sources."minimatch-3.1.2" - sources."minipass-3.3.5" - sources."minizlib-2.1.2" + sources."minipass-4.0.0" + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."nan-2.17.0" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."nopt-5.0.0" sources."npmlog-5.0.1" sources."object-assign-4.1.1" @@ -148082,7 +145105,7 @@ in sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" - sources."tar-6.1.12" + sources."tar-6.1.13" (sources."topojson-client-3.1.0" // { dependencies = [ sources."commander-2.20.3" @@ -148162,22 +145185,22 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-7.2.0" - sources."d3-array-3.2.0" + sources."d3-array-3.2.2" sources."d3-color-3.1.0" 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-3.1.0" sources."d3-geo-projection-4.0.0" sources."d3-hierarchy-3.1.2" sources."d3-interpolate-3.0.1" - sources."d3-path-3.0.1" + sources."d3-path-3.1.0" 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-shape-3.2.0" + sources."d3-time-3.1.0" sources."d3-time-format-4.1.0" sources."d3-timer-3.0.1" sources."delaunator-5.0.0" @@ -148191,7 +145214,7 @@ in sources."internmap-2.0.3" sources."is-fullwidth-code-point-3.0.0" sources."json-stringify-pretty-compact-3.0.0" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."require-directory-2.1.1" sources."robust-predicates-3.0.1" sources."rw-1.3.3" @@ -148259,15 +145282,42 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "28.4.14"; + version = "28.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-28.4.14.tgz"; - sha512 = "Jjtz6RAPhAHGKSnN+vUSlxOqfMESeex7XW9tKZwMlapSy/lI/fIzPJCWq/oNdDTU/0GEs0p/c7FASavR0XqsRQ=="; + url = "https://registry.npmjs.org/vercel/-/vercel-28.14.0.tgz"; + sha512 = "WMAWwJpj7zxPyMpnpEB4ofsu6ERvjXxzjtsd7AfzNBrgRZ88yBZ3yW5vKHPTVnEtJX8BvGq5o5lBQJOKlm2nfg=="; }; dependencies = [ + sources."@babel/runtime-7.12.1" + sources."@cspotcode/source-map-support-0.8.1" sources."@edge-runtime/format-1.1.0" sources."@edge-runtime/primitives-2.0.0" sources."@edge-runtime/vm-2.0.0" + sources."@esbuild/android-arm-0.16.17" + sources."@esbuild/android-arm64-0.16.17" + sources."@esbuild/android-x64-0.16.17" + sources."@esbuild/darwin-arm64-0.16.17" + sources."@esbuild/darwin-x64-0.16.17" + sources."@esbuild/freebsd-arm64-0.16.17" + sources."@esbuild/freebsd-x64-0.16.17" + sources."@esbuild/linux-arm-0.16.17" + sources."@esbuild/linux-arm64-0.16.17" + sources."@esbuild/linux-ia32-0.16.17" + sources."@esbuild/linux-loong64-0.16.17" + sources."@esbuild/linux-mips64el-0.16.17" + sources."@esbuild/linux-ppc64-0.16.17" + sources."@esbuild/linux-riscv64-0.16.17" + sources."@esbuild/linux-s390x-0.16.17" + sources."@esbuild/linux-x64-0.16.17" + sources."@esbuild/netbsd-x64-0.16.17" + sources."@esbuild/openbsd-x64-0.16.17" + sources."@esbuild/sunos-x64-0.16.17" + sources."@esbuild/win32-arm64-0.16.17" + sources."@esbuild/win32-ia32-0.16.17" + sources."@esbuild/win32-x64-0.16.17" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.9" (sources."@mapbox/node-pre-gyp-1.0.10" // { dependencies = [ sources."semver-7.3.8" @@ -148276,81 +145326,80 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" + sources."@rollup/pluginutils-4.2.1" + sources."@swc/core-1.3.30" + sources."@swc/core-darwin-arm64-1.3.30" + sources."@swc/core-darwin-x64-1.3.30" + sources."@swc/core-linux-arm-gnueabihf-1.3.30" + sources."@swc/core-linux-arm64-gnu-1.3.30" + sources."@swc/core-linux-arm64-musl-1.3.30" + sources."@swc/core-linux-x64-gnu-1.3.30" + sources."@swc/core-linux-x64-musl-1.3.30" + sources."@swc/core-win32-arm64-msvc-1.3.30" + sources."@swc/core-win32-ia32-msvc-1.3.30" + sources."@swc/core-win32-x64-msvc-1.3.30" + sources."@swc/wasm-1.3.30" sources."@ts-morph/common-0.11.1" + sources."@tsconfig/node10-1.0.9" + sources."@tsconfig/node12-1.0.11" + sources."@tsconfig/node14-1.0.3" + sources."@tsconfig/node16-1.0.3" sources."@types/json-schema-7.0.11" - sources."@types/node-18.11.9" - sources."@vercel/build-utils-5.5.7" - sources."@vercel/go-2.2.15" - sources."@vercel/hydrogen-0.0.28" - sources."@vercel/next-3.2.8" - sources."@vercel/nft-0.22.1" - sources."@vercel/node-2.6.1" - sources."@vercel/node-bridge-3.1.1" - sources."@vercel/python-3.1.24" - sources."@vercel/redwood-1.0.33" - sources."@vercel/remix-1.0.34" - (sources."@vercel/routing-utils-2.1.1" // { + sources."@types/node-14.18.33" + sources."@vercel/build-utils-6.0.0" + sources."@vercel/gatsby-plugin-vercel-analytics-1.0.7" + (sources."@vercel/gatsby-plugin-vercel-builder-1.0.2" // { + dependencies = [ + sources."ajv-8.12.0" + sources."esbuild-0.16.17" + ]; + }) + sources."@vercel/go-2.2.31" + sources."@vercel/hydrogen-0.0.45" + sources."@vercel/next-3.3.19" + sources."@vercel/nft-0.22.5" + sources."@vercel/node-2.8.16" + sources."@vercel/node-bridge-3.1.10" + sources."@vercel/python-3.1.41" + sources."@vercel/redwood-1.0.52" + sources."@vercel/remix-1.2.8" + (sources."@vercel/routing-utils-2.1.8" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" ]; }) - sources."@vercel/ruby-1.3.41" - sources."@vercel/static-build-1.0.34" - sources."@vercel/static-config-2.0.5" + sources."@vercel/ruby-1.3.57" + sources."@vercel/static-build-1.3.0" + sources."@vercel/static-config-2.0.11" sources."abbrev-1.1.1" - sources."acorn-8.8.1" + sources."acorn-8.8.2" + sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" sources."ajv-8.6.3" - 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."arg-4.1.3" sources."async-sema-3.1.1" sources."balanced-match-1.0.2" sources."bindings-1.5.0" - sources."boxen-5.1.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-from-1.1.2" - (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."chalk-4.1.2" sources."chownr-2.0.0" - sources."ci-info-2.0.0" - sources."cli-boxes-2.2.1" - sources."clone-response-1.0.3" sources."code-block-writer-10.1.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."color-support-1.1.3" sources."concat-map-0.0.1" - sources."configstore-5.0.1" sources."console-control-strings-1.1.0" sources."convert-hrtime-3.0.0" - sources."crypto-random-string-2.0.0" + sources."create-require-1.1.1" 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."delegates-1.0.0" sources."detect-libc-2.0.1" sources."diff-4.0.2" - sources."dot-prop-5.3.0" - sources."duplexer3-0.1.5" sources."edge-runtime-2.0.0" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" - sources."end-of-stream-1.4.4" sources."esbuild-0.14.47" sources."esbuild-android-64-0.14.47" sources."esbuild-android-arm64-0.14.47" @@ -148372,156 +145421,102 @@ in sources."esbuild-windows-32-0.14.47" sources."esbuild-windows-64-0.14.47" sources."esbuild-windows-arm64-0.14.47" - sources."escape-goat-2.1.1" sources."estree-walker-2.0.2" + sources."etag-1.8.1" sources."exit-hook-2.2.1" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" - sources."fs-minipass-2.1.0" + sources."fs-extra-11.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."fs.realpath-1.0.0" sources."gauge-3.0.2" - sources."get-stream-4.1.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."global-dirs-3.0.0" - sources."got-9.6.0" sources."graceful-fs-4.2.10" - sources."has-flag-4.0.0" sources."has-unicode-2.0.1" - sources."has-yarn-2.1.0" - sources."http-cache-semantics-4.1.0" sources."http-status-1.5.3" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" - 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."is-ci-2.0.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" - 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-yarn-global-0.3.0" - sources."json-buffer-3.0.0" sources."json-schema-to-ts-1.6.4" sources."json-schema-traverse-1.0.0" - sources."keyv-3.1.0" - sources."latest-version-5.1.0" - sources."lowercase-keys-1.0.1" + sources."jsonfile-6.1.0" sources."lru-cache-6.0.0" sources."make-dir-3.1.0" sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.5" - sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" - sources."minipass-3.3.5" - sources."minizlib-2.1.2" + sources."minipass-4.0.0" + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."mkdirp-1.0.4" sources."mri-1.2.0" sources."ms-2.1.2" sources."node-fetch-2.6.7" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."nopt-5.0.0" - sources."normalize-url-4.5.1" sources."npmlog-5.0.1" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."p-cancelable-1.1.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) sources."parse-ms-2.1.0" sources."path-browserify-1.0.1" sources."path-is-absolute-1.0.1" sources."path-to-regexp-6.1.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."prepend-http-2.0.0" sources."pretty-bytes-5.6.0" sources."pretty-ms-7.0.1" - sources."pump-3.0.0" - sources."punycode-2.1.1" - sources."pupa-2.1.1" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) sources."readable-stream-3.6.0" - sources."registry-auth-token-4.2.2" - sources."registry-url-5.1.0" + sources."regenerator-runtime-0.13.11" sources."require-from-string-2.0.2" sources."resolve-from-5.0.0" - sources."responselike-1.0.2" sources."reusify-1.0.4" sources."rimraf-3.0.2" - (sources."rollup-pluginutils-2.8.2" // { - dependencies = [ - sources."estree-walker-0.6.1" - ]; - }) sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-6.1.1" - (sources."semver-diff-3.1.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) sources."set-blocking-2.0.0" 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" 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-6.1.12" + sources."tar-6.1.13" sources."time-span-4.0.0" - sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."ts-morph-12.0.0" - sources."ts-node-8.9.1" + sources."ts-node-10.9.1" sources."ts-toolbelt-6.15.5" - sources."type-fest-0.20.2" - sources."typedarray-to-buffer-3.1.5" sources."typescript-4.3.4" - sources."unique-string-2.0.0" - (sources."update-notifier-5.1.0" // { - dependencies = [ - sources."semver-7.3.8" - ]; - }) + sources."universalify-2.0.0" sources."uri-js-4.4.1" - sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" + sources."v8-compile-cache-lib-3.0.1" + sources."web-vitals-0.2.4" 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."yallist-4.0.0" sources."yn-3.1.1" ]; @@ -148538,10 +145533,10 @@ in vim-language-server = nodeEnv.buildNodePackage { name = "vim-language-server"; packageName = "vim-language-server"; - version = "2.2.10"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.2.10.tgz"; - sha512 = "Z98jMgnyPCUKVqLZZhsypCLehpE+FbQZjv20IT+TTeAYDqqX0wGRcvkUsDgcw2x2xc2xKdN1Rgp71WGzydGINg=="; + url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.3.0.tgz"; + sha512 = "8RdW7F4rQDR9FNZqgFRFFsoMdiI9YlszCCPeaU3pPkPJI4Hyx4pXCk6BGy7Fi0ACM7p4RID64dd064snCBZQrw=="; }; buildInputs = globalBuildInputs; meta = { @@ -148648,10 +145643,10 @@ in 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.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globals-13.17.0" + sources."globals-13.20.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.3" @@ -148690,11 +145685,11 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" - sources."prettier-2.7.1" + sources."prettier-2.8.3" sources."progress-2.0.3" sources."pug-error-2.0.0" sources."pug-lexer-5.0.1" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."regexpp-3.2.0" sources."require-from-string-2.0.2" sources."resolve-1.22.1" @@ -148718,7 +145713,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" (sources."table-6.8.1" // { dependencies = [ - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -148734,7 +145729,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" (sources."vue-eslint-parser-7.11.0" // { @@ -148855,10 +145850,10 @@ in sources."vscode-languageserver-types-3.16.0" ]; }) - sources."vscode-languageserver-textdocument-1.0.7" + sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-languageserver-types-3.17.2" sources."vscode-nls-4.1.2" - sources."vscode-uri-3.0.6" + sources."vscode-uri-3.0.7" ]; buildInputs = globalBuildInputs; meta = { @@ -148905,7 +145900,7 @@ in sources."vscode-languageserver-types-3.5.0" ]; }) - sources."vscode-languageserver-textdocument-1.0.7" + sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-nls-2.0.2" sources."vscode-uri-1.0.8" @@ -148929,23 +145924,28 @@ in sha512 = "r8+ZWDHRAnUPQMyZQa2eZzZyYE8wGia3SCL9ZtVjl6S2MLA5l6NVg3z8Atz4nDQ9JPih858bj0vnthGsjhNLjg=="; }; dependencies = [ - sources."core-js-3.26.0" + sources."@vscode/l10n-0.0.11" + sources."core-js-3.27.2" sources."jsonc-parser-3.2.0" sources."picomatch-2.3.1" - sources."regenerator-runtime-0.13.10" + sources."regenerator-runtime-0.13.11" sources."request-light-0.5.8" - sources."typescript-4.8.4" - sources."vscode-css-languageservice-6.1.1" - sources."vscode-html-languageservice-5.0.2" - sources."vscode-json-languageservice-5.1.1" - sources."vscode-jsonrpc-8.1.0-next.1" - sources."vscode-languageserver-8.1.0-next.1" - sources."vscode-languageserver-protocol-3.17.3-next.1" - sources."vscode-languageserver-textdocument-1.0.7" + sources."typescript-4.9.4" + sources."vscode-css-languageservice-6.2.3" + sources."vscode-html-languageservice-5.0.4" + sources."vscode-json-languageservice-5.1.4" + sources."vscode-jsonrpc-8.1.0-next.7" + sources."vscode-languageserver-8.1.0-next.6" + (sources."vscode-languageserver-protocol-3.17.3-next.6" // { + dependencies = [ + sources."vscode-languageserver-types-3.17.3-next.3" + ]; + }) + sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-languageserver-types-3.17.2" sources."vscode-markdown-languageservice-0.2.0" sources."vscode-nls-5.2.0" - sources."vscode-uri-3.0.6" + sources."vscode-uri-3.0.7" ]; buildInputs = globalBuildInputs; meta = { @@ -148980,7 +145980,7 @@ in sources."async-2.6.4" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" @@ -149145,7 +146145,7 @@ in sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."read-metadata-1.0.0" (sources."readable-stream-2.3.7" // { @@ -149245,7 +146245,7 @@ in sha512 = "/dd2bJLxOmX8Ie0EPTlmU+F8cxAekn/1m8K9OAFoijm4fc8SdHznFUUEKuz2RMMhsaL5+rccj8xLFAJELYNbaA=="; }; dependencies = [ - sources."@adobe/css-tools-4.0.1" + sources."@adobe/css-tools-4.1.0" sources."@babel/code-frame-7.18.6" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" @@ -149264,7 +146264,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-18.11.9" + sources."@types/node-18.11.18" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -149290,7 +146290,7 @@ in sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -149438,7 +146438,7 @@ in sources."map-obj-1.0.1" ]; }) - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."deep-is-0.1.4" @@ -149599,7 +146599,7 @@ in sources."hosted-git-info-2.8.9" sources."html-void-elements-1.0.5" sources."html-whitespace-sensitive-tag-names-1.0.3" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."iconv-lite-0.4.24" sources."ignore-3.3.10" (sources."import-fresh-3.3.0" // { @@ -149662,8 +146662,8 @@ in (sources."js-beautify-1.14.7" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-8.0.3" - sources."minimatch-5.1.0" + sources."glob-8.1.0" + sources."minimatch-5.1.6" ]; }) sources."js-tokens-4.0.0" @@ -149672,7 +146672,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.1" + sources."json5-2.2.3" sources."jsonc-parser-1.0.3" sources."keyv-3.1.0" sources."kind-of-6.0.3" @@ -149688,7 +146688,7 @@ in sources."lodash.iteratee-4.7.0" sources."lodash.merge-4.6.2" sources."lodash.unescape-4.0.1" - sources."loglevel-1.8.0" + sources."loglevel-1.8.1" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -149850,7 +146850,7 @@ in sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."quick-lru-1.1.0" sources."rc-1.2.8" sources."read-pkg-3.0.0" @@ -150020,14 +147020,14 @@ in sources."source-map-0.7.4" ]; }) - (sources."stylus-supremacy-2.17.3" // { + (sources."stylus-supremacy-2.17.5" // { dependencies = [ sources."argparse-2.0.1" sources."brace-expansion-2.0.1" sources."debug-4.3.4" - sources."glob-8.0.3" + sources."glob-8.1.0" sources."js-yaml-4.1.0" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" sources."ms-2.1.2" sources."source-map-0.7.4" (sources."stylus-0.59.0" // { @@ -150104,7 +147104,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.2" + sources."unist-util-stringify-position-3.0.3" sources."unist-util-visit-1.4.1" (sources."unist-util-visit-parents-2.1.2" // { dependencies = [ @@ -150136,7 +147136,7 @@ in sources."vfile-message-2.0.4" ]; }) - sources."vfile-message-3.1.2" + sources."vfile-message-3.1.3" (sources."vfile-reporter-6.0.2" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -150159,7 +147159,7 @@ in sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-5.3.0-next.10" sources."vscode-languageserver-protocol-3.17.2" - sources."vscode-languageserver-textdocument-1.0.7" + sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-languageserver-types-3.17.2" sources."vscode-nls-5.2.0" sources."vscode-textbuffer-1.0.0" @@ -150214,199 +147214,130 @@ in wavedrom-cli = nodeEnv.buildNodePackage { name = "wavedrom-cli"; packageName = "wavedrom-cli"; - version = "2.8.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/wavedrom-cli/-/wavedrom-cli-2.8.1.tgz"; - sha512 = "slGcIXCA/j5d2uzQ7flA4/veF0P0eE+Om/Bw7uEO2LC9a3mVNdB+2bSR1CILMjvgyFy9Q9D6eseomQgp7UW5Dg=="; + url = "https://registry.npmjs.org/wavedrom-cli/-/wavedrom-cli-3.1.1.tgz"; + sha512 = "EwAUg6706mBujMLbb4Czhe9Ax5Dw3x64t/X2hn+vIVvVexAANSifVg3yB7ILZmeRSGmv9uYo6kL5J1c/DiGdaw=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.20.1" - sources."@mapbox/node-pre-gyp-1.0.10" - sources."@tootallnate/once-1.1.2" - sources."@types/raf-3.4.0" - sources."abab-2.0.6" - sources."abbrev-1.1.1" - sources."acorn-8.8.1" - (sources."acorn-globals-6.0.0" // { - dependencies = [ - sources."acorn-7.4.1" - ]; - }) - sources."acorn-walk-7.2.0" - sources."agent-base-6.0.2" + sources."@babel/runtime-7.20.13" + sources."@jimp/bmp-0.16.2" + sources."@jimp/core-0.16.2" + sources."@jimp/custom-0.16.2" + sources."@jimp/gif-0.16.2" + sources."@jimp/jpeg-0.16.2" + sources."@jimp/plugin-blit-0.16.2" + sources."@jimp/plugin-blur-0.16.2" + sources."@jimp/plugin-circle-0.16.2" + sources."@jimp/plugin-color-0.16.2" + sources."@jimp/plugin-contain-0.16.2" + sources."@jimp/plugin-cover-0.16.2" + sources."@jimp/plugin-crop-0.16.2" + sources."@jimp/plugin-displace-0.16.2" + sources."@jimp/plugin-dither-0.16.2" + sources."@jimp/plugin-fisheye-0.16.2" + sources."@jimp/plugin-flip-0.16.2" + sources."@jimp/plugin-gaussian-0.16.2" + sources."@jimp/plugin-invert-0.16.2" + sources."@jimp/plugin-mask-0.16.2" + sources."@jimp/plugin-normalize-0.16.2" + sources."@jimp/plugin-print-0.16.2" + sources."@jimp/plugin-resize-0.16.2" + sources."@jimp/plugin-rotate-0.16.2" + sources."@jimp/plugin-scale-0.16.2" + sources."@jimp/plugin-shadow-0.16.2" + sources."@jimp/plugin-threshold-0.16.2" + sources."@jimp/plugins-0.16.2" + sources."@jimp/png-0.16.2" + sources."@jimp/tiff-0.16.2" + sources."@jimp/types-0.16.2" + sources."@jimp/utils-0.16.2" + sources."@resvg/resvg-js-2.2.0" + sources."@resvg/resvg-js-android-arm-eabi-2.2.0" + sources."@resvg/resvg-js-android-arm64-2.2.0" + sources."@resvg/resvg-js-darwin-arm64-2.2.0" + sources."@resvg/resvg-js-darwin-x64-2.2.0" + sources."@resvg/resvg-js-linux-arm-gnueabihf-2.2.0" + sources."@resvg/resvg-js-linux-arm64-gnu-2.2.0" + sources."@resvg/resvg-js-linux-arm64-musl-2.2.0" + sources."@resvg/resvg-js-linux-x64-gnu-2.2.0" + sources."@resvg/resvg-js-linux-x64-musl-2.2.0" + sources."@resvg/resvg-js-win32-arm64-msvc-2.2.0" + sources."@resvg/resvg-js-win32-ia32-msvc-2.2.0" + sources."@resvg/resvg-js-win32-x64-msvc-2.2.0" + sources."@types/node-16.9.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."asynckit-0.4.0" + sources."any-base-1.1.0" sources."atob-2.1.2" - sources."balanced-match-1.0.2" - sources."bit-field-1.6.0" - sources."brace-expansion-1.1.11" - sources."browser-process-hrtime-1.0.0" + sources."base64-js-1.5.1" + (sources."bit-field-1.7.0" // { + dependencies = [ + sources."fs-extra-10.1.0" + ]; + }) + sources."bmp-js-0.1.0" sources."btoa-1.2.1" - sources."bufferutil-4.0.7" - sources."canvas-2.10.2" - sources."canvg-3.0.7" - sources."chownr-2.0.0" + sources."buffer-5.7.1" + sources."buffer-equal-0.0.1" sources."cliui-8.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."combined-stream-1.0.8" - sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."core-js-pure-3.26.0" - sources."cssom-0.4.4" - (sources."cssstyle-2.3.0" // { - dependencies = [ - sources."cssom-0.3.8" - ]; - }) - (sources."data-urls-2.0.0" // { - dependencies = [ - sources."tr46-2.1.0" - sources."webidl-conversions-6.1.0" - sources."whatwg-url-8.7.0" - ]; - }) - sources."debug-4.3.4" - sources."decimal.js-10.4.2" - sources."decompress-response-4.2.1" - sources."deep-is-0.1.4" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."detect-libc-2.0.1" - (sources."domexception-2.0.1" // { - dependencies = [ - sources."webidl-conversions-5.0.0" - ]; - }) + sources."dom-walk-0.1.2" sources."emoji-regex-8.0.0" - sources."encoding-0.1.13" sources."escalade-3.1.1" - sources."escodegen-2.0.0" - sources."esprima-4.0.1" sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."fast-levenshtein-2.0.6" - sources."form-data-3.0.1" - sources."fs-extra-10.1.0" - sources."fs-minipass-2.1.0" - sources."fs.realpath-1.0.0" - sources."gauge-3.0.2" + sources."exif-parser-0.1.12" + sources."file-type-9.0.0" + sources."fs-extra-11.1.0" sources."get-caller-file-2.0.5" - sources."glob-7.2.3" + sources."gifwrap-0.9.4" + sources."global-4.4.0" sources."graceful-fs-4.2.10" - sources."has-unicode-2.0.1" - sources."html-encoding-sniffer-2.0.1" - sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.6.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" + sources."ieee754-1.2.1" + sources."image-q-4.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."is-potential-custom-element-name-1.0.1" - (sources."jsdom-16.7.0" // { - dependencies = [ - sources."tr46-2.1.0" - sources."webidl-conversions-6.1.0" - sources."whatwg-url-8.7.0" - ]; - }) - sources."json5-2.2.1" + sources."is-function-1.0.2" + sources."jimp-0.16.2" + sources."jpeg-js-0.4.4" + sources."json5-2.2.3" sources."jsonfile-6.1.0" - sources."levn-0.3.0" - sources."lodash-4.17.21" + sources."load-bmfont-1.4.1" sources."logidrom-0.3.1" - sources."lru-cache-6.0.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-response-2.1.0" - sources."minimatch-3.1.2" - sources."minipass-3.3.5" - sources."minizlib-2.1.2" - sources."mkdirp-1.0.4" - sources."ms-2.1.2" - sources."nan-2.17.0" - sources."node-fetch-2.6.7" - sources."node-gyp-build-4.5.0" - sources."nopt-5.0.0" - sources."npmlog-5.0.1" - sources."nwsapi-2.2.2" - sources."object-assign-4.1.1" - sources."once-1.4.0" + sources."mime-1.6.0" + sources."min-document-2.19.0" + sources."minimist-1.2.7" + sources."mkdirp-0.5.6" + sources."omggif-1.0.10" sources."onml-2.1.0" - sources."optionator-0.8.3" - sources."parse5-6.0.1" - sources."path-is-absolute-1.0.1" - sources."performance-now-2.1.0" - sources."prelude-ls-1.1.2" - sources."psl-1.9.0" - sources."punycode-2.1.1" - sources."querystringify-2.2.0" - sources."raf-3.4.1" - sources."readable-stream-3.6.0" - sources."regenerator-runtime-0.13.10" + sources."pako-1.0.11" + 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.5" + sources."phin-2.9.3" + sources."pixelmatch-4.0.2" + sources."pngjs-3.4.0" + sources."process-0.11.10" + sources."regenerator-runtime-0.13.11" sources."require-directory-2.1.1" - sources."requires-port-1.0.0" - sources."rgbcolor-1.0.1" - sources."rimraf-3.0.2" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."saxes-5.0.1" - sources."semver-7.3.8" - sources."set-blocking-2.0.0" - sources."signal-exit-3.0.7" - sources."simple-concat-1.0.1" - sources."simple-get-3.1.1" - sources."source-map-0.6.1" - sources."stackblur-canvas-2.5.0" sources."string-width-4.2.3" - sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" - sources."svg-pathdata-5.0.5" - sources."svg2img-0.9.4" - sources."symbol-tree-3.2.4" - sources."tar-6.1.12" - (sources."tough-cookie-4.1.2" // { - dependencies = [ - sources."universalify-0.2.0" - ]; - }) - sources."tr46-0.0.3" + sources."svg2img-1.0.0-beta.2" + sources."timm-1.7.1" + sources."tinycolor2-1.5.2" sources."tspan-0.4.0" - sources."type-check-0.3.2" sources."universalify-2.0.0" - sources."url-parse-1.5.10" - sources."utf-8-validate-5.0.10" - sources."util-deprecate-1.0.2" - sources."w3c-hr-time-1.0.2" - sources."w3c-xmlserializer-2.0.0" - sources."wavedrom-2.9.1" - sources."webidl-conversions-3.0.1" - (sources."whatwg-encoding-1.0.5" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-5.0.0" - sources."wide-align-1.1.5" - sources."word-wrap-1.2.3" + sources."utif-2.0.1" + sources."wavedrom-3.1.1" sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."ws-7.5.9" - sources."xml-name-validator-3.0.0" - sources."xmlchars-2.2.0" + sources."xhr-2.6.0" + sources."xml-parse-from-string-1.0.1" + 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."yargs-17.6.2" sources."yargs-parser-21.1.1" ]; @@ -150423,10 +147354,10 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "7.3.1"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-7.3.1.tgz"; - sha512 = "ZTfktd1zcQpWaFAM3U+IQW674G89d1IW/Oh0Ncw9LwFvKvAcW/nA5EB4pwqB8LiW/6OSYQhHBP4x2XUTBu1SKg=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-7.5.0.tgz"; + sha512 = "Ymflj7Aq/LOD+zGoyvwRbAPx/yMJeig2OEb/rRXYrWl6NWRI5E0c2iWGqlBcnL45iKrOzz70H438dVeJk0w2ug=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -150442,46 +147373,45 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/runtime-7.19.4" + sources."@babel/runtime-7.20.13" sources."@devicefarmer/adbkit-3.2.3" sources."@devicefarmer/adbkit-logcat-2.1.2" sources."@devicefarmer/adbkit-monkey-1.2.1" - (sources."@eslint/eslintrc-1.3.3" // { + (sources."@eslint/eslintrc-1.4.1" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" sources."strip-json-comments-3.1.1" ]; }) - sources."@humanwhocodes/config-array-0.10.7" + sources."@humanwhocodes/config-array-0.11.8" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" - sources."@mdn/browser-compat-data-5.2.6" + sources."@mdn/browser-compat-data-5.2.29" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@pnpm/network.ca-file-1.0.1" + sources."@pnpm/network.ca-file-1.0.2" sources."@pnpm/npm-conf-1.0.5" sources."@sindresorhus/is-5.3.0" sources."@szmarczak/http-timer-5.0.1" sources."@types/http-cache-semantics-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/yauzl-2.10.0" sources."abort-controller-3.0.0" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" - sources."addons-linter-5.18.0" - sources."addons-moz-compare-1.2.0" - (sources."addons-scanner-utils-8.1.0" // { + sources."addons-linter-5.27.0" + sources."addons-moz-compare-1.3.0" + (sources."addons-scanner-utils-8.3.0" // { dependencies = [ sources."node-fetch-2.6.7" ]; }) - sources."adm-zip-0.5.9" - sources."ajv-8.11.0" - sources."ajv-merge-patch-5.0.1" + sources."adm-zip-0.5.10" + sources."ajv-8.12.0" (sources."ansi-align-3.0.1" // { dependencies = [ sources."string-width-4.2.3" @@ -150493,7 +147423,7 @@ in sources."argparse-2.0.1" sources."array-differ-4.0.0" sources."array-flatten-1.1.1" - sources."array-union-2.1.0" + sources."array-union-3.0.1" sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."async-3.2.4" @@ -150501,7 +147431,7 @@ in sources."at-least-node-1.0.0" sources."atomic-sleep-1.0.0" sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" @@ -150513,14 +147443,13 @@ in ]; }) sources."boolbase-1.0.0" - (sources."boxen-7.0.0" // { + (sources."boxen-7.0.1" // { dependencies = [ - sources."chalk-5.1.2" + sources."chalk-5.2.0" sources."type-fest-2.19.0" ]; }) sources."brace-expansion-1.1.11" - sources."braces-3.0.2" sources."buffer-6.0.3" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -150532,20 +147461,20 @@ in sources."bunyan-1.8.15" sources."bytes-3.1.2" sources."cacheable-lookup-7.0.0" - (sources."cacheable-request-10.2.2" // { + (sources."cacheable-request-10.2.5" // { dependencies = [ sources."get-stream-6.0.1" ]; }) sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."camelcase-7.0.0" + sources."camelcase-7.0.1" sources."caseless-0.12.0" sources."chalk-4.1.2" sources."cheerio-1.0.0-rc.12" sources."cheerio-select-2.1.0" sources."chrome-launcher-0.15.1" - sources."ci-info-3.5.0" + sources."ci-info-3.7.1" sources."cli-boxes-3.0.0" (sources."cliui-8.0.1" // { dependencies = [ @@ -150558,7 +147487,7 @@ in sources."color-name-1.1.4" sources."columnify-1.6.0" sources."combined-stream-1.0.8" - sources."commander-9.4.1" + sources."commander-9.5.0" sources."common-tags-1.8.2" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { @@ -150577,7 +147506,7 @@ in sources."content-type-1.0.4" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" - sources."core-js-3.25.3" + sources."core-js-3.27.1" sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" (sources."crypto-random-string-4.0.0" // { @@ -150588,7 +147517,7 @@ in sources."css-select-5.1.0" sources."css-what-6.1.0" sources."dashdash-1.14.1" - sources."data-uri-to-buffer-4.0.0" + sources."data-uri-to-buffer-4.0.1" sources."debounce-1.2.1" sources."debug-4.3.4" sources."decamelize-6.0.0" @@ -150607,7 +147536,6 @@ in sources."delayed-stream-1.0.0" sources."depd-2.0.0" sources."destroy-1.2.0" - sources."dir-glob-3.0.1" sources."doctrine-3.0.0" sources."dom-serializer-2.0.0" sources."domelementtype-2.3.0" @@ -150635,14 +147563,14 @@ in sources."escape-goat-4.0.0" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.25.0" // { + (sources."eslint-8.32.0" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" sources."strip-json-comments-3.1.1" ]; }) - sources."eslint-plugin-no-unsanitized-4.0.1" + sources."eslint-plugin-no-unsanitized-4.0.2" sources."eslint-scope-7.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -150650,7 +147578,7 @@ in ]; }) sources."eslint-visitor-keys-3.3.0" - sources."espree-9.4.0" + sources."espree-9.4.1" sources."esprima-4.0.1" sources."esquery-1.4.0" sources."esrecurse-4.3.0" @@ -150669,24 +147597,14 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - (sources."fast-glob-3.2.12" // { - dependencies = [ - sources."glob-parent-5.1.2" - ]; - }) - (sources."fast-json-patch-2.2.1" // { - dependencies = [ - sources."fast-deep-equal-2.0.1" - ]; - }) + sources."fast-json-patch-3.1.1" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fast-redact-3.1.2" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fd-slicer-1.1.0" sources."fetch-blob-3.2.0" sources."file-entry-cache-6.0.1" - sources."fill-range-7.0.1" (sources."finalhandler-1.2.0" // { dependencies = [ sources."debug-2.6.9" @@ -150702,14 +147620,14 @@ in sources."first-chunk-stream-3.0.0" sources."flat-cache-3.0.4" sources."flatted-3.2.7" - sources."fluent-syntax-0.13.0" + sources."fluent-syntax-0.14.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."form-data-encoder-2.1.3" + sources."form-data-encoder-2.1.4" sources."formdata-polyfill-4.0.10" sources."forwarded-0.2.0" sources."fresh-0.5.2" - (sources."fs-extra-10.1.0" // { + (sources."fs-extra-11.1.0" // { dependencies = [ sources."universalify-2.0.0" ]; @@ -150724,21 +147642,20 @@ in ]; }) sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."getpass-0.1.7" - (sources."glob-8.0.3" // { + (sources."glob-8.1.0" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" ]; }) sources."glob-parent-6.0.2" sources."glob-to-regexp-0.4.1" - sources."global-dirs-3.0.0" - sources."globals-13.17.0" - sources."globby-11.1.0" - (sources."got-12.5.2" // { + sources."global-dirs-3.0.1" + sources."globals-13.20.0" + (sources."got-12.5.3" // { dependencies = [ sources."get-stream-6.0.1" ]; @@ -150759,14 +147676,14 @@ in sources."has-symbols-1.0.3" sources."has-yarn-3.0.0" sources."htmlparser2-8.0.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http-signature-1.2.0" - sources."http2-wrapper-2.1.11" + sources."http2-wrapper-2.2.0" sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."image-size-1.0.2" sources."immediate-3.0.6" sources."import-fresh-3.3.0" @@ -150787,7 +147704,6 @@ in sources."is-installed-globally-0.4.0" sources."is-mergeable-object-1.1.1" sources."is-npm-6.0.0" - sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" sources."is-relative-0.1.3" @@ -150795,13 +147711,13 @@ in sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-wsl-2.2.0" - sources."is-yarn-global-0.4.0" + sources."is-yarn-global-0.4.1" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jed-1.1.1" - sources."jose-4.10.0" - sources."js-sdsl-4.1.5" + sources."jose-4.11.2" + sources."js-sdsl-4.3.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsbn-0.1.1" @@ -150817,11 +147733,7 @@ in sources."universalify-2.0.0" ]; }) - (sources."jsonwebtoken-8.5.1" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."jsonwebtoken-9.0.0" sources."jsprim-1.4.2" (sources."jszip-3.10.1" // { dependencies = [ @@ -150831,7 +147743,7 @@ in }) sources."jwa-1.4.1" sources."jws-3.2.2" - sources."keyv-4.5.1" + sources."keyv-4.5.2" sources."latest-version-7.0.0" sources."lcid-3.1.1" sources."levn-0.4.1" @@ -150844,14 +147756,8 @@ in }) sources."lines-and-columns-2.0.3" sources."locate-path-6.0.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-4.17.21" sources."lodash.merge-4.6.2" - sources."lodash.once-4.1.1" sources."lowercase-keys-3.0.0" sources."lru-cache-6.0.0" sources."make-error-1.3.6" @@ -150861,9 +147767,7 @@ in sources."mem-5.1.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-4.0.5" sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" @@ -150874,11 +147778,7 @@ in sources."mkdirp-1.0.4" sources."moment-2.29.4" sources."ms-2.1.2" - (sources."multimatch-6.0.0" // { - dependencies = [ - sources."array-union-3.0.1" - ]; - }) + sources."multimatch-6.0.0" (sources."mv-2.1.1" // { dependencies = [ sources."glob-6.0.4" @@ -150893,16 +147793,16 @@ in sources."ncp-2.0.0" sources."negotiator-0.6.3" sources."node-domexception-1.0.0" - sources."node-fetch-3.2.10" + sources."node-fetch-3.3.0" sources."node-forge-1.3.1" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."node-notifier-10.0.1" - sources."normalize-url-7.2.0" + sources."normalize-url-8.0.0" sources."npm-run-path-4.0.1" sources."nth-check-2.1.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."on-exit-leak-free-2.1.0" sources."on-finished-2.4.1" sources."once-1.4.0" @@ -150920,32 +147820,30 @@ in sources."pako-1.0.11" sources."parent-module-1.0.1" sources."parse-json-6.0.2" - sources."parse5-7.1.1" + sources."parse5-7.1.2" sources."parse5-htmlparser2-tree-adapter-7.0.0" sources."parseurl-1.3.3" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."path-to-regexp-0.1.7" - 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."pino-8.6.1" + sources."pino-8.8.0" sources."pino-abstract-transport-1.0.0" - sources."pino-std-serializers-6.0.0" - sources."postcss-8.4.18" + sources."pino-std-serializers-6.1.0" + sources."postcss-8.4.21" sources."prelude-ls-1.2.1" sources."process-0.11.10" sources."process-nextick-args-2.0.1" - sources."process-warning-2.0.0" + sources."process-warning-2.1.0" sources."promise-toolbox-0.21.0" sources."proto-list-1.2.4" sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."pupa-3.1.0" sources."qs-6.11.0" sources."queue-6.0.2" @@ -150960,9 +147858,9 @@ in sources."strip-json-comments-2.0.1" ]; }) - sources."readable-stream-4.2.0" + sources."readable-stream-4.3.0" sources."real-require-0.2.0" - sources."regenerator-runtime-0.13.10" + sources."regenerator-runtime-0.13.11" sources."regexpp-3.2.0" sources."registry-auth-token-5.0.1" sources."registry-url-6.0.1" @@ -150999,7 +147897,7 @@ in sources."safe-buffer-5.2.1" sources."safe-compare-1.1.4" sources."safe-json-stringify-1.2.0" - sources."safe-stable-stringify-2.4.1" + sources."safe-stable-stringify-2.4.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-7.3.8" @@ -151023,10 +147921,9 @@ in sources."shell-quote-1.7.3" sources."shellwords-0.1.1" sources."side-channel-1.0.4" - sources."sign-addon-5.1.0" + sources."sign-addon-5.2.0" sources."signal-exit-3.0.7" - sources."slash-3.0.0" - sources."sonic-boom-3.2.0" + sources."sonic-boom-3.2.1" sources."source-map-0.6.1" sources."source-map-js-1.0.2" sources."source-map-support-0.5.21" @@ -151059,10 +147956,9 @@ in sources."text-table-0.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" - sources."thread-stream-2.2.0" + sources."thread-stream-2.3.0" sources."through-2.3.8" sources."tmp-0.2.1" - sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tosource-1.0.0" sources."tough-cookie-2.5.0" @@ -151081,11 +147977,11 @@ in sources."upath-2.0.1" (sources."update-notifier-6.0.2" // { dependencies = [ - sources."chalk-5.1.2" + sources."chalk-5.2.0" ]; }) sources."uri-js-4.4.1" - sources."utf-8-validate-5.0.10" + sources."utf-8-validate-6.0.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-8.3.2" @@ -151105,7 +148001,7 @@ in sources."widest-line-4.0.1" sources."winreg-0.0.12" sources."word-wrap-1.2.3" - (sources."wrap-ansi-8.0.1" // { + (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-regex-6.0.1" sources."ansi-styles-6.2.1" @@ -151114,13 +148010,13 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-8.9.0" + sources."ws-8.12.0" sources."xdg-basedir-5.1.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."y18n-5.0.8" sources."yallist-4.0.0" - (sources."yargs-17.6.0" // { + (sources."yargs-17.6.2" // { dependencies = [ sources."string-width-4.2.3" ]; @@ -151143,10 +148039,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.74.0"; + version = "5.75.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz"; - sha512 = "A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz"; + sha512 = "piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ=="; }; dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" @@ -151159,7 +148055,7 @@ in sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -151177,17 +148073,17 @@ in sources."@webassemblyjs/wast-printer-1.11.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."browserslist-4.21.4" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" sources."electron-to-chromium-1.4.284" - sources."enhanced-resolve-5.10.0" + sources."enhanced-resolve-5.12.0" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -151211,23 +148107,23 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."neo-async-2.6.2" - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" sources."picocolors-1.0.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."randombytes-2.1.0" sources."safe-buffer-5.2.1" sources."schema-utils-3.1.1" - sources."serialize-javascript-6.0.0" + sources."serialize-javascript-6.0.1" sources."source-map-0.6.1" sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.15.1" + sources."terser-5.16.1" sources."terser-webpack-plugin-5.3.6" sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" sources."watchpack-2.4.0" - sources."webpack-5.74.0" + sources."webpack-5.75.0" sources."webpack-sources-3.2.3" ]; buildInputs = globalBuildInputs; @@ -151243,10 +148139,10 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.10.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz"; - sha512 = "NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.0.1.tgz"; + sha512 = "S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A=="; }; dependencies = [ sources."@discoveryjs/json-ext-0.5.7" @@ -151260,7 +148156,7 @@ in sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -151276,25 +148172,25 @@ 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.2.0" - sources."@webpack-cli/info-1.5.0" - sources."@webpack-cli/serve-1.7.0" + sources."@webpack-cli/configtest-2.0.1" + sources."@webpack-cli/info-2.0.1" + sources."@webpack-cli/serve-2.0.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."browserslist-4.21.4" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."chrome-trace-event-1.0.3" sources."clone-deep-4.0.1" sources."colorette-2.0.19" - sources."commander-7.2.0" + sources."commander-9.5.0" sources."cross-spawn-7.0.3" sources."electron-to-chromium-1.4.284" - sources."enhanced-resolve-5.10.0" + sources."enhanced-resolve-5.12.0" sources."envinfo-7.8.1" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -151316,7 +148212,7 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."import-local-3.1.0" - sources."interpret-2.2.0" + sources."interpret-3.1.1" sources."is-core-module-2.11.0" sources."is-plain-object-2.0.4" sources."isexe-2.0.0" @@ -151331,7 +148227,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."neo-async-2.6.2" - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -151340,15 +148236,15 @@ in sources."path-parse-1.0.7" sources."picocolors-1.0.0" sources."pkg-dir-4.2.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."randombytes-2.1.0" - sources."rechoir-0.7.1" + sources."rechoir-0.8.0" sources."resolve-1.22.1" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."safe-buffer-5.2.1" sources."schema-utils-3.1.1" - sources."serialize-javascript-6.0.0" + sources."serialize-javascript-6.0.1" sources."shallow-clone-3.0.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -151357,7 +148253,7 @@ in sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" - (sources."terser-5.15.1" // { + (sources."terser-5.16.1" // { dependencies = [ sources."commander-2.20.3" ]; @@ -151366,8 +148262,8 @@ in sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" sources."watchpack-2.4.0" - sources."webpack-5.74.0" - sources."webpack-cli-4.10.0" + sources."webpack-5.75.0" + sources."webpack-cli-5.0.1" sources."webpack-merge-5.8.0" sources."webpack-sources-3.2.3" sources."which-2.0.2" @@ -151406,19 +148302,19 @@ in sources."@types/eslint-8.4.10" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" - sources."@types/express-4.17.14" - sources."@types/express-serve-static-core-4.17.31" + sources."@types/express-4.17.16" + sources."@types/express-serve-static-core-4.17.33" sources."@types/http-proxy-1.17.9" sources."@types/json-schema-7.0.11" sources."@types/mime-3.0.1" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/retry-0.12.0" sources."@types/serve-index-1.9.1" sources."@types/serve-static-1.15.0" sources."@types/sockjs-0.3.33" - sources."@types/ws-8.5.3" + sources."@types/ws-8.5.4" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -151437,13 +148333,13 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."ajv-formats-2.1.1" sources."ajv-keywords-5.1.0" sources."ansi-html-community-0.0.8" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."array-flatten-2.1.2" sources."balanced-match-1.0.2" sources."batch-0.6.1" @@ -151453,7 +148349,7 @@ in sources."bytes-3.1.2" ]; }) - sources."bonjour-service-1.0.14" + sources."bonjour-service-1.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browserslist-4.21.4" @@ -151461,7 +148357,7 @@ in sources."bufferutil-4.0.7" sources."bytes-3.0.0" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" sources."colorette-2.0.19" @@ -151491,7 +148387,7 @@ in sources."ee-first-1.1.1" sources."electron-to-chromium-1.4.284" sources."encodeurl-1.0.2" - sources."enhanced-resolve-5.10.0" + sources."enhanced-resolve-5.12.0" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -151524,7 +148420,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-6.0.1" sources."glob-7.2.3" sources."glob-parent-5.1.2" @@ -151565,7 +148461,7 @@ in sources."json-schema-traverse-1.0.0" sources."loader-runner-4.3.0" sources."media-typer-0.3.0" - sources."memfs-3.4.10" + sources."memfs-3.4.13" sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."methods-1.1.2" @@ -151581,11 +148477,11 @@ in sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."node-forge-1.3.1" - sources."node-gyp-build-4.5.0" - sources."node-releases-2.0.6" + sources."node-gyp-build-4.6.0" + sources."node-releases-2.0.8" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" sources."obuf-1.1.2" sources."on-finished-2.4.1" sources."on-headers-1.0.2" @@ -151605,7 +148501,7 @@ in sources."ipaddr.js-1.9.1" ]; }) - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" @@ -151630,7 +148526,7 @@ in sources."ms-2.1.3" ]; }) - sources."serialize-javascript-6.0.0" + sources."serialize-javascript-6.0.1" (sources."serve-index-1.9.1" // { dependencies = [ sources."depd-1.1.2" @@ -151666,7 +148562,7 @@ in sources."strip-final-newline-2.0.0" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.15.1" + sources."terser-5.16.1" (sources."terser-webpack-plugin-5.3.6" // { dependencies = [ sources."ajv-6.12.6" @@ -151682,14 +148578,14 @@ in sources."unpipe-1.0.0" sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" - sources."utf-8-validate-5.0.10" + sources."utf-8-validate-6.0.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-8.3.2" sources."vary-1.1.2" sources."watchpack-2.4.0" sources."wbuf-1.7.3" - (sources."webpack-5.74.0" // { + (sources."webpack-5.75.0" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -151703,7 +148599,7 @@ in sources."websocket-extensions-0.1.4" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-8.11.0" + sources."ws-8.12.0" ]; buildInputs = globalBuildInputs; meta = { @@ -151737,7 +148633,7 @@ in sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -151755,20 +148651,20 @@ in sources."@webassemblyjs/wast-printer-1.11.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."ajv-formats-2.1.1" sources."ajv-keywords-5.1.0" sources."braces-3.0.2" sources."browserslist-4.21.4" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001431" + sources."caniuse-lite-1.0.30001449" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" sources."dir-glob-3.0.1" sources."electron-to-chromium-1.4.284" - sources."enhanced-resolve-5.10.0" + sources."enhanced-resolve-5.12.0" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -151786,14 +148682,14 @@ in ]; }) sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."glob-parent-6.0.2" sources."glob-to-regexp-0.4.1" - sources."globby-13.1.2" + sources."globby-13.1.3" sources."graceful-fs-4.2.10" sources."has-flag-4.0.0" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" @@ -151807,12 +148703,12 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."neo-async-2.6.2" - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" sources."normalize-path-3.0.0" sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" sources."require-from-string-2.0.2" @@ -151820,13 +148716,13 @@ in sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."schema-utils-4.0.0" - sources."serialize-javascript-6.0.0" + sources."serialize-javascript-6.0.1" sources."slash-4.0.0" sources."source-map-0.6.1" sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.15.1" + sources."terser-5.16.1" (sources."terser-webpack-plugin-5.3.6" // { dependencies = [ sources."ajv-6.12.6" @@ -151839,7 +148735,7 @@ in sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" sources."watchpack-2.4.0" - (sources."webpack-5.74.0" // { + (sources."webpack-5.75.0" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -151880,7 +148776,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" @@ -151893,7 +148789,7 @@ in sources."bep53-range-1.1.1" sources."binary-search-1.3.6" sources."bitfield-4.1.0" - (sources."bittorrent-dht-10.0.6" // { + (sources."bittorrent-dht-10.0.7" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -151905,11 +148801,12 @@ in sources."ms-2.1.2" ]; }) - sources."bittorrent-peerid-1.3.4" + sources."bittorrent-peerid-1.3.6" (sources."bittorrent-protocol-3.5.5" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" + sources."readable-stream-3.6.0" ]; }) (sources."bittorrent-tracker-9.19.0" // { @@ -151922,9 +148819,18 @@ in sources."simple-get-4.0.1" ]; }) - sources."bl-4.1.0" + (sources."bl-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."blob-to-buffer-1.2.9" - sources."block-stream2-2.1.0" + sources."block-iterator-1.1.1" + (sources."block-stream2-2.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."bn.js-5.2.1" sources."browserify-package-json-1.0.1" sources."buffer-5.7.1" @@ -151953,7 +148859,11 @@ in sources."mime-1.6.0" ]; }) - sources."chunk-store-stream-4.3.0" + (sources."chunk-store-stream-4.3.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."cli-cursor-3.1.0" sources."cli-spinners-2.7.0" sources."cli-width-3.0.0" @@ -151963,16 +148873,10 @@ in sources."color-name-1.1.4" sources."common-tags-1.8.2" sources."compact2string-1.4.1" - (sources."concat-stream-1.6.2" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."concat-stream-1.6.2" sources."core-util-is-1.0.3" sources."cpus-1.0.3" - sources."create-torrent-5.0.6" + sources."create-torrent-5.0.9" sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."defaults-1.0.4" @@ -152058,7 +148962,11 @@ in sources."magnet-uri-6.2.0" sources."mdns-js-0.5.0" sources."mdns-js-packet-0.2.0" - sources."mediasource-2.4.0" + (sources."mediasource-2.4.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."memory-chunk-store-1.3.5" sources."mime-3.0.0" sources."mimic-fn-2.1.0" @@ -152067,7 +148975,11 @@ in sources."mkdirp-classic-0.5.3" sources."moment-2.29.4" sources."mp4-box-encoding-1.4.1" - sources."mp4-stream-3.1.3" + (sources."mp4-stream-3.1.3" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."ms-2.0.0" (sources."multicast-dns-7.2.5" // { dependencies = [ @@ -152075,11 +148987,11 @@ in ]; }) sources."mute-stream-0.0.8" - sources."napi-macros-2.1.0" + sources."napi-macros-2.2.2" sources."netmask-2.0.2" sources."network-address-1.1.2" sources."next-event-1.0.0" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."node-ssdp-2.9.1" sources."nodebmc-0.0.7" sources."on-finished-2.4.1" @@ -152114,9 +149026,13 @@ in 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."range-slice-stream-2.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."rc4-0.1.5" - sources."readable-stream-3.6.0" + sources."readable-stream-2.3.7" sources."record-cache-1.2.0" (sources."render-media-4.1.0" // { dependencies = [ @@ -152131,8 +149047,8 @@ in sources."run-parallel-limit-1.1.0" sources."run-series-1.1.9" sources."rusha-0.8.14" - sources."rxjs-7.5.7" - sources."safe-buffer-5.2.1" + sources."rxjs-7.8.0" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.1.4" sources."semver-5.1.1" @@ -152144,6 +149060,7 @@ in sources."buffer-6.0.3" sources."debug-4.3.4" sources."ms-2.1.2" + sources."readable-stream-3.6.0" ]; }) sources."simple-sha1-3.1.0" @@ -152151,6 +149068,7 @@ in dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" + sources."readable-stream-3.6.0" ]; }) sources."smart-buffer-4.2.0" @@ -152165,10 +149083,10 @@ in sources."stream-to-blob-2.0.1" sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" - sources."streamx-2.12.5" + sources."streamx-2.13.2" sources."string-width-4.2.3" sources."string2compact-1.3.2" - sources."string_decoder-1.3.0" + sources."string_decoder-1.1.1" sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."thirty-two-1.0.2" @@ -152178,14 +149096,14 @@ in sources."timeout-refresh-1.0.3" sources."tmp-0.0.33" sources."to-arraybuffer-1.0.1" - (sources."torrent-discovery-9.4.14" // { + (sources."torrent-discovery-9.4.15" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."torrent-piece-2.0.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-fest-0.21.3" sources."typedarray-0.0.6" sources."uint64be-2.0.2" @@ -152203,11 +149121,15 @@ in sources."ut_pex-3.0.2" sources."utf-8-validate-5.0.10" sources."util-deprecate-1.0.2" - sources."utp-native-2.5.3" + (sources."utp-native-2.5.3" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."videostream-3.2.2" sources."vlc-command-1.2.0" sources."wcwidth-1.0.1" - (sources."webtorrent-1.9.1" // { + (sources."webtorrent-1.9.7" // { dependencies = [ sources."debug-4.3.4" sources."decompress-response-6.0.0" @@ -152240,13 +149162,13 @@ in "@withgraphite/graphite-cli" = nodeEnv.buildNodePackage { name = "_at_withgraphite_slash_graphite-cli"; packageName = "@withgraphite/graphite-cli"; - version = "0.20.11"; + version = "0.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-0.20.11.tgz"; - sha512 = "MpeRYC1CeU218Euj6+R7uGBwRiWhl2voek2LsMOsswI+jhN+YxgFM7d/UDrmrJ1Eq4IpCeCauZVnE+Ax7rJGNA=="; + url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-0.20.13.tgz"; + sha512 = "7no/PSf+6WElM1fSgihirkMB6Kz9sLO852q/o/mrzBZuGcHjQeN8bLp1AuK5eKzUo8yohJaVgYqDWtKiLWmU7Q=="; }; dependencies = [ - sources."@withgraphite/graphite-cli-routes-0.22.0" + sources."@withgraphite/graphite-cli-routes-0.23.0" sources."@withgraphite/retype-0.3.15" sources."@withgraphite/retyped-routes-0.3.7" sources."ansi-regex-5.0.1" @@ -152279,7 +149201,7 @@ in sources."kleur-3.0.3" sources."lru-cache-6.0.0" sources."minimatch-3.1.2" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.8" sources."once-1.4.0" sources."open-8.4.0" sources."path-is-absolute-1.0.1" @@ -152319,39 +149241,39 @@ in wrangler = nodeEnv.buildNodePackage { name = "wrangler"; packageName = "wrangler"; - version = "2.1.15"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/wrangler/-/wrangler-2.1.15.tgz"; - sha512 = "5iqtFNo+zbu1FTnQQU/1Y+WWxIEuPIy71fe0uvqqFl0pSlkAtZJ+ufw8UYVxf2Mprw4ia4mSDdhV+hHpZO1sLQ=="; + url = "https://registry.npmjs.org/wrangler/-/wrangler-2.8.1.tgz"; + sha512 = "O4wUr6/FUpk9KVstOUVYbiiZcWc1jKo7q0FfdwEjnMB3oN7Ofs6cIiX++Lzj1ldFSCOw2/aW3UYgixch6B2WCA=="; }; dependencies = [ sources."@cloudflare/kv-asset-handler-0.2.0" sources."@esbuild-plugins/node-globals-polyfill-0.1.1" sources."@esbuild-plugins/node-modules-polyfill-0.1.4" sources."@iarna/toml-2.2.5" - sources."@miniflare/cache-2.10.0" - sources."@miniflare/cli-parser-2.10.0" - sources."@miniflare/core-2.10.0" - sources."@miniflare/d1-2.10.0" - sources."@miniflare/durable-objects-2.10.0" - sources."@miniflare/html-rewriter-2.10.0" - sources."@miniflare/http-server-2.10.0" - sources."@miniflare/kv-2.10.0" - sources."@miniflare/queues-2.10.0" - sources."@miniflare/r2-2.10.0" - sources."@miniflare/runner-vm-2.10.0" - sources."@miniflare/scheduler-2.10.0" - sources."@miniflare/shared-2.10.0" - sources."@miniflare/sites-2.10.0" - sources."@miniflare/storage-file-2.10.0" - sources."@miniflare/storage-memory-2.10.0" - sources."@miniflare/storage-redis-2.10.0" - sources."@miniflare/watcher-2.10.0" - sources."@miniflare/web-sockets-2.10.0" - sources."@types/better-sqlite3-7.6.2" - sources."@types/node-18.11.9" + sources."@miniflare/cache-2.11.0" + sources."@miniflare/cli-parser-2.11.0" + sources."@miniflare/core-2.11.0" + sources."@miniflare/d1-2.11.0" + sources."@miniflare/durable-objects-2.11.0" + sources."@miniflare/html-rewriter-2.11.0" + sources."@miniflare/http-server-2.11.0" + sources."@miniflare/kv-2.11.0" + sources."@miniflare/queues-2.11.0" + sources."@miniflare/r2-2.11.0" + sources."@miniflare/runner-vm-2.11.0" + sources."@miniflare/scheduler-2.11.0" + sources."@miniflare/shared-2.11.0" + sources."@miniflare/sites-2.11.0" + sources."@miniflare/storage-file-2.11.0" + sources."@miniflare/storage-memory-2.11.0" + sources."@miniflare/storage-redis-2.11.0" + sources."@miniflare/watcher-2.11.0" + sources."@miniflare/web-sockets-2.11.0" + sources."@types/better-sqlite3-7.6.3" + sources."@types/node-18.11.18" sources."@types/stack-trace-0.0.29" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."binary-extensions-2.2.0" sources."blake3-wasm-2.1.5" sources."braces-3.0.2" @@ -152396,7 +149318,7 @@ in sources."get-stream-6.0.1" sources."glob-parent-5.1.2" sources."html-rewriter-wasm-0.4.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."human-signals-3.0.1" sources."ioredis-4.28.5" sources."is-binary-path-2.1.0" @@ -152414,12 +149336,12 @@ in sources."merge-stream-2.0.0" sources."mime-3.0.0" sources."mimic-fn-4.0.0" - sources."miniflare-2.10.0" + sources."miniflare-2.11.0" sources."ms-2.1.2" sources."mustache-4.2.0" sources."nanoid-3.3.4" sources."node-forge-1.3.1" - sources."node-gyp-build-4.5.0" + sources."node-gyp-build-4.6.0" sources."normalize-path-3.0.0" (sources."npm-run-path-5.1.0" // { dependencies = [ @@ -152461,10 +149383,10 @@ in sources."to-regex-range-5.0.1" sources."undici-5.9.1" sources."urlpattern-polyfill-4.0.3" - sources."utf-8-validate-5.0.10" + sources."utf-8-validate-6.0.2" sources."validate-npm-package-name-4.0.0" sources."which-2.0.2" - sources."ws-8.11.0" + sources."ws-8.12.0" sources."xxhash-wasm-1.0.2" sources."yallist-4.0.0" sources."youch-2.2.2" @@ -152506,15 +149428,14 @@ in sha512 = "P1Ct7+DNrOcr2JAxDZ3Q5i5sx2LSveu7iLaoUL0A+YiG0GKf0l5+9j3rwMeyh6JeTL1+HfQV1rnwEvzhNIvpFw=="; }; dependencies = [ - sources."@babel/runtime-7.20.1" - sources."@babel/runtime-corejs3-7.20.1" - (sources."@eslint/eslintrc-1.3.3" // { + sources."@babel/runtime-7.20.13" + (sources."@eslint/eslintrc-1.4.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - (sources."@humanwhocodes/config-array-0.11.7" // { + (sources."@humanwhocodes/config-array-0.11.8" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -152526,20 +149447,22 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@types/json5-0.0.29" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."adverb-where-0.2.5" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."argparse-2.0.1" - sources."aria-query-4.2.2" - sources."array-includes-3.1.5" + sources."aria-query-5.1.3" + sources."array-includes-3.1.6" sources."array.prototype.flat-1.3.1" sources."array.prototype.flatmap-1.3.1" + sources."array.prototype.tosorted-1.1.1" sources."ast-types-flow-0.0.7" - sources."axe-core-4.5.1" - sources."axobject-query-2.2.0" + sources."available-typed-arrays-1.0.5" + sources."axe-core-4.6.3" + sources."axobject-query-3.1.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."call-bind-1.0.2" @@ -152549,41 +149472,33 @@ in sources."color-name-1.1.4" sources."commander-2.20.3" sources."concat-map-0.0.1" - sources."core-js-pure-3.26.0" sources."cross-spawn-7.0.3" sources."damerau-levenshtein-1.0.8" - sources."debug-2.6.9" + sources."debug-3.2.7" + sources."deep-equal-2.2.0" sources."deep-is-0.1.4" sources."define-properties-1.1.4" sources."doctrine-2.1.0" sources."e-prime-0.10.4" sources."emoji-regex-9.2.2" - sources."es-abstract-1.20.4" + sources."es-abstract-1.21.1" + sources."es-get-iterator-1.1.3" + sources."es-set-tostringtag-2.0.1" sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.27.0" // { + (sources."eslint-8.32.0" // { dependencies = [ sources."debug-4.3.4" sources."doctrine-3.0.0" sources."ms-2.1.2" ]; }) - (sources."eslint-import-resolver-node-0.3.6" // { - dependencies = [ - sources."debug-3.2.7" - sources."ms-2.1.3" - ]; - }) - (sources."eslint-module-utils-2.7.4" // { - dependencies = [ - sources."debug-3.2.7" - sources."ms-2.1.3" - ]; - }) - sources."eslint-plugin-import-2.26.0" - sources."eslint-plugin-jsx-a11y-6.6.1" - (sources."eslint-plugin-react-7.31.10" // { + sources."eslint-import-resolver-node-0.3.7" + sources."eslint-module-utils-2.7.4" + sources."eslint-plugin-import-2.27.5" + sources."eslint-plugin-jsx-a11y-6.7.1" + (sources."eslint-plugin-react-7.32.1" // { dependencies = [ sources."resolve-2.0.0-next.4" ]; @@ -152604,33 +149519,39 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."file-entry-cache-6.0.1" sources."find-up-5.0.0" sources."flat-cache-3.0.4" sources."flatted-3.2.7" + sources."for-each-0.3.3" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.17.0" + sources."globals-13.20.0" + sources."globalthis-1.0.3" + sources."gopd-1.0.1" sources."grapheme-splitter-1.0.4" sources."has-1.0.3" sources."has-bigints-1.0.2" sources."has-flag-4.0.0" sources."has-property-descriptors-1.0.0" + sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internal-slot-1.0.3" + sources."internal-slot-1.0.4" + sources."is-arguments-1.1.1" + sources."is-array-buffer-3.0.1" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" @@ -152638,21 +149559,27 @@ in sources."is-date-object-1.0.5" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" + sources."is-map-2.0.2" sources."is-negative-zero-2.0.2" sources."is-number-object-1.0.7" sources."is-path-inside-3.0.3" sources."is-regex-1.1.4" + sources."is-set-2.0.2" sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.10" + sources."is-weakmap-2.0.1" sources."is-weakref-1.0.2" + sources."is-weakset-2.0.2" + sources."isarray-2.0.5" sources."isexe-2.0.0" - sources."js-sdsl-4.1.5" + sources."js-sdsl-4.3.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-1.0.1" + sources."json5-1.0.2" sources."jsx-ast-utils-3.3.3" sources."language-subtag-registry-0.3.22" sources."language-tags-1.0.5" @@ -152662,11 +149589,12 @@ in sources."loose-envify-1.4.0" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."ms-2.0.0" + sources."ms-2.1.3" sources."natural-compare-1.4.0" sources."no-cliches-0.3.4" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" + sources."object-inspect-1.12.3" + sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.4" sources."object.entries-1.1.6" @@ -152685,10 +149613,10 @@ in sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" sources."prop-types-15.8.1" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."react-is-16.13.1" - sources."regenerator-runtime-0.13.10" + sources."regenerator-runtime-0.13.11" sources."regexp.prototype.flags-1.4.3" sources."regexpp-3.2.0" sources."resolve-1.22.1" @@ -152701,9 +149629,10 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" - sources."string.prototype.matchall-4.0.7" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" + sources."stop-iteration-iterator-1.0.0" + sources."string.prototype.matchall-4.0.8" + sources."string.prototype.trimend-1.0.6" + sources."string.prototype.trimstart-1.0.6" sources."strip-ansi-6.0.1" sources."strip-bom-3.0.0" sources."strip-json-comments-3.1.1" @@ -152714,11 +149643,14 @@ in sources."tsconfig-paths-3.14.1" sources."type-check-0.4.0" sources."type-fest-0.20.2" + sources."typed-array-length-1.0.4" sources."unbox-primitive-1.0.2" sources."uri-js-4.4.1" sources."weasel-words-0.1.1" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" + sources."which-collection-1.0.1" + sources."which-typed-array-1.1.9" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."yocto-queue-0.1.0" @@ -152754,17 +149686,17 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.10.0.tgz"; - sha512 = "bGE5lObc8PBXDQ8QKEWUVFw85/g1R3TVbtLPswNY+YXR2fLb1RF6PW3CKNI0gshXTSKleywhAyORrXi7fjwpzg=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.11.0.tgz"; + sha512 = "1TBlhK1nMSpDiq3iZfAyDOg4xwagozZAnqr0AOrZG5UteMt3zbfhOVqhRuAunRIZ8kktfGMjsKxDjO+utGAJaA=="; }; dependencies = [ - sources."ajv-8.11.0" + sources."ajv-8.12.0" sources."fast-deep-equal-3.1.3" sources."json-schema-traverse-1.0.0" sources."jsonc-parser-3.2.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."request-light-0.5.8" sources."require-from-string-2.0.2" sources."uri-js-4.4.1" @@ -152776,10 +149708,10 @@ in sources."vscode-languageserver-types-3.16.0" ]; }) - sources."vscode-languageserver-textdocument-1.0.7" + sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-languageserver-types-3.17.2" sources."vscode-nls-5.2.0" - sources."vscode-uri-3.0.6" + sources."vscode-uri-3.0.7" sources."yaml-2.0.0-11" ]; buildInputs = globalBuildInputs; @@ -152818,7 +149750,7 @@ in sources."glob-7.2.3" sources."graceful-fs-4.2.10" sources."has-flag-4.0.0" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."ignore-walk-3.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -152872,13 +149804,25 @@ in yo = nodeEnv.buildNodePackage { name = "yo"; packageName = "yo"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/yo/-/yo-4.3.0.tgz"; - sha512 = "0V5CpR62BY1EOevIxXq5BL84YJeIunEzRsFlqb00tc7D77I51/0bvgdGRZhEwhNI2rFxKZ1i77eoisT56gfMTQ=="; + url = "https://registry.npmjs.org/yo/-/yo-4.3.1.tgz"; + sha512 = "KKp5WNPq0KdqfJY4W6HSiDG4DcgvmL4InWfkg5SVG9oYp+DTUUuc5ZmDw9VAvK0Z2J6XeEumDHcWh8NDhzrtOw=="; }; dependencies = [ - sources."@babel/runtime-7.20.1" + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.19.1" + (sources."@babel/highlight-7.18.6" // { + 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/runtime-7.20.13" sources."@gar/promisify-1.1.3" sources."@isaacs/string-locale-compare-1.1.0" sources."@nodelib/fs.scandir-2.1.5" @@ -152899,13 +149843,12 @@ in dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.8" - sources."which-2.0.2" ]; }) sources."@npmcli/installed-package-contents-1.0.7" (sources."@npmcli/map-workspaces-2.0.4" // { dependencies = [ - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" ]; }) (sources."@npmcli/metavuln-calculator-2.0.0" // { @@ -152924,11 +149867,17 @@ in sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-2.0.0" sources."@sindresorhus/is-0.7.0" + sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" + sources."@types/cacheable-request-6.0.3" sources."@types/expect-1.20.4" + sources."@types/http-cache-semantics-4.0.1" + sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" sources."@types/node-15.14.9" - sources."@types/vinyl-2.0.6" + sources."@types/normalize-package-data-2.4.1" + sources."@types/responselike-1.0.0" + sources."@types/vinyl-2.0.7" sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { dependencies = [ @@ -152943,12 +149892,15 @@ in ]; }) sources."aggregate-error-3.1.0" - sources."ajv-6.12.6" sources."ansi-0.3.1" - sources."ansi-align-2.0.0" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.1" - sources."ansi-styles-3.2.1" + sources."ansi-align-3.0.1" + (sources."ansi-escapes-4.3.2" // { + dependencies = [ + sources."type-fest-0.21.3" + ]; + }) + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" sources."aproba-2.0.0" sources."are-we-there-yet-1.1.7" (sources."argparse-1.0.10" // { @@ -152961,16 +149913,9 @@ in sources."array-union-2.1.0" sources."arrify-2.0.1" sources."asap-2.0.6" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."astral-regex-1.0.0" - sources."async-2.6.4" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."async-3.2.4" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" - sources."bcrypt-pbkdf-1.0.2" (sources."bin-links-3.0.3" // { dependencies = [ sources."npm-normalize-package-bin-2.0.0" @@ -152978,7 +149923,11 @@ in ]; }) sources."bin-version-3.1.0" - sources."bin-version-check-4.0.0" + (sources."bin-version-check-4.0.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."binaryextensions-4.18.0" (sources."bl-4.1.0" // { dependencies = [ @@ -152986,9 +149935,10 @@ in ]; }) sources."boolean-3.2.0" - (sources."boxen-1.3.0" // { + (sources."boxen-5.1.2" // { dependencies = [ - sources."camelcase-4.1.0" + sources."camelcase-6.3.0" + sources."type-fest-0.20.2" ]; }) sources."brace-expansion-2.0.1" @@ -153002,28 +149952,29 @@ in sources."mkdirp-1.0.4" ]; }) + sources."cacheable-lookup-5.0.4" (sources."cacheable-request-2.1.4" // { dependencies = [ sources."get-stream-3.0.0" sources."lowercase-keys-1.0.0" ]; }) - sources."camelcase-2.1.1" - sources."camelcase-keys-2.1.0" + sources."camelcase-4.1.0" + sources."camelcase-keys-4.2.0" sources."capture-stack-trace-1.0.2" - sources."caseless-0.12.0" - sources."chalk-2.4.2" + sources."chalk-4.1.2" + sources."char-regex-1.0.2" sources."chardet-0.7.0" sources."chownr-2.0.0" - sources."ci-info-1.6.0" + sources."ci-info-2.0.0" sources."clean-stack-2.2.0" - sources."cli-boxes-1.0.0" - sources."cli-cursor-2.1.0" + sources."cli-boxes-2.2.1" + sources."cli-cursor-3.1.0" sources."cli-list-0.2.0" sources."cli-spinners-2.7.0" sources."cli-table-0.3.11" - sources."cli-width-2.2.1" - sources."clone-2.1.2" + sources."cli-width-3.0.0" + sources."clone-1.0.4" sources."clone-buffer-1.0.0" sources."clone-regexp-1.0.1" sources."clone-response-1.0.2" @@ -153031,52 +149982,51 @@ in sources."cloneable-readable-1.1.3" sources."cmd-shim-5.0.0" sources."code-point-at-1.1.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.0.3" - sources."combined-stream-1.0.8" sources."commander-7.1.0" sources."common-ancestor-path-1.0.1" sources."commondir-1.0.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - sources."conf-1.4.0" sources."config-chain-1.1.13" - sources."configstore-3.1.5" + sources."configstore-5.0.1" sources."console-control-strings-1.1.0" - sources."core-js-3.26.0" + sources."core-js-3.27.2" sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" - sources."cross-spawn-6.0.5" - sources."crypto-random-string-1.0.0" + sources."cross-spawn-7.0.3" + sources."crypto-random-string-2.0.0" sources."currently-unhandled-0.4.1" - sources."dashdash-1.14.1" sources."dateformat-4.6.3" sources."debug-2.6.9" sources."debuglog-1.0.1" - sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.0" + sources."decamelize-2.0.0" + (sources."decamelize-keys-1.1.1" // { + dependencies = [ + sources."decamelize-1.2.0" + sources."map-obj-1.0.1" + ]; + }) + sources."decode-uri-component-0.2.2" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."default-uid-1.0.0" - (sources."defaults-1.0.4" // { - dependencies = [ - sources."clone-1.0.4" - ]; - }) + sources."defaults-1.0.4" + sources."defer-to-connect-1.1.3" + sources."define-lazy-prop-2.0.0" sources."define-properties-1.1.4" - sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" sources."detect-node-2.1.0" sources."dezalgo-1.0.4" sources."diff-5.1.0" sources."dir-glob-3.0.1" - sources."dot-prop-4.2.1" + sources."dot-prop-5.3.0" sources."downgrade-root-1.2.2" sources."duplexer3-0.1.5" - sources."ecc-jsbn-0.1.2" sources."ejs-3.1.8" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" @@ -153086,28 +150036,35 @@ in ]; }) sources."end-of-stream-1.4.4" - sources."env-paths-1.0.0" + sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."error-10.4.0" sources."error-ex-1.3.2" sources."es6-error-4.1.1" + sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."eventemitter3-4.0.7" - sources."execa-1.0.0" + (sources."execa-1.0.0" // { + dependencies = [ + sources."cross-spawn-6.0.5" + 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."execall-1.0.0" sources."exit-hook-1.1.1" 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.12" - sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.13.0" - sources."figures-2.0.0" + sources."fastq-1.15.0" + sources."figures-3.2.0" (sources."filelist-1.0.4" // { dependencies = [ - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" ]; }) sources."fill-range-7.0.1" @@ -153117,30 +150074,31 @@ in sources."find-yarn-workspace-root2-1.2.16" sources."first-chunk-stream-2.0.0" sources."foreachasync-3.0.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" sources."from2-2.3.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."fullname-4.0.1" sources."function-bind-1.1.1" sources."gauge-1.2.7" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stdin-4.0.1" sources."get-stream-4.1.0" - sources."getpass-0.1.7" - (sources."glob-8.0.3" // { + (sources."glob-8.1.0" // { dependencies = [ - sources."minimatch-5.1.0" + sources."minimatch-5.1.6" ]; }) sources."glob-parent-5.1.2" - (sources."global-agent-2.2.0" // { + (sources."global-agent-3.0.0" // { dependencies = [ sources."semver-7.3.8" ]; }) - sources."global-dirs-0.1.1" + (sources."global-dirs-3.0.1" // { + dependencies = [ + sources."ini-2.0.0" + ]; + }) sources."global-tunnel-ng-2.7.1" sources."globalthis-1.0.3" sources."globby-11.1.0" @@ -153152,20 +150110,19 @@ in }) sources."graceful-fs-4.2.10" sources."grouped-queue-2.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" // { dependencies = [ sources."ansi-regex-2.1.1" ]; }) - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."has-property-descriptors-1.0.0" sources."has-symbol-support-x-1.4.2" sources."has-symbols-1.0.3" sources."has-to-string-tag-x-1.4.1" sources."has-unicode-2.0.1" + sources."has-yarn-2.1.0" sources."hosted-git-info-2.8.9" sources."http-cache-semantics-3.8.1" (sources."http-proxy-agent-4.0.1" // { @@ -153174,7 +150131,11 @@ in sources."ms-2.1.2" ]; }) - sources."http-signature-1.2.0" + (sources."http2-wrapper-1.0.3" // { + dependencies = [ + sources."quick-lru-5.1.1" + ]; + }) (sources."https-proxy-agent-5.0.1" // { dependencies = [ sources."debug-4.3.4" @@ -153183,10 +150144,10 @@ in }) sources."human-signals-2.1.0" sources."humanize-ms-1.2.1" - sources."humanize-string-1.0.2" + sources."humanize-string-2.1.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."ignore-walk-4.0.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -153195,31 +150156,28 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."inquirer-6.5.2" - sources."insight-0.10.3" + sources."inquirer-8.2.5" (sources."into-stream-3.1.0" // { dependencies = [ sources."p-is-promise-1.1.0" ]; }) sources."ip-2.0.0" - sources."ip-regex-2.1.0" sources."is-arrayish-0.2.1" - sources."is-ci-1.2.1" + sources."is-ci-2.0.0" sources."is-core-module-2.11.0" - sources."is-docker-1.1.0" + sources."is-docker-2.2.1" sources."is-extglob-2.1.1" - sources."is-finite-1.1.0" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" - sources."is-installed-globally-0.1.0" + sources."is-installed-globally-0.4.0" sources."is-interactive-1.0.0" sources."is-lambda-1.0.1" - sources."is-npm-1.0.0" + sources."is-npm-5.0.0" sources."is-number-7.0.0" - sources."is-obj-1.0.1" + sources."is-obj-2.0.0" sources."is-object-1.0.2" - sources."is-path-inside-1.0.1" + sources."is-path-inside-3.0.3" sources."is-plain-obj-1.1.0" sources."is-redirect-1.0.0" sources."is-regexp-1.0.0" @@ -153231,49 +150189,41 @@ in sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-utf8-0.2.1" - sources."is-wsl-1.1.0" + sources."is-wsl-2.2.0" + sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."isbinaryfile-4.0.10" sources."isexe-2.0.0" - sources."isstream-0.1.2" sources."isurl-1.0.0" - (sources."jake-10.8.5" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."async-3.2.4" - 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."jake-10.8.5" + sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" - sources."jsbn-0.1.1" sources."json-buffer-3.0.0" 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-stringify-nice-1.1.4" sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" - sources."jsprim-1.4.2" - sources."just-diff-5.1.1" - sources."just-diff-apply-5.4.1" + sources."just-diff-5.2.0" + sources."just-diff-apply-5.5.0" sources."keyv-3.0.0" - (sources."latest-version-3.1.0" // { + (sources."latest-version-5.1.0" // { dependencies = [ - sources."get-stream-3.0.0" - sources."got-6.7.1" - sources."package-json-4.0.1" - sources."prepend-http-1.0.4" - sources."url-parse-lax-1.0.0" + sources."@sindresorhus/is-0.14.0" + sources."cacheable-request-6.1.0" + sources."get-stream-5.2.0" + sources."got-9.6.0" + sources."http-cache-semantics-4.1.1" + sources."lowercase-keys-2.0.0" + sources."normalize-url-4.5.1" + sources."p-cancelable-1.1.0" + sources."package-json-6.5.0" ]; }) - (sources."load-json-file-1.1.0" // { + sources."lines-and-columns-1.2.4" + (sources."load-json-file-4.0.0" // { dependencies = [ - sources."pify-2.3.0" + sources."strip-bom-3.0.0" ]; }) (sources."load-yaml-file-0.2.0" // { @@ -153285,23 +150235,21 @@ in sources."locate-path-2.0.0" sources."locutus-2.0.16" sources."lodash-4.17.21" - sources."lodash.debounce-4.0.8" sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" sources."lodash.padstart-4.6.1" - sources."log-symbols-2.2.0" + sources."log-symbols-4.1.0" sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."macos-release-2.5.0" - sources."make-dir-1.3.0" + sources."make-dir-3.1.0" (sources."make-fetch-happen-9.1.0" // { dependencies = [ - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" ]; }) sources."map-age-cleaner-0.1.3" - sources."map-obj-1.0.1" + sources."map-obj-2.0.0" (sources."matcher-3.0.0" // { dependencies = [ sources."escape-string-regexp-4.0.0" @@ -153309,19 +150257,15 @@ in }) sources."mem-5.1.1" sources."mem-fs-2.2.1" - sources."mem-fs-editor-9.5.0" - (sources."meow-3.7.0" // { + sources."mem-fs-editor-9.6.0" + (sources."meow-5.0.0" // { dependencies = [ - sources."find-up-1.1.2" - sources."path-exists-2.1.0" - sources."read-pkg-up-1.0.1" + sources."read-pkg-up-3.0.0" ]; }) sources."merge-stream-2.0.0" sources."merge2-1.4.1" 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.1.2" // { @@ -153330,7 +150274,12 @@ in ]; }) sources."minimist-1.2.7" - sources."minipass-3.3.5" + (sources."minimist-options-3.0.2" // { + dependencies = [ + sources."arrify-1.0.1" + ]; + }) + sources."minipass-3.3.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" @@ -153346,27 +150295,25 @@ in }) sources."ms-2.0.0" sources."multimatch-5.0.0" - sources."mute-stream-0.0.7" + sources."mute-stream-0.0.8" 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-3.0.1" - sources."env-paths-2.2.1" sources."gauge-4.0.4" sources."glob-7.2.3" - sources."is-fullwidth-code-point-3.0.0" sources."npmlog-6.0.2" sources."readable-stream-3.6.0" sources."semver-7.3.8" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."which-2.0.2" ]; }) sources."nopt-5.0.0" - sources."normalize-package-data-2.5.0" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."normalize-path-3.0.0" sources."normalize-url-2.0.1" sources."npm-bundled-1.1.2" @@ -153376,14 +150323,16 @@ in sources."semver-7.3.8" ]; }) - (sources."npm-keyword-5.0.0" // { + (sources."npm-keyword-6.1.0" // { dependencies = [ - sources."get-stream-3.0.0" - sources."got-7.1.0" - sources."p-cancelable-0.3.0" - sources."p-timeout-1.2.1" - sources."prepend-http-1.0.4" - sources."url-parse-lax-1.0.0" + sources."@sindresorhus/is-0.14.0" + sources."cacheable-request-6.1.0" + sources."get-stream-5.2.0" + sources."got-9.6.0" + sources."http-cache-semantics-4.1.1" + sources."lowercase-keys-2.0.0" + sources."normalize-url-4.5.1" + sources."p-cancelable-1.1.0" ]; }) sources."npm-normalize-package-bin-1.0.1" @@ -153410,7 +150359,7 @@ in sources."@tootallnate/once-2.0.0" sources."cacache-16.1.3" sources."debug-4.3.4" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."lru-cache-7.14.1" (sources."make-fetch-happen-10.2.1" // { @@ -153431,37 +150380,20 @@ in sources."unique-slug-3.0.0" ]; }) - sources."npm-run-path-2.0.2" + (sources."npm-run-path-2.0.2" // { + dependencies = [ + sources."path-key-2.0.1" + ]; + }) sources."npmlog-2.0.4" sources."number-is-nan-1.0.1" - sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-keys-1.1.1" sources."once-1.4.0" - (sources."onetime-2.0.1" // { - dependencies = [ - sources."mimic-fn-1.2.0" - ]; - }) - sources."open-6.4.0" - (sources."ora-5.4.1" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."cli-cursor-3.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."log-symbols-4.1.0" - sources."onetime-5.1.2" - sources."restore-cursor-3.1.0" - sources."strip-ansi-6.0.1" - sources."supports-color-7.2.0" - ]; - }) + sources."onetime-5.1.2" + sources."open-8.4.0" + sources."ora-5.4.1" sources."os-homedir-1.0.2" - sources."os-name-3.1.0" sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."p-any-2.1.0" @@ -153486,7 +150418,25 @@ in ]; }) sources."p-try-1.0.0" - sources."package-json-5.0.0" + (sources."package-json-7.0.0" // { + dependencies = [ + sources."@sindresorhus/is-4.6.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."got-11.8.6" + sources."http-cache-semantics-4.1.1" + sources."json-buffer-3.0.1" + sources."keyv-4.5.2" + sources."lowercase-keys-2.0.0" + sources."mimic-response-3.1.0" + sources."normalize-url-6.1.0" + sources."responselike-2.0.1" + sources."semver-7.3.8" + ]; + }) (sources."pacote-12.0.3" // { dependencies = [ sources."mkdirp-1.0.4" @@ -153495,15 +150445,13 @@ in sources."pad-component-0.0.1" sources."parse-conflict-json-2.0.2" sources."parse-help-1.0.0" - sources."parse-json-2.2.0" + sources."parse-json-4.0.0" sources."passwd-user-3.0.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" + sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-type-4.0.0" - sources."performance-now-2.1.0" sources."picomatch-2.3.1" sources."pify-3.0.0" sources."pinkie-2.0.4" @@ -153518,7 +150466,6 @@ in sources."path-exists-4.0.0" ]; }) - sources."pkg-up-2.0.0" (sources."preferred-pm-3.0.3" // { dependencies = [ sources."find-up-5.0.0" @@ -153537,34 +150484,34 @@ in sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" sources."proto-list-1.2.4" - sources."pseudomap-1.0.2" - sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.1.1" - sources."qs-6.5.3" + sources."pupa-2.1.1" sources."query-string-5.1.1" sources."queue-microtask-1.2.3" + sources."quick-lru-1.1.0" sources."rc-1.2.8" sources."read-cmd-shim-3.0.1" sources."read-package-json-fast-2.0.3" - (sources."read-pkg-1.1.0" // { + (sources."read-pkg-3.0.0" // { dependencies = [ - sources."path-type-1.1.0" - sources."pify-2.3.0" + sources."path-type-3.0.0" ]; }) - (sources."read-pkg-up-4.0.0" // { + (sources."read-pkg-up-7.0.1" // { dependencies = [ - sources."find-up-3.0.0" - sources."load-json-file-4.0.0" - sources."locate-path-3.0.0" + sources."find-up-4.1.0" + sources."locate-path-5.0.0" sources."p-limit-2.3.0" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."parse-json-4.0.0" - sources."path-type-3.0.0" - sources."read-pkg-3.0.0" - sources."strip-bom-3.0.0" + sources."parse-json-5.2.0" + sources."path-exists-4.0.0" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."type-fest-0.6.0" + ]; + }) + sources."type-fest-0.8.1" ]; }) (sources."readable-stream-2.3.7" // { @@ -153573,25 +150520,20 @@ in ]; }) sources."readdir-scoped-modules-1.1.0" - (sources."redent-1.0.0" // { + (sources."redent-2.0.0" // { dependencies = [ - sources."indent-string-2.1.0" + sources."indent-string-3.2.0" ]; }) - sources."regenerator-runtime-0.13.10" - sources."registry-auth-token-3.4.0" - sources."registry-url-3.1.0" + sources."regenerator-runtime-0.13.11" + sources."registry-auth-token-4.2.2" + sources."registry-url-5.1.0" sources."remove-trailing-separator-1.1.0" - sources."repeating-2.0.1" sources."replace-ext-1.0.1" - (sources."request-2.88.2" // { - dependencies = [ - sources."tough-cookie-2.5.0" - ]; - }) sources."resolve-1.22.1" + sources."resolve-alpn-1.2.1" sources."responselike-1.0.2" - sources."restore-cursor-2.0.0" + sources."restore-cursor-3.1.0" sources."retry-0.12.0" sources."reusify-1.0.4" (sources."rimraf-3.0.2" // { @@ -153604,23 +150546,27 @@ in sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."rx-4.1.0" - sources."rxjs-6.6.7" + sources."rxjs-7.8.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."scoped-regex-2.1.0" - sources."semver-5.7.1" + sources."semver-6.3.0" sources."semver-compare-1.0.0" - sources."semver-diff-2.1.0" + sources."semver-diff-3.1.1" sources."semver-regex-2.0.0" - sources."semver-truncate-1.1.2" + (sources."semver-truncate-1.1.2" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) (sources."serialize-error-7.0.1" // { dependencies = [ sources."type-fest-0.13.1" ]; }) sources."set-blocking-2.0.0" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."smart-buffer-4.2.0" @@ -153632,57 +150578,41 @@ in ]; }) sources."sort-keys-2.0.0" - (sources."sort-on-3.0.0" // { - dependencies = [ - sources."arrify-1.0.1" - ]; - }) + sources."sort-on-4.1.1" sources."spawn-sync-1.0.15" 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.12" sources."sprintf-js-1.1.2" - sources."sshpk-1.17.0" sources."ssri-8.0.1" sources."strict-uri-encode-1.1.0" - (sources."string-length-2.0.0" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) + sources."string-length-4.0.2" + sources."string-width-4.2.3" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.1" - ]; - }) + sources."strip-ansi-6.0.1" sources."strip-bom-2.0.0" sources."strip-bom-buf-1.0.0" sources."strip-bom-stream-2.0.0" sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" - sources."strip-indent-1.0.1" + sources."strip-indent-2.0.0" sources."strip-json-comments-2.0.1" (sources."sudo-block-1.2.0" // { dependencies = [ sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."chalk-1.1.3" + sources."is-docker-1.1.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" ]; }) - sources."supports-color-5.5.0" + sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" (sources."tabtab-1.3.2" // { dependencies = [ @@ -153691,6 +150621,7 @@ in sources."ansi-styles-2.2.1" sources."chalk-1.1.3" sources."cli-cursor-1.0.2" + sources."cli-width-2.2.1" sources."external-editor-1.1.1" sources."figures-1.7.0" sources."inquirer-1.2.3" @@ -153705,34 +150636,24 @@ in ]; }) sources."taketalk-1.0.0" - (sources."tar-6.1.12" // { + (sources."tar-6.1.13" // { dependencies = [ + sources."minipass-4.0.0" sources."mkdirp-1.0.4" ]; }) - (sources."term-size-1.2.0" // { - dependencies = [ - sources."cross-spawn-5.1.0" - sources."execa-0.7.0" - sources."get-stream-3.0.0" - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) sources."text-table-0.2.0" sources."textextensions-5.15.0" sources."through-2.3.8" sources."timed-out-4.0.1" - sources."titleize-1.0.1" + sources."titleize-2.1.0" sources."tmp-0.0.33" + sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" - sources."tough-cookie-3.0.1" sources."treeverse-1.0.4" - sources."trim-newlines-1.0.0" - sources."tslib-1.14.1" + sources."trim-newlines-2.0.0" + sources."tslib-2.5.0" sources."tunnel-0.0.6" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" (sources."twig-1.15.4" // { dependencies = [ sources."brace-expansion-1.1.11" @@ -153741,26 +150662,28 @@ in }) sources."type-fest-0.3.1" sources."typedarray-0.0.6" + sources."typedarray-to-buffer-3.1.5" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" - sources."unique-string-1.0.0" + sources."unique-string-2.0.0" sources."untildify-4.0.0" sources."unzip-response-2.0.1" - sources."update-notifier-2.5.0" - sources."uri-js-4.4.1" + (sources."update-notifier-5.1.0" // { + dependencies = [ + sources."semver-7.3.8" + ]; + }) sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" - (sources."verror-1.10.0" // { + (sources."vinyl-2.2.1" // { dependencies = [ - sources."core-util-is-1.0.2" + sources."clone-2.1.2" ]; }) - sources."vinyl-2.2.1" (sources."vinyl-file-3.0.0" // { dependencies = [ sources."pify-2.3.0" @@ -153769,103 +150692,98 @@ in sources."walk-2.3.15" sources."walk-up-path-1.0.0" sources."wcwidth-1.0.1" - sources."which-1.3.1" + sources."which-2.0.2" (sources."which-pm-2.0.0" // { dependencies = [ sources."path-exists-4.0.0" ]; }) sources."wide-align-1.1.5" - sources."widest-line-2.0.1" - sources."windows-release-3.3.3" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-regex-5.0.1" - 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."strip-ansi-6.0.1" - ]; - }) + sources."widest-line-3.1.0" + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.3" - sources."xdg-basedir-3.0.0" + sources."write-file-atomic-3.0.3" + sources."xdg-basedir-4.0.0" + sources."xregexp-4.0.0" sources."yallist-4.0.0" + sources."yargs-parser-10.1.0" (sources."yeoman-character-1.1.0" // { dependencies = [ sources."has-flag-1.0.0" sources."supports-color-3.2.3" ]; }) - sources."yeoman-doctor-5.0.0" - (sources."yeoman-environment-3.12.1" // { + (sources."yeoman-doctor-5.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."get-stream-3.0.0" + (sources."global-agent-2.2.0" // { + dependencies = [ + sources."semver-7.3.8" + ]; + }) + sources."got-6.7.1" + sources."has-flag-3.0.0" + sources."latest-version-3.1.0" + sources."log-symbols-2.2.0" + sources."package-json-4.0.1" + sources."prepend-http-1.0.4" + sources."registry-auth-token-3.4.0" + sources."registry-url-3.1.0" + sources."semver-5.7.1" + sources."supports-color-5.5.0" + sources."url-parse-lax-1.0.0" + ]; + }) + (sources."yeoman-environment-3.13.0" // { dependencies = [ - sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" sources."are-we-there-yet-2.0.0" - sources."chalk-4.1.2" - sources."cli-cursor-3.1.0" - sources."cli-width-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."cross-spawn-7.0.3" sources."debug-4.3.4" sources."escape-string-regexp-4.0.0" sources."execa-5.1.1" - (sources."figures-3.2.0" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) sources."find-up-5.0.0" sources."gauge-3.0.2" sources."get-stream-6.0.1" - sources."has-flag-4.0.0" - sources."inquirer-8.2.5" - sources."is-fullwidth-code-point-3.0.0" sources."is-stream-2.0.1" sources."locate-path-6.0.0" - sources."log-symbols-4.1.0" sources."ms-2.1.2" - sources."mute-stream-0.0.8" sources."npm-run-path-4.0.1" sources."npmlog-5.0.1" - sources."onetime-5.1.2" sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."path-exists-4.0.0" - sources."path-key-3.1.1" sources."readable-stream-3.6.0" - sources."restore-cursor-3.1.0" - sources."rxjs-7.5.7" sources."semver-7.3.8" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."supports-color-7.2.0" - sources."tslib-2.4.1" - sources."type-fest-0.21.3" - sources."which-2.0.2" ]; }) sources."yocto-queue-0.1.0" (sources."yosay-2.0.2" // { dependencies = [ sources."ansi-regex-2.1.1" + sources."ansi-styles-3.2.1" (sources."chalk-1.1.3" // { dependencies = [ sources."ansi-styles-2.2.1" ]; }) - sources."is-fullwidth-code-point-1.0.0" + sources."cli-boxes-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."is-fullwidth-code-point-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.1" + sources."strip-ansi-4.0.0" + ]; + }) sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" (sources."wrap-ansi-2.1.0" // { dependencies = [ + sources."is-fullwidth-code-point-1.0.0" sources."string-width-1.0.2" ]; }) @@ -153885,10 +150803,10 @@ in "@zwave-js/server" = nodeEnv.buildNodePackage { name = "_at_zwave-js_slash_server"; packageName = "@zwave-js/server"; - version = "1.24.1"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/server/-/server-1.24.1.tgz"; - sha512 = "QRBETwKH0V8jTyRXyvko/gdhGck8cXEK/8rnoGAtWjpch/tr83HXNJMdZZhD6KLO9iDl5avWeA+w1m226lwTGg=="; + url = "https://registry.npmjs.org/@zwave-js/server/-/server-1.25.0.tgz"; + sha512 = "+2WlJQ7M9D0mNrE1ovEFNqmDyhewY0kIMtddbbZVGtV2YYRzdBTZfqqwfzFhUAFdeEMyOn6gSIHDmw66t8FbSQ=="; }; dependencies = [ sources."@alcalzone/jsonl-db-2.5.3" @@ -153897,63 +150815,63 @@ in sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" sources."@esm2cjs/cacheable-lookup-7.0.0" - sources."@esm2cjs/cacheable-request-10.2.2" - sources."@esm2cjs/form-data-encoder-2.1.3" - sources."@esm2cjs/got-12.5.2" + sources."@esm2cjs/cacheable-request-10.2.5" + sources."@esm2cjs/form-data-encoder-2.1.4" + sources."@esm2cjs/got-12.5.3" sources."@esm2cjs/http-timer-5.0.1" sources."@esm2cjs/is-5.3.0" sources."@esm2cjs/lowercase-keys-3.0.0" sources."@esm2cjs/mimic-response-4.0.0" - sources."@esm2cjs/normalize-url-7.2.0" + sources."@esm2cjs/normalize-url-8.0.0" sources."@esm2cjs/p-cancelable-3.0.0" sources."@esm2cjs/p-queue-7.3.0" sources."@esm2cjs/p-timeout-5.1.0" sources."@esm2cjs/responselike-3.0.0" sources."@homebridge/ciao-1.1.5" - (sources."@sentry/core-7.17.4" // { + (sources."@sentry/core-7.34.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/integrations-7.17.4" // { + (sources."@sentry/integrations-7.34.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/node-7.17.4" // { + (sources."@sentry/node-7.34.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - sources."@sentry/types-7.17.4" - (sources."@sentry/utils-7.17.4" // { + sources."@sentry/types-7.34.0" + (sources."@sentry/utils-7.34.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) sources."@serialport/binding-mock-10.2.2" - sources."@serialport/bindings-cpp-10.7.0" - sources."@serialport/bindings-interface-1.2.1" - sources."@serialport/parser-byte-length-10.3.0" - sources."@serialport/parser-cctalk-10.3.0" - sources."@serialport/parser-delimiter-10.3.0" - sources."@serialport/parser-inter-byte-timeout-10.3.0" - sources."@serialport/parser-packet-length-10.3.0" - sources."@serialport/parser-readline-10.3.0" - sources."@serialport/parser-ready-10.3.0" - sources."@serialport/parser-regex-10.3.0" - sources."@serialport/parser-slip-encoder-10.3.0" - sources."@serialport/parser-spacepacket-10.3.0" - sources."@serialport/stream-10.3.0" + sources."@serialport/bindings-cpp-10.8.0" + sources."@serialport/bindings-interface-1.2.2" + sources."@serialport/parser-byte-length-10.5.0" + sources."@serialport/parser-cctalk-10.5.0" + sources."@serialport/parser-delimiter-10.5.0" + sources."@serialport/parser-inter-byte-timeout-10.5.0" + sources."@serialport/parser-packet-length-10.5.0" + sources."@serialport/parser-readline-10.5.0" + sources."@serialport/parser-ready-10.5.0" + sources."@serialport/parser-regex-10.5.0" + sources."@serialport/parser-slip-encoder-10.5.0" + sources."@serialport/parser-spacepacket-10.5.0" + sources."@serialport/stream-10.5.0" sources."@types/http-cache-semantics-4.0.1" - sources."@zwave-js/cc-10.3.0" - sources."@zwave-js/config-10.3.0" - sources."@zwave-js/core-10.3.0" - sources."@zwave-js/host-10.3.0" - sources."@zwave-js/nvmedit-10.3.0" - sources."@zwave-js/serial-10.3.0" - sources."@zwave-js/shared-10.3.0" - sources."@zwave-js/testing-10.3.0" + sources."@zwave-js/cc-10.5.2" + sources."@zwave-js/config-10.5.2" + sources."@zwave-js/core-10.5.0" + sources."@zwave-js/host-10.5.2" + sources."@zwave-js/nvmedit-10.5.0" + sources."@zwave-js/serial-10.5.2" + sources."@zwave-js/shared-10.4.0" + sources."@zwave-js/testing-10.5.2" sources."agent-base-6.0.2" sources."alcalzone-shared-4.0.8" sources."ansi-colors-4.1.3" @@ -153976,7 +150894,7 @@ in sources."colorspace-1.1.4" sources."cookie-0.4.2" sources."cross-spawn-7.0.3" - sources."dayjs-1.11.6" + sources."dayjs-1.11.7" sources."debug-4.3.4" sources."decompress-response-6.0.0" sources."defer-to-connect-2.0.1" @@ -153994,8 +150912,8 @@ in sources."get-caller-file-2.0.5" sources."get-stream-6.0.1" sources."graceful-fs-4.2.10" - sources."http-cache-semantics-4.1.0" - sources."http2-wrapper-2.1.11" + sources."http-cache-semantics-4.1.1" + sources."http2-wrapper-2.2.0" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" sources."immediate-3.0.6" @@ -154006,9 +150924,9 @@ in sources."isexe-2.0.0" sources."json-buffer-3.0.1" sources."json-logic-js-2.0.2" - sources."json5-2.2.1" + sources."json5-2.2.3" sources."jsonfile-6.1.0" - sources."keyv-4.5.1" + sources."keyv-4.5.2" sources."kuler-2.0.0" sources."lie-3.1.1" sources."localforage-1.10.0" @@ -154022,8 +150940,8 @@ in sources."minimist-1.2.7" sources."moment-2.29.4" sources."ms-2.1.2" - sources."node-addon-api-4.3.0" - sources."node-gyp-build-4.5.0" + sources."node-addon-api-5.1.0" + sources."node-gyp-build-4.6.0" sources."npm-run-path-4.0.1" sources."nrf-intel-hex-1.3.0" sources."object-hash-2.2.0" @@ -154039,9 +150957,9 @@ in sources."responselike-3.0.0" sources."retry-0.12.0" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-2.4.1" + sources."safe-stable-stringify-2.4.2" sources."semver-7.3.8" - sources."serialport-10.4.0" + sources."serialport-10.5.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" @@ -154055,22 +150973,22 @@ in sources."strip-final-newline-2.0.0" sources."text-hex-1.0.0" sources."triple-beam-1.3.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."universalify-2.0.0" - sources."utf-8-validate-5.0.10" + sources."utf-8-validate-6.0.2" sources."util-deprecate-1.0.2" sources."which-2.0.2" sources."winston-3.8.2" sources."winston-daily-rotate-file-4.7.1" sources."winston-transport-4.5.0" sources."wrap-ansi-7.0.0" - sources."ws-8.11.0" + sources."ws-8.12.0" sources."xstate-4.29.0" sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.6.2" sources."yargs-parser-21.1.1" - sources."zwave-js-10.3.0" + sources."zwave-js-10.5.4" ]; buildInputs = globalBuildInputs; meta = { @@ -154096,26 +151014,26 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.13" sources."@types/minimist-1.2.2" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/ps-tree-1.1.2" sources."@types/which-2.0.1" sources."braces-3.0.2" - sources."chalk-5.1.2" - sources."data-uri-to-buffer-4.0.0" + sources."chalk-5.2.0" + sources."data-uri-to-buffer-4.0.1" sources."dir-glob-3.0.1" sources."duplexer-0.1.2" sources."event-stream-3.3.4" sources."fast-glob-3.2.12" - sources."fastq-1.13.0" + sources."fastq-1.15.0" sources."fetch-blob-3.2.0" sources."fill-range-7.0.1" sources."formdata-polyfill-4.0.10" sources."from-0.1.7" sources."fs-extra-10.1.0" sources."glob-parent-5.1.2" - sources."globby-13.1.2" + sources."globby-13.1.3" sources."graceful-fs-4.2.10" - sources."ignore-5.2.0" + sources."ignore-5.2.4" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" @@ -154142,7 +151060,7 @@ in sources."universalify-2.0.0" sources."web-streams-polyfill-3.2.1" sources."which-2.0.2" - sources."yaml-2.1.3" + sources."yaml-2.2.1" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index bb73049be66a..1ecf716329b9 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -135,10 +135,6 @@ final: prev: { meta = oldAttrs.meta // { broken = since "12"; }; }); - deltachat-desktop = prev."deltachat-desktop-../../applications/networking/instant-messengers/deltachat-desktop".override (oldAttrs: { - meta = oldAttrs.meta // { broken = true; }; # use the top-level package instead - }); - eask = prev."@emacs-eask/cli".override { name = "eask"; }; @@ -365,10 +361,6 @@ final: prev: { ''; }; - photoprism-frontend = prev."photoprism-frontend-../../servers/photoprism".override { - meta.broken = true; # use the top-level package instead - }; - pnpm = prev.pnpm.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; @@ -414,7 +406,7 @@ final: prev: { src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-TAnObUMGCM9NLt9nsRs1WWYQGPKsJOK8bN/7gSAnBcYIxMCFFDe+XtFYJbyTzsJZ/i+0rH4zg8au3m7HX354LA=="; + sha512 = "sha512-bS96oZ5oDFXYgoF2l7PJ3Mp1wWWfLOo8B/jAfbA2Pn0Wm5Z/owBHzaMQKS3i1CzVBDWWPVnOohmbJmjvkcHS5w=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ @@ -444,6 +436,26 @@ final: prev: { ''; }; + readability-cli = prev.readability-cli.override (oldAttrs: { + # Wrap src to fix this build error: + # > readability-cli/readable.ts: unsupported interpreter directive "#!/usr/bin/env -S deno..." + # + # Need to wrap the source, instead of patching in patchPhase, because + # buildNodePackage only unpacks sources in the installPhase. + src = pkgs.srcOnly { + src = oldAttrs.src; + name = oldAttrs.name; + patchPhase = "chmod a-x readable.ts"; + }; + + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = with pkgs; [ + pixman + cairo + pango + ]; + }); + reveal-md = prev.reveal-md.override ( lib.optionalAttrs (!stdenv.isDarwin) { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; @@ -457,6 +469,10 @@ final: prev: { } ); + rush = prev."@microsoft/rush".override { + name = "rush"; + }; + ssb-server = prev.ssb-server.override (oldAttrs: { buildInputs = [ pkgs.automake pkgs.autoconf final.node-gyp-build ]; meta = oldAttrs.meta // { broken = since "10"; }; @@ -561,8 +577,7 @@ final: prev: { typescript-language-server = prev.typescript-language-server.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' - wrapProgram "$out/bin/typescript-language-server" \ - --suffix PATH : ${lib.makeBinPath [ final.typescript ]} + ${pkgs.xorg.lndir}/bin/lndir ${final.typescript} $out ''; }; diff --git a/pkgs/development/ocaml-modules/afl-persistent/default.nix b/pkgs/development/ocaml-modules/afl-persistent/default.nix index ba266ade830e..04d31c881561 100644 --- a/pkgs/development/ocaml-modules/afl-persistent/default.nix +++ b/pkgs/development/ocaml-modules/afl-persistent/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "06yyds2vcwlfr2nd3gvyrazlijjcrd1abnvkfpkaadgwdw3qam1i"; }; + strictDeps = true; + nativeBuildInputs = [ ocaml findlib ]; # don't run tests in buildPhase diff --git a/pkgs/development/ocaml-modules/ansiterminal/default.nix b/pkgs/development/ocaml-modules/ansiterminal/default.nix index edd40fb4df29..f421e59ce7da 100644 --- a/pkgs/development/ocaml-modules/ansiterminal/default.nix +++ b/pkgs/development/ocaml-modules/ansiterminal/default.nix @@ -1,16 +1,12 @@ -{ lib, buildDunePackage, fetchFromGitHub }: +{ lib, buildDunePackage, fetchurl }: buildDunePackage rec { pname = "ANSITerminal"; - version = "0.8.2"; + version = "0.8.5"; - useDune2 = true; - - src = fetchFromGitHub { - owner = "Chris00"; - repo = pname; - rev = version; - sha256 = "0dyjischrgwlxqz1p5zbqq76jvk6pl1qj75i7ydhijssr9pj278d"; + src = fetchurl { + url = "https://github.com/Chris00/ANSITerminal/releases/download/${version}/ANSITerminal-${version}.tbz"; + hash = "sha256-q3OyGLajAmfSu8QzEtzzE5gbiwvsVV2SsGuHZkst0w4="; }; doCheck = true; @@ -22,7 +18,7 @@ buildDunePackage rec { movements on ANSI terminals. It also works on the windows shell (but this part is currently work in progress). ''; - inherit (src.meta) homepage; + homepage = "https://github.com/Chris00/ANSITerminal"; license = licenses.lgpl3; maintainers = [ maintainers.jirkamarsik ]; }; diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index bfef3d5b6c66..fddf128d0d9b 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl }: +{ stdenv, lib, fetchFromGitHub, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl +, gnumake42 +}: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-apron"; @@ -10,10 +12,12 @@ stdenv.mkDerivation rec { sha256 = "14ymjahqdxj26da8wik9d5dzlxn81b3z1iggdl7rn2nn06jy7lvy"; }; - nativeBuildInputs = [ ocaml findlib perl ]; + # fails with make 4.4 + nativeBuildInputs = [ ocaml findlib perl gnumake42 ]; buildInputs = [ gmp mpfr ppl camlidl ]; propagatedBuildInputs = [ mlgmpidl ]; + # TODO: Doesn't produce the library correctly if true strictDeps = false; outputs = [ "out" "bin" "dev" ]; diff --git a/pkgs/development/ocaml-modules/arp/default.nix b/pkgs/development/ocaml-modules/arp/default.nix index 997e46e274f6..4c98f5b377bc 100644 --- a/pkgs/development/ocaml-modules/arp/default.nix +++ b/pkgs/development/ocaml-modules/arp/default.nix @@ -15,8 +15,8 @@ buildDunePackage rec { sha256 = "1x3l8v96ywc3wrcwbf0j04b8agap4fif0fz6ki2ndzx57yqcjszn"; }; - minimumOCamlVersion = "4.06"; - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; nativeBuildInputs = [ bisect_ppx diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix index 0658130f9e04..07ee079cae30 100644 --- a/pkgs/development/ocaml-modules/atdgen/default.nix +++ b/pkgs/development/ocaml-modules/atdgen/default.nix @@ -11,9 +11,8 @@ buildDunePackage { propagatedBuildInputs = [ atdgen-runtime ]; doCheck = true; - checkInputs = [ alcotest atdgen-codec-runtime - (python3.withPackages (ps: [ ps.jsonschema ])) - ]; + nativeCheckInputs = [ atd (python3.withPackages (ps: [ ps.jsonschema ]))]; + checkInputs = [ alcotest atdgen-codec-runtime ]; meta = (builtins.removeAttrs atd.meta [ "mainProgram" ]) // { description = "Generates efficient JSON serializers, deserializers and validators"; diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix index 4ba54c48d2e3..fd0bf82df343 100644 --- a/pkgs/development/ocaml-modules/awa/default.nix +++ b/pkgs/development/ocaml-modules/awa/default.nix @@ -8,17 +8,16 @@ buildDunePackage rec { pname = "awa"; - version = "0.1.0"; + version = "0.1.1"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-${version}.tbz"; - sha256 = "sha256-aPnFDp52oYVHr/56lFw0gtVJ0KvHawyM5FGtpHPOVY8="; + hash = "sha256-ae1gTx3Emmkof/2Gnhq0d5RyfkFx21hHkVEVgyPdXuo="; }; - nativeBuildInputs = [ ppx_cstruct ]; - propagatedBuildInputs = [ mirage-crypto mirage-crypto-ec mirage-crypto-rng mirage-crypto-pk x509 cstruct cstruct-sexp sexplib mtime @@ -26,6 +25,8 @@ buildDunePackage rec { ppx_sexp_conv eqaf ]; + buildInputs = [ ppx_cstruct ]; + doCheck = true; checkInputs = [ cstruct-unix cmdliner fmt ]; diff --git a/pkgs/development/ocaml-modules/awa/lwt.nix b/pkgs/development/ocaml-modules/awa/lwt.nix index 57f4d5a23a09..241df784ad59 100644 --- a/pkgs/development/ocaml-modules/awa/lwt.nix +++ b/pkgs/development/ocaml-modules/awa/lwt.nix @@ -7,11 +7,14 @@ buildDunePackage { inherit (awa) version src; + duneVersion = "3"; + propagatedBuildInputs = [ awa cstruct mtime lwt mirage-crypto-rng ]; doCheck = true; + nativeCheckInputs = [ awa ]; checkInputs = [ cstruct-unix ]; meta = awa.meta // { mainProgram = "awa_lwt_server"; }; diff --git a/pkgs/development/ocaml-modules/awa/mirage.nix b/pkgs/development/ocaml-modules/awa/mirage.nix index 8513e5741048..ebf3ad23fc5b 100644 --- a/pkgs/development/ocaml-modules/awa/mirage.nix +++ b/pkgs/development/ocaml-modules/awa/mirage.nix @@ -8,6 +8,8 @@ buildDunePackage { inherit (awa) version src; + duneVersion = "3"; + propagatedBuildInputs = [ awa cstruct mtime lwt mirage-flow mirage-clock logs duration mirage-time diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 4585f731e3c6..0d2b4247bd42 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which makeWrapper ocaml findlib ocamlbuild ocaml_oasis ]; - buildInputs = [ linenoise + buildInputs = [ ocamlbuild + linenoise ounit ppx_bitstring z3 diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix index 7310bb968ffc..db1a4e856467 100644 --- a/pkgs/development/ocaml-modules/base64/default.nix +++ b/pkgs/development/ocaml-modules/base64/default.nix @@ -1,18 +1,18 @@ -{ lib, fetchurl, buildDunePackage, ocaml, alcotest, bos, rresult }: +{ lib, fetchurl, buildDunePackage, ocaml, findlib, alcotest, bos, rresult }: buildDunePackage rec { pname = "base64"; version = "3.5.0"; - minimumOCamlVersion = "4.03"; - - useDune2 = true; + minimalOCamlVersion = "4.03"; src = fetchurl { url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-v${version}.tbz"; sha256 = "sha256-WJ3pwAV46/54QZismBjTWGxHSyMWts0+HEbMsfYq46Q="; }; + nativeBuildInputs = [ findlib ]; + # otherwise fmt breaks evaluation doCheck = lib.versionAtLeast ocaml.version "4.08"; checkInputs = [ alcotest bos rresult ]; diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index a6536865d884..38a28eafae8d 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, qcheck, num, ounit +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, qcheck, num, camlp-streams , doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64 }: @@ -8,20 +8,21 @@ else stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-batteries"; - version = "3.5.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "ocaml-batteries-team"; repo = "batteries-included"; rev = "v${version}"; - sha256 = "sha256-lLlpsg1v7mYFJ61rTdLV2v8/McK1R4HDTTuyka48aBw="; + hash = "sha256-D/0h0/70V8jmzHIUR6i2sT2Jz9/+tfR2dQgp4Bxtimc="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - checkInputs = [ qtest ounit qcheck ]; - propagatedBuildInputs = [ num ]; + nativeCheckInputs = [ qtest ]; + checkInputs = [ qcheck ]; + propagatedBuildInputs = [ camlp-streams num ]; - strictDeps = !doCheck; + strictDeps = true; inherit doCheck; checkTarget = "test"; @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = { - homepage = "http://batteries.forge.ocamlcore.org/"; + homepage = "https://ocaml-batteries-team.github.io/batteries-included/hdoc2/"; description = "OCaml Batteries Included"; longDescription = '' A community-driven effort to standardize on an consistent, documented, diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix index 0f5722a44acf..6c579e127184 100644 --- a/pkgs/development/ocaml-modules/benchmark/default.nix +++ b/pkgs/development/ocaml-modules/benchmark/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "16wi8ld7c3mq77ylpgbnj8qqqqimyzwxs47v06vyrwpma5pab5xa"; }; + strictDeps = true; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; buildInputs = [ ocaml_pcre ]; - strictDeps = true; - createFindlibDestdir = true; meta = { diff --git a/pkgs/development/ocaml-modules/bigarray-overlap/default.nix b/pkgs/development/ocaml-modules/bigarray-overlap/default.nix index c702faee8f82..2674369f37e0 100644 --- a/pkgs/development/ocaml-modules/bigarray-overlap/default.nix +++ b/pkgs/development/ocaml-modules/bigarray-overlap/default.nix @@ -14,8 +14,6 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; useDune2 = true; - strictDeps = !doCheck; - propagatedBuildInputs = [ bigarray-compat ]; nativeBuildInputs = [ findlib pkg-config ]; diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/pkgs/development/ocaml-modules/bigstringaf/default.nix index 8ef32fd33ea1..08f50ea53e19 100644 --- a/pkgs/development/ocaml-modules/bigstringaf/default.nix +++ b/pkgs/development/ocaml-modules/bigstringaf/default.nix @@ -13,9 +13,6 @@ buildDunePackage rec { sha256 = "sha256-HXPjnE56auy2MI6HV2XuBX/VeqsO50HFzTul17lKEqE="; }; - # This currently fails with dune - strictDeps = false; - nativeBuildInputs = [ pkg-config ]; checkInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index ff3b87699356..2c58a4081401 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -1,29 +1,19 @@ -{ lib, fetchFromGitHub, buildDunePackage, easy-format }: +{ lib, fetchurl, buildDunePackage, camlp-streams, easy-format }: buildDunePackage rec { pname = "biniou"; - version = "1.2.1"; + version = "1.2.2"; - useDune2 = true; - - src = fetchFromGitHub { - owner = "ocaml-community"; - repo = pname; - rev = version; - sha256 = "0x2kiy809n1j0yf32l7hj102y628jp5jdrkbi3z7ld8jq04h1790"; + src = fetchurl { + url = "https://github.com/ocaml-community/biniou/releases/download/${version}/biniou-${version}.tbz"; + hash = "sha256-i/P/F80Oyy1rbR2UywjvCJ1Eyu+W6brmvmg51Cj6MY8="; }; - propagatedBuildInputs = [ easy-format ]; - - strictDeps = true; - - postPatch = '' - patchShebangs . - ''; + propagatedBuildInputs = [ camlp-streams easy-format ]; meta = { description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; - inherit (src.meta) homepage; + homepage = "https://github.com/ocaml-community/biniou"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.vbgl ]; mainProgram = "bdump"; diff --git a/pkgs/development/ocaml-modules/biocaml/default.nix b/pkgs/development/ocaml-modules/biocaml/default.nix index f60a2c24ef9f..006316295e49 100644 --- a/pkgs/development/ocaml-modules/biocaml/default.nix +++ b/pkgs/development/ocaml-modules/biocaml/default.nix @@ -1,6 +1,7 @@ { lib, buildDunePackage, fetchFromGitHub, fetchpatch , ounit, async, base64, camlzip, cfstream -, core, ppx_jane, ppx_sexp_conv, rresult, uri, xmlm }: +, core, ppx_jane, ppx_sexp_conv, rresult, uri, xmlm +}: buildDunePackage rec { pname = "biocaml"; @@ -10,8 +11,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "biocaml"; - repo = pname; - rev = "v${version}"; + repo = pname; + rev = "v${version}"; sha256 = "01yw12yixs45ya1scpb9jy2f7dw1mbj7741xib2xpq3kkc1hc21s"; }; diff --git a/pkgs/development/ocaml-modules/bitv/default.nix b/pkgs/development/ocaml-modules/bitv/default.nix index a986a46f2935..25906f1432f0 100644 --- a/pkgs/development/ocaml-modules/bitv/default.nix +++ b/pkgs/development/ocaml-modules/bitv/default.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook which ocaml findlib ]; - strictDeps = true; - createFindlibDestdir = true; meta = { diff --git a/pkgs/development/ocaml-modules/bjack/default.nix b/pkgs/development/ocaml-modules/bjack/default.nix index fa03194bde4a..197d31638d61 100644 --- a/pkgs/development/ocaml-modules/bjack/default.nix +++ b/pkgs/development/ocaml-modules/bjack/default.nix @@ -1,19 +1,17 @@ -{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, libsamplerate, libjack2 }: +{ lib, stdenv, buildDunePackage, fetchFromGitHub, Accelerate, CoreAudio, dune-configurator, libsamplerate, libjack2 }: buildDunePackage rec { pname = "bjack"; version = "0.1.6"; - useDune2 = true; - src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-bjack"; rev = "v${version}"; - sha256 = "1gf31a8i9byp6npn0x6gydcickn6sf5dnzmqr2c1b9jn2nl7334c"; + hash = "sha256-jIxxqBVWphWYyLh+24rTxk4WWfPPdGCvNdevFJEKw70="; }; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreAudio ]; propagatedBuildInputs = [ libsamplerate libjack2 ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/bls12-381-signature/default.nix b/pkgs/development/ocaml-modules/bls12-381-signature/default.nix index e8e43c31a24e..db0a383f925e 100644 --- a/pkgs/development/ocaml-modules/bls12-381-signature/default.nix +++ b/pkgs/development/ocaml-modules/bls12-381-signature/default.nix @@ -1,11 +1,11 @@ -{ - lib, - fetchzip, - buildDunePackage, - bls12-381, - alcotest, - bisect_ppx, - integers_stubs_js, +{ lib +, fetchzip +, buildDunePackage +, bls12-381 +, alcotest +, bisect_ppx +, integers_stubs_js +, }: buildDunePackage rec { @@ -20,7 +20,7 @@ buildDunePackage rec { propagatedBuildInputs = [ bls12-381 ]; - checkInputs = [alcotest bisect_ppx integers_stubs_js]; + checkInputs = [ alcotest bisect_ppx integers_stubs_js ]; doCheck = true; @@ -28,6 +28,6 @@ buildDunePackage rec { description = "Implementation of BLS signatures for the pairing-friendly curve BLS12-381"; license = lib.licenses.mit; homepage = "https://gitlab.com/nomadic-labs/cryptography/ocaml-bls12-381-signature"; - maintainers = [lib.maintainers.ulrikstrid]; + maintainers = [ lib.maintainers.ulrikstrid ]; }; } diff --git a/pkgs/development/ocaml-modules/bls12-381/default.nix b/pkgs/development/ocaml-modules/bls12-381/default.nix index ed2fbeb3158a..6c1ff541c5f9 100644 --- a/pkgs/development/ocaml-modules/bls12-381/default.nix +++ b/pkgs/development/ocaml-modules/bls12-381/default.nix @@ -1,6 +1,7 @@ { lib, buildDunePackage, fetchFromGitLab , ff-sig, zarith, zarith_stubs_js, integers_stubs_js, integers, hex -, alcotest, ff-pbt }: +, alcotest, ff-pbt +}: buildDunePackage rec { pname = "bls12-381"; diff --git a/pkgs/development/ocaml-modules/brr/default.nix b/pkgs/development/ocaml-modules/brr/default.nix new file mode 100644 index 000000000000..709a9b092926 --- /dev/null +++ b/pkgs/development/ocaml-modules/brr/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchurl +, ocaml, findlib, ocamlbuild, topkg +, js_of_ocaml-compiler +, js_of_ocaml-toplevel +, note +}: + +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-brr"; + version = "0.0.4"; + src = fetchurl { + url = "https://erratique.ch/software/brr/releases/brr-${version}.tbz"; + hash = "sha256-v+Ik1tdRBVnNDqhmNoJuLelL3k5OhxIsUorGdTb9sbw="; + }; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; + propagatedBuildInputs = [ js_of_ocaml-compiler js_of_ocaml-toplevel note ]; + inherit (topkg) buildPhase installPhase; + + meta = { + homepage = "https://erratique.ch/software/brr"; + description = "A toolkit for programming browsers in OCaml"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix index c7712a14b9c7..1dab8e4911e0 100644 --- a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix @@ -14,17 +14,16 @@ buildDunePackage rec { pname = "ca-certs-nss"; - version = "3.77"; + version = "3.86"; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-${version}.tbz"; - sha256 = "sha256-Ezos9A2AQOo43R9akVbJ5l+euTDtguzMfH63YXo9hvc="; + hash = "sha256-3b20vYBP9T2uR17Vxyilfs/9C72WVUrgR7T582V++lQ="; }; - useDune2 = true; - propagatedBuildInputs = [ mirage-crypto mirage-clock diff --git a/pkgs/development/ocaml-modules/ca-certs/default.nix b/pkgs/development/ocaml-modules/ca-certs/default.nix index 0805edbafe84..185944f412e6 100644 --- a/pkgs/development/ocaml-modules/ca-certs/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs/default.nix @@ -5,21 +5,20 @@ buildDunePackage rec { pname = "ca-certs"; - version = "0.2.2"; + version = "0.2.3"; - minimumOCamlVersion = "4.07"; + minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-v${version}.tbz"; - sha256 = "sha256-Tx53zBJemZh3ODh/8izahxDoJvXvNFLyAA8LMM1mhlI="; + url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-${version}.tbz"; + hash = "sha256-0tjWRX2RXvbXg974Lzvl7C9W+S4gIU9Y7dY8nC/GDpw="; }; - useDune2 = true; + duneVersion = "3"; propagatedBuildInputs = [ bos fpath ptime mirage-crypto x509 astring logs ]; - # Assumes nss-cacert < 3.74 https://github.com/mirage/ca-certs/issues/21 - doCheck = false; + doCheck = true; checkInputs = [ cacert # for /etc/ssl/certs/ca-bundle.crt alcotest diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index 1801a0679b56..0b560f2004f6 100644 --- a/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -3,11 +3,11 @@ buildDunePackage rec { pname = "cairo2"; - version = "0.6.2"; + version = "0.6.4"; src = fetchurl { url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz"; - sha256 = "sha256-a7P1kiVmIwT6Fhtwxs29ffgO4iexsulxUoc9cnJmEK4="; + sha256 = "sha256-QDVzUtcgXTpXNYVWQ4MMs0Xy24OP+dGaUyAYdg1GigU="; }; minimalOCamlVersion = "4.02"; diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix index 4c089b76f3ed..8fd3f5befef9 100644 --- a/pkgs/development/ocaml-modules/calendar/default.nix +++ b/pkgs/development/ocaml-modules/calendar/default.nix @@ -1,27 +1,23 @@ -{ stdenv, lib, fetchurl, ocaml, findlib }: +{ lib, buildDunePackage, fetchFromGitHub, re }: -stdenv.mkDerivation rec { - pname = "ocaml-calendar"; - version = "2.5"; +buildDunePackage rec { + pname = "calendar"; + version = "3.0.0"; + minimalOCamlVersion = "4.03"; - src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/915/calendar-${version}.tar.bz2"; - sha256 = "04pvhwb664g3s644c7v7419a3kvf5s3pynkhmk5j59dvlfm1yf0f"; + src = fetchFromGitHub { + owner = "ocaml-community"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-+VQzi6pEMqzV1ZR84Yjdu4jsJEWtx+7bd6PQGX7TiEs="; }; - nativeBuildInputs = [ ocaml findlib ]; - - strictDeps = true; - - createFindlibDestdir = true; + propagatedBuildInputs = [ re ]; meta = { - homepage = "https://forge.ocamlcore.org/projects/calendar/"; - description = "An Objective Caml library managing dates and times"; - license = "LGPL"; - platforms = ocaml.meta.platforms or [ ]; - maintainers = [ - lib.maintainers.gal_bolle - ]; + inherit (src.meta) homepage; + description = "A library for handling dates and times"; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.gal_bolle ]; }; } diff --git a/pkgs/development/ocaml-modules/camlimages/4.2.4.nix b/pkgs/development/ocaml-modules/camlimages/4.2.4.nix index b44fd7db6b31..53115c4ecb8e 100644 --- a/pkgs/development/ocaml-modules/camlimages/4.2.4.nix +++ b/pkgs/development/ocaml-modules/camlimages/4.2.4.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { sha256 = "17hvsql5dml7ialjcags8wphs7w6z88b2rgjir1382bg8vn62bkr"; }; + strictDeps = true; + nativeBuildInputs = [ omake ocaml @@ -65,6 +67,8 @@ stdenv.mkDerivation rec { meta = with lib; { # 4.2.5 requires OCaml >= 4.06 branch = "4.2.4"; + # incompatible with omake >= 0.10 + broken = true; homepage = "https://gitlab.com/camlspotter/camlimages"; description = "OCaml image processing library"; license = licenses.lgpl2Only; diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index a83c7c474ac5..b6768cfe8c1a 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -17,8 +17,6 @@ buildDunePackage rec { sha256 = "1m2c76ghisg73dikz2ifdkrbkgiwa0hcmp21f2fm2rkbf02rq3f4"; }; - strictDeps = true; - nativeBuildInputs = [ cppo ]; buildInputs = [ dune-configurator graphics lablgtk stdio ]; diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index caf3e7a63f0d..761453739e29 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -1,17 +1,24 @@ {lib, stdenv, fetchurl, zlib, ocaml, findlib}: let - param = - if lib.versionAtLeast ocaml.version "4.02" - then { - version = "1.10"; - url = "https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz"; - sha256 = "X0YcczaQ3lFeJEiTIgjSSZ1zi32KFMtmZsP0FFpyfbI="; + common = { patches = []; postPatchInit = '' cp META-zip META-camlzip echo 'directory="../zip"' >> META-camlzip ''; + }; + param = + if lib.versionAtLeast ocaml.version "4.07" + then common // { + version = "1.11"; + url = "https://github.com/xavierleroy/camlzip/archive/rel111.tar.gz"; + sha256 = "sha256-/7vF3j4cE9wOWScjdtIy0u3pGzJ1UQY9R/3bdPHV7Tc="; + } else if lib.versionAtLeast ocaml.version "4.02" + then common // { + version = "1.10"; + url = "https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz"; + sha256 = "X0YcczaQ3lFeJEiTIgjSSZ1zi32KFMtmZsP0FFpyfbI="; } else { version = "1.05"; download_id = "1037"; @@ -25,7 +32,7 @@ let in stdenv.mkDerivation { - pname = "camlzip"; + pname = "ocaml${ocaml.version}-camlzip"; version = param.version; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index e5fe67021312..ea2a65393682 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -15,8 +15,6 @@ buildDunePackage rec { nativeBuildInputs = [ cppo ]; - strictDeps = true; - configurePhase = '' runHook preConfigure ocaml configure.ml --share $out/share/camomile diff --git a/pkgs/development/ocaml-modules/caqti/default.nix b/pkgs/development/ocaml-modules/caqti/default.nix index 5edb68d30cfa..18b55b9857ef 100644 --- a/pkgs/development/ocaml-modules/caqti/default.nix +++ b/pkgs/development/ocaml-modules/caqti/default.nix @@ -1,6 +1,7 @@ { lib, fetchurl, buildDunePackage, ocaml , cppo, logs, ptime, uri, bigstringaf -, re, cmdliner, alcotest }: +, re, cmdliner, alcotest +}: buildDunePackage rec { pname = "caqti"; diff --git a/pkgs/development/ocaml-modules/carton/carton-find-getconf.patch b/pkgs/development/ocaml-modules/carton/carton-find-getconf.patch new file mode 100644 index 000000000000..8c7176ee16c8 --- /dev/null +++ b/pkgs/development/ocaml-modules/carton/carton-find-getconf.patch @@ -0,0 +1,13 @@ +diff --git a/bin/fiber/fiber.ml b/bin/fiber/fiber.ml +index 188a92cc9..6087a8687 100644 +--- a/bin/fiber/fiber.ml ++++ b/bin/fiber/fiber.ml +@@ -129,7 +129,7 @@ let worker pool = + + let get_concurrency () = + try +- let ic = Unix.open_process_in "getconf _NPROCESSORS_ONLN" in ++ let ic = Unix.open_process_in "@getconf@/bin/getconf _NPROCESSORS_ONLN" in + let close () = ignore (Unix.close_process_in ic) in + let sc = Scanf.Scanning.from_channel ic in + try diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix index 13c5089d822b..727d407ac542 100644 --- a/pkgs/development/ocaml-modules/carton/default.nix +++ b/pkgs/development/ocaml-modules/carton/default.nix @@ -3,19 +3,28 @@ , checkseum, logs, psq, fmt , result, rresult, fpath, base64, bos, digestif, alcotest , crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner, hxd +, getconf, substituteAll }: buildDunePackage rec { pname = "carton"; - version = "0.4.4"; + version = "0.6.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/git-${pname}-v${version}.tbz"; - sha256 = "sha256-7mgCgu87Cn4XhjEhonlz9lhgTw0Cu5hnxNJ1wXr+Qhw="; + hash = "sha256-NAm4Xq7L0Dgynr8cKZQ356M4GR6D19LbCRxvnSlIf1U="; }; + patches = [ + (substituteAll { + src = ./carton-find-getconf.patch; + getconf = "${getconf}"; + }) + ]; + # remove changelogs for mimic and the git* packages postPatch = '' rm CHANGES.md diff --git a/pkgs/development/ocaml-modules/carton/git.nix b/pkgs/development/ocaml-modules/carton/git.nix index 2cc6b1336de2..b361ee1447b2 100644 --- a/pkgs/development/ocaml-modules/carton/git.nix +++ b/pkgs/development/ocaml-modules/carton/git.nix @@ -1,6 +1,6 @@ { buildDunePackage, carton, carton-lwt -, bigarray-compat, bigstringaf, lwt, fpath, result -, mmap, fmt, decompress, astring +, bigstringaf, lwt, fpath, result +, fmt, decompress, astring , alcotest, alcotest-lwt, cstruct, logs , mirage-flow, rresult, ke }: @@ -9,16 +9,15 @@ buildDunePackage { pname = "carton-git"; inherit (carton) version src postPatch; + duneVersion = "3"; propagatedBuildInputs = [ carton carton-lwt - bigarray-compat bigstringaf lwt fpath result - mmap fmt decompress astring diff --git a/pkgs/development/ocaml-modules/carton/lwt.nix b/pkgs/development/ocaml-modules/carton/lwt.nix index 2aeee63dbf1e..03333deff67a 100644 --- a/pkgs/development/ocaml-modules/carton/lwt.nix +++ b/pkgs/development/ocaml-modules/carton/lwt.nix @@ -1,8 +1,8 @@ { buildDunePackage, carton , lwt, decompress, optint, bigstringaf , alcotest, alcotest-lwt, cstruct, fmt, logs -, mirage-flow, result, rresult, bigarray-compat -, ke, base64, bos, checkseum, digestif, fpath, mmap +, mirage-flow, result, rresult +, ke, base64, bos, checkseum, digestif, fpath , stdlib-shims , git-binary # pkgs.git }: @@ -11,6 +11,7 @@ buildDunePackage { pname = "carton-lwt"; inherit (carton) version src postPatch; + duneVersion = "3"; propagatedBuildInputs = [ carton @@ -21,8 +22,10 @@ buildDunePackage { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ git-binary + ]; + checkInputs = [ alcotest alcotest-lwt cstruct @@ -31,14 +34,12 @@ buildDunePackage { mirage-flow result rresult - bigarray-compat ke base64 bos checkseum digestif fpath - mmap stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix index 62a29a5d4141..b39cb471e4cb 100644 --- a/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/pkgs/development/ocaml-modules/cfstream/default.nix @@ -17,8 +17,7 @@ buildDunePackage rec { patches = [ ./git_commit.patch ]; - # This currently fails with dune - strictDeps = false; + strictDeps = true; nativeBuildInputs = [ m4 ]; checkInputs = [ ounit ]; diff --git a/pkgs/development/ocaml-modules/class_group_vdf/default.nix b/pkgs/development/ocaml-modules/class_group_vdf/default.nix index 181228e28a0a..f59ad1448a9f 100644 --- a/pkgs/development/ocaml-modules/class_group_vdf/default.nix +++ b/pkgs/development/ocaml-modules/class_group_vdf/default.nix @@ -1,7 +1,8 @@ -{ lib, fetchFromGitLab, buildDunePackage +{ stdenv, lib, fetchFromGitLab, buildDunePackage , gmp, pkg-config, dune-configurator , zarith, integers -, alcotest, bisect_ppx }: +, alcotest, bisect_ppx +}: buildDunePackage rec { pname = "class_group_vdf"; @@ -23,6 +24,10 @@ buildDunePackage rec { dune-configurator ]; + buildInputs = [ + dune-configurator + ]; + propagatedBuildInputs = [ zarith integers @@ -38,6 +43,7 @@ buildDunePackage rec { meta = { description = "Verifiable Delay Functions bindings to Chia's VDF"; homepage = "https://gitlab.com/nomadic-labs/tezos"; + broken = stdenv.isDarwin && stdenv.isx86_64; license = lib.licenses.mit; maintainers = [ lib.maintainers.ulrikstrid ]; }; diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix index dc980ce4ab2a..3e6ac4ae2d96 100644 --- a/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/pkgs/development/ocaml-modules/cohttp/async.nix @@ -28,6 +28,8 @@ buildDunePackage { src ; + duneVersion = "3"; + buildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 597d4107fceb..fcbed191ad6f 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -9,6 +9,7 @@ buildDunePackage rec { version = "5.0.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index 2886cac1c7b1..b360cf0e587e 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -9,10 +9,17 @@ buildDunePackage { pname = "cohttp-lwt-unix"; inherit (cohttp-lwt) version src; + duneVersion = "3"; + buildInputs = [ cmdliner ppx_sexp_conv ]; propagatedBuildInputs = [ - cohttp-lwt conduit-lwt conduit-lwt-unix fmt logs magic-mime + cohttp-lwt + conduit-lwt + conduit-lwt-unix + fmt + logs + magic-mime ]; # TODO(@sternenseemann): fail for unknown reason diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix index 74fcfcbd4988..42e1d3808639 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -7,6 +7,8 @@ buildDunePackage { src ; + duneVersion = "3"; + buildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/cohttp/mirage.nix b/pkgs/development/ocaml-modules/cohttp/mirage.nix index 048202ccdbce..3b1c82194973 100644 --- a/pkgs/development/ocaml-modules/cohttp/mirage.nix +++ b/pkgs/development/ocaml-modules/cohttp/mirage.nix @@ -10,6 +10,8 @@ buildDunePackage { inherit (cohttp) version src; + duneVersion = "3"; + nativeBuildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/coin/default.nix b/pkgs/development/ocaml-modules/coin/default.nix index 5996cd7adb61..c9b6ad3128f3 100644 --- a/pkgs/development/ocaml-modules/coin/default.nix +++ b/pkgs/development/ocaml-modules/coin/default.nix @@ -24,8 +24,6 @@ buildDunePackage rec { nativeBuildInputs = [ findlib ]; buildInputs = [ re ]; - strictDeps = true; - doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix index fb5a96932164..a110e6dc1677 100644 --- a/pkgs/development/ocaml-modules/conduit/async.nix +++ b/pkgs/development/ocaml-modules/conduit/async.nix @@ -9,6 +9,8 @@ buildDunePackage { src ; + duneVersion = "3"; + buildInputs = [ ppx_sexp_conv ppx_here ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index c78839dd4335..99f3df493396 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -5,13 +5,14 @@ buildDunePackage rec { pname = "conduit"; - version = "5.1.0"; + version = "6.1.0"; - minimalOCamlVersion = "4.03"; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz"; - sha256 = "sha256-5RyMPoecu+ngmYmwBZUJODLchmQgiAcuA+Wlmiojkc0="; + sha256 = "sha256-ouKQiGMLvvksGpAhkqCVSKtKaz91p+7mciQm7KHvwF8="; }; propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index 81a77f356aff..cb86ea5f4f06 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -6,6 +6,7 @@ buildDunePackage { pname = "conduit-lwt-unix"; inherit (conduit-lwt) version src; + duneVersion = "3"; buildInputs = [ ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix index 641d57db10e3..2ec6f556916d 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -3,6 +3,7 @@ buildDunePackage { pname = "conduit-lwt"; inherit (conduit) version src; + duneVersion = "3"; buildInputs = [ ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/conduit/mirage.nix b/pkgs/development/ocaml-modules/conduit/mirage.nix index 61fb9b569b7b..09c7df5edab6 100644 --- a/pkgs/development/ocaml-modules/conduit/mirage.nix +++ b/pkgs/development/ocaml-modules/conduit/mirage.nix @@ -9,6 +9,7 @@ buildDunePackage { pname = "conduit-mirage"; inherit (conduit-lwt) version src; + duneVersion = "3"; nativeBuildInputs = [ ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 4b4cb19686bd..4cd6413293e5 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -5,14 +5,14 @@ }: buildDunePackage rec { - version = "3.9"; + version = "3.10"; pname = "containers"; src = fetchFromGitHub { owner = "c-cube"; repo = "ocaml-containers"; rev = "v${version}"; - sha256 = "sha256-uQyKBSXgf3kGx5HvS2VQrrkh0WqNZfxr5j8tTRjeTX4="; + hash = "sha256-eWmju4CD30+wX3sKI8rOUEbqbQygdOtc0U4sb9vYuNA="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/cooltt/default.nix b/pkgs/development/ocaml-modules/cooltt/default.nix index a3894f0cbf4f..180a09e4d4a1 100644 --- a/pkgs/development/ocaml-modules/cooltt/default.nix +++ b/pkgs/development/ocaml-modules/cooltt/default.nix @@ -13,6 +13,8 @@ , uuseg , uutf , yuujinchou +, ounit2 +, qcheck }: let @@ -70,12 +72,13 @@ buildDunePackage { }; nativeBuildInputs = [ - cmdliner menhir - ppxlib ]; - buildInputs = [ containers ]; + buildInputs = [ + cmdliner + ppxlib + ]; propagatedBuildInputs = [ bantorra @@ -87,6 +90,12 @@ buildDunePackage { uuseg uutf yuujinchou + containers + ]; + + checkInputs = [ + ounit2 + qcheck ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix index 7a1afda0745e..4688ec4ef328 100644 --- a/pkgs/development/ocaml-modules/cow/default.nix +++ b/pkgs/development/ocaml-modules/cow/default.nix @@ -1,5 +1,6 @@ { lib, fetchurl, buildDunePackage, ocaml, alcotest -, uri, xmlm, omd, ezjsonm }: +, uri, xmlm, omd, ezjsonm +}: buildDunePackage rec { useDune2 = true; diff --git a/pkgs/development/ocaml-modules/cpu/default.nix b/pkgs/development/ocaml-modules/cpu/default.nix index 33702ca18296..a61a597b2093 100644 --- a/pkgs/development/ocaml-modules/cpu/default.nix +++ b/pkgs/development/ocaml-modules/cpu/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { autoheader ''; - buildInputs = [ autoconf ]; + nativeBuildInputs = [ autoconf ]; hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 59ba28be3c3b..eb9fdd85e68d 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -2,7 +2,8 @@ buildDunePackage rec { pname = "cryptokit"; - version = "1.17"; + version = "1.18"; + duneVersion = "3"; minimalOCamlVersion = "4.08"; @@ -10,7 +11,7 @@ buildDunePackage rec { owner = "xavierleroy"; repo = "cryptokit"; rev = "release${lib.replaceStrings ["."] [""] version}"; - sha256 = "sha256:1xi7kcigxkfridjas2zwldsfc21wi31cgln071sbmv4agh3dqbyw"; + hash = "sha256-8ae8hroCSkp4O5vM/qVOhAnnJJ+uygMYm3ix5ytwtHU="; }; # dont do autotools configuration, but do trigger findlib's preConfigure hook diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix index a808a01153cc..b640c9745f3b 100644 --- a/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -6,14 +6,15 @@ if lib.versionOlder (cstruct.version or "1") "3" then cstruct else -buildDunePackage { - pname = "ppx_cstruct"; - inherit (cstruct) version src meta; + buildDunePackage { + pname = "ppx_cstruct"; + inherit (cstruct) version src meta; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; - propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ]; + propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ]; - doCheck = true; - checkInputs = [ ounit cppo ppx_sexp_conv cstruct-sexp cstruct-unix ]; -} + doCheck = true; + nativeCheckInputs = [ cppo ]; + checkInputs = [ ounit ppx_sexp_conv cstruct-sexp cstruct-unix ]; + } diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index 6e9aa98e1cca..e1bfab4d16e1 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -6,13 +6,13 @@ else stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-ctypes"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "ocamllabs"; repo = "ocaml-ctypes"; rev = version; - sha256 = "sha256-fr60H/hiSVjEg11qM8LF1Y5CotS3FEyFdCcIh0A0uI4="; + sha256 = "sha256-H1QR0MJCqRdXxRufCA663wzTNWQ8MYYAy2nz/XHCn0Y="; }; nativeBuildInputs = [ pkg-config ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix index f7e50ddca700..edb31f1836bf 100644 --- a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix +++ b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix @@ -19,11 +19,13 @@ buildDunePackage rec { }; propagatedBuildInputs = [ integers_stubs_js ]; + nativeCheckInputs = [ + nodejs + js_of_ocaml-compiler + ]; checkInputs = [ ctypes - js_of_ocaml-compiler ppx_expect - nodejs ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/cudf/default.nix b/pkgs/development/ocaml-modules/cudf/default.nix index c3b0a3c29c02..b4cd7e458a70 100644 --- a/pkgs/development/ocaml-modules/cudf/default.nix +++ b/pkgs/development/ocaml-modules/cudf/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, stdenv, ocaml, ocamlbuild, findlib, extlib, glib, perl, pkg-config, stdlib-shims, ounit }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-cudf"; version = "0.9"; @@ -13,15 +13,16 @@ stdenv.mkDerivation { "all" "opt" ]; + nativeBuildInputs = [ findlib ocaml ocamlbuild pkg-config + perl ]; buildInputs = [ glib - perl stdlib-shims ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix index 20197e207af3..5f0e93f8f26d 100644 --- a/pkgs/development/ocaml-modules/curly/default.nix +++ b/pkgs/development/ocaml-modules/curly/default.nix @@ -6,17 +6,18 @@ buildDunePackage rec { pname = "curly"; version = "0.2.0"; - minimumOCamlVersion = "4.02"; + minimalOCamlVersion = "4.02"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/rgrinberg/curly/releases/download/${version}/curly-${version}.tbz"; - sha256 = "07vqdrklar0d5i83ip7sjw2c1v18a9m3anw07vmi5ay29pxzal6k"; + hash = "sha256-01D1+03CqxLrPoBbNWpSKOzABJf63DhQLA1kRWdueB8="; }; propagatedBuildInputs = [ result ]; - checkInputs = [ alcotest cohttp-lwt-unix cacert ]; + nativeCheckInputs = [ cacert ]; + checkInputs = [ alcotest cohttp-lwt-unix ]; # test dependencies are only available for >= 4.08 # https://github.com/mirage/ca-certs/issues/16 doCheck = lib.versionAtLeast ocaml.version "4.08" diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index e72f4ce0e8b3..4c38d161ee61 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0yy3wf8i7jgvzdc40bni7mvpkvclq97cgb5fw265mrjj0iqpkqpd"; }; + strictDeps = true; + propagatedBuildInputs = [ ncurses ]; nativeBuildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/dap/default.nix b/pkgs/development/ocaml-modules/dap/default.nix index 6d14945ee15e..054020ba64e0 100644 --- a/pkgs/development/ocaml-modules/dap/default.nix +++ b/pkgs/development/ocaml-modules/dap/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { pname = "dap"; version = "1.0.6"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/hackwaly/ocaml-dap/releases/download/${version}/dap-${version}.tbz"; sha256 = "1zq0f8429m38a4x3h9n3rv7n1vsfjbs72pfi5902a89qwyilkcp0"; }; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; buildInputs = [ lwt_ppx diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix index 30e7391f8c3a..3e15bd5bbcd1 100644 --- a/pkgs/development/ocaml-modules/decompress/default.nix +++ b/pkgs/development/ocaml-modules/decompress/default.nix @@ -1,22 +1,24 @@ { lib, fetchurl, buildDunePackage , checkseum, optint, cmdliner , bigstringaf, alcotest, camlzip, base64, ctypes, fmt, crowbar, rresult +, astring, bos }: buildDunePackage rec { pname = "decompress"; - version = "1.5.1"; + version = "1.5.2"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-${version}.tbz"; - sha256 = "sha256-y/OVojFxhksJQQvvtS38SF7ZnMEQhAtwDey0ISwypP4="; + hash = "sha256-qMmmuhMlFNVq02JvvV55EkhEg2AQNQ7hYdQ7spv1di4="; }; buildInputs = [ cmdliner ]; propagatedBuildInputs = [ optint checkseum ]; - checkInputs = [ alcotest bigstringaf ctypes fmt camlzip base64 crowbar rresult ]; + checkInputs = [ alcotest astring bigstringaf bos ctypes fmt camlzip base64 crowbar rresult ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix index 2e2e3a7b23bb..75ecb7fc58fb 100644 --- a/pkgs/development/ocaml-modules/digestif/default.nix +++ b/pkgs/development/ocaml-modules/digestif/default.nix @@ -15,8 +15,7 @@ buildDunePackage rec { sha256 = "sha256-edNM5ROxFIV+OAqr328UcyGPGwXdflHQOJB3ntAbRmY="; }; - nativeBuildInputs = [ findlib which ]; - buildInputs = [ ocaml ]; + nativeBuildInputs = [ findlib which ocaml pkg-config ]; propagatedBuildInputs = [ eqaf ]; diff --git a/pkgs/development/ocaml-modules/dns/certify.nix b/pkgs/development/ocaml-modules/dns/certify.nix index ff98b5508617..3260e139fbbb 100644 --- a/pkgs/development/ocaml-modules/dns/certify.nix +++ b/pkgs/development/ocaml-modules/dns/certify.nix @@ -8,6 +8,7 @@ buildDunePackage { pname = "dns-certify"; inherit (dns) version src; + duneVersion = "3"; propagatedBuildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/dns/cli.nix b/pkgs/development/ocaml-modules/dns/cli.nix index fd54d9c8c86f..6e23eeecba97 100644 --- a/pkgs/development/ocaml-modules/dns/cli.nix +++ b/pkgs/development/ocaml-modules/dns/cli.nix @@ -10,6 +10,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; inherit (dns) version src; + duneVersion = "3"; # no need to propagate as this is primarily # an executable package diff --git a/pkgs/development/ocaml-modules/dns/client.nix b/pkgs/development/ocaml-modules/dns/client.nix index 6ef93dc4ad1d..e8bd210dcd8c 100644 --- a/pkgs/development/ocaml-modules/dns/client.nix +++ b/pkgs/development/ocaml-modules/dns/client.nix @@ -10,11 +10,29 @@ buildDunePackage { pname = "dns-client"; inherit (dns) src version; + duneVersion = "3"; - propagatedBuildInputs = [ cstruct fmt logs dns randomconv domain-name ipaddr - lwt mirage-random mirage-time mirage-clock - ca-certs ca-certs-nss happy-eyeballs tcpip tls tls-mirage - mtime mirage-crypto-rng ]; + propagatedBuildInputs = [ + cstruct + fmt + logs + dns + randomconv + domain-name + ipaddr + lwt + mirage-random + mirage-time + mirage-clock + ca-certs + ca-certs-nss + happy-eyeballs + tcpip + tls + tls-mirage + mtime + mirage-crypto-rng + ]; checkInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index 174adce4320f..81bc741d974b 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -1,17 +1,30 @@ -{ lib, buildDunePackage, fetchurl, alcotest -, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, fmt +{ lib +, buildDunePackage +, fetchurl +, alcotest +, cstruct +, domain-name +, duration +, gmap +, ipaddr +, logs +, lru +, metrics +, ptime +, fmt , base64 }: buildDunePackage rec { pname = "dns"; - version = "6.3.0"; + version = "6.4.1"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz"; - sha256 = "sha256-3EAjenN9EIi4PsXCZDevmEPDaS4xbESbcbB7pFgwc1E="; + hash = "sha256-omG0fKZAHGc+4ERC8cyK47jeEkiBZkB+1fz46j6SDno="; }; propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ]; diff --git a/pkgs/development/ocaml-modules/dns/dnssec.nix b/pkgs/development/ocaml-modules/dns/dnssec.nix index 06fe3f057eb5..de2a76052384 100644 --- a/pkgs/development/ocaml-modules/dns/dnssec.nix +++ b/pkgs/development/ocaml-modules/dns/dnssec.nix @@ -1,12 +1,20 @@ -{ buildDunePackage, cstruct, dns, mirage-crypto, mirage-crypto-pk, mirage-crypto-ec -, domain-name, logs -, alcotest, base64 +{ buildDunePackage +, cstruct +, dns +, mirage-crypto +, mirage-crypto-pk +, mirage-crypto-ec +, domain-name +, logs +, alcotest +, base64 }: buildDunePackage { pname = "dnssec"; inherit (dns) version src; + duneVersion = "3"; propagatedBuildInputs = [ cstruct diff --git a/pkgs/development/ocaml-modules/dns/mirage.nix b/pkgs/development/ocaml-modules/dns/mirage.nix index 3c69788e634d..640578831b22 100644 --- a/pkgs/development/ocaml-modules/dns/mirage.nix +++ b/pkgs/development/ocaml-modules/dns/mirage.nix @@ -4,6 +4,7 @@ buildDunePackage { pname = "dns-mirage"; inherit (dns) version src; + duneVersion = "3"; propagatedBuildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/dns/resolver.nix b/pkgs/development/ocaml-modules/dns/resolver.nix index a262280a460a..dd46a1534ed3 100644 --- a/pkgs/development/ocaml-modules/dns/resolver.nix +++ b/pkgs/development/ocaml-modules/dns/resolver.nix @@ -1,6 +1,18 @@ -{ buildDunePackage, dns, dns-server, dns-mirage, lru, duration -, randomconv, lwt, mirage-time, mirage-clock, mirage-random -, tcpip, tls, tls-mirage, dnssec +{ buildDunePackage +, dns +, dns-server +, dns-mirage +, lru +, duration +, randomconv +, lwt +, mirage-time +, mirage-clock +, mirage-random +, tcpip +, tls +, tls-mirage +, dnssec , alcotest }: @@ -8,6 +20,7 @@ buildDunePackage { pname = "dns-resolver"; inherit (dns) version src; + duneVersion = "3"; propagatedBuildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/dns/server.nix b/pkgs/development/ocaml-modules/dns/server.nix index 8570bb2491ef..049cf507e3ac 100644 --- a/pkgs/development/ocaml-modules/dns/server.nix +++ b/pkgs/development/ocaml-modules/dns/server.nix @@ -1,12 +1,23 @@ -{ buildDunePackage, dns, dns-mirage, randomconv, duration, lwt -, mirage-time, mirage-clock, metrics -, alcotest, mirage-crypto-rng, dns-tsig, base64 +{ buildDunePackage +, dns +, dns-mirage +, randomconv +, duration +, lwt +, mirage-time +, mirage-clock +, metrics +, alcotest +, mirage-crypto-rng +, dns-tsig +, base64 }: buildDunePackage { pname = "dns-server"; inherit (dns) version src; + duneVersion = "3"; propagatedBuildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/dns/stub.nix b/pkgs/development/ocaml-modules/dns/stub.nix index 17d5c0029b1d..943d28a57c5b 100644 --- a/pkgs/development/ocaml-modules/dns/stub.nix +++ b/pkgs/development/ocaml-modules/dns/stub.nix @@ -7,6 +7,7 @@ buildDunePackage { pname = "dns-stub"; inherit (dns) version src; + duneVersion = "3"; propagatedBuildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/dns/tsig.nix b/pkgs/development/ocaml-modules/dns/tsig.nix index 9ca078674a96..3ecc90d39853 100644 --- a/pkgs/development/ocaml-modules/dns/tsig.nix +++ b/pkgs/development/ocaml-modules/dns/tsig.nix @@ -4,6 +4,7 @@ buildDunePackage { pname = "dns-tsig"; inherit (dns) version src; + duneVersion = "3"; propagatedBuildInputs = [ mirage-crypto diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix index 7a7a14192f9e..b27efe501944 100644 --- a/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/pkgs/development/ocaml-modules/dolmen/default.nix @@ -7,8 +7,6 @@ buildDunePackage rec { pname = "dolmen"; version = "0.6"; - useDune2 = true; - minimalOCamlVersion = "4.08"; src = fetchurl { @@ -16,8 +14,6 @@ buildDunePackage rec { sha256 = "133l23mwxa9xy340izvk4zp5jqjz2cwsm2innsgs2kg85pd39c41"; }; - strictDeps = true; - nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ menhirLib fmt ]; diff --git a/pkgs/development/ocaml-modules/domainslib/default.nix b/pkgs/development/ocaml-modules/domainslib/default.nix new file mode 100644 index 000000000000..8a36285fe697 --- /dev/null +++ b/pkgs/development/ocaml-modules/domainslib/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchurl +, buildDunePackage +, lockfree +, mirage-clock-unix +}: + +buildDunePackage rec { + pname = "domainslib"; + version = "0.5.0"; + + duneVersion = "3"; + minimalOCamlVersion = "5.0"; + + src = fetchurl { + url = "https://github.com/ocaml-multicore/domainslib/releases/download/v${version}/domainslib-${version}.tbz"; + hash = "sha256-rty+9DUhTUEcN7BPl8G6Q/G/MJ6z/UAn0RPkG8hACwA="; + }; + + propagatedBuildInputs = [ lockfree ]; + + doCheck = true; + checkInputs = [ mirage-clock-unix ]; + + meta = { + homepage = "https://github.com/ocaml-multicore/domainslib"; + description = "Nested-parallel programming"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/dose3/default.nix b/pkgs/development/ocaml-modules/dose3/default.nix index 5f71375dc46f..1146da5d3067 100644 --- a/pkgs/development/ocaml-modules/dose3/default.nix +++ b/pkgs/development/ocaml-modules/dose3/default.nix @@ -33,12 +33,14 @@ buildDunePackage rec { stdlib-shims ]; - checkInputs = [ - dpkg # Replaces: conf-dpkg - git - ounit + nativeCheckInputs = [ python39 # Replaces: conf-python-3 python39Packages.pyyaml # Replaces: conf-python3-yaml + git + ]; + checkInputs = [ + dpkg # Replaces: conf-dpkg + ounit ]; doCheck = false; # Tests are failing. # To enable tests use: lib.versionAtLeast ocaml.version "4.04"; diff --git a/pkgs/development/ocaml-modules/dscheck/default.nix b/pkgs/development/ocaml-modules/dscheck/default.nix new file mode 100644 index 000000000000..0f74fb5e2414 --- /dev/null +++ b/pkgs/development/ocaml-modules/dscheck/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchurl, buildDunePackage +, containers +, oseq +}: + +buildDunePackage rec { + pname = "dscheck"; + version = "0.1.0"; + + minimalOCamlVersion = "5.0"; + duneVersion = "3"; + + src = fetchurl { + url = "https://github.com/ocaml-multicore/dscheck/releases/download/${version}/dscheck-${version}.tbz"; + hash = "sha256-zoouFZJcUp71yeluVb1xLUIMcFv99OpkcQQCHkPTKcI="; + }; + + propagatedBuildInputs = [ containers oseq ]; + + doCheck = true; + + meta = { + description = "Traced atomics"; + homepage = "https://github.com/ocaml-multicore/dscheck"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix index 44bc5d7498bf..ffcfb38c6bf1 100644 --- a/pkgs/development/ocaml-modules/dtoa/default.nix +++ b/pkgs/development/ocaml-modules/dtoa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildDunePackage }: +{ stdenv, lib, fetchurl, buildDunePackage, ounit }: buildDunePackage rec { pname = "dtoa"; @@ -13,6 +13,10 @@ buildDunePackage rec { sha256 = "0zkhn0rdq82g6gamsv6nkx6i44s8104nh6jg5xydazl9jl1704xn"; }; + checkInputs = [ ounit ]; + + doCheck = true; + hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/duff/default.nix b/pkgs/development/ocaml-modules/duff/default.nix index 27fb981de4d8..583949cf1da4 100644 --- a/pkgs/development/ocaml-modules/duff/default.nix +++ b/pkgs/development/ocaml-modules/duff/default.nix @@ -1,6 +1,12 @@ -{ lib, fetchurl, buildDunePackage, ocaml +{ lib +, fetchurl +, buildDunePackage +, ocaml , fmt -, alcotest, hxd, crowbar, bigstringaf +, alcotest +, hxd +, crowbar +, bigstringaf }: buildDunePackage rec { diff --git a/pkgs/development/ocaml-modules/dune-build-info/default.nix b/pkgs/development/ocaml-modules/dune-build-info/default.nix index 5d9f105782b4..9eb7afa2c408 100644 --- a/pkgs/development/ocaml-modules/dune-build-info/default.nix +++ b/pkgs/development/ocaml-modules/dune-build-info/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, dune_2 }: +{ lib, buildDunePackage, dune_2, dune-action-plugin }: buildDunePackage rec { pname = "dune-build-info"; @@ -8,6 +8,8 @@ buildDunePackage rec { dontAddPrefix = true; + buildInputs = [ dune-action-plugin ]; + meta = with lib; { inherit (dune_2.meta) homepage; description = "Embed build information inside executables"; diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix index 2ef4946306c9..209bf30d2a61 100644 --- a/pkgs/development/ocaml-modules/earlybird/default.nix +++ b/pkgs/development/ocaml-modules/earlybird/default.nix @@ -11,9 +11,9 @@ buildDunePackage rec { pname = "earlybird"; version = "1.1.0"; - useDune2 = true; + duneVersion = "3"; - minimumOCamlVersion = "4.11"; + minimalOCamlVersion = "4.11"; src = fetchFromGitHub { owner = "hackwaly"; @@ -22,7 +22,9 @@ buildDunePackage rec { hash = "sha256-8JHZWsgpz2pzpDxST3bkMSmPHtj7MDzD5G3ujqMW+MU="; }; - buildInputs = [ cmdliner dap fmt iter logs lru lwt_ppx lwt_react menhir menhirLib path_glob ppx_deriving_yojson ]; + nativeBuildInputs = [ menhir ]; + + buildInputs = [ cmdliner dap fmt iter logs lru lwt_ppx lwt_react menhirLib path_glob ppx_deriving_yojson ]; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 428e42682329..1c60c963ed91 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -11,7 +11,7 @@ , version ? if lib.versionAtLeast ocaml.version "4.08" then "1.16.5" else if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1" }: -with lib; + let fetched = coqPackages.metaFetch ({ release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A="; release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s="; @@ -31,17 +31,20 @@ buildDunePackage rec { pname = "elpi"; inherit (fetched) version src; - patches = lib.optional (versionAtLeast version "1.16" || version == "dev") + patches = lib.optional (lib.versionAtLeast version "1.16" || version == "dev") ./atd_2_10.patch; minimalOCamlVersion = "4.04"; - buildInputs = [ perl ncurses ] - ++ optional (versionAtLeast version "1.15" || version == "dev") menhir - ++ optional (versionAtLeast version "1.16" || version == "dev") atdgen; + # atdgen is both a library and executable + nativeBuildInputs = [ perl camlp5 ] + ++ lib.optional (lib.versionAtLeast version "1.15" || version == "dev") menhir + ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen; + buildInputs = [ ncurses ] + ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen; propagatedBuildInputs = [ re stdlib-shims ] - ++ (if versionAtLeast version "1.15" || version == "dev" + ++ (if lib.versionAtLeast version "1.15" || version == "dev" then [ menhirLib ] else [ camlp5 ] ) @@ -50,7 +53,7 @@ buildDunePackage rec { else [ ppxlib_0_15 ppx_deriving_0_15 ] ); - meta = { + meta = with lib; { description = "Embeddable λProlog Interpreter"; license = licenses.lgpl21Plus; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/emile/default.nix b/pkgs/development/ocaml-modules/emile/default.nix index e2572ba6ae8a..f1c61ce27e8d 100644 --- a/pkgs/development/ocaml-modules/emile/default.nix +++ b/pkgs/development/ocaml-modules/emile/default.nix @@ -1,6 +1,14 @@ -{ lib, buildDunePackage, fetchurl, ocaml -, angstrom, ipaddr, base64, pecu, uutf -, alcotest, cmdliner +{ lib +, buildDunePackage +, fetchurl +, ocaml +, angstrom +, ipaddr +, base64 +, pecu +, uutf +, alcotest +, cmdliner }: buildDunePackage rec { diff --git a/pkgs/development/ocaml-modules/encore/default.nix b/pkgs/development/ocaml-modules/encore/default.nix index 5924845c4f46..7c15edabd589 100644 --- a/pkgs/development/ocaml-modules/encore/default.nix +++ b/pkgs/development/ocaml-modules/encore/default.nix @@ -1,5 +1,12 @@ -{ lib, buildDunePackage, fetchurl, ocaml -, fmt, bigstringaf, angstrom, alcotest }: +{ lib +, buildDunePackage +, fetchurl +, ocaml +, fmt +, bigstringaf +, angstrom +, alcotest +}: buildDunePackage rec { pname = "encore"; diff --git a/pkgs/development/ocaml-modules/ethernet/default.nix b/pkgs/development/ocaml-modules/ethernet/default.nix index 59c581e128ae..6d76590c6ca9 100644 --- a/pkgs/development/ocaml-modules/ethernet/default.nix +++ b/pkgs/development/ocaml-modules/ethernet/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { sha256 = "0a898vp9dw42majsvzzvs8pc6x4ns01wlwhwbacixliv6vv78ng9"; }; - nativeBuildInputs = [ + buildInputs = [ ppx_cstruct ]; diff --git a/pkgs/development/ocaml-modules/fdkaac/default.nix b/pkgs/development/ocaml-modules/fdkaac/default.nix index d794e4acce79..f31a94e2c7d6 100644 --- a/pkgs/development/ocaml-modules/fdkaac/default.nix +++ b/pkgs/development/ocaml-modules/fdkaac/default.nix @@ -4,16 +4,14 @@ buildDunePackage rec { pname = "fdkaac"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-fdkaac"; - rev = version; - sha256 = "10i6hsjkrpw7zgx99zvvka3sapd7zy53k7z4b6khj9rdrbrgznv8"; + rev = "v${version}"; + hash = "sha256-cTPPQKBq0EFo35eK7TXlszbodHYIg1g7v+yQ/rG7Y9I="; }; - useDune2 = true; - buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ fdk_aac ]; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix index e8d71aa321e0..8c4d4e8c23c4 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix @@ -1,6 +1,10 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, AudioToolbox , ffmpeg-base ? callPackage ./base.nix { } -, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg }: +, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg +, stdenv +, VideoToolbox +}: buildDunePackage { pname = "ffmpeg-av"; @@ -10,7 +14,7 @@ buildDunePackage { inherit (ffmpeg-base) version src useDune2; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix index 8ee5428c473e..442c80ab6a12 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix @@ -1,6 +1,9 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, AudioToolbox , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil, ffmpeg +, stdenv +, VideoToolbox }: buildDunePackage { @@ -11,7 +14,8 @@ buildDunePackage { inherit (ffmpeg-base) version src useDune2; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] + ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix index e6641a6ca030..72180afb9614 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -1,6 +1,14 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, AppKit +, AudioToolbox +, Cocoa +, CoreImage +, ForceFeedback , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-av, ffmpeg +, OpenGL +, stdenv +, VideoToolbox }: buildDunePackage { @@ -11,7 +19,8 @@ buildDunePackage { inherit (ffmpeg-base) version src useDune2; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] + ++ lib.optionals stdenv.isDarwin [ AppKit AudioToolbox Cocoa CoreImage ForceFeedback OpenGL VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-av ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix index 6479bbe55bf6..3b3b94988b17 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix @@ -1,6 +1,11 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, AppKit +, CoreImage , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil, ffmpeg +, OpenGL +, stdenv +, VideoToolbox }: buildDunePackage { @@ -11,7 +16,8 @@ buildDunePackage { inherit (ffmpeg-base) version src useDune2; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] + ++ lib.optionals stdenv.isDarwin [ AppKit CoreImage OpenGL VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix index 121fb115146e..7635fb6d1218 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix @@ -1,4 +1,5 @@ -{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +{ lib, stdenv, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, AudioToolbox, VideoToolbox , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg }: @@ -11,7 +12,7 @@ buildDunePackage { inherit (ffmpeg-base) version src useDune2; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; propagatedBuildInputs = [ ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix index 92011e48eab6..801e00b6155f 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix @@ -1,6 +1,8 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil, ffmpeg-avcodec, ffmpeg +, stdenv +, VideoToolbox }: buildDunePackage { @@ -11,7 +13,7 @@ buildDunePackage { inherit (ffmpeg-base) version src useDune2; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix index 9d97b722551b..f39ffbc96fa0 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix @@ -1,6 +1,8 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil, ffmpeg +, stdenv +, VideoToolbox }: buildDunePackage { @@ -11,7 +13,7 @@ buildDunePackage { inherit (ffmpeg-base) version src useDune2; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 819298ac8cf1..0431c733cb90 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -1,25 +1,25 @@ -{ lib, fetchurl, buildDunePackage, stdlib-shims, ounit }: +{ lib, fetchurl, ocaml, buildDunePackage, seq, stdlib-shims, ounit2 }: buildDunePackage rec { pname = "fileutils"; - version = "0.6.3"; + version = "0.6.4"; src = fetchurl { - url = "https://github.com/gildor478/ocaml-fileutils/releases/download/v${version}/fileutils-v${version}.tbz"; - sha256 = "0qhlhc7fzcq0yfg1wyszsi0gyc4w9hyzmfv84aq9wc79i3283xgg"; + url = "https://github.com/gildor478/ocaml-fileutils/releases/download/v${version}/fileutils-${version}.tbz"; + hash = "sha256-enu2vGo2tuvawrTkap6bENNmxaLUQXpfHWih+7oKRF8="; }; - minimumOCamlVersion = "4.03"; - useDune2 = true; + minimalOCamlVersion = "4.03"; propagatedBuildInputs = [ + seq stdlib-shims ]; checkInputs = [ - ounit + ounit2 ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.04"; meta = with lib; { description = "OCaml API to manipulate real files (POSIX like) and filenames"; diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index f9e566eb0494..837a481cf1bd 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -6,8 +6,9 @@ buildDunePackage rec { pname = "gapi-ocaml"; version = "0.4.3"; + duneVersion = "3"; - minimalOCamlVersion = "4.02"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "astrada"; @@ -18,7 +19,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ]; - doCheck = lib.versionAtLeast ocaml.version "4.04"; + doCheck = true; checkInputs = [ ounit2 ]; meta = { diff --git a/pkgs/development/ocaml-modules/gd4o/default.nix b/pkgs/development/ocaml-modules/gd4o/default.nix index 19a1b42f06bd..cd2069648566 100644 --- a/pkgs/development/ocaml-modules/gd4o/default.nix +++ b/pkgs/development/ocaml-modules/gd4o/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib libjpeg libpng ]; propagatedBuildInputs = [ gd zlib freetype ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; preInstall = '' mkdir -p $OCAMLFIND_DESTDIR/stublibs diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 1c12f3ac5f87..ee932bffd5e6 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -1,31 +1,30 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: +{ lib, buildDunePackage, fetchFromGitHub, ocaml +, dune-configurator +, seq +, qcheck, ounit2 +}: -stdenv.mkDerivation rec { - version = "0.5"; - pname = "ocaml${ocaml.version}-gen"; +buildDunePackage rec { + version = "1.0"; + pname = "gen"; + minimalOCamlVersion = "4.03"; src = fetchFromGitHub { owner = "c-cube"; repo = "gen"; - rev = version; - sha256 = "14b8vg914nb0yp1hgxzm29bg692m0gqncjj43b599s98s1cwl92h"; + rev = "v${version}"; + hash = "sha256-YWoVcl2TQoMIgU1LoKL16ia31zJjwAMwuphtSXnhtvw="; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = lib.optionals doCheck [ qtest ounit ]; - strictDeps = true; - - configureFlags = lib.optional doCheck "--enable-tests"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ seq ]; + checkInputs = [ qcheck ounit2 ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkTarget = "test"; - - createFindlibDestdir = true; meta = { homepage = "https://github.com/c-cube/gen"; description = "Simple, efficient iterators for OCaml"; license = lib.licenses.bsd3; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/gen_js_api/default.nix b/pkgs/development/ocaml-modules/gen_js_api/default.nix index 4baa21c57cf1..36a8d8060a53 100644 --- a/pkgs/development/ocaml-modules/gen_js_api/default.nix +++ b/pkgs/development/ocaml-modules/gen_js_api/default.nix @@ -10,6 +10,7 @@ buildDunePackage rec { pname = "gen_js_api"; version = "1.1.1"; + duneVersion = "3"; src = fetchFromGitHub { owner = "LexiFi"; @@ -21,7 +22,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.11"; propagatedBuildInputs = [ ojs ppxlib ]; - checkInputs = [ js_of_ocaml-compiler nodejs ]; + nativeCheckInputs = [ js_of_ocaml-compiler nodejs ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/gen_js_api/ojs.nix b/pkgs/development/ocaml-modules/gen_js_api/ojs.nix index 381fda7acd93..0cfe8f4bbfc1 100644 --- a/pkgs/development/ocaml-modules/gen_js_api/ojs.nix +++ b/pkgs/development/ocaml-modules/gen_js_api/ojs.nix @@ -7,6 +7,7 @@ buildDunePackage rec { pname = "ojs"; inherit (gen_js_api) version src; + duneVersion = "3"; propagatedBuildInputs = [ js_of_ocaml-compiler ]; diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix index ec8bbb31617d..c3bf3a2ec938 100644 --- a/pkgs/development/ocaml-modules/gg/default.nix +++ b/pkgs/development/ocaml-modules/gg/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { sha256 = "sha256:0j7bpj8k17csnz6v6frkz9aycywsb7xmznnb31g8rbfk3626f3ci"; }; + strictDeps = true; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ topkg ]; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index fbbfd17ddb36..957d53b39644 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -8,13 +8,14 @@ buildDunePackage rec { pname = "git"; - version = "3.10.0"; + version = "3.10.1"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - sha256 = "sha256-slUzAT4qwPzUNzHMbib/ArxaGzcMFl8tg0ynq1y5U1M="; + sha256 = "sha256-plu69FIpyJcuZ8nJ3QnufLnDEjtcsoAd8czKHfzTkd8="; }; # remove changelog for the carton package @@ -30,8 +31,11 @@ buildDunePackage rec { ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd ]; + nativeCheckInputs = [ + git-binary + ]; checkInputs = [ - alcotest alcotest-lwt mirage-crypto-rng git-binary crowbar cmdliner + alcotest alcotest-lwt mirage-crypto-rng crowbar cmdliner ]; doCheck = !stdenv.isAarch64; diff --git a/pkgs/development/ocaml-modules/git/mirage.nix b/pkgs/development/ocaml-modules/git/mirage.nix index e7398d0d1dac..28ce7c4a3f30 100644 --- a/pkgs/development/ocaml-modules/git/mirage.nix +++ b/pkgs/development/ocaml-modules/git/mirage.nix @@ -1,4 +1,5 @@ -{ lib, buildDunePackage +{ lib +, buildDunePackage , git , mimic , mimic-happy-eyeballs @@ -43,6 +44,7 @@ buildDunePackage { inherit (git) version src; minimalOCamlVersion = "4.08"; + duneVersion = "3"; buildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/git/paf.nix b/pkgs/development/ocaml-modules/git/paf.nix index 476364a52fb9..99f0175f0f40 100644 --- a/pkgs/development/ocaml-modules/git/paf.nix +++ b/pkgs/development/ocaml-modules/git/paf.nix @@ -13,7 +13,6 @@ , rresult , tls , uri -, bigarray-compat , bigstringaf , domain-name , httpaf @@ -27,6 +26,7 @@ buildDunePackage { inherit (git) version src; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ git @@ -43,7 +43,6 @@ buildDunePackage { mirage-time tls uri - bigarray-compat bigstringaf domain-name httpaf diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix index bd2e6f31848a..f5e8337382e4 100644 --- a/pkgs/development/ocaml-modules/git/unix.nix +++ b/pkgs/development/ocaml-modules/git/unix.nix @@ -15,10 +15,14 @@ buildDunePackage { inherit (git) version src; minimalOCamlVersion = "4.08"; + duneVersion = "3"; buildInputs = [ - awa awa-mirage cmdliner - mirage-clock tcpip + awa + awa-mirage + cmdliner + mirage-clock + tcpip ]; propagatedBuildInputs = [ rresult result bigstringaf @@ -31,10 +35,11 @@ buildDunePackage { ]; checkInputs = [ alcotest alcotest-lwt base64 ke - mirage-crypto-rng git-binary + mirage-crypto-rng uri mtime cacert # sets up NIX_SSL_CERT_FILE ]; + nativeCheckInputs = [ git-binary ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/gluten/default.nix b/pkgs/development/ocaml-modules/gluten/default.nix index fb6f85b10487..d0f41d202689 100644 --- a/pkgs/development/ocaml-modules/gluten/default.nix +++ b/pkgs/development/ocaml-modules/gluten/default.nix @@ -3,24 +3,25 @@ , faraday , fetchurl , lib +, ke }: buildDunePackage rec { pname = "gluten"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/anmonteiro/gluten/releases/download/${version}/gluten-${version}.tbz"; - sha256 = "1pl0mpcprz8hmaiv28p7w51qfcx7s76zdkak0vm5cazbjl38nc46"; + hash = "sha256-9jctX3G/nQJTGJ7ClSBEiXwxeu0GcT9N+EmPfLuSFOU="; }; - minimalOCamlVersion = "4.06"; - - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ bigstringaf faraday + ke ]; doCheck = false; # No tests diff --git a/pkgs/development/ocaml-modules/gluten/lwt-unix.nix b/pkgs/development/ocaml-modules/gluten/lwt-unix.nix index f3986b051355..cec427c3ad61 100644 --- a/pkgs/development/ocaml-modules/gluten/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/gluten/lwt-unix.nix @@ -7,7 +7,9 @@ buildDunePackage rec { pname = "gluten-lwt-unix"; - inherit (gluten) doCheck meta src useDune2 version; + inherit (gluten) doCheck meta src version; + + duneVersion = "3"; propagatedBuildInputs = [ faraday-lwt-unix diff --git a/pkgs/development/ocaml-modules/gluten/lwt.nix b/pkgs/development/ocaml-modules/gluten/lwt.nix index e2643d618954..cfa736c4bc99 100644 --- a/pkgs/development/ocaml-modules/gluten/lwt.nix +++ b/pkgs/development/ocaml-modules/gluten/lwt.nix @@ -5,7 +5,9 @@ buildDunePackage rec { pname = "gluten-lwt"; - inherit (gluten) doCheck meta src useDune2 version; + inherit (gluten) doCheck meta src version; + + duneVersion = "3"; propagatedBuildInputs = [ gluten diff --git a/pkgs/development/ocaml-modules/gmap/default.nix b/pkgs/development/ocaml-modules/gmap/default.nix index 6c412ecfa459..ce13b0e1cee3 100644 --- a/pkgs/development/ocaml-modules/gmap/default.nix +++ b/pkgs/development/ocaml-modules/gmap/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, ocaml, fetchurl, alcotest }: +{ lib, buildDunePackage, ocaml, fetchurl, alcotest, fmt }: buildDunePackage rec { pname = "gmap"; @@ -13,7 +13,7 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; - checkInputs = [ alcotest ]; + checkInputs = [ alcotest fmt ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index fe4f85a0024f..4985459248ac 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { strictDeps = true; meta = { - homepage = "http://gmetadom.sourceforge.net/"; + homepage = "https://gmetadom.sourceforge.net/"; description = "A collection of librares, each library providing a DOM implementation"; license = lib.licenses.lgpl21Plus; maintainers = [ lib.maintainers.roconnor ]; diff --git a/pkgs/development/ocaml-modules/graphql/cohttp.nix b/pkgs/development/ocaml-modules/graphql/cohttp.nix index 09f4757041af..b202d46abd53 100644 --- a/pkgs/development/ocaml-modules/graphql/cohttp.nix +++ b/pkgs/development/ocaml-modules/graphql/cohttp.nix @@ -1,6 +1,14 @@ -{ lib, buildDunePackage, ocaml-crunch -, astring, cohttp, digestif, graphql, ocplib-endian -, alcotest, cohttp-lwt-unix, graphql-lwt +{ lib +, buildDunePackage +, ocaml-crunch +, astring +, cohttp +, digestif +, graphql +, ocplib-endian +, alcotest +, cohttp-lwt-unix +, graphql-lwt }: buildDunePackage rec { @@ -8,7 +16,7 @@ buildDunePackage rec { inherit (graphql) version src; - useDune2 = true; + duneVersion = "3"; nativeBuildInputs = [ ocaml-crunch ]; propagatedBuildInputs = [ astring cohttp digestif graphql ocplib-endian ]; diff --git a/pkgs/development/ocaml-modules/graphql/default.nix b/pkgs/development/ocaml-modules/graphql/default.nix index 5bf61789e83a..679d89f44b10 100644 --- a/pkgs/development/ocaml-modules/graphql/default.nix +++ b/pkgs/development/ocaml-modules/graphql/default.nix @@ -5,6 +5,8 @@ buildDunePackage rec { inherit (graphql_parser) version src; + duneVersion = "3"; + propagatedBuildInputs = [ graphql_parser rresult yojson ]; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/graphql/lwt.nix b/pkgs/development/ocaml-modules/graphql/lwt.nix index 8fd6abfb8fb4..cbdcba64abb4 100644 --- a/pkgs/development/ocaml-modules/graphql/lwt.nix +++ b/pkgs/development/ocaml-modules/graphql/lwt.nix @@ -5,6 +5,8 @@ buildDunePackage rec { inherit (graphql) version src; + duneVersion = "3"; + propagatedBuildInputs = [ graphql ocaml_lwt ]; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/graphql/parser.nix b/pkgs/development/ocaml-modules/graphql/parser.nix index ce953a68b3c2..4042e65772bc 100644 --- a/pkgs/development/ocaml-modules/graphql/parser.nix +++ b/pkgs/development/ocaml-modules/graphql/parser.nix @@ -5,6 +5,7 @@ buildDunePackage rec { version = "0.14.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/andreas/ocaml-graphql-server/releases/download/${version}/graphql-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/graphql_ppx/default.nix b/pkgs/development/ocaml-modules/graphql_ppx/default.nix index 020108a90362..9314c1033d4c 100644 --- a/pkgs/development/ocaml-modules/graphql_ppx/default.nix +++ b/pkgs/development/ocaml-modules/graphql_ppx/default.nix @@ -18,7 +18,9 @@ buildDunePackage rec { sha256 = "sha256-+WJhA2ixZHiSZBoX14dnQKk7JfVAIME4JooNSnhRp44="; }; - buildInputs = [ ppxlib ]; + nativeBuildInputs = [ reason ]; + + buildInputs = [ ppxlib reason ]; propagatedBuildInputs = [ reason diff --git a/pkgs/development/ocaml-modules/gstreamer/default.nix b/pkgs/development/ocaml-modules/gstreamer/default.nix index 4ef3e98cb75e..34407299914a 100644 --- a/pkgs/development/ocaml-modules/gstreamer/default.nix +++ b/pkgs/development/ocaml-modules/gstreamer/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, glib, gst_all_1 }: +{ lib, stdenv, buildDunePackage, fetchFromGitHub, dune-configurator, AppKit, Foundation, pkg-config, glib, gst_all_1 }: buildDunePackage rec { pname = "gstreamer"; @@ -12,7 +12,7 @@ buildDunePackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AppKit Foundation ]; propagatedBuildInputs = [ glib.dev gst_all_1.gstreamer.dev gst_all_1.gst-plugins-base ]; CFLAGS_COMPILE = [ diff --git a/pkgs/development/ocaml-modules/hacl-star/raw.nix b/pkgs/development/ocaml-modules/hacl-star/raw.nix index 07e4d99344f7..3ec895c8e833 100644 --- a/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ctypes ]; - checkInputs = [ + nativeCheckInputs = [ cppo ]; diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix index 0c3109106c3d..a3a2a3cff1f9 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix @@ -4,17 +4,15 @@ buildDunePackage rec { pname = "happy-eyeballs"; - version = "0.3.0"; + version = "0.4.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/roburio/happy-eyeballs/releases/download/v${version}/happy-eyeballs-${version}.tbz"; - sha256 = "17mnid1gvq1ml1zmqzn0m6jmrqw4kqdrjqrdsrphl5kxxyhs03m6"; + hash = "sha256-gR9q4J/DnYJz8oYmk/wy17h4F6wxbllba/gkor5i1nQ="; }; - strictDeps = true; - propagatedBuildInputs = [ domain-name duration diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix b/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix index e9b260b2c144..50f1f9455739 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix @@ -17,8 +17,7 @@ buildDunePackage { inherit (happy-eyeballs) src version; minimalOCamlVersion = "4.08"; - - strictDeps = true; + duneVersion = "3"; buildInputs = [ cmdliner diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix index c30348777634..eb15706efac9 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix @@ -19,8 +19,7 @@ buildDunePackage { inherit (happy-eyeballs) src version; minimalOCamlVersion = "4.08"; - - strictDeps = true; + duneVersion = "3"; buildInputs = [ duration diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix index b4492f438ccc..68fc506222de 100644 --- a/pkgs/development/ocaml-modules/hidapi/default.nix +++ b/pkgs/development/ocaml-modules/hidapi/default.nix @@ -13,8 +13,6 @@ buildDunePackage rec { sha256 = "1j7rd7ajrzla76r3sxljx6fb18f4f4s3jd7vhv59l2ilxyxycai2"; }; - strictDeps = true; - minimumOCamlVersion = "4.03"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/ocaml-modules/hkdf/default.nix b/pkgs/development/ocaml-modules/hkdf/default.nix index 9832a5f4c41b..3df9ad5307c0 100644 --- a/pkgs/development/ocaml-modules/hkdf/default.nix +++ b/pkgs/development/ocaml-modules/hkdf/default.nix @@ -4,15 +4,14 @@ buildDunePackage rec { pname = "hkdf"; version = "1.0.4"; - minimumOCamlVersion = "4.07"; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/hannesm/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "0nzx6vzbc1hh6vx1ly8df4b16lgps6zjpp9mjycsnnn49bddc9mr"; + hash = "sha256-uSbW2krEWquZlzXdK7/R91ETFnENeRr6NhAGtv42/Vs="; }; - useDune2 = true; - propagatedBuildInputs = [ cstruct mirage-crypto ]; checkInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/httpaf/lwt-unix.nix b/pkgs/development/ocaml-modules/httpaf/lwt-unix.nix new file mode 100644 index 000000000000..9b78d7bf6401 --- /dev/null +++ b/pkgs/development/ocaml-modules/httpaf/lwt-unix.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage +, httpaf +, faraday-lwt-unix +, lwt +}: + +buildDunePackage { + pname = "httpaf-lwt-unix"; + inherit (httpaf) version src; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; + + propagatedBuildInputs = [ + faraday-lwt-unix + httpaf + lwt + ]; + + meta = httpaf.meta // { + description = "Lwt support for http/af"; + }; +} diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix index 101a0e28b94e..10509f1e7500 100644 --- a/pkgs/development/ocaml-modules/imagelib/default.nix +++ b/pkgs/development/ocaml-modules/imagelib/default.nix @@ -1,22 +1,27 @@ -{ lib, fetchurl, buildDunePackage, ocaml -, decompress, stdlib-shims, alcotest +{ lib +, fetchurl +, buildDunePackage +, ocaml +, decompress +, stdlib-shims +, alcotest }: buildDunePackage rec { - minimumOCamlVersion = "4.07"; - version = "20210511"; + minimalOCamlVersion = "4.08"; + version = "20221222"; pname = "imagelib"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/rlepigre/ocaml-imagelib/releases/download/${version}/imagelib-${version}.tbz"; - sha256 = "1cb94ea3731dc994c205940c9434543ce3f2470cdcb2e93a3e02ed793e80d480"; + hash = "sha256-BQ2TVxGlpc6temteK84TKXpx0MtHZSykL/TjKN9xGP0="; }; propagatedBuildInputs = [ decompress stdlib-shims ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; checkInputs = [ alcotest ]; meta = { diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix index d1c6dc376164..2dce9320afd4 100644 --- a/pkgs/development/ocaml-modules/inotify/default.nix +++ b/pkgs/development/ocaml-modules/inotify/default.nix @@ -1,42 +1,24 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, ocamlbuild -, ocaml_lwt # optional lwt support -, ounit, fileutils # only for tests +{ lib, fetchFromGitHub, buildDunePackage +, lwt # optional lwt support +, ounit2, fileutils # only for tests }: -stdenv.mkDerivation rec { - version = "2.3"; - pname = "ocaml${ocaml.version}-inotify"; +buildDunePackage rec { + version = "2.4.1"; + pname = "inotify"; src = fetchFromGitHub { owner = "whitequark"; repo = "ocaml-inotify"; rev = "v${version}"; - sha256 = "1s6vmqpx19hxzsi30jvp3h7p56rqnxfhfddpcls4nz8sqca1cz5y"; + hash = "sha256-2ATFF3HeATjhWgW4dG4jheQ9m1oE8xTQ7mpMT/1Jdp8="; }; - patches = [ (fetchpatch { - url = "https://github.com/whitequark/ocaml-inotify/commit/716c8002cc1652f58eb0c400ae92e04003cba8c9.patch"; - sha256 = "04lfxrrsmk2mc704kaln8jqx93jc4bkxhijmfy2d4cmk1cim7r6k"; - }) ]; + buildInputs = [ 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") ]; - - postConfigure = lib.optionalString doCheck '' - echo ': pkg_threads' | tee -a _tags - ''; + checkInputs = [ ounit2 fileutils ]; doCheck = true; - checkTarget = "test"; - - createFindlibDestdir = true; meta = { description = "Bindings for Linux’s filesystem monitoring interface, inotify"; diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix index ed5ccbedb64d..343aeb216ba8 100644 --- a/pkgs/development/ocaml-modules/integers/default.nix +++ b/pkgs/development/ocaml-modules/integers/default.nix @@ -1,18 +1,20 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml }: +{ lib, fetchFromGitHub, buildDunePackage +, stdlib-shims +}: buildDunePackage rec { pname = "integers"; - version = "0.5.1"; - - useDune2 = lib.versionAtLeast ocaml.version "4.08"; + version = "0.7.0"; src = fetchFromGitHub { owner = "ocamllabs"; repo = "ocaml-integers"; rev = version; - sha256 = "0by5pc851fk7ccxqy1w2qc5jwn9z8whyqhs5gxlm5986vr9msnyi"; + sha256 = "sha256-zuUgP1jOiVT0q6GisGpkqx7nybWbARgnAcU8NYqvCzA="; }; + propagatedBuildInputs = [ stdlib-shims ]; + meta = { description = "Various signed and unsigned integer types for OCaml"; license = lib.licenses.mit; diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index eeb92c3eb28e..b57628222405 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, cstruct, bigarray-compat, ounit }: +{ lib, fetchurl, buildDunePackage, pkg-config, cstruct, bigarray-compat, ounit }: buildDunePackage rec { pname = "io-page"; @@ -11,6 +11,7 @@ buildDunePackage rec { sha256 = "sha256-DjbKdNkFa6YQgJDLmLsuvyrweb4/TNvqAiggcj/3hu4="; }; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ cstruct bigarray-compat ]; checkInputs = [ ounit ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/irmin/containers.nix b/pkgs/development/ocaml-modules/irmin/containers.nix index 547ec4105263..73cd25f3170d 100644 --- a/pkgs/development/ocaml-modules/irmin/containers.nix +++ b/pkgs/development/ocaml-modules/irmin/containers.nix @@ -13,12 +13,18 @@ buildDunePackage { ]; propagatedBuildInputs = [ - irmin irmin-fs ppx_irmin lwt mtime + irmin + irmin-fs + ppx_irmin + lwt + mtime ]; doCheck = true; checkInputs = [ - alcotest alcotest-lwt cacert + alcotest + alcotest-lwt + cacert ]; meta = ppx_irmin.meta // { diff --git a/pkgs/development/ocaml-modules/irmin/fs.nix b/pkgs/development/ocaml-modules/irmin/fs.nix index 54483d39b7e6..1788cf1eda23 100644 --- a/pkgs/development/ocaml-modules/irmin/fs.nix +++ b/pkgs/development/ocaml-modules/irmin/fs.nix @@ -1,5 +1,6 @@ { lib, buildDunePackage, irmin, astring, logs, lwt -, alcotest, irmin-test, irmin-watcher }: +, alcotest, irmin-test, irmin-watcher +}: buildDunePackage rec { diff --git a/pkgs/development/ocaml-modules/irmin/git.nix b/pkgs/development/ocaml-modules/irmin/git.nix index 387fc60a0aa9..c48928159130 100644 --- a/pkgs/development/ocaml-modules/irmin/git.nix +++ b/pkgs/development/ocaml-modules/irmin/git.nix @@ -10,6 +10,7 @@ buildDunePackage { pname = "irmin-git"; inherit (irmin) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ git diff --git a/pkgs/development/ocaml-modules/irmin/graphql.nix b/pkgs/development/ocaml-modules/irmin/graphql.nix index 1b5ecb51396f..005bf25eb2d9 100644 --- a/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -7,6 +7,7 @@ buildDunePackage rec { pname = "irmin-graphql"; inherit (irmin) version src; + duneVersion = "3"; propagatedBuildInputs = [ cohttp-lwt cohttp-lwt-unix graphql-cohttp graphql-lwt irmin git-unix ]; diff --git a/pkgs/development/ocaml-modules/irmin/http.nix b/pkgs/development/ocaml-modules/irmin/http.nix index 1f58daca536a..9a466928c64a 100644 --- a/pkgs/development/ocaml-modules/irmin/http.nix +++ b/pkgs/development/ocaml-modules/irmin/http.nix @@ -9,6 +9,7 @@ buildDunePackage rec { pname = "irmin-http"; inherit (irmin) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ astring cohttp-lwt cohttp-lwt-unix fmt jsonm logs lwt uri irmin webmachine ]; diff --git a/pkgs/development/ocaml-modules/irmin/mirage-git.nix b/pkgs/development/ocaml-modules/irmin/mirage-git.nix index 09c1820d6094..1491439f7656 100644 --- a/pkgs/development/ocaml-modules/irmin/mirage-git.nix +++ b/pkgs/development/ocaml-modules/irmin/mirage-git.nix @@ -7,6 +7,7 @@ buildDunePackage { pname = "irmin-mirage-git"; inherit (irmin-mirage) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ irmin-mirage diff --git a/pkgs/development/ocaml-modules/irmin/mirage-graphql.nix b/pkgs/development/ocaml-modules/irmin/mirage-graphql.nix index bfbe45b39019..75d3c567a04d 100644 --- a/pkgs/development/ocaml-modules/irmin/mirage-graphql.nix +++ b/pkgs/development/ocaml-modules/irmin/mirage-graphql.nix @@ -6,6 +6,7 @@ buildDunePackage { pname = "irmin-mirage-graphql"; inherit (irmin-mirage) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ irmin-mirage diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix index 8749aef1433d..83cd5b1d7f5f 100644 --- a/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -11,8 +11,6 @@ buildDunePackage rec { minimalOCamlVersion = "4.10"; - strictDeps = false; # We must provide checkInputs as buildInputs because dune builds tests at build time - propagatedBuildInputs = [ ppx_repr ppxlib diff --git a/pkgs/development/ocaml-modules/irmin/tezos.nix b/pkgs/development/ocaml-modules/irmin/tezos.nix index 8426316ed398..82a89daec359 100644 --- a/pkgs/development/ocaml-modules/irmin/tezos.nix +++ b/pkgs/development/ocaml-modules/irmin/tezos.nix @@ -9,17 +9,17 @@ buildDunePackage rec { inherit (irmin) version src strictDeps; propagatedBuildInputs = [ - irmin - irmin-pack - ppx_irmin - digestif - fmt - tezos-base58 + irmin + irmin-pack + ppx_irmin + digestif + fmt + tezos-base58 ]; buildInputs = [ - cmdliner - yojson + cmdliner + yojson ]; checkInputs = [ alcotest hex irmin-test fpath ]; diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix index 3faa8244b6d7..26adaf06d1ee 100644 --- a/pkgs/development/ocaml-modules/iter/default.nix +++ b/pkgs/development/ocaml-modules/iter/default.nix @@ -18,7 +18,8 @@ buildDunePackage rec { propagatedBuildInputs = [ result seq ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ mdx.bin ounit2 qcheck-core ]; + nativeCheckInputs = [ mdx.bin ]; + checkInputs = [ ounit2 qcheck-core ]; meta = { homepage = "https://github.com/c-cube/sequence"; diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 67d0e6c7896e..075f7c1f57d6 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -84,6 +84,7 @@ with self; async_js = janePackage { pname = "async_js"; + duneVersion = "3"; hash = "0rld8792lfwbinn9rhrgacivz49vppgy29smpqnvpga89wchjv0v"; meta.description = "A small library that provide Async support for JavaScript platforms"; buildInputs = [ js_of_ocaml-ppx ]; @@ -119,6 +120,7 @@ with self; }; async_smtp = janePackage { + duneVersion = "3"; pname = "async_smtp"; hash = "1xf3illn7vikdxldpnc29n4z8sv9f0wsdgdvl4iv93qlvjk8gzck"; meta.description = "SMTP client and server"; @@ -190,6 +192,7 @@ with self; bonsai = janePackage { pname = "bonsai"; + duneVersion = "3"; hash = "0k4grabwqc9sy4shzp77bgfvyajvvc0l8qq89ia7cvlwvly7gv6a"; meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; buildInputs = [ ppx_pattern_bind ]; @@ -203,8 +206,6 @@ with self; meta.description = "Trivial metaprogramming tool"; propagatedBuildInputs = [ re ]; checkInputs = [ ppx_jane ]; - # This currently fails with dune - strictDeps = false; }; core = janePackage { @@ -270,6 +271,7 @@ with self; }; email_message = janePackage { + duneVersion = "3"; pname = "email_message"; hash = "0k8hjkq91ikl7wjxs04k523jbkhl6q4abj6v0lzlbjiybmrpp69n"; meta.description = "E-mail message parser"; @@ -309,6 +311,7 @@ with self; incr_dom = janePackage { pname = "incr_dom"; + duneVersion = "3"; hash = "0mi98cwi4npdh5vvcz0pb4sbb9j9dydl52s51rswwc3kn8mipxfx"; meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; buildInputs = [ js_of_ocaml-ppx ]; @@ -778,8 +781,6 @@ with self; buildInputs = [ jst-config ]; propagatedBuildInputs = [ textutils ]; checkInputs = [ ounit ]; - # This currently fails with dune - strictDeps = false; }; shexp = janePackage { @@ -877,6 +878,7 @@ with self; virtual_dom = janePackage { pname = "virtual_dom"; + duneVersion = "3"; hash = "0vcydxx0jhbd5hbriahgp947mc7n3xymyrsfny1c4adk6aaq3c5w"; meta.description = "OCaml bindings for the virtual-dom library"; buildInputs = [ js_of_ocaml-ppx ]; diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index 19d0219e384d..7433c116b68f 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -1,5 +1,7 @@ { self +, bash , fetchpatch +, fzf , lib , openssl , zstd @@ -87,6 +89,7 @@ with self; async_js = janePackage { pname = "async_js"; + duneVersion = "3"; hash = "184j077bz686k5lrqswircnrdqldb316ngpzq7xri1pcsl39sy3q"; meta.description = "A small library that provide Async support for JavaScript platforms"; buildInputs = [ js_of_ocaml-ppx ]; @@ -108,6 +111,7 @@ with self; }; async_rpc_websocket = janePackage { + duneVersion = "3"; pname = "async_rpc_websocket"; hash = "1n93jhkz5r76xcc40c4i4sxcyfz1dbppz8sjfxpwcwjyi6lyhp1p"; meta.description = "Library to serve and dispatch Async RPCs over websockets"; @@ -129,6 +133,7 @@ with self; }; async_smtp = janePackage { + duneVersion = "3"; pname = "async_smtp"; hash = "1m00j7wcb0blipnc1m6by70gd96a1k621b4dgvgffp8as04a461r"; minimumOCamlVersion = "4.12"; @@ -157,6 +162,7 @@ with self; }; async_websocket = janePackage { + duneVersion = "3"; pname = "async_websocket"; hash = "16ixqfnx9jp77bvx11dlzsq0pzfpyiif60hl2q06zncyswky9xgb"; meta.description = "A library that implements the websocket protocol on top of Async"; @@ -207,6 +213,7 @@ with self; bonsai = janePackage { pname = "bonsai"; + duneVersion = "3"; hash = "150zx2g1dmhyrxwqq8j7f2m3hjpmk5bk182ihx2gdbarhw1ainpm"; meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; buildInputs = [ ppx_pattern_bind ]; @@ -240,6 +247,7 @@ with self; }; cohttp_async_websocket = janePackage { + duneVersion = "3"; pname = "cohttp_async_websocket"; hash = "0d0smavnxpnwrmhlcf3b5a3cm3n9kz1y8fh6l28xv6zrn4sc7ik8"; meta.description = "Websocket library for use with cohttp and async"; @@ -248,7 +256,8 @@ with self; core = janePackage { pname = "core"; - hash = "1m2ybvlz9zlb2d0jc0j7wdgd18mx9sh3ds2ylkv0cfjx1pzi0l25"; + version = "0.15.1"; + hash = "sha256-SHjnNFl+JAjdgVoRgmnz0wqrrc3zoh0ZyG2UhUsUbJ8="; meta.description = "Industrial strength alternative to OCaml's standard library"; buildInputs = [ jst-config ]; propagatedBuildInputs = [ base base_bigstring base_quickcheck ppx_jane time_now ]; @@ -280,7 +289,8 @@ with self; core_unix = janePackage { pname = "core_unix"; - hash = "1xzxqzg23in5ivz0v3qshzpr4w92laayscqj9im7jylh2ar1xi0a"; + version = "0.15.2"; + hash = "sha256-9f2PiLo+4Bjnfvh3scvIiPHj0wPZozmMMiCTe7vC1EA="; meta.description = "Unix-specific portions of Core"; buildInputs = [ jst-config ]; propagatedBuildInputs = [ core_kernel expect_test_helpers_core ocaml_intrinsics ppx_jane timezone spawn ]; @@ -291,7 +301,8 @@ with self; csvfields = janePackage { pname = "csvfields"; - hash = "0z47pq17bw776hzvk48ypbd92ps9vlvl86mnhw3j6cqx4ahbjik3"; + version = "0.15.1"; + hash = "sha256-bBupsarwjte2NCncNDFSkrrmMR3EYPn+D7xI9zQOhFA="; propagatedBuildInputs = [ core num ]; meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv"; }; @@ -311,6 +322,7 @@ with self; }; email_message = janePackage { + duneVersion = "3"; pname = "email_message"; hash = "00h66l2g5rjaay0hbyqy4v9i866g779miriwv20h9k4mliqdq7in"; meta.description = "E-mail message parser"; @@ -369,6 +381,9 @@ with self; hash = "1ha0i6dx5bgwzbdi4rn98wjwi2imv5p2i7qs7hy0c6cmg88xbdry"; meta.description = "A library for running the fzf command line tool"; propagatedBuildInputs = [ async core_kernel ppx_jane ]; + postPatch = '' + substituteInPlace src/fzf.ml --replace /usr/bin/fzf ${fzf}/bin/fzf + ''; }; higher_kinded = janePackage { @@ -381,6 +396,7 @@ with self; incr_dom = janePackage { pname = "incr_dom"; + duneVersion = "3"; hash = "1sija9w2im8vdp61h387w0mww9hh7jgkgsjcccps4lbv936ac7c1"; meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; buildInputs = [ js_of_ocaml-ppx ]; @@ -481,6 +497,10 @@ with self; patdiff = janePackage { pname = "patdiff"; hash = "0623a7n5r659rkxbp96g361mvxkcgc6x9lcbkm3glnppplk5kxr9"; + + # Used by patdiff-git-wrapper. Providing it here also causes the shebang + # line to be automatically patched. + buildInputs = [ bash ]; propagatedBuildInputs = [ core_unix patience_diff ocaml_pcre ]; meta = { description = "File Diff using the Patience Diff algorithm"; @@ -569,6 +589,7 @@ with self; ppx_css = janePackage { pname = "ppx_css"; + duneVersion = "3"; hash = "09dpmj3f3m3z1ji9hq775iqr3cfmv5gh7q9zlblizj4wx4y0ibyi"; meta.description = "A ppx that takes in css strings and produces a module for accessing the unique names defined within"; propagatedBuildInputs = [ core_kernel ppxlib js_of_ocaml js_of_ocaml-ppx sedlex ]; @@ -592,7 +613,8 @@ with self; ppx_expect = janePackage { pname = "ppx_expect"; - hash = "134dl5qhjxsj2mcmrx9f3m0iys0n5mjfpz9flj8zn8d2jir43776"; + version = "0.15.1"; + hash = "sha256-qlOipzTTdN9yQ35sItKmWpCv74kbuJLDg4IHNVTKvow="; minimumOCamlVersion = "4.04.2"; meta.description = "Cram like framework for OCaml"; propagatedBuildInputs = [ ppx_here ppx_inline_test re ]; @@ -818,11 +840,11 @@ with self; pythonlib = janePackage { pname = "pythonlib"; - hash = "0p88vmp19zmr0r58dz6sawsmbn4yi2vyymad2c82kp93kg66nm1v"; + version = "0.15.1"; + hash = "sha256-j8WXVTEiBmHtoTjkbnIh31vC4IghfAMaEL19nDLx3mc="; meta.description = "A library to help writing wrappers around ocaml code for python"; - patches = lib.optional (lib.versionAtLeast ocaml.version "4.13") ./pythonlib.patch; + buildInputs = [ ppx_optcomp ]; propagatedBuildInputs = [ ppx_expect ppx_let ppx_python stdio typerep ]; - meta.broken = lib.versionAtLeast ocaml.version "4.14"; }; re2 = janePackage { @@ -898,7 +920,8 @@ with self; sexp_pretty = janePackage { pname = "sexp_pretty"; - hash = "1p1jspwjvrhm8li22xl0n8wngs12d9g7nc1svk6xc32jralnxblg"; + version = "0.15.1"; + hash = "sha256-UJEO2P4C7ZaD110MEfkG4FXfGDVAAW2TAK489faV6SM="; minimumOCamlVersion = "4.07"; meta.description = "S-expression pretty-printer"; propagatedBuildInputs = [ ppx_base re sexplib ]; @@ -922,7 +945,8 @@ with self; sexplib = janePackage { pname = "sexplib"; - hash = "05h34fm3p0179xivc14bixc50pzc8zws46l5gsq310kpm37srq3c"; + version = "0.15.1"; + hash = "sha256-LkGNnp717LMHeWe1Ka6qUZcpw8fKSsd5MusaLgFjm70="; minimumOCamlVersion = "4.04.2"; meta.description = "Library for serializing OCaml values to and from S-expressions"; propagatedBuildInputs = [ num parsexp ]; @@ -935,8 +959,6 @@ with self; buildInputs = [ jst-config ]; propagatedBuildInputs = [ textutils ]; checkInputs = [ ounit ]; - # This currently fails with dune - strictDeps = false; }; shexp = janePackage { @@ -1042,6 +1064,7 @@ with self; hash = "15xia9v4ighzm0gv3vbqk9nvg47cvzqmfnl2zr67yxv4b98kyzv3"; meta.description = "OCaml bindings for the virtual-dom library"; buildInputs = [ js_of_ocaml-ppx ]; + duneVersion = "3"; propagatedBuildInputs = [ core_kernel gen_js_api js_of_ocaml lambdasoup tyxml ]; }; diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix index da2687576015..9552268abc2e 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix @@ -16,8 +16,6 @@ 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 5b9186835701..d61f1b6d41c2 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix @@ -16,8 +16,6 @@ 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 d124baea8972..e3c3efc9999e 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix @@ -6,12 +6,11 @@ , minimumOCamlVersion ? "4.08" , doCheck ? true , buildInputs ? [] -, strictDeps ? true , ...}@args: buildDunePackage (args // { useDune2 = true; - inherit version buildInputs strictDeps; + inherit version buildInputs; inherit minimumOCamlVersion; diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix index 678599089946..7306ce46bf99 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix @@ -6,12 +6,11 @@ , minimumOCamlVersion ? "4.11" , doCheck ? true , buildInputs ? [] -, strictDeps ? true , ...}@args: buildDunePackage (args // { useDune2 = true; - inherit version buildInputs strictDeps; + inherit version buildInputs; inherit minimumOCamlVersion; diff --git a/pkgs/development/ocaml-modules/janestreet/pythonlib.patch b/pkgs/development/ocaml-modules/janestreet/pythonlib.patch deleted file mode 100644 index 71a32fd0236c..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/pythonlib.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/type.ml b/src/type.ml -index 8a9e648..3f3b0e9 100644 ---- a/src/type.ml -+++ b/src/type.ml -@@ -31,12 +31,12 @@ let of_type_desc type_desc ~env = - | Tunivar _ -> Or_error.error_string "not handled: Tunivar" - | Tvariant _ -> Or_error.error_string "not handled: Tvariant" - | Tnil -> Or_error.error_string "not handled: Tnil" -- | Tobject (_, _) -> Or_error.error_string "not handled: Tobject" -- | Tfield (_, _, _, _) -> Or_error.error_string "not handled: Tfield" -- | Tpackage (_, _, _) -> Or_error.error_string "not handled: Tpackage" -- | Tpoly (_, _) -> Or_error.error_string "not handled: Tpoly" -+ | Tobject _ -> Or_error.error_string "not handled: Tobject" -+ | Tfield _ -> Or_error.error_string "not handled: Tfield" -+ | Tpackage _ -> Or_error.error_string "not handled: Tpackage" -+ | Tpoly _ -> Or_error.error_string "not handled: Tpoly" - | Tlink e -> walk e.desc -- | Tsubst e -> walk e.desc -+ | Tsubst (e, _) -> walk e.desc - | Ttuple es -> - let%bind tuple = List.map es ~f:(fun e -> walk e.desc) |> Or_error.all in - (match tuple with diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index a12ade51c2ea..5675e10dbad1 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -8,19 +8,18 @@ , extlib }: -if lib.versionOlder ocaml.version "4.04" -then throw "javalib is not available for OCaml ${ocaml.version}" -else +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "javalib is not available for OCaml ${ocaml.version}" stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-javalib"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "javalib-team"; repo = "javalib"; - rev = "v${version}"; - sha256 = "sha256-du1h+S+A7CetMXofsYxdGeSsobCgspDB9oUE9WNUbbo="; + rev = version; + hash = "sha256-XaI7GTU/O5UEWuYX4yqaIRmEoH7FuvCg/+gtKbE/P1s="; }; nativeBuildInputs = [ which ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/pkgs/development/ocaml-modules/jingoo/default.nix index 36aa09455cec..5ee48d3ed2d6 100644 --- a/pkgs/development/ocaml-modules/jingoo/default.nix +++ b/pkgs/development/ocaml-modules/jingoo/default.nix @@ -1,5 +1,6 @@ { lib, buildDunePackage, fetchFromGitHub -, menhir, ppxlib, ppx_deriving, re, uutf, uucp, ounit2 }: +, menhir, ppxlib, ppx_deriving, re, uutf, uucp, ounit2 +}: buildDunePackage rec { pname = "jingoo"; @@ -16,7 +17,7 @@ buildDunePackage rec { sha256 = "sha256-qIw69OE7wYyZYKnIc9QrmF8MzY5Fg5pBFyIpexmaYxA="; }; - buildInputs = [ menhir ]; + nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ ppxlib ppx_deriving re uutf uucp ]; checkInputs = [ ounit2 ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/jwto/default.nix b/pkgs/development/ocaml-modules/jwto/default.nix index 3950c13d3fcf..745f86dff52b 100644 --- a/pkgs/development/ocaml-modules/jwto/default.nix +++ b/pkgs/development/ocaml-modules/jwto/default.nix @@ -1,26 +1,26 @@ -{ lib, buildDunePackage, fetchFromGitHub, alcotest, cryptokit, fmt, yojson +{ lib, buildDunePackage, fetchFromGitHub, alcotest, digestif, fmt, yojson , ppxlib , base64, re, ppx_deriving }: buildDunePackage rec { pname = "jwto"; - version = "0.3.0"; + version = "0.4.0"; - useDune2 = true; + duneVersion = "3"; - minimumOCamlVersion = "4.05"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "sporto"; repo = "jwto"; rev = version; - sha256 = "1p799zk8j9c0002xzi2x7ndj1bzqf14744ampcqndrjnsi7mq71s"; + hash = "sha256-TOWwNyrOqboCm8Y4mM6GgtmxGO3NmyDdAX7m8CifA7Y="; }; buildInputs = [ ppxlib ]; propagatedBuildInputs = - [ cryptokit fmt yojson base64 re ppx_deriving ]; + [ digestif fmt yojson base64 re ppx_deriving ]; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index b010272b54b4..55dd88d7246b 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "sha256:141kc816iv59z96738i3vn9m9iw9g2zhi45hk4cchpwd99ar5l6k"; }; + strictDeps = true; + nativeBuildInputs = [ ocaml findlib ]; buildInputs = [ freeglut ]; propagatedBuildInputs = [ libGLU libGL ]; diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix index bcf82e1c3842..3d5135d7439a 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "09fqxwdib7r9yxynknc9gv3jw2hnhj5cak7q5jngk6m8rzvmhfcc"; }; + strictDeps = true; + nativeBuildInputs = [ ocaml findlib camlp4 ]; propagatedBuildInputs = [ config-file lablgtk xmlm ]; diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix index 75b3940a1d50..66728db65566 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { sha256 = "1bbdp5j18s582mmyd7qiaq1p08g2ag4gl7x65pmzahbhg719hjda"; }; + strictDeps = true; + nativeBuildInputs = [ ocaml findlib camlp4 ]; propagatedBuildInputs = [ config-file lablgtk xmlm ]; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 9a4bf801d1e5..96dbd071fdef 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, gtksourceview -, camlp-streams +, camlp-streams, gnumake42 }: let param = @@ -32,7 +32,8 @@ stdenv.mkDerivation { pname = "ocaml${ocaml.version}-lablgtk"; inherit (param) version src NIX_CFLAGS_COMPILE; - nativeBuildInputs = [ pkg-config ocaml findlib ]; + # gnumake42: https://github.com/garrigue/lablgtk/issues/162 + nativeBuildInputs = [ pkg-config ocaml findlib gnumake42 ]; buildInputs = [ gtk2 libgnomecanvas gtksourceview ] ++ param.buildInputs or []; diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index fd7e59424547..465c82da1210 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, fetchzip, ocaml, findlib, tcl, tk }: +{ stdenv, lib, makeWrapper, fetchzip, Cocoa, ocaml, findlib, tcl, tk }: let params = @@ -59,8 +59,10 @@ stdenv.mkDerivation rec { inherit (param) version src; pname = "ocaml${ocaml.version}-labltk"; + strictDeps = true; + nativeBuildInputs = [ ocaml findlib makeWrapper ]; - buildInputs = [ tcl tk ]; + buildInputs = [ tcl tk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; 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 239cbca42986..a2294822a0ca 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -16,8 +16,6 @@ buildDunePackage rec { duneVersion = if lib.versionAtLeast ocaml.version "4.08" then "3" else "2"; - strictDeps = true; - src = fetchFromGitHub { owner = "ocaml-community"; repo = pname; @@ -26,7 +24,7 @@ buildDunePackage rec { }; propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ] - ++ lib.optional (lib.versionAtLeast version "3.3.1") [ uucp logs ] ; + ++ lib.optionals (lib.versionAtLeast version "3.3.1") [ uucp logs ] ; meta = { description = "Terminal manipulation library for OCaml"; diff --git a/pkgs/development/ocaml-modules/lambdapi/default.nix b/pkgs/development/ocaml-modules/lambdapi/default.nix index 42238edcb312..1478687fe5e3 100644 --- a/pkgs/development/ocaml-modules/lambdapi/default.nix +++ b/pkgs/development/ocaml-modules/lambdapi/default.nix @@ -34,7 +34,7 @@ buildDunePackage rec { ]; checkInputs = [ alcotest dedukti ]; - doCheck = false; # anomaly: Sys_error("/homeless-shelter/.why3.conf: No such file or directory") + doCheck = false; # anomaly: Sys_error("/homeless-shelter/.why3.conf: No such file or directory") meta = with lib; { homepage = "https://github.com/Deducteam/lambdapi"; diff --git a/pkgs/development/ocaml-modules/letsencrypt/app.nix b/pkgs/development/ocaml-modules/letsencrypt/app.nix index 1f6cc6e2b103..b2d8b3c22073 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/app.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/app.nix @@ -17,12 +17,12 @@ buildDunePackage { pname = "letsencrypt-app"; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; inherit (letsencrypt) src version - useDune2 - minimumOCamlVersion ; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix index a0646517b1bc..13875147a4e5 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -25,11 +25,11 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz"; - sha256 = "f90875f5c9bdcab4c8be5ec7ebe9ea763030fa708e02857300996bb16e7c2070"; + hash = "sha256-+Qh19cm9yrTIvl7H6+nqdjAw+nCOAoVzAJlrsW58IHA="; }; - minimumOCamlVersion = "4.08"; - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; buildInputs = [ fmt diff --git a/pkgs/development/ocaml-modules/letsencrypt/dns.nix b/pkgs/development/ocaml-modules/letsencrypt/dns.nix index 99058f48d069..6465c8c72202 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/dns.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/dns.nix @@ -11,12 +11,12 @@ buildDunePackage { pname = "letsencrypt-dns"; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; inherit (letsencrypt) version src - useDune2 - minimumOCamlVersion ; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/lockfree/default.nix b/pkgs/development/ocaml-modules/lockfree/default.nix new file mode 100644 index 000000000000..c3400d4583e0 --- /dev/null +++ b/pkgs/development/ocaml-modules/lockfree/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchurl, buildDunePackage +, dscheck +, qcheck, qcheck-alcotest +}: + +buildDunePackage rec { + pname = "lockfree"; + version = "0.3.0"; + + minimalOCamlVersion = "5.0"; + duneVersion = "3"; + + src = fetchurl { + url = "https://github.com/ocaml-multicore/lockfree/releases/download/${version}/lockfree-${version}.tbz"; + hash = "sha256-XdJR5ojFsA7bJ4aZ5rh10NjopE0NjfqQ9KitOLMh3Jo="; + }; + + propagatedBuildInputs = [ dscheck ]; + + doCheck = true; + checkInputs = [ qcheck qcheck-alcotest ]; + + meta = { + description = "Lock-free data structures for multicore OCaml"; + homepage = "https://github.com/ocaml-multicore/lockfree"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/lru/default.nix b/pkgs/development/ocaml-modules/lru/default.nix index ec78ec91012c..678023bb8f3d 100644 --- a/pkgs/development/ocaml-modules/lru/default.nix +++ b/pkgs/development/ocaml-modules/lru/default.nix @@ -2,13 +2,11 @@ buildDunePackage rec { pname = "lru"; - version = "0.3.0"; - - useDune2 = true; + version = "0.3.1"; src = fetchurl { - url = "https://github.com/pqwy/lru/releases/download/v${version}/lru-v${version}.tbz"; - sha256 = "1ab9rd7cq15ml8x0wjl44wy99h5z7x4g9vkkz4i2d7n84ghy7vw4"; + url = "https://github.com/pqwy/lru/releases/download/v${version}/lru-${version}.tbz"; + hash = "sha256-bL4j0np9WyRPhpwLiBQNR/cPQTpkYu81wACTJdSyNv0="; }; propagatedBuildInputs = [ psq ]; diff --git a/pkgs/development/ocaml-modules/lustre-v6/default.nix b/pkgs/development/ocaml-modules/lustre-v6/default.nix index 419ae432ed37..97084b913edb 100644 --- a/pkgs/development/ocaml-modules/lustre-v6/default.nix +++ b/pkgs/development/ocaml-modules/lustre-v6/default.nix @@ -1,29 +1,28 @@ -{ lib, buildDunePackage, fetchurl, extlib, lutils, rdbg }: +{ lib, buildDunePackage, fetchurl, extlib, lutils, rdbg, yaml }: buildDunePackage rec { pname = "lustre-v6"; - version = "6.103.3"; + version = "6.107.3"; - useDune2 = true; - - minimalOCamlVersion = "4.05"; + minimalOCamlVersion = "4.12"; src = fetchurl { - url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.6.103.3.tgz"; - sha512 = "8d452184ee68edda1b5a50717e6a5b13fb21f9204634fc5898280e27a1d79c97a6e7cc04424fc22f34cdd02ed3cc8774dca4f982faf342980b5f9fe0dc1a017d"; + url = "https://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.v${version}.tgz"; + hash = "sha256-z3cljDyxtotCGUIdYEzYu7fQd04RC3hhWpROcMh6Zng="; }; propagatedBuildInputs = [ extlib lutils rdbg + yaml ]; meta = with lib; { description = "Lustre V6 compiler"; homepage = "https://www-verimag.imag.fr/lustre-v6.html"; - license = lib.licenses.cecill21; - maintainers = [ lib.maintainers.delta ]; + license = licenses.cecill21; + maintainers = with maintainers; [ delta wegank ]; mainProgram = "lv6"; }; } diff --git a/pkgs/development/ocaml-modules/lutils/default.nix b/pkgs/development/ocaml-modules/lutils/default.nix index c462eb9fe15d..38bd10077ce0 100644 --- a/pkgs/development/ocaml-modules/lutils/default.nix +++ b/pkgs/development/ocaml-modules/lutils/default.nix @@ -1,25 +1,24 @@ -{ lib, buildDunePackage, fetchurl, num }: +{ lib, buildDunePackage, fetchurl, camlp-streams, num }: buildDunePackage rec { pname = "lutils"; - version = "1.51.2"; - - useDune2 = true; + version = "1.54.1"; minimalOCamlVersion = "4.02"; src = fetchurl { - url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lutils.1.51.2.tgz"; - sha512 = "f94696be379c62e888410ec3d940c888ca4b607cf59c2e364e93a2a694da65ebe6d531107198b795e80eecc3c6865eedb02659c7e7c4e15c9b28d74aa35d09f8"; + url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lutils.v${version}.tgz"; + hash = "sha512:d3c3b80286b1aa236ba922d9e18a133721fc80126c8b89520fb811dce9400e217aaa75b5d49e03988be7f6bf5f2e1a391d02ceeaa5ec0a0cd5ce218083a29514"; }; propagatedBuildInputs = [ - num + camlp-streams num ]; meta = with lib; { homepage = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/"; description = "Tools and libs shared by Verimag/synchronous tools (lustre, lutin, rdbg)"; + changelog = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/-/releases/v${version}"; license = lib.licenses.cecill21; mainProgram = "gnuplot-rif"; }; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 9be06c2e6112..8004cfcd4bb4 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -15,8 +15,6 @@ buildDunePackage rec { sha256 = "sha256-XstKs0tMwliCyXnP0Vzi5WC27HKJGnATUYtbbQmH1TE="; }; - strictDeps = true; - nativeBuildInputs = [ cppo ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ libev ocplib-endian ]; diff --git a/pkgs/development/ocaml-modules/lwt/ppx.nix b/pkgs/development/ocaml-modules/lwt/ppx.nix index 1ba21af864bb..2881560c6f8d 100644 --- a/pkgs/development/ocaml-modules/lwt/ppx.nix +++ b/pkgs/development/ocaml-modules/lwt/ppx.nix @@ -2,11 +2,10 @@ buildDunePackage { pname = "lwt_ppx"; - version = "2.0.2"; + version = "2.1.0"; + duneVersion = "3"; - useDune2 = true; - - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.04"; # `lwt_ppx` has a different release cycle than Lwt, but it's included in # one of its release bundles. @@ -18,8 +17,8 @@ buildDunePackage { src = fetchFromGitHub { owner = "ocsigen"; repo = "lwt"; - rev = "5.4.0"; - sha256 = "sha256-rRivROVbQbXkHWen1n8+9AwrRJaOK0Fhyilw29T7was="; + rev = "5.6.0"; + hash = "sha256-DLQupCkZ14kOuSQatbb7j07I+jvvDCKpdlaR3rijT4s="; }; propagatedBuildInputs = [ lwt ppxlib ]; diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index dc8e2312e751..02ef06044457 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -1,30 +1,26 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml +{ lib, fetchurl, buildDunePackage, ocaml, findlib , alcotest -, astring, cmdliner, cppo, fmt, logs, ocaml-version, odoc-parser, ocaml_lwt, re, result, csexp -, pandoc +, astring, cppo, fmt, logs, ocaml-version, odoc-parser, lwt, re, csexp , gitUpdater }: buildDunePackage rec { pname = "mdx"; - version = "2.1.0"; + version = "2.2.1"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; - src = fetchFromGitHub { - owner = "realworldocaml"; - repo = pname; - rev = version; - hash = "sha256-p7jmksltgfLFTSkPxMuJWJexLq2VvPWT/DJtDveOL/A="; + src = fetchurl { + url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; + hash = "sha256-8J7XM/5EYWBfApdzdIpjU9Ablb5l65hrzOF9bdr1Cdg="; }; nativeBuildInputs = [ cppo ]; - buildInputs = [ cmdliner ]; - propagatedBuildInputs = [ astring fmt logs result csexp ocaml-version odoc-parser re ]; - checkInputs = [ alcotest ocaml_lwt pandoc ]; + propagatedBuildInputs = [ astring fmt logs csexp ocaml-version odoc-parser re findlib ]; + checkInputs = [ alcotest lwt ]; - # Check fails with cmdliner ≥ 1.1 - doCheck = false; + doCheck = true; outputs = [ "bin" "lib" "out" ]; diff --git a/pkgs/development/ocaml-modules/mec/default.nix b/pkgs/development/ocaml-modules/mec/default.nix index 9811c502596d..ddb610f5570b 100644 --- a/pkgs/development/ocaml-modules/mec/default.nix +++ b/pkgs/development/ocaml-modules/mec/default.nix @@ -1,6 +1,7 @@ { lib, fetchzip, buildDunePackage, ocaml , zarith, eqaf, bigarray-compat, hex, ff-sig, ff -, alcotest, bisect_ppx }: +, alcotest, bisect_ppx +}: buildDunePackage rec { pname = "mec"; diff --git a/pkgs/development/ocaml-modules/merlin-extend/default.nix b/pkgs/development/ocaml-modules/merlin-extend/default.nix index b295c0eda0f7..a8ccd2cf4a01 100644 --- a/pkgs/development/ocaml-modules/merlin-extend/default.nix +++ b/pkgs/development/ocaml-modules/merlin-extend/default.nix @@ -11,8 +11,6 @@ buildDunePackage rec { sha256 = "0hvc4mz92x3rl2dxwrhvhzwl4gilnyvvwcqgr45vmdpyjyp3dwn2"; }; - strictDeps = true; - nativeBuildInputs = [ cppo ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/metrics/unix.nix b/pkgs/development/ocaml-modules/metrics/unix.nix index 2d1333f74a10..5df5e14982cc 100644 --- a/pkgs/development/ocaml-modules/metrics/unix.nix +++ b/pkgs/development/ocaml-modules/metrics/unix.nix @@ -6,8 +6,14 @@ buildDunePackage rec { inherit (metrics) version src; + # Fixes https://github.com/mirage/metrics/issues/57 + postPatch = '' + substituteInPlace src/unix/dune --replace "mtime mtime.clock" "mtime" + ''; + propagatedBuildInputs = [ gnuplot lwt metrics mtime uuidm ]; + nativeCheckInputs = [ gnuplot ]; checkInputs = [ metrics-lwt ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/mimic/default.nix b/pkgs/development/ocaml-modules/mimic/default.nix index 9aef505a0611..097ecb313534 100644 --- a/pkgs/development/ocaml-modules/mimic/default.nix +++ b/pkgs/development/ocaml-modules/mimic/default.nix @@ -5,13 +5,14 @@ buildDunePackage rec { pname = "mimic"; - version = "0.0.5"; + version = "0.0.6"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/dinosaure/mimic/releases/download/${version}/mimic-${version}.tbz"; - sha256 = "sha256-3qFjttVLgXKHOsr71550z7aVBcHPYzwdFeMpwHgWPa0="; + sha256 = "sha256-gVvBj4NqqKR2mn944g9F0bFZ8Me+WC87skti0dBW3Cg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/mimic/happy-eyeballs.nix b/pkgs/development/ocaml-modules/mimic/happy-eyeballs.nix index 72e3f99ddbe7..193509dd4903 100644 --- a/pkgs/development/ocaml-modules/mimic/happy-eyeballs.nix +++ b/pkgs/development/ocaml-modules/mimic/happy-eyeballs.nix @@ -6,6 +6,7 @@ buildDunePackage { inherit (mimic) src version; minimalOCamlVersion = "4.08"; + duneVersion = "3"; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix index 1a56ed70401a..0d0851536b38 100644 --- a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix +++ b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix @@ -1,5 +1,6 @@ { lib, fetchurl, buildDunePackage, cstruct-lwt, diet, logs -, mirage-block, ounit2, rresult, uri }: +, mirage-block, ounit2, rresult, uri +}: buildDunePackage rec { pname = "mirage-block-unix"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 5b67c9ac4340..d5f110948dc9 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -25,8 +25,6 @@ buildDunePackage rec { 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 098b587f3d59..3afe582413f5 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix @@ -26,7 +26,6 @@ buildDunePackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - ocaml dune-configurator ]; propagatedBuildInputs = [ @@ -37,7 +36,7 @@ buildDunePackage rec { ocaml-freestanding ]; - strictDeps = !doCheck; + strictDeps = true; doCheck = true; checkInputs = [ diff --git a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix index 0793bf5c4f39..b79f49c64bd4 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix @@ -10,8 +10,6 @@ buildDunePackage rec { propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng zarith eqaf sexplib0 ]; - strictDeps = !doCheck; - doCheck = true; checkInputs = [ ounit2 randomconv ]; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix index bf940c3eb70c..c3703a5a60ab 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix @@ -14,8 +14,6 @@ buildDunePackage rec { 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 8900dd611d89..044b8ed27b82 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix @@ -12,7 +12,7 @@ buildDunePackage rec { buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt ]; - strictDeps = !doCheck; + strictDeps = true; meta = mirage-crypto.meta // { description = "A cryptographically secure PRNG"; diff --git a/pkgs/development/ocaml-modules/mirage-flow/unix.nix b/pkgs/development/ocaml-modules/mirage-flow/unix.nix index 0bd3e42ad37a..023896447db1 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/unix.nix +++ b/pkgs/development/ocaml-modules/mirage-flow/unix.nix @@ -1,5 +1,6 @@ { buildDunePackage, fmt, logs, mirage-flow, ocaml_lwt, cstruct -, alcotest, mirage-flow-combinators }: +, alcotest, mirage-flow-combinators +}: buildDunePackage { pname = "mirage-flow-unix"; diff --git a/pkgs/development/ocaml-modules/mirage-nat/default.nix b/pkgs/development/ocaml-modules/mirage-nat/default.nix index 9d4bbc88c2c5..fea1e712abd2 100644 --- a/pkgs/development/ocaml-modules/mirage-nat/default.nix +++ b/pkgs/development/ocaml-modules/mirage-nat/default.nix @@ -1,38 +1,29 @@ { lib, buildDunePackage, fetchurl -, ipaddr, cstruct, lwt, logs, lru -, tcpip, ethernet, stdlib-shims +, ipaddr, cstruct, logs, lru +, tcpip, ethernet , alcotest, mirage-clock-unix -, ppxlib, ppx_deriving }: buildDunePackage rec { pname = "mirage-nat"; - version = "2.2.5"; + version = "3.0.1"; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; - # due to cstruct - useDune2 = true; + duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "01xp0z4mywhawz7rxizi9ph342mqqwyfa5hqgvs8lhqzcym5d104"; + url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + hash = "sha256-wReySOMulGkrPD60XxpgMrUoHzY9hQ7TZzYQyJ3eiik="; }; - buildInputs = [ - ppxlib - ]; - propagatedBuildInputs = [ ipaddr cstruct - lwt logs lru tcpip ethernet - stdlib-shims - ppx_deriving ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/mldoc/default.nix b/pkgs/development/ocaml-modules/mldoc/default.nix index ef40a07628a6..058261a78d3d 100644 --- a/pkgs/development/ocaml-modules/mldoc/default.nix +++ b/pkgs/development/ocaml-modules/mldoc/default.nix @@ -6,6 +6,7 @@ , cmdliner , core , core_bench +, core_unix , js_of_ocaml , js_of_ocaml-ppx , ppx_deriving_yojson @@ -28,21 +29,24 @@ let in buildDunePackage rec { pname = "mldoc"; - version = "1.4.9"; + version = "1.5.2"; minimalOCamlVersion = "4.10"; + duneVersion = "3"; + src = fetchFromGitHub { owner = "logseq"; repo = "mldoc"; rev = "v${version}"; - sha256 = "sha256-jKZ4ejskngXb03EnHBlqRKC5xeNHJ32n73y1zQP9CiM="; + hash = "sha256-FiBlgTTGL5TQkbhpkOCKtBgDDxDs4S88Ps+XAHcNsJ4="; }; buildInputs = [ cmdliner core core_bench + core_unix js_of_ocaml js_of_ocaml-ppx lwt diff --git a/pkgs/development/ocaml-modules/mrmime/default.nix b/pkgs/development/ocaml-modules/mrmime/default.nix index 50cd04ddb0a7..a2d118765616 100644 --- a/pkgs/development/ocaml-modules/mrmime/default.nix +++ b/pkgs/development/ocaml-modules/mrmime/default.nix @@ -6,6 +6,7 @@ , bigarray-overlap , bigstringaf , buildDunePackage +, cmdliner , emile , fetchzip , fmt @@ -16,6 +17,7 @@ , ke , lib , mirage-crypto-rng +, ocaml , pecu , prettym , ptime @@ -34,7 +36,9 @@ buildDunePackage rec { sha256 = "14k67v0b39b8jq3ny2ymi8g8sqx2gd81mlzsjphdzdqnlx6fk716"; }; - useDune2 = true; + duneVersion = "3"; + + buildInputs = [ cmdliner hxd ]; propagatedBuildInputs = [ angstrom @@ -60,10 +64,9 @@ buildDunePackage rec { checkInputs = [ alcotest - hxd jsonm ]; - doCheck = true; + doCheck = lib.versionOlder ocaml.version "5.0"; meta = { description = "Parser and generator of mail in OCaml"; diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index ace29633964b..3ca6e4ac973b 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -1,39 +1,25 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, js_of_ocaml -, jsooSupport ? lib.versionAtLeast ocaml.version "4.03" -}: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }: -with lib; +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "mtime is not available for OCaml ${ocaml.version}" -let param = - if versionAtLeast ocaml.version "4.03" - then { - version = "1.2.0"; - sha256 = "0zm1jvqkz3ghznfsm3bbv9q2zinp9grggdf7k9phjazjvny68xb8"; - } else { - version = "0.8.4"; - sha256 = "1adm8sc3lkjly99hyi5gqnxas748k7h62ljgn8x423nkn8gyp8dh"; - }; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-mtime"; - inherit (param) version; + version = "1.4.0"; src = fetchurl { - url = "https://erratique.ch/software/mtime/releases/mtime-${param.version}.tbz"; - inherit (param) sha256; + url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz"; + sha256 = "sha256-VQyYEk8+57Yq8SUuYossaQUHZKqemHDJtf4LK8qjxvc="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; - buildInputs = [ topkg ] ++ optional jsooSupport js_of_ocaml; + buildInputs = [ topkg ]; strictDeps = true; - buildPhase = "${topkg.buildPhase} --with-js_of_ocaml ${boolToString jsooSupport}"; + inherit (topkg) buildPhase installPhase; - inherit (topkg) installPhase; - - meta = { + meta = with lib; { description = "Monotonic wall-clock time for OCaml"; homepage = "https://erratique.ch/software/mtime"; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/multipart-form-data/default.nix b/pkgs/development/ocaml-modules/multipart-form-data/default.nix new file mode 100644 index 000000000000..4d44f3b97763 --- /dev/null +++ b/pkgs/development/ocaml-modules/multipart-form-data/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitHub, buildDunePackage +, lwt, lwt_ppx, stringext +, alcotest }: + +buildDunePackage rec { + pname = "multipart-form-data"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "cryptosense"; + repo = pname; + rev = version; + hash = "sha256-3MYJDvVbPIv/JDiB9nKcLRFC5Qa0afyEfz7hk8MWRII="; + }; + + buildInputs = [ lwt_ppx ]; + propagatedBuildInputs = [ lwt stringext ]; + + duneVersion = "3"; + + doCheck = true; + checkInputs = [ alcotest ]; + + meta = { + description = "Parser for multipart/form-data (RFC2388)"; + homepage = "https://github.com/cryptosense/multipart-form-data"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mustache/default.nix b/pkgs/development/ocaml-modules/mustache/default.nix index b16dfd484814..5d4b39b21aa8 100644 --- a/pkgs/development/ocaml-modules/mustache/default.nix +++ b/pkgs/development/ocaml-modules/mustache/default.nix @@ -11,7 +11,8 @@ buildDunePackage rec { sha256 = "19v8rk8d8lkfm2rmhdawfgadji6wa267ir5dprh4w9l1sfj8a1py"; }; - buildInputs = [ ezjsonm menhir ]; + nativeBuildInputs = [ menhir ]; + buildInputs = [ ezjsonm ]; propagatedBuildInputs = [ menhirLib ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/netchannel/default.nix b/pkgs/development/ocaml-modules/netchannel/default.nix index 61e5c70edd44..ce859d366b03 100644 --- a/pkgs/development/ocaml-modules/netchannel/default.nix +++ b/pkgs/development/ocaml-modules/netchannel/default.nix @@ -28,7 +28,7 @@ buildDunePackage rec { sha256 = "sha256-kYsAf6ntwWKUp26dMcp5BScdUOaGpM46050jVZe6gfs="; }; - nativeBuildInputs = [ + buildInputs = [ ppx_cstruct ]; diff --git a/pkgs/development/ocaml-modules/note/default.nix b/pkgs/development/ocaml-modules/note/default.nix new file mode 100644 index 000000000000..5bb0da7dd106 --- /dev/null +++ b/pkgs/development/ocaml-modules/note/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }: + +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "note is not available for OCaml ${ocaml.version}" + +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-note"; + version = "0.0.2"; + src = fetchurl { + url = "https://erratique.ch/software/note/releases/note-${version}.tbz"; + hash = "sha256-b35XcaDUXQLqwkNfsJKX5A1q1pAhw/mgdwyOdacZiiY="; + }; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; + inherit (topkg) buildPhase installPhase; + + meta = { + homepage = "https://erratique.ch/software/note"; + description = "An OCaml module for functional reactive programming"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/npy/default.nix b/pkgs/development/ocaml-modules/npy/default.nix index 5ba6cb08cc66..9375029f5f68 100644 --- a/pkgs/development/ocaml-modules/npy/default.nix +++ b/pkgs/development/ocaml-modules/npy/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { }; propagatedBuildInputs = [ camlzip ]; - checkInputs = [ numpy ]; + nativeCheckInputs = [ numpy ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index f0e70699ad88..2c2ffecf3dba 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { patches = [ ./META.patch ]; + strictDeps = true; + nativeBuildInputs = [ pkg-config unzip ocaml automake gnum4 autoconf findlib ]; buildInputs = [ freetype lablgtk cairo gdk-pixbuf gtk2 pango ]; diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix index 942d69e59194..3588495884f8 100644 --- a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { ./configurable-binding.patch ]; + strictDeps = true; + nativeBuildInputs = [ ocaml pkg-config diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix index 4466234fdbc2..e6a778194654 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix @@ -9,7 +9,7 @@ buildDunePackage { doCheck = true; checkInputs = [ ounit fileutils ]; - meta = (builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]) // { + meta = (builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]) // { description = "Internationalization library using camomile (i18n)"; }; diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index 481619ebd071..c65f50646974 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "19ynsldb21r539fiwz1f43apsdnx7hj2a2d9qr9wg2hva9y2qrwb"; }; - buildInputs = [ cppo ]; + nativeBuildInputs = [ cppo ]; propagatedBuildInputs = [ gettext fileutils ]; diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index c321ca2bcb47..67741516af19 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, libvirt, autoreconfHook, pkg-config, ocaml, findlib, perl }: +{ lib, stdenv, fetchFromGitLab, libvirt, AppKit, Foundation, autoreconfHook, pkg-config, ocaml, findlib, perl }: lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02") "libvirt is not available for OCaml ${ocaml.version}" @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ocaml ]; + buildInputs = lib.optionals stdenv.isDarwin [ + Foundation + AppKit + ]; + strictDeps = true; buildFlags = [ "all" "opt" "CPPFLAGS=-Wno-error" ]; diff --git a/pkgs/development/ocaml-modules/ocaml-r/default.nix b/pkgs/development/ocaml-modules/ocaml-r/default.nix index ed22177bfaac..8de5abf7e481 100644 --- a/pkgs/development/ocaml-modules/ocaml-r/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-r/default.nix @@ -1,34 +1,29 @@ -{ lib, fetchFromGitHub, buildDunePackage, pkg-config, dune-configurator, stdio, R +{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, pkg-config, dune-configurator, stdio, R , alcotest }: buildDunePackage rec { pname = "ocaml-r"; - version = "0.4.0"; + version = "0.6.0"; - useDune2 = true; + duneVersion = "3"; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "pveber"; repo = pname; rev = "v${version}"; - sha256 = "10is2s148kfh3g0pwniyzp5mh48k57ldvn8gm86469zvgxyij1ri"; + sha256 = "sha256-jPyVMxjeh9+xu0dD1gelAxcOhxouKczyvzVoKZ5oSrs="; }; - # Without the following patch, stub generation fails with: - # > Fatal error: exception (Failure "not supported: osVersion") - preConfigure = '' - substituteInPlace stubgen/stubgen.ml --replace \ - 'failwithf "not supported: %s" name ()' \ - 'sprintf "(* not supported: %s *)" name' - substituteInPlace lib/config/discover.ml --replace \ - ' libRmath"' '"' - ''; - - # This currently fails with dune - strictDeps = false; + # Finds R and Rmathlib separatley + patches = [ + (fetchpatch { + url = "https://github.com/pveber/ocaml-r/commit/aa96dc5.patch"; + sha256 = "sha256-xW33W2ciesyUkDKEH08yfOXv0wP0V6X80or2/n2Nrb4="; + }) + ]; nativeBuildInputs = [ pkg-config R ]; buildInputs = [ dune-configurator stdio R ]; @@ -37,8 +32,6 @@ buildDunePackage rec { checkInputs = [ alcotest ]; meta = { - # This has been broken by the update to R 4.2.0 (#171597) - broken = true; description = "OCaml bindings for the R interpreter"; inherit (src.meta) homepage; license = lib.licenses.gpl3; diff --git a/pkgs/development/ocaml-modules/ocaml-vdom/default.nix b/pkgs/development/ocaml-modules/ocaml-vdom/default.nix index 6ae36252aa08..72c1cb148c20 100644 --- a/pkgs/development/ocaml-modules/ocaml-vdom/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-vdom/default.nix @@ -11,6 +11,10 @@ buildDunePackage rec { sha256 = "sha256-FVR0WubW9VJBGVtVaXdJ+O/ghq0w5+BuItFWXkuVYL8="; }; + nativeBuildInputs = [ + gen_js_api + ]; + buildInputs = [ gen_js_api ]; diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix index aeb9c9dc699c..28f12046eaa3 100644 --- a/pkgs/development/ocaml-modules/ocaml-version/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage }: +{ lib, fetchurl, buildDunePackage, alcotest }: buildDunePackage rec { pname = "ocaml-version"; @@ -9,6 +9,10 @@ buildDunePackage rec { sha256 = "sha256-2MG+tejY67dxC19DTOZqPsi3UrHk1rqHxP4nRSvbiiU="; }; + checkInputs = [ alcotest ]; + + doCheck = true; + minimumOCamlVersion = "4.07"; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index 13ac62f64514..1efcbf382dbf 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -11,9 +11,6 @@ buildDunePackage rec { sha256 = "6nmPXZx38hBGlg+gV9nnlRpPfeSAqDj4zBPcjUNvTRo="; }; - # This currently fails with dune - strictDeps = false; - nativeBuildInputs = [ camlidl ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ camlidl fuse ]; diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix index 0be4e7806630..850c29c4dc02 100644 --- a/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ocaml findlib ]; - buildInputs = [ ounit]; + checkInputs = [ ounit ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 22cd84da1f86..c650155ff382 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -2,9 +2,8 @@ , gnutls, nettle }: -if lib.versionOlder ocaml.version "4.02" -then throw "ocamlnet is not available for OCaml ${ocaml.version}" -else +lib.throwIf (lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0") + "ocamlnet is not available for OCaml ${ocaml.version}" stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-ocamlnet"; diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 3482aa37e750..2a33d8b17ccc 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f"; }; + strictDeps = true; + nativeBuildInputs = [ pkg-config ocaml findlib ]; buildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl ]; diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix deleted file mode 100644 index 8db892f325e2..000000000000 --- a/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ buildDunePackage, ocplib-json-typed, js_of_ocaml }: - -buildDunePackage { - pname = "ocplib-json-typed-browser"; - inherit (ocplib-json-typed) version src; - useDune2 = true; - - propagatedBuildInputs = [ ocplib-json-typed js_of_ocaml ]; - - meta = { - description = "A Json_repr interface over JavaScript's objects"; - inherit (ocplib-json-typed.meta) homepage license maintainers; - }; -} - diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix deleted file mode 100644 index f95a25d25f2e..000000000000 --- a/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ buildDunePackage, ocplib-json-typed, ocplib-endian }: - -buildDunePackage { - pname = "ocplib-json-typed-bson"; - inherit (ocplib-json-typed) version useDune2 src; - - propagatedBuildInputs = [ ocplib-json-typed ocplib-endian ]; - - meta = { - description = "A Json_repr compatible implementation of the JSON compatible subset of BSON"; - inherit (ocplib-json-typed.meta) homepage license maintainers; - }; -} diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix deleted file mode 100644 index 75554d25bf28..000000000000 --- a/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildDunePackage, fetchFromGitHub, uri }: - -buildDunePackage rec { - pname = "ocplib-json-typed"; - version = "0.7.1"; - useDune2 = true; - src = fetchFromGitHub { - owner = "OCamlPro"; - repo = "ocplib-json-typed"; - rev = "v${version}"; - sha256 = "1gv0vqqy9lh7isaqg54b3lam2sh7nfjjazi6x7zn6bh5f77g1p5q"; - }; - - propagatedBuildInputs = [ uri ]; - - meta = { - description = "A collection of type-aware JSON utilities for OCaml"; - license = lib.licenses.lgpl21; - maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - }; -} diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix deleted file mode 100644 index 6ffeec983048..000000000000 --- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, ocaml -, findlib -, ocamlbuild -, oasis -, camlp4 -, num -}: - -if lib.versionOlder ocaml.version "4.03" -then throw "ocsigen-deriving is not available of OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-ocsigen-deriving"; - version = "0.8.2"; - - src = fetchFromGitHub { - owner = "ocsigen"; - repo = "deriving"; - rev = version; - sha256 = "sha256:09rp9mrr551na0nmclpxddlrkb6l2d7763xv14xfx467kff3z0wf"; - }; - - createFindlibDestdir = true; - - nativeBuildInputs = [ ocaml findlib ocamlbuild oasis camlp4 ]; - buildInputs = [ oasis camlp4 ocamlbuild num ]; - - strictDeps = true; - - meta = { - homepage = "https://github.com/ocsigen/deriving"; - description = "Extension to OCaml for deriving functions from type declarations"; - license = lib.licenses.mit; - inherit (ocaml.meta) platforms; - maintainers = with lib.maintainers; [ - gal_bolle - vbgl - ]; - }; - - -} diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 6097194d2756..f4225c917dbd 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitHub, which, ocaml, lwt_react, ssl, lwt_ssl +{ lib, buildDunePackage, fetchFromGitHub, which, ocaml, lwt_react, ssl, lwt_ssl, findlib , bigstringaf, lwt, cstruct, mirage-crypto, zarith, mirage-crypto-ec, ptime, mirage-crypto-rng, mtime, ca-certs , cohttp, cohttp-lwt-unix, hmap , lwt_log, ocaml_pcre, cryptokit, xml-light, ipaddr @@ -20,7 +20,7 @@ buildDunePackage rec { version = "5.0.1"; pname = "ocsigenserver"; - useDune2 = true; + duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchFromGitHub { @@ -31,7 +31,7 @@ buildDunePackage rec { }; nativeBuildInputs = [ makeWrapper which ]; - buildInputs = [ lwt_react camlzip ]; + buildInputs = [ lwt_react camlzip findlib ]; propagatedBuildInputs = [ cohttp cohttp-lwt-unix cryptokit hmap ipaddr lwt_log lwt_ssl ocaml_pcre xml-light diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 60a07d30d059..aaa68c214460 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ]; nativeBuildInputs = [ ocaml findlib opaline eliom ]; + # Remove widgets not compatible with jsoo 4.1.0 + # https://github.com/ocsigen/ocsigen-toolkit/issues/221 + preConfigure = '' + rm src/widgets/ot_{carousel,drawer,swipe,tongue}.eliom{,i} + ''; + strictDeps = true; installPhase = '' diff --git a/pkgs/development/ocaml-modules/ocsipersist/default.nix b/pkgs/development/ocaml-modules/ocsipersist/default.nix index 8006477dad96..447c4f11d7f9 100644 --- a/pkgs/development/ocaml-modules/ocsipersist/default.nix +++ b/pkgs/development/ocaml-modules/ocsipersist/default.nix @@ -5,7 +5,8 @@ buildDunePackage { pname = "ocsipersist"; - inherit (ocsipersist-lib) src version useDune2; + inherit (ocsipersist-lib) src version; + duneVersion = "3"; buildInputs = [ ocsipersist-pgsql diff --git a/pkgs/development/ocaml-modules/ocsipersist/lib.nix b/pkgs/development/ocaml-modules/ocsipersist/lib.nix index a2abc5d9b399..33b086880241 100644 --- a/pkgs/development/ocaml-modules/ocsipersist/lib.nix +++ b/pkgs/development/ocaml-modules/ocsipersist/lib.nix @@ -6,7 +6,7 @@ buildDunePackage rec { pname = "ocsipersist-lib"; version = "1.1.0"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "ocsigen"; diff --git a/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix b/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix index e93c8b479035..e2d95e7434ef 100644 --- a/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix +++ b/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix @@ -7,7 +7,8 @@ buildDunePackage { pname = "ocsipersist-pgsql"; - inherit (ocsipersist-lib) version src useDune2; + inherit (ocsipersist-lib) version src; + duneVersion = "3"; propagatedBuildInputs = [ lwt_log diff --git a/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix b/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix index 2cfa30bc908e..696863e9fd66 100644 --- a/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix +++ b/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix @@ -7,7 +7,8 @@ buildDunePackage { pname = "ocsipersist-sqlite"; - inherit (ocsipersist-lib) version src useDune2; + inherit (ocsipersist-lib) version src; + duneVersion = "3"; propagatedBuildInputs = [ lwt_log diff --git a/pkgs/development/ocaml-modules/odate/default.nix b/pkgs/development/ocaml-modules/odate/default.nix index 24d2c04c6ca6..a16fbc578d33 100644 --- a/pkgs/development/ocaml-modules/odate/default.nix +++ b/pkgs/development/ocaml-modules/odate/default.nix @@ -15,8 +15,6 @@ buildDunePackage rec { sha256 = "1dk33lr0g2jnia2gqsm6nnc7nf256qgkm3v30w477gm6y2ppfm3h"; }; - strictDeps = true; - nativeBuildInputs = [ menhir ]; # Ensure compatibility of v0.6 with menhir ≥ 20220210 diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix index 7bd875e475ec..924f643cc88d 100644 --- a/pkgs/development/ocaml-modules/odoc/default.nix +++ b/pkgs/development/ocaml-modules/odoc/default.nix @@ -16,9 +16,11 @@ buildDunePackage rec { # dune 3 is required for tests to pass duneVersion = if doCheck then "3" else "2"; - buildInputs = [ astring cmdliner cppo fpath result tyxml odoc-parser fmt ]; + nativeBuildInputs = [ cppo ]; + buildInputs = [ astring cmdliner fpath result tyxml odoc-parser fmt ]; - checkInputs = [ markup yojson sexplib0 jq ppx_expect bash ]; + nativeCheckInputs = [ bash jq ]; + checkInputs = [ markup yojson sexplib0 jq ppx_expect ]; doCheck = lib.versionAtLeast ocaml.version "4.08" && lib.versionOlder yojson.version "2.0"; diff --git a/pkgs/development/ocaml-modules/opium/default.nix b/pkgs/development/ocaml-modules/opium/default.nix index 5db3d1b4a241..b98d892696ec 100644 --- a/pkgs/development/ocaml-modules/opium/default.nix +++ b/pkgs/development/ocaml-modules/opium/default.nix @@ -1,32 +1,62 @@ { buildDunePackage - -, ppx_sexp_conv -, ppx_fields_conv - +, lib +, fetchurl +, astring +, base64 , cmdliner -, cohttp-lwt-unix +, fmt +, httpaf +, httpaf-lwt-unix , logs , magic-mime -, opium_kernel -, stringext - -, alcotest +, mirage-crypto +, mtime +, multipart-form-data +, ptime +, re +, rock +, tyxml +, uri +, yojson +, alcotest-lwt }: -buildDunePackage { +buildDunePackage rec { pname = "opium"; - inherit (opium_kernel) version src meta minimumOCamlVersion; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; - useDune2 = true; - - doCheck = true; - - buildInputs = [ - ppx_sexp_conv ppx_fields_conv - alcotest - ]; + inherit (rock) src version; propagatedBuildInputs = [ - opium_kernel cmdliner cohttp-lwt-unix magic-mime logs stringext + astring + base64 + cmdliner + fmt + httpaf + httpaf-lwt-unix + logs + magic-mime + mirage-crypto + mtime + multipart-form-data + ptime + re + rock + tyxml + uri + yojson ]; + + doCheck = true; + checkInputs = [ + alcotest-lwt + ]; + + meta = { + description = "OCaml web framework"; + homepage = "https://github.com/rgrinberg/opium"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pmahoney ]; + }; } diff --git a/pkgs/development/ocaml-modules/opium_kernel/default.nix b/pkgs/development/ocaml-modules/opium_kernel/default.nix deleted file mode 100644 index 6b51443df232..000000000000 --- a/pkgs/development/ocaml-modules/opium_kernel/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, buildDunePackage -, fetchurl - -, ppx_fields_conv -, ppx_sexp_conv - -, cohttp-lwt -, ezjsonm -, hmap -, sexplib -, fieldslib -}: - -buildDunePackage rec { - pname = "opium_kernel"; - version = "0.18.0"; - - useDune2 = true; - - minimumOCamlVersion = "4.04.1"; - - src = fetchurl { - url = "https://github.com/rgrinberg/opium/releases/download/${version}/opium-${version}.tbz"; - sha256 = "0a2y9gw55psqhqli3a5ps9mfdab8r46fnbj882r2sp366sfcy37q"; - }; - - doCheck = true; - - buildInputs = [ - ppx_sexp_conv ppx_fields_conv - ]; - - propagatedBuildInputs = [ - hmap cohttp-lwt ezjsonm sexplib fieldslib - ]; - - meta = { - description = "Sinatra like web toolkit for OCaml based on cohttp & lwt"; - homepage = "https://github.com/rgrinberg/opium"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.pmahoney ]; - }; -} diff --git a/pkgs/development/ocaml-modules/optint/default.nix b/pkgs/development/ocaml-modules/optint/default.nix index 06729bb8799e..d98f6cf5ee2f 100644 --- a/pkgs/development/ocaml-modules/optint/default.nix +++ b/pkgs/development/ocaml-modules/optint/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { minimalOCamlVersion = "4.07"; - version = "0.2.0"; + version = "0.3.0"; pname = "optint"; src = fetchurl { url = "https://github.com/mirage/optint/releases/download/v${version}/optint-${version}.tbz"; - sha256 = "sha256-HcvgtrYDH3fbMwKMhxOP2zv5D5KRXjtmKd3rMKDTAAs="; + sha256 = "sha256-KVz/LBNLA4WxO6gdUAXZ+EG6QNSlAq7RDJl/I57xFHs="; }; meta = { diff --git a/pkgs/development/ocaml-modules/opus/default.nix b/pkgs/development/ocaml-modules/opus/default.nix index ecaf2090ca0f..104846b87f6e 100644 --- a/pkgs/development/ocaml-modules/opus/default.nix +++ b/pkgs/development/ocaml-modules/opus/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "opus"; version = "0.2.2"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-opus"; rev = "v${version}"; - sha256 = "sha256-Ghfqw/J1oLbTJpYJaiB5M79jaA6DACvyxBVE+NjnPkg="; + hash = "sha256-Ghfqw/J1oLbTJpYJaiB5M79jaA6DACvyxBVE+NjnPkg="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/ocaml-modules/oseq/default.nix b/pkgs/development/ocaml-modules/oseq/default.nix new file mode 100644 index 000000000000..cbe02de2ef11 --- /dev/null +++ b/pkgs/development/ocaml-modules/oseq/default.nix @@ -0,0 +1,33 @@ +{ lib, fetchFromGitHub, buildDunePackage +, seq +, containers, qcheck +}: + +buildDunePackage rec { + version = "0.4"; + pname = "oseq"; + + src = fetchFromGitHub { + owner = "c-cube"; + repo = pname; + rev = "v${version}"; + hash = "sha256-FoCBvvPwa/dUCrgDEd0clEKAO7EcpedjaO4v+yUO874="; + }; + + propagatedBuildInputs = [ seq ]; + + duneVersion = "3"; + + doCheck = true; + checkInputs = [ + containers + qcheck + ]; + + meta = { + homepage = "https://c-cube.github.io/oseq/"; + description = "Purely functional iterators compatible with standard `seq`"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index 96ef1037cf69..c7b9d930bd6f 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -1,26 +1,25 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf, result }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }: let pname = "otfm"; - version = "0.3.0"; + version = "0.4.0"; webpage = "https://erratique.ch/software/${pname}"; in -assert lib.versionAtLeast ocaml.version "4.01.0"; - stdenv.mkDerivation { - name = "ocaml-${pname}-${version}"; + pname = "ocaml${ocaml.version}-${pname}"; + inherit version; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "054s82539k3kc9na6s47g3scsl04icjahpas7pv5351jmsgqcq3k"; + hash = "sha256-02U23mYTy0ZJgSObDoyygPTGEMC4/Zge5bux4wshaEE="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ topkg ]; - propagatedBuildInputs = [ uutf result ]; + propagatedBuildInputs = [ uutf ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/otoml/default.nix b/pkgs/development/ocaml-modules/otoml/default.nix index 3f06a098d0e1..4a2e605f4cef 100644 --- a/pkgs/development/ocaml-modules/otoml/default.nix +++ b/pkgs/development/ocaml-modules/otoml/default.nix @@ -19,8 +19,6 @@ buildDunePackage rec { sha256 = "sha256-Xd3fHBN1f+tvgRFCxD/Gz8/lIvezknz7Zy3EtdqoTEM="; }; - strictDeps = true; - nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ menhirLib uutf ]; diff --git a/pkgs/development/ocaml-modules/ounit2/default.nix b/pkgs/development/ocaml-modules/ounit2/default.nix index f1358760696e..7872edca5922 100644 --- a/pkgs/development/ocaml-modules/ounit2/default.nix +++ b/pkgs/development/ocaml-modules/ounit2/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { propagatedBuildInputs = [ seq stdlib-shims ]; doCheck = true; - checkInputs = lib.optional (lib.versionOlder ocaml.version "4.07") ncurses; + nativeCheckInputs = lib.optional (lib.versionOlder ocaml.version "4.07") ncurses; meta = with lib; { homepage = "https://github.com/gildor478/ounit"; diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix index 980efd3bf5c6..6e77b6312fa4 100644 --- a/pkgs/development/ocaml-modules/owl/default.nix +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -19,8 +19,11 @@ buildDunePackage rec { checkInputs = [ alcotest ]; buildInputs = [ dune-configurator stdio ]; propagatedBuildInputs = [ - eigen openblasCompat owl-base npy + eigen + openblasCompat + owl-base + npy ]; - doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462 + doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462 } diff --git a/pkgs/development/ocaml-modules/paf/cohttp.nix b/pkgs/development/ocaml-modules/paf/cohttp.nix index fe0505fe7ea6..2f2891493061 100644 --- a/pkgs/development/ocaml-modules/paf/cohttp.nix +++ b/pkgs/development/ocaml-modules/paf/cohttp.nix @@ -22,7 +22,9 @@ buildDunePackage { inherit (paf) version src - ; + ; + + duneVersion = "3"; propagatedBuildInputs = [ paf @@ -45,6 +47,8 @@ buildDunePackage { astring ]; + __darwinAllowLocalNetworking = true; + meta = paf.meta // { description = "A CoHTTP client with its HTTP/AF implementation"; }; diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix index 59f17d28d3bc..e75efeb2ade7 100644 --- a/pkgs/development/ocaml-modules/paf/default.nix +++ b/pkgs/development/ocaml-modules/paf/default.nix @@ -25,14 +25,15 @@ buildDunePackage rec { pname = "paf"; - version = "0.2.0"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz"; - sha256 = "sha256-TzhRxFTPkLMAsLPl0ONC8DRhJRGstF58+QRKbGuJZVE="; + sha256 = "sha256-+RkrmWJJREHg8BBdNe92vYhd2/Frvs7l5qOr9jBwymU="; }; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ mirage-stack @@ -60,6 +61,8 @@ buildDunePackage rec { alcotest-lwt ]; + __darwinAllowLocalNetworking = true; + meta = { description = "HTTP/AF and MirageOS"; license = lib.licenses.mit; diff --git a/pkgs/development/ocaml-modules/paf/le.nix b/pkgs/development/ocaml-modules/paf/le.nix index 5c07eba3aab0..28345a6cdc56 100644 --- a/pkgs/development/ocaml-modules/paf/le.nix +++ b/pkgs/development/ocaml-modules/paf/le.nix @@ -19,6 +19,8 @@ buildDunePackage { src ; + duneVersion = "3"; + propagatedBuildInputs = [ paf duration diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/pkgs/development/ocaml-modules/parany/default.nix index 4f072391deb0..f5af16167955 100644 --- a/pkgs/development/ocaml-modules/parany/default.nix +++ b/pkgs/development/ocaml-modules/parany/default.nix @@ -1,20 +1,32 @@ -{ lib, buildDunePackage, fetchFromGitHub, ocamlnet, cpu }: +{ lib, buildDunePackage, fetchFromGitHub, ocaml, cpu, domainslib }: + +let params = + if lib.versionAtLeast ocaml.version "5.00" then { + version = "13.0.1"; + hash = "sha256-OYa0uLsDyzjmXZgWcYUxLhqco4Kp/icfDamNe3En5JQ="; + propagatedBuildInputs = [ domainslib ]; + } else { + version = "12.2.2"; + hash = "sha256-woZ4XJqqoRr/7mDurXYvTbSUUcLBEylzVYBQp1BAOqc="; + propagatedBuildInputs = [ cpu ]; + } +; in buildDunePackage rec { pname = "parany"; - version = "12.1.2"; + inherit (params) version; - useDune2 = true; - minimumOCamlVersion = "4.03.0"; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "UnixJunkie"; repo = pname; rev = "v${version}"; - sha256 = "yOeJzb2Wr6jA4efI9/fuqDCl/Tza3zxT3YjAiJmhHHg="; + inherit (params) hash; }; - propagatedBuildInputs = [ ocamlnet cpu ]; + inherit (params) propagatedBuildInputs; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/pbkdf/default.nix b/pkgs/development/ocaml-modules/pbkdf/default.nix index e9cd39827b93..d6b9bdb7e758 100644 --- a/pkgs/development/ocaml-modules/pbkdf/default.nix +++ b/pkgs/development/ocaml-modules/pbkdf/default.nix @@ -10,12 +10,14 @@ buildDunePackage rec { pname = "pbkdf"; version = "1.2.0"; + duneVersion = "3"; + src = fetchzip { url = "https://github.com/abeaumont/ocaml-pbkdf/archive/${version}.tar.gz"; sha256 = "sha256-dGi4Vw+7VBpK/NpJ6zdpogm+E6G/oJovXCksJBSmqjI="; }; - minimalOCamlVersion = "4.07"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ cstruct mirage-crypto ]; checkInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/pcap-format/default.nix b/pkgs/development/ocaml-modules/pcap-format/default.nix index ae093cc7817e..ffd183787793 100644 --- a/pkgs/development/ocaml-modules/pcap-format/default.nix +++ b/pkgs/development/ocaml-modules/pcap-format/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { sha256 = "14c5rpgglyz41jic0fg0xa22d2w1syb86kva22y9fi7aqj9vm31f"; }; - nativeBuildInputs = [ + buildInputs = [ ppx_tools ppx_cstruct ]; diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index 1cf9651e6ecc..e67429a6a45f 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -27,8 +27,9 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; - checkInputs = [ alcotest bppsuite ]; - buildInputs = [ menhir ]; + nativeCheckInputs = [ bppsuite ]; + checkInputs = [ alcotest ]; + nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ angstrom-unix biocaml @@ -40,6 +41,11 @@ buildDunePackage rec { printbox-text ]; + checkPhase = '' + runHook preCheck + dune build @app/fulltest + runHook postCheck + ''; doCheck = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/piaf/default.nix b/pkgs/development/ocaml-modules/piaf/default.nix index 0d0ec1594d40..cf2dd146ccab 100644 --- a/pkgs/development/ocaml-modules/piaf/default.nix +++ b/pkgs/development/ocaml-modules/piaf/default.nix @@ -1,7 +1,8 @@ { alcotest-lwt , buildDunePackage +, ocaml , dune-site -, fetchzip +, fetchurl , gluten-lwt-unix , lib , logs @@ -14,13 +15,18 @@ , uri }: +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "piaf is not available for OCaml ${ocaml.version}" + buildDunePackage rec { pname = "piaf"; version = "0.1.0"; - src = fetchzip { + duneVersion = "3"; + + src = fetchurl { url = "https://github.com/anmonteiro/piaf/releases/download/${version}/piaf-${version}.tbz"; - sha256 = "0d431kz3bkwlgdamvsv94mzd9631ppcjpv516ii91glzlfdzh5hz"; + hash = "sha256-AMO+ptGox33Bi7u/H0SaeCU88XORrRU3UbLof3EwcmU="; }; postPatch = '' @@ -36,7 +42,7 @@ buildDunePackage rec { gluten-lwt-unix ]; - checkInputs = [ + nativeCheckInputs = [ alcotest-lwt dune-site ]; diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 09f2bd351837..39ae5a86c598 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ocaml findlib ]; buildInputs = [ piqi stdlib-shims ]; - checkInputs = [ num ]; + checkInputs = [ num ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix index ec8231285827..b52c73d0534e 100644 --- a/pkgs/development/ocaml-modules/piqi/default.nix +++ b/pkgs/development/ocaml-modules/piqi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { strictDeps = true; - patches = [ ./no-ocamlpath-override.patch ]; + patches = [ ./no-stream.patch ./no-ocamlpath-override.patch ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/piqi/no-stream.patch b/pkgs/development/ocaml-modules/piqi/no-stream.patch new file mode 100644 index 000000000000..fde1c46cce42 --- /dev/null +++ b/pkgs/development/ocaml-modules/piqi/no-stream.patch @@ -0,0 +1,14 @@ +--- ./piqilib/piq_lexer.ml ++++ ./piqilib/piq_lexer.ml +@@ -476,11 +476,6 @@ let init_from_string s = + make_buf lexbuf + + +-let init_from_stream s = +- let lexbuf = Sedlexing.Utf8.from_stream s in +- make_buf lexbuf +- +- + let init_from_channel ch = + let lexbuf = Sedlexing.Utf8.from_channel ch in + make_buf lexbuf diff --git a/pkgs/development/ocaml-modules/plotkicadsch/default.nix b/pkgs/development/ocaml-modules/plotkicadsch/default.nix index e08fcdfeb2f3..27b3a0ac5ee7 100644 --- a/pkgs/development/ocaml-modules/plotkicadsch/default.nix +++ b/pkgs/development/ocaml-modules/plotkicadsch/default.nix @@ -17,6 +17,7 @@ buildDunePackage rec { pname = "plotkicadsch"; + duneVersion = "3"; inherit (kicadsch) src version; diff --git a/pkgs/development/ocaml-modules/postgresql/default.nix b/pkgs/development/ocaml-modules/postgresql/default.nix index a63876ec5bb1..d87f6b39efb8 100644 --- a/pkgs/development/ocaml-modules/postgresql/default.nix +++ b/pkgs/development/ocaml-modules/postgresql/default.nix @@ -15,7 +15,8 @@ buildDunePackage rec { sha256 = "1i4pnh2v00i0s7s9pcwz1x6s4xcd77d08gjjkvy0fmda6mqq6ghn"; }; - buildInputs = [ dune-configurator postgresql ]; + nativeBuildInputs = [ postgresql ]; + buildInputs = [ dune-configurator ]; meta = { description = "Bindings to the PostgreSQL library"; diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix index c58004b9adca..88f187cc706a 100644 --- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix +++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix @@ -42,8 +42,6 @@ buildDunePackage rec { 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 fbe484dea044..e1c31c3ec28e 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -1,6 +1,7 @@ { lib , fetchurl , buildDunePackage +, ocaml , cppo , ppxlib , ppx_derivers @@ -38,8 +39,7 @@ buildDunePackage rec { inherit (params) sha256; }; - # This currently fails with dune - strictDeps = false; + strictDeps = true; nativeBuildInputs = [ cppo ]; buildInputs = [ ppxlib ]; @@ -51,7 +51,7 @@ buildDunePackage rec { result ]; - doCheck = true; + doCheck = lib.versionOlder ocaml.version "5.0"; checkInputs = [ (if lib.versionAtLeast version "5.2" then ounit2 else ounit) ]; diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix index 3a59b217e8f2..120ce1893b27 100644 --- a/pkgs/development/ocaml-modules/ppx_import/default.nix +++ b/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -25,8 +25,6 @@ buildDunePackage rec { pname = "ppx_import"; inherit version; - useDune2 = true; - minimalOCamlVersion = "4.05"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index cc525d1d1e95..2d5f73be42b8 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -34,6 +34,7 @@ let param = "4.12" = v6_6; "4.13" = v6_6; "4.14" = v6_6; + "5.0" = v6_6; }.${ocaml.meta.branch}; in @@ -56,8 +57,7 @@ then buildDunePackage { inherit pname src meta; inherit (param) version buildInputs nativeBuildInputs; - - strictDeps = true; + duneVersion = "3"; } else stdenv.mkDerivation { diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index 92090c244142..bc683033eaca 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml +{ lib, fetchurl, buildDunePackage, ocaml , version ? if lib.versionAtLeast ocaml.version "4.07" then if lib.versionAtLeast ocaml.version "4.08" @@ -10,45 +10,49 @@ let param = { "0.8.1" = { - sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6"; + sha256 = "sha256-pct57oO7qAMEtlvEfymFOCvviWaLG0b5/7NzTC8vdSE="; max_version = "4.10"; useDune2 = false; useOMP2 = false; }; "0.13.0" = { - sha256 = "0c54g22pm6lhfh3f7s5wbah8y48lr5lj3cqsbvgi99bly1b5vqvl"; + sha256 = "sha256-geHz0whQDg5/YQjVsN2iuHlkClwh7z3Eqb2QOBzuOdk="; + max_version = "4.11"; useDune2 = false; useOMP2 = false; }; "0.15.0" = { - sha256 = "1p037kqj5858xrhh0dps6vbf4fnijla6z9fjz5zigvnqp4i2xkrn"; + sha256 = "sha256-C2MNf410qJmlXMJxiLXOA+c1qT8H6gwt5WUy2P2TszA="; min_version = "4.07"; max_version = "4.12"; useOMP2 = false; }; "0.18.0" = { - sha256 = "1ciy6va2gjrpjs02kha83pzh0x1gkmfsfsdgabbs1v14a8qgfibm"; + sha256 = "sha256-nUg8NkZ64GHHDfcWbtFGXq3MNEKu+nYPtcVDm/gEfcM="; min_version = "4.07"; max_version = "4.12"; }; "0.22.0" = { - sha256 = "0kf7lgcwygf6zlx7rwddqpqvasa6v7xiq0bqal8vxlib6lpg074q"; + sha256 = "sha256-PuuR4DlmZiKEoyIuYS3uf0+it2N8U9lXLSp0E0u5bXo="; min_version = "4.07"; + max_version = "4.13"; }; "0.22.2" = { - sha256 = "0fysjqcpv281n52wl3h0dy2lzf9d61wdzk90ldv3p63a4i3mr1j2"; + sha256 = "sha256-0Oih69xiILFXTXqSbwCEYMURjM73m/mgzgJC80z/Ilo="; min_version = "4.07"; + max_version = "4.14"; }; "0.23.0" = { - sha256 = "0jg5v4pssbl66hn5davpin1i57a0r3r54l96vpz5y99xk5w70xi1"; + sha256 = "sha256-G1g2wYa51aFqz0falPOWj08ItRm3cpzYao/TmXH+EuU="; min_version = "4.07"; + max_version = "4.14"; }; "0.24.0" = { - sha256 = "sha256-wuG7cUZiVP2PdM+nZloip7lGGiWn6Wpkh2YoF/Fuc9o="; + sha256 = "sha256-d2YCfC7ND1s7Rg6SEqcHCcZ0QngRPrkfMXxWxB56kMg="; min_version = "4.07"; }; "0.28.0" = { - sha256 = "sha256-i/U++sosKQUjyxu9GscPb1Gfv2a3Hbmj+UgIZlewnCo="; + sha256 = "sha256-2Hrl+aCBIGMIypZICbUKZq646D0lSAHouWdUSLYM83c="; min_version = "4.07"; }; }."${version}"; in @@ -62,12 +66,10 @@ buildDunePackage rec { pname = "ppxlib"; inherit version; - useDune2 = param.useDune2 or true; + duneVersion = if param.useDune2 or true then "2" else "1"; - src = fetchFromGitHub { - owner = "ocaml-ppx"; - repo = pname; - rev = version; + src = fetchurl { + url = "https://github.com/ocaml-ppx/ppxlib/releases/download/${version}/ppxlib-${version}.tbz"; inherit (param) sha256; }; @@ -85,6 +87,6 @@ buildDunePackage rec { description = "Comprehensive ppx tool set"; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + homepage = "https://github.com/ocaml-ppx/ppxlib"; }; } diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix index 8dd4bbedd4ba..13fad457e2ae 100644 --- a/pkgs/development/ocaml-modules/printbox/default.nix +++ b/pkgs/development/ocaml-modules/printbox/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { sha256 = "sha256-7u2ThRhM3vW4ItcFsK4ycgcaW0JcQOFoZZRq2kqbl+k="; }; - checkInputs = [ mdx.bin ]; + nativeCheckInputs = [ mdx.bin ]; # mdx is not available for OCaml < 4.08 doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/pkgs/development/ocaml-modules/printbox/text.nix b/pkgs/development/ocaml-modules/printbox/text.nix index cc0aa5691de7..43e7e18566ad 100644 --- a/pkgs/development/ocaml-modules/printbox/text.nix +++ b/pkgs/development/ocaml-modules/printbox/text.nix @@ -6,7 +6,7 @@ buildDunePackage { propagatedBuildInputs = [ printbox uucp uutf ]; - checkInputs = [ mdx.bin ]; + nativeCheckInputs = [ mdx.bin ]; meta = printbox.meta // { description = "Text renderer for printbox, using unicode edges"; diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix index 41e13f21a412..ef88bdcdab7b 100644 --- a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix +++ b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix @@ -8,14 +8,10 @@ buildDunePackage rec { owner = "ACoquereau"; repo = pname; rev = version; - sha256 = "sha256-cYY9x7QZjH7pdJyHMqfMXgHZ3/zJLp/6ntY6OSIo6Vs="; + hash = "sha256-cYY9x7QZjH7pdJyHMqfMXgHZ3/zJLp/6ntY6OSIo6Vs="; }; - useDune2 = true; - - minimumOCamlVersion = "4.03"; - - strictDeps = true; + minimalOCamlVersion = "4.03"; nativeBuildInputs = [ menhir ]; diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index 169cf4ce16f5..ee12abd3e3b1 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -1,26 +1,24 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, js_of_ocaml -, jsooSupport ? true +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }: -stdenv.mkDerivation rec { - version = "0.8.6"; - pname = "ocaml${ocaml.version}-ptime"; +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "ptime is not available for OCaml ${ocaml.version}" - minimalOCamlVersion = "4.03"; +stdenv.mkDerivation rec { + version = "1.0.0"; + pname = "ocaml${ocaml.version}-ptime"; src = fetchurl { url = "https://erratique.ch/software/ptime/releases/ptime-${version}.tbz"; - sha256 = "sha256-gy/fUsfUHUZx1A/2sQMQIFMHl1V+QO3zHAsEnZT/lkI="; + sha256 = "sha256-RByDjAFiyDdR8G663/MxabuSHTTuwVn7urtw7Z3iEQs="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; - buildInputs = [ topkg ] ++ lib.optional jsooSupport js_of_ocaml; + buildInputs = [ topkg ]; strictDeps = true; - buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport}"; - - inherit (topkg) installPhase; + inherit (topkg) buildPhase installPhase; meta = { homepage = "https://erratique.ch/software/ptime"; diff --git a/pkgs/development/ocaml-modules/ptmap/default.nix b/pkgs/development/ocaml-modules/ptmap/default.nix index a3c0eb55f968..edc9e1c6dcbd 100644 --- a/pkgs/development/ocaml-modules/ptmap/default.nix +++ b/pkgs/development/ocaml-modules/ptmap/default.nix @@ -14,8 +14,6 @@ buildDunePackage rec { sha256 = "1apk61fc1y1g7x3m3c91fnskvxp6i0vk5nxwvipj56k7x2pzilgb"; }; - strictDeps = true; - buildInputs = [ stdlib-shims ]; propagatedBuildInputs = [ seq ]; diff --git a/pkgs/development/ocaml-modules/pyml/default.nix b/pkgs/development/ocaml-modules/pyml/default.nix index 97fcf1d5caa4..8358be50032a 100644 --- a/pkgs/development/ocaml-modules/pyml/default.nix +++ b/pkgs/development/ocaml-modules/pyml/default.nix @@ -1,23 +1,41 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib, utop, python3, stdcompat, ncurses }: +{ buildDunePackage +, lib +, fetchFromGitHub +, fetchpatch +, utop +, python3 +, stdcompat +}: -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "pyml"; - version = "20220615"; + version = "20220905"; src = fetchFromGitHub { - owner = "thierry-martinez"; - repo = pname; - rev = version; - sha256 = "sha256-my/xn9vrYTcHyjXGBNamgqpBz2/6bTyQHuE9ViVGLjw="; + owner = "thierry-martinez"; + repo = "pyml"; + rev = version; + sha256 = "PL4tFIKQLRutSn9Sf84/ImJv0DqkstNnJaNBqWDTKDQ="; }; - nativeBuildInputs = [ - ocaml - findlib + patches = [ + # Fixes test crash. + # https://github.com/thierry-martinez/pyml/issues/85 + (fetchpatch { + url = "https://github.com/thierry-martinez/pyml/commit/a0bc5aca8632bea273f869d622cad2f55e754a7c.patch"; + sha256 = "bOqAokm5DE5rlvkBMQZtwMppRmoK9cvjJeGeP6BusnE="; + excludes = [ + "CHANGES.md" + ]; + }) + (fetchpatch { + url = "https://github.com/thierry-martinez/pyml/commit/97407473800b3f6215190643c1e6b9bd25d5caeb.patch"; + hash = "sha256-7CrVuV4JT7fyi/ktWz4nNOG/BbqsQVCoJwCAhE2y4YU="; + }) ]; + buildInputs = [ utop - ncurses ]; propagatedBuildInputs = [ @@ -25,24 +43,17 @@ stdenv.mkDerivation rec { stdcompat ]; + nativeCheckInputs = [ + python3.pkgs.numpy python3.pkgs.ipython + ]; + strictDeps = true; - buildPhase = '' - make all pymltop pymlutop PREFIX=$out - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mkdir -p $OCAMLFIND_DESTDIR/stublibs - make install PREFIX=$out - runHook postInstall - ''; - doCheck = true; meta = { description = "OCaml bindings for Python"; + homepage = "https://github.com/thierry-martinez/pyml"; license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index 9be32d28bab9..49b1357f5491 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -1,34 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, react, opaline }: +{ lib, fetchFromGitHub, buildDunePackage, react }: -if lib.versionOlder ocaml.version "4.04" -then throw "reactiveData is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-reactiveData"; - version = "0.2.2"; +buildDunePackage rec { + pname = "reactiveData"; + version = "0.3"; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "ocsigen"; repo = "reactiveData"; rev = version; - sha256 = "sha256-YLkacIbjxZQ/ThgSxjTqviBYih6eW2GX5H7iybQDv1A="; + sha256 = "sha256-imUphE1vMe3bYqHhgTuGT+B7uLn75acX6fAwBLh1tz4="; }; - 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"; - meta = with lib; { description = "An OCaml module for functional reactive programming (FRP) based on React"; homepage = "https://github.com/ocsigen/reactiveData"; license = licenses.lgpl21; - platforms = ocaml.meta.platforms or [ ]; maintainers = with maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/refmterr.nix b/pkgs/development/ocaml-modules/reason-native/refmterr.nix index b4d6708467f0..3e517591b9e6 100644 --- a/pkgs/development/ocaml-modules/reason-native/refmterr.nix +++ b/pkgs/development/ocaml-modules/reason-native/refmterr.nix @@ -4,6 +4,7 @@ pname = "refmterr"; nativeBuildInputs = [ + atdgen reason ]; diff --git a/pkgs/development/ocaml-modules/resto/acl.nix b/pkgs/development/ocaml-modules/resto/acl.nix index 0eed996289da..92a1b751ed5d 100644 --- a/pkgs/development/ocaml-modules/resto/acl.nix +++ b/pkgs/development/ocaml-modules/resto/acl.nix @@ -5,6 +5,7 @@ buildDunePackage { inherit (resto) src version meta doCheck; minimalOCamlVersion = "4.10"; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-client.nix index dd0db02cdd57..fe6dd6b506e1 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-client.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-client.nix @@ -9,6 +9,7 @@ buildDunePackage { pname = "resto-cohttp-client"; inherit (resto) src version meta doCheck; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix index c01fb1db9053..fac4ce7422ac 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix @@ -13,6 +13,7 @@ buildDunePackage { pname = "resto-cohttp-self-serving-client"; inherit (resto) src version meta doCheck; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp-server.nix b/pkgs/development/ocaml-modules/resto/cohttp-server.nix index 29e18aa88b16..6347b8628b39 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-server.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-server.nix @@ -12,6 +12,7 @@ buildDunePackage { pname = "resto-cohttp-server"; inherit (resto) src version meta doCheck; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp.nix b/pkgs/development/ocaml-modules/resto/cohttp.nix index 4de70b1dfef6..f495cadbf48f 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp.nix @@ -3,6 +3,7 @@ buildDunePackage { pname = "resto-cohttp"; inherit (resto) src version meta doCheck; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/default.nix b/pkgs/development/ocaml-modules/resto/default.nix index 03795e5e1cf2..0d67ca947751 100644 --- a/pkgs/development/ocaml-modules/resto/default.nix +++ b/pkgs/development/ocaml-modules/resto/default.nix @@ -3,6 +3,7 @@ buildDunePackage rec { pname = "resto"; version = "1.0"; + duneVersion = "3"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "resto"; diff --git a/pkgs/development/ocaml-modules/resto/directory.nix b/pkgs/development/ocaml-modules/resto/directory.nix index 555ec590ffd7..efbb7cb608e7 100644 --- a/pkgs/development/ocaml-modules/resto/directory.nix +++ b/pkgs/development/ocaml-modules/resto/directory.nix @@ -3,6 +3,7 @@ buildDunePackage { pname = "resto-directory"; inherit (resto) src version meta doCheck; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/json.nix b/pkgs/development/ocaml-modules/resto/json.nix index dbb81fd35a62..c0f9b00d6ad7 100644 --- a/pkgs/development/ocaml-modules/resto/json.nix +++ b/pkgs/development/ocaml-modules/resto/json.nix @@ -3,6 +3,7 @@ buildDunePackage { pname = "resto-json"; inherit (resto) src version meta doCheck; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/rock/default.nix b/pkgs/development/ocaml-modules/rock/default.nix new file mode 100644 index 000000000000..ae484e937b83 --- /dev/null +++ b/pkgs/development/ocaml-modules/rock/default.nix @@ -0,0 +1,35 @@ +{ lib, fetchurl, buildDunePackage +, bigstringaf +, hmap +, httpaf +, lwt +, sexplib0 +}: + +buildDunePackage rec { + pname = "rock"; + version = "0.20.0"; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; + + src = fetchurl { + url = "https://github.com/rgrinberg/opium/releases/download/${version}/opium-${version}.tbz"; + hash = "sha256-MmuRhm3pC69TX4t9Sy/yPjnZUuVzwEs8E/EFS1n/L7Y="; + }; + + propagatedBuildInputs = [ + bigstringaf + hmap + httpaf + lwt + sexplib0 + ]; + + meta = { + description = "Minimalist framework to build extensible HTTP servers and clients"; + homepage = "https://github.com/rgrinberg/opium"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/rpclib/lwt.nix b/pkgs/development/ocaml-modules/rpclib/lwt.nix index 49f718474980..1f97d7ff52d2 100644 --- a/pkgs/development/ocaml-modules/rpclib/lwt.nix +++ b/pkgs/development/ocaml-modules/rpclib/lwt.nix @@ -1,6 +1,10 @@ -{ lib, buildDunePackage, rpclib +{ lib +, buildDunePackage +, rpclib , lwt -, alcotest-lwt, ppx_deriving_rpc, yojson +, alcotest-lwt +, ppx_deriving_rpc +, yojson }: buildDunePackage { diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix index cdc3a1dba68a..3184e460a9ac 100644 --- a/pkgs/development/ocaml-modules/rresult/default.nix +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-rresult"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz"; - sha256 = "1k69a3gvrk7f2cshwjzvk7818f0bwxhacgd14wxy6d4gmrggci86"; + sha256 = "sha256-Eap/W4NGDmBDHjFU4+MsBx1G4VHqV2DPJDd4Bb+XVUA="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index 78d28270035a..a5d042fc1907 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -2,12 +2,11 @@ let pname = "sawja"; - version = "1.5.11"; + version = "1.5.12"; in -if lib.versionOlder ocaml.version "4.07" -then throw "${pname} is not available for OCaml ${ocaml.version}" -else +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "${pname} is not available for OCaml ${ocaml.version}" stdenv.mkDerivation { @@ -19,7 +18,7 @@ stdenv.mkDerivation { owner = "javalib-team"; repo = pname; rev = version; - sha256 = "sha256-1aKkRZDuLJLmDhUC1FXnn4QrgXaTyAbnXfTOAdnKgs8="; + hash = "sha256-G1W8/G0TEcldnFnH/NAb9a6ZSGGP2fWTM47lI8bBHnw="; }; nativeBuildInputs = [ which ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/secp256k1/default.nix b/pkgs/development/ocaml-modules/secp256k1/default.nix index 7ad18fba81c6..00233beefd94 100644 --- a/pkgs/development/ocaml-modules/secp256k1/default.nix +++ b/pkgs/development/ocaml-modules/secp256k1/default.nix @@ -2,15 +2,13 @@ buildDunePackage rec { pname = "secp256k1"; - version = "0.4.1"; - - useDune2 = true; + version = "0.4.4"; src = fetchFromGitHub { owner = "dakk"; repo = "secp256k1-ml"; rev = version; - sha256 = "0jkd7mc5kynhg0b76dfk70pww97qsq2jbd991634i16xf8qja9fj"; + hash = "sha256-22+dZb3MC1W5Qvsz3+IHV1/XiGCRmJHTH+6IW2QX2hU="; }; buildInputs = [ base stdio dune-configurator secp256k1 ]; diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index a6a7604208ab..cfe1938bf55b 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -10,8 +10,8 @@ let param = if lib.versionAtLeast ppxlib.version "0.26.0" then { - version = "2.6"; - sha256 = "sha256-AU+dV+jTG9v3BXzip2Bnv04Ewyo3pyUglDDBFsOsFf0="; + version = "3.0"; + sha256 = "sha256-+4ggynMznVfjviMBjXil8CXdMByq4kSmDz6P2PyEETA="; } else { version = "2.5"; sha256 = "sha256:062a5dvrzvb81l3a9phljrhxfw9nlb61q341q0a6xn65hll3z2wy"; diff --git a/pkgs/development/ocaml-modules/sha/default.nix b/pkgs/development/ocaml-modules/sha/default.nix index 4cbb658b6549..4d400d32844a 100644 --- a/pkgs/development/ocaml-modules/sha/default.nix +++ b/pkgs/development/ocaml-modules/sha/default.nix @@ -1,25 +1,22 @@ -{ lib, fetchurl, buildDunePackage, stdlib-shims, dune-configurator, ounit }: +{ lib, fetchurl, buildDunePackage, stdlib-shims, ounit2 }: buildDunePackage rec { pname = "sha"; - version = "1.15.1"; + version = "1.15.2"; + duneVersion = "3"; src = fetchurl { - url = "https://github.com/djs55/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "sha256-cRtjydvwgXgimi6F3C48j7LrWgfMO6m9UJKjKlxvp0Q="; + url = "https://github.com/djs55/ocaml-${pname}/releases/download/${version}/${pname}-${version}.tbz"; + hash = "sha256-P71Xs5p8QAaOtBrh7MuhQJOL6144BqTLvXlZOyGD/7c="; }; - useDune2 = true; - - buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ stdlib-shims ]; doCheck = true; checkInputs = [ - ounit + ounit2 ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix index baeda2d1b152..0b4974f910c9 100644 --- a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix +++ b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { sha256 = "sha256-KW8grij/OAnFkdUdRRZF21X39DvqayzkTWeRKwF8uoU="; }; - nativeBuildInputs = [ + buildInputs = [ ppx_cstruct ]; diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 90b469288c7f..f20a6cff0a89 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "sqlite3"; - version = "5.0.2"; + version = "5.1.0"; useDune2 = true; minimumOCamlVersion = "4.05"; src = fetchurl { url = "https://github.com/mmottl/sqlite3-ocaml/releases/download/${version}/sqlite3-${version}.tbz"; - sha256 = "0sba74n0jvzxibrclhbpqscil36yfw7i9jj9q562yhza6rax9p82"; + sha256 = "sha256-uw23EWkajfok/insTstpEkRK2Q4PTER6+Jgx5tHf/qU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 4159cee607ff..7eca606f93fc 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -10,13 +10,13 @@ buildDunePackage rec { pname = "ssl"; - version = "0.5.12"; + version = "0.5.13"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ssl"; rev = version; - sha256 = "sha256-cQUJ7t7C9R74lDy1/lt+up4E5CogiPbeZpaDveDzJ7c="; + sha256 = "sha256-Ws7QZOvZVy0QixMiBFJZEOnYzYlCWrZ1d95gOp/a5a0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/ocaml-modules/stdcompat/default.nix b/pkgs/development/ocaml-modules/stdcompat/default.nix index 3630be368e55..33e93967e192 100644 --- a/pkgs/development/ocaml-modules/stdcompat/default.nix +++ b/pkgs/development/ocaml-modules/stdcompat/default.nix @@ -1,29 +1,23 @@ -{ stdenv, lib, fetchurl -, ocaml, findlib +{ buildDunePackage +, lib +, fetchurl }: -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-stdcompat"; - version = "18"; +buildDunePackage rec { + pname = "stdcompat"; + version = "19"; src = fetchurl { url = "https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"; - sha256 = "sha256:01y67rndjlzfp5zq0gbqpg9skqq2hfbvhbq9lfhhk5xidr98sfj8"; + sha256 = "sha256-DKQGd4nnIN6SPls6hcA/2Jvc7ivYNpeMU6rYsVc1ClU="; }; - nativeBuildInputs = [ ocaml findlib ]; - - strictDeps = true; - - # build fails otherwise - enableParallelBuilding = false; - - configureFlags = [ "--libdir=$(OCAMLFIND_DESTDIR)" ]; + # Otherwise ./configure script will run and create files conflicting with dune. + dontConfigure = true; meta = { homepage = "https://github.com/thierry-martinez/stdcompat"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/tar/default.nix b/pkgs/development/ocaml-modules/tar/default.nix index 52054958d3a0..031bd4d5b141 100644 --- a/pkgs/development/ocaml-modules/tar/default.nix +++ b/pkgs/development/ocaml-modules/tar/default.nix @@ -1,40 +1,38 @@ { lib -, fetchFromGitHub +, fetchurl , buildDunePackage , camlp-streams , ppx_cstruct , cstruct -, re -, ppx_tools +, decompress }: buildDunePackage rec { pname = "tar"; - version = "2.0.1"; - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-tar"; - rev = "v${version}"; - sha256 = "1zr1ak164k1jm15xwqjf1iv77kdrrahak33wrxg7lifz9nnl0dms"; + version = "2.2.2"; + src = fetchurl { + url = "https://github.com/mirage/ocaml-tar/releases/download/v${version}/tar-${version}.tbz"; + hash = "sha256-Q+41LPFZFHi9sXKFV3F13FZZNO3KXRSElEmr+nH58Uw="; }; - useDune2 = true; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ camlp-streams - ppx_cstruct cstruct - re + decompress ]; buildInputs = [ - ppx_tools + ppx_cstruct ]; doCheck = true; meta = { - description = "Decode and encode tar format files from Unix"; + description = "Decode and encode tar format files in pure OCaml"; + homepage = "https://github.com/mirage/ocaml-tar"; license = lib.licenses.mit; maintainers = [ lib.maintainers.ulrikstrid ]; }; diff --git a/pkgs/development/ocaml-modules/tar/unix.nix b/pkgs/development/ocaml-modules/tar/unix.nix index 4ac1f625a02a..9426a6aaf10f 100644 --- a/pkgs/development/ocaml-modules/tar/unix.nix +++ b/pkgs/development/ocaml-modules/tar/unix.nix @@ -1,27 +1,22 @@ { lib , buildDunePackage , tar -, cstruct , cstruct-lwt -, re , lwt }: buildDunePackage rec { pname = "tar-unix"; - inherit (tar) version src useDune2 doCheck; + inherit (tar) version src doCheck; + duneVersion = "3"; propagatedBuildInputs = [ tar - cstruct cstruct-lwt - re lwt ]; - meta = { + meta = tar.meta // { description = "Decode and encode tar format files from Unix"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.ulrikstrid ]; }; } diff --git a/pkgs/development/ocaml-modules/tcpip/default.nix b/pkgs/development/ocaml-modules/tcpip/default.nix index 696ffe517e01..0cd57ba9c8ff 100644 --- a/pkgs/development/ocaml-modules/tcpip/default.nix +++ b/pkgs/development/ocaml-modules/tcpip/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { pname = "tcpip"; version = "7.1.2"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; @@ -23,12 +23,12 @@ buildDunePackage rec { }; nativeBuildInputs = [ - bisect_ppx - ppx_cstruct pkg-config ]; propagatedBuildInputs = [ + bisect_ppx + ppx_cstruct rresult cstruct cstruct-lwt diff --git a/pkgs/development/ocaml-modules/telegraml/default.nix b/pkgs/development/ocaml-modules/telegraml/default.nix index 9fed705ce3ee..1aca2da2974c 100644 --- a/pkgs/development/ocaml-modules/telegraml/default.nix +++ b/pkgs/development/ocaml-modules/telegraml/default.nix @@ -10,6 +10,7 @@ buildDunePackage rec { pname = "telegraml"; version = "unstable-2021-06-17"; + duneVersion = "3"; src = fetchFromGitHub { owner = "nv-vn"; diff --git a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix index 9723127a1de8..47f9253e4473 100644 --- a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix +++ b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix @@ -1,14 +1,14 @@ -{ - lib, - fetchFromGitLab, - buildDunePackage, - bls12-381, - data-encoding, - bigstringaf, - alcotest, - alcotest-lwt, - bisect_ppx, - qcheck-alcotest, +{ lib +, fetchFromGitLab +, buildDunePackage +, bls12-381 +, data-encoding +, bigstringaf +, alcotest +, alcotest-lwt +, bisect_ppx +, qcheck-alcotest +, }: buildDunePackage rec { @@ -22,9 +22,9 @@ buildDunePackage rec { sha256 = "sha256-H1Wog3GItTIVsawr9JkyyKq+uGqbTQPTR1dacpmxLbs="; }; - propagatedBuildInputs = [bls12-381 data-encoding bigstringaf]; + propagatedBuildInputs = [ bls12-381 data-encoding bigstringaf ]; - checkInputs = [alcotest alcotest-lwt bisect_ppx qcheck-alcotest]; + checkInputs = [ alcotest alcotest-lwt bisect_ppx qcheck-alcotest ]; doCheck = false; # circular dependencies @@ -32,6 +32,6 @@ buildDunePackage rec { description = "Polynomials over BLS12-381 finite field"; license = lib.licenses.mit; homepage = "https://gitlab.com/nomadic-labs/privacy-team"; - maintainers = [lib.maintainers.ulrikstrid]; + maintainers = [ lib.maintainers.ulrikstrid ]; }; } diff --git a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix index 7eba7fd255de..f9b78e11d332 100644 --- a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix +++ b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix @@ -1,14 +1,14 @@ -{ - lib, - buildDunePackage, - hacl-star, - bls12-381, - tezos-bls12-381-polynomial, - data-encoding, - tezos-plompiler, - alcotest, - qcheck-alcotest, - bisect_ppx, +{ lib +, buildDunePackage +, hacl-star +, bls12-381 +, tezos-bls12-381-polynomial +, data-encoding +, tezos-plompiler +, alcotest +, qcheck-alcotest +, bisect_ppx +, }: buildDunePackage rec { diff --git a/pkgs/development/ocaml-modules/theora/default.nix b/pkgs/development/ocaml-modules/theora/default.nix index 0f7b4aca1c79..6849056d2ded 100644 --- a/pkgs/development/ocaml-modules/theora/default.nix +++ b/pkgs/development/ocaml-modules/theora/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "theora"; version = "0.4.0"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-theora"; rev = "v${version}"; - sha256 = "1sggjmlrx4idkih1ddfk98cgpasq60haj4ykyqbfs22cmii5gpal"; + hash = "sha256-VN1XYqxMCO0W9tMTqSAwWKv7GErTtRZgnC2SnmmV7+k="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/tls/async.nix b/pkgs/development/ocaml-modules/tls/async.nix index 51d1b89f9188..002af344db9c 100644 --- a/pkgs/development/ocaml-modules/tls/async.nix +++ b/pkgs/development/ocaml-modules/tls/async.nix @@ -6,6 +6,7 @@ buildDunePackage rec { inherit (tls) src meta version; minimalOCamlVersion = "4.11"; + duneVersion = "3"; doCheck = true; diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 3f45aa919667..b68edba2728e 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -6,15 +6,15 @@ buildDunePackage rec { pname = "tls"; - version = "0.15.3"; + version = "0.15.4"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-${version}.tbz"; - sha256 = "0nj6fhgrirn8ky4hb24m3ilhr41ynzgk6bqmjs17g8rdibwmdd2x"; + sha256 = "sha256-X40dVrBvYGnv0dCj3gxFy0iNPRPrfxMshOx7o/DRw4I="; }; - minimumOCamlVersion = "4.08"; - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ cstruct diff --git a/pkgs/development/ocaml-modules/tls/mirage.nix b/pkgs/development/ocaml-modules/tls/mirage.nix index a0428536b813..667dd9b57c98 100644 --- a/pkgs/development/ocaml-modules/tls/mirage.nix +++ b/pkgs/development/ocaml-modules/tls/mirage.nix @@ -4,7 +4,8 @@ buildDunePackage { pname = "tls-mirage"; - inherit (tls) src version minimumOCamlVersion useDune2; + inherit (tls) src version; + duneVersion = "3"; propagatedBuildInputs = [ fmt diff --git a/pkgs/development/ocaml-modules/toml/default.nix b/pkgs/development/ocaml-modules/toml/default.nix index 41c52985cf99..baab042b1bf4 100644 --- a/pkgs/development/ocaml-modules/toml/default.nix +++ b/pkgs/development/ocaml-modules/toml/default.nix @@ -1,22 +1,18 @@ -{ lib, fetchFromGitHub, fetchpatch, buildDunePackage +{ lib, fetchFromGitHub, buildDunePackage , iso8601, menhir }: buildDunePackage rec { pname = "toml"; - version = "7.0.0"; + version = "7.1.0"; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchFromGitHub { owner = "ocaml-toml"; repo = "to.ml"; rev = version; - sha256 = "sha256-VEZQTFPwAGShCBGbKUiNOIY1zA/JdTpXU0ZIGNWopnQ="; - }; - - # Ensure compatibility with menhir ≥ 20211215 - patches = fetchpatch { - url = "https://github.com/ocaml-toml/To.ml/commit/41172b739dff43424a12f7c1f0f64939e3660648.patch"; - sha256 = "sha256:1333xkmm9qp5m3pp4y5w17k6rvmb30v62qyra6rfk1km2v28hqqq"; + hash = "sha256-uk14Py7lEEDJhFsRRtStXqKlJLtx0o8eS9DEIes4SHw="; }; nativeBuildInputs = [ menhir ]; diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index 10104228c839..a62cd9152ae6 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -9,7 +9,10 @@ build system is required, the attribute `run` can be used. let param = - if lib.versionAtLeast ocaml.version "4.03" then { + if lib.versionAtLeast ocaml.version "4.05" then { + version = "1.0.5"; + sha256 = "sha256-RSCCYm5lGsSxYzwrSuTK16vrH7ahMEbmmfle7Fi10cc="; + } else if lib.versionAtLeast ocaml.version "4.03" then { version = "1.0.3"; sha256 = "0b77gsz9bqby8v77kfi4lans47x9p2lmzanzwins5r29maphb8y6"; } else { diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 1b248dd18603..354a8ca2098a 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkg-config, ocb-stubblr }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkg-config +, AudioToolbox, Cocoa, CoreAudio, CoreVideo, ForceFeedback }: if lib.versionOlder ocaml.version "4.03" then throw "tsdl is not available for OCaml ${ocaml.version}" @@ -6,7 +7,7 @@ else let pname = "tsdl"; - version = "0.9.8"; + version = "0.9.9"; webpage = "https://erratique.ch/software/${pname}"; in @@ -15,12 +16,15 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "sha256-zjXz2++42FHmbE0nIDeryNQeX+avGwh9rwAs8O0pZYU="; + sha256 = "sha256-GqFz+bYG2ESkAEJyP8DKud4JFfU5MGLulzJa5Z4sptQ="; }; + strictDeps = true; + nativeBuildInputs = [ pkg-config ocaml findlib ocamlbuild topkg ]; buildInputs = [ topkg ]; - propagatedBuildInputs = [ SDL2 ctypes ]; + propagatedBuildInputs = [ SDL2 ctypes ] + ++ lib.optionals stdenv.isDarwin [ AudioToolbox Cocoa CoreAudio CoreVideo ForceFeedback ]; preConfigure = '' # The following is done to avoid an additional dependency (ncurses) diff --git a/pkgs/development/ocaml-modules/uecc/default.nix b/pkgs/development/ocaml-modules/uecc/default.nix index 5e24f955b17d..efb86d862476 100644 --- a/pkgs/development/ocaml-modules/uecc/default.nix +++ b/pkgs/development/ocaml-modules/uecc/default.nix @@ -2,17 +2,15 @@ buildDunePackage rec { pname = "uecc"; - version = "0.3"; + version = "0.4"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "ocaml-uecc"; rev = "v${version}"; - sha256 = "0m3cw34254baajscrwlrj0jp5n0yad3dhgi4jh3pz89iqykj15fr"; + hash = "sha256-o/DylUx+olRRloiCU6b1t/xOmW8A5IZB2n3U7fkMo80="; }; - useDune2 = true; - propagatedBuildInputs = [ bigstring ]; diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 0ead92d9c54b..bece082f6418 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-/GZbkJVDQu1UY8SliK282kUWAVMfOnpQadUlRT/tJrM="; }; + strictDeps = true; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; configurePlatforms = []; buildInputs = [ topkg cmdliner ]; diff --git a/pkgs/development/ocaml-modules/uuuu/default.nix b/pkgs/development/ocaml-modules/uuuu/default.nix index 59dd7d568967..4473cd8217c0 100644 --- a/pkgs/development/ocaml-modules/uuuu/default.nix +++ b/pkgs/development/ocaml-modules/uuuu/default.nix @@ -25,9 +25,7 @@ buildDunePackage rec { buildInputs = [ angstrom ]; - strictDeps = !doCheck; - - checkInputs = [ re ]; + nativeCheckInputs = [ re ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/vchan/default.nix b/pkgs/development/ocaml-modules/vchan/default.nix index e88a86344285..872d11606ff6 100644 --- a/pkgs/development/ocaml-modules/vchan/default.nix +++ b/pkgs/development/ocaml-modules/vchan/default.nix @@ -15,11 +15,8 @@ buildDunePackage rec { sha256 = "sha256-5E7dITMVirYoxUkp8ZamRAolyhA6avXGJNAioxeBuV0="; }; - nativeBuildInputs = [ - ppx_cstruct - ]; - propagatedBuildInputs = [ + ppx_cstruct ppx_sexp_conv lwt cstruct diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index 94ebc1b8d817..410e356be797 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -5,8 +5,6 @@ htmlcBackend ? true # depends on js_of_ocaml }: -with lib; - let inherit (lib) optionals versionOlder; @@ -38,14 +36,14 @@ stdenv.mkDerivation { strictDeps = true; buildPhase = topkg.buildPhase - + " --with-uutf ${boolToString pdfBackend}" - + " --with-otfm ${boolToString pdfBackend}" - + " --with-js_of_ocaml ${boolToString htmlcBackend}" + + " --with-uutf ${lib.boolToString pdfBackend}" + + " --with-otfm ${lib.boolToString pdfBackend}" + + " --with-js_of_ocaml ${lib.boolToString htmlcBackend}" + " --with-cairo2 false"; inherit (topkg) installPhase; - meta = { + meta = with lib; { description = "Declarative 2D vector graphics for OCaml"; longDescription = '' Vg is an OCaml module for declarative 2D vector graphics. In Vg, images diff --git a/pkgs/development/ocaml-modules/vorbis/default.nix b/pkgs/development/ocaml-modules/vorbis/default.nix index f33182e5fc19..5bfb230e6c7c 100644 --- a/pkgs/development/ocaml-modules/vorbis/default.nix +++ b/pkgs/development/ocaml-modules/vorbis/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "vorbis"; version = "0.8.0"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-vorbis"; rev = "v${version}"; - sha256 = "1acy7yvf2y5dggzxw4vmrpdipakr98si3pw5kxw0mh7livn08al8"; + hash = "sha256-iCoE7I70wAp4n4XfETVKeaob2811E97/e6144bY/nqk="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/webmachine/default.nix b/pkgs/development/ocaml-modules/webmachine/default.nix index c7ad92efe768..9f8749cac9fd 100644 --- a/pkgs/development/ocaml-modules/webmachine/default.nix +++ b/pkgs/development/ocaml-modules/webmachine/default.nix @@ -6,9 +6,9 @@ buildDunePackage rec { pname = "webmachine"; version = "0.7.0"; - useDune2 = true; + duneVersion = "3"; - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.03"; src = fetchFromGitHub { owner = "inhabitedtype"; @@ -24,7 +24,7 @@ buildDunePackage rec { doCheck = true; meta = { - inherit (src.meta) homepage; + homepage = "https://github.com/inhabitedtype/ocaml-webmachine"; license = lib.licenses.bsd3; description = "A REST toolkit for OCaml"; maintainers = [ lib.maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/wodan/default.nix b/pkgs/development/ocaml-modules/wodan/default.nix deleted file mode 100644 index f33d7b9861f6..000000000000 --- a/pkgs/development/ocaml-modules/wodan/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, buildDunePackage, fetchFromGitHub, lwt_ppx, ppx_cstruct, optint -, checkseum, diet, bitv, logs, lru, io-page, mirage-block }: - -buildDunePackage rec { - pname = "wodan"; - version = "unstable-2020-11-20"; - - useDune2 = true; - - src = fetchFromGitHub { - owner = "mirage"; - repo = pname; - rev = "cc08fe25888051c207f1009bcd2d39f8c514484f"; - sha256 = "0186vlhnl8wcz2hmpn327n9a0bibnypmjy3w4nxq3yyglh6vj1im"; - fetchSubmodules = true; - }; - - minimumOCamlVersion = "4.08"; - - propagatedBuildInputs = [ - lwt_ppx - ppx_cstruct - optint - checkseum - diet - bitv - /* nocrypto */ - logs - lru - io-page - mirage-block - ]; - - meta = with lib; { - broken = true; # nocrypto is no longer available in nixpkgs - inherit (src.meta) homepage; - description = "A flash-friendly, safe and flexible filesystem library"; - license = licenses.isc; - maintainers = with maintainers; [ ehmry ]; - }; -} diff --git a/pkgs/development/ocaml-modules/wodan/irmin.nix b/pkgs/development/ocaml-modules/wodan/irmin.nix deleted file mode 100644 index 6389b47b6179..000000000000 --- a/pkgs/development/ocaml-modules/wodan/irmin.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildDunePackage, irmin-chunk, irmin-git -, mirage-block-ramdisk, mirage-block-unix, wodan }: - -buildDunePackage rec { - pname = "wodan-irmin"; - inherit (wodan) version src useDune2; - - propagatedBuildInputs = [ - /* io-page-unix */ # No longer available in nixpkgs - irmin-chunk - irmin-git - mirage-block-ramdisk - mirage-block-unix - wodan - ]; - - meta = wodan.meta // { - # wodan is currently incompatible with irmin 2.3.0. - # additionally upgrading to current master (unclear - # if the issue is fixed there) is not possible as it - # depends on a custom fork of mirage-block - broken = true; - description = "Wodan as an Irmin store"; - }; -} diff --git a/pkgs/development/ocaml-modules/wodan/unix.nix b/pkgs/development/ocaml-modules/wodan/unix.nix deleted file mode 100644 index bd694bce801b..000000000000 --- a/pkgs/development/ocaml-modules/wodan/unix.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildDunePackage, base64, benchmark, csv, cmdliner, wodan, afl-persistent -, mirage-block-ramdisk, mirage-block-unix }: - -buildDunePackage rec { - outputs = [ "bin" "out" ]; - pname = "wodan-unix"; - inherit (wodan) version src useDune2; - - propagatedBuildInputs = [ - afl-persistent - base64 - benchmark - cmdliner - csv - /* io-page-unix */ - mirage-block-ramdisk - mirage-block-unix - wodan - ]; - - postInstall = '' - moveToOutput bin "''${!outputBin}" - ''; - - meta = wodan.meta // { - broken = true; # io-page-unix is no longer available - description = "Wodan clients with Unix integration"; - mainProgram = "wodanc"; - }; - -} diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index cea9d79333b4..bd7a7a0fa47c 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -10,9 +10,11 @@ buildDunePackage rec { pname = "x509"; version = "0.16.2"; + duneVersion = "3"; + src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-${version}.tbz"; - sha256 = "sha256-Zf/ZZjUAkeWe04XLmqMKgbxN/qe/Z1mpKM82veXVf2I="; + hash = "sha256-Zf/ZZjUAkeWe04XLmqMKgbxN/qe/Z1mpKM82veXVf2I="; }; checkInputs = [ alcotest cstruct-unix ]; diff --git a/pkgs/development/ocaml-modules/xenstore-tool/default.nix b/pkgs/development/ocaml-modules/xenstore-tool/default.nix index 34f32e4f117c..4b6c0d89a82a 100644 --- a/pkgs/development/ocaml-modules/xenstore-tool/default.nix +++ b/pkgs/development/ocaml-modules/xenstore-tool/default.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "xenstore-tool"; - inherit (xenstore_transport) src version useDune2 minimumOCamlVersion; + inherit (xenstore_transport) src version; buildInputs = [ xenstore_transport xenstore lwt ]; diff --git a/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix index 189920290e37..a3f4e0abcdef 100644 --- a/pkgs/development/ocaml-modules/xenstore/default.nix +++ b/pkgs/development/ocaml-modules/xenstore/default.nix @@ -1,25 +1,23 @@ { lib, buildDunePackage, fetchurl -, cstruct, ppx_cstruct, lwt, ounit, stdlib-shims +, cstruct, ppx_cstruct, lwt, ounit2 }: buildDunePackage rec { pname = "xenstore"; - version = "2.1.1"; + version = "2.2.0"; - minimumOCamlVersion = "4.04"; - - useDune2 = true; + minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/ocaml-xenstore/releases/download/${version}/xenstore-${version}.tbz"; - sha256 = "283814ea21adc345c4d59cfcb17b2f7c1185004ecaecc3871557c961874c84f5"; + url = "https://github.com/mirage/ocaml-xenstore/releases/download/v${version}/xenstore-${version}.tbz"; + hash = "sha256-1Mnqtt5zHeRdYJHvhdQNjN8d4yxUEKD2cpwtoc7DGC0="; }; - nativeBuildInputs = [ ppx_cstruct ]; - propagatedBuildInputs = [ stdlib-shims cstruct lwt ]; + buildInputs = [ ppx_cstruct ]; + propagatedBuildInputs = [ cstruct lwt ]; doCheck = true; - checkInputs = [ ounit ]; + checkInputs = [ ounit2 ]; meta = with lib; { description = "Xenstore protocol in pure OCaml"; diff --git a/pkgs/development/ocaml-modules/xenstore_transport/default.nix b/pkgs/development/ocaml-modules/xenstore_transport/default.nix index 1981f2d5cabb..a7fb853f3bec 100644 --- a/pkgs/development/ocaml-modules/xenstore_transport/default.nix +++ b/pkgs/development/ocaml-modules/xenstore_transport/default.nix @@ -4,8 +4,7 @@ buildDunePackage rec { pname = "xenstore_transport"; version = "1.3.0"; - minimumOCamlVersion = "4.04"; - useDune2 = true; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "xapi-project"; diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix index 010d7f8e1dbf..f91eb0b5b5cd 100644 --- a/pkgs/development/ocaml-modules/xml-light/default.nix +++ b/pkgs/development/ocaml-modules/xml-light/default.nix @@ -1,5 +1,8 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, gitUpdater }: +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "xml-light is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-xml-light"; version = "2.4"; diff --git a/pkgs/development/ocaml-modules/yaml/default.nix b/pkgs/development/ocaml-modules/yaml/default.nix index 62c8a565c870..61a5a326395d 100644 --- a/pkgs/development/ocaml-modules/yaml/default.nix +++ b/pkgs/development/ocaml-modules/yaml/default.nix @@ -19,7 +19,8 @@ buildDunePackage rec { propagatedBuildInputs = [ bos ctypes ]; doCheck = true; - checkInputs = [ fmt logs mdx.bin alcotest crowbar junit_alcotest ezjsonm ]; + nativeCheckInputs = [ mdx.bin ]; + checkInputs = [ fmt logs alcotest crowbar junit_alcotest ezjsonm ]; meta = { description = "Parse and generate YAML 1.1 files"; diff --git a/pkgs/development/ocaml-modules/yuscii/default.nix b/pkgs/development/ocaml-modules/yuscii/default.nix index 02de0220fc13..c0582fa2a224 100644 --- a/pkgs/development/ocaml-modules/yuscii/default.nix +++ b/pkgs/development/ocaml-modules/yuscii/default.nix @@ -19,10 +19,10 @@ buildDunePackage rec { sha256 = "0idywlkw0fbakrxv65swnr5bj7f2vns9kpay7q03gzlv82p670hy"; }; - useDune2 = true; - - checkInputs = [ + nativeCheckInputs = [ gcc + ]; + checkInputs = [ alcotest fmt uutf diff --git a/pkgs/development/octave-modules/image/default.nix b/pkgs/development/octave-modules/image/default.nix index 8bff55fadc64..78fcedfbd360 100644 --- a/pkgs/development/octave-modules/image/default.nix +++ b/pkgs/development/octave-modules/image/default.nix @@ -5,11 +5,11 @@ buildOctavePackage rec { pname = "image"; - version = "2.12.0"; + version = "2.14.0"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "1d3kqhbkq9acc29k42fcilfmykk9a0r321mvk46l5iibc7nqrmg7"; + sha256 = "sha256-dRXqIRqMuO9dnTurhaNunfVHXosFqRmgeODVJ0YHcTM="; }; meta = with lib; { diff --git a/pkgs/development/octave-modules/vibes/default.nix b/pkgs/development/octave-modules/vibes/default.nix index f60a5d7339a0..4d05a2c6893f 100644 --- a/pkgs/development/octave-modules/vibes/default.nix +++ b/pkgs/development/octave-modules/vibes/default.nix @@ -29,7 +29,7 @@ buildOctavePackage rec { VIBes API that enables your program to communicate with the viewer in order to draw figures. This package integrates the VIBes API into Octave. The VIBes application is required for operation and must be installed - seperately. Data types from third-party interval arithmetic libraries for + separately. Data types from third-party interval arithmetic libraries for Octave are also supported. ''; # Marked this way until KarlJoad gets around to packaging the vibes program. diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 9b42401fc4dc..110094ad8a49 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl" diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index 2d1c550d3168..3dca6550ad68 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -24,6 +24,8 @@ # 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" +, env ? {} + , ... }@attrs: @@ -43,10 +45,11 @@ lib.throwIf (attrs ? name) "buildPerlPackage: `name` (\"${attrs.name}\") is depr buildInputs = buildInputs ++ [ perl ]; nativeBuildInputs = nativeBuildInputs ++ [ (perl.mini or perl) ]; - fullperl = buildPerl; - inherit outputs src doCheck checkTarget enableParallelBuilding; - inherit PERL_AUTOINSTALL AUTOMATED_TESTING PERL_USE_UNSAFE_INC; + env = { + inherit PERL_AUTOINSTALL AUTOMATED_TESTING PERL_USE_UNSAFE_INC; + fullperl = buildPerl; + } // env; meta = defaultMeta // (attrs.meta or { }); }); diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix index ba2134d1b971..d33362d4a170 100644 --- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix +++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -1,8 +1,17 @@ -{ lib, stdenv, file, fetchFromGitLab, buildPerlPackage, ArchiveZip, ArchiveCpio, shortenPerlShebang }: +{ lib +, stdenv +, file +, fetchFromGitLab +, buildPerlPackage +, ArchiveZip +, ArchiveCpio +, SubOverride +, shortenPerlShebang +}: buildPerlPackage rec { pname = "strip-nondeterminism"; - version = "1.0.0"; + version = "1.13.0"; outputs = [ "out" "dev" ]; # no "devdoc" @@ -11,30 +20,42 @@ buildPerlPackage rec { repo = "strip-nondeterminism"; domain = "salsa.debian.org"; rev = version; - sha256 = "1pwar1fyadqxmvb7x4zyw2iawbi5lsfjcg0ps9n9rdjb6an7vv64"; + sha256 = "sha256-KZQeoJYBPJzUvz4wlUZbiGODbpCp7/52dsg5OemKDkI="; }; - # stray test failure - doCheck = false; - + strictDeps = true; nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; - buildInputs = [ ArchiveZip ArchiveCpio ]; - propagatedNativeBuildInputs = [ file ]; + buildInputs = [ + ArchiveZip + ArchiveCpio + ]; - perlPostHook = '' + nativeCheckInputs = [ SubOverride ]; + + postPatch = '' + substituteInPlace lib/File/StripNondeterminism.pm \ + --replace "exec('file'" "exec('${lib.getExe file}'" + ''; + + + postBuild = '' + patchShebangs ./bin + '' + lib.optionalString stdenv.isDarwin '' + shortenPerlShebang bin/strip-nondeterminism + ''; + + postInstall = '' # we don’t need the debhelper script rm $out/bin/dh_strip_nondeterminism - rm $out/share/man/man1/dh_strip_nondeterminism.1.gz + rm $out/share/man/man1/dh_strip_nondeterminism.1 ''; - postInstall = lib.optionalString stdenv.isDarwin '' - shortenPerlShebang $out/bin/strip-nondeterminism - ''; + doCheck = true; meta = with lib; { description = "A Perl module for stripping bits of non-deterministic information"; homepage = "https://reproducible-builds.org/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ pSub artturin ]; }; } diff --git a/pkgs/development/php-packages/amqp/default.nix b/pkgs/development/php-packages/amqp/default.nix index 0c4f170901d1..bc955553119b 100644 --- a/pkgs/development/php-packages/amqp/default.nix +++ b/pkgs/development/php-packages/amqp/default.nix @@ -1,16 +1,24 @@ -{ buildPecl, lib, rabbitmq-c }: +{ buildPecl, lib, rabbitmq-c, fetchFromGitHub }: -buildPecl { +let + version = "1.11.0"; +in buildPecl { + inherit version; pname = "amqp"; - version = "1.11.0beta"; - sha256 = "sha256-HbVLN6fg2htYZgAFw+IhYHP+XN8j7cTLG6S0YHHOC14="; + src = fetchFromGitHub { + owner = "php-amqp"; + repo = "php-amqp"; + rev = "v${version}"; + sha256 = "sha256-CDhNDk78D15MtljbtyYj8euPnCruLZnc2NEHqXDX8HY="; + }; buildInputs = [ rabbitmq-c ]; AMQP_DIR = rabbitmq-c; meta = with lib; { + changelog = "https://github.com/php-amqp/php-amqp/releases/tag/v${version}"; description = "PHP extension to communicate with any AMQP compliant server"; license = licenses.php301; homepage = "https://github.com/php-amqp/php-amqp"; diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index 2755c09d944c..556d28ba0139 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -1,10 +1,17 @@ -{ buildPecl, lib, pcre2 }: +{ buildPecl, lib, pcre2, fetchFromGitHub }: -buildPecl { +let + version = "5.1.22"; +in buildPecl { + inherit version; pname = "apcu"; - version = "5.1.22"; - sha256 = "sha256-AQoNj9ES4e16UqNWGR2jaWprdjGUI/ew396u6vy0Gh4="; + src = fetchFromGitHub { + owner = "krakjoe"; + repo = "apcu"; + rev = "v${version}"; + sha256 = "sha256-L4a+/kWT95a1Km+FzFNiAaBw8enU6k4ZiCFRErjj9o8="; + }; buildInputs = [ pcre2 ]; doCheck = true; @@ -14,6 +21,7 @@ buildPecl { outputs = [ "out" "dev" ]; meta = with lib; { + changelog = "https://github.com/krakjoe/apcu/releases/tag/v${version}"; description = "Userland cache for PHP"; license = licenses.php301; homepage = "https://pecl.php.net/package/APCu"; diff --git a/pkgs/development/php-packages/ast/default.nix b/pkgs/development/php-packages/ast/default.nix index c1c3594f44f8..8f94bf925e5a 100644 --- a/pkgs/development/php-packages/ast/default.nix +++ b/pkgs/development/php-packages/ast/default.nix @@ -1,12 +1,20 @@ -{ buildPecl, lib }: +{ buildPecl, lib, fetchFromGitHub }: -buildPecl { +let + version = "1.1.0"; +in buildPecl { + inherit version; pname = "ast"; - version = "1.1.0"; - sha256 = "sha256-7j1PZ+JNguTTQIBqJAUgEuSVTSIxIpSTd2ZUJ0Q+bRM="; + src = fetchFromGitHub { + owner = "nikic"; + repo = "php-ast"; + rev = "v${version}"; + sha256 = "sha256-e9J6O4A+8xRBlR9m4OK1kTVpzgzsviD0Eqi0iY4AgkY="; + }; meta = with lib; { + changelog = "https://github.com/nikic/php-ast/releases/tag/v${version}"; description = "Exposes the abstract syntax tree generated by PHP"; license = licenses.bsd3; homepage = "https://pecl.php.net/package/ast"; diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index 0ba58139710b..7ba5246d8a76 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -1,14 +1,15 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: + let pname = "box"; - version = "4.1.0"; + version = "4.2.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/box-project/box/releases/download/${version}/box.phar"; - sha256 = "sha256-DtrTsCocCpLngiEPrKBrFeU+OnND8AoI83g+Y7+zHzs="; + sha256 = "sha256-9pPhqFq9t3MKI/y6/7iCYB8ddWFrafGVcV/k+Exb+KQ="; }; dontUnpack = true; @@ -25,6 +26,7 @@ mkDerivation { ''; meta = with lib; { + changelog = "https://github.com/box-project/box/releases/tag/${version}"; description = "An application for building and managing Phars"; license = licenses.mit; homepage = "https://github.com/box-project/box"; diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index c723f201a2b0..c8ee78a3c5d0 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,15 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: + let pname = "composer"; - version = "2.4.4"; + version = "2.5.1"; in mkDerivation { inherit pname version; src = fetchurl { - url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "sha256-wlLCoiGZVviAif/CQrQsjLkwCjaP04kNY5QOT8llI0U="; + url = "https://github.com/composer/composer/releases/download/${version}/composer.phar"; + sha256 = "sha256-8blP7hGlvWoarl13yNomnfJ8cF/MgG6/TIwub6hkXCA="; }; dontUnpack = true; diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index d87985ab1217..2ff867348db5 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -25,6 +25,7 @@ buildPecl { ]; meta = with lib; { + changelog = "https://github.com/couchbase/php-couchbase/releases/tag/v${version}"; description = "Couchbase Server PHP extension"; license = licenses.asl20; homepage = "https://docs.couchbase.com/php-sdk/current/project-docs/sdk-release-notes.html"; diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index 4138be3f0651..8a9447525bba 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -2,19 +2,18 @@ buildPecl rec { pname = "ddtrace"; - version = "0.70.0"; + version = "0.82.0"; src = fetchFromGitHub { owner = "DataDog"; repo = "dd-trace-php"; rev = version; - sha256 = "sha256-AYRBzE0Detg/IHXYutZUfPRMtfthxdkSjqD0M+VcTpY="; + sha256 = "sha256-QTqZRHh57mRkg0HT9qQS13emGobB0IRqM+mdImAPgtE="; }; buildInputs = [ curl pcre2 ]; meta = with lib; { - broken = lib.versionOlder php.version "8.1"; # Broken on PHP older than 8.1. description = "Datadog Tracing PHP Client"; homepage = "https://github.com/DataDog/dd-trace-php"; license = licenses.apsl20; diff --git a/pkgs/development/php-packages/ds/default.nix b/pkgs/development/php-packages/ds/default.nix index 2552a5bee3b6..7cbdfa17f972 100644 --- a/pkgs/development/php-packages/ds/default.nix +++ b/pkgs/development/php-packages/ds/default.nix @@ -1,14 +1,22 @@ -{ buildPecl, lib, pcre2, php }: +{ buildPecl, lib, pcre2, php, fetchFromGitHub }: -buildPecl { +let + version = "1.4.0"; +in buildPecl { + inherit version; pname = "ds"; - version = "1.4.0"; - sha256 = "1vwk5d27zd746767l8cvbcdr8r70v74vw0im38mlw1g85mc31fd9"; + src = fetchFromGitHub { + owner = "php-ds"; + repo = "ext-ds"; + rev = "v${version}"; + sha256 = "sha256-IqNv2jVW1Hg1hV8H9vEyLT5BWsFkGHR+WlAOHJhlW84="; + }; buildInputs = [ pcre2 ]; meta = with lib; { + changelog = "https://github.com/php-ds/ext-ds/releases/tag/v${version}"; description = "An extension providing efficient data structures for PHP"; license = licenses.mit; homepage = "https://github.com/php-ds/ext-ds"; diff --git a/pkgs/development/php-packages/gnupg/default.nix b/pkgs/development/php-packages/gnupg/default.nix index 22ce2be4473b..1341ca2d1696 100644 --- a/pkgs/development/php-packages/gnupg/default.nix +++ b/pkgs/development/php-packages/gnupg/default.nix @@ -1,13 +1,21 @@ -{ buildPecl, lib, gpgme, file, gnupg, php }: +{ buildPecl, lib, gpgme, file, gnupg, php, fetchFromGitHub }: -buildPecl { +let + version = "1.5.1"; +in buildPecl { + inherit version; pname = "gnupg"; - version = "1.5.1"; - sha256 = "sha256-qZBvRlqyNDyy8xJ+4gnHJ2Ajh0XDSHjZu8FXZIYhklI="; + src = fetchFromGitHub { + owner = "php-gnupg"; + repo = "php-gnupg"; + rev = "gnupg-${version}"; + fetchSubmodules = true; + sha256 = "sha256-kEc0883sYgmAf1mkH0zRjHzUASnZgQvdYE6VzT5X2RI="; + }; buildInputs = [ gpgme ]; - checkInputs = [ gnupg ]; + nativeCheckInputs = [ gnupg ]; postPhpize = '' substituteInPlace configure \ @@ -29,6 +37,7 @@ buildPecl { doCheck = true; meta = with lib; { + changelog = "https://github.com/php-gnupg/php-gnupg/releases/tag/gnupg-${version}"; broken = lib.versionOlder php.version "8.1"; # Broken on PHP older than 8.1. description = "PHP wrapper for GpgME library that provides access to GnuPG"; license = licenses.bsd3; diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index eb74c5ad0419..b2d319d7f404 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -1,11 +1,12 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: + mkDerivation rec { pname = "grumphp"; - version = "1.8.1"; + version = "1.15.0"; src = fetchurl { url = "https://github.com/phpro/${pname}/releases/download/v${version}/${pname}.phar"; - sha256 = "sha256-3XPMyH2F3ZfRr8DmvlBY3Z6uolhaRraQxwKIskIwPq8="; + sha256 = "sha256-EqzJb7DYZb7PnebErLVI/EZLxj0m26cniZlsu1feif0="; }; dontUnpack = true; @@ -22,6 +23,7 @@ mkDerivation rec { ''; meta = with lib; { + changelog = "https://github.com/phpro/grumphp/releases/tag/v${version}"; description = "A PHP code-quality tool"; homepage = "https://github.com/phpro/grumphp"; license = licenses.mit; diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 7c4150a5cf79..a2784b09d13b 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.14.2"; - sha256 = "1amayawrkyl1f44b8qwvm9567nxxfpv12pkn65adgjbwk5ds6z3g"; + version = "1.15.0"; + sha256 = "sha256-7rYmjTS9C0o9zGDd5OSE9c9PokOco9nwJMAADpnuckA="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix index 4f2273321f2e..5c4a00976e05 100644 --- a/pkgs/development/php-packages/openswoole/default.nix +++ b/pkgs/development/php-packages/openswoole/default.nix @@ -1,17 +1,23 @@ -{ lib, stdenv, buildPecl, php, valgrind, pcre2 }: +{ lib, stdenv, buildPecl, php, valgrind, pcre2, fetchFromGitHub }: + let pname = "openswoole"; - version = "4.12.0"; -in -buildPecl { - inherit pname version; + version = "22.0.0"; +in buildPecl { + inherit version; + pname = "openswoole"; - sha256 = "16fxwkjqihinzsmjbpzslf13m8yp0wnsqa2y5g0b07cf15g6qbny"; + src = fetchFromGitHub { + owner = "openswoole"; + repo = "swoole-src"; + rev = "v${version}"; + sha256 = "sha256-4Z7mBNGHXS/giSCmPpSyu9/99MEjCnoXgymDM/s1gk8="; + }; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; meta = with lib; { - changelog = "https://pecl.php.net/package/openswoole/${version}"; + changelog = "https://github.com/openswoole/swoole-src/releases/tag/v${version}"; description = "Coroutine-based concurrency library and high performance programmatic server for PHP"; homepage = "https://www.openswoole.com/"; license = licenses.asl20; diff --git a/pkgs/development/php-packages/pcov/default.nix b/pkgs/development/php-packages/pcov/default.nix index 88c18ed64a24..a25479893dbf 100644 --- a/pkgs/development/php-packages/pcov/default.nix +++ b/pkgs/development/php-packages/pcov/default.nix @@ -1,14 +1,22 @@ -{ buildPecl, lib, pcre2 }: +{ buildPecl, lib, php, pcre2, fetchFromGitHub }: -buildPecl { +let + version = "1.0.11"; +in buildPecl { + inherit version; pname = "pcov"; - version = "1.0.11"; - sha256 = "sha256-rSLmTNOvBlMwGCrBQsHDq0Dek0SCzUAPi9dgZBMKwkI="; + src = fetchFromGitHub { + owner = "krakjoe"; + repo = "pcov"; + rev = "v${version}"; + sha256 = "sha256-lyY17Y9chpTO8oeWmDGSh0YSnipYqCuy1qmn9su5Eu8="; + }; buildInputs = [ pcre2 ]; meta = with lib; { + changelog = "https://github.com/krakjoe/pcov/releases/tag/v${version}"; description = "A self contained php-code-coverage compatible driver for PHP."; license = licenses.php301; homepage = "https://github.com/krakjoe/pcov"; diff --git a/pkgs/development/php-packages/phan/default.nix b/pkgs/development/php-packages/phan/default.nix new file mode 100644 index 000000000000..570d96ac2df7 --- /dev/null +++ b/pkgs/development/php-packages/phan/default.nix @@ -0,0 +1,42 @@ +{ lib +, php +, mkDerivation +, fetchurl +, makeWrapper +}: +let + php' = php.withExtensions ({ enabled, all }: enabled ++ [ all.ast ]); +in +mkDerivation rec { + pname = "phan"; + version = "5.4.1"; + + src = fetchurl { + url = "https://github.com/phan/phan/releases/download/${version}/phan.phar"; + hash = "sha256-DJr1BWAfNI3hYvmBui5Dp+n7ec+f+gkOso21KEd6m8I="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src $out/libexec/phan/phan.phar + makeWrapper ${php'}/bin/php $out/bin/phan \ + --add-flags "$out/libexec/phan/phan.phar" + runHook postInstall + ''; + + meta = with lib; { + description = "Static analyzer for PHP"; + longDescription = '' + Phan is a static analyzer for PHP. Phan prefers to avoid false-positives + and attempts to prove incorrectness rather than correctness. + ''; + license = licenses.mit; + homepage = "https://github.com/phan/phan"; + maintainers = [ maintainers.apeschar ]; + }; +} diff --git a/pkgs/development/php-packages/phing/default.nix b/pkgs/development/php-packages/phing/default.nix index 8b9dbd12254e..390904724e7b 100644 --- a/pkgs/development/php-packages/phing/default.nix +++ b/pkgs/development/php-packages/phing/default.nix @@ -1,4 +1,5 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: + let pname = "phing"; version = "2.17.4"; @@ -7,7 +8,7 @@ mkDerivation { inherit pname version; src = fetchurl { - url = "https://www.phing.info/get/phing-${version}.phar"; + url = "https://github.com/phingofficial/phing/releases/download/v${version}/phing-${version}.phar"; sha256 = "sha256-3QZsl5QJkFX5Z4RovMtw2ELCp8Zl4xiZsIBikakJ474="; }; diff --git a/pkgs/development/php-packages/phive/default.nix b/pkgs/development/php-packages/phive/default.nix index f564cb536922..f5670cdfcf23 100644 --- a/pkgs/development/php-packages/phive/default.nix +++ b/pkgs/development/php-packages/phive/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "phive"; - version = "0.15.0"; + version = "0.15.2"; src = fetchurl { url = "https://github.com/phar-io/phive/releases/download/${version}/phive-${version}.phar"; - sha256 = "sha256-crMr8d5nsVt7+zQ5xPeph/JXmTEn6jJFVtp3mOgylB4="; + sha256 = "K7B2dT7F1nL14vlql6D+fo6ewkpDnu0A/SnvlCx5Bfk="; }; dontUnpack = true; @@ -23,6 +23,7 @@ mkDerivation rec { ''; meta = with lib; { + changelog = "https://github.com/phar-io/phive/releases/tag/${version}"; description = "The Phar Installation and Verification Environment (PHIVE)"; homepage = "https://github.com/phar-io/phive"; license = licenses.bsd3; diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 7085ea167796..c34d4b175cef 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,14 +1,15 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: + let pname = "php-cs-fixer"; - version = "3.11.0"; + version = "3.13.1"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "sha256-hnSHR/tDX1w/4SV6fafvUHg4JwTQJxfwKaKvEbUWJjs="; + sha256 = "4bQrCjuaWN4Dbs1tkk4m1WxSb510ue7G59HA+gQ52yk="; }; dontUnpack = true; @@ -25,6 +26,7 @@ mkDerivation { ''; meta = with lib; { + changelog = "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/${version}"; description = "A tool to automatically fix PHP coding standards issues"; license = licenses.mit; homepage = "https://cs.symfony.com/"; diff --git a/pkgs/development/php-packages/php-parallel-lint/default.nix b/pkgs/development/php-packages/php-parallel-lint/default.nix index 1d7c23337c65..406e58b7958c 100644 --- a/pkgs/development/php-packages/php-parallel-lint/default.nix +++ b/pkgs/development/php-packages/php-parallel-lint/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchFromGitHub, makeWrapper, lib, php }: +{ mkDerivation, fetchFromGitHub, makeWrapper, lib, php, php81 }: let pname = "php-parallel-lint"; version = "1.3.2"; @@ -10,13 +10,17 @@ mkDerivation { owner = "php-parallel-lint"; repo = "PHP-Parallel-Lint"; rev = "v${version}"; - sha256 = "sha256-pTHH19HwqyOj5pSmH7l0JlntNVtMdu4K9Cl+qyrrg9U="; + # `.gitattibutes` exclude `box.json` from the archive produced git. + forceFetchGit = true; + sha256 = "SPP1ynxJad2m5wknGt8z94fW7Ucx8nqLvwZVmlylOgM="; }; nativeBuildInputs = [ makeWrapper php.packages.composer - php.packages.box + # box is only available for PHP ≥ 8.1 but the purpose of this tool is to validate + # that project does not use features not available on older PHP versions. + php81.packages.box ]; buildPhase = '' @@ -36,7 +40,6 @@ mkDerivation { ''; meta = with lib; { - broken = lib.versionOlder php.version "8.1"; # Broken on PHP older than 8.1. description = "Tool to check syntax of PHP files faster than serial check with fancier output"; license = licenses.bsd2; homepage = "https://github.com/php-parallel-lint/PHP-Parallel-Lint"; diff --git a/pkgs/development/php-packages/phpcbf/default.nix b/pkgs/development/php-packages/phpcbf/default.nix index 1cc6f46bd09d..9a85a5ec47d3 100644 --- a/pkgs/development/php-packages/phpcbf/default.nix +++ b/pkgs/development/php-packages/phpcbf/default.nix @@ -1,14 +1,15 @@ { mkDerivation, fetchurl, lib, php, makeWrapper }: + let pname = "phpcbf"; - version = "3.6.0"; + version = "3.7.1"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; - sha256 = "04wb1imm4934mpy2hxcmqh4cn7md1vwmfii39p6mby809325b5z1"; + sha256 = "sha256-yTwOg8vaIcIfhJzPD0tCl50gAEpaYXLtDqJw7Keub6g="; }; dontUnpack = true; @@ -25,6 +26,7 @@ mkDerivation { ''; meta = with lib; { + changelog = "https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/${version}"; description = "PHP coding standard beautifier and fixer"; license = licenses.bsd3; homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; diff --git a/pkgs/development/php-packages/phpcs/default.nix b/pkgs/development/php-packages/phpcs/default.nix index 877f587717da..0e2d886e6d5a 100644 --- a/pkgs/development/php-packages/phpcs/default.nix +++ b/pkgs/development/php-packages/phpcs/default.nix @@ -1,14 +1,15 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: + let pname = "phpcs"; - version = "3.6.0"; + version = "3.7.1"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; - sha256 = "0sdi78hrwd3r5p1b38qmp89m41kfszh2qn4n5zhq2dmhsjdhjziz"; + sha256 = "sha256-ehQyOhSvn1gwLRVEJJLuEHaozXLAGKgWy0SWW/OpsBU="; }; dontUnpack = true; @@ -25,6 +26,7 @@ mkDerivation { ''; meta = with lib; { + changelog = "https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/${version}"; description = "PHP coding standard tool"; license = licenses.bsd3; homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index 575d4ec7b460..ba8c0c70c837 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -1,14 +1,15 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: + let pname = "phpmd"; - version = "2.8.2"; + version = "2.13.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpmd/phpmd/releases/download/${version}/phpmd.phar"; - sha256 = "1i8qgzxniw5d8zjpypalm384y7qfczapfq70xmg129laq6xiqlqb"; + sha256 = "LNR7qT3KIhIeq9WPdXVGsnuzzXN4ze/juDMpt1Ke/A0="; }; dontUnpack = true; @@ -25,6 +26,7 @@ mkDerivation { ''; meta = with lib; { + changelog = "https://github.com/phpmd/phpmd/releases/tag/${version}"; description = "PHP code quality analyzer"; license = licenses.bsd3; homepage = "https://phpmd.org/"; diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index b277c996be2e..185df9f64150 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,15 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: + let pname = "phpstan"; - version = "1.8.6"; + version = "1.9.4"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-8scUd8BT6u9rqBPoaXozkn6H9PIWF/MWNWT9y8RwPkg="; + sha256 = "sha256-A+F/ZoL6dLYx4MWN0eWXtQnmWJPYBqEcSgY4A1oR3mo="; }; dontUnpack = true; @@ -25,6 +26,7 @@ mkDerivation { ''; meta = with lib; { + changelog = "https://github.com/phpstan/phpstan/releases/tag/${version}"; description = "PHP Static Analysis Tool"; longDescription = '' PHPStan focuses on finding errors in your code without actually diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index f092d1a8b199..b6a990559531 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -1,14 +1,15 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: + let pname = "psalm"; - version = "4.29.0"; + version = "5.4.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; - sha256 = "q+OjEPNAPwSjtnbfBynbbJy3WDITr01ci8O74BMO0Og="; + sha256 = "sha256-d5jf68s+LppUDwERQaqr+ry8L+Zmob8VwetYkQ+vIUg="; }; dontUnpack = true; @@ -25,6 +26,7 @@ mkDerivation { ''; meta = with lib; { + changelog = "https://github.com/vimeo/psalm/releases/tag/${version}"; description = "A static analysis tool for finding errors in PHP applications"; license = licenses.mit; homepage = "https://github.com/vimeo/psalm"; diff --git a/pkgs/development/php-packages/psysh/default.nix b/pkgs/development/php-packages/psysh/default.nix index b42375f74d5e..44905b54b352 100644 --- a/pkgs/development/php-packages/psysh/default.nix +++ b/pkgs/development/php-packages/psysh/default.nix @@ -1,14 +1,15 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: + let pname = "psysh"; - version = "0.11.8"; + version = "0.11.10"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; - sha256 = "sha256-VK1e3qQGaN6Kc/5dUaGwrHAqk9yiJCwbW29x6i6nHQ4="; + sha256 = "sha256-2U9HMA3OAA9Nl9JVJjepB2vi0O483xGpr8nQUGhOrpI="; }; dontUnpack = true; @@ -25,6 +26,7 @@ mkDerivation { ''; meta = with lib; { + changelog = "https://github.com/bobthecow/psysh/releases/tag/v${version}"; description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP."; license = licenses.mit; homepage = "https://psysh.org/"; diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix index b54d85b73ecb..42cc89b4874c 100644 --- a/pkgs/development/php-packages/redis/default.nix +++ b/pkgs/development/php-packages/redis/default.nix @@ -1,16 +1,24 @@ -{ buildPecl, lib, php }: +{ buildPecl, lib, php, fetchFromGitHub }: -buildPecl { +let + version = "5.3.7"; +in buildPecl { + inherit version; pname = "redis"; - version = "5.3.7"; - sha256 = "sha256-uVgWbM2k9AvRfGmY+eIjkCGuZERnzYrVwV3vQgqtZbA="; + src = fetchFromGitHub { + repo = "phpredis"; + owner = "phpredis"; + rev = version; + sha256 = "sha256-Cc9Mtx28j3kpyV8Yq+JSYQt5XQnELaVjuUbkkbG45kw="; + }; internalDeps = with php.extensions; [ session ]; meta = with lib; { + changelog = "https://github.com/phpredis/phpredis/releases/tag/${version}"; description = "PHP extension for interfacing with Redis"; license = licenses.php301; homepage = "https://github.com/phpredis/phpredis/"; diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix index c2f2f1cd126f..bd62e06233a8 100644 --- a/pkgs/development/php-packages/swoole/default.nix +++ b/pkgs/development/php-packages/swoole/default.nix @@ -1,10 +1,17 @@ -{ lib, stdenv, buildPecl, php, valgrind, pcre2 }: +{ lib, stdenv, buildPecl, php, valgrind, pcre2, fetchFromGitHub }: -buildPecl { +let + version = "5.0.1"; +in buildPecl { + inherit version; pname = "swoole"; - version = "5.0.1"; - sha256 = "1zq5vvwjqpg3d4qv8902w54gvghjgcb3c7szi7fpqi6f51mhhwvf"; + src = fetchFromGitHub { + owner = "swoole"; + repo = "swoole-src"; + rev = "v${version}"; + sha256 = "sha256-d0xccbfOmebWR14oTUviWz/mB5IA7iXn0uUWxTQRd9w="; + }; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; @@ -12,6 +19,7 @@ buildPecl { checkTarget = "tests"; meta = with lib; { + changelog = "https://github.com/swoole/swoole-src/releases/tag/v${version}"; description = "Coroutine-based concurrency library for PHP"; license = licenses.asl20; homepage = "https://www.swoole.co.uk/"; diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 388360462dcf..25715c56a151 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -1,18 +1,18 @@ -{ buildPecl, lib, php }: +{ buildPecl, lib, fetchFromGitHub }: let - versionData = if (lib.versionOlder php.version "8.1") then { - version = "3.1.6"; - sha256 = "1lnmrb5kgq8lbhjs48j3wwhqgk44pnqb1yjq4b5r6ysv9l5wlkjm"; - } else { - version = "3.2.0RC2"; - sha256 = "dQgXDP3Ifg+D0niWxaJ4ec71Vfr8KH40jv6QbxSyY+4="; - }; -in -buildPecl { + version = "3.2.0"; +in buildPecl { + inherit version; + pname = "xdebug"; - inherit (versionData) version sha256; + src = fetchFromGitHub { + owner = "xdebug"; + repo = "xdebug"; + rev = version; + sha256 = "sha256-GQB69aETp8STyT4GHQQSPJBVEynWifbmGQXUeISvLRI="; + }; doCheck = true; checkTarget = "test"; @@ -20,6 +20,7 @@ buildPecl { zendExtension = true; meta = with lib; { + changelog = "https://github.com/xdebug/xdebug/releases/tag/${version}"; description = "Provides functions for function traces and profiling"; license = licenses.php301; homepage = "https://xdebug.org/"; diff --git a/pkgs/development/python-modules/3to2/default.nix b/pkgs/development/python-modules/3to2/default.nix index ff64a6d1a473..18e93a1ff77a 100644 --- a/pkgs/development/python-modules/3to2/default.nix +++ b/pkgs/development/python-modules/3to2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "fef50b2b881ef743f269946e1090b77567b71bb9a9ce64b7f8e699b562ff685c"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test lib3to2/tests diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index b6f79b6c5fc6..2359eea7a04b 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.9.1"; + version = "3.9.1.post1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "APScheduler"; inherit version; - hash = "sha256-ZeZXS2OVSY03HQRfKop+T31Qxq0h73MT0VscfPIN8eM="; + hash = "sha256-sr6gMJVp2lOnJhv6DOGcZ92/4VG9p3amqQdXn9vT6yo="; }; buildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { tzlocal ]; - checkInputs = [ + nativeCheckInputs = [ gevent pytest-asyncio pytest-tornado diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 3065e822f6be..00aef53cc1b2 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -36,7 +36,7 @@ in buildPythonPackage rec { pkg-config ]; - checkInputs = [ + nativeCheckInputs = [ gdb numpy ncurses ]; diff --git a/pkgs/development/python-modules/Fabric/default.nix b/pkgs/development/python-modules/Fabric/default.nix index bafaee5d02b1..9b44b552648c 100644 --- a/pkgs/development/python-modules/Fabric/default.nix +++ b/pkgs/development/python-modules/Fabric/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ invoke paramiko cryptography ]; - checkInputs = [ pytestCheckHook pytest-relaxed mock ]; + nativeCheckInputs = [ pytestCheckHook pytest-relaxed mock ]; # ==================================== ERRORS ==================================== # ________________________ ERROR collecting test session _________________________ diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix index 3a01c9ba9831..bbbdc29d45f1 100644 --- a/pkgs/development/python-modules/Flask-PyMongo/default.nix +++ b/pkgs/development/python-modules/Flask-PyMongo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "051kwdk07y4xm4yawcjhn6bz8swxp9nanv7jj35mz2l0r0nv03k2"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix index 4244d358c8dd..307ad10b304a 100644 --- a/pkgs/development/python-modules/FormEncode/default.nix +++ b/pkgs/development/python-modules/FormEncode/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ + nativeCheckInputs = [ dnspython pycountry pytestCheckHook diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/GeoIP/default.nix index 0e4b66fe962f..95423a858d06 100644 --- a/pkgs/development/python-modules/GeoIP/default.nix +++ b/pkgs/development/python-modules/GeoIP/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "GeoIP"; version = "1.3.2"; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; propagatedBuildInputs = [ geoip ]; diff --git a/pkgs/development/python-modules/GitPython/hardcode-git-path.patch b/pkgs/development/python-modules/GitPython/hardcode-git-path.patch deleted file mode 100644 index 937479959926..000000000000 --- a/pkgs/development/python-modules/GitPython/hardcode-git-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/git/cmd.py b/git/cmd.py -index a4faefe..51ad442 100644 ---- a/git/cmd.py -+++ b/git/cmd.py -@@ -175,7 +175,7 @@ class Git(LazyMixin): - - # CONFIGURATION - -- git_exec_name = "git" # default that should work on linux and windows -+ git_exec_name = "@git@/bin/git" - - # Enables debugging of GitPython's git commands - GIT_PYTHON_TRACE = os.environ.get("GIT_PYTHON_TRACE", False) diff --git a/pkgs/development/python-modules/IPy/default.nix b/pkgs/development/python-modules/IPy/default.nix index 05587ef07401..5f370e7888d2 100644 --- a/pkgs/development/python-modules/IPy/default.nix +++ b/pkgs/development/python-modules/IPy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "edeca741dea2d54aca568fa23740288c3fe86c0f3ea700344571e9ef14a7cc1a"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests -e fuzz diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index 698a4165455d..f26473f0a905 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 +, packaging , pythonOlder , typing-extensions , pytest @@ -9,19 +10,21 @@ buildPythonPackage rec { pname = "JPype1"; - version = "1.4.0"; + version = "1.4.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-DF9mXuPm4xwn6dLUjdEr9OtP5oWII+ahEgGgNSdMz+E="; + sha256 = "sha256-3I7oVAc0dK15rhaNkML2iThU9Yk2z6GPNYfK2uDTaW0="; }; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + propagatedBuildInputs = [ + packaging + ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/Logbook/default.nix b/pkgs/development/python-modules/Logbook/default.nix index fa05a7a6dffa..da1f178729cf 100644 --- a/pkgs/development/python-modules/Logbook/default.nix +++ b/pkgs/development/python-modules/Logbook/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1s1gyfw621vid7qqvhddq6c3z2895ci4lq3g0r1swvpml2nm9x36"; }; - checkInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ]; + nativeCheckInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ]; propagatedBuildInputs = [ brotli ]; diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index 9118f5a6fcf3..7b8f9b7a8b3b 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.2.2"; + version = "1.2.4"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NySGmzY7pjCicqX4n2jAcDUhN7j9F1dlABe34G/aFj8="; + sha256 = "sha256-1go5A9w7sBoYrWqJzb4uTq3GnAvI7x43c7pT1Ew/ejQ="; }; propagatedBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ chameleon lingua mock diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 83d2fb638859..4a549cee2c0a 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -83,7 +83,7 @@ buildPythonPackage rec { Yapsy ]; - checkInputs = [ + nativeCheckInputs = [ freezegun mock pytestCheckHook diff --git a/pkgs/development/python-modules/Pmw/default.nix b/pkgs/development/python-modules/Pmw/default.nix index 27c62ea66326..f88346d66489 100644 --- a/pkgs/development/python-modules/Pmw/default.nix +++ b/pkgs/development/python-modules/Pmw/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = { description = "A toolkit for building high-level compound widgets in Python using the Tkinter module"; - homepage = "http://pmw.sourceforge.net/"; + homepage = "https://pmw.sourceforge.net/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ mounium ]; }; diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/PyVirtualDisplay/default.nix similarity index 100% rename from pkgs/development/python-modules/virtual-display/default.nix rename to pkgs/development/python-modules/PyVirtualDisplay/default.nix diff --git a/pkgs/development/python-modules/Rtree/default.nix b/pkgs/development/python-modules/Rtree/default.nix index d6e3dab16c64..4ee9b26c5d2e 100644 --- a/pkgs/development/python-modules/Rtree/default.nix +++ b/pkgs/development/python-modules/Rtree/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { buildInputs = [ libspatialindex ]; - checkInputs = [ + nativeCheckInputs = [ numpy pytestCheckHook ]; diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index f596a6d804db..e931875605bc 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -82,7 +82,7 @@ in buildPythonPackage rec { # the fix for which hasn't been merged yet. # keep Nose around since running the tests by hand is possible from Python or bash - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; # setuptools needed for cuda support propagatedBuildInputs = [ libgpuarray_ diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix index 624bb4388a5d..a88b843a6152 100644 --- a/pkgs/development/python-modules/WSME/default.nix +++ b/pkgs/development/python-modules/WSME/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { webob ]; - checkInputs = [ + nativeCheckInputs = [ nose cherrypy flask diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index 747887f2eaaf..4cf7842464ab 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-9fIxNkOdM+Bz1F9AWq02H3LLQnefxGSAtp9kM2OtJ9M="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aadict/default.nix b/pkgs/development/python-modules/aadict/default.nix index de3ec6fa7f05..c124cb7695db 100644 --- a/pkgs/development/python-modules/aadict/default.nix +++ b/pkgs/development/python-modules/aadict/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six ]; - checkInputs = [ nose coverage ]; + nativeCheckInputs = [ nose coverage ]; meta = with lib; { homepage = "https://github.com/metagriffin/aadict"; diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix index 58d07696de20..9e4cac5855e6 100644 --- a/pkgs/development/python-modules/aardwolf/default.nix +++ b/pkgs/development/python-modules/aardwolf/default.nix @@ -2,14 +2,17 @@ , arc4 , asn1crypto , asn1tools +, asyauth , asysocks , buildPythonPackage , colorama -, fetchPypi +, fetchFromGitHub , minikerberos , pillow , pyperclip , pythonOlder +, rustPlatform +, setuptools-rust , tqdm , unicrypto , winsspi @@ -17,20 +20,40 @@ buildPythonPackage rec { pname = "aardwolf"; - version = "0.0.8"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-plz1D+Lr5rV8iJo7IUmuXfjxLvVxX9lgyxyYXUlPH0k="; + src = fetchFromGitHub { + owner = "skelsec"; + repo = "aardwolf"; + rev = "86c4b511e0dfeeb767081902af2244f6297a68eb"; + hash = "sha256-ULczCJWVLrj0is6UYZxJNyLV6opzoJAFStqsjEmjaIA="; }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sourceRoot = "source/aardwolf/utils/rlers"; + name = "${pname}-${version}"; + hash = "sha256-F6NLWc5B577iH0uKAdj2y2TtQfo4eeXkMIK6he1tpvQ="; + }; + + cargoRoot = "aardwolf/utils/rlers"; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + setuptools-rust + ] ++ (with rustPlatform.rust; [ + cargo + rustc + ]); + propagatedBuildInputs = [ arc4 asn1crypto asn1tools + asyauth asysocks colorama minikerberos diff --git a/pkgs/development/python-modules/abodepy/default.nix b/pkgs/development/python-modules/abodepy/default.nix deleted file mode 100644 index 47fc6148ed24..000000000000 --- a/pkgs/development/python-modules/abodepy/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, colorlog, lomond -, requests, isPy3k, requests-mock }: - -buildPythonPackage rec { - pname = "abodepy"; - version = "1.2.2"; - - disabled = !isPy3k; - - src = fetchFromGitHub { - owner = "MisterWil"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-GrvNCgWGGBbUUONwS18csh4/A0MMkSk5Z6LlDhlQqok="; - }; - - propagatedBuildInputs = [ colorlog lomond requests ]; - checkInputs = [ pytestCheckHook requests-mock ]; - - meta = with lib; { - homepage = "https://github.com/MisterWil/abodepy"; - description = "An Abode alarm Python library running on Python 3"; - license = licenses.mit; - maintainers = with maintainers; [ jamiemagee ]; - }; -} diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index e2facc919347..8ce782aedc98 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 = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9WiAmTjEmrvaiYJiI8mStjCv0jxjgWCteEDP40dxDZc="; + sha256 = "sha256-Rjw4oI0uTO9sSYt2ulvUhY5MbvUdoaWh8nE5oCLiAkg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix index fff517c84fbe..dfe47d306811 100644 --- a/pkgs/development/python-modules/accupy/default.nix +++ b/pkgs/development/python-modules/accupy/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pyfma ] ++ lib.optional (pythonOlder "3.8") importlib-metadata; - checkInputs = [ + nativeCheckInputs = [ perfplot pytestCheckHook matplotlib diff --git a/pkgs/development/python-modules/accuweather/default.nix b/pkgs/development/python-modules/accuweather/default.nix index c5040b0feace..e6f2274667c2 100644 --- a/pkgs/development/python-modules/accuweather/default.nix +++ b/pkgs/development/python-modules/accuweather/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "accuweather"; - version = "0.4.0"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bieniu"; repo = pname; - rev = version; - hash = "sha256-NnDpSOEIqPuPLIr0Ty6yjrs9WRKyhykcdyiRPB/cHEw="; + rev = "refs/tags/${version}"; + hash = "sha256-v4mFvW+p0g+5IeZT8o0Z60MafHyYZ62d4lNH27wlAeI="; }; postPatch = '' @@ -36,7 +36,7 @@ buildPythonPackage rec { orjson ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytest-error-for-skips @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for getting weather data from AccuWeather servers"; homepage = "https://github.com/bieniu/accuweather"; + changelog = "https://github.com/bieniu/accuweather/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ jamiemagee ]; }; diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index 79c1ecffb037..0ecae898a670 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { buildInputs = [ setuptools-scm ]; - checkInputs = [ fusepy fuse ]; + nativeCheckInputs = [ fusepy fuse ]; doCheck = false; # seems to hang, not sure diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index f81f382b956e..e0354b58de15 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , matplotlib , numpy , pandas @@ -20,6 +21,9 @@ buildPythonPackage rec { inherit pname version; sha256 = "sha256-0CvMhCUc+i7dPiHH+IXdlj+OjFh/l1wvnU4dmxQrzFI="; }; + format = "pyproject"; + + nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ matplotlib @@ -29,7 +33,7 @@ buildPythonPackage rec { tabulate ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -44,8 +48,8 @@ buildPythonPackage rec { ]; disabledTestPaths = [ - # All tests fail with TypeError - "tests/test_aio.py" + # ValueError: Unknown window type: "hanning" + "tests/standards/test_iso_1996_2_2007.py" ]; pythonImportsCheck = [ "acoustics" ]; diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index 0b69bc68b046..b1b13bf581d1 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; rev = version; - hash = "sha256-YwmrdqWG5qD621+jQMVyTM0Uy0yXCVPv9zfVhZ+ohg0="; + hash = "sha256-S7EZZxNcoLcZyyRNGlZj6nGoCAlqCxNdh3azIVKvOTM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -53,7 +53,7 @@ buildPythonPackage rec { ] ++ dissect-target.optional-dependencies.full; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.full; diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index dd0a1c20cc76..60131fcb9d3b 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/adafruit-io/default.nix b/pkgs/development/python-modules/adafruit-io/default.nix index bd44626f8bcf..382fea4601cc 100644 --- a/pkgs/development/python-modules/adafruit-io/default.nix +++ b/pkgs/development/python-modules/adafruit-io/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/adafruit-nrfutil/default.nix b/pkgs/development/python-modules/adafruit-nrfutil/default.nix index 532fd301a1a4..ec61902034f7 100644 --- a/pkgs/development/python-modules/adafruit-nrfutil/default.nix +++ b/pkgs/development/python-modules/adafruit-nrfutil/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ecdsa ]; - checkInputs = [ + nativeCheckInputs = [ behave nose ]; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 6707cb53e720..62188429171e 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,17 +7,19 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.33.0"; - format = "setuptools"; + version = "3.40.2"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-Fj+LUTovZm6t0YRCa8QtoTBal+PefCvTIl9OeBoac6U="; + hash = "sha256-NLbKvC/7N10Y7l94sfiWCmBz92qlgufb1S62Adod4WA="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools-scm ]; @@ -32,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Platform detection for use by Adafruit libraries"; homepage = "https://github.com/adafruit/Adafruit_Python_PlatformDetect"; + changelog = "https://github.com/adafruit/Adafruit_Python_PlatformDetect/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index e944248db17a..cbce5d2af148 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ httpretty pytestCheckHook ]; diff --git a/pkgs/development/python-modules/adb-homeassistant/default.nix b/pkgs/development/python-modules/adb-homeassistant/default.nix index ff49aec1fbbc..72e6d6acd4d3 100644 --- a/pkgs/development/python-modules/adb-homeassistant/default.nix +++ b/pkgs/development/python-modules/adb-homeassistant/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { pycryptodome ]; - checkInputs = [ pytest mock ]; + nativeCheckInputs = [ pytest mock ]; checkPhase = '' py.test test ''; diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index 383a3fe782b0..cdd8ff94b893 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ mock pycryptodome pytestCheckHook diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 3106cf04002d..02ca5197c6d0 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { PSL_PATH = "${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook toml ]; diff --git a/pkgs/development/python-modules/add-trailing-comma/default.nix b/pkgs/development/python-modules/add-trailing-comma/default.nix index b6cfbb46d701..3fb15671ecda 100644 --- a/pkgs/development/python-modules/add-trailing-comma/default.nix +++ b/pkgs/development/python-modules/add-trailing-comma/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "add-trailing-comma"; - version = "2.3.0"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NEXPIkPeH6ZAm1uzqc8iRWnlLbhKmvGQGGraLu989sw="; + sha256 = "sha256-/dA3OwBBMjykSYaIbvhJZj9Z8/0+mfL5pW4GqgMgops="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { "add_trailing_comma" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/addict/default.nix b/pkgs/development/python-modules/addict/default.nix index 2bb531cff908..235c34af263d 100644 --- a/pkgs/development/python-modules/addict/default.nix +++ b/pkgs/development/python-modules/addict/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "b3b2210e0e067a281f5646c8c5db92e99b7231ea8b0eb5f74dbdf9e259d4e494"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "addict" ]; diff --git a/pkgs/development/python-modules/adext/default.nix b/pkgs/development/python-modules/adext/default.nix index 7b10b0de1b62..649ab4b732c6 100644 --- a/pkgs/development/python-modules/adext/default.nix +++ b/pkgs/development/python-modules/adext/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { alarmdecoder ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/adguardhome/default.nix b/pkgs/development/python-modules/adguardhome/default.nix index 134132f9931e..28af1269c180 100644 --- a/pkgs/development/python-modules/adguardhome/default.nix +++ b/pkgs/development/python-modules/adguardhome/default.nix @@ -12,15 +12,16 @@ buildPythonPackage rec { pname = "adguardhome"; - version = "0.5.1"; + version = "0.6.1"; format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "frenck"; repo = "python-${pname}"; - rev = "v${version}"; - sha256 = "sha256-HAgt52Bo2NOUkpr5xvWTcRyrLKpfcBDlVAZxgDNI7hY="; + rev = "refs/tags/v${version}"; + hash = "sha256-ZeajC8FM7Py+DWknVjnwiM4jaCCcnxfC+kTbHEEmyms="; }; postPatch = '' @@ -32,24 +33,29 @@ buildPythonPackage rec { --replace 0.0.0 ${version} ''; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ aiohttp yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook ]; - pythonImportsCheck = [ "adguardhome" ]; + pythonImportsCheck = [ + "adguardhome" + ]; meta = with lib; { description = "Python client for the AdGuard Home API"; homepage = "https://github.com/frenck/python-adguardhome"; + changelog = "https://github.com/frenck/python-adguardhome/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jamiemagee ]; }; diff --git a/pkgs/development/python-modules/adlfs/default.nix b/pkgs/development/python-modules/adlfs/default.nix index e41f8b75f62f..53c09cfa019f 100644 --- a/pkgs/development/python-modules/adlfs/default.nix +++ b/pkgs/development/python-modules/adlfs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "adlfs"; - version = "2022.10.0"; + version = "2023.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fsspec"; repo = pname; - rev = version; - hash = "sha256-h/xcqb7G4uj4WNVE8is/s2LQ2NfzP1negh15G8B9YCs="; + rev = "refs/tags/${version}"; + hash = "sha256-eSfdRiIr8xJEoLMs2114NX0CsBMlku9qjUXA23D5qgY="; }; propagatedBuildInputs = [ @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Filesystem interface to Azure-Datalake Gen1 and Gen2 Storage"; homepage = "https://github.com/fsspec/adlfs"; + changelog = "https://github.com/fsspec/adlfs/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/advantage-air/default.nix b/pkgs/development/python-modules/advantage-air/default.nix index 90c8645547fe..205ea0c0e7f8 100644 --- a/pkgs/development/python-modules/advantage-air/default.nix +++ b/pkgs/development/python-modules/advantage-air/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "advantage-air"; - version = "0.4.1"; + version = "0.4.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "advantage_air"; inherit version; - hash = "sha256-I9HMDLZX9xKDJuYSAweM2r4v3ZKevHTn5dHTYxN3EuE="; + hash = "sha256-3t6ujBmhDVghnDSmJWb/7CHKNsvr4QFsfIqd4p8BHlA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aemet-opendata/default.nix b/pkgs/development/python-modules/aemet-opendata/default.nix index 9c344f720aec..8789bd0fa193 100644 --- a/pkgs/development/python-modules/aemet-opendata/default.nix +++ b/pkgs/development/python-modules/aemet-opendata/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "aemet-opendata"; - version = "0.2.1"; + version = "0.2.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Noltari"; repo = "AEMET-OpenData"; - rev = version; - sha256 = "0jl1897m3qmr48n469mq7d66k1j0rn7hlbcahm0ylf5i3ma03aiw"; + rev = "refs/tags/${version}"; + sha256 = "sha256-3f3hvui00oItu6t9rKecoCquqsD1Eeqz+SEsLBqGt48="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 8ebed55e1bc7..bc3bdc2fd583 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -1,9 +1,9 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k , pyparsing -, python +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -11,28 +11,33 @@ buildPythonPackage rec { version = "3.1.11"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-rtLCc1R65yoNXuhpcZwCpkPaFr9QfICVj6rcfgOOP3M="; + hash = "sha256-rtLCc1R65yoNXuhpcZwCpkPaFr9QfICVj6rcfgOOP3M="; }; - checkInputs = [ + nativeCheckInputs = [ pyparsing + pytestCheckHook ]; - # py2 likes to reorder tests - doCheck = isPy3k; - - checkPhase = '' - runHook preCheck - ${python.interpreter} aenum/test.py - runHook postCheck - ''; - pythonImportsCheck = [ "aenum" ]; + disabledTests = [ + # https://github.com/ethanfurman/aenum/issues/27 + "test_class_nested_enum_and_pickle_protocol_four" + "test_pickle_enum_function_with_qualname" + "test_stdlib_inheritence" + "test_subclasses_with_getnewargs_ex" + "test_arduino_headers" + "test_c_header_scanner" + "test_extend_flag_backwards_stdlib" + ]; + meta = with lib; { description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants"; homepage = "https://github.com/ethanfurman/aenum"; diff --git a/pkgs/development/python-modules/aeppl/default.nix b/pkgs/development/python-modules/aeppl/default.nix index 6d222dfe51cb..039abb2fb68e 100644 --- a/pkgs/development/python-modules/aeppl/default.nix +++ b/pkgs/development/python-modules/aeppl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aeppl"; - version = "0.0.39"; + version = "0.0.50"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ILyE3tqoDHNmrKpHPBUJ02jrGevsU5864rjhgmgjwvo="; + hash = "sha256-cc41MspG2mXlNwLz7ViPPqXH/ayskVmms5SXqBo9g3Y="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ numdifftools pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index 17d0ff41339a..a739ce0d528e 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/pkgs/development/python-modules/aesara/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ jax jaxlib numba diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 29593503252a..397ad4e17b78 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -1,8 +1,27 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder -, fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens -, brotli, fontmath, mutatormath, booleanoperations -, ufoprocessor, ufonormalizer, psautohint, tqdm -, setuptools-scm, scikit-build +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, fetchpatch +, pythonOlder +, fonttools +, defcon +, lxml +, fs +, unicodedata2 +, zopfli +, brotlipy +, fontpens +, brotli +, fontmath +, mutatormath +, booleanoperations +, ufoprocessor +, ufonormalizer +, psautohint +, tqdm +, setuptools-scm +, scikit-build , cmake , antlr4_9 , libxml2 @@ -14,17 +33,16 @@ buildPythonPackage rec { pname = "afdko"; - version = "3.9.0"; + version = "3.9.2"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1fjsaz6bp028fbmry6fzfcih78mdzycqmky1wsz5y0bg4kfk4shh"; + sha256 = "sha256-3JEnQbS4CtZEqAb+/ngqkO+nv9SZ0Zi8sPJLyW+tQ9w="; }; - format = "pyproject"; - nativeBuildInputs = [ setuptools-scm scikit-build @@ -42,8 +60,6 @@ buildPythonPackage rec { # Use antlr4 runtime from nixpkgs and link it dynamically ./use-dynamic-system-antlr4-runtime.patch - - ./libxml2-cmake-find-package.patch ]; # setup.py will always (re-)execute cmake in buildPhase @@ -68,14 +84,15 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ pytestCheckHook ]; + # Use system libxml2 + FORCE_SYSTEM_LIBXML2 = true; + + nativeCheckInputs = [ pytestCheckHook ]; + preCheck = '' export PATH=$PATH:$out/bin - - # Update tests to match ufinormalizer-0.6.1 expectations: - # https://github.com/adobe-type-tools/afdko/issues/1418 - find tests -name layerinfo.plist -delete ''; + disabledTests = lib.optionals (!runAllTests) [ # Disable slow tests, reduces test time ~25 % "test_report" @@ -98,8 +115,9 @@ buildPythonPackage rec { }; meta = with lib; { + changelog = "https://github.com/adobe-type-tools/afdko/blob/${version}/NEWS.md"; description = "Adobe Font Development Kit for OpenType"; - homepage = "https://adobe-type-tools.github.io/afdko/"; + homepage = "https://adobe-type-tools.github.io/afdko"; license = licenses.asl20; maintainers = [ maintainers.sternenseemann ]; }; diff --git a/pkgs/development/python-modules/afdko/libxml2-cmake-find-package.patch b/pkgs/development/python-modules/afdko/libxml2-cmake-find-package.patch deleted file mode 100644 index 87604199d3e9..000000000000 --- a/pkgs/development/python-modules/afdko/libxml2-cmake-find-package.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit c423d1ddf0345aed7ecaf4c8b9e1fa5108aafc6f -Author: sternenseemann -Date: Sat Jul 2 12:35:56 2022 +0200 - - Force use of CMake-shipped FindLibXml2 module - - This is needed to work around a nixpkgs bug: - https://github.com/NixOS/nixpkgs/issues/125008 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a75b6fb1..c1408283 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,7 +42,7 @@ set(ANTLR4_TAG tags/4.9.3) - find_path(ANTLR4_HEADER antlr4-runtime.h PATH_SUFFIXES antlr4-runtime) - set(ANTLR4_INCLUDE_DIRS ${ANTLR4_HEADER}) - --FIND_PACKAGE(LibXml2) -+FIND_PACKAGE(LibXml2 REQUIRED MODULE) - IF (NOT ${LibXml2_FOUND}) - MESSAGE(STATUS "Could not locate LibXml2, will install externally.") - set(LIBXML2_TAG tags/v2.9.13) diff --git a/pkgs/development/python-modules/affine/default.nix b/pkgs/development/python-modules/affine/default.nix index 4b7696223a73..85991ac75575 100644 --- a/pkgs/development/python-modules/affine/default.nix +++ b/pkgs/development/python-modules/affine/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "sha256-1nbeZhV61q+Z/9lOD1Tonfw1sPtyUurS7QrS3KQxvdA="; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = "py.test"; meta = with lib; { diff --git a/pkgs/development/python-modules/afsapi/default.nix b/pkgs/development/python-modules/afsapi/default.nix index 323c0a225312..8d40361c6d06 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.7"; + version = "0.2.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "wlcrs"; repo = "python-afsapi"; rev = "refs/tags/${version}"; - hash = "sha256-TTZk/8mfG5lBr8SyMbqSaYDskWKnUlMkAUp94DXPCKo="; + hash = "sha256-eE5BsXNtSU6YUhRn4/SKpMrqaYf8tyfLKdxxGOmNJ9I="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -34,7 +34,7 @@ buildPythonPackage rec { lxml ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the Frontier Silicon API"; homepage = "https://github.com/wlcrs/python-afsapi"; + changelog = "https://github.com/wlcrs/python-afsapi/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index d02d71d866f7..a3e962ea6cd2 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ agate openpyxl xlrd olefile ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "agate" ]; diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 827f73f27e7a..5c6cf00cd232 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -11,18 +11,18 @@ buildPythonPackage rec { pname = "agate-sql"; - version = "0.5.8"; + version = "0.5.9"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "581e062ae878cc087d3d0948670d46b16589df0790bf814524b0587a359f2ada"; + sha256 = "sha256-MLZCoypbZxFhq++ejsNjUvLniiTOhJBU7axpRti53cY="; }; propagatedBuildInputs = [ agate sqlalchemy ]; - checkInputs = [ crate geojson pytestCheckHook ]; + nativeCheckInputs = [ crate geojson pytestCheckHook ]; pythonImportsCheck = [ "agatesql" ]; diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index 29f580636480..4b5ac2011375 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -9,7 +9,7 @@ , lxml , nose , parsedatetime -, PyICU +, pyicu , python-slugify , pytimeparse , pythonOlder @@ -41,12 +41,12 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ cssselect glibcLocales lxml nose - PyICU + pyicu pytz ]; diff --git a/pkgs/development/python-modules/aggdraw/default.nix b/pkgs/development/python-modules/aggdraw/default.nix index 7c4326db6415..89b998bee683 100644 --- a/pkgs/development/python-modules/aggdraw/default.nix +++ b/pkgs/development/python-modules/aggdraw/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-w3HlnsHYB0R+HZOXtzygC2RST3gllPI7SYtwSCVXhTU="; }; - checkInputs = [ + nativeCheckInputs = [ numpy pillow pytest diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index ec0b4cfb570f..2e878b014cc2 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.25"; + version = "9.2.36"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-AXMqCNnN63sCi5IlichNQhgXKxONnue//8ECi77Gf8Q="; + hash = "sha256-PEX2SanglMqjtJHuH+gA5dnikh7qqLFiXbmrcIzs1+A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index b0629483d014..ad0a641c35f5 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -1,11 +1,11 @@ { lib , aiohttp , aresponses -, asynctest , buildPythonPackage , fetchFromGitHub , geojson , haversine +, mock , pytest-asyncio , pytestCheckHook , pythonOlder @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aio-geojson-client"; - version = "0.17"; + version = "0.18"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-client"; - rev = "v${version}"; - hash = "sha256-5GiQgtbvYeleovFbXO2vlr2XPsDIWZiElM64O+urMcY="; + rev = "refs/tags/v${version}"; + hash = "sha256-nvfy1XLiMjyCiQo/YuzRbDtxGmAUAiq8UJwS/SkN3oM="; }; propagatedBuildInputs = [ @@ -31,9 +31,9 @@ buildPythonPackage rec { haversine ]; - checkInputs = [ + nativeCheckInputs = [ aresponses - asynctest + mock pytest-asyncio pytestCheckHook ]; @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-client"; + changelog = "https://github.com/exxamalte/python-aio-geojson-client/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix index df13e8d7519a..9a302f5af088 100644 --- a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aio-geojson-generic-client"; - version = "0.1"; + version = "0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-generic-client"; - rev = "v${version}"; - hash = "sha256-6Gc3SRRQiISBZnCg7a+rCQHR4NQipBHmG5gWZZXIsxY="; + rev = "refs/tags/v${version}"; + hash = "sha256-toDvliFMxicaEhlxb7wCadDJErpsIPcZbJz7TpO83GE="; }; propagatedBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ aresponses asynctest pytest-asyncio @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for accessing GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-generic-client"; + changelog = "https://github.com/exxamalte/python-aio-geojson-generic-client/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; 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 f3076160f9c6..90645327c046 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aio-geojson-geonetnz-quakes"; - version = "0.14"; + version = "0.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-quakes"; - rev = "v${version}"; - hash = "sha256-T3vQodb0/3YEjsyHLSI8DBKK75J8hvsaBqyQI7GkT3U="; + rev = "refs/tags/v${version}"; + hash = "sha256-/EPPEGLtiZBorZMnVg0NqwnHCbCXyZzz4449MzAYQx8="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook @@ -42,7 +42,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing the GeoNet NZ Quakes GeoJSON feeds"; - homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-quakes"; + homepage = "https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes"; + changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; 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 3ba2b430801e..3b61a49a4e5f 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -2,7 +2,7 @@ , aio-geojson-client , aiohttp , aresponses -, asynctest +, mock , buildPythonPackage , fetchFromGitHub , pytest-asyncio @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aio-geojson-geonetnz-volcano"; - version = "0.7"; + version = "0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-volcano"; - rev = "v${version}"; - sha256 = "sha256-2iVUHMk4ydmGmmGS6lJV5pvxJHyP9bRSeh/dOXbquE0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-wJVFjy6QgYb6GX9pZTylYFvCRWmD2lAFZKnodsa8Yqo="; }; propagatedBuildInputs = [ @@ -31,9 +31,9 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ aresponses - asynctest + mock pytest-asyncio pytestCheckHook ]; @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing the GeoNet NZ Volcanic GeoJSON feeds"; homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-volcano"; + changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; 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 c790188ea269..b7c205179fd7 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 @@ -2,7 +2,6 @@ , aio-geojson-client , aiohttp , aresponses -, asynctest , buildPythonPackage , fetchFromGitHub , pytest-asyncio @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "aio-geojson-nsw-rfs-incidents"; - version = "0.5"; + version = "0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-nsw-rfs-incidents"; - rev = "v${version}"; - sha256 = "sha256-rWlt4MYnuY+CzszFVDniWBnqpQW3WldSEl00ns3ko3U="; + rev = "refs/tags/v${version}"; + hash = "sha256-pn0r5iLpNnK3xmAhq/oX90hdiHgFDuwDQqfAzkp5jmw="; }; propagatedBuildInputs = [ @@ -31,9 +30,8 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ aresponses - asynctest pytest-asyncio pytestCheckHook ]; @@ -45,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing the NSW Rural Fire Service incidents feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-nsw-rfs-incidents"; + changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix index 0fde28910415..728a666447d3 100644 --- a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aio-geojson-usgs-earthquakes"; - version = "0.1"; + version = "0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-usgs-earthquakes"; - rev = "v${version}"; - hash = "sha256-Hb0/BdK/jjxlPl9WJJpFdOCzZpZDCguXoGreGIyN8oo="; + rev = "refs/tags/v${version}"; + hash = "sha256-ET8wcOep4tSZJXyL+XvfW2j9eKp6LrBk/g18ZlgLIzc="; }; propagatedBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ aresponses asynctest pytest-asyncio @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing the U.S. Geological Survey Earthquake Hazards Program feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-usgs-earthquakes"; + changelog = "https://github.com/exxamalte/python-aio-geojson-usgs-earthquakes/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aio-georss-client/default.nix b/pkgs/development/python-modules/aio-georss-client/default.nix index f62c8b1bcfb7..6fb1ec42631b 100644 --- a/pkgs/development/python-modules/aio-georss-client/default.nix +++ b/pkgs/development/python-modules/aio-georss-client/default.nix @@ -1,11 +1,11 @@ { lib , aiohttp , aresponses -, asynctest , buildPythonPackage , dateparser , fetchFromGitHub , haversine +, mock , pytest-asyncio , pytestCheckHook , pythonOlder @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aio-georss-client"; - version = "0.10"; + version = "0.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-georss-client"; - rev = "v${version}"; - sha256 = "sha256-g/BlRRBImJihVlAfSMsPIPV0GJns0/pStF8TKSxpDI4="; + rev = "refs/tags/v${version}"; + hash = "sha256-Voc1ME0iGQCMaDfBXDSVnRp8olvId+fLhH8sqHwB2Ak="; }; propagatedBuildInputs = [ @@ -35,9 +35,9 @@ buildPythonPackage rec { dateparser ]; - checkInputs = [ + nativeCheckInputs = [ aresponses - asynctest + mock pytest-asyncio pytestCheckHook ]; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for accessing GeoRSS feeds"; homepage = "https://github.com/exxamalte/python-aio-georss-client"; + changelog = "https://github.com/exxamalte/python-aio-georss-client/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aio-georss-gdacs/default.nix b/pkgs/development/python-modules/aio-georss-gdacs/default.nix index 96e105fab213..3816b591544d 100644 --- a/pkgs/development/python-modules/aio-georss-gdacs/default.nix +++ b/pkgs/development/python-modules/aio-georss-gdacs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aio-georss-gdacs"; - version = "0.7"; + version = "0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-georss-gdacs"; - rev = "v${version}"; - sha256 = "sha256-6z0l0PcFTQgOBj8cBgBMPJIqWG53u7h4WbYkBqU4FNE="; + rev = "refs/tags/v${version}"; + hash = "sha256-1mpOWd4Z2gTQtRewWfZsfEtmS6i5uMPAMTlC8UpawxM="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { dateparser ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for accessing GeoRSS feeds"; homepage = "https://github.com/exxamalte/python-aio-georss-gdacs"; + changelog = "https://github.com/exxamalte/python-aio-georss-gdacs/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix new file mode 100644 index 000000000000..fddabeccd6a1 --- /dev/null +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, aiormq +, yarl +, aiomisc +, shortuuid +}: + +buildPythonPackage rec { + pname = "aio-pika"; + version = "8.3.0"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mosquito"; + repo = pname; + rev = version; + sha256 = "CYfj6V/91J7JA8YSctG/FkSHRkwyLKxr27eREbA+MtQ="; + }; + + propagatedBuildInputs = [ + aiormq + yarl + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + checkInputs = [ + aiomisc + shortuuid + ]; + # Tests attempt to connect to a RabbitMQ server + disabledTestPaths = [ + "tests/test_amqp.py" + "tests/test_amqp_robust.py" + "tests/test_amqp_robust_proxy.py" + "tests/test_amqps.py" + "tests/test_master.py" + "tests/test_memory_leak.py" + "tests/test_rpc.py" + "tests/test_types.py" + ]; + pythonImportsCheck = [ "aio_pika" ]; + + meta = with lib; { + description = "AMQP 0.9 client designed for asyncio and humans"; + homepage = "https://github.com/mosquito/aio-pika"; + license = licenses.asl20; + maintainers = with maintainers; [ emilytrau ]; + }; +} diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 98bb7a8c7bc3..73f77b517a5c 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.5.1"; + version = "0.5.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-L2R4Qu72bvUjJyE/bBMeKufK/TAFw9u/oGowS1rCqP4="; + hash = "sha256-x4OtYUJjRDSDd0FzlbMf7syjUIVxKsqgEfRWS1wgvPo="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to control AirZone devices"; homepage = "https://github.com/Noltari/aioairzone"; + changelog = "https://github.com/Noltari/aioairzone/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioaladdinconnect/default.nix b/pkgs/development/python-modules/aioaladdinconnect/default.nix index f4ab5f9a4d5b..550c6d675e99 100644 --- a/pkgs/development/python-modules/aioaladdinconnect/default.nix +++ b/pkgs/development/python-modules/aioaladdinconnect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioaladdinconnect"; - version = "0.1.47"; + version = "0.1.55"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "AIOAladdinConnect"; inherit version; - hash = "sha256-1q5CX5vtdK+rNDE6GtIobuacv6dkHhRJ+kirbX62us8="; + hash = "sha256-Lyhv6JF+KuCiGz05EbXMEeXzVCI7ACsJmnEuAtDghYo="; }; propagatedBuildInputs = [ @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for controlling Genie garage doors connected to Aladdin Connect devices"; homepage = "https://github.com/mkmer/AIOAladdinConnect"; + changelog = "https://github.com/mkmer/AIOAladdinConnect/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix index 6a9ade641dbd..4d5c652db9be 100644 --- a/pkgs/development/python-modules/aioambient/default.nix +++ b/pkgs/development/python-modules/aioambient/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ aresponses asynctest pytest-aiohttp diff --git a/pkgs/development/python-modules/aioasuswrt/default.nix b/pkgs/development/python-modules/aioasuswrt/default.nix index c2a8bded2b6b..00d451a2b422 100644 --- a/pkgs/development/python-modules/aioasuswrt/default.nix +++ b/pkgs/development/python-modules/aioasuswrt/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { asyncssh ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/aiobiketrax/default.nix b/pkgs/development/python-modules/aiobiketrax/default.nix index e795a1758de7..f1196c0ce83d 100644 --- a/pkgs/development/python-modules/aiobiketrax/default.nix +++ b/pkgs/development/python-modules/aiobiketrax/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiobiketrax"; - version = "0.4.0"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "basilfx"; repo = pname; rev = "v${version}"; - hash = "sha256-P8BExzL22rRj1IFPpojKR8ITdVq0RF8e3qLgb+H1PzE="; + hash = "sha256-exxpJJA+JnVuehCnWs/ihk/SSPUqV7ODXZxvbmuHe8U="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { pyjwt ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for interacting with the PowUnity BikeTrax GPS tracker"; homepage = "https://github.com/basilfx/aiobiketrax"; + changelog = "https://github.com/basilfx/aiobiketrax/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioblescan/default.nix b/pkgs/development/python-modules/aioblescan/default.nix index 462a4088f660..312dcd20ee90 100644 --- a/pkgs/development/python-modules/aioblescan/default.nix +++ b/pkgs/development/python-modules/aioblescan/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioblescan"; - version = "0.2.13"; + version = "0.2.14"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,11 +15,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frawau"; repo = pname; - rev = version; - hash = "sha256-n1FiBsuVpVJrIq6+kuMNugpEaUOFQ/Gk/QU7Hry4YrU="; + rev = "refs/tags/${version}"; + hash = "sha256-JeA9jX566OSRiejdnlifbcNGm0J0C+xzA6zXDUyZ6jc="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to listen for BLE advertized packets"; homepage = "https://github.com/frawau/aioblescan"; + changelog = "https://github.com/frawau/aioblescan/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 6bc62a3854d3..42c366278f7a 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -1,39 +1,88 @@ { lib +, aiohttp +, aioitertools +, botocore , buildPythonPackage -, fetchPypi +, dill +, fetchFromGitHub +, moto +, pytest-asyncio +, pytestCheckHook , pythonOlder , wrapt -, aioitertools -, aiohttp -, botocore }: buildPythonPackage rec { pname = "aiobotocore"; - version = "2.4.0"; + version = "2.4.2"; + format = "setuptools"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-+f4GmMxJeGG9tUzRYWHIBAMfdYralIDDVUDyDAwHg4U="; + src = fetchFromGitHub { + owner = "aio-libs"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-IHVplle73JVLbz9R9uPyleL9Occ723EE9Ogl059TcPg="; }; - # relax version constraints: aiobotocore works with newer botocore versions + # Relax version constraints: aiobotocore works with newer botocore versions # the pinning used to match some `extras_require` we're not using. postPatch = '' sed -i "s/'botocore>=.*'/'botocore'/" setup.py ''; - propagatedBuildInputs = [ wrapt aiohttp aioitertools botocore ]; + propagatedBuildInputs = [ + aiohttp + aioitertools + botocore + wrapt + ]; - # tests not distributed on pypi - doCheck = false; - pythonImportsCheck = [ "aiobotocore" ]; + nativeCheckInputs = [ + dill + moto + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiobotocore" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/boto_tests/test_signers.py" + "tests/python3.8/" + "tests/test_basic_s3.py" + "tests/test_batch.py" + "tests/test_dynamodb.py" + "tests/test_ec2.py" + "tests/test_eventstreams.py" + "tests/test_lambda.py" + "tests/test_monitor.py" + "tests/test_mturk.py" + "tests/test_patches.py" + "tests/test_sns.py" + "tests/test_sqs.py" + "tests/test_version.py" + "tests/test_waiter.py" + ]; + + disabledTests = [ + "test_get_credential" + "test_load_sso_credentials_without_cache" + "test_load_sso_credentials" + "test_required_config_not_set" + "test_sso_cred_fetcher_raises_helpful_message_on_unauthorized_exception" + "test_sso_credential_fetcher_can_fetch_credentials" + ]; meta = with lib; { description = "Python client for amazon services"; - license = licenses.asl20; homepage = "https://github.com/aio-libs/aiobotocore"; + changelog = "https://github.com/aio-libs/aiobotocore/releases/tag/${version}"; + license = licenses.asl20; maintainers = with maintainers; [ teh ]; }; } diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix index db9cb191c9cf..bf6070ad1cf8 100644 --- a/pkgs/development/python-modules/aiocoap/default.nix +++ b/pkgs/development/python-modules/aiocoap/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiocoap"; - version = "0.4.4"; + version = "0.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,15 +16,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chrysn"; repo = pname; - rev = version; - sha256 = "sha256-m/tU1qf+CB9/2eoXktpBSgwjj8lMuMQ/WGYL6HhMNxA="; + rev = "refs/tags/${version}"; + hash = "sha256-t2yfWWfkJmOr14XdLsIV48HMgVRaEnUO4IG2jQHbKWA="; }; propagatedBuildInputs = [ pygments ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python CoAP library"; homepage = "https://aiocoap.readthedocs.io/"; + changelog = "https://github.com/chrysn/aiocoap/blob/${version}/NEWS"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index d32a37c6a7d3..23fab5398d63 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { sha256 = "sha256-PSXYXIWb2zTVC6kwMgkDovF+BVtEnqQh8NFPb96tFRY="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/pkgs/development/python-modules/aiocontextvars/default.nix index dc70baab9e5c..256a69338e1b 100644 --- a/pkgs/development/python-modules/aiocontextvars/default.nix +++ b/pkgs/development/python-modules/aiocontextvars/default.nix @@ -2,17 +2,16 @@ , buildPythonPackage , fetchFromGitHub , pytest-runner -, pytest +, pytestCheckHook , pytest-asyncio -, contextvars , sqlalchemy , isPy27 -, pythonOlder }: buildPythonPackage rec { pname = "aiocontextvars"; version = "0.2.2"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { @@ -26,18 +25,14 @@ buildPythonPackage rec { pytest-runner ]; - checkInputs = [ - pytest - pytest-asyncio - ]; - propagatedBuildInputs = [ sqlalchemy - ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ]; + ]; - checkPhase = '' - pytest - ''; + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; meta = with lib; { description = "Asyncio support for PEP-567 contextvars backport"; diff --git a/pkgs/development/python-modules/aiocron/default.nix b/pkgs/development/python-modules/aiocron/default.nix index 56f3561d84f3..d7fee0d0a34d 100644 --- a/pkgs/development/python-modules/aiocron/default.nix +++ b/pkgs/development/python-modules/aiocron/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { tzlocal ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook tzlocal ]; diff --git a/pkgs/development/python-modules/aiocsv/default.nix b/pkgs/development/python-modules/aiocsv/default.nix index 5479d94f0395..50002735d656 100644 --- a/pkgs/development/python-modules/aiocsv/default.nix +++ b/pkgs/development/python-modules/aiocsv/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { cython ]; - checkInputs = [ + nativeCheckInputs = [ aiofiles pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/aiocurrencylayer/default.nix b/pkgs/development/python-modules/aiocurrencylayer/default.nix index 4c853d7d3a39..80144877e141 100644 --- a/pkgs/development/python-modules/aiocurrencylayer/default.nix +++ b/pkgs/development/python-modules/aiocurrencylayer/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { httpx ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-httpx pytestCheckHook diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index 616011925967..b5b46190fee2 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { --replace "pyroute2>=0.5.18,!=0.6.1" "pyroute2" ''; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aioeafm/default.nix b/pkgs/development/python-modules/aioeafm/default.nix index d8b8c11cef99..f1535eb07d90 100644 --- a/pkgs/development/python-modules/aioeafm/default.nix +++ b/pkgs/development/python-modules/aioeafm/default.nix @@ -2,7 +2,8 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, poetry +, fetchpatch +, poetry-core , pytest-aiohttp , pytest-asyncio , pytest-cov @@ -21,11 +22,19 @@ buildPythonPackage rec { sha256 = "048cxn3fw2hynp27zlizq7k8ps67qq9sib1ddgirnxy5zc87vgkc"; }; - nativeBuildInputs = [ poetry ]; + patches = [ + (fetchpatch { + name = "use-poetry-core.patch"; + url = "https://github.com/Jc2k/aioeafm/commit/549590e2ed465be40e2406416d89b8a8cd8c6185.patch"; + hash = "sha256-cG/vQI1XQO8LVvWsHrAj8KlPGRulvO7Ny+k0CKUpPqQ="; + }) + ]; + + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytest-asyncio pytest-cov diff --git a/pkgs/development/python-modules/aioecowitt/default.nix b/pkgs/development/python-modules/aioecowitt/default.nix index a099bf7d7d0a..4a5abb7fe94e 100644 --- a/pkgs/development/python-modules/aioecowitt/default.nix +++ b/pkgs/development/python-modules/aioecowitt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aioecowitt"; - version = "2022.09.3"; + version = "2023.01.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-aYnRHr4YrYmO3a1V8HFac1T37WIC0Abp3Dhy9vDrQfE="; + hash = "sha256-xOoKrGBkMEdpeiU1r27xlZp5s5sGJzvD7Ats+w6KR/o="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { meteocalc ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aioemonitor/default.nix b/pkgs/development/python-modules/aioemonitor/default.nix index e78cb83b3f4c..88ae374e5d42 100644 --- a/pkgs/development/python-modules/aioemonitor/default.nix +++ b/pkgs/development/python-modules/aioemonitor/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytest-raises diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 87db5ad026a7..82cdb3733bb5 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 = "11.5.0"; + version = "13.1.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-z3ILdtxDU4xLBY5mVAKal2nBo2sdO5rlSQDyexwHUtI="; + hash = "sha256-slPYf7H8vwgSlqm7H7JnJnU17nL2Hwg9hHO0le33IqU="; }; postPatch = '' @@ -35,7 +35,7 @@ buildPythonPackage rec { zeroconf ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Client for ESPHome native API"; homepage = "https://github.com/esphome/aioesphomeapi"; + changelog = "https://github.com/esphome/aioesphomeapi/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab hexa ]; }; diff --git a/pkgs/development/python-modules/aioextensions/default.nix b/pkgs/development/python-modules/aioextensions/default.nix index cc1ebe3f6178..b5508d8d7434 100644 --- a/pkgs/development/python-modules/aioextensions/default.nix +++ b/pkgs/development/python-modules/aioextensions/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ uvloop ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' cd test/ pytest diff --git a/pkgs/development/python-modules/aiofile/default.nix b/pkgs/development/python-modules/aiofile/default.nix index 74336a22e01f..a2c4eaf5ff8e 100644 --- a/pkgs/development/python-modules/aiofile/default.nix +++ b/pkgs/development/python-modules/aiofile/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { caio ]; - checkInputs = [ + nativeCheckInputs = [ aiomisc asynctest pytestCheckHook diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index ef59dd6fa530..4b805b5b1d4c 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aioflo/default.nix b/pkgs/development/python-modules/aioflo/default.nix index 70b41a0af310..52649e960307 100644 --- a/pkgs/development/python-modules/aioflo/default.nix +++ b/pkgs/development/python-modules/aioflo/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-aiohttp pytest-asyncio diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index 37f8d9fa3353..224877efb93d 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { siosocks ]; - checkInputs = [ + nativeCheckInputs = [ async-timeout pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix index 051913ccce56..099ea8664dc1 100644 --- a/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/pkgs/development/python-modules/aiogithubapi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiogithubapi"; - version = "22.10.1"; + version = "22.12.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; repo = pname; - rev = version; - hash = "sha256-ceBuqaMqqL6qwN52765MG4sLt+08hx2G9rUVNC7x6ik="; + rev = "refs/tags/${version}"; + hash = "sha256-j7ikJS6lcqr7K4fU/EL43lFlWtGvPT4V9JC2Iqhi0ec="; }; postPatch = '' @@ -43,7 +43,7 @@ buildPythonPackage rec { backoff ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for the GitHub API"; homepage = "https://github.com/ludeeus/aiogithubapi"; + changelog = "https://github.com/ludeeus/aiogithubapi/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index aa5b31972221..fcbe12a11db7 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { voluptuous ]; - checkInputs = [ + nativeCheckInputs = [ asyncio-dgram asynctest pytest-aiohttp diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 18bbaff15da6..e29f22ba3c99 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "2.3.0"; + version = "2.4.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-dX3yz7b3fejLFtlk5CKBQzk+o9FpLtxyZYt5SaybBJM="; + hash = "sha256-a7i8xBlTM3DZDZBzLe/sbMR4CNx7XMxNQ6tiMI6MoTg="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; @@ -69,6 +69,7 @@ buildPythonPackage rec { Homekit accessories. ''; homepage = "https://github.com/Jc2k/aiohomekit"; + changelog = "https://github.com/Jc2k/aiohomekit/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiohttp-apispec/default.nix b/pkgs/development/python-modules/aiohttp-apispec/default.nix index df8c1fffdb91..ea908ff54414 100644 --- a/pkgs/development/python-modules/aiohttp-apispec/default.nix +++ b/pkgs/development/python-modules/aiohttp-apispec/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { webargs ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 3e3148fce7c2..8e062db87e6d 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { jinja2 ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiohttp-oauthlib/default.nix b/pkgs/development/python-modules/aiohttp-oauthlib/default.nix new file mode 100644 index 000000000000..92981ea952c7 --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-oauthlib/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, oauthlib +, aiohttp +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "aiohttp-oauthlib"; + version = "0.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-iTzRpZ3dDC5OmA46VE+XELfE/7nie0zQOLUf4dcDk7c="; + }; + + propagatedBuildInputs = [ + oauthlib + aiohttp + ]; + + nativeBuildInputs = [ + setuptools-scm + ]; + + # Package has no tests. + doCheck = false; + + meta = with lib; { + homepage = "https://git.sr.ht/~whynothugo/aiohttp-oauthlib"; + description = "oauthlib integration for aiohttp clients"; + license = licenses.isc; + maintainers = with maintainers; [ sumnerevans ]; + }; +} diff --git a/pkgs/development/python-modules/aiohttp-openmetrics/default.nix b/pkgs/development/python-modules/aiohttp-openmetrics/default.nix new file mode 100644 index 000000000000..ed6568ac7b34 --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-openmetrics/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, prometheus-client +}: + +buildPythonPackage rec { + pname = "aiohttp-openmetrics"; + version = "0.0.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-GIVUkjyn+iQSMZZ6dNmmimvbt+t+uxOYv2QEDk/dA+g="; + }; + + propagatedBuildInputs = [ + aiohttp + prometheus-client + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "aiohttp_openmetrics" ]; + + meta = with lib; { + description = "OpenMetrics provider for aiohttp"; + homepage = "https://github.com/jelmer/aiohttp-openmetrics/"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index 4b150b9edeae..ae0cbf998417 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiohttp-retry/default.nix b/pkgs/development/python-modules/aiohttp-retry/default.nix index 0cf747e70ba0..bf3c251b4fb8 100644 --- a/pkgs/development/python-modules/aiohttp-retry/default.nix +++ b/pkgs/development/python-modules/aiohttp-retry/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiohttp-swagger/default.nix b/pkgs/development/python-modules/aiohttp-swagger/default.nix index a8e3499ee584..19c822acf1a7 100644 --- a/pkgs/development/python-modules/aiohttp-swagger/default.nix +++ b/pkgs/development/python-modules/aiohttp-swagger/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-aiohttp ]; diff --git a/pkgs/development/python-modules/aiohttp-wsgi/default.nix b/pkgs/development/python-modules/aiohttp-wsgi/default.nix index 1f01a7b57e5a..a3b8334b9923 100644 --- a/pkgs/development/python-modules/aiohttp-wsgi/default.nix +++ b/pkgs/development/python-modules/aiohttp-wsgi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 9a6f14f765e5..2b912f9622e4 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -30,6 +30,8 @@ buildPythonPackage rec { pname = "aiohttp"; version = "3.8.3"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { @@ -39,6 +41,9 @@ buildPythonPackage rec { postPatch = '' sed -i '/--cov/d' setup.cfg + + substituteInPlace setup.cfg \ + --replace "charset-normalizer >=2.0, < 3.0" "charset-normalizer >=2.0, < 4.0" ''; propagatedBuildInputs = [ @@ -60,7 +65,7 @@ buildPythonPackage rec { idna-ssl ]; - checkInputs = [ + nativeCheckInputs = [ async_generator freezegun gunicorn diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 657ebc1aa9a1..f4248a27ddde 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiohue"; - version = "4.5.0"; + version = "4.6.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; - rev = version; - hash = "sha256-Lcs+Ieh5TEUE+sHqFAZr9rsAZMsI9t2/w87r36IUa1A="; + rev = "refs/tags/${version}"; + hash = "sha256-ATM4s2W1Gw98TysfqHVA/McerZStHaUK5eMrSU9+uOI="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { asyncio-throttle ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to talk to Philips Hue"; homepage = "https://github.com/home-assistant-libs/aiohue"; + changelog = "https://github.com/home-assistant-libs/aiohue/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix index 6936ac4ac448..b577abf37c8d 100644 --- a/pkgs/development/python-modules/aioimaplib/default.nix +++ b/pkgs/development/python-modules/aioimaplib/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { hash = "sha256-7Ta0BhtQSm228vvUa5z+pzM3UC7+BskgBNjxsbEb9P0="; }; - checkInputs = [ + nativeCheckInputs = [ asynctest docutils imaplib2 diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index e5544df68ee1..6fdc7dfd4d62 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index 0ae7c3e8a06c..320593f79370 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -1,36 +1,43 @@ { lib +, aiohttp +, async-timeout , buildPythonPackage , fetchFromGitHub -, pythonOlder -, aiohttp -, pytestCheckHook , pytest-aiohttp -, pygments +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aiojobs"; - version = "1.0.0"; - format = "flit"; + version = "1.1.0"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = "v${version}"; - sha256 = "EQwD0b2B9qFVd/8thKInaio0hpPzvVIjvCN0TcARu2w="; + rev = "refs/tags/v${version}"; + hash = "sha256-FHdEVt/XXmuTrPAETyod3fHJIK1wg957/+QMAhZG1xk="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=aiojobs/ --cov=tests/" "" + ''; + nativeBuildInputs = [ - pygments + setuptools ]; propagatedBuildInputs = [ aiohttp + async-timeout ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-aiohttp ]; @@ -42,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Jobs scheduler for managing background task (asyncio)"; homepage = "https://github.com/aio-libs/aiojobs"; + changelog = "https://github.com/aio-libs/aiojobs/blob/v${version}/CHANGES.rst"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai ]; }; diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix index c853b1d25a35..03957073c149 100644 --- a/pkgs/development/python-modules/aiokafka/default.nix +++ b/pkgs/development/python-modules/aiokafka/default.nix @@ -1,23 +1,30 @@ { lib +, async-timeout , buildPythonPackage -, fetchFromGitHub -, pythonOlder -, dataclasses -, kafka-python , cython +, fetchFromGitHub +, gssapi +, kafka-python +, lz4 +, packaging +, python-snappy +, pythonOlder , zlib +, zstandard }: buildPythonPackage rec { pname = "aiokafka"; - version = "0.7.2"; - disabled = pythonOlder "3.6"; + version = "0.8.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-D+91k4zVg28qPbWIrvyXi6WtDs1jeJt9jFGsrSBA3cs="; + rev = "refs/tags/v${version}"; + hash = "sha256-g7xUB5RfjG4G7J9Upj3KXKSePa+VDit1Zf8pWHfui1o="; }; nativeBuildInputs = [ @@ -29,20 +36,38 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + async-timeout kafka-python - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses + packaging ]; - # checks require running kafka server + passthru.optional-dependencies = { + snappy = [ + python-snappy + ]; + lz4 = [ + lz4 + ]; + zstd = [ + zstandard + ]; + gssapi = [ + gssapi + ]; + }; + + # Checks require running Kafka server doCheck = false; - pythonImportsCheck = [ "aiokafka" ]; + pythonImportsCheck = [ + "aiokafka" + ]; meta = with lib; { description = "Kafka integration with asyncio"; homepage = "https://aiokafka.readthedocs.org"; + changelog = "https://github.com/aio-libs/aiokafka/releases/tag/v${version}"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/aiokef/default.nix b/pkgs/development/python-modules/aiokef/default.nix index c153ff37d8c2..b2858b5b835c 100644 --- a/pkgs/development/python-modules/aiokef/default.nix +++ b/pkgs/development/python-modules/aiokef/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { tenacity ]; - checkInputs = [ + nativeCheckInputs = [ pytest-cov pytest-mypy pytestCheckHook diff --git a/pkgs/development/python-modules/aiolifx-effects/default.nix b/pkgs/development/python-modules/aiolifx-effects/default.nix index 71df3079b797..0b260340ec64 100644 --- a/pkgs/development/python-modules/aiolifx-effects/default.nix +++ b/pkgs/development/python-modules/aiolifx-effects/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aiolifx-effects"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "aiolifx_effects"; - hash = "sha256-6mFsQMrsEMhO9drsMMRhv8QY+eDPuskpJyazx3vG7Ko="; + hash = "sha256-yh0Nv1r5a5l6unn9qnLjSqct/ZzUuPT6cNebVDMMfUw="; }; propagatedBuildInputs = [ @@ -30,6 +30,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/amelchio/aiolifx_effects/releases/tag/v${version}"; description = "Light effects (pulse, colorloop ...) for LIFX lights running on aiolifx"; homepage = "https://github.com/amelchio/aiolifx_effects"; license = licenses.mit; diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 4aeec041c043..5f6612e409af 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.2.0"; + version = "0.4.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Djelibeybi"; repo = "aiolifx-themes"; - rev = "v${version}"; - hash = "sha256:17498vdg8i20hk4i8hzc67qaj206ik3s1zn1k70plsjr9zlgs6vz"; + rev = "refs/tags/v${version}"; + hash = "sha256-ND+0jukCU3jB34Sf4qAZg/+pyXVCoIoMqOoBW7srCSQ="; }; prePatch = '' @@ -39,7 +39,7 @@ buildPythonPackage rec { aiolifx ]; - checkInputs = [ + nativeCheckInputs = [ async-timeout pytestCheckHook pytest-asyncio @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Color themes for LIFX lights running on aiolifx"; homepage = "https://github.com/Djelibeybi/aiolifx-themes"; + changelog = "https://github.com/Djelibeybi/aiolifx-themes/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ lukegb ]; }; diff --git a/pkgs/development/python-modules/aiolimiter/default.nix b/pkgs/development/python-modules/aiolimiter/default.nix index 9f8f81e2fca8..04a2c6c46be0 100644 --- a/pkgs/development/python-modules/aiolimiter/default.nix +++ b/pkgs/development/python-modules/aiolimiter/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook toml diff --git a/pkgs/development/python-modules/aiolip/default.nix b/pkgs/development/python-modules/aiolip/default.nix index 80e110cbd8f0..a3d773cf04f2 100644 --- a/pkgs/development/python-modules/aiolip/default.nix +++ b/pkgs/development/python-modules/aiolip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1bgmcl8q1p6f2xm3w2qylvla6vf6bd1p2hfwj4l8w6w0w04vr02g"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiolivisi/default.nix b/pkgs/development/python-modules/aiolivisi/default.nix new file mode 100644 index 000000000000..05404b9ac777 --- /dev/null +++ b/pkgs/development/python-modules/aiolivisi/default.nix @@ -0,0 +1,49 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, pydantic +, pytestCheckHook +, pythonOlder +, websockets +}: + +buildPythonPackage rec { + pname = "aiolivisi"; + version = "0.0.15"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-qRIdIptvlSyxFYfi7ZFeoZKjnVPzdDW9rBr+DjUsDXc="; + }; + + postPatch = '' + # https://github.com/StefanIacobLivisi/aiolivisi/pull/3 + substituteInPlace setup.py \ + --replace 'REQUIREMENTS = list(val.strip() for val in open("requirements.txt"))' "" \ + --replace "REQUIREMENTS," "[]," + ''; + + propagatedBuildInputs = [ + aiohttp + pydantic + websockets + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "aiolivisi" + ]; + + meta = with lib; { + description = "Module to communicate with LIVISI Smart Home Controller"; + homepage = "https://github.com/StefanIacobLivisi/aiolivisi"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix index f0b5e145d8ba..75a6b0715d20 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.1.1"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,15 +19,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ANMalko"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-xFxkhKM/lX/kSg709wID7HlkfNKDlOcL3STUZOrHZJ8="; + rev = "refs/tags/v${version}"; + hash = "sha256-G3/lUgV60CMLskUo83TlvLLIfJtu5DEz+94mdVI4OrI="; }; propagatedBuildInputs = [ aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ faker pytest-aiohttp pytest-mock @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for interacting with LOOKin devices"; homepage = "https://github.com/ANMalko/aiolookin"; + changelog = "https://github.com/ANMalko/aiolookin/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiolyric/default.nix b/pkgs/development/python-modules/aiolyric/default.nix index 855748f665cf..ba0b17a5eb58 100644 --- a/pkgs/development/python-modules/aiolyric/default.nix +++ b/pkgs/development/python-modules/aiolyric/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "timmo001"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-yKeG0UCQ8haT1hvywoIwKQ519GK2wFg0wXaRTFeKYIk="; }; @@ -24,7 +24,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for the Honeywell Lyric Platform"; homepage = "https://github.com/timmo001/aiolyric"; + changelog = "https://github.com/timmo001/aiolyric/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index d1fd33eb618e..b3a65926d6e8 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -8,7 +8,7 @@ , colorlog , croniter , fastapi -, fetchFromGitHub +, fetchPypi , logging-journald , pytestCheckHook , pythonOlder @@ -20,16 +20,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "16.2"; + version = "16.2.10"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "aiokitchen"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-wxm7MrFHZ7TrUGw5w7iLWs1olU8ZmJmJ7M/BZ6Nf0fU="; + src = fetchPypi { + inherit pname version; + hash = "sha256-iQlbd1DoPgxq+Am0BTDYXIBZoC21/54+bywDtcCXlls="; }; propagatedBuildInputs = [ @@ -37,7 +35,7 @@ buildPythonPackage rec { logging-journald ]; - checkInputs = [ + nativeCheckInputs = [ aiocontextvars async-timeout fastapi @@ -73,11 +71,14 @@ buildPythonPackage rec { "aiomisc" ]; - disabledTestPaths = [ - # Dependencies are not available at the moment - "tests/test_entrypoint.py" - "tests/test_raven_service.py" - ]; + # Upstream stopped tagging with 16.2 + doCheck = false; + + # disabledTestPaths = [ + # # Dependencies are not available at the moment + # "tests/test_entrypoint.py" + # "tests/test_raven_service.py" + # ]; meta = with lib; { description = "Miscellaneous utils for asyncio"; diff --git a/pkgs/development/python-modules/aiomodernforms/default.nix b/pkgs/development/python-modules/aiomodernforms/default.nix index ef3f86ad331d..bbf3190e57de 100644 --- a/pkgs/development/python-modules/aiomodernforms/default.nix +++ b/pkgs/development/python-modules/aiomodernforms/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/aiomultiprocess/default.nix b/pkgs/development/python-modules/aiomultiprocess/default.nix index 6403f396eaac..4fc0f7781f61 100644 --- a/pkgs/development/python-modules/aiomultiprocess/default.nix +++ b/pkgs/development/python-modules/aiomultiprocess/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "aiomultiprocess/tests/*.py" ]; diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix index 186765377c4f..51c43d5cf96a 100644 --- a/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/pkgs/development/python-modules/aiomusiccast/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "aiomusiccast"; - version = "0.14.5"; - + version = "0.14.7"; format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "vigonotion"; repo = "aiomusiccast"; rev = "refs/tags/${version}"; - hash = "sha256-YssBrG4sFtQtrzKU/O/tWEVL9eq8dpszejY/1So5Mec="; + hash = "sha256-6fHTZ5zFiXuyFtZj9cNH5ejLbzx/1cEBUy+fs+Q6O4Y="; }; postPatch = '' @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Companion library for musiccast devices intended for the Home Assistant integration"; homepage = "https://github.com/vigonotion/aiomusiccast"; + changelog = "https://github.com/vigonotion/aiomusiccast/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/aiomysensors/default.nix b/pkgs/development/python-modules/aiomysensors/default.nix index 23f26ca72b25..14c061a2fce6 100644 --- a/pkgs/development/python-modules/aiomysensors/default.nix +++ b/pkgs/development/python-modules/aiomysensors/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiomysensors"; - version = "0.3.3"; + version = "0.3.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MartinHjelmare"; repo = pname; - rev = "v${version}"; - hash = "sha256-VvGhFf9x257YdSmOxjztGZW9FLBNd028rH3+BvXAQ4o="; + rev = "refs/tags/v${version}"; + hash = "sha256-jVqOOQLu/vL0L5WWtfU2rL4gNhPX+9HvchBp29aw+qA="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { pyserial-asyncio ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aionanoleaf/default.nix b/pkgs/development/python-modules/aionanoleaf/default.nix index 40686bf7d113..e819431a4220 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.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "milanmeu"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-bz568DlodWtSu2WTTd/QMhdiX9IkllW7UYVXuNlKFaY="; + rev = "refs/tags/v${version}"; + hash = "sha256-f0TyXhuAzI0s0n6sXH9mKWA4nad2YchZkQ0+jw/Bmv0="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for the Nanoleaf API"; homepage = "https://github.com/milanmeu/aionanoleaf"; + changelog = "https://github.com/milanmeu/aionanoleaf/releases/tag/v${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aionotify/default.nix b/pkgs/development/python-modules/aionotify/default.nix index 13ae51d25227..0483793c7bb0 100644 --- a/pkgs/development/python-modules/aionotify/default.nix +++ b/pkgs/development/python-modules/aionotify/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { --replace "asyncio.wait_for(task, timeout, loop=self.loop)" "asyncio.wait_for(task, timeout)" ''; - checkInputs = [ + nativeCheckInputs = [ asynctest ]; diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix index 71fc39dead59..1de22b698c2a 100644 --- a/pkgs/development/python-modules/aionotion/default.nix +++ b/pkgs/development/python-modules/aionotion/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-aiohttp pytest-asyncio diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index 18b6ae78b6f2..740cb29ebcd5 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-aiohttp pytestCheckHook diff --git a/pkgs/development/python-modules/aiopurpleair/default.nix b/pkgs/development/python-modules/aiopurpleair/default.nix new file mode 100644 index 000000000000..5f74bc55cbd1 --- /dev/null +++ b/pkgs/development/python-modules/aiopurpleair/default.nix @@ -0,0 +1,65 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pydantic +, pytest-aiohttp +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiopurpleair"; + version = "2022.12.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-YmJH4brWkTpgzyHwu9UnIWrY5qlDCmMtvF+KxQFXwfk="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pydantic = "^1.10.2"' 'pydantic = "*"' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + pydantic + ]; + + nativeCheckInputs = [ + aresponses + pytest-aiohttp + pytest-asyncio + pytestCheckHook + ]; + + disabledTestPaths = [ + # Ignore the examples directory as the files are prefixed with test_. + "examples/" + ]; + + pythonImportsCheck = [ + "aiopurpleair" + ]; + + meta = with lib; { + description = "Python library for interacting with the PurpleAir API"; + homepage = "https://github.com/bachya/aiopurpleair"; + changelog = "https://github.com/bachya/aiopurpleair/releases/tag/${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiopvapi/default.nix b/pkgs/development/python-modules/aiopvapi/default.nix index cfd3e709cb53..055239052ddb 100644 --- a/pkgs/development/python-modules/aiopvapi/default.nix +++ b/pkgs/development/python-modules/aiopvapi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { async-timeout ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix index 032bf995a7d4..0f44a49a3979 100644 --- a/pkgs/development/python-modules/aiopvpc/default.nix +++ b/pkgs/development/python-modules/aiopvpc/default.nix @@ -4,18 +4,17 @@ , backports-zoneinfo , buildPythonPackage , fetchFromGitHub -, holidays , poetry-core , pytest-asyncio , pytest-timeout , pytestCheckHook , pythonOlder -, tzdata +, python-dotenv }: buildPythonPackage rec { pname = "aiopvpc"; - version = "3.0.0"; + version = "4.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,39 +22,33 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "azogue"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-eTCQddoZIaCs7iKGNBC8aSq6ek4vwYXgIXx35UlME/k="; + rev = "refs/tags/v${version}"; + hash = "sha256-E5z74/5VuFuOyAfeT4PQlHUNOiVT4sPgOdxoAIIymxU="; }; + postPatch = '' + substituteInPlace pyproject.toml --replace \ + " --cov --cov-report term --cov-report html" "" + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp - holidays - tzdata async-timeout ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-timeout pytestCheckHook + python-dotenv ]; - 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" "" - ''; - pythonImportsCheck = [ "aiopvpc" ]; @@ -63,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to download Spanish electricity hourly prices (PVPC)"; homepage = "https://github.com/azogue/aiopvpc"; + changelog = "https://github.com/azogue/aiopvpc/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiopyarr/default.nix b/pkgs/development/python-modules/aiopyarr/default.nix index 139f947fa129..c728da8b5528 100644 --- a/pkgs/development/python-modules/aiopyarr/default.nix +++ b/pkgs/development/python-modules/aiopyarr/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { orjson ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix index c2c4b23d951a..e0a2b51a75d9 100644 --- a/pkgs/development/python-modules/aioqsw/default.nix +++ b/pkgs/development/python-modules/aioqsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioqsw"; - version = "0.2.2"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-icrgLPn2Nr5rKJ2YzLLL8rhHoTK+ecNyhGd3glOc7tM="; + hash = "sha256-8WfQTaa9BiMHDLxCZNqcFmi0ifEC2xgyN2cDBBtBDdI="; }; propagatedBuildInputs = [ @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to fetch data from QNAP QSW switches"; homepage = "https://github.com/Noltari/aioqsw"; + changelog = "https://github.com/Noltari/aioqsw/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioquic/default.nix b/pkgs/development/python-modules/aioquic/default.nix index 9ea35ea2d668..1b8dbb995e9f 100644 --- a/pkgs/development/python-modules/aioquic/default.nix +++ b/pkgs/development/python-modules/aioquic/default.nix @@ -1,5 +1,6 @@ { lib , fetchPypi +, fetchpatch , buildPythonPackage , openssl , pylsqpack @@ -17,6 +18,19 @@ buildPythonPackage rec { sha256 = "sha256-7ENqqs6Ze4RrAeUgDtv34+VrkYJqFE77l0j9jd0zK74="; }; + patches = [ + # This patch is here because it's required by the next patch. + (fetchpatch { + url = "https://github.com/aiortc/aioquic/commit/3930580b50831a034d21ee4689362188b21a4d6a.patch"; + hash = "sha256-XjhyajDawN/G1nPtkMbNe66iJCo76UpdA7PqwtxO5ag="; + }) + # https://github.com/aiortc/aioquic/pull/349, fixes test failure due pyopenssl==22 + (assert lib.versions.major pyopenssl.version == "22"; fetchpatch { + url = "https://github.com/aiortc/aioquic/commit/c3b72be85868d67ee32d49ab9bd98a4357cbcde9.patch"; + hash = "sha256-AjW+U9DpNXgA5yqKkWnx0OYpY2sZR9KIdQ3pSzxU+uY="; + }) + ]; + propagatedBuildInputs = [ certifi pylsqpack @@ -25,7 +39,7 @@ buildPythonPackage rec { buildInputs = [ openssl ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "aioquic" ]; diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix index 71a2f8d6f1f9..7da03f051f28 100644 --- a/pkgs/development/python-modules/aiorecollect/default.nix +++ b/pkgs/development/python-modules/aiorecollect/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses freezegun pytest-asyncio diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index 3c2a0e48d329..a5936a6a9b0f 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aioresponses"; - version = "0.7.3"; + version = "0.7.4"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LGTtVxDujLTpWMVpGE2tEvTJzVk5E1yzj4jGqCYczrM="; + sha256 = "sha256-m4wQizY1TARjO60Op1K1XZVqdgL+PjI0uTn8RK+W8dg="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ asynctest ddt pytestCheckHook diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix index 1f817b54b396..47d66af0b203 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 = "2022.11.0"; + version = "2023.01.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-KxT3Se27b+XoTETXCljOVGVmEuXcpYxOhIBs1xAdtZ8="; + hash = "sha256-enNYzU65QBT/ryCUNwB08U+QiFvVb03fbYzZ5Qk6GTk="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { titlecase ]; - checkInputs = [ + nativeCheckInputs = [ aresponses freezegun pytest-aiohttp @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with Ridwell waste recycling"; homepage = "https://github.com/bachya/aioridwell"; + changelog = "https://github.com/bachya/aioridwell/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiormq/default.nix b/pkgs/development/python-modules/aiormq/default.nix new file mode 100644 index 000000000000..747f38026686 --- /dev/null +++ b/pkgs/development/python-modules/aiormq/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, pamqp +, yarl +, setuptools +, poetry-core +, aiomisc +}: + +buildPythonPackage rec { + pname = "aiormq"; + version = "6.6.4"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mosquito"; + repo = pname; + rev = version; + sha256 = "+zTSaQzBoIHDUQgOpD6xvoruFFHZBb0z5D6uAUo0W5A="; + }; + + nativeBuildInputs = [ + setuptools + poetry-core + ]; + + propagatedBuildInputs = [ + pamqp + yarl + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + checkInputs = [ + aiomisc + ]; + # Tests attempt to connect to a RabbitMQ server + disabledTestPaths = [ + "tests/test_channel.py" + "tests/test_connection.py" + ]; + pythonImportsCheck = [ "aiormq" ]; + + meta = with lib; { + description = "AMQP 0.9.1 asynchronous client library"; + homepage = "https://github.com/mosquito/aiormq"; + license = licenses.asl20; + maintainers = with maintainers; [ emilytrau ]; + }; +} diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index 83ed397e47d0..1d55a3381c4e 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -1,8 +1,10 @@ { lib , aiohttp +, aioresponses , buildPythonPackage , click , fetchFromGitHub +, pydantic , poetry-core , pytestCheckHook , pythonOlder @@ -11,7 +13,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.3.1"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +22,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = pname; rev = "v${version}"; - hash = "sha256-DTFynPFf0NUBieXDiMKhCNwBqx3s/xzggNmnz/IKjbU="; + hash = "sha256-OOmcJB1o0cmAFj1n2obr0lxZxT5fYs2awftHQ6VMLUs="; }; nativeBuildInputs = [ @@ -30,10 +32,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp click + pydantic yarl ]; - checkInputs = [ + nativeCheckInputs = [ + aioresponses pytestCheckHook ]; @@ -49,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for the Remember the Milk API"; homepage = "https://github.com/MartinHjelmare/aiortm"; + changelog = "https://github.com/MartinHjelmare/aiortm/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index bc6954900ae2..82c6df741358 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiorun"; - version = "2021.10.1"; + version = "2022.11.1"; format = "flit"; disabled = pythonOlder "3.5"; @@ -17,15 +17,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cjrh"; repo = pname; - rev = "v${version}"; - hash = "sha256-9e1vUWDBv3BYWuKR/rZUvaIxFFetzBQaygXKnl4PDd8="; + rev = "refs/tags/v${version}"; + hash = "sha256-1qXt3HT/0sECOqPRwc0p+5+YZh1kyHSbkZHajcrjvZc="; }; propagatedBuildInputs = [ pygments ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook uvloop ]; @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Boilerplate for asyncio applications"; homepage = "https://github.com/cjrh/aiorun"; + changelog = "https://github.com/cjrh/aiorun/blob/v${version}/CHANGES"; license = licenses.asl20; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/aioruuvigateway/default.nix b/pkgs/development/python-modules/aioruuvigateway/default.nix new file mode 100644 index 000000000000..36f08874e926 --- /dev/null +++ b/pkgs/development/python-modules/aioruuvigateway/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, bluetooth-data-tools +, httpx +, pytest-asyncio +, pytest-httpx +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aioruuvigateway"; + version = "0.0.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "akx"; + repo = "aioruuvigateway"; + rev = "refs/tags/v${version}"; + hash = "sha256-oT5Tlmi9bevOkcVZqg/xvCckIpN7TjbPVQefo9z1RDM="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + bluetooth-data-tools + httpx + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-httpx + pytestCheckHook + ]; + + meta = with lib; { + description = "An asyncio-native library for requesting data from a Ruuvi Gateway"; + homepage = "https://github.com/akx/aioruuvigateway"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} + + diff --git a/pkgs/development/python-modules/aiorwlock/default.nix b/pkgs/development/python-modules/aiorwlock/default.nix index 9ee21f2a7c9b..cffaed5655e6 100644 --- a/pkgs/development/python-modules/aiorwlock/default.nix +++ b/pkgs/development/python-modules/aiorwlock/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-g/Eth99LlyiguP2hdWWFqw1lKxB7q1nGCE4bGtaSq0U="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index c4881dcdd56f..01be603f2101 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -1,14 +1,15 @@ { lib , aiohttp +, bluetooth-data-tools , buildPythonPackage , fetchFromGitHub -, netifaces +, orjson , pythonOlder }: buildPythonPackage rec { pname = "aioshelly"; - version = "4.1.2"; + version = "5.3.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -17,12 +18,13 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0BxbcWA2Kdk1xTSKN/dH9LJc3yI60kmyMCrK77tqyNE="; + hash = "sha256-a8zU3xHnYRmoiNiXlCUgrqgVINbhUWkPKGGsHkgHo4w="; }; propagatedBuildInputs = [ aiohttp - netifaces + bluetooth-data-tools + orjson ]; # Project has no test diff --git a/pkgs/development/python-modules/aioshutil/default.nix b/pkgs/development/python-modules/aioshutil/default.nix index fab58b9d9cbf..6a68e3e21c5e 100644 --- a/pkgs/development/python-modules/aioshutil/default.nix +++ b/pkgs/development/python-modules/aioshutil/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix index 9d815dfac059..2b3addc35917 100644 --- a/pkgs/development/python-modules/aiosignal/default.nix +++ b/pkgs/development/python-modules/aiosignal/default.nix @@ -9,36 +9,41 @@ buildPythonPackage rec { pname = "aiosignal"; - version = "1.2.0"; - disabled = pythonOlder "3.6"; + version = "1.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "1pamfc2l95s1q86jvmbp17chjy129gk01kwy8xm88d2ijy8s1caq"; + hash = "sha256-vx3Fe28r+0it1UFwyDSD9NNyeIN4tywTyr4pVp49WuU="; }; propagatedBuildInputs = [ frozenlist ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; postPatch = '' - substituteInPlace pytest.ini \ + substituteInPlace setup.cfg \ --replace "filterwarnings = error" "" \ --replace "--cov=aiosignal" "" ''; - pythonImportsCheck = [ "aiosignal" ]; + pythonImportsCheck = [ + "aiosignal" + ]; meta = with lib; { description = "Python list of registered asynchronous callbacks"; homepage = "https://github.com/aio-libs/aiosignal"; + changelog = "https://github.com/aio-libs/aiosignal/blob/v${version}/CHANGES.rst"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioskybell/default.nix b/pkgs/development/python-modules/aioskybell/default.nix index 0f3e8c041e0c..30f5740fbe6a 100644 --- a/pkgs/development/python-modules/aioskybell/default.nix +++ b/pkgs/development/python-modules/aioskybell/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { aiofiles ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix index 7d5dfa0ba519..59dca9a34670 100644 --- a/pkgs/development/python-modules/aioslimproto/default.nix +++ b/pkgs/development/python-modules/aioslimproto/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-Er7UsJDBDXD8CQSkUIOeO78HQaCsrRycU18LOjBpv/w="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiosmb/default.nix b/pkgs/development/python-modules/aiosmb/default.nix index 70737dcca796..97cbd60db1ab 100644 --- a/pkgs/development/python-modules/aiosmb/default.nix +++ b/pkgs/development/python-modules/aiosmb/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "aiosmb"; - version = "0.4.3"; + version = "0.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jJVXGBK8wWXEGvCzOTicHUh9jH35d1ARIxkLwn/ctjM="; + hash = "sha256-IGIEmM9eZ5T+op3ctGr72oy/cU48+OHaFJaZ8DRTY38="; }; propagatedBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SMB library"; homepage = "https://github.com/skelsec/aiosmb"; + changelog = "https://github.com/skelsec/aiosmb/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix index 254f1bfa4fe3..8f16230b2e0a 100644 --- a/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/pkgs/development/python-modules/aiosmtpd/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiosmtpd"; - version = "1.4.2"; + version = "1.4.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = version; - sha256 = "0hbpyns1j1fpvpj7gyb8cz359j7l4hzfqbig74xp4xih59sih0wj"; + rev = "refs/tags/${version}"; + sha256 = "sha256-QtLtw+2jEPLOxa45vDEbWEaSZ8RIyxf1zkZjR34Wu+8="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiosmtplib/default.nix b/pkgs/development/python-modules/aiosmtplib/default.nix index d54718d77efa..7bce233a8921 100644 --- a/pkgs/development/python-modules/aiosmtplib/default.nix +++ b/pkgs/development/python-modules/aiosmtplib/default.nix @@ -7,11 +7,12 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, trustme }: buildPythonPackage rec { pname = "aiosmtplib"; - version = "1.1.7"; + version = "2.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,18 +21,19 @@ buildPythonPackage rec { owner = "cole"; repo = pname; rev = "v${version}"; - hash = "sha256-ZVNYMVg2qeMoSojmPllvJLv2Xm5IYN9h5N13oHPFXSk="; + hash = "sha256-Py/44J9J8FdrsSpEM2/DR2DQH8x8Ub7y0FPIN2gcmmA="; }; nativeBuildInputs = [ poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ aiosmtpd hypothesis pytest-asyncio pytestCheckHook + trustme ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/aiosomecomfort/default.nix b/pkgs/development/python-modules/aiosomecomfort/default.nix new file mode 100644 index 000000000000..d89ada4a67e3 --- /dev/null +++ b/pkgs/development/python-modules/aiosomecomfort/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, prettytable +}: + +buildPythonPackage rec { + pname = "aiosomecomfort"; + version = "0.0.6"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "mkmer"; + repo = "AIOSomecomfort"; + rev = "refs/tags/${version}"; + hash = "sha256-3p38gWCqQVYz3sgu6SgfPH+wH/ZH2Qg+tVXiARuUh7s="; + }; + + propagatedBuildInputs = [ + aiohttp + prettytable + ]; + + pythonImportsCheck = [ + "aiosomecomfort" + ]; + + doCheck = false; # tests only run on windows, due to WindowsSelectorEventLoopPolicy + + meta = { + description = "AsyicIO client for US models of Honeywell Thermostats"; + homepage = "https://github.com/mkmer/AIOSomecomfort"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix index 022e34e23c1b..02f0a425858d 100644 --- a/pkgs/development/python-modules/aiosqlite/default.nix +++ b/pkgs/development/python-modules/aiosqlite/default.nix @@ -1,37 +1,49 @@ { lib , aiounittest , buildPythonPackage -, fetchPypi -, isPy27 +, fetchFromGitHub +, flit-core , pytestCheckHook -, typing-extensions +, pythonOlder }: buildPythonPackage rec { pname = "aiosqlite"; - version = "0.17.0"; - disabled = isPy27; + version = "0.18.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-8OaswkvEhkFJJnrIL7Rt+zvkRV+Z/iHfgmCcxua67lE="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "omnilib"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-yPGSKqjOz1EY5/V0oKz2EiZ90q2O4TINoXdxHuB7Gqk="; }; - checkInputs = [ - aiounittest - pytestCheckHook - typing-extensions + nativeBuildInputs = [ + flit-core ]; - # tests are not pick-up automatically by the hook - pytestFlagsArray = [ "aiosqlite/tests/*.py" ]; + nativeCheckInputs = [ + aiounittest + pytestCheckHook + ]; - pythonImportsCheck = [ "aiosqlite" ]; + # Tests are not pick-up automatically by the hook + pytestFlagsArray = [ + "aiosqlite/tests/*.py" + ]; + + pythonImportsCheck = [ + "aiosqlite" + ]; meta = with lib; { description = "Asyncio bridge to the standard sqlite3 module"; homepage = "https://github.com/jreese/aiosqlite"; + changelog = "https://github.com/omnilib/aiosqlite/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix index 7b7ff75614de..27588320fb2e 100644 --- a/pkgs/development/python-modules/aiostream/default.nix +++ b/pkgs/development/python-modules/aiostream/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-WOtscg02Dq5YNSAfq4pIyH3oUP/5G+cjBwKB6c+SUVA="; }; - checkInputs = [ pytestCheckHook pytest-cov pytest-asyncio ]; + nativeCheckInputs = [ pytestCheckHook pytest-cov pytest-asyncio ]; meta = with lib; { description = "Generator-based operators for asynchronous iteration"; diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 5a671bce26ce..0bd275f294ab 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "3.2.0"; + version = "3.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "TomerFi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Vob5p0+SlZR2eHj5Br2pWp3FCxW+zgY6crh8jrkreT0="; + hash = "sha256-k3xmW8aMBz6dbWuLnd6tw2BFoTuD80fpY7q2NfYqMlw="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { export TZ=Asia/Jerusalem ''; - checkInputs = [ + nativeCheckInputs = [ assertpy pytest-asyncio pytest-mockservers @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to interact with Switcher water heater"; homepage = "https://github.com/TomerFi/aioswitcher"; + changelog = "https://github.com/TomerFi/aioswitcher/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiosyncthing/default.nix b/pkgs/development/python-modules/aiosyncthing/default.nix index cefdf75a2866..73c512cb65f4 100644 --- a/pkgs/development/python-modules/aiosyncthing/default.nix +++ b/pkgs/development/python-modules/aiosyncthing/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses expects pytestCheckHook diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index b75b9ac31810..82fbb5a40aab 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -12,7 +12,8 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "41"; + version = "44"; + format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rBluo4080m9jFnquXaQY/Cntp7wHToY16aNFhzrQJs8="; + hash = "sha256-SRI7c0cmrNSTOEyRbs6JGEg5O9tws+Dwn0G8HUqWEqc="; }; propagatedBuildInputs = [ @@ -28,7 +29,7 @@ buildPythonPackage rec { orjson ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-aiohttp pytest-asyncio @@ -46,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for communicating with Unifi Controller API"; homepage = "https://github.com/Kane610/aiounifi"; + changelog = "https://github.com/Kane610/aiounifi/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/aiounittest/default.nix b/pkgs/development/python-modules/aiounittest/default.nix index d2f9ad916904..bdbdbb41c962 100644 --- a/pkgs/development/python-modules/aiounittest/default.nix +++ b/pkgs/development/python-modules/aiounittest/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { wrapt ]; - checkInputs = [ + nativeCheckInputs = [ nose coverage ]; diff --git a/pkgs/development/python-modules/aiovlc/default.nix b/pkgs/development/python-modules/aiovlc/default.nix index c41a39023706..64ece4bed85b 100644 --- a/pkgs/development/python-modules/aiovlc/default.nix +++ b/pkgs/development/python-modules/aiovlc/default.nix @@ -10,23 +10,28 @@ buildPythonPackage rec { pname = "aiovlc"; - version = "0.1.0"; + version = "0.3.0"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "MartinHjelmare"; repo = pname; - rev = "v${version}"; - sha256 = "jB2V/Wpxmp92wba41mWZAeO63wy3NrkupllGxJMNkFM="; + rev = "refs/tags/v${version}"; + hash = "sha256-ZFLNgPxR5N+hI988POCYJD9QGivs1fYysyFtmxsJQaA="; }; + postPatch = '' + substituteInPlace pyproject.toml --replace \ + " --cov=aiovlc --cov-report=term-missing:skip-covered" "" + ''; + propagatedBuildInputs = [ click ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-timeout pytestCheckHook @@ -39,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to control VLC"; homepage = "https://github.com/MartinHjelmare/aiovlc"; + changelog = "https://github.com/MartinHjelmare/aiovlc/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiowatttime/default.nix b/pkgs/development/python-modules/aiowatttime/default.nix index 67d21b7ebfab..54279db45757 100644 --- a/pkgs/development/python-modules/aiowatttime/default.nix +++ b/pkgs/development/python-modules/aiowatttime/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiowatttime"; - version = "2021.10.0"; + version = "2022.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - sha256 = "sha256-cWXhQMgRYBzOVgUQWONIwWFB5n/f0lqkSjUb9IoPwtI="; + rev = "refs/tags/${version}"; + sha256 = "sha256-rqmsUvVwXC/XkR/v2d9d3t7u6Poms4ORiOci41ajXIo="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-aiohttp pytest-asyncio diff --git a/pkgs/development/python-modules/aiowebostv/default.nix b/pkgs/development/python-modules/aiowebostv/default.nix index 436014106066..2bf09bb57cf4 100644 --- a/pkgs/development/python-modules/aiowebostv/default.nix +++ b/pkgs/development/python-modules/aiowebostv/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aiowebostv"; - version = "0.2.1"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-r/XdxF7/g6uDQIATi/OC6lNTUtBZg1jdgZHZilPPFNc="; + hash = "sha256-SNrznJY/HKUhDsClpC4j6Z/qE9qOsrdfc7Fu0W8ru/c="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with LG webOS based TV devices"; homepage = "https://github.com/home-assistant-libs/aiowebostv"; + changelog = "https://github.com/home-assistant-libs/aiowebostv/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioweenect/default.nix b/pkgs/development/python-modules/aioweenect/default.nix index 8b63e0ef71d3..a55c1ad65046 100644 --- a/pkgs/development/python-modules/aioweenect/default.nix +++ b/pkgs/development/python-modules/aioweenect/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/airly/default.nix b/pkgs/development/python-modules/airly/default.nix index 40cb085a17e8..95c7aba8e0cc 100644 --- a/pkgs/development/python-modules/airly/default.nix +++ b/pkgs/development/python-modules/airly/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses aiounittest pytestCheckHook diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index ec5204470d45..6351fea9bd80 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "airthings-ble"; - version = "0.5.3"; + version = "0.5.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vincegio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5moJ/Pu1Ixy4s7mCbjxQYROafjHVDM2cmpg0imDznl0="; + hash = "sha256-A1YsYOquDUDGeEI4xzQSjEk1H92Jjlhsb5IPRt0lM2c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/airtouch4pyapi/default.nix b/pkgs/development/python-modules/airtouch4pyapi/default.nix index 1c567181f9b4..de19c5965364 100644 --- a/pkgs/development/python-modules/airtouch4pyapi/default.nix +++ b/pkgs/development/python-modules/airtouch4pyapi/default.nix @@ -1,14 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , numpy , pythonOlder }: buildPythonPackage rec { pname = "airtouch4pyapi"; - version = "1.0.5"; + version = "1.0.8"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,19 +15,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "LonePurpleWolf"; repo = pname; - # https://github.com/LonePurpleWolf/airtouch4pyapi/issues/5 - rev = "34783888846783c058fe79cec16feda45504f701"; - sha256 = "17c7fm72p085pg9msvsfdggbskvm12a6jlb5bw1cndrqsqcrxywx"; + rev = "refs/tags/v${version}"; + hash = "sha256-RiRwebumidn0nijL/e9J74ZYx0DASi1up5BTNxYoGEA="; }; - patches = [ - # https://github.com/LonePurpleWolf/airtouch4pyapi/pull/10 - (fetchpatch { - url = "https://github.com/LonePurpleWolf/airtouch4pyapi/commit/5b5d91fad63495c83422e7a850897946ac95b25d.patch"; - hash = "sha256-tVlCLXuOJSqjbs0jj0iHCIXWZE8wmMV3ChzmE6uq3SM="; - }) - ]; - propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/ajsonrpc/default.nix b/pkgs/development/python-modules/ajsonrpc/default.nix index b3482cd74679..0dd07c0f4eea 100644 --- a/pkgs/development/python-modules/ajsonrpc/default.nix +++ b/pkgs/development/python-modules/ajsonrpc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "791bac18f0bf0dee109194644f151cf8b7ff529c4b8d6239ac48104a3251a19f"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ajsonrpc" ]; diff --git a/pkgs/development/python-modules/aladdin-connect/default.nix b/pkgs/development/python-modules/aladdin-connect/default.nix index ca6c6cca9632..3ca8016cd765 100644 --- a/pkgs/development/python-modules/aladdin-connect/default.nix +++ b/pkgs/development/python-modules/aladdin-connect/default.nix @@ -2,17 +2,21 @@ , requests , buildPythonPackage , fetchFromGitHub +, pythonOlder }: buildPythonPackage rec { pname = "aladdin-connect"; version = "0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "shoejosh"; repo = pname; - rev = version; - sha256 = "sha256-kLvMpSGa5WyDOH3ejAJyFGsB9IiMXp+nvVxM/ZkxyFw="; + rev = "refs/tags/${version}"; + hash = "sha256-kLvMpSGa5WyDOH3ejAJyFGsB9IiMXp+nvVxM/ZkxyFw="; }; propagatedBuildInputs = [ @@ -22,11 +26,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "aladdin_connect" ]; + pythonImportsCheck = [ + "aladdin_connect" + ]; meta = with lib; { description = "Python library for interacting with Genie Aladdin Connect devices"; homepage = "https://github.com/shoejosh/aladdin-connect"; + changelog = "https://github.com/shoejosh/aladdin-connect/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/alarmdecoder/default.nix b/pkgs/development/python-modules/alarmdecoder/default.nix index 23b4173f8da8..f06fc819bb49 100644 --- a/pkgs/development/python-modules/alarmdecoder/default.nix +++ b/pkgs/development/python-modules/alarmdecoder/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pyusb ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ale-py/cmake-pybind11.patch b/pkgs/development/python-modules/ale-py/cmake-pybind11.patch new file mode 100644 index 000000000000..5bcf5b1d9b2f --- /dev/null +++ b/pkgs/development/python-modules/ale-py/cmake-pybind11.patch @@ -0,0 +1,18 @@ +diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt +index 911e280..d484943 100644 +--- a/src/python/CMakeLists.txt ++++ b/src/python/CMakeLists.txt +@@ -1,12 +1,6 @@ + find_package(Python3 COMPONENTS Interpreter Development.Module REQUIRED) + +-include(FetchContent) +-FetchContent_Declare( +- pybind11 +- GIT_REPOSITORY https://github.com/pybind/pybind11 +- GIT_TAG v2.10.0) +-FetchContent_MakeAvailable(pybind11) +- ++find_package(pybind11 REQUIRED) + add_library(ale-py MODULE ale_python_interface.cpp) + # Depend on the ALE and pybind11 module + target_link_libraries(ale-py PUBLIC ale ale-lib) diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix new file mode 100644 index 000000000000..3a256e67468d --- /dev/null +++ b/pkgs/development/python-modules/ale-py/default.nix @@ -0,0 +1,83 @@ +{ buildPythonPackage +, SDL2 +, cmake +, fetchFromGitHub +, git +, gym +, importlib-metadata +, importlib-resources +, lib +, ninja +, numpy +, pybind11 +, pytestCheckHook +, python +, pythonOlder +, setuptools +, stdenv +, typing-extensions +, wheel +, zlib +}: + +buildPythonPackage rec { + pname = "ale-py"; + version = "0.8.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "mgbellemare"; + repo = "Arcade-Learning-Environment"; + rev = "v${version}"; + sha256 = "sha256-OPAtCc2RapK1lALTKHd95bkigxcZ9bcONu32I/91HIg="; + }; + + patches = [ + # don't download pybind11, use local pybind11 + ./cmake-pybind11.patch + ]; + + nativeBuildInputs = [ + cmake + setuptools + wheel + pybind11 + ]; + + buildInputs = [ + zlib + SDL2 + ]; + + propagatedBuildInputs = [ + typing-extensions + importlib-resources + numpy + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + ]; + + nativeCheckInputs = [ + pytestCheckHook + gym + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + substituteInPlace setup.py \ + --replace 'subprocess.check_output(["git", "rev-parse", "--short", "HEAD"], cwd=here)' 'b"${src.rev}"' + ''; + + dontUseCmakeConfigure = true; + + pythonImportsCheck = [ "ale_py" ]; + + meta = with lib; { + description = "a simple framework that allows researchers and hobbyists to develop AI agents for Atari 2600 games"; + homepage = "https://github.com/mgbellemare/Arcade-Learning-Environment"; + license = licenses.gpl2; + maintainers = with maintainers; [ billhuang ]; + broken = stdenv.isDarwin; # fails to link with missing library + }; +} diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index aefe80a3b0b3..a759dc226f32 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.8.1"; + version = "1.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zQteRbFLcGQmuDPwY2m5ptXuA/gm7DI4cjzoyq9uX/o="; + sha256 = "sha256-+fduQQYfXr4n1P6SYA353WElIadoP5BNqzKLoCz/paI="; }; propagatedBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { "alembic" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist ]; diff --git a/pkgs/development/python-modules/algebraic-data-types/default.nix b/pkgs/development/python-modules/algebraic-data-types/default.nix index 7c4f9a4f6082..9c19470fbddc 100644 --- a/pkgs/development/python-modules/algebraic-data-types/default.nix +++ b/pkgs/development/python-modules/algebraic-data-types/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-RHLI5rmFxklzG9dyYgYfSS/srCjcxNpzNcK/RPNJBPE="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis mypy diff --git a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix index c83e7d59e50b..6d0a9d5eb2a4 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-cdn"; - version = "3.7.7"; + version = "3.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Rqz4V6QunddSFeMyROROOL5T4MFPWK1gTorPpNWO8oQ="; + hash = "sha256-bcAaFwAS9xAbCLtqYtSiALHtlGklHFgGXpgiZZpR6no="; }; propagatedBuildInputs = [ @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "CDN module of Aliyun Python SDK"; homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk"; + changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-cdn/ChangeLog.txt"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix index a1796a2b25f0..a398612cea07 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-config"; - version = "2.2.1"; + version = "2.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Me5z68cOfLt8PDHaZ1b/F/KG5mtYAW3LXmNd+0epha8="; + hash = "sha256-rSywGyd9xpR11u9C0kJsx8RSzYhzZ4mF41ZPQ9PWWqQ="; }; propagatedBuildInputs = [ @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Configuration module of Aliyun Python SDK"; homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk"; + changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-config/ChangeLog.txt"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix index 272a2ea5cccb..16d2842b5e56 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Core module of Aliyun Python SDK"; homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk"; + changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-core/ChangeLog.txt"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix index 9378d620b034..0635b941c939 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-dbfs"; - version = "2.0.2"; + version = "2.0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+zypKosn+lKEjxJhjLHD43i8jK40WvapD8pjXQehU7E="; + hash = "sha256-R3ov7EssN9kcf8SA8juPu9+TEptzo9Vkb8YwzwFlMQ4="; }; propagatedBuildInputs = [ @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "DBFS module of Aliyun Python SDK"; homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk"; + changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-dbfs/ChangeLog.txt"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix index 069b06d7ad9a..6a5802c388f9 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-iot"; - version = "8.45.0"; + version = "8.49.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9vLc+Rp81P28lCs6KM8Dmt97lPlhnWd6hqZZDTdQEGk="; + hash = "sha256-POrDx4xXCIOBU4hvXu03XcZI2F6xHsjHNJRBaGFC8U8="; }; propagatedBuildInputs = [ @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "IoT module of Aliyun Python SDK"; homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk"; + changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-iot/ChangeLog.txt"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix index 4356c00a7c73..a57373d02b00 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "KMS module of Aliyun Python SDK"; homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk"; + changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-kms/ChangeLog.txt"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aliyun-python-sdk-sts/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-sts/default.nix index 7217822bbcce..297d347b9f06 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-sts/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-sts/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "STS module of Aliyun Python SDK"; homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk"; + changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-sts/ChangeLog.txt"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix index 9e1aac84f307..b029296fd3a7 100644 --- a/pkgs/development/python-modules/allpairspy/default.nix +++ b/pkgs/development/python-modules/allpairspy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/allure-behave/default.nix b/pkgs/development/python-modules/allure-behave/default.nix index 000c51359f54..4463be9997b3 100644 --- a/pkgs/development/python-modules/allure-behave/default.nix +++ b/pkgs/development/python-modules/allure-behave/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "allure-behave"; - version = "2.10.0"; + version = "2.12.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BzDu/LJBstuchkvUAeCDSIDIiFLZmC4y0s3d+1paGxs="; + sha256 = "sha256-CxdB1gliajS6dUUhnD+yRMVj0zglGEwZC6RDmirH+pg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/allure-pytest/default.nix b/pkgs/development/python-modules/allure-pytest/default.nix index 273aa38b02a4..d19805366ff1 100644 --- a/pkgs/development/python-modules/allure-pytest/default.nix +++ b/pkgs/development/python-modules/allure-pytest/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "allure-pytest"; - version = "2.10.0"; + version = "2.12.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Oyq2din0y9hher2BfSsiKSxut+/VWE+ZLRr4FDrqbuc="; + sha256 = "sha256-hbc7Hb6ZCLpPhLgBGKk+EEnALdWTIJJg2MHJUM8ob2w="; }; buildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pyhamcrest mock pytestCheckHook diff --git a/pkgs/development/python-modules/allure-python-commons-test/default.nix b/pkgs/development/python-modules/allure-python-commons-test/default.nix index fcdc76a0897a..a68cf5a90882 100644 --- a/pkgs/development/python-modules/allure-python-commons-test/default.nix +++ b/pkgs/development/python-modules/allure-python-commons-test/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "allure-python-commons-test"; - version = "2.11.0"; + version = "2.12.0"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-69iSW5pUbYQpA/dgpCr088CUaa1BGIwlijltmFZnEa0="; + sha256 = "sha256-TaeQF9EZ5tLMmVSwnWgrxsRz5lh0O3BZLLEUawd8BeI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/allure-python-commons/default.nix b/pkgs/development/python-modules/allure-python-commons/default.nix index 052ef498b4a6..414271358545 100644 --- a/pkgs/development/python-modules/allure-python-commons/default.nix +++ b/pkgs/development/python-modules/allure-python-commons/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "allure-python-commons"; - version = "2.10.0"; + version = "2.12.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1NMTRLDwA3pKEeFrkbKM8O6yP/oOUMJ/z8aqvnIhLTw="; + sha256 = "sha256-1cNi3QEWfwhjMYIumxkS1Ob9bLwtGgBt0EjnfoKnrnM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/alpha-vantage/default.nix b/pkgs/development/python-modules/alpha-vantage/default.nix index 7a67f9d6b0d1..23ffd7d8b4b6 100644 --- a/pkgs/development/python-modules/alpha-vantage/default.nix +++ b/pkgs/development/python-modules/alpha-vantage/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses requests-mock pandas diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index e4bec8fafa4b..63ee77d22163 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "altair"; - version = "4.2.0"; + version = "4.2.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d87d9372e63b48cd96b2a6415f0cf9457f50162ab79dc7a31cd7e024dd840026"; + sha256 = "sha256-OTmaJnxJsw0QLBBBHmerJjdBVqhLGuufzRUUBCm6ScU="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { jinja2 ] ++ lib.optionals (pythonOlder "3.5") [ typing ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales ipython pytestCheckHook diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index 5a3f7e449e23..3e7aae7f3daa 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -47,6 +47,11 @@ buildPythonPackage rec { url = "https://github.com/amaranth-lang/amaranth/pull/722/commits/e5a56b07c568e5f4cc2603eefebd14c5cc4e13d8.patch"; hash = "sha256-C8FyMSKHA7XsEMpO9eYNZx/X5rGaK7p3eXP+jSb6wVg="; }) + (fetchpatch { + name = "add-python-3.11-support.patch"; + url = "https://github.com/amaranth-lang/amaranth/commit/851546bf2d16db62663d7002bece51f07078d0a5.patch"; + hash = "sha256-eetlFCLqmpCfTKViD16OScJbkql1yhdi5uJGnfnpcCE="; + }) ]; SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"; @@ -64,7 +69,7 @@ buildPythonPackage rec { lib.optional (pythonOlder "3.9") importlib-resources ++ lib.optional (pythonOlder "3.8") importlib-metadata; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook symbiyosys yices diff --git a/pkgs/development/python-modules/amarna/default.nix b/pkgs/development/python-modules/amarna/default.nix index aadf4d2665e5..778a585a69f1 100644 --- a/pkgs/development/python-modules/amarna/default.nix +++ b/pkgs/development/python-modules/amarna/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "amarna"; - version = "0.1.3"; + version = "0.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "crytic"; repo = "amarna"; - rev = "v${version}"; - hash = "sha256-cE7OhACLpRmbJWzMsGTidbbw9FOKBbz47LEJwTW6wck="; + rev = "refs/tags/v${version}"; + hash = "sha256-tyvHWBhanR7YH87MDWdXUsDEzZG6MgnbshezAbxWO+I="; }; propagatedBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { pydot ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix index 365e4cc14a64..21db57509745 100644 --- a/pkgs/development/python-modules/amazon-ion/default.nix +++ b/pkgs/development/python-modules/amazon-ion/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/amazon_kclpy/default.nix b/pkgs/development/python-modules/amazon_kclpy/default.nix index 06f61981561b..7394606965f3 100644 --- a/pkgs/development/python-modules/amazon_kclpy/default.nix +++ b/pkgs/development/python-modules/amazon_kclpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mock boto ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' ${python.interpreter} -m pytest diff --git a/pkgs/development/python-modules/ambee/default.nix b/pkgs/development/python-modules/ambee/default.nix index 203254717933..ccc05d2ab300 100644 --- a/pkgs/development/python-modules/ambee/default.nix +++ b/pkgs/development/python-modules/ambee/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/amberelectric/default.nix b/pkgs/development/python-modules/amberelectric/default.nix index 667e5fff5e19..ae02eaec0b1a 100644 --- a/pkgs/development/python-modules/amberelectric/default.nix +++ b/pkgs/development/python-modules/amberelectric/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/amcrest/default.nix b/pkgs/development/python-modules/amcrest/default.nix index dcdf918344a3..30808ee3f0ee 100644 --- a/pkgs/development/python-modules/amcrest/default.nix +++ b/pkgs/development/python-modules/amcrest/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook responses diff --git a/pkgs/development/python-modules/amply/default.nix b/pkgs/development/python-modules/amply/default.nix index 5a26e341958b..2298b57cb1f4 100644 --- a/pkgs/development/python-modules/amply/default.nix +++ b/pkgs/development/python-modules/amply/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { docutils pyparsing ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "amply" ]; diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index ec4dd4dfcbee..bd834b9e1491 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { vine ]; - checkInputs = [ + nativeCheckInputs = [ case pytestCheckHook ]; diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix index 6f4a5007e7c6..9da8d6f204ba 100644 --- a/pkgs/development/python-modules/amqtt/default.nix +++ b/pkgs/development/python-modules/amqtt/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytest-logdog pytest-asyncio diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index 5584f2bd6719..ee808f973bae 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { pyperclip ]; - checkInputs = [ + nativeCheckInputs = [ codecov coverage mock diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index 561cbe5ddac9..856869445db3 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.69"; + version = "0.0.70"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - hash = "sha256-GfwXYugDrxOe9ekC1M7mi0BuqmohHdgZVTO4J8+B5iI="; + hash = "sha256-LKV5aO3sptHz48UYpP+zPk6pPhyHAZWAxiTTIWKHiSg="; }; propagatedBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { inherit (adb-shell.optional-dependencies) usb; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ] diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 4c9fd9d44fc4..4abcad0e7c9b 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -11,7 +11,7 @@ , cppheaderparser , dpkt , fetchFromGitHub -, GitPython +, gitpython , itanium-demangler , mulpyplexer , nampa @@ -22,31 +22,16 @@ , pycparser , pythonOlder , pyvex -, sympy -, sqlalchemy , rpyc , sortedcontainers +, sqlalchemy +, sympy , unicorn }: -let - # Only the pinned release in setup.py works properly - unicorn' = unicorn.overridePythonAttrs (old: rec { - pname = "unicorn"; - version = "1.0.2-rc4"; - src = fetchFromGitHub { - owner = "unicorn-engine"; - repo = pname; - rev = version; - sha256 = "17nyccgk7hpc4hab24yn57f1xnmr7kq4px98zbp2bkwcrxny8gwy"; - }; - doCheck = false; - }); -in - buildPythonPackage rec { pname = "angr"; - version = "9.2.25"; + version = "9.2.36"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -55,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-BxhCQZl/hsqaKzjieAreiOePUcmWGNn63jD0mZ9vFNE="; + hash = "sha256-KVIrhzd3EoDIVImshfjZrBAiNkCtlFAd6Ox9ATsvPTY="; }; propagatedBuildInputs = [ @@ -68,7 +53,7 @@ buildPythonPackage rec { cle cppheaderparser dpkt - GitPython + gitpython itanium-demangler mulpyplexer nampa @@ -82,7 +67,7 @@ buildPythonPackage rec { sortedcontainers sqlalchemy sympy - unicorn' + unicorn ]; setupPyBuildFlags = lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/python-modules/angrcli/default.nix b/pkgs/development/python-modules/angrcli/default.nix index 2f5ecae9db97..a43b39a4e9eb 100644 --- a/pkgs/development/python-modules/angrcli/default.nix +++ b/pkgs/development/python-modules/angrcli/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pygments ]; - checkInputs = [ + nativeCheckInputs = [ coreutils pytestCheckHook ]; diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index ea47444d47ce..eb8c6706b5d5 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -2,6 +2,7 @@ , angr , buildPythonPackage , fetchFromGitHub +, fetchpatch , progressbar , pythonOlder , pythonRelaxDepsHook @@ -22,6 +23,14 @@ buildPythonPackage rec { hash = "sha256-wIPk7Cz7FSPviPFBSLrBjLr9M0o3pyoJM7wiAhHrg9Q="; }; + patches = [ + (fetchpatch { + name = "compatibility-with-newer-angr.patch"; + url = "https://github.com/angr/angrop/commit/23194ee4ecdcb7a7390ec04eb133786ec3f807b1.patch"; + hash = "sha256-n9/oPUblUHSk81qwU129rnNOjsNViaegp6454CaDo+8="; + }) + ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index 62db58d611e4..b78ff31f8225 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix index c9ed6bd90ede..c38a32c81d19 100644 --- a/pkgs/development/python-modules/annexremote/default.nix +++ b/pkgs/development/python-modules/annexremote/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "08myswj1vqkl4s1glykq6xn76a070nv5mxj0z8ibl6axz89bvypi"; }; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix index 97841a6a62d8..da4becc24fcc 100644 --- a/pkgs/development/python-modules/annoy/default.nix +++ b/pkgs/development/python-modules/annoy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { h5py ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/anonip/default.nix b/pkgs/development/python-modules/anonip/default.nix index 96115aaee439..264acc781393 100644 --- a/pkgs/development/python-modules/anonip/default.nix +++ b/pkgs/development/python-modules/anonip/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0cssdcridadjzichz1vv1ng7jwphqkn8ihh83hpz9mcjmxyb94qc"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix index e2e4e7c93fb9..287bf13a5dee 100644 --- a/pkgs/development/python-modules/ansi/default.nix +++ b/pkgs/development/python-modules/ansi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix index 6489832c43a9..a1aceb5372fe 100644 --- a/pkgs/development/python-modules/ansi2html/default.nix +++ b/pkgs/development/python-modules/ansi2html/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six setuptools ]; preCheck = "export PATH=$PATH:$out/bin"; - checkInputs = [ mock pytestCheckHook ]; + nativeCheckInputs = [ mock pytestCheckHook ]; pythonImportsCheck = [ "ansi2html" ]; diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index f92423fde31a..da022c1e7f19 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "2.2.5"; + version = "3.0.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KMfFRf1g75wwWc+y/v0n+S2wkf9rWGj4PxIc614f4bU="; + sha256 = "sha256-19xeS3+t6bc3XFaKJEdbe+gQJMrCogyu8yYO8LUSh7Q="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { export PATH=$PATH:$out/bin ''; - checkInputs = [ + nativeCheckInputs = [ ansible-core flaky pytest-mock diff --git a/pkgs/development/python-modules/ansible-doctor/default.nix b/pkgs/development/python-modules/ansible-doctor/default.nix index e2de0500dd93..d05d730a467a 100644 --- a/pkgs/development/python-modules/ansible-doctor/default.nix +++ b/pkgs/development/python-modules/ansible-doctor/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "ansible-doctor"; - version = "1.4.6"; + version = "1.4.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = "ansible-doctor"; rev = "refs/tags/v${version}"; - hash = "sha256-76IYH9IWeHU+PAtpLFGT5f8oG2roY3raW0NC3KUnFls="; + hash = "sha256-A4SqDEArnRG9SJTqU/C9TOQO2vjot+hfj2/PKB/JMfw="; }; pythonRelaxDeps = true; @@ -69,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "Annotation based documentation for your Ansible roles"; homepage = "https://github.com/thegeeklab/ansible-doctor"; + changelog = "https://github.com/thegeeklab/ansible-doctor/releases/tag/v${version}"; license = licenses.lgpl3Only; maintainers = with maintainers; [ tboerger ]; }; diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix index b383453f7b92..37a97121b034 100644 --- a/pkgs/development/python-modules/ansible-later/default.nix +++ b/pkgs/development/python-modules/ansible-later/default.nix @@ -14,6 +14,7 @@ , pytest-mock , python-json-logger , pytestCheckHook +, pythonRelaxDepsHook , pythonOlder , pyyaml , toolz @@ -23,7 +24,7 @@ buildPythonPackage rec { pname = "ansible-later"; - version = "2.0.23"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -32,23 +33,29 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FQnyWC7d9h8Ya2BlaTGTrNXkHtJJLdeNL7qXP7scLFA="; + hash = "sha256-Mi8CJ3OU27zJ2PNkrqu0BytTI5ZaQezi8DIW3yXCzDI="; }; 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 = "' 'jsonschema = "^' \ - --replace 'python-json-logger = "' 'python-json-logger = "^' \ - --replace 'toolz = "0.11.2' 'toolz = "*' \ - --replace 'yamllint = "' 'yamllint = "^' + --replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --cov-append --no-cov-on-fail" "" ''; + pythonRelaxDeps = [ + "flake8" + "jsonschema" + "pathspec" + "python-json-logger" + "pyyaml" + "toolz" + "unidiff" + "yamllint" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -68,7 +75,7 @@ buildPythonPackage rec { yamllint ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; @@ -84,6 +91,7 @@ buildPythonPackage rec { meta = with lib; { description = "Best practice scanner for Ansible roles and playbooks"; homepage = "https://github.com/thegeeklab/ansible-later"; + changelog = "https://github.com/thegeeklab/ansible-later/releases/tag/v${version}"; 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 6460c0c923db..12c353d1059f 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -22,13 +22,14 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.8.6"; + version = "6.11.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Fx/o2tYgeLmBm1x01g61r6ow6py5ybqHBhSeVsVam24="; + hash = "sha256-NIrDVsOBem25j7aZPsF7WyNsFjEiOHWfCj8U81Q6nlA="; }; postPatch = '' @@ -59,7 +60,7 @@ buildPythonPackage rec { # tests can't be easily run without installing things from ansible-galaxy doCheck = false; - checkInputs = [ + nativeCheckInputs = [ flaky pytest-xdist pytestCheckHook @@ -91,15 +92,15 @@ buildPythonPackage rec { "test_run_inside_role_dir" "test_run_multiple_role_path_no_trailing_slash" "test_runner_exclude_globs" - "test_discover_lintables_umlaut" ]; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible-core ]}" ]; meta = with lib; { - homepage = "https://github.com/ansible/ansible-lint"; description = "Best practices checker for Ansible"; + homepage = "https://github.com/ansible/ansible-lint"; + changelog = "https://github.com/ansible/ansible-lint/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ sengaya ]; }; diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 44e5a519a7bb..dd136f0d7c3c 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ ansible-core # required to place ansible CLI onto the PATH in tests glibcLocales pytestCheckHook diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index b4d09d38f887..8f8e98ca6496 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.14.0"; + version = "2.14.2"; src = fetchPypi { inherit pname version; - hash = "sha256-+ki0gctiO/ebuQPyIwl2gaDBPhtOx+eOfdfYWNNqNLI="; + hash = "sha256-R/DUtBJbWO26ZDWkfzfL5qGNpUWU0Y+BKVi7DLWNTmU="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 81839ecce007..558ce409d4b6 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "6.6.0"; + version = "7.2.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-4blAqNT0EhI+3jwUsly5nDyKTVNf0ECqv45Pt7Dk8JI="; + sha256 = "sha256-YOLBpY8c6zShkLfDgPezOG0ec2kGGVSx+LjKPfdgY8w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ansicolors/default.nix b/pkgs/development/python-modules/ansicolors/default.nix index fab91690ab23..3f2d549694e6 100644 --- a/pkgs/development/python-modules/ansicolors/default.nix +++ b/pkgs/development/python-modules/ansicolors/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "99f94f5e3348a0bcd43c82e5fc4414013ccc19d70bd939ad71e0133ce9c372e0"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/ansiconv/default.nix b/pkgs/development/python-modules/ansiconv/default.nix index ba0c06f536aa..b0676258e107 100644 --- a/pkgs/development/python-modules/ansiconv/default.nix +++ b/pkgs/development/python-modules/ansiconv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0ljfpl8x069arzginvpi1v6hlaq4x2qpjqj01qds2ylz33scq8r4"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { description = "A module for converting ANSI coded text and converts it to either plain text or HTML"; diff --git a/pkgs/development/python-modules/ansimarkup/default.nix b/pkgs/development/python-modules/ansimarkup/default.nix index b74c7e321799..9de4e19d47e8 100644 --- a/pkgs/development/python-modules/ansimarkup/default.nix +++ b/pkgs/development/python-modules/ansimarkup/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ colorama ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ansimarkup" ]; diff --git a/pkgs/development/python-modules/ansiwrap/default.nix b/pkgs/development/python-modules/ansiwrap/default.nix index 1d0aef1ee5d3..3dc3a8df13be 100644 --- a/pkgs/development/python-modules/ansiwrap/default.nix +++ b/pkgs/development/python-modules/ansiwrap/default.nix @@ -1,16 +1,18 @@ { lib , ansicolors , buildPythonPackage -, coverage , fetchPypi -, pytest-cov , pytestCheckHook +, pythonOlder , textwrap3 }: buildPythonPackage rec { pname = "ansiwrap"; version = "0.8.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -18,21 +20,31 @@ buildPythonPackage rec { sha256 = "ca0c740734cde59bf919f8ff2c386f74f9a369818cdc60efe94893d01ea8d9b7"; }; + postPatch = '' + # https://github.com/jonathaneunice/ansiwrap/issues/18 + substituteInPlace test/test_ansiwrap.py \ + --replace "set(range(20, 120)).difference(LINE_LENGTHS)" "sorted(set(range(20, 120)).difference(LINE_LENGTHS))" \ + --replace "set(range(120, 400)).difference(LINE_LENGTHS)" "sorted(set(range(120, 400)).difference(LINE_LENGTHS))" + ''; + checkInputs = [ ansicolors - coverage - pytest-cov pytestCheckHook ]; - propagatedBuildInputs = [ textwrap3 ]; + propagatedBuildInputs = [ + textwrap3 + ]; - pythonImportsCheck = [ "ansiwrap" ]; + pythonImportsCheck = [ + "ansiwrap" + ]; meta = with lib; { description = "Textwrap, but savvy to ANSI colors and styles"; homepage = "https://github.com/jonathaneunice/ansiwrap"; + changelog = "https://github.com/jonathaneunice/ansiwrap/blob/master/CHANGES.yml"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix index 1ab91cacbcc3..4f5f25d0159b 100644 --- a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix +++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { # in 4.9, test was renamed to tests checkPhase = '' cd test* - ${python.interpreter} ctest.py + ${python.interpreter} run.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/anyascii/default.nix b/pkgs/development/python-modules/anyascii/default.nix index b34a711f6a9e..4af2a68ccb30 100644 --- a/pkgs/development/python-modules/anyascii/default.nix +++ b/pkgs/development/python-modules/anyascii/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-3t9XcoIG4obJHu18dZUFpeRcjNATZ91Awvcki7FcEfY="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/anybadge/default.nix b/pkgs/development/python-modules/anybadge/default.nix index 489e200afb04..0418de37a251 100644 --- a/pkgs/development/python-modules/anybadge/default.nix +++ b/pkgs/development/python-modules/anybadge/default.nix @@ -1,26 +1,46 @@ { lib -, fetchFromGitHub , buildPythonPackage +, fetchFromGitHub +, packaging , pytestCheckHook +, pythonOlder +, requests }: buildPythonPackage rec { pname = "anybadge"; - version = "1.11.1"; + version = "1.14.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "jongracecox"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-6br4WUwE1ovAneYUeTHcUN3PH5Wm1rnLYCpXDUshk7Q="; + rev = "refs/tags/v${version}"; + hash = "sha256-+CkkFCShCYtxKiCWRQcgTFcekc/g7ujQj9MdnG1+a0A="; }; # setup.py reads its version from the TRAVIS_TAG environment variable TRAVIS_TAG = "v${version}"; - checkInputs = [ + propagatedBuildInputs = [ + packaging + ]; + + nativeCheckInputs = [ pytestCheckHook + requests + ]; + + disabledTests = [ + # Comparison of CLI output fails + "test_module_same_output_as_main_cli" + ]; + + disabledTestPaths = [ + # No anybadge-server + "tests/test_server.py" ]; pythonImportsCheck = [ @@ -30,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tool for generating badges for your projects"; homepage = "https://github.com/jongracecox/anybadge"; + changelog = "https://github.com/jongracecox/anybadge/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fabiangd ]; }; diff --git a/pkgs/development/python-modules/anyconfig/default.nix b/pkgs/development/python-modules/anyconfig/default.nix index 17794d5c8c46..0b6d0280d3ee 100644 --- a/pkgs/development/python-modules/anyconfig/default.nix +++ b/pkgs/development/python-modules/anyconfig/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 9d2e2a333590..83b5d27655c7 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.5.0"; + version = "3.6.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,17 +29,9 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - sha256 = "sha256-AZ9M/NBCBlMIUpRJgKbJRL/oReZDUh2Jhwtoxoo0tMs="; + hash = "sha256-bootaulvx9zmobQGDirsMz5uxuLeCD9ggAvYkPaKnWo="; }; - patches = [ - (fetchpatch { - # Pytest 7.0 compatibility - url = "https://github.com/agronholm/anyio/commit/fed7cc4f95e196f68251bcb9253da3b143ea8e7e.patch"; - sha256 = "sha256-VmZmiQEmWJ4aPz0Wx+GTMZo7jXRDScnRYf2Hu2hiRVw="; - }) - ]; - preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION=${version} ''; @@ -59,7 +51,7 @@ buildPythonPackage rec { # trustme uses pyopenssl doCheck = !(stdenv.isDarwin && stdenv.isAarch64); - checkInputs = [ + nativeCheckInputs = [ curio hypothesis pytest-mock @@ -71,9 +63,17 @@ buildPythonPackage rec { mock ]; + pytestFlagsArray = [ + "-W" "ignore::trio.TrioDeprecationWarning" + ]; + disabledTests = [ # block devices access "test_is_block_device" + # INTERNALERROR> AttributeError: 'NonBaseMultiError' object has no attribute '_exceptions'. Did you mean: 'exceptions'? + "test_exception_group_children" + "test_exception_group_host" + "test_exception_group_filtering" ]; disabledTestPaths = [ @@ -87,6 +87,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "anyio" ]; meta = with lib; { + changelog = "https://github.com/agronholm/anyio/blob/${src.rev}/docs/versionhistory.rst"; description = "High level compatibility layer for multiple asynchronous event loop implementations on Python"; homepage = "https://github.com/agronholm/anyio"; license = licenses.mit; diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index fa92bc44891a..d49b22349639 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { # circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree doCheck = withGraphviz; - checkInputs = [ pytestCheckHook nose ]; + nativeCheckInputs = [ pytestCheckHook nose ]; pytestFlagsArray = lib.optionals (pythonOlder "3.4") [ # Use enums, which aren't available pre-python3.4 diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/development/python-modules/aocd/default.nix index 3202ac66f862..b58c31ea7320 100644 --- a/pkgs/development/python-modules/aocd/default.nix +++ b/pkgs/development/python-modules/aocd/default.nix @@ -1,18 +1,35 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests -, pytestCheckHook, tzlocal, pytest-mock, pytest-freezegun, pytest-raisin -, pytest-socket, requests-mock, pebble, python-dateutil, termcolor -, beautifulsoup4, setuptools +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, requests +, pytestCheckHook +, tzlocal +, pytest-mock +, pytest-freezegun +, pytest-raisin +, pytest-socket +, requests-mock +, pebble +, python-dateutil +, termcolor +, beautifulsoup4 +, setuptools +, pythonOlder }: buildPythonPackage rec { pname = "aocd"; - version = "1.2.1"; + version = "1.3.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "wimglenn"; repo = "advent-of-code-data"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Oz1sy+BHekI0ApDKn7hNMDvQrog6EB0JPry7SV5fxig="; + hash = "sha256-yY8ItXZZp0yVs4viJzduMPq8Q8NKd34uvlGaVUE2GjQ="; }; propagatedBuildInputs = [ @@ -37,7 +54,7 @@ buildPythonPackage rec { "test_load_input_from_file" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock pytest-freezegun @@ -46,11 +63,14 @@ buildPythonPackage rec { requests-mock ]; - pythonImportsCheck = [ "aocd" ]; + pythonImportsCheck = [ + "aocd" + ]; meta = with lib; { - homepage = "https://github.com/wimglenn/advent-of-code-data"; description = "Get your Advent of Code data with a single import statement"; + homepage = "https://github.com/wimglenn/advent-of-code-data"; + changelog = "https://github.com/wimglenn/advent-of-code-data/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ aadibajpai ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/apache-airflow/0001-Revert-fix-yarn-warning-from-d3-color-27139.patch b/pkgs/development/python-modules/apache-airflow/0001-Revert-fix-yarn-warning-from-d3-color-27139.patch new file mode 100644 index 000000000000..4e6f56a7cf12 --- /dev/null +++ b/pkgs/development/python-modules/apache-airflow/0001-Revert-fix-yarn-warning-from-d3-color-27139.patch @@ -0,0 +1,51 @@ +From eca202d2893c9f2f91628ad6244b52cf7880bfcf Mon Sep 17 00:00:00 2001 +From: Graham Bennett +Date: Mon, 21 Nov 2022 15:39:54 +0000 +Subject: [PATCH] Revert "fix yarn warning from d3-color (#27139)" + +This reverts commit b9e133e40c2848b0d555051a99bf8d2816fd28a7. +--- + airflow/www/package.json | 3 --- + airflow/www/yarn.lock | 13 +++++++++---- + 2 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/airflow/www/package.json b/airflow/www/package.json +index f694089ee6..3d37ad4c46 100644 +--- a/airflow/www/package.json ++++ b/airflow/www/package.json +@@ -120,8 +120,5 @@ + "redoc": "^2.0.0-rc.72", + "type-fest": "^2.17.0", + "url-search-params-polyfill": "^8.1.0" +- }, +- "resolutions": { +- "d3-color": "^3.1.0" + } + } +diff --git a/airflow/www/yarn.lock b/airflow/www/yarn.lock +index bafd63a368..dad0ebabab 100644 +--- a/airflow/www/yarn.lock ++++ b/airflow/www/yarn.lock +@@ -4518,10 +4518,15 @@ d3-collection@1, d3-collection@^1.0.4: + resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e" + integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A== + +-d3-color@1, "d3-color@1 - 2", d3-color@^3.1.0: +- version "3.1.0" +- resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2" +- integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA== ++d3-color@1: ++ version "1.4.1" ++ resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a" ++ integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q== ++ ++"d3-color@1 - 2": ++ version "2.0.0" ++ resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-2.0.0.tgz#8d625cab42ed9b8f601a1760a389f7ea9189d62e" ++ integrity sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ== + + d3-contour@1: + version "1.3.2" +-- +2.37.3 + diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index cc57679f5052..49cb93800554 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -16,7 +16,6 @@ , cron-descriptor , croniter , cryptography -, dataclasses , deprecated , dill , flask @@ -25,7 +24,7 @@ , flask-caching , flask-session , flask-wtf -, GitPython +, gitpython , graphviz , gunicorn , httpx @@ -78,15 +77,16 @@ , enabledProviders ? [] }: let - version = "2.4.1"; + version = "2.5.0"; airflow-src = fetchFromGitHub rec { owner = "apache"; repo = "airflow"; rev = "refs/tags/${version}"; - # Required because the GitHub archive tarballs don't appear to include tests - leaveDotGit = true; - sha256 = "sha256-HpPL/ocV7hRhYXsjfXMYvlP83Vh15kXyjBgubsaqaE8="; + # Download using the git protocol rather than using tarballs, because the + # GitHub archive tarballs don't appear to include tests + forceFetchGit = true; + hash = "sha256-QWUXSG+RSHkF5kP1ZYtx+tHjO0n7hfya9CFA3lBhJHk="; }; # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. @@ -136,7 +136,7 @@ buildPythonPackage rec { inherit version; src = airflow-src; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; propagatedBuildInputs = [ alembic @@ -160,7 +160,7 @@ buildPythonPackage rec { flask-session flask-wtf flask-login - GitPython + gitpython graphviz gunicorn httpx @@ -202,8 +202,6 @@ buildPythonPackage rec { typing-extensions unicodecsv werkzeug - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses ] ++ lib.optionals (pythonOlder "3.9") [ importlib-metadata ] ++ providerDependencies; @@ -212,7 +210,7 @@ buildPythonPackage rec { airflow-frontend ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook ]; @@ -225,7 +223,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ --replace "colorlog>=4.0.2, <5.0" "colorlog" \ - --replace "flask-login>=0.6.2" "flask-login" \ + --replace "flask-appbuilder==4.1.4" "flask-appbuilder>=4.1.3" \ --replace "pathspec~=0.9.0" "pathspec" '' + lib.optionalString stdenv.isDarwin '' # Fix failing test on Hydra @@ -283,11 +281,9 @@ buildPythonPackage rec { cd ./pkgs/development/python-modules/apache-airflow curl -O https://raw.githubusercontent.com/apache/airflow/$new_version/airflow/www/yarn.lock curl -O https://raw.githubusercontent.com/apache/airflow/$new_version/airflow/www/package.json - # Note: for 2.3.4 a manual change was needed to get a fully resolved URL for - # caniuse-lite@1.0.30001312 (with the sha after the #). The error from yarn - # was 'Can't make a request in offline mode' from yarn. Corrected install by - # manually running yarn add caniuse-lite@1.0.30001312 and copying the - # requisite section from the generated yarn.lock. + # Revert this commit which seems to break with our version of yarn + # https://github.com/apache/airflow/commit/b9e133e40c2848b0d555051a99bf8d2816fd28a7 + patch -p3 < 0001-Revert-fix-yarn-warning-from-d3-color-27139.patch yarn2nix > yarn.nix # update provider dependencies @@ -298,8 +294,8 @@ buildPythonPackage rec { # You can (manually) test the web UI as follows: # # nix shell .#python3Packages.apache-airflow + # airflow db reset # WARNING: this will wipe any existing db state you might have! # airflow db init - # airflow reset -y # WARNING: this will wipe any existing db state you might have! # airflow standalone # # Then navigate to the localhost URL using the credentials printed, try diff --git a/pkgs/development/python-modules/apache-airflow/providers.nix b/pkgs/development/python-modules/apache-airflow/providers.nix index 3c8205cfcb68..ca9d291c9173 100644 --- a/pkgs/development/python-modules/apache-airflow/providers.nix +++ b/pkgs/development/python-modules/apache-airflow/providers.nix @@ -9,11 +9,11 @@ imports = [ "airflow.providers.alibaba.cloud.hooks.oss" "airflow.providers.alibaba.cloud.operators.oss" ]; }; amazon = { - deps = [ "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.amazon.aws.hooks.appflow" "airflow.providers.amazon.aws.hooks.athena" "airflow.providers.amazon.aws.hooks.base_aws" "airflow.providers.amazon.aws.hooks.batch_client" "airflow.providers.amazon.aws.hooks.batch_waiters" "airflow.providers.amazon.aws.hooks.cloud_formation" "airflow.providers.amazon.aws.hooks.datasync" "airflow.providers.amazon.aws.hooks.dms" "airflow.providers.amazon.aws.hooks.dynamodb" "airflow.providers.amazon.aws.hooks.ec2" "airflow.providers.amazon.aws.hooks.ecs" "airflow.providers.amazon.aws.hooks.eks" "airflow.providers.amazon.aws.hooks.elasticache_replication_group" "airflow.providers.amazon.aws.hooks.emr" "airflow.providers.amazon.aws.hooks.emr" "airflow.providers.amazon.aws.hooks.glacier" "airflow.providers.amazon.aws.hooks.glue" "airflow.providers.amazon.aws.hooks.glue_catalog" "airflow.providers.amazon.aws.hooks.glue_crawler" "airflow.providers.amazon.aws.hooks.kinesis" "airflow.providers.amazon.aws.hooks.lambda_function" "airflow.providers.amazon.aws.hooks.logs" "airflow.providers.amazon.aws.hooks.quicksight" "airflow.providers.amazon.aws.hooks.rds" "airflow.providers.amazon.aws.hooks.redshift_cluster" "airflow.providers.amazon.aws.hooks.redshift_data" "airflow.providers.amazon.aws.hooks.redshift_sql" "airflow.providers.amazon.aws.hooks.s3" "airflow.providers.amazon.aws.hooks.sagemaker" "airflow.providers.amazon.aws.hooks.secrets_manager" "airflow.providers.amazon.aws.hooks.ses" "airflow.providers.amazon.aws.hooks.sns" "airflow.providers.amazon.aws.hooks.sqs" "airflow.providers.amazon.aws.hooks.step_function" "airflow.providers.amazon.aws.hooks.sts" "airflow.providers.amazon.aws.operators.appflow" "airflow.providers.amazon.aws.operators.athena" "airflow.providers.amazon.aws.operators.aws_lambda" "airflow.providers.amazon.aws.operators.batch" "airflow.providers.amazon.aws.operators.cloud_formation" "airflow.providers.amazon.aws.operators.datasync" "airflow.providers.amazon.aws.operators.dms" "airflow.providers.amazon.aws.operators.ec2" "airflow.providers.amazon.aws.operators.ecs" "airflow.providers.amazon.aws.operators.eks" "airflow.providers.amazon.aws.operators.emr" "airflow.providers.amazon.aws.operators.emr" "airflow.providers.amazon.aws.operators.glacier" "airflow.providers.amazon.aws.operators.glue" "airflow.providers.amazon.aws.operators.glue_crawler" "airflow.providers.amazon.aws.operators.lambda_function" "airflow.providers.amazon.aws.operators.quicksight" "airflow.providers.amazon.aws.operators.rds" "airflow.providers.amazon.aws.operators.redshift_cluster" "airflow.providers.amazon.aws.operators.redshift_data" "airflow.providers.amazon.aws.operators.redshift_sql" "airflow.providers.amazon.aws.operators.s3" "airflow.providers.amazon.aws.operators.sagemaker" "airflow.providers.amazon.aws.operators.sns" "airflow.providers.amazon.aws.operators.sqs" "airflow.providers.amazon.aws.operators.step_function" ]; }; apache_beam = { - deps = [ "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.apache.beam.hooks.beam" "airflow.providers.apache.beam.operators.beam" ]; }; apache_cassandra = { @@ -25,7 +25,7 @@ imports = [ "airflow.providers.apache.drill.hooks.drill" "airflow.providers.apache.drill.operators.drill" ]; }; apache_druid = { - deps = [ "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.apache.druid.hooks.druid" "airflow.providers.apache.druid.operators.druid" "airflow.providers.apache.druid.operators.druid_check" ]; }; apache_hdfs = { @@ -33,7 +33,7 @@ imports = [ "airflow.providers.apache.hdfs.hooks.hdfs" "airflow.providers.apache.hdfs.hooks.webhdfs" ]; }; apache_hive = { - deps = [ "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.apache.hive.hooks.hive" "airflow.providers.apache.hive.operators.hive" "airflow.providers.apache.hive.operators.hive_stats" ]; }; apache_kylin = { @@ -133,7 +133,7 @@ imports = [ "airflow.providers.github.hooks.github" "airflow.providers.github.operators.github" ]; }; google = { - deps = [ "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.google.ads.hooks.ads" "airflow.providers.google.ads.operators.ads" "airflow.providers.google.cloud.hooks.automl" "airflow.providers.google.cloud.hooks.bigquery" "airflow.providers.google.cloud.hooks.bigquery_dts" "airflow.providers.google.cloud.hooks.bigtable" "airflow.providers.google.cloud.hooks.cloud_build" "airflow.providers.google.cloud.hooks.cloud_composer" "airflow.providers.google.cloud.hooks.cloud_memorystore" "airflow.providers.google.cloud.hooks.cloud_sql" "airflow.providers.google.cloud.hooks.cloud_storage_transfer_service" "airflow.providers.google.cloud.hooks.compute" "airflow.providers.google.cloud.hooks.compute_ssh" "airflow.providers.google.cloud.hooks.datacatalog" "airflow.providers.google.cloud.hooks.dataflow" "airflow.providers.google.cloud.hooks.dataform" "airflow.providers.google.cloud.hooks.datafusion" "airflow.providers.google.cloud.hooks.dataplex" "airflow.providers.google.cloud.hooks.dataprep" "airflow.providers.google.cloud.hooks.dataproc" "airflow.providers.google.cloud.hooks.dataproc_metastore" "airflow.providers.google.cloud.hooks.datastore" "airflow.providers.google.cloud.hooks.dlp" "airflow.providers.google.cloud.hooks.functions" "airflow.providers.google.cloud.hooks.gcs" "airflow.providers.google.cloud.hooks.gdm" "airflow.providers.google.cloud.hooks.kms" "airflow.providers.google.cloud.hooks.kubernetes_engine" "airflow.providers.google.cloud.hooks.life_sciences" "airflow.providers.google.cloud.hooks.looker" "airflow.providers.google.cloud.hooks.mlengine" "airflow.providers.google.cloud.hooks.natural_language" "airflow.providers.google.cloud.hooks.os_login" "airflow.providers.google.cloud.hooks.pubsub" "airflow.providers.google.cloud.hooks.secret_manager" "airflow.providers.google.cloud.hooks.spanner" "airflow.providers.google.cloud.hooks.speech_to_text" "airflow.providers.google.cloud.hooks.stackdriver" "airflow.providers.google.cloud.hooks.tasks" "airflow.providers.google.cloud.hooks.text_to_speech" "airflow.providers.google.cloud.hooks.translate" "airflow.providers.google.cloud.hooks.vertex_ai.auto_ml" "airflow.providers.google.cloud.hooks.vertex_ai.batch_prediction_job" "airflow.providers.google.cloud.hooks.vertex_ai.custom_job" "airflow.providers.google.cloud.hooks.vertex_ai.dataset" "airflow.providers.google.cloud.hooks.vertex_ai.endpoint_service" "airflow.providers.google.cloud.hooks.vertex_ai.hyperparameter_tuning_job" "airflow.providers.google.cloud.hooks.vertex_ai.model_service" "airflow.providers.google.cloud.hooks.video_intelligence" "airflow.providers.google.cloud.hooks.vision" "airflow.providers.google.cloud.hooks.workflows" "airflow.providers.google.cloud.operators.automl" "airflow.providers.google.cloud.operators.bigquery" "airflow.providers.google.cloud.operators.bigquery_dts" "airflow.providers.google.cloud.operators.bigtable" "airflow.providers.google.cloud.operators.cloud_build" "airflow.providers.google.cloud.operators.cloud_composer" "airflow.providers.google.cloud.operators.cloud_memorystore" "airflow.providers.google.cloud.operators.cloud_sql" "airflow.providers.google.cloud.operators.cloud_storage_transfer_service" "airflow.providers.google.cloud.operators.compute" "airflow.providers.google.cloud.operators.datacatalog" "airflow.providers.google.cloud.operators.dataflow" "airflow.providers.google.cloud.operators.dataform" "airflow.providers.google.cloud.operators.datafusion" "airflow.providers.google.cloud.operators.dataplex" "airflow.providers.google.cloud.operators.dataprep" "airflow.providers.google.cloud.operators.dataproc" "airflow.providers.google.cloud.operators.dataproc_metastore" "airflow.providers.google.cloud.operators.datastore" "airflow.providers.google.cloud.operators.dlp" "airflow.providers.google.cloud.operators.functions" "airflow.providers.google.cloud.operators.gcs" "airflow.providers.google.cloud.operators.kubernetes_engine" "airflow.providers.google.cloud.operators.life_sciences" "airflow.providers.google.cloud.operators.looker" "airflow.providers.google.cloud.operators.mlengine" "airflow.providers.google.cloud.operators.natural_language" "airflow.providers.google.cloud.operators.pubsub" "airflow.providers.google.cloud.operators.spanner" "airflow.providers.google.cloud.operators.speech_to_text" "airflow.providers.google.cloud.operators.stackdriver" "airflow.providers.google.cloud.operators.tasks" "airflow.providers.google.cloud.operators.text_to_speech" "airflow.providers.google.cloud.operators.translate" "airflow.providers.google.cloud.operators.translate_speech" "airflow.providers.google.cloud.operators.translate_speech" "airflow.providers.google.cloud.operators.vertex_ai.auto_ml" "airflow.providers.google.cloud.operators.vertex_ai.batch_prediction_job" "airflow.providers.google.cloud.operators.vertex_ai.custom_job" "airflow.providers.google.cloud.operators.vertex_ai.dataset" "airflow.providers.google.cloud.operators.vertex_ai.endpoint_service" "airflow.providers.google.cloud.operators.vertex_ai.hyperparameter_tuning_job" "airflow.providers.google.cloud.operators.vertex_ai.model_service" "airflow.providers.google.cloud.operators.video_intelligence" "airflow.providers.google.cloud.operators.vision" "airflow.providers.google.cloud.operators.workflows" "airflow.providers.google.common.hooks.base_google" "airflow.providers.google.common.hooks.discovery_api" "airflow.providers.google.firebase.hooks.firestore" "airflow.providers.google.firebase.operators.firestore" "airflow.providers.google.leveldb.hooks.leveldb" "airflow.providers.google.leveldb.operators.leveldb" "airflow.providers.google.marketing_platform.hooks.analytics" "airflow.providers.google.marketing_platform.hooks.campaign_manager" "airflow.providers.google.marketing_platform.hooks.display_video" "airflow.providers.google.marketing_platform.hooks.search_ads" "airflow.providers.google.marketing_platform.operators.analytics" "airflow.providers.google.marketing_platform.operators.campaign_manager" "airflow.providers.google.marketing_platform.operators.display_video" "airflow.providers.google.marketing_platform.operators.search_ads" "airflow.providers.google.suite.hooks.calendar" "airflow.providers.google.suite.hooks.drive" "airflow.providers.google.suite.hooks.sheets" "airflow.providers.google.suite.operators.sheets" ]; }; grpc = { @@ -141,7 +141,7 @@ imports = [ "airflow.providers.grpc.hooks.grpc" "airflow.providers.grpc.operators.grpc" ]; }; hashicorp = { - deps = [ "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "hvac" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "hvac" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.hashicorp.hooks.vault" ]; }; http = { @@ -169,7 +169,7 @@ imports = [ "airflow.providers.jira.hooks.jira" "airflow.providers.jira.operators.jira" ]; }; microsoft_azure = { - deps = [ "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.microsoft.azure.hooks.adx" "airflow.providers.microsoft.azure.hooks.asb" "airflow.providers.microsoft.azure.hooks.azure_batch" "airflow.providers.microsoft.azure.hooks.azure_container_instance" "airflow.providers.microsoft.azure.hooks.azure_container_registry" "airflow.providers.microsoft.azure.hooks.azure_container_volume" "airflow.providers.microsoft.azure.hooks.azure_cosmos" "airflow.providers.microsoft.azure.hooks.azure_data_factory" "airflow.providers.microsoft.azure.hooks.azure_data_lake" "airflow.providers.microsoft.azure.hooks.azure_fileshare" "airflow.providers.microsoft.azure.hooks.base_azure" "airflow.providers.microsoft.azure.hooks.batch" "airflow.providers.microsoft.azure.hooks.container_instance" "airflow.providers.microsoft.azure.hooks.container_registry" "airflow.providers.microsoft.azure.hooks.container_volume" "airflow.providers.microsoft.azure.hooks.cosmos" "airflow.providers.microsoft.azure.hooks.data_factory" "airflow.providers.microsoft.azure.hooks.data_lake" "airflow.providers.microsoft.azure.hooks.fileshare" "airflow.providers.microsoft.azure.hooks.synapse" "airflow.providers.microsoft.azure.hooks.wasb" "airflow.providers.microsoft.azure.operators.adls" "airflow.providers.microsoft.azure.operators.adls_delete" "airflow.providers.microsoft.azure.operators.adls_list" "airflow.providers.microsoft.azure.operators.adx" "airflow.providers.microsoft.azure.operators.asb" "airflow.providers.microsoft.azure.operators.azure_batch" "airflow.providers.microsoft.azure.operators.azure_container_instances" "airflow.providers.microsoft.azure.operators.azure_cosmos" "airflow.providers.microsoft.azure.operators.batch" "airflow.providers.microsoft.azure.operators.container_instances" "airflow.providers.microsoft.azure.operators.cosmos" "airflow.providers.microsoft.azure.operators.data_factory" "airflow.providers.microsoft.azure.operators.synapse" "airflow.providers.microsoft.azure.operators.wasb_delete_blob" ]; }; microsoft_mssql = { @@ -189,7 +189,7 @@ imports = [ "airflow.providers.mongo.hooks.mongo" ]; }; mysql = { - deps = [ "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.mysql.hooks.mysql" "airflow.providers.mysql.operators.mysql" ]; }; neo4j = { @@ -225,11 +225,11 @@ imports = [ "airflow.providers.plexus.hooks.plexus" "airflow.providers.plexus.operators.job" ]; }; postgres = { - deps = [ "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.postgres.hooks.postgres" "airflow.providers.postgres.operators.postgres" ]; }; presto = { - deps = [ "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.presto.hooks.presto" ]; }; qubole = { @@ -293,7 +293,7 @@ imports = [ "airflow.providers.telegram.hooks.telegram" "airflow.providers.telegram.operators.telegram" ]; }; trino = { - deps = [ "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.trino.hooks.trino" "airflow.providers.trino.operators.trino" ]; }; vertica = { diff --git a/pkgs/development/python-modules/apache-airflow/yarn.lock b/pkgs/development/python-modules/apache-airflow/yarn.lock index 006831b90b29..bc6b63421bc2 100644 --- a/pkgs/development/python-modules/apache-airflow/yarn.lock +++ b/pkgs/development/python-modules/apache-airflow/yarn.lock @@ -7166,14 +7166,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2: - 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" - -json5@^2.2.1: +json5@^2.1.2, json5@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== @@ -7258,9 +7251,9 @@ loader-runner@^4.2.0: integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== loader-utils@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" - integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== + version "1.4.1" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.1.tgz#278ad7006660bccc4d2c0c1578e17c5c78d5c0e0" + integrity sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q== dependencies: big.js "^5.2.2" emojis-list "^3.0.0" @@ -7606,7 +7599,12 @@ minimist-options@4.1.0: is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: +minimist@^1.2.0: + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== + +minimist@^1.2.5, 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== diff --git a/pkgs/development/python-modules/apache-airflow/yarn.nix b/pkgs/development/python-modules/apache-airflow/yarn.nix index 0fc3dd1da260..956930b71c9c 100644 --- a/pkgs/development/python-modules/apache-airflow/yarn.nix +++ b/pkgs/development/python-modules/apache-airflow/yarn.nix @@ -7121,14 +7121,6 @@ sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; }; } - { - 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 = "json5___json5_2.2.1.tgz"; path = fetchurl { @@ -7242,11 +7234,11 @@ }; } { - name = "loader_utils___loader_utils_1.4.0.tgz"; + name = "loader_utils___loader_utils_1.4.1.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"; - sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; + name = "loader_utils___loader_utils_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.1.tgz"; + sha512 = "1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q=="; }; } { @@ -7673,6 +7665,14 @@ sha512 = "Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A=="; }; } + { + name = "minimist___minimist_1.2.7.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz"; + sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; + }; + } { name = "minimist___minimist_1.2.6.tgz"; path = fetchurl { diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 612cb70d6f65..08d69424e579 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -45,13 +45,13 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.40.0"; + version = "2.43.0"; src = fetchFromGitHub { owner = "apache"; repo = "beam"; - rev = "v${version}"; - sha256 = "sha256-0S7Dj6PMSbZkEAY6ZLUpKVfe/tFxsq60TTAFj0Qhtv0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-lqGXCC66eyBnHcK06k9knggX5C+2d0m6xBAI5sh0RHo="; }; patches = [ @@ -62,6 +62,13 @@ buildPythonPackage rec { hash = "sha256-iUmnzrItTFM98w3mpadzrmtI3t0fucpSujAg/6qxCGk="; stripLen = 2; }) + (fetchpatch { + # https://github.com/apache/beam/pull/24573 + name = "relax-httplib2-version.patch"; + url = "https://github.com/apache/beam/commit/4045503575ae5ccef3de8d7b868c54e37fef658b.patch"; + hash = "sha256-YqT+sHaa1R9vLQnEQN2K0lYoCdnGoPY9qduGBpXPaek="; + stripLen = 2; + }) ]; pythonRelaxDeps = [ @@ -114,7 +121,7 @@ buildPythonPackage rec { "apache_beam" ]; - checkInputs = [ + nativeCheckInputs = [ freezegun mock pandas diff --git a/pkgs/development/python-modules/apcaccess/default.nix b/pkgs/development/python-modules/apcaccess/default.nix index 4b1401d61e57..75cde6f4bfe9 100644 --- a/pkgs/development/python-modules/apcaccess/default.nix +++ b/pkgs/development/python-modules/apcaccess/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { "apcaccess" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index 3179f9be6f3a..efea1e3302f4 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { hatchling ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 9ad41715a231..1a85922e5dd5 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "apispec"; - version = "5.2.2"; + version = "6.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bqZULh6//p/ZW6Ae8/UTUerGwgCpdFYsdHMFm5zSCqc="; + hash = "sha256-522Atznt70viEwkqY4Stf9kzun1k9tWgr/jU2hvveIc="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { prance ]; - checkInputs = [ + nativeCheckInputs = [ openapi-spec-validator marshmallow mock @@ -39,6 +39,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/marshmallow-code/apispec/blob/${version}/CHANGELOG.rst"; description = "A pluggable API specification generator with support for the OpenAPI Specification"; homepage = "https://github.com/marshmallow-code/apispec"; license = licenses.mit; diff --git a/pkgs/development/python-modules/aplpy/default.nix b/pkgs/development/python-modules/aplpy/default.nix index 47a1de3c0d8d..6254a902eeab 100644 --- a/pkgs/development/python-modules/aplpy/default.nix +++ b/pkgs/development/python-modules/aplpy/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { shapely ]; - checkInputs = [ + nativeCheckInputs = [ pytest-astropy pytestCheckHook ]; diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 864dd570209e..671f4714ffb4 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -7,30 +7,29 @@ , gntp , installShellFiles , markdown -, mock , paho-mqtt +, pytest-mock +, pytest-xdist , pytestCheckHook , pythonOlder , pyyaml , requests , requests-oauthlib -, slixmpp }: buildPythonPackage rec { pname = "apprise"; - version = "1.1.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-92eoBwp3fcKb9zCBeeC2ndLeZeZpM+2JsZmef/5yO2A="; + hash = "sha256-Z+DCJ+7O4mAACYDbv4uh5e69vklPRzCAgpfJ5kXANXk="; }; nativeBuildInputs = [ - babel installShellFiles ]; @@ -43,12 +42,13 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ + babel gntp - mock paho-mqtt + pytest-mock + pytest-xdist pytestCheckHook - slixmpp ]; disabledTests = [ @@ -72,6 +72,7 @@ buildPythonPackage rec { meta = with lib; { description = "Push Notifications that work with just about every platform"; homepage = "https://github.com/caronc/apprise"; + changelog = "https://github.com/caronc/apprise/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; }; diff --git a/pkgs/development/python-modules/approval-utilities/default.nix b/pkgs/development/python-modules/approval-utilities/default.nix new file mode 100644 index 000000000000..3b21c3ffab83 --- /dev/null +++ b/pkgs/development/python-modules/approval-utilities/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, approvaltests +, pythonOlder +}: + +buildPythonPackage rec { + pname = "approval-utilities"; + inherit (approvaltests) version src; + disabled = pythonOlder "3.7"; + format = "setuptools"; + + postPatch = '' + mv setup.approval_utilities.py setup.py + ''; + + pythonImportsCheck = [ "approval_utilities" ]; + + # upstream has no tests + doCheck = false; + + meta = { + description = "Utilities for your production code that work well with approvaltests"; + homepage = "https://github.com/approvals/ApprovalTests.Python"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 3ad36749e0e2..066af243f627 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -5,10 +5,13 @@ # propagates , allpairspy +, approval-utilities , beautifulsoup4 , empty-files +, mrjob , pyperclip , pytest +, typing-extensions # tests , numpy @@ -16,29 +19,32 @@ }: buildPythonPackage rec { - version = "5.4.2"; + version = "8.1.0"; pname = "approvaltests"; format = "setuptools"; - disabled = pythonOlder "3.6.1"; + disabled = pythonOlder "3.7"; # no tests included in PyPI tarball src = fetchFromGitHub { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ZXtIM3McpfDFCaedlbJ6SU+Er5NyfI8kGnrn7sb1V5M="; + hash = "sha256-01OgofksXFglohcQtJqkir/nqBJArw3pXEmnX9P7rOA="; }; propagatedBuildInputs = [ allpairspy + approval-utilities beautifulsoup4 empty-files + mrjob pyperclip pytest + typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ numpy pytestCheckHook ]; diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 9a23a9603b95..3fbd115edd4f 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -1,20 +1,21 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, requests , appdirs -, tabulate +, buildPythonPackage +, cvss +, fetchFromGitHub +, httpx , msgpack , orjson -, semver , packageurl-python -, pythonOlder , pytestCheckHook +, pythonOlder +, semver +, tabulate }: buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "2.0.9"; + version = "4.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,20 +24,21 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - sha256 = "sha256-A5mphFJEjOkTG5Rv7tb4hm5eDMSir69gqkbHYn6109I="; + hash = "sha256-HZHHSY8a7xyJZAQLFeZ+5+CKixcquJcUkkjJTllFiyk="; }; propagatedBuildInputs = [ - requests appdirs - tabulate + cvss + httpx msgpack orjson - semver packageurl-python - ]; + semver + tabulate + ] ++ httpx.optional-dependencies.http2; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -62,6 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Vulnerability database and package search for sources such as OSV, NVD, GitHub and npm"; homepage = "https://github.com/appthreat/vulnerability-db"; + changelog = "https://github.com/AppThreat/vulnerability-db/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix index c2c14fba3735..d7b2db71c79c 100644 --- a/pkgs/development/python-modules/apptools/default.nix +++ b/pkgs/development/python-modules/apptools/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { importlib-resources ]; - checkInputs = [ + nativeCheckInputs = [ tables pandas pytestCheckHook diff --git a/pkgs/development/python-modules/aprslib/default.nix b/pkgs/development/python-modules/aprslib/default.nix index 789b506e7ff6..ce73dadd8d66 100644 --- a/pkgs/development/python-modules/aprslib/default.nix +++ b/pkgs/development/python-modules/aprslib/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ + nativeCheckInputs = [ mox3 pytestCheckHook ]; diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index b93a3187afe5..f8fdf1612174 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.39.4.0"; + version = "3.40.0.0"; format = "setuptools"; disabled = isPyPy; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = "refs/tags/${version}"; - hash = "sha256-vFPvevtAAEHG34G2ZPbETo/Erjem4G9r7xvkEoPBlLQ="; + hash = "sha256-Bi2pW+8vFLcYnatlqsfnwqfCpV2cjannYaTqgIlfNNM="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index a3dd440d43b1..894a30c7c606 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.4"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-+GVXmqoF9r/GPv2S7KP+PTS2WTeubhLBNaA9MXw5lRo="; + hash = "sha256-WnxH/AKi7j2u1SWVtyggUD09OqXfOST1Ayr9DrbYMcQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aqipy-atmotech/default.nix b/pkgs/development/python-modules/aqipy-atmotech/default.nix index fdecad826c12..a9b82ca6ad19 100644 --- a/pkgs/development/python-modules/aqipy-atmotech/default.nix +++ b/pkgs/development/python-modules/aqipy-atmotech/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-tqHhfJmtVFUSO57Cid9y3LK4pOoG7ROtwDT2hY5IE1Y="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aqualogic/default.nix b/pkgs/development/python-modules/aqualogic/default.nix index 255248e8d924..a1b302dd9f37 100644 --- a/pkgs/development/python-modules/aqualogic/default.nix +++ b/pkgs/development/python-modules/aqualogic/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/arabic-reshaper/default.nix b/pkgs/development/python-modules/arabic-reshaper/default.nix index 88675337b4cd..f9c82cd0a699 100644 --- a/pkgs/development/python-modules/arabic-reshaper/default.nix +++ b/pkgs/development/python-modules/arabic-reshaper/default.nix @@ -1,26 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, future, configparser, isPy27 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fonttools +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - pname = "arabic_reshaper"; - version = "2.1.3"; + pname = "arabic-reshaper"; + version = "3.0.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "a236fc6e9dde2a61cc6a5ca962b522e42694e1bb2a2d86894ed7a4eba4ce1890"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mpcabd"; + repo = "python-arabic-reshaper"; + rev = "refs/tags/v${version}"; + hash = "sha256-ucSC5aTvpnlAVQcT0afVecnoN3hIZKtzUhEQ6Qg0jQM="; }; - propagatedBuildInputs = [ future ] - ++ lib.optionals isPy27 [ configparser ]; + passthru.optional-dependencies = { + with-fonttools = [ + fonttools + ]; + }; - # Tests are not published on pypi - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "arabic_reshaper" ]; + pythonImportsCheck = [ + "arabic_reshaper" + ]; meta = with lib; { - homepage = "https://github.com/mpcabd/python-arabic-reshaper"; description = "Reconstruct Arabic sentences to be used in applications that don't support Arabic"; - platforms = platforms.unix; + homepage = "https://github.com/mpcabd/python-arabic-reshaper"; + changelog = "https://github.com/mpcabd/python-arabic-reshaper/releases/tag/v${version}"; + license = with licenses; [ mit ]; maintainers = with maintainers; [ freezeboy ]; }; } diff --git a/pkgs/development/python-modules/aranet4/default.nix b/pkgs/development/python-modules/aranet4/default.nix new file mode 100644 index 000000000000..6ea81a8347a3 --- /dev/null +++ b/pkgs/development/python-modules/aranet4/default.nix @@ -0,0 +1,43 @@ +{ lib +, bleak +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "aranet4"; + version = "2.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Anrijs"; + repo = "Aranet4-Python"; + rev = "refs/tags/v${version}"; + hash = "sha256-5q4eOC9iuN8pUmDsiQ7OwEXkxi4KdL+bhGVjlQlTBAg="; + }; + + propagatedBuildInputs = [ + bleak + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aranet4" + ]; + + meta = with lib; { + description = "Module to interact with Aranet4 devices"; + homepage = "https://github.com/Anrijs/Aranet4-Python"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/arc4/default.nix b/pkgs/development/python-modules/arc4/default.nix index 962187700358..17f3a0f54f00 100644 --- a/pkgs/development/python-modules/arc4/default.nix +++ b/pkgs/development/python-modules/arc4/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-z8zj46/xX/gXtWzlmnHuAsnK3xYCL4NM5/xpYcH+Qlo="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix index a1f4892a245f..c44126537794 100644 --- a/pkgs/development/python-modules/arcam-fmj/default.nix +++ b/pkgs/development/python-modules/arcam-fmj/default.nix @@ -12,15 +12,16 @@ buildPythonPackage rec { pname = "arcam-fmj"; - version = "0.12.0"; + version = "1.1.0"; + format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "elupus"; repo = "arcam_fmj"; - rev = version; - sha256 = "sha256-YkoABsOLEl1gSCRgZr0lLZGzicr3N5KRNLDjfuQhy2U="; + rev = "refs/tags/${version}"; + hash = "sha256-oXMoDpb4tg4iYAanTfPzeFp/IQl4bIELCTdM24hM84A="; }; propagatedBuildInputs = [ @@ -29,7 +30,7 @@ buildPythonPackage rec { defusedxml ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytest-mock pytestCheckHook @@ -45,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for speaking to Arcam receivers"; homepage = "https://github.com/elupus/arcam_fmj"; + changelog = "https://github.com/elupus/arcam_fmj/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index dd1f76fa9709..22a460cc2741 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.25"; + version = "9.2.36"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,14 +17,14 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-9uOv7h5UUWIZTWB7A+7ikG6ReE1FBHIeNAVY6QBhzmE="; + hash = "sha256-anZsvDIH1AWaFUG5UTuyQiOKeoUB/+MSbu5pjPZJxag="; }; nativeBuildInputs = [ setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/archspec/default.nix b/pkgs/development/python-modules/archspec/default.nix index ea48798b6898..85772c41cb2c 100644 --- a/pkgs/development/python-modules/archspec/default.nix +++ b/pkgs/development/python-modules/archspec/default.nix @@ -1,35 +1,49 @@ { lib , buildPythonPackage -, fetchFromGitHub -, poetry-core , click -, six -, pytestCheckHook +, fetchFromGitHub , jsonschema +, poetry-core +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "archspec"; - version = "0.1.4"; + version = "0.2.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; - sha256 = "sha256-ScigEpYNArveqi5tlqiA7LwsVs2RkjT+GChxhSy/ndw="; + hash = "sha256-Zu7/zx3FTVJVGpAdRDdnLBokeodspZg6ou/GBaqz4XY="; }; - nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ click six ]; - checkInputs = [ pytestCheckHook jsonschema ]; + nativeBuildInputs = [ + poetry-core + ]; - pythonImportsCheck = [ "archspec" ]; + propagatedBuildInputs = [ + click + ]; + + nativeCheckInputs = [ + pytestCheckHook + jsonschema + ]; + + pythonImportsCheck = [ + "archspec" + ]; meta = with lib; { - description = "A library for detecting, labeling, and reasoning about microarchitectures"; - homepage = "https://archspec.readthedocs.io/en/latest/"; + description = "Library for detecting, labeling, and reasoning about microarchitectures"; + homepage = "https://archspec.readthedocs.io/"; + changelog = "https://github.com/archspec/archspec/releases/tag/v0.2.0"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ atila ]; }; diff --git a/pkgs/development/python-modules/aresponses/default.nix b/pkgs/development/python-modules/aresponses/default.nix index 7bb54f33d513..06c7b1a9dad3 100644 --- a/pkgs/development/python-modules/aresponses/default.nix +++ b/pkgs/development/python-modules/aresponses/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pytest-asyncio ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 0aa3e8c1b948..5bf20d82b2fe 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; # meant to be ran with interactive interpreter # re-enable if we are able to make testing work - # checkInputs = [ bashInteractive coverage flake8 ]; + # nativeCheckInputs = [ bashInteractive coverage flake8 ]; propagatedBuildInputs = [ dicttoxml diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix index fd9ff184000f..bdc2a078a8a5 100644 --- a/pkgs/development/python-modules/argh/default.nix +++ b/pkgs/development/python-modules/argh/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ + nativeCheckInputs = [ iocapture mock pytestCheckHook diff --git a/pkgs/development/python-modules/argon2-cffi/default.nix b/pkgs/development/python-modules/argon2-cffi/default.nix index ed79243a6bd1..24e32526682f 100644 --- a/pkgs/development/python-modules/argon2-cffi/default.nix +++ b/pkgs/development/python-modules/argon2-cffi/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ARGON2_CFFI_USE_SSE2 = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) "0"; - checkInputs = [ hypothesis pytest wheel ]; + nativeCheckInputs = [ hypothesis pytest wheel ]; checkPhase = '' pytest tests ''; diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 2a7e6cb0df95..e505ac015bca 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -1,41 +1,82 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, aria2, poetry, pytest, pytest-cov, pytest-xdist, responses -, asciimatics, loguru, requests, setuptools, websocket-client +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pdm-pep517 +, appdirs +, loguru +, requests +, setuptools +, toml +, websocket-client +, asciimatics +, pyperclip +, aria2 +, fastapi +, pytest-xdist +, pytestCheckHook +, responses +, uvicorn }: buildPythonPackage rec { pname = "aria2p"; - version = "0.9.1"; + version = "0.11.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pawamoy"; repo = pname; - rev = "v${version}"; - sha256 = "1s4kad6jnfz9p64gkqclkfq2x2bn8dbc0hyr86d1545bgn7pz672"; + rev = version; + hash = "sha256-z74ej6J6Yh1aVsXR5fE+XhoCzCS+zfDxQL8gKFd7tBA="; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ + pdm-pep517 + ]; - preBuild = '' + propagatedBuildInputs = [ + appdirs + loguru + requests + setuptools # for pkg_resources + toml + websocket-client + ]; + + passthru.optional-dependencies = { + tui = [ asciimatics pyperclip ]; + }; + + preCheck = '' export HOME=$TMPDIR ''; - checkInputs = [ aria2 responses pytest pytest-cov pytest-xdist ]; + nativeCheckInputs = [ + aria2 + fastapi + pytest-xdist + pytestCheckHook + responses + uvicorn + ] ++ passthru.optional-dependencies.tui; - # Tests are not all stable/deterministic, - # they rely on actually running an aria2c daemon and communicating with it, - # race conditions and deadlocks were observed, - # thus the corresponding tests are disabled - checkPhase = '' - pytest -nauto -k "not test_api and not test_cli and not test_interface" - ''; + disabledTests = [ + # require a running display server + "test_add_downloads_torrents_and_metalinks" + "test_add_downloads_uris" + # require a running aria2 server + "test_get_files_method" + "test_pause_subcommand" + "test_resume_method" + ]; - propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket-client ]; + pythonImportsCheck = [ "aria2p" ]; meta = with lib; { homepage = "https://github.com/pawamoy/aria2p"; + changelog = "https://github.com/pawamoy/aria2p/blob/${src.rev}/CHANGELOG.md"; description = "Command-line tool and library to interact with an aria2c daemon process with JSON-RPC"; license = licenses.isc; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/ariadne/default.nix b/pkgs/development/python-modules/ariadne/default.nix new file mode 100644 index 000000000000..d88b199600c7 --- /dev/null +++ b/pkgs/development/python-modules/ariadne/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, freezegun +, graphql-core +, opentracing +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +, snapshottest +, starlette +, typing-extensions +, werkzeug +}: + +buildPythonPackage rec { + pname = "ariadne"; + version = "0.17.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mirumee"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-LRsijp2N0L4QCvPt0vWBX0qE4yqDDKtMcTBQ/eAkljA="; + }; + + propagatedBuildInputs = [ + graphql-core + starlette + typing-extensions + ]; + + nativeCheckInputs = [ + freezegun + opentracing + pytest-asyncio + pytest-mock + pytestCheckHook + snapshottest + werkzeug + ]; + + pythonImportsCheck = [ + "ariadne" + ]; + + disabledTests = [ + # TypeError: TestClient.request() got an unexpected keyword argument 'content' + "test_attempt_parse_request_missing_content_type_raises_bad_request_error" + "test_attempt_parse_non_json_request_raises_bad_request_error" + "test_attempt_parse_non_json_request_body_raises_bad_request_error" + ]; + + meta = with lib; { + description = "Python library for implementing GraphQL servers using schema-first approach"; + homepage = "https://ariadnegraphql.org"; + changelog = "https://github.com/mirumee/ariadne/blob/${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/arnparse/default.nix b/pkgs/development/python-modules/arnparse/default.nix index c2bd8bfa47a8..96f2fb3f6d70 100644 --- a/pkgs/development/python-modules/arnparse/default.nix +++ b/pkgs/development/python-modules/arnparse/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-2+wxzYoS/KJXjYM6lZguxbr2Oxobo0eFNnzWZHLi0WM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix index d3d320785293..7add80472cc7 100644 --- a/pkgs/development/python-modules/arpeggio/default.nix +++ b/pkgs/development/python-modules/arpeggio/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { --replace "pytest-runner" "" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "arpeggio" ]; diff --git a/pkgs/development/python-modules/arris-tg2492lg/default.nix b/pkgs/development/python-modules/arris-tg2492lg/default.nix index 9a883b2f68ee..9f6d8f6db1e6 100644 --- a/pkgs/development/python-modules/arris-tg2492lg/default.nix +++ b/pkgs/development/python-modules/arris-tg2492lg/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index ff626a5b4813..71ce479f2c2e 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ python-dateutil ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock pytz diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 4dd4415127f2..12b09b3bfcc0 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, bokeh , emcee , matplotlib , netcdf4 @@ -19,6 +18,7 @@ , xarray , xarray-einstats , zarr +, ffmpeg , h5py , jaxlib , torchvision @@ -55,10 +55,10 @@ buildPythonPackage rec { xarray-einstats ]; - checkInputs = [ - bokeh + nativeCheckInputs = [ cloudpickle emcee + ffmpeg h5py jax jaxlib diff --git a/pkgs/development/python-modules/arxiv2bib/default.nix b/pkgs/development/python-modules/arxiv2bib/default.nix index 54a6280017ae..bcffe0c3bb1d 100644 --- a/pkgs/development/python-modules/arxiv2bib/default.nix +++ b/pkgs/development/python-modules/arxiv2bib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1kp2iyx20lpc9dv4qg5fgwf83a1wx6f7hj1ldqyncg0kn9xcrhbg"; }; - checkInputs = [ unittestCheckHook mock ]; + nativeCheckInputs = [ unittestCheckHook mock ]; unittestFlagsArray = [ "-s" "tests" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 24e189cb55b5..5f27e8c131b5 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -6,12 +6,11 @@ , requests , requests-oauthlib , responses -, six }: buildPythonPackage rec { pname = "asana"; - version = "2.0.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,16 +19,15 @@ buildPythonPackage rec { owner = "asana"; repo = "python-asana"; rev = "refs/tags/v${version}"; - sha256 = "sha256-sY7M446krFIcyWkN2pk9FTa+VTXEOZ6xnHePx35e8IY="; + hash = "sha256-+lktPFCL2c79dNGgbsaFJRELmV6sJ2kiBSb8kd9XPIQ="; }; propagatedBuildInputs = [ requests requests-oauthlib - six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; @@ -41,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client library for Asana"; homepage = "https://github.com/asana/python-asana"; + changelog = "https://github.com/Asana/python-asana/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix index 3854abed09f8..ea6c513e18f8 100644 --- a/pkgs/development/python-modules/asciimatics/default.nix +++ b/pkgs/development/python-modules/asciimatics/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { future ]; - checkInputs = [ + nativeCheckInputs = [ mock nose ]; diff --git a/pkgs/development/python-modules/asciitree/default.nix b/pkgs/development/python-modules/asciitree/default.nix index 814cf1a3d410..9e0ac79eefac 100644 --- a/pkgs/development/python-modules/asciitree/default.nix +++ b/pkgs/development/python-modules/asciitree/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "071wlpyi8pa262sj9xdy0zbj163z84dasxad363z3sfndqxw78h1"; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index e12f3702a90a..4ce55b4d483c 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { importlib-resources ]; - checkInputs = [ + nativeCheckInputs = [ astropy lz4 pytest-astropy diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 6e857499f651..b0d2b1f72386 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "5.0.2"; + version = "6.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-Jynks+c8OV0t1GoKAk4vP9jYQ0PclJHl3x8q78au5gk="; + hash = "sha256-kbeIGIn8HMXROPiQSmwx3lo7wEX8SDuHYgxh4ws89Mo="; }; propagatedBuildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { wktutils ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix index a11d1c703044..506fbc46f2e8 100644 --- a/pkgs/development/python-modules/asgi-csrf/default.nix +++ b/pkgs/development/python-modules/asgi-csrf/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { python-multipart ]; - checkInputs = [ + nativeCheckInputs = [ httpx pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/asgineer/default.nix b/pkgs/development/python-modules/asgineer/default.nix index 3a1861bbd182..2559cda2a018 100644 --- a/pkgs/development/python-modules/asgineer/default.nix +++ b/pkgs/development/python-modules/asgineer/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0hd1i9pc8m7sc8bkn31q4ygkmnl5vklrcziq9zkdiqaqm8clyhcx"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests ]; diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 4ccbe3175cc8..72d9a9707323 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { async-timeout ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/asks/default.nix b/pkgs/development/python-modules/asks/default.nix index c67841c03463..088e946c93d1 100644 --- a/pkgs/development/python-modules/asks/default.nix +++ b/pkgs/development/python-modules/asks/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { h11 ]; - checkInputs = [ + nativeCheckInputs = [ curio overly pytestCheckHook diff --git a/pkgs/development/python-modules/asn1/default.nix b/pkgs/development/python-modules/asn1/default.nix index 7e1b8834cd0e..4e62df50aff5 100644 --- a/pkgs/development/python-modules/asn1/default.nix +++ b/pkgs/development/python-modules/asn1/default.nix @@ -8,22 +8,23 @@ buildPythonPackage rec { pname = "asn1"; - version = "2.6.0"; + version = "2.7.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "andrivet"; repo = "python-asn1"; - rev = "v${version}"; - sha256 = "sha256-oz9xZhFU4himXttVtfW6tTn7lfB0c7MlgxtbKxdJtUA="; + rev = "refs/tags/v${version}"; + hash = "sha256-pXLG2Mkrv6EeJn6Dk+SefzNtrPdQ6of95LbVTKjTADQ="; }; propagatedBuildInputs = [ future ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -32,13 +33,18 @@ buildPythonPackage rec { --replace "enum-compat" "" ''; - pytestFlagsArray = [ "tests/test_asn1.py" ]; + pytestFlagsArray = [ + "tests/test_asn1.py" + ]; - pythonImportsCheck = [ "asn1" ]; + pythonImportsCheck = [ + "asn1" + ]; meta = with lib; { description = "Python ASN.1 encoder and decoder"; homepage = "https://github.com/andrivet/python-asn1"; + changelog = "https://github.com/andrivet/python-asn1/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index 0c071c4206b0..8e649ed7cd25 100644 --- a/pkgs/development/python-modules/asn1crypto/default.nix +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "sha256-M8vASxhaJPgkiTrAckxz7gk/QHkrFlNz7fFbnLEBT+M="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix index 9168d9dcb43f..d9747450a336 100644 --- a/pkgs/development/python-modules/asn1tools/default.nix +++ b/pkgs/development/python-modules/asn1tools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "asn1tools"; - version = "0.164.0"; + version = "0.165.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "eerimoq"; repo = "asn1tools"; rev = version; - hash= "sha256-sbwwbwkhlZvCb2emuw1FTBj5pnv9SOtHpAcYPSQqIvM="; + hash = "sha256-E9ns4xBDHkmIET2rXsMP9/9knXZ9H0D24w5QISQrYlc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aspell-python/default.nix b/pkgs/development/python-modules/aspell-python/default.nix index 7c5c113dbd80..49cf9e21a32d 100644 --- a/pkgs/development/python-modules/aspell-python/default.nix +++ b/pkgs/development/python-modules/aspell-python/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { aspell ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aspy-refactor-imports/default.nix b/pkgs/development/python-modules/aspy-refactor-imports/default.nix index a19002449dfa..8eff00db43d5 100644 --- a/pkgs/development/python-modules/aspy-refactor-imports/default.nix +++ b/pkgs/development/python-modules/aspy-refactor-imports/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { "aspy.refactor_imports" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/assertpy/default.nix b/pkgs/development/python-modules/assertpy/default.nix index 5280808fb3cf..1800a14d507c 100644 --- a/pkgs/development/python-modules/assertpy/default.nix +++ b/pkgs/development/python-modules/assertpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0hnfh45cmqyp7zasrllwf8gbq3mazqlhhk0sq1iqlh6fig0yfq2f"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index bb1f7a7c5cf3..ed434bcb6bc7 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index fec7e2aa3b7e..f69afaf55252 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89 - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 8c97ef6750f7..40f66dc26ab4 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -1,23 +1,46 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest, freezegun }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# build +, poetry-core + +# runtime +, backports-zoneinfo + +# tests +, pytestCheckHook +, freezegun +}: buildPythonPackage rec { pname = "astral"; - version = "2.2"; - disabled = isPy27; + version = "3.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "e41d9967d5c48be421346552f0f4dedad43ff39a83574f5ff2ad32b6627b6fbe"; + hash = "sha256-m3w7QS6eadFyz7JL4Oat3MnxvQGijbi+vmbXXMxTPYg="; }; - propagatedBuildInputs = [ pytz requests freezegun ]; + nativeBuildInputs = [ + poetry-core + ]; - checkInputs = [ pytest ]; - checkPhase = '' - py.test -m "not webtest" - ''; + propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + ]; + + nativeCheckInputs = [ + freezegun + pytestCheckHook + ]; meta = with lib; { + changelog = "https://github.com/sffjunkie/astral/releases/tag/${version}"; description = "Calculations for the position of the sun and the moon"; homepage = "https://github.com/sffjunkie/astral/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 6cde2e755030..21b4948fb63e 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -1,12 +1,10 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonAtLeast , pythonOlder , isPyPy , lazy-object-proxy , setuptools -, setuptools-scm , typing-extensions , typed-ast , pylint @@ -16,26 +14,24 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.11.7"; # Check whether the version is compatible with pylint + version = "2.12.13"; # Check whether the version is compatible with pylint + format = "pyproject"; - disabled = pythonOlder "3.6.2"; + disabled = pythonOlder "3.7.2"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-HpniGxKf+daMh/sxP9T9UriYRrUFWqk7kDa8r+EqtVI="; + rev = "refs/tags/v${version}"; + hash = "sha256-C4A/JOFdIRgaZuV/YOLc4nC05XTtRCC1i0BcGBEG5ps="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ - setuptools-scm + setuptools ]; propagatedBuildInputs = [ lazy-object-proxy - setuptools wrapt ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions @@ -43,13 +39,9 @@ buildPythonPackage rec { typed-ast ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook - ]; - - disabledTests = [ - # AssertionError: Lists differ: ['ABC[16 chars]yBase', 'Final', 'Generic', 'MyProtocol', 'Protocol', 'object'] != ['ABC[16 chars]yBase', 'Final', 'Generic', 'MyProtocol', 'object'] - "test_mro_typing_extensions" + typing-extensions ]; passthru.tests = { diff --git a/pkgs/development/python-modules/astropy-extension-helpers/default.nix b/pkgs/development/python-modules/astropy-extension-helpers/default.nix index cb15acf88399..08a5139e5979 100644 --- a/pkgs/development/python-modules/astropy-extension-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-extension-helpers/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { patches = [ ./permissions.patch ]; - checkInputs = [ + nativeCheckInputs = [ findutils pytestCheckHook ]; diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index a690e45f0b7b..2eb0e4986f00 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { astropy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-doctestplus hypothesis diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index fbf40096daef..9b80f780b852 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -19,7 +19,7 @@ let pname = "astropy"; - version = "5.1"; + version = "5.2"; in buildPythonPackage { inherit pname version; @@ -29,7 +29,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-HbGyx+3fx3PKZvozvQeyXVucO17uK5NODKJ3+lsbe34="; + sha256 = "sha256-0zVgQCX24W98m/gtW6KOXbR0WoLlgjqdF73Zub1GsqI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index 4dfcde70c55e..418b9e1cb109 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" ''; - checkInputs = [ + nativeCheckInputs = [ matplotlib pillow pytest diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index 4a07d2ac96ec..89c959293df3 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -9,11 +9,12 @@ buildPythonPackage rec { pname = "asttokens"; - version = "2.0.8"; + version = "2.2.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xh4WJG7Pss3ilYQGtMjrwEPJ5tc6qoPJQWc7NeXTp2s="; + hash = "sha256-RiIRCypvMLd+FHOv+ql+cRvC8H0/EISEIP8YmO2+lPM="; }; nativeBuildInputs = [ @@ -24,7 +25,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ astroid pytestCheckHook ]; diff --git a/pkgs/development/python-modules/asyauth/default.nix b/pkgs/development/python-modules/asyauth/default.nix index 4ac397875ec9..7eab56d09bba 100644 --- a/pkgs/development/python-modules/asyauth/default.nix +++ b/pkgs/development/python-modules/asyauth/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyauth"; - version = "0.0.7"; + version = "0.0.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-a4M2I+xIla+S3Hi5F+AZpZRicTp7EycGRWWldVyAV8E="; + hash = "sha256-ctTuabTfLhYJL/yv0k6oXP7JV0+qRFA0SARI3XopTeM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix index b656b1947857..73ccaa62c3d3 100644 --- a/pkgs/development/python-modules/async-lru/default.nix +++ b/pkgs/development/python-modules/async-lru/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sed -i -e '/^addopts/d' -e '/^filterwarnings/,+2d' setup.cfg ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/async-modbus/default.nix b/pkgs/development/python-modules/async-modbus/default.nix index 84423c6afbbc..05d926744352 100644 --- a/pkgs/development/python-modules/async-modbus/default.nix +++ b/pkgs/development/python-modules/async-modbus/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , connio , fetchFromGitHub +, fetchpatch , pytest-asyncio , pytestCheckHook , pythonOlder @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "async-modbus"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,9 +21,17 @@ buildPythonPackage rec { owner = "tiagocoutinho"; repo = "async_modbus"; rev = "refs/tags/v${version}"; - hash = "sha256-TB+ndUvLZ9G3XXEBpLb4ULHlYZC2CoqGnL2BjMQrhRg="; + hash = "sha256-OTt/rUa3KLVSFOIUyMNHnqHvPtISxTposNFAgoixRfk="; }; + patches = [ + (fetchpatch { + # Fix tests; https://github.com/tiagocoutinho/async_modbus/pull/13 + url = "https://github.com/tiagocoutinho/async_modbus/commit/d81d8ffe94870f0f505e0c8a0694768c98053ecc.patch"; + hash = "sha256-mG3XO2nAFYitatkswU7er29BJc/A0IL1rL2Zu4daZ7k="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace '"--cov=async_modbus",' "" \ @@ -39,7 +48,7 @@ buildPythonPackage rec { umodbus ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/async-modbus/fix-tests.patch b/pkgs/development/python-modules/async-modbus/fix-tests.patch new file mode 100644 index 000000000000..1c9dd605f5b8 --- /dev/null +++ b/pkgs/development/python-modules/async-modbus/fix-tests.patch @@ -0,0 +1,73 @@ +diff --git a/tests/test_async_modbus.py b/tests/test_async_modbus.py +index b0bd3fd..6b8df87 100644 +--- a/tests/test_async_modbus.py ++++ b/tests/test_async_modbus.py +@@ -194,7 +194,7 @@ async def test_read_coils(proto, slave_id, starting_address, expected_reply): + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + server = Server(slave_id, starting_address, expected_reply) + client = AsyncClient(server, protocol) +@@ -204,7 +204,7 @@ async def test_read_coils(proto, slave_id, starting_address, expected_reply): + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + + @pytest.mark.asyncio +@@ -273,7 +273,7 @@ async def test_read_discrete_inputs(proto, slave_id, starting_address, expected_ + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + server = Server(slave_id, starting_address, expected_reply) + client = AsyncClient(server, protocol) +@@ -283,7 +283,7 @@ async def test_read_discrete_inputs(proto, slave_id, starting_address, expected_ + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + + @pytest.mark.asyncio +@@ -306,7 +306,7 @@ async def test_read_holding_registers( + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + server = Server(slave_id, starting_address, expected_reply) + client = AsyncClient(server, protocol) +@@ -316,7 +316,7 @@ async def test_read_holding_registers( + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + + @pytest.mark.asyncio +@@ -383,7 +383,7 @@ async def test_read_input_registers(proto, slave_id, starting_address, expected_ + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + server = Server(slave_id, starting_address, expected_reply) + client = AsyncClient(server, protocol) +@@ -393,4 +393,4 @@ async def test_read_input_registers(proto, slave_id, starting_address, expected_ + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 93f7dccb4711..112bd15d2ae9 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.32.2"; + version = "0.33.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; - rev = version; - sha256 = "sha256-KnbHQ/xHPNYQWk/EpdP6a0bEHvCXK/HrFGyGaeS79rc="; + rev = "refs/tags/${version}"; + hash = "sha256-gXDuStgCBH6YW3SsAjEvQq7l+Vf8+Z8sle1TnLRtNwo="; }; propagatedBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { voluptuous ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; @@ -73,6 +73,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asyncio UPnP Client library for Python"; homepage = "https://github.com/StevenLooman/async_upnp_client"; + changelog = "https://github.com/StevenLooman/async_upnp_client/blob/${version}/CHANGES.rst"; license = licenses.asl20; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/async_generator/default.nix b/pkgs/development/python-modules/async_generator/default.nix index 277616849e15..e80fd914c19c 100644 --- a/pkgs/development/python-modules/async_generator/default.nix +++ b/pkgs/development/python-modules/async_generator/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/async_stagger/default.nix b/pkgs/development/python-modules/async_stagger/default.nix index 3dafd2b21941..eb403ff71aae 100644 --- a/pkgs/development/python-modules/async_stagger/default.nix +++ b/pkgs/development/python-modules/async_stagger/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1mj3daaqxjdavbxcjrdwx5ky9maa2blbv53aa6d7w9zxkrz3b7xa"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio pytest-mock diff --git a/pkgs/development/python-modules/asyncclick/default.nix b/pkgs/development/python-modules/asyncclick/default.nix index f9b12e553420..716dd2ffca04 100644 --- a/pkgs/development/python-modules/asyncclick/default.nix +++ b/pkgs/development/python-modules/asyncclick/default.nix @@ -31,11 +31,15 @@ buildPythonPackage rec { anyio ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook trio ]; + pytestFlagsArray = [ + "-W" "ignore::trio.TrioDeprecationWarning" + ]; + disabledTests = [ # RuntimeWarning: coroutine 'Context.invoke' was never awaited "test_context_invoke_type" diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix index a01e9389f431..baf4702126f9 100644 --- a/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/asyncio-throttle/default.nix b/pkgs/development/python-modules/asyncio-throttle/default.nix index 38f3389aa60e..052cfc01f997 100644 --- a/pkgs/development/python-modules/asyncio-throttle/default.nix +++ b/pkgs/development/python-modules/asyncio-throttle/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1hsjcymdcm0hf4l68scf9n8j7ba89azgh96xhxrnyvwxfs5acnmv"; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/asyncio_mqtt/default.nix b/pkgs/development/python-modules/asyncio_mqtt/default.nix index 41f2f2864d18..448ec3eca2ae 100644 --- a/pkgs/development/python-modules/asyncio_mqtt/default.nix +++ b/pkgs/development/python-modules/asyncio_mqtt/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "asyncio-mqtt"; - version = "0.14.0"; + version = "0.16.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sbtinstruments"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ByVslOx/XsxVan2/xdRi+wOQR9oVpIGtHPcHlIcHMEk="; + hash = "sha256-f3JqocjOEwNjo6Uv17ij6oEdrjb6Z2wTzdhdVhx46iM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -37,7 +37,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ anyio pytestCheckHook ]; @@ -49,24 +49,25 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access "test_client_filtered_messages" - "test_client_unfiltered_messages" - "test_client_unsubscribe" - "test_client_will" - "test_client_tls_context" - "test_client_tls_params" - "test_client_username_password " "test_client_logger" "test_client_max_concurrent_outgoing_calls" - "test_client_websockets" - "test_client_pending_calls_threshold" "test_client_no_pending_calls_warnings_with_max_concurrent_outgoing_calls" + "test_client_pending_calls_threshold" + "test_client_tls_context" + "test_client_tls_params" + "test_client_unfiltered_messages" + "test_client_unsubscribe" + "test_client_username_password " + "test_client_websockets" + "test_client_will" + "test_multiple_messages_generators" ]; meta = with lib; { description = "Idomatic asyncio wrapper around paho-mqtt"; homepage = "https://github.com/sbtinstruments/asyncio-mqtt"; license = licenses.bsd3; - changelog = "https://github.com/sbtinstruments/asyncio-mqtt/blob/master/CHANGELOG.md"; + changelog = "https://github.com/sbtinstruments/asyncio-mqtt/blob/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ hexa ]; }; } diff --git a/pkgs/development/python-modules/asyncmy/default.nix b/pkgs/development/python-modules/asyncmy/default.nix index b81c4d2c6968..7e3129b726c1 100644 --- a/pkgs/development/python-modules/asyncmy/default.nix +++ b/pkgs/development/python-modules/asyncmy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asyncmy"; - version = "0.2.5"; + version = "0.2.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "long2ice"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-yLAse8p+2RYHJmDwD5vrHlf29URB+kdupjD1DwTcRAc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-UWwqQ0ZYGoOsgRC7ROV9DDBQ/l/vXWB6uHpQ/WaFRAw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index b9e6b051fd5e..f996182f8479 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { # sandboxing issues on aarch64-darwin, see https://github.com/NixOS/nixpkgs/issues/198495 doCheck = postgresql.doCheck; - checkInputs = [ + nativeCheckInputs = [ uvloop postgresql ]; diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 086bf0371ae8..4165db53b128 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.12.0"; + version = "2.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-J0EBMixLlBgjru2OGrbnvlGRaGxtstK9Na/rowUF54A="; + hash = "sha256-vn4ctHIl3JiZ5WRy/cTarANYSmhDZ1MpwM5nF5yyDik="; }; propagatedBuildInputs = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ openssh openssl pytestCheckHook @@ -81,6 +81,7 @@ buildPythonPackage rec { broken = stdenv.isDarwin; description = "Asynchronous SSHv2 Python client and server library"; homepage = "https://asyncssh.readthedocs.io/"; + changelog = "https://github.com/ronf/asyncssh/blob/v${version}/docs/changes.rst"; license = licenses.epl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index 6a9d911f66bc..608af2ac9023 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix new file mode 100644 index 000000000000..253640b50bb2 --- /dev/null +++ b/pkgs/development/python-modules/asyncua/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiosqlite +, aiofiles +, pytz +, python-dateutil +, sortedcontainers +, cryptography +, typing-extensions +, importlib-metadata +, pytestCheckHook +, pytest-asyncio +, pytest-mock +, asynctest +, pythonOlder +}: + +buildPythonPackage rec { + pname = "asyncua"; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "FreeOpcUa"; + repo = "opcua-asyncio"; + rev = "v${version}"; + hash = "sha256-wBtI3ZlsvOkNvl/q0X9cm2hNRUBW1oB/kZOo8lqo4dQ="; + }; + + propagatedBuildInputs = [ + aiosqlite + aiofiles + pytz + python-dateutil + sortedcontainers + cryptography + typing-extensions + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + pythonImportsCheck = [ + "asyncua" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + pytest-mock + asynctest + ]; + + disabledTests = [ + "test_cli_tools_which_require_sigint" # Hard coded path only works from root of src + ]; + + meta = with lib; { + description = "OPC UA / IEC 62541 Client and Server for Python"; + homepage = "https://github.com/FreeOpcUa/opcua-asyncio"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ harvidsen ]; + }; +} diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index 4e91aafde6da..3ec2635af773 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { whodap ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytestCheckHook ]; diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix index e4f5f8758b1c..c8d8f6afbf9b 100644 --- a/pkgs/development/python-modules/asysocks/default.nix +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "asysocks"; - version = "0.2.2"; + version = "0.2.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rhqML/w8Hp8xZogjc2ZD+Y9C9c/w1e4X7WNoFaLz9Ps="; + hash = "sha256-A8m6WA1SjD5awRdHtXsZNaG5vzSrtH2C23lzA1FhWlo="; }; propagatedBuildInputs = [ @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Socks4/5 client and server library"; homepage = "https://github.com/skelsec/asysocks"; + changelog = "https://github.com/skelsec/asysocks/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/atc-ble/default.nix b/pkgs/development/python-modules/atc-ble/default.nix index fd4aad6d4035..947f5db4b317 100644 --- a/pkgs/development/python-modules/atc-ble/default.nix +++ b/pkgs/development/python-modules/atc-ble/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix index 185f64d58f6e..9726239e0609 100644 --- a/pkgs/development/python-modules/atenpdu/default.nix +++ b/pkgs/development/python-modules/atenpdu/default.nix @@ -2,25 +2,25 @@ , buildPythonPackage , fetchPypi , async-timeout -, pysnmp +, pysnmplib , pythonOlder }: buildPythonPackage rec { pname = "atenpdu"; - version = "0.3.5"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MGxlzAEcd2EzIjAjY7/1xg1ZQhyL7dcFmCzfY9+jGJ4="; + hash = "sha256-uUi6NtiHt3wWU4hrC6RNVEDBcoBCgkpwKyePq1VxO0c="; }; propagatedBuildInputs = [ async-timeout - pysnmp + pysnmplib ]; # Project has no test diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index a0c006261629..2c9c653dd171 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.28.1"; + version = "3.32.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-ZKRmjfH3s35DU1Mut63YuN6opKzg2gpyunWYjg/FbHA="; + sha256 = "sha256-fI+c2JiChDZhZPdoy3PaRtUwgWMRJnZieHcF4OR6nZE="; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index 3b5b212b7ea1..c1fce70c7d07 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { rm -rf atom ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/atomicwrites-homeassistant/default.nix b/pkgs/development/python-modules/atomicwrites-homeassistant/default.nix index d905e590af0a..b340c0f9e80c 100644 --- a/pkgs/development/python-modules/atomicwrites-homeassistant/default.nix +++ b/pkgs/development/python-modules/atomicwrites-homeassistant/default.nix @@ -22,7 +22,7 @@ buildPythonPackage { "atomicwrites" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix index dbf094d54bc0..7aa6d889eac6 100644 --- a/pkgs/development/python-modules/atomicwrites/default.nix +++ b/pkgs/development/python-modules/atomicwrites/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { # Tests depend on pytest but atomicwrites is a dependency of pytest doCheck = false; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { description = "Atomic file writes on POSIX"; diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index ca2075cab7a3..1b71b66a63c9 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -20,6 +20,7 @@ , setuptools , toolz , xmltodict +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -38,6 +39,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -54,6 +56,8 @@ buildPythonPackage rec { xmltodict ]; + pythonRelaxDeps = [ "potentials" ]; + preCheck = '' # By default, pytestCheckHook imports atomman from the current directory # instead of from where `pip` installs it and fails due to missing Cython @@ -62,7 +66,7 @@ buildPythonPackage rec { rm -r atomman ''; - checkInputs = [ + nativeCheckInputs = [ ase phonopy pymatgen diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 286b79bcb675..952892f78f89 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook sybil ]; diff --git a/pkgs/development/python-modules/atsim_potentials/default.nix b/pkgs/development/python-modules/atsim_potentials/default.nix index d77dbfa4aae2..71423d907d75 100644 --- a/pkgs/development/python-modules/atsim_potentials/default.nix +++ b/pkgs/development/python-modules/atsim_potentials/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { - version = "0.4.0"; + version = "0.4.1"; pname = "atsim-potentials"; src = fetchFromGitHub { owner = "mjdrushton"; repo = pname; - rev = version; - sha256 = "sha256-MwjRVd54qa8uJOi9yRXU+Vrve50ndftJUl+TFZKVzQM="; + rev = "refs/tags/${version}"; + sha256 = "sha256-G7lNqwEUwAT0f7M2nUTCxpXOAl6FWKlh7tcsvbur1eM="; }; postPatch = '' @@ -40,7 +40,7 @@ buildPythonPackage rec { wrapt ]; - checkInputs = [ + nativeCheckInputs = [ deepdiff pytestCheckHook ]; diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix index 3a9834ec8657..4054fbd78b68 100644 --- a/pkgs/development/python-modules/attrdict/default.nix +++ b/pkgs/development/python-modules/attrdict/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ coverage nose ]; diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index 44b61fcba725..855b4bf86982 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -3,18 +3,24 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "attrs"; - version = "22.1.0"; - disabled = pythonOlder "3.5"; + version = "22.2.0"; + disabled = pythonOlder "3.6"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Ka3CZlRH5RkdDnxWj954sh+WctNEKB0MbhqwhUKbIrY="; + hash = "sha256-ySJ7/C8BmTwD9o2zfR0VyWkBiDI8BnxkHxo1ylgYX5k="; }; + nativeBuildInputs = [ + setuptools + ]; + outputs = [ "out" "testout" @@ -23,7 +29,7 @@ buildPythonPackage rec { postInstall = '' # Install tests as the tests output. mkdir $testout - cp -R tests $testout/tests + cp -R conftest.py tests $testout ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/attrs/tests.nix b/pkgs/development/python-modules/attrs/tests.nix index c9fae9e0228c..2614716d71d0 100644 --- a/pkgs/development/python-modules/attrs/tests.nix +++ b/pkgs/development/python-modules/attrs/tests.nix @@ -7,13 +7,14 @@ buildPythonPackage { pname = "attrs-tests"; inherit (attrs) version; + format = "other"; srcs = attrs.testout; dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ attrs hypothesis pytestCheckHook diff --git a/pkgs/development/python-modules/aubio/default.nix b/pkgs/development/python-modules/aubio/default.nix index ad78b6c63fc8..9b8eccabb6e6 100644 --- a/pkgs/development/python-modules/aubio/default.nix +++ b/pkgs/development/python-modules/aubio/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index fc3adf2534e7..d1d6de0bcba8 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -1,25 +1,50 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib , attrs , bidict , bitstruct +, buildPythonPackage +, fetchFromGitHub +, fetchpatch , more-itertools +, poetry-core , pprintpp +, pythonOlder +, pythonRelaxDepsHook , tbm-utils }: buildPythonPackage rec { pname = "audio-metadata"; version = "0.11.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "9e7ba79d49cf048a911d5f7d55bb2715c10be5c127fe5db0987c5fe1aa7335eb"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "thebigmunch"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-5ZX4HwbuB9ZmFfHuxaMCrn3R7/znuDsoyqqLql2Nizg="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'attrs>=18.2,<19.4'" "'attrs'" - ''; + patches = [ + # Switch to poetry-core, https://github.com/thebigmunch/audio-metadata/pull/41 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/thebigmunch/audio-metadata/commit/dfe91a69ee37e9dcefb692165eb0f9cd36a7e5b8.patch"; + hash = "sha256-ut3mqgZQu0YFbsTEA13Ch0+aSNl17ndMV0fuIu3n5tc="; + }) + ]; + + pythonRelaxDeps = [ + "attrs" + "more-itertools" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; propagatedBuildInputs = [ attrs @@ -30,12 +55,17 @@ buildPythonPackage rec { tbm-utils ]; - # No tests + # Tests require ward which is not ready to be used doCheck = false; + pythonImportsCheck = [ + "audio_metadata" + ]; + meta = with lib; { homepage = "https://github.com/thebigmunch/audio-metadata"; description = "A library for reading and, in the future, writing metadata from audio files"; + changelog = "https://github.com/thebigmunch/audio-metadata/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; }; diff --git a/pkgs/development/python-modules/audiotools/default.nix b/pkgs/development/python-modules/audiotools/default.nix index d008498117b6..74b03a413ce2 100644 --- a/pkgs/development/python-modules/audiotools/default.nix +++ b/pkgs/development/python-modules/audiotools/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utilities and Python modules for handling audio"; - homepage = "http://audiotools.sourceforge.net/"; + homepage = "https://audiotools.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/augmax/default.nix b/pkgs/development/python-modules/augmax/default.nix index cda3ff5fbcd2..48eb38cad3d2 100644 --- a/pkgs/development/python-modules/augmax/default.nix +++ b/pkgs/development/python-modules/augmax/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { # augmax does not have any tests at the time of writing (2022-02-19), but # jaxlib is necessary for the pythonImportsCheckPhase. - checkInputs = [ jaxlib ]; + nativeCheckInputs = [ jaxlib ]; pythonImportsCheck = [ "augmax" ]; diff --git a/pkgs/development/python-modules/aurorapy/default.nix b/pkgs/development/python-modules/aurorapy/default.nix index 8bbce350ad8d..6ee2be80d3b6 100644 --- a/pkgs/development/python-modules/aurorapy/default.nix +++ b/pkgs/development/python-modules/aurorapy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pyserial ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook six ]; diff --git a/pkgs/development/python-modules/autarco/default.nix b/pkgs/development/python-modules/autarco/default.nix index 82e69fc2104d..37625fdb1bd2 100644 --- a/pkgs/development/python-modules/autarco/default.nix +++ b/pkgs/development/python-modules/autarco/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index df5af6ef9172..3486e78711ed 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ] ++ pyjwt.optional-dependencies.crypto; - checkInputs = [ + nativeCheckInputs = [ aiohttp aioresponses callee diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index d4a71d639c73..fde3d3488032 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -25,14 +25,6 @@ buildPythonPackage rec { sha256 = "sha256-4IPBulzRoAAplyM/1MPE40IW4IXBIGYLydzpY64Gl0c="; }; - postPatch = '' - # https://github.com/alandtse/auth_capture_proxy/issues/14 - # https://github.com/alandtse/auth_capture_proxy/issues/15 - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" \ - --replace 'importlib-metadata = "^3.4.0"' 'importlib-metadata = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; @@ -47,7 +39,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index 37ca7ebe7bdb..eb65881afbb6 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "authlib"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "lepture"; repo = "authlib"; rev = "refs/tags/v${version}"; - hash = "sha256-UTsQRAgmYu4BwT0WWE6XOjTYyGWZIt8bMH9qJ8KLOWA="; + hash = "sha256-OYfvfPnpWE9g7L9cFXUD95B/9+OZy55ZVbmFhFgguUg="; }; propagatedBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ cachelib flask flask-sqlalchemy @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for building OAuth and OpenID Connect servers"; homepage = "https://github.com/lepture/authlib"; + changelog = "https://github.com/lepture/authlib/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ flokli ]; }; diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index a6e6de722744..9a464955aa33 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , attrs , argon2-cffi , base58 @@ -53,6 +54,14 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; + patches = [ + (fetchpatch { + # https://github.com/crossbario/autobahn-python/pull/1604 + url = "https://github.com/crossbario/autobahn-python/commit/ffe679fae4ebcdde964d4ee88cb82a9c65c40529.patch"; + sha256 = "sha256-QNnQkxMZJsFbiYUp4Os+dWo7jdCa96+kyb/2HxSMU8k="; + }) + ]; + src = fetchPypi { inherit pname version; sha256 = "sha256-i0Yuouaq1rTcDtRfuAC2y/6wMl5/5pg5B/Ei8r5KH+k="; @@ -70,12 +79,10 @@ buildPythonPackage rec { txaio ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook - # FIXME: remove the following dependencies when web3 gets added - eth-account ] ++ passthru.optional-dependencies.scram ++ passthru.optional-dependencies.serialization ++ passthru.optional-dependencies.xbr; diff --git a/pkgs/development/python-modules/autocommand/default.nix b/pkgs/development/python-modules/autocommand/default.nix index 0c8dfc54036c..7e4893e98af9 100644 --- a/pkgs/development/python-modules/autocommand/default.nix +++ b/pkgs/development/python-modules/autocommand/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { # fails with: SyntaxError: invalid syntax doCheck = false; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "autocommand" ]; diff --git a/pkgs/development/python-modules/autofaiss/default.nix b/pkgs/development/python-modules/autofaiss/default.nix new file mode 100644 index 000000000000..46f360cfef9e --- /dev/null +++ b/pkgs/development/python-modules/autofaiss/default.nix @@ -0,0 +1,79 @@ +{ buildPythonPackage +, embedding-reader +, faiss +, fetchFromGitHub +, fire +, fsspec +, lib +, numpy +, pyarrow +, pytestCheckHook +, pythonRelaxDepsHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "autofaiss"; + version = "2.15.4"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "criteo"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-OnDHwJxJcXx3DGxrkk2D2Ljs4CqPoYx7avdo9C8sDrU="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + # The `dataclasses` packages is a python2-only backport, unnecessary in + # python3. + "dataclasses" + # We call it faiss, not faiss-cpu. + "faiss-cpu" + ]; + + pythonRelaxDeps = [ + # As of v2.15.4, autofaiss asks for fire<0.5 but we have fire v0.5.0 in + # nixpkgs at the time of writing (2022-12-25). + "fire" + # As of v2.15.3, autofaiss asks for pyarrow<8 but we have pyarrow v9.0.0 in + # nixpkgs at the time of writing (2022-12-15). + "pyarrow" + ]; + + propagatedBuildInputs = [ + embedding-reader + fsspec + numpy + faiss + fire + pyarrow + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Attempts to spin up a Spark cluster and talk to it which doesn't work in + # the Nix build environment. + "test_build_partitioned_indexes" + "test_index_correctness_in_distributed_mode_with_multiple_indices" + "test_index_correctness_in_distributed_mode" + "test_quantize_with_pyspark" + ]; + + meta = with lib; { + description = "Automatically create Faiss knn indices with the most optimal similarity search parameters"; + homepage = "https://github.com/criteo/autofaiss"; + changelog = "https://github.com/criteo/autofaiss/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/python-modules/autoflake/default.nix similarity index 77% rename from pkgs/development/tools/analysis/autoflake/default.nix rename to pkgs/development/python-modules/autoflake/default.nix index adc861588dd5..2280c33f8020 100644 --- a/pkgs/development/tools/analysis/autoflake/default.nix +++ b/pkgs/development/python-modules/autoflake/default.nix @@ -1,21 +1,24 @@ { lib -, python3 +, buildPythonPackage +, fetchPypi +, pyflakes +, pytestCheckHook }: -python3.pkgs.buildPythonApplication rec { +buildPythonPackage rec { pname = "autoflake"; version = "1.4"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-YaNTASz/arlMoGKCPR+y9pLErNpRx2/4Oo13kV+6Ueo="; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ pyflakes ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index 094015e56f5e..5abb1a384d0d 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , attrs , pytest-benchmark , pytestCheckHook @@ -10,25 +9,15 @@ }: let automat = buildPythonPackage rec { - version = "20.2.0"; + version = "22.10.0"; pname = "automat"; src = fetchPypi { pname = "Automat"; inherit version; - sha256 = "7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33"; + hash = "sha256-5WvrhO2tGdzBHTDo2biV913ute9elrhKRnBms7hLsE4="; }; - patches = [ - # don't depend on m2r - (fetchpatch { - name = "dont-depend-on-m2r.patch"; - url = "https://github.com/glyph/automat/compare/v20.2.0..2562fa4ddeba5b5945d9482baa4c26a414f5e831.patch"; - includes = [ "setup.py" ]; - hash = "sha256-jlPLJMu1QbBpiVYHDiqPydrXjEoZgYZTVVGNxSA0NxY="; - }) - ]; - nativeBuildInputs = [ setuptools-scm ]; @@ -38,7 +27,7 @@ let automat = buildPythonPackage rec { attrs ]; - checkInputs = [ + nativeCheckInputs = [ pytest-benchmark pytestCheckHook ]; diff --git a/pkgs/development/python-modules/automate-home/default.nix b/pkgs/development/python-modules/automate-home/default.nix index bd2816f6d345..c51283f4b760 100644 --- a/pkgs/development/python-modules/automate-home/default.nix +++ b/pkgs/development/python-modules/automate-home/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index ec3ecb20f906..f22d92d7bfb1 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -1,38 +1,54 @@ { lib -, fetchPypi , buildPythonPackage -, pycodestyle +, fetchFromGitHub +, fetchpatch , glibcLocales -, toml +, pycodestyle , pytestCheckHook +, pythonOlder +, tomli }: buildPythonPackage rec { pname = "autopep8"; - version = "1.7.1"; + version = "2.0.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-8AWCIOTMDvYSGZb8jsHDLwc15Ea+I8Th9pLeC/IxdN0="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "hhatto"; + repo = "autopep8"; + rev = "refs/tags/v${version}"; + hash = "sha256-YEPSsUzJG4MPiiloVAf9m/UiChkhkN0+lK6spycpSvo="; }; - propagatedBuildInputs = [ pycodestyle toml ]; - - checkInputs = [ - glibcLocales - pytestCheckHook + patches = [ + # Ignore DeprecationWarnings to fix tests on Python 3.11, https://github.com/hhatto/autopep8/pull/665 + (fetchpatch { + name = "ignore-deprecation-warnings.patch"; + url = "https://github.com/hhatto/autopep8/commit/75b444d7cf510307ef67dc2b757d384b8a241348.patch"; + hash = "sha256-5hcJ2yAuscvGyI7zyo4Cl3NEFG/fZItQ8URstxhzwzE="; + }) ]; - disabledTests = [ - # missing tox.ini file from pypi package - "test_e101_skip_innocuous" + propagatedBuildInputs = [ + pycodestyle + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + nativeCheckInputs = [ + glibcLocales + pytestCheckHook ]; LC_ALL = "en_US.UTF-8"; meta = with lib; { + changelog = "https://github.com/hhatto/autopep8/releases/tag/v${version}"; description = "A tool that automatically formats Python code to conform to the PEP 8 style guide"; - homepage = "https://pypi.org/project/autopep8/"; + homepage = "https://github.com/hhatto/autopep8"; license = licenses.mit; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 3457d2d37b23..91b50e798c5b 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { rm -r av ''; - checkInputs = [ + nativeCheckInputs = [ numpy pillow pytestCheckHook diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index fd24227e03cd..81ea5127ee10 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/awacs/default.nix b/pkgs/development/python-modules/awacs/default.nix index 38ca2a11563c..54e7b32825fe 100644 --- a/pkgs/development/python-modules/awacs/default.nix +++ b/pkgs/development/python-modules/awacs/default.nix @@ -3,20 +3,18 @@ , fetchPypi , pythonOlder , python - - # python dependencies , typing-extensions }: buildPythonPackage rec { pname = "awacs"; - version = "2.2.0"; + version = "2.3.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zWRQHxjHogmSKSqnvQLJCdoilkOlJ07p00lN+U46WkU="; + hash = "sha256-0tizZWcHe1qbLxpXS/IngExaFFUHZyXXlksWcNL/vEw="; }; propagatedBuildInputs = lib.lists.optionals (pythonOlder "3.8") [ @@ -27,12 +25,15 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover ''; - pythonImportsCheck = [ "awacs" ]; + pythonImportsCheck = [ + "awacs" + ]; meta = with lib; { description = "AWS Access Policy Language creation library"; - maintainers = with maintainers; [ jlesquembre ]; - license = licenses.bsd2; homepage = "https://github.com/cloudtools/awacs"; + changelog = "https://github.com/cloudtools/awacs/blob/${version}/CHANGELOG.md"; + license = licenses.bsd2; + maintainers = with maintainers; [ jlesquembre ]; }; } diff --git a/pkgs/development/python-modules/awesome-slugify/default.nix b/pkgs/development/python-modules/awesome-slugify/default.nix index 884dcd4bc614..2ddccf85f82f 100644 --- a/pkgs/development/python-modules/awesome-slugify/default.nix +++ b/pkgs/development/python-modules/awesome-slugify/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ unidecode regex ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { homepage = "https://github.com/dimka665/awesome-slugify"; diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index d4c9082cedbf..3f842173bc60 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix new file mode 100644 index 000000000000..4dcf509af1af --- /dev/null +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, cmake +, numpy +, pybind11 +, scikit-build-core +, typing-extensions +}: + +buildPythonPackage rec { + pname = "awkward-cpp"; + version = "6"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-WOMq+oqkTDZedk9LXQdjfHmnm+LafPuqNGnYvSawv6I="; + }; + + nativeBuildInputs = [ + cmake + pybind11 + scikit-build-core + ] ++ scikit-build-core.optional-dependencies.pyproject; + + propagatedBuildInputs = [ + numpy + ]; + + dontUseCmakeConfigure = true; + + pythonImportsCheck = [ + "awkward_cpp" + ]; + + meta = with lib; { + description = "CPU kernels and compiled extensions for Awkward Array"; + homepage = "https://github.com/scikit-hep/awkward"; + license = licenses.bsd3; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 9e8ef3098a9d..a577e6c8a625 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -1,54 +1,49 @@ { lib , buildPythonPackage , fetchPypi -, cmake +, pythonOlder +, awkward-cpp +, hatch-fancy-pypi-readme +, hatchling , numba , numpy +, packaging +, typing-extensions , pytestCheckHook -, pythonOlder -, pyyaml -, rapidjson -, setuptools }: buildPythonPackage rec { pname = "awkward"; - version = "1.10.2"; - format = "setuptools"; + version = "2.0.5"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MDvAkZ8JMts+eKklTBf83rEl5L5lzYlLQN+8O/3fwFQ="; + hash = "sha256-Kge7BAlBF4L+oibeXIF+tuSNsG1kMjl3WB5PME+RECk="; }; nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - pyyaml - rapidjson + hatch-fancy-pypi-readme + hatchling ]; propagatedBuildInputs = [ + awkward-cpp numpy - setuptools + packaging + ] ++ lib.optionals (pythonOlder "3.11") [ + typing-extensions ]; dontUseCmakeConfigure = true; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook numba ]; - disabledTests = [ - # incomatible with numpy 1.23 - "test_numpyarray" - ]; - disabledTestPaths = [ "tests-cuda" ]; diff --git a/pkgs/development/python-modules/awkward0/default.nix b/pkgs/development/python-modules/awkward0/default.nix deleted file mode 100644 index ce9f1eabc77a..000000000000 --- a/pkgs/development/python-modules/awkward0/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, numpy -, pytest-runner -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "awkward0"; - version = "0.15.5"; - - src = fetchFromGitHub { - owner = "scikit-hep"; - repo = "awkward-0.x"; - rev = version; - sha256 = "039pxzgll2yz8xpr6bw788ymvgvqgna5kgl9m6d9mzi4yhbjsjpx"; - }; - - nativeBuildInputs = [ pytest-runner ]; - - propagatedBuildInputs = [ numpy ]; - - checkInputs = [ pytestCheckHook ]; - - # Can't find a fixture - disabledTests = [ "test_import_pandas" ]; - - pythonImportsCheck = [ "awkward0" ]; - - meta = with lib; { - description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy"; - homepage = "https://github.com/scikit-hep/awkward-array"; - license = licenses.bsd3; - maintainers = with maintainers; [ costrouc SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 7f79f99e3a67..85a4f6bbe680 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { --replace 'botocore = ">=1.12.6"' 'botocore = "*"' ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook toml ]; diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index b7c2cf8994d4..b4daad5c24ef 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.23.0"; + version = "1.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,14 +21,14 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-3jzUowSeO6j7DzIlOkeU3KUFFIUi7cEyvjbIL8uRGcU="; + hash = "sha256-XdWrEJL/u+B15jAzxS7UZBhFBCVfSlnBtUcKcA0iUOw="; }; propagatedBuildInputs = [ six ]; - checkInputs = [ + nativeCheckInputs = [ mock parameterized pyelftools @@ -63,6 +63,7 @@ buildPythonPackage rec { broken = (stdenv.isLinux && stdenv.isAarch64); description = "Tool to compile, build and package AWS Lambda functions"; homepage = "https://github.com/awslabs/aws-lambda-builders"; + changelog = "https://github.com/aws/aws-lambda-builders/releases/tag/v${version}"; longDescription = '' Lambda Builders is a Python library to compile, build and package AWS Lambda functions for several runtimes & frameworks. diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index edd0e9426506..5a8191f29327 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -5,16 +5,19 @@ , jsonschema , mock , parameterized +, pydantic , pytest-env +, pytest-rerunfailures +, pytest-xdist , pytestCheckHook , pythonOlder , pyyaml -, six +, typing-extensions }: buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.47.0"; + version = "1.55.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,13 +26,14 @@ buildPythonPackage rec { owner = "aws"; repo = "serverless-application-model"; rev = "refs/tags/v${version}"; - sha256 = "sha256-FYEJ+mMxb8+OXUVeyLbAqOnujNi/wNhvAl4Lh4ZeE0I="; + sha256 = "sha256-YDqdd4zKInttHDl04kvAgHKtc1vBryW12QfE0wiLU54="; }; propagatedBuildInputs = [ boto3 jsonschema - six + pydantic + typing-extensions ]; postPatch = '' @@ -39,10 +43,12 @@ buildPythonPackage rec { --replace " --cov samtranslator --cov-report term-missing --cov-fail-under 95" "" ''; - checkInputs = [ + nativeCheckInputs = [ mock parameterized pytest-env + pytest-rerunfailures + pytest-xdist pytestCheckHook pyyaml ]; @@ -52,6 +58,16 @@ buildPythonPackage rec { "test_errors_13_error_definitionuri" ]; + pytestFlagsArray = [ + # samtranslator.translator.arn_generator.NoRegionFound: AWS Region cannot be found + "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app" + "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing" + "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks" + "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing" + "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls" + "--deselect tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2" + ]; + pythonImportsCheck = [ "samtranslator" ]; diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index fd8ed21cd085..d851cd056066 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.10.0"; + version = "2.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mxSST9BijPkpNgVYZGVTVAA/CxrMPhw//eZAPQeZ3Xo="; + sha256 = "sha256-eINfyEHwPlUIWPGKmXPquGGPR/ItL1nt8TBXj6VFqGc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 85ce9deba6cf..954e3df9637d 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.15.1"; + version = "0.16.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2VBdad9NL19eW2Djot2gkynyjSCUvG4f0KnEub6M0vg="; + hash = "sha256-26JjUlFLyNtm93/UkvEO+eV22ZHI1gxWecf2cuBifgE="; }; buildInputs = lib.optionals stdenv.isDarwin [ @@ -33,11 +33,6 @@ buildPythonPackage rec { "strictoverflow" ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "extra_link_args += ['-Wl,-fatal_warnings']" "" - ''; - # gcc <10 is not supported, LLVM on darwin is just fine nativeBuildInputs = [ cmake @@ -58,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/awslabs/aws-crt-python"; + changelog = "https://github.com/awslabs/aws-crt-python/releases/tag/v${version}"; description = "Python bindings for the AWS Common Runtime"; license = licenses.asl20; maintainers = with maintainers; [ davegallant ]; diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index bc6bbcd30d72..d79b3448f212 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Test fails with: Assertion error diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix index b926a1abc25b..e09a1fa7d4bc 100644 --- a/pkgs/development/python-modules/axis/default.nix +++ b/pkgs/development/python-modules/axis/default.nix @@ -1,26 +1,31 @@ { lib +, async-timeout , attrs , buildPythonPackage , fetchFromGitHub , httpx +, orjson , packaging , xmltodict }: buildPythonPackage rec { pname = "axis"; - version = "44"; + version = "46"; + format = "setuptools"; src = fetchFromGitHub { owner = "Kane610"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GC8GiDP/QHU+8swe60VFPRx8kSMMHuXjIPEKCja8HPE="; + hash = "sha256-alhezwRPag+6JoC4zbusWdxFyZQ2dZl04Uj1PkiN4qo="; }; propagatedBuildInputs = [ + async-timeout attrs httpx + orjson packaging xmltodict ]; @@ -32,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for communicating with devices from Axis Communications"; homepage = "https://github.com/Kane610/axis"; + changelog = "https://github.com/Kane610/axis/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 75cf39587615..68a0409d9ead 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -17,14 +17,16 @@ , typing-extensions }: buildPythonPackage rec { - version = "1.25.1"; + version = "1.26.1"; pname = "azure-core"; disabled = pythonOlder "3.6"; + __darwinAllowLocalNetworking = true; + src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-PBzzaGUOduwAnAfNEXSpXNy0cbJHu3LRgkX31WwYCbI="; + sha256 = "sha256-IjsOkMvdHwPEGxlbAyOYmYQ/INAJZNu4XmQ4aHNBSi0="; }; propagatedBuildInputs = [ @@ -33,7 +35,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ aiodns aiohttp flask @@ -76,7 +78,7 @@ buildPythonPackage rec { "tests/testserver_tests/" # requires missing pytest plugin "tests/async_tests/test_rest_asyncio_transport.py" - # needs msrest, which cannot be included in checkInputs due to circular dependency new in msrest 0.7.1 + # needs msrest, which cannot be included in nativeCheckInputs due to circular dependency new in msrest 0.7.1 # azure-core needs msrest which needs azure-core "tests/test_polling.py" "tests/async_tests/test_base_polling_async.py" diff --git a/pkgs/development/python-modules/azure-data-tables/default.nix b/pkgs/development/python-modules/azure-data-tables/default.nix index 7f2933e01a56..1d8ce8d5675a 100644 --- a/pkgs/development/python-modules/azure-data-tables/default.nix +++ b/pkgs/development/python-modules/azure-data-tables/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-data-tables"; - version = "12.4.0"; + version = "12.4.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-3V/I3pHi+JCO+kxkyn9jz4OzBoqbpCYpjeO1QTnpZlw="; + sha256 = "sha256-FvEo6PZubKBcB/t4/MxxNJMjHfHYXjPE4lp5yURVhko="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index e6d36a87c982..6e8dbf6aad34 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.10.1"; + version = "5.11.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-LV+o7dMVCFIQfq9d2wYY34LghIP5FN06zDpUPtkELFQ="; + sha256 = "sha256-Z1tekAHjO2kVe5g/MpB1U9m38pBQ8J03+pDZdJgzcgE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix index 346a8f8a080a..25b68bf52a22 100644 --- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix index 796c65bcd077..9d89eae3e07b 100644 --- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "16.2.0"; + version = "17.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-aWkQZs1aLIbo/arvu4DilAOBrO38gFPfGTtSFNLs5oI="; + hash = "sha256-hkM4WVLuwxj4qgXsY8Ya7zu7/v37gKdP0Xbf2EqrsWo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-botservice/default.nix b/pkgs/development/python-modules/azure-mgmt-botservice/default.nix index 69dff020c8e7..e4172f9aaecb 100644 --- a/pkgs/development/python-modules/azure-mgmt-botservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-botservice/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "2.0.0"; pname = "azure-mgmt-botservice"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9dae4d749a2a072e22703318ea36e379aec20876c553b2889037c7bdec4b9546"; + sha256 = "sha256-hsBNJ8UnwZ2WAKiCFfriulJNxnRFU4ew0OUXIrWm1ro="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index 312b317d6f62..a2d260339aca 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "13.2.0"; + version = "13.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-XUsi5fNpirCTQ9Zz4AdYPvX8/WS7N5sQcT5t2q2YDkg="; + hash = "sha256-v1pTNPH0ujRm4VMt95Uw6d07lF8bgM3XIa3NJIbNLFI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 6c0f36d92eee..325c38412004 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "azure-mgmt-compute"; - version = "27.2.0"; + version = "29.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-5caVUxZvt+7L/1LDfcD/SiUwvFVF1KXdS6mDIVrSKJ0="; + hash = "sha256-LVobrn9dMHyh6FDX6D/tnIOdT2NbEKS40/i8YJisKIg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index dff9c2fe6d65..726984df9803 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "20.7.0"; + version = "21.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-tNuBIfObCWd8JXq49CDLOzMl1pw7ulTQJua7CNJjRuo="; + hash = "sha256-5EOythXO7spLzzlqDWrwcdkkJAMH9W8OBv96rYaWxAY="; }; propagatedBuildInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "This is the Microsoft Azure Container Service Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-containerservice_${version}/sdk/containerservice/azure-mgmt-containerservice/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index cadf74a5f653..3027d54531ac 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "2.8.1"; + version = "2.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-HuCp9J7uukK9QK0w2aHPZXiAsp4Az+6hx60ItbJvfkQ="; + hash = "sha256-IT1LQfdNpvc1yNX4Z/qMK2sL2MkaOA4krRFWz1SAz3s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix index 9d0f2a216873..a9c47aca1ead 100644 --- a/pkgs/development/python-modules/azure-mgmt-media/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-media"; - version = "10.1.0"; + version = "10.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-lm3rL9x+R4FCqrIyZG7jc3Yro6xUcDs1wRNNo1XQJIk="; + hash = "sha256-TVq/6dHttDGIUFzn8KTVeDTwcBMmphz3zrsGK7ux4aU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 7f09c490cb9f..e864cefb2327 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - version = "22.0.0"; + version = "22.2.0"; pname = "azure-mgmt-network"; format = "setuptools"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-qXWmZuiYA6BwFP/uydPi8mV68WlXrJlwP9eiTk+q1Ak="; + hash = "sha256-491E1Q59dYFkH5QniR+S5eoiiL/ACwLe+fgYob8/jG4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index 4ad3f3bd25f4..2d994b93707a 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -5,18 +5,21 @@ , msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg -, isPy3k +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "azure-mgmt-recoveryservices"; - version = "2.1.0"; + version = "2.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-2DeOemVpkjeI/hUdG04IuHU2h3cmk3oG4kr1wIDvdbM="; + hash = "sha256-2rU5Mc5tcSHEaej4LeiJ/WwWjk3fZFdd7MIwqmHgRss="; }; propagatedBuildInputs = [ @@ -24,13 +27,16 @@ buildPythonPackage rec { azure-mgmt-core msrest msrestazure - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; - # has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "azure.mgmt.recoveryservices" ]; + + pythonImportsCheck = [ + "azure.mgmt.recoveryservices" + ]; meta = with lib; { description = "This is the Microsoft Azure Recovery Services Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index d5fe92f320b0..6334df663747 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "5.0.0"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-BciA3sFyja5xo9yS3WVglC73y8gTfw8UejdEzbD4HYE="; + hash = "sha256-xl+KbNGceJWFvJKH8Aw02Ho+wMAxvxPZ4T09Qimn7OU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix index b2a763441a33..266be136857d 100644 --- a/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "1.1.0"; + version = "1.2.0"; pname = "azure-mgmt-redhatopenshift"; disabled = isPy27; # don't feel like fixing namespace issues on python2 src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-Tq8h3fvajxIG2QjtCyHCQDE2deBDioxLLaQQek/O24U="; + sha256 = "sha256-ZU4mKTzny9tsKDrFSU+lll5v6oDivYJlXDriWJLAYec="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 79923b254d32..fbabb64a0555 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-resource"; - version = "21.2.1"; + version = "22.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-vSBg1WOT/+Ykao8spn51Tt0D7Ae5dWMLMK4DqIYFl6c="; + hash = "sha256-/rXZeeGLUvLP0CO0oKM+VKb3bMaiUtyM117OLGMpjpQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 442315d0566b..331c0e1e2e95 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.10.0"; + version = "1.0.0"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-QhC2s/onnlbFVxMmK6SJg2hatxp4WTrYWtMV0pXtAZ8="; + sha256 = "sha256-x5v3e3/poSm+JMt0SWI1lcM6YAUcP+o2Sn8TluXOyIg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 47849c9c6f1a..9c7a57adc08d 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.8.0"; + version = "7.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-KTvJXOJ3o2KUL9iPcus6m0qS3hAAB3Wz0uPgCttFqlk="; + hash = "sha256-gI5eCyXGFkQgY0rhyGLioLXj1a4I6vV64Nm/EKyFEks="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 3b3499a780f0..f8f7f2f403b2 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -1,37 +1,46 @@ { lib -, buildPythonPackage -, fetchPypi , azure-common , azure-core , azure-storage-common +, buildPythonPackage +, cryptography +, fetchPypi +, isodate , msrest -, isPy3k -, futures ? null +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.13.1"; + version = "12.14.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-iZxLjiZxgS0s948QdVaifbsSjKqiuwYJTnKj1YNnQK8="; + hash = "sha256-hg1NgphaS/x9MnHnEnWvMw9U8zCnVDVUNae6dJzN6Zc="; }; propagatedBuildInputs = [ azure-common azure-core azure-storage-common + cryptography + isodate msrest - ] ++ lib.optional (!isPy3k) futures; + typing-extensions + ]; - # has no tests + # Module has no tests doCheck = false; meta = with lib; { description = "Client library for Microsoft Azure Storage services containing the blob service APIs"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-storage-blob_${version}/sdk/storage/azure-storage-blob/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ cmcdragonkai maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index 515b3f398dfd..aa69731809ba 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -3,20 +3,23 @@ , fetchPypi , azure-common , azure-storage-common +, msrest }: buildPythonPackage rec { pname = "azure-storage-queue"; - version = "2.1.0"; + version = "12.5.0"; src = fetchPypi { inherit pname version; - sha256 = "14e82d3691f1bbd23f2aff143a6c17af3c297164f6e597d223b65a67051ba278"; + sha256 = "sha256-OzdEJK9y0y2v+Lr5tkYwB0w6iz/VMypFIWs7yWvHsXI="; + extension = "zip"; }; propagatedBuildInputs = [ azure-common azure-storage-common + msrest ]; # has no tests diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index de0909fa0c02..a632ec9668d9 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.13.0"; + version = "0.15.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-WJZtE7efs1xwalyb0Sr2J+pmPIt9gn2o01/prncb2uM="; + sha256 = "sha256-XxryuN5HVuY9h6ioSEv9nwzkK6wYLupvFOCJqX82eWE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index 5994f1413de8..c5188188c467 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-lazy-fixture pytest-mock diff --git a/pkgs/development/python-modules/babel/default.nix b/pkgs/development/python-modules/babel/default.nix index eee9f58cc30d..e9f9f7bdfc4c 100644 --- a/pkgs/development/python-modules/babel/default.nix +++ b/pkgs/development/python-modules/babel/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytz ]; - checkInputs = [ pytestCheckHook freezegun ]; + nativeCheckInputs = [ pytestCheckHook freezegun ]; meta = with lib; { homepage = "https://babel.pocoo.org/"; diff --git a/pkgs/development/python-modules/backcall/default.nix b/pkgs/development/python-modules/backcall/default.nix index b5a53b62132b..acc189904461 100644 --- a/pkgs/development/python-modules/backcall/default.nix +++ b/pkgs/development/python-modules/backcall/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/backoff/default.nix b/pkgs/development/python-modules/backoff/default.nix index e62533f491cb..71c39395a46c 100644 --- a/pkgs/development/python-modules/backoff/default.nix +++ b/pkgs/development/python-modules/backoff/default.nix @@ -9,21 +9,21 @@ buildPythonPackage rec { pname = "backoff"; - version = "2.1.2"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "litl"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-eKd1g3UxXlpSlNlik80RKXRaw4mZyvAWl3i2GNuZ3hI="; + sha256 = "sha256-g8bYGJ6Kw6y3BUnuoP1IAye5CL0geH5l7pTb3xxq7jI="; }; nativeBuildInputs = [ poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook responses diff --git a/pkgs/development/python-modules/backports-cached-property/default.nix b/pkgs/development/python-modules/backports-cached-property/default.nix index 7bb8c4e81225..a4a9f3071944 100644 --- a/pkgs/development/python-modules/backports-cached-property/default.nix +++ b/pkgs/development/python-modules/backports-cached-property/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { wheel ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock pytest-sugar diff --git a/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix b/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix index 7db161b86110..bfec97496ae7 100644 --- a/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix +++ b/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix @@ -1,21 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytz +, unittestCheckHook +}: buildPythonPackage rec { pname = "backports-datetime-fromisoformat"; - version = "1.0.0"; + version = "2.0.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "0p0gyhfqq6gssf3prsy0pcfq5w0wx2w3pcjqbwx3imvc92ls4xwm"; + src = fetchFromGitHub { + owner = "movermeyer"; + repo = "backports.datetime_fromisoformat"; + rev = "refs/tags/v${version}"; + hash = "sha256-aHF3E/fLN+j/T4W9lvuVSMy6iRSEn+ARWmL01rY+ixs="; }; - # no tests in pypi package - doCheck = false; + nativeCheckInputs = [ + pytz + unittestCheckHook + ]; - pythonImportsCheck = [ "backports.datetime_fromisoformat" ]; + pythonImportsCheck = [ + "backports.datetime_fromisoformat" + ]; meta = with lib; { - description = "Backport of Python 3.7's datetime.fromisoformat"; + changelog = "https://github.com/movermeyer/backports.datetime_fromisoformat/releases/tag/v${version}"; + description = "Backport of Python 3.11's datetime.fromisoformat"; homepage = "https://github.com/movermeyer/backports.datetime_fromisoformat"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; diff --git a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix index 84618e8da1d8..9ff04e0e5038 100644 --- a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix +++ b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix @@ -1,16 +1,27 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools-scm, importlib-metadata }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools-scm +, importlib-metadata +}: buildPythonPackage rec { pname = "backports-entry-points-selectable"; - version = "1.1.1"; + version = "1.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "backports.entry_points_selectable"; inherit version; - sha256 = "914b21a479fde881635f7af5adc7f6e38d6b274be32269070c53b698c60d5386"; + hash = "sha256-Rwb1kXllfKfB0yWlQ+4TcPj0YzH0MrysYvqyQv3wr6U="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata @@ -24,6 +35,7 @@ buildPythonPackage rec { pythonNamespaces = [ "backports" ]; meta = with lib; { + changelog = "https://github.com/jaraco/backports.entry_points_selectable/blob/v${version}/CHANGES.rst"; description = "Compatibility shim providing selectable entry points for older implementations"; homepage = "https://github.com/jaraco/backports.entry_points_selectable"; license = licenses.mit; diff --git a/pkgs/development/python-modules/backports-shutil-which/default.nix b/pkgs/development/python-modules/backports-shutil-which/default.nix index 52163abe8bcf..95b47bb6028e 100644 --- a/pkgs/development/python-modules/backports-shutil-which/default.nix +++ b/pkgs/development/python-modules/backports-shutil-which/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "fe39f567cbe4fad89e8ac4dbeb23f87ef80f7fe8e829669d0221ecdb0437c133"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test test diff --git a/pkgs/development/python-modules/backports-zoneinfo/default.nix b/pkgs/development/python-modules/backports-zoneinfo/default.nix index 5fa4c6323169..b7337d8e1586 100644 --- a/pkgs/development/python-modules/backports-zoneinfo/default.nix +++ b/pkgs/development/python-modules/backports-zoneinfo/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "backports.zoneinfo" ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/backports_abc/default.nix b/pkgs/development/python-modules/backports_abc/default.nix deleted file mode 100644 index 684626c0780f..000000000000 --- a/pkgs/development/python-modules/backports_abc/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, unittestCheckHook -}: - -buildPythonPackage rec { - pname = "backports_abc"; - version = "0.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde"; - }; - - checkInputs = [ unittestCheckHook ]; - - meta = { - homepage = "https://github.com/cython/backports_abc"; - license = lib.licenses.psfl; - description = "A backport of recent additions to the 'collections.abc' module"; - }; -} 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 680d23782f56..0045a7950391 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # Test fail on Python 2 doCheck = isPy3k; diff --git a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix index 7fd9bca3a796..aec6077dd766 100644 --- a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix +++ b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix @@ -9,7 +9,7 @@ if !(pythonOlder "3.3") then null else buildPythonPackage { pname = "backports.shutil_get_terminal_size"; version = "unstable-2016-02-21"; - # there have been numerous fixes commited since the initial release. + # there have been numerous fixes committed since the initial release. # Most notably fixing a problem where the backport would always return # terminal size 0. See https://trac.sagemath.org/ticket/25320#comment:5. # Unfortunately the maintainer seems inactive and has not responded to @@ -22,7 +22,7 @@ if !(pythonOlder "3.3") then null else buildPythonPackage { sha256 = "17sgv8vg0xxfdnca45l1mmwwvj29gich5c8kqznnj51kfccch7sg"; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix deleted file mode 100644 index a7403e16123a..000000000000 --- a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, pythonAtLeast }: - -buildPythonPackage rec { - pname = "backports.ssl_match_hostname"; - version = "3.7.0.1"; - disabled = pythonAtLeast "3.7"; - - src = fetchPypi { - inherit pname version; - sha256 = "bb82e60f9fbf4c080eabd957c39f0641f0fc247d9a16e31e26d594d8f42b9fd2"; - }; - - meta = with lib; { - description = "The Secure Sockets layer is only actually *secure*"; - homepage = "https://bitbucket.org/brandon/backports.ssl_match_hostname"; - license = licenses.psfl; - }; -} diff --git a/pkgs/development/python-modules/backports_tempfile/default.nix b/pkgs/development/python-modules/backports_tempfile/default.nix index ef4f64def3a7..0e0f3ac03378 100644 --- a/pkgs/development/python-modules/backports_tempfile/default.nix +++ b/pkgs/development/python-modules/backports_tempfile/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { # requires https://pypi.org/project/backports.test.support doCheck = false; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/pkgs/development/python-modules/backports_weakref/default.nix b/pkgs/development/python-modules/backports_weakref/default.nix index a0cbe6d4b843..2a0ef0b43203 100644 --- a/pkgs/development/python-modules/backports_weakref/default.nix +++ b/pkgs/development/python-modules/backports_weakref/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { }; buildInputs = [ setuptools-scm ]; -# checkInputs = [ backports ]; +# nativeCheckInputs = [ backports ]; # Requires backports package doCheck = false; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "tests" ]; diff --git a/pkgs/development/python-modules/bacpypes/default.nix b/pkgs/development/python-modules/bacpypes/default.nix index 40d06f7da8a0..20c1288ba433 100644 --- a/pkgs/development/python-modules/bacpypes/default.nix +++ b/pkgs/development/python-modules/bacpypes/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ wheel ]; # Using pytes instead of setuptools check hook allows disabling specific tests - checkInputs = [ pytestCheckHook pytest-runner ]; + nativeCheckInputs = [ pytestCheckHook pytest-runner ]; dontUseSetuptoolsCheck = true; disabledTests = [ # Test fails with a an error: AssertionError: assert 30 == 31 diff --git a/pkgs/development/python-modules/bagit/default.nix b/pkgs/development/python-modules/bagit/default.nix index 67aed7c186fd..5f15060c4e2d 100644 --- a/pkgs/development/python-modules/bagit/default.nix +++ b/pkgs/development/python-modules/bagit/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix index cf1bbd9c54aa..73de9a4688d0 100644 --- a/pkgs/development/python-modules/bandit/default.nix +++ b/pkgs/development/python-modules/bandit/default.nix @@ -1,31 +1,35 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, lib , isPy3k - -# pythonPackages -, GitPython +, pythonOlder +, gitpython , pbr , pyyaml -, six +, rich , stevedore }: buildPythonPackage rec { pname = "bandit"; version = "1.7.4"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LWOoxXNBe64ziWLUubBvvGCA907NlVoJKEnh5lxxe9I="; + hash = "sha256-LWOoxXNBe64ziWLUubBvvGCA907NlVoJKEnh5lxxe9I="; }; - propagatedBuildInputs = [ - GitPython + nativeBuildInputs = [ pbr + ]; + + propagatedBuildInputs = [ + gitpython pyyaml - six + rich stevedore ]; @@ -33,12 +37,15 @@ buildPythonPackage rec { # and this requires Network Connectivity doCheck = false; - meta = { + pythonImportsCheck = [ + "bandit" + ]; + + meta = with lib; { description = "Security oriented static analyser for python code"; - homepage = "https://bandit.readthedocs.io/en/latest/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - kamadorueda - ]; + homepage = "https://bandit.readthedocs.io/"; + changelog = "https://github.com/PyCQA/bandit/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ kamadorueda ]; }; } diff --git a/pkgs/development/python-modules/baron/default.nix b/pkgs/development/python-modules/baron/default.nix index e5a752dd5dbb..af8c1a1d36a6 100644 --- a/pkgs/development/python-modules/baron/default.nix +++ b/pkgs/development/python-modules/baron/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ rply ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; doCheck = isPy3k; diff --git a/pkgs/development/python-modules/base36/default.nix b/pkgs/development/python-modules/base36/default.nix index 348422e31fa7..92b4faf7d9e6 100644 --- a/pkgs/development/python-modules/base36/default.nix +++ b/pkgs/development/python-modules/base36/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { --replace "--pep8 --cov" "" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "test_base36.py" ]; pythonImportsCheck = [ "base36" ]; diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix index 6fe7a111b5d4..c08ba1ccf5a8 100644 --- a/pkgs/development/python-modules/base58/default.nix +++ b/pkgs/development/python-modules/base58/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, py , pyhamcrest , pytest-benchmark , pytestCheckHook @@ -10,6 +11,7 @@ buildPythonPackage rec { pname = "base58"; version = "2.1.1"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { @@ -17,7 +19,8 @@ buildPythonPackage rec { sha256 = "c5d0cb3f5b6e81e8e35da5754388ddcc6d0d14b6c6a132cb93d69ed580a7278c"; }; - checkInputs = [ + nativeCheckInputs = [ + py pyhamcrest pytest-benchmark pytestCheckHook diff --git a/pkgs/development/python-modules/base58check/default.nix b/pkgs/development/python-modules/base58check/default.nix index e81eca6e137d..7b635abd0de1 100644 --- a/pkgs/development/python-modules/base58check/default.nix +++ b/pkgs/development/python-modules/base58check/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-Tig6beLRDsXC//x4+t/z2BGaJQWzcP0J+QEKx3D0rhs="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/baseline/default.nix b/pkgs/development/python-modules/baseline/default.nix index 0bee2295ed56..947ab4b6c1cb 100644 --- a/pkgs/development/python-modules/baseline/default.nix +++ b/pkgs/development/python-modules/baseline/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0qjg46ipyfjflvjqzqr5p7iylwwqn2mhhrq952d01vi8wvfds10d"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Easy String Baseline"; diff --git a/pkgs/development/python-modules/baselines/default.nix b/pkgs/development/python-modules/baselines/default.nix index 66972dc8b239..dd5139990128 100644 --- a/pkgs/development/python-modules/baselines/default.nix +++ b/pkgs/development/python-modules/baselines/default.nix @@ -51,7 +51,7 @@ buildPythonPackage { # fails to create a daemon, probably because of sandboxing doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix index 0ee12c414804..cb02db36ada1 100644 --- a/pkgs/development/python-modules/bashlex/default.nix +++ b/pkgs/development/python-modules/bashlex/default.nix @@ -1,33 +1,31 @@ -{ enum-compat -, lib +{ lib , buildPythonPackage , fetchFromGitHub -, nose , python +, pytestCheckHook }: buildPythonPackage rec { pname = "bashlex"; - version = "0.15"; + version = "0.16"; + + format = "setuptools"; src = fetchFromGitHub { owner = "idank"; repo = pname; rev = version; - sha256 = "sha256-kKVorAIKlyC9vUzLOlaZ/JrG1kBBRIvLwBmHNj9nx84="; + hash = "sha256-vpcru/ax872WK3XuRQWTmTD9zRdObn2Bit6kY9ZIQaI="; }; - checkInputs = [ nose ]; - propagatedBuildInputs = [ enum-compat ]; - # workaround https://github.com/idank/bashlex/issues/51 preBuild = '' ${python.interpreter} -c 'import bashlex' ''; - checkPhase = '' - ${python.interpreter} -m nose --with-doctest - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "bashlex" ]; diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix index 4fda2f331f6d..9e0c81570445 100644 --- a/pkgs/development/python-modules/batchgenerators/default.nix +++ b/pkgs/development/python-modules/batchgenerators/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { --replace '"unittest2",' "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix index 03ac94ad6044..3ca0d9f450bb 100644 --- a/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # New sklearn broke one test diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index 4f6753790196..d3954e52bb5b 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytestCheckHook nose glibcLocales ]; + nativeCheckInputs = [ pytestCheckHook nose glibcLocales ]; propagatedBuildInputs = [ numpy scipy matplotlib h5py ]; diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix index 7feb0dcf8f9c..9a02610c02a0 100644 --- a/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -8,17 +8,17 @@ buildPythonPackage rec { pname = "bc-python-hcl2"; - version = "0.3.47"; + version = "0.3.51"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-F4vAn6HRvNNc+4ZfGCzUef14bNmxTICwENmaOe3MaHc="; + hash = "sha256-Fb/suuiC6tmY3ZMAc3I3oU5A39jJc+XH3ntMkgQKAQ8="; }; - # Nose is required during build process, so can not use `checkInputs`. + # Nose is required during build process, so can not use `nativeCheckInputs`. buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/bcrypt/3.nix b/pkgs/development/python-modules/bcrypt/3.nix index 2f242faac86d..fec467f983cc 100644 --- a/pkgs/development/python-modules/bcrypt/3.nix +++ b/pkgs/development/python-modules/bcrypt/3.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { cffi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index a4848c676a94..adde33b70f6d 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { cffi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix index 9b692ef92f2a..58f7515c10d6 100644 --- a/pkgs/development/python-modules/beaker/default.nix +++ b/pkgs/development/python-modules/beaker/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pycryptopp ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales python-memcached mock diff --git a/pkgs/development/python-modules/beancount-black/default.nix b/pkgs/development/python-modules/beancount-black/default.nix new file mode 100644 index 000000000000..eb082f5b9537 --- /dev/null +++ b/pkgs/development/python-modules/beancount-black/default.nix @@ -0,0 +1,48 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, beancount-parser +, click +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "beancount-black"; + version = "0.1.13"; + + disabled = pythonOlder "3.9"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "LaunchPlatform"; + repo = "beancount-black"; + rev = version; + sha256 = "sha256-jhcPR+5+e8d9cbcXC//xuBwmZ14xtXNlYtmH5yNSU0E="; + }; + + buildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + beancount-parser + click + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "beancount_black" + ]; + + meta = with lib; { + description = "Opinioned code formatter for Beancount"; + homepage = "https://github.com/LaunchPlatform/beancount-black/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/beancount-parser/default.nix b/pkgs/development/python-modules/beancount-parser/default.nix new file mode 100644 index 000000000000..9af5fcd28fb4 --- /dev/null +++ b/pkgs/development/python-modules/beancount-parser/default.nix @@ -0,0 +1,47 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, lark +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "beancount-parser"; + version = "0.1.23"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "LaunchPlatform"; + repo = "beancount-parser"; + rev = "refs/tags/${version}"; + hash = "sha256-3pO1HvH3R2RpNFtplWyaXxqZy0caAoAxlmfSKmjkvKQ="; + }; + + buildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + lark + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "beancount_parser" + ]; + + meta = with lib; { + description = "Standalone Lark based Beancount syntax parser"; + homepage = "https://github.com/LaunchPlatform/beancount-parser/"; + changelog = "https://github.com/LaunchPlatform/beancount-parser/releases/tag/${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/beancount_docverif/default.nix b/pkgs/development/python-modules/beancount_docverif/default.nix index b39b52970f01..3ca6542f8fd2 100644 --- a/pkgs/development/python-modules/beancount_docverif/default.nix +++ b/pkgs/development/python-modules/beancount_docverif/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { beancount ]; - checkInputs = [ + nativeCheckInputs = [ pytest sh ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { Docverif is the "Document Verification" plugin for beancount, fulfilling the following functions: - Require that every transaction touching an account have an accompanying document on disk. - - Explictly declare the name of a document accompanying a transaction. + - Explicitly declare the name of a document accompanying a transaction. - Explicitly declare that a transaction is expected not to have an accompanying document. - Look for an "implicit" PDF document matching transaction data. - Associate (and require) a document with any type of entry, including open entries themselves. diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index 1a238a3937c5..bd64e9acd775 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -7,17 +7,17 @@ buildPythonPackage rec { pname = "beartype"; - version = "0.11.0"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-OFS1Dqqpi7iUkL5X5zxpx3eg8wRXTnBDrH2pisanNaY="; + hash = "sha256-O3VFs/MzprBwQraLECFBVUya3S6Xnat7D47WN49699c="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index ee11ead039e7..53d869db458c 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { soupsieve ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/beautifultable/default.nix b/pkgs/development/python-modules/beautifultable/default.nix index e222a8cdd9c4..97b13414f36b 100644 --- a/pkgs/development/python-modules/beautifultable/default.nix +++ b/pkgs/development/python-modules/beautifultable/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { wcwidth ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 1030e589a21d..f90b664ee7aa 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { hash = "sha256-B8PUN1Q4UAsDWrHjPZDlpaPjCKjI/pAogCSI+BQnaWs="; }; - checkInputs = [ pytestCheckHook mock path pyhamcrest pytest-html ]; + nativeCheckInputs = [ pytestCheckHook mock path pyhamcrest pytest-html ]; # upstream tests are failing, so instead we only check if we can import it doCheck = false; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index de4205654255..6ac6521530ac 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -1,30 +1,31 @@ { lib +, asynctest , buildPythonPackage -, fetchFromGitHub , click , click-log -, dataclasses +, fetchFromGitHub , pure-pcapy3 , pyserial-asyncio -, voluptuous -, zigpy -, asynctest -, pythonOlder -, pytestCheckHook , pytest-asyncio , pytest-timeout +, pytestCheckHook +, pythonOlder +, voluptuous +, zigpy }: buildPythonPackage rec { pname = "bellows"; - version = "0.34.3"; + version = "0.34.7"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - sha256 = "sha256-7jaXNz7i+kF64T+5/QWKGpxHCkg/M9U2hbWrVB2tjH8="; + hash = "sha256-+4OWiIRbCLvZWt5zn2djW20PrZJK4c5KOcz4Owbkozg="; }; propagatedBuildInputs = [ @@ -34,11 +35,9 @@ buildPythonPackage rec { pyserial-asyncio voluptuous zigpy - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio pytest-timeout @@ -53,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to implement EZSP for EmberZNet devices"; homepage = "https://github.com/zigpy/bellows"; + changelog = "https://github.com/zigpy/bellows/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mvnetbiz ]; }; diff --git a/pkgs/development/python-modules/bencoder/default.nix b/pkgs/development/python-modules/bencoder/default.nix new file mode 100644 index 000000000000..2fa730630c0b --- /dev/null +++ b/pkgs/development/python-modules/bencoder/default.nix @@ -0,0 +1,27 @@ +{ lib +, fetchPypi +, buildPythonPackage +, setuptools +}: +buildPythonPackage rec { + pname = "bencoder"; + version = "0.2.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-rENvM/3X51stkFdJHSq+77VjHvsTyBNAPbCtsRq1L8I="; + }; + + pythonImportsCheck = [ "bencoder" ]; + + # There are no tests. + doCheck = false; + + meta = with lib; { + description = "A simple bencode decoder/encoder library in pure Python"; + homepage = "https://github.com/utdemir/bencoder"; + license = licenses.gpl2; + maintainers = with maintainers; [ somasis ]; + }; +} diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix index b49204ee8c44..7b3d3bc09848 100644 --- a/pkgs/development/python-modules/betterproto/default.nix +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -5,7 +5,6 @@ , poetry-core , grpclib , python-dateutil -, dataclasses , black , jinja2 , isort @@ -21,7 +20,7 @@ buildPythonPackage rec { pname = "betterproto"; version = "2.0.0b5"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "danielgtaylor"; @@ -35,8 +34,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ grpclib python-dateutil - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses ]; passthru.optional-dependencies.compiler = [ @@ -47,7 +44,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "betterproto" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio pytest-mock diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix index 4545eaeaef6d..065af5879a47 100644 --- a/pkgs/development/python-modules/bibtexparser/default.nix +++ b/pkgs/development/python-modules/bibtexparser/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index f59e6418fe91..45ba90794d4f 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { sphinx ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis py pytestCheckHook diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 69c0d605c59a..c22c0c9657f1 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.9.8"; + version = "1.9.9"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/zl5m7IF+S1vLDIvC47/DRwCiPQpGgsY/OYa+k39fz4="; + sha256 = "sha256-KdYZ5sOpSdUdi7AvnrEfDBnfml4P6thTLM0dUPC/toA="; }; # needs packages which are not available in nixpkgs diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index 617b87bc12f1..a6ce06c8a971 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -1,23 +1,43 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder +, poetry-core , protobuf +, pytestCheckHook }: buildPythonPackage rec { pname = "biliass"; - version = "1.3.5"; - disabled = pythonOlder "3.6"; + version = "1.3.7"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-kgoQUX2l5YENEozcnfluwvcAO1ZSxlfHPVIa9ABW6IU="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "yutto-dev"; + repo = "biliass"; + rev = "refs/tags/v${version}"; + hash = "sha256-Opb4rlGe+LDJZs3F7e/NZYfuMtHEWUZeMm8VZQfEzKI="; }; - propagatedBuildInputs = [ protobuf ]; + nativeBuildInputs = [ + poetry-core + ]; - pythonImportsCheck = [ "biliass" ]; + propagatedBuildInputs = [ + protobuf + ]; + + doCheck = false; # test artifacts missing + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "biliass" + ]; meta = with lib; { homepage = "https://github.com/yutto-dev/biliass"; diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 303d334936c6..ddf1db4a6b54 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -9,17 +9,17 @@ buildPythonPackage rec { pname = "billiard"; - version = "4.0.0"; + version = "4.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NE2aHX063fFx6yxZbJ6Y0e/4Gw4D8fk5iTmjUYyiY6k="; + sha256 = "sha256-GtLuro4oBT1ym6M3PTTZ1uIQ9uTYvwqcZPkr0FPx7fU="; }; - checkInputs = [ + nativeCheckInputs = [ case psutil pytestCheckHook diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 4af50c6fdb45..91d663c6a23c 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.10.4"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-o4h84WM/p4gVrxv7YDNgwDpyBYu7Aileagwc8PXNwPs="; + hash = "sha256-Efa3Z4pWn+TkpA61COQTFCl+gOc5IGqYv6ZHTqiTC2c="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { pyjwt ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook respx time-machine diff --git a/pkgs/development/python-modules/binaryornot/default.nix b/pkgs/development/python-modules/binaryornot/default.nix index 103bd79294e6..b7ca1223ccae 100644 --- a/pkgs/development/python-modules/binaryornot/default.nix +++ b/pkgs/development/python-modules/binaryornot/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ chardet ]; - checkInputs = [ hypothesis ]; + nativeCheckInputs = [ hypothesis ]; meta = with lib; { homepage = "https://github.com/audreyr/binaryornot"; diff --git a/pkgs/development/python-modules/bincopy/default.nix b/pkgs/development/python-modules/bincopy/default.nix index 7af89c7aed87..6ecb4d1d18d2 100644 --- a/pkgs/development/python-modules/bincopy/default.nix +++ b/pkgs/development/python-modules/bincopy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bincopy"; - version = "17.11.0"; + version = "17.14.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rk7jYr9jUz7TUckoYkv74rr5D9fJLD3h7UFBH0XeleE="; + sha256 = "sha256-sx+0sBbY2P6vQt38e2M72GLU8tRwKOMpVWNNNtEXx0k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index a63df0d7d399..c3a0b8feedfd 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { HOME=$(mktemp -d) ''; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; pythonImportsCheck = [ "binwalk" ]; diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 002b3ce2e292..e0b419da2926 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.79"; + version = "1.80"; src = fetchPypi { inherit pname version; - sha256 = "edb07eac99d3b8abd7ba56ff4bedec9263f76dfc3c3f450e7d2e2bcdecf8559b"; + sha256 = "sha256-UoBemviHZ+RQ4t+BE7W8Welk4uinu4A6g1cL27UcDkM="; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix index ec351457a222..16786b2e0189 100644 --- a/pkgs/development/python-modules/bip_utils/default.nix +++ b/pkgs/development/python-modules/bip_utils/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , pythonOlder , ecdsa -, pysha3 , coincurve , pynacl , crcmod @@ -14,21 +13,26 @@ }: buildPythonPackage rec { - pname = "bip_utils"; + pname = "bip-utils"; version = "2.7.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ebellocchia"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-m7/CC5/T6qR2Ot4y5WQlzOAR0czz6XHCjJskES+2nns="; + repo = "bip_utils"; + rev = "refs/tags/v${version}"; + hash = "sha256-m7/CC5/T6qR2Ot4y5WQlzOAR0czz6XHCjJskES+2nns="; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "coincurve>=15.0.1,<18.0.0" "coincurve" + ''; + propagatedBuildInputs = [ ecdsa - pysha3 cbor2 pynacl coincurve @@ -42,10 +46,11 @@ buildPythonPackage rec { "bip_utils" ]; - meta = { + meta = with lib; { description = "Implementation of BIP39, BIP32, BIP44, BIP49 and BIP84 for wallet seeds, keys and addresses generation"; homepage = "https://github.com/ebellocchia/bip_utils"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ prusnak stargate01 ]; + changelog = "https://github.com/ebellocchia/bip_utils/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ prusnak stargate01 ]; }; } diff --git a/pkgs/development/python-modules/biplist/default.nix b/pkgs/development/python-modules/biplist/default.nix index c6714c3d4cbc..605500c67490 100644 --- a/pkgs/development/python-modules/biplist/default.nix +++ b/pkgs/development/python-modules/biplist/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1im45a9z7ryrfyp1v6i39qia5qagw6i1mhif0hl0praz9iv4j1ac"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index f49c4c9de47d..a9bbef0e4325 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.6.0"; + version = "2.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VtPxbdgHscVnMqJEzgccE17pc9PtyZKUGMGyTFQ5oP0="; + hash = "sha256-hEClSTIh9u1sTg2csrpuTmAKX7Y59mAD6vFbcVCkkjA="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix index f91ade7d10b3..e1cd7bd66a1b 100644 --- a/pkgs/development/python-modules/bitcoinlib/default.nix +++ b/pkgs/development/python-modules/bitcoinlib/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "bitcoinlib"; - version = "0.11.2"; + version = "0.12.0"; disabled = !isPy3k; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "petertodd"; repo = "python-bitcoinlib"; rev = "refs/tags/python-bitcoinlib-v${version}"; - sha256 = "sha256-/VgCTN010W/Svdrs0mGA8W1YZnyTHhcaWJKgP/c8CN8="; + sha256 = "sha256-jguybrH86z6NWLaucQEYjvH2Gkoh3Aqh/PLZ6l8Qel4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bitcoinrpc/default.nix b/pkgs/development/python-modules/bitcoinrpc/default.nix index 200f3edf038a..65c05c01991b 100644 --- a/pkgs/development/python-modules/bitcoinrpc/default.nix +++ b/pkgs/development/python-modules/bitcoinrpc/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bite-parser/default.nix b/pkgs/development/python-modules/bite-parser/default.nix index dc11813554af..9d5ba8eaa8a9 100644 --- a/pkgs/development/python-modules/bite-parser/default.nix +++ b/pkgs/development/python-modules/bite-parser/default.nix @@ -10,22 +10,23 @@ buildPythonPackage rec { pname = "bite-parser"; - version = "0.1.3"; + version = "0.2.1"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "0f246e98a5556d6ed9a33fda1e94c3ab906305729feb30d25e35344b3e1c1fd9"; + pname = "bite_parser"; + inherit version; + hash = "sha256-PmZCCQzxCfCq6Mr1qn03tj/7/0we9Bfk5fj4K+wMhsk="; }; nativeBuildInputs = [ poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook typing-extensions diff --git a/pkgs/development/python-modules/bitlist/default.nix b/pkgs/development/python-modules/bitlist/default.nix index 5d5a84da8bfb..26ca48fb4910 100644 --- a/pkgs/development/python-modules/bitlist/default.nix +++ b/pkgs/development/python-modules/bitlist/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { parts ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook nose ]; diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix index 66a42858650c..661b477e65bf 100644 --- a/pkgs/development/python-modules/bitmath/default.nix +++ b/pkgs/development/python-modules/bitmath/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "293325f01e65defe966853111df11d39215eb705a967cb115851da8c4cfa3eb8"; }; - checkInputs = [ (if isPy3k then progressbar33 else progressbar231) mock ]; + nativeCheckInputs = [ (if isPy3k then progressbar33 else progressbar231) mock ]; meta = with lib; { description = "Module for representing and manipulating file sizes with different prefix"; diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index c67b70778c89..478faf10173e 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -1,32 +1,30 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch +, pythonOlder +, setuptools , unittestCheckHook }: buildPythonPackage rec { pname = "bitstring"; - version = "3.1.9"; + version = "4.0.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "scott-griffiths"; repo = pname; rev = "bitstring-${version}"; - sha256 = "0y2kcq58psvl038r6dhahhlhp1wjgr5zsms45wyz1naq6ri8x9qa"; + hash = "sha256-eHP20F9PRe9ZNXjcDcsI3iFVswA6KtRWhBMAT7dkCv0="; }; - patches = [ - (fetchpatch { - name = "fix-running-unit-tests-using-unittest-hook.patch"; - url = "https://github.com/scott-griffiths/bitstring/commit/e5ee3fd41cad2ea761f4450b13b0424ae7262331.patch"; - hash = "sha256-+ZGywIfQQcYXJlYZBi402ONnysYm66G5zE4duJE40h8="; - }) + nativeBuildInputs = [ + setuptools ]; - checkInputs = [ unittestCheckHook ]; - - unittestFlagsArray = [ "-s" "test" ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "bitstring" ]; diff --git a/pkgs/development/python-modules/black-macchiato/default.nix b/pkgs/development/python-modules/black-macchiato/default.nix index 80aed4e6fef5..5a7c20e3c43e 100644 --- a/pkgs/development/python-modules/black-macchiato/default.nix +++ b/pkgs/development/python-modules/black-macchiato/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ black ]; - checkInputs = [ pytestCheckHook black ]; + nativeCheckInputs = [ pytestCheckHook black ]; pythonImportsCheck = [ "black" ]; diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 2dd909a338a5..33509352b6ee 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "black"; - version = "22.10.0"; + version = "22.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9RNYjaWZlD4M3k4yzJh56CXVhyDWVXBi0QmMWtgAgOE="; + hash = "sha256-IpNR5aGMow9Ee/ck0Af4kPl+E68HC7atTApEHNdZai8="; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { # Black starts a local server and needs to bind a local address. __darwinAllowLocalNetworking = true; - checkInputs = [ pytestCheckHook parameterized aiohttp ]; + nativeCheckInputs = [ pytestCheckHook parameterized aiohttp ]; preCheck = '' export PATH="$PATH:$out/bin" diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index de3caef7b0d2..1c6bd8896cee 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index ce23142f8928..54f0e009b26a 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -1,6 +1,7 @@ { lib , async-timeout , bleak +, bluetooth-adapters , dbus-fast , buildPythonPackage , fetchFromGitHub @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "2.8.5"; + version = "2.13.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Uct040yI4tJkdQNBAJhr/aOjMRcGkTOAnm4pzmeHNZM="; + hash = "sha256-MBAHo4ZpiSsGIh1ra4LugXjdSZP10RB6NG8PnC82DHY="; }; postPatch = '' @@ -36,10 +37,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ async-timeout bleak + bluetooth-adapters dbus-fast ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; @@ -58,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Connector for Bleak Clients that handles transient connection failures"; homepage = "https://github.com/bluetooth-devices/bleak-retry-connector"; + changelog = "https://github.com/bluetooth-devices/bleak-retry-connector/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index c93bc83b8a0f..3dc133fefcc7 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.19.4"; + version = "0.19.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "hbldh"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Sdgsf1gFA0UcyFuaScwqmvHV2E6Crb6vSQgUbBox5hw="; + hash = "sha256-KKZrp5yNuslEPn/TS4eAOMT48C4A5Da5/NhklyFcy7M="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bluetooth Low Energy platform agnostic client"; homepage = "https://github.com/hbldh/bleak"; + changelog = "https://github.com/hbldh/bleak/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ oxzi ]; diff --git a/pkgs/development/python-modules/blebox-uniapi/default.nix b/pkgs/development/python-modules/blebox-uniapi/default.nix index 92ea182ccc5c..82bdbe2fdd70 100644 --- a/pkgs/development/python-modules/blebox-uniapi/default.nix +++ b/pkgs/development/python-modules/blebox-uniapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "blebox-uniapi"; - version = "2.1.3"; + version = "2.1.4"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "blebox"; repo = "blebox_uniapi"; rev = "refs/tags/v${version}"; - hash = "sha256-rgZ/nHihhPZnc8LLtsrAXDCQT1XaXOnI7xBid+6khfs="; + hash = "sha256-hr3HD8UiI+bKiHcXGnyomJMzP+/GVXLgSUxeH2U6l/4="; }; postPatch = '' @@ -34,7 +34,7 @@ buildPythonPackage rec { semver ]; - checkInputs = [ + nativeCheckInputs = [ asynctest deepmerge pytest-asyncio @@ -46,6 +46,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/blebox/blebox_uniapi/blob/${src.rev}/HISTORY.rst"; description = "Python API for accessing BleBox smart home devices"; homepage = "https://github.com/blebox/blebox_uniapi"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/bless/default.nix b/pkgs/development/python-modules/bless/default.nix index e424a78c10f3..dbe92d76c73f 100644 --- a/pkgs/development/python-modules/bless/default.nix +++ b/pkgs/development/python-modules/bless/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bless"; - version = "0.2.4"; + version = "0.2.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kevincar"; repo = pname; - rev = "v${version}"; - hash = "sha256-lC1M6/9uawi4KpcK4/fAygENa9rZv9c7qCVdsZYtl5Q="; + rev = "refs/tags/v${version}"; + hash = "sha256-+rnMLqNfhIJASCKkIfOKpVil3S/d8BcMxnLHmdOcRIY="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { dbus-next ]; - checkInputs = [ + nativeCheckInputs = [ aioconsole numpy pytestCheckHook @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for creating a BLE Generic Attribute Profile (GATT) server"; homepage = "https://github.com/kevincar/bless"; + changelog = "https://github.com/kevincar/bless/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index 592c36692d0f..984ffbb33f6b 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "sha256-mg0JlpW/Yh1GgN1sc/atVH9qNEL72+gMSx2qHtvEkvw="; }; - checkInputs = [ pytest mock glibcLocales ]; + nativeCheckInputs = [ pytest mock glibcLocales ]; # Default tox.ini parameters not needed checkPhase = '' diff --git a/pkgs/development/python-modules/blessings/default.nix b/pkgs/development/python-modules/blessings/default.nix index 00b7fd9a63d7..31275a9f0703 100644 --- a/pkgs/development/python-modules/blessings/default.nix +++ b/pkgs/development/python-modules/blessings/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ six ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix index ceb6413da31c..8f53ff5c0564 100644 --- a/pkgs/development/python-modules/blinker/default.nix +++ b/pkgs/development/python-modules/blinker/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-kj5eL2nBVfLMQtr7vXDhbj/eJNLUqiq3L744YjiJJGI="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "blinker" ]; diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index 236f481df2ee..8b28cfacf1ac 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -1,35 +1,37 @@ { lib , buildPythonPackage , fetchFromGitHub +, pytestCheckHook , python-dateutil , python-slugify -, requests -, pytestCheckHook , pythonAtLeast , pythonOlder +, requests +, sortedcontainers }: buildPythonPackage rec { pname = "blinkpy"; - version = "0.19.2"; + version = "0.20.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fronzbot"; repo = "blinkpy"; rev = "refs/tags/v${version}"; - hash = "sha256-depaXtbXo5F1JC3M24i6ynWhpm9x9O7UCjkoSzFaSZI="; + hash = "sha256-6la8rCmMtH2N4/P5OVGht1wgSuiW16MmF5a422LADV4="; }; propagatedBuildInputs = [ python-dateutil python-slugify requests + sortedcontainers ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -52,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for the Blink Camera system"; homepage = "https://github.com/fronzbot/blinkpy"; + changelog = "https://github.com/fronzbot/blinkpy/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 68351bd82943..69bc78ddda65 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -10,14 +10,16 @@ buildPythonPackage rec { pname = "blis"; - version = "0.9.1"; + # Do not update to BLIS 0.9.x until the following issue is resolved: + # https://github.com/explosion/thinc/issues/771#issuecomment-1255825935 + version = "0.7.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fOrEZoAfnZfss04Q3e2MJM9eCSfqfoNNocydLtP8Nm8="; + hash = "sha256-Ke9MJQB3hakP/C8Ks9O9O3XNLXhWqaSCt9DayNURoJ0="; }; postPatch = '' @@ -34,7 +36,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytest ]; diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index 34245d93560c..206a3f81a9cd 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { docutils ]; - checkInputs = [ + nativeCheckInputs = [ ephem nose pytestCheckHook diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix index d26bdfa0851e..a5df0642d3e1 100644 --- a/pkgs/development/python-modules/blocksat-cli/default.nix +++ b/pkgs/development/python-modules/blocksat-cli/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { zfec ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ # disable tests which require being connected to the satellite diff --git a/pkgs/development/python-modules/blspy/default.nix b/pkgs/development/python-modules/blspy/default.nix index d4122dddc8bc..01200a2fae82 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.13"; + version = "1.0.16"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-feuHVtBgjzGBjY1eSKh47feTT8prdkSwvs993lJSSiI="; + hash = "sha256-XABdS6CCUJpZ9N1Vra078V0HoDU32u1l3yz96ZKHwFc="; }; patches = [ diff --git a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch index 3184e3f0ea8e..6acc6f878f51 100644 --- a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch +++ b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6922167..23d8da6 100644 +index 7922652..d85b058 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,29 +31,18 @@ set(CMAKE_MODULE_PATH @@ -10,7 +10,7 @@ index 6922167..23d8da6 100644 - # Latest commit at the moment this was added here - # Anchored to libsodium v1.0.18 - GIT_TAG f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65 -+ URL @sodium_src@ ++ URL /nix/store/2nj48a8vb7rzxhwaigdcpa0yyax7yrv7-source ) set(SODIUM_PCH "on" CACHE STRING "") set(SODIUM_DISABLE_TESTS "on" CACHE STRING "") @@ -30,12 +30,12 @@ index 6922167..23d8da6 100644 relic - GIT_REPOSITORY https://github.com/Chia-Network/relic.git - GIT_TAG ${RELIC_GIT_TAG} -+ SOURCE_DIR @relic_src@ ++ SOURCE_DIR /nix/store/6r9v1cmmy535q2y0pk0bkjh3ppyzb2ch-source ) # Relic related options diff --git a/python-bindings/CMakeLists.txt b/python-bindings/CMakeLists.txt -index 5a8c381..d9aa940 100644 +index 2e331c3..d9aa940 100644 --- a/python-bindings/CMakeLists.txt +++ b/python-bindings/CMakeLists.txt @@ -1,8 +1,7 @@ @@ -43,13 +43,13 @@ index 5a8c381..d9aa940 100644 FetchContent_Declare( pybind11 - GIT_REPOSITORY https://github.com/pybind/pybind11.git -- GIT_TAG v2.6.2 +- GIT_TAG v2.10.0 + SOURCE_DIR @pybind11_src@ ) FetchContent_MakeAvailable(pybind11 relic) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 449164a..15a955e 100644 +index 3164f7f..15a955e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,8 +37,7 @@ install(FILES $ DESTINATION lib) diff --git a/pkgs/development/python-modules/bluemaestro-ble/default.nix b/pkgs/development/python-modules/bluemaestro-ble/default.nix index 518a1c580a95..11edb88848b3 100644 --- a/pkgs/development/python-modules/bluemaestro-ble/default.nix +++ b/pkgs/development/python-modules/bluemaestro-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluemaestro-ble"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-lJYbbF6b1CazD/aVTNoZvyfH/XQf5jWBsddDdrP+FKA="; + rev = "refs/tags/v${version}"; + hash = "sha256-QGad5o9JZ6ansVh3bRBO+9mE4PKw05acY+9+Ur2OBsY="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for bluemaestro BLE devices"; homepage = "https://github.com/Bluetooth-Devices/bluemaestro-ble"; + changelog = "https://github.com/Bluetooth-Devices/bluemaestro-ble/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index b696b6b9369e..bb3519eeab73 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -3,18 +3,21 @@ , pythonOlder , fetchFromGitHub , poetry-core +, aiohttp , async-timeout , bleak , dbus-fast +, mac-vendor-lookup , myst-parser , pytestCheckHook , sphinxHook , sphinx-rtd-theme +, usb-devices }: buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.8.0"; + version = "0.15.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-K5EeDcGcjrZYQTbuYAzT7XhcAqpYW1w/jP5T0cOPsVU="; + hash = "sha256-vwcOMg10XRT6wNkQQF6qkbWSG2rsUXaDSEiIevii1eA="; }; postPatch = '' @@ -44,16 +47,19 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + aiohttp async-timeout bleak dbus-fast + mac-vendor-lookup + usb-devices ]; pythonImportsCheck = [ "bluetooth_adapters" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index 32b9c16db880..a539c3fd9a42 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -7,11 +7,12 @@ , pyric , pytestCheckHook , pythonOlder +, usb-devices }: buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "0.4.0"; + version = "1.0.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-juGrrUqPgg1bJsMZP0iitp0NW/XrCxNq/+/fx5QNkQ4="; + hash = "sha256-gDypj2Vud6JtbGREPotvawgcsu5hbf92gJxxutWHcII="; }; nativeBuildInputs = [ @@ -31,9 +32,10 @@ buildPythonPackage rec { async-timeout btsocket pyric + usb-devices ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 42c6965302f6..c843016e4ebb 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "0.3.0"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,14 +17,14 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bZ2kT9yIIHFd3/INIuJh3MdKzF8NCYNeVS/Egg5+S7I="; + hash = "sha256-MMsg1laEk9cKU4oMhjKI47ulLNaGPH6QjAdx/wuAvMM="; }; nativeBuildInputs = [ poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix index a511e23cd945..21bdad355c06 100644 --- a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/blurhash/default.nix b/pkgs/development/python-modules/blurhash/default.nix index 665f08f7987c..d0cf2135f1bc 100644 --- a/pkgs/development/python-modules/blurhash/default.nix +++ b/pkgs/development/python-modules/blurhash/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sed -i '/^addopts/d' setup.cfg ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pillow numpy diff --git a/pkgs/development/python-modules/bme680/default.nix b/pkgs/development/python-modules/bme680/default.nix index 9797a7ab0d8f..05431afa4148 100644 --- a/pkgs/development/python-modules/bme680/default.nix +++ b/pkgs/development/python-modules/bme680/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { cd library ''; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 75ca944830f1..1a4648d41382 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -28,16 +28,19 @@ , icalendar , pandas , pythonImportsCheckHook +, contourpy +, xyzservices }: buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "2.4.3"; + version = "3.0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7zOAEWGvN5Zlq3o0aE8iCYYeOu/VyAOiH7u5nZSHSwM="; + hash= "sha256-HChHHvXmEQulvtUTE3/SYFTrxEVLx2hlDq7vxTuJioo="; }; patches = [ @@ -58,7 +61,7 @@ buildPythonPackage rec { "bokeh" ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest pillow @@ -70,10 +73,10 @@ buildPythonPackage rec { requests nbconvert icalendar - pandas ]; propagatedBuildInputs = [ + contourpy pillow jinja2 python-dateutil @@ -81,8 +84,10 @@ buildPythonPackage rec { pyyaml tornado numpy + pandas packaging typing-extensions + xyzservices ] ++ lib.optionals ( isPy27 ) [ futures diff --git a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch index f8f33c0021f2..fffdea592b73 100644 --- a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch +++ b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch @@ -1,9 +1,9 @@ -diff --git a/bokeh/util/compiler.py b/bokeh/util/compiler.py -index a752aad7d..8af05ff63 100644 ---- a/bokeh/util/compiler.py -+++ b/bokeh/util/compiler.py -@@ -442,8 +442,8 @@ def _detect_nodejs(): - raise RuntimeError('node.js v%s or higher is needed to allow compilation of custom models ' % version + +diff --git a/src/bokeh/util/compiler.py b/src/bokeh/util/compiler.py +index 9af8691..4b93543 100644 +--- a/src/bokeh/util/compiler.py ++++ b/src/bokeh/util/compiler.py +@@ -415,8 +415,8 @@ def _detect_nodejs() -> str: + raise RuntimeError(f'node.js v{version_repr} or higher is needed to allow compilation of custom models ' + '("conda install nodejs" or follow https://nodejs.org/en/download/)') -_nodejs = None @@ -11,5 +11,5 @@ index a752aad7d..8af05ff63 100644 +_nodejs = "@node_bin@" +_npmjs = "@npm_bin@" - def _nodejs_path(): + def _nodejs_path() -> str: global _nodejs diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index 348919554ea0..19d69546abb8 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-8HO7X2PQEbQIQsCa2cMHQI3rlofVT22GYrWNXY34MLk="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index ae467123e9bc..04cf75a76d1f 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "boltztrap2"; - version = "22.6.1"; + version = "22.12.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "BoltzTraP2"; inherit version; - hash = "sha256-zEKRsNg5P+KKQCeB49TiiSXRmusvr1zwssHhppZdkfA="; + hash = "sha256-gzjWAMUJcF5AyDS1Qx7opVbYewaqGgmFMDGWCh/2Wz4="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/bond-api/default.nix b/pkgs/development/python-modules/bond-api/default.nix index 1a07de6dccef..e326688501e0 100644 --- a/pkgs/development/python-modules/bond-api/default.nix +++ b/pkgs/development/python-modules/bond-api/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/bond-async/default.nix b/pkgs/development/python-modules/bond-async/default.nix index 9b64d1e0a9b5..17b479cbeb99 100644 --- a/pkgs/development/python-modules/bond-async/default.nix +++ b/pkgs/development/python-modules/bond-async/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/bonsai/default.nix b/pkgs/development/python-modules/bonsai/default.nix new file mode 100644 index 000000000000..3e9f553d9ef6 --- /dev/null +++ b/pkgs/development/python-modules/bonsai/default.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, cyrus_sasl +, openldap +, typing-extensions +, gevent +, tornado +, trio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "bonsai"; + version = "1.5.1"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "noirello"; + repo = "bonsai"; + rev = "v${version}"; + hash = "sha256-UR/Ds5famD8kuDa6IIIyEv45eJuAcoygXef8XE+5Cxk="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + buildInputs = [ + cyrus_sasl + openldap + ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + + passthru.optional-dependencies = { + gevent = [ gevent ]; + tornado = [ tornado ]; + trio = [ trio ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # requires running LDAP server + "tests/test_asyncio.py" + "tests/test_ldapclient.py" + "tests/test_ldapconnection.py" + "tests/test_ldapentry.py" + "tests/test_ldapreference.py" + "tests/test_pool.py" + ]; + + disabledTests = [ + # requires running LDAP server + "test_set_async_connect" + ]; + + pythonImportsCheck = [ "bonsai" ]; + + meta = { + changelog = "https://github.com/noirello/bonsai/blob/${src.rev}/CHANGELOG.rst"; + description = "Python 3 module for accessing LDAP directory servers"; + homepage = "https://github.com/noirello/bonsai"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/boolean-py/default.nix b/pkgs/development/python-modules/boolean-py/default.nix index 3ac516e5e1b7..47afe1ef02b6 100644 --- a/pkgs/development/python-modules/boolean-py/default.nix +++ b/pkgs/development/python-modules/boolean-py/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-i6aNzGDhZip9YHXLiuh9crGm2qT2toBU2xze4PDLleg="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/booleanoperations/default.nix b/pkgs/development/python-modules/booleanoperations/default.nix index f5f3dda77a45..af718d99aca7 100644 --- a/pkgs/development/python-modules/booleanoperations/default.nix +++ b/pkgs/development/python-modules/booleanoperations/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { fontpens ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { description = "Boolean operations on paths"; diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index eb11f2f0b354..6e461e15b827 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-benchmark ]; diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index b2846e3a13a1..d2cefade9c44 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postPatch = '' mkdir -p $out/bin - ''; + '' + (pip.postPatch or ""); # `pip` does not necessarily have a `postPatch` field. nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ python ]; diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index daee50ffa832..2115eb273d66 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.36"; + version = "0.2.53"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-X/nlu/hwdgmUOw7+hALRhyCG/vphnWAK22fSWuUAjs0="; + sha256 = "sha256-V7FNuVXKJqIOsDqwg6Bn2Vb9QnuQ1XYzE4m0x2ipXW8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boto/default.nix b/pkgs/development/python-modules/boto/default.nix index 9d0248003778..8d4d8255b953 100644 --- a/pkgs/development/python-modules/boto/default.nix +++ b/pkgs/development/python-modules/boto/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ${python.interpreter} tests/test.py default ''; - checkInputs = [ nose mock ]; + nativeCheckInputs = [ nose mock ]; propagatedBuildInputs = [ requests httpretty ]; meta = with lib; { diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 698f252909ef..094ce40ce027 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -1,50 +1,57 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , botocore , jmespath , s3transfer -, futures ? null -, docutils -, nose -, mock -, isPy3k +, setuptools +, pytestCheckHook }: buildPythonPackage rec { pname = "boto3"; - version = "1.24.75"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.26.38"; # N.B: if you change this, change botocore and awscli to a matching version + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-e/oiQt+bH6c+F/TX959rIlYPVdXaLifleOWF725LFKc="; + src = fetchFromGitHub { + owner = "boto"; + repo = pname; + rev = version; + hash = "sha256-/QkR6gL0XkXofnFDcKa7J0ZbZbgT0IKnqtq2wcilbEs="; }; - propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; - checkInputs = [ docutils nose mock ]; + propagatedBuildInputs = [ + botocore + jmespath + s3transfer + setuptools + ]; - checkPhase = '' - runHook preCheck - # This method is not in mock. It might have appeared in some versions. - sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \ - tests/unit/resources/test_factory.py - nosetests -d tests/unit --verbose - runHook postCheck - ''; + doCheck = true; - # Network access - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "boto3" ]; + pythonImportsCheck = [ + "boto3" + ]; - meta = { + disabledTestPaths = [ + # Integration tests require networking + "tests/integration" + ]; + + meta = with lib; { homepage = "https://github.com/boto/boto3"; - license = lib.licenses.asl20; + changelog = "https://github.com/boto/boto3/blob/${version}/CHANGELOG.rst"; + license = licenses.asl20; description = "AWS SDK for Python"; longDescription = '' Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for Python, which allows Python developers to write software that makes use of services like Amazon S3 and Amazon EC2. ''; + maintainers = with maintainers; [ anthonyroussel ]; }; } diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index c6905d2de667..0c93fbf1b54a 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -4,43 +4,51 @@ , python-dateutil , jmespath , docutils -, simplejson -, mock -, nose , urllib3 +, pytestCheckHook +, jsonschema }: buildPythonPackage rec { pname = "botocore"; - version = "1.27.75"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.29.40"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-+LHaK0HojFjbUdsMbv9spWQliUjOSlrH6WrDWkabDU8="; + hash = "sha256-5YKsBykBjaQVsLXeFOox/9CtBIOp/bgUeQJSbQY0f7c="; }; propagatedBuildInputs = [ python-dateutil jmespath docutils - simplejson urllib3 ]; - checkInputs = [ mock nose ]; + nativeCheckInputs = [ + pytestCheckHook + jsonschema + ]; - checkPhase = '' - nosetests -v - ''; + doCheck = true; - # Network access - doCheck = false; + disabledTestPaths = [ + # Integration tests require networking + "tests/integration" - pythonImportsCheck = [ "botocore" ]; + # Disable slow tests (only run unit tests) + "tests/functional" + ]; + + pythonImportsCheck = [ + "botocore" + ]; meta = with lib; { homepage = "https://github.com/boto/botocore"; + changelog = "https://github.com/boto/botocore/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; description = "A low-level interface to a growing number of Amazon Web Services"; + maintainers = with maintainers; [ anthonyroussel ]; }; } diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index ebcf03652605..ac2f96455e63 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-aD3jqjmfsm6HsnTbz3CxplE4XUWRMXFjh6vcN5LgQWc="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index 5774397e24f2..b3431b834a38 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "bottleneck"; - version = "1.3.5"; + version = "1.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,14 +17,14 @@ buildPythonPackage rec { src = fetchPypi { pname = "Bottleneck"; inherit version; - hash = "sha256-LA0nr+RTUfb0IYkzYmIYBPp96hT+KaeOqlLUMj9kbec="; + hash = "sha256-vBXiVF1CgtbyUpWX3xvW5MXwxEKWs/hCW8g1MFvZQ8k="; }; propagatedBuildInputs = [ numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index 43fea29cc2f5..cb1ef6a35ea2 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { seaborn ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run torch torchvision diff --git a/pkgs/development/python-modules/bpycv/default.nix b/pkgs/development/python-modules/bpycv/default.nix index 7a88a4078f0b..5052cf2eb173 100644 --- a/pkgs/development/python-modules/bpycv/default.nix +++ b/pkgs/development/python-modules/bpycv/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ''; # pythonImportsCheck = [ "bpycv" ]; # this import depends on bpy that is only available inside blender - checkInputs = [ blender ]; + nativeCheckInputs = [ blender ]; checkPhase = let bpycv_example_data = fetchFromGitHub { owner = "DIYer22"; diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index f919d5cabe29..beb3d86cb70c 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -3,7 +3,6 @@ , fetchPypi , curtsies , cwcwidth -, dataclasses , greenlet , jedi , pygments @@ -20,14 +19,14 @@ buildPythonPackage rec { pname = "bpython"; - version = "0.23"; + version = "0.24"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nwB4q8iHxIrwiGkeL2R5fWyplKwPS8A8ONBvZX18BSo="; + hash = "sha256-mHNv/XqMSP0r+1PYmKR19CQb3gtnISVwavBNnQj9Pb0="; }; propagatedBuildInputs = [ @@ -42,8 +41,6 @@ buildPythonPackage rec { typing-extensions urwid watchdog - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses ]; postInstall = '' @@ -51,7 +48,7 @@ buildPythonPackage rec { --replace "Exec=/usr/bin/bpython" "Exec=$out/bin/bpython" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/braceexpand/default.nix b/pkgs/development/python-modules/braceexpand/default.nix index c5e711bb8043..40977d139c10 100644 --- a/pkgs/development/python-modules/braceexpand/default.nix +++ b/pkgs/development/python-modules/braceexpand/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "01gpcnksnqv6np28i4x8s3wkngawzgs99zvjfia57spa42ykkrg6"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "braceexpand" ]; diff --git a/pkgs/development/python-modules/bracex/default.nix b/pkgs/development/python-modules/bracex/default.nix index d5f080d8d4f6..3971c4963917 100644 --- a/pkgs/development/python-modules/bracex/default.nix +++ b/pkgs/development/python-modules/bracex/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hatchling ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "bracex" ]; diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index c88f6712f796..40715bcdacc1 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index e82c5ce78379..65b80267c1d4 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -1,31 +1,66 @@ { lib , buildPythonPackage -, fetchPypi -, pytest +, fetchFromGitHub , jinja2 +, pytestCheckHook +, pythonOlder +, setuptools-scm , selenium -, six -, setuptools }: buildPythonPackage rec { pname = "branca"; - version = "0.5.0"; + version = "0.6.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-5vL366fdNozu+PY4Irhn9eEdTTq90Jmnh9ue0rcGWuE="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "python-visualization"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-bcqr+vGKBga4rR4XFRWbjtw5xL+pWkIt+ihtKlKF6Y8="; }; - checkInputs = [ pytest selenium ]; - propagatedBuildInputs = [ jinja2 six setuptools ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - # Seems to require a browser - doCheck = false; + postPatch = '' + # We don't want flake8 + rm setup.cfg + ''; - meta = { + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + jinja2 + ]; + + nativeCheckInputs = [ + pytestCheckHook + selenium + ]; + + pythonImportsCheck = [ + "branca" + ]; + + disabledTestPaths = [ + # Some tests require a browser + "tests/test_utilities.py" + ]; + + disabledTests = [ + "test_rendering_utf8_iframe" + "test_rendering_figure_notebook" + ]; + + meta = with lib; { description = "Generate complex HTML+JS pages with Python"; homepage = "https://github.com/python-visualization/branca"; - license = with lib.licenses; [ mit ]; + changelog = "https://github.com/python-visualization/branca/blob/v${version}/CHANGES.txt"; + license = with licenses; [ mit ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix index eb0e03653e59..7f34a3c48bc7 100644 --- a/pkgs/development/python-modules/bravado-core/default.nix +++ b/pkgs/development/python-modules/bravado-core/default.nix @@ -2,34 +2,26 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fqdn -, idna -, isoduration -, jsonpointer +, pythonOlder + # build inputs , jsonref , jsonschema -, mock -, msgpack -, mypy-extensions -, pytest-benchmark -, pytestCheckHook , python-dateutil -, pythonOlder -, pytz , pyyaml -, rfc3987 -, rfc3339-validator +, requests , simplejson , six -, strict-rfc3339 , swagger-spec-validator -, uri-template -, webcolors +, pytz +, msgpack + # check inputs +, pytestCheckHook +, mock }: buildPythonPackage rec { pname = "bravado-core"; - version = "5.17.0"; + version = "5.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -38,76 +30,46 @@ buildPythonPackage rec { owner = "Yelp"; repo = pname; rev = "v${version}"; - hash = "sha256-okQA4YJq0lyVJuDzD8mMRlOS/K3gf1qRUpw/5M0LlZE="; + hash = "sha256-7LnKNR1/YIzw2iIPYXAuoC6G7fdm4D3frkSl/wJhYG4="; }; propagatedBuildInputs = [ jsonref - jsonschema - msgpack + jsonschema # with optional dependencies for format python-dateutil - pytz pyyaml + requests simplejson six swagger-spec-validator + pytz + msgpack + ] ++ jsonschema.optional-dependencies.format; - # the following packages are included when jsonschema (3.2) is installed - # as jsonschema[format], which reflects what happens in setup.py - fqdn - idna - isoduration - jsonpointer - rfc3987 - rfc3339-validator - strict-rfc3339 - uri-template - webcolors + nativeCheckInputs = [ + pytestCheckHook ]; checkInputs = [ - mypy-extensions - pytestCheckHook mock - pytest-benchmark ]; pythonImportsCheck = [ "bravado_core" ]; - pytestFlagsArray = [ - "--benchmark-skip" - ]; - disabledTestPaths = [ - # Tests are out-dated (not supporting later modules releases, e.g., jsonschema) - "tests/_decorators_test.py" - "tests/formatter" - "tests/marshal" - "tests/model" - "tests/operation" - "tests/param" - "tests/request" - "tests/resource" - "tests/response" - "tests/schema" - "tests/security_test.py" - "tests/spec" - "tests/swagger20_validator" - "tests/unmarshal" - "tests/validate" - ]; - - disabledTests = [ - "test_petstore_spec" + # skip benchmarks + "tests/profiling" + # take too long to run + "tests/spec/Spec" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Library for adding Swagger support to clients and servers"; homepage = "https://github.com/Yelp/bravado-core"; + changelog = "https://github.com/Yelp/bravado-core/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ vanschelven ]; + maintainers = with maintainers; [ vanschelven nickcao ]; }; } diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index a53af25bd888..cfb919682e44 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , docutils , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder , sphinx @@ -21,12 +22,19 @@ buildPythonPackage rec { hash = "sha256-OOc3XQjqQa0cVpA+/HHco+koL+0whUm5qC7x3xiEdwQ="; }; + patches = [ + (fetchpatch { + url = "https://github.com/breathe-doc/breathe/commit/de3504c81c7cefc87c8229743f93232ca00a685d.patch"; + hash = "sha256-UGld5j0F/hnTuS7KUFvgQL52xCUdaJ3/NeuEuHhpCxI="; + }) + ]; + propagatedBuildInputs = [ docutils sphinx ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index 64774a70867a..c8104f1b2376 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { launchpadlib ]; - checkInputs = [ testtools ]; + nativeCheckInputs = [ testtools ]; # There is a conflict with their `lazy_import` and plugin tests doCheck = false; diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix index e03fa1c2aef6..802fa6d23ba1 100644 --- a/pkgs/development/python-modules/broadlink/default.nix +++ b/pkgs/development/python-modules/broadlink/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "broadlink"; - version = "0.18.2"; + version = "0.18.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2ktLSJ1Nsdry8dvWmY/BbhHApTYQMvSjCsNKX3PkocU="; + hash = "sha256-3+WKuMbH79v2i4wurObKQZowCmFbVsxlQp3aSk+eelg="; }; propagatedBuildInputs = [ @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for controlling Broadlink IR controllers"; homepage = "https://github.com/mjg59/python-broadlink"; + changelog = "https://github.com/mjg59/python-broadlink/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index 297f1161fe2a..55dc7fd2202b 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "brother"; - version = "2.0.0"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pk9VBFha2NfQWI+fbWwGKcGFa93eKr5Cqh85r1CAXpI="; + hash = "sha256-jMvbZ4/NOA3dnJUdDWk2KTRz1gBOC+oDE0ChGNdFl1o="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { pysnmplib ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-error-for-skips pytestCheckHook diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index ad247be16185..23727f213771 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { # only returns information how to really build dontConfigure = true; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/brotlipy/default.nix b/pkgs/development/python-modules/brotlipy/default.nix index 2cc918b288ce..57310eb6a0ff 100644 --- a/pkgs/development/python-modules/brotlipy/default.nix +++ b/pkgs/development/python-modules/brotlipy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedNativeBuildInputs = [ cffi ]; - checkInputs = [ pytest hypothesis ]; + nativeCheckInputs = [ pytest hypothesis ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/brottsplatskartan/default.nix b/pkgs/development/python-modules/brottsplatskartan/default.nix index 8daf79f208d6..52c092c74b88 100644 --- a/pkgs/development/python-modules/brottsplatskartan/default.nix +++ b/pkgs/development/python-modules/brottsplatskartan/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-cov pytestCheckHook ]; diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index b072c5576d1f..cd596cecbb9f 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -6,20 +6,20 @@ , lz4 , keyring , pbkdf2 -, pycryptodome +, pycryptodomex , pyaes }: buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.16.2"; + version = "0.16.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IB0Ms+mCHh7lfG3XYfvE2h/2lec5Tq9AAjqANz7x0hE="; + hash = "sha256-i2Ib7OGnoimiZ2R/vGe6phPhA8lEP0BJ/gP1q9RVeiU="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { keyring pbkdf2 pyaes - pycryptodome + pycryptodomex ]; # No tests implemented @@ -38,10 +38,11 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Loads cookies from your browser into a cookiejar object"; homepage = "https://github.com/borisbabic/browser_cookie3"; + changelog = "https://github.com/borisbabic/browser_cookie3/blob/master/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ borisbabic ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/brunt/default.nix b/pkgs/development/python-modules/brunt/default.nix index 1c11e92b2346..40b0f665cb97 100644 --- a/pkgs/development/python-modules/brunt/default.nix +++ b/pkgs/development/python-modules/brunt/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bsuite/default.nix b/pkgs/development/python-modules/bsuite/default.nix index 955cd4951d7a..9ed9fce3eab9 100644 --- a/pkgs/development/python-modules/bsuite/default.nix +++ b/pkgs/development/python-modules/bsuite/default.nix @@ -51,7 +51,7 @@ let bsuite = buildPythonPackage rec { termcolor ]; - checkInputs = [ + nativeCheckInputs = [ distrax dm-haiku dm-sonnet diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 5831ea18ee33..9baacd74d9b4 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "2.3.1"; + version = "2.5.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4KsMYQQN/4A2sbk2Fj8CYOBf7/UAciJ4wTSFYZaCfdk="; + hash = "sha256-xxdCuTSpGe89TjF0YPmD4i1Fx1WfaQTTataFRnbcaos="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { pycryptodomex ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 9f91541599c9..69c663f9ce0b 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "btrees"; - version = "4.11.0"; + version = "4.11.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "BTrees"; inherit version; - hash = "sha256-AFwDtIAp1noojnYIeYw3rCSfLAabb1GDZAqUmdzY+qM="; + hash = "sha256-kIUAsCD/mJsAlG+Kb2Vz84qbGAjQd+UuPc8Ej7FwwTo="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { zope_interface ]; - checkInputs = [ + nativeCheckInputs = [ transaction zope_testrunner ]; diff --git a/pkgs/development/python-modules/btrfsutil/default.nix b/pkgs/development/python-modules/btrfsutil/default.nix new file mode 100644 index 000000000000..d529ec09c705 --- /dev/null +++ b/pkgs/development/python-modules/btrfsutil/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, btrfs-progs +}: +buildPythonPackage { + pname = "btrfsutil"; + inherit (btrfs-progs) version src; + format = "setuptools"; + + buildInputs = [ btrfs-progs ]; + + preConfigure = '' + cd libbtrfsutil/python + ''; + + # No tests + doCheck = false; + pythonImportsCheck = [ "btrfsutil" ]; + + meta = with lib; { + description = "Library for managing Btrfs filesystems"; + homepage = "https://btrfs.wiki.kernel.org/"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ raskin lopsided98 ]; + }; +} diff --git a/pkgs/development/python-modules/btsmarthub_devicelist/default.nix b/pkgs/development/python-modules/btsmarthub_devicelist/default.nix new file mode 100644 index 000000000000..59fb071c744c --- /dev/null +++ b/pkgs/development/python-modules/btsmarthub_devicelist/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + requests, + responses, +}: +buildPythonPackage rec { + pname = "btsmarthub_devicelist"; + version = "0.2.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jxwolstenholme"; + repo = "btsmarthub_devicelist"; + rev = "${version}"; + hash = "sha256-7ncxCpY+A2SuSFa3k21QchrmFs1dPRUMb1r1z/laa6M="; + }; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + responses + requests + pytestCheckHook + ]; + + disabledTests = [ + "test_btsmarthub2_detection_neither_router_present" + ]; + + meta = with lib; { + description = "Retrieve a list of devices from a bt smarthub or bt smarthub 2 on a local network"; + homepage = "https://github.com/jxwolstenholme/btsmarthub_devicelist"; + license = licenses.mit; + maintainers = with maintainers; [jamiemagee]; + }; +} diff --git a/pkgs/development/python-modules/btsocket/default.nix b/pkgs/development/python-modules/btsocket/default.nix index 560707ce1cbe..e1c1f8a32887 100644 --- a/pkgs/development/python-modules/btsocket/default.nix +++ b/pkgs/development/python-modules/btsocket/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-IqlbFYbEyJPlcmT3DIQIwsjQEAGeIGRtFNx4jWwNtjE="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bucketstore/default.nix b/pkgs/development/python-modules/bucketstore/default.nix index a0aa523f0c1e..d580b2024862 100644 --- a/pkgs/development/python-modules/bucketstore/default.nix +++ b/pkgs/development/python-modules/bucketstore/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ boto3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook moto ]; diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix index 03a1610ac7e4..74d86b7fc425 100644 --- a/pkgs/development/python-modules/bugzilla/default.nix +++ b/pkgs/development/python-modules/bugzilla/default.nix @@ -1,5 +1,9 @@ -{ lib, buildPythonPackage, fetchPypi -, pep8, coverage, logilab_common, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, requests +, pytestCheckHook +}: buildPythonPackage rec { pname = "bugzilla"; @@ -11,9 +15,12 @@ buildPythonPackage rec { sha256 = "0q8c3k0kdnd11g2s56cp8va9365x0xfr2m2zn9fgxjijdyhwdic5"; }; - buildInputs = [ pep8 coverage logilab_common ]; propagatedBuildInputs = [ requests ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + preCheck = '' mkdir -p check-phase export HOME=$(pwd)/check-phase @@ -22,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/python-bugzilla/python-bugzilla"; description = "Bugzilla XMLRPC access module"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ pierron ]; }; diff --git a/pkgs/development/python-modules/buienradar/default.nix b/pkgs/development/python-modules/buienradar/default.nix index ba288f59b28a..7612c62211d1 100644 --- a/pkgs/development/python-modules/buienradar/default.nix +++ b/pkgs/development/python-modules/buienradar/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index efc1f2f45ad1..44d6e6f97833 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ filelock toml pytest-mock diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index b1add1a764c0..c1a0de718200 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,8 +1,35 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k -, python, twisted, jinja2, msgpack, zope_interface, sqlalchemy, alembic -, python-dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pypugjs -, boto3, moto, mock, lz4, setuptoolsTrial -, buildbot-worker, buildbot-pkg, buildbot-plugins, parameterized, git, openssh +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, makeWrapper +, pythonOlder +, python +, twisted +, jinja2 +, msgpack +, zope_interface +, sqlalchemy +, alembic +, python-dateutil +, txaio +, autobahn +, pyjwt +, pyyaml +, treq +, txrequests +, pypugjs +, boto3 +, moto +, mock +, lz4 +, setuptoolsTrial +, buildbot-worker +, buildbot-pkg +, buildbot-plugins +, parameterized +, git +, openssh , glibcLocales , nixosTests }: @@ -17,7 +44,10 @@ let dontBuild = true; doCheck = false; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; + propagatedBuildInputs = plugins ++ package.propagatedBuildInputs; installPhase = '' @@ -33,11 +63,14 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "3.6.1"; + version = "3.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ByJPkI0AHis+Ey1lSuMly4M6W4s/xes4eG0gPPJ3fZA="; + hash = "sha256-YMLT1SP6NenJIUVTvr58GVrtNXHw+bhfgMpZu3revG4="; }; propagatedBuildInputs = [ @@ -57,7 +90,7 @@ let # tls ++ twisted.optional-dependencies.tls; - checkInputs = [ + nativeCheckInputs = [ treq txrequests pypugjs @@ -85,6 +118,9 @@ let substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" ''; + # Silence the depreciation warning from SqlAlchemy + SQLALCHEMY_SILENCE_UBER_WARNING = 1; + # TimeoutErrors on slow machines -> aarch64 doCheck = !stdenv.isAarch64; @@ -94,10 +130,10 @@ let # remove testfile which is missing configuration file from sdist rm buildbot/test/integration/test_graphql.py + # tests in this file are flaky, see https://github.com/buildbot/buildbot/issues/6776 + rm buildbot/test/integration/test_try_client.py ''; - disabled = !isPy3k; - passthru = { inherit withPlugins; tests.buildbot = nixosTests.buildbot; @@ -105,11 +141,12 @@ let }; meta = with lib; { - broken = stdenv.isDarwin; - homepage = "https://buildbot.net/"; description = "An open-source continuous integration framework for automating software build, test, and release processes"; + homepage = "https://buildbot.net/"; + changelog = "https://github.com/buildbot/buildbot/releases/tag/v${version}"; maintainers = with maintainers; [ ryansydnor lopsided98 ]; - license = licenses.gpl2; + license = licenses.gpl2Only; + broken = stdenv.isDarwin; }; }; in package diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 2abe2979ccb9..3b16184ae702 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-YmAO8o25uVk1KlyzFg79025KyiopXxWZVpfrvI0H8c4="; + sha256 = "sha256-4BXCOLW5e7RuZEzyD+oRmS2I4oT2W3oTcH4ZPxwKKvU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index a493d75f8562..ee36e10531f1 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,10 +7,10 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-MXCLaFXmZCzLp3nuzK2PW4aa1CC5JOXkvvswAbMwkXI="; + sha256 = "sha256-t4xHfox6h5PY4+phdCQbClHd77+WfpUWErMZCEcMxu0="; }; - # Remove unneccessary circular dependency on buildbot + # Remove unnecessary circular dependency on buildbot postPatch = '' sed -i "s/'buildbot'//" setup.py ''; @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-U89IyfhgIjrf6XH5pFod89zDE9Ln817AHMBCRTPw4tQ="; + sha256 = "sha256-JySn7QO+SgoXjVeV4wYwc9twr0Q2c/wsEspqeq038+k="; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-vbf4mMbgCePXlPwQQWeC7knBP1WZhhhEggy1ULNESG8="; + sha256 = "sha256-935eeF2kpT68lK/UMg8MZQOYEj7D8FaT9iSs/lNahYA="; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-haLbaeE1aKhHRT5UsKABBeNBRRvt7bVKalT3doQU7SI="; + sha256 = "sha256-3pHSiVoOZj2iCGfiz+tMWWMPHSBH5Ggp6e3+a8topsg="; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-zarpv8kwJMFwfZYA+EqEc7636tKud9wXfAbrlZM4bB4="; + sha256 = "sha256-5Qr1FeYIJG/qaFaTB7ScFN9uca+joHKE6FlfKwhubfo="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 91c29e31d61b..f8ab7941dc46 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -28,7 +28,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-13I7sttnxO6vORFZzpOKmXu3PfwOpSGmXqvozrhzIm0="; + sha256 = "sha256-Lc+FNrfXLfeEnDqNBs9R96jtoFEOCG2vLRWGKip/+VM="; }; postPatch = '' @@ -47,7 +47,7 @@ buildPythonPackage (rec { twisted ]; - checkInputs = [ + nativeCheckInputs = [ mock parameterized psutil diff --git a/pkgs/development/python-modules/buildcatrust/default.nix b/pkgs/development/python-modules/buildcatrust/default.nix index 9fc0330ad0ba..b875185ed2ff 100644 --- a/pkgs/development/python-modules/buildcatrust/default.nix +++ b/pkgs/development/python-modules/buildcatrust/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256:0s0m0fy943dakw9cbd40h46qmrhhgrcp292kppyb34m6y27sbagy"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix index efb0a0587114..ace266347994 100644 --- a/pkgs/development/python-modules/buildout/default.nix +++ b/pkgs/development/python-modules/buildout/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "zc-buildout"; - version = "3.0.0b2"; + version = "3.0.1"; src = fetchFromGitHub { owner = "buildout"; repo = "buildout"; rev = version; - sha256 = "01sj09xx5kmkzynhq1xd8ahn6xqybfi8lrqjqr5lr45aaxjk2pid"; + sha256 = "J/ymUCFhl7EviHMEYSUCTky0ULRT8aL4gNCGxrbqJi0="; }; propagatedBuildInputs = [ @@ -32,6 +32,6 @@ buildPythonPackage rec { downloadPage = "https://github.com/buildout/buildout"; homepage = "https://www.buildout.org"; license = licenses.zpl21; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ gotcha ]; }; } diff --git a/pkgs/development/python-modules/bunch/default.nix b/pkgs/development/python-modules/bunch/default.nix index 2758ff5b4185..39c858ebb676 100644 --- a/pkgs/development/python-modules/bunch/default.nix +++ b/pkgs/development/python-modules/bunch/default.nix @@ -1,17 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: buildPythonPackage rec { pname = "bunch"; - version = "1.0.1"; + version = "unstable-2017-11-21"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "1akalx2pd1fjlvrq69plvcx783ppslvikqdm93z2sdybq07pmish"; + disabled = pythonOlder "3.7"; + + # Use a fork as upstream is dead + src = fetchFromGitHub { + owner = "olivecoder"; + repo = pname; + rev = "71ac9d5c712becd4c502ab3099203731a0f1122e"; + hash = "sha256-XOgzJkcIqkAJFsKAyt2jSEIxcc0h2gFC15xy5kAs+7s="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "rU" "r" + ''; + + # No real tests available doCheck = false; + pythonImportsCheck = [ + "bunch" + ]; + meta = with lib; { + description = "Python dictionary that provides attribute-style access"; + homepage = "https://github.com/dsc/bunch"; + license = licenses.mit; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index 9886a53eb3dc..8c5be6384f35 100644 --- a/pkgs/development/python-modules/bundlewrap/default.nix +++ b/pkgs/development/python-modules/bundlewrap/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "bundlewrap"; - version = "4.15.0"; + version = "4.16.0"; disabled = pythonOlder "3.7"; @@ -26,17 +26,17 @@ buildPythonPackage rec { owner = "bundlewrap"; repo = "bundlewrap"; rev = version; - sha256 = "sha256-O31lh43VyaFnd/IUkx44wsgxkWubZKzjsKXzHwcGox0"; + sha256 = "sha256-y7h43D/SeXmMm0Fxi3hOOfXgDlmeoca11HOhGeJffRA="; }; nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ cryptography jinja2 Mako passlib pyyaml requests tomlkit librouteros - ] ++ lib.optional (pythonOlder "3.11") [ rtoml ]; + ] ++ lib.optionals (pythonOlder "3.11") [ rtoml ]; pythonImportsCheck = [ "bundlewrap" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ # only unit tests as integration tests need a OpenSSH client/server setup diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix new file mode 100644 index 000000000000..c3072f914342 --- /dev/null +++ b/pkgs/development/python-modules/bx-py-utils/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, beautifulsoup4 +, boto3 +, lxml +, pdoc +, pytestCheckHook +, requests-mock +}: + +buildPythonPackage rec { + pname = "bx-py-utils"; + version = "75"; + + disabled = pythonOlder "3.9"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "boxine"; + repo = "bx_py_utils"; + rev = "refs/tags/v${version}"; + hash = "sha256-+RHt5QTXxuaY1tDe1M66TrQfT9I7X56oVQAW36mzSwM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + pythonImportsCheck = [ + "bx_py_utils.anonymize" + "bx_py_utils.auto_doc" + "bx_py_utils.compat" + "bx_py_utils.dict_utils" + "bx_py_utils.environ" + "bx_py_utils.error_handling" + "bx_py_utils.file_utils" + "bx_py_utils.graphql_introspection" + "bx_py_utils.hash_utils" + "bx_py_utils.html_utils" + "bx_py_utils.iteration" + "bx_py_utils.path" + "bx_py_utils.processify" + "bx_py_utils.rison" + "bx_py_utils.stack_info" + "bx_py_utils.string_utils" + "bx_py_utils.test_utils" + "bx_py_utils.text_tools" + ]; + + nativeCheckInputs = [ + beautifulsoup4 + boto3 + lxml + pdoc + pytestCheckHook + requests-mock + ]; + + disabledTestPaths = [ + "bx_py_utils_tests/tests/test_project_setup.py" + ]; + + meta = { + description = "Various Python utility functions"; + homepage = "https://github.com/boxine/bx_py_utils"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix index 179ac7356a86..0606ccb859c6 100644 --- a/pkgs/development/python-modules/bx-python/default.nix +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; buildInputs = [ zlib ]; propagatedBuildInputs = [ numpy six python-lzo ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; postInstall = '' cp -r scripts/* $out/bin diff --git a/pkgs/development/python-modules/bytecode/default.nix b/pkgs/development/python-modules/bytecode/default.nix index 648ec29520bf..ac50b980abdb 100644 --- a/pkgs/development/python-modules/bytecode/default.nix +++ b/pkgs/development/python-modules/bytecode/default.nix @@ -3,21 +3,29 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook +, setuptools-scm }: buildPythonPackage rec { pname = "bytecode"; - version = "0.13.0"; + version = "0.14.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "vstinner"; repo = pname; - rev = version; - sha256 = "sha256-aY19qMYW7KziiXVY3lxdnHk7OCAJaNh+aTvlQyJWmDw="; + rev = "refs/tags/${version}"; + sha256 = "sha256-nGZ4qcms27lYr1dYvVe4ebd/jc5qIb1EDhSpSZmKKIo="; }; - checkInputs = [ + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index 529975f1080b..bbe531015778 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -18,6 +18,8 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; + __darwinAllowLocalNetworking = true; + src = fetchFromGitHub { owner = "ionrock"; repo = pname; @@ -30,7 +32,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ cherrypy mock pytestCheckHook diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix index 72bf870c37b5..555b1ce006e7 100644 --- a/pkgs/development/python-modules/cached-property/default.nix +++ b/pkgs/development/python-modules/cached-property/default.nix @@ -1,31 +1,55 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, fetchpatch , pytestCheckHook , freezegun +, pythonOlder }: buildPythonPackage rec { pname = "cached-property"; version = "1.5.2"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pydanny"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-DGI8FaEjFd2bDeBDKcA0zDCE+5I6meapVNZgycE1gzs="; }; - checkInputs = [ pytestCheckHook freezegun ]; + patches = [ + # Don't use asyncio.coroutine if it's not available, https://github.com/pydanny/cached-property/pull/267 + (fetchpatch { + name = "asyncio-coroutine.patch"; + url = "https://github.com/pydanny/cached-property/commit/297031687679762849dedeaf24aa3a19116f095b.patch"; + hash = "sha256-qolrUdaX7db4hE125Lt9ICmPNYsD/uBmQrdO4q5NG3c="; + }) + ]; + + checkInputs = [ + pytestCheckHook + freezegun + ]; disabledTests = [ # https://github.com/pydanny/cached-property/issues/131 "test_threads_ttl_expiry" ]; - meta = { + pythonImportsCheck = [ + "cached_property" + ]; + + meta = with lib; { description = "A decorator for caching properties in classes"; homepage = "https://github.com/pydanny/cached-property"; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ericsagnes ]; + changelog = "https://github.com/pydanny/cached-property/releases/tag/${version}"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ ericsagnes ]; }; } diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix index 9a873d24f563..f23a0ada1d49 100644 --- a/pkgs/development/python-modules/cachelib/default.nix +++ b/pkgs/development/python-modules/cachelib/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-LO1VdirKWXIAy3U8oRtnFI58qO+yn6Vm5bZdCjdgKwo="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-xprocess pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 9de26ad53395..08e0b559b0f2 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "cachetools"; - version = "5.2.0"; + version = "5.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,11 +15,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tkem"; repo = pname; - rev = "v${version}"; - hash = "sha256-DheHTD62f1ZxoiS0y0/CzDMHvKGmEiEUAX6oaqTpB78="; + rev = "refs/tags/v${version}"; + hash = "sha256-1B/vAfGroGABijMWuiKmIkMyjNSp2B3VkH7s1NMlbw0="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Extensible memoizing collections and decorators"; homepage = "https://github.com/tkem/cachetools"; + changelog = "https://github.com/tkem/cachetools/blob/v${version}/CHANGELOG.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/cachey/default.nix b/pkgs/development/python-modules/cachey/default.nix index aff819adcad8..c5e21598e567 100644 --- a/pkgs/development/python-modules/cachey/default.nix +++ b/pkgs/development/python-modules/cachey/default.nix @@ -17,7 +17,7 @@ sha256 = "sha256-5USmuufrrWtmgibpfkjo9NtgN30hdl8plJfythmxM4s="; }; propagatedBuildInputs = [ typing-extensions heapdict ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "cachey" ]; diff --git a/pkgs/development/python-modules/cadquery/default.nix b/pkgs/development/python-modules/cadquery/default.nix index f7e436a41605..385a36d46f16 100644 --- a/pkgs/development/python-modules/cadquery/default.nix +++ b/pkgs/development/python-modules/cadquery/default.nix @@ -88,7 +88,7 @@ in fontDirectories = [ freefont_ttf ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/caio/default.nix b/pkgs/development/python-modules/caio/default.nix index 28ba5a2f4d19..a7dcab5cacd4 100644 --- a/pkgs/development/python-modules/caio/default.nix +++ b/pkgs/development/python-modules/caio/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "caio"; - version = "0.9.8"; + version = "0.9.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,10 +17,10 @@ buildPythonPackage rec { owner = "mosquito"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hUG5EaraoKj3D3K+Qm2Nm1AFe19qwRy/FnEb1SXWKDM="; + hash = "sha256-BFlpjbC2yxwGtCAMfn1VM5zmioyN5fFNMJDDWceB+LE="; }; - checkInputs = [ + nativeCheckInputs = [ aiomisc pytestCheckHook ]; @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "File operations with asyncio support"; homepage = "https://github.com/mosquito/caio"; + changelog = "https://github.com/mosquito/caio/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/cairo-lang/default.nix b/pkgs/development/python-modules/cairo-lang/default.nix index ec11772fb50f..f1da79151f42 100644 --- a/pkgs/development/python-modules/cairo-lang/default.nix +++ b/pkgs/development/python-modules/cairo-lang/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { pyyaml ] ++ eth-hash.optional-dependencies.pycryptodome; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index 87c56b40e9e3..13a9363d414c 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { ++ lib.optional withXcffib xcffib; # pytestCheckHook does not work - checkInputs = [ numpy pikepdf pytest glibcLocales ]; + nativeCheckInputs = [ numpy pikepdf pytest glibcLocales ]; checkPhase = '' py.test $out/${python.sitePackages} diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index df6600e3faac..98e0235a9be0 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "CairoSVG"; - version = "2.5.2"; + version = "2.6.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-sLmSnPXboAUXjXRqgDb88AJVUPSYylTbYYczIjhHg7w="; + sha256 = "sha256-1eyT6QEBs7boKqJF0FRu6bAWz9oLY0RnUVmDDYU9XQQ="; }; propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ]; propagatedNativeBuildInputs = [ cairocffi ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' substituteInPlace setup.cfg \ diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 315260fb94c3..d6b8112c7df6 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -1,11 +1,11 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder , icalendar , lxml -, nose +, pytestCheckHook , pytz +, recurring-ical-events , requests , six , tzlocal @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "caldav"; - version = "0.9.1"; + version = "1.0.1"; src = fetchFromGitHub { owner = "python-caldav"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Gil0v4pGyp5+TnYPjb8Vk0xTqnQKaeD8Ko/ZWhvkbUk="; + hash = "sha256-1BGy4h0TpeiUNtUnj/BiGSfH4T9YXP8YGJ1+4UsRGug="; }; propagatedBuildInputs = [ @@ -28,30 +28,27 @@ buildPythonPackage rec { lxml requests six + icalendar + recurring-ical-events ]; - checkInputs = [ - icalendar - nose + nativeCheckInputs = [ + pytestCheckHook tzlocal pytz ]; - checkPhase = '' - nosetests tests - ''; - - # xandikos and radicale is only a optional test dependency, not available for python3 + # xandikos and radicale are only optional test dependencies, not available for python3 postPatch = '' substituteInPlace setup.py \ - --replace ", 'xandikos<0.2.4'" "" \ - --replace ", 'radicale'" "" + --replace xandikos "" \ + --replace radicale "" ''; pythonImportsCheck = [ "caldav" ]; meta = with lib; { - description = "This project is a CalDAV (RFC4791) client library for Python."; + description = "CalDAV (RFC4791) client library"; homepage = "https://github.com/python-caldav/caldav"; license = licenses.asl20; maintainers = with maintainers; [ marenz dotlambda ]; diff --git a/pkgs/development/python-modules/callee/default.nix b/pkgs/development/python-modules/callee/default.nix index 1cf63455c24b..d7fb37706a59 100644 --- a/pkgs/development/python-modules/callee/default.nix +++ b/pkgs/development/python-modules/callee/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; # missing dependency - checkInputs = [ + nativeCheckInputs = [ # taipan missing, unmaintained, not python3.10 compatible pytestCheckHook ]; diff --git a/pkgs/development/python-modules/calver/default.nix b/pkgs/development/python-modules/calver/default.nix new file mode 100644 index 000000000000..398e07b39df8 --- /dev/null +++ b/pkgs/development/python-modules/calver/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pretend +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "calver"; + version = "2022.06.26"; + + disabled = pythonOlder "3.5"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "di"; + repo = "calver"; + rev = version; + hash = "sha256-YaXTkeUazwzghCX96Wfx39hGvukWKtHMLLeyF9OeiZI="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "version=calver_version(True)" 'version="${version}"' + ''; + + nativeCheckInputs = [ + pretend + pytestCheckHook + ]; + + pythonImportsCheck = [ "calver" ]; + + meta = { + description = "Setuptools extension for CalVer package versions"; + homepage = "https://github.com/di/calver"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/camel-converter/default.nix b/pkgs/development/python-modules/camel-converter/default.nix new file mode 100644 index 000000000000..3d2f9e7b40e6 --- /dev/null +++ b/pkgs/development/python-modules/camel-converter/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pydantic +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "camel-converter"; + version = "3.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "sanders41"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-SUuSaQU6o2OtjDNrDcO3nS0EZH2ammEkP7AEp4H5ysI="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov=camel_converter --cov-report term-missing" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + passthru.optional-dependencies = { + pydantic = [ + pydantic + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ passthru.optional-dependencies.pydantic; + + pythonImportsCheck = [ + "camel_converter" + ]; + + meta = with lib; { + description = "Client for the Meilisearch API"; + homepage = "https://github.com/sanders41/camel-converter"; + changelog = "https://github.com/sanders41/camel-converter/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index f0b221e5adff..d96f588a0aae 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -12,42 +12,54 @@ , pythonOlder , typing-extensions , wrapt +, uptime }: buildPythonPackage rec { - pname = "python-can"; - version = "4.0.0"; + pname = "can"; + version = "4.1.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "hardbyte"; - repo = pname; - rev = version; - hash = "sha256-/z7zBfVbO7x4UtzWOXolH2YrtYWgsvRLObWwz8sqOEc="; + repo = "python-can"; + rev = "refs/tags/v${version}"; + hash = "sha256-jNy47SapujTF3ReJtIbwUY53IftIH4cXZjkzHrnZMFQ="; }; + postPatch = '' + substituteInPlace tox.ini \ + --replace " --cov=can --cov-config=tox.ini --cov-report=lcov --cov-report=term" "" + ''; + propagatedBuildInputs = [ msgpack packaging - pyserial typing-extensions wrapt ]; - checkInputs = [ + passthru.optional-dependencies = { + serial = [ + pyserial + ]; + seeedstudio = [ + pyserial + ]; + pcan = [ + uptime + ]; + }; + + nativeCheckInputs = [ future hypothesis parameterized pytest-timeout pytestCheckHook - ]; - - postPatch = '' - substituteInPlace tox.ini \ - --replace " --cov=can --cov-config=tox.ini --cov-report=xml --cov-report=term" "" - ''; + ] ++ passthru.optional-dependencies.serial; disabledTestPaths = [ # We don't support all interfaces @@ -74,6 +86,7 @@ buildPythonPackage rec { meta = with lib; { description = "CAN support for Python"; homepage = "https://python-can.readthedocs.io"; + changelog = "https://github.com/hardbyte/python-can/releases/tag/v${version}"; license = licenses.lgpl3Only; maintainers = with maintainers; [ fab sorki ]; }; diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix index d131e4001c94..79dbbf9d4421 100644 --- a/pkgs/development/python-modules/canmatrix/default.nix +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { --replace "version = versioneer.get_version()" "version = \"${version}\"" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # long_envvar_name_imports requires stable key value pair ordering pytestFlagsArray = [ "-s src/canmatrix" ]; disabledTests = [ "long_envvar_name_imports" ]; diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index 3e88db6c915b..46ceee80c0f5 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index ccb3626e2f48..072b22a895a6 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "canopen"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vMiqnqg/etpdoNregQOJd75SqTgCwmV2SXKesfggZdk="; + hash = "sha256-vBJrsdy2Ljs02KEuOKB7WqgxnBdFfJv+II8Lu9qQ/2E="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { canmatrix ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix index 2495040887fd..082c765b39dc 100644 --- a/pkgs/development/python-modules/capturer/default.nix +++ b/pkgs/development/python-modules/capturer/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { # hangs on darwin doCheck = !stdenv.isDarwin; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Easily capture stdout/stderr of the current process and subprocesses"; diff --git a/pkgs/development/python-modules/cart/default.nix b/pkgs/development/python-modules/cart/default.nix index c4d4e8892018..c4ef21648773 100644 --- a/pkgs/development/python-modules/cart/default.nix +++ b/pkgs/development/python-modules/cart/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pycryptodome ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index 5d635d5a52b2..68e2eaaf2f23 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -1,28 +1,39 @@ -{ buildPythonPackage, lib, fetchPypi -, pytestCheckHook, filelock, mock, pep8 -, cython, setuptools-scm -, six, pyshp, shapely, geos, numpy -, gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona -, proj, flufl_lock +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, cython +, setuptools-scm +, geos +, proj +, matplotlib +, numpy +, pyproj +, pyshp +, shapely +, owslib +, pillow +, gdal +, scipy +, fontconfig +, pytest-mpl +, pytestCheckHook }: buildPythonPackage rec { pname = "cartopy"; - version = "0.21.0"; + version = "0.21.1"; + + disabled = pythonOlder "3.8"; + + format = "setuptools"; src = fetchPypi { inherit version; pname = "Cartopy"; - sha256 = "sha256-zh06KKEy6UyJrDN2mlD4H2VjSrK9QFVjF+Fb1srRzkI="; + hash = "sha256-idVklxLIWCIxxuEYJaBMhfbwzulNu4nk2yPqvKHMJQo="; }; - postPatch = '' - # https://github.com/SciTools/cartopy/issues/1880 - substituteInPlace lib/cartopy/tests/test_crs.py \ - --replace "test_osgb(" "dont_test_osgb(" \ - --replace "test_epsg(" "dont_test_epsg(" - ''; - nativeBuildInputs = [ cython geos # for geos-config @@ -35,14 +46,27 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - # required - six pyshp shapely numpy - - # optional - gdal pillow matplotlib pyepsg pykdtree scipy fiona owslib + matplotlib + numpy + pyproj + pyshp + shapely ]; - checkInputs = [ pytestCheckHook filelock mock pep8 flufl_lock ]; + passthru.optional-dependencies = { + ows = [ owslib pillow ]; + plotting = [ gdal pillow scipy ]; + }; + + nativeCheckInputs = [ + pytest-mpl + pytestCheckHook + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + + preCheck = '' + export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf + export HOME=$TMPDIR + ''; pytestFlagsArray = [ "--pyargs" "cartopy" @@ -50,8 +74,6 @@ buildPythonPackage rec { ]; disabledTests = [ - "test_nightshade_image" - "background_img" "test_gridliner_labels_bbox_style" ]; diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 19444ee49f62..6cd182e181c9 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.17.4"; + version = "1.17.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-idcqNWocy4dDh7zv3gz81wHp+9WX5PptXGHI9uqM69M="; + hash = "sha256-PLtIxA3XD9Mi33zRfciocJUml1HqGsWGITlLUKAJUss="; }; propagatedBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { wcmatch ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Authorization library that supports access control models like ACL, RBAC and ABAC"; homepage = "https://github.com/casbin/pycasbin"; + changelog = "https://github.com/casbin/pycasbin/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 1243aad64cc4..0ea28830afe8 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { unset NIX_REDIRECTS LD_PRELOAD ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook eventlet mock diff --git a/pkgs/development/python-modules/castepxbin/default.nix b/pkgs/development/python-modules/castepxbin/default.nix index 993684bd5a38..765bb7164369 100644 --- a/pkgs/development/python-modules/castepxbin/default.nix +++ b/pkgs/development/python-modules/castepxbin/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pymatgen ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index 43e4d0029afa..553907bf7d89 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { zipp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index 9a395bc6c98e..0dfc302a49a5 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -1,22 +1,22 @@ { buildPythonPackage, fetchFromGitHub, lib, pythonOlder -, clang_12, python2, python +, clang_12, python , graphviz, matplotlib, numpy, pandas, plotly, scipy, six , withCuda ? false, cudatoolkit }: buildPythonPackage rec { pname = "catboost"; - version = "1.0.5"; + version = "1.1.1"; disabled = pythonOlder "3.4"; src = fetchFromGitHub { owner = "catboost"; repo = "catboost"; - rev = "v${version}"; - sha256 = "ILemeZUBI9jPb9G6F7QX/T1HaVhQ+g6y7YmsT6DFCJk="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-bqnUHTTRan/spA5y4LRt/sIUYpP3pxzdN/4wHjzgZVY="; }; - nativeBuildInputs = [ clang_12 python2 ]; + nativeBuildInputs = [ clang_12 ]; propagatedBuildInputs = [ graphviz matplotlib numpy pandas scipy plotly six ] ++ lib.optionals withCuda [ cudatoolkit ]; diff --git a/pkgs/development/python-modules/catppuccin/default.nix b/pkgs/development/python-modules/catppuccin/default.nix new file mode 100644 index 000000000000..5a53233fff87 --- /dev/null +++ b/pkgs/development/python-modules/catppuccin/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, pygments +}: + +buildPythonPackage rec { + pname = "catppuccin"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-mHNuV3yIuFL2cixDOr+//+/b9iD2fN82cfLzZkegxKc="; + }; + + propagatedBuildInputs = [ pygments ]; + + pythonImportsCheck = [ "catppuccin" ]; + + meta = with lib; { + description = "Soothing pastel theme for Python"; + homepage = "https://github.com/catppuccin/python"; + maintainers = with maintainers; [ fufexan ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix index 8514190202e1..ddca9628f0fe 100644 --- a/pkgs/development/python-modules/cattrs/default.nix +++ b/pkgs/development/python-modules/cattrs/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis immutables motor diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 7fd5baf57618..fe320063362c 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -9,21 +9,21 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.4.3"; + version = "5.4.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Yrhjxe5s7UAyr+lI88FITzdVUJldO4SYFFI3/ijlRsI="; + hash = "sha256-uJNQDbD+Az5XDDrclWr27vxX4oACa9LYb9U9qfHllNc="; }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix index e231624e40f8..86aa9f6c8593 100644 --- a/pkgs/development/python-modules/cccolutils/default.nix +++ b/pkgs/development/python-modules/cccolutils/default.nix @@ -1,23 +1,49 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, krb5Full, nose, GitPython, mock, git }: +{ lib +, buildPythonPackage +, fetchPypi +, git +, gitpython +, krb5 +, mock +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - pname = "CCColUtils"; + pname = "cccolutils"; version = "1.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "1gwcq4xan9as1j3q9k2zqrywxp46qx0ljwxbck9id2fvilds6ck3"; + pname = "CCColUtils"; + inherit version; + hash = "sha256-YzKjG43biRbTZKtzSUHHhtzOfcZfzISHDFolqzrBjL8="; }; - buildInputs = [ krb5Full ]; - propagatedBuildInputs = [ nose GitPython mock git ]; + buildInputs = [ + krb5 + ]; - doCheck = isPy3k; # needs unpackaged module to run tests on python2 + propagatedBuildInputs = [ + git + gitpython + mock + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "cccolutils" + ]; meta = with lib; { description = "Python Kerberos 5 Credential Cache Collection Utilities"; homepage = "https://pagure.io/cccolutils"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ disassembler ]; }; } diff --git a/pkgs/development/python-modules/cchardet/default.nix b/pkgs/development/python-modules/cchardet/default.nix index 587d0d1f6c12..dbb839463461 100644 --- a/pkgs/development/python-modules/cchardet/default.nix +++ b/pkgs/development/python-modules/cchardet/default.nix @@ -2,24 +2,29 @@ , stdenv , buildPythonPackage , fetchPypi -, python +, cython , nose }: buildPythonPackage rec { pname = "cchardet"; version = "2.1.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "c428b6336545053c2589f6caf24ea32276c6664cb86db817e03a94c60afa0eaf"; }; + nativeBuildInputs = [ + cython # pending https://github.com/PyYoshi/cChardet/pull/78 being released to PyPI + ]; + pythonImportsCheck = [ "cchardet" ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ 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 = '' diff --git a/pkgs/development/python-modules/cdcs/default.nix b/pkgs/development/python-modules/cdcs/default.nix index 2c608c06251e..45b4807a5e41 100644 --- a/pkgs/development/python-modules/cdcs/default.nix +++ b/pkgs/development/python-modules/cdcs/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/pkgs/development/python-modules/celery-redbeat/default.nix b/pkgs/development/python-modules/celery-redbeat/default.nix index a1be0b95826d..c3c4aa69dfd9 100644 --- a/pkgs/development/python-modules/celery-redbeat/default.nix +++ b/pkgs/development/python-modules/celery-redbeat/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { tenacity ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook fakeredis mock diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 67c3c58794d5..52fcaad47adf 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -38,10 +38,15 @@ buildPythonPackage rec { patches = [ (fetchpatch { - name = "billiard-4.0-comat.patch"; + name = "billiard-4.0-compat.patch"; url = "https://github.com/celery/celery/commit/b260860988469ef8ad74f2d4225839c2fa91d590.patch"; hash = "sha256-NWB/UB0fE7A/vgMRYz6QGmqLmyN1ninAMyL4V2tpzto="; }) + (fetchpatch { + name = "billiard-4.1-compat.patch"; + url = "https://github.com/celery/celery/pull/7781/commits/879af6341974c3778077d8212d78f093b2d77a4f.patch"; + hash = "sha256-+m8/YkeAPPjwm0WF7dw5XZzf7MImVBLXT0/FS+fk0FE="; + }) ]; postPatch = '' @@ -60,7 +65,7 @@ buildPythonPackage rec { vine ]; - checkInputs = [ + nativeCheckInputs = [ boto3 case dnspython diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 6b0ebf926846..63787b87f184 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ parameterized pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/cepa/default.nix b/pkgs/development/python-modules/cepa/default.nix index f198d8b058dd..95f59ab61353 100644 --- a/pkgs/development/python-modules/cepa/default.nix +++ b/pkgs/development/python-modules/cepa/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cepa"; - version = "1.8.3"; + version = "1.8.4"; src = fetchPypi { inherit pname version; - sha256 = "HcbwsyTTei7SyidGSOzo/SyWodL0QPWMDKF6/Ute3no="; + sha256 = "sha256-P7xwGsP8ic1/abxYptDXNbAU+kC2Hiwu/Tge0g21ipY="; }; postPatch = '' @@ -16,7 +16,7 @@ buildPythonPackage rec { sed -i '/MOCK_VERSION/d' run_tests.py ''; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; checkPhase = '' touch .gitignore diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index be597277b6b7..aa8c9b2f0440 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cert-chain-resolver/default.nix b/pkgs/development/python-modules/cert-chain-resolver/default.nix index 6491749498bd..cdd26163d2fd 100644 --- a/pkgs/development/python-modules/cert-chain-resolver/default.nix +++ b/pkgs/development/python-modules/cert-chain-resolver/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock six diff --git a/pkgs/development/python-modules/certauth/default.nix b/pkgs/development/python-modules/certauth/default.nix index 782ad9608144..71bd64484630 100644 --- a/pkgs/development/python-modules/certauth/default.nix +++ b/pkgs/development/python-modules/certauth/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { tldextract ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-cov ]; diff --git a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix index abdd6d2d8f06..fc6a645ade63 100644 --- a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix +++ b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { cloudflare ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/certbot-dns-google/default.nix b/pkgs/development/python-modules/certbot-dns-google/default.nix index 182ff720e13a..6a320209ecf1 100644 --- a/pkgs/development/python-modules/certbot-dns-google/default.nix +++ b/pkgs/development/python-modules/certbot-dns-google/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { oauth2client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/certbot-dns-inwx/default.nix b/pkgs/development/python-modules/certbot-dns-inwx/default.nix index 7c24a042c95c..06a6b3ae3dbb 100644 --- a/pkgs/development/python-modules/certbot-dns-inwx/default.nix +++ b/pkgs/development/python-modules/certbot-dns-inwx/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "certbot-dns-inwx"; - version = "2.1.3"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yAgualY4J92pJ8PIkICg8w0eYHmT5L3qAUOCW/cAitw="; + sha256 = "sha256-v03QBHsxhl6R8YcwWIKD+pf4APy9S2vFcQe3ZEc6AjI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix index f3da841667ba..18765f12d233 100644 --- a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix +++ b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { dnspython ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/certbot-dns-route53/default.nix b/pkgs/development/python-modules/certbot-dns-route53/default.nix index 7052107418c9..20df82303a44 100644 --- a/pkgs/development/python-modules/certbot-dns-route53/default.nix +++ b/pkgs/development/python-modules/certbot-dns-route53/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { certbot ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index c2f3c1f7915f..10c21a5cad2e 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -26,13 +26,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.31.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-JDhesUU6SQBEf0CG3vo1AhlRfGpltTEUmSqrpGIpptg="; + sha256 = "sha256-fCKTDAJiulwL2SOw4bV3vu0VEsvXGF+1ry8esYori8o="; }; sourceRoot = "source/${pname}"; @@ -56,7 +56,7 @@ buildPythonPackage rec { buildInputs = [ dialog gnureadline ]; - checkInputs = [ + nativeCheckInputs = [ python-dateutil pytestCheckHook pytest-xdist diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index ecf7ed49aa5c..93c3ac801a57 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, cacert , pythonOlder , fetchFromGitHub , pytestCheckHook @@ -7,7 +8,7 @@ buildPythonPackage rec { pname = "certifi"; - version = "2022.09.24"; + version = "2022.12.07"; disabled = pythonOlder "3.6"; @@ -15,10 +16,26 @@ buildPythonPackage rec { owner = pname; repo = "python-certifi"; rev = version; - hash = "sha256-B6LO6AfG9cfpyNI7hj3VjmGTFsrrIkDYO4gPMkZY74w="; + hash = "sha256-r6TJ6YGL0cygz+F6g6wiqBfBa/QKhynZ92C6lHTZ2rI="; }; - checkInputs = [ + patches = [ + # Add support for NIX_SSL_CERT_FILE + ./env.patch + ]; + + postPatch = '' + # Use our system-wide ca-bundle instead of the bundled one + rm -v "certifi/cacert.pem" + ln -snvf "${cacert}/etc/ssl/certs/ca-bundle.crt" "certifi/cacert.pem" + ''; + + propagatedNativeBuildInputs = [ + # propagate cacerts setup-hook to set up `NIX_SSL_CERT_FILE` + cacert + ]; + + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/certifi/env.patch b/pkgs/development/python-modules/certifi/env.patch new file mode 100644 index 000000000000..292f977ef2c0 --- /dev/null +++ b/pkgs/development/python-modules/certifi/env.patch @@ -0,0 +1,86 @@ +diff --git a/certifi/core.py b/certifi/core.py +index de02898..c033d20 100644 +--- a/certifi/core.py ++++ b/certifi/core.py +@@ -4,15 +4,25 @@ certifi.py + + This module returns the installation location of cacert.pem or its contents. + """ ++import os + import sys + + ++def get_cacert_path_from_environ(): ++ path = os.environ.get("NIX_SSL_CERT_FILE", None) ++ ++ if path == "/no-cert-file.crt": ++ return None ++ ++ return path ++ ++ + if sys.version_info >= (3, 11): + + from importlib.resources import as_file, files + + _CACERT_CTX = None +- _CACERT_PATH = None ++ _CACERT_PATH = get_cacert_path_from_environ() + + def where() -> str: + # This is slightly terrible, but we want to delay extracting the file +@@ -39,14 +49,16 @@ if sys.version_info >= (3, 11): + return _CACERT_PATH + + def contents() -> str: +- return files("certifi").joinpath("cacert.pem").read_text(encoding="ascii") ++ if _CACERT_PATH is not None: ++ return open(_CACERT_PATH, encoding="utf-8").read() ++ return files("certifi").joinpath("cacert.pem").read_text(encoding="utf-8") + + elif sys.version_info >= (3, 7): + + from importlib.resources import path as get_path, read_text + + _CACERT_CTX = None +- _CACERT_PATH = None ++ _CACERT_PATH = get_cacert_path_from_environ() + + def where() -> str: + # This is slightly terrible, but we want to delay extracting the +@@ -74,7 +86,9 @@ elif sys.version_info >= (3, 7): + return _CACERT_PATH + + def contents() -> str: +- return read_text("certifi", "cacert.pem", encoding="ascii") ++ if _CACERT_PATH is not None: ++ return open(_CACERT_PATH, encoding="utf-8").read() ++ return read_text("certifi", "cacert.pem", encoding="utf-8") + + else: + import os +@@ -84,6 +98,8 @@ else: + Package = Union[types.ModuleType, str] + Resource = Union[str, "os.PathLike"] + ++ _CACERT_PATH = get_cacert_path_from_environ() ++ + # This fallback will work for Python versions prior to 3.7 that lack the + # importlib.resources module but relies on the existing `where` function + # so won't address issues with environments like PyOxidizer that don't set +@@ -102,7 +118,14 @@ else: + def where() -> str: + f = os.path.dirname(__file__) + ++ if _CACERT_PATH is not None: ++ return _CACERT_PATH ++ + return os.path.join(f, "cacert.pem") + + def contents() -> str: +- return read_text("certifi", "cacert.pem", encoding="ascii") ++ if _CACERT_PATH is not None: ++ with open(_CACERT_PATH, encoding="utf-8") as data: ++ return data.read() ++ ++ return read_text("certifi", "cacert.pem", encoding="utf-8") diff --git a/pkgs/development/python-modules/certomancer/default.nix b/pkgs/development/python-modules/certomancer/default.nix index 3d863165f296..4fbe2ecd3792 100644 --- a/pkgs/development/python-modules/certomancer/default.nix +++ b/pkgs/development/python-modules/certomancer/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { --replace "pyhanko-certvalidator==0.19.2" "pyhanko-certvalidator==0.19.5" ''; - checkInputs = [ + nativeCheckInputs = [ freezegun jinja2 pyhanko-certvalidator diff --git a/pkgs/development/python-modules/certvalidator/default.nix b/pkgs/development/python-modules/certvalidator/default.nix index 8f53bd9805ba..ee24de068f99 100644 --- a/pkgs/development/python-modules/certvalidator/default.nix +++ b/pkgs/development/python-modules/certvalidator/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ asn1crypto oscrypto ]; - checkInputs = [ cacert ]; + nativeCheckInputs = [ cacert ]; checkPhase = '' # Tests are run with a custom executor/loader # The regex to skip specific tests relies on negative lookahead of regular expressions diff --git a/pkgs/development/python-modules/cexprtk/default.nix b/pkgs/development/python-modules/cexprtk/default.nix index e75efe1c6397..e8a8a5a360a4 100644 --- a/pkgs/development/python-modules/cexprtk/default.nix +++ b/pkgs/development/python-modules/cexprtk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-c7QXB+oXzkRveiPpNrW/HY8pMtpZx/RtDpJMVE7fY/A="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "cexprtk" ]; diff --git a/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff b/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff new file mode 100644 index 000000000000..c48c8090dd46 --- /dev/null +++ b/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff @@ -0,0 +1,21 @@ +diff -r bac92fcfe4d7 c/_cffi_backend.c +--- a/c/_cffi_backend.c Mon Jul 18 15:58:34 2022 +0200 ++++ b/c/_cffi_backend.c Sat Aug 20 12:38:31 2022 -0700 +@@ -96,7 +96,7 @@ + # define CFFI_CHECK_FFI_PREP_CIF_VAR 0 + # define CFFI_CHECK_FFI_PREP_CIF_VAR_MAYBE 0 + +-#elif defined(__APPLE__) && defined(FFI_AVAILABLE_APPLE) ++#elif defined(__APPLE__) + + # define CFFI_CHECK_FFI_CLOSURE_ALLOC __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *) + # define CFFI_CHECK_FFI_CLOSURE_ALLOC_MAYBE 1 +@@ -6413,7 +6413,7 @@ + else + #endif + { +-#if defined(__APPLE__) && defined(FFI_AVAILABLE_APPLE) && !FFI_LEGACY_CLOSURE_API ++#if defined(__APPLE__) && !FFI_LEGACY_CLOSURE_API + PyErr_Format(PyExc_SystemError, "ffi_prep_closure_loc() is missing"); + goto error; + #else diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 66b315f14ab0..87c8f898899d 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -1,5 +1,14 @@ -{ lib, stdenv, buildPythonPackage, isPyPy, fetchPypi, pytestCheckHook, - libffi, pkg-config, pycparser +{ lib +, stdenv +, buildPythonPackage +, isPyPy +, fetchPypi +, fetchpatch +, pytestCheckHook +, libffi +, pkg-config +, pycparser +, pythonAtLeast }: if isPyPy then null else buildPythonPackage rec { @@ -11,11 +20,45 @@ if isPyPy then null else buildPythonPackage rec { sha256 = "sha256-1AC/uaN7E1ElPLQCZxzqfom97MKU6AFqcH9tHYrJNPk="; }; - buildInputs = [ libffi ]; - - nativeBuildInputs = [ pkg-config ]; - - propagatedBuildInputs = [ pycparser ]; + patches = [ + # + # Trusts the libffi library inside of nixpkgs on Apple devices. + # + # Based on some analysis I did: + # + # https://groups.google.com/g/python-cffi/c/xU0Usa8dvhk + # + # I believe that libffi already contains the code from Apple's fork that is + # deemed safe to trust in cffi. + # + ./darwin-use-libffi-closures.diff + (fetchpatch { + # Drop py.code usage from tests, no longer depend on the deprecated py package + url = "https://foss.heptapod.net/pypy/cffi/-/commit/9c7d865e17ec16a847090a3e0d1498b698b99756.patch"; + excludes = [ + "README.md" + "requirements.txt" + ]; + hash = "sha256-HSuLLIYXXGGCPccMNLV7o1G3ppn2P0FGCrPjqDv2e7k="; + }) + (fetchpatch { + # Replace py.test usage with pytest + url = "https://foss.heptapod.net/pypy/cffi/-/commit/bd02e1b122612baa74a126e428bacebc7889e897.patch"; + excludes = [ + "README.md" + "requirements.txt" + ]; + hash = "sha256-+2daRTvxtyrCPimOEAmVbiVm1Bso9hxGbaAbd03E+ws="; + }) + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # Fix test that failed because python seems to have changed the exception format in the + # final release. This patch should be included in the next version and can be removed when + # it is released. + (fetchpatch { + url = "https://foss.heptapod.net/pypy/cffi/-/commit/8a3c2c816d789639b49d3ae867213393ed7abdff.diff"; + sha256 = "sha256-3wpZeBqN4D8IP+47QDGK7qh/9Z0Ag4lAe+H0R5xCb1E="; + }) + ]; postPatch = lib.optionalString stdenv.isDarwin '' # Remove setup.py impurities @@ -25,15 +68,25 @@ if isPyPy then null else buildPythonPackage rec { --replace '/usr/include/libffi' '${lib.getDev libffi}/include' ''; + buildInputs = [ libffi ]; + + nativeBuildInputs = [ pkg-config ]; + + propagatedBuildInputs = [ pycparser ]; + # The tests use -Werror but with python3.6 clang detects some unreachable code. NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument -Wno-unreachable-code -Wno-c++11-narrowing"; - # Lots of tests fail on aarch64-darwin due to "Cannot allocate write+execute memory": - # * https://cffi.readthedocs.io/en/latest/using.html#callbacks - doCheck = !stdenv.hostPlatform.isMusl && !(stdenv.isDarwin && stdenv.isAarch64); + doCheck = !stdenv.hostPlatform.isMusl; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = lib.optionals stdenv.isDarwin [ + # AssertionError: cannot seem to get an int[10] not completely cleared + # https://foss.heptapod.net/pypy/cffi/-/issues/556 + "test_ffi_new_allocator_1" + ]; meta = with lib; { maintainers = with maintainers; [ domenkozar lnl7 ]; diff --git a/pkgs/development/python-modules/cffsubr/default.nix b/pkgs/development/python-modules/cffsubr/default.nix index 4341efb05c87..124c61b1a578 100644 --- a/pkgs/development/python-modules/cffsubr/default.nix +++ b/pkgs/development/python-modules/cffsubr/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { fonttools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix index f19a6aba260f..d1fa5de4793d 100644 --- a/pkgs/development/python-modules/cfn-flip/default.nix +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 238f5e83630e..c6c24b51b79f 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.61.2"; + version = "0.72.5"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "refs/tags/v${version}"; - sha256 = "sha256-282h1fBWhAfwqCuP+dU3ajn0gQtmOcPNTMKZ0a2+vHU="; + sha256 = "sha256-UDjCTl4AAOrwiXbKYIFsZCaSDjIFXYwNnp8/hIfXbM0="; }; postPatch = '' @@ -45,7 +45,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock pydot pytestCheckHook diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index c925381d00f1..b827c48531aa 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cgen/default.nix b/pkgs/development/python-modules/cgen/default.nix index 06beebc2f326..fd0dbe4ba906 100644 --- a/pkgs/development/python-modules/cgen/default.nix +++ b/pkgs/development/python-modules/cgen/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "4ec99d0c832d9f95f5e51dd18a629ad50df0b5464ce557ef42c6e0cd9478bfcf"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ pytools numpy diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index 8f9408ec2fa2..f3558c80ceac 100644 --- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -48,7 +48,7 @@ buildPythonPackage { --replace "--cov=chacha20poly1305_reuseable --cov-report=term-missing:skip-covered" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index 9de7f2ad5e92..c6793137ba24 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { cupy ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 052120d893d0..94145c938cb0 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -16,7 +16,6 @@ , requests , setuptools , six -, typing , watchdog , websocket-client , wheel @@ -24,20 +23,21 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.27.1"; + version = "1.27.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "aws"; repo = pname; - rev = version; - sha256 = "sha256-Qz8kYXu2NmcgtW8GbmLPfB4BOearEycE6EMmQRXmWeI="; + rev = "refs/tags/${version}"; + hash = "sha256-izzoYxzkaQqcEM5e8BhZeZIxtAGRDNH/qvqwvrx250s="; }; postPatch = '' substituteInPlace setup.py \ --replace "attrs>=19.3.0,<21.5.0" "attrs" \ - --replace "pip>=9,<22.2" "pip" \ - --replace "typing==3.6.4" "typing" + --replace "inquirer>=2.7.0,<3.0.0" "inquirer" \ + --replace "pip>=9,<22.3" "pip" \ ''; propagatedBuildInputs = [ @@ -53,11 +53,9 @@ buildPythonPackage rec { six wheel watchdog - ] ++ lib.optionals (pythonOlder "3.7") [ - typing ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis mock pytestCheckHook diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 2d6f0d009169..3b800877be97 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-django pytestCheckHook diff --git a/pkgs/development/python-modules/characteristic/default.nix b/pkgs/development/python-modules/characteristic/default.nix index 2e12077bd562..ae86e1886515 100644 --- a/pkgs/development/python-modules/characteristic/default.nix +++ b/pkgs/development/python-modules/characteristic/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "ded68d4e424115ed44e5c83c2a901a0b6157a959079d7591d92106ffd3ada380"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; postPatch = '' substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]" diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index b5cca5110e7c..e750bbece81d 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -4,20 +4,27 @@ , hypothesis , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "chardet"; - version = "5.0.0"; + version = "5.1.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-A2jfK/14tfwgVyu06bt/tT4sCU9grpmTM56GcdCvuKo="; + hash = "sha256-DWJxK5VrwVT4X7CiZuKjxZE8KWfgA0hwGzJBHW3vMeU="; }; - checkInputs = [ - hypothesis + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + # "hypothesis" indirectly depends on chardet to build its documentation. + (hypothesis.override { enableDocumentation = false; }) pytestCheckHook ]; @@ -29,6 +36,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "chardet" ]; meta = with lib; { + changelog = "https://github.com/chardet/chardet/releases/tag/${version}"; description = "Universal encoding detector"; homepage = "https://github.com/chardet/chardet"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix index 9661700a2858..d567c41dbe6f 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -3,11 +3,15 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder + + # popular downstream dependencies +, aiohttp +, requests }: buildPythonPackage rec { pname = "charset-normalizer"; - version = "2.1.0"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -16,10 +20,10 @@ buildPythonPackage rec { owner = "Ousret"; repo = "charset_normalizer"; rev = "refs/tags/${version}"; - hash = "sha256-ntNMHjkQJqzSElEeyFmPIjUh6ZxQkTktPipfPHiJ/Vc="; + hash = "sha256-2kXs6ZdemA6taV4aa9xBKLmhbSgpybjg3Z61EUFabrk="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -32,6 +36,8 @@ buildPythonPackage rec { "charset_normalizer" ]; + passthru.tests = { inherit aiohttp requests; }; + meta = with lib; { description = "Python module for encoding and language detection"; homepage = "https://charset-normalizer.readthedocs.io/"; diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 3ddcf9599659..966daaf1ea1e 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.10.0"; + version = "5.11.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "refs/tags/v${version}"; - sha256 = "sha256-j1MiLUSIun0xnUFCcyZ5p8eGF5Q34jCwoVuQG5xSlkU="; + sha256 = "sha256-Reti8tvBpBxpfNjnZs8wWuS76oEWIKPCxzSdTEO+ykA="; }; sourceRoot = "source/packages/python/chart-studio"; @@ -29,7 +29,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ mock nose pytest ]; + nativeCheckInputs = [ mock nose pytest ]; # most tests talk to a service checkPhase = '' HOME=$TMPDIR pytest chart_studio/tests/test_core chart_studio/tests/test_plot_ly/test_api diff --git a/pkgs/development/python-modules/chat-downloader/default.nix b/pkgs/development/python-modules/chat-downloader/default.nix index 40aa56d75fac..930303005780 100644 --- a/pkgs/development/python-modules/chat-downloader/default.nix +++ b/pkgs/development/python-modules/chat-downloader/default.nix @@ -1,35 +1,24 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , requests , isodate , docstring-parser , colorlog , websocket-client , pytestCheckHook -, fetchpatch }: buildPythonPackage rec { pname = "chat-downloader"; - version = "0.2.0"; + version = "0.2.3"; + format = "setuptools"; - # PyPI tarball is missing files - src = fetchFromGitHub { - owner = "xenova"; - repo = "chat-downloader"; - rev = "v${version}"; - sha256 = "sha256-SVZyDTma6qAgmOz+QsPnudPrX1Eswtc0IKFRx1HnWLY="; + src = fetchPypi { + inherit version pname; + sha256 = "e19f961480b14b55d03d4d4aaa766d46131bdf2ea8a79b47d20037dfd980201a"; }; - patches = [ - # Remove argparse from dependencies. https://github.com/xenova/chat-downloader/pull/167 - (fetchpatch { - url = "https://github.com/xenova/chat-downloader/commit/cdaca5e3a334c8db1b37bebe191d181ebdfa576c.patch"; - sha256 = "sha256-AgH305dJmNRZy23lAf1h40klDE67RSwEL8o2gxX0VGA="; - }) - ]; - propagatedBuildInputs = [ requests isodate @@ -41,13 +30,14 @@ buildPythonPackage rec { # Tests try to access the network. doCheck = false; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "chat_downloader" ]; meta = with lib; { description = "A simple tool used to retrieve chat messages from livestreams, videos, clips and past broadcasts"; homepage = "https://github.com/xenova/chat-downloader"; + changelog = "https://github.com/xenova/chat-downloader/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; }; diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 4b62451ebdd1..8a3e328313f9 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ breezy git mock diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index da5870f7d500..cd6cabbe5791 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "cheroot"; - version = "8.6.0"; + version = "9.0.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NmrfbnyslVVIbC0b5il5kwIu/2+MRlXBRDJozKPwjiU="; + hash = "sha256-PUetnuGey+wUS0dYOZA2aS/b9npAuW7vH7FFQ2ez0zg="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ jaraco_text portend pypytools diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index d18d75bd3720..578fdaff2b87 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { jaraco_collections ]; - checkInputs = [ + nativeCheckInputs = [ objgraph path pytest-forked @@ -78,6 +78,9 @@ buildPythonPackage rec { "test_antistampede" "test_file_stream" + "test_basic_request" + "test_3_Redirect" + "test_4_File_deletion" ] ++ lib.optionals stdenv.isDarwin [ "test_block" ]; @@ -102,7 +105,7 @@ buildPythonPackage rec { meta = with lib; { description = "Object-oriented HTTP framework"; - homepage = "https://www.cherrypy.org"; + homepage = "https://cherrypy.dev/"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/chess/default.nix b/pkgs/development/python-modules/chess/default.nix index eed651ee3ada..c96c722cc386 100644 --- a/pkgs/development/python-modules/chess/default.nix +++ b/pkgs/development/python-modules/chess/default.nix @@ -7,7 +7,8 @@ buildPythonPackage rec { pname = "chess"; - version = "1.9.3"; + version = "1.9.4"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,19 +16,22 @@ buildPythonPackage rec { owner = "niklasf"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Qm6CNtie+oqZRCAs8qp8ythfs+OQvLZFK9YVLOuf918="; + hash = "sha256-YBABB//53gwJIwrmKJh8W+05hTBhl+49vCYv9//4E+0="; }; - pythonImportsCheck = [ "chess" ]; + pythonImportsCheck = [ + "chess" + ]; checkPhase = '' ${python.interpreter} ./test.py -v ''; meta = with lib; { - description = "A chess library for Python, with move generation, move validation, and support for common formats"; + description = "A chess library with move generation, move validation, and support for common formats"; homepage = "https://github.com/niklasf/python-chess"; - maintainers = with maintainers; [ smancill ]; + changelog = "https://github.com/niklasf/python-chess/blob/v${version}/CHANGELOG.rst"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ smancill ]; }; } diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix index cad84146c483..9fa7a378b56e 100644 --- a/pkgs/development/python-modules/chex/default.nix +++ b/pkgs/development/python-modules/chex/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { "chex" ]; - checkInputs = [ + nativeCheckInputs = [ jaxlib pytestCheckHook ]; @@ -42,6 +42,12 @@ buildPythonPackage rec { disabledTests = [ # See https://github.com/deepmind/chex/issues/204. "test_uninspected_checks" + + # These tests started failing at some point after upgrading to 0.1.5 + "test_useful_failure" + "TreeAssertionsTest" + "PmapFakeTest" + "WithDeviceTest" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/chia-rs/Cargo.lock b/pkgs/development/python-modules/chia-rs/Cargo.lock index 96fc3236f142..ad3755638df3 100644 --- a/pkgs/development/python-modules/chia-rs/Cargo.lock +++ b/pkgs/development/python-modules/chia-rs/Cargo.lock @@ -2,6 +2,38 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anyhow" +version = "1.0.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" + +[[package]] +name = "atomic-polyfill" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" +dependencies = [ + "critical-section", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + [[package]] name = "autocfg" version = "1.1.0" @@ -16,9 +48,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" -version = "0.22.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5237f00a8c86130a0cc317830e558b966dd7850d48a953d998c813f01a41b527" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", "radium", @@ -36,10 +68,19 @@ dependencies = [ ] [[package]] -name = "bls12_381" -version = "0.5.0" +name = "block-buffer" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54757888b09a69be70b5ec303e382a74227392086ba808cb01eeca29233a2397" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bls12_381" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62250ece575fa9b22068b3a8d59586f01d426dd7785522efd97632959e71c986" dependencies = [ "ff", "group", @@ -49,10 +90,27 @@ dependencies = [ ] [[package]] -name = "bumpalo" -version = "3.10.0" +name = "bls12_381_plus" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" +checksum = "c7c681aa947677ec0c5ccfa6f14c0dd039ddbaa7b12952bf146bd5226a5f9880" +dependencies = [ + "digest 0.9.0", + "ff", + "group", + "heapless", + "pairing", + "rand_core", + "serde", + "subtle", + "zeroize", +] + +[[package]] +name = "bumpalo" +version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" [[package]] name = "byteorder" @@ -60,6 +118,12 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + [[package]] name = "cfg-if" version = "1.0.0" @@ -68,31 +132,76 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chia" -version = "0.1.5" +version = "0.1.15" dependencies = [ + "chia-protocol", + "clvm-utils", "clvmr", "hex", "num-traits", "pyo3", - "serde", +] + +[[package]] +name = "chia-bls" +version = "0.1.15" +dependencies = [ + "anyhow", + "bls12_381_plus", + "criterion", + "group", + "hex", + "hkdf", + "num-bigint", + "rand", + "sha2 0.9.9", + "tiny-bip39", +] + +[[package]] +name = "chia-protocol" +version = "0.1.15" +dependencies = [ + "chia_py_streamable_macro", + "chia_streamable_macro", + "clvmr", + "hex", + "pyo3", + "sha2 0.10.2", +] + +[[package]] +name = "chia_py_streamable_macro" +version = "0.1.2" +dependencies = [ + "quote", + "syn", ] [[package]] name = "chia_rs" -version = "0.1.5" +version = "0.1.16" dependencies = [ "chia", + "chia-protocol", + "chia_py_streamable_macro", + "chia_streamable_macro", "clvmr", "hex", - "py_streamable", "pyo3", - "serde", - "sha2", +] + +[[package]] +name = "chia_streamable_macro" +version = "0.2.3" +dependencies = [ + "quote", + "syn", ] [[package]] name = "chia_wasm" -version = "0.1.5" +version = "0.1.15" dependencies = [ "chia", "wasm-bindgen", @@ -100,10 +209,65 @@ dependencies = [ ] [[package]] -name = "clvmr" -version = "0.1.20" +name = "ciborium" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d18d68c7f9e8e08ea66a6673bec83100bd53103a9d504fe279147bd0a79b260c" +checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" + +[[package]] +name = "ciborium-ll" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clap" +version = "3.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +dependencies = [ + "bitflags", + "clap_lex", + "indexmap", + "textwrap", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "clvm-utils" +version = "0.1.15" +dependencies = [ + "clvmr", +] + +[[package]] +name = "clvmr" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5e907612d322d0d7def6b0ecb3ad681f6af2db106bcfabe4153746c60ef9e4" dependencies = [ "bls12_381", "hex", @@ -111,10 +275,7 @@ dependencies = [ "num-bigint", "num-integer", "num-traits", - "pyo3", - "sha2", - "wasm-bindgen", - "wasm-bindgen-test", + "sha2 0.10.2", ] [[package]] @@ -129,18 +290,123 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.1.5" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ "libc", ] [[package]] -name = "ctor" -version = "0.1.22" +name = "criterion" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" +checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +dependencies = [ + "anes", + "atty", + "cast", + "ciborium", + "clap", + "criterion-plot", + "itertools", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools", +] + +[[package]] +name = "critical-section" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" + +[[package]] +name = "crossbeam-channel" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "crypto-mac" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", "syn", @@ -156,10 +422,27 @@ dependencies = [ ] [[package]] -name = "ff" -version = "0.10.1" +name = "digest" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f40b2dcd8bc322217a5f6559ae5f9e9d1de202a2ecee2e9eafcbece7562a4f" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer 0.10.3", + "crypto-common", + "subtle", +] + +[[package]] +name = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "ff" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" dependencies = [ "bitvec", "rand_core", @@ -168,25 +451,36 @@ dependencies = [ [[package]] name = "funty" -version = "1.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1847abb9cb65d566acd5942e94aea9c8f547ad02c98e1649326fc0e8910b8b1e" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "generic-array" -version = "0.14.5" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", "version_check", ] [[package]] -name = "ghost" -version = "0.1.5" +name = "getrandom" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93490550b1782c589a350f2211fff2e34682e25fed17ef53fc4fa8fe184975e" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "ghost" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb19fe8de3ea0920d282f7b77dd4227aea6b8b999b42cdf0ca41b2472b14443a" dependencies = [ "proc-macro2", "quote", @@ -195,9 +489,9 @@ dependencies = [ [[package]] name = "group" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912" +checksum = "7391856def869c1c81063a03457c676fbcd419709c3dfb33d8d319de484b154d" dependencies = [ "byteorder", "ff", @@ -205,12 +499,94 @@ dependencies = [ "subtle", ] +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heapless" +version = "0.7.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +dependencies = [ + "atomic-polyfill", + "hash32", + "rustc_version", + "spin", + "stable_deref_trait", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + [[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hkdf" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b" +dependencies = [ + "digest 0.9.0", + "hmac 0.11.0", +] + +[[package]] +name = "hmac" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +dependencies = [ + "crypto-mac", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.6", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + [[package]] name = "indoc" version = "0.3.6" @@ -265,6 +641,21 @@ dependencies = [ "syn", ] +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" + [[package]] name = "js-sys" version = "0.3.52" @@ -282,15 +673,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.126" +version = "0.2.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" [[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ "autocfg", "scopeguard", @@ -306,10 +697,19 @@ dependencies = [ ] [[package]] -name = "num-bigint" -version = "0.4.0" +name = "memoffset" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg", "num-integer", @@ -318,9 +718,9 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", "num-traits", @@ -328,18 +728,34 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] [[package]] -name = "once_cell" -version = "1.13.0" +name = "num_cpus" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "opaque-debug" @@ -348,10 +764,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] -name = "pairing" -version = "0.20.0" +name = "os_str_bytes" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de9d09263c9966e8196fe0380c9dbbc7ea114b5cf371ba29004bc1f9c6db7f3" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "pairing" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "135590d8bdba2b31346f9cd1fb2a912329f5135e832a4f422942eb6ead8b6b3b" dependencies = [ "group", ] @@ -369,9 +791,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", @@ -400,6 +822,49 @@ dependencies = [ "proc-macro-hack", ] +[[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest 0.10.6", +] + +[[package]] +name = "plotters" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" + +[[package]] +name = "plotters-svg" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + [[package]] name = "proc-macro-hack" version = "0.5.19" @@ -408,21 +873,13 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.42" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278e965f1d8cf32d6e0e96de3d3e79712178ae67986d9cf9151f51e95aac89b" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ "unicode-ident", ] -[[package]] -name = "py_streamable" -version = "0.1.0" -dependencies = [ - "quote", - "syn", -] - [[package]] name = "pyo3" version = "0.15.1" @@ -474,24 +931,70 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" dependencies = [ "proc-macro2", ] [[package]] name = "radium" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] [[package]] name = "redox_syscall" @@ -503,10 +1006,55 @@ dependencies = [ ] [[package]] -name = "scoped-tls" -version = "1.0.0" +name = "regex" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "ryu" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" @@ -515,19 +1063,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "serde" -version = "1.0.140" +name = "semver" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03" +checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" + +[[package]] +name = "serde" +version = "1.0.150" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.140" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da" +checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" dependencies = [ "proc-macro2", "quote", @@ -535,23 +1089,60 @@ dependencies = [ ] [[package]] -name = "sha2" -version = "0.9.5" +name = "serde_json" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" +checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" dependencies = [ - "block-buffer", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +dependencies = [ + "block-buffer 0.9.0", "cfg-if", "cpufeatures", - "digest", + "digest 0.9.0", "opaque-debug", ] [[package]] -name = "smallvec" -version = "1.9.0" +name = "sha2" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.6", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "spin" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +dependencies = [ + "lock_api", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "subtle" @@ -561,15 +1152,27 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.98" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + [[package]] name = "tap" version = "1.0.1" @@ -577,22 +1180,107 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] -name = "typenum" -version = "1.15.0" +name = "textwrap" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" + +[[package]] +name = "thiserror" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tiny-bip39" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" +dependencies = [ + "anyhow", + "hmac 0.12.1", + "once_cell", + "pbkdf2", + "rand", + "rustc-hash", + "sha2 0.10.2", + "thiserror", + "unicode-normalization", + "wasm-bindgen", + "zeroize", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicode-ident" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unindent" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52fee519a3e570f7df377a06a1a7775cdbfb7aa460be7e08de2b1f0e69973a44" +checksum = "58ee9362deb4a96cef4d437d1ad49cffc9b9e92d202b6995674e928ce684f112" [[package]] name = "version_check" @@ -600,6 +1288,23 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" version = "0.2.75" @@ -716,6 +1421,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -724,9 +1438,30 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "wyz" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "129e027ad65ce1453680623c3fb5163cbf7107bfe1aa32257e7d0e63f9ced188" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] + +[[package]] +name = "zeroize" +version = "1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] diff --git a/pkgs/development/python-modules/chia-rs/default.nix b/pkgs/development/python-modules/chia-rs/default.nix index 2df9c16f2a30..649edb7b41b3 100644 --- a/pkgs/development/python-modules/chia-rs/default.nix +++ b/pkgs/development/python-modules/chia-rs/default.nix @@ -7,15 +7,20 @@ buildPythonPackage rec { pname = "chia-rs"; - version = "0.1.5"; + version = "0.1.16"; src = fetchFromGitHub { owner = "chia-network"; repo = "chia_rs"; - rev = version; - sha256 = "sha256-4TIRj7FMIArI/EvDARReC4MqDG44zjn/MKoUHAVqq5s="; + rev = "refs/tags/${version}"; + sha256 = "sha256-WIt7yGceILzVhegluiSb7w3F9qQvI5DjulheGsJrcf8="; }; + patches = [ + # undo a hack from upstream that confuses our build hook + ./fix-build.patch + ]; + cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; @@ -34,7 +39,7 @@ buildPythonPackage rec { touch wheel/Cargo.lock ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/chia-rs/fix-build.patch b/pkgs/development/python-modules/chia-rs/fix-build.patch new file mode 100644 index 000000000000..cf793f78a744 --- /dev/null +++ b/pkgs/development/python-modules/chia-rs/fix-build.patch @@ -0,0 +1,12 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -1,8 +1,5 @@ +-# the "wheel" crate is excluded from the workspace because pyo3 has problems with +-# "cargo test" and "cargo bench" + [workspace] +-members = ["wasm", "chia_streamable_macro", "chia-bls", "clvm-utils", "chia-protocol", "chia_py_streamable_macro"] +-exclude = ["wheel"] ++members = ["wasm", "wheel", "chia_streamable_macro", "chia-bls", "clvm-utils", "chia-protocol", "chia_py_streamable_macro"] + + [package] + name = "chia" diff --git a/pkgs/development/python-modules/chiabip158/default.nix b/pkgs/development/python-modules/chiabip158/default.nix index b9615fec7b6b..508f32cd4641 100644 --- a/pkgs/development/python-modules/chiabip158/default.nix +++ b/pkgs/development/python-modules/chiabip158/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { buildInputs = [ pybind11 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix index 11452dee2ea5..120be8e92069 100644 --- a/pkgs/development/python-modules/chiapos/default.nix +++ b/pkgs/development/python-modules/chiapos/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "chiapos"; - version = "1.0.10"; + version = "1.0.11"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2SqWdGzSXs53PafXnCvTGQXNJqD+5gdJnaYi2O2ABLg="; + sha256 = "sha256-TMRf9549z3IQzGt5c53Rk1Vq3tdrpZ3Pqc8jhj4AKzo="; }; patches = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { buildInputs = [ pybind11 ]; - checkInputs = [ + nativeCheckInputs = [ psutil pytestCheckHook ]; diff --git a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch index 05bd212e9a6c..86dfad747d85 100644 --- a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch +++ b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5d7862b..c2d06a1 100644 +index d1dd25d..96abc65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,23 +21,20 @@ include(${CMAKE_INSTALL_PREFIX}/share/cmake/pybind11/pybind11Config.cmake) @@ -7,7 +7,7 @@ index 5d7862b..c2d06a1 100644 FetchContent_Declare( pybind11-src - GIT_REPOSITORY https://github.com/pybind/pybind11.git -- GIT_TAG v2.7.1 +- GIT_TAG v2.10.0 + SOURCE_DIR @pybind11_src@ ) FetchContent_MakeAvailable(pybind11-src) diff --git a/pkgs/development/python-modules/chiavdf/default.nix b/pkgs/development/python-modules/chiavdf/default.nix index 525bd1748846..80e39ccc9014 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.7"; + version = "1.0.8"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-956517eGqRSLg+Y4ybmASiZoypgpYn/D9lbPA4Rcfts="; + hash = "sha256-ilT7tCdX8ak3qmpXJ0LITf0ZGAdFSN4tm6GKw06A/m8="; }; patches = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { buildInputs = [ boost gmp pybind11 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch index 9b49db81fcf5..1bcea2e68b31 100644 --- a/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch +++ b/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch @@ -1,5 +1,5 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index c975128..a9f6910 100644 +index fb92c4d..9fa52ef 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,8 +31,7 @@ include(FetchContent) @@ -7,7 +7,7 @@ index c975128..a9f6910 100644 FetchContent_Declare( pybind11-src - GIT_REPOSITORY https://github.com/pybind/pybind11.git -- GIT_TAG v2.6.2 +- GIT_TAG v2.10.0 + SOURCE_DIR @pybind11_src@ ) FetchContent_MakeAvailable(pybind11-src) diff --git a/pkgs/development/python-modules/ci-info/default.nix b/pkgs/development/python-modules/ci-info/default.nix index 275f4cd5c858..24fd2a613fac 100644 --- a/pkgs/development/python-modules/ci-info/default.nix +++ b/pkgs/development/python-modules/ci-info/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "sha256-H9UMvUAfKa3/7rGLBIniMtFqwadFisa8MW3qtq5TX7A="; }; - checkInputs = [ pytest pytestCheckHook ]; + nativeCheckInputs = [ pytest pytestCheckHook ]; doCheck = false; # both tests access network diff --git a/pkgs/development/python-modules/ci-py/default.nix b/pkgs/development/python-modules/ci-py/default.nix index 61e1760f3727..032783566393 100644 --- a/pkgs/development/python-modules/ci-py/default.nix +++ b/pkgs/development/python-modules/ci-py/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pytest-runner ]; # pytest-runner included in setup-requires - checkInputs = [ pytest pytestCheckHook ]; + nativeCheckInputs = [ pytest pytestCheckHook ]; pythonImportsCheck = [ "ci" ]; diff --git a/pkgs/development/python-modules/cinemagoer/default.nix b/pkgs/development/python-modules/cinemagoer/default.nix index 8b62a57b306f..b33725d54594 100644 --- a/pkgs/development/python-modules/cinemagoer/default.nix +++ b/pkgs/development/python-modules/cinemagoer/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "cinemagoer"; - version = "2022.2.11"; + version = "2022.12.27"; src = fetchPypi { inherit pname version; - sha256 = "8efe29dab44a7d275702f3160746015bd55c87b2eed85991dd57dda42594e6c6"; + sha256 = "sha256-uUq/6Uijv6krBNCa5ftBWG/uYLs/5pLyDONLvBoxjYo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/circuitbreaker/default.nix b/pkgs/development/python-modules/circuitbreaker/default.nix index d6c6832debb7..35f844d56eeb 100644 --- a/pkgs/development/python-modules/circuitbreaker/default.nix +++ b/pkgs/development/python-modules/circuitbreaker/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-l0ASt9CQmgJmWpRrghElbff/gaNOmxNh+Wj0C0p4jE0="; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cirq-aqt/default.nix b/pkgs/development/python-modules/cirq-aqt/default.nix index 4357abe0ac8f..ae53a5eef6bd 100644 --- a/pkgs/development/python-modules/cirq-aqt/default.nix +++ b/pkgs/development/python-modules/cirq-aqt/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index e9328079b717..c37e60c9ac86 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "cirq-core"; - version = "1.0.0"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,8 +39,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "quantumlib"; repo = "cirq"; - rev = "v${version}"; - hash = "sha256-KJ+z4zGrdGIXcGZzqHtWMf8aAzcn9CtltFawcHVldMQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-5j4hbG95KRfRQTyyZgoNp/eHIcy0FphyEhbYnzyUMO4="; }; sourceRoot = "source/${pname}"; @@ -73,7 +73,7 @@ buildPythonPackage rec { quimb ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio freezegun diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix index ebd420244e4b..4eb47507001c 100644 --- a/pkgs/development/python-modules/cirq-google/default.nix +++ b/pkgs/development/python-modules/cirq-google/default.nix @@ -22,9 +22,9 @@ buildPythonPackage rec { cirq-core google-api-core protobuf - ]; + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cirq-ionq/default.nix b/pkgs/development/python-modules/cirq-ionq/default.nix index 78f52de89a8d..080497441898 100644 --- a/pkgs/development/python-modules/cirq-ionq/default.nix +++ b/pkgs/development/python-modules/cirq-ionq/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cirq-pasqal/default.nix b/pkgs/development/python-modules/cirq-pasqal/default.nix index 3fe2e52f7db5..5066455e294a 100644 --- a/pkgs/development/python-modules/cirq-pasqal/default.nix +++ b/pkgs/development/python-modules/cirq-pasqal/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cirq-rigetti/default.nix b/pkgs/development/python-modules/cirq-rigetti/default.nix index 2345c7ce4d0c..b3bd2d3a0549 100644 --- a/pkgs/development/python-modules/cirq-rigetti/default.nix +++ b/pkgs/development/python-modules/cirq-rigetti/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cirq-web/default.nix b/pkgs/development/python-modules/cirq-web/default.nix index 5531716fc64c..3488ab56586c 100644 --- a/pkgs/development/python-modules/cirq-web/default.nix +++ b/pkgs/development/python-modules/cirq-web/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { cirq-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index 0531020a2139..f77741052447 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ]; # pythonImportsCheck = [ "cirq" "cirq.Circuit" ]; # cirq's importlib hook doesn't work here - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix index b5e40423bd4b..40018a49c8cc 100644 --- a/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ciso8601/default.nix b/pkgs/development/python-modules/ciso8601/default.nix index 79afe8500072..52b87941b582 100644 --- a/pkgs/development/python-modules/ciso8601/default.nix +++ b/pkgs/development/python-modules/ciso8601/default.nix @@ -1,26 +1,34 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools +, pytestCheckHook , pytz -, unittest2 -, isPy27 }: buildPythonPackage rec { pname = "ciso8601"; - version = "2.2.0"; + version = "2.3.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "closeio"; repo = "ciso8601"; - rev = "v${version}"; - sha256 = "sha256-TqB1tQDgCkXu+QuzP6yBEH/xHxhhD/kGR2S0I8Osc5E="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-qTpt91Wf3L6Jl7FU8sn9PvGMRd/cjhQ1mQvUaQeLFQU="; }; - checkInputs = [ + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook pytz - ] ++ lib.optionals (isPy27) [ - unittest2 + ]; + + pytestFlagsArray = [ + "tests/tests.py" ]; pythonImportsCheck = [ "ciso8601" ]; diff --git a/pkgs/development/python-modules/citeproc-py/default.nix b/pkgs/development/python-modules/citeproc-py/default.nix index b404fa4a5cbd..d0294a28ae12 100644 --- a/pkgs/development/python-modules/citeproc-py/default.nix +++ b/pkgs/development/python-modules/citeproc-py/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ lxml ]; - checkInputs = [ nose git ]; + nativeCheckInputs = [ nose git ]; checkPhase = "nosetests tests"; doCheck = false; # seems to want a Git repository, but fetchgit with leaveDotGit also fails pythonImportsCheck = [ "citeproc" ]; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 86448c07f4e2..a8811d7f37ac 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -5,17 +5,15 @@ , decorator , fetchFromGitHub , future -, nose , pysmt , pythonOlder , pytestCheckHook -, six , z3 }: buildPythonPackage rec { pname = "claripy"; - version = "9.2.25"; + version = "9.2.36"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "angr"; repo = pname; - rev = "v${version}"; - hash = "sha256-zDc7TlMtheekLHUuZS7gFieaWRrs+iD/9ko6ECdHiks="; + rev = "refs/tags/v${version}"; + hash = "sha256-gF8T1ZTvTjyt+kEOxI3ryDJOZv4go54VTxSGEdUyGt4="; }; nativeBuildInputs = [ @@ -39,16 +37,14 @@ buildPythonPackage rec { z3 ]; - checkInputs = [ - nose + nativeCheckInputs = [ pytestCheckHook - six ]; postPatch = '' # Use upstream z3 implementation substituteInPlace setup.cfg \ - --replace "z3-solver == 4.10.2.0" "" + --replace "z3-solver==4.10.2.0" "" ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/classify-imports/default.nix b/pkgs/development/python-modules/classify-imports/default.nix index 16a7f361be71..694d4da42111 100644 --- a/pkgs/development/python-modules/classify-imports/default.nix +++ b/pkgs/development/python-modules/classify-imports/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { "classify_imports" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cld2-cffi/default.nix b/pkgs/development/python-modules/cld2-cffi/default.nix index fc5a6b0e54bc..c2087409b048 100644 --- a/pkgs/development/python-modules/cld2-cffi/default.nix +++ b/pkgs/development/python-modules/cld2-cffi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six cffi ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; # gcc doesn't approve of this code, so disable -Werror NIX_CFLAGS_COMPILE = "-w" + lib.optionalString stdenv.cc.isClang " -Wno-error=c++11-narrowing"; diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 1281a7a62cb1..e1f022c1a463 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.25"; + version = "9.2.36"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-4igNQqH3mU8Gyk8vpPKp3a4BCyRezmJ5dfZhR5KwyAo="; + hash = "sha256-XqoBFV87m/uz0proGDtbaewsoY8vsA6ToGwdv7xvO9Y="; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ buildPythonPackage rec { sortedcontainers ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix index e81ff175d533..ce4b9237745a 100644 --- a/pkgs/development/python-modules/cleo/default.nix +++ b/pkgs/development/python-modules/cleo/default.nix @@ -3,35 +3,30 @@ , fetchFromGitHub , crashtest , poetry-core -, pylev , pytest-mock , pytestCheckHook +, rapidfuzz }: buildPythonPackage rec { pname = "cleo"; - version = "1.0.0a5"; + version = "2.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FtGGIRF/tA2OWEjkCFwa1HHg6VY+5E5mAiJC/zjUC1g="; + hash = "sha256-y9PYlGSPLpZl9Ad2AFuDKIopH0LRETLp35aiZtLcXzM="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'crashtest = "^0.3.1"' 'crashtest = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ crashtest - pylev + rapidfuzz ]; pythonImportsCheck = [ @@ -41,13 +36,14 @@ buildPythonPackage rec { "cleo.helpers" ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/python-poetry/cleo"; + changelog = "https://github.com/python-poetry/cleo/blob/${src.rev}/CHANGELOG.md"; description = "Allows you to create beautiful and testable command-line interfaces"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index a144a51e2ca7..d657e55b7138 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -3,8 +3,6 @@ , fetchFromGitHub , cchardet , chardet -, cleo -, clikit , pandas , regex , tabview @@ -14,27 +12,32 @@ buildPythonPackage rec { pname = "clevercsv"; - version = "0.7.4"; + version = "0.7.5"; format = "setuptools"; src = fetchFromGitHub { owner = "alan-turing-institute"; repo = "CleverCSV"; - rev = "v${version}"; - sha256 = "sha256-2OLvVJbqV/wR+Quq0cAlR/vCUe1/Km/nALwfoHD9B+U="; + rev = "refs/tags/v${version}"; + hash = "sha256-zpnUw0ThYbbYS7CYgsi0ZL1qxbY4B1cy2NhrUU9uzig="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "packaging>=23.0" "packaging" + ''; + propagatedBuildInputs = [ cchardet chardet - cleo - clikit pandas regex tabview ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "clevercsv" diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index 02b6c6fccda7..a6b2ba5e9f11 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -1,37 +1,43 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , backports_csv , configobj , mock -, pytest +, pytestCheckHook +, pygments , tabulate , terminaltables , wcwidth }: buildPythonPackage rec { - pname = "cli_helpers"; + pname = "cli-helpers"; version = "2.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-5xdNADorWP0+Mac/u8RdWqUT3mLL1C1Df3i5ZYvV+Wc="; + pname = "cli_helpers"; + inherit version; + hash = "sha256-5xdNADorWP0+Mac/u8RdWqUT3mLL1C1Df3i5ZYvV+Wc="; }; propagatedBuildInputs = [ configobj - terminaltables tabulate - wcwidth - ] ++ (lib.optionals isPy27 [ backports_csv ]); + ] ++ tabulate.optional-dependencies.widechars; - # namespace collision between backport.csv and backports.configparser - doCheck = !isPy27; + passthru.optional-dependencies = { + styles = [ pygments ]; + }; - checkInputs = [ pytest mock ]; - - checkPhase = '' - py.test - ''; + nativeCheckInputs = [ + pytestCheckHook + mock + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); meta = with lib; { description = "Python helpers for common CLI tasks"; diff --git a/pkgs/development/python-modules/click-command-tree/default.nix b/pkgs/development/python-modules/click-command-tree/default.nix new file mode 100644 index 000000000000..1f836a64e9fd --- /dev/null +++ b/pkgs/development/python-modules/click-command-tree/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, click +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "click-command-tree"; + version = "1.1.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "whwright"; + repo = pname; + rev = version; + hash = "sha256-vFOcn+ibyLZnhU3OQMtnHI04UqAY2/CCvhq4EEU4XFo="; + }; + + patches = [ + (fetchpatch { + name = "remove-setup-downloading-flake8.patch"; + url = "https://github.com/whwright/click-command-tree/commit/1ecfcfa29bf01e1131e6ec712bd7338ac1283dc8.patch"; + hash = "sha256-u5jsNfEo1+XNlkVGPCM/rsDPnYko6cr2z2si9nq+sLA="; + }) + ]; + + propagatedBuildInputs = [ + click + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests.py" + ]; + + pythonImportsCheck = [ "click_command_tree" ]; + + meta = with lib; { + description = "click plugin to show the command tree of your CLI"; + homepage = "https://github.com/whwright/click-command-tree"; + license = licenses.mit; + maintainers = with maintainers; [ tjni ]; + }; +} diff --git a/pkgs/development/python-modules/click-configfile/default.nix b/pkgs/development/python-modules/click-configfile/default.nix index 62e0ed2d3b60..5ddf2891f7fc 100644 --- a/pkgs/development/python-modules/click-configfile/default.nix +++ b/pkgs/development/python-modules/click-configfile/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/click-default-group/default.nix b/pkgs/development/python-modules/click-default-group/default.nix index 3ed81e598d17..8e5668f2b05a 100644 --- a/pkgs/development/python-modules/click-default-group/default.nix +++ b/pkgs/development/python-modules/click-default-group/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "click_default_group" ]; diff --git a/pkgs/development/python-modules/click-help-colors/default.nix b/pkgs/development/python-modules/click-help-colors/default.nix index b63788c6060c..22561f4849fc 100644 --- a/pkgs/development/python-modules/click-help-colors/default.nix +++ b/pkgs/development/python-modules/click-help-colors/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "click_help_colors" ]; diff --git a/pkgs/development/python-modules/click-option-group/default.nix b/pkgs/development/python-modules/click-option-group/default.nix index 828b6a83be1f..47b476c6ebad 100644 --- a/pkgs/development/python-modules/click-option-group/default.nix +++ b/pkgs/development/python-modules/click-option-group/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/click-plugins/default.nix b/pkgs/development/python-modules/click-plugins/default.nix index 31ae00a348df..a03456b17d81 100644 --- a/pkgs/development/python-modules/click-plugins/default.nix +++ b/pkgs/development/python-modules/click-plugins/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix index 5934adab7a7f..fd2a20867bdc 100644 --- a/pkgs/development/python-modules/click-repl/default.nix +++ b/pkgs/development/python-modules/click-repl/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/click-shell/default.nix b/pkgs/development/python-modules/click-shell/default.nix index 68d65069ae44..1b9a5ecf6211 100644 --- a/pkgs/development/python-modules/click-shell/default.nix +++ b/pkgs/development/python-modules/click-shell/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytest-click pytestCheckHook ]; diff --git a/pkgs/development/python-modules/click-spinner/default.nix b/pkgs/development/python-modules/click-spinner/default.nix index e0d862ab1310..7d28cfb2819c 100644 --- a/pkgs/development/python-modules/click-spinner/default.nix +++ b/pkgs/development/python-modules/click-spinner/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "h+rPnXKYlzol12Fe9X1Hgq6/kTpTK7pLKKN+Nm6XXa8="; }; - checkInputs = [ + nativeCheckInputs = [ click six pytestCheckHook diff --git a/pkgs/development/python-modules/click-threading/default.nix b/pkgs/development/python-modules/click-threading/default.nix index 529ee08e4f8e..77ea7712d7a3 100644 --- a/pkgs/development/python-modules/click-threading/default.nix +++ b/pkgs/development/python-modules/click-threading/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-rc/mI8AqWVwQfDFAcvZ6Inj+TrQLcsDRoskDzHivNDk="; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ click ] ++ lib.optional (!isPy3k) futures; checkPhase = '' diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index c93e5d21823e..988027f953f5 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index 8aeb73bb25b2..4bb7603b9c21 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytest-cov }: +{ lib, buildPythonPackage, fetchFromGitHub, flake8, click, pyyaml, six, pytestCheckHook, pytest-cov }: buildPythonPackage rec { pname = "clickclick"; @@ -11,14 +11,12 @@ buildPythonPackage rec { sha256 = "1rij9ws9nhsmagiy1vclzliiqfkxi006rf65qvrw1k3sm2s8p5g0"; }; - checkInputs = [ pytestCheckHook pytest-cov ]; + nativeCheckInputs = [ pytestCheckHook pytest-cov ]; propagatedBuildInputs = [ flake8 click pyyaml six ]; # test_cli asserts on exact quoting style of output disabledTests = [ "test_cli" - ] ++ lib.optionals isPy36 [ - "test_choice_default" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix index d0f81a20c6d3..759d52bcd384 100644 --- a/pkgs/development/python-modules/clickgen/default.nix +++ b/pkgs/development/python-modules/clickgen/default.nix @@ -4,16 +4,15 @@ , pythonOlder , fetchFromGitHub , pillow -, libX11 -, libXcursor -, libpng +, toml +, numpy , python , pytestCheckHook }: buildPythonPackage rec { pname = "clickgen"; - version = "1.2.0"; + version = "2.1.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,25 +20,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ful1e5"; repo = "clickgen"; - rev = "v${version}"; - sha256 = "sha256-01c8SVy+J004dq5KCUe62w7i/xUTxTfl/IpvUtGQgw0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-qDaSfIeKCbyl3C2iKz9DYQc1oNwTe5xDlGg/yYhakSw="; }; - buildInputs = [ libXcursor libX11 libpng ]; + propagatedBuildInputs = [ pillow toml numpy ]; - propagatedBuildInputs = [ pillow ]; - - checkInputs = [ pytestCheckHook ]; - - postBuild = '' - # Needs to build xcursorgen.so - cd src/xcursorgen - make - cd ../.. - ''; + nativeCheckInputs = [ pytestCheckHook ]; postInstall = '' - install -m644 src/xcursorgen/xcursorgen.so $out/${python.sitePackages}/clickgen/xcursorgen.so # Copying scripts directory needed by clickgen script at $out/bin/ cp -R src/clickgen/scripts $out/${python.sitePackages}/clickgen/scripts ''; diff --git a/pkgs/development/python-modules/clickhouse-driver/default.nix b/pkgs/development/python-modules/clickhouse-driver/default.nix index 826ce08c1e06..375fee87486c 100644 --- a/pkgs/development/python-modules/clickhouse-driver/default.nix +++ b/pkgs/development/python-modules/clickhouse-driver/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "clickhouse-driver"; - version = "0.2.2"; + version = "0.2.5"; # pypi source doesn't contain tests src = fetchFromGitHub { owner = "mymarilyn"; repo = "clickhouse-driver"; rev = version; - sha256 = "0sx4jbadx9frzhqnj8b9w9l508x1r7j7b9883h7xq93lf00rxkfz"; + hash = "sha256-o5v37jPKmvUW4GFVD742nHSdO0g0z2FA4FkacbaRfNA="; }; propagatedBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { lz4 ]; - checkInputs = [ + nativeCheckInputs = [ freezegun mock nose diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index d8ff545c848e..34c02b3da389 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ow0w56z1DjwhSjnuPmaqLytZV+Kh3jc+F7uo6Yx1AaU="; + sha256 = "sha256-u+6CEnMIRyoxI+0QtSiWFsssQ1B0ZW3QcuVTYwU9CRw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cliff/tests.nix b/pkgs/development/python-modules/cliff/tests.nix index b981e78be0c7..56a29a6ef6ab 100644 --- a/pkgs/development/python-modules/cliff/tests.nix +++ b/pkgs/development/python-modules/cliff/tests.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ cliff docutils stestr diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix index 9a7be23938c0..85a6330e0b28 100644 --- a/pkgs/development/python-modules/clifford/default.nix +++ b/pkgs/development/python-modules/clifford/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { sparse ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ipython ]; diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix index 7806da7fb162..411e6d622db2 100644 --- a/pkgs/development/python-modules/cligj/default.nix +++ b/pkgs/development/python-modules/cligj/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ pytest glibcLocales ]; + nativeCheckInputs = [ pytest glibcLocales ]; checkPhase = '' LC_ALL=en_US.utf-8 pytest tests diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix index af366cdbec06..48ed42ffb8e3 100644 --- a/pkgs/development/python-modules/clikit/default.nix +++ b/pkgs/development/python-modules/clikit/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { ++ lib.optionals (pythonAtLeast "3.6") [ crashtest ] ++ lib.optionals isPy27 [ typing enum34 ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/clint/default.nix b/pkgs/development/python-modules/clint/default.nix index 45733c4ae7f1..7e826194de45 100644 --- a/pkgs/development/python-modules/clint/default.nix +++ b/pkgs/development/python-modules/clint/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { # no longer compatible as behavior demand 2to3, which was removed # in setuptools>=58 doCheck = false; - checkInputs = [ mock nose nose_progressive pkgs.glibcLocales ]; + nativeCheckInputs = [ mock nose nose_progressive pkgs.glibcLocales ]; checkPhase = '' ${python.interpreter} test_clint.py ''; diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index a848125a55dc..91c362237f41 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook python-dateutil pygments diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index 697296d9a200..1de1b81d89b6 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -1,28 +1,33 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, isPy27 , attrs +, buildPythonPackage , colorlog , csvw -, python-dateutil -, tabulate +, fetchFromGitHub +, git +, isPy27 +, lxml +, markdown +, markupsafe , mock , postgresql -, pytestCheckHook +, pylatexenc , pytest-mock +, pytestCheckHook +, python-dateutil +, tabulate }: buildPythonPackage rec { pname = "clldutils"; - version = "3.9.0"; + version = "3.19.0"; disabled = isPy27; src = fetchFromGitHub { owner = "clld"; repo = pname; rev = "v${version}"; - sha256 = "07ljq7v1zvaxyl6xn4a2p4097lgd5j9bz71lf05y5bz8k024mxbr"; + sha256 = "sha256-dva0lbbTxvETDPkACxpI3PPzWh5gz87Fv6W3lTjNv3Q="; }; patchPhase = '' @@ -30,18 +35,23 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + attrs + colorlog + csvw + lxml + markdown + markupsafe + pylatexenc python-dateutil tabulate - colorlog - attrs - csvw ]; - checkInputs = [ + nativeCheckInputs = [ mock postgresql - pytestCheckHook pytest-mock + pytestCheckHook + git ]; disabledTests = [ @@ -54,6 +64,6 @@ buildPythonPackage rec { description = "Utilities for clld apps without the overhead of requiring pyramid, rdflib et al"; homepage = "https://github.com/clld/clldutils"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ melling ]; }; } diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index 8e62a08ebf94..5e52ab7c1769 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "2.10.1"; + version = "2.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wLgb7HnDSX3OVCVNlBd97iIg+g0ngaDWk7Jcs5fKc7k="; + hash = "sha256-VAEgrM9F9M/HjL726RzofJT/Sc8R6WIF/D/gZH5ncBs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index 13f99462da53..37678b93d195 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-P0IZRpxVRTz+RzflZLZ8KhSRCdq/fyQkeJSLiV9hEG8="; }; - checkInputs = [ + nativeCheckInputs = [ psutil pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cloudscraper/default.nix b/pkgs/development/python-modules/cloudscraper/default.nix index 85b7a9447919..6b65a90529a7 100644 --- a/pkgs/development/python-modules/cloudscraper/default.nix +++ b/pkgs/development/python-modules/cloudscraper/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudscraper"; - version = "1.2.65"; + version = "1.2.68"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vwH5sSA9rFrnFO4zIvjloYXSNWK5Vn1rODO74vPWvEE="; + hash = "sha256-TQKs7/qQq9TavHW3m6+jFjYwm6p8Dy7mZeLTRarbiGM="; }; propagatedBuildInputs = [ @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to bypass Cloudflare's anti-bot page"; homepage = "https://github.com/venomous/cloudscraper"; + changelog = "https://github.com/VeNoMouS/cloudscraper/releases/tag/${version}"; 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 ffb9d35d2308..285e90c22526 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -1,28 +1,30 @@ { lib , buildPythonPackage -, fetchPypi , certifi -, six +, fetchPypi , python-dateutil +, pythonOlder +, six , urllib3 }: buildPythonPackage rec { pname = "cloudsmith-api"; - version = "1.142.3"; - + version = "2.0.1"; format = "wheel"; + disabled = pythonOlder "3.7"; + src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - sha256 = "sha256-Cdnsath9p+LPKKzV4cmoOtl4doahi86l1NIgUwliZRU="; + hash = "sha256-wFSHlUdZTARsAV3igVXThrXoGsPUaZyzXBJCSJFZYYQ="; }; propagatedBuildInputs = [ certifi - six python-dateutil + six urllib3 ]; diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix index 20d822d8ee77..bf7db4a9b1d4 100644 --- a/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/pkgs/development/python-modules/cloudsplaining/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { schema ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix index 1ccae736bddb..77a1835f3e24 100644 --- a/pkgs/development/python-modules/cloup/default.nix +++ b/pkgs/development/python-modules/cloup/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "cloup"; - version = "1.0.1"; + version = "2.0.0.post1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iQfpz2rl7Y3PJIG2aO+Cu1khx2g68XfOwhkRoENqsTg="; + sha256 = "sha256-FDDJB1Bi4Jy2TNhKt6/l1azSit9WHWqzEJ6xl1u9e2s="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index 890c20b0d25a..b38d61f6fa01 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "ClusterShell"; - version = "1.8.4"; + version = "1.9"; src = fetchPypi { inherit pname version; - sha256 = "ff6fba688a06e5e577315d899f0dab3f4fe479cef99d444a4e651af577b7d081"; + sha256 = "sha256-A0arNKF9jPRj3GnnOBHG8xDD2YEPpMrPRbZEaKg8FHQ="; }; postPatch = '' @@ -47,7 +47,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ bc hostname nose diff --git a/pkgs/development/python-modules/clvm-tools-rs/default.nix b/pkgs/development/python-modules/clvm-tools-rs/default.nix index 3d88084169a1..0e82989caadb 100644 --- a/pkgs/development/python-modules/clvm-tools-rs/default.nix +++ b/pkgs/development/python-modules/clvm-tools-rs/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "clvm-tools-rs"; - version = "0.1.19"; + version = "0.1.25"; disabled = pythonOlder "3.7"; format = "pyproject"; @@ -15,13 +15,13 @@ buildPythonPackage rec { owner = "Chia-Network"; repo = "clvm_tools_rs"; rev = version; - sha256 = "sha256-LQbFBZBLUAjyqIAWIn+N8tUrBMskRoKvMMg5gfTyVU8="; + sha256 = "sha256-s4AeXoLOtEIxCSnW5CWVZoZrAJ+wKQPklEehPAvnHMw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-LcDWpMM+PUElsXO82H6QVOp338+NduC/j3pXQKSni3I="; + sha256 = "sha256-4SjSpEMu6NAPn50u7iyAznTw4AL4+KmBvppMV4+w6Jk="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/clvm-tools/default.nix b/pkgs/development/python-modules/clvm-tools/default.nix index 7de885cc7384..394c105d19fc 100644 --- a/pkgs/development/python-modules/clvm-tools/default.nix +++ b/pkgs/development/python-modules/clvm-tools/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "clvm_tools"; - version = "0.4.5"; + version = "0.4.6"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "clvm_tools"; rev = version; - sha256 = "sha256-7FUZh9w6AM+7l7Br9V/ovS/1H62BLoas5gCrbeMvBAc="; + sha256 = "sha256-MAtVTSv1RR2/7QEKCOEQ+QH5vK4aE0Us2TXyRRAMl8U="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { clvm-tools-rs ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/clvm/default.nix b/pkgs/development/python-modules/clvm/default.nix index 2853bfe53182..f3a7cae8ce0b 100644 --- a/pkgs/development/python-modules/clvm/default.nix +++ b/pkgs/development/python-modules/clvm/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { blspy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix index 5f1121c8e914..ee3a552b94f3 100644 --- a/pkgs/development/python-modules/cma/default.nix +++ b/pkgs/development/python-modules/cma/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cma"; - version = "3.2.2"; + version = "3.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "CMA-ES"; repo = "pycma"; rev = "refs/tags/r${version}"; - hash = "sha256-STF7jtLqI2KiWvvI9/reRjP1XyW8l4/qy9uAPpE9mTs="; + hash = "sha256-+UJI3hDVbDMfRF4bkwHED3eJCHzxS2hO4YPUzJqcoQI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix index d609508822e4..3b1be813918f 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.8.0"; + version = "2022.10.27"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/oWbDpjSIrS0WAIgB9qsJ1fpcPBnHUXlXQGTHBtLs8s="; + sha256 = "sha256-k9msdxbqkBygv9GK47aPH2v1HeCDDD8jPvc0/NUqB5k="; }; propagatedNativeBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { cffi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index ada33a8594ef..ac560205bef1 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook glibcLocales pytest-mock diff --git a/pkgs/development/python-modules/cmigemo/default.nix b/pkgs/development/python-modules/cmigemo/default.nix index 7c88449b6c18..fb381ec18598 100644 --- a/pkgs/development/python-modules/cmigemo/default.nix +++ b/pkgs/development/python-modules/cmigemo/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sed -i 's~dict_path_base = "/usr/share/cmigemo"~dict_path_base = "/${cmigemo}/share/migemo"~g' test/test_cmigemo.py ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "test/" ]; diff --git a/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix index 8c5c8c7afed1..e3ca8380c659 100644 --- a/pkgs/development/python-modules/cmsis-pack-manager/default.nix +++ b/pkgs/development/python-modules/cmsis-pack-manager/default.nix @@ -16,11 +16,12 @@ }: let pname = "cmsis-pack-manager"; - version = "0.4.0"; + version = "0.5.1"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-NeUG6PFI2eTwq5SNtAB6ZMA1M3z1JmMND29V9/O5sgw="; + pname = "cmsis_pack_manager"; + inherit version; + sha256 = "sha256-2pKGJlPubR+C4UhdCuMDR9GG2wQOaP6YkMXxeAcaRkk="; }; native = rustPlatform.buildRustPackage { @@ -54,7 +55,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ appdirs milksnake pyyaml ]; - checkInputs = [ hypothesis jinja2 mock pytestCheckHook ]; + nativeCheckInputs = [ hypothesis jinja2 mock pytestCheckHook ]; preBuild = '' mkdir -p rust/target/release/deps diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix index 36e4bcf2760d..4efa160d27ea 100644 --- a/pkgs/development/python-modules/cnvkit/default.nix +++ b/pkgs/development/python-modules/cnvkit/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { rPackages.DNAcopy ]; - checkInputs = [ R ]; + nativeCheckInputs = [ R ]; checkPhase = '' pushd test/ diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index 848fb80ff093..c51dd9ecc95e 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -14,18 +14,18 @@ buildPythonPackage rec { pname = "coconut"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "evhub"; repo = "coconut"; - rev = "v${version}"; - sha256 = "sha256-TkMwOE/Jug1zKjR1048o/Jmn8o9/oQPNqzwXYakwpgs="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-zDMcQPAYlxid3fcMT8kRzE+LN1dxUVWjkg8pdVtmwZg="; }; propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ]; - checkInputs = [ pexpect pytestCheckHook tkinter ]; + nativeCheckInputs = [ pexpect pytestCheckHook tkinter ]; # Currently most tests have performance issues pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index 688fc7c367bc..d9eedb626c8f 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "cocotb"; - version = "1.7.1"; + version = "1.7.2"; # pypi source doesn't include tests src = fetchFromGitHub { owner = "cocotb"; repo = "cocotb"; - rev = "v${version}"; - sha256 = "sha256-wACgT5r0YmSYvLhTsuFhTcJqeCtGGLifOmr7/Lz2Vug="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-gLOYwljqnYkGsdbny7+f93QgroLBaLLnDBRpoCe8uEg="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { ./0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch ]; - checkInputs = [ cocotb-bus pytestCheckHook swig verilog ]; + nativeCheckInputs = [ cocotb-bus pytestCheckHook swig verilog ]; preCheck = '' export PATH=$out/bin:$PATH mv cocotb cocotb.hidden diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix index 20c80872fd0f..d63de1631a23 100644 --- a/pkgs/development/python-modules/codecov/default.nix +++ b/pkgs/development/python-modules/codecov/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { coverage ]; - checkInputs = [ + nativeCheckInputs = [ ddt mock pytestCheckHook diff --git a/pkgs/development/python-modules/coincurve/default.nix b/pkgs/development/python-modules/coincurve/default.nix index 5d259f250b5f..f30cda165ac2 100644 --- a/pkgs/development/python-modules/coincurve/default.nix +++ b/pkgs/development/python-modules/coincurve/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "coincurve"; - version = "17.0.0"; + version = "18.0.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ofek"; repo = "coincurve"; - rev = "v${version}"; - sha256 = "sha256-7H4/TDxteuMTrj1PdfpA5rc7CegJAOjqn1PteImfGiQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Z5g6ten8wNICoFu7+aZc6r8ET+RDmFeb93ONjsTzcbw="; }; postPatch = '' @@ -55,7 +55,7 @@ buildPythonPackage rec { rm tests/test_bench.py ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index 11b3f859d0a2..0826ad13b84d 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -1,31 +1,50 @@ -{ buildPythonPackage, fetchPypi, lib, orjson, pandas, poetry-core -, pytestCheckHook, pytest-mock, pythonOlder, python-dateutil, requests, typer -, websocket-client }: +{ lib +, buildPythonPackage +, fetchPypi +, orjson +, pandas +, poetry-core +, pytestCheckHook +, pytest-mock +, pythonOlder +, python-dateutil +, requests +, typer +, websocket-client +}: buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2022.9.22.15"; + version = "2022.11.14.16"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-37tuZDsGQAmbWSEGc7rjrXtCoSxuBN3MDMmjWHr0eS4="; + hash = "sha256-2x8S9Jj/1bBnhXS/x0lQ8YUQkCvfpgGcDSQU2dGbAn0="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ - orjson python-dateutil requests typer websocket-client + orjson + python-dateutil + requests + typer + websocket-client ]; - checkInputs = [ - pandas + nativeCheckInputs = [ pytestCheckHook pytest-mock - ]; + ] ++ passthru.optional-dependencies.pandas; - pythonImportsCheck = [ "coinmetrics.api_client" ]; + pythonImportsCheck = [ + "coinmetrics.api_client" + ]; passthru = { optional-dependencies = { @@ -34,8 +53,8 @@ buildPythonPackage rec { }; meta = with lib; { + description = "Coin Metrics API v4 client library"; homepage = "https://coinmetrics.github.io/api-client-python/site/index.html"; - description = "Coin Metrics API v4 client library (Python)"; license = licenses.mit; maintainers = with maintainers; [ centromere ]; }; diff --git a/pkgs/development/python-modules/collections-extended/default.nix b/pkgs/development/python-modules/collections-extended/default.nix index 867226c327b4..c4d20c23d3f2 100644 --- a/pkgs/development/python-modules/collections-extended/default.nix +++ b/pkgs/development/python-modules/collections-extended/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix index 1ae46cb2be79..747823f2dd9e 100644 --- a/pkgs/development/python-modules/colorama/default.nix +++ b/pkgs/development/python-modules/colorama/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "colorama" ]; diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index 33e7942dfc89..8e77075f79f2 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "colorcet"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "21c522346a7aa81a603729f2996c22ac3f7822f4c8c303c59761e27d2dfcf3db"; + sha256 = "sha256-UUVaIDU9EvrJH5U3cthAnyR05qDbGvP6T3AF9AWiSAs="; }; propagatedBuildInputs = [ @@ -21,7 +21,7 @@ buildPythonPackage rec { pyct ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mpl pytestCheckHook ]; diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix index 9a3352ca1424..dacb30a8e214 100644 --- a/pkgs/development/python-modules/colored/default.nix +++ b/pkgs/development/python-modules/colored/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-BP9NTdUUJ0/juZohu1L7lvJojAHpP7p77zciHny1bOA="; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix index 3ffdc6ffdd0e..44c47f569ebb 100644 --- a/pkgs/development/python-modules/coloredlogs/default.nix +++ b/pkgs/development/python-modules/coloredlogs/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { humanfriendly ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock util-linux diff --git a/pkgs/development/python-modules/colorful/default.nix b/pkgs/development/python-modules/colorful/default.nix index 9ea380cd1d55..d57be5da2b4c 100644 --- a/pkgs/development/python-modules/colorful/default.nix +++ b/pkgs/development/python-modules/colorful/default.nix @@ -2,25 +2,35 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "colorful"; - version = "0.5.4"; + version = "0.5.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # No tests in the Pypi package. src = fetchFromGitHub { owner = "timofurrer"; repo = pname; - rev = "v${version}"; - sha256 = "1fcz5v8b318a3dsdha4c874jsf3wmcw3f25bv2csixclyzacli98"; + rev = "refs/tags/v${version}"; + hash = "sha256-fgxbj1WE9JcGt+oEcBguL0wQEWIn5toRTLWsvCFO3k8="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "colorful" + ]; meta = with lib; { - description = "Terminal string styling done right, in Python."; + description = "Library for terminal string styling"; homepage = "https://github.com/timofurrer/colorful"; + changelog = "https://github.com/timofurrer/colorful/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; }; diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index 9c1be8c68333..3a2e4ffa642f 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-vZS9IcHhP6x70xU/S8On3A6wl0uLwv3xqYnkdPblguU="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "colorlog" ]; diff --git a/pkgs/development/python-modules/colormath/default.nix b/pkgs/development/python-modules/colormath/default.nix index 7f9f9f1a9ce7..fb4ddfd9a69f 100644 --- a/pkgs/development/python-modules/colormath/default.nix +++ b/pkgs/development/python-modules/colormath/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ networkx numpy ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = "nosetests"; diff --git a/pkgs/development/python-modules/colorzero/default.nix b/pkgs/development/python-modules/colorzero/default.nix index 4e74d9592a9b..01936cefd2c3 100644 --- a/pkgs/development/python-modules/colorzero/default.nix +++ b/pkgs/development/python-modules/colorzero/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { "colorzero" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cometblue-lite/default.nix b/pkgs/development/python-modules/cometblue-lite/default.nix index eea0b8dac04d..89af6333ae90 100644 --- a/pkgs/development/python-modules/cometblue-lite/default.nix +++ b/pkgs/development/python-modules/cometblue-lite/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cometblue-lite"; - version = "0.5.3"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "neffs"; repo = "python-cometblue_lite"; - rev = version; - hash = "sha256-KRWS2nqMFlF+IcBSmnQH3ptp6yxRQjAFY6aY0D7eZBs="; + rev = "refs/tags/${version}"; + hash = "sha256-Cjd7PdZ2/neRr1jStDY5iJaGMJ/srnFmCea8aLNan6g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/comm/default.nix b/pkgs/development/python-modules/comm/default.nix new file mode 100644 index 000000000000..4cf5dcdf4128 --- /dev/null +++ b/pkgs/development/python-modules/comm/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, traitlets +, pytestCheckHook +}: + +let + pname = "comm"; + version = "0.1.2"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "ipython"; + repo = "comm"; + rev = "refs/tags/${version}"; + hash = "sha256-Ve6tCvu89P5wUOj+vlzXItRR5RjJNKxItKnWP2fVk9U="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + traitlets + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Jupyter Python Comm implementation, for usage in ipykernel, xeus-python etc"; + homepage = "https://github.com/ipython/comm"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} + diff --git a/pkgs/development/python-modules/commentjson/default.nix b/pkgs/development/python-modules/commentjson/default.nix index c1d3b8916d91..9f4dbe1b2844 100644 --- a/pkgs/development/python-modules/commentjson/default.nix +++ b/pkgs/development/python-modules/commentjson/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ lark six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "commentjson" ]; diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 6b1d873069a8..064dfc770af7 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { typing ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist ]; diff --git a/pkgs/development/python-modules/commonmark/default.nix b/pkgs/development/python-modules/commonmark/default.nix index 56ddf7663078..1efefa4bf030 100644 --- a/pkgs/development/python-modules/commonmark/default.nix +++ b/pkgs/development/python-modules/commonmark/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { # UnicodeEncodeError on Python 2 doCheck = isPy3k; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; propagatedBuildInputs = [ future ]; meta = with lib; { diff --git a/pkgs/development/python-modules/compiledb/default.nix b/pkgs/development/python-modules/compiledb/default.nix index 1892337dc2d9..35a78b770421 100644 --- a/pkgs/development/python-modules/compiledb/default.nix +++ b/pkgs/development/python-modules/compiledb/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { --replace /bin/echo ${coreutils}/bin/echo ''; - checkInputs = [ pytest gcc coreutils ]; + nativeCheckInputs = [ pytest gcc coreutils ]; propagatedBuildInputs = [ click bashlex shutilwhich ]; checkPhase = '' diff --git a/pkgs/development/python-modules/compreffor/default.nix b/pkgs/development/python-modules/compreffor/default.nix index 0c1f376aeaf6..cad402dc8920 100644 --- a/pkgs/development/python-modules/compreffor/default.nix +++ b/pkgs/development/python-modules/compreffor/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { fonttools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/confection/default.nix b/pkgs/development/python-modules/confection/default.nix index 82cedc869687..08dccaafcf1b 100644 --- a/pkgs/development/python-modules/confection/default.nix +++ b/pkgs/development/python-modules/confection/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "confection"; - version = "0.0.3"; + version = "0.0.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "explosion"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3qxB94CYCMZN+sKqbmDfkRyAs6HJkFLE/5yJx1DKqYM="; + hash = "sha256-JZQ9D5+UAobywlj8eiyw15wXKYhUKz6+lf9hikMV6x0="; }; propagatedBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { srsly ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library that offers a configuration system"; homepage = "https://github.com/explosion/confection"; + changelog = "https://github.com/explosion/confection/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 7c1594e9e805..7d4728374f50 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -3,12 +3,15 @@ , fetchFromGitHub , mock , pytestCheckHook +, pyyaml }: buildPythonPackage rec { pname = "configargparse"; version = "1.5.3"; + format = "setuptools"; + src = fetchFromGitHub { owner = "bw2"; repo = "ConfigArgParse"; @@ -16,9 +19,10 @@ buildPythonPackage rec { sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz"; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook + pyyaml ]; pythonImportsCheck = [ "configargparse" ]; diff --git a/pkgs/development/python-modules/configclass/default.nix b/pkgs/development/python-modules/configclass/default.nix index 9856be48ac3d..8acf5aaad516 100644 --- a/pkgs/development/python-modules/configclass/default.nix +++ b/pkgs/development/python-modules/configclass/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mergedict ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "configclass" ]; diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix index 3ea89db527e9..df12b6a98af1 100644 --- a/pkgs/development/python-modules/configobj/default.nix +++ b/pkgs/development/python-modules/configobj/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 3c130acdc2fc..908680c9e4e4 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; preConfigure = '' export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 diff --git a/pkgs/development/python-modules/configupdater/default.nix b/pkgs/development/python-modules/configupdater/default.nix index 8dae9c0f8c95..b8fa44ca0851 100644 --- a/pkgs/development/python-modules/configupdater/default.nix +++ b/pkgs/development/python-modules/configupdater/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "configupdater" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix index e28621f26a99..25f9f3ef566e 100644 --- a/pkgs/development/python-modules/confuse/default.nix +++ b/pkgs/development/python-modules/confuse/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 2db1e11b271c..d4eb668d73ed 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "connexion"; - version = "2.14.1"; + version = "2.14.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "spec-first"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8nWNFYW4DWAzIAsxgWPXOodlc2tuuGOktNo4N1G1oOc="; + hash = "sha256-1v1xCHY3ZnZG/Vu9wN/it7rLKC/StoDefoMNs+hMjIs="; }; propagatedBuildInputs = [ @@ -50,7 +50,7 @@ buildPythonPackage rec { swagger-ui-bundle ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp-remotes decorator pytest-aiohttp @@ -70,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Swagger/OpenAPI First framework on top of Flask"; homepage = "https://github.com/spec-first/connexion"; + changelog = "https://github.com/spec-first/connexion/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/cons/default.nix b/pkgs/development/python-modules/cons/default.nix index 2977051d87b2..3712a0c46d78 100644 --- a/pkgs/development/python-modules/cons/default.nix +++ b/pkgs/development/python-modules/cons/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , logical-unification +, py , pytestCheckHook , pytest-html }: @@ -21,7 +22,8 @@ buildPythonPackage rec { logical-unification ]; - checkInputs = [ + nativeCheckInputs = [ + py pytestCheckHook pytest-html ]; diff --git a/pkgs/development/python-modules/consonance/default.nix b/pkgs/development/python-modules/consonance/default.nix index a31930bd0c4b..b14d965e5629 100644 --- a/pkgs/development/python-modules/consonance/default.nix +++ b/pkgs/development/python-modules/consonance/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { protobuf ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/construct-classes/default.nix b/pkgs/development/python-modules/construct-classes/default.nix index 479f0703118f..43c6f87391e3 100644 --- a/pkgs/development/python-modules/construct-classes/default.nix +++ b/pkgs/development/python-modules/construct-classes/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { construct ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "construct_classes" ]; diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index ce6e0a65b342..676f39df6a95 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { lz4 ]; - checkInputs = [ pytestCheckHook numpy arrow ruamel-yaml cloudpickle ]; + nativeCheckInputs = [ pytestCheckHook numpy arrow ruamel-yaml cloudpickle ]; disabledTests = [ "test_benchmarks" ] ++ lib.optionals stdenv.isDarwin [ "test_multiprocessing" ]; diff --git a/pkgs/development/python-modules/container-inspector/default.nix b/pkgs/development/python-modules/container-inspector/default.nix index 1dcf4e9b7a72..8afbdc229b7a 100644 --- a/pkgs/development/python-modules/container-inspector/default.nix +++ b/pkgs/development/python-modules/container-inspector/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { commoncode ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix index 456999679fcd..b5ea34675f69 100644 --- a/pkgs/development/python-modules/contextlib2/default.nix +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-qx4r/h0B2Wjht+jZAjvFHvNQm7ohe7cwzuOCfh7oKGk="; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "contextlib2" diff --git a/pkgs/development/python-modules/contexttimer/default.nix b/pkgs/development/python-modules/contexttimer/default.nix index 7cf41e9fcbdc..e7526ff7ea6d 100644 --- a/pkgs/development/python-modules/contexttimer/default.nix +++ b/pkgs/development/python-modules/contexttimer/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "contexttimer" ]; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; checkPhase = '' ${python.interpreter} -m unittest tests/test_timer.py diff --git a/pkgs/development/python-modules/contextvars/default.nix b/pkgs/development/python-modules/contextvars/default.nix deleted file mode 100644 index 1eda85a6ffe2..000000000000 --- a/pkgs/development/python-modules/contextvars/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, isPy36, immutables }: - -buildPythonPackage rec { - pname = "contextvars"; - version = "2.4"; - disabled = !isPy36; - - src = fetchPypi { - inherit pname version; - sha256 = "f38c908aaa59c14335eeea12abea5f443646216c4e29380d7bf34d2018e2c39e"; - }; - - propagatedBuildInputs = [ immutables ]; - - meta = { - description = "A backport of the Python 3.7 contextvars module for Python 3.6"; - homepage = "https://github.com/MagicStack/contextvars"; - license = with lib.licenses; [ asl20 ]; - maintainers = with lib.maintainers; [ catern ]; - }; -} diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix new file mode 100644 index 000000000000..96405864d5b5 --- /dev/null +++ b/pkgs/development/python-modules/contourpy/default.nix @@ -0,0 +1,75 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build +, pybind11 +, setuptools + +# propagates +, numpy + +# optionals +, bokeh +, chromedriver +, selenium + +# tests +, matplotlib +, pillow +, pytestCheckHook +}: + +let countourpy = buildPythonPackage rec { + pname = "contourpy"; + version = "1.0.6"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "contourpy"; + repo = "contourpy"; + rev = "refs/tags/v${version}"; + hash = "sha256-JbLaQ2NomJlgDmEATa7OmZ749Bezt3tvnt1nOA1aOVw="; + }; + + nativeBuildInputs = [ + pybind11 + setuptools + ]; + + propagatedBuildInputs = [ + numpy + ]; + + passthru.optional-depdendencies = { + bokeh = [ bokeh chromedriver selenium ]; + }; + + doCheck = false; # infinite recursion with matplotlib, tests in passthru + + nativeCheckInputs = [ + matplotlib + pillow + pytestCheckHook + ]; + + passthru.tests = { + check = countourpy.overridePythonAttrs (_: { doCheck = true; }); + }; + + pythonImportsCheck = [ + "contourpy" + ]; + + meta = with lib; { + changelog = "https://github.com/contourpy/contourpy/releases/tag/v${version}"; + description = "Python library for calculating contours in 2D quadrilateral grids"; + homepage = "https://github.com/contourpy/contourpy"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +}; +in countourpy diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix index b20066c51d8b..601799ba24e7 100644 --- a/pkgs/development/python-modules/convertdate/default.nix +++ b/pkgs/development/python-modules/convertdate/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index fdad4febcdaf..e4cf1138f19c 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPyPy , pytest, pytest-cov, pytest-mock, freezegun -, jinja2, future, binaryornot, click, jinja2_time, requests +, jinja2, future, binaryornot, click, jinja2-time, requests , python-slugify , pyyaml }: @@ -17,13 +17,13 @@ buildPythonPackage rec { sha256 = "sha256-85gr6NnFPawSYYZAE/3sf4Ov0uQu3m9t0GnF4UnFQNU="; }; - checkInputs = [ pytest pytest-cov pytest-mock freezegun ]; + nativeCheckInputs = [ pytest pytest-cov pytest-mock freezegun ]; propagatedBuildInputs = [ binaryornot jinja2 click pyyaml - jinja2_time + jinja2-time python-slugify requests ]; diff --git a/pkgs/development/python-modules/coordinates/default.nix b/pkgs/development/python-modules/coordinates/default.nix index c7a24a0c3e90..5c5e53e989f2 100644 --- a/pkgs/development/python-modules/coordinates/default.nix +++ b/pkgs/development/python-modules/coordinates/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1zha594rshjg3qjq9mrai2hfldya282ihasp2i3km7b2j4gjdw2b"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/coqpit/default.nix b/pkgs/development/python-modules/coqpit/default.nix index 12e1a46025a9..ad1fdb35efca 100644 --- a/pkgs/development/python-modules/coqpit/default.nix +++ b/pkgs/development/python-modules/coqpit/default.nix @@ -6,17 +6,17 @@ buildPythonPackage rec { pname = "coqpit"; - version = "0.0.16"; + version = "0.0.17"; format = "setuptools"; src = fetchFromGitHub { owner = "coqui-ai"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-f1FLjR4VzSOA/VaeseVA4F1NWVJIvokIZIDW1k7fNqU="; + sha256 = "sha256-FY3PYd8dY5HFKkhD6kBzPt0k1eFugdqsO3yIN4oDk3E="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/coreapi/default.nix b/pkgs/development/python-modules/coreapi/default.nix index ad9fd3d7ef73..3e8a54090402 100644 --- a/pkgs/development/python-modules/coreapi/default.nix +++ b/pkgs/development/python-modules/coreapi/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' cd ./tests pytest diff --git a/pkgs/development/python-modules/coreschema/default.nix b/pkgs/development/python-modules/coreschema/default.nix index d22e7f4ecd91..a36a6838c8e8 100644 --- a/pkgs/development/python-modules/coreschema/default.nix +++ b/pkgs/development/python-modules/coreschema/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' cd ./tests pytest diff --git a/pkgs/development/python-modules/corsair-scan/default.nix b/pkgs/development/python-modules/corsair-scan/default.nix index e7c016be06bb..ecebf7f92c1b 100644 --- a/pkgs/development/python-modules/corsair-scan/default.nix +++ b/pkgs/development/python-modules/corsair-scan/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index 20ccfd6e0a90..9b7914e5b9c1 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pytest-mock diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index b96929640806..2a30bed9936f 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -7,18 +7,18 @@ buildPythonPackage rec { pname = "coverage"; - version = "6.4.4"; + version = "7.0.1"; # uses f strings disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4WxFtyast4Dh5viLKG08ELORSrA0OPMhF8SqUtfzDVg="; + sha256 = "sha256-pKV0oZ7rZ1daUyildgu7tzf6poVhZYap+dpCgflAEJw="; }; # No tests in archive doCheck = false; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; meta = { description = "Code coverage measurement for python"; diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 72e8f6d45a72..7c68a33483a2 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "b32a8bb5d2df585207c119d6c01567b81fba690c9c10a753bfe27a335bfc43ea"; }; - checkInputs = [ + nativeCheckInputs = [ mock sh pytest diff --git a/pkgs/development/python-modules/cppe/default.nix b/pkgs/development/python-modules/cppe/default.nix index 52031bab74f7..9fa87ab806ad 100644 --- a/pkgs/development/python-modules/cppe/default.nix +++ b/pkgs/development/python-modules/cppe/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; - checkInputs = [ + nativeCheckInputs = [ pytest h5py numba diff --git a/pkgs/development/python-modules/cppy/default.nix b/pkgs/development/python-modules/cppy/default.nix index 5b7e092c42a5..5b982d61280c 100644 --- a/pkgs/development/python-modules/cppy/default.nix +++ b/pkgs/development/python-modules/cppy/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "cppy" ]; diff --git a/pkgs/development/python-modules/cpyparsing/default.nix b/pkgs/development/python-modules/cpyparsing/default.nix index b41ddf71da9c..97423234f035 100644 --- a/pkgs/development/python-modules/cpyparsing/default.nix +++ b/pkgs/development/python-modules/cpyparsing/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; - checkInputs = [ pexpect ]; + nativeCheckInputs = [ pexpect ]; checkPhase = '' ${python.interpreter} tests/cPyparsing_test.py diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix index ff156187a303..c451288f0006 100644 --- a/pkgs/development/python-modules/cram/default.nix +++ b/pkgs/development/python-modules/cram/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { version = "0.7"; pname = "cram"; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix index a88cc233ad56..b0ca3c0ac0e4 100644 --- a/pkgs/development/python-modules/cramjam/default.nix +++ b/pkgs/development/python-modules/cramjam/default.nix @@ -5,9 +5,11 @@ , stdenv , libiconv , brotli +, hypothesis , lz4 , memory_profiler , numpy +, py , pytest-benchmark , pytestCheckHook , python-snappy @@ -16,39 +18,52 @@ buildPythonPackage rec { pname = "cramjam"; - version = "2.4.0"; + version = "2.6.2.post1"; format = "pyproject"; src = fetchFromGitHub { owner = "milesgranger"; repo = "pyrus-cramjam"; - rev = "v${version}"; - sha256 = "sha256-00KvbiTf8PxYWljLKTRZmPIAbb+PnBleDM4p0AzZhHw="; + rev = "refs/tags/v${version}"; + hash = "sha256-KU1JVNEQJadXNiIWTvI33N2NSq994xoKxcAGGezFjaI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sha256 = "sha256-4y/jeEZjVUbaXtBx5l3Hrbnj3iNYX089K4xexRP+5v0="; + hash = "sha256-w1bEf+etLgR/YOyLmC3lFtO9fqAx8z2aul/XIKUQb5k="; }; nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + buildInputs = lib.optional stdenv.isDarwin libiconv; - checkInputs = [ + nativeCheckInputs = [ brotli + hypothesis lz4 memory_profiler numpy + py pytest-benchmark pytestCheckHook python-snappy zstd ]; - pytestFlagsArray = [ "--benchmark-disable" ]; - pythonImportsCheck = [ "cramjam" ]; + + pytestFlagsArray = [ + "--benchmark-disable" + ]; + + disabledTestPaths = [ + "benchmarks/test_bench.py" + ]; + + pythonImportsCheck = [ + "cramjam" + ]; meta = with lib; { description = "Thin Python bindings to de/compression algorithms in Rust"; diff --git a/pkgs/development/python-modules/crashtest/default.nix b/pkgs/development/python-modules/crashtest/default.nix index da01d77cd072..d8bd8c95b8d6 100644 --- a/pkgs/development/python-modules/crashtest/default.nix +++ b/pkgs/development/python-modules/crashtest/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "crashtest"; - version = "0.4.0"; + version = "0.4.1"; disabled = !(pythonAtLeast "3.6"); src = fetchPypi { inherit pname version; - sha256 = "sha256-1imwDx1OecMWkJ9Ot2O7yym1ENZfveE2Whzrk6t/pMg="; + sha256 = "sha256-gNex8xbr+9Qp9kgHbWJ1yHe6MLpIl53kGRcUp1Jm8M4="; }; # has tests, but only on GitHub, however the pyproject build fails for me diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index fd49ab8bfd63..5ba9a0f7695a 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -6,17 +6,18 @@ , isPy3k , sqlalchemy , pytestCheckHook +, pytz , stdenv }: buildPythonPackage rec { pname = "crate"; - version = "0.27.2"; + version = "0.29.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ch4O3enHlQ+XO6+r7cnptrGJwnElHp07UubJuErft6U="; + sha256 = "sha256-SywW/b4DnVeSzzRiHbDaKTjcuwDnkwrK6vFfaQVIZhQ="; }; propagatedBuildInputs = [ @@ -25,8 +26,9 @@ buildPythonPackage rec { geojson ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook + pytz ]; disabledTests = [ diff --git a/pkgs/development/python-modules/crccheck/default.nix b/pkgs/development/python-modules/crccheck/default.nix index a75a0c9611b4..0a9302b8841d 100644 --- a/pkgs/development/python-modules/crccheck/default.nix +++ b/pkgs/development/python-modules/crccheck/default.nix @@ -1,25 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, nose }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, unittestCheckHook +}: let pname = "crccheck"; - version = "1.1"; + version = "1.3.0"; in buildPythonPackage { inherit pname version; - - checkInputs = [ nose ]; - - src = fetchPypi { - inherit pname version; - sha256 = "45962231cab62b82d05160553eebd9b60ef3ae79dc39527caef52e27f979fa96"; - }; + format = "setuptools"; disabled = !isPy3k; + src = fetchFromGitHub { + owner = "MartinScharrer"; + repo = "crccheck"; + rev = "refs/tags/v${version}"; + hash = "sha256-nujt3RWupvCtk7gORejtSwqqVjW9VwztOVGXBHW9T+k="; + }; + + nativeCheckInputs = [ + unittestCheckHook + ]; + meta = with lib; { description = "Python library for CRCs and checksums"; - homepage = "https://sourceforge.net/projects/crccheck/"; - license = licenses.gpl3Plus; + homepage = "https://github.com/MartinScharrer/crccheck"; + license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.linux; }; diff --git a/pkgs/development/python-modules/crcmod/default.nix b/pkgs/development/python-modules/crcmod/default.nix index 082369baf73a..70053eb16713 100644 --- a/pkgs/development/python-modules/crcmod/default.nix +++ b/pkgs/development/python-modules/crcmod/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for generating objects that compute the Cyclic Redundancy Check (CRC)"; - homepage = "http://crcmod.sourceforge.net/"; + homepage = "https://crcmod.sourceforge.net/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index 559af64fe83e..fcd9247ae1e5 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { pname = "croniter"; - version = "1.3.7"; + version = "1.3.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-cu940PgzfrNTk7iJPr+/vrNA8tKuR+DS14Ew40sN2Lk="; + hash = "sha256-MqXsBOl+wIN7zfATdnq9LnHM7u/TwuFMgECYzlGtbNk="; }; propagatedBuildInputs = [ python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytz tzlocal diff --git a/pkgs/development/python-modules/cronsim/default.nix b/pkgs/development/python-modules/cronsim/default.nix index dc9caf3f53c0..ef4e533a977c 100644 --- a/pkgs/development/python-modules/cronsim/default.nix +++ b/pkgs/development/python-modules/cronsim/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-ebFYIOANXZLmM6cbovwBCJH8Wr/HlJbOR9YGp8Jw7pc="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/crossplane/default.nix b/pkgs/development/python-modules/crossplane/default.nix index 195e733ee874..20b4d4204f4c 100644 --- a/pkgs/development/python-modules/crossplane/default.nix +++ b/pkgs/development/python-modules/crossplane/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-DfIF+JvjIREi7zd5ZQ7Co/CIKC5iUeOgR/VLDPmrtTQ="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/crownstone-cloud/default.nix b/pkgs/development/python-modules/crownstone-cloud/default.nix index 8b02eaa58961..632f0812f00e 100644 --- a/pkgs/development/python-modules/crownstone-cloud/default.nix +++ b/pkgs/development/python-modules/crownstone-cloud/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { certifi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/crownstone-core/default.nix b/pkgs/development/python-modules/crownstone-core/default.nix index 0f793480ebcd..544eb25adaa4 100644 --- a/pkgs/development/python-modules/crownstone-core/default.nix +++ b/pkgs/development/python-modules/crownstone-core/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pyaes ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cryptg/default.nix b/pkgs/development/python-modules/cryptg/default.nix index 3d321a0a41c2..ab5996351996 100644 --- a/pkgs/development/python-modules/cryptg/default.nix +++ b/pkgs/development/python-modules/cryptg/default.nix @@ -1,9 +1,11 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder , rustPlatform , setuptools-rust +, libiconv }: buildPythonPackage rec { @@ -32,6 +34,10 @@ buildPythonPackage rec { rust.cargo ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; + # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/cryptography/cryptography-py27-warning.patch b/pkgs/development/python-modules/cryptography/cryptography-py27-warning.patch deleted file mode 100644 index 8233af78a9de..000000000000 --- a/pkgs/development/python-modules/cryptography/cryptography-py27-warning.patch +++ /dev/null @@ -1,14 +0,0 @@ -Delete the warning that breaks tests of dependent projects. - ---- a/src/cryptography/__init__.py -+++ b/src/cryptography/__init__.py -@@ -33,9 +32,0 @@ __all__ = [ -- --if sys.version_info[0] == 2: -- warnings.warn( -- "Python 2 is no longer supported by the Python core team. Support for " -- "it is now deprecated in cryptography, and will be removed in the " -- "next release.", -- CryptographyDeprecationWarning, -- stacklevel=2, -- ) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index c80e9a119941..b8cf310a06ee 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -18,6 +18,7 @@ , pretend , libiconv , iso8601 +, py , pytz , hypothesis }: @@ -27,19 +28,20 @@ let in buildPythonPackage rec { pname = "cryptography"; - version = "38.0.1"; # Also update the hash in vectors.nix + version = "38.0.4"; # Also update the hash in vectors.nix + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-HbPYB6FJMfoxf5ZDVpXZ7Dhr57hLYYzGHPpdCLCuM9c="; + hash = "sha256-F1wagYuHyayAu3N39VILfzGz7yoABOJCAxm+re22cpA="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-o8l13fnfEUvUdDasq3LxSPArozRHKVsZfQg9DNR6M6Q="; + hash = "sha256-BN0kOblUwgHj5QBf52RY2Jx0nBn03lwoN1O5PEohbwY="; }; cargoRoot = "src/rust"; @@ -58,11 +60,13 @@ buildPythonPackage rec { cffi ]; - checkInputs = [ + nativeCheckInputs = [ cryptography-vectors - hypothesis + # "hypothesis" indirectly depends on cryptography to build its documentation + (hypothesis.override { enableDocumentation = false; }) iso8601 pretend + py pytestCheckHook pytest-benchmark pytest-subtests diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 7f33c6cb84f3..31ace7c48ffd 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -4,11 +4,12 @@ buildPythonPackage rec { pname = "cryptography-vectors"; # The test vectors must have the same version as the cryptography package inherit (cryptography) version; + format = "setuptools"; src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-BDH9EHwfutA3dwSnBRlFs7ORFp/dxPb6C9TtxrbiNd0="; + hash = "sha256-bsYmlb7F34ECiN3OrpmK5pHNuKFigI1svJYNPeuafbE="; }; # No tests included diff --git a/pkgs/development/python-modules/cryptolyzer/default.nix b/pkgs/development/python-modules/cryptolyzer/default.nix index 2fd90b23bee0..5928a9b90ecf 100644 --- a/pkgs/development/python-modules/cryptolyzer/default.nix +++ b/pkgs/development/python-modules/cryptolyzer/default.nix @@ -1,22 +1,26 @@ { lib -, buildPythonPackage -, fetchPypi -, certvalidator , attrs +, buildPythonPackage +, certvalidator +, cryptoparser +, fetchPypi +, pythonOlder +, requests , six , urllib3 -, cryptoparser -, requests }: buildPythonPackage rec { pname = "cryptolyzer"; - version = "0.8.1"; + version = "0.8.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "CryptoLyzer"; inherit version; - sha256 = "sha256-FbxSjKxhzlpj3IezuLCQvoeZMG1q+OE/yn5vB/XE1rI="; + hash = "sha256-Bo8w9ijJu9IWdgr8OQws2iErzmuxUhs9YE6NAydPYgM="; }; propagatedBuildInputs = [ @@ -28,13 +32,17 @@ buildPythonPackage rec { requests ]; - doCheck = false; # Tests require networking + # Tests require networking + doCheck = false; - pythonImportsCheck = [ "cryptolyzer" ]; + pythonImportsCheck = [ + "cryptolyzer" + ]; meta = with lib; { - description = "Fast and flexible cryptographic protocol analyzer"; + description = "Cryptographic protocol analyzer"; homepage = "https://gitlab.com/coroner/cryptolyzer"; + changelog = "https://gitlab.com/coroner/cryptolyzer/-/blob/v${version}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ kranzes ]; }; diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index cfac7f20376e..c4771b394994 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cryptoparser"; - version = "0.8.0"; + version = "0.8.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kJg8d1PoGIC0feefbJM8oyXcRyMGdg1wWkQUl/nSNCo="; + hash = "sha256-eLQNqeCUnjcxWbazhWHtqJJgvPUMH42fboU5y2ZMy44="; }; propagatedBuildInputs = [ @@ -23,11 +23,14 @@ buildPythonPackage rec { python-dateutil ]; - pythonImportsCheck = [ "cryptoparser" ]; + pythonImportsCheck = [ + "cryptoparser" + ]; meta = with lib; { - description = "Fast and flexible security protocol parser and generator"; + description = "Security protocol parser and generator"; homepage = "https://gitlab.com/coroner/cryptoparser"; + changelog = "https://gitlab.com/coroner/cryptoparser/-/blob/v${version}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ kranzes ]; }; diff --git a/pkgs/development/python-modules/crysp/default.nix b/pkgs/development/python-modules/crysp/default.nix index 34f5d2c2f35c..dd8d43eac84b 100644 --- a/pkgs/development/python-modules/crysp/default.nix +++ b/pkgs/development/python-modules/crysp/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { matplotlib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix index d09fccfe5e10..5133f1642e13 100644 --- a/pkgs/development/python-modules/crytic-compile/default.nix +++ b/pkgs/development/python-modules/crytic-compile/default.nix @@ -1,14 +1,15 @@ { lib , buildPythonPackage +, cbor2 , fetchFromGitHub +, pycryptodome , pythonOlder -, pysha3 , setuptools }: buildPythonPackage rec { pname = "crytic-compile"; - version = "0.2.4"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,14 +18,16 @@ buildPythonPackage rec { owner = "crytic"; repo = "crytic-compile"; rev = "refs/tags/${version}"; - hash = "sha256-phb4Y8CUxuHsNt43oKsgDAZTraNauPkcYQtzcsiWyy8="; + hash = "sha256-4iTvtu2TmxvLTyWm4PV0+yV1fRLYpJHZNBgjy1MFLjM="; }; propagatedBuildInputs = [ - pysha3 + cbor2 + pycryptodome setuptools ]; + # Test require network access doCheck = false; pythonImportsCheck = [ @@ -34,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Abstraction layer for smart contract build systems"; homepage = "https://github.com/crytic/crytic-compile"; + changelog = "https://github.com/crytic/crytic-compile/releases/tag/${version}"; license = licenses.agpl3Plus; maintainers = with maintainers; [ SuperSandro2000 arturcygan ]; }; diff --git a/pkgs/development/python-modules/cssselect/default.nix b/pkgs/development/python-modules/cssselect/default.nix index 04b6dc36afab..0accd8c6cbae 100644 --- a/pkgs/development/python-modules/cssselect/default.nix +++ b/pkgs/development/python-modules/cssselect/default.nix @@ -1,17 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, pytestCheckHook +, lxml +}: buildPythonPackage rec { pname = "cssselect"; - version = "1.1.0"; + version = "1.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc"; + sha256 = "666b19839cfaddb9ce9d36bfe4c969132c647b92fc9088c4e23f786b30f1b3dc"; }; - # AttributeError: 'module' object has no attribute 'tests' - doCheck = false; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + lxml + ]; + + pythonImportsCheck = [ + "cssselect" + ]; meta = with lib; { + description = "CSS Selectors for Python"; + homepage = "https://cssselect.readthedocs.io/"; + changelog = "https://github.com/scrapy/cssselect/v${version}//CHANGES"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index 5904f80ac2a2..16a1a1609568 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "cssselect2"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-W11t6oGl6wyco58RbIV43UE3eAYMlMH1EZY3FhiQkyU="; + sha256 = "sha256-HM2YTauJ/GiVUEOspOGwPgzynK2YgPbijjunp0sUqlo="; }; postPatch = '' @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tinycss2 ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "cssselect2" ]; diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix index 4bac08d665d6..0f37366ed7f2 100644 --- a/pkgs/development/python-modules/cssutils/default.nix +++ b/pkgs/development/python-modules/cssutils/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ cssselect jaraco-test lxml diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix index 7ae79f4ec59f..3a973db3baa8 100644 --- a/pkgs/development/python-modules/csvw/default.nix +++ b/pkgs/development/python-modules/csvw/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { uritemplate ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; diff --git a/pkgs/development/python-modules/cu2qu/default.nix b/pkgs/development/python-modules/cu2qu/default.nix new file mode 100644 index 000000000000..ddad0b741b1e --- /dev/null +++ b/pkgs/development/python-modules/cu2qu/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi + +# build +, cython +, setuptools-scm +, setuptools + +# propagates +, defcon +, fonttools + +# tests +, pytestCheckHook +}: + +let + pname = "cu2qu"; + version = "1.6.7.post2"; +in +buildPythonPackage rec { + inherit pname version; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-HfVi2ZvWBZImCI9ENwK/Uc/djMY2I/IxN0WaeNe/WAg="; + extension = "zip"; + }; + + nativeBuildInputs = [ + cython + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + defcon + fonttools + ] ++ fonttools.optional-dependencies.ufo; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/googlefonts/cu2qu/releases/tag/v${version}"; + description = "Cubic-to-quadratic bezier curve conversion"; + homepage = "https://github.com/googlefonts/cu2qu"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix index f286cd4a7f02..b0cdc10735b9 100644 --- a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix +++ b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix @@ -1,4 +1,10 @@ -{ lib, fetchPypi, buildPythonPackage, pytest, pytest-html }: +{ lib +, fetchPypi +, buildPythonPackage +, py +, pytestCheckHook +, pytest-html + }: buildPythonPackage rec { pname = "cucumber-tag-expressions"; @@ -9,11 +15,14 @@ buildPythonPackage rec { sha256 = "e314d5fed6eebb2f90380271f562248fb15e18636764faf40f4dde4b28b1f960"; }; - checkInputs = [ pytest pytest-html ]; - checkPhase = "pytest tests/*/*.py"; + nativeCheckInputs = [ + py + pytestCheckHook + pytest-html + ]; meta = with lib; { - homepage = "https://github.com/cucumber/tag-expressions-python"; + homepage = "https://github.com/cucumber/tag-expressions"; description = "Provides tag-expression parser for cucumber/behave"; license = licenses.mit; maintainers = with maintainers; [ maxxk ]; diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix index 42f1d77b12b9..53d0d78cc09d 100644 --- a/pkgs/development/python-modules/cufflinks/default.nix +++ b/pkgs/development/python-modules/cufflinks/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { statsmodels ]; - checkInputs = [ pytest nose ]; + nativeCheckInputs = [ pytest nose ]; # ignore tests which are incompatible with pandas>=1.0 # https://github.com/santosjorge/cufflinks/issues/236 diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 9bc7efafff54..33758514a88c 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,20 +1,29 @@ -{ lib, buildPythonPackage -, fetchPypi, isPy3k, cython -, fastrlock, numpy, six, wheel, pytestCheckHook, mock, setuptools +{ lib +, buildPythonPackage +, fetchPypi +, cython +, fastrlock +, numpy +, wheel +, pytestCheckHook +, mock +, setuptools , cudaPackages , addOpenGLRunpath +, pythonOlder }: let inherit (cudaPackages) cudatoolkit cudnn cutensor nccl; in buildPythonPackage rec { pname = "cupy"; - version = "11.2.0"; - disabled = !isPy3k; + version = "11.5.0"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wzNh8RejR6Y/aZbql0RtF/HAOPGh9TPlAkZCNQdpI+I="; + hash = "sha256-S8hWW97SLMibIQ/Z+0il1TFvMHAeErsjhSpgMU4fn24="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both @@ -42,12 +51,11 @@ in buildPythonPackage rec { nccl fastrlock numpy - six setuptools wheel ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ]; @@ -67,6 +75,7 @@ in buildPythonPackage rec { meta = with lib; { description = "A NumPy-compatible matrix library accelerated by CUDA"; homepage = "https://cupy.chainer.org/"; + changelog = "https://github.com/cupy/cupy/releases/tag/v${version}"; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ hyphon81 ]; diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix index 7a66e4796648..19a09d100e25 100644 --- a/pkgs/development/python-modules/curio/default.nix +++ b/pkgs/development/python-modules/curio/default.nix @@ -9,15 +9,16 @@ buildPythonPackage rec { pname = "curio"; - version = "1.5"; + version = "1.6"; + format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-rwghLlkLt9qOTMOcQgEnEUlNwg1iLxYhVbopbMLjvBA="; + sha256 = "sha256-VipYbbICFrp9K+gmPeuesHnlYEj5uJBtEdX0WqgcUkc="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook sphinx ]; @@ -37,8 +38,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "curio" ]; meta = with lib; { - homepage = "https://github.com/dabeaz/curio"; description = "Library for performing concurrent I/O with coroutines in Python"; + homepage = "https://github.com/dabeaz/curio"; + changelog = "https://github.com/dabeaz/curio/raw/${version}/CHANGES"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index 2c63de46fdcd..ac36041deb2b 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { backports-cached-property ]; - checkInputs = [ + nativeCheckInputs = [ pyte pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cvelib/default.nix b/pkgs/development/python-modules/cvelib/default.nix index fc81da016f66..6d9efc36e406 100644 --- a/pkgs/development/python-modules/cvelib/default.nix +++ b/pkgs/development/python-modules/cvelib/default.nix @@ -1,32 +1,52 @@ -{ buildPythonPackage -, fetchFromGitHub -, requests +{ lib +, buildPythonPackage , click -, lib +, fetchFromGitHub +, jsonschema +, pytestCheckHook +, pythonOlder +, requests +, testers +, cve }: buildPythonPackage rec { pname = "cvelib"; - version = "1.0.0"; + version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "RedHatProductSecurity"; repo = "cvelib"; rev = "tags/${version}"; - sha256 = "sha256-KUj9Cnvl7r8NMmZvVj5CB0uZvLNK5aHcLc+NzxFrv0I="; + hash = "sha256-8qlXwEbgLRZ1qYtBJ1c0nv6qfIOW5zAK9eOS+n+afWQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; - propagatedBuildInputs = [ requests click ]; + + propagatedBuildInputs = [ + click + jsonschema + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "cvelib" ]; + passthru.tests.version = testers.testVersion { package = cve; }; + meta = with lib; { - description = "A library and a command line interface for the CVE Services API"; + description = "Library and a command line interface for the CVE Services API"; homepage = "https://github.com/RedHatProductSecurity/cvelib"; license = licenses.mit; maintainers = with maintainers; [ raboof ]; + mainProgram = "cve"; }; } diff --git a/pkgs/development/python-modules/cvss/default.nix b/pkgs/development/python-modules/cvss/default.nix new file mode 100644 index 000000000000..9f4979c53265 --- /dev/null +++ b/pkgs/development/python-modules/cvss/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, jsonschema +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "cvss"; + version = "2.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "RedHatProductSecurity"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-gD9MreJQPaxziy02Wt3BGFiIoQ/+pW3KqiNfNlTijJY="; + }; + + nativeCheckInputs = [ + jsonschema + pytestCheckHook + ]; + + pythonImportsCheck = [ + "cvss" + ]; + + disabledTests = [ + # Tests require additional data + "test_calculator" + "test_cvsslib" + "test_json_ordering" + "test_json_schema_repr" + "test_random" + "test_rh_vector" + "test_simple" + "test_simple_31" + ]; + + meta = with lib; { + description = "Library for CVSS2/3"; + homepage = "https://github.com/RedHatProductSecurity/cvss"; + changelog = "https://github.com/RedHatProductSecurity/cvss/releases/tag/v${version}"; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 31772c269353..c546d11ec3f6 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -1,8 +1,10 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchPypi , isPyPy , python +, openblas , blas , lapack # build segfaults with 64-bit blas , suitesparse @@ -28,13 +30,23 @@ buildPythonPackage rec { sha256 = "sha256-ALGyMvnR+QLVeKnXWBS2f6AgdY1a5CLijKjO9iafpcY="; }; - buildInputs = [ blas lapack ]; + buildInputs = (if stdenv.isDarwin then [ openblas ] else [ blas lapack ]); + doCheck = !stdenv.isDarwin; # similar to Gsl, glpk, fftw there is also a dsdp interface # but dsdp is not yet packaged in nixpkgs - preConfigure = '' + preConfigure = (if stdenv.isDarwin then + '' + export CVXOPT_BLAS_LIB=openblas + export CVXOPT_LAPACK_LIB=openblas + '' + else + '' export CVXOPT_BLAS_LIB=blas export CVXOPT_LAPACK_LIB=lapack + '') + + '' + export CVXOPT_BUILD_DSDP=0 export CVXOPT_SUITESPARSE_LIB_DIR=${lib.getLib suitesparse}/lib export CVXOPT_SUITESPARSE_INC_DIR=${lib.getDev suitesparse}/include '' + lib.optionalString withGsl '' @@ -51,7 +63,7 @@ buildPythonPackage rec { export CVXOPT_FFTW_INC_DIR=${fftw.dev}/include ''; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index da5f16d7f32d..3fd18bd03007 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -17,16 +17,21 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.2.1"; + version = "1.2.3"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bWdkJkPR3bLyr1m0Zrh9QsSi42eDGte0PDO1nu+ltQ4="; + hash = "sha256-IaeUtv0vdgqddm1o++SUZTT2Xom3Pom4icVQOYVVi4Y="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "setuptools <= 64.0.2" "setuptools" + ''; + propagatedBuildInputs = [ cvxopt ecos @@ -43,7 +48,7 @@ buildPythonPackage rec { export LDFLAGS="-lgomp" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "./cvxpy" ]; diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix index fc57df26230a..03b7d8422479 100644 --- a/pkgs/development/python-modules/cwcwidth/default.nix +++ b/pkgs/development/python-modules/cwcwidth/default.nix @@ -2,17 +2,17 @@ buildPythonPackage rec { pname = "cwcwidth"; - version = "0.1.7"; + version = "0.1.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wNZH4S46SxWogeHYT3lpN1FmSEieARJXI33CF51rGVE="; + sha256 = "sha256-WtwDS3yQ5qhYa9BGvL9gBONeFrDX4x3jlVE6UNcpu/Y="; }; nativeBuildInputs = [ cython setuptools ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' # Hack needed to make pytest + cython work # https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298 diff --git a/pkgs/development/python-modules/cwl-upgrader/default.nix b/pkgs/development/python-modules/cwl-upgrader/default.nix new file mode 100644 index 000000000000..9190cf882d1e --- /dev/null +++ b/pkgs/development/python-modules/cwl-upgrader/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-xdist +, pytestCheckHook +, pythonOlder +, ruamel-yaml +, schema-salad +}: + +buildPythonPackage rec { + pname = "cwl-upgrader"; + version = "1.2.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "common-workflow-language"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-3pKnkU8lks3w+N7w2qST9jr4/CS6YzgnBVLTlgq1gf0="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "ruamel.yaml >= 0.15, < 0.17.22" "ruamel.yaml" \ + --replace "setup_requires=PYTEST_RUNNER," "" + sed -i "/ruamel.yaml/d" setup.py + ''; + + propagatedBuildInputs = [ + ruamel-yaml + schema-salad + ]; + + nativeCheckInputs = [ + pytest-xdist + pytestCheckHook + ]; + + pythonImportsCheck = [ + "cwlupgrader" + ]; + + meta = with lib; { + description = "Library to interface with Yolink"; + homepage = "https://github.com/common-workflow-language/cwl-utils"; + changelog = "https://github.com/common-workflow-language/cwl-utils/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/cwl-utils/default.nix b/pkgs/development/python-modules/cwl-utils/default.nix new file mode 100644 index 000000000000..2f605950bc59 --- /dev/null +++ b/pkgs/development/python-modules/cwl-utils/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, cachecontrol +, cwl-upgrader +, cwlformat +, fetchFromGitHub +, packaging +, pytest-mock +, pytest-xdist +, pytestCheckHook +, pythonOlder +, rdflib +, requests +, schema-salad +}: + +buildPythonPackage rec { + pname = "cwl-utils"; + version = "0.22"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "common-workflow-language"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-vOIheOcDG8qdPtcN0kkBN3URodknDLTC7BzYGIiD2RA="; + }; + + propagatedBuildInputs = [ + cachecontrol + cwl-upgrader + packaging + rdflib + requests + schema-salad + ]; + + nativeCheckInputs = [ + cwlformat + pytest-mock + pytest-xdist + pytestCheckHook + ]; + + pythonImportsCheck = [ + "cwl_utils" + ]; + + disabledTests = [ + # Don't run tests which require Node.js + "test_context_multiple_regex" + "test_value_from_two_concatenated_expressions" + "test_graph_split" + "test_caches_js_processes" + "test_load_document_with_remote_uri" + ]; + + meta = with lib; { + description = "Utilities for CWL"; + homepage = "https://github.com/common-workflow-language/cwl-utils"; + changelog = "https://github.com/common-workflow-language/cwl-utils/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/cwlformat/default.nix b/pkgs/development/python-modules/cwlformat/default.nix new file mode 100644 index 000000000000..28da8e50beeb --- /dev/null +++ b/pkgs/development/python-modules/cwlformat/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, ruamel-yaml +}: + +buildPythonPackage rec { + pname = "cwlformat"; + version = "2022.02.18"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "rabix"; + repo = "cwl-format"; + rev = "refs/tags/${version}"; + hash = "sha256-FI8hUgb/KglTkubZ+StzptoSsYal71ITyyFNg7j48yk="; + }; + + propagatedBuildInputs = [ + ruamel-yaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "cwlformat" + ]; + + meta = with lib; { + description = "Code formatter for CWL"; + homepage = "https://github.com/rabix/cwl-format"; + changelog = "https://github.com/rabix/cwl-format/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index cb4f7e074ffa..c039222925e4 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cx-freeze"; - version = "6.11.1"; + version = "6.13.1"; src = fetchPypi { pname = "cx_Freeze"; inherit version; - sha256 = "sha256-jzowyeM5TykGVeNG07RgkQZWswrGNHqHSZu1rTZcbnw="; + sha256 = "sha256-9pT1Ta8pLpc9krFN8KLp3b10IGyvMjiaU3Cn4eVAiaQ="; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/cycler/default.nix b/pkgs/development/python-modules/cycler/default.nix index b9bd167c6a94..9df059251241 100644 --- a/pkgs/development/python-modules/cycler/default.nix +++ b/pkgs/development/python-modules/cycler/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "9c87405839a19696e837b3b818fed3f5f69f16f1eec1a1ad77e043dcea9c772f"; }; - checkInputs = [ coverage nose ]; + nativeCheckInputs = [ coverage nose ]; propagatedBuildInputs = [ six ]; checkPhase = '' diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index a2d94a8dbaaa..c2340dbced0e 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "3.1.0"; + version = "3.1.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pbwhjxlEdne426CiUORSM8w6MXpgpjMWoH37TnXxA5s="; + hash = "sha256-4lA8OdmvQD94jTeDf+Iz7ZyEQ9fZzCxnXQG9Ir8FKhk="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { types-toml ]; - checkInputs = [ + nativeCheckInputs = [ ddt jsonschema lxml @@ -64,7 +64,9 @@ buildPythonPackage rec { export PYTHONPATH=tests''${PYTHONPATH+:$PYTHONPATH} ''; - pytestFlagsArray = [ "tests/" ]; + pytestFlagsArray = [ + "tests/" + ]; disabledTests = [ # These tests require network access. @@ -75,6 +77,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for generating CycloneDX SBOMs"; homepage = "https://github.com/CycloneDX/cyclonedx-python-lib"; + changelog = "https://github.com/CycloneDX/cyclonedx-python-lib/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index f01011156273..bb78eb5eb20f 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -7,25 +7,34 @@ buildPythonPackage rec { pname = "cymem"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "explosion"; repo = "cymem"; - rev = "v${version}"; - sha256 = "sha256-o+44v6wvE9HxeQaDDQ0+gi7z1V7jtkZvWglY8UyVHLg="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-lYMRFFMS+ETjWd4xi12ezC8CVLbLJfynmOU1DpYQcck="; }; propagatedBuildInputs = [ cython ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; preCheck = '' - cd cymem + TEMPDIR=$(mktemp -d) + cp -R cymem/tests $TEMPDIR/ + pushd $TEMPDIR ''; + postCheck = '' + popd + ''; + + meta = with lib; { description = "Cython memory pool for RAII-style memory management"; homepage = "https://github.com/explosion/cymem"; diff --git a/pkgs/development/python-modules/cypherpunkpay/default.nix b/pkgs/development/python-modules/cypherpunkpay/default.nix index 8ef0f4cac78c..77b7031db351 100644 --- a/pkgs/development/python-modules/cypherpunkpay/default.nix +++ b/pkgs/development/python-modules/cypherpunkpay/default.nix @@ -36,7 +36,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'monero = "^0.99"' 'monero = ">=0.99"' \ + --replace "bitstring = '^3.1.9'" "bitstring = '>=3.1.9'" \ + --replace 'cffi = "1.15.0"' 'cffi = ">=1.15.0"' \ + --replace 'ecdsa = "^0.17.0"' 'ecdsa = ">=0.17.0"' \ --replace 'pypng = "^0.0.20"' 'pypng = ">=0.0.20"' \ --replace 'tzlocal = "2.1"' 'tzlocal = ">=2.1"' ''; @@ -62,7 +64,7 @@ buildPythonPackage rec { yoyo-migrations ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-cov webtest @@ -70,22 +72,26 @@ buildPythonPackage rec { disabledTestPaths = [ # performance test - "test/unit/tools/pbkdf2_test.py" + "tests/unit/tools/pbkdf2_test.py" # tests require network connection - "test/network/explorers/bitcoin" - "test/network/net/http_client" - "test/network/prices" + "tests/network/explorers/bitcoin" + "tests/network/monero/monero_address_transactions_db_test.py" + "tests/network/net/http_client" + "tests/network/prices" # tests require bitcoind running - "test/network/full_node_clients" + "tests/network/full_node_clients" # tests require lnd running - "test/network/ln" + "tests/network/ln" # tests require tor running - "test/network/net/tor_client" + "tests/network/monero/monero_test.py" + "tests/network/net/tor_client" + "tests/network/usecases/calc_monero_address_credits_uc_test.py" + "tests/network/usecases/fetch_monero_txs_from_open_node_uc_test.py" # tests require the full environment running - "test/acceptance/views" - "test/acceptance/views_admin" - "test/acceptance/views_donations" - "test/acceptance/views_dummystore" + "tests/acceptance/views" + "tests/acceptance/views_admin" + "tests/acceptance/views_donations" + "tests/acceptance/views_dummystore" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index 42305b455799..314f27f17dc1 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "cytoolz"; - version = "0.12.0"; + version = "0.12.1"; disabled = isPy27 || isPyPy; src = fetchPypi { inherit pname version; - sha256 = "sha256-wQWwX4XgP7zWAkQ3WWjmLkT+eYwVo1Mcki1TEBjSJBI="; + sha256 = "sha256-/DOQk5dIHJDePOyDG/uI2X4iDckZOdmWkgIC8YS0ZI4="; }; nativeBuildInputs = [ cython ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { homepage = "https://github.com/pytoolz/cytoolz/"; diff --git a/pkgs/development/python-modules/d2to1/default.nix b/pkgs/development/python-modules/d2to1/default.nix index 8a48ddcb13af..eaad9fc9095b 100644 --- a/pkgs/development/python-modules/d2to1/default.nix +++ b/pkgs/development/python-modules/d2to1/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "d2to1"; version = "0.2.12.post1"; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; src = fetchFromGitHub { owner = "embray"; diff --git a/pkgs/development/python-modules/dacite/default.nix b/pkgs/development/python-modules/dacite/default.nix index ba74695fb5ea..a33a26d5224d 100644 --- a/pkgs/development/python-modules/dacite/default.nix +++ b/pkgs/development/python-modules/dacite/default.nix @@ -2,13 +2,12 @@ , fetchFromGitHub , buildPythonPackage , pythonOlder -, pythonAtLeast , pytestCheckHook }: buildPythonPackage rec { pname = "dacite"; - version = "1.6.0"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,26 +15,31 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "konradhalas"; repo = pname; - rev = "v${version}"; - sha256 = "0nv2bnj3bq2v08ac4p583cnpjq2d6bv5isycgji5i5wg1y082a3d"; + rev = "refs/tags/v${version}"; + hash = "sha256-aQwQHFWaXwTaA6GQgDcWT6ivE9YtWtHCTOtxDi503+M="; }; - checkInputs = [ - pytestCheckHook - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--benchmark-autosave --benchmark-json=benchmark.json" "" + ''; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ - # https://github.com/konradhalas/dacite/issues/167 - "test_from_dict_with_union_and_wrong_data" + nativeCheckInputs = [ + pytestCheckHook ]; pythonImportsCheck = [ "dacite" ]; + disabledTestPaths = [ + "tests/performance" + ]; + meta = with lib; { description = "Python helper to create data classes from dictionaries"; homepage = "https://github.com/konradhalas/dacite"; + changelog = "https://github.com/konradhalas/dacite/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/daemonocle/default.nix b/pkgs/development/python-modules/daemonocle/default.nix index 0bdc795159ca..e673dd1adf5d 100644 --- a/pkgs/development/python-modules/daemonocle/default.nix +++ b/pkgs/development/python-modules/daemonocle/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook lsof ]; diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index e4bbb16abbe9..70150799f5f0 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { twisted ] ++ twisted.optional-dependencies.tls; - checkInputs = [ + nativeCheckInputs = [ django hypothesis pytest-asyncio diff --git a/pkgs/development/python-modules/dasbus/default.nix b/pkgs/development/python-modules/dasbus/default.nix index 96a4eccbc582..a7e0b754273f 100644 --- a/pkgs/development/python-modules/dasbus/default.nix +++ b/pkgs/development/python-modules/dasbus/default.nix @@ -1,16 +1,20 @@ -{ lib, buildPythonPackage, fetchPypi, pygobject3, dbus }: +{ lib, buildPythonPackage, fetchFromGitHub, pygobject3, dbus, hatchling, pytestCheckHook }: buildPythonPackage rec { pname = "dasbus"; - version = "1.6"; + version = "unstable-11-10-2022"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-FJrY/Iw9KYMhq1AVm1R6soNImaieR+IcbULyyS5W6U0="; + src = fetchFromGitHub { + owner = "rhinstaller"; + repo = pname; + rev = "64b6b4d9e37cd7e0cbf4a7bf75faa7cdbd01086d"; + hash = "sha256-TmhhDrfpP+nUErAd7dUb+RtGBRtWwn3bYOoIqa0VRoc="; }; + nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ pygobject3 ]; - checkInputs = [ dbus ]; + nativeCheckInputs = [ dbus pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/rhinstaller/dasbus"; diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 232cfb0b7f7d..5140a0a6cbc6 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.6.2"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-d2p3ahOqBA4n8XhMR6juluEGNM5EyT+GQFlDcuHZMqs="; + hash = "sha256-kxat6CjX4xPEtlhRiYJF5wN2Luds7DduZyiUA9/kKWY="; }; propagatedBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock mock diff --git a/pkgs/development/python-modules/dask-gateway/default.nix b/pkgs/development/python-modules/dask-gateway/default.nix index a9dae9638b93..af38853ef2c8 100644 --- a/pkgs/development/python-modules/dask-gateway/default.nix +++ b/pkgs/development/python-modules/dask-gateway/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "dask-gateway"; # update dask-gateway lock step with dask-gateway-server - version = "2022.6.1"; + version = "2023.1.1"; format = "pyproject"; src = fetchFromGitHub { owner = "dask"; repo = "dask-gateway"; rev = "refs/tags/${version}"; - hash = "sha256-PsagZdEPpeuZH9hFL98xB5z6zOdd4Cx/skGQ0eOYkCA="; + hash = "sha256-+YCHIfNq8E2rXO8b91Q1D21dVzNWnJZIKZeY4AETa7s="; }; sourceRoot = "source/dask-gateway"; diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index d0c7b128bc09..28bcc8fbb5e8 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { sparse ] ++ dask.optional-dependencies.array; - checkInputs = [ + nativeCheckInputs = [ sparse pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index 7f278b50a592..b658a6e8dbe7 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pims ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook scikitimage ]; diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index c014f0f3c2c3..6061b294734c 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { docrep ]; - checkInputs = [ + nativeCheckInputs = [ cryptography pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/dask-yarn/default.nix b/pkgs/development/python-modules/dask-yarn/default.nix index 6f4886d409fc..b9204f0eb839 100644 --- a/pkgs/development/python-modules/dask-yarn/default.nix +++ b/pkgs/development/python-modules/dask-yarn/default.nix @@ -1,18 +1,21 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage +, dask +, distributed , fetchFromGitHub +, grpcio , pytestCheckHook , pythonOlder -, distributed -, dask -, grpcio , skein }: buildPythonPackage rec { pname = "dask-yarn"; version = "0.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dask"; @@ -28,14 +31,30 @@ buildPythonPackage rec { skein ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + preCheck = '' export HOME=$TMPDIR ''; - pythonImportsCheck = [ "dask_yarn" ]; + + pythonImportsCheck = [ + "dask_yarn" + ]; + + disabledTests = [ + # skein.exceptions.DriverError: Failed to start java process + "test_basic" + "test_adapt" + "test_from_specification" + "test_from_application_id" + "test_from_current" + "test_basic_async" + "test_widget_and_html_reprs" + ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Deploy dask on YARN clusters"; longDescription = ''Dask-Yarn deploys Dask on YARN clusters, such as are found in traditional Hadoop installations. @@ -45,5 +64,6 @@ buildPythonPackage rec { homepage = "https://yarn.dask.org/"; license = licenses.bsd3; maintainers = with maintainers; [ illustris ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index e8682d020669..f859a43bd1e2 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2022.10.2"; + version = "2023.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -36,17 +36,9 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - hash = "sha256-zHJR2WjHigUMWtRJW25+gk1fKGKedU53BBjwx5zaodA="; + hash = "sha256-avyrKBAPyYZBNgItnkNCferqb6+4yeGpBAZhSkL/fFA="; }; - patches = [ - (fetchpatch { - # Fix test_repartition_npartitions on platforms other than x86-64 - url = "https://github.com/dask/dask/commit/65f40ad461c57065f981e6213e33b1d13cc9bc8f.patch"; - hash = "sha256-KyTSms4ik1kYtL+I/huAxD+zK2AAuPkwmHA9FYk601Y="; - }) - ]; - propagatedBuildInputs = [ click cloudpickle @@ -77,7 +69,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ fastparquet pyarrow pytestCheckHook diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index 24551340a0a8..b01564c7eeb3 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -1,43 +1,62 @@ { lib +, aiomysql +, aiopg +, aiosqlite +, asyncmy +, asyncpg , buildPythonPackage , fetchFromGitHub -, sqlalchemy -, aiocontextvars -, aiopg -, pythonOlder , pytestCheckHook -, pymysql -, asyncpg -, aiomysql -, aiosqlite +, pythonOlder +, sqlalchemy }: buildPythonPackage rec { pname = "databases"; - version = "0.6.1"; + version = "0.7.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "encode"; repo = pname; - rev = version; - hash = "sha256-kHsA9XpolGmtuAGzRTj61igooLG9/LBQyv7TtuqiJ/A="; + rev = "refs/tags/${version}"; + hash = "sha256-3RRHXkM8/GoIcO6Y1EZGbnp/X5gzYkW/PV4bzGay6ZI="; }; propagatedBuildInputs = [ - aiopg - aiomysql - aiosqlite - asyncpg - pymysql sqlalchemy - ] ++ lib.optionals (pythonOlder "3.7") [ - aiocontextvars ]; - checkInputs = [ + passthru.optional-dependencies = { + postgresql = [ + asyncpg + ]; + asyncpg = [ + asyncpg + ]; + aiopg = [ + aiopg + ]; + mysql = [ + aiomysql + ]; + aiomysql = [ + aiomysql + ]; + asyncmy = [ + asyncmy + ]; + sqlite = [ + aiosqlite + ]; + aiosqlite = [ + aiosqlite + ]; + }; + + nativeCheckInputs = [ pytestCheckHook ]; @@ -56,6 +75,7 @@ buildPythonPackage rec { meta = with lib; { description = "Async database support for Python"; homepage = "https://github.com/encode/databases"; + changelog = "https://github.com/encode/databases/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix index 190dac7fdc79..75f6130f7a5b 100644 --- a/pkgs/development/python-modules/databricks-cli/default.nix +++ b/pkgs/development/python-modules/databricks-cli/default.nix @@ -1,42 +1,65 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage , click -, oauthlib -, requests -, tabulate -, six , configparser -, pytest +, decorator +, fetchFromGitHub +, mock +, oauthlib +, pyjwt +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +, six +, tabulate }: buildPythonPackage rec { pname = "databricks-cli"; - version = "0.17.3"; + version = "0.17.4"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-LwDz5w6FmAnwWViF7Hb8c7pgrQzM1pVk999dlbbJAGY="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "databricks"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-srrNxiOGrU1u5shssRssr8Hwdy20U4coOAjYsT7eTSA="; }; - checkInputs = [ - pytest - ]; - - checkPhase = "pytest tests"; - # tests folder is missing in PyPI - doCheck = false; - propagatedBuildInputs = [ click - oauthlib - requests - tabulate - six configparser + oauthlib + pyjwt + requests + requests-mock + six + tabulate + ]; + + nativeCheckInputs = [ + decorator + mock + pytestCheckHook + ]; + + disabledTestPaths = [ + # Disabled due to option parsing which we don't have + "integration/dbfs/test_integration.py" + "integration/workspace/test_integration.py" + ]; + + pythonImportsCheck = [ + "databricks_cli" ]; meta = with lib; { + description = "Command line interface for Databricks"; homepage = "https://github.com/databricks/databricks-cli"; - description = "A command line interface for Databricks"; + changelog = "https://github.com/databricks/databricks-cli/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ tbenst ]; }; diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 92bbb9f54db2..fa90f3d72fa1 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "10.4.12"; + version = "10.4.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-T5KGJQryiE2+x9u+AcvTm6dLpU3kh20sCu0CTwpeJao="; + sha256 = "sha256-7lP9pn05EaGLZpaAp+oeed4yLhIjo6/wQg+lDpt1Hwg="; }; sourceRoot = "."; diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index b9f5561ebe60..e698d53f433d 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "2.0.5"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sql-python"; - rev = "v${version}"; - sha256 = "sha256-Qpdyn6z1mbO4bzyUZ2eYdd9pfIkIP/Aj4YgNXaYwxpE="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-EMLUXGeVGIXFeaMvaJ+crivRZtOt7W/LCycIO2gwqXA="; }; postPatch = '' @@ -35,7 +35,7 @@ buildPythonPackage rec { pyarrow ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 9f32be70a5b1..12dfea0650a8 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { marshmallow-enum ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis mypy pytestCheckHook diff --git a/pkgs/development/python-modules/dataclasses-serialization/default.nix b/pkgs/development/python-modules/dataclasses-serialization/default.nix index 72ef9877d181..a52135ddaf6f 100644 --- a/pkgs/development/python-modules/dataclasses-serialization/default.nix +++ b/pkgs/development/python-modules/dataclasses-serialization/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { toposort ]; - checkInputs = [ + nativeCheckInputs = [ bson pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dataclasses/default.nix b/pkgs/development/python-modules/dataclasses/default.nix deleted file mode 100644 index c276e9d000b2..000000000000 --- a/pkgs/development/python-modules/dataclasses/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, isPy36 }: - -buildPythonPackage rec { - pname = "dataclasses"; - version = "0.8"; - - # backport only works on Python 3.6, and is in the standard library in Python 3.7 - disabled = !isPy36; - - src = fetchPypi { - inherit pname version; - sha256 = "8479067f342acf957dc82ec415d355ab5edb7e7646b90dc6e2fd1d96ad084c97"; - }; - - meta = with lib; { - description = "An implementation of PEP 557: Data Classes"; - homepage = "https://github.com/ericvsmith/dataclasses"; - license = licenses.asl20; - maintainers = with maintainers; [ catern ]; - }; -} diff --git a/pkgs/development/python-modules/datadiff/default.nix b/pkgs/development/python-modules/datadiff/default.nix index 4b6338412673..446fdaf07b31 100644 --- a/pkgs/development/python-modules/datadiff/default.nix +++ b/pkgs/development/python-modules/datadiff/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "datadiff"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VASUQKiW3lJH7i57eqVCX5OayDLDftshAfjTA26Jyqg="; + hash = "sha256-I9QpQyW3sHyUgCYZYfJecTJDNHLaQtqnXG4WeA4p5VE="; }; # Tests are not part of the PyPI releases diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 7d32650302f4..6a258cf73036 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ++ lib.optional (pythonOlder "3.5") typing ++ lib.optional (pythonOlder "3.0") configparser; - checkInputs = [ + nativeCheckInputs = [ click freezegun mock diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index 4b36df22d183..fb991dabf3d2 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { pyarrow ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; pythonImportsCheck = [ "datafusion" ]; checkPhase = '' diff --git a/pkgs/development/python-modules/datapoint/default.nix b/pkgs/development/python-modules/datapoint/default.nix index b5d86acf2a00..4b68fe24b427 100644 --- a/pkgs/development/python-modules/datapoint/default.nix +++ b/pkgs/development/python-modules/datapoint/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/pkgs/development/python-modules/dataset/default.nix b/pkgs/development/python-modules/dataset/default.nix index 514876761ebf..d437c5794feb 100644 --- a/pkgs/development/python-modules/dataset/default.nix +++ b/pkgs/development/python-modules/dataset/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "dataset"; - version = "1.5.2"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TDZ6fAqFxOdI79o07uMAw/zD8HbHXDKQt0mnoFM1yEc="; + hash = "sha256-fNvJBdZjtYKvhGzwULfP2iDNUrqhxiwRlhlFrHfmGdU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datasette-publish-fly/default.nix b/pkgs/development/python-modules/datasette-publish-fly/default.nix index 9248588df216..521b408b524c 100644 --- a/pkgs/development/python-modules/datasette-publish-fly/default.nix +++ b/pkgs/development/python-modules/datasette-publish-fly/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "datasette-publish-fly"; - version = "1.2"; + version = "1.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,15 +18,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonw"; repo = pname; - rev = version; - hash = "sha256-0frP/RkpZX6LCR8cOlzcBG3pbcOh0KPuELlYUXS3dRE="; + rev = "refs/tags/${version}"; + hash = "sha256-L94QYcrTWjuoz0aEFTxPi8Xg0xERP1zCs7+vzhoJagc="; }; propagatedBuildInputs = [ datasette ]; - checkInputs = [ + nativeCheckInputs = [ cogapp pytest-mock pytestCheckHook @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Datasette plugin for publishing data using Fly"; homepage = "https://datasette.io/plugins/datasette-publish-fly"; + changelog = "https://github.com/simonw/datasette-publish-fly/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 8394befc51e6..6781f8213551 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.63.2"; + version = "0.64.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-VDmh2Q/ab5xaNbj0APuQ9pkZ+GHoNXW2crrJXi556Fk="; + sha256 = "sha256-EXYAiXqEfQVDTwc4MFTroLPEaTZ3QYTlUsuNQ72oHpA="; }; postPatch = '' @@ -67,7 +67,7 @@ buildPythonPackage rec { uvicorn ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp beautifulsoup4 pytest-asyncio diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index a72bc5b22bbe..f526438afafc 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { scipy ] ++ dask.optional-dependencies.complete; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist nbsmoke diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index 50bde25cf444..a7964914d079 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -28,7 +28,7 @@ in buildPythonPackage rec { sha256 = "0rhlj2kjj1vx5m73wnc5518rd6cs1zsbgpsvzk893n516k69shcf"; }; - checkInputs = [ pytest mock ]; + nativeCheckInputs = [ pytest mock ]; propagatedBuildInputs = [ numpy multipledispatch python-dateutil ]; # Disable several tests diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix index 2ebb488aba77..222399fdfd21 100644 --- a/pkgs/development/python-modules/datatable/default.nix +++ b/pkgs/development/python-modules/datatable/default.nix @@ -1,25 +1,29 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder -, pipInstallHook, writeText +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pipInstallHook +, writeText , blessed , docutils , libcxx , llvm , pytestCheckHook , typesentry -, isPy310 }: buildPythonPackage rec { pname = "datatable"; - version = "0.11.0"; - disabled = pythonOlder "3.5"; + # python 3.10+ support is not in the 1.0.0 release + version = "unstable-2022-12-15"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "19c602711e00f72e9ae296d8fa742d46da037c2d3a2d254bdf68f817a8da76bb"; + src = fetchFromGitHub { + owner = "h2oai"; + repo = pname; + rev = "9522f0833d3e965656396de4fffebd882d39c25d"; + hash = "sha256-lEXQwhx2msnJkkRrTkAwYttlYTISyH/Z7dSalqRrOhI="; }; - # authors seem to have created their own build system - format = "other"; postPatch = '' # tarball doesn't appear to have been shipped totally ready-to-build @@ -27,20 +31,17 @@ buildPythonPackage rec { --replace \ 'shell_cmd(["git"' \ '"0000000000000000000000000000000000000000" or shell_cmd(["git"' - echo '${version}' > VERSION.txt + # TODO revert back to use ${version} when bumping to the next stable release + echo '1.0' > VERSION.txt # don't make assumptions about architecture sed -i '/-m64/d' ci/ext.py ''; DT_RELEASE = "1"; - buildPhase = '' - python ci/ext.py wheel - ''; - propagatedBuildInputs = [ typesentry blessed ]; buildInputs = [ llvm pipInstallHook ]; - checkInputs = [ docutils pytestCheckHook ]; + nativeCheckInputs = [ docutils pytestCheckHook ]; LLVM = llvm; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; @@ -62,8 +63,5 @@ buildPythonPackage rec { homepage = "https://github.com/h2oai/datatable"; license = licenses.mpl20; maintainers = with maintainers; [ abbradar ]; - # uses custom build system and adds -Wunused-variable -Werror - # warning: ‘dt::expr::doc_first’ defined but not used [-Wunused-variable] - broken = isPy310; }; } diff --git a/pkgs/development/python-modules/datauri/default.nix b/pkgs/development/python-modules/datauri/default.nix index da6ffe3bd266..ec2643eaa5ef 100644 --- a/pkgs/development/python-modules/datauri/default.nix +++ b/pkgs/development/python-modules/datauri/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { "datauri" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index ca9e2f823748..4af53c9f756d 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, isPy3k +, pythonOlder , fetchFromGitHub , fetchpatch , python-dateutil @@ -13,7 +13,7 @@ , langdetect , parameterized , pytestCheckHook -, GitPython +, gitpython , parsel , requests , ruamel-yaml @@ -21,27 +21,19 @@ buildPythonPackage rec { pname = "dateparser"; - version = "1.1.3"; + version = "1.1.7"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; + + format = "setuptools"; src = fetchFromGitHub { owner = "scrapinghub"; repo = "dateparser"; - rev = "v${version}"; - sha256 = "sha256-2bZaaaLT3hocIiqLZpudP6gmiYwxPNMrjG9dYF3GvTc="; + rev = "refs/tags/v${version}"; + hash = "sha256-KQCjXuBDBZduNYJITwk1qx7mBp8CJ95ZbFlhrFMkE8w="; }; - patches = [ - ./regex-compat.patch - ]; - - postPatch = '' - substituteInPlace setup.py --replace \ - 'regex !=2019.02.19,!=2021.8.27,<2022.3.15' \ - 'regex' - ''; - propagatedBuildInputs = [ python-dateutil pytz @@ -55,10 +47,10 @@ buildPythonPackage rec { langdetect = [ langdetect ]; }; - checkInputs = [ + nativeCheckInputs = [ parameterized pytestCheckHook - GitPython + gitpython parsel requests ruamel-yaml @@ -80,6 +72,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "dateparser" ]; meta = with lib; { + changelog = "https://github.com/scrapinghub/dateparser/blob/${src.rev}/HISTORY.rst"; description = "Date parsing library designed to parse dates from HTML pages"; homepage = "https://github.com/scrapinghub/dateparser"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/dateparser/regex-compat.patch b/pkgs/development/python-modules/dateparser/regex-compat.patch deleted file mode 100644 index 4c69d14f1023..000000000000 --- a/pkgs/development/python-modules/dateparser/regex-compat.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/dateparser/languages/locale.py -+++ b/dateparser/languages/locale.py -@@ -169,7 +169,7 @@ class Locale: - if normalize: - value = list(map(normalize_unicode, value)) - pattern = '|'.join(sorted(value, key=len, reverse=True)) -- pattern = DIGIT_GROUP_PATTERN.sub(r'?P\d+', pattern) -+ pattern = pattern.replace(r'\d+', r'?P\d+') - pattern = re.compile(r'^(?:{})$'.format(pattern), re.UNICODE | re.IGNORECASE) - relative_dictionary[pattern] = key - return relative_dictionary diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix index 8efa6983150d..01d4cbe8f746 100644 --- a/pkgs/development/python-modules/db-dtypes/default.nix +++ b/pkgs/development/python-modules/db-dtypes/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "db-dtypes"; - version = "1.0.4"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "googleapis"; repo = "python-db-dtypes-pandas"; rev = "refs/tags/v${version}"; - hash = "sha256-ilcVog6mhF83GVa68BppUzvKNRPdSDXla2MU6M2EzLg="; + hash = "sha256-RlSze0e2NNHJ6kAbj9TX58MaEPutyjcLXIOYjpugO6o="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { pyarrow ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pandas Data Types for SQL systems (BigQuery, Spanner)"; homepage = "https://github.com/googleapis/python-db-dtypes-pandas"; + changelog = "https://github.com/googleapis/python-db-dtypes-pandas/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 6c85d0def6e8..10cf43f4f648 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.99.2"; + version = "0.99.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aeutAP2y+bUmUOZ39TpXULP+egeBcjyDmtoCheGzw+0="; + hash = "sha256-lAJypyrCfRah22mq/vggaEASzDVT/+mHXVzS46nLadw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index b658eeefd77f..b8f2fffe0e1a 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.75.0"; + version = "1.84.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-bmHUfRytUGlS0X1PEQHFocMZ4+FslA2rvzqHNE+3B3E="; + rev = "refs/tags/v${version}"; + hash = "sha256-AdfrzN7ufvy77tKjnHPNo+jHoHRw9fXtdUdYvdnMAjs="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { async-timeout ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix index ebca00fe3be1..c8f8714e5638 100644 --- a/pkgs/development/python-modules/dbus-next/default.nix +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "sha256-EKEQZFRUe+E65Z6DNCJFL5uCI5kbXrN7Tzd4O0X5Cqo="; }; - checkInputs = [ + nativeCheckInputs = [ dbus pytest pytest-cov @@ -29,16 +29,17 @@ buildPythonPackage rec { # test_tcp_connection_with_forwarding fails due to dbus # creating unix socket anyway on v1.14.4 checkPhase = '' - dbus-run-session --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf \ ${python.interpreter} -m pytest -sv --cov=dbus_next \ -k "not test_peer_interface and not test_tcp_connection_with_forwarding" ''; meta = with lib; { - broken = stdenv.isDarwin; - homepage = "https://github.com/altdesktop/python-dbus-next"; description = "A zero-dependency DBus library for Python with asyncio support"; + homepage = "https://github.com/altdesktop/python-dbus-next"; + changelog = "https://github.com/altdesktop/python-dbus-next/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ sfrijters ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/dbus-python-client-gen/default.nix b/pkgs/development/python-modules/dbus-python-client-gen/default.nix index 02b973d145ce..ee4a467b5779 100644 --- a/pkgs/development/python-modules/dbus-python-client-gen/default.nix +++ b/pkgs/development/python-modules/dbus-python-client-gen/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { dbus-python ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix index 8b0eb3f3cf97..026f69d9f2eb 100644 --- a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix +++ b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis hs-dbus-signature diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index 81052c62caed..5e1053fc1af9 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ++ lib.optional (! python ? modules) ncurses; doCheck = isPy3k; - checkInputs = [ dbus.out pygobject3 ]; + nativeCheckInputs = [ dbus.out pygobject3 ]; postInstall = '' cp -r dbus_python.egg-info $out/${python.sitePackages}/ diff --git a/pkgs/development/python-modules/dbutils/default.nix b/pkgs/development/python-modules/dbutils/default.nix index 8994e1d28cd2..e070e617e14b 100644 --- a/pkgs/development/python-modules/dbutils/default.nix +++ b/pkgs/development/python-modules/dbutils/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-+t65eeFAbcEj4tuZVfMU4NU2DzBOC9bPBHqqX8P99bM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dcmstack/default.nix b/pkgs/development/python-modules/dcmstack/default.nix index ee554a6e2bd7..08dcbb796acb 100644 --- a/pkgs/development/python-modules/dcmstack/default.nix +++ b/pkgs/development/python-modules/dcmstack/default.nix @@ -1,34 +1,32 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonAtLeast -, nose +, pythonOlder +, pytestCheckHook , nibabel , pydicom +, pylibjpeg-libjpeg }: buildPythonPackage rec { pname = "dcmstack"; - version = "0.8"; - - disabled = pythonAtLeast "3.8"; - # https://github.com/moloney/dcmstack/issues/67 + version = "0.9"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "moloney"; repo = pname; - rev = "v${version}"; - sha256 = "1n24pp3rqz7ss1z6276fxynnppraxadbl3b9p8ijrcqnpzbzih7p"; + rev = "refs/tags/v${version}"; + hash = "sha256-GVzih9H2m2ZGSuZMRuaDG78b95PI3j0WQw5M3l4KNCs="; }; - propagatedBuildInputs = [ nibabel pydicom ]; + propagatedBuildInputs = [ + nibabel + pydicom + pylibjpeg-libjpeg + ]; - checkInputs = [ nose ]; - checkPhase = '' - runHook preCheck - nosetests - runHook postCheck - ''; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/moloney/dcmstack"; diff --git a/pkgs/development/python-modules/ddt/default.nix b/pkgs/development/python-modules/ddt/default.nix index 1cb769d41518..f92e0c331b9a 100644 --- a/pkgs/development/python-modules/ddt/default.nix +++ b/pkgs/development/python-modules/ddt/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { enum34 ]; - checkInputs = [ six pyyaml mock pytestCheckHook ]; + nativeCheckInputs = [ six pyyaml mock pytestCheckHook ]; preCheck = '' # pytest can't import one file even with PYTHONPATH set diff --git a/pkgs/development/python-modules/deal-solver/default.nix b/pkgs/development/python-modules/deal-solver/default.nix index f762ec0ca0ec..dc66675dc095 100644 --- a/pkgs/development/python-modules/deal-solver/default.nix +++ b/pkgs/development/python-modules/deal-solver/default.nix @@ -41,9 +41,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ z3 astroid - ]; + ] ++ z3.requiredPythonModules; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis ]; diff --git a/pkgs/development/python-modules/deal/default.nix b/pkgs/development/python-modules/deal/default.nix index a7465d57dccb..98981a65adbc 100644 --- a/pkgs/development/python-modules/deal/default.nix +++ b/pkgs/development/python-modules/deal/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { typeguard ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook docstring-parser @@ -77,6 +77,8 @@ buildPythonPackage rec { "test_scheme_contract_is_satisfied_when_setting_arg" "test_scheme_contract_is_satisfied_within_chain" "test_scheme_errors_rewrite_message" + # broken since pytest > 7.1.3 + "test_exception_hook" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix index 56b630fda6e5..defe0b690723 100644 --- a/pkgs/development/python-modules/deap/default.nix +++ b/pkgs/development/python-modules/deap/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy matplotlib ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests --verbosity=3 ''; diff --git a/pkgs/development/python-modules/debian-inspector/default.nix b/pkgs/development/python-modules/debian-inspector/default.nix index 3888020ccd22..7568f9af9129 100644 --- a/pkgs/development/python-modules/debian-inspector/default.nix +++ b/pkgs/development/python-modules/debian-inspector/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { commoncode ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix index ad5f56368f1f..5fa306d651b0 100644 --- a/pkgs/development/python-modules/debian/default.nix +++ b/pkgs/development/python-modules/debian/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-debian"; - version = "0.1.48"; + version = "0.1.49"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-YtUFR9BqVjjOHF6A19cB3fFpY7QHr89b3IPH3k25T3w="; + hash = "sha256-jPZ3ow28tL56mVNsF+ETCKgnpNIgKNxZpn9sbdPw9Yw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/debtcollector/tests.nix b/pkgs/development/python-modules/debtcollector/tests.nix index 21d49ac983ab..5c10dc90904d 100644 --- a/pkgs/development/python-modules/debtcollector/tests.nix +++ b/pkgs/development/python-modules/debtcollector/tests.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ debtcollector stestr ]; diff --git a/pkgs/development/python-modules/debts/default.nix b/pkgs/development/python-modules/debts/default.nix index cc571f056314..7055a3736b22 100644 --- a/pkgs/development/python-modules/debts/default.nix +++ b/pkgs/development/python-modules/debts/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # for some reason tests only work if the module is properly installed checkPhase = '' diff --git a/pkgs/development/python-modules/debuglater/default.nix b/pkgs/development/python-modules/debuglater/default.nix index 40da613a65cd..8eabbacf7c86 100644 --- a/pkgs/development/python-modules/debuglater/default.nix +++ b/pkgs/development/python-modules/debuglater/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "debuglater"; - version = "1.4.3"; + version = "1.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ploomber"; repo = pname; - rev = version; - hash = "sha256-0fnWXmrlZjlLFGbiLC7HuDgMEM6OJVn8ajjNRqFg3Lc="; + rev = "refs/tags/${version}"; + hash = "sha256-o9IAk3EN8ghEft7Y7Xx+sEjWMNgoyiZ0eiBqnCyXkm8="; }; propagatedBuildInputs = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ numpy pandas pytestCheckHook @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for post-mortem debugging of Python programs"; homepage = "https://github.com/ploomber/debuglater"; + changelog = "https://github.com/ploomber/debuglater/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 97b06c130e22..c45d6621398f 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.6.3"; + version = "1.6.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "Microsoft"; - repo = pname; + owner = "microsoft"; + repo = "debugpy"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ERsqs+pCJfYQInOWPBhM/7hC5TTfQAksYJwFCcd+vlk="; + sha256 = "sha256-GanRWzGyg0Efa+kuU7Q0IOmO0ohXZIjuz8RZYERTpzo="; }; patches = [ @@ -69,7 +69,7 @@ buildPythonPackage rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")} )''; - checkInputs = [ + nativeCheckInputs = [ django flask gevent @@ -104,6 +104,7 @@ buildPythonPackage rec { meta = with lib; { description = "An implementation of the Debug Adapter Protocol for Python"; homepage = "https://github.com/microsoft/debugpy"; + changelog = "https://github.com/microsoft/debugpy/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ kira-bruneau ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "i686-darwin" "aarch64-darwin" ]; diff --git a/pkgs/development/python-modules/deep-translator/default.nix b/pkgs/development/python-modules/deep-translator/default.nix index d7089a85cba9..e68cda8c0e25 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.9.1"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-goLc/4BbVKUkH+csggKm6EKHmRVbv4i0Aq7N+/5WnmU="; + sha256 = "sha256-iHK1A44SZqJ5N+D2ets76xuU0mryGT7TehM4wryB/AY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/deep_merge/default.nix b/pkgs/development/python-modules/deep_merge/default.nix index 2c59d4ab6955..ad879347367c 100644 --- a/pkgs/development/python-modules/deep_merge/default.nix +++ b/pkgs/development/python-modules/deep_merge/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "tUQV+Qk0xC4zQRTihky01OczWzStOW41rYYQyWBlpH4="; }; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index bf296db3815a..b4921b2d1f44 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ jsonpickle numpy pytestCheckHook diff --git a/pkgs/development/python-modules/deepdish/default.nix b/pkgs/development/python-modules/deepdish/default.nix index 6ae9316a0f6d..0b04c2cc4418 100644 --- a/pkgs/development/python-modules/deepdish/default.nix +++ b/pkgs/development/python-modules/deepdish/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { "deepdish" ]; - # checkInputs = [ + # nativeCheckInputs = [ # pandas # ]; diff --git a/pkgs/development/python-modules/deepmerge/default.nix b/pkgs/development/python-modules/deepmerge/default.nix index 148599fe1666..d35395881cdd 100644 --- a/pkgs/development/python-modules/deepmerge/default.nix +++ b/pkgs/development/python-modules/deepmerge/default.nix @@ -9,20 +9,20 @@ buildPythonPackage rec { pname = "deepmerge"; - version = "1.0.1"; + version = "1.1.0"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-S0R3ntPS+3kbsYH8JoNCNJb+pCirt683/rIyht5/Cho="; + sha256 = "sha256-TCeg213iheGnzqx9vBUx3qpVa2J96kkAyCRFgezf6i0="; }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/deeptoolsintervals/default.nix b/pkgs/development/python-modules/deeptoolsintervals/default.nix index 0dde3c51c3ae..89cebb91ab39 100644 --- a/pkgs/development/python-modules/deeptoolsintervals/default.nix +++ b/pkgs/development/python-modules/deeptoolsintervals/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ zlib xz ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { homepage = "https://deeptools.readthedocs.io/en/develop"; diff --git a/pkgs/development/python-modules/deepwave/default.nix b/pkgs/development/python-modules/deepwave/default.nix index 37cb3968da39..986a0ca8d7b4 100644 --- a/pkgs/development/python-modules/deepwave/default.nix +++ b/pkgs/development/python-modules/deepwave/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ torch pybind11 ]; - checkInputs = [ + nativeCheckInputs = [ which scipy pytest-xdist diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index 8b683872d6d0..e1e8d056cc96 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.7.0"; + version = "5.8.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,14 +22,14 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-E4XNHrAq49F1EHG1mMOJrlsCG9W2KY8swijxHRO9MCc="; + hash = "sha256-M6icdvD412qeURAIkywUliUM9QAgG/b+yBMZVYatvyQ="; }; nativeBuildInputs = [ poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ environs pytest-mock pytest-vcr @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper around the Deezer API"; homepage = "https://github.com/browniebroke/deezer-python"; + changelog = "https://github.com/browniebroke/deezer-python/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ synthetica ]; }; diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index 1cfa630337f5..4bb079e9be7a 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { fonttools ]; - checkInputs = [ + nativeCheckInputs = [ fontpens fs lxml diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix index 5698dcbe491b..42c1602a399f 100644 --- a/pkgs/development/python-modules/deform/default.nix +++ b/pkgs/development/python-modules/deform/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { zope_deprecation ]; - checkInputs = [ + nativeCheckInputs = [ nose coverage beautifulsoup4 diff --git a/pkgs/development/python-modules/deltachat/default.nix b/pkgs/development/python-modules/deltachat/default.nix index 9a4d924b71f5..d0bdc0cd7179 100644 --- a/pkgs/development/python-modules/deltachat/default.nix +++ b/pkgs/development/python-modules/deltachat/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/demetriek/default.nix b/pkgs/development/python-modules/demetriek/default.nix index 99b889eae274..8330ec6ec796 100644 --- a/pkgs/development/python-modules/demetriek/default.nix +++ b/pkgs/development/python-modules/demetriek/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix index 08c794682713..d37d188a257a 100644 --- a/pkgs/development/python-modules/dendropy/default.nix +++ b/pkgs/development/python-modules/dendropy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-FP0+fJkkFtSysPxoHXjyMgF8pPin7aRyzmHe9bH8LlM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 5a48fc35f45a..14fe85c6af51 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.10.12"; + version = "0.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "scarface-4711"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QNiDoPjOuwwAgUqDzXHzn0BE9bwXQrQKAIFlHCywl88="; + hash = "sha256-0zclIoEGKjA8Ro8k+HYX/d77U+ntQZv0vq6gC4Sa7zE="; }; propagatedBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { netifaces ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook pytest-httpx @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automation Library for Denon AVR receivers"; homepage = "https://github.com/scarface-4711/denonavr"; + changelog = "https://github.com/ol-iver/denonavr/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ colemickens ]; }; diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index 628e18931255..ff00a9fd200a 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -7,56 +7,75 @@ , httpx , mypy-boto3-s3 , numpy -, scipy , pydantic +, pytest-asyncio , pytestCheckHook +, pythonOlder , pyyaml +, scipy , six }: buildPythonPackage rec { pname = "dependency-injector"; - version = "4.35.3"; + version = "4.41.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ets-labs"; repo = "python-dependency-injector"; rev = version; - sha256 = "sha256-2qe4A2T3EagNCh1zSbPWblVN7p9NH8rNwQQVyESJTdk="; + hash = "sha256-U3U/L8UuYrfpm4KwVNmViTbam7QdZd2vp1p+ENtOJlw="; }; propagatedBuildInputs = [ six ]; - checkInputs = [ - aiohttp + passthru.optional-dependencies = { + aiohttp = [ + aiohttp + ]; + pydantic = [ + pydantic + ]; + flask = [ + flask + ]; + yaml = [ + pyyaml + ]; + }; + + nativeCheckInputs = [ fastapi - flask httpx mypy-boto3-s3 numpy - pydantic - scipy + pytest-asyncio pytestCheckHook - pyyaml - ]; + scipy + ] ++ passthru.optional-dependencies.aiohttp + ++ passthru.optional-dependencies.pydantic + ++ passthru.optional-dependencies.yaml + ++ passthru.optional-dependencies.flask; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "six>=1.7.0,<=1.15.0" "six" - ''; + pythonImportsCheck = [ + "dependency_injector" + ]; disabledTestPaths = [ - # There is no unique identifier to disable the one failing test + # Exclude tests for EOL Python releases "tests/unit/ext/test_aiohttp_py35.py" + "tests/unit/wiring/test_*_py36.py" ]; - pythonImportsCheck = [ "dependency_injector" ]; - meta = with lib; { description = "Dependency injection microframework for Python"; homepage = "https://github.com/ets-labs/python-dependency-injector"; + changelog = "https://github.com/ets-labs/python-dependency-injector/blob/${version}/docs/main/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ gerschtli ]; }; diff --git a/pkgs/development/python-modules/deploykit/default.nix b/pkgs/development/python-modules/deploykit/default.nix index 6dc8ebde0841..e89eab8c0e50 100644 --- a/pkgs/development/python-modules/deploykit/default.nix +++ b/pkgs/development/python-modules/deploykit/default.nix @@ -5,25 +5,29 @@ , bash , openssh , pytestCheckHook +, pythonOlder , stdenv }: buildPythonPackage rec { pname = "deploykit"; - version = "1.0.1"; + version = "1.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "numtide"; repo = pname; rev = version; - hash = "sha256-eKyqsGgnJmF2wUYa7HjC1Jwsh03qVTJEP1MtL7JL4Ts="; + hash = "sha256-I1vAefWQBBRNykDw38LTNwdiPFxpPkLzCcevYAXO+Zo="; }; buildInputs = [ setuptools ]; - checkInputs = [ + nativeCheckInputs = [ bash openssh pytestCheckHook @@ -34,9 +38,14 @@ buildPythonPackage rec { # don't swallow stdout/stderr pytestFlagsArray = [ "-s" ]; + pythonImportsCheck = [ + "deploykit" + ]; + meta = with lib; { description = "Execute commands remote via ssh and locally in parallel with python"; homepage = "https://github.com/numtide/deploykit"; + changelog = "https://github.com/numtide/deploykit/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ mic92 zowoq ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index 40c20a40c20c..933e55e184f7 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { wrapt ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix index 0e15f2d74c61..5e3ddf7b07dd 100644 --- a/pkgs/development/python-modules/deprecation/default.nix +++ b/pkgs/development/python-modules/deprecation/default.nix @@ -1,10 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , fetchpatch , packaging -, python -, pythonAtLeast -, pythonOlder -, unittest2 , unittestCheckHook }: @@ -17,7 +15,7 @@ buildPythonPackage rec { sha256 = "1zqqjlgmhgkpzg9ss5ki8wamxl83xn51fs6gn2a8cxsx9vkbvcvj"; }; - patches = lib.optionals (pythonAtLeast "3.10") [ + patches = [ # fixes for python 3.10 test suite (fetchpatch { url = "https://github.com/briancurtin/deprecation/pull/57/commits/e13e23068cb8d653a02a434a159e8b0b7226ffd6.patch"; @@ -28,11 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging ]; - # avoiding mass rebuilds for python3.9, but no longer - # needed with patch - checkInputs = [ unittestCheckHook ] ++ lib.optionals (pythonOlder "3.10") [ - unittest2 - ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "A library to handle automated deprecations"; diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index 342b07387248..840fbda9231b 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -11,15 +11,16 @@ buildPythonPackage rec { pname = "desktop-notifier"; - version = "3.4.1"; + version = "3.4.2"; format = "pyproject"; - disabled = pythonOlder "3.6"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SamSchott"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-cqPLnahs3fT6AfQQkS5azh4/cHzaexytg78RsJG5c6U="; + hash = "sha256-OujBpq3SBDKw9Jgb9MD200Rp0fD0OJRw90flxS22I2s="; }; nativeBuildInputs = [ @@ -36,11 +37,15 @@ buildPythonPackage rec { # no tests available, do the imports check instead doCheck = false; - pythonImportsCheck = [ "desktop_notifier" ]; + + pythonImportsCheck = [ + "desktop_notifier" + ]; meta = with lib; { + description = "Python library for cross-platform desktop notifications"; homepage = "https://github.com/samschott/desktop-notifier"; - description = "A Python library for cross-platform desktop notifications"; + changelog = "https://github.com/samschott/desktop-notifier/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ sfrijters ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/detect-secrets/default.nix b/pkgs/development/python-modules/detect-secrets/default.nix index 85ee0e51bfb0..d14b3d523b6f 100644 --- a/pkgs/development/python-modules/detect-secrets/default.nix +++ b/pkgs/development/python-modules/detect-secrets/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook responses diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 2a47f58c6a8e..c437a1b56585 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -1,36 +1,40 @@ -{ stdenv -, lib -, buildPythonPackage -, fetchFromGitHub +{ lib , anytree -, nbval -, sympy -, scipy +, buildPythonPackage , cached-property -, psutil -, py-cpuinfo , cgen , click -, multidict -, distributed -, pyrevolve , codepy -, pytestCheckHook -, matplotlib -, pytest-xdist +, distributed +, fetchFromGitHub , gcc , llvmPackages +, matplotlib +, multidict +, nbval +, psutil +, py-cpuinfo +, pyrevolve +, pytest-xdist +, pytestCheckHook +, pythonOlder +, scipy +, stdenv +, sympy }: buildPythonPackage rec { pname = "devito"; version = "4.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "devitocodes"; repo = "devito"; - rev = "v${version}"; - sha256 = "sha256-crKTxlueE8NGjAqu625iFvp35UK2U7+9kl8rpbzf0gs="; + rev = "refs/tags/v${version}"; + hash = "sha256-crKTxlueE8NGjAqu625iFvp35UK2U7+9kl8rpbzf0gs="; }; postPatch = '' @@ -48,7 +52,30 @@ buildPythonPackage rec { -i requirements.txt ''; - checkInputs = [ pytestCheckHook pytest-xdist matplotlib gcc ]; + propagatedBuildInputs = [ + anytree + cached-property + cgen + click + codepy + distributed + nbval + multidict + psutil + py-cpuinfo + pyrevolve + scipy + sympy + ] ++ lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + matplotlib + gcc + ]; # I've had to disable the following tests since they fail while using nix-build, but they do pass # outside the build. They mostly related to the usage of MPI in a sandboxed environment. @@ -64,6 +91,11 @@ buildPythonPackage rec { "test_subdomainset_mpi" "test_init_omp_env_w_mpi" "test_mpi_nocomms" + "test_shortcuts" + "est_docstrings" + "test_docstrings[finite_differences.coefficients]" + "test_coefficients_w_xreplace" + "test_loop_bounds_forward" ]; disabledTestPaths = [ @@ -76,27 +108,14 @@ buildPythonPackage rec { "tests/test_gradient.py" ]; - propagatedBuildInputs = [ - anytree - cached-property - cgen - click - codepy - distributed - nbval - multidict - psutil - py-cpuinfo - pyrevolve - scipy - sympy - ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; - - pythonImportsCheck = [ "devito" ]; + pythonImportsCheck = [ + "devito" + ]; meta = with lib; { - homepage = "https://www.devitoproject.org/"; description = "Code generation framework for automated finite difference computation"; + homepage = "https://www.devitoproject.org/"; + changelog = "https://github.com/devitocodes/devito/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ atila ]; }; 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 5485372a1e1c..737ec13ad64b 100644 --- a/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { websocket-client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix index 640c06a7bcc3..e8bccf2928aa 100644 --- a/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "devolo-plc-api"; - version = "0.8.1"; - format = "setuptools"; + version = "1.1.0"; + format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "2Fake"; repo = "devolo_plc_api"; - rev = "v${version}"; - sha256 = "sha256-Gjs4x52LwCsE0zAJjLO1N0w5r1jDJkZoVY1JVZB8bmE="; + rev = "refs/tags/v${version}"; + hash = "sha256-xM7g6q18A+qmOhQeey4uxs6ow6Hf5YKDdbpXwYr2RXo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -39,22 +39,21 @@ buildPythonPackage rec { zeroconf ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-httpx pytest-mock pytestCheckHook ]; - - pythonImportsCheck = [ "devolo_plc_api" ]; meta = with lib; { - description = "Python module to interact with Devolo PLC devices"; + description = "Module to interact with Devolo PLC devices"; homepage = "https://github.com/2Fake/devolo_plc_api"; + changelog = "https://github.com/2Fake/devolo_plc_api/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index bb1aae2e8e50..6d41bc86ba08 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -1,30 +1,34 @@ { lib, buildPythonPackage, fetchPypi , requests , py -, pytest -, pytest-flake8 +, pytestCheckHook , lazy }: buildPythonPackage rec { pname = "devpi-common"; - version = "3.7.0"; + version = "3.7.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-O015TOlvFcN7hxwV4SgGmo6vanMuWb+i9KZOYhYZLJM="; + sha256 = "sha256-kHiYknmteenBgce63EpzhGBEUYcQHrDLreZ1k01eRkQ="; }; + postPatch = '' + substituteInPlace tox.ini \ + --replace "--flake8" "" + ''; + propagatedBuildInputs = [ requests py lazy ]; - checkInputs = [ pytest pytest-flake8 ]; - checkPhase = '' - py.test - ''; + nativeCheckInputs = [ + py + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/devpi/devpi"; diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix index 34004769b1fd..6f3f9b7479ae 100644 --- a/pkgs/development/python-modules/devtools/default.nix +++ b/pkgs/development/python-modules/devtools/default.nix @@ -2,6 +2,7 @@ , asttokens , buildPythonPackage , executing +, hatchling , fetchFromGitHub , pygments , pytest-mock @@ -11,25 +12,29 @@ buildPythonPackage rec { pname = "devtools"; - version = "0.8.0"; - format = "setuptools"; + version = "0.10.0"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "samuelcolvin"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "0yavcbxzxi1nfa1k326gsl03y8sadi5z5acamwd8b1bsiv15p757"; + sha256 = "sha256-x9dL/FE94OixMAmjnmfzZUcYJBqE5P2AAIFsNJF0Fxo="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ asttokens executing pygments ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; @@ -55,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python's missing debug print command and other development tools"; homepage = "https://python-devtools.helpmanual.io/"; + changelog = "https://github.com/samuelcolvin/python-devtools/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jdahm ]; }; diff --git a/pkgs/development/python-modules/diagrams/default.nix b/pkgs/development/python-modules/diagrams/default.nix index 49fd55545178..f7dda6214ac8 100644 --- a/pkgs/development/python-modules/diagrams/default.nix +++ b/pkgs/development/python-modules/diagrams/default.nix @@ -9,19 +9,21 @@ , inkscape , imagemagick , pytestCheckHook +, typed-ast }: buildPythonPackage rec { pname = "diagrams"; - version = "0.22.0"; + version = "0.23.3"; format = "pyproject"; - disabled = pythonOlder "3.6"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mingrammer"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-LUuClvBJeOxtrg+S+lYLpP7T1RXCy5dNjFYQO3H54QE="; + hash = "sha256-4b+jmR56y2VV0XxD6FCmNpDB0UKH9+FqcTQuU2jRCXo="; }; postPatch = '' @@ -40,20 +42,33 @@ buildPythonPackage rec { ./remove-black-requirement.patch ]; - checkInputs = [ pytestCheckHook ]; - # Despite living in 'tool.poetry.dependencies', # these are only used at build time to process the image resource files - nativeBuildInputs = [ inkscape imagemagick jinja2 poetry-core round ]; + nativeBuildInputs = [ + inkscape imagemagick + jinja2 + poetry-core + round + ]; - propagatedBuildInputs = [ graphviz ]; + propagatedBuildInputs = [ + graphviz + typed-ast + ]; - pythonImportsCheck = [ "diagrams" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "diagrams" + ]; meta = with lib; { description = "Diagram as Code"; - homepage = "https://diagrams.mingrammer.com/"; - license = licenses.mit; - maintainers = with maintainers; [ addict3d ]; + homepage = "https://diagrams.mingrammer.com/"; + changelog = "https://github.com/mingrammer/diagrams/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ addict3d ]; }; } diff --git a/pkgs/development/python-modules/diagrams/remove-black-requirement.patch b/pkgs/development/python-modules/diagrams/remove-black-requirement.patch index dcf9b4d2ad11..d6c9b4227091 100644 --- a/pkgs/development/python-modules/diagrams/remove-black-requirement.patch +++ b/pkgs/development/python-modules/diagrams/remove-black-requirement.patch @@ -1,8 +1,17 @@ +From bf081e60a7f604d2e71cf5c315dd90c48dd96808 Mon Sep 17 00:00:00 2001 +From: Fabian Affolter +Date: Thu, 26 Jan 2023 15:35:47 +0100 +Subject: [PATCH] Update autogen.sh + +--- + autogen.sh | 9 --------- + 1 file changed, 9 deletions(-) + diff --git a/autogen.sh b/autogen.sh -index acbcacb..1f60b83 100755 +index f5e065b35..b6cef5bf9 100755 --- a/autogen.sh +++ b/autogen.sh -@@ -21,11 +21,6 @@ +@@ -37,11 +37,6 @@ if ! [ -x "$(command -v convert)" ]; then exit 1 fi @@ -14,10 +23,10 @@ index acbcacb..1f60b83 100755 # preprocess the resources for pvd in "${providers[@]}"; do # convert the svg to png for azure provider -@@ -55,7 +50,3 @@ - # Generate doc for custom module - echo "generating the docs for custom" - python -m scripts.generate "custom" +@@ -75,7 +70,3 @@ python -m scripts.generate "custom" + # copy icons across to website + echo "copying icons to website static folder" + cp -r resources website/static/img/ - -# run black -echo "linting the all the diagram modules" diff --git a/pkgs/development/python-modules/diceware/default.nix b/pkgs/development/python-modules/diceware/default.nix index 5655e18bae10..cadc22fcbb9a 100644 --- a/pkgs/development/python-modules/diceware/default.nix +++ b/pkgs/development/python-modules/diceware/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ coverage pytest ]; + nativeCheckInputs = [ coverage pytest ]; # see https://github.com/ulif/diceware/commit/a7d844df76cd4b95a717f21ef5aa6167477b6733 checkPhase = '' diff --git a/pkgs/development/python-modules/dicom-numpy/default.nix b/pkgs/development/python-modules/dicom-numpy/default.nix new file mode 100644 index 000000000000..c1248ad21486 --- /dev/null +++ b/pkgs/development/python-modules/dicom-numpy/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, numpy +, pydicom +}: + +buildPythonPackage rec { + pname = "dicom-numpy"; + version = "0.6.3"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "innolitics"; + repo = pname; + rev = "v${version}"; + hash = "sha256-QIPuSFaWgHmcTddZ8H9kgzLYuwGUzy/FVsi/ttSUskA="; + }; + + propagatedBuildInputs = [ + numpy + pydicom + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dicom_numpy" + ]; + + meta = with lib; { + description = "Read DICOM files into Numpy arrays"; + homepage = "https://github.com/innolitics/dicom-numpy"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix index 0a9344313303..22e7f70b9e6e 100644 --- a/pkgs/development/python-modules/dicom2nifti/default.nix +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { substituteInPlace tests/test_generic.py --replace "from common" "from dicom2nifti.common" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "dicom2nifti" ]; diff --git a/pkgs/development/python-modules/dictdiffer/default.nix b/pkgs/development/python-modules/dictdiffer/default.nix index 5e043e55f853..2bb16eb097b9 100644 --- a/pkgs/development/python-modules/dictdiffer/default.nix +++ b/pkgs/development/python-modules/dictdiffer/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dictpath/default.nix b/pkgs/development/python-modules/dictpath/default.nix deleted file mode 100644 index 5a648f7898f5..000000000000 --- a/pkgs/development/python-modules/dictpath/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, six -}: - -buildPythonPackage rec { - pname = "dictpath"; - version = "0.1.3"; - - src = fetchFromGitHub { - owner = "p1c2u"; - repo = "dictpath"; - rev = version; - sha256 = "0314i8wky2z83a66zggc53m8qa1rjgkrznrl2ixsgiq0prcn6v16"; - }; - - postPatch = '' - sed -i "/^addopts/d" setup.cfg - ''; - - checkInputs = [ - pytestCheckHook - six - ]; - - pythonImportsCheck = [ "dictpath" ]; - - meta = with lib; { - description = "Object-oriented dictionary paths"; - homepage = "https://github.com/p1c2u/dictpath"; - license = licenses.asl20; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python-modules/dicttoxml/default.nix b/pkgs/development/python-modules/dicttoxml/default.nix index 9e24784731cf..c4fd5880526a 100644 --- a/pkgs/development/python-modules/dicttoxml/default.nix +++ b/pkgs/development/python-modules/dicttoxml/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dicttoxml"; - version = "1.7.4"; + version = "1.7.16"; src = fetchPypi { inherit pname version; - sha256 = "ea44cc4ec6c0f85098c57a431a1ee891b3549347b07b7414c8a24611ecf37e45"; + sha256 = "sha256-bzbOZEiB21zYlAvum3yz8/a3sye6imfYPT4sqgU4v50="; }; # No tests in archive diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index a3ea4034e8b6..3f650e60757d 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "7.0.2"; + version = "7.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - hash = "sha256-OENUR9rTKrt+AdHDlCU5AhpSI4ijtYXVg6biB8wTNJc="; + hash = "sha256-qbHyu9FJYs1Sedc1ijuo1ya5pswD2/QJ+JzCB2pCQjQ="; }; propagatedBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { tomli ]; - checkInputs = [ + nativeCheckInputs = [ pycodestyle pyflakes pylint @@ -61,6 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automatically find diff lines that need test coverage"; homepage = "https://github.com/Bachmann1234/diff-cover"; + changelog = "https://github.com/Bachmann1234/diff_cover/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ dzabraev ]; }; diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/digitalocean/default.nix index 5e45a1785a95..09ff7c52bdde 100644 --- a/pkgs/development/python-modules/digitalocean/default.nix +++ b/pkgs/development/python-modules/digitalocean/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; - checkInputs = [ + nativeCheckInputs = [ pytest pytestCheckHook responses diff --git a/pkgs/development/python-modules/dinghy/default.nix b/pkgs/development/python-modules/dinghy/default.nix index b819ff42a6b3..fa62731071b6 100644 --- a/pkgs/development/python-modules/dinghy/default.nix +++ b/pkgs/development/python-modules/dinghy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dinghy"; - version = "0.15.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "nedbat"; repo = pname; rev = version; - hash = "sha256-bfB1VVeIl1KzjY0oQ0jQ8M/fK5LZQqYU7AX201QX+Mk="; + hash = "sha256-xtcNcykfgcWvifso0xaeMT31+G5x4HCp+tLAIEEq4cw="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dipy/default.nix b/pkgs/development/python-modules/dipy/default.nix index 3712dfbaee1a..8a69a5f7de50 100644 --- a/pkgs/development/python-modules/dipy/default.nix +++ b/pkgs/development/python-modules/dipy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 +, pythonOlder , packaging , pytest , cython @@ -14,15 +14,15 @@ buildPythonPackage rec { pname = "dipy"; - version = "1.4.1"; + version = "1.5.0"; - disabled = isPy27; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "dipy"; - repo = pname; - rev = version; - sha256 = "0zaqsiq73vprbqbzvzswjfmqgappl5vhpl2fwjrrda33c27klpzj"; + owner = "dipy"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-kJ8JbnNpjTqGJXwwMTqZdgeN8fOEuxarycunDCRLB74="; }; nativeBuildInputs = [ cython packaging ]; @@ -34,7 +34,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # disable tests for now due to: # - some tests require data download (see dipy/dipy/issues/2092); diff --git a/pkgs/development/python-modules/directv/default.nix b/pkgs/development/python-modules/directv/default.nix index 5f8c40c075aa..34202a4b1c54 100644 --- a/pkgs/development/python-modules/directv/default.nix +++ b/pkgs/development/python-modules/directv/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/dirty-equals/default.nix b/pkgs/development/python-modules/dirty-equals/default.nix index 0a448b8de7f8..50f4b03123a3 100644 --- a/pkgs/development/python-modules/dirty-equals/default.nix +++ b/pkgs/development/python-modules/dirty-equals/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry-core +, hatchling , pytestCheckHook , pythonOlder , pytz @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dirty-equals"; - version = "0.4"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,21 +18,20 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; - rev = "v${version}"; - hash = "sha256-rh7N/VRx4sv/MhhGPkaYCn2d19Sv5er2CkG6/fJuXX4="; + rev = "refs/tags/v${version}"; + hash = "sha256-yYptO6NPhQRlF0T2eXliw2WBms9uqTZVzdYzGj9pCug="; }; nativeBuildInputs = [ - poetry-core + hatchling ]; propagatedBuildInputs = [ pytz - ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/discogs-client/default.nix b/pkgs/development/python-modules/discogs-client/default.nix index 65463eca207a..49a563fcba84 100644 --- a/pkgs/development/python-modules/discogs-client/default.nix +++ b/pkgs/development/python-modules/discogs-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "discogs-client"; - version = "2.5"; + version = "2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "joalla"; repo = "discogs_client"; rev = "refs/tags/v${version}"; - sha256 = "sha256-whLneq8RE1bok8jPlOteqIb5U07TvEa0O2mrzORp5HU="; + hash = "sha256-Si1EH5TalNC3BY7L/GqbGSCjDBWzbodB4NZlNayhZYs="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Unofficial Python API client for Discogs"; homepage = "https://github.com/joalla/discogs_client"; + changelog = "https://github.com/joalla/discogs_client/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index 2bcba19d03ac..07008fac336b 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "discord.py"; - version = "2.0.1"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Rapptz"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-DX9AmVhwP7XgzUApY8d+UB6LGqymErsaSzaisuKAOB0="; + rev = "refs/tags/v${version}"; + hash = "sha256-243w3J3nb/6GV5ogS/Ev9X3r0GrgUokMq14r5rjOdrA="; }; propagatedBuildInputs = [ @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for the Discord API"; homepage = "https://discordpy.rtfd.org/"; + changelog = "https://github.com/Rapptz/discord.py/blob/v${version}/docs/whats_new.rst"; license = licenses.mit; maintainers = with maintainers; [ ivar ]; }; diff --git a/pkgs/development/python-modules/discovery30303/default.nix b/pkgs/development/python-modules/discovery30303/default.nix index 6b69ecfc98cc..fb3904046b8b 100644 --- a/pkgs/development/python-modules/discovery30303/default.nix +++ b/pkgs/development/python-modules/discovery30303/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index 6a8d1e59cea7..30eb172513e3 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { hash = "sha256-c/k8mx/T4RkseDobJ2gtcuom0A6Ewyw4aP2Bk9pxV+o="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytest-xdist pytestCheckHook diff --git a/pkgs/development/python-modules/dissect-cim/default.nix b/pkgs/development/python-modules/dissect-cim/default.nix index a7b815242275..e13da65aee19 100644 --- a/pkgs/development/python-modules/dissect-cim/default.nix +++ b/pkgs/development/python-modules/dissect-cim/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-cim"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cim"; rev = version; - hash = "sha256-rWlAYndqqZ6l/iwk1u2gG0mtQHvAMYUUEWo23hLykXI="; + hash = "sha256-d02P6RXIiriOujGns9mOkyiJLNQFNTTW61kInzS17Y4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dissect-clfs/default.nix b/pkgs/development/python-modules/dissect-clfs/default.nix index 2265792f8807..3e807d3bd260 100644 --- a/pkgs/development/python-modules/dissect-clfs/default.nix +++ b/pkgs/development/python-modules/dissect-clfs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-clfs"; - version = "1.1"; + version = "1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.clfs"; rev = version; - hash = "sha256-5rG8YiVBU4ETLgQoFnMaeXHttIB26+OhIdYjKDKmPBc="; + hash = "sha256-1nh81ppJpYre3y7hJ9xS+TNU1NfTH+9NMHdV55kPEXI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -33,7 +33,7 @@ buildPythonPackage rec { dissect-cstruct ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index 5cf571e02004..722e1a75f775 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dissect-cstruct"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cstruct"; rev = version; - hash = "sha256-iP00EcEkUWoYi+SCo/gY9LSVtCSQZ3g2wMs4Z8m+X2M="; + hash = "sha256-8OxAsrECgsQf8+EaZtJ3XNhwdhBI08o3r+xhD/D1NhQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -28,7 +28,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix index a2d1cad5d4ec..74c8bdf9ec70 100644 --- a/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/pkgs/development/python-modules/dissect-esedb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-esedb"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.esedb"; rev = version; - hash = "sha256-DLu6FCWqeESFlsIB21jN/IKCwSKlBoibildv07/hPcw="; + hash = "sha256-ErPihjAcukMerCAxLdDQVUApeNdFnFn0Zejo3LhgZFc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dissect-etl/default.nix b/pkgs/development/python-modules/dissect-etl/default.nix index fba8a126d1a2..ffde95490763 100644 --- a/pkgs/development/python-modules/dissect-etl/default.nix +++ b/pkgs/development/python-modules/dissect-etl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-etl"; - version = "3.1"; + version = "3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.etl"; rev = version; - hash = "sha256-EqEYw2MpNjdw8nXkxe76R5y99Y+rsK42qfTpT/kxtZ0="; + hash = "sha256-s3Ls8tuqp/COBF+WV9RRyfo7FAqPcXmBZ08gHZMPzOU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dissect-eventlog/default.nix b/pkgs/development/python-modules/dissect-eventlog/default.nix index d5b8b87a2271..7fa3e68cabc6 100644 --- a/pkgs/development/python-modules/dissect-eventlog/default.nix +++ b/pkgs/development/python-modules/dissect-eventlog/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-eventlog"; - version = "3.1"; + version = "3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.eventlog"; rev = version; - hash = "sha256-cLIsK2/pL9nNOitoTZprqAio1BOo3/Uqfbl8uL/1tG4="; + hash = "sha256-emNGZs/5LWD29xE5BmXQKQfkZApLZlGs6KNIqobaKvM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dissect-evidence/default.nix b/pkgs/development/python-modules/dissect-evidence/default.nix index 4548ecd6d902..f6608aac9f71 100644 --- a/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/pkgs/development/python-modules/dissect-evidence/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-evidence"; - version = "3.1"; + version = "3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.evidence"; rev = version; - hash = "sha256-X0WMv96Wo3vDZ6HYGdWfn7OKhFuT5Qjzkyj4HzMqCiM="; + hash = "sha256-rm9IjsXHz4GS8M/oPaDoaxjwqMMtD0qjRtQ3vFJQyQY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dissect-extfs/default.nix b/pkgs/development/python-modules/dissect-extfs/default.nix index 54ac3280bf50..45aea2685d59 100644 --- a/pkgs/development/python-modules/dissect-extfs/default.nix +++ b/pkgs/development/python-modules/dissect-extfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-extfs"; - version = "3.1"; + version = "3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.extfs"; rev = version; - hash = "sha256-i52hlTh0uJJcprA6oVlFQ3v6BpOtSnQAQ0p6BHt56Ac="; + hash = "sha256-KGqmguKwCSQw2USKuWFMQCz+D8XMv5W12eJfUxgz324="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dissect-fat/default.nix b/pkgs/development/python-modules/dissect-fat/default.nix index 91958b8c71c2..47b2cafdb813 100644 --- a/pkgs/development/python-modules/dissect-fat/default.nix +++ b/pkgs/development/python-modules/dissect-fat/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-fat"; - version = "3.1"; + version = "3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.fat"; rev = version; - hash = "sha256-GBeacQtNA1onh67Svqo5R43gap/Lzpm+20TXcUMmU5k="; + hash = "sha256-kqdVgUkvW9I5CI4T9b7VeX6hPm3Ufwrdnhmo1jR5Fdg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-ffs/default.nix b/pkgs/development/python-modules/dissect-ffs/default.nix index a4898bfce98b..fd4d4372e2ac 100644 --- a/pkgs/development/python-modules/dissect-ffs/default.nix +++ b/pkgs/development/python-modules/dissect-ffs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-ffs"; - version = "3.1"; + version = "3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.ffs"; rev = version; - hash = "sha256-JI0i0pvOOChWCDB8rynDuf0txvPQT7z2JJ1EsE4VNLw="; + hash = "sha256-kcYSoY3a8ljY9LWzOUekLBzokE+wJrG1KEr0p5CCj0U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index 2106cf780c17..92c885907f15 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.hypervisor"; rev = version; - hash = "sha256-yc9QfzvWX8jsRVZYglZZuMfxsYUoPr5gf407DABjQcU="; + hash = "sha256-Q7lbFr+gc6inQEJT54DXjpyyis5GxrKQHI5qqa1INKo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dissect-ntfs/default.nix b/pkgs/development/python-modules/dissect-ntfs/default.nix index b8abeb1313ab..1b27129e9d58 100644 --- a/pkgs/development/python-modules/dissect-ntfs/default.nix +++ b/pkgs/development/python-modules/dissect-ntfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-ntfs"; - version = "3.1"; + version = "3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.ntfs"; rev = version; - hash = "sha256-hZz/v6qLZnbsZkS/cBU/to4XmZNgUJQwCaPkY2ebl4Q="; + hash = "sha256-4QEsWTdqlHIP1a9g45+zv1SdHY0Ofsr7Rf1z+ctssSw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dissect-ole/default.nix b/pkgs/development/python-modules/dissect-ole/default.nix index 60f39dde8bda..fb5ead471abb 100644 --- a/pkgs/development/python-modules/dissect-ole/default.nix +++ b/pkgs/development/python-modules/dissect-ole/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-ole"; - version = "3.1"; + version = "3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.ole"; rev = version; - hash = "sha256-qnrbS+gdzBV/mQ08fQzpvevkDtrJ1qXpteW0lxJ+ZUI="; + hash = "sha256-0bIlnRFKBvSXnBIU4+1V7WzyXCvulUpNSXG1Rj2k4jY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-regf/default.nix b/pkgs/development/python-modules/dissect-regf/default.nix index 8c5ecc583daf..d731aeb68a08 100644 --- a/pkgs/development/python-modules/dissect-regf/default.nix +++ b/pkgs/development/python-modules/dissect-regf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-regf"; - version = "3.1"; + version = "3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.regf"; rev = version; - hash = "sha256-88qG90jza0EVP5dgz09ZA8Z+zFwqanOODlUgsvkMxGo="; + hash = "sha256-hSMdgGkSmFDAiO6C1xTJDmKClHwrGc887wqO3/5NZn4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dissect-shellitem/default.nix b/pkgs/development/python-modules/dissect-shellitem/default.nix index 3fd88649ae23..4a4b3802128e 100644 --- a/pkgs/development/python-modules/dissect-shellitem/default.nix +++ b/pkgs/development/python-modules/dissect-shellitem/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-shellitem"; - version = "3.1"; + version = "3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.shellitem"; rev = version; - hash = "sha256-HVnfHsD1V+4kWt9qOClsKuIZMpX4VKrr/5eD7KRq5ww="; + hash = "sha256-z0/KSOgo5Gnl4MLOY5eUPHlI/8dCyYaEEiKMmkP7cgg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dissect-sql/default.nix b/pkgs/development/python-modules/dissect-sql/default.nix index 816fe7e612f2..55e52c9c9120 100644 --- a/pkgs/development/python-modules/dissect-sql/default.nix +++ b/pkgs/development/python-modules/dissect-sql/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-sql"; - version = "3.1"; + version = "3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.sql"; rev = version; - hash = "sha256-uKCCwTFLQSos+L0qc1pFlF3O4FV13up0qFqDYdTZJBk="; + hash = "sha256-yw0EUxlgm7/3FpecGGvxkukudyFMv0fmPbOLJqc2tC0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 04fc69f51252..0c69d93ef3ee 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -16,6 +16,7 @@ , dissect-ntfs , dissect-regf , dissect-sql +, dissect-thumbcache , dissect-util , dissect-volume , dissect-xfs @@ -35,7 +36,7 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.3"; + version = "3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -44,7 +45,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.target"; rev = version; - hash = "sha256-EWUYN2OsYeDo3C+QgjAVq9NXiVk1KWGILwtT0cI0tB0="; + hash = "sha256-QwEznweETwDTuTctOnq0n27JYXC9BO5l6BYpXsMRVq4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -79,6 +80,7 @@ buildPythonPackage rec { dissect-fat dissect-ffs dissect-sql + dissect-thumbcache dissect-xfs fusepy ipython @@ -88,7 +90,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.full; diff --git a/pkgs/development/python-modules/dissect-thumbcache/default.nix b/pkgs/development/python-modules/dissect-thumbcache/default.nix new file mode 100644 index 000000000000..ca48d44d344d --- /dev/null +++ b/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, dissect-cstruct +, dissect-util +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "dissect-thumbcache"; + version = "1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "fox-it"; + repo = "dissect.thumbcache"; + rev = version; + hash = "sha256-4yUVJwIQniE9AAtAgzHczOZfyWZly86JKc0Qh3byYf4="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + dissect-cstruct + dissect-util + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dissect.thumbcache" + ]; + + disabledTests = [ + # Don't run Windows related tests + "windows" + ]; + + meta = with lib; { + description = "Dissect module implementing a parser for the Windows thumbcache"; + homepage = "https://github.com/fox-it/dissect.thumbcache"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index f6021d9ae981..cac7233b9efb 100644 --- a/pkgs/development/python-modules/dissect-util/default.nix +++ b/pkgs/development/python-modules/dissect-util/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dissect-util"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.util"; rev = version; - hash = "sha256-vit+SQ368limLvdVP/0eVINiEAY/dzD/simHFw489Ck="; + hash = "sha256-HGlWyRjvXu1d0n1PPkMyl8NNRRhsjMzXZJMS1MjdTWQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -28,7 +28,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dissect-vmfs/default.nix b/pkgs/development/python-modules/dissect-vmfs/default.nix index 9789f264de35..a520ce8c05a5 100644 --- a/pkgs/development/python-modules/dissect-vmfs/default.nix +++ b/pkgs/development/python-modules/dissect-vmfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-vmfs"; - version = "3.1"; + version = "3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.vmfs"; rev = version; - hash = "sha256-JVJvuH+ZTlGOnmTSB/nnBuMrc/VtkKVrLDRYnukDXBA="; + hash = "sha256-6ZNybNRL97Zz6O32r4X0K3/+vZF3Qid98rj2pgGWgvI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index 8e409a846cc3..cff900efbefa 100644 --- a/pkgs/development/python-modules/dissect-volume/default.nix +++ b/pkgs/development/python-modules/dissect-volume/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-volume"; - version = "3.1"; + version = "3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.volume"; rev = version; - hash = "sha256-9SbluaB2wV4gOCry5c7ZLABMwhGfnYg7dTPdKMXYSZM="; + hash = "sha256-NwY4J1FSCvNIoH9uUHJVlM3jJt6A9CZ7uCWhlIdYztM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dissect-xfs/default.nix b/pkgs/development/python-modules/dissect-xfs/default.nix index 97eb2ed157a3..60a7ee1abb2f 100644 --- a/pkgs/development/python-modules/dissect-xfs/default.nix +++ b/pkgs/development/python-modules/dissect-xfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-xfs"; - version = "3.1"; + version = "3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.xfs"; rev = version; - hash = "sha256-Tg4su78Na6IAQhi7aOY8QNs3tnYOYvdnNQV6rn8QpSE="; + hash = "sha256-S05Y+Oe1q4DcTR9al2K82Q41EP0FnDGUp1gfzYiS/Yk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index ab6921f69348..e6da0a1a6a8e 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect"; rev = version; - hash = "sha256-DtiaBKQtz6CgU1csfGhCw0LJLoiKwyH6N6b7/elpJkU="; + hash = "sha256-1m5reKmPFSqMW/wYdiMw95l8A9E5FS8RHLb8/i1rQKY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissononce/default.nix b/pkgs/development/python-modules/dissononce/default.nix index 80655e6aa084..f3d903f91c99 100644 --- a/pkgs/development/python-modules/dissononce/default.nix +++ b/pkgs/development/python-modules/dissononce/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0hn64qfr0d5npmza6rjyxwwp12k2z2y1ma40zpl104ghac6g3mbs"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' HOME=$(mktemp -d) py.test tests/ ''; diff --git a/pkgs/development/python-modules/distorm3/default.nix b/pkgs/development/python-modules/distorm3/default.nix index 715e8c357143..5748effd390d 100644 --- a/pkgs/development/python-modules/distorm3/default.nix +++ b/pkgs/development/python-modules/distorm3/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "012bh1l2w7i9q8rcnznj3x0lra09d5yxd3r42cbrqdwl1mmg26qn"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook yasm ]; diff --git a/pkgs/development/python-modules/distrax/default.nix b/pkgs/development/python-modules/distrax/default.nix index be277f97ba5e..cd9ab15d1e1d 100644 --- a/pkgs/development/python-modules/distrax/default.nix +++ b/pkgs/development/python-modules/distrax/default.nix @@ -6,7 +6,8 @@ , chex , dm-haiku , pytestCheckHook -, jaxlib }: +, jaxlib +}: buildPythonPackage rec { pname = "distrax"; @@ -24,7 +25,7 @@ buildPythonPackage rec { tensorflow-probability ]; - checkInputs = [ + nativeCheckInputs = [ dm-haiku pytestCheckHook ]; @@ -53,5 +54,7 @@ buildPythonPackage rec { homepage = "https://github.com/deepmind/distrax"; license = licenses.asl20; maintainers = with maintainers; [ onny ]; + # Broken on all platforms (starting 2022-07-27) + broken = true; }; } diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 6b7f535e5152..9fa568bc1d45 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "distributed"; - version = "2022.10.2"; + version = "2023.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-U/Clv276uaWrM0XNkT9tPz1OpETuLtvqMxx/75b9Z9A="; + hash = "sha256-xV3HQmmDtSIn+DM3Rcoyp3dqY9qSjB+8Con6+o6a/y0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index deee452ae1b4..73ded7625dca 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -1,14 +1,23 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib +, fetchPypi +, buildPythonPackage +, setuptools +}: buildPythonPackage rec { pname = "distro"; - version = "1.7.0"; + version = "1.8.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FRrsz2DCFkApMrUuQO5HepOfjViJiSc3igKrvoUsHDk="; + hash = "sha256-AuER0dxqUKu47ta/McPkjtiwgw0eoqG3jGF2XCUT/dg="; }; + nativeBuildInputs = [ + setuptools + ]; + # tests are very targeted at individual linux distributions doCheck = false; diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix index a28c9dd05a58..55a3d408c4e8 100644 --- a/pkgs/development/python-modules/dj-database-url/default.nix +++ b/pkgs/development/python-modules/dj-database-url/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "dj-database-url"; - version = "1.0.0"; + version = "1.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-zPPocY913dFHoeIS/KiO7NqnIXWe5I44tIVIHHe8o9w="; + hash = "sha256-sjsVBGyzgYDgyVIHvMkP5enb3o7vFgZZB92Fz0ynA2w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index be31d9cd4796..2ed3df779891 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { djangorestframework ]; - checkInputs = [ + nativeCheckInputs = [ django-allauth djangorestframework-simplejwt responses diff --git a/pkgs/development/python-modules/django-admin-sortable2/default.nix b/pkgs/development/python-modules/django-admin-sortable2/default.nix new file mode 100644 index 000000000000..6301348e60ec --- /dev/null +++ b/pkgs/development/python-modules/django-admin-sortable2/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, django_4 +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "django-admin-sortable2"; + version = "2.1.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit version pname; + sha256 = "sha256-fcCP8PvOWFlQL4CdEIwElfOw2UYJJp6u27EjfgMISss="; + }; + + propagatedBuildInputs = [ + django_4 + ]; + + pythonImportsCheck = [ + "adminsortable2" + ]; + + # Tests are very slow (end-to-end with playwright) + doCheck = false; + + meta = with lib; { + description = "Generic drag-and-drop ordering for objects in the Django admin interface"; + homepage = "https://github.com/jrief/django-admin-sortable2"; + changelog = "https://github.com/jrief/django-admin-sortable2/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/django-annoying/default.nix b/pkgs/development/python-modules/django-annoying/default.nix index 3e062f29a0e0..5d4afc37b3ed 100644 --- a/pkgs/development/python-modules/django-annoying/default.nix +++ b/pkgs/development/python-modules/django-annoying/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { DJANGO_SETTINGS_MODULE = "tests.settings"; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index 7936df01bd01..ed44bc75f8ae 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "django-anymail"; - version = "8.6"; + version = "9.0"; src = fetchFromGitHub { owner = "anymail"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-hLNILUV7qzqHfh7l3SJAoFveUIRSCHTjEQ3ZC3PhZUY="; + sha256 = "sha256-qEYBHsaHo1gmrsa6q7DQiUJurC7cXhv5e/SQ7R3Tkzc="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { boto3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-django mock diff --git a/pkgs/development/python-modules/django-autocomplete-light/default.nix b/pkgs/development/python-modules/django-autocomplete-light/default.nix index 26138a4ab4af..faa37e0cfa12 100644 --- a/pkgs/development/python-modules/django-autocomplete-light/default.nix +++ b/pkgs/development/python-modules/django-autocomplete-light/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { # Too many un-packaged dependencies doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook django-debug-toolbar django-extensions diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix index dee64ebd6ee4..d70abd2d64eb 100644 --- a/pkgs/development/python-modules/django-cache-url/default.nix +++ b/pkgs/development/python-modules/django-cache-url/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sed -i '/--cov/d' setup.cfg ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/epicserve/django-cache-url"; diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index b8d76ebe7b4a..0280f693e76f 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-django ]; diff --git a/pkgs/development/python-modules/django-celery-beat/default.nix b/pkgs/development/python-modules/django-celery-beat/default.nix index b933a1f89cec..53a3ca85da49 100644 --- a/pkgs/development/python-modules/django-celery-beat/default.nix +++ b/pkgs/development/python-modules/django-celery-beat/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { tzdata ]; - checkInputs = [ + nativeCheckInputs = [ ephem pytest-timeout pytest-django diff --git a/pkgs/development/python-modules/django-celery-email/default.nix b/pkgs/development/python-modules/django-celery-email/default.nix index 950fb4f75e93..73f81e88be3b 100644 --- a/pkgs/development/python-modules/django-celery-email/default.nix +++ b/pkgs/development/python-modules/django-celery-email/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { DJANGO_SETTINGS_MODULE = "tests.settings"; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; diff --git a/pkgs/development/python-modules/django-celery-results/default.nix b/pkgs/development/python-modules/django-celery-results/default.nix new file mode 100644 index 000000000000..1cb4b0f3b81f --- /dev/null +++ b/pkgs/development/python-modules/django-celery-results/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchPypi +, buildPythonPackage +, celery +, django +, pythonOlder +}: + +buildPythonPackage rec { + pname = "django_celery_results"; + version = "2.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-dapRlw21aRy/JCxqD/UMjN9BniZc0Om3cjNdBkNsS5k="; + }; + + propagatedBuildInputs = [ + celery + django + ]; + + # Tests need access to a database. + doCheck = false; + + meta = with lib; { + description = "Celery result back end with django"; + homepage = "https://github.com/celery/django-celery-results"; + license = licenses.bsd3; + maintainers = with maintainers; [ babariviere ]; + }; +} diff --git a/pkgs/development/python-modules/django-cleanup/default.nix b/pkgs/development/python-modules/django-cleanup/default.nix index 9a399ed6ed94..4351f371af90 100644 --- a/pkgs/development/python-modules/django-cleanup/default.nix +++ b/pkgs/development/python-modules/django-cleanup/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "922e06ef8839c92bd3ab37a84db6058b8764f3fe44dbb4487bbca941d288280a"; }; - checkInputs = [ django ]; + nativeCheckInputs = [ django ]; meta = with lib; { description = "Automatically deletes old file for FileField and ImageField. It also deletes files on models instance deletion"; diff --git a/pkgs/development/python-modules/django-compressor/default.nix b/pkgs/development/python-modules/django-compressor/default.nix index 05c525c0cc90..6cea82395664 100644 --- a/pkgs/development/python-modules/django-compressor/default.nix +++ b/pkgs/development/python-modules/django-compressor/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { doCheck = false; # missing package django-sekizai - checkInputs = [ + nativeCheckInputs = [ beautifulsoup4 brotli pytestCheckHook diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index a57308dcfb4f..237e4548d73d 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -5,7 +5,6 @@ , dj-search-url , django , django-cache-url -, django-discover-runner , fetchPypi , importlib-metadata , mock @@ -35,8 +34,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ - django-discover-runner + nativeCheckInputs = [ mock dj-database-url dj-email-url diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index 452c00b6e37f..5174f44ccaee 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { django ]; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; diff --git a/pkgs/development/python-modules/django-crispy-forms/default.nix b/pkgs/development/python-modules/django-crispy-forms/default.nix index 2677d8ec5262..535eddb3b8b2 100644 --- a/pkgs/development/python-modules/django-crispy-forms/default.nix +++ b/pkgs/development/python-modules/django-crispy-forms/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { # FIXME: RuntimeError: Model class source.crispy_forms.tests.forms.CrispyTestModel doesn't declare an explicit app_label and isn't in an application in INSTALLED_APPS. doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index bc54eadde8f7..9f54b9b9ede5 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -3,6 +3,7 @@ , pythonOlder , buildPythonPackage , python +, hatchling , django , jinja2 , sqlparse @@ -11,8 +12,8 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "3.7"; - format = "setuptools"; + version = "3.8.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,9 +21,13 @@ buildPythonPackage rec { owner = "jazzband"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LGEx21m5TNotbwKHf5in+EDkYqqNOoF7mBstnfLYe9s="; + hash = "sha256-GlEw25wem8iwwm3rYLk6TFEAIzC1pYjpSHdAkHwtFcE="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ django jinja2 @@ -34,7 +39,7 @@ buildPythonPackage rec { TEST_ARGS = "tests"; DJANGO_SETTINGS_MODULE = "tests.settings"; - checkInputs = [ + nativeCheckInputs = [ html5lib ]; diff --git a/pkgs/development/python-modules/django-discover-runner/default.nix b/pkgs/development/python-modules/django-discover-runner/default.nix deleted file mode 100644 index 8d07148ce182..000000000000 --- a/pkgs/development/python-modules/django-discover-runner/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, django -}: - -buildPythonPackage rec { - version = "1.0"; - pname = "django-discover-runner"; - - src = fetchPypi { - inherit pname version; - sha256 = "0ba91fe722c256bcbfdeb36fac7eac0f27e5bfda55d98c4c1cf9ab62b5b084fe"; - }; - - propagatedBuildInputs = [ django ]; - - # tests not included with release - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/jezdez/django-discover-runner"; - description = "A Django test runner based on unittest2's test discovery"; - license = licenses.bsd0; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 4253d69feaa1..462c4674c948 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - checkInputs = [ + nativeCheckInputs = [ factory_boy mock pygments # not explicitly declared in setup.py, but some tests require it diff --git a/pkgs/development/python-modules/django-filter/default.nix b/pkgs/development/python-modules/django-filter/default.nix index bf4e342cc2d1..24c2c6d15b00 100644 --- a/pkgs/development/python-modules/django-filter/default.nix +++ b/pkgs/development/python-modules/django-filter/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { # Tests fail (needs the 'crispy_forms' module not packaged on nixos) doCheck = false; - checkInputs = [ + nativeCheckInputs = [ djangorestframework django mock diff --git a/pkgs/development/python-modules/django-guardian/default.nix b/pkgs/development/python-modules/django-guardian/default.nix index c6636ee5eabb..2842a085d8e1 100644 --- a/pkgs/development/python-modules/django-guardian/default.nix +++ b/pkgs/development/python-modules/django-guardian/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - checkInputs = [ + nativeCheckInputs = [ django-environ mock pytestCheckHook diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix index b391fcac495e..f953de0770ef 100644 --- a/pkgs/development/python-modules/django-haystack/default.nix +++ b/pkgs/development/python-modules/django-haystack/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { django ]; - checkInputs = [ + nativeCheckInputs = [ geopy nose pysolr diff --git a/pkgs/development/python-modules/django-health-check/default.nix b/pkgs/development/python-modules/django-health-check/default.nix index 6f38ae77e16a..f4bb2db23c17 100644 --- a/pkgs/development/python-modules/django-health-check/default.nix +++ b/pkgs/development/python-modules/django-health-check/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "django-health-check"; - version = "3.16.5"; + version = "3.17.0"; src = fetchFromGitHub { owner = "KristianOellegaard"; repo = pname; - rev = version; - hash = "sha256-Jfzi+o4ja2sNCSPfX9eRq3WGid1gcfehhayAD1L4f2U="; + rev = "refs/tags/${version}"; + hash = "sha256-f87dgB2pDc+A0h41FX13qTj6Zzw5I4QwsDoC6yPkvAE="; leaveDotGit = true; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { gitMinimal ]; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook mock diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix index ccd285757cbd..624c5ba258b2 100644 --- a/pkgs/development/python-modules/django-hijack-admin/default.nix +++ b/pkgs/development/python-modules/django-hijack-admin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0m98lchp2y43886n67j4s7miyd50pg2r5r966vjnxmd7nx7qkihf"; }; - checkInputs = [ django_nose ]; + nativeCheckInputs = [ django_nose ]; propagatedBuildInputs = [ django_hijack ]; checkPhase = '' diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index d68ec8f4b75e..cefcf75f6b56 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -9,30 +9,43 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.2.4"; + version = "3.2.6"; # the wheel comes with pre-built assets, allowing us to avoid fighting # with npm/webpack/gettext to build them ourselves. format = "wheel"; + src = fetchPypi { inherit version format; pname = "django_hijack"; dist = "py3"; python = "py3"; - sha256 = "sha256-tSIovIPEszq00Y0PMl/Wlx5YK5MTxLhCpNpHFZDi9rQ="; + hash = "sha256-xFPZ03II1814+bZ5gx7GD/AxYMiLuH6awfSeXEraOHQ="; }; - propagatedBuildInputs = [ django django_compat ]; + propagatedBuildInputs = [ + django + django_compat + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-django + ]; - checkInputs = [ pytestCheckHook pytest-django ]; preCheck = '' export DJANGO_SETTINGS_MODULE='hijack.tests.test_app.settings' ''; - pytestFlagsArray = [ "--pyargs" "hijack" ]; + + pytestFlagsArray = [ + "--pyargs" + "hijack" + ]; meta = with lib; { description = "Allows superusers to hijack (=login as) and work on behalf of another user"; homepage = "https://github.com/arteria/django-hijack"; + changelog = "https://github.com/django-hijack/django-hijack/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix new file mode 100644 index 000000000000..49f68462d0c5 --- /dev/null +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, chardet +, diff-match-patch +, django +, fetchFromGitHub +, python +, pythonOlder +, pytz +, tablib +}: + +buildPythonPackage rec { + pname = "django-import-export"; + version = "2.8.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "django-import-export"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-km6TQq4OZZtx9/lgBzS3tEifAYjkkUX//9FRATDLX/0="; + }; + + propagatedBuildInputs = [ + diff-match-patch + django + tablib + ] ++ (with tablib.optional-dependencies; html ++ ods ++ xls ++ xlsx ++ yaml); + + nativeCheckInputs = [ + chardet + pytz + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} tests/manage.py test core --settings=settings + runHook postCheck + ''; + + pythonImportsCheck = [ + "import_export" + ]; + + meta = with lib; { + description = "Django application and library for importing and exporting data with admin integration"; + homepage = "https://github.com/django-import-export/django-import-export"; + changelog = "https://github.com/django-import-export/django-import-export/blob/${version}/docs/changelog.rst"; + license = licenses.bsd2; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/django-js-reverse/default.nix b/pkgs/development/python-modules/django-js-reverse/default.nix index 9757d9aa2782..a63ef50a8068 100644 --- a/pkgs/development/python-modules/django-js-reverse/default.nix +++ b/pkgs/development/python-modules/django-js-reverse/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { django ]; - checkInputs = [ + nativeCheckInputs = [ nodejs js2py six diff --git a/pkgs/development/python-modules/django-logentry-admin/default.nix b/pkgs/development/python-modules/django-logentry-admin/default.nix index 1a3998dc8c1a..b3287b6f5223 100644 --- a/pkgs/development/python-modules/django-logentry-admin/default.nix +++ b/pkgs/development/python-modules/django-logentry-admin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1bndxgvisw8kk52zfdifvly6dl4833wqilxf77pg473172yaf5gq"; }; - checkInputs = [ pytest pytest-django ]; + nativeCheckInputs = [ pytest pytest-django ]; checkPhase = '' rm -r logentry_admin __init__.py pytest diff --git a/pkgs/development/python-modules/django-login-required-middleware/default.nix b/pkgs/development/python-modules/django-login-required-middleware/default.nix new file mode 100644 index 000000000000..6c69ef7ef27a --- /dev/null +++ b/pkgs/development/python-modules/django-login-required-middleware/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, django +, djangorestframework +, fetchFromGitHub +, python +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "django-login-required-middleware"; + version = "0.9.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "CleitonDeLima"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-WFQ/JvKh6gkUxPV27QBd2TzwFS8hfQGmcTInTnmh6iA="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + django + ]; + + checkInputs = [ + djangorestframework + ]; + + pythonImportsCheck = [ + "login_required" + ]; + + checkPhase = '' + ${python.interpreter} -m django test --settings tests.settings + ''; + + meta = with lib; { + description = "Requires login to all requests through middleware in Django"; + homepage = "https://github.com/CleitonDeLima/django-login-required-middleware"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 9486764e2783..ea1be647687e 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -4,17 +4,17 @@ buildPythonPackage rec { pname = "django-mailman3"; - version = "1.3.7"; + version = "1.3.8"; src = fetchPypi { inherit pname version; - sha256 = "6ea8c24c13e7afe744f18e18e4d19d0e74223e0d9bd5d782deea85dcb865feb7"; + sha256 = "sha256-C3ZyiQZ50JFg2e+HS0oIJFK+dV8TcDYehVh875zBRFU="; }; propagatedBuildInputs = [ django-gravatar2 django-compressor django-allauth mailmanclient ]; - checkInputs = [ django mock ]; + nativeCheckInputs = [ django mock ]; checkPhase = '' cd $NIX_BUILD_TOP/$sourceRoot diff --git a/pkgs/development/python-modules/django-maintenance-mode/default.nix b/pkgs/development/python-modules/django-maintenance-mode/default.nix index 76ae8338eeb2..36b72c586d97 100644 --- a/pkgs/development/python-modules/django-maintenance-mode/default.nix +++ b/pkgs/development/python-modules/django-maintenance-mode/default.nix @@ -4,26 +4,40 @@ , pytest , django , python-fsutil +, pythonOlder }: buildPythonPackage rec { pname = "django-maintenance-mode"; - version = "0.16.3"; + version = "0.18.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-G08xQpLQxnt7JbtIo06z0NlRAMbca3UWbo4aXQR/Wy0="; + hash = "sha256-Mcj8O20hCINGf5T3PCG9jq0onSrm4R+Ke5CLMqMDmuU="; }; - checkInputs = [ pytest ]; + propagatedBuildInputs = [ + django + python-fsutil + ]; - propagatedBuildInputs = [ django python-fsutil ]; + nativeCheckInputs = [ + pytest + ]; + + pythonImportsCheck = [ + "maintenance_mode" + ]; meta = with lib; { description = "Shows a 503 error page when maintenance-mode is on"; homepage = "https://github.com/fabiocaccamo/django-maintenance-mode"; + changelog = "https://github.com/fabiocaccamo/django-maintenance-mode/releases/tag/${version}"; maintainers = with maintainers; [ mrmebelman ]; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/django-model-utils/default.nix b/pkgs/development/python-modules/django-model-utils/default.nix index dc2bd2fbc34f..2a1778708aa9 100644 --- a/pkgs/development/python-modules/django-model-utils/default.nix +++ b/pkgs/development/python-modules/django-model-utils/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { # requires postgres database doCheck = false; - checkInputs = [ + nativeCheckInputs = [ freezegun psycopg2 pytest-django diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index e98ff368a5bc..d3628d66e35b 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { DJANGO_SETTINGS_MODULE = "tests.settings"; - checkInputs = [ + nativeCheckInputs = [ djangorestframework pytest-django pytest-xdist diff --git a/pkgs/development/python-modules/django-otp/default.nix b/pkgs/development/python-modules/django-otp/default.nix index 30c361723e8f..d3fd24281aec 100644 --- a/pkgs/development/python-modules/django-otp/default.nix +++ b/pkgs/development/python-modules/django-otp/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { qrcode ]; - checkInputs = [ + nativeCheckInputs = [ freezegun ]; diff --git a/pkgs/development/python-modules/django-phonenumber-field/default.nix b/pkgs/development/python-modules/django-phonenumber-field/default.nix new file mode 100644 index 000000000000..084bf31736d7 --- /dev/null +++ b/pkgs/development/python-modules/django-phonenumber-field/default.nix @@ -0,0 +1,58 @@ +{ lib +, babel +, buildPythonPackage +, django +, djangorestframework +, fetchFromGitHub +, phonenumbers +, python +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "django-phonenumber-field"; + version = "6.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "stefanfoulis"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-rrJTCWn1mFV4QQu8wyLDxheHkZQ/FIE7mRC/9nXNSaM="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + django + phonenumbers + babel + ]; + + nativeCheckInputs = [ + djangorestframework + ]; + + pythonImportsCheck = [ + "phonenumber_field" + ]; + + checkPhase = '' + ${python.interpreter} -m django test --settings tests.settings + ''; + + meta = with lib; { + description = "A django model and form field for normalised phone numbers using python-phonenumbers"; + homepage = "https://github.com/stefanfoulis/django-phonenumber-field/"; + changelog = "https://github.com/stefanfoulis/django-phonenumber-field/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index daebb7f7e048..0d4e9502878c 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - checkInputs = [ dj-database-url ]; + nativeCheckInputs = [ dj-database-url ]; checkPhase = '' ${python.interpreter} runtests.py diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix index 141a46f53154..5564e0f6de22 100644 --- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -4,23 +4,32 @@ , netaddr , six , fetchFromGitHub +, pythonOlder # required for tests #, djangorestframework #, psycopg2 -#, unittest2 }: buildPythonPackage rec { - version = "1.2.2"; pname = "django-postgresql-netfields"; + version = "1.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jimfunk"; repo = pname; rev = "v${version}"; - sha256 = "1rrh38f3zl3jk5ijs6g75dxxvxygf4lczbgc7ahrgzf58g4a48lm"; + hash = "sha256-I+X4yfadtiiZlW7QhfwVbK1qyWn/khH9fWXszCo9uro="; }; + propagatedBuildInputs = [ + django + netaddr + six + ]; + # tests need a postgres database doCheck = false; @@ -32,18 +41,18 @@ buildPythonPackage rec { # buildInputs = [ # djangorestframework # psycopg2 - # unittest2 # ]; - propagatedBuildInputs = [ - django - netaddr - six - ]; + # Requires psycopg2 + # pythonImportsCheck = [ + # "netfields" + # ]; meta = with lib; { description = "Django PostgreSQL netfields implementation"; homepage = "https://github.com/jimfunk/django-postgresql-netfields"; + changelog = "https://github.com/jimfunk/django-postgresql-netfields/blob/v${version}/CHANGELOG"; license = licenses.bsd2; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/django-prometheus/default.nix b/pkgs/development/python-modules/django-prometheus/default.nix index 209395ef6430..aa135d17de7f 100644 --- a/pkgs/development/python-modules/django-prometheus/default.nix +++ b/pkgs/development/python-modules/django-prometheus/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { "django_prometheus" ]; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix index a6ebb5714d9d..bcbb09fa430b 100644 --- a/pkgs/development/python-modules/django-q/default.nix +++ b/pkgs/development/python-modules/django-q/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { kill $REDIS_PID ''; - checkInputs = [ + nativeCheckInputs = [ croniter django-redis pytest-django diff --git a/pkgs/development/python-modules/django-redis/default.nix b/pkgs/development/python-modules/django-redis/default.nix index 1ad52e22d0ff..11033b3e0f1e 100644 --- a/pkgs/development/python-modules/django-redis/default.nix +++ b/pkgs/development/python-modules/django-redis/default.nix @@ -60,7 +60,7 @@ buildPythonPackage { kill $REDIS_PID ''; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/django-rest-auth/default.nix b/pkgs/development/python-modules/django-rest-auth/default.nix index ac7fc4813e71..77e532ed7f3a 100644 --- a/pkgs/development/python-modules/django-rest-auth/default.nix +++ b/pkgs/development/python-modules/django-rest-auth/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ django-allauth drf-jwt responses diff --git a/pkgs/development/python-modules/django-rest-polymorphic/default.nix b/pkgs/development/python-modules/django-rest-polymorphic/default.nix index 20a4f85a95f6..7715900c60c1 100644 --- a/pkgs/development/python-modules/django-rest-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-rest-polymorphic/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/django-rest-registration/default.nix b/pkgs/development/python-modules/django-rest-registration/default.nix new file mode 100644 index 000000000000..a3da3d81a669 --- /dev/null +++ b/pkgs/development/python-modules/django-rest-registration/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, django +, djangorestframework +, fetchFromGitHub +, pytest-django +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "django-rest-registration"; + version = "0.7.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "apragacz"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-JoIeVjl5s60ilq9kU28Jo+GaYRKU61hoqy1GzYmMdZQ="; + }; + + propagatedBuildInputs = [ + django + djangorestframework + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-django + ]; + + pythonImportsCheck = [ + "rest_registration" + ]; + + disabledTests = [ + # This test fails on Python 3.10 + "test_convert_html_to_text_fails" + # This test is broken and was removed after 0.7.3. Remove this line once version > 0.7.3 + "test_coreapi_autoschema_success" + ]; + + meta = with lib; { + description = "User-related REST API based on the awesome Django REST Framework"; + homepage = "https://github.com/apragacz/django-rest-registration/"; + changelog = "https://github.com/apragacz/django-rest-registration/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix index ebdbd916ef1d..d0894177c3f9 100644 --- a/pkgs/development/python-modules/django-rq/default.nix +++ b/pkgs/development/python-modules/django-rq/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "django-rq"; - version = "2.5.1"; + version = "2.6.0"; format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { owner = "rq"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-4oc3zco/j4lnAiooW87rU6xkzGSGCj3fIyikjiKQNZk="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Na/GeQc74LCoi7Dp3HcSnmUaLi1EjyYYgZTcFyzqOQM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-scim2/default.nix b/pkgs/development/python-modules/django-scim2/default.nix new file mode 100644 index 000000000000..90db4fe633d3 --- /dev/null +++ b/pkgs/development/python-modules/django-scim2/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# propagates +, django +, python-dateutil +, scim2-filter-parser +, gssapi +, python-ldap +, sssd + +# tests +, mock +}: + +buildPythonPackage rec { + pname = "django-scim2"; + version = "0.17.3"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "15five"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-5zdGPpjooiFoj+2OoglXhhKsPFB/KOHvrZWZd+1nZqU="; + }; + + propagatedBuildInputs = [ + django + python-dateutil + scim2-filter-parser + gssapi + python-ldap + sssd + ]; + + pythonImportsCheck = [ + "django_scim" + ]; + + nativeCheckInputs = [ + mock + ]; + + meta = with lib; { + description = "A SCIM 2.0 Service Provider Implementation (for Django)"; + homepage = "https://github.com/15five/django-scim2"; + license = licenses.mit; + maintainers = with maintainers; [ s1341 ]; + }; +} diff --git a/pkgs/development/python-modules/django-scopes/default.nix b/pkgs/development/python-modules/django-scopes/default.nix index 26810445faad..9b11393d3db0 100644 --- a/pkgs/development/python-modules/django-scopes/default.nix +++ b/pkgs/development/python-modules/django-scopes/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { django ]; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; diff --git a/pkgs/development/python-modules/django-sesame/default.nix b/pkgs/development/python-modules/django-sesame/default.nix index e24fff1efe77..eadc07519a00 100644 --- a/pkgs/development/python-modules/django-sesame/default.nix +++ b/pkgs/development/python-modules/django-sesame/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0k8s44zn2jmasp0w064vrx685fn4pbmdfx8qmhkab1hd5ys6pi44"; }; - checkInputs = [ django ]; + nativeCheckInputs = [ django ]; checkPhase = '' make test diff --git a/pkgs/development/python-modules/django-simple-captcha/default.nix b/pkgs/development/python-modules/django-simple-captcha/default.nix index 2a7f1e1da26d..86b81a625719 100644 --- a/pkgs/development/python-modules/django-simple-captcha/default.nix +++ b/pkgs/development/python-modules/django-simple-captcha/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { extension = "zip"; }; - checkInputs = [ testfixtures ]; + nativeCheckInputs = [ testfixtures ]; checkPhase = '' cd testproject ${python.interpreter} manage.py test captcha diff --git a/pkgs/development/python-modules/django-sites/default.nix b/pkgs/development/python-modules/django-sites/default.nix index 08641aa935f9..9e6bdc2fdbfd 100644 --- a/pkgs/development/python-modules/django-sites/default.nix +++ b/pkgs/development/python-modules/django-sites/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { django ]; - checkInputs = [ + nativeCheckInputs = [ django-jinja ]; diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix index 8fcfa070d2d4..9fc04339c226 100644 --- a/pkgs/development/python-modules/django-statici18n/default.nix +++ b/pkgs/development/python-modules/django-statici18n/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { DJANGO_SETTINGS_MODULE = "tests.test_project.project.settings"; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 040fe39d2b50..5b638aa05b34 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -1,6 +1,7 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , django - , azure-storage-blob , boto3 , dropbox @@ -11,14 +12,16 @@ buildPythonPackage rec { pname = "django-storages"; - version = "1.13.1"; + version = "1.13.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-s9mOzAnxsWJ8Kyz0MJZDIs5OCGF9v5tCNsFqModaHgs="; + hash = "sha256-y63RXJCc63JH1P/FA/Eqm+w2mZ340L73wx5XF31RJog="; }; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ + django + ]; preCheck = '' export DJANGO_SETTINGS_MODULE=tests.settings @@ -27,7 +30,8 @@ buildPythonPackage rec { --replace 'test_accessed_time' 'dont_test_accessed_time' \ --replace 'test_modified_time' 'dont_test_modified_time' ''; - checkInputs = [ + + nativeCheckInputs = [ azure-storage-blob boto3 dropbox @@ -36,11 +40,14 @@ buildPythonPackage rec { paramiko ]; - pythonImportsCheck = [ "storages" ]; + pythonImportsCheck = [ + "storages" + ]; meta = with lib; { description = "Collection of custom storage backends for Django"; homepage = "https://django-storages.readthedocs.io"; + changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; }; diff --git a/pkgs/development/python-modules/django-stubs-ext/default.nix b/pkgs/development/python-modules/django-stubs-ext/default.nix index 883e979b1d37..0fb43a1dca56 100644 --- a/pkgs/development/python-modules/django-stubs-ext/default.nix +++ b/pkgs/development/python-modules/django-stubs-ext/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-stubs-ext"; - version = "0.5.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-m9dBg3arALf4jW1Wvp/s6Fv6DHw0isYhFV+k16kRRvI="; + sha256 = "sha256-T9jNvGjRpCHyG7fg2edtUPaktQTTULp4ZAXa9TbpDCE="; }; # setup.cfg tries to pull in nonexistent LICENSE.txt file diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix index a03ed9aae01a..0ecb78f47546 100644 --- a/pkgs/development/python-modules/django-stubs/default.nix +++ b/pkgs/development/python-modules/django-stubs/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "django-stubs"; - version = "1.12.0"; + version = "1.13.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6os10NpJ97LumaeRJfGUPgM0Md0RRybWZDzDXeYZIw4="; + sha256 = "sha256-vMYYujU9q8VA2YK52sHVoZIWUvj8KhNlPVRaV9XjzA8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-taggit/default.nix b/pkgs/development/python-modules/django-taggit/default.nix index dd5e025edd5c..a5e93201bf37 100644 --- a/pkgs/development/python-modules/django-taggit/default.nix +++ b/pkgs/development/python-modules/django-taggit/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { "taggit" ]; - checkInputs = [ + nativeCheckInputs = [ djangorestframework ]; diff --git a/pkgs/development/python-modules/django-tastypie/default.nix b/pkgs/development/python-modules/django-tastypie/default.nix index a6c184e2d67e..8056aca7100e 100644 --- a/pkgs/development/python-modules/django-tastypie/default.nix +++ b/pkgs/development/python-modules/django-tastypie/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "django-tastypie"; - version = "0.14.4"; + version = "0.14.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-tastypie"; repo = pname; - rev = "v${version}"; - hash = "sha256-O/aVi8BshOZmg9WQxrFlBEOXfgyqJKVK/QlEFG3Edqs="; + rev = "refs/tags/v${version}"; + hash = "sha256-RgYinpo8eVzRaSkcnFkSq+IqpcFt6LCCHkpHyB/7u5M="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utilities and helpers for writing Pylint plugins"; homepage = "https://github.com/django-tastypie/django-tastypie"; + changelog = "https://github.com/django-tastypie/django-tastypie/releases/tag/v${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/django-timezone-field/default.nix b/pkgs/development/python-modules/django-timezone-field/default.nix index f8f85adf0d3d..123d44a78a29 100644 --- a/pkgs/development/python-modules/django-timezone-field/default.nix +++ b/pkgs/development/python-modules/django-timezone-field/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { DJANGO_SETTINGS_MODULE = "tests.settings"; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-lazy-fixture ]; diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/pkgs/development/python-modules/django-versatileimagefield/default.nix index 01c1b8353ba8..9ff9a5bec55e 100644 --- a/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pillow python-magic ]; - checkInputs = [ django ]; + nativeCheckInputs = [ django ]; # tests not included with pypi release doCheck = false; diff --git a/pkgs/development/python-modules/django-vite/default.nix b/pkgs/development/python-modules/django-vite/default.nix new file mode 100644 index 000000000000..34bb765cff5c --- /dev/null +++ b/pkgs/development/python-modules/django-vite/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, django +, pythonOlder +}: + +buildPythonPackage rec { + pname = "django-vite"; + version = "2.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "MrBin99"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-lYRFNHTIQBn7CDnWFxSzXELzqEtQcbwHedSZnR7ZtbE="; + }; + + propagatedBuildInputs = [ + django + ]; + + # Package doesn’t have any tests + doCheck = false; + + pythonImportsCheck = [ + "django_vite" + ]; + + meta = with lib; { + description = "Integration of ViteJS in a Django project"; + homepage = "https://github.com/MrBin99/django-vite"; + changelog = "https://github.com/MrBin99/django-vite/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index 67d6035696ed..7b5b6c67cff4 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "1.7.0"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-agZTglc3cbr0AHVMTTnAkTsKKaRTqUHfuRIu6+0hVy8="; + hash = "sha256-puZ5gF6WB7Bz7lJwLZtCa6waVGCdlmExqkNMeGAqwFA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 935abb99c8db..91c83942be8c 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -43,14 +43,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.1.3"; + version = "4.1.6"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Z4u/yGBOskbtVOIGPwdl8TsyGlBSa9yMsflD7af6MfE="; + hash = "sha256-vOsP4aOGeBrweIyuQQhiJ1bNBed3VEje7ASnHd+HaF0="; }; patches = [ @@ -82,7 +82,7 @@ buildPythonPackage rec { # ModuleNotFoundError: No module named 'asgiref' doCheck = false; - checkInputs = [ + nativeCheckInputs = [ aiosmtpd argon2-cffi asgiref @@ -113,6 +113,7 @@ buildPythonPackage rec { ''; meta = with lib; { + changelog = "https://docs.djangoproject.com/en/${lib.versions.majorMinor version}/releases/${version}/"; description = "A high-level Python Web framework that encourages rapid development and clean, pragmatic design."; homepage = "https://www.djangoproject.com"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/django_classytags/default.nix b/pkgs/development/python-modules/django_classytags/default.nix index d7d2e8789ae7..06a336be0814 100644 --- a/pkgs/development/python-modules/django_classytags/default.nix +++ b/pkgs/development/python-modules/django_classytags/default.nix @@ -2,27 +2,37 @@ , buildPythonPackage , fetchPypi , django -, six +, pythonOlder }: buildPythonPackage rec { pname = "django-classy-tags"; - version = "3.0.1"; + version = "4.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0iK0VQKsmeVQpWZmeDnvrvlUucc2amST8UOGKqvqyHg="; + hash = "sha256-25/Hxe0I3CYZzEwZsZUUzawT3bYYJ4qwcJTGJtKO7w0="; }; - propagatedBuildInputs = [ django six ]; + propagatedBuildInputs = [ + django + ]; # pypi version doesn't include runtest.py, needed to run tests doCheck = false; + pythonImportsCheck = [ + "classytags" + ]; + meta = with lib; { description = "Class based template tags for Django"; homepage = "https://github.com/divio/django-classy-tags"; + changelog = "https://github.com/django-cms/django-classy-tags/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index d59682de2f81..b7fbc9f2b179 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { django-taggit ]; - checkInputs = passthru.optional-dependencies.taggit; + nativeCheckInputs = passthru.optional-dependencies.taggit; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index 0dedc4d3bb9e..8a53a9d1d58f 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "django-silk"; - version = "5.0.2"; + version = "5.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-silk"; rev = "refs/tags/${version}"; - hash = "sha256-LzcbRZ9NLTkDTZ2eW+uXYqPbWDSdLZAJcYdD8JLuiDc="; + hash = "sha256-91FcOqAYZK7/RCKgXjbQEPUQ2cZRFi7NzVLQF+MMDRI="; }; # "test_time_taken" tests aren't suitable for reproducible execution, but Django's @@ -70,7 +70,7 @@ buildPythonPackage rec { sqlparse ]; - checkInputs = [ + nativeCheckInputs = [ freezegun contextlib2 networkx @@ -95,6 +95,7 @@ buildPythonPackage rec { meta = with lib; { description = "Silky smooth profiling for the Django Framework"; homepage = "https://github.com/jazzband/django-silk"; + changelog = "https://github.com/jazzband/django-silk/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix index be63c1e9e3c9..2728d77d3f80 100644 --- a/pkgs/development/python-modules/django_treebeard/default.nix +++ b/pkgs/development/python-modules/django_treebeard/default.nix @@ -1,30 +1,42 @@ { lib , buildPythonPackage -, fetchPypi -, pytest , django +, fetchPypi +, pytest-django +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "django-treebeard"; - version = "4.5.1"; + version = "4.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "80150017725239702054e5fa64dc66e383dc13ac262c8d47ee5a82cb005969da"; + hash = "sha256-frHrcbJCFPLn3DvSFfDDrjL9Z2QXnNR3SveqtJE53qA="; }; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ + django + ]; - # tests fail "AppRegistryNotReady("Apps aren't loaded yet.")" - doCheck = false; + nativeCheckInputs = [ + pytest-django + pytestCheckHook + ]; + + pythonImportsCheck = [ + "treebeard" + ]; meta = with lib; { - description = "Efficient tree implementations for Django 1.6+"; + description = "Efficient tree implementations for Django"; homepage = "https://tabo.pe/projects/django-treebeard/"; - maintainers = with maintainers; [ desiderius ]; + changelog = "https://github.com/django-treebeard/django-treebeard/blob/${version}/CHANGES.md"; license = licenses.asl20; + maintainers = with maintainers; [ desiderius ]; }; - } diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix index 0e38c82cab7e..cc0c4f5b4c37 100644 --- a/pkgs/development/python-modules/djangoql/default.nix +++ b/pkgs/development/python-modules/djangoql/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ply ]; - checkInputs = [ django ]; + nativeCheckInputs = [ django ]; checkPhase = '' export PYTHONPATH=test_project:$PYTHONPATH diff --git a/pkgs/development/python-modules/djangorestframework-camel-case/default.nix b/pkgs/development/python-modules/djangorestframework-camel-case/default.nix index 1a2cde8881c8..c4d1d300cca7 100644 --- a/pkgs/development/python-modules/djangorestframework-camel-case/default.nix +++ b/pkgs/development/python-modules/djangorestframework-camel-case/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { djangorestframework ]; - checkInputs = [ + nativeCheckInputs = [ six ]; diff --git a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix index c6b56651f927..4242c24c90bf 100644 --- a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix +++ b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix @@ -2,19 +2,25 @@ , buildPythonPackage , fetchFromGitHub , djangorestframework +, setuptools }: buildPythonPackage rec { pname = "djangorestframework-dataclasses"; - version = "1.1.1"; + version = "1.2.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "oxan"; repo = "djangorestframework-dataclasses"; - rev = "v${version}"; - sha256 = "sha256-wXgA/4Dik6yG0nKl9GbrHgb2lhrPsgS23+cEyaD9MRY="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-PTX5huYdusPV6xCBW+8sFwusuPtZBH1vVApvcQU7Dlc="; }; + nativeBuildInputs = [ + setuptools + ]; + postPatch = '' patchShebangs manage.py ''; diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 1fb8fd9f4b0a..067502961f5d 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index aaaf5708a593..dbe8912153fe 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "9a2420bf09af686736773153fca32a02ae11ecbe24b540c26104628959f91121"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ openssl dnspython pynacl authres ]; patchPhase = '' diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index 601c5ca50758..f75767811c1d 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -8,7 +8,7 @@ buildPythonPackage { patches = [ ./build-cores.patch ]; - checkInputs = [ pytest more-itertools ]; + nativeCheckInputs = [ pytest more-itertools ]; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/dlinfo/default.nix b/pkgs/development/python-modules/dlinfo/default.nix index a1f3ace78275..b51c71913f5f 100644 --- a/pkgs/development/python-modules/dlinfo/default.nix +++ b/pkgs/development/python-modules/dlinfo/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dlms-cosem/default.nix b/pkgs/development/python-modules/dlms-cosem/default.nix index e6040fb7860a..d9356e149237 100644 --- a/pkgs/development/python-modules/dlms-cosem/default.nix +++ b/pkgs/development/python-modules/dlms-cosem/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dm-env/default.nix b/pkgs/development/python-modules/dm-env/default.nix index 92c234c215c3..a11d35495575 100644 --- a/pkgs/development/python-modules/dm-env/default.nix +++ b/pkgs/development/python-modules/dm-env/default.nix @@ -4,15 +4,17 @@ , dm-tree , numpy , absl-py -, nose }: +, pytestCheckHook +}: buildPythonPackage rec { pname = "dm-env"; - version = "1.5"; + version = "1.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Pv2ZsGUlY1mVB8QV1ItRiWyIvi8BwrYlCvi6tRVx41M="; + hash = "sha256-pDbrHGVMOeDJhqUWzuIYvqcUC1EPzv9j+X60/P89k94="; }; buildInputs = [ @@ -21,8 +23,8 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ - nose + nativeCheckInputs = [ + pytestCheckHook ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index 87de983330c2..c756ff67a138 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "dm-haiku"; - version = "0.0.7"; + version = "0.0.9"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; - rev = "v${version}"; - hash = "sha256-Qa3g3vOPZJt/wBjjuZHAcFUz/gwN/yvirV/8V9CnIko="; + rev = "refs/tags/v${version}"; + hash = "sha256-d5THbfMRrbBL/2sQ99l2yeaTI9gT+bSkcxmVdRJT5bA="; }; outputs = [ diff --git a/pkgs/development/python-modules/dm-haiku/tests.nix b/pkgs/development/python-modules/dm-haiku/tests.nix index 93a4f3cd4795..a951323e5d89 100644 --- a/pkgs/development/python-modules/dm-haiku/tests.nix +++ b/pkgs/development/python-modules/dm-haiku/tests.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ bsuite chex cloudpickle diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index e089b91eb0f8..0f1518d6e5a0 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ docutils tensorflow-datasets ]; diff --git a/pkgs/development/python-modules/dm-tree/cmake.patch b/pkgs/development/python-modules/dm-tree/cmake.patch index e5698f457bc3..28f201a30f71 100644 --- a/pkgs/development/python-modules/dm-tree/cmake.patch +++ b/pkgs/development/python-modules/dm-tree/cmake.patch @@ -1,13 +1,13 @@ diff --git a/tree/CMakeLists.txt b/tree/CMakeLists.txt -index 8f9946c..b9d6e9b 100644 +index 4fd1b1a..f0d072b 100644 --- a/tree/CMakeLists.txt +++ b/tree/CMakeLists.txt -@@ -50,70 +50,80 @@ if(APPLE) +@@ -50,70 +50,79 @@ if(APPLE) set (CMAKE_FIND_FRAMEWORK LAST) endif() -# Fetch pybind to be able to use pybind11_add_module symbol. --set(PYBIND_VER v2.6.2) +-set(PYBIND_VER v2.10.1) -include(FetchContent) -FetchContent_Declare( - pybind11 @@ -42,7 +42,7 @@ index 8f9946c..b9d6e9b 100644 + +if (NOT pybind11_FOUND) + # Fetch pybind to be able to use pybind11_add_module symbol. -+ set(PYBIND_VER v2.6.2) ++ set(PYBIND_VER v2.10.1) + include(FetchContent) + FetchContent_Declare( + pybind11 @@ -69,10 +69,7 @@ index 8f9946c..b9d6e9b 100644 # Define pybind11 tree module. pybind11_add_module(_tree tree.h tree.cc) -add_dependencies(_tree abseil-cpp) - --if (WIN32 OR MSVC) -- set(ABSEIL_LIB_PREF "absl") -- set(LIB_SUFF "lib") +- +find_package(absl) + +if (NOT absl_FOUND) @@ -115,6 +112,9 @@ index 8f9946c..b9d6e9b 100644 + set(LIB_SUFF "a") + endif() + +-if (WIN32 OR MSVC) +- set(ABSEIL_LIB_PREF "absl") +- set(LIB_SUFF "lib") + # Link abseil static libs. + # We don't use find_library here to force cmake to build abseil before linking. + set(ABSEIL_LIBS int128 raw_hash_set raw_logging_internal strings throw_delegate) diff --git a/pkgs/development/python-modules/dm-tree/default.nix b/pkgs/development/python-modules/dm-tree/default.nix index 1b9437096648..de1a5f664648 100644 --- a/pkgs/development/python-modules/dm-tree/default.nix +++ b/pkgs/development/python-modules/dm-tree/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "dm-tree"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "deepmind"; repo = "tree"; - rev = version; - hash = "sha256-rg6dcGcbTGfK3h4WAyhwCjgM3o64Jj2SImxNsZXJHHM="; + rev = "refs/tags/${version}"; + hash = "sha256-VvSJTuEYjIz/4TTibSLkbg65YmcYqHImTHOomeorMJc="; }; patches = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { pybind11 ]; - checkInputs = [ + nativeCheckInputs = [ absl-py attrs numpy diff --git a/pkgs/development/python-modules/dnachisel/default.nix b/pkgs/development/python-modules/dnachisel/default.nix index 1c86e3bccf6b..7ef6a44ba9c2 100644 --- a/pkgs/development/python-modules/dnachisel/default.nix +++ b/pkgs/development/python-modules/dnachisel/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "dnachisel"; - version = "3.2.9"; + version = "3.2.10"; src = fetchFromGitHub { owner = "Edinburgh-Genome-Foundry"; repo = "DnaChisel"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Fg0gkI+01xIt8LQmNmRzkzd4AObg/99x34y5NclMtDQ="; + sha256 = "sha256-YlNOvK7ZXUHYdRX1NFEdZ646NGLtGXU1YgAjN6RY2QE="; }; propagatedBuildInputs = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { python-codon-tables ]; - checkInputs = [ + nativeCheckInputs = [ primer3 genome-collector matplotlib diff --git a/pkgs/development/python-modules/dnfile/default.nix b/pkgs/development/python-modules/dnfile/default.nix new file mode 100644 index 000000000000..0f589b7d95ac --- /dev/null +++ b/pkgs/development/python-modules/dnfile/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pefile +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "dnfile"; + version = "0.13.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "malwarefrank"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-TH30gEoxXkaDac6hJsGQFWzwDeqzdZ19HK8i/3Dlh8k="; + fetchSubmodules = true; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; + + propagatedBuildInputs = [ + pefile + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dnfile" + ]; + + meta = with lib; { + description = "Module to parse .NET executable files"; + homepage = "hhttps://github.com/malwarefrank/dnfile"; + changelog = "https://github.com/malwarefrank/dnfile/blob/v${version}/HISTORY.rst"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 4b7148596492..fa77bc0d0cde 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0gk00m8zxjghxnzafhars51k5ahd6wfhf123nrc1j5gzlsj6jx8g"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ lib.optionals stdenv.isDarwin [ cacert diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index 46d0db5e4a4a..5abb1f6d2ab0 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "doc8"; - version = "1.0.0"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HpmaFP5BXqltidUFPHkNAQYfGbZzdwa4F9FXnCoHzBY="; + hash = "sha256-2XqT6PWi78RxOggEZX3trYN0XMpM0diN6Rhvd/l3YAQ="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { pygments ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Style checker for Sphinx (or other) RST documentation"; homepage = "https://github.com/pycqa/doc8"; + changelog = "https://github.com/PyCQA/doc8/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix index 0523678bb074..f7be25f61509 100644 --- a/pkgs/development/python-modules/docformatter/default.nix +++ b/pkgs/development/python-modules/docformatter/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { untokenize ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 46103311700d..f4c59515315c 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { paramiko ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix index 55ff20803b26..8cf15e9fda75 100644 --- a/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -1,28 +1,23 @@ { lib , buildPythonPackage , fetchPypi -, six , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "dockerfile-parse"; - version = "1.2.0"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-B+Ze7DE5eOh32oGYVYcLOuR/P6yUpAqWW57eEEhNrMU="; + hash = "sha256-If59UQZC8rYamZ1Fw9l0X5UOEf5rokl1Vbj2N4K3jkU="; }; - propagatedBuildInputs = [ - six - ]; - - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -38,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for parsing Dockerfile files"; homepage = "https://github.com/DBuildService/dockerfile-parse"; + changelog = "https://github.com/containerbuildsystem/dockerfile-parse/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ leenaars ]; }; diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 5f64ee3a6fe7..1d3c53c95d51 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.23.222"; + version = "2.25.236"; # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "sha256-c5XpfEGTkojgzk+ATHCSzzh04zeEVJEEKBp+lPfS+x4="; + sha256 = "sha256-JWkUtMAROk4cePMuogx9dtyO/ihv6JAnDnXPrVD+UQ8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/docrep/default.nix b/pkgs/development/python-modules/docrep/default.nix index 3e5d9f21a2bb..37785f1e29db 100644 --- a/pkgs/development/python-modules/docrep/default.nix +++ b/pkgs/development/python-modules/docrep/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "ed8a17e201abd829ef8da78a0b6f4d51fb99a4cbd0554adbed3309297f964314"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ six ]; checkPhase = '' diff --git a/pkgs/development/python-modules/docstring-parser/default.nix b/pkgs/development/python-modules/docstring-parser/default.nix index 53a59f10ffac..4f8bfa60e3d8 100644 --- a/pkgs/development/python-modules/docstring-parser/default.nix +++ b/pkgs/development/python-modules/docstring-parser/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/docstring-to-markdown/default.nix b/pkgs/development/python-modules/docstring-to-markdown/default.nix index 432f77220adc..d287dcf293cc 100644 --- a/pkgs/development/python-modules/docstring-to-markdown/default.nix +++ b/pkgs/development/python-modules/docstring-to-markdown/default.nix @@ -2,17 +2,21 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "docstring-to-markdown"; - version = "0.10"; + version = "0.11"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python-lsp"; repo = pname; - rev = "v${version}"; - sha256 = "0rflkbms94wkcypjcnz30bc4w4iww91h7sqq3j2b6ypzl4g48csa"; + rev = "refs/tags/v${version}"; + hash = "sha256-4Jl1XJpxwbxGWxdF4bOerjHyzHCIHtrydklwwk1WGs4="; }; patches = [ @@ -20,7 +24,7 @@ buildPythonPackage rec { ./remove-coverage-tests.patch ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -31,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/python-lsp/docstring-to-markdown"; description = "On the fly conversion of Python docstrings to markdown"; + changelog = "https://github.com/python-lsp/docstring-to-markdown/releases/tag/v${version}"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ doronbehar ]; }; diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index 930077939818..ca7fcae7406e 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -2,13 +2,16 @@ , lib , fetchPypi , buildPythonPackage -, isPy3k , python +, pythonOlder }: buildPythonPackage rec { pname = "docutils"; version = "0.19"; + + disabled = pythonOlder "3.7"; + format = "setuptools"; src = fetchPypi { @@ -18,7 +21,7 @@ buildPythonPackage rec { # Only Darwin needs LANG, but we could set it in general. # It's done here conditionally to prevent mass-rebuilds. - checkPhase = lib.optionalString (isPy3k && stdenv.isDarwin) ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + '' + checkPhase = lib.optionalString stdenv.isDarwin ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + '' ${python.interpreter} test/alltests.py ''; diff --git a/pkgs/development/python-modules/docx2python/default.nix b/pkgs/development/python-modules/docx2python/default.nix index b6a63d48b357..13b41949ebef 100644 --- a/pkgs/development/python-modules/docx2python/default.nix +++ b/pkgs/development/python-modules/docx2python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; preCheck = "cd test"; # Tests require the `test/resources` folder to be accessible - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # asserts related to file deletions fail "test_docx2python.py" "test_docx_context.py" diff --git a/pkgs/development/python-modules/dodgy/default.nix b/pkgs/development/python-modules/dodgy/default.nix index ecd3cc6ce758..4437beb760ce 100644 --- a/pkgs/development/python-modules/dodgy/default.nix +++ b/pkgs/development/python-modules/dodgy/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "0ywwjpz0p6ls3hp1lndjr9ql6s5lkj7dgpll1h87w04kwan70j0x"; }; - checkInputs = [ + nativeCheckInputs = [ mock nose ]; diff --git a/pkgs/development/python-modules/dogpile-cache/default.nix b/pkgs/development/python-modules/dogpile-cache/default.nix index c367556b4ecb..a47dc6246a55 100644 --- a/pkgs/development/python-modules/dogpile-cache/default.nix +++ b/pkgs/development/python-modules/dogpile-cache/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; - checkInputs = [ pytestCheckHook mock Mako ]; + nativeCheckInputs = [ pytestCheckHook mock Mako ]; propagatedBuildInputs = [ decorator stevedore ]; diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix index fb513a20c654..cc4430ddb399 100644 --- a/pkgs/development/python-modules/dogtail/default.nix +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -45,7 +45,7 @@ buildPythonPackage { # export NO_AT_BRIDGE=1 gsettings set org.gnome.desktop.interface toolkit-accessibility true xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ ${python.interpreter} nix_run_setup test runHook postCheck ''; diff --git a/pkgs/development/python-modules/doit-py/default.nix b/pkgs/development/python-modules/doit-py/default.nix index 33d128c3d765..2ad323f1670e 100644 --- a/pkgs/development/python-modules/doit-py/default.nix +++ b/pkgs/development/python-modules/doit-py/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { mergedict ]; - checkInputs = [ + nativeCheckInputs = [ hunspell hunspellDicts.en_US pytestCheckHook diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix index cfb36b7daf4a..40a94c6aebbd 100644 --- a/pkgs/development/python-modules/doit/default.nix +++ b/pkgs/development/python-modules/doit/default.nix @@ -34,7 +34,7 @@ let doit = buildPythonPackage rec { ] ++ lib.optional stdenv.isLinux pyinotify ++ lib.optional stdenv.isDarwin macfsevents; - checkInputs = [ + nativeCheckInputs = [ configclass doit-py mergedict diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix index aa840dc9ff51..142f1e32eda2 100644 --- a/pkgs/development/python-modules/dominate/default.nix +++ b/pkgs/development/python-modules/dominate/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-UgEBNgiS6/nQVT9n0341n/kkA9ih4zgUAwUDCIoF2kk="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/doorbirdpy/default.nix b/pkgs/development/python-modules/doorbirdpy/default.nix index 1290aaf05757..54750b63a933 100644 --- a/pkgs/development/python-modules/doorbirdpy/default.nix +++ b/pkgs/development/python-modules/doorbirdpy/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , requests +, pythonOlder }: buildPythonPackage rec { pname = "doorbirdpy"; - version = "2.1.0"; + version = "2.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "DoorBirdPy"; inherit version; - sha256 = "ed0e94953cdf96111c7f73c5fcf358f65dc0ff5e47f63fc057bf18ca7512e606"; + hash = "sha256-o6d8xXF5OuiF0B/wwYhDAZr05D84MuxHBY96G2XHILU="; }; propagatedBuildInputs = [ @@ -21,7 +25,9 @@ buildPythonPackage rec { # no tests on PyPI, no tags on GitLab doCheck = false; - pythonImportsCheck = [ "doorbirdpy" ]; + pythonImportsCheck = [ + "doorbirdpy" + ]; meta = with lib; { description = "Python wrapper for the DoorBird LAN API"; diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/pkgs/development/python-modules/dot2tex/default.nix index 2154f33bb8ba..955d57ffd5c6 100644 --- a/pkgs/development/python-modules/dot2tex/default.nix +++ b/pkgs/development/python-modules/dot2tex/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ (texlive.combine { inherit (texlive) scheme-small preview pstricks; }) diff --git a/pkgs/development/python-modules/dotmap/default.nix b/pkgs/development/python-modules/dotmap/default.nix index 5c4cfbf95240..2300ac013a24 100644 --- a/pkgs/development/python-modules/dotmap/default.nix +++ b/pkgs/development/python-modules/dotmap/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-WCGnkz8HX7R1Y0F8DpLgt8AxFYtMmmp+VhY0ebZYs2g="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dparse/default.nix b/pkgs/development/python-modules/dparse/default.nix index d91bdb507a65..72c372e5aa78 100644 --- a/pkgs/development/python-modules/dparse/default.nix +++ b/pkgs/development/python-modules/dparse/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dparse2/default.nix b/pkgs/development/python-modules/dparse2/default.nix index d3b61574cf8a..9d6cb9b085f2 100644 --- a/pkgs/development/python-modules/dparse2/default.nix +++ b/pkgs/development/python-modules/dparse2/default.nix @@ -4,13 +4,13 @@ , pythonOlder , toml , pyyaml -, packaging +, packvers , pytestCheckHook }: buildPythonPackage rec { pname = "dparse2"; - version = "0.6.1"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,17 +18,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nexB"; repo = pname; - rev = version; - hash = "sha256-1tbNW7Gy7gvMnETdAM2ahHiwbhG9qvdYZggia1+7eGo="; + rev = "refs/tags/${version}"; + hash = "sha256-JUTL+SVf1RRIXQqwFR7MnExsgGseSiO0a5YzzcqdXHw="; }; propagatedBuildInputs = [ toml pyyaml - packaging + packvers ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to parse Python dependency files"; homepage = "https://github.com/nexB/dparse2"; + changelog = "https://github.com/nexB/dparse2/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index b6f0176dd737..97d7396078aa 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -4,26 +4,26 @@ , hypothesis , isPy27 , mock -, nose +, nose2 , pytestCheckHook }: buildPythonPackage rec { pname = "dpath"; - version = "2.0.6"; + version = "2.1.4"; disabled = isPy27; # uses python3 imports src = fetchPypi { inherit pname version; - sha256 = "sha256-Wh3a5SIz+8jvgbFfuFBzqBEmu0NpjT86G2qvVhpGzcA="; + sha256 = "sha256-M4CnfQ20q/EEElhg/260vQfJfGW4Gq1CpglxcImhvtA="; }; # use pytest as nosetests hangs - checkInputs = [ + nativeCheckInputs = [ hypothesis mock - nose + nose2 pytestCheckHook ]; diff --git a/pkgs/development/python-modules/drawille/default.nix b/pkgs/development/python-modules/drawille/default.nix new file mode 100644 index 000000000000..a00b0b16892b --- /dev/null +++ b/pkgs/development/python-modules/drawille/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "drawille"; + version = "0.1.0"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-t4nS8TWbEGKHibIbLfZZycPQxTiEzuJ7DYsa6Twi+8s="; + }; + + doCheck = false; # pypi package has no tests, git has no tags + + pythonImportsCheck = [ + "drawille" + ]; + + meta = with lib; { + description = "Drawing in terminal with unicode braille characters"; + homepage = "https://github.com/asciimoo/drawille"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ nobbz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/drawilleplot/default.nix b/pkgs/development/python-modules/drawilleplot/default.nix new file mode 100644 index 000000000000..1ed452c1d109 --- /dev/null +++ b/pkgs/development/python-modules/drawilleplot/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, drawille +, matplotlib +}: + +buildPythonPackage rec { + pname = "drawilleplot"; + version = "0.1.0"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ZEDroo7KkI2VxdESb2QDX+dPY4UahuuK9L0EddrxJjQ="; + }; + + doCheck = false; # does not have any tests at all + + propagatedBuildInputs = [ + drawille + matplotlib + ]; + + pythonImportsCheck = [ + "drawilleplot" + ]; + + meta = with lib; { + description = "matplotlib backend for graph output in unicode terminals using drawille"; + homepage = "https://github.com/gooofy/drawilleplot"; + license = licenses.asl20; + maintainers = with maintainers; [ nobbz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/drf-nested-routers/default.nix b/pkgs/development/python-modules/drf-nested-routers/default.nix index db0212e45697..8e5236389da8 100644 --- a/pkgs/development/python-modules/drf-nested-routers/default.nix +++ b/pkgs/development/python-modules/drf-nested-routers/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ django djangorestframework setuptools ]; - checkInputs = [ pytest pytest-cov pytest-django ipdb ]; + nativeCheckInputs = [ pytest pytest-cov pytest-django ipdb ]; checkPhase = '' ${python.interpreter} runtests.py --nolint diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix index 0941c2ab309c..0b0a256c1d61 100644 --- a/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/pkgs/development/python-modules/drf-spectacular/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { uritemplate ]; - checkInputs = [ + nativeCheckInputs = [ dj-rest-auth django-allauth django-filter diff --git a/pkgs/development/python-modules/drf-writable-nested/default.nix b/pkgs/development/python-modules/drf-writable-nested/default.nix index 77ce7d37ff8d..339677d387c9 100644 --- a/pkgs/development/python-modules/drf-writable-nested/default.nix +++ b/pkgs/development/python-modules/drf-writable-nested/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "drf-writable-nested"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "beda-software"; repo = "drf-writable-nested"; - rev = "v${version}"; - sha256 = "sha256-RybtXZ5HipQHaA2RV6TOKIpl6aI9V49mqXDhCH6lg58="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-/7MZAw0clzzlBdYchUVKldWT7WqtwdSe+016QAP0hqk="; }; propagatedBuildInputs = [ @@ -23,7 +23,7 @@ buildPythonPackage rec { djangorestframework ]; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index bdfb88402c2f..eca45373fab7 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { djangorestframework ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-django datadiff diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index a081a7445c4a..6e5b4dc2b629 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "drms"; - version = "0.6.2"; + version = "0.6.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Id8rPK8qq71gHn5DKnEi7Lp081GFbcFtGU+v89Vlt9o="; + sha256 = "sha256-crPVo7ALErZWvNcsaJ/BuBa0VkfCsZ+C929x4kEZHKw="; }; nativeBuildInputs = [ @@ -32,12 +32,20 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ astropy pytestCheckHook pytest-doctestplus ]; + disabledTests = [ + "test_query_hexadecimal_strings" + ]; + + disabledTestPaths = [ + "docs/tutorial.rst" + ]; + pythonImportsCheck = [ "drms" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index f38b504cbb8c..68eeb2aeb564 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.35.0"; + version = "11.36.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-vrOqsRe2sBsL5CIfGCmoO3geE9G0FJl88HRcP6FzZe0="; + hash = "sha256-J2AaGkD4TMDcVzTtdcNH0bgy6de+BRjYdtTaRL3lYrs="; }; propagatedBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { stone ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-mock pytestCheckHook @@ -77,6 +77,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for Dropbox's HTTP-based Core and Datastore APIs"; homepage = "https://github.com/dropbox/dropbox-sdk-python"; + changelog = "https://github.com/dropbox/dropbox-sdk-python/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ sfrijters ]; }; diff --git a/pkgs/development/python-modules/ds-store/default.nix b/pkgs/development/python-modules/ds-store/default.nix index 00d10e749496..5afa341942e9 100644 --- a/pkgs/development/python-modules/ds-store/default.nix +++ b/pkgs/development/python-modules/ds-store/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mac_alias ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ds_store" ]; diff --git a/pkgs/development/python-modules/dsinternals/default.nix b/pkgs/development/python-modules/dsinternals/default.nix index 53d5e5acc9ff..93b600c04484 100644 --- a/pkgs/development/python-modules/dsinternals/default.nix +++ b/pkgs/development/python-modules/dsinternals/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pycryptodomex ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix index 883ea432cd22..7b5a8aa1f611 100644 --- a/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/pkgs/development/python-modules/dsmr-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dsmr-parser"; - version = "0.34"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ndokter"; repo = "dsmr_parser"; - rev = "v${version}"; - sha256 = "sha256-GO+lSgTmFgi/ljt99mteoot+p5BJnGb6ZFky5I3I6Io="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-UjwrlNPnv/iBFiX65tcOZjkdC7gZsJzxxCtPdYTdl6Q="; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { tailer ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix index 31bdf6d1505d..0ad328bfd834 100644 --- a/pkgs/development/python-modules/ducc0/default.nix +++ b/pkgs/development/python-modules/ducc0/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "ducc0"; - version = "0.27.0"; + version = "0.28.0"; disabled = pythonOlder "3.7"; @@ -11,13 +11,13 @@ buildPythonPackage rec { owner = "mtr"; repo = "ducc"; rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-Z3eWuLuuA264z1ccdVp1YwAjDrLIXFxvTt/gC/zBE6o="; + sha256 = "sha256-yh7L87s3STL2usGBXgIhCS7GKQuau/PV6US3T06bb0M="; }; buildInputs = [ pybind11 ]; propagatedBuildInputs = [ numpy ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "python/test" ]; pythonImportsCheck = [ "ducc0" ]; diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index afe9b98d0745..ea812cb9d5ea 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.6.4"; + version = "0.6.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "duckdb_engine"; owner = "Mause"; - rev = "v${version}"; - hash = "sha256-7PfrI4bNz0XtBa/cb8T43j06BJ3B2S5zIyBZsEusyXc="; + rev = "refs/tags/v${version}"; + hash = "sha256-Vb2sXZjhBZpZdemtGZ8dajB9Ziu/obLv80R63IH/hJg="; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { "test_preload_extension" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis ipython-sql @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "SQLAlchemy driver for duckdb"; homepage = "https://github.com/Mause/duckdb_engine"; + changelog = "https://github.com/Mause/duckdb_engine/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; }; diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index b41bc431f168..6547e0d2942c 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pandas ]; - checkInputs = [ + nativeCheckInputs = [ google-cloud-storage mypy psutil diff --git a/pkgs/development/python-modules/duecredit/default.nix b/pkgs/development/python-modules/duecredit/default.nix index 249f71c67dca..b9c9e65a4fe6 100644 --- a/pkgs/development/python-modules/duecredit/default.nix +++ b/pkgs/development/python-modules/duecredit/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { # bin/duecredit requires setuptools at runtime propagatedBuildInputs = [ citeproc-py requests setuptools six ]; - checkInputs = [ contextlib2 pytest pytestCheckHook vcrpy ]; + nativeCheckInputs = [ contextlib2 pytest pytestCheckHook vcrpy ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/duet/default.nix b/pkgs/development/python-modules/duet/default.nix index ce95291b9e95..f2ca9f541094 100644 --- a/pkgs/development/python-modules/duet/default.nix +++ b/pkgs/development/python-modules/duet/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ typing-extensions ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "A simple future-based async library for python"; diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix index dac0eddf751b..b112e481a9cc 100644 --- a/pkgs/development/python-modules/dufte/default.nix +++ b/pkgs/development/python-modules/dufte/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ln -s $HOME/.config/matplotlib $HOME/.matplotlib ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix index 190411b5333c..6c87d50ccfd4 100644 --- a/pkgs/development/python-modules/dugong/default.nix +++ b/pkgs/development/python-modules/dugong/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1063c1779idc5nrjzfv5w1xqvyy3crapb2a2xll9y6xphxclnkjc"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index c3bab1180cf9..ec4a1a93ca43 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { - version = "0.20.50"; + version = "0.21.0"; pname = "dulwich"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-UKlBeWssZ1vjm+co1UDBa1t853654bP4VWUOzmgy0r4="; + hash = "sha256-wizAXwIKlq012U1lIPgHAnC+4KN7V1aG0JwCeYsl7YY="; }; LC_ALL = "en_US.UTF-8"; @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ gevent geventhttpclient git diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix index 65a9f4b0dcb0..60e42f5b2fa0 100644 --- a/pkgs/development/python-modules/dunamai/default.nix +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -7,11 +7,12 @@ , packaging , pytestCheckHook , setuptools +, git }: buildPythonPackage rec { pname = "dunamai"; - version = "1.13.1"; + version = "1.15.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = "dunamai"; rev = "refs/tags/v${version}"; - sha256 = "sha256-UoqVfRdwOgxNLY17+dPgYO1GIPw3ZUwE/tiVzHjBxcY="; + sha256 = "sha256-dqMI51UHbkyfkxAPojRlS6qew2Ob4LbUkYua6zmcQgc="; }; nativeBuildInputs = [ @@ -36,9 +37,14 @@ buildPythonPackage rec { # needs to be able to run dunami from PATH preCheck = '' export PATH=$PATH:$out/bin + export HOME=$(mktemp -d) + + git config --global user.email "nobody@example.com" + git config --global user.name "Nobody" ''; - checkInputs = [ + nativeCheckInputs = [ + git pytestCheckHook setuptools ]; diff --git a/pkgs/development/python-modules/duo-client/default.nix b/pkgs/development/python-modules/duo-client/default.nix index 3a0cbd8a36fb..fc25a2b5928f 100644 --- a/pkgs/development/python-modules/duo-client/default.nix +++ b/pkgs/development/python-modules/duo-client/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ freezegun mock nose2 diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index f5fc366c5f58..56a27acb6019 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -8,13 +8,14 @@ , nanotime , pygtrie , pythonOlder -, shortuuid , setuptools-scm +, shortuuid +, sqltrie }: buildPythonPackage rec { pname = "dvc-data"; - version = "0.1.13"; + version = "0.36.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-dKqn7dMwPxKnLLBPJGgmD/2MFzdzrw7W9+w9Zi/9hsA="; + hash = "sha256-HKNltc5pWc0mU+yCj/PV9E6GYQ+3fbcacRRXtquGM4w="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -40,6 +41,7 @@ buildPythonPackage rec { nanotime pygtrie shortuuid + sqltrie ]; # Tests depend on upath which is unmaintained and only available as wheel @@ -57,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "DVC's data management subsystem"; homepage = "https://github.com/iterative/dvc-data"; + changelog = "https://github.com/iterative/dvc-data/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 7e6a37a12d90..c20540b8eeb3 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.1.7"; + version = "0.19.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Edp2MRhe/eTUosL4XQfVbtwFWBg3D5RDWRb6r1C4MgE="; + hash = "sha256-jwjhRY1SMqiTZ5UJmoZb4odg3g8uC9ehPmxRU2VsH8U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -44,7 +44,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for DVC objects"; homepage = "https://github.com/iterative/dvc-objects"; + changelog = "https://github.com/iterative/dvc-objects/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix index b6da5663f41a..2ccc61cf97ca 100644 --- a/pkgs/development/python-modules/dvc-render/default.nix +++ b/pkgs/development/python-modules/dvc-render/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dvc-render"; - version = "0.0.9"; + version = "0.0.17"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ZUIyNg+PTj5CWC65RqB1whnB+pUp1yNJQj43iSBcyvU="; + hash = "sha256-GDfrkcKP/EZZ/ONZ2Afoxj4Q8sp8mRmtZf93kXcNQcg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -41,7 +41,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ funcy pytestCheckHook pytest-mock @@ -57,7 +57,8 @@ buildPythonPackage rec { meta = with lib; { description = "Library for rendering DVC plots"; homepage = "https://github.com/iterative/dvc-render"; + changelog = "https://github.com/iterative/dvc-render/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ fab anthonyroussel ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix index b71cf3175e2b..52d7e4706e4b 100644 --- a/pkgs/development/python-modules/dvc-task/default.nix +++ b/pkgs/development/python-modules/dvc-task/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-task"; - version = "0.1.2"; + version = "0.1.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iterative"; repo = pname; - rev = version; - hash = "sha256-LXjfFuLifgzU+3/EevycVCR7LhYBOoN6xg4YeNo5R4M="; + rev = "refs/tags/${version}"; + hash = "sha256-+v1M8bKcHWUTz4DJ85tB1qdFYKI0k8TS/Dvf166o920="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -40,7 +40,7 @@ buildPythonPackage rec { funcy ]; - checkInputs = [ + nativeCheckInputs = [ pytest-celery pytest-mock pytest-test-utils @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "Celery task queue used in DVC"; homepage = "https://github.com/iterative/dvc-task"; license = licenses.asl20; - maintainers = with maintainers; [ anthonyroussel ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 1507156112d1..a62c459ef379 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -4,13 +4,14 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, ruamel-yaml , setuptools , tabulate }: buildPythonPackage rec { pname = "dvclive"; - version = "0.10.0"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4sixsWZNnI3UJRlFyB21eAdUCgF8iIZ56ECgIeFV/u8="; + hash = "sha256-FAupTvaOLPp5EQ0vvE8tQCa8WnKW/qrQTc7i+6F7F1A="; }; nativeBuildInputs = [ @@ -28,8 +29,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ dvc-render - tabulate # will be available as dvc-render.optional-dependencies.table - ]; + ruamel-yaml + ] ++ dvc-render.optional-dependencies.table; # Circular dependency with dvc doCheck = false; @@ -41,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for logging machine learning metrics and other metadata in simple file formats"; homepage = "https://github.com/iterative/dvclive"; + changelog = "https://github.com/iterative/dvclive/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index 8db7f6c9169d..e8859128b5f8 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ glibcLocales ]; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-cov mock diff --git a/pkgs/development/python-modules/dynalite-devices/default.nix b/pkgs/development/python-modules/dynalite-devices/default.nix index ed3f3ffb82ab..7827c46d43a1 100644 --- a/pkgs/development/python-modules/dynalite-devices/default.nix +++ b/pkgs/development/python-modules/dynalite-devices/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sed -i '/^addopts/d' setup.cfg ''; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 896b50416db1..97afb19058f1 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "easy-thumbnails"; - version = "2.8.3"; + version = "2.8.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ij7GG7jHL6x/degRqW4815QqyJyrVasWVJ1tLOnN6qU="; + hash = "sha256-fk6RJgn8m2Czof72VX7BXd+cT5RiZ6kuaSDf1N12XjU="; }; propagatedBuildInputs = [ @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Easy thumbnails for Django"; homepage = "https://github.com/SmileyChris/easy-thumbnails"; + changelog = "https://github.com/SmileyChris/easy-thumbnails/blob/${version}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/easyocr/default.nix b/pkgs/development/python-modules/easyocr/default.nix new file mode 100644 index 000000000000..9c55897188ef --- /dev/null +++ b/pkgs/development/python-modules/easyocr/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hdf5 +, numpy +, opencv3 +, pillow +, pyaml +, pyclipper +, python-bidi +, torch +, scikitimage +, scipy +, shapely +, torchvision +, onnx +}: + +buildPythonPackage rec { + pname = "easyocr"; + version = "1.6.2"; + + src = fetchFromGitHub { + owner = "JaidedAI"; + repo = "EasyOCR"; + rev = "v${version}"; + sha256 = "sha256-f+JBSnFMRvVlhRRiL1rJb7a0CNjZPuh6r8r3K1meQCk="; + }; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "opencv-python-headless<=4.5.4.60" "" \ + --replace "ninja" "" + ''; + + propagatedBuildInputs = [ + scikitimage + hdf5 + python-bidi + numpy + opencv3 + torchvision + pillow + pyaml + pyclipper + torch + scipy + shapely + ]; + + nativeCheckInputs = [ onnx ]; + + pythonImportsCheck = [ "easyocr" ]; + + meta = with lib; { + description = "Ready-to-use OCR with 80+ supported languages and all popular writing scripts"; + homepage = "https://github.com/JaidedAI/EasyOCR"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/development/python-modules/easysnmp/default.nix b/pkgs/development/python-modules/easysnmp/default.nix deleted file mode 100644 index c55bf52a6643..000000000000 --- a/pkgs/development/python-modules/easysnmp/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, buildPythonPackage -, pythonAtLeast -, fetchFromGitHub -, net-snmp -, openssl -, pytest -, pytest-cov -, pytest-flake8 -, pytest-sugar -, termcolor -}: - -buildPythonPackage rec { - pname = "easysnmp"; - version = "0.2.5"; - - # See https://github.com/kamakazikamikaze/easysnmp/issues/108 - disabled = pythonAtLeast "3.7"; - - src = fetchFromGitHub { - owner = "kamakazikamikaze"; - repo = pname; - rev = version; - sha256 = "1si9iyxqj6z22jzn6m93lwpinsqn20lix2py3jm3g3fmwawkd735"; - }; - - checkInputs = [ - pytest - pytest-cov - pytest-flake8 - pytest-sugar - termcolor - ]; - - buildInputs = [ - net-snmp - openssl - ]; - - buildPhase = '' - python setup.py build bdist_wheel --basedir=${lib.getBin net-snmp}/bin - ''; - - # Unable to get tests to pass, even running by hand. The pytest tests have - # become stale. - doCheck = false; - - meta = with lib; { - description = "A blazingly fast and Pythonic SNMP library based on the official Net-SNMP bindings"; - homepage = "https://easysnmp.readthedocs.io/en/latest/"; - license = licenses.bsd3; - maintainers = with maintainers; [ WhittlesJr ]; - }; -} diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix index ce3d5bd4ce66..66831b051344 100644 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; # Only needed for tests - checkInputs = [ pkgs.openssl ]; + nativeCheckInputs = [ pkgs.openssl ]; meta = with lib; { description = "ECDSA cryptographic signature library"; diff --git a/pkgs/development/python-modules/ecos/default.nix b/pkgs/development/python-modules/ecos/default.nix index 0f5ef9c2e1fa..d5ef0867c300 100644 --- a/pkgs/development/python-modules/ecos/default.nix +++ b/pkgs/development/python-modules/ecos/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix index 4e220ba64667..8f103df26947 100644 --- a/pkgs/development/python-modules/edalize/default.nix +++ b/pkgs/development/python-modules/edalize/default.nix @@ -6,19 +6,18 @@ , pandas , pytestCheckHook , which -, verilog , yosys }: buildPythonPackage rec { pname = "edalize"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "olofk"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-fpUNCxW7+uymodJ/yGME9VNcCEZdBROIdT1+blpgkzA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-h6b0mdAUR4NsN2SpnLu5OgS9Fy9ZRitG+5Sbon1jlUM="; }; postPatch = '' @@ -29,17 +28,18 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pandas which yosys - verilog ]; pythonImportsCheck = [ "edalize" ]; disabledTestPaths = [ + "tests/test_questa_formal.py" + "tests/test_slang.py" "tests/test_apicula.py" "tests/test_ascentlint.py" "tests/test_diamond.py" diff --git a/pkgs/development/python-modules/editables/default.nix b/pkgs/development/python-modules/editables/default.nix index e5deb02af52f..9090e98f4095 100644 --- a/pkgs/development/python-modules/editables/default.nix +++ b/pkgs/development/python-modules/editables/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-FnUk43c1jtHxN05hwmjw16S/fb0EbGVve0EM3hYWGxo="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/editdistance-s/default.nix b/pkgs/development/python-modules/editdistance-s/default.nix index 548da09b993d..6dd37739302f 100644 --- a/pkgs/development/python-modules/editdistance-s/default.nix +++ b/pkgs/development/python-modules/editdistance-s/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "editdistance_s" ]; diff --git a/pkgs/development/python-modules/editdistance/default.nix b/pkgs/development/python-modules/editdistance/default.nix index 41d4a5003424..822eacc0843f 100644 --- a/pkgs/development/python-modules/editdistance/default.nix +++ b/pkgs/development/python-modules/editdistance/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "editdistance"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "roy-ht"; repo = pname; - rev = "v${version}"; - hash = "sha256-c0TdH1nJAKrepatCSCTLaKsDv9NKruMQadCjclKGxBw="; + rev = "refs/tags/v${version}"; + hash = "sha256-42PEK2KhR7rZLfNX9T45V6on+5CoINfKvntz/YQBJco="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { cythonize --inplace editdistance/bycython.pyx ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index e90a6efdc63e..2918733e96b3 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { chmod +w -R source/tests ''; - checkInputs = [ + nativeCheckInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/edlib/default.nix b/pkgs/development/python-modules/edlib/default.nix new file mode 100644 index 000000000000..30c3f8fb3b42 --- /dev/null +++ b/pkgs/development/python-modules/edlib/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, edlib +, cython +, python +}: + +buildPythonPackage { + inherit (edlib) pname src meta; + version = "1.3.9"; + + disabled = pythonOlder "3.6"; + + sourceRoot = "source/bindings/python"; + + preBuild = '' + ln -s ${edlib.src}/edlib . + ''; + + EDLIB_OMIT_README_RST = 1; + EDLIB_USE_CYTHON = 1; + + nativeBuildInputs = [ cython ]; + buildInputs = [ edlib ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} test.py + runHook postCheck + ''; + + pythonImportsCheck = [ "edlib" ]; + +} diff --git a/pkgs/development/python-modules/effect/default.nix b/pkgs/development/python-modules/effect/default.nix index 67537dd1f48b..739ace442b95 100644 --- a/pkgs/development/python-modules/effect/default.nix +++ b/pkgs/development/python-modules/effect/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "7affb603707c648b07b11781ebb793a4b9aee8acf1ac5764c3ed2112adf0c9ea"; }; - checkInputs = [ + nativeCheckInputs = [ pytest testtools ]; diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix new file mode 100644 index 000000000000..19f265a7c39e --- /dev/null +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, eigen +, numpy +}: + +stdenv.mkDerivation rec { + pname = "eigenpy"; + version = "2.9.2"; + + src = fetchFromGitHub { + owner = "stack-of-tasks"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-h088il9gih1rJJKOI09qq2180DxbxCAVZcgBXWh8aVk="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + boost + ]; + + propagatedBuildInputs = [ + eigen + numpy + ]; + + meta = with lib; { + description = "Bindings between Numpy and Eigen using Boost.Python"; + homepage = "https://github.com/stack-of-tasks/eigenpy"; + changelog = "https://github.com/stack-of-tasks/eigenpy/releases/tag/v${version}"; + license = licenses.bsd2; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix index 44b380e10328..f4364aac8307 100644 --- a/pkgs/development/python-modules/einops/default.nix +++ b/pkgs/development/python-modules/einops/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , chainer , fetchFromGitHub +, hatchling , jupyter , keras #, mxnet @@ -16,19 +17,21 @@ buildPythonPackage rec { pname = "einops"; - version = "0.4.1"; - format = "setuptools"; + version = "0.6.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "arogozhnikov"; repo = pname; - rev = "v${version}"; - hash = "sha256-n4R4lcRimuOncisCTs2zJWPlqZ+W2yPkvkWAnx4R91s="; + rev = "refs/tags/v${version}"; + hash = "sha256-/bnp8IhDxp8EB/PoW5Dz+7rOru0/odOrts84aq4qyJw="; }; - checkInputs = [ + nativeBuildInputs = [ hatchling ]; + + nativeCheckInputs = [ chainer jupyter keras diff --git a/pkgs/development/python-modules/eiswarnung/default.nix b/pkgs/development/python-modules/eiswarnung/default.nix index a13a45b66c65..a0ebc7150756 100644 --- a/pkgs/development/python-modules/eiswarnung/default.nix +++ b/pkgs/development/python-modules/eiswarnung/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 8b697fe2442c..0f44f7b8fb02 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -15,6 +15,7 @@ , pytest-bdd , pytest-localserver , pytest-mock +, pytest-random-order , pytestCheckHook , pythonOlder , sanic @@ -24,11 +25,12 @@ , tornado , urllib3 , webob +, wrapt }: buildPythonPackage rec { pname = "elastic-apm"; - version = "6.12.0"; + version = "6.14.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -37,7 +39,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-tAX96aOPuwtchLk5A1ANuZI5w5H9/yX3Zj9bRSyHv90="; + hash = "sha256-T1TWILlJZffTISVt8YSi8ZYSXOHieh6SV55j8W333LQ="; }; propagatedBuildInputs = [ @@ -48,6 +50,11 @@ buildPythonPackage rec { starlette tornado urllib3 + wrapt + ]; + + nativeCheckInputs = [ + pytestCheckHook ]; checkInputs = [ @@ -62,8 +69,8 @@ buildPythonPackage rec { pytest-bdd pytest-mock pytest-localserver + pytest-random-order sanic-testing - pytestCheckHook structlog webob ]; @@ -84,6 +91,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python agent for the Elastic APM"; homepage = "https://github.com/elastic/apm-agent-python"; + changelog = "https://github.com/elastic/apm-agent-python/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/elegy/default.nix b/pkgs/development/python-modules/elegy/default.nix index 12c205761b5e..14b87970537c 100644 --- a/pkgs/development/python-modules/elegy/default.nix +++ b/pkgs/development/python-modules/elegy/default.nix @@ -5,8 +5,9 @@ , deepmerge , dm-haiku , fetchFromGitHub +, fetchpatch , jaxlib -, poetry +, poetry-core , pytestCheckHook , pythonOlder , pyyaml @@ -31,10 +32,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "poets-ai"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-FZmLriYhsX+zyQKCtCjbOy6MH+AvjzHRNUyaDSXGlLI="; }; + patches = [ + (fetchpatch { + name = "use-poetry-core.patch"; + url = "https://github.com/poets-ai/elegy/commit/0ed472882f470ed9eb7a63b8a537ffabe7e19aa7.patch"; + hash = "sha256-nO/imHo7tEsiZh+64CF/M4eXQ1so3IunVhv8CvYP1ks="; + }) + ]; + # The cloudpickle constraint is too strict. wandb is marked as an optional # dependency but `buildPythonPackage` doesn't seem to respect that setting. # Python constraint: https://github.com/poets-ai/elegy/issues/244 @@ -46,7 +55,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - poetry + poetry-core ]; buildInputs = [ @@ -71,11 +80,11 @@ buildPythonPackage rec { "elegy" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook - torch sh tensorflow + torch ]; disabledTests = [ @@ -89,6 +98,7 @@ buildPythonPackage rec { meta = with lib; { description = "Neural Networks framework based on Jax inspired by Keras and Haiku"; homepage = "https://github.com/poets-ai/elegy"; + changelog = "https://github.com/poets-ai/elegy/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; }; diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 95c201afc4cd..0aa5c6583784 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.5.3"; + version = "3.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "refs/tags/v${version}"; - hash = "sha256-+NCsWPt5yMXe+GR9nEBU7byYhKrH/6xghQioj9AOGm4="; + hash = "sha256-b+Th28GI2UOmfO4jy4biohAJWPiYWkvFLqqs9lgR4Vc="; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/elgato/default.nix b/pkgs/development/python-modules/elgato/default.nix index 2a6c10da35e7..2fbaa7f66ae5 100644 --- a/pkgs/development/python-modules/elgato/default.nix +++ b/pkgs/development/python-modules/elgato/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index b8f75776217a..4797c1cb038b 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "c2f099a3e8d5ecfc22745766e7cc664a48db64b6b89d986dff270491d8683149"; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis testtools pytest diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index 737f4a5a0b43..a418e3006dbd 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -1,4 +1,5 @@ { lib +, async-timeout , buildPythonPackage , fetchFromGitHub , fetchpatch @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "2.1.0"; + version = "2.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gwww"; repo = "elkm1"; - rev = version; - hash = "sha256-uc+hU4RyF6IXUbdpZHozbF6vO2NE2hrfgxAnmmB27lw="; + rev = "refs/tags/${version}"; + hash = "sha256-UrdnEafmzO/l1kTcGmPWhujbThVWv4uBH57D2uZB/kw="; }; nativeBuildInputs = [ @@ -28,10 +29,11 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + async-timeout pyserial-asyncio ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; @@ -43,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for interacting with ElkM1 alarm/automation panel"; homepage = "https://github.com/gwww/elkm1"; + changelog = "https://github.com/gwww/elkm1/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/elmax-api/default.nix b/pkgs/development/python-modules/elmax-api/default.nix index 34d848d9a195..a57225d41db0 100644 --- a/pkgs/development/python-modules/elmax-api/default.nix +++ b/pkgs/development/python-modules/elmax-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "elmax-api"; - version = "0.0.2"; + version = "0.0.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "albertogeniola"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-YUnLi8+ibUgWoMFMgZPSPbpr286bnWBefxjOV7JfCuY="; + rev = "refs/tags/v${version}"; + hash = "sha256-ZqPDnIiFzxS6nU19bfEgnqEsuz7oI+Z4ac6br6Gr4Vk="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with the Elmax cloud"; homepage = "https://github.com/albertogeniola/elmax-api"; + changelog = "https://github.com/albertogeniola/elmax-api/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/elmax/default.nix b/pkgs/development/python-modules/elmax/default.nix index 77bbd480e9ba..7202f0efbdc1 100644 --- a/pkgs/development/python-modules/elmax/default.nix +++ b/pkgs/development/python-modules/elmax/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-httpx pytestCheckHook diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index cb553c4fd5f6..bf106a26dad5 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "email-validator"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "JoshData"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Avsqaev3LMoymU06y+u8MMv38ZI2cWk5tc/MkO+9oyA="; + hash = "sha256-mflUF2ZKYhCiQEoG+fKI+K266dukuSzG9cyg6gwBcTo="; }; propagatedBuildInputs = [ @@ -22,7 +22,7 @@ buildPythonPackage rec { idna ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "A robust email syntax and deliverability validation library"; homepage = "https://github.com/JoshData/python-email-validator"; + changelog = "https://github.com/JoshData/python-email-validator/releases/tag/v${version}"; license = licenses.cc0; maintainers = with maintainers; [ siddharthist ]; }; diff --git a/pkgs/development/python-modules/emailthreads/default.nix b/pkgs/development/python-modules/emailthreads/default.nix index 3daaf1577e68..8af7fc18e35e 100644 --- a/pkgs/development/python-modules/emailthreads/default.nix +++ b/pkgs/development/python-modules/emailthreads/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-7BhYS1DQCW9QpG31asPCq5qPyJy+WW2onZpvEHhwQCs="; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; PKGVER = version; diff --git a/pkgs/development/python-modules/embedding-reader/default.nix b/pkgs/development/python-modules/embedding-reader/default.nix new file mode 100644 index 000000000000..8265ff1a6d99 --- /dev/null +++ b/pkgs/development/python-modules/embedding-reader/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage +, fetchFromGitHub +, fsspec +, lib +, numpy +, pandas +, pyarrow +, pytestCheckHook +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "embedding-reader"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "rom1504"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-uyeIcAW9O9PR4cqmifC6Lx+Hn6XPb1RH/ksmUWvbdtw="; + }; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "pyarrow" ]; + + propagatedBuildInputs = [ fsspec numpy pandas pyarrow ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "embedding_reader" ]; + + meta = with lib; { + description = "Efficiently read embedding in streaming from any filesystem"; + homepage = "https://github.com/rom1504/embedding-reader"; + license = licenses.mit; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/emborg/default.nix b/pkgs/development/python-modules/emborg/default.nix new file mode 100644 index 000000000000..a788a34098aa --- /dev/null +++ b/pkgs/development/python-modules/emborg/default.nix @@ -0,0 +1,78 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pytestCheckHook +, pythonOlder +, borgbackup +, appdirs +, arrow +, docopt +, inform +, nestedtext +, parametrize-from-file +, quantiphy +, requests +, shlib +, voluptuous +}: + +buildPythonPackage rec { + pname = "emborg"; + version = "1.34"; + format = "flit"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "KenKundert"; + repo = "emborg"; + rev = "v${version}"; + hash = "sha256-bnlELPZzTU9KyVsz5Q0aW9xWvVrgwpowQrjkQvX844g="; + }; + + propagatedBuildInputs = [ + appdirs + arrow + docopt + inform + quantiphy + requests + ]; + + nativeCheckInputs = [ + nestedtext + parametrize-from-file + pytestCheckHook + shlib + voluptuous + borgbackup + ]; + + # this disables testing fuse mounts + MISSING_DEPENDENCIES = "fuse"; + + postPatch = '' + patchShebangs . + ''; + + # this patch fixes a whitespace issue in the message that a test is expecting, https://github.com/KenKundert/emborg/pull/67 + patches = [ + (fetchpatch { + url = "https://github.com/KenKundert/emborg/commit/afac6d1ddcecdb4bddbec87b6c8eed4cfbf4ebf9.diff"; + sha256 = "3xg2z03FLKH4ckmiBZqE1FDjpgjgdO8OZL1ewrJlQ4o="; + }) + ]; + + pythonImportsCheck = [ + "emborg" + ]; + + meta = with lib; { + description = "Interactive command line interface to Borg Backup"; + homepage = "https://github.com/KenKundert/emborg"; + changelog = "https://github.com/KenKundert/emborg/releases/tag/v${version}"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/pkgs/development/python-modules/embrace/default.nix b/pkgs/development/python-modules/embrace/default.nix index c342c9be5a0b..ea2ffaa99b39 100644 --- a/pkgs/development/python-modules/embrace/default.nix +++ b/pkgs/development/python-modules/embrace/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "embrace"; - version = "4.1.0"; + version = "4.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "~olly"; repo = "embrace-sql"; rev = "v${version}-release"; - hash = "sha256-R6Ug4f8KFZNzaNWqWZkLvOwtsawCuerzvHlysr7bd6M="; + hash = "sha256-otzpDMtC229qMXon+ydS39SBoMiXJmxn48/TQXjqu5U="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { wrapt ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix index 80e0e7daf868..3dbf9c9b6546 100644 --- a/pkgs/development/python-modules/emcee/default.nix +++ b/pkgs/development/python-modules/emcee/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "emcee"; - version = "3.1.3"; + version = "3.1.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dfm"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HAuwWFNL63BlvHomQx+hWw4et7kRYd3zhH2FAj632Lg="; + hash = "sha256-K2cPSbR7jnl9Vzf2sEiPZqk2vTwgChNWAf6CAerhZCg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -31,7 +31,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Kick ass affine-invariant ensemble MCMC sampling"; homepage = "https://emcee.readthedocs.io/"; + changelog = "https://github.com/dfm/emcee/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index a25458d6fc72..65cae10f0e21 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-3mCzbFuBIMdF6tbKLxqNKAO50vaRWeOxpydJ4ZeE+Vc="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Emoji for Python"; homepage = "https://github.com/carpedm20/emoji/"; + changelog = "https://github.com/carpedm20/emoji/blob/v${version}/CHANGES.md"; license = licenses.bsd3; maintainers = with maintainers; [ joachifm ]; }; diff --git a/pkgs/development/python-modules/emv/default.nix b/pkgs/development/python-modules/emv/default.nix index a4834a84656b..a06cb2b3f44a 100644 --- a/pkgs/development/python-modules/emv/default.nix +++ b/pkgs/development/python-modules/emv/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { terminaltables ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/energyflip-client/default.nix b/pkgs/development/python-modules/energyflip-client/default.nix index 73d0f5adfa16..b0f13eafc1f0 100644 --- a/pkgs/development/python-modules/energyflip-client/default.nix +++ b/pkgs/development/python-modules/energyflip-client/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/energyflow/default.nix b/pkgs/development/python-modules/energyflow/default.nix index 44342d732eca..5f89337f0de2 100644 --- a/pkgs/development/python-modules/energyflow/default.nix +++ b/pkgs/development/python-modules/energyflow/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { wasserstein ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/enhancements/default.nix b/pkgs/development/python-modules/enhancements/default.nix index 18fdfd29ce13..c9042e3d085e 100644 --- a/pkgs/development/python-modules/enhancements/default.nix +++ b/pkgs/development/python-modules/enhancements/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { typeguard ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index b808801928e3..f6568e691fa1 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "enlighten"; - version = "1.11.1"; + version = "1.11.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-V6vZij0/g0hO+fkfklX00jyLMJfs22R8e5sASdYAt/g="; + hash = "sha256-koSGHe5aJy4OGjdYzT87cYCxvRdUh12naHbyp/Rsy2E="; }; propagatedBuildInputs = [ @@ -25,7 +25,7 @@ buildPythonPackage rec { prefixed ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Enlighten Progress Bar for Python Console Apps"; homepage = "https://github.com/Rockhopper-Technologies/enlighten"; + changelog = "https://github.com/Rockhopper-Technologies/enlighten/releases/tag/${version}"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/enocean/default.nix b/pkgs/development/python-modules/enocean/default.nix index 365d6c94ef28..162e39aebffe 100644 --- a/pkgs/development/python-modules/enocean/default.nix +++ b/pkgs/development/python-modules/enocean/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pyserial ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/enrich/default.nix b/pkgs/development/python-modules/enrich/default.nix index d4b08af212d3..d823f3c4c848 100644 --- a/pkgs/development/python-modules/enrich/default.nix +++ b/pkgs/development/python-modules/enrich/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ rich ]; - checkInputs = [ pytestCheckHook pytest-mock ]; + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; disabledTests = [ # console output order is racy diff --git a/pkgs/development/python-modules/entry-points-txt/default.nix b/pkgs/development/python-modules/entry-points-txt/default.nix index f6ec759b0a0a..cac8c41f16f2 100644 --- a/pkgs/development/python-modules/entry-points-txt/default.nix +++ b/pkgs/development/python-modules/entry-points-txt/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/entrypoint2/default.nix b/pkgs/development/python-modules/entrypoint2/default.nix index e2146f3a5a62..812749b3beec 100644 --- a/pkgs/development/python-modules/entrypoint2/default.nix +++ b/pkgs/development/python-modules/entrypoint2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-/At/57IazatHpYWrlAfKflxPlstoiFddtrDOuR8OEFo="; }; - checkInputs = [ + nativeCheckInputs = [ EasyProcess path pytestCheckHook diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix index 1223f3f911de..916b499a9874 100644 --- a/pkgs/development/python-modules/entrypoints/default.nix +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/enum34/default.nix b/pkgs/development/python-modules/enum34/default.nix index 746e4dd314e7..8ec22fc1cd73 100644 --- a/pkgs/development/python-modules/enum34/default.nix +++ b/pkgs/development/python-modules/enum34/default.nix @@ -14,7 +14,7 @@ if pythonAtLeast "3.4" then null else buildPythonPackage rec { sha256 = "cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { homepage = "https://pypi.python.org/pypi/enum34"; diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 74b0fa28b6bd..d444c06901f1 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.25"; + version = "0.5.27"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - sha256 = "sha256-UF04TAhgeb76bYisNYOAraw59K54WkX9a8QOtHywMTQ="; + hash = "sha256-tZp3r0LALo32vmbeBOjHHg6sexpP+iq9WGRSob13mmE="; }; propagatedBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { voluptuous ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to get Environment Canada weather data"; homepage = "https://github.com/michaeldavie/env_canada"; + changelog = "https://github.com/michaeldavie/env_canada/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix index 4a8987b16346..464b0685be06 100644 --- a/pkgs/development/python-modules/environs/default.nix +++ b/pkgs/development/python-modules/environs/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { python-dotenv ]; - checkInputs = [ + nativeCheckInputs = [ dj-database-url dj-email-url django-cache-url diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix index 9f5cfc2d3e0c..6a7dde6f4eaf 100644 --- a/pkgs/development/python-modules/envisage/default.nix +++ b/pkgs/development/python-modules/envisage/default.nix @@ -2,6 +2,7 @@ , apptools , buildPythonPackage , fetchPypi +, fetchpatch , ipython , pytestCheckHook , pythonAtLeast @@ -22,6 +23,15 @@ buildPythonPackage rec { sha256 = "sha256-AATsUNcYLB4vtyvuooAMDZx8p5fayijb6yJoUKTCW40="; }; + patches = [ + # TODO: remove on next release + (fetchpatch { + name = "fix-mistake-in-menu-group-specification.patch"; + url = "https://github.com/enthought/envisage/commit/f23ea3864a5f6ffca665d47dec755992e062029b.patch"; + sha256 = "sha256-l4CWB4jRkSmoTDoV8CtP2w87Io2cLINKfOSaSPy7cXE="; + }) + ]; + # for the optional dependency ipykernel, only versions < 6 are # supported, so it's not included in the tests, and not propagated propagatedBuildInputs = [ @@ -34,7 +44,7 @@ buildPythonPackage rec { export HOME=$PWD/HOME ''; - checkInputs = [ + nativeCheckInputs = [ ipython pytestCheckHook ]; diff --git a/pkgs/development/python-modules/envoy-reader/default.nix b/pkgs/development/python-modules/envoy-reader/default.nix index 497d46f2d840..1a60d40c70cd 100644 --- a/pkgs/development/python-modules/envoy-reader/default.nix +++ b/pkgs/development/python-modules/envoy-reader/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pyjwt ]; - checkInputs = [ + nativeCheckInputs = [ pytest-raises pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix index 3f095459642a..307c7dfaa614 100644 --- a/pkgs/development/python-modules/envs/default.nix +++ b/pkgs/development/python-modules/envs/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { terminaltables ]; - checkInputs = [ + nativeCheckInputs = [ mock nose ]; diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index a5a87f908d4f..6ed71e7e4376 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -7,15 +7,15 @@ buildPythonPackage rec { pname = "ephem"; - version = "4.1.3"; + version = "4.1.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-f6GGhZgbpSjt1QQFKp1SEqCapb8VwRpzTtxqhuiotWo="; + sha256 = "sha256-c6WfDSFi0WJFNcPDt1+VZVa9uyBV6vVUp77xR9P5x2A="; }; - checkInputs = [ + nativeCheckInputs = [ glibcLocales pytest ]; diff --git a/pkgs/development/python-modules/ephemeral-port-reserve/default.nix b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix index 0af57945073f..dc3148f36230 100644 --- a/pkgs/development/python-modules/ephemeral-port-reserve/default.nix +++ b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { hash = "sha256-R6NRpfaT05PO/cTWgCakiGfCuCyucjVOXbAezn5x1cU="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/espeak-phonemizer/cdll.patch b/pkgs/development/python-modules/espeak-phonemizer/cdll.patch new file mode 100644 index 000000000000..3ce5df122d50 --- /dev/null +++ b/pkgs/development/python-modules/espeak-phonemizer/cdll.patch @@ -0,0 +1,21 @@ +diff --git a/espeak_phonemizer/__init__.py b/espeak_phonemizer/__init__.py +index a09472e..730a7f9 100644 +--- a/espeak_phonemizer/__init__.py ++++ b/espeak_phonemizer/__init__.py +@@ -163,14 +163,10 @@ class Phonemizer: + # Already initialized + return + +- self.libc = ctypes.cdll.LoadLibrary("libc.so.6") ++ self.libc = ctypes.cdll.LoadLibrary("@libc@") + self.libc.open_memstream.restype = ctypes.POINTER(ctypes.c_char) + +- try: +- self.lib_espeak = ctypes.cdll.LoadLibrary("libespeak-ng.so") +- except OSError: +- # Try .so.1 +- self.lib_espeak = ctypes.cdll.LoadLibrary("libespeak-ng.so.1") ++ self.lib_espeak = ctypes.cdll.LoadLibrary("@libespeak_ng@") + + sample_rate = self.lib_espeak.espeak_Initialize( + Phonemizer.AUDIO_OUTPUT_SYNCHRONOUS, 0, None, 0 diff --git a/pkgs/development/python-modules/espeak-phonemizer/default.nix b/pkgs/development/python-modules/espeak-phonemizer/default.nix new file mode 100644 index 000000000000..d8c5ba1bb644 --- /dev/null +++ b/pkgs/development/python-modules/espeak-phonemizer/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, substituteAll +, glibc +, espeak-ng +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "espeak-phonemizer"; + version = "1.1.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "espeak-phonemizer"; + rev = "refs/tags/v${version}"; + hash = "sha256-qnJtS5iIARdg+umolzLHT3/nLon9syjxfTnMWHOmYPU="; + }; + + patches = [ + (substituteAll { + src = ./cdll.patch; + libc = "${lib.getLib glibc}/lib/libc.so.6"; + libespeak_ng = "${lib.getLib espeak-ng}/lib/libespeak-ng.so"; + }) + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/rhasspy/espeak-phonemizer/releases/tag/v${version}"; + description = "Uses ctypes and libespeak-ng to transform test into IPA phonemes"; + homepage = "https://github.com/rhasspy/espeak-phonemizer"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/esphome-dashboard-api/default.nix b/pkgs/development/python-modules/esphome-dashboard-api/default.nix new file mode 100644 index 000000000000..24abd9d47a95 --- /dev/null +++ b/pkgs/development/python-modules/esphome-dashboard-api/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, aiohttp +}: + +buildPythonPackage rec { + pname = "esphome-dashboard-api"; + version = "1.2.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "esphome"; + repo = "dashboard-api"; + rev = "refs/tags/${version}"; + hash = "sha256-RFfS0xzRXoM6ETXmviiMPxffPzspjTqpkvHOlTJXN9g="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "esphome_dashboard_api" + ]; + + meta = with lib; { + description = "API to interact with ESPHome Dashboard"; + homepage = "https://github.com/esphome/dashboard-api"; + changelog = "https://github.com/esphome/dashboard-api/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/esprima/default.nix b/pkgs/development/python-modules/esprima/default.nix index b32a098c12bc..9f03e8a1e877 100644 --- a/pkgs/development/python-modules/esprima/default.nix +++ b/pkgs/development/python-modules/esprima/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "WtkPCReXhxyr6pOzE9gsdIeBlLk+nSnbxkS3OowEaHo="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/et_xmlfile/default.nix b/pkgs/development/python-modules/et_xmlfile/default.nix index 58d9c543aaa6..538ed10cde36 100644 --- a/pkgs/development/python-modules/et_xmlfile/default.nix +++ b/pkgs/development/python-modules/et_xmlfile/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256="0nrkhcb6jdrlb6pwkvd4rycw34y3s931hjf409ij9xkjsli9fkb1"; }; - checkInputs = [ lxml pytest ]; + nativeCheckInputs = [ lxml pytest ]; checkPhase = '' py.test $out ''; diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix index bc99c09b402b..f12fd2b5ca70 100644 --- a/pkgs/development/python-modules/etebase/default.nix +++ b/pkgs/development/python-modules/etebase/default.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "etebase"; - version = "0.31.5"; + version = "0.31.6"; src = fetchFromGitHub { owner = "etesync"; repo = "etebase-py"; rev = "v${version}"; - hash = "sha256-87t3toMaApnOSPBKfTGGLo2VRLqU8irFac9lg3kA1eE="; + hash = "sha256-T61nPW3wjBRjmJ81w59T1b/Kxrwwqvyj3gILE9OF/5Q="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Qg0aJ6CZaPxGneIs4o402A+fhI/nlJ9X/XdMFqkD/YY="; + hash = "sha256-wrMNtcaLAsWBVeJbYbYo+Xmobl01lnUbR9NUqqUzUgU="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/etesync/default.nix b/pkgs/development/python-modules/etesync/default.nix index ee81ead97c3a..a50f8e7c093a 100644 --- a/pkgs/development/python-modules/etesync/default.nix +++ b/pkgs/development/python-modules/etesync/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { vobject ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/eth-abi/default.nix b/pkgs/development/python-modules/eth-abi/default.nix index dc9b2f7895cd..01177a703faf 100644 --- a/pkgs/development/python-modules/eth-abi/default.nix +++ b/pkgs/development/python-modules/eth-abi/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { # lots of: TypeError: isinstance() arg 2 must be a type or tuple of types doCheck = false; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ] ++ eth-hash.optional-dependencies.pycryptodome; diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index 1c60a2d59489..7f5b436a14f5 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -4,6 +4,7 @@ , pythonOlder , pytest , pysha3 +, safe-pysha3 , pycryptodome }: @@ -19,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-LMDtFUrsPYgj/Fl9aBW1todlj1D3LlFxAkzNFAzCGLQ="; }; - checkInputs = [ + nativeCheckInputs = [ pytest ] ++ passthru.optional-dependencies.pycryptodome ++ passthru.optional-dependencies.pysha3; @@ -31,7 +32,7 @@ buildPythonPackage rec { passthru.optional-dependencies = { pycryptodome = [ pycryptodome ]; - pysha3 = [ pysha3 ]; + pysha3 = if pythonOlder "3.9" then [ pysha3 ] else [ safe-pysha3 ]; }; meta = with lib; { diff --git a/pkgs/development/python-modules/eth-keyfile/default.nix b/pkgs/development/python-modules/eth-keyfile/default.nix index fd62501b81d2..54b76e23606b 100644 --- a/pkgs/development/python-modules/eth-keyfile/default.nix +++ b/pkgs/development/python-modules/eth-keyfile/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pycryptodome ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix index 00029b7df05f..2b5a64527e81 100644 --- a/pkgs/development/python-modules/eth-keys/default.nix +++ b/pkgs/development/python-modules/eth-keys/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { eth-utils ]; - checkInputs = [ + nativeCheckInputs = [ asn1tools factory_boy hypothesis @@ -50,6 +50,8 @@ buildPythonPackage rec { "test_public_key_compression_is_equal" "test_public_key_decompression_is_equal" "test_signatures_with_high_s" + # timing sensitive + "test_encode_decode_pairings" ]; pythonImportsCheck = [ "eth_keys" ]; diff --git a/pkgs/development/python-modules/eth-rlp/default.nix b/pkgs/development/python-modules/eth-rlp/default.nix index 72cd3c1e8408..e97926b3d742 100644 --- a/pkgs/development/python-modules/eth-rlp/default.nix +++ b/pkgs/development/python-modules/eth-rlp/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { rlp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ eth-hash.optional-dependencies.pycryptodome; diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 6c8bc6cb5707..8ed085ad0e4a 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -7,26 +7,31 @@ buildPythonPackage rec { pname = "eth-typing"; - version = "3.1.0"; + version = "3.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-typing"; - rev = "v${version}"; - sha256 = "sha256-Xk/IfW1zuNbGdYAxXTNL9kL+ZW1bWruZ21KFV9+lv/E="; + rev = "refs/tags/v${version}"; + hash = "sha256-klN38pIQ9ZOFV7dzXNvylPGfifR8pXRLTJ3VE579AY0="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "eth_typing" ]; + pythonImportsCheck = [ + "eth_typing" + ]; - meta = { + meta = with lib; { description = "Common type annotations for Ethereum Python packages"; homepage = "https://github.com/ethereum/eth-typing"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ SuperSandro2000 ]; + changelog = "https://github.com/ethereum/eth-typing/blob/v${version}/docs/release_notes.rst"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index a5b19123c1ec..7297471ff7ef 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ++ lib.optional isPyPy toolz; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ] ++ eth-hash.optional-dependencies.pycryptodome; diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index d40bf842fdb5..b3ff9c680f8c 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "etils"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0dWve9nHhKJzxOHsz6qP6speBIGghxe1MT+iMdoiqQM="; + hash = "sha256-SJED6eSZpWZ2XGBFjuFdGFzwBl8gYKTRamj49Gli7Q0="; }; nativeBuildInputs = [ @@ -62,7 +62,7 @@ buildPythonPackage rec { "etils" ]; - checkInputs = [ + nativeCheckInputs = [ chex jaxlib pytest-subtests diff --git a/pkgs/development/python-modules/etuples/default.nix b/pkgs/development/python-modules/etuples/default.nix index 5ad7696ae1cf..7ea15ebb8d6f 100644 --- a/pkgs/development/python-modules/etuples/default.nix +++ b/pkgs/development/python-modules/etuples/default.nix @@ -3,19 +3,20 @@ , fetchFromGitHub , cons , multipledispatch +, py , pytestCheckHook , pytest-html }: buildPythonPackage rec { pname = "etuples"; - version = "0.3.5"; + version = "0.3.8"; src = fetchFromGitHub { owner = "pythological"; repo = "etuples"; - rev = "v${version}"; - sha256 = "sha256-gJNxrO2d/eF4t3bBlz/BwF+9eT1nKrVrTP3F6/dEN00="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-wEgam2IoI3z75bN45/R9o+0JmL3g0YmtsuJ4TnZjhi8="; }; propagatedBuildInputs = [ @@ -23,7 +24,8 @@ buildPythonPackage rec { multipledispatch ]; - checkInputs = [ + nativeCheckInputs = [ + py pytestCheckHook pytest-html ]; diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 354b10749938..659a2314d6dd 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -1,25 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi, linuxHeaders }: +{ lib +, buildPythonPackage +, fetchPypi +, linuxHeaders +, pythonOlder +}: buildPythonPackage rec { pname = "evdev"; - version = "1.6.0"; + version = "1.6.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7PoBtchPfoxs7TNnrJUoj0PNhO+/1919DNv8DRjIemo="; + hash = "sha256-KZ24YozHOyN/wcxX08KUj6oHVuKli2GUtb+B3CCB8eM="; }; - buildInputs = [ linuxHeaders ]; + buildInputs = [ + linuxHeaders + ]; patchPhase = '' - substituteInPlace setup.py --replace /usr/include/linux ${linuxHeaders}/include/linux + substituteInPlace setup.py \ + --replace /usr/include/linux ${linuxHeaders}/include/linux ''; doCheck = false; + pythonImportsCheck = [ + "evdev" + ]; + meta = with lib; { description = "Provides bindings to the generic input event interface in Linux"; - homepage = "https://pythonhosted.org/evdev"; + homepage = "https://python-evdev.readthedocs.io/"; + changelog = "https://github.com/gvalkov/python-evdev/blob/v${version}/docs/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 977f5e236a25..e653bda8caac 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { monotonic ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook nose ]; diff --git a/pkgs/development/python-modules/evtx/default.nix b/pkgs/development/python-modules/evtx/default.nix index c6550f37aa24..7f15ee79a805 100644 --- a/pkgs/development/python-modules/evtx/default.nix +++ b/pkgs/development/python-modules/evtx/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { maturinBuildHook ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index 76c6f0e2d34e..5e7930bbc9cd 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -1,30 +1,37 @@ { lib , buildPythonPackage -, fetchPypi -, flit-core +, fetchFromGitHub +, flit-scm , pytestCheckHook , pythonOlder +, pythonAtLeast }: buildPythonPackage rec { pname = "exceptiongroup"; - version = "1.0.0"; - format = "flit"; + version = "1.1.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-r/ur8T+26YmIw42cVlDnAVaf48HeMjPPthxfM3dGkK0="; + src = fetchFromGitHub { + owner = "agronholm"; + repo = "exceptiongroup"; + rev = version; + hash = "sha256-XQcYYz4MOxWj9QlgM6KuwBaCHjYzGRkQw3cN5WBSnAo="; }; nativeBuildInputs = [ - flit-core + flit-scm ]; - # Tests are only in the source available but tagged releases - # are incomplete as files are generated during the release process - doCheck = false; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + doCheck = pythonAtLeast "3.11"; # infinite recursion with pytest + + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "exceptiongroup" @@ -33,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Backport of PEP 654 (exception groups)"; homepage = "https://github.com/agronholm/exceptiongroup"; + changelog = "https://github.com/agronholm/exceptiongroup/blob/${version}/CHANGES.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 381cb282db99..b9e8313263e9 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -45,6 +45,12 @@ buildPythonPackage rec { url = "https://github.com/ecederstrand/exchangelib/commit/d5d386f54adec8ab02f871332b89e1176c214ba2.diff"; hash = "sha256-E3Ys6IDJ/yMsvi+1GKbwckkhbNrc9JLM/+GrPtUz+mY="; }) + (fetchpatch { + name = "tests-timezones-2.patch"; + url = "https://github.com/ecederstrand/exchangelib/commit/419eafcd9261bfd0617823ee437204d5556a8271.diff"; + excludes = [ "tests/test_ewsdatetime.py" ]; + hash = "sha256-dSp6NkNT5dHOg8XgDi8sR3t3hq46sNtPjUXva2YfFSU="; + }) ]; propagatedBuildInputs = [ @@ -65,7 +71,7 @@ buildPythonPackage rec { backports-zoneinfo ]; - checkInputs = [ + nativeCheckInputs = [ flake8 psutil python-dateutil diff --git a/pkgs/development/python-modules/exdown/default.nix b/pkgs/development/python-modules/exdown/default.nix index f7b4a38ee476..ba581cdef357 100644 --- a/pkgs/development/python-modules/exdown/default.nix +++ b/pkgs/development/python-modules/exdown/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 0c75727e7445..a7ad4cf4ed5d 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -2,23 +2,30 @@ , buildPythonPackage , isPyPy , fetchPypi +, fetchpatch , pytestCheckHook , setuptools-scm , apipkg +, py }: buildPythonPackage rec { pname = "execnet"; version = "1.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"; }; - checkInputs = [ pytestCheckHook ]; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ apipkg ]; + patches = [ + (fetchpatch { + # Fix test compat with pytest 7.2.0 + url = "https://github.com/pytest-dev/execnet/commit/c0459b92bc4a42b08281e69b8802d24c5d3415d4.patch"; + hash = "sha256-AT2qr7AUpFXcPps525U63A7ARcEVmf0HM6ya73Z2vi0="; + }) + ]; # remove vbox tests postPatch = '' @@ -29,14 +36,30 @@ buildPythonPackage rec { ${lib.optionalString isPyPy "rm -v testing/test_multi.py"} ''; - pythonImportsCheck = [ "execnet" ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + apipkg + ]; + + nativeCheckInputs = [ + py + pytestCheckHook + ]; + + pythonImportsCheck = [ + "execnet" + ]; __darwinAllowLocalNetworking = true; meta = with lib; { + changelog = "https://github.com/pytest-dev/execnet/blob/v${version}/CHANGELOG.rst"; description = "Distributed Python deployment and communication"; - license = licenses.mit; homepage = "https://execnet.readthedocs.io/"; + license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix index 1a6664df6712..484f5690054a 100644 --- a/pkgs/development/python-modules/executing/default.nix +++ b/pkgs/development/python-modules/executing/default.nix @@ -2,33 +2,40 @@ , asttokens , buildPythonPackage , fetchFromGitHub +, littleutils +, pytestCheckHook +, pythonAtLeast +, pythonOlder +, rich , setuptools-scm }: buildPythonPackage rec { pname = "executing"; - version = "0.8.2"; - format = "setuptools"; + version = "1.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "alexmojaki"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CDZQ9DONn7M+2/GtmM2G6nQPpI9dOd0ca+2F1PGRwO4="; + hash = "sha256-3M3uSJ5xQ5Ciy8Lz21u9zjju/7SBSFHobCqSiJ6AP8M="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools-scm ]; - preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" - ''; - - # Tests appear to run fine (Ran 22 tests in 4.076s) with setuptoolsCheckPhase - # but crash with pytestCheckHook - checkInputs = [ + nativeCheckInputs = [ asttokens + littleutils + pytestCheckHook + ] ++ lib.optionals (pythonAtLeast "3.11") [ + rich ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/executor/default.nix b/pkgs/development/python-modules/executor/default.nix index 610d9b0b096c..c9500d6f278b 100644 --- a/pkgs/development/python-modules/executor/default.nix +++ b/pkgs/development/python-modules/executor/default.nix @@ -1,8 +1,21 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27, coloredlogs, property-manager, fasteners, pytestCheckHook, mock, virtualenv }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, coloredlogs +, humanfriendly +, property-manager +, fasteners +, six +, pytestCheckHook +, mock +, virtualenv +}: buildPythonPackage rec { pname = "executor"; version = "23.2"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { @@ -12,9 +25,19 @@ buildPythonPackage rec { sha256 = "1mr0662c5l5zx0wjapcprp8p2xawfd0im3616df5sgv79fqzwfqs"; }; - propagatedBuildInputs = [ coloredlogs property-manager fasteners ]; + propagatedBuildInputs = [ + coloredlogs + humanfriendly + property-manager + fasteners + six + ]; - checkInputs = [ pytestCheckHook mock virtualenv ]; + nativeCheckInputs = [ + pytestCheckHook + mock + virtualenv + ]; # ignore impure tests disabledTests = [ @@ -28,6 +51,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/xolox/python-executor/blob/${version}/CHANGELOG.rst"; description = "Programmer friendly subprocess wrapper"; homepage = "https://github.com/xolox/python-executor"; license = licenses.mit; diff --git a/pkgs/development/python-modules/exif/default.nix b/pkgs/development/python-modules/exif/default.nix index 2c549030e6d7..6ecad38e2af8 100644 --- a/pkgs/development/python-modules/exif/default.nix +++ b/pkgs/development/python-modules/exif/default.nix @@ -2,24 +2,21 @@ buildPythonPackage rec { pname = "exif"; - version = "1.2.0"; + version = "1.3.5"; disabled = !isPy3k; src = fetchFromGitLab { owner = "TNThieding"; repo = "exif"; - rev = "686857c677f489759db90b1ad61fa1cc1cac5f9a"; - sha256 = "0z2if23kmi0iyxviz32mlqs997i3dqpqfz6nznlwkhkkb6rkwwnh"; + rev = "v${version}"; + sha256 = "sha256-XSORawioXo8oPVZ3Jnxqa6GFIxnQZMT0vJitdmpBj0E="; }; propagatedBuildInputs = [ plum-py ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "plum-py==0.3.1" "plum-py>=0.3.1" - ''; + nativeCheckInputs = [ pytestCheckHook baseline ]; - checkInputs = [ pytestCheckHook baseline ]; + pythonImportsCheck = [ "exif" ]; meta = with lib; { description = "Read and modify image EXIF metadata using Python"; diff --git a/pkgs/development/python-modules/expecttest/default.nix b/pkgs/development/python-modules/expecttest/default.nix index db64b386f241..5c1a27751e07 100644 --- a/pkgs/development/python-modules/expecttest/default.nix +++ b/pkgs/development/python-modules/expecttest/default.nix @@ -2,25 +2,25 @@ , fetchFromGitHub , hypothesis , lib -, poetry +, poetry-core , pytestCheckHook }: buildPythonPackage rec { pname = "expecttest"; - version = "0.1.3"; + version = "0.1.4"; format = "pyproject"; src = fetchFromGitHub { owner = "ezyang"; repo = pname; rev = "v${version}"; - hash = "sha256-5CnpVFSbf3FcAa06Y7atG8sxu8uevpfrliB2HuVcrx0="; + hash = "sha256-BFM0jFWXfH72n9XuFtU9URW8LWGPVJncXniBV5547W4="; }; - buildInputs = [ poetry ]; + nativeBuildInputs = [ poetry-core ]; - checkInputs = [ hypothesis pytestCheckHook ]; + nativeCheckInputs = [ hypothesis pytestCheckHook ]; pythonImportsCheck = [ "expecttest" ]; diff --git a/pkgs/development/python-modules/expiringdict/default.nix b/pkgs/development/python-modules/expiringdict/default.nix index 9dfe60aca7e3..e97f8233773e 100644 --- a/pkgs/development/python-modules/expiringdict/default.nix +++ b/pkgs/development/python-modules/expiringdict/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "sha256-vRhJSHIqc51I+s/wndtfANM44CKW3QS1iajqyoSBf0I="; }; - checkInputs = [ + nativeCheckInputs = [ dill coverage coveralls diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index a77c31e26a63..cd31e6ff0101 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -2,9 +2,11 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, antlr4 , antlr4-python3-runtime , igraph , pygments +, pytestCheckHook }: buildPythonPackage rec { @@ -18,6 +20,10 @@ buildPythonPackage rec { sha256 = "1vzyliiyrxx8l9sfbqcyr4xn5swd7znkxy69kn0vb5rban8hm9c1"; }; + nativeBuildInputs = [ + antlr4 + ]; + patches = [ # https://github.com/SkyTemple/ExplorerScript/pull/17 (fetchpatch { @@ -26,8 +32,27 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ antlr4-python3-runtime igraph ]; - checkInputs = [ pygments ]; + postPatch = '' + sed -i "s/antlr4-python3-runtime.*/antlr4-python3-runtime',/" setup.py + antlr -Dlanguage=Python3 -visitor explorerscript/antlr/{ExplorerScript,SsbScript}.g4 + ''; + + propagatedBuildInputs = [ + antlr4-python3-runtime + igraph + ]; + + passthru.optional-dependencies.pygments = [ + pygments + ]; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ passthru.optional-dependencies.pygments; + + pythonImportsCheck = [ + "explorerscript" + ]; meta = with lib; { homepage = "https://github.com/SkyTemple/explorerscript"; diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix index 0a8db8611921..2c592e081d92 100644 --- a/pkgs/development/python-modules/extractcode/default.nix +++ b/pkgs/development/python-modules/extractcode/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { extractcode-7z ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist ]; @@ -58,6 +58,8 @@ buildPythonPackage rec { "test_get_extractor_qcow2" # WARNING patch:patch.py:450 inconsistent line ends in patch hunks "test_patch_info_patch_patches_windows_plugin_explorer_patch" + # AssertionError: assert [['linux-2.6...._end;', ...]]] == [['linux-2.6...._end;', ...]]] + "test_patch_info_patch_patches_misc_linux_st710x_patches_motorola_rootdisk_c_patch" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/extruct/default.nix b/pkgs/development/python-modules/extruct/default.nix index 39591ac55fa2..5dd294c54745 100644 --- a/pkgs/development/python-modules/extruct/default.nix +++ b/pkgs/development/python-modules/extruct/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { w3lib ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 7adbba522e9b..2b5cc5afba75 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -1,13 +1,11 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , python , isPyPy , six , filetype , deprecation -, dataclasses }: buildPythonPackage rec { @@ -25,8 +23,10 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ - six filetype deprecation - ] ++ lib.optional (pythonOlder "3.7") dataclasses; + deprecation + filetype + six + ]; postInstall = '' for prog in "$out/bin/"*; do diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix index c04017b4e49d..94e9c37c028a 100644 --- a/pkgs/development/python-modules/ezdxf/default.nix +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ezyrb/default.nix b/pkgs/development/python-modules/ezyrb/default.nix index e3f6419871f9..0297ede47b6c 100644 --- a/pkgs/development/python-modules/ezyrb/default.nix +++ b/pkgs/development/python-modules/ezyrb/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ezyrb"; - version = "1.3.0.post2209"; + version = "1.3.0.post2212"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "EZyRB"; rev = "refs/tags/v${version}"; - sha256 = "sha256-jybDVPUybIuTeWRAA0cphb2pDVobuMX1OufBavZ/ZbQ="; + sha256 = "sha256-Em7t84fCTYCJfsjLGKhno75PheALhSbLH7z1mfgQ+v4="; }; propagatedBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { torch ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/face-recognition/default.nix b/pkgs/development/python-modules/face-recognition/default.nix index 150429acf879..8b06c83cf5aa 100644 --- a/pkgs/development/python-modules/face-recognition/default.nix +++ b/pkgs/development/python-modules/face-recognition/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pillow ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/face/default.nix b/pkgs/development/python-modules/face/default.nix index 50db0ce94991..cd024c1fb22b 100644 --- a/pkgs/development/python-modules/face/default.nix +++ b/pkgs/development/python-modules/face/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { boltons ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index 407083e4f691..a5b0130911e9 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { faker ]; - checkInputs = [ + nativeCheckInputs = [ django flask flask-sqlalchemy @@ -39,6 +39,11 @@ buildPythonPackage rec { "MongoEngineTestCase" ]; + disabledTestPaths = [ + # incompatible with latest flask-sqlalchemy + "examples/flask_alchemy/test_demoapp.py" + ]; + pythonImportsCheck = [ "factory" ]; diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index 9b207a81c3c7..1869ea45fcf0 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -1,17 +1,43 @@ -{ lib, fetchPypi, buildPythonPackage, six, pytest }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, importlib-metadata +, importlib-resources +, setuptools +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { pname = "fake-useragent"; - version = "0.1.11"; + version = "1.1.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "0dfz3bpmjmaxlhda6hfgsac7afb65pljibi8zkp9gc0ffn5rj161"; + src = fetchFromGitHub { + owner = "fake-useragent"; + repo = "fake-useragent"; + rev = "refs/tags/${version}"; + hash = "sha256-MKVJM8bduvA03xzL954huoCge7enG2BJtxZEAvo6HIY="; }; - propagatedBuildInputs = [ six ]; + postPatch = '' + sed -i '/addopts/d' pytest.ini + ''; - checkInputs = [ pytest ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-resources + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Up to date simple useragent faker with real world database"; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 9b8e6f7574a1..75263084f9ec 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 = "14.2.0"; + version = "15.3.4"; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-bbVuLEOit0JQ0cMy7yX+99wH3LbF+rUynde0RnuO17k="; + hash = "sha256-LVRDck9kDOB2WMqMqLvUDSa1iRTmPuxlSXJ4aapn4sw="; }; propagatedBuildInputs = [ @@ -25,7 +25,7 @@ buildPythonPackage rec { text-unidecode ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pillow pytestCheckHook diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 317f3d406759..d4a878b6a15f 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.0.0"; + version = "2.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-y9fuVg5Mu0ZT8hoja9V5mEfOz/hPH66Zbk5Rr/luPSc="; + hash = "sha256-COGzi/zK6ss47Qi2ll2e92V5WzzxdM5Z5cNmX3b1EH0="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { sortedcontainers ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytest-asyncio pytest-mock @@ -61,6 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fake implementation of Redis API"; homepage = "https://github.com/dsoftwareinc/fakeredis-py"; + changelog = "https://github.com/cunla/fakeredis-py/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index 89d047e968aa..341d3c661506 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -28,15 +28,15 @@ buildPythonPackage rec { pname = "falcon"; - version = "3.1.0"; + version = "3.1.1"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "falconry"; repo = pname; - rev = version; - hash = "sha256-Y6bD0GCXhqpvMV+/i1v59p2qWZ91f2ey7sPQrVALY54="; + rev = "refs/tags/${version}"; + hash = "sha256-5Lhz4qI/x7yK9tqQg4CvYNug+fp9l6ErNGH1pVybZ6c="; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ buildPythonPackage rec { popd ''; - checkInputs = [ + nativeCheckInputs = [ # https://github.com/falconry/falcon/blob/master/requirements/tests pytestCheckHook pyyaml diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index c5bca5712aba..77533844171c 100644 --- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -4,16 +4,20 @@ , marshmallow , packaging , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "faraday-agent-parameters-types"; - version = "1.1.0"; + version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "faraday_agent_parameters_types"; inherit version; - sha256 = "sha256-7CA5YvqoNHuz9Tq9jjt40lyjrg+CJpnzI1nVnBr9Cyg="; + sha256 = "sha256-jQgE/eR8Gd9nMGijH9unhHCrLUn7DbWFkTauoz3O/sM="; }; propagatedBuildInputs = [ @@ -21,7 +25,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -38,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of Faraday agent parameters types"; homepage = "https://github.com/infobyte/faraday_agent_parameters_types"; + changelog = "https://github.com/infobyte/faraday_agent_parameters_types/blob/${version}/CHANGELOG.md"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index bbcd6d600d6c..4bc9d1b239a3 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -8,6 +8,7 @@ , lxml , pytestCheckHook , python-dateutil +, pythonOlder , pytz , requests , simplejson @@ -16,16 +17,23 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.8.0"; + version = "1.10.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-KAfy2AQWZYFT/+rX8dNe8aWTFI0kkGg5IaSHhwYGk3A="; + hash = "sha256-bVuysEr8VVFgA4OZ7N7UlL2FigbyLVyPr1HHwkshSMU="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "version=version," "version='${version}'," + ''; + propagatedBuildInputs = [ beautifulsoup4 click @@ -39,7 +47,7 @@ buildPythonPackage rec { tabulate ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -64,6 +72,7 @@ buildPythonPackage rec { meta = with lib; { description = "Security tools report parsers for Faraday"; homepage = "https://github.com/infobyte/faraday_plugins"; + changelog = "https://github.com/infobyte/faraday_plugins/releases/tag/${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix index f7f4b33f1680..92c52fe5e956 100644 --- a/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/pkgs/development/python-modules/fastapi-mail/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "fastapi-mail"; - version = "1.2.0"; + version = "1.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,13 +28,16 @@ buildPythonPackage rec { owner = "sabuhish"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-RAUxc7spJL1QECAO0uZcCVAR/LaFIxFu61LD4RV9nEI="; + hash = "sha256-6Iwgl15adc6wK7i8sFLeSf2HSvMo/Sx/BI44qboNnRM="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'fastapi = "^0.75.0"' 'fastapi = "*"' \ - --replace 'httpx = "^0.22.0"' 'httpx = "*"' + --replace 'version = "1.2.2"' 'version = "${version}"' \ + --replace 'aiosmtplib = "^2.0"' 'aiosmtplib = "*"' \ + --replace 'pydantic = "^1.8"' 'pydantic = "*"' \ + --replace 'starlette = "^0.22.0"' 'starlette = "*"' \ + --replace 'black = "^22.12.0"' "" ''; nativeBuildInputs = [ @@ -54,7 +57,7 @@ buildPythonPackage rec { python-multipart ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; @@ -72,6 +75,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for sending emails and attachments"; homepage = "https://github.com/sabuhish/fastapi-mail"; + changelog = "https://github.com/sabuhish/fastapi-mail/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index f42188fb13ee..37671597fc84 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.85.2"; + version = "0.88.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-j3Set+xWNcRqbn90DJOJQhMrJYI3msvWHlFvN1habP0="; + hash = "sha256-2rjKmQcehqkL5OnmtLRTvsyUSpK2aUgyE9VLvz+oWNw="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ aiosqlite databases flask @@ -84,6 +84,8 @@ buildPythonPackage rec { "test_head" "test_options" "test_trace" + # Unexpected number of warnings caught + "test_warn_duplicate_operation_id" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index fc6ede97dd75..c4070226eee6 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.7.0"; + version = "1.7.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-vzaaX3wj1UkFGCohxYlPw6NA0b+oV/2JtpYXC4zncjk="; + sha256 = "sha256-oFBOHcrtJe9u/hdW4p8GgIJ2g4oiSNa+qbDFBuMB/HQ="; }; preBuild = '' @@ -31,7 +31,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; - checkInputs = [ + nativeCheckInputs = [ lz4 numpy pandas diff --git a/pkgs/development/python-modules/fastcache/default.nix b/pkgs/development/python-modules/fastcache/default.nix index 100af5244b57..37a8b1f1a67e 100644 --- a/pkgs/development/python-modules/fastcache/default.nix +++ b/pkgs/development/python-modules/fastcache/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0avqpswfmw5b08xx3ib6zchc5bis390fn1v74vg7nnrkf1pb3qbd"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { description = "C implementation of Python3 lru_cache for Python 2 and 3"; diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 1fd3af291fec..d0ed5bb1493c 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.5.27"; + version = "1.5.28"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-LFkjxcotJoHIX0GdKKqUSFF4/HSWc/sLwb34iuBrQIg="; + sha256 = "sha256-PSqwpDTzEaBXH77c64yv1s2TvQyIiz6It9cgjnCmrhY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastdiff/default.nix b/pkgs/development/python-modules/fastdiff/default.nix index a790f1623817..bc8eaa3588b9 100644 --- a/pkgs/development/python-modules/fastdiff/default.nix +++ b/pkgs/development/python-modules/fastdiff/default.nix @@ -1,4 +1,13 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, wasmer, wasmer-compiler-cranelift, pytestCheckHook, pytest-benchmark }: +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, wasmer +, wasmer-compiler-cranelift +, py +, pytestCheckHook +, pytest-benchmark +}: buildPythonPackage rec { pname = "fastdiff"; @@ -16,11 +25,24 @@ buildPythonPackage rec { --replace "collect_ignore = ['setup.py']" "" ''; - propagatedBuildInputs = [ wasmer wasmer-compiler-cranelift ]; + propagatedBuildInputs = [ + wasmer + wasmer-compiler-cranelift + ]; - checkInputs = [ pytestCheckHook pytest-benchmark ]; + nativeCheckInputs = [ + py + pytestCheckHook + pytest-benchmark + ]; - pythonImportsCheck = [ "fastdiff" ]; + pytestFlagsArray = [ + "--benchmark-skip" + ]; + + pythonImportsCheck = [ + "fastdiff" + ]; meta = with lib; { description = "A fast native implementation of diff algorithm with a pure Python fallback"; diff --git a/pkgs/development/python-modules/fastdtw/default.nix b/pkgs/development/python-modules/fastdtw/default.nix index cb75a599d03a..1ceaf3b875a3 100644 --- a/pkgs/development/python-modules/fastdtw/default.nix +++ b/pkgs/development/python-modules/fastdtw/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ "fastdtw.fastdtw" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; dontUseSetuptoolsCheck = true; # looks for pytest-runner preCheck = '' echo "Temporarily moving tests to $OUT to find cython modules" diff --git a/pkgs/development/python-modules/fastecdsa/default.nix b/pkgs/development/python-modules/fastecdsa/default.nix index e305f1e6d658..bd1a8c673e42 100644 --- a/pkgs/development/python-modules/fastecdsa/default.nix +++ b/pkgs/development/python-modules/fastecdsa/default.nix @@ -3,21 +3,28 @@ , fetchPypi , gmp , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "fastecdsa"; - version = "2.2.3"; + version = "2.3.1"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "269bdb0f618b38f8f6aec9d23d23db518046c3cee01a954fa6aa7322a1a7db8f"; + hash = "sha256-8ZjORPaUbKuwKYip9J0U78QQ26XiEemDIbqdhzeyP/g="; }; - buildInputs = [ gmp ]; + buildInputs = [ + gmp + ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; disabledTestPaths = [ # skip tests which require being online to download test vectors @@ -30,11 +37,14 @@ buildPythonPackage rec { # but the installed package works just fine doCheck = false; - pythonImportsCheck = [ "fastecdsa" ]; + pythonImportsCheck = [ + "fastecdsa" + ]; meta = with lib; { description = "Fast elliptic curve digital signatures"; homepage = "https://github.com/AntonKueltz/fastecdsa"; + changelog = "https://github.com/AntonKueltz/fastecdsa/blob/v${version}/CHANGELOG.md"; license = licenses.unlicense; maintainers = with maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 7072e4b3378c..38d09c47705c 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -1,39 +1,52 @@ { lib , buildPythonPackage -, fetchFromGitHub -, setuptools , diskcache +, eventlet +, fetchFromGitHub , more-itertools , pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "fasteners"; - version = "0.17.3"; + version = "0.18"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "harlowja"; repo = pname; - rev = version; - hash = "sha256-FVhHp8BZ/wQQyr5AcuDo94LlflixhjZ0SnheSdHuDVQ="; + rev = "refs/tags/${version}"; + hash = "sha256-FGcGGRfObOqXuURyEuNt/KDn51POpdNPUJJKtMcLJNI="; }; nativeBuildInputs = [ setuptools ]; - checkInputs = [ + nativeCheckInputs = [ diskcache + eventlet more-itertools pytestCheckHook ]; + pythonImportsCheck = [ + "fasteners" + ]; + + pytestFlagsArray = [ + "tests/" + ]; + meta = with lib; { - description = "A python package that provides useful locks"; + description = "Module that provides useful locks"; homepage = "https://github.com/harlowja/fasteners"; + changelog = "https://github.com/harlowja/fasteners/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index d05037ca9ef1..9f7219925a7f 100644 --- a/pkgs/development/python-modules/fastimport/default.nix +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "6ac99dda4e7b0b3ae831507b6d0094802e6dd95891feafde8cc5c405b6c149ca"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "fastimport" ]; diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix index cbb12c054e4b..449e0a3fdd48 100644 --- a/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/pkgs/development/python-modules/fastjsonschema/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "sha256-Gojayel/xQ5gRI0nbwsroeSMdRndjb+8EniX1Qs4nbg="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/fastnumbers/default.nix b/pkgs/development/python-modules/fastnumbers/default.nix index 5fd8115152f5..f0fe2e7b911c 100644 --- a/pkgs/development/python-modules/fastnumbers/default.nix +++ b/pkgs/development/python-modules/fastnumbers/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { # See https://github.com/SethMMorton/fastnumbers/issues/28 doCheck = !stdenv.hostPlatform.isAarch; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/fastpair/default.nix b/pkgs/development/python-modules/fastpair/default.nix index 45d9976896ec..4cdf1115e9fa 100644 --- a/pkgs/development/python-modules/fastpair/default.nix +++ b/pkgs/development/python-modules/fastpair/default.nix @@ -13,7 +13,7 @@ buildPythonPackage { nativeBuildInputs = [ pytest-runner ]; - checkInputs = [ pytest pytestCheckHook ]; + nativeCheckInputs = [ pytest pytestCheckHook ]; propagatedBuildInputs = [ scipy diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index e11aac39f7e6..16e3bd7ed229 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -2,6 +2,9 @@ , buildPythonPackage , fetchFromGitHub , python +, cython +, setuptools +, substituteAll , numba , numpy , pandas @@ -15,8 +18,8 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "0.8.1"; - format = "setuptools"; + version = "2023.1.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,9 +27,29 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - hash = "sha256-rWrbHHcJMahaUV8+YuKkZUhdboNFUK9btjvdg74lCxc="; + hash = "sha256-p8JydnrDEl9W4clrOkd+np0NYGP3hVnq+lyyF/zaVk8="; }; + nativeBuildInputs = [ + cython + setuptools + ]; + + patches = [ + (substituteAll { + src = ./version.patch; + inherit version; + }) + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" \ + --replace "oldest-supported-numpy" "numpy" + + sed -i '/"git", "status"/d' setup.py + ''; + propagatedBuildInputs = [ cramjam fsspec @@ -42,17 +65,10 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'," "" \ - --replace "oldest-supported-numpy" "numpy" - ''; - - # Workaround https://github.com/NixOS/nixpkgs/issues/123561 preCheck = '' mv fastparquet/test . diff --git a/pkgs/development/python-modules/fastparquet/version.patch b/pkgs/development/python-modules/fastparquet/version.patch new file mode 100644 index 000000000000..86d80e2a411b --- /dev/null +++ b/pkgs/development/python-modules/fastparquet/version.patch @@ -0,0 +1,7 @@ +diff --git a/fastparquet/_version.py b/fastparquet/_version.py +new file mode 100644 +index 0000000..eb2c9c9 +--- /dev/null ++++ b/fastparquet/_version.py +@@ -0,0 +1 @@ ++__version__ = "@version@" diff --git a/pkgs/development/python-modules/fastpbkdf2/default.nix b/pkgs/development/python-modules/fastpbkdf2/default.nix index 51669f90345d..ef6e0462c353 100644 --- a/pkgs/development/python-modules/fastpbkdf2/default.nix +++ b/pkgs/development/python-modules/fastpbkdf2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; buildInputs = [ openssl ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ cffi six ]; propagatedNativeBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix index b66ccd155c19..98a36d2953d4 100644 --- a/pkgs/development/python-modules/fastrlock/default.nix +++ b/pkgs/development/python-modules/fastrlock/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { # Todo: Check why the tests have an import error doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix index 1a3917fbdb7a..929a67557f57 100644 --- a/pkgs/development/python-modules/favicon/default.nix +++ b/pkgs/development/python-modules/favicon/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest-runner ]; - checkInputs = [ pytest requests-mock ]; + nativeCheckInputs = [ pytest requests-mock ]; propagatedBuildInputs = [ requests beautifulsoup4 ]; checkPhase = '' diff --git a/pkgs/development/python-modules/fe25519/default.nix b/pkgs/development/python-modules/fe25519/default.nix index 9e32640b8476..e85b23a4a959 100644 --- a/pkgs/development/python-modules/fe25519/default.nix +++ b/pkgs/development/python-modules/fe25519/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { parts ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index 53f2c15401ec..d47e15ecc629 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/fenics/default.nix b/pkgs/development/python-modules/fenics/default.nix index f1ccc5efc84b..277d28997e6e 100644 --- a/pkgs/development/python-modules/fenics/default.nix +++ b/pkgs/development/python-modules/fenics/default.nix @@ -40,7 +40,7 @@ let sha256 = "1ncgbr0bn5cvv16f13g722a0ipw6p9y6p4iasxjziwsp8kn5x97a"; }; propagatedBuildInputs = [ numpy six ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; preCheck = '' export HOME=$PWD ''; @@ -65,7 +65,7 @@ let sha256 = "1sbi0fbr7w9g9ajr565g3njxrc3qydqjy3334vmz5xg0rd3106il"; }; propagatedBuildInputs = [ numpy six sympy ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; preCheck = '' # Workaround pytest 4.6.3 issue. @@ -95,7 +95,7 @@ let sha256 = "04daxwg4y9c51sdgvwgmlc82nn0fjw7i2vzs15ckdc7dlazmcfi1"; }; propagatedBuildInputs = [ numpy six ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' runHook preCheck py.test test/ @@ -128,7 +128,7 @@ let ufl setuptools ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; preCheck = '' export HOME=$PWD rm test/unit/ufc/finite_element/test_evaluate.py diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index b5880a21b70e..ec2e0ee13b71 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -5,20 +5,27 @@ , tqdm , pytestCheckHook , ffmpeg +, procps }: buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "0.3.0"; + version = "0.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/FkVzssJZYafn3MlN8bODd7kA917x9oW0JivIOWxl+8="; + hash = "sha256-rt+Qg1H9t5PC4cyis9xuyf8myfxWLkTq3aD83+O4qmA="; }; propagatedBuildInputs = [ colorama tqdm ]; - checkInputs = [ pytestCheckHook ffmpeg ]; + nativeCheckInputs = [ pytestCheckHook ffmpeg procps ]; + + disabledTests = [ + "test_quit" + "test_quit_gracefully" + ]; pytestFlagsArray = [ "test/test.py" ]; diff --git a/pkgs/development/python-modules/ffmpeg-python/default.nix b/pkgs/development/python-modules/ffmpeg-python/default.nix index f514cf325371..6f54fb16061a 100644 --- a/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { future ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; diff --git a/pkgs/development/python-modules/fiblary3-fork/default.nix b/pkgs/development/python-modules/fiblary3-fork/default.nix index e2c53c3e417b..eeab77847c91 100644 --- a/pkgs/development/python-modules/fiblary3-fork/default.nix +++ b/pkgs/development/python-modules/fiblary3-fork/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ fixtures pytestCheckHook requests-mock diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index b769d897d09f..5f079f708692 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six cryptography ]; - checkInputs = [ unittestCheckHook mock pyfakefs ]; + nativeCheckInputs = [ unittestCheckHook mock pyfakefs ]; unittestFlagsArray = [ "-v" ]; diff --git a/pkgs/development/python-modules/file-read-backwards/default.nix b/pkgs/development/python-modules/file-read-backwards/default.nix index 80150a60de91..6b39bda1e522 100644 --- a/pkgs/development/python-modules/file-read-backwards/default.nix +++ b/pkgs/development/python-modules/file-read-backwards/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "fd50d9089b412147ea3c6027e2ad905f977002db2918cf315d64eed23d6d6eb8"; }; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; pythonImportsCheck = [ "file_read_backwards" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/filecheck/default.nix b/pkgs/development/python-modules/filecheck/default.nix index 9cbd8bde2117..d0945961ce22 100644 --- a/pkgs/development/python-modules/filecheck/default.nix +++ b/pkgs/development/python-modules/filecheck/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 7afb72545147..4b25ff52aad5 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -1,32 +1,35 @@ { lib , buildPythonPackage , fetchPypi +, hatch-vcs +, hatchling , pytestCheckHook , pythonOlder -, setuptools-scm }: buildPythonPackage rec { pname = "filelock"; - version = "3.8.0"; + version = "3.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VUR8qmZvIZjFtrE6JtIITSb6WxFcANBlZkshJGgMTtw="; + hash = "sha256-ezGfJDQLUfVaK/ehKsB1WpsD5xgxHaxWeg9Pf6vS9d4="; }; nativeBuildInputs = [ - setuptools-scm + hatch-vcs + hatchling ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { + changelog = "https://github.com/tox-dev/py-filelock/releases/tag/${version}"; description = "A platform independent file lock for Python"; homepage = "https://github.com/benediktschmitt/py-filelock"; license = licenses.unlicense; diff --git a/pkgs/development/python-modules/filetype/default.nix b/pkgs/development/python-modules/filetype/default.nix index e5e594fc5c10..f0d1caa25d27 100644 --- a/pkgs/development/python-modules/filetype/default.nix +++ b/pkgs/development/python-modules/filetype/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-ZrVs1kdL9B2MVGYDR9N6/MP30ZcGSN42XBAu93VIqts="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/filterpy/default.nix b/pkgs/development/python-modules/filterpy/default.nix index 9740117b9b92..877bd02ed31b 100644 --- a/pkgs/development/python-modules/filterpy/default.nix +++ b/pkgs/development/python-modules/filterpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "4f2a4d39e4ea601b9ab42b2db08b5918a9538c168cff1c6895ae26646f3d73b1"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ numpy scipy matplotlib ]; # single test fails (even on master branch of repository) diff --git a/pkgs/development/python-modules/finalfusion/default.nix b/pkgs/development/python-modules/finalfusion/default.nix index 379ed954dae0..18a8e5e56536 100644 --- a/pkgs/development/python-modules/finalfusion/default.nix +++ b/pkgs/development/python-modules/finalfusion/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix index 0e5892f58663..fe1ef2b672a1 100644 --- a/pkgs/development/python-modules/findpython/default.nix +++ b/pkgs/development/python-modules/findpython/default.nix @@ -15,7 +15,7 @@ let pname = "findpython"; - version = "0.2.2"; + version = "0.2.4"; in buildPythonPackage { inherit pname version; @@ -25,7 +25,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-gFV5YcBM8cjEukyjrHz3bsJ/qSeIpq9Cy3AeNFDElDA="; + hash = "sha256-YfF2jN2EPcL4pFlxJyxYwlZBpQsZ2pEwLiSS4ypmc2I="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -47,6 +47,7 @@ buildPythonPackage { meta = with lib; { description = "A utility to find python versions on your system"; homepage = "https://github.com/frostming/findpython"; + changelog = "https://github.com/frostming/findpython/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/fingerprints/default.nix b/pkgs/development/python-modules/fingerprints/default.nix index ea68c6fa8d4a..eda0bfe215f0 100644 --- a/pkgs/development/python-modules/fingerprints/default.nix +++ b/pkgs/development/python-modules/fingerprints/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { normality ]; - checkInputs = [ + nativeCheckInputs = [ mypy coverage nose diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index 13f20fbd49d6..ad7129411984 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests mt-940 sepaxml bleach ]; - checkInputs = [ pytestCheckHook pytest-mock ]; + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; meta = with lib; { homepage = "https://github.com/raphaelm/python-fints/"; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index cadbfc717a58..fec7fac990cd 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -1,31 +1,23 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder +{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder, cython , attrs, click, cligj, click-plugins, six, munch, enum34 , pytestCheckHook, boto3, mock, giflib, pytz , gdal, certifi -, fetchpatch }: buildPythonPackage rec { pname = "fiona"; - version = "1.8.22"; + version = "1.9.0"; src = fetchPypi { pname = "Fiona"; inherit version; - sha256 = "sha256-qCqZzps+eCV0AVfEXJ+yJZ1OkvCohqqsJfDbQP/h7qM="; + hash = "sha256-bkh8v7pahJ+98G5FFp/X4fFmL0Tz1xerS5RgRrJFfq4="; }; - patches = [ - # https://github.com/Toblerity/Fiona/pull/1122 - (fetchpatch { - url = "https://github.com/Toblerity/Fiona/commit/fa632130dcd9dfbb982ecaa4911b3fab3459168f.patch"; - hash = "sha256-IuNHr3yBqS1jY9Swvcq8XPv6BpVlInDx0FVuzEMaYTY="; - }) - ]; - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; nativeBuildInputs = [ + cython gdal # for gdal-config ]; @@ -44,7 +36,7 @@ buildPythonPackage rec { pytz ] ++ lib.optional (!isPy3k) enum34; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook boto3 ] ++ lib.optional (pythonOlder "3.4") mock; @@ -58,8 +50,12 @@ buildPythonPackage rec { disabledTests = [ # Some tests access network, others test packaging "http" "https" "wheel" + # https://github.com/Toblerity/Fiona/issues/1164 + "test_no_append_driver_cannot_append" ]; + pythonImportsCheck = [ "fiona" ]; + meta = with lib; { description = "OGR's neat, nimble, no-nonsense API for Python"; homepage = "https://fiona.readthedocs.io/"; diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix index 7e08fa87fd58..07d11670efb7 100644 --- a/pkgs/development/python-modules/fipy/default.nix +++ b/pkgs/development/python-modules/fipy/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { openssh ] ++ lib.optionals (!stdenv.isDarwin) [ gmsh ]; - checkInputs = lib.optionals (!stdenv.isDarwin) [ gmsh ]; + nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ gmsh ]; checkPhase = '' export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix index 252b180c4e06..f17bc7923f8b 100644 --- a/pkgs/development/python-modules/fire/default.nix +++ b/pkgs/development/python-modules/fire/default.nix @@ -1,26 +1,44 @@ -{ lib, buildPythonPackage, fetchFromGitHub, six, hypothesis, mock -, python-Levenshtein, pytest, termcolor, isPy27, enum34 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, six +, hypothesis +, mock +, levenshtein +, pytestCheckHook +, termcolor +, pythonOlder +}: buildPythonPackage rec { pname = "fire"; - version = "0.4.0"; + version = "0.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "google"; repo = "python-fire"; - rev = "v${version}"; - sha256 = "1caz6j2kdhj0kccrnqri6b4g2d6wzkkx8y9vxyvm7axvrwkv2vyn"; + rev = "refs/tags/v${version}"; + hash = "sha256-cwY1RRNtpAn6LnBASQLTNf4XXSPnfhOa1WgglGEM2/s="; }; - propagatedBuildInputs = [ six termcolor ] ++ lib.optional isPy27 enum34; + propagatedBuildInputs = [ + six + termcolor + ]; - checkInputs = [ hypothesis mock python-Levenshtein pytest ]; + nativeCheckInputs = [ + hypothesis + mock + levenshtein + pytestCheckHook + ]; - # ignore test which asserts exact usage statement, default behavior - # changed in python3.8. This can likely be remove >=0.3.1 - checkPhase = '' - py.test -k 'not testInitRequiresFlag' - ''; + pythonImportsCheck = [ + "fire" + ]; meta = with lib; { description = "A library for automatically generating command line interfaces"; @@ -42,6 +60,8 @@ buildPythonPackage rec { REPL with the modules and variables you'll need already imported and created. ''; + homepage = "https://github.com/google/python-fire"; + changelog = "https://github.com/google/python-fire/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ leenaars ]; }; diff --git a/pkgs/development/python-modules/fireflyalgorithm/default.nix b/pkgs/development/python-modules/fireflyalgorithm/default.nix index b0343f2d870a..cabee97bed9c 100644 --- a/pkgs/development/python-modules/fireflyalgorithm/default.nix +++ b/pkgs/development/python-modules/fireflyalgorithm/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "FireflyAlgorithm"; - version = "0.3.2"; + version = "0.3.4"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "firefly-cpp"; repo = pname; - rev = version; - sha256 = "sha256-IlOIoP2aANE8y3+Qtb/H6w/+REnPWiUUQGRiAfxOpcM="; + rev = "refs/tags/${version}"; + hash = "sha256-rJOcPQU/oz/qP787OpZsfbjSsT2dWvhJLTs4N5TriWc="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "An implementation of the stochastic nature-inspired algorithm for optimization"; homepage = "https://github.com/firefly-cpp/FireflyAlgorithm"; + changelog = "https://github.com/firefly-cpp/FireflyAlgorithm/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ firefly-cpp ]; }; diff --git a/pkgs/development/python-modules/fitbit/default.nix b/pkgs/development/python-modules/fitbit/default.nix index 3a1c76776774..df89eef07bfb 100644 --- a/pkgs/development/python-modules/fitbit/default.nix +++ b/pkgs/development/python-modules/fitbit/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ freezegun mock pytestCheckHook diff --git a/pkgs/development/python-modules/fixerio/default.nix b/pkgs/development/python-modules/fixerio/default.nix index 8605d0f65da0..eacd4f472aff 100644 --- a/pkgs/development/python-modules/fixerio/default.nix +++ b/pkgs/development/python-modules/fixerio/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ httpretty pytestCheckHook responses diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix index 2bc6612ba70d..ff246c4a0e98 100644 --- a/pkgs/development/python-modules/fixtures/default.nix +++ b/pkgs/development/python-modules/fixtures/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { six # not in install_requires, but used in fixture.py ]; - checkInputs = [ + nativeCheckInputs = [ mock ]; diff --git a/pkgs/development/python-modules/fjaraskupan/default.nix b/pkgs/development/python-modules/fjaraskupan/default.nix index bad4d7f14ef0..3068d6542ed7 100644 --- a/pkgs/development/python-modules/fjaraskupan/default.nix +++ b/pkgs/development/python-modules/fjaraskupan/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { bleak ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index d80b703522dc..71b457b52738 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "22.10.27"; + version = "23.1.20"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pzVzCEkndbesX3tzuuPqtpEmCd5/bSuQmJ2J2IPFRMk="; + hash = "sha256-JO6S9LjCEZKeUKxUpkqEw+RJ47HLbwQOOOKhHwnmWVI="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { flake8 ]; - checkInputs = [ + nativeCheckInputs = [ flake8 pytestCheckHook hypothesis diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix index 55858a9eaf2c..32885570ba76 100644 --- a/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/pkgs/development/python-modules/flake8-debugger/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pycodestyle ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index 699d37770a36..1c9926715379 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "flake8-future-import"; - version = "0.4.6"; + version = "0.4.7"; # PyPI tarball doesn't include the test suite src = fetchFromGitHub { owner = "xZise"; repo = "flake8-future-import"; - rev = version; - sha256 = "00q8n15xdnvqj454arn7xxksyrzh0dw996kjyy7g9rdk0rf8x82z"; + rev = "refs/tags/${version}"; + sha256 = "sha256-2EcCOx3+PCk9LYpQjHCFNpQVI2Pdi+lWL8R6bNadFe0="; }; patches = lib.optionals (pythonAtLeast "3.10") [ @@ -35,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flake8 ]; - checkInputs = [ six ]; + nativeCheckInputs = [ six ]; checkPhase = '' ${python.interpreter} -m test_flake8_future_import diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix index 25aa995f9122..51c9b9eb569e 100644 --- a/pkgs/development/python-modules/flake8-import-order/default.nix +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -1,25 +1,45 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, enum34, pycodestyle, pytest, flake8, pylama }: +{ lib +, buildPythonPackage +, fetchPypi +, flake8 +, pycodestyle +, pylama +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "flake8-import-order"; - version = "0.18.1"; + version = "0.18.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "14kfvsagqc6lrplvf3x58ia6x744bk8fj91wmk0hcipa8naw73d2"; + hash = "sha256-4jlB+JLaPgwJ1xG6u7DHO8c1JC6bIWtyZhZ1ipINkA4="; }; - propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34; + propagatedBuildInputs = [ + pycodestyle + ]; - checkInputs = [ pytest flake8 pycodestyle pylama ]; + nativeCheckInputs = [ + flake8 + pycodestyle + pylama + pytestCheckHook + ]; - checkPhase = '' - pytest --strict - ''; + pythonImportsCheck = [ + "flake8_import_order" + ]; meta = with lib; { description = "Flake8 and pylama plugin that checks the ordering of import statements"; homepage = "https://github.com/PyCQA/flake8-import-order"; + changelog = "https://github.com/PyCQA/flake8-import-order/blob/${version}/CHANGELOG.rst"; license = with licenses; [ lgpl3 mit ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/flake8-length/default.nix b/pkgs/development/python-modules/flake8-length/default.nix index 6f82b8dd50be..d81a9765bb0c 100644 --- a/pkgs/development/python-modules/flake8-length/default.nix +++ b/pkgs/development/python-modules/flake8-length/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "flake8-length"; - version = "0.3.0"; + version = "0.3.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "6e3c068005b0b3b5c8345923fe3e9a107c980baa1354dd19d820018f87409427"; + sha256 = "sha256-Dr1hTCU2G1STczXJsUPMGFYs1NpIAk1I95vxXsRTtRA="; }; propagatedBuildInputs = [ @@ -24,7 +24,7 @@ buildPythonPackage rec { "flake8_length" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests/" ]; diff --git a/pkgs/development/python-modules/flake8-polyfill/default.nix b/pkgs/development/python-modules/flake8-polyfill/default.nix index 60ee3558d1d4..1db143882736 100644 --- a/pkgs/development/python-modules/flake8-polyfill/default.nix +++ b/pkgs/development/python-modules/flake8-polyfill/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { flake8 ]; - checkInputs = [ + nativeCheckInputs = [ mock pep8 pytestCheckHook diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index d2827d7f2194..d56d42abf2ea 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { pname = "flake8"; - version = "5.0.4"; + version = "6.0.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; format = "setuptools"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "flake8"; rev = version; - hash = "sha256-Os8HIoM07/iOBMm+0WxdQj32pJJOJ8mkh+yLHpqkLXg="; + hash = "sha256-dN9LlLpQ/ZoVIFrAQ1NxMvsHqWsgdJVLUIAFwkheEL4="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { # Tests fail on Python 3.7 due to importlib using a deprecated interface doCheck = pythonAtLeast "3.7"; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flaky/default.nix b/pkgs/development/python-modules/flaky/default.nix index fe068211dfbf..65efea30db6c 100644 --- a/pkgs/development/python-modules/flaky/default.nix +++ b/pkgs/development/python-modules/flaky/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "3ad100780721a1911f57a165809b7ea265a7863305acb66708220820caf8aa0d"; }; - checkInputs = [ mock nose pytest ]; + nativeCheckInputs = [ mock nose pytest ]; checkPhase = '' # based on tox.ini diff --git a/pkgs/development/python-modules/flametree/default.nix b/pkgs/development/python-modules/flametree/default.nix index 047f2849d046..46157dac931e 100644 --- a/pkgs/development/python-modules/flametree/default.nix +++ b/pkgs/development/python-modules/flametree/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-oyiuhsYouGDKRssKc0aYIoG32H7GS6Bn4RtI7/9N158="; }; - checkInputs = [ + nativeCheckInputs = [ matplotlib pandas pytestCheckHook diff --git a/pkgs/development/python-modules/flammkuchen/default.nix b/pkgs/development/python-modules/flammkuchen/default.nix index eabfd1ad6fab..08bfbaed968f 100644 --- a/pkgs/development/python-modules/flammkuchen/default.nix +++ b/pkgs/development/python-modules/flammkuchen/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-KtMGQftoYVNNMtfYeYiaQyMLAySpf9YXLMxj+e/CV5I="; }; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index eae3bd65bc13..075cc2f7ec2a 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ arrow colour email-validator diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index 9a2aef0570ec..fa7ffee5a9cc 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -1,34 +1,66 @@ { lib , buildPythonPackage -, unittestCheckHook -, fetchPypi -, flask +, fetchFromGitHub + +# build-system +, poetry-core + +# docs +, furo +, sphinxHook + +# runtime , babel +, flask , jinja2 , pytz -, speaklater + +# tests +, pytest-mock +, pytestCheckHook }: buildPythonPackage rec { - pname = "Flask-Babel"; - version = "2.0.0"; + pname = "flask-babel"; + version = "3.0.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; + src = fetchFromGitHub { + owner = "python-babel"; + repo = "flask-babel"; + rev = "refs/tags/v${version}"; + hash = "sha256-c3QKAnyMe1THHuJ3uB2d0jMMo1SYGRAB9mBpIJSAHw0="; }; - propagatedBuildInputs = [ - flask - babel - jinja2 - pytz - speaklater + outputs = [ + "out" + "doc" ]; - unittestFlagsArray = [ "-s" "tests" ]; + nativeBuildInputs = [ + furo + poetry-core + sphinxHook + ]; + + propagatedBuildInputs = [ + babel + flask + jinja2 + pytz + ]; + + pythonImportsCheck = [ + "flask_babel" + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + ]; meta = with lib; { + changelog = "https://github.com/python-babel/flask-babel/releases/tag/v${version}"; description = "Adds i18n/l10n support to Flask applications"; longDescription = '' Implements i18n and l10n support for Flask. @@ -36,7 +68,7 @@ buildPythonPackage rec { installed automatically for you if you install this library. ''; license = licenses.bsd2; - maintainers = teams.sage.members; + maintainers = teams.sage.members ++ (with maintainers; [ matejc ]); homepage = "https://github.com/python-babel/flask-babel"; }; } diff --git a/pkgs/development/python-modules/flask-babelex/default.nix b/pkgs/development/python-modules/flask-babelex/default.nix index 4a7294540e12..7f48b68b0cb2 100644 --- a/pkgs/development/python-modules/flask-babelex/default.nix +++ b/pkgs/development/python-modules/flask-babelex/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { jinja2 ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/flask-bcrypt/default.nix b/pkgs/development/python-modules/flask-bcrypt/default.nix index fc80c5019046..3a95dcd2aa99 100644 --- a/pkgs/development/python-modules/flask-bcrypt/default.nix +++ b/pkgs/development/python-modules/flask-bcrypt/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { bcrypt ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "flask_bcrypt" diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index a75e1b4a435c..0f4b8a1433c4 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , fetchPypi @@ -11,26 +12,21 @@ buildPythonPackage rec { pname = "Flask-Caching"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EN8gCgPwMq9gB3vv5Bd53ZSJi2fIIEDTTochC3G6Jjg="; + sha256 = "sha256-JLYMVS1ZqWBcwbakLFbNs5qCoo2rRTK77bkiKuVOy04="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "Flask <= 2.1.2" "Flask <= 2.2" - ''; - propagatedBuildInputs = [ cachelib flask ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-xprocess pytestCheckHook @@ -42,11 +38,16 @@ buildPythonPackage rec { # optional backends "Redis" "Memcache" + ] ++ lib.optionals stdenv.isDarwin [ + # ignore flaky test + "test_cached_view_class" ]; meta = with lib; { - description = "Adds caching support to your Flask application"; - homepage = "https://github.com/sh4nks/flask-caching"; + description = "A caching extension for Flask"; + homepage = "https://github.com/pallets-eco/flask-caching"; + changelog = "https://github.com/pallets-eco/flask-caching/blob/v${version}/CHANGES.rst"; + maintainers = with maintainers; [ ]; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index 2622f2ab734e..654919256d91 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { brotli ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index 25c054b231bb..4ea6857cbd33 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de"; }; - checkInputs = [ nose packaging ]; + nativeCheckInputs = [ nose packaging ]; propagatedBuildInputs = [ flask six ]; # Exclude test_acl_uncaught_exception_500 test case because is not compatible diff --git a/pkgs/development/python-modules/flask-gravatar/default.nix b/pkgs/development/python-modules/flask-gravatar/default.nix index c0bbf7d01467..f96390211c1f 100644 --- a/pkgs/development/python-modules/flask-gravatar/default.nix +++ b/pkgs/development/python-modules/flask-gravatar/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { flask ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pygments ]; diff --git a/pkgs/development/python-modules/flask-httpauth/default.nix b/pkgs/development/python-modules/flask-httpauth/default.nix index 9c57881f4b2b..d3057e13ecad 100644 --- a/pkgs/development/python-modules/flask-httpauth/default.nix +++ b/pkgs/development/python-modules/flask-httpauth/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "sha256-9xmee60g1baLPwtivd/KdjfFUIfp0C9gWuJuDeR5/ZQ="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ flask ]; diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index 464894e9cfdd..44c95940d19c 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index 275b4507fb3b..d0971ee26da5 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -4,6 +4,7 @@ , flask , limits +, ordered-set , rich , typing-extensions @@ -18,23 +19,35 @@ buildPythonPackage rec { pname = "Flask-Limiter"; - version = "2.6.2"; + version = "3.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "alisaifee"; repo = "flask-limiter"; - rev = version; - sha256 = "sha256-JjksKwSMWzcslXCs977/Wlq1wDMaACxm8e6Ub+r3wPg="; + rev = "refs/tags/${version}"; + hash = "sha256-eAJRqyAH1j1NHYfagRZM2fPE6hm9+tJHD8FMqvgvMBI="; }; + postPatch = '' + substituteInPlace requirements/main.txt \ + --replace "rich>=12,<13" "rich" + + sed -i "/--cov/d" pytest.ini + + # flask-restful is unmaintained and breaks regularly, don't depend on it + sed -i "/import flask_restful/d" tests/test_views.py + ''; + propagatedBuildInputs = [ flask limits + ordered-set rich typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ asgiref pytest-mock pytestCheckHook @@ -44,13 +57,6 @@ buildPythonPackage rec { pymongo ]; - postPatch = '' - sed -i "/--cov/d" pytest.ini - - # flask-restful is unmaintained and breaks regularly, don't depend on it - sed -i "/import flask_restful/d" tests/test_views.py - ''; - disabledTests = [ # flask-restful is unmaintained and breaks regularly "test_flask_restful_resource" diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index faf93f4eee98..0d59651fa1bb 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { werkzeug ]; - checkInputs = [ + nativeCheckInputs = [ blinker pytestCheckHook semantic-version diff --git a/pkgs/development/python-modules/flask-mailman/default.nix b/pkgs/development/python-modules/flask-mailman/default.nix index aa8ffae24370..8dee11fe7d98 100644 --- a/pkgs/development/python-modules/flask-mailman/default.nix +++ b/pkgs/development/python-modules/flask-mailman/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { mkdocs-material-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index 63047c98fdf1..470639835a3b 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -1,25 +1,25 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 +, pythonOlder , alembic , flask , flask_script , flask-sqlalchemy -, unittestCheckHook +, pytestCheckHook }: buildPythonPackage rec { pname = "Flask-Migrate"; - version = "3.1.0"; + version = "4.0.2"; format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = pname; rev = "v${version}"; - sha256 = "0zj7qpknvlhrh4fsp5sx4fwyx3sp41ynclka992zympm3xym9zyq"; + hash = "sha256-6P5oIH/mVuMy4J71VIRD1p+qbvPUlq3COpytEgKz1qo="; }; propagatedBuildInputs = [ @@ -32,8 +32,8 @@ buildPythonPackage rec { "flask_migrate" ]; - checkInputs = [ - unittestCheckHook + nativeCheckInputs = [ + pytestCheckHook flask_script ]; @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "SQLAlchemy database migrations for Flask applications using Alembic"; homepage = "https://github.com/miguelgrinberg/Flask-Migrate"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ gador ]; }; } diff --git a/pkgs/development/python-modules/flask-paranoid/default.nix b/pkgs/development/python-modules/flask-paranoid/default.nix index 8de346593efb..d20f5c46633c 100644 --- a/pkgs/development/python-modules/flask-paranoid/default.nix +++ b/pkgs/development/python-modules/flask-paranoid/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { flask ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flask-principal/default.nix b/pkgs/development/python-modules/flask-principal/default.nix index f3164aa1f08e..1c185ce74770 100644 --- a/pkgs/development/python-modules/flask-principal/default.nix +++ b/pkgs/development/python-modules/flask-principal/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask blinker ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = with lib; { homepage = "http://packages.python.org/Flask-Principal/"; diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index c53d72d100b0..cecdb76fc10a 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ blinker mock nose diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/pkgs/development/python-modules/flask-restplus/default.nix index 3de74531c288..4673daa74644 100644 --- a/pkgs/development/python-modules/flask-restplus/default.nix +++ b/pkgs/development/python-modules/flask-restplus/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "0p4zz8b5bwbw7w0vhbyihl99d2gw13cb81rxzj4z626a1cnl8vm6"; }; - checkInputs = [ nose blinker tzlocal mock rednose ]; + nativeCheckInputs = [ nose blinker tzlocal mock rednose ]; propagatedBuildInputs = [ flask six jsonschema pytz aniso8601 flask-restful ] ++ lib.optional isPy27 enum34; diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index 6f7c83010eb1..961e1a644baa 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -10,6 +10,7 @@ , faker , mock , blinker +, py , pytest-flask , pytest-mock , pytest-benchmark @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "flask-restx"; - version = "1.0.3"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,8 +28,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-restx"; repo = pname; - rev = version; - sha256 = "sha256-fodoGeVSNw4XZrVt907H20OJQIR8FlfINvEPWOkZQqI="; + rev = "refs/tags/${version}"; + sha256 = "sha256-9CIAPsV0SJaBlNZZtWkqhhCJ/a1QEgbTkrCEBnuDVDo="; }; propagatedBuildInputs = [ @@ -39,10 +40,11 @@ buildPythonPackage rec { werkzeug ]; - checkInputs = [ + nativeCheckInputs = [ blinker faker mock + py pytest-benchmark pytest-flask pytest-mock diff --git a/pkgs/development/python-modules/flask-script/default.nix b/pkgs/development/python-modules/flask-script/default.nix index 9acc55166a86..3c130890e6cb 100644 --- a/pkgs/development/python-modules/flask-script/default.nix +++ b/pkgs/development/python-modules/flask-script/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ flask ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/flask-seasurf/default.nix b/pkgs/development/python-modules/flask-seasurf/default.nix index cebc4bfa89aa..55c96f4ea64a 100644 --- a/pkgs/development/python-modules/flask-seasurf/default.nix +++ b/pkgs/development/python-modules/flask-seasurf/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook mock ]; diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index bdefbc3db291..1af60bcc6caf 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder # extras: babel , babel @@ -45,12 +46,15 @@ buildPythonPackage rec { pname = "flask-security-too"; - version = "5.0.2"; + version = "5.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - sha256 = "sha256-Nv7g2l0bPSEcrydFU7d1NHjCCJl8Ykq7hOu6QmHeZcI="; + hash = "sha256-nSo7fdY9tiE7PnhosXh1eBfVa5l6a43XNvp6vKvrq5Y="; }; propagatedBuildInputs = [ @@ -86,7 +90,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ argon2-cffi flask-mongoengine mongoengine @@ -103,10 +107,13 @@ buildPythonPackage rec { ++ passthru.optional-dependencies.mfa; - pythonImportsCheck = [ "flask_security" ]; + pythonImportsCheck = [ + "flask_security" + ]; meta = with lib; { - homepage = "https://pypi.org/project/Flask-Security-Too/"; + changelog = "https://github.com/Flask-Middleware/flask-security/blob/${version}/CHANGES.rst"; + homepage = "https://github.com/Flask-Middleware/flask-security"; description = "Simple security for Flask apps (fork)"; license = licenses.mit; maintainers = with maintainers; [ gador ]; diff --git a/pkgs/development/python-modules/flask-session/default.nix b/pkgs/development/python-modules/flask-session/default.nix index a9433fe0b871..b6b65228d9a7 100644 --- a/pkgs/development/python-modules/flask-session/default.nix +++ b/pkgs/development/python-modules/flask-session/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask cachelib ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # The rest of the tests require database servers and optional db connector dependencies pytestFlagsArray = [ "-k" "'null_session or filesystem_session'" ]; diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index a429e81ce0fb..3c02d571082a 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { python-socketio ]; - checkInputs = [ + nativeCheckInputs = [ coverage pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index c7cc7351e66e..d5bd81ab90c1 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pdm-pep517 , flask , mock , sqlalchemy @@ -9,19 +10,24 @@ buildPythonPackage rec { pname = "Flask-SQLAlchemy"; - version = "2.5.1"; + version = "3.0.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912"; + hash = "sha256-FhmfWz3ftp4N8vUq5Mdq7b/sgjRiNJ2rshobLgorZek="; }; + nativeBuildInputs = [ + pdm-pep517 + ]; + propagatedBuildInputs = [ flask sqlalchemy ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flask-testing/default.nix b/pkgs/development/python-modules/flask-testing/default.nix index c66fe9bbfd1e..cb1c3cf79bd1 100644 --- a/pkgs/development/python-modules/flask-testing/default.nix +++ b/pkgs/development/python-modules/flask-testing/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { flask ]; - checkInputs = [ + nativeCheckInputs = [ blinker pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index 4c2e485c4bf1..8b68eb9d5580 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { email = [ email-validator ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index bc380cd8dbcb..3f0415d86dd4 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { werkzeug ] ++ lib.optional (pythonOlder "3.10") importlib-metadata; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/pkgs/development/python-modules/flaskbabel/default.nix deleted file mode 100644 index a0e42e60c2e0..000000000000 --- a/pkgs/development/python-modules/flaskbabel/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, flask -, jinja2 -, speaklater -, babel -, pytz -}: - -buildPythonPackage rec { - pname = "Flask-Babel"; - version = "2.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; - }; - - propagatedBuildInputs = [ flask jinja2 speaklater babel pytz ]; - - meta = with lib; { - description = "Adds i18n/l10n support to Flask applications"; - homepage = "https://github.com/mitsuhiko/flask-babel"; - license = licenses.bsd0; - maintainers = with maintainers; [ matejc ]; - }; - -} diff --git a/pkgs/development/python-modules/flatten-dict/default.nix b/pkgs/development/python-modules/flatten-dict/default.nix index e7bda9378b19..41929f9f671f 100644 --- a/pkgs/development/python-modules/flatten-dict/default.nix +++ b/pkgs/development/python-modules/flatten-dict/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index d9171d14e41d..f19030782827 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "flax"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-fZiODo+izOwGjCCTvi11GvUG/VQL1DV9bNXKjvIIw4A="; + sha256 = "sha256-4BYfrwEddA2LCMyDO6PBBYdMVTqqDxhzMCZ5JIIml3g="; }; buildInputs = [ jaxlib ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { "flax" ]; - checkInputs = [ + nativeCheckInputs = [ keras pytest-xdist pytestCheckHook diff --git a/pkgs/development/python-modules/flexmock/default.nix b/pkgs/development/python-modules/flexmock/default.nix index 434f9409dbb3..437868b70c82 100644 --- a/pkgs/development/python-modules/flexmock/default.nix +++ b/pkgs/development/python-modules/flexmock/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-sf419qXzJUe1zTGhXAYNmrhj3Aiv8BjNc9x40bZR7dQ="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook teamcity-messages testtools diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix index c13541acd833..ca04c9110eef 100644 --- a/pkgs/development/python-modules/flickrapi/default.nix +++ b/pkgs/development/python-modules/flickrapi/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/pkgs/development/python-modules/flipr-api/default.nix b/pkgs/development/python-modules/flipr-api/default.nix index 8140d462868e..3e1f5be4d8ae 100644 --- a/pkgs/development/python-modules/flipr-api/default.nix +++ b/pkgs/development/python-modules/flipr-api/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ requests-mock pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/flit-core/tests.nix b/pkgs/development/python-modules/flit-core/tests.nix index 0fd13e80cb12..dd05212407bc 100644 --- a/pkgs/development/python-modules/flit-core/tests.nix +++ b/pkgs/development/python-modules/flit-core/tests.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ flit pytestCheckHook testpath diff --git a/pkgs/development/python-modules/flit-scm/default.nix b/pkgs/development/python-modules/flit-scm/default.nix index 494df272445f..2a209f2b7cd8 100644 --- a/pkgs/development/python-modules/flit-scm/default.nix +++ b/pkgs/development/python-modules/flit-scm/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitLab , pythonOlder -, git , flit-core , setuptools-scm , tomli @@ -11,19 +10,37 @@ buildPythonPackage rec { pname = "flit-scm"; version = "1.7.0"; - format = "pyproject"; src = fetchFromGitLab { owner = "WillDaSilva"; repo = "flit_scm"; - rev = version; - sha256 = "sha256-K5sH+oHgX/ftvhkY+vIg6wUokAP96YxrTWds3tnEtyg="; - leaveDotGit = true; + rev = "refs/tags/${version}"; + hash = "sha256-K5sH+oHgX/ftvhkY+vIg6wUokAP96YxrTWds3tnEtyg="; }; - nativeBuildInputs = [ flit-core setuptools-scm tomli git ]; - propagatedBuildInputs = [ flit-core setuptools-scm ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + flit-core + setuptools-scm + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + propagatedBuildInputs = [ + flit-core + setuptools-scm + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + pythonImportsCheck = [ + "flit_scm" + ]; + + + doCheck = false; # no tests meta = with lib; { description = "A PEP 518 build backend that uses setuptools_scm to generate a version file from your version control system, then flit to build the package."; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 598905d97ffa..b28f4f6d5a61 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -7,7 +7,6 @@ , testpath , responses , flit-core -, tomli , tomli-w }: @@ -18,14 +17,14 @@ buildPythonPackage rec { pname = "flit"; - version = "3.7.1"; + version = "3.8.0"; format = "pyproject"; src = fetchFromGitHub { owner = "takluyver"; repo = "flit"; rev = version; - sha256 = "sha256-zKgaeK3fskz2TuHvIWlxBrdZIWfIJHhaqopZ3+V36wY="; + hash = "sha256-iXf9K/xI4u+dDV0Zf6S08nbws4NqycrTEW0B8/qCjQc="; }; nativeBuildInputs = [ @@ -36,11 +35,10 @@ buildPythonPackage rec { docutils requests flit-core - tomli tomli-w ]; - checkInputs = [ pytestCheckHook testpath responses ]; + nativeCheckInputs = [ pytestCheckHook testpath responses ]; disabledTests = [ # needs some ini file. diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index cf75588e20bd..b46b1df5410a 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -8,12 +8,13 @@ , pythonOlder , setuptools , setuptools-scm +, wheel , zstandard }: buildPythonPackage rec { pname = "flow-record"; - version = "3.5"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "flow.record"; rev = version; - hash = "sha256-hULz5pIqCKujVH3SpzFgzNM9R7WTtqAmuNOxG7VlUd0="; + hash = "sha256-bXI7q+unlrXvagKisAO4INfzeXlC4g918xmPmwMDCK8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -30,6 +31,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools setuptools-scm + wheel ]; propagatedBuildInputs = [ @@ -46,7 +48,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -59,6 +61,11 @@ buildPythonPackage rec { "tests/test_rdump.py" ]; + + disabledTests = [ + "test_rdump_fieldtype_path_json" + ]; + meta = with lib; { description = "Library for defining and creating structured data"; homepage = "https://github.com/fox-it/flow.record"; diff --git a/pkgs/development/python-modules/flower/default.nix b/pkgs/development/python-modules/flower/default.nix index 5d3e7d4482bd..1664b7214cc9 100644 --- a/pkgs/development/python-modules/flower/default.nix +++ b/pkgs/development/python-modules/flower/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { tornado ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix index 7045841245d3..50bcdc78e14f 100644 --- a/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flowlogs-reader"; - version = "3.2.0"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,8 +20,8 @@ buildPythonPackage rec { owner = "obsrvbl"; repo = pname; # https://github.com/obsrvbl/flowlogs-reader/issues/57 - rev = "fac4c6c63348ff67fd0a8f51d391ba7c9f59e5ed"; - hash = "sha256-bGb2CLp33aIr0R/lBPWAF3CbtVTWpqmcvYgZ6bcARTc="; + rev = "refs/tags/v${version}"; + hash = "sha256-XHRibTSzFzWPz50elz+KdbCwTrd1DKfVMSg6UamNbzc="; }; propagatedBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index 1cca2219a770..bd9fddf340dd 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -5,17 +5,17 @@ buildPythonPackage rec { pname = "flufl.lock"; - version = "7.1"; + version = "7.1.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Qxt/6PZhKZIA/2elOLrJNxchgcHtOm76bSiTS0i4oSw="; + sha256 = "sha256-rxQXKzW7xYaHvQa3DRaT/Y1Iy/D/3n5RphjBSK4kBC0="; }; nativeBuildInputs = [ pdm-pep517 ]; propagatedBuildInputs = [ atpublic psutil ]; - checkInputs = [ pytestCheckHook pytest-cov sybil ]; + nativeCheckInputs = [ pytestCheckHook pytest-cov sybil ]; # disable code coverage checks for all OS. Upstream does not enforce these # checks on Darwin, and code coverage cannot be improved downstream nor is it diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 21d1a51f8c41..f8a5a0826c68 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -1,4 +1,5 @@ { lib +, async-timeout , buildPythonPackage , fetchFromGitHub , webcolors @@ -8,7 +9,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.34"; + version = "0.28.35"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,14 +18,15 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = "refs/tags/${version}"; - hash = "sha256-bIL9ivjCLKeTLK3n0ytgGkXQggsuDiMCY7kAtE81qfY="; + hash = "sha256-+MbcI/gcoQOpfL77AyA0rZBP5OgP87gSDt4e5pjriqY="; }; propagatedBuildInputs = [ + async-timeout webcolors ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flynt/default.nix b/pkgs/development/python-modules/flynt/default.nix index 3c09106c94b8..75465b4a9288 100644 --- a/pkgs/development/python-modules/flynt/default.nix +++ b/pkgs/development/python-modules/flynt/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ astor ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "command line tool to automatically convert a project's Python code from old format style strings into Python 3.6+'s f-strings"; diff --git a/pkgs/development/python-modules/fnvhash/default.nix b/pkgs/development/python-modules/fnvhash/default.nix index d506b51a92cf..e54b49ddc8ea 100644 --- a/pkgs/development/python-modules/fnvhash/default.nix +++ b/pkgs/development/python-modules/fnvhash/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "00h8i70qd3dpsyf2dp7fkcb9m2prd6m3l33qv3wf6idpnqgjz6fq"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "fnvhash" ]; diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 9b8f3c080bae..09c2137872d2 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -1,42 +1,36 @@ { lib +, branca , buildPythonPackage , fetchFromGitHub -, fetchpatch -, pythonOlder -, pytestCheckHook -, branca +, geopandas , jinja2 , nbconvert , numpy , pandas , pillow +, pytestCheckHook +, pythonOlder , requests , selenium , setuptools-scm +, xyzservices }: buildPythonPackage rec { pname = "folium"; - version = "0.12.1.post1"; + version = "0.14.0"; + format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python-visualization"; repo = "folium"; - rev = "v${version}"; - sha256 = "sha256-4UseN/3ojZdDUopwZLpHZEBon1qDDvCWfdzxodi/BeA="; + rev = "refs/tags/v${version}"; + hash = "sha256-zxLFj5AeTVAxE0En7ZlbBdJEm3WrcPv23MgOhyfNi14="; }; - patches = [ - # Fix test failures with latest branca - (fetchpatch { - url = "https://github.com/python-visualization/folium/commit/b410ab21cc46ec6756c2f755e5e81dcdca029c53.patch"; - hash = "sha256-SVN4wKEep+VnAKnkJTf59rhnzHnbk6dV9XL5ntv4bog="; - }) - ]; - - SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ setuptools-scm @@ -49,25 +43,35 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ + geopandas nbconvert - pytestCheckHook pandas pillow + pytestCheckHook selenium + xyzservices ]; disabledTests = [ - # requires internet connection + # Tests require internet connection + "test__repr_png_is_bytes" "test_geojson" "test_heat_map_with_weights" "test_json_request" "test_notebook" + "test_valid_png_size" + "test_valid_png" + ]; + + pythonImportsCheck = [ + "folium" ]; meta = { description = "Make beautiful maps with Leaflet.js & Python"; homepage = "https://github.com/python-visualization/folium"; + changelog = "https://github.com/python-visualization/folium/blob/v${version}/CHANGES.txt"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix index 87fc01f83df9..1d9c08a81c12 100644 --- a/pkgs/development/python-modules/fontmake/default.nix +++ b/pkgs/development/python-modules/fontmake/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "fontmake"; - version = "3.4.0"; + version = "3.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g/JTmYE078qAFcTVCumVvGj65LbnDsCIUsFfqVlihTk="; + sha256 = "sha256-njJArNq7nhdoq0Si3+RUDE+VJSwuUvk+e7WeuNaluK0="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/fontmath/default.nix b/pkgs/development/python-modules/fontmath/default.nix index 2d5f90ebb686..63659bd08301 100644 --- a/pkgs/development/python-modules/fontmath/default.nix +++ b/pkgs/development/python-modules/fontmath/default.nix @@ -5,19 +5,19 @@ buildPythonPackage rec { pname = "fontMath"; - version = "0.9.2"; + version = "0.9.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-TIsccR4cv0upPD0IQ5NbBmGXMTEmGvCGCL3hfeEBhAQ="; + sha256 = "sha256-alOHy3/rEFlY2y9c7tyHhRPMNb83FeJiCQ8FV74MGxw="; extension = "zip"; }; nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ fonttools ]; - checkInputs = [ pytest pytest-runner ]; + nativeCheckInputs = [ pytest pytest-runner ]; meta = with lib; { description = "A collection of objects that implement fast font, glyph, etc. math"; diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index 6a595e29079e..2bf5db3483c0 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "fontParts"; - version = "0.10.8"; + version = "0.11.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LwEhvLqx3Vu1omc/QrGCptQD25Tbv9Ok5eTURL3hvEQ="; + sha256 = "sha256-He3BAIWxwDIM80ixmYjyAHlwDK9bBe/qS8P4+TVEkEg="; extension = "zip"; }; @@ -34,7 +34,7 @@ buildPythonPackage rec { ${python.interpreter} Lib/fontParts/fontshell/test.py runHook postCheck ''; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { description = "An API for interacting with the parts of fonts during the font development process."; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index cfcabbddc289..11db4867eb0e 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.34.4"; + version = "4.38.0"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-GwbcrDsfxs5qRQJozhK/+n3W3NlO39g7pzxL9iIiDfU="; + sha256 = "sha256-cdZI2kwR3zzS6eiiXGpeHIp+kgPCPEsTOSTV60pODTM="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -55,7 +55,7 @@ buildPythonPackage rec { all = lib.concatLists (lib.attrValues extras); }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatLists (lib.attrVals ([ "woff" diff --git a/pkgs/development/python-modules/foobot-async/default.nix b/pkgs/development/python-modules/foobot-async/default.nix index cd5be4ab0c2a..bf011e0ccf73 100644 --- a/pkgs/development/python-modules/foobot-async/default.nix +++ b/pkgs/development/python-modules/foobot-async/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { async-timeout ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytestCheckHook ]; diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index ea0c17d5524a..771feb3215fe 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , mock , pyopenssl , pytestCheckHook @@ -17,6 +18,14 @@ buildPythonPackage rec { sha256 = "sha256-6dGFU4YNk1joXXZi2c2L84JtUbTs1ICgXfv0/EU2P4Q="; }; + patches = [ + (fetchpatch { + name = "fix-tests-with-twisted-22.10.0.patch"; + url = "https://github.com/warner/foolscap/commit/c04202eb5d4cf052e650ec2985ea6037605fd79e.patch"; + hash = "sha256-RldDc18n3WYHdYg0ZmM8PBffIuiGa1NIfdoHs3mEEfc="; + }) + ]; + propagatedBuildInputs = [ mock twisted @@ -24,7 +33,7 @@ buildPythonPackage rec { service-identity ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/pkgs/development/python-modules/forbiddenfruit/default.nix index 13c46ba1e8aa..519d5a14028a 100644 --- a/pkgs/development/python-modules/forbiddenfruit/default.nix +++ b/pkgs/development/python-modules/forbiddenfruit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "16chhrxbbmg6lfbzm532fq0v00z8qihcsj0kg2b5jlgnb6qijwn8"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; preBuild = '' export FFRUIT_EXTENSION="true"; diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index 04a9586b40f4..fb2d0b166889 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { pkgconfig ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/fpyutils/default.nix b/pkgs/development/python-modules/fpyutils/default.nix index d70c5cd28e17..3ad71f9a2617 100644 --- a/pkgs/development/python-modules/fpyutils/default.nix +++ b/pkgs/development/python-modules/fpyutils/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "fpyutils"; - version = "2.2.1"; + version = "3.0.1"; format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "frnmst"; repo = pname; - rev = version; - sha256 = "sha256-5dikfR648AhQUMX/hS0igIy9gnMyxUHddp1xaxNyYCo="; + rev = "refs/tags/${version}"; + hash = "sha256-cmCD8uKPX/7Ak6jAqzCvDqR1FgH09GaLfLTZdBQB+bs="; }; propagatedBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of useful non-standard Python functions"; homepage = "https://github.com/frnmst/fpyutils"; + changelog = "https://blog.franco.net.eu.org/software/fpyutils-${version}/release.html"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/fqdn/default.nix b/pkgs/development/python-modules/fqdn/default.nix index cff62be2afff..def6532348a6 100644 --- a/pkgs/development/python-modules/fqdn/default.nix +++ b/pkgs/development/python-modules/fqdn/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-T0CdWWr8p3JVhp3nol5hyxsrD3951JE2EDpFt+m+3bE="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/freebox-api/default.nix b/pkgs/development/python-modules/freebox-api/default.nix index 76fd69bd0223..a896a6c72ed9 100644 --- a/pkgs/development/python-modules/freebox-api/default.nix +++ b/pkgs/development/python-modules/freebox-api/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/freetype-py/default.nix b/pkgs/development/python-modules/freetype-py/default.nix index 13e033e8bc36..ccc048c1fccb 100644 --- a/pkgs/development/python-modules/freetype-py/default.nix +++ b/pkgs/development/python-modules/freetype-py/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { cd tests ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index b1300b4e1146..112b5210173b 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/frilouz/default.nix b/pkgs/development/python-modules/frilouz/default.nix index 320912c7dd17..b19687f5fe03 100644 --- a/pkgs/development/python-modules/frilouz/default.nix +++ b/pkgs/development/python-modules/frilouz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0w2qzi4zb10r9iw64151ay01vf0yzyhh0bsjkx1apxp8fs15cdiw"; }; - checkInputs = [ astunparse ]; + nativeCheckInputs = [ astunparse ]; preCheck = "cd test"; diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index ae2f69a8a7e6..79301cf60031 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.10.3"; + version = "1.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,15 +16,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kbr"; repo = pname; - rev = version; - sha256 = "sha256-eRvo40VXgo+SQGeh88vRfHPnbrsVDyz03ToIgwRc43Q="; + rev = "refs/tags/${version}"; + hash = "sha256-BHlOX5STnKaIOM5tiBZ9JHNQIYVZfIPDMuSw6DAJliA="; }; propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index 6b47dc77c167..8c6c79c3ec6e 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -1,8 +1,9 @@ { lib , buildPythonPackage -, fetchPypi -, isPy3k +, fetchFromGitHub , pytestCheckHook +, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { @@ -10,32 +11,43 @@ buildPythonPackage rec { version = "2.3.4"; format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "15b4b18346259392b0d27598f240e9390fafbff882137a9c48a1e0104fb17f78"; + src = fetchFromGitHub { + owner = "Marco-Sulla"; + repo = "python-frozendict"; + rev = "refs/tags/v${version}"; + hash = "sha256-rDorFoVHiwbkRsIIA2MLKPHJ9HWJw2FKZ5iFHEiqzhg="; }; + postPatch = '' + # https://github.com/Marco-Sulla/python-frozendict/pull/69 + substituteInPlace setup.py \ + --replace 'if impl == "PyPy":' 'if impl == "PyPy" or not src_path.exists():' + ''; + + nativeCheckInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "frozendict" ]; - checkInputs = [ - pytestCheckHook - ]; - preCheck = '' pushd test ''; - postCheck = '' - popd - ''; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/Marco-Sulla/python-frozendict/issues/68 + "test_c_extension" + ]; meta = with lib; { + description = "Module for immutable dictionary"; homepage = "https://github.com/Marco-Sulla/python-frozendict"; - description = "A simple immutable dictionary"; + changelog = "https://github.com/Marco-Sulla/python-frozendict/releases/tag/v${version}"; license = licenses.lgpl3Only; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/frozenlist/default.nix b/pkgs/development/python-modules/frozenlist/default.nix index 73a5bfdb73fc..957e9f5d057a 100644 --- a/pkgs/development/python-modules/frozenlist/default.nix +++ b/pkgs/development/python-modules/frozenlist/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "frozenlist"; - version = "1.3.1"; + version = "1.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,14 +17,14 @@ buildPythonPackage rec { owner = "aio-libs"; repo = pname; rev = "v${version}"; - hash = "sha256-nOzS004uduS5C8y4ig0IaYyfk+h94uTiN048X66HO+Q="; + hash = "sha256-lJWRdXvuzyvJwNSpv0+ojY4rwws3jwDtlLOqYyLPrZc="; }; nativeBuildInputs = [ cython ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 1d4326f74ee3..e27216d551bb 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { # strong cycle with paramaterized doCheck = false; - checkInputs = [ pyftpdlib mock psutil pytestCheckHook ]; + nativeCheckInputs = [ pyftpdlib mock psutil pytestCheckHook ]; propagatedBuildInputs = [ six appdirs pytz setuptools ] ++ lib.optionals (!isPy3k) [ backports_os ] ++ lib.optionals (!pythonAtLeast "3.6") [ typing ] diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 452d9b49edfe..37adb4c8b533 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -13,6 +13,20 @@ , requests , smbprotocol , tqdm + +# optionals +, adlfs +, dask +, distributed +, dropbox +, fusepy +, gcsfs +, libarchive-c +, ocifs +, panel +, pyarrow +, pygit2 +, s3fs }: buildPythonPackage rec { @@ -37,7 +51,76 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + passthru.optional-dependencies = { + entrypoints = [ + ]; + abfs = [ + adlfs + ]; + adl = [ + adlfs + ]; + dask = [ + dask + distributed + ]; + dropbox = [ + # missing dropboxdrivefs + requests + dropbox + ]; + gcs = [ + gcsfs + ]; + git = [ + pygit2 + ]; + github = [ + requests + ]; + gs = [ + gcsfs + ]; + hdfs = [ + pyarrow + ]; + arrow = [ + pyarrow + ]; + http = [ + aiohttp + requests + ]; + sftp = [ + paramiko + ]; + s3 = [ + s3fs + ]; + oci = [ + ocifs + ]; + smb = [ + smbprotocol + ]; + ssh = [ + paramiko + ]; + fuse = [ + fusepy + ]; + libarchive = [ + libarchive-c + ]; + gui = [ + panel + ]; + tqdm = [ + tqdm + ]; + }; + + nativeCheckInputs = [ numpy pytest-asyncio pytest-mock diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index d214cb4f0a43..d7e6c75656f9 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { wcwidth ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix index 4cb2fe442d32..186cb45c941c 100644 --- a/pkgs/development/python-modules/ftputil/default.nix +++ b/pkgs/development/python-modules/ftputil/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-aInbhkndINm21ApsXw+EzPNAp9rB4L/A8AJAkPwq+zM="; }; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook ]; @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "High-level FTP client library (virtual file system and more)"; - homepage = "http://ftputil.sschwarzer.net/"; + homepage = "https://ftputil.sschwarzer.net/"; license = licenses.bsd2; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/func-timeout/default.nix b/pkgs/development/python-modules/func-timeout/default.nix index f20f5dde8b4b..f8b0f7829927 100644 --- a/pkgs/development/python-modules/func-timeout/default.nix +++ b/pkgs/development/python-modules/func-timeout/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "74cd3c428ec94f4edfba81f9b2f14904846d5ffccc27c92433b8b5939b5575dd"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/funcparserlib/default.nix b/pkgs/development/python-modules/funcparserlib/default.nix index 0eab273848ec..ae2ad068e4f0 100644 --- a/pkgs/development/python-modules/funcparserlib/default.nix +++ b/pkgs/development/python-modules/funcparserlib/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook six ]; diff --git a/pkgs/development/python-modules/functorch/default.nix b/pkgs/development/python-modules/functorch/default.nix deleted file mode 100644 index 033f0a3b4fda..000000000000 --- a/pkgs/development/python-modules/functorch/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ buildPythonPackage -, expecttest -, fetchFromGitHub -, lib -, ninja -, pytestCheckHook -, python -, torch -, pybind11 -, which -}: - -buildPythonPackage rec { - pname = "functorch"; - version = "0.2.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "pytorch"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-33skKk5aAIHn+1149ifolXPA+tpQ+WROAZvwPeGBbrA="; - }; - - # Somewhat surprisingly pytorch is actually necessary for the build process. - # `setup.py` imports `torch.utils.cpp_extension`. - nativeBuildInputs = [ - ninja - torch - which - ]; - - buildInputs = [ - pybind11 - ]; - - preCheck = '' - rm -rf functorch/ - ''; - - checkInputs = [ - expecttest - pytestCheckHook - ]; - - # See https://github.com/pytorch/functorch/issues/835. - disabledTests = [ - # RuntimeError: ("('...', '') is in PyTorch's OpInfo db ", "but is not in functorch's OpInfo db. Please regenerate ", '... and add the new tests to ', 'denylists if necessary.') - "test_coverage_bernoulli_cpu_float32" - "test_coverage_column_stack_cpu_float32" - "test_coverage_diagflat_cpu_float32" - "test_coverage_flatten_cpu_float32" - "test_coverage_linalg_lu_factor_cpu_float32" - "test_coverage_linalg_lu_factor_ex_cpu_float32" - "test_coverage_multinomial_cpu_float32" - "test_coverage_nn_functional_dropout2d_cpu_float32" - "test_coverage_nn_functional_feature_alpha_dropout_with_train_cpu_float32" - "test_coverage_nn_functional_feature_alpha_dropout_without_train_cpu_float32" - "test_coverage_nn_functional_kl_div_cpu_float32" - "test_coverage_normal_cpu_float32" - "test_coverage_normal_number_mean_cpu_float32" - "test_coverage_pca_lowrank_cpu_float32" - "test_coverage_round_decimals_0_cpu_float32" - "test_coverage_round_decimals_3_cpu_float32" - "test_coverage_round_decimals_neg_3_cpu_float32" - "test_coverage_scatter_reduce_cpu_float32" - "test_coverage_svd_lowrank_cpu_float32" - - # > self.assertEqual(len(functorch_lagging_op_db), len(op_db)) - # E AssertionError: Scalars are not equal! - # E - # E Absolute difference: 19 - # E Relative difference: 0.03525046382189239 - "test_functorch_lagging_op_db_has_opinfos_cpu" - - # RuntimeError: PyTorch not compiled with LLVM support! - "test_bias_gelu" - "test_binary_ops" - "test_broadcast1" - "test_broadcast2" - "test_float_double" - "test_float_int" - "test_fx_trace" - "test_int_long" - "test_issue57611" - "test_slice1" - "test_slice2" - "test_transposed1" - "test_transposed2" - "test_unary_ops" - ]; - - pythonImportsCheck = [ "functorch" ]; - - meta = with lib; { - description = "JAX-like composable function transforms for PyTorch"; - homepage = "https://pytorch.org/functorch"; - license = licenses.bsd3; - maintainers = with maintainers; [ samuela ]; - # See https://github.com/NixOS/nixpkgs/pull/174248#issuecomment-1139895064. - platforms = platforms.x86_64; - }; -} diff --git a/pkgs/development/python-modules/funcy/default.nix b/pkgs/development/python-modules/funcy/default.nix index 2a41d9955f34..5abacb6a79d9 100644 --- a/pkgs/development/python-modules/funcy/default.nix +++ b/pkgs/development/python-modules/funcy/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "funcy"; - version = "1.17"; + version = "1.18"; src = fetchPypi { inherit pname version; - sha256 = "40b9b9a88141ae6a174df1a95861f2b82f2fdc17669080788b73a3ed9370e968"; + sha256 = "sha256-FUSNGajrzHpYWv56OEoZGG0L1ny/VvtCzR/Q92MT+bI="; }; # No tests diff --git a/pkgs/development/python-modules/furl/default.nix b/pkgs/development/python-modules/furl/default.nix index 5872ab8b7824..0f561573d581 100644 --- a/pkgs/development/python-modules/furl/default.nix +++ b/pkgs/development/python-modules/furl/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ flake8 pytestCheckHook ]; diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index 7ee4c0999b4e..14401f7e53fd 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "furo"; - version = "2022.9.29"; + version = "2022.12.7"; format = "wheel"; disable = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-VZ7heZnA9ScoSB3PaxsM+Ml0PmjF46GMtFp5knR4aak="; + hash = "sha256-fLdsEqJe9l24WrB0PfkHVz0DAnozYx8X0mflmOuxkfc="; }; propagatedBuildInputs = [ @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "A clean customizable documentation theme for Sphinx"; homepage = "https://github.com/pradyunsg/furo"; + changelog = "https://github.com/pradyunsg/furo/blob/${version}/docs/changelog.md"; license = licenses.mit; maintainers = with maintainers; [ Luflosi ]; }; diff --git a/pkgs/development/python-modules/future/default.nix b/pkgs/development/python-modules/future/default.nix index a24ea8ab9723..7c4a5507b540 100644 --- a/pkgs/development/python-modules/future/default.nix +++ b/pkgs/development/python-modules/future/default.nix @@ -5,16 +5,27 @@ buildPythonPackage rec { pname = "future"; - version = "0.18.2"; + version = "0.18.3"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"; + hash = "sha256-NKF0Nu0elml6hvnePRWjsL4B2LyN6cHf/Vn7gjTtUwc="; }; + pythonImportsCheck = [ + "future.builtins" + "future.moves" + "future.standard_library" + "past.builtins" + "past.translation" + ]; + doCheck = false; meta = { + changelog = "https://github.com/PythonCharmers/python-future/blob/v${version}/docs/whatsnew.rst"; description = "Clean single-source support for Python 3 and 2"; longDescription = '' python-future is the missing compatibility layer between Python 2 and @@ -29,7 +40,7 @@ buildPythonPackage rec { ''; homepage = "https://python-future.org"; downloadPage = "https://github.com/PythonCharmers/python-future/releases"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ prikhi ]; }; } diff --git a/pkgs/development/python-modules/fuzzyfinder/default.nix b/pkgs/development/python-modules/fuzzyfinder/default.nix index a422e5606b0b..2107dd7b2d62 100644 --- a/pkgs/development/python-modules/fuzzyfinder/default.nix +++ b/pkgs/development/python-modules/fuzzyfinder/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "c56d86f110866becad6690c7518f7036c20831c0f82fc87eba8fdb943132f04b"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index 9059ba977b7b..fd0473b99824 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }: +{ lib, buildPythonPackage, fetchPypi, levenshtein, pycodestyle, hypothesis, pytest }: buildPythonPackage rec { pname = "fuzzywuzzy"; @@ -9,8 +9,8 @@ buildPythonPackage rec { sha256 = "1s00zn75y2dkxgnbw8kl8dw4p1mc77cv78fwfa4yb0274s96w0a5"; }; - propagatedBuildInputs = [ python-Levenshtein ]; - checkInputs = [ pycodestyle hypothesis pytest ]; + propagatedBuildInputs = [ levenshtein ]; + nativeCheckInputs = [ pycodestyle hypothesis pytest ]; meta = with lib; { description = "Fuzzy string matching for Python"; diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index 3c0ba94d3ab4..1ed186126dd7 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.1.1"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ekbebwsdGkINdOFI+LLdwTRBN6d8mlNmftkj5SNRKNI="; + sha256 = "sha256-8YxC0QYZqgUIKlYLXnm5+tfojQOmOX63dD7cxBO+0Gg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -36,7 +36,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist ]; diff --git a/pkgs/development/python-modules/gamble/default.nix b/pkgs/development/python-modules/gamble/default.nix index 0df84510efd4..6cdfc4410b34 100644 --- a/pkgs/development/python-modules/gamble/default.nix +++ b/pkgs/development/python-modules/gamble/default.nix @@ -7,15 +7,17 @@ buildPythonPackage rec { pname = "gamble"; - version = "0.10"; - disabled = pythonOlder "3.6"; + version = "0.11"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1lb5x076blnnz2hj7k92pyq0drbjwsls6pmnabpvyvs4ddhz5w9w"; + hash = "sha256-zsEBqhKidgO1e0lpKhw+LY75I2Df+IefNLaSkBBFKFU="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -26,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of gambling classes/tools"; homepage = "https://github.com/jpetrucciani/gamble"; + changelog = "https://github.com/jpetrucciani/gamble/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ jpetrucciani ]; }; diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix index 9569c1c8e10e..7566ea814eec 100644 --- a/pkgs/development/python-modules/gaphas/default.nix +++ b/pkgs/development/python-modules/gaphas/default.nix @@ -12,21 +12,24 @@ buildPythonPackage rec { pname = "gaphas"; - version = "3.8.1"; - disabled = pythonOlder "3.7"; - + version = "3.9.2"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-mT9o/qV+SkJHV1MDwu/bK5HAiHM5YEv354R0HiMgTb8="; + hash = "sha256-hw8aGjsrx6xWPbFybpss5EB3eg6tmxgkXpGiWguLKP4="; }; nativeBuildInputs = [ poetry-core ]; - buildInputs = [ gobject-introspection gtk3 ]; + buildInputs = [ + gobject-introspection + gtk3 + ]; propagatedBuildInputs = [ pycairo @@ -34,12 +37,15 @@ buildPythonPackage rec { typing-extensions ]; - pythonImportsCheck = [ "gaphas" ]; + pythonImportsCheck = [ + "gaphas" + ]; meta = with lib; { description = "GTK+ based diagramming widget"; - maintainers = with maintainers; [ wolfangaukang ]; homepage = "https://github.com/gaphor/gaphas"; + changelog = "https://github.com/gaphor/gaphas/releases/tag/${version}"; license = licenses.asl20; + maintainers = with maintainers; [ wolfangaukang ]; }; } diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index ec80ad6ba230..adadfc030bf1 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.1.48"; + version = "0.1.53"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-3HcwIcuZvHZS7eEIIw2wfley/Tdwt8S9HarrJMVYVVw="; + hash = "sha256-bUOdurCuAxpVag+mv3brxYIyNu9KhoDauL+lcrcob/k="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Garmin Connect Python API wrapper"; homepage = "https://github.com/cyberjunky/python-garminconnect"; + changelog = "https://github.com/cyberjunky/python-garminconnect/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/gassist-text/default.nix b/pkgs/development/python-modules/gassist-text/default.nix new file mode 100644 index 000000000000..b413c19d4093 --- /dev/null +++ b/pkgs/development/python-modules/gassist-text/default.nix @@ -0,0 +1,55 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, google-auth +, grpcio +, protobuf +, pytestCheckHook +, pythonOlder +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "gassist-text"; + version = "0.0.10"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "tronikos"; + repo = "gassist_text"; + rev = "refs/tags/${version}"; + hash = "sha256-BSMflCSYNAaQVTOqKWyr9U9Q70ley1jjF6ndOVum+GA="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + google-auth + grpcio + protobuf + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "gassist_text" + ]; + + meta = with lib; { + description = "Module for interacting with Google Assistant API via text"; + homepage = "https://github.com/tronikos/gassist_text"; + changelog = "https://github.com/tronikos/gassist_text/releases/tag/${version}"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix index 110363b38322..69e757df9d1f 100644 --- a/pkgs/development/python-modules/gast/default.nix +++ b/pkgs/development/python-modules/gast/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-0y2bHT7YEfTvDxTm6yLl3GmnPUYEieoGEnwkzfA6mOg="; }; - checkInputs = [ + nativeCheckInputs = [ astunparse pytestCheckHook ]; diff --git a/pkgs/development/python-modules/gb-io/default.nix b/pkgs/development/python-modules/gb-io/default.nix index 6a44b758d293..e1fa9a573483 100644 --- a/pkgs/development/python-modules/gb-io/default.nix +++ b/pkgs/development/python-modules/gb-io/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { pname = "gb-io"; - version = "0.1.1"; + version = "0.2.1"; src = fetchFromGitHub { owner = "althonos"; repo = "gb-io.py"; rev = "v${version}"; - sha256 = "05fpz11rqqjrb8lc8id6ssv7sni9i1h7x1ra5v5flw9ghpf29ncm"; + sha256 = "sha256-1B7BUJ8H+pTtmDtazfPfYtlXzL/x4rAHtRIFAAsSoWs="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src sourceRoot; name = "${pname}-${version}"; - sha256 = "1qh31jysg475f2qc70b3bczmzywmg9987kn2vsmk88h8sx4nnwc5"; + sha256 = "sha256-lPnOFbEJgcaPPl9bTngugubhW//AUFp9RAjyiFHxC70="; }; sourceRoot = "source"; @@ -32,7 +32,7 @@ buildPythonPackage rec { rust.rustc ]); - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "gb_io" ]; diff --git a/pkgs/development/python-modules/gbulb/default.nix b/pkgs/development/python-modules/gbulb/default.nix index cb6acd3165fc..c6306da0ee63 100644 --- a/pkgs/development/python-modules/gbulb/default.nix +++ b/pkgs/development/python-modules/gbulb/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { gtk3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook gobject-introspection ]; diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index bf6324d9a1d2..e06cf326d85d 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "4.0.2"; + version = "4.1.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-KvWLaGTCIjHZpCiex2quIGsl+IZsM2aEARxGJbcR8lc="; + hash = "sha256-xUU+Bbc0NJBdGXNne/b8kClPNR3REAPiOTAzTDbdU+Q="; }; propagatedBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytest-aiohttp pytest-asyncio diff --git a/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix b/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix new file mode 100644 index 000000000000..b3a38afafd07 --- /dev/null +++ b/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix @@ -0,0 +1,66 @@ +{ lib +, boto +, buildPythonPackage +, fasteners +, fetchFromGitHub +, freezegun +, google-reauth +, httplib2 +, oauth2client +, pyopenssl +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, retry_decorator +, rsa +, six +}: + +buildPythonPackage rec { + pname = "gcs-oauth2-boto-plugin"; + version = "3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-slTxh2j9VhLiSyiTmJIFFakzpzH/+mgilDRxx0VqqKQ="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "rsa==4.7.2" "rsa" \ + --replace "version='2.7'" "version='${version}'" + ''; + + propagatedBuildInputs = [ + boto + freezegun + google-reauth + httplib2 + oauth2client + pyopenssl + retry_decorator + rsa + six + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "gcs_oauth2_boto_plugin" + ]; + + meta = with lib; { + description = "Auth plugin allowing use the use of OAuth 2.0 credentials for Google Cloud Storage"; + homepage = "https://github.com/GoogleCloudPlatform/gcs-oauth2-boto-plugin"; + changelog = "https://github.com/GoogleCloudPlatform/gcs-oauth2-boto-plugin/releases/tag/v${version}"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index 76847827bdaf..3c0ad627b00a 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { ujson ]; - checkInputs = [ + nativeCheckInputs = [ pytest-vcr pytestCheckHook vcrpy diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 8e958598ab40..c7ddc590d97d 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gdown"; - version = "4.5.3"; + version = "4.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bL991BCFiMc0qliBMdjh1S5k8Ic4cPcfdMusGV8MYO8="; + hash = "sha256-XOPbCu2lT0bKrLLfhvMcPj7NF8NVaJ5kVthftSi6l0k="; }; propagatedBuildInputs = [ @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "A CLI tool for downloading large files from Google Drive"; homepage = "https://github.com/wkentaro/gdown"; + changelog = "https://github.com/wkentaro/gdown/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ breakds ]; }; diff --git a/pkgs/development/python-modules/ge25519/default.nix b/pkgs/development/python-modules/ge25519/default.nix index 647235c341f5..1850f49a66a9 100644 --- a/pkgs/development/python-modules/ge25519/default.nix +++ b/pkgs/development/python-modules/ge25519/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { fountains ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index d1a9f146db79..7c83f0623073 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.5.7"; + version = "0.5.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FmCoryNX1DnqMlGalad5iWO2ZRZwXgWgARQMYlJ6yVo="; + hash = "sha256-x83CmOAZFaIDv4bzO01YZxVPVM/cwUpJtKdCWOxH/O4="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SDK for GE smart appliances"; homepage = "https://github.com/simbaja/gehome"; + changelog = "https://github.com/simbaja/gehome/blob/master/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/gekitchen/default.nix b/pkgs/development/python-modules/gekitchen/default.nix index 8dc5bbdb3ae6..4c9e1d7b9674 100644 --- a/pkgs/development/python-modules/gekitchen/default.nix +++ b/pkgs/development/python-modules/gekitchen/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/gemfileparser/default.nix b/pkgs/development/python-modules/gemfileparser/default.nix index 8aa4b8192319..b9bcacf02a48 100644 --- a/pkgs/development/python-modules/gemfileparser/default.nix +++ b/pkgs/development/python-modules/gemfileparser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "839592e49ea3fd985cec003ef58f8e77009a69ed7644a0c0acc94cf6dd9b8d6e"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/gemfileparser2/default.nix b/pkgs/development/python-modules/gemfileparser2/default.nix new file mode 100644 index 000000000000..f6a2c0877bfd --- /dev/null +++ b/pkgs/development/python-modules/gemfileparser2/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "gemfileparser2"; + version = "0.9.3"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-BFKJZOf0W2b0YNbKIwnrmoKGvtP8A6R9PrUt7kYC/Dk="; + }; + + dontConfigure = true; + + nativeBuildInputs = [ + setuptools-scm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "gemfileparser2" + ]; + + meta = with lib; { + description = "Library to parse Rubygem gemspec and Gemfile files"; + homepage = "https://github.com/nexB/gemfileparser2"; + changelog = "https://github.com/nexB/gemfileparser2/blob/v${version}/CHANGELOG.rst"; + license = with licenses; [ mit /* or */ gpl3Plus ]; + maintainers = with maintainers; [ harvidsen ]; + }; +} diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 98e601140d49..26ced17565a9 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "generic"; - version = "1.1.0"; + version = "1.1.1"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/947oEvZSD5mjRD9qcuzKAFativTmaeejXxQ322UD+A="; + sha256 = "sha256-UHz2v6K5lNYb7cxBViTfPkpu2M8LItApGoSg3Bb2bqI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/geniushub-client/default.nix b/pkgs/development/python-modules/geniushub-client/default.nix index 019c1e1a21bc..7ba15e923475 100644 --- a/pkgs/development/python-modules/geniushub-client/default.nix +++ b/pkgs/development/python-modules/geniushub-client/default.nix @@ -1,30 +1,47 @@ { lib -, buildPythonPackage -, fetchPypi , aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "geniushub-client"; - version = "0.6.30"; + version = "0.7.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "390932b6e5051e221d104b2683d9deb6e352172c4ec4eeede0954bf2f9680211"; + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "manzanotti"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-amsMZjCsPI8CUfSct4uumn8nVZDESlQFh19LXu3yb7o="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'VERSION = os.environ["GITHUB_REF_NAME"]' "" \ + --replace "version=VERSION," 'version="${version}",' + ''; + propagatedBuildInputs = [ aiohttp ]; - # tests only implemented after 0.6.30 - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "geniushubclient" ]; + pythonImportsCheck = [ + "geniushubclient" + ]; meta = with lib; { - description = "Aiohttp-based client for Genius Hub systems"; - homepage = "https://github.com/zxdavb/geniushub-client"; + description = "Module to interact with Genius Hub systems"; + homepage = "https://github.com/manzanotti/geniushub-client"; + changelog = "https://github.com/manzanotti/geniushub-client/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 3a6fc0d254a9..406beae748b6 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "gensim"; - version = "4.2.0"; + version = "4.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-mV69KXCjHUfBAKqsECEvR+K/EuKwZTbTiIPJUf807vE="; + hash = "sha256-ZL1+ximQIVh4gi6LJWnRg1BU9WzfU2AN3+mSfjHztI0="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ mock pyemd pytestCheckHook diff --git a/pkgs/development/python-modules/gentools/default.nix b/pkgs/development/python-modules/gentools/default.nix index 14e1fc1c6098..d3f45cdea7f0 100644 --- a/pkgs/development/python-modules/gentools/default.nix +++ b/pkgs/development/python-modules/gentools/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { lib.optionals (pythonOlder "3.5") [ typing ] ++ lib.optionals (pythonOlder "3.4") [ funcsigs ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = "pytest"; meta = with lib; { diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 92bdb1a6578e..0e18c64f44af 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.12.5"; + version = "0.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "GeoAlchemy2"; inherit version; - hash = "sha256-McJQLc4xe1ezNeTrh1YtUB+jnkbHKL5RTZuGCR4I3Wc="; + hash = "sha256-VyRtRK6pC0xS+EwAb2dY0OGVHrkBjxBAmocUHwIVmxM="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { sqlalchemy ]; - checkInputs = [ + nativeCheckInputs = [ alembic psycopg2 pytestCheckHook diff --git a/pkgs/development/python-modules/geographiclib/default.nix b/pkgs/development/python-modules/geographiclib/default.nix index 12a542af509d..281e1bb620da 100644 --- a/pkgs/development/python-modules/geographiclib/default.nix +++ b/pkgs/development/python-modules/geographiclib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-9/Qchdw+HC09k17IZmDcOyyEjIPhf5qeUbqdUUahWFk="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index 65f938fd6a97..0563b8ae997a 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp maxminddb requests urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ mocket requests-mock pytestCheckHook diff --git a/pkgs/development/python-modules/geojson-client/default.nix b/pkgs/development/python-modules/geojson-client/default.nix index c67f40e799ce..f315d99d8dd8 100644 --- a/pkgs/development/python-modules/geojson-client/default.nix +++ b/pkgs/development/python-modules/geojson-client/default.nix @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-geojson-client"; - rev = "v${version}"; - sha256 = "sha256-nzM5P1ww6yWM3e2v3hRw0ECoYmRPhTs0Q7Wwicl+IpU="; + rev = "refs/tags/v${version}"; + hash = "sha256-nzM5P1ww6yWM3e2v3hRw0ECoYmRPhTs0Q7Wwicl+IpU="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for convenient access to GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-geojson-client"; + changelog = "https://github.com/exxamalte/python-geojson-client/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix index b762434fb65a..4a733fe3500d 100644 --- a/pkgs/development/python-modules/geojson/default.nix +++ b/pkgs/development/python-modules/geojson/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; LC_ALL = "en_US.UTF-8"; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; meta = { homepage = "https://github.com/frewsxcv/python-geojson"; diff --git a/pkgs/development/python-modules/geomet/default.nix b/pkgs/development/python-modules/geomet/default.nix index 9b90012695e0..fb5f098f0d9f 100644 --- a/pkgs/development/python-modules/geomet/default.nix +++ b/pkgs/development/python-modules/geomet/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "geomet"; - version = "0.3.1"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "geomet"; repo = "geomet"; rev = "refs/tags/${version}"; - hash = "sha256-7QfvGQlg4nTr1rwTyvTNm6n/jFptLtpBKMjjQj6OXCQ="; + hash = "sha256-dN0d6wu5FqL/5FQrpQn+wlyEvp52pa5dkxLu3j3bxnw="; }; propagatedBuildInputs = [ @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convert GeoJSON to WKT/WKB (Well-Known Text/Binary) and vice versa"; homepage = "https://github.com/geomet/geomet"; + changelog = "https://github.com/geomet/geomet/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ turion ris ]; }; diff --git a/pkgs/development/python-modules/geometric/default.nix b/pkgs/development/python-modules/geometric/default.nix index 775ace5f6b2c..984eded7955c 100644 --- a/pkgs/development/python-modules/geometric/default.nix +++ b/pkgs/development/python-modules/geometric/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { export OMP_NUM_THREADS=2 ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Geometry optimization code for molecular structures"; diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index e2e71e6b09b3..47d2376b41d6 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "geopandas"; - version = "0.12.1"; + version = "0.12.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "geopandas"; repo = "geopandas"; rev = "refs/tags/v${version}"; - hash = "sha256-aLERNVojPgZ3Y7+CnirGvC4RfuQf+K3Oj2/0BqdorwI="; + hash = "sha256-ntOZ2WCoMz5ZpqPeupqPC3cN8mbQmEAvJGaFblu0ibY="; }; propagatedBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { shapely ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook Rtree ]; @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python geospatial data analysis framework"; homepage = "https://geopandas.org"; + changelog = "https://github.com/geopandas/geopandas/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp ]; }; diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index 965411fe4af8..4094bacb8232 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { geographiclib ]; - checkInputs = [ + nativeCheckInputs = [ async_generator docutils pytestCheckHook diff --git a/pkgs/development/python-modules/georss-client/default.nix b/pkgs/development/python-modules/georss-client/default.nix index 09365ff58586..97acd538d096 100644 --- a/pkgs/development/python-modules/georss-client/default.nix +++ b/pkgs/development/python-modules/georss-client/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { dateparser ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/georss-generic-client/default.nix b/pkgs/development/python-modules/georss-generic-client/default.nix index 4345505f310c..d346a2afdc89 100644 --- a/pkgs/development/python-modules/georss-generic-client/default.nix +++ b/pkgs/development/python-modules/georss-generic-client/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { georss-client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 ae923138d295..15002c77f7bb 100644 --- a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix +++ b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "georss-ign-sismologia-client"; - version = "0.5"; + version = "0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,15 +16,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ign-sismologia-client"; - rev = "v${version}"; - hash = "sha256-i3VdxntFwieCmB4ihHRSCV5YKDyYytl3XnU/G1LwLhg="; + rev = "refs/tags/v${version}"; + hash = "sha256-OLX6Megl5l8KDnd/G16QJ/wQn5AQc2cZ+LCbjuHFbwo="; }; propagatedBuildInputs = [ georss-client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for accessing the IGN Sismologia GeoRSS feed"; homepage = "https://github.com/exxamalte/python-georss-ign-sismologia-client"; + changelog = "https://github.com/exxamalte/python-georss-ign-sismologia-client/blob/v0.6/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; 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 512db4d8deee..db9d23c690ec 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 @@ -24,7 +24,7 @@ buildPythonPackage rec { georss-client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 344c74b057f4..ef8ea220e9e1 100644 --- a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix +++ b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { georss-client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 fb4b0e753ab4..a85302544d09 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 @@ -24,7 +24,7 @@ buildPythonPackage rec { georss-client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 fc19ea105c69..adb89685d9bf 100644 --- a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix +++ b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { georss-client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 74c1a9994987..170bae63567c 100644 --- a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix +++ b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { georss-client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/getkey/default.nix b/pkgs/development/python-modules/getkey/default.nix index c0cbec29145a..563ee6464412 100644 --- a/pkgs/development/python-modules/getkey/default.nix +++ b/pkgs/development/python-modules/getkey/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { rm setup.cfg ''; - checkInputs = [ + nativeCheckInputs = [ flake8 pytestCheckHook ]; diff --git a/pkgs/development/python-modules/getmac/default.nix b/pkgs/development/python-modules/getmac/default.nix index 79f85ad95674..05b638559aec 100644 --- a/pkgs/development/python-modules/getmac/default.nix +++ b/pkgs/development/python-modules/getmac/default.nix @@ -1,24 +1,29 @@ { lib , buildPythonPackage , fetchFromGitHub +, py , pytest-benchmark , pytest-mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "getmac"; - version = "0.8.3"; + version = "0.9.1"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "GhostofGoes"; repo = pname; - rev = version; - sha256 = "sha256-X4uuYisyobCxhoywaSXBZjVxrPAbBiZrWUJAi2/P5mw="; + rev = "refs/tags/${version}"; + hash = "sha256-U04mtg7DCC78X5Fd0wGaHrf8XkUpDLi4+ctKCyR4dKg="; }; - checkInputs = [ + nativeCheckInputs = [ + py pytestCheckHook pytest-benchmark pytest-mock @@ -41,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to get the MAC address of network interfaces and hosts on the local network"; homepage = "https://github.com/GhostofGoes/getmac"; + changelog = "https://github.com/GhostofGoes/getmac/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ colemickens ]; }; diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 28a089296481..690c0b73e6ea 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gevent"; - version = "21.12.0"; + version = "22.10.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9ItkV4w2e5H6eTv46qr0mVy5PIvEWGDkc7+GgHCtCU4="; + hash = "sha256-HKAdoXbuN7NSeicC99QNvJ/7jPx75aA7+k+e7EXlXEY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 62568eb6f377..21638ce80311 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ dpkt pytestCheckHook urllib3 diff --git a/pkgs/development/python-modules/gflags/default.nix b/pkgs/development/python-modules/gflags/default.nix index 9b3b92784d79..2cef0c11a900 100644 --- a/pkgs/development/python-modules/gflags/default.nix +++ b/pkgs/development/python-modules/gflags/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "40ae131e899ef68e9e14aa53ca063839c34f6a168afe622217b5b875492a1ee2"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/ghdiff/default.nix b/pkgs/development/python-modules/ghdiff/default.nix index efbdc2f59f9a..213f7fdd3008 100644 --- a/pkgs/development/python-modules/ghdiff/default.nix +++ b/pkgs/development/python-modules/ghdiff/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "17mdhi2sq9017nq8rkjhhc87djpi5z99xiil0xz17dyplr7nmkqk"; }; - checkInputs = [ zope_testrunner ]; + nativeCheckInputs = [ zope_testrunner ]; propagatedBuildInputs = [ six chardet ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ghrepo-stats/default.nix b/pkgs/development/python-modules/ghrepo-stats/default.nix index 0552dbbf62dc..b7f65f9e7843 100644 --- a/pkgs/development/python-modules/ghrepo-stats/default.nix +++ b/pkgs/development/python-modules/ghrepo-stats/default.nix @@ -1,4 +1,5 @@ { lib +, beautifulsoup4 , buildPythonPackage , fetchFromGitHub , matplotlib @@ -8,7 +9,7 @@ buildPythonPackage rec { pname = "ghrepo-stats"; - version = "0.3.1"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,11 +17,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mrbean-bremen"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-W6RhVnMuOgB4GNxczx3UlSeq0RWIM7yISKEvpnrE9uk="; + rev = "refs/tags/v${version}"; + hash = "sha256-QHFwIfX0rSVnWgxe82zQXMwIS99CiPgprfoMbuXvXH0="; }; + postPatch = '' + # https://github.com/mrbean-bremen/ghrepo-stats/pull/1 + substituteInPlace setup.py \ + --replace "bs4" "beautifulsoup4" + ''; + propagatedBuildInputs = [ + beautifulsoup4 matplotlib PyGithub ]; @@ -35,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module and CLI tool for GitHub repo statistics"; homepage = "https://github.com/mrbean-bremen/ghrepo-stats"; + changelog = "https://github.com/mrbean-bremen/ghrepo-stats/blob/v${version}/CHANGES.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/gibberish-detector/default.nix b/pkgs/development/python-modules/gibberish-detector/default.nix index df3b70c000d7..274e8f9355d3 100644 --- a/pkgs/development/python-modules/gibberish-detector/default.nix +++ b/pkgs/development/python-modules/gibberish-detector/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1si0fkpnk9vjkwl31sq5jkyv3rz8a5f2nh3xq7591j9wv2b6dn0b"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index dfe1c186f493..50b8a0e7095f 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ] ++ pyjwt.optional-dependencies.crypto; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook aiohttp httpx diff --git a/pkgs/development/python-modules/gios/default.nix b/pkgs/development/python-modules/gios/default.nix index 559723862625..5953e206b258 100644 --- a/pkgs/development/python-modules/gios/default.nix +++ b/pkgs/development/python-modules/gios/default.nix @@ -12,7 +12,8 @@ buildPythonPackage rec { pname = "gios"; - version = "2.1.0"; + version = "2.3.0"; + format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-WjuDsu0EA+KtErusw5VADyvleVegXHCTEkuQ1lU/SRU="; + hash = "sha256-/lAENP9wKZ+h2Iq2e9S7s7Naa0CTl/I2cwCxBEAwsrA="; }; propagatedBuildInputs = [ @@ -28,7 +29,7 @@ buildPythonPackage rec { dacite ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytest-error-for-skips @@ -47,11 +48,14 @@ buildPythonPackage rec { "test_invalid_station_id" ]; - pythonImportsCheck = [ "gios" ]; + pythonImportsCheck = [ + "gios" + ]; meta = with lib; { description = "Python client for getting air quality data from GIOS"; homepage = "https://github.com/bieniu/gios"; + changelog = "https://github.com/bieniu/gios/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index 85d17ee3ab8a..297b6c9865de 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -1,19 +1,34 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , gevent +, pytestCheckHook }: buildPythonPackage rec { pname = "gipc"; version = "1.4.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-P8d2GIxFAAHeXjXgIxKGwahiH1TW/9fE+V0f9Ra54wo="; + src = fetchFromGitHub { + owner = "jgehrcke"; + repo = "gipc"; + rev = "refs/tags/${version}"; + hash = "sha256-T5TqLanODyzJGyjDZz+75bbz3THxoobYnfJFQxAB76E="; }; - propagatedBuildInputs = [ gevent ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "gevent>=1.5,<=21.12.0" "gevent>=1.5" + ''; + + propagatedBuildInputs = [ + gevent + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "gevent-cooperative child processes and IPC"; diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index 7b3a29eba6e2..649c2aa2bc51 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ + nativeCheckInputs = [ gitMinimal util-linux # `rev` is needed in tests/test_process.py ]; diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix index b4a771a4c3be..4f5efc271930 100644 --- a/pkgs/development/python-modules/git-revise/default.nix +++ b/pkgs/development/python-modules/git-revise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - checkInputs = [ git gnupg pytestCheckHook ]; + nativeCheckInputs = [ git gnupg pytestCheckHook ]; meta = with lib; { description = "Efficiently update, split, and rearrange git commits"; diff --git a/pkgs/development/python-modules/git-sweep/default.nix b/pkgs/development/python-modules/git-sweep/default.nix index 2d7da28535cf..0f223b03760a 100644 --- a/pkgs/development/python-modules/git-sweep/default.nix +++ b/pkgs/development/python-modules/git-sweep/default.nix @@ -1,24 +1,32 @@ { lib , buildPythonPackage , fetchPypi -, GitPython +, gitpython +, pythonOlder }: buildPythonPackage rec { pname = "git-sweep"; version = "0.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1csp0zd049d643d409rfivbswwzrayb4i6gkypp5mc27fb1z2afd"; + hash = "sha256-zSnxw3JHsFru9fOZSJZX+XOu144uJ0DaIKYlAtoHV7M="; }; - propagatedBuildInputs = [ GitPython ]; + propagatedBuildInputs = [ + gitpython + ]; - # no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "gitsweep" ]; + pythonImportsCheck = [ + "gitsweep" + ]; meta = with lib; { description = "A command-line tool that helps you clean up Git branches"; @@ -26,5 +34,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ pSub ]; }; - } diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix index 0895270d6c9c..3528bb2bcab6 100644 --- a/pkgs/development/python-modules/gitdb/default.nix +++ b/pkgs/development/python-modules/gitdb/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "gitdb"; - version = "4.0.9"; + version = "4.0.10"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "bac2fd45c0a1c9cf619e63a90d62bdc63892ef92387424b855792a6cabe789aa"; + sha256 = "sha256-brmQtp304VutiZ6oaNxGVyw/dTOXNWY7gd55sG8X65o="; }; propagatedBuildInputs = [ smmap ]; diff --git a/pkgs/development/python-modules/github-to-sqlite/default.nix b/pkgs/development/python-modules/github-to-sqlite/default.nix index dbdc4be45900..2d02a2a73241 100644 --- a/pkgs/development/python-modules/github-to-sqlite/default.nix +++ b/pkgs/development/python-modules/github-to-sqlite/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix index a5c930ba9eb0..ba83ca18478c 100644 --- a/pkgs/development/python-modules/github3_py/default.nix +++ b/pkgs/development/python-modules/github3_py/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ] ++ pyjwt.optional-dependencies.crypto; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook betamax betamax-matchers diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/gitpython/default.nix similarity index 68% rename from pkgs/development/python-modules/GitPython/default.nix rename to pkgs/development/python-modules/gitpython/default.nix index 8d89c1af8d0c..e5a98bb27d22 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/gitpython/default.nix @@ -1,44 +1,47 @@ { lib , buildPythonPackage -, fetchFromGitHub -, substituteAll -, git -, gitdb , ddt +, fetchFromGitHub +, gitdb +, pkgs , pythonOlder +, substituteAll , typing-extensions }: buildPythonPackage rec { pname = "gitpython"; - version = "3.1.27"; + version = "3.1.30"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "gitpython-developers"; repo = "GitPython"; rev = version; - sha256 = "sha256-RA+6JFXHUQoXGErV8+aYuJPsfXzNSZK3kTm6eMbQIss="; + hash = "sha256-odtYBQLscncdC+NbDC9D84QQveDoimkQ6RzUQLJgizI="; }; - patches = [ - (substituteAll { - src = ./hardcode-git-path.patch; - inherit git; - }) - ]; - propagatedBuildInputs = [ - gitdb ddt + gitdb + pkgs.gitMinimal ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; + postPatch = '' + substituteInPlace git/cmd.py \ + --replace 'git_exec_name = "git"' 'git_exec_name = "${pkgs.gitMinimal}/bin/git"' + ''; + # Tests require a git repo doCheck = false; - pythonImportsCheck = [ "git" ]; + pythonImportsCheck = [ + "git" + ]; meta = with lib; { description = "Python Git Library"; diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index dd241d5ff822..9aab37ade7a9 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { httpx ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-httpx pytestCheckHook diff --git a/pkgs/development/python-modules/glasgow/default.nix b/pkgs/development/python-modules/glasgow/default.nix index a8f658ac83a9..c1de69ff1b9a 100644 --- a/pkgs/development/python-modules/glasgow/default.nix +++ b/pkgs/development/python-modules/glasgow/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { crcmod ]; - checkInputs = [ yosys icestorm nextpnr ]; + nativeCheckInputs = [ yosys icestorm nextpnr ]; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 8164d6099a45..7506c5295b5f 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "6.2.0"; + version = "7.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-PKUc1PYfM4MxDFErV4zYyHl/mkPQNvIcjNaDekenHc8="; + hash = "sha256-xIlg3W/A3FBvVOEin/ku0QdmzGXlmOm5yLeYvoGkzNU="; }; postPatch = '' @@ -46,7 +46,7 @@ buildPythonPackage rec { yamllint ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index 68d50c435fc2..7834688e15f2 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -17,19 +17,19 @@ buildPythonPackage rec { pname = "glean-sdk"; - version = "51.2.0"; + version = "52.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-4EXCYthMabdmxWYltcnO0UTNeAYXwXQeRfwxt1WD3Ug="; + hash = "sha256-iW432YtZtRGUWia33Lsnu+aQuedhBJdh8dZ30FPg6Vk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-qOGoonutuIY+0UVaVSVVt0NbqEICdNs3qHWG0Epmkl0="; + hash = "sha256-/7qKIQglNKGveKFtPeqd35Mq2hH/20BGTgDBgip4PnI="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { semver ]; - checkInputs = [ + nativeCheckInputs = [ pytest-localserver pytestCheckHook ]; @@ -56,11 +56,6 @@ buildPythonPackage rec { "test_client_activity_api" ]; - postPatch = '' - substituteInPlace glean-core/python/setup.py \ - --replace "glean_parser==5.0.1" "glean_parser>=5.0.1" - ''; - pythonImportsCheck = [ "glean" ]; @@ -70,6 +65,6 @@ buildPythonPackage rec { 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 = with maintainers; [ melling ]; }; } diff --git a/pkgs/development/python-modules/glfw/default.nix b/pkgs/development/python-modules/glfw/default.nix index b28846860035..f90a24f090fb 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.5"; + version = "2.5.6"; src = fetchFromGitHub { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "refs/tags/v${version}"; - sha256 = "sha256-puaKveByAEkgME81uePTMSglvMgyqornW1sNAbJXNuc="; + sha256 = "sha256-zusVOhZfJyUpftvrUSLZJl7mG5AEGMLGXMOojFnEsH0="; }; # Patch path to GLFW shared object diff --git a/pkgs/development/python-modules/globre/default.nix b/pkgs/development/python-modules/globre/default.nix index 5debd1d0ab65..c7c77b35c342 100644 --- a/pkgs/development/python-modules/globre/default.nix +++ b/pkgs/development/python-modules/globre/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1qhjpg0722871dm5m7mmldf6c7mx58fbdvk1ix5i3s9py82448gf"; }; - checkInputs = [ nose coverage ]; + nativeCheckInputs = [ nose coverage ]; meta = with lib; { homepage = "https://github.com/metagriffin/globre"; diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index addc372f8a7e..57f869842c83 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.14.0"; + version = "3.15.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-lCqiBlyf0cUqsmSlCmt+jXTBGsXyCioZ232zd5rVqiA="; + hash = "sha256-qxqGfbrnMvmjbBD7l8OtGKx7WJr65Jbd9y5IyZDXwW4="; }; propagatedBuildInputs = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ mypy pytestCheckHook responses @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Interface to Globus REST APIs, including the Transfer API and the Globus Auth API"; homepage = "https://github.com/globus/globus-sdk-python"; + changelog = "https://github.com/globus/globus-sdk-python/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index 5f8ab55e9088..38f17c9ed8cc 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { face ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pyyaml ]; diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index 9c652994a8c3..31434342be84 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { numpy ] ++ lib.optionals isPy27 [ contextlib2 mock importlib-resources ]; - checkInputs = [ + nativeCheckInputs = [ scikitimage procps pytestCheckHook diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index 6e960f9b62e0..8b6e68de4bb7 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { skia-pathops ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "glyphsLib" ]; diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index e10ae6927f63..31d7127519e4 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.20"; + version = "0.2.23"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-RDd0KR7NjBTlgeQ/E4mnLnB2n4NCPoAt2a62NGdzCZE="; + sha256 = "sha256-SX49v+DuV4IZdTJc9XhqhgtG81qLC9QnR/LPMu2m0fo="; }; postPatch = '' @@ -34,7 +34,7 @@ buildPythonPackage rec { "goodwe" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for connecting to GoodWe inverter"; homepage = "https://github.com/marcelblijleven/goodwe"; + changelog = "https://github.com/marcelblijleven/goodwe/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index c92eb490df0e..c3839dc667c8 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -4,39 +4,51 @@ , google-auth , googleapis-common-protos , grpcio +, grpcio-gcp , grpcio-status -, protobuf -, proto-plus -, requests , mock +, proto-plus +, protobuf , pytest-asyncio , pytestCheckHook , pythonOlder +, requests }: buildPythonPackage rec { pname = "google-api-core"; - version = "2.10.2"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EMBvdzn+V3gfh1Izdejho6RnS/Y5LNYTGjIiGCuXEyA="; + hash = "sha256-S5u11aOAoL76BXOzAmUbipqJJiwXMON79CPOxRGATCI="; }; propagatedBuildInputs = [ googleapis-common-protos google-auth - grpcio - grpcio-status protobuf proto-plus requests ]; - checkInputs = [ + passthru.optional-dependencies = { + grpc = [ + grpcio + grpcio-status + ]; + grpcgcp = [ + grpcio-gcp + ]; + grpcio-gcp = [ + grpcio-gcp + ]; + }; + + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook 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 73f8310cc0d8..5e83c9859916 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.61.0"; + version = "2.75.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3goMt7sY6/9c99x4K0ikiKFL12hLU4eZ8xvtq33iuD8="; + sha256 = "sha256-DxCaK3HxTJp7SCMf7PzdOrlYYeqav1TwYKxFwgT63D0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-apitools/default.nix b/pkgs/development/python-modules/google-apitools/default.nix new file mode 100644 index 000000000000..550051c1d146 --- /dev/null +++ b/pkgs/development/python-modules/google-apitools/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildPythonPackage +, fasteners +, fetchFromGitHub +, gflags +, httplib2 +, mock +, oauth2client +, pytestCheckHook +, pythonOlder +, six +}: + +buildPythonPackage rec { + pname = "google-apitools"; + version = "0.5.32"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "google"; + repo = "apitools"; + rev = "refs/tags/v${version}"; + hash = "sha256-Z9BTDU6KKCcjspVLi5mJqVZMYEapnMXLPL5BXsIKZAw="; + }; + + propagatedBuildInputs = [ + fasteners + httplib2 + oauth2client + six + ]; + + passthru.optional-dependencies = { + cli = [ + gflags + ]; + }; + + nativeCheckInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "apitools" + ]; + + disabledTests = [ + # AttributeError: 'FieldList' object has no attribute '_FieldList__field' + "testPickle" + "testDecodeBadBase64BytesField" + "testConvertIdThatNeedsEscaping" + "testGeneration" + ]; + + disabledTestPaths = [ + # Samples are partially postfixed with test + "samples" + ]; + + meta = with lib; { + description = "Collection of utilities to make it easier to build client-side tools"; + homepage = "https://github.com/google/apitools"; + changelog = "https://github.com/google/apitools/releases/tag/v${version}"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix index 0109175ab85c..40af6ed4a0b7 100644 --- a/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -5,17 +5,21 @@ , google-auth , httplib2 , mock -, pytestCheckHook , pytest-localserver +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-auth-httplib2"; version = "0.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "a07c39fd632becacd3f07718dfd6021bf396978f03ad3ce4321d060015cc30ac"; + hash = "sha256-oHw5/WMr7KzT8HcY39YCG/OWl48DrTzkMh0GABXMMKw="; }; propagatedBuildInputs = [ @@ -23,7 +27,7 @@ buildPythonPackage rec { httplib2 ]; - checkInputs = [ + nativeCheckInputs = [ flask mock pytestCheckHook @@ -33,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Authentication Library: httplib2 transport"; homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"; + changelog = "https://github.com/googleapis/google-auth-library-python-httplib2/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 9f70702883a0..a197a124413e 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2xG85LPv/Jm1GOwiopA0cOCFPAySvldpTjaE5zjSJRM="; + sha256 = "sha256-gQVqMQ+xxKPlp+GkQ+Hrllk8a7xVsmwCYeTTKV0+ZZM="; }; propagatedBuildInputs = [ @@ -27,15 +27,14 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ click mock pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ - "test_run_local_server" - ]; + # some tests require loopback networking + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "google_auth_oauthlib" diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 2a411783fff3..0f6600d159c1 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -11,6 +11,7 @@ , pyopenssl , pyu2f , requests +, pythonOlder , aioresponses , asynctest , flask @@ -27,11 +28,14 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.14.0"; + version = "2.15.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zySBeFXYdO3i79BxqiISVEX1Vd4Whbc5qXgvz0CMKj0="; + sha256 = "sha256-cvEqbPyWjXVNe9qzacXFwWAyEG5S0yxt/YSE5MAabR8="; }; propagatedBuildInputs = [ @@ -56,9 +60,12 @@ buildPythonPackage rec { reauth = [ pyu2f ]; + requests = [ + requests + ]; }; - checkInputs = [ + nativeCheckInputs = [ aioresponses asynctest flask @@ -92,7 +99,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Auth Python Library"; longDescription = '' - This library simplifies using Google’s various server-to-server + This library simplifies using Google's various server-to-server authentication mechanisms to access Google APIs. ''; homepage = "https://github.com/googleapis/google-auth-library-python"; 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 0f75cccfac75..b105e9cfe16d 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 @@ -3,23 +3,25 @@ , fetchPypi , google-api-core , pythonOlder +, protobuf }: buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.14"; + version = "0.1.15"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GFS9VvdXHxP1KvJzQkgjmYXO3qpMXl8yICGZEr18O8M="; + hash = "sha256-W6Nb+H2CaULQ7Hp1hYxtnF9ITYa++Usc7XVoPkQPnVk="; }; propagatedBuildInputs = [ google-api-core - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; # No tests in repo doCheck = false; @@ -31,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Protobufs for Google Access Context Manager"; homepage = "https://github.com/googleapis/python-access-context-manager"; + changelog = "https://github.com/googleapis/python-access-context-manager/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; }; 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 4dedba76ff44..b0aca65e5ce4 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -5,6 +5,7 @@ , grpc-google-iam-v1 , mock , proto-plus +, protobuf , pytest-asyncio , pytestCheckHook , pythonOlder @@ -12,23 +13,24 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.1.6"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N0d/8lqqLT4IXbg0QpxchtJ4PmBOvXc4yGkvNhvHyJc="; + hash = "sha256-1S8U4empk3l6CG7/PUdy3qeQg5DGrWEtJigTQfF8mkk="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pytest-asyncio @@ -42,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Appengine logging client library"; homepage = "https://github.com/googleapis/python-appengine-logging"; + changelog = "https://github.com/googleapis/python-appengine-logging/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 68fe9c08a740..e32bcf970264 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -8,6 +8,7 @@ , google-cloud-os-config , google-cloud-testutils , libcst +, protobuf , proto-plus , pytest-asyncio , pytestCheckHook @@ -17,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.14.2"; + version = "3.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pwn9fU1kniouSQbDSEDlANkeoBN4gzTeuuhnuD5Puq8="; + hash = "sha256-EFMiiPlHwKkc7tjOcbqiAlnb+3oBsTBlg6Ey0vvs+Mc="; }; propagatedBuildInputs = [ @@ -35,9 +36,16 @@ buildPythonPackage rec { google-cloud-os-config libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + passthru.optional-dependencies = { + libcst = [ + libcst + ]; + }; + + nativeCheckInputs = [ google-cloud-testutils mock pytest-asyncio @@ -56,6 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Client for Google Cloud Asset API"; homepage = "https://github.com/googleapis/python-asset"; + changelog = "https://github.com/googleapis/python-asset/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/pkgs/development/python-modules/google-cloud-audit-log/default.nix index e1effd0ac2a2..643098f1de5e 100644 --- a/pkgs/development/python-modules/google-cloud-audit-log/default.nix +++ b/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -1,12 +1,21 @@ -{ lib, buildPythonPackage, fetchPypi, googleapis-common-protos, protobuf }: +{ lib +, buildPythonPackage +, fetchPypi +, googleapis-common-protos +, protobuf +, pythonOlder +}: buildPythonPackage rec { pname = "google-cloud-audit-log"; - version = "0.2.4"; + version = "0.2.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qr5VQ2ceT4qcekwOPqmoe6K6K5b5/61vqgIgmQDh8wg="; + hash = "sha256-huL6ujODrcj9BKW9f9T5YLPkrtqn7ZUPL4kc4WkC62s="; }; propagatedBuildInputs = [ googleapis-common-protos protobuf ]; @@ -14,11 +23,14 @@ buildPythonPackage rec { # tests are a bit wonky to setup and are not very deep either doCheck = false; - pythonImportsCheck = [ "google.cloud.audit" ]; + pythonImportsCheck = [ + "google.cloud.audit" + ]; meta = with lib; { description = "Google Cloud Audit Protos"; homepage = "https://github.com/googleapis/python-audit-log"; + changelog = "https://github.com/googleapis/python-audit-log/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 87ac3fe68f1a..dddde1a3093a 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -1,37 +1,50 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook -, libcst , google-api-core , google-cloud-storage , google-cloud-testutils +, libcst +, mock , pandas , proto-plus +, protobuf , pytest-asyncio -, mock +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.8.3"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aMkYgmx4TDGSW2/0KB7FTNUHUxtTaVpmeDiIWq7Z5lc="; + hash = "sha256-pS/fm9837vmdvh6msk69nTeo/gj1StxsfFf6DsmOQE4="; }; propagatedBuildInputs = [ google-api-core - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + passthru.optional-dependencies = { + libcst = [ + libcst + ]; + pandas = [ + pandas + ]; + storage = [ + google-cloud-storage + ]; + }; + + nativeCheckInputs = [ google-cloud-storage google-cloud-testutils mock @@ -64,6 +77,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud AutoML API client library"; homepage = "https://github.com/googleapis/python-automl"; + changelog = "https://github.com/googleapis/python-automl/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; 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 ebb6d95eb1f3..2c5d0a9a5474 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -3,37 +3,39 @@ , fetchPypi , google-api-core , libcst -, proto-plus -, pytestCheckHook -, pytest-asyncio -, pytz , mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook , pythonOlder +, pytz }: buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.7.3"; + version = "3.10.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oPgbgaq5RQM4C2qmf36i+qXDQA9sV16abCleNkdGYC0="; + hash = "sha256-GcgJhFT3L5TlVZYXjQQ9eENRcv/V176hF86BSsN7K/A="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus + protobuf pytz - ]; + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; pythonImportsCheck = [ @@ -44,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "BigQuery Data Transfer API client library"; homepage = "https://github.com/googleapis/python-bigquery-datatransfer"; + changelog = "https://github.com/googleapis/python-bigquery-datatransfer/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; 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 c46db49774e6..2c2e5fe6766d 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -5,6 +5,7 @@ , grpc-google-iam-v1 , mock , proto-plus +, protobuf , pytest-asyncio , pytestCheckHook , pythonOlder @@ -12,23 +13,24 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.0.7"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-F8PP/Vs+sOVDEwIUvWnO6C4+rQvVTtWKMPnREwKEQ0I="; + hash = "sha256-OsQeBJMvq/NOC6T7N4jyrsKzcazOAn838CDjfDq7dZA="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pytest-asyncio @@ -42,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bigquery logging client library"; homepage = "https://github.com/googleapis/python-bigquery-logging"; + changelog = "https://github.com/googleapis/python-bigquery-logging/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 766a793082cb..7aaa53d39cf1 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -1,32 +1,53 @@ { lib , buildPythonPackage +, fastavro , fetchPypi , google-api-core , google-auth , google-cloud-bigquery +, pandas +, protobuf +, pyarrow , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.16.2"; + version = "2.18.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5qyk97b06tuH+FEJBhd1Y1GOFYfIt7FivPjhyede9BY="; + hash = "sha256-XNPeWe8nYGmJr/MVxt0uBZMf0N2QEp5hYge0RJRWUqA="; }; propagatedBuildInputs = [ google-api-core - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + passthru.optional-dependencies = { + fastavro = [ + fastavro + ]; + pandas = [ + pandas + ]; + pyarrow = [ + pyarrow + ]; + }; + + nativeCheckInputs = [ google-auth google-cloud-bigquery pytestCheckHook ]; - # dependency loop with google-cloud-bigquery + # Dependency loop with google-cloud-bigquery doCheck = false; preCheck = '' @@ -42,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "BigQuery Storage API API client library"; homepage = "https://github.com/googleapis/python-bigquery-storage"; + changelog = "https://github.com/googleapis/python-bigquery-storage/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 1c71878ed0b4..41a9238d7a98 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -1,58 +1,85 @@ { lib , buildPythonPackage -, fetchPypi -, pytestCheckHook , db-dtypes +, fetchPypi , freezegun +, google-api-core , google-cloud-bigquery-storage , google-cloud-core , google-cloud-datacatalog , google-cloud-storage , google-cloud-testutils , google-resumable-media +, grpcio , ipython , mock , pandas , proto-plus +, protobuf , psutil , pyarrow , pytest-xdist +, pytestCheckHook +, python-dateutil , pythonOlder +, requests +, tqdm }: buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.3.5"; + version = "3.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+7ZXmcAnVN3K7ZgfSotrAhtpzADUzZw1yh1swnLq2dE="; + hash = "sha256-Ik3DKbxa0J1hTbdlyV8LuLJPCIGz0qSFQGLKNG+IlvA="; }; propagatedBuildInputs = [ + grpcio + google-api-core google-cloud-core google-cloud-bigquery-storage google-resumable-media proto-plus - pyarrow - ]; + protobuf + requests + python-dateutil + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ - db-dtypes + passthru.optional-dependencies = { + bqstorage = [ + google-cloud-bigquery-storage + grpcio + pyarrow + ]; + pandas = [ + db-dtypes + pandas + pyarrow + ]; + tqdm = [ + tqdm + ]; + ipython = [ + ipython + ]; + }; + + nativeCheckInputs = [ freezegun google-cloud-testutils - ipython mock - pandas psutil google-cloud-datacatalog google-cloud-storage pytestCheckHook pytest-xdist - ]; + ] ++ passthru.optional-dependencies.pandas + ++ passthru.optional-dependencies.ipython; # prevent google directory from shadowing google imports preCheck = '' @@ -83,10 +110,12 @@ buildPythonPackage rec { "test__initiate_resumable_upload_mtls" "test__initiate_resumable_upload_with_retry" "test_table_clones" + "test_context_with_default_connection" + "test_context_with_custom_connection" ]; disabledTestPaths = [ - # requires credentials + # Tests require credentials "tests/system/test_query.py" "tests/system/test_job_retry.py" "tests/system/test_pandas.py" @@ -100,6 +129,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google BigQuery API client library"; homepage = "https://github.com/googleapis/python-bigquery"; + changelog = "https://github.com/googleapis/python-bigquery/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index b45eb0ce1201..f92580db80b9 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -3,35 +3,44 @@ , fetchPypi , google-api-core , google-cloud-core +, grpcio , grpc-google-iam-v1 , libcst , mock , proto-plus +, protobuf , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.13.2"; + version = "2.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-a0R8CefN6gtIYqtNdCW9QKJulsbDnH6dFuUfTp8jUnA="; + hash = "sha256-idnWz7o7RuOAZbY+H5STVAVa1rexThDY3Zb5eaI10Ao="; }; propagatedBuildInputs = [ google-api-core google-cloud-core grpc-google-iam-v1 - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + passthru.optional-dependencies = { + libcst = [ + libcst + ]; + }; + + nativeCheckInputs = [ + grpcio mock pytestCheckHook ]; @@ -54,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Bigtable API client library"; homepage = "https://github.com/googleapis/python-bigtable"; + changelog = "https://github.com/googleapis/python-bigtable/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index f51cac5d8a5c..19910f1167c0 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -12,21 +12,23 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.5.2"; + version = "1.8.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-D0pIR1vQEt/7aIxMo0uDlxvt+fwS2DxCurU/lxMHAjo="; + hash = "sha256-pnhXkYSXph7aIZJoI3tXTNIUkH44S22QDIGXUl9ceFU="; }; propagatedBuildInputs = [ google-api-core proto-plus protobuf - ]; + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook @@ -48,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "API Client library for Google Cloud Compute"; homepage = "https://github.com/googleapis/python-compute"; + changelog = "https://github.com/googleapis/python-compute/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ jpetrucciani ]; }; diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 260079e58179..6c022b84ab75 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -2,42 +2,42 @@ , buildPythonPackage , fetchPypi , google-api-core -, grpc-google-iam-v1 , libcst , mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.13.0"; + version = "2.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Rq4DuCbXX4DSIr01AFYo0O4+wQv4B5yzrrX9a2ecAFI="; + hash = "sha256-PXDUjipUG7cYqeO2ivqrqLybHzDIssvBtdZixEMqXOA="; }; propagatedBuildInputs = [ google-api-core - grpc-google-iam-v1 libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; disabledTests = [ - # requires credentials + # Test requires credentials "test_list_clusters" ]; @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Container Engine API client library"; homepage = "https://github.com/googleapis/python-container"; + changelog = "https://github.com/googleapis/python-container/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index bc72ce501035..8d54e68bab72 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -1,34 +1,55 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , google-api-core +, google-auth +, grpcio , mock +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-core"; version = "2.3.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uVKe5wR/2NS/SiGC3mGRVCQN8X++YOrTmQeMGuFSr5o="; + hash = "sha256-uVKe5wR/2NS/SiGC3mGRVCQN8X++YOrTmQeMGuFSr5o="; }; - propagatedBuildInputs = [ google-api-core ]; + propagatedBuildInputs = [ + google-auth + google-api-core + ]; - checkInputs = [ mock pytestCheckHook ]; + passthru.optional-dependencies = { + grpc = [ + grpcio + ]; + }; + + nativeCheckInputs = [ + mock + pytestCheckHook + ] ++ passthru.optional-dependencies.grpc; # prevent google directory from shadowing google imports preCheck = '' rm -r google ''; - pythonImportsCheck = [ "google.cloud" ]; + pythonImportsCheck = [ + "google.cloud" + ]; meta = with lib; { description = "API Client library for Google Cloud: Core Helpers"; homepage = "https://github.com/googleapis/python-cloud-core"; + changelog = "https://github.com/googleapis/python-cloud-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 297847f6f3ac..f2d8b6ec50c1 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -1,39 +1,41 @@ { lib , buildPythonPackage , fetchPypi -, libcst , google-api-core , grpc-google-iam-v1 +, libcst +, mock , proto-plus +, protobuf , pytest-asyncio , pytestCheckHook -, mock , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.9.3"; + version = "3.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JgGs4lqOruHohIy6GaUGSHr0vd+lFsI5u4PVZwt7tdo="; + hash = "sha256-X4h6hrEfjiroAgtG26bz70P2PsEileHmZ5Jq6iPHqCs="; }; propagatedBuildInputs = [ - libcst google-api-core grpc-google-iam-v1 + libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ + mock pytest-asyncio pytestCheckHook - mock ]; pythonImportsCheck = [ @@ -43,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Data Catalog API API client library"; homepage = "https://github.com/googleapis/python-datacatalog"; + changelog = "https://github.com/googleapis/python-datacatalog/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 7e75978a3510..289fef97b1b6 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -5,6 +5,7 @@ , mock , libcst , proto-plus +, protobuf , pytestCheckHook , pytest-asyncio , pythonOlder @@ -12,30 +13,31 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.0.3"; + version = "5.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gE4PyJCrgEekqR3S4YNUtp3yd2AOt7TmKvvDaJ4stk0="; + hash = "sha256-iuhXfFp6cfDNDtk3JS+U8YbQAOII0khY2bmvP75QAP4="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pytest-asyncio ]; disabledTests = [ - # requires credentials + # Test requires credentials "test_list_clusters" ]; @@ -47,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Dataproc API client library"; homepage = "https://github.com/googleapis/python-dataproc"; + changelog = "https://github.com/googleapis/python-dataproc/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index a950f09050c6..553b7a7dd143 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -3,32 +3,34 @@ , fetchPypi , google-api-core , google-cloud-core -, libcst -, proto-plus -, mock -, pytestCheckHook -, pytest-asyncio , google-cloud-testutils +, libcst +, mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.9.0"; + version = "2.13.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8/gmeLpdheW7M9nhM0uTlxrpeRcODSgLVOVKPj9O870="; + hash = "sha256-ikstW53KrRr4vnmtbr0AOG8/kHaF8excJFbwclhCA7A="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; passthru.optional-dependencies = { libcst = [ @@ -36,7 +38,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ google-cloud-testutils mock pytestCheckHook @@ -50,6 +52,7 @@ buildPythonPackage rec { disabledTestPaths = [ # Requires credentials + "tests/system/test_aggregation_query.py" "tests/system/test_allocate_reserve_ids.py" "tests/system/test_query.py" "tests/system/test_put.py" @@ -66,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Datastore API client library"; homepage = "https://github.com/googleapis/python-datastore"; + changelog = "https://github.com/googleapis/python-datastore/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 331b6d8adb7b..86888e3fb621 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -3,35 +3,33 @@ , fetchPypi , google-api-core , google-cloud-testutils -, libcst -, proto-plus -, pytestCheckHook -, pytest-asyncio -, pytz , mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.9.2"; + version = "3.11.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yoiHO4/dhFDGZJB+WiouyBtbTQWIecwaIvR+qw8MGBU="; + hash = "sha256-TwVY6/4TSY8cPj3y/A7+cxpyVJ9+lPg+vAKNhfBNfqI="; }; propagatedBuildInputs = [ google-api-core - libcst proto-plus - pytz - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ google-cloud-testutils mock pytestCheckHook @@ -39,7 +37,7 @@ buildPythonPackage rec { ]; disabledTests = [ - # requires credentials + # Test requires credentials "test_inspect_content" ]; @@ -51,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Data Loss Prevention (DLP) API API client library"; homepage = "https://github.com/googleapis/python-dlp"; + changelog = "https://github.com/googleapis/python-dlp/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix index 00bedca7c4ca..b61f1b731749 100644 --- a/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -3,22 +3,32 @@ , fetchPypi , google-api-core , google-cloud-core -, pytestCheckHook , mock +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-dns"; version = "0.34.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RPpi7pPFHGxXIWBY2S0qkRa3E6SocanRajqDuZ4wwfk="; + hash = "sha256-RPpi7pPFHGxXIWBY2S0qkRa3E6SocanRajqDuZ4wwfk="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-core + ]; - checkInputs = [ mock pytestCheckHook ]; + nativeCheckInputs = [ + mock + pytestCheckHook + ]; preCheck = '' # don#t shadow python imports @@ -30,11 +40,14 @@ buildPythonPackage rec { "test_quota" ]; - pythonImportsCheck = [ "google.cloud.dns" ]; + pythonImportsCheck = [ + "google.cloud.dns" + ]; meta = with lib; { description = "Google Cloud DNS API client library"; homepage = "https://github.com/googleapis/python-dns"; + changelog = "https://github.com/googleapis/python-dns/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; 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 5ec7903b9e2d..5a062f4a85c2 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -1,35 +1,37 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook +, google-api-core , google-cloud-logging , google-cloud-testutils -, libcst , mock , proto-plus +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.6.3"; + version = "1.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7QR4NS98MtJ8aMLC+qQeTrK1Rv5kw6XlZhSKbatrZFY="; + hash = "sha256-Xl+Jc05daQZPh4xggf/JYYlJ5Lx6LafqWhMcVdk/r6o="; }; propagatedBuildInputs = [ + google-api-core google-cloud-logging - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ google-cloud-testutils mock pytestCheckHook @@ -37,7 +39,7 @@ buildPythonPackage rec { ]; disabledTests = [ - # require credentials + # Tests require credentials "test_report_error_event" "test_report_exception" ]; @@ -50,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Stackdriver Error Reporting API client library"; homepage = "https://github.com/googleapis/python-error-reporting"; + changelog = "https://github.com/googleapis/python-error-reporting/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 5abd123f8f1a..360c4c9a4d17 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -1,37 +1,43 @@ { lib +, aiounittest , buildPythonPackage , fetchPypi -, aiounittest , google-api-core -, google-cloud-testutils , google-cloud-core +, google-cloud-testutils , mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.7.2"; + version = "2.9.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yGB6dLcRxEuqPYGEbpOI5DInos/1ILWmzeXN+ck/W+g="; + hash = "sha256-WxUiufi+rXBPuSBcC/Ktp0tEkcaA457o0WexweS9MMI="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ aiounittest google-cloud-testutils mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; preCheck = '' @@ -60,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Firestore API client library"; homepage = "https://github.com/googleapis/python-firestore"; + changelog = "https://github.com/googleapis/python-firestore/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; 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 601d213892e2..9a1518b3cc00 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -5,6 +5,7 @@ , grpc-google-iam-v1 , mock , proto-plus +, protobuf , pytest-asyncio , pytestCheckHook , pythonOlder @@ -12,23 +13,24 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.0.6"; + version = "1.2.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XiuEki6bNKZ8CzfcBBjnDbAh2yEADZohpP991OTf2DI="; + hash = "sha256-Xj7XJ/Wz9dmbqygKqjcvWn+zeGejYyqBzLkpNufX8lQ="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pytest-asyncio @@ -42,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "IAM Service Logging client library"; homepage = "https://github.com/googleapis/python-iam-logging"; + changelog = "https://github.com/googleapis/python-iam-logging/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index 21ca4ff099fe..b06a5d3499be 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -1,28 +1,38 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook -, pythonOlder , google-api-core , libcst , mock , proto-plus , pytest-asyncio +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.9.0"; + version = "2.10.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/FPuPDJC+AuRNCtKv7pFrpsOlopPFEV/KggDWulRU8A="; + hash = "sha256-8q/Am7x5LFN9Uaw37QdUdwL19J1FgxRKjRL0Vrc+1TI="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "google.cloud.iam_credentials" @@ -32,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "IAM Service Account Credentials API client library"; homepage = "https://github.com/googleapis/python-iam"; + changelog = "https://github.com/googleapis/python-iam/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index bd902197416a..f3fdc38124aa 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -1,39 +1,41 @@ { lib , buildPythonPackage , fetchPypi -, grpc-google-iam-v1 , google-api-core +, grpc-google-iam-v1 , libcst -, proto-plus -, pytestCheckHook -, pytest-asyncio -, pythonOlder , mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.6.4"; + version = "2.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d3RRVqgetOS3sAT6UkV5DB/NZMjeZd5tBtd9ME8Wvs4="; + hash = "sha256-Rh23HbHv1FVmiZtyofv0bktv7tZWN3IS5jQawzbFfRk="; }; propagatedBuildInputs = [ - grpc-google-iam-v1 google-api-core + grpc-google-iam-v1 libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; disabledTests = [ @@ -49,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud IoT API API client library"; homepage = "https://github.com/googleapis/python-iot"; + changelog = "https://github.com/googleapis/python-iot/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 0173f38c184c..27a2e9e067dc 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -1,30 +1,45 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook -, grpc-google-iam-v1 , google-api-core -, libcst +, grpc-google-iam-v1 , mock , proto-plus +, protobuf , pytest-asyncio +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.12.3"; + version = "2.13.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ooWxYH4B8HY9ybWj0GQqUnfiFXzLCqyXGGZsocV9Od0="; + hash = "sha256-0nOQnibi1T0JW9NQaKSrNCnfB5EgsnNYMVCEiUsPRdU="; }; - propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + grpc-google-iam-v1 + google-api-core + proto-plus + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; # Disable tests that need credentials - disabledTests = [ "test_list_global_key_rings" ]; + disabledTests = [ + "test_list_global_key_rings" + ]; pythonImportsCheck = [ "google.cloud.kms" @@ -34,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Key Management Service (KMS) API API client library"; homepage = "https://github.com/googleapis/python-kms"; + changelog = "https://github.com/googleapis/python-kms/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 84b2c14ee700..5430c4f7abe4 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -2,34 +2,32 @@ , buildPythonPackage , fetchPypi , google-api-core -, libcst -, mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.6.1"; + version = "2.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KAZmikDsTmNarRo9fxrTR5EtGfSYm1i4rP1iX8pa6Zo="; + hash = "sha256-o4o9x7r7HpwzByUijDegzos35FILro0Esr2ugN2nyws="; }; propagatedBuildInputs = [ google-api-core - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ - mock + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; @@ -43,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Natural Language API client library"; homepage = "https://github.com/googleapis/python-language"; + changelog = "https://github.com/googleapis/python-language/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 81f032a095d9..d167a07fa611 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -1,32 +1,34 @@ { lib , buildPythonPackage -, fetchPypi , django +, fetchPypi , flask , google-api-core , google-cloud-appengine-logging , google-cloud-audit-log , google-cloud-core , google-cloud-testutils +, grpc-google-iam-v1 , mock , pandas , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder , rich }: buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.2.5"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wbB4AD+PwsCGSvBGUeK+EhPltzjqgykeX/VlJSm8Xlg="; + hash = "sha256-8RVEoh6jVW9w66x7wzj/qKGXkTg07N2IU9F2uHCCOqo="; }; propagatedBuildInputs = [ @@ -34,10 +36,12 @@ buildPythonPackage rec { google-cloud-appengine-logging google-cloud-audit-log google-cloud-core + grpc-google-iam-v1 proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ django flask google-cloud-testutils @@ -56,10 +60,16 @@ buildPythonPackage rec { preCheck = '' # prevent google directory from shadowing google imports rm -r google - # requires credentials - rm tests/system/test_system.py tests/unit/test__gapic.py ''; + disabledTestPaths = [ + # Tests require credentials + "tests/system/test_system.py" + "tests/unit/test__gapic.py" + # Exclude performance tests + "tests/performance/test_performance.py" + ]; + pythonImportsCheck = [ "google.cloud.logging" "google.cloud.logging_v2" @@ -68,6 +78,7 @@ buildPythonPackage rec { meta = with lib; { description = "Stackdriver Logging API client library"; homepage = "https://github.com/googleapis/python-logging"; + changelog = "https://github.com/googleapis/python-logging/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index d6d3f5f9815d..2dabd36a2e93 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -3,40 +3,45 @@ , fetchPypi , google-api-core , google-cloud-testutils -, libcst +, mock , proto-plus , pandas , pytestCheckHook , pytest-asyncio -, mock +, protobuf , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.11.3"; + version = "2.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Nm27yxdf6woQoP37CeNrHggM2Wobv9W9JrmTlx5A4uY="; + hash = "sha256-FKg2nEmc5mYKSWJwV0wG09kK4ZQl+Tan+9BqbwJ/8eA="; }; propagatedBuildInputs = [ - libcst google-api-core proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + passthru.optional-dependencies = { + pandas = [ + pandas + ]; + }; + + nativeCheckInputs = [ google-cloud-testutils mock - pandas pytestCheckHook pytest-asyncio - ]; + ] ++ passthru.optional-dependencies.pandas; disabledTests = [ # requires credentials @@ -51,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Stackdriver Monitoring API client library"; homepage = "https://github.com/googleapis/python-monitoring"; + changelog = "https://github.com/googleapis/python-monitoring/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; 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 8c3f2f683e70..43b5b09810e1 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -1,26 +1,50 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, google-api-core, mock, proto-plus, protobuf, pytest-asyncio }: +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.4.1"; + version = "1.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KYZvlpPqGy0zGDSZF3y6MsFZyb9M+88HGYp4NpPCiSY="; + hash = "sha256-ivlerguhDb7zhRfizIPGQWwwLOUhyoj2xWAy9inSklQ="; }; - propagatedBuildInputs = [ google-api-core proto-plus ]; + propagatedBuildInputs = [ + google-api-core + proto-plus + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - # prevent google directory from shadowing google imports + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + # Prevent google directory from shadowing google imports preCheck = '' rm -r google ''; - checkInputs = [ mock protobuf pytest-asyncio pytestCheckHook ]; - pythonImportsCheck = [ "google.cloud.orgpolicy" ]; + + pythonImportsCheck = [ + "google.cloud.orgpolicy" + ]; meta = with lib; { - description = "Protobufs for Google Cloud Organization Policy."; + description = "Protobufs for Google Cloud Organization Policy"; homepage = "https://github.com/googleapis/python-org-policy"; + changelog = "https://github.com/googleapis/python-org-policy/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; }; 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 18f7dafae7a5..9948b7243c94 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,8 +2,7 @@ , buildPythonPackage , fetchPypi , google-api-core -, libcst -, mock +, protobuf , proto-plus , pytestCheckHook , pytest-asyncio @@ -12,26 +11,25 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.12.4"; + version = "1.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SmzCo/nh6FbTt+7lw4XAyF5gwDHQCOz8Nbl05/AkDfY="; + hash = "sha256-wDb1vy1rj0yBOk7Q1pMzNw3foOXHk18YwIbY4ZcYCxM="; }; propagatedBuildInputs = [ google-api-core - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ - mock - pytestCheckHook + nativeCheckInputs = [ pytest-asyncio + pytestCheckHook ]; pythonImportsCheck = [ @@ -46,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud OS Config API client library"; homepage = "https://github.com/googleapis/python-os-config"; + changelog = "https://github.com/googleapis/python-os-config/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 29ddb2501391..26446cc412e5 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -1,41 +1,49 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , google-api-core , google-cloud-testutils , grpc-google-iam-v1 +, grpcio , grpcio-status , libcst -, mock , proto-plus +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.13.11"; + version = "2.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CFh47PuzmR/qavOgEaot2fVBXRnHYNDemlhSTSqhut4="; + hash = "sha256-4nFPB7dQRYvq9bB7Zw6ntgWO4VXAIcmH0LjmpAvzRG8="; }; propagatedBuildInputs = [ - grpc-google-iam-v1 google-api-core + grpc-google-iam-v1 + grpcio grpcio-status libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + passthru.optional-dependencies = { + libcst = [ + libcst + ]; + }; + + nativeCheckInputs = [ google-cloud-testutils - mock pytestCheckHook pytest-asyncio ]; @@ -56,7 +64,8 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Pub/Sub API client library"; - homepage = "https://pypi.org/project/google-cloud-pubsub"; + homepage = "https://github.com/googleapis/python-pubsub"; + changelog = "https://github.com/googleapis/python-pubsub/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 96b20dcc2607..248fcb7140b7 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -2,34 +2,32 @@ , buildPythonPackage , fetchPypi , google-api-core -, libcst -, mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.9.3"; + version = "2.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-81RPV8GaSU0jpYTyjFWxakpbuBz994eA7I/wyTxmg8Y="; + hash = "sha256-dRavwtaU+dpRZkO49Q0Btmh2Mi/zUWbvZbImrfUkrAM="; }; propagatedBuildInputs = [ google-api-core - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ - mock + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; @@ -43,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Memorystore for Redis API client library"; homepage = "https://github.com/googleapis/python-redis"; + changelog = "https://github.com/googleapis/python-redis/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; 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 7291702a83d3..b2aa7804b601 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -1,25 +1,26 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook -, google-cloud-core , google-api-core +, google-cloud-core , grpc-google-iam-v1 , proto-plus -, mock +, protobuf +, pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.6.3"; + version = "1.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-bPipp05loDhXiWlnx5MHt1gFx1Kt47xBIk5hZ3dLyck="; + hash = "sha256-npTv+f533JK/J2ceJ6Na7mS90HfKaHORmGnFz1LBzLQ="; }; propagatedBuildInputs = [ @@ -27,10 +28,11 @@ buildPythonPackage rec { google-cloud-core grpc-google-iam-v1 proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ - mock + nativeCheckInputs = [ + pytest-asyncio pytestCheckHook ]; @@ -47,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Resource Manager API client library"; homepage = "https://github.com/googleapis/python-resource-manager"; + changelog = "https://github.com/googleapis/python-resource-manager/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 3b435ac5adac..a9eb5f2ba7a6 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -5,34 +5,49 @@ , google-cloud-core , mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; version = "0.33.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MPmyvm2FSrUzb1y5i4xl5Cqea6sxixLoZ7V1hxNi7hw="; + hash = "sha256-MPmyvm2FSrUzb1y5i4xl5Cqea6sxixLoZ7V1hxNi7hw="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-core + ]; - checkInputs = [ mock pytestCheckHook ]; + nativeCheckInputs = [ + mock + pytestCheckHook + ]; # Client tests require credentials - disabledTests = [ "client_options" ]; + disabledTests = [ + "client_options" + ]; # prevent google directory from shadowing google imports preCheck = '' rm -r google ''; - pythonImportsCheck = [ "google.cloud.runtimeconfig" ]; + pythonImportsCheck = [ + "google.cloud.runtimeconfig" + ]; meta = with lib; { description = "Google Cloud RuntimeConfig API client library"; - homepage = "https://pypi.org/project/google-cloud-runtimeconfig"; + homepage = "https://github.com/googleapis/python-runtimeconfig"; + changelog = "https://github.com/googleapis/python-runtimeconfig/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; 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 f8a0e4053d8e..169e3496e779 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -3,37 +3,35 @@ , fetchPypi , google-api-core , grpc-google-iam-v1 -, libcst -, mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.12.6"; + version = "2.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-equimX9D+MOzWQPvxUw4moAvOYU7qB6B4RkPCTQg7PY="; + hash = "sha256-0ubTvpHT6HfCg5lfdbzAnP77oWPZw2N78qZs6tGim6M="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ - mock - pytestCheckHook + nativeCheckInputs = [ pytest-asyncio + pytestCheckHook ]; pythonImportsCheck = [ @@ -45,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Secret Manager API API client library"; homepage = "https://github.com/googleapis/python-secret-manager"; + changelog = "https://github.com/googleapis/python-secret-manager/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ siriobalmelli SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index bdf3aca4653a..28bf273bd561 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -1,37 +1,35 @@ { lib , buildPythonPackage , fetchPypi -, grpc-google-iam-v1 , google-api-core -, libcst -, mock +, grpc-google-iam-v1 , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.16.2"; + version = "1.18.2"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DU+0gpnWqmtm5nkLoHbEq5k3pnybsEag+aKEp7+HFmo="; + hash = "sha256-O1jSSozVmeDRoTCtRhsBDlZ/o8g/8ccGkJCg6hp7ob8="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ - mock + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; @@ -46,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Security Command Center API API client library"; homepage = "https://github.com/googleapis/python-securitycenter"; + changelog = "https://github.com/googleapis/python-securitycenter/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 8272416b29f2..1c0536749019 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -1,43 +1,52 @@ { lib , buildPythonPackage , fetchPypi -, grpc-google-iam-v1 +, google-api-core , google-cloud-core , google-cloud-testutils +, grpc-google-iam-v1 , libcst , mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio -, sqlparse +, pytestCheckHook , pythonOlder +, sqlparse }: buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.23.0"; + version = "3.27.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1RHzpCRYU2dUxZLa+zzopHd+xfnq7eWF6HDIkVk+2NY="; + hash = "sha256-6zrAz+VqO8ojC+E0wcYMktZpnWF7skSj6R4GRrJ3nOs="; }; propagatedBuildInputs = [ + google-api-core google-cloud-core grpc-google-iam-v1 - libcst proto-plus + protobuf sqlparse - ]; + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + passthru.optional-dependencies = { + libcst = [ + libcst + ]; + }; + + nativeCheckInputs = [ google-cloud-testutils mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; preCheck = '' @@ -69,6 +78,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Spanner API client library"; homepage = "https://github.com/googleapis/python-spanner"; + changelog = "https://github.com/googleapis/python-spanner/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index a0e68cdff34f..7c57cc560eb7 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -2,38 +2,38 @@ , buildPythonPackage , fetchPypi , google-api-core -, libcst , mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder , setuptools }: buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.16.2"; + version = "2.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aegM+pgdKsM7qC8sfPMxV74gwPYasArFWzkJ/p9ESzU="; + hash = "sha256-gWcYMY9Ztm5d9CkQXPtAZaDgrKwU90EZBdznuWWDp9o="; }; propagatedBuildInputs = [ - libcst google-api-core proto-plus + protobuf setuptools - ]; + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; disabledTestPaths = [ @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Speech API client library"; homepage = "https://github.com/googleapis/python-speech"; + changelog = "https://github.com/googleapis/python-speech/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 84f489a220b6..abd321fd8107 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -1,36 +1,45 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , google-auth -, google-cloud-iam , google-cloud-core +, google-cloud-iam , google-cloud-kms , google-cloud-testutils , google-resumable-media , mock +, protobuf +, pytestCheckHook , pythonOlder +, requests }: buildPythonPackage rec { pname = "google-cloud-storage"; - version = "2.5.0"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OC80uR3iIS48LntA7AedJ+4uPbuumbdbG82MYwY84jU="; + hash = "sha256-GsLVjS1pPLE0HrxIZZo1J753jZ4tiYlpeidGAlko/xc="; }; propagatedBuildInputs = [ google-auth google-cloud-core google-resumable-media + requests ]; - checkInputs = [ + passthru.optional-dependencies = { + protobuf = [ + protobuf + ]; + }; + + nativeCheckInputs = [ google-cloud-iam google-cloud-kms google-cloud-testutils @@ -38,7 +47,7 @@ buildPythonPackage rec { pytestCheckHook ]; - # disable tests which require credentials and network access + # Disable tests which require credentials and network access disabledTests = [ "create" "download" @@ -51,6 +60,7 @@ buildPythonPackage rec { "test_list_buckets" "test_open" "test_anonymous_client_access_to_public_bucket" + "test_ctor_w_custom_endpoint_use_auth" ]; disabledTestPaths = [ @@ -59,6 +69,7 @@ buildPythonPackage rec { "tests/system/test_bucket.py" "tests/system/test_fileio.py" "tests/system/test_kms_integration.py" + "tests/unit/test_transfer_manager.py" ]; preCheck = '' @@ -69,11 +80,14 @@ buildPythonPackage rec { rm tests/conformance/test_conformance.py ''; - pythonImportsCheck = [ "google.cloud.storage" ]; + pythonImportsCheck = [ + "google.cloud.storage" + ]; meta = with lib; { description = "Google Cloud Storage API client library"; homepage = "https://github.com/googleapis/python-storage"; + changelog = "https://github.com/googleapis/python-storage/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 8bbaa96f51ce..8751b583729b 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -3,9 +3,9 @@ , fetchPypi , google-api-core , grpc-google-iam-v1 -, libcst , mock , proto-plus +, protobuf , pytest-asyncio , pytestCheckHook , pythonOlder @@ -13,31 +13,31 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.10.4"; + version = "2.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZQ9PQ75yWEEQNyfqO8EyJ66euqL5na2q1TiIgxz8HXA="; + hash = "sha256-2kRj5zlAPVO2U3EzN+opz5OBtwEru5RqGOXGqLUPaUA="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook ]; disabledTests = [ - # requires credentials + # Test requires credentials "test_list_queues" ]; @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Tasks API API client library"; homepage = "https://github.com/googleapis/python-tasks"; + changelog = "https://github.com/googleapis/python-tasks/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index c2bd3f0a1466..10a2826c5daa 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -1,24 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi, click, google-auth, packaging, six }: +{ lib +, buildPythonPackage +, click +, fetchPypi +, google-auth +, packaging +, pythonOlder +}: buildPythonPackage rec { pname = "google-cloud-testutils"; version = "1.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "sha256-bRjvNNmvsBy0sR4C0DoC/n7A9ez6AfXUJrXZiHKkz0g="; }; - propagatedBuildInputs = [ click google-auth packaging six ]; + propagatedBuildInputs = [ + click + google-auth + packaging + ]; # does not contain tests doCheck = false; - pythonImportsCheck = [ "test_utils" ]; + pythonImportsCheck = [ + "test_utils" + ]; meta = with lib; { description = "System test utilities for google-cloud-python"; homepage = "https://github.com/googleapis/python-test-utils"; + changelog ="https://github.com/googleapis/python-test-utils/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 6920239879fc..3b67f04f6733 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -1,34 +1,34 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , google-api-core -, libcst , mock , proto-plus +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.12.3"; + version = "2.14.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-gnSl/W0mTv6It//+xV5ti0Rd6io1Gh4yxd0arrbEPtQ="; + hash = "sha256-3XFvKnaK1nUCz9mbmSXFH/1uFr6TtBCr7v/arBkL/oE="; }; propagatedBuildInputs = [ - libcst google-api-core proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Text-to-Speech API client library"; homepage = "https://github.com/googleapis/python-texttospeech"; + changelog = "https://github.com/googleapis/python-texttospeech/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 0bfe7189c860..a753acdcc1e8 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -2,34 +2,34 @@ , buildPythonPackage , fetchPypi , google-api-core -, google-cloud-core , google-cloud-testutils , mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.7.3"; + version = "1.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HFntFmPn3FPhCrB+nnJlBD9zqG2jDsP2naEl2IxhRqE="; + hash = "sha256-aU6XD+uj/X9Gs8z2vP0rhTlaqkg7u4H9CV/CJl2b7ak="; }; propagatedBuildInputs = [ google-api-core - google-cloud-core proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ google-cloud-testutils mock pytestCheckHook @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Trace API client library"; homepage = "https://github.com/googleapis/python-trace"; + changelog = "https://github.com/googleapis/python-trace/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 295eb13a240e..6ae9ff0ea946 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -1,37 +1,37 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , google-api-core , google-cloud-core , google-cloud-testutils -, libcst , mock , proto-plus +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.8.4"; + version = "3.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cptSFyAByZRZ7Dr93skVPeCvUoh0/PMACp3dmOEQfuc="; + hash = "sha256-++1k8lhJfJ7e/oK//IyYx9W/RacQa/1RwdrhyvCYWEM="; }; propagatedBuildInputs = [ google-api-core google-cloud-core - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ google-cloud-testutils mock pytestCheckHook @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Translation API client library"; homepage = "https://github.com/googleapis/python-translate"; + changelog = "https://github.com/googleapis/python-translate/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 0c0d579f7daa..b8019c03cc5f 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -1,33 +1,35 @@ { lib , buildPythonPackage , fetchPypi -, mock , google-api-core , google-cloud-testutils +, mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.8.3"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pB7exeGYpFT4nf3YuIhoI+bqG6YYEP6oWs0tohkOIbw="; + hash = "sha256-HlmuzMOaCl7z9NBVI5HoCH1vltQCeel30B5roX/+2HE="; }; propagatedBuildInputs = [ google-api-core proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ google-cloud-testutils mock pytestCheckHook @@ -51,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Video Intelligence API client library"; homepage = "https://github.com/googleapis/python-videointelligence"; + changelog = "https://github.com/googleapis/python-videointelligence/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index b29dd1cff410..af99aa9bd742 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -2,33 +2,33 @@ , buildPythonPackage , fetchPypi , google-api-core -, libcst , mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.1.4"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1nqU9Sr+tWPK3l5r7UiFD0wA3+UmYcHFT4ta2bdRL+U="; + hash = "sha256-G7v09CA1pJ2OSL7gBzYvfRGrjPjQElxnyeUvP2vpFJQ="; }; propagatedBuildInputs = [ - libcst google-api-core proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pytest-asyncio @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Vision API API client library"; homepage = "https://github.com/googleapis/python-vision"; + changelog = "https://github.com/googleapis/python-vision/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index d35944777fbf..91b7920f5843 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -1,36 +1,34 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , google-api-core -, libcst , mock -, protobuf , proto-plus +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.9.2"; + version = "1.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fUnoV5I9kMwC9zUdsHit6MbIYFV+3E+GT76vwEmzNNs="; + hash = "sha256-nVzFxoEIk01fPnybPQ7elFSff9ofSI9Ik6B+P4o41N8="; }; propagatedBuildInputs = [ google-api-core - libcst - protobuf proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook @@ -44,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Web Security Scanner API client library"; homepage = "https://github.com/googleapis/python-websecurityscanner"; + changelog = "https://github.com/googleapis/python-websecurityscanner/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix index 2fd5dc315e5d..d02dd0dda416 100644 --- a/pkgs/development/python-modules/google-crc32c/default.nix +++ b/pkgs/development/python-modules/google-crc32c/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { LDFLAGS = "-L${crc32c}/lib"; CFLAGS = "-I${crc32c}/include"; - checkInputs = [ pytestCheckHook crc32c ]; + nativeCheckInputs = [ pytestCheckHook crc32c ]; pythonImportsCheck = [ "google_crc32c" ]; diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix index 828d9ff5eb2b..600703130e61 100644 --- a/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/pkgs/development/python-modules/google-i18n-address/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "i18naddress" ]; diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index eefb4d85f90d..d8fe3ca62f97 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "2.1.0"; + version = "2.2.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-gT8Zrjzzunm5nt0GHYY0z2ZxtKBSc6FXndlrStbwo64="; + hash = "sha256-HQzU6no/DV2QOC+LV7kUSrygTwgAvfMSmYIKaBd/PCE="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ asynctest coreutils pytest-aiohttp @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for Google Nest Device Access using the Smart Device Management API"; homepage = "https://github.com/allenporter/python-google-nest-sdm"; + changelog = "https://github.com/allenporter/python-google-nest-sdm/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/google-reauth/default.nix b/pkgs/development/python-modules/google-reauth/default.nix new file mode 100644 index 000000000000..5a4524926d4d --- /dev/null +++ b/pkgs/development/python-modules/google-reauth/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, oauth2client +, pytestCheckHook +, pythonOlder +, pyu2f +}: + +buildPythonPackage rec { + pname = "google-reauth"; + version = "0.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Google"; + repo = "google-reauth-python"; + rev = "refs/tags/${version}"; + hash = "sha256-J7GVh+iY+69rFzf4hN/KLFZMZ1/S3CL5TZ7SsP5Oy3g="; + }; + + propagatedBuildInputs = [ + oauth2client + pyu2f + ]; + + nativeCheckInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "google_reauth" + ]; + + meta = with lib; { + description = "Auth plugin allowing use the use of OAuth 2.0 credentials for Google Cloud Storage"; + homepage = "https://github.com/Google/google-reauth-python"; + changelog = "https://github.com/google/google-reauth-python/releases/tag/${version}"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 0820ac217f19..3dda409f155e 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -1,27 +1,49 @@ { lib +, aiohttp , buildPythonPackage , fetchPypi , google-auth , google-cloud-testutils , google-crc32c , mock -, pytestCheckHook , pytest-asyncio +, pytestCheckHook +, pythonOlder , requests }: buildPythonPackage rec { pname = "google-resumable-media"; version = "2.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jVUYUC+SuezISsRneb1PCWlOyzujij58pzeobRXLyh8="; + hash = "sha256-jVUYUC+SuezISsRneb1PCWlOyzujij58pzeobRXLyh8="; }; - propagatedBuildInputs = [ google-auth google-crc32c requests ]; + propagatedBuildInputs = [ + google-auth + google-crc32c + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + passthru.optional-dependencies = { + requests = [ + requests + ]; + aiohttp = [ + aiohttp + ]; + }; + + nativeCheckInputs = [ + google-cloud-testutils + mock + pytest-asyncio + pytestCheckHook + ] ++ passthru.optional-dependencies.requests; preCheck = '' # prevent shadowing imports @@ -40,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utilities for Google Media Downloads and Resumable Uploads"; homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python"; + changelog = "https://github.com/googleapis/google-resumable-media-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index 2c35387b124d..7ac264a649c6 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.56.4"; + version = "1.57.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wlhzxHJ5OHz9y9r6NhSYh5AdNiAstkWg5PKWhr9uRBc="; + sha256 = "sha256-J6hJ1iBYOPtsw8HCHLmABwemYbshxs5/sT6Z6x+KDEY="; }; propagatedBuildInputs = [ grpc protobuf ]; diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix index e04cc6eca663..d2e67e4676e7 100644 --- a/pkgs/development/python-modules/googlemaps/default.nix +++ b/pkgs/development/python-modules/googlemaps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "googlemaps"; - version = "4.7.0"; + version = "4.10.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,14 +19,14 @@ buildPythonPackage rec { owner = "googlemaps"; repo = "google-maps-services-python"; rev = "refs/tags/v${version}"; - hash = "sha256-qn98b7oTU9/u0+EJ4OTOksLquJiWl/od9m498UuFiwo="; + hash = "sha256-8oGZEMKUGaDHKq4qIZy10cbLNMmVclJnQE/dx877pNQ="; }; propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-cov pytestCheckHook responses @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client library for Google Maps API Web Services"; homepage = "https://github.com/googlemaps/google-maps-services-python"; + changelog = "https://github.com/googlemaps/google-maps-services-python/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ Scriptkiddi ]; }; diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index 4034dc57cfec..233d0bbbce81 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.19.1"; + version = "0.22.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3uYAyItZ1X18pw3h3rTJpcv2H7O+e4sFCv1R7vb8QPI="; + hash = "sha256-HAUHNxO7dfocazGhcvvcqbZot/RkAP50DrsEkocOugI="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Govee BLE devices"; homepage = "https://github.com/Bluetooth-Devices/govee-ble"; + changelog = "https://github.com/bluetooth-devices/govee-ble/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/gpiozero/default.nix b/pkgs/development/python-modules/gpiozero/default.nix index e75938a89707..a9546df9c844 100644 --- a/pkgs/development/python-modules/gpiozero/default.nix +++ b/pkgs/development/python-modules/gpiozero/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { "gpiozero.tools" ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/gprof2dot/default.nix b/pkgs/development/python-modules/gprof2dot/default.nix index 1536c5fcbdb3..45f9915c06c5 100644 --- a/pkgs/development/python-modules/gprof2dot/default.nix +++ b/pkgs/development/python-modules/gprof2dot/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ]; # Needed so dot is on path of the test script - checkInputs = [ graphviz ]; + nativeCheckInputs = [ graphviz ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/gpustat/default.nix b/pkgs/development/python-modules/gpustat/default.nix index fbfa2faf597b..f7df51d6166e 100644 --- a/pkgs/development/python-modules/gpustat/default.nix +++ b/pkgs/development/python-modules/gpustat/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ mockito pytestCheckHook ]; diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index 217039277ba5..b6e4b4910e24 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { buildInputs = [ cython ]; propagatedBuildInputs = [ numpy scipy six paramz matplotlib ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; # $ nosetests GPy/testing/*.py # => Ran 483 tests in 112.146s (on 8 cores) diff --git a/pkgs/development/python-modules/gpyopt/default.nix b/pkgs/development/python-modules/gpyopt/default.nix index 8852c5696757..c430e29a3c94 100644 --- a/pkgs/development/python-modules/gpyopt/default.nix +++ b/pkgs/development/python-modules/gpyopt/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; # requires several packages not available in Nix - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = "nosetests -v GPyOpt/testing"; diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix index dae5fb3438e0..4d4146968cbe 100644 --- a/pkgs/development/python-modules/gql/default.nix +++ b/pkgs/development/python-modules/gql/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aiofiles mock parse @@ -93,6 +93,22 @@ buildPythonPackage rec { # Exclude linter tests "gql-checker/tests/test_flake8_linter.py" "gql-checker/tests/test_pylama_linter.py" + # Tests require network access + "tests/custom_scalars/test_money.py" + "tests/test_aiohttp.py" + "tests/test_appsync_http.py" + "tests/test_appsync_websockets.py" + "tests/test_async_client_validation.py" + "tests/test_graphqlws_exceptions.py" + "tests/test_graphqlws_subscription.py" + "tests/test_phoenix_channel_exceptions.py" + "tests/test_phoenix_channel_exceptions.py" + "tests/test_phoenix_channel_query.py" + "tests/test_phoenix_channel_subscription.py" + "tests/test_requests.py" + "tests/test_websocket_exceptions.py" + "tests/test_websocket_query.py" + "tests/test_websocket_subscription.py" ]; pythonImportsCheck = [ @@ -102,6 +118,7 @@ buildPythonPackage rec { meta = with lib; { description = "GraphQL client in Python"; homepage = "https://github.com/graphql-python/gql"; + changelog = "https://github.com/graphql-python/gql/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/gradient-utils/default.nix b/pkgs/development/python-modules/gradient-utils/default.nix index e81d815e8c20..3d3cd47cf41e 100644 --- a/pkgs/development/python-modules/gradient-utils/default.nix +++ b/pkgs/development/python-modules/gradient-utils/default.nix @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Paperspace"; repo = pname; - rev = "v${version}"; - sha256 = "19plkgwwfs6298vjplgsvhirixi3jbngq5y07x9c0fjxk39fa2dk"; + rev = "refs/tags/v${version}"; + hash = "sha256-swnl0phdOsBSP8AX/OySI/aYI9z60Ss3SsJox/mb9KY="; }; nativeBuildInputs = [ @@ -35,16 +35,19 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ mock requests pytestCheckHook ]; postPatch = '' + # https://github.com/Paperspace/gradient-utils/issues/68 + # https://github.com/Paperspace/gradient-utils/issues/72 substituteInPlace pyproject.toml \ --replace 'wheel = "^0.35.1"' 'wheel = "*"' \ - --replace 'prometheus-client = ">=0.8,<0.10"' 'prometheus-client = "*"' + --replace 'prometheus-client = ">=0.8,<0.10"' 'prometheus-client = "*"' \ + --replace 'pymongo = "^3.11.0"' 'pymongo = ">=3.11.0"' ''; preCheck = '' @@ -64,7 +67,7 @@ buildPythonPackage rec { description = "Python utils and helpers library for Gradient"; homepage = "https://github.com/Paperspace/gradient-utils"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ freezeboy ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/grandalf/default.nix b/pkgs/development/python-modules/grandalf/default.nix index c4e7eb4d7446..1852364fbfe2 100644 --- a/pkgs/development/python-modules/grandalf/default.nix +++ b/pkgs/development/python-modules/grandalf/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { future ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index f5d9b7904594..3e8625ca6d41 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage +, pythonAtLeast , pythonOlder , fetchFromGitHub -, fetchpatch , graphene , graphql-core @@ -13,6 +13,7 @@ , django-filter , mock +, py , pytest-django , pytest-random-order , pytestCheckHook @@ -20,26 +21,18 @@ buildPythonPackage rec { pname = "graphene-django"; - version = "unstable-2022-03-03"; + version = "3.0.0"; format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "graphql-python"; repo = pname; - rev = "f6ec0689c18929344c79ae363d2e3d5628fa4a2d"; - hash = "sha256-KTZ5jcoeHYXnlaF47t8jIi6+7NyMyA4hDPv+il3bt+U="; + rev = "refs/tags/v${version}"; + hash = "sha256-wSZm0hRukBmvrmU3bsqFuZSQRXBwwye9J4ojuSz1uzE="; }; - patches = [ - ./graphene-3_2_0.patch - (fetchpatch { - url = "https://github.com/graphql-python/graphene-django/commit/ca555293a4334c26cf9a390dd1e3d0bd4c819a17.patch"; - excludes = [ "setup.py" ]; - sha256 = "sha256-RxG1MRhmpBKnHhSg4SV+DjZ3uA0nl9oUeei56xjtUpw="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace '"pytest-runner"' "" @@ -58,17 +51,27 @@ buildPythonPackage rec { export DJANGO_SETTINGS_MODULE=examples.django_test_settings ''; - checkInputs = [ + nativeCheckInputs = [ django-filter mock + py pytest-django pytest-random-order pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # Pèython 3.11 support, https://github.com/graphql-python/graphene-django/pull/1365 + "test_django_objecttype_convert_choices_enum_naming_collisions" + "test_django_objecttype_choices_custom_enum_name" + "test_django_objecttype_convert_choices_enum_list" + "test_schema_representation" + ]; + meta = with lib; { description = "Integrate GraphQL into your Django project"; homepage = "https://github.com/graphql-python/graphene-django"; + changelog = "https://github.com/graphql-python/graphene-django/releases/tag/v{version}"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/graphene-django/graphene-3_2_0.patch b/pkgs/development/python-modules/graphene-django/graphene-3_2_0.patch deleted file mode 100644 index 0e8fa63464a3..000000000000 --- a/pkgs/development/python-modules/graphene-django/graphene-3_2_0.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff --git a/graphene_django/filter/tests/test_fields.py b/graphene_django/filter/tests/test_fields.py -index 7d440f4..0aec6e4 100644 ---- a/graphene_django/filter/tests/test_fields.py -+++ b/graphene_django/filter/tests/test_fields.py -@@ -1005,7 +1005,7 @@ def test_integer_field_filter_type(): - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pets(offset: Int = null, before: String = null, after: String = null, first: Int = null, last: Int = null, age: Int = null): PetTypeConnection -@@ -1074,7 +1074,7 @@ def test_other_filter_types(): - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pets(offset: Int = null, before: String = null, after: String = null, first: Int = null, last: Int = null, age: Int = null, age_Isnull: Boolean = null, age_Lt: Int = null): PetTypeConnection -diff --git a/graphene_django/tests/test_command.py b/graphene_django/tests/test_command.py -index 70116b8..a4ab4db 100644 ---- a/graphene_django/tests/test_command.py -+++ b/graphene_django/tests/test_command.py -@@ -49,7 +49,7 @@ def test_generate_graphql_file_on_call_graphql_schema(): - assert handle.write.called_once() - - schema_output = handle.write.call_args[0][0] -- assert schema_output == dedent( -+ assert schema_output.rstrip() + "\n" == dedent( - """\ - type Query { - hi: String -diff --git a/graphene_django/tests/test_types.py b/graphene_django/tests/test_types.py -index bde72c7..0b64440 100644 ---- a/graphene_django/tests/test_types.py -+++ b/graphene_django/tests/test_types.py -@@ -247,7 +247,7 @@ def test_schema_representation(): - } - """ - ) -- assert str(schema) == expected -+ assert str(schema).rstrip() + "\n" == expected - - - def with_local_registry(func): -@@ -515,7 +515,7 @@ class TestDjangoObjectType: - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pet: Pet -@@ -541,7 +541,7 @@ class TestDjangoObjectType: - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pet: Pet -@@ -576,7 +576,7 @@ class TestDjangoObjectType: - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pet: Pet -@@ -603,7 +603,7 @@ class TestDjangoObjectType: - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pet: PetModelKind -@@ -642,7 +642,7 @@ class TestDjangoObjectType: - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pet: PetModelKind -diff --git a/graphene_django/tests/test_views.py b/graphene_django/tests/test_views.py -index 945fa87..e2e8b46 100644 ---- a/graphene_django/tests/test_views.py -+++ b/graphene_django/tests/test_views.py -@@ -109,12 +109,10 @@ def test_reports_validation_errors(client): - { - "message": "Cannot query field 'unknownOne' on type 'QueryRoot'.", - "locations": [{"line": 1, "column": 9}], -- "path": None, - }, - { - "message": "Cannot query field 'unknownTwo' on type 'QueryRoot'.", - "locations": [{"line": 1, "column": 21}], -- "path": None, - }, - ] - } -@@ -135,8 +133,6 @@ def test_errors_when_missing_operation_name(client): - "errors": [ - { - "message": "Must provide operation name if query contains multiple operations.", -- "locations": None, -- "path": None, - } - ] - } -@@ -476,8 +472,7 @@ def test_handles_syntax_errors_caught_by_graphql(client): - "errors": [ - { - "locations": [{"column": 1, "line": 1}], -- "message": "Syntax Error: Unexpected Name 'syntaxerror'.", -- "path": None, -+ "message": "Syntax Error: Unexpected Name 'syntaxerror'." - } - ] - } -diff --git a/graphene_django/views.py b/graphene_django/views.py -index c23b020..f533f70 100644 ---- a/graphene_django/views.py -+++ b/graphene_django/views.py -@@ -11,7 +11,6 @@ from django.views.decorators.csrf import ensure_csrf_cookie - from django.views.generic import View - from graphql import OperationType, get_operation_ast, parse, validate - from graphql.error import GraphQLError --from graphql.error import format_error as format_graphql_error - from graphql.execution import ExecutionResult - - from graphene import Schema -@@ -387,7 +386,7 @@ class GraphQLView(View): - @staticmethod - def format_error(error): - if isinstance(error, GraphQLError): -- return format_graphql_error(error) -+ return error.formatted - - return {"message": str(error)} - diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index ec3bb8354164..190d3e708205 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -5,6 +5,7 @@ , graphql-core , graphql-relay , promise +, py , pytest-asyncio , pytest-benchmark , pytest-mock @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "graphene"; - version = "3.1.1"; + version = "3.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = "graphene"; rev = "refs/tags/v${version}"; - sha256 = "sha256-04ocm/Q/CDi5dRNhReuvr5nAiowMZUJrZol/wJOjG50="; + hash = "sha256-XnrzgPkkFsTgNE9J+eSkD8f5MokKjtZhbbE/dxNZryk="; }; propagatedBuildInputs = [ @@ -35,8 +36,9 @@ buildPythonPackage rec { graphql-relay ]; - checkInputs = [ + nativeCheckInputs = [ promise + py pytestCheckHook pytest-asyncio pytest-benchmark @@ -56,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "GraphQL Framework for Python"; homepage = "https://github.com/graphql-python/graphene"; + changelog = "https://github.com/graphql-python/graphene/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index 91def6f2886b..221b1cfbfae1 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -1,11 +1,14 @@ { lib , stdenv , buildPythonPackage +, python , cairocffi , django , django_tagging -, fetchPypi +, fetchFromGitHub +, fetchpatch , gunicorn +, mock , pyparsing , python-memcached , pythonOlder @@ -14,7 +17,6 @@ , txamqp , urllib3 , whisper -, whitenoise }: buildPythonPackage rec { @@ -24,11 +26,26 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Pxho1QWo2jJZYAMJx999bbELDVMr7Wp7wsssYPkc01o="; + src = fetchFromGitHub { + owner = "graphite-project"; + repo = pname; + rev = version; + hash = "sha256-2HgCBKwLfxJLKMopoIdsEW5k/j3kNAiifWDnJ98a7Qo="; }; + patches = [ + (fetchpatch { + name = "CVE-2022-4730.CVE-2022-4729.CVE-2022-4728.part-1.patch"; + url = "https://github.com/graphite-project/graphite-web/commit/9c626006eea36a9fd785e8f811359aebc9774970.patch"; + sha256 = "sha256-JMmdhLqsaRhUG2FsH+yPNl+cR7O2YLfKFliL2GU0aAk="; + }) + (fetchpatch { + name = "CVE-2022-4730.CVE-2022-4729.CVE-2022-4728.part-2.patch"; + url = "https://github.com/graphite-project/graphite-web/commit/2f178f490e10efc03cd1d27c72f64ecab224eb23.patch"; + sha256 = "sha256-NL7K5uekf3NlLa58aFFRPJT9ktjqBeNlWC4Htd0fRQ0="; + }) + ]; + propagatedBuildInputs = [ cairocffi django @@ -41,7 +58,6 @@ buildPythonPackage rec { txamqp urllib3 whisper - whitenoise ]; postPatch = '' @@ -59,12 +75,28 @@ buildPythonPackage rec { --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')" ''; + checkInputs = [ mock ]; + checkPhase = '' + runHook preCheck + + pushd webapp/ + # avoid confusion with installed module + rm -r graphite + # redis not practical in test environment + substituteInPlace tests/test_tags.py \ + --replace test_redis_tagdb _dont_test_redis_tagdb + + DJANGO_SETTINGS_MODULE=tests.settings ${python.interpreter} manage.py test + popd + + runHook postCheck + ''; + pythonImportsCheck = [ "graphite" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Enterprise scalable realtime graphing"; homepage = "http://graphiteapp.org/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 22372843bdb0..0d866a29bd28 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, py , pytest-benchmark , pytest-asyncio , pytestCheckHook @@ -21,7 +22,8 @@ buildPythonPackage rec { hash = "sha256-LtBbHA5r6/YNh2gKX0+NqQjrpKuMioyOYWT0R59SIL4="; }; - checkInputs = [ + nativeCheckInputs = [ + py pytest-asyncio pytest-benchmark pytestCheckHook diff --git a/pkgs/development/python-modules/graphql-relay/default.nix b/pkgs/development/python-modules/graphql-relay/default.nix index 435f1f5d8d0f..401214bc1c57 100644 --- a/pkgs/development/python-modules/graphql-relay/default.nix +++ b/pkgs/development/python-modules/graphql-relay/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-describe pytestCheckHook diff --git a/pkgs/development/python-modules/graphql-server-core/default.nix b/pkgs/development/python-modules/graphql-server-core/default.nix index 2ba45e099673..37c2893908c8 100644 --- a/pkgs/development/python-modules/graphql-server-core/default.nix +++ b/pkgs/development/python-modules/graphql-server-core/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { # fail with: cannot import name 'format_error' from 'graphql' doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/graphtage/default.nix b/pkgs/development/python-modules/graphtage/default.nix index a1bec8f3a1f4..53418f486da2 100644 --- a/pkgs/development/python-modules/graphtage/default.nix +++ b/pkgs/development/python-modules/graphtage/default.nix @@ -1,9 +1,8 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib , pytestCheckHook , pythonOlder - # Python dependencies , colorama , intervaltree , json5 @@ -15,16 +14,22 @@ buildPythonPackage rec { pname = "graphtage"; - version = "0.2.6"; + version = "0.2.7"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ZazqtrrCsoeJK7acj7Unpl+ZI2JL/khMN2aOSHdCHl0="; + hash = "sha256-3PJSjK8citdsfTyTLtDOlLeXWhkOW/4ajLC+j8F0BZw="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "json5==0.9.5" "json5>=0.9.5" + ''; + propagatedBuildInputs = [ colorama intervaltree @@ -35,18 +40,18 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "json5==0.9.5" "json5>=0.9.5" - ''; - - pythonImportsCheck = [ "graphtage" ]; + pythonImportsCheck = [ + "graphtage" + ]; meta = with lib; { - homepage = "https://github.com/trailofbits/graphtage"; description = "A utility to diff tree-like files such as JSON and XML"; + homepage = "https://github.com/trailofbits/graphtage"; + changelog = "https://github.com/trailofbits/graphtage/releases/tag/v${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ veehaitch ]; }; diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 1fd0db3a5f70..e83a90729f2c 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { fontDirectories = [ freefont_ttf ]; }; - checkInputs = [ + nativeCheckInputs = [ mock pytest pytest-mock diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index f16ba5fc4c77..7c9eb5ae4bc9 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -15,15 +15,15 @@ buildPythonPackage rec { pname = "graspologic"; - version = "1.0.0"; + version = "2.0.1"; disabled = isPy27; src = fetchFromGitHub { owner = "microsoft"; repo = "graspologic"; - rev = "v${version}"; - sha256 = "sha256-mzJ3eFo77gnOh/Vs9u68yFDZW3ilXtcCCwKahKyRRmc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-EmbCA4JpY2OIwXrRWjBxA4iNm0ddQODjoGmHIYgvAWs="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { seaborn ]; - checkInputs = [ pytestCheckHook pytest-cov ]; + nativeCheckInputs = [ pytestCheckHook pytest-cov ]; pytestFlagsArray = [ "tests" "--ignore=docs" "--ignore=tests/test_sklearn.py" ]; disabledTests = [ "gridplot_outputs" ]; diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index c2da89dc6c44..0cdf472be099 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "1.3.0"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = "refs/tags/v${version}"; - hash = "sha256-4kR3Hc5M4FDG/WFtIW20a9d0vwLzmqtrlhd+teMiejA="; + hash = "sha256-UBkfe4d+K+730TbvModZF1ET7uxMpQGxOkq0PF/WiWc="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { pycryptodome ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/greeneye-monitor/default.nix b/pkgs/development/python-modules/greeneye-monitor/default.nix index 76da49a9ee6d..40b1b68fef4d 100644 --- a/pkgs/development/python-modules/greeneye-monitor/default.nix +++ b/pkgs/development/python-modules/greeneye-monitor/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { siobrultech-protocols ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 12f3044f0680..bd33f3c096c8 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -2,23 +2,30 @@ , buildPythonPackage , fetchPypi , isPyPy -, unittestCheckHook +, objgraph +, psutil +, pytestCheckHook }: buildPythonPackage rec { pname = "greenlet"; - version = "1.1.3"; + version = "2.0.1"; + format = "setuptools"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - sha256 = "sha256-vLbG3R1r5tONbbKDdH0H/aCJ/4xVmoNSNlYKRBA0BFU="; + hash = "sha256-QuYCVkRg2g6O5ny21yNjY+5eExqhWUO2Zw5E5cLtD2c="; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ + objgraph + psutil + pytestCheckHook + ]; - unittestFlagsArray = [ "-v" "greenlet.tests" ]; + doCheck = false; # installed tests need to be executed, not sure how to accomplish that meta = with lib; { homepage = "https://github.com/python-greenlet/greenlet"; diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix index 2248bc806b06..efa1021323d8 100644 --- a/pkgs/development/python-modules/gremlinpython/default.nix +++ b/pkgs/development/python-modules/gremlinpython/default.nix @@ -6,7 +6,6 @@ , importlib-metadata , isodate , nest-asyncio -, six , pytestCheckHook , mock , pyhamcrest @@ -31,22 +30,23 @@ buildPythonPackage rec { sed -i '/pytest-runner/d' setup.py substituteInPlace setup.py \ - --replace 'aiohttp>=3.8.0,<=3.8.1' 'aiohttp' + --replace 'aiohttp>=3.8.0,<=3.8.1' 'aiohttp' \ + --replace 'importlib-metadata<5.0.0' 'importlib-metadata' ''; # setup-requires requirements nativeBuildInputs = [ importlib-metadata ]; + propagatedBuildInputs = [ aenum aiohttp isodate nest-asyncio - six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock pyhamcrest diff --git a/pkgs/development/python-modules/gridnet/default.nix b/pkgs/development/python-modules/gridnet/default.nix index 5c55b8c6c55f..2d4fbf506408 100644 --- a/pkgs/development/python-modules/gridnet/default.nix +++ b/pkgs/development/python-modules/gridnet/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 6b737e883479..692b2fe6d8e6 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.24.0"; + version = "0.25.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mkdocstrings"; repo = pname; - rev = version; - hash = "sha256-Gcht9pmh15dvSHRsG9y82l4HoJ7l/gxbmrRh7Jow2Bs="; + rev = "refs/tags/${version}"; + hash = "sha256-AZZhwHtVhdHkztzr/Hdi63VC5CjK2Vz8h8zizmSUdNY="; }; postPatch = '' @@ -41,7 +41,7 @@ buildPythonPackage rec { cached-property ]; - checkInputs = [ + nativeCheckInputs = [ git pytestCheckHook ]; @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Signatures for entire Python programs"; homepage = "https://github.com/mkdocstrings/griffe"; + changelog = "https://github.com/mkdocstrings/griffe/blob/${version}/CHANGELOG.md"; license = licenses.isc; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix index eab4b45547c1..fd22e420fdbd 100644 --- a/pkgs/development/python-modules/grip/default.nix +++ b/pkgs/development/python-modules/grip/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "sha256-CHL2dy0H/i0pLo653F7aUHFvZHTeZA6jC/rwn1KrEW4="; }; - checkInputs = [ pytest responses ]; + nativeCheckInputs = [ pytest responses ]; propagatedBuildInputs = [ docopt flask markdown path-and-address pygments requests tabulate ]; diff --git a/pkgs/development/python-modules/groestlcoin_hash/default.nix b/pkgs/development/python-modules/groestlcoin_hash/default.nix index 859573d1ca53..477ff19e33ab 100644 --- a/pkgs/development/python-modules/groestlcoin_hash/default.nix +++ b/pkgs/development/python-modules/groestlcoin_hash/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Bindings for groestl key derivation function library used in Groestlcoin"; homepage = "https://pypi.org/project/groestlcoin_hash/"; maintainers = with maintainers; [ gruve-p ]; - license = licenses.unfree; + license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix index 03a43a92eecf..1c7e12fab2e7 100644 --- a/pkgs/development/python-modules/growattserver/default.nix +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "growattserver"; - version = "1.2.4"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "indykoning"; repo = "PyPi_GrowattServer"; rev = "refs/tags/${version}"; - hash = "sha256-HZsgha7CAjJYDDBlh2Ib24glUiMAXpNR8KsSdm78BA8="; + hash = "sha256-V0EW3I0FIDx9urbxX/zh3A51B/BiDqUfsrKbKU9FKiE="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to retrieve information from Growatt units"; homepage = "https://github.com/indykoning/PyPi_GrowattServer"; + changelog = "https://github.com/indykoning/PyPi_GrowattServer/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index 0f659c0a14e2..022d677cf516 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.50.0"; + version = "1.51.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "69be81c4317ec77983fb0eab80221a01e86e833e0fcf2f6acea0a62597c84b93"; + sha256 = "ac2617a3095935ebd785e2228958f24b10a0d527a0c9eb5a0863c784f648a816"; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 1fbdc3973799..82e9315aec9a 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,12 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.50.0"; + version = "1.51.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "88b75f2afd889c7c6939f58d76b58ab84de4723c7de882a1f8448af6632e256f"; + sha256 = "8e62d23d3fed9d4f81738f98dd193dbd2e21aed4a8f0dd715e75b5439e649727"; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpclib/default.nix b/pkgs/development/python-modules/grpclib/default.nix index 1eb93ece6d6c..d6c1a6f50a81 100644 --- a/pkgs/development/python-modules/grpclib/default.nix +++ b/pkgs/development/python-modules/grpclib/default.nix @@ -31,7 +31,7 @@ buildPythonPackage { multidict ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio async-timeout diff --git a/pkgs/development/python-modules/gruut-ipa/default.nix b/pkgs/development/python-modules/gruut-ipa/default.nix index 2b8ed6709ac5..18a1a2c952a0 100644 --- a/pkgs/development/python-modules/gruut-ipa/default.nix +++ b/pkgs/development/python-modules/gruut-ipa/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "gruut_ipa" diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix index f36c9daa12d8..0038a85a3cbb 100644 --- a/pkgs/development/python-modules/gruut/default.nix +++ b/pkgs/development/python-modules/gruut/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , callPackage -, pythonOlder , fetchFromGitHub , babel , gruut-ipa @@ -9,7 +8,6 @@ , jsonlines , num2words , python-crfsuite -, dataclasses , python , networkx , glibcLocales @@ -61,13 +59,11 @@ buildPythonPackage rec { python-crfsuite dateparser networkx - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses ] ++ (map (lang: callPackage ./language-pack.nix { inherit lang version format src; }) langPkgs); - checkInputs = [ glibcLocales pytestCheckHook ]; + nativeCheckInputs = [ glibcLocales pytestCheckHook ]; disabledTests = [ # https://github.com/rhasspy/gruut/issues/25 diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index ab64a78c103f..076f08dc7a56 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "gsd"; - version = "2.6.1"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vQutfkSilfgRHuu/THWMG6bmkT1eKlAAniQM4DP8mqI="; + hash = "sha256-drzmlHfU2ut3o7JASvFbEcf6OVtWa8kAyzpeDV5iGlc="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "General simulation data file format"; homepage = "https://github.com/glotzerlab/gsd"; + changelog = "https://github.com/glotzerlab/gsd/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd2; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 35133847139c..c38746299c5d 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "gspread"; - version = "5.7.1"; + version = "5.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XznXohg0O2UU8G4iUODEE+tOgU3eaqv0hdrLaqMcqrA="; + hash = "sha256-znb5wWuIzLeSNQFCIkpZr6jmn3Rj89NBcUjL6JLvx8s="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Spreadsheets client library"; homepage = "https://github.com/burnash/gspread"; + changelog = "https://github.com/burnash/gspread/blob/v${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index f703820a4f5c..8bc82046f812 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -6,7 +6,7 @@ , six , decorator , nose -, krb5Full +, krb5 , GSS , parameterized , shouldbe @@ -17,25 +17,25 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.7.3"; + version = "1.8.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; - rev = "v${version}"; - sha256 = "sha256-/1YOnG6sCP8G8J3K2/RycTC95rXW9M+U3Mjz4GCt13s="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-qz4EWAO++yq72/AGwyNOtH/fTRSFbiCo/K98htROUxI="; }; # It's used to locate headers postPatch = '' substituteInPlace setup.py \ - --replace 'get_output(f"{kc} gssapi --prefix")' '"${lib.getDev krb5Full}"' + --replace 'get_output(f"{kc} gssapi --prefix")' '"${lib.getDev krb5}"' ''; nativeBuildInputs = [ cython - krb5Full + krb5 ]; propagatedBuildInputs = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { GSS ]; - checkInputs = [ + nativeCheckInputs = [ k5test nose parameterized diff --git a/pkgs/development/python-modules/gtts-token/default.nix b/pkgs/development/python-modules/gtts-token/default.nix index f3325aab8e6e..7785a449d4e8 100644 --- a/pkgs/development/python-modules/gtts-token/default.nix +++ b/pkgs/development/python-modules/gtts-token/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # requires internet access disabledTests = [ "test_real" ]; diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix index 3e3fabddf319..09c317d6a89a 100644 --- a/pkgs/development/python-modules/gtts/default.nix +++ b/pkgs/development/python-modules/gtts/default.nix @@ -15,13 +15,14 @@ buildPythonPackage rec { pname = "gtts"; - version = "2.2.4"; + version = "2.3.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; - rev = "v${version}"; - sha256 = "sha256-hQnFHi85Rifco0afLF8kKNOy9oPxKoupfmdm+fht6Cg="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-dbIcx6U5TIy3CteUGrZqcWqOJoZD2HILaJmKDY+j/II="; }; propagatedBuildInputs = [ @@ -34,7 +35,7 @@ buildPythonPackage rec { twine ]; - checkInputs = [ pytest mock testfixtures ]; + nativeCheckInputs = [ pytest mock testfixtures ]; # majority of tests just try to call out to Google's Translate API endpoint doCheck = false; diff --git a/pkgs/development/python-modules/gudhi/default.nix b/pkgs/development/python-modules/gudhi/default.nix index 03b26927cf35..392d6f9e8ceb 100644 --- a/pkgs/development/python-modules/gudhi/default.nix +++ b/pkgs/development/python-modules/gudhi/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { buildInputs = [ boost eigen gmp cgal_5 mpfr ] ++ lib.optionals enableTBB [ tbb ]; propagatedBuildInputs = [ numpy scipy ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index 8b85a488512a..824cb8f1ae5a 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -6,6 +6,7 @@ , rebulk , pythonOlder , importlib-resources +, py , pytestCheckHook , pytest-mock , pytest-benchmark @@ -14,11 +15,12 @@ buildPythonPackage rec { pname = "guessit"; - version = "3.4.3"; + version = "3.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "731e96e6a1f3b065d05accc8c19f35d4485d880b77ab8dc4b262cc353df294f7"; + hash = "sha256-eiaeOlfMBz5htWJZiT6rPFwC0a2Ky8iuLnjF6DnxELw="; }; propagatedBuildInputs = [ @@ -27,7 +29,7 @@ buildPythonPackage rec { python-dateutil ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - checkInputs = [ pytestCheckHook pytest-mock pytest-benchmark pyyaml ]; + nativeCheckInputs = [ py pytestCheckHook pytest-mock pytest-benchmark pyyaml ]; pytestFlagsArray = [ "--benchmark-disable" ]; diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix index 601aecdf331c..41c0d2352c88 100644 --- a/pkgs/development/python-modules/gumath/default.nix +++ b/pkgs/development/python-modules/gumath/default.nix @@ -16,7 +16,7 @@ buildPythonPackage { disabled = isPy27; inherit (libgumath) src version meta; - checkInputs = [ numba ]; + nativeCheckInputs = [ numba ]; propagatedBuildInputs = [ ndtypes xnd ]; postPatch = '' diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 72852ae1f12c..d41b45a479f4 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ eventlet gevent pytestCheckHook diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix index 7760346f9dba..c170bc3da3c5 100644 --- a/pkgs/development/python-modules/gvm-tools/default.nix +++ b/pkgs/development/python-modules/gvm-tools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "22.9.0"; + version = "23.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "greenbone"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-I+fnVRxkv8MjPOBElRZv2aigAOA0gGm5xoK+bFohfZA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-TwGeLEfP69ZK/fkhS0sB6aPh8aDjg6Tri2mUUzk4jbk="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { python-gvm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 44fbdc040123..ad19991140ba 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openai"; repo = pname; - rev = "${version}"; + rev = "refs/tags/${version}"; sha256 = "sha256-uJgm8l1SxIRC5PV6BIH/ht/1ucGT5UaUhkFMdusejgA="; }; diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix index 98dd8eef6cbd..e82ca2baaf3b 100644 --- a/pkgs/development/python-modules/h11/default.nix +++ b/pkgs/development/python-modules/h11/default.nix @@ -3,23 +3,30 @@ , fetchPypi , pytestCheckHook , pythonOlder +, httpcore +, httpx +, wsproto }: buildPythonPackage rec { pname = "h11"; - version = "0.13.0"; + version = "0.14.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cIE8ETUIeiSKTTjMDhoBgf+rIYgUGpPq9WeUDDlX/wY="; + sha256 = "sha256-jxn7vpnnJCD/NcALJ6NMuZN+kCqLgQ4siDAMbwo7aZ0="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; + passthru.tests = { + inherit httpcore httpx wsproto; + }; + meta = with lib; { description = "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1"; homepage = "https://github.com/python-hyper/h11"; diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index 97ccb7b91206..c69fec2564b1 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch , hpack , hyperframe , pytestCheckHook @@ -20,16 +21,30 @@ buildPythonPackage rec { sha256 = "sha256-qDrKCPvnqst5/seIycC6yTY0NWDtnsGLgqE6EsKNKrs="; }; + patches = [ + # https://github.com/python-hyper/h2/pull/1274 + (fetchpatch { + name = "fix-tests-in-python-3.11.patch"; + url = "https://github.com/python-hyper/h2/commit/8952c91606cd014720ccf202a25b5ee1fbed1591.patch"; + hash = "sha256-skAdAVHMZo1xJEqqKa6FOKPvoQQbGUgGsQjE11jIjtw="; + }) + ]; + propagatedBuildInputs = [ hpack hyperframe ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis ]; + disabledTests = [ + # timing sensitive + "test_changing_max_frame_size" + ]; + pythonImportsCheck = [ "h2.connection" "h2.config" diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix index e638997be79e..0296046a5200 100644 --- a/pkgs/development/python-modules/h3/default.nix +++ b/pkgs/development/python-modules/h3/default.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "h3"; - version = "3.7.4"; + version = "3.7.6"; # pypi version does not include tests src = fetchFromGitHub { owner = "uber"; repo = "h3-py"; rev = "refs/tags/v${version}"; - sha256 = "sha256-/DtQD2M+5kBn1RxAOobVqtu32+1cxN8lZSuGH613Bwc="; + sha256 = "sha256-QNiuiHJ4IMxpi39iobPSSlYUUj5oxpxO4B2+HXVQ/Zk="; }; dontConfigure = true; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; nativeBuildInputs = [ scikit-build cmake cython diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index cf4b9671b731..55fb49b1ccb5 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "h5netcdf"; - version = "1.0.2"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-iAih4JXwEitPtAjMmMYK3zmb1X/vSNHKfN9M2h0Ka0o="; + hash = "sha256-kyw7Vzvtc3Dr/J6ALNYPGk2lI277EbNu7/iXMk12v1Y="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { h5py ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook netcdf4 ]; @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "netCDF4 via h5py"; homepage = "https://github.com/shoyer/h5netcdf"; + changelog = "https://github.com/h5netcdf/h5netcdf/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index cd78af010aae..c956d139942b 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -1,6 +1,17 @@ -{ lib, fetchPypi, isPy27, buildPythonPackage, pythonOlder -, numpy, hdf5, cython, six, pkgconfig, unittest2 -, mpi4py ? null, openssh, pytestCheckHook, cached-property }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, setuptools +, numpy +, hdf5 +, cython +, pkgconfig +, mpi4py ? null +, openssh +, pytestCheckHook +, cached-property +}: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; @@ -10,7 +21,9 @@ let in buildPythonPackage rec { version = "3.7.0"; pname = "h5py"; - disabled = isPy27; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -35,16 +48,23 @@ in buildPythonPackage rec { preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; - # tests now require pytest-mpi, which isn't available and difficult to package - doCheck = false; - checkInputs = lib.optional isPy27 unittest2 ++ [ pytestCheckHook openssh ]; - nativeBuildInputs = [ pkgconfig cython ]; + nativeBuildInputs = [ + cython + pkgconfig + setuptools + ]; + buildInputs = [ hdf5 ] ++ lib.optional mpiSupport mpi; - propagatedBuildInputs = [ numpy six] + + propagatedBuildInputs = [ numpy ] ++ lib.optionals mpiSupport [ mpi4py openssh ] ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; + # tests now require pytest-mpi, which isn't available and difficult to package + doCheck = false; + nativeCheckInputs = [ pytestCheckHook openssh ]; + pythonImportsCheck = [ "h5py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ha-philipsjs/default.nix b/pkgs/development/python-modules/ha-philipsjs/default.nix index f8aecee9a67c..3d8ff39af14b 100644 --- a/pkgs/development/python-modules/ha-philipsjs/default.nix +++ b/pkgs/development/python-modules/ha-philipsjs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ha-philipsjs"; - version = "2.9.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "danielperna84"; repo = pname; - rev = version; - sha256 = "sha256-B2AQoVyoG6wyE9pTWf/ASQd8iZfIrjUr078rSkoARf0="; + rev = "refs/tags/${version}"; + hash = "sha256-iJxu+TdgDHMnLuNTFj0UC8V76x3nAgGqswMLDSgmDmQ="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { httpx ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytest-mock pytestCheckHook @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to interact with Philips TVs with jointSPACE API"; homepage = "https://github.com/danielperna84/ha-philipsjs"; + changelog = "https://github.com/danielperna84/ha-philipsjs/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index 0c8c724426ad..8bdfe84d9b6c 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook vcrpy ]; diff --git a/pkgs/development/python-modules/habitipy/default.nix b/pkgs/development/python-modules/habitipy/default.nix index d20c89e82e79..db4e84d13615 100644 --- a/pkgs/development/python-modules/habitipy/default.nix +++ b/pkgs/development/python-modules/habitipy/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis nose responses diff --git a/pkgs/development/python-modules/hachoir/default.nix b/pkgs/development/python-modules/hachoir/default.nix index c7d4178e3bf9..0de262ab7b43 100644 --- a/pkgs/development/python-modules/hachoir/default.nix +++ b/pkgs/development/python-modules/hachoir/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hachoir"; - version = "3.1.3"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,15 +16,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vstinner"; repo = pname; - rev = version; - hash = "sha256-HlxDwkU0GccO+IUzbtVpLbsAo+Mcacm4/WrXWCsmpBg="; + rev = "refs/tags/${version}"; + hash = "sha256-BRrb6bnPSDVjZF1cOA9NlUYd2HrtqZEAVhHgkjmE0Xg="; }; propagatedBuildInputs = [ urwid ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to view and edit a binary stream"; homepage = "https://hachoir.readthedocs.io/"; + changelog = "https://github.com/vstinner/hachoir/blob/${version}/doc/changelog.rst"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/hacking/default.nix b/pkgs/development/python-modules/hacking/default.nix index faa967d0ce4f..5f516175ea23 100644 --- a/pkgs/development/python-modules/hacking/default.nix +++ b/pkgs/development/python-modules/hacking/default.nix @@ -10,16 +10,15 @@ buildPythonPackage rec { pname = "hacking"; - version = "4.1.0"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0fg19rlcky3n1y1ri61xyjp7534yzf8r102z9dw3zqg93f4kj20m"; + sha256 = "sha256-qzWyCK8/FHpvlZUnMxw4gK5BrCHMzra/1oqE9OtW4CY="; }; postPatch = '' - substituteInPlace requirements.txt \ - --replace "flake8<3.9.0,>=3.8.0" "flake8" + sed -i 's/flake8.*/flake8/' requirements.txt substituteInPlace hacking/checks/python23.py \ --replace 'H236: class Foo(object):\n __metaclass__ = \' 'Okay: class Foo(object):\n __metaclass__ = \' substituteInPlace hacking/checks/except_checks.py \ @@ -32,7 +31,7 @@ buildPythonPackage rec { flake8 ]; - checkInputs = [ + nativeCheckInputs = [ ddt stestr testscenarios diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index d4e0fabc6073..6b93a99a3a27 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.11.2"; + version = "2023.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-m28UDaBk2EFwulkjvuT6zpLEeVL/oofHUVSop+AKYvc="; + sha256 = "sha256-kTWUwHgcq+J3ok43gpXmsxmKTnrjPMzmowSkm404j4Q="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { voluptuous ]; - checkInputs = [ + nativeCheckInputs = [ pydevccu pytest-aiohttp pytestCheckHook @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to interact with HomeMatic devices"; homepage = "https://github.com/danielperna84/hahomematic"; + changelog = "https://github.com/danielperna84/hahomematic/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/hangups/default.nix b/pkgs/development/python-modules/hangups/default.nix index 9782a89114a9..aa61baa1b489 100644 --- a/pkgs/development/python-modules/hangups/default.nix +++ b/pkgs/development/python-modules/hangups/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { mechanicalsoup ]; - checkInputs = [ + nativeCheckInputs = [ httpretty pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index 6756aae4d372..c198103f6310 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -16,15 +16,16 @@ buildPythonPackage rec { pname = "hap-python"; - version = "4.5.0"; + version = "4.6.0"; format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; rev = "refs/tags/v${version}"; - sha256 = "sha256-/XJvCL9hMIrOUwGPcrvSrJ6SZ/E6BQy+isFFlAniIM4="; + hash = "sha256-fAJB1gk8zTS/mW5KzWr3z26qctZc/EQlk//WM1Xwpl0="; }; propagatedBuildInputs = [ @@ -40,7 +41,7 @@ buildPythonPackage rec { pyqrcode ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-timeout pytestCheckHook @@ -64,11 +65,14 @@ buildPythonPackage rec { "test_migration_to_include_client_properties" ]; - pythonImportsCheck = [ "pyhap" ]; + pythonImportsCheck = [ + "pyhap" + ]; meta = with lib; { + description = "HomeKit Accessory Protocol implementation"; homepage = "https://github.com/ikalchev/HAP-python"; - description = "HomeKit Accessory Protocol implementation in python"; + changelog = "https://github.com/ikalchev/HAP-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ oro ]; }; diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index a1c07368c0de..b3fe9e7cb59e 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -15,19 +15,18 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.56.0"; + version = "0.61.0"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "sha256-IgDOugHr4fCD9o3QQY5w/ibjak/d56R31KgQAbjUkkI="; + sha256 = "sha256-KG2eCwGZWVtepJQdsSwFziWsT1AbV6rYWRIO/I/CR8g="; }; postPatch = '' substituteInPlace setup.py \ --replace "acme==" "acme>=" \ - --replace "cryptography>=2.8,<38.0" "cryptography" \ --replace "pycognito==" "pycognito>=" \ --replace "snitun==" "snitun>=" \ ''; @@ -44,7 +43,7 @@ buildPythonPackage rec { doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-aiohttp pytestCheckHook diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix new file mode 100644 index 000000000000..c8949968536c --- /dev/null +++ b/pkgs/development/python-modules/hassil/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchPypi + +# build +, antlr4 + +# propagates +, antlr4-python3-runtime +, dataclasses-json +, pyyaml + +# tests +, pytestCheckHook +}: + +let + pname = "hassil"; + version = "0.2.6"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-KbzGZLW+HrG4meOa0mVTh3jmt43gRxl9yN9asWMDxiY="; + }; + + nativeBuildInputs = [ + antlr4 + ]; + + postPatch = '' + sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements.txt + rm hassil/grammar/*.{tokens,interp} + antlr -Dlanguage=Python3 -visitor -o hassil/grammar/ *.g4 + ''; + + propagatedBuildInputs = [ + antlr4-python3-runtime + dataclasses-json + pyyaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/home-assistant/hassil/releases/tag/v${version}"; + description = "Intent parsing for Home Assistant"; + homepage = "https://github.com/home-assistant/hassil"; + license = licenses.asl20; + maintainers = teams.home-assistant.members; + }; +} diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index d5101e7ba666..0d7e6a037ed7 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.6.1"; + version = "0.6.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8B3xdSvvxmbjpPk6aWHQTraf2J1oCBvP0/UxTxaN0jY="; + hash = "sha256-aGCAQAZb8mChe/N43h6O21mhiPPm3XPM56cGqScWlxE="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to help parse and construct Tasmota MQTT messages"; homepage = "https://github.com/emontnemery/hatasmota"; + changelog = "https://github.com/emontnemery/hatasmota/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix index 4d1ba69c93df..16bbe3092dac 100644 --- a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix +++ b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ build pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix new file mode 100644 index 000000000000..d49c2aedb46f --- /dev/null +++ b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, hatch +, pytest-mock +, pytestCheckHook +, tomli +, twine +}: + +buildPythonPackage rec { + pname = "hatch-jupyter-builder"; + version = "0.8.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jupyterlab"; + repo = "hatch-jupyter-builder"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ns5jrVfTAA7NuvUok3/13nIpXSSVZ6WRkgHyTuxkSKA="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + nativeCheckInputs = [ + hatch + pytest-mock + pytestCheckHook + tomli + twine + ]; + + disabledTests = [ + # tests pip install, which unsuprisingly fails + "test_hatch_build" + ]; + + meta = with lib; { + changelog = "https://github.com/jupyterlab/hatch-jupyter-builder/releases/tag/v${version}"; + description = "hatch plugin to help build Jupyter packages"; + homepage = "https://github.com/jupyterlab/hatch-jupyter-builder"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/hatch-nodejs-version/default.nix b/pkgs/development/python-modules/hatch-nodejs-version/default.nix index 6095b696ad78..da991314cabd 100644 --- a/pkgs/development/python-modules/hatch-nodejs-version/default.nix +++ b/pkgs/development/python-modules/hatch-nodejs-version/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatch-nodejs-version"; - version = "0.3.0"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,15 +16,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "agoose77"; repo = "hatch-nodejs-version"; - rev = "v${version}"; - sha256 = "sha256-TBvqXjka8poQ8xxQ/H1hFYRLqnP1024uan1d9b95ags="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-txF392XiRqHndTEYw6QVk12Oqw9E6cOwF81hUyp2oh4="; }; propagatedBuildInputs = [ hatchling ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hatch-requirements-txt/default.nix b/pkgs/development/python-modules/hatch-requirements-txt/default.nix new file mode 100644 index 000000000000..b68506ecd352 --- /dev/null +++ b/pkgs/development/python-modules/hatch-requirements-txt/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatch +, hatchling +, packaging +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "hatch-requirements-txt"; + version = "0.3.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "repo-helper"; + repo = "hatch-requirements-txt"; + rev = "refs/tags/v${version}"; + hash = "sha256-Gyt5Fs8uqVe0cOKtxFeg1n1WMyeK5Iokh71ynb2i5cM="; + }; + + nativeBuildInputs = [ + hatch + ]; + + propagatedBuildInputs = [ + hatchling + packaging + ]; + + doCheck = false; # missing coincidence dependency + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/repo-helper/hatch-requirements-txt/releases/tag/${version}"; + description = "Hatchling plugin to read project dependencies from requirements.txt"; + homepage = "https://github.com/repo-helper/hatch-requirements-txt"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} + diff --git a/pkgs/development/python-modules/hatch-vcs/default.nix b/pkgs/development/python-modules/hatch-vcs/default.nix index 4f5c1f9bf3e6..6ccdfccfe0ec 100644 --- a/pkgs/development/python-modules/hatch-vcs/default.nix +++ b/pkgs/development/python-modules/hatch-vcs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "hatch-vcs"; - version = "0.2.0"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "hatch_vcs"; inherit version; - sha256 = "sha256-mRPXM7NO7JuwNF0GJsoyFlpK0t4V0c5kPDbQnKkIq/8="; + sha256 = "sha256-zsUQfPzkgsZ/i8lvGLvDIMmqDQaBgOFK0xe77loVP+4="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ git pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index 6d948889341d..09b7e4f8b1ed 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -52,7 +52,7 @@ buildPythonPackage { doCheck = false; # listed in /backend/tests/downstream/requirements.txt - checkInputs = [ + nativeCheckInputs = [ build packaging requests diff --git a/pkgs/development/python-modules/haversine/default.nix b/pkgs/development/python-modules/haversine/default.nix index 690f5eb78846..38bd8f54beab 100644 --- a/pkgs/development/python-modules/haversine/default.nix +++ b/pkgs/development/python-modules/haversine/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-iAGG1mjrt6oJ0IkmlJwrvb2Bpk4dNxV7ee9LYov03UY="; }; - checkInputs = [ + nativeCheckInputs = [ numpy pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index c7ded7a7e0a1..e7d1f93a05e9 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.18.1"; + version = "1.18.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nhz9fJEcYyt7rhIe0AkYPgG/mV0r87KUj/mM2A70rPE="; + hash = "sha256-N71bpWOH48SRxbq9PgirkdXwOQzV6IDk3+oZ4haBvJ4="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for the Hetzner Cloud API"; homepage = "https://github.com/hetznercloud/hcloud-python"; + changelog = "https://github.com/hetznercloud/hcloud-python/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ liff ]; }; diff --git a/pkgs/development/python-modules/hcs_utils/default.nix b/pkgs/development/python-modules/hcs_utils/default.nix index 5dd94e5de2ea..4e6931f0e339 100644 --- a/pkgs/development/python-modules/hcs_utils/default.nix +++ b/pkgs/development/python-modules/hcs_utils/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ''; buildInputs = [ six glibcLocales ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; disabled = pythonOlder "3.4"; diff --git a/pkgs/development/python-modules/hdate/default.nix b/pkgs/development/python-modules/hdate/default.nix index 42736d0a04c2..3c45b7ff08d6 100644 --- a/pkgs/development/python-modules/hdate/default.nix +++ b/pkgs/development/python-modules/hdate/default.nix @@ -11,16 +11,23 @@ buildPythonPackage rec { pname = "hdate"; version = "0.10.4"; - disabled = pythonOlder "3.6"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "py-libhdate"; repo = "py-libhdate"; - rev = "v${version}"; - sha256 = "sha256-NF2ZA9ruW7sL2tLY11VAtyPRxGg2o5/mpv3ZsH/Zxb8="; + rev = "refs/tags/v${version}"; + hash = "sha256-NF2ZA9ruW7sL2tLY11VAtyPRxGg2o5/mpv3ZsH/Zxb8="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pytz = ">= 2020.0"' 'pytz = "*"' \ + --replace 'astral = {version = "^2.2", python = "^3.6"}' 'astral = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; @@ -30,23 +37,22 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml --replace "^2020.5" ">=2020.5" - ''; - pytestFlagsArray = [ "tests" ]; - pythonImportsCheck = [ "hdate" ]; + pythonImportsCheck = [ + "hdate" + ]; meta = with lib; { description = "Python module for Jewish/Hebrew date and Zmanim"; homepage = "https://github.com/py-libhdate/py-libhdate"; + changelog = "https://github.com/py-libhdate/py-libhdate/releases/tag/v${version}"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index ecea57b8b68a..5de14ba8d230 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { cd hdbscan/tests rm __init__.py ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # known flaky tests: https://github.com/scikit-learn-contrib/hdbscan/issues/420 "test_mem_vec_diff_clusters" diff --git a/pkgs/development/python-modules/hdf5plugin/default.nix b/pkgs/development/python-modules/hdf5plugin/default.nix new file mode 100644 index 000000000000..0716c65f2fb4 --- /dev/null +++ b/pkgs/development/python-modules/hdf5plugin/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, h5py +}: + +buildPythonPackage rec { + pname = "hdf5plugin"; + version = "4.1.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "silx-kit"; + repo = "hdf5plugin"; + rev = "refs/tags/v${version}"; + hash = "sha256-fFR5t8jHOQc6eDNDhDcntibaveGAmI+j/dVte1tdcyk="; + }; + + propagatedBuildInputs = [ + h5py + ]; + + checkPhase = '' + python test/test.py + ''; + pythonImportsCheck = [ + "hdf5plugin" + ]; + + preBuild = '' + mkdir src/hdf5plugin/plugins + ''; + + meta = with lib; { + description = "Additional compression filters for h5py"; + longDescription = '' + hdf5plugin provides HDF5 compression filters and makes them usable from h5py. + Supported encodings: Blosc, Blosc2, BitShuffle, BZip2, FciDecomp, LZ4, SZ, SZ3, Zfp, ZStd + ''; + homepage = "http://www.silx.org/doc/hdf5plugin/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ bhipple ]; + }; + +} diff --git a/pkgs/development/python-modules/hdfs/default.nix b/pkgs/development/python-modules/hdfs/default.nix index 05faf08bc5e4..c00bd18640b6 100644 --- a/pkgs/development/python-modules/hdfs/default.nix +++ b/pkgs/development/python-modules/hdfs/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ docopt requests six ]; - checkInputs = [ fastavro nose pytestCheckHook ]; + nativeCheckInputs = [ fastavro nose pytestCheckHook ]; pythonImportsCheck = [ "hdfs" ]; diff --git a/pkgs/development/python-modules/headerparser/default.nix b/pkgs/development/python-modules/headerparser/default.nix index 3c1fd4fff9d3..550e5e9a4626 100644 --- a/pkgs/development/python-modules/headerparser/default.nix +++ b/pkgs/development/python-modules/headerparser/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/helper/default.nix b/pkgs/development/python-modules/helper/default.nix index 1697c7270397..d1e38dfbab9e 100644 --- a/pkgs/development/python-modules/helper/default.nix +++ b/pkgs/development/python-modules/helper/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ]; diff --git a/pkgs/development/python-modules/hepunits/default.nix b/pkgs/development/python-modules/hepunits/default.nix index c1af541def94..51902da85d57 100644 --- a/pkgs/development/python-modules/hepunits/default.nix +++ b/pkgs/development/python-modules/hepunits/default.nix @@ -1,23 +1,27 @@ { lib , buildPythonPackage , fetchPypi -, setuptools-scm +, hatch-vcs +, hatchling , pytestCheckHook }: buildPythonPackage rec { pname = "hepunits"; - version = "2.2.1"; + version = "2.3.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YJfmlUekg73Az+TRBuRHteuofFUBBg0xLNnWGqniJBQ="; + hash = "sha256-sRdLuk1XW5k5wB80HiTZvb4ODNTMTOLn13aS2hkUXPs="; }; + nativeBuildInputs = [ - setuptools-scm + hatch-vcs + hatchling ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/here-routing/default.nix b/pkgs/development/python-modules/here-routing/default.nix new file mode 100644 index 000000000000..26ed821d85db --- /dev/null +++ b/pkgs/development/python-modules/here-routing/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, aiohttp +, async-timeout +, yarl +, aresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "here-routing"; + version = "0.2.0"; + + disabled = pythonOlder "3.8"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "eifinger"; + repo = "here_routing"; + rev = "v${version}"; + hash = "sha256-IXiYLDrPXc6YT8u0QT6f2GAjBNYhWwzkFxGhmAyiq5s="; + }; + + postPatch = '' + sed -i "/^addopts/d" pyproject.toml + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + async-timeout + yarl + ]; + + nativeCheckInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "here_routing" ]; + + meta = { + changelog = "https://github.com/eifinger/here_routing/blob/${src.rev}/CHANGELOG.md"; + description = "Asynchronous Python client for the HERE Routing V8 API"; + homepage = "https://github.com/eifinger/here_routing"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/here-transit/default.nix b/pkgs/development/python-modules/here-transit/default.nix new file mode 100644 index 000000000000..638f46af434f --- /dev/null +++ b/pkgs/development/python-modules/here-transit/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, aiohttp +, async-timeout +, yarl +, aresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "here-transit"; + version = "1.2.0"; + + disabled = pythonOlder "3.8"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "eifinger"; + repo = "here_transit"; + rev = "v${version}"; + hash = "sha256-C5HZZCmK9ILUUXyx1i/cUggSM3xbOzXiJ13hrT2DWAI="; + }; + + postPatch = '' + sed -i "/^addopts/d" pyproject.toml + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + async-timeout + yarl + ]; + + nativeCheckInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "here_transit" ]; + + meta = { + changelog = "https://github.com/eifinger/here_transit/blob/${src.rev}/CHANGELOG.md"; + description = "Asynchronous Python client for the HERE Routing V8 API"; + homepage = "https://github.com/eifinger/here_transit"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/herepy/default.nix b/pkgs/development/python-modules/herepy/default.nix index 045910d8a1a8..c0c5fb0742f1 100644 --- a/pkgs/development/python-modules/herepy/default.nix +++ b/pkgs/development/python-modules/herepy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix index 4e65f5b91721..8a860daeb253 100644 --- a/pkgs/development/python-modules/heudiconv/default.nix +++ b/pkgs/development/python-modules/heudiconv/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { dcm2niix nibabel pydicom nipype dcmstack etelemetry filelock ]; - checkInputs = [ dcm2niix pytest mock ]; + nativeCheckInputs = [ dcm2niix pytest mock ]; # test_monitor and test_dlad require 'inotify' and 'datalad' respectively, # and these aren't in Nixpkgs diff --git a/pkgs/development/python-modules/hexbytes/default.nix b/pkgs/development/python-modules/hexbytes/default.nix index 563035f50df4..913bc34b06fb 100644 --- a/pkgs/development/python-modules/hexbytes/default.nix +++ b/pkgs/development/python-modules/hexbytes/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-EDFE5MUc+XMwe8BaXkz/DRchAZbS86X+AcShi5rx83M="; }; - checkInputs = [ + nativeCheckInputs = [ eth-utils hypothesis pytestCheckHook diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 831ed1235e72..accbda978f95 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.5.2"; + version = "10.5.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-45FOAQDJgAfhlTF/XBmIfvmMM1X7LUzsHAb7NMQl9Fs="; + sha256 = "sha256-0frkG8HqzC1ZftGDMv4vk47vc9tQWGBQbL4bzFdaCL4="; }; - checkInputs = [ + nativeCheckInputs = [ mercurial ]; diff --git a/pkgs/development/python-modules/hglib/default.nix b/pkgs/development/python-modules/hglib/default.nix index a6ed6b935ad1..9d6a4cece1c0 100644 --- a/pkgs/development/python-modules/hglib/default.nix +++ b/pkgs/development/python-modules/hglib/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' ${python.interpreter} test.py --with-hg "${mercurial}/bin/hg" -v diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index 8d442544fa78..5374a9b6b53d 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ h5py numpy dill ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook scipy pandas astropy ]; diff --git a/pkgs/development/python-modules/hid/default.nix b/pkgs/development/python-modules/hid/default.nix index 5546b71fea0e..32987c877aaf 100644 --- a/pkgs/development/python-modules/hid/default.nix +++ b/pkgs/development/python-modules/hid/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ hidapi ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; postPatch = '' hidapi=${hidapi}/lib/ diff --git a/pkgs/development/python-modules/hijri-converter/default.nix b/pkgs/development/python-modules/hijri-converter/default.nix index ae657fcd06d6..481e90bcbc2b 100644 --- a/pkgs/development/python-modules/hijri-converter/default.nix +++ b/pkgs/development/python-modules/hijri-converter/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-nh2fpMIg9oZ9oquxqWJAZ1rpdKu6lRxoangfTvasIY8="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hikvision/default.nix b/pkgs/development/python-modules/hikvision/default.nix index 274157c9616d..07224c627421 100644 --- a/pkgs/development/python-modules/hikvision/default.nix +++ b/pkgs/development/python-modules/hikvision/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hkdf/default.nix b/pkgs/development/python-modules/hkdf/default.nix index 43e7a8f4ce35..c972104f2c3d 100644 --- a/pkgs/development/python-modules/hkdf/default.nix +++ b/pkgs/development/python-modules/hkdf/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1jhxk5vhxmxxjp3zj526ry521v9inzzl8jqaaf0ma65w6k332ak2"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests diff --git a/pkgs/development/python-modules/hledger-utils/default.nix b/pkgs/development/python-modules/hledger-utils/default.nix new file mode 100644 index 000000000000..58fe5f3e8714 --- /dev/null +++ b/pkgs/development/python-modules/hledger-utils/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, setuptools +, setuptools-scm +, unittestCheckHook +, hledger +, perl +, rich +, pandas +, scipy +, psutil +, matplotlib +, drawilleplot +, asteval +}: + +buildPythonPackage rec { + pname = "hledger-utils"; + version = "1.12.1"; + + format = "pyproject"; + + src = fetchFromGitLab { + owner = "nobodyinperson"; + repo = "hledger-utils"; + rev = "refs/tags/v${version}"; + hash = "sha256-uAFqBNRET3RaWDTyV53onrBs1fjPR4b5rAvg5lweUN0="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + rich + pandas + scipy + psutil + matplotlib + drawilleplot + asteval + ]; + + checkInputs = [ + unittestCheckHook + ]; + + nativeCheckInputs = [ + hledger + perl + ]; + + preCheck = '' + export PATH=$out/bin:$PATH + ''; + + meta = with lib; { + description = "Utilities extending hledger"; + homepage = "https://gitlab.com/nobodyinperson/hledger-utils"; + license = with licenses; [cc0 cc-by-40 gpl3]; + maintainers = with maintainers; [ nobbz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index ea39c4324566..8097cc3b46b4 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { scikit-learn ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hole/default.nix b/pkgs/development/python-modules/hole/default.nix index 3175a8fabb58..37ac10cdfcaf 100644 --- a/pkgs/development/python-modules/hole/default.nix +++ b/pkgs/development/python-modules/hole/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "hole"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yZpzGfB5RTWaRn2DmT+cbSDC0pL16FyUc0Nr/V6TlhU="; + hash = "sha256-zkghLJe1SzN2qOeL23+T2ISjGkuODd9tJA1tO3hw2a0="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for interacting with a Pihole instance."; homepage = "https://github.com/home-assistant-ecosystem/python-hole"; + changelog = "https://github.com/home-assistant-ecosystem/python-hole/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 570c61d186f5..6d98f876bc70 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.17"; + version = "0.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nxa2Dwe+KgPKqj1sqLDWau6JkLcgag0TlM4x+tK0JC4="; + hash = "sha256-6U2dNTb/Gipw1tL1bLBV65qV0LmjpfuBuej5024zN4k="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { korean-lunar-calendar ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -36,9 +36,14 @@ buildPythonPackage rec { "holidays" ]; + disabledTestPaths = [ + "test/test_imports.py" + ]; + meta = with lib; { description = "Generate and work with holidays in Python"; homepage = "https://github.com/dr-prodigy/python-holidays"; + changelog = "https://github.com/dr-prodigy/python-holidays/releases/tag/v.${version}"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 6c5132027c5e..8f109053b5e9 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.15.2"; + version = "1.15.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3sJBf2VACLHXtkWzHs9iHIvvkBaU5MTnJy7/0Yr6Nts="; + hash = "sha256-pFiRzSuPzUCHQs//81HJKPv0zx730fBEQsfYeG7o6ZQ="; }; propagatedBuildInputs = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python data analysis and visualization seamless and simple"; - homepage = "http://www.holoviews.org/"; + homepage = "https://www.holoviews.org/"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index 4b0a9b660cfb..30e147172735 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -2,22 +2,25 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, cython , poetry-core +, setuptools , bleak , pytestCheckHook }: buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.6.0"; + version = "1.9.2"; format = "pyproject"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6w940Yn0WgVC0Rn9OX40+6hO4maPSC7VrT3ARD8CIjQ="; + hash = "sha256-8RGwWx/I6Log7qyGiP+LAWC1GCG2A7UEXnO5fGoTsb4="; }; postPatch = '' @@ -26,7 +29,9 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + cython poetry-core + setuptools ]; propagatedBuildInputs = [ @@ -37,13 +42,13 @@ buildPythonPackage rec { "home_assistant_bluetooth" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Basic bluetooth models used by Home Assistant"; - changelog = "https://github.com/home-assistant-libs/home-assistant-bluetooth/blob/main/CHANGELOG.md"; + changelog = "https://github.com/home-assistant-libs/home-assistant-bluetooth/blob/v${version}/CHANGELOG.md"; homepage = "https://github.com/home-assistant-libs/home-assistant-bluetooth"; license = licenses.asl20; maintainers = teams.home-assistant.members; diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix new file mode 100644 index 000000000000..8807d0877bb8 --- /dev/null +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, dacite +}: + +buildPythonPackage rec { + pname = "home-assistant-chip-clusters"; + version = "2023.1.0"; + format = "wheel"; + + src = fetchPypi { + inherit format version; + pname = "home_assistant_chip_clusters"; + dist = "py3"; + python = "py3"; + hash = "sha256-2UcDu2b3DtijAOUt+eazleoKxEhAgsU3MY/OoEBpLNg="; + }; + + propagatedBuildInputs = [ + dacite + ]; + + pythonImportsCheck = [ + "chip.clusters" + ]; + + doCheck = false; # no tests + + meta = with lib; { + description = "Python-base APIs and tools for CHIP"; + homepage = "https://github.com/home-assistant-libs/chip-wheels"; + license = licenses.asl20; + maintainers = teams.home-assistant.members; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix new file mode 100644 index 000000000000..c5c199f50539 --- /dev/null +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -0,0 +1,93 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder + +# build +, autoPatchelfHook + +# runtime +, openssl_1_1 + +# propagates +, coloredlogs +, construct +, dacite +, rich +, pyyaml +, ipdb +, deprecation +, mobly +, pygobject3 +}: + +buildPythonPackage rec { + pname = "home-assistant-chip-core"; + version = "2023.1.0"; + format = "wheel"; + + disabled = pythonOlder "3.7"; + + src = let + system = { + "aarch64-linux" = { + name = "aarch64"; + hash = "sha256-hNaGE2s/oFFAVCWu50IeeaFTlOSByJJAKvBgX1iDrVE="; + }; + "x86_64-linux" = { + name = "x86_64"; + hash = "sha256-zXxbDGfyFUXuEnaH4a8R4LXH0gfbMCkKPBJJGp77xHM="; + }; + }.${stdenv.system} or (throw "Unsupported system"); + in fetchPypi { + pname = "home_assistant_chip_core"; + inherit version format; + dist = "cp37"; + python = "cp37"; + abi = "abi3"; + platform = "manylinux_2_31_${system.name}"; + hash = system.hash; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + openssl_1_1 + ]; + + propagatedBuildInputs = [ + coloredlogs + construct + dacite + rich + pyyaml + ipdb + deprecation + mobly + pygobject3 + ]; + + pythonImportsCheck = [ + "chip" + "chip.ble" + # https://github.com/project-chip/connectedhomeip/pull/24376 + #"chip.configuration" + "chip.discovery" + "chip.native" + "chip.storage" + ]; + + doCheck = false; # no tests + + meta = with lib; { + description = "Python-base APIs and tools for CHIP"; + homepage = "https://github.com/home-assistant-libs/chip-wheels"; + license = licenses.asl20; + maintainers = teams.home-assistant.members; + platforms = platforms.linux; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index aba7e19b69e0..c929aa197642 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.9"; + version = "1.0.13"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "hahn-th"; repo = "homematicip-rest-api"; rev = "refs/tags/${version}"; - hash = "sha256-pQVSbR4MLbyHQRAoCFOMnOrhuAnGRMyiXm1szHvANuA="; + hash = "sha256-bNVvQbwtef7Q0OBtR/8vsDDPkgGQgzdBC3QyoxLW3Wo="; }; propagatedBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp-wsgi pytest-aiohttp pytest-asyncio @@ -53,6 +53,7 @@ buildPythonPackage rec { # Assert issues with datetime "test_contact_interface_device" "test_dimmer" + "test_external_device" "test_heating_failure_alert_group" "test_heating" "test_humidity_warning_rule_group" @@ -86,6 +87,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for the homematicIP REST API"; homepage = "https://github.com/hahn-th/homematicip-rest-api"; + changelog = "https://github.com/hahn-th/homematicip-rest-api/releases/tag/${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/homepluscontrol/default.nix b/pkgs/development/python-modules/homepluscontrol/default.nix index bc4ddc0e0b56..9d32704815bb 100644 --- a/pkgs/development/python-modules/homepluscontrol/default.nix +++ b/pkgs/development/python-modules/homepluscontrol/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytestCheckHook ]; diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index 7b5c63c95b43..7a4d32374b44 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hpack/default.nix b/pkgs/development/python-modules/hpack/default.nix index 842c6d5f8bfc..6dd6863d3ab4 100644 --- a/pkgs/development/python-modules/hpack/default.nix +++ b/pkgs/development/python-modules/hpack/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-2CehGy3K5fKbkB1J8+8x1D4XvnBn1Mbapx+p8rdXDYc="; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hpccm/default.nix b/pkgs/development/python-modules/hpccm/default.nix index 05a1085a8e18..6c2adca0fefe 100644 --- a/pkgs/development/python-modules/hpccm/default.nix +++ b/pkgs/development/python-modules/hpccm/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six archspec ]; - checkInputs = [ pytestCheckHook pytest-xdist ]; + nativeCheckInputs = [ pytestCheckHook pytest-xdist ]; disabledTests = [ # tests require git diff --git a/pkgs/development/python-modules/hs-dbus-signature/default.nix b/pkgs/development/python-modules/hs-dbus-signature/default.nix index 657a1d8b24a6..ebf8de2f5668 100644 --- a/pkgs/development/python-modules/hs-dbus-signature/default.nix +++ b/pkgs/development/python-modules/hs-dbus-signature/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { hash = "sha256-NNnTcSX+K8zU+sj1QBd13h7aEXN9VqltJMNWCuhgZ6I="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis ]; diff --git a/pkgs/development/python-modules/hsluv/default.nix b/pkgs/development/python-modules/hsluv/default.nix index 00e50e8259d7..385d4718e440 100644 --- a/pkgs/development/python-modules/hsluv/default.nix +++ b/pkgs/development/python-modules/hsluv/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "sha256-p3KD+zhHCOs/rLUVf1IkW/isfpUPQstB2VHGmZ/aEPU="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 0b97ee017479..eacca2b85140 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2022.11.1"; + version = "2023.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -14,8 +14,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; - rev = version; - sha256 = "sha256-4GirKCe84sYV+28ODPipixV3cl7wIV/NOd+iM0Cec4I="; + rev = "refs/tags/${version}"; + hash = "sha256-MF+pRP0KluF7LrSkfxs6ZSEXyqmr51mUqUn01dLdUdQ="; }; # Tests require network connection diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix index 09539b590cb3..4c75a2cbb3f0 100644 --- a/pkgs/development/python-modules/html-sanitizer/default.nix +++ b/pkgs/development/python-modules/html-sanitizer/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { beautifulsoup4 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/html-text/default.nix b/pkgs/development/python-modules/html-text/default.nix index 997cf053a5f7..1368f286cb12 100644 --- a/pkgs/development/python-modules/html-text/default.nix +++ b/pkgs/development/python-modules/html-text/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { lxml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook six ]; diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix index 51b92c8a4f69..95698872a08f 100644 --- a/pkgs/development/python-modules/html2text/default.nix +++ b/pkgs/development/python-modules/html2text/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1y924clp2hiqg3a9437z808p29mqcx537j5fmz71plx8qrcm5jf9"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "html2text" ]; diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix index 58da63d02edd..c6ca6dda2265 100644 --- a/pkgs/development/python-modules/html5lib/default.nix +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { # latest release not compatible with pytest 6 doCheck = false; - checkInputs = [ + nativeCheckInputs = [ mock pytest-expect pytestCheckHook diff --git a/pkgs/development/python-modules/httmock/default.nix b/pkgs/development/python-modules/httmock/default.nix index 7928189c7cd1..22e9b333cc4c 100644 --- a/pkgs/development/python-modules/httmock/default.nix +++ b/pkgs/development/python-modules/httmock/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-yid4vh1do0zqVzd1VV7gc+Du4VPrkeGFsDHqNbHL28I="; }; - checkInputs = [ + nativeCheckInputs = [ requests pytestCheckHook ]; diff --git a/pkgs/development/python-modules/http-ece/default.nix b/pkgs/development/python-modules/http-ece/default.nix index 638191ee7fc4..16f8fa23c328 100644 --- a/pkgs/development/python-modules/http-ece/default.nix +++ b/pkgs/development/python-modules/http-ece/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - checkInputs = [ coverage flake8 mock nose ]; + nativeCheckInputs = [ coverage flake8 mock nose ]; meta = with lib; { description = "Encipher HTTP Messages"; diff --git a/pkgs/development/python-modules/http-message-signatures/default.nix b/pkgs/development/python-modules/http-message-signatures/default.nix index d3e8c70a9b79..d88832f81acd 100644 --- a/pkgs/development/python-modules/http-message-signatures/default.nix +++ b/pkgs/development/python-modules/http-message-signatures/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { http-sfv ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests ]; diff --git a/pkgs/development/python-modules/http-parser/default.nix b/pkgs/development/python-modules/http-parser/default.nix index d0fc242c9896..8f21bc75daa0 100644 --- a/pkgs/development/python-modules/http-parser/default.nix +++ b/pkgs/development/python-modules/http-parser/default.nix @@ -19,15 +19,20 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + cython setuptools ]; + preBuild = '' + # re-run cython + make -B + ''; pythonImportsCheck = [ "http_parser" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index 98c50fd15232..570b75eddc46 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { werkzeug ] ++ raven.optional-dependencies.flask; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 5016ece96f2f..171acd803c55 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "httpcore"; - version = "0.15.0"; + version = "0.16.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,15 +25,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "encode"; repo = pname; - rev = version; - hash = "sha256-FF3Yzac9nkVcA5bHVOz2ymvOelSfJ0K6oU8UWpBDcmo="; + rev = "refs/tags/${version}"; + hash = "sha256-3bC97CTZi6An+owjoJF7Irtr7ONbP8RtNdTIGJRy0Ng="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "h11>=0.11,<0.13" "h11>=0.11,<0.14" - ''; - propagatedBuildInputs = [ anyio certifi @@ -50,7 +45,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pproxy pytest-asyncio pytest-httpbin @@ -63,6 +58,12 @@ buildPythonPackage rec { "httpcore" ]; + preCheck = '' + # remove upstreams pytest flags which cause: + # httpcore.ConnectError: TLS/SSL connection has been closed (EOF) (_ssl.c:997) + rm setup.cfg + ''; + pytestFlagsArray = [ "--asyncio-mode=strict" ]; diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix index 143822de63b9..b226ee1690cd 100644 --- a/pkgs/development/python-modules/httpie/default.nix +++ b/pkgs/development/python-modules/httpie/default.nix @@ -50,10 +50,10 @@ buildPythonPackage rec { requests-toolbelt setuptools rich - pysocks - ]; + ] ++ requests.optional-dependencies.socks; - checkInputs = [ + + nativeCheckInputs = [ pytest-httpbin pytest-lazy-fixture pytest-mock @@ -64,10 +64,9 @@ buildPythonPackage rec { postInstall = '' # install completions - installShellCompletion --bash \ - --name http.bash extras/httpie-completion.bash - installShellCompletion --fish \ - --name http.fish extras/httpie-completion.fish + installShellCompletion --cmd http \ + --bash extras/httpie-completion.bash \ + --fish extras/httpie-completion.fish # convert the docs/README.md file pandoc --standalone -f markdown -t man docs/README.md -o docs/http.1 @@ -91,6 +90,19 @@ buildPythonPackage rec { disabledTests = [ # flaky "test_stdin_read_warning" + # Re-evaluate those tests with the next release + "test_duplicate_keys_support_from_response" + "test_invalid_xml" + "test_json_formatter_with_body_preceded_by_non_json_data" + "test_pretty_options_with_and_without_stream_with_converter" + "test_response_mime_overwrite" + "test_terminal_output_response_charset_detection" + "test_terminal_output_response_charset_override" + "test_terminal_output_response_content_type_charset_with_stream" + "test_terminal_output_response_content_type_charset" + "test_valid_xml" + "test_xml_format_options" + "test_xml_xhtm" ] ++ lib.optionals stdenv.isDarwin [ # flaky "test_daemon_runner" @@ -99,7 +111,8 @@ buildPythonPackage rec { meta = with lib; { description = "A command line HTTP client whose goal is to make CLI human-friendly"; homepage = "https://httpie.org/"; + changelog = "https://github.com/httpie/httpie/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ antono relrod schneefux SuperSandro2000 ]; + maintainers = with maintainers; [ antono relrod schneefux ]; }; } diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 7f331c8edad4..95acab65796e 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -15,21 +15,21 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.20.4"; + version = "0.21.0"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-eLvxmG9PUX+2RB3M6oG442Wmh6c5GI/aKP/Z8Z5Ixq8="; + sha256 = "sha256-1Pl+l28J7crfO2UY/9/D019IzOHWOwjR+UvVEHICTqU="; }; propagatedBuildInputs = [ pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ cryptography mock pytest-forked diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index a47d531e332b..aeab2d9e00a6 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ + nativeCheckInputs = [ sure freezegun pytestCheckHook diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index 74f2f41eb260..ae55a10212f7 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -20,16 +20,16 @@ buildPythonPackage rec { pname = "httpx-socks"; - version = "0.7.4"; + version = "0.7.5"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "romis2012"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-+eWGmCHkXQA+JaEgofqUeFyGyMxSctal+jsqsShFM58="; + sha256 = "sha256-HwLJ2pScgiNmM/l14aKp47MMuGW1qSaIq7ujpCSRtqA="; }; propagatedBuildInputs = [ @@ -39,11 +39,15 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - asyncio = [ async-timeout ]; - trio = [ trio ]; + asyncio = [ + async-timeout + ]; + trio = [ + trio + ]; }; - checkInputs = [ + nativeCheckInputs = [ flask hypercorn pytest-asyncio @@ -66,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Proxy (HTTP, SOCKS) transports for httpx"; homepage = "https://github.com/romis2012/httpx-socks"; + changelog = "https://github.com/romis2012/httpx-socks/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 4085a2e0893f..8384470ef185 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -8,8 +8,11 @@ , click , fetchFromGitHub , h2 +, hatch-fancy-pypi-readme +, hatchling , httpcore , isPyPy +, multipart , pygments , python , pythonOlder @@ -26,8 +29,8 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.23.0"; - format = "setuptools"; + version = "0.23.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -35,9 +38,14 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = version; - hash = "sha256-s11Yeizm3y3w5D6ACQ2wp/KJ0+1ALY/R71IlTP2pMC4="; + hash = "sha256-1gRBHbGFUkaFvVgHHoXfpo9j0L074SyevFwMY202+uk="; }; + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatchling + ]; + propagatedBuildInputs = [ certifi httpcore @@ -67,8 +75,9 @@ buildPythonPackage rec { # trustme uses pyopenssl doCheck = !(stdenv.isDarwin && stdenv.isAarch64); - checkInputs = [ + nativeCheckInputs = [ chardet + multipart pytestCheckHook pytest-asyncio pytest-trio @@ -79,7 +88,7 @@ buildPythonPackage rec { ++ passthru.optional-dependencies.socks; postPatch = '' - substituteInPlace setup.py \ + substituteInPlace pyproject.toml \ --replace "rfc3986[idna2008]>=1.3,<2" "rfc3986>=1.3" ''; @@ -112,6 +121,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = with lib; { + changelog = "https://github.com/encode/httpx/blob/${src.rev}/CHANGELOG.md"; description = "The next generation HTTP client"; homepage = "https://github.com/encode/httpx"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/huawei-lte-api/default.nix b/pkgs/development/python-modules/huawei-lte-api/default.nix index d15381c5608e..237878d240e5 100644 --- a/pkgs/development/python-modules/huawei-lte-api/default.nix +++ b/pkgs/development/python-modules/huawei-lte-api/default.nix @@ -10,30 +10,25 @@ buildPythonPackage rec { pname = "huawei-lte-api"; - version = "1.6.7"; + version = "1.6.11"; format = "setuptools"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Salamek"; repo = "huawei-lte-api"; rev = "refs/tags/${version}"; - hash = "sha256-CMGOR5b8Uc8ZIuMlkCkxZqTqUA/Im2RgXK4uFZdoHeU="; + hash = "sha256-pOBYMSORgT8WOnhCdazuKucjPoOywnrWa+qCYR5qSls="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner" "" - ''; - propagatedBuildInputs = [ pycryptodomex requests xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -46,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "API For huawei LAN/WAN LTE Modems"; homepage = "https://github.com/Salamek/huawei-lte-api"; + changelog = "https://github.com/Salamek/huawei-lte-api/releases/tag/${version}"; license = licenses.lgpl3Only; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix index f19c7a9dd39f..afeb128e2048 100644 --- a/pkgs/development/python-modules/hug/default.nix +++ b/pkgs/development/python-modules/hug/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ falcon requests ]; - checkInputs = [ mock marshmallow pytestCheckHook numpy ]; + nativeCheckInputs = [ mock marshmallow pytestCheckHook numpy ]; postPatch = '' substituteInPlace setup.py --replace '"pytest-runner"' "" diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 2e68555dc738..4d8f02020018 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.11.0"; + version = "0.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-d+X4hGt4K6xmRFw8mevKpZ6RDv+U1PJ8WbmdKGDbVNs="; + hash = "sha256-sUo8B4IbFiIvqWx2UxT3TpHzi2Q2YNW1zrx1Squ2psQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/huisbaasje-client/default.nix b/pkgs/development/python-modules/huisbaasje-client/default.nix index a8db5e2abc93..56e44209676c 100644 --- a/pkgs/development/python-modules/huisbaasje-client/default.nix +++ b/pkgs/development/python-modules/huisbaasje-client/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index f9fccbde0928..33348ff252c7 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -11,8 +11,8 @@ }: buildPythonPackage rec { - version = "4.4.0"; pname = "humanize"; + version = "4.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-humanize"; repo = pname; - rev = version; - hash = "sha256-XxlmOs3sfHOLTkrKGsHRiBWpuCIPJua2VkKxDmjOeWE="; + rev = "refs/tags/${version}"; + hash = "sha256-vTfK45sZ9m7TUQJwZpQWhOXgZzO46CwCsnNP+PI1YfA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -45,7 +45,7 @@ buildPythonPackage rec { cp -r 'src/humanize/locale' "$out/lib/"*'/site-packages/humanize/' ''; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook ]; @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python humanize utilities"; homepage = "https://github.com/python-humanize/humanize"; + changelog = "https://github.com/python-humanize/humanize/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ rmcgibbo Luflosi ]; }; diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index a9e8bd112163..0144040f1c52 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent # segfaults in the testsuite that end up failing the tests in a background thread (in myapp) - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ lib.optionals (!stdenv.isDarwin) [ watchdog diff --git a/pkgs/development/python-modules/huum/default.nix b/pkgs/development/python-modules/huum/default.nix index 0df01749e953..68cba094ab31 100644 --- a/pkgs/development/python-modules/huum/default.nix +++ b/pkgs/development/python-modules/huum/default.nix @@ -1,22 +1,26 @@ { lib , aiohttp , buildPythonPackage -, fetchPypi +, fetchFromGitHub , poetry-core , pydantic +, pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "huum"; - version = "0.6.0"; + version = "0.7.1"; format = "pyproject"; disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-PYOjfLPa/vZZP0IZuUZnQ74IrTRvizgYhKOmhd83aMQ="; + src = fetchFromGitHub { + owner = "frwickst"; + repo = "pyhuum"; + rev = "refs/tags/${version}"; + hash = "sha256-vYHwcEOzxYEBav5YbmWpm+izFlivzu2UIR6hmAXXi0U="; }; nativeBuildInputs = [ @@ -28,17 +32,19 @@ buildPythonPackage rec { pydantic ]; - # Tests are not shipped and source not tagged - # https://github.com/frwickst/pyhuum/issues/2 - doCheck = false; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "huum" ]; meta = with lib; { - description = "Library for for Huum saunas"; + description = "Library for Huum saunas"; homepage = "https://github.com/frwickst/pyhuum"; + changelog = "https://github.com/frwickst/pyhuum/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 14d11af62e3b..16dcf7e54235 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "hvplot"; - version = "0.8.1"; + version = "0.8.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-U93+BnQ8TVkk+x5ZdlW/oU6A/q9XpDi/0oRC02rHwrY="; + hash = "sha256-/q2zlawBoL5fyJFVRSRGwrnEEqmdY+rAKQgxOBY9XBs="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "A high-level plotting API for the PyData ecosystem built on HoloViews"; homepage = "https://hvplot.pyviz.org"; + changelog = "https://github.com/holoviz/hvplot/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index fabe8c3f95df..f87e589eec1b 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "hwi"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "HWI"; rev = version; - sha256 = "sha256-jsJjGezf2JrPYr3YNZGx23Jo14DbmM1S6bu7+xgZh58="; + sha256 = "sha256-mLavlJHYU6gUqqc83uHMZfOglrKDIiRNN7Nf2i3fXzE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix index eab7e4d0638e..7a1bd2356d0f 100644 --- a/pkgs/development/python-modules/hy/default.nix +++ b/pkgs/development/python-modules/hy/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { astor ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hydra-core/antlr4.patch b/pkgs/development/python-modules/hydra-core/antlr4.patch new file mode 100644 index 000000000000..958e128998d1 --- /dev/null +++ b/pkgs/development/python-modules/hydra-core/antlr4.patch @@ -0,0 +1,13 @@ +diff --git a/build_helpers/build_helpers.py b/build_helpers/build_helpers.py +index 7159d22615..73db312bbe 100644 +--- a/build_helpers/build_helpers.py ++++ b/build_helpers/build_helpers.py +@@ -185,7 +185,7 @@ class ANTLRCommand(Command): # type: ignore + command = [ + "java", + "-jar", +- join(root_dir, "bin/antlr-4.9.3-complete.jar"), ++ "@antlr_jar@", + "-Dlanguage=Python3", + "-o", + join(project_root, "hydra/grammar/gen/"), diff --git a/pkgs/development/python-modules/hydra/default.nix b/pkgs/development/python-modules/hydra-core/default.nix similarity index 55% rename from pkgs/development/python-modules/hydra/default.nix rename to pkgs/development/python-modules/hydra-core/default.nix index 82409936d6ab..4cb6f264fb18 100644 --- a/pkgs/development/python-modules/hydra/default.nix +++ b/pkgs/development/python-modules/hydra-core/default.nix @@ -1,41 +1,60 @@ { stdenv , lib -, antlr4_9-python3-runtime +, antlr4 +, antlr4-python3-runtime , buildPythonPackage , fetchFromGitHub , importlib-resources , jre_headless , omegaconf +, packaging , pytestCheckHook , pythonOlder +, substituteAll }: buildPythonPackage rec { - pname = "hydra"; - version = "1.2.0"; + pname = "hydra-core"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "facebookresearch"; - repo = pname; + repo = "hydra"; rev = "refs/tags/v${version}"; - hash = "sha256-4r0ZWW9SGl35Oupf0ejwL/s6Nas6RoSN2egiBrvFZIA="; + hash = "sha256-4FOh1Jr+LM8ffh/xcAqMqKudKbXb2DZdxU+czq2xwxs="; }; + patches = [ + (substituteAll { + src = ./antlr4.patch; + antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar"; + }) + ]; + + postPatch = '' + # We substitute the path to the jar with the one from our antlr4 + # package, so this file becomes unused + rm -v build_helpers/bin/antlr*-complete.jar + + sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements/requirements.txt + ''; + nativeBuildInputs = [ jre_headless ]; propagatedBuildInputs = [ - antlr4_9-python3-runtime + antlr4-python3-runtime omegaconf + packaging ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -52,10 +71,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "hydra" + # See https://github.com/NixOS/nixpkgs/issues/208843 + "hydra.version" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; description = "A framework for configuring complex applications"; homepage = "https://hydra.cc"; license = licenses.mit; diff --git a/pkgs/development/python-modules/hydrawiser/default.nix b/pkgs/development/python-modules/hydrawiser/default.nix index 3dfeff72609f..76239f7876c6 100644 --- a/pkgs/development/python-modules/hydrawiser/default.nix +++ b/pkgs/development/python-modules/hydrawiser/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-cov pytestCheckHook diff --git a/pkgs/development/python-modules/hypercorn/default.nix b/pkgs/development/python-modules/hypercorn/default.nix index 940c31e31882..d8e6936e8dc3 100644 --- a/pkgs/development/python-modules/hypercorn/default.nix +++ b/pkgs/development/python-modules/hypercorn/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ wsproto toml h2 priority ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-trio pytestCheckHook diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix index e22dc0761a78..3673b50bb8a6 100644 --- a/pkgs/development/python-modules/hyperframe/default.nix +++ b/pkgs/development/python-modules/hyperframe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "hyperframe" ]; diff --git a/pkgs/development/python-modules/hyperion-py/default.nix b/pkgs/development/python-modules/hyperion-py/default.nix index ed57ad767b07..50def57aeb18 100644 --- a/pkgs/development/python-modules/hyperion-py/default.nix +++ b/pkgs/development/python-modules/hyperion-py/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-aiohttp pytestCheckHook diff --git a/pkgs/development/python-modules/hypothesis-auto/default.nix b/pkgs/development/python-modules/hypothesis-auto/default.nix index 854f104be758..49638e825823 100644 --- a/pkgs/development/python-modules/hypothesis-auto/default.nix +++ b/pkgs/development/python-modules/hypothesis-auto/default.nix @@ -1,8 +1,9 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , hypothesis -, poetry +, poetry-core , pydantic , pytest , pythonOlder @@ -20,6 +21,14 @@ buildPythonPackage rec { hash = "sha256-XiwvsJ3AmEJRLYBjC7eSNZodM9LARzrUfuI9oL6eMrE="; }; + patches = [ + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/timothycrosley/hypothesis-auto/commit/8277b4232617c0433f80e9c2844452b9fae67a65.patch"; + hash = "sha256-/0z0nphtQnUBiLYhhzLZT59kQgktSugaBg+ePNxy0qI="; + }) + ]; + postPatch = '' # https://github.com/timothycrosley/hypothesis-auto/pull/20 substituteInPlace pyproject.toml \ @@ -28,7 +37,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - poetry + poetry-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 59c758b25aa6..61b4f87a6793 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -9,11 +9,18 @@ , pytest-xdist , sortedcontainers , pythonOlder +, sphinxHook +, sphinx-rtd-theme +, sphinx-hoverxref +, sphinx-codeautolink +# Used to break internal dependency loop. +, enableDocumentation ? true }: buildPythonPackage rec { pname = "hypothesis"; - version = "6.54.5"; + version = "6.61.0"; + outputs = [ "out" ] ++ lib.optional enableDocumentation "doc"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,11 +29,31 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-mr8ctmAzRgWNVpW+PZlOhaQ0l28P0U8PxvjoVjfHX78="; + hash = "sha256-gTcdJaOgP8Nc4fN8UH6+sLedivq5ZNxMRULajFOVnSo="; }; + # I tried to package sphinx-selective-exclude, but it throws + # error about "module 'sphinx' has no attribute 'directives'". + # + # It probably has to do with monkey-patching internals of Sphinx. + # On bright side, this extension does not introduces new commands, + # only changes "::only" command, so we probably okay with stock + # implementation. + # + # I wonder how upstream of "hypothesis" builds documentation. + postPatch = '' + sed -i -e '/sphinx_selective_exclude.eager_only/ d' docs/conf.py + ''; + postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; + nativeBuildInputs = lib.optionals enableDocumentation [ + sphinxHook + sphinx-rtd-theme + sphinx-hoverxref + sphinx-codeautolink + ]; + propagatedBuildInputs = [ attrs sortedcontainers @@ -34,7 +61,7 @@ buildPythonPackage rec { exceptiongroup ]; - checkInputs = [ + nativeCheckInputs = [ pexpect pytest-xdist pytestCheckHook diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index 4bac9c0bb022..eac1d6b4d8d4 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "hypothesmith"; - version = "0.2.0"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922"; + sha256 = "sha256-vc6EXsmE5uP+0h5l0ugrjrxt5cpeuTZJ39dgNMWQakY="; }; patches = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ hypothesis lark libcst ]; - checkInputs = [ parso pytestCheckHook pytest-xdist ]; + nativeCheckInputs = [ parso pytestCheckHook pytest-xdist ]; pytestFlagsArray = [ "-v" @@ -46,6 +46,11 @@ buildPythonPackage rec { "test_source_code_from_libcst_node_type" ]; + disabledTestPaths = [ + # missing blib2to3 + "tests/test_syntactic.py" + ]; + pythonImportsCheck = [ "hypothesmith" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/hypothesmith/remove-black.patch b/pkgs/development/python-modules/hypothesmith/remove-black.patch index 565f350b06b4..d37222ef4b2c 100644 --- a/pkgs/development/python-modules/hypothesmith/remove-black.patch +++ b/pkgs/development/python-modules/hypothesmith/remove-black.patch @@ -1,5 +1,5 @@ diff --git a/tests/test_cst.py b/tests/test_cst.py -index c436183..bdba2d7 100644 +index 8532240..bdba2d7 100644 --- a/tests/test_cst.py +++ b/tests/test_cst.py @@ -3,7 +3,6 @@ import ast @@ -15,11 +15,11 @@ index c436183..bdba2d7 100644 -@pytest.mark.xfail --@example("A\u2592", black.FileMode()) +-@example("A\u2592", black.Mode()) -@given( - source_code=hypothesmith.from_node(), - mode=st.builds( -- black.FileMode, +- black.Mode, - line_length=st.just(88) | st.integers(0, 200), - string_normalization=st.booleans(), - is_pyi=st.booleans(), @@ -39,28 +39,27 @@ index c436183..bdba2d7 100644 def test_from_node_always_compilable(source_code): compile(source_code, "", "exec") diff --git a/tests/test_syntactic.py b/tests/test_syntactic.py -index 7ea42e9..a77ac39 100644 +index 7fe9835..17c4f7c 100644 --- a/tests/test_syntactic.py +++ b/tests/test_syntactic.py -@@ -3,8 +3,6 @@ import ast +@@ -3,7 +3,6 @@ import ast import io import tokenize -import black --import blib2to3 + import blib2to3 import parso import pytest - from hypothesis import example, given, reject, strategies as st -@@ -58,34 +56,6 @@ def test_ast_unparse_from_grammar(source_code): +@@ -58,34 +57,6 @@ def test_ast_unparse_from_grammar(source_code): assert ast.dump(first) == ast.dump(second) --@example("\\", black.FileMode()) --@example("A#\r#", black.FileMode()) +-@example("\\", black.Mode()) +-@example("A#\r#", black.Mode()) -@given( - source_code=hypothesmith.from_grammar(), - mode=st.builds( -- black.FileMode, +- black.Mode, - line_length=st.just(88) | st.integers(0, 200), - string_normalization=st.booleans(), - is_pyi=st.booleans(), diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index de089ba39d2d..3c88fa27092a 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ pytestCheckHook matplotlib seaborn ]; + nativeCheckInputs = [ pytestCheckHook matplotlib seaborn ]; disabledTestPaths = [ "docs" "benchmarks" diff --git a/pkgs/development/python-modules/hyrule/default.nix b/pkgs/development/python-modules/hyrule/default.nix index 8db2e54edc17..a02a110bb281 100644 --- a/pkgs/development/python-modules/hyrule/default.nix +++ b/pkgs/development/python-modules/hyrule/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { hy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix index 340e3618be1a..6c6e7983b7c3 100644 --- a/pkgs/development/python-modules/i-pi/default.nix +++ b/pkgs/development/python-modules/i-pi/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytest mock pytest-mock diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index 3805d501305b..ee3b4252296c 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { fontDirectories = [ ]; }; FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file - checkInputs = [ pytest xdpyinfo pytest-xvfb xorgserver i3 ]; + nativeCheckInputs = [ pytest xdpyinfo pytest-xvfb xorgserver i3 ]; postPatch = '' substituteInPlace test/i3.config \ diff --git a/pkgs/development/python-modules/iaqualink/default.nix b/pkgs/development/python-modules/iaqualink/default.nix index 3838c494cc8c..6e72b5a8519b 100644 --- a/pkgs/development/python-modules/iaqualink/default.nix +++ b/pkgs/development/python-modules/iaqualink/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { httpx ] ++ httpx.optional-dependencies.http2; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook respx ]; diff --git a/pkgs/development/python-modules/ibeacon-ble/default.nix b/pkgs/development/python-modules/ibeacon-ble/default.nix index ba4c156f3a56..7b9910559b4d 100644 --- a/pkgs/development/python-modules/ibeacon-ble/default.nix +++ b/pkgs/development/python-modules/ibeacon-ble/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { mac-vendor-lookup ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 84c1a7e93040..a49f7c684aab 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -91,7 +91,7 @@ buildPythonPackage rec { toolz ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook click filelock 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 c1e70fbf9902..6eb64f79ed32 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.16.0"; + version = "3.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MfWZGWbU0k586EYY0uhHHo2LuhQSmCfgs9Lz50Ds5Hc="; + hash = "sha256-TsM56eE2qCJsr+ZHTaY7Wd/ZjhFqWJXA7Z3O+2MCgPc="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client library for the IBM Cloud services"; homepage = "https://github.com/IBM/python-sdk-core"; + changelog = "https://github.com/IBM/python-sdk-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ globin ]; }; diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index 0de9070fca5d..421167f2395f 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ibm-cloud-sdk-core ]; - checkInputs = [ + nativeCheckInputs = [ responses pytestCheckHook python-dotenv diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index c472048d38e5..1c4d884ee0ee 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -1,9 +1,11 @@ { lib , python-dateutil , buildPythonPackage +, emoji , fetchFromGitHub , freezegun , tzdata +, py , pyparsing , pydantic , pytest-asyncio @@ -15,7 +17,7 @@ buildPythonPackage rec { pname = "ical"; - version = "4.1.1"; + version = "4.2.9"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -24,24 +26,29 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-yPFFOhAscLvhKo7sgXtH1HwcDYq8kWKHzrr3ep857Io="; + hash = "sha256-p1cvs+xLin2WK2zyqQFd1vWKzt+LU2mpDSieOgA7Qf8="; }; propagatedBuildInputs = [ + emoji python-dateutil tzdata pydantic pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ freezegun + py pytest-asyncio pytest-benchmark pytest-golden pytestCheckHook ]; + # https://github.com/allenporter/ical/issues/136 + disabledTests = [ "test_all_zoneinfo" ]; + pythonImportsCheck = [ "ical" ]; diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 5ef8864417d4..9e99b42eab4b 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -1,26 +1,42 @@ { lib , buildPythonPackage -, fetchPypi -, setuptools +, fetchFromGitHub +, pythonOlder +, backports-zoneinfo , python-dateutil , pytz +, hypothesis +, pytest }: buildPythonPackage rec { - version = "4.1.0"; + version = "5.0.4"; pname = "icalendar"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-l0i3wC78xD5Y0GFa4JdqxPJl6Q2t7ptPiE3imQXBs5U="; + src = fetchFromGitHub { + owner = "collective"; + repo = "icalendar"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ch0i6hxEnHV/Xu4PqpRVt30KLOHHgtCAI2W9UyXo15E="; }; - buildInputs = [ setuptools ]; - propagatedBuildInputs = [ python-dateutil pytz ]; + propagatedBuildInputs = [ + python-dateutil + pytz + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + ]; + + nativeCheckInputs = [ + hypothesis + pytest + ]; meta = with lib; { + changelog = "https://github.com/collective/icalendar/blob/v${version}/CHANGES.rst"; description = "A parser/generator of iCalendar files"; - homepage = "https://icalendar.readthedocs.org/"; + homepage = "https://github.com/collective/icalendar"; license = licenses.bsd2; maintainers = with maintainers; [ olcai ]; }; diff --git a/pkgs/development/python-modules/icontract/default.nix b/pkgs/development/python-modules/icontract/default.nix index 192a6db039ad..0a200038032f 100644 --- a/pkgs/development/python-modules/icontract/default.nix +++ b/pkgs/development/python-modules/icontract/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ astor asyncstdlib deal diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix index c62b738b28bd..c50e2caa972b 100644 --- a/pkgs/development/python-modules/ics/default.nix +++ b/pkgs/development/python-modules/ics/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { tatsu ]; - checkInputs = [ + nativeCheckInputs = [ pytest-flakes pytestCheckHook ]; diff --git a/pkgs/development/python-modules/idasen/default.nix b/pkgs/development/python-modules/idasen/default.nix index a315642d3291..0d653ed1e5ab 100644 --- a/pkgs/development/python-modules/idasen/default.nix +++ b/pkgs/development/python-modules/idasen/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { voluptuous ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 86ac0542591e..2d705352d1b3 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.5.9"; + version = "2.5.17"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,10 +18,10 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5ISxzOTTlA1EcBO5N6YtBEah0SRehGeVIONj30zOKk0="; + sha256 = "sha256-urviMomTJdbublr2nCj25R/xbs/pEsRKWxmklneTjOQ="; }; - checkInputs = [ + nativeCheckInputs = [ editdistance-s pytestCheckHook ukkonen diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index bf321edb38be..99b40c25a72a 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix index 319b080c3472..ab7080ed272b 100644 --- a/pkgs/development/python-modules/ifaddr/default.nix +++ b/pkgs/development/python-modules/ifaddr/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-zAy/yqv3ZdRFlYJfuWqZuxLHlxa3O0QzDqOO4rDErtQ="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 5ab12b4ec667..541ddad92e85 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -24,10 +24,10 @@ buildPythonPackage rec { sha256 = "sha256-mMiEVenDBNmeXMrDSZamUpnSm+4BQEgfK89zxIaFMio="; }; - checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ]; + nativeCheckInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ]; propagatedBuildInputs = [ packaging torch scikit-learn tqdm ]; - # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite. + # runs successfully in 3.9, however, async isn't correctly closed so it will fail after test suite. doCheck = pythonOlder "3.9"; # Some packages are not in NixPkgs; other tests try to build distributed diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index cc995746f297..b8f02166f330 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/pkgs/development/python-modules/igraph/default.nix @@ -10,15 +10,17 @@ buildPythonPackage rec { pname = "igraph"; - version = "0.10.2"; + version = "0.10.4"; disabled = pythonOlder "3.7"; + format = "setuptools"; + src = fetchFromGitHub { owner = "igraph"; repo = "python-igraph"; - rev = version; - hash = "sha256-ro2EkJQxW8aHejAvkaXI9mJC5XgFt31akhzFDAPZ4ow="; + rev = "refs/tags/${version}"; + hash = "sha256-DR4D12J/BKFpF4hMHfitNmwDZ7UEo+pI0tvEa1T5GTY="; }; postPatch = '' @@ -42,7 +44,7 @@ buildPythonPackage rec { # told to do it. ~ C. setupPyGlobalFlags = [ "--use-pkg-config" ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index d6933c25ac47..bd7d404fe290 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -90,7 +90,7 @@ buildPythonPackage rec { --replace "WTForms>=2.3.1,<3.1" "WTForms" ''; - checkInputs = [ + nativeCheckInputs = [ flask-testing pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index 3211aed644e0..78a5d59e9a54 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -1,23 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi, yajl, cffi, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, yajl +, cffi +, pytestCheckHook +}: buildPythonPackage rec { pname = "ijson"; - version = "3.1.4"; + version = "3.2.0.post0"; src = fetchPypi { inherit pname version; - sha256 = "1d1003ae3c6115ec9b587d29dd136860a81a23c7626b682e2b5b12c9fd30e4ea"; + hash = "sha256-gKW9fpkjyrIAcB9nrSNyEEMouZ3fJJ276INBAshS0xY="; }; - buildInputs = [ yajl ]; - propagatedBuildInputs = [ cffi ]; - checkInputs = [ pytestCheckHook ]; + buildInputs = [ + yajl + ]; + + propagatedBuildInputs = [ + cffi + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; doCheck = true; + pythonImportsCheck = [ + "ijson" + ]; + meta = with lib; { description = "Iterative JSON parser with a standard Python iterator interface"; homepage = "https://github.com/ICRAR/ijson"; + changelog = "https://github.com/ICRAR/ijson/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ rvl ]; }; diff --git a/pkgs/development/python-modules/ilua/default.nix b/pkgs/development/python-modules/ilua/default.nix index 5b5c129c2749..28bc7524fa9e 100644 --- a/pkgs/development/python-modules/ilua/default.nix +++ b/pkgs/development/python-modules/ilua/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , jupyter_console -, jupyter_core +, jupyter-core , pygments , termcolor , txzmq @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jupyter_console - jupyter_core + jupyter-core pygments termcolor txzmq diff --git a/pkgs/development/python-modules/image-go-nord/default.nix b/pkgs/development/python-modules/image-go-nord/default.nix index a8fb5df9433d..7b97e7763ebf 100644 --- a/pkgs/development/python-modules/image-go-nord/default.nix +++ b/pkgs/development/python-modules/image-go-nord/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "A tool that can convert rgb images to nordtheme palette"; diff --git a/pkgs/development/python-modules/imagecodecs-lite/default.nix b/pkgs/development/python-modules/imagecodecs-lite/default.nix index f71127971638..a9cec8bb50c1 100644 --- a/pkgs/development/python-modules/imagecodecs-lite/default.nix +++ b/pkgs/development/python-modules/imagecodecs-lite/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { cython ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/imagehash/default.nix b/pkgs/development/python-modules/imagehash/default.nix new file mode 100644 index 000000000000..b65053c56ead --- /dev/null +++ b/pkgs/development/python-modules/imagehash/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, numpy +, six +, scipy +, pillow +, pywavelets +}: + +buildPythonPackage rec { + pname = "imagehash"; + version = "4.3.1"; + + src = fetchFromGitHub { + owner = "JohannesBuchner"; + repo = "imagehash"; + rev = "v${version}"; + hash = "sha256-Tsq10TZqnzNTuO4goKjdylN4Eqy7DNbHLjr5n3+nidM="; + }; + + propagatedBuildInputs = [ + numpy + six + scipy + pillow + pywavelets + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "A Python Perceptual Image Hashing Module"; + homepage = "https://github.com/JohannesBuchner/imagehash"; + license = licenses.bsd2; + maintainers = with maintainers; [ e1mo ]; + }; +} diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 93d7a89d7156..45eb10658b57 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.22.1"; + version = "2.25.0"; disabled = pythonOlder "3.7"; src = fetchPypi { - sha256 = "sha256-Rl7DX5GdU4kG0wI7Yczsdm2OdXX+Vfy9dmns5Vr7l8o="; + sha256 = "sha256-uAeWofjDjGl6lAoq1zl+4okA1cTlEGG5pn0WrKhn8z4="; inherit pname version; }; @@ -37,7 +37,7 @@ buildPythonPackage rec { pillow ]; - checkInputs = [ + nativeCheckInputs = [ fsspec psutil pytestCheckHook diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index b4c7d2abf3a9..e302731825de 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.57.0"; + version = "1.0.0"; disabled = isPy27; @@ -17,10 +17,10 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "refs/tags/v${version}"; - hash = "sha256-plJ+X4RtZT77fWEAXAsyi5YnonjaWfZfKbSNFKE1DKc="; + hash = "sha256-JAMEJv0Vc5iunuKusyD+rxLiubEIDgHsr7FrMZgLy9Q="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/imapclient/default.nix b/pkgs/development/python-modules/imapclient/default.nix index 2ef40452516d..d943fbba0c27 100644 --- a/pkgs/development/python-modules/imapclient/default.nix +++ b/pkgs/development/python-modules/imapclient/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "imapclient" diff --git a/pkgs/development/python-modules/imaplib2/default.nix b/pkgs/development/python-modules/imaplib2/default.nix index c58b698a4a46..e6379c0af1dd 100644 --- a/pkgs/development/python-modules/imaplib2/default.nix +++ b/pkgs/development/python-modules/imaplib2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "14asi3xnvf4bb394k5j8c3by6svvmrr75pawzy6kaax5jx0h793m"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index 8a53e856b330..9e156f01e08a 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.9.1"; + version = "0.10.1"; disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2 src = fetchPypi { inherit pname version; - sha256 = "sha256-ThT3rmB4tauEO3PDebKsULIHRGQV2cJDjIhdbLWv2WI="; + sha256 = "sha256-vHYJYZ7Dw4xEIpKSgjmtPRC13rCviinIOCK3tXsxn4s="; }; propagatedBuildInputs = [ scikit-learn ]; - checkInputs = [ pytestCheckHook pandas ]; + nativeCheckInputs = [ pytestCheckHook pandas ]; preCheck = '' export HOME=$TMPDIR ''; diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index c749071bab9b..93cc6453f978 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { # https://gitlab.mister-muffin.de/josch/img2pdf/issues/128 doCheck = !stdenv.isAarch64; - checkInputs = [ + nativeCheckInputs = [ exiftool ghostscript imagemagick diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 2c84f5c00c50..1f91e41345e5 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ opencv3 pytestCheckHook ]; diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index 19c38ac3fbc8..eebeb17bb7e7 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.17.0"; + version = "2.18.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-dfSoorrSH9p7a9Qt98oEEg+yRjbr+bVm0lmybyBEsdA="; + hash = "sha256-fuLGoLzaxYGzj66NDzQ/3uVfkfH2psyWQ/z7zGwtw+Y="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/immutabledict/default.nix b/pkgs/development/python-modules/immutabledict/default.nix index 040e508e86ec..8fef0641b1f1 100644 --- a/pkgs/development/python-modules/immutabledict/default.nix +++ b/pkgs/development/python-modules/immutabledict/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "immutabledict"; - version = "2.2.2"; + version = "2.2.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "corenting"; repo = "immutabledict"; rev = "v${version}"; - hash = "sha256-YqUxkpFl2G/LFLtFWqocXbFvgVhqqiquoWNIIO9c/6o="; + hash = "sha256-GeQ1BEBt+66YhohyaXt7rIVNpEk6mINwsC3JrmYNjRI="; }; nativeBuildInputs = [ @@ -28,13 +28,14 @@ buildPythonPackage rec { "immutabledict" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "A fork of frozendict, an immutable wrapper around dictionaries"; homepage = "https://github.com/corenting/immutabledict"; + changelog = "https://github.com/corenting/immutabledict/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix index 30646e28ca98..a490d7ac8ce5 100644 --- a/pkgs/development/python-modules/immutables/default.nix +++ b/pkgs/development/python-modules/immutables/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ mypy pytestCheckHook ]; diff --git a/pkgs/development/python-modules/importlab/default.nix b/pkgs/development/python-modules/importlab/default.nix index 03b402c8dc79..9b9c6ffa0cff 100644 --- a/pkgs/development/python-modules/importlab/default.nix +++ b/pkgs/development/python-modules/importlab/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { propagatedBuildInputs = [ networkx ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ "tests/test_parsepy.py" ]; diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 9e4176a5b1ba..d9f03c521aca 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "4.12.0"; + version = "5.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-Y3JFuLqytlAvy8dSzEt6b2JDuwKzHFwmFWrRA9PUVnA="; + hash = "sha256-QE1I1iu6C3p3/51AXv2RUBvvLmf/Ss4L7UCgzyjDx80="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index 124733568723..ddd3949dd78e 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "importlib-resources"; - version = "5.9.0"; + version = "5.10.2"; format = "pyproject"; disabled = isPy27; src = fetchPypi { pname = "importlib_resources"; inherit version; - sha256 = "sha256-VIHpf7Ra+Nzy95iVJiVZHFj+WZ0HNdhrEPVN4IamFoE="; + sha256 = "sha256-5KlsjMAzlkf/ml4FUNnydvxaAf+idgErWOwQjP17hIQ="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { typing ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/importmagic/default.nix b/pkgs/development/python-modules/importmagic/default.nix index 8302478684be..6e4c00c286e4 100644 --- a/pkgs/development/python-modules/importmagic/default.nix +++ b/pkgs/development/python-modules/importmagic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "importmagic" ]; diff --git a/pkgs/development/python-modules/in-place/default.nix b/pkgs/development/python-modules/in-place/default.nix index 7114fae94e98..0acfbac481f6 100644 --- a/pkgs/development/python-modules/in-place/default.nix +++ b/pkgs/development/python-modules/in-place/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "in_place" ]; diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix index cf22ae79d8da..5f1f0beb25f5 100644 --- a/pkgs/development/python-modules/incremental/default.nix +++ b/pkgs/development/python-modules/incremental/default.nix @@ -21,7 +21,7 @@ let incremental = buildPythonPackage rec { # escape infinite recursion with twisted doCheck = false; - checkInputs = [ + nativeCheckInputs = [ twisted ]; diff --git a/pkgs/development/python-modules/infinity/default.nix b/pkgs/development/python-modules/infinity/default.nix index 1fe406e62ed8..366572cedacb 100644 --- a/pkgs/development/python-modules/infinity/default.nix +++ b/pkgs/development/python-modules/infinity/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1npcc4adcc3c9diw4kgmd5c0ikym1iz364p2zp6gs011rqaprald"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook six ]; diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 6e64c946b980..7a7737326476 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -9,20 +9,20 @@ buildPythonPackage rec { pname = "inflect"; - version = "6.0.0"; + version = "6.0.2"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-C8FRbsJyXi2CIXB6YSJFCTy28c6iCc/Yy9T8Xpb6Y2U="; + sha256 = "sha256-8aa8sBBQRviWGf3hp9BExhLGFMLYXvGCWC2dybhtMJo="; }; nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ pydantic ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "inflect" ]; diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix index f6d327d229d8..01dd785e4184 100644 --- a/pkgs/development/python-modules/inflection/default.nix +++ b/pkgs/development/python-modules/inflection/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1a29730d366e996aaacffb2f1f1cb9593dc38e2ddd30c91250c6dde09ea9b417"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # Suppress overly verbose output if tests run successfully checkPhase = "pytest >/dev/null || pytest"; diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 079edcd121ff..0ada1ee5d865 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.34.0"; + version = "1.36.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Bswlrfh9lBobZDA4Rt/02jMER5IrZ6b3ykpbklCFhUE="; + hash = "sha256-RHcUkIYzshJr6r76Kq4FsjDl9YXZJOaCeijBwMTvPfw="; }; propagatedBuildInputs = [ @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "InfluxDB client library"; homepage = "https://github.com/influxdata/influxdb-client-python"; + changelog = "https://github.com/influxdata/influxdb-client-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index ec81f631ac30..a44a2e300429 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { msgpack ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock mock diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix index aff0d77e7022..7dd4a5675cd7 100644 --- a/pkgs/development/python-modules/inform/default.nix +++ b/pkgs/development/python-modules/inform/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core , arrow , six , hypothesis @@ -7,28 +10,33 @@ buildPythonPackage rec { pname = "inform"; - version = "1.26"; + version = "1.27"; + format = "pyproject"; src = fetchFromGitHub { owner = "KenKundert"; repo = "inform"; - rev = "v${version}"; - sha256 = "0snrmvmc3rnz90cql5ayzs878rrkadk46rhvf2sn78nb0x57wa20"; + rev = "refs/tags/v${version}"; + hash = "sha256-SvE+UAGpUomUBHlH4aYZ1BYmLp3BherRjosKsIaOA/s="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner>=2.0" "" - ''; + nativeBuildInputs = [ + flit-core + ]; - propagatedBuildInputs = [ arrow six ]; + propagatedBuildInputs = [ + arrow + six + ]; - checkInputs = [ pytestCheckHook hypothesis ]; - preCheck = '' - patchShebangs test.doctests.py test.inform.py - ./test.doctests.py - ./test.inform.py - ''; + nativeCheckInputs = [ + pytestCheckHook + hypothesis + ]; + + disabledTests = [ + "test_prostrate" + ]; meta = with lib; { description = "Print and logging utilities"; diff --git a/pkgs/development/python-modules/inkbird-ble/default.nix b/pkgs/development/python-modules/inkbird-ble/default.nix index 6fb3ddb8c11a..2172a8841140 100644 --- a/pkgs/development/python-modules/inkbird-ble/default.nix +++ b/pkgs/development/python-modules/inkbird-ble/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/inotify/default.nix b/pkgs/development/python-modules/inotify/default.nix index 3590f53e1ecd..64737035193b 100644 --- a/pkgs/development/python-modules/inotify/default.nix +++ b/pkgs/development/python-modules/inotify/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { fetchSubmodules = false; }; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index 0fb7a2451210..a0a37ce92f80 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "inquirer"; - version = "2.9.2"; + version = "3.1.1"; format = "pyproject"; src = fetchFromGitHub rec { owner = "magmax"; repo = "python-inquirer"; - rev = "v${version}"; - sha256 = "sha256-TQEZeZDl4N78dE7CXy5OwquUoHuxxjmDAC3wdxqydaQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-gDJqD0IHshyGw9MmMtYjkkpvYklRLgPd6EtLVqi2I/o="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { readchar ]; - checkInputs = [ + nativeCheckInputs = [ pexpect pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/inscriptis/default.nix b/pkgs/development/python-modules/inscriptis/default.nix index 2fa224b3f210..a36a11ac6038 100644 --- a/pkgs/development/python-modules/inscriptis/default.nix +++ b/pkgs/development/python-modules/inscriptis/default.nix @@ -3,19 +3,22 @@ , fetchFromGitHub , lxml , pytestCheckHook +, pythonOlder , requests }: buildPythonPackage rec { pname = "inscriptis"; - version = "2.3.1"; + version = "2.3.2"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "weblyzard"; repo = "inscriptis"; - rev = version; - sha256 = "sha256-an/FTbujN2VnTYa0wngM8ugV1LNHJWM32RVqIbaW0KY="; + rev = "refs/tags/${version}"; + hash = "sha256-grsyHqt7ahiNsYKcZN/c5cJaag/nTWTBcaHaXnW1SpU="; }; propagatedBuildInputs = [ @@ -23,15 +26,18 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "inscriptis" ]; + pythonImportsCheck = [ + "inscriptis" + ]; meta = with lib; { - description = "inscriptis - HTML to text converter"; + description = "HTML to text converter"; homepage = "https://github.com/weblyzard/inscriptis"; + changelog = "https://github.com/weblyzard/inscriptis/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/installer/default.nix b/pkgs/development/python-modules/installer/default.nix index 8749ea16132d..836cfa06872b 100644 --- a/pkgs/development/python-modules/installer/default.nix +++ b/pkgs/development/python-modules/installer/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { pname = "installer"; - version = "0.5.1"; + version = "0.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pradyunsg"; repo = pname; rev = version; - sha256 = "sha256-vhZYUhUcD5fnjkyEqFMvggVGH9Ri8iNgqRgSBQTOCtM="; + sha256 = "sha256-IXznSrc/4LopgZDGFSC6cAOCbts+siKpdl5SvN1FFvA="; }; nativeBuildInputs = [ flit-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ]; diff --git a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix index 584aa0050ed5..8d6677b046af 100644 --- a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix +++ b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix @@ -1,26 +1,37 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "insteon-frontend-home-assistant"; - version = "0.2.0"; + version = "0.3.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AP8yf2eEBT8LWs03hKihCgbBkS9sEUg5NkYdagFiqwA="; + hash = "sha256-QaWRafp0901vQFMtlmFzkugNsM4PHRll+FUZlEz6E5g="; }; + nativeBuildInputs = [ + setuptools + ]; + # upstream has no tests doCheck = false; - pythonImportsCheck = [ "insteon_frontend" ]; + pythonImportsCheck = [ + "insteon_frontend" + ]; - meta = { + meta = with lib; { description = "The Insteon frontend for Home Assistant"; homepage = "https://github.com/teharris1/insteon-panel"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 6f895b45ed03..687fe8e58e6b 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "intake"; - version = "0.6.5"; + version = "0.6.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -34,8 +34,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - hash = "sha256-ABMXWUVptpOSPB1jQ57iXk/UG92puNCICzXo3ZMG2Pk="; + rev = "refs/tags/${version}"; + hash = "sha256-/VQKLmEpIOULTPpJKuVLyqqQVLKVhwVBoos9Q/upwQM="; }; propagatedBuildInputs = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ intake-parquet pytestCheckHook ] ++ passthru.optional-dependencies.server; @@ -98,6 +98,7 @@ buildPythonPackage rec { "test_read_pattern" "test_remote_arr" "test_remote_cat" + "test_remote_env" # ValueError "test_mlist_parameter" # ImportError @@ -118,6 +119,7 @@ buildPythonPackage rec { meta = with lib; { description = "Data load and catalog system"; homepage = "https://github.com/ContinuumIO/intake"; + changelog = "https://github.com/intake/intake/blob/${version}/docs/source/changelog.rst"; license = licenses.bsd2; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix index f6459c13e706..aa2fc70eb0de 100644 --- a/pkgs/development/python-modules/intbitset/default.nix +++ b/pkgs/development/python-modules/intbitset/default.nix @@ -7,17 +7,17 @@ buildPythonPackage rec { pname = "intbitset"; - version = "3.0.1"; + version = "3.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8ebQPGcpkioiPFGEnfZbnpFuYlrvuRF4Tn+azUwgfVM="; + hash = "sha256-owCy1aSYmFf/HQw5cWJHZqiadR4xWqCAwHhlAxrmN6c="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "C-based extension implementing fast integer bit sets"; homepage = "https://github.com/inveniosoftware/intbitset"; + changelog = "https://github.com/inveniosoftware-contrib/intbitset/blob/v${version}/CHANGELOG.rst"; license = licenses.lgpl3Plus; maintainers = teams.determinatesystems.members; }; diff --git a/pkgs/development/python-modules/intelhex/default.nix b/pkgs/development/python-modules/intelhex/default.nix index e5b0cc6fbc74..fdeeae500735 100644 --- a/pkgs/development/python-modules/intelhex/default.nix +++ b/pkgs/development/python-modules/intelhex/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-iStzYacZ9JRSN9qMz3VOlRPbMvViiFJ4WuoQjc0lAJM="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "intelhex/test.py" ]; diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index f0b702b1b513..6266e60f7284 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "2.2.1"; + version = "2.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jeeftor"; repo = pname; - rev = version; - hash = "sha256-dn5814eRZ9456Fn7blf1UzXPii4dXu3sjoXBV7CmwSs="; + rev = "refs/tags/${version}"; + hash = "sha256-iqlKfpnETLqQwy5sNcK2x/TgmuN2hCfYoHEFK2WWVXI="; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-mock pytestCheckHook @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to read Intellifire fireplace status data"; homepage = "https://github.com/jeeftor/intellifire4py"; + changelog = "https://github.com/jeeftor/intellifire4py/blob/${version}/CHANGELOG"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix index 94d6252e3c06..339332452e54 100644 --- a/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/pkgs/development/python-modules/intensity-normalization/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { statsmodels ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 2ab3a3a51001..e0021cbc39e0 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -16,13 +16,15 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "3.0.2"; + version = "3.3.0"; + + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3oVkZcLvaFIYTQi/1ZwMoBkEhls3OiezgwNKxrQSjrY="; + sha256 = "sha256-PLf+PMIXlaoL974e7coQCQKH6cVBYODPhkDxa2vhTB0="; }; propagatedBuildInputs = [ @@ -35,7 +37,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ pytest responses glibcLocales ]; + nativeCheckInputs = [ pytest responses glibcLocales ]; # tests depend on network doCheck = false; diff --git a/pkgs/development/python-modules/into-dbus-python/default.nix b/pkgs/development/python-modules/into-dbus-python/default.nix index 5ef92cf216a5..d295743dbb9f 100644 --- a/pkgs/development/python-modules/into-dbus-python/default.nix +++ b/pkgs/development/python-modules/into-dbus-python/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { dbus-python ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis hs-dbus-signature diff --git a/pkgs/development/python-modules/intreehooks/default.nix b/pkgs/development/python-modules/intreehooks/default.nix index e76a6997cb67..cec0f2a7120d 100644 --- a/pkgs/development/python-modules/intreehooks/default.nix +++ b/pkgs/development/python-modules/intreehooks/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytoml ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = { description = "Load a PEP 517 backend from inside the source tree"; diff --git a/pkgs/development/python-modules/invisible-watermark/default.nix b/pkgs/development/python-modules/invisible-watermark/default.nix new file mode 100644 index 000000000000..ce77b9e3115c --- /dev/null +++ b/pkgs/development/python-modules/invisible-watermark/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, opencv4 +, torch +, onnx +, onnxruntime +, pillow +, pywavelets +, numpy +}: + +buildPythonPackage rec { + pname = "invisible-watermark"; + version = "0.1.5"; + format = "setuptools"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ShieldMnt"; + repo = "invisible-watermark"; + rev = version; + sha256 = "sha256-NGDPEETuM7rYbo8kXYoRWLJWpa/lWLKEvaaiDzSWYZ4="; + }; + + propagatedBuildInputs = [ + opencv4 + torch + onnx + onnxruntime + pillow + pywavelets + numpy + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'opencv-python>=4.1.0.25' 'opencv' + ''; + + pythonImportsCheck = [ "imwatermark" ]; + + meta = with lib; { + description = "A library for creating and decoding invisible image watermarks"; + homepage = "https://github.com/ShieldMnt/invisible-watermark"; + license = licenses.mit; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/development/python-modules/iocapture/default.nix b/pkgs/development/python-modules/iocapture/default.nix index cc56f8d0bdea..e3bee127b7b7 100644 --- a/pkgs/development/python-modules/iocapture/default.nix +++ b/pkgs/development/python-modules/iocapture/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "86670e1808bcdcd4f70112f43da72ae766f04cd8311d1071ce6e0e0a72e37ee8"; }; - checkInputs = [ + nativeCheckInputs = [ flexmock pytest pytest-cov diff --git a/pkgs/development/python-modules/ionhash/default.nix b/pkgs/development/python-modules/ionhash/default.nix index 4d90d572876c..901cf602dc80 100644 --- a/pkgs/development/python-modules/ionhash/default.nix +++ b/pkgs/development/python-modules/ionhash/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ amazon-ion six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ionhash" ]; diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index 363c8a4f5768..0677e51ff42a 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -1,24 +1,41 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, decorator , ipython , isPyPy -, mock -, toml +, tomli +, setuptools +, unittestCheckHook }: buildPythonPackage rec { pname = "ipdb"; - version = "0.13.9"; + version = "0.13.11"; + format = "pyproject"; + disabled = isPyPy; # setupterm: could not find terminfo database src = fetchPypi { inherit pname version; - sha256 = "951bd9a64731c444fd907a5ce268543020086a697f6be08f7cc2c9a752a278c5"; + hash = "sha256-wjtnNvAf1Fhswuy+vfeaXrRUeWhT4c2PLtO3uR1KPpM="; }; - propagatedBuildInputs = [ ipython toml ]; - checkInputs = [ mock ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + ipython + decorator + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/ipfshttpclient/default.nix b/pkgs/development/python-modules/ipfshttpclient/default.nix index 71e0194a6b2f..965bb5625d4b 100644 --- a/pkgs/development/python-modules/ipfshttpclient/default.nix +++ b/pkgs/development/python-modules/ipfshttpclient/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-cov pytest-dependency diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index ef25868ea683..edfbc49d776b 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { traittypes ]; - checkInputs = [ pytest pytest-cov nbval ]; + nativeCheckInputs = [ pytest pytest-cov nbval ]; checkPhase = "pytest ipydatawidgets/tests"; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 36bd9961903c..b5afa47275b2 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -4,6 +4,7 @@ , fetchPypi , hatchling , pythonOlder +, comm , ipython , jupyter-client , packaging @@ -14,14 +15,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.15.3"; + version = "6.20.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uB1XsOFxZwhEvynNwRVisQENPahxFcRRPg7mYKg2h2U="; + sha256 = "sha256-ffr67GRTAHEMQUecCwvcE6nqZjm+5uOtBCdXZ06amik="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 @@ -34,6 +35,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + comm ipython jupyter-client packaging @@ -51,7 +53,7 @@ buildPythonPackage rec { meta = { description = "IPython Kernel for Jupyter"; - homepage = "http://ipython.org/"; + homepage = "https://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/ipykernel/tests.nix b/pkgs/development/python-modules/ipykernel/tests.nix index 9375dbc2bfdc..49208b30fe37 100644 --- a/pkgs/development/python-modules/ipykernel/tests.nix +++ b/pkgs/development/python-modules/ipykernel/tests.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ flaky ipykernel ipyparallel diff --git a/pkgs/development/python-modules/ipython-sql/default.nix b/pkgs/development/python-modules/ipython-sql/default.nix index 1a86ae238be3..8853b066ecb6 100644 --- a/pkgs/development/python-modules/ipython-sql/default.nix +++ b/pkgs/development/python-modules/ipython-sql/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { sqlparse ]; - checkInputs = [ ipython pandas pytest ]; + nativeCheckInputs = [ ipython pandas pytest ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index b6c193d05f05..094b3370c512 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -79,7 +79,7 @@ buildPythonPackage rec { --replace "--ipdoctest-modules" "--ipdoctest-modules --ignore=IPython/core/display.py" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook testpath ]; diff --git a/pkgs/development/python-modules/ipython_genutils/default.nix b/pkgs/development/python-modules/ipython_genutils/default.nix index 51cf6986349c..2283444c23db 100644 --- a/pkgs/development/python-modules/ipython_genutils/default.nix +++ b/pkgs/development/python-modules/ipython_genutils/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"; }; - checkInputs = [ nose glibcLocales ]; + nativeCheckInputs = [ nose glibcLocales ]; checkPhase = '' LC_ALL="en_US.UTF-8" nosetests -v ipython_genutils/tests @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Vestigial utilities from IPython"; - homepage = "http://ipython.org/"; + homepage = "https://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix index 6c0b15c41b37..77ed45ce4ccd 100644 --- a/pkgs/development/python-modules/ipyvue/default.nix +++ b/pkgs/development/python-modules/ipyvue/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ipyvue"; - version = "1.7.0"; + version = "1.8.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "fa8ff9b9a73b5a925c4af4c05f1839df2bd0fae0063871f403ee821792d5ab72"; + sha256 = "sha256-0qjvArC8xEr9MSecuAKMBr49fA60FYRyicAADy93N7c="; }; propagatedBuildInputs = [ ipywidgets ]; diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index b4689b207756..5d8a6f87c372 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "8.0.2"; + version = "8.0.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-CMt1xuCpaDYUfL/cVVgK4E0T4F0m/7w3e04caLqiix8="; + hash = "sha256-wABad6R9d4icr+2JK1jjO0oqlnEhVEBMZUjsIicoEeo="; }; propagatedBuildInputs = [ @@ -31,11 +31,11 @@ buildPythonPackage rec { widgetsnbextension ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "IPython HTML widgets for Jupyter"; - homepage = "http://ipython.org/"; + homepage = "https://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix index e16ac2449a7d..8351ff3d86be 100644 --- a/pkgs/development/python-modules/ircrobots/default.nix +++ b/pkgs/development/python-modules/ircrobots/default.nix @@ -5,7 +5,6 @@ , anyio , asyncio-rlock , asyncio-throttle -, dataclasses , ircstates , async_stagger , async-timeout @@ -15,7 +14,7 @@ buildPythonPackage rec { pname = "ircrobots"; version = "0.4.6"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jesopo"; @@ -38,8 +37,6 @@ buildPythonPackage rec { ircstates async_stagger async-timeout - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses ]; checkPhase = '' diff --git a/pkgs/development/python-modules/irctokens/default.nix b/pkgs/development/python-modules/irctokens/default.nix index 3cd86abb0b2e..e0863e43fdce 100644 --- a/pkgs/development/python-modules/irctokens/default.nix +++ b/pkgs/development/python-modules/irctokens/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-FgcLngS11U9eBNV/8jllwdrm89tCmthA1sUaFDovk6U="; }; - checkInputs = [ pyyaml ]; + nativeCheckInputs = [ pyyaml ]; checkPhase = '' ${python.interpreter} -m unittest test ''; diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index edbb42b74db1..cfef001013c7 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-FOZNsZK8PTPJhK0BvGQiPqCr8au3rwHsjE3dCKWGtDM="; }; - checkInputs = [ + nativeCheckInputs = [ nose coverage ]; diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index aa084783fa8f..aa8b997d57b5 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; preCheck = "mv islpy islpy.hidden"; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "islpy" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ismartgate/default.nix b/pkgs/development/python-modules/ismartgate/default.nix index 943036ecbd46..7998b03a3782 100644 --- a/pkgs/development/python-modules/ismartgate/default.nix +++ b/pkgs/development/python-modules/ismartgate/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ismartgate"; - version = "4.0.4"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; repo = pname; - rev = "v${version}"; - hash = "sha256-yh7gPyy3VMdyINBCZo5K2wA0BY7yYgHrKGZRB/pm77U="; + rev = "refs/tags/v${version}"; + hash = "sha256-o2yzMxrF0WB6MbeL1Tuf0Sq4wS4FDIWZZx1x2rvwLmY="; }; propagatedBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-asyncio pytest-raises @@ -55,12 +55,6 @@ buildPythonPackage rec { "ismartgate" ]; - disabledTestPaths = [ - # Tests are out-dated - "ismartgate/tests/test_init.py" - ]; - - meta = with lib; { description = "Python module to work with the ismartgate and gogogate2 API"; homepage = "https://github.com/bdraco/ismartgate"; diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix index 2820ff7dd6c1..9291912ecf51 100644 --- a/pkgs/development/python-modules/iso3166/default.nix +++ b/pkgs/development/python-modules/iso3166/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-/y7c2qSA6+WKUP9YTSaMBjBxtqAuF4nB3MKvL5P6vL0="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/iso4217/default.nix b/pkgs/development/python-modules/iso4217/default.nix index 5832b6e4a773..50268536bda5 100644 --- a/pkgs/development/python-modules/iso4217/default.nix +++ b/pkgs/development/python-modules/iso4217/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { importlib-resources ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix index e189e3778bc8..af90e739163c 100644 --- a/pkgs/development/python-modules/iso8601/default.nix +++ b/pkgs/development/python-modules/iso8601/default.nix @@ -24,8 +24,9 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ - hypothesis + nativeCheckInputs = [ + # "hypothesis" indirectly depends on iso8601 to build its documentation + (hypothesis.override { enableDocumentation = false; }) pytestCheckHook pytz ]; diff --git a/pkgs/development/python-modules/isodate/default.nix b/pkgs/development/python-modules/isodate/default.nix index ba507f168dbf..81f030e4830b 100644 --- a/pkgs/development/python-modules/isodate/default.nix +++ b/pkgs/development/python-modules/isodate/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "src/isodate/tests" ]; diff --git a/pkgs/development/python-modules/isoduration/default.nix b/pkgs/development/python-modules/isoduration/default.nix index 16bb9b13bf83..e0383b9883a5 100644 --- a/pkgs/development/python-modules/isoduration/default.nix +++ b/pkgs/development/python-modules/isoduration/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { arrow ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis isodate pytestCheckHook diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index 466d51266216..d51e41448548 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "isort"; - version = "5.10.1"; + version = "5.11.4"; format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = "isort"; - rev = version; - sha256 = "09spgl2k9xrprr5gbpfc91a8p7mx7a0c64ydgc91b3jhrmnd9jg1"; + rev = "refs/tags/${version}"; + sha256 = "sha256-1x0rhQOr6pPFuHtbYSCR10tXeDTGwf47ek49wBmJP+I="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ colorama hypothesis pylama diff --git a/pkgs/development/python-modules/itanium-demangler/default.nix b/pkgs/development/python-modules/itanium-demangler/default.nix index 6ec44062d8b8..d1251449af5c 100644 --- a/pkgs/development/python-modules/itanium-demangler/default.nix +++ b/pkgs/development/python-modules/itanium-demangler/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-I6NUfckt2cocQt5dZSFadpshTCuA/6bVNauNXypWh+A="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/itemloaders/default.nix b/pkgs/development/python-modules/itemloaders/default.nix index 8fa13fcc0cc2..86320ed693bc 100644 --- a/pkgs/development/python-modules/itemloaders/default.nix +++ b/pkgs/development/python-modules/itemloaders/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { itemadapter ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/iteration-utilities/default.nix b/pkgs/development/python-modules/iteration-utilities/default.nix new file mode 100644 index 000000000000..fd17b76103ba --- /dev/null +++ b/pkgs/development/python-modules/iteration-utilities/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "iteration-utilities"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "MSeifert04"; + repo = "iteration_utilities"; + rev = "v${version}"; + sha256 = "sha256-Q/ZuwAf+NPikN8/eltwaUilnLw4DKFm864tUe6GLDak="; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "iteration_utilities" ]; + + meta = with lib; { + description = "Utilities based on Pythons iterators and generators"; + homepage = "https://github.com/MSeifert04/iteration_utilities"; + license = licenses.asl20; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index 96c8fcfb3c14..eff730e0ad8e 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "iterm2"; - version = "2.6"; + version = "2.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rKvnr0C48mTkjbGyHhvNzgJ97p5mJ7F4wU8ZMPYV/rM="; + sha256 = "sha256-9vC+xGwyzsr3vn/YIpbsRpfUvyEB8MSqskzBI5kfojA="; }; propagatedBuildInputs = [ protobuf websockets ]; diff --git a/pkgs/development/python-modules/itsdangerous/default.nix b/pkgs/development/python-modules/itsdangerous/default.nix index 99bdb965235c..e4a22a268d5d 100644 --- a/pkgs/development/python-modules/itsdangerous/default.nix +++ b/pkgs/development/python-modules/itsdangerous/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-XbvGizF+XkLzJ/kCF2NUXcP8O/4i5t65aq8fw4h0FWo="; }; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook ]; diff --git a/pkgs/development/python-modules/itypes/default.nix b/pkgs/development/python-modules/itypes/default.nix index 36581bf2db50..14f021439788 100644 --- a/pkgs/development/python-modules/itypes/default.nix +++ b/pkgs/development/python-modules/itypes/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1ljhjp9pacbrv2phs58vppz1dlxix01p98kfhyclvbml6dgjcr52"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' mv itypes.py itypes.py.hidden pytest tests.py diff --git a/pkgs/development/python-modules/jaconv/default.nix b/pkgs/development/python-modules/jaconv/default.nix index 17f044dbd914..d65aca693165 100644 --- a/pkgs/development/python-modules/jaconv/default.nix +++ b/pkgs/development/python-modules/jaconv/default.nix @@ -8,19 +8,19 @@ buildPythonPackage rec { pname = "jaconv"; - version = "0.3"; + version = "0.3.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ikegami-yukino"; repo = pname; rev = "v${version}"; - sha256 = "rityHi1JWWlV7+sAxNrlbcmfHmORZWrMZqXTRlsclhQ="; + hash = "sha256-uzGHvklFHVoNloZauczgITeHQIgYQAfI9cjLWgG/vyI="; }; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Japanese character interconverter for Hiragana, Katakana, Hankaku and Zenkaku"; homepage = "https://github.com/ikegami-yukino/jaconv"; + changelog = "https://github.com/ikegami-yukino/jaconv/blob/v${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/jamo/default.nix b/pkgs/development/python-modules/jamo/default.nix index e7bebd52db44..058df62cb041 100644 --- a/pkgs/development/python-modules/jamo/default.nix +++ b/pkgs/development/python-modules/jamo/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { "jamo" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/janus/default.nix b/pkgs/development/python-modules/janus/default.nix index f4c52db722cd..a31d17b1fe7d 100644 --- a/pkgs/development/python-modules/janus/default.nix +++ b/pkgs/development/python-modules/janus/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ pytest-asyncio pytestCheckHook ]; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; # also fails upstream: https://github.com/aio-libs/janus/pull/258 disabledTests = [ "test_format" ]; diff --git a/pkgs/development/python-modules/jaraco-abode/default.nix b/pkgs/development/python-modules/jaraco-abode/default.nix new file mode 100644 index 000000000000..0f56965ebd68 --- /dev/null +++ b/pkgs/development/python-modules/jaraco-abode/default.nix @@ -0,0 +1,99 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, fetchPypi +, fetchpatch +, setuptools +, setuptools-scm +, requests +, lomond +, colorlog +, keyring +, requests-toolbelt +, jaraco_collections +, jaraco-context +, jaraco_classes +, jaraco-net +, more-itertools +, importlib-resources +, bx-py-utils +, platformdirs +, jaraco_itertools +, pytestCheckHook +, requests-mock +}: + +buildPythonPackage rec { + pname = "jaraco-abode"; + version = "3.2.1"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jaraco"; + repo = "jaraco.abode"; + rev = "refs/tags/v${version}"; + hash = "sha256-ZDdZba1oTOPaUm+r4fWC5E3ni/k8kXo6t5AWQTvfd5E="; + }; + + patches = [ + # https://github.com/jaraco/jaraco.abode/issues/19 + (fetchpatch { + name = "specify-options-package-data.patch"; + url = "https://github.com/jaraco/jaraco.abode/commit/8deebf57162fa097243d2b280942b6b7f95174c8.patch"; + hash = "sha256-Iu2uw9D+nMdVJZyoecEkwQaJH1oSzFN/ZLXKPZPGuPk="; + }) + ]; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + propagatedBuildInputs = [ + requests + lomond + colorlog + keyring + requests-toolbelt + jaraco_collections + jaraco-context + jaraco_classes + jaraco-net + more-itertools + importlib-resources + bx-py-utils + platformdirs + jaraco_itertools + ]; + + pythonImportsCheck = [ "jaraco.abode" ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + preCheck = '' + export HOME=$TEMP + ''; + + disabledTests = [ + "_cookie_string" + "test_cookies" + "test_empty_cookies" + "test_invalid_cookies" + ]; + + meta = with lib; { + homepage = "https://github.com/jaraco/jaraco.abode"; + description = "Library interfacing to the Abode home security system"; + license = licenses.mit; + maintainers = with maintainers; [ jamiemagee dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/jaraco-context/default.nix b/pkgs/development/python-modules/jaraco-context/default.nix index 4b097fd5b096..7a882c80195c 100644 --- a/pkgs/development/python-modules/jaraco-context/default.nix +++ b/pkgs/development/python-modules/jaraco-context/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "jaraco-context"; - version = "4.1.2"; + version = "4.3.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.context"; rev = "refs/tags/v${version}"; - sha256 = "sha256-gfrDZW4d3X/QjUBN8DFSvKRLZge3pnZ6KkI7S7Nz3W0="; + hash = "sha256-YdbkpKv7k62uyhmjKoxeA9uf5BWnRD/rK+z46FJN4xk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -32,11 +32,14 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - pythonImportsCheck = [ "jaraco.context" ]; + pythonImportsCheck = [ + "jaraco.context" + ]; meta = with lib; { description = "Python module for context management"; homepage = "https://github.com/jaraco/jaraco.context"; + changelog = "https://github.com/jaraco/jaraco.context/blob/v${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/jaraco-email/default.nix b/pkgs/development/python-modules/jaraco-email/default.nix new file mode 100644 index 000000000000..b99eff746f47 --- /dev/null +++ b/pkgs/development/python-modules/jaraco-email/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, setuptools-scm +, jaraco_text +, jaraco_collections +, keyring +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jaraco-email"; + version = "3.1.0"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jaraco"; + repo = "jaraco.email"; + rev = "refs/tags/v${version}"; + hash = "sha256-MR/SX5jmZvEMULgvQbh0JBZjIosNCPWl1wvEoJbdw4Y="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + propagatedBuildInputs = [ + jaraco_text + jaraco_collections + keyring + ]; + + pythonImportsCheck = [ "jaraco.email" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/jaraco/jaraco.email/blob/${src.rev}/CHANGES.rst"; + description = "E-mail facilities by jaraco"; + homepage = "https://github.com/jaraco/jaraco.email"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/jaraco-net/default.nix b/pkgs/development/python-modules/jaraco-net/default.nix new file mode 100644 index 000000000000..d4ff9e929460 --- /dev/null +++ b/pkgs/development/python-modules/jaraco-net/default.nix @@ -0,0 +1,97 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, setuptools-scm +, more-itertools +, beautifulsoup4 +, mechanize +, keyring +, requests +, feedparser +, jaraco_text +, jaraco_logging +, jaraco-email +, jaraco_functools +, jaraco_collections +, path +, python-dateutil +, pathvalidate +, jsonpickle +, ifconfig-parser +, pytestCheckHook +, cherrypy +, importlib-resources +, requests-mock +}: + +buildPythonPackage rec { + pname = "jaraco-net"; + version = "9.3.0"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jaraco"; + repo = "jaraco.net"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ks8e3xPjIWgSO0PSpjMYftxAuDt3ilogoDFuJqfN74o="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + propagatedBuildInputs = [ + more-itertools + beautifulsoup4 + mechanize + keyring + requests + feedparser + jaraco_text + jaraco_logging + jaraco-email + jaraco_functools + jaraco_collections + path + python-dateutil + pathvalidate + jsonpickle + ] ++ lib.optionals stdenv.isDarwin [ + ifconfig-parser + ]; + + pythonImportsCheck = [ "jaraco.net" ]; + + nativeCheckInputs = [ + pytestCheckHook + cherrypy + importlib-resources + requests-mock + ]; + + disabledTestPaths = [ + # doesn't actually contain tests + "fabfile.py" + # require networking + "jaraco/net/ntp.py" + "jaraco/net/scanner.py" + "tests/test_cookies.py" + ]; + + meta = { + changelog = "https://github.com/jaraco/jaraco.net/blob/${src.rev}/CHANGES.rst"; + description = "Networking tools by jaraco"; + homepage = "https://github.com/jaraco/jaraco.net"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/jaraco-test/default.nix b/pkgs/development/python-modules/jaraco-test/default.nix index 3f3f9d54f87f..fa4efeb53afc 100644 --- a/pkgs/development/python-modules/jaraco-test/default.nix +++ b/pkgs/development/python-modules/jaraco-test/default.nix @@ -14,16 +14,15 @@ buildPythonPackage rec { pname = "jaraco-test"; - version = "5.1.0"; + version = "5.3.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; - format = "pyproject"; - src = fetchPypi { pname = "jaraco.test"; inherit version; - sha256 = "04a7503c0c78cd057bd6b5f16ad1e3379b911b619df6694480a564ebc214c0a8"; + hash = "sha256-f2f8xTlTgXGCPlqp+dA04ulRLOTzVNEb39hNtytGHUA="; }; nativeBuildInputs = [ @@ -39,16 +38,19 @@ buildPythonPackage rec { jaraco_collections ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "jaraco.test" ]; + pythonImportsCheck = [ + "jaraco.test" + ]; - meta = { + meta = with lib; { description = "Testing support by jaraco"; homepage = "https://github.com/jaraco/jaraco.test"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; + changelog = "https://github.com/jaraco/jaraco.test/blob/v${version}/CHANGES.rst"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/jaraco_classes/default.nix b/pkgs/development/python-modules/jaraco_classes/default.nix index aadb9f9028f1..5fd16f1f505a 100644 --- a/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/pkgs/development/python-modules/jaraco_classes/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ more-itertools ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Utility functions for Python class constructs"; diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 686095d3b1c0..e42499b70999 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "3.5.2"; + version = "3.8.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ByuT6zX55IUISFdVU05mo07xzISvKR/Sfzm0TUwN0sM="; + sha256 = "sha256-VjBP1L1OuNWFzgys4KyAQYeRsUCFHjdIElQbCqJ8kdA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index de4b8c5ce489..afd7e113189e 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "jaraco.functools"; - version = "3.5.1"; + version = "3.5.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0K3PkXEKCFPv6fI6ePrVhr9n31cvDW2OD6NtKJrhwdk="; + sha256 = "sha256-RbBcFY860ocxB1VW/9R0m9JU7Gf5Hh6zZ9z+v/EVHbQ="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 95d20fd7e6be..8950d1aff394 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ inflect more-itertools six ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # tests no longer available through pypi doCheck = false; diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 4891b2ea38c5..21f0317cea57 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "jaraco.text"; - version = "3.9.1"; + version = "3.11.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1XzURIpYgCAxhCXgQZTol/lvwjuSuC/5MIok1cvys/s="; + sha256 = "sha256-DdtYlZX+F26oF5yAHKTs4r4Kpx83e5HzymW010GUg1E="; }; pythonNamespaces = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { importlib-resources ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ lib.optionals (pythonOlder "3.10") [ pathlib2 diff --git a/pkgs/development/python-modules/jarowinkler/default.nix b/pkgs/development/python-modules/jarowinkler/default.nix index b71187c9feae..9748c4121f15 100644 --- a/pkgs/development/python-modules/jarowinkler/default.nix +++ b/pkgs/development/python-modules/jarowinkler/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix index 3132c873246f..28ab53ce98a4 100644 --- a/pkgs/development/python-modules/javaproperties/default.nix +++ b/pkgs/development/python-modules/javaproperties/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ python-dateutil pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 07f4f5efedbd..816f6fe1c4da 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -21,7 +21,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.3.23"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,8 +29,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; repo = pname; - rev = "jax-v${version}"; - hash = "sha256-ruXOwpBwpi1G8jgH9nhbWbs14JupwWkjh+Wzrj8HVU4="; + rev = "refs/tags/jaxlib-v${version}"; + hash = "sha256-ajLI0iD0YZRK3/uKSbhlIZGc98MdW174vA34vhoy7Iw="; }; # jaxlib is _not_ included in propagatedBuildInputs because there are @@ -46,7 +46,7 @@ buildPythonPackage rec { typing-extensions ] ++ etils.optional-dependencies.epath; - checkInputs = [ + nativeCheckInputs = [ jaxlib matplotlib pytestCheckHook diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 1d3fb481b338..8574ed207754 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -56,6 +56,10 @@ let url = "https://storage.googleapis.com/jax-releases/mac/jaxlib-${version}-cp310-cp310-macosx_11_0_arm64.whl"; hash = "sha256-7Ir55ZhBkccqfoa56WVBF8QwFAC2ws4KFHDkfVw6zm0="; }; + "x86_64-darwin" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/mac/jaxlib-${version}-cp310-cp310-macosx_10_14_x86_64.whl"; + hash = "sha256-bOoQI+T+YsTUNA+cDu6wwYTcq9fyyzCpK9qrdCrNVoA="; + }; }; gpuSrc = fetchurl { @@ -121,6 +125,6 @@ buildPythonPackage rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; maintainers = with maintainers; [ samuela ]; - platforms = [ "aarch64-darwin" "x86_64-linux" ]; + platforms = [ "aarch64-darwin" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 37bfe4d739f8..baa9a0dc1abf 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -41,7 +41,6 @@ , zlib # CUDA flags: -, cudaCapabilities ? [ "sm_35" "sm_50" "sm_60" "sm_70" "sm_75" "compute_80" ] , cudaSupport ? false , cudaPackages ? {} @@ -50,7 +49,7 @@ }: let - inherit (cudaPackages) cudatoolkit cudnn nccl; + inherit (cudaPackages) cudatoolkit cudaFlags cudnn nccl; pname = "jaxlib"; version = "0.3.22"; @@ -165,7 +164,7 @@ let build --action_env TF_CUDA_PATHS="${cudatoolkit_joined},${cudnn},${nccl}" build --action_env TF_CUDA_VERSION="${lib.versions.majorMinor cudatoolkit.version}" build --action_env TF_CUDNN_VERSION="${lib.versions.major cudnn.version}" - build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${lib.concatStringsSep "," cudaCapabilities}" + build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${cudaFlags.cudaRealCapabilitiesCommaString}" '' + '' CFG ''; @@ -235,11 +234,13 @@ let fetchAttrs = { sha256 = if cudaSupport then - "sha256-Z9GDWGv+1YFyJjudyshZfeRJsKShoA1kIbNR3h3GxPQ=" - else if stdenv.isDarwin then - "sha256-i3wiJHD4+pgTvDMhnYiQo9pdxxKItgYnc4/4wGt2NXM=" - else - "sha256-liRxmjwm0OmVMfgoGXx+nGBdW2fzzP/d4zmK6A59HAM="; + "sha256-n8wo+hD9ZYO1SsJKgyJzUmjRlsz45WT6tt5ZLleGvGY=" + else { + x86_64-linux = "sha256-A0A18kxgGNGHNQ67ZPUzh3Yq2LEcRV7CqR9EfP80NQk="; + aarch64-linux = "sha256-mU2jzuDu89jVmaG/M5bA3jSd7n7lDi+h8sdhs1z8p1A="; + x86_64-darwin = "sha256-9nNTpetvjyipD/l8vKlregl1j/OnZKAcOCoZQeRBvts="; + aarch64-darwin = "sha256-dOGUsdFImeOLcZ3VtgrNnd8A/HgIs/LYuH9GQV7A+78="; + }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); }; buildAttrs = { diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index a77d36eca069..4cbba4d11a4b 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -10,19 +10,19 @@ buildPythonPackage rec { pname = "jc"; - version = "1.22.2"; + version = "1.22.5"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-GUzBZ9NCh+70yv40WDGWxQWq0F00oMpZOPQ3Y2AiQTQ="; + sha256 = "sha256-ktK/s9Tt1XNIiW/Ztn4znsPXIMrScB4KAS027YqxIVM="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "jc" ]; diff --git a/pkgs/development/python-modules/jdcal/default.nix b/pkgs/development/python-modules/jdcal/default.nix index c2dd66ac6634..abf5880e80f0 100644 --- a/pkgs/development/python-modules/jdcal/default.nix +++ b/pkgs/development/python-modules/jdcal/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "472872e096eb8df219c23f2689fc336668bdb43d194094b5cc1707e1640acfc8"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix index af61a5d5f236..35749407a36e 100644 --- a/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/pkgs/development/python-modules/jedi-language-server/default.nix @@ -1,39 +1,51 @@ { lib , buildPythonPackage -, fetchPypi -, fetchFromGitHub -, poetry , docstring-to-markdown +, fetchFromGitHub , jedi +, lsprotocol +, poetry-core , pygls -, pytestCheckHook +, pydantic , pyhamcrest +, pytestCheckHook , python-jsonrpc-server +, pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "jedi-language-server"; - version = "0.37.0"; + version = "0.40.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "pappasam"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-5il12WDmUkdud9zTpzTaoSXEqOaK15Ut3/fUAX422fA="; + hash = "sha256-+3VgONZzlobgs4wujCaGTTYpIgYrWgWwYgKQqirS7t8="; }; + pythonRelaxDeps = [ + "pygls" + ]; + nativeBuildInputs = [ - poetry + poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ docstring-to-markdown jedi + lsprotocol + pydantic pygls ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pyhamcrest python-jsonrpc-server @@ -48,8 +60,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/pappasam/jedi-language-server"; description = "A Language Server for the latest version(s) of Jedi"; + homepage = "https://github.com/pappasam/jedi-language-server"; + changelog = "https://github.com/pappasam/jedi-language-server/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; }; diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index f271920706fa..83efa565ddf5 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -1,8 +1,10 @@ { lib , stdenv , buildPythonPackage +, pythonAtLeast , pythonOlder , fetchFromGitHub +, attrs , django , pytestCheckHook , parso @@ -10,20 +12,23 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.18.1"; + version = "0.18.2"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi"; rev = "v${version}"; - sha256 = "sha256-wWNPNi16WtefvB7GcQBnWMbHVlVzxSFs4TKRqEasuR0="; + hash = "sha256-hNRmUFpRzVKJQAtfsSNV4jeTR8vVj1+mGBIPO6tUGto="; fetchSubmodules = true; }; propagatedBuildInputs = [ parso ]; - checkInputs = [ + nativeCheckInputs = [ + attrs django pytestCheckHook ]; @@ -33,19 +38,27 @@ buildPythonPackage rec { ''; disabledTests = [ - # Assertions mismatches with pytest>=6.0 - "test_completion" - # sensitive to platform, causes false negatives on darwin "test_import" ] ++ lib.optionals (stdenv.isAarch64 && pythonOlder "3.9") [ # AssertionError: assert 'foo' in ['setup'] "test_init_extension_module" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # disabled until 3.11 is added to _SUPPORTED_PYTHONS in jedi/api/environment.py + "test_find_system_environments" + + # disabled until https://github.com/davidhalter/jedi/issues/1858 is resolved + "test_interpreter" + "test_scanning_venvs" + "test_create_environment_venv_path" + "test_create_environment_executable" + "test_venv_and_pths" ]; meta = with lib; { - homepage = "https://github.com/davidhalter/jedi"; description = "An autocompletion tool for Python that can be used for text editors"; + homepage = "https://github.com/davidhalter/jedi"; + changelog = "https://github.com/davidhalter/jedi/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index 6ec1fb811cf0..3ba062e1ac54 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ async-timeout dbus pytest diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index a275b97310d9..65f385db922f 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "40c9a2ffd8bd3016f7611d424120442f627f56d518a106847dc93f0ead6ad79a"; }; - checkInputs = [ pytest unicodecsv ]; + nativeCheckInputs = [ pytest unicodecsv ]; meta = { homepage = "https://github.com/sunlightlabs/jellyfish"; diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix index 39ad443f1891..58fbd305e3ac 100644 --- a/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/pkgs/development/python-modules/jenkinsapi/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pytz requests ]; - checkInputs = [ mock pytest pytest-mock requests-kerberos toml ]; + nativeCheckInputs = [ mock pytest pytest-mock requests-kerberos toml ]; # TODO requests-kerberos is broken on darwin, weeding out the broken tests without # access to macOS is not an adventure I am ready to embark on - @rski doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/jieba/default.nix b/pkgs/development/python-modules/jieba/default.nix index 8b7146ebef93..a0fd5acf440a 100644 --- a/pkgs/development/python-modules/jieba/default.nix +++ b/pkgs/development/python-modules/jieba/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "028vmd6sj6wn9l1ilw7qfmlpyiysnlzdgdlhwxs6j4fvq0gyrwxk"; }; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; # UnicodeEncodeError doCheck = isPy3k; diff --git a/pkgs/development/python-modules/jinja2-ansible-filters/default.nix b/pkgs/development/python-modules/jinja2-ansible-filters/default.nix new file mode 100644 index 000000000000..33975ee204ea --- /dev/null +++ b/pkgs/development/python-modules/jinja2-ansible-filters/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi +, jinja2 +, pyyaml +}: + +buildPythonPackage rec { + pname = "jinja2-ansible-filters"; + version = "1.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-B8EM9E1wc/TwEQLKEtmi3DG0HUfkxh7ZLvam0mabNWs="; + }; + + propagatedBuildInputs = [ + jinja2 + pyyaml + ]; + + # no tests include in sdist, and source not available + doCheck = false; + + pythonImportsCheck = [ "jinja2_ansible_filters" ]; + + meta = with lib; { + description = "Jinja2 Ansible Filters"; + homepage = "https://pypi.org/project/jinja2-ansible-filters/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/jinja2_time/default.nix b/pkgs/development/python-modules/jinja2-time/default.nix similarity index 51% rename from pkgs/development/python-modules/jinja2_time/default.nix rename to pkgs/development/python-modules/jinja2-time/default.nix index 4268413fd3f5..ecd42a1c54dc 100644 --- a/pkgs/development/python-modules/jinja2_time/default.nix +++ b/pkgs/development/python-modules/jinja2-time/default.nix @@ -1,25 +1,40 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , arrow +, freezegun , jinja2 +, pytestCheckHook }: buildPythonPackage rec { - version = "0.2.0"; pname = "jinja2-time"; + version = "0.2.0"; src = fetchPypi { inherit pname version; sha256 = "0h0dr7cfpjnjj8bgl2vk9063a53649pn37wnlkd8hxjy656slkni"; }; + patches = [ + # fix usage of arrow in tests + (fetchpatch { + url = "https://github.com/hackebrot/jinja2-time/pull/19/commits/3b2476c266ba53262352153104ca3501722823a4.patch"; + sha256 = "sha256-zh4PpAj2GtpgaEap/Yvu6DNY84AwH/YTJlUPRRHPyTs="; + }) + ]; + propagatedBuildInputs = [ arrow jinja2 ]; + nativeCheckInputs = [ freezegun pytestCheckHook ]; + + pythonImportsCheck = [ "jinja2_time" ]; + meta = with lib; { homepage = "https://github.com/hackebrot/jinja2-time"; description = "Jinja2 Extension for Dates and Times"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index ee478fa152d1..048890d18c07 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { # See https://github.com/pallets/jinja/issues/1158 doCheck = !stdenv.is32bit; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 264bef920ea2..1002ae15dde5 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -15,8 +15,8 @@ buildPythonPackage rec { pname = "jira"; - version = "3.4.0"; - format = "setuptools"; + version = "3.4.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pycontribs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-XyMywnuJOGSXWsMNbwNbMaOeAa9bosBg6rvfNKw77Ik="; + hash = "sha256-EZCvYpcQ1dSsXDhipUalrHEG5SYOochktYrBdIoNDRo="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { requests-toolbelt ]; - checkInputs = [ + nativeCheckInputs = [ flaky pytestCheckHook requests-mock diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix index ca365b79b32d..92005868a57f 100644 --- a/pkgs/development/python-modules/jmespath/default.nix +++ b/pkgs/development/python-modules/jmespath/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-kCYbIG1t79WP3V6F9Hi/YzopAXmJBr4q04kVDFxg7b4="; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jmp/default.nix b/pkgs/development/python-modules/jmp/default.nix index 647cec6871c2..66eece32c52a 100644 --- a/pkgs/development/python-modules/jmp/default.nix +++ b/pkgs/development/python-modules/jmp/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { "jmp" ]; - checkInputs = [ + nativeCheckInputs = [ jaxlib pytestCheckHook ]; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index caa306be7dc5..98ec450671c9 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "sha256-4c7kp55K8iiBFk8hjUMR9gB0GX+3B+CC6AO2H20TcBg="; }; - checkInputs = [ sphinx numpydoc pytestCheckHook psutil ]; + nativeCheckInputs = [ sphinx numpydoc pytestCheckHook psutil ]; propagatedBuildInputs = [ lz4 setuptools ]; pytestFlagsArray = [ "joblib/test" ]; diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index 7432cf20622e..d7c179c8041d 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromGitHub +, fetchPypi , buildPythonPackage , rustPlatform , llvmPackages @@ -8,36 +8,31 @@ , pcsclite , nettle , httpx -, numpy , pytestCheckHook , pythonOlder +, vcrpy , PCSC , libiconv }: buildPythonPackage rec { pname = "johnnycanencrypt"; - version = "0.11.0"; - disabled = pythonOlder "3.7"; + version = "0.12.0"; + disabled = pythonOlder "3.8"; - src = fetchFromGitHub { - owner = "kushaldas"; - repo = "johnnycanencrypt"; - rev = "v${version}"; - hash = "sha256-YhuYejxuKZEv1xQ1fQcXSkt9I80iJOJ6MecG622JJJo="; + src = fetchPypi { + inherit pname version; + hash = "sha256-aGhM/uyYE7l0h6L00qp+HRUVaj7s/tnHWIHJpLAkmR4="; }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit patches src; + inherit src; name = "${pname}-${version}"; - hash = "sha256-r2NU1e3yeZDLOBy9pndGYM3JoH6BBKQkXMLsJR6PTRs="; + hash = "sha256-fcwDxkUFtA6LS77xdLktNnZJXmyl/ZzArvIW69SPpmI="; }; format = "pyproject"; - # https://github.com/kushaldas/johnnycanencrypt/issues/125 - patches = [ ./Cargo.lock.patch ]; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; propagatedBuildInputs = [ @@ -61,31 +56,23 @@ buildPythonPackage rec { libiconv ]; - # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage) - doCheck = false; - doInstallCheck = true; - - installCheckInputs = [ + nativeCheckInputs = [ pytestCheckHook - numpy + vcrpy ]; preCheck = '' - export TESTDIR=$(mktemp -d) - cp -r tests/ $TESTDIR - pushd $TESTDIR - ''; - - postCheck = '' - popd + # import from $out + rm -r johnnycanencrypt ''; pythonImportsCheck = [ "johnnycanencrypt" ]; meta = with lib; { homepage = "https://github.com/kushaldas/johnnycanencrypt"; + changelog = "https://github.com/kushaldas/johnnycanencrypt/blob/v${version}/changelog.md"; description = "Python module for OpenPGP written in Rust"; - license = licenses.gpl3Plus; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ _0x4A6F ]; }; } diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index 100228bf4f14..4dfe43e5ca40 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jproperties/default.nix b/pkgs/development/python-modules/jproperties/default.nix index 0089e153f4f3..35c762988bb8 100644 --- a/pkgs/development/python-modules/jproperties/default.nix +++ b/pkgs/development/python-modules/jproperties/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytest-datadir pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix index 92c78895eb62..9e31735242cc 100644 --- a/pkgs/development/python-modules/jpylyzer/default.nix +++ b/pkgs/development/python-modules/jpylyzer/default.nix @@ -1,26 +1,59 @@ { lib +, stdenv , fetchFromGitHub , buildPythonPackage , six +, lxml , pytestCheckHook +, doFullCheck ? false # weird filenames cause issues on some filesystems + +# for passthru.tests +, jpylyzer }: -buildPythonPackage rec { +let + # unclear relationship between test-files version and jpylyzer version. + # upstream appears to just always test against the latest version, so + # probably worth updating this when package is bumped. + testFiles = fetchFromGitHub { + owner = "openpreserve"; + repo = "jpylyzer-test-files"; + rev = "146cb0029b5ea9d8ef22dc6683cec8afae1cc63a"; + sha256 = "sha256-uKUau7mYXqGs4dSnXGPnPsH9k81ZCK0aPj5F9HWBMZ8="; + }; + +in buildPythonPackage rec { pname = "jpylyzer"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "openpreserve"; repo = pname; rev = version; - sha256 = "1cd9klq83g9p4nkg7x78axqid5vcsqzggp431hcfdiixa50yjxjg"; + sha256 = "sha256-LBVOwjWC/HEvGgoi8WxEdl33M4JrfdHEj1Dk7f1NAiA="; }; propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook lxml ]; + + # don't depend on testFiles unless doFullCheck as it may not be extractable + # on some filesystems due to weird filenames + preCheck = lib.optionalString doFullCheck '' + sed -i '/^testFilesDir = /ctestFilesDir = "${testFiles}"' tests/unit/test_testfiles.py + ''; + disabledTestPaths = lib.optionals (!doFullCheck) [ + "tests/unit/test_testfiles.py" + ]; + pythonImportsCheck = [ "jpylyzer" ]; + disallowedReferences = [ testFiles ]; + + passthru.tests = { + withFullCheck = jpylyzer.override { doFullCheck = true; }; + }; + meta = with lib; { description = "JP2 (JPEG 2000 Part 1) image validator and properties extractor"; homepage = "https://jpylyzer.openpreservation.org/"; diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix index 4d0ac3ebd8f7..e948c9f306c5 100644 --- a/pkgs/development/python-modules/jq/default.nix +++ b/pkgs/development/python-modules/jq/default.nix @@ -1,12 +1,14 @@ -{ buildPythonPackage, fetchPypi, lib, jq }: +{ lib, buildPythonPackage, fetchFromGitHub, cython, jq, pytestCheckHook }: buildPythonPackage rec { pname = "jq"; - version = "1.2.3"; + version = "1.3.0"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-15bXqaa6c6RMoHKqUAcOhPrhMBbqYHrDdnZAaFaHElc="; + src = fetchFromGitHub { + owner = "mwilliamson"; + repo = "jq.py"; + rev = version; + sha256 = "sha256-1EQm5ShjFHbO1IO5QD42fsGHFGDBrJulLrcl+WeU7wo="; }; patches = [ @@ -14,10 +16,18 @@ buildPythonPackage rec { ./jq-py-setup.patch ]; + nativeBuildInputs = [ cython ]; + buildInputs = [ jq ]; - # no tests executed - doCheck = false; + preBuild = '' + cython jq.pyx + ''; + + nativeCheckInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "jq" ]; meta = { diff --git a/pkgs/development/python-modules/jq/jq-py-setup.patch b/pkgs/development/python-modules/jq/jq-py-setup.patch index cf8713796751..0894b776fef6 100644 --- a/pkgs/development/python-modules/jq/jq-py-setup.patch +++ b/pkgs/development/python-modules/jq/jq-py-setup.patch @@ -1,17 +1,8 @@ -From bef841b73ba7c9a79211146798ac888fce9bb55a Mon Sep 17 00:00:00 2001 -From: "Robert T. McGibbon" -Date: Fri, 7 May 2021 19:14:20 -0400 -Subject: [PATCH 1/1] Vastly simplify setup.py for distro compatibility - ---- - setup.py | 98 +------------------------------------------------------- - 1 file changed, 1 insertion(+), 97 deletions(-) - diff --git a/setup.py b/setup.py -index 663792c..3ebcabe 100644 +index 01cc813..15e9048 100644 --- a/setup.py +++ b/setup.py -@@ -1,113 +1,19 @@ +@@ -1,97 +1,18 @@ #!/usr/bin/env python import os @@ -20,50 +11,42 @@ index 663792c..3ebcabe 100644 -import shutil -import sysconfig --import requests from setuptools import setup -from setuptools.command.build_ext import build_ext from setuptools.extension import Extension - --def urlretrieve(source_url, destination_path): -- response = requests.get(source_url, stream=True) -- if response.status_code != 200: -- raise Exception("status code was: {}".format(response.status_code)) - -- with open(destination_path, "wb") as fileobj: -- for chunk in response.iter_content(chunk_size=128): -- fileobj.write(chunk) -- --def path_in_dir(relative_path): +-def _path_in_dir(relative_path): - return os.path.abspath(os.path.join(os.path.dirname(__file__), relative_path)) - --def dependency_path(relative_path): -- return os.path.join(path_in_dir("_deps"), relative_path) +-def _dep_source_path(relative_path): +- return os.path.join(_path_in_dir("deps"), relative_path) - - def read(fname): +-def _dep_build_path(relative_path): +- return os.path.join(_path_in_dir("_deps/build"), relative_path) +- + def _read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() --jq_lib_tarball_path = dependency_path("jq-lib-1.6.tar.gz") --jq_lib_dir = dependency_path("jq-1.6") +-jq_lib_tarball_path = _dep_source_path("jq-1.6.tar.gz") +-jq_lib_dir = _dep_build_path("jq-1.6") - -oniguruma_version = "6.9.4" --oniguruma_lib_tarball_path = dependency_path("onig-{}.tar.gz".format(oniguruma_version)) --oniguruma_lib_build_dir = dependency_path("onig-{}".format(oniguruma_version)) --oniguruma_lib_install_dir = dependency_path("onig-install-{}".format(oniguruma_version)) +-oniguruma_lib_tarball_path = _dep_source_path("onig-{}.tar.gz".format(oniguruma_version)) +-oniguruma_lib_build_dir = _dep_build_path("onig-{}".format(oniguruma_version)) +-oniguruma_lib_install_dir = _dep_build_path("onig-install-{}".format(oniguruma_version)) - -class jq_build_ext(build_ext): - def run(self): -- if not os.path.exists(dependency_path(".")): -- os.makedirs(dependency_path(".")) +- if not os.path.exists(_dep_build_path(".")): +- os.makedirs(_dep_build_path(".")) - self._build_oniguruma() - self._build_libjq() - build_ext.run(self) - - def _build_oniguruma(self): - self._build_lib( -- source_url="https://github.com/kkos/oniguruma/releases/download/v{0}/onig-{0}.tar.gz".format(oniguruma_version), - tarball_path=oniguruma_lib_tarball_path, - lib_dir=oniguruma_lib_build_dir, - commands=[ @@ -75,7 +58,6 @@ index 663792c..3ebcabe 100644 - - def _build_libjq(self): - self._build_lib( -- source_url="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz", - tarball_path=jq_lib_tarball_path, - lib_dir=jq_lib_dir, - commands=[ @@ -83,9 +65,8 @@ index 663792c..3ebcabe 100644 - ["make"], - ]) - -- def _build_lib(self, source_url, tarball_path, lib_dir, commands): -- self._download_tarball( -- source_url=source_url, +- def _build_lib(self, tarball_path, lib_dir, commands): +- self._extract_tarball( - tarball_path=tarball_path, - lib_dir=lib_dir, - ) @@ -101,16 +82,10 @@ index 663792c..3ebcabe 100644 - for command in commands: - run_command(command) - -- def _download_tarball(self, source_url, tarball_path, lib_dir): -- if os.path.exists(tarball_path): -- os.unlink(tarball_path) -- print("Downloading {}".format(source_url)) -- urlretrieve(source_url, tarball_path) -- print("Downloaded {}".format(source_url)) -- +- def _extract_tarball(self, tarball_path, lib_dir): - if os.path.exists(lib_dir): - shutil.rmtree(lib_dir) -- tarfile.open(tarball_path, "r:gz").extractall(dependency_path(".")) +- tarfile.open(tarball_path, "r:gz").extractall(_dep_build_path(".")) - - jq_extension = Extension( @@ -126,19 +101,11 @@ index 663792c..3ebcabe 100644 ) setup( -@@ -120,7 +26,6 @@ setup( - python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', +@@ -104,7 +25,6 @@ def _extract_tarball(self, tarball_path, lib_dir): + python_requires='>=3.5', license='BSD 2-Clause', ext_modules = [jq_extension], - cmdclass={"build_ext": jq_build_ext}, classifiers=[ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', -@@ -137,4 +42,3 @@ setup( - 'Programming Language :: Python :: 3.9', - ], - ) -- --- -2.29.3 - diff --git a/pkgs/development/python-modules/js2py/default.nix b/pkgs/development/python-modules/js2py/default.nix index c47e6aee0bbd..9bbfe091c892 100644 --- a/pkgs/development/python-modules/js2py/default.nix +++ b/pkgs/development/python-modules/js2py/default.nix @@ -1,5 +1,5 @@ { lib -, fetchFromGitHub +, fetchPypi , buildPythonPackage , tzlocal , six @@ -8,13 +8,12 @@ buildPythonPackage rec { pname = "js2py"; - version = "0.71"; + version = "0.74"; - src = fetchFromGitHub { - owner = "PiotrDabkowski"; - repo = "Js2Py"; - rev = "5f665f60083a9796ec33861240ce31d6d2b844b6"; - sha256 = "sha256-1omTV7zkYSQfxhkNgI4gtXTenWt9J1r3VARRHoRsSfc="; + src = fetchPypi { + pname = "Js2Py"; + inherit version; + hash = "sha256-OfOmqoRpGA77o8hncnHfJ8MTMv0bRx3xryr1i4e4ly8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index d67939bc8adb..76ea0fe9a5a9 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jschema-to-python/default.nix b/pkgs/development/python-modules/jschema-to-python/default.nix index 5b25b5c18a4b..e217592e99b0 100644 --- a/pkgs/development/python-modules/jschema-to-python/default.nix +++ b/pkgs/development/python-modules/jschema-to-python/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pbr ]; - checkInputs =[ + nativeCheckInputs =[ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jsmin/default.nix b/pkgs/development/python-modules/jsmin/default.nix index 58759393bbed..a36c350264be 100644 --- a/pkgs/development/python-modules/jsmin/default.nix +++ b/pkgs/development/python-modules/jsmin/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "c0959a121ef94542e807a674142606f7e90214a2b3d1eb17300244bbb5cc2bfc"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/json-logging/default.nix b/pkgs/development/python-modules/json-logging/default.nix index a596dbe902b6..5a56ea4fbc02 100644 --- a/pkgs/development/python-modules/json-logging/default.nix +++ b/pkgs/development/python-modules/json-logging/default.nix @@ -3,6 +3,7 @@ , fastapi , fetchFromGitHub , flask +, httpx , pytestCheckHook , pythonOlder , requests @@ -21,13 +22,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bobbui"; repo = "json-logging-python"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-WOAEY1pONH+Gx1b8zHZDMNgJJSn7jvMO60LYTA8z/dE="; }; - checkInputs = [ + nativeCheckInputs = [ fastapi flask + httpx pytestCheckHook # quart requests @@ -53,6 +55,7 @@ buildPythonPackage rec { infrastructure such as ELK, EFK, AWS Cloudwatch, GCP Stackdriver. ''; homepage = "https://github.com/bobbui/json-logging-python"; + changelog = "https://github.com/bobbui/json-logging-python/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ AluisioASG ]; }; diff --git a/pkgs/development/python-modules/json-rpc/default.nix b/pkgs/development/python-modules/json-rpc/default.nix index e475c3117df3..58e4b5296444 100644 --- a/pkgs/development/python-modules/json-rpc/default.nix +++ b/pkgs/development/python-modules/json-rpc/default.nix @@ -4,14 +4,14 @@ let pythonEnv = lib.optional isPy27 mock; in buildPythonPackage rec { pname = "json-rpc"; - version = "1.13.0"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "12bmblnznk174hqg2irggx4hd3cq1nczbwkpsqqzr13hbg7xpw6y"; + sha256 = "sha256-/13xx/2G4dvQJZ8GWZdRzpGnx5DykEFHk6Vlq1ht3FI="; }; - checkInputs = pythonEnv ++ [ pytestCheckHook ]; + nativeCheckInputs = pythonEnv ++ [ pytestCheckHook ]; nativeBuildInputs = pythonEnv; 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 f420aefd7df9..88039e138e00 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.42.1"; + version = "0.44"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,8 +26,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "coveooss"; repo = pname; - rev = "v${version}"; - hash = "sha256-WVLIx85ivHz5b6C1AfgMAApngeFCuWwWhaBWNcfOvXA="; + rev = "refs/tags/v${version}"; + hash = "sha256-LsZPf5PVXPSyHNgfBdjH4hG4OFIdSprO5uj3saPDqzo="; }; postPatch = '' @@ -51,7 +51,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ beautifulsoup4 pytestCheckHook ]; @@ -70,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Quickly generate HTML documentation from a JSON schema"; homepage = "https://github.com/coveooss/json-schema-for-humans"; + changelog = "https://github.com/coveooss/json-schema-for-humans/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ astro ]; }; diff --git a/pkgs/development/python-modules/json-stream/default.nix b/pkgs/development/python-modules/json-stream/default.nix index bcfbe82ac943..de3d7b65c54d 100644 --- a/pkgs/development/python-modules/json-stream/default.nix +++ b/pkgs/development/python-modules/json-stream/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/json-tricks/default.nix b/pkgs/development/python-modules/json-tricks/default.nix index 9995e537c541..65ed7e7220fe 100644 --- a/pkgs/development/python-modules/json-tricks/default.nix +++ b/pkgs/development/python-modules/json-tricks/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "wdpqCqMO0EzKyqE4ishL3CTsSw3sZPGvJ0HEktKFgZU="; }; - checkInputs = [ numpy pandas pytz pytestCheckHook ]; + nativeCheckInputs = [ numpy pandas pytz pytestCheckHook ]; pythonImportsCheck = [ "json_tricks" ]; diff --git a/pkgs/development/python-modules/json5/default.nix b/pkgs/development/python-modules/json5/default.nix index 683811e0df5c..d1c3ccb9ea0a 100644 --- a/pkgs/development/python-modules/json5/default.nix +++ b/pkgs/development/python-modules/json5/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { hash = "sha256-0ommoTv5q7YuLNF+ZPWW/Xg/8CwnPrF7rXJ+eS0joUs="; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jsonconversion/default.nix b/pkgs/development/python-modules/jsonconversion/default.nix index 22f7fe4625d1..dda1d48a6912 100644 --- a/pkgs/development/python-modules/jsonconversion/default.nix +++ b/pkgs/development/python-modules/jsonconversion/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "'pytest-runner'" "" ''; - checkInputs = [ pytestCheckHook numpy ]; + nativeCheckInputs = [ pytestCheckHook numpy ]; pythonImportsCheck = [ "jsonconversion" ]; diff --git a/pkgs/development/python-modules/jsonfield/default.nix b/pkgs/development/python-modules/jsonfield/default.nix index 6b7faf9a312d..37e280b2a184 100644 --- a/pkgs/development/python-modules/jsonfield/default.nix +++ b/pkgs/development/python-modules/jsonfield/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0yl828cd0m8jsyr4di6hcjdqmi31ijh5vk57mbpfl7p2gmcq8kky"; }; - checkInputs = [ pytestCheckHook pytest-django ]; + nativeCheckInputs = [ pytestCheckHook pytest-django ]; preCheck = "export DJANGO_SETTINGS_MODULE=tests.settings"; diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix index a111d3ef6d04..6eb818013e9d 100644 --- a/pkgs/development/python-modules/jsonlines/default.nix +++ b/pkgs/development/python-modules/jsonlines/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { attrs ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix index de9656d01ccd..69a76db190f0 100644 --- a/pkgs/development/python-modules/jsonmerge/default.nix +++ b/pkgs/development/python-modules/jsonmerge/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jsonschema ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Fails with "Unresolvable JSON pointer" diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix index 03060f4e866f..0f117cb0d5e1 100644 --- a/pkgs/development/python-modules/jsonpatch/default.nix +++ b/pkgs/development/python-modules/jsonpatch/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { jsonpointer ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jsonpath-ng/default.nix b/pkgs/development/python-modules/jsonpath-ng/default.nix index fce18a6da2cc..86d39b5944fa 100644 --- a/pkgs/development/python-modules/jsonpath-ng/default.nix +++ b/pkgs/development/python-modules/jsonpath-ng/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ # Exclude tests that require oslotest diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index 969869f86b52..8289bf0e9575 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "2.2.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eycpGLBVQYLlPcNA3dYtm3+QL+x+ewViDATzzO9Hmg4="; + sha256 = "sha256-AyU4gEeV5zuU6tQQgArDh/223pj4iCrJV/zSR+OoUgA="; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; nativeBuildInputs = [ setuptools-scm diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix index 2ab8ec45a701..abd3fad2fd4c 100644 --- a/pkgs/development/python-modules/jsonref/default.nix +++ b/pkgs/development/python-modules/jsonref/default.nix @@ -1,20 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +}: buildPythonPackage rec { pname = "jsonref"; - version = "0.2"; + version = "1.0.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "15v69rg2lkcykb2spnq6vbbirv9sfq480fnwmfppw9gn3h95pi7k"; + src = fetchFromGitHub { + owner = "gazpachoking"; + repo = "jsonref"; + rev = "refs/tags/v${version}"; + hash = "sha256-8p0BmDZGpQ6Dl9rkqRKZKc0doG5pyXpfcVpemmetLhs="; }; - checkInputs = [ pytest mock ]; + nativeBuildInputs = [ + poetry-core + ]; - checkPhase = '' - py.test tests.py - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests.py" + ]; meta = with lib; { description = "An implementation of JSON Reference for Python"; diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index 2c66779e0196..b34bb4435d0c 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { jsonrpc-base ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix index f10fc3f1237b..42aa42638013 100644 --- a/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-C03m/zeLIFqsmEMSzt84LMOWAHUcpdEHhaa5hx2NsoQ="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index 9da8d8cf8ab1..fb70cdf69550 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { jsonrpc-base ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/jsons/default.nix b/pkgs/development/python-modules/jsons/default.nix index 9d1083bb47c3..457bcf4f6525 100644 --- a/pkgs/development/python-modules/jsons/default.nix +++ b/pkgs/development/python-modules/jsons/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { typish ]; - checkInputs = [ + nativeCheckInputs = [ attrs pytestCheckHook tzdata diff --git a/pkgs/development/python-modules/jsonschema-spec/default.nix b/pkgs/development/python-modules/jsonschema-spec/default.nix index 4e11bd4a27e2..28e93508ae86 100644 --- a/pkgs/development/python-modules/jsonschema-spec/default.nix +++ b/pkgs/development/python-modules/jsonschema-spec/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jsonschema/3_x.nix b/pkgs/development/python-modules/jsonschema/3_x.nix index b78165fc4f32..b86c5abda6be 100644 --- a/pkgs/development/python-modules/jsonschema/3_x.nix +++ b/pkgs/development/python-modules/jsonschema/3_x.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs importlib-metadata functools32 pyrsistent ]; - checkInputs = [ nose mock pyperf twisted vcversioner ]; + nativeCheckInputs = [ nose mock pyperf twisted vcversioner ]; # zope namespace collides on py27 doCheck = !isPy27; diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index 69dba8bd472e..71a7bc36320a 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -11,18 +11,29 @@ , pythonOlder , twisted , typing-extensions + +# optionals +, fqdn +, idna +, isoduration +, jsonpointer +, rfc3339-validator +, rfc3986-validator +, rfc3987 +, uri-template +, webcolors }: buildPythonPackage rec { pname = "jsonschema"; - version = "4.17.0"; + version = "4.17.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-W/zyvKFqCHreF+ArKC00r3zNdJ73YkHn+b18DLipQk0="; + sha256 = "sha256-D4ZEN6uLYHa6ZwdFPvj5imoNUSqA6T+KvbZ29zfstg0="; }; postPatch = '' @@ -45,7 +56,30 @@ buildPythonPackage rec { importlib-resources ]; - checkInputs = [ + passthru.optional-dependencies = { + format = [ + fqdn + idna + isoduration + jsonpointer + rfc3339-validator + rfc3987 + uri-template + webcolors + ]; + format-nongpl = [ + fqdn + idna + isoduration + jsonpointer + rfc3339-validator + rfc3986-validator + uri-template + webcolors + ]; + }; + + nativeCheckInputs = [ twisted ]; diff --git a/pkgs/development/python-modules/jsonstreams/default.nix b/pkgs/development/python-modules/jsonstreams/default.nix index 9b7816e8b186..197e372edf16 100644 --- a/pkgs/development/python-modules/jsonstreams/default.nix +++ b/pkgs/development/python-modules/jsonstreams/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests --doctest-modules jsonstreams" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/jstyleson/default.nix b/pkgs/development/python-modules/jstyleson/default.nix index be6eff6755f5..d5b7b0a76b69 100644 --- a/pkgs/development/python-modules/jstyleson/default.nix +++ b/pkgs/development/python-modules/jstyleson/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-s/0DDfy+07TuUNjHPqKRT3xMMQl6spZCacB7Dweof7A="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index 3de77e17095e..a26e98a7b172 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { bottle ]; - checkInputs = [ + nativeCheckInputs = [ numpy pytestCheckHook pyyaml diff --git a/pkgs/development/python-modules/junit-xml/default.nix b/pkgs/development/python-modules/junit-xml/default.nix index c7133c206d84..a6475188405b 100644 --- a/pkgs/development/python-modules/junit-xml/default.nix +++ b/pkgs/development/python-modules/junit-xml/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Creates JUnit XML test result documents that can be read by tools such as Jenkins"; diff --git a/pkgs/development/python-modules/junitparser/default.nix b/pkgs/development/python-modules/junitparser/default.nix index 3a712251fc5d..2dbd902efeef 100644 --- a/pkgs/development/python-modules/junitparser/default.nix +++ b/pkgs/development/python-modules/junitparser/default.nix @@ -2,30 +2,32 @@ , buildPythonPackage , fetchFromGitHub , future -, python +, glibcLocales +, lxml +, unittestCheckHook }: buildPythonPackage rec { pname = "junitparser"; - version = "1.4.1"; + version = "2.8.0"; src = fetchFromGitHub { - owner = "gastlygem"; + owner = "weiwei"; repo = pname; rev = version; - sha256 = "16xwayr0rbp7xdg7bzmyf8s7al0dhkbmkcnil66ax7r8bznp5lmp"; + hash = "sha256-rhDP05GSWT4K6Z2ip8C9+e3WbvBJOwP0vctvANBs7cw="; }; propagatedBuildInputs = [ future ]; - checkPhase = '' - ${python.interpreter} test.py - ''; + nativeCheckInputs = [ unittestCheckHook lxml glibcLocales ]; + + unittestFlagsArray = [ "-v" ]; meta = with lib; { - description = "A JUnit/xUnit Result XML Parser"; + description = "Manipulates JUnit/xUnit Result XML files"; license = licenses.asl20; - homepage = "https://github.com/gastlygem/junitparser"; + homepage = "https://github.com/weiwei/junitparser"; maintainers = with maintainers; [ multun ]; }; } diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 2cd29ba4da4b..c7c9997cf8ff 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "junos-eznc"; - version = "2.6.5"; + version = "2.6.6"; format = "setuptools"; src = fetchFromGitHub { owner = "Juniper"; repo = "py-junos-eznc"; - rev = version; - hash = "sha256-BoHT6ejccInfREbYtW6psm3fvsQxLS1vpj/aPDqqpnY="; + rev = "refs/tags/${version}"; + hash = "sha256-0JF9/lSIquXp25bM3GESqLC//aorSVT0hHccaOmQuM8="; }; propagatedBuildInputs = [ @@ -52,7 +52,7 @@ buildPythonPackage rec { yamlordereddictloader ]; - checkInputs = [ + nativeCheckInputs = [ mock nose ]; diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 7753f201a928..44f88d56d953 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -40,6 +40,10 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace "jsonschema<4" "jsonschema" \ --replace "sphinx-external-toc~=0.2.3" "sphinx-external-toc" \ + --replace "sphinx-jupyterbook-latex~=0.4.6" "sphinx-jupyterbook-latex" \ + --replace "sphinx-thebe~=0.1.1" "sphinx-thebe" \ + --replace "sphinx>=4,<5" "sphinx" \ + --replace "sphinx_book_theme~=0.3.2" "sphinx_book_theme" \ --replace "myst-nb~=0.13.1" "myst-nb" \ --replace "docutils>=0.15,<0.18" "docutils" \ --replace "sphinx-design~=0.1.0" "sphinx-design" \ diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix index 598cef9a8e58..23a1f35d2de8 100644 --- a/pkgs/development/python-modules/jupyter-client/default.nix +++ b/pkgs/development/python-modules/jupyter-client/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , entrypoints -, jupyter_core +, jupyter-core , hatchling , nest-asyncio , python-dateutil @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "7.3.5"; + version = "7.4.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PFhGahuNVdugvzzgg05PW3dguvmNHXPbCt1vGd6ezR0="; + sha256 = "sha256-EJo8M7YqnPZaqDJYUKCZmnlfrBVdneT3VVrvXzEO41o="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ entrypoints - jupyter_core + jupyter-core nest-asyncio python-dateutil pyzmq diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter-core/default.nix similarity index 81% rename from pkgs/development/python-modules/jupyter_core/default.nix rename to pkgs/development/python-modules/jupyter-core/default.nix index 56dc157a69d2..4a64530d1c10 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter-core/default.nix @@ -3,13 +3,14 @@ , pythonOlder , fetchFromGitHub , hatchling +, platformdirs , traitlets , pytestCheckHook }: buildPythonPackage rec { - pname = "jupyter_core"; - version = "4.11.2"; + pname = "jupyter-core"; + version = "5.1.1"; disabled = pythonOlder "3.7"; format = "pyproject"; @@ -17,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyter"; repo = "jupyter_core"; - rev = version; - hash = "sha256-lDhwvhsOxLHBC6CQjCW/rmtHSuMRPC2yaurBd5K3FLc="; + rev = "refs/tags/v${version}"; + hash = "sha256-54zbo+RXgT9AJabmJYHCznyoinTQqrTORzlM48WpnQQ="; }; patches = [ @@ -30,10 +31,11 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + platformdirs traitlets ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch b/pkgs/development/python-modules/jupyter-core/tests_respect_pythonpath.patch similarity index 100% rename from pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch rename to pkgs/development/python-modules/jupyter-core/tests_respect_pythonpath.patch diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix new file mode 100644 index 000000000000..26b3328538c3 --- /dev/null +++ b/pkgs/development/python-modules/jupyter-events/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build +, hatchling + +# runtime +, jsonschema +, python-json-logger +, pyyaml +, traitlets + +# optionals +, click +, rich + +# tests +, pytest-asyncio +, pytest-console-scripts +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jupyter-events"; + version = "0.5.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jupyter"; + repo = "jupyter_events"; + rev = "refs/tags/v${version}"; + hash = "sha256-ak5JNMitxMvXaHPmjMhB58y8Fy8N1oLtqNMNZ9lgpnM="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + jsonschema + python-json-logger + pyyaml + traitlets + ] + ++ jsonschema.optional-dependencies.format + ++ jsonschema.optional-dependencies.format-nongpl; + + passthru.optional-dependencies = { + cli = [ + click + rich + ]; + }; + + nativeCheckInputs = [ + pytest-asyncio + pytest-console-scripts + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + preCheck = '' + export PATH="$out/bin:$PATH" + ''; + + meta = with lib; { + changelog = "https://github.com/jupyter/jupyter_events/releases/tag/v${version}"; + description = "Configurable event system for Jupyter applications and extensions"; + homepage = "https://github.com/jupyter/jupyter_events"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/jupyter-lsp/default.nix b/pkgs/development/python-modules/jupyter-lsp/default.nix index ffcde4a5b216..342e0233eb76 100644 --- a/pkgs/development/python-modules/jupyter-lsp/default.nix +++ b/pkgs/development/python-modules/jupyter-lsp/default.nix @@ -2,7 +2,7 @@ , lib , buildPythonPackage , fetchPypi -, jupyter_server +, jupyter-server }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - jupyter_server + jupyter-server ]; # tests require network doCheck = false; diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix index 1ee870bfd573..62dfc6ded932 100644 --- a/pkgs/development/python-modules/jupyter-packaging/default.nix +++ b/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { tomlkit ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-timeout ]; diff --git a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix index 73797f8fd0d8..21eb1f9eb77f 100644 --- a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix +++ b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , jupyter-packaging -, jupyter_server +, jupyter-server , pytest-tornasync , pytestCheckHook }: @@ -22,10 +22,10 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jupyter_server + jupyter-server ]; - checkInputs = [ + nativeCheckInputs = [ pytest-tornasync pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jupyter-server-terminals/default.nix b/pkgs/development/python-modules/jupyter-server-terminals/default.nix new file mode 100644 index 000000000000..507df9b22429 --- /dev/null +++ b/pkgs/development/python-modules/jupyter-server-terminals/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build +, hatchling + +# runtime +, terminado + +# tests +, pytest-jupyter +, pytest-timeout +, pytestCheckHook +}: + +let self = buildPythonPackage rec { + pname = "jupyter-server-terminals"; + version = "0.4.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jupyter-server"; + repo = "jupyter_server_terminals"; + rev = "refs/tags/v${version}"; + hash = "sha256-swFMuKP/JIHJJ0zr3Dqv71Ne4WaP7GbzeNQ2tzEBpRU="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + terminado + ]; + + doCheck = false; # infinite recursion + + nativeCheckInputs = [ + pytest-jupyter + pytest-timeout + pytestCheckHook + ] ++ pytest-jupyter.optional-dependencies.server; + + passthru.tests = { + check = self.overridePythonAttrs (_: { doCheck = true; }); + }; + + meta = with lib; { + changelog = "https://github.com/jupyter-server/jupyter_server_terminals/releases/tag/v${version}"; + description = "A Jupyter Server Extension Providing Support for Terminals"; + homepage = "https://github.com/jupyter-server/jupyter_server_terminals"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +}; +in self diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix similarity index 79% rename from pkgs/development/python-modules/jupyter_server/default.nix rename to pkgs/development/python-modules/jupyter-server/default.nix index 791e238f3874..b8ecde78eda7 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -3,9 +3,12 @@ , buildPythonPackage , fetchPypi , pythonOlder +, hatch-jupyter-builder +, hatchling , pandoc , pytestCheckHook , pytest-console-scripts +, pytest-jupyter , pytest-timeout , pytest-tornasync , argon2-cffi @@ -15,8 +18,10 @@ , ipykernel , ipython_genutils , traitlets -, jupyter_core +, jupyter-core , jupyter-client +, jupyter-events +, jupyter-server-terminals , nbformat , nbconvert , send2trash @@ -29,15 +34,22 @@ }: buildPythonPackage rec { - pname = "jupyter_server"; - version = "1.19.1"; + pname = "jupyter-server"; + version = "2.0.6"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-0cw1lpRYSXQrw+7fBpn+61CtbGBF6+8CqSmLfxPCfp8="; + pname = "jupyter_server"; + inherit version; + hash= "sha256-jddZkukLfKVWeUoe1cylEmPGl6vG0N9WGvV0qhwKAz8="; }; + nativeBuildInputs = [ + hatch-jupyter-builder + hatchling + ]; + propagatedBuildInputs = [ argon2-cffi jinja2 @@ -45,8 +57,10 @@ buildPythonPackage rec { pyzmq ipython_genutils traitlets - jupyter_core + jupyter-core jupyter-client + jupyter-events + jupyter-server-terminals nbformat nbconvert send2trash @@ -57,11 +71,12 @@ buildPythonPackage rec { requests-unixsocket ]; - checkInputs = [ + nativeCheckInputs = [ ipykernel pandoc pytestCheckHook pytest-console-scripts + pytest-jupyter pytest-timeout pytest-tornasync requests diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix index 8943ba8adc0b..f5d4f12e3073 100644 --- a/pkgs/development/python-modules/jupyter_console/default.nix +++ b/pkgs/development/python-modules/jupyter_console/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { prompt-toolkit pygments ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 04db4d4d0c22..ffa6a336696a 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -133,7 +133,7 @@ buildPythonPackage rec { "'jupyterhub-singleuser'" "'$out/bin/jupyterhub-singleuser'" ''; - checkInputs = [ + nativeCheckInputs = [ # https://github.com/jupyterhub/jupyterhub/blob/master/dev-requirements.txt beautifulsoup4 cryptography diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index b8914a2a45a0..8d7d78ce70a5 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchPypi , git -, jupyter_server +, jupyter-server , jupyter-packaging , jupyterlab , nbdime @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.39.2"; + version = "0.41.0"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "jupyterlab_git"; inherit version; - sha256 = "sha256-+wzKAK5jdrlPjtVDgp7QqOyXaBDzzkRJI+6hcbOcnpo="; + sha256 = "sha256-UXZ9qgAvCKfPCzchFOtwbv8vNPEtcLU0dwBGTmiHSD4="; }; nativeBuildInputs = [ @@ -32,14 +32,14 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jupyter_server + jupyter-server nbdime git nbformat pexpect ]; - checkInputs = [ + nativeCheckInputs = [ jupyterlab pytest-asyncio pytest-tornasync diff --git a/pkgs/development/python-modules/jupyterlab-pygments/default.nix b/pkgs/development/python-modules/jupyterlab-pygments/default.nix index 3d6b9fa93350..a31f0de42e6f 100644 --- a/pkgs/development/python-modules/jupyterlab-pygments/default.nix +++ b/pkgs/development/python-modules/jupyterlab-pygments/default.nix @@ -1,16 +1,18 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pygments }: +{ lib, buildPythonPackage, fetchPypi, pygments, jupyter-packaging }: buildPythonPackage rec { pname = "jupyterlab_pygments"; - version = "0.1.2"; + version = "0.2.2"; - src = fetchFromGitHub { - owner = "jupyterlab"; - repo = pname; - rev = version; - sha256 = "02lv63qalw4x6xs70n2w2p3c2cnhk91sr961wlbi77xs0g8fcman"; + src = fetchPypi { + inherit pname version; + hash = "sha256-dAXX/eYIGdkFqfqM6J5M2DDjGM2tIqADD3qQHacFWF0="; }; + nativeBuildInputs = [ + jupyter-packaging + ]; + # no tests exist on upstream repo doCheck = false; diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix index 7077d39cb742..1634e986d025 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 = "3.0.3"; + version = "3.0.5"; src = fetchPypi { pname = "jupyterlab_widgets"; inherit version; - sha256 = "sha256-x2cYE5m0yotke+/i2ROxJg9Rv52O+behRjLUwae1Nr0="; + sha256 = "sha256-7q7N6vbAOvyWDdriAc7YjVl5tMqcOJG8uPZjGvcF9e8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 4bc5acb5cc42..8ac600083f59 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.5.0"; + version = "3.5.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4CVWyOobOGljxLRk5GGK7hU8VBawerSBQlyBegMzI6I="; + hash = "sha256-UeiJRIrhlO7vjlD2P1xPSH9yj0d77+Q26XSWcvdRHb4="; }; nativeBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/jupyterlab/jupyterlab/releases/tag/v${version}"; description = "Jupyter lab environment notebook server extension"; license = with licenses; [ bsd3 ]; homepage = "https://jupyter.org/"; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index c7a294eef44f..35abc73f5d30 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -8,7 +8,7 @@ , pytestCheckHook , json5 , babel -, jupyter_server +, jupyter-server , tomli , openapi-core , pytest-timeout @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.16.3"; + version = "2.17.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Y1oLF2qQHxk1HAIiGhJOWTF8R29REgBAm32GfospBcM="; + hash = "sha256-pbaSPiqeopn5jeW1DN6Qci10748HE6dcvL+/0/Qa0Fg="; }; nativeBuildInputs = [ @@ -38,13 +38,13 @@ buildPythonPackage rec { jsonschema json5 babel - jupyter_server + jupyter-server tomli - ] ++ lib.optional (pythonOlder "3.10") [ + ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ openapi-core pytestCheckHook pytest-timeout diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index dabbe303e161..872d99c821d1 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch -, GitPython +, gitpython , isort , jupyter-client , jupyter-packaging @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "mwouts"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-DDF4aTLkhEl4xViYh/E0/y6swcwZ9KbeS0qKm+HdFz8="; + hash = "sha256-DDF4aTLkhEl4xViYh/E0/y6swcwZ9KbeS0qKm+HdFz8="; }; patches = [ @@ -52,8 +52,8 @@ buildPythonPackage rec { toml ]; - checkInputs = [ - GitPython + nativeCheckInputs = [ + gitpython isort jupyter-client notebook diff --git a/pkgs/development/python-modules/justbackoff/default.nix b/pkgs/development/python-modules/justbackoff/default.nix index 814d1d3e53f3..f07af6df2d2a 100644 --- a/pkgs/development/python-modules/justbackoff/default.nix +++ b/pkgs/development/python-modules/justbackoff/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "097j6jxgl4b3z46x9y9z10643vnr9v831vhagrxzrq6nviil2z6l"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/justbases/default.nix b/pkgs/development/python-modules/justbases/default.nix index 90f59b6cfcc4..1ea6140147fc 100644 --- a/pkgs/development/python-modules/justbases/default.nix +++ b/pkgs/development/python-modules/justbases/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { hash = "sha256-vQEfC8Z7xMM/fhBG6jSuhLEP/Iece5Rje1yqbpjVuPg="; }; - checkInputs = [ hypothesis ]; + nativeCheckInputs = [ hypothesis ]; meta = with lib; { description = "conversion of ints and rationals to any base"; diff --git a/pkgs/development/python-modules/justbytes/default.nix b/pkgs/development/python-modules/justbytes/default.nix index 31afb7540be2..dde6c5d4bd0e 100644 --- a/pkgs/development/python-modules/justbytes/default.nix +++ b/pkgs/development/python-modules/justbytes/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ justbases ]; - checkInputs = [ hypothesis ]; + nativeCheckInputs = [ hypothesis ]; meta = with lib; { description = "computing with and displaying bytes"; diff --git a/pkgs/development/python-modules/jxmlease/default.nix b/pkgs/development/python-modules/jxmlease/default.nix index 19b29bf76397..a9782ef2d40f 100644 --- a/pkgs/development/python-modules/jxmlease/default.nix +++ b/pkgs/development/python-modules/jxmlease/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { # https://github.com/Juniper/jxmlease/issues/26 doCheck = false; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-v" ]; diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index 6123f4d410f6..b3f56a8e0d62 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchPypi , substituteAll -, krb5Full +, krb5 , findutils , which , pythonOlder @@ -11,21 +11,21 @@ buildPythonPackage rec { pname = "k5test"; - version = "0.10.1"; + version = "0.10.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "2c9181133f3d52c8e29a5ba970b668273c08f855e5da834aaee2ea9efeb6b069"; + sha256 = "sha256-nJ3uvK1joxXoGDPUXp/RK/IBZmQ7iry5/29NaxhMVx8="; }; patches = [ (substituteAll { src = ./fix-paths.patch; - inherit findutils krb5Full; + inherit findutils krb5; # krb5-config is in dev output - krb5FullDev = krb5Full.dev; + krb5Dev = krb5.dev; which = "${which}/bin/which"; }) ]; diff --git a/pkgs/development/python-modules/k5test/fix-paths.patch b/pkgs/development/python-modules/k5test/fix-paths.patch index dc6caf815809..c455ecf00ef7 100644 --- a/pkgs/development/python-modules/k5test/fix-paths.patch +++ b/pkgs/development/python-modules/k5test/fix-paths.patch @@ -7,13 +7,13 @@ index e289fac..e2f486a 100644 # if there was no LD_LIBRARY_PATH, or the above failed if _PLUGIN_DIR is None: - lib_dir = os.path.join(get_output('krb5-config --prefix'), 'lib64') -+ lib_dir = os.path.join(get_output('@krb5FullDev@/bin/krb5-config --prefix'), 'lib64') ++ lib_dir = os.path.join(get_output('@krb5Dev@/bin/krb5-config --prefix'), 'lib64') _PLUGIN_DIR = _decide_plugin_dir(_find_plugin_dirs_installed(lib_dir)) # /usr/lib64 seems only to be distinct on Fedora/RHEL/Centos family if _PLUGIN_DIR is None: - lib_dir = os.path.join(get_output('krb5-config --prefix'), 'lib') -+ lib_dir = os.path.join(get_output('@krb5FullDev@/bin/krb5-config --prefix'), 'lib') ++ lib_dir = os.path.join(get_output('@krb5Dev@/bin/krb5-config --prefix'), 'lib') _PLUGIN_DIR = _decide_plugin_dir(_find_plugin_dirs_installed(lib_dir)) if _PLUGIN_DIR is not None: @@ -53,7 +53,7 @@ index 161e5ad..9f50049 100644 if provider_cls == K5Realm: krb5_config = _discover_path('krb5-config', - '/usr/bin/krb5-config', kwargs) -+ '@krb5Full@/bin/krb5-config', kwargs) ++ '@krb5@/bin/krb5-config', kwargs) try: krb5_version = subprocess.check_output( @@ -62,7 +62,7 @@ index 161e5ad..9f50049 100644 if 'heimdal' in krb5_version.lower() or ( sys.platform == 'darwin' and - krb5_config == '/usr/bin/krb5-config'): -+ krb5_config == '@krb5Full@/bin/krb5-config'): ++ krb5_config == '@krb5@/bin/krb5-config'): provider_cls = HeimdalRealm else: provider_cls = MITRealm @@ -78,14 +78,14 @@ index 161e5ad..9f50049 100644 - ('kprop', 'kprop', '/usr/sbin/kprop'), - ('_kinit', 'kinit', '/usr/bin/kinit'), - ('_klist', 'klist', '/usr/bin/klist'), -+ ('kdb5_util', 'kdb5_util', '@krb5Full@/bin/kdb5_util'), -+ ('krb5kdc', 'krb5kdc', '@krb5Full@/bin/kdb5kdc'), -+ ('kadmin', 'kadmin', '@krb5Full@/bin/admin'), -+ ('kadmin_local', 'kadmin.local', '@krb5Full@/bin/kadmin.local'), -+ ('kadmind', 'kadmind', '@krb5Full@/bin/kadmind'), -+ ('kprop', 'kprop', '@krb5Full@/bin/kprop'), -+ ('_kinit', 'kinit', '@krb5Full@/bin/kinit'), -+ ('_klist', 'klist', '@krb5Full@/bin/klist'), ++ ('kdb5_util', 'kdb5_util', '@krb5@/bin/kdb5_util'), ++ ('krb5kdc', 'krb5kdc', '@krb5@/bin/kdb5kdc'), ++ ('kadmin', 'kadmin', '@krb5@/bin/admin'), ++ ('kadmin_local', 'kadmin.local', '@krb5@/bin/kadmin.local'), ++ ('kadmind', 'kadmind', '@krb5@/bin/kadmind'), ++ ('kprop', 'kprop', '@krb5@/bin/kprop'), ++ ('_kinit', 'kinit', '@krb5@/bin/kinit'), ++ ('_klist', 'klist', '@krb5@/bin/klist'), ] @property @@ -95,15 +95,15 @@ index 161e5ad..9f50049 100644 ('krb5kdc', 'kdc', os.path.join(base, 'kdc')), - ('kadmin', 'kadmin', '/usr/bin/kadmin'), - ('kadmin_local', 'kadmin', '/usr/bin/kadmin'), -+ ('kadmin', 'kadmin', '@krb5Full@/bin/kadmin'), -+ ('kadmin_local', 'kadmin', '@krb5Full@/bin/kadmin'), ++ ('kadmin', 'kadmin', '@krb5@/bin/kadmin'), ++ ('kadmin_local', 'kadmin', '@krb5@/bin/kadmin'), ('kadmind', 'kadmind', os.path.join(base, 'kadmind')), - ('_kinit', 'kinit', '/usr/bin/kinit'), - ('_klist', 'klist', '/usr/bin/klist'), - ('_ktutil', 'ktutil', '/usr/bin/ktutil'), -+ ('_kinit', 'kinit', '@krb5Full@/bin/kinit'), -+ ('_klist', 'klist', '@krb5Full@/bin/klist'), -+ ('_ktutil', 'ktutil', '@krb5Full@/bin/ktutil'), ++ ('_kinit', 'kinit', '@krb5@/bin/kinit'), ++ ('_klist', 'klist', '@krb5@/bin/klist'), ++ ('_ktutil', 'ktutil', '@krb5@/bin/ktutil'), ] @property @@ -116,7 +116,7 @@ index 3c64b9e..59da1ab 100644 global _KRB_VERSION if _KRB_VERSION is None: - _KRB_VERSION = _utils.get_output("krb5-config --version") -+ _KRB_VERSION = _utils.get_output("@krb5FullDev@/bin/krb5-config --version") ++ _KRB_VERSION = _utils.get_output("@krb5Dev@/bin/krb5-config --version") _KRB_VERSION = _KRB_VERSION.split(' ')[-1].split('.') def make_ext_test(func): diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index d8f37f563d4a..089c4a8ffc0a 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "04dfe7fea2b63726cd6f3e79a2d86e709d608d74406638c5da33a01d45a9d7e3"; }; - checkInputs = [ pytest six mock ]; + nativeCheckInputs = [ pytest six mock ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix index 95a47baaeb04..759adc82ab57 100644 --- a/pkgs/development/python-modules/kajiki/default.nix +++ b/pkgs/development/python-modules/kajiki/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ babel pytz nine ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Kajiki provides fast well-formed XML templates"; diff --git a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix index 8f5a11f14c61..7748e34df6f2 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix @@ -13,15 +13,19 @@ }: let - old-openfst = openfst.overrideAttrs (self: { + old-openfst = openfst.overrideAttrs (prev: { + version = "kag-unstable-2022-05-06"; + src = fetchFromGitHub { owner = "kkm000"; repo = "openfst"; + # required by https://github.com/daanzu/kaldi-fork-active-grammar/blob/e9c7d0ffca401cf312779d25f2c05a34b41ff696/cmake/third_party/openfst.cmake#L7 rev = "0bca6e76d24647427356dc242b0adbf3b5f1a8d9"; sha256 = "1802rr14a03zl1wa5a0x1fa412kcvbgprgkadfj5s6s3agnn11rx"; }; buildInputs = [ zlib ]; - }); in + }); +in assert blas.implementation == "openblas" && lapack.implementation == "openblas"; @@ -66,6 +70,20 @@ stdenv.mkDerivation rec { postPatch = '' # Replace the shebangs for the various build scripts patchShebangs src + # Compatability with OpenBLAS 0.3.21 + substituteInPlace src/matrix/cblas-wrappers.h \ + --replace stptri_ LAPACK_stptri \ + --replace dtptri_ LAPACK_dtptri \ + --replace sgetrf_ LAPACK_sgetrf \ + --replace dgetrf_ LAPACK_dgetrf \ + --replace sgetri_ LAPACK_sgetri \ + --replace dgetri_ LAPACK_dgetri \ + --replace sgesvd_ LAPACK_sgesvd \ + --replace dgesvd_ LAPACK_dgesvd \ + --replace ssptri_ LAPACK_ssptri \ + --replace dsptri_ LAPACK_dsptri \ + --replace ssptrf_ LAPACK_ssptrf \ + --replace dsptrf_ LAPACK_dsptrf ''; configurePhase = '' diff --git a/pkgs/development/python-modules/kanidm/default.nix b/pkgs/development/python-modules/kanidm/default.nix index 57ae3c59b563..eb60f61d5f3c 100644 --- a/pkgs/development/python-modules/kanidm/default.nix +++ b/pkgs/development/python-modules/kanidm/default.nix @@ -43,7 +43,7 @@ buildPythonPackage { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix index 309ecda49ccc..270b202e0c14 100644 --- a/pkgs/development/python-modules/kaptan/default.nix +++ b/pkgs/development/python-modules/kaptan/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyyaml ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { description = "Configuration manager for python applications"; diff --git a/pkgs/development/python-modules/karton-asciimagic/default.nix b/pkgs/development/python-modules/karton-asciimagic/default.nix index 74cfa7f8b53c..465b865d662c 100644 --- a/pkgs/development/python-modules/karton-asciimagic/default.nix +++ b/pkgs/development/python-modules/karton-asciimagic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { karton-core ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "karton.asciimagic" ]; diff --git a/pkgs/development/python-modules/karton-classifier/default.nix b/pkgs/development/python-modules/karton-classifier/default.nix index bcf4b075dfaf..6578dc70a6be 100644 --- a/pkgs/development/python-modules/karton-classifier/default.nix +++ b/pkgs/development/python-modules/karton-classifier/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { python-magic ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index 9a25f3cf1237..65c56cbae18c 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { redis ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "karton.core" diff --git a/pkgs/development/python-modules/karton-yaramatcher/default.nix b/pkgs/development/python-modules/karton-yaramatcher/default.nix index 67f99af39d9a..ac9c93ee1c4d 100644 --- a/pkgs/development/python-modules/karton-yaramatcher/default.nix +++ b/pkgs/development/python-modules/karton-yaramatcher/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { yara-python ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "karton.yaramatcher" ]; diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix index d84ee1994b5b..057f5f76a9f9 100644 --- a/pkgs/development/python-modules/kbcstorage/default.nix +++ b/pkgs/development/python-modules/kbcstorage/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { # ValueError: Root URL is required. doCheck = false; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook responses ]; diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index a29ce9368071..ca4f3c863e67 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ecdsa hidapi libusb1 mnemonic protobuf ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # tests requires hardware doCheck = false; diff --git a/pkgs/development/python-modules/keepkey_agent/default.nix b/pkgs/development/python-modules/keepkey_agent/default.nix index 27ef7d8dbf48..fc00b23ce509 100644 --- a/pkgs/development/python-modules/keepkey_agent/default.nix +++ b/pkgs/development/python-modules/keepkey_agent/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ]; doCheck = false; - pythonImportsChecks = [ "keepkey_agent" ]; + pythonImportsCheck = [ "keepkey_agent" ]; meta = with lib; { description = "Using KeepKey as hardware-based SSH/PGP agent"; diff --git a/pkgs/development/python-modules/kegtron-ble/default.nix b/pkgs/development/python-modules/kegtron-ble/default.nix index 4af4817d7f84..315054b10de9 100644 --- a/pkgs/development/python-modules/kegtron-ble/default.nix +++ b/pkgs/development/python-modules/kegtron-ble/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/pkgs/development/python-modules/keras-preprocessing/default.nix index a0d9d4bb153d..49bc63a5db08 100644 --- a/pkgs/development/python-modules/keras-preprocessing/default.nix +++ b/pkgs/development/python-modules/keras-preprocessing/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { scipy pillow ]; - checkInputs = [ + nativeCheckInputs = [ pytest keras ]; diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 32f4ad3a5995..37b7de10f85c 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -6,15 +6,15 @@ buildPythonPackage rec { pname = "keras"; - version = "2.10.0"; + version = "2.11.0"; format = "wheel"; src = fetchPypi { inherit format pname version; - sha256 = "sha256-JqbiwlIudGjd6iJxCpmzKQSTdo/AijnnXRFzoONFL98="; + sha256 = "sha256-OMb/8OqaiwaicXc2VlySpzyM2bHCOecSXMsYi3hI9l4="; }; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-cov pytest-xdist diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 6ff68d42caaa..3e3cf64ce1cf 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "keyring"; - version = "23.11.0"; + version = "23.13.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rRkiY+LN1fEodd7cLaE1NDWafnYOd/jQS1CWioIcI2E="; + hash = "sha256-ui4VqbNeIZCNCq9OCkesxS1q4zRE3w2itJ1BpG721ng="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { "keyring.backend" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index 7b46634d9f4a..b556718a8cce 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook keyring ]; diff --git a/pkgs/development/python-modules/keyrings-cryptfile/default.nix b/pkgs/development/python-modules/keyrings-cryptfile/default.nix index 23b8b66ea9fa..87cda535128e 100644 --- a/pkgs/development/python-modules/keyrings-cryptfile/default.nix +++ b/pkgs/development/python-modules/keyrings-cryptfile/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { "keyrings.cryptfile" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/keyrings-passwordstore/default.nix b/pkgs/development/python-modules/keyrings-passwordstore/default.nix new file mode 100644 index 000000000000..11f632d7bf5d --- /dev/null +++ b/pkgs/development/python-modules/keyrings-passwordstore/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +, keyring +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "keyrings.passwordstore"; + version = "0.1.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-pylZw45FUtLHzUV4cDyl/nT8tCZwNj4Jf41MMlyskoU="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + nativeCheckInputs = [ + keyring + ]; + + pythonImportsCheck = [ + "keyrings.passwordstore.backend" + ]; + + meta = { + license = lib.licenses.mit; + description = "Keyring backend for password-store"; + homepage = "https://github.com/stv0g/keyrings.passwordstore"; + maintainers = [ lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index cc10ec96686c..b13e862cde6f 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 = "5.0.0"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-brtfBEyd/SYwh6Mo1R1HmUfR3ckMCdr0GR333HEzQyM="; + sha256 = "sha256-nve0txmnmkoEOHpqpVintspK3xi4Ex8YasrwZD/5e74="; }; postPatch = '' @@ -50,7 +50,7 @@ buildPythonPackage rec { stevedore ]; - checkInputs = [ + nativeCheckInputs = [ hacking oslo-config oslo-utils diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix index 21eeb11d136c..031ae5a65c39 100644 --- a/pkgs/development/python-modules/keyutils/default.nix +++ b/pkgs/development/python-modules/keyutils/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ''; buildInputs = [ keyutils ]; - checkInputs = [ pytest pytest-runner ]; + nativeCheckInputs = [ pytest pytest-runner ]; meta = { description = "A set of python bindings for keyutils"; diff --git a/pkgs/development/python-modules/kinparse/default.nix b/pkgs/development/python-modules/kinparse/default.nix index 7d6437f41a86..95632f9ce9f2 100644 --- a/pkgs/development/python-modules/kinparse/default.nix +++ b/pkgs/development/python-modules/kinparse/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { doCheck = true; pythonImportsCheck = [ "kinparse" ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/kiss-headers/default.nix b/pkgs/development/python-modules/kiss-headers/default.nix index 43d1f784fab9..f89c7983de37 100644 --- a/pkgs/development/python-modules/kiss-headers/default.nix +++ b/pkgs/development/python-modules/kiss-headers/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' substituteInPlace setup.cfg \ diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix index 0b6f41d2c199..e60650594855 100644 --- a/pkgs/development/python-modules/kitchen/default.nix +++ b/pkgs/development/python-modules/kitchen/default.nix @@ -1,16 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + buildPythonPackage rec { pname = "kitchen"; version = "1.2.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0g5hq2icnng9vy4www5hnr3r5srisfwp0wxw1sv5c5dxy61gak5q"; + hash = "sha256-uEz1gvG9FVa2DrxzcLnTMeuSR7awcM6J3+lZy6LAsDw="; }; + # Waiting for upstream's clean-up + doCheck = false; + + pythonImportsCheck = [ + "kitchen" + ]; + meta = with lib; { description = "Kitchen contains a cornucopia of useful code"; - license = licenses.lgpl2; + homepage = "https://github.com/fedora-infra/kitchen"; + changelog = "https://github.com/fedora-infra/kitchen/blob/${version}/NEWS.rst"; + license = licenses.lgpl2Only; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix index 0e8b81ed19cd..0b91d0bb9728 100644 --- a/pkgs/development/python-modules/kivy/default.nix +++ b/pkgs/development/python-modules/kivy/default.nix @@ -11,23 +11,15 @@ buildPythonPackage rec { pname = "Kivy"; - version = "2.0.0"; + version = "2.1.0"; - # use github since pypi line endings are CRLF and patches do not apply src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; rev = version; - sha256 = "sha256-/7GSVQUkYSBEnLVBizMnZAZZxvXVN4r4lskyOgLEcew="; + sha256 = "sha256-k9LIiLtlHY6H1xfVylI/Xbm7R6pCpC5UHe8GWnCwEGA="; }; - patches = [ - (fetchpatch { - url = "https://github.com/kivy/kivy/commit/1c0656c4472817677cf3b08be504de9ca6b1713f.patch"; - sha256 = "sha256-phAjMaC3LQuvufwiD0qXzie5B+kezCf8FpKeQMhy/ms="; - }) - ]; - nativeBuildInputs = [ pkg-config cython diff --git a/pkgs/development/python-modules/kiwiki-client/default.nix b/pkgs/development/python-modules/kiwiki-client/default.nix new file mode 100644 index 000000000000..22da8a5236e2 --- /dev/null +++ b/pkgs/development/python-modules/kiwiki-client/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python-dateutil +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "kiwiki-client"; + version = "0.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "c7h"; + repo = "kiwiki_client"; + rev = "refs/tags/${version}"; + hash = "sha256-CIBed8HzbUqUIzNy1lHxIgjneA6R8uKtmd43LU92M0Q="; + }; + + propagatedBuildInputs = [ + python-dateutil + requests + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "kiwiki" + ]; + + meta = with lib; { + description = "Module to interact with the KIWI.KI API"; + homepage = "https://github.com/c7h/kiwiki_client"; + changelog = "https://github.com/c7h/kiwiki_client/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix index ef5a5a7832e0..aaea3c9b6ff9 100644 --- a/pkgs/development/python-modules/klaus/default.nix +++ b/pkgs/development/python-modules/klaus/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "klaus"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "jonashaag"; repo = pname; rev = version; - sha256 = "sha256-a0MbKjDqPSMakjmGS5gfaDaPegQpK4QA+ZdG7skd9QU="; + sha256 = "sha256-kQcza2beyekJhRT9RwSdMIkeyapcUDtjgkapK3rocvg="; }; prePatch = '' @@ -20,7 +20,7 @@ buildPythonPackage rec { flask pygments dulwich httpauth humanize ]; - checkInputs = [ + nativeCheckInputs = [ pytest requests python-ctags3 ] ++ lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix index d40005ef56af..0fda816533cf 100644 --- a/pkgs/development/python-modules/klein/default.nix +++ b/pkgs/development/python-modules/klein/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis treq ]; diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix index c3418b2c5c94..a3788cb123fd 100644 --- a/pkgs/development/python-modules/kmapper/default.nix +++ b/pkgs/development/python-modules/kmapper/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { jinja2 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook networkx matplotlib diff --git a/pkgs/development/python-modules/kml2geojson/default.nix b/pkgs/development/python-modules/kml2geojson/default.nix index 6ceb71a9e5be..489e80f94f04 100644 --- a/pkgs/development/python-modules/kml2geojson/default.nix +++ b/pkgs/development/python-modules/kml2geojson/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index 2e3808db8561..0c2dae23b11d 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -11,15 +11,19 @@ , mock , vcrpy , pytest +, pythonOlder }: buildPythonPackage rec { pname = "knack"; - version = "0.10.0"; + version = "0.10.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ExkPqV1MIbzgS0vuItak4/sZqTtpmbHRBL0CxHZwbCg="; + hash = "sha256-xXKBKCl+bSaXkQhc+Wwv/fzvWM+DxjSly5LrA7KSmDg="; }; propagatedBuildInputs = [ @@ -32,7 +36,7 @@ buildPythonPackage rec { tabulate ]; - checkInputs = [ + nativeCheckInputs = [ mock vcrpy pytest @@ -42,9 +46,14 @@ buildPythonPackage rec { HOME=$TMPDIR pytest . ''; + pythonImportsCheck = [ + "knack" + ]; + meta = with lib; { homepage = "https://github.com/microsoft/knack"; description = "A Command-Line Interface framework"; + changelog = "https://github.com/microsoft/knack/blob/v${version}/HISTORY.rst"; platforms = platforms.all; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index be4f4aad5665..28fe591d80c2 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ azure-servicebus case Pyro4 diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 731aba746062..03c858dd92f2 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { "kubernetes" ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 9b0b241c5ed1..641a4accc864 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -1,67 +1,103 @@ { lib , backoff -, backports-datetime-fromisoformat , buildPythonPackage -, dataclasses , fetchFromGitHub +, geojson , google-api-core -, jinja2 +, imagesize , ndjson +, numpy +, opencv + # , opencv-python +, packaging , pillow , pydantic + # , pygeotile +, pyproj , pytest-cases , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , rasterio , requests , shapely +, tqdm +, typeguard +, typing-extensions }: buildPythonPackage rec { pname = "labelbox"; - version = "3.24.1"; - disabled = pythonOlder "3.6"; + version = "3.34.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; rev = "refs/tags/v.${version}"; - sha256 = "sha256-pcIbCtVOr6pwodgNv8aGZ+k2Z9cQPCQm1UBJWJAlj/o="; + hash = "sha256-x/XvcGiFS//f/le3JAd2n/tuUy9MBrCsISpkIkCCNis="; }; + postPatch = '' + substituteInPlace pytest.ini \ + --replace "-s -vv -x --reruns 5 --reruns-delay 10 --durations=20" "-s -vv -x --durations=20" + ''; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "backoff" + ]; + propagatedBuildInputs = [ backoff - backports-datetime-fromisoformat - dataclasses google-api-core - jinja2 ndjson - pillow pydantic - rasterio requests - shapely + tqdm ]; - postPatch = '' - substituteInPlace setup.py --replace "pydantic==1.8" "pydantic>=1.8" - ''; + passthru.optional-dependencies = { + data = [ + shapely + geojson + numpy + pillow + # opencv-python + typeguard + imagesize + pyproj + # pygeotile + typing-extensions + packaging + ]; + }; - checkInputs = [ + nativeCheckInputs = [ pytest-cases pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.data; disabledTestPaths = [ # Requires network access "tests/integration" + # Missing requirements + "tests/data" ]; - pythonImportsCheck = [ "labelbox" ]; + pythonImportsCheck = [ + "labelbox" + ]; meta = with lib; { description = "Platform API for LabelBox"; homepage = "https://github.com/Labelbox/labelbox-python"; + changelog = "https://github.com/Labelbox/labelbox-python/blob/v.${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; }; diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index 2032eb33d60c..bcae9b88398d 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" ''; - checkInputs = [ + nativeCheckInputs = [ mock psutil pytestCheckHook diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index 72a80298c5cd..eb99c9b2b89d 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { setuptools # pkg_resources import in language_data/util.py ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/langdetect/default.nix b/pkgs/development/python-modules/langdetect/default.nix index 4eab3bd06e58..5d3dae158060 100644 --- a/pkgs/development/python-modules/langdetect/default.nix +++ b/pkgs/development/python-modules/langdetect/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/language-tags/default.nix b/pkgs/development/python-modules/language-tags/default.nix index ea3be88335c9..fb40b1fbc935 100644 --- a/pkgs/development/python-modules/language-tags/default.nix +++ b/pkgs/development/python-modules/language-tags/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-4Ira3EMS64AM8I3SLmUm+m6V5vwtDYf8WDmVDvI+ZOw="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/lark/default.nix b/pkgs/development/python-modules/lark/default.nix index 62123032a5d4..7707693f2ab0 100644 --- a/pkgs/development/python-modules/lark/default.nix +++ b/pkgs/development/python-modules/lark/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "lark"; - version = "1.1.2"; + version = "1.1.5"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; - rev = version; - sha256 = "sha256-Y1bDSiFnqAKTlIcd8aAgtc+I3TLnWF8hhQK2ez96TQs="; + rev = "refs/tags/${version}"; + sha256 = "sha256-drvF+0PSOdrha2rfpntrM8xIbeb0S7eNtfioxkdjEKw="; }; # Optional import, but fixes some re known bugs & allows advanced regex features @@ -28,7 +28,7 @@ buildPythonPackage rec { "lark.grammars" ]; - checkInputs = [ + nativeCheckInputs = [ js2py pytestCheckHook ]; diff --git a/pkgs/development/python-modules/larynx-train/default.nix b/pkgs/development/python-modules/larynx-train/default.nix new file mode 100644 index 000000000000..6e31d660cca9 --- /dev/null +++ b/pkgs/development/python-modules/larynx-train/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, larynx + +# build +, cython +, python + +# propagates +, espeak-phonemizer +, librosa +, numpy +, onnxruntime +, pytorch-lightning +, torch +}: + +buildPythonPackage rec { + inherit (larynx) version src meta; + + pname = "larynx-train"; + format = "setuptools"; + + sourceRoot = "source/src/python"; + + nativeBuildInputs = [ + cython + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "onnxruntime~=1.11.0" "onnxruntime" \ + --replace "pytorch-lightning~=1.7.0" "pytorch-lightning" \ + --replace "torch~=1.11.0" "torch" + ''; + + postBuild = '' + make -C larynx_train/vits/monotonic_align + ''; + + postInstall = '' + export MONOTONIC_ALIGN=$out/${python.sitePackages}/larynx_train/vits/monotonic_align/monotonic_align + mkdir -p $MONOTONIC_ALIGN + cp -v ./larynx_train/vits/monotonic_align/larynx_train/vits/monotonic_align/core.*.so $MONOTONIC_ALIGN/ + ''; + + propagatedBuildInputs = [ + espeak-phonemizer + librosa + numpy + onnxruntime + pytorch-lightning + torch + ]; + + pythonImportsCheck = [ + "larynx_train" + ]; + + doCheck = false; # no tests +} diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix index 37ffe23b8061..be3808659220 100644 --- a/pkgs/development/python-modules/latexcodec/default.nix +++ b/pkgs/development/python-modules/latexcodec/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/latexify-py/default.nix b/pkgs/development/python-modules/latexify-py/default.nix index 9356a5f31986..f0da746107b0 100644 --- a/pkgs/development/python-modules/latexify-py/default.nix +++ b/pkgs/development/python-modules/latexify-py/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { cd src ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "latexify" ]; diff --git a/pkgs/development/python-modules/launchpadlib/default.nix b/pkgs/development/python-modules/launchpadlib/default.nix index 10f7405a268a..2ac1ca14ebac 100644 --- a/pkgs/development/python-modules/launchpadlib/default.nix +++ b/pkgs/development/python-modules/launchpadlib/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "launchpadlib"; - version = "1.10.18"; + version = "1.11.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uFRv4XrKUUfSRq0gd4xKVUTrR6+RsYUVJDePpo8tcmQ="; + sha256 = "sha256-AYmMk3R3sMZKdTOK2wl3Ao1zRqigGesCPPaP7ZmFAUY="; }; propagatedBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { wadllib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/lazr-restfulclient/default.nix b/pkgs/development/python-modules/lazr-restfulclient/default.nix index 9db7239f44a7..9a4cfbaa75cc 100644 --- a/pkgs/development/python-modules/lazr-restfulclient/default.nix +++ b/pkgs/development/python-modules/lazr-restfulclient/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { # E ModuleNotFoundError: No module named 'lazr.uri' doCheck = false; - checkInputs = [ fixtures lazr-uri pytestCheckHook wsgi-intercept ]; + nativeCheckInputs = [ fixtures lazr-uri pytestCheckHook wsgi-intercept ]; pythonImportsCheck = [ "lazr.restfulclient" ]; diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index 0619a62fa32d..475c6e86d58a 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.7.1"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "d609c75b986def706743cdebe5e47553f4a5a1da9c5ff66d76013ef396b5a8a4"; + sha256 = "sha256-whmgAkWvD2+k6VkB7SgERUT1AVKEDFtqPnslaNs00VY="; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace ",<6.0" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/lazy_import/default.nix b/pkgs/development/python-modules/lazy_import/default.nix index 8cfd377a4efa..00766ffc1db4 100644 --- a/pkgs/development/python-modules/lazy_import/default.nix +++ b/pkgs/development/python-modules/lazy_import/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0gca9xj60qr3aprj9qdc66crr4r7hl8wzv6gc9y40nclazwawj91"; }; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-xdist ]; diff --git a/pkgs/development/python-modules/ld2410-ble/default.nix b/pkgs/development/python-modules/ld2410-ble/default.nix new file mode 100644 index 000000000000..30af931ef361 --- /dev/null +++ b/pkgs/development/python-modules/ld2410-ble/default.nix @@ -0,0 +1,56 @@ +{ lib +, async-timeout +, bleak +, bleak-retry-connector +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "ld2410-ble"; + version = "0.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "930913"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-D8Z3OXlXWsaN0Ck9gx//J9TCaQmirYDbaXK7aTpI7ns="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + async-timeout + bleak + bleak-retry-connector + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=ld2410_ble --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "ld2410_ble" + ]; + + meta = with lib; { + description = "Library for the LD2410B modules from HiLinks"; + homepage = "https://github.com/930913/ld2410-ble"; + changelog = "https://github.com/930913/ld2410-ble/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ldapdomaindump/default.nix b/pkgs/development/python-modules/ldapdomaindump/default.nix index 3e1358cd8f22..a7e8a5de4a65 100644 --- a/pkgs/development/python-modules/ldapdomaindump/default.nix +++ b/pkgs/development/python-modules/ldapdomaindump/default.nix @@ -1,23 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi, dnspython, future, ldap3 }: +{ lib +, buildPythonPackage +, fetchPypi +, dnspython +, future +, ldap3 +, pythonOlder +}: buildPythonPackage rec { pname = "ldapdomaindump"; - version = "0.9.3"; + version = "0.9.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "10cis8cllpa9qi5qil9k7521ag3921mxwg2wj9nyn0lk41rkjagc"; + hash = "sha256-mdzaFwUKllSZZuU7yJ5x2mcAlNU9lUKzsNAZfQNeb1I="; }; - propagatedBuildInputs = [ dnspython future ldap3 ]; + propagatedBuildInputs = [ + dnspython + future + ldap3 + ]; # requires ldap server doCheck = false; - pythonImportsCheck = [ "ldapdomaindump" ]; + + pythonImportsCheck = [ + "ldapdomaindump" + ]; meta = with lib; { description = "Active Directory information dumper via LDAP"; homepage = "https://github.com/dirkjanm/ldapdomaindump/"; + changelog = "https://github.com/dirkjanm/ldapdomaindump/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index 4697c80680af..14d23a96d262 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ python-ldap prettytable ]; - checkInputs = [ fixtures testresources testtools ]; + nativeCheckInputs = [ fixtures testresources testtools ]; meta = with lib; { description = "A simple connector pool for python-ldap"; diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix index f7b5e7cf96b8..caf4f3ef3339 100644 --- a/pkgs/development/python-modules/ldaptor/default.nix +++ b/pkgs/development/python-modules/ldaptor/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { zope_interface ] ++ twisted.optional-dependencies.tls; - checkInputs = [ + nativeCheckInputs = [ twisted ]; diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix index af2cb219cdbd..99977e7c6a2f 100644 --- a/pkgs/development/python-modules/leather/default.nix +++ b/pkgs/development/python-modules/leather/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ + nativeCheckInputs = [ cssselect lxml nose diff --git a/pkgs/development/python-modules/leb128/default.nix b/pkgs/development/python-modules/leb128/default.nix index fa71abd735e7..6ba2330eb56a 100644 --- a/pkgs/development/python-modules/leb128/default.nix +++ b/pkgs/development/python-modules/leb128/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "040l6fxyzqal841kirf783kk1840gcy1gjd374jfr46v96qc8scm"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "leb128" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/led-ble/default.nix b/pkgs/development/python-modules/led-ble/default.nix index 810a9d59c02c..53ae154857aa 100644 --- a/pkgs/development/python-modules/led-ble/default.nix +++ b/pkgs/development/python-modules/led-ble/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { flux-led ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 7480045f7008..be5b87146901 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.43"; + version = "0.1.44"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-t0mdw8cBGUZ33BWOSeEHyFAGga/Tf1F/gATFSfCpAJQ="; + hash = "sha256-pOLpeej10G7Br8juTuQOSuCbhMjAP4aY0/JwnmJRblk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/leidenalg/default.nix b/pkgs/development/python-modules/leidenalg/default.nix new file mode 100644 index 000000000000..f1b55e0ae817 --- /dev/null +++ b/pkgs/development/python-modules/leidenalg/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, ddt +, fetchPypi +, igraph +, igraph-c +, pythonOlder +, setuptools-scm +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "leidenalg"; + version = "0.9.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-flz+O2+A8yuQ9V81xo1KmQsEibEoLPP6usjNpJiJdfM="; + }; + + postPatch = '' + substituteInPlace ./setup.py \ + --replace "[\"/usr/include/igraph\", \"/usr/local/include/igraph\"]" \ + "[\"${igraph-c.dev}/include/igraph\"]" + + rm -r vendor + ''; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + igraph + igraph-c + ]; + + checkInputs = [ + ddt + unittestCheckHook + ]; + + pythonImportsCheck = [ "leidenalg" ]; + + meta = with lib; { + description = "Implementation of the Leiden algorithm for various quality functions to be used with igraph in Python"; + homepage = "https://leidenalg.readthedocs.io"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ jboy ]; + }; +} diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix index 74fecc7f0e53..d3c717a7e0c9 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/pkgs/development/python-modules/lektor/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytest-click pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 835552ee526b..6faaae0794a7 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "levenshtein"; - version = "0.20.8"; + version = "0.20.9"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "Levenshtein"; rev = "refs/tags/v${version}"; - hash = "sha256-McTgQa4c+z+ABlm+tOgVf82meXZ1vWlzYCREnkxIfv0="; + hash = "sha256-BPfv3XsAaspLGmztllUYLq6VMKaW+s/Pp18RQmSrilc="; }; nativeBuildInputs = [ @@ -36,11 +37,15 @@ buildPythonPackage rec { rapidfuzz-cpp ]; + NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [ + "-fno-lto" # work around https://github.com/NixOS/nixpkgs/issues/19098 + ]; + propagatedBuildInputs = [ rapidfuzz ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -51,7 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Functions for fast computation of Levenshtein distance and string similarity"; homepage = "https://github.com/maxbachmann/Levenshtein"; - changelog = "https://github.com/maxbachmann/Levenshtein/blob/${src.rev}/HISTORY.md"; + changelog = "https://github.com/maxbachmann/Levenshtein/blob/${version}/HISTORY.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/lexid/default.nix b/pkgs/development/python-modules/lexid/default.nix index 0e9cf69ea8c0..5ab5953aef62 100644 --- a/pkgs/development/python-modules/lexid/default.nix +++ b/pkgs/development/python-modules/lexid/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "micro library to increment lexically ordered numerical ids"; diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 1aa0346795ee..3bb8962e5a3a 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ mock pytest ]; + nativeCheckInputs = [ mock pytest ]; checkPhase = '' py.test libagent/tests diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 8985e8fbcf51..fbf0224204e8 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { # data files missing doCheck = false; - checkInputs = [ pytest pytest-runner pytest-cov coverage ]; + nativeCheckInputs = [ pytest pytest-runner pytest-cov coverage ]; propagatedBuildInputs = [ six ]; meta = with lib; { diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index aafe92e73089..943ed138f991 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { "libarchive" ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales mock pytestCheckHook diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 7ebfe30ac937..817afce5cd1c 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.6.1"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-D6zzIGVoQwyZjaQOm7rG06DE/IDdUWdNnnlLOBRQEgw="; + sha256 = "sha256-FIqeUAaWVEMqfTSZeVTpFDTdOOv2iDLrnHXUQrPmL60="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index d763c52d8191..8fef5c7151b2 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "libcst"; - version = "0.4.7"; + version = "0.4.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,14 +26,14 @@ buildPythonPackage rec { owner = "instagram"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-YrGajxs8t8PU4XRkFlhwtxoa9pzpKPXq8ZvN/uqftlE="; + hash = "sha256-ikddvKsvXMNHMfA9jUhvyiDXII0tTs/rE97IGI/azgA="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "source/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-V/WHZVvh8HtD8IUNk3V4e8/E2A8DebqY5i/lS1X6x3o="; + hash = "sha256-FWQGv3E5X+VEnTYD0uKN6W4USth8EQlEGbYgUAWZ5EQ="; }; cargoRoot = "native"; @@ -60,7 +60,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix index 2807804b77d9..0f4e1a8e05dd 100644 --- a/pkgs/development/python-modules/libevdev/default.nix +++ b/pkgs/development/python-modules/libevdev/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Python wrapper around the libevdev C library"; diff --git a/pkgs/development/python-modules/liblarch/default.nix b/pkgs/development/python-modules/liblarch/default.nix index 3700ebb85dde..6035260a9d58 100644 --- a/pkgs/development/python-modules/liblarch/default.nix +++ b/pkgs/development/python-modules/liblarch/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "sha256-A2qChe2z6rAhjRVX5VoHQitebf/nMATdVZQgtlquuYg="; }; - checkInputs = [ + nativeCheckInputs = [ gobject-introspection # for setup hook gtk3 ]; diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index 7ced26888b80..cefa9b818819 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium${soext}')" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "libnacl" ]; diff --git a/pkgs/development/python-modules/libpyvivotek/default.nix b/pkgs/development/python-modules/libpyvivotek/default.nix index db9f14a5a80a..9a4cda0ae684 100644 --- a/pkgs/development/python-modules/libpyvivotek/default.nix +++ b/pkgs/development/python-modules/libpyvivotek/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook vcrpy ]; diff --git a/pkgs/development/python-modules/librouteros/default.nix b/pkgs/development/python-modules/librouteros/default.nix index 6994c8abca4b..03f5e9b072a2 100644 --- a/pkgs/development/python-modules/librouteros/default.nix +++ b/pkgs/development/python-modules/librouteros/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-VwpZ1RY6Sul7xvWY7ZoOxZ7KgbRmKRwcVdF9e2b3f6Q="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-xdist pytestCheckHook ]; diff --git a/pkgs/development/python-modules/libsass/default.nix b/pkgs/development/python-modules/libsass/default.nix index 704262bfeccc..61c3cb845b72 100644 --- a/pkgs/development/python-modules/libsass/default.nix +++ b/pkgs/development/python-modules/libsass/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { export SYSTEM_SASS=true; ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook werkzeug ]; diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix index edee7a625366..2abd187d0476 100644 --- a/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/pkgs/development/python-modules/libsoundtouch/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { zeroconf ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 199f467fbbca..aa026a98eb32 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -3,35 +3,51 @@ , fetchFromGitHub , buildPythonPackage , poetry-core +, pytest-rerunfailures , pytestCheckHook , procps , tmux +, ncurses }: buildPythonPackage rec { pname = "libtmux"; - version = "0.13.0"; + version = "0.21.0"; format = "pyproject"; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-u08lxVMuyO5CwFbmxn69QqdSWcvGaSMZgizRJlsHa0k="; + hash = "sha256-nZPVS3jNz2e2LTlWiSz1fN7MzqJs/CqtAt6UVZaPPTY="; }; + postPatch = '' + sed -i '/addopts/d' setup.cfg + ''; + nativeBuildInputs = [ poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ procps tmux - + ncurses + pytest-rerunfailures pytestCheckHook ]; - pytestFlagsArray = lib.optionals stdenv.isDarwin [ "--ignore=tests/test_test.py" ]; + pytestFlagsArray = [ "tests" ]; + + disabledTests = [ + # Fail with: 'no server running on /tmp/tmux-1000/libtmux_test8sorutj1'. + "test_new_session_width_height" + ]; + + disabledTestPaths = lib.optionals stdenv.isDarwin [ + "test_test.py" + ]; pythonImportsCheck = [ "libtmux" ]; diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index da84d890eced..80ad5590d995 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ libusb1 ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "usb1/testUSB1.py" diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix index 5fb33fa54774..e3b48b41205c 100644 --- a/pkgs/development/python-modules/libversion/default.nix +++ b/pkgs/development/python-modules/libversion/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { libversion ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 37114eb70c6f..36d45c5ac664 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,19 +2,19 @@ buildPythonPackage rec { pname = "libvirt"; - version = "8.8.0"; + version = "9.0.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "sha256-UguqUsIfrql1UZeBoHLKXvLYuWicbJWamglkvqS++FI="; + sha256 = "sha256-/u6sctXn4Jmn2bUl1FjjrKpHReaTg+O9LprKXx3OAyU="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvirt lxml ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests ''; diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index e1f77e45dcc7..cbff5928829a 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -9,15 +9,16 @@ buildPythonPackage rec { pname = "license-expression"; - version = "30.0.0"; + version = "30.1.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nexB"; repo = "license-expression"; - rev = "v${version}"; - hash = "sha256-tGXNZm9xH8sXa7dtBFsTzGgT+hfbmkwps7breR7KUWU="; + rev = "refs/tags/v${version}"; + hash = "sha256-QPjVSSndgKlAdGY6nZjjOrnyyVfOVu8ggfBwGWi+RyE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -32,7 +33,7 @@ buildPythonPackage rec { boolean-py ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -43,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utility library to parse, normalize and compare License expressions"; homepage = "https://github.com/nexB/license-expression"; + changelog = "https://github.com/nexB/license-expression/blob/v${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/life360/default.nix b/pkgs/development/python-modules/life360/default.nix index 947d29762f3e..cb61561eacd5 100644 --- a/pkgs/development/python-modules/life360/default.nix +++ b/pkgs/development/python-modules/life360/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "life360"; - version = "5.3.0"; + version = "5.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pnbruckner"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GacesPWPTuIIZel4OARWW13OYflYFNf4Jxh9I8ms7s0="; + hash = "sha256-F/j3qIdz63pEQ+nj1poP3lBFWSpSq4nLseYg+N2tykU="; }; propagatedBuildInputs = [ @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to interact with Life360"; homepage = "https://github.com/pnbruckner/life360"; + changelog = "https://github.com/pnbruckner/life360/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index ad54268c8cf5..01be9fb86511 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , buildPythonPackage , fetchPypi , cmake @@ -6,15 +7,19 @@ , scipy , scikit-learn , llvmPackages ? null +, pythonOlder }: buildPythonPackage rec { pname = "lightgbm"; - version = "3.3.2"; + version = "3.3.5"; + format = "other"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "5d25d16e77c844c297ece2044df57651139bc3c8ad8c4108916374267ac68b64"; + hash = "sha256-ELj73PhR5PaKHwLzjZm9xEx8f7mxpi3PkkoNKf9zOVw="; }; nativeBuildInputs = [ @@ -23,7 +28,10 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - buildInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; + buildInputs = lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp + ]; + propagatedBuildInputs = [ numpy scipy @@ -38,11 +46,15 @@ buildPythonPackage rec { # repository. It contains c++ tests which don't seem to wired up to # `make check`. doCheck = false; - pythonImportsCheck = [ "lightgbm" ]; + + pythonImportsCheck = [ + "lightgbm" + ]; meta = with lib; { description = "A fast, distributed, high performance gradient boosting (GBDT, GBRT, GBM or MART) framework"; homepage = "https://github.com/Microsoft/LightGBM"; + changelog = "https://github.com/microsoft/LightGBM/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ teh costrouc ]; }; diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix new file mode 100644 index 000000000000..c080bbac92dd --- /dev/null +++ b/pkgs/development/python-modules/lightning-utilities/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build +, setuptools + +# runtime +, packaging +, typing-extensions + +# tests +, pytest-timeout +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "lightning-utilities"; + version = "0.5.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Lightning-AI"; + repo = "utilities"; + rev = "refs/tags/v${version}"; + hash = "sha256-J73sUmX1a7ww+rt1vwBt9P0Xbeoxag6jR0W63xEySCI="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + packaging + typing-extensions + ]; + + pythonImportsCheck = [ + "lightning_utilities" + ]; + + nativeCheckInputs = [ + pytest-timeout + pytestCheckHook + ]; + + disabledTests = [ + "lightning_utilities.core.enums.StrEnum" + "lightning_utilities.core.imports.RequirementCache" + "lightning_utilities.core.imports.compare_version" + "lightning_utilities.core.imports.get_dependency_min_version_spec" + ]; + + disabledTestPaths = [ + "docs" + + ]; + + meta = with lib; { + changelog = "https://github.com/Lightning-AI/utilities/releases/tag/v${version}"; + description = "Common Python utilities and GitHub Actions in Lightning Ecosystem"; + homepage = "https://github.com/Lightning-AI/utilities"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/lightwave/default.nix b/pkgs/development/python-modules/lightwave/default.nix index ba937f7700d9..1f90a32748dd 100644 --- a/pkgs/development/python-modules/lightwave/default.nix +++ b/pkgs/development/python-modules/lightwave/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "lightwave"; - version = "0.20"; + version = "0.21"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jhffMDhgQ257ZQxvidiRgBSnZvzLJFKNU2NZ8AyGTGc="; + hash = "sha256-h/ztEY473XjvUCWu6vr7FA3WSYPHaLKNMc2fpu/wRC0="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/lightwave2/default.nix b/pkgs/development/python-modules/lightwave2/default.nix index 8aa6a2eb7bb2..964806911d94 100644 --- a/pkgs/development/python-modules/lightwave2/default.nix +++ b/pkgs/development/python-modules/lightwave2/default.nix @@ -7,21 +7,21 @@ buildPythonPackage rec { pname = "lightwave2"; - version = "0.8.17"; + version = "0.8.19"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7rNhQXflyfEyOtn00DWYv3CIVYmFp+5z8quYRRdqJMY="; + hash = "sha256-S4nHJMaSX8qCYoUnMqb6AbObTR96Wg098FJAM+dQJTc="; }; propagatedBuildInputs = [ aiohttp ]; - # Project has no tests + # Module has no tests doCheck = false; pythonImportsCheck = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Python library to interact with LightWaveRF 2nd Gen lights and switches"; + description = "Library to interact with LightWaveRF 2nd Gen lights and switches"; homepage = "https://github.com/bigbadblunt/lightwave2"; license = licenses.mit; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/lima/default.nix b/pkgs/development/python-modules/lima/default.nix index 16a5f01ed7a9..6174a4d76410 100644 --- a/pkgs/development/python-modules/lima/default.nix +++ b/pkgs/development/python-modules/lima/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0qqj0053r77ppkcyyk2fhpaxjzsl1h98nf9clpny6cs66sdl241v"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Lightweight Marshalling of Python 3 Objects."; diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 2b4499e29e8e..39c46e28402c 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "limits"; - version = "2.7.0"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,14 +25,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alisaifee"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; # Upstream uses versioneer, which relies on git attributes substitution. # This leads to non-reproducible archives on github. Remove the substituted # file here, and recreate it later based on our version info. postFetch = '' rm "$out/limits/_version.py" ''; - hash = "sha256-TBZElCogPtoR2qX1YjBgpYh99LhrvLHFtr2ogemo9/c="; + hash = "sha256-XGYwSe9KWw6PdxDjyqZ5kw5jlBxQR0VYacquwZ2z8rA="; }; propagatedBuildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ hiro pymemcache pymongo diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 2acb735052bd..428b199294cc 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.9.20"; + version = "2023.1.12"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-db+JKQXDffMm5dcyMVtYNj1YFKHSlvYAoyZi86tqoiA="; + hash = "sha256-V3DkIsnVv/HekWuOnIKnMHhccDGWun7mF7AcBSEsy6o="; }; propagatedBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix index cafd6d311463..d929b5e214bf 100644 --- a/pkgs/development/python-modules/line_profiler/default.nix +++ b/pkgs/development/python-modules/line_profiler/default.nix @@ -13,14 +13,15 @@ buildPythonPackage rec { pname = "line-profiler"; - version = "3.5.1"; + version = "4.0.2"; + format = "setuptools"; disabled = pythonOlder "3.6" || isPyPy; src = fetchPypi { pname = "line_profiler"; inherit version; - sha256 = "sha256-d0ACCL+9XUNBk4qaOk+1GU9a9/wjstSWyRN1X4MQ6Lg="; + hash = "sha256-JejJ1CSNxIkFgBhR/4p1ucdIJ6CHHRGNEQTY5D1/sPw="; }; nativeBuildInputs = [ @@ -33,7 +34,7 @@ buildPythonPackage rec { ipython ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -54,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Line-by-line profiler"; homepage = "https://github.com/pyutils/line_profiler"; + changelog = "https://github.com/pyutils/line_profiler/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/linkify-it-py/default.nix b/pkgs/development/python-modules/linkify-it-py/default.nix index 54f71fe2ec2b..21c99442f7bd 100644 --- a/pkgs/development/python-modules/linkify-it-py/default.nix +++ b/pkgs/development/python-modules/linkify-it-py/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ uc-micro-py ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "linkify_it" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index 48d5a1e80802..906f5eb40a06 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix index 8093c949d399..6739d2ed13c1 100644 --- a/pkgs/development/python-modules/liquidctl/default.nix +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -17,15 +17,16 @@ buildPythonPackage rec { pname = "liquidctl"; - version = "1.11.1"; - disabled = pythonOlder "3.6"; + version = "1.12.1"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-9g6h8GMOcICiry9M9b/Tt0ONsTxuJI/duprUkxB1Gr0="; + hash = "sha256-0QjgnTxqB50JNjSUAgBrGyhN2XC/TDYiC1tvhw1Bl1M="; }; nativeBuildInputs = [ @@ -48,7 +49,10 @@ buildPythonPackage rec { smbus-cffi ]; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; postInstall = '' installManPage liquidctl.8 @@ -58,19 +62,23 @@ buildPythonPackage rec { cp extra/linux/71-liquidctl.rules $out/lib/udev/rules.d/. ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; postBuild = '' # needed for pythonImportsCheck export XDG_RUNTIME_DIR=$TMPDIR ''; - pythonImportsCheck = [ "liquidctl" ]; + pythonImportsCheck = [ + "liquidctl" + ]; meta = with lib; { description = "Cross-platform CLI and Python drivers for AIO liquid coolers and other devices"; homepage = "https://github.com/liquidctl/liquidctl"; - changelog = "https://github.com/liquidctl/liquidctl/blob/master/CHANGELOG.md"; + changelog = "https://github.com/liquidctl/liquidctl/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ arturcygan evils ]; }; diff --git a/pkgs/development/python-modules/littleutils/default.nix b/pkgs/development/python-modules/littleutils/default.nix index ea490f19fe5d..538f4dea0a67 100644 --- a/pkgs/development/python-modules/littleutils/default.nix +++ b/pkgs/development/python-modules/littleutils/default.nix @@ -1,24 +1,32 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, lib +, pythonOlder }: buildPythonPackage rec { pname = "littleutils"; version = "0.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0vwijrylppmk0nbddqvn527r9cg3zw8d6zk6r58hslry42jf7jp6"; + hash = "sha256-5srjpCA+Uw1RyWZ+0xD/47GUjyh249aWBbPeS32WkW8="; }; - # This tiny package has no unit tests at all + # Module has no tests doCheck = false; - pythonImportsCheck = [ "littleutils" ]; + + pythonImportsCheck = [ + "littleutils" + ]; meta = with lib; { description = "Small collection of Python utility functions"; homepage = "https://github.com/alexmojaki/littleutils"; + changelog = "https://github.com/alexmojaki/littleutils/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/livelossplot/default.nix b/pkgs/development/python-modules/livelossplot/default.nix index 467d239857af..74047e657dd1 100644 --- a/pkgs/development/python-modules/livelossplot/default.nix +++ b/pkgs/development/python-modules/livelossplot/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ bokeh ipython matplotlib numpy ]; - checkInputs = [ nbconvert nbformat pytestCheckHook ]; + nativeCheckInputs = [ nbconvert nbformat pytestCheckHook ]; meta = with lib; { description = "Live training loss plot in Jupyter for Keras, PyTorch, and others"; diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix index 958236606c67..de2064538047 100644 --- a/pkgs/development/python-modules/livereload/default.nix +++ b/pkgs/development/python-modules/livereload/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tornado six ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; # TODO: retry running all tests after v2.6.1 checkPhase = "NOSE_EXCLUDE=test_watch_multiple_dirs nosetests -s"; diff --git a/pkgs/development/python-modules/lizard/default.nix b/pkgs/development/python-modules/lizard/default.nix index 801b77c0fcb0..dec52c8021a3 100644 --- a/pkgs/development/python-modules/lizard/default.nix +++ b/pkgs/development/python-modules/lizard/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ]; diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 497e1e279ebe..c1039db8829c 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { # On Darwin, the test requires macFUSE to be installed outside of Nix. doCheck = !stdenv.isDarwin; - checkInputs = [ pytestCheckHook which ]; + nativeCheckInputs = [ pytestCheckHook which ]; disabledTests = [ "test_listdir" # accesses /usr/bin diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index 8efc1e3fb12c..955b2d846e85 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -4,26 +4,36 @@ , pytestCheckHook , cffi , lmdb +, pythonOlder }: buildPythonPackage rec { pname = "lmdb"; - version = "1.3.0"; + version = "1.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "60a11efc21aaf009d06518996360eed346f6000bfc9de05114374230879f992e"; + hash = "sha256-OfbE7hRdKNFwJdNQcgq7b5XbgWUU6GjbV0RP3vUcu0c="; }; - buildInputs = [ lmdb ]; + buildInputs = [ + lmdb + ]; - checkInputs = [ cffi pytestCheckHook ]; + nativeCheckInputs = [ + cffi + pytestCheckHook + ]; LMDB_FORCE_SYSTEM=1; meta = with lib; { description = "Universal Python binding for the LMDB 'Lightning' Database"; homepage = "https://github.com/dw/py-lmdb"; + changelog = "https://github.com/jnwatson/py-lmdb/blob/py-lmdb_${version}/ChangeLog"; license = licenses.openldap; maintainers = with maintainers; [ copumpkin ivan ]; }; diff --git a/pkgs/development/python-modules/lml/default.nix b/pkgs/development/python-modules/lml/default.nix index f426d3dd7b4c..878edcf6bdb8 100644 --- a/pkgs/development/python-modules/lml/default.nix +++ b/pkgs/development/python-modules/lml/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "57a085a29bb7991d70d41c6c3144c560a8e35b4c1030ffb36d85fa058773bcc5"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ]; diff --git a/pkgs/development/python-modules/localstack-client/default.nix b/pkgs/development/python-modules/localstack-client/default.nix index 97cbd9968a10..a5a5b0576a2d 100644 --- a/pkgs/development/python-modules/localstack-client/default.nix +++ b/pkgs/development/python-modules/localstack-client/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { # All commands test `localstack` which is a downstream dependency doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index a3d323edf983..1947467c0ec8 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "1.2.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-F+FQJwvB1WH7qcfOG6IGY+ZlfKwz39UE5rwoQKnxaac="; + sha256 = "sha256-zMGKGTKomduydhOAxfif/Caf1QJiG2mxig4a+789SJc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix index c9856889de1f..b0da4fba2934 100644 --- a/pkgs/development/python-modules/localstack/default.nix +++ b/pkgs/development/python-modules/localstack/default.nix @@ -11,6 +11,7 @@ , psutil , python-dotenv , pyyaml +, packaging , requests , rich , semver @@ -19,19 +20,20 @@ buildPythonPackage rec { pname = "localstack"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; - rev = "v${version}"; - sha256 = "sha256-en/9kxhiW4aesc2SOpg/jRXiRa222iBQuq1O3cHeBJs="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-cxkEP/fsIGTcFLAM8tn/esCMmAvsIYb46X+EzV2VHDc="; }; postPatch = '' substituteInPlace setup.cfg \ --replace "requests>=2.20.0,<2.26" "requests~=2.20" \ - --replace "cachetools~=5.0.0" "cachetools~=5.0" + --replace "cachetools~=5.0.0" "cachetools~=5.0" \ + --replace "boto3>=1.20,<1.25.0" "boto3~=1.20" ''; propagatedBuildInputs = [ @@ -45,6 +47,7 @@ buildPythonPackage rec { psutil python-dotenv pyyaml + packaging requests rich semver diff --git a/pkgs/development/python-modules/localzone/default.nix b/pkgs/development/python-modules/localzone/default.nix index 0fcf15fe9474..c84cd1c893b2 100644 --- a/pkgs/development/python-modules/localzone/default.nix +++ b/pkgs/development/python-modules/localzone/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ dnspython sphinx ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/locationsharinglib/default.nix b/pkgs/development/python-modules/locationsharinglib/default.nix index 2004f962098b..01c07c6fecc5 100644 --- a/pkgs/development/python-modules/locationsharinglib/default.nix +++ b/pkgs/development/python-modules/locationsharinglib/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ betamax emoji nose diff --git a/pkgs/development/python-modules/lockfile/default.nix b/pkgs/development/python-modules/lockfile/default.nix index 295c8eaf9790..2368c4415ba4 100644 --- a/pkgs/development/python-modules/lockfile/default.nix +++ b/pkgs/development/python-modules/lockfile/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; buildInputs = [ pbr ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests diff --git a/pkgs/development/python-modules/logfury/default.nix b/pkgs/development/python-modules/logfury/default.nix index d25278a4e57c..9909ab410675 100644 --- a/pkgs/development/python-modules/logfury/default.nix +++ b/pkgs/development/python-modules/logfury/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook testfixtures ]; diff --git a/pkgs/development/python-modules/logging-journald/default.nix b/pkgs/development/python-modules/logging-journald/default.nix index 6abd9efeda27..7dc0d67e7a71 100644 --- a/pkgs/development/python-modules/logging-journald/default.nix +++ b/pkgs/development/python-modules/logging-journald/default.nix @@ -1,21 +1,28 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, poetry-core , pythonOlder }: buildPythonPackage rec { pname = "logging-journald"; - version = "0.6.2"; - format = "setuptools"; + version = "0.6.4"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-U6kqAvMSyLDbThc6wAN/ri0vmt/vAxgFFZT65Csbpss="; + src = fetchFromGitHub { + owner = "mosquito"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-g8oDFuqTBVutS7Uq7JCN+SXYL7UEQ+7G2nxzndjKAh8="; }; + nativeBuildInputs = [ + poetry-core + ]; + # Circular dependency with aiomisc doCheck = false; diff --git a/pkgs/development/python-modules/logi-circle/default.nix b/pkgs/development/python-modules/logi-circle/default.nix index 4894bfe26290..51d66dd40672 100644 --- a/pkgs/development/python-modules/logi-circle/default.nix +++ b/pkgs/development/python-modules/logi-circle/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytestCheckHook ]; diff --git a/pkgs/development/python-modules/logical-unification/default.nix b/pkgs/development/python-modules/logical-unification/default.nix index b89fcb25339e..c6abe327233c 100644 --- a/pkgs/development/python-modules/logical-unification/default.nix +++ b/pkgs/development/python-modules/logical-unification/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , toolz , multipledispatch +, py , pytestCheckHook , pytest-html , pytest-benchmark @@ -24,7 +25,8 @@ buildPythonPackage rec { multipledispatch ]; - checkInputs = [ + nativeCheckInputs = [ + py pytestCheckHook pytest-html pytest-benchmark # Needed for the `--benchmark-skip` flag diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index a1cb1b248ae3..eef74d0695ec 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -1,24 +1,51 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, unittest2, six }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, importlib-metadata +, mypy-extensions +, typing-extensions +, pytestCheckHook +, pytz +}: buildPythonPackage rec { pname = "logilab-common"; - version = "1.6.1"; - disabled = isPy27; + version = "1.9.7"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0h0b2vg2xpfbnynrkg2yki4zjpscm6wgm6nhaahb088v98zxqbrk"; + hash = "sha256-/JlN9RlIRLbi9TL9V6SgO6ddPeKqLzK402DqkLBRuxM="; }; - propagatedBuildInputs = [ unittest2 six ]; + nativeBuildInputs = [ + setuptools + ]; - # package supports 3.x but tests require egenix-mx-base which is python 2.x only - # and is not currently in nixos - doCheck = false; + propagatedBuildInputs = [ + mypy-extensions + typing-extensions + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytz + ]; + + preCheck = '' + export COLLECT_DEPRECATION_WARNINGS_PACKAGE_NAME=true + ''; meta = with lib; { description = "Python packages and modules used by Logilab "; - homepage = "https://www.logilab.org/project/logilab-common"; - license = licenses.lgpl21; + homepage = "https://logilab-common.readthedocs.io/"; + changelog = "https://forge.extranet.logilab.fr/open-source/logilab-common/-/blob/branch/default/CHANGELOG.md"; + license = licenses.lgpl21Plus; }; } diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix index ca9e5b17be85..9168d2ef8b06 100644 --- a/pkgs/development/python-modules/logilab/constraint.nix +++ b/pkgs/development/python-modules/logilab/constraint.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, logilab_common, six }: +{ lib, buildPythonPackage, fetchPypi, logilab-common, six }: buildPythonPackage rec { pname = "logilab-constraint"; @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - logilab_common six + logilab-common six ]; diff --git a/pkgs/development/python-modules/logilab_astng/default.nix b/pkgs/development/python-modules/logilab_astng/default.nix deleted file mode 100644 index dac5862324ab..000000000000 --- a/pkgs/development/python-modules/logilab_astng/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib -, buildPythonPackage -, fetchurl -, logilab_common -}: - -buildPythonPackage rec { - pname = "logilab-astng"; - version = "0.24.3"; - - src = fetchurl { - url = "http://download.logilab.org/pub/astng/${pname}-${version}.tar.gz"; - sha256 = "0np4wpxyha7013vkkrdy54dvnil67gzi871lg60z8lap0l5h67wn"; - }; - - propagatedBuildInputs = [ logilab_common ]; - - meta = with lib; { - homepage = "https://www.logilab.org/project/logilab-astng"; - description = "Python Abstract Syntax Tree New Generation"; - license = licenses.lgpl2; - }; - -} diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index 9c0d88df644d..f89741e527af 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -4,51 +4,45 @@ , buildPythonPackage , colorama , fetchpatch -, fetchPypi +, fetchFromGitHub +, freezegun +, mypy , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "loguru"; - version = "0.6.0"; + # No release since Jan 2022, only master is compatible with Python 3.11 + # https://github.com/Delgan/loguru/issues/740 + version = "unstable-2023-01-20"; format = "setuptools"; disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-BmvQZ1jQpRPpg2/ZxrWnW/s/02hB9LmWvGC1R6MJ1Bw="; + src = fetchFromGitHub { + owner = "Delgan"; + repo = pname; + rev = "07f94f3c8373733119f85aa8b9ca05ace3325a4b"; + hash = "sha256-lMGyQbBX3z6186ojs/iew7JMrG91ivPA679T9r+7xYw="; }; - patches = [ - (fetchpatch { - name = "fix-test-repr-infinite-recursion.patch"; - url = "https://github.com/Delgan/loguru/commit/4fe21f66991abeb1905e24c3bc3c634543d959a2.patch"; - hash = "sha256-NUOkgUS28TOazO0txMinFtaKwsi/J1Y7kqjjvMRCnR8="; - }) - ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ aiocontextvars ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook colorama + freezegun + mypy ]; disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/test_multiprocessing.py" ]; - disabledTests = [ - "test_time_rotation_reopening" - "test_file_buffering" - # Tests are failing with Python 3.10 - "test_exception_others" - "" - ] ++ lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" diff --git a/pkgs/development/python-modules/logutils/default.nix b/pkgs/development/python-modules/logutils/default.nix index 0a49262647e9..7f3584578563 100644 --- a/pkgs/development/python-modules/logutils/default.nix +++ b/pkgs/development/python-modules/logutils/default.nix @@ -1,21 +1,41 @@ { lib +, stdenv , buildPythonPackage , fetchPypi +, pytestCheckHook +, redis +, redis-server }: buildPythonPackage rec { pname = "logutils"; version = "0.3.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "bc058a25d5c209461f134e1f03cab637d66a7a5ccc12e593db56fbb279899a82"; }; + nativeCheckInputs = [ + pytestCheckHook + redis + redis-server + ]; + + disabledTests = [ + # https://bitbucket.org/vinay.sajip/logutils/issues/4/035-pytest-test-suite-warnings-and-errors + "test_hashandlers" + ]; + + disabledTestPaths = lib.optionals (stdenv.isDarwin) [ + # Exception: unable to connect to Redis server + "tests/test_redis.py" + ]; + meta = with lib; { description = "Logging utilities"; homepage = "https://bitbucket.org/vinay.sajip/logutils/"; license = licenses.bsd0; }; - } diff --git a/pkgs/development/python-modules/logzero/default.nix b/pkgs/development/python-modules/logzero/default.nix index 4e3ffd255e07..5e6b45fa7f46 100644 --- a/pkgs/development/python-modules/logzero/default.nix +++ b/pkgs/development/python-modules/logzero/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "7f73ddd3ae393457236f081ffebd044a3aa2e423a47ae6ddb5179ab90d0ad082"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/lomond/default.nix b/pkgs/development/python-modules/lomond/default.nix index f5bfef6a0a27..4fbdf5a2f823 100644 --- a/pkgs/development/python-modules/lomond/default.nix +++ b/pkgs/development/python-modules/lomond/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 0e80ef1da88b..8effe91bc6e5 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.16.6"; + version = "1.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - sha256 = "sha256-x8a2W64zLDi8r7d8B7GYCwWtSAB3BH+Sprbw+Xr7mH4="; + hash = "sha256-H0dGPcGSiV8fZwZRGWIx39ObriPmsr1pZaFkSsXrTQA="; }; propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/pkgs/development/python-modules/lru-dict/default.nix b/pkgs/development/python-modules/lru-dict/default.nix index 36b8c8978954..75921e8a8518 100644 --- a/pkgs/development/python-modules/lru-dict/default.nix +++ b/pkgs/development/python-modules/lru-dict/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { hash = "sha256-h4vI70Bz5c+5U9/Bz0WF20HouBTAEGq9400A7g0LMRU="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/lsprotocol/default.nix b/pkgs/development/python-modules/lsprotocol/default.nix new file mode 100644 index 000000000000..e2dcd7bb9a74 --- /dev/null +++ b/pkgs/development/python-modules/lsprotocol/default.nix @@ -0,0 +1,66 @@ +{ lib +, attrs +, buildPythonPackage +, cattrs +, fetchFromGitHub +, flit-core +, jsonschema +, nox +, pyhamcrest +, pytest +, pythonOlder +}: + +buildPythonPackage rec { + pname = "lsprotocol"; + version = "2022.0.0a9"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-6XecPKuBhwtkmZrGozzO+VEryI5wwy9hlvWE1oV6ajk="; + }; + + nativeBuildInputs = [ + flit-core + nox + ]; + + propagatedBuildInputs = [ + attrs + cattrs + ]; + + nativeCheckInputs = [ + pytest + ]; + + checkInputs = [ + jsonschema + pyhamcrest + ]; + + checkPhase = '' + runHook preCheck + + sed -i "/^ _install_requirements/d" noxfile.py + nox --session tests + + runHook postCheck + ''; + + pythonImportsCheck = [ + "lsprotocol" + ]; + + meta = with lib; { + description = "Python implementation of the Language Server Protocol"; + homepage = "https://github.com/microsoft/lsprotocol"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar fab ]; + }; +} diff --git a/pkgs/development/python-modules/luddite/default.nix b/pkgs/development/python-modules/luddite/default.nix index 46a5f2952902..26570a1540b6 100644 --- a/pkgs/development/python-modules/luddite/default.nix +++ b/pkgs/development/python-modules/luddite/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytestCheckHook pytest-socket pytest-mock ]; + nativeCheckInputs = [ pytestCheckHook pytest-socket pytest-mock ]; pythonImportsCheck = [ "luddite" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix index ccfe6bcf3fb5..343460325c09 100644 --- a/pkgs/development/python-modules/luftdaten/default.nix +++ b/pkgs/development/python-modules/luftdaten/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { httpx ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-httpx pytestCheckHook diff --git a/pkgs/development/python-modules/luhn/default.nix b/pkgs/development/python-modules/luhn/default.nix index 09ab90a3b177..b5622a23d66a 100644 --- a/pkgs/development/python-modules/luhn/default.nix +++ b/pkgs/development/python-modules/luhn/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-ZifaCjOVhWdXuzi5n6V+6eVN5vrEHKgUdpSOXoMyR18="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/lupupy/default.nix b/pkgs/development/python-modules/lupupy/default.nix index 8daee818d9dd..9f2e31fbc7df 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.9"; + version = "0.2.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UclKPuWcIa1nNFKqPIEnqlnJh0aXP50k2nMbHhT1aFs="; + hash = "sha256-SxhGUwcZjaRNCS5dB2hh5uctFGHWuKnM48CcIz6VMh8="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to control Lupusec alarm control panels"; homepage = "https://github.com/majuss/lupupy"; + changelog = "https://github.com/majuss/lupupy/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/luxor/default.nix b/pkgs/development/python-modules/luxor/default.nix index ebebdd0d9bc9..1bd7a7bbc018 100644 --- a/pkgs/development/python-modules/luxor/default.nix +++ b/pkgs/development/python-modules/luxor/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index a3efd863bbbd..ab0edb676f5b 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.2.4"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-yr+CU8MgBIUHuw40oNmm+//DG+iB0m7geBh4doaqV/0="; + hash = "sha256-9dvWm5FnqNkcILeY7qkRESk/iLlNEChs24RniRXtsNM="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Lightweight Extensible Message Format for Reticulum"; homepage = "https://github.com/markqvist/lxmf"; + changelog = "https://github.com/markqvist/LXMF/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index f0a9d6ff523a..65cb5afab187 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.9.1"; + version = "4.9.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/lxml-${version}"; - sha256 = "sha256-5MJw3ciXYnfctSNcemJ/QJGKAaYpadvdbFhkc8+pmPM="; + sha256 = "sha256-IHuTlcDbrZHvS6Gtx48IkznVU+9WxZT9XHUZf8M1WOE="; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index aaf4e0aa69bc..863ed3ccc221 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-lz4"; - version = "4.0.1"; + version = "4.3.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-hQuZkstsB37pFDWmA0W6qGd7rAer1mun7Z6MxMp0ZmE="; + sha256 = "sha256-XWkCZhBapjtzH3g3t+xXiB2f54p3Xw0+UBKVNH+gGHQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,7 +46,7 @@ buildPythonPackage rec { "lz4.stream" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook psutil ]; diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index 8e214540b12d..8f75d74f9525 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -1,41 +1,43 @@ { lib -, fetchpatch , buildPythonPackage , fetchPypi -, pythonOlder +, fetchpatch , swig2 , openssl , typing +, parameterized }: buildPythonPackage rec { - version = "0.36.0"; + version = "0.38.0"; pname = "M2Crypto"; src = fetchPypi { inherit pname version; - sha256 = "1hadbdckmjzfb8qzbkafypin6sakfx35j2qx0fsivh757s7c2hhm"; + sha256 = "sha256-mfImCjCQHJSajcbV+CzVMS/7iryS52YzuvIxu7yy3ss="; }; patches = [ + # Use OpenSSL_version_num() instead of unrealiable parsing of .h file. (fetchpatch { - url = "https://github.com/void-linux/void-packages/raw/7946d12eb3d815e5ecd4578f1a6133d948694370/srcpkgs/python-M2Crypto/patches/libressl.patch"; - sha256 = "0z5qnkndg6ma5f5qqrid5m95i9kybsr000v3fdy1ab562kf65a27"; + url = "https://src.fedoraproject.org/rpms/m2crypto/raw/42951285c800f72e0f0511cec39a7f49e970a05c/f/m2crypto-MR271-opensslversion.patch"; + hash = "sha256-e1/NHgWza+kum76MUFSofq9Ko3pML67PUfqWjcwIl+A="; + }) + # Changed required to pass tests on OpenSSL 3.0 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/m2crypto/raw/42951285c800f72e0f0511cec39a7f49e970a05c/f/m2crypto-0.38-ossl3-tests.patch"; + hash = "sha256-B6JKoPh76+CIna6zmrvFj50DIp3pzg8aKyzz+Q5hqQ0="; + }) + # Allow EVP tests fail on non-FIPS algorithms + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/m2crypto/raw/42951285c800f72e0f0511cec39a7f49e970a05c/f/m2crypto-0.38-ossl3-tests-evp.patch"; + hash = "sha256-jMUAphVBQMFaOJSeYUCQMV3WSe9VDQqG6GY5fDQXZnA="; }) ]; - patchFlags = [ "-p0" ]; - nativeBuildInputs = [ swig2 ]; - buildInputs = [ swig2 openssl ]; - - propagatedBuildInputs = lib.optional (pythonOlder "3.5") typing; - - preConfigure = '' - substituteInPlace setup.py --replace "self.openssl = '/usr'" "self.openssl = '${openssl.dev}'" - ''; - - doCheck = false; # another test that depends on the network. + nativeBuildInputs = [ swig2 openssl ]; + buildInputs = [ openssl parameterized ]; meta = with lib; { description = "A Python crypto and SSL toolkit"; @@ -43,5 +45,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ andrew-d ]; }; - } diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index d85c2196e843..0019a1c5a688 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mistune docutils ]; - checkInputs = [ pygments ]; + nativeCheckInputs = [ pygments ]; meta = with lib; { homepage = "https://github.com/miyakogi/m2r"; diff --git a/pkgs/development/python-modules/m3u8/default.nix b/pkgs/development/python-modules/m3u8/default.nix index e69bf61657fa..cc5dfc7ba254 100644 --- a/pkgs/development/python-modules/m3u8/default.nix +++ b/pkgs/development/python-modules/m3u8/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests iso8601 ]; - checkInputs = [ bottle pytestCheckHook ]; + nativeCheckInputs = [ bottle pytestCheckHook ]; pytestFlagsArray = [ "tests/test_parser.py" diff --git a/pkgs/development/python-modules/mac-vendor-lookup/default.nix b/pkgs/development/python-modules/mac-vendor-lookup/default.nix index 2c0a7d4f7240..d4a1be562f9e 100644 --- a/pkgs/development/python-modules/mac-vendor-lookup/default.nix +++ b/pkgs/development/python-modules/mac-vendor-lookup/default.nix @@ -13,8 +13,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bauerj"; repo = "mac_vendor_lookup"; - rev = "5b57faac0c5a701a7e18085e331853397b68c07c"; - hash = "sha256-F/aiMs+J4bAesr6mKy+tYVjAjZ3l9vyHxV7zaaB6KbA="; + rev = "90dbea48f8a9d567b5f9039ebd151ddfe7d12a19"; + hash = "sha256-mPPJDrWdyvkTdb4WfeTNYwuC+Ek9vH7ORKRTREg+vK8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mac_alias/default.nix b/pkgs/development/python-modules/mac_alias/default.nix index ac750b13e390..159dfa1d89ad 100644 --- a/pkgs/development/python-modules/mac_alias/default.nix +++ b/pkgs/development/python-modules/mac_alias/default.nix @@ -1,15 +1,24 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi +, setuptools }: buildPythonPackage rec { - version = "2.2.0"; - pname = "mac_alias"; + pname = "mac-alias"; + version = "2.2.2"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "0eb84a63f98bf54c2f9fbdc4de956a63e64eb8a4a124143a1c1f5a78326442f0"; + pname = "mac_alias"; + inherit version; + hash = "sha256-yZxyjrUS6VXBHxpiA6D/qIg7JlSeiv5ogEAxql2oVrc="; }; + nativeBuildInputs = [ + setuptools + ]; + # pypi package does not include tests; # tests anyway require admin privileges to succeed doCheck = false; diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 370655029e42..5798f7c95d99 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -9,53 +9,54 @@ , desktop-notifier , dropbox , fasteners +, importlib-metadata , keyring , keyrings-alt , packaging , pathspec , Pyro5 , requests +, rich , setuptools -, sdnotify , survey +, typing-extensions , watchdog -, importlib-metadata , pytestCheckHook , nixosTests }: buildPythonPackage rec { pname = "maestral"; - version = "1.6.3"; - disabled = pythonOlder "3.6"; + version = "1.6.5"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "refs/tags/v${version}"; - sha256 = "sha256-JVzaWwdHAn5JOruLEN9Z2/5eV1oh3J2NQffNI3RqYfA="; + hash = "sha256-YCPMPkvMaZ0uzTiiCbXFDpgDS0yGlfF0wKK2HhYmH+Y="; }; - format = "pyproject"; - propagatedBuildInputs = [ click desktop-notifier dbus-python dropbox fasteners + importlib-metadata keyring keyrings-alt packaging pathspec Pyro5 requests + rich setuptools - sdnotify survey + typing-extensions watchdog - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata ]; makeWrapperArgs = [ @@ -64,7 +65,7 @@ buildPythonPackage rec { "--prefix PYTHONPATH : $out/lib/${python.libPrefix}/site-packages" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -83,17 +84,22 @@ buildPythonPackage rec { "test_filestatus" "test_path_exists_case_insensitive" "test_cased_path_candidates" + # AssertionError + "test_locking_multiprocess" ]; - pythonImportsCheck = [ "maestral" ]; + pythonImportsCheck = [ + "maestral" + ]; passthru.tests.maestral = nixosTests.maestral; meta = with lib; { description = "Open-source Dropbox client for macOS and Linux"; + homepage = "https://maestral.app"; + changelog = "https://github.com/samschott/maestral/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg sfrijters ]; platforms = platforms.unix; - homepage = "https://maestral.app"; }; } diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index 4d000c7a1672..0a9e26771c4a 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , six , attrs , twisted @@ -9,17 +10,30 @@ , autobahn , treq , mock +, pythonOlder }: buildPythonPackage rec { - version = "0.4.1"; pname = "magic-wormhole-mailbox-server"; + version = "0.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "1af10592909caaf519c00e706eac842c5e77f8d4356215fe9c61c7b2258a88fb"; }; + patches = [ + (fetchpatch { + # Remove the 'U' open mode removed, https://github.com/magic-wormhole/magic-wormhole-mailbox-server/pull/34 + name = "fix-for-python-3.11.patch"; + url = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/commit/4b358859ba80de37c3dc0a5f67ec36909fd48234.patch"; + hash = "sha256-RzZ5kD+xhmFYusVzAbGE+CODXtJVR1zN2rZ+VGApXiQ="; + }) + ]; + propagatedBuildInputs = [ attrs six @@ -28,11 +42,12 @@ buildPythonPackage rec { ] ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls; - checkInputs = [ + nativeCheckInputs = [ treq mock twisted ]; + checkPhase = '' trial -j$NIX_BUILD_CORES wormhole_mailbox_server ''; @@ -40,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Securely transfer data between computers"; homepage = "https://github.com/warner/magic-wormhole-mailbox-server"; + changelog = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/${version}/NEWS.md"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix index a618be999c0b..a47322fdc647 100644 --- a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ autobahn twisted ]; - checkInputs = [ mock twisted ]; + nativeCheckInputs = [ mock twisted ]; checkPhase = '' trial -j$NIX_BUILD_CORES wormhole_transit_relay diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 12374ed1938b..07732774897d 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { ] ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls; - checkInputs = [ + nativeCheckInputs = [ mock magic-wormhole-transit-relay magic-wormhole-mailbox-server diff --git a/pkgs/development/python-modules/magicgui/default.nix b/pkgs/development/python-modules/magicgui/default.nix index d6c6108d52be..6cf78d129847 100644 --- a/pkgs/development/python-modules/magicgui/default.nix +++ b/pkgs/development/python-modules/magicgui/default.nix @@ -27,7 +27,7 @@ nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ typing-extensions qtpy pyside2 psygnal docstring-parser ]; - checkInputs = [ pytestCheckHook pytest-mypy-plugins ]; + nativeCheckInputs = [ pytestCheckHook pytest-mypy-plugins ]; doCheck = false; # Reports "Fatal Python error" diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index a7ca6a708dae..e644f1c29eb5 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' substituteInPlace mahotas/io/freeimage.py \ diff --git a/pkgs/development/python-modules/mailcap-fix/default.nix b/pkgs/development/python-modules/mailcap-fix/default.nix index da735d9d048d..3d644bec3a93 100644 --- a/pkgs/development/python-modules/mailcap-fix/default.nix +++ b/pkgs/development/python-modules/mailcap-fix/default.nix @@ -1,13 +1,12 @@ { lib , buildPythonPackage , fetchPypi -, isPy36 }: buildPythonPackage rec { pname = "mailcap-fix"; version = "1.0.1"; - disabled = isPy36; # this fix is merged into python 3.6 + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index 6e1958f56995..24ed5999a78e 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 = "5.0.3"; + version = "5.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-D8xyXBUDRaXLempcJ7G/Ybe7A3FiAaZ8kgm4jgKhkSI="; + hash = "sha256-u5htHCI10mn6AQDlAShMpbyI4PcqiRgpRvsy5Q3km+0="; }; # Module has no tests @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for temporary (disposable/throwaway) email detection"; homepage = "https://github.com/FGRibreau/mailchecker"; + changelog = "https://github.com/FGRibreau/mailchecker/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix index e7a752663c6d..6c52490dc0ef 100644 --- a/pkgs/development/python-modules/mailmanclient/default.nix +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mailmanclient"; - version = "3.3.4"; + version = "3.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0y31HXjvU/bwy0s0PcDOlrX1RdyTTnk41ceD4A0R4p4="; + hash = "sha256-Y1gcYEyn6sAhSJwVqsygaklY63b2ZXTG+rBerGVN2Fc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mailsuite/default.nix b/pkgs/development/python-modules/mailsuite/default.nix index ff44629de9f1..6767e86feb22 100644 --- a/pkgs/development/python-modules/mailsuite/default.nix +++ b/pkgs/development/python-modules/mailsuite/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "mailsuite"; - version = "1.9.7"; + version = "1.9.14"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-d96r712suiL4dSzT5vG/rD+4PInlvpuoAo3cedqVe+w="; + hash = "sha256-8vybabJPQyR0XMXaNp8lQFyuPajrhucgdfazt2ci8Gs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/maison/default.nix b/pkgs/development/python-modules/maison/default.nix new file mode 100644 index 000000000000..8fa3393d1e93 --- /dev/null +++ b/pkgs/development/python-modules/maison/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, poetry-core +, pydantic +, pytestCheckHook +, pythonOlder +, toml +}: + +buildPythonPackage rec { + pname = "maison"; + version = "1.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "dbatten5"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Ny/n1vDWS6eA9zLIB0os5zrbwvutb+7sQ6iPXeid1M0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + click + pydantic + toml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "maison" + ]; + + meta = with lib; { + description = "Library to read settings from config files"; + homepage = "https://github.com/dbatten5/maison"; + changelog = "https://github.com/dbatten5/maison/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix index 8060e63122e7..20b1b951ec8c 100644 --- a/pkgs/development/python-modules/makefun/default.nix +++ b/pkgs/development/python-modules/makefun/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/malduck/default.nix b/pkgs/development/python-modules/malduck/default.nix index 7d5998da2e96..ee73eb9405ec 100644 --- a/pkgs/development/python-modules/malduck/default.nix +++ b/pkgs/development/python-modules/malduck/default.nix @@ -3,18 +3,20 @@ , capstone , click , cryptography +, dnfile , fetchFromGitHub , pefile , pycryptodomex , pyelftools , pythonOlder +, pytestCheckHook , typing-extensions , yara-python }: buildPythonPackage rec { pname = "malduck"; - version = "4.2.0"; + version = "4.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,13 +25,14 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UgpblcZ/Jxl3U4256YIHzly7igNXwhTdFN4HOqZBVbM="; + hash = "sha256-1gwJhlhRLnh01AIJj07Wpba8X7V5AfACuJmZX+cfT6Y="; }; propagatedBuildInputs = [ capstone click cryptography + dnfile pefile pycryptodomex pyelftools @@ -39,11 +42,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "pefile==2019.4.18" "pefile" + --replace "pefile==2019.4.18" "pefile" \ + --replace "dnfile==0.11.0" "dnfile" ''; - # Project has no tests. They will come with the next release - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "malduck" @@ -52,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Helper for malware analysis"; homepage = "https://github.com/CERT-Polska/malduck"; + changelog = "https://github.com/CERT-Polska/malduck/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/managesieve/default.nix b/pkgs/development/python-modules/managesieve/default.nix index fd2eac2b2c7e..9e2515b0e7b5 100644 --- a/pkgs/development/python-modules/managesieve/default.nix +++ b/pkgs/development/python-modules/managesieve/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "44930a3b48332d23b35a5305ae7ba47904d4485ed1b7a22208b7d5ad9d60427a"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "ManageSieve client library for remotely managing Sieve scripts"; diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix index 34be99bc8df5..1480a002d0e2 100644 --- a/pkgs/development/python-modules/manhole/default.nix +++ b/pkgs/development/python-modules/manhole/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { # https://github.com/ionelmc/python-manhole/issues/54 is fixed doCheck = false; - checkInputs = [ pytest requests process-tests ]; + nativeCheckInputs = [ pytest requests process-tests ]; checkPhase = '' # Based on its tox.ini export PYTHONUNBUFFERED=yes diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 48487af1bc47..9b03caa6b103 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "manimpango"; - version = "0.4.2"; + version = "0.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ManimCommunity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ftoESXUMc+jnKmEzhmwZc/R7vVX9idsezPFHRUzPbaU="; + hash = "sha256-FT3X6TmGfwd8kRPtuqy78ZCGeEGGg6IJEeEpB7ZbIsA="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { cython ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/manticore/default.nix b/pkgs/development/python-modules/manticore/default.nix index c645a070e4b1..8bc54fabf184 100644 --- a/pkgs/development/python-modules/manticore/default.nix +++ b/pkgs/development/python-modules/manticore/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { --replace "crytic-compile==0.2.2" "crytic-compile>=0.2.2" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix index 7bf02f03895b..6f1829c7ec51 100644 --- a/pkgs/development/python-modules/manuel/default.nix +++ b/pkgs/development/python-modules/manuel/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six ]; - checkInputs = [ zope_testing ]; + nativeCheckInputs = [ zope_testing ]; meta = with lib; { description = "A documentation builder"; diff --git a/pkgs/development/python-modules/mapbox-earcut/default.nix b/pkgs/development/python-modules/mapbox-earcut/default.nix index 009bf2ed653c..fa4659ae40bd 100644 --- a/pkgs/development/python-modules/mapbox-earcut/default.nix +++ b/pkgs/development/python-modules/mapbox-earcut/default.nix @@ -6,29 +6,43 @@ , pybind11 , pytestCheckHook , setuptools +, pythonOlder }: buildPythonPackage rec { pname = "mapbox-earcut"; - version = "1.0.0"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "skogler"; repo = "mapbox_earcut_python"; - rev = "v${version}"; - sha256 = "m4q2qTL55fkdi3hm75C3/XV9SUQkpJS+B5SEgpPEctk="; + rev = "refs/tags/v${version}"; + hash = "sha256-+Vxvo++bkoCsJFmt/u1eaqhgpz8Uddz06iIi66ju+MQ="; }; - nativeBuildInputs = [ setuptools pybind11 ]; + nativeBuildInputs = [ + setuptools + pybind11 + ]; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + numpy + ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "mapbox_earcut" ]; + pythonImportsCheck = [ + "mapbox_earcut" + ]; meta = with lib; { homepage = "https://github.com/skogler/mapbox_earcut_python"; + changelog = "https://github.com/skogler/mapbox_earcut_python/releases/tag/v${version}"; license = licenses.isc; description = "Mapbox-earcut fast triangulation of 2D-polygons"; longDescription = '' diff --git a/pkgs/development/python-modules/mapbox/default.nix b/pkgs/development/python-modules/mapbox/default.nix index 84ca6199e2f4..721a2ece39fd 100644 --- a/pkgs/development/python-modules/mapbox/default.nix +++ b/pkgs/development/python-modules/mapbox/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ boto3 cachecontrol iso3166 python-dateutil requests polyline uritemplate ]; - checkInputs = [ pytestCheckHook responses ]; + nativeCheckInputs = [ pytestCheckHook responses ]; meta = with lib; { homepage = "https://github.com/mapbox/mapbox-sdk-py"; diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index 02d98c86c841..1a791cd0fb4b 100644 --- a/pkgs/development/python-modules/marisa-trie/default.nix +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -9,18 +9,18 @@ buildPythonPackage rec { pname = "marisa-trie"; - version = "0.7.7"; + version = "0.7.8"; src = fetchPypi { inherit pname version; - sha256 = "bbeafb7d92839dc221365340e79d012cb50ee48a1f3f30dd916eb35a8b93db00"; + sha256 = "sha256-ruPeXyg2B0z9gD8crxb2g5DyYu8JzX3H0Oiu6baHhkM="; }; nativeBuildInputs = [ cython ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook readme_renderer hypothesis diff --git a/pkgs/development/python-modules/marisa/default.nix b/pkgs/development/python-modules/marisa/default.nix new file mode 100644 index 000000000000..21a457b5b34e --- /dev/null +++ b/pkgs/development/python-modules/marisa/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, marisa +, swig +}: + +buildPythonPackage rec { + pname = "marisa"; + inherit (marisa) src version; + + nativeBuildInputs = [ swig ]; + + buildInputs = [ marisa ]; + + preBuild = '' + make -C bindings swig-python + + cd bindings/python + ''; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "marisa" ]; + + meta = { + description = "Python bindings for marisa"; + homepage = "https://github.com/s-yata/marisa-trie"; + license = with lib.licenses; [ bsd2 lgpl21Plus ]; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/markdown-include/default.nix b/pkgs/development/python-modules/markdown-include/default.nix index 091809d8314b..3d32b507579e 100644 --- a/pkgs/development/python-modules/markdown-include/default.nix +++ b/pkgs/development/python-modules/markdown-include/default.nix @@ -2,21 +2,28 @@ , buildPythonPackage , fetchFromGitHub , markdown +, setuptools-scm }: buildPythonPackage rec { pname = "markdown-include"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; # only wheel on pypi src = fetchFromGitHub { owner = "cmacmackin"; repo = pname; - rev = "v${version}"; - hash = "sha256-2pC0K/Z5l7q6sx4FSM4Pi1/5bt1wLZsqOmcbnE47rVs="; + rev = "refs/tags/v${version}"; + hash = "sha256-wTGgxvM3/h+6plUcheeMSkpk1we7pwuWHurkDkmbnPY="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ markdown ]; diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index d408c0071003..c1c5da228f0f 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -6,11 +6,15 @@ , linkify-it-py , mdurl , psutil +, py , pytest-benchmark , pytest-regressions , pytestCheckHook , pythonOlder , typing-extensions +# allow disabling tests for the nixos manual build. +# the test suite closure is just too large. +, disableTests ? false }: buildPythonPackage rec { @@ -39,13 +43,19 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ psutil + py + ] ++ lib.optionals (! disableTests) [ pytest-benchmark pytest-regressions pytestCheckHook ]; + pytestFlagsArray = [ + "--benchmark-skip" + ]; + pythonImportsCheck = [ "markdown_it" ]; diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index da3a8af52058..b9e8f8df517f 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ unittestCheckHook pyyaml ]; + nativeCheckInputs = [ unittestCheckHook pyyaml ]; pythonImportsCheck = [ "markdown" ]; diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix index 385fa8f89a9d..45fc711b1c22 100644 --- a/pkgs/development/python-modules/markdown2/default.nix +++ b/pkgs/development/python-modules/markdown2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pygments ]; + nativeCheckInputs = [ pygments ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/markdownify/default.nix b/pkgs/development/python-modules/markdownify/default.nix index cc5f3a36e85b..fab9f11eae84 100644 --- a/pkgs/development/python-modules/markdownify/default.nix +++ b/pkgs/development/python-modules/markdownify/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ beautifulsoup4 six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "HTML to Markdown converter"; diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix index 04e59287a86a..59f4eaf83bae 100644 --- a/pkgs/development/python-modules/markdownsuperscript/default.nix +++ b/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sed 's/=.*//' -i requirements/*.txt ''; - checkInputs = [ pytest pytest-runner pytest-cov coverage ]; + nativeCheckInputs = [ pytest pytest-runner pytest-cov coverage ]; meta = with lib; { description = "An extension to the Python Markdown package enabling superscript text"; diff --git a/pkgs/development/python-modules/markerlib/default.nix b/pkgs/development/python-modules/markerlib/default.nix index 7762a970fb1e..99358e4f95d3 100644 --- a/pkgs/development/python-modules/markerlib/default.nix +++ b/pkgs/development/python-modules/markerlib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptools ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests diff --git a/pkgs/development/python-modules/markuppy/default.nix b/pkgs/development/python-modules/markuppy/default.nix new file mode 100644 index 000000000000..e10b7b4bb1d3 --- /dev/null +++ b/pkgs/development/python-modules/markuppy/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "markuppy"; + version = "1.14"; + + src = fetchPypi { + pname = "MarkupPy"; + inherit version; + sha256 = "sha256-Gt7iwKVCrzeP6EVI/29rAWjzy39Ca0aWEDiivPqtDV8="; + }; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "MarkupPy" ]; + + meta = with lib; { + description = "An HTML/XML generator"; + homepage = "https://github.com/tylerbakke/MarkupPy"; + license = licenses.mit; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/markups/default.nix b/pkgs/development/python-modules/markups/default.nix index 2a0db14d96e7..024097634aee 100644 --- a/pkgs/development/python-modules/markups/default.nix +++ b/pkgs/development/python-modules/markups/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index 0c36299b1f12..d164813f8b09 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-f5EZfMnkj5idEuTm+8RklcRGY238gbnM9Quw7HS5HUs="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 0324d1687ac5..ba13fae46ece 100644 --- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "marshmallow-dataclass"; - version = "8.5.10"; + version = "8.5.11"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lovasoa"; repo = "marshmallow_dataclass"; - rev = "v${version}"; - sha256 = "sha256-AxUZf1dRe/7Y96DYJnziMqHKW5xyQv4FIrMMwSZTuGQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-P2eJLNI+G0km2HWZII4tx/uJ+6lvyxtap/qPh13LLmA="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { typing-inspect ]; - checkInputs = [ + nativeCheckInputs = [ marshmallow-enum pytestCheckHook typeguard @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automatic generation of marshmallow schemas from dataclasses"; homepage = "https://github.com/lovasoa/marshmallow_dataclass"; + changelog = "https://github.com/lovasoa/marshmallow_dataclass/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/marshmallow-enum/default.nix b/pkgs/development/python-modules/marshmallow-enum/default.nix index a7852afb7082..b2559c6c3e2c 100644 --- a/pkgs/development/python-modules/marshmallow-enum/default.nix +++ b/pkgs/development/python-modules/marshmallow-enum/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { marshmallow ] ++ lib.optionals isPy27 [ enum34 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix index 8fc946305bc8..3e4faf8c6031 100644 --- a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix +++ b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "marshmallow-oneofschema"; - version = "3.0.1"; + version = "3.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = pname; rev = version; - hash = "sha256-x0v8WkfjGkP2668QIQiewQViYFDIS2zBWMULcDThWas="; + hash = "sha256-Em2jQmvI5IiWREeOX/JAcdOQlpwP7k+cbCirkh82sf0="; }; propagatedBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -35,6 +35,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/marshmallow-code/marshmallow-oneofschema/blob/${src.rev}/CHANGELOG.rst"; description = "Marshmallow library extension that allows schema (de)multiplexing"; homepage = "https://github.com/marshmallow-code/marshmallow-oneofschema"; license = licenses.mit; diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index 6b5394ac2770..57da08b09cdb 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { marshmallow ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 0d8ffb125f02..100298e0fc0b 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { "marshmallow_sqlalchemy" ]; - checkInputs = [ + nativeCheckInputs = [ pytest-lazy-fixture pytestCheckHook ]; diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 5f41a048760a..5fcaf478f186 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.16.0"; + version = "3.19.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,14 +19,14 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = pname; rev = version; - hash = "sha256-bR10hYViK7OrAaBpKaeM7S5XyHQZhlGUQTwH/EJ0kME="; + hash = "sha256-b1brLHM48t45bwUXk7QreLLmvTzU0sX7Uoc1ZAgGkrE="; }; propagatedBuildInputs = [ packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytz simplejson @@ -37,6 +37,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/marshmallow-code/marshmallow/blob/${src.rev}/CHANGELOG.rst"; description = "Library for converting complex objects to and from simple Python datatypes"; homepage = "https://github.com/marshmallow-code/marshmallow"; license = licenses.mit; diff --git a/pkgs/development/python-modules/masky/default.nix b/pkgs/development/python-modules/masky/default.nix new file mode 100644 index 000000000000..3a1ea574e62f --- /dev/null +++ b/pkgs/development/python-modules/masky/default.nix @@ -0,0 +1,48 @@ +{ lib +, asn1crypto +, buildPythonPackage +, colorama +, cryptography +, fetchFromGitHub +, impacket +, pyasn1 +, pythonOlder +}: + +buildPythonPackage rec { + pname = "masky"; + version = "0.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Z4kSec"; + repo = "Masky"; + rev = "refs/tags/v${version}"; + hash = "sha256-awPPpdw6/zlVa7/DY1iafrbqIHJERN5+cfX1bTnCjl0="; + }; + + propagatedBuildInputs = [ + asn1crypto + colorama + cryptography + impacket + pyasn1 + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "masky" + ]; + + meta = with lib; { + description = "Library to remotely dump domain credentials"; + homepage = "https://github.com/Z4kSec/Masky"; + changelog = "https://github.com/Z4kSec/Masky/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ elasticdog ]; + }; +} diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix index ada014a6b81d..2bac23d0602e 100644 --- a/pkgs/development/python-modules/mastodon-py/default.nix +++ b/pkgs/development/python-modules/mastodon-py/default.nix @@ -18,13 +18,15 @@ buildPythonPackage rec { pname = "mastodon-py"; - version = "1.6.3"; + version = "1.8.0"; + + format = "setuptools"; src = fetchFromGitHub { owner = "halcy"; repo = "Mastodon.py"; rev = "refs/tags/${version}"; - sha256 = "sha256-bzacM5bJa936sBW+hgm9GOezW8cVY2oPaWApqjDYLSo="; + hash = "sha256-T/yG9LLdttBQ+9vCSit+pyQX/BPqqDXbrTcPfTAUu1U="; }; postPatch = '' @@ -43,7 +45,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock pytest-vcr @@ -53,6 +55,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "mastodon" ]; meta = with lib; { + changelog = "https://github.com/halcy/Mastodon.py/blob/${src.rev}/CHANGELOG.rst"; description = "Python wrapper for the Mastodon API"; homepage = "https://github.com/halcy/Mastodon.py"; license = licenses.mit; diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 6e2b1a02402d..e467023a8793 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -4,7 +4,6 @@ , unittestCheckHook , pythonOlder , fetchFromGitLab -, fetchpatch , substituteAll , bubblewrap , exiftool @@ -24,7 +23,7 @@ buildPythonPackage rec { pname = "mat2"; - version = "0.13.0"; + version = "0.13.2"; disabled = pythonOlder "3.5"; @@ -33,7 +32,7 @@ buildPythonPackage rec { owner = "jvoisin"; repo = "mat2"; rev = version; - hash = "sha256-H3l8w2F+ZcJ1P/Dg0ZVBJPUK0itLocL7a0jeSrG3Ws8="; + hash = "sha256-gZl2VH7qCmjrM/UrXPief8hCQKkBHdjG8w0MQvkZ7wk="; }; patches = [ @@ -49,16 +48,6 @@ 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"; - }) - # https://0xacab.org/jvoisin/mat2/-/issues/178 - (fetchpatch { - url = "https://0xacab.org/jvoisin/mat2/-/commit/618e0a8e3984fd534b95ef3dbdcb8a76502c90b5.patch"; - hash = "sha256-l9UFim3hGj+d2uKITiDG1OnqGeo2McBIiRSmK0Vidg8="; - }) ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ (substituteAll { src = ./bubblewrap-path.patch; @@ -92,14 +81,11 @@ buildPythonPackage rec { postInstall = '' 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 $propagatedBuildInputs" - patchPythonScript "$out/share/nautilus-python/extensions/mat2.py" '' + lib.optionalString dolphinIntegration '' install -Dm 444 dolphin/mat2.desktop -t "$out/share/kservices5/ServiceMenus" ''; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-v" ]; diff --git a/pkgs/development/python-modules/mat2/fix_poppler.patch b/pkgs/development/python-modules/mat2/fix_poppler.patch deleted file mode 100644 index 02bdbb6345dc..000000000000 --- a/pkgs/development/python-modules/mat2/fix_poppler.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 784e04cda383..53f72ce94637 100644 --- a/pkgs/development/python-modules/mat2/paths.patch +++ b/pkgs/development/python-modules/mat2/paths.patch @@ -13,7 +13,7 @@ index 41c8de4..11df258 100644 +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/exiftool.py b/libmat2/exiftool.py -index eb65b2a..51a0fa1 100644 +index cdfce3d..1e83520 100644 --- a/libmat2/exiftool.py +++ b/libmat2/exiftool.py @@ -1,8 +1,6 @@ @@ -23,13 +23,13 @@ index eb65b2a..51a0fa1 100644 import os -import shutil import subprocess - from typing import Dict, Union, Set + from typing import Union -@@ -70,14 +68,5 @@ class ExiftoolParser(abstract.AbstractParser): +@@ -67,14 +65,5 @@ class ExiftoolParser(abstract.AbstractParser): return False return True --@functools.lru_cache() +-@functools.lru_cache def _get_exiftool_path() -> str: # pragma: no cover - which_path = shutil.which('exiftool') - if which_path: @@ -42,7 +42,7 @@ index eb65b2a..51a0fa1 100644 - raise RuntimeError("Unable to find exiftool") + return '@exiftool@' diff --git a/libmat2/video.py b/libmat2/video.py -index ae9e463..2acc65c 100644 +index 4d33aa4..6388664 100644 --- a/libmat2/video.py +++ b/libmat2/video.py @@ -1,6 +1,4 @@ @@ -51,7 +51,7 @@ index ae9e463..2acc65c 100644 -import shutil import logging - from typing import Dict, Union + from typing import Union @@ -135,10 +133,5 @@ class MP4Parser(AbstractFFmpegParser): } diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index efcf1741ab41..cd11d89c7d66 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { multiset ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis ]; diff --git a/pkgs/development/python-modules/mathlibtools/default.nix b/pkgs/development/python-modules/mathlibtools/default.nix index 11e4b3207282..bf50e7fdd62c 100644 --- a/pkgs/development/python-modules/mathlibtools/default.nix +++ b/pkgs/development/python-modules/mathlibtools/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , click , fetchPypi -, GitPython +, gitpython , networkx , pydot , PyGithub @@ -15,20 +15,20 @@ buildPythonPackage rec { pname = "mathlibtools"; - version = "1.1.2"; + version = "1.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Jbnb3FKyB1NAehB8tZxBV6d7JJCOgWZPMWMaFEAOzkM="; + hash = "sha256-mkn0y3NV/acnkqVzi8xd+Sex4QLvxxmt++FtsZmgrGs="; }; propagatedBuildInputs = [ atomicwrites click - GitPython + gitpython networkx pydot PyGithub @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Supporting tool for Lean's mathlib"; homepage = "https://github.com/leanprover-community/mathlib-tools"; + changelog = "https://github.com/leanprover-community/mathlib-tools/raw/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ gebner ]; }; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 6a507d01ef3b..a033e8a11bab 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchPypi, writeText, buildPythonPackage, isPy3k, pycairo , which, cycler, python-dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, qhull, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection -, certifi, pillow, fonttools, setuptools-scm, setuptools-scm-git-archive, packaging +, certifi, contourpy, pillow, fonttools, setuptools-scm, setuptools-scm-git-archive, packaging , enableGhostscript ? true, ghostscript, gtk3 , enableGtk3 ? false, cairo # darwin has its own "MacOSX" backend @@ -17,7 +17,7 @@ let in buildPythonPackage rec { - version = "3.5.3"; + version = "3.6.2"; pname = "matplotlib"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-M5ysSLgN28i/0F2q4KOnNBRlGoWWkEwqiBz9Httl8mw="; + sha256 = "sha256-sD/RChcJ0BAcBUiDtVD3xMXpdPdR4mgDGHWa8AWWSZA="; }; XDG_RUNTIME_DIR = "/tmp"; @@ -45,8 +45,14 @@ buildPythonPackage rec { Cocoa ]; + # clang-11: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument] + hardeningDisable = lib.optionals stdenv.isDarwin [ + "strictoverflow" + ]; + propagatedBuildInputs = [ certifi + contourpy cycler fonttools freetype diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index a2a5a155b5ea..9816f9470c64 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/pkgs/development/python-modules/matrix-common/default.nix b/pkgs/development/python-modules/matrix-common/default.nix index 4abec9e31548..90289f79cba8 100644 --- a/pkgs/development/python-modules/matrix-common/default.nix +++ b/pkgs/development/python-modules/matrix-common/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { attrs ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 45689c045168..73171dbdbf29 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -18,6 +18,7 @@ , jsonschema , peewee , poetry-core +, py , pycryptodome , pytest-aiohttp , pytest-benchmark @@ -28,14 +29,14 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.20.0"; + version = "0.20.1"; format = "pyproject"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - hash = "sha256-7bYGMbNLAN48kfckCcNtnymvQHm9CSNsgy/soe14SII="; + hash = "sha256-6oMOfyl8yR8FMprPYD831eiXh9g/bqslvxDmVcrNK80="; }; postPatch = '' @@ -69,10 +70,11 @@ buildPythonPackage rec { unpaddedbase64 ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses faker hypothesis + py pytest-aiohttp pytest-benchmark pytestCheckHook diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index abf52ceae1d6..dd3553419792 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -1,40 +1,67 @@ { lib , buildPythonPackage -, fetchPypi -, aiohttp +, fetchFromGitHub , pythonOlder -, sqlalchemy -, ruamel-yaml -, CommonMark -, lxml + # deps +, aiohttp +, attrs +, yarl + # optional deps +, python-magic +, python-olm +, unpaddedbase64 +, pycryptodome + # check deps +, pytestCheckHook +, pytest-asyncio , aiosqlite +, sqlalchemy +, asyncpg }: buildPythonPackage rec { pname = "mautrix"; - version = "0.18.8"; + version = "0.19.3"; format = "setuptools"; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-DRJhqHpeGbDzqhym6z9wCmzTz3VpnwJMdDKFT5vMVUE="; + src = fetchFromGitHub { + owner = "mautrix"; + repo = "python"; + rev = "v${version}"; + hash = "sha256-7nvy2/DUS2BkcyQUUG8+aT/JHcPu141e5YWOiccS6cU="; }; propagatedBuildInputs = [ aiohttp - - # defined in optional-requirements.txt - sqlalchemy - aiosqlite - ruamel-yaml - CommonMark - lxml + attrs + yarl ]; - # no tests available - doCheck = false; + passthru.optional-dependencies = { + detect_mimetype = [ + python-magic + ]; + encryption = [ + python-olm + unpaddedbase64 + pycryptodome + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ + pytest-asyncio + aiosqlite + sqlalchemy + asyncpg + ] ++ passthru.optional-dependencies.encryption; + + SQLALCHEMY_SILENCE_UBER_WARNING = 1; pythonImportsCheck = [ "mautrix" @@ -45,6 +72,6 @@ buildPythonPackage rec { homepage = "https://github.com/tulir/mautrix-python"; changelog = "https://github.com/mautrix/python/releases/tag/v${version}"; license = licenses.mpl20; - maintainers = with maintainers; [ nyanloutre ma27 sumnerevans ]; + maintainers = with maintainers; [ nyanloutre ma27 sumnerevans nickcao ]; }; } diff --git a/pkgs/development/python-modules/maxcube-api/default.nix b/pkgs/development/python-modules/maxcube-api/default.nix index 0627667a4e56..86fb5fe574b4 100644 --- a/pkgs/development/python-modules/maxcube-api/default.nix +++ b/pkgs/development/python-modules/maxcube-api/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "license=license" "license='MIT'" ''; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "maxcube" diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index 09997b5e60f2..cf803de336a5 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { buildInputs = [ libmaxminddb ]; - checkInputs = [ nose mock ]; + nativeCheckInputs = [ nose mock ]; # Tests are broken for macOS on python38 doCheck = !(stdenv.isDarwin && pythonAtLeast "3.8"); diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index 55f8fca0c35e..b0ddfeeefcf3 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -4,6 +4,7 @@ , envisage , fetchPypi , numpy +, packaging , pyface , pygments , pyqt5 @@ -15,21 +16,17 @@ buildPythonPackage rec { pname = "mayavi"; - version = "4.8.0"; + version = "4.8.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TGBDYdn1+juBvhjVvxTzBlCw7jju1buhbMikQ5QXj2M="; + sha256 = "sha256-n0J+8spska542S02ibpr7KJMhGDicG2KHJuEKJrT/Z4="; }; postPatch = '' - # Discovery of 'vtk' in setuptools is not working properly, due to a missing - # .egg-info in the vtk package. It does however import and run just fine. - substituteInPlace mayavi/__init__.py --replace "'vtk'" "" - # building the docs fails with the usual Qt xcb error, so skip: substituteInPlace setup.py \ --replace "build.build.run(self)" "build.build.run(self); return" @@ -43,6 +40,7 @@ buildPythonPackage rec { apptools envisage numpy + packaging pyface pygments pyqt5 @@ -50,6 +48,8 @@ buildPythonPackage rec { vtk ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; + # Needs X server doCheck = false; diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index f8001dbdd568..8cd113972a24 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "9.3.0"; + version = "10.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "py-mine"; repo = pname; - rev = "v${version}"; - hash = "sha256-kNThVElEDqhbCitktBv5tQkjMaU4IsX0dJk63hvLhb0="; + rev = "refs/tags/v${version}"; + hash = "sha256-rwEZhN/CbIw5lZ1AGorsagr4RlvCMlCK/M0XzQBCvh8="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { dnspython ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index 40a637dda188..a8d1c18c471e 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.1.5"; + version = "8.1.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - hash = "sha256-jt2ZZV63s7LL0R9ay/tvMH3cIDElYXiNPBuHlxj/Z8E="; + hash = "sha256-2Q/NcsGupYV80byrKmuoxA0d6/z7Z+fmGB6bfzDRvqQ="; }; propagatedBuildInputs = [ fpyutils ]; - checkInputs = [ + nativeCheckInputs = [ pyfakefs pytestCheckHook ]; @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Table of contents generator for Markdown"; homepage = "https://docs.franco.net.eu.org/md-toc/"; + changelog = "https://blog.franco.net.eu.org/software/CHANGELOG-md-toc.html"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/md2gemini/default.nix b/pkgs/development/python-modules/md2gemini/default.nix index bc4e4fc4b2c6..c48dc0d26ba1 100644 --- a/pkgs/development/python-modules/md2gemini/default.nix +++ b/pkgs/development/python-modules/md2gemini/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { version = "1.9.0"; propagatedBuildInputs = [ mistune cjkwrap wcwidth ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "md2gemini" ]; src = fetchPypi { diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix index 114685e2f46d..0f06e44f905b 100644 --- a/pkgs/development/python-modules/mdformat/default.nix +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix index 4174c18d10bf..f93751ca71d5 100644 --- a/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -2,15 +2,18 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, setuptools +, flit-core , markdown-it-py , pytest-regressions , pytestCheckHook +# allow disabling tests for the nixos manual build. +# the test suite closure is just too large. +, disableTests ? false }: buildPythonPackage rec { pname = "mdit-py-plugins"; - version = "0.3.0"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,19 +21,19 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "executablebooks"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-3zFSTjqwjUV6+fU6falYbIzj/Hp7E/9EXKZIi00tkg4="; + rev = "refs/tags/v${version}"; + hash = "sha256-9eaVM5KxrMY5q0c2KWmctCHyPGmEGGNa9B3LoRL/mcI="; }; nativeBuildInputs = [ - setuptools + flit-core ]; propagatedBuildInputs = [ markdown-it-py ]; - checkInputs = [ + nativeCheckInputs = lib.optionals (!disableTests) [ pytestCheckHook pytest-regressions ]; diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix index dc73daa449b9..75dfc5dabc9a 100644 --- a/pkgs/development/python-modules/mdp/default.nix +++ b/pkgs/development/python-modules/mdp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ future numpy ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; doCheck = true; diff --git a/pkgs/development/python-modules/mdurl/default.nix b/pkgs/development/python-modules/mdurl/default.nix index fb846dffd158..f245deeb7050 100644 --- a/pkgs/development/python-modules/mdurl/default.nix +++ b/pkgs/development/python-modules/mdurl/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mdutils/default.nix b/pkgs/development/python-modules/mdutils/default.nix index f2b142589312..b24f24ab912c 100644 --- a/pkgs/development/python-modules/mdutils/default.nix +++ b/pkgs/development/python-modules/mdutils/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-regIrMWbGmW574dfojxZFJoivpaqOpN1I6YsqLEp8BM="; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "Set of basic tools that can help to create Markdown files"; diff --git a/pkgs/development/python-modules/measurement/default.nix b/pkgs/development/python-modules/measurement/default.nix index 30969501213c..250fabe4fd6c 100644 --- a/pkgs/development/python-modules/measurement/default.nix +++ b/pkgs/development/python-modules/measurement/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sed -i 's|use_scm_version=True|version="${version}"|' setup.py ''; - checkInputs = [ pytest pytest-runner ]; + nativeCheckInputs = [ pytest pytest-runner ]; nativeBuildInputs = [ sphinx setuptools-scm ]; propagatedBuildInputs = [ sympy ]; diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index 1b452850161b..baeb56992eb8 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -4,15 +4,19 @@ , mecab , swig , setuptools-scm +, pythonOlder }: buildPythonPackage rec { pname = "mecab-python3"; - version = "1.0.5"; + version = "1.0.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5wPXjIimcau4FwNRZEhQAV2bv6sxUwo7QNEkgaZ3mhE="; + hash = "sha256-FvOKzkhAIL00RqEAVIKWeMHnuX8XQLWLAKMdWVz/Al4="; }; nativeBuildInputs = [ @@ -21,13 +25,20 @@ buildPythonPackage rec { setuptools-scm ]; - buildInputs = [ mecab ]; + buildInputs = [ + mecab + ]; doCheck = false; + pythonImportsCheck = [ + "MeCab" + ]; + meta = with lib; { description = "A python wrapper for mecab: Morphological Analysis engine"; homepage = "https://github.com/SamuraiT/mecab-python3"; + changelog = "https://github.com/SamuraiT/mecab-python3/releases/tag/v${version}"; license = with licenses; [ gpl2 lgpl21 bsd3 ]; # any of the three maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/mechanicalsoup/default.nix b/pkgs/development/python-modules/mechanicalsoup/default.nix index 3dcfee155750..4d68f71d2b06 100644 --- a/pkgs/development/python-modules/mechanicalsoup/default.nix +++ b/pkgs/development/python-modules/mechanicalsoup/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-httpbin pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/mediafile/default.nix b/pkgs/development/python-modules/mediafile/default.nix index 1e09a5e489ab..a3c2ad7794f5 100644 --- a/pkgs/development/python-modules/mediafile/default.nix +++ b/pkgs/development/python-modules/mediafile/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix index 9b188f9c2a59..44190b11e599 100644 --- a/pkgs/development/python-modules/mediapy/default.nix +++ b/pkgs/development/python-modules/mediapy/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "mediapy"; - version = "1.1.0"; + version = "1.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-CejgiCiW7an1GpKB5MUiA1Alkigv3RmfTq0um9pc93E="; + hash = "sha256-uz+Pv3DvmhDajIqNpCj+2HsRT7Dh7Ks5yryhiEa8KOI="; }; propagatedBuildInputs = [ ipython matplotlib numpy pillow ]; diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index f215ec661f0e..f418cfbe9f01 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, camel-converter , fetchFromGitHub , pythonOlder , requests @@ -7,7 +8,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.19.1"; + version = "0.23.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,12 +17,13 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-/z1UtZJE91dUHogXCbCv8nI8bd26HYVi1OzUV3sArJU="; + hash = "sha256-7TiXyuB2veNJtK6UmQg01O82r549aRmEa/DFzJtnQug="; }; propagatedBuildInputs = [ + camel-converter requests - ]; + ] ++ camel-converter.optional-dependencies.pydantic; pythonImportsCheck = [ "meilisearch" @@ -33,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client for the Meilisearch API"; homepage = "https://github.com/meilisearch/meilisearch-python"; + changelog = "https://github.com/meilisearch/meilisearch-python/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix index 0fced5f3e71e..c33aae4d20c4 100644 --- a/pkgs/development/python-modules/meinheld/default.nix +++ b/pkgs/development/python-modules/meinheld/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { patchPhase = '' # Allow greenlet-1.0.0. # See https://github.com/mopemope/meinheld/pull/123 - substituteInPlace setup.py --replace "greenlet>=0.4.5,<0.5" "greenlet>=0.4.5,<2.0.0" + substituteInPlace setup.py --replace "greenlet>=0.4.5,<0.5" "greenlet>=0.4.5" ''; propagatedBuildInputs = [ greenlet ]; @@ -20,6 +20,10 @@ buildPythonPackage rec { # No tests doCheck = false; + pythonImportsCheck = [ + "meinheld" + ]; + meta = with lib; { description = "High performance asynchronous Python WSGI Web Server"; homepage = "https://meinheld.org/"; diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix index e7f307361ed3..cc382982413c 100644 --- a/pkgs/development/python-modules/mercantile/default.nix +++ b/pkgs/development/python-modules/mercantile/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - checkInputs = [ pytestCheckHook hypothesis ]; + nativeCheckInputs = [ pytestCheckHook hypothesis ]; meta = with lib; { description = "Spherical mercator tile and coordinate utilities"; diff --git a/pkgs/development/python-modules/mergedb/default.nix b/pkgs/development/python-modules/mergedb/default.nix index b31d4ddf1928..3c78026632ba 100644 --- a/pkgs/development/python-modules/mergedb/default.nix +++ b/pkgs/development/python-modules/mergedb/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mergedeep/default.nix b/pkgs/development/python-modules/mergedeep/default.nix index 46de34050239..8b348120c235 100644 --- a/pkgs/development/python-modules/mergedeep/default.nix +++ b/pkgs/development/python-modules/mergedeep/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1msvvdzk33sxzgyvs4fs8dlsrsi7fjj038z83s0yw5h8m8d78469"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = "pytest"; pythonImportsCheck = [ "mergedeep" ]; diff --git a/pkgs/development/python-modules/mergedict/default.nix b/pkgs/development/python-modules/mergedict/default.nix index b1ed82f5348f..6023a6ca2332 100644 --- a/pkgs/development/python-modules/mergedict/default.nix +++ b/pkgs/development/python-modules/mergedict/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-4ZkrNqVCKQFPvLx6nIwo0fSuEx6h2NNFyTlz+fDcb9w="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "mergedict" ]; diff --git a/pkgs/development/python-modules/merkletools/default.nix b/pkgs/development/python-modules/merkletools/default.nix index a57f926a615f..b5dc5adf3dcc 100644 --- a/pkgs/development/python-modules/merkletools/default.nix +++ b/pkgs/development/python-modules/merkletools/default.nix @@ -1,19 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi, pysha3 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { pname = "merkletools"; version = "1.0.3"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "0pdik5sil0xcrwdcgdfy86c5qcfrz24r0gfc8m8bxa0i7h7x2v9l"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Tierion"; + repo = "pymerkletools"; + rev = "refs/tags/${version}"; + hash = "sha256-pd7Wxi7Sk95RcrFOTOtl725nIXidva3ftdKSGxHYPTA="; }; - propagatedBuildInputs = [ pysha3 ]; + postPatch = '' + # pysha3 is deprecated and not needed for Python > 3.6 + substituteInPlace setup.py \ + --replace "install_requires=install_requires" "install_requires=[]," + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "merkletools" + ]; meta = with lib; { description = "Python tools for creating Merkle trees, generating Merkle proofs, and verification of Merkle proofs"; homepage = "https://github.com/Tierion/pymerkletools"; + changelog = "https://github.com/Tierion/pymerkletools/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ Madouura ]; }; diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix index 713408e08c1c..5de72c96f163 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.5.0"; + version = "0.4.5.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = "MerossIot"; rev = "refs/tags/${version}"; - sha256 = "sha256-6TWtqPYbHZKiAEHAGxZrPxvIiLdNhwOtqtgG+HtQGjI="; + hash = "sha256-Wyg9Y4THnjNTWQsiOanoyEEBqVgsG5MeyoGE69/n8sM="; }; propagatedBuildInputs = [ @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to interact with Meross devices"; homepage = "https://github.com/albertogeniola/MerossIot"; + changelog = "https://github.com/albertogeniola/MerossIot/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix index aaf13a76530d..9310637b7c79 100644 --- a/pkgs/development/python-modules/mesa/default.nix +++ b/pkgs/development/python-modules/mesa/default.nix @@ -1,29 +1,46 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 -, cookiecutter, networkx , pandas, tornado, tqdm -, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, cookiecutter +, networkx +, pandas +, tornado +, tqdm +, pytestCheckHook +}: buildPythonPackage rec { pname = "mesa"; - version = "0.8.7"; + version = "1.1.1"; + format = "setuptools"; # According to their docs, this library is for Python 3+. disabled = isPy27; - src = fetchFromGitHub { - owner = "projectmesa"; - repo = "mesa"; - rev = "v${version}"; - sha256 = "0i1bpdqjrx4avgrzyqxpwxx86j11yhrq1j4kca854xahvhmwis19"; + src = fetchPypi { + pname = "Mesa"; + inherit version; + hash = "sha256-FPQLPClI8CKVsacZs4DLFnaikVSwrevU5TfUMevXgSY="; }; - checkInputs = [ pytest ]; + propagatedBuildInputs = [ + cookiecutter + networkx + pandas + tornado + tqdm + ]; - # Ignore test which tries to mkdir in unreachable location. - checkPhase = '' - pytest tests -k "not scaffold" - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; - propagatedBuildInputs = [ cookiecutter networkx pandas tornado tqdm ]; + disabledTests = [ + "test_examples" + "test_run" + "test_scaffold_creates_project_dir" + ]; meta = with lib; { homepage = "https://github.com/projectmesa/mesa"; diff --git a/pkgs/development/python-modules/meshcat/default.nix b/pkgs/development/python-modules/meshcat/default.nix new file mode 100644 index 000000000000..932d9a2390a3 --- /dev/null +++ b/pkgs/development/python-modules/meshcat/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ipython +, u-msgpack-python +, numpy +, tornado +, pyzmq +, pyngrok +, pillow +}: + +buildPythonPackage rec { + pname = "meshcat"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LP4XzeT+hdByo94Bip2r9WJvgMJV//LOY7JqSNJIStk="; + }; + + postPatch = '' + sed -i '/PYTHONPATH/d' src/meshcat/servers/zmqserver.py + ''; + + propagatedBuildInputs = [ + ipython + u-msgpack-python + numpy + tornado + pyzmq + pyngrok + pillow + ]; + + pythonImportsCheck = [ "meshcat" ]; + + # requires a running MeshCat viewer + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/rdeits/meshcat-python"; + description = "WebGL-based 3D visualizer for Python"; + license = licenses.mit; + maintainers = with maintainers; [ wegank ]; + }; +} diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix index 2e8d4044ce3b..3dae72e39bee 100644 --- a/pkgs/development/python-modules/meshio/default.nix +++ b/pkgs/development/python-modules/meshio/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { rich ]; - checkInputs = [ + nativeCheckInputs = [ exdown pytestCheckHook ]; diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 741388f363c1..a76d3ff3eff6 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 = "2.0.3"; + version = "2.0.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-h8OuDmm9I8lElhAGSpPx8sPUTY+EnFp2VXOYrYjiYNk="; + hash = "sha256-XIYzlGtj+S28N7RLvA38WSLv7LNZqKs8aJUaEG1CslI="; }; propagatedBuildInputs = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytap2 pytestCheckHook ]; @@ -94,15 +94,19 @@ buildPythonPackage rec { "test_main_setPref_invalid_field" "test_main_setPref_valid_field_int_as_string" "test_readGPIOs" + "test_onGPIOreceive" "test_setURL_empty_url" "test_watchGPIOs" "test_writeConfig_with_no_radioConfig" "test_writeGPIOs" + "test_reboot" + "test_shutdown" ]; meta = with lib; { description = "Python API for talking to Meshtastic devices"; homepage = "https://github.com/meshtastic/Meshtastic-python"; + changelog = "https://github.com/meshtastic/python/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index 18c00a95e856..b839c6136804 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -7,17 +7,19 @@ , ninja , pyproject-metadata , tomli +, typing-extensions +, pythonOlder }: buildPythonPackage rec { pname = "meson-python"; - version = "0.8.1"; + version = "0.12.0"; format = "pyproject"; src = fetchPypi { inherit version; pname = "meson_python"; - hash = "sha256-RC8fpM9dtQ7qYRcKYFnBD6/XCXf12980QcEGzSOwXkw="; + hash = "sha256-jLFZqAk6LnPPqJf4CS7JO3TjhC+U3/f944HG/g4LBk0="; }; nativeBuildInputs = [ @@ -25,6 +27,8 @@ buildPythonPackage rec { ninja pyproject-metadata tomli + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions ]; propagatedBuildInputs = [ @@ -32,6 +36,8 @@ buildPythonPackage rec { ninja pyproject-metadata tomli + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions ]; # Ugly work-around. Drop ninja dependency. @@ -42,8 +48,9 @@ buildPythonPackage rec { ''; meta = { + changelog = "https://github.com/mesonbuild/meson-python/blob/${version}/CHANGELOG.rst"; description = "Meson Python build backend (PEP 517)"; - homepage = "https://github.com/FFY00/meson-python"; + homepage = "https://github.com/mesonbuild/meson-python"; license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers.fridh ]; }; diff --git a/pkgs/development/python-modules/messagebird/default.nix b/pkgs/development/python-modules/messagebird/default.nix index 2b428964655f..4365e4462374 100644 --- a/pkgs/development/python-modules/messagebird/default.nix +++ b/pkgs/development/python-modules/messagebird/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix index 5cc40f4a6ca6..748de6f67541 100644 --- a/pkgs/development/python-modules/metakernel/default.nix +++ b/pkgs/development/python-modules/metakernel/default.nix @@ -1,26 +1,48 @@ { lib , buildPythonPackage , fetchPypi +, hatchling , ipykernel +, jedi +, jupyter-core +, pexpect +, pythonOlder }: buildPythonPackage rec { pname = "metakernel"; - version = "0.29.2"; + version = "0.29.4"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-A++uLR4hhOQYmA6o9wBTejFju3CpbK0hwIs7XFscddQ="; + hash = "sha256-kxrF/Msxjht7zGs0aEcL/Sf0qwcLiSoDPDUlE7Lrcmg="; }; - propagatedBuildInputs = [ ipykernel ]; + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + ipykernel + jedi + jupyter-core + pexpect + ]; # Tests hang, so disable doCheck = false; + pythonImportsCheck = [ + "metakernel" + ]; + meta = with lib; { description = "Jupyter/IPython Kernel Tools"; homepage = "https://github.com/Calysto/metakernel"; + changelog = "https://github.com/Calysto/metakernel/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ thomasjm ]; }; diff --git a/pkgs/development/python-modules/metar/default.nix b/pkgs/development/python-modules/metar/default.nix index 5fb1804dc64f..9e630c1fe916 100644 --- a/pkgs/development/python-modules/metar/default.nix +++ b/pkgs/development/python-modules/metar/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "metar" ]; diff --git a/pkgs/development/python-modules/meteocalc/default.nix b/pkgs/development/python-modules/meteocalc/default.nix index 6b18bba979ca..886b77de0880 100644 --- a/pkgs/development/python-modules/meteocalc/default.nix +++ b/pkgs/development/python-modules/meteocalc/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-WuIW6hROQkjMfbCLUouECIrp4s6oCd2/N79hsrTbVTk="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix index a49426bb6442..9183bc8170f5 100644 --- a/pkgs/development/python-modules/meteofrance-api/default.nix +++ b/pkgs/development/python-modules/meteofrance-api/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index 2c5346e5763c..d9e537b057df 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { # Tests Fail Due to Syntax Warning, Fixed for v3.1.11+ doCheck = false; - # sed calls will be unecessary in v3.1.11+ + # sed calls will be unnecessary in v3.1.11+ preConfigure = '' sed -i 's/==/>=/' setup.py ''; diff --git a/pkgs/development/python-modules/mf2py/default.nix b/pkgs/development/python-modules/mf2py/default.nix index 110da8e60f8f..0b8ae3404325 100644 --- a/pkgs/development/python-modules/mf2py/default.nix +++ b/pkgs/development/python-modules/mf2py/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ lxml mock nose diff --git a/pkgs/development/python-modules/micloud/default.nix b/pkgs/development/python-modules/micloud/default.nix index 07db8906c5d3..1cd2c43ea9e5 100644 --- a/pkgs/development/python-modules/micloud/default.nix +++ b/pkgs/development/python-modules/micloud/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "micloud"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "Squachen"; repo = "micloud"; rev = "v_${version}"; - sha256 = "sha256-1qtOsEH+G5ASsRyVCa4U0WQ/9kDRn1WpPNkvuvWFovQ="; + hash = "sha256-IsNXFs1N+rKwqve2Pjp+wRTZCxHF4acEo6KyhsSKuqI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/microdata/default.nix b/pkgs/development/python-modules/microdata/default.nix index 39ed19395c5d..8502d85d84bb 100644 --- a/pkgs/development/python-modules/microdata/default.nix +++ b/pkgs/development/python-modules/microdata/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { html5lib ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix index 25d8d492dd71..9b9b25ee3768 100644 --- a/pkgs/development/python-modules/mido/default.nix +++ b/pkgs/development/python-modules/mido/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { python-rtmidi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/milc/default.nix b/pkgs/development/python-modules/milc/default.nix index ebf4d1d2d224..0931bfbad329 100644 --- a/pkgs/development/python-modules/milc/default.nix +++ b/pkgs/development/python-modules/milc/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { halo ]; - checkInputs = [ + nativeCheckInputs = [ nose2 semver ]; diff --git a/pkgs/development/python-modules/mill-local/default.nix b/pkgs/development/python-modules/mill-local/default.nix index 1d13d8bd92cf..6c24ba8f424c 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.2.0"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyMillLocal"; rev = "refs/tags/${version}"; - sha256 = "sha256-u7TidHD0NzZ1JxYoCWviIXSsXojJHvVNg07eDBFQuls="; + hash = "sha256-kFBzasS7/5AM/ZW5z1ncZ9Xwuy/bh2LTVXPxNTLQnV0="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to communicate locally with Mill heaters"; homepage = "https://github.com/Danielhiversen/pyMillLocal"; + changelog = "https://github.com/Danielhiversen/pyMillLocal/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/minexr/default.nix b/pkgs/development/python-modules/minexr/default.nix index 0417fe7594fd..7cb8632ea548 100644 --- a/pkgs/development/python-modules/minexr/default.nix +++ b/pkgs/development/python-modules/minexr/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; pythonImportsCheck = [ "minexr" ]; - checkInputs = [ pytestCheckHook pillow ]; + nativeCheckInputs = [ pytestCheckHook pillow ]; meta = with lib; { description = "Minimal, standalone OpenEXR reader for single-part, uncompressed scan line files."; diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index 92c94b574b88..7c681d849b3a 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedNativeBuildInputs = [ cffi ]; propagatedBuildInputs = [ cffi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix index 5723138ecc3e..8bd0aea36ca4 100644 --- a/pkgs/development/python-modules/minidb/default.nix +++ b/pkgs/development/python-modules/minidb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "minidb"; - version = "2.0.6"; + version = "2.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,11 +15,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thp"; repo = "minidb"; - rev = version; - hash = "sha256-H7W+GBapT9uJgbPlARp4ZLKTN7hZlF/FbNo7rObqDM4="; + rev = "refs/tags/${version}"; + hash = "sha256-0f2usKoHs4NO/Ir8MhyiAVZFYnUkVH5avdh3QdHzY6s="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/minikanren/default.nix b/pkgs/development/python-modules/minikanren/default.nix index 7452148e8e47..1b25a84377a3 100644 --- a/pkgs/development/python-modules/minikanren/default.nix +++ b/pkgs/development/python-modules/minikanren/default.nix @@ -6,6 +6,7 @@ , multipledispatch , etuples , logical-unification +, py , pytestCheckHook , pytest-html }: @@ -29,7 +30,8 @@ buildPythonPackage rec { logical-unification ]; - checkInputs = [ + nativeCheckInputs = [ + py pytestCheckHook pytest-html ]; diff --git a/pkgs/development/python-modules/minikerberos/default.nix b/pkgs/development/python-modules/minikerberos/default.nix index ed59c2f3425e..104b9a9149ae 100644 --- a/pkgs/development/python-modules/minikerberos/default.nix +++ b/pkgs/development/python-modules/minikerberos/default.nix @@ -5,25 +5,27 @@ , fetchPypi , oscrypto , pythonOlder +, tqdm , unicrypto }: buildPythonPackage rec { pname = "minikerberos"; - version = "0.3.3"; + version = "0.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xO7d5GCihEzIH/DZziRR1SRpzAywPe99WJXeRyuh7S8="; + hash = "sha256-FjeMtf09I2EksVUwZ2UCndmmqqnyTvtgh58HSrqVShw="; }; propagatedBuildInputs = [ asn1crypto asysocks oscrypto + tqdm unicrypto ]; @@ -37,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Kerberos manipulation library in Python"; homepage = "https://github.com/skelsec/minikerberos"; + changelog = "https://github.com/skelsec/minikerberos/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 9a114514969a..b93cf7dee8c9 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "minio"; - version = "7.1.12"; + version = "7.1.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "minio"; repo = "minio-py"; rev = "refs/tags/${version}"; - hash = "sha256-9BjKoBQdkqkNK6StsiP0L3S5Dn8y53K5VghUIpIt46k="; + hash = "sha256-Kn/I5q079b4vqi+jL/pcVKMqGgs+PYgMoByX8ZzgZ5M="; }; propagatedBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ faker mock nose @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple APIs to access any Amazon S3 compatible object storage server"; homepage = "https://github.com/minio/minio-py"; + changelog = "https://github.com/minio/minio-py/releases/tag/${version}"; maintainers = with maintainers; [ peterromfeldhk ]; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/mip/default.nix b/pkgs/development/python-modules/mip/default.nix new file mode 100644 index 000000000000..1011677338bf --- /dev/null +++ b/pkgs/development/python-modules/mip/default.nix @@ -0,0 +1,78 @@ +{ lib +, buildPythonPackage +, cffi +, dos2unix +, fetchPypi +, matplotlib +, networkx +, numpy +, pytestCheckHook +, pythonOlder +, gurobi +, gurobipy +# Enable support for the commercial Gurobi solver (requires a license) +, gurobiSupport ? false +# If Gurobi has already been installed outside of the Nix store, specify its +# installation directory here +, gurobiHome ? null +}: + +buildPythonPackage rec { + pname = "mip"; + version = "1.14.2"; + + disabled = pythonOlder "3.7"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-wr4gXSh456heG5nsaEi2yo7LMre2Nd6QbTm0dcDCX1k="; + }; + + nativeCheckInputs = [ matplotlib networkx numpy pytestCheckHook ]; + nativeBuildInputs = [ dos2unix ]; + propagatedBuildInputs = [ + cffi + ] ++ lib.optionals gurobiSupport ([ + gurobipy + ] ++ lib.optional (builtins.isNull gurobiHome) gurobi); + + # Source files have CRLF terminators, which make patch error out when supplied + # with diffs made on *nix machines + prePatch = '' + find . -type f -exec ${dos2unix}/bin/dos2unix {} \; + ''; + + patches = [ + # Some tests try to be smart and dynamically construct a path to their test + # inputs. Unfortunately, since the test phase is run after installation, + # those paths point to the Nix store, which no longer contains the test + # data. This patch hardcodes the data path to point to the source directory. + ./test-data-path.patch + ]; + + postPatch = '' + # Allow cffi versions with a different patch level to be used + substituteInPlace pyproject.toml --replace "cffi==1.15.0" "cffi==1.15.*" + ''; + + # Make MIP use the Gurobi solver, if configured to do so + makeWrapperArgs = lib.optional gurobiSupport + "--set GUROBI_HOME ${if builtins.isNull gurobiHome then gurobi.outPath else gurobiHome}"; + + # Tests that rely on Gurobi are activated only when Gurobi support is enabled + disabledTests = lib.optional (!gurobiSupport) "gurobi"; + + passthru.optional-dependencies = { + inherit gurobipy numpy; + }; + + meta = with lib; { + homepage = "https://python-mip.com/"; + description = "A collection of Python tools for the modeling and solution of Mixed-Integer Linear programs (MIPs)"; + downloadPage = "https://github.com/coin-or/python-mip/releases"; + changelog = "https://github.com/coin-or/python-mip/releases/tag/${version}"; + license = licenses.epl20; + maintainers = with maintainers; [ nessdoor ]; + }; +} diff --git a/pkgs/development/python-modules/mip/test-data-path.patch b/pkgs/development/python-modules/mip/test-data-path.patch new file mode 100644 index 000000000000..d96f34254951 --- /dev/null +++ b/pkgs/development/python-modules/mip/test-data-path.patch @@ -0,0 +1,30 @@ +diff --git a/examples/extract_features_mip.py b/examples/extract_features_mip.py +index cdc109f..90e79fa 100644 +--- a/examples/extract_features_mip.py ++++ b/examples/extract_features_mip.py +@@ -9,9 +9,7 @@ import mip + lp_path = "" + + # using test data, replace with your instance +-lp_path = mip.__file__.replace("mip/__init__.py", "test/data/1443_0-9.lp").replace( +- "mip\\__init__.py", "test\\data\\1443_0-9.lp" +-) ++lp_path = "test/data/1443_0-9.lp" + + m = Model() + if m.solver_name.upper() in ["GRB", "GUROBI"]: +diff --git a/examples/gen_cuts_mip.py b/examples/gen_cuts_mip.py +index f71edae..2799734 100644 +--- a/examples/gen_cuts_mip.py ++++ b/examples/gen_cuts_mip.py +@@ -11,9 +11,7 @@ import mip + lp_path = "" + + # using test data +-lp_path = mip.__file__.replace("mip/__init__.py", "test/data/1443_0-9.lp").replace( +- "mip\\__init__.py", "test\\data\\1443_0-9.lp" +-) ++lp_path = "test/data/1443_0-9.lp" + + m = Model() + if m.solver_name.upper() in ["GRB", "GUROBI"]: diff --git a/pkgs/development/python-modules/misoc/default.nix b/pkgs/development/python-modules/misoc/default.nix index 447bde58c328..785043f1ae74 100644 --- a/pkgs/development/python-modules/misoc/default.nix +++ b/pkgs/development/python-modules/misoc/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { migen ]; - checkInputs = [ + nativeCheckInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/mistletoe/default.nix b/pkgs/development/python-modules/mistletoe/default.nix index 0f5c064a58f9..bd352fd41425 100644 --- a/pkgs/development/python-modules/mistletoe/default.nix +++ b/pkgs/development/python-modules/mistletoe/default.nix @@ -1,21 +1,29 @@ { lib -, isPy3k , fetchPypi -, buildPythonPackage }: +, buildPythonPackage +, pythonOlder +}: buildPythonPackage rec { pname = "mistletoe"; - version = "0.9.0"; - disabled = !isPy3k; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PLlteCJtCPDTvwnvyvMw0jkCSSAG4YssBlWOi4a/f68="; + hash = "sha256-+g6cV+IFDP1orjBOT5xeHmk1dMxf2DI9szRSlJ1oJmE="; }; + pythonImportsCheck = [ + "mistletoe" + ]; + meta = with lib; { - description = "A fast, extensible Markdown parser in pure Python."; + description = "Fast and extensible Markdown parser"; homepage = "https://github.com/miyuchina/mistletoe"; + changelog = "https://github.com/miyuchina/mistletoe/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ eadwu ]; }; diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 883bbb513501..600c77e8e0a6 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mitmproxy-wireguard/default.nix b/pkgs/development/python-modules/mitmproxy-wireguard/default.nix index 46510d61a89f..3cb3e82b0e07 100644 --- a/pkgs/development/python-modules/mitmproxy-wireguard/default.nix +++ b/pkgs/development/python-modules/mitmproxy-wireguard/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "mitmproxy-wireguard"; - version = "0.1.18"; + version = "0.1.20"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "decathorpe"; repo = "mitmproxy_wireguard"; rev = "refs/tags/${version}"; - hash = "sha256-vDexI9ihZhisbtt7k9epYD3RjPUaUnEX1TuDQDHZO8A="; + hash = "sha256-Oq3jF4XeT58rad0MWmqucZZHVAshhA8PViQ+2Q9Shgc="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-iVrF+9D4HHRx1E10GbGftcmil3Epw6iuRdf2m2o+/u8="; + hash = "sha256-HIChSAVztTmftwLhCWeLX2afqXAIHp3pmVWeW4yFZ+0="; }; # Module has no tests, only a test client diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 4b4cf1315b5f..0d38d3259d40 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , buildPythonPackage , pythonOlder # Mitmproxy requirements @@ -8,7 +7,6 @@ , blinker , brotli , certifi -, click , cryptography , flask , h11 @@ -16,6 +14,7 @@ , hyperframe , kaitaistruct , ldap3 +, mitmproxy-wireguard , msgpack , passlib , protobuf @@ -42,24 +41,16 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "8.1.1"; - disabled = pythonOlder "3.8"; + version = "9.0.1"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-nW/WfiY6uF67qNa95tvNvSv/alP2WmzTk34LEBma/04="; + owner = "mitmproxy"; + repo = "mitmproxy"; + rev = "refs/tags/${version}"; + sha256 = "sha256-CINKvRnBspciS+wefJB8gzBE13L8CjbYCkmLmTTeYlA="; }; - patches = [ - # Fix onboarding addon tests failing with Flask >= v2.2 - (fetchpatch { - url = "https://github.com/mitmproxy/mitmproxy/commit/bc370276a19c1d1039e7a45ecdc23c362626c81a.patch"; - hash = "sha256-Cp7RnYpZEuRhlWYOk8BOnAKBAUa7Vy296UmQi3/ufes="; - }) - ]; - propagatedBuildInputs = [ setuptools # setup.py @@ -67,7 +58,6 @@ buildPythonPackage rec { blinker brotli certifi - click cryptography flask h11 @@ -75,11 +65,12 @@ buildPythonPackage rec { hyperframe kaitaistruct ldap3 + mitmproxy-wireguard msgpack passlib protobuf - publicsuffix2 pyopenssl + publicsuffix2 pyparsing pyperclip ruamel-yaml @@ -90,7 +81,7 @@ buildPythonPackage rec { zstandard ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis parver pytest-asyncio @@ -119,7 +110,17 @@ buildPythonPackage rec { "test_flowview" # ValueError: Exceeds the limit (4300) for integer string conversion "test_roundtrip_big_integer" + + "test_wireguard" + "test_commands_exist" + "test_statusbar" ]; + + disabledTestPaths = [ + # teardown of half the tests broken + "test/mitmproxy/addons/test_onboarding.py" + ]; + dontUsePytestXdist = true; pythonImportsCheck = [ "mitmproxy" ]; diff --git a/pkgs/development/python-modules/mixpanel/default.nix b/pkgs/development/python-modules/mixpanel/default.nix index fac1afe2c97b..473520177177 100644 --- a/pkgs/development/python-modules/mixpanel/default.nix +++ b/pkgs/development/python-modules/mixpanel/default.nix @@ -1,40 +1,41 @@ { buildPythonPackage , fetchFromGitHub -, isPy37 , lib # Python Dependencies -, mock -, pytest , six +, urllib3 +, requests + +# tests +, pytestCheckHook +, responses }: buildPythonPackage rec { pname = "mixpanel"; - version = "4.5.0"; - disabled = !isPy37; + version = "4.10.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "mixpanel"; repo = "mixpanel-python"; - rev = version; - sha256 = "1hlc717wcn71i37ngsfb3c605rlyjhsn3v6b5bplq00373r4d39z"; + rev = "refs/tags/v${version}"; + hash = "sha256-jV2NLEc23uaI5Q7ZXDwGaZV9iAKQLMAETRTw8epZwQA="; }; propagatedBuildInputs = [ + requests six + urllib3 ]; - checkInputs = [ - mock - pytest + nativeCheckInputs = [ + pytestCheckHook + responses ]; - checkPhase = '' - py.test - ''; - meta = with lib; { homepage = "https://github.com/mixpanel/mixpanel-python"; description = "Official Mixpanel Python library"; diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index 8cd4eb98330b..a013934a019d 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -7,12 +7,13 @@ , pytestCheckHook , pythonOlder , scipy +, setuptools-scm }: buildPythonPackage rec { pname = "mizani"; - version = "0.7.4"; - format = "setuptools"; + version = "0.8.1"; + format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,9 +21,13 @@ buildPythonPackage rec { owner = "has2k1"; repo = pname; rev = "v${version}"; - hash = "sha256-oqbo/aQ5L1nQO8BvXH6/8PBPiWcv2m/LUjwow8+J90w="; + hash = "sha256-VE0M5/s8/XmmAe8EE/FcHBFGc9ppVWuYOYMuajQeZww="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ matplotlib palettable @@ -30,7 +35,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -46,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Scales for Python"; homepage = "https://github.com/has2k1/mizani"; + changelog = "https://github.com/has2k1/mizani/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ samuela ]; }; diff --git a/pkgs/development/python-modules/mkdocs-autorefs/default.nix b/pkgs/development/python-modules/mkdocs-autorefs/default.nix index dd88bd332e0e..39f1a00043b8 100644 --- a/pkgs/development/python-modules/mkdocs-autorefs/default.nix +++ b/pkgs/development/python-modules/mkdocs-autorefs/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { mkdocs ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/pkgs/development/python-modules/mkdocs-jupyter/default.nix index 846d40a25fa0..e285ed008312 100644 --- a/pkgs/development/python-modules/mkdocs-jupyter/default.nix +++ b/pkgs/development/python-modules/mkdocs-jupyter/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "mkdocs_jupyter" ]; - checkInputs = [ + nativeCheckInputs = [ pytest-cov pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index d82c1a654362..fe1eca400072 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -2,6 +2,9 @@ , callPackage , buildPythonPackage , fetchFromGitHub +, hatch-requirements-txt +, hatch-nodejs-version +, hatchling , jinja2 , markdown , mkdocs @@ -9,12 +12,13 @@ , pygments , pymdown-extensions , pythonOlder +, requests }: buildPythonPackage rec { pname = "mkdocs-material"; - version = "8.4.3"; - format = "setuptools"; + version = "8.5.11"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,9 +26,15 @@ buildPythonPackage rec { owner = "squidfunk"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ntArFD/wnoFC2vMS9WjiFP5/I1XklgSPGKGxFXxdNxs="; + hash = "sha256-jF5lpRv2itkhkqH7RzUXEH5e0Bia3SnTApfoy61RfJA="; }; + nativeBuildInputs = [ + hatch-requirements-txt + hatch-nodejs-version + hatchling + ]; + propagatedBuildInputs = [ jinja2 markdown @@ -32,6 +42,7 @@ buildPythonPackage rec { mkdocs-material-extensions pygments pymdown-extensions + requests ]; # No tests for python diff --git a/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix b/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix index 2d03c8fa8c5d..4e1c47a8c49d 100644 --- a/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix +++ b/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix @@ -1,16 +1,25 @@ -{ lib, fetchFromGitHub, buildPythonPackage }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, hatchling +}: buildPythonPackage rec { pname = "mkdocs-material-extensions"; - version = "1.0.3"; + version = "1.1.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = pname; - rev = version; - sha256 = "1mvc13lz16apnli2qcqf0dvlm8mshy47jmz2vp72lja6x8jfq2p3"; + rev = "refs/tags/${version}"; + hash = "sha256-FHI6WEQRd/Ff6pmU13f8f0zPSeFhhbmDdk4/0rdIl4I="; }; + nativeBuildInputs = [ + hatchling + ]; + doCheck = false; # Circular dependency pythonImportsCheck = [ "materialx" ]; diff --git a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix new file mode 100644 index 000000000000..57f900c6ab12 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix @@ -0,0 +1,43 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, beautifulsoup4 +, jsbeautifier +, mkdocs +, mkdocs-material +, pymdown-extensions +, pyyaml +, requests +}: + +buildPythonPackage rec { + pname = "mkdocs-mermaid2-plugin"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "fralau"; + repo = "mkdocs-mermaid2-plugin"; + rev = "v${version}"; + sha256 = "sha256-Oe6wkVrsB0NWF+HHeifrEogjxdGPINRDJGkh9p+GoHs="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + jsbeautifier + mkdocs + mkdocs-material + pymdown-extensions + pyyaml + requests + ]; + + # non-traditional python tests (e.g. nodejs based tests) + doCheck = false; + + pythonImportsCheck = [ "mermaid2" ]; + + meta = with lib; { + description = "A MkDocs plugin for including mermaid graphs in markdown sources"; + homepage = "https://github.com/fralau/mkdocs-mermaid2-plugin"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/mkdocs-minify/default.nix b/pkgs/development/python-modules/mkdocs-minify/default.nix index ee6765d31751..7c04933fb621 100644 --- a/pkgs/development/python-modules/mkdocs-minify/default.nix +++ b/pkgs/development/python-modules/mkdocs-minify/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "mkdocs-minify"; - version = "0.5.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "byrnereese"; repo = "${pname}-plugin"; - rev = version; - sha256 = "sha256-7v4uX711KAKuXFeVdLuIdGQi2i+dL4WX7+Zd4H1L3lM="; + rev = "refs/tags/${version}"; + sha256 = "sha256-ABoLt5sFpt8Hm07tkqeAcs63ZvJ4vTbGw4QRYVYpMEA="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { mkdocs ]; - checkInputs = [ + nativeCheckInputs = [ mkdocs pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mkdocs-redirects/default.nix b/pkgs/development/python-modules/mkdocs-redirects/default.nix index 9394692fc5cf..d50ee643f350 100644 --- a/pkgs/development/python-modules/mkdocs-redirects/default.nix +++ b/pkgs/development/python-modules/mkdocs-redirects/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { mkdocs ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index 2997e93ce0b9..46e3d410614b 100644 --- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.4.3"; + version = "0.5.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-N/7JhVX3STsUAz7O6yWkvKz72+3RZA5CNb3Z6FTrdRs="; + sha256 = "sha256-CAIQbSg8o+FxPqb/O9ML1b6OxmmH4c+RRU4ecHyfn8w="; }; propagatedBuildInputs = [ mkdocs beautifulsoup4 ]; diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index 0fb61bd8a599..ac3c2c851c63 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -4,7 +4,11 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder - # runtime deps + +# buildtime +, hatchling + +# runtime deps , click , ghp-import , importlib-metadata @@ -15,7 +19,8 @@ , pyyaml , pyyaml-env-tag , watchdog - # testing deps + +# testing deps , babel , mock , unittestCheckHook @@ -23,16 +28,26 @@ buildPythonPackage rec { pname = "mkdocs"; - version = "1.3.0"; + version = "1.4.2"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "sha256-S4xkr3jS5GvkMu8JnEGfqhmkxy3FtZZb7Rbuniltudg="; + rev = "refs/tags/${version}"; + hash = "sha256-/NxiKbCd2acYcNe5ww3voM9SGVE2IDqknngqApkDbNs="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "Markdown >=3.2.1, <3.4" "Markdown" + ''; + + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ click jinja2 @@ -46,7 +61,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook babel mock diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index d944a987aa42..92673a752f65 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "0.8.0"; + version = "0.8.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = version; - hash = "sha256-KAVBK0ZR1R27cWH99DVOYNFWKa4ubBXzgM0hVpGRIpE="; + hash = "sha256-JGk6oJQ6mcLtn7SDtltsLPT+CxPZNRbq8bnY9pMcXHc="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { mkdocstrings ]; - checkInputs = [ + nativeCheckInputs = [ mkdocs-material pytestCheckHook ]; @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python handler for mkdocstrings"; homepage = "https://github.com/mkdocstrings/python"; + changelog = "https://github.com/mkdocstrings/python/blob/${version}/CHANGELOG.md"; license = licenses.isc; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index 5d20ea1a6e97..4d367c809d44 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.19.0"; + version = "0.20.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,10 +22,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mkdocstrings"; repo = pname; - rev = version; - sha256 = "sha256-7OF1CrRnE4MYHuYD/pasnZpLe9lrbieGp4agnWAaKVo="; + rev = "refs/tags/${version}"; + hash = "sha256-eFHcwbYEIwVWvDJWlmeUvEdqp3NYAF8SgdHJGw6bEMc="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["version"]' 'version = "${version}"' \ + --replace 'license = "ISC"' 'license = {text = "ISC"}' + ''; + nativeBuildInputs = [ pdm-pep517 ]; @@ -39,15 +45,10 @@ buildPythonPackage rec { pymdown-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'dynamic = ["version"]' 'version = "${version}"' - ''; - pythonImportsCheck = [ "mkdocstrings" ]; @@ -57,9 +58,15 @@ buildPythonPackage rec { "tests/test_extension.py" ]; + disabledTests = [ + # Not all requirements are available + "test_disabling_plugin" + ]; + meta = with lib; { description = "Automatic documentation from sources for MkDocs"; homepage = "https://github.com/mkdocstrings/mkdocstrings"; + changelog = "https://github.com/mkdocstrings/mkdocstrings/blob/${version}/CHANGELOG.md"; license = licenses.isc; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix index be0ac454ee98..ef62dc1398a5 100644 --- a/pkgs/development/python-modules/mkl-service/default.nix +++ b/pkgs/development/python-modules/mkl-service/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { MKLROOT = mkl; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; nativeBuildInputs = [ cython ]; propagatedBuildInputs = [ mkl six ]; diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index cc5abbdd3d2f..375c56b6885a 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -9,7 +9,7 @@ , fetchpatch , fetchPypi , flask -, GitPython +, gitpython , gorilla , gunicorn , importlib-metadata @@ -50,7 +50,7 @@ buildPythonPackage rec { docker entrypoints flask - GitPython + gitpython gorilla gunicorn importlib-metadata @@ -81,6 +81,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open source platform for the machine learning lifecycle"; homepage = "https://github.com/mlflow/mlflow"; + changelog = "https://github.com/mlflow/mlflow/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ tbenst ]; }; diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix index 2187f2726801..72e2bf969c2a 100644 --- a/pkgs/development/python-modules/mlrose/default.nix +++ b/pkgs/development/python-modules/mlrose/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ scikit-learn ]; - checkInputs = [ pytest-randomly pytestCheckHook ]; + nativeCheckInputs = [ pytest-randomly pytestCheckHook ]; postPatch = '' substituteInPlace setup.py --replace sklearn scikit-learn diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 63cc4e3b39ec..d8b2a5212eef 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -13,17 +13,17 @@ buildPythonPackage rec { pname = "mlxtend"; - version = "0.20.0"; + version = "0.21.0"; disabled = isPy27; src = fetchFromGitHub { owner = "rasbt"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ECDO3nc9IEgmZNdSA70BzOODOi0wnisI00F2Dxzdz+M="; + sha256 = "sha256-7G4tIoQGS7/YPpAhUn0CRf8fl/DdjdqySPWgJEL0trA="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # image tests download files over the network pytestFlagsArray = [ "-sv" "--ignore=mlxtend/image" ]; # Fixed in master, but failing in release version diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 53a852934d47..f79fb2f3689c 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "1.2.2"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KFifnu9MR3FoVs7gLv+CpB/p3/6Iej9RJuBf1uc1HJs="; + hash = "sha256-3N9S8QhQ3vtC9SZBQqvwVpE8V062VVWTV3nBhPI1lmA="; }; propagatedBuildInputs = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ h5py nibabel pandas diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix index 86590c1d7b8d..0bba28020a70 100644 --- a/pkgs/development/python-modules/mnemonic/default.nix +++ b/pkgs/development/python-modules/mnemonic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-YYgWlYfVd1iALOziaUI8uVYjJDCIVk/dXcUmJd2jcvQ="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "mnemonic" ]; diff --git a/pkgs/development/python-modules/mnist/default.nix b/pkgs/development/python-modules/mnist/default.nix index 022cd3a2e02b..2d0b158534bf 100644 --- a/pkgs/development/python-modules/mnist/default.nix +++ b/pkgs/development/python-modules/mnist/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ] ++ lib.optional isPy27 mock; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; dontUseSetuptoolsCheck = true; diff --git a/pkgs/development/python-modules/moat-ble/default.nix b/pkgs/development/python-modules/moat-ble/default.nix index 33a59c72f8a0..5131fd048603 100644 --- a/pkgs/development/python-modules/moat-ble/default.nix +++ b/pkgs/development/python-modules/moat-ble/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mobly/default.nix b/pkgs/development/python-modules/mobly/default.nix new file mode 100644 index 000000000000..c91cf2697fbd --- /dev/null +++ b/pkgs/development/python-modules/mobly/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# runtime +, portpicker +, pyserial +, pyyaml +, timeout-decorator +, typing-extensions + +# tests +, procps +, pytestCheckHook +, pytz +}: + +buildPythonPackage rec { + pname = "mobly"; + version = "1.12.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "google"; + repo = "mobly"; + rev = "refs/tags/${version}"; + hash = "sha256-8ZcjxxAv+x8vTsgVKLFb55M02gElkZcZo/nrLwG7k6k="; + }; + + propagatedBuildInputs = [ + portpicker + pyserial + pyyaml + timeout-decorator + typing-extensions + ]; + + nativeCheckInputs = [ + procps + pytestCheckHook + pytz + ]; + + meta = with lib; { + changelog = "https://github.com/google/mobly/blob/${src.rev}/CHANGELOG.md"; + description = "Automation framework for special end-to-end test cases"; + homepage = "https://github.com/google/mobly"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/mock-services/default.nix b/pkgs/development/python-modules/mock-services/default.nix index 2917b21dcfe4..51f07960bb0f 100644 --- a/pkgs/development/python-modules/mock-services/default.nix +++ b/pkgs/development/python-modules/mock-services/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { requests-mock ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mock/default.nix b/pkgs/development/python-modules/mock/default.nix index d23ae8d30c9f..f8684475de34 100644 --- a/pkgs/development/python-modules/mock/default.nix +++ b/pkgs/development/python-modules/mock/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook pytest ]; diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 7e5d62454c6b..c36747d3ddc7 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.10.8"; + version = "3.10.9"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-aiofKFE9CPLMVJm+IT6VmtJSsVuH7ucpv5Kp1w7d2FE="; + sha256 = "sha256-fAVw5WvpJOITQWqA8Y6Xi7QbaunZ1WGXxAuUMXbh+Aw="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock aiohttp diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index 494386212d7b..658dd02e3cd3 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ]; - checkInputs = [ pytest numpy ]; + nativeCheckInputs = [ pytest numpy ]; # tests are no longer packaged in pypi tarball doCheck = false; diff --git a/pkgs/development/python-modules/mockupdb/default.nix b/pkgs/development/python-modules/mockupdb/default.nix index ddd72e7e7c1a..e06b1637b685 100644 --- a/pkgs/development/python-modules/mockupdb/default.nix +++ b/pkgs/development/python-modules/mockupdb/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pymongo ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/modeled/default.nix b/pkgs/development/python-modules/modeled/default.nix index dc50ea3141e3..b9f0174bb59f 100644 --- a/pkgs/development/python-modules/modeled/default.nix +++ b/pkgs/development/python-modules/modeled/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six moretools path ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "modeled" ]; diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix index 10d230fdf018..71855b544dda 100644 --- a/pkgs/development/python-modules/moderngl/default.nix +++ b/pkgs/development/python-modules/moderngl/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "moderngl"; - version = "5.7.2"; + version = "5.7.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sfmCY5Yny1HgZfEN10AE1Ev1EVQ6JE51646DXjoQxyA="; + hash = "sha256-IPghv2aygRvIZI189/ZEAq//dhn+onH0Km7oX+A+QEE="; }; buildInputs = [ @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "High performance rendering for Python"; homepage = "https://github.com/moderngl/moderngl"; + changelog = "https://github.com/moderngl/moderngl/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ c0deaddict ]; # should be mesaPlatforms, darwin build breaks. diff --git a/pkgs/development/python-modules/moderngl_window/default.nix b/pkgs/development/python-modules/moderngl_window/default.nix index 6888356ec431..8bb104da185e 100644 --- a/pkgs/development/python-modules/moderngl_window/default.nix +++ b/pkgs/development/python-modules/moderngl_window/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "moderngl_window"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "moderngl"; repo = pname; - rev = version; - sha256 = "12a5nl01c9b1ww7sj7i02xa7zmlrgg8jvi8cz004hw98kjcs9li8"; + rev = "refs/tags/${version}"; + sha256 = "sha256-jsASGYrsH9UNanswX2bZyWS3co/2Y1joaQ98virWcBE="; }; propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr glcontext ]; diff --git a/pkgs/development/python-modules/mohawk/default.nix b/pkgs/development/python-modules/mohawk/default.nix index 6616ba7d537b..ae57d8fbf84c 100644 --- a/pkgs/development/python-modules/mohawk/default.nix +++ b/pkgs/development/python-modules/mohawk/default.nix @@ -1,6 +1,5 @@ { lib, buildPythonPackage, fetchPypi, mock, nose, pytest, six }: -with lib; buildPythonPackage rec { pname = "mohawk"; version = "1.1.0"; @@ -12,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ mock nose pytest ]; + nativeCheckInputs = [ mock nose pytest ]; checkPhase = '' pytest mohawk/tests.py @@ -21,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Python library for Hawk HTTP authorization."; homepage = "https://github.com/kumar303/mohawk"; - license = licenses.mpl20; + license = lib.licenses.mpl20; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/moku/default.nix b/pkgs/development/python-modules/moku/default.nix index e93f1a054fac..3aba750f22e7 100644 --- a/pkgs/development/python-modules/moku/default.nix +++ b/pkgs/development/python-modules/moku/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "moku"; - version = "2.5.1"; + version = "2.6.0"; /* @@ -22,7 +22,7 @@ buildPythonPackage rec { */ src = fetchPypi { inherit pname version; - hash = "sha256-oFRwJ6i4wfjA3E2QMqE4ybutT7OZiFZ3LYXoplY3D/I="; + hash = "sha256-tG54V26H7viu5DPs3EWTg7ouCsdC3EXoeb8iexO6YBw="; }; /* diff --git a/pkgs/development/python-modules/monai/default.nix b/pkgs/development/python-modules/monai/default.nix index 4f142c5f2bba..df8f7492f63a 100644 --- a/pkgs/development/python-modules/monai/default.nix +++ b/pkgs/development/python-modules/monai/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "monai"; - version = "1.0.0"; + version = "1.1.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Project-MONAI"; repo = "MONAI"; rev = "refs/tags/${version}"; - hash = "sha256-BnsgZpkXsY2l6inuzOkuvK4zJqYs2dj7jF5gKKiLnZM="; + hash = "sha256-XTjZhynIiFtFjJSW6rRAnpErZvf6QHkuK4e2L6l3naM="; }; # Ninja is not detected by setuptools for some reason even though it's present: postPatch = '' - substituteInPlace "setup.cfg" --replace "ninja" "" + substituteInPlace "setup.cfg" --replace " ninja" "" ''; preBuild = '' diff --git a/pkgs/development/python-modules/monero/default.nix b/pkgs/development/python-modules/monero/default.nix index 907e54417d6d..2147e5613940 100644 --- a/pkgs/development/python-modules/monero/default.nix +++ b/pkgs/development/python-modules/monero/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "monero"; - version = "1.0.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "monero-ecosystem"; repo = "monero-python"; rev = "v${version}"; - sha256 = "sha256-ZjAShIeGVVIKlwgSNPVSN7eaqhKu3wEpDP9wgBMOyZU="; + sha256 = "sha256-WIF3pFBOLgozYTrQHLzIRgSlT3dTZTe+7sF/dVjVdTo="; }; postPatch = '' @@ -40,7 +40,7 @@ buildPythonPackage rec { varint ]; - checkInputs = [ pytestCheckHook pytest-cov responses ]; + nativeCheckInputs = [ pytestCheckHook pytest-cov responses ]; meta = with lib; { description = "Comprehensive Python module for handling Monero"; diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index ff91a63d792f..e5a8ccd46707 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mongoengine"; - version = "0.24.1"; + version = "0.25.0"; disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-KmCk4YTkwpWePTOOFyp4hGIcxpy/rrfAAC1/Xes/IYk="; + sha256 = "sha256-2UPjyKJGiW8UfWgMu8WKZJ5l+p4vTR57GxMFC5amb4A="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ nose pillow coverage diff --git a/pkgs/development/python-modules/mongomock/default.nix b/pkgs/development/python-modules/mongomock/default.nix index e3dc90ef8082..5e66ad42197c 100644 --- a/pkgs/development/python-modules/mongomock/default.nix +++ b/pkgs/development/python-modules/mongomock/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { sentinels ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mongoquery/default.nix b/pkgs/development/python-modules/mongoquery/default.nix new file mode 100644 index 000000000000..c6034ce27614 --- /dev/null +++ b/pkgs/development/python-modules/mongoquery/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +, isPy27 +}: + +buildPythonPackage rec { + pname = "mongoquery"; + version = "1.4.2"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "bd19fc465f0aa9feb3070f144fde41fc68cf28ea32dd3b7565f7df3ab6fc0ac2"; + }; + + propagatedBuildInputs = [ + six + ]; + + pythonImportsCheck = [ + "mongoquery" + ]; + + meta = with lib; { + description = "A python implementation of mongodb queries"; + homepage = "https://github.com/kapouille/mongoquery"; + license = with licenses; [ unlicense ]; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index a5d5958ec0dc..d6d67cd76335 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -1,27 +1,29 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder , msgpack -, pytestCheckHook , numpy , pandas , pydantic , pymongo +, pytestCheckHook +, pythonOlder , ruamel-yaml , tqdm }: buildPythonPackage rec { pname = "monty"; - version = "2022.9.8"; - disabled = pythonOlder "3.5"; # uses type annotations + version = "2022.9.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-3C5L7nKokuxtYlw13AKSrNVsvKH9okmBNyLXt7Vmjqk="; + hash = "sha256-7ToNiRSWxe9nNcaWWmS6bhVqWMEwXN4uiwtjAmuK5qw="; }; postPatch = '' @@ -30,17 +32,29 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + msgpack ruamel-yaml tqdm - msgpack ]; - checkInputs = [ - pytestCheckHook + nativeCheckInputs = [ numpy pandas pydantic pymongo + pytestCheckHook + ]; + + pythonImportsCheck = [ + "monty" + ]; + + disabledTests = [ + # Test file was removed and re-added after 2022.9.9 + "test_reverse_readfile_gz" + "test_Path_objects" + "test_zopen" + "test_zpath" ]; meta = with lib; { @@ -51,6 +65,7 @@ buildPythonPackage rec { patterns such as singleton and cached_class, and many more. "; homepage = "https://github.com/materialsvirtuallab/monty"; + changelog = "https://github.com/materialsvirtuallab/monty/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/moonraker-api/default.nix b/pkgs/development/python-modules/moonraker-api/default.nix index 50ba81d6d526..e425cef6e600 100644 --- a/pkgs/development/python-modules/moonraker-api/default.nix +++ b/pkgs/development/python-modules/moonraker-api/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index 1735148c58ec..371954492709 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "8.14.0"; + version = "9.0.0"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wJRDzT1UOLja/M2GemvBywiUOJ6Qy1PSJ0VrCwvMt1A="; + sha256 = "sha256-WmJX5Ah47wUgsYA5kOPiIwOkG1cUAGwyo/2DBLJuoas="; }; nativeBuildInouts = [ @@ -25,7 +25,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/more-properties/default.nix b/pkgs/development/python-modules/more-properties/default.nix index e878c8e72254..05c75b8f2107 100644 --- a/pkgs/development/python-modules/more-properties/default.nix +++ b/pkgs/development/python-modules/more-properties/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { --replace dataclasses "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index 01f6b58a9475..75e92bb32bf2 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ zetup ]; - checkInputs = [ six path pytest ]; + nativeCheckInputs = [ six path pytest ]; propagatedBuildInputs = [ decorator ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mortgage/default.nix b/pkgs/development/python-modules/mortgage/default.nix index dc395a87a560..9cd4fe920c5b 100644 --- a/pkgs/development/python-modules/mortgage/default.nix +++ b/pkgs/development/python-modules/mortgage/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "18fcb356c631e9cc27fa7019f6ff6021707e34b9ce3a3b7dc815661288709921"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index 8ee1e026684e..2a9fcd201035 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.6.13"; + version = "0.6.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = "refs/tags/${version}"; - sha256 = "sha256-vms9GcB2GQ7fZDk9f9xvFJ5Df7ArEcKn6frIuL1GwPo="; + hash = "sha256-OTnlfJeE64tURR5YrTXjzTHbvGnbeEWu9UHGynzmSiQ="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interfacing with Motion Blinds"; homepage = "https://github.com/starkillerOG/motion-blinds"; + changelog = "https://github.com/starkillerOG/motion-blinds/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix index f1ba9ee73304..4f2afc6e4113 100644 --- a/pkgs/development/python-modules/motioneye-client/default.nix +++ b/pkgs/development/python-modules/motioneye-client/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , aiohttp , buildPythonPackage , fetchFromGitHub @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "motioneye-client"; - version = "0.3.12"; + version = "0.3.14"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,9 +21,15 @@ buildPythonPackage rec { owner = "dermotduffy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vEB9ztz0RTGoolFUVQcMV7DUthCEAx1kpwkAS2186OU="; + hash = "sha256-kgFSd5RjO+OtnPeAOimPTDVEfJ47rXh2Ku5xEYStHv8="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'aiohttp = "^3.8.1,!=3.8.2,!=3.8.3"' 'aiohttp = "*"' \ + --replace " --cov-report=html:htmlcov --cov-report=xml:coverage.xml --cov-report=term-missing --cov=motioneye_client --cov-fail-under=100" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -32,26 +38,21 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytest-timeout pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov-report=html:htmlcov --cov-report=xml:coverage.xml --cov-report=term-missing --cov=motioneye_client --cov-fail-under=100" "" - ''; - pythonImportsCheck = [ "motioneye_client" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Python library for motionEye"; homepage = "https://github.com/dermotduffy/motioneye-client"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index ad8b8c13a692..3860a22e2078 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -20,7 +20,6 @@ , openapi-spec-validator , python-dateutil , python-jose -, pytz , pyyaml , requests , responses @@ -37,21 +36,16 @@ buildPythonPackage rec { pname = "moto"; - version = "4.0.3"; + version = "4.0.12"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iutWdX5oavPkpj+Qr7yXPLIxrarYfFzonmiTbBCbC+k="; + hash = "sha256-MPjzFljxjNsV62JsjLOgdSDw2MIZMib7yzMmrhL7okY="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "werkzeug>=0.5,<2.2.0" "werkzeug>=0.5" - ''; - propagatedBuildInputs = [ aws-xray-sdk boto3 @@ -68,7 +62,6 @@ buildPythonPackage rec { openapi-spec-validator python-dateutil python-jose - pytz pyyaml requests responses @@ -77,7 +70,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook sure @@ -139,6 +132,8 @@ buildPythonPackage rec { "tests/test_awslambda/test_lambda_eventsourcemapping.py" "tests/test_awslambda/test_lambda_invoke.py" "tests/test_batch/test_batch_jobs.py" + "tests/test_kinesis/test_kinesis.py" + "tests/test_kinesis/test_kinesis_stream_consumers.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix index cd819a14a879..704c8697ce8d 100644 --- a/pkgs/development/python-modules/motor/default.nix +++ b/pkgs/development/python-modules/motor/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pymongo ]; - checkInputs = [ + nativeCheckInputs = [ mockupdb ]; diff --git a/pkgs/development/python-modules/mouseinfo/default.nix b/pkgs/development/python-modules/mouseinfo/default.nix index 683062a790f9..6f5f5cbe86cb 100644 --- a/pkgs/development/python-modules/mouseinfo/default.nix +++ b/pkgs/development/python-modules/mouseinfo/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { ]; doCheck = false; - # Mouseinfo requires a X server running to import succesfully + # Mouseinfo requires a X server running to import successfully # pythonImportsCheck = [ "mouseinfo" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mox/default.nix b/pkgs/development/python-modules/mox/default.nix index bd7fc589a7aa..3513ac2b2cc8 100644 --- a/pkgs/development/python-modules/mox/default.nix +++ b/pkgs/development/python-modules/mox/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index d6c5fac48593..ce073ed27c43 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { nativeBuildInputs = [ mpi ]; - checkInputs = [ openssh ]; + nativeCheckInputs = [ openssh ]; meta = with lib; { description = "Python bindings for the Message Passing Interface standard"; diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix index e3b3223966c9..412965ab11ab 100644 --- a/pkgs/development/python-modules/mpmath/default.nix +++ b/pkgs/development/python-modules/mpmath/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mrjob/default.nix b/pkgs/development/python-modules/mrjob/default.nix new file mode 100644 index 000000000000..97cd5fd78e85 --- /dev/null +++ b/pkgs/development/python-modules/mrjob/default.nix @@ -0,0 +1,81 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# propagates +, pyyaml + +# optionals +, boto3 +, botocore +, google-cloud-dataproc +, google-cloud-logging +, google-cloud-storage +, python-rapidjson +, simplejson +, ujson + + +# tests +, pyspark +, unittestCheckHook +, warcio +}: + +buildPythonPackage rec { + pname = "mrjob"; + version = "0.7.4"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Yelp"; + repo = "mrjob"; + rev = "refs/tags/v${version}"; + hash = "sha256-Yp4yUx6tkyGB622I9y+AWK2AkIDVGKQPMM+LtB/M3uo="; + }; + + propagatedBuildInputs = [ + pyyaml + ]; + + passthru.optional-dependencies = { + aws = [ + boto3 + botocore + ]; + google = [ + google-cloud-dataproc + google-cloud-logging + google-cloud-storage + ]; + rapidjson = [ + python-rapidjson + ]; + simplejson = [ + simplejson + ]; + ujson = [ + ujson + ]; + }; + + doCheck = false; # failing tests + + nativeCheckInputs = [ + pyspark + unittestCheckHook + warcio + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + unittestFlagsArray = [ + "-v" + ]; + + meta = with lib; { + changelog = "https://github.com/Yelp/mrjob/blob/v${version}/CHANGES.txt"; + description = "Run MapReduce jobs on Hadoop or Amazon Web Services"; + homepage = "https://github.com/Yelp/mrjob"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/ms-cv/default.nix b/pkgs/development/python-modules/ms-cv/default.nix index aa8e361338dd..07af4ecb510f 100644 --- a/pkgs/development/python-modules/ms-cv/default.nix +++ b/pkgs/development/python-modules/ms-cv/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { --replace "pytest-runner" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index aa413190d4da..7832a46d368b 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index 22e18e5975f2..a1df35addf03 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index 6ec4772611f8..fdeddeae0601 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "msgspec"; - version = "0.9.1"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jcrist"; repo = pname; - rev = version; - hash = "sha256-q7WNVnkvK7MTleHEuClOFJ0Wv6EWu/3ztMi6TYdKgKU="; + rev = "refs/tags/${version}"; + hash = "sha256-9k1lpx5pb9idMwgYAZjVEM915w5wsmLWQ/tnHNSKHAs="; }; # Requires libasan to be accessible @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to handle JSON/MessagePack"; homepage = "https://github.com/jcrist/msgspec"; + changelog = "https://github.com/jcrist/msgspec/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/pkgs/development/python-modules/msoffcrypto-tool/default.nix index a1d834929055..2d1ab99020a2 100644 --- a/pkgs/development/python-modules/msoffcrypto-tool/default.nix +++ b/pkgs/development/python-modules/msoffcrypto-tool/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index c22dad7130a5..3463931a1cb6 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ httpretty pytest-aiohttp pytestCheckHook diff --git a/pkgs/development/python-modules/msrestazure/default.nix b/pkgs/development/python-modules/msrestazure/default.nix index 96c546e5d355..716667e870d6 100644 --- a/pkgs/development/python-modules/msrestazure/default.nix +++ b/pkgs/development/python-modules/msrestazure/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ adal msrest ]; - checkInputs = [ httpretty mock pytest ] + nativeCheckInputs = [ httpretty mock pytest ] ++ lib.optionals isPy3k [ pytest-asyncio ]; checkPhase = '' diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index 3b63b02986a2..b99954e55408 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -3,17 +3,17 @@ }: buildPythonPackage rec { - version = "4.26.0"; + version = "4.28.0"; pname = "mt-940"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HL56TXZNkjVnap0XIhBT/xDA2N80NLCLpvuXkxXu6zE="; + sha256 = "sha256-ydTOaijDmA2ogIONzRMMoz+5jr99qxWM1zzGGzg7f2Q="; }; propagatedBuildInputs = lib.optional (!isPy3k) enum34; - checkInputs = [ pyyaml pytest ]; + nativeCheckInputs = [ pyyaml pytest ]; # requires tests files that are not present doCheck = false; diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 6ee071732691..863e005d4a4b 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -7,24 +7,27 @@ buildPythonPackage rec { pname = "multidict"; - version = "6.0.2"; + version = "6.0.4"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-X/O9dfOOTEPx9HDy33pNQwuCHEziK+OE4UWctX1rsBM="; + hash = "sha256-NmaQZJLvt2RTwOe5fyz0WbBoLnQCwEialUhJZdvB2kk="; }; postPatch = '' sed -i '/^addopts/d' setup.cfg ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "multidict" ]; meta = with lib; { + changelog = "https://github.com/aio-libs/multidict/blob/v${version}/CHANGES.rst"; description = "Multidict implementation"; homepage = "https://github.com/aio-libs/multidict/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/multimethod/default.nix b/pkgs/development/python-modules/multimethod/default.nix index ef8004d20829..3523563693c3 100644 --- a/pkgs/development/python-modules/multimethod/default.nix +++ b/pkgs/development/python-modules/multimethod/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/multipart/default.nix b/pkgs/development/python-modules/multipart/default.nix new file mode 100644 index 000000000000..84daaac2773f --- /dev/null +++ b/pkgs/development/python-modules/multipart/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "multipart"; + version = "0.2.4"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "06ba205360bc7096fefe618e4f1e9b2cdb890b4f2157053a81f386912a2522cb"; + }; + + patches = [ + (fetchpatch { + name = "dont-test-semicolon-separators-in-urlencoded-data.patch"; + url = "https://github.com/defnull/multipart/commit/4d4ac6b79c453918ebf40c690e8d57d982ee840b.patch"; + hash = "sha256-rMeMhQEhonWAHzy5M8Im5mL6km5a9O0CGVOV+T3UNqo="; + }) + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "multipart" ]; + + meta = { + description = "Parser for multipart/form-data"; + homepage = "https://github.com/defnull/multipart"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix index 8558706485c2..6d0780370ff0 100644 --- a/pkgs/development/python-modules/multiprocess/default.nix +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "multiprocess"; - version = "0.70.13"; + version = "0.70.14"; format = "setuptools"; src = fetchFromGitHub { owner = "uqfoundation"; repo = pname; rev = "refs/tags/multiprocess-${version}"; - sha256 = "sha256-L/PesvaidavDEgJGqBxwcCYtG9TlKSwaxrUMJ+XVFOM="; + sha256 = "sha256-pjYOEOI5No9gT0XchmH6FSJ9uDqEnaLj/PyHT2a90jo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/multiset/default.nix b/pkgs/development/python-modules/multiset/default.nix index e511ab100459..bebd6a73e702 100644 --- a/pkgs/development/python-modules/multiset/default.nix +++ b/pkgs/development/python-modules/multiset/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptools-scm pytest-runner ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { description = "An implementation of a multiset"; diff --git a/pkgs/development/python-modules/munkres/default.nix b/pkgs/development/python-modules/munkres/default.nix index ffb4f8774906..a047db7ffd9d 100644 --- a/pkgs/development/python-modules/munkres/default.nix +++ b/pkgs/development/python-modules/munkres/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "http://bmc.github.com/munkres/"; diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index 78dbb73a00e1..0fc32322c255 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ${python.pythonForBuild.interpreter} setup.py build_sphinx --build-dir=$doc ''; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mutatormath/default.nix b/pkgs/development/python-modules/mutatormath/default.nix index 9336dbf354af..1fdb937e33ea 100644 --- a/pkgs/development/python-modules/mutatormath/default.nix +++ b/pkgs/development/python-modules/mutatormath/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ fontmath unicodedata2 defcon ]; - checkInputs = [ unicodedata2 fs ]; + nativeCheckInputs = [ unicodedata2 fs ]; meta = with lib; { description = "Piecewise linear interpolation in multiple dimensions with multiple, arbitrarily placed, masters"; diff --git a/pkgs/development/python-modules/mutf8/default.nix b/pkgs/development/python-modules/mutf8/default.nix index 954cc663c2a4..dd6f554a66af 100644 --- a/pkgs/development/python-modules/mutf8/default.nix +++ b/pkgs/development/python-modules/mutf8/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-4Ojn3t0EbOVdrYEiY8JegJuvW9sz8jt9tKFwOluiGQo="; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index da260251e9f2..048364d5bb6e 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook responses diff --git a/pkgs/development/python-modules/mwdblib/default.nix b/pkgs/development/python-modules/mwdblib/default.nix index faccc18a07b3..4d5387abd4f9 100644 --- a/pkgs/development/python-modules/mwdblib/default.nix +++ b/pkgs/development/python-modules/mwdblib/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "mwdblib" diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix index b8399bebef46..a2a49021c722 100644 --- a/pkgs/development/python-modules/mwparserfromhell/default.nix +++ b/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-kr7JUorjTScok8yvK1J9+FwxT/KM+7MFY0BGewldg0w="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-runner ]; diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index 433f06a0c50b..0c64f0549e5b 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "myfitnesspal"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xkO4rzjQTf1H4ZtJlzx6dT6BnfSg3VZU8pXdJFraTAI="; + sha256 = "sha256-wlQ/mo9MBQo0t1p0h6/TJir3I87DKYAUc022T3hZjH8="; }; propagatedBuildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ mock nose pytestCheckHook diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix index c6956b828dbc..d23116c5b341 100644 --- a/pkgs/development/python-modules/mygpoclient/default.nix +++ b/pkgs/development/python-modules/mygpoclient/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0aa28wc55x3rxa7clwfv5v5500ffyaq0vkxaa3v01y1r93dxkdvp"; }; - checkInputs = [ nose minimock ]; + nativeCheckInputs = [ nose minimock ]; checkPhase = '' nosetests diff --git a/pkgs/development/python-modules/myhdl/default.nix b/pkgs/development/python-modules/myhdl/default.nix index 77e793266e70..e5b5bbf97a75 100644 --- a/pkgs/development/python-modules/myhdl/default.nix +++ b/pkgs/development/python-modules/myhdl/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-Tgoem88Y6AhlCKVhMm0Khg6GPcrEktYOqV8xcMaNkl4="; }; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-xdist verilog @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "A free, open-source package for using Python as a hardware description and verification language."; - homepage = "http://www.myhdl.org/"; + homepage = "https://www.myhdl.org/"; license = licenses.lgpl21; maintainers = with maintainers; [ doronbehar ]; }; diff --git a/pkgs/development/python-modules/myhome/default.nix b/pkgs/development/python-modules/myhome/default.nix index de729243f042..dfdf81a08a1e 100644 --- a/pkgs/development/python-modules/myhome/default.nix +++ b/pkgs/development/python-modules/myhome/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/myjwt/default.nix b/pkgs/development/python-modules/myjwt/default.nix index 3c21c2c8106f..807e205eb0d3 100644 --- a/pkgs/development/python-modules/myjwt/default.nix +++ b/pkgs/development/python-modules/myjwt/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook requests-mock diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 00be47cf8207..d6ada06ef91e 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.11.11"; + version = "7.12.3"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-4iyh/oXuYsdtqEf1Dh4Z3y8AHWiS1TmimO5HUwsHrHA="; + hash = "sha256-cAbDw/u0kLUEdmd/NBNDy/bt5Wno9QpmqpqicqZ/Q6g="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index eb36da387f60..bacf0cbf52b2 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.26.0.post1"; + version = "1.26.62"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bXB5+Mc53Jk8vtrQc2KZxBOyl4FLc3laOFWnkWnsyTg="; + hash = "sha256-qBf/8o/ualbYlkEK4KbYSP/kNUgK43rBxIGUDZYOz+U="; }; propagatedBuildInputs = [ @@ -31,9 +31,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Type annotations for boto3"; - homepage = "https://vemel.github.io/boto3_stubs_docs/mypy_boto3_s3/"; - license = with licenses; [ bsd3 ]; + description = "Type annotations for boto3.s3"; + homepage = "https://github.com/youtype/mypy_boto3_builder"; + license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index b8b3de240820..2bd02f1ff7b8 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { doCheck = false; # ModuleNotFoundError: No module named 'testproto' - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index b664d871fb55..bb585a7afcd7 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -20,12 +20,13 @@ , tomli , types-setuptools , types-typed-ast +, types-psutil , virtualenv }: buildPythonPackage rec { pname = "mypy"; - version = "0.981"; + version = "0.991"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -33,13 +34,14 @@ buildPythonPackage rec { owner = "python"; repo = "mypy"; rev = "refs/tags/v${version}"; - hash = "sha256-CkRK/j5DRUZU2enpZtqX4l+89E7ODDG9MeRYFQp9kSs="; + hash = "sha256-ljnMlQUlz4oiZqlqOlqJOumrP6wKLDGiDtT3Y5OEQog="; }; nativeBuildInputs = [ setuptools types-typed-ast types-setuptools + types-psutil ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix index ba0a079fee1d..7f167c3f71df 100644 --- a/pkgs/development/python-modules/mypy/extensions.nix +++ b/pkgs/development/python-modules/mypy/extensions.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional (pythonOlder "3.5") typing; # make the testsuite run with pytest, so we can disable individual tests - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/myst-docutils/default.nix b/pkgs/development/python-modules/myst-docutils/default.nix index c7d9f7999bc7..6746b314c021 100644 --- a/pkgs/development/python-modules/myst-docutils/default.nix +++ b/pkgs/development/python-modules/myst-docutils/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "myst-docutils"; - version = "0.18.0"; + version = "0.18.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-evyIuNLbBWR3KfQMv2lNw6fOgX1+/uMS5cHIbSTYDmA="; + sha256 = "sha256-Dxg5TtQaK4plvRmXZa7AqPFIv/jvUOpV8M/BJohiXj0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix index e81bf763b3a8..4437c9edcb75 100644 --- a/pkgs/development/python-modules/myst-parser/default.nix +++ b/pkgs/development/python-modules/myst-parser/default.nix @@ -19,24 +19,24 @@ buildPythonPackage rec { pname = "myst-parser"; - version = "0.18.0"; + version = "0.18.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "executablebooks"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-GEtrC7o5YnkuvBfQQfhG5P74QMiHz63Fdh1cC/r5CF0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-wgRZwafAF05LtwjH6SVKzsY7bKeZ6lUlM3dB5PdOn1E="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "docutils>=0.15,<0.19" "docutils>=0.15" + --replace "docutils>=0.15,<0.19" "docutils>=0.15" \ + --replace "sphinx>=4,<6" "sphinx" ''; - format = "flit"; - nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ @@ -51,7 +51,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "myst_parser" ]; - checkInputs = [ + nativeCheckInputs = [ beautifulsoup4 pytest-param-files pytest-regressions @@ -67,6 +67,8 @@ buildPythonPackage rec { "test_fieldlist_extension" # docutils 0.19 expectation mismatches "test_docutils_roles" + # sphinx 6.0 expectation mismatches + "test_sphinx_directives" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/nad-receiver/default.nix b/pkgs/development/python-modules/nad-receiver/default.nix index 60006c7afcb7..3d21379c246f 100644 --- a/pkgs/development/python-modules/nad-receiver/default.nix +++ b/pkgs/development/python-modules/nad-receiver/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pyserial ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nagiosplugin/default.nix b/pkgs/development/python-modules/nagiosplugin/default.nix index fab05cd4acde..a7e7b016577d 100644 --- a/pkgs/development/python-modules/nagiosplugin/default.nix +++ b/pkgs/development/python-modules/nagiosplugin/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { twine ]; - checkInputs = [ + nativeCheckInputs = [ numpy pytestCheckHook ]; diff --git a/pkgs/development/python-modules/namedlist/default.nix b/pkgs/development/python-modules/namedlist/default.nix index d9b2db64f465..0bba6233f854 100644 --- a/pkgs/development/python-modules/namedlist/default.nix +++ b/pkgs/development/python-modules/namedlist/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-NPifyZJZLICzmnCeE27c9B6hfyS6Mer4SjFKAsi5vO8="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index 63e795f98c85..d3780e0c3c29 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.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zoM27XRk+nubh0X0i5xi3qa+2TG5lxXKlHk2BUSZIUM="; + sha256 = "sha256-9LbHwQSNUovWqisnz0KgZEfSsx5FqVsgRJUTB48dhu8="; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/names/default.nix b/pkgs/development/python-modules/names/default.nix index b65bb463475b..b2d6a25bb5ae 100644 --- a/pkgs/development/python-modules/names/default.nix +++ b/pkgs/development/python-modules/names/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0jfn11bl05k3qkqw0f4vi2i2lhllxdrbb1732qiisdy9fbvv8611"; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/nampa/default.nix b/pkgs/development/python-modules/nampa/default.nix index 9f572d141c70..133fd4932b44 100644 --- a/pkgs/development/python-modules/nampa/default.nix +++ b/pkgs/development/python-modules/nampa/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { future ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nanoid/default.nix b/pkgs/development/python-modules/nanoid/default.nix new file mode 100644 index 000000000000..5054756a3092 --- /dev/null +++ b/pkgs/development/python-modules/nanoid/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "nanoid"; + version = "2.0.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-WoDK1enG6a46Qfovs0rhiffLQgsqXY+CvZ0jRm5O+mg="; + }; + + doCheck = false; # tests not in sdist, git not tagged + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nanoid" + ]; + + meta = with lib; { + description = "A tiny, secure, URL-friendly, unique string ID generator for Python"; + homepage = "https://github.com/puyuan/py-nanoid"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/nanotime/default.nix b/pkgs/development/python-modules/nanotime/default.nix index fc9306eb5714..e7802871b085 100644 --- a/pkgs/development/python-modules/nanotime/default.nix +++ b/pkgs/development/python-modules/nanotime/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "c7cc231fc5f6db401b448d7ab51c96d0a4733f4b69fabe569a576f89ffdf966b"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix index 9625c8b55649..1c000f1676e8 100644 --- a/pkgs/development/python-modules/napalm/default.nix +++ b/pkgs/development/python-modules/napalm/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { ncclient ]; - checkInputs = [ pytestCheckHook mock ddt ]; + nativeCheckInputs = [ pytestCheckHook mock ddt ]; meta = with lib; { description = diff --git a/pkgs/development/python-modules/napalm/hp-procurve.nix b/pkgs/development/python-modules/napalm/hp-procurve.nix index f6ebfa980e6e..c0a326b0ef7f 100644 --- a/pkgs/development/python-modules/napalm/hp-procurve.nix +++ b/pkgs/development/python-modules/napalm/hp-procurve.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { preCheck = '' rm setup.cfg ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # AssertionError: Some methods vary. "test_method_signatures" diff --git a/pkgs/development/python-modules/napari-plugin-engine/default.nix b/pkgs/development/python-modules/napari-plugin-engine/default.nix index 802b25e8df14..969351a41a88 100644 --- a/pkgs/development/python-modules/napari-plugin-engine/default.nix +++ b/pkgs/development/python-modules/napari-plugin-engine/default.nix @@ -13,7 +13,7 @@ sha256 = "sha256-cKpCAEYYRq3UPje7REjzhEe1J9mmrtXs8TBnxWukcNE="; }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; doCheck = false; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/napari-svg/default.nix b/pkgs/development/python-modules/napari-svg/default.nix index 89101e824445..1a5eb1ee4be5 100644 --- a/pkgs/development/python-modules/napari-svg/default.nix +++ b/pkgs/development/python-modules/napari-svg/default.nix @@ -17,7 +17,7 @@ }; nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ vispy napari-plugin-engine imageio ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; doCheck = false; # Circular dependency: napari SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 4e4fffa53063..592407007221 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -35,7 +35,7 @@ mkDerivationWith buildPythonPackage rec { pname = "napari"; - version = "0.4.16"; + version = "0.4.17"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ mkDerivationWith buildPythonPackage rec { owner = "napari"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Fx3DoTIb2ev5wMP/gmprPIoxeF2f+Cbac6pnWB/zTTw="; + hash = "sha256-34FALCI7h0I295553Rv0KZxKIipuA2OMNsINGde7/oE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/nasdaq-data-link/default.nix b/pkgs/development/python-modules/nasdaq-data-link/default.nix index ac1141af34ef..17e2b229245a 100644 --- a/pkgs/development/python-modules/nasdaq-data-link/default.nix +++ b/pkgs/development/python-modules/nasdaq-data-link/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ factory_boy httpretty jsondate diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix index c65ef0c35c23..9a3ed2848101 100644 --- a/pkgs/development/python-modules/nats-py/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ed25519 ]; - checkInputs = [ + nativeCheckInputs = [ nats-server pytestCheckHook uvloop diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 065367e36dd6..4a01afaaf707 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -4,7 +4,7 @@ , fetchPypi , glibcLocales , hypothesis -, PyICU +, pyicu , pytest-mock , pytestCheckHook , pythonOlder @@ -24,10 +24,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ fastnumbers - PyICU + pyicu ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales hypothesis pytest-mock diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix index 7065191b1ad1..2735efd4ce3a 100644 --- a/pkgs/development/python-modules/nbclassic/default.nix +++ b/pkgs/development/python-modules/nbclassic/default.nix @@ -6,14 +6,14 @@ , ipython_genutils , jinja2 , jupyter-client -, jupyter_core -, jupyter_server +, jupyter-core +, jupyter-server , nbconvert , nbformat , nest-asyncio -, notebook , notebook-shim , prometheus-client +, pytest-jupyter , pytest-tornasync , pytestCheckHook , pythonOlder @@ -42,12 +42,11 @@ buildPythonPackage rec { ipython_genutils jinja2 jupyter-client - jupyter_core - jupyter_server + jupyter-core + jupyter-server nbconvert nbformat nest-asyncio - notebook notebook-shim prometheus-client pyzmq @@ -57,7 +56,8 @@ buildPythonPackage rec { traitlets ]; - checkInputs = [ + nativeCheckInputs = [ + pytest-jupyter pytest-tornasync pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 1643904c314f..605ecf1d6058 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -1,6 +1,7 @@ { async_generator , buildPythonPackage , fetchFromGitHub +, hatchling , ipykernel , ipywidgets , jupyter-client @@ -11,14 +12,15 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, testpath , traitlets , xmltodict }: let nbclient = buildPythonPackage rec { pname = "nbclient"; - version = "0.6.8"; - format = "setuptools"; + version = "0.7.2"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,20 +28,31 @@ let nbclient = buildPythonPackage rec { owner = "jupyter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+GQkEGWReo9y8bgcysslQdzJUcvQiZkQTQiwmWJ1mx8="; + hash = "sha256-2H6Oi1tK/GrtfMTR1j12tZdRzQkFUxXzMSpfCtGPyWE="; }; - propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ]; + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + async_generator + traitlets + nbformat + nest-asyncio + jupyter-client + ]; # circular dependencies if enabled by default doCheck = false; - checkInputs = [ + nativeCheckInputs = [ ipykernel ipywidgets nbconvert pytest-asyncio pytestCheckHook + testpath xmltodict ]; diff --git a/pkgs/development/python-modules/nbconflux/default.nix b/pkgs/development/python-modules/nbconflux/default.nix index 42d9ae3cf389..2de84cf20eae 100644 --- a/pkgs/development/python-modules/nbconflux/default.nix +++ b/pkgs/development/python-modules/nbconflux/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ nbconvert requests ]; - checkInputs = [ pytestCheckHook responses ]; + nativeCheckInputs = [ pytestCheckHook responses ]; JUPYTER_PATH="${nbconvert}/share/jupyter"; disabledTests = [ diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 51123d05ef4a..54632a502573 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -9,7 +9,7 @@ , importlib-metadata , ipywidgets , jinja2 -, jupyter_core +, jupyter-core , jupyterlab-pygments , lib , markupsafe @@ -33,7 +33,7 @@ let }; in buildPythonPackage rec { pname = "nbconvert"; - version = "7.2.3"; + version = "7.2.5"; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-eufMxoSVtWXasVNFnufmUDmXCRPrEVBw2m4sZzzw6fg="; + hash = "sha256-j9xE/X2UJNt/3G4eg0oC9rhiD/tlN2c4i+L56xb4QYQ="; }; # Add $out/share/jupyter to the list of paths that are used to search for @@ -66,7 +66,7 @@ in buildPythonPackage rec { bleach defusedxml jinja2 - jupyter_core + jupyter-core jupyterlab-pygments markupsafe mistune @@ -84,7 +84,7 @@ in buildPythonPackage rec { export HOME=$(mktemp -d) ''; - checkInputs = [ + nativeCheckInputs = [ ipywidgets pyppeteer pytestCheckHook diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index da00ff3702dd..40a0d63d48a0 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k +, pythonOlder , hypothesis , setuptools-scm , six @@ -19,7 +19,7 @@ , pygments , tornado , requests -, GitPython +, gitpython , jupyter-server-mathjax , notebook , jinja2 @@ -28,14 +28,18 @@ buildPythonPackage rec { pname = "nbdime"; version = "3.1.1"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "67767320e971374f701a175aa59abd3a554723039d39fae908e72d16330d648b"; + hash = "sha256-Z3ZzIOlxN09wGhdapZq9OlVHIwOdOfrpCOctFjMNZIs="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ attrs @@ -48,12 +52,12 @@ buildPythonPackage rec { pygments tornado requests - GitPython + gitpython notebook jinja2 ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytest-timeout pytest-tornado @@ -78,6 +82,10 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ + "nbdime" + ]; + meta = with lib; { homepage = "https://github.com/jupyter/nbdime"; description = "Tools for diffing and merging of Jupyter notebooks."; diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index a418e5c6b48f..ab2520279a31 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -6,7 +6,7 @@ , hatch-nodejs-version , fastjsonschema , jsonschema -, jupyter_core +, jupyter-core , traitlets , pep440 , pytestCheckHook @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.7.0"; + version = "5.7.1"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1d4760c15c1a04269ef5caf375be8b98dd2f696e5eb9e603ec2bf091f9b0d3f3"; + sha256 = "sha256-OBCgEwRT7QMZcFIdIJibilkvPC5zKDqCgK40rh91s/g="; }; nativeBuildInputs = [ @@ -34,11 +34,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ fastjsonschema jsonschema - jupyter_core + jupyter-core traitlets ]; - checkInputs = [ + nativeCheckInputs = [ pep440 pytestCheckHook testpath diff --git a/pkgs/development/python-modules/nbmerge/default.nix b/pkgs/development/python-modules/nbmerge/default.nix index 79900197133a..5919f7e18bf6 100644 --- a/pkgs/development/python-modules/nbmerge/default.nix +++ b/pkgs/development/python-modules/nbmerge/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ nbformat ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' patchShebangs . diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 060184fa2a7a..3a93825f8e0c 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -7,17 +7,19 @@ , nbformat , sphinx , traitlets -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "nbsphinx"; - version = "0.8.10"; + version = "0.8.12"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-qNaARviquRbilAubOBm9PvndzoaKo4hF6jZmRcq7YlQ="; + hash = "sha256-dlcEFs3svrIdv1w9aqIEztbB3X6+9Ad7XCG4xuzpUz8="; }; propagatedBuildInputs = [ @@ -33,16 +35,16 @@ buildPythonPackage rec { doCheck = false; JUPYTER_PATH = "${nbconvert}/share/jupyter"; + pythonImportsCheck = [ "nbsphinx" ]; - disabled = !isPy3k; - meta = with lib; { description = "Jupyter Notebook Tools for Sphinx"; homepage = "https://nbsphinx.readthedocs.io/"; + changelog = "https://github.com/spatialaudio/nbsphinx/blob/${version}/NEWS.rst"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index 3db084665221..1e135a80d1ce 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook matplotlib sympy diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 8367074ef6ca..68d3ca60342a 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -4,7 +4,7 @@ , fetchFromGitLab , gobject-introspection , idna -, libsoup +, libsoup_3 , precis-i18n , pygobject3 , pyopenssl @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "3.2.5"; + version = "4.0.1"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitLab { domain = "dev.gajim.org"; owner = "gajim"; repo = "python-nbxmpp"; rev = version; - sha256 = "sha256-HIPvZu8Zj69k1FCbkrlSeGtur5cT0TNIYfdXcRbYLwQ="; + hash = "sha256-PL+qNxeNubGSLqSci4uhRWtOIqs10p+A1VPfTwCLu84="; }; nativeBuildInputs = [ @@ -37,12 +37,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ gobject-introspection idna - libsoup + libsoup_3 pygobject3 pyopenssl ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 3457c71af4ca..385899ba8418 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { lxml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ndjson/default.nix b/pkgs/development/python-modules/ndjson/default.nix index cd70025d6106..9f2cf3fb2b9b 100644 --- a/pkgs/development/python-modules/ndjson/default.nix +++ b/pkgs/development/python-modules/ndjson/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "v5dGy2uxy1PRcs2n8VTAfHhtZl/yg0Hk5om3lrIp5dY="; }; - checkInputs = [ pytest pytest-runner flake8 twine sphinx coverage watchdog ]; + nativeCheckInputs = [ pytest pytest-runner flake8 twine sphinx coverage watchdog ]; meta = with lib; { homepage = "https://github.com/rhgrant10/ndjson"; diff --git a/pkgs/development/python-modules/ndms2-client/default.nix b/pkgs/development/python-modules/ndms2-client/default.nix index d29946a5685f..feeb36737a8a 100644 --- a/pkgs/development/python-modules/ndms2-client/default.nix +++ b/pkgs/development/python-modules/ndms2-client/default.nix @@ -6,16 +6,18 @@ buildPythonPackage rec { pname = "ndms2-client"; - version = "0.1.1"; + version = "0.1.2"; + + format = "setuptools"; src = fetchFromGitHub { owner = "foxel"; repo = "python_ndms2_client"; rev = version; - sha256 = "1sc39d10hm1y8xf3gdqzq1akrx94k590l106242j9bvfqyr8lrk9"; + hash = "sha256-cM36xNLymg5Xph3bvbUGdAEmMABJ9y3/w/U8re6ZfB4="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ndspy/default.nix b/pkgs/development/python-modules/ndspy/default.nix index 7408949649fa..1fb330213888 100644 --- a/pkgs/development/python-modules/ndspy/default.nix +++ b/pkgs/development/python-modules/ndspy/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { crcmod ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index 14e33064fe4f..0bb1f33c98ba 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { quantities ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 38ad7832ee8f..5f7e3430cb09 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -3,11 +3,12 @@ , fetchFromGitHub , pythonOlder , pytz +, tomlkit }: buildPythonPackage rec { pname = "neo4j"; - version = "5.2.1"; + version = "5.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,11 +17,12 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-d4OkXj6mZjrdRG8UyxWeAh3rLywz2TUk2pZq+Ni1F3s="; + hash = "sha256-K3ggXXDDdyPIcWL4eLo1HrpZB05tA9oYWpbOohcCF/w="; }; propagatedBuildInputs = [ pytz + tomlkit ]; # Missing dependencies @@ -33,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Neo4j Bolt Driver for Python"; homepage = "https://github.com/neo4j/neo4j-python-driver"; + changelog = "https://github.com/neo4j/neo4j-python-driver/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/nessclient/default.nix b/pkgs/development/python-modules/nessclient/default.nix index 591d74a95a54..c48fe4a74678 100644 --- a/pkgs/development/python-modules/nessclient/default.nix +++ b/pkgs/development/python-modules/nessclient/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index faa015d85f31..995641eb9253 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.5.5"; + version = "1.5.6"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "sha256-5EIpHNlCaYvmGYI6F6hqV1nqvh+GEwhHkN4Yn+nhbWU="; + sha256 = "sha256-0mfMH/eUQD999pKWTR0qP6lBj/6io/aFmkOf9IL+8pA="; }; # tests not packaged with source dist as of 1.3.2/1.3.2, and diff --git a/pkgs/development/python-modules/nested-lookup/default.nix b/pkgs/development/python-modules/nested-lookup/default.nix index dc186606f41c..c8c00c3366eb 100644 --- a/pkgs/development/python-modules/nested-lookup/default.nix +++ b/pkgs/development/python-modules/nested-lookup/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nestedtext/default.nix b/pkgs/development/python-modules/nestedtext/default.nix index 1fbfde7b26a6..c8b0c77b7a39 100644 --- a/pkgs/development/python-modules/nestedtext/default.nix +++ b/pkgs/development/python-modules/nestedtext/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ inform ]; - checkInputs = [ pytestCheckHook docopt natsort voluptuous ]; + nativeCheckInputs = [ pytestCheckHook docopt natsort voluptuous ]; pytestFlagsArray = [ "--ignore=build" ]; # Avoids an ImportMismatchError. meta = with lib; { diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index 3f7f78a374cb..2a9f4b78b5c8 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ importlib-resources ]; - checkInputs = [ glibcLocales pytestCheckHook ]; + nativeCheckInputs = [ glibcLocales pytestCheckHook ]; meta = with lib; { homepage = "https://netaddr.readthedocs.io/en/latest/"; diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index f0606f769194..1fd7e47ade23 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -1,22 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi, isPyPy, pytest -, numpy, zlib, netcdf, hdf5, curl, libjpeg, cython, cftime +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, python +, setuptools +, numpy +, zlib +, netcdf +, hdf5 +, curl +, libjpeg +, cython +, cftime }: + buildPythonPackage rec { pname = "netCDF4"; - version = "1.6.1"; + version = "1.6.2"; + format = "pyproject"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "sha256-uo3F1lKTqZ8a+4wqz1iNkD/f3BljpiVFtnf6JzQmKng="; + sha256 = "sha256-A4KwL/aiiEGfb/7IXexA9FH0G4dVVHFUxXXd2fD0rlM="; }; - checkInputs = [ pytest ]; - - buildInputs = [ - cython - ]; + nativeBuildInputs = [ setuptools cython ]; propagatedBuildInputs = [ cftime @@ -29,22 +39,24 @@ buildPythonPackage rec { ]; checkPhase = '' - py.test test/tst_*.py + pushd test/ + NO_NET=1 NO_CDL=1 ${python.interpreter} run_all.py ''; - # Tests need fixing. - doCheck = false; - # Variables used to configure the build process - USE_NCCONFIG="0"; + USE_NCCONFIG = "0"; HDF5_DIR = lib.getDev hdf5; - NETCDF4_DIR=netcdf; - CURL_DIR=curl.dev; - JPEG_DIR=libjpeg.dev; + NETCDF4_DIR = netcdf; + CURL_DIR = curl.dev; + JPEG_DIR = libjpeg.dev; + + pythonImportsCheckHook = [ "netcdf4" ]; meta = with lib; { description = "Interface to netCDF library (versions 3 and 4)"; - homepage = "https://pypi.python.org/pypi/netCDF4"; - license = licenses.free; # Mix of license (all MIT* like) + homepage = "https://github.com/Unidata/netcdf4-python"; + changelog = "https://github.com/Unidata/netcdf4-python/raw/v${version}/Changelog"; + maintainers = with maintainers; [ ]; + license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/netdata/default.nix b/pkgs/development/python-modules/netdata/default.nix index 660f2bd19fa7..18942bb01417 100644 --- a/pkgs/development/python-modules/netdata/default.nix +++ b/pkgs/development/python-modules/netdata/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-httpx pytestCheckHook diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index 0017483eca27..ef1ebbf68f79 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests zeroconf ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ # Broken due to removed discoverables in https://github.com/home-assistant-libs/netdisco/commit/477db5a1dc93919a6c5bd61b4b1d3c80e75785bd diff --git a/pkgs/development/python-modules/netio/default.nix b/pkgs/development/python-modules/netio/default.nix index dbc988191846..46186fbab750 100644 --- a/pkgs/development/python-modules/netio/default.nix +++ b/pkgs/development/python-modules/netio/default.nix @@ -1,22 +1,23 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pyopenssl , pythonOlder , requests -, pyopenssl }: buildPythonPackage rec { pname = "netio"; - version = "1.0.6"; + version = "1.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "Netio"; - inherit version; - hash = "sha256-G1NSCchoRjgX2K9URNXsxpp9jxrQo0RgZ00tzWdexGU="; + src = fetchFromGitHub { + owner = "netioproducts"; + repo = "PyNetio"; + rev = "v${version}"; + hash = "sha256-07GzT9j27KmrTQ7naIdlIz7HB9knHpjH4mQhlwUKucU="; }; propagatedBuildInputs = [ @@ -39,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for interacting with NETIO devices"; homepage = "https://github.com/netioproducts/PyNetio"; + changelog = "https://github.com/netioproducts/PyNetio/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 3ae81a4afed6..71cd3b9a260d 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -1,10 +1,11 @@ { lib , aiohttp , aioresponses +, aqipy-atmotech , buildPythonPackage , dacite , fetchFromGitHub -, aqipy-atmotech +, orjson , pytest-asyncio , pytest-error-for-skips , pytestCheckHook @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.4.2"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,16 +23,17 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - hash = "sha256-UbknJ+dX+4kzfe6/gg/Nj1Ay8YXtIRj203B6NkhGVys="; + hash = "sha256-86YEpn3rI6Y4v0pcNk+/4tHCUzXpXZN5xwV9M/1gZ8U="; }; propagatedBuildInputs = [ aiohttp - dacite aqipy-atmotech + dacite + orjson ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytest-error-for-skips @@ -45,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to get air quality data from Nettigo Air Monitor devices"; homepage = "https://github.com/bieniu/nettigo-air-monitor"; + changelog = "https://github.com/bieniu/nettigo-air-monitor/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index 7bb23f3f6410..9bf6f3c7817b 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.3.0"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,15 +20,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "networktocode"; repo = pname; - rev = "v${version}"; - hash = "sha256-3c44ZJIEBhKggtqs77gt2fY3tI00ZGmFGLIGR8LF6aE="; + rev = "refs/tags/v${version}"; + hash = "sha256-RT6KAliRlH285sEx2fbIXJNwe1gcyH6CrQ8pXKgY/hQ="; }; nativeBuildInputs = [ poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ jinja2 pytestCheckHook pyyaml @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library that is a collection of objects for common network automation tasks"; homepage = "https://github.com/networktocode/netutils"; + changelog = "https://github.com/networktocode/netutils/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; broken = stdenv.isDarwin; diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index 7c026be5cd26..01e21ae877fd 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.8.6"; + version = "2.8.8"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vSt3MDAIYMvS2v6OWvif9cmmXDl1s1J5nYemI4tDAaY="; + sha256 = "sha256-Iw04gRevhw/OVkejxSQB/PdT6Ucg5uprQZelNVZIiF4="; }; propagatedBuildInputs = [ decorator setuptools ]; - checkInputs = [ nose pytestCheckHook ]; + nativeCheckInputs = [ nose pytestCheckHook ]; meta = { homepage = "https://networkx.github.io/"; diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix index 37586ccfcb47..808427e241d9 100644 --- a/pkgs/development/python-modules/nevow/default.nix +++ b/pkgs/development/python-modules/nevow/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ twisted ]; - checkInputs = [ twisted ]; + nativeCheckInputs = [ twisted ]; checkPhase = '' trial formless nevow diff --git a/pkgs/development/python-modules/newversion/default.nix b/pkgs/development/python-modules/newversion/default.nix index f340dc3a1b32..f1643b9f21cb 100644 --- a/pkgs/development/python-modules/newversion/default.nix +++ b/pkgs/development/python-modules/newversion/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix index 90e6a1a0204b..3e68892c8b3e 100644 --- a/pkgs/development/python-modules/nexia/default.nix +++ b/pkgs/development/python-modules/nexia/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses requests-mock pytestCheckHook diff --git a/pkgs/development/python-modules/nextdns/default.nix b/pkgs/development/python-modules/nextdns/default.nix index a0aac69df9e1..18eae73ca000 100644 --- a/pkgs/development/python-modules/nextdns/default.nix +++ b/pkgs/development/python-modules/nextdns/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nextdns"; - version = "1.1.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hMTafmG3mk6jyrqxI7L/rQxKGpgNgEZ+b6d6/yISCng="; + hash = "sha256-F6vTOwE8WdcELH+W7VuRbGDLD+7+a09iai/TDMBfv4s="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { orjson ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytest-error-for-skips @@ -41,6 +41,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/bieniu/nextdns/releases/tag/${version}"; description = "Module for the NextDNS API"; homepage = "https://github.com/bieniu/nextdns"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix index 39a4c485205b..6385b07898f9 100644 --- a/pkgs/development/python-modules/niaaml/default.nix +++ b/pkgs/development/python-modules/niaaml/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { toml-adapt -path pyproject.toml -a change -dep scikit-learn -ver X ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index 240a487680bc..eed07e4a38db 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -10,17 +10,17 @@ }: buildPythonPackage rec { - pname = "NiaARM"; - version = "0.2.2"; + pname = "niaarm"; + version = "0.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "firefly-cpp"; - repo = pname; + repo = "NiaARM"; rev = version; - hash = "sha256-IY72hDklPkGjb2zo7Wf0MBiPn/jHtyUKW9D0jxA0P54="; + hash = "sha256-JPsBpVMeVZxUhCHoIBP47LhR8nrc8ZtJHREZLwL5Zxw="; }; nativeBuildInputs = [ @@ -33,7 +33,12 @@ buildPythonPackage rec { pandas ]; - checkInputs = [ + disabledTests = [ + # Test requires extra nltk data dependency + "test_text_mining" + ]; + + nativeCheckInputs = [ pytestCheckHook ]; @@ -44,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "A minimalistic framework for Numerical Association Rule Mining"; homepage = "https://github.com/firefly-cpp/NiaARM"; + changelog = "https://github.com/firefly-cpp/NiaARM/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ firefly-cpp ]; }; diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix index bad77441d0b2..59f8a881a5dd 100644 --- a/pkgs/development/python-modules/niapy/default.nix +++ b/pkgs/development/python-modules/niapy/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pandas ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index f30f3f56f224..54b92a17871b 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index 4a3ce21b82a7..825f89354e56 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -5,6 +5,7 @@ , async-timeout , buildPythonPackage , construct +, exceptiongroup , fetchFromGitHub , pytest-asyncio , pytestCheckHook @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "1.2.1"; + version = "1.6.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-y1/yZE5Gfj2XPscZ27TNXOM/VGy/iIFkvg2TCNsh4tI="; + hash = "sha256-6pQsVGb26FpoV2LgOrs+Cfq2rATRqbljrVJ+NsZUSuc="; }; nativeBuildInputs = [ @@ -35,10 +36,11 @@ buildPythonPackage rec { async-modbus async-timeout construct + exceptiongroup tenacity ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook @@ -51,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for the communication with Nibe heatpumps"; homepage = "https://github.com/yozik04/nibe"; + changelog = "https://github.com/yozik04/nibe/releases/tag/${version}"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/nidaqmx/default.nix b/pkgs/development/python-modules/nidaqmx/default.nix index 60c9f271011c..785b88185149 100644 --- a/pkgs/development/python-modules/nidaqmx/default.nix +++ b/pkgs/development/python-modules/nidaqmx/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { enum34 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pykka ]; diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 576724c9c256..f0cbc4398a1a 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "sha256-jajTg12SzXuKbMkkVaSJ1+f1mUz2T8cbzmU+NidzueQ="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ "test_clean_confounds" ]; # https://github.com/nilearn/nilearn/issues/2608 # do subset of tests which don't fetch resources pytestFlagsArray = [ "nilearn/connectome/tests" ]; diff --git a/pkgs/development/python-modules/nimfa/default.nix b/pkgs/development/python-modules/nimfa/default.nix index eb04e0c4d89d..3f6e521047ab 100644 --- a/pkgs/development/python-modules/nimfa/default.nix +++ b/pkgs/development/python-modules/nimfa/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy scipy ]; - checkInputs = [ matplotlib pytest ]; + nativeCheckInputs = [ matplotlib pytest ]; doCheck = !isPy3k; # https://github.com/marinkaz/nimfa/issues/42 meta = with lib; { diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index fc221085f98e..125667cd0486 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -49,12 +49,12 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.8.4"; + version = "1.8.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-yoG6iLfF7ugBL4eNC9OLINIzBj1YgF4TVngFKb77qak="; + sha256 = "sha256-44QnQ/tmBGTdKd5z3Pye9m0nO+ELzGQFn/Ic1e8ellU="; }; postPatch = '' @@ -86,7 +86,7 @@ buildPythonPackage rec { xvfbwrapper ] ++ [ (if useNeurdflib then neurdflib else rdflib) ]; - checkInputs = [ + nativeCheckInputs = [ pybids codecov glibcLocales diff --git a/pkgs/development/python-modules/nipype/neurdflib.nix b/pkgs/development/python-modules/nipype/neurdflib.nix index 8095b0fb0401..6fb1ee04569b 100644 --- a/pkgs/development/python-modules/nipype/neurdflib.nix +++ b/pkgs/development/python-modules/nipype/neurdflib.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ isodate html5lib sparqlwrapper ]; - checkInputs = [ networkx nose ]; + nativeCheckInputs = [ networkx nose ]; # Python 2 syntax # Failing doctest diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix index 183e003d2860..183e2dfcfb77 100644 --- a/pkgs/development/python-modules/nitime/default.nix +++ b/pkgs/development/python-modules/nitime/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "sha256-bn2QrbsfqUJim84vH5tt5T6h3YsGAlgu9GCMiNQ0OHQ="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; buildInputs = [ cython ]; propagatedBuildInputs = [ numpy scipy matplotlib networkx nibabel ]; diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index 42533cfcacd8..25ec70ca9d83 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -9,18 +9,18 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "5.2.2"; + version = "6.0.0"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "seppeljordan"; repo = "nix-prefetch-github"; rev = "v${version}"; - sha256 = "sha256-+0s47YhpMojxmRHKC7kazov2ZUsOs2/Y2EmHAAcARf0="; + sha256 = "YobBihNPbqYYWhe3x0p+BIlEK8R62s/dDFWUzP7fCTI="; }; - checkInputs = [ unittestCheckHook git which ]; + nativeCheckInputs = [ unittestCheckHook git which ]; # ignore tests which are impure DISABLED_TESTS = "network requires_nix_build"; diff --git a/pkgs/development/python-modules/nkdfu/default.nix b/pkgs/development/python-modules/nkdfu/default.nix index fa094404b8b1..d95b688ed9ce 100644 --- a/pkgs/development/python-modules/nkdfu/default.nix +++ b/pkgs/development/python-modules/nkdfu/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "nkdfu"; - version = "0.1"; + version = "0.2"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Y8GonfCBi3BNMhZ99SN6/SDSa0+dbfPIMPoVzALwH5A="; + sha256 = "sha256-8l913dOCxHKFtpQ83p9RV3sUlu0oT5PVi14FSuYJ9fg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 9beeb4cb0a69..9b290730be9d 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nltk"; - version = "3.7"; + version = "3.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-1lB9ZGDOx21wr+pCQqImp1QvhcZpF3ucf1YrfPGwVQI="; + hash = "sha256-dLMIJqN9eNU0JxBbvQN92IAlG+Jp/KZO5TCDikbtVfw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nmapthon2/default.nix b/pkgs/development/python-modules/nmapthon2/default.nix index a19dd946b8fd..4c8a66c91a55 100644 --- a/pkgs/development/python-modules/nmapthon2/default.nix +++ b/pkgs/development/python-modules/nmapthon2/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-4Na75TdKDywUomJF4tDWUWwCCtcOSxBUMOF7+FDhbpY="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix index bea2d9c2c2f0..42067f594e8b 100644 --- a/pkgs/development/python-modules/nocasedict/default.nix +++ b/pkgs/development/python-modules/nocasedict/default.nix @@ -7,18 +7,18 @@ buildPythonPackage rec { pname = "nocasedict"; - version = "1.0.4"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fBEdpM79JEQzy2M3ev8IGkD4S92unm83bGfwhsD4Bto="; + sha256 = "sha256-rFUd5pK+aupbQ6w/LDN4DflAATrG3QcY+1Usi1YLpmE="; }; propagatedBuildInputs = [ six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix index 083174c824dc..3a11c78f3453 100644 --- a/pkgs/development/python-modules/nocaselist/default.nix +++ b/pkgs/development/python-modules/nocaselist/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "sha256-SPBn+MuEEkXzTQMSC8G6mQDxOxnLUbzGx77gF/fIdNo="; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/nocturne/default.nix b/pkgs/development/python-modules/nocturne/default.nix new file mode 100644 index 000000000000..42424f1dacc9 --- /dev/null +++ b/pkgs/development/python-modules/nocturne/default.nix @@ -0,0 +1,61 @@ +{ buildPythonPackage +, cmake +, fetchFromGitHub +, gtest +, hydra-core +, lib +, nlohmann_json +, pybind11 +, PyVirtualDisplay +, sfml +, substituteAll +}: + +buildPythonPackage rec { + pname = "nocturne"; + version = "unstable-2022-10-15"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = pname; + rev = "ae0a4e361457caf6b7e397675cc86f46161405ed"; + hash = "sha256-pFVbl4m7qX1mJgleNabRboS9klDDsbzUa4PYL5+Jupc="; + }; + + # Simulate the git submodules but with nixpkgs dependencies + postUnpack = '' + rm -rf $sourceRoot/third_party/* + ln -s ${nlohmann_json.src} $sourceRoot/third_party/json + ln -s ${pybind11.src} $sourceRoot/third_party/pybind11 + ''; + + patches = [ + (substituteAll { + src = ./dependencies.patch; + gtest_src = gtest.src; + }) + ]; + + nativeBuildInputs = [ cmake ]; + dontUseCmakeConfigure = true; + + buildInputs = [ sfml ]; + + # hydra-core and PyVirtualDisplay are not declared as dependences but they are requirements + propagatedBuildInputs = [ hydra-core PyVirtualDisplay ]; + + # Test suite requires hydra-submitit-launcher which is not packaged as of 2022-01-02 + doCheck = false; + + pythonImportsCheck = [ + "nocturne" + ]; + + meta = with lib; { + description = "A data-driven, fast driving simulator for multi-agent coordination under partial observability"; + homepage = "https://github.com/facebookresearch/nocturne"; + license = licenses.mit; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/nocturne/dependencies.patch b/pkgs/development/python-modules/nocturne/dependencies.patch new file mode 100644 index 000000000000..18843ff6309f --- /dev/null +++ b/pkgs/development/python-modules/nocturne/dependencies.patch @@ -0,0 +1,27 @@ +diff --git a/nocturne/cpp/CMakeLists.txt b/nocturne/cpp/CMakeLists.txt +index c67815f..e1f825b 100644 +--- a/nocturne/cpp/CMakeLists.txt ++++ b/nocturne/cpp/CMakeLists.txt +@@ -62,8 +62,7 @@ include(FetchContent) + + FetchContent_Declare( + googletest +- GIT_REPOSITORY https://github.com/google/googletest.git +- GIT_TAG main ++ SOURCE_DIR @gtest_src@ + ) + + set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) +diff --git a/setup.py b/setup.py +index 4863ae6..b5d3545 100644 +--- a/setup.py ++++ b/setup.py +@@ -92,6 +92,8 @@ def main(): + # with open("./requirements.txt", "r") as f: + # requires = f.read().splitlines() + setup( ++ # Adding `packages=` is necessary to get `python setup.py install` to work ++ packages=["nocturne", "cfgs"], + ext_modules=[CMakeExtension("nocturne", "./nocturne")], + cmdclass=dict(build_ext=CMakeBuild), + ) diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix index 276011e65ea6..6549697f1e3e 100644 --- a/pkgs/development/python-modules/node-semver/default.nix +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { version = "0.8.1"; pname = "node-semver"; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nodeenv/default.nix b/pkgs/development/python-modules/nodeenv/default.nix index d08fcf4699ab..ae0259788fd3 100644 --- a/pkgs/development/python-modules/nodeenv/default.nix +++ b/pkgs/development/python-modules/nodeenv/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/noiseprotocol/default.nix b/pkgs/development/python-modules/noiseprotocol/default.nix index 76ed1b1fc2a0..b1135eba7de4 100644 --- a/pkgs/development/python-modules/noiseprotocol/default.nix +++ b/pkgs/development/python-modules/noiseprotocol/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "noise" ]; diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 075aebbd6b2e..4f1389a04ab9 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -5,11 +5,12 @@ , lxmf , urwid , pythonOlder +, qrcode }: buildPythonPackage rec { pname = "nomadnet"; - version = "0.2.7"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,14 +18,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "markqvist"; repo = "NomadNet"; - rev = version; - hash = "sha256-ycQWvJnYvuNtXxNWjuLXD+TghscCIuOZMmch02M9C00="; + rev = "refs/tags/${version}"; + hash = "sha256-QIme76Y7rhPCooazX+pr5ETbAmShVHZ9polJ964NLFg="; }; propagatedBuildInputs = [ rns lxmf urwid + qrcode ]; # Module has no tests @@ -37,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Off-grid, resilient mesh communication"; homepage = "https://github.com/markqvist/NomadNet"; + changelog = "https://github.com/markqvist/NomadNet/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/normality/default.nix b/pkgs/development/python-modules/normality/default.nix index a91489f1aded..208898731b7a 100644 --- a/pkgs/development/python-modules/normality/default.nix +++ b/pkgs/development/python-modules/normality/default.nix @@ -4,7 +4,7 @@ , text-unidecode , chardet , banal -, PyICU +, pyicu , pytestCheckHook }: buildPythonPackage rec { @@ -22,10 +22,10 @@ buildPythonPackage rec { text-unidecode chardet banal - PyICU + pyicu ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nose-randomly/default.nix b/pkgs/development/python-modules/nose-randomly/default.nix index 94f64028d669..da294bf88297 100644 --- a/pkgs/development/python-modules/nose-randomly/default.nix +++ b/pkgs/development/python-modules/nose-randomly/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "7e483a3d79e13ae760d6ade57ae07ae45bb4b223b61a805e958b4c077116c67c"; }; - checkInputs = [ numpy nose ]; + nativeCheckInputs = [ numpy nose ]; checkPhase = if stdenv.isDarwin then '' # Work around "OSError: AF_UNIX path too long" diff --git a/pkgs/development/python-modules/nose-timer/default.nix b/pkgs/development/python-modules/nose-timer/default.nix index bbc164c85e2b..de3bbdc9a439 100644 --- a/pkgs/development/python-modules/nose-timer/default.nix +++ b/pkgs/development/python-modules/nose-timer/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ nose ]; - checkInputs = [ + nativeCheckInputs = [ mock nose parameterized diff --git a/pkgs/development/python-modules/nose_warnings_filters/default.nix b/pkgs/development/python-modules/nose_warnings_filters/default.nix index 81e7de8815ee..6617c85d16d4 100644 --- a/pkgs/development/python-modules/nose_warnings_filters/default.nix +++ b/pkgs/development/python-modules/nose_warnings_filters/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ nose ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests -v ''; diff --git a/pkgs/development/python-modules/nosejs/default.nix b/pkgs/development/python-modules/nosejs/default.nix index f80953bd2d71..7a63713d2d09 100644 --- a/pkgs/development/python-modules/nosejs/default.nix +++ b/pkgs/development/python-modules/nosejs/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0qrhkd3sga56qf6k0sqyhwfcladwi05gl6aqmr0xriiq1sgva5dy"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests -v diff --git a/pkgs/development/python-modules/notebook-shim/default.nix b/pkgs/development/python-modules/notebook-shim/default.nix index a37e0cb3c679..94d4f9fc75f6 100644 --- a/pkgs/development/python-modules/notebook-shim/default.nix +++ b/pkgs/development/python-modules/notebook-shim/default.nix @@ -1,23 +1,26 @@ { lib , buildPythonPackage , fetchFromGitHub -, jupyter_server +, hatchling +, jupyter-server , pytestCheckHook , pytest-tornasync }: buildPythonPackage rec { pname = "notebook-shim"; - version = "0.1.0"; + version = "0.2.2"; + format = "pyproject"; src = fetchFromGitHub { owner = "jupyter"; repo = "notebook_shim"; - rev = "v${version}"; - sha256 = "sha256-5oIYj8SdC4E0N/yFxsmD2p4VkStHvqrVqAwb/htyPm4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-/z4vXSBqeL2wSqJ0kFNgU0TSGUGByhxHNya8EO55+7s="; }; - propagatedBuildInputs = [ jupyter_server ]; + nativeBuildInputs = [ hatchling ]; + propagatedBuildInputs = [ jupyter-server ]; preCheck = '' mv notebook_shim/conftest.py notebook_shim/tests @@ -28,7 +31,7 @@ buildPythonPackage rec { # have been comitted with msgs "wip" though. doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-tornasync ]; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index fdb599466ff2..e1c0210bec90 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -1,20 +1,19 @@ { stdenv , lib , buildPythonPackage +, pythonOlder , fetchPypi , argon2-cffi -, nose -, nose_warnings_filters , glibcLocales -, isPy3k , mock , jinja2 , tornado , ipython_genutils , traitlets -, jupyter_core +, jupyter-core , jupyter-client , nbformat +, nbclassic , nbconvert , ipykernel , terminado @@ -27,30 +26,25 @@ buildPythonPackage rec { pname = "notebook"; - version = "6.4.12"; - disabled = !isPy3k; + version = "6.5.2"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YmjJ7JBIz/ekVAXJkMKaycpAsLw+wpJj0hjF4B8rToY="; + sha256 = "sha256-wYl+UxfiJfx4tFVJpqtLZo5MmW/QOgTpOP5eevK//9A="; }; LC_ALL = "en_US.utf8"; - checkInputs = [ nose pytestCheckHook glibcLocales ] - ++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]); + nativeCheckInputs = [ pytestCheckHook glibcLocales ]; propagatedBuildInputs = [ - jinja2 tornado ipython_genutils traitlets jupyter_core send2trash - jupyter-client nbformat nbconvert ipykernel terminado requests pexpect + jinja2 tornado ipython_genutils traitlets jupyter-core send2trash + jupyter-client nbformat nbclassic + nbconvert ipykernel terminado requests pexpect prometheus-client argon2-cffi ]; - # disable warning_filters - preCheck = lib.optionalString (!isPy3k) '' - echo "" > setup.cfg - ''; - postPatch = '' # Remove selenium tests rm -rf notebook/tests/selenium diff --git a/pkgs/development/python-modules/notifications-python-client/default.nix b/pkgs/development/python-modules/notifications-python-client/default.nix index 3ed0d05e93ba..e98620dd9187 100644 --- a/pkgs/development/python-modules/notifications-python-client/default.nix +++ b/pkgs/development/python-modules/notifications-python-client/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ freezegun mock pytest-mock diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix index 6d255424812e..61c1c9026e0b 100644 --- a/pkgs/development/python-modules/notify-py/default.nix +++ b/pkgs/development/python-modules/notify-py/default.nix @@ -1,12 +1,14 @@ { lib , stdenv , buildPythonPackage -, isPy3k +, pythonOlder , fetchFromGitHub , substituteAll , alsa-utils , libnotify , which +, poetry-core +, pythonRelaxDepsHook , jeepney , loguru , pytest @@ -16,15 +18,16 @@ buildPythonPackage rec { pname = "notify-py"; - version = "0.3.3"; + version = "0.3.42"; + format = "pyproject"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ms7m"; repo = pname; - rev = "v${version}"; - sha256 = "1n35adwsyhz304n4ifnsz6qzkymwhyqc8sg8d76qv5psv2xsnzlf"; + rev = "refs/tags/v${version}"; + hash = "sha256-XtjJImH9UwPPZS/Yqs8S5xGXOLBRmJRawzxWXoPWvrM="; }; patches = lib.optionals stdenv.isLinux [ @@ -42,13 +45,22 @@ buildPythonPackage rec { }) ]; + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "loguru" + ]; + propagatedBuildInputs = [ loguru ] ++ lib.optionals stdenv.isLinux [ jeepney ]; - checkInputs = [ + nativeCheckInputs = [ pytest ] ++ lib.optionals stdenv.isLinux [ dbus @@ -61,17 +73,22 @@ buildPythonPackage rec { PATH="$TMP/bin:$PATH" pytest '' else if stdenv.isLinux then '' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ pytest '' else '' pytest ''; + # GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name + # org.freedesktop.Notifications was not provided by any .service files + doCheck = false; + pythonImportsCheck = [ "notifypy" ]; meta = with lib; { description = "Cross-platform desktop notification library for Python"; homepage = "https://github.com/ms7m/notify-py"; + changelog = "https://github.com/ms7m/notify-py/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ austinbutler dotlambda ]; }; diff --git a/pkgs/development/python-modules/notify-py/linux-paths.patch b/pkgs/development/python-modules/notify-py/linux-paths.patch index f043ec14a467..19965f33996f 100644 --- a/pkgs/development/python-modules/notify-py/linux-paths.patch +++ b/pkgs/development/python-modules/notify-py/linux-paths.patch @@ -1,54 +1,22 @@ diff --git a/notifypy/os_notifiers/linux.py b/notifypy/os_notifiers/linux.py -index ee89216..5201574 100644 +index 5882481..e26eaaf 100644 --- a/notifypy/os_notifiers/linux.py +++ b/notifypy/os_notifiers/linux.py -@@ -53,30 +53,12 @@ class LinuxNotifierLibNotify(BaseNotifier): - @staticmethod - def _find_installed_aplay(): - """Function to find the path for notify-send""" -- try: -- run_which_for_aplay = subprocess.check_output(["which", "aplay"]) -- return run_which_for_aplay.decode("utf-8") -- except subprocess.CalledProcessError: -- logger.exception("Unable to find aplay.") -- return False -- except Exception: -- logger.exception("Unhandled exception for finding aplay.") -- return False -+ return "@aplay@" +@@ -10,7 +10,7 @@ try: + from jeepney.io.blocking import open_dbus_connection + from shutil import which - @staticmethod - def _find_installed_notify_send(): - """Function to find the path for notify-send""" -- try: -- run_which_for_notify_send = subprocess.check_output( -- ["which", "notify-send"] -- ) -- return run_which_for_notify_send.decode("utf-8") -- except subprocess.CalledProcessError: -- logger.exception("Unable to find notify-send.") -- return False -- except Exception: -- logger.exception("Unhandled exception for finding notify-send.") -- return False -+ return "@notifysend@" +- NOTIFY = which('notify-send') # alternatively: from ctypes.util import find_library ++ NOTIFY = '@notifysend@' # alternatively: from ctypes.util import find_library - def send_notification( - self, -@@ -159,15 +141,7 @@ class LinuxNotifier(BaseNotifier): - @staticmethod - def _find_installed_aplay(): - """Function to find the path for notify-send""" -- try: -- run_which_for_aplay = subprocess.check_output(["which", "aplay"]) -- return run_which_for_aplay.decode("utf-8") -- except subprocess.CalledProcessError: -- logger.exception("Unable to find aplay.") -- return False -- except Exception: -- logger.exception("Unhandled exception for finding aplay.") -- return False -+ return "@aplay@" + if NOTIFY: + logger.info("libnotify found, using it for notifications") +@@ -22,7 +22,7 @@ try: + else: + raise ImportError - def send_notification( - self, +- APLAY = which('aplay') ++ APLAY = '@aplay@' + + if APLAY == None: + logger.debug("aplay binary not installed.. audio will not work!") diff --git a/pkgs/development/python-modules/notion-client/default.nix b/pkgs/development/python-modules/notion-client/default.nix new file mode 100644 index 000000000000..16405ff27e1b --- /dev/null +++ b/pkgs/development/python-modules/notion-client/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, anyio +, httpx +, pytest-asyncio +, pytest-vcr +}: + +buildPythonPackage rec { + pname = "notion-client"; + version = "2.0.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ramnes"; + repo = "notion-sdk-py"; + rev = version; + sha256 = "sha256-zfG1OgH/2ytDUC+ogIY9/nP+xkgjiMt9+HVcWEMXoj8="; + }; + + propagatedBuildInputs = [ + httpx + ]; + + # disable coverage options as they don't provide us value, and they break the defalt pytestCheckHook + preCheck = '' + sed -i '/addopts/d' ./setup.cfg + ''; + + nativeCheckInputs = [ + pytestCheckHook + anyio + pytest-asyncio + pytest-vcr + ]; + + pythonImportsCheck = [ + "notion_client" + ]; + + meta = with lib; { + description = "Python client for the official Notion API"; + homepage = "https://github.com/ramnes/notion-sdk-py"; + changelog = "https://github.com/ramnes/notion-sdk-py/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix index dbf01f3698d5..d038504205fa 100644 --- a/pkgs/development/python-modules/notus-scanner/default.nix +++ b/pkgs/development/python-modules/notus-scanner/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix new file mode 100644 index 000000000000..bc84559345a4 --- /dev/null +++ b/pkgs/development/python-modules/nox/default.nix @@ -0,0 +1,78 @@ +{ lib +, argcomplete +, buildPythonPackage +, colorlog +, fetchFromGitHub +, fetchpatch +, setuptools +, importlib-metadata +, jinja2 +, packaging +, pytestCheckHook +, pythonOlder +, tox +, typing-extensions +, virtualenv +}: + +buildPythonPackage rec { + pname = "nox"; + version = "2022.11.21"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "wntrblm"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-N70yBZyrtdQvgaJzkskG3goHit8eH0di9jHycuAwzfU="; + }; + + patches = [ + # Remove rogue mocking of py._path, https://github.com/wntrblm/nox/pull/677 + (fetchpatch { + name = "remove-py-pyth.patch"; + url = "https://github.com/wntrblm/nox/commit/44d06b679761e21d76bb96b2b8ffe0ffbe3d4fd0.patch"; + hash = "sha256-KRDVwbBMBd4GdiAcGJyS7DTNUw3Pumt0JO1igx6npnc="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + argcomplete + colorlog + packaging + virtualenv + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + importlib-metadata + ]; + + + checkInputs = [ + jinja2 + tox + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nox" + ]; + + disabledTestPaths = [ + # AttributeError: module 'tox.config' has... + "tests/test_tox_to_nox.py" + ]; + + meta = with lib; { + description = "Flexible test automation for Python"; + homepage = "https://nox.thea.codes/"; + changelog = "https://github.com/wntrblm/nox/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ doronbehar fab ]; + }; +} diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix index 13e0d28a3017..ecf2255b3593 100644 --- a/pkgs/development/python-modules/nplusone/default.nix +++ b/pkgs/development/python-modules/nplusone/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ flake8 flask-sqlalchemy mock diff --git a/pkgs/development/python-modules/nptyping/default.nix b/pkgs/development/python-modules/nptyping/default.nix new file mode 100644 index 000000000000..517512f6b791 --- /dev/null +++ b/pkgs/development/python-modules/nptyping/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, beartype +, invoke +, mypy +, numpy +, pandas +, feedparser +, typeguard +}: + +buildPythonPackage rec { + pname = "nptyping"; + version = "2.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ramonhagenaars"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-jV2MVMP/tlYN3djoViemGaJyzREoOJJamwG97WFhIvc="; + }; + + propagatedBuildInputs = [ + numpy + ]; + + nativeCheckInputs = [ + beartype + feedparser + invoke + mypy + pandas + pytestCheckHook + typeguard + ]; + + disabledTests = [ + # tries to download data + "test_pandas_stubs_fork_is_synchronized" + ]; + + disabledTestPaths = [ + # missing pyright import: + "tests/test_pyright.py" + # can't find mypy stubs for pandas: + "tests/test_mypy.py" + "tests/pandas_/test_mypy_dataframe.py" + # tries to build wheel of package, broken/unnecessary under Nix: + "tests/test_wheel.py" + ]; + + pythonImportsCheck = [ + "nptyping" + ]; + + meta = with lib; { + description = "Type hints for numpy"; + homepage = "https://github.com/ramonhagenaars/nptyping"; + changelog = "https://github.com/ramonhagenaars/nptyping/blob/v${version}/HISTORY.md"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/nsz/default.nix b/pkgs/development/python-modules/nsz/default.nix index c165e850de0c..29284c97eaeb 100644 --- a/pkgs/development/python-modules/nsz/default.nix +++ b/pkgs/development/python-modules/nsz/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "nsz"; - version = "4.1.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "nicoboss"; repo = pname; - rev = version; - sha256 = "sha256-tdngXV+VUOAkg3lF2NOmw0mBeSEE+YpUfuKukTKcPnM="; + rev = "refs/tags/${version}"; + sha256 = "sha256-It815Uxxs4T9BM9EypAfPuq4Oy8rgGLpKA79m2xM8N4="; }; propagatedBuildInputs = [pycryptodome enlighten zstandard ] diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index a188daf6b428..f161cfd154db 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "3.0.0"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "networktocode"; repo = pname; - rev = "v${version}"; - sha256 = "0kijzmmvq2rw7ima19w7lyb2p26a5w52k70fzbkaqqw78qzw8178"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-uEGl245tmc+W/9G+IclSNu76VTJ7w3zw6BQkhmGgEnY="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { textfsm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ruamel-yaml yamllint diff --git a/pkgs/development/python-modules/ntlm-auth/default.nix b/pkgs/development/python-modules/ntlm-auth/default.nix index d56fccde051d..d3d64bcbe235 100644 --- a/pkgs/development/python-modules/ntlm-auth/default.nix +++ b/pkgs/development/python-modules/ntlm-auth/default.nix @@ -4,39 +4,55 @@ , fetchFromGitHub , mock , pytestCheckHook +, pythonOlder , requests -, six }: buildPythonPackage rec { pname = "ntlm-auth"; version = "1.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jborean93"; repo = "ntlm-auth"; rev = "v${version}"; - sha256 = "00dpf5bfsy07frsjihv1k10zmwcyq4bvkilbxha7h6nlwpcm2409"; + hash = "sha256-CRBR2eXUGngU7IvGuRfBnvH6QZhhwyh1dgd47VZxtwE="; }; propagatedBuildInputs = [ cryptography - six ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook requests ]; - pythonImportsCheck = [ "ntlm_auth" ]; + pythonImportsCheck = [ + "ntlm_auth" + ]; + + disabledTests = [ + # Tests are outdated as module will be replaced by pyspnego + "test_authenticate_message" + "test_authenticate_without_domain_workstation" + "test_create_authenticate_message" + "test_get_" + "test_lm_v" + "test_nt_" + "test_ntlm_context" + "test_ntowfv" + ]; meta = with lib; { description = "Calculates NTLM Authentication codes"; homepage = "https://github.com/jborean93/ntlm-auth"; + changelog = "https://github.com/jborean93/ntlm-auth/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ elasticdog ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index b81ba43c8317..4e52fc4dcd1d 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "0wgcl860acbxnq8q9hck147yhxz8pcbqhv9glracfnrsd2qkpgpp"; }; - checkInputs = [ vmprof pyqt4 ]; + nativeCheckInputs = [ vmprof pyqt4 ]; nativeBuildInputs = [ scons ]; propagatedBuildInputs = [ chrpath ]; diff --git a/pkgs/development/python-modules/nulltype/default.nix b/pkgs/development/python-modules/nulltype/default.nix index 1f354e422488..f04f9df780dc 100644 --- a/pkgs/development/python-modules/nulltype/default.nix +++ b/pkgs/development/python-modules/nulltype/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0wpjbsmm0c9ifg9y6cnfz49qq9pa5f99nnqp6wdlv42ymfr3rak4"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix index 9e8c0961680e..438ee8afbaea 100644 --- a/pkgs/development/python-modules/num2words/default.nix +++ b/pkgs/development/python-modules/num2words/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ docopt ]; - checkInputs = [ delegator-py pytest ]; + nativeCheckInputs = [ delegator-py pytest ]; checkPhase = '' pytest -k 'not cli_with_lang' diff --git a/pkgs/development/python-modules/numba-scipy/default.nix b/pkgs/development/python-modules/numba-scipy/default.nix index f67d0be92270..07e82c0ca6d7 100644 --- a/pkgs/development/python-modules/numba-scipy/default.nix +++ b/pkgs/development/python-modules/numba-scipy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { --replace "scipy>=0.16,<=1.7.3" "scipy>=0.16" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index 3137fa7acd37..9a9b51aa7084 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -2,30 +2,33 @@ , buildPythonPackage , fetchPypi , isPy27 +, setuptools , setuptools-scm , cython , entrypoints , numpy , msgpack +, py-cpuinfo , pytestCheckHook , python -, gcc8 }: buildPythonPackage rec { pname = "numcodecs"; - version = "0.10.2"; + version = "0.11.0"; + format ="pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-IoOMaz/Zhr2cckA5uIhwBX95DiKyDm4cu6oN4ULdWcQ="; + sha256 = "sha256-bAWLMh3oShcpKZsOrk1lKy5I6hyn+d8NplyxNHDmNes="; }; nativeBuildInputs = [ + setuptools setuptools-scm cython - gcc8 + py-cpuinfo ]; propagatedBuildInputs = [ @@ -34,7 +37,7 @@ buildPythonPackage rec { msgpack ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index 6c76a8fc88ee..63d95622c061 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.8.3"; + version = "2.8.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-y2R8nZx4Xa4HWb9sh1zeK+xHK1w/emAVc0sWGudm0UE="; + hash = "sha256-1UMlN0GNGGkbkRXWFdbaoX7oJ1uu8+3xr7v4vGmAYUc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index c4877e839cd1..585e539bd6a3 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.17.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NskgGS9EXdV/CRpjYpvdpaknTUdROjOsLvrRJzc5S3o="; + sha256 = "sha256-V4t46ssFKayaui8X3MNj1Yx8PFcIcQwY+MHpll8ugaw="; }; propagatedBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { python-utils ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 6f13a90e2ec3..5640c01d6430 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -40,14 +40,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.23.3"; + version = "1.23.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-Ub9JwM0dUr4KJAqmbzRYr8S5XYmT0tBPDZH6YMEK9s0="; + hash = "sha256-Gxdm1vOXwYFT1AAV3fx53bcVyrrcBNLSKNTlqLxN7Ro="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ @@ -75,9 +75,10 @@ in buildPythonPackage rec { enableParallelBuilding = true; - checkInputs = [ + nativeCheckInputs = [ pytest - hypothesis + # "hypothesis" indirectly depends on numpy to build its documentation. + (hypothesis.override { enableDocumentation = false; }) typing-extensions ]; diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index 9eebc8c39a48..0ac923f4861d 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "numpydoc"; - version = "1.4.0"; + version = "1.5.0"; format = "setuptools"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname; inherit version; - sha256 = "sha256-lJTa8cdhL1mQX6CeZcm4qQu6yzgE2R96lOd4gx5vz6U="; + sha256 = "sha256-sNt7daMjZ6DiXCOzl4QsZeNEoSBlJNFsgGnwockbX0w="; }; postPatch = '' @@ -34,7 +34,7 @@ buildPythonPackage rec { sphinx ]; - checkInputs = [ + nativeCheckInputs = [ matplotlib pytestCheckHook ]; diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix index 2ecb598ab5f6..5870d47ab5cc 100644 --- a/pkgs/development/python-modules/numpyro/default.nix +++ b/pkgs/development/python-modules/numpyro/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix index 3089093d9cd1..9a3cfb2b48e4 100644 --- a/pkgs/development/python-modules/nutils/default.nix +++ b/pkgs/development/python-modules/nutils/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nutils"; - version = "7.0"; + version = "7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "evalf"; repo = "nutils"; rev = "refs/tags/v${version}"; - hash = "sha256-V7lSMhwzc9+36uXMCy5uF241XwJ62Pdf59RUulOt4i8="; + hash = "sha256-KCvUBE3qbX6v1HahBj4/jjM8ujvFGtWNuH1D+bTHrQ0="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { stringly ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index 4938f2339ed3..c6ab97d9c8fa 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { tornado ]; - checkInputs = [ + nativeCheckInputs = [ flaky pytest-asyncio pytest-httpbin diff --git a/pkgs/development/python-modules/nvidia-ml-py/default.nix b/pkgs/development/python-modules/nvidia-ml-py/default.nix index 3adb6f829ab2..64ecf95ef5d2 100644 --- a/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "nvidia-ml-py"; - version = "11.515.48"; + version = "11.515.75"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-iNLQu9c8Q3B+FXMObRTtxqE3B/siJIlIlCH6T0rX+sY="; + hash = "sha256-48dfBtWjIB3FETbgDljFwTKzvl1gTYbBQ0Jq205BxJA="; }; patches = [ diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index 4579be5c3c13..d64eed0e200a 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/oath/default.nix b/pkgs/development/python-modules/oath/default.nix index a8740f685747..fed667302f0d 100644 --- a/pkgs/development/python-modules/oath/default.nix +++ b/pkgs/development/python-modules/oath/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { inherit pname version; sha256 = "sha256-vWsg0g8sTj9TUj7pACEdynWu7KcvT1qf2NyswXX+HAs="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 4e1b032de0ec..33d04b78a533 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { jupyterhub ]; - checkInputs = [ + nativeCheckInputs = [ google-api-python-client google-auth-oauthlib mwoauth diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index 078e4a383445..e1d6bbc13070 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "oauthlib"; - version = "3.2.1"; + version = "3.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-9Du0REnN7AkvMmejXsWc7Uy+YF8MYeLK+QnYHbrPhPA="; + hash = "sha256-KADS1pEaLYi86LEt2VVuz8FVTBANzxC8EeQLgGMxuBU="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { pyjwt ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index 0d2da52f015c..ec75d9c452ae 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -1,25 +1,26 @@ { lib , buildPythonPackage , fetchPypi -, isPyPy -, substituteAll -, graphvizPkgs , graphviz -, mock +, graphvizPkgs +, isPyPy +, pytestCheckHook +, pythonOlder +, substituteAll }: buildPythonPackage rec { pname = "objgraph"; version = "3.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.5" || isPyPy; src = fetchPypi { inherit pname version; - sha256 = "4752ca5bcc0e0512e41b8cc4d2780ac2fd3b3eabd03b7e950a5594c06203dfc4"; + hash = "sha256-R1LKW8wOBRLkG4zE0ngKwv07PqvQO36VClWUwGID38Q="; }; - # Tests fail with PyPy. - disabled = isPyPy; - patches = [ (substituteAll { src = ./hardcode-graphviz-path.patch; @@ -27,14 +28,27 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ graphviz ]; + propagatedBuildInputs = [ + graphviz + ]; - checkInputs = [ mock ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "objgraph" + ]; + + pytestFlagsArray = [ + "tests.py" + ]; meta = with lib; { description = "Draws Python object reference graphs with graphviz"; homepage = "https://mg.pov.lt/objgraph/"; + changelog = "https://github.com/mgedmin/objgraph/blob/${version}/CHANGES.rst"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/objsize/default.nix b/pkgs/development/python-modules/objsize/default.nix new file mode 100644 index 000000000000..18efa2b3494a --- /dev/null +++ b/pkgs/development/python-modules/objsize/default.nix @@ -0,0 +1,24 @@ +{ lib +, python +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "objsize"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "liran-funaro"; + repo = pname; + rev = version; + hash = "sha256-FgRB7EENwNOlC7ynIRxcwucoywNjko494s75kOp5O+w="; + }; + + meta = with lib; { + description = "Traversal over objects subtree and calculate the total size"; + homepage = "https://github.com/liran-funaro/objsize"; + license = licenses.bsd3; + maintainers = with maintainers; [ ocfox ]; + }; +} diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 11525c710382..3c3c43c7ed98 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.85.0"; + version = "2.90.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-NaVD7oWdKrUC0wjoFTbRg02tCFMlRyNIRHciTtyra7w="; + hash = "sha256-alJ0FMh2bZLHG3pUfBJDpnihreSkswQ4BizIMIXKcFc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index f61f94f00c26..51c756db19e3 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "14.0.1"; + version = "14.0.2"; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-eYn24FkAXj/ESCoC0QaLY+wRhkxZP1KnuY4VU1WiG24="; + hash = "sha256-s2G+ZNMEF3ZB1+ibPiYPuqdypoYFdFPpASeqFReR8/g="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -84,7 +84,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-xdist pytestCheckHook ]; diff --git a/pkgs/development/python-modules/od/default.nix b/pkgs/development/python-modules/od/default.nix index 805aec6c1e69..510d042e7296 100644 --- a/pkgs/development/python-modules/od/default.nix +++ b/pkgs/development/python-modules/od/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-uGkj2Z8mLg51IV+FOqwZl1hT7zVyjmD1CcY/VbH4tKk="; }; - checkInputs = [ + nativeCheckInputs = [ repeated-test ]; diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix index 531a80759a06..ff874ac6fb15 100644 --- a/pkgs/development/python-modules/odfpy/default.nix +++ b/pkgs/development/python-modules/odfpy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ defusedxml ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/garages-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix similarity index 56% rename from pkgs/development/python-modules/garages-amsterdam/default.nix rename to pkgs/development/python-modules/odp-amsterdam/default.nix index 2b25decd4fc8..3021333091ab 100644 --- a/pkgs/development/python-modules/garages-amsterdam/default.nix +++ b/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -1,28 +1,33 @@ { lib , aiohttp +, aresponses , buildPythonPackage , fetchFromGitHub , poetry-core , pythonOlder +, pytest-asyncio +, pytestCheckHook }: buildPythonPackage rec { - pname = "garages-amsterdam"; - version = "4.1.0"; + pname = "odp-amsterdam"; + version = "5.0.1"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "klaasnicolaas"; - repo = "garages_amsterdam"; + repo = "python-odp-amsterdam"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ZWp543msRAgn/fFplEt6saSNbZ2flC5gwjxrll4w0W0="; + hash = "sha256-gRfOZwUguQgoROnqQuQWKOgubR3wjcf7Yfje2+4+CB0="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace '"0.0.0"' '"${version}"' + + sed -i '/addopts/d' pyproject.toml ''; nativeBuildInputs = [ @@ -33,16 +38,20 @@ buildPythonPackage rec { aiohttp ]; - # The only test requires network access - doCheck = false; + nativeCheckInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ - "garages_amsterdam" + "odp_amsterdam" ]; meta = with lib; { description = "Python client for getting garage occupancy in Amsterdam"; - homepage = "https://github.com/klaasnicolaas/python-garages-amsterdam"; + homepage = "https://github.com/klaasnicolaas/python-odp-amsterdam"; + changelog = "https://github.com/klaasnicolaas/python-odp-amsterdam/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/oemthermostat/default.nix b/pkgs/development/python-modules/oemthermostat/default.nix index 7a2ecfc26c03..b97ddf64eb5b 100644 --- a/pkgs/development/python-modules/oemthermostat/default.nix +++ b/pkgs/development/python-modules/oemthermostat/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/pkgs/development/python-modules/ofxtools/default.nix index 0f0dfb057695..d07bf3283114 100644 --- a/pkgs/development/python-modules/ofxtools/default.nix +++ b/pkgs/development/python-modules/ofxtools/default.nix @@ -7,19 +7,19 @@ buildPythonPackage rec { pname = "ofxtools"; - version = "0.8.20"; + version = "0.9.5"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; # PyPI distribution does not include tests src = fetchFromGitHub { owner = "csingley"; repo = pname; rev = version; - sha256 = "1s3fhhmj1acnmqglh39003db0bi451m4hcrkcpyrkqf5m32lslz8"; + sha256 = "sha256-NsImnD+erhpakQnl1neuHfSKiV6ipNBMPGKMDM0gwWc="; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; # override $HOME directory: # error: [Errno 13] Permission denied: '/homeless-shelter' checkPhase = '' diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix index ff0dc7c1c93a..6bf379aacd90 100644 --- a/pkgs/development/python-modules/olefile/default.nix +++ b/pkgs/development/python-modules/olefile/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "133b031eaf8fd2c9399b78b8bc5b8fcbe4c31e85295749bb17a87cba8f3c3964"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/development/python-modules/oletools/default.nix index 3ba66ac38edc..d7df0523eac5 100644 --- a/pkgs/development/python-modules/oletools/default.nix +++ b/pkgs/development/python-modules/oletools/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/omegaconf/antlr4.patch b/pkgs/development/python-modules/omegaconf/antlr4.patch new file mode 100644 index 000000000000..8b9ed34d313e --- /dev/null +++ b/pkgs/development/python-modules/omegaconf/antlr4.patch @@ -0,0 +1,13 @@ +diff --git a/build_helpers/build_helpers.py b/build_helpers/build_helpers.py +index 6419e26..9e6c21c 100644 +--- a/build_helpers/build_helpers.py ++++ b/build_helpers/build_helpers.py +@@ -30,7 +30,7 @@ class ANTLRCommand(Command): # type: ignore # pragma: no cover + command = [ + "java", + "-jar", +- str(build_dir / "bin" / "antlr-4.9.3-complete.jar"), ++ "@antlr_jar@", + "-Dlanguage=Python3", + "-o", + str(project_root / "omegaconf" / "grammar" / "gen"), diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index 1071a642ef10..245c60fc7e4b 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -1,5 +1,6 @@ { lib -, antlr4_9-python3-runtime +, antlr4 +, antlr4-python3-runtime , buildPythonPackage , fetchFromGitHub , jre_minimal @@ -8,11 +9,12 @@ , pytestCheckHook , pythonOlder , pyyaml +, substituteAll }: buildPythonPackage rec { pname = "omegaconf"; - version = "2.2.3"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,19 +23,34 @@ buildPythonPackage rec { owner = "omry"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sJUYi0M/6SBSeKVSJoNY7IbVmzRZVTlek8AyL2cOPAM="; + hash = "sha256-Qxa4uIiX5TAyQ5rFkizdev60S4iVAJ08ES6FpNqf8zI="; }; + patches = [ + (substituteAll { + src = ./antlr4.patch; + antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar"; + }) + ]; + + postPatch = '' + # We substitute the path to the jar with the one from our antlr4 + # package, so this file becomes unused + rm -v build_helpers/bin/antlr*-complete.jar + + sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements/base.txt + ''; + nativeBuildInputs = [ jre_minimal ]; propagatedBuildInputs = [ - antlr4_9-python3-runtime + antlr4-python3-runtime pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pydevd pytest-mock pytestCheckHook @@ -46,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Framework for configuring complex applications"; homepage = "https://github.com/omry/omegaconf"; + changelog = "https://github.com/omry/omegaconf/blob/v${version}/NEWS.md"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/omnikinverter/default.nix b/pkgs/development/python-modules/omnikinverter/default.nix index 914267ea86f7..7bc4f640863d 100644 --- a/pkgs/development/python-modules/omnikinverter/default.nix +++ b/pkgs/development/python-modules/omnikinverter/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses asynctest pytest-asyncio diff --git a/pkgs/development/python-modules/onetimepass/default.nix b/pkgs/development/python-modules/onetimepass/default.nix index 220265fbc01d..6b339294a5cb 100644 --- a/pkgs/development/python-modules/onetimepass/default.nix +++ b/pkgs/development/python-modules/onetimepass/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ timecop ]; diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index a266fb4e6b44..a6f290633edc 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ nbval pytestCheckHook pytest-runner diff --git a/pkgs/development/python-modules/onnxconverter-common/default.nix b/pkgs/development/python-modules/onnxconverter-common/default.nix index 89fefb38dee0..d19702f214a7 100644 --- a/pkgs/development/python-modules/onnxconverter-common/default.nix +++ b/pkgs/development/python-modules/onnxconverter-common/default.nix @@ -29,7 +29,7 @@ buildPythonPackage { onnx ]; - checkInputs = [ + nativeCheckInputs = [ onnxruntime unittestCheckHook ]; diff --git a/pkgs/development/python-modules/open-meteo/default.nix b/pkgs/development/python-modules/open-meteo/default.nix index 520af3062eac..4aec00f312b2 100644 --- a/pkgs/development/python-modules/open-meteo/default.nix +++ b/pkgs/development/python-modules/open-meteo/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix index 73327d314af1..b30f218193eb 100644 --- a/pkgs/development/python-modules/openai-whisper/default.nix +++ b/pkgs/development/python-modules/openai-whisper/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "whisper"; - version = "unstable-2022-09-30"; + version = "20230124"; format = "setuptools"; src = fetchFromGitHub { owner = "openai"; repo = pname; - rev = "60132ade70e00b843d93542fcb37b58c0d8bf9e7"; - hash = "sha256-4mhlCvewA0bVo5bq2sbSEKHq99TQ6jUauiCUkdRSdas="; + rev = "refs/tags/v${version}"; + hash = "sha256-+3fs/EXK5NGlISuMTk7r2ZZ4tNFKbNFNkVS2LmHBvwk="; }; patches = [ @@ -50,7 +50,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 9a5e34d5dc20..d4cedc80be11 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -1,12 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub +, aiohttp , matplotlib , numpy , openpyxl , pandas , pandas-stubs , plotly +, pytest-asyncio , pytest-mock , pytestCheckHook , pythonOlder @@ -16,11 +18,12 @@ , tqdm , typing-extensions , wandb +, withOptionalDependencies ? false }: buildPythonPackage rec { pname = "openai"; - version = "0.25.0"; + version = "0.26.4"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -29,37 +32,44 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - hash = "sha256-bwv7lpdDYlk+y3KBjv7cSvaGr3v02riNCUfPFh6yv1I="; + hash = "sha256-WcUH6zbb5kIH0qk67M+lUx9CbMEbYDXQm6IVzzuQo9w="; }; propagatedBuildInputs = [ - numpy - openpyxl - pandas - pandas-stubs + aiohttp requests tqdm + ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions - ]; + ] ++ lib.optionals withOptionalDependencies (builtins.attrValues { + inherit (passthru.optional-dependencies) embeddings wandb; + }); passthru.optional-dependencies = { - wandb = [ - wandb + datalib = [ + numpy + openpyxl + pandas + pandas-stubs ]; embeddings = [ matplotlib plotly scikit-learn tenacity - ]; + ] ++ passthru.optional-dependencies.datalib; + wandb = [ + wandb + ] ++ passthru.optional-dependencies.datalib; }; pythonImportsCheck = [ "openai" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook + pytest-asyncio pytest-mock ]; @@ -72,6 +82,7 @@ buildPythonPackage rec { disabledTestPaths = [ # Requires a real API key "openai/tests/test_endpoints.py" + "openai/tests/asyncio/test_endpoints.py" # openai: command not found "openai/tests/test_file_cli.py" "openai/tests/test_long_examples_validator.py" diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index bb5d02724bbe..496dceeaab48 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "openapi-core"; - version = "0.16.1"; + version = "0.16.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -35,8 +35,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "p1c2u"; repo = "openapi-core"; - rev = version; - hash = "sha256-J3n34HR5lfMM0ik5HAZ2JCr75fX5FTqBWrZ7E3/6XSE="; + rev = "refs/tags/${version}"; + hash = "sha256-xXSZ9qxjmeIyYIWQubJbJxkXUdOu/WSSBddIWsVaH8k="; }; postPatch = '' @@ -79,7 +79,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook responses @@ -91,12 +91,8 @@ buildPythonPackage rec { ++ passthru.optional-dependencies.requests; disabledTestPaths = [ - # AttributeError: 'str' object has no attribute '__name__' - #"tests/integration/validation" # Requires secrets and additional configuration "tests/integration/contrib/django/" - # Unable to detect SECRET_KEY and ROOT_URLCONF - "tests/integration/contrib/django/" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index 2060b2cf4787..d3c121ed94e7 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ isodate jsonschema six strict-rfc3339 rfc3339-validator ]; - checkInputs = [ pytestCheckHook pytest-cov ]; + nativeCheckInputs = [ pytestCheckHook pytest-cov ]; pythonImportsCheck = [ "openapi_schema_validator" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 7ca4be89a32d..371661e2feb8 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { sed -i '/--cov/d' pyproject.toml ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/opencensus-context/default.nix b/pkgs/development/python-modules/opencensus-context/default.nix new file mode 100644 index 000000000000..692b2c307913 --- /dev/null +++ b/pkgs/development/python-modules/opencensus-context/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, fetchPypi +, lib +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "opencensus-context"; + version = "0.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-oDEIw8ENjIC7Xd9cih8DMWH6YZcqmRf5ubOhhRfwCIw="; + }; + + pythonNamespaces = [ + "opencensus.common" + ]; + + doCheck = false; # No tests in archive + + meta = with lib; { + description = "OpenCensus Runtime Context"; + homepage = "https://github.com/census-instrumentation/opencensus-python/tree/master/context/opencensus-context"; + license = licenses.asl20; + maintainers = with maintainers; [ billhuang ]; + }; +} diff --git a/pkgs/development/python-modules/opencensus/default.nix b/pkgs/development/python-modules/opencensus/default.nix index 0690da3d7ba9..7cf85104b61b 100644 --- a/pkgs/development/python-modules/opencensus/default.nix +++ b/pkgs/development/python-modules/opencensus/default.nix @@ -1,24 +1,11 @@ { buildPythonPackage , fetchPypi , lib -, python , unittestCheckHook , google-api-core +, opencensus-context }: -let - opencensus-context = buildPythonPackage rec { - pname = "opencensus-context"; - version = "0.1.3"; - - checkInputs = [ unittestCheckHook ]; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-oDEIw8ENjIC7Xd9cih8DMWH6YZcqmRf5ubOhhRfwCIw="; - }; - }; -in buildPythonPackage rec { pname = "opencensus"; version = "0.11.0"; @@ -28,23 +15,20 @@ buildPythonPackage rec { sha256 = "sha256-AmIWq6uJ2U2FBJLz3GWVAFXsT4QRX6bHvq/7pEo0bkI="; }; - buildInputs = [ - # opencensus-context is embedded in opencensus + propagatedBuildInputs = [ + google-api-core opencensus-context ]; - propagatedBuildInputs = [ - google-api-core + pythonNamespaces = [ + "opencensus.common" ]; - postInstall = '' - ln -sf ${opencensus-context}/${python.sitePackages}/opencensus/common/runtime_context \ - $out/${python.sitePackages}/opencensus/common/ - ''; + doCheck = false; # No tests in sdist - checkInputs = [ unittestCheckHook ]; - - pythonImportsCheck = [ "opencensus" ]; + pythonImportsCheck = [ + "opencensus.common" + ]; meta = with lib; { description = "A stats collection and distributed tracing framework"; diff --git a/pkgs/development/python-modules/openerz-api/default.nix b/pkgs/development/python-modules/openerz-api/default.nix index 9cbe89e26a34..7fe8de134b48 100644 --- a/pkgs/development/python-modules/openerz-api/default.nix +++ b/pkgs/development/python-modules/openerz-api/default.nix @@ -9,30 +9,40 @@ buildPythonPackage rec { pname = "openerz-api"; - version = "0.1.0"; + version = "0.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "misialq"; repo = pname; - rev = "v${version}"; - sha256 = "10kxsmaz2rn26jijaxmdmhx8vjdz8hrhlrvd39gc8yvqbjwhi3nw"; + rev = "refs/tags/v${version}"; + hash = "sha256-6q0mKWyTTlNJ/DCeAsck1meM5dQovYBcV2EqmjlABvc="; }; propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook testfixtures ]; - pythonImportsCheck = [ "openerz_api" ]; + pythonImportsCheck = [ + "openerz_api" + ]; + + disabledTests = [ + # Assertion issue + "test_sensor_make_api_request" + ]; meta = with lib; { description = "Python module to interact with the OpenERZ API"; homepage = "https://github.com/misialq/openerz-api"; + changelog = "https://github.com/misialq/openerz-api/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/openevsewifi/default.nix b/pkgs/development/python-modules/openevsewifi/default.nix index 4241927c5156..98beb5ea181f 100644 --- a/pkgs/development/python-modules/openevsewifi/default.nix +++ b/pkgs/development/python-modules/openevsewifi/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ requests-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index 8afc16f86d43..a8239d1d4be3 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-5HgFYnrrz4YO207feYexMJwbNjLzdQU47ZYrvMO9dEk="; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ jdcal et_xmlfile lxml ]; postPatch = '' diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index 2f413a46d6c9..4d0fa4ed18b9 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -1,13 +1,15 @@ { lib , fetchFromGitHub }: rec { - version = "3.3.0"; + version = "3.5.1"; + src = fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; rev = "v${version}"; - sha256 = "1lw2cpj2xzwcsn5igrqj3f6m2v5n6zp1xa9vv3j9f9r2fbb48jcl"; + sha256 = "sha256-6YU2tl17LpDZe9pQ1a+B2SGIhqGdwME3Db6umVz7RLc="; }; + meta = with lib; { homepage = "https://openrazer.github.io/"; license = licenses.gpl2Only; diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix index 4c551bc7150f..31fbdc462682 100644 --- a/pkgs/development/python-modules/openrazer/daemon.nix +++ b/pkgs/development/python-modules/openrazer/daemon.nix @@ -16,13 +16,21 @@ let common = import ./common.nix { inherit lib fetchFromGitHub; }; in -buildPythonPackage (common // rec { +buildPythonPackage (common // { pname = "openrazer_daemon"; disabled = !isPy3k; outputs = [ "out" "man" ]; + prePatch = '' + cd daemon + ''; + + postPatch = '' + substituteInPlace openrazer_daemon/daemon.py --replace "plugdev" "openrazer" + ''; + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; propagatedBuildInputs = [ @@ -35,18 +43,13 @@ buildPythonPackage (common // rec { setproctitle ]; - prePatch = '' - cd daemon - ''; - - postPatch = '' - substituteInPlace openrazer_daemon/daemon.py --replace "plugdev" "openrazer" - ''; - postBuild = '' DESTDIR="$out" PREFIX="" make install manpages ''; + # no tests run + doCheck = false; + meta = common.meta // { description = "An entirely open source user-space daemon that allows you to manage your Razer peripherals on GNU/Linux"; }; diff --git a/pkgs/development/python-modules/openrazer/pylib.nix b/pkgs/development/python-modules/openrazer/pylib.nix index fb83d64c5020..257fb589ba7b 100644 --- a/pkgs/development/python-modules/openrazer/pylib.nix +++ b/pkgs/development/python-modules/openrazer/pylib.nix @@ -9,7 +9,7 @@ let common = import ./common.nix { inherit lib fetchFromGitHub; }; in -buildPythonPackage (common // rec { +buildPythonPackage (common // { pname = "openrazer"; sourceRoot = "source/pylib"; @@ -20,6 +20,9 @@ buildPythonPackage (common // rec { openrazer-daemon ]; + # no tests run + doCheck = false; + meta = common.meta // { description = "An entirely open source Python library that allows you to manage your Razer peripherals on GNU/Linux"; }; diff --git a/pkgs/development/python-modules/openrouteservice/default.nix b/pkgs/development/python-modules/openrouteservice/default.nix index f5e1ab81fbf7..9f93d566b0bc 100644 --- a/pkgs/development/python-modules/openrouteservice/default.nix +++ b/pkgs/development/python-modules/openrouteservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1d5qbygb81fhpwfdm1a118r3xv45xz9n9avfkgxkvw1n8y6ywz2q"; }; - checkInputs = [ pytestCheckHook responses ]; + nativeCheckInputs = [ pytestCheckHook responses ]; disabledTests = [ # touches network diff --git a/pkgs/development/python-modules/opensearch-py/default.nix b/pkgs/development/python-modules/opensearch-py/default.nix new file mode 100644 index 000000000000..7f9fd5c85b16 --- /dev/null +++ b/pkgs/development/python-modules/opensearch-py/default.nix @@ -0,0 +1,59 @@ +{ aiohttp +, botocore +, buildPythonPackage +, certifi +, fetchFromGitHub +, lib +, mock +, pytest-asyncio +, pytestCheckHook +, pyyaml +, requests +, urllib3 +}: + +buildPythonPackage rec { + pname = "opensearch-py"; + version = "2.1.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "opensearch-project"; + repo = "opensearch-py"; + rev = "refs/tags/v${version}"; + hash = "sha256-uJ6fdRPDK76qKHE4E6dI01vKgvfqbc6A1RCwnOtuOTY="; + }; + + propagatedBuildInputs = [ + botocore + certifi + requests + urllib3 + ]; + + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + pyyaml + ] ++ passthru.optional-dependencies.async; + + disabledTestPaths = [ + # require network + "test_opensearchpy/test_async/test_connection.py" + "test_opensearchpy/test_async/test_server" + "test_opensearchpy/test_connection.py" + "test_opensearchpy/test_server" + "test_opensearchpy/test_server_secured" + ]; + + passthru.optional-dependencies.async = [ aiohttp ]; + + meta = { + description = "Python low-level client for OpenSearch"; + homepage = "https://github.com/opensearch-project/opensearch-py"; + changelog = "https://github.com/opensearch-project/opensearch-py/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mcwitt ]; + }; +} diff --git a/pkgs/development/python-modules/opensensemap-api/default.nix b/pkgs/development/python-modules/opensensemap-api/default.nix index 56edc136c44f..4cce64c43008 100644 --- a/pkgs/development/python-modules/opensensemap-api/default.nix +++ b/pkgs/development/python-modules/opensensemap-api/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "opensensemap-api"; - version = "0.2.0"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KSukSPpSbfbEEqTq4zqqo8OT7ptdPrGy2QyQYjErQWI="; + hash = "sha256-lz2G7vXUadhTFgfHpIq9kHfojf+iytjitFZZ7rgqeO8="; }; propagatedBuildInputs = [ @@ -23,7 +23,7 @@ buildPythonPackage rec { async-timeout ]; - # no tests are present + # Module has no tests doCheck = false; pythonImportsCheck = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { available information from the sensor can be retrieved. ''; homepage = "https://github.com/home-assistant-ecosystem/python-opensensemap-api"; + changelog = "https://github.com/home-assistant-ecosystem/python-opensensemap-api/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix index 9e20d450973e..65931f770a2f 100644 --- a/pkgs/development/python-modules/opensfm/default.nix +++ b/pkgs/development/python-modules/opensfm/default.nix @@ -99,7 +99,7 @@ buildPythonPackage rec { xmltodict cloudpickle ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; dontUseCmakeBuildDir = true; cmakeFlags = [ diff --git a/pkgs/development/python-modules/openshift/default.nix b/pkgs/development/python-modules/openshift/default.nix index 497af2e735d1..6a58985845f2 100644 --- a/pkgs/development/python-modules/openshift/default.nix +++ b/pkgs/development/python-modules/openshift/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pythonImportsCheck = ["openshift"]; - checkInputs = [ + nativeCheckInputs = [ pytest-bdd pytestCheckHook ]; diff --git a/pkgs/development/python-modules/opensimplex/default.nix b/pkgs/development/python-modules/opensimplex/default.nix index a30933e806df..bcbbd28178e4 100644 --- a/pkgs/development/python-modules/opensimplex/default.nix +++ b/pkgs/development/python-modules/opensimplex/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests/test_opensimplex.py" ]; pythonImportsCheck = [ "opensimplex" ]; diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index 75833f8a8684..f514791fd0c7 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "0.102.0"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-sqGP66eerCrDRpyNr+AdQAjIrDC+OkxrUydbTxxroq0="; + hash = "sha256-z2vVGeMB94S/51bB+Tf47ByvP9BWQ1TzQHpFGS8FR8w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openstacksdk/tests.nix b/pkgs/development/python-modules/openstacksdk/tests.nix index 9a2d6e37ab56..aa96ed5ae843 100644 --- a/pkgs/development/python-modules/openstacksdk/tests.nix +++ b/pkgs/development/python-modules/openstacksdk/tests.nix @@ -13,16 +13,17 @@ , testscenarios }: -buildPythonPackage rec { +buildPythonPackage { pname = "openstacksdk-tests"; inherit (openstacksdk) version; + format = "other"; src = openstacksdk.src; dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ ddt hacking jsonschema diff --git a/pkgs/development/python-modules/openstep-plist/default.nix b/pkgs/development/python-modules/openstep-plist/default.nix index 274294f59388..a85be4dc2bd2 100644 --- a/pkgs/development/python-modules/openstep-plist/default.nix +++ b/pkgs/development/python-modules/openstep-plist/default.nix @@ -9,17 +9,17 @@ buildPythonPackage rec { pname = "openstep-plist"; - version = "0.3.0"; + version = "0.3.0.post1"; src = fetchPypi { pname = "openstep_plist"; inherit version; - sha256 = "sha256-KO4sGKjod5BwUFQ1MU2S1dG0DyiJ06mdroMbRDsugBk="; + sha256 = "sha256-GK/z1e3tnr++3+ukRKPASDJGl7+KObsENhwN1Tv+qws="; extension = "zip"; }; nativeBuildInputs = [ setuptools-scm cython ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "openstep_plist" ]; meta = { diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix index b34c883d685c..fbd3b2852eed 100644 --- a/pkgs/development/python-modules/opentimestamps/default.nix +++ b/pkgs/development/python-modules/opentimestamps/default.nix @@ -3,15 +3,15 @@ , buildPythonPackage , fetchFromGitHub , git -, GitPython -, pysha3 +, gitpython +, pycryptodomex , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "opentimestamps"; - version = "0.4.2"; + version = "0.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,17 +20,16 @@ buildPythonPackage rec { owner = "opentimestamps"; repo = "python-opentimestamps"; rev = "python-opentimestamps-v${version}"; - hash = "sha256-RRCAxDYWySmnG1sEQWurUDQsu+vPx9Npbr6BaoNGm1U="; + hash = "sha256-clG/5NAPmmmoj4b3LdVwl58DHg1EFMIMu+erx+GT+NE="; }; propagatedBuildInputs = [ bitcoinlib - GitPython - pysha3 + gitpython + pycryptodomex ]; - checkInputs = [ - git + nativeCheckInputs = [ pytestCheckHook ]; @@ -47,7 +46,8 @@ buildPythonPackage rec { meta = with lib; { description = "Create and verify OpenTimestamps proofs"; homepage = "https://github.com/opentimestamps/python-opentimestamps"; + changelog = "https://github.com/opentimestamps/python-opentimestamps/releases/tag/python-opentimestamps-v${version}"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/development/python-modules/opentracing/default.nix b/pkgs/development/python-modules/opentracing/default.nix index bf7ec6a938ff..f21bf4aa7825 100644 --- a/pkgs/development/python-modules/opentracing/default.nix +++ b/pkgs/development/python-modules/opentracing/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional isPy27 futures; - checkInputs = [ + nativeCheckInputs = [ gevent mock pytestCheckHook diff --git a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix index 37f389e76fc5..086649173f3d 100644 --- a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix +++ b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/opt-einsum/default.nix b/pkgs/development/python-modules/opt-einsum/default.nix index 6e4eabeb68ab..fd51ead5a0e3 100644 --- a/pkgs/development/python-modules/opt-einsum/default.nix +++ b/pkgs/development/python-modules/opt-einsum/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/optax/default.nix b/pkgs/development/python-modules/optax/default.nix index b04c1549b4e1..38868516759f 100644 --- a/pkgs/development/python-modules/optax/default.nix +++ b/pkgs/development/python-modules/optax/default.nix @@ -1,22 +1,26 @@ -{ absl-py +{ lib +, absl-py , buildPythonPackage , chex , fetchFromGitHub , jaxlib -, lib , numpy , callPackage +, pythonOlder }: buildPythonPackage rec { pname = "optax"; - version = "0.1.3"; + version = "0.1.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XAYztMBQpLBHNuNED/iodbwIMJSN/0GxdmTGQ5jD9Ws="; + hash = "sha256-BvmRFA1KNS7F6kozH9LMG8v4XJY/T2DwKgf9IIY2shE="; }; outputs = [ @@ -24,7 +28,9 @@ buildPythonPackage rec { "testsout" ]; - buildInputs = [ jaxlib ]; + buildInputs = [ + jaxlib + ]; propagatedBuildInputs = [ absl-py @@ -49,8 +55,9 @@ buildPythonPackage rec { }; meta = with lib; { - description = "Optax is a gradient processing and optimization library for JAX."; + description = "Gradient processing and optimization library for JAX"; homepage = "https://github.com/deepmind/optax"; + changelog = "https://github.com/deepmind/optax/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; }; diff --git a/pkgs/development/python-modules/optax/tests.nix b/pkgs/development/python-modules/optax/tests.nix index fedff61302d7..59fed40bdf08 100644 --- a/pkgs/development/python-modules/optax/tests.nix +++ b/pkgs/development/python-modules/optax/tests.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ dm-haiku pytest-xdist pytestCheckHook diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 1236a24628ec..c921feadd0e8 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -30,17 +30,17 @@ buildPythonPackage rec { pname = "optuna"; - version = "2.10.1"; + version = "3.0.5"; disabled = isPy27; src = fetchFromGitHub { owner = "optuna"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-HHVEoLCZtEJEfc4xYobQrzRcDDxxeQjgL2Rw2KeVbi0="; + sha256 = "sha256-TfAWL81a7GIePkPm+2uXinBP5jwnhWCZPp5GJjXOC6g="; }; - checkInputs = [ + nativeCheckInputs = [ pytest mock bokeh diff --git a/pkgs/development/python-modules/opuslib/default.nix b/pkgs/development/python-modules/opuslib/default.nix index a9c33f5abab4..4ea7c8e7ba8f 100644 --- a/pkgs/development/python-modules/opuslib/default.nix +++ b/pkgs/development/python-modules/opuslib/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = with lib; { description = "Python bindings to the libopus, IETF low-delay audio codec"; diff --git a/pkgs/development/python-modules/opytimark/default.nix b/pkgs/development/python-modules/opytimark/default.nix new file mode 100644 index 000000000000..69eb61f795bf --- /dev/null +++ b/pkgs/development/python-modules/opytimark/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, numpy +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "opytimark"; + version = "1.0.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "gugarosa"; + repo = "opytimark"; + rev = "v${version}"; + hash = "sha256-T3OFm10gvGrUXAAHOnO0Zv1nWrXPBXSmEWnbJxrWYU0="; + }; + + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/gugarosa/opytimark/pull/2.patch"; + hash = "sha256-r/oCKI9Q1nuCZDGHx7UW8j523sFe4EFmguMOJTs/LOU="; + }) + ]; + + propagatedBuildInputs = [ + numpy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # several tests are failing + disabledTests = [ + "test_year" + "test_decorator" + "test_loader" + "cec_benchmark" + ]; + + pythonImportsCheck = [ + "opytimark" + ]; + + meta = with lib; { + description = "Library consisting of optimization benchmarking functions"; + homepage = "https://github.com/gugarosa/opytimark"; + changelog = "https://github.com/gugarosa/opytimark/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ firefly-cpp ]; + }; +} diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix index ae8d4c51af35..e373034c2a54 100644 --- a/pkgs/development/python-modules/oralb-ble/default.nix +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -1,4 +1,5 @@ { lib +, bleak-retry-connector , bluetooth-data-tools , bluetooth-sensor-state-data , buildPythonPackage @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "oralb-ble"; - version = "0.14.2"; + version = "0.17.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LPVNxdmKaOfUcnLVSH1kANW7Zz6bPPEyCemsau5YyHA="; + hash = "sha256-0VZRtsh17W8h1qcGfAxE4KUehtCk1PKy3MO3fVJb4qY="; }; nativeBuildInputs = [ @@ -28,12 +29,13 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + bleak-retry-connector bluetooth-data-tools bluetooth-sensor-state-data home-assistant-bluetooth ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -49,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Oral B BLE devices"; homepage = "https://github.com/Bluetooth-Devices/oralb-ble"; + changelog = "https://github.com/Bluetooth-Devices/oralb-ble/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix index 8ea71fd2d901..9859e1065104 100644 --- a/pkgs/development/python-modules/ordered-set/default.nix +++ b/pkgs/development/python-modules/ordered-set/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/orderedmultidict/default.nix b/pkgs/development/python-modules/orderedmultidict/default.nix index 7c37cc7aa5aa..f2688d46b2e3 100644 --- a/pkgs/development/python-modules/orderedmultidict/default.nix +++ b/pkgs/development/python-modules/orderedmultidict/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1bc2v0yflsxjyyjx4q9wqx0j3bvzcw9z87d5pz4iqac7bsxhn1q4"; }; - checkInputs = [ flake8 ]; + nativeCheckInputs = [ flake8 ]; propagatedBuildInputs = [ six ] ++ lib.optionals (pythonOlder "3.8") [ diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 98e3ede7fb92..4890614ed5a9 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -16,20 +16,20 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.8.1"; + version = "3.8.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ijl"; repo = pname; rev = version; - hash = "sha256-3U27JuKMsMla3BKbbpO0uXesGHYaVQs8MwtQvumkksY="; + hash = "sha256-XQBiE8hmLC/AIRt0eJri/ilPHUEYiOxd0onRBQsx+pM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-QXguyDxQHW9Fd3Nhmi5JzSxZQuk3HGPhhh/RGuOTZNY"; + hash = "sha256-O2W9zO7qHWG+78T+uECICAmecaSIbTTJPktJIPZYElE="; }; format = "pyproject"; @@ -43,7 +43,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - checkInputs = [ + nativeCheckInputs = [ numpy psutil pytestCheckHook @@ -52,17 +52,12 @@ buildPythonPackage rec { xxhash ]; - disabledTests = lib.optionals (stdenv.is32bit) [ - # integer overflow on 32bit - "test_numpy_array_d1_intp" - "test_numpy_array_d1_uintp" - ]; - pythonImportsCheck = [ pname ]; meta = with lib; { description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"; homepage = "https://github.com/ijl/orjson"; + changelog = "https://github.com/ijl/orjson/blob/${version}/CHANGELOG.md"; license = with licenses; [ asl20 mit ]; platforms = platforms.unix; maintainers = with maintainers; [ misuzu ]; diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index 873fe5b07261..90b56b3cd4d7 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -8,8 +8,10 @@ , databases , fastapi , fetchFromGitHub +, httpx , importlib-metadata , mysqlclient +, nest-asyncio , orjson , poetry-core , psycopg2 @@ -18,13 +20,14 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , sqlalchemy , typing-extensions }: buildPythonPackage rec { pname = "ormar"; - version = "0.12.0"; + version = "0.12.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -33,50 +36,84 @@ buildPythonPackage rec { owner = "collerek"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-B6dC9+t/pe7vsPb7rkGAbJWLfCAF7lIElFvt1pUu5yA="; + hash = "sha256-7d0vmYDN1EjzNWmylb/As4ywo8YYzQ88UwigIsVnwMM="; }; + pythonRelaxDeps = [ + "databases" + "pydantic" + "SQLAlchemy" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ - aiomysql - aiosqlite - asyncpg - cryptography databases - orjson psycopg2 pydantic sqlalchemy + psycopg2 ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions importlib-metadata ]; - checkInputs = [ - aiomysql - aiopg - aiosqlite - asyncpg - fastapi - mysqlclient - psycopg2 - pymysql - pytest-asyncio + passthru.optional-dependencies = { + postgresql = [ + asyncpg + ]; + postgres = [ + asyncpg + ]; + aiopg = [ + aiopg + ]; + mysql = [ + aiomysql + ]; + sqlite = [ + aiosqlite + ]; + orjson = [ + orjson + ]; + crypto = [ + cryptography + ]; + all = [ + aiomysql + aiopg + aiosqlite + asyncpg + cryptography + mysqlclient + orjson + pymysql + ]; + }; + + nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'SQLAlchemy = ">=1.3.18,<1.4.42"' 'SQLAlchemy = ">=1.3.18"' \ - --replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<0.6.2"' 'databases = ">=0.5.5"' - ''; + checkInputs = [ + fastapi + httpx + nest-asyncio + pytest-asyncio + ] ++ passthru.optional-dependencies.all; + + disabledTestPaths = [ + "benchmarks/test_benchmark_*.py" + ]; disabledTests = [ # TypeError: Object of type bytes is not JSON serializable "test_bulk_operations_with_json" + "test_all_endpoints" # Tests require a database "test_model_multiple_instances_of_same_table_in_schema" "test_load_all_multiple_instances_of_same_table_in_schema" @@ -124,6 +161,7 @@ buildPythonPackage rec { meta = with lib; { description = "Async ORM with fastapi in mind and pydantic validation"; homepage = "https://github.com/collerek/ormar"; + changelog = "https://github.com/collerek/ormar/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ andreasfelix ]; }; diff --git a/pkgs/development/python-modules/os-service-types/tests.nix b/pkgs/development/python-modules/os-service-types/tests.nix index 4cb93d797476..5958d824d58d 100644 --- a/pkgs/development/python-modules/os-service-types/tests.nix +++ b/pkgs/development/python-modules/os-service-types/tests.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ os-service-types keystoneauth1 oslotest diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix index 9d2a4929a6e7..f2b789f26d6b 100644 --- a/pkgs/development/python-modules/osc-lib/default.nix +++ b/pkgs/development/python-modules/osc-lib/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { simplejson ]; - checkInputs = [ + nativeCheckInputs = [ requests-mock stestr ]; @@ -56,7 +56,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "osc_lib" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "OpenStackClient Library"; homepage = "https://github.com/openstack/osc-lib"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index 8a5812bcf28f..07157162f4cd 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; buildInputs = [ bashInteractive ]; # needed for bash-completion helper - checkInputs = [ rpm diffstat ]; + nativeCheckInputs = [ rpm diffstat ]; propagatedBuildInputs = [ urllib3 cryptography ]; postInstall = '' diff --git a/pkgs/development/python-modules/oscpy/default.nix b/pkgs/development/python-modules/oscpy/default.nix index 7b2be6ab778c..894e884a4de2 100644 --- a/pkgs/development/python-modules/oscpy/default.nix +++ b/pkgs/development/python-modules/oscpy/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "oscpy" ]; diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix index e4735aa4334d..3f368ba7f1ab 100644 --- a/pkgs/development/python-modules/oscrypto/default.nix +++ b/pkgs/development/python-modules/oscrypto/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { asn1crypto ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index 8a4d5926823e..a714cd3a2281 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { # tests hang for unknown reason and time the build out doCheck = false; - checkInputs = [ + nativeCheckInputs = [ eventlet fixtures oslotest diff --git a/pkgs/development/python-modules/oslo-config/tests.nix b/pkgs/development/python-modules/oslo-config/tests.nix index c94eb2941b77..b2a730928b8f 100644 --- a/pkgs/development/python-modules/oslo-config/tests.nix +++ b/pkgs/development/python-modules/oslo-config/tests.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ oslo-config docutils oslo-log diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix index e558749b8489..fe4e7363cfc1 100644 --- a/pkgs/development/python-modules/oslo-context/default.nix +++ b/pkgs/development/python-modules/oslo-context/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pbr ]; - checkInputs = [ + nativeCheckInputs = [ oslotest stestr ]; diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index 65d98db529ee..e1a4a368a52b 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 = "12.2.0"; + version = "12.3.1"; src = fetchPypi { pname = "oslo.db"; inherit version; - sha256 = "sha256-wAA/+oqFjUfbFYIxSWWC9jgFpgqvIg4AlKhVM3MwGuc="; + sha256 = "sha256-Gd7FAkDwj7q1rnZzVOtZF1oUdz8CcdeDpX/KxJ5KbaE="; }; nativeBuildInputs = [ pbr ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { testscenarios ]; - checkInputs = [ + nativeCheckInputs = [ oslotest stestr ]; diff --git a/pkgs/development/python-modules/oslo-i18n/default.nix b/pkgs/development/python-modules/oslo-i18n/default.nix index cdb6767c7a52..7a5aee1e1696 100644 --- a/pkgs/development/python-modules/oslo-i18n/default.nix +++ b/pkgs/development/python-modules/oslo-i18n/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pbr ]; - checkInputs = [ + nativeCheckInputs = [ oslotest stestr testscenarios diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 87e2b969f734..d981114b7301 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pyinotify ]; - checkInputs = [ + nativeCheckInputs = [ eventlet oslotest pytestCheckHook diff --git a/pkgs/development/python-modules/oslo-serialization/default.nix b/pkgs/development/python-modules/oslo-serialization/default.nix index 4b33bb06dc10..a94c79e9baf6 100644 --- a/pkgs/development/python-modules/oslo-serialization/default.nix +++ b/pkgs/development/python-modules/oslo-serialization/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ msgpack oslo-utils pytz ]; - checkInputs = [ oslotest stestr ]; + nativeCheckInputs = [ oslotest stestr ]; checkPhase = '' stestr run diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index fe207cbd5c46..91a71620bd52 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 = "6.0.1"; + version = "6.1.0"; src = fetchPypi { pname = "oslo.utils"; inherit version; - sha256 = "sha256-mwRU+ZQV0MqsXIYFNxbXRtGY7Oxm5nLY5eY4a2+6orY="; + sha256 = "sha256-drwBCNUKypcraP7IKY55G1+8vrmlGifGmGtBsKamLus="; }; postPatch = '' @@ -50,7 +50,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ ddt eventlet fixtures diff --git a/pkgs/development/python-modules/oslotest/tests.nix b/pkgs/development/python-modules/oslotest/tests.nix index 542e9467d16f..fb18e64bb9d9 100644 --- a/pkgs/development/python-modules/oslotest/tests.nix +++ b/pkgs/development/python-modules/oslotest/tests.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ oslotest oslo-config stestr diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index 9f26c06eaf3a..330385625d2e 100755 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -1,27 +1,63 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, geopandas, matplotlib, networkx, numpy -, pandas, requests, Rtree, shapely, folium, scikit-learn, scipy, gdal, rasterio}: +{ lib +, buildPythonPackage +, fetchFromGitHub +, folium +, gdal +, geopandas +, matplotlib +, networkx +, numpy +, pandas +, pythonOlder +, rasterio +, requests +, Rtree +, scikit-learn +, scipy +, shapely +}: buildPythonPackage rec { pname = "osmnx"; - version = "1.2.2"; + version = "1.3.0"; + format = "setuptools"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "gboeing"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-+dUv1QrUmCIOCyUyjYX1kJtZrPuSp3t9xz/sRV7ppgA="; + owner = "gboeing"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-17duWrg48Qb4ojYYFX4HBpPLeVgHn1WV84KVATvBnzY="; }; - propagatedBuildInputs = [ geopandas matplotlib networkx numpy pandas requests Rtree shapely folium scikit-learn scipy gdal rasterio ]; + propagatedBuildInputs = [ + geopandas + matplotlib + networkx + numpy + pandas + requests + Rtree + shapely + folium + scikit-learn + scipy + gdal + rasterio + ]; - # requires network + # Tests require network doCheck = false; - pythonImportsCheck = [ "osmnx" ]; + + pythonImportsCheck = [ + "osmnx" + ]; meta = with lib; { description = "A package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX."; homepage = "https://github.com/gboeing/osmnx"; + changelog = "https://github.com/gboeing/osmnx/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/ospd/default.nix b/pkgs/development/python-modules/ospd/default.nix index c4fe8be0b7ac..4525d455757c 100644 --- a/pkgs/development/python-modules/ospd/default.nix +++ b/pkgs/development/python-modules/ospd/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index 016f9325db40..7f15cc189832 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "osqp"; - version = "0.6.2.post5"; + version = "0.6.2.post8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-svoXquQqftSY7CYbM/Jiu0s2BefoRkBiFZ2froF/DWE="; + hash = "sha256-I9a65KNhL2DV9lLQ5fpLLq1QfKv/9dkw2CIFeubtZnc="; }; postPatch = '' @@ -44,7 +44,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ cvxopt pytestCheckHook ]; diff --git a/pkgs/development/python-modules/oss2/default.nix b/pkgs/development/python-modules/oss2/default.nix index 0ed3a0a3bdd7..e7f2856771a3 100644 --- a/pkgs/development/python-modules/oss2/default.nix +++ b/pkgs/development/python-modules/oss2/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ aliyun-python-sdk-sts mock pytestCheckHook diff --git a/pkgs/development/python-modules/ossfs/default.nix b/pkgs/development/python-modules/ossfs/default.nix index e6d8bf28a652..f78ed6dd5adf 100644 --- a/pkgs/development/python-modules/ossfs/default.nix +++ b/pkgs/development/python-modules/ossfs/default.nix @@ -4,22 +4,36 @@ , fsspec , oss2 , pythonOlder +, setuptools-scm +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "ossfs"; - version = "2021.8.0"; - format = "setuptools"; + version = "2023.1.0"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fsspec"; repo = pname; - rev = version; - hash = "sha256-bORiE3sIDNESjEizdzsJYZTSMbcqpbjostXo+0NQDfA="; + rev = "refs/tags/${version}"; + hash = "sha256-5mz1OC+6kDpiLNsMwOp+bdqY2eozMpAekS6h34QiOdo="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + pythonRelaxDeps = [ + "fsspec" + "oss2" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools-scm + ]; + propagatedBuildInputs = [ fsspec oss2 @@ -35,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Filesystem for Alibaba Cloud (Aliyun) Object Storage System (OSS)"; homepage = "https://github.com/fsspec/ossfs"; + changelog = "https://github.com/fsspec/ossfs/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix index 0150f1f5a2aa..474b0ab1bfff 100644 --- a/pkgs/development/python-modules/outcome/default.nix +++ b/pkgs/development/python-modules/outcome/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-b4K9PeRdowPPH3ceyvoWM3UKNYQ2qLtg4Goc63RdJnI="; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ attrs ]; # Has a test dependency on trio, which depends on outcome. doCheck = false; diff --git a/pkgs/development/python-modules/overpy/default.nix b/pkgs/development/python-modules/overpy/default.nix index bd50ddb502b6..37abe9551117 100644 --- a/pkgs/development/python-modules/overpy/default.nix +++ b/pkgs/development/python-modules/overpy/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix index b9ab287260d6..9b0716123857 100644 --- a/pkgs/development/python-modules/ovh/default.nix +++ b/pkgs/development/python-modules/ovh/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - checkInputs = [ + nativeCheckInputs = [ mock nose yanc diff --git a/pkgs/development/python-modules/ovoenergy/default.nix b/pkgs/development/python-modules/ovoenergy/default.nix index 1e60872b2c1b..1aaf94710311 100644 --- a/pkgs/development/python-modules/ovoenergy/default.nix +++ b/pkgs/development/python-modules/ovoenergy/default.nix @@ -3,12 +3,15 @@ , buildPythonPackage , click , fetchFromGitHub +, incremental +, pydantic , pythonOlder +, typer }: buildPythonPackage rec { pname = "ovoenergy"; - version = "1.2.0"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,13 +19,24 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "timmo001"; repo = pname; - rev = "v${version}"; - hash = "sha256-OSK74uvpHuEtWgbLVFrz1NO7lvtHbt690smGQ+GlsOI="; + rev = "refs/tags/${version}"; + hash = "sha256-oeNwBmzlkE8JewSwuFG8OYigyispP4xdwO3s2CAcfW4="; }; + nativeBuildInputs = [ + incremental + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "typer==0.6.1" "typer" + ''; + propagatedBuildInputs = [ aiohttp click + pydantic + typer ]; # Project has no tests diff --git a/pkgs/development/python-modules/oyaml/default.nix b/pkgs/development/python-modules/oyaml/default.nix index e2519c0b9720..6e43b4c0e9c6 100644 --- a/pkgs/development/python-modules/oyaml/default.nix +++ b/pkgs/development/python-modules/oyaml/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/p1monitor/default.nix b/pkgs/development/python-modules/p1monitor/default.nix index 634c06352e50..219bb1f2910a 100644 --- a/pkgs/development/python-modules/p1monitor/default.nix +++ b/pkgs/development/python-modules/p1monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "p1monitor"; - version = "2.1.1"; + version = "2.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-p1monitor"; rev = "refs/tags/v${version}"; - hash = "sha256-VHY5AWxt5BZd1NQKzsgubEZBLKAlDNm8toyEazPUnDU="; + hash = "sha256-jmSSejflez3AmIp7PY6m0+vW8YZuNgUj8lwyu0roLYc="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for interacting with the P1 Monitor"; homepage = "https://github.com/klaasnicolaas/python-p1monitor"; + changelog = "https://github.com/klaasnicolaas/python-p1monitor/releases/tag/v${version}"; 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 135ab6fdbc1c..a1764765ef3d 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/pkgs/development/python-modules/packageurl-python/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-XJEzT5Qs1V1F6wxn3TOaU175DiXwW57AFq0YjtDvkEg="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index c7587cb5c5dc..237f43bc7ef6 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -27,7 +27,7 @@ let propagatedBuildInputs = [ pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pretend ]; diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix index f27b0130a700..4ae637f5bc72 100644 --- a/pkgs/development/python-modules/packet-python/default.nix +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-runner requests-mock diff --git a/pkgs/development/python-modules/packvers/default.nix b/pkgs/development/python-modules/packvers/default.nix new file mode 100644 index 000000000000..5ec3bd628c3e --- /dev/null +++ b/pkgs/development/python-modules/packvers/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pretend +, pyparsing +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "packvers"; + version = "21.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "nexB"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-nCSYL0g7mXi9pGFt24pOXbmmYsaRuB+rRZrygf8DTLE="; + }; + + propagatedBuildInputs = [ + pyparsing + ]; + + nativeCheckInputs = [ + pretend + pytestCheckHook + ]; + + pythonImportsCheck = [ + "packvers" + ]; + + meta = with lib; { + description = "Module for version handling of modules"; + homepage = "https://github.com/nexB/dparse2"; + changelog = "https://github.com/nexB/packvers/blob/${version}/CHANGELOG.rst"; + license = with licenses; [ asl20 /* and */ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pafy/default.nix b/pkgs/development/python-modules/pafy/default.nix deleted file mode 100644 index c657a2fa1b12..000000000000 --- a/pkgs/development/python-modules/pafy/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildPythonPackage, youtube-dl, fetchPypi }: -buildPythonPackage rec { - pname = "pafy"; - version = "0.5.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "364f1d1312c89582d97dc7225cf6858cde27cb11dfd64a9c2bab1a2f32133b1e"; - }; - - # No tests included in archive - doCheck = false; - - propagatedBuildInputs = [ youtube-dl ]; - - meta = with lib; { - description = "A library to download YouTube content and retrieve metadata"; - homepage = "https://github.com/mps-youtube/pafy"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ odi ]; - }; -} - diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix index e25f54748685..b94428ebbef7 100644 --- a/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/pkgs/development/python-modules/paho-mqtt/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook six ] ++ lib.optionals (!isPy3k) [ diff --git a/pkgs/development/python-modules/palettable/default.nix b/pkgs/development/python-modules/palettable/default.nix index dce72bb74bb5..a61370144905 100644 --- a/pkgs/development/python-modules/palettable/default.nix +++ b/pkgs/development/python-modules/palettable/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "72feca71cf7d79830cd6d9181b02edf227b867d503bec953cf9fa91bf44896bd"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix index 64b331db992d..62c568e64818 100644 --- a/pkgs/development/python-modules/pamqp/default.nix +++ b/pkgs/development/python-modules/pamqp/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-zvvRoGMNP4NMy3Etjif5MYUPdRqmQXATbFgxaPp1TaM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix index 9719b918b6eb..b45689afb1df 100644 --- a/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/pkgs/development/python-modules/pandas-stubs/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { types-pytz ]; - checkInputs = [ + nativeCheckInputs = [ jinja2 matplotlib openpyxl diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 9125b96a014c..6c6fb3b29cc3 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -28,13 +28,13 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.4.4"; + version = "1.5.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-q2wNc4YXtnUYPl8o2zK1FItpStm7oKQMPqJtlrQx22c="; + hash = "sha256-IguY0VzuCyzYOaY1i9Hyc9A1a/lkwaGusy1H2wIVSIs="; }; nativeBuildInputs = [ cython ]; @@ -47,7 +47,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales hypothesis jinja2 @@ -96,6 +96,10 @@ buildPythonPackage rec { # than expected, e.g. on amd64 with FMA or on arm64 # https://github.com/pandas-dev/pandas/issues/38921 "test_rolling_var_numerical_issues" + # Requires mathplotlib + "test_subset_for_boolean_cols" + # DeprecationWarning from numpy + "test_sort_values_sparse_no_warning" ] ++ lib.optionals stdenv.isDarwin [ "test_locale" "test_clipboard" diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 1271fb3b4da0..9b35cb6ac177 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "panel"; - version = "0.14.1"; + version = "0.14.2"; format = "wheel"; @@ -23,7 +23,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-DSurTC+inYSoGJ047u03K+wEQhGFqqRX0uS5qb3sNEI="; + hash = "sha256-cDjrim7esGduL8IHxPpoqHB43uA78R9UMIrhNktqUdU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/panflute/default.nix b/pkgs/development/python-modules/panflute/default.nix index a0c4930ab010..981e52a07c09 100644 --- a/pkgs/development/python-modules/panflute/default.nix +++ b/pkgs/development/python-modules/panflute/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec{ pname = "panflute"; - version = "2.2.3"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AJMz+gt8Wa45aFZSLm15RjiiJlJnkWC4Lobk8o8Pu8Y="; + hash = "sha256-zv2d/EjM2XMqU9tXYQcB0igG2jl6ipflzI3AcLVYZco="; }; propagatedBuildInputs = [ @@ -30,6 +30,7 @@ buildPythonPackage rec{ meta = with lib; { description = "Pythonic alternative to John MacFarlane's pandocfilters, with extra helper functions"; homepage = "http://scorreia.com/software/panflute"; + changelog = "https://github.com/sergiocorreia/panflute/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ synthetica ]; }; diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index d9de15ad76ee..9afafa5c66fa 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index b33f65bad5c4..8e84896079c1 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -27,7 +27,6 @@ , tqdm , typing-extensions , whoosh -, xdg-utils }: buildPythonPackage rec { @@ -70,19 +69,15 @@ buildPythonPackage rec { ]; postPatch = '' + # Remove when https://github.com/papis/papis/pull/478 lands in upstream substituteInPlace setup.py \ - --replace "isbnlib>=3.9.1,<3.10" "isbnlib>=3.9" + --replace "etc/bash_completion.d/" "share/bash-completion/completions/" substituteInPlace setup.cfg \ --replace "--cov=papis" "" ''; - # Tests are failing on Python > 3.9 - doCheck = !stdenv.isDarwin && !(pythonAtLeast "3.10"); - - checkInputs = ([ + checkInputs = [ pytestCheckHook - ]) ++ [ - xdg-utils ]; preCheck = '' @@ -106,6 +101,8 @@ buildPythonPackage rec { "test_get_data" "test_validate_arxivid" "test_yaml" + ] ++ lib.optionals stdenv.isDarwin [ + "test_default_opener" ]; pythonImportsCheck = [ @@ -115,7 +112,8 @@ buildPythonPackage rec { meta = with lib; { description = "Powerful command-line document and bibliography manager"; homepage = "https://papis.readthedocs.io/"; + changelog = "https://github.com/papis/papis/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nico202 teto ]; + maintainers = with maintainers; [ nico202 teto marsam ]; }; } diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index dc1e8c9ae517..6338c46399de 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -2,20 +2,24 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "param"; - version = "1.12.2"; + version = "1.12.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "holoviz"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-NrMsIDcpZc/R2j8VuXitbnIlhP3NtLxU/OkygXqYok8="; + hash = "sha256-XVHYx0M/BLjNNneObxygPHtid65ti7nctKsUMF21fmw="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -32,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Declarative Python programming using Parameters"; homepage = "https://github.com/pyviz/param"; + changelog = "https://github.com/holoviz/param/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/parameter-expansion-patched/default.nix b/pkgs/development/python-modules/parameter-expansion-patched/default.nix index 4f2c5eaf6094..19149d8db241 100644 --- a/pkgs/development/python-modules/parameter-expansion-patched/default.nix +++ b/pkgs/development/python-modules/parameter-expansion-patched/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index 5ec4421ec8be..a6083836714b 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -1,39 +1,50 @@ { lib , buildPythonPackage , fetchPypi -, glibcLocales -, isPy3k , mock , nose +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "parameterized"; version = "0.8.1"; - disable = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Qbv/N9YYZDD3f5ANd35btqJJKKHEb7HeaS+LUriDO1w="; + hash = "sha256-Qbv/N9YYZDD3f5ANd35btqJJKKHEb7HeaS+LUriDO1w="; }; checkInputs = [ - nose mock - glibcLocales + nose + pytestCheckHook ]; - checkPhase = '' - runHook preCheck - LC_ALL="en_US.UTF-8" nosetests -v - runHook postCheck - ''; + pytestFlagsArray = [ + "parameterized/test.py" + ]; - pythonImportsCheck = [ "parameterized" ]; + disabledTests = [ + # Tests seem outdated + "test_method" + "test_with_docstring_0_value1" + "test_with_docstring_1_v_l_" + "testCamelCaseMethodC" + ]; + + pythonImportsCheck = [ + "parameterized" + ]; meta = with lib; { description = "Parameterized testing with any Python test framework"; homepage = "https://github.com/wolever/parameterized"; + changelog = "https://github.com/wolever/parameterized/blob/v${version}/CHANGELOG.txt"; license = licenses.bsd2; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/parameterizedtestcase/default.nix b/pkgs/development/python-modules/parameterizedtestcase/default.nix deleted file mode 100644 index 9d277af8d1a9..000000000000 --- a/pkgs/development/python-modules/parameterizedtestcase/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, python -, isPy27 -}: - -buildPythonPackage rec { - pname = "parameterizedtestcase"; - version = "0.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "4ccc1d15d7e7ef153619a6a9cd45b170268cf82c67fdd336794c75139aae127e"; - }; - - checkPhase = '' - runHook preCheck - ${python.interpreter} -m parameterizedtestcase.tests - runHook postCheck - ''; - - doCheck = isPy27; - - meta = with lib; { - description = "Parameterized tests for Python's unittest module"; - homepage = "https://github.com/msabramo/python_unittest_parameterized_test_case"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - broken = python.isPy3k; # uses use_2to3 - }; -} diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix new file mode 100644 index 000000000000..e2d94ac02561 --- /dev/null +++ b/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, coveralls +, numpy +, contextlib2 +, decopatch +, more-itertools +, nestedtext +, pyyaml +, tidyexc +, toml +}: + +buildPythonPackage rec { + pname = "parametrize-from-file"; + version = "0.17.0"; + format = "flit"; + + src = fetchPypi { + inherit version; + pname = "parametrize_from_file"; + sha256 = "1c91j869n2vplvhawxc1sv8km8l53bhlxhhms43fyjsqvy351v5j"; + }; + + # patch out coveralls since it doesn't provide us value + preBuild = '' + sed -i '/coveralls/d' ./pyproject.toml + + substituteInPlace pyproject.toml \ + --replace "more_itertools~=8.10" "more_itertools" + ''; + + nativeCheckInputs = [ + numpy + pytestCheckHook + ]; + + propagatedBuildInputs = [ + contextlib2 + decopatch + more-itertools + nestedtext + pyyaml + tidyexc + toml + ]; + + pythonImportsCheck = [ "parametrize_from_file" ]; + + meta = with lib; { + description = "Read unit test parameters from config files"; + homepage = "https://github.com/kalekundert/parametrize_from_file"; + changelog = "https://github.com/kalekundert/parametrize_from_file/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 616dad5e8cb6..a578566019aa 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { invoke = [ invoke ]; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 99065aa19944..5fe452d2047f 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy scipy six decorator ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; # Ran 113 tests in 3.082s checkPhase = '' diff --git a/pkgs/development/python-modules/paranoid-crypto/default.nix b/pkgs/development/python-modules/paranoid-crypto/default.nix index e7bd9c5848df..f4ee6d2fe0b7 100644 --- a/pkgs/development/python-modules/paranoid-crypto/default.nix +++ b/pkgs/development/python-modules/paranoid-crypto/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { protobuf ]; - checkInputs = [ + nativeCheckInputs = [ fpylll pytestCheckHook ]; diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index 131d8de094fc..6e33c6f520bd 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "parfive"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/b4KrYg0mXoQJ/L+9ol7gD2myB0aLgDj0IWa8sxarKU="; + sha256 = "sha256-kIIR+cXLUtyLJ5YmhyCV88zhXahok/U7QXbezt3PyF0="; }; buildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ aiofiles pytest-asyncio pytest-localserver diff --git a/pkgs/development/python-modules/parquet/default.nix b/pkgs/development/python-modules/parquet/default.nix index 3be0cce9fa4e..89503526654e 100644 --- a/pkgs/development/python-modules/parquet/default.nix +++ b/pkgs/development/python-modules/parquet/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { thriftpy2 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index 3356853e8ac4..8dc5ded97455 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix index 4b42071f01fb..fab03550fd1f 100644 --- a/pkgs/development/python-modules/parsedatetime/default.nix +++ b/pkgs/development/python-modules/parsedatetime/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ future ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests/Test*.py" ]; diff --git a/pkgs/development/python-modules/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix index 9c70561cd37b..ff90cfa74a08 100644 --- a/pkgs/development/python-modules/parsel/default.nix +++ b/pkgs/development/python-modules/parsel/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { w3lib ]; - checkInputs = [ + nativeCheckInputs = [ psutil pytestCheckHook ]; diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix index f22b1b605e34..5a51270e2090 100644 --- a/pkgs/development/python-modules/parsimonious/default.nix +++ b/pkgs/development/python-modules/parsimonious/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { regex ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index 16313ab16ee8..bd2e3ad90acd 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "sha256-jAe+KQu1nwNYiRWSHinopQACrK8s3F+g4BFPkXCfr6A="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = lib.optionals (pythonAtLeast "3.10") [ # python changed exception message format in 3.10, 3.10 not yet supported diff --git a/pkgs/development/python-modules/parsy/default.nix b/pkgs/development/python-modules/parsy/default.nix index 9083953009ad..74e62d1ce0e2 100644 --- a/pkgs/development/python-modules/parsy/default.nix +++ b/pkgs/development/python-modules/parsy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-FislrLb+u4T5m/eEER7kazZHJKEwPHe+Vg/YDJp4PyM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index 7f6fa7b510f7..2e62b2ee5990 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-zpGrzcYXjWaLyqQxeRpakX2QI0HLGT9UP+RF1JRmBIU="; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ locket numpy pandas pyzmq toolz ]; diff --git a/pkgs/development/python-modules/particle/default.nix b/pkgs/development/python-modules/particle/default.nix index d1207fe84983..1a9f4fef309b 100644 --- a/pkgs/development/python-modules/particle/default.nix +++ b/pkgs/development/python-modules/particle/default.nix @@ -1,56 +1,66 @@ { lib +, attrs , buildPythonPackage , fetchFromGitHub , fetchPypi -, setuptools-scm -, attrs -, deprecated +, hatch-vcs +, hatchling , hepunits -, pytestCheckHook -, tabulate , pandas +, pytestCheckHook +, pythonOlder +, setuptools-scm +, tabulate }: buildPythonPackage rec { pname = "particle"; - version = "0.20.1"; + version = "0.21.2"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HoWWwoGMrkRqlYzrF2apGsxsZAHwHbHSO5TCSCelxUc="; + hash = "sha256-BDTTmqtPxyvORSoR+CJzb5WTfF9BFrDoMSVOvO9s/Ns="; }; + + postPatch = '' + # Disable benchmark tests, so we won't need pytest-benchmark and pytest-cov + # as dependencies + substituteInPlace pyproject.toml \ + --replace '"--benchmark-disable",' "" + ''; + nativeBuildInputs = [ - setuptools-scm + hatch-vcs + hatchling ]; propagatedBuildInputs = [ attrs - deprecated hepunits ]; + nativeCheckInputs = [ + pytestCheckHook + tabulate + pandas + ]; + pythonImportsCheck = [ "particle" ]; - preCheck = '' - # Disable benchmark tests, so we won't need pytest-benchmark and pytest-cov - # as dependencies - substituteInPlace pyproject.toml \ - --replace '"--benchmark-disable", ' "" - rm tests/particle/test_performance.py - ''; - - checkInputs = [ - pytestCheckHook - tabulate - pandas + disabledTestPaths = [ + "tests/particle/test_performance.py" ]; - meta = { - description = "Package to deal with particles, the PDG particle data table, PDGIDs, etc."; + meta = with lib; { + description = "Package to deal with particles, the PDG particle data table and others"; homepage = "https://github.com/scikit-hep/particle"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ doronbehar ]; + changelog = "https://github.com/scikit-hep/particle/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix index 878b2746758c..925fa6febfa1 100644 --- a/pkgs/development/python-modules/parver/default.nix +++ b/pkgs/development/python-modules/parver/default.nix @@ -1,35 +1,38 @@ { lib , buildPythonPackage , fetchPypi -, six +, pythonOlder +, setuptools , attrs , pytestCheckHook , hypothesis , pretend , arpeggio +, typing-extensions }: buildPythonPackage rec { pname = "parver"; - version = "0.3.1"; + version = "0.4"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "c902e0653bcce927cc156a7fd9b3a51924cbce3bf3d0bfd49fc282bfd0c5dfd3"; + hash = "sha256-1KPbuTxTNz7poLoFXkhYxEFpsgS5EuSdAD6tlduam8o="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "arpeggio ~= 1.7" "arpeggio" - ''; - - propagatedBuildInputs = [ - six - attrs - arpeggio + nativeBuildInputs = [ + setuptools ]; - checkInputs = [ + propagatedBuildInputs = [ + attrs + arpeggio + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions + ]; + + nativeCheckInputs = [ pytestCheckHook hypothesis pretend diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 72892a109539..f18307c50bf0 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { totp = [ cryptography ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.argon2 ++ passthru.optional-dependencies.bcrypt @@ -32,9 +32,9 @@ buildPythonPackage rec { disabledTests = [ # timming sensitive "test_dummy_verify" - ] - # These tests fail because they don't expect support for algorithms provided through libxcrypt - ++ lib.optionals stdenv.isDarwin [ + "test_encrypt_cost_timing" + ] ++ lib.optionals stdenv.isDarwin [ + # These tests fail because they don't expect support for algorithms provided through libxcrypt "test_82_crypt_support" ]; diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index 9186cef3efc6..e388adfb1f1e 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # broken test diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index 07705d62b32b..03b765719069 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-9/8aM/G/EdapCZJlx0ZPzNbmw2uYjA1zGbNWJAWoeCU="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Load, configure, and compose WSGI applications and servers"; diff --git a/pkgs/development/python-modules/pastel/default.nix b/pkgs/development/python-modules/pastel/default.nix index 39953306fbb1..ed91aaf40077 100644 --- a/pkgs/development/python-modules/pastel/default.nix +++ b/pkgs/development/python-modules/pastel/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "e6581ac04e973cac858828c6202c1e1e81fee1dc7de7683f3e1ffe0bfd8a573d"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index 244b51f3f844..27933066c7b7 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -7,16 +7,20 @@ , six , paste , pastedeploy +, pythonOlder }: buildPythonPackage rec { pname = "pastescript"; - version = "3.2.1"; + version = "3.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "PasteScript"; inherit version; - sha256 = "f3ef819785e1b284e6fc108a131bce7e740b18255d96cd2e99ee3f00fd452468"; + hash = "sha256-3eyAGhOsZn4JTt3ij5AhLN6nvcmhjUNxsI9abvfS66I="; }; propagatedBuildInputs = [ @@ -27,9 +31,15 @@ buildPythonPackage rec { # test suite seems to unset PYTHONPATH doCheck = false; - checkInputs = [ nose pytestCheckHook ]; - pythonNamespaces = [ "paste" ]; + nativeCheckInputs = [ + nose + pytestCheckHook + ]; + + pythonNamespaces = [ + "paste" + ]; disabledTestPaths = [ "appsetup/testfiles" diff --git a/pkgs/development/python-modules/path-and-address/default.nix b/pkgs/development/python-modules/path-and-address/default.nix index bd71ffad0f2c..a01c798615cf 100644 --- a/pkgs/development/python-modules/path-and-address/default.nix +++ b/pkgs/development/python-modules/path-and-address/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0b0afpsaim06mv3lhbpm8fmawcraggc11jhzr6h72kdj1cqjk5h6"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/path/default.nix b/pkgs/development/python-modules/path/default.nix index a22aa64e8b1e..93f1fbcabe55 100644 --- a/pkgs/development/python-modules/path/default.nix +++ b/pkgs/development/python-modules/path/default.nix @@ -14,21 +14,21 @@ buildPythonPackage rec { pname = "path"; - version = "16.4.0"; + version = "16.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uvLnV8Sxm+ggj55n5I+0dbSld9VhNZDORmk7298IL1I="; + hash = "sha256-vqOBbh1U9OM6rHjSAxoLDtL5XmnbhbRdUfF9+XBx2mk="; }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pathable/default.nix b/pkgs/development/python-modules/pathable/default.nix index 0f81f87aa6fc..789162b1fe52 100644 --- a/pkgs/development/python-modules/pathable/default.nix +++ b/pkgs/development/python-modules/pathable/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for object-oriented paths"; homepage = "https://github.com/p1c2u/pathable"; + changelog = "https://github.com/p1c2u/pathable/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pathlib/default.nix b/pkgs/development/python-modules/pathlib/default.nix index b29a5bae8ed2..4ec9da43a563 100644 --- a/pkgs/development/python-modules/pathlib/default.nix +++ b/pkgs/development/python-modules/pathlib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = { description = "Object-oriented filesystem paths"; diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index f0f0163652ca..f4b7c6e05d83 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ] ++ lib.optionals (pythonOlder "3.5") [ scandir typing ]; - checkInputs = [ glibcLocales ] + nativeCheckInputs = [ glibcLocales ] ++ lib.optional (pythonOlder "3.3") mock; preCheck = '' diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index 9c6dd6256606..333f1be21c4e 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pathos"; - version = "0.2.9"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "uqfoundation"; repo = pname; rev = "refs/tags/pathos-${version}"; - sha256 = "sha256-39D+itH0nkOzmh3Rpg/HXLRj2F1UPsys+iU0ZiodkM0="; + sha256 = "sha256-Jc7pMVjOUSaZydRh87FsHivEAXpX9v6EbZNkHwPeq/Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index 121f83df2898..66facfd1e132 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.10.1"; + version = "0.10.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-es5hYbYh0x55AutrWuFI0Sz9I/SiSbn/trn+4SCEMj0="; + hash = "sha256-ViAN5Ad9nQeRRlqpCVoB1CGGHkBbUJaVUFHe79aX1vY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pathy/default.nix b/pkgs/development/python-modules/pathy/default.nix index 30cdd782df2e..feb347b797c7 100644 --- a/pkgs/development/python-modules/pathy/default.nix +++ b/pkgs/development/python-modules/pathy/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, dataclasses , fetchPypi , fetchpatch , google-cloud-storage @@ -13,38 +12,27 @@ buildPythonPackage rec { pname = "pathy"; - version = "0.6.1"; + version = "0.10.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "838624441f799a06b446a657e4ecc9ebc3fdd05234397e044a7c87e8f6e76b1c"; + hash = "sha256-TNbnG0zV/4dc+7lJrZ+lUZ2NHb5p1fwdGyOqPLBJYYs="; }; propagatedBuildInputs = [ + google-cloud-storage smart-open typer - google-cloud-storage - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; - patches = [ - # Support for smart-open >= 6.0.0, https://github.com/justindujardin/pathy/pull/71 - (fetchpatch { - name = "support-later-smart-open.patch"; - url = "https://github.com/justindujardin/pathy/commit/ba1c23df6ee5d1e57bdfe845ff6a9315cba3df6a.patch"; - sha256 = "sha256-V1i4tx73Xkdqb/wZhQIv4p6FVpF9SEfDhlBkwaaRE3w="; - }) - ]; - disabledTestPaths = [ # Exclude tests that require provider credentials "pathy/_tests/test_clients.py" diff --git a/pkgs/development/python-modules/patiencediff/default.nix b/pkgs/development/python-modules/patiencediff/default.nix index 4c14d161f46e..4c5c0744b0e2 100644 --- a/pkgs/development/python-modules/patiencediff/default.nix +++ b/pkgs/development/python-modules/patiencediff/default.nix @@ -1,25 +1,30 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "patiencediff"; - version = "0.2.6"; - format = "setuptools"; + version = "0.2.12"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "breezy-team"; repo = pname; - rev = "v${version}"; - hash = "sha256-oJOsqZ9XCbYHJ7VEbDpC9wquCkvfj05M0nerlV5jL7w="; + rev = "refs/tags/v${version}"; + hash = "sha256-BdTsx4UIRRK9fbMXOrgut651YMTowxHDFfitlP7ue2I="; }; - checkInputs = [ + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ pytestCheckHook ]; @@ -30,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "C implementation of patiencediff algorithm for Python"; homepage = "https://github.com/breezy-team/patiencediff"; + changelog = "https://github.com/breezy-team/patiencediff/releases/tag/v${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ wildsebastian ]; }; diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix index cbc3a05044ee..f23521ea2140 100644 --- a/pkgs/development/python-modules/patool/default.nix +++ b/pkgs/development/python-modules/patool/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { --replace "path = None" 'path = os.environ["PATH"] + ":${lib.makeBinPath compression-utilities}"' ''; - checkInputs = [ pytestCheckHook ] ++ compression-utilities; + nativeCheckInputs = [ pytestCheckHook ] ++ compression-utilities; disabledTests = [ "test_unzip" diff --git a/pkgs/development/python-modules/patsy/default.nix b/pkgs/development/python-modules/patsy/default.nix index 0f607df1de0c..e4d389022d49 100644 --- a/pkgs/development/python-modules/patsy/default.nix +++ b/pkgs/development/python-modules/patsy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/paver/default.nix b/pkgs/development/python-modules/paver/default.nix index 8721ef3dd601..d46d6eaa2934 100644 --- a/pkgs/development/python-modules/paver/default.nix +++ b/pkgs/development/python-modules/paver/default.nix @@ -1,33 +1,53 @@ { lib , buildPythonPackage -, fetchPypi -, nose , cogapp +, fetchPypi , mock +, nose +, pytestCheckHook +, pythonOlder +, six , virtualenv }: buildPythonPackage rec { + pname = "paver"; version = "1.3.4"; - pname = "Paver"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "d3e6498881485ab750efe40c5278982a9343bc627e137b11adced627719308c7"; + pname = "Paver"; + inherit version; + hash = "sha256-0+ZJiIFIWrdQ7+QMUniYKpNDvGJ+E3sRrc7WJ3GTCMc="; }; - buildInputs = [ cogapp mock virtualenv ]; + propagatedBuildInputs = [ + six + ]; - propagatedBuildInputs = [ nose ]; + checkInputs = [ + cogapp + mock + nose + pytestCheckHook + virtualenv + ]; - # the tests do not pass - doCheck = false; + pythonImportsCheck = [ + "paver" + ]; + + disabledTestPaths = [ + # Test depends on distutils + "paver/tests/test_setuputils.py" + ]; meta = with lib; { description = "A Python-based build/distribution/deployment scripting tool"; - homepage = "https://github.com/paver/paver"; + homepage = "https://github.com/paver/paver"; + license = licenses.bsd3; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; }; - } diff --git a/pkgs/development/python-modules/pbr/tests.nix b/pkgs/development/python-modules/pbr/tests.nix index b04751231872..47be8ef19f07 100644 --- a/pkgs/development/python-modules/pbr/tests.nix +++ b/pkgs/development/python-modules/pbr/tests.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pythonOutputDistPhase() { touch $dist; } ''; - checkInputs = [ + nativeCheckInputs = [ pbr build git diff --git a/pkgs/development/python-modules/pcapy-ng/default.nix b/pkgs/development/python-modules/pcapy-ng/default.nix index 7fec65bfb52f..da490bd304eb 100644 --- a/pkgs/development/python-modules/pcapy-ng/default.nix +++ b/pkgs/development/python-modules/pcapy-ng/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { libpcap ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index f2ed6e7a297c..14f82b6ce3a9 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -1,14 +1,21 @@ -{ lib, buildPythonPackage, fetchPypi, pillow, poppler_utils }: +{ lib +, buildPythonPackage +, fetchPypi +, pillow +, poppler_utils +, pythonOlder +}: buildPythonPackage rec { pname = "pdf2image"; - version = "1.16.0"; + version = "1.16.2"; + format = "setuptools"; - propagatedBuildInputs = [ pillow ]; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "d58ed94d978a70c73c2bb7fdf8acbaf2a7089c29ff8141be5f45433c0c4293bb"; + hash = "sha256-hnYQke7jX0ZB6pjf3bJUJUNh0Bi+aYoZmv98HTczGAM="; }; postPatch = '' @@ -16,9 +23,18 @@ buildPythonPackage rec { sed -i '0,/poppler_path=None/s||poppler_path="${poppler_utils}/bin"|' pdf2image/pdf2image.py ''; + propagatedBuildInputs = [ + pillow + ]; + + pythonImportsCheck = [ + "pdf2image" + ]; + meta = with lib; { - description = "A python module that wraps the pdftoppm utility to convert PDF to PIL Image object"; + description = "Module that wraps the pdftoppm utility to convert PDF to PIL Image object"; homepage = "https://github.com/Belval/pdf2image"; + changelog = "https://github.com/Belval/pdf2image/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ gerschtli ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/pdfminer-six/default.nix b/pkgs/development/python-modules/pdfminer-six/default.nix index ec434b3dfbe6..a0b7d765646c 100644 --- a/pkgs/development/python-modules/pdfminer-six/default.nix +++ b/pkgs/development/python-modules/pdfminer-six/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { "pdfminer.high_level" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pdfx/default.nix b/pkgs/development/python-modules/pdfx/default.nix index aaffa0f93818..b61a22cb516f 100644 --- a/pkgs/development/python-modules/pdfx/default.nix +++ b/pkgs/development/python-modules/pdfx/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pdfminer-six chardet ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index 156226536bcf..50f6be3be655 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pdm-pep517"; - version = "1.0.4"; + version = "1.0.6"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OS+MK0fG7CBVDLjhniS529Jzc0E/BntW7Ndfl2f5MBU="; + sha256 = "sha256-pEB3A9UPpNZxODo1SGiwWhMGDBvzgmTLtd3Jpz5KHcU="; }; preCheck = '' @@ -25,7 +25,7 @@ buildPythonPackage rec { git config --global user.email nobody@example.com ''; - checkInputs = [ + nativeCheckInputs = [ setuptools pytestCheckHook git diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix index 2572b8c04611..c8813208d5e8 100644 --- a/pkgs/development/python-modules/pdoc/default.nix +++ b/pkgs/development/python-modules/pdoc/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { markupsafe ] ++ lib.optional (pythonOlder "3.9") astunparse; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis ]; diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index a5220f018011..38e06d362d93 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "7.4.0"; + version = "11.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7b6fF6wVNo4kBJ+s1lxNSl1C2vZjnAmHOtVSmqoiY9Q="; + hash = "sha256-SU8vsKwZio/5UD2SMhLenfkBjXRuMZCPo2k6+1hx8Y4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pebble/default.nix b/pkgs/development/python-modules/pebble/default.nix index 996d85b67d9f..deeec443b85c 100644 --- a/pkgs/development/python-modules/pebble/default.nix +++ b/pkgs/development/python-modules/pebble/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pebble"; - version = "5.0.2"; + version = "5.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,10 +16,10 @@ buildPythonPackage rec { src = fetchPypi { pname = "Pebble"; inherit version; - hash = "sha256-nFjAPq+SDDEodETG/vOdxTuurJ3iIerRBPXJtI6L1Yc="; + hash = "sha256-vc/Z6n4K7biVsgQXfBnm1lQ9mWL040AuurIXUASGPag="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix index c35b53cd25d2..63bae07aec72 100644 --- a/pkgs/development/python-modules/pecan/default.nix +++ b/pkgs/development/python-modules/pecan/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook genshi gunicorn diff --git a/pkgs/development/python-modules/peewee-migrate/default.nix b/pkgs/development/python-modules/peewee-migrate/default.nix new file mode 100644 index 000000000000..d86e447711c4 --- /dev/null +++ b/pkgs/development/python-modules/peewee-migrate/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# runtime +, cached-property +, click +, peewee + +# tests +, psycopg2 +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "peewee-migrate"; + version = "1.6.6"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "klen"; + repo = "peewee_migrate"; + rev = "refs/tags/${version}"; + hash = "sha256-gUtxsvPj8pwzijia313d553j9U2LP5vKJHxVU1SqsV8="; + }; + + postPatch = '' + sed -i '/addopts/d' setup.cfg + ''; + + propagatedBuildInputs = [ + peewee + click + ] ++ lib.optionals (pythonOlder "3.8") [ + cached-property + ]; + + pythonImportsCheck = [ + "peewee_migrate" + ]; + + nativeCheckInputs = [ + psycopg2 + pytestCheckHook + ]; + + meta = with lib; { + description = "Simple migration engine for Peewee"; + homepage = "https://github.com/klen/peewee_migrate"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 089088a09bd3..3f139410e865 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.15.3"; + version = "3.15.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6s+JTUYmuP6Y6D+mi8YTznHbPYUS7yk259MuPpm9H/s="; + hash = "sha256-UbhJWooZuZOm1AUbM+66Qm76zar+sBOvuUnAc1vLvOU="; }; buildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { mysql-connector ]; - checkInputs = [ + nativeCheckInputs = [ flask ]; diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index f6268953fde3..8fedf5c694b7 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { unidecode ]; - checkInputs = [ + nativeCheckInputs = [ pytest-xdist pytestCheckHook pandoc @@ -107,7 +107,7 @@ buildPythonPackage rec { meta = with lib; { description = "Static site generator that requires no database or server-side logic"; - homepage = "http://getpelican.com/"; + homepage = "https://getpelican.com/"; license = licenses.agpl3; maintainers = with maintainers; [ offline prikhi ]; }; diff --git a/pkgs/development/python-modules/pep440/default.nix b/pkgs/development/python-modules/pep440/default.nix index ebaade39ce99..c9753a47d81a 100644 --- a/pkgs/development/python-modules/pep440/default.nix +++ b/pkgs/development/python-modules/pep440/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix index 9848e2780173..fe40559493e5 100644 --- a/pkgs/development/python-modules/pep517/default.nix +++ b/pkgs/development/python-modules/pep517/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { importlib-metadata zipp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook setuptools testpath diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix index 7e9642a2bc28..5fd696523d84 100644 --- a/pkgs/development/python-modules/pep8-naming/default.nix +++ b/pkgs/development/python-modules/pep8-naming/default.nix @@ -1,31 +1,25 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , flake8 , python +, pythonOlder }: buildPythonPackage rec { pname = "pep8-naming"; - version = "0.13.1"; + version = "0.13.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = version; - sha256 = "sha256-NG4hLZcOMKprUyMnzkHRmUCFGyYgvT6ydBQNpgWE9h0="; + hash = "sha256-l7zZUOMWyTxnTbkFkzfABY/eVMKnv0kNJ0UPzJo0W1Y="; }; - patches = [ - # Fixes tests for flake8 => 5 - # Remove on next release - (fetchpatch { - url = "https://github.com/PyCQA/pep8-naming/commit/c8808a0907f64b5d081cff8d3f9443e5ced1474e.patch"; - sha256 = "sha256-4c+a0viS0rXuxj+TuIfgrKZjnrjiJjDoYBbNp3+6Ed0="; - }) - ]; - propagatedBuildInputs = [ flake8 ]; @@ -41,8 +35,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/PyCQA/pep8-naming"; description = "Check PEP-8 naming conventions, plugin for flake8"; + homepage = "https://github.com/PyCQA/pep8-naming"; + changelog = "https://github.com/PyCQA/pep8-naming/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ eadwu ]; }; diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index 1c8cdf4421bf..63b00e896f17 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix index 89a293b75f40..6f0a8245ade5 100644 --- a/pkgs/development/python-modules/periodictable/default.nix +++ b/pkgs/development/python-modules/periodictable/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 3b2331871fb8..5c517231ec91 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index c5d6088ead43..6a20154da380 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "persistent"; - version = "4.9.2"; + version = "5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8j6yXqRbvKa/YgSwKKCn6qFz0ngdaP9XzVhhzBoNDtA="; + hash = "sha256-hx5jxSExFgeVzcjpw90xP4bg3/NMFRyY3NkSPG2M5nM="; }; nativeBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automatic persistence for Python objects"; homepage = "https://github.com/zopefoundation/persistent/"; + changelog = "https://github.com/zopefoundation/persistent/blob/${version}/CHANGES.rst"; license = licenses.zpl21; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/persisting-theory/default.nix b/pkgs/development/python-modules/persisting-theory/default.nix index 17d210f4006d..eb9b8cbdd69f 100644 --- a/pkgs/development/python-modules/persisting-theory/default.nix +++ b/pkgs/development/python-modules/persisting-theory/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-D4QPoiJHvKpRQJTafzsmxgI1lCmrEtLNiL4GtJozYpA="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pescea/default.nix b/pkgs/development/python-modules/pescea/default.nix index 4bf4f395a907..415fcd5a09a0 100644 --- a/pkgs/development/python-modules/pescea/default.nix +++ b/pkgs/development/python-modules/pescea/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { async-timeout ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index b0167bf17a3f..314d3fdfb0e6 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.113"; + version = "2.1.119"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FykzeHQjBMBZ+NqOMzjwHiOCMLk1rvomjUaoHco2ZQg="; + hash = "sha256-QughY8G0Z9/371tlG0VMUqeKW/Nndv9mMbR1AIBlmTA="; }; nativeBuildInputs = [ @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library and tool for generating .pex (Python EXecutable) files"; homepage = "https://github.com/pantsbuild/pex"; + changelog = "https://github.com/pantsbuild/pex/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ copumpkin ]; }; diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index e23d3d2b0b4f..1e2fc644b29d 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.29.3"; + version = "1.29.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yMlU08htf79ZG8g7ANbs4on64XbIM1oYKnVwaZ2iv9w="; + hash = "sha256-dtKqF1ejC8ceAwfa4Yw3TjNqaRI+awRuIGqWYR+iozA="; }; nativeBuildInputs = [ @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python driver for PostgreSQL"; homepage = "https://github.com/tlocke/pg8000"; + changelog = "https://github.com/tlocke/pg8000#release-notes"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/pgcli/default.nix b/pkgs/development/python-modules/pgcli/default.nix index 0e193d4c5c69..ac291d7af7d5 100644 --- a/pkgs/development/python-modules/pgcli/default.nix +++ b/pkgs/development/python-modules/pgcli/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { sshtunnel ]; - checkInputs = [ pytestCheckHook mock ]; + nativeCheckInputs = [ pytestCheckHook mock ]; disabledTests = lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ]; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 8907cb456846..8c146474d94e 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "3.17"; + version = "4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-C2SWuX6Lt4R62rkNJ9qOoVK50j+TUkhoGUw+seWjTQw="; + hash = "sha256-JXgU2uoMhfqKlQOksbdYZtnJbs7UZKlTxZNo7OIGEig="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { --replace "--cov=pglast --cov-report term-missing" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pgpy/default.nix b/pkgs/development/python-modules/pgpy/default.nix index 336d077f2aad..fc9c0c656961 100644 --- a/pkgs/development/python-modules/pgpy/default.nix +++ b/pkgs/development/python-modules/pgpy/default.nix @@ -1,10 +1,8 @@ { lib , pythonOlder , fetchFromGitHub -, fetchpatch , buildPythonPackage -, six -, enum34 +, setuptools , pyasn1 , cryptography , pytestCheckHook @@ -12,49 +10,38 @@ buildPythonPackage rec { pname = "pgpy"; - version = "0.5.4"; + version = "0.6.0"; + + disabled = pythonOlder "3.6"; + + format = "pyproject"; src = fetchFromGitHub { owner = "SecurityInnovation"; repo = "PGPy"; rev = "v${version}"; - hash = "sha256-iuga6vZ7eOl/wNVuLnhDVeUPJPibGm8iiyTC4dOA7A4="; + hash = "sha256-47YiHNxmjyCOYHHUV3Zyhs3Att9HZtCXYfbN34ooTxU="; }; - patches = [ - # Fixes the issue in https://github.com/SecurityInnovation/PGPy/issues/402. - # by pulling in https://github.com/SecurityInnovation/PGPy/pull/403. - (fetchpatch { - name = "crytography-38-support.patch"; - url = "https://github.com/SecurityInnovation/PGPy/commit/d84597eb8417a482433ff51dc6b13060d4b2e686.patch"; - hash = "sha256-dviXCSGtPguROHVZ1bt/eEfpATjehm8jZ5BeVjxdb8U="; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ - six pyasn1 cryptography - ] ++ lib.optionals (pythonOlder "3.4") [ - enum34 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # assertions contains extra: IDEA has been deprecated - "test_encrypt_bad_cipher" - ]; - meta = with lib; { homepage = "https://github.com/SecurityInnovation/PGPy"; - description = "Pretty Good Privacy for Python 2 and 3"; + description = "Pretty Good Privacy for Python"; longDescription = '' - PGPy is a Python (2 and 3) library for implementing Pretty Good Privacy - into Python programs, conforming to the OpenPGP specification per RFC - 4880. + PGPy is a Python library for implementing Pretty Good Privacy into Python + programs, conforming to the OpenPGP specification per RFC 4880. ''; license = licenses.bsd3; maintainers = with maintainers; [ eadwu dotlambda ]; diff --git a/pkgs/development/python-modules/pgsanity/default.nix b/pkgs/development/python-modules/pgsanity/default.nix index 82d636979e10..4660461e91c1 100644 --- a/pkgs/development/python-modules/pgsanity/default.nix +++ b/pkgs/development/python-modules/pgsanity/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "de0bbd6fe4f98bf5139cb5f466eac2e2abaf5a7b050b9e4867b87bf360873173"; }; - checkInputs = [ unittestCheckHook postgresql ]; + nativeCheckInputs = [ unittestCheckHook postgresql ]; propagatedBuildInputs = [ postgresql ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index b2f28a189e12..1bb34132401f 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { psycopg ]; - checkInputs = [ + nativeCheckInputs = [ configobj pytestCheckHook ]; diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index a6dc63b8e3fe..adf507cb048b 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -20,18 +20,18 @@ buildPythonPackage rec { pname = "phik"; - version = "0.12.2"; + version = "0.12.3"; disabled = !isPy3k; format = "pyproject"; src = fetchFromGitHub { owner = "KaveIO"; repo = "PhiK"; - rev = "v${version}"; - hash = "sha256-nr3804MLIBPFw/PlJ9B8xKFFGI5LDp8m2gLtJB7YcEE="; + rev = "refs/tags/v${version}"; + hash = "sha256-9o3EDhgmne2J1QfzjjNQc1mUcyCzoVrCnWXqjWkiZU0="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook nbconvert jupyter diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index 38e5f8533eb3..2e8dcb85570b 100644 --- a/pkgs/development/python-modules/phonemizer/default.nix +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { }; postPatch = '' - sed -i '/pytest-runner/d setup.py + sed -i '/pytest-runner/d' setup.py ''; patches = [ @@ -33,7 +33,6 @@ buildPythonPackage rec { libespeak = "${lib.getLib espeak-ng}/lib/libespeak-ng${stdenv.hostPlatform.extensions.sharedLibrary}"; # FIXME package festival }) - ./remove-intertwined-festival-test.patch ]; propagatedBuildInputs = [ @@ -44,26 +43,9 @@ buildPythonPackage rec { typing-extensions ]; - preCheck = '' - export HOME=$TMPDIR - ''; - - checkInputs = [ - pytestCheckHook - ]; - - # We tried to package festvial, but were unable to get the backend running, + # We tried to package festival, but were unable to get the backend running, # so let's disable related tests. - disabledTestPaths = [ - "test/test_festival.py" - ]; - - disabledTests = [ - "test_festival" - "test_festival_path" - "test_readme_festival_syll" - "test_unicode" - ]; + doCheck = false; meta = with lib; { homepage = "https://github.com/bootphon/phonemizer"; diff --git a/pkgs/development/python-modules/phonemizer/remove-intertwined-festival-test.patch b/pkgs/development/python-modules/phonemizer/remove-intertwined-festival-test.patch deleted file mode 100644 index a0e0817bb72a..000000000000 --- a/pkgs/development/python-modules/phonemizer/remove-intertwined-festival-test.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff --git a/test/test_main.py b/test/test_main.py -index b8c53e9..8f8c6d2 100644 ---- a/test/test_main.py -+++ b/test/test_main.py -@@ -68,16 +68,11 @@ def test_readme(): - _test('hello world', 'həloʊ wɜːld ', '--verbose') - _test('hello world', 'həloʊ wɜːld ', '--quiet') - _test('hello world', 'hello world | həloʊ wɜːld ', '--prepend-text') -- _test('hello world', 'hhaxlow werld', '-b festival --strip') - _test('bonjour le monde', 'bɔ̃ʒuʁ lə mɔ̃d ', '-l fr-fr') - _test('bonjour le monde', 'b ɔ̃ ʒ u ʁ ;eword l ə ;eword m ɔ̃ d ;eword ', - '-l fr-fr -p " " -w ";eword "') - - --@pytest.mark.skipif( -- '2.1' in backend.FestivalBackend.version(), -- reason='festival-2.1 gives different results than further versions ' -- 'for syllable boundaries') - def test_readme_festival_syll(): - _test('hello world', - 'hh ax ;esyll l ow ;esyll ;eword w er l d ;esyll ;eword ', -diff --git a/test/test_phonemize.py b/test/test_phonemize.py -index d156c9e..2bbe371 100644 ---- a/test/test_phonemize.py -+++ b/test/test_phonemize.py -@@ -213,18 +213,6 @@ def test_segments(njobs): - ('segments', True, True, False, - ['achi acho?', '', 'achi acho'], - [u'ʌtʃɪ ʌtʃʊ?', '', u'ʌtʃɪ ʌtʃʊ ']), -- ('festival', False, False, False, -- ['hello world!', '', 'goodbye'], -- ['hhaxlow werld ', 'guhdbay ']), -- ('festival', False, True, False, -- ['hello world!', '', 'goodbye'], -- ['hhaxlow werld!', 'guhdbay ']), -- ('festival', True, False, False, -- ['hello world!', '', 'goodbye'], -- ['hhaxlow werld ', '', 'guhdbay ']), -- ('festival', True, True, False, -- ['hello world!', '', 'goodbye'], -- ['hhaxlow werld!', '', 'guhdbay ']), - ('espeak', False, False, True, - ['hello world!', '', 'goodbye'], - [('hello world!', 'həloʊ wɜːld '), ('goodbye', 'ɡʊdbaɪ ')]), -@@ -248,19 +236,7 @@ def test_segments(njobs): - [('achi acho?', u'ʌtʃɪ ʌtʃʊ '), ('', ''), ('achi acho', u'ʌtʃɪ ʌtʃʊ ')]), - ('segments', True, True, True, - ['achi acho?', '', 'achi acho'], -- [('achi acho?', u'ʌtʃɪ ʌtʃʊ?'), ('', ''), ('achi acho', u'ʌtʃɪ ʌtʃʊ ')]), -- ('festival', False, False, True, -- ['hello world!', '', 'goodbye'], -- [('hello world!', 'hhaxlow werld '), ('goodbye', 'guhdbay ')]), -- ('festival', False, True, True, -- ['hello world!', '', 'goodbye'], -- [('hello world!', 'hhaxlow werld!'), ('goodbye', 'guhdbay ')]), -- ('festival', True, False, True, -- ['hello world!', '', 'goodbye'], -- [('hello world!', 'hhaxlow werld '), ('', ''), ('goodbye', 'guhdbay ')]), -- ('festival', True, True, True, -- ['hello world!', '', 'goodbye'], -- [('hello world!', 'hhaxlow werld!'), ('', ''), ('goodbye', 'guhdbay ')])]) -+ [('achi acho?', u'ʌtʃɪ ʌtʃʊ?'), ('', ''), ('achi acho', u'ʌtʃɪ ʌtʃʊ ')])]) - def test_preserve_empty_lines(backend, empty_lines, punctuation, prepend_text, text, expected): - language = 'cree' if backend == 'segments' else 'en-us' - -@@ -278,11 +254,7 @@ def test_preserve_empty_lines(backend, empty_lines, punctuation, prepend_text, t - ('segments', False, False, [''], []), - ('segments', False, True, [''], []), - ('segments', True, False, [''], ['']), -- ('segments', True, True, [''], ['']), -- ('festival', False, False, [''], []), -- ('festival', False, True, [''], []), -- ('festival', True, False, [''], ['']), -- ('festival', True, True, [''], [''])]) -+ ('segments', True, True, [''], [''])]) - def test_empty_input(backend, empty_lines, punctuation, text, expected): - language = 'cree' if backend == 'segments' else 'en-us' - -diff --git a/test/test_punctuation.py b/test/test_punctuation.py -index b2206ac..62e31c1 100644 ---- a/test/test_punctuation.py -+++ b/test/test_punctuation.py -@@ -28,9 +28,6 @@ ESPEAK_150 = (EspeakBackend.version() >= (1, 50)) - # True if we are using espeak>=1.49.3 - ESPEAK_143 = (EspeakBackend.version() >= (1, 49, 3)) - --# True if we are using festival>=2.5 --FESTIVAL_25 = (FestivalBackend.version() >= (2, 5)) -- - - @pytest.mark.parametrize( - 'inp, out', [ -@@ -179,9 +176,7 @@ def test_issue_54(text): - ('espeak', 'default', ['! ?', 'hey!'], ['! ?', 'heɪ!']), - ('espeak', '!', ['! ?', 'hey!'], ['! ', 'heɪ!']), - ('segments', 'default', ['! ?', 'hey!'], ['! ?', 'heːj!']), -- ('segments', '!', ['! ?', 'hey!'], ValueError), -- ('festival', 'default', ['! ?', 'hey!'], ['! ?', 'hhey!']), -- ('festival', '!', ['! ?', 'hey!'], ['! ', 'hhey!'])]) -+ ('segments', '!', ['! ?', 'hey!'], ValueError)]) - def test_issue55(backend, marks, text, expected): - if marks == 'default': - marks = Punctuation.default_marks() diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index ff8265beac92..3d216dfd9796 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -7,17 +7,17 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.57"; + version = "8.13.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BX0ZZpYvuGs9xEe/rCyOJc7td0UJ5JsYCSahOpmRAxg="; + hash = "sha256-fQxFwVQBOXC3i4b0GI4OAKjnfWvr73yB79wDjbh27ro="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index a4fbeb81e365..6345c3848f64 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.16.3"; + version = "2.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xTbTVRVmJvJuXV/RWLA+EMShPEYdagKiawXjtjEbnXk="; + hash = "sha256-t+1i1S8UVd0s9/Fda0H2kaouDDBVS+x6G40Meb2rLYc="; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { spglib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Modulefor phonon calculations at harmonic and quasi-harmonic levels"; homepage = "https://phonopy.github.io/phonopy/"; + changelog = "https://github.com/phonopy/phonopy/blob/v${version}/doc/changelog.md"; license = licenses.bsd0; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/phx-class-registry/default.nix b/pkgs/development/python-modules/phx-class-registry/default.nix index 0cb94be921db..742648026ada 100644 --- a/pkgs/development/python-modules/phx-class-registry/default.nix +++ b/pkgs/development/python-modules/phx-class-registry/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0gpvq4a6qrr2iki6b4vxarjr1jrsw560m2qzm5bb43ix8c8b7y3q"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pi1wire/default.nix b/pkgs/development/python-modules/pi1wire/default.nix index faaaec0caa1c..6d3debdcaa2f 100644 --- a/pkgs/development/python-modules/pi1wire/default.nix +++ b/pkgs/development/python-modules/pi1wire/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-l/5w71QsAW4BvILOaLdUVvQ8xxUm1ZTzUESRFzUgtic="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/piano-transcription-inference/default.nix b/pkgs/development/python-modules/piano-transcription-inference/default.nix new file mode 100644 index 000000000000..272f3f6810bf --- /dev/null +++ b/pkgs/development/python-modules/piano-transcription-inference/default.nix @@ -0,0 +1,75 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, fetchurl +, librosa +, matplotlib +, mido +, torch +, torchlibrosa +}: + +buildPythonPackage rec { + pname = "piano-transcription-inference"; + version = "0.0.5"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-nbhuSkXuWrekFxwdNHaspuag+3K1cKwq90IpATBpWPY="; + }; + + checkpoint = fetchurl { + name = "piano-transcription-inference.pth"; + # The download url can be found in + # https://github.com/qiuqiangkong/piano_transcription_inference/blob/master/piano_transcription_inference/inference.py + url = "https://zenodo.org/record/4034264/files/CRNN_note_F1%3D0.9677_pedal_F1%3D0.9186.pth?download=1"; + hash = "sha256-w/qXMHJb9Kdi8cFLyAzVmG6s2gGwJvWkolJc1geHYUE="; + }; + + propagatedBuildInputs = [ + librosa + matplotlib + mido + torch + torchlibrosa + ]; + + patches = [ + # Fix run against librosa 0.9.0 + # https://github.com/qiuqiangkong/piano_transcription_inference/pull/10 + (fetchpatch { + url = "https://github.com/qiuqiangkong/piano_transcription_inference/commit/b2d448916be771cd228f709c23c474942008e3e8.patch"; + hash = "sha256-8O4VtFij//k3fhcbMRz4J8Iz4AdOPLkuk3UTxuCSy8U="; + }) + ]; + + postPatch = '' + substituteInPlace piano_transcription_inference/inference.py --replace \ + "checkpoint_path='{}/piano_transcription_inference_data/note_F1=0.9677_pedal_F1=0.9186.pth'.format(str(Path.home()))" \ + "checkpoint_path='$out/share/checkpoint.pth'" + ''; + + postInstall = '' + mkdir "$out/share" + ln -s "${checkpoint}" "$out/share/checkpoint.pth" + ''; + + # Project has no tests. + # In order to make pythonImportsCheck work, NUMBA_CACHE_DIR env var need to + # be set to a writable dir (https://github.com/numba/numba/issues/4032#issuecomment-488102702). + # pythonImportsCheck has no pre* hook, use checkPhase to wordaround that. + checkPhase = '' + export NUMBA_CACHE_DIR="$(mktemp -d)" + ''; + pythonImportsCheck = [ "piano_transcription_inference" ]; + + meta = with lib; { + description = "A piano transcription inference package"; + homepage = "https://github.com/qiuqiangkong/piano_transcription_inference"; + license = licenses.mit; + maintainers = with maintainers; [ azuwis ]; + }; +} diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix index d041ecc3ec70..f9a68d98dc31 100644 --- a/pkgs/development/python-modules/piccata/default.nix +++ b/pkgs/development/python-modules/piccata/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0pn842jcf2czjks5dphivgp1s7wiifqiv93s0a89h0wxafd6pbsr"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/piccolo-theme/default.nix b/pkgs/development/python-modules/piccolo-theme/default.nix index 8f04d0ce00dc..4a0e3bf0f98b 100644 --- a/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/pkgs/development/python-modules/piccolo-theme/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "piccolo-theme"; - version = "0.12.0"; + version = "0.14.0"; src = fetchPypi { pname = "piccolo_theme"; inherit version; - sha256 = "sha256-o6uaqAo/Nb28doByq40XakKJpA4o6/Z/PzMhmb058FE="; + sha256 = "sha256-PGPf05TQfC6Somn2PR07Y2qiOuyg+37U1l16m2LKykU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pick/default.nix b/pkgs/development/python-modules/pick/default.nix index 3b3d723f7fce..9292ffd76fdf 100644 --- a/pkgs/development/python-modules/pick/default.nix +++ b/pkgs/development/python-modules/pick/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pick"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,14 +17,14 @@ buildPythonPackage rec { owner = "wong2"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-rpUcWMVshlAhprvySqJJjVXpq92ITuhlV+DNwTXSfMc="; + hash = "sha256-Py+D03bXnVsIwvYwjl0IMeH33ZPJW5TuJ3tU79MMsCw="; }; nativeBuildInputs = [ poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to create curses-based interactive selection list in the terminal"; homepage = "https://github.com/wong2/pick"; + changelog = "https://github.com/wong2/pick/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/picobox/default.nix b/pkgs/development/python-modules/picobox/default.nix index 6094b65efaac..de0bdb14725b 100644 --- a/pkgs/development/python-modules/picobox/default.nix +++ b/pkgs/development/python-modules/picobox/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ flask pytestCheckHook ]; diff --git a/pkgs/development/python-modules/picos/default.nix b/pkgs/development/python-modules/picos/default.nix index a6f1aa1a141d..a5af53c1b8cc 100644 --- a/pkgs/development/python-modules/picos/default.nix +++ b/pkgs/development/python-modules/picos/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; # Needed only for the tests - checkInputs = [ + nativeCheckInputs = [ networkx ]; diff --git a/pkgs/development/python-modules/piep/default.nix b/pkgs/development/python-modules/piep/default.nix index 8db4f09a9249..196619f525fe 100644 --- a/pkgs/development/python-modules/piep/default.nix +++ b/pkgs/development/python-modules/piep/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pygments ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = with lib; { description = "Bringing the power of python to stream editing"; diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix index 440df36384c9..329989232fa4 100644 --- a/pkgs/development/python-modules/piexif/default.nix +++ b/pkgs/development/python-modules/piexif/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ]; # Pillow needed for unit tests - checkInputs = [ pillow ]; + nativeCheckInputs = [ pillow ]; meta = with lib; { description = "Simplify Exif manipulations with Python"; diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index 1d4f48913185..3ac0b61fc362 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ gevent tornado twisted ]; - checkInputs = [ nose2 mock ]; + nativeCheckInputs = [ nose2 mock ]; postPatch = '' # don't stop at first test failure diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 97ada3b69928..89a51051d696 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "6.2.4"; + version = "6.2.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-YSzwcrWhqyKjdydwodf57S+HIGaKE124umJPtJKiM5g="; + hash = "sha256-Obsg5fsTv/7uiFRbzGp90+d90e2dX7CWMMRMgiQvNyc="; }; patches = [ @@ -66,7 +66,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ attrs hypothesis pytest-xdist diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix index 49a070006671..edf2d7eac27b 100644 --- a/pkgs/development/python-modules/pilkit/default.nix +++ b/pkgs/development/python-modules/pilkit/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pillow ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix index b39a86a7fbfc..f16ef4465562 100644 --- a/pkgs/development/python-modules/pillow-simd/default.nix +++ b/pkgs/development/python-modules/pillow-simd/default.nix @@ -9,6 +9,8 @@ import ../pillow/generic.nix (rec { # check for release version on https://pypi.org/project/Pillow-SIMD/#history # does not match the latest pillow release version! version = "9.0.0.post1"; + format = "setuptools"; + disabled = !isPy3k; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 6e50be53f99d..05fe40802c5d 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -12,14 +12,15 @@ import ./generic.nix (rec { pname = "pillow"; - version = "9.2.0"; + version = "9.3.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Pillow"; inherit version; - sha256 = "sha256-deY2/T4PuHJpPyPMuKX/LNV4gBJR86T2hUxqXUN9PAQ="; + hash = "sha256-yTWiKlV6VgEI14D5oPxCbddFmUDcVPqknYMknI0+dg8="; }; passthru.tests = { diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix index 54f730751076..95ecce0522c3 100644 --- a/pkgs/development/python-modules/pillow/generic.nix +++ b/pkgs/development/python-modules/pillow/generic.nix @@ -11,7 +11,7 @@ with args; buildPythonPackage rec { - inherit pname version src meta passthru patches; + inherit pname version format src meta passthru patches; # Disable imagefont tests, because they don't work well with infinality: # https://github.com/python-pillow/Pillow/issues/1259 @@ -19,24 +19,25 @@ buildPythonPackage rec { rm Tests/test_imagefont.py ''; - # Disable darwin tests which require executables: `iconutil` and `screencapture` - disabledTests = lib.optionals stdenv.isDarwin [ - "test_grab" - "test_grabclipboard" - "test_save" + disabledTests = [ + # Code quality mismathch 9 vs 10 + "test_pyroma" # pillow-simd "test_roundtrip" "test_basic" - ] ++ lib.optionals (lib.versions.major version == "6") [ - # RuntimeError: Error setting from dictionary "test_custom_metadata" + ] ++ lib.optionals stdenv.isDarwin [ + # Disable darwin tests which require executables: `iconutil` and `screencapture` + "test_grab" + "test_grabclipboard" + "test_save" ]; propagatedBuildInputs = [ olefile ] ++ lib.optionals (lib.versionAtLeast version "8.2.0") [ defusedxml ]; - checkInputs = [ pytestCheckHook pyroma numpy ]; + nativeCheckInputs = [ pytestCheckHook pyroma numpy ]; buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp libxcrypt tcl lcms2 ] ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ] diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index 879e25f77418..19052eb49342 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook scikitimage ]; diff --git a/pkgs/development/python-modules/pint-pandas/default.nix b/pkgs/development/python-modules/pint-pandas/default.nix index fafe0b11173e..d2f5f66c0b3f 100644 --- a/pkgs/development/python-modules/pint-pandas/default.nix +++ b/pkgs/development/python-modules/pint-pandas/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pandas ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index b4e68c190946..67f4dd004ab7 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pint"; - version = "0.19.2"; + version = "0.20.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "Pint"; - sha256 = "sha256-4dSYn/UQs3ja1k+RcR572r5cp411sGoYVprEVGeMS68="; + sha256 = "sha256-OHzwQHjcff5KcIAzuq1Uq2HYKrBsTuPUkiseRdViYGc="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-subtests numpy diff --git a/pkgs/development/python-modules/pip-api/default.nix b/pkgs/development/python-modules/pip-api/default.nix index fe7cc3ef7163..48edbf2480dc 100644 --- a/pkgs/development/python-modules/pip-api/default.nix +++ b/pkgs/development/python-modules/pip-api/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pip ]; - checkInputs = [ + nativeCheckInputs = [ pretend pytestCheckHook virtualenv diff --git a/pkgs/development/python-modules/pip-requirements-parser/default.nix b/pkgs/development/python-modules/pip-requirements-parser/default.nix index 0693fbf4fde8..51af23fdc5cc 100644 --- a/pkgs/development/python-modules/pip-requirements-parser/default.nix +++ b/pkgs/development/python-modules/pip-requirements-parser/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pip-requirements-parser"; - version = "31.2.0"; + version = "32.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "nexB"; repo = pname; rev = "v${version}"; - hash = "sha256-i4hw3tS4i2ek2JzcDiGo5aFFJ9J2JJ9MB5vxDhOilb0="; + hash = "sha256-Wu4C93PWujygKIzXqUjCmKWcllr+hkuvnqDuw6/D9Do="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -33,7 +33,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to parse pip requirements"; homepage = "https://github.com/nexB/pip-requirements-parser"; + changelog = "https://github.com/nexB/pip-requirements-parser/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 2486a77dd771..8657f4d28e79 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.8.0"; - format = "setuptools"; + version = "6.12.2"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Oeiu5GVEbgInjYDb69QyXR3YYzJI9DITxzol9Y59ilU="; + hash = "sha256-i5A2lt9FmLENRpAm75mVxfmodLQW6I56IUiE6+SnAkU="; }; patches = [ ./fix-setup-py-bad-syntax-detection.patch ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { wheel ]; - checkInputs = [ + nativeCheckInputs = [ pytest-xdist pytestCheckHook ]; @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Keeps your pinned dependencies fresh"; homepage = "https://github.com/jazzband/pip-tools/"; + changelog = "https://github.com/jazzband/pip-tools/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 1287ec7017e3..0c2444870082 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -14,24 +14,30 @@ buildPythonPackage rec { pname = "pip"; - version = "22.2.2"; + version = "22.3.1"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; - rev = version; - sha256 = "sha256-SLjmxFUFmvgy8E8kxfc6lxxCRo+GN4L77pqkWkRR8aE="; + rev = "refs/tags/${version}"; + hash = "sha256-mrfd3VWqb4SgSjBJAxBhYegABdJa7pVXL7wA5uZtF/A="; name = "${pname}-${version}-source"; }; nativeBuildInputs = [ bootstrapped-pip ]; + postPatch = '' + # Remove vendored Windows PE binaries + # Note: These are unused but make the package unreproducible. + find -type f -name '*.exe' -delete + ''; + # pip detects that we already have bootstrapped_pip "installed", so we need # to force it a little. pipInstallFlags = [ "--ignore-installed" ]; - checkInputs = [ mock scripttest virtualenv pretend pytest ]; + nativeCheckInputs = [ mock scripttest virtualenv pretend pytest ]; # Pip wants pytest, but tests are not distributed doCheck = false; diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 0132ff4db345..186e468e0491 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ diff-cover pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index 7cbbb859e0ae..7e6998175af2 100644 --- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -3,13 +3,14 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder -, poetry +, poetry-core +, tomlkit , typer , setuptools }: buildPythonPackage rec { - version = "0.2.1"; + version = "0.3.1"; pname = "pipenv-poetry-migrate"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,23 +19,24 @@ buildPythonPackage rec { owner = "yhino"; repo = "pipenv-poetry-migrate"; rev = "refs/tags/v${version}"; - hash = "sha256-aP8bzWFUzAZrEsz8pYL2y5c7GaUjWG5GA+cc4/tGPZk="; + hash = "sha256-HYzKp7ZYvJZX2CiHmR8wIeuL2a1xdk0Y87HLs9EP2tM="; }; - nativeBuildInputs = [ - setuptools + nativeBuildInputs = [ + poetry-core ]; propagatedBuildInputs = [ - poetry + setuptools # for pkg_resources + tomlkit typer ]; postPatch = '' - substituteInPlace pyproject.toml --replace 'typer = "^0.4.0"' 'typer = ">=0.4"' + substituteInPlace pyproject.toml --replace 'typer = "^0.4.0"' 'typer = ">=0.4"' ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index 955b2d8a7d65..cf0af0d1decf 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pixcat/default.nix b/pkgs/development/python-modules/pixcat/default.nix index 026685cd6341..90fdae5dcf03 100644 --- a/pkgs/development/python-modules/pixcat/default.nix +++ b/pkgs/development/python-modules/pixcat/default.nix @@ -5,7 +5,6 @@ , docopt , pillow , requests -, dataclasses , pythonOlder }: @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "pixcat"; version = "0.1.4"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pixelmatch/default.nix b/pkgs/development/python-modules/pixelmatch/default.nix index e09f0b32ff20..c0187f4838f7 100644 --- a/pkgs/development/python-modules/pixelmatch/default.nix +++ b/pkgs/development/python-modules/pixelmatch/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pillow pytest-benchmark pytest-mypy diff --git a/pkgs/development/python-modules/pkce/default.nix b/pkgs/development/python-modules/pkce/default.nix index 5dc77a2661ba..38a0058be4e6 100644 --- a/pkgs/development/python-modules/pkce/default.nix +++ b/pkgs/development/python-modules/pkce/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-dOHCu0pDXk9LM4Yobaz8GAfVpBd8rXlty+Wfhx+WPME="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pkce" ]; diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index 6721390d7abb..91f8db998a1c 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pkgconfig" ]; diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index b3f4f1d450bf..e095248ac07b 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -6,15 +6,15 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.8.3"; + version = "1.9.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qE2kMY3Yb4cKlEeoyYNAqgYha/xvK3vcS4dmmErhhnw="; + sha256 = "sha256-rAPjfk1gGq7kD4CH9j/EoqbJgU3aLI+mqrGxgpZTvfo="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pkginfo2/default.nix b/pkgs/development/python-modules/pkginfo2/default.nix index 25b9b053748a..08eee37498bb 100644 --- a/pkgs/development/python-modules/pkginfo2/default.nix +++ b/pkgs/development/python-modules/pkginfo2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-E9EyaN3ncf/34vvvhRe0rwV28VrjqJo79YFgXq2lKWU="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pkutils/default.nix b/pkgs/development/python-modules/pkutils/default.nix index c4baa649cf94..6ca68dbe6245 100644 --- a/pkgs/development/python-modules/pkutils/default.nix +++ b/pkgs/development/python-modules/pkutils/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { semver ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index bb99badfb948..51f96c24ab58 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "11.1.0"; + version = "11.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-TgSdhBcXxV8bNeKb1v8WVBRknm9qi6iRjWxdW5JZeew="; + hash = "sha256-5IHFChiIm/6x3xr+F+RIAZ3kDYQsXs+baFqUasjI8qs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plantuml-markdown/default.nix b/pkgs/development/python-modules/plantuml-markdown/default.nix index 25b56e2a4254..3c2d4bd7495c 100644 --- a/pkgs/development/python-modules/plantuml-markdown/default.nix +++ b/pkgs/development/python-modules/plantuml-markdown/default.nix @@ -11,7 +11,7 @@ }: let pname = "plantuml-markdown"; - version = "3.6.3"; + version = "3.8.0"; in buildPythonPackage { inherit pname version; @@ -20,7 +20,7 @@ buildPythonPackage { owner = "mikitex70"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-y5Z7mjx2+DW8DwSSyy3tLn11rB7daQyyjsoY/QoI6mc="; + sha256 = "sha256-6zGE3j+AfS5r3dj+4mfT4juxKUODEOgGlnn3wtvPcEk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 84a85de82057..ad1fa2d68fd1 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ plaster pastedeploy ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "PasteDeploy binding to the plaster configuration loader"; diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix index 749ffdb7f321..40362c65db9f 100644 --- a/pkgs/development/python-modules/plaster/default.nix +++ b/pkgs/development/python-modules/plaster/default.nix @@ -4,16 +4,16 @@ buildPythonPackage rec { pname = "plaster"; - version = "1.0"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "8351c7c7efdf33084c1de88dd0f422cbe7342534537b553c49b857b12d98c8c3"; + sha256 = "sha256-+L78VL+MEUfBCrQCl+yEwmdvotTqXW9STZQ2qAB075g="; }; checkPhase = '' py.test ''; - checkInputs = [ pytest pytest-cov ]; + nativeCheckInputs = [ pytest pytest-cov ]; } diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index e04b40bc1e44..db4810513dee 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -2,16 +2,16 @@ , appdirs , buildPythonPackage , fetchFromGitHub +, hatch-vcs +, hatchling , pytest-mock , pytestCheckHook , pythonOlder -, hatchling -, hatch-vcs }: buildPythonPackage rec { pname = "platformdirs"; - version = "2.5.2"; + version = "2.6.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "sha256-c7gGgqOUVYA6wYU4+nQsYYw4Gn+DpMoIq2nP8nEdPcg="; + rev = "refs/tags/${version}"; + hash = "sha256-yGpDAwn8Kt6vF2K2zbAs8+fowhYQmvsm/87WJofuhME="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -30,7 +30,7 @@ buildPythonPackage rec { hatch-vcs ]; - checkInputs = [ + nativeCheckInputs = [ appdirs pytest-mock pytestCheckHook @@ -41,8 +41,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Python module for determining appropriate platform-specific directories"; + description = "Module for determining appropriate platform-specific directories"; homepage = "https://platformdirs.readthedocs.io/"; + changelog = "https://github.com/platformdirs/platformdirs/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 66a249a3d351..e57655c2227c 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -193,6 +193,8 @@ buildPythonPackage rec { ln -s ${driver} $out/${python.sitePackages}/playwright/driver ''; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + # Skip tests because they require network access. doCheck = false; diff --git a/pkgs/development/python-modules/pleroma-bot/default.nix b/pkgs/development/python-modules/pleroma-bot/default.nix index ed586a4474b8..65dd403c21da 100644 --- a/pkgs/development/python-modules/pleroma-bot/default.nix +++ b/pkgs/development/python-modules/pleroma-bot/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 9db6d8afb9a2..88f3fb89a81f 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.13.1"; + version = "4.13.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - hash = "sha256-py3UmKie96FR8klf97zsYxUkrQisO7/cnWUgKxgB+tQ="; + hash = "sha256-5YwINPgQ4efZBvu5McsLYicW/7keKSi011lthJUR9zw="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for the Plex API"; homepage = "https://github.com/pkkid/python-plexapi"; + changelog = "https://github.com/pkkid/python-plexapi/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ colemickens ]; }; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index f150945a37cb..05e7e15a0086 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.10.0"; + version = "5.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TTbZhZt6FTsnNWLe7tjCklh6Ry6x/VfNQVjsidne+ts="; + sha256 = "sha256-Tv70ecLsHYbc2shAW2ynDKZWSad0COOafoSh6i22x4c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index 9e0b1c817613..717f530ef16d 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -1,32 +1,42 @@ { lib -, fetchPypi -, buildPythonPackage -, matplotlib -, scipy -, patsy -, pandas -, statsmodels -, pytestCheckHook -, geopandas -, scikit-misc , adjusttext -, mizani }: +, buildPythonPackage +, fetchPypi +, geopandas +, matplotlib +, mizani +, pandas +, patsy +, pytestCheckHook +, pythonOlder +, scikit-misc +, scipy +, setuptools-scm +, statsmodels +}: buildPythonPackage rec { pname = "plotnine"; - version = "0.9.0"; + version = "0.10.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DompMBXzxx1oRKx6qfsNoJuQj199+n3V1opcoysuvOo="; + hash = "sha256-2RKgS2ONz4IsUaZ4i4VmQjI0jVFfFR2zpkwAAZZvaEE="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace " --cov=plotnine --cov-report=xml" "" ''; - buildInputs = [ + propagatedBuildInputs = [ matplotlib mizani pandas @@ -35,7 +45,7 @@ buildPythonPackage rec { statsmodels ]; - checkInputs = [ + nativeCheckInputs = [ adjusttext geopandas pytestCheckHook @@ -69,7 +79,8 @@ buildPythonPackage rec { meta = with lib; { description = "Grammar of graphics for python"; - homepage = "https://plotnine.readthedocs.io/en/stable"; + homepage = "https://plotnine.readthedocs.io/"; + changelog = "https://github.com/has2k1/plotnine/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix index b8df04a1b32f..f90b4b415300 100644 --- a/pkgs/development/python-modules/pluginbase/default.nix +++ b/pkgs/development/python-modules/pluginbase/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "ff6c33a98fce232e9c73841d787a643de574937069f0d18147028d70d7dee287"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' cd tests diff --git a/pkgs/development/python-modules/plugincode/default.nix b/pkgs/development/python-modules/plugincode/default.nix index e3265ec5b34d..831109f8e48a 100644 --- a/pkgs/development/python-modules/plugincode/default.nix +++ b/pkgs/development/python-modules/plugincode/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pluggy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist ]; diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 303c43697453..338c18967876 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.26.0"; + version = "0.27.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-WDjZZFl64tYZ7cy7xcLEX2/87TJSOw71QSro6cgE98s="; + hash = "sha256-qEAXyWa5OjTpF4foi0ljHKbemIEHORPGE6vIVL57BOU="; }; propagatedBuildInputs = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { semver ]; - checkInputs = [ + nativeCheckInputs = [ freezegun jsonpickle mypy @@ -63,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for Plugwise Smiles, Stretch and USB stick"; homepage = "https://github.com/plugwise/python-plugwise"; + changelog = "https://github.com/plugwise/python-plugwise/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/plum-py/default.nix b/pkgs/development/python-modules/plum-py/default.nix index 50a33266c8fa..d1ef4c9caa3e 100644 --- a/pkgs/development/python-modules/plum-py/default.nix +++ b/pkgs/development/python-modules/plum-py/default.nix @@ -2,22 +2,19 @@ buildPythonPackage rec { pname = "plum-py"; - version = "0.4.0"; + version = "0.8.5"; disabled = !isPy3k; src = fetchFromGitLab { owner = "dangass"; repo = "plum"; - rev = "6a9ff863c0e9fa21f7b2230d25402155a5522e4b"; - sha256 = "1iv62yb704c61b0dvsmyp3j6xpbmay532g9ny4pw4zbg3l69vd5j"; + rev = version; + sha256 = "sha256-jCZUNT1HpSr0khHsjnxEzN2LCzcDV6W27PjVkwFJHUg="; }; - postPatch = '' - substituteInPlace src/plum/int/flag/_flag.py \ - --replace 'if sys.version_info < (3, 7):' 'if True:' - ''; + pythonImportsCheck = [ "plum" ]; - checkInputs = [ pytest baseline ]; + nativeCheckInputs = [ pytest baseline ]; checkPhase = "pytest tests"; meta = with lib; { diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index 70b4421778f3..2fe218080ce6 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -12,18 +12,18 @@ buildPythonPackage rec { pname = "plumbum"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "tomerfiliba"; repo = "plumbum"; - rev = "v${version}"; - sha256 = "sha256-bCCcNFz+ZsbKSF7aCfy47lBHb873tDYN0qFuSCxJp1w="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-SqZO9qYOtBB+KWP0DLsImI64QTTpYKzWMYwSua9k2S0="; }; postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov-config=setup.cfg" "" + substituteInPlace pyproject.toml \ + --replace '"--cov-config=setup.cfg", ' "" ''; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -32,7 +32,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ openssh ps psutil @@ -61,6 +61,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/tomerfiliba/plumbum/releases/tag/v${version}"; description = " Plumbum: Shell Combinators "; homepage = " https://github.com/tomerfiliba/plumbum "; license = licenses.mit; diff --git a/pkgs/development/python-modules/plux/default.nix b/pkgs/development/python-modules/plux/default.nix index 70ba8d6b28f0..ec235c7b99b3 100644 --- a/pkgs/development/python-modules/plux/default.nix +++ b/pkgs/development/python-modules/plux/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { stevedore ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/plyer/default.nix b/pkgs/development/python-modules/plyer/default.nix index c39595c5bd0b..3bf0739ebaed 100644 --- a/pkgs/development/python-modules/plyer/default.nix +++ b/pkgs/development/python-modules/plyer/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ keyring ]; - checkInputs = [ mock pytestCheckHook ]; + nativeCheckInputs = [ mock pytestCheckHook ]; pytestFlagsArray = [ "plyer/tests" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index d47805bb643f..09a1c31297b7 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plyvel"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "4ea98bea04ebf0f44747bacdfafefc8827787106fbb787f0aedc46482b2dfd53"; + sha256 = "sha256-zZGOCzFpCrzT0gKodCyvlRqy/hVz3nr3HDhFaEf5ICs="; }; buildInputs = [ pkgs.leveldb ] ++ lib.optional isPy3k pytest; diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/pkgs/development/python-modules/podcastparser/default.nix index c65a37a99b9d..31472409ee71 100644 --- a/pkgs/development/python-modules/podcastparser/default.nix +++ b/pkgs/development/python-modules/podcastparser/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1s83iq0mxcikxv6gi003iyavl1ai3siw1d7arijh0g28l0fff23a"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests test_*.py diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index e90529dac6d0..82438a695457 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.3.2"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,14 +24,14 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - hash = "sha256-3Ryfq0MwrL/mKP8DmkhLOyFlulf3c73z9fFIzMuqOrg="; + hash = "sha256-SCzs2v0LIgx3vBYTavPqc7uwAQdWsdmkbDyHgIjOxrk="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ build git pep517 @@ -58,6 +58,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/python-poetry/poetry-core/blob/${src.rev}/CHANGELOG.md"; description = "Core utilities for Poetry"; homepage = "https://github.com/python-poetry/poetry-core/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index 00baeef1185b..7692ab2fceed 100644 --- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -5,6 +5,7 @@ , jinja2 , markupsafe , poetry-core +, poetry , pytestCheckHook , pythonOlder , tomlkit @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "poetry-dynamic-versioning"; - version = "0.18.0"; + version = "0.21.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UO2D80cZurfPCtDXAEQ4nOJdhNtIghLtZN7gL+9xbGc="; + hash = "sha256-LdcjzfOiKar0BCdU7W+N5adErdk/NOUf+FzeaMlfn3w="; }; nativeBuildInputs = [ @@ -35,14 +36,20 @@ buildPythonPackage rec { tomlkit ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook + poetry ]; + # virtualenv: error: argument dest: the destination . is not write-able at / + doCheck = false; + disabledTests = [ # these require .git, but leaveDotGit = true doesn't help "test__get_version__defaults" "test__get_version__format_jinja" + # these expect to be able to run the poetry cli which fails in test hook + "test_integration" ]; pythonImportsCheck = [ @@ -52,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Plugin for Poetry to enable dynamic versioning based on VCS tags"; homepage = "https://github.com/mtkennerly/poetry-dynamic-versioning"; + changelog = "https://github.com/mtkennerly/poetry-dynamic-versioning/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; }; diff --git a/pkgs/development/python-modules/poetry-plugin-export/default.nix b/pkgs/development/python-modules/poetry-plugin-export/default.nix index bbf6013e4fd3..8711a4a527d0 100644 --- a/pkgs/development/python-modules/poetry-plugin-export/default.nix +++ b/pkgs/development/python-modules/poetry-plugin-export/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "poetry-plugin-export"; - version = "1.1.2"; + version = "1.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-+BDBQwYaiddq3OQDHKmLap3ehWJe+Gh5D3TwuNXycjg="; + hash = "sha256-xrAGjHFYRT6n+r/16b0xyoI7+1Q1Hsw3lEK92UabIqo="; }; postPatch = '' @@ -29,6 +29,7 @@ buildPythonPackage rec { pythonImportsCheck = []; meta = with lib; { + changelog = "https://github.com/python-poetry/poetry-plugin-export/blob/${src.rev}/CHANGELOG.md"; description = "Poetry plugin to export the dependencies to various formats"; license = licenses.mit; homepage = "https://github.com/python-poetry/poetry-plugin-export"; diff --git a/pkgs/development/python-modules/poetry-semver/default.nix b/pkgs/development/python-modules/poetry-semver/default.nix index 2318a2cf60be..1e144bf36cf3 100644 --- a/pkgs/development/python-modules/poetry-semver/default.nix +++ b/pkgs/development/python-modules/poetry-semver/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-2Am2Eqons5vy0PydMbT0gJsOlyZGxfGc+kbHJbdjiBA="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "A semantic versioning library for Python."; diff --git a/pkgs/development/python-modules/polarizationsolver/default.nix b/pkgs/development/python-modules/polarizationsolver/default.nix index c4710f6901ed..c8f47db63287 100644 --- a/pkgs/development/python-modules/polarizationsolver/default.nix +++ b/pkgs/development/python-modules/polarizationsolver/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ fields ]; + nativeCheckInputs = [ fields ]; pythonImportsCheck = [ "polarizationsolver" ]; diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index dd9dbc114b23..f265e24fe4ef 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -5,13 +5,14 @@ , rustPlatform , libiconv , fetchzip +, typing-extensions }: let pname = "polars"; - version = "0.13.19"; + version = "0.15.13"; rootSource = fetchzip { - url = "https://github.com/pola-rs/${pname}/archive/refs/tags/py-polars-v${version}.tar.gz"; - sha256 = "sha256-JOHjxTTPzS9Dd/ODp4r0ebU9hEonxrbjURJoq0BQCyI="; + url = "https://github.com/pola-rs/${pname}/archive/refs/tags/py-${version}.tar.gz"; + sha256 = "sha256-bk2opNLN3L+fkzXVfUU5O37UmA27ijmnAElCHjsuI+o="; }; in buildPythonPackage { @@ -19,8 +20,13 @@ buildPythonPackage { format = "pyproject"; disabled = pythonOlder "3.6"; src = rootSource; + + # Cargo.lock files is sometimes behind actual release which throws an error, + # thus the `sed` command + # Make sure to check that the right substitutions are made when updating the package preBuild = '' cd py-polars + sed -i 's/version = "0.15.11"/version = "${version}"/g' Cargo.lock ''; cargoDeps = rustPlatform.fetchCargoTarball { @@ -29,16 +35,21 @@ buildPythonPackage { cd py-polars ''; name = "${pname}-${version}"; - sha256 = "sha256-KEt8lITY4El2afuh2cxnrDkXGN3MZgfKQU3Pe2jECF0="; + sha256 = "sha256-u7ascftUPz8K+gWwjjxdXXFJf++M+8P9QE/KVJkO5DM="; }; cargoRoot = "py-polars"; + # Revisit this whenever package or Rust is upgraded + RUSTC_BOOTSTRAP = 1; + + propagatedBuildInputs = if pythonOlder "3.10" then [ typing-extensions ] else []; + nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; pythonImportsCheck = [ "polars" ]; - # checkInputs = [ + # nativeCheckInputs = [ # pytestCheckHook # fixtures # graphviz @@ -49,36 +60,7 @@ buildPythonPackage { # ]; meta = with lib; { - # Adding cmake to nativeBuildInputs and using `dontUseCmakeConfigure = true;` - # The following error still happens - - # Compiling arrow2 v0.10.1 (https://github.com/ritchie46/arrow2?branch=polars#da703ae3) - # error[E0554]: `#![feature]` may not be used on the stable release channel - # --> /build/polars-0.13.19-vendor.tar.gz/arrow2/src/lib.rs:8:39 - # | - # 8 | #![cfg_attr(feature = "simd", feature(portable_simd))] - # | ^^^^^^^^^^^^^ - # error: aborting due to previous error - # For more information about this error, try `rustc --explain E0554`. - # error: could not compile `arrow2` due to 2 previous errors - # warning: build failed, waiting for other jobs to finish... - # maturin failed - # Caused by: Failed to build a native library through cargo - # Caused by: Cargo build finished with "exit status: 101": `cargo rustc --message-format json --manifest-path Cargo.toml -j 8 --frozen --target x86_64-unknown-linux-gnu --release --lib -- -C link-arg=-s` - # error: builder for '/nix/store/qfnqi5hs3x4xdb6d4f6rpaf63n1w74yn-python3.10-polars-0.13.19.drv' failed with exit code 1; - # last 10 log lines: - # > error: aborting due to previous error - # > - # > - # > For more information about this error, try `rustc --explain E0554`. - # > - # > error: could not compile `arrow2` due to 2 previous errors - # > warning: build failed, waiting for other jobs to finish... - # > maturin failed - # > Caused by: Failed to build a native library through cargo - # > Caused by: Cargo build finished with "exit status: 101": `cargo rustc --message-format json --manifest-path Cargo.toml -j 8 --frozen --target x86_64-unknown-linux-gnu --release --lib -- -C link-arg=-s` - # For full logs, run 'nix log /nix/store/qfnqi5hs3x4xdb6d4f6rpaf63n1w74yn-python3.10-polars-0.13.19.drv'. - broken = true; + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Fast multi-threaded DataFrame library in Rust | Python | Node.js "; homepage = "https://github.com/pola-rs/polars"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index b1aac2f1e174..ea98a6679275 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { schema ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/polyline/default.nix b/pkgs/development/python-modules/polyline/default.nix index f1dcd699527a..249512cedb26 100644 --- a/pkgs/development/python-modules/polyline/default.nix +++ b/pkgs/development/python-modules/polyline/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six ]; - checkInputs = [ flake8 nose ]; + nativeCheckInputs = [ flake8 nose ]; checkPhase = '' nosetests ''; diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index 6d89ac0db6ce..8c94f8bd1a67 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ]; - checkInputs = [ pandas nose ]; # as of 0.13.5, it depends explicitly on nose, rather than pytest. + nativeCheckInputs = [ pandas nose ]; # as of 0.13.5, it depends explicitly on nose, rather than pytest. meta = with lib; { broken = stdenv.isDarwin; diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 7d78b0d3520d..ae3b4c551dd4 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -7,14 +7,16 @@ , packaging , poetry-core , pytestCheckHook +, python-dateutil , pythonOlder , rich , tomlkit +, typing-extensions }: buildPythonPackage rec { pname = "pontos"; - version = "22.10.0"; + version = "23.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +25,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-z+oJakeZARnyZrkkNjLlyFcOB73u9+G0tXhbI13neyc="; + hash = "sha256-4GIfXHDY2g6dhvymYzunK2UWxJcO37dXQbI2jxOIwCw="; }; nativeBuildInputs = [ @@ -34,20 +36,19 @@ buildPythonPackage rec { colorful httpx packaging + python-dateutil rich + typing-extensions tomlkit - ]; + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ] ++ httpx.optional-dependencies.http2; - checkInputs = [ + nativeCheckInputs = [ git pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'packaging = "^20.3"' 'packaging = "*"' - ''; - disabledTests = [ "PrepareTestCase" # Signing fails @@ -69,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of Python utilities, tools, classes and functions"; homepage = "https://github.com/greenbone/pontos"; + changelog = "https://github.com/greenbone/pontos/releases/tag/v${version}"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 4cea071d2772..46cef2597522 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, pythonAtLeast }: buildPythonPackage rec { @@ -10,7 +11,7 @@ buildPythonPackage rec { version = "0.7.16"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.7" || pythonAtLeast "3.11"; src = fetchFromGitHub { owner = "ponyorm"; @@ -19,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-yATIsX2nKsW5DBwg9/LznQqf+XPY3q46WZut18Sr0v0="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index 238e6ad62230..3c6f4ff90040 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging appdirs requests ]; preCheck = "HOME=$TMPDIR"; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # tries to touch network disabledTests = [ "pooch_custom_url" diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix index 35829044c3cf..79d3eebf93e5 100644 --- a/pkgs/development/python-modules/pook/default.nix +++ b/pkgs/development/python-modules/pook/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pook"; - version = "1.0.2"; + version = "1.1.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "h2non"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-4OGcnuajGdBRlXCYwbTK/zLNQRrir60qCYajHRRCpkU="; + rev = "refs/tags/v${version}"; + hash = "sha256-nLeJAAsJUKFAetZSAQmOtXP+3ZRHvCTFAzycSkK+kiI="; }; propagatedBuildInputs = [ @@ -31,16 +31,19 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; - pythonImportsCheck = [ "pook" ]; + pythonImportsCheck = [ + "pook" + ]; meta = with lib; { description = "HTTP traffic mocking and testing made simple in Python"; homepage = "https://github.com/h2non/pook"; + changelog = "https://github.com/h2non/pook/blob/v${version}/History.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index 1c425f3711f1..4133cb02394c 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { redis ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mypy ]; diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index bf84e41610cb..4dfd663ac871 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tempora ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/posix_ipc/default.nix b/pkgs/development/python-modules/posix_ipc/default.nix index 59f4b4b707f2..fc97afa36cf5 100644 --- a/pkgs/development/python-modules/posix_ipc/default.nix +++ b/pkgs/development/python-modules/posix_ipc/default.nix @@ -1,21 +1,31 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pythonOlder }: buildPythonPackage rec { - pname = "posix_ipc"; - version = "1.0.5"; + pname = "posix-ipc"; + version = "1.1.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "6cddb1ce2cf4aae383f2a0079c26c69bee257fe2720f372201ef047f8ceb8b97"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "osvenskan"; + repo = "posix_ipc"; + rev = "rel${version}"; + hash = "sha256-xK5CkThqVFVMIxBtgUfHIRNRfmBxKa/DWBYQg7QHl/M="; }; + pythonImportsCheckHook = [ + "posix_ipc" + ]; + meta = with lib; { description = "POSIX IPC primitives (semaphores, shared memory and message queues)"; + homepage = "https://github.com/osvenskan/posix_ipc"; license = licenses.bsd3; - homepage = "http://semanchuk.com/philip/posix_ipc/"; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix index 2cc9e3368c76..adbbd3bf526e 100644 --- a/pkgs/development/python-modules/pot/default.nix +++ b/pkgs/development/python-modules/pot/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pymanopt ]; - checkInputs = [ + nativeCheckInputs = [ cvxopt matplotlib numpy diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 15597188135f..d53ac9acddbb 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ppft"; - version = "1.7.6.5"; + version = "1.7.6.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-R+DauHpRbAuZks1bDJCDSOTH2WQwTRBrIn+tKK4DIZ4="; + sha256 = "sha256-+TPwQE8+gIvIYHRayzt5zU/jHqGaIIiaZF+QBBW+YPE="; }; propagatedBuildInputs = [ @@ -26,8 +26,9 @@ buildPythonPackage rec { # darwin seems to hang doCheck = !stdenv.isDarwin; checkPhase = '' - cd examples + runHook preCheck ${python.interpreter} -m ppft.tests + runHook postCheck ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pprintpp/default.nix b/pkgs/development/python-modules/pprintpp/default.nix index 5b07613f098a..b72eeeebce47 100644 --- a/pkgs/development/python-modules/pprintpp/default.nix +++ b/pkgs/development/python-modules/pprintpp/default.nix @@ -1,29 +1,56 @@ -{ lib, fetchpatch, buildPythonPackage, fetchPypi, python, nose, parameterized }: +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +, nose +, parameterized +, python +, pythonOlder +}: buildPythonPackage rec { pname = "pprintpp"; version = "0.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "00v4pkyiqc0y9qjnp3br58a4k5zwqdrjjxbcsv39vx67w84630pa"; + hash = "sha256-6oJhCOLH9J3G1mx1KXPD/JdJFCp5jWslTh4wHP28ZAM="; }; patches = [ + # Replace nose-parameterized with parameterized, https://github.com/wolever/pprintpp/pull/21 (fetchpatch { url = "https://github.com/wolever/pprintpp/commit/873217674cc824b4c1cfdad4867c560c60e8d806.patch"; - sha256 = "0rqxzxawr83215s84mfzh1gnjwjm2xv399ywwcl4q7h395av5vb3"; + hash = "sha256-Y+2yVUkDHkwo49ynNHYXVXJpX4DfVYJ0CWKgzFX/HWc="; + }) + # Remove "U" move from open(), https://github.com/wolever/pprintpp/pull/31 + (fetchpatch { + name = "remove-u.patch"; + url = "https://github.com/wolever/pprintpp/commit/deec5e5efad562fc2f9084abfe249ed0c7dd65fa.patch"; + hash = "sha256-I84pnY/KyCIPPI9q0uvj64t8oPeMkgVTPEBRANkZNa4="; }) ]; - checkInputs = [ nose parameterized ]; + nativeCheckInputs = [ + nose + parameterized + ]; + checkPhase = '' ${python.interpreter} test.py ''; + pythonImportsCheck = [ + "pprintpp" + ]; + meta = with lib; { - homepage = "https://github.com/wolever/pprintpp"; description = "A drop-in replacement for pprint that's actually pretty"; + homepage = "https://github.com/wolever/pprintpp"; + changelog = "https://github.com/wolever/pprintpp/blob/${version}/CHANGELOG.txt"; license = licenses.bsd2; maintainers = with maintainers; [ jakewaksbaum ]; }; diff --git a/pkgs/development/python-modules/ppscore/default.nix b/pkgs/development/python-modules/ppscore/default.nix index 57d8048f0d6d..c817fc390ead 100644 --- a/pkgs/development/python-modules/ppscore/default.nix +++ b/pkgs/development/python-modules/ppscore/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { scikit-learn ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 1065781cde18..9f730b2f39f9 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { semver ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook openapi-spec-validator ]; diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index f5e2f72060ef..767dc5c55ca0 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { websocket-client ]; - checkInputs = [ + nativeCheckInputs = [ betamax betamax-serializers betamax-matchers diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index a115d42472a6..3591476927cc 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ testfixtures mock betamax diff --git a/pkgs/development/python-modules/prayer-times-calculator/default.nix b/pkgs/development/python-modules/prayer-times-calculator/default.nix index d686ac3bd0b0..7e96bf4196b4 100644 --- a/pkgs/development/python-modules/prayer-times-calculator/default.nix +++ b/pkgs/development/python-modules/prayer-times-calculator/default.nix @@ -7,14 +7,16 @@ buildPythonPackage rec { pname = "prayer-times-calculator"; - version = "0.0.7"; + version = "0.0.8"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "uchagani"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-fIfv10oi5Lv1dj5Y5CYI94/UdWG3bAY/ENCiMTkO0RE="; + hash = "sha256-Zk7lzZUfojJrsrLRS9cf9AhEfGGsxZJo2MnIIOv6Ezk="; }; propagatedBuildInputs = [ @@ -24,11 +26,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "prayer_times_calculator" ]; + pythonImportsCheck = [ + "prayer_times_calculator" + ]; meta = with lib; { description = "Python client for the Prayer Times API"; homepage = "https://github.com/uchagani/prayer-times-calculator"; + changelog = "https://github.com/uchagani/prayer-times-calculator/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix index db3aef0b2bb0..b795be68e485 100644 --- a/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pre-commit-hooks"; - version = "4.3.0"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-qdsSM+7ScSfxhmLAqwi1iraGHrhb5NBee/j+TKr2WUA="; + hash = "sha256-V23pgHQ9GdZ2mukFEMAhkp+dl/CQTGxWHAhF7s1VvHo="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { tomli ]; - checkInputs = [ + nativeCheckInputs = [ git pytestCheckHook ]; @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Some out-of-the-box hooks for pre-commit"; homepage = "https://github.com/pre-commit/pre-commit-hooks"; + changelog = "https://github.com/pre-commit/pre-commit-hooks/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; }; diff --git a/pkgs/development/python-modules/precis-i18n/default.nix b/pkgs/development/python-modules/precis-i18n/default.nix index f6e0459139a0..8d5969d18f08 100644 --- a/pkgs/development/python-modules/precis-i18n/default.nix +++ b/pkgs/development/python-modules/precis-i18n/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "precis-i18n"; - version = "1.0.4"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -14,8 +14,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "byllyfish"; repo = "precis_i18n"; - rev = "v${version}"; - hash = "sha256-90yNusUyz8qJi7WWYIFhHzrpvu1TqxfpT+lv2CVhSR8="; + rev = "refs/tags/v${version}"; + hash = "sha256-DSm+KomveGs9ZzNFiT0B1gAjx2fh0BaUdKW0J+kW24U="; }; pythonImportsCheck = [ @@ -23,8 +23,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/byllyfish/precis_i18n"; description = "Internationalized usernames and passwords"; + homepage = "https://github.com/byllyfish/precis_i18n"; + changelog = "https://github.com/byllyfish/precis_i18n/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/prefixed/default.nix b/pkgs/development/python-modules/prefixed/default.nix index 5f6cf56465a1..9b0efcad461e 100644 --- a/pkgs/development/python-modules/prefixed/default.nix +++ b/pkgs/development/python-modules/prefixed/default.nix @@ -2,24 +2,33 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "prefixed"; - version = "0.4.2"; + version = "0.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gfTjvBUEbncnE6uA8IaQ5hxSzOsgFBQldU6rWwCxMMk="; + hash = "sha256-C1TRXmAuuK9Kwxsdsho36pXOWJDgdBuw3Z3tSTzvu+k="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "prefixed" ]; + pythonImportsCheck = [ + "prefixed" + ]; meta = with lib; { description = "Prefixed alternative numeric library"; homepage = "https://github.com/Rockhopper-Technologies/prefixed"; + changelog = "https://github.com/Rockhopper-Technologies/prefixed/releases/tag/${version}"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/preggy/default.nix b/pkgs/development/python-modules/preggy/default.nix index 44be123335f9..cddca33b84ba 100644 --- a/pkgs/development/python-modules/preggy/default.nix +++ b/pkgs/development/python-modules/preggy/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { version = "1.4.4"; propagatedBuildInputs = [ six unidecode ]; - checkInputs = [ nose yanc ]; + nativeCheckInputs = [ nose yanc ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/preprocess-cancellation/default.nix b/pkgs/development/python-modules/preprocess-cancellation/default.nix index 5d2b722e6434..dc571f076fe3 100644 --- a/pkgs/development/python-modules/preprocess-cancellation/default.nix +++ b/pkgs/development/python-modules/preprocess-cancellation/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { shapely ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix index e20d3d78a157..b253525aacd1 100644 --- a/pkgs/development/python-modules/preshed/default.nix +++ b/pkgs/development/python-modules/preshed/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { murmurhash ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix index 0134b0dc36a4..231b953923e4 100644 --- a/pkgs/development/python-modules/pretend/default.nix +++ b/pkgs/development/python-modules/pretend/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-OqMfeIMFNBBLq6ejR3uOCIHZ9aA4zew7iefVlAsy1JQ="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 922f85990db7..149556c125e5 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -1,24 +1,35 @@ { lib , buildPythonPackage -, fetchPypi -, glibcLocales -, setuptools-scm +, fetchFromGitHub +, pythonOlder +, hatch-vcs +, hatchling , wcwidth , importlib-metadata -, pythonOlder +, pytest-lazy-fixture +, pytestCheckHook }: buildPythonPackage rec { pname = "prettytable"; - version = "3.4.1"; + version = "3.5.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-fX3YTQsgby2qxEcacvKZ1pB/NFFgZP6yg44zOk4lZ70="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jazzband"; + repo = "prettytable"; + rev = "refs/tags/${version}"; + hash= "sha256-J6oWNug2MEkUZSi67mM5H/Nf4tdSTB/ku34plp1XWCM="; }; - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ glibcLocales ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; propagatedBuildInputs = [ wcwidth @@ -26,18 +37,21 @@ buildPythonPackage rec { importlib-metadata ]; - preCheck = '' - export LANG="en_US.UTF-8" - ''; + nativeCheckInputs = [ + pytest-lazy-fixture + pytestCheckHook + ]; - # no test no longer available in pypi package - doCheck = false; - pythonImportsCheck = [ "prettytable" ]; + pythonImportsCheck = [ + "prettytable" + ]; meta = with lib; { - description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; - homepage = "http://code.google.com/p/prettytable/"; + changelog = "https://github.com/jazzband/prettytable/releases/tag/${version}"; + description = "Display tabular data in a visually appealing ASCII table format"; + homepage = "https://github.com/jazzband/prettytable"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/primer3/default.nix b/pkgs/development/python-modules/primer3/default.nix index 0f1a2ac66fef..14c96e5734ab 100644 --- a/pkgs/development/python-modules/primer3/default.nix +++ b/pkgs/development/python-modules/primer3/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ++ lib.optionals stdenv.isDarwin [ gcc ]; # pytestCheckHook leads to a circular import issue - checkInputs = [ click ]; + nativeCheckInputs = [ click ]; pythonImportsCheck = [ "primer3" ]; diff --git a/pkgs/development/python-modules/priority/default.nix b/pkgs/development/python-modules/priority/default.nix index 16908e90c9e6..8f12f7f2144e 100644 --- a/pkgs/development/python-modules/priority/default.nix +++ b/pkgs/development/python-modules/priority/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { "priority" ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/prison/default.nix b/pkgs/development/python-modules/prison/default.nix index 95a79ea1896b..de61fbd25239 100644 --- a/pkgs/development/python-modules/prison/default.nix +++ b/pkgs/development/python-modules/prison/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/prodict/default.nix b/pkgs/development/python-modules/prodict/default.nix index a6fdc61658dd..e3cc7564ef8b 100644 --- a/pkgs/development/python-modules/prodict/default.nix +++ b/pkgs/development/python-modules/prodict/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { # make setuptools happy on case-sensitive filesystems postPatch = ''if [[ ! -f README.md ]]; then mv README.MD README.md; fi''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index e3ee0a208a6a..29b361344b62 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { python-utils ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook ]; diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix index aacde11916e5..f9e11f096622 100644 --- a/pkgs/development/python-modules/prometheus-client/default.nix +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-LabvQMNiRH4jclMnN0P4M3w25NQasNQEu1HWvRDQQ2o="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix index 09891d0d4bbb..e84e0a20260c 100644 --- a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix +++ b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask prometheus-client ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests/" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/promise/default.nix b/pkgs/development/python-modules/promise/default.nix index 8833689cec12..a9c4c416b7fc 100644 --- a/pkgs/development/python-modules/promise/default.nix +++ b/pkgs/development/python-modules/promise/default.nix @@ -1,23 +1,37 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib -, six -, pytestCheckHook +, fetchpatch , mock , pytest-asyncio +, pytestCheckHook +, pythonOlder +, six }: buildPythonPackage rec { pname = "promise"; version = "2.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "syrusakbary"; repo = "promise"; - rev = "v${version}"; - sha256 = "17mq1bm78xfl0x1g50ng502m5ldq6421rzz35hlqafsj0cq8dkp6"; + rev = "refs/tags/v${version}"; + hash = "sha256-5s6GMANSO4UpLOP/HAQxuNFSBSjPgvJCB9R1dOoKuJ4="; }; + patches = [ + # Convert @asyncio.coroutine to async def, https://github.com/syrusakbary/promise/pull/99 + (fetchpatch { + name = "use-async-def.patch"; + url = "https://github.com/syrusakbary/promise/commit/3cde549d30b38dcff81b308e18c7f61783003791.patch"; + hash = "sha256-XCbTo6RCv75nNrpbK3TFdV0h7tBJ0QK+WOAR8S8w9as="; + }) + ]; + postPatch = '' substituteInPlace tests/test_extra.py \ --replace "assert_exc.traceback[-1].path.strpath" "str(assert_exc.traceback[-1].path)" @@ -27,22 +41,25 @@ buildPythonPackage rec { six ]; - checkInputs = [ - pytestCheckHook + nativeCheckInputs = [ mock pytest-asyncio + pytestCheckHook ]; disabledTestPaths = [ "tests/test_benchmark.py" ]; + pythonImportsCheck = [ + "promise" + ]; + meta = with lib; { description = "Ultra-performant Promise implementation in Python"; homepage = "https://github.com/syrusakbary/promise"; + changelog = "https://github.com/syrusakbary/promise/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ - kamadorueda - ]; + maintainers = with maintainers; [ kamadorueda ]; }; } diff --git a/pkgs/development/python-modules/prompt-toolkit/1.nix b/pkgs/development/python-modules/prompt-toolkit/1.nix index e1b9695071a6..f92ceeb86fff 100644 --- a/pkgs/development/python-modules/prompt-toolkit/1.nix +++ b/pkgs/development/python-modules/prompt-toolkit/1.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ docopt six wcwidth pygments ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ "test_pathcompleter_can_expanduser" diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index 038575794bd3..afe14d81d7d7 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.31"; + version = "3.0.36"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - sha256 = "sha256-mtqVLJ0Xh/Uv9tXzSE0LTfiVJ4fAh+32offCyx6ogUg="; + sha256 = "sha256-PhY/JUvvWgOxRjl9fBljvT4oEvCWS7miTm7HYf0o22M="; }; propagatedBuildInputs = [ @@ -25,7 +25,7 @@ buildPythonPackage rec { wcwidth ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/property-manager/default.nix b/pkgs/development/python-modules/property-manager/default.nix index f50f9625fd96..451d6f79091b 100644 --- a/pkgs/development/python-modules/property-manager/default.nix +++ b/pkgs/development/python-modules/property-manager/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ coloredlogs humanfriendly verboselogs ]; - checkInputs = [ pytest pytest-cov ]; + nativeCheckInputs = [ pytest pytest-cov ]; meta = with lib; { description = "Useful property variants for Python programming"; diff --git a/pkgs/development/python-modules/protego/default.nix b/pkgs/development/python-modules/protego/default.nix index a881292ada2d..12489fa64bbc 100644 --- a/pkgs/development/python-modules/protego/default.nix +++ b/pkgs/development/python-modules/protego/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest tests diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index 3d3646d5c839..b4f4facda1d8 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -10,17 +10,17 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.22.1"; + version = "1.22.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-bH39Ei3++AGf9lR0a+T1sdnIC7p4f+lhG1CN2Ivjovo="; + sha256 = "sha256-DozaPVpjTZiVt1xXPJNSwWSGy3XesOB4tf2jTbQkMWU="; }; propagatedBuildInputs = [ protobuf ]; - checkInputs = [ pytestCheckHook pytz googleapis-common-protos ]; + nativeCheckInputs = [ pytestCheckHook pytz googleapis-common-protos ]; pythonImportsCheck = [ "proto" ]; diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 7034ef322ab5..8df8bb7c4a7d 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -2,8 +2,9 @@ , lib , buildPythonPackage , protobuf -, pyext , isPyPy +, fetchpatch +, pythonAtLeast }: let @@ -24,6 +25,15 @@ buildPythonPackage { sourceRoot = "source/python"; + patches = lib.optionals (pythonAtLeast "3.11") [ + (fetchpatch { + url = "https://github.com/protocolbuffers/protobuf/commit/da973aff2adab60a9e516d3202c111dbdde1a50f.patch"; + stripLen = 2; + extraPrefix = ""; + hash = "sha256-a/12C6yIe1tEKjsMxcfDAQ4JHolA8CzkN7sNG8ZspPs="; + }) + ]; + prePatch = '' if [[ "$(<../version.json)" != *'"python": "'"$version"'"'* ]]; then echo "Python library version mismatch. Derivation version: $version, actual: $(<../version.json)" @@ -31,8 +41,6 @@ buildPythonPackage { fi ''; - nativeBuildInputs = [ pyext ]; - buildInputs = [ protobuf ]; propagatedNativeBuildInputs = [ @@ -40,7 +48,7 @@ buildPythonPackage { buildPackages."protobuf${lib.versions.major protobuf.version}_${lib.versions.minor protobuf.version}" ]; - setupPyGlobalFlags = "--cpp_implementation"; + setupPyGlobalFlags = [ "--cpp_implementation" ]; pythonImportsCheck = [ "google.protobuf" diff --git a/pkgs/development/python-modules/proton-client/default.nix b/pkgs/development/python-modules/proton-client/default.nix index 914f12a1546c..fbd69dbd54fe 100644 --- a/pkgs/development/python-modules/proton-client/default.nix +++ b/pkgs/development/python-modules/proton-client/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ #ValueError: Invalid modulus diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix index d3868d556ebe..89a4bf789c3a 100644 --- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix +++ b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "protonvpn-nm-lib"; - version = "3.13.0"; + version = "3.14.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ProtonVPN"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-i6Y+ardptWCVO2SzzluAOQp6MDO6Xzm0NneiqzkhHrw="; + sha256 = "sha256-xpK3l8BI6/DUt46VR8DS89hzdHUljAbrYhEyf00giGg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index 101ea7e2e939..91b7e412b581 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { rdflib ]; - checkInputs = [ + nativeCheckInputs = [ pydot ]; diff --git a/pkgs/development/python-modules/prox-tv/default.nix b/pkgs/development/python-modules/prox-tv/default.nix index 1202d45efa4a..869ac7457c76 100644 --- a/pkgs/development/python-modules/prox-tv/default.nix +++ b/pkgs/development/python-modules/prox-tv/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { sha256 = "0mlrjbb5rw78dgijkr3bspmsskk6jqs9y7xpsgs35i46dvb327q5"; }; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/proxmoxer/default.nix b/pkgs/development/python-modules/proxmoxer/default.nix index 9684fe84ba0f..98063a560472 100644 --- a/pkgs/development/python-modules/proxmoxer/default.nix +++ b/pkgs/development/python-modules/proxmoxer/default.nix @@ -1,17 +1,17 @@ { lib , buildPythonPackage , fetchFromGitHub -, mock -, nose , paramiko , pytestCheckHook , pythonOlder , requests +, requests-toolbelt +, responses }: buildPythonPackage rec { pname = "proxmoxer"; - version = "1.3.1"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FY0JLDBoKmh85VoKh3UuPPRbMAIjs3l/fZM4owniH1c="; + hash = "sha256-kwD6yJhVTaVAAUVA6k4r6HZy4w+MPDF7DfJBS8wGE/c="; }; propagatedBuildInputs = [ @@ -28,15 +28,15 @@ buildPythonPackage rec { requests ]; - checkInputs = [ - mock - nose + nativeCheckInputs = [ pytestCheckHook + requests-toolbelt + responses ]; - pytestFlagsArray = [ + disabledTestPaths = [ # Tests require openssh_wrapper which is outdated and not available - "tests/paramiko_tests.py" + "tests/test_openssh.py" ]; pythonImportsCheck = [ @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for Proxmox API v2"; homepage = "https://github.com/proxmoxer/proxmoxer"; + changelog = "https://github.com/proxmoxer/proxmoxer/releases/tag/${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/proxy-py/default.nix b/pkgs/development/python-modules/proxy-py/default.nix index bea708129872..911637bf8505 100644 --- a/pkgs/development/python-modules/proxy-py/default.nix +++ b/pkgs/development/python-modules/proxy-py/default.nix @@ -1,7 +1,10 @@ -{ stdenv -, lib +{ lib +, stdenv +, bash , buildPythonPackage , fetchFromGitHub +, gnumake +, httpx , openssl , paramiko , pytest-asyncio @@ -15,7 +18,7 @@ buildPythonPackage rec { pname = "proxy-py"; version = "2.4.3"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,9 +26,18 @@ buildPythonPackage rec { owner = "abhinavsingh"; repo = "proxy.py"; rev = "refs/tags/v${version}"; - sha256 = "sha256-dA7a9RicBFCSf6IoGX/CdvI8x/xMOFfNtyuvFn9YmHI="; + hash = "sha256-dA7a9RicBFCSf6IoGX/CdvI8x/xMOFfNtyuvFn9YmHI="; }; + postPatch = '' + substituteInPlace Makefile \ + --replace "SHELL := /bin/bash" "SHELL := ${bash}/bin/bash" + substituteInPlace pytest.ini \ + --replace "-p pytest_cov" "" \ + --replace "--no-cov-on-fail" "" + sed -i "/--cov/d" pytest.ini + ''; + nativeBuildInputs = [ setuptools-scm ]; @@ -35,8 +47,10 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ + httpx openssl + gnumake pytest-asyncio pytest-mock pytestCheckHook @@ -46,20 +60,23 @@ buildPythonPackage rec { export HOME=$(mktemp -d); ''; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "typing-extensions==3.7.4.3" "typing-extensions" - ''; + disabledTests = [ + # Test requires network access + "test_http2_via_proxy" + # Tests run into a timeout + "integration" + ]; pythonImportsCheck = [ "proxy" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Python proxy framework"; homepage = "https://github.com/abhinavsingh/proxy.py"; + changelog = "https://github.com/abhinavsingh/proxy.py/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index b9fb5f3aa146..9bf12055df1c 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fonttools lxml fs ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-cov pytest-xdist diff --git a/pkgs/development/python-modules/pscript/default.nix b/pkgs/development/python-modules/pscript/default.nix index fae2c8a42818..76af30e2c125 100644 --- a/pkgs/development/python-modules/pscript/default.nix +++ b/pkgs/development/python-modules/pscript/default.nix @@ -3,21 +3,24 @@ , fetchFromGitHub , pytestCheckHook , nodejs +, pythonOlder }: buildPythonPackage rec { pname = "pscript"; - version = "0.7.6"; + version = "0.7.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # PyPI tarball doesn't include tests directory src = fetchFromGitHub { owner = "flexxui"; repo = pname; - rev = "v${version}"; - sha256 = "169px5n4jjnpdn9y86f28qwd95bwf1q1rz0a1h3lb5nn5c6ym8c4"; + rev = "refs/tags/v${version}"; + hash = "sha256-AhVI+7FiWyH+DfAXnau4aAHJAJtsWEpmnU90ey2z35o="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook nodejs ]; @@ -27,13 +30,15 @@ buildPythonPackage rec { rm -rf pscript_legacy ''; + pythonImportsCheck = [ + "pscript" + ]; + meta = with lib; { description = "Python to JavaScript compiler"; - license = licenses.bsd2; homepage = "https://pscript.readthedocs.io"; - maintainers = [ maintainers.matthiasbeyer ]; + changelog = "https://github.com/flexxui/pscript/blob/v${version}/docs/releasenotes.rst"; + license = licenses.bsd2; + maintainers = with maintainers; [ matthiasbeyer ]; }; } - - - diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index 96be2af48b14..f0baddf628db 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -1,10 +1,9 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 +, pythonOlder , docopt , pillow -, enum34 , scikitimage , aggdraw , pytestCheckHook @@ -14,16 +13,21 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.23"; + version = "1.9.24"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "psd-tools"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-pJUf5rE5QMnfNytU1P0Zbj1iztrK5xrX4CJ/WvIG8mY="; + hash = "sha256-RW8v3UeO2tCjKkCqraFw2IfVt2YL3EbixfGsK7pOQYI="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ + cython + ]; propagatedBuildInputs = [ aggdraw @@ -33,13 +37,18 @@ buildPythonPackage rec { scikitimage ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "psd_tools" ]; + pythonImportsCheck = [ + "psd_tools" + ]; meta = with lib; { description = "Python package for reading Adobe Photoshop PSD files"; homepage = "https://github.com/kmike/psd-tools"; + changelog = "https://github.com/psd-tools/psd-tools/blob/v${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/psrpcore/default.nix b/pkgs/development/python-modules/psrpcore/default.nix index 41c514d2ca63..131d49f4ac93 100644 --- a/pkgs/development/python-modules/psrpcore/default.nix +++ b/pkgs/development/python-modules/psrpcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "psrpcore"; - version = "0.1.2"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,15 +17,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jborean93"; repo = pname; - rev = "v${version}"; - hash = "sha256-f1NGE+wSgi8yqBicZZRfUqzinsqazuIaoAje2y+dK1w="; + rev = "refs/tags/v${version}"; + hash = "sha256-KMSyqXKhNH+i9Y0Mx3DHCwJZOkl4Va2n0zu0TEitslU="; }; propagatedBuildInputs = [ cryptography ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook xmldiff ]; @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for the PowerShell Remoting Protocol (PSRP)"; homepage = "https://github.com/jborean93/psrpcore"; + changelog = "https://github.com/jborean93/psrpcore/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/psutil-home-assistant/default.nix b/pkgs/development/python-modules/psutil-home-assistant/default.nix index 4e248702f53c..9ea18d7853b0 100644 --- a/pkgs/development/python-modules/psutil-home-assistant/default.nix +++ b/pkgs/development/python-modules/psutil-home-assistant/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index b461bc6fdcf0..5532816a9c12 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.9.3"; + version = "5.9.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fM/N/qT8SwoCyiwx3n/NGGvrnP+CB4AOFKtm95x3OvY="; + hash = "sha256-PX+XOetDXUsTOJRKviP0lYS95TlfJ0h9LuJa2ah3SmI="; }; buildInputs = @@ -29,7 +29,7 @@ buildPythonPackage rec { IOKit ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -52,6 +52,7 @@ buildPythonPackage rec { "disk_io_counters" "sensors_battery" "user" + "test_disk_partitions" # problematic on Hydra's Linux builders, apparently ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index 6d2bdc8691be..1b84cc6140c8 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -16,6 +16,7 @@ # psycopg-c , cython_3 +, tomli # docs , furo @@ -32,13 +33,13 @@ let pname = "psycopg"; - version = "3.1.3"; + version = "3.1.8"; src = fetchFromGitHub { owner = "psycopg"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-cAfFxUDgfI3KTlBU9wV/vQkPun4cR3se8eSIHHcEr4g="; + hash = "sha256-VmuotHcLWd+k8/GLv0N2wSZR0sZjY+TmGBQjhpYE3YA="; }; patches = [ @@ -70,9 +71,10 @@ let ''; nativeBuildInputs = [ - setuptools cython_3 postgresql + setuptools + tomli ]; # tested in psycopg @@ -96,7 +98,7 @@ let cd psycopg_pool ''; - propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ + propagatedBuildInputs = [ typing-extensions ]; @@ -167,7 +169,7 @@ buildPythonPackage rec { cd .. ''; - checkInputs = [ + nativeCheckInputs = [ pproxy pytest-asyncio pytest-randomly @@ -181,10 +183,6 @@ buildPythonPackage rec { # don't depend on mypy for tests "test_version" "test_package_version" - ] ++ lib.optionals (stdenv.isDarwin) [ - # racy test - "test_sched" - "test_sched_error" ]; disabledTestPaths = [ @@ -197,7 +195,8 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "-o cache_dir=$TMPDIR" + "-o" "cache_dir=$TMPDIR" + "-m" "'not timing'" ]; postCheck = '' diff --git a/pkgs/development/python-modules/psycopg2cffi/default.nix b/pkgs/development/python-modules/psycopg2cffi/default.nix index 71c9017380ad..a504c8484ab2 100644 --- a/pkgs/development/python-modules/psycopg2cffi/default.nix +++ b/pkgs/development/python-modules/psycopg2cffi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ postgresql ]; propagatedBuildInputs = [ six cffi ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # NB: The tests need a postgres instance running to test against, and so we # disable them. diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index 778c5516c635..586e5d8dfb28 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ numpy pydantic pytest-mypy-plugins diff --git a/pkgs/development/python-modules/ptable/default.nix b/pkgs/development/python-modules/ptable/default.nix index ae2ad58a1acb..169f08fb3594 100644 --- a/pkgs/development/python-modules/ptable/default.nix +++ b/pkgs/development/python-modules/ptable/default.nix @@ -12,7 +12,7 @@ buildPythonPackage { sha256 = "1cj314rp6irlvr0a2c4xffsm2idsb0hzwr38vzz6z3kbhphcb63i"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests --with-coverage --cover-package=prettytable --cover-min-percentage=75 diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 458cd14f7128..c78aacc8d5a2 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, pythonOlder, fetchPypi +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi , appdirs , black , importlib-metadata @@ -10,12 +13,14 @@ buildPythonPackage rec { pname = "ptpython"; - version = "3.0.20"; - disabled = !isPy3k; + version = "3.0.22"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "eafd4ced27ca5dc370881d4358d1ab5041b32d88d31af8e3c24167fe4af64ed6"; + hash = "sha256-wJezJEBgFKAFxrCfSTu73eVx5BI2CvK6FVGHOhDDbPg="; }; propagatedBuildInputs = [ @@ -24,14 +29,21 @@ buildPythonPackage rec { jedi prompt-toolkit pygments - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; # no tests to run doCheck = false; + pythonImportsCheck = [ + "ptpython" + ]; + meta = with lib; { description = "An advanced Python REPL"; homepage = "https://github.com/prompt-toolkit/ptpython"; + changelog = "https://github.com/prompt-toolkit/ptpython/blob/${version}/CHANGELOG"; license = licenses.bsd3; maintainers = with maintainers; [ mlieberman85 ]; }; diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index bee8e8353632..a94b40de50fe 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "7.0.1"; + version = "7.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-rOpTPj9g9WKc8MLX4HqsZit7yvTtDqha7ImewW/tH7g="; + hash = "sha256-+g/VBxv0XfqqwTEKtgBAy7Pfakll00JXMFBS2q3pHn8="; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-vcr pytestCheckHook @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python-based APIs for PubNub"; homepage = "https://github.com/pubnub/python"; + changelog = "https://github.com/pubnub/python/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index c135b0b5ccf2..6ba0d12588bf 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, dataclasses , fetchPypi , jedi , pygments @@ -13,14 +12,14 @@ buildPythonPackage rec { pname = "pudb"; - version = "2022.1.2"; + version = "2022.1.3"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-a4OrgFvdtTcQEJaQoiN+mL+DwLOgADPFF8319qj6Rw0="; + hash = "sha256-WOg62p4Z/+ksH9x4rlRY75GuuJKluPDnN55vph4OZko="; }; propagatedBuildInputs = [ @@ -28,11 +27,9 @@ buildPythonPackage rec { pygments urwid urwid-readline - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; @@ -48,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "A full-screen, console-based Python debugger"; homepage = "https://github.com/inducer/pudb"; + changelog = "https://github.com/inducer/pudb/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index 60fa54438f9c..816af17c69fd 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index e895a0920e5c..b2c703058770 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { "pulsectl" ]; - checkInputs = [ unittestCheckHook pulseaudio ]; + nativeCheckInputs = [ unittestCheckHook pulseaudio ]; preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 8627c4f3d519..e7150093bb42 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.19.0"; + version = "5.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-ZpbWqhTScWOlcVsX4OYlA5dYQg0UsfOhMLllXjEDdUI="; + hash = "sha256-7lO3GbVPG70u+PzS/22d6i6xIRXiTMc/iUXrZurD2LU="; }; sourceRoot = "${src.name}/sdk/python"; @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pulumi python amazon web services provider"; homepage = "https://github.com/pulumi/pulumi-aws"; + changelog = "https://github.com/pulumi/pulumi-aws/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix index ad779eb2ffc4..b0d11e59d964 100644 --- a/pkgs/development/python-modules/pulumi/default.nix +++ b/pkgs/development/python-modules/pulumi/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pulumi.pkgs.pulumi-language-python pytestCheckHook ]; @@ -36,7 +36,7 @@ buildPythonPackage rec { "test/" ]; - sourceRoot = "source/sdk/python/lib"; + sourceRoot = "${src.name}/sdk/python/lib"; # we apply the modifications done in the pulumi/sdk/python/Makefile # but without the venv code @@ -44,7 +44,7 @@ buildPythonPackage rec { cp ../../README.md . substituteInPlace setup.py \ --replace "3.0.0" "${version}" \ - --replace "grpcio==1.47" "grpcio" + --replace "grpcio==1.50" "grpcio" ''; # Allow local networking in tests on Darwin diff --git a/pkgs/development/python-modules/pure-cdb/default.nix b/pkgs/development/python-modules/pure-cdb/default.nix index 2683499dce2c..ea25ba2f595f 100644 --- a/pkgs/development/python-modules/pure-cdb/default.nix +++ b/pkgs/development/python-modules/pure-cdb/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { hash = "sha256-7zxQO+oTZJhXfM2yijGXchLixiQRuFTOSESVlEc+T0s="; }; - checkInputs = [ flake8 ]; + nativeCheckInputs = [ flake8 ]; pythonImportsCheck = [ "cdblib" ]; diff --git a/pkgs/development/python-modules/pure-eval/default.nix b/pkgs/development/python-modules/pure-eval/default.nix index ba84c1db5fae..f21f4d7fe4cc 100644 --- a/pkgs/development/python-modules/pure-eval/default.nix +++ b/pkgs/development/python-modules/pure-eval/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pure-python-adb/default.nix b/pkgs/development/python-modules/pure-python-adb/default.nix index 512c38b730d3..31ec5d509118 100644 --- a/pkgs/development/python-modules/pure-python-adb/default.nix +++ b/pkgs/development/python-modules/pure-python-adb/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { doCheck = pythonOlder "3.10"; # all tests result in RuntimeError on 3.10 - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.async; diff --git a/pkgs/development/python-modules/purepng/default.nix b/pkgs/development/python-modules/purepng/default.nix index 3615935b88ec..29a3a2aba574 100644 --- a/pkgs/development/python-modules/purepng/default.nix +++ b/pkgs/development/python-modules/purepng/default.nix @@ -31,7 +31,7 @@ buildPythonPackage { nativeBuildInputs = [ cython ]; # numpy is optional - if not supplied, tests simply have less coverage - checkInputs = [ numpy ]; + nativeCheckInputs = [ numpy ]; # checkPhase begins by deleting source dir to force test execution against installed version checkPhase = '' rm -r code/png diff --git a/pkgs/development/python-modules/purl/default.nix b/pkgs/development/python-modules/purl/default.nix index 8c7b208df2fe..9519d8bf21f1 100644 --- a/pkgs/development/python-modules/purl/default.nix +++ b/pkgs/development/python-modules/purl/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pushbullet-py/default.nix b/pkgs/development/python-modules/pushbullet-py/default.nix index 3fff30cb6dd5..472f4dcc5853 100644 --- a/pkgs/development/python-modules/pushbullet-py/default.nix +++ b/pkgs/development/python-modules/pushbullet-py/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { preCheck = '' export PUSHBULLET_API_KEY="" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ "test_auth_fail" "test_auth_success" diff --git a/pkgs/development/python-modules/pushover-complete/default.nix b/pkgs/development/python-modules/pushover-complete/default.nix index 92131b52628d..33741f9f2924 100644 --- a/pkgs/development/python-modules/pushover-complete/default.nix +++ b/pkgs/development/python-modules/pushover-complete/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-toolbelt responses diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 3a93b36cb2b7..dcdad33afa91 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytestCheckHook flaky mock pytest-mock ]; + nativeCheckInputs = [ pytestCheckHook flaky mock pytest-mock ]; propagatedBuildInputs = [ numpy pandas pytz six requests ]; # Skip a few tests that try to access some URLs diff --git a/pkgs/development/python-modules/pvo/default.nix b/pkgs/development/python-modules/pvo/default.nix index 0b107f155060..cbc7a2c0b47d 100644 --- a/pkgs/development/python-modules/pvo/default.nix +++ b/pkgs/development/python-modules/pvo/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 35ad60317ad4..a9b5b7f0ae6d 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -28,12 +28,12 @@ let debuggerName = lib.strings.getName debugger; in buildPythonPackage rec { - version = "4.8.0"; + version = "4.9.0"; pname = "pwntools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QgUuLYg3EOTh2gQekWdabXGftOXvLdJFyyhT2hEmkpA="; + sha256 = "sha256-7qZ9GC+RcEiDkpmNmy8d67dYiTgFBVAfB3B2RfrH5xI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pxml/default.nix b/pkgs/development/python-modules/pxml/default.nix index efa9e81b8de9..5ef283a26ccc 100644 --- a/pkgs/development/python-modules/pxml/default.nix +++ b/pkgs/development/python-modules/pxml/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ blessings six ]; - checkInputs = [ nose coverage ]; + nativeCheckInputs = [ nose coverage ]; # test_prefixedWhitespace fails due to a python3 StringIO issue requiring # bytes rather than str diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index d3150b453a63..446edb4221eb 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { py-air-control ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/py-bip39-bindings/default.nix b/pkgs/development/python-modules/py-bip39-bindings/default.nix index 8385f492d8f3..12d70e8bee4a 100644 --- a/pkgs/development/python-modules/py-bip39-bindings/default.nix +++ b/pkgs/development/python-modules/py-bip39-bindings/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/py-canary/default.nix b/pkgs/development/python-modules/py-canary/default.nix index e849e147e42d..7e0200abea3c 100644 --- a/pkgs/development/python-modules/py-canary/default.nix +++ b/pkgs/development/python-modules/py-canary/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook requests-mock diff --git a/pkgs/development/python-modules/py-cid/default.nix b/pkgs/development/python-modules/py-cid/default.nix index 86c2e80601f6..3f8d07adbfef 100644 --- a/pkgs/development/python-modules/py-cid/default.nix +++ b/pkgs/development/python-modules/py-cid/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { py-multihash ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis ]; diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix index 09f8ba4ad758..3c8b1f1e1cd3 100644 --- a/pkgs/development/python-modules/py-cpuinfo/default.nix +++ b/pkgs/development/python-modules/py-cpuinfo/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-Q5u0guAqDVhf6bvJTzNvCpWbIzjxxAjE7s0OuXj9T4Q="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/py-deprecate/default.nix b/pkgs/development/python-modules/py-deprecate/default.nix index 86064dd0933f..4684b51d79a9 100644 --- a/pkgs/development/python-modules/py-deprecate/default.nix +++ b/pkgs/development/python-modules/py-deprecate/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { hash = "sha256-84RmQvLxwtLPQk3hX7Q6eeJeejhrO3t+mc95W1E85Fg="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook scikit-learn ]; diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix index 0c700151f694..30631de36e52 100644 --- a/pkgs/development/python-modules/py-desmume/default.nix +++ b/pkgs/development/python-modules/py-desmume/default.nix @@ -1,32 +1,68 @@ -{ lib, buildPythonPackage, fetchFromGitHub, GitPython -, libpcap, meson, ninja, pillow, pkg-config, pygobject3, SDL2 -, alsa-lib, soundtouch, openal +{ lib +, alsa-lib +, buildPythonPackage +, fetchFromGitHub +, gitpython +, libpcap +, meson +, ninja +, openal +, pillow +, pkg-config +, pygobject3 +, pythonOlder +, SDL2 +, soundtouch }: buildPythonPackage rec { pname = "py-desmume"; version = "0.0.4.post2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-a819+K/Ovnz53ViDKpUGGjeblWvrAO5ozt/tizdLKCY="; + hash = "sha256-a819+K/Ovnz53ViDKpUGGjeblWvrAO5ozt/tizdLKCY="; fetchSubmodules = true; }; - buildInputs = [ GitPython libpcap SDL2 alsa-lib soundtouch openal ]; - nativeBuildInputs = [ meson ninja pkg-config ]; - propagatedBuildInputs = [ pillow pygobject3 ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; - hardeningDisable = [ "format" ]; + buildInputs = [ + alsa-lib + gitpython + libpcap + openal + SDL2 + soundtouch + ]; + + propagatedBuildInputs = [ + pillow + pygobject3 + ]; + + hardeningDisable = [ + "format" + ]; doCheck = false; # there are no tests - pythonImportsCheck = [ "desmume" ]; + + pythonImportsCheck = [ + "desmume" + ]; meta = with lib; { - homepage = "https://github.com/SkyTemple/py-desmume"; description = "Python library to interface with DeSmuME, the Nintendo DS emulator"; + homepage = "https://github.com/SkyTemple/py-desmume"; license = licenses.gpl3Plus; maintainers = with maintainers; [ xfix ]; }; diff --git a/pkgs/development/python-modules/py-ecc/default.nix b/pkgs/development/python-modules/py-ecc/default.nix index 8060ab45cae1..71103c0d6699 100644 --- a/pkgs/development/python-modules/py-ecc/default.nix +++ b/pkgs/development/python-modules/py-ecc/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { mypy-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/py-multiaddr/default.nix b/pkgs/development/python-modules/py-multiaddr/default.nix index 24fa6975cc5e..4bf9e797395c 100644 --- a/pkgs/development/python-modules/py-multiaddr/default.nix +++ b/pkgs/development/python-modules/py-multiaddr/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { py-multicodec ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/py-multibase/default.nix b/pkgs/development/python-modules/py-multibase/default.nix index 87cfd6b8e427..eeb83df5a98b 100644 --- a/pkgs/development/python-modules/py-multibase/default.nix +++ b/pkgs/development/python-modules/py-multibase/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { python-baseconv ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/py-multicodec/default.nix b/pkgs/development/python-modules/py-multicodec/default.nix index c41da62cf4c5..f0c34a70efd8 100644 --- a/pkgs/development/python-modules/py-multicodec/default.nix +++ b/pkgs/development/python-modules/py-multicodec/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { morphys ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/py-multihash/default.nix b/pkgs/development/python-modules/py-multihash/default.nix index 73307c75b8b8..202d2702163a 100644 --- a/pkgs/development/python-modules/py-multihash/default.nix +++ b/pkgs/development/python-modules/py-multihash/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { varint ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/py-nextbusnext/default.nix b/pkgs/development/python-modules/py-nextbusnext/default.nix index 3b6d24d6168d..67e934dad1d1 100644 --- a/pkgs/development/python-modules/py-nextbusnext/default.nix +++ b/pkgs/development/python-modules/py-nextbusnext/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-uUHA8v5iTISmPaTgk0RvcLLRM34f3JXUjZClKGXdMoI="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/py-nightscout/default.nix b/pkgs/development/python-modules/py-nightscout/default.nix index b98fa7b13397..3330b68c949e 100644 --- a/pkgs/development/python-modules/py-nightscout/default.nix +++ b/pkgs/development/python-modules/py-nightscout/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytestCheckHook pytest-asyncio diff --git a/pkgs/development/python-modules/py-radix/default.nix b/pkgs/development/python-modules/py-radix/default.nix index f4b064d41aac..579311776f34 100644 --- a/pkgs/development/python-modules/py-radix/default.nix +++ b/pkgs/development/python-modules/py-radix/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; doCheck = true; - checkInputs = [ coverage nose ]; + nativeCheckInputs = [ coverage nose ]; meta = with lib; { description = "Python radix tree for IPv4 and IPv6 prefix matching"; diff --git a/pkgs/development/python-modules/py-sonic/default.nix b/pkgs/development/python-modules/py-sonic/default.nix index dce8157da566..14c783196709 100644 --- a/pkgs/development/python-modules/py-sonic/default.nix +++ b/pkgs/development/python-modules/py-sonic/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "py-sonic"; - version = "0.7.9"; + version = "0.8.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1677b7287914567b5123de90ad872b441628d8a7777cf4a5f41671b813facf75"; + sha256 = "sha256-BzHBoN7zfZ6Bh1IC1TG5NSa6EiFNje2hQY+lSA/PV+c="; }; # package has no tests diff --git a/pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock b/pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock index ded748b62770..0a31c382b1d4 100644 --- a/pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock +++ b/pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock @@ -10,9 +10,9 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" [[package]] name = "arrayvec" -version = "0.5.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "autocfg" @@ -28,31 +28,13 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "block-buffer" -version = "0.7.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding", - "byte-tools", - "byteorder", "generic-array", ] -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - [[package]] name = "byteorder" version = "1.4.3" @@ -66,57 +48,61 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "ctor" -version = "0.1.23" +name = "cpufeatures" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", "syn", ] [[package]] -name = "curve25519-dalek" -version = "2.1.3" +name = "curve25519-dalek-ng" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216" +checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" dependencies = [ "byteorder", "digest", "rand_core", - "subtle", + "subtle-ng", "zeroize", ] [[package]] name = "digest" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ "generic-array", ] -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "generic-array" -version = "0.12.4" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", + "version_check", ] [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", @@ -125,9 +111,9 @@ dependencies = [ [[package]] name = "ghost" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb19fe8de3ea0920d282f7b77dd4227aea6b8b999b42cdf0ca41b2472b14443a" +checksum = "41973d4c45f7a35af8753ba3457cc99d406d863941fd7f52663cff54a5ab99b3" dependencies = [ "proc-macro2", "quote", @@ -136,22 +122,9 @@ dependencies = [ [[package]] name = "hex-literal" -version = "0.2.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d70693199b3cf4552f3fa720b54163927a3ebed2aef240efaf556033ab336a11" -dependencies = [ - "hex-literal-impl", - "proc-macro-hack", -] - -[[package]] -name = "hex-literal-impl" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59448fc2f82a5fb6907f78c3d69d843e82ff5b051923313cc4438cb0c7b745a8" -dependencies = [ - "proc-macro-hack", -] +checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" [[package]] name = "indoc" @@ -209,15 +182,18 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" +checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +dependencies = [ + "cpufeatures", +] [[package]] name = "libc" -version = "0.2.134" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "lock_api" @@ -231,9 +207,9 @@ dependencies = [ [[package]] name = "merlin" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e261cf0f8b3c42ded9f7d2bb59dea03aa52bc8a1cbc7482f9fc3fd1229d3b42" +checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" dependencies = [ "byteorder", "keccak", @@ -243,9 +219,9 @@ dependencies = [ [[package]] name = "opaque-debug" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "parking_lot" @@ -260,9 +236,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", @@ -291,30 +267,24 @@ dependencies = [ "proc-macro-hack", ] -[[package]] -name = "ppv-lite86" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" - [[package]] name = "proc-macro-hack" -version = "0.5.19" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.46" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" dependencies = [ "unicode-ident", ] [[package]] name = "py-sr25519-bindings" -version = "0.1.5" +version = "0.2.0" dependencies = [ "hex-literal", "pyo3", @@ -361,54 +331,22 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core", -] - [[package]] name = "rand_core" -version = "0.5.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom", ] -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - [[package]] name = "redox_syscall" version = "0.2.16" @@ -420,19 +358,18 @@ dependencies = [ [[package]] name = "schnorrkel" -version = "0.9.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862" +checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d" dependencies = [ "arrayref", "arrayvec", - "curve25519-dalek", - "getrandom", + "curve25519-dalek-ng", "merlin", - "rand", "rand_core", + "serde_bytes", "sha2", - "subtle", + "subtle-ng", "zeroize", ] @@ -443,14 +380,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "sha2" -version = "0.8.2" +name = "serde" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" + +[[package]] +name = "serde_bytes" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819" +dependencies = [ + "serde", +] + +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer", + "cfg-if", + "cpufeatures", "digest", - "fake-simd", "opaque-debug", ] @@ -461,16 +414,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] -name = "subtle" -version = "2.4.1" +name = "subtle-ng" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" [[package]] name = "syn" -version = "1.0.102" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -491,15 +444,15 @@ dependencies = [ [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicode-ident" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-xid" @@ -509,15 +462,21 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unindent" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ee9362deb4a96cef4d437d1ad49cffc9b9e92d202b6995674e928ce684f112" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "winapi" @@ -552,9 +511,9 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" +checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/python-modules/py-sr25519-bindings/default.nix b/pkgs/development/python-modules/py-sr25519-bindings/default.nix index 9db6cc998956..650e259f982b 100644 --- a/pkgs/development/python-modules/py-sr25519-bindings/default.nix +++ b/pkgs/development/python-modules/py-sr25519-bindings/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-sr25519-bindings"; - version = "0.1.5"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "polkascan"; repo = "py-sr25519-bindings"; - rev = "a97398b386c10ebe0a1f6c45dea466add0d407ce"; - sha256 = "sha256-RJfwWeD82J5QqY+qq2bC3vlqT75jUwhTXuIsza4qUzk="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Lu3J0+YeQHHKItOZTT24DlQAUJuE9fd+py6Eb46/MSE="; }; cargoDeps = rustPlatform.importCargoLock { @@ -38,7 +38,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook py-bip39-bindings ]; diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index 0ebd218aa9cc..8dab19a4f818 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -1,34 +1,39 @@ { lib +, aiohttp +, async-timeout , buildPythonPackage , fetchFromGitHub , poetry-core , pytestCheckHook -, requests -, urllib3 +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "1.0.8"; + version = "2.1.1"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "mib1185"; - repo = "synologydsm-api"; - rev = "v${version}"; - sha256 = "sha256-9bh7uLt9+uda6yFCWV6xUh//jFC4DgiS+KtRXQrU3A8="; + repo = "py-synologydsm-api"; + rev = "refs/tags/v${version}"; + hash = "sha256-rT9KkSgIinJxTyJ40Z3VzMh23Ry9O3NFrLH4I2+NFPg="; }; nativeBuildInputs = [ poetry-core + setuptools ]; propagatedBuildInputs = [ - requests - urllib3 + aiohttp + async-timeout ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -38,7 +43,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for Synology DSM"; - homepage = "https://github.com/hacf-fr/synologydsm-api"; + homepage = "https://github.com/mib1185/py-synologydsm-api"; + changelog = "https://github.com/mib1185/py-synologydsm-api/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ uvnikita ]; }; diff --git a/pkgs/development/python-modules/py-tes/default.nix b/pkgs/development/python-modules/py-tes/default.nix index 633dc6fa5f4a..6fba131e0713 100644 --- a/pkgs/development/python-modules/py-tes/default.nix +++ b/pkgs/development/python-modules/py-tes/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/pkgs/development/python-modules/py-tree-sitter/default.nix b/pkgs/development/python-modules/py-tree-sitter/default.nix index f087bac5c10e..c8b914aed78f 100644 --- a/pkgs/development/python-modules/py-tree-sitter/default.nix +++ b/pkgs/development/python-modules/py-tree-sitter/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "py-tree-sitter"; - version = "unstable-2022-02-08"; + version = "0.20.1"; format = "pyproject"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "py-tree-sitter"; - rev = "9c8261d36e55d9e4a6543dc9e570bfd7911ed7bf"; - sha256 = "sha256-YDe9m85LIPNumo9mrhMMotUspq/8B3t5kt2ScMJI+hY="; + rev = "v${version}"; + sha256 = "sha256-mdV5zGvVI1MltmOD1BtXxsKB/yigk8d56WwLlX6Uizg="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/py-ubjson/default.nix b/pkgs/development/python-modules/py-ubjson/default.nix index 4efa2b8b6fdb..5cb8cfc40220 100644 --- a/pkgs/development/python-modules/py-ubjson/default.nix +++ b/pkgs/development/python-modules/py-ubjson/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1frn97xfa88zrfmpnvdk1pc03yihlchhph99bhjayvzlfcrhm5v3"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix index 69dde8ca38ed..111e702455d2 100644 --- a/pkgs/development/python-modules/py-vapid/default.nix +++ b/pkgs/development/python-modules/py-vapid/default.nix @@ -1,24 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi -, flake8, mock, nose, pytest +{ lib +, buildPythonPackage +, fetchPypi +, flake8 +, mock +, nose +, pytest , cryptography +, pythonOlder }: buildPythonPackage rec { pname = "py-vapid"; - version = "1.8.2"; + version = "1.9.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "874f21910f2103c56228cded941d6e733dd8f1eb12876137919533bfacb65a48"; + hash = "sha256-BmSreJl0LvKyhzl6TUYe9pHtDML1hyBRKNjPYX/9uRk="; }; - propagatedBuildInputs = [ cryptography ]; + propagatedBuildInputs = [ + cryptography + ]; - checkInputs = [ flake8 mock nose pytest ]; + nativeCheckInputs = [ + flake8 + mock + nose + pytest + ]; meta = with lib; { - description = "VAPID is a voluntary standard for WebPush subscription providers"; + description = "Library for VAPID header generation"; homepage = "https://github.com/mozilla-services/vapid"; license = licenses.mpl20; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/py-zabbix/default.nix b/pkgs/development/python-modules/py-zabbix/default.nix index 410068f45237..e706da6064ca 100644 --- a/pkgs/development/python-modules/py-zabbix/default.nix +++ b/pkgs/development/python-modules/py-zabbix/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "aPQc188pszfDQvNtsGYlRLHS5CG5VyqptSoe4/GJVvE="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/py17track/default.nix b/pkgs/development/python-modules/py17track/default.nix index b39d50dbfc7a..12bd7446e140 100644 --- a/pkgs/development/python-modules/py17track/default.nix +++ b/pkgs/development/python-modules/py17track/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/py3rijndael/default.nix b/pkgs/development/python-modules/py3rijndael/default.nix index be098df6a6a8..74a91b6ee2f4 100644 --- a/pkgs/development/python-modules/py3rijndael/default.nix +++ b/pkgs/development/python-modules/py3rijndael/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { hash = "sha256-tmVaPr/zoQVA6u0EnoeI7qOsk9a3GzpqwrACJLvs6ag="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 5fb31f9fdde2..ab8492beab7f 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -1,35 +1,82 @@ { lib -, buildPythonPackage -, fetchPypi , aiohttp -, requests +, aioredis +, buildPythonPackage +, coloredlogs +, fastapi +, fetchFromGitHub +, pillow +, psutil +, pytestCheckHook , pythonOlder +, redis +, requests +, ujson +, uvicorn +, watchdog }: buildPythonPackage rec { - pname = "pyTelegramBotAPI"; - version = "4.7.0"; + pname = "pytelegrambotapi"; + version = "4.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-sVu518B+PDSpW6MhYtNWkPpwuT471VfGuDDtpL7Mo/U="; + src = fetchFromGitHub { + owner = "eternnoir"; + repo = "pyTelegramBotAPI"; + rev = "refs/tags/${version}"; + hash = "sha256-OaJMNJqb3h16aZJYma8eXTEkAEbb8NgpVEEHmGvpxQg="; }; - propagatedBuildInputs = [ - aiohttp + passthru.optional-dependencies = { + json = [ + ujson + ]; + PIL = [ + pillow + ]; + redis = [ + redis + ]; + aioredis = [ + aioredis + ]; + aiohttp = [ + aiohttp + ]; + fastapi = [ + fastapi + ]; + uvicorn = [ + uvicorn + ]; + psutil = [ + psutil + ]; + coloredlogs = [ + coloredlogs + ]; + watchdog = [ + watchdog + ]; + }; + + checkInputs = [ + pytestCheckHook requests - ]; + ] ++ passthru.optional-dependencies.watchdog + ++ passthru.optional-dependencies.aiohttp; pythonImportsCheck = [ "telebot" ]; meta = with lib; { + description = "Python implementation for the Telegram Bot API"; homepage = "https://github.com/eternnoir/pyTelegramBotAPI"; - description = "A simple, but extensible Python implementation for the Telegram Bot API"; + changelog = "https://github.com/eternnoir/pyTelegramBotAPI/releases/tag/${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ das_j ]; }; diff --git a/pkgs/development/python-modules/py_stringmatching/default.nix b/pkgs/development/python-modules/py_stringmatching/default.nix index 79d09daba9cc..a6d4bc48e844 100644 --- a/pkgs/development/python-modules/py_stringmatching/default.nix +++ b/pkgs/development/python-modules/py_stringmatching/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "c87f62698fba1612a18f8f44bd57f0c4e70aac2d7ca6dfb6ed46dabd2194453c"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; propagatedBuildInputs = [ numpy six ]; diff --git a/pkgs/development/python-modules/pyads/default.nix b/pkgs/development/python-modules/pyads/default.nix index a22e85154261..6e9d7386669a 100644 --- a/pkgs/development/python-modules/pyads/default.nix +++ b/pkgs/development/python-modules/pyads/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { --replace "ctypes.CDLL(adslib)" "ctypes.CDLL(\"${adslib}/lib/adslib.so\")" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyaftership/default.nix b/pkgs/development/python-modules/pyaftership/default.nix index c0b941e849d1..7c1c76c4adb5 100644 --- a/pkgs/development/python-modules/pyaftership/default.nix +++ b/pkgs/development/python-modules/pyaftership/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyaftership"; - version = "21.11.0"; + version = "23.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,15 +18,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; repo = pname; - rev = version; - sha256 = "sha256-SN7fvI/+VHYn2eYQe5wp6lEZ73YeZbsiPjDiq/Ibk3Q="; + rev = "refs/tags/${version}"; + hash = "sha256-njlDScmxIYWxB4EL9lOSGCXqZDzP999gI9EkpcZyFlE="; }; propagatedBuildInputs = [ aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper package for the AfterShip API"; homepage = "https://github.com/ludeeus/pyaftership"; + changelog = "https://github.com/ludeeus/pyaftership/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ jamiemagee ]; }; diff --git a/pkgs/development/python-modules/pyahocorasick/default.nix b/pkgs/development/python-modules/pyahocorasick/default.nix index fd2c6de2c25c..b490f883d4cb 100644 --- a/pkgs/development/python-modules/pyahocorasick/default.nix +++ b/pkgs/development/python-modules/pyahocorasick/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyahocorasick"; - version = "2.0.0b1"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,11 +16,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "WojciechMula"; repo = pname; - rev = version; - hash = "sha256-APpL99kOwzIQjePvRDeJ0FDm1kjBi6083JMKuBqtaRk="; + rev = "refs/tags/${version}"; + hash = "sha256-Ugl7gHyubXpxe4aots2e9stLuQAZEWsrlDuAHdSC0SA="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -36,6 +36,7 @@ buildPythonPackage rec { key strings occurrences at once in some input text. ''; homepage = "https://github.com/WojciechMula/pyahocorasick"; + changelog = "https://github.com/WojciechMula/pyahocorasick/blob/${version}/CHANGELOG.rst"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyairnow/default.nix b/pkgs/development/python-modules/pyairnow/default.nix index 51497e8875b7..04206796d4d6 100644 --- a/pkgs/development/python-modules/pyairnow/default.nix +++ b/pkgs/development/python-modules/pyairnow/default.nix @@ -3,8 +3,9 @@ , aioresponses , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytest-aiohttp -, poetry +, poetry-core , pytest-asyncio , pytest-cov , pytestCheckHook @@ -22,11 +23,19 @@ buildPythonPackage rec { sha256 = "1hkpfl8rdwyzqrr1drqlmcw3xpv3pi1jf19h1divspbzwarqxs1c"; }; - nativeBuildInputs = [ poetry ]; + patches = [ + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/asymworks/pyairnow/commit/f7a01733a41c648563fc2fe4b559f61ef08b9153.patch"; + hash = "sha256-lcHnFP3bwkPTi9Zq1dZtShLKyXcxO0XoDF+PgjbWOqs="; + }) + ]; + + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytest-aiohttp diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix index c1246afbbfcb..228844f53021 100644 --- a/pkgs/development/python-modules/pyairvisual/default.nix +++ b/pkgs/development/python-modules/pyairvisual/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "pyairvisual"; - version = "2022.11.1"; + version = "2022.12.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-5o3iJEcpxiHvjEi6VZj39SelBtfeneg349hvFwJ2oQU="; + hash = "sha256-xzTho4HsIU2YLURz9DfFfaRL3tsrtVi8n5IA2bRkyzw="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { pysmb ]; - checkInputs = [ + nativeCheckInputs = [ aresponses asynctest pytest-aiohttp diff --git a/pkgs/development/python-modules/pyalmond/default.nix b/pkgs/development/python-modules/pyalmond/default.nix deleted file mode 100644 index 59a9339c2649..000000000000 --- a/pkgs/development/python-modules/pyalmond/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -}: - -buildPythonPackage rec { - pname = "pyalmond"; - version = "0.0.3"; - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "stanford-oval"; - repo = pname; - rev = "v${version}"; - sha256 = "0d1w83lr7k2wxcs846iz4mjyqn1ximnw6155kgl515v10fqyrhgk"; - }; - - propagatedBuildInputs = [ aiohttp ]; - - # Tests require a running Almond instance - doCheck = false; - pythonImportsCheck = [ "pyalmond" ]; - - meta = with lib; { - description = "Python client for the Almond API"; - homepage = "https://github.com/stanford-oval/pyalmond"; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index cbab9bacfb81..444b66549af6 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ unidecode ]; diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix index 50edda1a7ef2..7dbb595efe8c 100644 --- a/pkgs/development/python-modules/pyannotate/default.nix +++ b/pkgs/development/python-modules/pyannotate/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { mypy-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyarlo/default.nix b/pkgs/development/python-modules/pyarlo/default.nix index 76fe9bc0a108..63c766ffb5bc 100644 --- a/pkgs/development/python-modules/pyarlo/default.nix +++ b/pkgs/development/python-modules/pyarlo/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sseclient-py ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock requests-mock diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index bdd907176f99..a862fa69a9a2 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pandas pytestCheckHook @@ -100,6 +100,8 @@ buildPythonPackage rec { # Flaky test "--deselect=pyarrow/tests/test_flight.py::test_roundtrip_errors" "--deselect=pyarrow/tests/test_pandas.py::test_threaded_pandas_import" + # Flaky test, works locally but not on Hydra + "--deselect=pyarrow/tests/test_csv.py::TestThreadedCSVTableRead::test_cancellation" ] ++ lib.optionals stdenv.isDarwin [ # Requires loopback networking "--deselect=pyarrow/tests/test_ipc.py::test_socket_" diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index 4bb515e17aa6..de87a9b5eeff 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyasn1 ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pyatag/default.nix b/pkgs/development/python-modules/pyatag/default.nix index a06d2a05fb40..56e6059c278c 100644 --- a/pkgs/development/python-modules/pyatag/default.nix +++ b/pkgs/development/python-modules/pyatag/default.nix @@ -1,21 +1,22 @@ { lib -, buildPythonPackage -, isPy27 -, fetchFromGitHub , aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder }: buildPythonPackage rec { pname = "pyatag"; - version = "3.5.1"; + version = "0.3.6.2"; + format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "MatsNl"; repo = "pyatag"; - rev = version; - sha256 = "17x2m7icbby1y2zfc79jpbir2kvyqlrkix9pvvxanm658arsh8c7"; + rev = "refs/tags/${version}"; + sha256 = "sha256-yJEPDNjEv2lGrBQ78sl7nseVRemsG7hTdBGH5trciYU="; }; propagatedBuildInputs = [ @@ -33,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to talk to Atag One"; homepage = "https://github.com/MatsNl/pyatag"; + changelog = "https://github.com/MatsNl/pyatag/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index 15b43db0e5b4..8c6086092a71 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -3,6 +3,7 @@ , botocore , buildPythonPackage , fetchPypi +, fsspec , pandas , pythonOlder , tenacity @@ -10,20 +11,20 @@ buildPythonPackage rec { pname = "pyathena"; - version = "2.14.0"; + version = "2.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "PyAthena"; - inherit version; - hash = "sha256-1DeqvlHlOt781nObnPdgZo3JqjwcK8lSREXqUNoKhhU="; + inherit pname version; + hash = "sha256-59NH4HIhgDOxwgSUJq71ewpQTn2sbpNNT9Q3nj8qJss="; }; propagatedBuildInputs = [ boto3 botocore + fsspec pandas tenacity ]; diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index f448942ae01d..92ccf8e071b8 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 = "7.4.0"; + version = "7.5.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jabesq"; repo = "pyatmo"; rev = "refs/tags/v${version}"; - sha256 = "sha256-0AgmH0cxXPUBzC30HyX68WsSyYsDcPaVQHLOIsZbHzI="; + hash = "sha256-GucatimZTg0Fggrz4bG1x6YSa3wE/uLGB4ufil/km3w="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -41,7 +41,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple API to access Netatmo weather station data"; homepage = "https://github.com/jabesq/pyatmo"; + changelog = "https://github.com/jabesq/pyatmo/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ delroth ]; }; diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 644c346e4b0c..046486ba895a 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -14,6 +14,7 @@ , pytest-asyncio , pytest-timeout , pytestCheckHook +, pythonRelaxDepsHook , pythonOlder , requests , srptools @@ -25,24 +26,39 @@ buildPythonPackage rec { version = "0.10.3"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ng5KfW93p2/N2a6lnGbRJC6aWOQgTl0imBLdUIUlDic="; + hash = "sha256-ng5KfW93p2/N2a6lnGbRJC6aWOQgTl0imBLdUIUlDic="; }; 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" ''; + pythonRelaxDeps = [ + "aiohttp" + "async_timeout" + "bitarray" + "chacha20poly1305-reuseable" + "cryptography" + "ifaddr" + "mediafile" + "miniaudio" + "protobuf" + "requests" + "srptools" + "zeroconf" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ aiohttp bitarray @@ -57,7 +73,7 @@ buildPythonPackage rec { zeroconf ]; - checkInputs = [ + nativeCheckInputs = [ deepdiff pytest-aiohttp pytest-asyncio @@ -72,6 +88,7 @@ buildPythonPackage rec { disabledTestPaths = [ # Test doesn't work in the sandbox "tests/protocols/companion/test_companion_auth.py" + "tests/protocols/mrp/test_mrp_auth.py" ]; __darwinAllowLocalNetworking = true; @@ -83,7 +100,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python client library for the Apple TV"; homepage = "https://github.com/postlund/pyatv"; + changelog = "https://github.com/postlund/pyatv/blob/v${version}/CHANGES.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pyaudio/default.nix b/pkgs/development/python-modules/pyaudio/default.nix index 82f2b685d268..365a8565db65 100644 --- a/pkgs/development/python-modules/pyaudio/default.nix +++ b/pkgs/development/python-modules/pyaudio/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "PyAudio"; - version = "0.2.12"; + version = "0.2.13"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "sha256-Vd3123K8U3u6X128o6ufAiLuW4Qr2oOXjqsLe49g+54="; + sha256 = "sha256-JrzMgeQkPRwP9Uh+a0gd5jKfzWXHk2XCZ87zjzY6K1Y="; }; buildInputs = [ pkgs.portaudio ]; diff --git a/pkgs/development/python-modules/pyautogui/default.nix b/pkgs/development/python-modules/pyautogui/default.nix index a7b35bc5710e..d9747d43387b 100644 --- a/pkgs/development/python-modules/pyautogui/default.nix +++ b/pkgs/development/python-modules/pyautogui/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "sha256-R9tcTqxUaqw63FLOGFRaO/Oz6kD7V6MPHdQ8A29NdXw="; }; - checkInputs = [ xvfb-run scrot ]; + nativeCheckInputs = [ xvfb-run scrot ]; checkPhase = '' xvfb-run python -c 'import pyautogui' # The tests depend on some specific things that xvfb cant provide, like keyboard and mouse diff --git a/pkgs/development/python-modules/pyavm/default.nix b/pkgs/development/python-modules/pyavm/default.nix index c5127be1a877..9c343c53fe7d 100644 --- a/pkgs/development/python-modules/pyavm/default.nix +++ b/pkgs/development/python-modules/pyavm/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { astropy-helpers ]; - checkInputs = [ + nativeCheckInputs = [ astropy pillow pytestCheckHook diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index 12c4851e3470..3ae7a774785f 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ asn1crypto click lxml ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Python3 Parser for Android XML file and get Application Name without using Androguard"; diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index d16ff8e4ef34..bd0c899ce604 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-dtB035p7mJs1iZJqsZRmd7uzmez+IwcUsTFX4mM2Ee0="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pybase64" ]; diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 18717f40f4fe..be47a00080cc 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - version = "0.15.3"; + version = "0.15.5"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TZnJebxLwgnP9woC0downJv4xrAzjioLZuvqd8fzxGE="; + sha256 = "sha256-ryIiWpFoh0KSmyLI4LDn+EkXEYwDIr8/A7opoZJ+bo4="; }; propagatedBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { sqlalchemy ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "bids" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pybigwig/default.nix b/pkgs/development/python-modules/pybigwig/default.nix index cb1764b23b04..cb23c2a5732b 100644 --- a/pkgs/development/python-modules/pybigwig/default.nix +++ b/pkgs/development/python-modules/pybigwig/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ zlib ]; - checkInputs = [ numpy pytest ]; + nativeCheckInputs = [ numpy pytest ]; meta = with lib; { homepage = "https://github.com/deeptools/pyBigWig"; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index e97db8beefe0..a5154a3e4abd 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.10.0"; + version = "2.10.3"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - hash = "sha256-/X8DZPFsNrKGbhjZ1GFOj17/NU6p4R+saCW3pLKVNeA="; + hash = "sha256-Rlr6Ec6BEujTxQkQ9UP+6u0cYeFsJlj7U346MtRM6QM="; }; postPatch = '' @@ -33,10 +33,16 @@ buildPythonPackage rec { dontUseCmakeBuildDir = true; + # Don't build tests if not needed, read the doInstallCheck value at runtime + preConfigure = '' + if [ -n "$doInstallCheck" ]; then + cmakeFlagsArray+=("-DBUILD_TESTING=ON") + fi + ''; + cmakeFlags = [ "-DBoost_INCLUDE_DIR=${lib.getDev boost}/include" "-DEIGEN3_INCLUDE_DIR=${lib.getDev eigen}/include/eigen3" - "-DBUILD_TESTING=on" "-DPYTHON_EXECUTABLE:FILEPATH=${python.pythonForBuild.interpreter}" ] ++ lib.optionals (python.isPy3k && !stdenv.cc.isClang) [ "-DPYBIND11_CXX_STANDARD=-std=c++17" @@ -54,7 +60,7 @@ buildPythonPackage rec { ln -sf $out/include/pybind11 $out/include/${python.libPrefix}/pybind11 ''; - checkInputs = [ + nativeCheckInputs = [ catch numpy pytestCheckHook @@ -72,6 +78,12 @@ buildPythonPackage rec { "tests/extra_setuptools/test_setuphelper.py" ]; + disabledTests = lib.optionals (stdenv.isDarwin) [ + # expects KeyError, gets RuntimeError + # https://github.com/pybind/pybind11/issues/4243 + "test_cross_module_exception_translator" + ]; + meta = with lib; { homepage = "https://github.com/pybind/pybind11"; changelog = "https://github.com/pybind/pybind11/blob/${src.rev}/docs/changelog.rst"; diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix index ab18b4886bda..a7a5de92e9e8 100644 --- a/pkgs/development/python-modules/pybindgen/default.nix +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pygccxml ]; diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index 394ea6e3fb0d..004572279abb 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -1,22 +1,22 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , requests , requests-oauthlib , voluptuous -, pythonOlder }: buildPythonPackage rec { pname = "pybotvac"; - version = "0.0.23"; + version = "0.0.24"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VLT+VlwQAAxU1WRNCB4t4fhQ2u+6w5zqdM6mSbR7+xI="; + hash = "sha256-SXIs9AUXWm1H49MVDT4z6msNPaW5sAU20rcsWZ7ERdU="; }; propagatedBuildInputs = [ @@ -25,7 +25,7 @@ buildPythonPackage rec { voluptuous ]; - # no tests + # Module no tests doCheck = false; pythonImportsCheck = [ @@ -35,7 +35,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for interacting with Neato Botvac Connected vacuum robots"; homepage = "https://github.com/stianaske/pybotvac"; + changelog = "https://github.com/stianaske/pybotvac/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pybravia/default.nix b/pkgs/development/python-modules/pybravia/default.nix index 89aedb3de0bf..92fe34836851 100644 --- a/pkgs/development/python-modules/pybravia/default.nix +++ b/pkgs/development/python-modules/pybravia/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pybravia"; - version = "0.2.3"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Drafteed"; repo = pname; rev = "v${version}"; - hash = "sha256-ZM1XJnEYMNcbVOkpcI1ml7Cck2CXA2QXEpJMx3RwtSQ="; + hash = "sha256-aY+G4e2uq2yWUkJ9CXnOhc5S57kkMB36N/x+iQDCivo="; }; nativeBuildInputs = [ @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for remote control of Sony Bravia TVs 2013 and newer"; homepage = "https://github.com/Drafteed/pybravia"; + changelog = "https://github.com/Drafteed/pybravia/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pybrowserid/default.nix b/pkgs/development/python-modules/pybrowserid/default.nix index 391be3c17bd4..23906cbd2e4e 100644 --- a/pkgs/development/python-modules/pybrowserid/default.nix +++ b/pkgs/development/python-modules/pybrowserid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; meta = with lib; { description = "Python library for the BrowserID Protocol"; diff --git a/pkgs/development/python-modules/pybtex-docutils/default.nix b/pkgs/development/python-modules/pybtex-docutils/default.nix index 1bffde00e8e8..d8f9e4616f4e 100644 --- a/pkgs/development/python-modules/pybtex-docutils/default.nix +++ b/pkgs/development/python-modules/pybtex-docutils/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pybtex ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index ee77b3e10358..23450ed37c21 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pycairo"; - version = "1.21.0"; + version = "1.23.0"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pycairo"; rev = "refs/tags/v${version}"; - sha256 = "sha256-cwkGN5O15DduCLkFWeh8DPO4lY64iIlCQaUsCBKB8Mw="; + sha256 = "sha256-tkyVTJUdL2pBpBUpWsiDPKnd5OV88w3TdEOMxMc+hPM="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { libxcrypt ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index a0a0ff76337b..ad1c7c1cec50 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -1,41 +1,48 @@ -{ lib, fetchpatch -, buildPythonPackage, fetchPypi, isPy3k -, beautifulsoup4, lxml, cssutils, future, enum34, six +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, beautifulsoup4 +, lxml +, cssutils +, nltk +, pytest-lazy-fixture +, pytestCheckHook }: buildPythonPackage rec { pname = "pycaption"; - version = "1.0.1"; + version = "2.1.1"; + + disabled = pythonOlder "3.6"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "0f2hx9ky65c4niws3x5yx59yi8mqqrw9b2cghd220g4hj9yl800h"; + hash = "sha256-B+uIh8WTPPeNVU3yP8FEGc8OinY0MpJb9dHLC+nhi4I="; }; - disabled = !isPy3k; - - prePatch = '' - substituteInPlace setup.py \ - --replace 'beautifulsoup4>=4.2.1,<4.5.0' \ - 'beautifulsoup4>=4.2.1,<5' - ''; - - # don't require enum34 on python >= 3.4 - patches = [ - (fetchpatch { - url = "https://github.com/pbs/pycaption/pull/161.patch"; - sha256 = "0p58awpsqx1qc3x9zfl1gd85h1nk7204lzn4kglsgh1bka0j237j"; - }) + propagatedBuildInputs = [ + beautifulsoup4 + lxml + cssutils ]; - propagatedBuildInputs = [ beautifulsoup4 lxml cssutils future enum34 six ]; + passthru.optional-dependencies = { + transcript = [ nltk ]; + }; - # Tests not included in pypi (?) - doCheck = false; + nativeCheckInputs = [ + pytest-lazy-fixture + pytestCheckHook + ]; meta = with lib; { + changelog = "https://github.com/pbs/pycaption/blob/${version}/docs/changelog.rst"; description = "Closed caption converter"; homepage = "https://github.com/pbs/pycaption"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index 74dc59aefbe8..84a7cbe1ba42 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -1,18 +1,24 @@ { lib +, aiodns , buildPythonPackage , c-ares , cffi , fetchPypi , idna +, pythonOlder +, tornado }: buildPythonPackage rec { pname = "pycares"; - version = "4.2.2"; + version = "4.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4fV6gAQ3AIBpS9b7lpof/JFxpZxoJNVPeRwbLk0pg4U="; + hash = "sha256-xUJpb22sl46dmRkjhHRaZfgKfZRQUBFR5KdWPgYBDUU="; }; buildInputs = [ @@ -31,11 +37,18 @@ buildPythonPackage rec { # Requires network access doCheck = false; - pythonImportsCheck = [ "pycares" ]; + passthru.tests = { + inherit aiodns tornado; + }; + + pythonImportsCheck = [ + "pycares" + ]; meta = with lib; { description = "Python interface for c-ares"; homepage = "https://github.com/saghul/pycares"; + changelog = "https://github.com/saghul/pycares/releases/tag/pycares-${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pycarwings2/default.nix b/pkgs/development/python-modules/pycarwings2/default.nix index e404475e93ba..d89035bac222 100644 --- a/pkgs/development/python-modules/pycarwings2/default.nix +++ b/pkgs/development/python-modules/pycarwings2/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pycarwings2"; - version = "2.13"; + version = "2.14"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "filcole"; repo = pname; rev = "v${version}"; - sha256 = "04k1la7wix6sp668nqpwdhd3057b2bzcz7h2b9a57cxlifl8pjxf"; + sha256 = "sha256-kqj/NZXqgPUsOnnzMPmIlICHek7RBxksmL3reNBK+bo="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { pycryptodome ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with the NissanConnect EV"; homepage = "https://github.com/filcole/pycarwings2"; + changelog = "https://github.com/filcole/pycarwings2/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pycategories/default.nix b/pkgs/development/python-modules/pycategories/default.nix index ec902e0b385d..8d41b7f4ee42 100644 --- a/pkgs/development/python-modules/pycategories/default.nix +++ b/pkgs/development/python-modules/pycategories/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { # and shouldn't be used in production code propagatedBuildInputs = [ (callPackage ./infix.nix { }) ]; - checkInputs = [ pytest pytest-cov ]; + nativeCheckInputs = [ pytest pytest-cov ]; meta = with lib; { homepage = "https://gitlab.com/danielhones/pycategories"; diff --git a/pkgs/development/python-modules/pycec/default.nix b/pkgs/development/python-modules/pycec/default.nix index 640cc6b36561..c33b3c1fad84 100644 --- a/pkgs/development/python-modules/pycec/default.nix +++ b/pkgs/development/python-modules/pycec/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { libcec ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pycep-parser/default.nix b/pkgs/development/python-modules/pycep-parser/default.nix index aab9f05d93ff..5888b82fbd6f 100644 --- a/pkgs/development/python-modules/pycep-parser/default.nix +++ b/pkgs/development/python-modules/pycep-parser/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ assertpy pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pycfdns/default.nix b/pkgs/development/python-modules/pycfdns/default.nix index 4f7a4d282bdc..df7979be3881 100644 --- a/pkgs/development/python-modules/pycfdns/default.nix +++ b/pkgs/development/python-modules/pycfdns/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pycfdns"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; - rev = version; - sha256 = "sha256-2vjeoI+IqvCIHb51BLkuTISbG0PxFGHlmpSiCaV+E0w="; + rev = "refs/tags/${version}"; + hash = "sha256-f6kxYX/dg16OWYpw29dH4Z26ncLZCYyHKGc4fzoCld0="; }; propagatedBuildInputs = [ @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for updating Cloudflare DNS A records"; homepage = "https://github.com/ludeeus/pycfdns"; + changelog = "https://github.com/ludeeus/pycfdns/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix index dde651cf783b..03f8b1d69959 100644 --- a/pkgs/development/python-modules/pycfmodel/default.nix +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ httpx pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 727a46375bed..5fd60d40e1bf 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , casttube , fetchPypi -, isPy3k +, pythonOlder , protobuf , requests , zeroconf @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "12.1.4"; + version = "13.0.4"; format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "PyChromecast"; inherit version; - sha256 = "sha256-nlfcmFpKBdtb3NXaIZy/bO0lVIygk/jXS8EHs8VU7AA="; + hash = "sha256-eS+6PzHklopemcGcdxd0CDoqp+iX6/b14hjjCOM6Rh8="; }; postPatch = '' @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Python to communicate with the Google Chromecast"; homepage = "https://github.com/home-assistant-libs/pychromecast"; + changelog = "https://github.com/home-assistant-libs/pychromecast/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/pyclimacell/default.nix b/pkgs/development/python-modules/pyclimacell/default.nix index 7f5703585c43..31343ce7b7a2 100644 --- a/pkgs/development/python-modules/pyclimacell/default.nix +++ b/pkgs/development/python-modules/pyclimacell/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyclip/default.nix b/pkgs/development/python-modules/pyclip/default.nix index 6a344365b25b..cfeb3a19916b 100644 --- a/pkgs/development/python-modules/pyclip/default.nix +++ b/pkgs/development/python-modules/pyclip/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyclip"; - version = "0.6.0"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "spyoungtech"; repo = pname; - rev = "v${version}"; - hash = "sha256-NCWmCp4VGwwvubqN8FUUJ0kcZbXjOEyB6+BfGky1Kj4="; + rev = "refs/tags/v${version}"; + hash = "sha256-0nOkNgT8XCwtXI9JZntkhoMspKQU602rTKBFajVKBoM="; }; postPatch = '' @@ -27,7 +27,7 @@ buildPythonPackage rec { --replace docs/README.md README.md ''; - checkInputs = [ + nativeCheckInputs = [ pytest ] ++ lib.optionals stdenv.isLinux [ xclip diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix index 9216f0d5b893..1b9eba36b96d 100644 --- a/pkgs/development/python-modules/pyclipper/default.nix +++ b/pkgs/development/python-modules/pyclipper/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyclipper"; - version = "1.3.0.post3"; + version = "1.3.0.post4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fonttools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-viBnmzbCAH9QaVHwUq43rm11e8o3N/jtGsGpmRZokaw="; + hash = "sha256-FMqOZ0WOorTtbdweeu9UdoUNWOPrcwc+0SK+55XxyQQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -28,7 +28,7 @@ buildPythonPackage rec { cython ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index f3817a16d996..ecba98c85e73 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.6"; + version = "3.7"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sepandhaghighi"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-96M/QKt4AdiZoZ7L9AHocSyZPkwEb2iuRJKW3rVP3hc="; + sha256 = "sha256-Yow5MVbaBgKA7U6RNpS/Yh1mG3XSLKPSDsUeBRSln1U="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { seaborn ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pycmarkgfm/default.nix b/pkgs/development/python-modules/pycmarkgfm/default.nix index 348bca8d49e7..14e62474e9b7 100644 --- a/pkgs/development/python-modules/pycmarkgfm/default.nix +++ b/pkgs/development/python-modules/pycmarkgfm/default.nix @@ -2,12 +2,13 @@ buildPythonPackage rec { pname = "pycmarkgfm"; - version = "1.1.0"; + version = "1.2.0"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "694cb242f4961437c30b5b015dfbce9d1a1fa48305c2e39f902ce7c65b4cbe0e"; + sha256 = "sha256-qvTMXpQhC3Yx8LwbQDiELhgdkGzjirKT30N1NkXF5ps="; }; propagatedNativeBuildInputs = [ cffi ]; @@ -19,7 +20,7 @@ buildPythonPackage rec { # pytest in an environment that does not contain this extension, which fails. # cmarkgfm has virtually the same build setup as this package, and uses the # same trick: pkgs/development/python-modules/cmarkgfm/default.nix - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest ''; @@ -27,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/zopieux/pycmarkgfm"; description = "Bindings to GitHub's Flavored Markdown (cmark-gfm), with enhanced support for task lists"; + changelog = "https://github.com/zopieux/pycmarkgfm/raw/v${version}/CHANGELOG.md"; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl3Plus; maintainers = with maintainers; [ zopieux ]; diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 9904353bfccd..ed4ac3f5fbf3 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pycodestyle"; - version = "2.9.1"; + version = "2.10.0"; disabled = pythonOlder "3.6"; @@ -15,10 +15,10 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "2c9607871d58c76354b697b42f5d57e1ada7d261c261efac224b664affdc5785"; + hash = "sha256-NHGHvbR2Mp2Y9pXCE9cpWoRtEVL/T+m6y4qVkLjucFM="; }; - # https://github.com/PyCQA/pycodestyle/blob/2.9.1/tox.ini#L13 + # https://github.com/PyCQA/pycodestyle/blob/2.10.0/tox.ini#L13 checkPhase = '' ${python.interpreter} -m pycodestyle --statistics pycodestyle.py ${python.interpreter} -m pycodestyle --max-doc-length=72 --testsuite testsuite @@ -29,6 +29,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pycodestyle" ]; meta = with lib; { + changelog = "https://github.com/PyCQA/pycodestyle/blob/${version}/CHANGES.txt"; description = "Python style guide checker"; homepage = "https://pycodestyle.pycqa.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix index c0e0043d0597..2f1143b5ffdf 100644 --- a/pkgs/development/python-modules/pycognito/default.nix +++ b/pkgs/development/python-modules/pycognito/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pycognito"; - version = "2022.08.0"; + version = "2022.12.0"; disabled = isPy27; src = fetchFromGitHub { owner = "pvizeli"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-A80iYF2zwM2YkhnwJMU/bZezsCzs389ro1fikG8vXSA="; + sha256 = "sha256-WepDna9f3Z3dBxWdE6G7nbl3yPK5vMG+7X1rxbZwdjE="; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ freezegun mock moto diff --git a/pkgs/development/python-modules/pycoin/default.nix b/pkgs/development/python-modules/pycoin/default.nix index f20a971aa24d..1758eac9a215 100644 --- a/pkgs/development/python-modules/pycoin/default.nix +++ b/pkgs/development/python-modules/pycoin/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { substituteInPlace ./pycoin/cmds/tx.py --replace '"gpg"' '"${gnupg}/bin/gpg"' ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; dontUseSetuptoolsCheck = true; diff --git a/pkgs/development/python-modules/pycomfoconnect/default.nix b/pkgs/development/python-modules/pycomfoconnect/default.nix index 0c35dc4d5bac..79cc0334c2fc 100644 --- a/pkgs/development/python-modules/pycomfoconnect/default.nix +++ b/pkgs/development/python-modules/pycomfoconnect/default.nix @@ -2,17 +2,21 @@ , buildPythonPackage , fetchFromGitHub , protobuf +, pythonOlder }: buildPythonPackage rec { pname = "pycomfoconnect"; - version = "0.4"; + version = "0.5.1"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "michaelarnauts"; repo = "comfoconnect"; - rev = version; - sha256 = "0bipzv68yw056iz9m2g9h40hzrwd058a7crxp0xbq4rw2d8j0jn6"; + rev = "refs/tags/${version}"; + sha256 = "sha256-I/0vCgSEi6mgYg1fMH4Ha7PoonewtqYYsvXZT8y4rJE="; }; propagatedBuildInputs = [ @@ -22,11 +26,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "pycomfoconnect" ]; + pythonImportsCheck = [ + "pycomfoconnect" + ]; meta = with lib; { description = "Python module to interact with ComfoAir Q350/450/600 units"; homepage = "https://github.com/michaelarnauts/comfoconnect"; + changelog = "https://github.com/michaelarnauts/comfoconnect/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pycoolmasternet-async/default.nix b/pkgs/development/python-modules/pycoolmasternet-async/default.nix index 909feb944328..d8aa5760d5d9 100644 --- a/pkgs/development/python-modules/pycoolmasternet-async/default.nix +++ b/pkgs/development/python-modules/pycoolmasternet-async/default.nix @@ -1,12 +1,13 @@ { lib , buildPythonPackage -, pythonOlder , fetchFromGitHub +, pythonOlder }: buildPythonPackage rec { pname = "pycoolmasternet-async"; - version = "0.1.3"; + version = "0.1.6"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -14,13 +15,15 @@ buildPythonPackage rec { owner = "OnFreund"; repo = "pycoolmasternet-async"; rev = "v${version}"; - hash = "sha256-1Xd8OdN8d3g23kQZqihZrNLKoqLCbu5BvAMNitg8aDA="; + hash = "sha256-7RYKZWs8SCXCBgjbiTLSRUPujeraxiOE6MHENPmhimg="; }; # no tests implemented doCheck = false; - pythonImportsCheck = [ "pycoolmasternet_async" ]; + pythonImportsCheck = [ + "pycoolmasternet_async" + ]; meta = with lib; { description = "Python library to control CoolMasterNet HVAC bridges over asyncio"; diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index a0048e7e75c9..946f58ba0533 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix index 47f1a20fbb29..edc6744f672c 100644 --- a/pkgs/development/python-modules/pycparser/default.nix +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/pkgs/development/python-modules/pycron/default.nix b/pkgs/development/python-modules/pycron/default.nix index 7155ee95723e..7aa8afee1088 100644 --- a/pkgs/development/python-modules/pycron/default.nix +++ b/pkgs/development/python-modules/pycron/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "12hkqrdfg3jbqkmck8i00ssyaw1c4hhvdhjxkmh2gm9pd99z5bpv"; }; - checkInputs = [ arrow coveralls delorean nose pendulum pytz udatetime ]; + nativeCheckInputs = [ arrow coveralls delorean nose pendulum pytz udatetime ]; checkPhase = '' nosetests diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 29ef48bde165..f2b546cac802 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , callPackage , fetchFromGitHub -, cffi +, fetchpatch , gmp }: @@ -11,22 +11,29 @@ let in buildPythonPackage rec { pname = "pycryptodome"; - version = "3.15.0"; + version = "3.16.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Legrandin"; repo = "pycryptodome"; rev = "v${version}"; - hash = "sha256-SPRoAfwP1MFlVzZsVWmXDWUY5Yje7eg7d+9zJhZNXrw="; + hash = "sha256-8EAgeAU3HQiPrMKOtoVQQLbgq47cbveU2eQYp15XS/U="; }; + patches = [ + (fetchpatch { + url = "https://github.com/Legrandin/pycryptodome/commit/1c043abb089ddbc2fc43d1c169672688ccc64c64.patch"; + sha256 = "sha256-QklwOlFpQNAH0CpR06fWSZqx8C97RV8BRsKbp2j8js8="; + }) + ]; + postPatch = '' substituteInPlace lib/Crypto/Math/_IntegerGMP.py \ --replace 'load_lib("gmp"' 'load_lib("${gmp}/lib/libgmp.so.10"' ''; - checkInputs = [ + nativeCheckInputs = [ test-vectors ]; diff --git a/pkgs/development/python-modules/pycryptodome/vectors.nix b/pkgs/development/python-modules/pycryptodome/vectors.nix index f6a2b715ad91..89df4507867e 100644 --- a/pkgs/development/python-modules/pycryptodome/vectors.nix +++ b/pkgs/development/python-modules/pycryptodome/vectors.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pycryptodome-test-vectors"; - version = "1.0.8"; + version = "1.0.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-3BTh7as4CikvVfUx2xBZlUOaq/dAQNNFHpuRxWg/5N0="; + hash = "sha256-oqgHWAw0Xrc22eAuY6+Q/H90tL9Acz6V0EJp060hH2Q="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix index 4538410c3623..b1e5ec095f13 100644 --- a/pkgs/development/python-modules/pyct/default.nix +++ b/pkgs/development/python-modules/pyct/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index c0ea080396bd..e2a41cca4a3a 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -24,11 +24,11 @@ let in buildPythonPackage rec { pname = "pycuda"; - version = "2022.1"; + version = "2022.2.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rNkDDZPnbmCxIuM60WvPAbsTRPTDBN7f8c0r/7DzE6M="; + sha256 = "sha256-zZLnJGu0WsNFKVWhEHFBEmdM3ztKni9P8lpBWcaE5rs="; }; preConfigure = with lib.versions; '' diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index ab8a5a7e01dc..68e710cf3492 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { curl ]; - checkInputs = [ + nativeCheckInputs = [ bottle pytestCheckHook flaky diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index ba6612bbde47..2d0b967cb347 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.8.0"; + version = "2.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mustang51"; repo = pname; rev = "v${version}"; - hash = "sha256-AZDwoq4lCThzwHI0WCzrV9Il2MHp0LKxWg/dscGw0q0="; + hash = "sha256-cJkrBt4HRH2SX4YWo+gK4rd7uyZRzLUvFXJ6L5nxzeM="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytest-aiohttp pytestCheckHook diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix index a3bd6ee91469..0420c3fd4f87 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 = "20220916.1"; + version = "20221110.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GKnJ1aRLuJp+wQVjzL51o/KteGD5k4X221bDzpIiEEQ="; + sha256 = "sha256-fD6JHHD42JGONidvIQoZWbt7rfOydvRxkZhv/PW2o5A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 31f456dabc68..93af15c4e0d9 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, autoflake , cython , devtools , email-validator @@ -8,11 +9,13 @@ , pytest-mock , pytestCheckHook , python-dotenv +, pythonAtLeast , pythonOlder +, pyupgrade , typing-extensions # dependencies for building documentation. # docs fail to build in Darwin sandbox: https://github.com/samuelcolvin/pydantic/issues/4245 -, withDocs ? (stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isDarwin) +, withDocs ? (stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isDarwin && pythonAtLeast "3.10") , ansi2html , markdown-include , mkdocs @@ -27,7 +30,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.9.2"; + version = "1.10.4"; outputs = [ "out" @@ -41,7 +44,7 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ZGFxyQ1qD3zZWTdfTeoGj3UcUwAzO8K0DySdVAsMHyI="; + sha256 = "sha256-BFyv1uVq2pLcJeS5955G/pDA3ce9YTqZ6F7kAkwnuvY="; }; postPatch = '' @@ -52,6 +55,7 @@ buildPythonPackage rec { cython ] ++ lib.optionals withDocs [ # dependencies for building documentation + autoflake ansi2html markdown-include mdx-truly-sane-lists @@ -67,15 +71,21 @@ buildPythonPackage rec { propagatedBuildInputs = [ devtools email-validator + pyupgrade python-dotenv typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; + pytestFlagsArray = [ + # https://github.com/pydantic/pydantic/issues/4817 + "-W" "ignore::pytest.PytestReturnNotNoneWarning" + ]; + preCheck = '' export HOME=$(mktemp -d) ''; diff --git a/pkgs/development/python-modules/pydash/default.nix b/pkgs/development/python-modules/pydash/default.nix index 57a0c6d1790e..14e7ffdfcd6e 100644 --- a/pkgs/development/python-modules/pydash/default.nix +++ b/pkgs/development/python-modules/pydash/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { hash = "sha256-VbuRzKwPMh5S4GZQYnh0sZOBi4LNFjMuol95tMC43b0="; }; - checkInputs = [ + nativeCheckInputs = [ invoke mock sphinx-rtd-theme diff --git a/pkgs/development/python-modules/pydeck/default.nix b/pkgs/development/python-modules/pydeck/default.nix index 9ca7638538a5..f38723f3fa2a 100644 --- a/pkgs/development/python-modules/pydeck/default.nix +++ b/pkgs/development/python-modules/pydeck/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pydeck" ]; - checkInputs = [ pytestCheckHook pandas ]; + nativeCheckInputs = [ pytestCheckHook pandas ]; # tries to start a jupyter server disabledTests = [ "test_nbconvert" ]; diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index c81c42d47707..54b4b2ef1d8a 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "105"; + version = "106"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-8GQJ4PCl8te3sovC5FwWoaQnXIRR27b7gPwfmyPRVBE="; + hash = "sha256-13of5ohz/hezlmGvSNqCu9QoOPKdPPtrhQHbxmG2/Do="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { orjson ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-aiohttp pytestCheckHook diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index 00f257be765e..ef5339086f63 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.10.24"; + version = "1.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yDHIZk6+9K5hg4Q6pydd4NwnxSU1+u+dGUiUQph9ccY="; + hash = "sha256-XAx7B3v+7xYiW15nJgiL82YlNeBxW80M0Rq0LMMsWu0="; }; buildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { stdlib-list ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pyyaml ]; @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module dependency visualization"; homepage = "https://github.com/thebjorn/pydeps"; + changelog = "https://github.com/thebjorn/pydeps/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pydevccu/default.nix b/pkgs/development/python-modules/pydevccu/default.nix index 212a245b328c..62754bdd18ee 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.3"; + version = "0.1.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -14,8 +14,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "danielperna84"; repo = pname; - rev = version; - sha256 = "sha256-rbxYTpB6ieZBYbbE1AKVEc/lapWlOUMOrSHCkuwkzLg="; + rev = "refs/tags/${version}"; + hash = "sha256-scgWD40jjt8qPGygV11Rfd4Z1voBlErScabLLcmQqGg="; }; # Module has no tests @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "HomeMatic CCU XML-RPC Server with fake devices"; homepage = "https://github.com/danielperna84/pydevccu"; + changelog = "https://github.com/danielperna84/pydevccu/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pydevd/default.nix b/pkgs/development/python-modules/pydevd/default.nix index 11ada4189d20..f595eb5d0b26 100644 --- a/pkgs/development/python-modules/pydevd/default.nix +++ b/pkgs/development/python-modules/pydevd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-+yRngN10654trB09ZZa8QQsTPdM7VxVj7r6jh7OcgAA="; }; - checkInputs = [ + nativeCheckInputs = [ numpy psutil pytestCheckHook diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 9310d0cf5553..34a802a25692 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -11,13 +11,13 @@ let pname = "pydicom"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "pydicom"; repo = "pydicom"; - rev = "v${version}"; - hash = "sha256-CAQWaBkzecJ1VXQ5BnAUjmBMjh0I8y+gT7I4P4o2gqI="; + rev = "refs/tags/v${version}"; + hash = "sha256-xt0aK908lLgNlpcI86OSxy96Z/PZnQh7+GXzJ0VMQGA="; }; # Pydicom needs pydicom-data to run some tests. If these files aren't downloaded @@ -42,7 +42,7 @@ buildPythonPackage { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pydispatcher/default.nix b/pkgs/development/python-modules/pydispatcher/default.nix index 902f39e6b970..1705fe918fd8 100644 --- a/pkgs/development/python-modules/pydispatcher/default.nix +++ b/pkgs/development/python-modules/pydispatcher/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { hash = "sha256-PX5PQ8cAAKHcox+SaU6Z0BAZNPpuq11UVadYhY2G35U="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { - homepage = "http://pydispatcher.sourceforge.net/"; + homepage = "https://pydispatcher.sourceforge.net/"; description = "Signal-registration and routing infrastructure for use in multiple contexts"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index 81788c5d66b5..ab7457a13086 100644 --- a/pkgs/development/python-modules/pydmd/default.nix +++ b/pkgs/development/python-modules/pydmd/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydmd"; - version = "0.4.0.post2211"; + version = "0.4.0.post2301"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "PyDMD"; rev = "refs/tags/v${version}"; - sha256 = "sha256-DTKw7Gy2w+zas9u62SN6QDhoeMEjSk/Ej09do38yfNY="; + hash = "sha256-0ss7yyT6u0if+YjBYNbKtx5beJU43JC1LD9rqHPKBS8="; }; propagatedBuildInputs = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { ezyrb ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Dynamic Mode Decomposition"; homepage = "https://mathlab.github.io/PyDMD/"; + changelog = "https://github.com/mathLab/PyDMD/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ yl3dy ]; broken = stdenv.hostPlatform.isAarch64; diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index 0658e1857174..4a5b693ef444 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { snowballstemmer ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index 8dccfbc2610d..ac965f8404e0 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ chardet pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pydrive2/default.nix b/pkgs/development/python-modules/pydrive2/default.nix index 6ebdc3d6cc57..159679b0515f 100644 --- a/pkgs/development/python-modules/pydrive2/default.nix +++ b/pkgs/development/python-modules/pydrive2/default.nix @@ -5,17 +5,20 @@ , oauth2client , pyopenssl , pyyaml -, six +, pythonOlder }: buildPythonPackage rec { pname = "pydrive2"; - version = "1.14.0"; + version = "1.15.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "PyDrive2"; inherit version; - sha256 = "sha256-212jvmcWMPVxynEAsoHYtdcv0His1CUkem0pLis9KEA="; + hash = "sha256-OuBrZr+WP0NSSYnIf01ngDlEH+BZmTxnA/szzDxtiuw="; }; propagatedBuildInputs = [ @@ -23,17 +26,19 @@ buildPythonPackage rec { oauth2client pyopenssl pyyaml - six ]; doCheck = false; - pythonImportsCheck = [ "pydrive2" ]; + pythonImportsCheck = [ + "pydrive2" + ]; - meta = { - description = "Google Drive API Python wrapper library. Maintained fork of PyDrive."; + meta = with lib; { + description = "Google Drive API Python wrapper library"; homepage = "https://github.com/iterative/PyDrive2"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ sei40kr ]; + changelog = "https://github.com/iterative/PyDrive2/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ sei40kr ]; }; } diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix index 3adf54281b77..a7c21329b594 100644 --- a/pkgs/development/python-modules/pydub/default.nix +++ b/pkgs/development/python-modules/pydub/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { "pydub.playback" ]; - checkInputs = [ + nativeCheckInputs = [ ffmpeg-full ]; diff --git a/pkgs/development/python-modules/pyduke-energy/default.nix b/pkgs/development/python-modules/pyduke-energy/default.nix index 35ab4e5af83f..08c7a6b5c98a 100644 --- a/pkgs/development/python-modules/pyduke-energy/default.nix +++ b/pkgs/development/python-modules/pyduke-energy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyduke-energy"; - version = "1.0.2"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mjmeli"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-0fxFZQr8Oti17egBvpvE92YsIZ+Jf8gYRh0J2g5WTIc="; + hash = "sha256-g+s9YaVFOCKaBGR5o9cPk4kcIW4BffFHTtmDNE8f/zE="; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-timeout pytestCheckHook @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for the Duke Energy API"; homepage = "https://github.com/mjmeli/pyduke-energy"; + changelog = "https://github.com/mjmeli/pyduke-energy/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pydy/default.nix b/pkgs/development/python-modules/pydy/default.nix index b342a2a99e03..265493d01d67 100644 --- a/pkgs/development/python-modules/pydy/default.nix +++ b/pkgs/development/python-modules/pydy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sympy ]; - checkInputs = [ + nativeCheckInputs = [ nose cython pytestCheckHook diff --git a/pkgs/development/python-modules/pydyf/default.nix b/pkgs/development/python-modules/pydyf/default.nix index 935cc044e5c1..402f8c6b1baf 100644 --- a/pkgs/development/python-modules/pydyf/default.nix +++ b/pkgs/development/python-modules/pydyf/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ ghostscript pillow pytestCheckHook diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix index c5d7f822d202..b33e4d7035e5 100644 --- a/pkgs/development/python-modules/pyeapi/default.nix +++ b/pkgs/development/python-modules/pyeapi/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { netaddr ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyeclib/default.nix b/pkgs/development/python-modules/pyeclib/default.nix index 7dd36c8fd6a1..4741f4a39973 100644 --- a/pkgs/development/python-modules/pyeclib/default.nix +++ b/pkgs/development/python-modules/pyeclib/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { buildInputs = [ liberasurecode ]; - checkInputs = [ six ]; + nativeCheckInputs = [ six ]; pythonImportsCheck = [ "pyeclib" ]; diff --git a/pkgs/development/python-modules/pyeconet/default.nix b/pkgs/development/python-modules/pyeconet/default.nix index 581238c90ac6..c12720305590 100644 --- a/pkgs/development/python-modules/pyeconet/default.nix +++ b/pkgs/development/python-modules/pyeconet/default.nix @@ -1,23 +1,30 @@ { lib -, paho-mqtt -, buildPythonPackage -, fetchPypi , aiohttp +, buildPythonPackage +, fetchFromGitHub +, paho-mqtt , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pyeconet"; - version = "0.1.15"; - format = "setuptools"; + version = "0.1.18"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-zxD2sjKWB/bmxwpVFgkKTngMhr4bVuW+qkSt+pbxqPY="; + src = fetchFromGitHub { + owner = "w1ll1am23"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-nKXYjv1a6nEuy8X0HnLSrvQDV2XVQhQuEm/gqnEVaoY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ paho-mqtt aiohttp @@ -33,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to the EcoNet API"; homepage = "https://github.com/w1ll1am23/pyeconet"; + changelog = "https://github.com/w1ll1am23/pyeconet/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index 7a967c48a042..a009186dd019 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytest-trio diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix index 1f0bcc15b3ea..817a39cedf9e 100644 --- a/pkgs/development/python-modules/pyelftools/default.nix +++ b/pkgs/development/python-modules/pyelftools/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyelftools"; - version = "0.28"; + version = "0.29"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,14 +17,16 @@ buildPythonPackage rec { owner = "eliben"; repo = pname; rev = "v${version}"; - hash = "sha256-+T5C0ah2oj5E8fWaQbuzYRVgD5bSiUbaArrlxNLojvw="; + hash = "sha256-tPY0C5CoA9hGHeEA/KWQ1RAVT5kqMlAwuWpOSH+KJ9Y="; }; doCheck = stdenv.hostPlatform.system == "x86_64-linux" && stdenv.hostPlatform.isGnu; checkPhase = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" test/external_tools/readelf - ${python.interpreter} test/all_tests.py + ${python.interpreter} test/run_all_unittests.py + ${python.interpreter} test/run_examples_test.py + ${python.interpreter} test/run_readelf_tests.py --parallel ''; pythonImportsCheck = [ @@ -34,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for analyzing ELF files and DWARF debugging information"; homepage = "https://github.com/eliben/pyelftools"; + changelog = "https://github.com/eliben/pyelftools/blob/v${version}/CHANGES"; license = licenses.publicDomain; maintainers = with maintainers; [ igsha pamplemousse ]; }; diff --git a/pkgs/development/python-modules/pyevmasm/default.nix b/pkgs/development/python-modules/pyevmasm/default.nix index d2923f1ad44a..bccf243a0a02 100644 --- a/pkgs/development/python-modules/pyevmasm/default.nix +++ b/pkgs/development/python-modules/pyevmasm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ future ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Ethereum Virtual Machine (EVM) assembler and disassembler"; diff --git a/pkgs/development/python-modules/pyexcel-ods/default.nix b/pkgs/development/python-modules/pyexcel-ods/default.nix index b923932ec574..b0f9028a70e7 100644 --- a/pkgs/development/python-modules/pyexcel-ods/default.nix +++ b/pkgs/development/python-modules/pyexcel-ods/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { odfpy ]; - checkInputs = [ + nativeCheckInputs = [ nose pyexcel pyexcel-xls diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix index ea520b50c6f3..1699757bd291 100644 --- a/pkgs/development/python-modules/pyexcel-xls/default.nix +++ b/pkgs/development/python-modules/pyexcel-xls/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { xlwt ]; - checkInputs = [ + nativeCheckInputs = [ nose pyexcel mock diff --git a/pkgs/development/python-modules/pyext/default.nix b/pkgs/development/python-modules/pyext/default.nix deleted file mode 100644 index eb88bf785860..000000000000 --- a/pkgs/development/python-modules/pyext/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: - -buildPythonPackage { - pname = "pyext"; - version = "0.8"; - - # Latest release not on Pypi or tagged since 2015 - src = fetchFromGitHub { - owner = "kirbyfan64"; - repo = "PyExt"; - rev = "1e018b12752ceb279f11aee123ed773d63dcec7e"; - sha256 = "16km897ng6lgjs39hv83xragdxh0mhyw6ds0qkm21cyci1k5m1vm"; - }; - - # Has no test suite - doCheck = false; - - meta = with lib; { - description = "Simple Python extensions"; - homepage = "https://github.com/kirbyfan64/PyExt"; - license = licenses.mit; - maintainers = with maintainers; [ edwtjo ]; - }; -} diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 35f8eb4bfa44..c827507a16b6 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.9"; + version = "0.2.0.12"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "baqs"; repo = "pyEzviz"; - rev = version; - sha256 = "sha256-HdtyERk2Af+O7/ei7S1+JO6zQxNXrSX95k9707SQuwE="; + rev = "refs/tags/${version}"; + hash = "sha256-RHwsKNbjKPMp0Ddc3eEsJbLwCAgbFd+5hpzUABYnTso="; }; propagatedBuildInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface for for Ezviz cameras"; homepage = "https://github.com/baqs/pyEzviz/"; + changelog = "https://github.com/BaQs/pyEzviz/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index bd0785d9403c..b976989f6b5b 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyface"; - version = "7.4.2"; + version = "7.4.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YT7TAcubr7m6o3xEeT13XQPdI9hD7rkm/xPPaJ6v6N0="; + hash = "sha256-0F+qxFOUvVWYWQahIM8AEv58rCxmNJYsBTC2pjUO2yI="; }; propagatedBuildInputs = [ @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Traits-capable windowing framework"; homepage = "https://github.com/enthought/pyface"; + changelog = "https://github.com/enthought/pyface/releases/tag/${version}"; maintainers = with maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index 11359954c505..4f7e62450a9a 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales nose numpy diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index bac9202a2b22..f833e8c24ead 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.6.3"; + version = "5.0.0"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bfEqfPZXY3obA2vCAFlyfGQvkpkOkP7i+wA9qjzabKE="; + sha256 = "sha256-GdHY8e5SCJHXi27QXCB44HktVF+D3uM0YfuqXMcuGH0="; }; postPatch = '' @@ -29,7 +29,7 @@ buildPythonPackage rec { --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir" ''); - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # https://github.com/jmcgeheeiv/pyfakefs/issues/581 (OSError: [Errno 9] Bad file descriptor) disabledTests = [ "test_open_existing_pipe" ]; pythonImportsCheck = [ "pyfakefs" ]; diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix index 651ad1c439e3..976ecfa5c6a4 100644 --- a/pkgs/development/python-modules/pyfftw/default.nix +++ b/pkgs/development/python-modules/pyfftw/default.nix @@ -2,12 +2,12 @@ , fftw, fftwFloat, fftwLongDouble, numpy, scipy, cython, dask }: buildPythonPackage rec { - version = "0.13.0"; + version = "0.13.1"; pname = "pyFFTW"; src = fetchPypi { inherit pname version; - sha256 = "da85102405c0bd95d57eb19e99b01a0729d8406cb204c3900894b873784253da"; + sha256 = "sha256-CRVekKDG0MHy0fNmgYCn3pX7n4P+9RN6ES+wWXjocyA="; }; preConfigure = '' diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 64f554a00efd..56e6e8864526 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyflakes"; - version = "2.5.0"; + version = "3.0.1"; disabled = pythonOlder "3.6"; @@ -15,10 +15,10 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "491feb020dca48ccc562a8c0cbe8df07ee13078df59813b83959cbdada312ea3"; + hash = "sha256-7IsnamtgvYDe/tJa3X5DmIHBnmSFCv2bNGKD1BZf0P0="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyflume/default.nix b/pkgs/development/python-modules/pyflume/default.nix index cb02243676a5..e59381a1360f 100644 --- a/pkgs/development/python-modules/pyflume/default.nix +++ b/pkgs/development/python-modules/pyflume/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ requests-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyflunearyou/default.nix b/pkgs/development/python-modules/pyflunearyou/default.nix index a481e9a97a89..ea59fa0dc10f 100644 --- a/pkgs/development/python-modules/pyflunearyou/default.nix +++ b/pkgs/development/python-modules/pyflunearyou/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { ujson ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytest-aiohttp diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix index 103446dbe68f..5c73cc84c267 100644 --- a/pkgs/development/python-modules/pyfma/default.nix +++ b/pkgs/development/python-modules/pyfma/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyfritzhome/default.nix b/pkgs/development/python-modules/pyfritzhome/default.nix index a9f8f20a76b1..b2baa5146671 100644 --- a/pkgs/development/python-modules/pyfritzhome/default.nix +++ b/pkgs/development/python-modules/pyfritzhome/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ mock nose ]; diff --git a/pkgs/development/python-modules/pyfronius/default.nix b/pkgs/development/python-modules/pyfronius/default.nix index 8a27fb0bae9c..0133d409d0c6 100644 --- a/pkgs/development/python-modules/pyfronius/default.nix +++ b/pkgs/development/python-modules/pyfronius/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index b69b7acc99d4..b276e80e6b28 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ mock psutil ]; diff --git a/pkgs/development/python-modules/pyfuse3/default.nix b/pkgs/development/python-modules/pyfuse3/default.nix index e7b545d2a5ec..19e92f9d532e 100644 --- a/pkgs/development/python-modules/pyfuse3/default.nix +++ b/pkgs/development/python-modules/pyfuse3/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ${python.pythonForBuild.interpreter} setup.py build_cython ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-trio which diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix index 46a25e2c6bba..0df1538c9ced 100644 --- a/pkgs/development/python-modules/pyfxa/default.nix +++ b/pkgs/development/python-modules/pyfxa/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ grequests mock responses diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index 86a56c11bcaa..29b3743be0da 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { png = [ cairosvg ]; }; - checkInputs = [ + nativeCheckInputs = [ pyquery pytestCheckHook ] ++ passthru.optional-dependencies.png; diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix index 7404a5fefcbb..80a8f4eaadeb 100644 --- a/pkgs/development/python-modules/pygame-gui/default.nix +++ b/pkgs/development/python-modules/pygame-gui/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pygame-gui"; - version = "064"; + version = "067"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "MyreMylar"; repo = "pygame_gui"; rev = "refs/tags/v_${version}"; - sha256 = "sha256-13+fK1hYxiMh0T+xbbmHViZjyBoQfRyIDc05fIJ/46U="; + sha256 = "sha256-ZBd9jq+20A8kxsvZxuCIfyzuZvk5/73vhh4xmExuwGQ="; }; propagatedBuildInputs = [ pygame python-i18n ]; @@ -26,7 +26,7 @@ buildPythonPackage rec { --replace "xsel" "${pkgs.xsel}/bin/xsel" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/pygatt/default.nix b/pkgs/development/python-modules/pygatt/default.nix index fab5c093c502..f622dccab292 100644 --- a/pkgs/development/python-modules/pygatt/default.nix +++ b/pkgs/development/python-modules/pygatt/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pexpect ]; - checkInputs = [ + nativeCheckInputs = [ mock nose pytestCheckHook diff --git a/pkgs/development/python-modules/pygbm/default.nix b/pkgs/development/python-modules/pygbm/default.nix index 5367f622e9b8..4eac823b50e8 100644 --- a/pkgs/development/python-modules/pygbm/default.nix +++ b/pkgs/development/python-modules/pygbm/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { scikit-learn ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pygdbmi/default.nix b/pkgs/development/python-modules/pygdbmi/default.nix index c1be042dc7d9..af328835752e 100644 --- a/pkgs/development/python-modules/pygdbmi/default.nix +++ b/pkgs/development/python-modules/pygdbmi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0a6b3zyxwdcb671c6lrwxm8fhvsbjh0m8hf1r18m9dha86laimjr"; }; - checkInputs = [ gdb ]; + nativeCheckInputs = [ gdb ]; # tests require gcc for some reason doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/development/python-modules/pygeos/default.nix b/pkgs/development/python-modules/pygeos/default.nix index 3b22c119ba20..67fa2e02aa59 100644 --- a/pkgs/development/python-modules/pygeos/default.nix +++ b/pkgs/development/python-modules/pygeos/default.nix @@ -10,25 +10,21 @@ buildPythonPackage rec { pname = "pygeos"; - version = "0.13"; + version = "0.14"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HDcweKrVou/tHDnNcceXqiAzvzCH8191FrrIm+ULmGE="; + hash = "sha256-MPvBf2SEQgC4UTO4hfz7ZVQbh3lTH270+P5GfT+6diM="; }; - patches = [ - # Adapt https://github.com/shapely/shapely/commit/4889bd2d72ff500e51ba70d5b954241878349562, - # backporting to pygeos - ./fix-for-geos-3-11.patch - ]; - nativeBuildInputs = [ geos # for geos-config cython ]; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + numpy + ]; # The cythonized extensions are required to exist in the pygeos/ directory # for the package to function. Therefore override of buildPhase was @@ -38,15 +34,18 @@ buildPythonPackage rec { ${python.interpreter} setup.py bdist_wheel ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "pygeos" ]; + pythonImportsCheck = [ + "pygeos" + ]; meta = with lib; { - description = "Wraps GEOS geometry functions in numpy ufuncs."; + description = "Wraps GEOS geometry functions in numpy ufuncs"; homepage = "https://github.com/pygeos/pygeos"; + changelog = "https://github.com/pygeos/pygeos/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ nialov ]; }; diff --git a/pkgs/development/python-modules/pygeos/fix-for-geos-3-11.patch b/pkgs/development/python-modules/pygeos/fix-for-geos-3-11.patch deleted file mode 100644 index fe81c0769c18..000000000000 --- a/pkgs/development/python-modules/pygeos/fix-for-geos-3-11.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ea82dbefeb573150935eb78a6916813775512e76 Mon Sep 17 00:00:00 2001 -From: Joris Van den Bossche -Date: Tue, 26 Apr 2022 22:17:00 +0200 -Subject: [PATCH] TST: fix tests for GEOS main (#1357) (backported for nixpkgs) - ---- - pygeos/tests/test_constructive.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/pygeos/tests/test_constructive.py b/pygeos/tests/test_constructive.py -index 87c0a9f..b3459d1 100644 ---- a/pygeos/tests/test_constructive.py -+++ b/pygeos/tests/test_constructive.py -@@ -48,7 +48,11 @@ def test_no_args_array(geometry, func): - @pytest.mark.parametrize("geometry", all_types) - @pytest.mark.parametrize("func", CONSTRUCTIVE_FLOAT_ARG) - def test_float_arg_array(geometry, func): -- if func is pygeos.offset_curve and pygeos.get_type_id(geometry) not in [1, 2]: -+ if ( -+ func is pygeos.offset_curve -+ and pygeos.get_type_id(geometry) not in [1, 2] -+ and pygeos.geos_version < (3, 11, 0) -+ ): - with pytest.raises(GEOSException, match="only accept linestrings"): - func([geometry, geometry], 0.0) - return --- -2.36.1 - diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 413b79c562b1..bf35421b6b08 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.10.1"; + version = "1.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NUZRvwYsAtHwgEHW+/GptL96k6/OZZeb3Ai9xlZTqi4="; + hash = "sha256-eT9YP9M2IPCsODdtsPV3aO8pIribRZ51saxEA3frZOw="; }; preConfigure = lib.optionalString stdenv.isDarwin '' @@ -43,7 +43,7 @@ buildPythonPackage rec { cffi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index f1c4bb44d9ae..82ccd411e85e 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.27"; + version = "2.0.2.1"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TQDgZ0UfOxD9UbaXZP3atlRENyoto0TuKzXwqObr8AU="; + sha256 = "sha256-WonGjdooD3Yb3rAha536An+y4nUZoOo8FvZViyBPHl8="; extension = "zip"; }; @@ -84,7 +84,7 @@ buildPythonPackage rec { # tests do run and pass in nix-shell, however. doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index ce69c36d7461..199082cae15e 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -3,7 +3,7 @@ , pythonOlder , fetchFromGitHub , setuptools-scm -, pydantic +, lsprotocol , toml , typeguard , mock @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pygls"; - version = "0.12.3"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,20 +21,22 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openlawlibrary"; repo = "pygls"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-RtoRIfPIbERQFx0GzQqsxnKAMsIK5Zbf2sNtHhC2fmo="; + rev = "v${version}"; + hash = "sha256-31J4+giK1RDBS52Q/Ia3Y/Zak7fp7gRVTQ7US/eFjtM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + toml + ]; propagatedBuildInputs = [ - pydantic - toml + lsprotocol typeguard ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook @@ -46,6 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pygls" ]; meta = with lib; { + changelog = "https://github.com/openlawlibrary/pygls/blob/${src.rev}/CHANGELOG.md"; description = "Pythonic generic implementation of the Language Server Protocol"; homepage = "https://github.com/openlawlibrary/pygls"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pygmars/default.nix b/pkgs/development/python-modules/pygmars/default.nix index e0764ecb3a4b..4b0a701c79e1 100644 --- a/pkgs/development/python-modules/pygmars/default.nix +++ b/pkgs/development/python-modules/pygmars/default.nix @@ -8,15 +8,16 @@ buildPythonPackage rec { pname = "pygmars"; - version = "0.7.0"; + version = "0.8.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nexB"; repo = pname; - rev = "v${version}"; - sha256 = "0wghk4nzplpl26iwrgvm0n9x88nyxlcxz4ywss4nwdr4hfccl28l"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-PiH1lV1Vt9VTSOB+jep8FHIdk8qnauxj4nP3CIi/m7o="; }; dontConfigure = true; @@ -25,7 +26,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -36,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python lexing and parsing library"; homepage = "https://github.com/nexB/pygmars"; + changelog = "https://github.com/nexB/pygmars/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pygments-style-github/default.nix b/pkgs/development/python-modules/pygments-style-github/default.nix new file mode 100644 index 000000000000..918456774f57 --- /dev/null +++ b/pkgs/development/python-modules/pygments-style-github/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, pygments }: + +buildPythonPackage rec { + pname = "pygments-style-github"; + version = "0.4"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-D8q9IxR9VMhiQPYhZ4xTyZin3vqg0naRHB8t7wpF9Kc="; + }; + + # no tests exist on upstream repo + doCheck = false; + + propagatedBuildInputs = [ pygments ]; + + pythonImportsCheck = [ "pygments_style_github" ]; + + meta = with lib; { + description = "A port of the github color scheme for pygments"; + homepage = "https://github.com/hugomaiavieira/pygments-style-github"; + license = licenses.bsd3; + maintainers = with maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix index e5c2ca53686c..22193faab82c 100644 --- a/pkgs/development/python-modules/pygments/default.nix +++ b/pkgs/development/python-modules/pygments/default.nix @@ -24,7 +24,7 @@ let pygments = buildPythonPackage # circular dependencies if enabled by default doCheck = false; - checkInputs = [ + nativeCheckInputs = [ lxml pytestCheckHook wcag-contrast-ratio diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index a2a993de7f17..43f6b2073211 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -17,7 +17,8 @@ buildPythonPackage rec { pname = "pygmt"; - version = "0.7.0"; + version = "0.8.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "GenericMappingTools"; repo = "pygmt"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Z38fZvmeWDLZEIyH+UG6Nb6KNnjEuXIn3RRH4CPWz9A="; + sha256 = "sha256-wbqJaibRZW7qiNyLArr7I/dzHprILHQpORtdHWkIfSE="; }; postPatch = '' @@ -37,7 +38,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy netcdf4 pandas packaging xarray ]; doCheck = false; # the *entire* test suite requires network access - checkInputs = [ pytestCheckHook pytest-mpl ghostscript ipython ]; + nativeCheckInputs = [ pytestCheckHook pytest-mpl ghostscript ipython ]; postBuild = '' export HOME=$TMP ''; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix deleted file mode 100644 index 14acb15e03b5..000000000000 --- a/pkgs/development/python-modules/pygobject/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }: - -buildPythonPackage rec { - pname = "pygobject"; - version = "2.28.7"; - format = "other"; - disabled = pythonAtLeast "3.9"; - - src = fetchurl { - url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz"; - sha256 = "0nkam61rsn7y3wik3vw46wk5q2cjfh2iph57hl9m39rc8jijb7dv"; - }; - - outputs = [ "out" "devdoc" ]; - - patches = lib.optionals stdenv.isDarwin [ - ./pygobject-2.0-fix-darwin.patch - (fetchpatch { - url = "https://github.com/macports/macports-ports/raw/f2975d5bbbc2459c661905c5a850cc661fa32f55/python/py-gobject/files/py-gobject-dynamic_lookup-11.patch"; - sha256 = "sha256-mtlyu+La3+iC5iQAmVJzDA5E35XGaRQy/EKXzvrWRCg="; - extraPrefix = ""; - }) - ]; - - configureFlags = [ "--disable-introspection" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib ]; - - # in a "normal" setup, pygobject and pygtk are installed into the - # same site-packages: we need a pth file for both. pygtk.py would be - # used to select a specific version, in our setup it should have no - # effect, but we leave it in case somebody expects and calls it. - postInstall = lib.optionalString (!isPy3k) '' - mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${pname}-${version}.pth} - - # Prevent wrapping of codegen files as these are meant to be - # executed by the python program - chmod a-x $out/share/pygobject/*/codegen/*.py - ''; - - meta = with lib; { - homepage = "https://pygobject.readthedocs.io/"; - description = "Python bindings for GLib"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/python-modules/pygogo/default.nix b/pkgs/development/python-modules/pygogo/default.nix index 8cee037bb106..4a6a89844e6a 100644 --- a/pkgs/development/python-modules/pygogo/default.nix +++ b/pkgs/development/python-modules/pygogo/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pkutils ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 15f57612ac66..80f16e760d8b 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { buildInputs = [ graphviz ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/pygrok/default.nix b/pkgs/development/python-modules/pygrok/default.nix index 56d8b05af9a5..f209463f9991 100644 --- a/pkgs/development/python-modules/pygrok/default.nix +++ b/pkgs/development/python-modules/pygrok/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ regex ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/pygtfs/default.nix b/pkgs/development/python-modules/pygtfs/default.nix index 6bd6fedb64a4..38f62d9e658a 100644 --- a/pkgs/development/python-modules/pygtfs/default.nix +++ b/pkgs/development/python-modules/pygtfs/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sqlalchemy ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index ffe11cc140b3..f9111d7f7408 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -1,19 +1,20 @@ { lib , buildPythonPackage , fetchFromGitHub -, hatchling , hatch-vcs +, hatchling , numpy -, pythonOlder , pytest-xdist , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pyhamcrest"; version = "2.0.4"; format = "pyproject"; - disabled = pythonOlder "3.6"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "hamcrest"; @@ -22,25 +23,37 @@ buildPythonPackage rec { hash = "sha256-CIkttiijbJCR0zdmwM5JvFogQKYuHUXHJhdyWonHcGk="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; nativeBuildInputs = [ - hatchling hatch-vcs + hatchling ]; - checkInputs = [ + nativeCheckInputs = [ numpy pytest-xdist pytestCheckHook ]; + disabledTests = [ + # Tests started failing with numpy 1.24 + "test_numpy_numeric_type_complex" + "test_numpy_numeric_type_float" + "test_numpy_numeric_type_int" + ]; + + pythonImportsCheck = [ + "hamcrest" + ]; + meta = with lib; { - homepage = "https://github.com/hamcrest/PyHamcrest"; description = "Hamcrest framework for matcher objects"; + homepage = "https://github.com/hamcrest/PyHamcrest"; license = licenses.bsd3; - maintainers = with maintainers; [ - alunduil - ]; + maintainers = with maintainers; [ alunduil ]; }; } diff --git a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix index 5763a4c4bed6..1375b4425899 100644 --- a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix +++ b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { uritools ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyhanko/default.nix b/pkgs/development/python-modules/pyhanko/default.nix index 2cd71ae0f33a..2fd3373abd52 100644 --- a/pkgs/development/python-modules/pyhanko/default.nix +++ b/pkgs/development/python-modules/pyhanko/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { --replace "pytest-aiohttp~=0.3.0" "pytest-aiohttp~=1.0.3" ''; - checkInputs = [ + nativeCheckInputs = [ aiohttp certomancer freezegun diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index 5f279cd73069..38b71b80e782 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 = "22.8.0"; + version = "23.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-30UHbxs0WZyIVyq0ai2PsoPTkvoYawS1OBhVbV0JVN8="; + sha256 = "sha256-HMJqZn0yzN2dP5WTRCbem1Xw8nyH2Hy7oVP4kEKHHAo="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { awesomeversion ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix index 62d40e368efc..eac566b9037e 100644 --- a/pkgs/development/python-modules/pyhcl/default.nix +++ b/pkgs/development/python-modules/pyhcl/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { echo '__version__ = "${version}"' > ./src/hcl/version.py ''; - checkInputs = [ + nativeCheckInputs = [ coverage pytest ]; diff --git a/pkgs/development/python-modules/pyheos/default.nix b/pkgs/development/python-modules/pyheos/default.nix index 715c609875e6..7a05306fa839 100644 --- a/pkgs/development/python-modules/pyheos/default.nix +++ b/pkgs/development/python-modules/pyheos/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0rgzg7lnqzzqrjp73c1hj1hq8p0j0msyih3yr4wa2rj81s8ihmby"; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyhiveapi/default.nix b/pkgs/development/python-modules/pyhiveapi/default.nix index b2035077fa0d..ec6d51191966 100644 --- a/pkgs/development/python-modules/pyhiveapi/default.nix +++ b/pkgs/development/python-modules/pyhiveapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyhiveapi"; - version = "0.5.14"; + version = "0.5.15"; format = "pyproject"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Pyhass"; repo = "Pyhiveapi"; rev = "refs/tags/v${version}"; - hash = "sha256-YBcVoffcM3nkVmuPKE6WR/1TqAiz6ePzCxcrntqCQkY="; + hash = "sha256-tR2PCR1qGn4KnqAjEpcRTcVlMEpKCwn5RAm99AXBSnk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix index f9014f5db2b7..d382687e5c27 100644 --- a/pkgs/development/python-modules/pyhocon/default.nix +++ b/pkgs/development/python-modules/pyhocon/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyhs100/default.nix b/pkgs/development/python-modules/pyhs100/default.nix index 429f3a8ebb9f..fa5f73787af2 100644 --- a/pkgs/development/python-modules/pyhs100/default.nix +++ b/pkgs/development/python-modules/pyhs100/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { deprecation ]; - checkInputs = [ + nativeCheckInputs = [ pytest voluptuous ]; diff --git a/pkgs/development/python-modules/pyhumps/default.nix b/pkgs/development/python-modules/pyhumps/default.nix index 0bdf9f7003b1..b7ed9548e3a2 100644 --- a/pkgs/development/python-modules/pyhumps/default.nix +++ b/pkgs/development/python-modules/pyhumps/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 56f4e4236215..dafdefb75bed 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { tzlocal ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 54c757c93915..f8100ad3ddbb 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -7,17 +7,19 @@ }: buildPythonPackage rec { - pname = "PyICU"; + pname = "pyicu"; version = "2.10.2"; + format = "setuptools"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-DDMJ7qf6toV1B6zmJANRW2D+CWy/tPkNFPVf91xUQcE="; + pname = "PyICU"; + inherit version; + hash = "sha256-DDMJ7qf6toV1B6zmJANRW2D+CWy/tPkNFPVf91xUQcE="; }; nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config buildInputs = [ icu ]; - checkInputs = [ pytestCheckHook six ]; + nativeCheckInputs = [ pytestCheckHook six ]; pythonImportsCheck = [ "icu" ]; diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index 96a0be843c56..899e1d191046 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyinfra"; - version = "2.5.3"; + version = "2.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Fizzadar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1buLaBhhmc4FnROr5M+bqSlsbkfjl58a1/4qWBXE97Y="; + hash = "sha256-8eYbsPBMcRhFk5eouSAHEr3q/Llj0RqR76iwn/TrSSg="; }; propagatedBuildInputs = [ @@ -44,7 +44,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -63,7 +63,9 @@ buildPythonPackage rec { 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"; + homepage = "https://pyinfra.com"; + downloadPage = "https://pyinfra.com/Fizzadar/pyinfra/releases"; + changelog = "https://github.com/Fizzadar/pyinfra/blob/v${version}/CHANGELOG.md"; 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 5340be273fc9..70f76c129f02 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ async_generator pytest-asyncio pytest-timeout diff --git a/pkgs/development/python-modules/pyipma/default.nix b/pkgs/development/python-modules/pyipma/default.nix index c0388f7757b7..9befc34acbb6 100644 --- a/pkgs/development/python-modules/pyipma/default.nix +++ b/pkgs/development/python-modules/pyipma/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { geopy ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses freezegun mock diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix index adcc66116342..d16ab81fafec 100644 --- a/pkgs/development/python-modules/pyipp/default.nix +++ b/pkgs/development/python-modules/pyipp/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix index 7532ae45b26a..81127de8c662 100644 --- a/pkgs/development/python-modules/pyiqvia/default.nix +++ b/pkgs/development/python-modules/pyiqvia/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { backoff ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-aiohttp pytest-asyncio diff --git a/pkgs/development/python-modules/pyisbn/default.nix b/pkgs/development/python-modules/pyisbn/default.nix index e14dadcfe1a7..eec0e4b039ad 100644 --- a/pkgs/development/python-modules/pyisbn/default.nix +++ b/pkgs/development/python-modules/pyisbn/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { --replace "--cov pyisbn --cov-report term-missing --no-cov-on-fail" "" ''; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index f6f812b96f86..472bf727edca 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/pkgs/development/python-modules/pyisy/default.nix @@ -1,30 +1,42 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, requests -, python-dateutil , aiohttp +, buildPythonPackage +, colorlog +, fetchFromGitHub +, python-dateutil +, pythonOlder +, requests +, setuptools-scm }: buildPythonPackage rec { pname = "pyisy"; - version = "3.0.8"; + version = "3.1.11"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "automicus"; repo = "PyISY"; rev = "refs/tags/v${version}"; - hash = "sha256-Q3KewvZJMq4YKrpS6ir5rqZkDhxGACDIhlbr3b6lDAs="; + hash = "sha256-RYC0mfskDcCU9O2pSKRL9ulPUaJQO9UKp7WANXZWJ60="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' substituteInPlace setup.py \ - --replace "setuptools-git-version" "" \ --replace 'version_format="{tag}"' 'version="${version}"' ''; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ aiohttp + colorlog python-dateutil requests ]; @@ -37,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to talk to ISY994 from UDI"; homepage = "https://github.com/automicus/PyISY"; + changelog = "https://github.com/automicus/PyISY/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pyjet/default.nix b/pkgs/development/python-modules/pyjet/default.nix index ed23eba4c264..f7a2b7941ae4 100644 --- a/pkgs/development/python-modules/pyjet/default.nix +++ b/pkgs/development/python-modules/pyjet/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { importlib-resources ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' mv pyjet _pyjet pytest tests/ diff --git a/pkgs/development/python-modules/pyjsparser/default.nix b/pkgs/development/python-modules/pyjsparser/default.nix index 0f2ddf62f1a8..7382f82c3617 100644 --- a/pkgs/development/python-modules/pyjsparser/default.nix +++ b/pkgs/development/python-modules/pyjsparser/default.nix @@ -16,7 +16,7 @@ let pyjsparser = buildPythonPackage rec { sha256 = "sha256-Hqay9/qsjUfe62U7Q79l0Yy01L2Bnj5xNs6427k3Br8="; }; - checkInputs = [ pytestCheckHook js2py ]; + nativeCheckInputs = [ pytestCheckHook js2py ]; # escape infinite recursion with js2py doCheck = false; diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index a46a05ba9c23..721274c23697 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyjwt"; - version = "2.5.0"; + version = "2.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyJWT"; inherit version; - sha256 = "sha256-53q4lICQXYaZhEKsV4jzUzP6hfZQR6U0rcOO3zyI/Ds="; + sha256 = "sha256-aShcfjH8RPaKH+swnpSODfUyWdV5KV5s/isXkjKfBf0="; }; postPatch = '' @@ -41,7 +41,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ (lib.flatten (lib.attrValues passthru.optional-dependencies)); diff --git a/pkgs/development/python-modules/pykakasi/default.nix b/pkgs/development/python-modules/pykakasi/default.nix index 13f5466b8a10..859564e1d13d 100644 --- a/pkgs/development/python-modules/pykakasi/default.nix +++ b/pkgs/development/python-modules/pykakasi/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytest-benchmark pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pykaleidescape/default.nix b/pkgs/development/python-modules/pykaleidescape/default.nix new file mode 100644 index 000000000000..d0eccbc183a3 --- /dev/null +++ b/pkgs/development/python-modules/pykaleidescape/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, buildPythonPackage +, dnspython +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pykaleidescape"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "SteveEasley"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-KM/gtpsQ27QZz2uI1t/yVN5no0zp9LZag1duAJzK55g="; + }; + + propagatedBuildInputs = [ + aiohttp + dnspython + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "kaleidescape" + ]; + + disabledTests = [ + # Test requires network access + "test_resolve_succeeds" + ]; + + meta = with lib; { + description = "Module for controlling Kaleidescape devices"; + homepage = "https://github.com/SteveEasley/pykaleidescape"; + changelog = "https://github.com/SteveEasley/pykaleidescape/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index b4b442945962..99467ae52ed7 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pykdtree"; - version = "1.3.5"; + version = "1.3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-c0L3XnMRA+ZT/B9rn9q8JBDPkrbnsGFggEp1eGybV0c="; + sha256 = "sha256-eAtpPQVVuFfXqrMeNdQpO/Tr253sekW6S7I7RAD2Jtw="; }; buildInputs = [ openmp ]; @@ -18,7 +18,7 @@ buildPythonPackage rec { mv pykdtree tests ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "kd-tree implementation for fast nearest neighbour search in Python"; diff --git a/pkgs/development/python-modules/pykeyatome/default.nix b/pkgs/development/python-modules/pykeyatome/default.nix index 141bf396c593..0f6786c4c4cc 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 = "2.1.0"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jugla"; repo = "pyKeyAtome"; rev = "refs/tags/V${version}"; - sha256 = "sha256-DUnER/Vom5Yc3syx4kPP1WbI7FpC+XGK9X4c1RrJJFk="; + hash = "sha256-/HfWPrpW4NowFmdmU2teIiex1O03bHemnUdhOoEDRgc="; }; propagatedBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { simplejson ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook requests-mock @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to get data from Atome Key"; homepage = "https://github.com/jugla/pyKeyAtome"; + changelog = "https://github.com/jugla/pyKeyAtome/releases/tag/V${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index 060a738911d1..fac61d0b5db2 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; diff --git a/pkgs/development/python-modules/pykulersky/default.nix b/pkgs/development/python-modules/pykulersky/default.nix index 83a5b58c7f1c..9a4318a1a64a 100644 --- a/pkgs/development/python-modules/pykulersky/default.nix +++ b/pkgs/development/python-modules/pykulersky/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/pykwalify/default.nix b/pkgs/development/python-modules/pykwalify/default.nix index cf42c98457cb..383de0aee3db 100644 --- a/pkgs/development/python-modules/pykwalify/default.nix +++ b/pkgs/development/python-modules/pykwalify/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ruamel-yaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook testfixtures ]; diff --git a/pkgs/development/python-modules/pylacrosse/default.nix b/pkgs/development/python-modules/pylacrosse/default.nix index 74b244f52965..a3349ff2ec96 100644 --- a/pkgs/development/python-modules/pylacrosse/default.nix +++ b/pkgs/development/python-modules/pylacrosse/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyserial ]; - checkInputs = [ + nativeCheckInputs = [ mock nose pytestCheckHook diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index 5875112c99fd..e62d356f70ee 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -51,7 +51,7 @@ let pylama = buildPythonPackage rec { # escape infinite recursion pylint -> isort -> pylama doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pylint pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 91124c01ec61..b3314165bfaa 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook flaky ]; diff --git a/pkgs/development/python-modules/pylatexenc/default.nix b/pkgs/development/python-modules/pylatexenc/default.nix index 496e7e6af2c3..0080ad8293a0 100644 --- a/pkgs/development/python-modules/pylatexenc/default.nix +++ b/pkgs/development/python-modules/pylatexenc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; pythonImportsCheck = [ "pylatexenc" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Simple LaTeX parser providing latex-to-unicode and unicode-to-latex conversion"; diff --git a/pkgs/development/python-modules/pylaunches/default.nix b/pkgs/development/python-modules/pylaunches/default.nix index 8f2ed7083580..80257ca7ac98 100644 --- a/pkgs/development/python-modules/pylaunches/default.nix +++ b/pkgs/development/python-modules/pylaunches/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytestCheckHook pytest-asyncio diff --git a/pkgs/development/python-modules/pylddwrap/default.nix b/pkgs/development/python-modules/pylddwrap/default.nix index 27bac5c1e3a0..6c8a5159f987 100644 --- a/pkgs/development/python-modules/pylddwrap/default.nix +++ b/pkgs/development/python-modules/pylddwrap/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "lddwrap" ]; diff --git a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix new file mode 100644 index 000000000000..46dd18b109fd --- /dev/null +++ b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, cython +, numpy +}: + +buildPythonPackage rec { + pname = "pylibjpeg-libjpeg"; + version = "1.3.3"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pydicom"; + repo = pname; + rev = "refs/tags/v.${version}"; + hash = "sha256-fv3zX+P2DWMdxPKsvSPhPCV8cDX3tAMO/h5coMHBHN8="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cython]; + + propagatedBuildInputs = [ numpy ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + doCheck = false; # tests try to import 'libjpeg.data', which errors + + pythonImportsCheck = [ + "libjpeg" + ]; + + meta = with lib; { + description = "A JPEG, JPEG-LS and JPEG XT plugin for pylibjpeg"; + homepage = "https://github.com/pydicom/pylibjpeg-libjpeg"; + license = licenses.gpl3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix index 64f8e62c2862..52f59cc3fc8d 100644 --- a/pkgs/development/python-modules/pyliblo/default.nix +++ b/pkgs/development/python-modules/pyliblo/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchurl , isPyPy +, pythonAtLeast , liblo , cython }: @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "pyliblo"; version = "0.10.0"; - disabled = isPyPy; + disabled = isPyPy || pythonAtLeast "3.11"; src = fetchurl { url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz"; @@ -19,7 +20,7 @@ buildPythonPackage rec { buildInputs = [ liblo cython ]; meta = with lib; { - homepage = "http://das.nasophon.de/pyliblo/"; + homepage = "https://das.nasophon.de/pyliblo/"; description = "Python wrapper for the liblo OSC library"; license = licenses.lgpl21; }; diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix index e572ec542fbc..3c282f0e60a0 100644 --- a/pkgs/development/python-modules/pylink-square/default.nix +++ b/pkgs/development/python-modules/pylink-square/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylink-square"; - version = "0.14.2"; + version = "1.0.0"; format = "setuptools"; @@ -19,12 +19,12 @@ buildPythonPackage rec { owner = "square"; repo = "pylink"; rev = "refs/tags/v${version}"; - hash = "sha256-4jmFU8jlrEAYTAQH+uQCWrzqwKX4onb7Xk4iTYzx9dI="; + hash = "sha256-05mg2raHiKg0gHxF/7zFd81C/8OrhStThMwEnpaFGSc="; }; propagatedBuildInputs = [ psutil six future ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index e6d7c6bd63d3..dcfc83c029a7 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pylint-plugin-utils ]; - checkInputs = [ + nativeCheckInputs = [ factory_boy pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pylint-plugin-utils/default.nix b/pkgs/development/python-modules/pylint-plugin-utils/default.nix index 46c12f0d0d07..a8cff3800960 100644 --- a/pkgs/development/python-modules/pylint-plugin-utils/default.nix +++ b/pkgs/development/python-modules/pylint-plugin-utils/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 3bc20493dd64..bdc49c041306 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -2,6 +2,7 @@ , lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder , installShellFiles , astroid @@ -9,10 +10,13 @@ , isort , mccabe , platformdirs +, requests +, setuptools , tomli , tomlkit , typing-extensions -, GitPython +, gitpython +, py , pytest-timeout , pytest-xdist , pytestCheckHook @@ -20,8 +24,8 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.14.5"; - format = "setuptools"; + version = "2.15.9"; + format = "pyproject"; disabled = pythonOlder "3.7.2"; @@ -29,11 +33,25 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JTFGplqIA6WavwzKOkrm1rHBKNRrplBPvAdEkb/fTlI="; + hash = "sha256-T+om5rrG0Gjyr05L5X4j82/S11Q7JBUDNOm4gVEQ494="; }; + patches = [ + (fetchpatch { + name = "fix-dummy-plugin-tests.patch"; + url = "https://github.com/PyCQA/pylint/commit/e75089bae209d1b9ca72903c0d65530b02f67fdf.patch"; + hash = "sha256-4ErlCMLTI5xIu1dCvcJsvo03dwcgLLbFFQ5M7DFdL3o="; + }) + (fetchpatch { + name = "fix-pythonpath-tests.patch"; + url = "https://github.com/PyCQA/pylint/commit/6725f761f2ac7a853e315790b496a2eb4d926694.patch"; + hash = "sha256-Xaeub7uUaC07BBuusA6+neGiXFWWfVNBkGXmYJe7ot4="; + }) + ]; + nativeBuildInputs = [ installShellFiles + setuptools ]; propagatedBuildInputs = [ @@ -55,12 +73,14 @@ buildPythonPackage rec { installManPage man/*.1 ''; - checkInputs = [ - GitPython + nativeCheckInputs = [ + gitpython # https://github.com/PyCQA/pylint/blob/main/requirements_test_min.txt + py pytest-timeout pytest-xdist pytestCheckHook + requests typing-extensions ]; diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 169784039c6c..8b1b41cf3c44 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2022.11.0"; + version = "2023.1.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GEKLkFzQV8xI3c8061fO1p66WKj3eDXmx7VaRYDu7kw="; + hash = "sha256-PSg0u4Beg0OVUMxaBCPxJSVO/MxBvCpDu2rQhiYT9OM="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { pyjwt ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-aiohttp pytest-freezegun @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Modulefor controlling a Litter-Robot"; homepage = "https://github.com/natekspencer/pylitterbot"; + changelog = "https://github.com/natekspencer/pylitterbot/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix index 128c8cbd0de2..3e12fbdf9794 100644 --- a/pkgs/development/python-modules/pyls-black/default.nix +++ b/pkgs/development/python-modules/pyls-black/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { disabled = !isPy3k; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ black toml python-language-server ]; diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix index ad387106e885..8c7db89d3b19 100644 --- a/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/pkgs/development/python-modules/pyls-mypy/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ mock pytest-cov coverage pytestCheckHook ]; + nativeCheckInputs = [ mock pytest-cov coverage pytestCheckHook ]; propagatedBuildInputs = [ mypy python-language-server configparser diff --git a/pkgs/development/python-modules/pyls-spyder/default.nix b/pkgs/development/python-modules/pyls-spyder/default.nix index 61b0fa7449bc..63f9122acdc8 100644 --- a/pkgs/development/python-modules/pyls-spyder/default.nix +++ b/pkgs/development/python-modules/pyls-spyder/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { python-lsp-server ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix index a2504e4bbc9d..02139d368247 100644 --- a/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , mypy , pytestCheckHook , python-lsp-server @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "pylsp-mypy"; - version = "0.6.3"; + version = "0.6.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "Richardk2n"; repo = "pylsp-mypy"; rev = "refs/tags/${version}"; - hash = "sha256-fZ2bPPjBK/H2jMI4S3EhvWJaNl4tK7HstxcHSAkoFW4="; + hash = "sha256-LQ9Kw/dG3XA67WaVObE72fxERb21eZzk+MCqIp2Qy0o="; }; propagatedBuildInputs = [ @@ -28,7 +29,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pylsqpack/default.nix b/pkgs/development/python-modules/pylsqpack/default.nix index 0fbd7a757c00..2b5e9f3757c7 100644 --- a/pkgs/development/python-modules/pylsqpack/default.nix +++ b/pkgs/development/python-modules/pylsqpack/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-tnps4/aTfYUGgYJ3FL5zCqNhwEnjd1Lj7Z3xHn8jL/s="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pylsqpack" ]; diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix index 80fa5bff3200..b68695ad4252 100644 --- a/pkgs/development/python-modules/pylti/default.nix +++ b/pkgs/development/python-modules/pylti/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ]; - checkInputs = [ + nativeCheckInputs = [ flask httpretty oauthlib pyflakes pytest pytestcache pytest-cov covCore pytest-flakes sphinx mock chalice ]; diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index a14fce498e20..ab6e1e2c6657 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.17.1"; + version = "0.18.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gurumitts"; repo = pname; - rev = "v${version}"; - hash = "sha256-W3OfYNVendYOrwN/WGeAkNAnZctvlssZ3Bvp5caPZao="; + rev = "refs/tags/v${version}"; + hash = "sha256-7bQgMDmvEAvnEoHZxZ9JzYsx1JR9W5eYuvcVUmYM/dw="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-sugar pytest-timeout @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module o control Lutron Caseta devices"; homepage = "https://github.com/gurumitts/pylutron-caseta"; + changelog = "https://github.com/gurumitts/pylutron-caseta/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pylutron/default.nix b/pkgs/development/python-modules/pylutron/default.nix index 4bf56d5e6edc..e39498616371 100644 --- a/pkgs/development/python-modules/pylutron/default.nix +++ b/pkgs/development/python-modules/pylutron/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pylutron"; - version = "0.2.9"; + version = "0.2.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xy5XPNOrvdPZMCfa2MYA+xtUcFdGSurW5QYL6H7n2VI="; + sha256 = "sha256-DKwjBQXC7O/8bFxq5shJJxRV3HYgBeS7tJXg4m3vQMY="; }; # Project has no tests diff --git a/pkgs/development/python-modules/pylxd/default.nix b/pkgs/development/python-modules/pylxd/default.nix index 3373daf8a796..6017d8019943 100644 --- a/pkgs/development/python-modules/pylxd/default.nix +++ b/pkgs/development/python-modules/pylxd/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ws4py ]; - checkInputs = [ + nativeCheckInputs = [ ddt mock-services pytestCheckHook diff --git a/pkgs/development/python-modules/pymanopt/default.nix b/pkgs/development/python-modules/pymanopt/default.nix index f299c4900f27..33799515c09a 100644 --- a/pkgs/development/python-modules/pymanopt/default.nix +++ b/pkgs/development/python-modules/pymanopt/default.nix @@ -22,20 +22,22 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy scipy torch ]; - checkInputs = [ nose2 autograd matplotlib tensorflow ]; + nativeCheckInputs = [ nose2 autograd matplotlib tensorflow ]; checkPhase = '' runHook preCheck - # FIXME: Some numpy regression? - # Traceback (most recent call last): - # File "/build/source/tests/manifolds/test_hyperbolic.py", line 270, in test_second_order_function_approximation - # self.run_hessian_approximation_test() - # File "/build/source/tests/manifolds/_manifold_tests.py", line 29, in run_hessian_approximation_test - # assert np.allclose(np.linalg.norm(error), 0) or (2.95 <= slope <= 3.05) - # AssertionError - rm tests/manifolds/test_hyperbolic.py + + # upstream themselves seem unsure about the robustness of these + # tests - see https://github.com/pymanopt/pymanopt/issues/219 + grep -lr 'test_second_order_function_approximation' tests/ | while read -r fn ; do + substituteInPlace "$fn" \ + --replace \ + 'test_second_order_function_approximation' \ + 'dont_test_second_order_function_approximation' + done nose2 tests -v + runHook postCheck ''; diff --git a/pkgs/development/python-modules/pymarshal/default.nix b/pkgs/development/python-modules/pymarshal/default.nix index 7da938526422..c273b379a812 100644 --- a/pkgs/development/python-modules/pymarshal/default.nix +++ b/pkgs/development/python-modules/pymarshal/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { bson ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook bson pyyaml diff --git a/pkgs/development/python-modules/pymatgen-lammps/default.nix b/pkgs/development/python-modules/pymatgen-lammps/default.nix index 87d46a35fa84..b1b5cf473855 100644 --- a/pkgs/development/python-modules/pymatgen-lammps/default.nix +++ b/pkgs/development/python-modules/pymatgen-lammps/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest-runner ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ pymatgen ]; pythonImportsCheck = [ "pmg_lammps" ]; diff --git a/pkgs/development/python-modules/pymaven-patch/default.nix b/pkgs/development/python-modules/pymaven-patch/default.nix index e3a70ede0602..f74c959cfd74 100644 --- a/pkgs/development/python-modules/pymaven-patch/default.nix +++ b/pkgs/development/python-modules/pymaven-patch/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { lxml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-cov mock diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index baa31b40e342..d9b51d9d0755 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.35"; + version = "2.4.37"; src = fetchPypi { inherit pname version; - sha256 = "sha256-P2pqcxI6w9cw4b26g5ad5CeW9Sf1fNN0FGiIzOWfOCU="; + sha256 = "sha256-dU561/kOBW++mrfzX/kqNVPgi7m/QniBrCJxBD/fZ1Y="; }; propagatedBuildInputs = [ future lxml ]; diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix index 44aa012d57d0..b7f31adc8e87 100644 --- a/pkgs/development/python-modules/pymbolic/default.nix +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , matchpy , pytestCheckHook , pythonOlder @@ -9,21 +10,29 @@ buildPythonPackage rec { pname = "pymbolic"; - version = "2022.1"; + version = "2022.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tS9FHdC5gD4D3jMgrzt85XIwcAYcbSMcACFvbaQlkBI="; + hash = "sha256-+Cd2lCuzy3Iyn6Hxqito7AnyN9uReMlc/ckqaup87Ik="; }; + patches = [ + (fetchpatch { + url = "https://github.com/inducer/pymbolic/commit/cb3d999e4788dad3edf053387b6064adf8b08e19.patch"; + excludes = [ ".github/workflows/ci.yml" ]; + sha256 = "sha256-P0YjqAo0z0LZMIUTeokwMkfP8vxBXi3TcV4BSFaO1lU="; + }) + ]; + propagatedBuildInputs = [ pytools ]; - checkInputs = [ + nativeCheckInputs = [ matchpy pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 4434312e2683..1f528d9ab715 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -1,6 +1,4 @@ { lib -, aeppl -, aesara , arviz , buildPythonPackage , cachetools @@ -8,38 +6,33 @@ , fastprogress , fetchFromGitHub , numpy +, pytensor , pythonOlder -, pythonRelaxDepsHook , scipy , typing-extensions }: buildPythonPackage rec { pname = "pymc"; - version = "4.3.0"; + version = "5.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pymc-devs"; - repo = "pymc"; + repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pkeAcsdVBDc7eKC03+FDJCYT48PaVcXT8K8U8T4gGKo="; + hash = "sha256-ffNWSSzoRLFmYzN9sm5Z1j6WtEoFzGkCQxpBC0NlpRc="; }; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - propagatedBuildInputs = [ - aeppl - aesara arviz cachetools cloudpickle fastprogress numpy + pytensor scipy typing-extensions ]; @@ -49,11 +42,6 @@ buildPythonPackage rec { --replace ', "pytest-cov"' "" ''; - pythonRelaxDeps = [ - "aesara" - "aeppl" - ]; - # The test suite is computationally intensive and test failures are not # indicative for package usability hence tests are disabled by default. doCheck = false; @@ -65,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)"; homepage = "https://github.com/pymc-devs/pymc3"; + changelog = "https://github.com/pymc-devs/pymc/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ nidabdella ]; }; diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix index 08749312580c..69f3f62fb5b0 100644 --- a/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -38,21 +38,21 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "9.5"; + version = "9.9"; format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; rev = "refs/tags/${version}"; - sha256 = "sha256-bgvoY+8bbGoG1A93A+Uan1UDpQmEUu/TJu3FOkXechQ="; + sha256 = "sha256-JZtze6KjiBJGEQzA8lsTShhZu96wxAr4KeKzCe0A18Q="; }; nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ markdown pygments ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pyyaml ]; diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index 50ea8c5cef0d..e511c24fccde 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -1,15 +1,24 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib +, stdenv +, fetchPypi +, buildPythonPackage , libmediainfo , setuptools-scm -, pytest, glibcLocales }: +, pytest +, glibcLocales +, pythonOlder +}: buildPythonPackage rec { pname = "pymediainfo"; - version = "5.1.0"; + version = "6.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "d996c69d50081a24d6dca9679abf43ffd2be368b065f953c2c9082e5d649c734"; + hash = "sha256-luBLrA38tya+1wwxSxIZEhxLk0TGapj0Js4n1/mr/7A="; }; postPatch = '' @@ -22,18 +31,28 @@ buildPythonPackage rec { "${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}.0" ''; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - checkInputs = [ glibcLocales pytest ]; + nativeCheckInputs = [ + glibcLocales + pytest + ]; checkPhase = '' export LC_ALL=en_US.UTF-8 py.test -k 'not test_parse_url' tests ''; + pythonImportsCheck = [ + "pymediainfo" + ]; + meta = with lib; { description = "Python wrapper for the mediainfo library"; homepage = "https://github.com/sbraz/pymediainfo"; + changelog = "https://github.com/sbraz/pymediainfo/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jfrankenau ]; }; diff --git a/pkgs/development/python-modules/pymedio/default.nix b/pkgs/development/python-modules/pymedio/default.nix new file mode 100644 index 000000000000..d7f90f9f8453 --- /dev/null +++ b/pkgs/development/python-modules/pymedio/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, numpy +}: + +buildPythonPackage rec { + pname = "pymedio"; + version = "0.2.13"; + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "jcreinhold"; + repo = "pymedio"; + rev = "refs/tags/v${version}"; + hash = "sha256-iHbClOrtYkHT1Nar+5j/ig4Krya8LdQdFB4Mmm5B9bg="; + }; + + # relax Python dep to work with 3.10.x + postPatch = '' + substituteInPlace setup.cfg --replace "!=3.10.*," "" + ''; + + propagatedBuildInputs = [ numpy ]; + + doCheck = false; # requires SimpleITK python package (not in Nixpkgs) + + pythonImportsCheck = [ + "pymedio" + ]; + + meta = with lib; { + description = "Read medical image files into Numpy arrays"; + homepage = "https://github.com/jcreinhold/pymedio"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/pymeeus/default.nix b/pkgs/development/python-modules/pymeeus/default.nix index 162f3ab55966..9c7d2914cb5a 100644 --- a/pkgs/development/python-modules/pymeeus/default.nix +++ b/pkgs/development/python-modules/pymeeus/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "PyMeeus"; - version = "0.5.11"; + version = "0.5.12"; src = fetchPypi { inherit pname version; - sha256 = "bb9d670818d8b0594317b48a7dadea02a0594e5344263bf2054e1a011c8fed55"; + sha256 = "sha256-VI9xhr2LlsvAac9kmo6ON33OSax0SGcJhJ/mOpnK1oQ="; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest . diff --git a/pkgs/development/python-modules/pymelcloud/default.nix b/pkgs/development/python-modules/pymelcloud/default.nix index ed06b347b694..079c7e31f140 100644 --- a/pkgs/development/python-modules/pymelcloud/default.nix +++ b/pkgs/development/python-modules/pymelcloud/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix index ec0c2308d815..cf69c2b0fa33 100644 --- a/pkgs/development/python-modules/pymemcache/default.nix +++ b/pkgs/development/python-modules/pymemcache/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ faker mock pytestCheckHook diff --git a/pkgs/development/python-modules/pymemoize/default.nix b/pkgs/development/python-modules/pymemoize/default.nix index f66a6ef702b0..9fdb8bbc2651 100644 --- a/pkgs/development/python-modules/pymemoize/default.nix +++ b/pkgs/development/python-modules/pymemoize/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0yqr60hm700zph6nv8wb6yp2s0i08mahxvw98bvkmw5ijbsviiq7"; }; - checkInputs = [ django ]; + nativeCheckInputs = [ django ]; # django.core.exceptions.ImproperlyConfigured: Requested settings, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings doCheck = false; diff --git a/pkgs/development/python-modules/pymeteoclimatic/default.nix b/pkgs/development/python-modules/pymeteoclimatic/default.nix index db150342a2a3..463acc3f9d95 100644 --- a/pkgs/development/python-modules/pymeteoclimatic/default.nix +++ b/pkgs/development/python-modules/pymeteoclimatic/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { lxml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pymfy/default.nix b/pkgs/development/python-modules/pymfy/default.nix index e48966e9da06..5600db81b1d1 100644 --- a/pkgs/development/python-modules/pymfy/default.nix +++ b/pkgs/development/python-modules/pymfy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ httpretty pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 41babc82175e..a6e3f5eb9a74 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -9,6 +9,9 @@ , pygments , pyserial , pyserial-asyncio +, pytest-asyncio +, pytest-rerunfailures +, pytest-xdist , pytestCheckHook , redis , sqlalchemy @@ -18,13 +21,14 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "2.5.3"; + version = "3.1.2"; + format = "setuptools"; src = fetchFromGitHub { - owner = "riptideio"; + owner = "pymodbus-dev"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-pf1TU/imBqNVYdG4XX8fnma8O8kQHuOHu6DT3E/PUk4="; + rev = "refs/tags/v${version}"; + hash = "sha256-kae/TADu23NnCrXkJ/dkDBNIgBm/+BxXf+lh8uMxz/s="; }; # Twisted asynchronous version is not supported due to a missing dependency @@ -38,15 +42,22 @@ buildPythonPackage rec { tornado ]; - checkInputs = [ + nativeCheckInputs = [ asynctest mock + pytest-asyncio + pytest-rerunfailures + pytest-xdist pytestCheckHook redis sqlalchemy twisted ]; + pytestFlagsArray = [ + "--reruns" "3" # Racy socket tests + ]; + pythonImportsCheck = [ "pymodbus" ]; meta = with lib; { @@ -57,7 +68,8 @@ buildPythonPackage rec { also be used without any third party dependencies if a more lightweight project is needed. ''; - homepage = "https://github.com/riptideio/pymodbus"; + homepage = "https://github.com/pymodbus-dev/pymodbus"; + changelog = "https://github.com/pymodbus-dev/pymodbus/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 285a729eb894..292e7fceead6 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -2,18 +2,25 @@ , buildPythonPackage , fetchPypi , pythonOlder +, dnspython }: buildPythonPackage rec { pname = "pymongo"; - version = "4.2.0"; - disabled = pythonOlder "3.6"; + version = "4.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cvM49qq9N9NDvZ0f3T3pIRBNOVdmvMXNxAOeTC3Zd2Y="; + hash = "sha256-NOlf+wpov/vDtDfy0fJfyRb+899c3u0JktpfQvrpuAc="; }; + propagatedBuildInputs = [ + dnspython + ]; + # Tests call a running mongodb instance doCheck = false; diff --git a/pkgs/development/python-modules/pymoo/default.nix b/pkgs/development/python-modules/pymoo/default.nix index d2d0bdec81d4..786c9ab46333 100644 --- a/pkgs/development/python-modules/pymoo/default.nix +++ b/pkgs/development/python-modules/pymoo/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { --replace "https://raw.githubusercontent.com/anyoptimization/pymoo-data/main/" \ "file://$pymoo_data/" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook nbformat notebook diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index 6fc917981a7f..3763aeabbcf6 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "993f1a3599ca3f4fcd7160c7545ad06310c9e12f70174ae7ae8d4e25f6c5d3fa"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pymumble/default.nix b/pkgs/development/python-modules/pymumble/default.nix index 35cbbc31bb02..558d5c6bd9e5 100644 --- a/pkgs/development/python-modules/pymumble/default.nix +++ b/pkgs/development/python-modules/pymumble/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { protobuf ]; - checkInputs = [ + nativeCheckInputs = [ pycrypto pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index f28a4908a606..e75b4fa3a90f 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -5,20 +5,27 @@ , python , cffi , pytestCheckHook +, pythonOlder , ApplicationServices }: buildPythonPackage rec { pname = "pymunk"; - version = "6.3.0"; + version = "6.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-er0+HuCQw2FPeyuBc1BVdutmidYzcKIBqdeteqwsXiA="; + hash = "sha256-YNzZ/wQz5s5J5ctXekNo0FksRoX03rZE1wXIghYcck4="; }; - propagatedBuildInputs = [ cffi ]; + propagatedBuildInputs = [ + cffi + ]; + buildInputs = lib.optionals stdenv.isDarwin [ ApplicationServices ]; @@ -27,15 +34,22 @@ buildPythonPackage rec { ${python.interpreter} setup.py build_ext --inplace ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + pytestFlagsArray = [ "pymunk/tests" ]; - pythonImportsCheck = [ "pymunk" ]; + + pythonImportsCheck = [ + "pymunk" + ]; meta = with lib; { description = "2d physics library"; homepage = "https://www.pymunk.org"; + changelog = "https://github.com/viblo/pymunk/releases/tag/${version}"; license = with licenses; [ mit ]; 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 daf2197f8337..075444ca17bd 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -9,34 +9,52 @@ , jbig2dec , libjpeg_turbo , gumbo +, pythonOlder }: buildPythonPackage rec { pname = "pymupdf"; - version = "1.20.2"; + version = "1.21.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "PyMuPDF"; inherit version; - sha256 = "sha256-Au7fAfV8a6+16GZ86gCIotJSJkPEcQDxkIvsOmioSIg="; + hash = "sha256-+BV0GkNcYqADa7y/X6bFM1Z71pxTONQTcU/FeyLbk+A="; }; postPatch = '' substituteInPlace setup.py \ --replace '/usr/include/mupdf' ${mupdf.dev}/include/mupdf ''; - nativeBuildInputs = [ swig ]; - buildInputs = [ mupdf freetype harfbuzz openjpeg jbig2dec libjpeg_turbo gumbo ]; + nativeBuildInputs = [ + swig + ]; + + buildInputs = [ + mupdf + freetype + harfbuzz + openjpeg + jbig2dec + libjpeg_turbo + gumbo + ]; doCheck = false; - pythonImportsCheck = [ "fitz" ]; + pythonImportsCheck = [ + "fitz" + ]; meta = with lib; { - description = "Python bindings for MuPDF's rendering library."; + description = "Python bindings for MuPDF's rendering library"; homepage = "https://github.com/pymupdf/PyMuPDF"; - maintainers = with maintainers; [ teto ]; + changelog = "https://github.com/pymupdf/PyMuPDF/releases/tag/${version}"; license = licenses.agpl3Only; + maintainers = with maintainers; [ teto ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/pymyq/default.nix b/pkgs/development/python-modules/pymyq/default.nix index 94ff699507e1..afe7f7af628d 100644 --- a/pkgs/development/python-modules/pymyq/default.nix +++ b/pkgs/development/python-modules/pymyq/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pymyq"; - version = "3.1.5"; + version = "3.1.6"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "arraylabs"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-/2eWB4rtHPptfc8Tm0CGk0UB+Hq1EmNhWmdrpPiUJcw="; + hash = "sha256-zhGCoZ7mkHlfDjEbQihtM23u+N6nfYsQhKmrloevzp8="; }; propagatedBuildInputs = [ @@ -28,11 +28,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "pymyq" ]; + pythonImportsCheck = [ + "pymyq" + ]; meta = with lib; { description = "Python wrapper for MyQ API"; homepage = "https://github.com/arraylabs/pymyq"; + changelog = "https://github.com/arraylabs/pymyq/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix index e9d6ab74ad8c..58bdf10ab5b1 100644 --- a/pkgs/development/python-modules/pymysensors/default.nix +++ b/pkgs/development/python-modules/pymysensors/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest-sugar pytest-timeout pytestCheckHook diff --git a/pkgs/development/python-modules/pymystem3/default.nix b/pkgs/development/python-modules/pymystem3/default.nix index 8c909b868b39..b8aa6469b7f8 100644 --- a/pkgs/development/python-modules/pymystem3/default.nix +++ b/pkgs/development/python-modules/pymystem3/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ requests ]; - checkInputs = [ flake8 mock pytest ]; + nativeCheckInputs = [ flake8 mock pytest ]; doCheck = isPy3k; # fails on linting postPatch = '' diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index f34956d7280f..68bd546cd36c 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { cffi ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index 4844ebee9990..885486cbbc5e 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "5.2.3"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pynamodb"; repo = "PynamoDB"; rev = "refs/tags/${version}"; - sha256 = "sha256-3Si0BCMofr38OuXoX8Tj9n3ITv3rH5hNfDQZvZWk79o="; + hash = "sha256-N+WpQil/OJ2p81Dc2b6c5K03NjAUdpbS+gjPzdqLY4w="; }; propagatedBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ] ++ passthru.optional-dependencies.signal; @@ -66,6 +66,7 @@ buildPythonPackage rec { verbose. PynamoDB presents you with a simple, elegant API. ''; homepage = "http://jlafon.io/pynamodb.html"; + changelog = "https://github.com/pynamodb/PynamoDB/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/pync/default.nix b/pkgs/development/python-modules/pync/default.nix index 43161880e26b..9dd31aa725b3 100644 --- a/pkgs/development/python-modules/pync/default.nix +++ b/pkgs/development/python-modules/pync/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "38b9e61735a3161f9211a5773c5f5ea698f36af4ff7f77fa03e8d1ff0caa117f"; }; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; propagatedBuildInputs = [ python-dateutil ]; preInstall = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index e92776e72a29..333f88e3f563 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -10,13 +10,14 @@ buildPythonPackage rec { pname = "pynetbox"; - version = "6.6.2"; + version = "7.0.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "netbox-community"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-W5ukrhqJTgOXM9MnbZWvNy9TCoEUGrFYfD+zGGNU07w="; + hash = "sha256-RAUM79lDz7oNV7Li987Sz7JoNz/feO6BsEcWO0u/Ub8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -30,7 +31,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pyyaml ]; @@ -41,6 +42,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/netbox-community/pynetbox/releases/tag/v${version}"; description = "API client library for Netbox"; homepage = "https://github.com/netbox-community/pynetbox"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix index 52860b00174b..f6cf6e4b999d 100644 --- a/pkgs/development/python-modules/pynetdicom/default.nix +++ b/pkgs/development/python-modules/pynetdicom/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pydicom ]; - checkInputs = [ + nativeCheckInputs = [ pyfakefs pytestCheckHook sqlalchemy diff --git a/pkgs/development/python-modules/pynetgear/default.nix b/pkgs/development/python-modules/pynetgear/default.nix index 77a51b58322e..f941d9fe9d12 100644 --- a/pkgs/development/python-modules/pynetgear/default.nix +++ b/pkgs/development/python-modules/pynetgear/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynetgear"; - version = "0.10.8"; + version = "0.10.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MatMaul"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-cffaXYoMBICfevoRnm3n0/qfD/Arz4TZeGihhIMmUcI="; + hash = "sha256-VYiXFdUD4q6d7KraA26SFV29k53AoluCj7ACMgNQcLU="; }; propagatedBuildInputs = [ @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for interacting with Netgear wireless routers"; homepage = "https://github.com/MatMaul/pynetgear"; + changelog = "https://github.com/MatMaul/pynetgear/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix new file mode 100644 index 000000000000..db4ec105d87c --- /dev/null +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyyaml +}: + +buildPythonPackage rec { + pname = "pyngrok"; + version = "5.2.1"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-dws4Z4LzgkkOGTS5LZn/MU8ZKr70n4PWocezsDhxeT4="; + }; + + propagatedBuildInputs = [ + pyyaml + ]; + + pythonImportsCheck = [ "pyngrok" ]; + + meta = with lib; { + homepage = "https://github.com/alexdlaird/pyngrok"; + description = "A Python wrapper for ngrok"; + license = licenses.mit; + maintainers = with maintainers; [ wegank ]; + }; +} diff --git a/pkgs/development/python-modules/pynina/default.nix b/pkgs/development/python-modules/pynina/default.nix index be81bd6e6557..1d6376d0af69 100644 --- a/pkgs/development/python-modules/pynina/default.nix +++ b/pkgs/development/python-modules/pynina/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynina"; - version = "0.1.8"; + version = "0.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyNINA"; inherit version; - sha256 = "sha256-U8/SzkkZJLRBpTQx8NRpFWUlckn4Jr0n9cHR4/plyb0="; + hash = "sha256-2Ujq2+6xQXPjKzK3HQbJnjz8cX3ALUV+22gdQflFxFY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/pkgs/development/python-modules/pynmea2/default.nix index 4a4fbfd4dc6b..859b12647460 100644 --- a/pkgs/development/python-modules/pynmea2/default.nix +++ b/pkgs/development/python-modules/pynmea2/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "pynmea2"; - version = "1.18.0"; + version = "1.19.0"; src = fetchPypi { inherit pname version; - sha256 = "1b94lhpbgvnknb563dlwvs5vkk7w3ma54sj614ynh2dzgqrd6h73"; + hash = "sha256-Hap5uTJ5+IfRwjXlzFx54yZEVkE4zkaYmrD0ovyXDXw="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pynmea2" ]; diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index 725a2dbcf43b..b7075b9619d7 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , importlib-metadata , joblib , llvmlite @@ -23,6 +24,18 @@ buildPythonPackage rec { hash = "sha256-p8VSVpv2BKEB/VS7odJ8EjieBllF3uOmd3pRjGOkbys="; }; + patches = [ + # Fix sklearn 1.2.0 compat; https://github.com/lmcinnes/pynndescent/issues/207 + (fetchpatch { + url = "https://github.com/lmcinnes/pynndescent/commit/00444be2107b71169b853847e7b334623c58a4e3.patch"; + hash = "sha256-mbe01BwroS5q6hENsj3NejmGGhmk2IeX4LD6Iq6PR0c="; + }) + (fetchpatch { + url = "https://github.com/lmcinnes/pynndescent/commit/e56b92776a4a05f2dabb80d25479bd37e7ebd88e.patch"; + hash = "sha256-zVTaW4syGEHh2HAGPyBN3YXqUGe55v/LxKLX/zjXT5Y="; + }) + ]; + propagatedBuildInputs = [ joblib llvmlite @@ -33,7 +46,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pynrrd/default.nix b/pkgs/development/python-modules/pynrrd/default.nix index 91cff70bae35..7d36e42da70d 100644 --- a/pkgs/development/python-modules/pynrrd/default.nix +++ b/pkgs/development/python-modules/pynrrd/default.nix @@ -1,13 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub -, numpy , pythonOlder +, numpy +, nptyping +, typing-extensions }: buildPythonPackage rec { pname = "pynrrd"; - version = "0.4.3"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,11 +18,13 @@ buildPythonPackage rec { owner = "mhe"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4UM2NAKWfsjxAoLQCFSPVKG5GukxqppywqvLM0V/dIs="; + hash = "sha256-R/bUItF2BaKTFdMNBHFJKq0jSX6z49e8CGXENUn07SU="; }; propagatedBuildInputs = [ numpy + nptyping + typing-extensions ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pynws/default.nix b/pkgs/development/python-modules/pynws/default.nix index eb19d273459b..15044872a982 100644 --- a/pkgs/development/python-modules/pynws/default.nix +++ b/pkgs/development/python-modules/pynws/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { metar ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytest-aiohttp pytest-asyncio diff --git a/pkgs/development/python-modules/pynx584/default.nix b/pkgs/development/python-modules/pynx584/default.nix index 35c0301aeb31..2ac855773e84 100644 --- a/pkgs/development/python-modules/pynx584/default.nix +++ b/pkgs/development/python-modules/pynx584/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { stevedore ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/embedded/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix similarity index 97% rename from pkgs/development/embedded/pyocd/default.nix rename to pkgs/development/python-modules/pyocd/default.nix index 52cf703a71aa..aebab128cb1e 100644 --- a/pkgs/development/embedded/pyocd/default.nix +++ b/pkgs/development/python-modules/pyocd/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { hidapi ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pyocd" ]; diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index 916a22a62ed0..2922c03b0588 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/python-modules/pyoctoprintapi/default.nix b/pkgs/development/python-modules/pyoctoprintapi/default.nix index da3ebac2c1e2..4c53c37d5c24 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.9"; + version = "0.1.11"; in buildPythonPackage { inherit pname version; @@ -22,7 +22,7 @@ buildPythonPackage { owner = "rfleming71"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kZMTHw0S12aUn/DYQuyjQa48QtiwLGYyY4gYKA5063A="; + hash = "sha256-MlFL8yUCkiMnxPbMGr4jwCs0kYwRM+VGBRQUcQ5Hd6A="; }; propagatedBuildInputs = [ @@ -33,7 +33,7 @@ buildPythonPackage { "pyoctoprintapi" ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; @@ -41,6 +41,7 @@ buildPythonPackage { meta = with lib; { description = "Simple async wrapper around the Octoprint API"; homepage = "https://github.com/rfleming71/pyoctoprintapi"; + changelog = "https://github.com/rfleming71/pyoctoprintapi/releases/tag/v${version}"; license = licenses.mit; maintainers= with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index e62417b2df3a..5b8656bbe19f 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -1,24 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, isPyPy, unixODBC }: +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, pythonOlder +, unixODBC +}: buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.34"; - disabled = isPyPy; # use pypypdbc instead + version = "4.0.35"; + format = "setuptools"; + + disabled = pythonOlder "3.7" || isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - sha256 = "sha256-fqeGlTK5a41Smx8I6oV2X5TffkpY6Wiy+NRVNGoD5Fw="; + hash = "sha256-krmvSOi5KEVbyLlL89oFdR+uwJMqEe7iN8GJxtQ55cg="; }; - buildInputs = [ unixODBC ]; + buildInputs = [ + unixODBC + ]; - doCheck = false; # tests require a database server + # Tests require a database server + doCheck = false; - pythonImportsCheck = [ "pyodbc" ]; + pythonImportsCheck = [ + "pyodbc" + ]; meta = with lib; { description = "Python ODBC module to connect to almost any database"; homepage = "https://github.com/mkleehammer/pyodbc"; + changelog = "https://github.com/mkleehammer/pyodbc/releases/tag/${version}"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index 23283ab2f5a8..eef2875a0d97 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyomo"; - version = "6.4.2"; + version = "6.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,14 +18,14 @@ buildPythonPackage rec { repo = "pyomo"; owner = "pyomo"; rev = "refs/tags/${version}"; - hash = "sha256-YTcK5UCE6AuGk3iyhLOeqdl0rb8ccOhBRJEew40Rris="; + hash = "sha256-FVpwJRCRlc537tJomB4Alxx8zJj8FpZp+LxB0f12rGE="; }; propagatedBuildInputs = [ ply ]; - checkInputs = [ + nativeCheckInputs = [ parameterized pytestCheckHook ]; @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Optimization Modeling Objects"; homepage = "http://pyomo.org"; + changelog = "https://github.com/Pyomo/pyomo/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 8d361ccb6ec8..ad24fbcbd2a0 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -22,9 +22,9 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2022.2.4"; + version = "2022.3.1"; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs; propagatedBuildInputs = [ @@ -40,7 +40,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-tXye+L2ObbB+iRBvMJG6I2sk+Vo4/UDfsX0u1/9r5K0="; + sha256 = "sha256-Sj2w/mG1zclSZ1Jt7r1xp+HXlWlNSw/idh8GMLzKNiE="; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/pkgs/development/python-modules/pyopengl-accelerate/default.nix index 195ec563d50f..27e329c92855 100644 --- a/pkgs/development/python-modules/pyopengl-accelerate/default.nix +++ b/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyopengl-accelerate"; - version = "3.1.5"; + version = "3.1.6"; disabled = pythonAtLeast "3.10"; # fails to compile src = fetchPypi { pname = "PyOpenGL-accelerate"; inherit version; - sha256 = "01iggy5jwxv7lxnj51zbmlbhag9wcb7dvrbwgi97i90n0a5m3r8j"; + sha256 = "sha256-rYowAlbsolIoJh3hb3QeUaMPNPHhsc9oNZ9cYtvNzcM="; }; meta = { diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index 7370057ad720..5ba33acd2305 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = "http://pyopengl.sourceforge.net/"; + homepage = "https://pyopengl.sourceforge.net/"; description = "PyOpenGL, the Python OpenGL bindings"; longDescription = '' PyOpenGL is the cross platform Python binding to OpenGL and diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 2a81ebf40efe..048c47184d16 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, fetchpatch , openssl , cryptography , pytestCheckHook @@ -21,19 +22,23 @@ buildPythonPackage rec { sha256 = "sha256-eoO3snLdWVIi1nL1zimqAw8fuDdjDvIp9i5y45XOiWg="; }; + patches = [ + (fetchpatch { + name = "fix-flaky-darwin-handshake-tests.patch"; + url = "https://github.com/pyca/pyopenssl/commit/8a75898356806784caf742e8277ef03de830ce11.patch"; + hash = "sha256-UVsZ8Nq1jUTZhOUAilRgdtqMYp4AN7qvWHqc6RleqRI="; + }) + ]; + postPatch = '' # remove cryptography pin sed "/cryptography/ s/,<[0-9]*//g" setup.py ''; - # 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 ]; - checkInputs = [ pytestCheckHook pretend flaky ]; + nativeCheckInputs = [ pytestCheckHook pretend flaky ]; preCheck = '' export LANG="en_US.UTF-8" @@ -79,7 +84,5 @@ buildPythonPackage rec { homepage = "https://github.com/pyca/pyopenssl"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; - # https://github.com/pyca/pyopenssl/issues/873 - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix index 8de86af1fbc8..49f4b06a5ce6 100644 --- a/pkgs/development/python-modules/pyopenuv/default.nix +++ b/pkgs/development/python-modules/pyopenuv/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyopenuv"; - version = "2022.10.0"; + version = "2023.01.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-g89UV3rQc6WP6xU4x07Vdgp6plTH1BVdwxmjE2ocnp4="; + hash = "sha256-qPLfah35E0vX2tQhGw4wTSMyE4nIyWMDIaKlJePVSd4="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { backoff ]; - checkInputs = [ + nativeCheckInputs = [ aresponses asynctest pytest-asyncio diff --git a/pkgs/development/python-modules/pyopnsense/default.nix b/pkgs/development/python-modules/pyopnsense/default.nix index f4f5bf6c70d4..7debcd3b7a35 100644 --- a/pkgs/development/python-modules/pyopnsense/default.nix +++ b/pkgs/development/python-modules/pyopnsense/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ fixtures mock pytest-cov diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index 22473af90282..289f4d1c048e 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -1,28 +1,59 @@ -{ lib, buildPythonPackage, fetchFromGitHub, cmake, python -, libosmium, protozero, boost, expat, bzip2, zlib, pybind11 -, shapely, pythonOlder, isPyPy, lz4, requests, pytestCheckHook +{ lib +, buildPythonPackage +, fetchFromGitHub +, cmake +, python +, libosmium +, protozero +, boost +, expat +, bzip2 +, zlib +, pybind11 +, shapely +, pythonOlder +, isPyPy +, lz4 +, requests +, pytestCheckHook }: buildPythonPackage rec { pname = "pyosmium"; - version = "3.5.0"; + version = "3.6.0"; + format = "setuptools"; - disabled = pythonOlder "3.4" || isPyPy; + disabled = pythonOlder "3.6" || isPyPy; src = fetchFromGitHub { owner = "osmcode"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-dumTyca1nLPa6B3p5fmUGWa6jReHOeFPc9heTz/2zao="; + hash = "sha256-+YJQGPQm2FGOPhNzlXX2GM+ad4QdipJhwViOKGHtqBk="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libosmium protozero boost expat bzip2 zlib pybind11 lz4 ]; - propagatedBuildInputs = [ requests ]; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + libosmium + protozero + boost + expat + bzip2 + zlib + pybind11 + lz4 + ]; + + propagatedBuildInputs = [ + requests + ]; preBuild = "cd .."; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook shapely ]; diff --git a/pkgs/development/python-modules/pyotgw/default.nix b/pkgs/development/python-modules/pyotgw/default.nix index 7e6807854180..71ef391cb49f 100644 --- a/pkgs/development/python-modules/pyotgw/default.nix +++ b/pkgs/development/python-modules/pyotgw/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyotgw"; - version = "2.1.2"; + version = "2.1.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "mvn23"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qUwpW9C9VqsbDNa9zqa/BZtMuzmPU21Au/q0iGRkBNY="; + hash = "sha256-XIwBGjvIulKLmYZIorKIJwoHTNOIYYX8US2Na8MZ2LA="; }; propagatedBuildInputs = [ pyserial-asyncio ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyotp/default.nix b/pkgs/development/python-modules/pyotp/default.nix index 8b64a713d9f4..47ef017c7f11 100644 --- a/pkgs/development/python-modules/pyotp/default.nix +++ b/pkgs/development/python-modules/pyotp/default.nix @@ -1,18 +1,30 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, unittestCheckHook +}: buildPythonPackage rec { pname = "pyotp"; - version = "2.7.0"; - disabled = isPy27; + version = "2.8.0"; + disabled = pythonOlder "3.7"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zpifq6Dfd9wDK0XlHGzKQrzyCJbI09HnzXWaU9x9bLU="; + hash = "sha256-wvXhfZ2pLY7B995jMasIEWuRFa26vLpuII1G/EmpjFo="; }; + nativeCheckInputs = [ + unittestCheckHook + ]; + pythonImportsCheck = [ "pyotp" ]; meta = with lib; { + changelog = "https://github.com/pyauth/pyotp/blob/v${version}/Changes.rst"; description = "Python One Time Password Library"; homepage = "https://github.com/pyauth/pyotp"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index be3548fad0b9..49e6abffd54a 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.6.0"; + version = "1.7.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-TWX/8O57gNqkm1ZqreZfy1AQ6UcgP4FODDpXteqO5q8="; + hash = "sha256-hmi6cOBHbcxzA10vQt6fxB8qHrr4My5JFmucV5QCUVg="; }; postPatch = '' @@ -45,7 +45,7 @@ buildPythonPackage rec { warrant-lite ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with the Somfy TaHoma API or other OverKiz APIs"; homepage = "https://github.com/iMicknl/python-overkiz-api"; + changelog = "https://github.com/iMicknl/python-overkiz-api/releases/tag/v${version}"; 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 b5b8a100ba2f..3282120a52ff 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyp/default.nix b/pkgs/development/python-modules/pyp/default.nix index 1eeeb83a9dce..fa7fcc6902e2 100644 --- a/pkgs/development/python-modules/pyp/default.nix +++ b/pkgs/development/python-modules/pyp/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { export PATH=$out/bin:$PATH ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook coreutils jq diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index 87cfe2708dfd..a12ae560bfc5 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ./skip-tests.patch ]; - checkInputs = [ + nativeCheckInputs = [ texlive.combined.scheme-small pandocfilters ]; diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index 3d10fca06c05..fcf33dc94163 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -5,45 +5,49 @@ , jinja2 , pytestCheckHook , railroad-diagrams +, pyparsing }: -let - pyparsing = buildPythonPackage rec { - pname = "pyparsing"; - version = "3.0.9"; - format = "pyproject"; +buildPythonPackage rec { + pname = "pyparsing"; + version = "3.0.9"; + format = "pyproject"; - src = fetchFromGitHub { - owner = "pyparsing"; - repo = pname; - rev = "pyparsing_${version}"; - sha256 = "sha256-aCRyJQyLf8qQ6NO41q+HC856TjIHzIt0vyVBLV+3teE="; - }; - - nativeBuildInputs = [ - flit-core - ]; - - # circular dependencies with pytest if enabled by default - doCheck = false; - checkInputs = [ - jinja2 - pytestCheckHook - railroad-diagrams - ]; - - pythonImportsCheck = [ "pyparsing" ]; - - 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 ]; - }; + src = fetchFromGitHub { + owner = "pyparsing"; + repo = pname; + rev = "pyparsing_${version}"; + sha256 = "sha256-aCRyJQyLf8qQ6NO41q+HC856TjIHzIt0vyVBLV+3teE="; }; -in -pyparsing + + nativeBuildInputs = [ + flit-core + ]; + + # circular dependencies with pytest if enabled by default + doCheck = false; + nativeCheckInputs = [ + jinja2 + pytestCheckHook + railroad-diagrams + ]; + + pythonImportsCheck = [ "pyparsing" ]; + + passthru.tests = { + check = pyparsing.overridePythonAttrs (_: { doCheck = true; }); + }; + + meta = with lib; { + homepage = "https://github.com/pyparsing/pyparsing"; + description = "Python library for creating PEG parsers"; + longDescription = '' + The pyparsing module is an alternative approach to creating and executing + simple grammars, vs. the traditional lex/yacc approach, or the use of + regular expressions. The pyparsing module provides a library of classes + that client code uses to construct the grammar directly in Python code. + ''; + license = licenses.mit; + maintainers = with maintainers; [ kamadorueda ]; + }; +} diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index 1c054defbef3..3c6abd0cc78b 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ pkgs.pkg-config ]; - checkInputs = [ six ]; + nativeCheckInputs = [ six ]; propagatedBuildInputs = [ pkgs.parted ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index f70e40029992..9c497b3e3b50 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pexpect ] ++ lib.optional (pythonOlder "3.4") enum34; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; # Configuration so that the tests work preCheck = '' diff --git a/pkgs/development/python-modules/pypcap/default.nix b/pkgs/development/python-modules/pypcap/default.nix index 84f94a76294c..77d27bdff1e5 100644 --- a/pkgs/development/python-modules/pypcap/default.nix +++ b/pkgs/development/python-modules/pypcap/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { buildInputs = [ libpcap ]; - checkInputs = [ + nativeCheckInputs = [ dpkt pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 13519664b52b..1ef36070a52f 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.15"; + version = "0.7.16"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,11 +18,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alengwenus"; repo = pname; - rev = version; - hash = "sha256-OuM/r9rxIl4niY87cEcbZ73x2ZIQbaPZqbMrQ7hZE/g="; + rev = "refs/tags/${version}"; + hash = "sha256-OcXMVgG62JUH28BGvfO/rpnC++/klhBLJ2HafDu9R40="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-timeout pytestCheckHook @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "LCN-PCK library written in Python"; homepage = "https://github.com/alengwenus/pypck"; + changelog = "https://github.com/alengwenus/pypck/releases/tag/${version}"; license = with licenses; [ epl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pypdf2/default.nix b/pkgs/development/python-modules/pypdf2/default.nix index 8980a9ff592b..a93653e7e83f 100644 --- a/pkgs/development/python-modules/pypdf2/default.nix +++ b/pkgs/development/python-modules/pypdf2/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "PyPDF2" diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index 3a0f1a53ffd6..28eac119f9b5 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -1,38 +1,41 @@ { lib , buildPythonPackage , fetchPypi -, six -, statistics +, fetchpatch , pythonOlder -, nose , psutil -, contextlib2 -, mock -, unittest2 -, isPy27 -, python +, unittestCheckHook }: buildPythonPackage rec { pname = "pyperf"; - version = "2.4.1"; + version = "2.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OM9ekMVvkGqDIM6CpQv6kskCuTr/1y5NyBWAEV81WFM="; + hash = "sha256-n9m+W1ciTmi1pbiPcSbxW2yGZ1c/YqCjn68U1v3ROQk="; }; - checkInputs = [ nose psutil ] ++ - lib.optionals isPy27 [ contextlib2 mock unittest2 ]; - propagatedBuildInputs = [ six ] ++ - lib.optionals (pythonOlder "3.4") [ statistics ]; + patches = [ + (fetchpatch { + name = "fix-pythonpath-in-tests.patch"; + url = "https://github.com/psf/pyperf/commit/d373c5e56c0257d2d7abd705b676bea25cf66566.patch"; + hash = "sha256-2q1fTf+uU3qj3BG8P5otX4f7mSTnQxm4sfmmgIUuszA="; + }) + ]; - # tests not included in pypi repository - doCheck = false; + propagatedBuildInputs = [ + psutil + ]; - checkPhase = '' - ${python.interpreter} -m nose - ''; + nativeCheckInputs = [ + unittestCheckHook + ]; + + unittestFlagsArray = [ "-s" "pyperf/tests/" "-v" ]; meta = with lib; { description = "Python module to generate and modify perf"; diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index 6822886bda4e..81d4aa5b1c2f 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -3,16 +3,19 @@ , fetchPypi , flit , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pyphen"; - version = "0.13.0"; + version = "0.13.2"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-Boc86//WWo/KfCDA49wDJlXH7o3g9VIgXK07V0JlwpM="; + hash = "sha256-hH9XoEOlhAjyRnCuAYT/bt+1/VcxdDIIIowCjdxRRDg="; }; nativeBuildInputs = [ @@ -23,13 +26,18 @@ buildPythonPackage rec { sed -i '/addopts/d' pyproject.toml ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "pyphen" + ]; + meta = with lib; { - description = "Pure Python module to hyphenate text"; + description = "Module to hyphenate text"; homepage = "https://github.com/Kozea/Pyphen"; + changelog = "https://github.com/Kozea/Pyphen/releases/tag/${version}"; license = with licenses; [gpl2 lgpl21 mpl20]; maintainers = with maintainers; [ rvl ]; }; diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix index 4f79d50e3673..327e3a92adac 100644 --- a/pkgs/development/python-modules/pypinyin/default.nix +++ b/pkgs/development/python-modules/pypinyin/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { "--cov-report term-missing" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pypiserver/default.nix b/pkgs/development/python-modules/pypiserver/default.nix index 74d3c10ffe73..c4a058dff172 100644 --- a/pkgs/development/python-modules/pypiserver/default.nix +++ b/pkgs/development/python-modules/pypiserver/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - checkInputs = [ + nativeCheckInputs = [ passlib pytestCheckHook twine diff --git a/pkgs/development/python-modules/pypng/default.nix b/pkgs/development/python-modules/pypng/default.nix index 129300b08158..ce8b8deffa2c 100644 --- a/pkgs/development/python-modules/pypng/default.nix +++ b/pkgs/development/python-modules/pypng/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "png" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Pure Python library for PNG image encoding/decoding"; diff --git a/pkgs/development/python-modules/pyppeteer/default.nix b/pkgs/development/python-modules/pyppeteer/default.nix index a1857ec72067..19e76acb9db5 100644 --- a/pkgs/development/python-modules/pyppeteer/default.nix +++ b/pkgs/development/python-modules/pyppeteer/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ syncer pytest-xdist pytestCheckHook diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix index 621850742af2..d9172c959550 100644 --- a/pkgs/development/python-modules/pyprecice/default.nix +++ b/pkgs/development/python-modules/pyprecice/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyprecice"; - version = "2.4.0.0"; + version = "2.5.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "precice"; repo = "python-bindings"; rev = "refs/tags/v${version}"; - hash = "sha256-Endy5oiC1OWdtZlVPUkIdkzoDTc1b5TaQ6VEUWq5iSg="; + hash = "sha256-0dxWtlN3x3orBgtCTxTsql39+MBVsgeHO7gXjOO8qcA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyprind/default.nix b/pkgs/development/python-modules/pyprind/default.nix index 082ebb2a49b0..faf99607199a 100644 --- a/pkgs/development/python-modules/pyprind/default.nix +++ b/pkgs/development/python-modules/pyprind/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ psutil ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test tests diff --git a/pkgs/development/python-modules/pyprof2calltree/default.nix b/pkgs/development/python-modules/pyprof2calltree/default.nix index 7244438c6e08..77f24e3e15e2 100644 --- a/pkgs/development/python-modules/pyprof2calltree/default.nix +++ b/pkgs/development/python-modules/pyprof2calltree/default.nix @@ -15,7 +15,8 @@ buildPythonPackage rec { meta = with lib; { description = "Help visualize profiling data from cProfile with kcachegrind and qcachegrind"; - homepage = "https://pypi.python.org/pypi/pyprof2calltree/"; + homepage = "https://github.com/pwaller/pyprof2calltree"; + changelog = "https://github.com/pwaller/pyprof2calltree/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ sfrijters ]; }; diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 35ff129e2681..f847fedc5ec1 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyproj"; - version = "3.4.0"; + version = "3.4.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pyproj4"; repo = "pyproj"; rev = "refs/tags/${version}"; - hash = "sha256-EXPeDNGr6eAAsLXCkV9mmkNDO1KScjZYgmBPzt+A1OU="; + hash = "sha256-SbuamcVXvbV5eGm08jhbp1yBno60vkniHrH5xrPej2A="; }; # force pyproj to use ${proj} @@ -43,7 +43,7 @@ buildPythonPackage rec { certifi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock numpy diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix new file mode 100644 index 000000000000..d0617dfced85 --- /dev/null +++ b/pkgs/development/python-modules/pyproject-api/default.nix @@ -0,0 +1,89 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build time +, hatchling +, hatch-vcs +, setuptools-scm + +# runtime +, packaging +, toml +, tomli + +# docs +, sphinxHook +, furo +, sphinx-autodoc-typehints + +# tests +, pytest-mock +, pytestCheckHook +, virtualenv +, wheel +}: + +buildPythonPackage rec { + pname = "pyproject-api"; + version = "1.2.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "tox-dev"; + repo = "pyproject-api"; + rev = "refs/tags/${version}"; + hash = "sha256-IRNg0/lTWoS8znsbipZNoeun+uOpZtCApL4HkF2lwhU="; + }; + + outputs = [ + "out" + "doc" + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + hatchling + hatch-vcs + setuptools-scm + + # docs + sphinxHook + furo + sphinx-autodoc-typehints + ]; + + propagatedBuildInputs = [ + packaging + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + nativeCheckInputs = [ + pytest-mock + pytestCheckHook + virtualenv + wheel + ]; + + disabledTests = [ + # requires eol python2 interpreter + "test_can_build_on_python_2" + ]; + + pythonImportsCheck = [ + "pyproject_api" + ]; + + meta = with lib; { + changelog = "https://github.com/tox-dev/pyproject-api/releases/tag/${version}"; + description = "API to interact with the python pyproject.toml based projects"; + homepage = "https://github.com/tox-dev/pyproject-api"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pyproject-hooks/default.nix b/pkgs/development/python-modules/pyproject-hooks/default.nix new file mode 100644 index 000000000000..76bf3902c3d2 --- /dev/null +++ b/pkgs/development/python-modules/pyproject-hooks/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flit-core +, pytestCheckHook +, pythonOlder +, setuptools +, testpath +, tomli +}: + +buildPythonPackage rec { + pname = "pyproject-hooks"; + version = "1.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi rec { + pname = "pyproject_hooks"; + inherit version; + hash = "sha256-8nGymLl/WVXVP7ErcsH7GUjCLBprcLMVxUztrKAmTvU="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + nativeCheckInputs = [ + pytestCheckHook + setuptools + testpath + ]; + + disabledTests = [ + # fail to import setuptools + "test_setup_py" + "test_issue_104" + ]; + + pythonImportsCheck = [ + "pyproject_hooks" + ]; + + meta = with lib; { + description = "Low-level library for calling build-backends in `pyproject.toml`-based project "; + homepage = "https://github.com/pypa/pyproject-hooks"; + changelog = "https://github.com/pypa/pyproject-hooks/blob/v${version}/docs/changelog.rst"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pyproject-metadata/default.nix b/pkgs/development/python-modules/pyproject-metadata/default.nix index 5cd5b92073bc..4704b4ef157b 100644 --- a/pkgs/development/python-modules/pyproject-metadata/default.nix +++ b/pkgs/development/python-modules/pyproject-metadata/default.nix @@ -1,21 +1,24 @@ { lib , buildPythonPackage , fetchPypi -, setuptools -, wheel , packaging , pytestCheckHook +, pythonOlder +, setuptools , tomli +, wheel }: buildPythonPackage rec { pname = "pyproject-metadata"; - version = "0.5.0"; + version = "0.6.1"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi rec { inherit pname version; - hash = "sha256-6YN9I3V8XJ//+19/N8+be8LZc30OlZt/XV8YmVFulww="; + hash = "sha256-tfsJVDpkqRFl3+hXlnWfnkFe3Clr602zPR7PeGaoYr0="; }; nativeBuildInputs = [ @@ -27,17 +30,23 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; # Many broken tests, and missing test files doCheck = false; + pythonImportsCheck = [ + "pyproject_metadata" + ]; + meta = with lib; { description = "PEP 621 metadata parsing"; homepage = "https://github.com/FFY00/python-pyproject-metadata"; + changelog = "https://github.com/FFY00/python-pyproject-metadata/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/pypsrp/default.nix b/pkgs/development/python-modules/pypsrp/default.nix index 7246af07e382..e474a8456738 100644 --- a/pkgs/development/python-modules/pypsrp/default.nix +++ b/pkgs/development/python-modules/pypsrp/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook pyyaml diff --git a/pkgs/development/python-modules/pypubsub/default.nix b/pkgs/development/python-modules/pypubsub/default.nix index fd19167a3e9d..db473a293895 100644 --- a/pkgs/development/python-modules/pypubsub/default.nix +++ b/pkgs/development/python-modules/pypubsub/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "02j74w28wzmdvxkk8i561ywjgizjifq3hgcl080yj0rvkd3wivlb"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' cd tests/suite diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix index b983bedc4098..e530df116c2b 100644 --- a/pkgs/development/python-modules/pypugjs/default.nix +++ b/pkgs/development/python-modules/pypugjs/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six charset-normalizer ]; - checkInputs = [ + nativeCheckInputs = [ django jinja2 Mako diff --git a/pkgs/development/python-modules/pypykatz/default.nix b/pkgs/development/python-modules/pypykatz/default.nix index b926da1236cc..da6cdd5dc10e 100644 --- a/pkgs/development/python-modules/pypykatz/default.nix +++ b/pkgs/development/python-modules/pypykatz/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pypykatz"; - version = "0.6.2"; + version = "0.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-djk8b7/H23aDmyGaM60goAcpfZQrpftOIIRKnJjFz50="; + hash = "sha256-Rb4QCxntXJYA8sqkgAjS6e8WJK9ljhIKgM3dfpmbHSc="; }; propagatedBuildInputs = [ @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Mimikatz implementation in Python"; homepage = "https://github.com/skelsec/pypykatz"; + changelog = "https://github.com/skelsec/pypykatz/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pypytools/default.nix b/pkgs/development/python-modules/pypytools/default.nix index e88891172deb..fdaeb031f9c6 100644 --- a/pkgs/development/python-modules/pypytools/default.nix +++ b/pkgs/development/python-modules/pypytools/default.nix @@ -6,6 +6,7 @@ , numpy , py , pytestCheckHook +, pythonAtLeast , pythonOlder }: @@ -25,9 +26,10 @@ buildPythonPackage rec { py ]; - checkInputs = [ + nativeCheckInputs = [ freezegun numpy + py pytestCheckHook ]; @@ -44,6 +46,11 @@ buildPythonPackage rec { "pypytools" ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/antocuni/pypytools/issues/4 + "test_clonefunc" + ]; + meta = with lib; { description = "Collection of tools to use PyPy-specific features"; homepage = "https://github.com/antocuni/pypytools"; diff --git a/pkgs/development/python-modules/pyqldb/default.nix b/pkgs/development/python-modules/pyqldb/default.nix index a6fd8665fd14..b4ff71cb0397 100644 --- a/pkgs/development/python-modules/pyqldb/default.nix +++ b/pkgs/development/python-modules/pyqldb/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ boto3 amazon-ion ionhash ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' export AWS_DEFAULT_REGION=us-east-1 diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index c2ef82a158c6..fce9308093ec 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , isPy27 , fetchPypi @@ -58,7 +59,7 @@ buildPythonPackage rec { # pkgs/development/interpreters/python/hooks/pip-build-hook.sh # does not use the enableParallelBuilding flag postUnpack = '' - export MAKEFLAGS+=" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES" + export MAKEFLAGS+=" -j$NIX_BUILD_CORES" ''; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyqt6-webengine.nix b/pkgs/development/python-modules/pyqt6-webengine.nix index 96fa057a47ca..564d1a143251 100644 --- a/pkgs/development/python-modules/pyqt6-webengine.nix +++ b/pkgs/development/python-modules/pyqt6-webengine.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { # pkgs/development/interpreters/python/hooks/pip-build-hook.sh # does not use the enableParallelBuilding flag postUnpack = '' - export MAKEFLAGS+=" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES" + export MAKEFLAGS+=" -j$NIX_BUILD_CORES" ''; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index af5567acc8d3..23cceed4e7e0 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pyopengl ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}" diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index c86fe165d4fc..c11dcad4d7d3 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -1,10 +1,12 @@ -{ lib, pythonPackages, pkg-config +{ lib, stdenv, pythonPackages, pkg-config , qmake, qtbase, qtsvg, qtwebengine , wrapQtAppsHook +, darwin }: let inherit (pythonPackages) buildPythonPackage python isPy27 pyqt5 enum34 sip pyqt-builder; + inherit (darwin) autoSignDarwinBinariesHook; in buildPythonPackage rec { pname = "PyQtWebEngine"; version = "5.15.4"; @@ -33,6 +35,8 @@ in buildPythonPackage rec { qtwebengine pyqt-builder pythonPackages.setuptools + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pyquaternion/default.nix b/pkgs/development/python-modules/pyquaternion/default.nix index 48c8d991175f..feee5dcc6be0 100644 --- a/pkgs/development/python-modules/pyquaternion/default.nix +++ b/pkgs/development/python-modules/pyquaternion/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; pythonImportsCheck = [ "pyquaternion" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyquery/default.nix b/pkgs/development/python-modules/pyquery/default.nix index 40139c795677..0e1203b901b0 100644 --- a/pkgs/development/python-modules/pyquery/default.nix +++ b/pkgs/development/python-modules/pyquery/default.nix @@ -3,18 +3,23 @@ , cssselect , fetchPypi , lxml +, pytestCheckHook , pythonOlder +, requests +, webob +, webtest }: buildPythonPackage rec { pname = "pyquery"; - version = "1.4.3"; - disabled = pythonOlder "3.5"; + version = "2.0.0"; + disabled = pythonOlder "3.7"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "00p6f1dfma65192hc72dxd506491lsq3g5wgxqafi1xpg2w1xia6"; + hash = "sha256-lj6NTpAmL/bY3sBy6pcoXcN0ovacrXd29AgqvPah2K4="; }; propagatedBuildInputs = [ @@ -22,10 +27,23 @@ buildPythonPackage rec { lxml ]; - # circular dependency on webtest - doCheck = false; pythonImportsCheck = [ "pyquery" ]; + checkInputs = [ + pytestCheckHook + requests + webob + (webtest.overridePythonAttrs (_: { + # circular dependency + doCheck = false; + })) + ]; + + pytestFlagsArray = [ + # requires network + "--deselect=tests/test_pyquery.py::TestWebScrappingEncoding::test_get" + ]; + meta = with lib; { description = "A jquery-like library for Python"; homepage = "https://github.com/gawel/pyquery"; diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index 7fa842230f45..72ba19f8a2e8 100644 --- a/pkgs/development/python-modules/pyquil/default.nix +++ b/pkgs/development/python-modules/pyquil/default.nix @@ -12,7 +12,9 @@ , pytest-httpx , pytest-mock , pytestCheckHook +, pythonAtLeast , pythonOlder +, pythonRelaxDepsHook , qcs-api-client , respx , retry @@ -24,7 +26,7 @@ buildPythonPackage rec { pname = "pyquil"; - version = "3.3.2"; + version = "3.3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,12 +34,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rigetti"; repo = pname; - rev = "v${version}"; - hash = "sha256-Ur7dRxmnaAWXHk7c6NC3lBw59RRgh9vwAHFW00fViD4="; + rev = "refs/tags/v${version}"; + hash = "sha256-jA6nYQSfdxd9FCTMQlYTe/EbV39vV0h9F9Fgf1M0+SY="; }; + pythonRelaxDeps = [ + "lark" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -54,22 +61,19 @@ buildPythonPackage rec { importlib-metadata ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + checkInputs = [ pytest-asyncio pytest-freezegun pytest-httpx pytest-mock - pytestCheckHook respx ipython ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'lark = "^0.11.1"' 'lark = "*"' \ - --replace 'qcs-api-client = ">=0.8.1,<0.21.0"' 'qcs-api-client = "*"' - ''; - disabledTestPaths = [ # Tests require network access "test/e2e/" @@ -85,6 +89,8 @@ buildPythonPackage rec { "test/unit/test_reference_wavefunction.py" # Out-dated "test/unit/test_qpu_client.py" + "test/unit/test_qvm_client.py" + "test/unit/test_reference_density.py" ]; disabledTests = [ @@ -102,6 +108,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for creating Quantum Instruction Language (Quil) programs"; homepage = "https://github.com/rigetti/pyquil"; + changelog = "https://github.com/rigetti/pyquil/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyqvrpro/default.nix b/pkgs/development/python-modules/pyqvrpro/default.nix index 0e12b339c07c..f170050954f7 100644 --- a/pkgs/development/python-modules/pyqvrpro/default.nix +++ b/pkgs/development/python-modules/pyqvrpro/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { untangle ]; - checkInputs = [ + nativeCheckInputs = [ pytest-vcr pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyqwikswitch/default.nix b/pkgs/development/python-modules/pyqwikswitch/default.nix new file mode 100644 index 000000000000..20a5d59833db --- /dev/null +++ b/pkgs/development/python-modules/pyqwikswitch/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, attrs +, requests +, python +}: + +buildPythonPackage rec { + pname = "pyqwikswitch"; + version = "0.94"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-IpyWz+3EMr0I+xULBJJhBgdnQHNPJIM1SqKFLpszhQc="; + }; + + propagatedBuildInputs = [ + attrs + requests + ]; + + pythonImportsCheck = [ + "pyqwikswitch" + "pyqwikswitch.threaded" + ]; + + doCheck = false; # no tests in sdist + + meta = with lib; { + description = "QwikSwitch USB Modem API binding for Python"; + homepage = "https://github.com/kellerza/pyqwikswitch"; + license = licenses.mit; + maintainers = teams.home-assistant.members; + }; +} diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix index 97c8b6895c3f..dfcff9feb933 100644 --- a/pkgs/development/python-modules/pyrad/default.nix +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { --replace "def testBindv6(self):" "def dontTestBindv6(self):" ''; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 5035f7c1a369..899e1cfd7b60 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , parameterized , pycryptodome +, pydantic +, pytest-aiohttp , pytestCheckHook , pythonOlder , pyyaml @@ -13,31 +15,36 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "0.6.2"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = "jbarrancos"; + owner = "allenporter"; repo = pname; - rev = version; - hash = "sha256-MikJDW5Fo2DNpn9/Hyc1ecIIMEwE8GD5LKpka2t7aCk="; + rev = "refs/tags/${version}"; + hash = "sha256-e+neyzH+sGTzGwdy/N7n6GUvctHlHQgwDkRQsnzL7Jw="; }; postPatch = '' substituteInPlace pytest.ini \ --replace "--cov=pyrainbird --cov-report=term-missing" "" + + substituteInPlace setup.cfg \ + --replace "pycryptodome>=3.16.0" "pycryptodome" ''; propagatedBuildInputs = [ pycryptodome + pydantic pyyaml requests ]; - checkInputs = [ + nativeCheckInputs = [ parameterized + pytest-aiohttp pytestCheckHook requests-mock responses @@ -49,7 +56,8 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with Rainbird controllers"; - homepage = "https://github.com/jbarrancos/pyrainbird/"; + homepage = "https://github.com/allenporter/pyrainbird"; + changelog = "https://github.com/allenporter/pyrainbird/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index fb1feb767315..426459a67fb4 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -13,28 +13,48 @@ , webob , zope_deprecation , zope_interface +, pythonOlder }: buildPythonPackage rec { pname = "pyramid"; - version = "2.0"; + version = "2.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "45431b387587ed0fac6213b54d6e9f0936f0cc85238a8f5af7852fc9484c5c77"; + hash = "sha256-+r/XRQOeJq1bCRX8OW6HJcD4o9F7lB+WEezR7XbP59o="; }; - checkInputs = [ webtest zope_component ]; + propagatedBuildInputs = [ + hupper + pastedeploy + plaster + plaster-pastedeploy + repoze_lru + translationstring + venusian + webob + zope_deprecation + zope_interface + ]; - propagatedBuildInputs = [ hupper pastedeploy plaster plaster-pastedeploy repoze_lru translationstring venusian webob zope_deprecation zope_interface ]; + nativeCheckInputs = [ + webtest + zope_component + ]; - pythonImportsCheck = [ "pyramid" ]; + pythonImportsCheck = [ + "pyramid" + ]; meta = with lib; { - description = "The Pyramid Web Framework, a Pylons project"; + description = "Python web framework"; homepage = "https://trypyramid.com/"; + changelog = "https://github.com/Pylons/pyramid/blob/${version}/CHANGES.rst"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; - } diff --git a/pkgs/development/python-modules/pyramid_beaker/default.nix b/pkgs/development/python-modules/pyramid_beaker/default.nix index 9a529214c2e8..494a8e0c0bfb 100644 --- a/pkgs/development/python-modules/pyramid_beaker/default.nix +++ b/pkgs/development/python-modules/pyramid_beaker/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { py.test -k 'not test_includeme' pyramid_beaker/tests.py ''; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ beaker pyramid ]; diff --git a/pkgs/development/python-modules/pyramid_chameleon/default.nix b/pkgs/development/python-modules/pyramid_chameleon/default.nix index 87ccc32a3aa8..715dce1fbdf9 100644 --- a/pkgs/development/python-modules/pyramid_chameleon/default.nix +++ b/pkgs/development/python-modules/pyramid_chameleon/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { zope_interface ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid_jinja2/default.nix index 8543a950a8cd..6ec35620cd65 100644 --- a/pkgs/development/python-modules/pyramid_jinja2/default.nix +++ b/pkgs/development/python-modules/pyramid_jinja2/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { zope_deprecation ]; - checkInputs = [ + nativeCheckInputs = [ webtest pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyrdfa3/default.nix b/pkgs/development/python-modules/pyrdfa3/default.nix index 97768e7fed50..610eaa39bd7e 100644 --- a/pkgs/development/python-modules/pyrdfa3/default.nix +++ b/pkgs/development/python-modules/pyrdfa3/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , isPy27 , rdflib , html5lib @@ -17,6 +18,14 @@ buildPythonPackage rec { sha256 = "sha256-FXZjqSuH3zRbb2m94jXf9feXiRYI4S/h5PqNrWhxMa4="; }; + patches = [ + (fetchpatch { + name = "CVE-2022-4396.patch"; + url = "https://github.com/RDFLib/pyrdfa3/commit/ffd1d62dd50d5f4190013b39cedcdfbd81f3ce3e.patch"; + hash = "sha256-prRrOwylYcEqKLr/8LIpyJ5Yyt+6+HTUqH5sQXU8tqc="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "'html = pyRdfa.rdflibparsers:StructuredDataParser'" "'html = pyRdfa.rdflibparsers:StructuredDataParser'," \ diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix index c6197fcd7448..6bc583ca6e85 100644 --- a/pkgs/development/python-modules/pyreadstat/default.nix +++ b/pkgs/development/python-modules/pyreadstat/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyreadstat"; - version = "1.1.9"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Roche"; repo = "pyreadstat"; - rev = "v${version}"; - hash = "sha256-OtvAvZTmcBTGfgp3Ddp9JJuZegr1o6c7rTMOuLwJSpk="; + rev = "refs/tags/v${version}"; + hash = "sha256-Rw+v1+KpjSSZoqhlENKcJiaFhAvcNRbZ3+MA2dOsj4Q="; }; nativeBuildInputs = [ @@ -57,8 +57,9 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Python package to read SAS, SPSS and Stata files into pandas data frames using the readstat C library"; + description = "Module to read SAS, SPSS and Stata files into pandas data frames"; homepage = "https://github.com/Roche/pyreadstat"; + changelog = "https://github.com/Roche/pyreadstat/blob/v${version}/change_log.md"; license = licenses.asl20; maintainers = with maintainers; [ swflint ]; }; diff --git a/pkgs/development/python-modules/pyrect/default.nix b/pkgs/development/python-modules/pyrect/default.nix index 1d0a0ba022fe..f7c4a1b565c5 100644 --- a/pkgs/development/python-modules/pyrect/default.nix +++ b/pkgs/development/python-modules/pyrect/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-9lFV9t+bkptnyv+9V8CUfFrlRJ07WA0XgHS/+0egm3g="; }; - checkInputs = [ pytestCheckHook pygame ]; + nativeCheckInputs = [ pytestCheckHook pygame ]; preCheck = '' export LC_ALL="en_US.UTF-8" diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix index 11595e018112..02c69a461520 100644 --- a/pkgs/development/python-modules/pyregion/default.nix +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeBuildInputs = [ astropy-helpers cython ]; - checkInputs = [ pytestCheckHook pytest-astropy ]; + nativeCheckInputs = [ pytestCheckHook pytest-astropy ]; # Disable automatic update of the astropy-helper module postPatch = '' diff --git a/pkgs/development/python-modules/pyres/default.nix b/pkgs/development/python-modules/pyres/default.nix index a5b618d56902..4aeccc1d360a 100644 --- a/pkgs/development/python-modules/pyres/default.nix +++ b/pkgs/development/python-modules/pyres/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { version = "1.5"; propagatedBuildInputs = [ simplejson setproctitle redis pkgs.ps ]; - checkInputs = [ nose pkgs.redis ]; + nativeCheckInputs = [ nose pkgs.redis ]; # PyPI tarball doesn't contain tests so let's use GitHub src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyrevolve/default.nix b/pkgs/development/python-modules/pyrevolve/default.nix index 74fdc68c07e8..3d6a5f52dc88 100644 --- a/pkgs/development/python-modules/pyrevolve/default.nix +++ b/pkgs/development/python-modules/pyrevolve/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ versioneer cython ]; propagatedBuildInputs = [ contexttimer numpy ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # Using approach bellow bcs the tests fail with the pytestCheckHook, throwing the following error # ImportError: cannot import name 'crevolve' from partially initialized module 'pyrevolve' # (most likely due to a circular import) diff --git a/pkgs/development/python-modules/pyrfxtrx/default.nix b/pkgs/development/python-modules/pyrfxtrx/default.nix index 3c69d56a6ae1..389dff30ad10 100644 --- a/pkgs/development/python-modules/pyrfxtrx/default.nix +++ b/pkgs/development/python-modules/pyrfxtrx/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pyserial ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix index 5ce800af4d25..72fc5ab0a200 100644 --- a/pkgs/development/python-modules/pyrisco/default.nix +++ b/pkgs/development/python-modules/pyrisco/default.nix @@ -7,21 +7,26 @@ buildPythonPackage rec { pname = "pyrisco"; - version = "0.5.6"; + version = "0.5.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "OnFreund"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jhThPU4wlujZVC9v/8JSRFxC0LlJedFevOENdRHidV8="; + hash = "sha256-ySFHB+PZmjsqKJQrfFoupylowsOiV5B2feHX7nF8dUA="; }; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "pyrisco" ]; + + pythonImportsCheck = [ + "pyrisco" + ]; meta = with lib; { description = "Python interface to Risco alarm systems through Risco Cloud"; diff --git a/pkgs/development/python-modules/pyrmvtransport/default.nix b/pkgs/development/python-modules/pyrmvtransport/default.nix index 1db84979e2a1..42d4771c7633 100644 --- a/pkgs/development/python-modules/pyrmvtransport/default.nix +++ b/pkgs/development/python-modules/pyrmvtransport/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { lxml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio pytest-httpx diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index b0cc9c7f91cd..94e06834fe25 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pyro-ppl"; - version = "1.8.2"; + version = "1.8.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - hash = "sha256-4Afl0ROCpY78+4+61xxy6vEGbIZsaNxURXDEGMGCiks="; + hash = "sha256-dm+tYeUt9IiF3pbUEhPaH46MG3ns8witUxifzRXBy0E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index 96b0e08a56d9..7b0c8229c899 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -1,12 +1,12 @@ { lib , buildPythonPackage -, fetchPypi -, serpent -, dill , cloudpickle +, dill +, fetchPypi , msgpack -, isPy27 , pytestCheckHook +, pythonAtLeast +, serpent }: buildPythonPackage rec { @@ -14,7 +14,9 @@ buildPythonPackage rec { version = "4.82"; format = "setuptools"; - disabled = isPy27; + # No support Python >= 3.11 + # https://github.com/irmen/Pyro4/issues/246 + disabled = pythonAtLeast "3.11"; src = fetchPypi { pname = "Pyro4"; @@ -32,17 +34,18 @@ buildPythonPackage rec { msgpack ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; # add testsupport.py to PATH - preCheck = "PYTHONPATH=tests/PyroTests:$PYTHONPATH"; + preCheck = '' + PYTHONPATH=tests/PyroTests:$PYTHONPATH + ''; - - pytestFlagsArray = [ + disabledTestPaths = [ # ignore network related tests, which fail in sandbox - "--ignore=tests/PyroTests/test_naming.py" + "tests/PyroTests/test_naming.py" ]; disabledTests = [ @@ -61,6 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distributed object middleware for Python (RPC)"; homepage = "https://github.com/irmen/Pyro4"; + changelog = "https://github.com/irmen/Pyro4/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/pyro5/default.nix b/pkgs/development/python-modules/pyro5/default.nix index 094711199a7a..7c469595ab74 100644 --- a/pkgs/development/python-modules/pyro5/default.nix +++ b/pkgs/development/python-modules/pyro5/default.nix @@ -1,36 +1,52 @@ -{ buildPythonPackage -, fetchPypi -, lib +{ lib , stdenv +, buildPythonPackage +, fetchPypi , serpent , pythonOlder , pytestCheckHook }: buildPythonPackage rec { - pname = "Pyro5"; + pname = "pyro5"; version = "5.14"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-ZP3OE3sP5TLohhTSRrfJi74KT0JnhsUkU5rNxeaUCGo="; + pname = "Pyro5"; + inherit version; + hash = "sha256-ZP3OE3sP5TLohhTSRrfJi74KT0JnhsUkU5rNxeaUCGo="; }; - propagatedBuildInputs = [ serpent ]; + propagatedBuildInputs = [ + serpent + ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - # ignore network related tests, which fail in sandbox - disabledTests = [ "StartNSfunc" "Broadcast" "GetIP" "TestNameServer" "TestBCSetup" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ + disabledTests = [ + # Ignore network related tests, which fail in sandbox + "StartNSfunc" + "Broadcast" + "GetIP" + "TestNameServer" + "TestBCSetup" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "Socket" ]; + pythonImportsCheck = [ + "Pyro5" + ]; + meta = with lib; { description = "Distributed object middleware for Python (RPC)"; homepage = "https://github.com/irmen/Pyro5"; + changelog = "https://github.com/irmen/Pyro5/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index bd5433c7a5fb..b143a6c40fd2 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.62"; + version = "2.0.97"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-Kex9xIjcAYCzHeqWoDAIgTMuih0s42/O2zfTYxWEqbM="; + hash = "sha256-cYwH2o2ss8qnOST8Cjh+88PNM5NTO2B11PW7mWS1ctk="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { pysocks ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 2d9efdf39e2d..b232a0bd8f41 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.7.3"; + version = "0.7.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cEEEDbHC0Yf7zNFRSFsSRMQddYvoIXhYR5RjcOtrtwY="; + hash = "sha256-d1rO/vTSrOdZHmIAAL3zg8cMi3lpgEhw9sLYIE+iF+A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index 5a1b66bfa26c..97abb766fb8d 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,18 +9,18 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.18.1"; + version = "0.19.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-1NYfi5k6clW6cU3zrKUnAPgSUon4T3BM+AkWUXxG65Y="; + sha256 = "sha256-GimUdzcGu7SZXDGpe8lPFBgxSSO9EEjG2WSDcEA3ZEA="; }; propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook hypothesis ]; + nativeCheckInputs = [ pytestCheckHook hypothesis ]; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index 55883383c61d..abb0d4fd8b4b 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysam"; - version = "0.19.1"; + version = "0.20.0"; # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is # missing some files which cause test failures. @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pysam-developers"; repo = "pysam"; rev = "refs/tags/v${version}"; - sha256 = "sha256-fbvfobffLha1eFatnHvh0tOYcuMRLTmy/BJ9QXFHx2o="; + sha256 = "sha256-7yEZJ+iIw4qOxsanlKQlqt1bfi8MvyYjGJWiVDmXBrc="; }; nativeBuildInputs = [ samtools ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { export HTSLIB_INCLUDE_DIR=${htslib}/include ''; - checkInputs = [ + nativeCheckInputs = [ pytest bcftools htslib diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index d5aa54a55686..5f67dc1a103f 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -59,7 +59,7 @@ in buildPythonPackage rec { importlib-resources ]; - checkInputs = [ + nativeCheckInputs = [ mock pyasn1 pymongo3 diff --git a/pkgs/development/python-modules/pysatochip/default.nix b/pkgs/development/python-modules/pysatochip/default.nix index 8c1401c2a7cc..f76d889ada57 100644 --- a/pkgs/development/python-modules/pysatochip/default.nix +++ b/pkgs/development/python-modules/pysatochip/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography ecdsa pyaes pyopenssl pyscard ]; - checkInputs = [ certifi ]; + nativeCheckInputs = [ certifi ]; pythonImportsCheck = [ "pysatochip" ]; diff --git a/pkgs/development/python-modules/pysbd/default.nix b/pkgs/development/python-modules/pysbd/default.nix index b85d1f6cd531..684846a0ceb5 100644 --- a/pkgs/development/python-modules/pysbd/default.nix +++ b/pkgs/development/python-modules/pysbd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "12p7qm237z56hw4zr03n8rycgfymhki2m9c4w3ib0mvqq122a5dp"; }; - checkInputs = [ tqdm spacy ]; + nativeCheckInputs = [ tqdm spacy ]; doCheck = false; # requires pyconll and blingfire diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix index 84a4b4fb5bdb..362cb5daba15 100644 --- a/pkgs/development/python-modules/pyscf/default.nix +++ b/pkgs/development/python-modules/pyscf/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ nose nose-exclude ]; + nativeCheckInputs = [ nose nose-exclude ]; pythonImportsCheck = [ "pyscf" ]; preCheck = '' diff --git a/pkgs/development/python-modules/pyschemes/default.nix b/pkgs/development/python-modules/pyschemes/default.nix index 3b7eaa0da421..f6d1a62059b3 100644 --- a/pkgs/development/python-modules/pyschemes/default.nix +++ b/pkgs/development/python-modules/pyschemes/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "sha256-vDaWxMrn2aC2wmd035EWRZ3cd/XME81z/BWG0f2T9jc="; }) ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyscreeze/default.nix b/pkgs/development/python-modules/pyscreeze/default.nix index ddca8e72c23f..b7059eeccec3 100644 --- a/pkgs/development/python-modules/pyscreeze/default.nix +++ b/pkgs/development/python-modules/pyscreeze/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; pythonImportsCheck = [ "pyscreeze" ]; - checkInputs = [ scrot xlib xvfb-run ]; + nativeCheckInputs = [ scrot xlib xvfb-run ]; checkPhase = '' python -m unittest tests.test_pillow_unavailable xvfb-run python -m unittest tests.test_pyscreeze diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix index 5153663c6e88..ca40ac09ca9f 100644 --- a/pkgs/development/python-modules/pyscss/default.nix +++ b/pkgs/development/python-modules/pyscss/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-z0y4z+/JE6rZWHAvps/taDZvutyVhxxs2gMujV5rNu4="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ six ] ++ lib.optionals (pythonOlder "3.4") [ enum34 pathlib ]; diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index 04a59fa5df90..90202829fc67 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.14"; + version = "0.9.15"; # The tests use OpenGL using find_library, which would have to be # patched; also they seem to actually open X windows and test stuff @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-JAkfjZ5DdkZZHH921bru49OqbNiuSSpRxwJuUzifGHo="; + sha256 = "sha256-kIp946iMKyKiwhppkXxTIVKJW9GkkFJ6Jw7hTK1A5kc="; }; # Deliberately not in propagated build inputs; users can decide diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix index 171fa06830fb..54ada321371a 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -1,29 +1,27 @@ { lib , aiohttp , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pythonOlder }: buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.21"; + version = "1.0.25"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "andrey-git"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-YvriIG2G0NVlpzT91Ev13OJq8lNluqdEOTIQFQeWekI="; + src = fetchPypi { + inherit pname version; + hash = "sha256-AZpqV/CQ8TLKjaee9b0Zbu6WfnGNenKIvot+TTTSikg="; }; propagatedBuildInputs = [ aiohttp ]; - # no tests implemented + # No tests implemented doCheck = false; pythonImportsCheck = [ @@ -33,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for interacting with Sensibo"; homepage = "https://github.com/andrey-git/pysensibo"; + changelog = "https://github.com/andrey-git/pysensibo/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pysensors/default.nix b/pkgs/development/python-modules/pysensors/default.nix index e7d3697da0fb..0c8e32440209 100644 --- a/pkgs/development/python-modules/pysensors/default.nix +++ b/pkgs/development/python-modules/pysensors/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { # due to sandboxing doCheck = false; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/pkgs/development/python-modules/pyserial/default.nix b/pkgs/development/python-modules/pyserial/default.nix index 7eed44d0fbb1..a515c5acfcd1 100644 --- a/pkgs/development/python-modules/pyserial/default.nix +++ b/pkgs/development/python-modules/pyserial/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = !stdenv.hostPlatform.isDarwin; # broken on darwin - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "test" ]; diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix index c7b469dbf760..272672c2db34 100644 --- a/pkgs/development/python-modules/pyshark/default.nix +++ b/pkgs/development/python-modules/pyshark/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; # `stripLen` does not seem to work here - patchFlags = "-p2"; + patchFlags = [ "-p2" ]; sourceRoot = "${src.name}/src"; @@ -46,7 +46,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - checkInputs = [ pytestCheckHook wireshark-cli ]; + nativeCheckInputs = [ py pytestCheckHook wireshark-cli ]; pythonImportsCheck = [ "pyshark" ]; diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index ce4d09ba1748..280e4cb7675b 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-yfxhgk8a1rdpGVkE1sjJqT6tiFLimhu2m2SjGxLI6wo="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pysiaalarm/default.nix b/pkgs/development/python-modules/pysiaalarm/default.nix index c06e1ed32ac8..5885491a6178 100644 --- a/pkgs/development/python-modules/pysiaalarm/default.nix +++ b/pkgs/development/python-modules/pysiaalarm/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pycryptodome ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-cases pytestCheckHook diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index 5826ed7be160..9d6a3c640798 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -1,5 +1,13 @@ -{ python, fetchurl, lib, stdenv, - cmake, ninja, qt5, shiboken2 }: +{ python +, fetchurl +, lib +, stdenv +, cmake +, libxcrypt +, ninja +, qt5 +, shiboken2 +}: stdenv.mkDerivation rec { pname = "pyside2"; @@ -26,12 +34,29 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${qt5.qtdeclarative.dev}/include/QtQuick/${qt5.qtdeclarative.version}/QtQuick"; nativeBuildInputs = [ cmake ninja qt5.qmake python ]; + buildInputs = (with qt5; [ - qtbase qtxmlpatterns qtmultimedia qttools qtx11extras qtlocation qtscript - qtwebsockets qtwebengine qtwebchannel qtcharts qtsensors qtsvg - ]) ++ [ - python.pkgs.setuptools - ]; + qtbase + qtxmlpatterns + qtmultimedia + qttools + qtx11extras + qtlocation + qtscript + qtwebsockets + qtwebengine + qtwebchannel + qtcharts + qtsensors + qtsvg + ]) ++ (with python.pkgs; [ + setuptools + ]) ++ (lib.optionals (python.pythonOlder "3.9") [ + # see similar issue: 202262 + # libxcrypt is required for crypt.h for building older python modules + libxcrypt + ]); + propagatedBuildInputs = [ shiboken2 ]; dontWrapQtApps = true; diff --git a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix index b4ed12200b5d..ca99e542c66d 100644 --- a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-elasticsearch"; - version = "0.1.1"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-elasticsearch"; rev = "refs/tags/v${version}"; - hash = "sha256-Niix0j4xaoQBMxvTOhy7hgmZ5btjs+0ovTEJcXAzjNY="; + hash = "sha256-EDs1ZBjwZCNrZMiH0Lcp2NyxQhGHygUMNBEU/5zuUYI="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { pysigma ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests ]; @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to support Elasticsearch for pySigma"; homepage = "https://github.com/SigmaHQ/pySigma-backend-elasticsearch"; + changelog = "https://github.com/SigmaHQ/pySigma-backend-elasticsearch/releases/tag/v${version}"; license = with licenses; [ lgpl21Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix index ed6e78447b3e..41c0e2723f5f 100644 --- a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { "pysigma" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix index e7c4eb03b609..f3a7f7d15497 100644 --- a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma-backend-opensearch"; - version = "0.1.3"; + version = "0.1.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-opensearch"; rev = "refs/tags/v${version}"; - hash = "sha256-lRw9zNyAIdwCT0uhZ9NxJXWs+sB/cyGFtZIIBImTNcM="; + hash = "sha256-j8BiO/7wp1TRSK+C5cPSgF72CuBpb2jLhJXRJLHgh5I="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { pysigma-backend-elasticsearch ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests ]; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to support OpenSearch for pySigma"; homepage = "https://github.com/SigmaHQ/pySigma-backend-opensearch"; + changelog = "https://github.com/SigmaHQ/pySigma-backend-opensearch/releases/tag/v${version}"; license = with licenses; [ lgpl21Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pysigma-backend-qradar/default.nix b/pkgs/development/python-modules/pysigma-backend-qradar/default.nix index 7a88d432e359..212bb0974686 100644 --- a/pkgs/development/python-modules/pysigma-backend-qradar/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-qradar/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma-backend-qradar"; - version = "0.2.1"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "nNipsx-Sec"; repo = "pySigma-backend-qradar"; rev = "refs/tags/v${version}"; - hash = "sha256-kd/KWO3xxIHPgXqvcOrSvdozLG34+DwZedfSVoZ+dDA="; + hash = "sha256-4QiPBgzlZG3aeYwn9zodZCXY6mjOktgdPWR5ikg/Y30="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { pysigma ]; - checkInputs = [ + nativeCheckInputs = [ pysigma-pipeline-sysmon pytestCheckHook ]; @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to support Qradar for pySigma"; homepage = "https://github.com/nNipsx-Sec/pySigma-backend-qradar"; + changelog = "https://github.com/nNipsx-Sec/pySigma-backend-qradar/releases/tag/v${version}"; license = with licenses; [ lgpl21Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix index 7fab211f1813..3f49622ac1e8 100644 --- a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pysigma ]; - checkInputs = [ + nativeCheckInputs = [ pysigma-pipeline-sysmon pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix index a9e3e01667ea..da424e133c5a 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pysigma ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix index dc8e21bc8107..274236cb3957 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pysigma ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix index 905f1575dcf0..33f1b2ee76c8 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pysigma ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to support Windows service pipeline for pySigma"; homepage = "https://github.com/SigmaHQ/pySigma-pipeline-windows"; + changelog = "https://github.com/SigmaHQ/pySigma-pipeline-windows/releases/tag/v${version}"; 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 index 82fde07aef48..67d037789c9c 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.8.9"; + version = "0.8.12"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-SXZ6bo1b5xhVGSlWr51ZCxT0Ov1g/qd8V43P5KEhY+s="; + hash = "sha256-OAhKeAKRT2/A6VO+PxUBi7bkaQVNRT59boyLPGdO+Yw="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to parse and convert Sigma rules into queries"; homepage = "https://github.com/SigmaHQ/pySigma"; + changelog = "https://github.com/SigmaHQ/pySigma/releases/tag/v${version}"; license = with licenses; [ lgpl21Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyskyqremote/default.nix b/pkgs/development/python-modules/pyskyqremote/default.nix index 3d14c10bcd50..b8adb278d57d 100644 --- a/pkgs/development/python-modules/pyskyqremote/default.nix +++ b/pkgs/development/python-modules/pyskyqremote/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyskyqremote"; - version = "0.3.20"; + version = "0.3.24"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_remote"; rev = "refs/tags/${version}"; - sha256 = "sha256-HLiLFuMJL9iXv7FckoVVK02jOhSRMrU8FohkD4gKjmM="; + hash = "sha256-XKfxjxSQUjSFQNt4LgOIXOE3M2oyVfsb68z35a1B3DY="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing SkyQ boxes"; homepage = "https://github.com/RogerSelwyn/skyq_remote"; + changelog = "https://github.com/RogerSelwyn/skyq_remote/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pysmart/default.nix b/pkgs/development/python-modules/pysmart/default.nix index 3bd5fa50a133..f0ec07437bca 100644 --- a/pkgs/development/python-modules/pysmart/default.nix +++ b/pkgs/development/python-modules/pysmart/default.nix @@ -4,17 +4,21 @@ , smartmontools , humanfriendly , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pysmart"; - version = "1.1.0"; + version = "1.2.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "truenas"; repo = "py-SMART"; - rev = "v${version}"; - sha256 = "sha256-e46ALiYg0Db/gOzqLmVc1vi9ObhfxzqwfQk9/9pz+r0="; + rev = "refs/tags/v${version}"; + hash = "sha256-5VoZEgHWmHUDkm2KhBP0gfmhOJUYJUqDLWBp/kU1404="; }; postPatch = '' @@ -22,16 +26,23 @@ buildPythonPackage rec { --replace "which('smartctl')" '"${smartmontools}/bin/smartctl"' ''; - propagatedBuildInputs = [ humanfriendly ]; + propagatedBuildInputs = [ + humanfriendly + ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "pySMART" ]; + pythonImportsCheck = [ + "pySMART" + ]; meta = with lib; { description = "Wrapper for smartctl (smartmontools)"; homepage = "https://github.com/truenas/py-SMART"; - maintainers = with maintainers; [ nyanloutre ]; + changelog = "https://github.com/truenas/py-SMART/blob/v${version}/CHANGELOG.md"; license = licenses.lgpl21Only; + maintainers = with maintainers; [ nyanloutre ]; }; } diff --git a/pkgs/development/python-modules/pysmartapp/default.nix b/pkgs/development/python-modules/pysmartapp/default.nix index a4ab8e58382c..b14d0bf5afd5 100644 --- a/pkgs/development/python-modules/pysmartapp/default.nix +++ b/pkgs/development/python-modules/pysmartapp/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { httpsig ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pysmartthings/default.nix b/pkgs/development/python-modules/pysmartthings/default.nix index 8e97570a2c78..cfdc691539dc 100644 --- a/pkgs/development/python-modules/pysmartthings/default.nix +++ b/pkgs/development/python-modules/pysmartthings/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix index 01f30bf2d5f1..67f468a508f9 100644 --- a/pkgs/development/python-modules/pysmb/default.nix +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -1,26 +1,28 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pyasn1 , pythonOlder +, tqdm }: buildPythonPackage rec { pname = "pysmb"; - version = "1.2.8"; + version = "1.2.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - format = "setuptools"; - extension = "zip"; - hash = "sha256-OwfbFiF0ZQOdDCVpTAcFuDZjyoIlniCfNWbVd1Nqc5U="; + src = fetchFromGitHub { + owner = "miketeo"; + repo = "pysmb"; + rev = "refs/tags/pysmb-${version}"; + hash = "sha256-psV6fYymE6k2YqxOvFM2s7JTG51fI5pSqmkZnvfmprw="; }; propagatedBuildInputs = [ pyasn1 + tqdm ]; # Tests require Network Connectivity and a server up and running @@ -33,6 +35,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/miketeo/pysmb/releases/tag/pysmb-${version}"; description = "Experimental SMB/CIFS library written in Python to support file sharing between Windows and Linux machines"; homepage = "https://miketeo.net/wp/index.php/projects/pysmb"; license = licenses.zlib; diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix index 93aa6606c7d5..83465ab859a2 100644 --- a/pkgs/development/python-modules/pysmbc/default.nix +++ b/pkgs/development/python-modules/pysmbc/default.nix @@ -3,24 +3,35 @@ , fetchPypi , samba , pkg-config +, pythonOlder }: buildPythonPackage rec { pname = "pysmbc"; - version = "1.0.23"; + version = "1.0.25.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1y0n1n6jkzf4mr5lqfc73l2m0qp56gvxwfjnx2vj8c0hh5i1gnq8"; + hash = "sha256-IvFxXfglif2cxCU/6rOQtO8Lq/FPZFE82NB7N4mWMiY="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; - buildInputs = [ samba ]; + buildInputs = [ + samba + ]; # Tests would require a local SMB server doCheck = false; - pythonImportsCheck = [ "smbc" ]; + + pythonImportsCheck = [ + "smbc" + ]; meta = with lib; { description = "libsmbclient binding for Python"; diff --git a/pkgs/development/python-modules/pysmf/default.nix b/pkgs/development/python-modules/pysmf/default.nix index 3b350954eae3..2fc1637d22a5 100644 --- a/pkgs/development/python-modules/pysmf/default.nix +++ b/pkgs/development/python-modules/pysmf/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ libsmf glib ]; meta = with lib; { - homepage = "http://das.nasophon.de/pysmf/"; + homepage = "https://das.nasophon.de/pysmf/"; description = "Python extension module for reading and writing Standard MIDI Files, based on libsmf."; license = licenses.bsd2; maintainers = [ ]; diff --git a/pkgs/development/python-modules/pysmt/default.nix b/pkgs/development/python-modules/pysmt/default.nix index 3f003aa9fb05..6a08234312ab 100644 --- a/pkgs/development/python-modules/pysmt/default.nix +++ b/pkgs/development/python-modules/pysmt/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-cE+WmKzggYof/olxQb5M7xPsBONr39KdjOTG4ofYPUM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pysnmp-pyasn1/default.nix b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix index 3caccf688b8c..5da547e5ebfa 100644 --- a/pkgs/development/python-modules/pysnmp-pyasn1/default.nix +++ b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pysnmplib/default.nix b/pkgs/development/python-modules/pysnmplib/default.nix index 642d0a9b69d7..71fdfa28057b 100644 --- a/pkgs/development/python-modules/pysnmplib/default.nix +++ b/pkgs/development/python-modules/pysnmplib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysnmplib"; - version = "5.0.19"; + version = "5.0.20"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pysnmp"; repo = "pysnmp"; rev = "refs/tags/v${version}"; - hash = "sha256-xplQ12LLtTsU1AfEmWDwpbTK9NBxoLIfpF/QzA8Xot0="; + hash = "sha256-SrtOn9zETtobT6nMVHLi6hP7VZGBvXvFzoThTi3ITag="; }; nativeBuildInputs = [ @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of v1/v2c/v3 SNMP engine"; homepage = "https://github.com/pysnmp/pysnmp"; + changelog = "https://github.com/pysnmp/pysnmp/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pysnooper/default.nix b/pkgs/development/python-modules/pysnooper/default.nix index 370ed373da55..e8a6727ae694 100644 --- a/pkgs/development/python-modules/pysnooper/default.nix +++ b/pkgs/development/python-modules/pysnooper/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-0X3JHMoVk8ECMNzkXkax0/8PiRDww46UHt9roSYLOCA="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pysnooz/default.nix b/pkgs/development/python-modules/pysnooz/default.nix index 31a884a69d83..7cf1205ed396 100644 --- a/pkgs/development/python-modules/pysnooz/default.nix +++ b/pkgs/development/python-modules/pysnooz/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { transitions ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytest-asyncio pytest-mock diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix index 36e45d9d8695..d3ad4bee17c4 100644 --- a/pkgs/development/python-modules/pysnow/default.nix +++ b/pkgs/development/python-modules/pysnow/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ httpretty pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix index 596c3a64cd70..6309cfc03429 100644 --- a/pkgs/development/python-modules/pysolcast/default.nix +++ b/pkgs/development/python-modules/pysolcast/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pysolcast"; - version = "1.0.12"; + version = "1.0.14"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mcaulifn"; repo = "solcast"; - rev = "v${version}"; - hash = "sha256-azcEbv/4M3UqRyV30yld+6pWbSxbGXiJJHWMDL4xgOM="; + rev = "refs/tags/v${version}"; + hash = "sha256-SI8lRihzJClciPLX9DXOO0K7YWgix74aM784j7fVu/g="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -36,7 +36,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with the Solcast API"; homepage = "https://github.com/mcaulifn/solcast"; + changelog = "https://github.com/mcaulifn/solcast/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pysolr/default.nix b/pkgs/development/python-modules/pysolr/default.nix index a7f34b9c13a1..1e2e3d5dbf6c 100644 --- a/pkgs/development/python-modules/pysolr/default.nix +++ b/pkgs/development/python-modules/pysolr/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; doCheck = false; # requires network access diff --git a/pkgs/development/python-modules/pysoma/default.nix b/pkgs/development/python-modules/pysoma/default.nix index beba51305780..ebb87a4612a1 100644 --- a/pkgs/development/python-modules/pysoma/default.nix +++ b/pkgs/development/python-modules/pysoma/default.nix @@ -1,20 +1,27 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "pysoma"; - version = "0.0.11"; + version = "0.0.13"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-U/kLaO/GBpOa9mHHlYQiWSw7sVNPaMneDURoJBqqojo="; + hash = "sha256-1bS9zafuqxwcuqpM/AA3ZjNbFpxBNXtoHYFsQOWmLXQ="; }; # Project has no test doCheck = false; - pythonImportsCheck = [ "api" ]; + + pythonImportsCheck = [ + "api" + ]; meta = with lib; { description = "Python wrapper for the HTTP API provided by SOMA Connect"; diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index 132c904dc3ef..b9c4a1e9b175 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock requests-mock diff --git a/pkgs/development/python-modules/pyspcwebgw/default.nix b/pkgs/development/python-modules/pyspcwebgw/default.nix index 7a40985457da..612a22d74a82 100644 --- a/pkgs/development/python-modules/pyspcwebgw/default.nix +++ b/pkgs/development/python-modules/pyspcwebgw/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/pyspellchecker/default.nix b/pkgs/development/python-modules/pyspellchecker/default.nix index 425d1a67f136..77e3f04e6eae 100644 --- a/pkgs/development/python-modules/pyspellchecker/default.nix +++ b/pkgs/development/python-modules/pyspellchecker/default.nix @@ -1,20 +1,29 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools +, pytestCheckHook }: buildPythonPackage rec { pname = "pyspellchecker"; - version = "0.7.0"; - format = "setuptools"; + version = "0.7.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-zKbDJCjuOI0Vsbh+lK/Dv5T7GGK6hIo7RJvs1inSatM="; + src = fetchFromGitHub { + owner = "barrust"; + repo = "pyspellchecker"; + rev = "refs/tags/v${version}"; + hash = "sha256-DM1Q8OirFMoYqjdSnsNL5r7Zxffxc0DEXwv1W6y8GnE="; }; - # no tests in PyPI - doCheck = false; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Pure python spell checking"; diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix index 966fb6679237..b6c9dfcd1a0d 100644 --- a/pkgs/development/python-modules/pyspnego/default.nix +++ b/pkgs/development/python-modules/pyspnego/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyspnego"; - version = "0.5.3"; + version = "0.7.0"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-awlS1VHXj6n9Ee4qUI1x5tEdkMF/ZEr9NPKh4ICkv3g="; + sha256 = "sha256-FtXHbPilQKqo/pmFAYRCoSHkq2fIhP9DYi8kNNBz7uM="; }; propagatedBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { ruamel-yaml ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/pysqlcipher3/default.nix b/pkgs/development/python-modules/pysqlcipher3/default.nix index acb71deab0b1..cc8a53e8fcea 100644 --- a/pkgs/development/python-modules/pysqlcipher3/default.nix +++ b/pkgs/development/python-modules/pysqlcipher3/default.nix @@ -1,10 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, sqlcipher }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, sqlcipher }: buildPythonPackage rec { pname = "pysqlcipher3"; version = "1.1.0"; - disabled = pythonAtLeast "3.9"; + disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix index 36d223b7688d..9656afa275b7 100644 --- a/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/pkgs/development/python-modules/pysqueezebox/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix index 1099bffc40f0..ff48960f815b 100644 --- a/pkgs/development/python-modules/pysrt/default.nix +++ b/pkgs/development/python-modules/pysrt/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1f5hxyzlh5mdvvi52qapys9qcinffr6ghgivb6k4jxa92cbs3mfg"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests -v ''; diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix index b3270c5e7334..4c408d3ad601 100644 --- a/pkgs/development/python-modules/pystache/default.nix +++ b/pkgs/development/python-modules/pystache/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # https://github.com/defunkt/pystache/issues/181 doCheck = !isPy3k; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et"; diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index 763ac34c5171..0d46312152d3 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; - checkInputs = [ pytest mock ]; + nativeCheckInputs = [ pytest mock ]; checkPhase = "pytest tests"; diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix index 120867f389cc..dd258c380c6f 100644 --- a/pkgs/development/python-modules/pystemmer/default.nix +++ b/pkgs/development/python-modules/pystemmer/default.nix @@ -1,22 +1,69 @@ -{ lib, python, fetchPypi, buildPythonPackage, cython }: +{ lib +, python +, fetchPypi +, fetchFromGitHub +, fetchpatch +, buildPythonPackage +, cython +, libstemmer + }: buildPythonPackage rec { pname = "PyStemmer"; - version = "2.0.1"; + version = "2.2.0"; + format = "setuptools"; - src = fetchPypi { + src' = fetchPypi { inherit pname version; - sha256 = "9b81c35302f1d2a5ad9465b85986db246990db93d97d3e8f129269ed7102788e"; + sha256 = "sha256-4hcbkbhrscap3d8J6Mhn5Ij4vWm94H0EEKNc3O4NhXw="; + }; + + src = fetchFromGitHub { + owner = "snowballstem"; + repo = "pystemmer"; + rev = "refs/tags/v${version}"; + hash = "sha256-bJVFeO7XP+aZ2nowQiuws5ziL/FmS1eaOllW6QxA70U="; }; nativeBuildInputs = [ cython ]; - preBuild = '' - cython src/Stemmer.pyx + patches = [ + (fetchpatch { + # Allow building with system libstemmer + url = "https://github.com/snowballstem/pystemmer/commit/2f52b4b2ff113fe6c33cebe14ed4fd4388bb1742.patch"; + hash = "sha256-JqR/DUmABgWaq23CNjoKSasL0mNhM2QuU986mouK6A8="; + }) + (fetchpatch { + # Fix doctests + url = "https://github.com/snowballstem/pystemmer/commit/b2826f19fe8ba65238b5f3b4cee7096a698f048e.patch"; + hash = "sha256-VTZydjYaJJ/KoHD4KbON36kZnkuAyO51H0Oeg6VXTqg="; + }) + ]; + + postConfigure = '' + export PYSTEMMER_SYSTEM_LIBSTEMMER="${lib.getDev libstemmer}/include" ''; + NIX_CFLAGS_COMPILE = [ + "-I${lib.getDev libstemmer}/include" + ]; + + NIX_CFLAGS_LINK = [ + "-L${libstemmer}/lib" + ]; + + #preBuild = '' + # cython src/Stemmer.pyx + #''; + + pythonImportsCheck = [ + "Stemmer" + ]; + checkPhase = '' + runHook preCheck ${python.interpreter} runtests.py + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix index 975f940da68d..03fb3213d184 100644 --- a/pkgs/development/python-modules/pystray/default.nix +++ b/pkgs/development/python-modules/pystray/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeBuildInputs = [ gobject-introspection sphinx ]; propagatedBuildInputs = [ pillow xlib six pygobject3 gtk3 libayatana-appindicator ]; - checkInputs = [ xvfb-run ]; + nativeCheckInputs = [ xvfb-run ]; checkPhase = '' rm tests/icon_tests.py # test needs user input diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index c2df3f72cef0..db7848a9282a 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "pysvn"; - version = "1.9.18"; + version = "1.9.20"; format = "other"; src = fetchurl { - url = "https://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz"; - hash = "sha256-lUPsNumMYwZoiR1Gt/hqdLLoHOZybRxwvu9+eU1CY78="; + url = "mirror://sourceforge/project/pysvn/pysvn/V${version}/pysvn-${version}.tar.gz"; + hash = "sha256-LbAz+KjEY3nkSJAzJNwlnSRYoWr4i1ITRUPV3ZBH7cc="; }; patches = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { --svn-bin-dir=${subversion.out}/bin ''; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; checkPhase = '' runHook preCheck @@ -62,8 +62,7 @@ buildPythonPackage rec { runHook postCheck ''; - # FIXME https://github.com/NixOS/nixpkgs/issues/175227 - # pythonImportsCheck = [ "pysvn" ]; + pythonImportsCheck = [ "pysvn" ]; installPhase = '' dest=$(toPythonPath $out)/pysvn diff --git a/pkgs/development/python-modules/pyswitchbee/default.nix b/pkgs/development/python-modules/pyswitchbee/default.nix index 2bb02397f3a2..978fc21ac92f 100644 --- a/pkgs/development/python-modules/pyswitchbee/default.nix +++ b/pkgs/development/python-modules/pyswitchbee/default.nix @@ -1,14 +1,16 @@ { lib +, awesomeversion , buildPythonPackage , aiohttp , fetchFromGitHub , setuptools , pythonOlder +, packaging }: buildPythonPackage rec { pname = "pyswitchbee"; - version = "1.6.2"; + version = "1.7.21"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,21 +19,17 @@ buildPythonPackage rec { owner = "jafar-atili"; repo = "pySwitchbee"; rev = "refs/tags/${version}"; - hash = "sha256-MDutpeHI6MW1VwCRTPJK/y08ee4eidOHluMf6lPQfEk="; + hash = "sha256-3Ujs9GgdJm69vb8F00ZWaRgWXxkaPguX5DJ71bqOFec="; }; - postPatch = '' - # https://github.com/jafar-atili/pySwitchbee/pull/2 - substituteInPlace pyproject.toml \ - --replace '"asyncio",' "" - ''; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ aiohttp + awesomeversion + packaging ]; # Module doesn't have tests @@ -44,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to control SwitchBee smart home device"; homepage = "https://github.com/jafar-atili/pySwitchbee/"; + changelog = "https://github.com/jafar-atili/pySwitchbee/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index a1bdf23c2629..801dabdf4ead 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -1,15 +1,18 @@ { lib , bleak , bleak-retry-connector +, boto3 , buildPythonPackage +, cryptography , fetchFromGitHub , pythonOlder , pytestCheckHook +, requests }: buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.20.5"; + version = "0.37.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,15 +21,18 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-3yOZyCoCKNP0xgOFBb1d9jC3rvtiFMCCN7R+tQk+/6o="; + hash = "sha256-6td0ueo21h3B2ITV6wXehiwDPIB8+4m0K5hnMm8Mu54="; }; propagatedBuildInputs = [ bleak bleak-retry-connector + boto3 + cryptography + requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -42,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to control Switchbot IoT devices"; homepage = "https://github.com/Danielhiversen/pySwitchbot"; + changelog = "https://github.com/Danielhiversen/pySwitchbot/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/pysyncobj/default.nix b/pkgs/development/python-modules/pysyncobj/default.nix index ae670c709a32..d5623fff6313 100644 --- a/pkgs/development/python-modules/pysyncobj/default.nix +++ b/pkgs/development/python-modules/pysyncobj/default.nix @@ -1,26 +1,34 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder }: buildPythonPackage rec { pname = "pysyncobj"; - version = "0.3.11"; + version = "0.3.12"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bakwc"; repo = "PySyncObj"; - rev = version; - sha256 = "sha256-MsyEDRla+okamffm78hoC2OwhjHLvCDQeZCzPZPbGy4="; + rev = "refs/tags/${version}"; + hash = "sha256-ZWzvvv13g/iypm+MIl5q0Y8ekqzZEY5upSTPk3MFTPI="; }; # Tests require network features doCheck = false; - pythonImportsCheck = [ "pysyncobj" ]; + + pythonImportsCheck = [ + "pysyncobj" + ]; meta = with lib; { description = "Python library for replicating your class"; homepage = "https://github.com/bakwc/PySyncObj"; + changelog = "https://github.com/bakwc/PySyncObj/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix index fcff8365ffd9..44d38fb6636a 100644 --- a/pkgs/development/python-modules/pytado/default.nix +++ b/pkgs/development/python-modules/pytado/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index cd51421fbc74..909dad99fb8f 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { taglib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytap2/default.nix b/pkgs/development/python-modules/pytap2/default.nix index 3823f0270381..7f5f656fdd4e 100644 --- a/pkgs/development/python-modules/pytap2/default.nix +++ b/pkgs/development/python-modules/pytap2/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nettools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytautulli/default.nix b/pkgs/development/python-modules/pytautulli/default.nix index b21b21842269..5d2c51675c43 100644 --- a/pkgs/development/python-modules/pytautulli/default.nix +++ b/pkgs/development/python-modules/pytautulli/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytautulli"; - version = "21.11.0"; + version = "23.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; repo = pname; - rev = version; - sha256 = "sha256-zODU3aN+8Fdw/GQ/EfZhn6kOuLDARKgLULzRw2+b2BM="; + rev = "refs/tags/${version}"; + hash = "sha256-5wE8FjLFu1oQkVqnWsbp253dsQ1/QGWC6hHSIFwLajY="; }; postPatch = '' @@ -33,10 +33,13 @@ buildPythonPackage rec { aiohttp ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + checkInputs = [ aresponses pytest-asyncio - pytestCheckHook ]; pytestFlagsArray = [ @@ -50,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to get information from Tautulli"; homepage = "https://github.com/ludeeus/pytautulli"; + changelog = "https://github.com/ludeeus/pytautulli/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix index e703a934466c..604df3ed0934 100644 --- a/pkgs/development/python-modules/pyte/default.nix +++ b/pkgs/development/python-modules/pyte/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ wcwidth ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pyte" ]; diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index caae9319db7e..0f3cd981ba94 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.9"; + version = "1.4.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; rev = "refs/tags/${version}"; - hash = "sha256-Cj1/f/e+j5CJMl+afF+HStd419Uh053jKk/vmObaBl8="; + hash = "sha256-GSEMjgG8Q+gzHQWRbXr/qiGP6U6ydPxu0JsD56mRNWU="; }; propagatedBuildInputs = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ responses pytest-datafiles pytest-vcr @@ -70,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for the Tenable.io and TenableSC API"; homepage = "https://github.com/tenable/pyTenable"; + changelog = "https://github.com/tenable/pyTenable/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix new file mode 100644 index 000000000000..aed37ab14229 --- /dev/null +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -0,0 +1,95 @@ +{ stdenv +, lib +, buildPythonPackage +, cons +, cython +, etuples +, fetchFromGitHub +, filelock +, jax +, jaxlib +, logical-unification +, minikanren +, numba +, numba-scipy +, numpy +, pytestCheckHook +, pythonOlder +, scipy +, typing-extensions +}: + +buildPythonPackage rec { + pname = "pytensor"; + version = "2.9.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pymc-devs"; + repo = pname; + rev = "refs/tags/rel-${version}"; + hash = "sha256-vuZHiDbGg55lXr9BwPT66Hy8RUe/RfYVaV57i/YlBwg="; + }; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + cons + etuples + filelock + logical-unification + minikanren + numpy + scipy + typing-extensions + ]; + + checkInputs = [ + jax + jaxlib + numba + numba-scipy + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--durations=50" "" + ''; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ + "pytensor" + ]; + + disabledTests = [ + # benchmarks (require pytest-benchmark): + "test_elemwise_speed" + "test_logsumexp_benchmark" + "test_scan_multiple_output" + ]; + + disabledTestPaths = [ + # Don't run the most compute-intense tests + "tests/scan/" + "tests/tensor/" + "tests/sandbox/" + "tests/sparse/sandbox/" + ]; + + meta = with lib; { + description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays"; + homepage = "https://github.com/pymc-devs/pytensor"; + changelog = "https://github.com/pymc-devs/pytensor/releases"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + broken = (stdenv.isLinux && stdenv.isAarch64); + }; +} diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index e38af1f89309..5054e11f450d 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pillow ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://pypi.org/project/pytesseract/"; diff --git a/pkgs/development/python-modules/pytest-aio/default.nix b/pkgs/development/python-modules/pytest-aio/default.nix index 09c278a70e10..a37a8cd67089 100644 --- a/pkgs/development/python-modules/pytest-aio/default.nix +++ b/pkgs/development/python-modules/pytest-aio/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ + nativeCheckInputs = [ anyio curio hypothesis diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index 728544bd2618..4a70b0d98057 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -36,10 +36,16 @@ buildPythonPackage rec { pytest-asyncio ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; + disabledTestPaths = [ + # pytest 7.2.0 incompatibilities + # https://github.com/aio-libs/pytest-aiohttp/issues/50 + "tests/test_fixtures.py" + ]; + meta = with lib; { homepage = "https://github.com/aio-libs/pytest-aiohttp/"; changelog = "https://github.com/aio-libs/pytest-aiohttp/blob/v${version}/CHANGES.rst"; diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index ee8d7caf779a..c28d46886586 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { # requires pandoc < 2.0 # buildInputs = [ setuptools-markdown ]; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; propagatedBuildInputs = [ ansible ]; # tests not included with release, even on github diff --git a/pkgs/development/python-modules/pytest-astropy-header/default.nix b/pkgs/development/python-modules/pytest-astropy-header/default.nix index 4d95058b9354..aa88d42813ea 100644 --- a/pkgs/development/python-modules/pytest-astropy-header/default.nix +++ b/pkgs/development/python-modules/pytest-astropy-header/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook numpy ]; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 855b5f618f81..e13f67ec83b5 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.19.0"; + version = "0.20.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-A8ngASbSRwY4RjanalnWBGgskZMDO50ffOf6wMNqOvA="; + hash = "sha256-oq28wJ/Tq4yuQ/98tdzYKDyatpliS0Xcbc6T46ZTP7I="; }; outputs = [ diff --git a/pkgs/development/python-modules/pytest-asyncio/tests.nix b/pkgs/development/python-modules/pytest-asyncio/tests.nix index 17e60e4369bd..6a471513112a 100644 --- a/pkgs/development/python-modules/pytest-asyncio/tests.nix +++ b/pkgs/development/python-modules/pytest-asyncio/tests.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pytest-asyncio ]; - checkInputs = [ + nativeCheckInputs = [ flaky hypothesis pytest-trio diff --git a/pkgs/development/python-modules/pytest-base-url/default.nix b/pkgs/development/python-modules/pytest-base-url/default.nix new file mode 100644 index 000000000000..f34c6c8c3f4c --- /dev/null +++ b/pkgs/development/python-modules/pytest-base-url/default.nix @@ -0,0 +1,58 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, poetry-core +, pytest +, pytest-localserver +, requests +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pytest-base-url"; + version = "2.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-v6pLejWNeb9Do6x2EJqmLKj8DNqcMtmYIs+7iDYsbjk="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-localserver + ]; + + pytestFlagsArray = [ + "tests" + ]; + + pythonImportsCheck = [ + "pytest_base_url" + ]; + + meta = with lib; { + description = "pytest plugin for URL based tests"; + homepage = "https://github.com/pytest-dev/pytest-base-url"; + changelog = "https://github.com/pytest-dev/pytest-base-url/blob/v${version}/CHANGES.rst"; + license = licenses.mpl20; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix index cfae0cb2bf95..fb86c3b0433e 100644 --- a/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/pkgs/development/python-modules/pytest-bdd/default.nix @@ -1,48 +1,49 @@ { lib , buildPythonPackage , fetchFromGitHub -, execnet -, glob2 , Mako -, mock , parse , parse-type -, py +, poetry-core , pytest , pytestCheckHook , pythonOlder +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "pytest-bdd"; - version = "6.0.0"; - format = "setuptools"; + version = "6.1.1"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pytest-dev"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-1dyAhvEw8gUe78qDpgrcwl6grWKiwPgSe/QeFAjBzZg="; + hash = "sha256-+76jIgfDQPdIoesTr1+QUu8wmOnrdf4KT+TJr9F2Hqk="; }; + nativeBuildInputs = [ + poetry-core + ]; + buildInputs = [ pytest ]; propagatedBuildInputs = [ - glob2 Mako parse parse-type - py + typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook - execnet - mock + setuptools ]; preCheck = '' diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index b9def8d834af..6fd0cefb51c3 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-benchmark"; - version = "3.4.1"; + version = "4.0.0"; format = "setuptools"; src = fetchFromGitHub { owner = "ionelmc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qc/8Epax5bPUZvhq42xSj6NUq0T4gbO5dDDS6omWBOU="; + hash = "sha256-f9Ty4+5PycraxoLUSa9JFusV5Cot6bBWKfOGHZIRR3o="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index f13cf9bba100..9e85ceb51ce0 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -7,19 +7,19 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "1.0.10"; + version = "1.3.0"; format = "flit"; src = fetchPypi { inherit pname version; - hash = "sha256-ng7c10Dyxb5qbO22TDkNl5wAzXg2eYrLO21sjtEBoio="; + hash = "sha256-o4eWjWJSVzjNnzalKAEzFtfZFc8Mz1vhRqOOf/+gu6k="; }; buildInputs = [ pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-cid/default.nix b/pkgs/development/python-modules/pytest-cid/default.nix index 767d300f7dd9..ba553040095b 100644 --- a/pkgs/development/python-modules/pytest-cid/default.nix +++ b/pkgs/development/python-modules/pytest-cid/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { py-cid ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-cov ]; diff --git a/pkgs/development/python-modules/pytest-click/default.nix b/pkgs/development/python-modules/pytest-click/default.nix index 82e6409c9b7f..6cf3db2bd24d 100644 --- a/pkgs/development/python-modules/pytest-click/default.nix +++ b/pkgs/development/python-modules/pytest-click/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "pytest plugin for click"; diff --git a/pkgs/development/python-modules/pytest-console-scripts/default.nix b/pkgs/development/python-modules/pytest-console-scripts/default.nix index b01d2d2b7d0a..1cf1db5fe1a8 100644 --- a/pkgs/development/python-modules/pytest-console-scripts/default.nix +++ b/pkgs/development/python-modules/pytest-console-scripts/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 971b12dc01c7..88e77f9f7ce9 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-cov"; - version = "3.0.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"; + sha256 = "sha256-mWt5795kM829AIiHLbxfs+1/4VeLaM27pjTxS7jdBHA="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix index 55ee719cd20f..44322ef2d1b8 100644 --- a/pkgs/development/python-modules/pytest-cram/default.nix +++ b/pkgs/development/python-modules/pytest-cram/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { version = "0.2.2"; pname = "pytest-cram"; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ cram ]; src = fetchPypi { diff --git a/pkgs/development/python-modules/pytest-datadir/default.nix b/pkgs/development/python-modules/pytest-datadir/default.nix index 58ad575d6386..e57292b774b6 100644 --- a/pkgs/development/python-modules/pytest-datadir/default.nix +++ b/pkgs/development/python-modules/pytest-datadir/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pytest_datadir" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix index fb960c13de51..5215dad5ab2f 100644 --- a/pkgs/development/python-modules/pytest-datafiles/default.nix +++ b/pkgs/development/python-modules/pytest-datafiles/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/pkgs/development/python-modules/pytest-dependency/default.nix index c583288b406f..91e59bf90364 100644 --- a/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/pkgs/development/python-modules/pytest-dependency/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/pytest-describe/default.nix b/pkgs/development/python-modules/pytest-describe/default.nix index 7f5fbf361597..b659445267ca 100644 --- a/pkgs/development/python-modules/pytest-describe/default.nix +++ b/pkgs/development/python-modules/pytest-describe/default.nix @@ -6,6 +6,7 @@ , pytest # tests +, py , pytestCheckHook }: @@ -26,7 +27,8 @@ buildPythonPackage { pytest ]; - checkInputs = [ + nativeCheckInputs = [ + py pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index c4668def279e..f78a637a5b8a 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pytest setuptools-scm ]; - checkInputs = [ pytest django-configurations pytest-xdist six ]; + nativeCheckInputs = [ pytest django-configurations pytest-xdist six ]; propagatedBuildInputs = [ django ]; # Complicated. Requires Django setup. diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 9f722ca92836..4f520f3e8b2e 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -5,13 +5,14 @@ , pytest , pytestCheckHook , pythonOlder +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "pytest-doctestplus"; version = "0.12.1"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,9 +31,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging + setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-dotenv/default.nix b/pkgs/development/python-modules/pytest-dotenv/default.nix index 3ae89e6a5197..05e5da7ffdd5 100644 --- a/pkgs/development/python-modules/pytest-dotenv/default.nix +++ b/pkgs/development/python-modules/pytest-dotenv/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; propagatedBuildInputs = [ python-dotenv ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { description = "A pytest plugin that parses environment files before running tests"; diff --git a/pkgs/development/python-modules/pytest-env/default.nix b/pkgs/development/python-modules/pytest-env/default.nix index 72df18c88475..3d68c2dccc46 100644 --- a/pkgs/development/python-modules/pytest-env/default.nix +++ b/pkgs/development/python-modules/pytest-env/default.nix @@ -1,15 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, hatch-vcs +, hatchling +, pytest +, pytestCheckHook +}: buildPythonPackage rec { pname = "pytest-env"; - version = "0.6.2"; + version = "0.8.1"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "1hl0ln0cicdid4qjk7mv90lw9xkb0v71dlj7q7rn89vzxxm9b53y"; + pname = "pytest_env"; + inherit version; + hash = "sha256-17L1Jz7G0eIhdXmYvC9Q0kdO19C5MxuSVWAR+txOmr8="; }; - checkInputs = [ pytest ]; + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + buildInputs = [ + pytest + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Pytest plugin used to set environment variables"; diff --git a/pkgs/development/python-modules/pytest-error-for-skips/default.nix b/pkgs/development/python-modules/pytest-error-for-skips/default.nix index 60d3f16a1c97..7ed7972792a3 100644 --- a/pkgs/development/python-modules/pytest-error-for-skips/default.nix +++ b/pkgs/development/python-modules/pytest-error-for-skips/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pytest_error_for_skips" ]; diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix index eea6c61a7274..77290573dc16 100644 --- a/pkgs/development/python-modules/pytest-factoryboy/default.nix +++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { inflection ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pytestcache diff --git a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix index 5df0aa976f1f..054170408be6 100644 --- a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix +++ b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix @@ -5,39 +5,49 @@ , pytest-cov , pytest-doctestplus , pytestCheckHook +, pythonOlder , setuptools-scm }: buildPythonPackage rec { pname = "pytest-filter-subpackage"; - version = "0.1.1"; + version = "0.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1s4s2kd31yc65rfvl4xhy8xx806xhy59kc7668h6b6wq88xgrn5p"; + hash = "sha256-H66jZxeAPlJFiNbBCdJtINOzRCLo1qloEnWJd9ygF4I="; }; nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ pytest ]; + buildInputs = [ + pytest + ]; propagatedBuildInputs = [ pytest-doctestplus pytest-cov ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; # missing some files - disabledTests = [ "with_rst" ]; + disabledTests = [ + "with_rst" + ]; meta = with lib; { description = "Meta-package containing dependencies for testing"; - homepage = "https://astropy.org"; + homepage = "https://github.com/astropy/pytest-filter-subpackage"; + changelog = "https://github.com/astropy/pytest-filter-subpackage/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index d6da25139893..fab7bab0ba94 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { flake8 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -42,5 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/tholo/pytest-flake8"; maintainers = with lib.maintainers; [ jluttine ]; license = lib.licenses.bsd2; + broken = lib.versionAtLeast flake8.version "6.0.0"; }; } diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index afa04dfe937a..ae92c18766a9 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; propagatedBuildInputs = [ pyflakes ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # no longer passes doCheck = false; diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 594a5efaa894..80b294445f7a 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch , setuptools-scm , py , pytest @@ -19,6 +20,18 @@ buildPythonPackage rec { sha256 = "sha256-i2dYfI+Yy7rf3YBFOe1UVbbtA4AiA0hd0vU8FCLXRA4="; }; + patches = [ + # pytest 7.2.0 compat, remove after 1.4.0 + (fetchpatch { + url = "https://github.com/pytest-dev/pytest-forked/commit/c3c753e96916a4bc5a8a37699e75c6cbbd653fa2.patch"; + hash = "sha256-QPgxBeMQ0eKJyHXYZyBicVbE+JyKPV/Kbjsb8gNJBGA="; + }) + (fetchpatch { + url = "https://github.com/pytest-dev/pytest-forked/commit/de584eda15df6db7912ab6197cfb9ff23024ef23.patch"; + hash = "sha256-VLE32xZRwFK0nEgCWuSoMW/yyFHEURtNFU9Aa9haLhk="; + }) + ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ @@ -29,7 +42,12 @@ buildPythonPackage rec { py ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + py + pytestCheckHook + ]; + + setupHook = ./setup-hook.sh; meta = { description = "Run tests in isolated forked subprocesses"; diff --git a/pkgs/development/python-modules/pytest-forked/setup-hook.sh b/pkgs/development/python-modules/pytest-forked/setup-hook.sh new file mode 100644 index 000000000000..e613feadf834 --- /dev/null +++ b/pkgs/development/python-modules/pytest-forked/setup-hook.sh @@ -0,0 +1,25 @@ +pytestForkedHook() { + pytestFlagsArray+=( + "--forked" + ) + + # Using --forked on darwin leads to crashes when fork safety is + # enabled. This often happens when urllib tries to request proxy + # settings on MacOS through `urllib.request.getproxies()` + # - https://github.com/python/cpython/issues/77906 + if [[ "$OSTYPE" == "darwin"* ]]; then + export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES + fi +} + +# the flags should be added before pytestCheckHook runs so +# until we have dependency mechanism in generic builder, we need to use this ugly hack. + +if [ -z "${dontUsePytestForked-}" ] && [ -z "${dontUsePytestCheck-}" ]; then + if [[ " ${preDistPhases:-} " =~ " pytestCheckPhase " ]]; then + preDistPhases+=" " + preDistPhases="${preDistPhases/ pytestCheckPhase / pytestForkedHook pytestCheckPhase }" + else + preDistPhases+=" pytestForkedHook" + fi +fi diff --git a/pkgs/development/python-modules/pytest-freezegun/default.nix b/pkgs/development/python-modules/pytest-freezegun/default.nix index 3ba67867a1aa..95ccd9b77cd4 100644 --- a/pkgs/development/python-modules/pytest-freezegun/default.nix +++ b/pkgs/development/python-modules/pytest-freezegun/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , freezegun , pytest , pytestCheckHook @@ -17,13 +18,22 @@ buildPythonPackage rec { sha256 = "10c4pbh03b4s1q8cjd75lr0fvyf9id0zmdk29566qqsmaz28npas"; }; + patches = [ + (fetchpatch { + # https://github.com/ktosiek/pytest-freezegun/pull/38 + name = "pytest-freezegun-drop-distutils.patch"; + url = "https://github.com/ktosiek/pytest-freezegun/commit/03d7107a877e8f07617f931a379f567d89060085.patch"; + hash = "sha256-/7GTQdidVbE2LT5hwxjEc2dr+aWr6TX1131U4KMQhns="; + }) + ]; + buildInputs = [ pytest ]; propagatedBuildInputs = [ freezegun ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-freezer/default.nix b/pkgs/development/python-modules/pytest-freezer/default.nix new file mode 100644 index 000000000000..8621eeee8088 --- /dev/null +++ b/pkgs/development/python-modules/pytest-freezer/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, freezegun +, hatchling +, pytest +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pytest-freezer"; + version = "0.4.6"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-0JZv6MavRceAV+ZOetCVxJEyttd5W3PCts6Fz2KQsh0="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + freezegun + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pytest_freezer" + ]; + + meta = with lib; { + description = "Pytest plugin providing a fixture interface for spulec/freezegun"; + homepage = "https://github.com/pytest-dev/pytest-freezer"; + changelog = "https://github.com/pytest-dev/pytest-freezer/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-golden/default.nix b/pkgs/development/python-modules/pytest-golden/default.nix index d6fd3fe5d2d0..dede2e30b9fd 100644 --- a/pkgs/development/python-modules/pytest-golden/default.nix +++ b/pkgs/development/python-modules/pytest-golden/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub #, hatchling , ruamel-yaml -, poetry +, poetry-core , pytest , pytest-asyncio , pytestCheckHook @@ -27,13 +27,19 @@ buildPythonPackage rec { hash = "sha256-l5fXWDK6gWJc3dkYFTokI9tWvawMRnF0td/lSwqkYXE="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry>=0.12" poetry-core \ + --replace poetry.masonry.api poetry.core.masonry.api + ''; + pythonRelaxDeps = [ "testfixtures" ]; nativeBuildInputs = [ # hatchling used for > 0.2.2 - poetry + poetry-core pythonRelaxDepsHook ]; @@ -47,7 +53,7 @@ buildPythonPackage rec { testfixtures ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix index f7d6ce312640..7ac3fdc47f28 100644 --- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix +++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools setuptools-declarative-requirements setuptools-scm ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pytest_helpers_namespace" ]; diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix index 78b2de292f1d..dea7f772f78f 100644 --- a/pkgs/development/python-modules/pytest-html/default.nix +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pytest-html"; - version = "3.1.1"; + version = "3.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3ee1cf319c913d19fe53aeb0bc400e7b0bc2dbeb477553733db1dad12eb75ee3"; + sha256 = "sha256-xOL0uwv/xDf1GtIXSoo+cd+Bu8L2iUYE5gSvGPvmh8M="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index c83724fa8036..0020076a1b33 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { --replace "assert response.headers['Location'].startswith('https://')" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests ]; diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index cba9a9294e7c..1c69f426b169 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -1,35 +1,50 @@ { lib , buildPythonPackage -, fetchPypi -, pytest-cov +, fetchFromGitHub +, poetry-core , pytestCheckHook +, pythonOlder , requests +, toml , werkzeug }: buildPythonPackage rec { pname = "pytest-httpserver"; version = "1.0.6"; + format = "pyproject"; - src = fetchPypi { - pname = "pytest_httpserver"; - inherit version; - sha256 = "sha256-kEDQe/WaxF2N49sdRGj9LR1geXXk2kyHLswEAs2/ez4="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "csernazs"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-LY5Ur0cIcsNrgvyQlY2E479ZzRcuwqTuiT2MtRupVcs="; }; - propagatedBuildInputs = [ werkzeug ]; - - checkInputs = [ - pytest-cov - pytestCheckHook - requests + nativeBuildInputs = [ + poetry-core ]; - pythonImportsCheck = [ "pytest_httpserver" ]; + propagatedBuildInputs = [ + werkzeug + ]; + + nativeCheckInputs = [ + pytestCheckHook + requests + toml + ]; + + pythonImportsCheck = [ + "pytest_httpserver" + ]; meta = with lib; { description = "HTTP server for pytest to test HTTP clients"; homepage = "https://www.github.com/csernazs/pytest-httpserver"; + changelog = "https://github.com/csernazs/pytest-httpserver/blob/${version}/CHANGES.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index 6a66727b1ebb..f8dbcffa9d6f 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.21.0"; + version = "0.21.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Colin-b"; repo = "pytest_httpx"; - rev = "v${version}"; - hash = "sha256-mUzmtZCguaab4fAE7VcUhv+NQVYiPpxxHpiVVlzwrIo="; + rev = "refs/tags/v${version}"; + hash = "sha256-pIYSXmOxLfWknWTfrnhslx76UMSSlnqzFE7qvJo1mz4="; }; buildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { httpx ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-instafail/default.nix b/pkgs/development/python-modules/pytest-instafail/default.nix index f9942dd5bcd3..35e8598e26e0 100644 --- a/pkgs/development/python-modules/pytest-instafail/default.nix +++ b/pkgs/development/python-modules/pytest-instafail/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "10lpr6mjcinabqynj6v85bvb1xmapnhqmg50nys1r6hg7zgky9qr"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pytest_instafail" ]; meta = { description = "pytest plugin that shows failures and errors instantly instead of waiting until the end of test session"; diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index 234742f2e6d7..6298d18ed0d2 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , importlib-metadata , isort , poetry-core @@ -12,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-isort"; - version = "3.0.0"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stephrdev"; repo = pname; - rev = version; - hash = "sha256-gbEO3HBDeZ+nUACzpeV6iVuCdNHS5956wFzIYkbam+M="; + rev = "refs/tags/${version}"; + hash = "sha256-1oCVIi0sXwac4AufScJJRsfvBwaBAwlMBRNqLcUXEh4="; }; nativeBuildInputs = [ @@ -38,19 +37,10 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - patches = [ - # Can be removed with the next release, https://github.com/stephrdev/pytest-isort/pull/44 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/stephrdev/pytest-isort/commit/f17ed2d294ae90e415d051e1c720982e3dd01bff.patch"; - sha256 = "sha256-PiOs0c61BNx/tZN11DYblOd7tNzGthNnlkmYMTI9v18="; - }) - ]; - pythonImportsCheck = [ "pytest_isort" ]; @@ -58,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin to perform isort checks (import ordering)"; homepage = "https://github.com/moccu/pytest-isort/"; + changelog = "https://github.com/stephrdev/pytest-isort/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/pytest-json-report/default.nix b/pkgs/development/python-modules/pytest-json-report/default.nix index 95a0bcb325f1..335f2de30a84 100644 --- a/pkgs/development/python-modules/pytest-json-report/default.nix +++ b/pkgs/development/python-modules/pytest-json-report/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytest-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytest-xdist pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix new file mode 100644 index 000000000000..f9e49cf09144 --- /dev/null +++ b/pkgs/development/python-modules/pytest-jupyter/default.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build +, hatchling +, pytest + +# runtime +, jupyter-core + +# optionals +, jupyter-client +, ipykernel +, jupyter-server +, nbformat + +# tests +, pytest-timeout +, pytestCheckHook +}: + +let self = buildPythonPackage rec { + pname = "pytest-jupyter"; + version = "0.6.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jupyter-server"; + repo = "pytest-jupyter"; + rev = "refs/tags/v${version}"; + hash = "sha256-kY4QHrlj0opEBywe4SpwE4Ck6l6JIzEosx6uuXh+yCQ="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + jupyter-core + ]; + + passthru.optional-dependencies = rec { + client = [ + jupyter-client + ipykernel + ]; + server = [ + jupyter-server + nbformat + ] ++ client; + }; + + doCheck = false; # infinite recursion with jupyter-server + + nativeCheckInputs = [ + pytest-timeout + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + passthru.tests = { + check = self.overridePythonAttrs (_: { doCheck = false; }); + }; + + meta = with lib; { + changelog = "https://github.com/jupyter-server/pytest-jupyter/releases/tag/v${version}"; + description = "pytest plugin for testing Jupyter core libraries and extensions"; + homepage = "https://github.com/jupyter-server/pytest-jupyter"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +}; +in self diff --git a/pkgs/development/python-modules/pytest-lazy-fixture/default.nix b/pkgs/development/python-modules/pytest-lazy-fixture/default.nix index 2b9c57b99d8a..8f41c5c55b9c 100644 --- a/pkgs/development/python-modules/pytest-lazy-fixture/default.nix +++ b/pkgs/development/python-modules/pytest-lazy-fixture/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1b0hmnsxw4s2wf9pks8dg6dfy5cx3zcbzs8517lfccxsfizhqz8f"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-logdog/default.nix b/pkgs/development/python-modules/pytest-logdog/default.nix index bba0f092fd3f..f9bd63d8ee66 100644 --- a/pkgs/development/python-modules/pytest-logdog/default.nix +++ b/pkgs/development/python-modules/pytest-logdog/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix index 321aacb5c704..7d1ec8696c21 100644 --- a/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -1,24 +1,38 @@ { lib , buildPythonPackage , fetchPypi +, poetry-core , pytest +, pytestCheckHook , pythonOlder , setuptools-scm }: buildPythonPackage rec { pname = "pytest-metadata"; - version = "2.0.2"; + version = "2.0.4"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-/NL0FvFb4pWUNSezyLoWpErlpxQZOckMPcXOnRZ88qU="; + pname = "pytest_metadata"; + inherit version; + hash = "sha256-/MZT9l/jA1tHiCC1KE+/D1KANiLuP2Ci+u16fTuh9B4="; }; - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ pytest ]; + nativeBuildInputs = [ + poetry-core + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Plugin for accessing test session metadata"; diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index ed25a10d3a4e..7dc15e3cd276 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch , pytest , pytest-asyncio , pytestCheckHook @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "3.8.2"; + version = "3.10.0"; disabled = pythonOlder "3.7"; @@ -18,16 +19,24 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-d/A/RVQ5JVhwApXgWu0LEJaiDUpgpPPdzeWLDDHI/KI="; + hash = "sha256-+72whe98JSoyb9jNysCqOxMz2IEfExvcxwEALhvn7U8="; }; + patches = [ + (fetchpatch { + # Remove unnecessary py.code import + url = "https://github.com/pytest-dev/pytest-mock/pull/328/commits/e2016928db1147a2a46de6ee9fa878ca0e9d8fc8.patch"; + hash = "sha256-5Gpzi7h7Io1CMykmBCZR/upM8E9isc3jEItYgwjEOWA="; + }) + ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-mockito/default.nix b/pkgs/development/python-modules/pytest-mockito/default.nix index 240cf44343e2..279b04b83e0e 100644 --- a/pkgs/development/python-modules/pytest-mockito/default.nix +++ b/pkgs/development/python-modules/pytest-mockito/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { mockito ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-mockservers/default.nix b/pkgs/development/python-modules/pytest-mockservers/default.nix index 4022befcb14d..d65b29d7662f 100644 --- a/pkgs/development/python-modules/pytest-mockservers/default.nix +++ b/pkgs/development/python-modules/pytest-mockservers/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pytest-asyncio ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index e5bf251def6c..6f7ccd02e992 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pillow ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix index 1424e6c48dca..61fa877d9a9c 100644 --- a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix +++ b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "typeddjango"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-7Qow315zuZB6BNIIm6QR9ZMFH6E/VSp2vRBpONlqYhM="; + hash = "sha256-7Qow315zuZB6BNIIm6QR9ZMFH6E/VSp2vRBpONlqYhM="; }; buildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { regex ]; - checkInputs = [ + nativeCheckInputs = [ mypy pytestCheckHook ]; @@ -50,9 +50,18 @@ buildPythonPackage rec { "pytest_mypy_plugins" ]; + disabledTests = [ + # ...TypecheckAssertionError: Invalid output: + "with_out" + "add_mypypath_env_var_to_package_searc" + "error_case" + "skip_if_false" + ]; + meta = with lib; { description = "Pytest plugin for testing mypy types, stubs, and plugins"; homepage = "https://github.com/TypedDjango/pytest-mypy-plugins"; + changelog = "https://github.com/typeddjango/pytest-mypy-plugins/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ SomeoneSerge ]; }; diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index bec0ee59d0c5..e4d368bf61d4 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-mypy"; - version = "0.9.1"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-n/o79AXBLFxr6ekuIr67arLJG5wy9FsPDJOvRzJpq1w="; + sha256 = "sha256-+EWPZCMj8Toso+LmFQn3dnlmtSe02K3M1QMsPntP09s="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-openfiles/default.nix b/pkgs/development/python-modules/pytest-openfiles/default.nix index 573dbf275117..f076417fbbe5 100644 --- a/pkgs/development/python-modules/pytest-openfiles/default.nix +++ b/pkgs/development/python-modules/pytest-openfiles/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { psutil ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Pytest plugin for detecting inadvertent open file handles"; diff --git a/pkgs/development/python-modules/pytest-order/default.nix b/pkgs/development/python-modules/pytest-order/default.nix index e40e0671bc03..46ba61cef6ea 100644 --- a/pkgs/development/python-modules/pytest-order/default.nix +++ b/pkgs/development/python-modules/pytest-order/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist pytest-dependency diff --git a/pkgs/development/python-modules/pytest-ordering/default.nix b/pkgs/development/python-modules/pytest-ordering/default.nix index c5e8a786b5ef..5156aa35a5ae 100644 --- a/pkgs/development/python-modules/pytest-ordering/default.nix +++ b/pkgs/development/python-modules/pytest-ordering/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1xim0kj5g37p1skgvp8gdylpx949krmx60w3pw6j1m1h7sakmddn"; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-param-files/default.nix b/pkgs/development/python-modules/pytest-param-files/default.nix index c2ed3da53640..0cbdcf92dd49 100644 --- a/pkgs/development/python-modules/pytest-param-files/default.nix +++ b/pkgs/development/python-modules/pytest-param-files/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pytest_param_files" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-playwright/default.nix b/pkgs/development/python-modules/pytest-playwright/default.nix new file mode 100644 index 000000000000..9e620a6210a4 --- /dev/null +++ b/pkgs/development/python-modules/pytest-playwright/default.nix @@ -0,0 +1,63 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, playwright +, pytest +, pytest-base-url +, pytestCheckHook +, python-slugify +, pythonOlder +, setuptools-scm +, django +}: + +buildPythonPackage rec { + pname = "pytest-playwright"; + version = "0.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "playwright-pytest"; + rev = "refs/tags/v${version}"; + hash = "sha256-fHzQxbQBSEkCFu/ualjzSmIt3SiEa2ktTvIJKPZLT9Q="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + playwright + pytest-base-url + python-slugify + ]; + + # Most of the tests rely on network access, or on unavailable browsers such as + # msedge, chrome or webkit + doCheck = false; + + preCheck = '' + export PLAYWRIGHT_BROWSERS_PATH=${playwright.browsers} + ''; + + pythonImportsCheck = [ + "pytest_playwright" + ]; + + meta = with lib; { + description = "Pytest plugin to write end-to-end browser tests with Playwright"; + homepage = "https://github.com/microsoft/playwright-pytest"; + changelog = "https://github.com/microsoft/playwright-pytest/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-plt/default.nix b/pkgs/development/python-modules/pytest-plt/default.nix index 2c995aaeff1c..b1546e368480 100644 --- a/pkgs/development/python-modules/pytest-plt/default.nix +++ b/pkgs/development/python-modules/pytest-plt/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-IkTNlierFXIG9WSVUfVoirfQ6z7JOYlCaa5NhnBSuxc="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook matplotlib ]; diff --git a/pkgs/development/python-modules/pytest-qt/default.nix b/pkgs/development/python-modules/pytest-qt/default.nix index f1d8707a3a19..3d7a5a86fbbe 100644 --- a/pkgs/development/python-modules/pytest-qt/default.nix +++ b/pkgs/development/python-modules/pytest-qt/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ + nativeCheckInputs = [ pyqt5 ]; diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix index 99d65ec28669..0a7c1907635f 100644 --- a/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-quickcheck"; - version = "0.8.6"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "3ef9bde7ba1fe6470c5b61631440186d1254e276c67a527242d91451ab7994e5"; + sha256 = "sha256-UFF8ldnaImXU6al4kGjf720mbwXE6Nut9VlvNVrMVoY="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-raises/default.nix b/pkgs/development/python-modules/pytest-raises/default.nix index 7891437909ed..68c23064afe9 100644 --- a/pkgs/development/python-modules/pytest-raises/default.nix +++ b/pkgs/development/python-modules/pytest-raises/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0gbb4kml2qv7flp66i73mgb4qihdaybb6c96b5dw3mhydhymcsy2"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-random-order/default.nix b/pkgs/development/python-modules/pytest-random-order/default.nix index d95af8651f34..223024fe6451 100644 --- a/pkgs/development/python-modules/pytest-random-order/default.nix +++ b/pkgs/development/python-modules/pytest-random-order/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "1.0.4"; + version = "1.1.0"; pname = "pytest-random-order"; src = fetchPypi { inherit pname version; - sha256 = "6b2159342a4c8c10855bc4fc6d65ee890fc614cb2b4ff688979b008a82a0ff52"; + sha256 = "sha256-2+beu5NTp6+YTMnt2+s1d91Nu8wVKaeePSH2jtm0VgU="; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix index 8bb8c6d06374..7e05104ff637 100644 --- a/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ factory_boy faker numpy diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index 99099d3ac924..73337221c239 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pytest-regressions"; - version = "2.3.1"; + version = "2.4.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-s+xM2zTo9idgYnXYuDTGXmDhowc+MmuzcnpCcnPQIh0="; + sha256 = "sha256-Jk0j6BMt7rV0Qc9Ga3tdtEV5fzRucrZyyVt/UqR78Bs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook matplotlib ]; diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index 13838eb326c9..b07d603c1e8e 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -1,44 +1,53 @@ { lib , buildPythonPackage -, fetchPypi -, pytest -, six , decorator +, fetchPypi +, invocations +, invoke +, pytest , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - version = "1.1.5"; pname = "pytest-relaxed"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e39a7e5b14e14dfff0de0ad720dfffa740c128d599ab14cfac13f4deb34164a6"; + hash = "sha256-Szc8x1Rmb/YPVCWmnLQUZCwqEc56RsjOBmpzjkCSyjk="; }; - # newer decorator versions are incompatible and cause the test suite to fail - # but only a few utility functions are used from this package which means it has no actual impact on test execution in paramiko and Fabric - postPatch = '' - substituteInPlace setup.py \ - --replace "decorator>=4,<5" "decorator>=4" \ - --replace "pytest>=3,<5" "pytest>=3" - ''; + buildInputs = [ + pytest + ]; - buildInputs = [ pytest ]; + propagatedBuildInputs = [ + decorator + ]; - propagatedBuildInputs = [ six decorator ]; + nativeCheckInputs = [ + invocations + invoke + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ + "tests" + ]; - # lots of assertion errors mainly around decorator - doCheck = false; + pythonImportsCheck = [ + "pytest_relaxed" + ]; meta = with lib; { homepage = "https://pytest-relaxed.readthedocs.io/"; description = "Relaxed test discovery/organization for pytest"; + changelog = "https://github.com/bitprophet/pytest-relaxed/blob/${version}/docs/changelog.rst"; license = licenses.bsd0; - maintainers = [ maintainers.costrouc ]; - # see https://github.com/bitprophet/pytest-relaxed/issues/12 - broken = true; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/pytest-remotedata/default.nix b/pkgs/development/python-modules/pytest-remotedata/default.nix index fc9b5e6f9c1b..1529796bab3b 100644 --- a/pkgs/development/python-modules/pytest-remotedata/default.nix +++ b/pkgs/development/python-modules/pytest-remotedata/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-remotedata"; - version = "0.3.3"; + version = "0.4.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "66920bf1c62928b079d0e611379111a0d49f10a9509ced54c8269514ccce6ee3"; + hash = "sha256-viHFWONNfBGw9q61CVbAlSC//NArf86cb46FMaQBocg="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin for controlling remote data access"; homepage = "https://github.com/astropy/pytest-remotedata"; + changelog = "https://github.com/astropy/pytest-remotedata/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-repeat/default.nix b/pkgs/development/python-modules/pytest-repeat/default.nix index 1b3721282159..61d7d22b2945 100644 --- a/pkgs/development/python-modules/pytest-repeat/default.nix +++ b/pkgs/development/python-modules/pytest-repeat/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index 9b16760b23b8..a0e9bb1fb2a6 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -2,18 +2,18 @@ buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "10.2"; + version = "10.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "9e1e1bad51e07642c5bbab809fc1d4ec8eebcb7de86f90f1a26e6ef9de446697"; + sha256 = "sha256-2CRNeZ+Jpu215XMB3a6ztvENZpFjjVHoCzcTEVkuKMY="; }; buildInputs = [ pytest ]; - checkInputs = [ mock pytest ]; + nativeCheckInputs = [ mock pytest ]; checkPhase = '' py.test test_pytest_rerunfailures.py diff --git a/pkgs/development/python-modules/pytest-resource-path/default.nix b/pkgs/development/python-modules/pytest-resource-path/default.nix index 7476801794c3..f82e5a661e41 100644 --- a/pkgs/development/python-modules/pytest-resource-path/default.nix +++ b/pkgs/development/python-modules/pytest-resource-path/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { colorama ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-sanic/default.nix b/pkgs/development/python-modules/pytest-sanic/default.nix index 2bce8eaecb71..ae907034a7fa 100644 --- a/pkgs/development/python-modules/pytest-sanic/default.nix +++ b/pkgs/development/python-modules/pytest-sanic/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ sanic pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index e3b2277fa99b..480c15b87c36 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,28 +1,64 @@ -{ lib, isPyPy, buildPythonPackage, fetchPypi -, pytest, cmdline, pytest-cov, coverage, setuptools-git, mock, path, execnet -, contextlib2, termcolor, six }: +{ lib +, isPyPy +, buildPythonPackage +, fetchPypi + +# build +, pytest + +# runtime +, setuptools-git +, mock +, path +, execnet +, termcolor +, six + +# tests +, cmdline +, pytestCheckHook + }: buildPythonPackage rec { pname = "pytest-shutil"; version = "1.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "0q8j0ayzmnvlraml6i977ybdq4xi096djhf30n2m1rvnvrhm45nq"; + hash = "sha256-2BZSYd5251CFBcNB2UwCsRPclj8nRUOrynTb+r0CEmE="; }; postPatch = '' substituteInPlace setup.py \ + --replace "contextlib2" 'contextlib2;python_version<"3"' \ --replace "path.py" "path" ''; - buildInputs = [ pytest ]; - checkInputs = [ cmdline pytest ]; - propagatedBuildInputs = [ pytest-cov coverage setuptools-git mock path execnet contextlib2 termcolor six ]; + buildInputs = [ + pytest + ]; - checkPhase = '' - py.test ${lib.optionalString isPyPy "-k'not (test_run or test_run_integration)'"} - ''; + propagatedBuildInputs = [ + setuptools-git + mock + path + execnet + termcolor + six + ]; + + nativeCheckInputs = [ + cmdline + pytestCheckHook + ]; + + disabledTests = [ + "test_pretty_formatter" + ] ++ lib.optionals isPyPy [ + "test_run" + "test_run_integration" + ]; meta = with lib; { description = "A goodie-bag of unix shell and environment tools for py.test"; diff --git a/pkgs/development/python-modules/pytest-snapshot/default.nix b/pkgs/development/python-modules/pytest-snapshot/default.nix index 0d24f8fa202e..707c002380ca 100644 --- a/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix index 7dc1bd9d08e9..d3ea76b8a1bb 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.2"; + version = "1.5.0"; disabled = pythonOlder "3.6"; @@ -21,14 +21,14 @@ buildPythonPackage rec { owner = "aklajnert"; repo = "pytest-subprocess"; rev = "refs/tags/${version}"; - hash = "sha256-8Of3/RltijfF5MXtVazGzIqpmRIhreT26kLNjzXLF1k="; + hash = "sha256-u9d9RhbikOyknMWs18j2efYJb9YdHsQrp31LfcbudoA="; }; buildInputs = [ pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook docutils pygments diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix index 8ada20dce8f5..60947ed1172f 100644 --- a/pkgs/development/python-modules/pytest-subtests/default.nix +++ b/pkgs/development/python-modules/pytest-subtests/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix index 9b59eb2e55b8..a738aacaca5d 100644 --- a/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-sugar"; - version = "0.9.5"; + version = "0.9.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7qeLbxW2NSd9PZAoDNOG2P7qHKsPm+dZR6Ym6LArR30="; + sha256 = "sha256-xHk0lfPDLhFPD1QWKQlGwxbrlq1aNoTc2t2pJn5Zsrg="; }; buildInputs = [ pytest ]; @@ -23,7 +23,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-tap/default.nix b/pkgs/development/python-modules/pytest-tap/default.nix new file mode 100644 index 000000000000..32b12ddcc236 --- /dev/null +++ b/pkgs/development/python-modules/pytest-tap/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytest +, tappy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-tap"; + version = "3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "python-tap"; + repo = "pytest-tap"; + rev = "v${version}"; + sha256 = "R0RSdKTyJYGq+x0+ut4pJEywTGNgGp/ps36ZaH5dyY4="; + }; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + tappy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Fixed in 4ed0138bf659c348b6dfb8bb701ae1989625d3d8 and hopefully in next release + "test_unittest_expected_failure" + ]; + + pythonImportsCheck = [ + "pytest_tap" + ]; + + meta = with lib; { + description = "Test Anything Protocol (TAP) reporting plugin for pytest"; + homepage = "https://github.com/python-tap/pytest-tap"; + changelog = "https://github.com/python-tap/pytest-tap/blob/v${version}/docs/releases.rst"; + license = licenses.bsd2; + maintainers = with maintainers; [ cynerd ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-test-utils/default.nix b/pkgs/development/python-modules/pytest-test-utils/default.nix index fd5022dac4f8..1d15abd4b1bd 100644 --- a/pkgs/development/python-modules/pytest-test-utils/default.nix +++ b/pkgs/development/python-modules/pytest-test-utils/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 4748cdedf81b..dcdfba7285b5 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -1,23 +1,31 @@ { lib , buildPythonPackage , coverage -, fetchPypi +, fetchFromGitHub +, poetry-core , pytest , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.4.0"; - format = "setuptools"; + version = "1.4.5"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-PVLXOBTo2xnMBM4wyvrmGgyztW0ajGxMU+oIhrjZiw8="; + src = fetchFromGitHub { + owner = "tarpas"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-RHzPLCC33bPEk59rin4CZD3F7fsT1qyRR2HRyDIwszo="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ pytest ]; @@ -36,7 +44,8 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plug-in which automatically selects and re-executes only tests affected by recent changes"; homepage = "https://github.com/tarpas/pytest-testmon/"; - license = licenses.mit; + changelog = "https://github.com/tarpas/pytest-testmon/releases/tag/v${version}"; + license = licenses.agpl3Only; maintainers = with maintainers; [ dmvianna ]; }; } diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index e380068c59d3..b41c6f173fb7 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pexpect pytest-cov diff --git a/pkgs/development/python-modules/pytest-tornasync/default.nix b/pkgs/development/python-modules/pytest-tornasync/default.nix index f037ab86d5f6..ac2cf07736c5 100644 --- a/pkgs/development/python-modules/pytest-tornasync/default.nix +++ b/pkgs/development/python-modules/pytest-tornasync/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { tornado ]; - checkInputs = [ + nativeCheckInputs = [ pytest tornado ]; diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix index e42ed5c68386..e65e494a5409 100644 --- a/pkgs/development/python-modules/pytest-trio/default.nix +++ b/pkgs/development/python-modules/pytest-trio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { outcome ]; - checkInputs = [ + nativeCheckInputs = [ pytest hypothesis ]; diff --git a/pkgs/development/python-modules/pytest-unordered/default.nix b/pkgs/development/python-modules/pytest-unordered/default.nix index 5dc0916991c9..b47536983e6a 100644 --- a/pkgs/development/python-modules/pytest-unordered/default.nix +++ b/pkgs/development/python-modules/pytest-unordered/default.nix @@ -1,25 +1,36 @@ { lib , buildPythonPackage , fetchFromGitHub +, pytest , pytestCheckHook }: buildPythonPackage rec { pname = "pytest-unordered"; - version = "0.4.1"; + version = "0.5.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "utapyngo"; - repo = pname; - rev = "972012a984b1e9fb3e98f9e8fe9e2ada16ad8110"; - hash = "sha256-mCcR6WZb2+V5n0PwgsjvnChWnANkIyQ0YtqwTKBYtaA="; + repo = "pytest-unordered"; + rev = "refs/tags/v${version}"; + hash = "sha256-51UJjnGBO7qBvQlY8F0B29n8+EO2aa3DF3WOwcjZzSo="; }; - checkInputs = [ pytestCheckHook ]; + buildInputs = [ + pytest + ]; - pythonImportsCheck = [ "pytest_unordered" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pytest_unordered" + ]; meta = with lib; { + changelog = "https://github.com/utapyngo/pytest-unordered/blob/v${version}/CHANGELOG.md"; description = "Test equality of unordered collections in pytest"; homepage = "https://github.com/utapyngo/pytest-unordered"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index c4a66cc48e5d..0feb637f4b50 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "03w2zz3crblj1p6i8nq17946hbn3zqp9z7cfnifw47hi4a4fww12"; }; - checkInputs = [ pytest pytest-cov mock cmdline ]; + nativeCheckInputs = [ pytest pytest-cov mock cmdline ]; propagatedBuildInputs = [ pytest-fixture-config pytest-shutil virtualenv ]; checkPhase = "py.test tests/unit "; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index b17b6f2f763a..8d120459f0ce 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -7,32 +7,47 @@ , filelock , execnet , pytest -, pytest-forked , psutil -, pexpect +, setproctitle }: buildPythonPackage rec { pname = "pytest-xdist"; - version = "2.5.0"; + version = "3.1.0"; disabled = pythonOlder "3.6"; + format = "pyproject"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-RYDeyj/wTdsqxT66Oddstd1e3qwFDLb7x2iw3XErTt8="; + hash = "sha256-QP2481RJIcXfzUhqwIDOIocOcdgs7W0uePqXwq3dSAw="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; + buildInputs = [ pytest ]; - checkInputs = [ pytestCheckHook filelock pexpect ]; - propagatedBuildInputs = [ execnet pytest-forked psutil ]; + + propagatedBuildInputs = [ + execnet + ]; + + nativeCheckInputs = [ + filelock + pytestCheckHook + ]; + + passthru.optional-dependencies = { + psutil = [ psutil ]; + setproctitle = [ setproctitle ]; + }; pytestFlagsArray = [ # pytest can already use xdist at this point "--numprocesses=$NIX_BUILD_CORES" - "--forked" ]; # access file system diff --git a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh index 61d0f64d1a4d..4c6473cea64d 100644 --- a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh +++ b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh @@ -1,16 +1,7 @@ pytestXdistHook() { pytestFlagsArray+=( "--numprocesses=$NIX_BUILD_CORES" - "--forked" ) - - # Using --forked on darwin leads to crashes when fork safety is - # enabled. This often happens when urllib tries to request proxy - # settings on MacOS through `urllib.request.getproxies()` - # - https://github.com/python/cpython/issues/77906 - if [[ "$OSTYPE" == "darwin"* ]]; then - export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES - fi } # the flags should be added before pytestCheckHook runs so diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index c6262b7f1e0e..bed564319450 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -1,30 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , psutil +, py , pytest , setuptools-scm }: buildPythonPackage rec { pname = "pytest-xprocess"; - version = "0.20.0"; + version = "0.21.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AhZ1IsTcdZ+RxKsZhUY5zR6fbgq/ynXhGWgrVB0b1j8="; + sha256 = "sha256-+UcL/PiE9ymetrgqQ9KYwxi45T7DFO5iTJh+DofBtEk="; }; - nativeBuildInputs = [ setuptools-scm ]; - - buildInputs = [ pytest ]; - - propagatedBuildInputs = [ psutil ]; - - # Remove test QoL package from install_requires postPatch = '' + # Remove test QoL package from install_requires substituteInPlace setup.py \ --replace "'pytest-cache', " "" ''; + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + psutil + py + ]; + # There's no tests in repo doCheck = false; diff --git a/pkgs/development/python-modules/pytest-xvfb/default.nix b/pkgs/development/python-modules/pytest-xvfb/default.nix index c3dabe7f6e30..f4038c557797 100644 --- a/pkgs/development/python-modules/pytest-xvfb/default.nix +++ b/pkgs/development/python-modules/pytest-xvfb/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, virtual-display +, PyVirtualDisplay , isPy27 }: @@ -19,7 +19,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; propagatedBuildInputs = [ - virtual-display + PyVirtualDisplay ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 7690b84fd3fa..b329fee256ff 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -11,6 +11,7 @@ # propagates , attrs +, exceptiongroup , iniconfig , packaging , pluggy @@ -20,12 +21,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "7.1.3"; + version = "7.2.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TzZf7C3/nBFi+DTZ8YrxuhMGLbDHCL97lG+KXHYYDDk="; + hash = "sha256-xAFOtA4Q8R81WtTjwvssbG0ZGcc/O1pDPeRwggLK3lk="; }; outputs = [ @@ -44,6 +45,8 @@ buildPythonPackage rec { pluggy py tomli + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup ]; postInstall = '' @@ -69,7 +72,7 @@ buildPythonPackage rec { # - files are not needed after tests are finished pytestRemoveBytecodePhase () { # suffix is defined at: - # https://github.com/pytest-dev/pytest/blob/7.1.3/src/_pytest/assertion/rewrite.py#L51-L53 + # https://github.com/pytest-dev/pytest/blob/7.2.0/src/_pytest/assertion/rewrite.py#L51-L53 find $out -name "*-pytest-*.py[co]" -delete } preDistPhases+=" pytestRemoveBytecodePhase" diff --git a/pkgs/development/python-modules/pytest/tests.nix b/pkgs/development/python-modules/pytest/tests.nix index 76581b1f3d77..3fc078148b20 100644 --- a/pkgs/development/python-modules/pytest/tests.nix +++ b/pkgs/development/python-modules/pytest/tests.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ hypothesis pygments ]; diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix new file mode 100644 index 000000000000..1763ed44d175 --- /dev/null +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -0,0 +1,142 @@ +{ lib +, arangodb +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, pyjwt +, pytest +, mock +, requests +, requests-toolbelt +}: + +let + testDBOpts = { + host = "127.0.0.1"; + port = "8529"; + password = "test"; + secret = "secret"; + }; +in + +buildPythonPackage rec { + pname = "python-arango"; + version = "7.5.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ArangoDB-Community"; + repo = "python-arango"; + rev = "refs/tags/${version}"; + hash = "sha256-b3UZuH2hpulRSThReBkDwh0MLJmc95HeWInmmMAl4g0="; + }; + + propagatedBuildInputs = [ + requests + requests-toolbelt + pyjwt + ]; + + nativeCheckInputs = [ + arangodb + mock + pytestCheckHook + ]; + + # arangodb is compiled only for particular target architectures + # (i.e. "haswell"). Thus, these tests may not pass reproducibly, + # failing with: `166: Illegal instruction` if not run on arangodb's + # specified architecture. + # + # nonetheless, the client library should remain in nixpkgs - since + # the client library will talk to arangodb across the network and + # architecture issues will be irrelevant. + doCheck = false; + + preCheck = lib.optionalString doCheck '' + # Start test DB + mkdir -p .nix-test/{data,work} + + ICU_DATA=${arangodb}/share/arangodb3 \ + GLIBCXX_FORCE_NEW=1 \ + TZ=UTC \ + TZ_DATA=${arangodb}/share/arangodb3/tzdata \ + ARANGO_ROOT_PASSWORD=${testDBOpts.password} \ + ${arangodb}/bin/arangod \ + --server.uid=$(id -u) \ + --server.gid=$(id -g) \ + --server.authentication=true \ + --server.endpoint=http+tcp://${testDBOpts.host}:${testDBOpts.port} \ + --server.descriptors-minimum=4096 \ + --server.jwt-secret=${testDBOpts.secret} \ + --javascript.app-path=.nix-test/app \ + --log.file=.nix-test/log \ + --database.directory=.nix-test/data \ + --foxx.api=false & + ''; + + pytestFlagsArray = [ + "--host" + testDBOpts.host + "--port" + testDBOpts.port + "--passwd" + testDBOpts.password + "--secret" + testDBOpts.secret + ]; + + disabledTests = [ + # AssertionError geo-related - try enabling later + "test_document_find_in_box" + + # maybe arangod misconfig - try enabling later + # arango.exceptions.JWTAuthError: [HTTP 401][ERR 401] Wrong credentials + "test_auth_jwt" + + # ValueError - try enabling later + # maybe missed 3.9.3->3.10.0 changes + # most caused by key change: isNewlyCreated->new + "test_add_hash_index" + "test_add_skiplist_index" + "test_add_persistent_index" + "test_add_ttl_index" + "test_delete_index" + "test_pregel_management" + + # formatting error - try enabling later + # maybe missed 3.9.3->3.10.0 changes + # caused by: body["computedValues"] = None + "test_permission_management" + "test_collection_misc_methods" + "test_collection_management" + "test_replication_inventory" + + # want outgoing network to update foxx apis + # so foxx.api disabled in arangod startup + "test_foxx_service_management_file" + "test_foxx_service_management_json" + "test_foxx_config_management" + "test_foxx_dependency_management" + "test_foxx_development_toggle" + "test_foxx_misc_functions" + + # no replication configured via arangod invocation + "test_replication_applier" + ]; + + pythonImportsCheck = [ + "arango" + ]; + + meta = with lib; { + description = "Python Driver for ArangoDB"; + homepage = "https://github.com/ArangoDB-Community/python-arango"; + changelog = "https://github.com/ArangoDB-Community/python-arango/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ jsoo1 ]; + }; +} diff --git a/pkgs/development/python-modules/python-awair/default.nix b/pkgs/development/python-modules/python-awair/default.nix index 19fad9db2707..a3de0366c438 100644 --- a/pkgs/development/python-modules/python-awair/default.nix +++ b/pkgs/development/python-modules/python-awair/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { voluptuous ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook vcrpy diff --git a/pkgs/development/python-modules/python-barcode/default.nix b/pkgs/development/python-modules/python-barcode/default.nix index 5d64f933b691..dc54f7075fdc 100644 --- a/pkgs/development/python-modules/python-barcode/default.nix +++ b/pkgs/development/python-modules/python-barcode/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { --replace "--no-cov-on-fail" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.images; diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 19f07ccc0394..446fbfcd9c9e 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -1,26 +1,30 @@ { lib -, aiohttp +, boto3 , buildPythonPackage , fetchFromGitHub , ftfy , mailchecker +, openpyxl , orjson , phonenumbers , pytestCheckHook , python-dateutil +, python-decouple , python-fsutil -, pythonOlder , python-slugify +, pythonOlder +, pythonRelaxDepsHook , pyyaml , requests , six , toml +, xlrd , xmltodict }: buildPythonPackage rec { pname = "python-benedict"; - version = "0.25.4"; + version = "0.28.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,25 +33,37 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-q7aQW4XRlKp+X1iItHVEsHEjkl2DU9QG0eMrcuq+rc4="; + hash = "sha256-6gzmVOuJfNpNJlea4Am20HI98mgcKkwtU/28l7qg20Y="; }; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "boto3" + ]; + propagatedBuildInputs = [ + boto3 + ftfy mailchecker + openpyxl phonenumbers python-dateutil python-fsutil python-slugify pyyaml - ftfy - orjson requests toml + xlrd xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ + orjson pytestCheckHook + python-decouple six ]; @@ -59,6 +75,7 @@ buildPythonPackage rec { "test_from_plist_with_valid_url_valid_content" "test_from_query_string_with_valid_url_valid_content" "test_from_toml_with_valid_url_valid_content" + "test_from_xls_with_valid_url_valid_content" "test_from_xml_with_valid_url_valid_content" "test_from_yaml_with_valid_url_valid_content" ]; @@ -70,6 +87,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module with keylist/keypath support"; homepage = "https://github.com/fabiocaccamo/python-benedict"; + changelog = "https://github.com/fabiocaccamo/python-benedict/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index f5cd9b29f520..3641ac73b201 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 777c54a66e1c..7fabc513e9b1 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.all; diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index ada950cd8aab..11d3bdc3adfc 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.5.7"; + version = "0.5.9"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "liudger"; repo = pname; - rev = "v${version}"; - hash = "sha256-eavARej+R8SPNuwX6LOGr43SJi1AuZszThJVG00vKhQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-9WXj/zFFzPr3YabdEYN+Xn/IwKplPFdHAFDB2S2JUEI="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytest-mock @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to control and monitor an BSBLan device programmatically"; homepage = "https://github.com/liudger/python-bsblan"; + changelog = "https://github.com/liudger/python-bsblan/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index af09d9327b21..3e920ff6b9ac 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 = "9.1.0"; + version = "9.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+bMK8ubm5aEmwsgfNRRcWu5wwglV5t1AmRm+TRuHs0M="; + sha256 = "sha256-qnYodaJwr0kFfKyofVsDTmMLMYDexqGTz8uSefPWPfQ="; }; propagatedBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { stevedore ]; - checkInputs = [ + nativeCheckInputs = [ ddt oslo-serialization requests-mock diff --git a/pkgs/development/python-modules/python-constraint/default.nix b/pkgs/development/python-modules/python-constraint/default.nix index e6fcc4f8ab7a..d26d7e91c96c 100644 --- a/pkgs/development/python-modules/python-constraint/default.nix +++ b/pkgs/development/python-modules/python-constraint/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1dv11406yxmmgkkhwzqicajbg2bmla5xfad7lv57zyahxz8jzz94"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; dontUseSetuptoolsCheck = true; meta = with lib; { diff --git a/pkgs/development/python-modules/python-crfsuite/default.nix b/pkgs/development/python-modules/python-crfsuite/default.nix index f4f0f107f539..f48bc9c13ea7 100644 --- a/pkgs/development/python-modules/python-crfsuite/default.nix +++ b/pkgs/development/python-modules/python-crfsuite/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { rm -r pycrfsuite ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-crontab/default.nix b/pkgs/development/python-modules/python-crontab/default.nix index 9de0801d5375..c75dc71e0fc0 100644 --- a/pkgs/development/python-modules/python-crontab/default.nix +++ b/pkgs/development/python-modules/python-crontab/default.nix @@ -1,22 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi, python-dateutil, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, python-dateutil +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "python-crontab"; - version = "2.6.0"; + version = "2.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1e35ed7a3cdc3100545b43e196d34754e6551e7f95e4caebbe0e1c0ca41c2f1b"; + hash = "sha256-shr0ZHx7u4SP7y8CBhbGsCidy5+UtPmRpVMQ/5vsV0k="; }; - checkInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ + python-dateutil + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + disabledTests = [ "test_07_non_posix_shell" # doctest that assumes /tmp is writeable, awkward to patch "test_03_usage" ]; - propagatedBuildInputs = [ python-dateutil ]; + pythonImportsCheck = [ + "crontab" + ]; meta = with lib; { description = "Python API for crontab"; @@ -24,7 +42,7 @@ buildPythonPackage rec { Crontab module for reading and writing crontab files and accessing the system cron automatically and simply using a direct API. ''; - homepage = "https://pypi.org/project/python-crontab/"; + homepage = "https://gitlab.com/doctormo/python-crontab/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ kfollesdal ]; }; diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index cc12b14aa153..4e67546fad7b 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { lockfile ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook testscenarios testtools diff --git a/pkgs/development/python-modules/python-datemath/default.nix b/pkgs/development/python-modules/python-datemath/default.nix index 0dc6b6034532..9da7ed1c5a97 100644 --- a/pkgs/development/python-modules/python-datemath/default.nix +++ b/pkgs/development/python-modules/python-datemath/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { arrow ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index cc8181e7325c..a36f367ba43b 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -20,13 +20,13 @@ let ''; in buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.28.4"; + version = "0.28.6"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-gsGg9zHVyDTCVZmFUI8qqXDt0ui+o3hPwjRlsYUmShg="; + sha256 = "sha256-tNV1GQsUG5BGTNGB0VBUa0Yxqv/HsRSlRfEU4KNd29w="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -39,7 +39,7 @@ in buildPythonPackage rec { dbus-python ]; - checkInputs = [ + nativeCheckInputs = [ dbus pygobject3 bluez diff --git a/pkgs/development/python-modules/python-decouple/default.nix b/pkgs/development/python-modules/python-decouple/default.nix new file mode 100644 index 000000000000..5907be3a22a0 --- /dev/null +++ b/pkgs/development/python-modules/python-decouple/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "python-decouple"; + version = "3.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "HBNetwork"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-sCUlE+92+nG7ZHuGKXRJVx2wokNP7/F7g8LvdRWqHCQ="; + }; + + nativeCheckInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "decouple" + ]; + + meta = with lib; { + description = "Module to handle code and condifuration"; + homepage = "https://github.com/HBNetwork/python-decouple"; + changelog = "https://github.com/HBNetwork/python-decouple/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-didl-lite/default.nix b/pkgs/development/python-modules/python-didl-lite/default.nix index f58da984f8c9..4ea41cf68a76 100644 --- a/pkgs/development/python-modules/python-didl-lite/default.nix +++ b/pkgs/development/python-modules/python-didl-lite/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { defusedxml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-docx/default.nix b/pkgs/development/python-modules/python-docx/default.nix index fd22adc37744..36146bbe05e3 100644 --- a/pkgs/development/python-modules/python-docx/default.nix +++ b/pkgs/development/python-modules/python-docx/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1105d233a0956dd8dd1e710d20b159e2d72ac3c301041b95f4d4ceb3e0ebebc4"; }; - checkInputs = [ behave mock pyparsing pytest ]; + nativeCheckInputs = [ behave mock pyparsing pytest ]; propagatedBuildInputs = [ lxml ]; checkPhase = '' diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index 85e5034d6ebc..8038faf2eee5 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - checkInputs = [ + nativeCheckInputs = [ ipython mock pytestCheckHook diff --git a/pkgs/development/python-modules/python-ecobee-api/default.nix b/pkgs/development/python-modules/python-ecobee-api/default.nix index d1769806e283..e287d7490b99 100644 --- a/pkgs/development/python-modules/python-ecobee-api/default.nix +++ b/pkgs/development/python-modules/python-ecobee-api/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "python-ecobee-api"; - version = "0.2.15"; + version = "0.2.16"; src = fetchPypi { inherit pname version; - sha256 = "91929b0dda6acc2af6661d0fb539eb6375323d7529d3d64b67915efb1dc1a6ca"; + hash = "sha256-wzL1WylQAFLxWu3lDFqQtLxJbQjse4OX/fbzaaEuvGQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index c9b344e5acf9..f1a079d5896e 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , eventlet , fetchFromGitHub +, fetchpatch , iana-etc , libredirect , mock @@ -24,11 +25,20 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; - rev = "v${version}"; - sha256 = "sha256-fymO9WqkYaRsHKCJHQJpySHqZor2t8BfVrfYUfYoJno="; + rev = "refs/tags/v${version}"; + hash = "sha256-fymO9WqkYaRsHKCJHQJpySHqZor2t8BfVrfYUfYoJno="; }; - checkInputs = [ + patches = [ + # Address Python 3.11 mocking issue, https://github.com/miguelgrinberg/python-engineio/issues/279 + (fetchpatch { + name = "mocking-issue-py311.patch"; + url = "https://github.com/miguelgrinberg/python-engineio/commit/ac3911356fbe933afa7c11d56141f0e228c01528.patch"; + hash = "sha256-LNMhjX8kqOI3y8XugCHxCPEC6lF83NROfIczXWiLuqY="; + }) + ]; + + nativeCheckInputs = [ aiohttp eventlet mock @@ -66,6 +76,7 @@ buildPythonPackage rec { bidirectional event-based communication between clients and a server. ''; homepage = "https://github.com/miguelgrinberg/python-engineio/"; + changelog = "https://github.com/miguelgrinberg/python-engineio/blob/v${version}/CHANGES.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/python-forecastio/default.nix b/pkgs/development/python-modules/python-forecastio/default.nix index 991ec3279dec..4117c5adf241 100644 --- a/pkgs/development/python-modules/python-forecastio/default.nix +++ b/pkgs/development/python-modules/python-forecastio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; propagatedBuildInputs = [ requests responses ]; diff --git a/pkgs/development/python-modules/python-frontmatter/default.nix b/pkgs/development/python-modules/python-frontmatter/default.nix index e00ef7d9deeb..1019b058e11e 100644 --- a/pkgs/development/python-modules/python-frontmatter/default.nix +++ b/pkgs/development/python-modules/python-frontmatter/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { # tries to import test.test, which conflicts with module # exported by python interpreter doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index 92c6c03eb992..fedf919c7ea8 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.7.0"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,14 +17,14 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2T2C2bIOAdxppZxqI+QGE2R/+46LoqB7eNdlt4sVAd8="; + hash = "sha256-bHnCa7laDYi424czCGCPZuomqEOAeihjDTTW35ZTiac="; }; propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module with file-system utilities"; homepage = "https://github.com/fabiocaccamo/python-fsutil"; + changelog = "https://github.com/fabiocaccamo/python-fsutil/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-fullykiosk/default.nix b/pkgs/development/python-modules/python-fullykiosk/default.nix index 2cb8f1f8144a..d1931f82f310 100644 --- a/pkgs/development/python-modules/python-fullykiosk/default.nix +++ b/pkgs/development/python-modules/python-fullykiosk/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "python-fullykiosk"; - version = "0.0.11"; + version = "0.0.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "cgarwood"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Fndf9OOy3JLVTzHwfRzYrF/Khuhf9BMT6I+ze375p70="; + hash = "sha256-88PsJ1qAlOpxDtZyQe8pFC2Y3ygg3boiPxmYad58Fm8="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Wrapper for Fully Kiosk Browser REST interface"; homepage = "https://github.com/cgarwood/python-fullykiosk"; + changelog = "https://github.com/cgarwood/python-fullykiosk/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-gammu/default.nix b/pkgs/development/python-modules/python-gammu/default.nix index ec8d5841bafd..23ad1ac8b548 100644 --- a/pkgs/development/python-modules/python-gammu/default.nix +++ b/pkgs/development/python-modules/python-gammu/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ]; # Check with the next release if tests could be run with pytest - # checkInputs = [ pytestCheckHook ]; + # nativeCheckInputs = [ pytestCheckHook ]; # Don't run tests for now doCheck = false; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 63cfb7c38846..55e11d49d1d1 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.11.0"; + version = "3.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-25Rytq5PupaLQJ3DL67iDdZQiQZdqpPgjSG3lqZdZXg="; + hash = "sha256-rVArcrXRE39K831KaK4g/n1sl3j2fL4q7FZveZUFPH0="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Interact with GitLab API"; homepage = "https://github.com/python-gitlab/python-gitlab"; + changelog = "https://github.com/python-gitlab/python-gitlab/blob/v${version}/CHANGELOG.md"; license = licenses.lgpl3Only; maintainers = with maintainers; [ nyanloutre ]; }; diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix index 390aad8b55cd..2c55dce69e11 100644 --- a/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/pkgs/development/python-modules/python-glanceclient/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "python-glanceclient"; - version = "4.1.0"; + version = "4.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-fknYBKZzCA6sThugNQT5+p+/hqv8vW6M2LMMpbT+7rY="; + hash = "sha256-+CmOh9Dr6Gx8MLkR1u/YNpScOxIO7OUIbJAio+omOpg="; }; postPatch = '' @@ -47,7 +47,7 @@ buildPythonPackage rec { pyopenssl ]; - checkInputs = [ + nativeCheckInputs = [ stestr testscenarios ddt diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index d1ae7b80bf23..1bf1431da11e 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index 0a7af2f40d81..5210bc79e72d 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { paramiko ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix index df1fc0dc4597..9756572223e6 100644 --- a/pkgs/development/python-modules/python-heatclient/default.nix +++ b/pkgs/development/python-modules/python-heatclient/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ stestr testscenarios requests-mock diff --git a/pkgs/development/python-modules/python-hglib/default.nix b/pkgs/development/python-modules/python-hglib/default.nix index aa47f9a3319b..41f25d8f7093 100644 --- a/pkgs/development/python-modules/python-hglib/default.nix +++ b/pkgs/development/python-modules/python-hglib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-sYvR7VPJDuV9VxTWata7crZOkw1K7KmDCJLAi7KNpgg="; }; - checkInputs = [ mercurial nose ]; + nativeCheckInputs = [ mercurial nose ]; preCheck = '' export HGTMP=$(mktemp -d) diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix index a52535673a6c..b7eaa9f3e6ce 100644 --- a/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "1.2.0"; + version = "1.8.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-tFIqlPeRMB0Q9XpA5zBBzjo0Dw2bhnYdJsXvl0A04vY="; + hash = "sha256-ab+Fa7Dc2mHGy5C5PfoBfXIb/eugCyGrWjTYlJmTQE0="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix index 4eca7cca13fc..1a9757dfc2c8 100644 --- a/pkgs/development/python-modules/python-hosts/default.nix +++ b/pkgs/development/python-modules/python-hosts/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { substituteInPlace python_hosts/utils.py --replace "import win_inet_pton" "" ''; - checkInputs = [ pyyaml pytest pytest-cov ]; + nativeCheckInputs = [ pyyaml pytest pytest-cov ]; # Removing 1 test file (it requires internet connection) and keeping the other two checkPhase = '' diff --git a/pkgs/development/python-modules/python-http-client/default.nix b/pkgs/development/python-modules/python-http-client/default.nix index 78a3b018c7ea..2223a5db9340 100644 --- a/pkgs/development/python-modules/python-http-client/default.nix +++ b/pkgs/development/python-modules/python-http-client/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { - pname = "python_http_client"; + pname = "python-http-client"; version = "3.3.7"; format = "setuptools"; @@ -20,11 +20,16 @@ buildPythonPackage rec { sha256 = "sha256-8Qs5Jw0LMV2UucLnlFKJQ2PUhYaQx6uJdIV/4gaPH3w="; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; + disabledTests = [ + # checks date in license file and subsequently fails after new years + "test_daterange" + ]; + pythonImportsCheck = [ "python_http_client" ]; diff --git a/pkgs/development/python-modules/python-i18n/default.nix b/pkgs/development/python-modules/python-i18n/default.nix index 8e7f8f880e2a..d12d8b841344 100644 --- a/pkgs/development/python-modules/python-i18n/default.nix +++ b/pkgs/development/python-modules/python-i18n/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "6FahoHZqaOWYGaT9RqLARCm2kLfUIlYuauB6+0eX7jA="; }; - checkInputs = [ pytestCheckHook pyyaml ]; + nativeCheckInputs = [ pytestCheckHook pyyaml ]; pytestFlagsArray = [ "i18n/tests/run_tests.py" ]; diff --git a/pkgs/development/python-modules/python-ipmi/default.nix b/pkgs/development/python-modules/python-ipmi/default.nix index cbd68f387656..9ee03dc8911c 100644 --- a/pkgs/development/python-modules/python-ipmi/default.nix +++ b/pkgs/development/python-modules/python-ipmi/default.nix @@ -10,21 +10,21 @@ buildPythonPackage rec { pname = "python-ipmi"; - version = "0.5.2"; + version = "0.5.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kontron"; repo = pname; rev = version; - sha256 = "sha256-VXWSoVRfgJWf9rOT4SE1mTJdeNmzR3TRc2pc6Pp1M5U="; + sha256 = "sha256-Y8HJ7MXYHJRUWPTcw8p+GGSFswuRI7u+/bIaJpKy7lY="; }; propagatedBuildInputs = [ future ]; - checkInputs = [ + nativeCheckInputs = [ mock nose pytestCheckHook diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index bf41e95739e9..0214a6b0d2e4 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { stevedore ]; - checkInputs = [ + nativeCheckInputs = [ stestr requests-mock oslotest diff --git a/pkgs/development/python-modules/python-izone/default.nix b/pkgs/development/python-modules/python-izone/default.nix index b4dac08811cb..19dbbf733dc6 100644 --- a/pkgs/development/python-modules/python-izone/default.nix +++ b/pkgs/development/python-modules/python-izone/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { netifaces ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aio pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index dad933966aea..863ab45ed548 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { buildInputs = [ mock ]; propagatedBuildInputs = [ pbr pyyaml setuptools six multi_key_dict requests ]; - checkInputs = [ stestr testscenarios requests-mock ]; + nativeCheckInputs = [ stestr testscenarios requests-mock ]; checkPhase = '' stestr run ''; diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 5ba5d9c8ddc0..dd3d56c6c3eb 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { rsa ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix index 33b414018182..b49d8df61acc 100644 --- a/pkgs/development/python-modules/python-json-logger/default.nix +++ b/pkgs/development/python-modules/python-json-logger/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-dk12IXX5n8xGML1IU7CWMqy2CmIkrLJ84IzXDwsbgb0="; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = with lib; { homepage = "https://github.com/madzak/python-json-logger"; diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index a8cbec25a996..d60c1edcf967 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sed -i "s/version=versioneer.get_version(),/version=\"$version\",/g" setup.py ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock pytest-cov coverage ]; diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 7f55dd64b94e..36cf7d737a5d 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/python-keystoneclient/default.nix b/pkgs/development/python-modules/python-keystoneclient/default.nix index 55fb3fff3182..f92816afc7bd 100644 --- a/pkgs/development/python-modules/python-keystoneclient/default.nix +++ b/pkgs/development/python-modules/python-keystoneclient/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pbr ]; - checkInputs = [ + nativeCheckInputs = [ openssl requests-mock stestr diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix index f8844c5eaec7..db9565607a66 100644 --- a/pkgs/development/python-modules/python-ldap/default.nix +++ b/pkgs/development/python-modules/python-ldap/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pyasn1-modules ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-levenshtein/default.nix b/pkgs/development/python-modules/python-levenshtein/default.nix deleted file mode 100644 index 9795c27d9901..000000000000 --- a/pkgs/development/python-modules/python-levenshtein/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "python-levenshtein"; - version = "0.12.2"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "dc2395fbd148a1ab31090dd113c366695934b9e85fe5a4b2a032745efd0346f6"; - }; - - # No tests included in archive - doCheck = false; - - pythonImportsCheck = [ - "Levenshtein" - ]; - - meta = with lib; { - description = "Functions for fast computation of Levenshtein distance and string similarity"; - homepage = "https://github.com/ztane/python-Levenshtein"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ aske ]; - }; -} diff --git a/pkgs/development/python-modules/python-louvain/default.nix b/pkgs/development/python-modules/python-louvain/default.nix index 699fc97f58e2..36c973db74db 100644 --- a/pkgs/development/python-modules/python-louvain/default.nix +++ b/pkgs/development/python-modules/python-louvain/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "community" ]; - checkInputs = [ pandas scipy ]; + nativeCheckInputs = [ pandas scipy ]; meta = with lib; { homepage = "https://github.com/taynaud/python-louvain"; diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix index ee66ea262c63..86a6995f0570 100644 --- a/pkgs/development/python-modules/python-lsp-black/default.nix +++ b/pkgs/development/python-modules/python-lsp-black/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-qNA6Bj1VI0YEtRuvcMQZGWakQNNrJ2PqhozrLmQHPAg="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ black python-lsp-server toml ]; diff --git a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix index 6938bc282f88..d45febae139c 100644 --- a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix +++ b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ujson ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index ec65059f54df..a026eb15fa27 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -18,11 +18,13 @@ , pylint , pyqt5 , pytestCheckHook +, pythonRelaxDepsHook , python-lsp-jsonrpc , pythonOlder , rope , setuptools , setuptools-scm +, toml , ujson , websockets , whatthepatch @@ -31,7 +33,7 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.6.0"; + version = "1.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -40,7 +42,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-1LV8FcwQqUg+FIkrorBYlxMl4F1PkrrOWjD5M0JSp3Q="; + hash = "sha256-Rx8mHBmJw4gh0FtQBVMmOlQklODplrhnWwzsEhQm4NE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -48,15 +50,20 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ - --replace "--cov pylsp --cov test" "" \ - --replace "autopep8>=1.6.0,<1.7.0" "autopep8" \ - --replace "flake8>=5.0.0,<5.1.0" "flake8" \ - --replace "mccabe>=0.7.0,<0.8.0" "mccabe" \ - --replace "pycodestyle>=2.9.0,<2.10.0" "pycodestyle" \ - --replace "pyflakes>=2.5.0,<2.6.0" "pyflakes" + --replace "--cov pylsp --cov test" "" ''; + pythonRelaxDeps = [ + "autopep8" + "flake8" + "mccabe" + "pycodestyle" + "pydocstyle" + "pyflakes" + ]; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools-scm ]; @@ -79,6 +86,7 @@ buildPythonPackage rec { pyflakes pylint rope + toml whatthepatch yapf ]; @@ -115,7 +123,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ flaky matplotlib numpy @@ -128,10 +136,12 @@ buildPythonPackage rec { ]; disabledTests = [ + # Don't run lint tests + "test_pydocstyle" # https://github.com/python-lsp/python-lsp-server/issues/243 "test_numpy_completions" "test_workspace_loads_pycodestyle_config" - ] ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # pyqt5 is broken on aarch64-darwin "test_pyqt_completion" ]; @@ -148,6 +158,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the Language Server Protocol"; homepage = "https://github.com/python-lsp/python-lsp-server"; + changelog = "https://github.com/python-lsp/python-lsp-server/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-lzo/default.nix b/pkgs/development/python-modules/python-lzo/default.nix index dcf55e8e32b0..38a31fbb6cb6 100644 --- a/pkgs/development/python-modules/python-lzo/default.nix +++ b/pkgs/development/python-modules/python-lzo/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { buildInputs = [ lzo ]; propagatedBuildInputs = [ ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = with lib; { homepage = "https://github.com/jd-boyd/python-lzo"; diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 3338fb6fa7d0..725849fee078 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { export LC_ALL=en_US.UTF-8 ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index 301ce42f0c77..4e10af5b40d3 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -18,17 +18,16 @@ , python-keystoneclient , debtcollector , callPackage -, pythonOlder }: buildPythonPackage rec { pname = "python-manilaclient"; - version = "4.1.0"; + version = "4.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-yoyQyhyqRQZ8yyn3sv94JqkVZQMybwxLGFForZowr3o="; + hash = "sha256-Hf/U3LFcIsT00lIzvvZaowfMth/zj5WY6UAxYWjC1JA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-manilaclient/tests.nix b/pkgs/development/python-modules/python-manilaclient/tests.nix index 61615456225a..37357d779b16 100644 --- a/pkgs/development/python-modules/python-manilaclient/tests.nix +++ b/pkgs/development/python-modules/python-manilaclient/tests.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ python-manilaclient stestr ddt diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 3e7b70463245..4716177f51ce 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -90,7 +90,7 @@ buildPythonPackage rec { export XMLPARSER=libxml2 ''; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-markdown-math/default.nix b/pkgs/development/python-modules/python-markdown-math/default.nix index 0b6d01746b97..959448d2ea22 100644 --- a/pkgs/development/python-modules/python-markdown-math/default.nix +++ b/pkgs/development/python-modules/python-markdown-math/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "8564212af679fc18d53f38681f16080fcd3d186073f23825c7ce86fadd3e3635"; }; - checkInputs = [ markdown ]; + nativeCheckInputs = [ markdown ]; meta = { description = "Math extension for Python-Markdown"; diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix new file mode 100644 index 000000000000..d7dfee08633a --- /dev/null +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -0,0 +1,86 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build +, setuptools + +# propagates +, aiohttp +, aiorun +, coloredlogs +, dacite +, orjson +, home-assistant-chip-clusters + +# optionals +, home-assistant-chip-core + +# tests +, python +, pytest +, pytest-aiohttp +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-matter-server"; + version = "2.0.2"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "python-matter-server"; + rev = "refs/tags/${version}"; + hash = "sha256-9Lb5Q54hPdyqMjrHvwBzVXPk8uKBLNRUl2Bljo64Fpo="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + aiorun + coloredlogs + dacite + orjson + home-assistant-chip-clusters + ]; + + passthru.optional-dependencies = { + server = [ + home-assistant-chip-core + ]; + }; + + nativeCheckInputs = [ + pytest-aiohttp + pytestCheckHook + ] + ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + preCheck = let + pythonEnv = python.withPackages (_: propagatedBuildInputs ++ nativeCheckInputs ++ [ pytest ]); + in + '' + export PYTHONPATH=${pythonEnv}/${python.sitePackages} + ''; + + pytestFlagsArray = [ + # Upstream theymselves limit the test scope + # https://github.com/home-assistant-libs/python-matter-server/blob/main/.github/workflows/test.yml#L65 + "tests/server" + ]; + + meta = with lib; { + changelog = "https://github.com/home-assistant-libs/python-matter-server/releases/tag/${version}"; + description = "Python server to interact with Matter"; + homepage = "https://github.com/home-assistant-libs/python-matter-server"; + license = licenses.asl20; + maintainers = teams.home-assistant.members; + }; +} diff --git a/pkgs/development/python-modules/python-memcached/default.nix b/pkgs/development/python-modules/python-memcached/default.nix index 1f69062a64e9..180e70f1c1d3 100644 --- a/pkgs/development/python-modules/python-memcached/default.nix +++ b/pkgs/development/python-modules/python-memcached/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 32d5d542c30a..1d900d3d7fd8 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -9,10 +9,12 @@ , cryptography , defusedxml , fetchPypi +, fetchpatch , importlib-metadata , micloud , netifaces , poetry-core +, pytest-asyncio , pytest-mock , pytestCheckHook , pythonOlder @@ -39,6 +41,14 @@ buildPythonPackage rec { poetry-core ]; + patches = [ + (fetchpatch { + # Fix pytest 7.2 compat + url = "https://github.com/rytilahti/python-miio/commit/67d9d771d04d51f5bd97f361ca1c15ae4a18c274.patch"; + hash = "sha256-Os9vCSKyieCqHs63oX6gcLrtv1N7hbX5WvEurelEp8w="; + }) + ]; + propagatedBuildInputs = [ android-backup appdirs @@ -58,19 +68,12 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ + pytest-asyncio pytest-mock pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'defusedxml = "^0"' 'defusedxml = "*"' - # Will be fixed with the next release, https://github.com/rytilahti/python-miio/pull/1378 - substituteInPlace miio/integrations/vacuum/roborock/vacuum_cli.py \ - --replace "resultcallback" "result_callback" - ''; - pythonImportsCheck = [ "miio" ]; diff --git a/pkgs/development/python-modules/python-mimeparse/default.nix b/pkgs/development/python-modules/python-mimeparse/default.nix index ab91a5d5e2e5..e5aa879136b1 100644 --- a/pkgs/development/python-modules/python-mimeparse/default.nix +++ b/pkgs/development/python-modules/python-mimeparse/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix index 3bf07bd1d509..edf3db11d5d0 100644 --- a/pkgs/development/python-modules/python-multipart/default.nix +++ b/pkgs/development/python-modules/python-multipart/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { --replace "yaml.load" "yaml.safe_load" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock pyyaml diff --git a/pkgs/development/python-modules/python-mystrom/default.nix b/pkgs/development/python-modules/python-mystrom/default.nix index ccda98b2eb1a..4f3a39d5b78d 100644 --- a/pkgs/development/python-modules/python-mystrom/default.nix +++ b/pkgs/development/python-modules/python-mystrom/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "python-mystrom"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "050dkx29wrmdd8z7pmyk36k2ihpapqi4qmyb70bm6xl5l4jh4k7j"; + sha256 = "sha256-Kqv5rUdwkynOzssID77gVYyzs0CDR/bUWh6zpt5zOP8="; }; propagatedBuildInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { There is support for bulbs, motion sensors, plugs and buttons. ''; homepage = "https://github.com/home-assistant-ecosystem/python-mystrom"; + changelog = "https://github.com/home-assistant-ecosystem/python-mystrom/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-nomad/default.nix b/pkgs/development/python-modules/python-nomad/default.nix index 6d6c5c90fdfe..ffd93a2e28f0 100644 --- a/pkgs/development/python-modules/python-nomad/default.nix +++ b/pkgs/development/python-modules/python-nomad/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-nomad"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "087a7d5d2af9fd8ce5da70d29e4b456c6b8b0ea3cd16613ed50f6eb8ad6cdba6"; + sha256 = "sha256-VpngJvm9eK60lPeFIbjnTwzWWoJ9tRBDYP5SghDMbAg="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix index 5ae75098ddd3..6731aa873b53 100644 --- a/pkgs/development/python-modules/python-novaclient/default.nix +++ b/pkgs/development/python-modules/python-novaclient/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "python-novaclient"; - version = "18.1.0"; + version = "18.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-eCBVnRZfGk2BDn2nyV+IQl2L5JX20aPG9CA7isGH4lQ="; + hash = "sha256-GFu/LK+189dh8nLj4YSnAMx7pc99UWGQZb5/XEtbfPQ="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { prettytable ]; - checkInputs = [ + nativeCheckInputs = [ ddt openssl requests-mock diff --git a/pkgs/development/python-modules/python-nvd3/default.nix b/pkgs/development/python-modules/python-nvd3/default.nix index d4ecba5a4d95..6ad6b6d56de0 100644 --- a/pkgs/development/python-modules/python-nvd3/default.nix +++ b/pkgs/development/python-modules/python-nvd3/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ python-slugify jinja2 setuptools ]; - checkInputs = [ coverage ]; + nativeCheckInputs = [ coverage ]; checkPhase = '' coverage run --source=nvd3 setup.py test diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 3500e88e57ad..6a9e24a9f8d8 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { installManPage doc/build/man/openstack.1 ''; - checkInputs = [ + nativeCheckInputs = [ ddt stestr requests-mock diff --git a/pkgs/development/python-modules/python-openzwave-mqtt/default.nix b/pkgs/development/python-modules/python-openzwave-mqtt/default.nix index a2c76c7d6d54..68b51fc2fb3d 100644 --- a/pkgs/development/python-modules/python-openzwave-mqtt/default.nix +++ b/pkgs/development/python-modules/python-openzwave-mqtt/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { asyncio-mqtt ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-osc/default.nix b/pkgs/development/python-modules/python-osc/default.nix index ade67876ea0c..8c6fc7cc3d54 100644 --- a/pkgs/development/python-modules/python-osc/default.nix +++ b/pkgs/development/python-modules/python-osc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "python-osc"; - version = "1.8.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "2f8c187c68d239960fb2eddcb5346a62a9b35e64f2de045b3e5e509f475ca73d"; + sha256 = "sha256-69a3z4rjhzgPSOnW1zabrRwXahr2YI79eIi1C08OdK0="; }; pythonImportsCheck = [ "pythonosc" ]; diff --git a/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix b/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix index 6bb111a07e91..ad8117b996bf 100644 --- a/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix +++ b/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pyhamcrest pytestCheckHook requests-mock diff --git a/pkgs/development/python-modules/python-pae/default.nix b/pkgs/development/python-modules/python-pae/default.nix index 067d2a2843e6..92c7bd2cfb3e 100644 --- a/pkgs/development/python-modules/python-pae/default.nix +++ b/pkgs/development/python-modules/python-pae/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-prctl/default.nix b/pkgs/development/python-modules/python-prctl/default.nix index dc967b54305c..05b73e43a859 100644 --- a/pkgs/development/python-modules/python-prctl/default.nix +++ b/pkgs/development/python-modules/python-prctl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { buildInputs = [ libcap ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Intel MPX support was removed in GCC 9.1 & Linux kernel 5.6 diff --git a/pkgs/development/python-modules/python-rabbitair/default.nix b/pkgs/development/python-modules/python-rabbitair/default.nix index 6578a0777525..28c0ab9f4e56 100644 --- a/pkgs/development/python-modules/python-rabbitair/default.nix +++ b/pkgs/development/python-modules/python-rabbitair/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 1d8456df5fd0..f2cd6d285b75 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -25,6 +25,8 @@ let hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4="; }) ]; + # valgrind_unittest failed + cmakeFlags = old.cmakeFlags ++ [ "-DCMAKE_CTEST_ARGUMENTS=-E;valgrind_unittest" ]; }); in buildPythonPackage rec { version = "1.9"; @@ -40,7 +42,7 @@ in buildPythonPackage rec { "--rj-include-dir=${lib.getDev rapidjson'}/include" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytz ]; diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index 7671e5a4a9b2..103349f7b65f 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -1,28 +1,39 @@ { lib , stdenv , buildPythonPackage +, eventlet , fetchPypi -, redis -, pytestCheckHook -, process-tests +, gevent , pkgs -, withDjango ? false, django-redis +, process-tests +, pytestCheckHook +, pythonOlder +, redis +, withDjango ? false +, django-redis }: buildPythonPackage rec { pname = "python-redis-lock"; - version = "3.7.0"; + version = "4.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "4265a476e39d476a8acf5c2766485c44c75f3a1bd6cf73bb195f3079153b8374"; + hash = "sha256-Sr0Lz0kTasrWZye/VIbdJJQHjKVeSe+mk/eUB3MZCRo="; }; propagatedBuildInputs = [ redis - ] ++ lib.optional withDjango django-redis; + ] ++ lib.optional withDjango [ + django-redis + ]; - checkInputs = [ + nativeCheckInputs = [ + eventlet + gevent pytestCheckHook process-tests pkgs.redis @@ -37,10 +48,15 @@ buildPythonPackage rec { "test_reset_all_signalizes" ]; + pythonImportsCheck = [ + "redis_lock" + ]; + meta = with lib; { + changelog = "https://github.com/ionelmc/python-redis-lock/blob/v${version}/CHANGELOG.rst"; + description = "Lock context manager implemented via redis SETNX/BLPOP"; homepage = "https://github.com/ionelmc/python-redis-lock"; license = licenses.bsd2; - description = "Lock context manager implemented via redis SETNX/BLPOP"; maintainers = with maintainers; [ vanschelven ]; }; } diff --git a/pkgs/development/python-modules/python-registry/default.nix b/pkgs/development/python-modules/python-registry/default.nix index 8b24ca08ff8b..324afa93579e 100644 --- a/pkgs/development/python-modules/python-registry/default.nix +++ b/pkgs/development/python-modules/python-registry/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { unicodecsv ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook six ]; diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index 58d6a1e72f55..fbdc6d9a9c40 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { CoreMIDI CoreServices ]; - checkInputs = [ + nativeCheckInputs = [ tox flake8 alabaster diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix index 43b5e635294b..bcffe6f865c1 100644 --- a/pkgs/development/python-modules/python-sat/default.nix +++ b/pkgs/development/python-modules/python-sat/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six pypblib ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # https://github.com/pysathq/pysat/pull/102 postPatch = '' diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 5f985f0fafdd..ce10278fb45c 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { unidecode ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index dba19a2ee627..91a1ccb7e48b 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/python-snap7/default.nix b/pkgs/development/python-modules/python-snap7/default.nix index 8322d1c4d379..069b57bd8c89 100644 --- a/pkgs/development/python-modules/python-snap7/default.nix +++ b/pkgs/development/python-modules/python-snap7/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-snap7"; - version = "1.2"; + version = "1.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "gijzelaerr"; repo = "python-snap7"; rev = "refs/tags/${version}"; - hash = "sha256-xkkJE3wTqS6spwEmQ+HBY1Szao1VFoqmQ041vnAYuqQ="; + hash = "sha256-90WwgqPHsHbuQUY49cSQblN1jfoLydiG0dm1aMF/NCA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix index d75c80d5e415..28c06ea3d04d 100644 --- a/pkgs/development/python-modules/python-snappy/default.nix +++ b/pkgs/development/python-modules/python-snappy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional isPyPy cffi; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "Python library for the snappy compression library from Google"; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index a6b2bc0d247a..7dd424820c23 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.7.1"; + version = "5.7.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,18 +23,25 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "sha256-KVaBSBWLeFJYiNJYTwoExExUmUaeNJ40c/WTgTc2Y/w="; + hash = "sha256-mSFs/k+3Lp5w4WdOLKj65kOA5b+Nc1uuksVmeeqV58E="; }; propagatedBuildInputs = [ - aiohttp bidict python-engineio - requests - websocket-client ]; - checkInputs = [ + passthru.optional-dependencies = { + client = [ + requests + websocket-client + ]; + asyncio_client = [ + aiohttp + ]; + }; + + nativeCheckInputs = [ mock msgpack pytestCheckHook @@ -51,6 +58,7 @@ buildPythonPackage rec { bidirectional event-based communication between clients and a server. ''; homepage = "https://github.com/miguelgrinberg/python-socketio/"; + changelog = "https://github.com/miguelgrinberg/python-socketio/blob/v${version}/CHANGES.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index b0d0fbd36616..4cb8273b78bc 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -3,29 +3,31 @@ , buildPythonPackage , curio , fetchFromGitHub +, anyio , flask , pytest-asyncio , pytest-trio , pythonOlder , pytestCheckHook , trio +, trustme , yarl }: buildPythonPackage rec { pname = "python-socks"; - version = "2.0.3"; + version = "2.1.1"; format = "setuptools"; - disabled = pythonOlder "3.6.1"; + disabled = pythonOlder "3.6.2"; __darwinAllowLocalNetworking = true; src = fetchFromGitHub { owner = "romis2012"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-tVoBon9HF9MTOK+dN9g58fQO706ElNlCeULx//7hPWA="; + repo = "python-socks"; + rev = "refs/tags/v${version}"; + hash = "sha256-QvUuCS8B/6+dgzWrflizLfNlAUeOPpUPtmFaE6LGYGc="; }; propagatedBuildInputs = [ @@ -34,11 +36,15 @@ buildPythonPackage rec { async-timeout ]; - checkInputs = [ + doCheck = false; # requires tiny_proxy module + + nativeCheckInputs = [ + anyio flask pytest-asyncio pytest-trio pytestCheckHook + trustme yarl ]; @@ -47,6 +53,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/romis2012/python-socks/releases/tag/v${version}"; description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python"; homepage = "https://github.com/romis2012/python-socks"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index 91012839d053..58a5cd625fc4 100644 --- a/pkgs/development/python-modules/python-sql/default.nix +++ b/pkgs/development/python-modules/python-sql/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-b+dkCC9IiR2Ffqfm+kJfpU8TUx3fa4nyTAmOZGrRtLY="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 51ac732b1729..19142bc13fb8 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -3,24 +3,36 @@ , fetchPypi , pytestCheckHook , pythonOlder +, zeep }: buildPythonPackage rec { pname = "python-stdnum"; - version = "1.17"; + version = "1.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N04rXhORLM2/ULCyP8osPgUxF0gFwy104UXzd1Yyg0A="; + hash = "sha256-vMdj2cSa4j2l0remhtX9He7J2QUTQRYKENGscjomvsA="; }; - checkInputs = [ + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=stdnum --cov-report=term-missing:skip-covered --cov-report=html" "" + ''; + + nativeCheckInputs = [ pytestCheckHook ]; + passthru.optional-dependencies = { + SOAP = [ + zeep + ]; + }; + pythonImportsCheck = [ "stdnum" ]; @@ -28,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to handle standardized numbers and codes"; homepage = "https://arthurdejong.org/python-stdnum/"; + changelog = "https://github.com/arthurdejong/python-stdnum/blob/${version}/ChangeLog"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ johbo ]; }; diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix index f5a15a34f0ca..318b6c5f6f84 100644 --- a/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/pkgs/development/python-modules/python-swiftclient/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { python-keystoneclient ]; - checkInputs = [ + nativeCheckInputs = [ mock openstacksdk stestr diff --git a/pkgs/development/python-modules/python-tado/default.nix b/pkgs/development/python-modules/python-tado/default.nix index 7172b0574fdb..4aa201469a3e 100644 --- a/pkgs/development/python-modules/python-tado/default.nix +++ b/pkgs/development/python-modules/python-tado/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ requests ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 47d716d1c868..d87ba9f7610d 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -1,60 +1,124 @@ { lib +, aiolimiter , APScheduler +, beautifulsoup4 , buildPythonPackage , cachetools -, certifi -, decorator -, fetchPypi -, future -, tornado -, urllib3 +, cryptography +, fetchFromGitHub +, flaky +, httpx +, pytest-asyncio +, pytest-timeout +, pytest-xdist +, pytestCheckHook , pythonOlder +, pytz +, tornado }: buildPythonPackage rec { pname = "python-telegram-bot"; - version = "13.14"; + version = "20.0"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-6TkdQ+sRI94md6nSTqh4qdUyfWWyQZr7plP0dtJq7MM="; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-34Apzy7id+fDxTN935hPT0HeZNZMEdQqZ0aiV0trAxE="; }; propagatedBuildInputs = [ + aiolimiter APScheduler cachetools - certifi - decorator - future + cryptography + httpx + pytz + ] ++ httpx.optional-dependencies.socks; + + nativeCheckInputs = [ + beautifulsoup4 + flaky + pytest-asyncio + pytest-timeout + pytest-xdist + pytestCheckHook tornado - urllib3 ]; - # --with-upstream-urllib3 is not working properly - postPatch = '' - rm -r telegram/vendor - - substituteInPlace requirements.txt \ - --replace "APScheduler==3.6.3" "APScheduler" \ - --replace "cachetools==4.2.2" "cachetools" \ - --replace "tornado==6.1" "tornado" - ''; - - setupPyGlobalFlags = [ "--with-upstream-urllib3" ]; - - # tests not included with release - doCheck = false; - pythonImportsCheck = [ "telegram" ]; + disabledTests = [ + # Tests require network access + "TestAIO" + "TestAnimation" + "TestApplication" + "TestAudio" + "TestBase" + "TestBot" + "TestCallback" + "TestChat" + "TestChosenInlineResult" + "TestCommandHandler" + "TestConstants" + "TestContact" + "TestConversationHandler" + "TestDice" + "TestDict" + "TestDocument" + "TestFile" + "TestForceReply" + "TestForum" + "TestGame" + "TestGet" + "TestHTTP" + "TestInline" + "TestInput" + "TestInvoice" + "TestJob" + "TestKeyboard" + "TestLocation" + "TestMask" + "TestMenu" + "TestMessage" + "TestMeta" + "TestOrder" + "TestPassport" + "TestPhoto" + "TestPickle" + "TestPoll" + "TestPre" + "TestPrefix" + "TestProximity" + "TestReply" + "TestRequest" + "TestSend" + "TestSent" + "TestShipping" + "TestSlot" + "TestSticker" + "TestString" + "TestSuccess" + "TestTelegram" + "TestType" + "TestUpdate" + "TestUser" + "TestVenue" + "TestVideo" + "TestVoice" + "TestWeb" + ]; + meta = with lib; { description = "Python library to interface with the Telegram Bot API"; homepage = "https://python-telegram-bot.org"; + changelog = "https://github.com/python-telegram-bot/python-telegram-bot/blob/v${version}/CHANGES.rst"; license = licenses.lgpl3Only; maintainers = with maintainers; [ veprbl pingiun ]; }; diff --git a/pkgs/development/python-modules/python-toolbox/default.nix b/pkgs/development/python-modules/python-toolbox/default.nix index a310736c7492..bd975092ae9a 100644 --- a/pkgs/development/python-modules/python-toolbox/default.nix +++ b/pkgs/development/python-modules/python-toolbox/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1hpls1hwisdjx1g15cq052bdn9fvh43r120llws8bvgvj9ivnaha"; }; - checkInputs = [ + nativeCheckInputs = [ docutils pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-twitch-client/default.nix b/pkgs/development/python-modules/python-twitch-client/default.nix index 30f6ab9a0a71..b069de34c3f4 100644 --- a/pkgs/development/python-modules/python-twitch-client/default.nix +++ b/pkgs/development/python-modules/python-twitch-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/pkgs/development/python-modules/python-twitter/default.nix b/pkgs/development/python-modules/python-twitter/default.nix index 79d262a8b02a..646cdaa18e46 100644 --- a/pkgs/development/python-modules/python-twitter/default.nix +++ b/pkgs/development/python-modules/python-twitter/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses hypothesis diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 40e963763f02..5a5ac9f772a6 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { postPatch = '' sed -i '/--cov/d' pytest.ini + sed -i '/--mypy/d' pytest.ini ''; passthru.optional-dependencies = { @@ -32,7 +33,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mypy pytestCheckHook @@ -49,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module with some convenient utilities"; homepage = "https://github.com/WoLpH/python-utils"; + changelog = "https://github.com/wolph/python-utils/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix index c3d51ae59119..58bf890921c1 100644 --- a/pkgs/development/python-modules/python-vipaccess/default.nix +++ b/pkgs/development/python-modules/python-vipaccess/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "python-vipaccess"; - version = "0.14"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "d5013d306e5891ecfe523c9ef52d074fe8b6ca29ee259c0deeb8a83ae9884ce0"; + sha256 = "sha256-vBFCRXwZ91C48GuOet2Obbo7gM02M2c9+7rhp0l6w54="; }; propagatedBuildInputs = [ @@ -22,7 +22,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # test_check_token_detects_valid_hotp_token, # test_check_token_detects_valid_totp_token and # test_check_token_detects_invlaid_token require network diff --git a/pkgs/development/python-modules/python-vlc/default.nix b/pkgs/development/python-modules/python-vlc/default.nix index de14a4010b65..06a468b707e5 100644 --- a/pkgs/development/python-modules/python-vlc/default.nix +++ b/pkgs/development/python-modules/python-vlc/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "python-vlc"; - version = "3.0.16120"; + version = "3.0.18121"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kvmP7giPcr1tBjs7MxLQvSmzfnrWXd6zpzAzIDAMKAc="; + hash = "sha256-JFUDFKPm7VX9NHsAlJHJi4ZfnfoFqS6InXsKIhDnSFs="; }; patches = [ diff --git a/pkgs/development/python-modules/python-whois/default.nix b/pkgs/development/python-modules/python-whois/default.nix index dafbdfba4b4b..724884fe73b8 100644 --- a/pkgs/development/python-modules/python-whois/default.nix +++ b/pkgs/development/python-modules/python-whois/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ future ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook simplejson diff --git a/pkgs/development/python-modules/python-zbar/default.nix b/pkgs/development/python-modules/python-zbar/default.nix index 04e89b664c49..7ad125b26ef5 100644 --- a/pkgs/development/python-modules/python-zbar/default.nix +++ b/pkgs/development/python-modules/python-zbar/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { buildInputs = [ zbar ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; preBuild = '' cd python diff --git a/pkgs/development/python-modules/python3-saml/default.nix b/pkgs/development/python-modules/python3-saml/default.nix index dca35089f45f..7f39eca6ad48 100644 --- a/pkgs/development/python-modules/python3-saml/default.nix +++ b/pkgs/development/python-modules/python3-saml/default.nix @@ -1,33 +1,45 @@ -{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, -isodate, lxml, xmlsec, freezegun }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, freezegun +, isodate +, lxml +, pythonOlder +, xmlsec +}: buildPythonPackage rec { pname = "python3-saml"; - version = "1.14.0"; - disabled = !isPy3k; + version = "1.15.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "onelogin"; repo = "python3-saml"; - rev = "v${version}"; - sha256 = "sha256-TAfVXh1fSKhNn/lsi7elq4wFyKCxCtCYUTrnH3ytBTw="; + rev = "refs/tags/v${version}"; + hash = "sha256-xPPR2z3h8RpoAROpKpu9ZoDxGq5Stm9wQVt4Stj/6fg="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "lxml<4.7.1" "lxml<5" - ''; - propagatedBuildInputs = [ - isodate lxml xmlsec + isodate + lxml + xmlsec ]; - checkInputs = [ freezegun ]; - pythonImportsCheck = [ "onelogin.saml2" ]; + nativeCheckInputs = [ + freezegun + ]; + + pythonImportsCheck = [ + "onelogin.saml2" + ]; meta = with lib; { - description = "OneLogin's SAML Python Toolkit for Python 3"; + description = "OneLogin's SAML Python Toolkit"; homepage = "https://github.com/onelogin/python3-saml"; + changelog = "https://github.com/SAML-Toolkits/python3-saml/blob/v${version}/changelog.md"; license = licenses.mit; maintainers = with maintainers; [ zhaofengli ]; }; diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix index 6a5c6a304f14..7f4e6e2a4fd5 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python_fedora/default.nix @@ -1,22 +1,55 @@ -{ lib, buildPythonPackage, fetchPypi, kitchen, requests, bunch, paver -, six, munch, urllib3, beautifulsoup4, openidc-client, lockfile }: +{ lib +, beautifulsoup4 +, buildPythonPackage +, bunch +, fetchPypi +, kitchen +, lockfile +, munch +, openidc-client +, paver +, pythonOlder +, requests +, six +, urllib3 +}: buildPythonPackage rec { pname = "python-fedora"; version = "1.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "56b9d841a39b4030e388e90c7b77dacd479f1ce5e2ff9b18c3954d97d5709a19"; + hash = "sha256-VrnYQaObQDDjiOkMe3fazUefHOXi/5sYw5VNl9Vwmhk="; }; - propagatedBuildInputs = [ kitchen requests bunch paver lockfile - six munch urllib3 beautifulsoup4 openidc-client ]; + + propagatedBuildInputs = [ + beautifulsoup4 + bunch + kitchen + lockfile + munch + openidc-client + paver + requests + six + urllib3 + ]; + doCheck = false; + pythonImportsCheck = [ + "fedora" + ]; + meta = with lib; { - description = "Python Fedora Module"; + description = "Module to interact with the infrastructure of the Fedora Project"; homepage = "https://github.com/fedora-infra/python-fedora"; - license = licenses.lgpl2; + changelog = "https://github.com/fedora-infra/python-fedora/releases/tag/1.1.1"; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix index 6d005a22292a..54d7dabfe1a2 100644 --- a/pkgs/development/python-modules/pythonfinder/default.nix +++ b/pkgs/development/python-modules/pythonfinder/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-cov pytest-timeout @@ -44,7 +44,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "--no-cov" ]; # these tests invoke git in a subprocess and - # for some reason git can't be found even if included in checkInputs + # for some reason git can't be found even if included in nativeCheckInputs disabledTests = [ "test_shims_are_kept" "test_shims_are_removed" diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix index 5ccb664a83a7..1f4142b3245f 100644 --- a/pkgs/development/python-modules/pythonnet/default.nix +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { mono ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook psutil # needed for memory leak tests ]; diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 1bef56a01a40..da72cc0839af 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "pythonocc-core"; - version = "7.6.2"; + version = "7.7.0"; src = fetchFromGitHub { owner = "tpaviot"; repo = "pythonocc-core"; - rev = version; - sha256 = "sha256-45pqPQ07KYlpFwJSAYVHbzuqDQTbAvPpxReal52DCzU="; + rev = "refs/tags/${version}"; + sha256 = "sha256-YybpwiCeBnwZfYS6ZxUbycHFn2DlqYxcNMylRN5ihFM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 4583c883904c..3a595a2d301a 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -1,18 +1,20 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub , aiohttp , async-timeout +, buildPythonPackage +, fetchFromGitHub +, gql , graphql-subscription-manager -, python-dateutil , pytest-asyncio , pytestCheckHook +, python-dateutil +, pythonOlder +, pytz }: buildPythonPackage rec { pname = "pytibber"; - version = "0.25.6"; + version = "0.27.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,17 +23,18 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-aGl43gxrnKwo3ZhN+EpSBMZw0wKWf5aIPFx3goo8Nog="; + hash = "sha256-m4y65UiuiWRS7EBv6AFnX9Ia2eTy8H1vgfx+fQrcXz4="; }; propagatedBuildInputs = [ aiohttp async-timeout + gql graphql-subscription-manager python-dateutil - ]; + ] ++ gql.optional-dependencies.websockets; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; @@ -40,7 +43,7 @@ buildPythonPackage rec { "test/test.py" ]; - # tests access network + # Tests access network doCheck = false; pythonImportsCheck = [ @@ -50,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to communicate with Tibber"; homepage = "https://github.com/Danielhiversen/pyTibber"; + changelog = "https://github.com/Danielhiversen/pyTibber/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pytidylib/default.nix b/pkgs/development/python-modules/pytidylib/default.nix index 15280fff4b05..20aa6f817160 100644 --- a/pkgs/development/python-modules/pytidylib/default.nix +++ b/pkgs/development/python-modules/pytidylib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { $' @unittest.skip("")\n def test_large_document(self):' ''; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "Python wrapper for HTML Tidy (tidylib) on Python 2 and 3"; diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index e32a2176b166..95e8725540e7 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-aiohttp pytest-asyncio diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix index 3bf0ad078c59..257314860d50 100644 --- a/pkgs/development/python-modules/pytimeparse/default.nix +++ b/pkgs/development/python-modules/pytimeparse/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "e86136477be924d7e670646a98561957e8ca7308d44841e21f5ddea757556a0a"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = with lib; { description = "A small Python library to parse various kinds of time expressions"; diff --git a/pkgs/development/python-modules/pytmx/default.nix b/pkgs/development/python-modules/pytmx/default.nix index 0fa38a9a6311..177d255a13b5 100644 --- a/pkgs/development/python-modules/pytmx/default.nix +++ b/pkgs/development/python-modules/pytmx/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { "pytmx.util_pysdl2" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytoml/default.nix b/pkgs/development/python-modules/pytoml/default.nix index b13dfd07dadc..afa3e5244a05 100644 --- a/pkgs/development/python-modules/pytoml/default.nix +++ b/pkgs/development/python-modules/pytoml/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "02hjq44zhh6z0fsbm3hvz34sav6fic90sjrw8g1pkdvskzzl46mz"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' ${python.interpreter} test/test.py diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix index 73c1987fb3c9..f9782758f39a 100644 --- a/pkgs/development/python-modules/pytomlpp/default.nix +++ b/pkgs/development/python-modules/pytomlpp/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { buildInputs = [ pybind11 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook python-dateutil diff --git a/pkgs/development/python-modules/pytomorrowio/default.nix b/pkgs/development/python-modules/pytomorrowio/default.nix index 0b92b97fa5cf..7a6ab301279d 100644 --- a/pkgs/development/python-modules/pytomorrowio/default.nix +++ b/pkgs/development/python-modules/pytomorrowio/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix new file mode 100644 index 000000000000..8c49cc766d00 --- /dev/null +++ b/pkgs/development/python-modules/pytoolconfig/default.nix @@ -0,0 +1,99 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build +, pdm-pep517 + +# docs +, docutils +, sphinxHook +, sphinx-rtd-theme +, sphinx-autodoc-typehints + +# runtime +, tomli +, packaging + +# optionals +, pydantic +, platformdirs +, sphinx +, tabulate + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytoolconfig"; + version = "1.2.5"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bagel897"; + repo = "pytoolconfig"; + rev = "refs/tags/v${version}"; + hash = "sha256-b7er/IgXr2j9dSnI87669BXWA5CXNTzwa1DTpl8PBZ4="; + }; + + outputs = [ + "out" + "doc" + ]; + + PDM_PEP517_SCM_VERSION = version; + + nativeBuildInputs = [ + pdm-pep517 + + # docs + docutils + sphinx-autodoc-typehints + sphinx-rtd-theme + sphinxHook + ] ++ passthru.optional-dependencies.doc; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "packaging>=22.0" "packaging" + ''; + + propagatedBuildInputs = [ + packaging + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + passthru.optional-dependencies = { + validation = [ + pydantic + ]; + global = [ + platformdirs + ]; + doc = [ + sphinx + tabulate + ]; + }; + + pythonImportsCheck = [ + "pytoolconfig" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + meta = with lib; { + changelog = "https://github.com/bagel897/pytoolconfig/releases/tag/v${version}"; + description = "Python tool configuration"; + homepage = "https://github.com/bagel897/pytoolconfig"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ fab hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 3e811a39f00c..7008f72acb0e 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pytools"; - version = "2022.1.12"; + version = "2022.1.14"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TWKHXpoqsqJOOTqai3mUkvGnIb/6hArzgHv9Qocd0fQ="; + sha256 = "sha256-QQFzcWELsqA2hVl8UoUgXmWXx/F3OD2VyLhxJEsSwU4="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index a2d8da399d28..f1f4139cd823 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -1,47 +1,65 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 -, future +, pythonOlder , fsspec +, lightning-utilities +, numpy , packaging -, pytestCheckHook -, torch , pyyaml -, tensorboard +, tensorboardx +, torch , torchmetrics -, tqdm }: +, tqdm +, traitlets + +# tests +, psutil +, pytestCheckHook +}: buildPythonPackage rec { pname = "pytorch-lightning"; - version = "1.6.5"; - - disabled = isPy27; + version = "1.9.0"; + format = "pyproject"; src = fetchFromGitHub { - owner = "PyTorchLightning"; - repo = pname; + owner = "Lightning-AI"; + repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-CgD5g5nhz2DI4gOQyPl8/Cq6wWHzL0ALgOB5SgUOgaI="; + hash = "sha256-zlOIZYwNoUkznRcwNn8LQIEM4UuG6mPnqQIH+O4Jun4="; }; + preConfigure = '' + export PACKAGE_NAME=pytorch + ''; + propagatedBuildInputs = [ - packaging - future fsspec - torch + numpy + packaging pyyaml - tensorboard + tensorboardx + torch + lightning-utilities torchmetrics tqdm + traitlets + ] + ++ fsspec.optional-dependencies.http; + + nativeCheckInputs = [ + psutil + pytestCheckHook ]; - checkInputs = [ pytestCheckHook ]; # Some packages are not in NixPkgs; other tests try to build distributed # models, which doesn't work in the sandbox. doCheck = false; - pythonImportsCheck = [ "pytorch_lightning" ]; + pythonImportsCheck = [ + "pytorch_lightning" + ]; meta = with lib; { description = "Lightweight PyTorch wrapper for machine learning researchers"; diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index 5ff9f64a4dcc..d019e2b62917 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , isPy27 @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "1.6.2"; + version = "2.0.0"; disabled = isPy27; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-y/KqMqxSzTGsjwtbhHbFK+S4CX6yHC6tR6jdPWUzeGg="; + sha256 = "sha256-xarZvCRT/PhhB+ySv94XGz7uF/WiKbil6ohg7XbzOUs="; }; propagatedBuildInputs = [ @@ -39,7 +40,7 @@ buildPythonPackage rec { ''; # package only requires `unittest`, but use `pytest` to exclude tests - checkInputs = [ + nativeCheckInputs = [ faiss pytestCheckHook ]; @@ -56,6 +57,10 @@ buildPythonPackage rec { "test_pca" # flaky "test_distributed_classifier_loss_and_miner" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly + "test_global_embedding_space_tester" + "test_with_same_parent_label_tester" ]; meta = { diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix index 8fc3b2eae037..4f61c14a59af 100644 --- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -12,18 +12,18 @@ buildPythonPackage rec { pname = "pytorch-pfn-extras"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "pfnet"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-J1+y5hHMKC31rIYeWI3Ca8Hdx0FF+MnCOAp0ejHzX/Y="; + sha256 = "sha256-x1aE/55+2QwYG3Hhy35j26jLAj9O5orrU/c4KlTTOcc="; }; propagatedBuildInputs = [ numpy packaging torch typing-extensions ]; - checkInputs = [ onnx pytestCheckHook torchvision ]; + nativeCheckInputs = [ onnx pytestCheckHook torchvision ]; # ignore all pytest warnings preCheck = '' diff --git a/pkgs/development/python-modules/pytraccar/default.nix b/pkgs/development/python-modules/pytraccar/default.nix index c65fdf8b1080..7b33eb0290f7 100644 --- a/pkgs/development/python-modules/pytraccar/default.nix +++ b/pkgs/development/python-modules/pytraccar/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytestCheckHook pytest-asyncio diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index f5cbce6bcc0b..58b3ea9f2ec9 100644 --- a/pkgs/development/python-modules/pytradfri/default.nix +++ b/pkgs/development/python-modules/pytradfri/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "pytradfri"; - version = "11.0.0"; + version = "12.0.1"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "pytradfri"; rev = "refs/tags/${version}"; - hash = "sha256-+OOmoh2HLKiHAqOIH2aB4CZcW/ND/0bszgkcdRMYBlc="; + hash = "sha256-ov5Z9frYxdbPxqUedwXPYZEinCgQ0ge1jcX6UFdQMHw="; }; propagatedBuildInputs = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.async; @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to communicate with the IKEA Trådfri ZigBee Gateway"; homepage = "https://github.com/home-assistant-libs/pytradfri"; + changelog = "https://github.com/home-assistant-libs/pytradfri/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pytrafikverket/default.nix b/pkgs/development/python-modules/pytrafikverket/default.nix index 65ddd8fd8b04..f3785f5fb6db 100644 --- a/pkgs/development/python-modules/pytrafikverket/default.nix +++ b/pkgs/development/python-modules/pytrafikverket/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pytrafikverket"; - version = "0.2.1"; + version = "0.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LBOq1AvJrRmyWIe2w4dQbWvlRAJN6s2/lsJRI2LZK2o="; + hash = "sha256-bbg1FzzJ3cJIbV+u3Ih70hkgu23Joxc1xeLELiRYt8g="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to get data from the Swedish Transport Administration (Trafikverket) API"; homepage = "https://github.com/endor-force/pytrafikverket"; + changelog = "https://github.com/endor-force/pytrafikverket/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index c9ee34c05c69..a684e5ca6a39 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "12.1.0"; + version = "12.1.2"; disabled = pythonOlder "3.6"; @@ -17,10 +17,10 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - hash = "sha256-o4kfZLkEs+XYor2sS2lfuDZkPfHrB+rDoxroc4f55gc="; + hash = "sha256-Y4mriCwFvwAZ3e8kHKo9/S2vReb4q+b8KTHxtQo8SEw="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix index 6207b992c7d1..9384ff0e0b40 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.7"; + version = "1.7.0"; format = "setuptools"; src = fetchPypi { pname = "PyTurboJPEG"; inherit version; - hash = "sha256-e++Dl7khHWLXo+G9Gd8RQiF458OtYn+X7JU6HF6WzYA="; + hash = "sha256-9c7lfeM6PXF6CR3JtLi1NPmTwEbrv9Kh1kvdDQbskuI="; }; patches = [ diff --git a/pkgs/development/python-modules/pytz-deprecation-shim/default.nix b/pkgs/development/python-modules/pytz-deprecation-shim/default.nix index cce3c469cc22..dd37c3c1af28 100644 --- a/pkgs/development/python-modules/pytz-deprecation-shim/default.nix +++ b/pkgs/development/python-modules/pytz-deprecation-shim/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { tzdata ]); - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook pytz diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 718ee964588e..e162a4a6cb61 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,14 +2,16 @@ buildPythonPackage rec { pname = "pytz"; - version = "2022.2.1"; + version = "2022.7"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zqIhQXIE8tGiqgPdrj6GeSGXHQ128U2Hq7RBRBW73PU="; + hash = "sha256-fM+ue0ssBnRkpnM8YmFnP9uP0b6QVGA5a5egc+n6aDo="; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "pytz/tests" ]; diff --git a/pkgs/development/python-modules/pyu2f/default.nix b/pkgs/development/python-modules/pyu2f/default.nix index cf7b3eb2aeb0..65387824302b 100644 --- a/pkgs/development/python-modules/pyu2f/default.nix +++ b/pkgs/development/python-modules/pyu2f/default.nix @@ -10,17 +10,29 @@ buildPythonPackage rec { pname = "pyu2f"; version = "0.1.5a"; + format = "setuptools"; src = fetchFromGitHub { owner = "google"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; sha256 = "0mx7bn1p3n0fxyxa82wg3c719hby7vqkxv57fhf7zvhlg2zfnr0v"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + ]; - checkInputs = [ mock pyfakefs pytestCheckHook ]; + nativeCheckInputs = [ + mock + pyfakefs + pytestCheckHook + ]; + + disabledTestPaths = [ + # API breakage with pyfakefs>=5.0 + "pyu2f/tests/hid/linux_test.py" + ]; meta = with lib; { description = "U2F host library for interacting with a U2F device over USB"; diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index aa54e5169697..b9c664de934c 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { --replace "find_library(name)" "'${lib.getLib udev}/lib/libudev.so'" ''; - checkInputs = [ pytest mock hypothesis docutils ]; + nativeCheckInputs = [ pytest mock hypothesis docutils ]; propagatedBuildInputs = [ six ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index f8faa56b5a53..e75e99ceb340 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -10,6 +10,7 @@ , packaging , pillow , poetry-core +, py , pydantic , pyjwt , pytest-aiohttp @@ -22,6 +23,7 @@ , pythonOlder , pytz , setuptools +, setuptools-scm , termcolor , typer , ffmpeg @@ -29,7 +31,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.4.2"; + version = "4.6.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -38,7 +40,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-30nQ02UUXJHvHC+hWTWHsUeU83G8cOJHK+Tgo6AE5jc="; + hash = "sha256-sEIjR6ScJNliJJJET06e22x5GMDrmB6fZAzyHr847sk="; }; postPatch = '' @@ -46,8 +48,11 @@ buildPythonPackage rec { --replace "--cov=pyunifiprotect --cov-append" "" ''; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -72,8 +77,9 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ ffmpeg # Required for command ffprobe + py pytest-aiohttp pytest-asyncio pytest-benchmark diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 2e17db7d29bd..04e21f6e52ac 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 = "3.1.0"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,14 +17,14 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-OzU3Qv6qdEw0hJdbQ7Q3T6zOGpUt2uZyfy1Fxm3GT0Q="; + hash = "sha256-vg1eNxIkdHM1MMTkCof/ED6nqFhwSgEiKjYmqAyHMp0="; }; propagatedBuildInputs = [ tokenize-rt ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyuptimerobot/default.nix b/pkgs/development/python-modules/pyuptimerobot/default.nix index 601faccb37f7..8b6af6dc5d92 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 = "22.2.0"; + version = "23.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,26 +18,26 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; repo = pname; - rev = version; - sha256 = "sha256-QZm8FlUm17Vv80hB3iai54QcVlhSrq2AvbdBaRWDyok="; + rev = "refs/tags/${version}"; + hash = "sha256-hy/hmXxxEb44X8JUszoA1YF/41y7GkQqC4uS+Pax6WA="; }; - propagatedBuildInputs = [ - aiohttp - ]; - - checkInputs = [ - aresponses - pytestCheckHook - pytest-asyncio - ]; - postPatch = '' # Upstream doesn't set version in the repo substituteInPlace setup.py \ --replace 'version="main",' 'version="${version}",' ''; + propagatedBuildInputs = [ + aiohttp + ]; + + nativeCheckInputs = [ + aresponses + pytestCheckHook + pytest-asyncio + ]; + pythonImportsCheck = [ "pyuptimerobot" ]; @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API wrapper for Uptime Robot"; homepage = "https://github.com/ludeeus/pyuptimerobot"; + changelog = "https://github.com/ludeeus/pyuptimerobot/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyuseragents/default.nix b/pkgs/development/python-modules/pyuseragents/default.nix index 9ab48ebf59d4..beafd4bff271 100644 --- a/pkgs/development/python-modules/pyuseragents/default.nix +++ b/pkgs/development/python-modules/pyuseragents/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "D7Qs3vsfkRH2FDkbfakrR+FfWzQFiOCQM7q9AdJavyU="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "test.py" ]; pythonImportsCheck = [ "pyuseragents" ]; diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index f559afb6a4d4..3a6c3871a441 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ simplejson ]; - checkInputs = [ mock twisted ]; + nativeCheckInputs = [ mock twisted ]; prePatch = lib.optionalString isPyPy '' grep -rl 'utf-8-with-signature-unix' ./ | xargs sed -i -e "s|utf-8-with-signature-unix|utf-8|g" diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index 464e10c33179..f16a530530cf 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Python package for writing Value Change Dump (VCD) files"; diff --git a/pkgs/development/python-modules/pyvcf/default.nix b/pkgs/development/python-modules/pyvcf/default.nix index 919477298b15..1efcdd4d2242 100644 --- a/pkgs/development/python-modules/pyvcf/default.nix +++ b/pkgs/development/python-modules/pyvcf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0qf9lwj7r2hjjp4bd4vc7nayrhblfm4qcqs4dbd43a6p4bj2jv5p"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { homepage = "https://pyvcf.readthedocs.io/en/latest/index.html"; diff --git a/pkgs/development/python-modules/pyvera/default.nix b/pkgs/development/python-modules/pyvera/default.nix index 9a8ef3043abe..b6f1f851d76a 100644 --- a/pkgs/development/python-modules/pyvera/default.nix +++ b/pkgs/development/python-modules/pyvera/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-timeout pytest-cov diff --git a/pkgs/development/python-modules/pyverilog/default.nix b/pkgs/development/python-modules/pyverilog/default.nix index 115014a25bbb..54456cf42789 100644 --- a/pkgs/development/python-modules/pyverilog/default.nix +++ b/pkgs/development/python-modules/pyverilog/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { --replace "python_paths" "pythonpath" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyversasense/default.nix b/pkgs/development/python-modules/pyversasense/default.nix index f462deedd48c..40c2fac51577 100644 --- a/pkgs/development/python-modules/pyversasense/default.nix +++ b/pkgs/development/python-modules/pyversasense/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index 19d8fee57ef4..25e075b31806 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 = "2.0.4"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1Svz/9ZS5ynr88/We1fa+H1IGdC5ljUa4M5O8X+muX4="; + sha256 = "sha256-ulYOzCIpHkL/2nQExomoV4mLkU6e0ns4MHxEbjCPGrQ="; }; propagatedBuildInputs = [ @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to manage Etekcity Devices and Levoit Air Purifier"; homepage = "https://github.com/webdjoe/pyvesync"; + changelog = "https://github.com/webdjoe/pyvesync/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index b513cba8a32a..58523a13b066 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.25"; + version = "9.2.36"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7AcotD80GlBDiVtNPXlCUSNbZXybHoqWH92CxTfajhE="; + hash = "sha256-KV/fkgYUt8hfpGxDO3CNNrC91BaI9W8T2mr2H4eJdxo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index d34ee0b932e1..97d2b5a83ba6 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.19.0"; + version = "2.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-i1RXHrIkWqZw2LzVPEQSxgWa7PkUEsG6NO6H9egPWkk="; + sha256 = "sha256-D0N7kRTzfKCxLNtRJML+xykvsv3Mv0WHdlA05eLHl3M="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -30,7 +30,7 @@ buildPythonPackage rec { pkce ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index b9101e9888b3..b8a793d7d7d9 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' substituteInPlace pyvips/__init__.py \ diff --git a/pkgs/development/python-modules/pyvis/default.nix b/pkgs/development/python-modules/pyvis/default.nix index f13e1bbac798..1ac752f23d70 100644 --- a/pkgs/development/python-modules/pyvis/default.nix +++ b/pkgs/development/python-modules/pyvis/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ networkx jinja2 ipython jsonpickle ]; - checkInputs = [ numpy ]; + nativeCheckInputs = [ numpy ]; pythonImportsCheck = [ "pyvis" ]; diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index 4b7a179678a3..bd5b31869cba 100644 --- a/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/pkgs/development/python-modules/pyvisa-py/default.nix @@ -7,17 +7,21 @@ , pyvisa , typing-extensions , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pyvisa-py"; - version = "0.5.3"; + version = "0.6.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pyvisa"; repo = "pyvisa-py"; rev = "refs/tags/${version}"; - hash = "sha256-37GptqqBSIFOpm6SpS61ZZ9C4iU5AiOduVq255mTRNo="; + hash = "sha256-cXxiT/PWDf5WV+s8GbEA2u+1dPyfUKu19IQ2+Q4GTqM="; }; nativeBuildInputs = [ @@ -31,7 +35,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -40,8 +44,9 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "PyVISA backend that implements a large part of the Virtual Instrument Software Architecture in pure Python"; + description = "Module that implements the Virtual Instrument Software Architecture"; homepage = "https://github.com/pyvisa/pyvisa-py"; + changelog = "https://github.com/pyvisa/pyvisa-py/blob/${version}/CHANGES"; license = licenses.mit; maintainers = with maintainers; [ mvnetbiz ]; }; diff --git a/pkgs/development/python-modules/pyvisa/default.nix b/pkgs/development/python-modules/pyvisa/default.nix index 3fb0bbd51cec..850b19e5b1af 100644 --- a/pkgs/development/python-modules/pyvisa/default.nix +++ b/pkgs/development/python-modules/pyvisa/default.nix @@ -5,17 +5,20 @@ , setuptools , typing-extensions , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pyvisa"; - version = "1.12.0"; + version = "1.13.0"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pyvisa"; repo = "pyvisa"; rev = "refs/tags/${version}"; - hash = "sha256-2khTfj0RRna9YDPOs5kQHHhkeMwv3kTtGyDBYnu+Yhw="; + hash = "sha256-TBu3Xko0IxFBT2vzrsOxqEG3y4XfPzISEtbkWkIaCvM="; }; nativeBuildInputs = [ @@ -27,7 +30,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix new file mode 100644 index 000000000000..ce69f6c6c075 --- /dev/null +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, imageio +, numpy +, pillow +, pooch +, scooby +, vtk +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "pyvista"; + version = "0.37.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-02osbV9T9HOrapJBZpaTrO56UXk5Tcl1ldoUzB3iMUE="; + }; + + propagatedBuildInputs = [ + imageio + numpy + pillow + pooch + scooby + vtk + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + meta = with lib; { + homepage = "https://pyvista.org"; + description = "Easier Pythonic interface to VTK"; + license = licenses.mit; + maintainers = with maintainers; [ wegank ]; + }; +} diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix index 8788384e9079..02550d61a9ee 100644 --- a/pkgs/development/python-modules/pyvlx/default.nix +++ b/pkgs/development/python-modules/pyvlx/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index a2f475f3b314..54ee52c347bf 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -1,24 +1,43 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests, six }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, six +, pythonOlder +}: buildPythonPackage rec { pname = "pyvmomi"; - version = "7.0.3"; + version = "8.0.0.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "vmware"; repo = pname; - rev = "v${version}"; - sha256 = "07jwlbi3k5kvpmgygvpkhsnbdp9m2ndwqxk9k6kyzfszwcbdx4bk"; + rev = "refs/tags/v${version}"; + hash = "sha256-K3gCG4TYyCiHKhrixPwBtBZ4s0bNd7Z4f3CLGnqCDG0="; }; - # requires old version of vcrpy + propagatedBuildInputs = [ + requests + six + ]; + + # Requires old version of vcrpy doCheck = false; - propagatedBuildInputs = [ requests six ]; + pythonImportsCheck = [ + "pyVim" + "pyVmomi" + ]; meta = with lib; { description = "Python SDK for the VMware vSphere API that allows you to manage ESX, ESXi, and vCenter"; homepage = "https://github.com/vmware/pyvmomi"; + changelog = "https://github.com/vmware/pyvmomi/releases/tag/v${version}"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index 35da20d648d0..634db03a3a22 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pillow pytestCheckHook pytest-astropy diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix index a85a59ff4ab6..163f93288ff8 100644 --- a/pkgs/development/python-modules/pywavelets/default.nix +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "PyWavelets"; - version = "1.3.0"; + version = "1.4.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-y6qdYgUtna+Np2X8jnwww46iuOnhwYhBkT37SuxnHuU="; + sha256 = "sha256-ZDevPd8IMRjCbY+Xq0OwckuVbJ+Vjp6niGWfaig0upM="; }; - checkInputs = [ nose pytest ]; + nativeCheckInputs = [ nose pytest ]; buildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/pywayland/default.nix b/pkgs/development/python-modules/pywayland/default.nix index 75e427f3da83..f5832449b0d7 100644 --- a/pkgs/development/python-modules/pywayland/default.nix +++ b/pkgs/development/python-modules/pywayland/default.nix @@ -10,18 +10,18 @@ buildPythonPackage rec { pname = "pywayland"; - version = "0.4.14"; + version = "0.4.15"; src = fetchPypi { inherit pname version; - hash = "sha256-CXJidzwFvS1ewqYyfpJhwQtqh4TtUfhO9O0iYJpOCy0="; + hash = "sha256-vz7Sjd8KT7UgOBI5AN5q6CS7jl+WL87w91cgm0bXRGw="; }; nativeBuildInputs = [ pkg-config ]; propagatedNativeBuildInputs = [ cffi ]; buildInputs = [ wayland ]; propagatedBuildInputs = [ cffi ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postBuild = '' ${python.interpreter} pywayland/ffi_build.py diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index f1b2b439ab37..e02d767ce938 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -1,36 +1,37 @@ { lib , buildPythonPackage +, decorator , fetchPypi -, libxml2 -, m2crypto -, ply -, pyyaml -, six -, pbr -, pythonOlder -, nocasedict -, nocaselist -, yamlloader -, requests-mock +, FormEncode , httpretty +, libxml2 , lxml , mock +, nocasedict +, nocaselist +, pbr +, ply , pytest -, requests -, decorator -, FormEncode -, testfixtures +, pythonOlder , pytz +, pyyaml +, requests +, requests-mock +, six +, testfixtures +, yamlloader }: buildPythonPackage rec { pname = "pywbem"; - version = "1.5.0"; + version = "1.6.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-xffkWMJTDGE1j7xjM750+vNmqs546uM3QUMSZ63zJhA="; + hash = "sha256-4mqwMkR17lMp10lx+UK0sxW2rA7a8njnDha1YDJ475g="; }; propagatedBuildInputs = [ @@ -42,9 +43,9 @@ buildPythonPackage rec { pyyaml six yamlloader - ] ++ lib.optionals (pythonOlder "3.0") [ m2crypto ]; + ]; - checkInputs = [ + nativeCheckInputs = [ decorator FormEncode httpretty @@ -57,9 +58,14 @@ buildPythonPackage rec { testfixtures ]; + pythonImportsCheck = [ + "pywbem" + ]; + meta = with lib; { description = "Support for the WBEM standard for systems management"; homepage = "https://pywbem.github.io"; + changelog = "https://github.com/pywbem/pywbem/blob/${version}/docs/changes.rst"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index c7c60d20f3cd..77e24c56b5e7 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ coverage flake8 mock diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index b80c85d8e13b..835ff624378b 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pywebview"; - version = "3.7"; + version = "3.7.2"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "r0x0r"; repo = "pywebview"; rev = "refs/tags/${version}"; - hash = "sha256-RRq6b0hqAzig/WwFK0VsrhHO6ar8HhMdAEIosPPNUQg="; + hash = "sha256-5e05XkyxvOGLaEwKljYFppHQ99BxDQ7wPkViRlRo1VI="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { importlib-resources ]; - checkInputs = [ + nativeCheckInputs = [ pygobject3 pytest qtpy diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix index fd54ccf3d974..d71d84627f2a 100644 --- a/pkgs/development/python-modules/pywemo/default.nix +++ b/pkgs/development/python-modules/pywemo/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { lxml ]; - checkInputs = [ + nativeCheckInputs = [ pytest-vcr pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pywerview/default.nix b/pkgs/development/python-modules/pywerview/default.nix index 9dbb19738bee..43543279efc2 100644 --- a/pkgs/development/python-modules/pywerview/default.nix +++ b/pkgs/development/python-modules/pywerview/default.nix @@ -7,12 +7,13 @@ , ldap3 , lxml , pyasn1 +, pycryptodome , pythonOlder }: buildPythonPackage rec { pname = "pywerview"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "the-useless-one"; repo = pname; - rev = "v${version}"; - hash = "sha256-nrPhyBHW13dkXFC5YJfrkiztAxMw4KuEif0zCdjQEq0="; + rev = "refs/tags/v${version}"; + hash = "sha256-5/Cn70qQaUp38qko1Wq+gZMCcQtcAPtZwt7Zrx8MFc4="; }; propagatedBuildInputs = [ @@ -30,18 +31,13 @@ buildPythonPackage rec { impacket ldap3 lxml + pycryptodome pyasn1 ]; # Module has no tests doCheck = false; - postPatch = '' - # https://github.com/the-useless-one/pywerview/pull/51 - substituteInPlace setup.py \ - --replace "bs4" "beautifulsoup4" - ''; - pythonImportsCheck = [ "pywerview" ]; @@ -49,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for PowerSploit's PowerView support"; homepage = "https://github.com/the-useless-one/pywerview"; + changelog = "https://github.com/the-useless-one/pywerview/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pywick/default.nix b/pkgs/development/python-modules/pywick/default.nix index 13a037f345a8..0596ce02fe2e 100644 --- a/pkgs/development/python-modules/pywick/default.nix +++ b/pkgs/development/python-modules/pywick/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook -, albumentations , dill , h5py , hickle @@ -10,7 +9,6 @@ , opencv4 , pandas , pillow -, prodict , pycm , pyyaml , scipy @@ -43,7 +41,6 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - albumentations dill h5py hickle @@ -51,7 +48,6 @@ buildPythonPackage rec { opencv4 pandas pillow - prodict pycm pyyaml scipy @@ -65,12 +61,13 @@ buildPythonPackage rec { yacs ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "High-level training framework for Pytorch"; homepage = "https://github.com/achaiah/pywick"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; + broken = true; # Nixpkgs missing `albumentations` and `prodict` }; } diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix index 0867cfe36f89..40e8c70ba83b 100644 --- a/pkgs/development/python-modules/pywinrm/default.nix +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index 2ca664b88a17..e6ce3013515d 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index 0edd0b06be6d..2fdf0407c64f 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedNativeBuildInputs = [ cffi ]; buildInputs = [ libinput libxkbcommon pixman xorg.libxcb udev wayland wlroots ]; propagatedBuildInputs = [ cffi pywayland xkbcommon ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postBuild = '' ${python.interpreter} wlroots/ffi_build.py diff --git a/pkgs/development/python-modules/pyworld/default.nix b/pkgs/development/python-modules/pyworld/default.nix index 9833a29593e8..4e22e5f5d9cc 100644 --- a/pkgs/development/python-modules/pyworld/default.nix +++ b/pkgs/development/python-modules/pyworld/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyworld"; - version = "0.3.0"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "e19b5d8445e0c4fc45ded71863aeaaf2680064b4626b0e7c90f72e9ace9f6b5b"; + sha256 = "sha256-Zo0JhCw8+nSx9u2r2wBYpkwE+c8XuTiD5tqBHhIErU0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyws66i/default.nix b/pkgs/development/python-modules/pyws66i/default.nix index 41b56150d0ef..6931a0531ced 100644 --- a/pkgs/development/python-modules/pyws66i/default.nix +++ b/pkgs/development/python-modules/pyws66i/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-NTL2+xLqSNsz4YdUTwr0nFjhm1NNgB8qDnWSoE2sizY="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix index 78a834fd0d8d..85fdafa5064b 100644 --- a/pkgs/development/python-modules/pyx/default.nix +++ b/pkgs/development/python-modules/pyx/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package for the generation of PostScript, PDF, and SVG files"; - homepage = "http://pyx.sourceforge.net/"; + homepage = "https://pyx.sourceforge.net/"; license = with licenses; [ gpl2 ]; }; } diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix index 35bfaecda977..1ad0391ea34d 100644 --- a/pkgs/development/python-modules/pyxattr/default.nix +++ b/pkgs/development/python-modules/pyxattr/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyxattr"; - version = "0.7.2"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "68477027e6d3310669f98aaef15393bfcd9b2823d7a7f00a6f1d91a3c971ae64"; + sha256 = "sha256-e/QM7FrpPdZWEocX29Joz8Ozso2VU214hndslPomeFU="; }; # IOError: [Errno 95] Operation not supported (expected) diff --git a/pkgs/development/python-modules/pyxbe/default.nix b/pkgs/development/python-modules/pyxbe/default.nix index 929a02ac4751..8db0c5e0ea23 100644 --- a/pkgs/development/python-modules/pyxbe/default.nix +++ b/pkgs/development/python-modules/pyxbe/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-oOY0g1F5sxGUxXAT19Ygq5q7pnxEhIAKmyYELR1PHEA="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyxl3/default.nix b/pkgs/development/python-modules/pyxl3/default.nix index e931400b386e..19063414a44d 100644 --- a/pkgs/development/python-modules/pyxl3/default.nix +++ b/pkgs/development/python-modules/pyxl3/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-8nKQgwLXPVgPxNRF4CryKJb7+llDsZHis5VctxqpIRo="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Python 3 port of pyxl for writing structured and reusable inline HTML"; diff --git a/pkgs/development/python-modules/pyxnat/default.nix b/pkgs/development/python-modules/pyxnat/default.nix index 1dcacf19a13a..eee4bf530647 100644 --- a/pkgs/development/python-modules/pyxnat/default.nix +++ b/pkgs/development/python-modules/pyxnat/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { --replace "future>=0.16" "" ''; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = "nosetests pyxnat/tests"; doCheck = false; # requires a docker container running an XNAT server diff --git a/pkgs/development/python-modules/pyyaml-env-tag/default.nix b/pkgs/development/python-modules/pyyaml-env-tag/default.nix index f81bbbd7acbf..208f608855c5 100644 --- a/pkgs/development/python-modules/pyyaml-env-tag/default.nix +++ b/pkgs/development/python-modules/pyyaml-env-tag/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyyaml-include/default.nix b/pkgs/development/python-modules/pyyaml-include/default.nix new file mode 100644 index 000000000000..e6effdd72740 --- /dev/null +++ b/pkgs/development/python-modules/pyyaml-include/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchPypi +, pytestCheckHook +, pyyaml +, setuptools-scm +, setuptools-scm-git-archive +, toml +}: + +buildPythonPackage rec { + pname = "pyyaml-include"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-9/vrjnG1C+Dm4HRy98edv7GhW63pyToHg2n/SeV+Z3E="; + }; + + nativeBuildInputs = [ + pyyaml + setuptools-scm + setuptools-scm-git-archive + toml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "yamlinclude" ]; + + meta = with lib; { + description = "Extending PyYAML with a custom constructor for including YAML files within YAML files"; + homepage = "https://github.com/tanbro/pyyaml-include"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/pyzbar/default.nix b/pkgs/development/python-modules/pyzbar/default.nix index dd6a2461274c..fca8feab0c3f 100644 --- a/pkgs/development/python-modules/pyzbar/default.nix +++ b/pkgs/development/python-modules/pyzbar/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zbar pillow numpy ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # find_library doesn't return an absolute path # https://github.com/NixOS/nixpkgs/issues/7307 diff --git a/pkgs/development/python-modules/pyzerproc/default.nix b/pkgs/development/python-modules/pyzerproc/default.nix index bc90068e66ea..ff5a106c09bc 100644 --- a/pkgs/development/python-modules/pyzerproc/default.nix +++ b/pkgs/development/python-modules/pyzerproc/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 480247d01bb0..74f5b3afc1d6 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "23.2.1"; + version = "24.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-KzgaqGfs59CoLzCgx/PUOHt88uBpfjPvqlvtbFeEq80="; + hash = "sha256-IW9dfbtnFmdZ5ZsEebyoK4rPm+1gFbUmuOsQFD+wjnc="; }; buildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { py ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook tornado ]; diff --git a/pkgs/development/python-modules/pyzufall/default.nix b/pkgs/development/python-modules/pyzufall/default.nix index e0434e8e4dd4..7ca619efa38d 100644 --- a/pkgs/development/python-modules/pyzufall/default.nix +++ b/pkgs/development/python-modules/pyzufall/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { # https://github.com/nose-devs/nose/issues/1037 doCheck = false; - checkInputs = [ nose coverage ]; + nativeCheckInputs = [ nose coverage ]; propagatedBuildInputs = [ future ]; checkPhase = '' diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index 166536771136..7b12781ba160 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index af842c6c9559..abb84e1e7375 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "qcengine"; - version = "0.24.1"; + version = "0.26.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KUOGbGQd1ffXNkQiW8yeUxValCOAfd8nBv9nnk9giVU="; + hash = "sha256-jBA3exH/qzEaKZeumvgKD0tKnDptZdlv1KykyUHs8Bg="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { qcelemental ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 22e29ce3a762..48b0e0ac7e04 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -11,7 +11,9 @@ , pytest-asyncio , pytestCheckHook , python-dateutil +, pythonAtLeast , pythonOlder +, pythonRelaxDepsHook , respx , retrying , rfc3339 @@ -20,7 +22,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.21.2"; + version = "0.21.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,11 +31,26 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-api-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-gQow1bNRPhUm4zRu2T5FpcgOTcS2F1TQIz8WP1K0Xww="; + hash = "sha256-GEsCyqawLX6fTICjAOOREsO5FsmV6U/5+sDOW1v+VKE="; }; + patches = [ + # Switch to poetry-core, https://github.com/rigetti/qcs-api-client-python/pull/2 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/rigetti/qcs-api-client-python/commit/32f0b3c7070a65f4edf5b2552648d88435469e44.patch"; + hash = "sha256-mOc+Q/5cmwPziojtxeEMWWHSDvqvzZlNRbPtOSeTinQ="; + }) + ]; + + pythonRelaxDeps = [ + "attrs" + "httpx" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -48,38 +65,14 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook respx ]; - patches = [ - # Switch to poetry-core, https://github.com/rigetti/qcs-api-client-python/pull/2 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/rigetti/qcs-api-client-python/commit/32f0b3c7070a65f4edf5b2552648d88435469e44.patch"; - hash = "sha256-mOc+Q/5cmwPziojtxeEMWWHSDvqvzZlNRbPtOSeTinQ="; - }) - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'attrs = "^20.1.0"' 'attrs = "*"' \ - --replace 'httpx = "^0.15.0"' 'httpx = "*"' \ - --replace 'iso8601 = "^0.1.13"' 'iso8601 = "*"' \ - --replace 'pydantic = "^1.7.2"' 'pydantic = "*"' \ - --replace 'pyjwt = "^1.7.1"' 'pyjwt = "*"' - ''; - - disabledTestPaths = [ - # Test is outdated - "tests/test_client/test_additional_properties.py" - "tests/test_client/test_auth.py" - "tests/test_client/test_client.py" - "tests/test_client/test_datetime.py" - "tests/test_imports.py" - ]; + # Tests are failing on Python 3.11, Fatal Python error: Aborted + doCheck = !(pythonAtLeast "3.11"); pythonImportsCheck = [ "qcs_api_client" @@ -88,6 +81,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for accessing the Rigetti QCS API"; homepage = "https://qcs-api-client-python.readthedocs.io/"; + changelog = "https://github.com/rigetti/qcs-api-client-python/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/qdldl/default.nix b/pkgs/development/python-modules/qdldl/default.nix index f818f49fa65d..16a5622cc78a 100644 --- a/pkgs/development/python-modules/qdldl/default.nix +++ b/pkgs/development/python-modules/qdldl/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ "qdldl" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "A free LDL factorization routine"; diff --git a/pkgs/development/python-modules/qds_sdk/default.nix b/pkgs/development/python-modules/qds_sdk/default.nix index af5df9c347eb..b172f0e71816 100644 --- a/pkgs/development/python-modules/qds_sdk/default.nix +++ b/pkgs/development/python-modules/qds_sdk/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ pytest mock ]; + nativeCheckInputs = [ pytest mock ]; checkPhase = '' py.test --disable-pytest-warnings tests ''; diff --git a/pkgs/development/python-modules/qimage2ndarray/default.nix b/pkgs/development/python-modules/qimage2ndarray/default.nix index 431b5c9bfa10..9c54df213dc3 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.9.0"; + version = "1.10.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-p5B1xtDYRDxEIu6WmlQJ5E/QJUVxYEzOqHXGyV4/Veo="; + sha256 = "sha256-NyUQJEbcimlrLsd1sdKvQ7E69qf56+6KNxFbuVQ6LFg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qingping-ble/default.nix b/pkgs/development/python-modules/qingping-ble/default.nix index fa1c4ca4cb50..21053b8c75bc 100644 --- a/pkgs/development/python-modules/qingping-ble/default.nix +++ b/pkgs/development/python-modules/qingping-ble/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index f7ad8da805a0..d4ba54738672 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.10.4"; + version = "0.11.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -39,8 +39,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Qiskit"; repo = "qiskit-aer"; - rev = version; - sha256 = "sha256-mf+Pgw/daFkt1bvqSeYzlO/Sd2F2MtwZcLr+h1u+eb0="; + rev = "refs/tags/${version}"; + sha256 = "sha256-ew9ucqOWDztjB+hJTh9WkJiutVBJyVQobtEcWeUwEcw="; }; postPatch = '' @@ -120,7 +120,7 @@ buildPythonPackage rec { "test_extended_stabilizer_sparse_output_probs" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ddt fixtures diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix index 45764b4983ef..7b629221931f 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.3.3"; + version = "0.3.4"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-1XM4gBuMsvjwU4GSdQJobMyyDFZOOTbwvnUPG0nXFoc="; + sha256 = "sha256-Ijoqn6nANLsEVKA5nycd1xbW5htJ+TQm6LkiMUWTsSs="; }; postPatch = '' @@ -50,7 +50,7 @@ buildPythonPackage rec { yfinance ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-timeout ddt diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 4cad6f0bc5aa..65287ce09878 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { ''; # Most tests require credentials to run on IBMQ - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook nbconvert nbformat diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index 0b40fc8fc7e6..2c963271a4db 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { preCheck = '' export HOME=$TMPDIR ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ddt pyfakefs diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix index e4761dc33b02..fe04e7472218 100644 --- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "qiskit-machine-learning"; - version = "0.4.0"; + version = "0.5.0"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-WZSXt+sVeO64wCVbDgBhuGvo5jTn/JKh9oNSO7ZY9wo="; + sha256 = "sha256-wK0ZRNnU7WJlTWRJ2ce6LN6WGKlkh5jBrbXMDYcPQJI="; }; propagatedBuildInputs = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { ]; doCheck = false; # TODO: enable. Tests fail on unstable due to some multithreading issue? - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-timeout ddt diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix index 7c7510675f13..47ec6ff8fcac 100644 --- a/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/pkgs/development/python-modules/qiskit-nature/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "qiskit-nature"; - version = "0.4.3"; + version = "0.5.2"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-trThxcft6AOxalOglOKPwrJ23Bqt/FmMCAucKmNmB7c="; + sha256 = "sha256-rUY5fnsWg2UisF0tGORvHot8laCs8eVAvuVKUOG5ibw="; }; propagatedBuildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { scipy ] ++ lib.optional withPyscf pyscf; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ddt pylatexenc diff --git a/pkgs/development/python-modules/qiskit-optimization/default.nix b/pkgs/development/python-modules/qiskit-optimization/default.nix index 9a98cf29576b..870878be16a9 100644 --- a/pkgs/development/python-modules/qiskit-optimization/default.nix +++ b/pkgs/development/python-modules/qiskit-optimization/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ddt pylatexenc diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index aa9ce69fa1a5..e46e706c8657 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -94,7 +94,7 @@ buildPythonPackage rec { ++ lib.optionals withCrosstalkPass crosstalkPackages; # *** Tests *** - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ddt hypothesis diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 458fa6a146e3..00200525f078 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -28,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.37.0"; + version = "0.39.4"; disabled = pythonOlder "3.6"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit"; rev = "refs/tags/${version}"; - sha256 = "sha256-TsDDiSWSjk2iXaxFjGXQxPFEPCR242dR26H0cpA6ZxY="; + sha256 = "sha256-4Lf+0Dq64J53qTEzr9gtuYwe1a+zIgHmgoKMTBEef8M="; }; propagatedBuildInputs = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { qiskit-terra ] ++ lib.optionals withOptionalPackages optionalQiskitPackages; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "qiskit" diff --git a/pkgs/development/python-modules/qnapstats/default.nix b/pkgs/development/python-modules/qnapstats/default.nix index 1803d2ffe72e..e42b0753bd3e 100644 --- a/pkgs/development/python-modules/qnapstats/default.nix +++ b/pkgs/development/python-modules/qnapstats/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ responses ]; diff --git a/pkgs/development/python-modules/qpageview/default.nix b/pkgs/development/python-modules/qpageview/default.nix new file mode 100644 index 000000000000..db5ea8ad1f7d --- /dev/null +++ b/pkgs/development/python-modules/qpageview/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, python3Packages +, pythonOlder +}: + +python3Packages.buildPythonPackage rec { + pname = "qpageview"; + version = "0.6.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "frescobaldi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-XFMTOD7ums8sbFHUViEI9q6/rCjUmEtXAdd3/OmLsHU="; + }; + + propagatedBuildInputs = with python3Packages; [ pyqt5 poppler-qt5 pycups ]; + + pythonImportsCheck = [ "qpageview" ]; + + meta = with lib; { + description = "A page-based viewer widget for Qt5/PyQt5"; + homepage = "https://github.com/frescobaldi/qpageview"; + changelog = "https://github.com/frescobaldi/qpageview/blob/${src.rev}/ChangeLog"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ camillemndn ]; + }; +} diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix index 9b9254bdcc1a..f354e707af83 100644 --- a/pkgs/development/python-modules/qrcode/default.nix +++ b/pkgs/development/python-modules/qrcode/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six pillow pymaging_png setuptools ]; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; meta = with lib; { description = "Quick Response code generation for Python"; diff --git a/pkgs/development/python-modules/qreactor/default.nix b/pkgs/development/python-modules/qreactor/default.nix index dc2031c70287..e4648919d9f7 100644 --- a/pkgs/development/python-modules/qreactor/default.nix +++ b/pkgs/development/python-modules/qreactor/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { twisted qtpy ]; - checkInputs = [ + nativeCheckInputs = [ pyqt5 ]; diff --git a/pkgs/development/python-modules/qstylizer/default.nix b/pkgs/development/python-modules/qstylizer/default.nix index 835437da0011..ee49d37055d4 100644 --- a/pkgs/development/python-modules/qstylizer/default.nix +++ b/pkgs/development/python-modules/qstylizer/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { tinycss2 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; diff --git a/pkgs/development/python-modules/qt5reactor/default.nix b/pkgs/development/python-modules/qt5reactor/default.nix index a85f2ad6892a..e479e53dec56 100644 --- a/pkgs/development/python-modules/qt5reactor/default.nix +++ b/pkgs/development/python-modules/qt5reactor/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { twisted ]; - checkInputs = [ + nativeCheckInputs = [ pytest-twisted pytestCheckHook ]; diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index b4e02e77b229..234a0689cc1f 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "qtawesome"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "spyder-ide"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KcYCXrTP8ED5j/VTLTw7a8zotDSqIu9ultmwp8Ip5nM="; + hash = "sha256-zXwIwYG76aCKPTE8mGiAOK8kQUCzJbqnjJszmIqByaA="; }; propagatedBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { qtpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Iconic fonts in PyQt and PySide applications"; homepage = "https://github.com/spyder-ide/qtawesome"; + changelog = "https://github.com/spyder-ide/qtawesome/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.linux; # fails on Darwin diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 5c618b418931..519eb31a5b1e 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , ipykernel -, jupyter_core +, jupyter-core , jupyter-client , pygments , pyqt5 @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipykernel - jupyter_core + jupyter-core jupyter-client pygments pyqt5 @@ -36,7 +36,7 @@ buildPythonPackage rec { traitlets ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 97d2111677f3..1521f383677d 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "QtPy"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2F8bEh8kpBrSbFXERuZqvbfFKIOfjE8R8VbsRUGQORQ="; + sha256 = "sha256-BgPJyDzMA1pHF6EpCL9rxssiUJgn6i7A6Uwtp8ntV8U="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { ]; doCheck = false; # ModuleNotFoundError: No module named 'PyQt5.QtConnectivity' - checkInputs = [ + nativeCheckInputs = [ pyside (pyqt5.override { withConnectivity = true; diff --git a/pkgs/development/python-modules/quadprog/default.nix b/pkgs/development/python-modules/quadprog/default.nix new file mode 100644 index 000000000000..47a3f4e1a555 --- /dev/null +++ b/pkgs/development/python-modules/quadprog/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, cython +, numpy +, pytestCheckHook +, scipy +}: + +buildPythonPackage rec { + pname = "quadprog"; + version = "0.1.11"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-/suv1KbG3HbiYqEiuCtB/ia3xbxAO5AMuWx1Svy0rMw="; + }; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + numpy + ]; + + preBuild = '' + cython quadprog/quadprog.pyx + ''; + + nativeCheckInputs = [ + pytestCheckHook + scipy + ]; + + pytestFlagsArray = [ + # test fails on aarch64-darwin + "--deselect=tests/test_1.py::test_5" + ]; + + meta = with lib; { + homepage = "https://github.com/quadprog/quadprog"; + changelog = "https://github.com/quadprog/quadprog/releases/tag/v${version}"; + description = "Quadratic Programming Solver"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ wegank ]; + }; +} diff --git a/pkgs/development/python-modules/qualysclient/default.nix b/pkgs/development/python-modules/qualysclient/default.nix index 6556187c44bf..a61314816902 100644 --- a/pkgs/development/python-modules/qualysclient/default.nix +++ b/pkgs/development/python-modules/qualysclient/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook responses diff --git a/pkgs/development/python-modules/quamash/default.nix b/pkgs/development/python-modules/quamash/default.nix index 54df9bebb57c..5d0382fda6d9 100644 --- a/pkgs/development/python-modules/quamash/default.nix +++ b/pkgs/development/python-modules/quamash/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyqt ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest -k 'test_qthreadexec.py' # the others cause the test execution to be aborted, I think because of asyncio ''; diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix index e819cd24e99d..b70cdf4de385 100644 --- a/pkgs/development/python-modules/quandl/default.nix +++ b/pkgs/development/python-modules/quandl/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ factory_boy faker httpretty diff --git a/pkgs/development/python-modules/quantiphy-eval/default.nix b/pkgs/development/python-modules/quantiphy-eval/default.nix new file mode 100644 index 000000000000..68eba2e94627 --- /dev/null +++ b/pkgs/development/python-modules/quantiphy-eval/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, inform +, pythonOlder +, sly +}: + +buildPythonPackage rec { + pname = "quantiphy-eval"; + version = "0.5"; + format = "flit"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "KenKundert"; + repo = "quantiphy_eval"; + rev = "v${version}"; + hash = "sha256-7VHcuINhe17lRNkHUnZkVOEtD6mVWk5gu0NbrLZwprg="; + }; + + propagatedBuildInputs = [ + inform + sly + ]; + + # this has a circular dependency on quantiphy + preBuild = '' + sed -i '/quantiphy>/d' ./pyproject.toml + ''; + + # tests require quantiphy import + doCheck = false; + + # Also affected by the circular dependency on quantiphy + # pythonImportsCheck = [ + # "quantiphy_eval" + # ]; + + meta = with lib; { + description = "QuantiPhy support for evals in-line"; + homepage = "https://github.com/KenKundert/quantiphy_eval/"; + changelog = "https://github.com/KenKundert/quantiphy_eval/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/pkgs/development/python-modules/quantiphy/default.nix b/pkgs/development/python-modules/quantiphy/default.nix new file mode 100644 index 000000000000..38ff4bc434ff --- /dev/null +++ b/pkgs/development/python-modules/quantiphy/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flitBuildHook +, pytestCheckHook +, pythonOlder +, inform +, parametrize-from-file +, setuptools +, voluptuous +, quantiphy-eval +, rkm-codes +}: + +buildPythonPackage rec { + pname = "quantiphy"; + version = "2.18"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "KenKundert"; + repo = "quantiphy"; + rev = "v${version}"; + hash = "sha256-KXZQTal5EQDrMNV9QKeuLeYYDaMfAJlEDEagq2XG9/Q="; + }; + + nativeBuildInputs = [ + flitBuildHook + ]; + + propagatedBuildInputs = [ + quantiphy-eval + rkm-codes + ]; + + nativeCheckInputs = [ + inform + parametrize-from-file + pytestCheckHook + setuptools + voluptuous + ]; + + pythonImportsCheck = [ + "quantiphy" + ]; + + meta = with lib; { + description = "Module for physical quantities (numbers with units)"; + homepage = "https://quantiphy.readthedocs.io"; + changelog = "https://github.com/KenKundert/quantiphy/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index 48cc70d5f2af..419dea854096 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -18,15 +18,13 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ - # Tests don't work with current numpy - # https://github.com/python-quantities/python-quantities/pull/195 - "test_arctan2" - "test_fix" + # test fails with numpy 1.24 + "test_mul" ]; pythonImportsCheck = [ "quantities" ]; diff --git a/pkgs/development/python-modules/quantum-gateway/default.nix b/pkgs/development/python-modules/quantum-gateway/default.nix index 272899a6bbbd..43c9c8dcb2d3 100644 --- a/pkgs/development/python-modules/quantum-gateway/default.nix +++ b/pkgs/development/python-modules/quantum-gateway/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ requests-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix index e0b549dd6dcb..b7b03c3b441a 100644 --- a/pkgs/development/python-modules/questionary/default.nix +++ b/pkgs/development/python-modules/questionary/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { prompt-toolkit ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 519cb9957bcc..4a49e3d70e7a 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -6,6 +6,7 @@ , cython , doCheck ? true , fetchFromGitHub +, ipython , matplotlib , numpy , packaging @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "qutip"; - version = "4.7.0"; + version = "4.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,8 +27,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - hash = "sha256-wGr6uTM6pFL2nvN4zdqPdEO8O3kjrRtKWx8luL1t9Sw="; + rev = "refs/tags/v${version}"; + hash = "sha256-W5iqRWAB6D1Dnxz0Iyl7ZmP3yrXvLyV7BdBdIgFCiQY="; }; nativeBuildInputs = [ @@ -40,10 +41,10 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-rerunfailures - ] ++ passthru.optional-dependencies.graphics; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # Disabling OpenMP support on Darwin. setupPyGlobalFlags = lib.optionals (!stdenv.isDarwin) [ @@ -75,6 +76,9 @@ buildPythonPackage rec { graphics = [ matplotlib ]; + ipython = [ + ipython + ]; semidefinite = [ cvxpy cvxopt diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index 89548dbc9f0c..a6c2afa7d5ee 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -5,11 +5,15 @@ , fetchPypi , radare2 , coreutils +, pythonOlder }: buildPythonPackage rec { pname = "r2pipe"; - version = "1.7.3"; + version = "1.7.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; postPatch = let r2lib = "${lib.getOutput "lib" radare2}/lib"; @@ -27,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-zhKV0+467xFpzmSDswIWPEGpks0X/F+ecBWPWpvakik="; + sha256 = "sha256-bmr9/iqlp5GghY6DOpFhBH3k69ErqR3DHx7iAu3m6f0="; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't diff --git a/pkgs/development/python-modules/rabbitpy/default.nix b/pkgs/development/python-modules/rabbitpy/default.nix index 57c52ff49ba9..9287c72441cc 100644 --- a/pkgs/development/python-modules/rabbitpy/default.nix +++ b/pkgs/development/python-modules/rabbitpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pamqp ]; - checkInputs = [ mock nose ]; + nativeCheckInputs = [ mock nose ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/rachiopy/default.nix b/pkgs/development/python-modules/rachiopy/default.nix index 3fcf773e83d9..ccd1f9aef64d 100644 --- a/pkgs/development/python-modules/rachiopy/default.nix +++ b/pkgs/development/python-modules/rachiopy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ jsonschema pytestCheckHook ]; diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale_infcloud/default.nix index 580ab59e630b..0bd4629b0912 100644 --- a/pkgs/development/python-modules/radicale_infcloud/default.nix +++ b/pkgs/development/python-modules/radicale_infcloud/default.nix @@ -22,6 +22,6 @@ buildPythonPackage { homepage = "https://github.com/Unrud/RadicaleInfCloud/"; description = "Integrate InfCloud into Radicale's web interface"; license = with licenses; [ agpl3 gpl3 ]; - maintainers = with maintainers; [ aneeshusa erictapen ]; + maintainers = with maintainers; [ erictapen ]; }; } diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/pkgs/development/python-modules/radio_beam/default.nix index aa56e223237b..1a349736787a 100644 --- a/pkgs/development/python-modules/radio_beam/default.nix +++ b/pkgs/development/python-modules/radio_beam/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook matplotlib pytest-astropy diff --git a/pkgs/development/python-modules/radios/default.nix b/pkgs/development/python-modules/radios/default.nix index c5b4413540c4..047946b25175 100644 --- a/pkgs/development/python-modules/radios/default.nix +++ b/pkgs/development/python-modules/radios/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/radiotherm/default.nix b/pkgs/development/python-modules/radiotherm/default.nix index 9cefe8839c1c..e7cd4fb1f854 100644 --- a/pkgs/development/python-modules/radiotherm/default.nix +++ b/pkgs/development/python-modules/radiotherm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0p37pc7l2malmjfkdlh4q2cfa6dqpsk1rah2j2xil0pj57ai6bks"; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index 258cd012716c..8e84f1e2fd8b 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "radish-bdd"; - version = "0.14.0"; + version = "0.14.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = pname; repo = "radish"; rev = "refs/tags/v${version}"; - hash = "sha256-7C8XgGlpNVUONSfg9DsIS8Awpy6iDzFOLAFs1xpfHXI="; + hash = "sha256-Xyj9yA4Rif3/BWEBnFubXQxwMM0IkHQ1koFZ+HWYQcI="; }; propagatedBuildInputs = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { tag-expressions ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/raincloudy/default.nix b/pkgs/development/python-modules/raincloudy/default.nix index c0fb2accc53a..da4a3846a95f 100644 --- a/pkgs/development/python-modules/raincloudy/default.nix +++ b/pkgs/development/python-modules/raincloudy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { html5lib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/pkgs/development/python-modules/rangehttpserver/default.nix b/pkgs/development/python-modules/rangehttpserver/default.nix index 006dc747fe6f..673661b07b99 100644 --- a/pkgs/development/python-modules/rangehttpserver/default.nix +++ b/pkgs/development/python-modules/rangehttpserver/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ nose requests ]; diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 27cc7f80f2df..0b55d0a77b0d 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -7,10 +8,8 @@ , ninja , scikit-build , setuptools -, jarowinkler , numpy , hypothesis -, jarowinkler-cpp , pandas , pytestCheckHook , rapidfuzz-cpp @@ -19,7 +18,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "2.13.2"; + version = "2.13.7"; disabled = pythonOlder "3.7"; @@ -29,7 +28,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-a83Vww9dEh0nNylnZwCm6PJYmfKvw5RnMLerfKfN1dY="; + hash = "sha256-ZovXYOoLriAmJHptolD135qCn7XHeVvzLJNzI08mqwY="; }; nativeBuildInputs = [ @@ -43,21 +42,29 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; buildInputs = [ - jarowinkler-cpp rapidfuzz-cpp taskflow ]; preBuild = '' export RAPIDFUZZ_BUILD_EXTENSION=1 + '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + export CMAKE_ARGS="-DCMAKE_CXX_COMPILER_AR=$AR -DCMAKE_CXX_COMPILER_RANLIB=$RANLIB" ''; + NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [ + "-fno-lto" # work around https://github.com/NixOS/nixpkgs/issues/19098 + ]; + propagatedBuildInputs = [ - jarowinkler numpy ]; - checkInputs = [ + preCheck = '' + export RAPIDFUZZ_IMPLEMENTATION=cpp + ''; + + nativeCheckInputs = [ hypothesis pandas pytestCheckHook @@ -73,7 +80,7 @@ buildPythonPackage rec { meta = with lib; { description = "Rapid fuzzy string matching"; homepage = "https://github.com/maxbachmann/RapidFuzz"; - changelog = "https://github.com/maxbachmann/RapidFuzz/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/maxbachmann/RapidFuzz/blob/${src.rev}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix index 545782d853ea..6bc0c7f2a24e 100644 --- a/pkgs/development/python-modules/rarfile/default.nix +++ b/pkgs/development/python-modules/rarfile/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0gpriqkvcb6bsccvq8b099xjv5fkjs0d7g4636d5jphy417jxk5m"; }; - checkInputs = [ pytestCheckHook nose glibcLocales ]; + nativeCheckInputs = [ pytestCheckHook nose glibcLocales ]; prePatch = '' substituteInPlace rarfile.py \ diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 7876e6667491..16661032fff1 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -1,45 +1,41 @@ { lib , stdenv -, buildPythonPackage -, fetchFromGitHub -, pythonOlder - -# build time -, cython -, gdal - -# runtime , affine , attrs , boto3 +, buildPythonPackage , click , click-plugins , cligj -, matplotlib -, numpy -, snuggs -, setuptools - -# tests +, certifi +, cython +, fetchFromGitHub +, gdal , hypothesis +, matplotlib +, ipython +, numpy , packaging , pytest-randomly , pytestCheckHook +, pythonOlder +, setuptools , shapely +, snuggs }: buildPythonPackage rec { pname = "rasterio"; - version = "1.3.0"; # not x.y[ab]z, those are alpha/beta versions + version = "1.3.5"; format = "pyproject"; - disabled = pythonOlder "3.6"; - # Pypi doesn't ship the tests, so we fetch directly from GitHub + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "rasterio"; repo = "rasterio"; rev = "refs/tags/${version}"; - hash = "sha256-CBnG1zNMOL3rAmnErv7XZZ2Cu9W+DnRPcjtKdmYXHUA="; + hash = "sha256-VZE58xbTTAicGqkl8ktYBhN+5tFj8FoUYxg8fi05bmo="; }; nativeBuildInputs = [ @@ -50,25 +46,32 @@ buildPythonPackage rec { propagatedBuildInputs = [ affine attrs - boto3 click click-plugins cligj - matplotlib + certifi numpy snuggs - setuptools # needs pkg_resources at runtime + setuptools ]; - preCheck = '' - rm -rf rasterio - ''; + passthru.optional-dependencies = { + ipython = [ + ipython + ]; + plot = [ + matplotlib + ]; + s3 = [ + boto3 + ]; + }; - checkInputs = [ + nativeCheckInputs = [ + hypothesis + packaging pytest-randomly pytestCheckHook - packaging - hypothesis shapely ]; @@ -85,13 +88,15 @@ buildPythonPackage rec { ]; doInstallCheck = true; + installCheckPhase = '' $out/bin/rio --version | grep ${version} > /dev/null ''; meta = with lib; { description = "Python package to read and write geospatial raster data"; - homepage = "https://rasterio.readthedocs.io/en/latest/"; + homepage = "https://rasterio.readthedocs.io/"; + changelog = "https://github.com/rasterio/rasterio/blob/${version}/CHANGES.txt"; license = licenses.bsd3; maintainers = with maintainers; [ mredaelli ]; }; diff --git a/pkgs/development/python-modules/ratelimit/default.nix b/pkgs/development/python-modules/ratelimit/default.nix index f706d043bf86..7a1af77df0e2 100644 --- a/pkgs/development/python-modules/ratelimit/default.nix +++ b/pkgs/development/python-modules/ratelimit/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sed -i "/--cov/d" pytest.ini ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests" ]; diff --git a/pkgs/development/python-modules/ratelimiter/default.nix b/pkgs/development/python-modules/ratelimiter/default.nix index cccca46296b6..6c01a9e548c9 100644 --- a/pkgs/development/python-modules/ratelimiter/default.nix +++ b/pkgs/development/python-modules/ratelimiter/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { hash = "sha256-XDldyr273i5ReO8/ibVoowZkVKbdwiO3ZHPawi+JtPc="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rawkit/default.nix b/pkgs/development/python-modules/rawkit/default.nix index 0a96123db04c..65c5a5759998 100644 --- a/pkgs/development/python-modules/rawkit/default.nix +++ b/pkgs/development/python-modules/rawkit/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { buildInputs = [ libraw ]; - checkInputs = [ pytest mock ]; + nativeCheckInputs = [ pytest mock ]; checkPhase = '' py.test tests diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 27356390cfda..208f3ae1278b 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -18,12 +18,13 @@ , html5lib # tests +, pytest-cov , pytestCheckHook }: buildPythonPackage rec { pname = "rdflib"; - version = "6.1.1"; + version = "6.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,8 +32,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RDFLib"; repo = pname; - rev = version; - hash = "sha256:1ih7vx4i16np1p8ig5faw74apmbm7kgyj9alya521yvzid6d7pzd"; + rev = "refs/tags/${version}"; + hash = "sha256-GkqfSyApOFKPIiIYXhgaRZuMawk7PRYmxGDhnRI+Rz0="; }; propagatedBuildInputs = [ @@ -52,7 +53,8 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ + pytest-cov pytestCheckHook ] ++ passthru.optional-dependencies.networkx @@ -68,6 +70,10 @@ buildPythonPackage rec { # Requires network access "test_service" "testGuessFormatForParse" + "test_infix_owl_example1" + "test_context" + "test_guess_format_for_parse" + "rdflib.extras.infixowl" ] ++ lib.optionals stdenv.isDarwin [ # Require loopback network access "TestGraphHTTP" diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index b42523dc8bf5..4e8236365ef3 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchzip , cmake +, comic-neue , boost , catch2 , inchi @@ -15,32 +15,32 @@ , numpy , pandas , pillow -, git }: let external = { - avalon = fetchzip { - url = "http://sourceforge.net/projects/avalontoolkit/files/AvalonToolkit_1.2/AvalonToolkit_1.2.0.source.tar"; - sha256 = "0nhxfxckb5a5qs0g148f55yarhncqjgjzcvdskkv9rxi2nrs7160"; - stripRoot = false; + avalon = fetchFromGitHub { + owner = "rohdebe1"; + repo = "ava-formake"; + rev = "AvalonToolkit_2.0.2"; + hash = "sha256-YI39OknHiSyArNGqRKrSVzEJnFc1xJ0W3UcTZrTKeME="; }; yaehmop = fetchFromGitHub { owner = "greglandrum"; repo = "yaehmop"; - rev = "cfb5aeebbdf5ae93c4f4eeb14c7a507dea54ae9e"; - sha256 = "sha256-QMnc5RyHlY3giw9QmrkGntiA+Srs7OhCIKs9GGo5DfQ="; + rev = "v2022.09.1"; + hash = "sha256-QMnc5RyHlY3giw9QmrkGntiA+Srs7OhCIKs9GGo5DfQ="; }; freesasa = fetchFromGitHub { owner = "mittinatten"; repo = "freesasa"; - rev = "2.1.1"; - sha256 = "sha256-fUJvLDTVhpBWl9MavZwp0kAO5Df1QuHEKqe20CXNfcg="; + rev = "2.0.3"; + hash = "sha256-7E+imvfDAJFnXQRWb5hNaSu+Xrf9NXeIKc9fl+o3yHQ="; }; }; in buildPythonPackage rec { pname = "rdkit"; - version = "2022.03.5"; + version = "2022.09.1"; format = "other"; src = @@ -51,35 +51,35 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "Release_${versionTag}"; - sha256 = "19idgilabh04cbr1qj6zgrgsfjm248mmfz6fsr0smrd68d0xnml9"; + hash = "sha256-AaawjCv3/ShByOKU0c37/hjuyfD7NhFC8UngDoG7C0s="; }; unpackPhase = '' - mkdir -p source/External/AvalonTools/avalon source/External/YAeHMOP/yaehmop source/External/FreeSASA/freesasa - cp -r ${src}/* source - cp -r ${external.avalon}/SourceDistribution/* source/External/AvalonTools/avalon - cp -r ${external.yaehmop}/* source/External/YAeHMOP/yaehmop - cp -r ${external.freesasa}/* source/External/FreeSASA/freesasa + cp -r $src/* . + find . -type d -exec chmod +w {} + - find source -type d -exec chmod 755 {} + - cp source/External/FreeSASA/freesasa2.c source/External/FreeSASA/freesasa/src - ln -s ${rapidjson} source/External/rapidjson-1.1.0 + mkdir External/AvalonTools/avalon + ln -s ${external.avalon}/* External/AvalonTools/avalon + + mkdir External/YAeHMOP/yaehmop + ln -s ${external.yaehmop}/* External/YAeHMOP/yaehmop + + mkdir -p External/FreeSASA/freesasa + cp -r ${external.freesasa}/* External/FreeSASA/freesasa + chmod +w External/FreeSASA/freesasa/src + cp External/FreeSASA/freesasa2.c External/FreeSASA/freesasa/src + + ln -s ${rapidjson} External/rapidjson-1.1.0 + ln -s ${comic-neue}/share/fonts/truetype/ComicNeue-Regular.ttf Data/Fonts/ ''; - sourceRoot = "source"; - nativeBuildInputs = [ cmake - git # required by freesasa ]; buildInputs = [ boost - catch2 - inchi - eigen cairo - rapidjson ]; propagatedBuildInputs = [ @@ -95,10 +95,6 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; preConfigure = '' - # Don't want this contacting the git remote during the build - substituteInPlace External/YAeHMOP/CMakeLists.txt --replace \ - 'GIT_TAG master' 'DOWNLOAD_COMMAND true' - # Since we can't expand with bash in cmakeFlags cmakeFlags="$cmakeFlags -DPYTHON_NUMPY_INCLUDE_PATH=$(${python}/bin/python -c 'import numpy; print(numpy.get_include())')" cmakeFlags="$cmakeFlags -DFREESASA_DIR=$PWD/External/FreeSASA/freesasa" @@ -114,7 +110,6 @@ buildPythonPackage rec { "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" "-DRDK_INSTALL_INTREE=OFF" "-DRDK_INSTALL_STATIC_LIBS=OFF" - "-DRDK_INSTALL_COMIC_FONTS=OFF" "-DRDK_BUILD_INCHI_SUPPORT=ON" "-DRDK_BUILD_AVALON_SUPPORT=ON" "-DRDK_BUILD_FREESASA_SUPPORT=ON" @@ -145,9 +140,9 @@ buildPythonPackage rec { ''; pythonImportsCheck = [ - "rdkit" - "rdkit.Chem" - "rdkit.Chem.AllChem" + "rdkit" + "rdkit.Chem" + "rdkit.Chem.AllChem" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/reactivex/default.nix b/pkgs/development/python-modules/reactivex/default.nix index 4d95605a09b5..430581fce58f 100644 --- a/pkgs/development/python-modules/reactivex/default.nix +++ b/pkgs/development/python-modules/reactivex/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/readability-lxml/default.nix b/pkgs/development/python-modules/readability-lxml/default.nix index b0494631388e..8f0006a3c0ce 100644 --- a/pkgs/development/python-modules/readability-lxml/default.nix +++ b/pkgs/development/python-modules/readability-lxml/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace 'sys.platform == "darwin"' "False" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook timeout-decorator ]; diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index 81c489bd8c09..cb8af2c9495d 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -12,27 +12,27 @@ buildPythonPackage rec { pname = "readchar"; - version = "3.0.5"; + version = "4.0.3"; format = "setuptools"; # Don't use wheels on PyPI src = fetchFromGitHub { owner = "magmax"; repo = "python-${pname}"; - rev = "v${version}"; - sha256 = "sha256:01bjw3ipdzxq1ijn9354nlya625i26ri7jac1dnlj1d1gdd8m5lx"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-QMaTZRS9iOSuax706Es9WhkwU3vdcNb14dbiSt48aN0="; }; postPatch = '' substituteInPlace setup.cfg \ - --replace "--cov readchar" "" + --replace "--cov=readchar" "" ''; nativeBuildInputs = [ flake8 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pexpect ]; diff --git a/pkgs/development/python-modules/readlike/default.nix b/pkgs/development/python-modules/readlike/default.nix index fae5b1a78720..6fc271f7811a 100644 --- a/pkgs/development/python-modules/readlike/default.nix +++ b/pkgs/development/python-modules/readlike/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1mw8j8ads8hqdbz42siwpffi4wi5s33z9g14a5c2i7vxp8m68qc1"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/pkgs/development/python-modules/readme/default.nix b/pkgs/development/python-modules/readme/default.nix index 95b45185a08c..cf3c7f6e8da8 100644 --- a/pkgs/development/python-modules/readme/default.nix +++ b/pkgs/development/python-modules/readme/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "32fbe1538a437da160fa4e4477270bfdcd8876e2e364d0d12898302644496231"; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index daa9a4d49092..dd733c8ee6e2 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pygments ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index e0ba8cd57cf4..5dab116f146e 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "2.1.8"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pX43E9r3e/kdG6GeS5iIpHwKv+tj7PAuOsd/z9mb/mk="; + sha256 = "sha256-5e/82CWBYRGjd6t6iXuBkhUTj45eisyG+ZIYMo+VckA="; }; propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest mock sphinx ]; + nativeCheckInputs = [ pytest mock sphinx ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix index 897a8239f0fa..fc3b22ec62b9 100644 --- a/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -8,19 +8,25 @@ , requests , pytestCheckHook , responses +, setuptools }: buildPythonPackage rec { pname = "recipe-scrapers"; - version = "14.14.0"; + version = "14.26.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "hhursev"; repo = "recipe-scrapers"; - rev = version; - sha256 = "sha256-3qrjNd1jX4JP3qG9YX8MQqwPh8cvfkZa1tEk0uCwego="; + rev = "refs/tags/${version}"; + hash = "sha256-U7A9HmkXPcuYEsY/uGUVh3LYHDYhV/uizELh1/vXG+U="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ beautifulsoup4 extruct @@ -29,7 +35,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix index 48d92d43ec6e..7804029c0d9b 100644 --- a/pkgs/development/python-modules/recommonmark/default.nix +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0kwm4smxbgq0c0ybkxfvlgrfb3gq9amdw94141jyykk9mmz38379"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ CommonMark docutils sphinx ]; dontUseSetuptoolsCheck = true; diff --git a/pkgs/development/python-modules/recordlinkage/default.nix b/pkgs/development/python-modules/recordlinkage/default.nix index 2e0f03b8972c..64d2457adbdf 100644 --- a/pkgs/development/python-modules/recordlinkage/default.nix +++ b/pkgs/development/python-modules/recordlinkage/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { # pytestCheckHook does not work # Reusing their CI setup which involves 'rm -rf recordlinkage' in preCheck phase do not work too. - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; pythonImportsCheck = [ "recordlinkage" ]; diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix new file mode 100644 index 000000000000..830aeb242815 --- /dev/null +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, icalendar +, pytz +, python-dateutil +, x-wr-timezone +, pytestCheckHook +, restructuredtext_lint +, pygments +, tzdata +}: + +buildPythonPackage rec { + pname = "recurring-ical-events"; + version = "2.0.1"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "niccokunzmann"; + repo = "python-recurring-ical-events"; + rev = "v${version}"; + hash = "sha256-1tmUf0HIKufiocAZPxkTLyicMU0o8dhSjCij2Lc/lyk="; + }; + + propagatedBuildInputs = [ + icalendar + pytz + python-dateutil + x-wr-timezone + ]; + + nativeCheckInputs = [ + pytestCheckHook + restructuredtext_lint + pygments + tzdata + ]; + + pythonImportsCheck = [ "recurring_ical_events" ]; + + meta = { + changelog = "https://github.com/niccokunzmann/python-recurring-ical-events/blob/${src.rev}/README.rst#changelog"; + description = "Repeat ICalendar events by RRULE, RDATE and EXDATE"; + homepage = "https://github.com/niccokunzmann/python-recurring-ical-events"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/redbaron/default.nix b/pkgs/development/python-modules/redbaron/default.nix index 841d6a31fb2c..46123c39496f 100644 --- a/pkgs/development/python-modules/redbaron/default.nix +++ b/pkgs/development/python-modules/redbaron/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { rm tests/test_bounding_box.py ''; #error about fixtures - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/gristlabs/asttokens"; diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index adaf4d86ef69..d16cff4f9280 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "redis"; - version = "4.3.4"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3fJwcd9K3zghxPLKWdZ1JcOoLl8mi+2XuBPLT6v4eIA="; + sha256 = "sha256-e4yH0ZxF0/EnGxJIWNKlwTFgxOdNSDXignNAD6NNUig="; }; propagatedBuildInputs = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - hidredis = [ + hiredis = [ hiredis ]; ocsp = [ diff --git a/pkgs/development/python-modules/rednose/default.nix b/pkgs/development/python-modules/rednose/default.nix index 73b7f5d4758e..fdfcbff877fe 100644 --- a/pkgs/development/python-modules/rednose/default.nix +++ b/pkgs/development/python-modules/rednose/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # Also macOS tests are broken on python38 doCheck = !(isPy27 || (stdenv.isDarwin && pythonAtLeast "3.8")); - checkInputs = [ six ]; + nativeCheckInputs = [ six ]; propagatedBuildInputs = [ nose colorama termstyle ]; meta = with lib; { diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix new file mode 100644 index 000000000000..467d5e1340b4 --- /dev/null +++ b/pkgs/development/python-modules/redshift-connector/default.nix @@ -0,0 +1,62 @@ +{ beautifulsoup4 +, boto3 +, buildPythonPackage +, fetchFromGitHub +, lib +, lxml +, packaging +, pytest-mock +, pytestCheckHook +, pythonOlder +, pytz +, requests +, scramp +}: + +buildPythonPackage rec { + pname = "redshift-connector"; + version = "2.0.910"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "amazon-redshift-python-driver"; + rev = "refs/tags/v${version}"; + hash = "sha256-24yI6pXSHxhT30N3rJXAMtpCOhhGsBuDrwx9jMO1FW0="; + }; + + # disable test coverage + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + + propagatedBuildInputs = [ + beautifulsoup4 + boto3 + lxml + packaging + pytz + requests + scramp + ]; + + nativeCheckInputs = [ + pytest-mock + pytestCheckHook + ]; + + # integration tests require a Redshift cluster + pytestFlagsArray = [ "test/unit" ]; + + __darwinAllowLocalNetworking = true; # required for tests + + meta = { + description = "Redshift interface library"; + homepage = "https://github.com/aws/amazon-redshift-python-driver"; + changelog = "https://github.com/aws/amazon-redshift-python-driver/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mcwitt ]; + }; +} diff --git a/pkgs/development/python-modules/reedsolo/default.nix b/pkgs/development/python-modules/reedsolo/default.nix index 44e2c3b9b449..65006ea823ab 100644 --- a/pkgs/development/python-modules/reedsolo/default.nix +++ b/pkgs/development/python-modules/reedsolo/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = "nosetests"; meta = with lib; { diff --git a/pkgs/development/python-modules/reflink/default.nix b/pkgs/development/python-modules/reflink/default.nix index cb0a9fb5856a..1364f3a4b22e 100644 --- a/pkgs/development/python-modules/reflink/default.nix +++ b/pkgs/development/python-modules/reflink/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedNativeBuildInputs = [ cffi ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index 48505237ae4f..92e5c680b730 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -10,11 +10,12 @@ , pytest-mock , pytestCheckHook , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "regenmaschine"; - version = "2022.11.0"; + version = "2022.11.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-aCgMAaur2ljjiQ7tt/gXm/Vt+o6j/MsCOLN661CkFw4="; + hash = "sha256-0ih0qlN9NxkYkcRl990gVyZF33ymSNUJoNFzpcnqu1o="; }; nativeBuildInputs = [ @@ -32,9 +33,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ aresponses asynctest pytest-aiohttp @@ -57,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with RainMachine smart sprinkler controllers"; homepage = "https://github.com/bachya/regenmaschine"; + changelog = "https://github.com/bachya/regenmaschine/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 1bd2d8b5d871..d41bed6136ed 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "regex"; - version = "2022.9.13"; + version = "2022.10.31"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-8HNztuVqbzoN89dbZRonjKe9NXp5YHiiapWOoc4FiP0="; + hash = "sha256-o6mJIdqaG/hFeu7mpVGUioNgFonl7N1zaJTqm77HfoM="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/regional/default.nix b/pkgs/development/python-modules/regional/default.nix index 26f0755b3fe1..0fc894e9f011 100644 --- a/pkgs/development/python-modules/regional/default.nix +++ b/pkgs/development/python-modules/regional/default.nix @@ -4,38 +4,48 @@ , numpy , scipy , matplotlib -, pytest +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "regional"; version = "1.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "freeman-lab"; repo = pname; rev = "e3a29c58982e5cd3d5700131ac96e5e0b84fb981"; # no tags in repo - sha256 = "03qgm35q9sa5cy0kkw4bj60zfylw0isfzb96nlhdfrsigzs2zkxv"; + hash = "sha256-u88v9H9RZ9cgtSat73QEnHr3gZGL8DmBZ0XphMuoDw8="; }; propagatedBuildInputs = [ + matplotlib numpy scipy - matplotlib ]; - checkInputs = [ - pytest + nativeCheckInputs = [ + pytestCheckHook ]; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ + "regional" + ]; + + disabledTests = [ + "test_dilate" + "test_outline" + "test_mask" + ]; meta = with lib; { description = "Simple manipualtion and display of spatial regions"; homepage = "https://github.com/freeman-lab/regional"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index c9c5011da617..dd75551b34e5 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "reikna"; - version = "0.7.6"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "722fefbd253d0bbcbf5250b7b9c4aca5722cde4ca38bfbf863a551a5fc26edfa"; + sha256 = "sha256-fpa1Pfo5EAafg7Pgha17G6k5G13fdErjclv0On/uYyI="; }; - checkInputs = [ sphinx pytest-cov pytest ]; + nativeCheckInputs = [ sphinx pytest-cov pytest ]; propagatedBuildInputs = [ Mako numpy funcsigs ] ++ lib.optional withCuda pycuda diff --git a/pkgs/development/python-modules/related/default.nix b/pkgs/development/python-modules/related/default.nix index e6716b55b449..8c131e146944 100644 --- a/pkgs/development/python-modules/related/default.nix +++ b/pkgs/development/python-modules/related/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 1baf6f4b0aac..05a18ff34eee 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { fodt = [ python-magic ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.fodt; diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix index 2b7a20a2dd00..738c2f18f661 100644 --- a/pkgs/development/python-modules/remarshal/default.nix +++ b/pkgs/development/python-modules/remarshal/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { u-msgpack-python ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/remi/default.nix b/pkgs/development/python-modules/remi/default.nix index 4e2b9acdf64b..1a6ac76db05c 100644 --- a/pkgs/development/python-modules/remi/default.nix +++ b/pkgs/development/python-modules/remi/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { "self.assertEqual(" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook python-snap7 opencv4 diff --git a/pkgs/development/python-modules/remote-pdb/default.nix b/pkgs/development/python-modules/remote-pdb/default.nix new file mode 100644 index 000000000000..174b0bff311d --- /dev/null +++ b/pkgs/development/python-modules/remote-pdb/default.nix @@ -0,0 +1,18 @@ +{ buildPythonPackage, fetchFromGitHub, lib }: +buildPythonPackage rec { + pname = "remote-pdb"; + version = "2.1.0"; + src = fetchFromGitHub { + owner = "ionelmc"; + repo = "python-remote-pdb"; + rev = "v${version}"; + sha256 = "sha256-/7RysJOJigU4coC6d/Ob2lrtw8u8nLZI8wBk4oEEY3g="; + }; + meta = with lib; { + description = "Remote vanilla PDB (over TCP sockets)."; + homepage = "https://github.com/ionelmc/python-remote-pdb"; + license = licenses.bsd2; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 33e1f0124a7f..321b3daec198 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { tabulate ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index 86192cbc29ca..ffbe1ef8967a 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix new file mode 100644 index 000000000000..2215ac0c28e9 --- /dev/null +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -0,0 +1,71 @@ +{ lib +, aiohttp +, aiounittest +, buildPythonPackage +, fetchFromGitHub +, ffmpeg-python +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "reolink-aio"; + version = "0.3.2"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "starkillerOG"; + repo = "reolink_aio"; + rev = "refs/tags/${version}"; + hash = "sha256-lLq+tmsyySpTO99ecH/uGK9b7/BJFbz5U2fSO/IrPGo="; + }; + + postPatch = '' + # Packages in nixpkgs is different than the module name + substituteInPlace setup.py \ + --replace "ffmpeg" "ffmpeg-python" + ''; + propagatedBuildInputs = [ + aiohttp + ffmpeg-python + requests + ]; + + doCheck = false; # all testse require a network device + + nativeCheckInputs = [ + aiounittest + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/test.py" + ]; + + disabledTests = [ + # Tests require network access + "test1_settings" + "test2_states" + "test3_images" + "test4_properties" + "test_succes" + "test_wrong_host" + "test_wrong_password" + "test_wrong_user" + ]; + + pythonImportsCheck = [ + "reolink_aio" + ]; + + meta = with lib; { + description = "Module to interact with the Reolink IP camera API"; + homepage = "https://github.com/starkillerOG/reolink_aio"; + changelog = "https://github.com/starkillerOG/reolink_aio/releases/tag/${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix index 896eb093cf9b..4ae14db36e2f 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.61"; + version = "0.63"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fwestenberg"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-XUYTDHh0oTro6BT+h4LjRdMukOZTlWP+giFpjLciZNQ="; + hash = "sha256-qwS7frXRk4gCBoAyBFLlbpYsyQZYqMLGB/pdznwyCoA="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ aiounittest pytestCheckHook ]; @@ -61,8 +61,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Python module to interact with the Reolink IP camera API"; + description = "Module to interact with the Reolink IP camera API"; homepage = "https://github.com/fwestenberg/reolink"; + changelog = "https://github.com/fwestenberg/reolink/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/reorder-python-imports/default.nix b/pkgs/development/python-modules/reorder-python-imports/default.nix index 632dbd55356c..00efb26386ba 100644 --- a/pkgs/development/python-modules/reorder-python-imports/default.nix +++ b/pkgs/development/python-modules/reorder-python-imports/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { "reorder_python_imports" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/repeated-test/default.nix b/pkgs/development/python-modules/repeated-test/default.nix index 5d934d2559f8..4d68f52be981 100644 --- a/pkgs/development/python-modules/repeated-test/default.nix +++ b/pkgs/development/python-modules/repeated-test/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/reportengine/default.nix b/pkgs/development/python-modules/reportengine/default.nix index 6168f62d463d..17720e8bec2b 100644 --- a/pkgs/development/python-modules/reportengine/default.nix +++ b/pkgs/development/python-modules/reportengine/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "reportengine"; - version = "0.30.dev0"; + version = "0.31"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "eb612994b7f364e872301b4569b544648e95e587d803284ddb5610efc8f2170f"; + sha256 = "sha256-jrt+ml8o1PUidV1bY0hCyNgcPaVTBloW574/i5Pl7iE="; }; nativeBuildInputs = [ flit ]; @@ -36,7 +36,7 @@ buildPythonPackage rec { curio ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pandoc pytestCheckHook diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 7a58aaddaace..81aa02c6349d 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -12,18 +12,18 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.6.11"; + version = "3.6.12"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BPxEIPBUiBXQYj4DHIah9/PzAD5pnZr3FIdC4tcrAko="; + sha256 = "sha256-sTzr9OOXu6FFQrzQIzOLb/LBUaOhKqvKie7L+XLLNho="; }; patches = [ ./darwin-m1-compat.patch ]; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; buildInputs = [ ft pillow ]; diff --git a/pkgs/development/python-modules/repoze_who/default.nix b/pkgs/development/python-modules/repoze_who/default.nix index 47bb842cc875..fb946fc1eb19 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.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ikybkmi0/w7dkG6Xwu7XzoPrn2LkJQv+A7zbum0xojc="; + sha256 = "sha256-6VWt8AwfCwxxXoKJeaI37Ev37nCCe9l/Xhe/gnYNyzA="; }; propagatedBuildInputs = [ zope_interface webob ]; diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index a8643ca65073..2bc59b553507 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "reproject"; - version = "0.9"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zhjI4MjlCV9zR0nNcss+C36CZXY/imGsalfKMGacfi0="; + hash = "sha256-pXSUVeTrxtSqKTa286xdCAAFipg38iR4XSO6CRfWXtc="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ pytest-astropy pytestCheckHook ]; diff --git a/pkgs/development/python-modules/reqif/default.nix b/pkgs/development/python-modules/reqif/default.nix index ace3052e5a9c..a419e70cf1a9 100644 --- a/pkgs/development/python-modules/reqif/default.nix +++ b/pkgs/development/python-modules/reqif/default.nix @@ -1,13 +1,11 @@ { lib , buildPythonPackage , python -, pythonOlder , fetchFromGitHub , poetry-core , beautifulsoup4 , lxml , jinja2 -, dataclasses , pytestCheckHook }: @@ -39,15 +37,13 @@ buildPythonPackage rec { beautifulsoup4 lxml jinja2 - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses ]; pythonImportsCheck = [ "reqif" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index e024efb58b0f..d67f8f364ea2 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "requests-aws4auth"; - version = "1.1.2"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tedder"; repo = pname; - rev = "v${version}"; - hash = "sha256-/SqU/ojP9I4JXzR0c5tLzxx9UyNaVsON7LG/dbdeiH0="; + rev = "refs/tags/v${version}"; + hash = "sha256-Dr3i+5xTKLKOMjGkCdKhkK2BCV8/FgTGMtGsYtvB5s8="; }; propagatedBuildInputs = [ @@ -29,10 +29,12 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - httpx = [ httpx ]; + httpx = [ + httpx + ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.httpx; @@ -43,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Amazon Web Services version 4 authentication for the Python Requests library"; homepage = "https://github.com/sam-washington/requests-aws4auth"; + changelog = "https://github.com/tedder/requests-aws4auth/releases/tag/v${version}"; license = licenses.mit; 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 21648484b2f6..5cb90496ea61 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock rich diff --git a/pkgs/development/python-modules/requests-credssp/default.nix b/pkgs/development/python-modules/requests-credssp/default.nix index 20ce327b4eda..8c7dfc3aee8d 100644 --- a/pkgs/development/python-modules/requests-credssp/default.nix +++ b/pkgs/development/python-modules/requests-credssp/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix index d8cd9d81c94d..de7a94c75aa0 100644 --- a/pkgs/development/python-modules/requests-file/default.nix +++ b/pkgs/development/python-modules/requests-file/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix index 96ade3b45f6d..36b993d79553 100644 --- a/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/pkgs/development/python-modules/requests-http-signature/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix index 3a1382061bd7..38a38f27dfa4 100644 --- a/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/pkgs/development/python-modules/requests-kerberos/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pyspnego ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix index 85b9d9fe35fb..992dee5eda85 100644 --- a/pkgs/development/python-modules/requests-mock/default.nix +++ b/pkgs/development/python-modules/requests-mock/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests six ]; - checkInputs = [ mock purl testrepository testtools pytest ]; + nativeCheckInputs = [ mock purl testrepository testtools pytest ]; meta = with lib; { description = "Mock out responses from the requests package"; diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index d42de957791e..d34d6c5c40e4 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ oauthlib requests ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook requests-mock diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index af6788d173fc..cfb58b4faef4 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -11,43 +11,24 @@ buildPythonPackage rec { pname = "requests-toolbelt"; - version = "0.9.1"; + version = "0.10.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-loCJ1FhK1K18FxRU8KXG2sI5celHJSHqO21J1hCqb8A="; + hash = "sha256-YuCff/XMvakncqKfOUpJw61ssYHVaLEzdiayq7Yopj0="; }; propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ betamax mock pytestCheckHook ]; - patches = [ - (fetchpatch { - # Fix collections.abc deprecation warning, https://github.com/requests/toolbelt/pull/246 - name = "fix-collections-abc-deprecation.patch"; - url = "https://github.com/requests/toolbelt/commit/7188b06330e5260be20bce8cbcf0d5ae44e34eaf.patch"; - sha256 = "sha256-pRkG77sNglG/KsRX6JaPgk4QxmmSBXypFRp/vNA3ot4="; - }) - # Make pyopenssl optional - (fetchpatch { - url = "https://github.com/requests/toolbelt/commit/c7c1f8626b73e5715e6ecc1de0833fabdfd67323.patch"; - sha256 = "sha256-OhE3nyYyKKRHs9rCq8EJYebwaYyjWjbvbtL79MIMMRc="; - }) - # Make pyopenssl optional - (fetchpatch { - url = "https://github.com/requests/toolbelt/commit/2453f32f1c995e7b19294750a4177bc32326826e.patch"; - sha256 = "sha256-qmKHp+aVeazZt8X+sZeYfZCB56SE0OvFvWCXRZtkCew="; - }) - ]; - disabledTests = [ # https://github.com/requests/toolbelt/issues/306 "test_no_content_length_header" diff --git a/pkgs/development/python-modules/requests-unixsocket/default.nix b/pkgs/development/python-modules/requests-unixsocket/default.nix index 57f4d5787c67..4e32c712e180 100644 --- a/pkgs/development/python-modules/requests-unixsocket/default.nix +++ b/pkgs/development/python-modules/requests-unixsocket/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook waitress ]; diff --git a/pkgs/development/python-modules/requests/0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch b/pkgs/development/python-modules/requests/0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch deleted file mode 100644 index de6a4b5c1b57..000000000000 --- a/pkgs/development/python-modules/requests/0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch +++ /dev/null @@ -1,60 +0,0 @@ -From b36083efafec5a3c1c5864cd0b62367ddf3856ae Mon Sep 17 00:00:00 2001 -From: Keshav Kini -Date: Sun, 16 May 2021 20:35:24 -0700 -Subject: [PATCH] Prefer NixOS/Nix default CA bundles over certifi - -Normally, requests gets its default CA bundle from the certifi -package. On NixOS and when using Nix on non-NixOS platforms, we would -rather default to using our own certificate bundles controlled by the -Nix/NixOS user. - -This commit overrides requests.certs.where(), which previously was -just aliased to certifi.where(), so that now it does the following: - -- When run by Nix on non-NixOS, the environment variable - $NIX_SSL_CERT_FILE will point to the CA bundle we're using, so we - use that. - -- When running on NixOS, the CA bundle we're using has the static path - /etc/ssl/certs/ca-certificates.crt , so we use that. - -- Otherwise, we fall back to the original behavior of using certifi's - CA bundle. Higher in the call stack, users of requests can also - explicitly specify a CA bundle to use, which overrides all this - logic. ---- - requests/certs.py | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - -diff --git a/requests/certs.py b/requests/certs.py -index d1a378d7..faf462b7 100644 ---- a/requests/certs.py -+++ b/requests/certs.py -@@ -12,7 +12,23 @@ If you are packaging Requests, e.g., for a Linux distribution or a managed - environment, you can change the definition of where() to return a separately - packaged CA bundle. - """ --from certifi import where -+ -+import os -+ -+import certifi -+ -+ -+def where(): -+ nix_ssl_cert_file = os.getenv("NIX_SSL_CERT_FILE") -+ if nix_ssl_cert_file and os.path.exists(nix_ssl_cert_file): -+ return nix_ssl_cert_file -+ -+ nixos_ca_bundle = "/etc/ssl/certs/ca-certificates.crt" -+ if os.path.exists(nixos_ca_bundle): -+ return nixos_ca_bundle -+ -+ return certifi.where() -+ - - if __name__ == '__main__': - print(where()) --- -2.31.1 - diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 5eab25fa3e15..dfa4b16c8e98 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -6,6 +6,7 @@ , chardet , charset-normalizer , fetchPypi +, fetchpatch , idna , pysocks , pytest-mock @@ -17,21 +18,18 @@ buildPythonPackage rec { pname = "requests"; - version = "2.28.1"; + version = "2.28.2"; + format = "setuptools"; + disabled = pythonOlder "3.7"; __darwinAllowLocalNetworking = true; src = fetchPypi { inherit pname version; - hash = "sha256-fFWZsQL+3apmHIJsVqtP7ii/0X9avKHrvj5/GdfJeYM="; + hash = "sha256-mLGyeC48bEkEk4uEwOuTJyEGnf25E0MTvv98g8LfJL8="; }; - patches = [ - # Use the default NixOS CA bundle from the certifi package - ./0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch - ]; - propagatedBuildInputs = [ brotlicffi certifi @@ -50,7 +48,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytest-xdist pytestCheckHook @@ -89,6 +87,7 @@ buildPythonPackage rec { meta = with lib; { description = "HTTP library for Python"; homepage = "http://docs.python-requests.org/"; + changelog = "https://github.com/psf/requests/blob/v${version}/HISTORY.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/requirements-detector/default.nix b/pkgs/development/python-modules/requirements-detector/default.nix index fa1b381126e2..d1c480698287 100644 --- a/pkgs/development/python-modules/requirements-detector/default.nix +++ b/pkgs/development/python-modules/requirements-detector/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/requirements-parser/default.nix b/pkgs/development/python-modules/requirements-parser/default.nix index 3e26c91014a4..e3b6d71d6633 100644 --- a/pkgs/development/python-modules/requirements-parser/default.nix +++ b/pkgs/development/python-modules/requirements-parser/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { types-setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index 190463f8f25e..f9827dca48d6 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { numba ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook scipy ]; diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix index 30345ae654e4..97304376b0e0 100644 --- a/pkgs/development/python-modules/resolvelib/default.nix +++ b/pkgs/development/python-modules/resolvelib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "198vfv78hilpg0d0mjzchzp9zk6239wnra61vlsgwpcgz66d2bgv"; }; - checkInputs = [ + nativeCheckInputs = [ commentjson pytestCheckHook ]; diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 21e3dd38cdb8..c549b86bbf16 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -1,16 +1,20 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytest-localserver +, pytest-asyncio +, pytest-httpserver , pytestCheckHook , pythonOlder , requests +, toml +, types-toml +, typing-extensions , urllib3 }: buildPythonPackage rec { pname = "responses"; - version = "0.21.0"; + version = "0.22.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,16 +25,22 @@ buildPythonPackage rec { owner = "getsentry"; repo = pname; rev = version; - hash = "sha256-qYohrXrQkUBPo7yC+ZOwidDaCg/2nteXKAOCUvR4k2Q="; + hash = "sha256-VOIpowxPvYmufnj9MM/vMtZQDIOxorAhMCNK0fX/j1U="; }; propagatedBuildInputs = [ requests + toml + types-toml urllib3 + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; - checkInputs = [ - pytest-localserver + + nativeCheckInputs = [ + pytest-asyncio + pytest-httpserver pytestCheckHook ]; diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix index 4d4e4e1175d8..153fe4d8b4b7 100644 --- a/pkgs/development/python-modules/respx/default.nix +++ b/pkgs/development/python-modules/respx/default.nix @@ -12,20 +12,20 @@ buildPythonPackage rec { pname = "respx"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "lundberg"; repo = pname; rev = version; - sha256 = "sha256-xb5jb+l6wA1v/r2yGUB6IuUVXIaTc+3O/w5xn/+A74o="; + sha256 = "sha256-Qs3+NWMKiAFlKTTosdyHOxWRPKFlYQD20+MKiKR371U="; }; propagatedBuildInputs = [ httpx ]; - checkInputs = [ + nativeCheckInputs = [ httpcore httpx flask diff --git a/pkgs/development/python-modules/restfly/default.nix b/pkgs/development/python-modules/restfly/default.nix index 067230e804c6..8ebc4ee2b880 100644 --- a/pkgs/development/python-modules/restfly/default.nix +++ b/pkgs/development/python-modules/restfly/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { python-box ]; - checkInputs = [ + nativeCheckInputs = [ pytest-datafiles pytest-vcr pytestCheckHook diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index 6e782b1bd336..08df5a3d9fd5 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -3,20 +3,23 @@ , fetchPypi , pytest-mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "restrictedpython"; - version = "5.2"; + version = "6.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { pname = "RestrictedPython"; inherit version; - sha256 = "sha256-Y02h9sXBIqJi9DOwg+49F6mgOfjxs3eFl++0dGHNNhs="; + hash = "sha256-QFzwvZ7sLxmxMmtfSCKO/lbWWQtOkYJrjMOyzUAKlq0="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; @@ -28,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Restricted execution environment for Python to run untrusted code"; homepage = "https://github.com/zopefoundation/RestrictedPython"; + changelog = "https://github.com/zopefoundation/RestrictedPython/blob/${version}/CHANGES.rst"; license = licenses.zpl21; maintainers = with maintainers; [ juaningan ]; }; diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix index 0033794ef437..08c22ae26770 100644 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-GyNcDJIjQatsUwOQiS656S+QubdQRgY+BHys+w8FDEU="; }; - checkInputs = [ nose testtools ]; + nativeCheckInputs = [ nose testtools ]; propagatedBuildInputs = [ docutils ]; checkPhase = '' diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index fe41a3c9516b..817577cc447f 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pygments ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/result/default.nix b/pkgs/development/python-modules/result/default.nix index f8c8c7f2b509..2b5764458f9e 100644 --- a/pkgs/development/python-modules/result/default.nix +++ b/pkgs/development/python-modules/result/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { --replace '"--cov-report=xml",' "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/retry/default.nix b/pkgs/development/python-modules/retry/default.nix index 03deee5bae21..e093f761f251 100644 --- a/pkgs/development/python-modules/retry/default.nix +++ b/pkgs/development/python-modules/retry/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { py ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/retry_decorator/default.nix b/pkgs/development/python-modules/retry_decorator/default.nix index c2f91c8fe1b1..a2c984dfe412 100644 --- a/pkgs/development/python-modules/retry_decorator/default.nix +++ b/pkgs/development/python-modules/retry_decorator/default.nix @@ -1,21 +1,36 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - pname = "retry_decorator"; + pname = "retry-decorator"; version = "1.1.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "e1e8ad02e518fe11073f2ea7d80b6b8be19daa27a60a1838aff7c731ddcf2ebe"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pnpnpn"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-0dZq4YbPcH4ItyMnpF7B20YYLtzwniJClBK9gRndU1M="; }; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "retry_decorator" + ]; + meta = with lib; { + description = "Decorator for retrying when exceptions occur"; homepage = "https://github.com/pnpnpn/retry-decorator"; - description = "Retry Decorator for python functions"; - license = licenses.mit; + changelog = "https://github.com/pnpnpn/retry-decorator/releases/tag/v${version}"; + license = with licenses; [ asl20 ]; }; - } diff --git a/pkgs/development/python-modules/retrying/default.nix b/pkgs/development/python-modules/retrying/default.nix index 5e2451affb90..36e76f6bc6c7 100644 --- a/pkgs/development/python-modules/retrying/default.nix +++ b/pkgs/development/python-modules/retrying/default.nix @@ -2,26 +2,36 @@ , buildPythonPackage , fetchPypi , six +, pythonOlder }: buildPythonPackage rec { pname = "retrying"; - version = "1.3.3"; + version = "1.3.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0fwp86xv0rvkncjdvy2mwcvbglw4w9k0fva25i7zx8kd19b3kh08"; + hash = "sha256-NF2oxXZb2YKx0ZFd65EC/T0fetFr2EqXALhfZNJOjz4="; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + ]; # doesn't ship tests in tarball doCheck = false; - meta = with lib; { - homepage = "https://github.com/rholder/retrying"; - description = "General-purpose retrying library"; - license = licenses.asl20; - }; + pythonImportsCheck = [ + "retrying" + ]; + meta = with lib; { + description = "General-purpose retrying library"; + homepage = "https://github.com/rholder/retrying"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; } diff --git a/pkgs/development/python-modules/retworkx/default.nix b/pkgs/development/python-modules/retworkx/default.nix index 62b419def880..1e42af234c25 100644 --- a/pkgs/development/python-modules/retworkx/default.nix +++ b/pkgs/development/python-modules/retworkx/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; pythonImportsCheck = [ "retworkx" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook fixtures graphviz diff --git a/pkgs/development/python-modules/rfc3339-validator/default.nix b/pkgs/development/python-modules/rfc3339-validator/default.nix index d821d672a294..e1a9f0318882 100644 --- a/pkgs/development/python-modules/rfc3339-validator/default.nix +++ b/pkgs/development/python-modules/rfc3339-validator/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook hypothesis strict-rfc3339 ]; + nativeCheckInputs = [ pytestCheckHook hypothesis strict-rfc3339 ]; pythonImportsCheck = [ "rfc3339_validator" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/rfc3986-validator/default.nix b/pkgs/development/python-modules/rfc3986-validator/default.nix new file mode 100644 index 000000000000..823eb16aef1a --- /dev/null +++ b/pkgs/development/python-modules/rfc3986-validator/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, hypothesis +, rfc3987 +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "rfc3986-validator"; + version = "0.1.1"; + format = "setuptools"; + + src = fetchPypi { + pname = "rfc3986_validator"; + inherit version; + hash = "sha256-PUS955IbO57Drk463KNwQ47M68Z2RWRJsUXVM7JA0FU="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" + ''; + + nativeCheckInputs = [ + hypothesis + pytestCheckHook + rfc3987 + ]; + + meta = with lib; { + description = "Pure python rfc3986 validator"; + homepage = "https://github.com/naimetti/rfc3986-validator"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix index f8fcc9aef7ab..ed29754b66ba 100644 --- a/pkgs/development/python-modules/rfc3986/default.nix +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { idna ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rfc6555/default.nix b/pkgs/development/python-modules/rfc6555/default.nix index e866df5d122e..d33d518fcea5 100644 --- a/pkgs/development/python-modules/rfc6555/default.nix +++ b/pkgs/development/python-modules/rfc6555/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-Lmwgusc4EQlF0GHmMTUxWzUCjBk19cvurNwbOnT+1jM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rfcat/default.nix b/pkgs/development/python-modules/rfcat/default.nix index 0828287ff84a..edb17bc813fd 100644 --- a/pkgs/development/python-modules/rfcat/default.nix +++ b/pkgs/development/python-modules/rfcat/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , future @@ -6,14 +7,13 @@ , numpy , pyserial , pyusb -, hostPlatform , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "rfcat"; - version = "1.9.6"; + version = "1.9.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "atlas0fd00m"; repo = "rfcat"; rev = "refs/tags/v${version}"; - hash = "sha256-7iYz7YY9zpnJmLfCmp/sF21eZ21HMGq2sLQIENxbr34="; + hash = "sha256-VOLA/ZZLazW7u0VYkAHzDh4aaHGr3u09bKVOkhYk6Fk="; }; propagatedBuildInputs = [ @@ -33,12 +33,12 @@ buildPythonPackage rec { pyusb ]; - postInstall = lib.optionalString hostPlatform.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/etc/udev/rules.d cp etc/udev/rules.d/20-rfcat.rules $out/etc/udev/rules.d ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rflink/default.nix b/pkgs/development/python-modules/rflink/default.nix index f966b7ccba9b..a751ef1d4c0e 100644 --- a/pkgs/development/python-modules/rflink/default.nix +++ b/pkgs/development/python-modules/rflink/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index 4b6f8b4874c8..4c4de7f75d8b 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rich-click"; - version = "1.5.2"; + version = "1.6.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ewels"; repo = pname; - rev = "v${version}"; - hash = "sha256-eW5CR7ReVsFLJ09F4EUQbvFB+GdlnTay0bX4NNLQ0xo="; + rev = "refs/tags/v${version}"; + hash = "sha256-Be6okg3zmbdbdlB4/uwioUxn6CZUay/istiIoiFrsJk="; }; propagatedBuildInputs = [ @@ -26,17 +26,6 @@ buildPythonPackage rec { rich ]; - passthru.optional-dependencies = { - typer = [ - typer - ]; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "typer>=0.4,<0.6" "typer>=0.4" - ''; - # Module has no test doCheck = false; @@ -47,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to format click help output nicely with rich"; homepage = "https://github.com/ewels/rich-click"; + changelog = "https://github.com/ewels/rich-click/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/rich-rst/default.nix b/pkgs/development/python-modules/rich-rst/default.nix index f15e565bd043..f278db19a287 100644 --- a/pkgs/development/python-modules/rich-rst/default.nix +++ b/pkgs/development/python-modules/rich-rst/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "A beautiful reStructuredText renderer for rich"; homepage = "https://github.com/wasi-master/rich-rst"; license = licenses.mit; - maintainers = with maintainers; [ jyooru ]; + maintainers = with maintainers; [ joelkoen ]; }; } diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index c2cd935c651f..b263a2d08cbe 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -1,10 +1,8 @@ { lib -, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder , CommonMark -, dataclasses , poetry-core , pygments , typing-extensions @@ -19,15 +17,15 @@ buildPythonPackage rec { pname = "rich"; - version = "12.5.1"; + version = "13.0.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Textualize"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-FjzvFx+A4DS2XeKBZ2DGRqudvH22AUSQJnIxKs2O0AU="; + rev = "refs/tags/v${version}"; + hash = "sha256-Mc2ZTpn2cPGXIBblwwukJGiD8etdVi8ag9Xb77gG62A="; }; nativeBuildInputs = [ poetry-core ]; @@ -35,21 +33,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ CommonMark pygments - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses ] ++ lib.optionals (pythonOlder "3.9") [ typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ - # darwin console duplicates 3 of 4 lines - "test_rich_console_ex" - ]; - pythonImportsCheck = [ "rich" ]; passthru.tests = { @@ -60,6 +51,6 @@ buildPythonPackage rec { description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"; homepage = "https://github.com/Textualize/rich"; license = licenses.mit; - maintainers = with maintainers; [ ris jyooru ]; + maintainers = with maintainers; [ ris joelkoen ]; }; } diff --git a/pkgs/development/python-modules/rig/default.nix b/pkgs/development/python-modules/rig/default.nix deleted file mode 100644 index bc43aac3551a..000000000000 --- a/pkgs/development/python-modules/rig/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, isPy35, isPy27 -, numpy, pytz, six, enum-compat, sentinel -}: - -buildPythonPackage rec { - pname = "rig"; - version = "2.4.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "5a3896dbde3f291c5dd34769e7329ef5d5e4da34fee53479bd13dc5e5d540b8a"; - }; - - propagatedBuildInputs = [ numpy pytz six sentinel enum-compat ]; - - # This is the list of officially supported versions. Other versions may work - # as well. - disabled = !(isPy27 || isPy35); - - # Test Phase is only supported in development sources. - doCheck = false; - - meta = with lib; { - description = "A collection of tools for developing SpiNNaker applications"; - homepage = "https://github.com/project-rig/rig"; - license = licenses.gpl2; - }; -} diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix index bffa6fed7d12..a484f6bff0b4 100644 --- a/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix index 6d3c9d5e397d..639d2637f80a 100644 --- a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix +++ b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix @@ -1,24 +1,27 @@ { lib -, python-dateutil -, python-socketio -, requests -, jsonschema -, pythonOlder -, pytestCheckHook , buildPythonPackage , fetchFromGitHub +, jsonschema +, pytestCheckHook +, python-dateutil +, python-socketio +, pythonOlder +, requests }: buildPythonPackage rec { pname = "ripe-atlas-cousteau"; version = "1.5.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "RIPE-NCC"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EHZt9Po/1wDwDacXUCVGcuVSOwcIkPCT2JCKGchu8G4="; + hash = "sha256-EHZt9Po/1wDwDacXUCVGcuVSOwcIkPCT2JCKGchu8G4="; }; postPatch = '' @@ -30,9 +33,9 @@ buildPythonPackage rec { python-dateutil requests python-socketio - ]; + ] ++ python-socketio.optional-dependencies.client; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook jsonschema ]; @@ -44,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client library for RIPE ATLAS API"; homepage = "https://github.com/RIPE-NCC/ripe-atlas-cousteau"; + changelog = "https://github.com/RIPE-NCC/ripe-atlas-cousteau/blob/v${version}/CHANGES.rst"; license = licenses.gpl3Only; maintainers = with maintainers; [ raitobezarius ]; }; diff --git a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix index 3b3b16ce78e5..a9ed4bd3f52c 100644 --- a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix +++ b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix index 5317b39f083a..61e340057a99 100644 --- a/pkgs/development/python-modules/ripser/default.nix +++ b/pkgs/development/python-modules/ripser/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { persim ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rising/default.nix b/pkgs/development/python-modules/rising/default.nix index 553724807261..ab52aec1a236 100644 --- a/pkgs/development/python-modules/rising/default.nix +++ b/pkgs/development/python-modules/rising/default.nix @@ -1,9 +1,12 @@ -{ lib +{ stdenv +, lib , buildPythonPackage -, isPy27 +, pythonOlder , fetchFromGitHub , pytestCheckHook +, pythonRelaxDepsHook , dill +, lightning-utilities , numpy , torch , threadpoolctl @@ -12,21 +15,38 @@ buildPythonPackage rec { pname = "rising"; - version = "0.2.1"; - - disabled = isPy27; + version = "0.3.0"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "PhoenixDL"; repo = pname; - rev = "v${version}"; - sha256 = "15wYWToXRae1cMpHWbJwzAp0THx6ED9ixQgL+n1v9PI="; + rev = "refs/tags/v${version}"; + hash = "sha256-sBzVTst5Tp2oZZ+Xsg3M7uAMbucL6idlpYwHvib3EaY="; }; - propagatedBuildInputs = [ numpy torch threadpoolctl tqdm ]; - checkInputs = [ dill pytestCheckHook ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; - disabledTests = [ "test_affine" ]; # deprecated division operator '/' + pythonRelaxDeps = [ "lightning-utilities" ]; + + propagatedBuildInputs = [ + lightning-utilities numpy torch threadpoolctl tqdm + ]; + nativeCheckInputs = [ dill pytestCheckHook ]; + disabledTests = lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly: + "test_progressive_resize_integration" + ]; + + pythonImportsCheck = [ + "rising" + "rising.loading" + "rising.ops" + "rising.random" + "rising.transforms" + "rising.transforms.functional" + "rising.utils" + ]; meta = { description = "High-performance data loading and augmentation library in PyTorch"; diff --git a/pkgs/development/python-modules/rki-covid-parser/default.nix b/pkgs/development/python-modules/rki-covid-parser/default.nix index 928723897b5d..0f7b47a01228 100644 --- a/pkgs/development/python-modules/rki-covid-parser/default.nix +++ b/pkgs/development/python-modules/rki-covid-parser/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-aiohttp pytestCheckHook diff --git a/pkgs/development/python-modules/rkm-codes/default.nix b/pkgs/development/python-modules/rkm-codes/default.nix new file mode 100644 index 000000000000..5c3ddf70e91d --- /dev/null +++ b/pkgs/development/python-modules/rkm-codes/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flitBuildHook +, setuptools +}: + +buildPythonPackage rec { + pname = "rkm-codes"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "KenKundert"; + repo = "rkm_codes"; + rev = "v${version}"; + sha256 = "sha256-r4F72iHxH7BoPtgYm1RD6BeSZszKRrpeBQccmT4wzuw="; + }; + + format = "pyproject"; + nativeBuildInputs = [ + flitBuildHook + ]; + propagatedBuildInputs = [ + setuptools + ]; + + # this has a circular dependency on quantiphy + preBuild = '' + sed -i '/quantiphy/d' ./setup.py + sed -i '/pytest-runner/d' ./setup.py + ''; + + # this import check will fail as quantiphy is imported by this package + # pythonImportsCheck = [ "rkm_codes" ]; + + # tests require quantiphy import + doCheck = false; + + meta = with lib; { + description = "QuantiPhy support for RKM codes"; + homepage = "https://github.com/kenkundert/rkm_codes/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/pkgs/development/python-modules/rl-coach/default.nix b/pkgs/development/python-modules/rl-coach/default.nix index 0724abec19a9..f1da92d056d2 100644 --- a/pkgs/development/python-modules/rl-coach/default.nix +++ b/pkgs/development/python-modules/rl-coach/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/rlax/default.nix b/pkgs/development/python-modules/rlax/default.nix index c23f7d9cce3a..ac4aac2be5d2 100644 --- a/pkgs/development/python-modules/rlax/default.nix +++ b/pkgs/development/python-modules/rlax/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { tensorflow-probability ]; - checkInputs = [ + nativeCheckInputs = [ bsuite dm-env dm-haiku diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index e0736cdf0506..7999e59b2de7 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { eth-utils ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rmrl/default.nix b/pkgs/development/python-modules/rmrl/default.nix index 747fba8302b1..48a33ca47cde 100644 --- a/pkgs/development/python-modules/rmrl/default.nix +++ b/pkgs/development/python-modules/rmrl/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub , poetry-core , pdfrw , reportlab @@ -12,15 +12,17 @@ buildPythonPackage rec { pname = "rmrl"; - version = "0.2.1"; + version = "unstable-2022-12-11"; disabled = pythonOlder "3.7"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "c532bef4168350e6ab17cf37c6481dc12b6a78e007c073503f082f36215b71c9"; + src = fetchFromGitHub { + owner = "naturale0"; + repo = "rmrl"; + rev = "3c908536f11dfa92f81e7127ae76f18f0b2cc3e3"; + hash = "sha256-13pMfRe2McWDpBTlJy/TBT0W5wyd0EXDoocxeIzmqCo="; }; nativeBuildInputs = [ @@ -42,7 +44,7 @@ buildPythonPackage rec { meta = { description = "Render reMarkable documents to PDF"; - homepage = "https://github.com/rschroll/rmrl"; + homepage = "https://github.com/naturale0/rmrl"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/rnginline/default.nix b/pkgs/development/python-modules/rnginline/default.nix index a64c035dbc95..20c5b2205648 100644 --- a/pkgs/development/python-modules/rnginline/default.nix +++ b/pkgs/development/python-modules/rnginline/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index a219977348fa..7383946dcb16 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.4.1"; + version = "0.4.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-bUhVnkFgfwhHe8zFLICOXHluecp0hZlD10I1AtpWO8o="; + hash = "sha256-1cTGzZ/5YgaYpSdk8nGLqgpKBNyY16fCFmrUJ+QwSDM="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cryptography-based networking stack for wide-area networks"; homepage = "https://github.com/markqvist/Reticulum"; + changelog = "https://github.com/markqvist/Reticulum/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index 504a5ac557ea..e0f04758b66f 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "RoboMachine"; - version = "0.9.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "4251d405759a38f1e665acc245dcbcdec319376718169a73c57560183370fe0e"; + sha256 = "sha256-XrxHaV9U7mZ2TvySHGm6qw1AsoukppzwPq4wufIjL+k="; }; propagatedBuildInputs = [ pyparsing robotframework allpairspy ]; diff --git a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix index 01e6a98c0228..aa769a3037d4 100644 --- a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix +++ b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , pytest-mockito , pytestCheckHook , robotframework @@ -10,7 +9,7 @@ buildPythonPackage rec { pname = "robotframework-pythonlibcore"; - version = "4.0.0"; + version = "4.1.0"; disabled = pythonOlder "3.7"; @@ -20,18 +19,10 @@ buildPythonPackage rec { owner = "robotframework"; repo = "PythonLibCore"; rev = "v${version}"; - hash = "sha256-86o5Lh9zWo4vUF2186dN7e8tTUu5PIxM/ZukPwNl0S8="; + hash = "sha256-BgnllONYJjfeKIN8BLfMw1iZrVewtXB1KN8b9KjdtK0="; }; - patches = [ - (fetchpatch { - name = "fix-finding-version.patch"; - url = "https://github.com/robotframework/PythonLibCore/commit/84c73979e309f59de057ae6a77725ab0f468b71f.patch"; - hash = "sha256-zrjsNvXpJDLpXql200NV+QGWFLtnRVZTeAjT52dRn2s="; - }) - ]; - - checkInputs = [ + nativeCheckInputs = [ pytest-mockito pytestCheckHook robotframework diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index 7f08c345bc6b..f885d4df057f 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { selenium ]; - checkInputs = [ + nativeCheckInputs = [ approvaltests pytest-mockito pytestCheckHook diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/pkgs/development/python-modules/robotframework-tools/default.nix index 2c2fe3945b09..9b224775f6e7 100644 --- a/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/pkgs/development/python-modules/robotframework-tools/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { "setup_requires=SETUP_REQUIRES + (zfg.SETUP_REQUIRES or [])," "" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "test" ]; pythonImportsCheck = [ "robottools" ]; diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index 4f925c341dcf..eb8ebbeba157 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -2,16 +2,16 @@ buildPythonPackage rec { pname = "robotframework"; - version = "5.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-aJUXqY6OFlbdLIr5Qpg27mGFm6hD+WvCrqXmf204WUo="; + sha256 = "sha256-c7pPcDgqyqWQtiMbLQbQd0nAgx4TIFUFHrlBVDNdr8M="; }; - checkInputs = [ jsonschema ]; + nativeCheckInputs = [ jsonschema ]; checkPhase = '' python3 utest/run.py diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix index 8e51b8409421..9bd1f6f811c5 100644 --- a/pkgs/development/python-modules/robotsuite/default.nix +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage , fetchPypi -, unittest2 , lxml , robotframework , pytestCheckHook +, six }: buildPythonPackage rec { @@ -16,16 +16,13 @@ buildPythonPackage rec { sha256 = "sha256-iugVKUPl6HTTO8K1EbSqAk1fl/fsEPoOcsOnnAgcEas="; }; - buildInputs = [ - unittest2 - ]; - propagatedBuildInputs = [ robotframework lxml + six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/roku/default.nix b/pkgs/development/python-modules/roku/default.nix index c82eda6e35c0..c4826e6bc4ad 100644 --- a/pkgs/development/python-modules/roku/default.nix +++ b/pkgs/development/python-modules/roku/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest flask ]; + nativeCheckInputs = [ pytest flask ]; pythonImportsCheck = [ "roku" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index e584fcdda879..44ea38934b9f 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytest-freezegun diff --git a/pkgs/development/python-modules/rollbar/default.nix b/pkgs/development/python-modules/rollbar/default.nix index 93a0349b9bdc..125c3732efe9 100644 --- a/pkgs/development/python-modules/rollbar/default.nix +++ b/pkgs/development/python-modules/rollbar/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ webob blinker mock diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix index beb72d887826..c1ee853a105c 100644 --- a/pkgs/development/python-modules/roombapy/default.nix +++ b/pkgs/development/python-modules/roombapy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { paho-mqtt ]; - checkInputs = [ + nativeCheckInputs = [ amqtt pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix index 84909ca05659..ae3116de9ae5 100644 --- a/pkgs/development/python-modules/roonapi/default.nix +++ b/pkgs/development/python-modules/roonapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "roonapi"; - version = "0.1.1"; + version = "0.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pavoni"; repo = "pyroon"; rev = version; - sha256 = "sha256-GEgm250uALTXIEMBWmluqGw/dw2TfGmUIcItfzonGkU="; + hash = "sha256-QOFBNTz8g3f6C8Vjkblrd3QFCRrA1WqOCv6xS4GbFC4="; }; nativeBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to interface with the Roon API"; homepage = "https://github.com/pavoni/pyroon"; + changelog = "https://github.com/pavoni/pyroon/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 21d5886efe21..3a9c947a118d 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -1,33 +1,51 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, nose }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytoolconfig +, pytest-timeout +, pytestCheckHook +, pythonOlder +, setuptools +}: buildPythonPackage rec { pname = "rope"; - version = "0.18.0"; + version = "1.6.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "786b5c38c530d4846aa68a42604f61b4e69a493390e3ca11b88df0fbfdc3ed04"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "python-rope"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-avNCti288dY9pl5AVTmUzZU/vb6WDkXEtELNlEi6L/o="; }; - patches = [ - # Python 3.9 ast changes - (fetchpatch { - url = "https://github.com/python-rope/rope/pull/333.patch"; - excludes = [ ".github/workflows/main.yml" ]; - sha256 = "1gq7n1zs18ndmv0p8jg1h5pawabi1m9m9z2w5hgidvqmpmcziky0"; - }) + nativeBuildInputs = [ + setuptools ]; - checkInputs = [ nose ]; - checkPhase = '' - # tracked upstream here https://github.com/python-rope/rope/issues/247 - NOSE_IGNORE_FILES=type_hinting_test.py nosetests ropetest - ''; + propagatedBuildInputs = [ + pytoolconfig + ] ++ pytoolconfig.optional-dependencies.global; + + nativeCheckInputs = [ + pytest-timeout + pytestCheckHook + ]; + + disabledTests = [ + "test_search_submodule" + "test_get_package_source_pytest" + "test_get_modname_folder" + ]; meta = with lib; { description = "Python refactoring library"; homepage = "https://github.com/python-rope/rope"; - maintainers = with maintainers; [ goibhniu ]; + changelog = "https://github.com/python-rope/rope/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/pkgs/development/python-modules/ropgadget/default.nix b/pkgs/development/python-modules/ropgadget/default.nix index 36bd4eaf7b90..165cfd2ebbfc 100644 --- a/pkgs/development/python-modules/ropgadget/default.nix +++ b/pkgs/development/python-modules/ropgadget/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ropgadget"; - version = "7.1"; + version = "7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "JonathanSalwan"; repo = "ROPgadget"; rev = "refs/tags/v${version}"; - hash = "sha256-eVRQQ8VmjT8wTpiTK2Emr1tEpSwFJPbMc1fa2Zh3mT0="; + hash = "sha256-JvGDnMh42CbdsbE8jM3jD/4JMl6XlmkJfojvlBhFWA0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 681ecfaefe3b..1bc393fd44ee 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ropper"; - version = "1.13.7"; + version = "1.13.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sashs"; repo = "Ropper"; rev = "v${version}"; - hash = "sha256-3tWWIYqh/G/b7Z6BMua5bRvtSh4SibT6pv/NArhmqPE="; + hash = "sha256-agbqP5O9QEP5UKkaWI5HxAlMsCBPKNSLnAAo2WFDXS8="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { filebytes ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -36,10 +36,10 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Show information about files in different file formats"; homepage = "https://scoding.de/ropper/"; license = licenses.bsd3; maintainers = with maintainers; [ bennofs ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/rpcq/default.nix b/pkgs/development/python-modules/rpcq/default.nix index bdf6f0f31993..d1561046fe0d 100644 --- a/pkgs/development/python-modules/rpcq/default.nix +++ b/pkgs/development/python-modules/rpcq/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ruamel-yaml ]; - checkInputs = [ + nativeCheckInputs = [ numpy pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/rpi-bad-power/default.nix b/pkgs/development/python-modules/rpi-bad-power/default.nix index 8c0dbd61c3a5..5a73ee4a1bf1 100644 --- a/pkgs/development/python-modules/rpi-bad-power/default.nix +++ b/pkgs/development/python-modules/rpi-bad-power/default.nix @@ -28,7 +28,7 @@ buildPythonPackage { "rpi_bad_power" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rpi-gpio2/default.nix b/pkgs/development/python-modules/rpi-gpio2/default.nix index 3adf7a35ea74..aaf958d26922 100644 --- a/pkgs/development/python-modules/rpi-gpio2/default.nix +++ b/pkgs/development/python-modules/rpi-gpio2/default.nix @@ -1,13 +1,15 @@ -{ lib, libgpiod, buildPythonPackage, fetchurl }: +{ lib, libgpiod, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "rpi-gpio2"; version = "0.3.0a3"; # PyPi source does not work for some reason - src = fetchurl { - url = "https://github.com/underground-software/RPi.GPIO2/archive/refs/tags/v${version}.tar.gz"; - sha256 = "sha256-AY1AD2Yu66eJUqB4OStZnUeEhmISLVRrTOAcmEHjuOM="; + src = fetchFromGitHub { + owner = "underground-software"; + repo = "RPi.GPIO2"; + rev = "v${version}"; + hash = "sha256-8HQbEnO+4Ppo2Z3HBulbBcSKJF1bNNQYz8k6aUt65oc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix index 33f8547496db..ff42e93f9560 100644 --- a/pkgs/development/python-modules/rply/default.nix +++ b/pkgs/development/python-modules/rply/default.nix @@ -1,21 +1,34 @@ -{ lib, pytest, fetchFromGitHub, buildPythonPackage, appdirs }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, appdirs +, py +, pytestCheckHook +}: buildPythonPackage rec { pname = "rply"; version = "0.7.7"; + format = "setuptools"; src = fetchFromGitHub { owner = "alex"; repo = "rply"; rev = "v${version}"; - sha256 = "1qv37hn7hhxd388znri76g0zjxsbwhxhcaic94dvw9pq4l60vqp6"; + hash = "sha256-5uINDCX4Jr4bSSwqBjvkS3f5wTMnZvsRGq1DeCw8Y+M="; }; - propagatedBuildInputs = [ appdirs ]; + propagatedBuildInputs = [ + appdirs + ]; - checkInputs = [ pytest ]; - checkPhase = '' - HOME=$(mktemp -d) py.test tests + nativeCheckInputs = [ + py + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) ''; meta = with lib; { diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 4f04a7b5ef5b..dd27a7ca110d 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -24,13 +24,13 @@ }: buildPythonPackage rec { - version = "3.5.5"; + version = "3.5.7"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "sha256-olLEDiHPTyOsbhO//cuCtZALScMEPtj9MdpcYftY0Dc="; + sha256 = "sha256-h6QJA3m0/DTn86Q0cXMJBndsNzmIhwhqgDV9ZP3QZUs="; }; patches = [ @@ -81,7 +81,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index 5d9c5958bd55..5ad8494634fe 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rpyc"; - version = "5.2.3"; + version = "5.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tomerfiliba"; repo = pname; - rev = version; - hash = "sha256-SDt6Oh+8qRIdM02FEFM+Xw1y/bBn66D6KbOrhGVs6ng="; + rev = "refs/tags/${version}"; + hash = "sha256-gqYjCvyiLhgosmzYITrthMkjLA6WJcBbmjkTNXZKUxc="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { plumbum ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 49c55c5d9734..d0caa8741dc1 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "rq"; - version = "1.11.1"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rq"; repo = "rq"; rev = "refs/tags/v${version}"; - hash = "sha256-7l/ckkDchs+iRDZLHrm4TYwA9wAJAnw9kYSaAbSo0jY="; + hash = "sha256-hV9Rntgt1Y4TBWGlunoXDKy8A2/9tum8aII8kFIZznU="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for creating background jobs and processing them"; homepage = "https://github.com/nvie/rq/"; + changelog = "https://github.com/rq/rq/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ mrmebelman ]; }; diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix index 0a70f8d8b088..792024166d97 100644 --- a/pkgs/development/python-modules/rsa/default.nix +++ b/pkgs/development/python-modules/rsa/default.nix @@ -1,36 +1,51 @@ { lib , buildPythonPackage -, fetchPypi -, unittest2 +, fetchFromGitHub +, poetry-core , pyasn1 -, mock -, isPy3k +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "rsa"; version = "4.9"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-44RkpJxshdfxNRsBJmYUh6fgoUpQ8WdexQ6zTU8g7yE="; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "sybrenstuvel"; + repo = "python-rsa"; + rev = "version-${version}"; + hash = "sha256-PwaRe+ICy0UoguXSMSh3PFl5R+YAhJwNdNN9isadlJY="; }; - checkInputs = [ unittest2 mock ]; - propagatedBuildInputs = [ pyasn1 ]; - - preConfigure = lib.optionalString (isPy3k && pythonOlder "3.7") '' + preConfigure = lib.optionalString (pythonOlder "3.7") '' substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')" ''; - # No tests in archive - doCheck = false; + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ pyasn1 ]; + + preCheck = '' + sed -i '/addopts/d' tox.ini + ''; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + "tests/test_mypy.py" + ]; meta = with lib; { homepage = "https://stuvel.eu/rsa"; license = licenses.asl20; description = "A pure-Python RSA implementation"; }; - } diff --git a/pkgs/development/python-modules/rst2pdf/default.nix b/pkgs/development/python-modules/rst2pdf/default.nix index 2a276c1aab7c..ecf06468f7c8 100644 --- a/pkgs/development/python-modules/rst2pdf/default.nix +++ b/pkgs/development/python-modules/rst2pdf/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { "rst2pdf" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pymupdf sphinx diff --git a/pkgs/development/python-modules/rstcheck-core/default.nix b/pkgs/development/python-modules/rstcheck-core/default.nix index b296f5dc168d..1126a61ff6ae 100644 --- a/pkgs/development/python-modules/rstcheck-core/default.nix +++ b/pkgs/development/python-modules/rstcheck-core/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "rstcheck-core"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rstcheck"; repo = pname; - rev = "v${version}"; - hash = "sha256-XNr+prK9VDP66ZaFvh3Qrx+eJs6mnVO8lvoMC/qrCLs="; + rev = "refs/tags/v${version}"; + hash = "sha256-9U+GhkwBr+f3yEe7McOxqPRUuTp9vP+3WT5wZ92n32w="; }; nativeBuildInputs = [ @@ -39,18 +39,12 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-mock pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"' \ - --replace 'docutils = ">=0.7, <0.19"' 'docutils = ">=0.7"' - ''; - pythonImportsCheck = [ "rstcheck_core" ]; @@ -58,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for checking syntax of reStructuredText"; homepage = "https://github.com/rstcheck/rstcheck-core"; + changelog = "https://github.com/rstcheck/rstcheck-core/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index a3789b97088a..2a7b91e3dbd2 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "rstcheck"; - version = "6.1.0"; + version = "6.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rstcheck"; repo = pname; - rev = "v${version}"; - hash = "sha256-dw/KggiZpKaFZMcTIaSBUhR4oQsZI3iSmEj9Sy80wTs="; + rev = "refs/tags/v${version}"; + hash = "sha256-6TpDzk0GjIn9AnWadwHoYRc3SNi9nBAM7GyKm338wH8="; }; nativeBuildInputs = [ @@ -43,16 +43,10 @@ buildPythonPackage rec { importlib-metadata ] ++ typer.optional-dependencies.all; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'docutils = ">=0.7, <0.19"' 'docutils = ">=0.7"' \ - --replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"' - ''; - pythonImportsCheck = [ "rstcheck" ]; @@ -65,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Checks syntax of reStructuredText and code blocks nested within it"; homepage = "https://github.com/myint/rstcheck"; + changelog = "https://github.com/rstcheck/rstcheck/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ staccato ]; }; diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix index 886073951f10..f0e4482eaa43 100644 --- a/pkgs/development/python-modules/rtoml/default.nix +++ b/pkgs/development/python-modules/rtoml/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { "rtoml" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix index 2c8fd9e40ba2..812a4fc1ba1f 100644 --- a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix +++ b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix index 714ffebd8a4e..57d300592995 100644 --- a/pkgs/development/python-modules/ruffus/default.nix +++ b/pkgs/development/python-modules/ruffus/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ gevent ]; - checkInputs = [ + nativeCheckInputs = [ hostname pytest ]; diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index a54aeadb33de..28c282ed6dfd 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { wget ] ++ urllib3.optional-dependencies.secure; - checkInputs = [ + nativeCheckInputs = [ deepdiff pytest-cov pytestCheckHook diff --git a/pkgs/development/python-modules/ruuvitag-ble/default.nix b/pkgs/development/python-modules/ruuvitag-ble/default.nix new file mode 100644 index 000000000000..8280f62723d9 --- /dev/null +++ b/pkgs/development/python-modules/ruuvitag-ble/default.nix @@ -0,0 +1,57 @@ +{ lib +, bluetooth-data-tools +, bluetooth-sensor-state-data +, buildPythonPackage +, fetchFromGitHub +, hatchling +, home-assistant-bluetooth +, pytestCheckHook +, pythonOlder +, sensor-state-data +}: + +buildPythonPackage rec { + pname = "ruuvitag-ble"; + version = "0.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-WkPYlEkUH1xvGjBVr6JkLx5CfIPvAa9vX50OjCOmTME="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + bluetooth-data-tools + bluetooth-sensor-state-data + home-assistant-bluetooth + sensor-state-data + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=ruuvitag_ble --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "ruuvitag_ble" + ]; + + meta = with lib; { + description = "Library for Ruuvitag BLE devices"; + homepage = "https://github.com/Bluetooth-Devices/ruuvitag-ble"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ruyaml/default.nix b/pkgs/development/python-modules/ruyaml/default.nix index bb0728bd2639..3ddede9d8c5a 100644 --- a/pkgs/development/python-modules/ruyaml/default.nix +++ b/pkgs/development/python-modules/ruyaml/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { distro ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rx/default.nix b/pkgs/development/python-modules/rx/default.nix index 8d7277823a7b..3dc07cd0def4 100644 --- a/pkgs/development/python-modules/rx/default.nix +++ b/pkgs/development/python-modules/rx/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "b657ca2b45aa485da2f7dcfd09fac2e554f7ac51ff3c2f8f2ff962ecd963d91c"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; # Some tests are nondeterministic. (`grep sleep -r tests`) # test_timeout_schedule_action_cancel: https://hydra.nixos.org/build/74954646 diff --git a/pkgs/development/python-modules/rxv/default.nix b/pkgs/development/python-modules/rxv/default.nix index 9d59efd9bd35..50e5f1482cec 100644 --- a/pkgs/development/python-modules/rxv/default.nix +++ b/pkgs/development/python-modules/rxv/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytest-timeout diff --git a/pkgs/development/python-modules/s3-credentials/default.nix b/pkgs/development/python-modules/s3-credentials/default.nix index 0173f14efd03..9d0d4a7e2f70 100644 --- a/pkgs/development/python-modules/s3-credentials/default.nix +++ b/pkgs/development/python-modules/s3-credentials/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { click-default-group ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis moto pytest-mock diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index b1bebfce47c0..d295c73b2fe2 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,16 +11,20 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2022.10.0"; + version = "2022.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6N64DyC9CyBZFBuHT9udauuMzjUxLqXywCsiWnigBAY="; + hash = "sha256-EMWsKDpPW2f/rW0fJf9+4CYUJ1DFxdyGh0bNkE9hfDM="; }; + postPatch = '' + sed -i 's/fsspec==.*/fsspec/' requirements.txt + ''; + buildInputs = [ docutils ]; diff --git a/pkgs/development/python-modules/sacn/default.nix b/pkgs/development/python-modules/sacn/default.nix index ff432f6f3a00..4ba86bd68aef 100644 --- a/pkgs/development/python-modules/sacn/default.nix +++ b/pkgs/development/python-modules/sacn/default.nix @@ -1,27 +1,32 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder }: buildPythonPackage rec { pname = "sacn"; - version = "1.8.1"; - disabled = isPy27; + version = "1.9.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "cdc9af732f4ca5badbf732499775575c4f815c73f857720c0a61a3fc80257f7a"; + hash = "sha256-LimA0I8y1tdjFk244iWvKJj0Rx3OEaYOSIJtirRHh4o="; }; # no tests doCheck = false; - pythonImportsCheck = [ "sacn" ]; + pythonImportsCheck = [ + "sacn" + ]; meta = with lib; { - description = "A simple ANSI E1.31 (aka sACN) module for python"; + description = "A simple ANSI E1.31 (aka sACN) module"; homepage = "https://github.com/Hundemeier/sacn"; + changelog = "https://github.com/Hundemeier/sacn/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/sacremoses/default.nix b/pkgs/development/python-modules/sacremoses/default.nix index 4ffea014001b..9efb29ba76f2 100644 --- a/pkgs/development/python-modules/sacremoses/default.nix +++ b/pkgs/development/python-modules/sacremoses/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click six tqdm joblib ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # ignore tests which call to remote host checkPhase = '' pytest -k 'not truecase' diff --git a/pkgs/development/python-modules/safe-pysha3/default.nix b/pkgs/development/python-modules/safe-pysha3/default.nix new file mode 100644 index 000000000000..cf654cfd714b --- /dev/null +++ b/pkgs/development/python-modules/safe-pysha3/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, python +}: + +buildPythonPackage rec { + pname = "safe-pysha3"; + version = "1.0.3"; + format = "setuptools"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Kd+lb9t5ney50BvdfbwPKAb0Ro0sKW+DtuN9hlMZF8I="; + }; + + checkPhase = '' + runHook preCheck + + ${python.interpreter} tests.py + + runHook postCheck + ''; + + pythonImportsCheck = [ + "sha3" + ]; + + meta = { + changelog = "https://github.com/5afe/pysha3/releases/tag/v${version}"; + description = "SHA-3 (Keccak) for Python 3.9 - 3.11"; + homepage = "https://github.com/5afe/pysha3"; + license = lib.licenses.psfl; + maintainers = with lib.maintainers; [ wegank ]; + }; +} diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index fdd0c975272f..1716dadda100 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "safety"; - version = "2.3.1"; + version = "2.3.5"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-bm/LfU6DIQmM8on1m2UFHK/TRn8InG5XyfiUrjLCO3E="; + hash = "sha256-pgwR+JUvQSy7Fl1wyx9nOjtDorqak84R+X5qTeg0qjo="; }; postPatch = '' @@ -46,7 +46,7 @@ buildPythonPackage rec { ruamel-yaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index ebcb42920618..cac3e0fc4049 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.109.0"; + version = "2.126.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hs71bIoByh5S1ncsku+y4X2i0yU65FknJE05lEmnru4="; + hash = "sha256-wuU53FmrtAY8E08Q+W4OhBoBQ8kks3LjJiR7kxlbfAg="; }; nativeBuildInputs = [ pythonRelaxDepsHook ]; diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index fcb51c4303a8..d213026bd5b8 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0q2m6xri1b7qv46rqpv2qfdgk2jvswj8lpaacnxwjna3m685fhfx"; }; - checkInputs = [ jinja2 mock ]; + nativeCheckInputs = [ jinja2 mock ]; propagatedBuildInputs = [ chardet dnspython lmtpd python-daemon six click ]; # Darwin tests fail without this. See: diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index 2e97bae92b6a..6284dccc3e2e 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/saneyaml/default.nix b/pkgs/development/python-modules/saneyaml/default.nix index e92e464a9c91..2290f40a6434 100644 --- a/pkgs/development/python-modules/saneyaml/default.nix +++ b/pkgs/development/python-modules/saneyaml/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sanic-auth/default.nix b/pkgs/development/python-modules/sanic-auth/default.nix index 9e915dd66ed1..813df37a84e5 100644 --- a/pkgs/development/python-modules/sanic-auth/default.nix +++ b/pkgs/development/python-modules/sanic-auth/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sanic ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook sanic-testing ]; diff --git a/pkgs/development/python-modules/sanic-routing/default.nix b/pkgs/development/python-modules/sanic-routing/default.nix index cb06b5d1f2b3..197f50800228 100644 --- a/pkgs/development/python-modules/sanic-routing/default.nix +++ b/pkgs/development/python-modules/sanic-routing/default.nix @@ -3,25 +3,36 @@ , fetchFromGitHub , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "sanic-routing"; - version = "22.3.0"; + version = "22.8.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-routing"; - rev = "v${version}"; - hash = "sha256-dX+uxrVjtPxX0ba3WUE/JKgj0PZzvFdKr/lXQgASN6Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-2T6WY0nzvr8Q9lBoStzmX7m7Ct35lcG53OSLcqxkEcY="; }; - checkInputs = [ pytestCheckHook pytest-asyncio ]; - pythonImportsCheck = [ "sanic_routing" ]; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sanic_routing" + ]; meta = with lib; { description = "Core routing component for the Sanic web framework"; homepage = "https://github.com/sanic-org/sanic-routing"; + changelog = "https://github.com/sanic-org/sanic-routing/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ AluisioASG ]; }; diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index 120f80b57e22..acb174c86997 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -1,21 +1,25 @@ { lib , buildPythonPackage +, callPackage , fetchFromGitHub , httpx +, pythonOlder , sanic , websockets -, callPackage }: buildPythonPackage rec { pname = "sanic-testing"; - version = "22.3.1"; + version = "22.12.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-testing"; rev = "refs/tags/v${version}"; - sha256 = "sha256-6aJyc5B9e65RPG3FwXAoQByVNdrLAWTEu2/Dqf9hf+g="; + hash = "sha256-pFTF2SQ9giRzPhG24FLqLPJRXaFdQ7Xi5EeltS7J3DI="; }; outputs = [ @@ -23,10 +27,6 @@ buildPythonPackage rec { "testsout" ]; - postPatch = '' - sed -i 's/httpx>=.*"/httpx"/' setup.py - ''; - propagatedBuildInputs = [ httpx sanic @@ -38,8 +38,9 @@ buildPythonPackage rec { cp -R tests $testsout/tests ''; - # check in passthru.tests.pytest to escape infinite recursion with sanic + # Check in passthru.tests.pytest to escape infinite recursion with sanic doCheck = false; + doInstallCheck = false; passthru.tests = { @@ -49,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Core testing clients for the Sanic web framework"; homepage = "https://github.com/sanic-org/sanic-testing"; + changelog = "https://github.com/sanic-org/sanic-testing/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ AluisioASG ]; }; diff --git a/pkgs/development/python-modules/sanic-testing/tests.nix b/pkgs/development/python-modules/sanic-testing/tests.nix index 6a228a982310..a8871c0b5139 100644 --- a/pkgs/development/python-modules/sanic-testing/tests.nix +++ b/pkgs/development/python-modules/sanic-testing/tests.nix @@ -14,7 +14,7 @@ buildPythonPackage { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook sanic diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index e1559e1ec432..571606a9a34f 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -9,13 +9,12 @@ , httptools , multidict , pytest-asyncio -, pytest-benchmark -, pytest-sugar -, pytestCheckHook + ,pytestCheckHook , pythonOlder , pythonAtLeast , sanic-routing , sanic-testing +, setuptools , ujson , uvicorn , uvloop @@ -25,18 +24,22 @@ buildPythonPackage rec { pname = "sanic"; - version = "22.6.2"; - format = "setuptools"; + version = "22.12.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sanic-org"; repo = pname; - rev = "v${version}"; - hash = "sha256-krEQd0ak9Uua+r+pYmLStlizgE4HmZBO8Q0I2/gWAwU="; + rev = "refs/tags/v${version}"; + hash = "sha256-Vj780rP5rJ+YsMWlb3BR9LTKT/nTt0C2H3J0X9sysj8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiofiles aioquic @@ -48,7 +51,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ beautifulsoup4 gunicorn pytest-asyncio @@ -76,37 +79,34 @@ buildPythonPackage rec { pytestFlagsArray = [ "--asyncio-mode=auto" + "-vvv" ]; disabledTests = [ # Require networking "test_full_message" - # Fails to parse cmdline arguments - "test_dev" - "test_auto_reload" - "test_host_port_ipv6_loopback" + # Server mode mismatch (debug vs production) "test_num_workers" - "test_debug" - "test_access_logs" - "test_noisy_exceptions" - # OSError: foo - "test_bad_headers" - "test_create_server_trigger_events" - "test_json_body_requests" - "test_missing_startup_raises_exception" - "test_no_body_requests" - "test_oserror_warning" - "test_running_multiple_offset_warning" - "test_streaming_body_requests" - "test_trigger_before_events_create_server" - "test_keep_alive_connection_context" # Racy tests "test_keep_alive_client_timeout" "test_keep_alive_server_timeout" "test_zero_downtime" - # broke with ujson 5.4 upgrade - # https://github.com/sanic-org/sanic/pull/2504 - "test_json_response_json" + # sanic.exceptions.SanicException: Cannot setup Sanic Simple Server without a path to a directory + "test_load_app_simple" + # create defunct python processes + "test_reloader_live" + "test_reloader_live_with_dir" + "test_reload_listeners" + # crash the python interpreter + "test_host_port_localhost" + "test_host_port" + "test_server_run" + # NoneType object is not subscriptable + "test_serve_app_implicit" + # AssertionError: assert [] == ['Restarting a process', 'Begin restart termination', 'Starting a process'] + "test_default_reload_shutdown_order" + # App not found. + "test_input_is_dir" ]; disabledTestPaths = [ @@ -129,6 +129,7 @@ buildPythonPackage rec { broken = stdenv.isDarwin; description = "Web server and web framework"; homepage = "https://github.com/sanic-org/sanic/"; + changelog = "https://github.com/sanic-org/sanic/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ costrouc AluisioASG ]; }; diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix index 98187f96af9f..d02b9da7be44 100644 --- a/pkgs/development/python-modules/sarge/default.nix +++ b/pkgs/development/python-modules/sarge/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-bT1DbcQi+SbeRBsL7ILuQbSnAj3BBB4+FNl+Zek5xU4="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix index 700fb05bc67f..77d28ae4da1e 100644 --- a/pkgs/development/python-modules/sasmodels/default.nix +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { # Note: the 1.0.5 release should be compatible with pytest6, so this can # be set back to 'pytest' at that point - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/scales/default.nix b/pkgs/development/python-modules/scales/default.nix index 3806ffb9d46b..93e566fd380b 100644 --- a/pkgs/development/python-modules/scales/default.nix +++ b/pkgs/development/python-modules/scales/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "8b6930f7d4bf115192290b44c757af5e254e3fcfcb75ff9a51f5c96a404e2753"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; propagatedBuildInputs = [ six ]; # No tests included diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 40e391347702..773d945f3a8c 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -60,13 +60,13 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "31.1.1"; + version = "31.2.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-/QLW+rxkDbrv/78xiXOuSNaQvY+0oYZQV0/m60CEZLk="; + hash = "sha256-+5zYYpH8EyHPruX9LDWzeVPny7VoFiARb4+32FXMxUc="; }; dontConfigure = true; @@ -129,7 +129,7 @@ buildPythonPackage rec { typing ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 152be5166c50..a76e8c5384f7 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "scapy"; - version = "2.4.5"; + version = "2.5.0"; disabled = isPyPy; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "secdev"; repo = "scapy"; rev = "v${version}"; - sha256 = "0nxci1v32h5517gl9ic6zjq8gc8drwr0n5pz04c91yl97xznnw94"; + sha256 = "sha256-xJlovcxUQOQHfOU0Jgin/ayd2T5fOyeN4Jg0DbLHoeU="; }; patches = [ @@ -52,7 +52,7 @@ buildPythonPackage rec { # Running the tests seems too complicated: doCheck = false; - checkInputs = [ mock can brotli ]; + nativeCheckInputs = [ mock can brotli ]; checkPhase = '' # TODO: be more specific about files patchShebangs . diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index ae1627f888f3..9ae1fd02b62a 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.3.20220913105718"; + version = "8.4.20230127112827"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-18/xLIq1+yM8iQBIeXvRIO4A5GqZS/3qOKXmi439+sQ="; + hash = "sha256-nptZTNveutV9bGSkDPWLfiBusZblVqd/5m7DN4HwGJY="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { ruamel-yaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.pycodegen; @@ -57,13 +57,15 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - pycodegen = [ black ]; + pycodegen = [ + black + ]; }; meta = with lib; { - broken = true; # disables on outdated version of mistune description = "Semantic Annotations for Linked Avro Data"; homepage = "https://github.com/common-workflow-language/schema_salad"; + changelog = "https://github.com/common-workflow-language/schema_salad/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index dabe046e4861..c095ea9ca921 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { contextlib2 ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix index 1ebbda5481a4..93dc48affc82 100644 --- a/pkgs/development/python-modules/schwifty/default.nix +++ b/pkgs/development/python-modules/schwifty/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytest-cov pytestCheckHook ]; diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index e86b384f9c4a..d7781f3fb8d0 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -20,17 +20,17 @@ }: buildPythonPackage rec { - version = "0.5.7"; + version = "0.5.8"; pname = "scikit-bio"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-Y0PKDGIeL8xdHAQsi+MgBmTFMllWqDvqdRzxvMddHak="; + sha256 = "sha256-1VqDw+XyyhEydE4UCSM/th2a8MWpXet7KR5uNAcSuGs="; }; nativeBuildInputs = [ cython ]; - checkInputs = [ coverage ]; + nativeCheckInputs = [ coverage ]; propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy h5py hdmedians scikit-learn ]; # cython package not included for tests diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix new file mode 100644 index 000000000000..664bec81aede --- /dev/null +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -0,0 +1,83 @@ +{ lib +, buildPythonPackage +, fetchPypi +, distlib +, pythonOlder +, exceptiongroup +, hatch-vcs +, hatchling +, cattrs +, cmake +, packaging +, pathspec +, pyproject-metadata +, pytest-subprocess +, pytestCheckHook +, tomli +}: + +buildPythonPackage rec { + pname = "scikit-build-core"; + version = "0.1.5"; + format = "pyproject"; + + src = fetchPypi { + pname = "scikit_build_core"; + inherit version; + hash = "sha256-OUS/QOaBd0DDBrDk8c3LzFrPVrVF65EJQPRjGtnUmjU="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'minversion = "7.2"' "" \ + --replace '"error",' '"error", "ignore::DeprecationWarning", "ignore::UserWarning",' + ''; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + propagatedBuildInputs = [ + packaging + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup + tomli + ]; + + passthru.optional-dependencies = { + pyproject = [ + distlib + pathspec + pyproject-metadata + ]; + }; + + dontUseCmakeConfigure = true; + + nativeCheckInputs = [ + cattrs + cmake + pytest-subprocess + pytestCheckHook + ] ++ passthru.optional-dependencies.pyproject; + + disabledTestPaths = [ + # runs pip, requires network access + "tests/test_pyproject_pep517.py" + "tests/test_pyproject_pep518.py" + "tests/test_setuptools_pep517.py" + "tests/test_setuptools_pep518.py" + ]; + + pythonImportsCheck = [ + "scikit_build_core" + ]; + + meta = with lib; { + description = "A next generation Python CMake adaptor and Python API for plugins"; + homepage = "https://github.com/scikit-build/scikit-build-core"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 4a466fcef06d..dc286741004e 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -23,14 +23,20 @@ buildPythonPackage rec { pname = "scikit-build"; - version = "0.15.0"; + version = "0.16.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5yPNDzSJoEI3C56piLu5z9dyXoslsgyhx5gYIfz2X7k="; + hash = "sha256-KiDEreqzwq7BHXC86WkJlc/w5Tvq/jIae1MACayo5zE="; }; + # This line in the filterwarnings section of the pytest configuration leads to this error: + # E UserWarning: Distutils was imported before Setuptools, but importing Setuptools also replaces the `distutils` module in `sys.modules`. This may lead to undesirable behaviors or errors. To avoid these issues, avoid using distutils directly, ensure that setuptools is installed in the traditional way (e.g. not an editable install), and/or make sure that setuptools is always imported before distutils. + postPatch = '' + sed -i "/'error',/d" pyproject.toml + ''; + propagatedBuildInputs = [ distro packaging @@ -39,7 +45,7 @@ buildPythonPackage rec { wheel ]; - checkInputs = [ + nativeCheckInputs = [ cmake cython ninja diff --git a/pkgs/development/python-modules/scikit-fuzzy/default.nix b/pkgs/development/python-modules/scikit-fuzzy/default.nix index 1fd809010e0c..6d44cf0a37c7 100644 --- a/pkgs/development/python-modules/scikit-fuzzy/default.nix +++ b/pkgs/development/python-modules/scikit-fuzzy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ networkx numpy scipy ]; - checkInputs = [ matplotlib nose pytestCheckHook ]; + nativeCheckInputs = [ matplotlib nose pytestCheckHook ]; pythonImportsCheck = [ "skfuzzy" ]; diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index ed0cbd28acb6..1e8b6263b8a0 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -6,40 +6,48 @@ , pyyaml , requests , setuptools-scm +, pythonOlder }: buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.21"; + version = "0.4.25"; format = "pyproject"; - # fetch from github as we want the data files - # https://github.com/scikit-hep/scikit-hep-testdata/issues/60 + disabled = pythonOlder "3.6"; + src = fetchFromGitHub { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-DhOtoxjhczsYqOn+CwLGlRIPa2hh7mH6EfwcLLPMQcw="; + hash = "sha256-JiQaGyvoECylcJHWR2xm8ob5fA+0FmIEQpTuxxysvlw="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ pyyaml requests - ] ++ lib.optional (!pythonAtLeast "3.9") importlib-resources; - - SETUPTOOLS_SCM_PRETEND_VERSION = version; + ] ++ lib.optional (!pythonAtLeast "3.9") [ + importlib-resources + ]; SKHEP_DATA = 1; # install the actual root files doCheck = false; # tests require networking - pythonImportsCheck = [ "skhep_testdata" ]; + + pythonImportsCheck = [ + "skhep_testdata" + ]; meta = with lib; { homepage = "https://github.com/scikit-hep/scikit-hep-testdata"; description = "A common package to provide example files (e.g., ROOT) for testing and developing packages against"; + changelog = "https://github.com/scikit-hep/scikit-hep-testdata/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 9098724da42a..d899c940b982 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -52,7 +52,7 @@ let # test suite is very cpu intensive, move to passthru.tests doCheck = false; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # (1) The package has cythonized modules, whose .so libs will appear only in the wheel, i.e. in nix store; # (2) To stop Python from importing the wrong directory, i.e. the one in the build dir, not the one in nix store, `skimage` dir should be removed or renamed; diff --git a/pkgs/development/python-modules/scikit-learn-extra/default.nix b/pkgs/development/python-modules/scikit-learn-extra/default.nix index f198b49c7ad2..c14c98489a40 100644 --- a/pkgs/development/python-modules/scikit-learn-extra/default.nix +++ b/pkgs/development/python-modules/scikit-learn-extra/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ numpy cython ]; propagatedBuildInputs = [ numpy scipy scikit-learn ]; - checkInputs = [ matplotlib pytestCheckHook ]; + nativeCheckInputs = [ matplotlib pytestCheckHook ]; preCheck = '' # Remove the package in the build dir, because Python defaults to it and diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 9739163cea50..7499eb6e9de9 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.1.3"; + version = "1.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vvUZeKUewZl3cA/nuGrs6knIJYhPOBF1a3SjsVK7TjU="; + sha256 = "sha256-+/ilyJPJtLmbzH7Y+z6FAJV6ET9BAYYDhtBmNVIPfPs="; }; buildInputs = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { threadpoolctl ]; - checkInputs = [ pytestCheckHook pytest-xdist ]; + nativeCheckInputs = [ pytestCheckHook pytest-xdist ]; LC_ALL="en_US.UTF-8"; @@ -95,7 +95,7 @@ buildPythonPackage rec { changelog = let major = versions.major version; minor = versions.minor version; - dashVer = replaceChars ["."] ["-"] version; + dashVer = replaceStrings ["."] ["-"] version; in "https://scikit-learn.org/stable/whats_new/v${major}.${minor}.html#version-${dashVer}"; homepage = "https://scikit-learn.org"; diff --git a/pkgs/development/python-modules/scikit-optimize/default.nix b/pkgs/development/python-modules/scikit-optimize/default.nix index 5e87c585116a..91eb003987f7 100644 --- a/pkgs/development/python-modules/scikit-optimize/default.nix +++ b/pkgs/development/python-modules/scikit-optimize/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix index 1dd50b6380d8..708979a4cb2e 100644 --- a/pkgs/development/python-modules/scikit-survival/default.nix +++ b/pkgs/development/python-modules/scikit-survival/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "scikit-survival"; - version = "0.18.0"; + version = "0.19.0.post1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LfQESmKxSJ4tWlp3EZTBajOxZC3IEOUtJmX8A5ROpmU="; + sha256 = "sha256-UBhUCpRXyd5gLxaf38wBURo2DIoUgMmROogGF3bwWJk="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "sksurv" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # Hack needed to make pytest + cython work # https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298 diff --git a/pkgs/development/python-modules/scikit-tda/default.nix b/pkgs/development/python-modules/scikit-tda/default.nix index cf2e524337de..784dc84a0892 100644 --- a/pkgs/development/python-modules/scikit-tda/default.nix +++ b/pkgs/development/python-modules/scikit-tda/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { tadasets ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix index e419cb8b63e5..17cbfdfbdef6 100644 --- a/pkgs/development/python-modules/scikits-odes/default.nix +++ b/pkgs/development/python-modules/scikits-odes/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "scikits.odes"; - version = "2.6.5"; + version = "2.7.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-MP1pNkr0fAyWWVHJVHiaVEn1UsbVsjU9MZHHAQYtPYI="; + sha256 = "sha256-px4Z4UhYk3VK6MBQZoIy/MaU8XuDYC51++v3v5+XXh4="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { ] ++ lib.optionals (!isPy3k) [ enum34 ]; doCheck = true; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' cd $out/${python.sitePackages}/scikits/odes/tests diff --git a/pkgs/development/python-modules/scim2-filter-parser/default.nix b/pkgs/development/python-modules/scim2-filter-parser/default.nix new file mode 100644 index 000000000000..9b140ae6fed5 --- /dev/null +++ b/pkgs/development/python-modules/scim2-filter-parser/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, django +, sly +, mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "scim2-filter-parser"; + version = "0.5.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "15five"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-QEPTYpWlRPWO6Evyt4zoqUST4ousF67GmiOpD7WUqcI="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry.masonry.api" "poetry.core.masonry.api" + ''; + + propagatedBuildInputs = [ + sly + ]; + + passthru.optional-dependencies = { + django-query = [ + django + ]; + }; + + pythonImportsCheck = [ + "scim2_filter_parser" + ]; + + nativeCheckInputs = [ + mock + pytestCheckHook + ] ++ passthru.optional-dependencies.django-query; + + meta = with lib; { + description = "A customizable parser/transpiler for SCIM2.0 filters"; + homepage = "https://github.com/15five/scim2-filter-parser"; + changelog = "https://github.com/15five/scim2-filter-parser/blob/${version}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ s1341 ]; + }; +} diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 457a9c622a12..7f9091d87f14 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchPypi -, fetchpatch , python , pythonOlder , buildPythonPackage @@ -21,21 +20,14 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.9.1"; + version = "1.9.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JtKMRokA5tX9s30oEqtG2wzNIsY7qglQV4cfqjpJi8k="; + sha256 = "sha256-+8XAXIXBoCvnex/1kQh8g7xEV5xtK9n7eYu2TqXhoCc="; }; - patches = [ - (fetchpatch { - url = "https://github.com/scipy/scipy/commit/318d8c6d16fdf000be8637e9917989729f2c8ce7.diff"; - sha256 = "sha256-Zfb9GYP0r9MDJ91hSzMN1r4eNilajPThNIvZmDzFEXo="; - }) - ]; - nativeBuildInputs = [ cython gfortran meson-python pythran pkg-config wheel ]; buildInputs = [ @@ -47,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - checkInputs = [ nose pytest pytest-xdist ]; + nativeCheckInputs = [ nose pytest pytest-xdist ]; doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 62ba132641c9..0f2ffa7138e6 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -5,7 +5,7 @@ , fetchFromGitHub , fsspec , funcy -, GitPython +, gitpython , pathspec , pygit2 , pygtrie @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "0.1.3"; + version = "0.1.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-YivsP5c0fnpm/0VCFfyH054LYAQbyEdH+wZTRxsCAY4="; + hash = "sha256-F+t/3Nfcw+LG9Kh0Je2JwPWUWBNsZXTEaQOKaTT5ig0="; }; postPatch = '' @@ -42,7 +42,7 @@ buildPythonPackage rec { dulwich fsspec funcy - GitPython + gitpython pathspec pygit2 pygtrie @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "SCM wrapper and fsspec filesystem"; homepage = "https://github.com/iterative/scmrepo"; + changelog = "https://github.com/iterative/scmrepo/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix new file mode 100644 index 000000000000..0bd037a74fc7 --- /dev/null +++ b/pkgs/development/python-modules/scooby/default.nix @@ -0,0 +1,66 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, numpy +, pytest-console-scripts +, pytestCheckHook +, pythonOlder +, pyvips +, scipy +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "scooby"; + version = "0.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "banesullivan"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-wKbCIA6Xp+VYhcQ5ZpHo5usB+ksnMAJyv5naBvl4Cxo="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + nativeCheckInputs = [ + beautifulsoup4 + numpy + pytest-console-scripts + pytestCheckHook + pyvips + scipy + ]; + + preCheck = '' + export PATH="$PATH:$out/bin"; + ''; + + pythonImportsCheck = [ + "scooby" + ]; + + disabledTests = [ + # Tests have additions requirements (e.g., time and module) + "test_get_version" + "test_tracking" + "test_import_os_error" + "test_import_time" + ]; + + meta = with lib; { + changelog = "https://github.com/banesullivan/scooby/releases/tag/v${version}"; + description = "A lightweight tool for reporting Python package versions and hardware resources"; + homepage = "https://github.com/banesullivan/scooby"; + license = licenses.mit; + maintainers = with maintainers; [ wegank ]; + }; +} diff --git a/pkgs/development/python-modules/scramp/default.nix b/pkgs/development/python-modules/scramp/default.nix index ef0d132368e9..954a95c94cd8 100644 --- a/pkgs/development/python-modules/scramp/default.nix +++ b/pkgs/development/python-modules/scramp/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix index 643afd6dc8bf..c8a909691f94 100644 --- a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fake-useragent faker ]; - checkInputs = [ pytestCheckHook scrapy pytest-cov pytest-mock ]; + nativeCheckInputs = [ pytestCheckHook scrapy pytest-cov pytest-mock ]; meta = with lib; { description = "Random User-Agent middleware based on fake-useragent"; diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 3571a783af8d..646db47538bb 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { zope_interface ]; - checkInputs = [ + nativeCheckInputs = [ botocore glibcLocales jmespath @@ -95,6 +95,7 @@ buildPythonPackage rec { "test_nested_css" "test_nested_xpath" "test_flavor_detection" + "test_follow_whitespace" # Requires network access "AnonymousFTPTestCase" "FTPFeedStorageTest" diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix index 574d3159494a..40479baca0d1 100644 --- a/pkgs/development/python-modules/screeninfo/default.nix +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , buildPythonPackage -, dataclasses , fetchFromGitHub , libX11 , libXinerama @@ -16,7 +15,7 @@ buildPythonPackage rec { version = "0.8.1"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "rr-"; @@ -29,10 +28,6 @@ buildPythonPackage rec { poetry-core ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ - dataclasses - ]; - postPatch = '' substituteInPlace screeninfo/enumerators/xinerama.py \ --replace 'load_library("X11")' 'ctypes.cdll.LoadLibrary("${libX11}/lib/libX11.so")' \ @@ -42,7 +37,7 @@ buildPythonPackage rec { --replace 'load_library("Xrandr")' 'ctypes.cdll.LoadLibrary("${libXrandr}/lib/libXrandr.so")' ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index ca137888ce7c..4e0513985a85 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -1,4 +1,5 @@ { lib +, async-timeout , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -8,7 +9,7 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.5.5"; + version = "0.6.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,10 +18,14 @@ buildPythonPackage rec { owner = "dieselrabbit"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-1tBr7k7RutCHvea/56J7drl9P+WZ5bQpDeQwhgktc1s="; + hash = "sha256-3V63DnMzICLZUyzcyWNa7XI0fd1kOat15cL6GPos04E="; }; - checkInputs = [ + propagatedBuildInputs = [ + async-timeout + ]; + + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; @@ -41,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface for Pentair Screenlogic devices"; homepage = "https://github.com/dieselrabbit/screenlogicpy"; + changelog = "https://github.com/dieselrabbit/screenlogicpy/releases/tag/v${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/scripttest/default.nix b/pkgs/development/python-modules/scripttest/default.nix index 5fe4b2b2ee6f..c6102f145310 100644 --- a/pkgs/development/python-modules/scripttest/default.nix +++ b/pkgs/development/python-modules/scripttest/default.nix @@ -5,8 +5,8 @@ }: buildPythonPackage rec { - version = "1.3"; pname = "scripttest"; + version = "1.3"; src = fetchPypi { inherit pname version; @@ -20,8 +20,8 @@ buildPythonPackage rec { meta = with lib; { description = "A library for testing interactive command-line applications"; - homepage = "https://pypi.python.org/pypi/ScriptTest/"; + homepage = "https://pypi.org/project/scripttest/"; + maintainers = with maintainers; [ ]; license = licenses.mit; }; - } diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix index 24b7d36343a8..b9ee0aed2df7 100644 --- a/pkgs/development/python-modules/scs/default.nix +++ b/pkgs/development/python-modules/scs/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "scs" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/sdds/default.nix b/pkgs/development/python-modules/sdds/default.nix index 4d26c2ebf391..c36d066a7517 100644 --- a/pkgs/development/python-modules/sdds/default.nix +++ b/pkgs/development/python-modules/sdds/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index a23c36e2b30a..04b2f8612180 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index 6f048144dfa1..92923170c0de 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { ''; # few backends enabled, but still some tests - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock zipp diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index f13f763974b6..17c2324598e5 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi secp256k1 ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # Tests are not included in archive doCheck = false; diff --git a/pkgs/development/python-modules/securetar/default.nix b/pkgs/development/python-modules/securetar/default.nix index 68b25355744d..c6010b8eef3c 100644 --- a/pkgs/development/python-modules/securetar/default.nix +++ b/pkgs/development/python-modules/securetar/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/seedir/default.nix b/pkgs/development/python-modules/seedir/default.nix new file mode 100644 index 000000000000..f9b6c442868d --- /dev/null +++ b/pkgs/development/python-modules/seedir/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, natsort +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "seedir"; + version = "0.4.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "earnestt1234"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ioez5lBNyiBK3poL2Px3KtCQeM+Gh2d4iD3SoAIHFAk="; + }; + + propagatedBuildInputs = [ + natsort + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "seedir" + ]; + + pytestFlagsArray = [ + "tests/tests.py" + ]; + + meta = with lib; { + description = "Module for for creating, editing, and reading folder tree diagrams"; + homepage = "https://github.com/earnestt1234/seedir"; + changelog = "https://github.com/earnestt1234/seedir/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix index dbfe45107769..8788bf665363 100644 --- a/pkgs/development/python-modules/seekpath/default.nix +++ b/pkgs/development/python-modules/seekpath/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ glibcLocales ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # I don't know enough about crystal structures to fix checkPhase = '' diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix index f1c0ad3bf0ef..97805642dc4c 100644 --- a/pkgs/development/python-modules/segments/default.nix +++ b/pkgs/development/python-modules/segments/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { clldutils ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pytest-mock diff --git a/pkgs/development/python-modules/segno/default.nix b/pkgs/development/python-modules/segno/default.nix index 5db60d0d0bdb..e01c2487493e 100644 --- a/pkgs/development/python-modules/segno/default.nix +++ b/pkgs/development/python-modules/segno/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "sha256-+OEXG5OvrZ5Ft7IO/7zodf+SgiRF+frwjltrBENNnHo="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pypng pyzbar diff --git a/pkgs/development/python-modules/segyio/default.nix b/pkgs/development/python-modules/segyio/default.nix index 546f1117e80d..7b0ec0bea13a 100644 --- a/pkgs/development/python-modules/segyio/default.nix +++ b/pkgs/development/python-modules/segyio/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { doCheck = true; # I'm not modifying the checkPhase nor adding a pytestCheckHook because the pytest is called # within the cmake test phase - checkInputs = [ pytest numpy ]; + nativeCheckInputs = [ pytest numpy ]; meta = with lib; { description = "Fast Python library for SEGY files"; diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix index dc108502ce9c..2611ae5c3aa8 100644 --- a/pkgs/development/python-modules/selectors2/default.nix +++ b/pkgs/development/python-modules/selectors2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { ./mapping-import.patch ]; - checkInputs = [ nose psutil mock ]; + nativeCheckInputs = [ nose psutil mock ]; checkPhase = '' # https://github.com/NixOS/nixpkgs/pull/46186#issuecomment-419450064 diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index c6f42a38e0f1..76c3956ec86b 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.6.0"; + version = "4.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { repo = "selenium"; # check if there is a newer tag with or without -python suffix rev = "refs/tags/selenium-${version}"; - hash = "sha256-xgGGtJo+DZIwPa0H6dsT0VClRTMM8iFbNzSDZjH7ImI="; + hash = "sha256-7inmi8dHi6So+8AbLq85Go/GEaiV1XK/7+wt9UkTdo8="; }; postPatch = '' @@ -42,7 +42,7 @@ buildPythonPackage rec { urllib3 ] ++ urllib3.optional-dependencies.socks; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/semantic-version/default.nix b/pkgs/development/python-modules/semantic-version/default.nix index 131cf230ef78..39c4df56ef4a 100644 --- a/pkgs/development/python-modules/semantic-version/default.nix +++ b/pkgs/development/python-modules/semantic-version/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-vau20zaZjLs3jUuds6S1ah4yNXAdwF6iaQ2amX7VBBw="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 00fd16f15642..637681dd2d4f 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index 1741c76b3d4f..6fd63a1c198b 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index 8462b9924eda..6a359d988986 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ flask pytestCheckHook pyyaml diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index b3f2d6955709..a0855cd3f0f7 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.10.4"; + version = "0.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,10 +18,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scottbonline"; repo = "sense"; - rev = version; - hash = "sha256-yflI17lLZMXXB0ye+jz3VWWMdZtcBTwbg8deA4ENmWw="; + rev = "refs/tags/${version}"; + hash = "sha256-lfqQelAHh/xJH1jPz3JK32AIEA7ghUP6Mnya2M34V/w="; }; + postPatch = '' + sed -i '/download_url/d' setup.py + ''; + propagatedBuildInputs = [ aiohttp requests diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index e6e411c1f6e5..27161cac7304 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.12.0"; + version = "2.13.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,14 +19,14 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-u17vtw3yu8ibi/omTriy6s33/243WjxM03Nss3pFAYk="; + hash = "sha256-iLHv2rwynpSAKlRn2ezq2VUR7v4oHNJaPg/prlkZo6U="; }; nativeBuildInputs = [ poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Models for storing and converting Sensor Data state"; homepage = "https://github.com/bluetooth-devices/sensor-state-data"; + changelog = "https://github.com/Bluetooth-Devices/sensor-state-data/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/sensorpro-ble/default.nix b/pkgs/development/python-modules/sensorpro-ble/default.nix index 66d73b041bea..3e9793d0974e 100644 --- a/pkgs/development/python-modules/sensorpro-ble/default.nix +++ b/pkgs/development/python-modules/sensorpro-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sensorpro-ble"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-B5WtOl1Va2rqm6PZEUCYakN7mE2zz/edGj+TtwDcS+Y="; + hash = "sha256-D0xHNPsGlNBoHR3LqR6TbVhqXWapzwYsG+uN3kSF1oE="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Sensorpro BLE devices"; homepage = "https://github.com/Bluetooth-Devices/sensorpro-ble"; + changelog = "https://github.com/Bluetooth-Devices/sensorpro-ble/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/sensorpush-ble/default.nix b/pkgs/development/python-modules/sensorpush-ble/default.nix index 00a01dc0df9a..3567b178bb95 100644 --- a/pkgs/development/python-modules/sensorpush-ble/default.nix +++ b/pkgs/development/python-modules/sensorpush-ble/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sentinels/default.nix b/pkgs/development/python-modules/sentinels/default.nix index 17c2c94a30ff..ba2412cecbf6 100644 --- a/pkgs/development/python-modules/sentinels/default.nix +++ b/pkgs/development/python-modules/sentinels/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 5db4264507a4..e01c1828fe60 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.11.0"; + version = "1.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-PObYXwWYQ7cC//W3c+n/qceu2ShjFqMGAaLyNflwcL4="; + hash = "sha256-2STQKIAoaGLreGGkqOSrNrByu7j+7oxZihwp9COhuGM="; }; propagatedBuildInputs = [ @@ -112,7 +112,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ asttokens executing gevent diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/pkgs/development/python-modules/sepaxml/default.nix index bc46aa5198d1..d865d1f0143e 100644 --- a/pkgs/development/python-modules/sepaxml/default.nix +++ b/pkgs/development/python-modules/sepaxml/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { xmlschema ]; - checkInputs = [ + nativeCheckInputs = [ lxml pytestCheckHook ]; diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index c27a2eb2c91c..7fee814f973e 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/seqeval/default.nix b/pkgs/development/python-modules/seqeval/default.nix index 73ad00332bf8..05a284f47a70 100644 --- a/pkgs/development/python-modules/seqeval/default.nix +++ b/pkgs/development/python-modules/seqeval/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { scikit-learn ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index 2ab2b081f2b1..537b986a62f4 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optionals isPy27 [ enum34 ]; - checkInputs = [ attrs pytz ]; + nativeCheckInputs = [ attrs pytz ]; checkPhase = '' ${python.interpreter} setup.py test ''; diff --git a/pkgs/development/python-modules/servefile/default.nix b/pkgs/development/python-modules/servefile/default.nix index 76d72df128c7..a4a62a5145af 100644 --- a/pkgs/development/python-modules/servefile/default.nix +++ b/pkgs/development/python-modules/servefile/default.nix @@ -9,18 +9,18 @@ buildPythonPackage rec { pname = "servefile"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "sebageek"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-/ZEMZIH/ImuZ2gh5bwB0FlaWnG/ELxfBGEJ2SuNSEb8="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-hIqXwhmvstCslsCO973oK5FF2c8gZJ0wNUI/z8W+OjU="; }; propagatedBuildInputs = [ pyopenssl ]; - checkInputs = [ pytestCheckHook requests ]; + nativeCheckInputs = [ pytestCheckHook requests ]; # Test attempts to connect to a port on localhost which fails in nix build # environment. disabledTests = [ diff --git a/pkgs/development/python-modules/serverlessrepo/default.nix b/pkgs/development/python-modules/serverlessrepo/default.nix index d3cc7e9c633b..68ebeca52069 100644 --- a/pkgs/development/python-modules/serverlessrepo/default.nix +++ b/pkgs/development/python-modules/serverlessrepo/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ]; diff --git a/pkgs/development/python-modules/service-identity/default.nix b/pkgs/development/python-modules/service-identity/default.nix index 10eac468a150..9e13bdbe6f09 100644 --- a/pkgs/development/python-modules/service-identity/default.nix +++ b/pkgs/development/python-modules/service-identity/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix index cfcd221c5abb..85b94cd66812 100644 --- a/pkgs/development/python-modules/setproctitle/default.nix +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-ufuXkHyDDSYPoGWO1Yr9SKhrK4iqxSETXDUv9/00d/0="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # tries to compile programs with dependencies that aren't available pytestFlagsArray = [ "--ignore=tests/setproctitle_test.py" ]; diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix index f58515679e1f..d92d81f632a7 100644 --- a/pkgs/development/python-modules/setupmeta/default.nix +++ b/pkgs/development/python-modules/setupmeta/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "setupmeta"; - version = "3.3.2"; + version = "3.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "codrsquad"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-kX7S5NSqO1LDRkfBHaNfTjzW+l0Pd+5KvQHiNF3eH/M="; + rev = "refs/tags/v${version}"; + hash = "sha256-HNGoLCTidgnaU5QA+0d/PQuCswigjdvQC3/w19i+Xuc="; }; preBuild = '' @@ -32,7 +32,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ git mock pep440 diff --git a/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix b/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix index 86d2784beb71..8442ad6252aa 100644 --- a/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix +++ b/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ setuptools-scm ]; - checkInputs = [ pypiserver pytestCheckHook virtualenv ]; + nativeCheckInputs = [ pypiserver pytestCheckHook virtualenv ]; # Tests use network doCheck = false; diff --git a/pkgs/development/python-modules/setuptools-gettext/default.nix b/pkgs/development/python-modules/setuptools-gettext/default.nix new file mode 100644 index 000000000000..f8b5d45bbc7f --- /dev/null +++ b/pkgs/development/python-modules/setuptools-gettext/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "setuptools-gettext"; + version = "0.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "breezy-team"; + repo = "setuptools-gettext"; + rev = "refs/tags/v${version}"; + hash = "sha256-MifsEuWNTEDJa9RfIbM/EDMJg0cmHXX6oJxNskKEbY4="; + }; + + propagatedBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "setuptools_gettext" + ]; + + meta = with lib; { + changelog = "https://github.com/breezy-team/setuptools-gettext/releases/tag/v${version}"; + description = "setuptools plugin for building mo files"; + homepage = "https://github.com/breezy-team/setuptools-gettext"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix index 556f1e0a375b..d2f6a10a3700 100644 --- a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix +++ b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests.py" diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index b4e8cc5afa62..dc338bd41120 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -5,24 +5,33 @@ , typing-extensions , tomli , setuptools +, pythonOlder , lib }: buildPythonPackage rec { pname = "setuptools-scm"; - version = "7.0.5"; + version = "7.1.0"; + format = "pyproject"; src = fetchPypi { pname = "setuptools_scm"; inherit version; - sha256 = "sha256-Ax4Tr3cdb4krlBrbbqBFRbv5Hrxc5ox4qvP/9uH7SEQ="; + hash = "sha256-bFCDRadxqtfVbr/w5wYovysOx1c3Yr6ZYCFHMN4njyc="; }; + nativeBuildInputs = [ + packaging + setuptools + typing-extensions + ]; + propagatedBuildInputs = [ packaging - typing-extensions - tomli setuptools + typing-extensions + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/setuptools-scm/tests.nix b/pkgs/development/python-modules/setuptools-scm/tests.nix index b90797abf7eb..9bbdb1c6946c 100644 --- a/pkgs/development/python-modules/setuptools-scm/tests.nix +++ b/pkgs/development/python-modules/setuptools-scm/tests.nix @@ -10,13 +10,14 @@ buildPythonPackage rec { pname = "setuptools-scm-tests"; inherit (setuptools-scm) version; + format = "other"; src = setuptools-scm.src; dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook setuptools-scm pip diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 9fab8747b67f..993850922f5c 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -10,7 +10,7 @@ let pname = "setuptools"; - version = "65.3.0"; + version = "65.6.3"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ let owner = "pypa"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LPguGVWvwEMZpJFuXWLVFzIlzw+/QSMjVi2oYh0cI0s="; + hash = "sha256-B/1MhH0RDW7/pUam2FHnIcUPN6NpvQYBjRyHIm+E9rI="; name = "${pname}-${version}-source"; }; diff --git a/pkgs/development/python-modules/seventeentrack/default.nix b/pkgs/development/python-modules/seventeentrack/default.nix index 8e70b4af51d4..56bec419987a 100644 --- a/pkgs/development/python-modules/seventeentrack/default.nix +++ b/pkgs/development/python-modules/seventeentrack/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix index 03f3b64ee509..968dea44b0f0 100644 --- a/pkgs/development/python-modules/sfepy/default.nix +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -14,19 +14,21 @@ , mpi4py , psutil , openssh +, pyvista +, pytest , pythonOlder }: buildPythonPackage rec { pname = "sfepy"; - version = "2022.1"; + version = "2022.3"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "sfepy"; repo = "sfepy"; rev = "release_${version}"; - sha256 = "sha256-OayULh/dGI5sEynYMc+JLwUd67zEGdIGEKo6CTOdZS8="; + sha256 = "sha256-6AhyO6LRG6N62ZAoPCZpRKu4ZBzj9IHkurhKFIPFAJI="; }; propagatedBuildInputs = [ @@ -41,34 +43,38 @@ buildPythonPackage rec { mpi4py psutil openssh + pyvista ]; postPatch = '' # broken tests - rm tests/test_meshio.py + rm sfepy/tests/test_meshio.py # slow tests - rm tests/test_input_*.py - rm tests/test_elasticity_small_strain.py - rm tests/test_term_call_modes.py - rm tests/test_refine_hanging.py - rm tests/test_hyperelastic_tlul.py - rm tests/test_poly_spaces.py - rm tests/test_linear_solvers.py - rm tests/test_quadratures.py + rm sfepy/tests/test_io.py + rm sfepy/tests/test_elasticity_small_strain.py + rm sfepy/tests/test_term_call_modes.py + rm sfepy/tests/test_refine_hanging.py + rm sfepy/tests/test_hyperelastic_tlul.py + rm sfepy/tests/test_poly_spaces.py + rm sfepy/tests/test_linear_solvers.py + rm sfepy/tests/test_quadratures.py ''; + nativeCheckInputs = [ + pytest + ]; + checkPhase = '' export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh export HOME=$TMPDIR mv sfepy sfepy.hidden mkdir -p $HOME/.matplotlib echo "backend: ps" > $HOME/.matplotlib/matplotlibrc - ${python.interpreter} run_tests.py -o $TMPDIR/test_outputs --raise + ${python.interpreter} -c "import sfepy; sfepy.test()" ''; meta = with lib; { - broken = stdenv.isLinux && stdenv.isAarch64; homepage = "https://sfepy.org/"; description = "Simple Finite Elements in Python"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix new file mode 100644 index 000000000000..208e8b13a427 --- /dev/null +++ b/pkgs/development/python-modules/sfrbox-api/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, click +, defusedxml +, fetchFromGitHub +, httpx +, poetry-core +, pydantic +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, respx +}: + +buildPythonPackage rec { + pname = "sfrbox-api"; + version = "0.0.5"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "hacf-fr"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-6SwZAAWBnxeeunZwUAVQJBU8904czNVheBlRFg5yrOw="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pydantic = ">=1.10.2"' 'pydantic = "*"' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + click + defusedxml + httpx + pydantic + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + respx + ]; + + pythonImportsCheck = [ + "sfrbox_api" + ]; + + meta = with lib; { + description = "Module for the SFR Box API"; + homepage = "https://github.com/hacf-fr/sfrbox-api"; + changelog = "https://github.com/hacf-fr/sfrbox-api/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/sgmllib3k/default.nix b/pkgs/development/python-modules/sgmllib3k/default.nix index c4b0d9bdb94d..05eb7da77395 100644 --- a/pkgs/development/python-modules/sgmllib3k/default.nix +++ b/pkgs/development/python-modules/sgmllib3k/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "0bzf6pv85dzfxfysm6zbj8m40hp0xzr9h8qlk4hp3nmy88rznqvr"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sgp4/default.nix b/pkgs/development/python-modules/sgp4/default.nix index 1b8ecc0b46ba..94522c6b78d5 100644 --- a/pkgs/development/python-modules/sgp4/default.nix +++ b/pkgs/development/python-modules/sgp4/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, tox, numpy }: +{ lib, buildPythonPackage, fetchPypi, numpy }: buildPythonPackage rec { pname = "sgp4"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "sha256-YXm4dQRId+lBYzwgr3ci/SMaiNiomvAb8wvWTzPN7O8="; }; - checkInputs = [ tox numpy ]; + nativeCheckInputs = [ numpy ]; pythonImportsCheck = [ "sgp4" ]; diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index 17dcc5acbee0..bcc07dc14ccc 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sed -i 's#/bin/sleep#${coreutils.outPath}/bin/sleep#' test.py ''; - checkInputs = [ coverage lsof glibcLocales pytestCheckHook ]; + nativeCheckInputs = [ coverage lsof glibcLocales pytestCheckHook ]; # A test needs the HOME directory to be different from $TMPDIR. preCheck = '' diff --git a/pkgs/development/python-modules/shamir-mnemonic/default.nix b/pkgs/development/python-modules/shamir-mnemonic/default.nix index 737156ad83fd..cdc4cb4fdf21 100644 --- a/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { colorama ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "shamir_mnemonic" ]; diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index 661c6622195f..a16e645a814c 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -89,7 +89,7 @@ buildPythonPackage rec { # These tests are marked as "Expected fail" (xfail) cat ${conftestSkipNetworkErrors} >> tests/conftest.py ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mpl matplotlib @@ -130,7 +130,7 @@ buildPythonPackage rec { #pytestFlagsArray = ["-x" "-W" "ignore"]; # uncomment this to debug - pythonImportCheck = [ + pythonImportsCheck = [ "shap" "shap.explainers" "shap.explainers.other" diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index fda2645105f6..8225751f9024 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -1,50 +1,45 @@ { lib , stdenv , buildPythonPackage -, fetchPypi -, substituteAll , pythonOlder -, geos -, pytestCheckHook +, fetchPypi , cython +, geos +, setuptools , numpy +, pytestCheckHook }: buildPythonPackage rec { - pname = "Shapely"; - version = "1.8.4"; - disabled = pythonOlder "3.6"; + pname = "shapely"; + version = "2.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; + hash = "sha256-EfGxIxpsBCE/sSJsaWjRsbOzaexC0ellUGavh2MYYOo="; }; nativeBuildInputs = [ - geos # for geos-config cython + geos # for geos-config + setuptools + ]; + + buildInputs = [ + geos ]; propagatedBuildInputs = [ numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - # Environment variable used in shapely/_buildcfg.py - GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; - - patches = [ - # Patch to search form GOES .so/.dylib files in a Nix-aware way - (substituteAll { - src = ./library-paths.patch; - libgeos_c = GEOS_LIBRARY_PATH; - libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; - }) - ]; - preCheck = '' rm -r shapely # prevent import of local shapely ''; @@ -63,9 +58,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "shapely" ]; meta = with lib; { - description = "Geometric objects, predicates, and operations"; - homepage = "https://pypi.python.org/pypi/Shapely/"; - license = with licenses; [ bsd3 ]; + changelog = "https://github.com/shapely/shapely/blob/${version}/CHANGES.txt"; + description = "Manipulation and analysis of geometric objects"; + homepage = "https://github.com/shapely/shapely"; + license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp ]; }; } diff --git a/pkgs/development/python-modules/shapely/library-paths.patch b/pkgs/development/python-modules/shapely/library-paths.patch deleted file mode 100644 index d095eada9d6e..000000000000 --- a/pkgs/development/python-modules/shapely/library-paths.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/shapely/geos.py b/shapely/geos.py -index 88c5f53..1ccd6e4 100644 ---- a/shapely/geos.py -+++ b/shapely/geos.py -@@ -96,6 +96,7 @@ if sys.platform.startswith('linux'): - alt_paths = [ - 'libgeos_c.so.1', - 'libgeos_c.so', -+ '@libgeos_c@', - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) - -@@ -160,6 +161,7 @@ elif sys.platform == 'darwin': - "/usr/local/lib/libgeos_c.dylib", - # homebrew Apple Silicon - "/opt/homebrew/lib/libgeos_c.dylib", -+ "@libgeos_c@", - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) - -diff --git a/tests/test_dlls.py b/tests/test_dlls.py -index c71da8e..c36262c 100644 ---- a/tests/test_dlls.py -+++ b/tests/test_dlls.py -@@ -18,4 +18,5 @@ class LoadingTestCase(unittest.TestCase): - '/opt/homebrew/lib/libgeos_c.dylib', # homebrew (macOS) - os.path.join(sys.prefix, "lib", "libgeos_c.so"), # anaconda (Linux) - 'libgeos_c.so.1', -- 'libgeos_c.so']) -+ 'libgeos_c.so', -+ '@libgeos_c@']) diff --git a/pkgs/development/python-modules/shellescape/default.nix b/pkgs/development/python-modules/shellescape/default.nix index 2d7309d88215..6244baca90d5 100644 --- a/pkgs/development/python-modules/shellescape/default.nix +++ b/pkgs/development/python-modules/shellescape/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { hash = "sha256-HAe3Qf3lLeVWw/tVkW0J+CfoxSoOnCcWDR2nEWZn7HM="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "shellescape" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index 341d3f3c32e3..d8e9e6274b94 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index c4210cfeda2e..53ea30ca6823 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -1,5 +1,12 @@ -{ python, lib, stdenv, pyside2 -, cmake, qt5, llvmPackages }: +{ python +, lib +, stdenv +, pyside2 +, cmake +, qt5 +, libxcrypt +, llvmPackages +}: stdenv.mkDerivation { pname = "shiboken2"; @@ -17,7 +24,18 @@ stdenv.mkDerivation { CLANG_INSTALL_DIR = llvmPackages.libclang.out; nativeBuildInputs = [ cmake ]; - buildInputs = [ llvmPackages.libclang python python.pkgs.setuptools qt5.qtbase qt5.qtxmlpatterns ]; + + buildInputs = [ + llvmPackages.libclang + python + python.pkgs.setuptools + qt5.qtbase + qt5.qtxmlpatterns + ] ++ (lib.optionals (python.pythonOlder "3.9") [ + # see similar issue: 202262 + # libxcrypt is required for crypt.h for building older python modules + libxcrypt + ]); cmakeFlags = [ "-DBUILD_TESTS=OFF" diff --git a/pkgs/development/python-modules/shiv/default.nix b/pkgs/development/python-modules/shiv/default.nix index 8038e0f2f000..8e0ec9de050f 100644 --- a/pkgs/development/python-modules/shiv/default.nix +++ b/pkgs/development/python-modules/shiv/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "shiv" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # AssertionError diff --git a/pkgs/development/python-modules/shlib/default.nix b/pkgs/development/python-modules/shlib/default.nix new file mode 100644 index 000000000000..797e22f14c1a --- /dev/null +++ b/pkgs/development/python-modules/shlib/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, braceexpand +, inform +}: + +buildPythonPackage rec { + pname = "shlib"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "KenKundert"; + repo = "shlib"; + rev = "v${version}"; + sha256 = "sha256-2fwRxa64QXKJuhYwt9Z4BxhTeq1iwbd/IznfxPUjeSM="; + }; + + pythonImportsCheck = [ "shlib" ]; + postPatch = '' + patchShebangs . + ''; + nativeCheckInputs = [ + pytestCheckHook + ]; + propagatedBuildInputs = [ + braceexpand + inform + ]; + + meta = with lib; { + description = "shell library"; + homepage = "https://github.com/KenKundert/shlib"; + changelog = "https://github.com/KenKundert/shlib/releases/tag/v${version}"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix index b443e319290c..34ad5aa93908 100644 --- a/pkgs/development/python-modules/shortuuid/default.nix +++ b/pkgs/development/python-modules/shortuuid/default.nix @@ -7,17 +7,17 @@ buildPythonPackage rec { pname = "shortuuid"; - version = "1.0.9"; + version = "1.0.11"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RZ8S+hrMNP8hOxNxRnwDJRaWRaMe2YniaIcjOa91Y9U="; + hash = "sha256-/HXyYVkUgVqOTLFQGzpRN0XLZu8P1fxvufjD+jSB94k="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -25,10 +25,6 @@ buildPythonPackage rec { "shortuuid" ]; - pytestFlagsArray = [ - "shortuuid/tests.py" - ]; - meta = with lib; { description = "Library to generate concise, unambiguous and URL-safe UUIDs"; homepage = "https://github.com/stochastic-technologies/shortuuid/"; diff --git a/pkgs/development/python-modules/shouldbe/default.nix b/pkgs/development/python-modules/shouldbe/default.nix index b733c1c95162..20634f4a9f02 100644 --- a/pkgs/development/python-modules/shouldbe/default.nix +++ b/pkgs/development/python-modules/shouldbe/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "16zbvjxf71dl4yfbgcr6idyim3mdrfvix1dv8b95p0s9z07372pj"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; propagatedBuildInputs = [ forbiddenfruit ]; meta = with lib; { diff --git a/pkgs/development/python-modules/showit/default.nix b/pkgs/development/python-modules/showit/default.nix index 0cc379161324..10638620b012 100644 --- a/pkgs/development/python-modules/showit/default.nix +++ b/pkgs/development/python-modules/showit/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { matplotlib ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix index 41d5636d70f6..7a8877369448 100644 --- a/pkgs/development/python-modules/shtab/default.nix +++ b/pkgs/development/python-modules/shtab/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ bashInteractive pytest-timeout pytestCheckHook diff --git a/pkgs/development/python-modules/shutilwhich/default.nix b/pkgs/development/python-modules/shutilwhich/default.nix index a30e23c894e0..5bcd2bca8bdd 100644 --- a/pkgs/development/python-modules/shutilwhich/default.nix +++ b/pkgs/development/python-modules/shutilwhich/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "05fwcjn86w8wprck04iv1zccfi39skdf0lhwpb4b9gpvklyc9mj0"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest -rs diff --git a/pkgs/development/python-modules/sievelib/default.nix b/pkgs/development/python-modules/sievelib/default.nix index 4e0e058ac947..694f0f0f3417 100644 --- a/pkgs/development/python-modules/sievelib/default.nix +++ b/pkgs/development/python-modules/sievelib/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/signalslot/default.nix b/pkgs/development/python-modules/signalslot/default.nix new file mode 100644 index 000000000000..515267a70b26 --- /dev/null +++ b/pkgs/development/python-modules/signalslot/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, pythonRelaxDepsHook +, contexter +, eventlet +, mock +, pytest-xdist +, pytestCheckHook +, six +}: + +buildPythonPackage rec { + pname = "signalslot"; + version = "0.1.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Z26RPNau+4719e82jMhb2LyIR6EvsANI8r3+eKuw494="; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--pep8 --cov" "" \ + --replace "--cov-report html" "" + ''; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + contexter + six + ]; + + pythonRemoveDeps = [ + "weakrefmethod" # needed until https://github.com/Numergy/signalslot/pull/17 + ]; + + nativeCheckInputs = [ + eventlet + mock + pytest-xdist + pytestCheckHook + ]; + + pythonImportsCheck = [ "signalslot" ]; + + meta = with lib; { + description = "Simple Signal/Slot implementation"; + homepage = "https://github.com/numergy/signalslot"; + license = licenses.mit; + maintainers = with maintainers; [ myaats ]; + }; +} diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix index c7604126c7a3..e57a86c37f21 100644 --- a/pkgs/development/python-modules/signedjson/default.nix +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/signify/default.nix b/pkgs/development/python-modules/signify/default.nix index dbad1a8167db..392bcd2eaac0 100644 --- a/pkgs/development/python-modules/signify/default.nix +++ b/pkgs/development/python-modules/signify/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { "signify" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sigtools/default.nix b/pkgs/development/python-modules/sigtools/default.nix index a41bdbf184bd..87dc4e91e6e9 100644 --- a/pkgs/development/python-modules/sigtools/default.nix +++ b/pkgs/development/python-modules/sigtools/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { attrs ]; - checkInputs = [ + nativeCheckInputs = [ mock repeated-test sphinx diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix index c712edf5ca8b..a9d61dd6528d 100644 --- a/pkgs/development/python-modules/simanneal/default.nix +++ b/pkgs/development/python-modules/simanneal/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "sha256-yKZHkrf6fM0WsHczIEK5Kxusz5dSBgydK3fLu1nDyvk="; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = "pytest tests"; meta = with lib; { diff --git a/pkgs/development/python-modules/simber/default.nix b/pkgs/development/python-modules/simber/default.nix index 68e9638c350a..750af927e768 100644 --- a/pkgs/development/python-modules/simber/default.nix +++ b/pkgs/development/python-modules/simber/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "simber"; - version = "0.2.4"; + version = "0.2.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,15 +16,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "deepjyoti30"; repo = pname; - rev = version; - hash = "sha256-P4bhxu9Di4E2Zkd0vIkyDi1S6Y0V/EQSMF4ftWoiXKE="; + rev = "refs/tags/${version}"; + hash = "sha256-d9YhqYmRyoYb03GqYKM7HkK8cnTQKPbSP6z2aanB6pQ="; }; propagatedBuildInputs = [ colorama ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple, minimal and powerful logger for Python"; homepage = "https://github.com/deepjyoti30/simber"; + changelog = "https://github.com/deepjyoti30/simber/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ j0hax ]; }; diff --git a/pkgs/development/python-modules/simple-di/default.nix b/pkgs/development/python-modules/simple-di/default.nix index 150eb52f8d4e..79437c4a0b34 100644 --- a/pkgs/development/python-modules/simple-di/default.nix +++ b/pkgs/development/python-modules/simple-di/default.nix @@ -4,7 +4,6 @@ , fetchPypi , setuptools , typing-extensions -, dataclasses }: buildPythonPackage rec { @@ -23,8 +22,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools typing-extensions - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/simple-rest-client/default.nix b/pkgs/development/python-modules/simple-rest-client/default.nix index 4b5b2ed06811..c5d885f328fa 100644 --- a/pkgs/development/python-modules/simple-rest-client/default.nix +++ b/pkgs/development/python-modules/simple-rest-client/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { python-status ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-httpserver pytestCheckHook diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index a75bc775106f..566c5c7c8365 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { zeep ]; - checkInputs = [ + nativeCheckInputs = [ nose pytz responses diff --git a/pkgs/development/python-modules/simplebayes/default.nix b/pkgs/development/python-modules/simplebayes/default.nix index 06fe8e236b37..40bc248d8a0b 100644 --- a/pkgs/development/python-modules/simplebayes/default.nix +++ b/pkgs/development/python-modules/simplebayes/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { sha256 = "0mp7rvfdmpfxnka4czw3lv5kkh6gdxh6dm4r6hcln1zzfg9lxp4h"; }; - checkInputs = [ nose mock ]; + nativeCheckInputs = [ nose mock ]; postPatch = lib.optionalString isPy3k '' sed -i -e 's/open *(\([^)]*\))/open(\1, encoding="utf-8")/' setup.py diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix index ddc4b56654e6..28e5c2578602 100644 --- a/pkgs/development/python-modules/simpleeval/default.nix +++ b/pkgs/development/python-modules/simpleeval/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/simplehound/default.nix b/pkgs/development/python-modules/simplehound/default.nix index 1ecd446c5b48..307010f3feaf 100644 --- a/pkgs/development/python-modules/simplehound/default.nix +++ b/pkgs/development/python-modules/simplehound/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ requests-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 74530b3fb830..381c7688be18 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -1,28 +1,34 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub -, stdenv , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "simplejson"; - version = "3.17.6"; + version = "3.18.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "1irlp5sakbdfcf717qmrx0r9rjlmwk0vza6zm3y55d32zw5c1cxg"; + hash = "sha256-m5V1wmqkPxZBH25vWajztwa3HF4KtH+HXXs4TCecTm8="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; doCheck = !stdenv.isDarwin; - pythonImportsCheck = [ "simplejson" ]; + pythonImportsCheck = [ + "simplejson" + ]; meta = with lib; { description = "Extensible JSON encoder/decoder for Python"; @@ -33,6 +39,7 @@ buildPythonPackage rec { for unicode characters). ''; homepage = "https://github.com/simplejson/simplejson"; + changelog = "https://github.com/simplejson/simplejson/blob/v${version}/CHANGES.txt"; license = with licenses; [ mit afl21 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 9312b9f36d17..ac6ca9c21264 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2022.11.0"; + version = "2022.12.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-I4ZEKJFfCrpwPXl2f+2XJdFD2VkCghiKdgLjRKdZC+0="; + hash = "sha256-AOlO4K8ku+auEKw7OmgEo5E4ftAar0ukPQVIYzBJBW0="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ aresponses asynctest pytest-aiohttp @@ -80,6 +80,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = with lib; { + changelog = "https://github.com/bachya/simplisafe-python/releases/tag/${version}"; description = "Python library the SimpliSafe API"; homepage = "https://simplisafe-python.readthedocs.io/"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index ff139523e1f4..2be43f157a16 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -1,9 +1,16 @@ -{ buildPythonPackage, fetchPypi, isPy27, lib, setuptools, setuptools-scm +{ buildPythonPackage +, fetchPypi +, isPy27 +, lib +, setuptools +, setuptools-scm +, py , pytestCheckHook }: buildPythonPackage rec { pname = "simpy"; version = "4.0.1"; + format = "setuptools"; disabled = isPy27; @@ -12,11 +19,18 @@ buildPythonPackage rec { sha256 = "b36542e2faab612f861c5ef4da17220ac1553f5892b3583c67281dbe4faad404"; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - propagatedBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ + setuptools + ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + py + pytestCheckHook + ]; meta = with lib; { homepage = "https://simpy.readthedocs.io/en/${version}/"; diff --git a/pkgs/development/python-modules/single-version/default.nix b/pkgs/development/python-modules/single-version/default.nix index 39cd92f5f67e..01671657eea9 100644 --- a/pkgs/development/python-modules/single-version/default.nix +++ b/pkgs/development/python-modules/single-version/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "single_version" ]; diff --git a/pkgs/development/python-modules/siobrultech-protocols/default.nix b/pkgs/development/python-modules/siobrultech-protocols/default.nix index 730ca8f5d68c..10daf4a3287c 100644 --- a/pkgs/development/python-modules/siobrultech-protocols/default.nix +++ b/pkgs/development/python-modules/siobrultech-protocols/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { hash = "sha256-t8is68WrvLj57tNeM5AKuuvpn7kWbhbvoRnCI3+q4uE="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook pyyaml diff --git a/pkgs/development/python-modules/siosocks/default.nix b/pkgs/development/python-modules/siosocks/default.nix index a1235b41a76a..a72b54f56ca3 100644 --- a/pkgs/development/python-modules/siosocks/default.nix +++ b/pkgs/development/python-modules/siosocks/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { trio ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook pytest-trio diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 07a731b53d92..5facfac582c0 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "sip"; - version = "6.7.4"; + version = "6.7.5"; src = fetchPypi { pname = "sip"; inherit version; - sha256 = "sha256-nb+KDnyNdtFkLi/dP1PmpSL3wwmA5Sd2PEV2DCUFz78="; + sha256 = "sha256-llXQieHQxfv2a94RVYqHSYBykTK1vQwq41WsGnuJOrQ="; }; propagatedBuildInputs = [ packaging ply toml ]; diff --git a/pkgs/development/python-modules/siuba/default.nix b/pkgs/development/python-modules/siuba/default.nix new file mode 100644 index 000000000000..97d90cac25ae --- /dev/null +++ b/pkgs/development/python-modules/siuba/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, hypothesis +, numpy +, pandas +, psycopg2 +, pymysql +, python-dateutil +, pytz +, pyyaml +, six +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "siuba"; + version = "0.4.2"; + disabled = pythonOlder "3.7"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "machow"; + repo = "siuba"; + rev = "refs/tags/v${version}"; + hash = "sha256-Q2nkK51bmIO2OcBuWu+u7yB8UmaqiZJXpuxXcytTlUY="; + }; + + propagatedBuildInputs = [ + numpy + pandas + psycopg2 + pymysql + python-dateutil + pytz + pyyaml + six + sqlalchemy + ]; + + checkInputs = [ + hypothesis + pytestCheckHook + ]; + doCheck = false; + # requires running mysql and postgres instances; see docker-compose.yml + + pythonImportsCheck = [ + "siuba" + "siuba.data" + ]; + + meta = with lib; { + description = "Use dplyr-like syntax with pandas and SQL"; + homepage = "https://siuba.org"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix index 24fe639211d1..775dd4b3992e 100644 --- a/pkgs/development/python-modules/six/default.nix +++ b/pkgs/development/python-modules/six/default.nix @@ -1,30 +1,31 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "six"; version = "1.16.0"; + format = "setuptools"; + src = fetchPypi { inherit pname version; sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - checkPhase = '' - py.test test_six.py - ''; - - # To prevent infinite recursion with pytest - doCheck = false; + pythonImportsCheck = [ "six" ]; meta = { - description = "A Python 2 and 3 compatibility library"; - homepage = "https://pypi.python.org/pypi/six/"; + changelog = "https://github.com/benjaminp/six/blob/${version}/CHANGES"; + description = "Python 2 and 3 compatibility library"; + homepage = "https://github.com/benjaminp/six"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/sjcl/default.nix b/pkgs/development/python-modules/sjcl/default.nix index 0ef52c657131..a44ceb91589f 100644 --- a/pkgs/development/python-modules/sjcl/default.nix +++ b/pkgs/development/python-modules/sjcl/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycryptodome ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "sjcl" diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index 5b486e0163cc..d3896772bb8e 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "skein" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # These tests require connecting to a YARN cluster. They could be done through NixOS tests later. disabledTests = [ "test_ui" diff --git a/pkgs/development/python-modules/skia-pathops/default.nix b/pkgs/development/python-modules/skia-pathops/default.nix index 4da35b98f4a4..7784b5bee4f9 100644 --- a/pkgs/development/python-modules/skia-pathops/default.nix +++ b/pkgs/development/python-modules/skia-pathops/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "skia-pathops"; - version = "0.7.2"; + version = "0.7.4"; src = fetchPypi { pname = "skia-pathops"; inherit version; extension = "zip"; - sha256 = "sha256-Gdhcmv77oVr5KxPIiJlk935jgvWPQsYEC0AZ6yjLppA="; + sha256 = "sha256-Ci/e6Ht62wGMv6bpXvnkKZ7WOwCAvidnejD/77ypE1A="; }; postPatch = '' @@ -44,7 +44,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pathops" ]; diff --git a/pkgs/development/python-modules/skl2onnx/default.nix b/pkgs/development/python-modules/skl2onnx/default.nix index 96511df4f83c..e4dde4d52b26 100644 --- a/pkgs/development/python-modules/skl2onnx/default.nix +++ b/pkgs/development/python-modules/skl2onnx/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "scikit-learn" ]; - checkInputs = [ + nativeCheckInputs = [ onnxruntime pandas unittestCheckHook diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix index 02d66aa84e8c..8ea58cbf7b73 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.26"; + version = "1.3.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lendy007"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-zuS19oM3V+o0yiby6yOX2RSxXY3m5qhqjlX2v9jmpIk="; + hash = "sha256-bjFXrhwIGB50upL++VnrrfzFhxFOrxgYhoNZqkbvZ9w="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to communicate with Skoda Connect"; homepage = "https://github.com/lendy007/skodaconnect"; + changelog = "https://github.com/lendy007/skodaconnect/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index a6508ded491e..f4b45e88811e 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -2,8 +2,6 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, pytest -, pytest-cov , flaky , numpy , pandas @@ -16,32 +14,41 @@ buildPythonPackage rec { pname = "skorch"; - version = "0.11.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "b35cb4e50045742f0ffcfad33044af691d5d36b50212573753a804483a947ca9"; + hash = "sha256-fjNbNY/Dr7lgVGPrHJTvPGuhyPR6IVS7ohBQMI+J1+k="; }; propagatedBuildInputs = [ numpy torch scikit-learn scipy tabulate tqdm ]; - checkInputs = [ pytest pytest-cov flaky pandas pytestCheckHook ]; + nativeCheckInputs = [ flaky pandas pytestCheckHook ]; + + # patch out pytest-cov dep/invocation + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=skorch" "" \ + --replace "--cov-report=term-missing" "" \ + --replace "--cov-config .coveragerc" "" + ''; disabledTests = [ # on CPU, these expect artifacts from previous GPU run "test_load_cuda_params_to_cpu" # failing tests "test_pickle_load" - "test_grid_search_with_slds_" - "test_grid_search_with_dict_works" ]; + # tries to import `transformers` and download HuggingFace data + disabledTestPaths = [ "skorch/tests/test_hf.py" ]; + + pythonImportsCheck = [ "skorch" ]; + meta = with lib; { description = "Scikit-learn compatible neural net library using Pytorch"; homepage = "https://skorch.readthedocs.io"; changelog = "https://github.com/skorch-dev/skorch/blob/master/CHANGES.md"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; - # TypeError: __init__() got an unexpected keyword argument 'iid' - broken = true; }; } diff --git a/pkgs/development/python-modules/skrl/default.nix b/pkgs/development/python-modules/skrl/default.nix index 9747218157a5..b40fc789ec3a 100644 --- a/pkgs/development/python-modules/skrl/default.nix +++ b/pkgs/development/python-modules/skrl/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; doCheck = torch.cudaSupport; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/skybellpy/default.nix b/pkgs/development/python-modules/skybellpy/default.nix index c94b03bcc667..093df95b5657 100644 --- a/pkgs/development/python-modules/skybellpy/default.nix +++ b/pkgs/development/python-modules/skybellpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-sugar pytest-timeout pytestCheckHook diff --git a/pkgs/development/python-modules/skyfield/default.nix b/pkgs/development/python-modules/skyfield/default.nix index c6b3c69fc3e9..ca45a3de8d1c 100644 --- a/pkgs/development/python-modules/skyfield/default.nix +++ b/pkgs/development/python-modules/skyfield/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ certifi numpy sgp4 jplephem ]; - checkInputs = [ pandas ipython matplotlib assay ]; + nativeCheckInputs = [ pandas ipython matplotlib assay ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/skytemple-dtef/default.nix b/pkgs/development/python-modules/skytemple-dtef/default.nix index 9a050e9c2b5a..401e5a8e015b 100644 --- a/pkgs/development/python-modules/skytemple-dtef/default.nix +++ b/pkgs/development/python-modules/skytemple-dtef/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { skytemple-files ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 5e17f98f4448..22901130ccd8 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.19.3"; + version = "3.19.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - sha256 = "sha256-iWDKF4FZJPL6wHxVbvj2zlY0sqpBMXki9e7uuysX1o0="; + hash = "sha256-/DVcnfHjvmRreHSlZbzxz6pbqytEUdqbaGbQVxIW4Qk="; }; propagatedBuildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ codecov databases flake8 @@ -76,6 +76,7 @@ buildPythonPackage rec { meta = with lib; { description = "Slack Developer Kit for Python"; homepage = "https://slack.dev/python-slack-sdk/"; + changelog = "https://github.com/slackapi/python-slack-sdk/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index 1c02d592d679..08671a0e0f44 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -1,12 +1,14 @@ { lib , stdenv , aiohttp +, boto3 , buildPythonPackage -, codecov , fetchFromGitHub -, flake8 +, flask +, flask-sockets , isPy3k , mock +, moto , psutil , pytest-cov , pytest-mock @@ -15,20 +17,23 @@ , requests , responses , six +, sqlalchemy +, websockets , websocket-client }: buildPythonPackage rec { pname = "slackclient"; - version = "2.9.3"; + version = "3.19.5"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; - rev = "v${version}"; - sha256 = "1rfb7izgddv28ag37gdnv3sd8z2zysrxs7ad8x20x690zshpaq16"; + rev = "refs/tags/v${version}"; + hash = "sha256-/DVcnfHjvmRreHSlZbzxz6pbqytEUdqbaGbQVxIW4Qk="; }; propagatedBuildInputs = [ @@ -38,23 +43,31 @@ buildPythonPackage rec { six ]; - checkInputs = [ - codecov - flake8 + nativeCheckInputs = [ + boto3 + flask + flask-sockets mock + moto psutil - pytest-cov pytest-mock pytestCheckHook - pytest-runner responses + sqlalchemy + websockets ]; # Exclude tests that requires network features pytestFlagsArray = [ "--ignore=integration_tests" ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + disabledTests = [ "test_start_raises_an_error_if_rtm_ws_url_is_not_returned" + "test_interactions" + "test_send_message_while_disconnection" ] ++ lib.optionals stdenv.isDarwin [ # these fail with `ConnectionResetError: [Errno 54] Connection reset by peer` "test_issue_690_oauth_access" diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix index 506fad5db48d..76d96346b26e 100644 --- a/pkgs/development/python-modules/slicedimage/default.nix +++ b/pkgs/development/python-modules/slicedimage/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { tifffile ] ++ lib.optionals isPy27 [ pathlib enum34 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/slicer/default.nix b/pkgs/development/python-modules/slicer/default.nix index f5352c3de933..7228c7914619 100644 --- a/pkgs/development/python-modules/slicer/default.nix +++ b/pkgs/development/python-modules/slicer/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "f5d5f7b45f98d155b9c0ba6554fa9770c6b26d5793a3e77a1030fb56910ebeec"; }; - checkInputs = [ pytestCheckHook pandas torch scipy ]; + nativeCheckInputs = [ pytestCheckHook pandas torch scipy ]; disabledTests = [ # IndexError: too many indices for array diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index 303d385bbc42..ef2a897de21e 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -1,11 +1,12 @@ { lib , stdenv , buildPythonPackage +, crytic-compile , fetchFromGitHub , makeWrapper -, pythonOlder -, crytic-compile +, packaging , prettytable +, pythonOlder , setuptools , solc , withSolc ? false @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.9.1"; + version = "0.9.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "crytic"; repo = "slither"; rev = "refs/tags/${version}"; - hash = "sha256-u9uA4eq6gYQXHhZ1ruk1vkEIRTKsgN87zENuR1Fhew4="; + hash = "sha256-Co3BFdLmSIMqlZVEPJHYH/Cf7oKYSZ+Ktbnd5RZGmfE="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ crytic-compile + packaging prettytable setuptools ]; @@ -51,6 +53,7 @@ buildPythonPackage rec { contract details, and provides an API to easily write custom analyses. ''; homepage = "https://github.com/trailofbits/slither"; + changelog = "https://github.com/crytic/slither/releases/tag/${version}"; license = licenses.agpl3Plus; maintainers = with maintainers; [ arturcygan fab ]; }; diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 1f9f5e9f04f0..809db713cb25 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pyasn1-modules ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix index 72af69e3e7c2..363bd0ab62d7 100644 --- a/pkgs/development/python-modules/slob/default.nix +++ b/pkgs/development/python-modules/slob/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , isPy3k -, PyICU +, pyicu , python }: @@ -18,7 +18,7 @@ buildPythonPackage { sha256 = "01195hphjnlcvgykw143rf06s6y955sjc1r825a58vhjx7hj54zh"; }; - propagatedBuildInputs = [ PyICU ]; + propagatedBuildInputs = [ pyicu ]; checkPhase = '' ${python.interpreter} -m unittest slob diff --git a/pkgs/development/python-modules/slowapi/default.nix b/pkgs/development/python-modules/slowapi/default.nix index 6880053f4900..b8f2741cc788 100644 --- a/pkgs/development/python-modules/slowapi/default.nix +++ b/pkgs/development/python-modules/slowapi/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "slowapi"; - version = "0.1.6"; + version = "0.1.7"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "laurentS"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-3ZkQnroHMCHuTPH/cvi/iWndvdyQ/ZJQ2Qtu1CZyeGg="; + rev = "refs/tags/v${version}"; + hash = "sha256-IAB7JW8iVb5M610GVK0POXlSiya22KzNgr26BNvPC4Q="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { redis ]; - checkInputs = [ + nativeCheckInputs = [ fastapi hiro mock @@ -65,6 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for API rate limiting"; homepage = "https://github.com/laurentS/slowapi"; + changelog = "https://github.com/laurentS/slowapi/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/sly/default.nix b/pkgs/development/python-modules/sly/default.nix index 273972cbe4ee..715298062986 100644 --- a/pkgs/development/python-modules/sly/default.nix +++ b/pkgs/development/python-modules/sly/default.nix @@ -1,24 +1,39 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, setuptools +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "sly"; - version = "0.4"; + version = "0.5"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0an31bm5m8wqwphanmcsbbnmycy6l4xkmg4za4bwq8hk4dm2dwp5"; + hash = "sha256-JR1CAV6FBxWK7CFk8GA130qCsDFM5kUPRX1xJedkkCQ="; }; - checkInputs = [ pytest ]; + nativeBuildInputs = [ + setuptools + ]; - # tests not included with pypi release - doCheck = false; + postPatch = '' + # imperative dev dependency installation + rm Makefile + ''; + + pythonImportsCheck = [ + "sly" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "An improved PLY implementation of lex and yacc for Python 3"; diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index 668cdb1643da..5a306d181042 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "smart-open"; - version = "6.2.0"; + version = "6.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RaRe-Technologies"; repo = "smart_open"; - rev = "v${version}"; - sha256 = "sha256-AtFIluoI2QeHUX2dclEmOxsv/cEtusWq7GyViRBhL5g="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-sVKrCph5M7xsE7gtzsP/eVEbZyFfoucW3p30YYpwVFI="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ moto paramiko pytestCheckHook diff --git a/pkgs/development/python-modules/smartypants/default.nix b/pkgs/development/python-modules/smartypants/default.nix index 29a1e3c9a201..af21271edc51 100644 --- a/pkgs/development/python-modules/smartypants/default.nix +++ b/pkgs/development/python-modules/smartypants/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "00p1gnb9pzb3svdq3c5b9b332gsp50wrqqa39gj00m133zadanjp"; }; - checkInputs = [ + nativeCheckInputs = [ docutils pygments pytestCheckHook diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix index 562346b1a476..9f199d612511 100644 --- a/pkgs/development/python-modules/smbprotocol/default.nix +++ b/pkgs/development/python-modules/smbprotocol/default.nix @@ -7,30 +7,28 @@ , pytest-mock , pytestCheckHook , pythonOlder -, six }: buildPythonPackage rec { pname = "smbprotocol"; - version = "1.9.0"; + version = "1.10.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jborean93"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-u3brP3WsnoqRy3R0OQQkIbq+avS7nemx9GKpvTq+vxg="; + rev = "refs/tags/v${version}"; + hash = "sha256-8T091yF/Hu60aaUr6IDZt2cLxz1sXUbMewSqW1Ch0Vo="; }; propagatedBuildInputs = [ cryptography pyspnego - six ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; @@ -52,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SMBv2 and v3 Client"; homepage = "https://github.com/jborean93/smbprotocol"; + changelog = "https://github.com/jborean93/smbprotocol/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/smbus-cffi/default.nix b/pkgs/development/python-modules/smbus-cffi/default.nix index ffb22d1c4b42..ec3fbd8e8d80 100644 --- a/pkgs/development/python-modules/smbus-cffi/default.nix +++ b/pkgs/development/python-modules/smbus-cffi/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , cffi +, py , pytestCheckHook , pyserial , fetchpatch @@ -37,7 +38,7 @@ buildPythonPackage rec { # requires hardware access pytestFlagsArray = [ "--ignore=test/test_smbus_integration.py" ]; - checkInputs = [ pytestCheckHook pyserial ]; + nativeCheckInputs = [ py pytestCheckHook pyserial ]; meta = with lib; { description = "Python module for SMBus access through Linux I2C /dev interface"; diff --git a/pkgs/development/python-modules/smbus2/default.nix b/pkgs/development/python-modules/smbus2/default.nix index 262e765ad0da..8282d0b10961 100644 --- a/pkgs/development/python-modules/smbus2/default.nix +++ b/pkgs/development/python-modules/smbus2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-6JzFbhUq8XR1nYkadPeYqItcLZDIFAwTe3BriEW2nVI="; }; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/smhi-pkg/default.nix b/pkgs/development/python-modules/smhi-pkg/default.nix index 529d3fe27d78..b4a5ef4839d3 100644 --- a/pkgs/development/python-modules/smhi-pkg/default.nix +++ b/pkgs/development/python-modules/smhi-pkg/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/smmap/default.nix b/pkgs/development/python-modules/smmap/default.nix index 5e8344e3d637..53afd01afcfa 100644 --- a/pkgs/development/python-modules/smmap/default.nix +++ b/pkgs/development/python-modules/smmap/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936"; }; - checkInputs = [ nosexcover ]; + nativeCheckInputs = [ nosexcover ]; meta = { description = "A pure python implementation of a sliding window memory map manager"; diff --git a/pkgs/development/python-modules/smpplib/default.nix b/pkgs/development/python-modules/smpplib/default.nix index a71d3d6bd3d4..d26d5707d96a 100644 --- a/pkgs/development/python-modules/smpplib/default.nix +++ b/pkgs/development/python-modules/smpplib/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index 4bff67afd93f..2588c5724996 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/snapshottest/default.nix b/pkgs/development/python-modules/snapshottest/default.nix index b20f9afff9e6..6f6a1df05b8e 100644 --- a/pkgs/development/python-modules/snapshottest/default.nix +++ b/pkgs/development/python-modules/snapshottest/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fastdiff six termcolor ]; - checkInputs = [ django pytestCheckHook pytest-cov ]; + nativeCheckInputs = [ django pytestCheckHook pytest-cov ]; pythonImportsCheck = [ "snapshottest" ]; diff --git a/pkgs/development/python-modules/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix index 86e37168c899..b16cebd557d8 100644 --- a/pkgs/development/python-modules/sniffio/default.nix +++ b/pkgs/development/python-modules/sniffio/default.nix @@ -1,27 +1,33 @@ -{ buildPythonPackage, lib, fetchPypi, glibcLocales, isPy3k, contextvars -, pythonOlder, pytest, curio +{ buildPythonPackage +, lib +, fetchPypi +, glibcLocales +, isPy3k +, pythonOlder +, pytestCheckHook +, curio }: buildPythonPackage rec { pname = "sniffio"; version = "1.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5gMFxeXTFPU4klm38iqqM9j33uSXYxGSNK83VcVbkQE="; + hash = "sha256-5gMFxeXTFPU4klm38iqqM9j33uSXYxGSNK83VcVbkQE="; }; disabled = !isPy3k; - buildInputs = [ glibcLocales ]; + buildInputs = [ + glibcLocales + ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ contextvars ]; - - checkInputs = [ pytest curio ]; - - checkPhase = '' - pytest - ''; + nativeCheckInputs = [ + curio + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/python-trio/sniffio"; diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index 1b7bd7341ebf..40dbad84a416 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index dd2a4175d77f..f0299b231b06 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -20,16 +20,22 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.8.0"; - format = "setuptools"; + version = "2.9.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gvZ+Nuf+Ns1XIYpsBHdegzA9sjFxT9+Qm6kbsJR8JLY="; + hash = "sha256-dVGyQEsmhQ+xLGIy0BW6XRCtsTsJHjef6Lg2ZJL2JLg="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "charset_normalizer>=2,<3" "charset_normalizer" \ + --replace "pyOpenSSL>=16.2.0,<23.0.0" "pyOpenSSL" + ''; + propagatedBuildInputs = [ asn1crypto certifi @@ -47,13 +53,6 @@ buildPythonPackage rec { typing-extensions ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pyOpenSSL>=16.2.0,<23.0.0" "pyOpenSSL" \ - --replace "cryptography>=3.1.0,<37.0.0" "cryptography" \ - --replace "charset-normalizer~=2.0.0" "charset_normalizer>=2" - ''; - # Tests require encrypted secrets, see # https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters doCheck = false; @@ -64,6 +63,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/snowflakedb/snowflake-connector-python/blob/v${version}/DESCRIPTION.md"; description = "Snowflake Connector for Python"; homepage = "https://github.com/snowflakedb/snowflake-connector-python"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index ed51eb73eaa7..94a4a2a14a52 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.4.3"; + version = "1.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sBnkztxqTz7MQ0eYvkAvYWPojxBy6ek1qZxMppLTTM4="; + hash = "sha256-clUDElZ17xxbrJ+O0oplzVAxL1afWDwdk/g5ZofEhOs="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/snowflakedb/snowflake-sqlalchemy/blob/v${version}/DESCRIPTION.md"; description = "Snowflake SQLAlchemy Dialect"; homepage = "https://github.com/snowflakedb/snowflake-sqlalchemy"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/snuggs/default.nix b/pkgs/development/python-modules/snuggs/default.nix index f88b6080fdf3..9290e2f36987 100644 --- a/pkgs/development/python-modules/snuggs/default.nix +++ b/pkgs/development/python-modules/snuggs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click numpy pyparsing ]; - checkInputs = [ pytest hypothesis ]; + nativeCheckInputs = [ pytest hypothesis ]; checkPhase = "pytest test_snuggs.py"; meta = with lib; { diff --git a/pkgs/development/python-modules/social-auth-app-django/default.nix b/pkgs/development/python-modules/social-auth-app-django/default.nix index bd38ef3a5a24..eb928ec2e781 100644 --- a/pkgs/development/python-modules/social-auth-app-django/default.nix +++ b/pkgs/development/python-modules/social-auth-app-django/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "social_django" ]; - checkInputs = [ + nativeCheckInputs = [ django ]; diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix index 6427208420f2..5636021ca0b7 100644 --- a/pkgs/development/python-modules/social-auth-core/default.nix +++ b/pkgs/development/python-modules/social-auth-core/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook httpretty ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); diff --git a/pkgs/development/python-modules/socialscan/default.nix b/pkgs/development/python-modules/socialscan/default.nix index 9e51ccd81d37..5e25e3c16bec 100644 --- a/pkgs/development/python-modules/socialscan/default.nix +++ b/pkgs/development/python-modules/socialscan/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "socialscan"; - version = "1.4.2"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iojw"; repo = pname; - rev = "v${version}"; - sha256 = "rT+/j6UqDOzuNBdN3I74YIxS6qkhd7BjHCGX+gGjprc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-jiyTcpJ00DvfweChawj1ugdCVHHAdwDbHEp9jivH7gs="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library and CLI for accurately querying username and email usage on online platforms"; homepage = "https://github.com/iojw/socialscan"; + changelog = "https://github.com/iojw/socialscan/releases/tag/v${version}"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/sockio/default.nix b/pkgs/development/python-modules/sockio/default.nix index 6476c88c31a6..5e1fcbe2a7f1 100644 --- a/pkgs/development/python-modules/sockio/default.nix +++ b/pkgs/development/python-modules/sockio/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { --replace "--durations=2 --verbose" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/socksio/default.nix b/pkgs/development/python-modules/socksio/default.nix index 5d42ed6e8ecc..ad0e8e2e6c07 100644 --- a/pkgs/development/python-modules/socksio/default.nix +++ b/pkgs/development/python-modules/socksio/default.nix @@ -28,7 +28,7 @@ buildPythonPackage { rm pytest.ini ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 578cc6ce2d8d..48a69786855b 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "soco"; - version = "0.28.1"; + version = "0.29.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; - rev = "v${version}"; - hash = "sha256-Po9ns+XQ8WuILKrinllm/lqZFWEBnylesCoqs+cnKs4="; + rev = "refs/tags/v${version}"; + hash = "sha256-6xyJY+qgwMsOgnh+PTVCf4F442hnBwlFnW+bt/cWxGc="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook graphviz mock @@ -47,13 +47,12 @@ buildPythonPackage rec { "soco" ]; - passthru.updateScript = nix-update-script { - attrPath = "python3Packages.${pname}"; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "CLI and library to control Sonos speakers"; homepage = "http://python-soco.com/"; + changelog = "https://github.com/SoCo/SoCo/releases/tag/v${version}"; 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 6c3df4eb6f98..25bc231b814e 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -1,53 +1,55 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , click , fetchFromGitHub , mock +, prettytable , prompt-toolkit , ptable , pygments , pytestCheckHook , pythonOlder , requests +, rich , sphinx , testtools , tkinter , urllib3 -, prettytable -, rich , zeep }: buildPythonPackage rec { pname = "softlayer"; - version = "6.1.0"; - disabled = pythonOlder "3.5"; + version = "6.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; repo = "softlayer-python"; - rev = "v${version}"; - sha256 = "sha256-T49KVAsgcAZySkaJi47IrFcMHGZvEkGDjPWsdMarzwM="; + rev = "refs/tags/v${version}"; + hash = "sha256-msNW0PeDbs5iq77FBPKKWH0js/PAQz6xfbM0ycMVg5U="; }; postPatch = '' substituteInPlace setup.py \ - --replace 'rich == 12.3.0' 'rich >= 12.3.0' + --replace "rich ==" "rich >=" ''; propagatedBuildInputs = [ click + prettytable prompt-toolkit ptable pygments requests - urllib3 - prettytable rich + urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook sphinx @@ -64,14 +66,17 @@ buildPythonPackage rec { disabledTestPaths = [ # Test fails with ConnectionError trying to connect to api.softlayer.com - "tests/transports/soap_tests.py" + "tests/transports/soap_tests.py.unstable" ]; - pythonImportsCheck = [ "SoftLayer" ]; + pythonImportsCheck = [ + "SoftLayer" + ]; meta = with lib; { description = "Python libraries that assist in calling the SoftLayer API"; homepage = "https://github.com/softlayer/softlayer-python"; + changelog = "https://github.com/softlayer/softlayer-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/solax/default.nix b/pkgs/development/python-modules/solax/default.nix index 3e9f2d4659bc..4a471bedf17e 100644 --- a/pkgs/development/python-modules/solax/default.nix +++ b/pkgs/development/python-modules/solax/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp voluptuous ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-cov pytest-httpserver diff --git a/pkgs/development/python-modules/solc-select/default.nix b/pkgs/development/python-modules/solc-select/default.nix index e51f1cd143f1..af8724d1999d 100644 --- a/pkgs/development/python-modules/solc-select/default.nix +++ b/pkgs/development/python-modules/solc-select/default.nix @@ -1,17 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, packaging +, pycryptodome }: buildPythonPackage rec { pname = "solc-select"; - version = "0.2.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6VawTcffIgnR+zuC4rti+Ocwu1VMTX+VihT/L7LzchI="; + sha256 = "sha256-zrpWHQdoCVDGaDGDf9fWhnRsTe1GVwqk1qls1PyvlLw="; }; + propagatedBuildInputs = [ + packaging + pycryptodome + ]; + # no tests doCheck = false; pythonImportsCheck = [ "solc_select" ]; diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index 507e75356bed..e34a6babb042 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.2"; + version = "2.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "tsproisl"; repo = "SoMaJo"; rev = "refs/tags/v${version}"; - sha256 = "sha256-rzh+IASqs+uSgUq3BI9UdC4XRsozIGsaOt/LR+VhBxc="; + sha256 = "sha256-EnYw8TSZLXgB4pZaZBgxaO13PpTDx4lGsdGJ+51A6wE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/somecomfort/default.nix b/pkgs/development/python-modules/somecomfort/default.nix deleted file mode 100644 index 89c5dedf5065..000000000000 --- a/pkgs/development/python-modules/somecomfort/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, prettytable -, requests -}: - -buildPythonPackage rec { - pname = "somecomfort"; - version = "0.8.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "56e60e4e9f76c12c0c9dd1016e9f1334be6800409e0762f5f143f9069d7292d3"; - }; - - propagatedBuildInputs = [ - requests - prettytable - ]; - - # tests require network access - doCheck = false; - - pythonImportsCheck = [ "somecomfort" ]; - - meta = with lib; { - description = "Client for Honeywell's US-based cloud devices"; - homepage = "https://github.com/kk7ds/somecomfort"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python-modules/sonarr/default.nix b/pkgs/development/python-modules/sonarr/default.nix index 9f73522def4d..2cc1095b9ede 100644 --- a/pkgs/development/python-modules/sonarr/default.nix +++ b/pkgs/development/python-modules/sonarr/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index ac0a39363134..bd7efca27e6f 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix index 9f9f99a1856c..30e7486c6d9a 100644 --- a/pkgs/development/python-modules/sortedcollections/default.nix +++ b/pkgs/development/python-modules/sortedcollections/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sortedcontainers ]; - checkInputs = [ + nativeCheckInputs = [ pytest-cov pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/pkgs/development/python-modules/sortedcontainers/default.nix index 4edd68f1f07d..bbf22ed9b793 100644 --- a/pkgs/development/python-modules/sortedcontainers/default.nix +++ b/pkgs/development/python-modules/sortedcontainers/default.nix @@ -18,7 +18,7 @@ let doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix index c1b68e61088e..4bbf606ff523 100644 --- a/pkgs/development/python-modules/soundfile/default.nix +++ b/pkgs/development/python-modules/soundfile/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ numpy libsndfile cffi ]; propagatedNativeBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/spacy-loggers/default.nix b/pkgs/development/python-modules/spacy-loggers/default.nix index 9de42f2a6c0f..cc3aebff1bbd 100644 --- a/pkgs/development/python-modules/spacy-loggers/default.nix +++ b/pkgs/development/python-modules/spacy-loggers/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "spacy-loggers"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-APb9VU25/R/eZQGyPh8Ocvbu8Uux5/wVRW0R0dLekso="; + sha256 = "sha256-5vmDv3EjAJHVu3sRv2S9VEFeyoORCNX4PZFV0LqTvyg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix b/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix index 11a927a0a627..c9e1f3400f3a 100644 --- a/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { dontBuild = true; doCheck = true; - checkInputs = [ pytest spacy_models.en_core_web_trf ]; + nativeCheckInputs = [ pytest spacy_models.en_core_web_trf ]; checkPhase = '' pytest annotate.py diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index 914e2cb5153e..068f8ede69dd 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -2,7 +2,6 @@ , callPackage , fetchPypi , buildPythonPackage -, dataclasses , torch , pythonOlder , spacy @@ -13,14 +12,14 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.1.8"; + version = "1.1.9"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-e7YuBEq2yggW5G2pJ0Rjw9z3c1jqgRKCifYSfnzblVs="; + hash = "sha256-2uU6y/rsvNSLpeXL6O9IOQ0RMN0AEMH+/IKH6uufusU="; }; propagatedBuildInputs = [ @@ -29,15 +28,8 @@ buildPythonPackage rec { spacy-alignments srsly transformers - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "transformers>=3.4.0,<4.22.0" "transformers>=3.4.0 # ,<4.22.0" - ''; - # Test fails due to missing arguments for trfs2arrays(). doCheck = false; @@ -50,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "spaCy pipelines for pretrained BERT, XLNet and GPT-2"; homepage = "https://github.com/explosion/spacy-transformers"; + changelog = "https://github.com/explosion/spacy-transformers/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/spacy/annotation-test/default.nix b/pkgs/development/python-modules/spacy/annotation-test/default.nix index 1b066ff3c39d..c7d5efe86641 100644 --- a/pkgs/development/python-modules/spacy/annotation-test/default.nix +++ b/pkgs/development/python-modules/spacy/annotation-test/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { dontBuild = true; doCheck = true; - checkInputs = [ pytest spacy_models.en_core_web_sm ]; + nativeCheckInputs = [ pytest spacy_models.en_core_web_sm ]; checkPhase = '' pytest annotate.py diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 54c96a73cb82..4fd3594b8826 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.4.1"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-WcXPXTSKbA5kpZrFz+bNhdCOhmM3hwyV0exhYdUx5GM="; + hash = "sha256-/iAScBKZJ3iATZP3XOk3DViFcwcmOcODLOw49Uv35KU="; }; propagatedBuildInputs = [ @@ -72,7 +72,7 @@ buildPythonPackage rec { --replace "typer>=0.3.0,<0.5.0" "typer>=0.3.0" ''; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/spacy/legacy.nix b/pkgs/development/python-modules/spacy/legacy.nix index 3ee2feeaa96a..a68ea0456fe5 100644 --- a/pkgs/development/python-modules/spacy/legacy.nix +++ b/pkgs/development/python-modules/spacy/legacy.nix @@ -5,20 +5,24 @@ buildPythonPackage rec { pname = "spacy-legacy"; - version = "3.0.9"; + version = "3.0.12"; src = fetchPypi { inherit pname version; - sha256 = "sha256-T33LxObI6MtOrbsAn5wKGipnRC4AMsjWd2yUcMN1mQM="; + sha256 = "sha256-s31uDJtuHXyhz1vHFSq2SkxGcfWcha2vej/LhwNXp3Q="; }; - # checkInputs = [ pytestCheckHook spacy ]; + # nativeCheckInputs = [ pytestCheckHook spacy ]; doCheck = false; - pythonImportsCheck = [ "spacy_legacy" ]; + + pythonImportsCheck = [ + "spacy_legacy" + ]; meta = with lib; { - description = "A Path interface for local and cloud bucket storage"; - homepage = "https://github.com/justindujardin/pathy"; + description = "Legacy registered functions for spaCy backwards compatibility"; + homepage = "https://github.com/explosion/spacy-legacy"; + changelog = "https://github.com/explosion/spacy-legacy/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ melling ]; }; diff --git a/pkgs/development/python-modules/spake2/default.nix b/pkgs/development/python-modules/spake2/default.nix index 4038e2255afa..a5f5f6bf92a4 100644 --- a/pkgs/development/python-modules/spake2/default.nix +++ b/pkgs/development/python-modules/spake2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "c17a614b29ee4126206e22181f70a406c618d3c6c62ca6d6779bce95e9c926f4"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ hkdf ]; diff --git a/pkgs/development/python-modules/sparklines/default.nix b/pkgs/development/python-modules/sparklines/default.nix index 9913cafdbc18..b94a56439d53 100644 --- a/pkgs/development/python-modules/sparklines/default.nix +++ b/pkgs/development/python-modules/sparklines/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ future ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "sparklines" ]; diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index 2a11e1f14587..a9ed433c2e52 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ dask pytestCheckHook ]; diff --git a/pkgs/development/python-modules/spdx-tools/default.nix b/pkgs/development/python-modules/spdx-tools/default.nix index d35846a11017..d1e66d676464 100644 --- a/pkgs/development/python-modules/spdx-tools/default.nix +++ b/pkgs/development/python-modules/spdx-tools/default.nix @@ -12,13 +12,14 @@ buildPythonPackage rec { pname = "spdx-tools"; - version = "0.7.0a3"; + version = "0.7.0"; + format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-afV1W1n5ubHhqfLFpPO5fxaIy5TaZdw9eDy3JYOJ1oE="; + hash = "sha256-QqKMKBedWOFYF1av9IgQuyJ6b5mNhhMpIZVJdEDcAK8="; }; propagatedBuildInputs = [ @@ -29,7 +30,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -40,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "SPDX parser and tools"; homepage = "https://github.com/spdx/tools-python"; + changelog = "https://github.com/spdx/tools-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = teams.determinatesystems.members; }; diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index fae812319ec8..eb208528c980 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ astropy casa-formats-io radio_beam joblib six dask ]; - checkInputs = [ pytestCheckHook aplpy pytest-astropy ]; + nativeCheckInputs = [ pytestCheckHook aplpy pytest-astropy ]; # On x86_darwin, this test fails with "Fatal Python error: Aborted" # when sandbox = true. diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index 8b5e36b0f665..04742fbf020c 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - checkInputs = [ pytest pyyaml ]; + nativeCheckInputs = [ pytest pyyaml ]; # pytestCheckHook doesn't work # ImportError: cannot import name '_spglib' from partially initialized module 'spglib' diff --git a/pkgs/development/python-modules/sphinx-argparse/default.nix b/pkgs/development/python-modules/sphinx-argparse/default.nix index a4a414328b55..9a5164b3e0b4 100644 --- a/pkgs/development/python-modules/sphinx-argparse/default.nix +++ b/pkgs/development/python-modules/sphinx-argparse/default.nix @@ -7,11 +7,12 @@ buildPythonPackage rec { pname = "sphinx-argparse"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-5UrWyPiVrGu50N2foH5H4TeipCrhinFFFSYuhrTMS6s="; + pname = "sphinx_argparse"; + inherit version; + sha256 = "sha256-4PNBhOtW8S+s53T7yHuICr25AXoJmNHsVZsmfpaX5Ek="; }; postPatch = '' @@ -26,7 +27,7 @@ buildPythonPackage rec { sphinx ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index 85f6366f0f07..3908ef631a28 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchPypi +, hatch-vcs +, hatchling , pythonOlder , sphinx , pytestCheckHook @@ -8,7 +10,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "1.19.2"; + version = "1.19.5"; in buildPythonPackage { @@ -20,14 +22,19 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-hy+y17PXlIJsKONu32c56TVJSRRH3KvrB8WIVen5FN4="; + hash = "sha256-OKInN44rwVyE4pr4yx11gRgtoRBxEf0ciLGbXrcHYgU="; }; + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + propagatedBuildInputs = [ sphinx ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -39,6 +46,7 @@ buildPythonPackage { ]; meta = with lib; { + changelog = "https://github.com/tox-dev/sphinx-autodoc-typehints/releases/tag/${version}"; description = "Type hints (PEP 484) support for the Sphinx autodoc extension"; homepage = "https://github.com/tox-dev/sphinx-autodoc-typehints"; license = licenses.mit; diff --git a/pkgs/development/python-modules/sphinx-automodapi/default.nix b/pkgs/development/python-modules/sphinx-automodapi/default.nix index c8b586d0fc6e..7560b37036d3 100644 --- a/pkgs/development/python-modules/sphinx-automodapi/default.nix +++ b/pkgs/development/python-modules/sphinx-automodapi/default.nix @@ -36,9 +36,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace "sphinx_automodapi/tests/helpers.py" \ --replace '[0]), None)' "[0]), (None, '${testInventory}'))" + + substituteInPlace "sphinx_automodapi/tests/test_cases.py" \ + --replace '[0]), None)' "[0]), (None, '${testInventory}'))" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook cython gcc diff --git a/pkgs/development/python-modules/sphinx-book-theme/default.nix b/pkgs/development/python-modules/sphinx-book-theme/default.nix index 10f45cb6a7d5..6c5597755a36 100644 --- a/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "sphinx-book-theme"; - version = "0.3.3"; + version = "0.4.0rc1"; format = "wheel"; @@ -20,7 +20,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "sphinx_book_theme"; - sha256 = "9685959dbbb492af005165ef1b9229fdd5d5431580ac181578beae3b4d012d91"; + sha256 = "bfad8ef469885da5633f7cf7f8cd9a0ae11ea2351a91e507b44cf15973934512"; }; propagatedBuildInputs = [ @@ -34,10 +34,8 @@ buildPythonPackage rec { meta = with lib; { description = "A clean book theme for scientific explanations and documentation with Sphinx"; homepage = "https://github.com/executablebooks/sphinx-book-theme"; + changelog = "https://github.com/executablebooks/sphinx-book-theme/raw/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; - # Missing sphinx 5.X support - # https://github.com/executablebooks/sphinx-book-theme/issues/592 - broken = true; }; } diff --git a/pkgs/development/python-modules/sphinx-codeautolink/default.nix b/pkgs/development/python-modules/sphinx-codeautolink/default.nix new file mode 100644 index 000000000000..c9dcec606fa1 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-codeautolink/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonImportsCheckHook +# documentation build dependencies +, sphinxHook +, sphinx-rtd-theme +, matplotlib +, ipython +# runtime dependencies +, sphinx +, beautifulsoup4 +# check dependencies +, pytest +}: + +buildPythonPackage rec { + pname = "sphinx-codeautolink"; + version = "0.12.1"; + outputs = [ "out" "doc" ]; + + src = fetchFromGitHub { + owner = "felix-hilden"; + repo = "sphinx-codeautolink"; + rev = "v${version}"; + hash = "sha256-x81jhYknJ6lsLxR5ZyuYNNz/zt0kto6bNyaeZmPKDIE="; + }; + + nativeBuildInputs = [ + pythonImportsCheckHook + sphinxHook + sphinx-rtd-theme + matplotlib + ipython + ]; + + sphinxRoot = "docs/src"; + + propagatedBuildInputs = [ sphinx beautifulsoup4 ]; + + nativeCheckInputs = [ pytest ]; + + pythonImportsCheck = [ "sphinx_codeautolink" ]; + + meta = with lib; { + description = "A sphinx extension that makes code examples clickable"; + homepage = "https://github.com/felix-hilden/sphinx-codeautolink"; + license = licenses.mit; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/development/python-modules/sphinx-external-toc/default.nix b/pkgs/development/python-modules/sphinx-external-toc/default.nix index 009e4ef9c841..cc0163ba3d6e 100644 --- a/pkgs/development/python-modules/sphinx-external-toc/default.nix +++ b/pkgs/development/python-modules/sphinx-external-toc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sphinx-external-toc"; - version = "0.3.0"; + version = "0.3.1"; format = "flit"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sphinx_external_toc"; - sha256 = "73198636ada4b4f72f69c7bab09f0e4ce84978056dc5afa9ee51d287bec0a8ef"; + sha256 = "9c8ea9980ea0e57bf3ce98f6a400f9b69eb1df808f7dd796c9c8cc1873d8b355"; }; nativeBuildInputs = [ flit-core ]; @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "A sphinx extension that allows the site-map to be defined in a single YAML file"; homepage = "https://github.com/executablebooks/sphinx-external-toc"; + changelog = "https://github.com/executablebooks/sphinx-external-toc/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; }; diff --git a/pkgs/development/python-modules/sphinx-fortran/default.nix b/pkgs/development/python-modules/sphinx-fortran/default.nix index 748e4c6948bc..6b52078f0b97 100644 --- a/pkgs/development/python-modules/sphinx-fortran/default.nix +++ b/pkgs/development/python-modules/sphinx-fortran/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { # Tests are failing because reference files are not updated doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sphinx-hoverxref/default.nix b/pkgs/development/python-modules/sphinx-hoverxref/default.nix new file mode 100644 index 000000000000..c606297e1afc --- /dev/null +++ b/pkgs/development/python-modules/sphinx-hoverxref/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pythonImportsCheckHook +# documentation build dependencies +, sphinxHook +, sphinx-notfound-page +, sphinx-prompt +, sphinx-rtd-theme +, sphinx-tabs +, sphinx-version-warning +, sphinxcontrib-autoapi +, sphinxcontrib-bibtex +, sphinxemoji +# runtime dependencies +, sphinx +, sphinx-jquery +}: + +buildPythonPackage rec { + pname = "sphinx-hoverxref"; + version = "1.3.0"; + format = "flit"; + outputs = [ "out" "doc" ]; + + src = fetchFromGitHub { + owner = "readthedocs"; + repo = "sphinx-hoverxref"; + rev = version; + hash = "sha256-DJ+mHu9IeEYEyf/SD+nDNtWpTf6z7tQzG0ogaECDpkU="; + }; + + nativeBuildInputs = [ + flit-core + pythonImportsCheckHook + + sphinxHook + sphinx-notfound-page + sphinx-prompt + sphinx-rtd-theme + sphinx-tabs + sphinx-version-warning + sphinxcontrib-autoapi + sphinxcontrib-bibtex + sphinxemoji + ]; + + propagatedBuildInputs = [ sphinx sphinx-jquery ]; + + pythonImportsCheck = [ "hoverxref" ]; + + meta = with lib; { + description = "A sphinx extension for creating tooltips on the cross references of the documentation"; + longDescription = '' + sphinx-hoverxref is a Sphinx extension to show a floating window + (tooltips or modal dialogues) on the cross references of the + documentation embedding the content of the linked section on them. + + With sphinx-hoverxref, you don’t need to click a link to see what’s + in there. + ''; + homepage = "https://github.com/readthedocs/sphinx-hoverxref"; + license = licenses.mit; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/development/python-modules/sphinx-jquery/default.nix b/pkgs/development/python-modules/sphinx-jquery/default.nix new file mode 100644 index 000000000000..6bbf8687f5a1 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-jquery/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pythonImportsCheckHook +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinx-jquery"; + version = "3.0.0"; + format = "flit"; + + src = fetchFromGitHub { + owner = "sphinx-contrib"; + repo = "jquery"; + rev = "v${version}"; + hash = "sha256-argG+jMUqLiWo4lKWAmHmUxotHl+ddJuJZ/zcUl9u5Q="; + }; + + nativeBuildInputs = [ + pythonImportsCheckHook + flit-core + ]; + + propagatedBuildInputs = [ sphinx ]; + + pythonImportsCheck = [ "sphinxcontrib.jquery" ]; + + meta = with lib; { + description = "A sphinx extension that ensures that jQuery is installed for use in Sphinx themes or extensions"; + homepage = "https://github.com/sphinx-contrib/jquery"; + license = licenses.bsd0; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/development/python-modules/sphinx-markdown-tables/default.nix b/pkgs/development/python-modules/sphinx-markdown-tables/default.nix new file mode 100644 index 000000000000..55fb0b41f43e --- /dev/null +++ b/pkgs/development/python-modules/sphinx-markdown-tables/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sphinx +, markdown +}: + +buildPythonPackage rec { + pname = "sphinx-markdown-tables"; + version = "0.0.17"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-a8bT1ADqzP7r0ohEa8CN2DCDNnxYuF1A/mwS1371kvE="; + }; + + propagatedBuildInputs = [ + sphinx + markdown + ]; + + pythonImportsCheck = [ "sphinx_markdown_tables" ]; + + meta = with lib; { + description = "Sphinx extension for rendering tables written in markdown"; + homepage = "https://github.com/ryanfox/sphinx-markdown-tables"; + maintainers = with maintainers; [ Madouura ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/python-modules/sphinx-mdinclude/default.nix b/pkgs/development/python-modules/sphinx-mdinclude/default.nix index 246c30e79664..ca7e574c82fb 100644 --- a/pkgs/development/python-modules/sphinx-mdinclude/default.nix +++ b/pkgs/development/python-modules/sphinx-mdinclude/default.nix @@ -10,19 +10,19 @@ buildPythonPackage rec { pname = "sphinx-mdinclude"; - version = "0.5.2"; + version = "0.5.3"; format = "flit"; src = fetchPypi { pname = "sphinx_mdinclude"; inherit version; - hash = "sha256-F7UVe1xNrz+vCbJOCxwyJQoxfwSCORW+qu9vDH7oEPc="; + hash = "sha256-KZjj0YswIsmYPRtyGR/jfiX/zNVBZcvjrLIszu3ZGvQ="; }; nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ mistune docutils ]; - checkInputs = [ pygments ]; + nativeCheckInputs = [ pygments ]; meta = with lib; { homepage = "https://github.com/miyakogi/m2r"; diff --git a/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/pkgs/development/python-modules/sphinx-notfound-page/default.nix new file mode 100644 index 000000000000..dd2efe81fd15 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pythonImportsCheckHook +# documentation build dependencies +, sphinxHook +, sphinx-prompt +, sphinx-rtd-theme +, sphinx-tabs +, sphinxcontrib-autoapi +, sphinxemoji +# runtime dependencies +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinx-notfound-page"; + version = "0.8.3"; + format = "flit"; + outputs = [ "out" "doc" ]; + + src = fetchFromGitHub { + owner = "readthedocs"; + repo = "sphinx-notfound-page"; + rev = version; + hash = "sha256-9iP6X2dqtMC3+CIrNI3fGDLL8xyXVAWNhN90DlMa9JU="; + }; + + nativeBuildInputs = [ + flit-core + pythonImportsCheckHook + sphinxHook + sphinx-prompt + sphinx-rtd-theme + sphinx-tabs + sphinxcontrib-autoapi + sphinxemoji + ]; + + propagatedBuildInputs = [ sphinx ]; + + pythonImportsCheck = [ "notfound" ]; + + meta = with lib; { + description = "A sphinx extension to create a custom 404 page with absolute URLs hardcoded"; + homepage = "https://github.com/readthedocs/sphinx-notfound-page"; + license = licenses.mit; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/development/python-modules/sphinx-prompt/default.nix b/pkgs/development/python-modules/sphinx-prompt/default.nix new file mode 100644 index 000000000000..cc5d5f0b2eca --- /dev/null +++ b/pkgs/development/python-modules/sphinx-prompt/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, sphinxHook +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinx-prompt"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "sbrunner"; + repo = "sphinx-prompt"; + rev = version; + hash = "sha256-ClUPAIyPrROJw4GXeakA8U443Vlhy3P/2vFnAtyrPHU="; + }; + + propagatedBuildInputs = [ sphinx ]; + + meta = with lib; { + description = "A sphinx extension for creating unselectable prompt"; + homepage = "https://github.com/sbrunner/sphinx-prompt"; + license = licenses.bsd3; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/development/python-modules/sphinx-pytest/default.nix b/pkgs/development/python-modules/sphinx-pytest/default.nix index c1ecb232c8b5..019a5d177b9b 100644 --- a/pkgs/development/python-modules/sphinx-pytest/default.nix +++ b/pkgs/development/python-modules/sphinx-pytest/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "sphinx_pytest" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix index 514ce279fe79..998ee4b8ed77 100644 --- a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix @@ -9,17 +9,18 @@ buildPythonPackage rec { pname = "sphinx-rtd-theme"; - version = "1.0.0"; + version = "1.1.1"; src = fetchPypi { pname = "sphinx_rtd_theme"; inherit version; - sha256 = "0p3abj91c3l72ajj5jwblscsdf1jflrnn0djx2h5y6f2wjbx9ipf"; + sha256 = "sha256-YUbIRfHhlHs8PdRDLCiZihaTzMdCtPmtfGMSnwdXwQM="; }; postPatch = '' - substituteInPlace setup.py \ - --replace "docutils<0.18" "docutils" + substituteInPlace setup.cfg \ + --replace "docutils <0.18" "docutils" \ + --replace "sphinx >=1.6,<6" "sphinx" ''; preBuild = '' @@ -32,7 +33,7 @@ buildPythonPackage rec { sphinx ]; - checkInputs = [ + nativeCheckInputs = [ readthedocs-sphinx-ext pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sphinx-tabs/default.nix b/pkgs/development/python-modules/sphinx-tabs/default.nix new file mode 100644 index 000000000000..a2714c2d1260 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-tabs/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonImportsCheckHook +# documentation build dependencies +, sphinxHook +# runtime dependencies +, sphinx +, pygments +, docutils +# test dependencies +, pytest +, beautifulsoup4 +}: + +buildPythonPackage rec { + pname = "sphinx-tabs"; + version = "3.4.1"; + outputs = [ "out" "doc" ]; + + src = fetchFromGitHub { + owner = "executablebooks"; + repo = "sphinx-tabs"; + rev = "v${version}"; + hash = "sha256-5lpo7NRCksXJOdbLSFjDxQV/BsxRBb93lA6tavz6YEs="; + }; + + postPatch = '' + substituteInPlace setup.py --replace 'docutils~=0.18.0' 'docutils' + ''; + + nativeBuildInputs = [ + pythonImportsCheckHook + sphinxHook + ]; + + propagatedBuildInputs = [ + sphinx + pygments + docutils + ]; + + nativeCheckInputs = [ pytest + beautifulsoup4 + ]; + + pythonImportsCheck = [ "sphinx_tabs" ]; + + meta = with lib; { + description = "A sphinx extension for creating tabbed content when building HTML."; + homepage = "https://github.com/executablebooks/sphinx-tabs"; + license = licenses.mit; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/development/python-modules/sphinx-testing/default.nix b/pkgs/development/python-modules/sphinx-testing/default.nix index daf90bb3b503..d29cfdb7a761 100644 --- a/pkgs/development/python-modules/sphinx-testing/default.nix +++ b/pkgs/development/python-modules/sphinx-testing/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "ef661775b5722d7b00f67fc229104317d35637a4fb4434bf2c005afdf1da4d09"; }; - checkInputs = [ unittestCheckHook mock ]; + nativeCheckInputs = [ unittestCheckHook mock ]; propagatedBuildInputs = [ sphinx six ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/pkgs/development/python-modules/sphinx-thebe/default.nix b/pkgs/development/python-modules/sphinx-thebe/default.nix index c98e2fea6883..1bf8685282ee 100644 --- a/pkgs/development/python-modules/sphinx-thebe/default.nix +++ b/pkgs/development/python-modules/sphinx-thebe/default.nix @@ -7,13 +7,14 @@ buildPythonPackage rec { pname = "sphinx-thebe"; - version = "0.1.2"; + version = "0.2.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "756f1dd6643f5abb491f8a27b22825b04f47e05c5d214bbb2e6b5d42b621b85e"; + sha256 = "f4c8c1542054f991b73fcb28c4cf21697e42aba2f83f22348c1c851b82766583"; }; propagatedBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/sphinx-version-warning/default.nix b/pkgs/development/python-modules/sphinx-version-warning/default.nix new file mode 100644 index 000000000000..bf57d4f2fd83 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-version-warning/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pythonImportsCheckHook +, sphinx +, sphinxHook +, sphinxcontrib-autoapi +, sphinx-rtd-theme +, sphinx-tabs +, sphinx-prompt +, sphinxemoji +}: + +# Latest tagged release release "1.1.2" (Nov 2018) does not contain +# documenation, it was added in commits Aug 10, 2019. Repository does not have +# any activity since then. +buildPythonPackage rec { + pname = "sphinx-version-warning"; + version = "unstable-2019-08-10"; + outputs = [ "out" "doc" ]; + + src = fetchFromGitHub { + owner = "humitos"; + repo = "sphinx-version-warning"; + rev = "a82156c2ea08e5feab406514d0ccd9d48a345f48"; + hash = "sha256-WnJYMk1gPLT0dBn7lmxVDNVkLYkDCgQOtM9fQ3kc6k0="; + }; + + # It tries to write to file relative to it own location at runtime + # and gets permission denied, since Nix store is immutable. + patches = [ + (fetchpatch { + url = "https://github.com/humitos/sphinx-version-warning/commit/cb1b47becf2a0d3b2570ca9929f42f7d7e472b6f.patch"; + hash = "sha256-Vj0QAHIBmc0VxE+TTmJePzvr5nc45Sn2qqM+C/pkgtM="; + }) + ]; + + nativeBuildInputs = [ + pythonImportsCheckHook + sphinxHook + sphinxcontrib-autoapi + sphinx-rtd-theme + sphinx-tabs + sphinx-prompt + sphinxemoji + ]; + + propagatedBuildInputs = [ sphinx ]; + + pythonImportsCheck = [ "versionwarning" ]; + + meta = with lib; { + description = "A sphinx extension to show a warning banner at the top of your documentation"; + homepage = "https://github.com/humitos/sphinx-version-warning"; + license = licenses.mit; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 5a27f04bd0ee..74abbe90c964 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -5,6 +5,9 @@ , fetchFromGitHub , fetchpatch +# nativeBuildInputs +, flit-core + # propagatedBuildInputs , babel , alabaster @@ -34,8 +37,8 @@ buildPythonPackage rec { pname = "sphinx"; - version = "5.1.1"; - format = "setuptools"; + version = "5.3.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -43,7 +46,7 @@ buildPythonPackage rec { owner = "sphinx-doc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dTgQNMRIn7ETm+1HgviOkWWOCmLX7Ez6DM9ChlI32mY="; + hash = "sha256-80bVg1rfBebgSOKbWkzP84vpm39iLgM8lWlVD64nSsQ="; postFetch = '' cd $out mv tests/roots/test-images/testimäge.png \ @@ -52,13 +55,9 @@ buildPythonPackage rec { ''; }; - postPatch = '' - # remove impurity caused by date inclusion - # https://github.com/sphinx-doc/sphinx/blob/master/setup.cfg#L4-L6 - substituteInPlace setup.cfg \ - --replace "tag_build = .dev" "" \ - --replace "tag_date = true" "" - ''; + nativeBuildInputs = [ + flit-core + ]; propagatedBuildInputs = [ babel @@ -85,7 +84,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ cython html5lib pytestCheckHook diff --git a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix index 2a029c468a5b..1f4eb94fea54 100644 --- a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { unidecode ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; @@ -47,6 +47,5 @@ buildPythonPackage rec { longDescription = "Sphinx AutoAPI provides 'autodoc' style documentation for multiple programming languages without needing to load, run, or import the project being documented."; license = licenses.mit; maintainers = with maintainers; [ karolchmist ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix b/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix index 6f53dd79d364..799a4ba1b5cf 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-bayesnet"; - version = "0.1"; + version = "0.4"; src = fetchPypi { inherit pname version; - sha256 = "0x1kisvj7221cxfzmwplx3xlwbavl636fpncnjh7gghp1af71clw"; + sha256 = "sha256-+M+K8WzQqxQUGgAgGPK+isf3gKK7HOrdI6nNW/V8Wv0="; }; propagatedBuildInputs = [ sphinx sphinxcontrib-tikz ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix index 61b44aa2b704..8d22c5806764 100644 --- a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { # Seems to look for files in the wrong dir doCheck = false; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index 54ef5bac8b7b..476c3f1815c3 100644 --- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-katex"; - version = "0.9.0"; + version = "0.9.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HFs1+9tWl1D5VWY14dPCk+Ewv+ubedhd9DcCSrPQZnQ="; + hash = "sha256-Mcn+gcP6ywhVlguCggJkH4SA6n1ikmviRbah7LejDZE="; }; propagatedBuildInputs = [ @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx extension using KaTeX to render math in HTML"; homepage = "https://github.com/hagenw/sphinxcontrib-katex"; + changelog = "https://github.com/hagenw/sphinxcontrib-katex/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 1b4c5f11d11b..1486372b02ab 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , deepmerge -, fetchFromGitHub +, fetchPypi , fetchpatch , isPy27 , setuptools-scm @@ -14,23 +14,12 @@ buildPythonPackage rec { pname = "sphinxcontrib-openapi"; - version = "unstable-2022-08-26"; + version = "0.8.1"; disabled = isPy27; - # Switch to Cilums' fork of openapi, which uses m2r instead of mdinclude, - # as m2r is unmaintained and incompatible with the version of mistune. - # See - # https://github.com/cilium/cilium/commit/b9862461568dd41d4dc8924711d4cc363907270b and - # https://github.com/cilium/openapi/commit/cd829a05caebd90b31e325d4c9c2714b459d135f - # for details. - # PR to switch upstream sphinx-contrib/openapi from m2r to sphinx-mdinclude: - # https://github.com/sphinx-contrib/openapi/pull/127 - # (once merged, we should switch away from that fork again) - src = fetchFromGitHub { - owner = "cilium"; - repo = "openapi"; - rev = "0ea3332fa6482114f1a8248a32a1eacb61aebb69"; - hash = "sha256-a/oVMg9gGTD+NClfpC2SpjbY/mIcZEVLLOR0muAg5zY="; + src = fetchPypi { + inherit pname version; + hash = "sha256-BPz4fCWTRRYqUEzj3+4PcTifUHw3l3mNxTHHdImVtOs="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index 20f182b55baf..793bf0771b1a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -3,26 +3,33 @@ , fetchPypi , sphinx , plantuml +, pythonOlder }: buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.24"; + version = "0.24.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-z2Xbc1j3haZJjuA+cZi2aAxiXSjlWzNHX8P2yUNRRR0="; + hash = "sha256-OdLkvEDV4JMSYSmhRPVrbuFfWM+lBItZSOY6Ea/ztYY="; }; + propagatedBuildInputs = [ + sphinx + plantuml + ]; + # No tests included. doCheck = false; - propagatedBuildInputs = [ sphinx plantuml ]; - meta = with lib; { description = "Provides a Sphinx domain for embedding UML diagram with PlantUML"; homepage = "https://github.com/sphinx-contrib/plantuml/"; - maintainers = with maintainers; [ ]; license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 1a97d85d9f02..8c4900d35bd1 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-spelling"; - version = "7.6.2"; + version = "7.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oSnV3QwAydQUvN9Zmv3bVbrgHx1UNjbn67CUkborq9Q="; + hash = "sha256-VlYcP2oVWwlGkU5N6YhymFkxVyncGBteTcimj+eN41o="; }; nativeBuildInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx spelling extension"; homepage = "https://github.com/sphinx-contrib/spelling"; + changelog = "https://github.com/sphinx-contrib/spelling/blob/${version}/docs/source/history.rst"; license = licenses.bsd2; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 76e5079e9163..4bf290328821 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -4,24 +4,31 @@ , sphinx , pytestCheckHook , beautifulsoup4 +, setuptools-scm }: buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.6.3"; + version = "0.7.5"; src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; - rev = "v${version}"; - sha256 = "sha256-YR6TlsmND5IhLdbPbmtVhRN2vSZfx70g2a6Yn6y6L/M="; + rev = "refs/tags/v${version}"; + hash = "sha256-fNtXj7iYX7rSaGO6JcxC+PvR8WzTFl8gYwHyRExYdfI="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ sphinx ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook beautifulsoup4 ]; diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index d4fef974fc01..e051388dafa8 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { selenium ]; - checkInputs = [ + nativeCheckInputs = [ cssselect django flask diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index e81183c02fb3..1247312ad0fc 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.21.0"; + version = "2.22.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YhFhqbWqAVaBwu4buIc87i7mtEDYQEDanSpXzWf31eU="; + hash = "sha256-VGgNvyQ6Kwz/DlkeHSaWkulCZSc7UquQmUpmFVXASsc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index ce566fb94a89..db23fee15cea 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , dos2unix , pythonRelaxDepsHook , asn1crypto @@ -9,6 +8,7 @@ , bincopy , bitstring , click +, click-command-tree , click-option-group , cmsis-pack-manager , commentjson @@ -33,40 +33,32 @@ buildPythonPackage rec { pname = "spsdk"; - version = "1.6.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "NXPmicro"; repo = pname; rev = version; - sha256 = "sha256-JMhd2XdbjEN6SUzFgcBHd/dStiuYeXXis6pfijSfUso="; + hash = "sha256-yCmkOrUe5XqbuHeo7F84j1gmdzpdpCRWdD9V74U64c4="; }; - patches = [ - # https://github.com/NXPmicro/spsdk/pull/43 - (fetchpatch { - name = "cryptography-37-compat.patch"; - url = "https://github.com/NXPmicro/spsdk/commit/a85b854de1093de593d27fa64de442224ab2e0fd.patch"; - sha256 = "sha256-4pXV/8RaNuGl7KNdoGD/8YnPQ2ZmUQOjXWA/Yy0Kxu8="; - }) - # https://github.com/NXPmicro/spsdk/pull/41 - (fetchpatch { - name = "blhost-click-8-1-compat.patch"; - url = "https://github.com/NXPmicro/spsdk/commit/5112b1b69aa681d265035475e73d28ea0c8cb6ab.patch"; - sha256 = "sha256-Okz6Er6OVuAA5IlB5IabSa/gUSLa+E2Ltd+J3uoIg6o="; - }) + nativeBuildInputs = [ + pythonRelaxDepsHook ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ + "bincopy" + "bitstring" "cmsis-pack-manager" - "cryptography" "deepmerge" "jinja2" "pylink-square" "pyocd" ]; - pythonRemoveDeps = [ "pyocd-pemicro" ]; + + pythonRemoveDeps = [ + "pyocd-pemicro" + ]; propagatedBuildInputs = [ asn1crypto @@ -74,6 +66,7 @@ buildPythonPackage rec { bincopy bitstring click + click-command-tree click-option-group cmsis-pack-manager commentjson @@ -94,17 +87,11 @@ buildPythonPackage rec { sly ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook voluptuous ]; - disabledTests = [ - # tests also fail on debian, so presumable they are broken - "test_elftosb_mbi_signed" - "test_elftosb_sb31" - ]; - pythonImportsCheck = [ "spsdk" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index f39b03763c81..837cf0c0a520 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.4.0"; + version = "2.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-O9MvvjChUKucztvVvrbd04veHZqHeNpS9+30ILv7jlE="; + hash = "sha256-eD2N+9cVzZdyjpE5FnebN8+OllZjVevaz+NBHSvrR5Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index bb744b2abab4..80435a738d58 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pythonOlder -, makeDesktopItem , atomicwrites , chardet , cloudpickle @@ -46,16 +45,20 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.4.0"; + version = "5.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nZ+rw5qALSdu+nbaAtGA7PLW6XjcjeZvuPd4a5WtZkw="; + hash = "sha256-kQBOYRXhjz+OQk7Vlxb/UKiDi92mA8ialsFQ+QzqhlE="; }; + patches = [ + ./dont-clear-pythonpath.patch + ]; + nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; @@ -101,16 +104,6 @@ buildPythonPackage rec { # There is no test for spyder doCheck = false; - desktopItem = makeDesktopItem { - name = "Spyder"; - exec = "spyder"; - icon = "spyder"; - comment = "Scientific Python Development Environment"; - desktopName = "Spyder"; - genericName = "Python IDE"; - categories = [ "Development" "IDE" ]; - }; - postPatch = '' # Remove dependency on pyqtwebengine # This is still part of the pyqt 5.11 version we have in nixpkgs @@ -124,11 +117,6 @@ buildPythonPackage rec { # Add Python libs to env so Spyder subprocesses # created to run compute kernels don't fail with ImportErrors wrapProgram $out/bin/spyder --prefix PYTHONPATH : "$PYTHONPATH" - - # Create desktop item - mkdir -p $out/share/icons - cp spyder/images/spyder.svg $out/share/icons - cp -r $desktopItem/share/applications/ $out/share ''; dontWrapQtApps = true; diff --git a/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch b/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch new file mode 100644 index 000000000000..cb2a37930715 --- /dev/null +++ b/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch @@ -0,0 +1,24 @@ +Don't remove sys.path entries that come from PYTHONPATH, or else the app cannot +be used in Nixpkgs. + +Author: Bjørn Forsman +diff -uNr spyder-5.4.0.orig/spyder/app/start.py spyder-5.4.0/spyder/app/start.py +--- spyder-5.4.0.orig/spyder/app/start.py 2022-08-30 02:02:28.000000000 +0200 ++++ spyder-5.4.0/spyder/app/start.py 2023-01-02 11:38:28.138744879 +0100 +@@ -6,16 +6,8 @@ + # (see spyder/__init__.py for details) + # ----------------------------------------------------------------------------- + +-# Remove PYTHONPATH paths from sys.path before other imports to protect against +-# shadowed standard libraries. + import os + import sys +-if os.environ.get('PYTHONPATH'): +- for path in os.environ['PYTHONPATH'].split(os.pathsep): +- try: +- sys.path.remove(path.rstrip(os.sep)) +- except ValueError: +- pass + + # Standard library imports + import ctypes diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 0d2ef66cfa88..8a038bbb3193 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -1,23 +1,30 @@ { lib -, fetchPypi , buildPythonPackage +, fetchPypi , flask , flask-login , flask-sqlalchemy , flexmock +, psycopg2 +, pymysql , pytestCheckHook +, pythonOlder , sqlalchemy -, sqlalchemy-utils , sqlalchemy-i18n +, sqlalchemy-utils }: buildPythonPackage rec { - pname = "SQLAlchemy-Continuum"; - version = "1.3.13"; + pname = "sqlalchemy-continuum"; + version = "1.3.14"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-JTqlHQmaVH2qKz7CFyCqpous3ecOpoFrxVlzasbc21I="; + pname = "SQLAlchemy-Continuum"; + inherit version; + hash = "sha256-1+k/lx6R8tW9gM3M2kqaVEwpmx8cMhDXeqCjyd8O2hM="; }; propagatedBuildInputs = [ @@ -25,21 +32,46 @@ buildPythonPackage rec { sqlalchemy-utils ]; + passthru.optional-dependencies = { + flask = [ + flask + ]; + flask-login = [ + flask-login + ]; + flask-sqlalchemy = [ + flask-sqlalchemy + ]; + flexmock = [ + flexmock + ]; + i18n = [ + sqlalchemy-i18n + ]; + }; + + nativeCheckInputs = [ + psycopg2 + pymysql + pytestCheckHook + ] ++ passthru.optional-dependencies.flask + ++ passthru.optional-dependencies.flask-login + ++ passthru.optional-dependencies.flask-sqlalchemy + ++ passthru.optional-dependencies.flexmock + ++ passthru.optional-dependencies.i18n; + # indicate tests that we don't have a database server at hand DB = "sqlite"; - checkInputs = [ - pytestCheckHook - sqlalchemy-i18n - flask - flask-login - flask-sqlalchemy - flexmock + pythonImportsCheck = [ + "sqlalchemy_continuum" ]; meta = with lib; { - homepage = "https://github.com/kvesteri/sqlalchemy-continuum/"; description = "Versioning and auditing extension for SQLAlchemy"; + homepage = "https://github.com/kvesteri/sqlalchemy-continuum/"; + changelog = "https://github.com/kvesteri/sqlalchemy-continuum/blob/${version}/CHANGES.rst"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix index 83d813b3dbd9..a17e7ada4522 100644 --- a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , sqlalchemy , sqlalchemy-utils +, six }: buildPythonPackage rec { @@ -17,6 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sqlalchemy sqlalchemy-utils + six ]; # tests require running a postgresql server diff --git a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix index 8270834ab609..03732a154cd1 100644 --- a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "sqlalchemy-jsonfield"; - version = "1.0.0"; + version = "1.0.1.post0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "penguinolog"; repo = "sqlalchemy_jsonfield"; - rev = version; - sha256 = "015pl4z84spfw8389hk1szlm37jgw2basvbmzmkacdqi0685zx24"; + rev = "refs/tags/${version}"; + sha256 = "sha256-dSvqUXZzr+s/v8QEtqrv6slI7p1akXwAxi68D9ctyuU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; @@ -37,7 +37,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-sugar pymysql @@ -49,8 +49,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/penguinolog/sqlalchemy_jsonfield"; description = "SQLALchemy JSONField implementation for storing dicts at SQL independently from JSON type support"; + homepage = "https://github.com/penguinolog/sqlalchemy_jsonfield"; + changelog = "https://github.com/penguinolog/sqlalchemy_jsonfield/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ ivan-tkatchev ]; }; diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index bfae1d7b3b9d..c00aad2d403c 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -1,6 +1,19 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, python -, scripttest, pytz, pbr, tempita, decorator, sqlalchemy -, six, sqlparse, testrepository +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, fetchpatch +, python +, pythonAtLeast +, scripttest +, pytz +, pbr +, tempita +, decorator +, sqlalchemy +, six +, sqlparse +, testrepository }: buildPythonPackage rec { @@ -29,7 +42,7 @@ buildPythonPackage rec { --replace "pylint" "" ''; - checkInputs = [ scripttest pytz testrepository ]; + nativeCheckInputs = [ scripttest pytz testrepository ]; propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ]; doCheck = !stdenv.isDarwin; @@ -51,5 +64,8 @@ buildPythonPackage rec { description = "Schema migration tools for SQLAlchemy"; license = licenses.asl20; maintainers = teams.openstack.members ++ (with maintainers; [ makefu ]); + # using deprecated inspect.getargspec function + # https://bugs.launchpad.net/sqlalchemy-migrate/+bug/2003619 + broken = pythonAtLeast "3.11"; }; } diff --git a/pkgs/development/python-modules/sqlalchemy-mixins/default.nix b/pkgs/development/python-modules/sqlalchemy-mixins/default.nix index c979fc58b196..6986ab234333 100644 --- a/pkgs/development/python-modules/sqlalchemy-mixins/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-mixins/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { sqlalchemy ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 49bba2811312..633457c4b16a 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -1,58 +1,101 @@ { lib , buildPythonPackage , fetchPypi -, six +, pythonOlder + +# runtime +, importlib-metadata , sqlalchemy -, colour -, flexmock -, jinja2 -, mock -, pg8000 + +# optionals +, babel +, arrow +, pendulum +#, intervals , phonenumbers -, pygments -, pymysql -, pytestCheckHook +, passlib +, colour , python-dateutil +, furl +, cryptography + +# tests +, pytestCheckHook +, pygments +, jinja2 +, docutils +, flexmock +, psycopg2 +, psycopg2cffi +, pg8000 +, pytz +, backports-zoneinfo +, pymysql +, pyodbc + }: buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.38.3"; + version = "0.39.0"; + format = "setuptools"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - sha256 = "sha256-n5r7pgekBFXPcDrfqYRlhL8mFooMWmCnAGO3DWUFH00="; + hash = "sha256-s3JAkX2BwU/htuUJakArrORysXkSE4TkfBDYVNv1r5I="; }; patches = [ - # We don't run MySQL, MSSQL, or PostgreSQL ./skip-database-tests.patch ]; propagatedBuildInputs = [ - six sqlalchemy + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; - checkInputs = [ - colour - flexmock - jinja2 - mock - pg8000 - phonenumbers - pygments - pymysql + passthru.optional-dependencies = { + babel = [ babel ]; + arrow = [ arrow ]; + pendulum = [ pendulum ]; + #intervals = [ intervals ]; + phone = [ phonenumbers ]; + password = [ passlib ]; + color = [ colour ]; + timezone = [ python-dateutil ]; + url = [ furl ]; + encrypted = [ cryptography ]; + }; + + nativeCheckInputs = [ pytestCheckHook + pygments + jinja2 + docutils + flexmock + psycopg2 + psycopg2cffi + pg8000 + pytz python-dateutil + pymysql + pyodbc + ] + ++ lib.flatten (builtins.attrValues passthru.optional-dependencies) + ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo ]; - disabledTests = [ - "test_literal_bind" + pytestFlagsArray = [ + "--deselect tests/functions/test_database.py::TestDatabasePostgresCreateDatabaseCloseConnection::test_create_database_twice" + "--deselect tests/functions/test_database.py::TestDatabasePostgresPg8000::test_create_and_drop" + "--deselect tests/functions/test_database.py::TestDatabasePostgresPsycoPG2CFFI::test_create_and_drop" ]; meta = with lib; { + changelog = "https://github.com/kvesteri/sqlalchemy-utils/releases/tag/${version}"; homepage = "https://github.com/kvesteri/sqlalchemy-utils"; description = "Various utility functions and datatypes for SQLAlchemy"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch b/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch index 79aa12f03d99..d5f9a46ecb88 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch +++ b/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch @@ -1,13 +1,12 @@ diff --git a/conftest.py b/conftest.py -index 9e146cd..8dbc9a5 100644 +index 4426e02..1f84096 100644 --- a/conftest.py +++ b/conftest.py -@@ -61,17 +61,12 @@ def mysql_db_user(): - +@@ -73,17 +73,12 @@ def mysql_db_user(): @pytest.fixture def postgresql_dsn(postgresql_db_user, postgresql_db_password, postgresql_db_host, db_name): -- return 'postgresql://{0}:{1}@{2}/{3}'.format( +- return 'postgresql://{}:{}@{}/{}'.format( - postgresql_db_user, - postgresql_db_password, - postgresql_db_host, @@ -18,83 +17,18 @@ index 9e146cd..8dbc9a5 100644 @pytest.fixture def mysql_dsn(mysql_db_user, db_name): -- return 'mysql+pymysql://{0}@localhost/{1}'.format(mysql_db_user, db_name) +- return f'mysql+pymysql://{mysql_db_user}@localhost/{db_name}' + pytest.skip() @pytest.fixture -@@ -108,8 +104,7 @@ def mssql_db_driver(): +@@ -121,8 +116,7 @@ def mssql_db_driver(): @pytest.fixture def mssql_dsn(mssql_db_user, mssql_db_password, mssql_db_driver, db_name): -- return 'mssql+pyodbc://{0}:{1}@localhost/{2}?driver={3}'\ +- return 'mssql+pyodbc://{}:{}@localhost/{}?driver={}'\ - .format(mssql_db_user, mssql_db_password, db_name, mssql_db_driver) + pytest.skip() @pytest.fixture -diff --git a/tests/functions/test_database.py b/tests/functions/test_database.py -index 0ad6721..83f208d 100644 ---- a/tests/functions/test_database.py -+++ b/tests/functions/test_database.py -@@ -76,28 +76,6 @@ class TestDatabasePostgres(DatabaseTest): - "TEMPLATE my_template") in str(excinfo.value) - - --class TestDatabasePostgresPg8000(DatabaseTest): -- -- @pytest.fixture -- def dsn(self, postgresql_db_user, postgresql_db_password): -- return 'postgresql+pg8000://{0}:{1}@localhost/{2}'.format( -- postgresql_db_user, -- postgresql_db_password, -- 'db_to_test_create_and_drop_via_pg8000_driver' -- ) -- -- --class TestDatabasePostgresPsycoPG2CFFI(DatabaseTest): -- -- @pytest.fixture -- def dsn(self, postgresql_db_user, postgresql_db_password): -- return 'postgresql+psycopg2cffi://{0}:{1}@localhost/{2}'.format( -- postgresql_db_user, -- postgresql_db_password, -- 'db_to_test_create_and_drop_via_psycopg2cffi_driver' -- ) -- -- - @pytest.mark.usefixtures('postgresql_dsn') - class TestDatabasePostgresWithQuotedName(DatabaseTest): - -@@ -116,31 +94,6 @@ class TestDatabasePostgresWithQuotedName(DatabaseTest): - 'TEMPLATE "my-template"') in str(excinfo.value) - - --class TestDatabasePostgresCreateDatabaseCloseConnection: -- def test_create_database_twice( -- self, -- postgresql_db_user, -- postgresql_db_password -- ): -- dsn_list = [ -- 'postgresql://{0}:{1}@localhost/db_test_sqlalchemy-util-a'.format( -- postgresql_db_user, -- postgresql_db_password -- ), -- 'postgresql://{0}:{1}@localhost/db_test_sqlalchemy-util-b'.format( -- postgresql_db_user, -- postgresql_db_password -- ), -- ] -- for dsn_item in dsn_list: -- assert not database_exists(dsn_item) -- create_database(dsn_item, template="template1") -- assert database_exists(dsn_item) -- for dsn_item in dsn_list: -- drop_database(dsn_item) -- assert not database_exists(dsn_item) -- -- - @pytest.mark.usefixtures('mssql_dsn') - class TestDatabaseMssql(DatabaseTest): - diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 7c842352eb02..f378437b4723 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -39,12 +39,12 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.41"; # TODO: check python3Packages.fastapi when updating to >= 1.4.42 + version = "1.4.46"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ApL3DReX48VOhi5vMK5HQBRki8nHI+FKL9pzCtsKl5E="; + hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; }; nativeBuildInputs = lib.optionals (!isPyPy) [ @@ -125,7 +125,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ]; diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix index 4a540b978392..05dfba949729 100644 --- a/pkgs/development/python-modules/sqlglot/default.nix +++ b/pkgs/development/python-modules/sqlglot/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ python-dateutil ]; - checkInputs = [ pytestCheckHook duckdb ]; + nativeCheckInputs = [ pytestCheckHook duckdb ]; pythonImportsCheck = [ "sqlglot" ]; diff --git a/pkgs/development/python-modules/sqlite-fts4/default.nix b/pkgs/development/python-modules/sqlite-fts4/default.nix index 748587ed5ad0..27a6913020a0 100644 --- a/pkgs/development/python-modules/sqlite-fts4/default.nix +++ b/pkgs/development/python-modules/sqlite-fts4/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-Ibiows3DSnzjIUv7U9tYNVnDaecBBxjXzDqxbIlNhhU="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 92a4b34199df..24fdb5b2fa98 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { tabulate ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis ]; diff --git a/pkgs/development/python-modules/sqlitedict/default.nix b/pkgs/development/python-modules/sqlitedict/default.nix index 5634eb41601a..38847309cee2 100644 --- a/pkgs/development/python-modules/sqlitedict/default.nix +++ b/pkgs/development/python-modules/sqlitedict/default.nix @@ -1,28 +1,36 @@ { lib , buildPythonPackage , fetchFromGitHub +, py +, pytest-benchmark , pytestCheckHook }: buildPythonPackage rec { pname = "sqlitedict"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "RaRe-Technologies"; repo = "sqlitedict"; - rev = "refs/tags/${version}"; - sha256 = "sha256-8dmGn5h3NigCdDtnDYjpjntRpyjk7ivRp1B8x8nUgpE="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GfvvkQ6a75UBPn70IFOvjvL1MedSc4siiIjA3IsQnic="; }; preCheck = '' mkdir tests/db ''; - checkInputs = [ + nativeCheckInputs = [ + py + pytest-benchmark pytestCheckHook ]; + pytestFlagsArray = [ + "--benchmark-disable" + ]; + 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 791da716c56b..80e82d353e98 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -1,17 +1,21 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , file -, stdenv +, pythonOlder }: buildPythonPackage rec { pname = "sqlmap"; - version = "1.6.11"; + version = "1.7.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/zucBRLf5qnRURS0YS3Zv4jxRZYOIGtzPBepQ7a2nvs="; + hash = "sha256-XTLDdfNZXzqTreRan2kb0tGygdhdAW4JG3rZPKvkDfM="; }; postPatch = '' @@ -26,7 +30,9 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - pythonImportsCheck = [ "sqlmap" ]; + pythonImportsCheck = [ + "sqlmap" + ]; meta = with lib; { description = "Automatic SQL injection and database takeover tool"; diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index 2cd80b086723..4b30f56a9f27 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqlobject"; - version = "3.10.0"; + version = "3.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "SQLObject"; inherit version; - hash = "sha256-i/wBFu8z/DS5Gtj00ZKrbuPsvqDH3O5GmbrknGbvJ7A="; + hash = "sha256-/PPqJ/ha8GRQpY/uQOLIF0v90p9tZKrHTCMkusiIuEQ="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { pydispatcher ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix index 29e92cdecb93..479dcc91d7f9 100644 --- a/pkgs/development/python-modules/sqlparse/default.nix +++ b/pkgs/development/python-modules/sqlparse/default.nix @@ -8,18 +8,18 @@ buildPythonPackage rec { pname = "sqlparse"; - version = "0.4.2"; + version = "0.4.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0c00730c74263a94e5a9919ade150dfc3b19c574389985446148402998287dae"; + sha256 = "sha256-acqASEa7EU0uw4DkNgqKNA24PwzPOvzusUBN8Cj1cmg="; }; nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postInstall = '' installManPage docs/sqlformat.1 diff --git a/pkgs/development/python-modules/sqlsoup/default.nix b/pkgs/development/python-modules/sqlsoup/default.nix index df1f988a03eb..39de5e760490 100644 --- a/pkgs/development/python-modules/sqlsoup/default.nix +++ b/pkgs/development/python-modules/sqlsoup/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ sqlalchemy ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = with lib; { description = "A one step database access tool, built on the SQLAlchemy ORM"; diff --git a/pkgs/development/python-modules/sqltrie/default.nix b/pkgs/development/python-modules/sqltrie/default.nix new file mode 100644 index 000000000000..76c1eb22b2dc --- /dev/null +++ b/pkgs/development/python-modules/sqltrie/default.nix @@ -0,0 +1,52 @@ +{ lib +, attrs +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pygtrie +, orjson +, python +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "sqltrie"; + version = "0.0.27"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "iterative"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-8ymTdbJgRUf9BBNMEVF1lm29qA+N1629cekEohaxt0c="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + attrs + orjson + pygtrie + ]; + + # nox is not available at the moment + doCheck = false; + + pythonImportsCheck = [ + "sqltrie" + ]; + + meta = with lib; { + description = "DVC's data management subsystem"; + homepage = "https://github.com/iterative/sqltrie"; + changelog = "https://github.com/iterative/sqltrie/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/srpenergy/default.nix b/pkgs/development/python-modules/srpenergy/default.nix index d0ac3602445d..e36bd7c2e4b8 100644 --- a/pkgs/development/python-modules/srpenergy/default.nix +++ b/pkgs/development/python-modules/srpenergy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix index a4022574f11e..75435ca5a45a 100644 --- a/pkgs/development/python-modules/srptools/default.nix +++ b/pkgs/development/python-modules/srptools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytest pytest-runner ]; + nativeCheckInputs = [ pytest pytest-runner ]; meta = with lib; { description = "Python-Tools to implement Secure Remote Password (SRP) authentication"; diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 5108f9ea5eaa..9f1d94668851 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -6,35 +6,49 @@ , catalogue , mock , numpy +, psutil , pytest , ruamel-yaml +, setuptools +, tornado }: buildPythonPackage rec { pname = "srsly"; - version = "2.4.4"; + version = "2.4.5"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-6KBlgWJ7ZxLxnGAkG3wUwrspzobvBPeRN5p58bJJoSg="; + hash = "sha256-yEIliWe6pSfOqTZ5huQrgUOhqJDn1KGNJaNu3Dx6M8c="; }; - nativeBuildInputs = [ cython ]; - - propagatedBuildInputs = [ catalogue ]; - - checkInputs = [ - mock - numpy - pytest - ruamel-yaml + nativeBuildInputs = [ + cython + setuptools ]; - pythonImportsCheck = [ "srsly" ]; + propagatedBuildInputs = [ + catalogue + ]; + + nativeCheckInputs = [ + mock + numpy + psutil + pytest + ruamel-yaml + tornado + ]; + + pythonImportsCheck = [ + "srsly" + ]; meta = with lib; { + changelog = "https://github.com/explosion/srsly/releases/tag/v${version}"; description = "Modern high-performance serialization utilities for Python"; homepage = "https://github.com/explosion/srsly"; license = licenses.mit; diff --git a/pkgs/development/python-modules/srt/default.nix b/pkgs/development/python-modules/srt/default.nix index b6a5f4df097d..1e91aad7b16d 100644 --- a/pkgs/development/python-modules/srt/default.nix +++ b/pkgs/development/python-modules/srt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "7aa4ad5ce4126d3f53b3e7bc4edaa86653d0378bf1c0b1ab8c59f5ab41384450"; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/srvlookup/default.nix b/pkgs/development/python-modules/srvlookup/default.nix index 11f31c06550f..15c0eedd0fb5 100644 --- a/pkgs/development/python-modules/srvlookup/default.nix +++ b/pkgs/development/python-modules/srvlookup/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { dnspython ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix index 48ca8b6b938e..44a7f37190dc 100644 --- a/pkgs/development/python-modules/ssdeep/default.nix +++ b/pkgs/development/python-modules/ssdeep/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index bd73a6abaead..2ae8dbf68ddb 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "ssdp"; - version = "1.1.0"; + version = "1.1.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "codingjoe"; repo = pname; - rev = version; - sha256 = "19d2b5frpq2qkfkpz173wpjk5jwhkjpk75p8q92nm8iv41nrzljy"; + rev = "refs/tags/${version}"; + sha256 = "sha256-D2mww3sEc2SvufWNmT450a2CW+ogROn3RHypljkebuY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -30,7 +30,7 @@ buildPythonPackage rec { pbr ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index a9fdfe2050e2..0c3e597952d0 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { # some tests use python3 strings doCheck = !isPy27; - checkInputs = [ backports_unittest-mock pytestCheckHook pytest-runner ]; + nativeCheckInputs = [ backports_unittest-mock pytestCheckHook pytest-runner ]; # tries to open connection to wikipedia disabledTests = [ "event_stream" ]; diff --git a/pkgs/development/python-modules/ssh-mitm/default.nix b/pkgs/development/python-modules/ssh-mitm/default.nix index ea2aa9531c59..ae703fb48e53 100644 --- a/pkgs/development/python-modules/ssh-mitm/default.nix +++ b/pkgs/development/python-modules/ssh-mitm/default.nix @@ -1,23 +1,21 @@ { lib +, argcomplete , buildPythonPackage , fetchFromGitHub , pythonOlder , colored -, enhancements , packaging , paramiko , pytz , pyyaml -, requests , rich , sshpubkeys -, typeguard , pytestCheckHook }: buildPythonPackage rec { pname = "ssh-mitm"; - version = "2.1.0"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,20 +24,18 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DMXzDgSt1p3ZNGrXnSr79KH33SJNN8U4/94Hoz7Rs+I="; + hash = "sha256-bFxpgzomtcFGf0LfLUR05y3+/8DNhND6EKAmCZcYb5E="; }; propagatedBuildInputs = [ + argcomplete colored - enhancements packaging paramiko pytz pyyaml - requests rich sshpubkeys - typeguard ]; # Module has no tests @@ -52,7 +48,8 @@ buildPythonPackage rec { meta = with lib; { description = "Tool for SSH security audits"; homepage = "https://github.com/ssh-mitm/ssh-mitm"; - license = licenses.lgpl3Only; + changelog = "https://github.com/ssh-mitm/ssh-mitm/blob/${version}/CHANGELOG.md"; + license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix index 3c53864ec332..f68647ce7d8f 100644 --- a/pkgs/development/python-modules/sshtunnel/default.nix +++ b/pkgs/development/python-modules/sshtunnel/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ paramiko ]; - checkInputs = [ pytestCheckHook mock ]; + nativeCheckInputs = [ pytestCheckHook mock ]; # disable impure tests disabledTests = [ diff --git a/pkgs/development/python-modules/stack-data/default.nix b/pkgs/development/python-modules/stack-data/default.nix index 7f319333cac8..300dccb9447a 100644 --- a/pkgs/development/python-modules/stack-data/default.nix +++ b/pkgs/development/python-modules/stack-data/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pure-eval ]; - checkInputs = [ + nativeCheckInputs = [ cython littleutils pygments diff --git a/pkgs/development/python-modules/starkbank-ecdsa/default.nix b/pkgs/development/python-modules/starkbank-ecdsa/default.nix index c539bb9df424..ec741b7e1ee4 100644 --- a/pkgs/development/python-modules/starkbank-ecdsa/default.nix +++ b/pkgs/development/python-modules/starkbank-ecdsa/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-HarlCDE2qOLbyhMLOE++bTC+7srJqwmohM6vrJkJ/gc="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 6d96df91c4f5..54fe677dab22 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -2,44 +2,40 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch -, aiofiles +, hatchling + +# runtime +, ApplicationServices , anyio -, contextlib2 , itsdangerous , jinja2 , python-multipart , pyyaml -, requests -, aiosqlite -, databases +, httpx +, typing-extensions + +# tests , pytestCheckHook , pythonOlder , trio -, typing-extensions -, ApplicationServices }: buildPythonPackage rec { pname = "starlette"; - version = "0.20.4"; - format = "setuptools"; + version = "0.23.1"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vP2TJPn9lRGnLGkO8lUmnsoT6rSnhuWDD3WqNk76SM0="; + hash = "sha256-LcFrdaRgFBqcdylCzNlewj/papsg/sZ1FMVxBDLvQWI="; }; - patches = [ - (fetchpatch { - url = "https://github.com/encode/starlette/commit/ab70211f0e1fb7390668bf4891eeceda8d9723a0.diff"; - excludes = [ "requirements.txt" ]; # conflicts - hash = "sha256-UHf4c4YUWp/1I1vD8J0hMewdlfkmluA+FyGf9ZsSv3Y="; - }) + nativeBuildInputs = [ + hatchling ]; postPatch = '' @@ -48,29 +44,29 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - aiofiles anyio itsdangerous jinja2 python-multipart pyyaml - requests - ] ++ lib.optionals (pythonOlder "3.8") [ + httpx + ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions - ] ++ lib.optionals (pythonOlder "3.7") [ - contextlib2 ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; - checkInputs = [ - aiosqlite - databases + nativeCheckInputs = [ pytestCheckHook trio typing-extensions ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + "-W" "ignore::trio.TrioDeprecationWarning" + ]; + disabledTests = [ # asserts fail due to inclusion of br in Accept-Encoding "test_websocket_headers" @@ -82,6 +78,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/encode/starlette/releases/tag/${version}"; homepage = "https://www.starlette.io/"; description = "The little ASGI framework that shines"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index e8621d8e954d..9d24dd739fed 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { easywatch ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-check markdown diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix index 50e93eeac9b6..f5fc9dd9c7da 100644 --- a/pkgs/development/python-modules/statmake/default.nix +++ b/pkgs/development/python-modules/statmake/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "statmake"; - version = "0.5.1"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "daltonmaag"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-BpxjAr65ZQEJ0PSUIPtS78UvJbMG91qkV8py2K/+W2E="; + hash = "sha256-3BZ71JVvj7GCojM8ycu160viPj8BLJ1SiW86Df2fzsw="; }; nativeBuildInputs = [ @@ -44,27 +44,26 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ 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"' \ - --replace 'cattrs = "^1.1"' 'cattrs = ">= 1.1"' - ''; - pythonImportsCheck = [ "statmake" ]; + disabledTests = [ + # Test requires an update as later cattrs is present in Nixpkgs + # https://github.com/daltonmaag/statmake/issues/42 + "test_load_stylespace_broken_range" + ]; + meta = with lib; { description = "Applies STAT information from a Stylespace to a variable font"; homepage = "https://github.com/daltonmaag/statmake"; + changelog = "https://github.com/daltonmaag/statmake/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; }; diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix index da455c02d670..a9dd1b3ff252 100644 --- a/pkgs/development/python-modules/statsd/default.nix +++ b/pkgs/development/python-modules/statsd/default.nix @@ -1,20 +1,26 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , nose , mock }: buildPythonPackage rec { pname = "statsd"; - version = "3.3.0"; + version = "4.0.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "07yxnlalvcglgwa9pjs1clwrmwx7a4575jai7q05jz3g4i6dprp3"; + hash = "sha256-mXY9qBv+qNr2s9ItEarMsBqND1LqUh2qs351ikyn0Sg="; }; - checkInputs = [ nose mock ]; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ nose mock ]; patchPhase = '' # Failing test: ERROR: statsd.tests.test_ipv6_resolution_udp diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 0f01870c41b4..704d53963d4a 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -1,38 +1,53 @@ { lib , buildPythonPackage +, cython , fetchPypi -, isPy27 -, nose +, matplotlib , numpy -, scipy , pandas , patsy -, cython -, matplotlib +, pythonOlder +, scipy +, setuptools-scm }: buildPythonPackage rec { pname = "statsmodels"; - version = "0.13.2"; - disabled = isPy27; + version = "0.13.5"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-d9wpLJk5wDakdvF3D50Il2sFQ32qIpko2nMjEUfN59Q="; + hash = "sha256-WTUmrK4cD9oOpsSEOfZ8OUMJTFQv52n4uQ/p5sbMSHE="; }; - nativeBuildInputs = [ cython ]; - checkInputs = [ nose ]; - propagatedBuildInputs = [ numpy scipy pandas patsy matplotlib ]; + nativeBuildInputs = [ + cython + setuptools-scm + ]; + + propagatedBuildInputs = [ + numpy + scipy + pandas + patsy + matplotlib + ]; # Huge test suites with several test failures doCheck = false; - pythonImportsCheck = [ "statsmodels" ]; - meta = { + pythonImportsCheck = [ + "statsmodels" + ]; + + meta = with lib; { description = "Statistical computations and models for use with SciPy"; homepage = "https://www.github.com/statsmodels/statsmodels"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; + changelog = "https://github.com/statsmodels/statsmodels/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix index 9ad5e2285ffb..90bfaf8a6220 100644 --- a/pkgs/development/python-modules/stem/default.nix +++ b/pkgs/development/python-modules/stem/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stem"; - version = "1.8.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "1hk8alc0r4m669ggngdfvryndd0fbx0w62sclcmg55af4ak8xd50"; + sha256 = "sha256-gdQ6fGaLqde8EQOy56kR6dFIKUs3PSelmujaee96Pi8="; }; postPatch = '' @@ -16,7 +16,7 @@ buildPythonPackage rec { sed -i '/MOCK_VERSION/d' run_tests.py ''; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; checkPhase = '' touch .gitignore diff --git a/pkgs/development/python-modules/stestr/tests.nix b/pkgs/development/python-modules/stestr/tests.nix index 36935839e6ff..b66310f2dc63 100644 --- a/pkgs/development/python-modules/stestr/tests.nix +++ b/pkgs/development/python-modules/stestr/tests.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pythonOutputDistPhase() { touch $dist; } ''; - checkInputs = [ + nativeCheckInputs = [ stestr ]; diff --git a/pkgs/development/python-modules/stim/default.nix b/pkgs/development/python-modules/stim/default.nix index d17f3f6e34b0..4ad0891e37ed 100644 --- a/pkgs/development/python-modules/stim/default.nix +++ b/pkgs/development/python-modules/stim/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pybind11 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix index 3e09506ac66b..f79caf582f93 100644 --- a/pkgs/development/python-modules/stm32loader/default.nix +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ progress pyserial ]; - checkInputs = [ pytest ] ++ lib.optional isPy27 mock; + nativeCheckInputs = [ pytest ] ++ lib.optional isPy27 mock; checkPhase = '' pytest --strict tests/unit diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index 55f74b58fb52..a0d07fa51542 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -5,43 +5,53 @@ , ply , pytestCheckHook , six +, pythonOlder }: buildPythonPackage rec { pname = "stone"; version = "3.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # pypi sdist misses requirements.txt src = fetchFromGitHub { owner = "dropbox"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-0FWdYbv+paVU3Wj6g9OrSNUB0pH8fLwTkhVIBPeFB/U="; }; postPatch = '' - sed -i '/pytest-runner/d' setup.py + # https://github.com/dropbox/stone/issues/288 + substituteInPlace stone/frontend/ir_generator.py \ + --replace "inspect.getargspec" "inspect.getfullargspec" + substituteInPlace setup.py \ + --replace "'pytest-runner == 5.2.0'," "" ''; - propagatedBuildInputs = [ ply six ]; - - checkInputs = [ pytestCheckHook mock ]; - - # try to import from `test` directory, which is exported by the python interpreter - # and cannot be overriden without removing some py3 to py2 support - disabledTestPaths = [ - "test/test_tsd_types.py" - "test/test_js_client.py" + propagatedBuildInputs = [ + ply + six ]; + + nativeCheckInputs = [ + pytestCheckHook + mock + ]; + disabledTests = [ "test_type_name_with_module" ]; - pythonImportsCheck = [ "stone" ]; + pythonImportsCheck = [ + "stone" + ]; meta = with lib; { description = "Official Api Spec Language for Dropbox"; homepage = "https://github.com/dropbox/stone"; + changelog = "https://github.com/dropbox/stone/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/strategies/default.nix b/pkgs/development/python-modules/strategies/default.nix index 2b03ddcf9c94..f11ce2ce5c8f 100644 --- a/pkgs/development/python-modules/strategies/default.nix +++ b/pkgs/development/python-modules/strategies/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ multipledispatch toolz ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = { description = "A Python library for control flow programming"; diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index a06a375be0e5..c7e506e3ca20 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "stravalib"; - version = "0.10.4"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "451817c68a11e0c77db9cb628e3c4df0f4806c5a481536598ab3baa1d1c21215"; + sha256 = "sha256-qn46u1Kq2fkEL/JnjDNKbJZMTz/pitveNFPaf2xkbYs="; }; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 3c84d30ab371..cd01471d366d 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonPackage, fetchFromGitHub, poetry, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, poetry-core, pythonOlder , click, backports-cached-property, graphql-core, pygments, python-dateutil, python-multipart, typing-extensions , aiohttp, asgiref, chalice, django, fastapi, flask, pydantic, sanic, starlette, uvicorn }: buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.125.0"; + version = "0.151.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -13,12 +13,20 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "strawberry-graphql"; repo = "strawberry"; - rev = version; - sha256 = "sha256-8ERmG10qNiYg9Zr8oUZk/Uz68sCE+oWrqmJ5kUMqbRo="; + rev = "refs/tags/${version}"; + sha256 = "sha256-sHrdZ33irwTkm3OHQ2yxxcCWZDcaNbKy7amfRTtPVZ8="; }; + patches = [ + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/strawberry-graphql/strawberry/commit/710bb96f47c244e78fc54c921802bcdb48f5f421.patch"; + hash = "sha256-ekUZ2hDPCqwXp9n0YjBikwSkhCmVKUzQk7LrPECcD7Y="; + }) + ]; + nativeBuildInputs = [ - poetry + poetry-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/streaming-form-data/default.nix b/pkgs/development/python-modules/streaming-form-data/default.nix index 2f52d4aeb308..959c47d8121b 100644 --- a/pkgs/development/python-modules/streaming-form-data/default.nix +++ b/pkgs/development/python-modules/streaming-form-data/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests-toolbelt ]; - checkInputs = [ numpy pytest ]; + nativeCheckInputs = [ numpy pytest ]; checkPhase = '' make test diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index a4fe702c8c5d..b1c013790b65 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { zict ]; - checkInputs = [ + nativeCheckInputs = [ confluent-kafka distributed flaky diff --git a/pkgs/development/python-modules/strenum/default.nix b/pkgs/development/python-modules/strenum/default.nix index d73b60906cc5..963680c4113b 100644 --- a/pkgs/development/python-modules/strenum/default.nix +++ b/pkgs/development/python-modules/strenum/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "strenum"; - version = "0.4.8"; + version = "0.4.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "irgeek"; repo = "StrEnum"; - rev = "v${version}"; - hash = "sha256-S64YfF+cbefXRWoeJK99ZPTiO9DUcDaT77hVQd7pKDk="; + rev = "refs/tags/v${version}"; + hash = "sha256-tElXpwyjrgTw9eHqGPgXakY+G9JXkBQYG7jSZSjv6P0="; }; postPatch = '' @@ -26,7 +26,7 @@ buildPythonPackage rec { --replace " --cov=strenum --cov-report term-missing --black --pylint" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "MOdule for enum that inherits from str"; homepage = "https://github.com/irgeek/StrEnum"; + changelog = "https://github.com/irgeek/StrEnum/releases/tag/v${version}"; 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 18d348b144cb..96a7310cb04c 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "4.1.0"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hSrKk/Lu6rWCPSrPSlvtsl+Ub6EM6llaW1l9B0jxNl8="; + hash = "sha256-vcjF7o5rU8R2e75yB1LO24r5HbRq2W5RHt0Pt0lkrF0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/striprtf/default.nix b/pkgs/development/python-modules/striprtf/default.nix index 040985107003..42d99a101edb 100644 --- a/pkgs/development/python-modules/striprtf/default.nix +++ b/pkgs/development/python-modules/striprtf/default.nix @@ -1,16 +1,19 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "striprtf"; - version = "0.0.21"; + version = "0.0.22"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-/wqYbdJ+OI/RTODnKB34e7zADHzCPEX0LkTausqFNtY="; + hash = "sha256-T7rb6EJPQStbJjv3L7PA2rTdtXTWCd1NCE9uK4sEQCs="; }; pythonImportsCheck = [ @@ -18,6 +21,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/joshy/striprtf/blob/v${version}/CHANGELOG.md"; homepage = "https://github.com/joshy/striprtf"; description = "A simple library to convert rtf to text"; maintainers = with maintainers; [ aanderse ]; diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index a3b591db5f8e..8ec20e3b1dce 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -6,6 +6,9 @@ , pytest-asyncio , pretend , freezegun +, hatch-fancy-pypi-readme +, hatch-vcs +, hatchling , simplejson , typing-extensions , pythonAtLeast @@ -13,16 +16,24 @@ buildPythonPackage rec { pname = "structlog"; - version = "22.1.0"; - format = "flit"; + version = "22.3.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "hynek"; repo = "structlog"; rev = "refs/tags/${version}"; - sha256 = "sha256-2sdH6iP+l+6pBNC+sjpAX8bCdCANqqkaqZRmR68uwxY="; + sha256 = "sha256-+r+M+uTXdNBWQf0TGQuZgsCXg2CBKwH8ZE2+uAe0Dzg="; }; + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ typing-extensions ]; @@ -31,7 +42,7 @@ buildPythonPackage rec { "structlog" ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pretend pytest-asyncio diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 190ee6ccfa8a..8f0f9164dd4d 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { numba ]; - checkInputs = [ + nativeCheckInputs = [ pandas dask distributed diff --git a/pkgs/development/python-modules/stups-cli-support/default.nix b/pkgs/development/python-modules/stups-cli-support/default.nix index 97a7d6ebbdda..1ec1bb017dfa 100644 --- a/pkgs/development/python-modules/stups-cli-support/default.nix +++ b/pkgs/development/python-modules/stups-cli-support/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { preCheck = "export HOME=$TEMPDIR"; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-cov ]; diff --git a/pkgs/development/python-modules/stups-fullstop/default.nix b/pkgs/development/python-modules/stups-fullstop/default.nix index 8628c83334ba..46b5f9046f60 100644 --- a/pkgs/development/python-modules/stups-fullstop/default.nix +++ b/pkgs/development/python-modules/stups-fullstop/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { export HOME=$TEMPDIR "; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-cov ]; diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/pkgs/development/python-modules/stups-pierone/default.nix index 3df2a3e2895b..b99ac4cf520b 100644 --- a/pkgs/development/python-modules/stups-pierone/default.nix +++ b/pkgs/development/python-modules/stups-pierone/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { export HOME=$TEMPDIR ''; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-cov hypothesis diff --git a/pkgs/development/python-modules/stups-tokens/default.nix b/pkgs/development/python-modules/stups-tokens/default.nix index 62dec6f348e8..8f046986a025 100644 --- a/pkgs/development/python-modules/stups-tokens/default.nix +++ b/pkgs/development/python-modules/stups-tokens/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest pytest-cov diff --git a/pkgs/development/python-modules/stups-zign/default.nix b/pkgs/development/python-modules/stups-zign/default.nix index e7f6c2805de5..e9a1bad22e32 100644 --- a/pkgs/development/python-modules/stups-zign/default.nix +++ b/pkgs/development/python-modules/stups-zign/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { export HOME=$TEMPDIR "; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-cov ]; diff --git a/pkgs/development/python-modules/stytra/default.nix b/pkgs/development/python-modules/stytra/default.nix index fba544789a81..3817856f01f7 100644 --- a/pkgs/development/python-modules/stytra/default.nix +++ b/pkgs/development/python-modules/stytra/default.nix @@ -1,36 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, opencv3 -, pyqt5 -, pyqtgraph -, numpy -, scipy -, numba -, pandas -, tables -, git -, scikitimage -, matplotlib -, qdarkstyle -, GitPython +{ lib , anytree -, pims +, arrayqueues +, av +, buildPythonPackage +, colorspacious +, fetchPypi +, flammkuchen +, git +, gitpython , imageio , imageio-ffmpeg -, av -, nose -, pytestCheckHook -, pyserial -, arrayqueues -, colorspacious -, qimage2ndarray -, flammkuchen , lightparam +, matplotlib +, nose +, numba +, numpy +, opencv3 +, pandas +, pims +, pyqt5 +, pyqtgraph +, pyserial +, pytestCheckHook +, pythonOlder +, qdarkstyle +, qimage2ndarray +, scikitimage +, scipy +, tables }: buildPythonPackage rec { pname = "stytra"; version = "0.8.34"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -42,12 +47,6 @@ buildPythonPackage rec { rm stytra/tests/test_z_experiments.py ''; - checkInputs = [ - nose - pytestCheckHook - pyserial - ]; - propagatedBuildInputs = [ opencv3 pyqt5 @@ -61,7 +60,7 @@ buildPythonPackage rec { scikitimage matplotlib qdarkstyle - GitPython + gitpython anytree qimage2ndarray flammkuchen @@ -74,10 +73,16 @@ buildPythonPackage rec { av ]; - meta = { - homepage = "https://github.com/portugueslab/stytra"; + nativeCheckInputs = [ + nose + pytestCheckHook + pyserial + ]; + + meta = with lib; { description = "A modular package to control stimulation and track behaviour"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ tbenst ]; + homepage = "https://github.com/portugueslab/stytra"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ tbenst ]; }; } diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index bf975f5e8483..99ba13d45e5a 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.6.1"; + version = "0.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "G-Two"; repo = pname; - rev = "v${version}"; - hash = "sha256-esZ+nIHIXKfilb8dBFbAbQQFI6fFRUcoFVCPdnqGXYw="; + rev = "refs/tags/v${version}"; + hash = "sha256-igfC/Hi/cbNnHmrzgWQnhJ9cdWHPI0fIqPIYeIZuxgU="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { stdiomask ]; - checkInputs = [ + nativeCheckInputs = [ asynctest cryptography pytest-asyncio @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for interacting with STARLINK-enabled vehicle"; homepage = "https://github.com/G-Two/subarulink"; + changelog = "https://github.com/G-Two/subarulink/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index 9188ad223eaa..8c904808be25 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { appdirs rarfile pytz ]; - checkInputs = [ + nativeCheckInputs = [ sympy vcrpy pytest pytest-flakes pytest-cov pytest-runner ]; diff --git a/pkgs/development/python-modules/subprocess-tee/default.nix b/pkgs/development/python-modules/subprocess-tee/default.nix index adc4cae187bc..467d0a20e2a5 100644 --- a/pkgs/development/python-modules/subprocess-tee/default.nix +++ b/pkgs/development/python-modules/subprocess-tee/default.nix @@ -8,18 +8,19 @@ buildPythonPackage rec { pname = "subprocess-tee"; - version = "0.3.5"; + version = "0.4.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "ff5cced589a4b8ac973276ca1ba21bb6e3de600cde11a69947ff51f696efd577"; + sha256 = "sha256-s8EkmT+LiNHrHC/eC8IGl4fqxyC6iHccuhfoyTMkgl0="; }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook enrich ]; diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix index 704a4cb924ac..eb27ffdfb982 100644 --- a/pkgs/development/python-modules/subunit/default.nix +++ b/pkgs/development/python-modules/subunit/default.nix @@ -9,30 +9,46 @@ # python dependencies , fixtures , hypothesis -, pytest +, pytestCheckHook +, setuptools , testscenarios , testtools -, unittest2 }: buildPythonPackage { inherit (subunit) name src meta; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + postPatch = '' + substituteInPlace setup.py \ + --replace "version=VERSION" 'version="${subunit.version}"' + ''; + + nativeBuildInputs = [ + pkg-config + setuptools + ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ check cppunit ]; propagatedBuildInputs = [ testtools ]; - checkInputs = [ testscenarios hypothesis fixtures pytest unittest2 ]; + nativeCheckInputs = [ + testscenarios + hypothesis + fixtures + pytestCheckHook + ]; - # requires unittest2, which no longer supported in 3.10 - doCheck = pythonOlder "3.10"; - # ignore tests which call shell code, or call methods which haven't been implemented - checkPhase = '' - pytest python/subunit \ - --ignore=python/subunit/tests/test_{output_filter,test_protocol{,2}}.py - ''; + pytestFlagsArray = [ + "python/subunit" + ]; - postPatch = '' - sed -i 's/version=VERSION/version="${subunit.version}"/' setup.py - ''; + disabledTestPaths = [ + # these tests require testtools and don't work with pytest + "python/subunit/tests/test_output_filter.py" + "python/subunit/tests/test_test_protocol.py" + "python/subunit/tests/test_test_protocol2.py" + ]; } diff --git a/pkgs/development/python-modules/subunit2sql/default.nix b/pkgs/development/python-modules/subunit2sql/default.nix index 78035910397d..03fa99fcd14a 100644 --- a/pkgs/development/python-modules/subunit2sql/default.nix +++ b/pkgs/development/python-modules/subunit2sql/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ mock oslo-concurrency stestr diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix index a13841435650..0ede9c2de81b 100644 --- a/pkgs/development/python-modules/sumo/default.nix +++ b/pkgs/development/python-modules/sumo/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { spglib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sumtypes/default.nix b/pkgs/development/python-modules/sumtypes/default.nix index c99fa0595645..4c19828545c1 100644 --- a/pkgs/development/python-modules/sumtypes/default.nix +++ b/pkgs/development/python-modules/sumtypes/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { attrs ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 88dca4a51d4a..d316598946d1 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "4.0.5"; + version = "4.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7I23WtSeZPtHULJ7sNAbOdwAuzjiPE6WW2ukKUCMODs="; + hash = "sha256-DAWc5G5YTydxHIuZkY7Nb3euejPn0aQy7D01xChFDeM="; }; nativeBuildInputs = [ @@ -85,7 +85,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytest-astropy pytest-mock diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index db93064b541f..22cec4dc861b 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pygments ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; doCheck = false; # Segfaults... diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix index 6b10e838e5fb..7d4c7f4e3f8b 100644 --- a/pkgs/development/python-modules/supervise_api/default.nix +++ b/pkgs/development/python-modules/supervise_api/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional (!isPy3k) whichcraft; - checkInputs = [ util-linux ]; + nativeCheckInputs = [ util-linux ]; meta = { description = "An API for running processes safely and securely"; diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index 9af3db2de490..3999a4c8b8c3 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -1,31 +1,46 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi +{ lib +, stdenv +, buildPythonPackage +, fetchPypi , mock -, pytest +, pytestCheckHook +, pythonOlder , setuptools }: buildPythonPackage rec { pname = "supervisor"; - version = "4.2.4"; + version = "4.2.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "40dc582ce1eec631c3df79420b187a6da276bbd68a4ec0a8f1f123ea616b97a2"; + sha256 = "sha256-NHYbrhojxYGSKBpRFfsH+/IsmwEzwIFmvv/HD+0+vBI="; }; + propagatedBuildInputs = [ + setuptools + ]; + # wants to write to /tmp/foo which is likely already owned by another # nixbld user on hydra doCheck = !stdenv.isDarwin; - checkInputs = [ mock pytest ]; - checkPhase = '' - pytest - ''; - propagatedBuildInputs = [ setuptools ]; + nativeCheckInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "supervisor" + ]; meta = with lib; { description = "A system for controlling process state under UNIX"; homepage = "http://supervisord.org/"; + changelog = "https://github.com/Supervisor/supervisor/blob/${version}/CHANGES.rst"; license = licenses.free; # http://www.repoze.org/LICENSE.txt maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix index 84cc78e8a4a8..fb2857a1bef0 100644 --- a/pkgs/development/python-modules/sure/default.nix +++ b/pkgs/development/python-modules/sure/default.nix @@ -5,12 +5,15 @@ , six , mock , isPyPy +, pythonOlder , fetchpatch }: buildPythonPackage rec { pname = "sure"; version = "2.0.0"; + format = "setuptools"; + disabled = isPyPy; src = fetchPypi { @@ -26,13 +29,26 @@ buildPythonPackage rec { }) ]; - buildInputs = [ rednose ]; - propagatedBuildInputs = [ six mock ]; + propagatedBuildInputs = [ + six + mock + ]; + + nativeCheckInputs = [ + rednose + ]; + + doCheck = pythonOlder "3.11"; + + pythonImportsCheck = [ + "sure" + ]; meta = with lib; { description = "Utility belt for automated testing"; - homepage = "https://sure.readthedocs.io/en/latest/"; + homepage = "https://sure.readthedocs.io/"; + changelog = "https://github.com/gabrielfalcao/sure/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/surt/default.nix b/pkgs/development/python-modules/surt/default.nix index 21024c0ed02c..9ae0b451f92f 100644 --- a/pkgs/development/python-modules/surt/default.nix +++ b/pkgs/development/python-modules/surt/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { tldextract ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/survey/default.nix b/pkgs/development/python-modules/survey/default.nix index 34b1eed17279..e15db14c693a 100644 --- a/pkgs/development/python-modules/survey/default.nix +++ b/pkgs/development/python-modules/survey/default.nix @@ -24,8 +24,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "survey" ]; meta = with lib; { - homepage = "https://github.com/Exahilosys/survey"; description = "A simple library for creating beautiful interactive prompts"; + homepage = "https://github.com/Exahilosys/survey"; + changelog = "https://github.com/Exahilosys/survey/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ sfrijters ]; }; diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index 8c565b3d41c8..2ec9f5b78025 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-GiFZ+duJjfk8RjfP08yvfaH9Bz9Z+ppZUMc+RtSqGso="; }; - checkInputs = [ + nativeCheckInputs = [ pillow pytestCheckHook ]; diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index c15e88ebeb24..686c4298e0ba 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -2,29 +2,39 @@ , buildPythonPackage , fetchFromGitHub , lxml -, isPy27 +, pytestCheckHook }: buildPythonPackage { pname = "svg2tikz"; - version = "1.0.0"; - disabled = ! isPy27; + version = "unstable-2021-01-12"; - propagatedBuildInputs = [ lxml ]; + format = "setuptools"; src = fetchFromGitHub { - owner = "kjellmf"; + owner = "xyz2tex"; repo = "svg2tikz"; - rev = "ad36f2c3818da13c4136d70a0fd8153acf8daef4"; - sha256 = "sha256-QpQo7ENeU2crhc37uJu4rw/5+COPXQWXBynlF30lLV8="; - fetchSubmodules = true; + rev = "7a9959c295e1ed73e543474c6f3679d04cebc9e9"; + hash = "sha256-OLMFtEEdcY8ARI+hUSOhMwwcrtOAsbKRJRdDJcuaIBg="; }; + propagatedBuildInputs = [ + lxml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # upstream hasn't updated the tests in a while + doCheck = false; + + pythonImportsCheck = [ "svg2tikz" ]; + meta = with lib; { - homepage = "https://github.com/kjellmf/svg2tikz"; - description = "An SVG to TikZ converter"; + homepage = "https://github.com/xyz2tex/svg2tikz"; + description = "Set of tools for converting SVG graphics to TikZ/PGF code"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ gal_bolle ]; + maintainers = with maintainers; [ dotlambda gal_bolle ]; }; - } diff --git a/pkgs/development/python-modules/svglib/default.nix b/pkgs/development/python-modules/svglib/default.nix index 97e03ad4b036..59841b4cecfd 100644 --- a/pkgs/development/python-modules/svglib/default.nix +++ b/pkgs/development/python-modules/svglib/default.nix @@ -12,15 +12,14 @@ buildPythonPackage rec { pname = "svglib"; - version = "1.4.1"; + version = "1.5.1"; + format = "setuptools"; disabled = pythonOlder "3.7"; - format = "setuptools"; - src = fetchPypi { inherit pname version; - sha256 = "sha256-SMJHBsI7tCYhc7b6Seq7EK+hW4QS8UKDEgVJUXzPoxQ="; + hash = "sha256-Oudl06lAnuYMD7TSTC3raoBheqknBU9bzX/JjwaV5Yc="; }; propagatedBuildInputs = [ @@ -31,22 +30,27 @@ buildPythonPackage rec { tinycss2 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - # Ignore tests that require network access (TestWikipediaFlags and TestW3CSVG), and tests that - # require files missing in the 1.0.0 PyPI release (TestOtherFiles). - pytestFlagsArray = [ - "-k 'not TestWikipediaFlags and not TestW3CSVG and not TestOtherFiles'" + disabledTests = [ + # Ignore tests that require network access (TestWikipediaFlags and TestW3CSVG), and tests that + # require files missing in the 1.0.0 PyPI release (TestOtherFiles). + "TestWikipediaFlags" + "TestW3CSVG" + "TestOtherFiles" ]; - pythonImportsCheck = [ "svglib.svglib" ]; + pythonImportsCheck = [ + "svglib.svglib" + ]; meta = with lib; { - homepage = "https://github.com/deeplook/svglib"; description = "A pure-Python library for reading and converting SVG"; - license = licenses.lgpl3; + homepage = "https://github.com/deeplook/svglib"; + changelog = "https://github.com/deeplook/svglib/blob/v${version}/CHANGELOG.rst"; + license = licenses.lgpl3Only; maintainers = with maintainers; [ trepetti ]; }; } diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/pkgs/development/python-modules/svgwrite/default.nix index 87e34b376375..10d02fa7264f 100644 --- a/pkgs/development/python-modules/svgwrite/default.nix +++ b/pkgs/development/python-modules/svgwrite/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # svgwrite requires Python 3.6 or newer disabled = pythonOlder "3.6"; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # embed_google_web_font test tried to pull font from internet diff --git a/pkgs/development/python-modules/swagger-spec-validator/default.nix b/pkgs/development/python-modules/swagger-spec-validator/default.nix index ec15516b16b6..80fb6bb6a53d 100644 --- a/pkgs/development/python-modules/swagger-spec-validator/default.nix +++ b/pkgs/development/python-modules/swagger-spec-validator/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ]; diff --git a/pkgs/development/python-modules/swift/default.nix b/pkgs/development/python-modules/swift/default.nix index c56b8abd0978..1eed43519e7e 100644 --- a/pkgs/development/python-modules/swift/default.nix +++ b/pkgs/development/python-modules/swift/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "swift"; - version = "2.30.0"; + version = "2.31.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ytxs7hWQa7iaBinO2nhiXhNvo7lsuhmDPnqE1K62C5k="; + sha256 = "sha256-gU6XQKiLv6E1OtSjwDunjhNIMK36//arcSsQRwuRtTY="; }; postPatch = '' @@ -59,7 +59,7 @@ buildPythonPackage rec { installManPage doc/manpages/* ''; - checkInputs = [ + nativeCheckInputs = [ boto3 mock stestr diff --git a/pkgs/development/python-modules/swisshydrodata/default.nix b/pkgs/development/python-modules/swisshydrodata/default.nix index f9464382c4c0..38ed15981fd4 100644 --- a/pkgs/development/python-modules/swisshydrodata/default.nix +++ b/pkgs/development/python-modules/swisshydrodata/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index 2667f0af5464..d1bb2994f779 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -1,31 +1,26 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "sybil"; - version = "3.0.1"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-bwLcIgSvflohIDeSTZdPcngfbcGP08RMx85GOhIPUw0="; + src = fetchFromGitHub { + owner = "simplistix"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-9fXvQfVS3IVdOV4hbA0bEYFJU7uK0WpqJKMNBltqFTI="; }; - checkInputs = [ - pytestCheckHook - ]; - - disabledTests = [ - # Sensitive to output of other commands - "test_namespace" - "test_unittest" - ]; + # Circular dependency with testfixtures + doCheck = false; pythonImportsCheck = [ "sybil" @@ -34,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automated testing for the examples in your documentation"; homepage = "https://github.com/cjw296/sybil"; + changelog = "https://github.com/simplistix/sybil/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index ee2a08738456..fc57fec57da9 100644 --- a/pkgs/development/python-modules/symengine/default.nix +++ b/pkgs/development/python-modules/symengine/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { buildInputs = [ cython ]; - checkInputs = [ pytest sympy ]; + nativeCheckInputs = [ pytest sympy ]; setupPyBuildFlags = [ "--symengine-dir=${symengine}/" diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index c00230e501d2..f7fb4b735eff 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-4yOA3OY8t8AQjtUlVwCS/UUWi9ri+qF+UoIh73Lohlg="; }; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; propagatedBuildInputs = [ mpmath ]; diff --git a/pkgs/development/python-modules/synergy/default.nix b/pkgs/development/python-modules/synergy/default.nix index 53af1552ac30..0b6c367db6ee 100644 --- a/pkgs/development/python-modules/synergy/default.nix +++ b/pkgs/development/python-modules/synergy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pandas ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "synergy" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/synologydsm-api/default.nix b/pkgs/development/python-modules/synologydsm-api/default.nix index 71bd11144294..e86361979c1b 100644 --- a/pkgs/development/python-modules/synologydsm-api/default.nix +++ b/pkgs/development/python-modules/synologydsm-api/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix new file mode 100644 index 000000000000..3ad320751acb --- /dev/null +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest +, colored +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "syrupy"; + version = "3.0.6"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tophat"; + repo = "syrupy"; + rev = "refs/tags/v${version}"; + hash = "sha256-8DdPgah1cWVY9YZT78otlAv7X00iwxfi+Fkn3OmLgeM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + colored + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/tophat/syrupy/releases/tag/v${version}"; + description = "Pytest Snapshot Test Utility"; + homepage = "https://github.com/tophat/syrupy"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/tableaudocumentapi/default.nix b/pkgs/development/python-modules/tableaudocumentapi/default.nix index ae6f374836d7..4862e3208d42 100644 --- a/pkgs/development/python-modules/tableaudocumentapi/default.nix +++ b/pkgs/development/python-modules/tableaudocumentapi/default.nix @@ -3,29 +3,40 @@ , fetchPypi , lxml , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "tableaudocumentapi"; - version = "0.10"; + version = "0.11"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ahR+o4UgFLm/9aFsEqmlwXkcgTjqI0wU2Tl9EjVjLZs="; + hash = "sha256-g6V1UBf+P21FcZkR3PHoUmdmrQwEvjdd1VKhvNmvOys="; }; - propagatedBuildInputs = [ lxml ]; + propagatedBuildInputs = [ + lxml + ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "tableaudocumentapi" ]; + pythonImportsCheck = [ + "tableaudocumentapi" + ]; # ModuleNotFoundError: No module named 'test.assets' doCheck = false; meta = with lib; { - description = "A Python module for working with Tableau files"; + description = "Python module for working with Tableau files"; homepage = "https://github.com/tableau/document-api-python"; + changelog = "https://github.com/tableau/document-api-python/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index fbe99c6fa931..2a50024dc6e0 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { "--blosc=${lib.getDev c-blosc}" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' cd .. ''; diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index ae0217b0ebdc..56af48f6403e 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -1,14 +1,15 @@ -{ buildPythonPackage -, lib +{ lib +, buildPythonPackage , fetchPypi -, isPy27 +, markuppy , odfpy , openpyxl , pandas -, setuptools-scm , pytestCheckHook -, pytest-cov +, pythonOlder , pyyaml +, setuptools-scm +, tabulate , unicodecsv , xlrd , xlwt @@ -16,27 +17,80 @@ buildPythonPackage rec { pname = "tablib"; - version = "3.2.1"; - disabled = isPy27; + version = "3.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pX8ncLjCJf6+wcseZQEqac8w3Si+gQ4P+Y0CR2jH0PE="; + hash = "sha256-EeAqb4HSVuBmaHfYOXly0QMCMHpUwE/XFX6S+vdAyxA="; }; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ]; - checkInputs = [ pytestCheckHook pytest-cov unicodecsv pandas ]; + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov=tablib --cov=tests --cov-report xml --cov-report term --cov-report html" "" + ''; - # test_tablib needs MarkupPy, which isn't packaged yet - pytestFlagsArray = [ "--ignore=tests/test_tablib.py" ]; + nativeBuildInputs = [ + setuptools-scm + ]; - pythonImportsCheck = [ "tablib" ]; + passthru.optional-dependencies = { + all = [ + markuppy + odfpy + openpyxl + pandas + pyyaml + tabulate + xlrd + xlwt + ]; + cli = [ + tabulate + ]; + html = [ + markuppy + ]; + ods = [ + odfpy + ]; + pandas = [ + pandas + ]; + xls = [ + xlrd + xlwt + ]; + xlsx = [ + openpyxl + ]; + yaml = [ + pyyaml + ]; + }; + + nativeCheckInputs = [ + pandas + pytestCheckHook + unicodecsv + ]; + + disabledTestPaths = [ + # test_tablib needs MarkupPy, which isn't packaged yet + "tests/test_tablib.py" + ]; + + pythonImportsCheck = [ + "tablib" + ]; meta = with lib; { description = "Format-agnostic tabular dataset library"; homepage = "https://tablib.readthedocs.io/"; changelog = "https://github.com/jazzband/tablib/raw/v${version}/HISTORY.md"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/tabula-py/default.nix b/pkgs/development/python-modules/tabula-py/default.nix index 71873965f862..25ae9a1b5117 100644 --- a/pkgs/development/python-modules/tabula-py/default.nix +++ b/pkgs/development/python-modules/tabula-py/default.nix @@ -2,17 +2,18 @@ , buildPythonPackage , distro , fetchFromGitHub -, jdk +, jre , numpy , pandas , pytestCheckHook , pythonOlder , setuptools-scm +, setuptools }: buildPythonPackage rec { pname = "tabula-py"; - version = "2.5.1"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,10 +21,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chezou"; repo = pname; - rev = "v${version}"; - hash = "sha256-Dfi6LzrLDz9VVDmbeK1dEaWuQosD4tvAH13Q4Mp3smA="; + rev = "refs/tags/v${version}"; + hash = "sha256-L/N4TqVHIlwqVeBKlUq5Oz1VW/105Ov6Yicvnn/lxlI="; }; + patches = [ + ./java-interpreter-path.patch + ]; + + postPatch = '' + sed -i 's|@JAVA@|${jre}/bin/java|g' $(find -name '*.py') + ''; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ @@ -34,10 +43,10 @@ buildPythonPackage rec { distro numpy pandas + setuptools ]; - checkInputs = [ - jdk + nativeCheckInputs = [ pytestCheckHook ]; @@ -56,6 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to extract table from PDF into pandas DataFrame"; homepage = "https://github.com/chezou/tabula-py"; + changelog = "https://github.com/chezou/tabula-py/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/tabula-py/java-interpreter-path.patch b/pkgs/development/python-modules/tabula-py/java-interpreter-path.patch new file mode 100644 index 000000000000..fcd03628794a --- /dev/null +++ b/pkgs/development/python-modules/tabula-py/java-interpreter-path.patch @@ -0,0 +1,54 @@ +diff -ru origsource/tabula/io.py source/tabula/io.py +--- origsource/tabula/io.py 2022-11-23 17:19:35.419837514 +0100 ++++ source/tabula/io.py 2022-11-23 17:22:08.204194807 +0100 +@@ -79,7 +79,7 @@ + ) + ) + +- args = ["java"] + java_options + ["-jar", _jar_path()] + options.build_option_list() ++ args = ["@JAVA@"] + java_options + ["-jar", _jar_path()] + options.build_option_list() + if path: + args.append(path) + +diff -ru origsource/tabula/util.py source/tabula/util.py +--- origsource/tabula/util.py 2022-11-23 17:19:35.422837521 +0100 ++++ source/tabula/util.py 2022-11-23 17:21:41.514132392 +0100 +@@ -26,7 +26,7 @@ + + try: + res = subprocess.check_output( +- ["java", "-version"], stderr=subprocess.STDOUT ++ ["@JAVA@", "-version"], stderr=subprocess.STDOUT + ).decode() + + except FileNotFoundError: +diff -ru origsource/tests/test_read_pdf_table.py source/tests/test_read_pdf_table.py +--- origsource/tests/test_read_pdf_table.py 2022-11-23 17:19:35.422837521 +0100 ++++ source/tests/test_read_pdf_table.py 2022-11-23 17:21:22.008086776 +0100 +@@ -281,7 +281,7 @@ + + tabula.read_pdf(self.pdf_path, encoding="utf-8") + +- target_args = ["java"] ++ target_args = ["@JAVA@"] + if platform.system() == "Darwin": + target_args += ["-Djava.awt.headless=true"] + target_args += [ +@@ -355,7 +355,7 @@ + + tabula.read_pdf(self.pdf_path, encoding="utf-8", silent=False) + +- target_args = ["java"] ++ target_args = ["@JAVA@"] + if platform.system() == "Darwin": + target_args += ["-Djava.awt.headless=true"] + target_args += [ +@@ -382,7 +382,7 @@ + + tabula.read_pdf(self.pdf_path, encoding="utf-8", silent=True) + +- target_args = ["java"] ++ target_args = ["@JAVA@"] + if platform.system() == "Darwin": + target_args += ["-Djava.awt.headless=true"] + target_args += [ diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index 34e668339878..99420e9e32fe 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -1,22 +1,39 @@ { lib , buildPythonPackage , fetchPypi -, nose +, pythonOlder +, setuptools-scm +, setuptools +, wcwidth +, pytestCheckHook }: buildPythonPackage rec { - version = "0.8.10"; + version = "0.9.0"; pname = "tabulate"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bFfz8916wngncBVfOtstsLGiaWN+QvJ1mZJeZLEU9Rk="; + hash = "sha256-AJWxK/WWbeUpwP6x+ghnFnGzNo7sd9fverEUviwGizw="; }; - checkInputs = [ nose ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - # Tests: cannot import common (relative import). - doCheck = false; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + passthru.optional-dependencies = { + widechars = [ wcwidth ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); meta = { description = "Pretty-print tabular data"; diff --git a/pkgs/development/python-modules/tabview/default.nix b/pkgs/development/python-modules/tabview/default.nix index 6123dc8a0567..62eaf512357b 100644 --- a/pkgs/development/python-modules/tabview/default.nix +++ b/pkgs/development/python-modules/tabview/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1d1l8fhdn3w2zg7wakvlmjmgjh9lh9h5fal1clgyiqmhfix4cn4m"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "Python curses command line CSV and tabular data viewer"; diff --git a/pkgs/development/python-modules/tadasets/default.nix b/pkgs/development/python-modules/tadasets/default.nix index d1de836a5b8c..a5dbed7133cd 100644 --- a/pkgs/development/python-modules/tadasets/default.nix +++ b/pkgs/development/python-modules/tadasets/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { matplotlib ]; - checkInputs = [ + nativeCheckInputs = [ pytest scipy ]; diff --git a/pkgs/development/python-modules/tag-expressions/default.nix b/pkgs/development/python-modules/tag-expressions/default.nix index 137759f5a54b..d992b4250891 100644 --- a/pkgs/development/python-modules/tag-expressions/default.nix +++ b/pkgs/development/python-modules/tag-expressions/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1c0a49c3c0357976822b03c43db8d4a1c5548e16fb07ac939c10bbd5183f529d"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Package to parse logical tag expressions"; diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix index e3210b443252..806da0dc3e41 100644 --- a/pkgs/development/python-modules/tailscale/default.nix +++ b/pkgs/development/python-modules/tailscale/default.nix @@ -21,10 +21,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frenck"; repo = "python-tailscale"; - rev = "v${version}"; - sha256 = "sha256-gGDsVGsCBZi/pxD0cyH3+xrvHVBC+wJCcl/NGqsTqiE="; + rev = "refs/tags/v${version}"; + hash = "sha256-gGDsVGsCBZi/pxD0cyH3+xrvHVBC+wJCcl/NGqsTqiE="; }; + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -35,19 +42,12 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ 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 = [ "tailscale" ]; @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for the Tailscale API"; homepage = "https://github.com/frenck/python-tailscale"; + changelog = "https://github.com/frenck/python-tailscale/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/tank-utility/default.nix b/pkgs/development/python-modules/tank-utility/default.nix index 658920abbed1..ab4573594d95 100644 --- a/pkgs/development/python-modules/tank-utility/default.nix +++ b/pkgs/development/python-modules/tank-utility/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { setuptools ] ++ urllib3.optional-dependencies.secure; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook responses diff --git a/pkgs/development/python-modules/tappy/default.nix b/pkgs/development/python-modules/tappy/default.nix index 4652ea99f6d8..d2a311f7e95a 100644 --- a/pkgs/development/python-modules/tappy/default.nix +++ b/pkgs/development/python-modules/tappy/default.nix @@ -16,13 +16,14 @@ buildPythonPackage rec { sha256 = "3c0cd45212ad5a25b35445964e2517efa000a118a1bfc3437dae828892eaf1e1"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "tap" ]; meta = with lib; { - homepage = "https://github.com/python-tap/tappy"; description = "A set of tools for working with the Test Anything Protocol (TAP) in Python"; + homepage = "https://github.com/python-tap/tappy"; + changelog = "https://tappy.readthedocs.io/en/latest/releases.html"; license = licenses.bsd2; maintainers = with maintainers; [ sfrijters ]; }; diff --git a/pkgs/development/python-modules/tasklib/default.nix b/pkgs/development/python-modules/tasklib/default.nix index ebc2d46fd989..204bcb7df1a6 100644 --- a/pkgs/development/python-modules/tasklib/default.nix +++ b/pkgs/development/python-modules/tasklib/default.nix @@ -1,4 +1,8 @@ -{ lib, pythonPackages, taskwarrior, writeShellScriptBin }: +{ lib +, pythonPackages +, taskwarrior +, writeShellScriptBin +}: with pythonPackages; @@ -8,11 +12,11 @@ wsl_stub = writeShellScriptBin "wsl" "true"; in buildPythonPackage rec { pname = "tasklib"; - version = "2.4.3"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "b523bc12893d26c8173a6b8d84b16259c9a9c5acaaf8932bc018117f907b3bc5"; + hash = "sha256-XM1zG1JjbdEEV6i42FjLDQJv+qsePnUbr3kb+APjfXs="; }; propagatedBuildInputs = [ @@ -21,14 +25,15 @@ in buildPythonPackage rec { tzlocal ]; - checkInputs = [ + nativeCheckInputs = [ taskwarrior wsl_stub ]; meta = with lib; { homepage = "https://github.com/robgolding/tasklib"; - description = "A library for interacting with taskwarrior databases"; + description = "Library for interacting with taskwarrior databases"; + changelog = "https://github.com/GothenburgBitFactory/tasklib/releases/tag/${version}"; maintainers = with maintainers; [ arcnmx ]; platforms = platforms.all; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index dfdbbcf5d814..76cfe0faf0f4 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six python-dateutil kitchen pytz ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/ralphbean/taskw"; diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index 274c8818b204..8f0adfc8d119 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ colorama regex ]; - checkInputs = [ pytestCheckHook pytest-mypy ]; + nativeCheckInputs = [ pytestCheckHook pytest-mypy ]; pythonImportsCheck = [ "tatsu" ]; diff --git a/pkgs/development/python-modules/taxi/default.nix b/pkgs/development/python-modules/taxi/default.nix index 28aa01e904a1..47a50d8ad2cd 100644 --- a/pkgs/development/python-modules/taxi/default.nix +++ b/pkgs/development/python-modules/taxi/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook ]; diff --git a/pkgs/development/python-modules/tcxparser/default.nix b/pkgs/development/python-modules/tcxparser/default.nix index 2f8f4e6b1d21..c011b9e32fac 100644 --- a/pkgs/development/python-modules/tcxparser/default.nix +++ b/pkgs/development/python-modules/tcxparser/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/tcxreader/default.nix b/pkgs/development/python-modules/tcxreader/default.nix index ec4abfd886d4..dd11c6624e3f 100644 --- a/pkgs/development/python-modules/tcxreader/default.nix +++ b/pkgs/development/python-modules/tcxreader/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "tcxreader"; - version = "0.4.2"; + version = "0.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,10 +16,10 @@ buildPythonPackage rec { owner = "alenrajsp"; repo = "tcxreader"; rev = "v${version}"; - hash = "sha256-YJDuyInO5FCIdz7xE29qOpuH6rPKvO4FZChjgXdc+Aw="; + hash = "sha256-UJ6F+GcdF0b2gALQWepLyCnWm+6RKBRnBt1eJNoRRzo="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/teamcity-messages/default.nix b/pkgs/development/python-modules/teamcity-messages/default.nix index 482386ac89b3..bb05dec3f49d 100644 --- a/pkgs/development/python-modules/teamcity-messages/default.nix +++ b/pkgs/development/python-modules/teamcity-messages/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-9az7kD7nKqMF2b3/eFgF+pOKKIYLvTy2sf4TSJfHRnA="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/telegraph/default.nix b/pkgs/development/python-modules/telegraph/default.nix index a27db889c887..b6bca3a357a3 100644 --- a/pkgs/development/python-modules/telegraph/default.nix +++ b/pkgs/development/python-modules/telegraph/default.nix @@ -9,26 +9,18 @@ buildPythonPackage rec { pname = "telegraph"; - version = "2.1.0"; - disabled = pythonOlder "3.6"; + version = "2.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { repo = "telegraph"; owner = "python273"; - sha256 = "ChlQJu4kHkXUf4gOtW5HS+ThP3eQL7LsyANeS/10pLo="; - rev = "da629de7c00c3b8b0c7ab8ef4bf23caf419a3c6c"; + rev = "refs/tags/v${version}"; + hash = "sha256-xARX8lSOftNVYY4InR5vU4OiguCJJJZv/W76G9eLgNY="; }; - checkInputs = [ pytestCheckHook ]; - - pytestFlagsArray = [ "tests/" ]; - - disabledTests = [ - "test_get_page" - ]; - - doCheck = true; - propagatedBuildInputs = [ requests ]; @@ -39,12 +31,28 @@ buildPythonPackage rec { ]; }; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "telegraph" ]; + pytestFlagsArray = [ + "tests/" + ]; + + disabledTests = [ + "test_get_page" + ]; + + doCheck = true; + + pythonImportsCheck = [ + "telegraph" + ]; meta = with lib; { - homepage = "https://github.com/python273/telegraph"; description = "Telegraph API wrapper"; + homepage = "https://github.com/python273/telegraph"; + changelog = "https://github.com/python273/telegraph/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ gp2112 ]; }; diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index 71df98720834..f40809dabf9e 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "telethon"; - version = "1.25.1"; + version = "1.26.1"; format = "pyproject"; disabled = pythonOlder "3.5"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "LonamiWebs"; repo = "Telethon"; rev = "refs/tags/v${version}"; - hash = "sha256-xmFoCUqYo600RH72KWG/aM7hKGiTYdCBsbPOFipxIzA="; + hash = "sha256-RxnC+PVSnLeCZ1xap6n6CjpeA8Ig6oLGiB0LDxqUmsA="; }; patchPhase = '' @@ -37,7 +37,7 @@ buildPythonPackage rec { pyaes ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/telfhash/default.nix b/pkgs/development/python-modules/telfhash/default.nix index 86386ad48a90..b2cb3c3ac953 100644 --- a/pkgs/development/python-modules/telfhash/default.nix +++ b/pkgs/development/python-modules/telfhash/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 654c8a9e2ab0..7198620b8ff0 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { pname = "tempest"; - version = "32.0.0"; + version = "33.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MPaGhT2H8Hzk29qylQru9Z6QaRrHM+9I7N5qhe9Wts4="; + sha256 = "sha256-aEtBAE3p+HVw/macwZtKo20mSJctrsIN7idqWe6Dvtc="; }; propagatedBuildInputs = [ @@ -57,7 +57,7 @@ buildPythonPackage rec { debtcollector ]; - checkInputs = [ + nativeCheckInputs = [ stestr hacking oslotest diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 8b50406c7eac..83f07a52f085 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "tempora"; - version = "5.0.2"; + version = "5.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MfpbszsmQQJiEfI+gI64vTUZAZiLFn1F8yPI9FDs8hE="; + sha256 = "sha256-PnxKU2mheIyIqZtr46THTAx3KNO2L9dop+gb0L4OiN8="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytest-freezegun pytestCheckHook diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 8de4c87b6fdc..15d67383c8b1 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -1,28 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, isPy3k -, pbr, six, futures ? null, monotonic ? null, typing ? null, setuptools-scm -, pytest, sphinx, tornado, typeguard +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools-scm +, tornado +, typeguard }: buildPythonPackage rec { pname = "tenacity"; - version = "8.0.1"; + version = "8.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "43242a20e3e73291a28bcbcacfd6e000b02d3857a9a9fff56b297a27afdc932f"; + sha256 = "sha256-5IxDf9+TQPVma5LNeZDpa8X8lV4SmLr0qQfjlyBnpEU="; }; - nativeBuildInputs = [ pbr setuptools-scm ]; - propagatedBuildInputs = [ six ] - ++ lib.optionals isPy27 [ futures monotonic typing ]; + nativeBuildInputs = [ + pbr + setuptools-scm + ]; - checkInputs = [ pytest sphinx tornado ] - ++ lib.optionals isPy3k [ typeguard ]; - checkPhase = if isPy27 then '' - pytest --ignore='tenacity/tests/test_asyncio.py' - '' else '' - pytest - ''; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + tornado + typeguard + ]; + + pythonImportsCheck = [ + "tenacity" + ]; meta = with lib; { homepage = "https://github.com/jd/tenacity"; diff --git a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix index 2cb1629ffe67..158437a93d1f 100644 --- a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix +++ b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tensorboard_plugin_profile"; - version = "2.8.0"; + version = "2.11.1"; format = "wheel"; src = fetchPypi { @@ -17,7 +17,7 @@ buildPythonPackage rec { format = "wheel"; dist = "py3"; python = "py3"; - hash = "sha256-2LzXSdPrzS5G63ONvchdEL4aJD75eU9dF1pMqLcfbto="; + hash = "sha256-t9AZg0BGjDcOxtoRBHZO0joIgLHpoKqEUY4pxmw8sjg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index f42d1b3220b7..7a10279ce88f 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , pythonAtLeast +, pythonRelaxDepsHook , numpy , wheel , werkzeug @@ -23,7 +24,7 @@ buildPythonPackage rec { pname = "tensorboard"; - version = "2.10.0"; + version = "2.11.0"; format = "wheel"; disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; @@ -31,23 +32,17 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-dskaXolZzSIIzDLLF6DLACutq7ZqBqwq8Cp4EPSaWeM="; + hash = "sha256-oOWS7oeWLhevPw3Of6rj+70jkDAVnp5iXM6BC341xT0="; }; - postPatch = '' - chmod u+rwx -R ./dist - pushd dist - wheel unpack --dest unpacked ./*.whl - pushd unpacked/tensorboard-${version} + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; - substituteInPlace tensorboard-${version}.dist-info/METADATA \ - --replace "google-auth-oauthlib (<0.5,>=0.4.1)" "google-auth-oauthlib (<1.0,>=0.4.1)" \ - --replace "protobuf (<3.20,>=3.9.2)" "protobuf (>=3.9.2)" - - popd - wheel pack ./unpacked/tensorboard-${version} - popd - ''; + pythonRelaxDeps = [ + "google-auth-oauthlib" + "protobuf" + ]; propagatedBuildInputs = [ absl-py diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index 7d0a28a4198c..732d97946fff 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { soundfile ]; - checkInputs = [ + nativeCheckInputs = [ boto3 matplotlib moto diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 1afd6c55a3fb..20837e9efd2f 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -42,13 +42,13 @@ buildPythonPackage rec { pname = "tensorflow-datasets"; - version = "4.6.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "tensorflow"; repo = "datasets"; rev = "refs/tags/v${version}"; - sha256 = "sha256-z52UZz9d1AaZklLOPbWuzByEl1hJ6ra4Hoz6eNGD+hg="; + sha256 = "sha256-YG0Abb5xdTaq+/0I45KU02wuZHyLKD5oMSINJOy7Nrk="; }; patches = [ @@ -76,7 +76,7 @@ buildPythonPackage rec { "tensorflow_datasets" ]; - checkInputs = [ + nativeCheckInputs = [ apache-beam beautifulsoup4 ffmpeg diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/bin.nix similarity index 86% rename from pkgs/development/python-modules/tensorflow-estimator/default.nix rename to pkgs/development/python-modules/tensorflow-estimator/bin.nix index 24fb681f3b6f..c7d8e4d630be 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/bin.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "tensorflow-estimator"; - version = "2.10.0"; + version = "2.11.0"; format = "wheel"; src = fetchPypi { pname = "tensorflow_estimator"; inherit version format; - hash = "sha256-8yTqF81X8W4zvxiHEdUHfmsuX1oSwyjW4BoHsjiI7c0="; + hash = "sha256-6jtkrP/z2aJE8GF4yb3ty90/Eltn0IiNuoIpSY0GRos="; }; propagatedBuildInputs = [ mock numpy absl-py ]; diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index 994d821d9a25..f5008136f0b5 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "tensorflow-metadata"; - version = "1.9.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "tensorflow"; repo = "metadata"; rev = "refs/tags/v${version}"; - sha256 = "sha256-6BtKHyVrprtEb2Bi7g2YuctUykWSRXmKwADfHzGkYjc="; + sha256 = "sha256-pgeQ9qMcz/DsdvF3THMZ4uPToLxtIM0No/kgRlBzU8A="; }; patches = [ diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 760e9a0e9d1c..bd447bd4325a 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -1,7 +1,10 @@ { lib +, stdenv , fetchFromGitHub +, bazel_6 , buildBazelPackage , buildPythonPackage +, cctools , python , setuptools , wheel @@ -24,7 +27,7 @@ }: let - version = "0.15.0"; + version = "0.19.0"; pname = "tensorflow_probability"; # first build all binaries and generate setup.py using bazel @@ -34,7 +37,7 @@ let owner = "tensorflow"; repo = "probability"; rev = "v" + version; - sha256 = "155fgmra90s08vjnp61qxdrpzq74xa3kdzhgdkavwgc25pvxn3mi"; + hash = "sha256-ZkQ20Qt/RF/leVP6Kc38tGgPz+C6lEuHvoL+s97oksE="; }; nativeBuildInputs = [ # needed to create the output wheel in installPhase @@ -45,10 +48,13 @@ let tensorflow ]; + bazel = bazel_6; + bazelTarget = ":pip_pkg"; + LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; fetchAttrs = { - sha256 = "0sgxdlw5x3dydy53l10vbrj8smh78b7r1wff8jxcgp4w69mk8zfm"; + sha256 = "sha256-pST4R45mWC5j0ngkkRe+hmostaMploW0+BN3WKPt0t0="; }; buildAttrs = { @@ -88,7 +94,7 @@ in buildPythonPackage { # Listed here: # https://github.com/tensorflow/probability/blob/f3777158691787d3658b5e80883fe1a933d48989/testing/dependency_install_lib.sh#L83 - checkInputs = [ + nativeCheckInputs = [ hypothesis pytest scipy diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 96f54632069e..dcfa8e0e964c 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -18,7 +18,7 @@ , wheel , opt-einsum , backports_weakref -, tensorflow-estimator +, tensorflow-estimator-bin , tensorboard , cudaSupport ? false , cudaPackages ? {} @@ -49,6 +49,9 @@ in buildPythonPackage { inherit (packages) version; format = "wheel"; + # Python 3.11 still unsupported + disabled = pythonAtLeast "3.11"; + src = let pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion; platform = if stdenv.isDarwin then "mac" else "linux"; @@ -73,7 +76,7 @@ in buildPythonPackage { opt-einsum google-pasta wrapt - tensorflow-estimator + tensorflow-estimator-bin tensorboard keras-applications keras-preprocessing diff --git a/pkgs/development/python-modules/tensorflow/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/binary-hashes.nix index b2ce20d93486..3f8eb562f966 100644 --- a/pkgs/development/python-modules/tensorflow/binary-hashes.nix +++ b/pkgs/development/python-modules/tensorflow/binary-hashes.nix @@ -1,51 +1,51 @@ { -version = "2.9.1"; +version = "2.9.3"; linux_py_37_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1wpqjqx3zfyrclhs6kkqhq76kmb45h2jv2jdi89jrk8pfk3mcf2k"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0p1a4dlqj7kl4a3aad33r083f5pfspc0hm0x9a3b1qvvgaldww08"; }; linux_py_38_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1np06xy18z8k29q8vg5a8kmvxpbcz0grjjww3hcpb4kvy9rx01sw"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1zq39ls1asha4zkrfqvg5375mmryf20hc1fi243k8z077391ihhv"; }; linux_py_39_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1gy258wfgjf2f1lcpayvgx5cnncnqjcp2mj70mz50bm9mhmzl4kd"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "16gz4bcw2gvwh3264wc8a2lyfr542avhgdrnmd0pxwszqg45rkdj"; }; linux_py_310_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "0bh5xg4wfc86q1x7ph8bvdpa3arm6kmbvd4cg3d427sywkmdsrk6"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1a5s19x8ybncmpx8hr116bm6cvjar3b0sj8k8w2wrpxhh02sndwh"; }; linux_py_37_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1qsq7la0fpmk2hych7sy9k8mza1q7w05c4nmgq92cxgkmpa7d17x"; + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "03zh1fzi7s5incxghgnk4hm9m9kg989pn420g532grzj1f85x23f"; }; linux_py_38_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "0913znz5mg6mkryi24xhz4s7rwhxbx172fsk26lxl6w6qx219pfd"; + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1czajraildk4acwn3rd921wfarl1jwbnmfiwk57ijsx5s9q4d328"; }; linux_py_39_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "01srcvpcwpgpvb9inlc2mwsmf5sj13rqb695rvm50ybkjrrac7l4"; + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0rk1ii9dqi856bgm596igbragvcwk3799cz05x6gyjkixdkbk5jj"; }; linux_py_310_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "19g93jig1x389ybc25ifsh1grrsghn3w2xgk029289432bnlpzp4"; + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1q6pf6140qza16p1yxw2z3n7ndfq3by2k6wc45lhpx4bl1vs7my7"; }; mac_py_37_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.1-cp37-cp37m-macosx_10_14_x86_64.whl"; - sha256 = "0b2hirjhqw4jl75h0ik1a9hgbkkq0b3gj4wkkp9vb6mi4116gxxi"; + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.3-cp37-cp37m-macosx_10_14_x86_64.whl"; + sha256 = "05y3y18ggnrfzrcrzkxkb3djbhsm8001s1l1nmvvv9zq8v02b6hp"; }; mac_py_38_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.1-cp38-cp38-macosx_10_14_x86_64.whl"; - sha256 = "0da6csvldvxg47r932wbx5z6w3hf1d107p9blayzrjchdwhqs16z"; + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.3-cp38-cp38-macosx_10_14_x86_64.whl"; + sha256 = "0qgzqdfv4q5bl6hd932jd6zfp47abva59nyrgxw19kiz0gzq3lw9"; }; mac_py_39_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.1-cp39-cp39-macosx_10_14_x86_64.whl"; - sha256 = "1fa0nf4pj5sl5shifaahr8n30q86k6hdsg0qwvan0hyg75fh9bc1"; + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.3-cp39-cp39-macosx_10_14_x86_64.whl"; + sha256 = "1zjvjyvz0lshvqf5sc80bxkdwnk8b43abwmzsm9m6dyl8waj5d5r"; }; mac_py_310_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.1-cp310-cp310-macosx_10_14_x86_64.whl"; - sha256 = "0baq0djx8vhn8d75wyf82m6iqgfxwcrgg4xcvlr20m4x9bmysxrc"; + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.3-cp310-cp310-macosx_10_14_x86_64.whl"; + sha256 = "0pncslab7m9d89syaad7n3fgxygkr07d5prir225a42kym8slni8"; }; } diff --git a/pkgs/development/python-modules/tensorflow/com_google_absl_fix_macos.patch b/pkgs/development/python-modules/tensorflow/com_google_absl_fix_macos.patch new file mode 100644 index 000000000000..7da8ab1b2e9b --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/com_google_absl_fix_macos.patch @@ -0,0 +1,15 @@ +diff -ru a/absl/base/config.h b/absl/base/config.h +--- a/absl/base/config.h ++++ b/absl/base/config.h +@@ -558,9 +558,9 @@ + __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 50000) || \ + (defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && \ + __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 120000)))) +-#define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 1 ++// #define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 1 + #else +-#define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 0 ++// #define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 0 + #endif + + // ABSL_HAVE_STD_ANY diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index c8308b2f80ac..8082fd9267bc 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -6,10 +6,10 @@ , numpy, tensorboard, absl-py , packaging, setuptools, wheel, keras, keras-preprocessing, google-pasta , opt-einsum, astunparse, h5py -, termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator +, termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator-bin , dill, flatbuffers-python, portpicker, tblib, typing-extensions # Common deps -, git, pybind11, which, binutils, glibcLocales, cython, perl +, git, pybind11, which, binutils, glibcLocales, cython, perl, coreutils # Common libraries , jemalloc, mpi, gast, grpc, sqlite, boringssl, jsoncpp, nsync , curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib, protobuf-core @@ -22,8 +22,6 @@ , tensorboardSupport ? true # XLA without CUDA is broken , xlaSupport ? cudaSupport -# Default from ./configure script -, cudaCapabilities ? [ "sm_35" "sm_50" "sm_60" "sm_70" "sm_75" "compute_80" ] , sse42Support ? stdenv.hostPlatform.sse4_2Support , avx2Support ? stdenv.hostPlatform.avx2Support , fmaSupport ? stdenv.hostPlatform.fmaSupport @@ -32,7 +30,7 @@ }: let - inherit (cudaPackages) cudatoolkit cudnn nccl; + inherit (cudaPackages) cudatoolkit cudaFlags cudnn nccl; in assert cudaSupport -> cudatoolkit != null @@ -76,7 +74,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.10.0"; + version = "2.11.0"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -100,7 +98,7 @@ let six tblib tensorboard - tensorflow-estimator + tensorflow-estimator-bin termcolor typing-extensions wheel @@ -168,7 +166,7 @@ let ''; }; bazel-build = if stdenv.isDarwin then _bazel-build.overrideAttrs (prev: { - bazelBuildFlags = prev.bazelBuildFlags ++ [ + bazelFlags = prev.bazelFlags ++ [ "--override_repository=rules_cc=${rules_cc_darwin_patched}" "--override_repository=llvm-raw=${llvm-raw_darwin_patched}" ]; @@ -189,8 +187,8 @@ let src = fetchFromGitHub { owner = "tensorflow"; repo = "tensorflow"; - rev = "v${version}"; - hash = "sha256-Y6cujiMoQXKQlsLBr7d0T278ltdd00IfsTRycJbRVN4="; + rev = "refs/tags/v${version}"; + hash = "sha256-OYh61/83yv+ycivylfdS8yFUIUAk8euAPvmfjPzldGs="; }; # On update, it can be useful to steal the changes from gentoo @@ -236,6 +234,8 @@ let # arbitrarily set to the current latest bazel version, overly careful TF_IGNORE_MAX_BAZEL_VERSION = true; + LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; + # Take as many libraries from the system as possible. Keep in sync with # list of valid syslibs in # https://github.com/tensorflow/tensorflow/blob/master/third_party/systemlibs/syslibs_configure.bzl @@ -303,11 +303,14 @@ let TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkit_joined},${cudnn},${nccl}"; GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin"; GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc"; - TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities; + TF_CUDA_COMPUTE_CAPABILITIES = builtins.concatStringsSep "," cudaFlags.cudaRealArchs; postPatch = '' # bazel 3.3 should work just as well as bazel 3.1 rm -f .bazelversion + patchShebangs . + '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") '' + cat ${./com_google_absl_fix_macos.patch} >> third_party/absl/com_google_absl_fix_mac_and_nvcc_build.patch '' + lib.optionalString (!withTensorboard) '' # Tensorboard pulls in a bunch of dependencies, some of which may # include security vulnerabilities. So we make it optional. @@ -367,15 +370,14 @@ let dontAddBazelOpts = true; fetchAttrs = { - # cudaSupport causes fetch of ncclArchive, resulting in different hashes - sha256 = if cudaSupport then - "sha256-KtVReqHL3zxE8TPrqIerSOt59Mgke/ftoFZKMzgX/u8=" - else - if stdenv.isDarwin then - # FIXME: this checksum is currently wrong, since the tensorflow dependency fetch is broken on darwin - "sha256-j2k9Q+k41nq5nP1VjjkkNjXRov1uAda4RCMDMAthjr0=" - else - "sha256-zH3xNFEU2JR0Ww8bpD4mCiorGtao0WVPP4vklVMgS4A="; + sha256 = { + x86_64-linux = if cudaSupport + then "sha256-/wB9EpaDPg3TrD9qggdA4vPgzvmaKc6dDnLjoYTJC5o=" + else "sha256-QgOaUaq0V5HG9BOv9nEw8OTSlzINNFvbnyP8Vx+r9Xw="; + aarch64-linux = "sha256-zjnRtTG1j9cZTbP0Xnk2o/zWTNsP8T0n4Ai8IiAT3PE="; + x86_64-darwin = "sha256-RBLox9rzBKcZMm4NwnT7vQ/EjapWQJkqxuQ0LIdaM1E="; + aarch64-darwin = "sha256-BRzh79lYvMHsUMk8BEYDLHTpnmeZ9+0lrDtj4XI1YY4="; + }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; buildAttrs = { @@ -417,6 +419,7 @@ let }; meta = with lib; { + changelog = "https://github.com/tensorflow/tensorflow/releases/tag/v${version}"; description = "Computation using data flow graphs for scalable machine learning"; homepage = "http://tensorflow.org"; license = licenses.asl20; @@ -436,11 +439,13 @@ in buildPythonPackage { src = bazel-build.python; # Adjust dependency requirements: + # - Drop tensorflow-io dependency until we get it to build # - Relax flatbuffers and gast version requirements # - The purpose of python3Packages.libclang is not clear at the moment and we don't have it packaged yet # - keras and tensorlow-io-gcs-filesystem will be considered as optional for now. postPatch = '' sed -i setup.py \ + -e '/tensorflow-io-gcs-filesystem/,+1d' \ -e "s/'flatbuffers[^']*',/'flatbuffers',/" \ -e "s/'gast[^']*',/'gast',/" \ -e "/'libclang[^']*',/d" \ @@ -474,7 +479,7 @@ in buildPythonPackage { packaging protobuf-python six - tensorflow-estimator + tensorflow-estimator-bin termcolor typing-extensions wrapt @@ -497,7 +502,7 @@ in buildPythonPackage { # TODO try to run them anyway # TODO better test (files in tensorflow/tools/ci_build/builds/*test) # TEST_PACKAGES in tensorflow/tools/pip_package/setup.py - checkInputs = [ + nativeCheckInputs = [ dill keras portpicker diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh index 2e24cde079da..0d6e8f014396 100755 --- a/pkgs/development/python-modules/tensorflow/prefetcher.sh +++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -version="2.9.1" +version="2.9.3" bucket="https://storage.googleapis.com/tensorflow" diff --git a/pkgs/development/python-modules/tensorly/default.nix b/pkgs/development/python-modules/tensorly/default.nix index 58260b62d0b4..0de6a2ff9eed 100644 --- a/pkgs/development/python-modules/tensorly/default.nix +++ b/pkgs/development/python-modules/tensorly/default.nix @@ -1,16 +1,16 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , numpy , pytestCheckHook , pythonOlder , scipy -, sparse }: buildPythonPackage rec { pname = "tensorly"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,29 +18,35 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "sha256-VcX3pCczZQUYZaD7xrrkOcj0QPJt28cYTwpZm5D/X3c="; + rev = "refs/tags/${version}"; + hash = "sha256-6iZvUgsoYf8fDGEuAODgfr4jCkiJwaJXlQUAsaOF9JU="; }; propagatedBuildInputs = [ numpy scipy - sparse ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - # nose is not actually required for anything - # (including testing with the minimal dependencies) - substituteInPlace setup.py \ - --replace ", 'nose'" "" - ''; - pythonImportsCheck = [ "tensorly" + "tensorly.base" + "tensorly.cp_tensor" + "tensorly.tucker_tensor" + "tensorly.tt_tensor" + "tensorly.tt_matrix" + "tensorly.parafac2_tensor" + "tensorly.tenalg" + "tensorly.decomposition" + "tensorly.regression" + "tensorly.metrics" + "tensorly.random" + "tensorly.datasets" + "tensorly.plugins" + "tensorly.contrib" ]; pytestFlagsArray = [ @@ -48,6 +54,8 @@ buildPythonPackage rec { ]; disabledTests = [ + # tries to download data: + "test_kinetic" # AssertionError: Partial_SVD took too long, maybe full_matrices set wrongly "test_svd_time" ]; @@ -57,5 +65,6 @@ buildPythonPackage rec { homepage = "https://tensorly.org/"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; + broken = stdenv.isLinux && stdenv.isAarch64; # test failures: test_TTOI and test_validate_tucker_rank }; } diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix index b1cfc0dc0461..19a7525d6bad 100644 --- a/pkgs/development/python-modules/termcolor/default.nix +++ b/pkgs/development/python-modules/termcolor/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "termcolor"; - version = "2.0.1"; + version = "2.1.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ayz3aekzZKJnbh3lanwM/yz1vQfzfpzICw3WMg6/44g="; + sha256 = "sha256-Z87iAJrcZEnGUPa8873u0AyLpTqM2lNiczxT4KOftws="; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ buildPythonPackage rec { "termcolor" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/termgraph/default.nix b/pkgs/development/python-modules/termgraph/default.nix index 24e76a5df788..30d37d9f87d8 100644 --- a/pkgs/development/python-modules/termgraph/default.nix +++ b/pkgs/development/python-modules/termgraph/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ colorama ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "termgraph" ]; diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index ac5481e13a8e..baa5e9b29095 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "terminado"; - version = "0.15.0"; + version = "0.17.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-q07u3M/MHmE0v+6GEGr5CFLGnWAohOo6Hoym1Ehum/4="; + sha256 = "sha256-bMu806T4olpewEmR85oLjbUt/NSH6g5XjZd+Z1I4AzM="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { "terminado" ]; - checkInputs = [ + nativeCheckInputs = [ pytest-timeout pytestCheckHook ]; diff --git a/pkgs/development/python-modules/termplotlib/default.nix b/pkgs/development/python-modules/termplotlib/default.nix index 89fd114ad739..5ed244959eb1 100644 --- a/pkgs/development/python-modules/termplotlib/default.nix +++ b/pkgs/development/python-modules/termplotlib/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ]; format = "pyproject"; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook exdown ]; diff --git a/pkgs/development/python-modules/tern/default.nix b/pkgs/development/python-modules/tern/default.nix index 635733149504..2e95c6acc2fc 100644 --- a/pkgs/development/python-modules/tern/default.nix +++ b/pkgs/development/python-modules/tern/default.nix @@ -1,28 +1,32 @@ { lib , buildPythonPackage -, fetchPypi -, pyyaml +, debian-inspector , docker , dockerfile-parse +, fetchPypi +, gitpython +, idna +, license-expression +, packageurl-python +, pbr +, prettytable +, pythonOlder +, pyyaml +, regex , requests , stevedore -, pbr -, debian-inspector -, license-expression -, regex -, GitPython -, prettytable -, idna -, packageurl-python }: buildPythonPackage rec { pname = "tern"; - version = "2.10.1"; + version = "2.11.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MMsq8/Obe3ogQSjiP8EebYseUJGcchMOczUrxE9jht4="; + hash = "sha256-MELPpz7UeOKSAW7hC2xDIog/bdLUflU00vvIbAePNBA="; }; preBuild = '' @@ -42,7 +46,7 @@ buildPythonPackage rec { stevedore debian-inspector regex - GitPython + gitpython prettytable idna packageurl-python @@ -58,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "A software composition analysis tool and Python library that generates a Software Bill of Materials for container images and Dockerfiles"; homepage = "https://github.com/tern-tools/tern"; + changelog = "https://github.com/tern-tools/tern/releases/tag/v${version}"; license = licenses.bsd2; maintainers = teams.determinatesystems.members; }; diff --git a/pkgs/development/python-modules/tesla-powerwall/default.nix b/pkgs/development/python-modules/tesla-powerwall/default.nix index d879d9302eb0..50fc9b2be6bb 100644 --- a/pkgs/development/python-modules/tesla-powerwall/default.nix +++ b/pkgs/development/python-modules/tesla-powerwall/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tesla-powerwall"; - version = "0.3.18"; + version = "0.3.19"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,15 +17,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jrester"; repo = "tesla_powerwall"; - rev = "v${version}"; - hash = "sha256-Z+axzTiKDgJqGhl2c6g7N1AbmXO46lbaHVOXhMstoCY="; + rev = "refs/tags/v${version}"; + hash = "sha256-ClrMgPAMBtDMfD6hCJIN1u4mp75QW+c3re28v3FreQg="; }; propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "API for Tesla Powerwall"; homepage = "https://github.com/jrester/tesla_powerwall"; + changelog = "https://github.com/jrester/tesla_powerwall/blob/v${version}/CHANGELOG"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/tesla-wall-connector/default.nix b/pkgs/development/python-modules/tesla-wall-connector/default.nix index 3f2c68b87d2e..9bce448f7d2a 100644 --- a/pkgs/development/python-modules/tesla-wall-connector/default.nix +++ b/pkgs/development/python-modules/tesla-wall-connector/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { backoff ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 5461306622ad..12fdd29bff01 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -10,12 +10,13 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, tenacity , wrapt }: buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.2.0"; + version = "3.7.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6xYMaKYKQkxbdm/vPOvKUxU8vnB+/cSiA6U7g9YPosQ="; + hash = "sha256-VOxdX6O6MG2F2ENiFI5+i7Yh+onHq755DsL7obm6Tcg="; }; nativeBuildInputs = [ @@ -37,10 +38,11 @@ buildPythonPackage rec { backoff beautifulsoup4 httpx + tenacity wrapt ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index c8e1d2e64f95..73b5a5727a38 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { "tesserocr" ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/test-tube/default.nix b/pkgs/development/python-modules/test-tube/default.nix index d480600b253d..b2044e2f0732 100644 --- a/pkgs/development/python-modules/test-tube/default.nix +++ b/pkgs/development/python-modules/test-tube/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "0w60xarmcw06gc4002sy7bjfykdz34gbgniswxkl0lw8a1v0xn2m"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/testbook/default.nix b/pkgs/development/python-modules/testbook/default.nix index 615fb96cd142..b78e453b3b44 100644 --- a/pkgs/development/python-modules/testbook/default.nix +++ b/pkgs/development/python-modules/testbook/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nbformat ]; - checkInputs = [ + nativeCheckInputs = [ ipykernel pandas pytestCheckHook diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 9f0de060d7d4..bfbb1f697c16 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "7.0.0"; + version = "7.0.4"; format = "setuptools"; # DO NOT CONTACT upstream. # https://github.com/simplistix/ is only concerned with internal CI process. @@ -25,10 +25,10 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-jsrFowh5NFFkBZTZykLOibmHcR4eTJMShVMh7CH2zLQ="; + hash = "sha256-xSaqiXjBAC8FnxUsSt43WMShJBjfqyspdUrmIwyvPQQ="; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook sybil @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of helpers and mock objects for unit tests and doc tests"; homepage = "https://github.com/Simplistix/testfixtures"; + changelog = "https://github.com/simplistix/testfixtures/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ siriobalmelli ]; }; diff --git a/pkgs/development/python-modules/testing-postgresql/default.nix b/pkgs/development/python-modules/testing-postgresql/default.nix index fd88ea03bf72..5c6eaa7ac2b4 100644 --- a/pkgs/development/python-modules/testing-postgresql/default.nix +++ b/pkgs/development/python-modules/testing-postgresql/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pg8000 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook psycopg2 sqlalchemy diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix index 4db5aa362f4a..1f8469ad2f79 100644 --- a/pkgs/development/python-modules/testpath/default.nix +++ b/pkgs/development/python-modules/testpath/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/testrepository/default.nix b/pkgs/development/python-modules/testrepository/default.nix index 45093a5f7cf7..908779a45d69 100644 --- a/pkgs/development/python-modules/testrepository/default.nix +++ b/pkgs/development/python-modules/testrepository/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m"; }; - checkInputs = [ testresources ]; + nativeCheckInputs = [ testresources ]; buildInputs = [ pbr ]; propagatedBuildInputs = [ fixtures subunit testtools ]; diff --git a/pkgs/development/python-modules/testresources/default.nix b/pkgs/development/python-modules/testresources/default.nix index 1aaddc3dec9c..8a7a6160e1af 100644 --- a/pkgs/development/python-modules/testresources/default.nix +++ b/pkgs/development/python-modules/testresources/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pbr ]; - checkInputs = [ fixtures testtools ]; + nativeCheckInputs = [ fixtures testtools ]; checkPhase = '' ${python.interpreter} -m testtools.run discover diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index 430d0374ef20..e0780dd768cb 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -5,7 +5,6 @@ , pbr , python-mimeparse , extras -, unittest2 , traceback2 , testscenarios }: @@ -25,7 +24,7 @@ buildPythonPackage rec { # testscenarios has a circular dependency on testtools doCheck = false; - checkInputs = [ testscenarios ]; + nativeCheckInputs = [ testscenarios ]; pythonRemoveDeps = [ "fixtures" ]; diff --git a/pkgs/development/python-modules/text-unidecode/default.nix b/pkgs/development/python-modules/text-unidecode/default.nix index 5f5a0bf85127..30f5b73f5fd3 100644 --- a/pkgs/development/python-modules/text-unidecode/default.nix +++ b/pkgs/development/python-modules/text-unidecode/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 2eae44aeeb27..2986f3428eb1 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/textfsm/default.nix b/pkgs/development/python-modules/textfsm/default.nix index e1bfdb5909df..409cffd33862 100644 --- a/pkgs/development/python-modules/textfsm/default.nix +++ b/pkgs/development/python-modules/textfsm/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { future ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/textile/default.nix b/pkgs/development/python-modules/textile/default.nix index a8acf346cd60..adae00ef3ec5 100644 --- a/pkgs/development/python-modules/textile/default.nix +++ b/pkgs/development/python-modules/textile/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { regex ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index b104bd845962..9b492747bf22 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "texttable"; - version = "1.6.4"; + version = "1.6.7"; src = fetchPypi { inherit pname version; - sha256 = "42ee7b9e15f7b225747c3fa08f43c5d6c83bc899f80ff9bae9319334824076e9"; + sha256 = "sha256-KQNI+2f3dGkxvN/VWsdYTs1OWwhGqxZDM/B5SxIXYPI="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 5806b28e3490..5decea07774d 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -2,15 +2,24 @@ , buildPythonPackage , fetchFromGitHub , poetry-core +, importlib-metadata +, nanoid , rich , typing-extensions +, aiohttp +, click +, jinja2 +, msgpack +, pytest-aiohttp , pytestCheckHook , pythonOlder +, syrupy +, time-machine }: buildPythonPackage rec { pname = "textual"; - version = "0.1.18"; + version = "0.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,29 +27,38 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Textualize"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-XVmbt8r5HL8r64ISdJozmM+9HuyvqbpdejWICzFnfiw="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-DPE8brf8y6DJDPfDNUBk09ngthSWN59UYw6yPfI4+Qw="; }; nativeBuildInputs = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'importlib-metadata = "^4.11.3"' 'importlib-metadata = "*"' + ''; + propagatedBuildInputs = [ + importlib-metadata + nanoid rich - ] ++ lib.optionals (pythonOlder "3.9") [ + ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ + aiohttp + click + jinja2 + msgpack + pytest-aiohttp pytestCheckHook + syrupy + time-machine ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'rich = "^12.3.0"' 'rich = "*"' - ''; - pythonImportsCheck = [ "textual" ]; @@ -49,6 +67,6 @@ buildPythonPackage rec { description = "TUI framework for Python inspired by modern web development"; homepage = "https://github.com/Textualize/textual"; license = licenses.mit; - maintainers = with maintainers; [ jyooru ]; + maintainers = with maintainers; [ joelkoen ]; }; } diff --git a/pkgs/development/python-modules/textwrap3/default.nix b/pkgs/development/python-modules/textwrap3/default.nix index 995a62230b22..2a3fa04268f7 100644 --- a/pkgs/development/python-modules/textwrap3/default.nix +++ b/pkgs/development/python-modules/textwrap3/default.nix @@ -1,10 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, tox -, pytest -, coverage -, pytest-cov +, pytestCheckHook }: buildPythonPackage rec { @@ -17,17 +14,10 @@ buildPythonPackage rec { sha256 = "5008eeebdb236f6303dcd68f18b856d355f6197511d952ba74bc75e40e0c3414"; }; - checkInputs = [ - tox - pytest - coverage - pytest-cov + nativeCheckInputs = [ + pytestCheckHook ]; - checkPhase = '' - pytest - ''; - meta = with lib; { description = "Textwrap from Python 3.6 backport plus a few tweaks"; homepage = "https://github.com/jonathaneunice/textwrap3"; diff --git a/pkgs/development/python-modules/textx/tests.nix b/pkgs/development/python-modules/textx/tests.nix index 021224e9f35d..af910a16119f 100644 --- a/pkgs/development/python-modules/textx/tests.nix +++ b/pkgs/development/python-modules/textx/tests.nix @@ -25,7 +25,7 @@ buildPythonPackage { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ click gprof2dot html5lib diff --git a/pkgs/development/python-modules/tgcrypto/default.nix b/pkgs/development/python-modules/tgcrypto/default.nix index 9152bb4b2ac6..a9c9dd96c677 100644 --- a/pkgs/development/python-modules/tgcrypto/default.nix +++ b/pkgs/development/python-modules/tgcrypto/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/thefuzz/default.nix b/pkgs/development/python-modules/thefuzz/default.nix new file mode 100644 index 000000000000..2748381f7dc2 --- /dev/null +++ b/pkgs/development/python-modules/thefuzz/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytestCheckHook +, hypothesis +, levenshtein +}: + +buildPythonPackage rec { + pname = "thefuzz"; + version = "0.19.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-b3Em2y8silQhKwXjp0DkX0KRxJfXXSB1Fyj2Nbt0qj0="; + }; + + propagatedBuildInputs = [ levenshtein ]; + + # Skip linting + postPatch = '' + substituteInPlace test_thefuzz.py --replace "import pycodestyle" "" + ''; + + pythonImportsCheck = [ + "thefuzz" + ]; + + nativeCheckInputs = [ + hypothesis + pytestCheckHook + ]; + + disabledTests = [ + # Skip linting + "test_pep8_conformance" + ]; + + meta = with lib; { + description = "Fuzzy string matching for Python"; + homepage = "https://github.com/seatgeek/thefuzz"; + changelog = "https://github.com/seatgeek/thefuzz/blob/${version}/CHANGES.rst"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ sumnerevans ]; + }; +} diff --git a/pkgs/development/python-modules/thermobeacon-ble/default.nix b/pkgs/development/python-modules/thermobeacon-ble/default.nix index b7f29f8ca8b9..16fed5c05598 100644 --- a/pkgs/development/python-modules/thermobeacon-ble/default.nix +++ b/pkgs/development/python-modules/thermobeacon-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "thermobeacon-ble"; - version = "0.4.0"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-t4l5K52Shaw/J4thcP0ken/u77ZX7BsMEEA6ZUpcRKY="; + hash = "sha256-WjABxtZ5td25K9QCbLHisT+DMd2Cv/nljwYwxY2br3A="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/thermopro-ble/default.nix b/pkgs/development/python-modules/thermopro-ble/default.nix index 8a266607912a..ee2a4fb2e757 100644 --- a/pkgs/development/python-modules/thermopro-ble/default.nix +++ b/pkgs/development/python-modules/thermopro-ble/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index 7a4f0e5ee855..eeea8f5bd4a2 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.10.6"; + version = "3.10.7"; pname = "thespian"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c987a8042ba2303e22371f38a67354593dd81c4c11ba1eba7f6657409288d5ed"; + sha256 = "sha256-HcHvZtMpBtNXq9Yp2ayeHTuIf7gpBUb6xZqjaECbfgo="; }; # Do not run the test suite: it takes a long time and uses diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 334411fe26c9..e415bc17a7b3 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -5,13 +5,11 @@ , buildPythonPackage , catalogue , confection -, contextvars , CoreFoundation , CoreGraphics , CoreVideo , cymem , cython -, dataclasses , fetchPypi , hypothesis , mock @@ -31,14 +29,14 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.1.1"; + version = "8.1.7"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-m5AoKYTzy6rJjgNn3xsa+eSDYjG8Bj361yQqnQ3VK80="; + hash = "sha256-Dwj20fxQ4ovxiBTKKxyAfNTVmpMNcTRZpnXghsR3mvk="; }; buildInputs = [ @@ -65,12 +63,9 @@ buildPythonPackage rec { wasabi ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions - ] ++ lib.optionals (pythonOlder "3.7") [ - contextvars - dataclasses ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis mock pytestCheckHook diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index 5316c90c5d15..b2d85107e74f 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "sha256-/qt7cgFbvpc1BLZC7a4S0RToqSggKXAqF1Xr6xOqzw8="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook numpy scipy diff --git a/pkgs/development/python-modules/threat9-test-bed/default.nix b/pkgs/development/python-modules/threat9-test-bed/default.nix index 35d5f1389fd1..4eab16c304e3 100644 --- a/pkgs/development/python-modules/threat9-test-bed/default.nix +++ b/pkgs/development/python-modules/threat9-test-bed/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/thriftpy2/default.nix b/pkgs/development/python-modules/thriftpy2/default.nix index 53b1219bc485..6d8c9c9f83d2 100644 --- a/pkgs/development/python-modules/thriftpy2/default.nix +++ b/pkgs/development/python-modules/thriftpy2/default.nix @@ -2,15 +2,16 @@ , buildPythonPackage , cython , fetchFromGitHub -, pythonOlder , ply +, pythonOlder , six , tornado }: buildPythonPackage rec { pname = "thriftpy2"; - version = "0.4.15"; + version = "0.4.16"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "Thriftpy"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-1X1roRFQgLJ+rrRuRlHMVtUdj2D68WGdxvid/0chsvI="; + hash = "sha256-o+h38NREnh14M23gyF2X2UdW7/spmHFo0rqvkKnmSRQ="; }; nativeBuildInputs = [ @@ -34,11 +35,14 @@ buildPythonPackage rec { # Not all needed files seems to be present doCheck = false; - pythonImportsCheck = [ "thriftpy2" ]; + pythonImportsCheck = [ + "thriftpy2" + ]; meta = with lib; { description = "Python module for Apache Thrift"; homepage = "https://github.com/Thriftpy/thriftpy2"; + changelog = "https://github.com/Thriftpy/thriftpy2/blob/v${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/tidalapi/default.nix b/pkgs/development/python-modules/tidalapi/default.nix new file mode 100644 index 000000000000..405b7cea1198 --- /dev/null +++ b/pkgs/development/python-modules/tidalapi/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, python-dateutil +, requests +}: + +buildPythonPackage rec { + pname = "tidalapi"; + version = "0.7.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LdlTBkCOb7tXiupsNJ5lbk38syKXeADvi2IdGpW/dk8="; + }; + + propagatedBuildInputs = [ + requests + python-dateutil + ]; + + doCheck = false; # tests require internet access + + pythonImportsCheck = [ + "tidalapi" + ]; + + meta = with lib; { + changelog = "https://github.com/tamland/python-tidal/releases/tag/v${version}"; + description = "Unofficial Python API for TIDAL music streaming service"; + homepage = "https://github.com/tamland/python-tidal"; + license = licenses.gpl3; + maintainers = [ maintainers.rodrgz ]; + }; +} diff --git a/pkgs/development/python-modules/tidyexc/default.nix b/pkgs/development/python-modules/tidyexc/default.nix new file mode 100644 index 000000000000..b4f7ed0ef582 --- /dev/null +++ b/pkgs/development/python-modules/tidyexc/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "tidyexc"; + version = "0.10.0"; + format = "flit"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gl1jmihafawg7hvnn4xb20vd2x5qpvca0m1wr2gk0m2jj42yiq6"; + }; + + pythonImportsCheck = [ + "tidyexc" + ]; + + meta = with lib; { + description = "Raise rich, helpful exceptions"; + homepage = "https://github.com/kalekundert/tidyexc"; + changelog = "https://github.com/kalekundert/tidyexc/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 8e4bacad9aac..29dcb22b90ba 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -12,21 +12,21 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2022.8.12"; + version = "2022.10.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PnTg/UiDhHfrz0Dgm3eAvQle5ZILIjj0heLGhGOj3LQ="; + hash = "sha256-ULYbqUO4ZtGRKVvDigAZHJ/asj7OBjVEx/GiZOP2qo4="; }; propagatedBuildInputs = [ numpy ]; - checkInputs = [ + nativeCheckInputs = [ dask fsspec lxml diff --git a/pkgs/development/python-modules/tika/default.nix b/pkgs/development/python-modules/tika/default.nix index 375560ad9817..f71772749c13 100644 --- a/pkgs/development/python-modules/tika/default.nix +++ b/pkgs/development/python-modules/tika/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "tika"; - version = "1.24"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "wsUPQFYi90UxhBEE+ehcF1Ea7eEd6OU4XqsaKaMfGRs="; + sha256 = "sha256-VmcOuBKUTrJe1z8bOwdapB56E1t0skCCLyi4GeWzc9o="; }; propagatedBuildInputs = [ pyyaml requests ]; diff --git a/pkgs/development/python-modules/tikzplotlib/default.nix b/pkgs/development/python-modules/tikzplotlib/default.nix index ebf58dd12e9c..8a38bb9a7dc6 100644 --- a/pkgs/development/python-modules/tikzplotlib/default.nix +++ b/pkgs/development/python-modules/tikzplotlib/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pandas ]; diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index 99020f8d7ac1..7e05668b23da 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.16.3"; + version = "0.19.0"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; rev = "refs/tags/${version}"; - sha256 = "sha256-Tg2MHlLwwcpXoHoflaNWXmXr6s7dg3IJou4PZBahRzc="; + sha256 = "sha256-eha0I/SJmBGFdvJrNUBg/sx54UXdbjhEbyvI40Vngm4="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { wheel # No idea why but it is listed ]; - checkInputs = [ + nativeCheckInputs = [ psutil # optional pandas diff --git a/pkgs/development/python-modules/tilequant/default.nix b/pkgs/development/python-modules/tilequant/default.nix index 90caab8ebef8..a72802e2c7b3 100644 --- a/pkgs/development/python-modules/tilequant/default.nix +++ b/pkgs/development/python-modules/tilequant/default.nix @@ -1,4 +1,13 @@ -{ lib, buildPythonPackage, fetchFromGitHub, GitPython, click, ordered-set, pillow, sortedcollections }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, gitpython +, click +, ordered-set +, pythonOlder +, pillow +, sortedcollections +}: let aikku93-tilequant = fetchFromGitHub { @@ -11,6 +20,9 @@ in buildPythonPackage rec { pname = "tilequant"; version = "0.4.0.post0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SkyTemple"; @@ -23,15 +35,26 @@ buildPythonPackage rec { cp -R --no-preserve=mode ${aikku93-tilequant} __aikku93_tilequant ''; - buildInputs = [ GitPython ]; - propagatedBuildInputs = [ click ordered-set pillow sortedcollections ]; + buildInputs = [ + gitpython + ]; + + propagatedBuildInputs = [ + click + ordered-set + pillow + sortedcollections + ]; doCheck = false; # there are no tests - pythonImportsCheck = [ "skytemple_tilequant" ]; + + pythonImportsCheck = [ + "skytemple_tilequant" + ]; meta = with lib; { - homepage = "https://github.com/SkyTemple/tilequant"; description = "Tool for quantizing image colors using tile-based palette restrictions"; + homepage = "https://github.com/SkyTemple/tilequant"; license = licenses.gpl3Plus; maintainers = with maintainers; [ xfix ]; }; diff --git a/pkgs/development/python-modules/tiler/default.nix b/pkgs/development/python-modules/tiler/default.nix index de4517ff3278..7f26871b29b5 100644 --- a/pkgs/development/python-modules/tiler/default.nix +++ b/pkgs/development/python-modules/tiler/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/tilt-ble/default.nix b/pkgs/development/python-modules/tilt-ble/default.nix index a663ba8429ac..c4164ce07003 100644 --- a/pkgs/development/python-modules/tilt-ble/default.nix +++ b/pkgs/development/python-modules/tilt-ble/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index 44335c7248b9..1c410042ac5b 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { backports-zoneinfo ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/timeago/default.nix b/pkgs/development/python-modules/timeago/default.nix index 0c2a688f674e..fa89cff6ebe8 100644 --- a/pkgs/development/python-modules/timeago/default.nix +++ b/pkgs/development/python-modules/timeago/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "03vm7c02l4g2d1x33w382i1psk8i3an7xchk69yinha33fjj1cag"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index c7775aa435d6..e85786b37873 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "timetagger"; - version = "22.10.1"; + version = "22.12.1"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-+7PKYVZfX+zDBKpaFwEVftyp4yPL90X9HSQDvoNNFuA="; + sha256 = "sha256-yoDILEE/mUWkGPWp2xTKlkpmw1gZctaQmBsed8U7bHc="; }; propagatedBuildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests ]; diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index f5dc5f7c346f..eceeb7d929a4 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -1,17 +1,19 @@ { lib , buildPythonPackage , fetchFromGitHub +, cffi , h3 , numba , numpy , poetry-core , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "timezonefinder"; - version = "6.0.2"; + version = "6.1.9"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,20 +21,23 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jannikmi"; repo = pname; - rev = version; - hash = "sha256-jquaA/+alSRUaa2wXQ6YoDR4EY9OlZCAdcxS5TR0CAU="; + rev = "refs/tags/${version}"; + hash = "sha256-A5s1npvgJGp6SvIqoXGRmFN3iE0pqMUl1ZTi07ix5b0="; }; nativeBuildInputs = [ + cffi poetry-core + setuptools ]; propagatedBuildInputs = [ + cffi h3 numpy ]; - checkInputs = [ + nativeCheckInputs = [ numba pytestCheckHook ]; @@ -52,6 +57,7 @@ buildPythonPackage rec { ''; meta = with lib; { + changelog = "https://github.com/jannikmi/timezonefinder/blob/${version}/CHANGELOG.rst"; description = "Module for finding the timezone of any point on earth (coordinates) offline"; homepage = "https://github.com/MrMinimal64/timezonefinder"; license = licenses.mit; diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix new file mode 100644 index 000000000000..5f2d0135cc8f --- /dev/null +++ b/pkgs/development/python-modules/timm/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, expecttest +, pytest-timeout +, huggingface-hub +, pyyaml +, torch +, torchvision +}: + +buildPythonPackage rec { + pname = "timm"; + version = "0.6.12"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "rwightman"; + repo = "pytorch-image-models"; + rev = "refs/tags/v${version}"; + hash = "sha256-RNjCcCnNhtr5a+29Bx+k427a03MSooqvnuiDQ8cT8FA="; + }; + + propagatedBuildInputs = [ + huggingface-hub + pyyaml + torch + torchvision + ]; + + nativeCheckInputs = [ expecttest pytestCheckHook pytest-timeout ]; + pytestFlagsArray = [ "tests" ]; + # takes too long and also tries to download models: + disabledTestPaths = [ "tests/test_models.py" ]; + + pythonImportsCheck = [ + "timm" + "timm.data" + ]; + + meta = with lib; { + description = "PyTorch image models, scripts, and pretrained weights"; + homepage = "https://huggingface.co/docs/timm/index"; + changelog = "https://github.com/rwightman/pytorch-image-models/blob/v${version}/README.md#whats-new"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/tinycss/default.nix b/pkgs/development/python-modules/tinycss/default.nix index 42250b058d58..5dc443a0e47a 100644 --- a/pkgs/development/python-modules/tinycss/default.nix +++ b/pkgs/development/python-modules/tinycss/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ cssutils ]; nativeBuildInputs = [ cython diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 8d6d457d31a6..937c47505340 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ webencodings ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Low-level CSS parser for Python"; diff --git a/pkgs/development/python-modules/tinydb/default.nix b/pkgs/development/python-modules/tinydb/default.nix index ae08cceab1ee..87d3502f6e03 100644 --- a/pkgs/development/python-modules/tinydb/default.nix +++ b/pkgs/development/python-modules/tinydb/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "tinydb"; - version = "4.7.0"; + version = "4.7.1"; disabled = pythonOlder "3.5"; format = "pyproject"; src = fetchFromGitHub { owner = "msiemens"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-cAIo/qdIOIpPt9vPan5oJfKtH2Gmrm03aLuAHpfUfLY="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-nKsTMakCOBVHDDp8AX/xDkvHpCMBoIb0pa24F4VX/14="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { --replace "--cov-append --cov-report term --cov tinydb" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pycodestyle pyyaml diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index 33fe952ad2a3..0614f375a3a9 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { regex ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index d64acf2db5f2..2166be051172 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -4,34 +4,45 @@ , faker , fetchPypi , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "tld"; - version = "0.12.6"; + version = "0.12.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "69fed19d26bb3f715366fb4af66fdeace896c55c052b00e8aaba3a7b63f3e7f0"; + hash = "sha256-tvdynhnODrx3ugpltw1iE665UsAf9gXhKZquX7diHF4="; }; + nativeCheckInputs = [ + pytestCheckHook + ]; + checkInputs = [ factory_boy faker - pytestCheckHook ]; - # these tests require network access, but disabledTestPaths doesn't work. - # the file needs to be `import`ed by another python test file, so it + # These tests require network access, but disabledTestPaths doesn't work. + # the file needs to be `import`ed by another Python test file, so it # can't simply be removed. preCheck = '' echo > src/tld/tests/test_commands.py ''; - pythonImportsCheck = [ "tld" ]; + + pythonImportsCheck = [ + "tld" + ]; meta = with lib; { - homepage = "https://github.com/barseghyanartur/tld"; description = "Extracts the top level domain (TLD) from the URL given"; + homepage = "https://github.com/barseghyanartur/tld"; + changelog = "https://github.com/barseghyanartur/tld/blob/${version}/CHANGELOG.rst"; # https://github.com/barseghyanartur/tld/blob/master/README.rst#license # MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later license = with licenses; [ lgpl21Plus mpl11 gpl2Only ]; diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index 1aac6f45575c..c87cb7a799af 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { requests-file ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook responses diff --git a/pkgs/development/python-modules/tls-parser/default.nix b/pkgs/development/python-modules/tls-parser/default.nix index a886e116e458..1c0669b72bea 100644 --- a/pkgs/development/python-modules/tls-parser/default.nix +++ b/pkgs/development/python-modules/tls-parser/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-A1lYRe1sHDoOFdF20DP+xRMcPBWzokIXFphIpaBmwBc="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/todoist-api-python/default.nix b/pkgs/development/python-modules/todoist-api-python/default.nix new file mode 100644 index 000000000000..fca8d0acad7d --- /dev/null +++ b/pkgs/development/python-modules/todoist-api-python/default.nix @@ -0,0 +1,63 @@ +{ lib +, attrs +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, requests +, responses +}: + +buildPythonPackage rec { + pname = "todoist-api-python"; + version = "2.0.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Doist"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-CKOsUb35+7WjSNf4Xo0SK5loIqWJbEnHdmhw9QXWFAI="; + }; + + patches = [ + # Switch to poetry-core, https://github.com/Doist/todoist-api-python/pull/81 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/Doist/todoist-api-python/commit/42288e066d2f0c69611ab50cb57ca98b8c6bd1ca.patch"; + sha256 = "sha256-yq+VVvjPYywvUn+ydyWVQPkiYPYWe9U6w38G54L2lkE="; + }) + ]; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + attrs + requests + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ + "todoist_api_python" + ]; + + meta = with lib; { + description = "Library for the Todoist REST API"; + homepage = "https://github.com/Doist/todoist-api-python"; + changelog = "https://github.com/Doist/todoist-api-python/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix index d4797bdfad35..611680d9734d 100644 --- a/pkgs/development/python-modules/todoist/default.nix +++ b/pkgs/development/python-modules/todoist/default.nix @@ -1,21 +1,33 @@ -{ lib, fetchPypi, buildPythonPackage -, requests, pythonOlder, typing +{ lib +, fetchPypi +, buildPythonPackage +, requests +, pythonOlder }: buildPythonPackage rec { pname = "todoist-python"; version = "8.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AFRKA5VRD6jyiguZYP7WOQOWqHq1GjUzbuez0f1070U="; + hash = "sha256-AFRKA5VRD6jyiguZYP7WOQOWqHq1GjUzbuez0f1070U="; }; - propagatedBuildInputs = [ requests ] ++ lib.optional (pythonOlder "3.5") typing; + propagatedBuildInputs = [ + requests + ]; + + pythonImportsCheck = [ + "todoist" + ]; meta = with lib; { description = "The official Todoist Python API library"; - homepage = "https://todoist-python.readthedocs.io/en/latest/"; + homepage = "https://todoist-python.readthedocs.io/"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index af6132cd2771..a72e329bc9cb 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { validate-email ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock faker @@ -57,7 +57,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "notify-py==0.3.1" "notify-py>=0.3.1" \ + --replace "notify-py==0.3.3" "notify-py>=0.3.3" \ --replace "click==8.0.3" "click>=8.0.3" \ --replace "pbr==5.8.0" "pbr>=5.8.0" \ --replace "inquirer==2.9.1" "inquirer>=2.9.1" diff --git a/pkgs/development/python-modules/token-bucket/default.nix b/pkgs/development/python-modules/token-bucket/default.nix index 072b084db6dd..d11db6d03131 100644 --- a/pkgs/development/python-modules/token-bucket/default.nix +++ b/pkgs/development/python-modules/token-bucket/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pytest-runner ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/tokenize-rt/default.nix b/pkgs/development/python-modules/tokenize-rt/default.nix index 556c35c30705..6f5d1f08ade9 100644 --- a/pkgs/development/python-modules/tokenize-rt/default.nix +++ b/pkgs/development/python-modules/tokenize-rt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "sha256-YNt4YwkuA3DVq4EjJaIES9V3A6ENa3k6/qVKisjA5Pc="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "A wrapper around the stdlib `tokenize` which roundtrips"; diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 2ff5c452a173..a3c02f70ed1f 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -97,7 +97,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ datasets pytestCheckHook requests diff --git a/pkgs/development/python-modules/tololib/default.nix b/pkgs/development/python-modules/tololib/default.nix index 63720359dabd..6d2ad4815b5a 100644 --- a/pkgs/development/python-modules/tololib/default.nix +++ b/pkgs/development/python-modules/tololib/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tololib"; - version = "0.1.0b3"; + version = "0.1.0b4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "MatthiasLohr"; repo = pname; rev = "v${version}"; - sha256 = "qkdMy6/ZuBksbBTbDhPyCPWMjubQODjdMsqHTJ7QvQI="; + hash = "sha256-2OQaJR70bx8qWs1IPErF+B3X1iRvHW74axTqtdvum3U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Library for Controlling TOLO Sauna/Steam Bath Devices"; homepage = "https://gitlab.com/MatthiasLohr/tololib"; + changelog = "https://gitlab.com/MatthiasLohr/tololib/-/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/toml-adapt/default.nix b/pkgs/development/python-modules/toml-adapt/default.nix index 51497c3fbc0d..8387fb386b71 100644 --- a/pkgs/development/python-modules/toml-adapt/default.nix +++ b/pkgs/development/python-modules/toml-adapt/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix index 24a3b2f51f06..c196d1e487f5 100644 --- a/pkgs/development/python-modules/tomli/default.nix +++ b/pkgs/development/python-modules/tomli/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "tomli" ]; diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 6bd461db75a2..861560c2aee0 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -10,18 +10,18 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.11.4"; + version = "0.11.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MjWpAQ+uVDI+cnw6wG+3IHUv5mNbNCbjedrsYPvUSoM="; + hash = "sha256-cblS5XIWiJN/sCz501TbzweFBmFJ0oVeRFMevdK2XXM="; }; propagatedBuildInputs = lib.optionals isPy27 [ enum34 functools32 ] ++ lib.optional isPy27 typing; - checkInputs = [ + nativeCheckInputs = [ pyaml pytestCheckHook ]; @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/sdispater/tomlkit"; + changelog = "https://github.com/sdispater/tomlkit/blob/${version}/CHANGELOG.md"; description = "Style-preserving TOML library for Python"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index 6ca48fd1ffb2..d1961b970d47 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-iMVwhhxEDuPy9gN8RlRhMij/QMk6bCXg66cNFygsYZQ="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/pytoolz/toolz"; diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index a9722b053bfb..2559399b25c5 100644 --- a/pkgs/development/python-modules/toposort/default.nix +++ b/pkgs/development/python-modules/toposort/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "toposort"; - version = "1.7"; + version = "1.9"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3cIYLEKRKkQFEb1/9dPmocq8Osy8Z0oyWMjEHL+7ISU="; + sha256 = "sha256-9Bo0SQ1Ek0tTOnva/5ee6KRyA/0tinRtuD8tWrEkWLk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/torch-tb-profiler/default.nix b/pkgs/development/python-modules/torch-tb-profiler/default.nix index 41ff63a21fad..108acfb0d355 100644 --- a/pkgs/development/python-modules/torch-tb-profiler/default.nix +++ b/pkgs/development/python-modules/torch-tb-profiler/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pandas tensorboard ]; - checkInputs = [ pytestCheckHook torch torchvision ]; + nativeCheckInputs = [ pytestCheckHook torch torchvision ]; disabledTests = [ # Tests that attempt to access the filesystem in naughty ways. diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index ac83f1015726..e9018c123d46 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -20,7 +20,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "1.12.1"; + version = "1.13.1"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix index 2169e1873b0b..2802ef080eac 100644 --- a/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/binary-hashes.nix @@ -6,61 +6,62 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "1.12.1" = { + "1.13.1" = { x86_64-linux-37 = { - name = "torch-1.12.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torch-1.12.1%2Bcu116-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-/JtHhuxUvmfqqLDHyZmeL0riuJocGOQd4VFaGQRAxpE="; + name = "torch-1.13.1-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torch-1.13.1%2Bcu116-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-INfG4AgEtr6m9pt3JAxPzfJEzOL2sf9zvv98DfZVPZ0="; }; x86_64-linux-38 = { - name = "torch-1.12.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torch-1.12.1%2Bcu116-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-3aMSkBIgiVCHzIPTZlRko9wXHQRGDGHDGvRj77+1SJY="; + name = "torch-1.13.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torch-1.13.1%2Bcu116-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-kzj6oKWg62JeF+OXKfBvsKV0CY16uI2Fa72ky3agtmU="; }; x86_64-linux-39 = { - name = "torch-1.12.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torch-1.12.1%2Bcu116-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-dyVCDavr/K9EmE7c4yg+6pH5jw99WHS8aMehZL2BJuM="; + name = "torch-1.13.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torch-1.13.1%2Bcu116-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-20V6gi1zYBO2/+UJBTABvJGL3Xj+aJZ7YF9TmEqa+sU="; }; x86_64-linux-310 = { - name = "torch-1.12.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torch-1.12.1%2Bcu116-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-trwxJEqigYkp+7MMSDwiHfRx6dhW6AXFof9ysTGunns="; + name = "torch-1.13.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torch-1.13.1%2Bcu116-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-UdWHDN8FtiCLHHOf4LpRG5d+yjf5UHgpZ1WWrMEbbKQ="; }; x86_64-darwin-37 = { - name = "torch-1.12.1-cp37-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp37-none-macosx_10_9_x86_64.whl"; - hash = "sha256-ijSi+7qgfJIeGyA/WdPW4A7TefKzhERXc70U4yiltsg="; + name = "torch-1.13.1-cp37-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp37-none-macosx_10_9_x86_64.whl"; + hash = "sha256-DZuAYQSM+3jmdbnS6oUDv+MNtD1YNZmuhiaxJjoME4A="; }; x86_64-darwin-38 = { - name = "torch-1.12.1-cp38-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp38-none-macosx_10_9_x86_64.whl"; - hash = "sha256-qDILqa2H6AylpqAW5GraTRugxUYm4TXZmyEppFQcUJ0="; + name = "torch-1.13.1-cp38-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp38-none-macosx_10_9_x86_64.whl"; + hash = "sha256-M+Z+6lJuC7uRUSY+ZUF6nvLY+lPL5ijocxAGDJ3PoxI="; }; x86_64-darwin-39 = { - name = "torch-1.12.1-cp39-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp39-none-macosx_10_9_x86_64.whl"; - hash = "sha256-v+woQ9qmVPBP2iO6gjrwPntvdlCoc823JnUtDjcY2to="; + name = "torch-1.13.1-cp39-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp39-none-macosx_10_9_x86_64.whl"; + hash = "sha256-aTB5HvqHV8tpdK9z1Jlra1DFkogqMkuPsFicapui3a8="; }; x86_64-darwin-310 = { - name = "torch-1.12.1-cp310-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp310-none-macosx_10_9_x86_64.whl"; - hash = "sha256-l2w/mXzqOO6RoN08OkIyJ4VBR0jRdh75JreJ36l8YTQ="; + name = "torch-1.13.1-cp310-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp310-none-macosx_10_9_x86_64.whl"; + hash = "sha256-OTpic8gy4EdYEGP7dDNf9QtMVmIXAZzGrOMYzXnrBWY="; }; aarch64-darwin-38 = { - name = "torch-1.12.1-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-A+McN3Edss0gHgLeWCbeh1Up5FpVYx0xeq3OLx7UWqg="; + name = "torch-1.13.1-cp38-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp38-none-macosx_11_0_arm64.whl"; + hash = "sha256-7usgTTD9QK9qLYCHm0an77489Dzb64g43U89EmzJCys="; }; aarch64-darwin-39 = { - name = "torch-1.12.1-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-af4srnw5zK3WWhI3k9MODbiB8cGSeUVRnFwXMjExQ34="; + name = "torch-1.13.1-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-4N+QKnx91seVaYUy7llwzomGcmJWNdiF6t6ZduWgSUk="; }; aarch64-darwin-310 = { - name = "torch-1.12.1-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-aBBORxWlXEuymoXGqNV9gg4HV9o2O+G6aA+ozFvhe1I="; + name = "torch-1.13.1-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-ASKAaxEblJ0h+hpfl2TR/S/MSkfLf4/5FCBP1Px1LtU="; }; + }; } diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 2c619f46ac37..c64f36c8df32 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -3,7 +3,6 @@ mklDnnSupport ? true, useSystemNccl ? true, MPISupport ? false, mpi, buildDocs ? false, - cudaArchList ? null, # Native build inputs cmake, util-linux, linkFarm, symlinkJoin, which, pybind11, removeReferencesTo, @@ -30,10 +29,19 @@ # dependencies for torch.utils.tensorboard pillow, six, future, tensorboard, protobuf, - isPy3k, pythonOlder }: + isPy3k, pythonOlder, + + # ROCm dependencies + rocmSupport ? false, + gpuTargets ? [ ], + openmp, rocm-core, hip, rccl, miopen, miopengemm, rocrand, rocblas, + rocfft, rocsparse, hipsparse, rocthrust, rocprim, hipcub, roctracer, + rocsolver, hipfft, hipsolver, hipblas, rocminfo, rocm-thunk, rocm-comgr, + rocm-device-libs, rocm-runtime, rocm-opencl-runtime, hipify +}: let - inherit (cudaPackages) cudatoolkit cudnn nccl; + inherit (cudaPackages) cudatoolkit cudaFlags cudnn nccl; in # assert that everything needed for cuda is present and that the correct cuda versions are used @@ -52,64 +60,6 @@ let paths = [ cudatoolkit.out cudatoolkit.lib nccl.dev nccl.out ]; }; - # Give an explicit list of supported architectures for the build, See: - # - pytorch bug report: https://github.com/pytorch/pytorch/issues/23573 - # - pytorch-1.2.0 build on nixpks: https://github.com/NixOS/nixpkgs/pull/65041 - # - # This list was selected by omitting the TORCH_CUDA_ARCH_LIST parameter, - # observing the fallback option (which selected all architectures known - # from cudatoolkit_10_0, pytorch-1.2, and python-3.6), and doing a binary - # searching to find offending architectures. - # - # NOTE: Because of sandboxing, this derivation can't auto-detect the hardware's - # cuda architecture, so there is also now a problem around new architectures - # not being supported until explicitly added to this derivation. - # - # FIXME: CMake is throwing the following warning on python-1.2: - # - # ``` - # CMake Warning at cmake/public/utils.cmake:172 (message): - # In the future we will require one to explicitly pass TORCH_CUDA_ARCH_LIST - # to cmake instead of implicitly setting it as an env variable. This will - # become a FATAL_ERROR in future version of pytorch. - # ``` - # If this is causing problems for your build, this derivation may have to strip - # away the standard `buildPythonPackage` and use the - # [*Adjust Build Options*](https://github.com/pytorch/pytorch/tree/v1.2.0#adjust-build-options-optional) - # instructions. This will also add more flexibility around configurations - # (allowing FBGEMM to be built in pytorch-1.1), and may future proof this - # derivation. - brokenArchs = [ "3.0" ]; # this variable is only used as documentation. - - cudaCapabilities = rec { - cuda9 = [ - "3.5" - "5.0" - "5.2" - "6.0" - "6.1" - "7.0" - "7.0+PTX" # I am getting a "undefined architecture compute_75" on cuda 9 - # which leads me to believe this is the final cuda-9-compatible architecture. - ]; - - cuda10 = cuda9 ++ [ - "7.5" - "7.5+PTX" # < most recent architecture as of cudatoolkit_10_0 and pytorch-1.2.0 - ]; - - cuda11 = cuda10 ++ [ - "8.0" - "8.0+PTX" # < CUDA toolkit 11.0 - "8.6" - "8.6+PTX" # < CUDA toolkit 11.1 - ]; - }; - final_cudaArchList = - if !cudaSupport || cudaArchList != null - then cudaArchList - else cudaCapabilities."cuda${lib.versions.major cudatoolkit.version}"; - # Normally libcuda.so.1 is provided at runtime by nvidia-x11 via # LD_LIBRARY_PATH=/run/opengl-driver/lib. We only use the stub # libcuda.so from cudatoolkit for running tests, so that we don’t have @@ -121,10 +71,21 @@ let cudaStubEnv = lib.optionalString cudaSupport "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH "; + rocmtoolkit_joined = symlinkJoin { + name = "rocm-merged"; + + paths = [ + rocm-core hip rccl miopen miopengemm rocrand rocblas + rocfft rocsparse hipsparse rocthrust rocprim hipcub + roctracer rocfft rocsolver hipfft hipsolver hipblas + rocminfo rocm-thunk rocm-comgr rocm-device-libs + rocm-runtime rocm-opencl-runtime hipify + ]; + }; in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. - version = "1.12.1"; + version = "1.13.1"; format = "setuptools"; disabled = pythonOlder "3.7.0"; @@ -140,7 +101,7 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-8378BVOBFCRYRG1+yIYFSPKmb1rFOLgR+8pNZKt9NfI="; + hash = "sha256-yQz+xHPw9ODRBkV9hv1th38ZmUr/fXa+K+d+cvmX3Z8="; }; patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ @@ -152,11 +113,40 @@ in buildPythonPackage rec { ./pthreadpool-disable-gcd.diff ]; + postPatch = lib.optionalString rocmSupport '' + # https://github.com/facebookincubator/gloo/pull/297 + substituteInPlace third_party/gloo/cmake/Hipify.cmake \ + --replace "\''${HIPIFY_COMMAND}" "python \''${HIPIFY_COMMAND}" + + # Replace hard-coded rocm paths + substituteInPlace caffe2/CMakeLists.txt \ + --replace "/opt/rocm" "${rocmtoolkit_joined}" \ + --replace "hcc/include" "hip/include" \ + --replace "rocblas/include" "include/rocblas" \ + --replace "hipsparse/include" "include/hipsparse" + + # Doesn't pick up the environment variable? + substituteInPlace third_party/kineto/libkineto/CMakeLists.txt \ + --replace "\''$ENV{ROCM_SOURCE_DIR}" "${rocmtoolkit_joined}" \ + --replace "/opt/rocm" "${rocmtoolkit_joined}" + + # Strangely, this is never set in cmake + substituteInPlace cmake/public/LoadHIP.cmake \ + --replace "set(ROCM_PATH \$ENV{ROCM_PATH})" \ + "set(ROCM_PATH \$ENV{ROCM_PATH})''\nset(ROCM_VERSION ${lib.concatStrings (lib.intersperse "0" (lib.splitString "." hip.version))})" + ''; + preConfigure = lib.optionalString cudaSupport '' - export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}" + export TORCH_CUDA_ARCH_LIST="${cudaFlags.cudaCapabilitiesSemiColonString}" export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ '' + lib.optionalString (cudaSupport && cudnn != null) '' export CUDNN_INCLUDE_DIR=${cudnn}/include + '' + lib.optionalString rocmSupport '' + export ROCM_PATH=${rocmtoolkit_joined} + export ROCM_SOURCE_DIR=${rocmtoolkit_joined} + export PYTORCH_ROCM_ARCH="${lib.strings.concatStringsSep ";" (if gpuTargets == [ ] then hip.gpuTargets else gpuTargets)}" + export CMAKE_CXX_FLAGS="-I${rocmtoolkit_joined}/include -I${rocmtoolkit_joined}/include/rocblas" + python tools/amd_build/build_amd.py ''; # Use pytorch's custom configurations @@ -223,11 +213,14 @@ in buildPythonPackage rec { ninja pybind11 removeReferencesTo - ] ++ lib.optionals cudaSupport [ cudatoolkit_joined ]; + ] ++ lib.optionals cudaSupport [ cudatoolkit_joined ] + ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; buildInputs = [ blas blas.provider pybind11 ] - ++ [ linuxHeaders_5_19 ] # TMP: avoid "flexible array member" errors for now - ++ lib.optionals cudaSupport [ cudnn magma nccl ] + ++ lib.optionals stdenv.isLinux [ linuxHeaders_5_19 ] # TMP: avoid "flexible array member" errors for now + ++ lib.optionals cudaSupport [ cudnn nccl ] + ++ lib.optionals rocmSupport [ openmp ] + ++ lib.optionals (cudaSupport || rocmSupport) [ magma ] ++ lib.optionals stdenv.isLinux [ numactl ] ++ lib.optionals stdenv.isDarwin [ CoreServices libobjc ]; @@ -239,7 +232,8 @@ in buildPythonPackage rec { typing-extensions # the following are required for tensorboard support pillow six future tensorboard protobuf - ] ++ lib.optionals MPISupport [ mpi ]; + ] ++ lib.optionals MPISupport [ mpi ] + ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; # Tests take a long time and may be flaky, so just sanity-check imports doCheck = false; @@ -248,7 +242,7 @@ in buildPythonPackage rec { "torch" ]; - checkInputs = [ hypothesis ninja psutil ]; + nativeCheckInputs = [ hypothesis ninja psutil ]; checkPhase = with lib.versions; with lib.strings; concatStringsSep " " [ "runHook preCheck" @@ -286,6 +280,12 @@ in buildPythonPackage rec { mkdir $lib mv $out/${python.sitePackages}/torch/lib $lib/lib ln -s $lib/lib $out/${python.sitePackages}/torch/lib + '' + lib.optionalString rocmSupport '' + substituteInPlace $dev/share/cmake/Tensorpipe/TensorpipeTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib64" "$lib/lib" + + substituteInPlace $dev/share/cmake/ATen/ATenConfig.cmake \ + --replace "/build/source/torch/include" "$dev/include" ''; postFixup = lib.optionalString stdenv.isDarwin '' @@ -308,7 +308,6 @@ in buildPythonPackage rec { passthru = { inherit cudaSupport cudaPackages; - cudaArchList = final_cudaArchList; # 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; }; @@ -320,6 +319,7 @@ in buildPythonPackage rec { homepage = "https://pytorch.org/"; license = licenses.bsd3; maintainers = with maintainers; [ teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds - platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin; + platforms = with platforms; linux ++ lib.optionals (!cudaSupport || !rocmSupport) darwin; + broken = rocmSupport && cudaSupport; # CUDA and ROCm are mutually exclusive }; } diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index 7388bbc7d26f..f3656aa0a46f 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "0.12.1"; + version = "0.13.1"; format = "wheel"; src = diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index 8731c63787cf..a5ac20de3efa 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -6,61 +6,61 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.12.1" = { + "0.13.1" = { x86_64-linux-37 = { - name = "torchaudio-0.12.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchaudio-0.12.1%2Bcu116-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-8Z72lazhnV2ZBtnvpdm5ZHhiyE/wHwEpQ9UzZoi//mw="; + name = "torchaudio-0.13.1-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.1%2Bcu116-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-jrztfOrRCFKVNuXqnyeM3GCRDj/K8DDmW9jNLckCEAs="; }; x86_64-linux-38 = { - name = "torchaudio-0.12.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchaudio-0.12.1%2Bcu116-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-CCtZ6eUhs/6kaoU0HwDDaK4JTSFKkVJF+OMAu368Zno="; + name = "torchaudio-0.13.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.1%2Bcu116-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-oESJecUUYoHWYkPa8/+t86rjEj4F4CNpvPpCwZAk5AY="; }; x86_64-linux-39 = { - name = "torchaudio-0.12.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchaudio-0.12.1%2Bcu116-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-pNa5fV9vC1cXeDLhHTCscO7RO2lst2Vmm0K7NzINqgw="; + name = "torchaudio-0.13.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.1%2Bcu116-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-W8DinLePfEUu608nApxABJdw1RVTv4QLTKLt1j2iie4="; }; x86_64-linux-310 = { - name = "torchaudio-0.12.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchaudio-0.12.1%2Bcu116-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-KdeBVGBQ1lQxXxCQGwX17E1iptMis0Rfex++o4JmVog="; + name = "torchaudio-0.13.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.1%2Bcu116-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-3vRLFxUB3LmU9aGUjVWWYnBXBe475veBvRHvzTu/zTA="; }; x86_64-darwin-37 = { - name = "torchaudio-0.12.1-cp37-cp37m-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-0.12.1-cp37-cp37m-macosx_10_9_x86_64.whl"; - hash = "sha256-I9vPN68vQdSRwDN8qUUB7H71iK2xdm4esoAz+sVJu9k="; + name = "torchaudio-0.13.1-cp37-cp37m-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp37-cp37m-macosx_10_9_x86_64.whl"; + hash = "sha256-D6fMGiswVvxs7ubWDbze9YlVp8pTRmfQ25tPye+gh6E="; }; x86_64-darwin-38 = { - name = "torchaudio-0.12.1-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-0.12.1-cp38-cp38-macosx_10_9_x86_64.whl"; - hash = "sha256-pMjBWx6BCpO7d7J/pJFZvqIlO1k++UA5lG7Emu9Rdk8="; + name = "torchaudio-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl"; + hash = "sha256-Qs5cZtMEvCzWgziRa4Ij4yLgmoTcvZIogU7za8R3o3s="; }; x86_64-darwin-39 = { - name = "torchaudio-0.12.1-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-0.12.1-cp39-cp39-macosx_10_9_x86_64.whl"; - hash = "sha256-CPkrxTaC07rYYG3ttwpJ5aD3z5MGyRc/B027qXeFRC4="; + name = "torchaudio-0.13.1-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp39-cp39-macosx_10_9_x86_64.whl"; + hash = "sha256-nSFwVA3jKuAxqrOTYSmGjoluoEFhe21mkt3mqi37CiM="; }; x86_64-darwin-310 = { - name = "torchaudio-0.12.1-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-0.12.1-cp310-cp310-macosx_10_9_x86_64.whl"; - hash = "sha256-3BOL7gayMFRC/BMhcfKgHV9CUJ6qIb34fD0mpvSgn90="; + name = "torchaudio-0.13.1-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp310-cp310-macosx_10_9_x86_64.whl"; + hash = "sha256-Xg89xmmVBlITZCZnBOa/idDQV5/UNdEsXC9YWNUt5Po="; }; aarch64-darwin-38 = { - name = "torchaudio-0.12.1-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-0.12.1-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-g8CLcabcjiPB17AHgKu55MKVKOR6bmRP497nrCJjgh4="; + name = "torchaudio-0.13.1-cp38-cp38-macosx_12_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.1-cp38-cp38-macosx_12_0_arm64.whl"; + hash = "sha256-sJOz52YchRaOyd3iz5c0WWXqCTHT0qfni9QJIh5taZg="; }; aarch64-darwin-39 = { - name = "torchaudio-0.12.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-0.12.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-L8WivI6KrUdbxRnzyCuWSeFLXGV0h/+nEs98UUFD6dc="; + name = "torchaudio-0.13.1-cp39-cp39-macosx_12_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.1-cp39-cp39-macosx_12_0_arm64.whl"; + hash = "sha256-kfz79HAAQC0Sv/JiTmIgoP07jKjub/Ue31lF7DmrCn8="; }; aarch64-darwin-310 = { - name = "torchaudio-0.12.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-0.12.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-HYH3GDfV1b5lHoXKn6k3fstFE7ASnd+wJVQOHCQG0+Y="; + name = "torchaudio-0.13.1-cp310-cp310-macosx_12_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.1-cp310-cp310-macosx_12_0_arm64.whl"; + hash = "sha256-7HKhfU0heIKed4BoKZm1Nc9X/hYNDCCw1r3BrRqHxN0="; }; }; } diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh index 72b919c479dd..807129f227ea 100755 --- a/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -18,9 +18,9 @@ url_and_key_list=( "x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl" "x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl" "x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl" - "aarch64-darwin-38 $darwin_bucket/cpu/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl" - "aarch64-darwin-39 $darwin_bucket/cpu/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl" - "aarch64-darwin-310 $darwin_bucket/cpu/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" + "aarch64-darwin-38 $darwin_bucket/cpu/torchaudio-${version}-cp38-cp38-macosx_12_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_12_0_arm64.whl" + "aarch64-darwin-39 $darwin_bucket/cpu/torchaudio-${version}-cp39-cp39-macosx_12_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_12_0_arm64.whl" + "aarch64-darwin-310 $darwin_bucket/cpu/torchaudio-${version}-cp310-cp310-macosx_12_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_12_0_arm64.whl" ) hashfile=binary-hashes-"$version".nix diff --git a/pkgs/development/python-modules/torchgpipe/default.nix b/pkgs/development/python-modules/torchgpipe/default.nix index 8bde4937eaec..0ebce5b66ddb 100644 --- a/pkgs/development/python-modules/torchgpipe/default.nix +++ b/pkgs/development/python-modules/torchgpipe/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ torch ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ "test_inplace_on_requires_grad" "test_input_requiring_grad" diff --git a/pkgs/development/python-modules/torchinfo/default.nix b/pkgs/development/python-modules/torchinfo/default.nix index c18f1c68be98..c36372235e78 100644 --- a/pkgs/development/python-modules/torchinfo/default.nix +++ b/pkgs/development/python-modules/torchinfo/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { torchvision ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/torchlibrosa/default.nix b/pkgs/development/python-modules/torchlibrosa/default.nix new file mode 100644 index 000000000000..bab73b0dae93 --- /dev/null +++ b/pkgs/development/python-modules/torchlibrosa/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, librosa +, numpy +, torch +}: + +buildPythonPackage rec { + pname = "torchlibrosa"; + version = "0.0.9"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-+LzejKvLlJIIwWm9rYPCWQDSueIwnG5gbkwNE+wbv0A="; + }; + + propagatedBuildInputs = [ + librosa + numpy + torch + ]; + + patches = [ + # Fix run against librosa 0.9.0, https://github.com/qiuqiangkong/torchlibrosa/pull/8 + (fetchpatch { + url = "https://github.com/qiuqiangkong/torchlibrosa/commit/eec7e7559a47d0ef0017322aee29a31dad0572d5.patch"; + hash = "sha256-c1x3MA14Plm7+lVuqiuLWgSY6FW615qnKbcWAfbrcas="; + }) + ]; + + # Project has no tests. + # In order to make pythonImportsCheck work, NUMBA_CACHE_DIR env var need to + # be set to a writable dir (https://github.com/numba/numba/issues/4032#issuecomment-488102702). + # pythonImportsCheck has no pre* hook, use checkPhase to workaround that. + checkPhase = '' + export NUMBA_CACHE_DIR="$(mktemp -d)" + ''; + pythonImportsCheck = [ "torchlibrosa" ]; + + meta = with lib; { + description = "PyTorch implemention of part of librosa functions"; + homepage = "https://github.com/qiuqiangkong/torchlibrosa"; + license = licenses.mit; + maintainers = with maintainers; [ azuwis ]; + }; +} diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index eee18b2cb7b3..c1ce980176c7 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -15,7 +15,7 @@ let pname = "torchmetrics"; - version = "0.9.3"; + version = "0.11.0"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PyTorchLightning"; repo = "metrics"; rev = "refs/tags/v${version}"; - hash = "sha256-L2p8UftRkuBuRJX4V5+OYkJeJ5pCK3MvfA1OvSfgglY="; + hash = "sha256-vHWW9TAIocU4g7++UQ0SWtOV/Cdtdq+tOV1x0MLwY7E="; }; propagatedBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage { torch ]; - checkInputs = [ + nativeCheckInputs = [ pytorch-lightning scikit-learn scikitimage diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index e1a0055af260..afa862ab4778 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -16,7 +16,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.13.1"; + version = "0.14.1"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index 9b6301bab2c3..7a46e5650bf5 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -6,61 +6,61 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.13.1" = { + "0.14.1" = { x86_64-linux-37 = { - name = "torchvision-0.13.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchvision-0.13.1%2Bcu116-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-3PMvbZmEk+duwho4u7hWt0Ailc96Z/sJzlvefn5yV1Y="; + name = "torchvision-0.14.1-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.1%2Bcu116-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-SYVxnGbJYS/0uy06U8P6r92TQVKyqHQU0nvceHSkNg8="; }; x86_64-linux-38 = { - name = "torchvision-0.13.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchvision-0.13.1%2Bcu116-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-w86ys/RW8MmEr3HvVfhjfxeKKdw+E6ZvuwEM7q0okeE="; + name = "torchvision-0.14.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.1%2Bcu116-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-R1k1helxw+DJgPq/v7iF61/wVHFrqlVWYMWwMEyeo50="; }; x86_64-linux-39 = { - name = "torchvision-0.13.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchvision-0.13.1%2Bcu116-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-dZhqvlchOCWOuXlctM1z9Asr34N0/voa9v9rsNvJcsY="; + name = "torchvision-0.14.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.1%2Bcu116-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-qfw4BA4TPRd58TG0SXyu+DDp5pn6+JzTI81YeU/7MFs="; }; x86_64-linux-310 = { - name = "torchvision-0.13.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchvision-0.13.1%2Bcu116-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-DJorYFrDD89HXWD3m6N4rwBzoi3lhUU/jD3WwUUqubw="; + name = "torchvision-0.14.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.1%2Bcu116-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-/LWNQb+V3YuF04j6GWnR3K1V7sBV4xeYHWU6BcTKbYs="; }; x86_64-darwin-37 = { - name = "torchvision-0.13.1-cp37-cp37m-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchvision-0.13.1-cp37-cp37m-macosx_10_9_x86_64.whl"; - hash = "sha256-XmMSQb7jZh3mT4NhZlYiSvLjUS6yWA2nwI4IuMllqKw="; + name = "torchvision-0.14.1-cp37-cp37m-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.14.1-cp37-cp37m-macosx_10_9_x86_64.whl"; + hash = "sha256-+3p5P9M84avsJLQneEGaP7HjFZ19/LJ0o8qPuMvECNw="; }; x86_64-darwin-38 = { - name = "torchvision-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchvision-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl"; - hash = "sha256-8jChpA7XDVHkY85D3yQ+xSCQL4cl3iUC5IXvxe6p2GQ="; + name = "torchvision-0.14.1-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.14.1-cp38-cp38-macosx_10_9_x86_64.whl"; + hash = "sha256-aO0DNZ3NPanNIbirlNohFY34pqDFutC/SkLw5EjSjLM="; }; x86_64-darwin-39 = { - name = "torchvision-0.13.1-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchvision-0.13.1-cp39-cp39-macosx_10_9_x86_64.whl"; - hash = "sha256-Api647Caw2GGYIhDQAjYK5nWRY/oiIyN+Qcg70s0fUQ="; + name = "torchvision-0.14.1-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.14.1-cp39-cp39-macosx_10_9_x86_64.whl"; + hash = "sha256-xedE9W5fW0Ut61/A8/K6TS8AYS0U2NoNvv6o8JrHaQs="; }; x86_64-darwin-310 = { - name = "torchvision-0.13.1-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchvision-0.13.1-cp310-cp310-macosx_10_9_x86_64.whl"; - hash = "sha256-GShqczxp3L1Be4Z5PfgHvSJ9tXhu14fBcpd0GpsND8c="; + name = "torchvision-0.14.1-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.14.1-cp310-cp310-macosx_10_9_x86_64.whl"; + hash = "sha256-7rBd2d069UKP7lJUAHWdr42o5MrsRd3WkIz7NlcfZDM="; }; aarch64-darwin-38 = { - name = "torchvision-0.13.1-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.13.1-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-6aVjiU+fpAaS4k0apYw+8EBFABfP7TWY/5Y39ATz/js="; + name = "torchvision-0.14.1-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.14.1-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-MPzw6f5X1KxM5kJmWaV9zhmWN8y2xwvhEoZw8XdpJiQ="; }; aarch64-darwin-39 = { - name = "torchvision-0.13.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.13.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-xe1gnIvIjFdSJkALIjLgMJCUR3yCrziVLgNz7e8AA/0="; + name = "torchvision-0.14.1-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.14.1-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-dYsg0HnoELR0C9YNHrFuSdqDDjNg+b43nrF37iIfpdQ="; }; aarch64-darwin-310 = { - name = "torchvision-0.13.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.13.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-CPWS6mGDbr7Otcl/TXqBO519xlG7985EAVY8z65qIfw="; + name = "torchvision-0.14.1-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.14.1-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-jQdm6pKv+nrySOMn3YX3yc/fUaV1MLQyEtThhYVI6dc="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index c44413ba4948..de8852035c90 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -15,7 +15,7 @@ }: let - inherit (torch.cudaPackages) cudatoolkit cudnn; + inherit (torch.cudaPackages) cudatoolkit cudaFlags cudnn; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -24,13 +24,13 @@ let cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" torch.cudaArchList; in buildPythonPackage rec { pname = "torchvision"; - version = "0.13.1"; + version = "0.14.1"; src = fetchFromGitHub { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - hash = "sha256-QlUAFAG6zEDCDSXR5n2CznspU3fT0kbqySzofGLPgK4="; + hash = "sha256-lKkEJolJQaLr1TVm44CizbJQedGa1wyy0cFWg2LTJN0="; }; nativeBuildInputs = [ libpng ninja which ] @@ -45,7 +45,7 @@ in buildPythonPackage rec { propagatedBuildInputs = [ numpy pillow torch scipy ]; preBuild = lib.optionalString cudaSupport '' - export TORCH_CUDA_ARCH_LIST="${cudaArchStr}" + export TORCH_CUDA_ARCH_LIST="${cudaFlags.cudaCapabilitiesSemiColonString}" export FORCE_CUDA=1 ''; @@ -56,7 +56,7 @@ in buildPythonPackage rec { HOME=$TMPDIR py.test test --ignore=test/test_datasets_download.py ''; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { description = "PyTorch vision library"; diff --git a/pkgs/development/python-modules/tornado/4.nix b/pkgs/development/python-modules/tornado/4.nix index 5765dee4415a..e4f59c148735 100644 --- a/pkgs/development/python-modules/tornado/4.nix +++ b/pkgs/development/python-modules/tornado/4.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 diff --git a/pkgs/development/python-modules/tornado/5.nix b/pkgs/development/python-modules/tornado/5.nix index 5dfb4f805429..d3961d06c405 100644 --- a/pkgs/development/python-modules/tornado/5.nix +++ b/pkgs/development/python-modules/tornado/5.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index c9fa36ec65df..7c8a374a8d2a 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-m2MEGb3oTsZmv9fqCkyyqKZRwtXMzb3RlyoMhZ38PBM="; }; - checkInputs = [ + nativeCheckInputs = [ pycares pycurl twisted diff --git a/pkgs/development/python-modules/torpy/default.nix b/pkgs/development/python-modules/torpy/default.nix index 7602e6680841..635b975f2852 100644 --- a/pkgs/development/python-modules/torpy/default.nix +++ b/pkgs/development/python-modules/torpy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index 9c6396d55c11..0d65d0ade19f 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -3,28 +3,33 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools , zeep }: buildPythonPackage rec { pname = "total-connect-client"; - version = "2022.10"; - format = "setuptools"; + version = "2023.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "craigjmidwinter"; repo = "total-connect-client"; - rev = version; - hash = "sha256-HNX+8TIfXOEy4KCmOjsNvOvLBdF8iQT0NJLBDD+XWsA="; + rev = "refs/tags/${version}"; + hash = "sha256-BZEL/cIAeiwxQor3TbzY8cJ08PYSkXxMl/4XkIEXncg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ zeep ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -35,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Interact with Total Connect 2 alarm systems"; homepage = "https://github.com/craigjmidwinter/total-connect-client"; + changelog = "https://github.com/craigjmidwinter/total-connect-client/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index 7b7ab11079a3..06ec0f00a5b2 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , click , click-default-group , incremental @@ -13,11 +16,14 @@ buildPythonPackage rec { pname = "towncrier"; - version = "22.8.0"; + version = "22.12.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fTg5sDOFm0X7Vd+Ct0z9cCQxkzwMyfKHpafqPgXQQss="; + hash = "sha256-nEnX519kaprqAq6QTAvBY5yP0UoBKS0rEjuNMHVkA00="; }; propagatedBuildInputs = [ @@ -29,26 +35,26 @@ buildPythonPackage rec { setuptools ]; - # zope.interface collision - doCheck = !isPy27; - preCheck = '' export PATH=$out/bin:$PATH ''; - checkInputs = [ + nativeCheckInputs = [ git mock twisted pytestCheckHook ]; - pythonImportsCheck = [ "towncrier" ]; + pythonImportsCheck = [ + "towncrier" + ]; meta = with lib; { description = "Utility to produce useful, summarised news files"; homepage = "https://github.com/twisted/towncrier/"; + changelog = "https://github.com/twisted/towncrier/blob/${version}/NEWS.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 9c167a7614c8..b0cf95cd3ae8 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pythonOlder , packaging , pluggy , py @@ -10,27 +11,69 @@ , toml , tomli , filelock -, pythonOlder +, hatchling +, hatch-vcs +, platformdirs +, pyproject-api +, colorama +, chardet +, cachetools +, testers +, tox }: buildPythonPackage rec { pname = "tox"; - version = "3.27.1"; + version = "4.1.0"; + format = "pyproject"; - buildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ packaging pluggy py six virtualenv filelock ] - ++ lib.optional (pythonOlder "3.11") tomli; + src = fetchFromGitHub { + owner = "tox-dev"; + repo = "tox"; + rev = "refs/tags/${version}"; + hash = "sha256-ApJa7v1HJDca2jvZFKqOgKho4fI2tXFrjaFzLcS9Vfk="; + }; - doCheck = false; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "packaging>=22" "packaging" + ''; - src = fetchPypi { - inherit pname version; - hash = "sha256-sqkg41pmjMBpQv/RzzpPsiGk2QnKchkftthLCxinvgQ="; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + hatchling + hatch-vcs + ]; + + propagatedBuildInputs = [ + cachetools + chardet + colorama + filelock + packaging + platformdirs + pluggy + py + pyproject-api + six + toml + virtualenv + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + doCheck = false; # infinite recursion via devpi-client + + passthru.tests = { + version = testers.testVersion { package = tox; }; }; meta = with lib; { - description = "Virtualenv-based automation of test activities"; - homepage = "https://tox.readthedocs.io/"; + changelog = "https://github.com/tox-dev/tox/releases/tag/${version}"; + description = "A generic virtualenv management and test command line tool"; + homepage = "https://github.com/tox-dev/tox"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index 04e7f890bf1c..c51830b7fc7b 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.0.2"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-W3WJPYQofNcpW5AyIW3ms6FxQ2yWzocL3nrZGCdm+gk="; + hash = "sha256-p58W6PIYdimJz8Cdzv/rr8GRW1wLcb0jnhNxkbuQiBo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index 8f8d49d34f1a..fe7df9d9efcf 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -18,17 +18,19 @@ buildPythonPackage rec { pname = "tpm2-pytss"; - version = "1.2.0"; + version = "2.1.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OgWWTjcj3Qd4dSaCwY+fuRQpLSFn4+9o11kPR9n8a54="; + hash = "sha256-W1tLFFb9wa7vPSw5cL6qB4yPfyZIyXppvPYMWi+VyJc="; }; nativeBuildInputs = [ cffi - pkgconfig # this is the python module + pkgconfig # this is the Python module pkg-config # this is the actual pkg-config tool setuptools-scm ]; @@ -47,15 +49,18 @@ buildPythonPackage rec { # https://github.com/tpm2-software/tpm2-pytss/issues/341 doCheck = false; - checkInputs = [ + nativeCheckInputs = [ ibm-sw-tpm2 pytestCheckHook ]; - pythonImportsCheck = [ "tpm2_pytss" ]; + pythonImportsCheck = [ + "tpm2_pytss" + ]; meta = with lib; { homepage = "https://github.com/tpm2-software/tpm2-pytss"; + changelog = "https://github.com/tpm2-software/tpm2-pytss/blob/${version}/CHANGELOG.md"; description = "TPM2 TSS Python bindings for Enhanced System API (ESYS)"; license = licenses.bsd2; maintainers = with maintainers; [ baloo ]; diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 6da72cde5ea5..edb182d8b3c6 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio pytest-timeout diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix index 94597726389d..bab98930c117 100644 --- a/pkgs/development/python-modules/trackpy/default.nix +++ b/pkgs/development/python-modules/trackpy/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { numba ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix index 627c21ee4bf0..4145fdf1a4a4 100644 --- a/pkgs/development/python-modules/trainer/default.nix +++ b/pkgs/development/python-modules/trainer/default.nix @@ -9,6 +9,7 @@ , torch-bin , tensorboardx , protobuf +, psutil , pytestCheckHook , soundfile @@ -17,7 +18,7 @@ let pname = "trainer"; - version = "0.0.16"; + version = "0.0.20"; in buildPythonPackage { inherit pname version; @@ -27,7 +28,7 @@ buildPythonPackage { owner = "coqui-ai"; repo = "Trainer"; rev = "refs/tags/v${version}"; - hash = "sha256-G2qFQEO5OOEI2jsb+zXsO8cbC13o7pqAC2xkFrhGkLc="; + hash = "sha256-se2Q2wJyynPc/3TkfEn4nEh+emqBJBwPGDSnOV+sH4I="; }; postPatch = '' @@ -37,16 +38,17 @@ buildPythonPackage { propagatedBuildInputs = [ coqpit fsspec - torch-bin + protobuf + psutil soundfile tensorboardx - protobuf + torch-bin ]; # only one test and that requires training data from the internet doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook torchvision-bin ]; @@ -58,6 +60,7 @@ buildPythonPackage { meta = with lib; { description = "A general purpose model trainer, as flexible as it gets"; homepage = "https://github.com/coqui-ai/Trainer"; + changelog = "https://github.com/coqui-ai/Trainer/releases/tag/v${version}"; license = licenses.asl20; maintainers = teams.tts.members; }; diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 30bff404032e..a42fc6f95e7a 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -13,17 +13,17 @@ buildPythonPackage rec { pname = "traitlets"; - version = "5.4.0"; + version = "5.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PyxOQ14nFZL+Q5DxdG6laDbjoID4Tngz8PgB2WE/7Dk="; + sha256 = "sha256-bMV9bcKMhdU2WWFyb/0ZtThzk0d0nhPr404DMjoOj4Q="; }; nativeBuildInputs = [ hatchling ]; - checkInputs = [ glibcLocales pytest mock ]; + nativeCheckInputs = [ glibcLocales pytest mock ]; propagatedBuildInputs = [ ipython_genutils decorator six ]; checkPhase = '' @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "Traitlets Python config system"; - homepage = "http://ipython.org/"; + homepage = "https://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix index cf5e8bf8302a..de0928508844 100644 --- a/pkgs/development/python-modules/traitsui/default.nix +++ b/pkgs/development/python-modules/traitsui/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "traitsui"; - version = "7.4.1"; + version = "7.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TFs9Oq6qvR7IGgqMQPnM0o+oy51k7RORfJkNF0ZU+h0="; + hash = "sha256-2zJRfpYioFgMIyCeE/gDLOoA5hxndJNnCf9F52M11bk="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Traits-capable windowing framework"; homepage = "https://github.com/enthought/traitsui"; + changelog = "https://github.com/enthought/traitsui/releases/tag/${version}"; license = licenses.bsdOriginal; maintainers = with maintainers; [ knedlsepp ]; }; diff --git a/pkgs/development/python-modules/traittypes/default.nix b/pkgs/development/python-modules/traittypes/default.nix index 290892672e59..a26ab6b46f81 100644 --- a/pkgs/development/python-modules/traittypes/default.nix +++ b/pkgs/development/python-modules/traittypes/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ traitlets ]; - checkInputs = [ numpy pandas xarray nose pytestCheckHook ]; + nativeCheckInputs = [ numpy pandas xarray nose pytestCheckHook ]; pythonImportsCheck = [ "traittypes" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index e445dd7e8db3..15eee616aea3 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.24.0"; + version = "4.25.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aGtTey+QK12URZcGNaRAlcaOphON4ViZOGdigtXU1g0="; + hash = "sha256-b0xEHM72HcaTRgGisB6fnPrMaXZ8EcJfowwK92W4aYg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/transforms3d/default.nix b/pkgs/development/python-modules/transforms3d/default.nix index 8b21e64e9a7e..549ad85c78e9 100644 --- a/pkgs/development/python-modules/transforms3d/default.nix +++ b/pkgs/development/python-modules/transforms3d/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy sympy ]; - checkInputs = [ pytest scipy ]; + nativeCheckInputs = [ pytest scipy ]; checkPhase = "pytest transforms3d"; meta = with lib; { diff --git a/pkgs/development/python-modules/transip/default.nix b/pkgs/development/python-modules/transip/default.nix index ff37464a0f34..1179f9240200 100644 --- a/pkgs/development/python-modules/transip/default.nix +++ b/pkgs/development/python-modules/transip/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { suds-jurko ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index 42efd9d0017a..77eec05114d8 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pygraphviz # optional ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock graphviz diff --git a/pkgs/development/python-modules/translatepy/default.nix b/pkgs/development/python-modules/translatepy/default.nix index 374c1d5dfaca..90ccce1c9f18 100644 --- a/pkgs/development/python-modules/translatepy/default.nix +++ b/pkgs/development/python-modules/translatepy/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { inquirer ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ # Requires network connection "tests/test_translate.py" diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix index b82a61b7518c..da95234c1fd6 100644 --- a/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/pkgs/development/python-modules/transmission-rpc/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytz pytestCheckHook yarl diff --git a/pkgs/development/python-modules/treeo/default.nix b/pkgs/development/python-modules/treeo/default.nix index febb59880b69..30a90bd36eea 100644 --- a/pkgs/development/python-modules/treeo/default.nix +++ b/pkgs/development/python-modules/treeo/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { jax ]; - checkInputs = [ jaxlib ]; + nativeCheckInputs = [ jaxlib ]; pythonImportsCheck = [ "treeo" ]; diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix index 7f247bbdc07d..cfbadc344eff 100644 --- a/pkgs/development/python-modules/treex/default.nix +++ b/pkgs/development/python-modules/treex/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "treex"; - version = "0.6.10"; + version = "0.6.11"; format = "pyproject"; src = fetchFromGitHub { owner = "cgarciae"; repo = pname; - rev = version; - hash = "sha256-ZHfgmRNbFh8DFZkmilY0pmRNQhJFqT689I7Lu8FuFm4="; + rev = "refs/tags/${version}"; + hash = "sha256-ObOnbtAT4SlrwOms1jtn7/XKZorGISGY6VuhQlC3DaQ="; }; # At the time of writing (2022-03-29), rich is currently at version 11.0.0. @@ -57,7 +57,7 @@ buildPythonPackage rec { torch ]; - checkInputs = [ + nativeCheckInputs = [ cloudpickle dm-haiku hypothesis diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 0f77463077a0..5f7184206669 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { twisted ] ++ twisted.optional-dependencies.tls; - checkInputs = [ + nativeCheckInputs = [ httpbin twisted ]; diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index ae9778d91039..c56e3663c0ee 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -25,13 +25,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.13.4"; + version = "0.13.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "04a77b44005971819386bbd55242a1004b1f88fbbdb829deb039a1e0028a4af1"; + sha256 = "sha256-jhUBca/+rDge/bFHgpKQhNZBTsd8zNyHHW8NZE/1e9g="; }; nativeBuildInputs = [ installShellFiles ]; @@ -56,7 +56,7 @@ buildPythonPackage rec { trezor-udev-rules ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ "tests/test_stellar.py" # requires stellar-sdk diff --git a/pkgs/development/python-modules/trfl/default.nix b/pkgs/development/python-modules/trfl/default.nix index 0f986f7148e9..356eb985005e 100644 --- a/pkgs/development/python-modules/trfl/default.nix +++ b/pkgs/development/python-modules/trfl/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { tensorflow-probability ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 56f79842c7a4..1c191cc2991a 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.15.8"; + version = "3.18.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bFUDm6/4XUyyrMxc1KKqbVi1gmUJ7Lxonei/HxlmGwI="; + sha256 = "sha256-lVoBBBrzyhrSmR2FM0xo8UJBCOShwaYOrIpeAwQn76M="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix index 25caa3e965fb..127da2d4766f 100644 --- a/pkgs/development/python-modules/trio-asyncio/default.nix +++ b/pkgs/development/python-modules/trio-asyncio/default.nix @@ -33,15 +33,16 @@ buildPythonPackage rec { sniffio ]; - checkInputs = [ + nativeCheckInputs = [ pytest-trio pytestCheckHook ]; pytestFlagsArray = [ # https://github.com/python-trio/trio-asyncio/issues/112 - "-W" - "ignore::DeprecationWarning" + "-W" "ignore::DeprecationWarning" + # trio.MultiError is deprecated since Trio 0.22.0; use BaseExceptionGroup (on Python 3.11 and later) or exceptiongroup.BaseExceptionGroup (earlier versions) instead (https://github.com/python-trio/trio/issues/2211) + "-W" "ignore::trio.TrioDeprecationWarning" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/trio-websocket/default.nix b/pkgs/development/python-modules/trio-websocket/default.nix index 3b33b80e921e..4549a056b067 100644 --- a/pkgs/development/python-modules/trio-websocket/default.nix +++ b/pkgs/development/python-modules/trio-websocket/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { wsproto ]; - checkInputs = [ + nativeCheckInputs = [ pytest-trio pytestCheckHook trustme diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index dde139103454..194dc3f71856 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -2,9 +2,9 @@ , attrs , sortedcontainers , async_generator +, exceptiongroup , idna , outcome -, contextvars , pytestCheckHook , pyopenssl , trustme @@ -18,12 +18,13 @@ buildPythonPackage rec { pname = "trio"; - version = "0.21.0"; - disabled = pythonOlder "3.6"; + version = "0.22.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Uj85t7ae73NQHOv+Gq/UAKmq1bA1Q6Dt7VKVJIj/HBM="; + hash = "sha256-zmjxxUAKR7E3xaTecsfJAb1OeiT73r/ptB3oxsBOqs8="; }; propagatedBuildInputs = [ @@ -33,12 +34,14 @@ buildPythonPackage rec { idna outcome sniffio - ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ]; + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup + ]; # tests are failing on Darwin doCheck = !stdenv.isDarwin; - checkInputs = [ + nativeCheckInputs = [ astor jedi pyopenssl diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index 93e09901e7d6..a7a27bd86c39 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -12,7 +12,8 @@ buildPythonPackage rec { pname = "troposphere"; - version = "4.1.0"; + version = "4.2.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "cloudtools"; repo = pname; rev = version; - hash = "sha256-cAn4Hty5f/RsCnUA59CxtGrhRgzVyaHe5PuQOM6lwEQ="; + hash = "sha256-4flnV4WxK21NNd9FXizkw6FoGffSL27Tq/Jc87vYJbc="; }; propagatedBuildInputs = [ @@ -29,7 +30,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ awacs ]; @@ -48,5 +49,6 @@ buildPythonPackage rec { maintainers = with maintainers; [ jlesquembre ]; license = licenses.bsd2; homepage = "https://github.com/cloudtools/troposphere"; + changelog = "https://github.com/cloudtools/troposphere/blob/${version}/CHANGELOG.rst"; }; } diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix new file mode 100644 index 000000000000..b4440f68d6c5 --- /dev/null +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, calver +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "trove-classifiers"; + version = "2023.1.20"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-7T/U4dLqd8qe03k4BYJWbmADpU1wo+VSGpsqeJZgk2I="; + }; + + nativeBuildInputs = [ + calver + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "trove_classifiers" ]; + + meta = { + description = "Canonical source for classifiers on PyPI"; + homepage = "https://github.com/pypa/trove-classifiers"; + changelog = "https://github.com/pypa/trove-classifiers/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index 103878ccac69..786b6f5bc8ac 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -20,10 +19,10 @@ buildPythonPackage rec { sha256 = "sha256-XgeyPXDO7WTzuzauS5q8UjVMFsmNRasDe+4rX7/+WGw="; }; - checkInputs = [ + nativeCheckInputs = [ pyopenssl - service-identity pytestCheckHook + service-identity ]; propagatedBuildInputs = [ @@ -33,12 +32,6 @@ buildPythonPackage rec { futures ]; - # aarch64-darwin forbids W+X memory, but this tests depends on it: - # * https://github.com/pyca/pyopenssl/issues/873 - disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - "test_pyopenssl_end_to_end" - ]; - # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index ce39ed5d1a05..8f7dd450c235 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -13,7 +13,7 @@ , wrapt , passlib , pydot -, python-Levenshtein +, levenshtein , html2text , weasyprint , gevent @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "6.4.5"; + version = "6.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AF8LG68K+CvHpFOIoGbxD+lF7IVwBDk8K06I4uTNguI="; + sha256 = "sha256-fE1JBlvKIvDFjMat/lgOM22rIpMlqnxoo9p8VJF6szs="; }; propagatedBuildInputs = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { # extra dependencies pydot - python-Levenshtein + levenshtein html2text weasyprint gevent @@ -59,7 +59,7 @@ buildPythonPackage rec { ++ passlib.optional-dependencies.argon2 ++ lib.optional withPostgresql psycopg2; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/ttach/default.nix b/pkgs/development/python-modules/ttach/default.nix new file mode 100644 index 000000000000..11b43fd99250 --- /dev/null +++ b/pkgs/development/python-modules/ttach/default.nix @@ -0,0 +1,33 @@ +{ fetchFromGitHub +, pythonOlder +, pytestCheckHook +, torch +, buildPythonPackage +, lib +}: + +buildPythonPackage rec { + pname = "ttach"; + version = "0.0.3"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "qubvel"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-R6QO+9hv0eI7dZW5iJf096+LU1q+vnmOpveurgZemPc="; + }; + + propagatedBuildInputs = [ torch ]; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "ttach" ]; + + meta = with lib; { + description = "Image Test Time Augmentation with PyTorch"; + homepage = "https://github.com/qubvel/ttach"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ cfhammill ]; + }; +} diff --git a/pkgs/development/python-modules/ttls/default.nix b/pkgs/development/python-modules/ttls/default.nix index ea1d3b789152..dfdb676d6fb7 100644 --- a/pkgs/development/python-modules/ttls/default.nix +++ b/pkgs/development/python-modules/ttls/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ttls"; - version = "1.4.3"; + version = "1.6.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jschlyter"; repo = pname; - rev = "v${version}"; - hash = "sha256-lBmkfB7HXB+1xLbfOl4wVtsOVfKhztoDBqzV8i6bFAg="; + rev = "refs/tags/v${version}"; + hash = "sha256-W7r2XgH8SloL9l/Lw1xWLmjF8aMBHWFe2DQ3tkqu+JQ="; }; nativeBuildInputs = [ @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with Twinkly LEDs"; homepage = "https://github.com/jschlyter/ttls"; + changelog = "https://github.com/jschlyter/ttls/blob/v${version}/CHANGES.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ttp-templates/default.nix b/pkgs/development/python-modules/ttp-templates/default.nix index ac27cc1aef50..afe58c880546 100644 --- a/pkgs/development/python-modules/ttp-templates/default.nix +++ b/pkgs/development/python-modules/ttp-templates/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ttp-templates"; - version = "0.3.1"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "dmulyalin"; repo = "ttp_templates"; rev = "refs/tags/${version}"; - hash = "sha256-35Ej76E9qy5EY41Jt2GDCldyXq7IkdqKxVFrBOJh9nE="; + hash = "sha256-Bm9//hahM1sP/XDUDR7JcGWz0qF8ovkWZU5x/qj0UZg="; }; nativeBuildInputs = [ @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Template Text Parser Templates collections"; homepage = "https://github.com/dmulyalin/ttp_templates"; + changelog = "https://github.com/dmulyalin/ttp_templates/releases/tag/${version}"; 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 afa66b288ab2..f350b2e10a54 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "ttp"; - version = "0.9.1"; + version = "0.9.2"; format = "pyproject"; src = fetchFromGitHub { owner = "dmulyalin"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FhuIYXktcNnOVX+KU5cDOd2Qk7AcWaSKvfB/BZYpsZo="; + hash = "sha256-KhQRC4zcLCnYUtQm08wJzb/YwBquOEGR5L0YUmnzheg="; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ buildPythonPackage rec { "ttp" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pyyaml ttp-templates @@ -62,6 +62,7 @@ buildPythonPackage rec { "test/pytest/test_N2G_formatter.py" # missing test file "test/pytest/test_extend_tag.py" + "test/pytest/test_ttp_parser_methods.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 045780219d42..abb5e6c1fc0f 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -4,29 +4,39 @@ , fetchPypi , yt-dlp , docopt -, isPy27 +, pythonOlder +, urllib3 }: buildPythonPackage rec { pname = "tubeup"; - version = "0.0.34"; + version = "0.0.35"; format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "ae1e606b243fd70742f8b5871c497628d258ee9f416caa46544aca9a5fbfbca0"; + sha256 = "006aea68bb8d967a7427c58ee7862e3f2481dae667c2bbcfb1a1f2fd80e665d1"; }; postPatch = '' substituteInPlace setup.py \ + --replace "internetarchive==3.0.2" "internetarchive" \ + --replace "urllib3==1.26.13" "urllib3" \ --replace "docopt==0.6.2" "docopt" ''; - propagatedBuildInputs = [ internetarchive docopt yt-dlp ]; + propagatedBuildInputs = [ + internetarchive + docopt + urllib3 + yt-dlp + ]; - pythonImportsCheck = [ "tubeup" ]; + pythonImportsCheck = [ + "tubeup" + ]; # Tests failing upstream doCheck = false; @@ -34,7 +44,8 @@ buildPythonPackage rec { meta = with lib; { description = "Youtube (and other video site) to Internet Archive Uploader"; homepage = "https://github.com/bibanon/tubeup"; + changelog = "https://github.com/bibanon/tubeup/releases/tag/${version}"; license = licenses.gpl3Only; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/pkgs/development/python-modules/tunigo/default.nix b/pkgs/development/python-modules/tunigo/default.nix index 9f2f177552de..c69f00f251b7 100644 --- a/pkgs/development/python-modules/tunigo/default.nix +++ b/pkgs/development/python-modules/tunigo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "07q9girrjjffzkn8xj4l3ynf9m4psi809zf6f81f54jdb330p2fs"; }; - checkInputs = [ mock responses pytest ]; + nativeCheckInputs = [ mock responses pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/turnt/default.nix b/pkgs/development/python-modules/turnt/default.nix index a04d16a959fd..b6c0549c040a 100644 --- a/pkgs/development/python-modules/turnt/default.nix +++ b/pkgs/development/python-modules/turnt/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "turnt"; - version = "1.8.0"; + version = "1.9.0"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "c6cfcb68a3353032c4ce6fff352196e723d05f9cee23eaf4f36d4dcfd89b8e49"; + sha256 = "sha256-X0uJmY2MVnvM50LDBXDn9hK4NuHAil4Kf39V/8b8OIQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tvdb_api/default.nix b/pkgs/development/python-modules/tvdb_api/default.nix index 1264f07c1829..91b360f936e3 100644 --- a/pkgs/development/python-modules/tvdb_api/default.nix +++ b/pkgs/development/python-modules/tvdb_api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests-cache ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # requires network access doCheck = false; diff --git a/pkgs/development/python-modules/tweedledum/default.nix b/pkgs/development/python-modules/tweedledum/default.nix index 69b126481d3e..a768e3559d5b 100644 --- a/pkgs/development/python-modules/tweedledum/default.nix +++ b/pkgs/development/python-modules/tweedledum/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "tweedledum" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "python/test" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index c530218b79fc..e313818daf7d 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "tweepy"; - version = "4.12.0"; + version = "4.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ru0DCl9MOrU4uZvLXDxM4txD0D/GR4eYBHvqeMcbTVA="; + hash = "sha256-jyH2qJoVFuNwZCOtl2CvuuMCpJXCvlxcaHJd7fT1XzA="; }; propagatedBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook vcrpy ]; @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Twitter library for Python"; homepage = "https://github.com/tweepy/tweepy"; + changelog = "https://github.com/tweepy/tweepy/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/twentemilieu/default.nix b/pkgs/development/python-modules/twentemilieu/default.nix index 39f8629a5b1e..c54f897a51d1 100644 --- a/pkgs/development/python-modules/twentemilieu/default.nix +++ b/pkgs/development/python-modules/twentemilieu/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 6cf44ee9dc7f..1f8f402583af 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.15.3"; + version = "7.16.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-c1UNqp8eYK9tkogpcDtTOTHa5ME+yOkop2UccXwOAqM="; + hash = "sha256-Z783lHGZc5/Fl4pnM5mf863UVuFroRNwV5cljPSpCmw="; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ cryptography django mock @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Twilio API client and TwiML generator"; homepage = "https://github.com/twilio/twilio-python/"; + changelog = "https://github.com/twilio/twilio-python/blob/${version}/CHANGES.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index f68ec91e1cbb..fdc750fa8962 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "twill"; - version = "3.0.2"; + version = "3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-dWtrdkiR1+IBfeF9jwbOjKE2UMXDJji0iOb+USbY7zk="; + hash = "sha256-tWcZRvBvkRyQ7gD5zjocBzFVlzQ0Mhf1unF3gUkhB94="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index c3e4682d5a7e..5e51082ed6ac 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "twine"; - version = "4.0.1"; + version = "4.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lrHPEveuYRpKQLaujpVwIV2v8GEYKPX+HzehYlWrJKA="; + sha256 = "sha256-nhAu9f3VogZh64j61GM4gGw70yzx23KWA/42l7G8g8g="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index fae5ef8cf103..0f0f455a4235 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, pythonAtLeast , pythonOlder , fetchPypi , fetchpatch @@ -10,12 +11,12 @@ , automat , bcrypt , constantly -, contextvars , cryptography , git , glibcLocales , h2 , hyperlink +, hypothesis , idna , incremental , priority @@ -45,7 +46,7 @@ buildPythonPackage rec { pname = "twisted"; - version = "22.8.0"; + version = "22.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -54,14 +55,23 @@ buildPythonPackage rec { pname = "Twisted"; inherit version; extension = "tar.gz"; - hash = "sha256-5bYN458tHaFT++GHTYhf4/y9sh/MRG+nWaU+j8NRO+0="; + hash = "sha256-Mqy9QKlPX0bntCwQm/riswIlCUVWF4Oot6BZBI8tTTE="; }; patches = [ (fetchpatch { - name = "fix-test_openFileDescriptors.patch"; - url = "https://github.com/twisted/twisted/commit/47f47634940141466177261b20bb43c300531e38.patch"; - hash = "sha256-wacnF166PnZHXJEqTlPZUdDILJIVHOcnC2a34SQumvs="; + url = "https://github.com/twisted/twisted/pull/11787.diff"; + hash = "sha256-bQgUmbvDa61Vg8p/o/ivfkOAHyj1lTgHkrRVEGLM9aU="; + }) + ] ++ lib.optionals (pythonAtLeast "3.11") [ + (fetchpatch { + url = "https://github.com/twisted/twisted/pull/11734.diff"; + excludes = [ ".github/workflows/*" ]; + hash = "sha256-Td08pDxHwl7fPLCA6rUySuXpy8YmZfvXPHGsBpdcmSo="; + }) + (fetchpatch { + url = "https://github.com/twisted/twisted/commit/00bf5be704bee022ba4d9b24eb6c2c768b4a1921.patch"; + hash = "sha256-fnBzczm3OlhbjRcePIQ7dSX6uldlCZ9DJTS+UFO2nAQ="; }) ]; @@ -116,6 +126,11 @@ buildPythonPackage rec { '' + lib.optionalString (stdenv.isAarch64 && stdenv.isDarwin) '' echo 'AbortConnectionTests_AsyncioSelectorReactorTests.test_fullWriteBufferAfterByteExchange.skip = "Timeout after 120 seconds"' >> src/twisted/internet/test/test_tcp.py echo 'AbortConnectionTests_AsyncioSelectorReactorTests.test_resumeProducingAbort.skip = "Timeout after 120 seconds"' >> src/twisted/internet/test/test_tcp.py + + echo 'PosixReactorBaseTests.test_removeAllSkipsInternalReaders.skip = "Fails due to unclosed event loop"' >> src/twisted/internet/test/test_posixbase.py + echo 'PosixReactorBaseTests.test_wakerIsInternalReader.skip = "Fails due to unclosed event loop"' >> src/twisted/internet/test/test_posixbase.py + + echo 'TCPPortTests.test_connectionLostFailed.skip = "Fails due to unclosed event loop"' >> src/twisted/internet/test/test_posixbase.py ''; # Generate Twisted's plug-in cache. Twisted users must do it as well. See @@ -125,9 +140,11 @@ buildPythonPackage rec { $out/bin/twistd --help > /dev/null ''; - checkInputs = [ + nativeCheckInputs = [ git glibcLocales + # "hypothesis" indirectly depends on twisted to build its documentation. + (hypothesis.override { enableDocumentation = false; }) pyhamcrest ] ++ passthru.optional-dependencies.conch @@ -145,7 +162,6 @@ buildPythonPackage rec { optional-dependencies = rec { conch = [ appdirs bcrypt cryptography pyasn1 ]; conch_nacl = conch ++ [ pynacl ]; - contextvars = lib.optionals (pythonOlder "3.7") [ contextvars ]; http2 = [ h2 priority ]; serial = [ pyserial ]; tls = [ idna pyopenssl service-identity ]; @@ -169,11 +185,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/twisted/twisted"; - description = "Twisted, an event-driven networking engine written in Python"; - longDescription = '' - Twisted is an event-driven networking engine written in Python - and licensed under the MIT license. - ''; + description = "Asynchronous networking framework written in Python"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/twitch-python/default.nix b/pkgs/development/python-modules/twitch-python/default.nix index c11e8bd4fdaa..7bb1d04f545a 100644 --- a/pkgs/development/python-modules/twitch-python/default.nix +++ b/pkgs/development/python-modules/twitch-python/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests rx ]; - checkInputs = [ pytestCheckHook responses ]; + nativeCheckInputs = [ pytestCheckHook responses ]; pythonImportsCheck = [ "twitch" ]; diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index 9427d39c20af..4d9223f7d93a 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -4,14 +4,12 @@ , fetchPypi , aiohttp , python-dateutil -, requests , typing-extensions -, websockets }: buildPythonPackage rec { pname = "twitchapi"; - version = "2.5.7.1"; + version = "3.7.0"; disabled = pythonOlder "3.7"; @@ -20,15 +18,13 @@ buildPythonPackage rec { src = fetchPypi { pname = "twitchAPI"; inherit version; - hash = "sha256-ZhmzrHWbwoHL+9FdkVoc+GGxH1v2j7rB/3ZiaWu9kjQ="; + hash = "sha256-zmMzHuaSsuj2MxkmQyzROrZ/zxO0/I7llKlnpZzauDw="; }; propagatedBuildInputs = [ aiohttp python-dateutil - requests typing-extensions - websockets ]; # upstream has no tests @@ -43,6 +39,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/Teekeks/pyTwitchAPI/blob/v${version}/docs/changelog.rst"; description = "Python implementation of the Twitch Helix API, its Webhook, PubSub and EventSub"; homepage = "https://github.com/Teekeks/pyTwitchAPI"; license = licenses.mit; diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 02cf7c0fda6a..eeb53a809255 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -11,12 +11,14 @@ buildPythonPackage rec { pname = "txaio"; - version = "22.2.1"; + version = "23.1.1"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LkWCtw8EsjRZCCVGhKmEIGwNm1DjB0okpMVauiHSTQE="; + hash = "sha256-+akhbpduXjJG39ESrXrVXKkVYGtguEp1esdpvUBP9wQ="; }; propagatedBuildInputs = [ @@ -24,7 +26,7 @@ buildPythonPackage rec { zope_interface ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook @@ -42,11 +44,14 @@ buildPythonPackage rec { "test_cancel" ]; - pythonImportsCheck = [ "txaio" ]; + pythonImportsCheck = [ + "txaio" + ]; meta = with lib; { description = "Utilities to support code that runs unmodified on Twisted and asyncio"; homepage = "https://github.com/crossbario/txaio"; + changelog = "https://github.com/crossbario/txaio/blob/v${version}/docs/releases.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/txrequests/default.nix b/pkgs/development/python-modules/txrequests/default.nix index eaf94e21ee3a..afe4b0f93b23 100644 --- a/pkgs/development/python-modules/txrequests/default.nix +++ b/pkgs/development/python-modules/txrequests/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { # Require network access doCheck = false; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "Asynchronous Python HTTP for Humans."; diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index ef06f711848b..85385347b96f 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { zope_interface ] ++ twisted.optional-dependencies.tls; - checkInputs = [ pytestCheckHook mock lsof GeoIP ]; + nativeCheckInputs = [ pytestCheckHook mock lsof GeoIP ]; doCheck = !(stdenv.isDarwin && stdenv.isAarch64); diff --git a/pkgs/development/python-modules/txzmq/default.nix b/pkgs/development/python-modules/txzmq/default.nix index 6ae66dba90ca..f47c33924ce1 100644 --- a/pkgs/development/python-modules/txzmq/default.nix +++ b/pkgs/development/python-modules/txzmq/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { twisted ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index 2fa0010bdd03..929f53785a3e 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { typecode-libmagic ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist ]; diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 0c5e1fa3cd27..8487b7ff9e01 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-GRmKw7SRrrIIb61VeB8GLhSKCmLUd54AA+GAf43vor8="; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index 81ca0bfd0bf3..af8b9c5ef364 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -1,52 +1,70 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchPypi -, setuptoolsBuildHook , attrs +, buildPythonPackage , cattrs -, toml -, pytestCheckHook , click , click-option-group +, fetchPypi +, hatchling +, pytestCheckHook +, pythonOlder +, tomli +, typing-extensions }: buildPythonPackage rec { pname = "typed-settings"; - version = "1.1.1"; + version = "2.0.2"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-fbo4oj84j7Vkz2V6B/EqoyRl9OutSpm5Ko9Tctu2DYM="; + pname = "typed_settings"; + inherit version; + hash = "sha256-AYHA1xFS0g99cloGIjvi8loKS/Q/AteyLiLH8rf+2No="; }; nativeBuildInputs = [ - setuptoolsBuildHook + hatchling ]; propagatedBuildInputs = [ attrs cattrs click-option-group - toml + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; + passthru.optional-dependencies = { + click = [ + click + ]; + }; + + checkInputs = [ + pytestCheckHook + typing-extensions + ] ++ passthru.optional-dependencies.click; + pytestFlagsArray = [ "tests" ]; - checkInputs = [ - click - pytestCheckHook + disabledTests = [ + # AssertionError: assert [OptionInfo(p... + "test_deep_options" ]; - pythonImportsCheck = [ "typed_settings" ]; + pythonImportsCheck = [ + "typed_settings" + ]; meta = { description = "Typed settings based on attrs classes"; homepage = "https://gitlab.com/sscherfke/typed-settings"; + changelog = "https://gitlab.com/sscherfke/typed-settings/-/blob/${version}/CHANGELOG.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index dd3f62527aa2..7c69463d9b7b 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace " --cov" "" ''; - checkInputs = [ pytestCheckHook typing-extensions ]; + nativeCheckInputs = [ pytestCheckHook typing-extensions ]; disabledTestPaths = [ # mypy tests aren't passing with latest mypy diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 35a946c6079b..f02a0f0c5139 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -17,16 +17,21 @@ buildPythonPackage rec { pname = "typer"; - version = "0.6.1"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-LVcgpeY/c+rzHtqhX2q4fzXwaQ+MojMBfX0j10OpHXM="; + hash = "sha256-/3l4RleKnyogG1NEKu3rVDMZRmhw++HHAeq2bddoEWU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "rich >=10.11.0,<13.0.0" "rich" + ''; + nativeBuildInputs = [ flit-core ]; @@ -43,7 +48,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ coverage # execs coverage in tests pytest-sugar pytest-xdist diff --git a/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix index 9fa0baac88e6..155b18f02841 100644 --- a/pkgs/development/python-modules/types-colorama/default.nix +++ b/pkgs/development/python-modules/types-colorama/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-colorama"; - version = "0.4.15.3"; + version = "0.4.15.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-k2L0kWdQX3EbvJpjUtrmZQSVswUzg4aPf3a/642SMAI="; + hash = "sha256-PSqJbsfz0fZpz3ruoO9+usRznwLbM6sTKB5qcewvwsU="; }; # Module has no tests diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix index c0637e7b389e..275fdbaab886 100644 --- a/pkgs/development/python-modules/types-dateutil/default.nix +++ b/pkgs/development/python-modules/types-dateutil/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-dateutil"; - version = "2.8.19.2"; + version = "2.8.19.5"; format = "setuptools"; src = fetchPypi { pname = "types-python-dateutil"; inherit version; - hash = "sha256-5uMs4Y83dlsIxGYiKHvI2BNtwMVi2a1bj9FYxZlj16c="; + hash = "sha256-q5H8X3FffXbZpQ09100MaN/jilTwI5z6BQZXWuTYep0="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix index 0af21f38a4a3..44389574ce5a 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.8.1"; + version = "5.1.8.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+SkMviPSZ0uxii2V9ZPCdUdGPtRZ4OYEgAxCCZw8akQ="; + sha256 = "sha256-Sddr47Ry/U+k3DO6VapLke5h6/c3nRrSVfxWMvy9wAc="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index af33403ee7fc..31906b220af2 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.19.1.1"; + version = "0.19.1.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-vgpRuhx90hXZ0t9m1oReY8EAm0u/TFvrh6DZdFzbqWI="; + hash = "sha256-yj0hNUhK21LdBCu929bt3LvajGCLo/Xl+Qi9VI/8s5k="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 92415fb04c61..862b8ff805c2 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.20.4.2"; + version = "4.21.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/WWrhQL5oI4InyytJtUvqwTNVzIs+JbFcKszkcp2C64="; + sha256 = "sha256-ffSD00rT/LH6f/8Qc1YNWWyawfQZz6hRsiDJqTOGyZg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-psutil/default.nix b/pkgs/development/python-modules/types-psutil/default.nix new file mode 100644 index 000000000000..3d1d6eecb19b --- /dev/null +++ b/pkgs/development/python-modules/types-psutil/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-psutil"; + version = "5.9.5.5"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Tyb9sssGSydMvGNZ+6Sr87OimT19SrwzatCUdWghLGI="; + }; + + # Module doesn't have tests + doCheck = false; + + pythonImportsCheck = [ + "psutil-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for psutil"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ anselmschueler ]; + }; +} diff --git a/pkgs/development/python-modules/types-python-dateutil/default.nix b/pkgs/development/python-modules/types-python-dateutil/default.nix index acf092b8411c..e671b91bb979 100644 --- a/pkgs/development/python-modules/types-python-dateutil/default.nix +++ b/pkgs/development/python-modules/types-python-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.19.4"; + version = "2.8.19.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-NRqMqa/UrqZi+HwXJNLhrln59fmWkb47OxHSOTzTqqE="; + hash = "sha256-Sm9MwZzkuhoIZwhx4pe/OAL1XU8SnmqiRD9UC2z4A9I="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 7ba9ad6d971a..5968bb38f2e3 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 = "2022.6.0.1"; + version = "2022.7.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0HgZY3TRJ36fmYTUk3PqBDzyxk1dXEkfvIbCWFV71G8="; + sha256 = "sha256-kY+cPnqVC6fn1vhLGKfKyryIhstxJfsZJ/8cdStLWd4="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-pyyaml/default.nix b/pkgs/development/python-modules/types-pyyaml/default.nix index f61550c4148b..f0b4056e2b58 100644 --- a/pkgs/development/python-modules/types-pyyaml/default.nix +++ b/pkgs/development/python-modules/types-pyyaml/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pyyaml"; - version = "6.0.12.1"; + version = "6.0.12.3"; format = "setuptools"; src = fetchPypi { pname = "types-PyYAML"; inherit version; - sha256 = "sha256-cMyq/PP7QE1Xv/wVKf3YahPotPLPn8PugaZAjOCtWdI="; + sha256 = "sha256-F84Xs+rY8G5BajsdW43cbLgqQiuyACVN2LRpQ0sEX/w="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 8928dda88fef..3a970d42d054 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.3.21.3"; + version = "4.4.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Lh8YQFYYjIdU3tC1Fz3AGCTSv+QZdf4xgGimi+7ftiw="; + sha256 = "sha256-fYJtRY6abb19TyH99tfDm6Li80dMijSAACQZZYYKDt8="; }; # Module 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 730a0a591540..274e69ca7768 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.28.11.5"; + version = "2.28.11.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-p983zG+2GHqECX2pUfjiHTNUSKolAaawo5y9HXyp7io="; + sha256 = "sha256-5nQkUl+ErfvqtyaKFZ08Yzhi2vrhXFsZVHzhtVlU8KM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-retry/default.nix b/pkgs/development/python-modules/types-retry/default.nix index 53323d950cbf..29652179d2f1 100644 --- a/pkgs/development/python-modules/types-retry/default.nix +++ b/pkgs/development/python-modules/types-retry/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-retry"; - version = "0.9.9"; + version = "0.9.9.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-sQh7J0aAtULHllSehIiJjQsizYmYjvEBbvVtQ2f/T0E="; + hash = "sha256-NE6tQ4fg6YxtYDdYwTGO5OWwRCnOy5o0Khz4c947UQ0="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index c67524015ee1..661d3ce8c7a1 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 = "65.5.0.3"; + version = "65.6.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-F3aRcfXyotxpslwNMQZVKlzadnu/azbLYhKyba5aqfw="; + sha256 = "sha256-rWDM8B1ibel2IiREjzbBPgZg6GOv1twR2Xmzc5psfSQ="; }; # 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 f9bc60a8b92c..fe16137f19a8 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.8.1"; + version = "1.5.8.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-9kwV7ATAkRgZrEwP0AUnlRMgAfv16iPR1+T+rX3km/w="; + hash = "sha256-OmK8JRaPi0TOdOERT5+8Luh9bpbjiAy+85qtlSJVW04="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/typesentry/default.nix b/pkgs/development/python-modules/typesentry/default.nix index a4d8125b5d61..5aa12fb041ad 100644 --- a/pkgs/development/python-modules/typesentry/default.nix +++ b/pkgs/development/python-modules/typesentry/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { }; propagatedBuildInputs = [ colorama ]; - checkInputs = [ pytest pytest-cov ]; + nativeCheckInputs = [ pytest pytest-cov ]; checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix index 30d26293e5d1..18834d9c3899 100644 --- a/pkgs/development/python-modules/typesystem/default.nix +++ b/pkgs/development/python-modules/typesystem/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/typical/default.nix b/pkgs/development/python-modules/typical/default.nix index 066c3f452ed1..4914e011e9dc 100644 --- a/pkgs/development/python-modules/typical/default.nix +++ b/pkgs/development/python-modules/typical/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ujson ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mypy pydantic diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index 36464204e75d..01ef53e479ad 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "typing-extensions"; - version = "4.3.0"; + version = "4.4.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typing_extensions"; inherit version; - hash = "sha256-5tJnejL0f8frJ5XbHdFcHzTv9ha8ryz7Xpl/hU+hxKY="; + hash = "sha256-FRFDS7kr+N0ZjBKxzIEugA1Bgc/LhnZ04PgnnMkwh6o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix index e79eb6823efa..b0418176bf41 100644 --- a/pkgs/development/python-modules/typing-inspect/default.nix +++ b/pkgs/development/python-modules/typing-inspect/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { mypy-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/typish/default.nix b/pkgs/development/python-modules/typish/default.nix index 8b7fcdce39bf..c0942c701683 100644 --- a/pkgs/development/python-modules/typish/default.nix +++ b/pkgs/development/python-modules/typish/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0mc5hw92f15mwd92rb2q9isc4wi7xq76449w7ph5bskcspas0wrf"; }; - checkInputs = [ + nativeCheckInputs = [ numpy pytestCheckHook ]; diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix index 2e3cdafc8a12..7059c9cae15c 100644 --- a/pkgs/development/python-modules/tzdata/default.nix +++ b/pkgs/development/python-modules/tzdata/default.nix @@ -10,19 +10,19 @@ buildPythonPackage rec { pname = "tzdata"; - version = "2022.6"; + version = "2022.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-kfEdtFAzhZKMFVmMmFc+OvB+cikYG+5Tdb0w8Wld3K4="; + hash = "sha256-/l+Gbt3YuW6fy6l4+OUDyQmxnqfv2hHlLjlJS606e/o="; }; nativeBuildInputs = [ setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-subtests ] ++ lib.optionals (pythonOlder "3.7") [ diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index bb51abb1822c..392e8e899240 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pytz-deprecation-shim ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix index 1a82fe4b70a8..18215f96bbca 100644 --- a/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -7,18 +7,18 @@ buildPythonPackage rec { pname = "u-msgpack-python"; - version = "2.7.1"; + version = "2.7.2"; src = fetchPypi { inherit pname version; - sha256 = "b7e7d433cab77171a4c752875d91836f3040306bab5063fb6dbe11f64ea69551"; + sha256 = "sha256-6G96xqoO9MbEnwBLT9Q1vOmcI+LdXXMAPz+YFgJMK9g="; }; LC_ALL="en_US.UTF-8"; buildInputs = [ glibcLocales ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = { description = "A portable, lightweight MessagePack serializer and deserializer written in pure Python"; diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix index e324459e9810..e9c9a561739c 100644 --- a/pkgs/development/python-modules/ua-parser/default.nix +++ b/pkgs/development/python-modules/ua-parser/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 6fb474aefc2b..985a0af28f83 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.6.0"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LDG3ShCFbszyWNc8TQjlysTWBgo0uYNIkL/UK8sTg1A="; + sha256 = "sha256-fOA+tGANKKHeq0uGbzd9Tq5/yc3Gfj6I94jV8daD3IY="; }; patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index 4d7fe6b034b4..f1b3c49646f9 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { } )]; - checkInputs = [ pytestCheckHook pytest-cov ]; + nativeCheckInputs = [ pytestCheckHook pytest-cov ]; propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions ]; # Tests must be run from outside the source directory diff --git a/pkgs/development/python-modules/uasiren/default.nix b/pkgs/development/python-modules/uasiren/default.nix index 49ab9906c51b..b6771266f2ab 100644 --- a/pkgs/development/python-modules/uasiren/default.nix +++ b/pkgs/development/python-modules/uasiren/default.nix @@ -38,7 +38,7 @@ buildPythonPackage { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/uc-micro-py/default.nix b/pkgs/development/python-modules/uc-micro-py/default.nix index 9b20e2251165..d83a4cbd54d2 100644 --- a/pkgs/development/python-modules/uc-micro-py/default.nix +++ b/pkgs/development/python-modules/uc-micro-py/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-23mKwoRGjtxpCOC26V8bAN5QEHLDOoSqPeTlUuIrxZ0="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "uc_micro" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 5a87bfd42c2b..8f3eb8c4853f 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -1,47 +1,52 @@ { lib , buildPythonPackage , fetchPypi + +# build , setuptools-scm -, fonttools -, defcon -, compreffor + +# runtime , booleanoperations , cffsubr +, compreffor +, cu2qu +, defcon +, fonttools +, skia-pathops , ufoLib2 + +# tests , pytestCheckHook }: buildPythonPackage rec { pname = "ufo2ft"; - version = "2.28.0"; - + version = "2.30.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pWHvjAvHNWlmJiQ75JRmFyrjYnzbJG7M8/DGoIWpEBk="; + hash = "sha256-ZpO55rNXkVbqMdGxsZn77gJnGBbM8c8GIAaQnTzVnf8="; }; - patches = [ - # Use cu2qu from fonttools. - # https://github.com/googlefonts/ufo2ft/pull/461 - ./fonttools-cu2qu.patch - ]; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ + cu2qu fonttools defcon compreffor booleanoperations cffsubr ufoLib2 - ]; + skia-pathops + ] + ++ fonttools.optional-dependencies.lxml + ++ fonttools.optional-dependencies.ufo; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ufoLib2/default.nix b/pkgs/development/python-modules/ufoLib2/default.nix index fab42e5169b8..7a959147deaf 100644 --- a/pkgs/development/python-modules/ufoLib2/default.nix +++ b/pkgs/development/python-modules/ufoLib2/default.nix @@ -4,35 +4,46 @@ , attrs , fonttools , pytestCheckHook -, fs , setuptools-scm + +# optionals +, cattrs +, lxml +, orjson +, msgpack }: buildPythonPackage rec { pname = "ufoLib2"; - version = "0.13.1"; - + version = "0.14.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MnWi2mI+bUt+4pyYTNs6W4a7wj8KHOlEhti7XDCKpHs="; + hash = "sha256-OdUJfNe3nOQyCf3nT9/5y/C8vZXnSAWiLHvZ8GXMViw="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ attrs fonttools - # required by fonttools[ufo] - fs - ]; + ] ++ fonttools.optional-dependencies.ufo; - nativeBuildInputs = [ setuptools-scm ]; + passthru.optional-dependencies = { + lxml = [ lxml ]; + converters = [ cattrs ]; + json = [ cattrs orjson ]; + msgpack = [ cattrs msgpack ]; + }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); -pythonImportsCheck = [ "ufoLib2" ]; + pythonImportsCheck = [ "ufoLib2" ]; meta = with lib; { description = "Library to deal with UFO font sources"; diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix index ac0fd9fb66b1..ce9d4da479f0 100644 --- a/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/pkgs/development/python-modules/uharfbuzz/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ ApplicationServices ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index 15e71e9544d9..7f9ca14ebdbe 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -8,19 +8,19 @@ buildPythonPackage rec { pname = "ujson"; - version = "5.5.0"; + version = "5.6.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-slB3qXHH2ke9aEapEqdH9pY3dtkHIMiGA7G1XYF5B4A="; + sha256 = "sha256-+IHi2KAi6Shaouq2uoZ0NY28srV/poYY2I1ik3rD/wQ="; }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ukkonen/default.nix b/pkgs/development/python-modules/ukkonen/default.nix index dfdcf3515220..5ea0930d7d89 100644 --- a/pkgs/development/python-modules/ukkonen/default.nix +++ b/pkgs/development/python-modules/ukkonen/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { cffi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ukrainealarm/default.nix b/pkgs/development/python-modules/ukrainealarm/default.nix index 00854ded3167..4cd4d2a852a9 100644 --- a/pkgs/development/python-modules/ukrainealarm/default.nix +++ b/pkgs/development/python-modules/ukrainealarm/default.nix @@ -38,7 +38,7 @@ buildPythonPackage { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 25016f9b4cc5..001a5f1b4208 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , keras , numba , numpy @@ -27,6 +28,22 @@ buildPythonPackage rec { hash = "sha256-S2+k7Ec4AxsN6d0GUGnU81oLnBgmlZp8OmUFCNaUJYw="; }; + patches = [ + # Fix tests with sklearn>=1.2.0 + (fetchpatch { + url = "https://github.com/lmcinnes/umap/commit/a714b59bd9e2ca2e63312bc3491b2b037a42f2f2.patch"; + hash = "sha256-WOSWNN5ewVTV7IEBEA7ZzgZYMZxctF1jAWs9ylKTyLs="; + }) + (fetchpatch { + url = "https://github.com/lmcinnes/umap/commit/c7d05683325589ad432a55e109cacb9d631cfaa9.patch"; + hash = "sha256-hE2Svxf7Uja+DbCmTDCnd7mZynjNbC5GUjfqg4ZRO9Y="; + }) + (fetchpatch { + url = "https://github.com/lmcinnes/umap/commit/949abd082524fce8c45dfb147bcd8e8ef49eade3.patch"; + hash = "sha256-8/1k8iYeF77FIaUApNtY07auPJkrt3vNRR/HTYRvq+0="; + }) + ]; + propagatedBuildInputs = [ numba numpy @@ -36,7 +53,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ keras pytestCheckHook tensorflow diff --git a/pkgs/development/python-modules/umodbus/default.nix b/pkgs/development/python-modules/umodbus/default.nix index 845548dcb790..331a4b1306d2 100644 --- a/pkgs/development/python-modules/umodbus/default.nix +++ b/pkgs/development/python-modules/umodbus/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pyserial ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/unasync/default.nix b/pkgs/development/python-modules/unasync/default.nix index 9b37edfb2841..d6e8c99510e4 100644 --- a/pkgs/development/python-modules/unasync/default.nix +++ b/pkgs/development/python-modules/unasync/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index 06bdf12349dc..f2fdbd748cd1 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ future ]; - checkInputs = [ nose numpy ]; + nativeCheckInputs = [ nose numpy ]; checkPhase = '' nosetests -sv diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 15c7322fb3c3..4f9a2a9526d7 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -12,15 +12,15 @@ buildPythonPackage rec { pname = "uncompyle6"; - version = "3.8.0"; + version = "3.9.0"; disabled = pythonAtLeast "3.9"; # See: https://github.com/rocky/python-uncompyle6/issues/331 src = fetchPypi { inherit pname version; - sha256 = "sha256-YgYzYY9t/B8+eBh+Igk014/8Y5wOOdrsofxTWquBcBQ="; + sha256 = "sha256-HmqQLeYOpcP30q9+J0UAa05Lm97eiIoH+EQcmTjy7n0="; }; - checkInputs = [ nose pytest hypothesis six ]; + nativeCheckInputs = [ nose pytest hypothesis six ]; propagatedBuildInputs = [ spark_parser xdis ]; # six import errors (yet it is supplied...) diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index c12074136930..0501a1695cbd 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -2,12 +2,10 @@ , buildPythonPackage , fetchPypi , pythonOlder - , cached-property , packaging , pdm-pep517 , requests - , flask , pytest-httpserver , pytestCheckHook @@ -17,13 +15,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.6.1"; + version = "0.7.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-S3v719NKEWc9gN+uf6u/khwTmqx4OD+wyhapDTtTpm4="; + hash = "sha256-z1RBGze3qUHzzf3ymu7ivxgWSor8o1xGe5f+q2JuZx4="; }; nativeBuildInputs = [ @@ -37,7 +36,7 @@ buildPythonPackage rec { cached-property ]; - checkInputs = [ + nativeCheckInputs = [ flask pytest-httpserver pytestCheckHook @@ -45,9 +44,14 @@ buildPythonPackage rec { trustme ]; + pythonImportsCheck = [ + "unearth" + ]; + meta = with lib; { + description = "A utility to fetch and download Python packages"; homepage = "https://github.com/frostming/unearth"; - description = "A utility to fetch and download python packages"; + changelog = "https://github.com/frostming/unearth/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ betaboon ]; }; diff --git a/pkgs/development/python-modules/unicode-slugify/default.nix b/pkgs/development/python-modules/unicode-slugify/default.nix index 3d91368dd60a..1a4ccb1ee7d9 100644 --- a/pkgs/development/python-modules/unicode-slugify/default.nix +++ b/pkgs/development/python-modules/unicode-slugify/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six unidecode ]; - checkInputs = [ + nativeCheckInputs = [ nose unittestCheckHook ]; diff --git a/pkgs/development/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix index ea878d6e0cbc..5e09df1f6d1f 100644 --- a/pkgs/development/python-modules/unicodedata2/default.nix +++ b/pkgs/development/python-modules/unicodedata2/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0bcgls7m2zndpd8whgznnd5908jbsa50si2bh88wsn0agcznhv7d"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Backport and updates for the unicodedata module"; diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix index 96e487871aa3..5fcf87e9ced9 100644 --- a/pkgs/development/python-modules/unidecode/default.nix +++ b/pkgs/development/python-modules/unidecode/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "unidecode"; - version = "1.3.4"; + version = "1.3.6"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -16,10 +16,10 @@ buildPythonPackage rec { owner = "avian2"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-2LRV6Egst2bdxefEzfuA9Ef8zMSWvmlCEV/sIzezyPw="; + hash = "sha256-75E2OlrGIxvwR9MeZEB4bDLdFd1SdprCVcBIJCPS3hM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -29,7 +29,8 @@ buildPythonPackage rec { meta = with lib; { description = "ASCII transliterations of Unicode text"; - homepage = "https://pypi.python.org/pypi/Unidecode/"; + homepage = "https://github.com/avian2/unidecode"; + changelog = "https://github.com/avian2/unidecode/blob/unidecode-${version}/ChangeLog"; license = licenses.gpl2Plus; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/unidiff/default.nix b/pkgs/development/python-modules/unidiff/default.nix index 2fea8dca66f2..c34e70eb9d26 100644 --- a/pkgs/development/python-modules/unidiff/default.nix +++ b/pkgs/development/python-modules/unidiff/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "2bbcbc986e1fb97f04b1d7b864aa6002ab02f4d8a996bf03aa6e5a81447d1fc5"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/pkgs/development/python-modules/unifi-discovery/default.nix b/pkgs/development/python-modules/unifi-discovery/default.nix index 387818583777..cd53dae36822 100644 --- a/pkgs/development/python-modules/unifi-discovery/default.nix +++ b/pkgs/development/python-modules/unifi-discovery/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pyroute2 ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/unify/default.nix b/pkgs/development/python-modules/unify/default.nix index 45b755711705..1935374d37e1 100644 --- a/pkgs/development/python-modules/unify/default.nix +++ b/pkgs/development/python-modules/unify/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ untokenize ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "Modifies strings to all use the same quote where possible"; diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix index c59b3428c096..d84f5c36d81e 100644 --- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { lxml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/unittest2/collections-compat.patch b/pkgs/development/python-modules/unittest2/collections-compat.patch deleted file mode 100644 index 350c9d716783..000000000000 --- a/pkgs/development/python-modules/unittest2/collections-compat.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/unittest2/compatibility.py b/unittest2/compatibility.py -index 9e5f1a5..473957c 100644 ---- a/unittest2/compatibility.py -+++ b/unittest2/compatibility.py -@@ -1,4 +1,5 @@ - import collections -+import collections.abc - import os - import sys - -@@ -140,7 +141,7 @@ except ImportError: - ### ChainMap (helper for configparser and string.Template) - ######################################################################## - --class ChainMap(collections.MutableMapping): -+class ChainMap(collections.abc.MutableMapping): - ''' A ChainMap groups multiple dicts (or other mappings) together - to create a single, updateable view. - diff --git a/pkgs/development/python-modules/unittest2/default.nix b/pkgs/development/python-modules/unittest2/default.nix deleted file mode 100644 index 786b8996f83b..000000000000 --- a/pkgs/development/python-modules/unittest2/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, six -, traceback2 -, pythonAtLeast -}: - -buildPythonPackage rec { - version = "1.1.0"; - pname = "unittest2"; - - src = fetchPypi { - inherit pname version; - sha256 = "0y855kmx7a8rnf81d3lh5lyxai1908xjp0laf4glwa4c8472m212"; - }; - - patches = lib.optionals (pythonAtLeast "3.7") [ - ./collections-compat.patch - ]; - - propagatedBuildInputs = [ six traceback2 ]; - - # 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 - 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 - ''; - - meta = with lib; { - description = "A backport of the new features added to the unittest testing framework"; - homepage = "https://pypi.org/project/unittest2/"; - license = licenses.bsd0; - }; -} diff --git a/pkgs/development/python-modules/univers/default.nix b/pkgs/development/python-modules/univers/default.nix index ca3f2b6ce445..f40fc7d99ebe 100644 --- a/pkgs/development/python-modules/univers/default.nix +++ b/pkgs/development/python-modules/univers/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs packaging pyparsing semantic-version semver ]; - checkInputs = [ commoncode pytestCheckHook saneyaml ]; + nativeCheckInputs = [ commoncode pytestCheckHook saneyaml ]; dontConfigure = true; # ./configure tries to setup virtualenv and downloads dependencies diff --git a/pkgs/development/python-modules/untangle/default.nix b/pkgs/development/python-modules/untangle/default.nix index 22472549e6cc..0948e91c72c8 100644 --- a/pkgs/development/python-modules/untangle/default.nix +++ b/pkgs/development/python-modules/untangle/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { defusedxml ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/pkgs/development/python-modules/untokenize/default.nix b/pkgs/development/python-modules/untokenize/default.nix index 2977ffd76e5d..3ee6b53d0586 100644 --- a/pkgs/development/python-modules/untokenize/default.nix +++ b/pkgs/development/python-modules/untokenize/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "3865dbbbb8efb4bb5eaa72f1be7f3e0be00ea8b7f125c69cbd1f5fda926f37a2"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "Transforms tokens into original source code while preserving whitespace"; diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix index 52b422c0e1d3..50b4d7a4d0a5 100644 --- a/pkgs/development/python-modules/upb-lib/default.nix +++ b/pkgs/development/python-modules/upb-lib/default.nix @@ -8,13 +8,14 @@ buildPythonPackage rec { pname = "upb-lib"; - version = "0.5.1"; + version = "0.5.3"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-iXwJPe6YYG2TWiQ/dXbeIiadzGMgFzZa6Now692r+t0="; + pname = "upb_lib"; + inherit version; + hash = "sha256-I1lnIr8ptDCyK8r0bvFWFPUGRwoMsQcNnSCSwzdt1Bc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/upcloud-api/default.nix b/pkgs/development/python-modules/upcloud-api/default.nix index e70a49be5a87..379a3ebd2d5d 100644 --- a/pkgs/development/python-modules/upcloud-api/default.nix +++ b/pkgs/development/python-modules/upcloud-api/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/pkgs/development/python-modules/update-dotdee/default.nix b/pkgs/development/python-modules/update-dotdee/default.nix index a89f0df403c3..00e4e51ebb78 100644 --- a/pkgs/development/python-modules/update-dotdee/default.nix +++ b/pkgs/development/python-modules/update-dotdee/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 784d02dafa42..b4d0f71a5af8 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -1,13 +1,15 @@ { lib -, awkward , buildPythonPackage , fetchFromGitHub +, pythonOlder +, awkward +, hatchling , importlib-metadata -, lz4 , numpy , packaging , pytestCheckHook -, pythonOlder +, lz4 +, pytest-timeout , scikit-hep-testdata , xxhash , zstandard @@ -15,32 +17,37 @@ buildPythonPackage rec { pname = "uproot"; - version = "4.3.6"; - format = "setuptools"; + version = "5.0.2"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "scikit-hep"; - repo = "uproot4"; + repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-Te4D2tHVD5fD8DH2njjQMGnTUvLQdcGBzApklnGn6g8="; + hash = "sha256-cklLbTO/EooQpq8vavKgloncSlyIX7DW+T9Cauyn6ng="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ awkward numpy - lz4 packaging - xxhash - zstandard ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook + lz4 + pytest-timeout scikit-hep-testdata + xxhash + zstandard ]; preCheck = '' diff --git a/pkgs/development/python-modules/uproot3-methods/default.nix b/pkgs/development/python-modules/uproot3-methods/default.nix deleted file mode 100644 index f5760b974ffd..000000000000 --- a/pkgs/development/python-modules/uproot3-methods/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, numpy -, awkward0 -}: - -buildPythonPackage rec { - version = "0.10.1"; - pname = "uproot3-methods"; - - src = fetchPypi { - inherit pname version; - sha256 = "dd68f90be1ea276360b96369836849df29045f7fe4e534f9ac21ea00798ee358"; - }; - - nativeBuildInputs = [ awkward0 ]; - - propagatedBuildInputs = [ numpy awkward0 ]; - - # No tests on PyPi - doCheck = false; - pythonImportsCheck = [ "uproot3_methods" ]; - - meta = with lib; { - homepage = "https://github.com/scikit-hep/uproot3-methods"; - description = "Pythonic mix-ins for ROOT classes"; - license = licenses.bsd3; - maintainers = with maintainers; [ costrouc SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/python-modules/uproot3/default.nix b/pkgs/development/python-modules/uproot3/default.nix deleted file mode 100644 index e5b3903eefa7..000000000000 --- a/pkgs/development/python-modules/uproot3/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, fetchFromGitHub, buildPythonPackage, isPy27 -, awkward0, backports_lzma ? null, cachetools, lz4, pandas -, pytestCheckHook, pkgconfig, mock -, numpy, requests, uproot3-methods, xxhash, zstandard -}: - -buildPythonPackage rec { - pname = "uproot3"; - version = "3.14.4"; - - src = fetchFromGitHub { - owner = "scikit-hep"; - repo = "uproot3"; - rev = version; - sha256 = "sha256-hVJpKdYvyoCPyqgZzKYp30SvkYm+HWSNBdd9bYCYACE="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner"' "" - ''; - - propagatedBuildInputs = [ - awkward0 - cachetools - lz4 - numpy - uproot3-methods - xxhash - zstandard - ] ++ lib.optional isPy27 backports_lzma; - - checkInputs = [ - mock - pandas - pkgconfig - pytestCheckHook - requests - ] ++ lib.optional isPy27 backports_lzma; - - meta = with lib; { - homepage = "https://github.com/scikit-hep/uproot3"; - description = "ROOT I/O in pure Python and Numpy"; - license = licenses.bsd3; - maintainers = with maintainers; [ ktf SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/python-modules/uptime-kuma-api/default.nix b/pkgs/development/python-modules/uptime-kuma-api/default.nix new file mode 100644 index 000000000000..e9af904e9cd8 --- /dev/null +++ b/pkgs/development/python-modules/uptime-kuma-api/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python-socketio +, pythonOlder +}: + +buildPythonPackage rec { + pname = "uptime-kuma-api"; + version = "0.9.0"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "uptime_kuma_api"; + inherit version; + hash = "sha256-nbRBsG4Mietd6kcrvpbTbWUP0SMRXbW4mWme1G5n3ks="; + }; + + propagatedBuildInputs = [ + python-socketio + python-socketio.optional-dependencies.client + ]; + + pythonImportsCheck = [ + "uptime_kuma_api" + ]; + + # Tests need an uptime-kuma instance to run + doCheck = false; + + meta = with lib; { + description = "A Python wrapper for the Uptime Kuma Socket.IO API"; + homepage = "https://github.com/lucasheld/uptime-kuma-api"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ julienmalka ]; + }; +} diff --git a/pkgs/development/python-modules/uritemplate/default.nix b/pkgs/development/python-modules/uritemplate/default.nix index 814e7fd8c19a..ccd1126439f5 100644 --- a/pkgs/development/python-modules/uritemplate/default.nix +++ b/pkgs/development/python-modules/uritemplate/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { simplejson ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index 3d1b274d0690..76678539bd9c 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "uritools"; - version = "4.0.0"; + version = "4.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "420d94c1ff4bf90c678fca9c17b8314243bbcaa992c400a95e327f7f622e1edf"; + hash = "sha256-78XDpt4FQEhQaFqNPzTahHa1aqNRb7+O/1yHBMeigm8="; }; pythonImportsCheck = [ @@ -23,6 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "RFC 3986 compliant, Unicode-aware, scheme-agnostic replacement for urlparse"; homepage = "https://github.com/tkem/uritools/"; + changelog = "https://github.com/tkem/uritools/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ rvolosatovs ]; }; diff --git a/pkgs/development/python-modules/url-normalize/default.nix b/pkgs/development/python-modules/url-normalize/default.nix index 3032f7791a70..a3cca49393e7 100644 --- a/pkgs/development/python-modules/url-normalize/default.nix +++ b/pkgs/development/python-modules/url-normalize/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytest-flakes pytest-mock pytest-socket diff --git a/pkgs/development/python-modules/urlextract/default.nix b/pkgs/development/python-modules/urlextract/default.nix index 855af054a384..90fb0d457c0a 100644 --- a/pkgs/development/python-modules/urlextract/default.nix +++ b/pkgs/development/python-modules/urlextract/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "urlextract"; - version = "1.7.1"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DYg7Wd5Th4c+o4JeYrNDWDMTE1rGZMP1wNVfF7Kzv30="; + hash = "sha256-NXP2uBKBTv4GykbpHoLZhO2qPNB9qqqilqRnrZiBoDc="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { uritools ]; - checkInputs = [ + nativeCheckInputs = [ dnspython pytestCheckHook ]; @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collects and extracts URLs from given text"; homepage = "https://github.com/lipoja/URLExtract"; + changelog = "https://github.com/lipoja/URLExtract/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ilkecan ]; }; diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index ec63f5f21ed9..37390c12ba92 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -20,19 +20,19 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.26.12"; + version = "1.26.13"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-P6ls9CPmmHmX/DJq6N85bbKot8ZndH1H3djsupH0p04="; + hash = "sha256-wIPdDc5o2/vhEp1SccuQ+UR96n1SCXxuASYSDFId3qg="; }; # FIXME: remove backwards compatbility hack propagatedBuildInputs = passthru.optional-dependencies.brotli ++ passthru.optional-dependencies.socks; - checkInputs = [ + nativeCheckInputs = [ python-dateutil mock pytest-freezegun @@ -64,15 +64,27 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - brotli = if isPyPy then [ brotlicffi ] else [ brotli ]; + brotli = if isPyPy then [ + brotlicffi + ] else [ + brotli + ]; # Use carefully since pyopenssl is not supported aarch64-darwin - secure = [ certifi cryptography idna pyopenssl ]; - socks = [ pysocks ]; + secure = [ + certifi + cryptography + idna + pyopenssl + ]; + socks = [ + pysocks + ]; }; meta = with lib; { description = "Powerful, sanity-friendly HTTP client for Python"; homepage = "https://github.com/shazow/urllib3"; + changelog = "https://github.com/urllib3/urllib3/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/urlpy/default.nix b/pkgs/development/python-modules/urlpy/default.nix index cd0e028c50c0..cd03957e00e1 100644 --- a/pkgs/development/python-modules/urlpy/default.nix +++ b/pkgs/development/python-modules/urlpy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { publicsuffix2 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/urwid-readline/default.nix b/pkgs/development/python-modules/urwid-readline/default.nix index 192676ceac82..3ea35c2a9058 100644 --- a/pkgs/development/python-modules/urwid-readline/default.nix +++ b/pkgs/development/python-modules/urwid-readline/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { urwid ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales pytestCheckHook ]; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 57e64ba97a89..7e135e2aa7f0 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , isPy3k , glibcLocales }: @@ -15,9 +16,18 @@ buildPythonPackage rec { sha256 = "588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae"; }; + patches = [ + # https://github.com/urwid/urwid/pull/517 + (fetchpatch { + name = "python311-compat.patch"; + url = "https://github.com/urwid/urwid/commit/42c1ed1eeb663179b265bae9b384d7ec11c8a9b5.patch"; + hash = "sha256-Oz8O/M6AdqbB6C/BB5rtxp8FgdGhZUxkSxKIyq5Dmho="; + }) + ]; + # tests need to be able to set locale LC_ALL = "en_US.UTF-8"; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; # tests which assert on strings don't decode results correctly doCheck = isPy3k; diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix index 863989156c3d..372d6830f8d0 100644 --- a/pkgs/development/python-modules/urwidtrees/default.nix +++ b/pkgs/development/python-modules/urwidtrees/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; LC_ALL="en_US.UTF-8"; meta = with lib; { diff --git a/pkgs/development/python-modules/usb-devices/default.nix b/pkgs/development/python-modules/usb-devices/default.nix new file mode 100644 index 000000000000..8a77fd8597f9 --- /dev/null +++ b/pkgs/development/python-modules/usb-devices/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "usb-devices"; + version = "0.4.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-9w7YCAEpdptQC0GCnJCEyhZgcHMDIw0alj7q4Y82hmA="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=usb_devices --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "usb_devices" + ]; + + meta = with lib; { + description = "Library for for mapping, describing, and resetting USB devices"; + homepage = "https://github.com/Bluetooth-Devices/usb-devices"; + changelog = "https://github.com/Bluetooth-Devices/usb-devices/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ush/default.nix b/pkgs/development/python-modules/ush/default.nix index 3e7773fb2fd9..7ce8ec1f28a7 100644 --- a/pkgs/development/python-modules/ush/default.nix +++ b/pkgs/development/python-modules/ush/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-eL3vG3yS02enbLYorKvvYKbju9HInffUhrZgkodwhvo="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook six ]; diff --git a/pkgs/development/python-modules/utils/default.nix b/pkgs/development/python-modules/utils/default.nix index a6dd57e0e5ea..c2ad8a87904c 100644 --- a/pkgs/development/python-modules/utils/default.nix +++ b/pkgs/development/python-modules/utils/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "07pr39cfw5ayzkp6h53y7lfpd0w19pphsdzsf100fsyy3npavgbr"; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/uvcclient/default.nix b/pkgs/development/python-modules/uvcclient/default.nix index 1490172a463a..61a14b85ebeb 100644 --- a/pkgs/development/python-modules/uvcclient/default.nix +++ b/pkgs/development/python-modules/uvcclient/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0k8aswrk1n08w6pi6dg0zdzsmk23cafihkrss9ywg3i85w7q43x2"; }; - checkInputs = [ + nativeCheckInputs = [ nose mock ]; diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 26d23f08afa4..e48536e66359 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -11,19 +11,22 @@ , uvloop , watchfiles , websockets +, hatchling , pythonOlder }: buildPythonPackage rec { pname = "uvicorn"; - version = "0.18.2"; - disabled = pythonOlder "3.6"; + version = "0.20.0"; + disabled = pythonOlder "3.7"; + + format = "pyproject"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - hash = "sha256-nxtDqYh2OmDtoV10CEBGYQrQBf+Xtuf5k9yR6UfCgYc="; + hash = "sha256-yca6JI3/aqdZF7SxFeYr84GOeQnLBmbm1dIXjngX9Ng="; }; outputs = [ @@ -31,6 +34,8 @@ buildPythonPackage rec { "testsout" ]; + nativeBuildInputs = [ hatchling ]; + propagatedBuildInputs = [ click h11 diff --git a/pkgs/development/python-modules/uvicorn/tests.nix b/pkgs/development/python-modules/uvicorn/tests.nix index b9cd883f43c0..cb8e479377a8 100644 --- a/pkgs/development/python-modules/uvicorn/tests.nix +++ b/pkgs/development/python-modules/uvicorn/tests.nix @@ -16,12 +16,14 @@ buildPythonPackage rec { pname = "uvicorn-tests"; inherit (uvicorn) version; + format = "other"; + src = uvicorn.testsout; dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ asgiref uvicorn httpx @@ -44,6 +46,8 @@ buildPythonPackage rec { disabledTests = [ "test_supported_upgrade_request" "test_invalid_upgrade" + "test_no_server_headers" + "test_multiple_server_header" ]; } diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index fafc027337a0..ac3da7eb78d3 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; dontUseSetuptoolsCheck = true; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook psutil ] ++ lib.optionals (pythonOlder "3.11") [ diff --git a/pkgs/development/python-modules/vaa/default.nix b/pkgs/development/python-modules/vaa/default.nix index d43f007c35cd..54c2520ee665 100644 --- a/pkgs/development/python-modules/vaa/default.nix +++ b/pkgs/development/python-modules/vaa/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook cerberus django diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix index 8cb42064ba21..85809e0a5f2c 100644 --- a/pkgs/development/python-modules/validators/default.nix +++ b/pkgs/development/python-modules/validators/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/validobj/default.nix b/pkgs/development/python-modules/validobj/default.nix index 3f0f40fc26c6..be42bfc0792a 100644 --- a/pkgs/development/python-modules/validobj/default.nix +++ b/pkgs/development/python-modules/validobj/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ flit ]; - checkInputs = [ hypothesis pytestCheckHook ]; + nativeCheckInputs = [ hypothesis pytestCheckHook ]; pythonImportsCheck = [ "validobj" ]; diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix index 821dbb19e635..0b667d921841 100644 --- a/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , construct , websockets , asynctest @@ -10,25 +11,28 @@ buildPythonPackage rec { pname = "vallox-websocket-api"; - version = "2.12.0"; + version = "3.0.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; - format = "setuptools"; - src = fetchFromGitHub { owner = "yozik04"; repo = "vallox_websocket_api"; rev = "refs/tags/${version}"; - hash = "sha256-Ibp+oAd6q8Vu9V+TaLzlPbWIDheFUjCyW83Hg4Ztw20="; + hash = "sha256-iy5ipW7ldvLWhfxgPlWcsFeKrAXqtyypveAX74u8zmo="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ construct websockets ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytestCheckHook ]; diff --git a/pkgs/development/python-modules/vapoursynth/default.nix b/pkgs/development/python-modules/vapoursynth/default.nix index 3a72e5c2d9d0..da75653962ef 100644 --- a/pkgs/development/python-modules/vapoursynth/default.nix +++ b/pkgs/development/python-modules/vapoursynth/default.nix @@ -13,7 +13,7 @@ buildPythonPackage { vapoursynth ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix index 2b5dccec558a..e1483dbf96fd 100644 --- a/pkgs/development/python-modules/variants/default.nix +++ b/pkgs/development/python-modules/variants/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook six ]; diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index 9abd727e725c..043d08a022bb 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -1,51 +1,57 @@ -{ buildPythonPackage -, lib -, isPy27 -, six +{ lib +, buildPythonPackage , fetchPypi -, pyyaml , mock -, contextlib2 -, wrapt -, pytest , pytest-httpbin -, yarl +, pytestCheckHook , pythonOlder -, pythonAtLeast +, pyyaml +, six +, yarl +, wrapt }: buildPythonPackage rec { pname = "vcrpy"; version = "4.2.1"; + format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fNPoGixJLgHCgfGAvMKoa1ILFz0rZWy12J2ZR1Qj4BM="; + hash = "sha256-fNPoGixJLgHCgfGAvMKoa1ILFz0rZWy12J2ZR1Qj4BM="; }; - checkInputs = [ - pytest - pytest-httpbin - ]; - propagatedBuildInputs = [ pyyaml - wrapt six - ] - ++ lib.optionals (pythonOlder "3.3") [ contextlib2 mock ] - ++ lib.optionals (pythonAtLeast "3.4") [ yarl ]; + yarl + wrapt + ]; - checkPhase = '' - py.test --ignore=tests/integration -k "not TestVCRConnection" - ''; + nativeCheckInputs = [ + pytest-httpbin + pytestCheckHook + ]; + + disabledTestPaths = [ + "tests/integration" + ]; + + disabledTests = [ + "TestVCRConnection" + ]; + + pythonImportsCheck = [ + "vcr" + ]; meta = with lib; { description = "Automatically mock your HTTP interactions to simplify and speed up testing"; homepage = "https://github.com/kevin1024/vcrpy"; + changelog = "https://github.com/kevin1024/vcrpy/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } - diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix index 70ddf7bec97a..91c6fe3085f5 100644 --- a/pkgs/development/python-modules/vdf/default.nix +++ b/pkgs/development/python-modules/vdf/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { hash = "sha256-6ozglzZZNKDtADkHwxX2Zsnkh6BE8WbcRcC9HkTTgPU="; }; - checkInputs = [ mock pytestCheckHook ]; + nativeCheckInputs = [ mock pytestCheckHook ]; pythonImportsCheck = [ "vdf" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index b51246739518..418850444c7f 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -7,25 +7,31 @@ , click-threading , requests-toolbelt , requests -, requests-oauthlib , atomicwrites , hypothesis , pytestCheckHook -, pytest-localserver , pytest-subtesthack , setuptools-scm +, aiostream +, aiohttp-oauthlib +, aiohttp +, pytest-asyncio +, trustme +, aioresponses +, vdirsyncer +, testers }: buildPythonPackage rec { pname = "vdirsyncer"; - version = "0.18.0"; + version = "0.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-J7w+1R93STX7ujkpFcjI1M9jmuUaRLZ0aGtJoQJfwgE="; + hash = "sha256:0995bavlv8s9j0127ncq3yzy5p72lam9qgpswyjfanc6l01q87lf"; }; postPatch = '' @@ -41,19 +47,23 @@ buildPythonPackage rec { click-log click-threading requests - requests-oauthlib requests-toolbelt + aiostream + aiohttp + aiohttp-oauthlib ]; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook - pytest-localserver pytest-subtesthack + pytest-asyncio + trustme + aioresponses ]; preCheck = '' @@ -66,6 +76,8 @@ buildPythonPackage rec { "test_verbosity" ]; + passthru.tests.version = testers.testVersion { package = vdirsyncer; }; + meta = with lib; { homepage = "https://github.com/pimutils/vdirsyncer"; description = "Synchronize calendars and contacts"; diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index 706c6eb85ec8..a1b153deefab 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -1,37 +1,58 @@ { lib +, awkward , buildPythonPackage , fetchPypi , hatch-vcs , hatchling +, numba , numpy +, notebook +, packaging +, papermill , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "vector"; - version = "0.10.0"; + version = "0.11.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version; - sha256 = "b785678f449de32476f427911248391ddcc7c3582a522a88cbbd50c92dcae490"; + sha256 = "sha256-/e0wZDWIIm9vi37NEkIEitQj0p1M132AAO6id0eaA5Y="; }; nativeBuildInputs = [ hatch-vcs hatchling ]; + propagatedBuildInputs = [ numpy + packaging ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + awkward + notebook + numba + papermill + pytestCheckHook + ]; - pythonImportsCheck = [ "vector" ]; + pythonImportsCheck = [ + "vector" + ]; + + __darwinAllowLocalNetworking = true; meta = with lib; { - description = "A Python 3.7+ library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way"; + description = "Library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way"; homepage = "https://github.com/scikit-hep/vector"; + changelog = "https://github.com/scikit-hep/vector/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 9bc875963163..989a26c11d98 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage , fetchPypi, pythonOlder -, jupyter_core, pandas, ipywidgets, jupyter }: +, jupyter-core, pandas, ipywidgets, jupyter }: buildPythonPackage rec { pname = "vega"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "sha256-cO+7Ynbv/+uoNUOPQvDNZji04llHUBlm95Cyfy+Ny80="; }; - propagatedBuildInputs = [ jupyter jupyter_core pandas ipywidgets ]; + propagatedBuildInputs = [ jupyter jupyter-core pandas ipywidgets ]; # currently, recommonmark is broken on python3 doCheck = false; diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix index 70235aa95bd7..629f5407437c 100644 --- a/pkgs/development/python-modules/vega_datasets/default.nix +++ b/pkgs/development/python-modules/vega_datasets/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pandas ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test vega_datasets --doctest-modules -k 'not column_names' diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix index 7328494a61ff..24ee92f492aa 100644 --- a/pkgs/development/python-modules/vehicle/default.nix +++ b/pkgs/development/python-modules/vehicle/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index 664ff0d1fe96..3c7b7ba03254 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 = "2022.10.4"; + version = "2022.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - sha256 = "sha256-6Sg2t8UmIyVCfjTW3GDldOk09gVg2ngV9sXhyQI4Kz4="; + hash = "sha256-hhomNynH2X2tnCzVBmyF/sYsHLHyGGaR9oX6M7kcWVc="; fetchSubmodules = true; }; @@ -29,7 +29,7 @@ buildPythonPackage rec { pyserial-asyncio ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to support the Velbus home automation system"; homepage = "https://github.com/Cereal2nd/velbus-aio"; + changelog = "https://github.com/Cereal2nd/velbus-aio/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index f13bd4cbdc43..2e81a9559fc6 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "f6842b7242b1039c0c28f6feef29016e7e7dd3caaeb476a193acf737db31ee38"; }; - checkInputs = [ pytest pytest-cov ]; + nativeCheckInputs = [ pytest pytest-cov ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/verboselogs/default.nix b/pkgs/development/python-modules/verboselogs/default.nix index 009dcd60edb0..45f747b936ee 100644 --- a/pkgs/development/python-modules/verboselogs/default.nix +++ b/pkgs/development/python-modules/verboselogs/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-hcIdbn0gdkdJ33KcOx6uv0iMXW0x+i880SoROi+qX4I="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ]; diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index 131bf9d7f425..5976a307bf0a 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -1,23 +1,32 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder +, setuptools +, tomli }: buildPythonPackage rec { pname = "versioneer"; - version = "0.26"; - format = "setuptools"; + version = "0.28"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-hPxymqKW0dJmRaj2LxeAGYhf9vmhBzsppKIoJwrFJXs="; + src = fetchFromGitHub { + owner = "python-versioneer"; + repo = "python-versioneer"; + rev = "refs/tags/${version}"; + hash = "sha256-Jy0c1I3kLgJAeGWzcgl5qVAWesf4EXaMIOW03B+1yWE="; }; - # Couldn't get tests to work because, for instance, they used virtualenv and - # pip. + nativeBuildInputs = [ + setuptools + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + # Couldn't get tests to work because, for instance, they used virtualenv and pip doCheck = false; pythonImportsCheck = [ @@ -27,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Version-string management for VCS-controlled trees"; homepage = "https://github.com/warner/python-versioneer"; + changelog = "https://github.com/python-versioneer/python-versioneer/blob/${version}/NEWS.md"; license = licenses.publicDomain; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/versionfinder/default.nix b/pkgs/development/python-modules/versionfinder/default.nix index 951ae8d9874d..3e2d01b5ebfb 100644 --- a/pkgs/development/python-modules/versionfinder/default.nix +++ b/pkgs/development/python-modules/versionfinder/default.nix @@ -2,7 +2,7 @@ , backoff , buildPythonPackage , fetchFromGitHub -, GitPython +, gitpython , pytestCheckHook , pythonOlder , requests @@ -23,11 +23,11 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - GitPython + gitpython backoff ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests ]; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Find the version of another package, whether installed via pip, setuptools or git"; homepage = "https://github.com/jantman/versionfinder"; + changelog = "https://github.com/jantman/versionfinder/blob/${version}/CHANGES.rst"; license = licenses.agpl3Plus; maintainers = with maintainers; [ zakame ]; }; diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix index 5cfe9861f465..480b72e2e5df 100644 --- a/pkgs/development/python-modules/versioningit/default.nix +++ b/pkgs/development/python-modules/versioningit/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { tomli ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook build pydantic diff --git a/pkgs/development/python-modules/versiontag/default.nix b/pkgs/development/python-modules/versiontag/default.nix index 8c4bb49ebaff..3e250cd5ea4c 100644 --- a/pkgs/development/python-modules/versiontag/default.nix +++ b/pkgs/development/python-modules/versiontag/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { --replace "get_version(pypi=True)" '"${version}"' ''; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; pythonImportsCheck = [ "versiontag" ]; diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index 3b994b7e50d0..1bd12d4a3dc2 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "1.1.1"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3t9W12tnZztNV6E/f5br3FeznqZQuT6/DAXrbR0sDAU="; + hash = "sha256-zfeXJJL5pWzv9y39MWHYZggBRBAPGJItUKKaxp8MlRM="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock parameterized pytestCheckHook @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Native Python client for Vertica database"; homepage = "https://github.com/vertica/vertica-python"; + changelog = "https://github.com/vertica/vertica-python/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ arnoldfarkas ]; }; diff --git a/pkgs/development/python-modules/videocr/default.nix b/pkgs/development/python-modules/videocr/default.nix index a6ac156b7063..0685b184c4ab 100644 --- a/pkgs/development/python-modules/videocr/default.nix +++ b/pkgs/development/python-modules/videocr/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, python-Levenshtein +, levenshtein , pytesseract , opencv4 , fuzzywuzzy @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - python-Levenshtein + levenshtein pytesseract opencv4 fuzzywuzzy @@ -25,6 +25,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ + --replace "python-Levenshtein" "Levenshtein" \ --replace "opencv-python" "opencv" substituteInPlace videocr/constants.py \ --replace "master" "main" diff --git a/pkgs/development/python-modules/viewstate/default.nix b/pkgs/development/python-modules/viewstate/default.nix index cd64dcc75643..3b1c5e74617d 100644 --- a/pkgs/development/python-modules/viewstate/default.nix +++ b/pkgs/development/python-modules/viewstate/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "15s0n1lhkz0zwi33waqkkjipal3f7s45rxsj1bw89xpr4dj87qx5"; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/vilfo-api-client/default.nix b/pkgs/development/python-modules/vilfo-api-client/default.nix index 05ce50199708..d628a12fff19 100644 --- a/pkgs/development/python-modules/vilfo-api-client/default.nix +++ b/pkgs/development/python-modules/vilfo-api-client/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { semver ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix index 3f272a84b89b..200f4f68ebef 100644 --- a/pkgs/development/python-modules/vine/default.nix +++ b/pkgs/development/python-modules/vine/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-fTsWJKlT2oLvY0YgE7vScdPrdXUUifmAdZjo80C9Y34="; }; - checkInputs = [ + nativeCheckInputs = [ case pytestCheckHook ]; diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index 6d407d7ea24b..3723daec558c 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { virtualenv ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index f0b365761f6c..c57a1e0e0474 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -1,9 +1,8 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , pythonOlder , isPy27 -, backports-entry-points-selectable , cython , distlib , fetchPypi @@ -18,16 +17,18 @@ , pytest-timeout , pytestCheckHook , setuptools-scm -, six }: buildPythonPackage rec { pname = "virtualenv"; - version = "20.16.5"; + version = "20.17.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-In6huZlP3F6jGXe6M4PvKW10cuqFvp1nMuQqkcBOgNo="; + hash = "sha256-+LknaE78bxzCBsnbKXpXCrmtDlHBb6nkVIfTbRkFwFg="; }; nativeBuildInputs = [ @@ -35,13 +36,9 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - backports-entry-points-selectable distlib filelock platformdirs - six - ] ++ lib.optionals (pythonOlder "3.4" && !stdenv.hostPlatform.isWindows) [ - pathlib2 ] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources ] ++ lib.optionals (pythonOlder "3.8") [ @@ -52,7 +49,7 @@ buildPythonPackage rec { ./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch ]; - checkInputs = [ + nativeCheckInputs = [ cython flaky pytest-freezegun @@ -65,8 +62,8 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - # Ignore tests which require network access disabledTestPaths = [ + # Ignore tests which require network access "tests/unit/create/test_creator.py" "tests/unit/seed/embed/test_bootstrap_link_via_app_data.py" ]; @@ -77,16 +74,16 @@ buildPythonPackage rec { "test_seed_link_via_app_data" # Permission Error "test_bad_exe_py_info_no_raise" - ] ++ lib.optionals isPy27 [ - "test_python_via_env_var" - "test_python_multi_value_prefer_newline_via_env_var" ]; - pythonImportsCheck = [ "virtualenv" ]; + pythonImportsCheck = [ + "virtualenv" + ]; meta = with lib; { description = "A tool to create isolated Python environments"; homepage = "http://www.virtualenv.org"; + changelog = "https://github.com/pypa/virtualenv/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 6c3acdf6e2ba..d69d9722d334 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -10,17 +10,21 @@ , kiwisolver , libGL , numpy +, pythonOlder , setuptools-scm , setuptools-scm-git-archive }: buildPythonPackage rec { pname = "vispy"; - version = "0.12.0"; + version = "0.12.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CtSg/pAtOhhiuS6yE3ogzF0llceMQTF12ShXIi9GMD0="; + hash = "sha256-4AiBwdD5ssCOtuJuk2GtveijqW54eO5sHhmefFhyIk8="; }; patches = [ @@ -65,8 +69,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://vispy.org/index.html"; description = "Interactive scientific visualization in Python"; + homepage = "https://vispy.org/index.html"; + changelog = "https://github.com/vispy/vispy/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ goertzenator ]; }; diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix index 6b86123ade75..f70d4771ba6c 100644 --- a/pkgs/development/python-modules/viv-utils/default.nix +++ b/pkgs/development/python-modules/viv-utils/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { pname = "viv-utils"; - version = "0.7.5"; + version = "0.7.7"; src = fetchFromGitHub { owner = "williballenthin"; repo = "viv-utils"; - rev = "v${version}"; - sha256 = "sha256-JDu+1n1wP2Vsp2V/bKdE+RFp6bE8RNmimi4wdsatwME="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ih6CtnsGfHRLDjoaF7BkoUENu+0pU3NB6TG0A70f3nE="; }; postPatch = '' @@ -34,7 +34,7 @@ buildPythonPackage rec { vivisect ]; - checkInputs = [ + nativeCheckInputs = [ pytest-sugar pytestCheckHook ]; diff --git a/pkgs/development/python-modules/volkszaehler/default.nix b/pkgs/development/python-modules/volkszaehler/default.nix index cbc51d024a6e..dcb153ba98ca 100644 --- a/pkgs/development/python-modules/volkszaehler/default.nix +++ b/pkgs/development/python-modules/volkszaehler/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "volkszaehler"; - version = "0.3.2"; + version = "0.4.0"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "home-assistant-ecosystem"; repo = "python-volkszaehler"; - rev = version; - sha256 = "sha256-EiruMlhXvbUhCaDtHc3qCLbpp/KHp9rVpk2FmbR4A/k="; + rev = "refs/tags/${version}"; + hash = "sha256-jX0nwBsBYU383LG8f08FVI7Lo9gnyPSQ0fiEF8dQc/M="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for interacting with the Volkszahler API"; homepage = "https://github.com/home-assistant-ecosystem/python-volkszaehler"; + changelog = "https://github.com/home-assistant-ecosystem/python-volkszaehler/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix index 31ea68662a40..2cb55c69cec7 100644 --- a/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ voluptuous ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook voluptuous ]; diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index 4212de031be8..c7e82d193f58 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { hash = "sha256-cz3Bd+/yPh+VOHxzi/W+gbDh/H5Nl/n4jvxDOirmAVk="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index adb55bd0726d..f3df712c3d51 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -1,34 +1,43 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub -, setuptools -, geopy -, docopt -, certifi -, amqtt -, websockets , aiohttp -, pytestCheckHook -, asynctest +, amqtt +, buildPythonPackage +, certifi +, docopt +, fetchFromGitHub +, fetchpatch +, geopy +, mock , pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +, websockets }: buildPythonPackage rec { pname = "volvooncall"; version = "0.10.1"; + format = "setuptools"; disabled = pythonOlder "3.8"; - format = "setuptools"; - src = fetchFromGitHub { owner = "molobrakos"; repo = "volvooncall"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-udYvgKj7Rlc/hA86bbeBfnoVRjKkXT4TwpceWz226cU="; }; + patches = [ + # Remove async, https://github.com/molobrakos/volvooncall/pull/92 + (fetchpatch { + name = "remove-asnyc.patch"; + url = "https://github.com/molobrakos/volvooncall/commit/ef0df403250288c00ed4c600e9dfa79dcba8941e.patch"; + hash = "sha256-U+hM7vzD9JSEUumvjPSLpVQcc8jAuZHG3/1dQ3wnIcA="; + }) + ]; + propagatedBuildInputs = [ aiohttp ]; @@ -46,16 +55,19 @@ buildPythonPackage rec { }; checkInputs = [ - asynctest + mock pytest-asyncio pytestCheckHook ] ++ passthru.optional-dependencies.mqtt; - pythonImportsCheck = [ "volvooncall" ]; + pythonImportsCheck = [ + "volvooncall" + ]; meta = with lib; { description = "Retrieve information from the Volvo On Call web service"; homepage = "https://github.com/molobrakos/volvooncall"; + changelog = "https://github.com/molobrakos/volvooncall/releases/tag/v${version}"; 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 d87bbff3595e..40303c29f9c9 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 = "9.5.0"; + version = "9.6.0"; src = fetchPypi{ inherit pname version; - sha256 = "sha256-LfEP0T/dYFuLPgz8cBtO6iajfnTt9GXCuor0NibP0qY="; + sha256 = "sha256-LHs98lccPjub5GDPB3dxtkOYCDxri04CVpSSsypa4xI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vpk/default.nix b/pkgs/development/python-modules/vpk/default.nix index a39f0a47dfa8..6adf28cebdd3 100644 --- a/pkgs/development/python-modules/vpk/default.nix +++ b/pkgs/development/python-modules/vpk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { hash = "sha256-SPkPb8kveAR2cN9kd2plS+TjmBYBCfa6pJ0c22l69M0="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix index 4928c2adc40c..1551ab31183e 100644 --- a/pkgs/development/python-modules/vsure/default.nix +++ b/pkgs/development/python-modules/vsure/default.nix @@ -1,23 +1,31 @@ { lib , buildPythonPackage , fetchPypi +, click , requests }: buildPythonPackage rec { pname = "vsure"; - version = "1.8.1"; + version = "2.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Zh83t7yjZU2NjOgCkqPUHbqvEyEWXGITRgr5d2fLtRI="; + hash = "sha256-KMLW1270Xs9s2a4ROWTvwRpfr4n4RO9rIYlskNjGzFQ="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + click + requests + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "verisure" ]; + + pythonImportsCheck = [ + "verisure" + ]; meta = with lib; { description = "Python library for working with verisure devices"; diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index 1fbcf76a636b..e0f37922c00d 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.17.3"; + version = "0.17.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,14 +19,14 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-nveMsebW828ATEW6vw+var+GxbJj2N0mNaQlkx+GH3w="; + hash = "sha256-4CmSsSZqFhH3rwctCJUqU4JdDxBgIxFnUZ5FQCBZXqg="; }; propagatedBuildInputs = [ aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-httpserver pytestCheckHook diff --git a/pkgs/development/python-modules/vulture/default.nix b/pkgs/development/python-modules/vulture/default.nix index 0062bbd9e415..501b08969dda 100644 --- a/pkgs/development/python-modules/vulture/default.nix +++ b/pkgs/development/python-modules/vulture/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "vulture"; - version = "2.5"; + version = "2.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-KDFpQFXrLjagnDt2gJNINxArm2wJaSBuOQLVE2Ehd8M="; + hash = "sha256-JRX6hIGBAB3Ipzq6agGhoXQG9dNy8k7H9xkYZvn0mX4="; }; postPatch = '' @@ -28,7 +28,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pint pytestCheckHook ]; diff --git a/pkgs/development/python-modules/vxi11/default.nix b/pkgs/development/python-modules/vxi11/default.nix index 242fe47b33d0..e33fb6dbc045 100644 --- a/pkgs/development/python-modules/vxi11/default.nix +++ b/pkgs/development/python-modules/vxi11/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1xv7chp7rm0vrvbz6q57fpwhlgjz461h08q9zgmkcl2l0w96hmsn"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests ''; diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index 9c98f4d0926c..a01b1e5f5f9d 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -1,31 +1,38 @@ { lib , buildPythonPackage , fetchPypi -, six , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "w3lib"; - version = "2.0.1"; + version = "2.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-E98V+MF7Fj3g/V+qiSwa0UPhkN/L25hTS7l16zfGx9Y="; + hash = "sha256-DhGY8bdFGVtrPdGkzWYBH7+C8wpNnauu4fnlyG8CAnQ="; }; - propagatedBuildInputs = [ six ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "w3lib" ]; + pythonImportsCheck = [ + "w3lib" + ]; disabledTests = [ "test_add_or_replace_parameter" ]; meta = with lib; { - description = "A library of web-related functions"; + description = "Library of web-related functions"; homepage = "https://github.com/scrapy/w3lib"; + changelog = "https://github.com/scrapy/w3lib/blob/v${version}/NEWS"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index 699af4120158..934f55f2aa4a 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -8,22 +8,22 @@ buildPythonPackage rec { pname = "wakeonlan"; - version = "2.1.0"; + version = "3.0.0"; disabled = pythonOlder "3.6"; format = "pyproject"; src = fetchFromGitHub { owner = "remcohaszing"; repo = "pywakeonlan"; - rev = version; - sha256 = "sha256-5ri4bXc0EMNntzmcUZYpRIfaXoex4s5M6psf/9ta17Y="; + rev = "refs/tags/${version}"; + sha256 = "sha256-7BDE7TmTT8rSaG0rEn5QwH+izGWA2PeQzxpGiv7+3fo="; }; nativeBuildInputs = [ poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/wand/default.nix b/pkgs/development/python-modules/wand/default.nix index 396642b0c13a..d6747b3d7271 100644 --- a/pkgs/development/python-modules/wand/default.nix +++ b/pkgs/development/python-modules/wand/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , imagemagickBig +, py , pytestCheckHook }: @@ -21,7 +22,8 @@ buildPythonPackage rec { "magick_home = '${imagemagickBig}'" ''; - checkInputs = [ + nativeCheckInputs = [ + py pytestCheckHook ]; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index f9e862c0fbbb..f6d1769f526b 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, appdirs , azure-core , bokeh , buildPythonPackage @@ -8,7 +9,7 @@ , fetchFromGitHub , flask , git -, GitPython +, gitpython , jsonref , jsonschema , matplotlib @@ -39,7 +40,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.13.5"; + version = "0.13.9"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -48,7 +49,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1GoFmncG5bUWJOIUDLatopQMxCFsmlcj8aofJMGUTzQ="; + hash = "sha256-BpFLN4WLT+fm5+50NDOU4bM73WjeGEhD6P8XKE9n9cI="; }; patches = [ @@ -65,9 +66,10 @@ buildPythonPackage rec { # setuptools is necessary since pkg_resources is required at runtime. propagatedBuildInputs = [ + appdirs click docker_pycreds - GitPython + gitpython pathtools promise protobuf @@ -80,7 +82,7 @@ buildPythonPackage rec { shortuuid ]; - checkInputs = [ + nativeCheckInputs = [ azure-core bokeh flask @@ -99,8 +101,10 @@ buildPythonPackage rec { tqdm ]; + # Set BOKEH_CDN_VERSION to stop bokeh throwing an exception in tests preCheck = '' export HOME=$(mktemp -d) + export BOKEH_CDN_VERSION=3.0.3 ''; pythonRelaxDeps = [ "protobuf" ]; @@ -114,9 +118,9 @@ buildPythonPackage rec { "tests/unit_tests_old/test_footer.py" "tests/unit_tests_old/test_internal_api.py" "tests/unit_tests_old/test_keras.py" + "tests/unit_tests_old/test_logging.py" "tests/unit_tests_old/test_metric_internal.py" "tests/unit_tests_old/test_public_api.py" - "tests/unit_tests_old/test_report_api.py" "tests/unit_tests_old/test_runtime.py" "tests/unit_tests_old/test_sender.py" "tests/unit_tests_old/test_tb_watcher.py" diff --git a/pkgs/development/python-modules/warcio/default.nix b/pkgs/development/python-modules/warcio/default.nix index ae870a37fe57..6b9fd5d171ca 100644 --- a/pkgs/development/python-modules/warcio/default.nix +++ b/pkgs/development/python-modules/warcio/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook httpbin requests diff --git a/pkgs/development/python-modules/ward/default.nix b/pkgs/development/python-modules/ward/default.nix new file mode 100644 index 000000000000..9d438d74258f --- /dev/null +++ b/pkgs/development/python-modules/ward/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, click +, click-completion +, click-default-group +, cucumber-tag-expressions +, fetchFromGitHub +, pluggy +, poetry-core +, pprintpp +, pythonOlder +, pythonRelaxDepsHook +, rich +, tomli +}: + +buildPythonPackage rec { + pname = "ward"; + version = "0.67.0b0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "darrenburns"; + repo = pname; + rev = "refs/tags/release%2F${version}"; + hash = "sha256-4dEMEEPySezgw3dIcYMl56HrhyaYlql9JvtamOn7Y8g="; + }; + + pythonRelaxDeps = [ + "rich" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + click + rich + tomli + pprintpp + cucumber-tag-expressions + click-default-group + click-completion + pluggy + ]; + + # Fixture is missing. Looks like an issue with the import of the sample file + doCheck = false; + + pythonImportsCheck = [ + "ward" + ]; + + meta = with lib; { + description = "Test framework for Python"; + homepage = "https://github.com/darrenburns/ward"; + changelog = "https://github.com/darrenburns/ward/releases/tag/release%2F${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix index c646107c32f7..b0b16aed16a8 100644 --- a/pkgs/development/python-modules/warlock/default.nix +++ b/pkgs/development/python-modules/warlock/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { jsonschema ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix index 8da1cf55b54a..6482024a4da3 100644 --- a/pkgs/development/python-modules/warrant/default.nix +++ b/pkgs/development/python-modules/warrant/default.nix @@ -28,7 +28,7 @@ buildPythonPackage { --replace "python-jose-cryptodome>=1.3.2" "python-jose>=2.0.0" ''; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; propagatedBuildInputs = [ boto3 envs python-jose requests ]; diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index 2f751e8105e4..103f71a70ade 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -1,23 +1,31 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , pythonOlder + +# tests +, ipykernel +, nbconvert +, pytestCheckHook +, typing-extensions }: buildPythonPackage rec { pname = "wasabi"; - version = "0.10.1"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yONyeBvhknKUI4KxTZkxTRdVGNeCIFfLepcBDEJZ0kk="; + sha256 = "sha256-9e58YJAngRvRbmIPL9enMZRmAFhI5BsFGmIFOrj9cNY="; }; - checkInputs = [ + nativeCheckInputs = [ + ipykernel + nbconvert + typing-extensions pytestCheckHook ]; diff --git a/pkgs/development/python-modules/wasmer/tests.nix b/pkgs/development/python-modules/wasmer/tests.nix index bdb3adfe93ce..523d06a401ad 100644 --- a/pkgs/development/python-modules/wasmer/tests.nix +++ b/pkgs/development/python-modules/wasmer/tests.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook wasmer wasmer-compiler-cranelift diff --git a/pkgs/development/python-modules/wasserstein/default.nix b/pkgs/development/python-modules/wasserstein/default.nix index 79994a616951..1609e12f20c2 100644 --- a/pkgs/development/python-modules/wasserstein/default.nix +++ b/pkgs/development/python-modules/wasserstein/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - pname = "Wasserstein"; + pname = "wasserstein"; version = "1.1.0"; src = fetchFromGitHub { owner = "pkomiske"; - repo = pname; + repo = "Wasserstein"; rev = "89c2d6279a7e0aa3b56bcc8fb7b6009420f2563e"; # https://github.com/pkomiske/Wasserstein/issues/1 hash = "sha256-s9en6XwvO/WPsF7/+SEmGePHZQgl7zLgu5sEn4nD9YE="; }; @@ -26,7 +26,7 @@ buildPythonPackage rec { wurlitzer ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index f42645940aac..a242c7ec9c6c 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -1,44 +1,43 @@ { lib , stdenv , buildPythonPackage -, fetchPypi -, pathtools -, pyyaml -, flaky -, pytest-timeout -, pytestCheckHook , CoreServices , fetchpatch +, fetchPypi +, flaky +, pathtools +, pytest-timeout +, pytestCheckHook +, pythonOlder +, pyyaml }: buildPythonPackage rec { pname = "watchdog"; - version = "2.1.9"; + version = "2.2.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-Q84g67NqUfIfo3b3bR1GkkUrJSfM1gGVDWntNrniFgk="; + hash = "sha256-g8+Lxg2cYTtmpMAYBRhz1ic9nkXQQO7QbWqWJBvY7AE="; }; patches = lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ ./force-kqueue.patch - ] ++ [ - (fetchpatch { - url = "https://github.com/gorakhargosh/watchdog/commit/255d1e45c17929dd5ba8a6f91aa28771109931cd.patch"; - sha256 = "sha256-gGgEGuB/0g+4Pv1dXMvIdObjqKruWKkxtufS/dzSlY8="; - excludes = [ "changelog.rst" ]; - }) ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ + CoreServices + ]; propagatedBuildInputs = [ pathtools pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ flaky pytest-timeout pytestCheckHook @@ -70,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API and shell utilities to monitor file system events"; homepage = "https://github.com/gorakhargosh/watchdog"; + changelog = "https://github.com/gorakhargosh/watchdog/blob/v${version}/changelog.rst"; license = licenses.asl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix index 034566f90acf..c31aa264bd84 100644 --- a/pkgs/development/python-modules/watchfiles/default.nix +++ b/pkgs/development/python-modules/watchfiles/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { anyio ]; - checkInputs = [ + nativeCheckInputs = [ dirty-equals pytest-mock pytest-timeout diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix index 526066f1fa74..7c57fc4d0e9e 100644 --- a/pkgs/development/python-modules/waterfurnace/default.nix +++ b/pkgs/development/python-modules/waterfurnace/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { websocket-client ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/watermark/default.nix b/pkgs/development/python-modules/watermark/default.nix index 10be7466063c..6cb717679d1a 100644 --- a/pkgs/development/python-modules/watermark/default.nix +++ b/pkgs/development/python-modules/watermark/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/wavedrom/default.nix b/pkgs/development/python-modules/wavedrom/default.nix index cce9a162e865..25e7222608b0 100644 --- a/pkgs/development/python-modules/wavedrom/default.nix +++ b/pkgs/development/python-modules/wavedrom/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ cairosvg pillow pytestCheckHook diff --git a/pkgs/development/python-modules/wavefile/default.nix b/pkgs/development/python-modules/wavefile/default.nix index 3090ee815440..21641008c826 100644 --- a/pkgs/development/python-modules/wavefile/default.nix +++ b/pkgs/development/python-modules/wavefile/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pyaudio numpy libsndfile diff --git a/pkgs/development/python-modules/wcag-contrast-ratio/default.nix b/pkgs/development/python-modules/wcag-contrast-ratio/default.nix index c7b7e9bc9e82..e6025b7690d4 100644 --- a/pkgs/development/python-modules/wcag-contrast-ratio/default.nix +++ b/pkgs/development/python-modules/wcag-contrast-ratio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-aRkrjlwKfQ3F/xGH7rPjmBQWM6S95RxpyH9Y/oftNhw="; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/wcmatch/default.nix b/pkgs/development/python-modules/wcmatch/default.nix index defd5df7a64e..6105838ec52b 100644 --- a/pkgs/development/python-modules/wcmatch/default.nix +++ b/pkgs/development/python-modules/wcmatch/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ bracex ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index 7d5cbc69ecaa..7b58fb111fb4 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ setuptools ] ++ lib.optionals (!isPy3k) [ backports_functools_lru_cache diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 5ec5c5997706..071fe201119a 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "57.0"; + version = "57.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "weasyprint"; - hash = "sha256-e29cwTgZ6afYdIwdvw6NJET3pIGKmDOfgtzKqCK/kRs="; + hash = "sha256-uOnvLcvPvILpkhWs/Wj5R7K18ZmbWxVtt1+r44C6fpo="; }; patches = [ @@ -62,7 +62,7 @@ buildPythonPackage rec { tinycss2 ] ++ fonttools.optional-dependencies.woff; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ghostscript ]; @@ -79,6 +79,11 @@ buildPythonPackage rec { FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + # Fontconfig error: Cannot load default config file: No such file: (null) + makeWrapperArgs = [ + "--set FONTCONFIG_FILE ${FONTCONFIG_FILE}" + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace "--isort --flake8 --cov --no-cov-on-fail" "" diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix index 1b40519d592a..35d89947c7c0 100644 --- a/pkgs/development/python-modules/web/default.nix +++ b/pkgs/development/python-modules/web/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "web" ]; - checkInputs = [ pytestCheckHook dbutils mysqlclient pymysql mysql-connector psycopg2 ]; + nativeCheckInputs = [ pytestCheckHook dbutils mysqlclient pymysql mysql-connector psycopg2 ]; meta = with lib; { description = "Makes web apps"; diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix index 8515ccda3625..c31fe93b0220 100644 --- a/pkgs/development/python-modules/web3/default.nix +++ b/pkgs/development/python-modules/web3/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { pythonRelaxDeps = true; # TODO: package eth-tester - #checkInputs = [ + #nativeCheckInputs = [ # eth-tester # eth-tester.optional-dependencies.py-evm # py-geth diff --git a/pkgs/development/python-modules/webargs/default.nix b/pkgs/development/python-modules/webargs/default.nix index 57b0e82b6bc4..e98156a13f4c 100644 --- a/pkgs/development/python-modules/webargs/default.nix +++ b/pkgs/development/python-modules/webargs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ marshmallow ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-aiohttp webtest diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix index 176d2f661608..081fdc59bbe3 100644 --- a/pkgs/development/python-modules/webassets/default.nix +++ b/pkgs/development/python-modules/webassets/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pyyaml ]; - checkInputs = [ nose jinja2 mock pytest ]; + nativeCheckInputs = [ nose jinja2 mock pytest ]; # Needs Babel CLI tool doCheck = false; diff --git a/pkgs/development/python-modules/webauthn/default.nix b/pkgs/development/python-modules/webauthn/default.nix index 8b551f1c66a0..47dfe467d243 100644 --- a/pkgs/development/python-modules/webauthn/default.nix +++ b/pkgs/development/python-modules/webauthn/default.nix @@ -11,14 +11,16 @@ buildPythonPackage rec { pname = "webauthn"; - version = "1.6.0"; - disabled = pythonOlder "3"; + version = "1.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "duo-labs"; repo = "py_webauthn"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Ts0zKnQg1EaBNB9xQmzOpEVwDSFwHNjIhEP1jTwEOFI="; + hash = "sha256-iAEvWFxJGf4H2PEseG+ykt9sriGyNvbmj4+NZFcPGPk="; }; propagatedBuildInputs = [ @@ -28,15 +30,23 @@ buildPythonPackage rec { pyopenssl ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "webauthn" ]; + pythonImportsCheck = [ + "webauthn" + ]; + + disabledTests = [ + # TypeError: X509StoreContextError.__init__() missing 1 required... + "test_throws_on_bad_root_cert" + ]; meta = with lib; { - homepage = "https://github.com/duo-labs/py_webauthn"; description = "Implementation of the WebAuthn API"; + homepage = "https://github.com/duo-labs/py_webauthn"; + changelog = "https://github.com/duo-labs/py_webauthn/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix index 46498b5950a1..5ec245676a6a 100644 --- a/pkgs/development/python-modules/webcolors/default.nix +++ b/pkgs/development/python-modules/webcolors/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-FtBD06CP1qGxt+Pp5iZA0JeQ3OgNK91HkqF1s1/nlKk="; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/pkgs/development/python-modules/webdav4/default.nix b/pkgs/development/python-modules/webdav4/default.nix index 7aab18e3c6b1..5459617cd831 100644 --- a/pkgs/development/python-modules/webdav4/default.nix +++ b/pkgs/development/python-modules/webdav4/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ cheroot colorama pytest-xdist diff --git a/pkgs/development/python-modules/webdavclient3/default.nix b/pkgs/development/python-modules/webdavclient3/default.nix index 4d2c37f6b0e2..d74d7b2e7ab9 100644 --- a/pkgs/development/python-modules/webdavclient3/default.nix +++ b/pkgs/development/python-modules/webdavclient3/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ python-dateutil lxml requests ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # disable tests completely, as most of them fail due to urllib3 not being able to establish a http connection doCheck = false; diff --git a/pkgs/development/python-modules/webencodings/default.nix b/pkgs/development/python-modules/webencodings/default.nix index fa89241d7d8f..a8686fb7c7ed 100644 --- a/pkgs/development/python-modules/webencodings/default.nix +++ b/pkgs/development/python-modules/webencodings/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test webencodings/tests.py diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix index e4fb4f0ea324..2b07f61e1d3a 100644 --- a/pkgs/development/python-modules/webob/default.nix +++ b/pkgs/development/python-modules/webob/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-tk71FBvlWc+t5EjwRPpFwiYDUe3Lao72t+AMfc7wwyM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index 6ceefbaa20ce..79a88db2a576 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { --replace "weboob.tools.capabilities.bank.transactions," "" ''; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index 1e1823095b0b..8b0287c9aa61 100644 --- a/pkgs/development/python-modules/websocket-client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -4,29 +4,31 @@ , pythonOlder , pytestCheckHook , python-socks -, six }: buildPythonPackage rec { pname = "websocket-client"; - version = "1.4.1"; - disabled = pythonOlder "3.6"; + version = "1.4.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+WEetlyCQaZ/s3O+8ECzz4rTd6n2VGoStiC2UR6Oqe8="; + hash = "sha256-1uj5DKji3U6AJ8RWGt65RWtUBEMS26ZV58rmUs65rlk="; }; propagatedBuildInputs = [ python-socks - six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "websocket" ]; + pythonImportsCheck = [ + "websocket" + ]; meta = with lib; { description = "Websocket client for Python"; diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index ba8ee074664f..98bc6cc863ca 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "websockets"; - version = "10.3"; + version = "10.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,12 +17,9 @@ buildPythonPackage rec { owner = "aaugustin"; repo = pname; rev = version; - hash = "sha256-ZUn/DvO1Kx7Uxne4DF/am69YL1c48qpgQrGek355Z+4="; + hash = "sha256-IylvnaS8cHatA+WMc5uY9E+l+52INqOMITU1VJPO2xY="; }; - # Tests fail on Darwin with `OSError: AF_UNIX path too long` - doCheck = !stdenv.isDarwin; - patchPhase = '' # Disable all tests that need to terminate within a predetermined amount of # time. This is nondeterministic. @@ -44,7 +41,12 @@ buildPythonPackage rec { done ''; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ + unittestCheckHook + ]; + + # Tests fail on Darwin with `OSError: AF_UNIX path too long` + doCheck = !stdenv.isDarwin; pythonImportsCheck = [ "websockets" @@ -53,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "WebSocket implementation in Python"; homepage = "https://websockets.readthedocs.io/"; + changelog = "https://github.com/aaugustin/websockets/blob/${version}/docs/project/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix index 47a25c25d1f4..55c9b9e6e3a1 100644 --- a/pkgs/development/python-modules/webssh/default.nix +++ b/pkgs/development/python-modules/webssh/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , fetchPypi , paramiko @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "webssh"; - version = "1.6.0"; + version = "1.6.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-yqjwahh2METXD83geTGt5sUL+vmxbrYxj4KtwTxbD94="; + hash = "sha256-g3RRQUWbjHRaZRVekmETcrHYeVIIpeteCCh7o28jBLY="; }; propagatedBuildInputs = [ @@ -22,7 +22,7 @@ buildPythonPackage rec { tornado ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -36,10 +36,11 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Web based SSH client"; homepage = "https://github.com/huashengdun/webssh/"; + changelog = "https://github.com/huashengdun/webssh/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ davidtwco ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/webtest-aiohttp/default.nix b/pkgs/development/python-modules/webtest-aiohttp/default.nix index c1ae249c87eb..34c61524f173 100644 --- a/pkgs/development/python-modules/webtest-aiohttp/default.nix +++ b/pkgs/development/python-modules/webtest-aiohttp/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytest-aiohttp , pytestCheckHook , pythonOlder @@ -22,11 +23,19 @@ buildPythonPackage rec { sha256 = "sha256-UuAz/k/Tnumupv3ybFR7PkYHwG3kH7M5oobZykEP+ao="; }; + patches = [ + (fetchpatch { + name = "python311-compat.patch"; + url = "https://github.com/sloria/webtest-aiohttp/commit/64e5ab1867ea9ef87901bb2a1a6142566bffc90b.patch"; + hash = "sha256-OKJGajqJLFMkcbGmGfU9G5hCpJaj24Gs363sI0z7YZw="; + }) + ]; + propagatedBuildInputs = [ webtest ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp pytest-aiohttp pytestCheckHook @@ -37,6 +46,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/sloria/webtest-aiohttp/blob/${src.rev}/CHANGELOG.rst"; description = "Provides integration of WebTest with aiohttp.web applications"; homepage = "https://github.com/sloria/webtest-aiohttp"; license = licenses.mit; diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index 50e7a1c73e61..ce34b045fd67 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { webob ]; - checkInputs = [ + nativeCheckInputs = [ pastedeploy pyquery pytestCheckHook diff --git a/pkgs/development/python-modules/webthing-ws/default.nix b/pkgs/development/python-modules/webthing-ws/default.nix new file mode 100644 index 000000000000..1e7b89e03b62 --- /dev/null +++ b/pkgs/development/python-modules/webthing-ws/default.nix @@ -0,0 +1,43 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "webthing-ws"; + version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "home-assistant-ecosystem"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-j7nc4yJczDs28RVFDHeQ2ZIG9mIW2m25AAeErVKi4E4="; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "webthing_ws" + ]; + + meta = with lib; { + description = "WebThing WebSocket consumer and API client"; + homepage = "https://github.com/home-assistant-ecosystem/webthing-ws"; + changelog = "https://github.com/home-assistant-ecosystem/webthing-ws/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 19e394ff26ba..4f6a8b00d213 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.40.3"; + version = "0.41.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-kV4BWQ4XfB2QjXY5b46+pxt3rhyo1glKRYO2mMJNhJM="; + hash = "sha256-RYxfz5uBWV1HLbcIK1N/glJv2w0nfPLBPyM2b7HuDIY="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { --replace "pytest-cov" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client that publishes data from Volkswagen WeConnect"; homepage = "https://github.com/tillsteinbach/WeConnect-mqtt"; + changelog = "https://github.com/tillsteinbach/WeConnect-mqtt/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 58f2fcd7a637..db66c2e9b1c8 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.48.3"; + version = "0.50.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-GXTjG/3Gk58C6TxKrgtblUZI+xf7Te9OA8HnDvNEIvA="; + hash = "sha256-KYGNtUJXpY1UrRbUxr71EHxLCR6WixTAk+ybkfqB3Ps="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest-httpserver pytestCheckHook ]; @@ -48,7 +48,7 @@ buildPythonPackage rec { --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \ --replace "tests_require=TEST_REQUIRED," "tests_require=[]," substituteInPlace image_extra_requirements.txt \ - --replace "pillow~=9.2.0" "pillow" + --replace "pillow~=9.3.0" "pillow" substituteInPlace pytest.ini \ --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ --replace "pytest-cov" "" @@ -61,6 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for the Volkswagen WeConnect Services"; homepage = "https://github.com/tillsteinbach/WeConnect-python"; + changelog = "https://github.com/tillsteinbach/WeConnect-python/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 8d3e0769786b..204e4a848a5f 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -4,7 +4,6 @@ , pythonOlder , fetchPypi , watchdog -, dataclasses , ephemeral-port-reserve , pytest-timeout , pytest-xprocess @@ -32,11 +31,9 @@ buildPythonPackage rec { ] ++ lib.optionals (!stdenv.isDarwin) [ # watchdog requires macos-sdk 10.13+ watchdog - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses ]; - checkInputs = [ + nativeCheckInputs = [ ephemeral-port-reserve pytest-timeout pytest-xprocess diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/pkgs/development/python-modules/wfuzz/default.nix index 91afabd368cf..f7a197bcc114 100644 --- a/pkgs/development/python-modules/wfuzz/default.nix +++ b/pkgs/development/python-modules/wfuzz/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { colorama ]; - checkInputs = [ + nativeCheckInputs = [ netaddr pytest pytestCheckHook diff --git a/pkgs/development/python-modules/whatthepatch/default.nix b/pkgs/development/python-modules/whatthepatch/default.nix index 9244e26520cd..0d7aa812300d 100644 --- a/pkgs/development/python-modules/whatthepatch/default.nix +++ b/pkgs/development/python-modules/whatthepatch/default.nix @@ -2,20 +2,26 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "whatthepatch"; - version = "1.0.2"; + version = "1.0.3"; + format = "pyproject"; src = fetchFromGitHub { owner = "cscorley"; repo = pname; - rev = version; - hash = "sha256-0l/Ebq7Js9sKFJ/RzkQ1aWEDCxt+COVd2qVnLSWwFx0="; + rev = "refs/tags/${version}"; + hash = "sha256-P4SYSMdDjwXOmre3hXKS4gQ0OS9pz0SWqBeD/WQMQFw="; }; - checkInputs = [ + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ pytestCheckHook ]; @@ -25,6 +31,6 @@ buildPythonPackage rec { description = "Python library for both parsing and applying patch files"; homepage = "https://github.com/cscorley/whatthepatch"; license = licenses.mit; - maintainers = with maintainers; [ jyooru ]; + maintainers = with maintainers; [ joelkoen ]; }; } diff --git a/pkgs/development/python-modules/wheel-filename/default.nix b/pkgs/development/python-modules/wheel-filename/default.nix index d4dd51ab2c89..e874894b1323 100644 --- a/pkgs/development/python-modules/wheel-filename/default.nix +++ b/pkgs/development/python-modules/wheel-filename/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/wheel-inspect/default.nix b/pkgs/development/python-modules/wheel-inspect/default.nix index 438084e6c058..c8ce155c788f 100644 --- a/pkgs/development/python-modules/wheel-inspect/default.nix +++ b/pkgs/development/python-modules/wheel-inspect/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { wheel-filename ]; - checkInputs = [ + nativeCheckInputs = [ jsonschema pytestCheckHook ]; diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix index b771615ebbdd..c68925b46ae3 100644 --- a/pkgs/development/python-modules/whichcraft/default.nix +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { LC_ALL="en_US.utf-8"; buildInputs = [ glibcLocales ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index d77ad762d89d..aae90576e055 100644 --- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "whirlpool-sixth-sense"; - version = "0.18"; + version = "0.18.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "abmantis"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-XmbRUVivV+jSJUpksMIJ88CwNtOD+Qkwtqyg3dX33ZU="; + hash = "sha256-6vmevL/VDuBnsPeYxtBZkCi9SVuINpM6jVlNR1Y6AuA="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix index b36a5c9a23c8..114c32356d9b 100644 --- a/pkgs/development/python-modules/whisper/default.nix +++ b/pkgs/development/python-modules/whisper/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/whispers/default.nix b/pkgs/development/python-modules/whispers/default.nix index a0032baa7178..9a0ad6756c2c 100644 --- a/pkgs/development/python-modules/whispers/default.nix +++ b/pkgs/development/python-modules/whispers/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index 0f95515c62c6..e56abe4cba5e 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { brotli ]; - checkInputs = [ + nativeCheckInputs = [ django pytestCheckHook requests diff --git a/pkgs/development/python-modules/whodap/default.nix b/pkgs/development/python-modules/whodap/default.nix index fcb4d938934d..8dd65d11911e 100644 --- a/pkgs/development/python-modules/whodap/default.nix +++ b/pkgs/development/python-modules/whodap/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "whodap"; - version = "0.1.6"; + version = "0.1.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gLA6tT6ZUMjb2ZF5t6DdI5nqiX2Uxatj3ThmQ+VZu9A="; + hash = "sha256-Aji8OqdcVOHB4TOv4W6x1qIGaJvoDmLGpr/PFz5mZ4w="; }; propagatedBuildInputs = [ httpx ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytestCheckHook ]; @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python RDAP utility for querying and parsing information about domain names"; homepage = "https://github.com/pogzyb/whodap"; + changelog = "https://github.com/pogzyb/whodap/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix index bb67d36974da..a89645d0ba77 100644 --- a/pkgs/development/python-modules/whois/default.nix +++ b/pkgs/development/python-modules/whois/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "whois"; - version = "0.9.18"; + version = "0.9.26"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "DannyCork"; repo = "python-whois"; rev = "refs/tags/${version}"; - sha256 = "sha256-15oa7E33VQMPtI2LJ0XVKd42m9BY9jZLL3XGXpAhv/A="; + hash = "sha256-AnKzn3GScy9jgnb7vmQ2x73n5C/5VxJr+lR03HqVwMU="; }; propagatedBuildInputs = [ @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module/library for retrieving WHOIS information"; homepage = "https://github.com/DannyCork/python-whois/"; + changelog = "https://github.com/DannyCork/python-whois/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix index e31d97a07d92..10053bc27918 100644 --- a/pkgs/development/python-modules/whoosh/default.nix +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # Wrong encoding postPatch = '' diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index 7b077d14c58e..65d5eebfeaa4 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - version = "4.0.3"; + version = "4.0.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-NIJIZMBisLMDCteCENta5qOWDfth1bJ1YtZjF3TeAoY="; + hash = "sha256-AD9xbZMNOFvj/Z3kLdm/AI4wBT9zvd3iNdFPvq7/Ga8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wifi/default.nix b/pkgs/development/python-modules/wifi/default.nix index 0b5a9444dbfd..c02ab8781b5e 100644 --- a/pkgs/development/python-modules/wifi/default.nix +++ b/pkgs/development/python-modules/wifi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { --replace "/sbin/iwlist" "${wirelesstools}/bin/iwlist" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/winacl/default.nix b/pkgs/development/python-modules/winacl/default.nix index c8c92c2f08bf..f58ce1fecbf7 100644 --- a/pkgs/development/python-modules/winacl/default.nix +++ b/pkgs/development/python-modules/winacl/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "winacl"; - version = "0.1.5"; + version = "0.1.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8/dLFbzn7ARuJ27MA8LSMCykBdEntYQXuOyj/yqjaWE="; + hash = "sha256-GAw3Vgej9v8gSIpMaN2pbOptWsqTvC0Kph70yfj2LDQ="; }; propagatedBuildInputs = [ @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for ACL/ACE/Security descriptor manipulation"; homepage = "https://github.com/skelsec/winacl"; + changelog = "https://github.com/skelsec/winacl/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/withings-api/default.nix b/pkgs/development/python-modules/withings-api/default.nix index fbfab134b119..df5af3299d4b 100644 --- a/pkgs/development/python-modules/withings-api/default.nix +++ b/pkgs/development/python-modules/withings-api/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 9d42c48a606f..8c2967c5aec6 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.14.1"; + version = "0.15.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ytjCjxnJOMmFlGS+AuEAbIZcV2yoTgaXSLdqxPg6Hew="; + sha256 = "sha256-GmentEsCJQ9N9kXfy5pbkGXi5CvZfbepdCWab+/fLJc="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/wn/default.nix b/pkgs/development/python-modules/wn/default.nix new file mode 100644 index 000000000000..1bdb096f7b57 --- /dev/null +++ b/pkgs/development/python-modules/wn/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, flit-core +, requests +, tomli +}: + +buildPythonPackage rec { + pname = "wn"; + version = "0.9.3"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-rqrzGUiF1XQZzE6xicwJ7CJsI7SvWlFT4nDCrhtQUWg="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + requests + tomli + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ + "wn" + ]; + + meta = with lib; { + description = "A modern, interlingual wordnet interface for Python"; + homepage = "https://github.com/goodmami/wn"; + changelog = "https://github.com/goodmami/wn/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index e9f5ec19d1d1..ee71b7cae4f1 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { --replace "with-coverage = 1" "" ''; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix index c3caf374ff1e..58d513adcc47 100644 --- a/pkgs/development/python-modules/word2vec/default.nix +++ b/pkgs/development/python-modules/word2vec/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cython numpy scikit-learn six ]; - checkInputs = [ pytest pytest-cov ]; + nativeCheckInputs = [ pytest pytest-cov ]; # Checks require test data downloaded separately # See project source Makefile:test-data rule for reference diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix index 2ac682c775fe..08ae8cfc3477 100644 --- a/pkgs/development/python-modules/wordcloud/default.nix +++ b/pkgs/development/python-modules/wordcloud/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pillow ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix index 72a2f013928d..a0313bc23fc1 100644 --- a/pkgs/development/python-modules/wordfreq/default.nix +++ b/pkgs/development/python-modules/wordfreq/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "wordfreq"; - version = "2.5.1"; + version = "3.0.2"; disabled = isPy27; src = fetchFromGitHub { owner = "LuminosoInsight"; repo = "wordfreq"; - rev = "v${version}"; - sha256 = "1lw7kbsydd89hybassnnhqnj9s5ch9wvgd6pla96198nrq9mj7fw"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ANOBbQWLB35Vz6oil6QZDpsNpKHeKUJnDKA5Q9JRVdE="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "regex ==" "regex >=" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # These languages require additional dictionaries that aren't packaged "test_languages" diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix index fed9a3c9007f..837b619e7702 100644 --- a/pkgs/development/python-modules/worldengine/default.nix +++ b/pkgs/development/python-modules/worldengine/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { ''; doCheck = !isPy27; # google namespace clash - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ "TestSerialization" diff --git a/pkgs/development/python-modules/wrapio/default.nix b/pkgs/development/python-modules/wrapio/default.nix index e04424ba49e2..e9364a618da6 100644 --- a/pkgs/development/python-modules/wrapio/default.nix +++ b/pkgs/development/python-modules/wrapio/default.nix @@ -19,8 +19,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "wrapio" ]; meta = with lib; { - homepage = "https://github.com/Exahilosys/wrapio"; description = "Handling event-based streams"; + homepage = "https://github.com/Exahilosys/wrapio"; + changelog = "https://github.com/Exahilosys/wrapio/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ sfrijters ]; }; diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index b53c52d6098a..590100c3006d 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -6,17 +6,17 @@ buildPythonPackage rec { pname = "wrapt"; - version = "1.13.3"; + version = "1.14.1"; format = "setuptools"; src = fetchFromGitHub { owner = "GrahamDumpleton"; repo = pname; rev = version; - hash = "sha256-kq3Ujkn4HzonzjuQfVnPNnQV+2Rnbr3ZfYmrnY3upxU="; + hash = "sha256-nXwDuNo4yZxgjnkus9bVwIZltPaSH93D+PcZMGT2nGM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix index 2714169aaddd..78b3486c72e6 100644 --- a/pkgs/development/python-modules/wrf-python/default.nix +++ b/pkgs/development/python-modules/wrf-python/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { wrapt ]; - checkInputs = [ + nativeCheckInputs = [ netcdf4 ]; diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index 8abf78520dca..58649de2056e 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "29d073d7f2e006373e6a848b1d00951a1107eb81f3742952be905429dc5a5483"; }; - checkInputs = [ pytest mock git ]; + nativeCheckInputs = [ pytest mock git ]; propagatedBuildInputs = [ cherrypy gevent tornado ]; checkPhase = '' diff --git a/pkgs/development/python-modules/wsdiscovery/default.nix b/pkgs/development/python-modules/wsdiscovery/default.nix index 8ba797449494..784172b7cef4 100644 --- a/pkgs/development/python-modules/wsdiscovery/default.nix +++ b/pkgs/development/python-modules/wsdiscovery/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { netifaces ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/wsgi-intercept/default.nix b/pkgs/development/python-modules/wsgi-intercept/default.nix index 81ed4fdf7667..2d6b5911d11f 100644 --- a/pkgs/development/python-modules/wsgi-intercept/default.nix +++ b/pkgs/development/python-modules/wsgi-intercept/default.nix @@ -1,18 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, six, httplib2, py, pytestCheckHook, requests, urllib3 }: +{ lib +, buildPythonPackage +, fetchPypi +, six +, httplib2 +, py +, pytestCheckHook +, pythonOlder +, requests +, urllib3 +}: buildPythonPackage rec { pname = "wsgi-intercept"; - version = "1.10.0"; + version = "1.11.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "wsgi_intercept"; inherit version; - sha256 = "sha256-BX8EWtR8pXkibcliJbfBw6/5VdHs9HczjM1c1SWx3wk="; + hash = "sha256-KvrZs+EgeK7Du7ni6icKHfcF0W0RDde0W6Aj/EPZ2Hw="; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + ]; - checkInputs = [ httplib2 py pytestCheckHook requests urllib3 ]; + nativeCheckInputs = [ + httplib2 + py + pytestCheckHook + requests + urllib3 + ]; disabledTests = [ "test_http_not_intercepted" @@ -20,10 +41,12 @@ buildPythonPackage rec { "test_https_no_ssl_verification_not_intercepted" ]; - pythonImportsCheck = [ "wsgi_intercept" ]; + pythonImportsCheck = [ + "wsgi_intercept" + ]; meta = with lib; { - description = "wsgi_intercept installs a WSGI application in place of a real URI for testing"; + description = "Module that acts as a WSGI application in place of a real URI for testing"; homepage = "https://github.com/cdent/wsgi-intercept"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; diff --git a/pkgs/development/python-modules/wsgidav/default.nix b/pkgs/development/python-modules/wsgidav/default.nix index 90be9491f33c..b54a351b47de 100644 --- a/pkgs/development/python-modules/wsgidav/default.nix +++ b/pkgs/development/python-modules/wsgidav/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ cheroot pytestCheckHook requests diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index ce9f0c0d7a37..583b8111ab68 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ h11 ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "wsproto" ]; diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index ef2e06cc3e71..037bbb394e2e 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ markupsafe babel ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook email-validator ]; diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix index 395f3ad5b107..ee93a2c6454d 100644 --- a/pkgs/development/python-modules/wurlitzer/default.nix +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -1,32 +1,39 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 -, mock -, pytest -, selectors2 +, pythonOlder +, pytestCheckHook }: buildPythonPackage rec { pname = "wurlitzer"; - version = "3.0.2"; + version = "3.0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "36051ac530ddb461a86b6227c4b09d95f30a1d1043de2b4a592e97ae8a84fcdf"; + hash = "sha256-Ik9f5wYYvjhywF393IxFcZHsGHBlRZYnn8we2t6+Pls="; }; - propagatedBuildInputs = lib.optionals isPy27 [ selectors2 ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - checkInputs = [ mock pytest ]; + pythonImportsCheck = [ + "wurlitzer" + ]; - checkPhase = '' - py.test test.py - ''; + pytestFlagsArray = [ + "test.py" + ]; - meta = { + meta = with lib; { description = "Capture C-level output in context managers"; homepage = "https://github.com/minrk/wurlitzer"; - license = lib.licenses.mit; + changelog = "https://github.com/minrk/wurlitzer/blob/{version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index d9fead66e355..380fefbc4cd0 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -12,6 +12,7 @@ , ncurses , libintl , wxGTK +, gtk3 , IOKit , Carbon , Cocoa @@ -42,7 +43,7 @@ buildPythonPackage rec { then [ AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL ] else - [ wxGTK.gtk ] + [ gtk3 ] ); propagatedBuildInputs = [ @@ -58,7 +59,7 @@ buildPythonPackage rec { --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-2.0.so"), + ("gdk", "${gtk3}/lib/libgtk-x11-2.0.so"), ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"), ("appsvc", None) ]}' diff --git a/pkgs/development/python-modules/x-wr-timezone/default.nix b/pkgs/development/python-modules/x-wr-timezone/default.nix new file mode 100644 index 000000000000..8944078f70ac --- /dev/null +++ b/pkgs/development/python-modules/x-wr-timezone/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, icalendar +, pytz +, pytestCheckHook +, restructuredtext_lint +, pygments +}: + +buildPythonPackage rec { + pname = "x-wr-timezone"; + version = "0.0.5"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "niccokunzmann"; + repo = "x-wr-timezone"; + rev = "v${version}"; + hash = "sha256-vUhAq6b5I0gYbXmbElxSSL6Mu9BSLs0uT5gb8zXdmpg="; + }; + + propagatedBuildInputs = [ + icalendar + pytz + ]; + + nativeCheckInputs = [ + pytestCheckHook + restructuredtext_lint + pygments + ]; + + preCheck = '' + export PATH=$out/bin:$PATH + ''; + + pythonImportsCheck = [ "x_wr_timezone" ]; + + meta = { + description = "Convert calendars using X-WR-TIMEZONE to standard ones"; + homepage = "https://github.com/niccokunzmann/x-wr-timezone"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index 333f544c151e..9613ccbeb06d 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -1,6 +1,9 @@ { lib , fetchFromGitHub , buildPythonPackage +, python +, meson +, ninja , psutil , pygobject3 , gtk3 @@ -11,15 +14,22 @@ buildPythonPackage rec { pname = "xapp"; - version = "2.2.2"; + version = "2.4.0"; + + format = "other"; src = fetchFromGitHub { owner = "linuxmint"; repo = "python-xapp"; rev = version; - hash = "sha256-ntjJ/O6HiRZMsqsuQY4HLM4fBE0aWpn/L4n5YCRlhhg="; + hash = "sha256-qEK71cGNGmaThxlFVsfnLUTD83RTr8GP+501c4UbHCk="; }; + nativeBuildInputs = [ + meson + ninja + ]; + propagatedBuildInputs = [ psutil pygobject3 @@ -33,6 +43,13 @@ buildPythonPackage rec { substituteInPlace "xapp/os.py" --replace "/usr/bin/pkexec" "${polkit}/bin/pkexec" ''; + postInstall = '' + # This is typically set by pipInstallHook/eggInstallHook, + # so we have to do so manually when using meson. + # https://github.com/NixOS/nixpkgs/issues/175227 + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + ''; + doCheck = false; pythonImportsCheck = [ "xapp" ]; diff --git a/pkgs/development/python-modules/xarray-einstats/default.nix b/pkgs/development/python-modules/xarray-einstats/default.nix index 244541f7d852..9ca01d574d7f 100644 --- a/pkgs/development/python-modules/xarray-einstats/default.nix +++ b/pkgs/development/python-modules/xarray-einstats/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xarray-einstats"; - version = "0.3.0"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "arviz-devs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-N8ievasPaqusx51FCxcl1FGIjXooyBsRqsuRU73puRM="; + hash = "sha256-6Wf5pc8e36lMv1V115N6sQbmE4l3QT6kbO7izUws0zc="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { xarray ]; - checkInputs = [ + nativeCheckInputs = [ einops numba pytestCheckHook @@ -46,10 +46,6 @@ buildPythonPackage rec { "xarray_einstats" ]; - pytestFlagsArray = [ - "src/xarray_einstats/tests/" - ]; - meta = with lib; { description = "Stats, linear algebra and einops for xarray"; homepage = "https://github.com/arviz-devs/xarray-einstats"; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 2d10f0ddb572..3448ad879b3b 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "xarray"; - version = "2022.6.0"; + version = "2022.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ECjRmEk/ZrsVvTXc/dEd79gxy+469lif/xb0G93WfoQ="; + sha256 = "sha256-CD0I5VKnZHx+zhNt+jpLahN5JWvrVbvti43fBfHhTsc="; }; SETUPTOOLS_SCM_PRETEND_VERSION="${version}"; @@ -35,7 +35,7 @@ buildPythonPackage rec { pandas ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index ee31542d08b9..fa9620d9dab3 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -3,18 +3,24 @@ , fetchPypi , python , cffi +, pythonOlder }: buildPythonPackage rec { pname = "xattr"; - version = "0.10.0"; + version = "0.10.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ciZS0qUyTheJHEFtTHbZHM+YgwqPUWoN6FM86GfzrK8="; + hash = "sha256-wS59gf+qBgWzrIwiwplKjhipzxxZKHobdyKiKJyVLsU="; }; - propagatedBuildInputs = [ cffi ]; + propagatedBuildInputs = [ + cffi + ]; # https://github.com/xattr/xattr/issues/43 doCheck = false; @@ -23,10 +29,15 @@ buildPythonPackage rec { ${python.interpreter} -m compileall -f xattr ''; - meta = with lib; { - homepage = "https://github.com/xattr/xattr"; - description = "Python wrapper for extended filesystem attributes"; - license = licenses.mit; - }; + pythonImportsCheck = [ + "xattr" + ]; + meta = with lib; { + description = "Python wrapper for extended filesystem attributes"; + homepage = "https://github.com/xattr/xattr"; + changelog = "https://github.com/xattr/xattr/blob/v${version}/CHANGES.txt"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; } diff --git a/pkgs/development/python-modules/xbox-webapi/default.nix b/pkgs/development/python-modules/xbox-webapi/default.nix index de4500378f0d..e4701e806d9d 100644 --- a/pkgs/development/python-modules/xbox-webapi/default.nix +++ b/pkgs/development/python-modules/xbox-webapi/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/xboxapi/default.nix b/pkgs/development/python-modules/xboxapi/default.nix index 973f2f6aba24..0f34bec3c886 100644 --- a/pkgs/development/python-modules/xboxapi/default.nix +++ b/pkgs/development/python-modules/xboxapi/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "xboxapi" ]; diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index cb9e1ddf921c..4de24783ea48 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -3,17 +3,17 @@ , fetchPypi , xorg , cffi -, nose , six +, pytestCheckHook }: buildPythonPackage rec { - version = "0.11.1"; + version = "1.1.2"; pname = "xcffib"; src = fetchPypi { inherit pname version; - sha256 = "12949cfe2e68c806efd57596bb9bf3c151f399d4b53e15d1101b2e9baaa66f5a"; + sha256 = "sha256-Wqc6wlUUUpfMeJmhEFmEf41TDz2zhLPeOqwT+GDgS6w="; }; patchPhase = '' @@ -25,7 +25,11 @@ buildPythonPackage rec { propagatedNativeBuildInputs = [ cffi ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ + pytestCheckHook + xorg.xeyes + xorg.xorgserver + ]; pythonImportsCheck = [ "xcffib" ]; diff --git a/pkgs/development/python-modules/xdg/default.nix b/pkgs/development/python-modules/xdg/default.nix index ddf66a741758..a84d2656cde0 100644 --- a/pkgs/development/python-modules/xdg/default.nix +++ b/pkgs/development/python-modules/xdg/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { clikit ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "XDG Base Directory Specification for Python"; diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index 5039dc242f03..4528bad359d7 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "xdis"; - version = "6.0.4"; + version = "6.0.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; - rev = version; - hash = "sha256-CRZG898xCwukq+9YVkyXMP8HcuJ9GtvDhy96kxvRFks="; + rev = "refs/tags/${version}"; + hash = "sha256-3mL0EuPHF/dithovrYvMjweYGwGhrN75N9MRfLjNC34="; }; postPatch = '' @@ -33,7 +33,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index a07235006c9a..cd7fdd9a218b 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -11,9 +11,9 @@ buildPythonPackage rec { }; disabled = !isPy3k; - nativeBuildInputs = [ wrapGAppsHook ]; - propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 numpy ]; - checkInputs = [ xvfb-run ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + propagatedBuildInputs = [ pygobject3 graphviz gtk3 numpy ]; + nativeCheckInputs = [ xvfb-run ]; postInstall = '' wrapProgram "$out/bin/xdot" --prefix PATH : "${lib.makeBinPath [ graphviz ]}" diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index f6c63db45051..5d0b3b561221 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -1,34 +1,22 @@ { lib , buildPythonPackage -, pytestCheckHook +, pythonOlder , cmake +, numpy , scipy -, scikit-learn , stdenv , xgboost -, pandas -, matplotlib -, graphviz -, datatable -, hypothesis }: buildPythonPackage { pname = "xgboost"; inherit (xgboost) version src meta; + disabled = pythonOlder "3.8"; + nativeBuildInputs = [ cmake ]; buildInputs = [ xgboost ]; - propagatedBuildInputs = [ scipy ]; - checkInputs = [ - pytestCheckHook - scikit-learn - pandas - matplotlib - graphviz - datatable - hypothesis - ]; + propagatedBuildInputs = [ numpy scipy ]; # Override existing logic for locating libxgboost.so which is not appropriate for Nix prePatch = let @@ -43,24 +31,13 @@ buildPythonPackage { cd python-package ''; - preCheck = '' - ln -sf ../demo . - ln -s ${xgboost}/bin/xgboost ../xgboost - ''; + # test setup tries to download test data with no option to disable + # (removing sklearn from nativeCheckInputs causes all previously enabled tests to be skipped) + # and are extremely cpu intensive anyway + doCheck = false; - # tests are extremely cpu intensive, only run basic tests to ensure package is working - pytestFlagsArray = ["../tests/python/test_basic.py"]; - disabledTestPaths = [ - # Requires internet access: https://github.com/dmlc/xgboost/blob/03cd087da180b7dff21bd8ef34997bf747016025/tests/python/test_ranking.py#L81 - "../tests/python/test_ranking.py" - ]; - disabledTests = [ - "test_cli_binary_classification" - "test_model_compatibility" - ] ++ lib.optionals stdenv.isDarwin [ - # fails to connect to the com.apple.fonts daemon in sandboxed mode - "test_plotting" - "test_sklearn_plotting" + pythonImportsCheck = [ + "xgboost" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index 31ae00ec7817..ad1e3b731f91 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { svglib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 676afd2a44dd..c868801e2d4e 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.11.0"; + version = "0.15.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-qAqXg+skA7FfAjRXljt1UpyOcC3KYghc+5wjiRzlyyg="; + rev = "refs/tags/v${version}"; + hash = "sha256-6j5hZ9NGmAFpbgYTyC4UuI4XkQwotZND1UMHnmJHCdo="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Xiaomi BLE devices"; homepage = "https://github.com/Bluetooth-Devices/xiaomi-ble"; + changelog = "https://github.com/Bluetooth-Devices/xiaomi-ble/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/xkbcommon/default.nix b/pkgs/development/python-modules/xkbcommon/default.nix index 580ad3921905..f9320a4bca00 100644 --- a/pkgs/development/python-modules/xkbcommon/default.nix +++ b/pkgs/development/python-modules/xkbcommon/default.nix @@ -10,18 +10,18 @@ buildPythonPackage rec { pname = "xkbcommon"; - version = "0.4"; + version = "0.8"; src = fetchPypi { inherit pname version; - sha256 = "V5LMaX5TPhk9x4ZA4MGFzDhUiC6NKPo4uTbW6Q7mdVw="; + sha256 = "sha256-W+WXO/W3UlaHpN9shHibQhWQ1/fPkq5W8qqxd7eV1RY="; }; nativeBuildInputs = [ pkg-config ]; propagatedNativeBuildInputs = [ cffi ]; buildInputs = [ libxkbcommon ]; propagatedBuildInputs = [ cffi ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postBuild = '' ${python.interpreter} xkbcommon/ffi_build.py diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index 5aac18d21077..1186cac19213 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { installShellFiles ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 7a950df3af24..2d1cbab86c6d 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "1.2.1"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5uRPMu9qZ0ofMdgk8d1IpKjHjnEP+zhWs+EDQx9wk6U="; + hash = "sha256-G4az6YmCDv1MPF30mBQVNBPZdebjZqd+0vxo5F5iDWY="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { ifaddr ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; @@ -52,6 +52,7 @@ buildPythonPackage rec { packets. It provides support for KNX/IP routing and tunneling devices. ''; homepage = "https://github.com/XKNX/xknx"; + changelog = "https://github.com/XKNX/xknx/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index 05d5e095a163..c9fd70140301 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -13,25 +13,30 @@ buildPythonPackage rec { pname = "xlib"; - version = "0.31"; + version = "0.33"; src = fetchFromGitHub { owner = "python-xlib"; repo = "python-xlib"; - rev = version; - sha256 = "155p9xhsk01z9vdml74h07svlqy6gljnx9c6qbydcr14lwghwn06"; + rev = "refs/tags/${version}"; + hash = "sha256-u06OWlMIOUzHOVS4hvm72jGgTSXWUqMvEQd8bTpFog0="; }; - patches = [ - ./fix-no-protocol-specified.patch + nativeBuildInputs = [ + setuptools-scm ]; - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ xorg.libX11 ]; - propagatedBuildInputs = [ six ]; + buildInputs = [ + xorg.libX11 + ]; + + propagatedBuildInputs = [ + six + ]; doCheck = !stdenv.isDarwin; - checkInputs = [ + + nativeCheckInputs = [ pytestCheckHook mock nose @@ -46,9 +51,11 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/python-xlib/python-xlib/releases/tag/${version}"; description = "Fully functional X client library for Python programs"; - homepage = "http://python-xlib.sourceforge.net/"; - license = licenses.gpl2Plus; + homepage = "https://github.com/python-xlib/python-xlib"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix index bc88880f30a3..6fa9b6935def 100644 --- a/pkgs/development/python-modules/xlrd/default.nix +++ b/pkgs/development/python-modules/xlrd/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "f72f148f54442c6b056bf931dbc34f986fd0c3b0b6b5a58d013c9aef274d0c88"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = "http://www.python-excel.org/"; + homepage = "https://www.python-excel.org/"; description = "Library for developers to extract data from Microsoft Excel (tm) spreadsheet files"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix index 21a40f0c35f3..7cf71eabdb81 100644 --- a/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/pkgs/development/python-modules/xlsx2csv/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "xlsx2csv"; - version = "0.8.0"; + version = "0.8.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LCaOUJt3ZspKJPLzYwLpGHBcXq0vzeP0vV8cphUvfiw="; + sha256 = "sha256-fs1tK8JCby5DL0/awSIR4ZdtPLtl+QM+Htpl7dogReM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix index 7b8e931fb874..efcc4adfda6f 100644 --- a/pkgs/development/python-modules/xlwt/default.nix +++ b/pkgs/development/python-modules/xlwt/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests -v ''; diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 28c9a856b3f8..ff8451da3c08 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,32 +1,33 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, intervaltree -, pyflakes -, requests -, lxml -, google-i18n-address -, pycountry -, html5lib -, six -, kitchen -, pypdf2 -, dict2xml -, weasyprint -, pyyaml -, jinja2 -, configargparse , appdirs +, buildPythonPackage +, configargparse , decorator +, dict2xml +, fetchFromGitHub +, google-i18n-address +, html5lib +, intervaltree +, jinja2 +, lxml +, markupsafe , pycairo +, pycountry +, pyflakes +, pypdf2 , pytestCheckHook , python-fontconfig +, pythonOlder +, pyyaml +, requests +, six +, wcwidth }: buildPythonPackage rec { pname = "xml2rfc"; - version = "3.15.1"; + version = "3.16.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -34,7 +35,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - sha256 = "sha256-/0Y49ZSaPM3IAFJGmWKiKD+mziA0LYQ3fvGFrkPkl9Y="; + hash = "sha256-H2m6WZTIu2xLIz3ysOZcicIibPj8mErrxYM2+F07aS0="; }; postPatch = '' @@ -46,43 +47,46 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + appdirs + configargparse + dict2xml + google-i18n-address + html5lib intervaltree jinja2 + lxml + markupsafe + pycountry pyflakes + pypdf2 pyyaml requests - lxml - google-i18n-address - pycountry - html5lib six - kitchen - pypdf2 - dict2xml - weasyprint - configargparse - appdirs + wcwidth ]; - checkInputs = [ + nativeCheckInputs = [ decorator pycairo pytestCheckHook python-fontconfig ]; - # requires Noto Serif and Roboto Mono font + # Requires Noto Serif and Roboto Mono font doCheck = false; checkPhase = '' make tests-no-network ''; - pythonImportsCheck = [ "xml2rfc" ]; + pythonImportsCheck = [ + "xml2rfc" + ]; meta = with lib; { description = "Tool generating IETF RFCs and drafts from XML sources"; homepage = "https://github.com/ietf-tools/xml2rfc"; + changelog = "https://github.com/ietf-tools/xml2rfc/blob/v${version}/CHANGELOG.md"; # Well, parts might be considered unfree, if being strict; see: # http://metadata.ftp-master.debian.org/changelogs/non-free/x/xml2rfc/xml2rfc_2.9.6-1_copyright license = licenses.bsd3; diff --git a/pkgs/development/python-modules/xmldiff/default.nix b/pkgs/development/python-modules/xmldiff/default.nix index 1dfb09147589..9f3bde9f348e 100644 --- a/pkgs/development/python-modules/xmldiff/default.nix +++ b/pkgs/development/python-modules/xmldiff/default.nix @@ -1,28 +1,40 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi , lxml , setuptools -, six , pytestCheckHook }: buildPythonPackage rec { pname = "xmldiff"; - version = "2.4"; + version = "2.5"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Bb6iDOHyyWeGg7zODDupmB+H2StwnRkOAYvL8Efsz2M="; + sha256 = "sha256-bF8wvGXOboHZpwo8sCafe6YYUv1sqnoPv8Dt8zs8txc="; }; - propagatedBuildInputs = [ lxml setuptools six ]; + propagatedBuildInputs = [ + lxml + setuptools + ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "xmldiff" + ]; meta = with lib; { - homepage = "https://github.com/Shoobx/xmldiff"; description = "Creates diffs of XML files"; + homepage = "https://github.com/Shoobx/xmldiff"; + changelog = "https://github.com/Shoobx/xmldiff/blob/master/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ sfrijters ]; }; diff --git a/pkgs/development/python-modules/xmljson/default.nix b/pkgs/development/python-modules/xmljson/default.nix index dd5d84afacb4..60752537e339 100644 --- a/pkgs/development/python-modules/xmljson/default.nix +++ b/pkgs/development/python-modules/xmljson/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "b4158e66aa1e62ee39f7f80eb2fe4f767670ba3c0d5de9804420dc53427fdec8"; }; - checkInputs = [ + nativeCheckInputs = [ lxml ]; diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 3dcfe8d7d026..cfec72b96835 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "1.11.3"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-z6VgLRDp5PHaYstdV30gt6xGVd4uifz4LkYQ2z3ayk4="; + hash = "sha256-rt7QScg458ezDwktO1QRydmC3XqedX+kPpv6J+JvLzQ="; }; propagatedBuildInputs = [ elementpath ]; - checkInputs = [ + nativeCheckInputs = [ lxml pytestCheckHook ]; diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix index 1aec0cc114ec..0817764cc8ff 100644 --- a/pkgs/development/python-modules/xmlsec/default.nix +++ b/pkgs/development/python-modules/xmlsec/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ lxml ]; - checkInputs = [ pytestCheckHook hypothesis ]; + nativeCheckInputs = [ pytestCheckHook hypothesis ]; disabledTestPaths = [ # Full git clone required for test_doc_examples diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index 19c2b1d283f6..c0dbe6dc3ca5 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-NBWVpIjj4BqFqdiRHYkS/ZIu3l/sxNzkN+tLbI0DflY="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/xmodem/default.nix b/pkgs/development/python-modules/xmodem/default.nix index a53567f7fa8b..7358f843eb64 100644 --- a/pkgs/development/python-modules/xmodem/default.nix +++ b/pkgs/development/python-modules/xmodem/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1xx7wd8bnswxa1fv3bfim2gcamii79k7qmwg7dbxbjvrhbcjjc0l"; }; - checkInputs = [ pytest which lrzsz ]; + nativeCheckInputs = [ pytest which lrzsz ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/xpath-expressions/default.nix b/pkgs/development/python-modules/xpath-expressions/default.nix index a7c08ddc0bec..eebd30364e47 100644 --- a/pkgs/development/python-modules/xpath-expressions/default.nix +++ b/pkgs/development/python-modules/xpath-expressions/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ lxml pytestCheckHook ]; diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index ab8881827394..6ad48ac12364 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xsdata"; - version = "22.11"; + version = "22.12"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-3A2vyK6UdelWSzcN7pzPz6xKnU3X+rum7dKzl6OfWoc="; + hash = "sha256-o9Xxt7b/+MkW94Jcg26ihaTn0/OpTcu+0OY7oV3JRGY="; }; postPatch = '' @@ -46,7 +46,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.cli ++ passthru.optional-dependencies.lxml diff --git a/pkgs/development/python-modules/xtensor-python/default.nix b/pkgs/development/python-modules/xtensor-python/default.nix index 7d973c0906e9..217d856e77f9 100644 --- a/pkgs/development/python-modules/xtensor-python/default.nix +++ b/pkgs/development/python-modules/xtensor-python/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { dontUsePipInstall = true; dontUseSetuptoolsCheck = true; - checkInputs = [ + nativeCheckInputs = [ gtest ]; diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix index f037cb40338c..90890677ef9a 100644 --- a/pkgs/development/python-modules/xvfbwrapper/default.nix +++ b/pkgs/development/python-modules/xvfbwrapper/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { # See: https://github.com/cgoldberg/xvfbwrapper/issues/30 doCheck = false; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; meta = with lib; { description = "Run headless display inside X virtual framebuffer (Xvfb)"; diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index ff4eeff35459..00cc42ee56c2 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "3.0.0"; + version = "3.2.0"; pname = "xxhash"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MLLZeq8R+xIgI/a0TruXxpVengDXRhqWQVygMLXOucc="; + sha256 = "sha256-Gv1Hr4lVxdtzD2MK1TrnmM9/rgrLZM67PPlNNcR90Ig="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xyzservices/default.nix b/pkgs/development/python-modules/xyzservices/default.nix new file mode 100644 index 000000000000..56a2ad45ab28 --- /dev/null +++ b/pkgs/development/python-modules/xyzservices/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchPypi +, mercantile +, pytestCheckHook +, requests +}: + +buildPythonPackage rec { + pname = "xyzservices"; + version = "2022.9.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-VWUZYXCLmhSEmXizOd92AIyIbfeoMmMIpVSbrlUWJgw="; + }; + + pythonImportsCheck = [ + "xyzservices.providers" + ]; + + nativeCheckInputs = [ + mercantile + pytestCheckHook + requests + ]; + + meta = with lib; { + changelog = "https://github.com/geopandas/xyzservices/releases/tag/${version}"; + description = "Source of XYZ tiles providers"; + homepage = "https://github.com/geopandas/xyzservices"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/yabadaba/default.nix b/pkgs/development/python-modules/yabadaba/default.nix index 9c9013df2da0..2fab492268ef 100644 --- a/pkgs/development/python-modules/yabadaba/default.nix +++ b/pkgs/development/python-modules/yabadaba/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 084feb2e6ca4..3e2de3d2afcd 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "1.9.5"; + version = "1.12.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; repo = pname; - rev = "v${version}"; - hash = "sha256-cU4aeJlRBwxQm6a/rqpO2HVZfz/vfEo4P5x+BjKqqeo="; + rev = "refs/tags/v${version}"; + hash = "sha256-04Xl2TBs9RL+KWmJgUY+PDoYN4AAvrcWP7TJBEu5lNU="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { pycryptodome ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Yale BLE devices"; homepage = "https://github.com/bdraco/yalexs-ble"; + changelog = "https://github.com/bdraco/yalexs-ble/blob/v${version}/CHANGELOG.md"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 2ffd5fe287e3..22919fa0a01f 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses aiounittest asynctest diff --git a/pkgs/development/python-modules/yamale/default.nix b/pkgs/development/python-modules/yamale/default.nix index 5cd60f02b589..7e0d693abce7 100644 --- a/pkgs/development/python-modules/yamale/default.nix +++ b/pkgs/development/python-modules/yamale/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ruamel-yaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index b789aab03701..96a5c74aec2a 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -2,41 +2,45 @@ , buildPythonPackage , click , fetchFromGitHub +, maison +, pdm-pep517 , pytest-xdist , pytestCheckHook , pythonOlder , ruyaml +, setuptools }: buildPythonPackage rec { pname = "yamlfix"; - version = "0.8.2"; - format = "setuptools"; + version = "1.6.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "lyz-code"; repo = pname; - rev = version; - sha256 = "sha256-YCC4xK1fB5Gyv32JhbSuejtzLNMRnH7iyUpzccVijS0="; + rev = "refs/tags/${version}"; + hash = "sha256-OXo9PkvKn+XPxfXUObwps62lwNo6lE4Ot5L0lZPIYPw="; }; + nativeBuildInputs = [ + setuptools + pdm-pep517 + ]; + propagatedBuildInputs = [ click + maison ruyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytest-xdist pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'python_paths = "."' "" - ''; - pythonImportsCheck = [ "yamlfix" ]; @@ -44,7 +48,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python YAML formatter that keeps your comments"; homepage = "https://github.com/lyz-code/yamlfix"; - license = licenses.gpl3Plus; + changelog = "https://github.com/lyz-code/yamlfix/blob/${version}/CHANGELOG.md"; + license = licenses.gpl3Only; maintainers = with maintainers; [ koozz ]; }; } diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index ca092cef8c72..84fb0dd9a4cc 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pathspec ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix index 97da02102c7f..33f9a0ccfd8c 100644 --- a/pkgs/development/python-modules/yamlloader/default.nix +++ b/pkgs/development/python-modules/yamlloader/default.nix @@ -1,21 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, pyyaml, hypothesis +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pyyaml +, hypothesis +, pythonOlder }: buildPythonPackage rec { pname = "yamlloader"; - version = "1.1.0"; + version = "1.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8a297c7a197683ba02e5e2b882ffd6c6180d01bdefb534b69cd3962df020bfe6"; + hash = "sha256-NWaf17n4xrONuGGlFwFULEJnK0boq2MlNIaoy4N3toc="; }; propagatedBuildInputs = [ pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytest ]; diff --git a/pkgs/development/python-modules/yanc/default.nix b/pkgs/development/python-modules/yanc/default.nix index 37e7d91a8098..dfe590390166 100644 --- a/pkgs/development/python-modules/yanc/default.nix +++ b/pkgs/development/python-modules/yanc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # Tests fail on Python>=3.5. See: https://github.com/0compute/yanc/issues/10 doCheck = pythonOlder "3.5"; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests . diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix index 42caebb92e8b..c8e8809bcd46 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.14"; + version = "1.4.15"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OMqtZ/kPj7ge235nuyrfCzawG6AOAqfJPzQHF8cW4Ok="; + sha256 = "sha256-yw/LwWjHW4vgHp06E/DgqauTvdfLxerHw1avge91XLU="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ buildPythonPackage rec { pyxb ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 2d6fc9520ccd..80b84b73ff97 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { hash = "sha256-o/UIXTfvfj4ATEup+bPkDFT/GQHNER8FFFrjE6fGfRs="; }; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/yappi/default.nix b/pkgs/development/python-modules/yappi/default.nix index 764fcaf901c6..cb12c4f63f37 100644 --- a/pkgs/development/python-modules/yappi/default.nix +++ b/pkgs/development/python-modules/yappi/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ./tests.patch ]; - checkInputs = [ + nativeCheckInputs = [ gevent ]; diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix index a6471d8f07ef..278712019592 100644 --- a/pkgs/development/python-modules/yapsy/default.nix +++ b/pkgs/development/python-modules/yapsy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = "http://yapsy.sourceforge.net/"; + homepage = "https://yapsy.sourceforge.net/"; description = "Yet another plugin system"; license = licenses.bsd0; # tests fail and are not using pytest to easily disable them diff --git a/pkgs/development/python-modules/yara-python/default.nix b/pkgs/development/python-modules/yara-python/default.nix index e9774ae85dd4..85b8a26abc36 100644 --- a/pkgs/development/python-modules/yara-python/default.nix +++ b/pkgs/development/python-modules/yara-python/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { yara ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/yarg/default.nix b/pkgs/development/python-modules/yarg/default.nix index 97237ba09b09..6368fbc463cd 100644 --- a/pkgs/development/python-modules/yarg/default.nix +++ b/pkgs/development/python-modules/yarg/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ nose mock ]; + nativeCheckInputs = [ nose mock ]; checkPhase = '' nosetests ''; diff --git a/pkgs/development/python-modules/yark/default.nix b/pkgs/development/python-modules/yark/default.nix new file mode 100644 index 000000000000..c2ac28e64d9b --- /dev/null +++ b/pkgs/development/python-modules/yark/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, pythonRelaxDepsHook +, click +, colorama +, flask +, requests +, yt-dlp +, progress +}: + +buildPythonPackage rec { + pname = "yark"; + version = "1.2.4"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "fdd50d0e832b4522cbe24433f42ed571a1f199f571c1d0c98472b94a501db9cf"; + }; + + pythonRelaxDeps = [ + "requests" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + click + colorama + flask + progress + requests + yt-dlp + ]; + + # There aren't any unit tests. If test discovery runs, it will crash, halting the build. + # When upstream adds unit tests, please configure them here. Thanks! ~ C. + doCheck = false; + + pythonImportsCheck = [ + "yark" + ]; + + meta = with lib; { + description = "YouTube archiving made simple"; + homepage = "https://github.com/Owez/yark"; + license = licenses.mit; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 249bf974322e..1a1295d29bee 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonAtLeast , pythonOlder , idna , multidict @@ -10,11 +11,15 @@ buildPythonPackage rec { pname = "yarl"; - version = "1.8.1"; + version = "1.8.2"; + + disabled = pythonOlder "3.7"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-r4h4RbjC4GDrVgX/crby3SqrenYTeTc/2J0xT0dSq78="; + hash = "sha256-SdQ0AsbjATrQl4YCv2v1MoU1xI0ZIwS5G5ejxnkLFWI="; }; postPatch = '' @@ -33,10 +38,14 @@ buildPythonPackage rec { pushd tests ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + "test_not_a_scheme2" + ]; + postCheck = '' popd ''; @@ -44,6 +53,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "yarl" ]; meta = with lib; { + changelog = "https://github.com/aio-libs/yarl/blob/v${version}/CHANGES.rst"; description = "Yet another URL library"; homepage = "https://github.com/aio-libs/yarl"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/yaspin/default.nix b/pkgs/development/python-modules/yaspin/default.nix index 9bad354d732c..bf68acafba72 100644 --- a/pkgs/development/python-modules/yaspin/default.nix +++ b/pkgs/development/python-modules/yaspin/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { termcolor ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/yaswfp/default.nix b/pkgs/development/python-modules/yaswfp/default.nix index 267052f5c17d..8b7843d91752 100644 --- a/pkgs/development/python-modules/yaswfp/default.nix +++ b/pkgs/development/python-modules/yaswfp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1dxdz89hlycy1rnn269fwl1f0qxgxqarkc0ivs2m77f8xba2qgj9"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index 211a4b60c813..6bac02af7f80 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yattag"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "5731a31cb7452c0c6930dd1a284e0170b39eee959851a2aceb8d6af4134a5fa8"; + sha256 = "sha256-ap/z/TMKYCh4BOpzcKhBZrYk6/S3rZ7XiLfFd3m2UmM="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index e7452b89a539..46490a098eb8 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { patchShebangs tests/*.sh ''; - checkInputs = [ docutils pygments ]; + nativeCheckInputs = [ docutils pygments ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix index b2c019889483..2a67d6a9b668 100644 --- a/pkgs/development/python-modules/yeelight/default.nix +++ b/pkgs/development/python-modules/yeelight/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ifaddr ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 1a5e718d451b..d2a113fb51d0 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -1,7 +1,10 @@ { lib , appdirs +, beautifulsoup4 , buildPythonPackage +, cryptography , fetchFromGitHub +, frozendict , multitasking , numpy , pandas @@ -12,7 +15,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.77"; + version = "0.2.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,11 +24,14 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gg9wX3WWacS5BmbR1wgdicFxhPN5b45KH0+obWmJ65g="; + hash = "sha256-CcvBVW9MdXVx1BnIcPB9b1PHGK2zw4Hg0vVNW6s87/Q="; }; propagatedBuildInputs = [ appdirs + beautifulsoup4 + cryptography + frozendict multitasking numpy pandas @@ -41,8 +47,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Yahoo! Finance market data downloader (+faster Pandas Datareader)"; - homepage = "https://aroussi.com/post/python-yahoo-finance"; + description = "Module to doiwnload Yahoo! Finance market data"; + homepage = "https://github.com/ranaroussi/yfinance"; + changelog = "https://github.com/ranaroussi/yfinance/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index ed5edf43c03d..e882a48c6332 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.1.0"; + version = "0.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "YoSmart-Inc"; repo = pname; - rev = "v${version}"; - hash = "sha256-uEW8d8b7ObwmGwVTOq25kZWaLVv4lxTl+cqZK5Kjkmo="; + rev = "refs/tags/v${version}"; + hash = "sha256-6Ch17aKUT8jVUo+pYD5EvydEzP/TTjLtgkUQJnHYkKg="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to interface with Yolink"; homepage = "https://github.com/YoSmart-Inc/yolink-api"; + changelog = "https://github.com/YoSmart-Inc/yolink-api/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix index f29c10a8a4f6..c5f5b7f1f3d2 100644 --- a/pkgs/development/python-modules/youless-api/default.nix +++ b/pkgs/development/python-modules/youless-api/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/youtube-transcript-api/default.nix b/pkgs/development/python-modules/youtube-transcript-api/default.nix index 100aa2eaf06e..888389f59d57 100644 --- a/pkgs/development/python-modules/youtube-transcript-api/default.nix +++ b/pkgs/development/python-modules/youtube-transcript-api/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ mock httpretty pytestCheckHook diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix index 30c056db9340..08b137402b45 100644 --- a/pkgs/development/python-modules/yowsup/default.nix +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { --replace "==" ">=" \ ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/yoyo-migrations/default.nix b/pkgs/development/python-modules/yoyo-migrations/default.nix index 14c90dbd5f28..14aec06320d7 100644 --- a/pkgs/development/python-modules/yoyo-migrations/default.nix +++ b/pkgs/development/python-modules/yoyo-migrations/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, importlib-metadata , setuptools , sqlparse , tabulate @@ -8,14 +9,19 @@ buildPythonPackage rec { pname = "yoyo-migrations"; - version = "7.3.2"; + version = "8.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RIQIKOGgFp9UHnAtWu3KgYWtpoCH57rUhQpvxdced6Q="; + sha256 = "sha256-ggYGoD4mLPHNT1niVsKPpEZCUiTVuCo9EnX9eBeFI+Q="; }; - propagatedBuildInputs = [ setuptools sqlparse tabulate ]; + propagatedBuildInputs = [ + importlib-metadata + setuptools + sqlparse + tabulate + ]; doCheck = false; # pypi tarball does not contain tests diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index 937c95864a3d..599cb56c4dc9 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { argcomplete ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/yte/default.nix b/pkgs/development/python-modules/yte/default.nix index 90bb34a71cd1..cb5e036b6b9c 100644 --- a/pkgs/development/python-modules/yte/default.nix +++ b/pkgs/development/python-modules/yte/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index fd5baba48adc..a2adbeb87d29 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.24.0"; + version = "0.25.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-vbSWgBze3tFLEpHdh3JXij3m5R6iAhTSjrCMaSLZalY="; + hash = "sha256-hpX/qmRRwvCE0N5jIWl6AZkcYaVViK30nPbJwyZD+rM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix index 0db092a144d1..5aad3df78a63 100644 --- a/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ zc-buildout ]; - checkInputs = [ zope_testrunner ]; + nativeCheckInputs = [ zope_testrunner ]; doCheck = !python.pkgs.isPy27; checkPhase = '' ${python.interpreter} -m zope.testrunner --test-path=src [] diff --git a/pkgs/development/python-modules/zadnegoale/default.nix b/pkgs/development/python-modules/zadnegoale/default.nix index 7d47cb347c8c..64feef272491 100644 --- a/pkgs/development/python-modules/zadnegoale/default.nix +++ b/pkgs/development/python-modules/zadnegoale/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zadnegoale"; - version = "0.6.5"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ubBN4jvueNgReNbS+RXNDNHID0MF/rvQnb0+F4/DZaU="; + hash = "sha256-ij8xou8LXC4/BUTApIV6xSgb7ethwLyrHNJvBgxSBYM="; }; propagatedBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { orjson ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytest-error-for-skips @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for getting allergen concentration data from Żadnego Ale servers"; homepage = "https://github.com/bieniu/zadnegoale"; + changelog = "https://github.com/bieniu/zadnegoale/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/zake/default.nix b/pkgs/development/python-modules/zake/default.nix index f144bc9d2c43..a9a5902b4c06 100644 --- a/pkgs/development/python-modules/zake/default.nix +++ b/pkgs/development/python-modules/zake/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ kazoo six ]; buildInputs = [ testtools ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; preCheck = '' # Skip test - fails with our new kazoo version substituteInPlace zake/tests/test_client.py \ diff --git a/pkgs/development/python-modules/zamg/default.nix b/pkgs/development/python-modules/zamg/default.nix index 11066aa26332..791dfd87798a 100644 --- a/pkgs/development/python-modules/zamg/default.nix +++ b/pkgs/development/python-modules/zamg/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zamg"; - version = "0.1.2"; + version = "0.2.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "killer0071234"; repo = "python-zamg"; rev = "refs/tags/v${version}"; - hash = "sha256-R3byV8llg7X+KYuYTsEtdLSFfLsPD4tyqAaU0CifDks="; + hash = "sha256-pBXt7t7Cs7F0bxvB8N67XaY/uvYhZPw10+bei/3QSfw="; }; postPatch = '' @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to read weather data from ZAMG Austria"; homepage = "https://github.com/killer0071234/python-zamg"; + changelog = "https://github.com/killer0071234/python-zamg/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 72cd251dcb31..53609f6b3456 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.12.0"; + version = "2.13.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-UVox7kuta7SK4FF4xYiuSaAqNd76Ad2aMpMwaQM2gWU="; + sha256 = "sha256-2ySwkGFsY49l4zprxdlW1kIiEYKWFRXMvCixf7DQtIw="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { numcodecs ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/zbaemon/default.nix b/pkgs/development/python-modules/zbaemon/default.nix index 23eae31057fc..738fbb075603 100644 --- a/pkgs/development/python-modules/zbaemon/default.nix +++ b/pkgs/development/python-modules/zbaemon/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zdaemon"; - version = "4.3"; + version = "4.4"; src = fetchPypi { inherit pname version; - sha256 = "f249fc6885646d165d7d6b228a7b71f5170fc7117de9e0688271f8fb97840f72"; + sha256 = "sha256-SCHjvbRzh88eklWwREusQ3z3KqC1nRQHuTLjH9QyPvw="; }; propagatedBuildInputs = [ zconfig ]; diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index 521bca4ece8c..2f965d1e63d3 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -10,18 +10,18 @@ buildPythonPackage rec { pname = "ZConfig"; - version = "3.6.0"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oo6VoK4zV5V0fsytNbLLcI831Ex/Ml4qyyAemDMLFuU="; + sha256 = "sha256-RCLH1mOvdizXeVd1NmvGpnq0QKGreW6w90JbDpA08HY="; }; patches = lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; buildInputs = [ manuel docutils ]; propagatedBuildInputs = [ zope_testrunner ]; - checkInputs = [ pygments ]; + nativeCheckInputs = [ pygments ]; meta = with lib; { description = "Structured Configuration Library"; diff --git a/pkgs/development/python-modules/zcs/default.nix b/pkgs/development/python-modules/zcs/default.nix index b0a6226350f2..89ee7a239098 100644 --- a/pkgs/development/python-modules/zcs/default.nix +++ b/pkgs/development/python-modules/zcs/default.nix @@ -4,32 +4,43 @@ , python , yacs , boxx +, pythonOlder }: buildPythonPackage rec { pname = "zcs"; - version = "0.1.22"; + version = "0.1.25"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+0lG2OirfXj55IFA9GMERVWtrWwULfVfdbIg8ebH+7M="; + hash = "sha256-/QIyRQtxLDVW+vcQi5bL8rJ0o3+OhqGhQEALR1YO1pg="; }; patches = [ ./fix-test-yaml.patch ]; - propagatedBuildInputs = [ yacs ]; + propagatedBuildInputs = [ + yacs + ]; - pythonImportsCheck = [ "zcs" ]; + pythonImportsCheck = [ + "zcs" + ]; + + nativeCheckInputs = [ + boxx + ]; - checkInputs = [ boxx ]; checkPhase = '' ${python.interpreter} test/test_zcs.py ''; meta = with lib; { - description = "A flexible powerful configuration system which takes advantage of both argparse and yacs"; + description = "Configuration system which takes advantage of both argparse and yacs"; homepage = "https://github.com/DIYer22/zcs"; license = licenses.mit; maintainers = with maintainers; [ lucasew ]; diff --git a/pkgs/development/python-modules/zdaemon/default.nix b/pkgs/development/python-modules/zdaemon/default.nix index 23eae31057fc..8695c2c6927e 100644 --- a/pkgs/development/python-modules/zdaemon/default.nix +++ b/pkgs/development/python-modules/zdaemon/default.nix @@ -1,28 +1,38 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , zconfig }: buildPythonPackage rec { pname = "zdaemon"; - version = "4.3"; + version = "4.4"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f249fc6885646d165d7d6b228a7b71f5170fc7117de9e0688271f8fb97840f72"; + hash = "sha256-SCHjvbRzh88eklWwREusQ3z3KqC1nRQHuTLjH9QyPvw="; }; - propagatedBuildInputs = [ zconfig ]; + propagatedBuildInputs = [ + zconfig + ]; # too many deps.. doCheck = false; + pythonImportsCheck = [ + "zdaemon" + ]; + meta = with lib; { description = "A daemon process control library and tools for Unix-based systems"; homepage = "https://pypi.python.org/pypi/zdaemon"; + changelog = "https://github.com/zopefoundation/zdaemon/blob/${version}/CHANGES.rst"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; - } diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 83ee3f37f7e4..8f0aff1db64b 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -28,25 +28,17 @@ buildPythonPackage rec { pname = "zeep"; - version = "4.1.0"; + version = "4.2.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "mvantellingen"; repo = "python-zeep"; - rev = version; - sha256 = "sha256-fJLr2LJpbNQTl183R56G7sJILfm04R39qpJxLogQLoo="; + rev = "refs/tags/${version}"; + sha256 = "sha256-8f6kS231gbaZ8qyE8BKMcbnZsm8o2+iBoTlQrs5X+jY="; }; - patches = [ - (fetchpatch { - # fixes pytest_httpx test case; https://github.com/mvantellingen/python-zeep/pull/1293 - url = "https://github.com/mvantellingen/python-zeep/commit/2907848185adcb4e6d8c093db6c617c64cb8c8bf.patch"; - hash = "sha256-hpksgMfrBLvYtI1QIs1aHBtFq7C1PWpnAj8BW5ak1/4="; - }) - ]; - propagatedBuildInputs = [ attrs cached-property @@ -62,7 +54,7 @@ buildPythonPackage rec { xmlsec ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp aioresponses freezegun diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index 1c015d4d75a7..4fd287f3beb3 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.8"; + version = "3.7.8.2"; src = fetchPypi { inherit version pname; - sha256 = "sha256-kodRHIkMXdFUBGNVRtSyjbVqGQRxPaHqgp6ddFT5ZIY="; + sha256 = "sha256-ZDiiyNT871XMDHNPOhKHm4NzgXHcJ0fN/iO4sEz8pRE="; }; buildInputs = [ openssl bzip2 ]; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 6bc6b7888d8c..9c2b3945642b 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -4,15 +4,17 @@ , buildPythonPackage , fetchFromGitHub , ifaddr +, poetry-core , pytest-asyncio , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "zeroconf"; - version = "0.39.4"; - format = "setuptools"; + version = "0.47.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,9 +22,14 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-CUHpTtCQBuuy8E8bjxfhGOIKr9n2Gdhg/RIyv6OWGvI="; + hash = "sha256-vY4n0QIEzumtUayRbGGqycR3z7kpbOH4XKxSMcnTVrA="; }; + nativeBuildInputs = [ + poetry-core + setuptools + ]; + propagatedBuildInputs = [ async-timeout ifaddr @@ -31,11 +38,15 @@ buildPythonPackage rec { # OSError: [Errno 48] Address already in use doCheck = !stdenv.isDarwin; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; + preCheck = '' + sed -i '/addopts/d' pyproject.toml + ''; + disabledTests = [ # tests that require network interaction "test_close_multiple_times" @@ -58,6 +69,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/python-zeroconf/python-zeroconf/releases/tag/${version}"; description = "Python implementation of multicast DNS service discovery"; homepage = "https://github.com/jstasiak/python-zeroconf"; license = licenses.lgpl21Only; diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index 41b5f05cfeb2..4808aa497270 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ path nbconvert pytestCheckHook diff --git a/pkgs/development/python-modules/zeversolarlocal/default.nix b/pkgs/development/python-modules/zeversolarlocal/default.nix index feb56c384dc1..04063837b420 100644 --- a/pkgs/development/python-modules/zeversolarlocal/default.nix +++ b/pkgs/development/python-modules/zeversolarlocal/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { httpx ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index f91706b97d18..2101c36adbc0 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyutil ]; - checkInputs = [ setuptoolsTrial twisted ]; + nativeCheckInputs = [ setuptoolsTrial twisted ]; # argparse is in the stdlib but zfec doesn't know that. postPatch = '' diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index f81a155bdfa5..ce35780dfcb9 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.86"; + version = "0.0.92"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-gKYpjen5JLMiZITLGZbcgqDZedsxeofZyMhRR2ti3Ew="; + hash = "sha256-WKuME0OVNdNGv0nG40ctG2UAOmDXTkIr6mIh3+JE/uo="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { zigpy ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytestCheckHook ]; @@ -39,8 +39,9 @@ buildPythonPackage rec { meta = with lib; { description = "ZHA Device Handlers are custom quirks implementations for Zigpy"; homepage = "https://github.com/dmulcahey/zha-device-handlers"; + changelog = "https://github.com/zigpy/zha-device-handlers/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix index ed4629c07f2d..54c750d94bbf 100644 --- a/pkgs/development/python-modules/zigpy-cc/default.nix +++ b/pkgs/development/python-modules/zigpy-cc/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { zigpy ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index de08bb59320c..299fb706fe60 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.19.0"; + version = "0.19.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-HYLL+1o133Is40wVCPJoUGZO1B/43p+V8K2rJ/mdMFQ="; + hash = "sha256-Eu+6I904vwPewQesYtn8cWXoo36fQpa1Bw660tnV+Lw="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { zigpy ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-asyncio pytestCheckHook @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library which communicates with Deconz radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-deconz"; + changelog = "https://github.com/zigpy/zigpy-deconz/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mvnetbiz ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix index 30bfe8ad4167..e09c22f56fb7 100644 --- a/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { zigpy ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index 24cf7f30eb30..16228f53861a 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { zigpy ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 083805f8e7ee..f1b846e9482b 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.9.1"; + version = "0.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-32QSFBzYg+E++5euCWKgbF3/uLEn1uObenmR/Wv9XZc="; + sha256 = "sha256-orJDOnkZH9siDg8H8M8C0UTxJfWPTB+gBNtUM6s4F94="; }; propagatedBuildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { zigpy ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytest-timeout diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index c7abaac023aa..e8949b496e4b 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.51.5"; + version = "0.53.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-6OSP23lEdl15IjSqGYLCW5+F6rki+rzmXm82QRzabwU="; + hash = "sha256-1ey1JDxRF9zYSTn1EKWz1gcCw5WrCCH1eNyp6KOO8eI="; }; propagatedBuildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { voluptuous ]; - checkInputs = [ + nativeCheckInputs = [ asynctest freezegun pytest-asyncio @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library implementing a ZigBee stack"; homepage = "https://github.com/zigpy/zigpy"; + changelog = "https://github.com/zigpy/zigpy/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mvnetbiz ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix index 20e23afcfc01..53c4bd8ed208 100644 --- a/pkgs/development/python-modules/zimports/default.nix +++ b/pkgs/development/python-modules/zimports/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { tomli ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/zipfile36/default.nix b/pkgs/development/python-modules/zipfile36/default.nix deleted file mode 100644 index 46dd1e173fb2..000000000000 --- a/pkgs/development/python-modules/zipfile36/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, python -, isPy3k -, pythonOlder -}: - -buildPythonPackage rec { - pname = "zipfile36"; - version = "0.1.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "a78a8dddf4fa114f7fe73df76ffcce7538e23433b7a6a96c1c904023f122aead"; - }; - - checkPhase = '' - ${python.interpreter} -m unittest test_zipfile.py - ''; - - # Only works with Python 3.x. - # Not supposed to be used with 3.6 and up. - disabled = !(isPy3k && (pythonOlder "3.6")); - - meta = { - description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; - homepage = "https://gitlab.com/takluyver/zipfile36"; - license = lib.licenses.psfl; - maintainers = lib.maintainers.fridh; - }; -} diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index cdabed860c92..267f376620ea 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -9,14 +9,14 @@ let zipp = buildPythonPackage rec { pname = "zipp"; - version = "3.10.0"; + version = "3.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-enJi/ZML0+NsULmmSJeuw/r/89/e7JYjriK0DpP5m7g="; + sha256 = "sha256-p6IuBZKSkKZ0AUQLOWkK5lYyebztXzFGCdnQN5j1Z2Y="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ let zipp = buildPythonPackage rec { # Prevent infinite recursion with pytest doCheck = false; - checkInputs = [ + nativeCheckInputs = [ func-timeout jaraco_itertools ]; diff --git a/pkgs/development/python-modules/zipstream-new/default.nix b/pkgs/development/python-modules/zipstream-new/default.nix index 3f95fd5d4c61..143f4040cce8 100644 --- a/pkgs/development/python-modules/zipstream-new/default.nix +++ b/pkgs/development/python-modules/zipstream-new/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { "zipstream" ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/zipstream-ng/default.nix b/pkgs/development/python-modules/zipstream-ng/default.nix index b1f620557bfa..0db1a3073316 100644 --- a/pkgs/development/python-modules/zipstream-ng/default.nix +++ b/pkgs/development/python-modules/zipstream-ng/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { "zipstream" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/zipstream/default.nix b/pkgs/development/python-modules/zipstream/default.nix index 00c291a1c510..3ec6fd24aa59 100644 --- a/pkgs/development/python-modules/zipstream/default.nix +++ b/pkgs/development/python-modules/zipstream/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "01im5anqdyggmwkigqcjg0qw2a5bnn84h33mfaqjjd69a28lpwif"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = { description = "A zip archive generator"; diff --git a/pkgs/development/python-modules/zm-py/default.nix b/pkgs/development/python-modules/zm-py/default.nix index 65f5ec1fa7af..ce461a3dffea 100644 --- a/pkgs/development/python-modules/zm-py/default.nix +++ b/pkgs/development/python-modules/zm-py/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' PYTHONPATH="./zoneminder:$PYTHONPATH" pytest diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index 7c788f7a9f8f..d44642d7515b 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "ZODB"; - version = "5.7.0"; + version = "5.8.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+kC7wF7NoewkNc0MbdAqE7dphGBVikYENm9qCmhAHNM="; + sha256 = "sha256-KNugDvYm3hBYnt7auFrQ8O33KSXnXTahXJnGOsBf52Q="; }; # remove broken test @@ -39,7 +39,7 @@ buildPythonPackage rec { BTrees ]; - checkInputs = [ + nativeCheckInputs = [ manuel zope_testrunner ]; @@ -50,7 +50,8 @@ buildPythonPackage rec { meta = with lib; { description = "Zope Object Database: object database and persistence"; - homepage = "https://pypi.python.org/pypi/ZODB"; + homepage = "https://zodb-docs.readthedocs.io/"; + changelog = "https://github.com/zopefoundation/ZODB/blob/${version}/CHANGES.rst"; license = licenses.zpl21; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index ae9e15ecb80d..be3265b04722 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -1,22 +1,33 @@ -{ buildPythonPackage -, isPyPy +{ lib +, buildPythonPackage +, pythonOlder , fetchPypi }: buildPythonPackage rec { pname = "zodbpickle"; - version = "2.4"; - disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10 + version = "2.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vWzJIPKDO6bTWzvxwyaekhDr/AHs1/F2jCL2OqoHU60="; + hash = "sha256-BZePwk/5PzSQRa6hH6OtHvqA6rGcq2JR6sdBfGMRodI="; }; # fails.. doCheck = false; - meta = { - homepage = "https://pypi.python.org/pypi/zodbpickle"; + pythonImportsCheck = [ + "zodbpickle" + ]; + + meta = with lib; { + description = "Fork of Python's pickle module to work with ZODB"; + homepage = "https://github.com/zopefoundation/zodbpickle"; + changelog = "https://github.com/zopefoundation/zodbpickle/blob/${version}/CHANGES.rst"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/zope-cachedescriptors/default.nix b/pkgs/development/python-modules/zope-cachedescriptors/default.nix index 7696e078343e..56c6875ceede 100644 --- a/pkgs/development/python-modules/zope-cachedescriptors/default.nix +++ b/pkgs/development/python-modules/zope-cachedescriptors/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index e1cba0ebc02b..b60a393e4286 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_proxy ]; - checkInputs = [ zope_testrunner ]; + nativeCheckInputs = [ zope_testrunner ]; checkPhase = '' zope-testrunner --test-path=src [] diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix index f1bc3bf72f74..ff5fe9bb2023 100644 --- a/pkgs/development/python-modules/zope-hookable/default.nix +++ b/pkgs/development/python-modules/zope-hookable/default.nix @@ -6,15 +6,15 @@ buildPythonPackage rec { pname = "zope-hookable"; - version = "5.2"; + version = "5.4"; src = fetchPypi { pname = "zope.hookable"; inherit version; - sha256 = "sha256-TDAYvPKznPXMz0CCb3mbS4wUAFbbeA+WywyjMqJDvSk="; + sha256 = "sha256-+2AfAKyH5apYKoExXtlnaM41EygHKdP1H3kxLiuLlKw="; }; - checkInputs = [ zope_testing ]; + nativeCheckInputs = [ zope_testing ]; meta = with lib; { description = "Supports the efficient creation of “hookable” objects"; diff --git a/pkgs/development/python-modules/zope-testbrowser/default.nix b/pkgs/development/python-modules/zope-testbrowser/default.nix index 31de6e28f2ee..59c6e676938e 100644 --- a/pkgs/development/python-modules/zope-testbrowser/default.nix +++ b/pkgs/development/python-modules/zope-testbrowser/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock zope_testing zope_testrunner diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix index b8d364b95ebb..7e1ed3d5dd86 100644 --- a/pkgs/development/python-modules/zope_configuration/default.nix +++ b/pkgs/development/python-modules/zope_configuration/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-giPqSvU5hmznqccwrH6xjlHRfrUVk6p3c7NZPI1tdgg="; }; - checkInputs = [ zope_testrunner manuel ]; + nativeCheckInputs = [ zope_testrunner manuel ]; propagatedBuildInputs = [ zope_i18nmessageid zope_schema ]; diff --git a/pkgs/development/python-modules/zope_contenttype/default.nix b/pkgs/development/python-modules/zope_contenttype/default.nix index bb748eaec900..1e5ac40d1c30 100644 --- a/pkgs/development/python-modules/zope_contenttype/default.nix +++ b/pkgs/development/python-modules/zope_contenttype/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-NnVoeLxSWzY2TQ1b2ZovCw/TuaUND+m73Eqxs4rCOAA="; }; - checkInputs = [ zope_testrunner ]; + nativeCheckInputs = [ zope_testrunner ]; meta = with lib; { homepage = "https://github.com/zopefoundation/zope.contenttype"; diff --git a/pkgs/development/python-modules/zope_copy/default.nix b/pkgs/development/python-modules/zope_copy/default.nix index be4cdca72b65..88d26cee5a5b 100644 --- a/pkgs/development/python-modules/zope_copy/default.nix +++ b/pkgs/development/python-modules/zope_copy/default.nix @@ -11,17 +11,17 @@ buildPythonPackage rec { pname = "zope.copy"; - version = "4.2"; + version = "4.3"; src = fetchPypi { inherit pname version; - sha256 = "47bb9d09ff06c600b446f220f47a742396598ac4828d738d3d85e6490629a71a"; + sha256 = "sha256-epg2yjqX9m1WGzYPeGUBKGif4JNAddzg75ECe9xPOlc="; }; propagatedBuildInputs = [ zope_interface ]; doCheck = !isPy27; # namespace conflicts - checkInputs = [ unittestCheckHook zope_location zope_schema ]; + nativeCheckInputs = [ unittestCheckHook zope_location zope_schema ]; unittestFlagsArray = [ "-s" "src/zope/copy" ]; diff --git a/pkgs/development/python-modules/zope_event/default.nix b/pkgs/development/python-modules/zope_event/default.nix index 118a3a2c44a3..fddf45ef0631 100644 --- a/pkgs/development/python-modules/zope_event/default.nix +++ b/pkgs/development/python-modules/zope_event/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "zope.event"; - version = "4.5.0"; + version = "4.6"; src = fetchPypi { inherit pname version; - sha256 = "5e76517f5b9b119acf37ca8819781db6c16ea433f7e2062c4afc2b6fbedb1330"; + sha256 = "sha256-gdmIEwRvyGzEE242mP7mKKMoL5wyDbGGWMIXSSNfzoA="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix index fb1eb07154a0..16da25903ea1 100644 --- a/pkgs/development/python-modules/zope_exceptions/default.nix +++ b/pkgs/development/python-modules/zope_exceptions/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.exceptions"; - version = "4.5"; + version = "4.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TjW7oEiJxdEU3KpVKXQl1fM/YYqF7323Ehs7dxEAeE4="; + sha256 = "sha256-YZ0kpMZb7Zez3QUV5zLoK2nxVdQsyUlV0b6MKCiGg80="; }; propagatedBuildInputs = [ zope_interface ]; diff --git a/pkgs/development/python-modules/zope_filerepresentation/default.nix b/pkgs/development/python-modules/zope_filerepresentation/default.nix index 4792a09e26b2..6539143a007a 100644 --- a/pkgs/development/python-modules/zope_filerepresentation/default.nix +++ b/pkgs/development/python-modules/zope_filerepresentation/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "zope.filerepresentation"; - version = "5.0.0"; + version = "6.0"; src = fetchPypi { inherit pname version; - sha256 = "1mp2r80v6ns92j089l7ngh8l9fk95g2661vkp4vqw7c71irs9g1z"; + sha256 = "sha256-yza3iGspJ2+C8WhfPykfQjXmac2HhdFHQtRl0Trvaqs="; }; propagatedBuildInputs = [ zope_interface zope_schema ]; diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/pkgs/development/python-modules/zope_i18nmessageid/default.nix index 1155adc83e9e..856b51d06713 100644 --- a/pkgs/development/python-modules/zope_i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope_i18nmessageid/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "zope.i18nmessageid"; - version = "5.0.1"; + version = "5.1.1"; src = fetchPypi { inherit pname version; - sha256 = "9534142b684c986f5303f469573978e5a340f05ba2eee4f872933f1c38b1b059"; + sha256 = "sha256-R7djR7gOCytmxIbuZvP4bFdJOiB1uFqfuAJpD6cwvZI="; }; propagatedBuildInputs = [ six ]; - checkInputs = [ coverage zope_testrunner ]; + nativeCheckInputs = [ coverage zope_testrunner ]; meta = with lib; { homepage = "https://github.com/zopefoundation/zope.i18nmessageid"; diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index c1f61a4cbee5..eea485ab2a58 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.interface"; - version = "5.4.0"; + version = "5.5.2"; src = fetchPypi { inherit pname version; - sha256 = "5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e"; + sha256 = "sha256-v+4fP/YhQ4GUmeNI9bin86oCWfmspeDdrnOR0Fnc5nE="; }; propagatedBuildInputs = [ zope_event ]; diff --git a/pkgs/development/python-modules/zope_location/default.nix b/pkgs/development/python-modules/zope_location/default.nix index 69fee2e338ff..f4fe420951dd 100644 --- a/pkgs/development/python-modules/zope_location/default.nix +++ b/pkgs/development/python-modules/zope_location/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.location"; - version = "4.2"; + version = "4.3"; src = fetchPypi { inherit pname version; - sha256 = "a720f9e3c8a51d5007ed6fcd47e1834df02671d85dbfd1062a0d808de8bf80ac"; + sha256 = "sha256-Fx7tyKIOw6isJxOaqQzyd/93dy6gMrVLaicBp5J7OsU="; }; propagatedBuildInputs = [ zope_proxy ]; diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix index 70e329cce9e9..24210e8c73cc 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.proxy"; - version = "4.5.0"; + version = "4.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1329846261cf6c552b05579f3cfad199b2d178510d0b4703eb5f7cdd6ebad01a"; + sha256 = "sha256-+xUTt6jtc3oxI/1XHCRPB+7iRdYIGlY3CyBhHUAPCXQ="; }; propagatedBuildInputs = [ zope_interface ]; diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix index 9472000f15d1..4dd97d94e43b 100644 --- a/pkgs/development/python-modules/zope_schema/default.nix +++ b/pkgs/development/python-modules/zope_schema/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "zope.schema"; - version = "6.2.0"; + version = "6.2.1"; src = fetchPypi { inherit pname version; - sha256 = "2201aef8ad75ee5a881284d7a6acd384661d6dca7bde5e80a22839a77124595b"; + sha256 = "sha256-47M8i8i6nYWlZxOrjwo8JhXVSoCF8eQVzgyN+15UC+Y="; }; propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ]; diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/pkgs/development/python-modules/zope_testing/default.nix index f8ea4e83b15c..773209adcdf4 100644 --- a/pkgs/development/python-modules/zope_testing/default.nix +++ b/pkgs/development/python-modules/zope_testing/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "zope.testing"; - version = "4.10"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-O25ZBsrd0UjCP+lY5qrj+tyKCKilP3R9l5HC2BNe5W4="; + sha256 = "sha256-6HzQ2NZmVzza8TOBare5vuyAGmSoZZXBnLX+mS7z1kk="; }; doCheck = !isPyPy; diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index 1b838354c4cf..a1f85a9d0f36 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zope.testrunner"; - version = "5.5.1"; + version = "5.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ahDTg1RZ7tO8hDHyGq9gS8dU/4OSopeXzSDlqUHBQ74="; + sha256 = "sha256-1r1y9E6jLKpBW5bP4UFSsnhjF67xzW9IqCe2Le8Fj9Q="; }; propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix index dc2b14bdc62b..97625a3e3c1c 100644 --- a/pkgs/development/python-modules/zopfli/default.nix +++ b/pkgs/development/python-modules/zopfli/default.nix @@ -2,22 +2,24 @@ buildPythonPackage rec { pname = "zopfli"; - version = "0.2.1"; + version = "0.2.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1ipjkcgdbplsrhr31ypk48px8cax4cm9gcjj7yrcrhg20ql3s9p5"; + sha256 = "1z1akqx3fjnwa75insch9p08hafikqdvqkj6mxv1k6fr81sxnj9d"; extension = "zip"; }; + format = "pyproject"; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ zopfli ]; USE_SYSTEM_ZOPFLI = "True"; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "cPython bindings for zopfli"; diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index bbcc6d67c8c9..580ab130d83f 100755 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { cffi ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis ]; diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index db33c7f36772..eb98ae6f78c8 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { VERSION = zstd.version; PKG_VERSION = version; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/zulip/default.nix b/pkgs/development/python-modules/zulip/default.nix index fc0a49687e34..fe889522e5f7 100644 --- a/pkgs/development/python-modules/zulip/default.nix +++ b/pkgs/development/python-modules/zulip/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 dcbeca33f827..3a759b15815e 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.43.0"; + version = "0.44.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qzAM3vcVySJB6OfOHKXYYXDR+xOSbGpyH7b9TaYkOLM="; + hash = "sha256-AG8LXdQvutlgeg7543bDx8Znidf67CzusnnD6GOakf4="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/zwave-me-ws/default.nix b/pkgs/development/python-modules/zwave-me-ws/default.nix index 8702d8edc2f1..f478bf1788a5 100644 --- a/pkgs/development/python-modules/zwave-me-ws/default.nix +++ b/pkgs/development/python-modules/zwave-me-ws/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zwave-me-ws"; - version = "0.3.0"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Z-Wave-Me"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-M/+ij6Xjx3irZRAFlHBF+0JHaVpY+kG2i5OISneVjws="; + hash = "sha256-DfQh9wuYx/gCyW3ONk8wwDOgbp8Pifx3nwDgS5NZFhI="; }; nativeBuildInputs = [ @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to connect to a ZWave-Me instance"; homepage = "https://github.com/Z-Wave-Me/zwave-me-ws"; + changelog = "https://github.com/Z-Wave-Me/zwave-me-ws/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/zxcvbn/default.nix b/pkgs/development/python-modules/zxcvbn/default.nix index 67f48f34731d..e9a8f32700c6 100644 --- a/pkgs/development/python-modules/zxcvbn/default.nix +++ b/pkgs/development/python-modules/zxcvbn/default.nix @@ -1,22 +1,24 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "zxcvbn"; version = "4.4.28"; + format = "setuptools"; # no tests included in PyPI tarball src = fetchFromGitHub { owner = "dwolfhub"; repo = "zxcvbn-python"; - rev = "45afdf0d3dd8477bc7e457629bb4bc9680794cd7"; # not tagged in repository - sha256 = "0w0sx9ssjks8da973cdv5xi87yjsf038jqxmzj2y26xvpyjsg2v2"; + rev = "refs/tags/v${version}"; + hash = "sha256-etcST7pxlpOH5Q9KtOPGf1vmnkyjEp6Cd5QCmBjW9Hc="; }; - checkInputs = [ pytest ]; - - checkPhase = '' - pytest - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Python implementation of Dropbox's realistic password strength estimator"; diff --git a/pkgs/development/python-modules/zxing_cpp/default.nix b/pkgs/development/python-modules/zxing_cpp/default.nix new file mode 100644 index 000000000000..9c43844888c9 --- /dev/null +++ b/pkgs/development/python-modules/zxing_cpp/default.nix @@ -0,0 +1,49 @@ +{ buildPythonPackage +, lib +, cmake +, pybind11 +, zxing-cpp +, numpy +, pillow +}: + +buildPythonPackage rec { + pname = "zxing_cpp"; + inherit (zxing-cpp) src version; + + sourceRoot = "source/wrappers/python"; + patches = [ + ./use-nixpkgs-pybind11.patch + ]; + dontUseCmakeConfigure = true; + + propagatedBuildInputs = [ + pybind11 + numpy + ]; + + nativeBuildInputs = [ + cmake + ]; + + nativeCheckInputs = [ + pillow + ]; + + meta = with lib; { + homepage = "https://github.com/zxing-cpp/zxing-cpp"; + description = "Python bindings for C++ port of zxing (a Java barcode image processing library)"; + longDescription = '' + ZXing-C++ ("zebra crossing") is an open-source, multi-format 1D/2D barcode + image processing library implemented in C++. + + It was originally ported from the Java ZXing Library but has been + developed further and now includes many improvements in terms of quality + and performance. It can both read and write barcodes in a number of + formats. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ lukegb ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/python-modules/zxing_cpp/use-nixpkgs-pybind11.patch b/pkgs/development/python-modules/zxing_cpp/use-nixpkgs-pybind11.patch new file mode 100644 index 000000000000..4a4960f13d6d --- /dev/null +++ b/pkgs/development/python-modules/zxing_cpp/use-nixpkgs-pybind11.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eadfc045..b6f273a6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,8 +20,7 @@ if (NOT hasParent) + # In development mode, when the whole zxing-cpp directory is checked out, build against head code. + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../core ZXing EXCLUDE_FROM_ALL) + +- include(${CMAKE_CURRENT_SOURCE_DIR}/../../zxing.cmake) +- zxing_add_package(pybind11 pybind11 ${pybind11_git_repo} ${pybind11_git_rev}) ++ find_package(pybind11 CONFIG) + else() + # we don't have access to the top-level cmake helpers -> simply fetch it unconditional + include(FetchContent) diff --git a/pkgs/development/python2-modules/Pygments/default.nix b/pkgs/development/python2-modules/Pygments/default.nix deleted file mode 100644 index aa59c370d2e7..000000000000 --- a/pkgs/development/python2-modules/Pygments/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, fetchpatch -, docutils -}: - -buildPythonPackage rec { - pname = "Pygments"; - version = "2.5.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe"; - }; - - patches = [ - (fetchpatch { - name = "CVE-2021-27291.patch"; - url = "https://github.com/pygments/pygments/commit/2e7e8c4a7b318f4032493773732754e418279a14.patch"; - sha256 = "0ap7jgkmvkkzijabsgnfrwl376cjsxa4jmzvqysrkwpjq3q4rxpa"; - excludes = ["CHANGES"]; - }) - ]; - - propagatedBuildInputs = [ docutils ]; - - # Circular dependency with sphinx - doCheck = false; - - meta = { - homepage = "https://pygments.org/"; - description = "A generic syntax highlighter"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ ]; - }; -} diff --git a/pkgs/development/python2-modules/TurboCheetah/default.nix b/pkgs/development/python2-modules/TurboCheetah/default.nix deleted file mode 100644 index 717b2b5f2780..000000000000 --- a/pkgs/development/python2-modules/TurboCheetah/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, cheetah -, nose -}: - -buildPythonPackage rec { - pname = "TurboCheetah"; - version = "1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "9e4c7ecb0d061bfb58281363ee1b09337083f013a8b4d0355326a5d8668f450c"; - }; - - propagatedBuildInputs = [ cheetah ]; - - checkInputs = [ nose ]; - - meta = { - description = "TurboGears plugin to support use of Cheetah templates"; - homepage = "http://docs.turbogears.org/TurboCheetah"; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/boto3/default.nix b/pkgs/development/python2-modules/boto3/default.nix deleted file mode 100644 index c8b8210f6503..000000000000 --- a/pkgs/development/python2-modules/boto3/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, botocore -, jmespath -, s3transfer -, futures ? null -, docutils -, nose -, mock -, isPy3k -}: - -buildPythonPackage rec { - pname = "boto3"; - version = "1.17.97"; # N.B: if you change this, change botocore and awscli to a matching version - - src = fetchPypi { - inherit pname version; - sha256 = "0ab5afc51461c30f27aebef944211d16f47697b98ff8d2e2f6e49e59584853bb"; - }; - - propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; - checkInputs = [ docutils nose mock ]; - - checkPhase = '' - runHook preCheck - # This method is not in mock. It might have appeared in some versions. - sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \ - tests/unit/resources/test_factory.py - nosetests -d tests/unit --verbose - runHook postCheck - ''; - - # Network access - doCheck = false; - - pythonImportsCheck = [ "boto3" ]; - - meta = { - homepage = "https://github.com/boto/boto3"; - license = lib.licenses.asl20; - description = "AWS SDK for Python"; - longDescription = '' - Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for - Python, which allows Python developers to write software that makes use of - services like Amazon S3 and Amazon EC2. - ''; - }; -} diff --git a/pkgs/development/python2-modules/botocore/default.nix b/pkgs/development/python2-modules/botocore/default.nix deleted file mode 100644 index f23a10579c6e..000000000000 --- a/pkgs/development/python2-modules/botocore/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, python-dateutil -, jmespath -, docutils -, simplejson -, mock -, nose -, urllib3 -}: - -buildPythonPackage rec { - pname = "botocore"; - version = "1.20.97"; # N.B: if you change this, change boto3 and awscli to a matching version - - src = fetchPypi { - inherit pname version; - sha256 = "f7e119cf3e0f4a36100f0e983583afa91a84fb27c479a1716820aee4f2e190ab"; - }; - - propagatedBuildInputs = [ - python-dateutil - jmespath - docutils - simplejson - urllib3 - ]; - - checkInputs = [ mock nose ]; - - checkPhase = '' - nosetests -v - ''; - - # Network access - doCheck = false; - - pythonImportsCheck = [ "botocore" ]; - - meta = with lib; { - homepage = "https://github.com/boto/botocore"; - license = licenses.asl20; - description = "A low-level interface to a growing number of Amazon Web Services"; - }; -} diff --git a/pkgs/development/python2-modules/certifi/default.nix b/pkgs/development/python2-modules/certifi/default.nix deleted file mode 100644 index 529d5b1fb996..000000000000 --- a/pkgs/development/python2-modules/certifi/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, fetchPypi -, buildPythonPackage -, python3 -}: - -let - inherit (python3.pkgs) certifi; - -in buildPythonPackage rec { - pname = "certifi"; - version = "2019.11.28"; - - src = fetchPypi { - inherit pname version; - sha256 = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"; - }; - - postPatch = '' - cp ${certifi.src}/certifi/cacert.pem certifi/cacert.pem - ''; - - pythonImportsCheck = [ "certifi" ]; - - # no tests implemented - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/certifi/python-certifi"; - description = "Python package for providing Mozilla's CA Bundle"; - license = licenses.isc; - maintainers = with maintainers; [ ]; # NixOps team - }; -} diff --git a/pkgs/development/python2-modules/cffi/default.nix b/pkgs/development/python2-modules/cffi/default.nix new file mode 100644 index 000000000000..adeda6e90d22 --- /dev/null +++ b/pkgs/development/python2-modules/cffi/default.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, cffi }: + +if cffi == null then null else cffi.overridePythonAttrs { + disabledTests = lib.optionals stdenv.isDarwin [ + # cannot load library 'c' + "test_FILE" + "test_FILE_object" + "test_FILE_only_for_FILE_arg" + "test_load_and_call_function" + "test_load_library" + + # cannot load library 'dl' + "test_dlopen_handle" + + # cannot load library 'm' + "test_dir_on_dlopen_lib" + "test_dlclose" + "test_dlopen" + "test_dlopen_constant" + "test_dlopen_flags" + "test_function_typedef" + "test_line_continuation_in_defines" + "test_missing_function" + "test_remove_comments" + "test_remove_line_continuation_comments" + "test_simple" + "test_sin" + "test_sinf" + "test_stdcall_only_on_windows" + "test_wraps_from_stdlib" + + # MemoryError + "test_callback_as_function_argument" + "test_callback_crash" + "test_callback_decorator" + "test_callback_large_struct" + "test_callback_returning_void" + "test_cast_functionptr_and_int" + "test_function_pointer" + "test_functionptr_intptr_return" + "test_functionptr_simple" + "test_functionptr_void_return" + "test_functionptr_voidptr_return" + ]; +} diff --git a/pkgs/development/python2-modules/chardet/default.nix b/pkgs/development/python2-modules/chardet/default.nix deleted file mode 100644 index 5f6fe0a672a7..000000000000 --- a/pkgs/development/python2-modules/chardet/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch -, pytest, pytest-runner, hypothesis }: - -buildPythonPackage rec { - pname = "chardet"; - version = "3.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"; - }; - - patches = [ - # Add pytest 4 support. See: https://github.com/chardet/chardet/pull/174 - (fetchpatch { - url = "https://github.com/chardet/chardet/commit/0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4.patch"; - sha256 = "1y1xhjf32rdhq9sfz58pghwv794f3w2f2qcn8p6hp4pc8jsdrn2q"; - }) - ]; - - checkInputs = [ pytest pytest-runner hypothesis ]; - - meta = with lib; { - homepage = "https://github.com/chardet/chardet"; - description = "Universal encoding detector"; - license = licenses.lgpl2; - maintainers = with maintainers; [ domenkozar ]; - }; -} diff --git a/pkgs/development/python2-modules/cheetah/default.nix b/pkgs/development/python2-modules/cheetah/default.nix deleted file mode 100644 index 1cee46fa7252..000000000000 --- a/pkgs/development/python2-modules/cheetah/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, markdown -, isPy3k -, TurboCheetah -}: - -buildPythonPackage rec { - pname = "cheetah"; - version = "2.4.4"; - - disabled = isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550"; - }; - - propagatedBuildInputs = [ markdown ]; - - doCheck = false; # Circular dependency - - checkInputs = [ - TurboCheetah - ]; - - meta = { - homepage = "http://www.cheetahtemplate.org/"; - description = "A template engine and code generation tool"; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/construct/default.nix b/pkgs/development/python2-modules/construct/default.nix deleted file mode 100644 index 5bbbd1501453..000000000000 --- a/pkgs/development/python2-modules/construct/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub -, pytestCheckHook, pytest-benchmark, enum34, numpy, arrow, ruamel-yaml -}: - -buildPythonPackage rec { - pname = "construct"; - version = "2.10.54"; - - # no tests in PyPI tarball - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "1mqspsn6bf3ibvih1zna2glkg8iw7vy5zg9gzg0d1m8zcndk2c48"; - }; - - checkInputs = [ pytestCheckHook enum34 numpy ]; - - # these have dependencies that are broken on Python 2 - disabledTestPaths = [ - "tests/gallery/test_gallery.py" - "tests/test_benchmarks.py" - "tests/test_compiler.py" - ]; - - disabledTests = [ - "test_benchmarks" - "test_timestamp" - ] ++ lib.optionals stdenv.isDarwin [ - "test_multiprocessing" - ]; - - meta = with lib; { - description = "Powerful declarative parser (and builder) for binary data"; - homepage = "https://construct.readthedocs.org/"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python2-modules/contextlib2/default.nix b/pkgs/development/python2-modules/contextlib2/default.nix index 38d9fb696e28..063039448fea 100644 --- a/pkgs/development/python2-modules/contextlib2/default.nix +++ b/pkgs/development/python2-modules/contextlib2/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, unittest2 }: buildPythonPackage rec { @@ -13,7 +12,8 @@ buildPythonPackage rec { sha256 = "01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"; }; - checkInputs = [ unittest2 ]; + # requires unittest2, which has been removed + doCheck = false; meta = { description = "Backports and enhancements for the contextlib module"; diff --git a/pkgs/development/python2-modules/coverage/default.nix b/pkgs/development/python2-modules/coverage/default.nix index f93d32d392f7..94da2f4c7b43 100644 --- a/pkgs/development/python2-modules/coverage/default.nix +++ b/pkgs/development/python2-modules/coverage/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; meta = { description = "Code coverage measurement for python"; diff --git a/pkgs/development/python2-modules/google-apputils/default.nix b/pkgs/development/python2-modules/google-apputils/default.nix deleted file mode 100644 index 225adf348d1a..000000000000 --- a/pkgs/development/python2-modules/google-apputils/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isPy3k -, pytz -, gflags -, python-dateutil -, mox -, python -}: - -buildPythonPackage rec { - pname = "google-apputils"; - version = "0.4.2"; - disabled = isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "0afw0gxmh0yw5g7xsmw49gs8bbp0zyhbh6fr1b0h48f3a439v5a7"; - }; - - preConfigure = '' - sed -i '/ez_setup/d' setup.py - ''; - - propagatedBuildInputs = [ pytz gflags python-dateutil mox ]; - - checkPhase = '' - ${python.executable} setup.py google_test - ''; - - # ERROR:root:Trying to access flag test_tmpdir before flags were parsed. - doCheck = false; - - meta = with lib; { - description = "Google Application Utilities for Python"; - homepage = "https://github.com/google/google-apputils"; - license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/python2-modules/gtkme/default.nix b/pkgs/development/python2-modules/gtkme/default.nix deleted file mode 100644 index bc23854d95c8..000000000000 --- a/pkgs/development/python2-modules/gtkme/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ 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/httpretty/default.nix b/pkgs/development/python2-modules/httpretty/default.nix deleted file mode 100644 index 92ed5c6616e0..000000000000 --- a/pkgs/development/python2-modules/httpretty/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, tornado -, requests -, httplib2 -, sure -, nose -, nose-exclude -, coverage -, rednose -, nose-randomly -, six -, mock -}: - -buildPythonPackage rec { - pname = "httpretty"; - version = "0.9.7"; - - # drop this for version > 0.9.7 - # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394 - doCheck = lib.versionAtLeast version "0.9.8"; - - src = fetchPypi { - inherit pname version; - sha256 = "66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"; - }; - - propagatedBuildInputs = [ six ]; - - checkInputs = [ nose sure coverage mock rednose - # Following not declared in setup.py - nose-randomly requests tornado httplib2 nose-exclude - ]; - - __darwinAllowLocalNetworking = true; - - # Those flaky tests are failing intermittently on all platforms - NOSE_EXCLUDE = lib.concatStringsSep "," [ - "tests.functional.test_httplib2.test_callback_response" - "tests.functional.test_requests.test_streaming_responses" - "tests.functional.test_httplib2.test_callback_response" - "tests.functional.test_requests.test_httpretty_should_allow_adding_and_overwritting_by_kwargs_u2" - ]; - - meta = with lib; { - homepage = "https://httpretty.readthedocs.org/"; - description = "HTTP client request mocking tool"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/hypothesis/default.nix b/pkgs/development/python2-modules/hypothesis/default.nix index 47bc8860bc54..f1eb403d8109 100644 --- a/pkgs/development/python2-modules/hypothesis/default.nix +++ b/pkgs/development/python2-modules/hypothesis/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { sortedcontainers ] ++ lib.optional (!isPy3k) enum34; - checkInputs = [ pytest pytest-xdist flaky mock pexpect ]; + nativeCheckInputs = [ pytest pytest-xdist flaky mock pexpect ]; inherit doCheck; checkPhase = '' diff --git a/pkgs/development/python2-modules/idna/default.nix b/pkgs/development/python2-modules/idna/default.nix deleted file mode 100644 index 9a1c1dc271f1..000000000000 --- a/pkgs/development/python2-modules/idna/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "idna"; - version = "2.10"; - - src = fetchPypi { - inherit pname version; - sha256 = "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"; - }; - - checkInputs = [ pytestCheckHook ]; - - meta = { - homepage = "https://github.com/kjd/idna/"; - description = "Internationalized Domain Names in Applications (IDNA)"; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/development/python2-modules/jinja2/default.nix b/pkgs/development/python2-modules/jinja2/default.nix index 0be970d49946..3b593338763f 100644 --- a/pkgs/development/python2-modules/jinja2/default.nix +++ b/pkgs/development/python2-modules/jinja2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ markupsafe setuptools ]; # Multiple tests run out of stack space on 32bit systems with python2. diff --git a/pkgs/development/python2-modules/marisa/default.nix b/pkgs/development/python2-modules/marisa/default.nix deleted file mode 100644 index 93a4ccb959f7..000000000000 --- a/pkgs/development/python2-modules/marisa/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, marisa, swig -, isPy3k -}: - -buildPythonPackage rec { - pname = "marisa"; - version = "1.3.40"; - - disabled = isPy3k; - - src = fetchFromGitHub { - owner = "s-yata"; - repo = "marisa-trie"; - rev = "8dba9850b89d7828ebf33b8ab84df2b54d31260b"; - sha256 = "0pkp9fggk53lxlicfwrskgx33qplc4v6njbavlnz4x4z63zd4933"; - }; - - nativeBuildInputs = [ swig marisa ]; - buildInputs = [ marisa ]; - - sourceRoot = "${src.name}/bindings/python"; - - meta = with lib; { - description = "Python binding for marisa package (do not confuse with marisa-trie python bindings)"; - homepage = "https://github.com/s-yata/marisa-trie"; - license = with licenses; [ bsd2 lgpl2 ]; - maintainers = with maintainers; [ vanzef ]; - }; -} diff --git a/pkgs/development/python2-modules/markdown/default.nix b/pkgs/development/python2-modules/markdown/default.nix deleted file mode 100644 index 13ed2f1744a2..000000000000 --- a/pkgs/development/python2-modules/markdown/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools -, nose -, pyyaml -, pythonOlder -, importlib-metadata -}: - -buildPythonPackage rec { - pname = "Markdown"; - version = "3.1.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"; - }; - - propagatedBuildInputs = [ - setuptools - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - - checkInputs = [ nose pyyaml ]; - - meta = { - description = "A Python implementation of John Gruber's Markdown with Extension support"; - homepage = "https://github.com/Python-Markdown/markdown"; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/development/python2-modules/mock/default.nix b/pkgs/development/python2-modules/mock/default.nix index f30c407e6f5a..a343acfffaa1 100644 --- a/pkgs/development/python2-modules/mock/default.nix +++ b/pkgs/development/python2-modules/mock/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { #doCheck = !(python.isPyPy && python.isPy27); doCheck = false; # Infinite recursion pytest - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook pytest ]; diff --git a/pkgs/development/python2-modules/more-itertools/default.nix b/pkgs/development/python2-modules/more-itertools/default.nix index f9a6ac732e2e..615b1d00d204 100644 --- a/pkgs/development/python2-modules/more-itertools/default.nix +++ b/pkgs/development/python2-modules/more-itertools/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; propagatedBuildInputs = [ six ]; # iterable = range(10 ** 10) # Is efficiently reversible diff --git a/pkgs/development/python2-modules/mutagen/default.nix b/pkgs/development/python2-modules/mutagen/default.nix deleted file mode 100644 index 7f2e9f452b4d..000000000000 --- a/pkgs/development/python2-modules/mutagen/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, hypothesis -, pycodestyle -, pyflakes -, pytest -, setuptools -, pkgs -}: - -buildPythonPackage rec { - pname = "mutagen"; - version = "1.43.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "d873baeb7815311d3420aab0a1d83f050f628228cbc2d6045a14a16460411bc9"; - }; - - propagatedBuildInputs = [ setuptools ]; - checkInputs = [ - pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz - pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis - ]; - LC_ALL = "en_US.UTF-8"; - - meta = with lib; { - description = "Python multimedia tagging library"; - homepage = "https://mutagen.readthedocs.io"; - license = licenses.lgpl2Plus; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/python2-modules/numpy/default.nix b/pkgs/development/python2-modules/numpy/default.nix deleted file mode 100644 index 0bb01ef6812a..000000000000 --- a/pkgs/development/python2-modules/numpy/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ lib -, fetchPypi -, python -, buildPythonPackage -, gfortran -, pytest -, blas -, lapack -, writeTextFile -, isPyPy -, cython -, setuptools - }: - -assert (!blas.isILP64) && (!lapack.isILP64); - -let - cfg = writeTextFile { - name = "site.cfg"; - text = (lib.generators.toINI {} { - ${blas.implementation} = { - include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include"; - library_dirs = "${blas}/lib:${lapack}/lib"; - runtime_library_dirs = "${blas}/lib:${lapack}/lib"; - libraries = "lapack,lapacke,blas,cblas"; - }; - lapack = { - include_dirs = "${lib.getDev lapack}/include"; - library_dirs = "${lapack}/lib"; - runtime_library_dirs = "${lapack}/lib"; - }; - blas = { - include_dirs = "${lib.getDev blas}/include"; - library_dirs = "${blas}/lib"; - runtime_library_dirs = "${blas}/lib"; - }; - }); - }; -in buildPythonPackage rec { - pname = "numpy"; - version = "1.16.6"; - format = "pyproject"; - - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "e5cf3fdf13401885e8eea8170624ec96225e2174eb0c611c6f26dd33b489e3ff"; - }; - - nativeBuildInputs = [ gfortran pytest cython setuptools ]; - buildInputs = [ blas lapack ]; - - patches = lib.optionals python.hasDistutilsCxxPatch [ - # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 - # Patching of numpy.distutils is needed to prevent it from undoing the - # patch to distutils. - ./numpy-distutils-C++.patch - ]; - - preConfigure = '' - sed -i 's/-faltivec//' numpy/distutils/system_info.py - export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES - export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES)) - ''; - - preBuild = '' - ln -s ${cfg} site.cfg - ''; - - enableParallelBuilding = true; - - doCheck = !isPyPy; # numpy 1.16+ hits a bug in pypy's ctypes, using either numpy or pypy HEAD fixes this (https://github.com/numpy/numpy/issues/13807) - - checkPhase = '' - runHook preCheck - pushd "$out" - ${python.interpreter} -c 'import numpy; numpy.test("fast", verbose=10)' - popd - runHook postCheck - ''; - - passthru = { - # just for backwards compatibility - blas = blas.provider; - blasImplementation = blas.implementation; - inherit cfg; - }; - - # Disable test - # - test_large_file_support: takes a long time and can cause the machine to run out of disk space - NOSE_EXCLUDE="test_large_file_support"; - - meta = { - description = "Scientific tools for Python"; - homepage = "https://numpy.org/"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; - }; -} diff --git a/pkgs/development/python2-modules/numpy/numpy-distutils-C++.patch b/pkgs/development/python2-modules/numpy/numpy-distutils-C++.patch deleted file mode 100644 index b2626ea26e5b..000000000000 --- a/pkgs/development/python2-modules/numpy/numpy-distutils-C++.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py ---- a/numpy/distutils/unixccompiler.py -+++ b/numpy/distutils/unixccompiler.py -@@ -44,8 +44,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts - if opt not in llink_s: - self.linker_so = llink_s.split() + opt.split() - -- display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src) -- - # gcc style automatic dependencies, outputs a makefile (-MF) that lists - # all headers needed by a c file as a side effect of compilation (-MMD) - if getattr(self, '_auto_depends', False): -@@ -54,8 +52,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts - deps = [] - - try: -- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + -- extra_postargs, display = display) -+ if self.detect_language(src) == 'c++': -+ display = '%s: %s' % (os.path.basename(self.compiler_so_cxx[0]), src) -+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + deps + -+ extra_postargs, display = display) -+ else: -+ display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src) -+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + -+ extra_postargs, display = display) -+ - except DistutilsExecError: - msg = str(get_exception()) - raise CompileError(msg) diff --git a/pkgs/development/python2-modules/packaging/default.nix b/pkgs/development/python2-modules/packaging/default.nix index 0f9e61859a16..61f0ed3a7303 100644 --- a/pkgs/development/python2-modules/packaging/default.nix +++ b/pkgs/development/python2-modules/packaging/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyparsing six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pretend ]; diff --git a/pkgs/development/python2-modules/pillow/default.nix b/pkgs/development/python2-modules/pillow/default.nix deleted file mode 100644 index 61242c894a89..000000000000 --- a/pkgs/development/python2-modules/pillow/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k -, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 -, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook -}@args: - -import ./generic.nix (rec { - pname = "Pillow"; - version = "6.2.2"; - - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "0l5rv8jkdrb5q846v60v03mcq64yrhklidjkgwv6s1pda71g17yv"; - }; - - meta = with lib; { - homepage = "https://python-pillow.org/"; - description = "The friendly PIL fork (Python Imaging Library)"; - longDescription = '' - The Python Imaging Library (PIL) adds image processing - capabilities to your Python interpreter. This library - supports many file formats, and provides powerful image - processing and graphics capabilities. - ''; - license = "http://www.pythonware.com/products/pil/license.htm"; - maintainers = with maintainers; [ goibhniu prikhi SuperSandro2000 ]; - knownVulnerabilities = [ - "CVE-2020-10177" - "CVE-2020-10378" - "CVE-2020-10379" - "CVE-2020-10994" - "CVE-2020-11538" - "CVE-2020-35653" - "CVE-2020-35654" - "CVE-2020-35655" - "CVE-2021-25289" - "CVE-2021-25290" - "CVE-2021-25291" - "CVE-2021-25292" - "CVE-2021-25293" - "CVE-2021-27921" - "CVE-2021-27922" - "CVE-2021-27923" - ]; - }; -} // args ) diff --git a/pkgs/development/python2-modules/pillow/generic.nix b/pkgs/development/python2-modules/pillow/generic.nix deleted file mode 100644 index 3e33f1a8aa0f..000000000000 --- a/pkgs/development/python2-modules/pillow/generic.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ pname -, version -, disabled -, src -, meta -, ... -}@args: - -with args; - -buildPythonPackage rec { - inherit pname version src meta; - - # Disable imagefont tests, because they don't work well with infinality: - # https://github.com/python-pillow/Pillow/issues/1259 - postPatch = '' - rm Tests/test_imagefont.py - ''; - - # Disable darwin tests which require executables: `iconutil` and `screencapture` - disabledTests = lib.optionals stdenv.isDarwin [ - "test_grab" - "test_grabclipboard" - "test_save" - - # pillow-simd - "test_roundtrip" - "test_basic" - ] ++ lib.optionals (lib.versions.major version == "6") [ - # RuntimeError: Error setting from dictionary - "test_custom_metadata" - ]; - - propagatedBuildInputs = [ olefile ] - ++ lib.optionals (lib.versionAtLeast version "8.2.0") [ defusedxml ]; - - checkInputs = [ pytestCheckHook pyroma numpy ]; - - buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] - ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ] - ++ lib.optionals (isPyPy) [ tk libX11 ]; - - # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. - # NOTE: The Pillow install script will, by default, add paths like /usr/lib - # and /usr/include to the search paths. This can break things when building - # on a non-NixOS system that has some libraries installed that are not - # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't - # build Pillow with this support). We patch the `disable_platform_guessing` - # setting here, instead of passing the `--disable-platform-guessing` - # command-line option, since the command-line option doesn't work when we run - # tests. - preConfigure = let - libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; - libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; - in '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; - s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; - s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; - s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; - s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; - s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' - export LDFLAGS="$LDFLAGS -L${libwebp}/lib" - export CFLAGS="$CFLAGS -I${libwebp}/include" - '' + lib.optionalString (lib.versionAtLeast version "7.1.0") '' - export LDFLAGS="$LDFLAGS -L${libxcb}/lib" - export CFLAGS="$CFLAGS -I${libxcb.dev}/include" - '' + lib.optionalString stdenv.isDarwin '' - # Remove impurities - substituteInPlace setup.py \ - --replace '"/Library/Frameworks",' "" \ - --replace '"/System/Library/Frameworks"' "" - ''; -} diff --git a/pkgs/development/python2-modules/pip/default.nix b/pkgs/development/python2-modules/pip/default.nix index e3666d6a7961..ba78377f5943 100644 --- a/pkgs/development/python2-modules/pip/default.nix +++ b/pkgs/development/python2-modules/pip/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { # to force it a little. pipInstallFlags = [ "--ignore-installed" ]; - checkInputs = [ mock scripttest virtualenv pretend pytest ]; + nativeCheckInputs = [ mock scripttest virtualenv pretend pytest ]; # Pip wants pytest, but tests are not distributed doCheck = false; diff --git a/pkgs/development/python2-modules/prettytable/default.nix b/pkgs/development/python2-modules/prettytable/default.nix deleted file mode 100644 index 8191e9b5f579..000000000000 --- a/pkgs/development/python2-modules/prettytable/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, glibcLocales -, setuptools-scm -, wcwidth -}: - -buildPythonPackage rec { - pname = "prettytable"; - version = "1.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "0wcpp1nkicrswb353yn6xd2x535cpif62nw5rgz33c1wj0wzbdvb"; - }; - - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ glibcLocales ]; - - propagatedBuildInputs = [ wcwidth ]; - - preCheck = '' - export LANG="en_US.UTF-8" - ''; - - # no test no longer available in pypi package - doCheck = false; - pythonImportsCheck = [ "prettytable" ]; - - meta = with lib; { - description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; - homepage = "http://code.google.com/p/prettytable/"; - license = licenses.bsd3; - }; - -} diff --git a/pkgs/development/python2-modules/protobuf/default.nix b/pkgs/development/python2-modules/protobuf/default.nix deleted file mode 100644 index 30e9fbf9ea75..000000000000 --- a/pkgs/development/python2-modules/protobuf/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ buildPackages -, lib -, fetchpatch -, python -, buildPythonPackage -, isPy37 -, protobuf -, google-apputils ? null -, six -, pyext -, isPy27 -, disabled -, doCheck ? true -}: - -buildPythonPackage { - inherit (protobuf) pname src version; - inherit disabled; - doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2 - - propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ google-apputils ]; - propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc. - nativeBuildInputs = [ pyext ] ++ lib.optionals isPy27 [ google-apputils ]; - buildInputs = [ protobuf ]; - - patches = lib.optional (isPy37 && (lib.versionOlder protobuf.version "3.6.1.2")) - # Python 3.7 compatibility (not needed for protobuf >= 3.6.1.2) - (fetchpatch { - url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch"; - sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1"; - stripLen = 1; - }) - ; - - prePatch = '' - while [ ! -d python ]; do - cd * - done - cd python - ''; - - setupPyGlobalFlags = lib.optional (lib.versionAtLeast protobuf.version "2.6.0") - "--cpp_implementation"; - - pythonImportsCheck = [ - "google.protobuf" - ] ++ lib.optionals (lib.versionAtLeast protobuf.version "2.6.0") [ - "google.protobuf.internal._api_implementation" # Verify that --cpp_implementation worked - ]; - - meta = with lib; { - description = "Protocol Buffers are Google's data interchange format"; - homepage = "https://developers.google.com/protocol-buffers/"; - license = licenses.bsd3; - maintainers = with maintainers; [ knedlsepp ]; - }; - - passthru.protobuf = protobuf; -} diff --git a/pkgs/development/python2-modules/pygobject/default.nix b/pkgs/development/python2-modules/pygobject/default.nix index ce9410eaf8b5..2a09002976b2 100644 --- a/pkgs/development/python2-modules/pygobject/default.nix +++ b/pkgs/development/python2-modules/pygobject/default.nix @@ -1,33 +1,48 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection, -pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome }: +{ lib, stdenv, fetchurl, fetchpatch, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }: buildPythonPackage rec { pname = "pygobject"; - version = "3.36.1"; - + version = "2.28.7"; format = "other"; + disabled = pythonAtLeast "3.9"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0b9CgC0c7BE7Wtqg579/N0W0RSHcIWNYjSdtXNYdcY8="; + url = "mirror://gnome/sources/pygobject/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0nkam61rsn7y3wik3vw46wk5q2cjfh2iph57hl9m39rc8jijb7dv"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "devdoc" ]; - mesonFlags = [ - "-Dpython=python${if isPy3k then "3" else "2" }" + patches = lib.optionals stdenv.isDarwin [ + ./pygobject-2.0-fix-darwin.patch + (fetchpatch { + url = "https://github.com/macports/macports-ports/raw/f2975d5bbbc2459c661905c5a850cc661fa32f55/python/py-gobject/files/py-gobject-dynamic_lookup-11.patch"; + sha256 = "sha256-mtlyu+La3+iC5iQAmVJzDA5E35XGaRQy/EKXzvrWRCg="; + extraPrefix = ""; + }) ]; - nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ]; - buildInputs = [ glib gobject-introspection ] - ++ lib.optionals stdenv.isDarwin [ which ncurses ]; - propagatedBuildInputs = [ pycairo cairo ]; + configureFlags = [ "--disable-introspection" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ glib ]; + + # in a "normal" setup, pygobject and pygtk are installed into the + # same site-packages: we need a pth file for both. pygtk.py would be + # used to select a specific version, in our setup it should have no + # effect, but we leave it in case somebody expects and calls it. + postInstall = lib.optionalString (!isPy3k) '' + mv $out/${python.sitePackages}/{pygtk.pth,${pname}-${version}.pth} + + # Prevent wrapping of codegen files as these are meant to be + # executed by the python program + chmod a-x $out/share/pygobject/*/codegen/*.py + ''; meta = with lib; { homepage = "https://pygobject.readthedocs.io/"; - description = "Python bindings for Glib"; + description = "Python bindings for GLib"; license = licenses.gpl2; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch b/pkgs/development/python2-modules/pygobject/pygobject-2.0-fix-darwin.patch similarity index 100% rename from pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch rename to pkgs/development/python2-modules/pygobject/pygobject-2.0-fix-darwin.patch diff --git a/pkgs/development/python2-modules/pyparsing/default.nix b/pkgs/development/python2-modules/pyparsing/default.nix index d51032a154af..5b61dc0c85b5 100644 --- a/pkgs/development/python2-modules/pyparsing/default.nix +++ b/pkgs/development/python2-modules/pyparsing/default.nix @@ -22,7 +22,7 @@ let # circular dependencies if enabled by default doCheck = false; - checkInputs = [ + nativeCheckInputs = [ jinja2 railroad-diagrams ]; diff --git a/pkgs/development/python2-modules/pyroma/default.nix b/pkgs/development/python2-modules/pyroma/default.nix deleted file mode 100644 index 9fee5ec56c0e..000000000000 --- a/pkgs/development/python2-modules/pyroma/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, docutils, pygments, setuptools -}: - -buildPythonPackage rec { - pname = "pyroma"; - version = "2.6.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "2527423e3a24ccd56951f3ce1b0ebbcc4fa0518c82fca882e696c78726ab9c2f"; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "pygments < 2.6" "pygments" - ''; - - propagatedBuildInputs = [ docutils pygments setuptools ]; - - meta = with lib; { - description = "Test your project's packaging friendliness"; - homepage = "https://github.com/regebro/pyroma"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/pysqlite/default.nix b/pkgs/development/python2-modules/pysqlite/default.nix deleted file mode 100644 index 09cc312223ad..000000000000 --- a/pkgs/development/python2-modules/pysqlite/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv -, buildPythonPackage -, fetchPypi -, isPy3k -, pkgs -}: - -buildPythonPackage rec { - pname = "pysqlite"; - version = "2.8.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "17d3335863e8cf8392eea71add33dab3f96d060666fe68ab7382469d307f4490"; - }; - - # Need to use the builtin sqlite3 on Python 3 - disabled = isPy3k; - - # Since the `.egg' file is zipped, the `NEEDED' of the `.so' files - # it contains is not taken into account. Thus, we must explicitly make - # it a propagated input. - propagatedBuildInputs = [ pkgs.sqlite ]; - - patchPhase = '' - substituteInPlace "setup.cfg" \ - --replace "/usr/local/include" "${pkgs.sqlite.dev}/include" \ - --replace "/usr/local/lib" "${pkgs.sqlite.out}/lib" - ${lib.optionalString (!stdenv.isDarwin) ''export LDSHARED="$CC -pthread -shared"''} - ''; - - meta = with lib; { - homepage = "https://pysqlite.org/"; - description = "Python bindings for the SQLite embedded relational database engine"; - longDescription = '' - pysqlite is a DB-API 2.0-compliant database interface for SQLite. - - SQLite is a relational database management system contained in - a relatively small C library. It is a public domain project - created by D. Richard Hipp. Unlike the usual client-server - paradigm, the SQLite engine is not a standalone process with - which the program communicates, but is linked in and thus - becomes an integral part of the program. The library - implements most of SQL-92 standard, including transactions, - triggers and most of complex queries. - - pysqlite makes this powerful embedded SQL engine available to - Python programmers. It stays compatible with the Python - database API specification 2.0 as much as possible, but also - exposes most of SQLite's native API, so that it is for example - possible to create user-defined SQL functions and aggregates - in Python. - ''; - license = licenses.bsd3; - }; - -} diff --git a/pkgs/development/python2-modules/pytest-runner/default.nix b/pkgs/development/python2-modules/pytest-runner/default.nix deleted file mode 100644 index bea83146c37d..000000000000 --- a/pkgs/development/python2-modules/pytest-runner/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }: - -buildPythonPackage rec { - pname = "pytest-runner"; - version = "5.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "96c7e73ead7b93e388c5d614770d2bae6526efd997757d3543fe17b557a0942b"; - }; - - nativeBuildInputs = [ setuptools-scm pytest ]; - - postPatch = '' - rm pytest.ini - ''; - - checkPhase = '' - py.test tests - ''; - - # Fixture not found - doCheck = false; - - meta = with lib; { - description = "Invoke py.test as distutils command with dependency resolution"; - homepage = "https://github.com/pytest-dev/pytest-runner"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/pytest-xdist/default.nix b/pkgs/development/python2-modules/pytest-xdist/default.nix index 466d86f50f78..5da424a0c302 100644 --- a/pkgs/development/python2-modules/pytest-xdist/default.nix +++ b/pkgs/development/python2-modules/pytest-xdist/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools-scm pytest ]; - checkInputs = [ pytest filelock ]; + nativeCheckInputs = [ pytest filelock ]; propagatedBuildInputs = [ execnet pytest-forked psutil six ]; # Encountered a memory leak diff --git a/pkgs/development/python2-modules/pytest/default.nix b/pkgs/development/python2-modules/pytest/default.nix index 0a0ae571ba01..0edfd3039112 100644 --- a/pkgs/development/python2-modules/pytest/default.nix +++ b/pkgs/development/python2-modules/pytest/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0" ''; - checkInputs = [ hypothesis mock ]; + nativeCheckInputs = [ hypothesis mock ]; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] ++ lib.optionals (!isPy3k) [ funcsigs ] diff --git a/pkgs/development/python2-modules/pyyaml/default.nix b/pkgs/development/python2-modules/pyyaml/default.nix deleted file mode 100644 index 3edfae90e668..000000000000 --- a/pkgs/development/python2-modules/pyyaml/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, cython -, libyaml -, isPy27 -, python -}: - -buildPythonPackage rec { - pname = "PyYAML"; - version = "5.4.1.1"; - - src = fetchFromGitHub { - owner = "yaml"; - repo = "pyyaml"; - rev = version; - sha256 = "1v386gzdvsjg0mgix6v03rd0cgs9dl81qvn3m547849jm8r41dx8"; - }; - - nativeBuildInputs = [ cython ]; - - buildInputs = [ libyaml ]; - - checkPhase = '' - runHook preCheck - PYTHONPATH=""tests/lib":$PYTHONPATH" ${python.interpreter} -m test_all - runHook postCheck - ''; - - pythonImportsCheck = [ "yaml" ]; - - meta = with lib; { - description = "The next generation YAML parser and emitter for Python"; - homepage = "https://github.com/yaml/pyyaml"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/qpid-python/default.nix b/pkgs/development/python2-modules/qpid-python/default.nix deleted file mode 100644 index e22b3215e81f..000000000000 --- a/pkgs/development/python2-modules/qpid-python/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, buildPythonPackage -, fetchurl -, isPy3k -}: - -buildPythonPackage rec { - pname = "qpid-python"; - version = "0.32"; - disabled = isPy3k; - - src = fetchurl { - url = "http://www.us.apache.org/dist/qpid/${version}/${pname}-${version}.tar.gz"; - sha256 = "09hdfjgk8z4s3dr8ym2r6xn97j1f9mkb2743pr6zd0bnj01vhsv4"; - }; - - # needs a broker running and then ./qpid-python-test - doCheck = false; - - meta = with lib; { - homepage = "https://qpid.apache.org/"; - description = "Python client implementation and AMQP conformance tests for Apache Qpid"; - license = licenses.asl20; - }; - -} diff --git a/pkgs/development/python2-modules/s3transfer/default.nix b/pkgs/development/python2-modules/s3transfer/default.nix deleted file mode 100644 index 8cfd324f00a5..000000000000 --- a/pkgs/development/python2-modules/s3transfer/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, fetchPypi -, pythonOlder -, buildPythonPackage -, docutils -, mock -, nose -, coverage -, wheel -, unittest2 -, botocore -, futures ? null -}: - -buildPythonPackage rec { - pname = "s3transfer"; - version = "0.4.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI="; - }; - - propagatedBuildInputs = - [ - botocore - ] ++ lib.optional (pythonOlder "3") futures; - - buildInputs = [ - docutils - mock - nose - coverage - wheel - unittest2 - ]; - - checkPhase = '' - pushd s3transfer/tests - nosetests -v unit/ functional/ - popd - ''; - - # version on pypi has no tests/ dir - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/boto/s3transfer"; - license = licenses.asl20; - description = "A library for managing Amazon S3 transfers"; - }; -} diff --git a/pkgs/development/python2-modules/sphinx/default.nix b/pkgs/development/python2-modules/sphinx/default.nix deleted file mode 100644 index 80dec0531085..000000000000 --- a/pkgs/development/python2-modules/sphinx/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytest -, simplejson -, mock -, glibcLocales -, html5lib -, pythonOlder -, enum34 -, python -, docutils -, jinja2 -, pygments -, alabaster -, babel -, snowballstemmer -, six -, sqlalchemy -, whoosh -, imagesize -, requests -, typing -, sphinxcontrib-websupport -, setuptools -}: - -buildPythonPackage rec { - pname = "sphinx"; - version = "1.8.5"; - src = fetchPypi { - pname = "Sphinx"; - inherit version; - sha256 = "c7658aab75c920288a8cf6f09f244c6cfdae30d82d803ac1634d9f223a80ca08"; - }; - LC_ALL = "en_US.UTF-8"; - - checkInputs = [ pytest ]; - buildInputs = [ simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34; - # Disable two tests that require network access. - checkPhase = '' - cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored' - ''; - propagatedBuildInputs = [ - docutils - jinja2 - pygments - alabaster - babel - setuptools - snowballstemmer - six - sphinxcontrib-websupport - sqlalchemy - whoosh - imagesize - requests - ] ++ lib.optional (pythonOlder "3.5") typing; - - # Lots of tests. Needs network as well at some point. - doCheck = false; - - patches = [ - # Since pygments 2.5, PythonLexer refers to python3. If we want to use - # python2, we need to explicitly specify Python2Lexer. - # Not upstreamed since there doesn't seem to be any upstream maintenance - # branch for 1.8 (and this patch doesn't make any sense for 2.x). - ./python2-lexer.patch - ]; - # https://github.com/NixOS/nixpkgs/issues/22501 - # Do not run `python sphinx-build arguments` but `sphinx-build arguments`. - postPatch = '' - substituteInPlace sphinx/make_mode.py --replace "sys.executable, " "" - ''; - - meta = { - description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; - homepage = "http://sphinx.pocoo.org/"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ ]; - }; -} diff --git a/pkgs/development/python2-modules/sphinx/python2-lexer.patch b/pkgs/development/python2-modules/sphinx/python2-lexer.patch deleted file mode 100644 index cf4a243315a2..000000000000 --- a/pkgs/development/python2-modules/sphinx/python2-lexer.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py -index ac2bd1b06..63ca52de2 100644 ---- a/sphinx/highlighting.py -+++ b/sphinx/highlighting.py -@@ -16,7 +16,7 @@ from pygments.filters import ErrorToken - from pygments.formatters import HtmlFormatter, LatexFormatter - from pygments.lexer import Lexer # NOQA - from pygments.lexers import get_lexer_by_name, guess_lexer --from pygments.lexers import PythonLexer, Python3Lexer, PythonConsoleLexer, \ -+from pygments.lexers import Python2Lexer, Python3Lexer, PythonConsoleLexer, \ - CLexer, TextLexer, RstLexer - from pygments.styles import get_style_by_name - from pygments.util import ClassNotFound -@@ -40,7 +40,7 @@ logger = logging.getLogger(__name__) - - lexers = dict( - none = TextLexer(stripnl=False), -- python = PythonLexer(stripnl=False), -+ python = Python2Lexer(stripnl=False), - python3 = Python3Lexer(stripnl=False), - pycon = PythonConsoleLexer(stripnl=False), - pycon3 = PythonConsoleLexer(python3=True, stripnl=False), diff --git a/pkgs/development/python2-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python2-modules/sphinxcontrib-websupport/default.nix deleted file mode 100644 index b1bdf6a0dff6..000000000000 --- a/pkgs/development/python2-modules/sphinxcontrib-websupport/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, six -}: - -buildPythonPackage rec { - pname = "sphinxcontrib-websupport"; - version = "1.1.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "1501befb0fdf1d1c29a800fdbf4ef5dc5369377300ddbdd16d2cd40e54c6eefc"; - }; - - propagatedBuildInputs = [ six ]; - - doCheck = false; - - meta = { - description = "Sphinx API for Web Apps"; - homepage = "http://sphinx-doc.org/"; - license = lib.licenses.bsd2; - }; -} diff --git a/pkgs/development/python2-modules/typing/default.nix b/pkgs/development/python2-modules/typing/default.nix index a835be985ff4..b8c143cbd537 100644 --- a/pkgs/development/python2-modules/typing/default.nix +++ b/pkgs/development/python2-modules/typing/default.nix @@ -20,7 +20,7 @@ in buildPythonPackage rec { # Also, don't bother on PyPy: AssertionError: TypeError not raised doCheck = pythonOlder "3.6" && !isPyPy; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" testDir ]; diff --git a/pkgs/development/python2-modules/zipp/default.nix b/pkgs/development/python2-modules/zipp/default.nix index 82f100aaa0d1..c256ed4f7ada 100644 --- a/pkgs/development/python2-modules/zipp/default.nix +++ b/pkgs/development/python2-modules/zipp/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ more-itertools ]; - checkInputs = [ pytest pytest-flake8 ]; + nativeCheckInputs = [ pytest pytest-flake8 ]; checkPhase = '' pytest diff --git a/pkgs/development/quickemu/default.nix b/pkgs/development/quickemu/default.nix index a02761a9a022..d5b56f585eca 100644 --- a/pkgs/development/quickemu/default.nix +++ b/pkgs/development/quickemu/default.nix @@ -50,13 +50,13 @@ in stdenv.mkDerivation rec { pname = "quickemu"; - version = "4.4"; + version = "4.5"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; rev = version; - hash = "sha256-82ojq1WTcgkVh+DQup2ymmqa6d6+LVR2p5cqEHA3hSM="; + hash = "sha256-31f4BIIYCh2acbueUtGZShKnlhctd1FfKkFqsNiUqrI="; }; postPatch = '' diff --git a/pkgs/development/r-modules/bioc-annotation-packages.nix b/pkgs/development/r-modules/bioc-annotation-packages.nix index 247a3fb2dfb8..7d47727ed413 100644 --- a/pkgs/development/r-modules/bioc-annotation-packages.nix +++ b/pkgs/development/r-modules/bioc-annotation-packages.nix @@ -4,14 +4,14 @@ # Rscript generate-r-packages.R bioc-annotation >new && mv new bioc-annotation-packages.nix { self, derive }: -let derive2 = derive { biocVersion = "3.15"; }; +let derive2 = derive { biocVersion = "3.16"; }; in with self; { AHCytoBands = derive2 { name="AHCytoBands"; version="0.99.1"; sha256="0svxxhj3mh5gqik45ikcxnlhnma8n1c0rv8pycj2034cb9ms1dbv"; depends=[]; }; - AHEnsDbs = derive2 { name="AHEnsDbs"; version="1.1.7"; sha256="1ckrdqlbk0vmpw1b7y4zlrx8gslhxh62q343k2a3b45r8lg78lp0"; depends=[AnnotationHubData ensembldb]; }; - AHLRBaseDbs = derive2 { name="AHLRBaseDbs"; version="1.4.0"; sha256="15wlnzwa1zqxlzqk90fid7g2631q91n3y117wsk2h1prmgb64j7l"; depends=[AnnotationHub]; }; - AHMeSHDbs = derive2 { name="AHMeSHDbs"; version="1.4.0"; sha256="1nx9qx0kqqkblgcl03p5zdjlzkwpwgzrw9zaywz2nb2318219n3d"; depends=[AnnotationHub]; }; + AHEnsDbs = derive2 { name="AHEnsDbs"; version="1.1.8"; sha256="1bn39n8lwb6w533fl4vlszivb4b3x9adkjh04z98sbn333bicgki"; depends=[AnnotationHubData ensembldb]; }; + AHLRBaseDbs = derive2 { name="AHLRBaseDbs"; version="1.5.0"; sha256="0dhh6a05a4m76h7gdg7yyya9aylls8ii8n14zkgyx9mhh9drhqq7"; depends=[AnnotationHub]; }; + AHMeSHDbs = derive2 { name="AHMeSHDbs"; version="1.5.0"; sha256="1g3b9skkdnqbvrrz0jcclhy99abaaiwwasr7j4r4kvla5n9kbyrg"; depends=[AnnotationHub]; }; AHPathbankDbs = derive2 { name="AHPathbankDbs"; version="0.99.5"; sha256="10wcrglm521xcrfbzc39dkbjvg1pkz0zq70vgnh68akiwmdirp89"; depends=[AnnotationHub]; }; - AHPubMedDbs = derive2 { name="AHPubMedDbs"; version="1.4.0"; sha256="1rmy4gdb5rgh7pr2fdxn55cnhdwsb1b7c9ph97ax82a30japvsa1"; depends=[AnnotationHub]; }; + AHPubMedDbs = derive2 { name="AHPubMedDbs"; version="1.5.0"; sha256="071z6m2301njdwiq0x0dw61k7ckyimj81jacy25y9chclys8j5cq"; depends=[AnnotationHub]; }; AHWikipathwaysDbs = derive2 { name="AHWikipathwaysDbs"; version="0.99.4"; sha256="0vz3p9sx36bwzl9rq0ffh7klbq13pv2yhgjq1cjk7ll8z226c0q4"; depends=[AnnotationHub]; }; BSgenome_Alyrata_JGI_v1 = derive2 { name="BSgenome.Alyrata.JGI.v1"; version="1.0.1"; sha256="062ap94m6s4w8clg1zlj223wmgbmq19yhksx9fcdcqrxr5kbfv85"; depends=[BSgenome]; }; BSgenome_Amellifera_BeeBase_assembly4 = derive2 { name="BSgenome.Amellifera.BeeBase.assembly4"; version="1.4.0"; sha256="02zs16q441zcbfp7xvv1gny5nn02ivfr8md1wh5s5rpnj6sdl6kj"; depends=[BSgenome]; }; @@ -125,7 +125,7 @@ in with self; { BSgenome_Vvinifera_URGI_IGGP12Xv0 = derive2 { name="BSgenome.Vvinifera.URGI.IGGP12Xv0"; version="0.1"; sha256="1m8mqkiqs7291hccb8pfyf2yxpky45qr6j3d9wkvp9x3ra3h0yxf"; depends=[BSgenome]; }; BSgenome_Vvinifera_URGI_IGGP12Xv2 = derive2 { name="BSgenome.Vvinifera.URGI.IGGP12Xv2"; version="0.1"; sha256="1saavsi75gw33jphhm3qb5psyfrv850ss4cmqr4i7aw1kc0fvs1j"; depends=[BSgenome]; }; BSgenome_Vvinifera_URGI_IGGP8X = derive2 { name="BSgenome.Vvinifera.URGI.IGGP8X"; version="0.1"; sha256="0v0hi2pbbi5ynd92bvbv4bzr7bgv48kvyz62hdv7k9gh7s5pg0id"; depends=[BSgenome]; }; - CTCF = derive2 { name="CTCF"; version="0.99.5"; sha256="0rrks0zmknfj04gzvbj6206n4v78cjwxrwr4216xwsp6bsbqaj65"; depends=[]; }; + CTCF = derive2 { name="CTCF"; version="0.99.10"; sha256="0s6rscf6c4sjf6azf3blzb3lfgk7sk3clrlvmhq2gv82g9ic6d40"; depends=[]; }; ChemmineDrugs = derive2 { name="ChemmineDrugs"; version="1.0.2"; sha256="0l47ac6lkycmghra2cbcdcxcv47ari8xg6lxpzilvkf4n6ld6064"; depends=[BiocGenerics ChemmineR RSQLite]; }; DO_db = derive2 { name="DO.db"; version="2.9"; sha256="10bqqa124l61ivzy4mdd3z3ar9a6537qbxw23pc4y9w8a6dwnavn"; depends=[AnnotationDbi]; }; ENCODExplorerData = derive2 { name="ENCODExplorerData"; version="0.99.5"; sha256="00gfm5l8pxrfs4cw4jlw6n0cz5s31isg69k833n89800v26w3kvh"; depends=[data_table jsonlite RCurl]; }; @@ -147,10 +147,11 @@ in with self; { FDb_UCSC_snp137common_hg19 = derive2 { name="FDb.UCSC.snp137common.hg19"; version="1.0.0"; sha256="1q1r7rk29q0zlzxz6fvfy1kjfli6wxzvhvhhfnf3z4ksy5332q63"; depends=[AnnotationDbi GenomicFeatures]; }; FDb_UCSC_tRNAs = derive2 { name="FDb.UCSC.tRNAs"; version="1.0.1"; sha256="1dymdalx9fzrplxyc0fd9faa4r5jimi7zyry9k65lyz1pabpkwqz"; depends=[AnnotationDbi GenomicFeatures]; }; GGHumanMethCancerPanelv1_db = derive2 { name="GGHumanMethCancerPanelv1.db"; version="1.4.1"; sha256="0ag1pkbh4mx4aplfrrz1q4f4cl05mczq9pcsfkd1071qk51dcwvx"; depends=[AnnotationDbi AnnotationForge org_Hs_eg_db]; }; - GO_db = derive2 { name="GO.db"; version="3.15.0"; sha256="169d2fycsw1k6m2cx08i877nbcv1mwm1ll2apjjny83zqmrivjds"; depends=[AnnotationDbi]; }; - GeneSummary = derive2 { name="GeneSummary"; version="0.99.3"; sha256="0za1cy8kz8all8g5wk3475lvzwp25wq7b7p0568didfif88w5pj2"; depends=[]; }; - GenomeInfoDbData = derive2 { name="GenomeInfoDbData"; version="1.2.8"; sha256="1d4yfah3fllmqbv76ygxfga4rbj03g558wbwnk61w70118rm0rsp"; depends=[]; }; + GO_db = derive2 { name="GO.db"; version="3.16.0"; sha256="13iv94wl2adqrwvcmicrxiz3jmji6v4znvhkkgmsx053icnq2lj6"; depends=[AnnotationDbi]; }; + GeneSummary = derive2 { name="GeneSummary"; version="0.99.4"; sha256="0fliy0z1byh7zlf7k3lklarrd2l2rl3sgliqsxnn4sviskv2rlxz"; depends=[]; }; + GenomeInfoDbData = derive2 { name="GenomeInfoDbData"; version="1.2.9"; sha256="1yj5vhd05d2alh9cgvq5jz9sl754g8zfhpf9kyiyvvyfisd72fp6"; depends=[]; }; GenomicState = derive2 { name="GenomicState"; version="0.99.15"; sha256="1r7z3n6wyrd2cclj5b7sg15wpmjdh9k5b1hjlw7jjx8j384l7l1h"; depends=[AnnotationDbi AnnotationHub bumphunter derfinder GenomeInfoDb GenomicFeatures IRanges org_Hs_eg_db rtracklayer]; }; + HDO_db = derive2 { name="HDO.db"; version="0.99.1"; sha256="14ngyxailmxrbxqqi9m7mchqcvchmbg7zm34i8a927b20s6z4z61"; depends=[AnnotationDbi]; }; Homo_sapiens = derive2 { name="Homo.sapiens"; version="1.3.1"; sha256="151vj7h5p1c8yd5swrchk46z469p135wk50hvkl0nhgndvy0jj01"; depends=[AnnotationDbi GenomicFeatures GO_db org_Hs_eg_db OrganismDbi TxDb_Hsapiens_UCSC_hg19_knownGene]; }; Hs6UG171_db = derive2 { name="Hs6UG171.db"; version="3.2.3"; sha256="034aady3hy8j9bm7pbl8l8h0gcfnzmpyxg9l9s1ky0pj7ryzr93a"; depends=[AnnotationDbi org_Hs_eg_db]; }; HsAgilentDesign026652_db = derive2 { name="HsAgilentDesign026652.db"; version="3.2.3"; sha256="0x6nxvzmc8k4qp382ca32y58awkxpg0b3kc7m1mz9iag6sq7c5vx"; depends=[AnnotationDbi org_Hs_eg_db]; }; @@ -199,9 +200,9 @@ in with self; { Mus_musculus = derive2 { name="Mus.musculus"; version="1.3.1"; sha256="143zdf83gbfqhy8jm9df7gzhw5q3a64jrjrxrzjf0zd76j8s8j6y"; depends=[AnnotationDbi GenomicFeatures GO_db org_Mm_eg_db OrganismDbi TxDb_Mmusculus_UCSC_mm10_knownGene]; }; Norway981_db = derive2 { name="Norway981.db"; version="3.2.3"; sha256="04ngc2hilqi9m7933mnm7jcvkxlz68vqqh5b628db575vcxql9b9"; depends=[AnnotationDbi org_Hs_eg_db]; }; OperonHumanV3_db = derive2 { name="OperonHumanV3.db"; version="3.2.3"; sha256="082gff88cwk2p50q8g9bixggacaclgqcvk6w5dc11h9fkgvd160i"; depends=[AnnotationDbi org_Hs_eg_db]; }; - Orthology_eg_db = derive2 { name="Orthology.eg.db"; version="3.15.0"; sha256="15lshbv5rlhh0cm9a235s0hxiy6svqp0pwk1gs4h6wlsr49560kv"; depends=[AnnotationDbi]; }; + Orthology_eg_db = derive2 { name="Orthology.eg.db"; version="3.16.0"; sha256="0m696d1pwnaiymv4c9wmhl05jgwa64n98xvv4czyg1wjxxdly9z7"; depends=[AnnotationDbi]; }; PANTHER_db = derive2 { name="PANTHER.db"; version="1.0.11"; sha256="0ckhrbhcxf7lq1hz1lrkrb7djjsfy7m0abf3665aagk6vvzigxy8"; depends=[AnnotationDbi AnnotationHub BiocFileCache RSQLite]; }; - PFAM_db = derive2 { name="PFAM.db"; version="3.15.0"; sha256="03vjfb9vx1gxrw1jkq6y4i46qhjj9z2mkdiflglbd6kpfrgnl0z7"; depends=[AnnotationDbi]; }; + PFAM_db = derive2 { name="PFAM.db"; version="3.16.0"; sha256="035k1vappczks14jms7azl9bvgg1z67svbng8b7v4qmr9slsm0l0"; depends=[AnnotationDbi]; }; POCRCannotation_db = derive2 { name="POCRCannotation.db"; version="3.2.3"; sha256="0ybvs4hrxpivdkhm0fxpib11vlxqqdk8prlyj78vj5qzyb3iy89d"; depends=[AnnotationDbi org_Hs_eg_db]; }; PartheenMetaData_db = derive2 { name="PartheenMetaData.db"; version="3.2.3"; sha256="0d37c5b7s3fgkkvg7sj7gl9ksrjk5pyyv54vkys8w3qwgsm8yrdz"; depends=[AnnotationDbi org_Hs_eg_db]; }; PolyPhen_Hsapiens_dbSNP131 = derive2 { name="PolyPhen.Hsapiens.dbSNP131"; version="1.0.2"; sha256="1kikygkli41sn3rqihz0924prmqg2264ifj29vmg1a7qccm0kf7c"; depends=[AnnotationDbi RSQLite VariantAnnotation]; }; @@ -214,16 +215,12 @@ in with self; { SHDZ_db = derive2 { name="SHDZ.db"; version="3.2.3"; sha256="077xy2zx3f4c01di18ki32xmrwgsc1qjci3wj33nmgsy5925zdxs"; depends=[AnnotationDbi org_Hs_eg_db]; }; SIFT_Hsapiens_dbSNP132 = derive2 { name="SIFT.Hsapiens.dbSNP132"; version="1.0.2"; sha256="1akqhmv9hp41q2jrvz4xvpdi30c4c6v4xbz6ykn6pdf0217p7xry"; depends=[AnnotationDbi RSQLite VariantAnnotation]; }; SIFT_Hsapiens_dbSNP137 = derive2 { name="SIFT.Hsapiens.dbSNP137"; version="1.0.0"; sha256="1472abqanbwziyynr851xzhg7ck8w1n98ymmggg7s46hzix5mlj8"; depends=[AnnotationDbi RSQLite VariantAnnotation]; }; - SNPlocs_Hsapiens_dbSNP_20101109 = derive2 { name="SNPlocs.Hsapiens.dbSNP.20101109"; version="0.99.9"; sha256="1qxsaq2wai1rqbidz005frjw8r8m2ia9cd87ziw8i66a798rzima"; depends=[GenomicRanges IRanges S4Vectors]; }; - SNPlocs_Hsapiens_dbSNP_20120608 = derive2 { name="SNPlocs.Hsapiens.dbSNP.20120608"; version="0.99.13"; sha256="123n3rwkq8c8gqwhbwpsvis2x1xp137hchg9y7sv7l1givb6n2kf"; depends=[BSgenome GenomicRanges IRanges]; }; - SNPlocs_Hsapiens_dbSNP141_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP141.GRCh38"; version="0.99.12"; sha256="1hfqbf03jd2r7ybb19rl3czrjb4h4vjqlrrilfqc8yymy7myvqqb"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; - SNPlocs_Hsapiens_dbSNP142_GRCh37 = derive2 { name="SNPlocs.Hsapiens.dbSNP142.GRCh37"; version="0.99.6"; sha256="17ql8fsali09dx1vv9178ya7zx901vwq4bnjrs35fjrjdvx6yvfd"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges]; }; SNPlocs_Hsapiens_dbSNP144_GRCh37 = derive2 { name="SNPlocs.Hsapiens.dbSNP144.GRCh37"; version="0.99.20"; sha256="1z8kx43ki1jvj7ms7pcybakcdimfwr6zpjvspkjmma97bdz093iz"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; SNPlocs_Hsapiens_dbSNP144_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP144.GRCh38"; version="0.99.20"; sha256="0yxmsnxncr7w30r0d7bg5i96pclm2vf40p9jdqa02rc67a6sximn"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; SNPlocs_Hsapiens_dbSNP149_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP149.GRCh38"; version="0.99.20"; sha256="17bv25p1261hn9d7mxfp6pvivj15pxyvr92gms8a8msfqg9y0xkb"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; SNPlocs_Hsapiens_dbSNP150_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP150.GRCh38"; version="0.99.20"; sha256="0jkwwgxxpm9ry8kizq8hs70sky41pks1ag40y5aqq91yjbpqlckj"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; - SNPlocs_Hsapiens_dbSNP151_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP151.GRCh38"; version="0.99.21"; sha256="19j5h0dgxd2iw35p6fblj8b3z2d92zmmp60khw5zs70scd5fs9pb"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; - SNPlocs_Hsapiens_dbSNP155_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP155.GRCh38"; version="0.99.21"; sha256="0id595ily1kwzsc3sh3mhbjyki19vc7n4vzdwq9pdpasraykc718"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + SNPlocs_Hsapiens_dbSNP155_GRCh37 = derive2 { name="SNPlocs.Hsapiens.dbSNP155.GRCh37"; version="0.99.22"; sha256="0icb85y6jc6a2rphf8dsxhfcsh7j6kmm6iii7f0dl33dsgsmb1wl"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + SNPlocs_Hsapiens_dbSNP155_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP155.GRCh38"; version="0.99.22"; sha256="1zdx6bjl494wlzqhhz6q6cnygbrvqimcrmmxab5dfwckkyfxlyd8"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; TxDb_Athaliana_BioMart_plantsmart22 = derive2 { name="TxDb.Athaliana.BioMart.plantsmart22"; version="3.0.1"; sha256="0j2zr4cddad7z1lxx9m9kfgyy7jajjnblpk9j8igd39ia3ixrpzc"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Athaliana_BioMart_plantsmart25 = derive2 { name="TxDb.Athaliana.BioMart.plantsmart25"; version="3.1.3"; sha256="0a6v0l6p13zmiysi3k8dxzdlxng552qqj9rnlbdavdiidla0pvm3"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Athaliana_BioMart_plantsmart28 = derive2 { name="TxDb.Athaliana.BioMart.plantsmart28"; version="3.2.2"; sha256="1yjyvrbx55y024lqg3b2rlf8pngqw5xi3p83j5ipan05wf0aq6ir"; depends=[AnnotationDbi GenomicFeatures]; }; @@ -247,7 +244,7 @@ in with self; { TxDb_Hsapiens_UCSC_hg18_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg18.knownGene"; version="3.2.2"; sha256="1yk9ggclkqqfzrdp8gcqyplvif824pa7df54ck5gb1xb9q5s975w"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Hsapiens_UCSC_hg19_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg19.knownGene"; version="3.2.2"; sha256="1sajhcqqwazgz2lqbik7rd935i7kpnh08zxbp2ra10j72yqy4g86"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Hsapiens_UCSC_hg19_lincRNAsTranscripts = derive2 { name="TxDb.Hsapiens.UCSC.hg19.lincRNAsTranscripts"; version="3.2.2"; sha256="0bmbp7kydvviczw8axgxq2wdlwq6fdas90jk9bg56avjq5syws2g"; depends=[AnnotationDbi GenomicFeatures]; }; - TxDb_Hsapiens_UCSC_hg38_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg38.knownGene"; version="3.15.0"; sha256="1y9fqhkk5wgny43bxc0j82afy49vz34rblcmcfmwavngdkpnj879"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Hsapiens_UCSC_hg38_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg38.knownGene"; version="3.16.0"; sha256="1kphpnfibyfh5qqki8ivngynsr81jfqw04ysya6xq2llldh8i137"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Hsapiens_UCSC_hg38_refGene = derive2 { name="TxDb.Hsapiens.UCSC.hg38.refGene"; version="3.15.0"; sha256="03ca3spvhci16fndy82fx0cik0a6yqj77l6nfvv5k9qg3xnrp179"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Mmulatta_UCSC_rheMac10_refGene = derive2 { name="TxDb.Mmulatta.UCSC.rheMac10.refGene"; version="3.14.0"; sha256="12gxs6s57l22013g40b7hb09vxhmdri73cp9rgs2icb88p7sjlib"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Mmulatta_UCSC_rheMac3_refGene = derive2 { name="TxDb.Mmulatta.UCSC.rheMac3.refGene"; version="3.12.0"; sha256="1a0wbh4dajpgynmw2iwbvp836nklzlk0cfhqnwmqq9l4gzzh2w07"; depends=[AnnotationDbi GenomicFeatures]; }; @@ -270,7 +267,7 @@ in with self; { TxDb_Sscrofa_UCSC_susScr11_refGene = derive2 { name="TxDb.Sscrofa.UCSC.susScr11.refGene"; version="3.12.0"; sha256="1i3w8avi5ihkynapya1wy70i6f0nq4jyy5nvlwikppqpdjwn7gb4"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Sscrofa_UCSC_susScr3_refGene = derive2 { name="TxDb.Sscrofa.UCSC.susScr3.refGene"; version="3.12.0"; sha256="01bl7zdxyhhg4706jhi7271fs09riixkyr3x0bancl1fpzwszc6p"; depends=[AnnotationDbi GenomicFeatures]; }; UCSCRepeatMasker = derive2 { name="UCSCRepeatMasker"; version="3.15.2"; sha256="0hi1h8vvbf27wk13gbfgm0amjqgl7b2qxlgakcbr87qxwbi02zv7"; depends=[AnnotationHub GenomeInfoDb RCurl XML]; }; - XtraSNPlocs_Hsapiens_dbSNP141_GRCh38 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP141.GRCh38"; version="0.99.13"; sha256="1fidmrf0xr7wwd4v1y7x2wwyplplbs1z8jqpfdjpc8aclcy38m3f"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + UniProtKeywords = derive2 { name="UniProtKeywords"; version="0.99.4"; sha256="0rs3y7kw77nwbvil4kvmjjlvjdsdyd8rdc0qb1ghm3bvisycgnyh"; depends=[]; }; XtraSNPlocs_Hsapiens_dbSNP144_GRCh37 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP144.GRCh37"; version="0.99.12"; sha256="0k823fvqjmdkmd47m7wyra6jxmv8lnk2i1xl4pp0mh3zgb87hgfb"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; XtraSNPlocs_Hsapiens_dbSNP144_GRCh38 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP144.GRCh38"; version="0.99.12"; sha256="0d4q32ij2x4726wvw06sgmivid0n94vfdmszdyh607xlcahqxa5z"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; adme16cod_db = derive2 { name="adme16cod.db"; version="3.4.0"; sha256="1vn9s1lrl6zzs00madb111fdzqjfb45mprpjqap8bvib65942rvq"; depends=[AnnotationDbi org_Rn_eg_db]; }; @@ -279,22 +276,22 @@ in with self; { agprobe = derive2 { name="agprobe"; version="2.18.0"; sha256="1vnawamcpz16na8nmlq2czfxcr325fwdnngxl65mmnbd0f4lmy3k"; depends=[AnnotationDbi]; }; alternativeSplicingEvents_hg19 = derive2 { name="alternativeSplicingEvents.hg19"; version="1.1.0"; sha256="0q90nw3ds66zbyn3ch19lq1qimd1hz1s3jyyd6zi3v10p5s8bm0y"; depends=[AnnotationHub]; }; alternativeSplicingEvents_hg38 = derive2 { name="alternativeSplicingEvents.hg38"; version="1.1.0"; sha256="18qabggvs9mcg8fwd6prdca8lfxn9r9i0493l667n8jl9vy2pbfc"; depends=[AnnotationHub]; }; - anopheles_db0 = derive2 { name="anopheles.db0"; version="3.15.0"; sha256="01hs1qxzpp9974yhplkhd4hq0mxx63plgb9p5azqz5z05x88ksfn"; depends=[AnnotationDbi]; }; - arabidopsis_db0 = derive2 { name="arabidopsis.db0"; version="3.15.1"; sha256="1sazbvgc7rjfcn9y0qkvq0s21vb8i5iy14w9wi274s2h75ishg2i"; depends=[AnnotationDbi]; }; + anopheles_db0 = derive2 { name="anopheles.db0"; version="3.16.0"; sha256="0mmhbm5hzz739jv0028wna03zk6lphiwac5qhg55w8y19kclkvc2"; depends=[AnnotationDbi]; }; + arabidopsis_db0 = derive2 { name="arabidopsis.db0"; version="3.16.0"; sha256="1gir9xvfx7zccj3y3k6g9bli330pmlwc6gn8ajf513a2w4gl0z4q"; depends=[AnnotationDbi]; }; ath1121501_db = derive2 { name="ath1121501.db"; version="3.13.0"; sha256="0v4vapbns71dpv09857lyrnliq202i8yi4ar9z81wbpbc22lhf0d"; depends=[AnnotationDbi org_At_tair_db]; }; ath1121501cdf = derive2 { name="ath1121501cdf"; version="2.18.0"; sha256="1naq8f8dwgbmndx178nm2pw6hjx5ljx0w1wb4dfjifnl4bs5rqcc"; depends=[AnnotationDbi]; }; ath1121501probe = derive2 { name="ath1121501probe"; version="2.18.0"; sha256="0a2nd8zhp3ybis780l3rrmwcxskbl3a111g8w6m8qfwsw5vnlqg1"; depends=[AnnotationDbi]; }; barley1cdf = derive2 { name="barley1cdf"; version="2.18.0"; sha256="0rbij5cqr2sz33y5waybv85nrcgf70iwj5gk13g0xn9p1l1zxyn2"; depends=[AnnotationDbi]; }; barley1probe = derive2 { name="barley1probe"; version="2.18.0"; sha256="1kh5r748b4vkmvlfaclmrh07ypbrzgxn90liqfz1rwkabh6rfk71"; depends=[AnnotationDbi]; }; bovine_db = derive2 { name="bovine.db"; version="3.13.0"; sha256="06692b1n0lzhg0biixipsnwx33w9y8wkc7pc5q1lkjfzbmd2inml"; depends=[AnnotationDbi org_Bt_eg_db]; }; - bovine_db0 = derive2 { name="bovine.db0"; version="3.15.0"; sha256="1vvlsdbnbdg1pifzzrzsgz9lp251p3bq80mgc5jmmkw2mf1pk3n0"; depends=[AnnotationDbi]; }; + bovine_db0 = derive2 { name="bovine.db0"; version="3.16.0"; sha256="02abx3ygnh1pnks8rbf2k86a1kzkbv7vfykkln22anvf2a41qd0d"; depends=[AnnotationDbi]; }; bovinecdf = derive2 { name="bovinecdf"; version="2.18.0"; sha256="13mf0yy0dypkm5n2ghl04xm6ayb9bn9qijqhgynksghi7s2k34mb"; depends=[AnnotationDbi]; }; bovineprobe = derive2 { name="bovineprobe"; version="2.18.0"; sha256="0i4afa5dksnir2nfrfh2cynjm59sm6vfaqa9wyag8cxg7c2nlm1i"; depends=[AnnotationDbi]; }; bsubtiliscdf = derive2 { name="bsubtiliscdf"; version="2.18.0"; sha256="1rihrjim37b49rhqr4nxga8sp67qri9xqlqc141mhbngh6cw3iyl"; depends=[AnnotationDbi]; }; bsubtilisprobe = derive2 { name="bsubtilisprobe"; version="2.18.0"; sha256="0k99hvgaswn96x4yanvr9cy8bdy69sd5q7yp6dj9synxj7s1fcw9"; depends=[AnnotationDbi]; }; cMAP = derive2 { name="cMAP"; version="1.15.1"; sha256="0pzizm27rgcaic7wsh52z30v1jwarmz4cwh1mksbygp63k54mwiv"; depends=[]; }; canine_db = derive2 { name="canine.db"; version="3.13.0"; sha256="1x1mlh0p6r2l5kclarqwgiw9y64xc8jhp6252hhpl9bpnn638n3s"; depends=[AnnotationDbi org_Cf_eg_db]; }; - canine_db0 = derive2 { name="canine.db0"; version="3.15.0"; sha256="0ycxp1z0idjdhzi5zr5s3cj6h421mfgjdvrcx64h4sfg6qga8yv2"; depends=[AnnotationDbi]; }; + canine_db0 = derive2 { name="canine.db0"; version="3.16.0"; sha256="0cn1czv87dmmc706n7l8995pv1xa57f8agx5xdfdba3d50snwh7p"; depends=[AnnotationDbi]; }; canine2_db = derive2 { name="canine2.db"; version="3.13.0"; sha256="1xzz0vivdypwl6kaq2ba02jkpxw0r9r98297ilksdh8m71f244si"; depends=[AnnotationDbi org_Cf_eg_db]; }; canine2cdf = derive2 { name="canine2cdf"; version="2.18.0"; sha256="077cmmnhjdk0vxjzm1kqf3q5kgx6chwkm59dr4s5dy019rqb6sqr"; depends=[AnnotationDbi]; }; canine2probe = derive2 { name="canine2probe"; version="2.18.0"; sha256="1l849a1dqy4kpcsxs0lvb48ag81i0f0ys0w4757rw4kp8ry59z4b"; depends=[AnnotationDbi]; }; @@ -304,10 +301,10 @@ in with self; { celeganscdf = derive2 { name="celeganscdf"; version="2.18.0"; sha256="0a6w0a48azg0i21j3aqb7fnxck3ff9w3gsi89bnlfh0zx6pknx7p"; depends=[AnnotationDbi]; }; celegansprobe = derive2 { name="celegansprobe"; version="2.18.0"; sha256="05k7si3f8pzkyb8jv0r2vkavbrqxsn4nawl92gcphfsylrwcddqb"; depends=[AnnotationDbi]; }; chicken_db = derive2 { name="chicken.db"; version="3.13.0"; sha256="0szb7sgassw10kzm8iz8h3fdbxm6v0kz95yb3a9icj2chi5d1m2i"; depends=[AnnotationDbi org_Gg_eg_db]; }; - chicken_db0 = derive2 { name="chicken.db0"; version="3.15.0"; sha256="09jpzqj46w0m4gz9i3wghvhd0agksimmyp6c53d9sszi45sxhqyc"; depends=[AnnotationDbi]; }; + chicken_db0 = derive2 { name="chicken.db0"; version="3.16.0"; sha256="1r3svjlr536q3zicq7k0wvw6szpdj81h3bjb3f4a0f3rlxzrakif"; depends=[AnnotationDbi]; }; chickencdf = derive2 { name="chickencdf"; version="2.18.0"; sha256="09hhim5s9xj7n2b5rhn1svf5qly2mn0rr2v2ls25hfzyrqcbxlz1"; depends=[AnnotationDbi]; }; chickenprobe = derive2 { name="chickenprobe"; version="2.18.0"; sha256="1fdsiwfyg7fwslrr7xs3gny7sw24bzg5k1fvlyzb1477sgj0pid3"; depends=[AnnotationDbi]; }; - chimp_db0 = derive2 { name="chimp.db0"; version="3.15.0"; sha256="0k2wip710k6z4s20f86ff3lbhjh5jg9waaqcznhhrn4nca9gymzr"; depends=[AnnotationDbi]; }; + chimp_db0 = derive2 { name="chimp.db0"; version="3.16.0"; sha256="04lzica0hgq7xrdspzidfnjgjg9cxhy2wjcz4vndlx519jlwdrny"; depends=[AnnotationDbi]; }; chromhmmData = derive2 { name="chromhmmData"; version="0.99.2"; sha256="13g6x7lzmkz9qv7yr6ps8gsgilgr048lc7y0y7xsfa9ws3n08fzj"; depends=[]; }; citruscdf = derive2 { name="citruscdf"; version="2.18.0"; sha256="1326mj1xf3k4v5iyyn46whx24qfng0x3cv6rvckdr1ycc1v887dn"; depends=[AnnotationDbi]; }; citrusprobe = derive2 { name="citrusprobe"; version="2.18.0"; sha256="0bf1wic136cxwgs4j13wsyqasnyvr0jw1hzg6qizndmy7g8hrb87"; depends=[AnnotationDbi]; }; @@ -331,15 +328,15 @@ in with self; { ecoli2_db = derive2 { name="ecoli2.db"; version="3.13.0"; sha256="1i2arr26hch7lmx2bixzy4l0zaa0gynah4dfwa98cvb24ahqqj9f"; depends=[AnnotationDbi org_EcK12_eg_db]; }; ecoli2cdf = derive2 { name="ecoli2cdf"; version="2.18.0"; sha256="1rkxrwadq9kg9685z9pg6rgc4bblkx5p3c6snsl4gv2k188dva9r"; depends=[AnnotationDbi]; }; ecoli2probe = derive2 { name="ecoli2probe"; version="2.18.0"; sha256="11q4ka0ncjapahic49xdl9919vm9frrwlqgj101krgkg262lfm8n"; depends=[AnnotationDbi]; }; - ecoliK12_db0 = derive2 { name="ecoliK12.db0"; version="3.15.0"; sha256="00r9w2wklmvswrvvvmx0bwgwlb5q2fj7wr0nz2p5rnv4nczj8f8w"; depends=[AnnotationDbi]; }; - ecoliSakai_db0 = derive2 { name="ecoliSakai.db0"; version="3.15.0"; sha256="0xall7j0y7gq4iv02q4q3b4mj7111zxjb1gycib1z3fy6nfx5bl1"; depends=[AnnotationDbi]; }; + ecoliK12_db0 = derive2 { name="ecoliK12.db0"; version="3.16.0"; sha256="17khj10g2nsim40w9c6wc79hx5xx4g2n0hnvigsxm3l0a38vsz12"; depends=[AnnotationDbi]; }; + ecoliSakai_db0 = derive2 { name="ecoliSakai.db0"; version="3.16.0"; sha256="09n18nv2v4c7j472ygzpv808p473gfnifh9vnzm79ifjiixvzx4w"; depends=[AnnotationDbi]; }; ecoliasv2cdf = derive2 { name="ecoliasv2cdf"; version="2.18.0"; sha256="16i6has9qgmzakcy24racc1h9j331wndv5c87qp5r1zrai61zyav"; depends=[AnnotationDbi]; }; ecoliasv2probe = derive2 { name="ecoliasv2probe"; version="2.18.0"; sha256="1hfrnal170cdigc2fmnynb75jjsiq77p4x6ws9gah558hvx87nk3"; depends=[AnnotationDbi]; }; ecolicdf = derive2 { name="ecolicdf"; version="2.18.0"; sha256="18g5prjykn356k35m131ifn128k5mhij2x26balqav0azigzjqsn"; depends=[AnnotationDbi]; }; ecoliprobe = derive2 { name="ecoliprobe"; version="2.18.0"; sha256="17g5zxfzsak7a0w51irc0w1w2i5ngdkx9db6rhv1fyp8mfjgaphd"; depends=[AnnotationDbi]; }; - excluderanges = derive2 { name="excluderanges"; version="0.99.6"; sha256="1ryp2ghbx1b1268fpgza5rn6brhalff9hsr6fxpr5x5mc35hkd68"; depends=[]; }; + excluderanges = derive2 { name="excluderanges"; version="0.99.8"; sha256="19pdwlhqlz420yss371bsqhkx8c7wxr0sv4wsycnc0mlplwq4bsf"; depends=[GenomicRanges]; }; fitCons_UCSC_hg19 = derive2 { name="fitCons.UCSC.hg19"; version="3.7.1"; sha256="19isa4x8js0pdb4k8a11bw3bzmzv6jc4jphzrvav7piqkvrgykzx"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; }; - fly_db0 = derive2 { name="fly.db0"; version="3.15.0"; sha256="0x4hsqlzsjjdhjfqa57xwsvn5cnn7radhqb21vjq7vcpvp2hfjmp"; depends=[AnnotationDbi]; }; + fly_db0 = derive2 { name="fly.db0"; version="3.16.0"; sha256="1mjd1g0pazhzgwiwll71fhqcisilc5wqz7dnl8ypxd7v7915w8jr"; depends=[AnnotationDbi]; }; geneplast_data = derive2 { name="geneplast.data"; version="0.99.6"; sha256="1vq2l828d25lsmmac6079vip8bbvqhiyr1x58s467cwcl1mgayrk"; 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=[]; }; @@ -472,7 +469,7 @@ in with self; { hugene20sttranscriptcluster_db = derive2 { name="hugene20sttranscriptcluster.db"; version="8.8.0"; sha256="00fjhz7gac0rssn3kplag68vfx7gimjrm4mc7z516bs013rppgsz"; depends=[AnnotationDbi org_Hs_eg_db]; }; hugene21stprobeset_db = derive2 { name="hugene21stprobeset.db"; version="8.8.0"; sha256="0s4zl9lv5w3fkb9axhz9siliz73brwarw8a7cam1p9b2kmdrdqs0"; depends=[AnnotationDbi org_Hs_eg_db]; }; hugene21sttranscriptcluster_db = derive2 { name="hugene21sttranscriptcluster.db"; version="8.8.0"; sha256="1g7yfva96vhkdvcvsjwsj7sy8q6kczd5rmcwrwjc73v9qi4ywgal"; depends=[AnnotationDbi org_Hs_eg_db]; }; - human_db0 = derive2 { name="human.db0"; version="3.15.0"; sha256="15y7ggkapizkj9fx0w0d388vqd4v2j24crygx7c783g01hi0lrn1"; depends=[AnnotationDbi]; }; + human_db0 = derive2 { name="human.db0"; version="3.16.0"; sha256="1gjikb5rp6qh5cv90hylhjkna4kp084mxawqv0x1z5kl8lx8dfgk"; depends=[AnnotationDbi]; }; human1mduov3bCrlmm = derive2 { name="human1mduov3bCrlmm"; version="1.0.4"; sha256="1p7qpzk6svafgdafljhh4k0z7pcs78qmwwfd80r0a1yhkssmp0v9"; depends=[]; }; human1mv1cCrlmm = derive2 { name="human1mv1cCrlmm"; version="1.0.3"; sha256="1qlph3qrjv52ddzlj8pwa93zzh70x4mbdrdr7q9pan427lpck9gx"; depends=[]; }; human370quadv3cCrlmm = derive2 { name="human370quadv3cCrlmm"; version="1.0.3"; sha256="1chjx9vsmqz2whslw1l7jn7nfn7zx6pcjfmqqm9mh81i74rzrdik"; depends=[]; }; @@ -510,7 +507,7 @@ in with self; { m20kcod_db = derive2 { name="m20kcod.db"; version="3.4.0"; sha256="1p2sm5j4b50iqzwcb984qrh74c3hf6yml7b8mvxlhhhvxz4iy1np"; depends=[AnnotationDbi org_Mm_eg_db]; }; maizecdf = derive2 { name="maizecdf"; version="2.18.0"; sha256="0yfz5gjhsq4wz6j63s1b1hxjz03gsmrlfs2cdc8smq6azp3zdid4"; depends=[AnnotationDbi]; }; maizeprobe = derive2 { name="maizeprobe"; version="2.18.0"; sha256="01h5dv5i0zaqlphkii9ipxy9wswv1srgprrpr5vmi01c9d98qsk0"; depends=[AnnotationDbi]; }; - malaria_db0 = derive2 { name="malaria.db0"; version="3.15.0"; sha256="07fd1pfkzkjrf6zk061hngf2hba9yikczc5kdwks22sh8sz407yd"; depends=[AnnotationDbi]; }; + malaria_db0 = derive2 { name="malaria.db0"; version="3.16.0"; sha256="0mgwrhlcac6vxvb9b8m9xx1v2yav04sdgw649vkaq7a8kbzwywas"; depends=[AnnotationDbi]; }; medicagocdf = derive2 { name="medicagocdf"; version="2.18.0"; sha256="1clz679cc887x98c6jk93cphijkbg5r2nd9idrj5901yvh6p9n5q"; depends=[AnnotationDbi]; }; medicagoprobe = derive2 { name="medicagoprobe"; version="2.18.0"; sha256="0w6j1pfkvb3npc8srpjifq2ywnqxhc9q090jqzmkx22x36cw9cl5"; depends=[AnnotationDbi]; }; metaboliteIDmapping = derive2 { name="metaboliteIDmapping"; version="1.0.0"; sha256="0nflpvla3wn8i2gaja5wwjkxk0jich95f5ws3rnhh2a6rx3xi3ql"; depends=[AnnotationHub]; }; @@ -565,7 +562,7 @@ in with self; { mogene20sttranscriptcluster_db = derive2 { name="mogene20sttranscriptcluster.db"; version="8.8.0"; sha256="1bpzpba9aifc7w6qbrh6rnc636k6z1r9gz03sxvc3aa3977p9xag"; depends=[AnnotationDbi org_Mm_eg_db]; }; mogene21stprobeset_db = derive2 { name="mogene21stprobeset.db"; version="8.8.0"; sha256="172bhzqqw5hz76bw8vqwx2qpw4f6rwbcm6savmkxmmhzb2nq60z5"; depends=[AnnotationDbi org_Mm_eg_db]; }; mogene21sttranscriptcluster_db = derive2 { name="mogene21sttranscriptcluster.db"; version="8.8.0"; sha256="02g2n5nkxi9lqw9h7sbkblk99zd57lkrldqb1fmi9zww59qwagrv"; depends=[AnnotationDbi org_Mm_eg_db]; }; - mouse_db0 = derive2 { name="mouse.db0"; version="3.15.0"; sha256="1b85xci8xcmck41yqm1sd63cvxmkrnm5cpfdnr9dmw77vl1p85wb"; depends=[AnnotationDbi]; }; + mouse_db0 = derive2 { name="mouse.db0"; version="3.16.0"; sha256="0nr2s573najg1n8jl73040cglqmgb169rv9mhk8zmcc4zqgfaa0k"; depends=[AnnotationDbi]; }; mouse4302_db = derive2 { name="mouse4302.db"; version="3.13.0"; sha256="0rf22kfj6y96ap0gcwq3mnpv6fj0yax37gf51sfi0wkmp95k7rcs"; depends=[AnnotationDbi org_Mm_eg_db]; }; mouse4302cdf = derive2 { name="mouse4302cdf"; version="2.18.0"; sha256="1mpyma4x8zfs2fmmx57xw4cfs2cf9lhw71nc3icl72d7vmwidswc"; depends=[AnnotationDbi]; }; mouse4302frmavecs = derive2 { name="mouse4302frmavecs"; version="1.5.0"; sha256="04clwkfz1gqqwrnqbavkka3hv480w6vi6c4q947qqnhw8j5jjp7s"; depends=[]; }; @@ -602,26 +599,26 @@ in with self; { nugomm1a520177cdf = derive2 { name="nugomm1a520177cdf"; version="3.4.0"; sha256="0skd5b76si0vydzk5qhg4f1a1j655alxflm9sqci8fi8safwj96a"; depends=[AnnotationDbi]; }; nugomm1a520177probe = derive2 { name="nugomm1a520177probe"; version="3.4.0"; sha256="1n70k0mhv146983myjgk1cgkr9rmmcpqdv8wpkcr320qcvgf9bn7"; depends=[AnnotationDbi]; }; oligoData = derive2 { name="oligoData"; version="1.8.0"; sha256="1d1yfms3jv2c4s255xnh8yxwijrj35skw3nxds7l46y88lg3qn8y"; depends=[oligo]; }; - ontoProcData = derive2 { name="ontoProcData"; version="0.99.9"; sha256="1axqhximb238h7ib7sd7g1n1in8969d263pjd362i0s1m4y5y033"; depends=[]; }; - org_Ag_eg_db = derive2 { name="org.Ag.eg.db"; version="3.15.0"; sha256="1qnqp1m7asa16llxlrjmj6ng93v7ngcg03l51k33cnwjhzalgl88"; depends=[AnnotationDbi]; }; - org_At_tair_db = derive2 { name="org.At.tair.db"; version="3.15.1"; sha256="1n954fc14rfdsaldw93dnw11jrs0ar0bk5icc86mdiy0c18bvx4z"; depends=[AnnotationDbi]; }; - org_Bt_eg_db = derive2 { name="org.Bt.eg.db"; version="3.15.0"; sha256="0nmrhbnpkjgmb5adh38lffrv1h84grfy6lbgd98y6b1iq58facnl"; depends=[AnnotationDbi]; }; - org_Ce_eg_db = derive2 { name="org.Ce.eg.db"; version="3.15.0"; sha256="0hc3gd782yynn12wkawwri07src6ay3zwpj0yjbxcgkkrdga8jdj"; depends=[AnnotationDbi]; }; - org_Cf_eg_db = derive2 { name="org.Cf.eg.db"; version="3.15.0"; sha256="1dmvszbri4kipjydjaz78igi16xqjlzxvns4f2d1rfdlfvwpgvyf"; depends=[AnnotationDbi]; }; - org_Dm_eg_db = derive2 { name="org.Dm.eg.db"; version="3.15.0"; sha256="1d9igsxxl7nws3ah6k4vz9hfzpdb0vb8hg6h911yr4z0hpc00hbk"; depends=[AnnotationDbi]; }; - org_Dr_eg_db = derive2 { name="org.Dr.eg.db"; version="3.15.0"; sha256="0nmgwqq8s4vswa9cc5r3qglgbc13wggs2isnj9n1rnb738i3n54n"; depends=[AnnotationDbi]; }; - org_EcK12_eg_db = derive2 { name="org.EcK12.eg.db"; version="3.15.0"; sha256="0x0j7fc8pyz23jn6ag3cvz55zrk3gmvnkqhfwvsvdz7v72cgwhxy"; depends=[AnnotationDbi]; }; - org_EcSakai_eg_db = derive2 { name="org.EcSakai.eg.db"; version="3.15.0"; sha256="10ma0823mr2aj9xrr0ygg8sjdndksslkjpzlxb259lwy421hskcn"; depends=[AnnotationDbi]; }; - org_Gg_eg_db = derive2 { name="org.Gg.eg.db"; version="3.15.0"; sha256="1gi8dj5hn8798fgwhqskn131p108n78lvk2wnl69sb6cwyw4dg5g"; depends=[AnnotationDbi]; }; - org_Hs_eg_db = derive2 { name="org.Hs.eg.db"; version="3.15.0"; sha256="0prwma5jfxszwc4avna51x4cmnqchz2s317cp4ia5w7035hbpj8x"; depends=[AnnotationDbi]; }; - org_Mm_eg_db = derive2 { name="org.Mm.eg.db"; version="3.15.0"; sha256="12npjcq5n04ja82yxpp35lmjgxrzd3rp5xxmrggzw0zb1w4dyn66"; depends=[AnnotationDbi]; }; - org_Mmu_eg_db = derive2 { name="org.Mmu.eg.db"; version="3.15.0"; sha256="1ly8bfjq4n3agb7f27cizf87qy0y4001nimnw9a3nar1hi43df7n"; depends=[AnnotationDbi]; }; + ontoProcData = derive2 { name="ontoProcData"; version="0.99.9901"; sha256="16wwh539hdm89f1vxqfgjmlbqwadnr4xqap80annsqgfn90mi8rk"; depends=[]; }; + org_Ag_eg_db = derive2 { name="org.Ag.eg.db"; version="3.16.0"; sha256="07p8v4ls2s2svd0r276nn4w125iimcq78395r9pmx9x0vw2a6xvj"; depends=[AnnotationDbi]; }; + org_At_tair_db = derive2 { name="org.At.tair.db"; version="3.16.0"; sha256="15xgqgnd4qmnhx9fd95g40zr07iiw97jkjhmp1whdc5cvd2bhjwm"; depends=[AnnotationDbi]; }; + org_Bt_eg_db = derive2 { name="org.Bt.eg.db"; version="3.16.0"; sha256="12smyjq1bl1s4j06r3klqbm491in4ndjqnk7j6vydyjrz9jwkdcs"; depends=[AnnotationDbi]; }; + org_Ce_eg_db = derive2 { name="org.Ce.eg.db"; version="3.16.0"; sha256="0sa4g769wddw4gk3p8103x48hggn6hab28pnsm7idginz5gygc70"; depends=[AnnotationDbi]; }; + org_Cf_eg_db = derive2 { name="org.Cf.eg.db"; version="3.16.0"; sha256="0w75s2zqvq1rxgvbcnif01fmyj5ajvx9m7jfdb86al8jm3pcd61x"; depends=[AnnotationDbi]; }; + org_Dm_eg_db = derive2 { name="org.Dm.eg.db"; version="3.16.0"; sha256="1ss1sd9g0lzqa7il4wkchlwqxyrc0wirkdxzd18fmqij7wvwa0pb"; depends=[AnnotationDbi]; }; + org_Dr_eg_db = derive2 { name="org.Dr.eg.db"; version="3.16.0"; sha256="1vxnf0b5v0lc963vqrzhccya895fhbzzarfwm54gwd7zj9r7chy0"; depends=[AnnotationDbi]; }; + org_EcK12_eg_db = derive2 { name="org.EcK12.eg.db"; version="3.16.0"; sha256="1n9l2y213187fnbxsyyq51rkl9ck895gymbnacg5krj668h08g6j"; depends=[AnnotationDbi]; }; + org_EcSakai_eg_db = derive2 { name="org.EcSakai.eg.db"; version="3.16.0"; sha256="0rmis6gx2gwkjli9xp3vwrppp22kdlpxpywx38r0cfkxsaaaq9pi"; depends=[AnnotationDbi]; }; + org_Gg_eg_db = derive2 { name="org.Gg.eg.db"; version="3.16.0"; sha256="1rdyxwfxiamr1x4zxngjc57a5zpdycjnq5b9xxx9wih8md8ij5aq"; depends=[AnnotationDbi]; }; + org_Hs_eg_db = derive2 { name="org.Hs.eg.db"; version="3.16.0"; sha256="02ic79qb6b3vp50g44736gkmlx1hsjhfadj7dp463fqdzbg6ybid"; depends=[AnnotationDbi]; }; + org_Mm_eg_db = derive2 { name="org.Mm.eg.db"; version="3.16.0"; sha256="030wpxzp4lf3fs6wxp1vwrlclxjsq8i507wwvnbhkl9lcys5f0x0"; depends=[AnnotationDbi]; }; + org_Mmu_eg_db = derive2 { name="org.Mmu.eg.db"; version="3.16.0"; sha256="0sm147m9xp4xdzga2kk8d5zdfgb3qzxz57hhb093ph1a4hyczl64"; depends=[AnnotationDbi]; }; org_Mxanthus_db = derive2 { name="org.Mxanthus.db"; version="1.0.27"; sha256="1jqwsdjz1d8fwqhq26lavb2kq739ddlb8khsh4b096vhnwv3dxg5"; depends=[AnnotationDbi AnnotationHub BiocFileCache BiocStyle]; }; - org_Pt_eg_db = derive2 { name="org.Pt.eg.db"; version="3.15.0"; sha256="1dca0qxji9nfrmr8p01w9fm2fqghkmjhwfjky8y6k49k28mr3pi6"; depends=[AnnotationDbi]; }; - org_Rn_eg_db = derive2 { name="org.Rn.eg.db"; version="3.15.0"; sha256="0yx4vqax25p0cy6li2pxbmgsslxk2nbqx381vsikpiyqlzkb77p0"; depends=[AnnotationDbi]; }; - org_Sc_sgd_db = derive2 { name="org.Sc.sgd.db"; version="3.15.0"; sha256="0rhrb52qafvxjxg3b65w67x9lhcmxc1pz4svp1q549f6s75mhvmp"; depends=[AnnotationDbi]; }; - org_Ss_eg_db = derive2 { name="org.Ss.eg.db"; version="3.15.0"; sha256="0fv7y4ldyg2l1zr2csbaf8f34xz2wlr8rj86bgyn1ygra503irwm"; depends=[AnnotationDbi]; }; - org_Xl_eg_db = derive2 { name="org.Xl.eg.db"; version="3.15.0"; sha256="0kzr4mnb2mld46d81ckygqg8s9r0nxcdckixn748yw0hwvf33krg"; depends=[AnnotationDbi]; }; + org_Pt_eg_db = derive2 { name="org.Pt.eg.db"; version="3.16.0"; sha256="1jwma50lw8c0axr2hs1ij5wn26sl129gk7rcrrk2h1lh21zx48n0"; depends=[AnnotationDbi]; }; + org_Rn_eg_db = derive2 { name="org.Rn.eg.db"; version="3.16.0"; sha256="1wvnd2f9nv0bgqan63b0v40mv1y8j1jcf30hxlfx72r0isdpf4fh"; depends=[AnnotationDbi]; }; + org_Sc_sgd_db = derive2 { name="org.Sc.sgd.db"; version="3.16.0"; sha256="03b8m4p865kzhjj8zyhmc0ic0n4jyjdl4h8a8xny10b7xs6l0v9f"; depends=[AnnotationDbi]; }; + org_Ss_eg_db = derive2 { name="org.Ss.eg.db"; version="3.16.0"; sha256="1v793yxdszxg7hsj0f60qjxlflmpqjywcwmxrvizjzb9d76y6zrk"; depends=[AnnotationDbi]; }; + org_Xl_eg_db = derive2 { name="org.Xl.eg.db"; version="3.16.0"; sha256="0j2xv59d65gin2v6d2gfsly6wyj9bmjpnld75qzlc7sqapa51li6"; depends=[AnnotationDbi]; }; paeg1acdf = derive2 { name="paeg1acdf"; version="2.18.0"; sha256="127pgxxp5wp3hgmafbzdzsk4gqnllq1m1gcsfyzkvpkvmbn4aa9n"; depends=[AnnotationDbi]; }; paeg1aprobe = derive2 { name="paeg1aprobe"; version="2.18.0"; sha256="0hbyd402wf9nzy2g93nhnf2zsi9jvhgfk0llxlyfk0kqxs0y4byy"; depends=[AnnotationDbi]; }; pd_081229_hg18_promoter_medip_hx1 = derive2 { name="pd.081229.hg18.promoter.medip.hx1"; version="0.99.4"; sha256="1h4925dmw0vfsnhllg55gswq3sxfmx9rcjzifdvgs9y27399psrr"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite]; }; @@ -798,8 +795,10 @@ in with self; { phastCons100way_UCSC_hg19 = derive2 { name="phastCons100way.UCSC.hg19"; version="3.7.2"; sha256="1jmc4k4zgkx5vr2plnidnd9bidlwlb0kr7mjg60cqjw7dq7jl1fa"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; }; phastCons100way_UCSC_hg38 = derive2 { name="phastCons100way.UCSC.hg38"; version="3.7.1"; sha256="0dka39rvx4d3wbcjypcgvc19s6cnxkkfywa4irv23kpibq1sjyv0"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; }; phastCons30way_UCSC_hg38 = derive2 { name="phastCons30way.UCSC.hg38"; version="3.13.0"; sha256="0jq5z1af0f5jqazz46gvf3nnkrp91a6qzb96bk7fjdbvk5b3z0dd"; depends=[AnnotationHub GenomicScores]; }; + phastCons35way_UCSC_mm39 = derive2 { name="phastCons35way.UCSC.mm39"; version="3.16.0"; sha256="0lniqakqxja8inq3gn168w1xja1m2kbmww0cw971smsnddypmig7"; depends=[AnnotationHub GenomicScores]; }; phastCons7way_UCSC_hg38 = derive2 { name="phastCons7way.UCSC.hg38"; version="3.7.1"; sha256="105isdrb3nsy30wd8yy9vrrv8b7c8izc11xqqixg6rcriacd0rl0"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; }; - pig_db0 = derive2 { name="pig.db0"; version="3.15.0"; sha256="0rbfkbi7hmjmsb0w6qzvz70cg6g1j0zyl2bm3jckb2x80nzd0cyl"; depends=[AnnotationDbi]; }; + phyloP35way_UCSC_mm39 = derive2 { name="phyloP35way.UCSC.mm39"; version="3.16.0"; sha256="1n0iywfs23dhc54mapirvaqcbx38zjf8lknbsz80p5lxp24n2lf9"; depends=[AnnotationHub GenomicScores]; }; + pig_db0 = derive2 { name="pig.db0"; version="3.16.0"; sha256="0aj1xafsx1dg4w6mmfaaj87izgjfs8akj4dm5x7qzcmvxcd6sx7c"; depends=[AnnotationDbi]; }; plasmodiumanophelescdf = derive2 { name="plasmodiumanophelescdf"; version="2.18.0"; sha256="1vs36091djinn3g6rjhmy9xfdyi58365zbcjc9mf50adnp2i5fq9"; depends=[AnnotationDbi]; }; plasmodiumanophelesprobe = derive2 { name="plasmodiumanophelesprobe"; version="2.18.0"; sha256="03hfq51nrpmx8ihc48jiih6bk99irrgal9x7i7mgcv8xd508gcsy"; depends=[AnnotationDbi]; }; poplarcdf = derive2 { name="poplarcdf"; version="2.18.0"; sha256="0j28czs936j2wgwp63qbwl1mjcflcrx7ir88jzxkkw7411ch1gl1"; depends=[AnnotationDbi]; }; @@ -829,7 +828,7 @@ in with self; { ragene20sttranscriptcluster_db = derive2 { name="ragene20sttranscriptcluster.db"; version="8.8.0"; sha256="1bi4wy0sbhsyavxwshxvf3iqmyz26q7y2vqp1h3rjshsjdmhfd0h"; depends=[AnnotationDbi org_Rn_eg_db]; }; ragene21stprobeset_db = derive2 { name="ragene21stprobeset.db"; version="8.8.0"; sha256="1m0hd0nlav9dhqzvs5drl8q3llx2wjxdfvb24fmjnba4h769ns7k"; depends=[AnnotationDbi org_Rn_eg_db]; }; ragene21sttranscriptcluster_db = derive2 { name="ragene21sttranscriptcluster.db"; version="8.8.0"; sha256="14hp03pizq7kprwk26s9w6s27zzbs2kk50qhjbiwic1xbrl0dp8a"; depends=[AnnotationDbi org_Rn_eg_db]; }; - rat_db0 = derive2 { name="rat.db0"; version="3.15.0"; sha256="1cj6s5x7zkw642qgbbngnpym5f71p3cvi79vx0y6pd565s6hfkj1"; depends=[AnnotationDbi]; }; + rat_db0 = derive2 { name="rat.db0"; version="3.16.0"; sha256="18c7im1l50z7gzj5i9aj3h9pqvnrrazqimigp49nh6ssxlpy51rc"; depends=[AnnotationDbi]; }; rat2302_db = derive2 { name="rat2302.db"; version="3.13.0"; sha256="1k2qm1rpq3xkj52m3n629r4qcqi2azdssb2i5shj9jdaqkmr43qc"; depends=[AnnotationDbi org_Rn_eg_db]; }; rat2302cdf = derive2 { name="rat2302cdf"; version="2.18.0"; sha256="1748rc6yypd7y8wgr1qg632pcsxx0fkxjz6b3z4fhblgdllhy9wk"; depends=[AnnotationDbi]; }; rat2302frmavecs = derive2 { name="rat2302frmavecs"; version="0.99.11"; sha256="0qy5hf86lrkn20yg6d46kcw9fjc0qhsbzbyavaj1v2zl34xvr1ii"; depends=[affy frma]; }; @@ -837,7 +836,7 @@ in with self; { ratCHRLOC = derive2 { name="ratCHRLOC"; version="2.1.6"; sha256="0mgk6lwvvdwjzjh4r1q1q6nfnx4vqx9iy6gmbrb9f31jf30hqnsb"; depends=[]; }; rattoxfxcdf = derive2 { name="rattoxfxcdf"; version="2.18.0"; sha256="0q84lfaxnnj2zbm5q8xswa1md15fjj4i0djnqr835ixzn7px4yqn"; depends=[AnnotationDbi]; }; rattoxfxprobe = derive2 { name="rattoxfxprobe"; version="2.18.0"; sha256="1kp159553rkcn9yh6x3yph3yjz2ja21wi9j5ax03qnhwlsl1x8ik"; depends=[AnnotationDbi]; }; - reactome_db = derive2 { name="reactome.db"; version="1.81.0"; sha256="0rfrk0akjngha6zs6dnh4wa9jl0l9dknrmwhbag9gbc9h5pl7i4g"; depends=[AnnotationDbi]; }; + reactome_db = derive2 { name="reactome.db"; version="1.82.0"; sha256="0l6k7jy0gz8wsv69apw4nk6lbr0ppbfpyjppk81hqn22pzi17w42"; depends=[AnnotationDbi]; }; rgu34a_db = derive2 { name="rgu34a.db"; version="3.13.0"; sha256="1nl28gia0zh8xkfv8llxiysxk1k1gm6cs2wvl0n1xqhnr0rhla76"; depends=[AnnotationDbi org_Rn_eg_db]; }; rgu34acdf = derive2 { name="rgu34acdf"; version="2.18.0"; sha256="08z9f16xp1m2mwl9vlmbffxl4zyyl8cgzf6wp66rrm32lvl0nbwq"; depends=[AnnotationDbi]; }; rgu34aprobe = derive2 { name="rgu34aprobe"; version="2.18.0"; sha256="1gjxyq9128jgv3ic386f84rajgf3wz7yi2dja80y0ff4m0a48dlh"; depends=[AnnotationDbi]; }; @@ -851,7 +850,7 @@ in with self; { rgug4105a_db = derive2 { name="rgug4105a.db"; version="3.2.3"; sha256="0lq8k95qm0q7j65nf16p3f09dn9zs87n3k561wxrgi2lb0pf6j40"; depends=[AnnotationDbi org_Rn_eg_db]; }; rgug4130a_db = derive2 { name="rgug4130a.db"; version="3.2.3"; sha256="0zlcn9spw23bj3px9z1l2f5afn09zbr6rv0nbd2h6dd12wrvy1zk"; depends=[AnnotationDbi org_Rn_eg_db]; }; rgug4131a_db = derive2 { name="rgug4131a.db"; version="3.2.3"; sha256="1r272jf9cflf1yf4bznp4d59h7bd7adh1i3rf890h5ffc0xzf5cq"; depends=[AnnotationDbi org_Rn_eg_db]; }; - rhesus_db0 = derive2 { name="rhesus.db0"; version="3.15.0"; sha256="0iqn7cad6rhlkbyhw8ldc85z9fzs28hybb80pc6j7p0a6k3va6ny"; depends=[AnnotationDbi]; }; + rhesus_db0 = derive2 { name="rhesus.db0"; version="3.16.0"; sha256="0zz6aarirvd31x6cnya097ckjvww3g5wx135wg4041f33cqisq55"; depends=[AnnotationDbi]; }; rhesuscdf = derive2 { name="rhesuscdf"; version="2.18.0"; sha256="0q2alkxm80wkzaf0q80df27q30qkswybavz05x6ywsihbs9h0nb8"; depends=[AnnotationDbi]; }; rhesusprobe = derive2 { name="rhesusprobe"; version="2.18.0"; sha256="0fd8pvwvpcmx41k80nbccjxllh39fvjf7l9dr8facisl1x7gsfil"; depends=[AnnotationDbi]; }; ri16cod_db = derive2 { name="ri16cod.db"; version="3.4.0"; sha256="1xz533vxjdyxx1wkks0kgk6b90sxs44iqcsvyds0xcm573bx8c6q"; depends=[AnnotationDbi org_Rn_eg_db]; }; @@ -873,8 +872,8 @@ in with self; { soybeanprobe = derive2 { name="soybeanprobe"; version="2.18.0"; sha256="06dpwqad7q3wyq0bsgpwkw8kx1gq5fy1s1lw632xrvgcid2fsmf8"; depends=[AnnotationDbi]; }; sugarcanecdf = derive2 { name="sugarcanecdf"; version="2.18.0"; sha256="0wghc6wr7iwkql63m3wibjjdcdpqd53z0g5rxdh553sjb0ca2n7z"; depends=[AnnotationDbi]; }; sugarcaneprobe = derive2 { name="sugarcaneprobe"; version="2.18.0"; sha256="17zrydd8xd7m61bp750xlpcak0m3zgl0mvknz9s7mv2a35kp02ih"; depends=[AnnotationDbi]; }; - synaptome_data = derive2 { name="synaptome.data"; version="0.99.3"; sha256="08j7arr8lhm17ikhxxg6f8vx45ixchvh33f2wla2486dvd160pw4"; depends=[AnnotationHub]; }; - synaptome_db = derive2 { name="synaptome.db"; version="0.99.8"; sha256="0g7pah9q1ci0ykm1lf3gdssfxmc33qkc5y428wdb8fzirqh5csx4"; depends=[AnnotationHub DBI dbplyr dplyr igraph Rdpack RSQLite synaptome_data]; }; + synaptome_data = derive2 { name="synaptome.data"; version="0.99.6"; sha256="00cqgx06wysz0qyicwnxlc8hpqkj5rwqlyfzsvy7agvcjjkarwg5"; depends=[AnnotationHub]; }; + synaptome_db = derive2 { name="synaptome.db"; version="0.99.12"; sha256="1f63s54kn78bxrhp1aidghaicymd39p3bgpnxkz9lkby50xcfwyl"; depends=[AnnotationHub DBI dbplyr dplyr igraph Rdpack RSQLite synaptome_data]; }; targetscan_Hs_eg_db = derive2 { name="targetscan.Hs.eg.db"; version="0.6.1"; sha256="1p14jyhn1d2m6kww9vsb96263g8crnrff7qgyiz46pp9ww8mvxf4"; depends=[AnnotationDbi]; }; targetscan_Mm_eg_db = derive2 { name="targetscan.Mm.eg.db"; version="0.6.1"; sha256="0ad6vxpwn9x82qcrpwcy1lwg0q3ik4vabxn01k6gwmbpvydz9cf5"; depends=[AnnotationDbi]; }; test1cdf = derive2 { name="test1cdf"; version="2.18.0"; sha256="0nmkrp4b2p09pg8ndcnfv5y7w94xah6fa5pff60dp1s2s8dcgcr4"; depends=[AnnotationDbi]; }; @@ -891,8 +890,8 @@ in with self; { vitisviniferaprobe = derive2 { name="vitisviniferaprobe"; version="2.18.0"; sha256="1ggz1s37dwvrkhj4vx2civyhap7bgqsshy33lk14z4fjsayfi39a"; depends=[AnnotationDbi]; }; wheatcdf = derive2 { name="wheatcdf"; version="2.18.0"; sha256="1gmbrdilqvm54h6nkb1cm01ki8aipiywd4qj8gpwlm2hqrimr8kr"; depends=[AnnotationDbi]; }; wheatprobe = derive2 { name="wheatprobe"; version="2.18.0"; sha256="1fifi3pvzdrg356idwz0kx7qlf5mssdxlyvwpn3cjgw0z7n7cnw8"; depends=[AnnotationDbi]; }; - worm_db0 = derive2 { name="worm.db0"; version="3.15.0"; sha256="0xv5b7mblx25rqm2g018jdch05c0djq83sa764ck4ps8nzk4yzws"; depends=[AnnotationDbi]; }; - xenopus_db0 = derive2 { name="xenopus.db0"; version="3.15.0"; sha256="1crz6wyz7aczpy7xfl4yh1l34lv0ldvqb64qd0mnclsvx1222mm1"; depends=[AnnotationDbi]; }; + worm_db0 = derive2 { name="worm.db0"; version="3.16.0"; sha256="06wn3nw6614awmf7z7r2kq02347bbmpq8ydzbpsrfniq14jly6m4"; depends=[AnnotationDbi]; }; + xenopus_db0 = derive2 { name="xenopus.db0"; version="3.16.0"; sha256="146zg2x69m3hzyqbjzadilaqskzfxvjblw0c4pjgv6akf3vi3xn3"; depends=[AnnotationDbi]; }; xenopuslaeviscdf = derive2 { name="xenopuslaeviscdf"; version="2.18.0"; sha256="1bcz1hr7gxw6ac4qvw0giph6hfcf5i9b11s274ypq512qc1d32iq"; depends=[AnnotationDbi]; }; xenopuslaevisprobe = derive2 { name="xenopuslaevisprobe"; version="2.18.0"; sha256="0prb14zn2gvgxq8w0y21x1ng51cn3bgjhkppf7zkmnq1xkzvq0pw"; depends=[AnnotationDbi]; }; xlaevis_db = derive2 { name="xlaevis.db"; version="3.2.3"; sha256="0cdi71c8pflb8n4yfxc0wmfi51w6z0dlz7nw5hv0hkx547v79d53"; depends=[AnnotationDbi org_Xl_eg_db]; }; @@ -904,7 +903,7 @@ in with self; { ye6100subbcdf = derive2 { name="ye6100subbcdf"; version="2.18.0"; sha256="1169hv56981b915rlr5w5sn6ppyjd8as7f4k1hbjzadrdrl3glwp"; depends=[AnnotationDbi]; }; ye6100subccdf = derive2 { name="ye6100subccdf"; version="2.18.0"; sha256="0mhr4zd33gfvvivc17k7fb6nvmhq6h3q0xbx2zl09zd6qk09kizm"; depends=[AnnotationDbi]; }; ye6100subdcdf = derive2 { name="ye6100subdcdf"; version="2.18.0"; sha256="11b1fflgc34lrj4yf1p7way5n83cm9c7znsbxpzlwddwyy8qib30"; depends=[AnnotationDbi]; }; - yeast_db0 = derive2 { name="yeast.db0"; version="3.15.0"; sha256="0k3fp0zxyybgy0dp4i4kckdrcbmx22fgfw11qj97m9vcy3l0rvvj"; depends=[AnnotationDbi]; }; + yeast_db0 = derive2 { name="yeast.db0"; version="3.16.0"; sha256="0ibc6lzax4f3ym049s3cgg0fqhab7vlnk3xs2javvnx2vmizsi54"; depends=[AnnotationDbi]; }; yeast2_db = derive2 { name="yeast2.db"; version="3.13.0"; sha256="0aqbs3p6f3sc6nyggyk7gvg191b551rwq20009fnk0li50dg1ps6"; depends=[AnnotationDbi org_Sc_sgd_db]; }; yeast2cdf = derive2 { name="yeast2cdf"; version="2.18.0"; sha256="0c68val9x8bfnv4xx0vag9dxwsx5q8dzbj0dpha3nshh12jw48w9"; depends=[AnnotationDbi]; }; yeast2probe = derive2 { name="yeast2probe"; version="2.18.0"; sha256="125nif693qcmxc0nnnz917f9avggcdr8g9rfvx2qdc54a2l7vdb7"; depends=[AnnotationDbi]; }; @@ -913,7 +912,7 @@ in with self; { ygs98frmavecs = derive2 { name="ygs98frmavecs"; version="1.3.0"; sha256="1xrm1209xnknwvad7nvg1a0mbxz15z12yd4x5bia3cq03zcmzf9m"; depends=[]; }; ygs98probe = derive2 { name="ygs98probe"; version="2.18.0"; sha256="0awf6z4j2vb2jk9a9j2r512yd3m31660y68pasa9mp488m270a3q"; depends=[AnnotationDbi]; }; zebrafish_db = derive2 { name="zebrafish.db"; version="3.13.0"; sha256="13a65jxr3r5qjf82h1dr0k9qq20g14canqgqdd11k9gk5h31xhc7"; depends=[AnnotationDbi org_Dr_eg_db]; }; - zebrafish_db0 = derive2 { name="zebrafish.db0"; version="3.15.0"; sha256="15ysjz7x935aadapwnlgg57rwiwgs49wlcaak348w6x4rbk7sldz"; depends=[AnnotationDbi]; }; + zebrafish_db0 = derive2 { name="zebrafish.db0"; version="3.16.0"; sha256="186z99zsw023wq8l94l781lh7szrx72bxkg1f0ldq0lz5j3k99cn"; depends=[AnnotationDbi]; }; zebrafishcdf = derive2 { name="zebrafishcdf"; version="2.18.0"; sha256="0sq1xqhblbilvaiabhqyl9gxdj3jg576vgq8v0cls1zvvx0isrx0"; depends=[AnnotationDbi]; }; zebrafishprobe = derive2 { name="zebrafishprobe"; version="2.18.0"; sha256="1pb8z2rdhq11hq391xyi236scyafbp56kbhhwsnha36yygz5drw0"; depends=[AnnotationDbi]; }; LRBase_Ath_eg_db = derive2 { name="LRBase.Ath.eg.db"; version="2.0.1"; sha256="1f9yp9rfaydzz24bhl795379clcinibi4kavxzzavrvqfvkrgw84"; depends=[LRBaseDbi RSQLite]; broken = true; }; @@ -1003,6 +1002,12 @@ in with self; { MeSH_Xtr_eg_db = derive2 { name="MeSH.Xtr.eg.db"; version="1.15.1"; sha256="19waylyzyga4zqygar6509gq36a8z36fbpz55msb0zsin24s0y82"; depends=[MeSHDbi]; broken = true; }; MeSH_Zma_eg_db = derive2 { name="MeSH.Zma.eg.db"; version="1.15.1"; sha256="0plldymwirg8hyj9yv5jw4ldrlnvf5dx60gymb8rgmmxvrmhay66"; depends=[MeSHDbi]; broken = true; }; MeSH_db = derive2 { name="MeSH.db"; version="1.15.1"; sha256="0ixlxcakcc9f6d3dzxfdda4nh5gnivqvbi9dw7c85c0145dgnpzx"; depends=[MeSHDbi]; broken = true; }; + SNPlocs_Hsapiens_dbSNP_20101109 = derive2 { name="SNPlocs.Hsapiens.dbSNP.20101109"; version="0.99.9"; sha256="1qxsaq2wai1rqbidz005frjw8r8m2ia9cd87ziw8i66a798rzima"; depends=[GenomicRanges IRanges S4Vectors]; broken = true; }; + SNPlocs_Hsapiens_dbSNP_20120608 = derive2 { name="SNPlocs.Hsapiens.dbSNP.20120608"; version="0.99.13"; sha256="123n3rwkq8c8gqwhbwpsvis2x1xp137hchg9y7sv7l1givb6n2kf"; depends=[BSgenome GenomicRanges IRanges]; broken = true; }; + SNPlocs_Hsapiens_dbSNP141_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP141.GRCh38"; version="0.99.12"; sha256="1hfqbf03jd2r7ybb19rl3czrjb4h4vjqlrrilfqc8yymy7myvqqb"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; broken = true; }; + SNPlocs_Hsapiens_dbSNP142_GRCh37 = derive2 { name="SNPlocs.Hsapiens.dbSNP142.GRCh37"; version="0.99.6"; sha256="17ql8fsali09dx1vv9178ya7zx901vwq4bnjrs35fjrjdvx6yvfd"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges]; broken = true; }; + SNPlocs_Hsapiens_dbSNP151_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP151.GRCh38"; version="0.99.21"; sha256="19j5h0dgxd2iw35p6fblj8b3z2d92zmmp60khw5zs70scd5fs9pb"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; broken = true; }; + XtraSNPlocs_Hsapiens_dbSNP141_GRCh38 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP141.GRCh38"; version="0.99.13"; sha256="1fidmrf0xr7wwd4v1y7x2wwyplplbs1z8jqpfdjpc8aclcy38m3f"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; broken = true; }; greengenes13_5MgDb = derive2 { name="greengenes13.5MgDb"; version="2.0.0"; sha256="0j4pd653vlfpd9gq6gi459lra8xhyknjrzadkx9d3zjy0hcwpj7r"; depends=[]; broken = true; }; org_Pf_plasmo_db = derive2 { name="org.Pf.plasmo.db"; version="3.14.0"; sha256="1fs68n9xyia6v9jj8a91asmrirnh2xkqcgrjbzk7x6ss0rlwcl7w"; depends=[AnnotationDbi]; broken = true; }; ribosomaldatabaseproject11_5MgDb = derive2 { name="ribosomaldatabaseproject11.5MgDb"; version="1.00.0"; sha256="04ppa4k8p54bmkq3jm41h0v4lb5hz95cmnakfzmqfml00ir04mxp"; depends=[]; broken = true; }; diff --git a/pkgs/development/r-modules/bioc-experiment-packages.nix b/pkgs/development/r-modules/bioc-experiment-packages.nix index 71184527f286..1888fb3ecfb8 100644 --- a/pkgs/development/r-modules/bioc-experiment-packages.nix +++ b/pkgs/development/r-modules/bioc-experiment-packages.nix @@ -4,420 +4,429 @@ # Rscript generate-r-packages.R bioc-experiment >new && mv new bioc-experiment-packages.nix { self, derive }: -let derive2 = derive { biocVersion = "3.15"; }; +let derive2 = derive { biocVersion = "3.16"; }; in with self; { - ALL = derive2 { name="ALL"; version="1.38.0"; sha256="0410045x327wmfkksshd8yishw4yxij08vn8p65cdj7hb3qy3p0z"; depends=[Biobase]; }; - ALLMLL = derive2 { name="ALLMLL"; version="1.36.0"; sha256="01dkfq412p6chbv0z9fqhizmjravrq7lgbl94zfhxx3rr2r94gvg"; depends=[affy]; }; - ARRmData = derive2 { name="ARRmData"; version="1.32.0"; sha256="1cjzr58426s9z2bwjz3wzlkh52fv0q85cw4gbjnhwakh9sr3dd5p"; depends=[]; }; - ASICSdata = derive2 { name="ASICSdata"; version="1.16.0"; sha256="0y2n8g7sxh3sygvslk9z4pcac55c2fa1cplrg3hi1m1w315wrkvv"; depends=[]; }; - Affyhgu133A2Expr = derive2 { name="Affyhgu133A2Expr"; version="1.32.0"; sha256="06dq8930jjhw4hqzqwh5vyqaacg1dm6v4v20ilz82ynsa616mhf7"; depends=[]; }; - Affyhgu133Plus2Expr = derive2 { name="Affyhgu133Plus2Expr"; version="1.30.0"; sha256="1hvjlv3qza7cggfc764blw51aa2vghqbkyr7vhc2zipwvx924ig3"; depends=[]; }; - Affyhgu133aExpr = derive2 { name="Affyhgu133aExpr"; version="1.34.0"; sha256="1mzfzaphd42h6rcwawj521643blwp1qdimmx1k6nxjfzm4igwdvf"; depends=[]; }; - AffymetrixDataTestFiles = derive2 { name="AffymetrixDataTestFiles"; version="0.34.0"; sha256="1sfxmhlhg26ksrl12crvbfn8c3q9h5n93vg3rw5m3q7bxss4ag1j"; depends=[]; }; - Affymoe4302Expr = derive2 { name="Affymoe4302Expr"; version="1.34.0"; sha256="0hw0xrx12aa0a8l2mqshpd364acb98qani4m6mzgp419rl0bdw70"; depends=[]; }; - AmpAffyExample = derive2 { name="AmpAffyExample"; version="1.36.0"; sha256="1k3z11wg44xrpm14lcvhbcgndz79b6i8dqld3n4xg0m5ivc11qrl"; depends=[affy]; }; - AneuFinderData = derive2 { name="AneuFinderData"; version="1.24.0"; sha256="0cncb8km0sc2xh95rgnnm38kys5ml0n8gh8cl6x7ls1xh9sm83f7"; depends=[]; }; - AshkenazimSonChr21 = derive2 { name="AshkenazimSonChr21"; version="1.26.0"; sha256="11rxr1wapfyif7wn6x0zjc6c470fmkhbpcjssfrmkisxrlq84xdf"; depends=[]; }; - AssessORFData = derive2 { name="AssessORFData"; version="1.14.0"; sha256="1pgwrcixr0si0977svyavls79fw7dh5fh9i4ywnqb5rziadmjcmq"; depends=[DECIPHER]; }; - BeadArrayUseCases = derive2 { name="BeadArrayUseCases"; version="1.34.0"; sha256="0ckgm24nxq1sk54acqj49f7wi54zaipav85yzgjr72slp5rkzvmp"; depends=[beadarray GEOquery limma]; }; - BeadSorted_Saliva_EPIC = derive2 { name="BeadSorted.Saliva.EPIC"; version="1.4.0"; sha256="17r22xnw8kq6v2nlgjibqpl927wz0y1pxqb42grqmz8dvhhxig76"; depends=[ExperimentHub minfi]; }; - BioImageDbs = derive2 { name="BioImageDbs"; version="1.4.0"; sha256="0khlz0vzymschk3bz1i2v4qj08b12qb9p3gbz86fxrcydd10084j"; depends=[animation AnnotationHub EBImage einsum ExperimentHub filesstrings magick magrittr markdown rmarkdown]; }; - BloodCancerMultiOmics2017 = derive2 { name="BloodCancerMultiOmics2017"; version="1.16.0"; sha256="1nj30nw545wlr710phay3jd3gd3pssx5pisyap8mall9953zzr4p"; depends=[beeswarm Biobase DESeq2 devtools dplyr ggdendro ggplot2 glmnet gtable ipflasso RColorBrewer reshape2 scales SummarizedExperiment survival tibble]; }; - CCl4 = derive2 { name="CCl4"; version="1.34.0"; sha256="00hdpa4s8n3kx6nqsmja9x7qwwwx6awjv1spa2gfkyrrj3lgzdfg"; depends=[Biobase limma]; }; - CLL = derive2 { name="CLL"; version="1.36.0"; sha256="1g3m90j86518wq4g4bd535pi3i8wylffcwvq1p0kr1jm7hfwshmn"; depends=[affy Biobase]; }; - CLLmethylation = derive2 { name="CLLmethylation"; version="1.16.0"; sha256="1nchppd564cj61lzbjl89m8jdx336f1iszq5giybjhnywvqdz0p1"; depends=[ExperimentHub SummarizedExperiment]; }; - COHCAPanno = derive2 { name="COHCAPanno"; version="1.32.0"; sha256="0r29krcwsfvyp3acx6slfv1909xh04izjdbbxhn032h02ahk2wxr"; depends=[]; }; - CONFESSdata = derive2 { name="CONFESSdata"; version="1.24.0"; sha256="1cd86s4n9k3fmzaxw7cda3x0hxxr4yk15v9wadn6gncqia5qflix"; depends=[]; }; - COPDSexualDimorphism_data = derive2 { name="COPDSexualDimorphism.data"; version="1.32.0"; sha256="1kvza4sf3wlylq7x6v5rv8bz46q2bm9dd49xy3a3yw7kjfby1h9x"; depends=[]; }; - COSMIC_67 = derive2 { name="COSMIC.67"; version="1.32.0"; sha256="14gwl2j6sgfwrvzlccfjnvrlwqzjrxh7fdphs89ij57nkc750bkk"; depends=[GenomicRanges SummarizedExperiment VariantAnnotation]; }; - CRCL18 = derive2 { name="CRCL18"; version="1.16.0"; sha256="1nph7k01d0gvgh62rk5m0p8g6clii6rihlwxa8j57sakpf19a3ap"; depends=[Biobase]; }; - CardinalWorkflows = derive2 { name="CardinalWorkflows"; version="1.28.0"; sha256="0wcrsbbr5a8sh5hvagdl3jhfxy22p2dslfnzp21pxj65fj33ij2y"; depends=[Cardinal]; }; - CellMapperData = derive2 { name="CellMapperData"; version="1.22.0"; sha256="0nyik0vjm8a3mj6589civly48504a1f2a9nxn2inbfw011plg7hf"; depends=[CellMapper ExperimentHub]; }; - ChAMPdata = derive2 { name="ChAMPdata"; version="2.28.0"; sha256="1fvr7drdfzw4jwp7lilspy2mv751828a5w53y0s1f1i347vplw0s"; depends=[BiocGenerics GenomicRanges]; }; - ChIC_data = derive2 { name="ChIC.data"; version="1.16.0"; sha256="16ac969qqhpca0qlff36g85rw1m25jk5qbs30i561yznn82bk2q0"; depends=[caret genomeIntervals randomForest]; }; - ChIPXpressData = derive2 { name="ChIPXpressData"; version="1.34.0"; sha256="09v30pxs1nqq53294mzc0vajxxymv6168fixz3gsspb3aq3xnfy2"; depends=[bigmemory]; }; - ChIPexoQualExample = derive2 { name="ChIPexoQualExample"; version="1.20.0"; sha256="153nbfwwhn888ribapy1xh2lii0mzs9f1hczph9f4iaykyk5i9di"; depends=[]; }; - ChimpHumanBrainData = derive2 { name="ChimpHumanBrainData"; version="1.34.0"; sha256="107glwdm8pjyzvb13x75qa826xbpl4x0c8k33ych54ji1gd3qmyg"; depends=[affy hexbin limma qvalue statmod]; }; - CluMSIDdata = derive2 { name="CluMSIDdata"; version="1.12.0"; sha256="1dkz0xl9nn620mbin88yxk2vs312vpayp95i0ci5qnpifnwv63wk"; depends=[]; }; - ConnectivityMap = derive2 { name="ConnectivityMap"; version="1.32.0"; sha256="1lfp54kics0lkdhwyr78fdpwhyf3ziw9hq2mf648a0dinrd8m9k3"; depends=[]; }; - CopyNeutralIMA = derive2 { name="CopyNeutralIMA"; version="1.14.0"; sha256="0xvj4z8vh2sv3gl5nkrkmjdvvallixdf0dyqbnpg7q03kfvbnw44"; depends=[ExperimentHub Rdpack]; }; - CopyhelpeR = derive2 { name="CopyhelpeR"; version="1.28.0"; sha256="0klrnxck0q14birnpwzkiwmj77hwdn6gazvdg0lqn9y6j5mbkyx1"; depends=[]; }; - DAPARdata = derive2 { name="DAPARdata"; version="1.26.5"; sha256="0jyvz7pcnxl7vc0b6rnwcc19pwijk6h26s364jskwvxk051ribsw"; depends=[MSnbase]; }; - DExMAdata = derive2 { name="DExMAdata"; version="1.4.0"; sha256="1bdc40cyfkwk3y5ab8qnql0g2k5cz025fh4n6bisil3372jick53"; depends=[Biobase]; }; - DLBCL = derive2 { name="DLBCL"; version="1.36.0"; sha256="1s9j6ssxhbb5vcik7rdkfkm1y9la1g3ys91xdfyc6hpxmzxckgvk"; depends=[Biobase]; }; - DMRcatedata = derive2 { name="DMRcatedata"; version="2.14.0"; sha256="0abmnnawn06m4dyh6hs5hcdlhwx5l5bmlygzizcy6968d9x5l4w9"; depends=[ExperimentHub GenomicFeatures Gviz IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylationEPICanno_ilm10b4_hg19 plyr readxl rtracklayer]; }; - DREAM4 = derive2 { name="DREAM4"; version="1.31.0"; sha256="11ypc84agvq0q0v7bk0b25cm48awxay5hhhjd95gw9s7jk196i2p"; depends=[SummarizedExperiment]; }; - DeSousa2013 = derive2 { name="DeSousa2013"; version="1.32.0"; sha256="1dx3568szd4i26jpl8i0klqqh0qgi8mgh5i4mmmkxwp44p10igzg"; depends=[affy AnnotationDbi Biobase cluster ConsensusClusterPlus frma frmaTools gplots hgu133plus2_db hgu133plus2frmavecs pamr rgl ROCR siggenes survival sva]; }; - DmelSGI = derive2 { name="DmelSGI"; version="1.28.1"; sha256="0644cwq481n5wk49q52jjwg3bkg2hpz6bcw8hf5y5v9vl2dsnwip"; depends=[abind gplots igraph knitr limma rhdf5 TSP]; }; - DonaPLLP2013 = derive2 { name="DonaPLLP2013"; version="1.34.0"; sha256="088w2c7xyz6zsymwsm4s5999q6sry0xscrs9n8sv6qzqhpfisa5p"; depends=[EBImage]; }; - DropletTestFiles = derive2 { name="DropletTestFiles"; version="1.6.0"; sha256="0lwcfprv17p9ng5x3arr9j67234y003n5g45aqcc39qiz075y8rv"; depends=[AnnotationHub ExperimentHub S4Vectors]; }; - DrugVsDiseasedata = derive2 { name="DrugVsDiseasedata"; version="1.32.0"; sha256="0l4n4wfd24l0lx07b5x947ngp4wyyw2iajgyam4h9n99k8cjkmnl"; depends=[]; }; - DuoClustering2018 = derive2 { name="DuoClustering2018"; version="1.14.0"; sha256="055hjyd29rjw1zh5vq0r4pqiryrjzay6fpslb7lwkp5g7xyav25w"; depends=[dplyr ExperimentHub ggplot2 ggthemes magrittr mclust purrr reshape2 tidyr viridis]; }; - DvDdata = derive2 { name="DvDdata"; version="1.32.0"; sha256="115j17lkcr33phqx6ps90wj7jljzbf6cnah77ambzk1grfniw0hy"; depends=[]; }; - EGSEAdata = derive2 { name="EGSEAdata"; version="1.24.0"; sha256="08jhv4sq8wkwfv9klv6amf8shdm95qg9a5wl1pbxkp3bd326l1hj"; depends=[]; }; - ELMER_data = derive2 { name="ELMER.data"; version="2.20.0"; sha256="0ifnlf0fk901spsqpm8gqy8d3fizb3axff1hf7wa809n5mqzhpvf"; depends=[GenomicRanges]; }; - EatonEtAlChIPseq = derive2 { name="EatonEtAlChIPseq"; version="0.34.0"; sha256="1p7cnp2nx0ar1gimwwsnw7brnlrj7gnpmv687wv16vmab5nnk1bx"; depends=[GenomicRanges rtracklayer ShortRead]; }; - FANTOM3and4CAGE = derive2 { name="FANTOM3and4CAGE"; version="1.32.0"; sha256="0kg8d3npjkvpa915n3m9v8q4im4z47npgwj66xr7jjxy0fjrigg1"; depends=[]; }; - FIs = derive2 { name="FIs"; version="1.24.0"; sha256="1vmzfy33b11ac4zhc8b02ksfhnqc7ypzhb0nrgab4gd0d0mylvs1"; depends=[]; }; - FieldEffectCrc = derive2 { name="FieldEffectCrc"; version="1.6.0"; sha256="0h0rh24cqh8s607wk7aaf4znzhxh88dx839mxp61glqrjhhpkp8y"; depends=[AnnotationHub BiocStyle DESeq2 ExperimentHub RUnit SummarizedExperiment]; }; - Fletcher2013a = derive2 { name="Fletcher2013a"; version="1.32.0"; sha256="11hfy58hnvaarsrgvqrz51y25sdach67qksfc51id45nqr5za345"; depends=[Biobase gplots limma VennDiagram]; }; - Fletcher2013b = derive2 { name="Fletcher2013b"; version="1.32.0"; sha256="18qr6wvvarvjzrknlyfvpdwpzw4gqwfjawaxpyhhp3yhx3n6vyxq"; depends=[Fletcher2013a igraph RColorBrewer RedeR RTN]; }; - FlowSorted_Blood_450k = derive2 { name="FlowSorted.Blood.450k"; version="1.34.0"; sha256="17i096gjbsl7zgy2i3nh2nl4gdly7pkn151m0bn120cd4381r3nv"; depends=[minfi]; }; - FlowSorted_Blood_EPIC = derive2 { name="FlowSorted.Blood.EPIC"; version="2.0.0"; sha256="1wqpibrfjzrpi2mzij9kjq74z3mi08dmfd9j7jviwq7c1hskycj4"; depends=[AnnotationHub ExperimentHub genefilter minfi nlme quadprog S4Vectors SummarizedExperiment]; }; - FlowSorted_CordBlood_450k = derive2 { name="FlowSorted.CordBlood.450k"; version="1.24.0"; sha256="0f2vm1qf9irqk7xj0fdkvaigxpv2srni187378g6zbm93srrzs9d"; depends=[minfi]; }; - FlowSorted_CordBloodCombined_450k = derive2 { name="FlowSorted.CordBloodCombined.450k"; version="1.12.0"; sha256="1pf01g7pi37rrqgqan8zq8v0q3h27p2djff3f5zqrfn3d02if4lv"; depends=[AnnotationHub ExperimentHub IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylationEPICanno_ilm10b4_hg19 minfi SummarizedExperiment]; }; - FlowSorted_CordBloodNorway_450k = derive2 { name="FlowSorted.CordBloodNorway.450k"; version="1.22.0"; sha256="0kk416rfl2sgx6xfnja32jx2yjixnm306kj1h7vg3xnfy843gzin"; depends=[minfi]; }; - FlowSorted_DLPFC_450k = derive2 { name="FlowSorted.DLPFC.450k"; version="1.32.0"; sha256="0s5a1lsjpwibqaz1ghwlk1my5fz11kqhymb7j42c3jx6sc3ka6g5"; depends=[minfi]; }; - GIGSEAdata = derive2 { name="GIGSEAdata"; version="1.14.0"; sha256="1lkbgyb8camaay0yjkvhl946dmashzkraax7janqprhdjmhphv5h"; depends=[]; }; - GSBenchMark = derive2 { name="GSBenchMark"; version="1.16.0"; sha256="0j8sjp999ri7zj9xyfm5cfyggikp5ihyblqbcy16rzi02lz7ns99"; depends=[]; }; - GSE103322 = derive2 { name="GSE103322"; version="1.2.0"; sha256="0h84bf69kvqrvyp2syf3vjs8avmrjsgv3gfm2ib5wxnrgfxn6czq"; depends=[Biobase GEOquery]; }; - GSE13015 = derive2 { name="GSE13015"; version="1.4.0"; sha256="08wrw8h81mn5cg29ry11mchxl51h9nnfdxn9yjf8ivcjhklcy14f"; depends=[Biobase GEOquery preprocessCore SummarizedExperiment]; }; - GSE159526 = derive2 { name="GSE159526"; version="1.2.0"; sha256="18i9dgvhvzjcnx63qchd6004yinqj8mzxm8yk3dcgcgb2r082f04"; depends=[]; }; - GSE62944 = derive2 { name="GSE62944"; version="1.24.0"; sha256="029fpng282x99yapi70zxlkqbh2xy6l0b4plmf2hsakg45ybg693"; depends=[Biobase GEOquery]; }; - GSVAdata = derive2 { name="GSVAdata"; version="1.32.0"; sha256="1mgjy2pg9j4zr8jacfj7h6q4c62s9mmg3dbkkirwq4gki9i5hdi0"; depends=[Biobase GSEABase hgu95a_db]; }; - GWASdata = derive2 { name="GWASdata"; version="1.34.0"; sha256="0ii9gc17hjx1gw06q63s0gykvch673rxa7czda76dvj0qvcpx5v0"; depends=[GWASTools]; }; - GenomicDistributionsData = derive2 { name="GenomicDistributionsData"; version="1.4.0"; sha256="1asclqpk9ixbf147n246246f3ciw9qsyq1i0v0xgd1nbzbqn12pn"; depends=[AnnotationFilter AnnotationHub BSgenome data_table ensembldb ExperimentHub GenomeInfoDb GenomicFeatures GenomicRanges]; }; - GeuvadisTranscriptExpr = derive2 { name="GeuvadisTranscriptExpr"; version="1.24.0"; sha256="1032lyisc5gzzsnzdahb9mz03pi7z103n8vyfjpzrri8jhrbbaya"; depends=[]; }; - HCAData = derive2 { name="HCAData"; version="1.12.0"; sha256="0dqi06mwa7ss1z28pic8kr1v85njqv596z0ik3g5qfjjfvc0h2za"; depends=[AnnotationHub ExperimentHub HDF5Array SingleCellExperiment]; }; - HD2013SGI = derive2 { name="HD2013SGI"; version="1.36.0"; sha256="1wbf00bvd6rpszzfwplk6q7b5v7ih2jdjbcncg9php2ji76ij58w"; depends=[EBImage geneplotter gplots limma LSD RColorBrewer splots vcd]; }; - HDCytoData = derive2 { name="HDCytoData"; version="1.16.0"; sha256="1vdk7r7v3vvj6lils4a30sys5507qnlmdk775bl4grv16j9lf2pb"; depends=[ExperimentHub flowCore SummarizedExperiment]; }; - HEEBOdata = derive2 { name="HEEBOdata"; version="1.34.0"; sha256="02mjs27ypk2gfa5rvgclb143a1hl3cciddcm5wmg90666q85bm2z"; depends=[]; }; - HIVcDNAvantWout03 = derive2 { name="HIVcDNAvantWout03"; version="1.36.0"; sha256="1hqljpiing2gzkizqrdv4wh3w0gwp6m9zs9y68sqhdr4f9w7azn6"; depends=[]; }; - HMP16SData = derive2 { name="HMP16SData"; version="1.16.0"; sha256="1s9h638wawm15gmqrgarxxhmwbvaq86i36s81knbzamhrw95gbgq"; depends=[AnnotationHub assertthat dplyr ExperimentHub kableExtra knitr magrittr readr S4Vectors stringr SummarizedExperiment tibble]; }; - HMP2Data = derive2 { name="HMP2Data"; version="1.10.0"; sha256="0pnrhx1x3wlxjq42igcdzdw4zgqb89gh666f7l48msqx2gk2lhly"; depends=[AnnotationHub assertthat data_table dplyr ExperimentHub kableExtra knitr magrittr MultiAssayExperiment phyloseq readr S4Vectors SummarizedExperiment]; }; - HSMMSingleCell = derive2 { name="HSMMSingleCell"; version="1.16.0"; sha256="12whx0pl9461xbak5r9zi6ggx5is8sk6mgrbjwlmx3mbr9am116v"; depends=[]; }; - HarmanData = derive2 { name="HarmanData"; version="1.24.0"; sha256="1fq4kh7669fw1qxzfz42zfsw9fg30niqzz8g54qaxyl3ljbfw7f4"; depends=[]; }; - HarmonizedTCGAData = derive2 { name="HarmonizedTCGAData"; version="1.18.0"; sha256="11mwkl3nahvrb85r0jgbam464w5hcwsg28a5dm9fqzrn94m15nkx"; depends=[ExperimentHub]; }; - HelloRangesData = derive2 { name="HelloRangesData"; version="1.22.0"; sha256="0lpnqzrdkq1k8rwk7b4kg3848nqiyr3wl6vncy963xqnjdwpghzc"; depends=[]; }; - HiCDataHumanIMR90 = derive2 { name="HiCDataHumanIMR90"; version="1.16.0"; sha256="0imrwr1iy3slnvs59xmpcdrly76kqy3h8bldr78dzi9r1an30gg4"; depends=[]; }; - HiCDataLymphoblast = derive2 { name="HiCDataLymphoblast"; version="1.32.0"; sha256="18rdg07s4m4p9vqk3lp83x7p0zvfrfnvg2khhb7shqjdd9ya14i2"; depends=[]; }; - HighlyReplicatedRNASeq = derive2 { name="HighlyReplicatedRNASeq"; version="1.8.0"; sha256="0m95mh6bjjvd343ysnl97npif557sjxm0nfa2iw3sr2x4pwma1zz"; depends=[ExperimentHub S4Vectors SummarizedExperiment]; }; - Hiiragi2013 = derive2 { name="Hiiragi2013"; version="1.32.0"; sha256="1wmszish22yb9sh2c3i6fz9l17w0nxba44zbd2p5jks7frgryh8c"; depends=[affy Biobase boot clue cluster genefilter geneplotter gplots gtools KEGGREST lattice latticeExtra MASS mouse4302_db RColorBrewer xtable]; }; - HumanAffyData = derive2 { name="HumanAffyData"; version="1.22.0"; sha256="15l3fyvl534zr2nn102dg98r82iwy9g0imnmcpyrmx467p74iqb7"; depends=[Biobase ExperimentHub]; }; - IHWpaper = derive2 { name="IHWpaper"; version="1.24.0"; sha256="061v9ax5pf3f9l54xhyskz7bmb4878xf2s05z5rwhbw6hj7v9bcn"; depends=[Biobase BiocGenerics BiocParallel cowplot DESeq2 dplyr fdrtool genefilter ggplot2 IHW qvalue Rcpp SummarizedExperiment]; }; - ITALICSData = derive2 { name="ITALICSData"; version="2.34.0"; sha256="0vg5aq813n709hmnc1w51ynjml23q6xsgg9my3p4zim765clc1c4"; depends=[]; }; - Illumina450ProbeVariants_db = derive2 { name="Illumina450ProbeVariants.db"; version="1.32.0"; sha256="1jlx2gpnlgivfhggl6cvj1spv4y7pyr6pxlgn8859nrw49jjdj1p"; depends=[]; }; - IlluminaDataTestFiles = derive2 { name="IlluminaDataTestFiles"; version="1.34.0"; sha256="1h9vlif4dnzgffvab31i6qp2zcx8aph9wr71vgif9ayzc4gmx2if"; depends=[]; }; - Iyer517 = derive2 { name="Iyer517"; version="1.38.0"; sha256="0as22vdrw61hr39lx29wa17qfmz47q267l9i4l4jxldcm349f609"; depends=[Biobase]; }; - JASPAR2014 = derive2 { name="JASPAR2014"; version="1.32.0"; sha256="1palkamhw8wdnliyw9avpk1l6kpz8dhnghjpzdk4wd0dgfnfj2hr"; depends=[Biostrings]; }; - JASPAR2016 = derive2 { name="JASPAR2016"; version="1.24.0"; sha256="0g80f0zgl42p84br6ni8q0q4p2xcdc675kx1l6lf35jb845vmsgy"; depends=[]; }; - KEGGandMetacoreDzPathwaysGEO = derive2 { name="KEGGandMetacoreDzPathwaysGEO"; version="1.16.0"; sha256="0bx4d7sjfr9p4ivwcpqblsshkymlkgyxm4mpxc3mhcv579ir2nnr"; depends=[Biobase BiocGenerics]; }; - KEGGdzPathwaysGEO = derive2 { name="KEGGdzPathwaysGEO"; version="1.34.0"; sha256="1abzkzvz0i8yvdpwrcrdzrq1g99rhkws2b9b7zafrqn8zljwm3kc"; depends=[Biobase BiocGenerics]; }; - KOdata = derive2 { name="KOdata"; version="1.22.0"; sha256="1x26wcysd56wzijcsrs1r0rd8j9naylfbbr90b54wd24sfrq970c"; depends=[]; }; - LRcellTypeMarkers = derive2 { name="LRcellTypeMarkers"; version="1.4.0"; sha256="028gzmv555wb7pq41058sbacspjzxxqrmkx690aimn93y7pg0lh3"; depends=[ExperimentHub]; }; - LiebermanAidenHiC2009 = derive2 { name="LiebermanAidenHiC2009"; version="0.34.0"; sha256="17awdhd23fwr3i81vfcbgnnjibjp7q3z497zmmgm5q8fx79wfrrb"; depends=[IRanges KernSmooth]; }; - ListerEtAlBSseq = derive2 { name="ListerEtAlBSseq"; version="1.28.0"; sha256="0j4acswm0ixgkbgffnricap8rf1b3jp3mzlbb95p46jh9kxm9b2f"; depends=[methylPipe]; }; - LungCancerACvsSCCGEO = derive2 { name="LungCancerACvsSCCGEO"; version="1.32.0"; sha256="1ff43qfigrbh78bdc15agvkwagc6vr6m9qjpirqkchvhj9xzdssv"; depends=[]; }; - LungCancerLines = derive2 { name="LungCancerLines"; version="0.34.0"; sha256="163za70mbpqkkm5q027vilh4q9b7pzqwakqn51hkk58qi2sbrl18"; depends=[Rsamtools]; }; - M3DExampleData = derive2 { name="M3DExampleData"; version="1.22.0"; sha256="033572y1qr5dz279rvd64w4rivxzhafnmh71cr8g9qkf04g8ani3"; depends=[]; }; - MACSdata = derive2 { name="MACSdata"; version="1.4.0"; sha256="175g4x0hvbyjwm8vs64rj19685ibdncq9ph972c1rip7nlzj0raw"; depends=[]; }; - MAQCsubset = derive2 { name="MAQCsubset"; version="1.34.0"; sha256="13r4a7m08h6n0b7c4q3w30sh1w8qxhhck66fmx95jimdjdzf04zy"; depends=[affy Biobase lumi]; }; - MAQCsubsetILM = derive2 { name="MAQCsubsetILM"; version="1.34.0"; sha256="1k8l3vc2xrsf9hni3dfim2r9dll6cc0njzdg7ailf9hi8lbc03xp"; depends=[Biobase lumi]; }; - MEDIPSData = derive2 { name="MEDIPSData"; version="1.32.0"; sha256="02s88wlxgnl90ypgzxbspv1zqngcd3gbr9li7ng4snp5l7sgmpb7"; depends=[]; }; - MEEBOdata = derive2 { name="MEEBOdata"; version="1.34.0"; sha256="14cx5rv123z4pglbdwyndm8v1zvvf683ilv102ryzvnwsp2g2xi5"; depends=[]; }; - MIGSAdata = derive2 { name="MIGSAdata"; version="1.20.0"; sha256="0raz59fz568n9hsams91higf6f6q98nlgcapz7lnw9df7d5zmagv"; depends=[]; }; - MMAPPR2data = derive2 { name="MMAPPR2data"; version="1.10.0"; sha256="1aibly4pw3swf6qyx4gsnfqs0p4xv8wcq37lmd0b58bvp27ficrd"; depends=[Rsamtools]; }; - MMDiffBamSubset = derive2 { name="MMDiffBamSubset"; version="1.32.0"; sha256="1zfyp8q2849zmmp2b0ny7wbrhhsdvyv15xf2glifnhbpzdrrwjhl"; depends=[]; }; - MOFAdata = derive2 { name="MOFAdata"; version="1.12.0"; sha256="12vhcc6q52x8gxnjplb8bdn98pmrkvldc1h9hkvhgs810i96dhz9"; depends=[]; }; - MSMB = derive2 { name="MSMB"; version="1.14.0"; sha256="11a3rv09bljyvx4n3rhl83iyxsk5idl53cd1l016dc21z0wy9aki"; depends=[]; }; - MUGAExampleData = derive2 { name="MUGAExampleData"; version="1.16.0"; sha256="0vxqpk6ldsj1bmiyjalss3k3hkwic04vs4flh75djxhg113zsxx3"; depends=[]; }; - MetaGxBreast = derive2 { name="MetaGxBreast"; version="1.16.0"; sha256="0qgfml7p39ra6svj9i510ff01k4nbns85068a7gh1v4l85ykgd11"; depends=[AnnotationHub Biobase ExperimentHub impute lattice SummarizedExperiment]; }; - MetaGxOvarian = derive2 { name="MetaGxOvarian"; version="1.16.0"; sha256="1rjj8jxcaaz10rq7aanz3zw0z6sb1lmzy1ya8cl2icyalcm6q2k6"; depends=[AnnotationHub Biobase ExperimentHub impute lattice SummarizedExperiment]; }; - MetaGxPancreas = derive2 { name="MetaGxPancreas"; version="1.16.0"; sha256="0ppyf8pmq0pr00dvhb98qp19gcfsf9w6ix9d1yky8cf7l8czkqia"; depends=[AnnotationHub ExperimentHub impute S4Vectors SummarizedExperiment]; }; - MethylAidData = derive2 { name="MethylAidData"; version="1.28.0"; sha256="1gkv07qn4qxya3gcfppdg42wywzrq0ama56alf1z15knwn67a8ps"; depends=[MethylAid]; }; - MethylSeqData = derive2 { name="MethylSeqData"; version="1.6.0"; sha256="13yfqksyda8m1ckph00cw37j5nvs3aidbqb6bmg9gkw4fg21hc7i"; depends=[ExperimentHub GenomeInfoDb GenomicRanges HDF5Array IRanges rhdf5 S4Vectors SummarizedExperiment]; }; - MouseGastrulationData = derive2 { name="MouseGastrulationData"; version="1.10.0"; sha256="1drbxbh3qzmpwcbk8ly2r9hw5lr99mvzf5gjnl972glfy6fvjbnj"; depends=[BiocGenerics BumpyMatrix ExperimentHub S4Vectors SingleCellExperiment SpatialExperiment SummarizedExperiment]; }; - MouseThymusAgeing = derive2 { name="MouseThymusAgeing"; version="1.4.0"; sha256="1imk0s5h9v9nbwvdfd5gnmlqblx3wnws32spdp0q40p3dg5zgp4d"; depends=[BiocGenerics ExperimentHub S4Vectors SingleCellExperiment SummarizedExperiment]; }; - NCIgraphData = derive2 { name="NCIgraphData"; version="1.32.0"; sha256="0k9gc22zzfcnqz5ahz250ycry1l1rczlfpbg9j1dwjbfs76zib2f"; depends=[]; }; - NGScopyData = derive2 { name="NGScopyData"; version="1.16.0"; sha256="15kggy2abfq7a92yh3r0diqz0ddxfzbk3p0v85jh8h38swv94766"; depends=[]; }; - NanoporeRNASeq = derive2 { name="NanoporeRNASeq"; version="1.6.0"; sha256="1cy36izd1h3c7qz9f6igvljph8bmvlvhyvppwgiqr7k3paflf489"; depends=[ExperimentHub]; }; - NestLink = derive2 { name="NestLink"; version="1.12.0"; sha256="029rj9cv22cmk1arl68836mq7cav3rnc9z4kidakfk163r830v5p"; depends=[AnnotationHub Biostrings ExperimentHub gplots protViz ShortRead]; }; - Neve2006 = derive2 { name="Neve2006"; version="0.34.0"; sha256="0izjgs9p8rw4psvvwg6cpwa5pbh8i9fz1q8slllarj1yndadmg0l"; depends=[annotate Biobase hgu133a_db]; }; - NxtIRFdata = derive2 { name="NxtIRFdata"; version="1.2.0"; sha256="048j52rbdys46a3m9ki9aphrrhlh10zq4yl19qnp65h53hcz0lg5"; depends=[BiocFileCache ExperimentHub R_utils rtracklayer]; }; - OMICsPCAdata = derive2 { name="OMICsPCAdata"; version="1.14.0"; sha256="1ahyaalpn9rimy65jjmxgx5dapblvwibw153rgwjkz4k4p1v9p3v"; depends=[MultiAssayExperiment]; }; - ObMiTi = derive2 { name="ObMiTi"; version="1.4.0"; sha256="0nhlg364rvhaz9xv3hkszkzas4i1qx14nssv802fxlqqg87gjx7n"; depends=[ExperimentHub SummarizedExperiment]; }; - OnassisJavaLibs = derive2 { name="OnassisJavaLibs"; version="1.18.0"; sha256="14pvc2d2zs3h9r3rh1rip63rj2gvm0lzf949b5jb05qhkc26wzm6"; depends=[rJava]; }; - PCHiCdata = derive2 { name="PCHiCdata"; version="1.24.0"; sha256="12qb4wl6fjqhyavvm3y41psagkzrazlvhnwhdrbcp6qg3ql8770s"; depends=[Chicago]; }; - PREDAsampledata = derive2 { name="PREDAsampledata"; version="0.36.0"; sha256="1ia19649kxi1w1i5qlnl3hbrwq28y7mlrz3nldr76p1kgyzym6lq"; depends=[affy annotate Biobase PREDA]; }; - PWMEnrich_Dmelanogaster_background = derive2 { name="PWMEnrich.Dmelanogaster.background"; version="4.30.0"; sha256="0shqpciskbbdz7h0w873fp9gdajsxy7wham58hsik8zg8sjq7nlq"; depends=[PWMEnrich]; }; - PWMEnrich_Hsapiens_background = derive2 { name="PWMEnrich.Hsapiens.background"; version="4.30.0"; sha256="1giqjwwndgx23kcmwl6qlfqkqs2g57rqy9a6rk7f1a2h9n6v92vh"; depends=[PWMEnrich]; }; - PWMEnrich_Mmusculus_background = derive2 { name="PWMEnrich.Mmusculus.background"; version="4.30.0"; sha256="1g4pxsc7rl2bg9q1gvypwydf0fr31raqw3mxdnmprgai2rv9g339"; depends=[PWMEnrich]; }; - PasillaTranscriptExpr = derive2 { name="PasillaTranscriptExpr"; version="1.24.0"; sha256="0wf30zng7prgb4qgv8mjgg0c3d6h3ni82gb2vpv6n127vkbnv99g"; depends=[]; }; - PathNetData = derive2 { name="PathNetData"; version="1.32.0"; sha256="09mlmqax71q4ha4sq2ar33g4nsv9sszp5jl359mpncpgf08fkpnf"; depends=[]; }; - PepsNMRData = derive2 { name="PepsNMRData"; version="1.14.0"; sha256="0jfyr3ggx5i8bzhh5ajm2s78knrnf6zaq9mhy6nyq619546dcx3p"; depends=[]; }; - PhyloProfileData = derive2 { name="PhyloProfileData"; version="1.10.0"; sha256="0qv146pgzjhmdsg8yclddvc6bpxm60j1jhjfv8f9jqsnvbllqzbm"; depends=[BiocStyle Biostrings ExperimentHub]; }; - ProData = derive2 { name="ProData"; version="1.34.0"; sha256="0zg74wn11w2fd69lykl06k9sb05z9cmac3w1s2gmfdjqy3nbpi88"; depends=[Biobase]; }; - PtH2O2lipids = derive2 { name="PtH2O2lipids"; version="1.22.0"; sha256="1da28hnshxq2vy6sgs4118akxy3im92xda576vqw76nnjhp9ly1w"; depends=[CAMERA LOBSTAHS xcms]; }; - QDNAseq_hg19 = derive2 { name="QDNAseq.hg19"; version="1.26.0"; sha256="0x7n8xqf510w4hirdr8g2g4dcx2jy9psgnnb15gsvrcgvds802av"; depends=[QDNAseq]; }; - QDNAseq_mm10 = derive2 { name="QDNAseq.mm10"; version="1.26.0"; sha256="0ij9clgyczvkxc7529sz4zxdkrfpdjasmbbfycka228l1xqqnxqr"; depends=[QDNAseq]; }; - QUBICdata = derive2 { name="QUBICdata"; version="1.24.0"; sha256="08a9fvs4cigl3bx6s3my92njbj9gpkfsdyrsimng4ykkll25jwji"; depends=[]; }; - RGMQLlib = derive2 { name="RGMQLlib"; version="1.16.0"; sha256="1zkwf3wll7b786kfpbdzqhzhqmznx6bgdc4vlpzb1i2zrbsw5c5z"; depends=[]; }; - RITANdata = derive2 { name="RITANdata"; version="1.20.0"; sha256="0s8d8im2czp79qvch87y3swpfmcnpp3pa341zj3byiyc7agz1w6d"; depends=[]; }; - RLHub = derive2 { name="RLHub"; version="1.2.0"; sha256="1s6mkz1kv3rl68rzpnpi5m507d9pja2c58vzdximmpl2b764j41k"; depends=[AnnotationHub ExperimentHub]; }; - RMassBankData = derive2 { name="RMassBankData"; version="1.34.0"; sha256="147jdpi61jg87p6j957k6cca4a2sx5kzrbm4b9pszzrzrcvqq8w5"; depends=[]; }; - RNASeqRData = derive2 { name="RNASeqRData"; version="1.14.0"; sha256="1bn6d0zn40abqn7gvr82i89r1fwyaj4wb0hvg6rqcmmqdfqhbrs6"; depends=[]; }; - RNAinteractMAPK = derive2 { name="RNAinteractMAPK"; version="1.34.0"; sha256="0yamvw8r3zjmy4rvxswpdmav0n1pirk930c0z20chqzmz0fld7ls"; depends=[Biobase fields gdata genefilter lattice MASS RNAinteract sparseLDA]; }; - RNAmodR_Data = derive2 { name="RNAmodR.Data"; version="1.10.0"; sha256="0c0y7mvj4mnq9zsirayj74pxsj78qksbsaisbfikbkbabx7v827b"; depends=[ExperimentHub ExperimentHubData]; }; - RNAseqData_HNRNPC_bam_chr14 = derive2 { name="RNAseqData.HNRNPC.bam.chr14"; version="0.34.0"; sha256="1qs34fnlkbjlnqfk65m63lqbhqd773yzi4dwv8b1rbv75hqcmywc"; depends=[]; }; - RRBSdata = derive2 { name="RRBSdata"; version="1.16.0"; sha256="18ijbyfajiydarrr2wqf7y4spf40k3vyg1bsm8qdam6l1rg40d1i"; depends=[BiSeq]; }; - RTCGA_CNV = derive2 { name="RTCGA.CNV"; version="1.24.0"; sha256="1m36f15spkg6bkiympda0r4sb2nai7bnajvg3cfdypym0javmjni"; depends=[RTCGA]; }; - RTCGA_PANCAN12 = derive2 { name="RTCGA.PANCAN12"; version="1.24.0"; sha256="11r3xy84zfzp4ws9g8jn0lqbqdydlzsi6vgxh1xyf7jpv1m3qw1r"; depends=[RTCGA]; }; - RTCGA_RPPA = derive2 { name="RTCGA.RPPA"; version="1.24.0"; sha256="0lhcmp9mm1f8biw05nlg0hiqiyad7lz2dl06x9bhyz8aggdpdx5m"; depends=[RTCGA]; }; - RTCGA_clinical = derive2 { name="RTCGA.clinical"; version="20151101.26.0"; sha256="0iipvf5ii185q4nghwqmk3mp4s7wdbs90hk3mdc96f7qs5h53jzb"; depends=[RTCGA]; }; - RTCGA_mRNA = derive2 { name="RTCGA.mRNA"; version="1.24.0"; sha256="12yjxqq49jbss409ms8c4a5lxn613d0cbin2h8033z2ldk73zsnp"; depends=[RTCGA]; }; - RTCGA_methylation = derive2 { name="RTCGA.methylation"; version="1.24.0"; sha256="0si0xr1d6013f1jylk6srx5n4nfrlr97dywh8f4hdwdk5fsn2nsv"; depends=[RTCGA]; }; - RTCGA_miRNASeq = derive2 { name="RTCGA.miRNASeq"; version="1.24.0"; sha256="0xf6yf3phyagmysavgrcfpv7n7h3vgvf5in1m4n5my0168b9xi35"; depends=[RTCGA]; }; - RTCGA_mutations = derive2 { name="RTCGA.mutations"; version="20151101.26.0"; sha256="1zdpghr75vj9x4ldw0gzxkanca4zzl3fzmx61jr9jh5lkgj8h4vv"; depends=[RTCGA]; }; - RTCGA_rnaseq = derive2 { name="RTCGA.rnaseq"; version="20151101.26.0"; sha256="1qmp5nlvqcb2699fcyxgngsyaygygajypj8m1an419xiy3kxnjdp"; depends=[RTCGA]; }; - RUVnormalizeData = derive2 { name="RUVnormalizeData"; version="1.16.0"; sha256="003gf94pfsimc1f2xwm7jdndkng9hdllhvq92il5y4kjr6ky9bkr"; depends=[Biobase]; }; - RcisTarget_hg19_motifDBs_cisbpOnly_500bp = derive2 { name="RcisTarget.hg19.motifDBs.cisbpOnly.500bp"; version="1.16.0"; sha256="1wi7g1246p04ld97x11pkb7hy4490cq5pfw404xhcmavm6sbrsps"; depends=[data_table]; }; - ReactomeGSA_data = derive2 { name="ReactomeGSA.data"; version="1.10.0"; sha256="1z0sridzwyfq3cxvmv97c5mg96z5aylwpma35kizzi1y5y7xjqnr"; depends=[edgeR limma ReactomeGSA Seurat]; }; - RegParallel = derive2 { name="RegParallel"; version="1.14.0"; sha256="12ak24899dp4184xc2g549d22zxv297aaz1c5s3zva821bv43djq"; depends=[arm data_table doParallel foreach iterators stringr survival]; }; - RforProteomics = derive2 { name="RforProteomics"; version="1.34.1"; sha256="11i9r36n3jqwnf1q3fawgk26zvs7zkixq8hmfam7d4kaqj5f9kvz"; depends=[BiocManager biocViews MSnbase R_utils]; }; - RnBeads_hg19 = derive2 { name="RnBeads.hg19"; version="1.28.0"; sha256="13vjqi6n6swz08qzadycn873rls1wkzprmf2rawx7mrbsy1cn5zh"; depends=[GenomicRanges]; }; - RnBeads_hg38 = derive2 { name="RnBeads.hg38"; version="1.28.0"; sha256="0wdzm89rn5z33sk3jw9f8yq6f23k5m5pv6ysbf8irw6s1g6y3xr3"; depends=[GenomicRanges]; }; - RnBeads_mm10 = derive2 { name="RnBeads.mm10"; version="2.4.1"; sha256="10gixzi25ka6arxapn04yxj39193f1b614ynnn1795hbz1njv7a4"; depends=[GenomicRanges]; }; - RnBeads_mm9 = derive2 { name="RnBeads.mm9"; version="1.28.0"; sha256="0ylvnw19j3fqgyp014zyzzpwhwj54bcl6r8gc45zs9py82zqkmyr"; depends=[GenomicRanges]; }; - RnBeads_rn5 = derive2 { name="RnBeads.rn5"; version="1.28.0"; sha256="129rv2zlqgqr3n64gx6y2ippqn2lrqsh6g5br1zh8awr9lbkp6bb"; depends=[GenomicRanges]; }; - RnaSeqSampleSizeData = derive2 { name="RnaSeqSampleSizeData"; version="1.28.0"; sha256="1qwah52mc5pn27nm8c5byjyf121830yvfi9a4qsg5lqlwysfpnl9"; depends=[edgeR]; }; - SBGNview_data = derive2 { name="SBGNview.data"; version="1.10.0"; sha256="0gh4qs5r13x8rlf3f7kn63czbc5rzds5j27flk60yx70cinvgf6q"; depends=[bookdown knitr rmarkdown]; }; - SCATEData = derive2 { name="SCATEData"; version="1.6.0"; sha256="0g7hydh8prb9in64iyn993kg1i933l0nian00rh8n7lhhlhsmcrd"; depends=[ExperimentHub GenomicAlignments GenomicRanges]; }; - SCLCBam = derive2 { name="SCLCBam"; version="1.28.0"; sha256="0mmw9dzpx66hdp0cmzq8j2w07ckg1887l50j1a6szanrm0ln04ig"; depends=[]; }; - SNAData = derive2 { name="SNAData"; version="1.42.0"; sha256="1xlqmfscf55q5j3k0ssvyyvgf5xqj9ypypdj7qcwn9izgn6ihpv1"; depends=[graph]; }; - SNAGEEdata = derive2 { name="SNAGEEdata"; version="1.32.0"; sha256="184kf4zqy924p776pzdmlbly8whgkh7kdqqcpmyra388mmish97h"; depends=[]; }; - SNPhoodData = derive2 { name="SNPhoodData"; version="1.26.0"; sha256="1mzpkhr9apm5smp8w7rxdd61yizn283hhr2hb3s9ym05nrfgwyvy"; depends=[]; }; - STexampleData = derive2 { name="STexampleData"; version="1.4.5"; sha256="0gdizm0pkzd9hwmpbdb1pq5w4q286vycjx7vaf79gj8rrha01k5z"; depends=[ExperimentHub SpatialExperiment]; }; - SVM2CRMdata = derive2 { name="SVM2CRMdata"; version="1.28.0"; sha256="1ycd1ihlms44y4hqq3n7l8hhcc3fkvihmsq3vm5434k1zx0prby6"; depends=[]; }; - SimBenchData = derive2 { name="SimBenchData"; version="1.4.0"; sha256="1g8yd5h878r2cnh9s3iwc2q60syrxyjg5riiv4jzz3xv0s1g6awd"; depends=[ExperimentHub S4Vectors]; }; - Single_mTEC_Transcriptomes = derive2 { name="Single.mTEC.Transcriptomes"; version="1.24.0"; sha256="0kzwjl6a0y8j4kabnwdnprb19riqirpfcf465rz59w5gyvqg2k2q"; depends=[]; }; - SingleCellMultiModal = derive2 { name="SingleCellMultiModal"; version="1.8.0"; sha256="0cmzjqhgjkgmji3bps387siq2s2k8flv4sksk6rh754wklry7bpm"; depends=[AnnotationHub BiocFileCache BiocGenerics ExperimentHub HDF5Array Matrix MultiAssayExperiment S4Vectors SingleCellExperiment SpatialExperiment SummarizedExperiment]; }; - SingleMoleculeFootprintingData = derive2 { name="SingleMoleculeFootprintingData"; version="1.4.0"; sha256="1mi27fg1xnibz41fw2xlnj81mbszs8jfxiirky5x3358xac8n5fy"; depends=[ExperimentHub]; }; - SomatiCAData = derive2 { name="SomatiCAData"; version="1.34.0"; sha256="06k9g27f92zvahr52jrdn4i504n215w02hrk3p888yh2jyypkjif"; depends=[]; }; - SomaticCancerAlterations = derive2 { name="SomaticCancerAlterations"; version="1.32.0"; sha256="14yxvvw2x2qmp3vz7xiqhfdmykcmjw36sikdi046zqfcfqxq1vrw"; depends=[GenomicRanges IRanges S4Vectors]; }; - SpikeIn = derive2 { name="SpikeIn"; version="1.38.0"; sha256="1mvzixy1s5xvfgi3hf1z21mp7587v1byb6vsi9yiacc6knm55rih"; depends=[affy]; }; - SpikeInSubset = derive2 { name="SpikeInSubset"; version="1.36.0"; sha256="1rx3lsf50v17rq5yd45w35xbh79rh6pmyx73didv4afsy8vcq984"; depends=[affy Biobase]; }; - TBX20BamSubset = derive2 { name="TBX20BamSubset"; version="1.32.0"; sha256="09nawqwz6gq1bp9vgqg2nm0vb1f6id7nzqi742iz5h98p21y3jn9"; depends=[Rsamtools xtable]; }; - TCGAMethylation450k = derive2 { name="TCGAMethylation450k"; version="1.32.0"; sha256="1hiqa6ww5rkl9vlp5fn5fzgr1yl8br8h9s8knhcyfw83bmr7ihkb"; depends=[]; }; - TCGAWorkflowData = derive2 { name="TCGAWorkflowData"; version="1.20.0"; sha256="0ffhinj97jgk6z2qa1bk1dzijk5vjii41g8cnbs0rcshpllc0yiq"; depends=[SummarizedExperiment]; }; - TCGAbiolinksGUI_data = derive2 { name="TCGAbiolinksGUI.data"; version="1.16.0"; sha256="1mb2z59acs1pi1gqvgjyh62wnmbxskc5l0p42gpjajsjip5x1x7g"; depends=[]; }; - TCGAcrcmRNA = derive2 { name="TCGAcrcmRNA"; version="1.16.0"; sha256="0sjdk1kxpj3k4slrinywgd261jwfwa6ba6b19fz6gjik0w900f7n"; depends=[Biobase]; }; - TCGAcrcmiRNA = derive2 { name="TCGAcrcmiRNA"; version="1.16.0"; sha256="16p8zbrrfah2hmkjysp3aagvwwn8g437yqrf1a0wg2jaxh246z1l"; depends=[Biobase]; }; - TENxBUSData = derive2 { name="TENxBUSData"; version="1.10.0"; sha256="0kblhl9b0vjngfnh8rdbsbs26pgmy1xx47kvjj7qcawb3s0blc96"; depends=[AnnotationHub BiocGenerics ExperimentHub]; }; - TENxBrainData = derive2 { name="TENxBrainData"; version="1.16.0"; sha256="1cb7sbk1hn1i6lw5k3q6p7s501q0yrighfcw0l5abvb4mz9xm1rh"; depends=[AnnotationHub ExperimentHub HDF5Array SingleCellExperiment]; }; - TENxPBMCData = derive2 { name="TENxPBMCData"; version="1.14.0"; sha256="1mybd23fck9g4wqvhbh1fjvwzn23h91dlr7wvrh91s61yajj01hd"; depends=[AnnotationHub ExperimentHub HDF5Array SingleCellExperiment]; }; - TENxVisiumData = derive2 { name="TENxVisiumData"; version="1.4.0"; sha256="05w1xqkd8bb2vi1i667pshpvs0913ybx87x3vlhj2fzmx5jjsllq"; depends=[ExperimentHub SpatialExperiment]; }; - TMExplorer = derive2 { name="TMExplorer"; version="1.6.2"; sha256="0xhnmg8ngvjk3zwafyj04qhij5v101q2m69fcxsqnvvzsb7vyqi2"; depends=[BiocFileCache Matrix SingleCellExperiment]; }; - TabulaMurisData = derive2 { name="TabulaMurisData"; version="1.14.0"; sha256="16788gn24810c3qn4s2fpffl6sgfzar2wyv5fnay3p29iv66nlww"; depends=[ExperimentHub]; }; - TabulaMurisSenisData = derive2 { name="TabulaMurisSenisData"; version="1.2.0"; sha256="17vx35lgkhl5w6ny9a3dc4p5rrv5ywh1qg8lvka4d2jarv18gn8s"; depends=[AnnotationHub ExperimentHub gdata HDF5Array SingleCellExperiment SummarizedExperiment]; }; - TargetScoreData = derive2 { name="TargetScoreData"; version="1.32.0"; sha256="0xrfp2jqsp5kf85mc9bbalpr09hhzspcg0305mzf9cyf8lpms3n4"; depends=[]; }; - TargetSearchData = derive2 { name="TargetSearchData"; version="1.34.0"; sha256="16kc003g7l9k6yq0z7b6a4yzgpkz4b343fzzg3lf9ww1565jfgr0"; depends=[]; }; - TimerQuant = derive2 { name="TimerQuant"; version="1.26.0"; sha256="0hp6lfxnwmv18ci15gjlq5va2926j1cmv1lbxqjmjmkj6p28gbdy"; depends=[deSolve dplyr ggplot2 gridExtra locfit shiny]; }; - VariantToolsData = derive2 { name="VariantToolsData"; version="1.20.0"; sha256="1jdi9045iq09gb3rfnz5kc83qhqjbqkda2vg410d86v78r2zzkwp"; depends=[BiocGenerics GenomicRanges VariantAnnotation]; }; - VectraPolarisData = derive2 { name="VectraPolarisData"; version="1.0.0"; sha256="0lp3fn9x4hi2fihnc66cvziw0x05qmcki06za5z7k761pbc2cgk0"; depends=[ExperimentHub SpatialExperiment]; }; - WES_1KG_WUGSC = derive2 { name="WES.1KG.WUGSC"; version="1.28.0"; sha256="027ga0wzqmd1j792drz6qllk221d6rfva3hfqd7g0grbzb0lipnj"; depends=[]; }; - WGSmapp = derive2 { name="WGSmapp"; version="1.8.0"; sha256="08g71y2ix377if47jsymdqip6kiy0hs198r84a83pwxrbj4a66zf"; depends=[GenomicRanges]; }; - XhybCasneuf = derive2 { name="XhybCasneuf"; version="1.34.0"; sha256="0d7gnay3jhcxmyyh45ggq6dfh83zz0s2z9rjr98dbx3jyhhy52mn"; depends=[affy ath1121501cdf RColorBrewer tinesath1cdf]; }; - adductData = derive2 { name="adductData"; version="1.12.0"; sha256="02r7p1645vhhf7wn5x0aklmf7l97h6fjb8v9mldim4waccmpyg48"; depends=[AnnotationHub ExperimentHub]; }; - affycompData = derive2 { name="affycompData"; version="1.34.0"; sha256="0lbdjmpy4460dv9s7rkbbcvhzpyqmb8hr40hbmnrjmzi8b5rs2j0"; depends=[affycomp Biobase]; }; - affydata = derive2 { name="affydata"; version="1.44.0"; sha256="1d8ims7hks536v739r5hhfkkzyzqrf398aqal3hzyfm0psv15jbp"; depends=[affy]; }; - airway = derive2 { name="airway"; version="1.16.0"; sha256="1m0llmb0z8vw8as81qb2jawcxgad5ivgl6s3vgm89zdr3a2lpxjz"; depends=[SummarizedExperiment]; }; - alpineData = derive2 { name="alpineData"; version="1.22.0"; sha256="187axprwpb25lfcxw5mxbxsav07iqkiknd0yh77iff9hhzf06van"; depends=[AnnotationHub ExperimentHub GenomicAlignments]; }; - antiProfilesData = derive2 { name="antiProfilesData"; version="1.32.0"; sha256="1b8xxkg5qi8xzs4ax9cvga9b6sbvwfna5w5hi3x38lpxlzyp9p45"; depends=[Biobase]; }; - aracne_networks = derive2 { name="aracne.networks"; version="1.22.0"; sha256="0w6v6hj1c43pbadb20rxmfhxgqinz0rrz6nc59mzb6zm2ydcg7z5"; depends=[viper]; }; - bcellViper = derive2 { name="bcellViper"; version="1.32.0"; sha256="1lwiii0fp2msnlk6c9c1xyh03g5cmx1r6jf98sylcaz93s63gz0f"; depends=[Biobase]; }; - beadarrayExampleData = derive2 { name="beadarrayExampleData"; version="1.34.0"; sha256="0pi4raxy7jwsbl2ds49wh00v2k5gp42y3cl7ipy5ammkjyjz4fa0"; depends=[beadarray Biobase]; }; - benchmarkfdrData2019 = derive2 { name="benchmarkfdrData2019"; version="1.10.0"; sha256="0v3j3v987gz6wi4z7l4wavagkk59rmkgfy9ynw6v6v53gjmwjrsd"; depends=[ExperimentHub SummarizedExperiment]; }; - beta7 = derive2 { name="beta7"; version="1.34.0"; sha256="0z161a395ykd2kylfmqql4ma6g4124sykmab488vz7cy7kmgi55j"; depends=[marray]; }; - biotmleData = derive2 { name="biotmleData"; version="1.20.0"; sha256="1ayxv1nlzfrpk1q2rrjlfyiyzhnz5hyd1mpw40qyp1sby7qkhwin"; depends=[]; }; - biscuiteerData = derive2 { name="biscuiteerData"; version="1.10.0"; sha256="0nda6b8mkv93s513y0xfgxvi7zn8v07jx323ii709rknlncm6qqw"; depends=[AnnotationHub curl ExperimentHub]; }; - bladderbatch = derive2 { name="bladderbatch"; version="1.34.0"; sha256="1dpbaqsqizyi99r0imf5m4lndhhrkyiaqii9bi8rp18fjbjdd72k"; depends=[Biobase]; }; - blimaTestingData = derive2 { name="blimaTestingData"; version="1.16.0"; sha256="1xngnh8fgwnvxcycnxzbaqlwr478aqacj9xh9zcig6xvkqbvdan0"; depends=[]; }; - bodymapRat = derive2 { name="bodymapRat"; version="1.12.0"; sha256="0cm0pxk47axi2kp0jl2ix03vbg4q54fsq9wbrlz6gy0zmab05qy8"; depends=[ExperimentHub SummarizedExperiment]; }; - breakpointRdata = derive2 { name="breakpointRdata"; version="1.14.0"; sha256="19xmwvx70m4s6naxw1m13qdyxaswmq94mhxc71gnfr80w9l28qdx"; depends=[]; }; - breastCancerMAINZ = derive2 { name="breastCancerMAINZ"; version="1.34.0"; sha256="1a658xkiimhbhjic4mwgxccsrqfi11l8sjyhxlqzwhqpg25s52yc"; depends=[]; }; - breastCancerNKI = derive2 { name="breastCancerNKI"; version="1.34.0"; sha256="11vbsam86zq8zpc871gnham6dpvz4pivj8bjk64r9nclcl6msflm"; depends=[]; }; - breastCancerTRANSBIG = derive2 { name="breastCancerTRANSBIG"; version="1.34.0"; sha256="11p77vhp4qjibglc2gyj3ljcgzxijh6gakq1jy9x08hwbzbk59cp"; depends=[]; }; - breastCancerUNT = derive2 { name="breastCancerUNT"; version="1.34.0"; sha256="12736cr61fnaq2gladlnpa6247zk3mbgx4gr3m3swfr1xzfjmr96"; depends=[]; }; - breastCancerUPP = derive2 { name="breastCancerUPP"; version="1.34.0"; sha256="1688njb87jlbil7j0lpa6cvzqs9j82nxjcjqwxvizwwmwmsybygw"; depends=[]; }; - breastCancerVDX = derive2 { name="breastCancerVDX"; version="1.34.0"; sha256="0w1vd8v1ld81a20l1rzjbfsf3xyd6r85ifgpyl63rmk4zlyk9qa1"; depends=[]; }; - brgedata = derive2 { name="brgedata"; version="1.18.0"; sha256="0ls9qyv6p8g64cibrxavch2z9yb057mmhk0wj8a3qzp2yammp866"; depends=[Biobase SummarizedExperiment]; }; - bronchialIL13 = derive2 { name="bronchialIL13"; version="1.34.0"; sha256="08jal96cv14wym7c6yv10yh4qcgzqdgi6x231v21asmawl0gjv8n"; depends=[affy]; }; - bsseqData = derive2 { name="bsseqData"; version="0.34.0"; sha256="1izn9qwsvr6nic70b5iwpn06if2wvrsh4rvrhlj275q4s91l1apk"; depends=[bsseq]; }; - cMap2data = derive2 { name="cMap2data"; version="1.32.0"; sha256="1x28q46y1794hr8b2bmdy5agwy3j8chdk6lczwkqsqb7qaccbgxl"; depends=[]; }; - cancerdata = derive2 { name="cancerdata"; version="1.34.0"; sha256="06dijhvjzi60fd7bh6m4inf1yvc7d2p6swmp887pfjap5id99hb3"; depends=[Biobase]; }; - ccTutorial = derive2 { name="ccTutorial"; version="1.34.0"; sha256="1ag9jv5y6ky3xqqvsln7xcpa7z4p4jm3vqz16dmxm92ldkrpff8f"; depends=[affy Biobase Ringo topGO]; }; - ccdata = derive2 { name="ccdata"; version="1.22.0"; sha256="1glgrc3z7q2pigivhh4q0aa4y354bxfxyhinz8vdr2nkrnh5fl6c"; depends=[]; }; - celarefData = derive2 { name="celarefData"; version="1.14.0"; sha256="0awh198v9swj6mpa3pihvms9ml74798hpywhfqmmakpqb8i5nmk8"; depends=[]; }; - celldex = derive2 { name="celldex"; version="1.6.0"; sha256="1fjldmhb9yg6yr3aq5ldvc8xwqw71ix4cdlr53xxckgwljjq7x10"; depends=[AnnotationDbi AnnotationHub DelayedArray DelayedMatrixStats ExperimentHub S4Vectors SummarizedExperiment]; }; - chipenrich_data = derive2 { name="chipenrich.data"; version="2.20.0"; sha256="1hg728bncvw008fzpw0cxy2haq5ynnriymyb2dwwa9yi9bzqhcs2"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicRanges IRanges readr rtracklayer S4Vectors]; }; - chipseqDBData = derive2 { name="chipseqDBData"; version="1.12.0"; sha256="06j0jh3kg0n0jfa34iwmdc4j1h96wgvg0i5rwiidmdzii30y24a3"; depends=[AnnotationHub ExperimentHub Rsamtools S4Vectors]; }; - chromstaRData = derive2 { name="chromstaRData"; version="1.22.0"; sha256="1ajwnkibpi01c93nrplxhy6grw8jj5219g4pii4rkan4k5815kv1"; depends=[]; }; - clustifyrdatahub = derive2 { name="clustifyrdatahub"; version="1.6.0"; sha256="1ynj9h7cgg8kdb97g8bd0rvzpyjfqbs91c1jcj5gsml2mqn20zb9"; depends=[ExperimentHub]; }; - cnvGSAdata = derive2 { name="cnvGSAdata"; version="1.32.0"; sha256="08ag0mj6wbhgrs5csvri6rm2c61hxzspgm6p2ggikxp8b98dq249"; depends=[cnvGSA]; }; - colonCA = derive2 { name="colonCA"; version="1.38.0"; sha256="15pid97gpg0hcdh8xw8r72qlm1k76l6m0zmh12f1q2z792bqv3v2"; depends=[Biobase]; }; - crisprScoreData = derive2 { name="crisprScoreData"; version="1.0.0"; sha256="0qv93yx25zrs7xn3w8f298b1v0jmgsdzcnlivhr8va95rlaa36zp"; depends=[ExperimentHub]; }; - curatedAdipoArray = derive2 { name="curatedAdipoArray"; version="1.8.0"; sha256="0xhm84d1g1mv4x8lavwx87346123nd7957pbvw5ajhg42ipz8qwl"; depends=[]; }; - curatedAdipoChIP = derive2 { name="curatedAdipoChIP"; version="1.12.0"; sha256="1c5mg1f4d6rk4dx0vfs5f8fk15gh9gqnh2n0z6a21ial3pz2hq16"; depends=[ExperimentHub SummarizedExperiment]; }; - curatedAdipoRNA = derive2 { name="curatedAdipoRNA"; version="1.12.0"; sha256="11gb3c4bvzxhhxrzi5y6p2703r4nz9qf8w996sh9giqq0kdk1iaf"; depends=[SummarizedExperiment]; }; - curatedBladderData = derive2 { name="curatedBladderData"; version="1.32.0"; sha256="1qbwxfpicrqq2xmghj0j93nk6fyn9nqr3kj7hh4hhzrv71kgrlha"; depends=[affy]; }; - curatedBreastData = derive2 { name="curatedBreastData"; version="2.24.0"; sha256="1lfb8dw4c3dg2dxqdy0ibv53savz6qyavj03lyxvzw3rg052lwfy"; depends=[Biobase BiocStyle ggplot2 impute XML]; }; - curatedCRCData = derive2 { name="curatedCRCData"; version="2.28.0"; sha256="18cwky29pic2ixabr5ckzl98g9xm1yj36l3xaxk37jav7brnabx1"; depends=[BiocGenerics nlme]; }; - curatedMetagenomicData = derive2 { name="curatedMetagenomicData"; version="3.4.2"; sha256="1fxzb60jqbx4kc4lqk0gcbq1981gzjxvpapk96sswidjid44gg2r"; depends=[AnnotationHub dplyr ExperimentHub magrittr mia purrr rlang S4Vectors stringr SummarizedExperiment tibble tidyr tidyselect TreeSummarizedExperiment]; }; - curatedOvarianData = derive2 { name="curatedOvarianData"; version="1.34.0"; sha256="0fnvsjxs3rfr0vwlnqzgs3121jad85vff3f34rjiq5mmgj8d3szs"; depends=[affy BiocGenerics]; }; - curatedTBData = derive2 { name="curatedTBData"; version="1.2.0"; sha256="1ca5vnyzcdarrdczffj88nlchzkx3nrhpxh4r8446yvgm9nq1f13"; depends=[AnnotationHub ExperimentHub MultiAssayExperiment rlang]; }; - curatedTCGAData = derive2 { name="curatedTCGAData"; version="1.18.0"; sha256="0h3mpwy6lhyn8hfry13sdjgb35gqyi3g26igfjqzshc5wvsniwpr"; depends=[AnnotationHub ExperimentHub HDF5Array MultiAssayExperiment S4Vectors SummarizedExperiment]; }; - davidTiling = derive2 { name="davidTiling"; version="1.36.0"; sha256="1a2wcgw7dpsk86516c0qqy6lspc5ilip9ym1hdjmdmldw653qgw6"; depends=[Biobase GO_db tilingArray]; }; - depmap = derive2 { name="depmap"; version="1.10.0"; sha256="0378blcy4k440xfjsfr6d8fzgv8v1gbfd7jq2jqawj8s3in3g8sc"; depends=[AnnotationHub dplyr ExperimentHub]; }; - derfinderData = derive2 { name="derfinderData"; version="2.14.0"; sha256="02p2zz9i9g6z20fvc29i31nrw5jamw0sk9yf3yxq3211xprrq556"; depends=[]; }; - diffloopdata = derive2 { name="diffloopdata"; version="1.24.0"; sha256="1h7d755akxbsb68mhddqck759hfb5ahcv99040xl5pl0wg76qhx4"; depends=[]; }; - diggitdata = derive2 { name="diggitdata"; version="1.28.0"; sha256="1i1bj3fhkp9g3szcsf4z78mq2nwk9s7gbhwzjz87gpq1ly0wi5zm"; depends=[Biobase viper]; }; - dorothea = derive2 { name="dorothea"; version="1.8.0"; sha256="0yby99xncj8625rjc71wfp164bkbc00kbqaxx1nhhcxx5wyb5li7"; depends=[bcellViper dplyr magrittr viper]; }; - dressCheck = derive2 { name="dressCheck"; version="0.34.0"; sha256="05rajbidn01mv711xm8w5ida2dxkykwby5q3fm6wr9vk9hdg6h8y"; depends=[Biobase]; }; - dyebiasexamples = derive2 { name="dyebiasexamples"; version="1.36.0"; sha256="01j7gwzdg6q2l2nqbmmhvg4c06irjlgvqj3gcwff5m2372p7qgn5"; depends=[GEOquery marray]; }; - easierData = derive2 { name="easierData"; version="1.2.0"; sha256="1hvm8xhjm7xx2m8r9w2hfk1naj37mnyzg76ig2yszi7g20xxkn07"; depends=[AnnotationHub ExperimentHub SummarizedExperiment]; }; - ecoliLeucine = derive2 { name="ecoliLeucine"; version="1.36.0"; sha256="1nncm8k9xrn7pi89skbqkp01bwnkr8myzxvwvdqwwpdhz23h67iq"; depends=[affy ecolicdf]; }; - emtdata = derive2 { name="emtdata"; version="1.4.0"; sha256="0wfqyyncn8y7dbpiq9ydqglbci1zcaxqph78h3f0m91gsyb46n48"; depends=[edgeR ExperimentHub SummarizedExperiment]; }; - epimutacionsData = derive2 { name="epimutacionsData"; version="1.0.0"; sha256="00l7mjryq7zf83mf9zwfs6pih7lncyz0310rvbgmgxij0d2ihcs0"; depends=[]; }; - estrogen = derive2 { name="estrogen"; version="1.42.0"; sha256="0s6gaxks4z6dnj304j2hliqyqs8iwqdvf5xmca31xms9sdix57nv"; depends=[]; }; - etec16s = derive2 { name="etec16s"; version="1.24.0"; sha256="1s4jq4nzl33fll7k9b88divyhi8phkv2n5629q2qa8ag2rvdw50g"; depends=[Biobase metagenomeSeq]; }; - ewceData = derive2 { name="ewceData"; version="1.4.0"; sha256="14wnj0dxdbrr57blvi1kmgjxcmy8h6b85zyjk4ksnz3jqnb3x4zx"; depends=[ExperimentHub]; }; - faahKO = derive2 { name="faahKO"; version="1.36.0"; sha256="1z23c2nlgf1ssfa9fmh6qbymsgwj8w0sslnyyiwmq6f1c5slagdk"; depends=[xcms]; }; - fabiaData = derive2 { name="fabiaData"; version="1.34.0"; sha256="0ps43wp6ywz3g92dckcmczh8g26fz4hg2w63bjzkpyl9pp6g70jn"; depends=[Biobase]; }; - ffpeExampleData = derive2 { name="ffpeExampleData"; version="1.34.0"; sha256="1493i3pgq12afp97rm5nlslkfqh87vr0hrw2r3m6d76xkaxmq47f"; depends=[lumi]; }; - fibroEset = derive2 { name="fibroEset"; version="1.38.0"; sha256="0hyb9cmqpnl98gpvjh5mrrbnzpwsqlnngm0h88rca6jsxgzypyxg"; depends=[Biobase]; }; - fission = derive2 { name="fission"; version="1.16.0"; sha256="1xp8a0qvskb4arl2h937zvdx23z7xgjfa46lfk35pyl398vvr04p"; depends=[SummarizedExperiment]; }; - flowPloidyData = derive2 { name="flowPloidyData"; version="1.22.0"; sha256="12n5zaikca17w1bwc4hb9hxj28vdka1gz2x62hzd552baimv694c"; depends=[]; }; - flowWorkspaceData = derive2 { name="flowWorkspaceData"; version="3.8.0"; sha256="1z67crxi4vd2s4sbraj8i1qdnbdjr28gij2ygv3j0ys6jscwvz6q"; depends=[]; }; - frmaExampleData = derive2 { name="frmaExampleData"; version="1.32.0"; sha256="1am40f3b3g6rgbsji52a674x8s5xk2zgbkv7z4mrwcqy3qbvv2kp"; depends=[]; }; - furrowSeg = derive2 { name="furrowSeg"; version="1.24.0"; sha256="04bnqdbfmkl42cpflq4krwcc6g5znkajw56vpcxa8sahcqlzlz50"; depends=[abind dplyr EBImage locfit tiff]; }; - gageData = derive2 { name="gageData"; version="2.34.0"; sha256="00s2aig9r0bvk45brc0shildrgl2z0i0k8xlvqc9h1s274nnslk9"; depends=[]; }; - gaschYHS = derive2 { name="gaschYHS"; version="1.34.0"; sha256="07s469vdj9zbqaq660asv10qlsg03ga1ln0hkq5xxqqjnwliy0nr"; depends=[Biobase]; }; - gatingMLData = derive2 { name="gatingMLData"; version="2.36.0"; sha256="0ljyahrd2v4kz8y26h16apc2yz8a1fg54190ryy30v7gfdaacbad"; depends=[]; }; - gcspikelite = derive2 { name="gcspikelite"; version="1.34.0"; sha256="1lhgsinx128qi2rcm577smpkdnh91c9nn05737pp0ww2ys8pziqk"; depends=[]; }; - geneLenDataBase = derive2 { name="geneLenDataBase"; version="1.32.0"; sha256="0p4rmd3qszsnyn47mfbk96zfa0bhpyyvsh4ma1ligjrsnmkicsaz"; depends=[GenomicFeatures rtracklayer]; }; - genomationData = derive2 { name="genomationData"; version="1.28.0"; sha256="0ckdgmarndpz6r0y9sd4nmypzjgivj32w2890yl15xmxkx4397fh"; depends=[]; }; - golubEsets = derive2 { name="golubEsets"; version="1.38.0"; sha256="02f30hxg9ap1na59vgq6zqpnxba1yv38v458bx2ppxj2pj7jldh1"; depends=[Biobase]; }; - gpaExample = derive2 { name="gpaExample"; version="1.8.0"; sha256="0zv7djz65lm8a3d8ybg1nm5r2b7byh55g78v5jmskh6jkv9njd9w"; depends=[]; }; - grndata = derive2 { name="grndata"; version="1.28.0"; sha256="14hn88p65jkd44skf07v358rr5hbncp3mlsz2xl5mfyxgl124fcd"; depends=[]; }; - h5vcData = derive2 { name="h5vcData"; version="2.16.0"; sha256="04cwqilsaiw9x709lhb9vrv75lhvhfx7k7zw400nf5h4pn0cgxw4"; depends=[]; }; - hapmap100khind = derive2 { name="hapmap100khind"; version="1.38.0"; sha256="0rabyxvlxgzawdwa3q0xy2iqdlkcgmzbmqc4052ndm7wdh4h4s97"; depends=[]; }; - hapmap100kxba = derive2 { name="hapmap100kxba"; version="1.38.0"; sha256="162wx2g4ghh6b92d9q446js7qk2j5ahajvbynckg2ggnzavd7v1f"; depends=[]; }; - hapmap500knsp = derive2 { name="hapmap500knsp"; version="1.38.0"; sha256="0wpnr9xvpaki01hqkh5pm29d2vcb153646k9b9m3xvlv5ra3qr9f"; depends=[]; }; - hapmap500ksty = derive2 { name="hapmap500ksty"; version="1.38.0"; sha256="1g9kv2jd0527m000scr871pk08h98cf9b8mnasgbm5isvfpn0fwk"; depends=[]; }; - hapmapsnp5 = derive2 { name="hapmapsnp5"; version="1.38.0"; sha256="0dwfgz9pyx24mn3vncxp3ddb0bj42zxjd6p5pm34rzwzsw8zlvby"; depends=[]; }; - hapmapsnp6 = derive2 { name="hapmapsnp6"; version="1.38.0"; sha256="0byanf3i5yws4hwnxpd5b2vkr9iqvc0h2nlbxqhbc6b5ny7n0fsc"; depends=[]; }; - harbChIP = derive2 { name="harbChIP"; version="1.34.0"; sha256="1q17lynp7alv95p6vn515iamyqz3s0vhj3vnyzrjyhswb1vy3fs4"; depends=[Biobase Biostrings IRanges]; }; - healthyControlsPresenceChecker = derive2 { name="healthyControlsPresenceChecker"; version="1.0.0"; sha256="1sjicfsamv22r5f913g4xjspnrpqcrdcq5w9yqwqn7wz88sbarld"; depends=[geneExpressionFromGEO GEOquery magrittr xml2]; }; - healthyFlowData = derive2 { name="healthyFlowData"; version="1.34.0"; sha256="0iw2a6fdnhq1zqhldsrg7z8b55qg23l721rgx2i8v09ivsrk79hj"; depends=[flowCore]; }; - hgu133abarcodevecs = derive2 { name="hgu133abarcodevecs"; version="1.34.0"; sha256="1n4jhlgvqggyf2qa2iqxkxf6hqsaawq32h5r8ns904jdllq4ryp3"; depends=[]; }; - hgu133plus2CellScore = derive2 { name="hgu133plus2CellScore"; version="1.16.0"; sha256="1ws42wafyvr5931vjv0zcyfg979zhjms8kfmmcjjwqbvgp6b8nxd"; depends=[Biobase]; }; - hgu133plus2barcodevecs = derive2 { name="hgu133plus2barcodevecs"; version="1.34.0"; sha256="1q8a5away3iz8skc093djn85sakixhijr2i0yfhbl50y1jpfxn9c"; depends=[]; }; - hgu2beta7 = derive2 { name="hgu2beta7"; version="1.36.0"; sha256="0zmhxv5fjyfjxd7rqcr79yb8vkk014hinphmq604pzcdym29dmaa"; depends=[]; }; - humanStemCell = derive2 { name="humanStemCell"; version="0.36.0"; sha256="1i6gn462x09g9c6fb98bgchs7hwnrv5wanbpy41zcird6a8jb205"; depends=[Biobase hgu133plus2_db]; }; - imcdatasets = derive2 { name="imcdatasets"; version="1.4.1"; sha256="0ck6fyra8jj8v3x1pckl90m4a9ch51xgjs6nlpva5pkwffjldzq9"; depends=[cytomapper DelayedArray ExperimentHub HDF5Array S4Vectors SingleCellExperiment]; }; - kidpack = derive2 { name="kidpack"; version="1.38.0"; sha256="0pwrf9h1qgfb20jjd5izy6f01v14bzg43k2d8mmx3553ha9w1xi4"; depends=[Biobase]; }; - leeBamViews = derive2 { name="leeBamViews"; version="1.32.0"; sha256="0nqrg0k5g62kqbmhq0y795afx34zxzlmgsjszs8byfdhd8gbpz14"; depends=[Biobase BSgenome GenomicAlignments GenomicRanges IRanges Rsamtools S4Vectors]; }; - leukemiasEset = derive2 { name="leukemiasEset"; version="1.32.0"; sha256="1hzwdcfv0w4y877h4ahr2cmvv0svkjv73l77d7m309ikfbzmdqax"; depends=[Biobase]; }; - lumiBarnes = derive2 { name="lumiBarnes"; version="1.36.0"; sha256="072i02dshanxfxwpg7ibcp2vxyyqfw7q28r2a3f3lq9gph0pd865"; depends=[Biobase lumi]; }; - lungExpression = derive2 { name="lungExpression"; version="0.34.0"; sha256="1lskd4gapfhsrl5ydzv3bjs5n7085wzx91dq8bziv7pmhzl9pvyw"; depends=[Biobase]; }; - lydata = derive2 { name="lydata"; version="1.22.0"; sha256="1z48qsbbxxjlfwmb7xyasskdy95paab96077ps45v41cwkwjv7kd"; depends=[]; }; - mAPKLData = derive2 { name="mAPKLData"; version="1.28.0"; sha256="1122nnkhhcyrf36v3saybfi3llarjsa8fnh6f5c41d5x6fyjp2mf"; depends=[]; }; - mCSEAdata = derive2 { name="mCSEAdata"; version="1.16.0"; sha256="0n6dk7n7gi3ffdwvji6nkl90hhrb1jg0c1dyj0xrd8sf2cnpn8kh"; depends=[]; }; - macrophage = derive2 { name="macrophage"; version="1.12.0"; sha256="0ml8v92w021fmzsn4yl90ap3l4l3b9c1pk8pzsrm122p82wzlyms"; depends=[]; }; - mammaPrintData = derive2 { name="mammaPrintData"; version="1.32.0"; sha256="03h0pjwaasbb635l1csfrcsjzrfw18cmk071p9f4w57rkx11wbmi"; depends=[]; }; - maqcExpression4plex = derive2 { name="maqcExpression4plex"; version="1.40.0"; sha256="1smi1kaygc8gdcdkv358ghblwvsz8239g4ck2d4h8gq9z4jkkqn4"; depends=[]; }; - mcsurvdata = derive2 { name="mcsurvdata"; version="1.14.0"; sha256="0nrss5d2vb88wygsm4b44zxkaq619svjf8j3gg5r6x13ss5x0vcr"; depends=[AnnotationHub Biobase ExperimentHub]; }; - metaMSdata = derive2 { name="metaMSdata"; version="1.32.0"; sha256="0n1nnljns0aq8xxa881r8p72wwipfbx4046wz97034y39i0l9rcj"; depends=[]; }; - methylclockData = derive2 { name="methylclockData"; version="1.4.0"; sha256="0qzyc01rhmay3h1pmbk0jskszrmpgsng32j40j8wqnnpzhmklwf2"; depends=[ExperimentHub ExperimentHubData]; }; - miRNATarget = derive2 { name="miRNATarget"; version="1.34.0"; sha256="1yfsdkxc7ns4z0swrjg2pq3kfpgq9rrhrxsiqljnkw65c1g4h3q3"; depends=[Biobase]; }; - miRcompData = derive2 { name="miRcompData"; version="1.26.0"; sha256="1ww126vnlq2c36py0939i3vv7y6pf9kb6akgq8x96l90ri8zdpcg"; depends=[]; }; - microRNAome = derive2 { name="microRNAome"; version="1.18.0"; sha256="0p187zs1fhi55zm4yjbvx6xvdlynlm1r66x9dcd2xldwam8qmliz"; depends=[SummarizedExperiment]; }; - microbiomeDataSets = derive2 { name="microbiomeDataSets"; version="1.4.0"; sha256="1pbwx3cq78k333mmrmy8h68l1k3g3r62a8qjx8ysg8q99q1yn63w"; depends=[ape BiocGenerics Biostrings ExperimentHub MultiAssayExperiment SummarizedExperiment TreeSummarizedExperiment]; }; - minfiData = derive2 { name="minfiData"; version="0.42.0"; sha256="04idswjc4kslnpx1yf990pd8fl7wk5v9x4rgbv73d0s0g578ajd6"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest minfi]; }; - minfiDataEPIC = derive2 { name="minfiDataEPIC"; version="1.22.0"; sha256="0mkq4q39fjbal4qrx8vx51579kzhhyryk017cgjzqj9cwycyr720"; depends=[IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest minfi]; }; - minionSummaryData = derive2 { name="minionSummaryData"; version="1.26.0"; sha256="03h803p8xcndy5gsrdy20rb4714rxj31g31z82rg7hkwn0cvqxkx"; depends=[]; }; - mosaicsExample = derive2 { name="mosaicsExample"; version="1.34.0"; sha256="13fjkal88ag1dxw5n4dpkbzrnhffqjn4pym5vwzgnczyggz40c8y"; depends=[]; }; - mouse4302barcodevecs = derive2 { name="mouse4302barcodevecs"; version="1.34.0"; sha256="0ip3238dkyy9773q85535q09yawxnc1f1sdvl9s0ydys7v4rcxih"; depends=[]; }; - msPurityData = derive2 { name="msPurityData"; version="1.24.0"; sha256="05l7ym2vnspnkdl78f5b2jyby8x4qvjhmbhqmkd8nsz7sb2q2f67"; depends=[]; }; - msd16s = derive2 { name="msd16s"; version="1.16.0"; sha256="0bnvsfgsl8ssin8s7g3lmdfk9jvbbzs6cn748i5vl5ac96567bb5"; depends=[Biobase metagenomeSeq]; }; - msdata = derive2 { name="msdata"; version="0.36.0"; sha256="0nqb7d7fa9l15bxy3s9wmy2h79jb6ldwww0hzk5mifabacmzx691"; depends=[]; }; - msigdb = derive2 { name="msigdb"; version="1.4.0"; sha256="1qla2hjzq99513nyknhbb44zpp65q52j81mn6g9ya3wg9686ggvg"; depends=[AnnotationDbi AnnotationHub ExperimentHub GSEABase org_Hs_eg_db org_Mm_eg_db]; }; - msqc1 = derive2 { name="msqc1"; version="1.24.0"; sha256="0j0gqn32chs0vmcj309xk9y2qh856zj6ps16n39ad4d0bbc1l7y1"; depends=[lattice]; }; - mtbls2 = derive2 { name="mtbls2"; version="1.26.0"; sha256="1k0ravb8h23xvk8jlc1vh73slsw5alqcfdrw8p6mzggzfd6l189i"; depends=[]; }; - muscData = derive2 { name="muscData"; version="1.10.0"; sha256="1vwvjjd53j4im8jpckcgc4x9ldy3s8gzknc30yw1i67f4zw7zlcq"; depends=[ExperimentHub SingleCellExperiment]; }; - mvoutData = derive2 { name="mvoutData"; version="1.32.0"; sha256="08mmwc8x47wc91ncil6bqbhy1iz8hr153yma52zbsw0nhdhs7b87"; depends=[affy Biobase lumi]; }; - nanotubes = derive2 { name="nanotubes"; version="1.12.0"; sha256="0cm2d8wp6dy6m2jbj42inbba117zzf137g86xy07hn563izksqcw"; depends=[]; }; - nullrangesData = derive2 { name="nullrangesData"; version="1.2.0"; sha256="1yynisn5zw41kaspli9zs2k03w8ar457p0dsd37lph3cfdgniysv"; depends=[ExperimentHub GenomicRanges InteractionSet]; }; - oct4 = derive2 { name="oct4"; version="1.12.0"; sha256="0jkhk1p7z5ydxwab2g9ayhqfmxayrrwswr9lwbx84n7jm3gdkncr"; depends=[]; }; - optimalFlowData = derive2 { name="optimalFlowData"; version="1.8.0"; sha256="0g72cliwh3jpgz3qsfp3rv3glhp6v0ligfzp3kh0xgb6g9nwc246"; depends=[]; }; - pRolocdata = derive2 { name="pRolocdata"; version="1.34.0"; sha256="1b1kvnym9aigkpv4n1wp8ybp507hwiqv8hc3x4hv72kdlfphy0qh"; depends=[Biobase MSnbase]; }; - parathyroidSE = derive2 { name="parathyroidSE"; version="1.34.0"; sha256="1h33x55c4gbzmh085skqif04wdcvjp2l9fm55qzwws27kwd30c16"; depends=[SummarizedExperiment]; }; - pasilla = derive2 { name="pasilla"; version="1.24.0"; sha256="1vsxh7mv2krkbdqs5gsgjsxarjbll0bpyk94syrwh56z67n7jyib"; depends=[DEXSeq]; }; - pasillaBamSubset = derive2 { name="pasillaBamSubset"; version="0.34.0"; sha256="1dcnas0d592kcmnd95g3l13b8fxf0kiwbpyxmhfvrmms9i2d6dfc"; depends=[]; }; - pcxnData = derive2 { name="pcxnData"; version="2.18.0"; sha256="1gwc793c7r7qi5bmwlxh6fg59v8jzs753ilw102s5r4kq8r1fb4h"; depends=[]; }; - pd_atdschip_tiling = derive2 { name="pd.atdschip.tiling"; version="0.34.0"; sha256="1r9xqqgx2asn47j1ib1z3v5ybxd88mjfyi7b64llhlv1s9igp645"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; - pepDat = derive2 { name="pepDat"; version="1.16.0"; sha256="079wasdnd4j7pply4lmr7b41i84gj1x6yfp6pq7f7kbmr451c9hq"; depends=[GenomicRanges]; }; - plasFIA = derive2 { name="plasFIA"; version="1.24.0"; sha256="0r69msj7yby4kw2nj1am7ww7ia7kian4bpx2j3v4il909hw8xr76"; depends=[proFIA]; }; - plotgardenerData = derive2 { name="plotgardenerData"; version="1.2.0"; sha256="0arag030zfvpd6niq5bxxkkc3dg86hhl9dcbh1knjgqa3njfyh50"; depends=[]; }; - ppiData = derive2 { name="ppiData"; version="0.34.0"; sha256="10xbp12wim5kj1h2vkxn9x22fd92s2038w653y81jwbh2hyidybf"; depends=[AnnotationDbi graph]; }; - prebsdata = derive2 { name="prebsdata"; version="1.32.0"; sha256="1sza6d27rx05dg7xbzypjjf2h7m4jawhb2y0w1n8k9d57b9m6sij"; depends=[]; }; - preciseTADhub = derive2 { name="preciseTADhub"; version="1.4.0"; sha256="0sraqrvhxf7xva522rsj9hhl0hhb89fxrihywbw2w0vpv7ia08j7"; depends=[ExperimentHub]; }; - prostateCancerCamcap = derive2 { name="prostateCancerCamcap"; version="1.24.0"; sha256="0kyfr8s89dv9psl4r0g7mr02y8yvsjpd6k2iqzbdwj3jqhwxcw4p"; depends=[Biobase]; }; - prostateCancerGrasso = derive2 { name="prostateCancerGrasso"; version="1.24.0"; sha256="1qsaz1fqf9iky3a4sjy0di4bamg3996qna99jcxp7nal0bj1q44j"; depends=[Biobase]; }; - prostateCancerStockholm = derive2 { name="prostateCancerStockholm"; version="1.24.0"; sha256="0a9yph83xrpql6k5ixic37v3ccpyf358d0ia5bgn05xfacd1il4b"; depends=[Biobase]; }; - prostateCancerTaylor = derive2 { name="prostateCancerTaylor"; version="1.24.0"; sha256="1g657bfhk2x5gldkxy3k4c66cjnlj0j5j0daza9y8sdibk6cagxf"; depends=[Biobase]; }; - prostateCancerVarambally = derive2 { name="prostateCancerVarambally"; version="1.24.0"; sha256="17pz2k8h1i9x37d2j4v4ybnyn2fl79d839bv41jxiciacxp3az5c"; depends=[Biobase]; }; - ptairData = derive2 { name="ptairData"; version="1.4.0"; sha256="1lplv1g38a7d3mlqdy18b7n9n2l834a2rqifsvvxdfimww8vdihq"; depends=[rhdf5 signal]; }; - pumadata = derive2 { name="pumadata"; version="2.32.0"; sha256="1zw60nvpdbnnbfr6ffjbhp7aay9xlk8r4dwi8di9g2352xp9i14h"; depends=[Biobase oligo puma]; }; - pwrEWAS_data = derive2 { name="pwrEWAS.data"; version="1.10.0"; sha256="11p1z66q6bpvh89cp1rqnm0kkfkdxfm47p7nfd9c45y15qpzbplw"; depends=[ExperimentHub]; }; - qPLEXdata = derive2 { name="qPLEXdata"; version="1.14.0"; sha256="046xpnqp4pdvldbmw4klkjlhpzvjhv1zq8vamzzqc9hni6sjl3cc"; depends=[dplyr knitr MSnbase qPLEXanalyzer]; }; - rRDPData = derive2 { name="rRDPData"; version="1.16.0"; sha256="0lnff12cb120dl48pi5p2sc77vp4zapr35w9p9l669hwdlvy2jv5"; depends=[rRDP]; }; - rcellminerData = derive2 { name="rcellminerData"; version="2.18.0"; sha256="1bpsdnhdkyva7rbcxgwf0y85dngs2l43hb2c5wp6iafzvnb402dp"; depends=[Biobase]; }; - restfulSEData = derive2 { name="restfulSEData"; version="1.18.0"; sha256="095iv7hvdl26y2mbwa3cv0gdr7gn3irgwm72cvz4y5lkr4ifyafx"; depends=[DelayedArray ExperimentHub HDF5Array SummarizedExperiment]; }; - rheumaticConditionWOLLBOLD = derive2 { name="rheumaticConditionWOLLBOLD"; version="1.34.0"; sha256="1yc5vz3cvpwk449lga3f5w1x1xjp8a7c17k30z3wim4iv6g8ag9x"; depends=[]; }; - sampleClassifierData = derive2 { name="sampleClassifierData"; version="1.20.0"; sha256="1sg4h9pw3lwa1k01s9nhbh1l0w8w81q6m254hqs1ga8k8kawkvap"; depends=[SummarizedExperiment]; }; - scATAC_Explorer = derive2 { name="scATAC.Explorer"; version="1.2.1"; sha256="1ks9fh82jqg9kcfkb1ys6b42j1074zffp1lyb3h287dw6yv8zxx5"; depends=[BiocFileCache data_table Matrix S4Vectors SingleCellExperiment]; }; - scRNAseq = derive2 { name="scRNAseq"; version="2.10.0"; sha256="131x1q69grn16rr7lr6vyphds5mdx5z3kc6nhpfisrxjia9dly0x"; depends=[AnnotationDbi AnnotationHub BiocGenerics ensembldb ExperimentHub GenomicFeatures GenomicRanges S4Vectors SingleCellExperiment SummarizedExperiment]; }; - scTHI_data = derive2 { name="scTHI.data"; version="1.8.0"; sha256="1awrjw0fhypxlz7s4lj0fvhmj0av8xgh191zz5imqvimfzjvf985"; depends=[]; }; - scanMiRData = derive2 { name="scanMiRData"; version="1.2.0"; sha256="06d91vwbirp75f5aaflny7ngfhnz834a1750vah2x1jwikd427zg"; depends=[scanMiR]; }; - scpdata = derive2 { name="scpdata"; version="1.4.0"; sha256="0rxrsay1ifzwkd32jjfa91phnjvndk136w5is01rx1hzibpv1x7j"; depends=[AnnotationHub ExperimentHub QFeatures S4Vectors SingleCellExperiment]; }; - seq2pathway_data = derive2 { name="seq2pathway.data"; version="1.28.0"; sha256="0ay0gzjl6j4aqaq7cybqw0cv3xfxhg83psib3z0m438gs2in1011"; depends=[]; }; - seqCNA_annot = derive2 { name="seqCNA.annot"; version="1.32.0"; sha256="0khf5mjl9slfvba6x876j8d2ngijwxfm8k2d01fj9sh3hdbi7y8n"; depends=[]; }; - seqc = derive2 { name="seqc"; version="1.30.0"; sha256="1x9cs6sfzwnppkb80n1vgy3lj85bk7c81994r3c12sna5sil8df7"; depends=[Biobase]; }; - serumStimulation = derive2 { name="serumStimulation"; version="1.32.0"; sha256="18mbg1n6c38qcz4r5n83x2796hb0wqhzqv997nlvjmxrzb53sh9z"; depends=[]; }; - sesameData = derive2 { name="sesameData"; version="1.14.0"; sha256="1c9bcrah4vz2035px6yv8djqrmpnn7i6y01pgy1hqlwsn24px3nf"; depends=[AnnotationHub ExperimentHub GenomeInfoDb GenomicRanges IRanges readr S4Vectors stringr]; }; - seventyGeneData = derive2 { name="seventyGeneData"; version="1.32.0"; sha256="0axbgyn0cqhfq7mqivawpd0q268r2njm3igv6hjqcvvp2s7gzffn"; depends=[]; }; - shinyMethylData = derive2 { name="shinyMethylData"; version="1.16.0"; sha256="1ww9abjsqyyprz5706d4ny3i42a0czrdmxjaq3wlryiqgn54jrl3"; depends=[]; }; - signatureSearchData = derive2 { name="signatureSearchData"; version="1.10.0"; sha256="1wq9pk2g4zriijrlc6bqizi4rvmag3m0nrnml3qhqhn1jcc065g3"; depends=[affy Biobase dplyr ExperimentHub limma magrittr R_utils rhdf5]; }; - simpIntLists = derive2 { name="simpIntLists"; version="1.32.0"; sha256="07jscl1yd3dix0igsxw1fsyhsgqhqf0la6p6958jypy2chih4wp8"; depends=[]; }; - spatialDmelxsim = derive2 { name="spatialDmelxsim"; version="1.2.0"; sha256="126agbyablnn3b2gh4fkvlqf1mm1krvk01bxl0x41f6l4dm5gj6a"; depends=[ExperimentHub SummarizedExperiment]; }; - spatialLIBD = derive2 { name="spatialLIBD"; version="1.8.11"; sha256="0yk749566rcvcw415s8ix185jf1vvmip2079mf81kjr8jsmlmz4c"; depends=[AnnotationHub benchmarkme BiocFileCache BiocGenerics cowplot DT ExperimentHub fields GenomicRanges ggplot2 golem IRanges jsonlite magick Matrix paletteer plotly png RColorBrewer rtracklayer S4Vectors scater sessioninfo shiny shinyWidgets SingleCellExperiment SpatialExperiment SummarizedExperiment tibble viridisLite]; }; - spqnData = derive2 { name="spqnData"; version="1.8.0"; sha256="190jkvra5zsml0hxmw96nxg3fz5cnq6apcxcqsncq9raz30w8qqq"; depends=[SummarizedExperiment]; }; - stemHypoxia = derive2 { name="stemHypoxia"; version="1.32.0"; sha256="0rfnka092sd0qb6vs7yawwkjw763rdaayyr7bv4618qqx2i6kllz"; depends=[]; }; - stjudem = derive2 { name="stjudem"; version="1.36.0"; sha256="0a7qrs9r76zlzd6kmfid8wzvv3k47y3w95ydqphd5pic9c6r56a3"; depends=[]; }; - synapterdata = derive2 { name="synapterdata"; version="1.34.0"; sha256="15lndkk8cgk5sy2ddc7g98nnjcd89j5a7c8kxz7jvd0j2vq1g0ga"; depends=[synapter]; }; - systemPipeRdata = derive2 { name="systemPipeRdata"; version="2.0.1"; sha256="1g5641hkx2di7j2kgd13v1zih4ddm9wljrzi7swr0dxb01vqvckh"; depends=[BiocGenerics Biostrings jsonlite remotes]; }; - tartare = derive2 { name="tartare"; version="1.10.0"; sha256="1857nmpd64zlbk0i7jk7ql04kkmyznr355jd3zml44x2zbip96mg"; depends=[AnnotationHub ExperimentHub]; }; - timecoursedata = derive2 { name="timecoursedata"; version="1.6.0"; sha256="0f2m6d4q6ayk6sqz3d4gnh4w9c5z91m4j8pjfi1932q4a86smhr5"; depends=[SummarizedExperiment]; }; - tinesath1cdf = derive2 { name="tinesath1cdf"; version="1.34.0"; sha256="01kb0papl4rac44bc4rmjmjx424xb00rw3dvnc78qzz03cx90xq4"; depends=[]; }; - tinesath1probe = derive2 { name="tinesath1probe"; version="1.34.0"; sha256="0cadrq4aklyzy3sflnpwy8n4r7pkmb3mn0n1y0yqpljlqbdd9g8l"; depends=[AnnotationDbi]; }; - tissueTreg = derive2 { name="tissueTreg"; version="1.16.0"; sha256="14hiv2d3z502j334342ab0rqf1qwapf2g56ipbwm4jdw2yz2aqbd"; depends=[]; }; - tofsimsData = derive2 { name="tofsimsData"; version="1.24.0"; sha256="1gykmyv9lyylpha5a2fh2n0dhmd70mnhr502m0kimwg5hr2z1w8z"; depends=[]; }; - topdownrdata = derive2 { name="topdownrdata"; version="1.18.0"; sha256="0d0532jc8lpqh99yqygl4mxg7al4a74mdm8j45a36qa4q53m4xpf"; depends=[topdownr]; }; - tuberculosis = derive2 { name="tuberculosis"; version="1.2.0"; sha256="0b9286bcb4c4ygalrp2la1s48rq7csz83l2svgbx9da6jdc32n65"; depends=[AnnotationHub dplyr ExperimentHub magrittr purrr rlang S4Vectors stringr SummarizedExperiment tibble tidyr]; }; - tweeDEseqCountData = derive2 { name="tweeDEseqCountData"; version="1.34.0"; sha256="0wnplck86wsc8d86cvk2a6w21s809cpvzdj1y17x1p5f9f0zkra7"; depends=[Biobase]; }; - tximportData = derive2 { name="tximportData"; version="1.24.0"; sha256="0mgbwpybg2xd6x1ijrflmjh5w63qz6ylnzszbbyp437n618m7riy"; depends=[]; }; - vulcandata = derive2 { name="vulcandata"; version="1.18.0"; sha256="1y5gjk6l97bdyk1pm9c2yqszcykd0pdmc81sn7g4m0x81mhd81c6"; depends=[]; }; - xcoredata = derive2 { name="xcoredata"; version="1.0.0"; sha256="0qwg720yhjkmdhh6i5g4pwwf2pfjbxj74nb9n20sypzc673dab9z"; depends=[ExperimentHub]; }; - yeastCC = derive2 { name="yeastCC"; version="1.36.0"; sha256="1mpfsn9iyw37yxipdczj15hnxyvdrcn5sr2xvqlxj7csyfp2kxw9"; depends=[Biobase]; }; - yeastExpData = derive2 { name="yeastExpData"; version="0.42.0"; sha256="0sg4lr09s0iw99j7j7fq9xfaidnfxc4n0jjgnhghpdcqymm8ns82"; depends=[graph]; }; - yeastGSData = derive2 { name="yeastGSData"; version="0.34.0"; sha256="0bbqj899cr6d1nkf80bcbksnp4689kp38hg74gwvbj8ln7v0f7mk"; depends=[]; }; - yeastNagalakshmi = derive2 { name="yeastNagalakshmi"; version="1.32.0"; sha256="0rb3mf94g5px7xk7r25xjgx9hiawjlkv9zsqf6n2z2gnglfplic1"; depends=[]; }; - yeastRNASeq = derive2 { name="yeastRNASeq"; version="0.34.0"; sha256="0167p4g10ixbmnjyh08yz8dsai6d1ifr8ms5vd6jgmfwddznk8mi"; depends=[]; }; - zebrafishRNASeq = derive2 { name="zebrafishRNASeq"; version="1.16.0"; sha256="0nsdm0fvqjak54rg2f2jsn3l0a1y53mzb7pm2f7p0x75a7ays9p5"; depends=[]; }; + ALL = derive2 { name="ALL"; version="1.40.0"; sha256="1klf604g4m0g6y12swqz9f8gc20k0c79sxzj7zk6v4jadi1fhsqw"; depends=[Biobase]; }; + ALLMLL = derive2 { name="ALLMLL"; version="1.38.0"; sha256="1r6ny7v9q4h6gx7i28rp9w7a120ln9kd77a4ygiiy92s9d5qi6xn"; depends=[affy]; }; + ARRmData = derive2 { name="ARRmData"; version="1.34.0"; sha256="1c48gfb5h0chfs205hgl5gfb1rlsz355cv5xq0acj9cvzwv25sh6"; depends=[]; }; + ASICSdata = derive2 { name="ASICSdata"; version="1.18.0"; sha256="0s2zfa42yfx5mcbngp979fca6afszxgflrzhn7spry4y071xvkvb"; depends=[]; }; + Affyhgu133A2Expr = derive2 { name="Affyhgu133A2Expr"; version="1.34.0"; sha256="1bkzak8pwdz23isrfvw71y3y0jbmy11v50wg4z4xhwp0fhfk21fw"; depends=[]; }; + Affyhgu133Plus2Expr = derive2 { name="Affyhgu133Plus2Expr"; version="1.32.0"; sha256="1vvcia75d4n29kph83pi0ihrkjfl2jb46qvwzrhjyccxp1l16bvc"; depends=[]; }; + Affyhgu133aExpr = derive2 { name="Affyhgu133aExpr"; version="1.36.0"; sha256="03dsz3wzxrxykq4km8787n6082i1r140s4afw6r3m29yfk02rqfy"; depends=[]; }; + AffymetrixDataTestFiles = derive2 { name="AffymetrixDataTestFiles"; version="0.36.0"; sha256="15dddf2kzcdpvmskszsyxb9i613632d0dfjfv01mlbmvd4q0h20s"; depends=[]; }; + Affymoe4302Expr = derive2 { name="Affymoe4302Expr"; version="1.36.0"; sha256="125firpilbi9xlb61cp641g972cwqd23p9vrpczicjw6dm6mh5km"; depends=[]; }; + AmpAffyExample = derive2 { name="AmpAffyExample"; version="1.38.0"; sha256="0v2r91h6ydzyrcn4ryhrd5q0p5dlq6w1alcfbbk43nvmjqidm2r3"; depends=[affy]; }; + AneuFinderData = derive2 { name="AneuFinderData"; version="1.26.0"; sha256="01g4g0sz46psi86792fqyazr6vzbcrcrhzw2k9k94cawppnlfnwh"; depends=[]; }; + AshkenazimSonChr21 = derive2 { name="AshkenazimSonChr21"; version="1.28.0"; sha256="109qzyjhvmpm0q6ghfvsmrrskvjd6djlki7kn63jfsfqphx1v7db"; depends=[]; }; + AssessORFData = derive2 { name="AssessORFData"; version="1.16.0"; sha256="092f1nivs9xvibbs380ahwfx3f7msnbbb62bj94ihs2swsq7b1y8"; depends=[DECIPHER]; }; + BeadArrayUseCases = derive2 { name="BeadArrayUseCases"; version="1.36.0"; sha256="079qj26622s9jb2kw1wpd5bjihmj3a9mif4y86zjna7jm1jdvzv8"; depends=[beadarray GEOquery limma]; }; + BeadSorted_Saliva_EPIC = derive2 { name="BeadSorted.Saliva.EPIC"; version="1.6.0"; sha256="0mh10sg95djkzp9w7bjr4ggy86a0pakfi2008fk4xikjc3q7ky24"; depends=[ExperimentHub minfi]; }; + BioImageDbs = derive2 { name="BioImageDbs"; version="1.6.0"; sha256="0r4m5qchzglpx4dn95ss0xfd3cqd7vxafjg869y8fxpayjn11dqg"; depends=[animation AnnotationHub EBImage einsum ExperimentHub filesstrings magick magrittr markdown rmarkdown]; }; + BioPlex = derive2 { name="BioPlex"; version="1.4.2"; sha256="091d9gywkkbgd922sgqqqnj20sjnrsarqrhqbw99x9ccnfzqr2jn"; depends=[BiocFileCache GenomeInfoDb GenomicRanges GEOquery graph SummarizedExperiment]; }; + BloodCancerMultiOmics2017 = derive2 { name="BloodCancerMultiOmics2017"; version="1.18.0"; sha256="1284qhij9663b382aq4nq3zl3jjsj5gdh3bfqj6sjfvbvx4pmcpg"; depends=[beeswarm Biobase DESeq2 devtools dplyr ggdendro ggplot2 glmnet gtable ipflasso RColorBrewer reshape2 scales SummarizedExperiment survival tibble]; }; + CCl4 = derive2 { name="CCl4"; version="1.36.0"; sha256="09zja5jzz7lh11cyjvczfgic8z4bq35j6f63irwwizxvp861w902"; depends=[Biobase limma]; }; + CLL = derive2 { name="CLL"; version="1.38.0"; sha256="109sspddzqg08gqf5xacf2vbjs672i2d3n6a6wzr8isdyar40xx1"; depends=[affy Biobase]; }; + CLLmethylation = derive2 { name="CLLmethylation"; version="1.18.0"; sha256="0xagl4f5cn9wax4jjh4csfd4p53ljnh09b063rk8dqm7adr2c788"; depends=[ExperimentHub SummarizedExperiment]; }; + COHCAPanno = derive2 { name="COHCAPanno"; version="1.34.0"; sha256="0fps1b4kfhv4n1gm3yqspjbrh6gnq8hl1q2apzb1ir1gnfm28ird"; depends=[]; }; + CONFESSdata = derive2 { name="CONFESSdata"; version="1.26.0"; sha256="03dyzdj79377srmcxh3fc0z321g3mkcp88lknwndw1xa44n2hqd5"; depends=[]; }; + COPDSexualDimorphism_data = derive2 { name="COPDSexualDimorphism.data"; version="1.34.0"; sha256="05m5288ilcisifnhkq6vdgrchhkp21nc8kmdm7kdszl9d4xrj7mq"; depends=[]; }; + COSMIC_67 = derive2 { name="COSMIC.67"; version="1.34.0"; sha256="0ga0islkm9m4qry37qkw8z0zs7amqky7fy0i418k9gn0ba06xd0s"; depends=[GenomicRanges SummarizedExperiment VariantAnnotation]; }; + CRCL18 = derive2 { name="CRCL18"; version="1.18.0"; sha256="0515xmrbhvkw8zk62ivyzlr8p0mmmqbayy73vdwzz3a5gd3zh7zl"; depends=[Biobase]; }; + CardinalWorkflows = derive2 { name="CardinalWorkflows"; version="1.30.0"; sha256="17hwxp251ghwmlywa7rxvlj0m3fqdf3pm57m0rfxnda0izx6xvk2"; depends=[Cardinal]; }; + CellMapperData = derive2 { name="CellMapperData"; version="1.24.0"; sha256="192jaz5fss0bz64jn52c7lnj81ih89dhrz6pjkyllsh8ffvqb067"; depends=[CellMapper ExperimentHub]; }; + ChAMPdata = derive2 { name="ChAMPdata"; version="2.30.0"; sha256="0rz762szfl02h4d3dj7ckd41ji9mdsja8nxqw6fl086z337041zw"; depends=[BiocGenerics GenomicRanges]; }; + ChIC_data = derive2 { name="ChIC.data"; version="1.18.0"; sha256="1ii43y280mqb0csa3g7xrw3aj1lsl4rk1hnakg27jnjk7c36jg0c"; depends=[caret genomeIntervals randomForest]; }; + ChIPXpressData = derive2 { name="ChIPXpressData"; version="1.36.0"; sha256="049y1mvf7d1ajqnk1hs72ak41j16dz2zhsmq3b6817a4frrnmb0a"; depends=[bigmemory]; }; + ChIPexoQualExample = derive2 { name="ChIPexoQualExample"; version="1.22.0"; sha256="1jgvf953b3pmkri02avajmqx7p0ylljdl4v2qiwvxi0gxzlb2qwn"; depends=[]; }; + ChimpHumanBrainData = derive2 { name="ChimpHumanBrainData"; version="1.36.0"; sha256="1jlm1l5vkk18r0y5jk0rz8a30f71cpzq5wimff4xnka30zkk83r9"; depends=[affy hexbin limma qvalue statmod]; }; + CluMSIDdata = derive2 { name="CluMSIDdata"; version="1.14.0"; sha256="0qnhs5kvf9a1vsg1y4ky6cb0awnf9fj6n4n37yz9ss7dl3rpn3qk"; depends=[]; }; + ConnectivityMap = derive2 { name="ConnectivityMap"; version="1.34.0"; sha256="0f7spc4l9y8hrv6fscgxj9fy9hnqm9h8r4nya97jzbwryj9yzm2s"; depends=[]; }; + CopyNeutralIMA = derive2 { name="CopyNeutralIMA"; version="1.16.0"; sha256="0s3fp0pblwpf8g1ply64n9kq41mn59gyf1wh9lncks8sfxdk1h0a"; depends=[ExperimentHub Rdpack]; }; + CopyhelpeR = derive2 { name="CopyhelpeR"; version="1.30.0"; sha256="19yqcvfji8263wdcqmjbmmz2xzi0nl9d4jdwsqrvv6ja5pqm2l7w"; depends=[]; }; + DAPARdata = derive2 { name="DAPARdata"; version="1.28.0"; sha256="0ix3z12g2xff16bkiynly8y75ygrapv65p1ml9z7p4ap04rd718v"; depends=[MSnbase]; }; + DExMAdata = derive2 { name="DExMAdata"; version="1.6.0"; sha256="16k017y3bf0z3h05gldb611hl10vqllyl5346nnpmw8pqihcq5by"; depends=[Biobase]; }; + DLBCL = derive2 { name="DLBCL"; version="1.38.0"; sha256="1adzmfk67xl3lqlhkbb6r2kkprkbjwb6n77ynj4mx6gi4b3s8b2n"; depends=[Biobase]; }; + DMRcatedata = derive2 { name="DMRcatedata"; version="2.16.0"; sha256="1p67kw8l8367rkn72wjlsdc4gw1cbpi8w928dmpa1x833ypfpkc6"; depends=[ExperimentHub GenomicFeatures Gviz IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylationEPICanno_ilm10b4_hg19 plyr readxl rtracklayer]; }; + DeSousa2013 = derive2 { name="DeSousa2013"; version="1.34.0"; sha256="0zk9z0bmn15wsrscdh30cxps1c5qi06xhzbvl8v2lals6hxqgixz"; depends=[affy AnnotationDbi Biobase cluster ConsensusClusterPlus frma frmaTools gplots hgu133plus2_db hgu133plus2frmavecs pamr rgl ROCR siggenes survival sva]; }; + DmelSGI = derive2 { name="DmelSGI"; version="1.30.0"; sha256="1isn7ay22dpvnsdjlmanfj7pdqnim4dcrq2rf8dflydgjq6hc06k"; depends=[abind gplots igraph knitr limma rhdf5 TSP]; }; + DonaPLLP2013 = derive2 { name="DonaPLLP2013"; version="1.36.0"; sha256="1xq303q0wmrk73band29yfpb8dacg6187qxpr3pqacksj3dsp70m"; depends=[EBImage]; }; + DropletTestFiles = derive2 { name="DropletTestFiles"; version="1.8.0"; sha256="1yzq3yddqv06j1j3wpw92ydsgi2k67dirvjn7127iwpp865hs12r"; depends=[AnnotationHub ExperimentHub S4Vectors]; }; + DrugVsDiseasedata = derive2 { name="DrugVsDiseasedata"; version="1.34.0"; sha256="1j8mnkk71w2wp18wp65z2rwj4ql5s6pqggv2rd02l0jq9n89w8wl"; depends=[]; }; + DuoClustering2018 = derive2 { name="DuoClustering2018"; version="1.16.0"; sha256="0dha80wlb9w1brq22lfmcm267axkm56pwfxcd1szbsg3w2fv3wrn"; depends=[dplyr ExperimentHub ggplot2 ggthemes magrittr mclust purrr reshape2 tidyr viridis]; }; + DvDdata = derive2 { name="DvDdata"; version="1.34.0"; sha256="1x22s36aq8ppyphc58gsd5s7chkkkf6dhand39c8b9npybx9rx8d"; depends=[]; }; + EGSEAdata = derive2 { name="EGSEAdata"; version="1.26.0"; sha256="0df556k4wbwmn8cjpfq38c3mxicncz2j4f9f7xxsj5gjd2ww2p2r"; depends=[]; }; + ELMER_data = derive2 { name="ELMER.data"; version="2.22.0"; sha256="1603g55jkdq3f66xp84cj7x3f7bgw2s4bhscyjvb1hagcnwg48lf"; depends=[GenomicRanges]; }; + EatonEtAlChIPseq = derive2 { name="EatonEtAlChIPseq"; version="0.36.0"; sha256="1bpm8ds36iydbd4nv5ifrp8spdlx21k14dx18awm61d9wzg6fk1p"; depends=[GenomicRanges rtracklayer ShortRead]; }; + EpiMix_data = derive2 { name="EpiMix.data"; version="1.0.0"; sha256="1n65fyq8syiaix876ll1zjjx5cm9k63p92x9by6xbpv1xqmqbpzz"; depends=[ExperimentHub]; }; + FANTOM3and4CAGE = derive2 { name="FANTOM3and4CAGE"; version="1.34.0"; sha256="06fqm4rj5c6l1aynvz3xqv9lk8w1s57m9ncfb2729sgyp7zg64pp"; depends=[]; }; + FIs = derive2 { name="FIs"; version="1.26.0"; sha256="13f8q3gjgbbycp6g81jr5aq5w759mhs4niacqbzmfa5bksvsmlmn"; depends=[]; }; + FieldEffectCrc = derive2 { name="FieldEffectCrc"; version="1.8.0"; sha256="0bcsvgjr03z5r2xxlzrzcpqw0vqh0vfghrwlsismxp8dp46kjr25"; depends=[AnnotationHub BiocStyle DESeq2 ExperimentHub RUnit SummarizedExperiment]; }; + Fletcher2013a = derive2 { name="Fletcher2013a"; version="1.34.0"; sha256="1dgqhgmzhfnwyjr1wcz41ggri8i63d9b4malr1izd8gnh9c80an3"; depends=[Biobase gplots limma VennDiagram]; }; + Fletcher2013b = derive2 { name="Fletcher2013b"; version="1.34.0"; sha256="1hhsyk98q23j2d5y4l4kj15vypms9yn7skw3wcxmwl95cgdwzb9s"; depends=[Fletcher2013a igraph RColorBrewer RedeR RTN]; }; + FlowSorted_Blood_450k = derive2 { name="FlowSorted.Blood.450k"; version="1.36.0"; sha256="1ha9qsp5g3g2yhnk574x6xhg95bb29ywvmg3ns1c50z69v6wbraq"; depends=[minfi]; }; + FlowSorted_Blood_EPIC = derive2 { name="FlowSorted.Blood.EPIC"; version="2.2.0"; sha256="1vybj69jxnirqg6ik03q3pb1vv23z8mir7wpi2ys7iljf5ixzgl1"; depends=[AnnotationHub ExperimentHub genefilter minfi nlme quadprog S4Vectors SummarizedExperiment]; }; + FlowSorted_CordBlood_450k = derive2 { name="FlowSorted.CordBlood.450k"; version="1.26.0"; sha256="08wyfv2z8xcmany5m9lpz3lv7ql4qq95vb14fvq7bmhy1ahbr9by"; depends=[minfi]; }; + FlowSorted_CordBloodCombined_450k = derive2 { name="FlowSorted.CordBloodCombined.450k"; version="1.14.0"; sha256="062dk56shf41qdd4wm8g8vgbcg1bpj24v9x7q4kvb2cmcqyr233s"; depends=[AnnotationHub ExperimentHub IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylationEPICanno_ilm10b4_hg19 minfi SummarizedExperiment]; }; + FlowSorted_CordBloodNorway_450k = derive2 { name="FlowSorted.CordBloodNorway.450k"; version="1.24.0"; sha256="0c6v5cxw3xy0zlw3dlfx5gwijlkwmq4m2irg04j9fng90zm2kmh2"; depends=[minfi]; }; + FlowSorted_DLPFC_450k = derive2 { name="FlowSorted.DLPFC.450k"; version="1.34.0"; sha256="0nchavb8jwkp7jpf5nkfdzavjqjsr7d9g3cll7w2zczgz00ysfij"; depends=[minfi]; }; + GIGSEAdata = derive2 { name="GIGSEAdata"; version="1.16.0"; sha256="0ryrsmjsvv02p9zrcw6h45c8hrq6pvg3r18j3jbcsz069awsy9ik"; depends=[]; }; + GSBenchMark = derive2 { name="GSBenchMark"; version="1.18.0"; sha256="0n1ag0a34hfrfrnnzdd6n2dk05hxrpgr9mfnxlnyffcn36fv7fwv"; depends=[]; }; + GSE103322 = derive2 { name="GSE103322"; version="1.4.0"; sha256="148p24hh7j07ny2jxwnvk5lq6313xmaqmn80amv1qvf78wfnf3bf"; depends=[Biobase GEOquery]; }; + GSE13015 = derive2 { name="GSE13015"; version="1.6.0"; sha256="1r3w675f53n0z6ii6xlsahyg33mc0zmcsirgp2nb4ab6r22y36sa"; depends=[Biobase GEOquery preprocessCore SummarizedExperiment]; }; + GSE159526 = derive2 { name="GSE159526"; version="1.4.0"; sha256="125q8bl3qaf8lnadqh96g651y8ydkcsg8szcni1rjsnw6hhqasxm"; depends=[]; }; + GSE62944 = derive2 { name="GSE62944"; version="1.26.0"; sha256="1d3zyyir01i4isqbk1sjy1d0jkrjqiyciyqqklhigk1jyk4irpvj"; depends=[Biobase GEOquery]; }; + GSVAdata = derive2 { name="GSVAdata"; version="1.34.0"; sha256="009y1ywfb11d9yrqnknjgynpm732fixrg8xk49ggf1m0r8qd7p0k"; depends=[Biobase GSEABase hgu95a_db]; }; + GWASdata = derive2 { name="GWASdata"; version="1.36.0"; sha256="0nibj1n8gqzrrfpggryfl80zk68hf3a3n4ndjqi9rnn5kl9aw5b6"; depends=[GWASTools]; }; + GenomicDistributionsData = derive2 { name="GenomicDistributionsData"; version="1.6.0"; sha256="1ascrsvildfcp4kqzy9zdx97dyqkdl8nhkv356sqy6scd4fdjknf"; depends=[AnnotationFilter AnnotationHub BSgenome data_table ensembldb ExperimentHub GenomeInfoDb GenomicFeatures GenomicRanges]; }; + GeuvadisTranscriptExpr = derive2 { name="GeuvadisTranscriptExpr"; version="1.26.0"; sha256="0mkzaqsqqyn9d4z3cgr10csimqklxqvymsjphn05m8d5dhfzcwn7"; depends=[]; }; + HCAData = derive2 { name="HCAData"; version="1.14.0"; sha256="14734jlxq0l3l3187frw40qfsgx7cv04hxl772wvaahnd8wmga9z"; depends=[AnnotationHub ExperimentHub HDF5Array SingleCellExperiment]; }; + HD2013SGI = derive2 { name="HD2013SGI"; version="1.38.0"; sha256="0i2sv80qw3svk8kl8yrg4n6mxjw589fz0kpqn9hbaj07z57g7rb5"; depends=[EBImage geneplotter gplots limma LSD RColorBrewer splots vcd]; }; + HDCytoData = derive2 { name="HDCytoData"; version="1.18.0"; sha256="1fn8q6ds10z3ymdarkfyh88pcqnrry9yhzammp84vf86f0bl8mrc"; depends=[ExperimentHub flowCore SummarizedExperiment]; }; + HEEBOdata = derive2 { name="HEEBOdata"; version="1.36.0"; sha256="1jm0i9d6vwbhp7xxy571n0c4gc8zga0vividkkk5wkr3mzc00qm6"; depends=[]; }; + HIVcDNAvantWout03 = derive2 { name="HIVcDNAvantWout03"; version="1.38.0"; sha256="0yf0xwkjhb6inxpxy2r258zkqmx286v7d0hcrp9s2jy1jxsvzyrg"; depends=[]; }; + HMP16SData = derive2 { name="HMP16SData"; version="1.18.0"; sha256="1zp5s3c95nkq4ngm6v96wah4h1y47pgwxpg1x8w0ysjiswjag74f"; depends=[AnnotationHub assertthat dplyr ExperimentHub kableExtra knitr magrittr readr S4Vectors stringr SummarizedExperiment tibble]; }; + HMP2Data = derive2 { name="HMP2Data"; version="1.12.0"; sha256="1m57kd35m7j8jvai5lh252433s14fn181vpm4bz38wqh4dj41qhs"; depends=[AnnotationHub assertthat data_table dplyr ExperimentHub kableExtra knitr magrittr MultiAssayExperiment phyloseq readr S4Vectors SummarizedExperiment]; }; + HSMMSingleCell = derive2 { name="HSMMSingleCell"; version="1.18.0"; sha256="0ir4vd88p0pfh4sbsks65dijxadxj2xdc5rrjznvchj39ia48lp9"; depends=[]; }; + HarmanData = derive2 { name="HarmanData"; version="1.26.0"; sha256="17gl8j02gnninbq386b7jmbnai77hg3w78lvikcm1450mlk1vkk3"; depends=[]; }; + HarmonizedTCGAData = derive2 { name="HarmonizedTCGAData"; version="1.20.0"; sha256="07gh5gfzprdvv0cif999k2v8rijhjqsyw6yrmn6mf2hyf7hc09r1"; depends=[ExperimentHub]; }; + HelloRangesData = derive2 { name="HelloRangesData"; version="1.24.0"; sha256="01mdjz9l6fnzd4yz31xyhraqczd64dsay37pqmc1w9kd9934sfrm"; depends=[]; }; + HiCDataHumanIMR90 = derive2 { name="HiCDataHumanIMR90"; version="1.18.0"; sha256="0l9v1hycb47cjmk1k1b8vvry7amqgl74l72qigznx9h64dl0vqpc"; depends=[]; }; + HiCDataLymphoblast = derive2 { name="HiCDataLymphoblast"; version="1.34.0"; sha256="1il9j759bw6h84v9ap1wf5fvn4i34nhdn0rb9flls1xbrmi1bsl6"; depends=[]; }; + HiContactsData = derive2 { name="HiContactsData"; version="1.0.0"; sha256="1hp46qr1abllmqqimgk8lp2fb7mfb9zc9kqcfzc8fx7jbyxsqj7q"; depends=[AnnotationHub BiocFileCache ExperimentHub]; }; + HighlyReplicatedRNASeq = derive2 { name="HighlyReplicatedRNASeq"; version="1.10.0"; sha256="1v6qd15k36ynmy45kd5rg7rfs9xp054jgbwksxc0hz3v50nqjl6w"; depends=[ExperimentHub S4Vectors SummarizedExperiment]; }; + Hiiragi2013 = derive2 { name="Hiiragi2013"; version="1.34.0"; sha256="0a87ldx5hwlvk64ynd4jm0mf3sbn2yxq2d87c9gwpcc471jglqn6"; depends=[affy Biobase boot clue cluster genefilter geneplotter gplots gtools KEGGREST lattice latticeExtra MASS mouse4302_db RColorBrewer xtable]; }; + HumanAffyData = derive2 { name="HumanAffyData"; version="1.24.0"; sha256="0sbxl4jh697220888ssi825iiakzj94m4k871lg42xn22d7991wc"; depends=[Biobase ExperimentHub]; }; + IHWpaper = derive2 { name="IHWpaper"; version="1.26.0"; sha256="01p50lcybzr8bk7hdzmi71bwwy51xan5wba2ppis6z68gjvyn4hf"; depends=[Biobase BiocGenerics BiocParallel cowplot DESeq2 dplyr fdrtool genefilter ggplot2 IHW qvalue Rcpp SummarizedExperiment]; }; + ITALICSData = derive2 { name="ITALICSData"; version="2.36.0"; sha256="09d2igic3b5p7wpq98hb2lffxm1nfq9mwmnqlbdn3jv49pgz3hmw"; depends=[]; }; + Illumina450ProbeVariants_db = derive2 { name="Illumina450ProbeVariants.db"; version="1.34.0"; sha256="1c1iqxi17s1a1sa1vab2ma7pjq1dxal7ibsiahj66ys0pa4sm42p"; depends=[]; }; + IlluminaDataTestFiles = derive2 { name="IlluminaDataTestFiles"; version="1.36.0"; sha256="0xsnp9bxsmsrqnlshd0g8smqmianlna8vapln96ix47mjj0hcq9c"; depends=[]; }; + Iyer517 = derive2 { name="Iyer517"; version="1.40.0"; sha256="0y8a5rsnk0m6x4sfp8fnc7c54fv3pwsps19h4hfs0qxzvxzzjrf3"; depends=[Biobase]; }; + JASPAR2014 = derive2 { name="JASPAR2014"; version="1.34.0"; sha256="0g95w9fk7rjn39xqcpyxx87mzizrkmpmrh76msgkmwpmdvjz6hkh"; depends=[Biostrings]; }; + JASPAR2016 = derive2 { name="JASPAR2016"; version="1.26.0"; sha256="1y60fslisdxwm27g0sjzjg6r5qf8bjp4hyb1k2plxpdarvl7jzqf"; depends=[]; }; + KEGGandMetacoreDzPathwaysGEO = derive2 { name="KEGGandMetacoreDzPathwaysGEO"; version="1.18.0"; sha256="0x582iygpw580i8afdxw41jn7gv6mp0hcy9mx8n75nkknvzs4w0g"; depends=[Biobase BiocGenerics]; }; + KEGGdzPathwaysGEO = derive2 { name="KEGGdzPathwaysGEO"; version="1.36.0"; sha256="09syk5d39blzzi1z8l8w1ia8ahrxhrwync7kmlwnvssbd5q1q0rd"; depends=[Biobase BiocGenerics]; }; + KOdata = derive2 { name="KOdata"; version="1.24.0"; sha256="1kclj56823bc9mn8r3khwfwak342ja69afcmllfg2cfr4al6ikgh"; depends=[]; }; + LRcellTypeMarkers = derive2 { name="LRcellTypeMarkers"; version="1.6.0"; sha256="0r0p7v482d9r06cwgqy23la238dff9ga70iap7wyhn8xdfcp7rfm"; depends=[ExperimentHub]; }; + LiebermanAidenHiC2009 = derive2 { name="LiebermanAidenHiC2009"; version="0.36.0"; sha256="03vgrpgw3sqfrvbgm7r6avwkl85qmxl4fy0r92ikh8wr6waw7a62"; depends=[IRanges KernSmooth]; }; + ListerEtAlBSseq = derive2 { name="ListerEtAlBSseq"; version="1.30.0"; sha256="1733sz2qhkrvalx0vk7xa2plddz40psfmnfpq3zkf6v4i1cvnvmx"; depends=[methylPipe]; }; + LungCancerACvsSCCGEO = derive2 { name="LungCancerACvsSCCGEO"; version="1.34.0"; sha256="10fbjpk50nqpm91r9fw94q8dqcz1jg4smbjjx2nbwvl1qzzr1qpj"; depends=[]; }; + LungCancerLines = derive2 { name="LungCancerLines"; version="0.36.0"; sha256="053zb04n45mypnaws2g4id6pzlbmgdzwrg7x3i6gcw566vdai82n"; depends=[Rsamtools]; }; + M3DExampleData = derive2 { name="M3DExampleData"; version="1.24.0"; sha256="0cmgb0qx78awjx6gcf5nyd7am0p86ga9l7ps8h8z9llr0d0yr0hc"; depends=[]; }; + MACSdata = derive2 { name="MACSdata"; version="1.6.0"; sha256="04pimm8g4m2mahrpdwc45l1cnsg8h0737qh932k9g9740pmhv1pd"; depends=[]; }; + MAQCsubset = derive2 { name="MAQCsubset"; version="1.36.0"; sha256="0k40plz86v4bwcwny0zd3icq4zjqfglbnrk957bvbsgacjag87cq"; depends=[affy Biobase lumi]; }; + MAQCsubsetILM = derive2 { name="MAQCsubsetILM"; version="1.36.0"; sha256="1vr0avq39p8hg5zzx6fy1n9p4anvlcjbngkhiq6nprmp2s8064vg"; depends=[Biobase lumi]; }; + MEDIPSData = derive2 { name="MEDIPSData"; version="1.34.0"; sha256="1h9dhirmq30j9jds21f1a3jvijy9z0mp9j08phd79sallkcvsqna"; depends=[]; }; + MEEBOdata = derive2 { name="MEEBOdata"; version="1.36.0"; sha256="0klm6xv25g3x7yf814l1jbi16cknb2xbh6yn1cx9a0p3rgm49j1l"; depends=[]; }; + MIGSAdata = derive2 { name="MIGSAdata"; version="1.22.0"; sha256="01sz73h1xkqck6d0yliy2i4nx0v980bxm30y7rn6g3nxw9qs5q1m"; depends=[]; }; + MMAPPR2data = derive2 { name="MMAPPR2data"; version="1.12.0"; sha256="1k5ay043ys2npmmb2mk01cpdxvl1ccysl5bw5aj9d2h7mixxfc27"; depends=[Rsamtools]; }; + MMDiffBamSubset = derive2 { name="MMDiffBamSubset"; version="1.34.0"; sha256="0hnvjsbj6iaaaqslgfnqzlk59q6fmyzsjbscqvl2pfdiliy2mkix"; depends=[]; }; + MOFAdata = derive2 { name="MOFAdata"; version="1.14.0"; sha256="141rvb3ra457hgc8hhskc4j6xl6k7f13amrlrw5nvx4n77wfsv8b"; depends=[]; }; + MSMB = derive2 { name="MSMB"; version="1.16.0"; sha256="0rz9cvpsnq0lnbahnpsbdxwcvh6z7id3lrzcr2bcxvnkj4ah95q4"; depends=[tibble]; }; + MUGAExampleData = derive2 { name="MUGAExampleData"; version="1.18.0"; sha256="1f2zsy950rn437cgqpai5nlchpza100sf2acqdq8cyqiq4ip7q8j"; depends=[]; }; + MerfishData = derive2 { name="MerfishData"; version="1.0.0"; sha256="0jcq6n0x57i11c793alj3kj813vs37fmi01z5yl1lsx41cgflpll"; depends=[AnnotationHub BumpyMatrix EBImage ExperimentHub S4Vectors SpatialExperiment SummarizedExperiment]; }; + MetaGxBreast = derive2 { name="MetaGxBreast"; version="1.18.0"; sha256="0wjgk3j9r6shk7ava3isdyiihdf7b9dz701jkv3nhg87x3nhvwfh"; depends=[AnnotationHub Biobase ExperimentHub impute lattice SummarizedExperiment]; }; + MetaGxOvarian = derive2 { name="MetaGxOvarian"; version="1.18.0"; sha256="0miznxb2d7smfzcyddhx64lip9xxn4bcq7x2f9fn9047qfky0w9i"; depends=[AnnotationHub Biobase ExperimentHub impute lattice SummarizedExperiment]; }; + MetaGxPancreas = derive2 { name="MetaGxPancreas"; version="1.18.0"; sha256="1icm9y4x2qglp9gy66j71ngn61snbxy3gz3m6mdgj2vw02f93xif"; depends=[AnnotationHub ExperimentHub impute S4Vectors SummarizedExperiment]; }; + MethylAidData = derive2 { name="MethylAidData"; version="1.30.0"; sha256="0j53ilxqvl7gaplkmrslz1ywm3fybqyri2psdr5c34kay7j50sng"; depends=[MethylAid]; }; + MethylSeqData = derive2 { name="MethylSeqData"; version="1.8.0"; sha256="0rfl5xz23kbvjxf2sf25j526a8252dvd6zmg4x9pj7fqyf7yvfdd"; depends=[ExperimentHub GenomeInfoDb GenomicRanges HDF5Array IRanges rhdf5 S4Vectors SummarizedExperiment]; }; + MicrobiomeBenchmarkData = derive2 { name="MicrobiomeBenchmarkData"; version="1.0.0"; sha256="06m0yi3379g8kvhs0amcc9r5d0np9xwq2a85vk8iz3xi6sqbbbzj"; depends=[ape BiocFileCache S4Vectors SummarizedExperiment TreeSummarizedExperiment]; }; + MouseGastrulationData = derive2 { name="MouseGastrulationData"; version="1.12.0"; sha256="0icgs53mfaiary8gjifasjalc9942fr876w61bxssdg7v4jn76ss"; depends=[BiocGenerics BumpyMatrix ExperimentHub S4Vectors SingleCellExperiment SpatialExperiment SummarizedExperiment]; }; + MouseThymusAgeing = derive2 { name="MouseThymusAgeing"; version="1.6.0"; sha256="0y5xibhd5w37ks3fvn6gsgqd5whxvg1rbd4li2ank0v56mvazfij"; depends=[BiocGenerics ExperimentHub S4Vectors SingleCellExperiment SummarizedExperiment]; }; + NCIgraphData = derive2 { name="NCIgraphData"; version="1.34.0"; sha256="0sismlawhq1dz29v1532x5ha1n2pdv2fa43kzma4xdf1vafj5ham"; depends=[]; }; + NGScopyData = derive2 { name="NGScopyData"; version="1.18.0"; sha256="1w3hpmqf6030smwb4r61czwz0qsr2kz8z11q8z8819bj0czvr32x"; depends=[]; }; + NanoporeRNASeq = derive2 { name="NanoporeRNASeq"; version="1.8.0"; sha256="0k548ib7yi29xcs2c0y46c3vwi6fkqsp3njwbn4acm85pr93z54g"; depends=[ExperimentHub]; }; + NestLink = derive2 { name="NestLink"; version="1.14.0"; sha256="0qk0c506j2gwp25hyqriii7cwh1h2rbvhahm1akxvr4j1v2pk01l"; depends=[AnnotationHub Biostrings ExperimentHub gplots protViz ShortRead]; }; + NetActivityData = derive2 { name="NetActivityData"; version="1.0.0"; sha256="12h25q7vp23rac1d3lgf99fclj2h3615bkxfhy117971i4n2z4i4"; depends=[]; }; + Neve2006 = derive2 { name="Neve2006"; version="0.36.0"; sha256="0i7l60ys7mnqllx30r6g8jif460z90j8cw59jv13hbym5dhdk4bi"; depends=[annotate Biobase hgu133a_db]; }; + NxtIRFdata = derive2 { name="NxtIRFdata"; version="1.4.0"; sha256="1k0krkmp13l9w6jwidc1snm5z11g3wgw2pmp9jzsxyxjimha0vh2"; depends=[BiocFileCache ExperimentHub R_utils rtracklayer]; }; + OMICsPCAdata = derive2 { name="OMICsPCAdata"; version="1.16.0"; sha256="16jyvgj9rcinsjixczwq6rw8wpl0lxyf7h5sajf47306nxx5w073"; depends=[MultiAssayExperiment]; }; + ObMiTi = derive2 { name="ObMiTi"; version="1.6.0"; sha256="04hcr5ng7gqz6200zvdkfgrw1j3zkvqqh6yn5zsf9q2vwxibxyz5"; depends=[ExperimentHub SummarizedExperiment]; }; + OnassisJavaLibs = derive2 { name="OnassisJavaLibs"; version="1.20.0"; sha256="1338j9fqcizrfnx7wi97qpsa14yyzy34hb11q3017ry1hkhy28qd"; depends=[rJava]; }; + PCHiCdata = derive2 { name="PCHiCdata"; version="1.26.0"; sha256="10nlrqsxv655d489fy1vchgi4iw3pfxr6xwhylgcj94nigfy632y"; depends=[Chicago]; }; + PREDAsampledata = derive2 { name="PREDAsampledata"; version="0.38.0"; sha256="1wmvx2vp8yfz4mx4gmcgvisxp5cn0cf3pznxh01gwiaydpafiskr"; depends=[affy annotate Biobase PREDA]; }; + PWMEnrich_Dmelanogaster_background = derive2 { name="PWMEnrich.Dmelanogaster.background"; version="4.32.0"; sha256="1bikxs5h6wl8l3l6avgh42h3d8yz1b98s15fggl62gkncaygqfr7"; depends=[PWMEnrich]; }; + PWMEnrich_Hsapiens_background = derive2 { name="PWMEnrich.Hsapiens.background"; version="4.32.0"; sha256="0ckvjrzr7hqr7lls7z8pdg58k0xpm7hnk8dl2vfy03ddgl7ma34v"; depends=[PWMEnrich]; }; + PWMEnrich_Mmusculus_background = derive2 { name="PWMEnrich.Mmusculus.background"; version="4.32.0"; sha256="1hwlwkmvkf9q3vi9c7ipr3h6hfrda5xm6gbzv03bmc3pcwwqa2j9"; depends=[PWMEnrich]; }; + PasillaTranscriptExpr = derive2 { name="PasillaTranscriptExpr"; version="1.26.0"; sha256="0mhb68rm3dmzdpm7x0ffyz9a44fidgr1gxpnwxppslklrnm7g24q"; depends=[]; }; + PathNetData = derive2 { name="PathNetData"; version="1.34.0"; sha256="131d10id8b93hd7g0z3rl4z8cvv5h5gdi3x636b2z2is821jvnbr"; depends=[]; }; + PepsNMRData = derive2 { name="PepsNMRData"; version="1.16.0"; sha256="13n9calm3k480sxcgqhvw519m1ss51ysiin7cxhipjfjf8fdnbkb"; depends=[]; }; + PhyloProfileData = derive2 { name="PhyloProfileData"; version="1.12.0"; sha256="1kpg1a2p6cb4xa7ynlr3wmx7hx1l2xhxccbyqd8mnwn0r52njwmw"; depends=[BiocStyle Biostrings ExperimentHub]; }; + ProData = derive2 { name="ProData"; version="1.36.0"; sha256="06bmlgwyw4m7cirlvhvsl9qhmczv8rv0aj5ckickwzdcxyig9bjw"; depends=[Biobase]; }; + PtH2O2lipids = derive2 { name="PtH2O2lipids"; version="1.24.0"; sha256="076q31wxfrxbgyhp4m0d7rxfpi3vvh9950lhcadf92mz6rc39hi0"; depends=[CAMERA LOBSTAHS xcms]; }; + QDNAseq_hg19 = derive2 { name="QDNAseq.hg19"; version="1.28.0"; sha256="0mszcm31wvzz4sd9909x3ngbd0gdg7iyyxqwmn6ish8f3aj7b5zg"; depends=[QDNAseq]; }; + QDNAseq_mm10 = derive2 { name="QDNAseq.mm10"; version="1.28.0"; sha256="19i559hx0lbn3m0ihx4wxl8zwskbfwhyzywl8aan165f7snj8has"; depends=[QDNAseq]; }; + QUBICdata = derive2 { name="QUBICdata"; version="1.26.0"; sha256="1ibffdqc2szj48g6a9ysqwr499bfx706ki0436jwcyxgql2rwbi3"; depends=[]; }; + RGMQLlib = derive2 { name="RGMQLlib"; version="1.18.0"; sha256="0jsmqibzlclxg4sa73wk63z9l798g1hjl1amjpjy1xb1mn585bhc"; depends=[]; }; + RITANdata = derive2 { name="RITANdata"; version="1.22.0"; sha256="0wx5i8i5aq6zqrr134fl42a0a97zgrjkmwqh3n2ds5bdn5iylk4g"; depends=[]; }; + RLHub = derive2 { name="RLHub"; version="1.4.0"; sha256="1gdlg3sfpf2dpkxiaq0m2mmkpyj7v3jqb9paq6ii89l0df2rmrlb"; depends=[AnnotationHub ExperimentHub]; }; + RMassBankData = derive2 { name="RMassBankData"; version="1.36.0"; sha256="0hkg0w2d8r2r661a7jrpki79ycxnibqwghra4aql9dxqvwrz5qxi"; depends=[]; }; + RNASeqRData = derive2 { name="RNASeqRData"; version="1.16.0"; sha256="17c5fvyqxdsg7wl0hy0i28z0kf2lmjg36lfrmsv51kzklsc6ykrp"; depends=[]; }; + RNAinteractMAPK = derive2 { name="RNAinteractMAPK"; version="1.36.0"; sha256="1fpcaqvffb4qrcqs1flvhjggycdxcy93jbj3x5196kz4h9i23fvk"; depends=[Biobase fields gdata genefilter lattice MASS RNAinteract sparseLDA]; }; + RNAmodR_Data = derive2 { name="RNAmodR.Data"; version="1.12.0"; sha256="1qb753pa6vz4m98s5bqjan70ygqdg4v8jkz440hdq20m2fl54k8w"; depends=[ExperimentHub ExperimentHubData]; }; + RNAseqData_HNRNPC_bam_chr14 = derive2 { name="RNAseqData.HNRNPC.bam.chr14"; version="0.36.0"; sha256="1w1af68xbpwqmpvvsd1i7jhs4vpxsbn3x277dgg7lgf9gwzsac50"; depends=[]; }; + RRBSdata = derive2 { name="RRBSdata"; version="1.18.0"; sha256="02j98pnn8pprrx7y1038w5gzb9cw2wf96vryjp17w92k5shv0v5j"; depends=[BiSeq]; }; + RTCGA_CNV = derive2 { name="RTCGA.CNV"; version="1.26.0"; sha256="0va9ijh2f10c24z0am0rhsdxy0s35cmbsyxfrsysdn56vlz4hprl"; depends=[RTCGA]; }; + RTCGA_PANCAN12 = derive2 { name="RTCGA.PANCAN12"; version="1.26.0"; sha256="0ha4pz9a85jm74yhp5hylgcs3xkcv81b3h5svcrpzwgz4bb34cny"; depends=[RTCGA]; }; + RTCGA_RPPA = derive2 { name="RTCGA.RPPA"; version="1.26.0"; sha256="1h0438li369ziwdjvdvyzfnsxrp8sf28xxkxywivy8ihkcq28pxy"; depends=[RTCGA]; }; + RTCGA_clinical = derive2 { name="RTCGA.clinical"; version="20151101.28.0"; sha256="03qp4h7vks5dra741f795i5pjryh5x2313xx7zy7fz996sd1q7q7"; depends=[RTCGA]; }; + RTCGA_mRNA = derive2 { name="RTCGA.mRNA"; version="1.26.0"; sha256="1srd8aswa4sgm9k1w0ymd7vcvwlkhb8i075yyh7zs4a4w1jwavh4"; depends=[RTCGA]; }; + RTCGA_methylation = derive2 { name="RTCGA.methylation"; version="1.26.0"; sha256="0ncgzr3z0yi613ryz2w8lgmyrkzigzfgc6w6jrdgxik3yvkl6b13"; depends=[RTCGA]; }; + RTCGA_miRNASeq = derive2 { name="RTCGA.miRNASeq"; version="1.26.0"; sha256="0rslg5pmnk5dllvahfjrira8mxg7pfaimnqci3jsi78qqb7wdgfi"; depends=[RTCGA]; }; + RTCGA_mutations = derive2 { name="RTCGA.mutations"; version="20151101.28.0"; sha256="089zy9bmwmwmihldgcw423sngjwq0vrx7bazrm3xl2psvcfday0g"; depends=[RTCGA]; }; + RTCGA_rnaseq = derive2 { name="RTCGA.rnaseq"; version="20151101.28.0"; sha256="0q5k6g944xzlhivwzni7azw44rvahz7hgc9bkbbx17dpgz0nkl6y"; depends=[RTCGA]; }; + RUVnormalizeData = derive2 { name="RUVnormalizeData"; version="1.18.0"; sha256="0l7cv7za7jknwa3jw3110jba31hmsf5wf0sys5kbg1jgkvv0g7ci"; depends=[Biobase]; }; + RcisTarget_hg19_motifDBs_cisbpOnly_500bp = derive2 { name="RcisTarget.hg19.motifDBs.cisbpOnly.500bp"; version="1.18.0"; sha256="1qld3cm8qhfxh7p5j0g2iq6i1bxcyhs88222sqyjqjl6i0z01wdf"; depends=[data_table]; }; + ReactomeGSA_data = derive2 { name="ReactomeGSA.data"; version="1.12.0"; sha256="1vm6s3n4v4ar3znlg4qlsllddp24wamz53qnmf6ay09wq0wyy9yv"; depends=[edgeR limma ReactomeGSA Seurat]; }; + RegParallel = derive2 { name="RegParallel"; version="1.16.0"; sha256="04qrk7x5b3g4r2j63w0cc2qbxqcljfkjv4qrdg0qmbn3p4gi5nqv"; depends=[arm data_table doParallel foreach iterators stringr survival]; }; + RforProteomics = derive2 { name="RforProteomics"; version="1.35.1"; sha256="1igdx4idgk1j0mcs8zjzd6bppj4nadryxhw2q026hazx6kj5qbxh"; depends=[BiocManager biocViews MSnbase R_utils]; }; + RnBeads_hg19 = derive2 { name="RnBeads.hg19"; version="1.30.0"; sha256="00aymammhqndzwfrb1c9lkpzsia20jqx7pysl3s80nbxga7rc2nj"; depends=[GenomicRanges]; }; + RnBeads_hg38 = derive2 { name="RnBeads.hg38"; version="1.30.0"; sha256="0fayz3kp02lshc42r27jwa7qd8yq6qb5g0kp1lbak062l8mzzjdp"; depends=[GenomicRanges]; }; + RnBeads_mm10 = derive2 { name="RnBeads.mm10"; version="2.6.0"; sha256="0wd55fkdjl1kdchadkd6npz7fmpbacs8mz9phnw7l12nn2qd4mdn"; depends=[GenomicRanges]; }; + RnBeads_mm9 = derive2 { name="RnBeads.mm9"; version="1.30.0"; sha256="17s3dpwhdv24fzk1x7ppyj63rg4rajz564dqplga9445rjb00dzd"; depends=[GenomicRanges]; }; + RnBeads_rn5 = derive2 { name="RnBeads.rn5"; version="1.30.0"; sha256="149i8l5fv0c2z467bacq8lr7ff5jibd2zxxw1p7icbq4k31bcap9"; depends=[GenomicRanges]; }; + RnaSeqSampleSizeData = derive2 { name="RnaSeqSampleSizeData"; version="1.30.0"; sha256="07zpwv4s8idgmjy87bpvjq0f0zvgmra7g31kghilslxiq5ywydw8"; depends=[edgeR]; }; + SBGNview_data = derive2 { name="SBGNview.data"; version="1.12.0"; sha256="1a541w5xik81ln571dg3r4iiwprk4xzl95diqqxq2qyivvj6v66w"; depends=[bookdown knitr rmarkdown]; }; + SCATEData = derive2 { name="SCATEData"; version="1.8.0"; sha256="05q33yxj99g0xbha3a7qibpcp33y98p6242lsl3my6p48fby7rh7"; depends=[ExperimentHub GenomicAlignments GenomicRanges]; }; + SCLCBam = derive2 { name="SCLCBam"; version="1.30.0"; sha256="0969p97x5w7vwaq51bjcdclz40k9yphlr66l92rnvcl3wqbvrs0i"; depends=[]; }; + SFEData = derive2 { name="SFEData"; version="1.0.2"; sha256="1kan3yii88rz9bb3rqgrcvc30pkvrjywhwfax7q51rsz71wvb52i"; depends=[AnnotationHub BiocFileCache ExperimentHub]; }; + SNAData = derive2 { name="SNAData"; version="1.44.0"; sha256="133d7ky4sv7msyxxqja6rnf66c1yphx7zh0xzjf6gni4r09a7jp9"; depends=[graph]; }; + SNAGEEdata = derive2 { name="SNAGEEdata"; version="1.34.0"; sha256="02an8d31yd7ryvpy2ldlf52gsyql1waz0qh8d3xsx96p9cg9il2y"; depends=[]; }; + SNPhoodData = derive2 { name="SNPhoodData"; version="1.28.0"; sha256="0668whnkan61jxxi9iykaz1ny0929vnbhb27p7qngc5m92l1zja9"; depends=[]; }; + STexampleData = derive2 { name="STexampleData"; version="1.6.0"; sha256="0mmc41px0yz7mij6gdnjcf8vifwk8p03jy7b5lvylfggbfng579z"; depends=[ExperimentHub SpatialExperiment]; }; + SVM2CRMdata = derive2 { name="SVM2CRMdata"; version="1.30.0"; sha256="1rjkm6sdhwn4nhswqv5jhlqz4002grslz97lcp5k9i5bsl9yy5lf"; depends=[]; }; + SimBenchData = derive2 { name="SimBenchData"; version="1.6.0"; sha256="0jb82fb9mqiqh9b4nn2cryylzgk5g9yibcyin8wydmv4sk8xxm5w"; depends=[ExperimentHub S4Vectors]; }; + Single_mTEC_Transcriptomes = derive2 { name="Single.mTEC.Transcriptomes"; version="1.26.0"; sha256="1r4sal6cv91lp4sjxqqg291x1jv16iq0wi34wm0r0mjnfycw6x6n"; depends=[]; }; + SingleCellMultiModal = derive2 { name="SingleCellMultiModal"; version="1.10.0"; sha256="0mjy130147sg1jp45niydrsinnxn6i9v4jjmlanwyf1kghl4hx7y"; depends=[AnnotationHub BiocFileCache BiocGenerics ExperimentHub HDF5Array Matrix MultiAssayExperiment S4Vectors SingleCellExperiment SpatialExperiment SummarizedExperiment]; }; + SingleMoleculeFootprintingData = derive2 { name="SingleMoleculeFootprintingData"; version="1.6.0"; sha256="0mq5y03yzpxdhhlws9y3g9mz0kr3q3g38a566cvp18mmhxp3414k"; depends=[ExperimentHub]; }; + SomatiCAData = derive2 { name="SomatiCAData"; version="1.36.0"; sha256="1sshapw93rbiqn9i3rg3xls7836hvg87qsl7awp17gzqlqap4331"; depends=[]; }; + SomaticCancerAlterations = derive2 { name="SomaticCancerAlterations"; version="1.34.0"; sha256="1zahhn2b10187hbljp9nppvr94iz067yasfgxalkhkxl09pdpksx"; depends=[GenomicRanges IRanges S4Vectors]; }; + SpikeIn = derive2 { name="SpikeIn"; version="1.40.0"; sha256="0r0lgzr0wrfvhl4fs4w5qcj0ykmngfrn341jgrxh13wn1cdk9yk9"; depends=[affy]; }; + SpikeInSubset = derive2 { name="SpikeInSubset"; version="1.38.0"; sha256="0546mwyacdhcgglfgqkq2c02nzvq1a8pkybggnlvyz1bhrrg51ay"; depends=[affy Biobase]; }; + TBX20BamSubset = derive2 { name="TBX20BamSubset"; version="1.34.0"; sha256="0na9f3i33h33xpbybgmxwf00mdvyvmgyfvpbj813wcrlp0m2zzhm"; depends=[Rsamtools xtable]; }; + TCGAMethylation450k = derive2 { name="TCGAMethylation450k"; version="1.34.0"; sha256="19y43lxmzhly8q3xszlkz7l5v76agyflcjvz0z7bliri1hpxx6bk"; depends=[]; }; + TCGAWorkflowData = derive2 { name="TCGAWorkflowData"; version="1.22.0"; sha256="02w9blh9igpflvjmfcxmnw5czjjlmh92ks1y0jhx72fz5g13mq3a"; depends=[SummarizedExperiment]; }; + TCGAbiolinksGUI_data = derive2 { name="TCGAbiolinksGUI.data"; version="1.18.0"; sha256="0q1h4z1x47x5y618j4z2zp4lfhm85s0240nmzi8l8129sqfmb9m5"; depends=[]; }; + TCGAcrcmRNA = derive2 { name="TCGAcrcmRNA"; version="1.18.0"; sha256="14qxsi6mn83c02mhvzs2qss59a8ld1vc94kmy03c9l3p5jcb9352"; depends=[Biobase]; }; + TCGAcrcmiRNA = derive2 { name="TCGAcrcmiRNA"; version="1.18.0"; sha256="0fx3vxyc89gr2k3wnx5wlqxi6ml45hyijwbf5f7crijzh6avwhbh"; depends=[Biobase]; }; + TENxBUSData = derive2 { name="TENxBUSData"; version="1.12.0"; sha256="0zqsnw0ppmh8f6x8j8ldpfza9308lspasgzbm1qw3cqa5sf2620w"; depends=[AnnotationHub BiocGenerics ExperimentHub]; }; + TENxBrainData = derive2 { name="TENxBrainData"; version="1.18.0"; sha256="1mk1vjqqnpc83x5m0js3j59vxi43yp4wrzj6yrrx7rn10xz26x03"; depends=[AnnotationHub ExperimentHub HDF5Array SingleCellExperiment]; }; + TENxPBMCData = derive2 { name="TENxPBMCData"; version="1.16.0"; sha256="0551izai1apxs4xz9rd0f12dpbjk2qr0sz8bb69h4rxrbp2jg7r6"; depends=[AnnotationHub ExperimentHub HDF5Array SingleCellExperiment]; }; + TENxVisiumData = derive2 { name="TENxVisiumData"; version="1.6.0"; sha256="0z31bqcw2mjqx1vv34z55zcy2s2xnzj1h53j4nmxbwfncj40b9sm"; depends=[ExperimentHub SpatialExperiment]; }; + TMExplorer = derive2 { name="TMExplorer"; version="1.8.0"; sha256="13prp9ksh3k5w84bbvk731fda1psb45mi56dwd9n958rj27mwkgb"; depends=[BiocFileCache Matrix SingleCellExperiment]; }; + TabulaMurisData = derive2 { name="TabulaMurisData"; version="1.16.0"; sha256="0yy9bl3qqcyp8pw4afx90nn0z1zw070qhanwdlim0c4fg5p6g02l"; depends=[ExperimentHub]; }; + TabulaMurisSenisData = derive2 { name="TabulaMurisSenisData"; version="1.4.0"; sha256="1xmim64br8zx57l50ip7sbyjfdwhlr8j29gzf00i610dmksb2sii"; depends=[AnnotationHub ExperimentHub gdata HDF5Array SingleCellExperiment SummarizedExperiment]; }; + TargetScoreData = derive2 { name="TargetScoreData"; version="1.34.0"; sha256="0n7lr3qvppy9pbvff66mk5dc9399afac7f3kn3xkfzpcfjc27b1z"; depends=[]; }; + TargetSearchData = derive2 { name="TargetSearchData"; version="1.36.0"; sha256="0dwsq9cclzxp7f6lhg22cs62gm60pgwx0w9z3h13zvign43ha8r1"; depends=[]; }; + TimerQuant = derive2 { name="TimerQuant"; version="1.28.0"; sha256="0b2vh4xcns8ypmjig42zggws7pffclic57sl7w1cdmynpmn4jr33"; depends=[deSolve dplyr ggplot2 gridExtra locfit shiny]; }; + VariantToolsData = derive2 { name="VariantToolsData"; version="1.22.0"; sha256="13hgmciikp246nwp0wk4528fad4ccmc587x8s45zg9ybi3ya00iw"; depends=[BiocGenerics GenomicRanges VariantAnnotation]; }; + VectraPolarisData = derive2 { name="VectraPolarisData"; version="1.2.0"; sha256="0gl92bypw6axdwj83dxmvib7p72dl1n5vqfrsy398fahx24djwln"; depends=[ExperimentHub SpatialExperiment]; }; + WES_1KG_WUGSC = derive2 { name="WES.1KG.WUGSC"; version="1.30.0"; sha256="0yi72kdihvrxf7w72fn24bs5r89pg10kc9myl8n4nmf2iiplcn0c"; depends=[]; }; + WGSmapp = derive2 { name="WGSmapp"; version="1.10.0"; sha256="0lgfmpmnwpmrg05nz8vxlkz3jwy6gkd74fl7a2f81bh2lrs4bgh1"; depends=[GenomicRanges]; }; + WeberDivechaLCdata = derive2 { name="WeberDivechaLCdata"; version="1.0.0"; sha256="1zqc26n7945b024ln82yqp5zpsmb7d5bi8zgj8hqnm09bna3qiil"; depends=[ExperimentHub SingleCellExperiment SpatialExperiment]; }; + XhybCasneuf = derive2 { name="XhybCasneuf"; version="1.36.0"; sha256="1r09wr45vjcr7yxxfi5l132bqg380bicdlz699961hbinvyg7pgc"; depends=[affy ath1121501cdf RColorBrewer tinesath1cdf]; }; + adductData = derive2 { name="adductData"; version="1.14.0"; sha256="0yfgjvq7qk5gvdjhrh2lyz77c6jd438ykd2mpfm6643zr2bkxp4g"; depends=[AnnotationHub ExperimentHub]; }; + affycompData = derive2 { name="affycompData"; version="1.36.0"; sha256="0qcjlm2i0z8z6ab7dknwl1pdmxv69hyfpj61lhygn8ks02al12kn"; depends=[affycomp Biobase]; }; + affydata = derive2 { name="affydata"; version="1.46.0"; sha256="1k2npkq41ik7c1cniz22vm9970ylrc3cjfr38iy5x5zmh8i35ypn"; depends=[affy]; }; + airway = derive2 { name="airway"; version="1.18.0"; sha256="0l706h1flvv4zz82w3qyj73g28cw094vsx4iq7ahhh0vyyxg9bjx"; depends=[SummarizedExperiment]; }; + alpineData = derive2 { name="alpineData"; version="1.24.0"; sha256="00r7ks6rgiwhqsayhv6l9z7i65jxgdvlj73r2mx6c04fg0nqp3y8"; depends=[AnnotationHub ExperimentHub GenomicAlignments]; }; + antiProfilesData = derive2 { name="antiProfilesData"; version="1.34.0"; sha256="0kxya21ycp8fwkqbiziggf3k5y2d344qr1bk0yvncgjf7qvydfrb"; depends=[Biobase]; }; + aracne_networks = derive2 { name="aracne.networks"; version="1.24.0"; sha256="1hynz34hjc49vb2di23zs921p2k0cy3b923s20g7ajfz827cpjsd"; depends=[viper]; }; + bcellViper = derive2 { name="bcellViper"; version="1.34.0"; sha256="1fpgh70x2r68v0ximgcdphnyzq2hgiwbamyhbac3yka8flhrd1fm"; depends=[Biobase]; }; + beadarrayExampleData = derive2 { name="beadarrayExampleData"; version="1.36.0"; sha256="15fmqxlp28j4mrbkg9fjk35ki8s15xn9kbh928cni2722b5pvxml"; depends=[beadarray Biobase]; }; + benchmarkfdrData2019 = derive2 { name="benchmarkfdrData2019"; version="1.12.0"; sha256="1zhxd4y7d4j34cpvrhidz2rqd4n7ngj7wpk1klpfn3kdrsm7s4my"; depends=[ExperimentHub SummarizedExperiment]; }; + beta7 = derive2 { name="beta7"; version="1.36.0"; sha256="13g2n1nywj5pd1pvhvwqqyc8q7vzxnlm9345ivfk0vnvafdvadmr"; depends=[marray]; }; + biotmleData = derive2 { name="biotmleData"; version="1.22.0"; sha256="0vizblf5sv5mj9j5w3wy48pv75c97bf4lcxd0fsz73lcfz446ja4"; depends=[]; }; + biscuiteerData = derive2 { name="biscuiteerData"; version="1.12.0"; sha256="0a2sk4f7lxllja3pbawd5apkcvlh2flw6xa69vn71860fi9k831v"; depends=[AnnotationHub curl ExperimentHub]; }; + bladderbatch = derive2 { name="bladderbatch"; version="1.36.0"; sha256="13zgwh3g6iy4pdq8w5wx5nmzh4ypc17d6apm9c1mv3y4xaya7i1h"; depends=[Biobase]; }; + blimaTestingData = derive2 { name="blimaTestingData"; version="1.18.0"; sha256="0wyvskjn3kfqlnfll36c86cb9gxj4vj194mvpy2p8mbmarhpb2qr"; depends=[]; }; + bodymapRat = derive2 { name="bodymapRat"; version="1.14.0"; sha256="1jfa3i1d1llhqqa5pxbj7raj09sw4j7ayclnr5325n49cblvrgln"; depends=[ExperimentHub SummarizedExperiment]; }; + breakpointRdata = derive2 { name="breakpointRdata"; version="1.16.0"; sha256="0f23i4ynb4vgn22c3d2l64z92rzv3qnwd4j8qyvalklrxkwilhfn"; depends=[]; }; + breastCancerMAINZ = derive2 { name="breastCancerMAINZ"; version="1.36.0"; sha256="0rfcycjl3jz3fgx7h46hi40gppq640c0mdyf6nh42zc34ml49cml"; depends=[]; }; + breastCancerNKI = derive2 { name="breastCancerNKI"; version="1.36.0"; sha256="11kv9bnbi1p8qlnyayqb7380mwx95a7cd5vljq3zmw74v6723h6k"; depends=[]; }; + breastCancerTRANSBIG = derive2 { name="breastCancerTRANSBIG"; version="1.36.0"; sha256="1z7p2fgbd80hqqrphw6kr3hasx4ybigd4ilw22i040b8c5zkilfw"; depends=[]; }; + breastCancerUNT = derive2 { name="breastCancerUNT"; version="1.36.0"; sha256="0rdjk0cl0shhfx3jr0cpnh9whhdcnbj6akhipc2c5sk2l7kagiz8"; depends=[]; }; + breastCancerUPP = derive2 { name="breastCancerUPP"; version="1.36.0"; sha256="19bzlxj106ww4ffkgd15fhq4idqvnwa5slbb4f65xf0nnpf11s19"; depends=[]; }; + breastCancerVDX = derive2 { name="breastCancerVDX"; version="1.36.0"; sha256="0kk048gs3ksg163hcscnb1ng3zswqg5mzzyy1jlb6q0rswh4f6zx"; depends=[]; }; + brgedata = derive2 { name="brgedata"; version="1.20.0"; sha256="0brjmgjcpx8ka1idxd4fm6aa1mgw1nbsa99di3j5n65k34dapzmi"; depends=[Biobase SummarizedExperiment]; }; + bronchialIL13 = derive2 { name="bronchialIL13"; version="1.36.0"; sha256="0vj61n1h52y1yhlf32pqvfz7zk77r02j7pxpd6aih8p7yhpna4f0"; depends=[affy]; }; + bsseqData = derive2 { name="bsseqData"; version="0.36.0"; sha256="15qii9mqm05p84m8m2w65rk2hayq354127j33f6dv8zfnyijr1sk"; depends=[bsseq]; }; + cMap2data = derive2 { name="cMap2data"; version="1.34.0"; sha256="10r4dbw76bzhqc2aclksib0nnyzsn59xwazaghq8cm0nbaidddf4"; depends=[]; }; + cancerdata = derive2 { name="cancerdata"; version="1.36.0"; sha256="01cmwqz3h8rbymgws6fsd5rdjiq0k8p9jyl31l5lqck53z1ngxfl"; depends=[Biobase]; }; + ccTutorial = derive2 { name="ccTutorial"; version="1.36.0"; sha256="0c76b68hasc8g452mc3q5w2d2xar8qp8hkpg0n98pyzlm5yddqzd"; depends=[affy Biobase Ringo topGO]; }; + ccdata = derive2 { name="ccdata"; version="1.24.0"; sha256="1gag2w14qb2jialkgwapdkh8l0impa6ni621za9gz08yvgw0m8c3"; depends=[]; }; + celarefData = derive2 { name="celarefData"; version="1.16.0"; sha256="1kblk1dl6ysxlfqb0z5jqcffniafsl786mpvgqw6hjxnjya5vz28"; depends=[]; }; + celldex = derive2 { name="celldex"; version="1.8.0"; sha256="1nn87ig61cy87n7fjz45x13xl7ap1frd2i6pgp2y2wx0lj83hamb"; depends=[AnnotationDbi AnnotationHub DelayedArray DelayedMatrixStats ExperimentHub S4Vectors SummarizedExperiment]; }; + chipenrich_data = derive2 { name="chipenrich.data"; version="2.22.0"; sha256="1rh329i39zc5ip6h7v5pdy8383ak0jdq27zvi2szci450sqrrmp1"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicRanges IRanges readr rtracklayer S4Vectors]; }; + chipseqDBData = derive2 { name="chipseqDBData"; version="1.14.0"; sha256="06r2l4z26barr7fa0p7brpm5ds3c234vpbcd54g5chah57n2v420"; depends=[AnnotationHub ExperimentHub Rsamtools S4Vectors]; }; + chromstaRData = derive2 { name="chromstaRData"; version="1.24.0"; sha256="0hip3b4dkkcqvy8n5ac8m1r7qa0hr3apb5a7wm9zi11dyzyin0g0"; depends=[]; }; + clustifyrdatahub = derive2 { name="clustifyrdatahub"; version="1.8.0"; sha256="01p7qy2svm382v4ykfzndy562dlgrbzzzrf6rfnk6w1j5lhads1r"; depends=[ExperimentHub]; }; + cnvGSAdata = derive2 { name="cnvGSAdata"; version="1.34.0"; sha256="0b08mq034w6xs64f9280ckvdz0g2r7glclpkpwmcw6rw73qi35w3"; depends=[cnvGSA]; }; + colonCA = derive2 { name="colonCA"; version="1.40.0"; sha256="0an3vhj7mbyyzpnpi078wcky8p83lr46dlj6079g13j0azpmf7cr"; depends=[Biobase]; }; + crisprScoreData = derive2 { name="crisprScoreData"; version="1.2.0"; sha256="0b0vkcd30m56cnk1rsincigs66yh5pvlmpzl61hz1iyhc7367bqn"; depends=[AnnotationHub ExperimentHub]; }; + curatedAdipoArray = derive2 { name="curatedAdipoArray"; version="1.10.0"; sha256="07xaaqrxnyvq0binjyxdn1wy523frynkbql2wzhbhafwq9x02xnj"; depends=[]; }; + curatedAdipoChIP = derive2 { name="curatedAdipoChIP"; version="1.14.0"; sha256="0rhcw4wy023g55586hz6zyvzlcb3cfmm0jp3rsa0iq8pbm2r9n6m"; depends=[ExperimentHub SummarizedExperiment]; }; + curatedAdipoRNA = derive2 { name="curatedAdipoRNA"; version="1.14.0"; sha256="0mq25yi91hm60ak3mws7wi49hvllirxfzz4kqjxxr493bkdllxkl"; depends=[SummarizedExperiment]; }; + curatedBladderData = derive2 { name="curatedBladderData"; version="1.34.0"; sha256="1vp9w40v37xgjdsg8m0w7580h2i0xi823f34qik87mj1hr5xawsf"; depends=[affy]; }; + curatedBreastData = derive2 { name="curatedBreastData"; version="2.26.0"; sha256="02iflnwfpcmglj060w5zygqccii91n2s0vp9bkl1ppj6g409pxm3"; depends=[Biobase BiocStyle ggplot2 impute XML]; }; + curatedCRCData = derive2 { name="curatedCRCData"; version="2.30.0"; sha256="0hbc3d1sj1mfqszmfgkmhpnkbw4mdapp85s7bj2spmcwf0pcsr0n"; depends=[BiocGenerics nlme]; }; + curatedMetagenomicData = derive2 { name="curatedMetagenomicData"; version="3.6.0"; sha256="0ry9063nmcc5n289a2h7rpv7dgf25i3yk44nfsslfy73bvrdnz75"; depends=[AnnotationHub dplyr ExperimentHub magrittr mia purrr rlang S4Vectors stringr SummarizedExperiment tibble tidyr tidyselect TreeSummarizedExperiment]; }; + curatedOvarianData = derive2 { name="curatedOvarianData"; version="1.36.0"; sha256="09zb3m32a2rqwgs2x6g1ixvwnbx0100mb2m8rkbkdlfczlnq9riq"; depends=[affy BiocGenerics]; }; + curatedTBData = derive2 { name="curatedTBData"; version="1.4.0"; sha256="0ksb30h6hlksxzgp0dl1f09jr4a59zdll9jnla8xcsbqqvbkm4g7"; depends=[AnnotationHub ExperimentHub MultiAssayExperiment rlang]; }; + curatedTCGAData = derive2 { name="curatedTCGAData"; version="1.20.0"; sha256="01q3bcspvff2syg5d933iqfxwl62axfy4xbzkwlg15as7bl7a54r"; depends=[AnnotationHub ExperimentHub HDF5Array MultiAssayExperiment S4Vectors SummarizedExperiment]; }; + davidTiling = derive2 { name="davidTiling"; version="1.38.0"; sha256="1g8q0m03ss7nf2v3rk6db93mmbzy1kc960scs37pc3s9xdm7k9ak"; depends=[Biobase GO_db tilingArray]; }; + depmap = derive2 { name="depmap"; version="1.12.0"; sha256="10y1s5v6c74ynq8m0rck41w16hglnr700c322k5p9yzndf86f3hv"; depends=[AnnotationHub dplyr ExperimentHub]; }; + derfinderData = derive2 { name="derfinderData"; version="2.16.0"; sha256="147bf7x90prw1x58gy6w13l02sf6zbn4888ikw817k9n5ja3f3x1"; depends=[]; }; + diffloopdata = derive2 { name="diffloopdata"; version="1.26.0"; sha256="0kdh2kd0wv324nzi1zwx765hj2fblp02lnyabmyc0xdvinv64vmy"; depends=[]; }; + diggitdata = derive2 { name="diggitdata"; version="1.30.0"; sha256="020v1l8h8xmxk0v5fnbvp769mks71wzdmkqjawjngd7v0jj9zclp"; depends=[Biobase viper]; }; + dorothea = derive2 { name="dorothea"; version="1.10.0"; sha256="05vkb5mash2m8p6njk842sy5pz7vblrm8n9bphqbslm86kld5n92"; depends=[bcellViper dplyr magrittr viper]; }; + dressCheck = derive2 { name="dressCheck"; version="0.36.0"; sha256="0yrnm6i36zrcjri8fispnlk29wbrj5p2ld716qbd3v7i7kh65v2f"; depends=[Biobase]; }; + dyebiasexamples = derive2 { name="dyebiasexamples"; version="1.38.0"; sha256="0f940198kz8i81s3j3sk5kiaradvk6f9g1w7y40kr92y67p0l438"; depends=[GEOquery marray]; }; + easierData = derive2 { name="easierData"; version="1.4.0"; sha256="0w8g2b6d0c97m796nl09s7ls8wzs6ir7947maygi0a9qv20b2n0x"; depends=[AnnotationHub ExperimentHub SummarizedExperiment]; }; + ecoliLeucine = derive2 { name="ecoliLeucine"; version="1.38.0"; sha256="1303yzp75n9ipvvp5avajcs45p0nz6hqisgl2h58baq9qqxgda6z"; depends=[affy ecolicdf]; }; + emtdata = derive2 { name="emtdata"; version="1.6.0"; sha256="182v17zcsfi1k6vmyjg6m9pdmfzg9ljvhdvydgr63zmjhdh3l4p2"; depends=[edgeR ExperimentHub SummarizedExperiment]; }; + epimutacionsData = derive2 { name="epimutacionsData"; version="1.2.0"; sha256="10ihas90rqkfagi95hhvpz6clpwlsclv2vx2sgy4v51mwk71hhps"; depends=[]; }; + estrogen = derive2 { name="estrogen"; version="1.44.0"; sha256="00mw9cvvh28yp3brdm3jyaal3vkkwis8gla4v30glpivb3nd13yq"; depends=[]; }; + etec16s = derive2 { name="etec16s"; version="1.26.0"; sha256="1cbyzvymznf9rsi22psd61vsnf1m64zsq9fwz6yani7h4lr2i1sp"; depends=[Biobase metagenomeSeq]; }; + ewceData = derive2 { name="ewceData"; version="1.6.0"; sha256="15lrlg8yl570cxyqlh2cp7cy6l7n9bcbrz2dn9713q3649r9gh9z"; depends=[ExperimentHub]; }; + faahKO = derive2 { name="faahKO"; version="1.38.0"; sha256="04jc58rzd1ykchhvcg5zvi22gkj26g4a2qm9ciyky9my3mihjz1l"; depends=[xcms]; }; + fabiaData = derive2 { name="fabiaData"; version="1.36.0"; sha256="072hip7xgd55bbjbnnw645hm89cv7821j6m02d360hyi4l17kmbf"; depends=[Biobase]; }; + ffpeExampleData = derive2 { name="ffpeExampleData"; version="1.36.0"; sha256="19fsyxdfaq75r7a7z0p4479afgk8bjbmnw8yh731s826hd5xbcjr"; depends=[lumi]; }; + fibroEset = derive2 { name="fibroEset"; version="1.40.0"; sha256="1bna044rbxmqck6rkq3dyrc3cgvvscpldzv4j7skw55d9vxy495a"; depends=[Biobase]; }; + fission = derive2 { name="fission"; version="1.18.0"; sha256="0lrwkwf56nqzwrn0vs5g8xr5vbb32qrlaif3c86z04jnzkdx3xnj"; depends=[SummarizedExperiment]; }; + flowPloidyData = derive2 { name="flowPloidyData"; version="1.24.0"; sha256="1fqv9hw18aa9rb7mq09d1njl0y8ix2m1njini99w7ivs1c19lcpa"; depends=[]; }; + flowWorkspaceData = derive2 { name="flowWorkspaceData"; version="3.10.0"; sha256="100r6sjwkbwhw93prqszgnqsgs2i6m10kivzrqwrmk9kbr9ib58z"; depends=[]; }; + frmaExampleData = derive2 { name="frmaExampleData"; version="1.34.0"; sha256="0yxpsgqigv75dwy8hn9yrbxskqalh2wdhvp0iv84fr1m7md5k9pb"; depends=[]; }; + furrowSeg = derive2 { name="furrowSeg"; version="1.26.0"; sha256="1ig42k7xwxpmcn1iairmg3lqvii5jidrm6v62whjpmvafh7sqjvc"; depends=[abind dplyr EBImage locfit tiff]; }; + gageData = derive2 { name="gageData"; version="2.36.0"; sha256="1ikmf894d8bqk3n5yvsm4chvs65hi8drvdwdagkrfqvdrf0pb96s"; depends=[]; }; + gaschYHS = derive2 { name="gaschYHS"; version="1.36.0"; sha256="17mxnym5wqzjgli5rlkwrck5jp9qdhnvmqaqmsz4w1hjdx9raxb7"; depends=[Biobase]; }; + gatingMLData = derive2 { name="gatingMLData"; version="2.38.0"; sha256="1dhm48nrh1y0x6p50045cn6f21bg35i0b4z7bjymn9aw0n9r5fyk"; depends=[]; }; + gcspikelite = derive2 { name="gcspikelite"; version="1.36.0"; sha256="0kyy1pm7582am6rgfr8kbfw1diwb9zpsblgnbjq0c18zb3kg21sn"; depends=[]; }; + geneLenDataBase = derive2 { name="geneLenDataBase"; version="1.34.0"; sha256="1xcnsg1cv1q13bwaqf4dyv05fbxpjg58c338v0nh9sg13nrg174g"; depends=[GenomicFeatures rtracklayer]; }; + genomationData = derive2 { name="genomationData"; version="1.30.0"; sha256="0k3zdpxjzv2nc2v11n0hk7gi8s7v1gjmmqslidqi2y77y1z64rpr"; depends=[]; }; + golubEsets = derive2 { name="golubEsets"; version="1.40.0"; sha256="1n92qi82if1myq6qn7143dn3bz021qf9x9pfq93sjp78gizd8n41"; depends=[Biobase]; }; + gpaExample = derive2 { name="gpaExample"; version="1.10.0"; sha256="0wprivx26a0c0j2yjp74af97019lafg3584i2ik3pbq9kn9qsnk6"; depends=[]; }; + grndata = derive2 { name="grndata"; version="1.30.0"; sha256="1wwhkjhnpn5qyvnk2a2x347gry834bk98ri62qgkn48i7bxdl4nn"; depends=[]; }; + h5vcData = derive2 { name="h5vcData"; version="2.18.0"; sha256="0im0wp751zqf46hvv99pmy7qz0j2hlr8mqyxljf8m0aydrhdd1c0"; depends=[]; }; + hapmap100khind = derive2 { name="hapmap100khind"; version="1.40.0"; sha256="1d0q84lz3a47znd7w3hjcml9awvkn4qaqk0zlxibifzzbqyh17ci"; depends=[]; }; + hapmap100kxba = derive2 { name="hapmap100kxba"; version="1.40.0"; sha256="0lb36nhdj4vq7d87niwxllmyql0k283mxj41amcf7wr5i1lkx8bq"; depends=[]; }; + hapmap500knsp = derive2 { name="hapmap500knsp"; version="1.40.0"; sha256="0bfsa6niqrvz4krwc8lgidx57n311lvnxdfajzxg0icinlji4nkc"; depends=[]; }; + hapmap500ksty = derive2 { name="hapmap500ksty"; version="1.40.0"; sha256="0b3jmbf3brqd8w4f7ryzxkgis0g36ckr390gl2hw5llvsz01kr4v"; depends=[]; }; + hapmapsnp5 = derive2 { name="hapmapsnp5"; version="1.40.0"; sha256="1w0j2zgw5xd6ni13vgi61i4zikpf62h6miq8cfhqc6i9frb5h3an"; depends=[]; }; + hapmapsnp6 = derive2 { name="hapmapsnp6"; version="1.40.0"; sha256="1ngb3rwdz6891hlvy4qblj0p04l5hgcvj60yb1nfccbmg9389phc"; depends=[]; }; + harbChIP = derive2 { name="harbChIP"; version="1.36.0"; sha256="0dj0nmsqmp8wlhjisjj1dwiyspjkkk2jlb9qkp6p9c2brbbpzyc0"; depends=[Biobase Biostrings IRanges]; }; + healthyControlsPresenceChecker = derive2 { name="healthyControlsPresenceChecker"; version="1.2.0"; sha256="1a9i2qyhz5gf98096hll7q8mwzidff8jrnclw2z1s4w3wjmv1f8q"; depends=[geneExpressionFromGEO GEOquery magrittr xml2]; }; + healthyFlowData = derive2 { name="healthyFlowData"; version="1.36.0"; sha256="1s581y2z33420cjjmr05l0hsnrgiy3ifn7mhhndplsmfy9q36kji"; depends=[flowCore]; }; + hgu133abarcodevecs = derive2 { name="hgu133abarcodevecs"; version="1.36.0"; sha256="0q5dlsndx9b77wndai51dk2mv6fw7qkixhq9vxrsvy7yapflc68b"; depends=[]; }; + hgu133plus2CellScore = derive2 { name="hgu133plus2CellScore"; version="1.18.0"; sha256="0vx2gfxbk3fr4xcicwblrm1lcnmmnljpv97zrzlgyqmx5clj13jm"; depends=[Biobase]; }; + hgu133plus2barcodevecs = derive2 { name="hgu133plus2barcodevecs"; version="1.36.0"; sha256="167wfkp7w6ly6mzmdjg7lq2r2dyp8f6fpy3nfg2r9yli76gmx59v"; depends=[]; }; + hgu2beta7 = derive2 { name="hgu2beta7"; version="1.38.0"; sha256="0n2g88j7rpqabb6gkq8gy0iml1dikkdknkkhzqaz79cmvj28iiy2"; depends=[]; }; + humanStemCell = derive2 { name="humanStemCell"; version="0.38.0"; sha256="1s5jlh5xiw5hgnk3x2c6y6rb5gjmbnc8mglih8kc10y9agghj2rv"; depends=[Biobase hgu133plus2_db]; }; + imcdatasets = derive2 { name="imcdatasets"; version="1.6.0"; sha256="0n0bk4kh8d7sr5c8w953d6ns17ylzjq5dic4rh953l197pdsihfc"; depends=[cytomapper DelayedArray ExperimentHub HDF5Array S4Vectors SingleCellExperiment SpatialExperiment]; }; + kidpack = derive2 { name="kidpack"; version="1.40.0"; sha256="10padi12jp5all6bpi2wp5wsx5cn7nxp100kcf9bm3rxkaqccfiq"; depends=[Biobase]; }; + leeBamViews = derive2 { name="leeBamViews"; version="1.34.0"; sha256="0p0mcwyhf052fviggi5vmg1xb8h1inp0vg4i0dqvqbh2w85fg3wp"; depends=[Biobase BSgenome GenomicAlignments GenomicRanges IRanges Rsamtools S4Vectors]; }; + leukemiasEset = derive2 { name="leukemiasEset"; version="1.34.0"; sha256="0l23s68hdjj2pj3wfv8vzag6lbsd3py2463b2rgb084b4cnsc07b"; depends=[Biobase]; }; + lumiBarnes = derive2 { name="lumiBarnes"; version="1.38.0"; sha256="00bc1s583mkj9iqn64mgz3h64kj5dnq1b9lwgz73cn9zhgzll9lx"; depends=[Biobase lumi]; }; + lungExpression = derive2 { name="lungExpression"; version="0.36.0"; sha256="0pksq9gi0vahg10lnr81nacn5rlb6i3z495ymm7vqiiygc4mx81m"; depends=[Biobase]; }; + lydata = derive2 { name="lydata"; version="1.24.0"; sha256="031g2hzmrbf83ac4inn9670nn055axr60hiv9cj8jkjnwpi938sj"; depends=[]; }; + mAPKLData = derive2 { name="mAPKLData"; version="1.30.0"; sha256="01bd8zcxnncfkfdlli7ay4v8rh2wkhh6gidk7442qw86x7d1dxbx"; depends=[]; }; + mCSEAdata = derive2 { name="mCSEAdata"; version="1.18.0"; sha256="1bxnczhvmgf1ilff91h9g2kzk6i76l42gh2gfapjlkhd3g2wl31z"; depends=[]; }; + macrophage = derive2 { name="macrophage"; version="1.14.0"; sha256="1dwq7agr98pqv5f910kz8z4szscsrl15j4f4zakv8m1ajkyz53h2"; depends=[]; }; + mammaPrintData = derive2 { name="mammaPrintData"; version="1.34.0"; sha256="0bpm2w3p97sp0jwmqmzs2h4pizfj7x742pnnib5rbvlmc59ypwc0"; depends=[]; }; + maqcExpression4plex = derive2 { name="maqcExpression4plex"; version="1.42.0"; sha256="0j8ikjbcpd703gpzxi7lx4hmsrh0p1vxz222vnw352imd2bxi58v"; depends=[]; }; + mcsurvdata = derive2 { name="mcsurvdata"; version="1.16.0"; sha256="1wbwf365wsd931y4a0vyif02svl16rx2rglxkw93i7cdkblpjr28"; depends=[AnnotationHub Biobase ExperimentHub]; }; + metaMSdata = derive2 { name="metaMSdata"; version="1.34.0"; sha256="0hw8kaysnw6kf524vmrkkzkins1r8a9w6a1x4k7zq1hklfvwb72x"; depends=[]; }; + methylclockData = derive2 { name="methylclockData"; version="1.6.0"; sha256="1ip9n0329d3wx4q9a4xpng6lzrls3yx93c0z9m0j2q1jsb8bwaxa"; depends=[ExperimentHub ExperimentHubData]; }; + miRNATarget = derive2 { name="miRNATarget"; version="1.36.0"; sha256="1ln3vz92ci3m8p165c33j2p6zxzgibmca9mdph1k1cc1mnp64jh2"; depends=[Biobase]; }; + miRcompData = derive2 { name="miRcompData"; version="1.28.0"; sha256="1gz7bnis42vmkx5h31nvrfy7gnvypb08sh5ayblfzfcva1mx14dp"; depends=[]; }; + microRNAome = derive2 { name="microRNAome"; version="1.20.0"; sha256="0hxwnhlvkhgjxljzmkjs94r3d1w4da8g2chryqyllsklhzs0g0ki"; depends=[SummarizedExperiment]; }; + microbiomeDataSets = derive2 { name="microbiomeDataSets"; version="1.6.0"; sha256="15y39w53yn9jzm682fhq7cf971pcg78hn1xbdha7aavdnd4032vj"; depends=[ape BiocGenerics Biostrings ExperimentHub MultiAssayExperiment SummarizedExperiment TreeSummarizedExperiment]; }; + minfiData = derive2 { name="minfiData"; version="0.44.0"; sha256="15s3kc629m2c78vkidmp6kcc28sn1wzjzrxazmd8z7x8cdad3q4g"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest minfi]; }; + minfiDataEPIC = derive2 { name="minfiDataEPIC"; version="1.24.0"; sha256="03kfxq5fq66y6z1aliyxam6dgxmr4asmxvqfzla8br5rpd1sa8qc"; depends=[IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest minfi]; }; + minionSummaryData = derive2 { name="minionSummaryData"; version="1.28.0"; sha256="0cqchzvdk13y80xsxnkaxd4x6c14d6wmc0vml3i8mzdqfh2d5bz1"; depends=[]; }; + mosaicsExample = derive2 { name="mosaicsExample"; version="1.36.0"; sha256="1p1acg1gwc1xb7g66bikvcdjix007i5l9vi8r4qjm28h78iij1rj"; depends=[]; }; + mouse4302barcodevecs = derive2 { name="mouse4302barcodevecs"; version="1.36.0"; sha256="0bdsfnb7qmazshzy2ww8vp2n3m0x27v65z94gw5bi6bnrmakl040"; depends=[]; }; + msPurityData = derive2 { name="msPurityData"; version="1.26.0"; sha256="07zjdbi5nyp2yq9x37wk4yg24s3c5l8gw1r91x0pb93kb52i5p1v"; depends=[]; }; + msd16s = derive2 { name="msd16s"; version="1.18.0"; sha256="0glsh139jn0by93f52850y5nbh14wbapc0qmr8ib7ql7y25q0l16"; depends=[Biobase metagenomeSeq]; }; + msdata = derive2 { name="msdata"; version="0.38.0"; sha256="0rrmf8dygql6pisac18khjk4fn2zk2wn6f9j2x3y4z5345s0a0hn"; depends=[]; }; + msigdb = derive2 { name="msigdb"; version="1.6.0"; sha256="01pxk4hs8zd89ck1q7h0apd4ypy7v7y9k4xx6rqd80wzn5bkc8rc"; depends=[AnnotationDbi AnnotationHub ExperimentHub GSEABase org_Hs_eg_db org_Mm_eg_db]; }; + msqc1 = derive2 { name="msqc1"; version="1.26.0"; sha256="15idd0dl3q3707ircfvylh5q12ndpa38fk5cwba59732092pc866"; depends=[lattice]; }; + mtbls2 = derive2 { name="mtbls2"; version="1.28.0"; sha256="0nd4zb7lr4v5fcms3qx8zhy72gwg41kk6x2b1q68hajf8dww6r9x"; depends=[]; }; + muscData = derive2 { name="muscData"; version="1.12.0"; sha256="062xiaaka1k1raq5mhmr1wxwb755ws0n00dki1zsj2kl4l4lca2f"; depends=[ExperimentHub SingleCellExperiment]; }; + mvoutData = derive2 { name="mvoutData"; version="1.34.0"; sha256="0lybg4whmlr8d7glmlnz981n3cg5ypmj2w7pdkxwphmm0l0bchq5"; depends=[affy Biobase lumi]; }; + nanotubes = derive2 { name="nanotubes"; version="1.14.0"; sha256="05i7yrmibbv4wgdnmlagmpnxzsv8hiqnf5w3cbpm3xvchmi3zzvx"; depends=[]; }; + nullrangesData = derive2 { name="nullrangesData"; version="1.4.0"; sha256="1991pdj4mwaryli85kn3v8lj367l9yqym6j5swmjmpgvszrk6b1h"; depends=[ExperimentHub GenomicRanges InteractionSet]; }; + oct4 = derive2 { name="oct4"; version="1.14.0"; sha256="1dzwbqwm10zhn1qr1r7d704jhm2knhccmy1zywgsr1y6fizwl6rv"; depends=[]; }; + octad_db = derive2 { name="octad.db"; version="1.0.0"; sha256="09wzmy23x1b1dc40a522kxw8ry2migs22h15bfzl10l8mxryibhf"; depends=[ExperimentHub]; }; + optimalFlowData = derive2 { name="optimalFlowData"; version="1.10.0"; sha256="123wfjjv8pcx4xjaggmcndmsdcsdx4jr9rj97wlzwf6f7inxq282"; depends=[]; }; + pRolocdata = derive2 { name="pRolocdata"; version="1.36.0"; sha256="0q1fi4msl2xyx3cgknwmfp9hlgqk46y68znrq0knnsz6fkl4n9qa"; depends=[Biobase MSnbase]; }; + parathyroidSE = derive2 { name="parathyroidSE"; version="1.36.0"; sha256="1yk7cyhsdj1zp87ggng8mciagp8kpkrnrv5qa9w1i8ap3dwvxrs8"; depends=[SummarizedExperiment]; }; + pasilla = derive2 { name="pasilla"; version="1.26.0"; sha256="0xi2f37v0ds6ivzgx53mfb2isvz8npn8wmdczg88ym6b77g6a3ki"; depends=[DEXSeq]; }; + pasillaBamSubset = derive2 { name="pasillaBamSubset"; version="0.36.0"; sha256="072gqidg42235zfx8qqd8sv7kigrkagkkw4i3nj5sbxzqb1f8vvs"; depends=[]; }; + pcxnData = derive2 { name="pcxnData"; version="2.20.0"; sha256="1ga9azlwx6qfr1f452k80bg2kfkwf18mjk39plq0yjzisrj1jy5m"; depends=[]; }; + pd_atdschip_tiling = derive2 { name="pd.atdschip.tiling"; version="0.36.0"; sha256="13c9f1hwfngkp3d4ljcm5xjlr6r6fsiyb06b18q3b8kp5wya9lp2"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pepDat = derive2 { name="pepDat"; version="1.18.0"; sha256="1cirzkhi76jjqf0cgbb3hq69ykkivpxl0nf52x3vi3wp67ai3x0p"; depends=[GenomicRanges]; }; + plasFIA = derive2 { name="plasFIA"; version="1.26.0"; sha256="0vbqjbfc75pb2gk49sl6aihmvcc38ylngyr1bgdvdxr0xh11imv0"; depends=[proFIA]; }; + plotgardenerData = derive2 { name="plotgardenerData"; version="1.4.0"; sha256="0zpsjr3q3jgd07091i78x4izcqaxk1dqyfanmy2z08xd313mqniq"; depends=[]; }; + prebsdata = derive2 { name="prebsdata"; version="1.34.0"; sha256="1qgd3bmlm2bcqyfsdhfnms6q1bsdi7k0pn9yd9lfwzd3yj9lns1m"; depends=[]; }; + preciseTADhub = derive2 { name="preciseTADhub"; version="1.6.0"; sha256="0hs04i0l0wsdcg9k2j2gbdfmi2cd05gmncjw8vbpiqc5170lcxnp"; depends=[ExperimentHub]; }; + prostateCancerCamcap = derive2 { name="prostateCancerCamcap"; version="1.26.0"; sha256="1z2s8z98a3zbj9wjzwgma3pbl0z2bjkqv3lgslay3l8b7xb1pw2r"; depends=[Biobase]; }; + prostateCancerGrasso = derive2 { name="prostateCancerGrasso"; version="1.26.0"; sha256="008d32f1wva5n75cdz4lf0pcm0bszjc0qklc69mxq64riq1z410h"; depends=[Biobase]; }; + prostateCancerStockholm = derive2 { name="prostateCancerStockholm"; version="1.26.0"; sha256="12hndm71gqicmkll47dc9blxq650k20bny7dgckg4jx1ck5j8dmr"; depends=[Biobase]; }; + prostateCancerTaylor = derive2 { name="prostateCancerTaylor"; version="1.26.0"; sha256="07k18cx9i0ca29hf00dfmqp3qbqdlh10hfx4kwn4q42ixj57hkf4"; depends=[Biobase]; }; + prostateCancerVarambally = derive2 { name="prostateCancerVarambally"; version="1.26.0"; sha256="0bg8jdvqhrh6qyyp5jsrsv09wzixsxkwfx7j1g7jz5w4zh3z35rx"; depends=[Biobase]; }; + ptairData = derive2 { name="ptairData"; version="1.6.0"; sha256="16x9c6gp7mg8hiw9hv49nmx41hd5sxxhyblf2jq8gf1aydvmfpij"; depends=[rhdf5 signal]; }; + pumadata = derive2 { name="pumadata"; version="2.34.0"; sha256="1pc7jmx5qh3zj5wk7kjfzlbq2cipw0943fw5ykqivvlinlg7f57y"; depends=[Biobase oligo puma]; }; + pwrEWAS_data = derive2 { name="pwrEWAS.data"; version="1.12.0"; sha256="1icq59yifsaxifxl29pxx97vrl27cfkwqziz9cpcbc3lqfp8iqmj"; depends=[ExperimentHub]; }; + qPLEXdata = derive2 { name="qPLEXdata"; version="1.16.0"; sha256="177gin4y9jb7188myan5h847yzanwgfwjiwrdz2bd2iskbygbsq3"; depends=[dplyr knitr MSnbase qPLEXanalyzer]; }; + rRDPData = derive2 { name="rRDPData"; version="1.18.0"; sha256="16p33xyp8pw2sx2bq4fhlxlmrlfy0b6zqpnf1f0dy1857nll6kp4"; depends=[rRDP]; }; + rcellminerData = derive2 { name="rcellminerData"; version="2.20.0"; sha256="1imqc82pfmxpiscajslzw6fyy8qplabmyq6745p963pjh7kqk7qb"; depends=[Biobase]; }; + restfulSEData = derive2 { name="restfulSEData"; version="1.20.0"; sha256="1j3ix1900mckca70n4qjzaw44mwzqfbvc5nb0ww23b5ihbly0gls"; depends=[DelayedArray ExperimentHub HDF5Array SummarizedExperiment]; }; + rheumaticConditionWOLLBOLD = derive2 { name="rheumaticConditionWOLLBOLD"; version="1.36.0"; sha256="1ks94mcjvr6fm9ww2h2ll9kcnmm0skycj58z6g5g98182nximy65"; depends=[]; }; + sampleClassifierData = derive2 { name="sampleClassifierData"; version="1.22.0"; sha256="0ysf3mssn9mpkpcy1p4m93h7fc4finb8gnv73046bwmzc3nlysj8"; depends=[SummarizedExperiment]; }; + scATAC_Explorer = derive2 { name="scATAC.Explorer"; version="1.4.0"; sha256="0nkr32jm772ksrc8yns1j4nbc4sc83hcw4v6l6imwm845dv8n4kz"; depends=[BiocFileCache data_table Matrix S4Vectors SingleCellExperiment]; }; + scRNAseq = derive2 { name="scRNAseq"; version="2.12.0"; sha256="1kzsd2armxy4b8q574qc6wzjnf668y8zdp9mkqjnigsvfxnw65zb"; depends=[AnnotationDbi AnnotationHub BiocGenerics ensembldb ExperimentHub GenomicFeatures GenomicRanges S4Vectors SingleCellExperiment SummarizedExperiment]; }; + scTHI_data = derive2 { name="scTHI.data"; version="1.10.0"; sha256="0a46f981h3b99qpys48845cy5a75bv07w64bbmzn9kxy12njdbwf"; depends=[]; }; + scanMiRData = derive2 { name="scanMiRData"; version="1.4.0"; sha256="0ijb1m2fcvg02zhw8nxvbidl5j422p1szqii5xaqxwy7jq3hygdk"; depends=[scanMiR]; }; + scpdata = derive2 { name="scpdata"; version="1.6.0"; sha256="0kmymij0zm9sramba3nmg88ci6dvypcf36lh9bmshn692cp0ga4s"; depends=[AnnotationHub ExperimentHub QFeatures S4Vectors SingleCellExperiment]; }; + seq2pathway_data = derive2 { name="seq2pathway.data"; version="1.30.0"; sha256="058fi3p0kmvk7p7j81jgcysw17ws0ppnsfkxljp01w111aqlfgf2"; depends=[]; }; + seqCNA_annot = derive2 { name="seqCNA.annot"; version="1.34.0"; sha256="16giir805vrqgfvvkrivh9jzd7kbblk3yk9ykqczsn6fjrmkbbac"; depends=[]; }; + seqc = derive2 { name="seqc"; version="1.32.0"; sha256="1iz5d3snnk1zqiz90m3m29138wwh9zpv6lqqff1bphir0sn3dhk1"; depends=[Biobase]; }; + serumStimulation = derive2 { name="serumStimulation"; version="1.34.0"; sha256="1x2ipkpgw8ln8n7s5naiw69vqk7jdqvbpvc3551i3fiph8dp5j7c"; depends=[]; }; + sesameData = derive2 { name="sesameData"; version="1.16.0"; sha256="1a5aq0lzs5w2zrvdm3fwg34rx36ypzpzwhyrw2w1kfpdpnb41gpz"; depends=[AnnotationHub ExperimentHub GenomeInfoDb GenomicRanges IRanges readr S4Vectors stringr]; }; + seventyGeneData = derive2 { name="seventyGeneData"; version="1.34.0"; sha256="08xfx7y42y7zhy7j5qjsvzgy71fi6zdzsnz8zidsrjqbvky5j0bw"; depends=[]; }; + shinyMethylData = derive2 { name="shinyMethylData"; version="1.18.0"; sha256="1bwqfg29dghnr6d3ds4cj48w7azrmi0ichlvbpbvi4p5p0v06p4c"; depends=[]; }; + signatureSearchData = derive2 { name="signatureSearchData"; version="1.12.0"; sha256="0s4pcfnkks8bw9igj5nx3b21zpyj3zzl4dy71wc5zfb9xdzbrkbg"; depends=[affy Biobase dplyr ExperimentHub limma magrittr R_utils rhdf5]; }; + simpIntLists = derive2 { name="simpIntLists"; version="1.34.0"; sha256="02613cn3rix33pybf6da78yi76ccswr69mkcvhfx0h78hpgk9qy2"; depends=[]; }; + spatialDmelxsim = derive2 { name="spatialDmelxsim"; version="1.4.0"; sha256="15ajjp19kfnfdddsrsgdkwa28f296xpb7jza51cnyix34n1xzrhi"; depends=[ExperimentHub SummarizedExperiment]; }; + spatialLIBD = derive2 { name="spatialLIBD"; version="1.10.1"; sha256="0p88kl1l59iy0hs2jm4xg100lgnplzak6imq9pqirgnp0j5py4db"; depends=[AnnotationHub benchmarkme BiocFileCache BiocGenerics cowplot DT edgeR ExperimentHub fields GenomicRanges ggplot2 golem IRanges jsonlite limma magick Matrix paletteer plotly png RColorBrewer rtracklayer S4Vectors scater scuttle sessioninfo shiny shinyWidgets SingleCellExperiment SpatialExperiment statmod SummarizedExperiment tibble viridisLite]; }; + spqnData = derive2 { name="spqnData"; version="1.10.0"; sha256="1wccrbnk1mgpi9hfk7agjyhlkv6awpmk1iaqng9m6540s51wqrb2"; depends=[SummarizedExperiment]; }; + stemHypoxia = derive2 { name="stemHypoxia"; version="1.34.0"; sha256="177zrz7pg3i5rl2yl2mv8chasaa6kjanmqp1q1fn3lxb5w7cc12w"; depends=[]; }; + stjudem = derive2 { name="stjudem"; version="1.38.0"; sha256="07hv42g9p2n2yflp5zfss3n8l1mbfvx70xrgd4jshrbf7vq52w7s"; depends=[]; }; + synapterdata = derive2 { name="synapterdata"; version="1.36.0"; sha256="1bihd9xg92v62p20hfk0q00jvfbpzpz80qlsqh14h5dcn663ivc3"; depends=[synapter]; }; + systemPipeRdata = derive2 { name="systemPipeRdata"; version="2.2.0"; sha256="1cywnnwxbwn1bfvha5dqc29lgb3q05hxdh0icql8w8lizv8z0zj6"; depends=[BiocGenerics Biostrings jsonlite remotes]; }; + tartare = derive2 { name="tartare"; version="1.12.0"; sha256="1ygv0h8v7yll9b0kp0v8sclbhwwlkz062ycxg5qa0yzkbr5msysc"; depends=[AnnotationHub ExperimentHub]; }; + timecoursedata = derive2 { name="timecoursedata"; version="1.8.0"; sha256="11kkf874757nka958vdg9nm4cqfv5rfy5jikm3bpw2k4bz5v3iwc"; depends=[SummarizedExperiment]; }; + tinesath1cdf = derive2 { name="tinesath1cdf"; version="1.36.0"; sha256="0pax9b36bq64ry9wcpyrqlggqc2mfqxxp3yvv1hsxpsyb880xlmz"; depends=[]; }; + tinesath1probe = derive2 { name="tinesath1probe"; version="1.36.0"; sha256="0rjq0rpm1bq8jb63qa8ywzi6dp4dvwn3hyx7qqmgb2dazymqz8hj"; depends=[AnnotationDbi]; }; + tissueTreg = derive2 { name="tissueTreg"; version="1.18.0"; sha256="0wzxpi9ix1c6jk553vr87vhpfbigf4c280ynms4kl46rn63v3zvz"; depends=[]; }; + tofsimsData = derive2 { name="tofsimsData"; version="1.26.0"; sha256="06wyfskxy4mr6bf9c2h4idc637x7dnrfm2affd0wvfggypi8nxh9"; depends=[]; }; + topdownrdata = derive2 { name="topdownrdata"; version="1.20.0"; sha256="0hhl8wsj3x3ff9lv703qw9knyprm8ajlfbqqrlx37vkviwxb90zi"; depends=[topdownr]; }; + tuberculosis = derive2 { name="tuberculosis"; version="1.4.0"; sha256="0qai1w2gvwr6kz8jgb0g8bdb56xsasd9z18fjn85z0k87ml9pnw6"; depends=[AnnotationHub dplyr ExperimentHub magrittr purrr rlang S4Vectors stringr SummarizedExperiment tibble tidyr]; }; + tweeDEseqCountData = derive2 { name="tweeDEseqCountData"; version="1.36.0"; sha256="19n0gw60vv4kygckdcl70qy16gm1hcwv5zg4dgn1a6mxpj65ksn6"; depends=[Biobase]; }; + tximportData = derive2 { name="tximportData"; version="1.26.0"; sha256="08xrfs8bca8vyh4wx5nd8mf7r8z3q46wflnrn2w57zavymgf8dqs"; depends=[]; }; + vulcandata = derive2 { name="vulcandata"; version="1.20.0"; sha256="0r0bs5d27knwpgpnhszg925slxdha94nika533iv3ggkv5f4927v"; depends=[]; }; + xcoredata = derive2 { name="xcoredata"; version="1.2.0"; sha256="0frv5xzqldxqylz82557acrnlzjakc3f1kpdbirvv19aj744x2h0"; depends=[ExperimentHub]; }; + yeastCC = derive2 { name="yeastCC"; version="1.38.0"; sha256="0c8mx5amk60gdjmrxjvm9qnhfh6vsxlz7n96a8a45c2xdyrr9bbz"; depends=[Biobase]; }; + yeastExpData = derive2 { name="yeastExpData"; version="0.44.0"; sha256="1z9hi3gflpj39ajg73gmyf1nx2sm0nl51fb5mb3giiwal1kp9js6"; depends=[graph]; }; + yeastGSData = derive2 { name="yeastGSData"; version="0.36.0"; sha256="00z4yvmyqnvwvbnp79k5hn85q4k8g54d46v7nmbkwf0nspj381wb"; depends=[]; }; + yeastNagalakshmi = derive2 { name="yeastNagalakshmi"; version="1.34.0"; sha256="03vdl4wh11s6yqj8j9ws8is2yq7awwlr4h6q426lww6hnkadfbyw"; depends=[]; }; + yeastRNASeq = derive2 { name="yeastRNASeq"; version="0.36.0"; sha256="1vqpm9jjs3d7ab9vkan7622dlz0z6pjnjy0dcr3xl3nc23kbvg3l"; depends=[]; }; + zebrafishRNASeq = derive2 { name="zebrafishRNASeq"; version="1.18.0"; sha256="1nmgh1v2sryhhx0zrysv54lwvk63sqhhsks5jrvahpqd64p4k3qk"; depends=[]; }; ABAData = derive2 { name="ABAData"; version="1.24.0"; sha256="1wgniq7ibvjj6dx63ixr3i5yclqmg94qpifzfbzzn9yjj3wnikzr"; depends=[]; broken = true; }; + DREAM4 = derive2 { name="DREAM4"; version="1.31.0"; sha256="11ypc84agvq0q0v7bk0b25cm48awxay5hhhjd95gw9s7jk196i2p"; depends=[SummarizedExperiment]; broken = true; }; MAQCsubsetAFX = derive2 { name="MAQCsubsetAFX"; version="1.30.0"; sha256="14mwg96g7aza81vc3hpmb41scmygl8vnsi6s8p48c8v92106asmb"; depends=[affy Biobase]; broken = true; }; MSstatsBioData = derive2 { name="MSstatsBioData"; version="1.13.0"; sha256="1jzypgfmd6d0fdj9ycp4jwihjpxyinr5kwi2x2dg2z6hvxx97gb8"; depends=[]; broken = true; }; brainImageRdata = derive2 { name="brainImageRdata"; version="1.12.0"; sha256="072x7yn1ambf6hfpir6qdxl8bybv64blpbi1jdp0bvqlk66zs7zv"; depends=[ExperimentHub]; broken = true; }; + ppiData = derive2 { name="ppiData"; version="0.34.0"; sha256="10xbp12wim5kj1h2vkxn9x22fd92s2038w653y81jwbh2hyidybf"; depends=[AnnotationDbi graph]; broken = true; }; tcgaWGBSData_hg19 = derive2 { name="tcgaWGBSData.hg19"; version="1.12.0"; sha256="1kmh4iyh2h7vc1mlwb3sridn4nwkqdschz5md5dk53mxkn2wxcmi"; depends=[bsseq ExperimentHub knitr]; broken = true; }; } diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix index 8682a22125fa..8e9a7c8b5179 100644 --- a/pkgs/development/r-modules/bioc-packages.nix +++ b/pkgs/development/r-modules/bioc-packages.nix @@ -4,2165 +4,2236 @@ # Rscript generate-r-packages.R bioc >new && mv new bioc-packages.nix { self, derive }: -let derive2 = derive { biocVersion = "3.15"; }; +let derive2 = derive { biocVersion = "3.16"; }; in with self; { - ABSSeq = derive2 { name="ABSSeq"; version="1.50.0"; sha256="1kwl0gcqwbgblwvpbvqlgnsi91km77j11f0q1f0gd6hhnv38mmlv"; depends=[limma locfit]; }; - ABarray = derive2 { name="ABarray"; version="1.64.0"; sha256="0kjq00i2mb21xyjjs3jy09ps80f11cy37wywzjvmxyjxzbsk4d7r"; depends=[Biobase multtest]; }; - ACE = derive2 { name="ACE"; version="1.14.0"; sha256="1xnw288vz810vjkidar5h218wyc0q2hx0k4zi3r88vaz5rfhc05m"; depends=[Biobase GenomicRanges ggplot2 QDNAseq]; }; - ACME = derive2 { name="ACME"; version="2.52.0"; sha256="0ilcsgpc4m47gifxc0yzx2xi3g4day515mncnnjvfdj3iq8xwk25"; depends=[Biobase BiocGenerics]; }; - ADAM = derive2 { name="ADAM"; version="1.12.0"; sha256="1cgcjykik9hjrwlvvgaccprcrimgq5kwh9cj6367yk9m574a4gmn"; depends=[dplyr DT GO_db KEGGREST knitr pbapply Rcpp stringr SummarizedExperiment]; }; - ADAMgui = derive2 { name="ADAMgui"; version="1.12.0"; sha256="0vvd5qdwkfcr7zg7z63x3vvrcg63r6c9p383yvcg2lp8zmx8hsbs"; depends=[ADAM colorRamps data_table dplyr DT ggplot2 ggpubr ggrepel ggsignif GO_db gridExtra knitr RColorBrewer reshape2 shiny shinyjs stringi stringr testthat varhandle]; }; - ADImpute = derive2 { name="ADImpute"; version="1.6.0"; sha256="0885kd8mpmwjpzpx14pi6l3mqcvsixk10vkf5h4sqb7di0nnna4w"; depends=[BiocParallel checkmate data_table DrImpute kernlab MASS Matrix rsvd S4Vectors SAVER SingleCellExperiment SummarizedExperiment]; }; - ADaCGH2 = derive2 { name="ADaCGH2"; version="2.36.0"; sha256="0awjxl2lwyh7hkjsx1zqsvrh649s9zn89za1iv8yd9l48ch2zfs5"; depends=[aCGH bit cluster DNAcopy ff GLAD snapCGH tilingArray waveslim]; }; - AGDEX = derive2 { name="AGDEX"; version="1.44.0"; sha256="0c44fw5ajdjc13409rn3lsv0jhlqa2qcak9b1k8hpig486xxzsr9"; depends=[Biobase GSEABase]; }; - AIMS = derive2 { name="AIMS"; version="1.28.0"; sha256="1z7yzaizyzcv556w8880603nd947k0d6raadjm42mdl66mma0cdx"; depends=[Biobase e1071]; }; - ALDEx2 = derive2 { name="ALDEx2"; version="1.28.1"; sha256="0xppx52sllbz4pli174422i4kkf37v0yl844088nbj3j9r6pfbj9"; depends=[BiocParallel GenomicRanges IRanges multtest Rfast S4Vectors SummarizedExperiment zCompositions]; }; - AMARETTO = derive2 { name="AMARETTO"; version="1.12.0"; sha256="111dk19b9910icksyr592cvhc5gwvgknr5q4887j9yxbajd7hcmx"; depends=[BiocFileCache callr circlize ComplexHeatmap curatedTCGAData doParallel dplyr DT foreach ggplot2 glmnet gridExtra httr impute knitr limma Matrix matrixStats MultiAssayExperiment Rcpp readr reshape2 rmarkdown tibble]; }; - AMOUNTAIN = derive2 { name="AMOUNTAIN"; version="1.22.0"; sha256="0vdfabsrisdd7qq28f5ivd0v8zz49szqn677i5lhwnlaix220c54"; depends=[]; }; - ANCOMBC = derive2 { name="ANCOMBC"; version="1.6.4"; sha256="02vip6b6vkzwnwsmdxpmrkd8nb9diq05wvrs0yqvxxnvkj980ppz"; depends=[CVXR DescTools doParallel doRNG dplyr emmeans energy foreach Hmisc lme4 lmerTest magrittr MASS mia nloptr Rdpack rlang rngtools S4Vectors SingleCellExperiment SummarizedExperiment tibble tidyr]; }; - ANF = derive2 { name="ANF"; version="1.18.0"; sha256="1fa2pbdapymrpz01ws0m2fbzf11d723x6rbsys29v06is57f5lpj"; depends=[Biobase igraph MASS RColorBrewer survival]; }; - APAlyzer = derive2 { name="APAlyzer"; version="1.10.0"; sha256="1xixj6ck1akwc01gv7xsgnnflrkhflsrpq2cbxh5s7z6xj0f8k00"; depends=[DESeq2 dplyr GenomicAlignments GenomicFeatures GenomicRanges ggplot2 ggrepel HybridMTest repmis Rsamtools Rsubread rtracklayer SummarizedExperiment tidyr VariantAnnotation]; }; - APL = derive2 { name="APL"; version="1.0.1"; sha256="0v6m5vcj5c1f0f9d8ksyhq58jgqfrjsgg4vf9pmbb36gvf3k81dk"; depends=[ggplot2 ggrepel magrittr org_Hs_eg_db org_Mm_eg_db plotly reticulate rlang Seurat SingleCellExperiment SummarizedExperiment topGO viridisLite]; }; - ARRmNormalization = derive2 { name="ARRmNormalization"; version="1.36.0"; sha256="1pnvw8psbql787m8lrmhd9xbmgkc3dbc70yfds1aggv50dk3yjk1"; depends=[ARRmData]; }; - ASAFE = derive2 { name="ASAFE"; version="1.22.0"; sha256="1l9iqw2imr6w2gwqrmg05jp6lj2xc7hbyhd144d4q8vw8z7ga4ns"; depends=[]; }; - ASEB = derive2 { name="ASEB"; version="1.40.0"; sha256="1i0r4vimk6is4j4rr14ajp8papznpmmr0bhwd96s8w53cqdqph7p"; depends=[]; }; - ASGSCA = derive2 { name="ASGSCA"; version="1.30.0"; sha256="0mxrrkm2lg7gxjh8ynn6qmryn8wqda7b83sr51dpgblay83jcbaq"; depends=[MASS Matrix]; }; - ASICS = derive2 { name="ASICS"; version="2.12.1"; sha256="1qx0qpwl34bayk3gj6lvc7rsq3wnzkdngz3wyxnsab0r3cmqcbab"; depends=[BiocParallel ggplot2 glmnet gridExtra Matrix mvtnorm PepsNMR plyr quadprog ropls SummarizedExperiment zoo]; }; - ASSET = derive2 { name="ASSET"; version="2.14.0"; sha256="029acl5k9d4hnvy3jia9cr4rk6w31zn8b5s79i6lazq1cp236hbg"; depends=[MASS msm rmeta]; }; - ASSIGN = derive2 { name="ASSIGN"; version="1.32.0"; sha256="1f1lqip58cvf85nmq8mj7phlk0plcfv1h5ihc0cf2h5y7n4wrm9n"; depends=[ggplot2 gplots msm Rlab sva yaml]; }; - ASURAT = derive2 { name="ASURAT"; version="1.0.0"; sha256="160wvlvyc5dddjngmd21s1av292f6nvjkabag9iz8dipivicyi23"; depends=[circlize cluster ComplexHeatmap plot3D Rcpp S4Vectors SingleCellExperiment SummarizedExperiment]; }; - ASpediaFI = derive2 { name="ASpediaFI"; version="1.10.0"; sha256="1wn7iwaj92j1qvfp4l93ir4dawd1yczff3qyhh886qw2jcbf0b99"; depends=[BiocParallel biomaRt dplyr DRaWR e1071 fgsea GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 Gviz igraph IRanges IVAS limma Matrix reshape2 ROCR Rsamtools rtracklayer S4Vectors scales SummarizedExperiment]; }; - ASpli = derive2 { name="ASpli"; version="2.6.0"; sha256="1frlcwa8m4imfx6ncav8r8yskyaf4ibha177mfnp9y84w6mphynz"; depends=[AnnotationDbi BiocGenerics BiocStyle data_table DT edgeR GenomicAlignments GenomicFeatures GenomicRanges Gviz htmltools igraph IRanges limma MASS pbmcapply Rsamtools S4Vectors tidyr UpSetR]; }; - ATACseqQC = derive2 { name="ATACseqQC"; version="1.20.2"; sha256="0jj7n0mcj0gciw0ksazlksgmwzp51a40pwqhf0c7la0cc4bnrkqp"; depends=[BiocGenerics Biostrings BSgenome ChIPpeakAnno edgeR GenomeInfoDb GenomicAlignments GenomicRanges GenomicScores IRanges KernSmooth limma motifStack preseqR randomForest Rsamtools rtracklayer S4Vectors]; }; - AUCell = derive2 { name="AUCell"; version="1.18.1"; sha256="17wr7dycll0l1gax4w268qw7is163bs51rj6p1qnx1dgc9ibnsgr"; depends=[BiocGenerics data_table DelayedArray DelayedMatrixStats GSEABase mixtools R_utils shiny SummarizedExperiment]; }; - AWFisher = derive2 { name="AWFisher"; version="1.10.0"; sha256="050k7w0azsl7rqx2pxgccihzc2q8pmh6fyy4gib2d42sdyijr2n1"; depends=[edgeR limma]; }; - AffiXcan = derive2 { name="AffiXcan"; version="1.14.0"; sha256="0wj9shzmlxpksbxny571xzfcmmqqzjlk1vq4mx1is2r6ma7jkblq"; depends=[BiocParallel crayon MultiAssayExperiment SummarizedExperiment]; }; - AffyCompatible = derive2 { name="AffyCompatible"; version="1.56.0"; sha256="0x3lj1jgqq67389rzfklah5p878ns9b4fpdpz455m2gq9sk7qsda"; depends=[Biostrings RCurl XML]; }; - AffyRNADegradation = derive2 { name="AffyRNADegradation"; version="1.42.0"; sha256="16akwmpzwxai7ks5bvc1yyb9sx2scv9b9gas5avb0sk5fk0h3nsf"; depends=[affy]; }; - AgiMicroRna = derive2 { name="AgiMicroRna"; version="2.46.0"; sha256="0jic89gyphbv7jzlfgm9bh1aq48lp86rq6hr34gsg9z0pa1192xa"; depends=[affy affycoretools Biobase limma preprocessCore]; }; - AllelicImbalance = derive2 { name="AllelicImbalance"; version="1.34.0"; sha256="0w4xd0xzkwx7bbhrgqligpahlhg85rginknx520z891r8v0bim2z"; 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.10.0"; sha256="1ikdrigma02gnl6ggrc89bjsiqmd7knpb9kw7nqyrdnv3qjd9iag"; depends=[BiocParallel data_table dplyr expm ggplot2 gtools igraph optimx plotly stringr]; }; - AlpsNMR = derive2 { name="AlpsNMR"; version="3.6.1"; sha256="09z2k6mqr837bh422mpy0k71hwsmc4s730f58fq9ya651cjzvdcs"; depends=[baseline BiocParallel dplyr fs future ggplot2 glue htmltools magrittr matrixStats mixOmics pcaPP purrr readxl reshape2 rlang rmarkdown signal speaq stringr tibble tidyr vctrs]; }; - AnVIL = derive2 { name="AnVIL"; version="1.8.7"; sha256="16vqqm7p3v92b51ir9kmaa410p57bpqpxr4nvqngz2c8vvkm5l5g"; depends=[BiocManager dplyr futile_logger httr jsonlite rapiclient rlang tibble tidyr tidyselect]; }; - AnVILBilling = derive2 { name="AnVILBilling"; version="1.6.0"; sha256="08bc1lsjkgs0hmrfi2fbk5swbi5ckgrv4vhsfkqqywfpnkq9k436"; depends=[bigrquery DBI dplyr DT ggplot2 lubridate magrittr plotly shiny shinytoastr]; }; - AnVILPublish = derive2 { name="AnVILPublish"; version="1.6.0"; sha256="1iwvm60lricpsf4nr99wxhni0lwaa4z8aibr7lwj9gdwf2y43c9x"; depends=[AnVIL httr jsonlite readr rmarkdown whisker yaml]; }; - Anaquin = derive2 { name="Anaquin"; version="2.20.0"; sha256="1jgpnls2djl1yzvnk64qc83mljmlci7wflwkza3wr0sv6r47b0dd"; depends=[DESeq2 ggplot2 knitr locfit plyr qvalue ROCR]; }; - AneuFinder = derive2 { name="AneuFinder"; version="1.24.0"; sha256="1acsp987jv2x4qwbgy3y7ff4r2qz7680b0nbr37m4lmncqfgh8yl"; depends=[AneuFinderData bamsignals BiocGenerics Biostrings cowplot DNAcopy doParallel ecp foreach GenomeInfoDb GenomicAlignments GenomicRanges ggdendro ggplot2 ggrepel IRanges mclust ReorderCluster reshape2 Rsamtools S4Vectors]; }; - AnnotationDbi = derive2 { name="AnnotationDbi"; version="1.58.0"; sha256="15cwy7lic89jwl3dr7j4pb5bx457jdpvzvylr71624s0p0j9rgwn"; depends=[Biobase BiocGenerics DBI IRanges KEGGREST RSQLite S4Vectors]; }; - AnnotationFilter = derive2 { name="AnnotationFilter"; version="1.20.0"; sha256="082lpcd6yr2nkxndlck2wqqd3nfdx7lnpw8barxgv41q4l7v4ald"; depends=[GenomicRanges lazyeval]; }; - AnnotationForge = derive2 { name="AnnotationForge"; version="1.38.1"; sha256="0lcr79a3570h7zg4z691gxg2vlyqnars5811q0clzinbmq7b4x3v"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl RSQLite S4Vectors XML]; }; - AnnotationHub = derive2 { name="AnnotationHub"; version="3.4.0"; sha256="03dmbx43rsv9xv94lk12gpraq47ryc13jijwma3q05hl9wn8xjxs"; depends=[AnnotationDbi BiocFileCache BiocGenerics BiocManager BiocVersion curl dplyr httr interactiveDisplayBase rappdirs RSQLite S4Vectors yaml]; }; - AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.26.1"; sha256="1s104n0dkrncbdihd4jq28ibl0v8fnbaxfkhrv7jmx3wh7j4vnfp"; 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.56.0"; sha256="0v2v7v0gim0bsg34ciplapz6mjih68yqhcgzdlhcyj2d6vrgiad5"; depends=[Biobase limma oligo XML]; }; - ArrayExpressHTS = derive2 { name="ArrayExpressHTS"; version="1.46.0"; sha256="1bwgqadqrx2zasyr1dhapmwkapdfdmzl6z7fdlmafmlsfyvqvq68"; 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.14.0"; sha256="1l87bpny9k3jbzbzmb9h2ijvblrj471gqv26fyzbvb3vr6y406z7"; depends=[Biostrings DECIPHER GenomicRanges IRanges]; }; - BAC = derive2 { name="BAC"; version="1.56.0"; sha256="0dkw7438d2sf6nb577dnzija54qs0nhlr47lb73li60fhlnvqmh2"; depends=[]; }; - BADER = derive2 { name="BADER"; version="1.34.0"; sha256="0i5x1r2ns1hxhqk5jyfqird81hck1hllvvgx5bn0rb5vl99g8spm"; depends=[]; }; - BAGS = derive2 { name="BAGS"; version="2.36.0"; sha256="1c1sdv8199kj2pd1hwnbmbf2a4fb7zkazsjgn8hi9c5sm7mlnc29"; depends=[Biobase breastCancerVDX]; }; - BANDITS = derive2 { name="BANDITS"; version="1.12.0"; sha256="1423djb7cij68y0q2dcp8q7lrcn2fxjn6d25v4qy3w00b2w8ppg9"; depends=[BiocParallel data_table doParallel doRNG DRIMSeq foreach ggplot2 MASS R_utils Rcpp RcppArmadillo]; }; - BASiCS = derive2 { name="BASiCS"; version="2.8.0"; sha256="06g041xcv2qci2aapj3g4i32xzw508nhvvss9lfn8g2vdhj07inn"; depends=[assertthat Biobase BiocGenerics BiocParallel coda cowplot ggExtra ggplot2 hexbin MASS Matrix matrixStats Rcpp RcppArmadillo reshape2 S4Vectors scran scuttle SingleCellExperiment SummarizedExperiment viridis]; }; - BBCAnalyzer = derive2 { name="BBCAnalyzer"; version="1.26.0"; sha256="1m4pwfl920pkhnpdc1qps65nsihn73hzyach1d5dhvx884540lq4"; depends=[Biostrings GenomicRanges IRanges Rsamtools SummarizedExperiment VariantAnnotation]; }; - BCRANK = derive2 { name="BCRANK"; version="1.58.0"; sha256="0c1q7vag7jj16wiw0lbvl1b5k8f1wyn9rv0rpnpl4642ab6sps1v"; depends=[Biostrings]; }; - BDMMAcorrect = derive2 { name="BDMMAcorrect"; version="1.14.0"; sha256="19b3jm2a5nz7p43sxa0b08zvc1lvjnqd5g052rj98n6knfb403k7"; depends=[ape ellipse ggplot2 Rcpp RcppArmadillo RcppEigen SummarizedExperiment vegan]; }; - BEARscc = derive2 { name="BEARscc"; version="1.16.0"; sha256="0vslyhscqw1y519qmbilb1fw0482aplib8kb37pvmhy3ak1mcxqj"; depends=[data_table ggplot2 SingleCellExperiment]; }; - BEAT = derive2 { name="BEAT"; version="1.34.0"; sha256="1hgqiy52l34z8zxzvq5j528sy3pf2l5q1mjsccs2nkxalpd31vmg"; depends=[Biostrings BSgenome GenomicRanges ShortRead]; }; - BEclear = derive2 { name="BEclear"; version="2.12.1"; sha256="0r8w71zwsrva7734d1a23qbwvd7p380h0i5d2lrdgdq4h5p7kzsm"; depends=[abind BiocParallel data_table dixonTest futile_logger ids Matrix Rcpp Rdpack]; }; - BGmix = derive2 { name="BGmix"; version="1.56.0"; sha256="03f6nknp3n49yvg2d9qsmds676rva70pr4wjz0md228jczgjk0vj"; depends=[KernSmooth]; }; - BHC = derive2 { name="BHC"; version="1.48.0"; sha256="1kqajd16981y5yaak2imaq1i7pilgqdr3nbhggsakh787j1d9rc5"; depends=[]; }; - BLMA = derive2 { name="BLMA"; version="1.20.0"; sha256="1425r1gavszzdfh7zy9gnc20507vjqimadxrm9yi1y1knk5ikas2"; depends=[Biobase graph GSA limma metafor PADOG ROntoTools]; }; - BOBaFIT = derive2 { name="BOBaFIT"; version="1.0.1"; sha256="0fvdmcdfyky8471nl6pb3iwrwgm8ydwx2xkh7cr94gmr021ghfcq"; depends=[dplyr GenomicRanges ggbio ggforce ggplot2 magrittr NbClust plyranges stringr tidyr]; }; - BPRMeth = derive2 { name="BPRMeth"; version="1.22.0"; sha256="0841wcb5khfi7g358jkrih64fwabwkdf9xydxxlvvvr4xw92pxqj"; depends=[assertthat BiocStyle cowplot data_table doParallel e1071 earth foreach GenomicRanges ggplot2 IRanges kernlab magrittr MASS matrixcalc mvtnorm randomForest Rcpp RcppArmadillo S4Vectors truncnorm]; }; - BRAIN = derive2 { name="BRAIN"; version="1.42.0"; sha256="0b2fjhv05lgvgpdfs2p191vv8d7v3h1gfwi29hc5agpk3fg1rzqn"; depends=[Biostrings lattice PolynomF]; }; - BRGenomics = derive2 { name="BRGenomics"; version="1.8.0"; sha256="1nyf5qsf5av2s81bbwi43skaggwa5pd59sfidavr1vcizjmc9qd8"; depends=[DESeq2 GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; - BSgenome = derive2 { name="BSgenome"; version="1.64.0"; sha256="17gqrmaf6xxghgrzcansl9gfw3ghkrqp87swlnwgyghqvflr5qxc"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges matrixStats Rsamtools rtracklayer S4Vectors XVector]; }; - BUMHMM = derive2 { name="BUMHMM"; version="1.20.0"; sha256="1xn4ikvjilr04c68y5is27g9kmxlmlijx3a1jq8vjbzz410ir6g9"; depends=[Biostrings devtools gtools IRanges stringi SummarizedExperiment]; }; - BUS = derive2 { name="BUS"; version="1.52.0"; sha256="1w0d79gqk6xb6yhnffka51aiv540j1xknryhr0xznb9q8hf6aymi"; depends=[infotheo minet]; }; - BUScorrect = derive2 { name="BUScorrect"; version="1.14.0"; sha256="04c6xl2nbfgvzqi0kqf1g5sp3bf6a1blaqhassja9ara0wbs7i7a"; depends=[gplots SummarizedExperiment]; }; - BUSpaRse = derive2 { name="BUSpaRse"; version="1.10.0"; sha256="11rw7r0kdaqbj9iwjbyg107ayzqnrckc6w1g3v13lgdym0c864mr"; depends=[AnnotationDbi AnnotationFilter BH BiocGenerics biomaRt Biostrings BSgenome dplyr ensembldb GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges magrittr Matrix plyranges Rcpp RcppArmadillo RcppProgress S4Vectors stringr tibble tidyr zeallot]; }; - BUSseq = derive2 { name="BUSseq"; version="1.2.0"; sha256="1lcw75drcmsrpl5ski1xjhjr8whndp5h8y8hs5vkjqmllrrw0x11"; depends=[gplots S4Vectors SingleCellExperiment SummarizedExperiment]; }; - BaalChIP = derive2 { name="BaalChIP"; version="1.22.0"; sha256="02qwk9n2fyg5f9xxjiiha9mi6p9ii3zi5x7w84sh5d5g58s27g6q"; depends=[coda doBy doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges reshape2 Rsamtools scales]; }; - BadRegionFinder = derive2 { name="BadRegionFinder"; version="1.24.0"; sha256="1a1pqmh5ak9s3k1lxw6flanchk24zyznwm34ixi2b78wdc3hqgm9"; depends=[biomaRt GenomicRanges Rsamtools S4Vectors VariantAnnotation]; }; - BaseSpaceR = derive2 { name="BaseSpaceR"; version="1.40.0"; sha256="0jyw4pnybsd6ywpaamk5ywkrcib2z48farsnszmwq97zlbmra7fj"; depends=[RCurl RJSONIO]; }; - Basic4Cseq = derive2 { name="Basic4Cseq"; version="1.32.0"; sha256="14pvjdkgmkbnbmyyp8wfgvs6b1bvy1rhqwg8hc6jclwl8hfyxxxp"; depends=[Biostrings BSgenome_Ecoli_NCBI_20080805 caTools GenomicAlignments GenomicRanges RCircos]; }; - BasicSTARRseq = derive2 { name="BasicSTARRseq"; version="1.24.0"; sha256="0qmdiwch808i2k8fcgx8xdrk9j4lzm7x6j9k6n7iac125i1san31"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges S4Vectors]; }; - BatchQC = derive2 { name="BatchQC"; version="1.24.0"; sha256="1mhffv9ic52v7jm3bphg2q0spk4fz729yjapiqxl56bira04bagi"; depends=[corpcor ggvis gplots heatmaply knitr limma Matrix matrixStats MCMCpack moments pander reshape2 rmarkdown shiny sva]; }; - BayesKnockdown = derive2 { name="BayesKnockdown"; version="1.22.0"; sha256="122vg0lvs3fkgwcvn259rk0m1vaz19pdfvhsj5m1hd3d2h44pv65"; depends=[Biobase]; }; - BayesSpace = derive2 { name="BayesSpace"; version="1.6.0"; sha256="0086fw2chymjwxwgzax6lky84kaa34900ca2p90pbjqx14b161vf"; depends=[assertthat BiocFileCache BiocSingular coda DirichletReg ggplot2 Matrix mclust purrr Rcpp RcppArmadillo RcppDist RcppProgress RCurl rhdf5 S4Vectors scales scater scran SingleCellExperiment SummarizedExperiment xgboost]; }; - BeadDataPackR = derive2 { name="BeadDataPackR"; version="1.48.0"; sha256="19f0y6drsrsrwysb16xx6mafgiw55fr35pwxkjxn0ks6jc5vx1cx"; depends=[]; }; - BgeeCall = derive2 { name="BgeeCall"; version="1.12.2"; sha256="0l6smwy55mm4clb71l4bpch3bayyyf87nq1asbrv6s6fd22mmwil"; depends=[biomaRt Biostrings data_table dplyr GenomicFeatures jsonlite rhdf5 rslurm rtracklayer sjmisc tximport]; }; - BgeeDB = derive2 { name="BgeeDB"; version="2.22.3"; sha256="1f6lrazaibbz21sqvj59rq6ps9m1riw2y0kyidbn29mxf4ibwh3k"; depends=[Biobase curl data_table digest dplyr graph R_utils RCurl RSQLite tidyr topGO]; }; - BiFET = derive2 { name="BiFET"; version="1.16.0"; sha256="03ypbbn8i0f4bl4m6wfdcv702jydniak56wqjb1vlrckd9aphwzq"; depends=[GenomicRanges poibin]; }; - BiGGR = derive2 { name="BiGGR"; version="1.32.0"; sha256="0n57bgl6xz5b1gpw4isimq2pqxmlabn7jzhbjg2fbxcklabdvrcw"; depends=[hyperdraw hypergraph LIM limSolve rsbml stringr]; }; - BiRewire = derive2 { name="BiRewire"; version="3.28.0"; sha256="0r3i7n45qgj8wzdsx8wmfk0lc4xbcvxvmfziiqzig7r706q2c2hm"; depends=[igraph Matrix Rtsne slam]; }; - BiSeq = derive2 { name="BiSeq"; version="1.36.0"; sha256="1cnsh7cx500a3aaxqc7vn56b9ng2m5m9gxw1bhi84nm1hiig4ff1"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; }; - BicARE = derive2 { name="BicARE"; version="1.54.0"; sha256="0qjh5bsjcjry6k1vzdaascwy2shjrkc2bw0w57w0qa458cbi89z2"; depends=[Biobase GSEABase multtest]; }; - BindingSiteFinder = derive2 { name="BindingSiteFinder"; version="1.2.0"; sha256="1lypprchiyxyfjj33qzq00xla4sqd3w9dp3sa863iyhycwr3bya8"; depends=[GenomicRanges ggforce ggplot2 matrixStats plyr rtracklayer S4Vectors tidyr]; }; - BioCor = derive2 { name="BioCor"; version="1.20.0"; sha256="004mksswampwisljcdz6fswwbgdjdii3y86gjzib0gf8v4w7w4q3"; depends=[BiocParallel GSEABase Matrix]; }; - BioMM = derive2 { name="BioMM"; version="1.12.0"; sha256="1sxa6safl4dp2b89bmgshdvkc1s0kxrmld3xfv2wlxkf90b3b57h"; depends=[BiocParallel CMplot e1071 ggplot2 glmnet imager lattice nsprcomp precrec ranger rms topGO vioplot xlsx]; }; - BioMVCClass = derive2 { name="BioMVCClass"; version="1.64.0"; sha256="078pnyygbvbfxziqspfr1nn78w67xyb4qmiwc34czga5psblvfwz"; depends=[Biobase graph MVCClass Rgraphviz]; }; - BioNERO = derive2 { name="BioNERO"; version="1.4.2"; sha256="0dsznfnhidbmf52rv8l26f1ms2k9yy4q4c6cf3x8ylc79c1sjrcp"; depends=[BiocParallel ComplexHeatmap dynamicTreeCut GENIE3 ggnetwork ggnewscale ggplot2 ggrepel igraph intergraph matrixStats minet NetRep networkD3 patchwork RColorBrewer reshape2 SummarizedExperiment sva WGCNA]; }; - BioNet = derive2 { name="BioNet"; version="1.56.0"; sha256="0kcw71j4nmdkn373wk21ak6h0v4gycivnfrklb72kk1qcmsy1wrm"; depends=[AnnotationDbi Biobase graph igraph RBGL]; }; - BioNetStat = derive2 { name="BioNetStat"; version="1.16.1"; sha256="0zs6pymvxb95sji0rnnzaz3whj7hsvj2kl4n4gzj7w1q0prbfpb2"; 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.2.3"; sha256="0cn0x6ij2a3xy61bq0qy5amp0ipj4r4shh7g0vlwbkrclj9w347r"; depends=[BiocFileCache GenomeInfoDb GenomicRanges GEOquery graph SummarizedExperiment]; }; - BioQC = derive2 { name="BioQC"; version="1.24.0"; sha256="0vb2nnzqvyv25pw8qshcmijravswafg0858pkgqjgiv7wsr2mn3m"; depends=[Biobase edgeR Rcpp]; }; - BioTIP = derive2 { name="BioTIP"; version="1.10.0"; sha256="1sihi5zy7mlabh3ix1wvdqz8ibfq1avl8bnxjhvxyzq40zbcklh6"; depends=[cluster GenomicRanges igraph MASS psych scran stringr]; }; - Biobase = derive2 { name="Biobase"; version="2.56.0"; sha256="1mnxky78an079p60427cjvk4fzilp0xzy6b85fq274qvdcrz8jbv"; depends=[BiocGenerics]; }; - BiocCheck = derive2 { name="BiocCheck"; version="1.32.1"; sha256="0bq4xrz1spp0bmbccxydkw6yw03by5dysz85mn152ab6xixm52lw"; depends=[BiocManager biocViews codetools graph httr knitr stringdist]; }; - BiocDockerManager = derive2 { name="BiocDockerManager"; version="1.8.1"; sha256="0a4dcga18bw5mvzmsml28bf4zclz32pp9iflnbvps7pdxvhmmg9d"; depends=[dplyr httr memoise readr whisker]; }; - BiocFileCache = derive2 { name="BiocFileCache"; version="2.4.0"; sha256="1bdbmlixrd8wvs25nmzdksq5hwnsxf8b6ds9qwx01h284vky5vsw"; depends=[curl DBI dbplyr dplyr filelock httr rappdirs RSQLite]; }; - BiocGenerics = derive2 { name="BiocGenerics"; version="0.42.0"; sha256="0iv9bnpw2hycndwbmjsszqfwrksz6dfr6qcz78jkssc9ldsgmdhc"; depends=[]; }; - BiocIO = derive2 { name="BiocIO"; version="1.6.0"; sha256="16j826w4zrmbgpmq6nyglcrjailsfv48ih1rz1qn383g7v503ydp"; depends=[BiocGenerics S4Vectors]; }; - BiocNeighbors = derive2 { name="BiocNeighbors"; version="1.14.0"; sha256="1a43hzmcpxviqa9723hkafr6gm358amfpqj9d56imclkkfkdz95x"; depends=[BiocParallel Matrix Rcpp RcppHNSW S4Vectors]; }; - BiocOncoTK = derive2 { name="BiocOncoTK"; version="1.16.0"; sha256="1alplszw84vqa1mvzp996f94s40scmh4qwbrqhg43hrnyvbnq7pi"; depends=[bigrquery car ComplexHeatmap curatedTCGAData DBI dplyr DT GenomicFeatures GenomicRanges ggplot2 ggpubr graph httr IRanges magrittr plyr Rgraphviz rjson S4Vectors scales shiny SummarizedExperiment]; }; - BiocParallel = derive2 { name="BiocParallel"; version="1.30.4"; sha256="1sf87gxyh41v82pip71qkqpmind357zyngzyg1f80iz65c85xk0k"; depends=[BH codetools futile_logger snow]; }; - BiocPkgTools = derive2 { name="BiocPkgTools"; version="1.14.1"; sha256="0akryshjdn227a8ir8r0lb59v060h58rhy5vjmdxax8p81ajzxkd"; depends=[BiocFileCache BiocManager biocViews dplyr DT gh graph htmltools htmlwidgets httr igraph jsonlite magrittr RBGL readr rlang rvest stringr tibble tidyr tidyselect xml2]; }; - BiocSet = derive2 { name="BiocSet"; version="1.10.0"; sha256="1ghba7020inrdxlbrrgds9gjymjxjma2p89b9lgkjin89zalqglh"; depends=[AnnotationDbi BiocIO dplyr KEGGREST ontologyIndex plyr rlang S4Vectors tibble tidyr]; }; - BiocSingular = derive2 { name="BiocSingular"; version="1.12.0"; sha256="1sraycnn0jahpi8kni1y8ik00ga89fvwqjmbr8388968q22mvm3x"; depends=[beachmat BiocGenerics BiocParallel DelayedArray irlba Matrix Rcpp rsvd S4Vectors ScaledMatrix]; }; - BiocSklearn = derive2 { name="BiocSklearn"; version="1.18.2"; sha256="0q9qlp12ycmhnvfqwn7mvrhd8ypwnbbf715ficgx1xnagh72dpgg"; depends=[basilisk reticulate SummarizedExperiment]; }; - BiocStyle = derive2 { name="BiocStyle"; version="2.24.0"; sha256="1nwiib201b9q1x19ihqjqr5jl0vnid8wfgpi8sa3y02bn722g5a5"; depends=[BiocManager bookdown knitr rmarkdown yaml]; }; - BiocVersion = derive2 { name="BiocVersion"; version="3.15.2"; sha256="0rs4nyza4hqqk204d037gi013135wgfhx5asq2dsdjc9vk5nwzfn"; depends=[]; }; - BiocWorkflowTools = derive2 { name="BiocWorkflowTools"; version="1.22.0"; sha256="1jj4icpkhrv9f6yx3vghkpdil1pfghf3yvc9756wmndvhs100r5l"; depends=[BiocStyle bookdown git2r httr knitr rmarkdown rstudioapi stringr usethis]; }; - Biostrings = derive2 { name="Biostrings"; version="2.64.1"; sha256="1wk8nlmp6f6fsjrcb4fb48s3ay38yywwad748i6lfkkcw2pdfw33"; depends=[BiocGenerics crayon GenomeInfoDb IRanges S4Vectors XVector]; }; - BitSeq = derive2 { name="BitSeq"; version="1.40.0"; sha256="0pfsdc15zfn7sizf0zqh0wjg5yr84kd9lmdifykkbxk882gjy5fh"; depends=[IRanges Rhtslib Rsamtools S4Vectors]; }; - BloodGen3Module = derive2 { name="BloodGen3Module"; version="1.4.0"; sha256="1dlb6jbzrdp417sm55y0h90sx2l62h4329l67w49z321yi7iyw1j"; depends=[circlize ComplexHeatmap ExperimentHub ggplot2 gtools limma matrixStats preprocessCore randomcoloR reshape2 SummarizedExperiment testthat V8]; }; - BrainSABER = derive2 { name="BrainSABER"; version="1.6.0"; sha256="1rc4ff0rglbj1kax4fdn6mmv8jzz5qyapi9mjb4nh9ffaswfj09n"; depends=[BiocFileCache biomaRt data_table lsa S4Vectors shiny SummarizedExperiment]; }; - BridgeDbR = derive2 { name="BridgeDbR"; version="2.6.0"; sha256="1389ymch31wqmp8spvwzyhn95bv1h7nkzhin6mzz1prp8rsdpc0z"; depends=[curl rJava]; }; - BrowserViz = derive2 { name="BrowserViz"; version="2.18.0"; sha256="03z1vkbimvhgjl9c08nndvjzgg2d3d3sgx9mk8bv65brpgpzd3nd"; depends=[BiocGenerics httpuv jsonlite]; }; - BubbleTree = derive2 { name="BubbleTree"; version="2.26.0"; sha256="1q5hlq80p848askxafni502yxnp587vpla65hb2925pcighnz5a3"; depends=[Biobase BiocGenerics BiocStyle biovizBase dplyr e1071 GenomicRanges ggplot2 gridExtra gtable gtools IRanges limma magrittr plyr RColorBrewer WriteXLS]; }; - BufferedMatrix = derive2 { name="BufferedMatrix"; version="1.60.0"; sha256="1sla61mrmwpk3aczgggzmnfgy9wr1cqknv6rsyscjniii7shn360"; depends=[]; }; - BufferedMatrixMethods = derive2 { name="BufferedMatrixMethods"; version="1.60.0"; sha256="07m2r046lk1akbccy52n2rg3ydzkwl157xlyylfqhkmpz7x9zix2"; depends=[BufferedMatrix]; }; - BumpyMatrix = derive2 { name="BumpyMatrix"; version="1.4.0"; sha256="0gy972qvvvf4rbxrcj24l3x8kk3ic85y6l655d54fvlbwr8h82iv"; depends=[IRanges Matrix S4Vectors]; }; - CAEN = derive2 { name="CAEN"; version="1.4.0"; sha256="054wrw550sxn6gn1h3yra623k48syiqn0cm0kz0nn63ys9fmwk3l"; depends=[PoiClaClu SummarizedExperiment]; }; - CAFE = derive2 { name="CAFE"; version="1.32.0"; sha256="1mcmfghl982dqr13bnybx0v5gs302hnnar1m64l13f4si6lnxk62"; depends=[affy annotate Biobase biovizBase GenomicRanges ggbio ggplot2 gridExtra IRanges]; }; - CAGEfightR = derive2 { name="CAGEfightR"; version="1.16.0"; sha256="1nn1flq3732vbxb7r971sbk1qxiqdgzgib8v0g21v8362vajcjwv"; depends=[assertthat BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicInteractions GenomicRanges Gviz InteractionSet IRanges Matrix pryr rtracklayer S4Vectors SummarizedExperiment]; }; - CAGEr = derive2 { name="CAGEr"; version="2.2.0"; sha256="03gxnbsf8byk1ggijf264p6dyvl09hihkmrcx5m28pjs0imlzmhw"; 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.52.0"; sha256="0jz8i0m8g8f18yzjzkgf4xsk038nm6h6qdhsdmmkprz97ysjayr5"; depends=[Biobase graph Hmisc igraph RBGL xcms]; }; - CARNIVAL = derive2 { name="CARNIVAL"; version="2.6.2"; sha256="0shq6bdhbfvsg0ihdsbz0gdpn8mwa2h67zm6kxfdh862ssfn4rbz"; depends=[dplyr igraph lpSolve readr rjson rmarkdown stringr tibble tidyr]; }; - CATALYST = derive2 { name="CATALYST"; version="1.20.1"; sha256="05vfqwa9qsm16px77s9bzygs6zymcxshymmpvz86a9l1cy1yxbza"; 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.27.0"; sha256="14x0m5iv7dm1iii5zsny9wnf4j5ddh0kij2jm658r3i4wnc99mkb"; depends=[ggplot2 reshape]; }; - CBEA = derive2 { name="CBEA"; version="1.0.0"; sha256="08hhpd7syycliqn5fw3x6pfxi89pghm4b4my4p73lvgkr75n71x4"; depends=[BiocParallel BiocSet dplyr fitdistrplus generics glue goftest lmom magrittr mixtools Rcpp rlang SummarizedExperiment tibble tidyr TreeSummarizedExperiment]; }; - CCPROMISE = derive2 { name="CCPROMISE"; version="1.22.0"; sha256="1zmm22rbwp706l2xl5623aja0fw01r0w9cn3dv8ga0riz3pz2fy7"; depends=[Biobase CCP GSEABase PROMISE]; }; - CEMiTool = derive2 { name="CEMiTool"; version="1.20.0"; sha256="05lpi29mwv45na4b2pi59fdv6vfxdjmyd0xf1lsrmiy7c1p2df8s"; 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]; }; - CFAssay = derive2 { name="CFAssay"; version="1.30.0"; sha256="0cfkkvci9zf08zfgxv6knz00qf89x45g81ifml274y4jg40swcjd"; depends=[]; }; - CGEN = derive2 { name="CGEN"; version="3.32.0"; sha256="1010mi5s82q7v2dwfyn1a65cijxpn9lrjgn5pm5s6blzb8l4s7d4"; depends=[mvtnorm survival]; }; - CGHbase = derive2 { name="CGHbase"; version="1.56.0"; sha256="1q8yy60r4g5nyv2gbfdgk192xd73c0rrjr668d5616ddb7sx8wcr"; depends=[Biobase marray]; }; - CGHcall = derive2 { name="CGHcall"; version="2.58.0"; sha256="1qpsibp4gb09sn6fkwwrdjkh3a28lqfbk18c6fvn4m386j96ps65"; depends=[Biobase CGHbase DNAcopy impute snowfall]; }; - CGHnormaliter = derive2 { name="CGHnormaliter"; version="1.50.0"; sha256="16i0i83wd3ibzkj5l5az3jxgsp78i6ragl3yiy3yymvgr9f2z3fz"; depends=[Biobase CGHbase CGHcall]; }; - CGHregions = derive2 { name="CGHregions"; version="1.54.0"; sha256="18k833qpbkyj8ywvgmglcxm3cqaj1ys4ygq7cvnv43d6sm4fi44m"; depends=[Biobase CGHbase]; }; - CHETAH = derive2 { name="CHETAH"; version="1.12.1"; sha256="19nx25f4m45k9wc4rdb5siw7p4zdfrm75x0rwfckbrkqlk9iaj4q"; depends=[bioDist corrplot cowplot dendextend ggplot2 pheatmap plotly reshape2 S4Vectors shiny SingleCellExperiment SummarizedExperiment]; }; - CHRONOS = derive2 { name="CHRONOS"; version="1.24.1"; sha256="1xkjliliwq03qklhcsvm2sbw6hprvzwid2cccb5zyx6gap7kszaz"; depends=[biomaRt circlize doParallel foreach graph igraph openxlsx RBGL RCurl rJava XML]; }; - CIMICE = derive2 { name="CIMICE"; version="1.4.0"; sha256="12knj9vz41kbx0jzqw6ah1ils6hsxv5fbnw98mbi3phnr3kl9ih4"; depends=[assertthat dplyr expm ggcorrplot ggplot2 ggraph glue igraph maftools Matrix networkD3 purrr tidygraph tidyr visNetwork]; }; - CINdex = derive2 { name="CINdex"; version="1.24.0"; sha256="1k6wl4y4za85n8pf96x9zj7irmq3glkpyz612wxj1s16whl6wy6s"; depends=[bitops dplyr GenomeInfoDb GenomicRanges gplots gridExtra IRanges png S4Vectors som stringr]; }; - CMA = derive2 { name="CMA"; version="1.54.0"; sha256="0bl8j1dx153k66vvmhsln1s58jnjfrp6ihfnydsgiq72zqkxhcbz"; depends=[Biobase]; }; - CNAnorm = derive2 { name="CNAnorm"; version="1.42.0"; sha256="1cnf8lj16d1z663ff4k5vfq4bkyj1jims6a6phkjj1sb1zsx3xji"; depends=[DNAcopy]; }; - CNEr = derive2 { name="CNEr"; version="1.32.0"; sha256="05zvr5fv8nprxqh2wvvrlf737dq242i20p1rpyqjaxihl6xl62kq"; depends=[annotate BiocGenerics Biostrings DBI GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 GO_db IRanges KEGGREST poweRlaw R_utils readr reshape2 RSQLite rtracklayer S4Vectors XVector]; }; - CNORdt = derive2 { name="CNORdt"; version="1.38.0"; sha256="161qhpx6kyn87h1p72mwfpi1pd4ck3cssr4f291axhw99sg6968c"; depends=[abind CellNOptR]; }; - CNORfeeder = derive2 { name="CNORfeeder"; version="1.36.1"; sha256="07k18izfzfnm7l5bddbdyhignv18fgv3varvi8ynv22zd0gf9bs1"; depends=[CellNOptR graph]; }; - CNORfuzzy = derive2 { name="CNORfuzzy"; version="1.38.0"; sha256="0qnfvfd2wsmpaggq2amp8n1ry7wgysxysfh97rvrx5ymivbzr18p"; depends=[CellNOptR nloptr]; }; - CNORode = derive2 { name="CNORode"; version="1.38.0"; sha256="0bvlwlf0mm6q3cp2vf87rb7xsha5cz9bk7vsi6ssxngmspiq3kjz"; depends=[CellNOptR genalg knitr]; }; - CNTools = derive2 { name="CNTools"; version="1.52.0"; sha256="1d5ahszdf0brbmhd1vi2l9v1qi8kbpkw2kawcdf3rxibla0756y3"; depends=[genefilter]; }; - CNVMetrics = derive2 { name="CNVMetrics"; version="1.0.0"; sha256="15ihpsr804qrywf968h0zvskcz1w8117hlh6ly5lr30afs4kfq5g"; depends=[BiocParallel GenomicRanges gridExtra IRanges magrittr pheatmap S4Vectors]; }; - CNVPanelizer = derive2 { name="CNVPanelizer"; version="1.28.0"; sha256="1d7srf01ds32nbn2m26nc2bffi59dc2pc9nn5whb7kkgawgbh4a9"; 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.12.0"; sha256="08w1nmpvyy302024g6xcb3vi4hr8kspxqx40qs234l6k62xsri4z"; 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.10.1"; sha256="1sbgzsbiz0jhlswsj4xa517ay5pkjncikz653k6n7jiq71d2x81i"; depends=[assertthat Biostrings CopyNumberPlots GenomeInfoDb GenomicRanges IRanges karyoploteR pracma regioneR Rsamtools SummarizedExperiment VariantAnnotation]; }; - CNVgears = derive2 { name="CNVgears"; version="1.4.0"; sha256="1n93vbxsb69j302rbbgb10z576hmhm0f8hwjv36xr92chy7x6fya"; depends=[data_table ggplot2]; }; - CNViz = derive2 { name="CNViz"; version="1.4.0"; sha256="062rr0im9dfi7qgkwz3a34m63vd479n9m7d1nlm22fcalym5s08r"; depends=[CopyNumberPlots dplyr DT GenomicRanges karyoploteR magrittr plotly scales shiny]; }; - CNVrd2 = derive2 { name="CNVrd2"; version="1.34.0"; sha256="1mdn5dljl8cw7sax4d0p6pv7kc9li8g3r19yybyhbv7wzh6q350j"; depends=[DNAcopy ggplot2 gridExtra IRanges rjags Rsamtools VariantAnnotation]; }; - COCOA = derive2 { name="COCOA"; version="2.10.0"; sha256="0ml09hihkf0drx743a44ff978nn8jgcpf4wchr7zybyj5k52dc11"; depends=[Biobase BiocGenerics ComplexHeatmap data_table fitdistrplus GenomicRanges ggplot2 IRanges MIRA S4Vectors simpleCache tidyr]; }; - CODEX = derive2 { name="CODEX"; version="1.28.0"; sha256="11pq2hym0hhg42pbk59fj0xri12i8mn6qhf3ad182asqh5sngvdp"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb IRanges Rsamtools S4Vectors]; }; - COHCAP = derive2 { name="COHCAP"; version="1.42.0"; sha256="0wy91spx9iv81xqw7kqljhmy2wazpmk8s17bq6ssmybg6yxhdj5j"; depends=[BH COHCAPanno gplots RColorBrewer Rcpp RcppArmadillo WriteXLS]; }; - COMPASS = derive2 { name="COMPASS"; version="1.34.0"; sha256="0ib2v9d8bzjykrdfpclzxh27lkj2iaxlvl6z58n44x3kflb4js0w"; depends=[abind BiocStyle clue coda data_table dplyr foreach knitr magrittr pdist plyr RColorBrewer Rcpp reshape2 rlang rmarkdown scales tidyr]; }; - CONFESS = derive2 { name="CONFESS"; version="1.24.0"; sha256="11k4j21lj27pp6ngf361k1mmq7drnd7xca62jsnrh4h9j00lsmg8"; depends=[changepoint cluster contrast data_table EBImage ecp flexmix flowClust flowCore flowMeans flowMerge flowPeaks foreach ggplot2 limma MASS moments outliers plotrix raster readbitmap reshape2 SamSPECTRAL waveslim wavethresh zoo]; }; - CONSTANd = derive2 { name="CONSTANd"; version="1.4.0"; sha256="04lw35r8c979xmzlq7ikf83vficp6rjlrr0iqzs6wlhzj5s0zfpz"; depends=[]; }; - CORREP = derive2 { name="CORREP"; version="1.62.0"; sha256="0lkgnypkpjbx9qhwph1ylijfqcxhjrvkdhlf4i5mpnq9ghpa0a3z"; depends=[e1071]; }; - COSNet = derive2 { name="COSNet"; version="1.30.0"; sha256="1gz1kxjbbigvbgzk1sb3207gxhx70jnd1dfh89xpwsswia9r6laz"; depends=[]; }; - COTAN = derive2 { name="COTAN"; version="1.0.0"; sha256="0rkxz9f13jdm903k8ywrynvrpx4izv662pl0awbclicb1994adpy"; depends=[basilisk circlize ComplexHeatmap dplyr ggplot2 ggrepel Matrix reticulate Rfast rlang scales tibble tidyr]; }; - CRISPRseek = derive2 { name="CRISPRseek"; version="1.36.0"; sha256="1sw4jrq14wnc9v5ybgj3xrmnvh6kf9z6ybvskbx6nm29mz8116z3"; depends=[BiocGenerics Biostrings BSgenome data_table DelayedArray dplyr GenomeInfoDb GenomicRanges hash IRanges keras mltools reticulate rhdf5 S4Vectors seqinr XVector]; }; - CRImage = derive2 { name="CRImage"; version="1.44.0"; sha256="0bf6lk3c04c5l08md43lda2rwj3way79ap259d8cz5yn24dhklf1"; depends=[aCGH DNAcopy e1071 EBImage foreach MASS sgeostat]; }; - CSAR = derive2 { name="CSAR"; version="1.48.0"; sha256="0lzdl84d84nf5jjw5cc5lr36pllaw89ci08sn559dsrmvn9c5c1w"; depends=[GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; - CSSP = derive2 { name="CSSP"; version="1.34.0"; sha256="0asb29dxhr92cspfq6v0iz8pdhf2j3amrlisjpm9nwhd8nwaxbj0"; depends=[]; }; - CSSQ = derive2 { name="CSSQ"; version="1.8.0"; sha256="1kgadkqjcac127xbaxr38r2icfhdz6y4q1w9xpamj4mjb6d27hq7"; depends=[GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; - CTDquerier = derive2 { name="CTDquerier"; version="2.3.1"; sha256="18pxg4qhgf03sq48yp5m0x0jq5y27pbpqqlcvpn2pj09dzx7camc"; depends=[BiocFileCache ggplot2 gridExtra igraph RCurl S4Vectors stringdist stringr]; }; - CancerInSilico = derive2 { name="CancerInSilico"; version="2.16.0"; sha256="1xswflpx055x3lkakbvxaw6q8y4ndrpr9ma1wyia63ghvdnaian0"; depends=[BH Rcpp]; }; - CancerSubtypes = derive2 { name="CancerSubtypes"; version="1.22.1"; sha256="0dg35d0m1lvrqbq3v406qagjdpwi2kfsfvnby3mcj9lpn7vahg0x"; depends=[cluster ConsensusClusterPlus impute limma NMF sigclust survival]; }; - Cardinal = derive2 { name="Cardinal"; version="2.14.0"; sha256="07048rzp4x6593836a9iag8xjq93a94z9zvj6cbp0bj15w3p62r6"; depends=[Biobase BiocGenerics BiocParallel dplyr EBImage irlba lattice magrittr Matrix matter mclust nlme ProtGenerics S4Vectors signal sp viridisLite]; }; - Category = derive2 { name="Category"; version="2.62.0"; sha256="07js03cfdd6gzbzw14iavlqxynfcqszh988v6k1a3h074wxiivqd"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI genefilter graph GSEABase Matrix RBGL]; }; - CausalR = derive2 { name="CausalR"; version="1.28.0"; sha256="1ij6z12a6irbd1hd8nzd01xipmrgrpj7gqm6gp5r3hd7gfdpsway"; depends=[igraph]; }; - CeTF = derive2 { name="CeTF"; version="1.8.0"; sha256="0hs5jk6x6kamajs61122vr39n7x65rx5qk3sfj2lil9r4wlmmc13"; depends=[circlize clusterProfiler ComplexHeatmap DESeq2 dplyr GenomicTools_fileHandler GGally ggnetwork ggplot2 ggpubr ggrepel igraph Matrix network Rcpp RcppArmadillo RCy3 S4Vectors SummarizedExperiment]; }; - CellBarcode = derive2 { name="CellBarcode"; version="1.2.0"; sha256="1xan4ha7aiasch2h1lk7adj2dc3prpmiily1s6pfy0chwj0bi76n"; depends=[Biostrings Ckmeans_1d_dp data_table egg ggplot2 magrittr plyr Rcpp S4Vectors ShortRead stringr]; }; - CellBench = derive2 { name="CellBench"; version="1.12.0"; sha256="1sw3z3n7vdvw2352amc7biz35dmyzx7fhxdmz1jr0gdf0fhwhr1s"; depends=[BiocFileCache BiocGenerics BiocParallel dplyr glue lubridate magrittr memoise purrr rappdirs rlang SingleCellExperiment tibble tidyr tidyselect]; }; - CellMapper = derive2 { name="CellMapper"; version="1.22.0"; sha256="1sz81czvam86am9mrzs3kn4qn0qz6402i7n2bdic7hcchl00qbbd"; depends=[S4Vectors]; }; - CellMixS = derive2 { name="CellMixS"; version="1.12.0"; sha256="06xjxdgmgndc06xvgg1kylnh8248j780r4jbc27hga6jha9jbh1f"; depends=[BiocGenerics BiocNeighbors BiocParallel cowplot dplyr ggplot2 ggridges kSamples magrittr purrr scater SingleCellExperiment SummarizedExperiment tidyr viridis]; }; - CellNOptR = derive2 { name="CellNOptR"; version="1.42.1"; sha256="0hacmjg02hz9qjk0dj95pwg3670gkvy22hs1wlvkrkicmwk4746r"; depends=[ggplot2 graph igraph RBGL RCurl Rgraphviz rmarkdown stringi stringr XML]; }; - CellScore = derive2 { name="CellScore"; version="1.16.0"; sha256="11iqs9isggfp5l1sh9ndsrb5f57lhgpspsb5mmzd1vn182bsj3n8"; depends=[Biobase gplots lsa RColorBrewer squash]; }; - CellTrails = derive2 { name="CellTrails"; version="1.14.0"; sha256="11xrkib9ajwsyz608d221r2z0nb67063ssmwd6i2zd4i7vhci5b0"; depends=[Biobase BiocGenerics cba dendextend dtw EnvStats ggplot2 ggrepel igraph maptree mgcv reshape2 Rtsne SingleCellExperiment SummarizedExperiment]; }; - CellaRepertorium = derive2 { name="CellaRepertorium"; version="1.6.0"; sha256="0ccx0698rircn5csd56il1v4s0707fhp2b7yidadrn6apv0jyd7b"; depends=[BiocGenerics Biostrings dplyr forcats Matrix progress purrr Rcpp reshape2 rlang S4Vectors stringr tibble tidyr]; }; - CelliD = derive2 { name="CelliD"; version="1.4.0"; sha256="0697cfm9mlxk12acxxz68rng8niavmf42qlrkd8063k9kkzzh01q"; 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.2.0"; sha256="08bpddpkagp9yzb65j3caf740vndnk399rm21f32qvbq803y0lp5"; depends=[BiocParallel DelayedArray DelayedMatrixStats dplyr ggplot2 GSEABase HDF5Array patchwork reshape2 rlang S4Vectors SingleCellExperiment SummarizedExperiment]; }; - CexoR = derive2 { name="CexoR"; version="1.34.0"; sha256="1sph506rwc4p25ar6km7yvg11aj7clk4bjncnlb75fynrv9zsarw"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; }; - ChAMP = derive2 { name="ChAMP"; version="2.26.0"; sha256="1ck4pn24q222k4bhv4ngimzwyzgkf7a0nw9svhcmv91ys5h4lhhj"; depends=[bumphunter ChAMPdata combinat dendextend DMRcate DNAcopy doParallel DT GenomicRanges ggplot2 globaltest goseq Hmisc Illumina450ProbeVariants_db IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b4_hg19 IlluminaHumanMethylationEPICmanifest illuminaio impute isva kpmt limma marray matrixStats minfi missMethyl plotly plyr preprocessCore prettydoc quadprog qvalue RColorBrewer rmarkdown RPMM shiny shinythemes sva wateRmelon]; }; - ChIC = derive2 { name="ChIC"; version="1.16.0"; sha256="17az2nhccji8qjllvr5adzb8sqr15rhc4lg0iq52gmn6w7f7vrlz"; depends=[BiocGenerics caret caTools ChIC_data genomeIntervals GenomicRanges IRanges progress randomForest Rsamtools S4Vectors spp]; }; - ChIPComp = derive2 { name="ChIPComp"; version="1.26.0"; sha256="06q34y59gf1iz0rs7y5x8ndy1wa95j65rfmz37aym5c46ijqsnq0"; depends=[BiocGenerics BSgenome_Hsapiens_UCSC_hg19 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges limma Rsamtools rtracklayer S4Vectors]; }; - ChIPQC = derive2 { name="ChIPQC"; version="1.32.2"; sha256="1c7yi0ga6fbw7903aakgkvm9048a9yndmlg7sn15i2pjrvwql8ms"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors TxDb_Celegans_UCSC_ce6_ensGene TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene]; }; - ChIPXpress = derive2 { name="ChIPXpress"; version="1.40.0"; sha256="1w8kvpvvwh7bjpk4672060vz0nn6ya0lm40k97grss1i4kmv7zna"; depends=[affy biganalytics bigmemory Biobase ChIPXpressData frma GEOquery]; }; - ChIPanalyser = derive2 { name="ChIPanalyser"; version="1.18.0"; sha256="0vi7qngbyss7h6zzbqv5x31x09pnwkrhxgfsbmhazz6wczmwkcix"; depends=[BiocManager Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges RcppRoll ROCR rtracklayer S4Vectors]; }; - ChIPexoQual = derive2 { name="ChIPexoQual"; version="1.20.0"; sha256="1r4s8awvwwj1g33jpnzfxji23mfy0chkhi14i0ml5sh090xijpaz"; 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.30.1"; sha256="0a26glldxczcfymjvd45gv5m4hympziivm6wwx4ab9wld7n43l8y"; 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.32.1"; sha256="0l2514wvlc8q7n1zjzfrghdg372sp73z39204bkif3g6pdkcvbcf"; depends=[AnnotationDbi BiocGenerics boot dplyr enrichplot GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggVennDiagram gplots gtools IRanges magrittr plotrix RColorBrewer rtracklayer S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene]; }; - ChIPseqR = derive2 { name="ChIPseqR"; version="1.50.0"; sha256="09z03ym6iqllj007558pijksjz6bqizrq8r5y1s9f12919szydsv"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; }; - ChIPsim = derive2 { name="ChIPsim"; version="1.50.0"; sha256="1rjh61721pxm3r0zh1jpk65f2ll7yyhk7d92hvp4hjmq8283xwsh"; depends=[Biostrings IRanges ShortRead XVector]; }; - ChemmineOB = derive2 { name="ChemmineOB"; version="1.34.0"; sha256="1cxblrisvqmrng5zvsm2x9g2rjl088s9jmrxxapgbf5zxdv1h1lb"; depends=[BH BiocGenerics Rcpp zlibbioc]; }; - ChemmineR = derive2 { name="ChemmineR"; version="3.48.0"; sha256="1nri4zkc9lp1mqgsi0h58486vixwiv2989b6pmx2aj5c3575i0ma"; depends=[base64enc BH BiocGenerics DBI digest DT ggplot2 gridExtra jsonlite png Rcpp RCurl rjson rsvg stringi]; }; - Chicago = derive2 { name="Chicago"; version="1.24.0"; sha256="13vzxmvxpc3r9gii37zvhhr5nbnaggrva97g6m2n02qn9daf6vmm"; depends=[data_table Delaporte Hmisc MASS matrixStats]; }; - ChromHeatMap = derive2 { name="ChromHeatMap"; version="1.50.0"; sha256="1k7w5dlq5wa87rnqizvpr1pj3dx4l1ja6fls0691793ag337av0l"; depends=[annotate AnnotationDbi Biobase BiocGenerics GenomicRanges IRanges rtracklayer]; }; - ChromSCape = derive2 { name="ChromSCape"; version="1.6.0"; sha256="0hvk0lpslmlbim3dlr8rngp6ggr8chn2wbx344mf71hy48qyvarh"; depends=[batchelor BiocParallel colorRamps colourpicker ConsensusClusterPlus coop DelayedArray dplyr DT edgeR forcats fs GenomicRanges gggenes ggplot2 ggrepel gridExtra IRanges irlba jsonlite kableExtra Matrix matrixTests msigdbr plotly qs qualV Rcpp rlist Rsamtools rtracklayer Rtsne S4Vectors scater scran shiny shinycssloaders shinydashboard shinydashboardPlus shinyFiles shinyhelper shinyjs shinyWidgets SingleCellExperiment stringdist SummarizedExperiment tibble tidyr umap viridis]; }; - CiteFuse = derive2 { name="CiteFuse"; version="1.8.0"; sha256="19l1splp6364wfmddxxpj2zlq30frglzcrfs3xhkrai2yfx2cnmy"; depends=[cowplot dbscan ggplot2 ggraph ggridges gridExtra igraph Matrix mixtools pheatmap propr randomForest reshape2 rhdf5 rlang Rtsne S4Vectors scales scran SingleCellExperiment SummarizedExperiment uwot]; }; - ClassifyR = derive2 { name="ClassifyR"; version="3.0.3"; sha256="1a24i413v2cvmcf9f20gdvdkvwjx2yvlhbiasiwnmflb0p95n48m"; depends=[BiocParallel dplyr MultiAssayExperiment randomForest rlang S4Vectors survival tidyr]; }; - Clomial = derive2 { name="Clomial"; version="1.32.0"; sha256="0l1z45yp02hqjrrbyggk78fcm8g25sgdqsy4z2s4b2phrjh8nlc2"; depends=[matrixStats permute]; }; - Clonality = derive2 { name="Clonality"; version="1.44.0"; sha256="08z691r97krlzxwzcfhqkcpjwiacdxlfds1g4nzzi680zmvrdb4n"; depends=[DNAcopy]; }; - CluMSID = derive2 { name="CluMSID"; version="1.12.0"; sha256="0g9ml6dw5flcjlqjr4y33dy17hz2g9r7kavhywzgzh4167ppi0vh"; depends=[ape Biobase dbscan GGally ggplot2 gplots MSnbase mzR network plotly RColorBrewer S4Vectors sna]; }; - ClusterJudge = derive2 { name="ClusterJudge"; version="1.18.0"; sha256="0aw6dpqb8ky6in6a7is6fjjhng74vzqfirrvx4f7pvhj3hcmq22i"; depends=[httr infotheo jsonlite lattice latticeExtra]; }; - ClusterSignificance = derive2 { name="ClusterSignificance"; version="1.24.0"; sha256="1njqcwlbxfb0xc9jyxli3hyq5fjivvhklhvxqcr4aqg9as577qad"; depends=[pracma princurve RColorBrewer scatterplot3d]; }; - CoCiteStats = derive2 { name="CoCiteStats"; version="1.68.0"; sha256="1agaxkxzgxfz7ycyjdmkfm1r21lhamkm7y7k7nxqkwpdz8rxg45y"; depends=[AnnotationDbi org_Hs_eg_db]; }; - CoGAPS = derive2 { name="CoGAPS"; version="3.16.0"; sha256="0ssq59pz0jfdpzj5dhh5bri6iffalhrgvl330v0q0zbj854fagm3"; depends=[BH BiocParallel cluster gplots RColorBrewer Rcpp rhdf5 S4Vectors SingleCellExperiment SummarizedExperiment]; }; - CoRegNet = derive2 { name="CoRegNet"; version="1.34.0"; sha256="16vqv6nc59jwyprhbwvlcmzya3837kimaplj0h09qmch9dr50yrb"; depends=[arules igraph shiny]; }; - Cogito = derive2 { name="Cogito"; version="1.2.0"; sha256="0sahx7cdqqnpzwb0164c84xwr246aiv4jdv9b07mw3k4s45z3h37"; depends=[AnnotationDbi BiocManager entropy GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 jsonlite magrittr rmarkdown S4Vectors TxDb_Mmusculus_UCSC_mm9_knownGene]; }; - ComPrAn = derive2 { name="ComPrAn"; version="1.4.0"; sha256="0wwx025sv07h4xf3nvvqijvyca5mwdb8vsb8kvp4g0rxngc6jm30"; depends=[data_table dplyr DT forcats ggplot2 magrittr purrr RColorBrewer rio rlang scales shiny shinydashboard shinyjs stringr tibble tidyr VennDiagram]; }; - ComplexHeatmap = derive2 { name="ComplexHeatmap"; version="2.12.1"; sha256="0b4p3ijhdcydfp0j58xlb5dn7d3m2x420n91rl9diqpg4r2gl0s8"; depends=[circlize clue codetools colorspace digest doParallel foreach GetoptLong GlobalOptions IRanges matrixStats png RColorBrewer]; }; - CompoundDb = derive2 { name="CompoundDb"; version="1.0.2"; sha256="1lwl4n9zm196l8dc5wdp4xl1h5dncbswqsninzzdqjrdwbpflkfz"; depends=[AnnotationFilter Biobase BiocGenerics ChemmineR DBI dbplyr dplyr IRanges jsonlite MetaboCoreUtils MsCoreUtils ProtGenerics RSQLite S4Vectors Spectra tibble xml2]; }; - ConsensusClusterPlus = derive2 { name="ConsensusClusterPlus"; version="1.60.0"; sha256="1021cix4mr9qsafskw4kk1l3wdzx9pk2gcwjifz6f4zqxss9v07p"; depends=[ALL Biobase cluster]; }; - CopyNumberPlots = derive2 { name="CopyNumberPlots"; version="1.12.0"; sha256="01sxmgsjrwhg8j7gckmcjwjy0yfbhw2rnww8z4hk0ig5vcb8g778"; depends=[cn_mops GenomeInfoDb GenomicRanges IRanges karyoploteR regioneR rhdf5 Rsamtools SummarizedExperiment VariantAnnotation]; }; - CopywriteR = derive2 { name="CopywriteR"; version="2.28.0"; sha256="1k11kvam96hpg71hz2n9cfzizmb7d1bmq5zfvm34s7fn09is60xb"; depends=[BiocParallel chipseq CopyhelpeR data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; }; - CoreGx = derive2 { name="CoreGx"; version="2.0.2"; sha256="06wd9z8bgccxxxyipv30sgc2cxqnr1fmlpr3c11bqzaxp2g42y0a"; depends=[bench Biobase BiocGenerics BiocParallel BumpyMatrix checkmate crayon data_table glue lsa MatrixGenerics MultiAssayExperiment piano rlang S4Vectors SummarizedExperiment]; }; - Cormotif = derive2 { name="Cormotif"; version="1.42.0"; sha256="0ww39z987ig23sn9w2m7jd6rv3njiyslnzcxxzi6gbqy0dax8n93"; depends=[affy limma]; }; - CoverageView = derive2 { name="CoverageView"; version="1.34.0"; sha256="0mh66l4yh6rpd1r7qbqwh5jkklqyvpfiap0zcqhz9kimssm2pbbp"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; }; - CrispRVariants = derive2 { name="CrispRVariants"; version="1.24.0"; sha256="05hb0z6zmi6vxn11l5cih7ja92362v6idzwiwjk67dk4rrk273va"; depends=[AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges reshape2 Rsamtools S4Vectors]; }; - CyTOFpower = derive2 { name="CyTOFpower"; version="1.2.0"; sha256="0dkz6wihnlvmrbjvw1rigcm5mff9vds0izqhcr4507cmvclw6984"; depends=[CytoGLMM diffcyt dplyr DT ggplot2 magrittr rlang shiny shinyFeedback shinyjs shinyMatrix SummarizedExperiment tibble tidyr]; }; - CytoDx = derive2 { name="CytoDx"; version="1.16.0"; sha256="0rk3ksgycwxagkyvl3qm0sbcrzjwlmll9mrhiwyj6n3divw2qg81"; depends=[doParallel dplyr flowCore glmnet rpart rpart_plot]; }; - CytoGLMM = derive2 { name="CytoGLMM"; version="1.4.0"; sha256="04k9gz1rbz2rkkdcn1g1ya6dcjslk4h8427dmy9mkz58nvyjg1ya"; depends=[BiocParallel caret cowplot doParallel dplyr factoextra flexmix ggplot2 ggrepel logging magrittr MASS Matrix mbest pheatmap RColorBrewer rlang speedglm stringr strucchange tibble tidyr]; }; - CytoML = derive2 { name="CytoML"; version="2.8.1"; sha256="01yzdljpyq92bv318b5qs29f190226zwbqjnckvxmbb0k8m7s5hw"; depends=[base64enc BH Biobase corpcor cytolib data_table dplyr flowCore flowWorkspace ggcyto graph jsonlite lattice openCyto plyr RBGL Rcpp RcppArmadillo RcppParallel Rgraphviz Rhdf5lib RProtoBufLib RUnit tibble XML xml2 yaml]; }; - CytoTree = derive2 { name="CytoTree"; version="1.6.0"; sha256="1dsdhwjkd3ngnw50fs6vz048afk47r95vhi0wqj8sip11nhndkd8"; depends=[Biobase BiocNeighbors cluster destiny flowCore FlowSOM flowUtils ggplot2 gmodels igraph limma Matrix matrixStats mclust pheatmap prettydoc RANN Rcpp Rtsne scatterpie scatterplot3d stringr sva umap]; }; - DAMEfinder = derive2 { name="DAMEfinder"; version="1.8.0"; sha256="123ra94bij0m45j2fzqr7fjipj4ld9kgk0kir1zfdbbd5h8h4mdf"; depends=[BiocGenerics Biostrings bumphunter cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges limma plyr readr reshape2 Rsamtools S4Vectors stringr SummarizedExperiment VariantAnnotation]; }; - DAPAR = derive2 { name="DAPAR"; version="1.28.5"; sha256="1z7p6h1j76k5dhqd1fs1swy2iyjh79h50nlagkdbxfpcc9vcfa3z"; depends=[Biobase DAPARdata foreach highcharter MSnbase]; }; - DART = derive2 { name="DART"; version="1.44.0"; sha256="105f3awf9dxkmrqgxjqzsragvhavfnygzgggi0mgq330ybmmp1as"; depends=[igraph]; }; - DECIPHER = derive2 { name="DECIPHER"; version="2.24.0"; sha256="045q2bfzgq1yzhyrzvrhrnmlpka4gikrajxxwv05szksy5nvp7q5"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; }; - DEComplexDisease = derive2 { name="DEComplexDisease"; version="1.16.0"; sha256="09a967x1rnv7byjwh29ngjhs67rgg27zblmlzx6pyqlwy5jsp89d"; depends=[BiocParallel ComplexHeatmap DESeq2 edgeR Rcpp SummarizedExperiment]; }; - DEFormats = derive2 { name="DEFormats"; version="1.24.0"; sha256="1y6z5zvqmcrsl184skmlryi27s6511xas0nr117mz1g7skd5j2f4"; depends=[checkmate data_table DESeq2 edgeR GenomicRanges S4Vectors SummarizedExperiment]; }; - DEGraph = derive2 { name="DEGraph"; version="1.48.0"; sha256="0jdz7snssfiq9rv48irqsxzsgw9j0276wgvp61fpp37av4hp1dh2"; depends=[graph KEGGgraph lattice mvtnorm NCIgraph R_methodsS3 R_utils RBGL Rgraphviz rrcov]; }; - DEGreport = derive2 { name="DEGreport"; version="1.32.0"; sha256="0lgz1zyy3dn1nhjkn9sp0bs6psrnvkli74y1aixrmq8wmq8dq526"; depends=[Biobase BiocGenerics broom circlize cluster ComplexHeatmap ConsensusClusterPlus cowplot DESeq2 dplyr edgeR ggdendro ggplot2 ggrepel knitr logging magrittr Nozzle_R1 psych RColorBrewer reshape rlang S4Vectors scales stringr SummarizedExperiment tibble tidyr]; }; - DEGseq = derive2 { name="DEGseq"; version="1.50.0"; sha256="1pjyxhfbm03dmq2hlh2ndr9hr9q8mc5skyraywnhk7spa59vz11f"; depends=[qvalue]; }; - DEP = derive2 { name="DEP"; version="1.18.0"; sha256="019brs6jspc32ax6gj0l9kqi2ih79jsgwin4akfl80pyz83rr7j6"; depends=[assertthat circlize cluster ComplexHeatmap dplyr DT fdrtool ggplot2 ggrepel gridExtra imputeLCMD limma MSnbase purrr RColorBrewer readr rmarkdown shiny shinydashboard SummarizedExperiment tibble tidyr vsn]; }; - DEScan2 = derive2 { name="DEScan2"; version="1.16.0"; sha256="0hqj9vp8pqfn75yzn3njfns4ls5fvryk483fn2qfmh30cf38flsn"; depends=[BiocGenerics BiocParallel ChIPpeakAnno data_table DelayedArray GenomeInfoDb GenomicAlignments GenomicRanges glue IRanges plyr Rcpp RcppArmadillo rtracklayer S4Vectors SummarizedExperiment]; }; - DESeq2 = derive2 { name="DESeq2"; version="1.36.0"; sha256="06mvb0jqn2fg96wfwspv0kzpa8xpimzaldrcy8m2d4yk76xwsdr7"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; }; - DEWSeq = derive2 { name="DEWSeq"; version="1.10.0"; sha256="138j21nph0nzn69qs1gqpwqv6hx3a75rbm5k8p5xaaii3jr5jf1w"; depends=[BiocGenerics BiocParallel data_table DESeq2 GenomeInfoDb GenomicRanges R_utils S4Vectors SummarizedExperiment]; }; - DEXSeq = derive2 { name="DEXSeq"; version="1.42.0"; sha256="1dzx9mvm8pvcrwr88rin3flnpmzp3vq8mvspx9s8virqhv1102am"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; }; - DEqMS = derive2 { name="DEqMS"; version="1.14.0"; sha256="04b35mhsz87dfj53clgxrb7igkyv41hqmblb4429l68l55wsxhp6"; depends=[ggplot2 limma matrixStats]; }; - DEsingle = derive2 { name="DEsingle"; version="1.16.0"; sha256="0gw2zbq910jnn1pdpc5sgvvfmvg06hximz1qnvvmv9pb8g68r0zk"; depends=[bbmle BiocParallel gamlss MASS Matrix maxLik pscl VGAM]; }; - DEsubs = derive2 { name="DEsubs"; version="1.22.0"; sha256="06vjby0wpaczaw9bj2g2inylfnw92acrqgpadr70q458v1kpshs5"; depends=[circlize DESeq2 EBSeq edgeR ggplot2 graph igraph jsonlite limma locfit Matrix NBPSeq pheatmap RBGL]; }; - DExMA = derive2 { name="DExMA"; version="1.4.5"; sha256="08pxd01x829v6a20y2lvdsbmhq2as1c5pnsyzcjbpmb3d73aad70"; depends=[Biobase bnstruct DExMAdata GEOquery impute limma pheatmap plyr RColorBrewer scales snpStats sva swamp]; }; - DFP = derive2 { name="DFP"; version="1.54.0"; sha256="19xjvfymjclnd0ck7n7al3f54s7f8z3aszi35i0cavr7xj3cgrj5"; depends=[Biobase]; }; - DIAlignR = derive2 { name="DIAlignR"; version="2.4.0"; sha256="0mh27n8vsnsv10mq8jcslspyq86sfvwwgn8iib5w3f7qb47w5d7r"; depends=[ape bit64 data_table DBI dplyr ggplot2 magrittr mzR phangorn pracma Rcpp RcppEigen reticulate rlang RMSNumpress RSQLite signal tidyr zoo]; }; - DMCFB = derive2 { name="DMCFB"; version="1.10.0"; sha256="0wka5s820k0vfw87dfycnkbr3c41wm4rmylwnkm8c0azjda8n126"; depends=[arm benchmarkme BiocParallel data_table fastDummies GenomicRanges IRanges MASS matrixStats rtracklayer S4Vectors speedglm SummarizedExperiment tibble]; }; - DMCHMM = derive2 { name="DMCHMM"; version="1.18.0"; sha256="146b7568ckgcwg1r7gh6802vbfnha8a2b0kssxa4hf8vfd61a7mj"; depends=[BiocParallel calibrate fdrtool GenomicRanges IRanges multcomp rtracklayer S4Vectors SummarizedExperiment]; }; - DMRScan = derive2 { name="DMRScan"; version="1.18.0"; sha256="0gmfmmg7hs4qkinkypcxnk5ixylz47hb0z5x9pyd7jx3pldpld3m"; depends=[GenomeInfoDb GenomicRanges IRanges MASS Matrix mvtnorm RcppRoll]; }; - DMRcaller = derive2 { name="DMRcaller"; version="1.28.0"; sha256="12rdw3l2vjms6z9n7nlljnaf91hkfcvyv3f1vjsxkdvl91kj6arn"; depends=[betareg GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; }; - DMRcate = derive2 { name="DMRcate"; version="2.10.0"; sha256="0l0fz89x1nxjszsdz9zdqrdz8jn9w22c3fasz3ach75fawfdznjv"; depends=[bsseq DSS edgeR ExperimentHub GenomeInfoDb GenomicRanges Gviz IRanges limma minfi missMethyl plyr S4Vectors SummarizedExperiment]; }; - DMRforPairs = derive2 { name="DMRforPairs"; version="1.32.0"; sha256="14z01pnvg3v15cmdgrb216hc7yz2wkpb6dqj7a4bsrfqpbjy021s"; depends=[GenomicRanges Gviz R2HTML]; }; - DNABarcodeCompatibility = derive2 { name="DNABarcodeCompatibility"; version="1.12.0"; sha256="07q6grnzpb5mmqidkd6dv95jflvxzzzvdyw5591is05px7if96q4"; depends=[DNABarcodes dplyr numbers purrr stringr tidyr]; }; - DNABarcodes = derive2 { name="DNABarcodes"; version="1.26.0"; sha256="0n2qlvpcjhrxr3br27gz9vhwcpf7sn6g4xdjazvvi3gqcgk90xc6"; depends=[BH Matrix Rcpp]; }; - DNAcopy = derive2 { name="DNAcopy"; version="1.70.0"; sha256="10bh4p8nbl84rfngsm3bi9w542m159kff95f8c2hvjcxv5yw7iwc"; depends=[]; }; - DNAshapeR = derive2 { name="DNAshapeR"; version="1.24.0"; sha256="0qayysdkifa7dpin6a64zqp0mfvfxj2z0g1vcp757jci2w903b6g"; depends=[Biostrings fields GenomicRanges Rcpp]; }; - DOSE = derive2 { name="DOSE"; version="3.22.1"; sha256="1mch26kddrhhzgi4bssnyy7bvdhprrncmvxl6zn1cq7g07p5765i"; depends=[AnnotationDbi BiocParallel DO_db fgsea ggplot2 GOSemSim qvalue reshape2]; }; - DRIMSeq = derive2 { name="DRIMSeq"; version="1.24.0"; sha256="1dph483ij43ayw0z5dbnp6gwp53ka7k5si1hp3miac7z8dqzv94l"; depends=[BiocGenerics BiocParallel edgeR GenomicRanges ggplot2 IRanges limma MASS reshape2 S4Vectors]; }; - DSS = derive2 { name="DSS"; version="2.44.0"; sha256="12l5b3h9jd2ld6g4vncxy70a8vfi37byl5k85ix61ir0rbcqf6jn"; depends=[Biobase BiocParallel bsseq matrixStats]; }; - DTA = derive2 { name="DTA"; version="2.42.0"; sha256="13x7z2zgxcnz8lpgdnsm5rp6j8yj6fkm03amymlnzihrqjdjpzw4"; depends=[LSD scatterplot3d]; }; - DaMiRseq = derive2 { name="DaMiRseq"; version="2.8.0"; sha256="1lyj8ic87bh8bwwm64rc5wj6sargf81x4x8bilff0gisq35w981g"; depends=[arm caret corrplot DESeq2 e1071 EDASeq edgeR FactoMineR FSelector ggplot2 Hmisc ineq kknn limma lubridate MASS pheatmap pls plsVarSel plyr randomForest RColorBrewer reshape2 RSNNS SummarizedExperiment sva]; }; - DeMAND = derive2 { name="DeMAND"; version="1.26.0"; sha256="0dwn6p24gc4ix8258w8xvc32ldhh6w3q4drzmm7nwacfk9rjqi93"; depends=[KernSmooth]; }; - DeMixT = derive2 { name="DeMixT"; version="1.12.0"; sha256="11x6s6dsnh05l853218b2528adjdy4pbgf95jclibz9gx5nf4hnf"; depends=[base64enc ggplot2 KernSmooth knitr matrixcalc matrixStats Rcpp rmarkdown SummarizedExperiment truncdist]; }; - DeconRNASeq = derive2 { name="DeconRNASeq"; version="1.38.0"; sha256="10smk88srxm58hli0fhkdfd6l5z02q58xc9mww39gkn71y0127k6"; depends=[ggplot2 limSolve pcaMethods]; }; - DeepBlueR = derive2 { name="DeepBlueR"; version="1.22.0"; sha256="19mxag9pzaa4bsh9plq4zrky3fpai6rangi01p6yrkxpjnnhrwqq"; depends=[data_table diffr dplyr filehash foreach GenomeInfoDb GenomicRanges R_utils RCurl rjson rtracklayer settings stringr withr XML]; }; - DeepPINCS = derive2 { name="DeepPINCS"; version="1.4.0"; sha256="06kxdw1cl2i3jqyfsk3cxppdhqcdmqqfisqn7pyidacjwjm16rvg"; depends=[CatEncoders keras matlab PRROC purrr rcdk reticulate stringdist tensorflow tokenizers ttgsea webchem]; }; - DegNorm = derive2 { name="DegNorm"; version="1.6.1"; sha256="0332mw9b0qvrnsvshjpcznglz406dqk44l7mjcrb1995ddld3221"; depends=[data_table doParallel foreach GenomicAlignments GenomicFeatures GenomicRanges ggplot2 heatmaply IRanges plotly plyr Rcpp RcppArmadillo Rsamtools S4Vectors viridis]; }; - DelayedArray = derive2 { name="DelayedArray"; version="0.22.0"; sha256="11id63qza9dxl1364gllqafxmx25a0q22jv5q8h709bgc3f0grqy"; depends=[BiocGenerics IRanges Matrix MatrixGenerics S4Vectors]; }; - DelayedDataFrame = derive2 { name="DelayedDataFrame"; version="1.12.0"; sha256="1nja5h0vxl2i34dhag7gyjdhyaisqagn11004i65pwbx5fmwq58d"; depends=[BiocGenerics DelayedArray S4Vectors]; }; - DelayedMatrixStats = derive2 { name="DelayedMatrixStats"; version="1.18.2"; sha256="0zc7560d5lizkfai7yf4is246mjw8n5j2wrrikrrv3fabby44h7x"; depends=[DelayedArray IRanges Matrix MatrixGenerics matrixStats S4Vectors sparseMatrixStats]; }; - DelayedRandomArray = derive2 { name="DelayedRandomArray"; version="1.4.0"; sha256="13g4dfsv4d5fdp8flxy7p7sc5l9jiby97zixpkda8q1smg2ggr93"; depends=[BH DelayedArray dqrng Rcpp]; }; - DelayedTensor = derive2 { name="DelayedTensor"; version="1.2.0"; sha256="1paciar5cm61gx894awwxb7gzqnyiwmsfinfijff2qx210l0yz51"; depends=[BiocSingular DelayedArray DelayedRandomArray einsum HDF5Array irlba Matrix rTensor]; }; - DepInfeR = derive2 { name="DepInfeR"; version="1.0.0"; sha256="03qvgk20dgxa95gkv2ya2dibiwshda3ssl5f95x5nn06lfgzk6m0"; depends=[BiocParallel glmnet matrixStats]; }; - DepecheR = derive2 { name="DepecheR"; version="1.12.0"; sha256="0rixczdds5gpac50wap6s68kmpdj4208l38gcihkrysz5frbvqjp"; depends=[beanplot doSNOW dplyr FNN foreach ggplot2 gmodels gplots MASS matrixStats mixOmics moments Rcpp RcppEigen reshape2 robustbase viridis]; }; - DiffBind = derive2 { name="DiffBind"; version="3.6.5"; sha256="1c82szcbbai9yldzby90p0q7qi4n9g1wd2wl7h4imyqyj2n4yagx"; 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.20.0"; sha256="08dr3ah0gakdkv133ipw1ib2w1p84hild0s4y9kp8z51qg0zk7mn"; depends=[cba]; }; - DifferentialRegulation = derive2 { name="DifferentialRegulation"; version="1.0.7"; sha256="1q33zyhqc0dxfip5pcn4m5rvr4nivzic4wshdh8sk1hwpviwd90r"; depends=[BANDITS data_table doParallel doRNG foreach ggplot2 MASS Matrix Rcpp RcppArmadillo SingleCellExperiment SummarizedExperiment]; }; - Dino = derive2 { name="Dino"; version="1.2.0"; sha256="1rcll2y034v1n183v819brazr6crr73klp8qmkq51p7jpsvx1450"; depends=[BiocParallel BiocSingular Matrix matrixStats S4Vectors scran Seurat SingleCellExperiment SummarizedExperiment]; }; - Director = derive2 { name="Director"; version="1.22.0"; sha256="1s6yg90ai37cvkqq7gs394bxd70l85mgz36y6gyjv1bzbc298am8"; depends=[htmltools]; }; - DirichletMultinomial = derive2 { name="DirichletMultinomial"; version="1.38.0"; sha256="15l0h2qz80lmrm5rva3v7lkgddn42igyxxwims57zwpwyhrk9bmx"; depends=[BiocGenerics IRanges S4Vectors]; }; - DiscoRhythm = derive2 { name="DiscoRhythm"; version="1.12.0"; sha256="1ld3515clkmxnwyn3z44n7h1bsk3qyxlf0v0fybv5k78rmkrjamv"; 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.16.0"; sha256="0iyd3my4kqs2cj284gym59ldq49jhga67z95qwsh1kyjapqiqjz9"; depends=[AnnotationDbi biomaRt Biostrings data_table GenomeInfoDb GenomicRanges IRanges SummarizedExperiment VariantAnnotation]; }; - Doscheda = derive2 { name="Doscheda"; version="1.18.0"; sha256="116s7s81yxkc0igfy79fqbn6wn1mvd73c5qx1g86vc1mss3nw7k0"; 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.36.0"; sha256="0lpcmx02xnmxrnkwssjgb9pd7jmshkpqslama920d905lrxydp9c"; depends=[]; }; - DropletUtils = derive2 { name="DropletUtils"; version="1.16.0"; sha256="1zq8yhix70a63piffia228zbia9nrzv85lga77flix4p836qmcww"; 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.38.0"; sha256="0q1k4pjfl7nvb1g97iraqfan59idwwp0775ndk99qv8lcmnn032h"; 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.8.0"; sha256="0xbhbjjhh82k7vblb3b2afxyiqqi17l225zwsycjqpvb2bqpybpc"; depends=[aricode BiocParallel dplyr gganimate ggplot2 magrittr purrr RColorBrewer SummarizedExperiment tidyr]; }; - DynDoc = derive2 { name="DynDoc"; version="1.74.0"; sha256="0yqidldl1n93wcdr7n6k18hy602r04b2plkblcvbvi0rlpwcggxi"; depends=[]; }; - EBImage = derive2 { name="EBImage"; version="4.38.0"; sha256="1vcx45bw36k9daw9dywj5bz77jmqk4gjfwsym8ajjnc1jmlq20si"; depends=[abind BiocGenerics fftwtools htmltools htmlwidgets jpeg locfit png RCurl tiff]; }; - EBSEA = derive2 { name="EBSEA"; version="1.24.0"; sha256="104534fl41p9qwi2md78prw4wdzd0c309j3pvq225z4n38fzs8gp"; depends=[DESeq2 EmpiricalBrownsMethod]; }; - EBSeq = derive2 { name="EBSeq"; version="1.36.0"; sha256="192xl9fwsh04w563yk33mfl303d1kqby2ssbqkckqsdr4jb7d57y"; depends=[blockmodeling gplots testthat]; }; - EBSeqHMM = derive2 { name="EBSeqHMM"; version="1.30.0"; sha256="0530imykm1lpisa1ksmw5kdndjxcnj2nyvca6zpjfqw3wdj0s24q"; depends=[EBSeq]; }; - EBarrays = derive2 { name="EBarrays"; version="2.60.0"; sha256="027zarnpxpdnyl877swp5ypxj7zvq0cjp2q2xs6g6yn5dpqjvxxk"; depends=[Biobase cluster lattice]; }; - EBcoexpress = derive2 { name="EBcoexpress"; version="1.40.0"; sha256="07rkar9yh06z3i7v4din5bwpy34a01xdj78sm3r4k64z4xh4zglp"; depends=[EBarrays mclust minqa]; }; - EDASeq = derive2 { name="EDASeq"; version="2.30.0"; sha256="1qnpbmhxvqsma7ihi6yp3ad962xcanlxald84k2szh011ipxj7ws"; depends=[AnnotationDbi aroma_light Biobase BiocGenerics BiocManager biomaRt Biostrings GenomicFeatures GenomicRanges IRanges Rsamtools ShortRead]; }; - EGAD = derive2 { name="EGAD"; version="1.24.0"; sha256="1w8pfkb9capppb3m2fhhy84s1aghf5vp90zlmlnb0mmvxcs6i7im"; depends=[Biobase GEOquery gplots igraph impute limma MASS plyr RColorBrewer RCurl zoo]; }; - EGSEA = derive2 { name="EGSEA"; version="1.24.0"; sha256="09z5247djg4yif8kvkzqady85r7k7xnls7n3hmpjld6rxb00qyrn"; depends=[AnnotationDbi Biobase DT edgeR EGSEAdata gage ggplot2 globaltest gplots GSVA HTMLUtils htmlwidgets hwriter limma metap org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db PADOG pathview plotly RColorBrewer safe stringi topGO]; }; - ELMER = derive2 { name="ELMER"; version="2.20.0"; sha256="1zffwm9m7mixnfc912f0g4qvnzljr9d13zrfg7c38p35qlkdi2wp"; depends=[biomaRt circlize ComplexHeatmap DelayedArray doParallel downloader dplyr ELMER_data GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggpubr ggrepel gridExtra Gviz IRanges lattice magrittr Matrix MultiAssayExperiment plotly plyr progress purrr readr reshape reshape2 rmarkdown rtracklayer rvest S4Vectors scales stringr SummarizedExperiment TCGAbiolinks tibble tidyr xml2]; }; - EMDomics = derive2 { name="EMDomics"; version="2.26.0"; sha256="14mn3p3mq0hcgr5ynf2jq09y7y1sykcq86hpsnbhgq56gf2v3gzg"; depends=[BiocParallel CDFt emdist ggplot2 matrixStats preprocessCore]; }; - ENmix = derive2 { name="ENmix"; version="1.32.0"; sha256="09lznn1ajlpn3rr9gcs9v8c370cdk1gcfjpb1cmp68gc22333ql7"; depends=[AnnotationHub Biobase doParallel dynamicTreeCut ExperimentHub foreach genefilter geneplotter gplots gtools illuminaio impute IRanges matrixStats minfi preprocessCore quadprog RPMM S4Vectors SummarizedExperiment]; }; - ERSSA = derive2 { name="ERSSA"; version="1.14.0"; sha256="0g06svlww704z65jk9w747gs8jv6h75b9d096an0qi5zqp2s1lh4"; depends=[BiocParallel DESeq2 edgeR ggplot2 plyr RColorBrewer]; }; - EWCE = derive2 { name="EWCE"; version="1.4.0"; sha256="19mq43s0rfzgy793cf7l5a4vgss3s2l0nhnsfgdsrxv4gy6nfgnq"; depends=[BiocParallel data_table DelayedArray dplyr ewceData ggplot2 HGNChelper limma Matrix orthogene reshape2 RNOmni SingleCellExperiment stringr SummarizedExperiment]; }; - EmpiricalBrownsMethod = derive2 { name="EmpiricalBrownsMethod"; version="1.24.0"; sha256="04r9fcxaqajhzdbjhi9dhv8pppqlprc0g5h2spf0d798if51f2ck"; depends=[]; }; - EnMCB = derive2 { name="EnMCB"; version="1.8.2"; sha256="1kna7s4rz5mlaj7vwc0mrzaziadvai7zq8ajiy4jya8xw78llyw4"; depends=[BiocFileCache boot e1071 ggplot2 glmnet igraph Matrix mboost rms survival survivalROC survivalsvm]; }; - EnhancedVolcano = derive2 { name="EnhancedVolcano"; version="1.14.0"; sha256="1ghsmfyhb2wa6vm5zhpjxcbmlnwhccahjajgpccbn85lq2203lz2"; depends=[ggplot2 ggrepel]; }; - EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.26.0"; sha256="1960amh4pwnim6didgjqp6f3456ddndcsz2ghvpc0pv8v832phnl"; depends=[circlize ComplexHeatmap GenomicRanges GetoptLong IRanges locfit matrixStats Rcpp]; }; - EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.26.0"; sha256="1bqq2jhlqm1vykrlr65z7yrvai406wymhrz0kallyhvgqwjbzwl3"; depends=[AnnotationDbi BiocFileCache BiocManager edgeR GO_db graph graphite GSEABase hwriter KEGGgraph KEGGREST limma pathview Rgraphviz S4Vectors safe SPIA SummarizedExperiment]; }; - EpiCompare = derive2 { name="EpiCompare"; version="1.0.0"; sha256="0ca4xh0slzhdbji5ffqgjvd9vgaypmgl412vksc8n1jg6q7zx0xm"; depends=[AnnotationHub BRGenomics ChIPseeker clusterProfiler dplyr genomation GenomicRanges ggplot2 IRanges magrittr org_Hs_eg_db plotly plyranges reshape2 rmarkdown rtracklayer S4Vectors stringr tidyr UpSetR]; }; - EpiDISH = derive2 { name="EpiDISH"; version="2.12.0"; sha256="020jimk1qy6r62z6pibsi9nyjxpfw0ikn1h136pn13b42rrrmjk4"; depends=[e1071 locfdr MASS Matrix matrixStats quadprog stringr]; }; - EpiTxDb = derive2 { name="EpiTxDb"; version="1.8.0"; sha256="12xa3h1j7jp1h27dz7hqfsbx3h4p76r5fm1bvspf52w8823qwpds"; depends=[AnnotationDbi BiocFileCache BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges httr IRanges Modstrings RSQLite S4Vectors tRNAdbImport xml2]; }; - EventPointer = derive2 { name="EventPointer"; version="3.4.1"; sha256="0fykvpbi4jr9j5xkbia7gj7yq3xf2nfahasa44i4yswqr7d82bbl"; depends=[abind affxparser Biostrings BSgenome cobs doParallel fgsea 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.14.0"; sha256="1vxkhll9zmv4w13xhazhmpbfjsc47g4sz2hizci491hyh41yq4jx"; depends=[GenomicRanges IRanges matrixStats Rsubread rtracklayer]; }; - ExiMiR = derive2 { name="ExiMiR"; version="2.38.0"; sha256="06k8f62c9ssbmqgx2gyxhy5cx8mryx3d5mzrwjlq35jbnnvdqn8c"; depends=[affy affyio Biobase limma preprocessCore]; }; - ExperimentHub = derive2 { name="ExperimentHub"; version="2.4.0"; sha256="11hna8vrm1az1zk7pw2dv0wh84sd0hw2bi55w40hqvs36csb7lkl"; depends=[AnnotationHub BiocFileCache BiocGenerics BiocManager curl rappdirs S4Vectors]; }; - ExperimentHubData = derive2 { name="ExperimentHubData"; version="1.22.0"; sha256="07n2igb5sva2l323d7p1xqd7520a4fpfan4y5q0l2nr8f3azgfdy"; depends=[AnnotationHubData BiocGenerics BiocManager curl DBI ExperimentHub httr S4Vectors]; }; - ExperimentSubset = derive2 { name="ExperimentSubset"; version="1.6.0"; sha256="0j4qhqpgh925yjgc2cbrqh0vfc0wih4hvva4645cwmrd3hb09hzf"; depends=[Matrix S4Vectors SingleCellExperiment SpatialExperiment SummarizedExperiment TreeSummarizedExperiment]; }; - ExploreModelMatrix = derive2 { name="ExploreModelMatrix"; version="1.8.0"; sha256="152m93d0z4z5wksfbizly7dsr7v9a6c4qar540swcr4qba39p6mm"; depends=[cowplot dplyr DT ggplot2 limma magrittr MASS rintrojs S4Vectors scales shiny shinydashboard shinyjs tibble tidyr]; }; - ExpressionAtlas = derive2 { name="ExpressionAtlas"; version="1.24.0"; sha256="0m9hjxdlndr00zqv8xh817n9bnf49smgdw0jc48i6rlmpnr3namx"; depends=[Biobase httr limma S4Vectors SummarizedExperiment XML xml2]; }; - FCBF = derive2 { name="FCBF"; version="2.4.0"; sha256="0kymmx151f0n42h6b8m07y3fir95a29bf76hskkbix18x62ak570"; depends=[ggplot2 gridExtra mclust pbapply SummarizedExperiment]; }; - FEAST = derive2 { name="FEAST"; version="1.4.0"; sha256="050m7l8wm5c9gzj5m9pd472l29affj5zzwgnjscb4gi9albhbs1r"; depends=[BiocParallel irlba matrixStats mclust SC3 SingleCellExperiment SummarizedExperiment TSCAN]; }; - FELLA = derive2 { name="FELLA"; version="1.16.0"; sha256="0j7h8xaxa0wkpbfwq17qgsp3rn45fkjv4fc3ca01y1kvj219a3vw"; depends=[igraph KEGGREST Matrix plyr]; }; - FGNet = derive2 { name="FGNet"; version="3.30.0"; sha256="10v82y7gmxxq1drw1w51r175ada5igy1ixj2m6y6kk8xldiy1ngr"; depends=[hwriter igraph plotrix png R_utils RColorBrewer reshape2 XML]; }; - FISHalyseR = derive2 { name="FISHalyseR"; version="1.30.0"; sha256="12qrqh9xm3zd2wlkda4n3h4v057hq3bgqzz8z25wnhxil6qyqb43"; depends=[abind EBImage]; }; - FLAMES = derive2 { name="FLAMES"; version="1.2.2"; sha256="1dk1pc3vhk2jgmmhkq9q0jy1s1ad5zxzgmnr6nx3x7wbaibb5rp2"; depends=[bambu basilisk BiocGenerics Biostrings circlize ComplexHeatmap cowplot dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 gridExtra igraph magrittr Matrix RColorBrewer Rcpp reticulate Rhtslib Rsamtools rtracklayer S4Vectors scater scran scuttle SingleCellExperiment stringr SummarizedExperiment tidyr withr zlibbioc]; }; - FRASER = derive2 { name="FRASER"; version="1.8.1"; sha256="1bixarfx0ykzns4w5c556l8q2lscnxmmdbl292g9q7k9qiw39p03"; depends=[AnnotationDbi BBmisc Biobase BiocGenerics BiocParallel biomaRt BSgenome cowplot data_table DelayedArray DelayedMatrixStats extraDistr generics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 ggrepel HDF5Array IRanges matrixStats OUTRIDER pcaMethods pheatmap plotly PRROC R_utils RColorBrewer Rcpp RcppArmadillo rhdf5 Rsamtools Rsubread S4Vectors SummarizedExperiment tibble VGAM]; }; - FRGEpistasis = derive2 { name="FRGEpistasis"; version="1.32.0"; sha256="14wskfc350zrna1ng8wkyb91y3h01jhk93ajw3if04nkghav193a"; depends=[fda MASS]; }; - FScanR = derive2 { name="FScanR"; version="1.6.0"; sha256="0117fgbmig6zaik5j7axcw33rx2pjwhgla751sr4zi990a9p6igb"; depends=[]; }; - FamAgg = derive2 { name="FamAgg"; version="1.24.0"; sha256="0pzqy8rx7hyz93v8gh4qf861axwidxwiv3w9i8j7g796mdmy66my"; depends=[BiocGenerics gap igraph kinship2 Matrix survey]; }; - FastqCleaner = derive2 { name="FastqCleaner"; version="1.14.2"; sha256="0vna7kmfgn6m0irrp7aqgvswvfmxcd8bjpl6l35mwqq2rm8h25gf"; depends=[Biostrings DT htmltools IRanges Rcpp S4Vectors shiny shinyBS ShortRead]; }; - FilterFFPE = derive2 { name="FilterFFPE"; version="1.6.0"; sha256="0x76a382lw0j06h8hlq2vrawnydjngn9w0dhymyrx94jkmsl15wl"; depends=[doParallel foreach GenomicRanges IRanges Rsamtools S4Vectors]; }; - FindIT2 = derive2 { name="FindIT2"; version="1.2.3"; sha256="0fj6csbxx6dfcd8fhsiff04cagb2yyg79h8wklqqm0dr7agbfaj9"; depends=[BiocGenerics BiocParallel dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel glmnet IRanges MultiAssayExperiment patchwork progress purrr qvalue rlang rtracklayer S4Vectors stringr SummarizedExperiment tibble tidyr withr]; }; - FitHiC = derive2 { name="FitHiC"; version="1.22.0"; sha256="0iv14yx3g7shzl8qrjknyxbmiylj51sbd1wzr1ff9lc5shgl55kq"; depends=[data_table fdrtool Rcpp]; }; - FlowSOM = derive2 { name="FlowSOM"; version="2.4.0"; sha256="0balsds5mm981cqamdjv3ndq1y9arharisd6f2lrpkzgvwawa645"; 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.14.0"; sha256="1dwdppgawgc22qryc98p3ibamcn90871hgix1ad0p3zyhpvza9z5"; depends=[ggplot2 tidyr topGO]; }; - FunChIP = derive2 { name="FunChIP"; version="1.22.0"; sha256="1cc6yxizb8jxfin1pl0lxf6x0yxwvi0lr1pyg1v8a0842dv3zh1d"; depends=[doParallel fda foreach GenomeInfoDb GenomicAlignments GenomicRanges RColorBrewer Rcpp Rsamtools shiny]; }; - GA4GHclient = derive2 { name="GA4GHclient"; version="1.20.0"; sha256="0mg6c1ygj732dpcqbv3ndh58z66msy7bp1rq95d3inj57ccw5fpf"; depends=[BiocGenerics Biostrings dplyr GenomeInfoDb GenomicRanges httr IRanges jsonlite S4Vectors VariantAnnotation]; }; - GA4GHshiny = derive2 { name="GA4GHshiny"; version="1.18.0"; sha256="1gpls1wpd4rdhkwwmm81pv06sj2w6ravcsns2rgqaa4sp2pdsb8a"; depends=[AnnotationDbi BiocGenerics dplyr DT GA4GHclient GenomeInfoDb GenomicFeatures openxlsx purrr S4Vectors shiny shinyjs shinythemes tidyr]; }; - GAPGOM = derive2 { name="GAPGOM"; version="1.11.0"; sha256="0sl97w5zx4zdrdbcwayqyvgxspaxpbils3mpsrim0zlspjrjcy6z"; depends=[AnnotationDbi Biobase BiocFileCache data_table dplyr fastmatch GEOquery GO_db GOSemSim graph igraph magrittr Matrix matrixStats org_Hs_eg_db org_Mm_eg_db plyr RBGL]; }; - GARS = derive2 { name="GARS"; version="1.16.0"; sha256="1v3ps3v2zsr4p2q5wvxa1wm9mnxkhc2d9sgsz841ld0rbqzw7fjl"; depends=[cluster DaMiRseq ggplot2 MLSeq SummarizedExperiment]; }; - GAprediction = derive2 { name="GAprediction"; version="1.22.0"; sha256="08xhky97f5x6kakdavzpqdxp053nrjfjr51r4gkfvcv4xj4dypk0"; depends=[glmnet Matrix]; }; - GBScleanR = derive2 { name="GBScleanR"; version="1.0.6"; sha256="01wk8d1kbs7x26i2anxh8pjsvc9arr6b64qy4zzr32kwmlj0yvg7"; depends=[expm gdsfmt ggplot2 Rcpp RcppParallel SeqArray tidyr]; }; - GCSConnection = derive2 { name="GCSConnection"; version="1.7.0"; sha256="1psmw3825whyzvbzqpqksgcl09b6kfyb8k5vny6ljkjbac1jzvnf"; depends=[googleAuthR googleCloudStorageR httr jsonlite Rcpp]; }; - GCSFilesystem = derive2 { name="GCSFilesystem"; version="1.6.0"; sha256="0qk8xyg06f71y4r1q1zpcj89irh9i6cd9z6nqlx635x8if84sh6d"; depends=[]; }; - GCSscore = derive2 { name="GCSscore"; version="1.10.0"; sha256="0cdhv2awcyg95cjwq088r9rsbmdi3vqnlnh0c74h7k2gjldl9r24"; depends=[affxparser Biobase BiocManager data_table devtools dplR RSQLite stringr]; }; - GDCRNATools = derive2 { name="GDCRNATools"; version="1.16.6"; sha256="0zkw0g711g1w0dp75qwa3cfk3d8dfsp6v4f122j88xc1cjf5rarv"; 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.16.0"; sha256="1j6a0xlrx4cjqsfcm1k1vapddi5v2q5h05b617i839l9cp0ggd1s"; depends=[BiocGenerics DelayedArray gdsfmt S4Vectors SeqArray SNPRelate]; }; - GEM = derive2 { name="GEM"; version="1.22.0"; sha256="0vxpncvnqhgggy0is4lvgf29lgh307jkgz4zjjspdq9ds6y40l1i"; depends=[ggplot2]; }; - GENESIS = derive2 { name="GENESIS"; version="2.26.0"; sha256="1qn3x6j9lvyx130sx9wg7bxvacwbwp87x75inpxx9llc00p7sl9c"; depends=[Biobase BiocGenerics BiocParallel data_table gdsfmt GenomicRanges GWASTools igraph IRanges Matrix reshape2 S4Vectors SeqArray SeqVarTools SNPRelate]; }; - GENIE3 = derive2 { name="GENIE3"; version="1.18.0"; sha256="0h3vnpnznb9rda8gfwp4cnd2mqsvs1vzmfx90dchn5pqaphz1k2l"; depends=[dplyr reshape2]; }; - GEOexplorer = derive2 { name="GEOexplorer"; version="1.2.0"; sha256="00lnrp07nv8hia77riy3p10iq5rsyjzlrq93l4ql6m2cxv2p4qdg"; 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.4.0"; sha256="05s35fbzi2w3c4y11h144mf70i0rhbx1jwdz70ldyfa0ld3hbh89"; depends=[doParallel foreach plyr RCurl rvest stringr xml2]; }; - GEOmetadb = derive2 { name="GEOmetadb"; version="1.58.0"; sha256="12x2aabm2m1rv4s91h6vyq5q36i4i15lgh3bya3bjm80bfmxkfm3"; depends=[GEOquery RSQLite]; }; - GEOquery = derive2 { name="GEOquery"; version="2.64.2"; sha256="1cvkvq2haz831qi8w0gd3ayvxfxsl0z5klhki4gkfi9xqdv1gi9x"; depends=[Biobase curl data_table dplyr limma magrittr R_utils readr tidyr xml2]; }; - GEOsubmission = derive2 { name="GEOsubmission"; version="1.48.0"; sha256="0ml72djmli9qvq2c75nqq00q31lqcb64v8532vw4fk57cclmf76d"; depends=[affy Biobase]; }; - GEWIST = derive2 { name="GEWIST"; version="1.40.0"; sha256="0df1jm69krsr8y315mx93hjnmf4qpvnhbm0iz4j4920ra7g8wdp7"; depends=[car]; }; - GGPA = derive2 { name="GGPA"; version="1.8.0"; sha256="08p3k5dfkc2la5j99wbwswd7zhc4i4aynkmr3x561h6p59n31hnk"; depends=[GGally matrixStats network Rcpp RcppArmadillo scales sna]; }; - GIGSEA = derive2 { name="GIGSEA"; version="1.14.0"; sha256="1v8f3slcx08kcba13aq68y4lmdprz71h33cm7masrcxs2iz839c9"; depends=[locfdr MASS Matrix]; }; - GISPA = derive2 { name="GISPA"; version="1.20.0"; sha256="1qpw6fwa15p6ccylb4hjfwjypy0waywp1yiwq3fwhdazg0pbzr9h"; depends=[Biobase changepoint data_table genefilter GSEABase HH lattice latticeExtra plyr scatterplot3d]; }; - GLAD = derive2 { name="GLAD"; version="2.60.0"; sha256="02amcicn07ywgmd4dkinw0wq6vi0yx45m0naycfgc6bszh78a05z"; depends=[aws]; }; - GMRP = derive2 { name="GMRP"; version="1.24.0"; sha256="0bkz9pj07gn5a2gfci0zl1932mkzcmm5cv9axaa0f8yavn4vy4i5"; depends=[diagram GenomicRanges plotrix]; }; - GNET2 = derive2 { name="GNET2"; version="1.12.0"; sha256="1s09cyhhfbi5p9bnp1wgpl94js65sp63z33bf795mm6jv460ibyy"; depends=[DiagrammeR dplyr ggplot2 igraph matrixStats Rcpp reshape2 SummarizedExperiment xgboost]; }; - GOSemSim = derive2 { name="GOSemSim"; version="2.22.0"; sha256="1hp15pzd0m0g9f8kglyfsgjqxnvxcmm9022xnsrkzfvmj2yw14vd"; depends=[AnnotationDbi GO_db Rcpp]; }; - GOSim = derive2 { name="GOSim"; version="1.34.0"; sha256="0nl5fk7nxmha9sp7phmj9r6mxvg5v0p8l7pblrb34m40h3f27d96"; depends=[annotate AnnotationDbi cluster corpcor flexmix GO_db graph Matrix org_Hs_eg_db RBGL Rcpp topGO]; }; - GOTHiC = derive2 { name="GOTHiC"; version="1.32.0"; sha256="0hnwqsa7pgxnmqrcrbn78mr647rzjs004xx2x5bbi9nbpirr04j9"; depends=[BiocGenerics BiocManager Biostrings BSgenome data_table GenomeInfoDb GenomicRanges ggplot2 IRanges Rsamtools rtracklayer S4Vectors ShortRead]; }; - GOexpress = derive2 { name="GOexpress"; version="1.30.0"; sha256="164vr6hff42gym2rak37xnpz23d4ga20p67jxzw96bnynnzgaaxw"; depends=[Biobase biomaRt ggplot2 gplots randomForest RColorBrewer RCurl stringr]; }; - GOfuncR = derive2 { name="GOfuncR"; version="1.16.0"; sha256="02vdfsjrqp0m06mfbspwkxjyqxfca0w1idgygpi1a9i5m4fqhwpk"; depends=[AnnotationDbi GenomicRanges gtools IRanges mapplots Rcpp vioplot]; }; - GOpro = derive2 { name="GOpro"; version="1.22.0"; sha256="04xgfmazi557r5qr9ginbfsqwvccpw7kds7kyvh6xxcy5kgnlbf0"; depends=[AnnotationDbi BH dendextend doParallel foreach GO_db IRanges MultiAssayExperiment org_Hs_eg_db Rcpp S4Vectors]; }; - GOstats = derive2 { name="GOstats"; version="2.62.0"; sha256="121ly9vifarg8y7mc468571bbs0xv4sx6sflm5zcdqf0p83yvjrm"; depends=[annotate AnnotationDbi AnnotationForge Biobase Category GO_db graph RBGL Rgraphviz]; }; - GOsummaries = derive2 { name="GOsummaries"; version="2.32.0"; sha256="0wkal7hsfz9msf8j7975vkqqzv5x681c891zj1b4mfk6dvn5xffa"; depends=[ggplot2 gProfileR gtable limma plyr Rcpp reshape2]; }; - GPA = derive2 { name="GPA"; version="1.8.0"; sha256="0z4qh88x7gvm02186mnl6bkhg1f5swqci30gzj27lj1kx700jsf3"; depends=[DT ggplot2 ggrepel plyr Rcpp shiny shinyBS vegan]; }; - GRENITS = derive2 { name="GRENITS"; version="1.48.0"; sha256="09c6d8hcawc6ky0pjhvc5yvd7fj1a1bl8n4hcw72nyfgbf20hygi"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; }; - GRaNIE = derive2 { name="GRaNIE"; version="1.0.7"; sha256="1lvc78fbhbp4i6ix4bdmmlnzwma2n5w0v3099p1nghzwcl0jx7z2"; depends=[BiocFileCache BiocManager BiocParallel Biostrings checkmate circlize colorspace ComplexHeatmap csaw data_table DESeq2 dplyr forcats futile_logger GenomeInfoDb GenomicRanges ggplot2 gridExtra igraph IRanges limma magrittr Matrix matrixStats patchwork progress purrr RColorBrewer readr reshape2 rlang robust S4Vectors scales stringr SummarizedExperiment tibble tidyr tidyselect tidyverse topGO viridis]; }; - GRmetrics = derive2 { name="GRmetrics"; version="1.22.0"; sha256="1qz2bj8wnp14mw5zm2207xk3zj98s2gk16fvhdzpy21y07irrx3j"; depends=[drc ggplot2 plotly S4Vectors SummarizedExperiment]; }; - GRridge = derive2 { name="GRridge"; version="1.20.0"; sha256="16bra2nz4i4f40x2gfcky7ggz3alpvhwcbilv48r7nv4p6b31j8i"; depends=[glmnet graph Iso mvtnorm penalized survival]; }; - GSALightning = derive2 { name="GSALightning"; version="1.24.0"; sha256="0p2k8k05283h7ls1aj5457ycqq46mxjjx7pmjijmj0kfzcmnqyv2"; depends=[data_table Matrix]; }; - GSAR = derive2 { name="GSAR"; version="1.30.0"; sha256="0b71l3hlg5zxf6y3yffbl785pprh66z89xx9gz9s2vb5rqkbqydb"; depends=[igraph]; }; - GSCA = derive2 { name="GSCA"; version="2.26.0"; sha256="0vrgzp4rc8y0amzjgqv3l77jqpbjgc5qdpijpqfm870fcjp1iqvi"; depends=[ggplot2 gplots RColorBrewer reshape2 rhdf5 shiny sp]; }; - GSEABase = derive2 { name="GSEABase"; version="1.58.0"; sha256="1qhvgyg392fd98h2qnmfmhg7mil5hp9cy3qmkqs4x1bhpv1m978g"; depends=[annotate AnnotationDbi Biobase BiocGenerics graph XML]; }; - GSEABenchmarkeR = derive2 { name="GSEABenchmarkeR"; version="1.16.0"; sha256="19yvv82c2fvmjzv4rrfv19svsj2dm3pkvg78zjk7vs64y81ph5d7"; depends=[AnnotationDbi AnnotationHub Biobase BiocFileCache BiocParallel edgeR EnrichmentBrowser ExperimentHub KEGGandMetacoreDzPathwaysGEO KEGGdzPathwaysGEO S4Vectors SummarizedExperiment]; }; - GSEAlm = derive2 { name="GSEAlm"; version="1.56.0"; sha256="1ybfd6b79bqv3rk986456y9hqmjkgibmpv43q9ivxqz1acyvj6v0"; depends=[Biobase]; }; - GSEAmining = derive2 { name="GSEAmining"; version="1.6.0"; sha256="19r923086qr400f4p2kfn4ii09q2k2pqg9k4r035b9afqgd0x91a"; depends=[dendextend dplyr ggplot2 ggwordcloud gridExtra rlang stringr tibble tidytext]; }; - GSRI = derive2 { name="GSRI"; version="2.44.0"; sha256="0z79l6m3z0ib9iy24hpiscmxasrx33y6swrdg0k1z48sdhy0gsf1"; depends=[Biobase fdrtool genefilter GSEABase les]; }; - GSReg = derive2 { name="GSReg"; version="1.30.0"; sha256="0g0j4bh9h8qvki84gcp2s6yn2hhc38219jzihmf9jpjl66k74gs0"; depends=[AnnotationDbi GenomicFeatures Homo_sapiens org_Hs_eg_db]; }; - GSVA = derive2 { name="GSVA"; version="1.44.5"; sha256="09szzrgyjcx33yh2327s8w4xaarvavajsb19jfdgdxc1bs5yhzl9"; depends=[Biobase BiocParallel BiocSingular DelayedArray DelayedMatrixStats GSEABase HDF5Array IRanges Matrix S4Vectors SingleCellExperiment sparseMatrixStats SummarizedExperiment]; }; - GSgalgoR = derive2 { name="GSgalgoR"; version="1.6.0"; sha256="1wi6ww5rycc2zxhnm83amzrh7ffripmiqklcmxisv6jqgr64adp3"; depends=[cluster doParallel foreach matchingR nsga2R proxy survival]; }; - GUIDEseq = derive2 { name="GUIDEseq"; version="1.26.0"; sha256="1ar20zr3mjfqs7fvd323mdrxylvsjazn6si4d8ilgbpq4xhdv58a"; depends=[BiocGenerics BiocParallel Biostrings BSgenome ChIPpeakAnno CRISPRseek data_table dplyr GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges hash IRanges limma matrixStats Rsamtools S4Vectors]; }; - GWAS_BAYES = derive2 { name="GWAS.BAYES"; version="1.6.0"; sha256="01bj6gh95p95imyvvzjylnw42rcrzw3x8z0q8x2cx42zqf45dqc1"; depends=[caret doParallel GA ggplot2 Matrix memoise Rcpp RcppEigen reshape2]; }; - GWASTools = derive2 { name="GWASTools"; version="1.42.1"; sha256="0a9k2dsaxp5szqm71qd3l5jq0aqnbgp7w5n8d7qiywlkfw4l8lwm"; depends=[Biobase data_table DBI DNAcopy gdsfmt GWASExactHW lmtest logistf quantsmooth RSQLite sandwich survival]; }; - GWENA = derive2 { name="GWENA"; version="1.6.0"; sha256="10cs5csg6dwqajsk461flq55siz6jfd90w5cyqdhyq4mcbv6zp1x"; depends=[cluster dplyr dynamicTreeCut ggplot2 gprofiler2 igraph magrittr matrixStats NetRep purrr RColorBrewer rlist stringr SummarizedExperiment tibble tidyr WGCNA]; }; - GateFinder = derive2 { name="GateFinder"; version="1.16.0"; sha256="1wrx3rp1r4fjq8c56dk40izawzpsrmkrrdvivi67arx5pdjhjz30"; depends=[diptest flowCore flowFP mvoutlier splancs]; }; - GenProSeq = derive2 { name="GenProSeq"; version="1.0.0"; sha256="0vmsjpdkfvq28bihmf47a2ihlfxzadjr5vm6clh25016rz0086pp"; depends=[CatEncoders DeepPINCS keras mclust reticulate tensorflow ttgsea word2vec]; }; - GenVisR = derive2 { name="GenVisR"; version="1.28.0"; sha256="1cr9f044vj4qfb050nsbnnr9bvz12p3fzvnag54na3j2yinvsq6c"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome data_table DBI GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra gtable gtools IRanges plyr reshape2 Rsamtools scales VariantAnnotation viridis]; }; - GeneAccord = derive2 { name="GeneAccord"; version="1.14.0"; sha256="0lpw3fxfwfhnymivvjh6na9ssqs7268543kpf5wximfcm7wy9mzm"; depends=[biomaRt caTools dplyr ggplot2 ggpubr gtools magrittr maxLik RColorBrewer reshape2 tibble]; }; - GeneBreak = derive2 { name="GeneBreak"; version="1.26.0"; sha256="0dw5r5zaxp0y2g626gsvwcqcaqf7lz8ajnca6n6k6krbng7nqpf2"; depends=[CGHbase CGHcall GenomicRanges QDNAseq]; }; - GeneExpressionSignature = derive2 { name="GeneExpressionSignature"; version="1.42.0"; sha256="0jyxvsqm8gswbv2aky18hz2lc75l2l12yidhkqhv0c0rr3kxqvsv"; depends=[Biobase]; }; - GeneGA = derive2 { name="GeneGA"; version="1.46.0"; sha256="1xb7m5rzgycbp1w1wa022ksn5fskkvyh38ndg7a11nfk0lq1mxiw"; depends=[hash seqinr]; }; - GeneGeneInteR = derive2 { name="GeneGeneInteR"; version="1.22.0"; sha256="1ccxwdjyk567i78xda40ycnpa9lnln9zc8r9k5njwizj9wma1fzy"; depends=[data_table FactoMineR GenomicRanges igraph IRanges kernlab mvtnorm Rsamtools snpStats]; }; - GeneMeta = derive2 { name="GeneMeta"; version="1.68.0"; sha256="1y0d65h40s68gmnw680a2ac1g6kmfh4zbgzff1dblh1k4lvgzir2"; depends=[Biobase genefilter]; }; - GeneNetworkBuilder = derive2 { name="GeneNetworkBuilder"; version="1.38.0"; sha256="0yz0p9q3km71lji12p0bqa7zz6rcbrmw2c62im0bnrxmraw1l498"; depends=[graph htmlwidgets plyr Rcpp Rgraphviz rjson XML]; }; - GeneOverlap = derive2 { name="GeneOverlap"; version="1.32.0"; sha256="0nqwa3x9q1hl9nm06hqzzrn00rirc9kj6s320csjlf7x6rcidr93"; depends=[gplots RColorBrewer]; }; - GeneRegionScan = derive2 { name="GeneRegionScan"; version="1.52.0"; sha256="0qgfjlahc93ijsz7m2i11xmkkkwnzddf4mi17l2cq6a14ykdlww5"; depends=[affxparser Biobase Biostrings RColorBrewer S4Vectors]; }; - GeneSelectMMD = derive2 { name="GeneSelectMMD"; version="2.40.0"; sha256="19q88wy0gmyyvc9ddq7dm6mqy5zh8kqpad1dz5ymvzq8663cldqa"; depends=[Biobase limma MASS]; }; - GeneStructureTools = derive2 { name="GeneStructureTools"; version="1.16.0"; sha256="1ciflsp0i96ljh4xz1b1bbf6za4hd2swnykmp0wvgayxxcwxdwjv"; depends=[Biostrings BSgenome_Mmusculus_UCSC_mm10 data_table GenomicRanges Gviz IRanges plyr rtracklayer S4Vectors stringdist stringr]; }; - GeneTonic = derive2 { name="GeneTonic"; version="2.0.2"; sha256="08mq482px35a1b3cz64h8hlw2s4cabyddb1ly5hzbbgcqq9h18p3"; depends=[AnnotationDbi backbone bs4Dash circlize colorspace colourpicker ComplexHeatmap ComplexUpset 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.58.0"; sha256="0vbkbjyb9r5gsbkn3c28y3bicmn82r1bfsah6ww6pf539xzipbzj"; depends=[gdata genetics MASS]; }; - GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.32.4"; sha256="0z2bqr0zrl3r2kcqs72ny8p1psf8w1sgbr7qjjknxdv1qp8m2j7v"; depends=[BiocGenerics GenomeInfoDbData IRanges RCurl S4Vectors]; }; - GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.32.1"; sha256="09pg7822camyav5zvlpv360sj5gz8q1bhk528qa2da2qsz74a3cz"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; }; - GenomicDataCommons = derive2 { name="GenomicDataCommons"; version="1.20.3"; sha256="09qjy79wvbahwyb2avvagp3pp4d2v3qr2balsjvg75g8j5fsy50f"; depends=[dplyr GenomicRanges httr IRanges jsonlite magrittr rappdirs readr rlang tibble xml2]; }; - GenomicDistributions = derive2 { name="GenomicDistributions"; version="1.4.6"; sha256="05q36bbcg2acr93bzcmd6vfxl442ig7rk0d0kmzhp33fbrrz8k3a"; depends=[Biostrings broom data_table dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges plyr reshape2 scales]; }; - GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.48.4"; sha256="15kn5lmdqp7rsh2zlixj7ashsqnv50bs36hapw36qbaz9vgvim4v"; depends=[AnnotationDbi Biobase BiocGenerics BiocIO biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors XVector]; }; - GenomicFiles = derive2 { name="GenomicFiles"; version="1.32.1"; sha256="06ycfna26klx27vvsnlpgv46bymfrc8z0zkpag7nm4m23153ivkz"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges MatrixGenerics Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; - GenomicInteractionNodes = derive2 { name="GenomicInteractionNodes"; version="1.0.0"; sha256="064mvbgrhf098pyqabqdi70yskri5pa3fd1yylzwmabx3g7wvsw8"; depends=[AnnotationDbi GenomeInfoDb GenomicFeatures GenomicRanges GO_db graph IRanges RBGL S4Vectors]; }; - GenomicInteractions = derive2 { name="GenomicInteractions"; version="1.30.0"; sha256="0aph1hja5vfprxs3jl4zd1inhvih6m3v1p3jkm6w7xpj3jzvmgbx"; depends=[Biobase BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph InteractionSet IRanges Rsamtools rtracklayer S4Vectors stringr]; }; - GenomicOZone = derive2 { name="GenomicOZone"; version="1.10.0"; sha256="1dhrlibbs41rl97rspnn4sc77ic5rv7l23vgm4qmgq37lv1crpdk"; depends=[biomaRt Ckmeans_1d_dp GenomeInfoDb GenomicRanges ggbio ggplot2 gridExtra IRanges lsr plyr Rdpack S4Vectors]; }; - GenomicRanges = derive2 { name="GenomicRanges"; version="1.48.0"; sha256="088rv1aclwq265pdg4hmks73nl0125vk0vigyi44n3djkrdx48yn"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; }; - GenomicScores = derive2 { name="GenomicScores"; version="2.8.2"; sha256="12rcxw69an1d5q7ar58xy8s871l47imw2nm08j054ivxslx8597j"; depends=[AnnotationHub Biobase BiocFileCache BiocGenerics BiocManager Biostrings DelayedArray GenomeInfoDb GenomicRanges HDF5Array httr IRanges rhdf5 S4Vectors XML]; }; - GenomicSuperSignature = derive2 { name="GenomicSuperSignature"; version="1.4.0"; sha256="09hfb3j1v4b2as4vwy87h5jqi4kzz179k4lzvw4csr0yvs80f3ks"; depends=[Biobase BiocFileCache ComplexHeatmap dplyr flextable ggplot2 ggpubr plotly S4Vectors SummarizedExperiment]; }; - GenomicTuples = derive2 { name="GenomicTuples"; version="1.30.0"; sha256="0mjw7vvw28lgb7yrsymnixambnwasq79hfbcc3rw24c0srad6hsw"; depends=[BiocGenerics data_table GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; }; - GeoDiff = derive2 { name="GeoDiff"; version="1.2.0"; sha256="0s0bcx6j7varibkv5gwf29kld8znzz0dlbsrip6qxg5w23wwdhcz"; depends=[Biobase GeomxTools lme4 Matrix NanoStringNCTools plyr Rcpp RcppArmadillo robust roptim testthat withr]; }; - GeomxTools = derive2 { name="GeomxTools"; version="3.0.1"; sha256="1jj4jsh4z514lkdzd7isfhsg54lr6fkvqacdmizyvbcpiiccgw6v"; depends=[Biobase BiocGenerics data_table dplyr EnvStats GGally ggplot2 lmerTest NanoStringNCTools readxl reshape2 rjson rlang S4Vectors SeuratObject stringr]; }; - GladiaTOX = derive2 { name="GladiaTOX"; version="1.12.0"; sha256="15s1qm5519ijr4h2krbfgix1768yb4jjhx9py57px6v6mwg7ahks"; depends=[brew data_table DBI ggplot2 ggrepel numDeriv RColorBrewer RCurl RJSONIO RMySQL RSQLite stringr tidyr XML xtable]; }; - Glimma = derive2 { name="Glimma"; version="2.6.0"; sha256="1k17ay09vhb2hakg1vrgvpp1zliavlj7cdkxaal162bc3v8pyvyz"; depends=[DESeq2 edgeR htmlwidgets jsonlite limma S4Vectors SummarizedExperiment]; }; - GlobalAncova = derive2 { name="GlobalAncova"; version="4.14.0"; sha256="01w50kl0cfif8d773i4xx70p8wp337fkx6kclxgvrgd7bmv286v4"; depends=[annotate AnnotationDbi Biobase corpcor dendextend globaltest GSEABase VGAM]; }; - GmicR = derive2 { name="GmicR"; version="1.10.0"; sha256="02h92xlziqjva283crbgjlffii00bsmbldknzsj38fksjp43dih9"; depends=[AnnotationDbi ape bnlearn Category data_table doParallel DT foreach GOstats gRain gRbase GSEABase org_Hs_eg_db org_Mm_eg_db reshape2 shiny WGCNA]; }; - GraphAT = derive2 { name="GraphAT"; version="1.68.0"; sha256="1s5qcykfprqwqbhmlp64yxmjaxskwrxgh93j4idzgp71md1k5sf1"; depends=[graph MCMCpack]; }; - GraphAlignment = derive2 { name="GraphAlignment"; version="1.60.0"; sha256="0spjsqb8rx6si5lshk0drlq1h4h5jgb6bmcwdh0wz9755npz0p8m"; depends=[]; }; - GraphPAC = derive2 { name="GraphPAC"; version="1.38.0"; sha256="1qrcxcb68bx1kzpilrd61m14902wl490kmzkjj9bv35w20ln1f3h"; depends=[igraph iPAC RMallow TSP]; }; - GreyListChIP = derive2 { name="GreyListChIP"; version="1.28.1"; sha256="0w52vwvjarql19bsv40b80yn701qx8c9d0clsjhj85wmzj2p6dhg"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer SummarizedExperiment]; }; - Guitar = derive2 { name="Guitar"; version="2.12.0"; sha256="09grsasnnk7rmlzjh4lhas9r5spzcsrvmdqj6fx1dk22sckcqahh"; depends=[AnnotationDbi dplyr GenomicFeatures GenomicRanges ggplot2 knitr magrittr rtracklayer]; }; - Gviz = derive2 { name="Gviz"; version="1.40.1"; sha256="0as3sxhv21bqqrpvafcqim7798hhkzj3q40hy1rqyhv2lhj4rbvi"; 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.24.2"; sha256="1dzx5463ig3ag72a47slc4jbq5id11w77cj0zgzr85h0dbxklrr9"; depends=[BiocGenerics DelayedArray IRanges Matrix rhdf5 rhdf5filters Rhdf5lib S4Vectors]; }; - HDTD = derive2 { name="HDTD"; version="1.30.0"; sha256="084bx1qwlibpd6xna29sb9nfksxa3z4jiz4l3fhkl8n5ww6k33pq"; depends=[Rcpp RcppArmadillo]; }; - HELP = derive2 { name="HELP"; version="1.54.0"; sha256="1sk3433d90msi6g0rpvsj8fdvr7isqs7gna409fcya2n4dlgmbs1"; depends=[Biobase]; }; - HEM = derive2 { name="HEM"; version="1.68.0"; sha256="1hq6i9rjrlis4fmi6zc06d37562vvv0sbsm4mihyrfmmn87k06wq"; depends=[Biobase]; }; - HGC = derive2 { name="HGC"; version="1.4.0"; sha256="1mm6drdslj7f23p9mzy0nlmyvmqafad9hm7nvskm6fv4jwbpg4wv"; depends=[ape dendextend dplyr ggplot2 Matrix mclust patchwork RANN Rcpp RcppEigen]; }; - HIBAG = derive2 { name="HIBAG"; version="1.32.0"; sha256="0a9gm7r2f1rfqzc5bviz3z4bfgl5lfzdwjlrc1dca2s6qsb5z01l"; depends=[RcppParallel]; }; - HIPPO = derive2 { name="HIPPO"; version="1.8.0"; sha256="0y69bc5557sijzczh2viflxg6wgy380a8jk7d1cqgmqcaqabwzbv"; depends=[dplyr ggplot2 ggrepel gridExtra irlba magrittr Matrix reshape2 rlang Rtsne SingleCellExperiment umap]; }; - HIREewas = derive2 { name="HIREewas"; version="1.14.0"; sha256="0gxaki4si2brjjns1fmhkgbrxv6kr5wcrhxx3083cnhdvllpqmzi"; depends=[gplots quadprog]; }; - HMMcopy = derive2 { name="HMMcopy"; version="1.38.0"; sha256="0hpb42wxsxyvl2p7l9ml2fnr30fvba54hc8zrl6rqaf9qdhw4c3x"; depends=[data_table]; }; - HPAStainR = derive2 { name="HPAStainR"; version="1.6.0"; sha256="1hp5y6ws0zg3qckd2bhhbpcqpzrlggljphqi2xc9fmjpbk2h0hbg"; depends=[data_table dplyr scales shiny stringr tibble tidyr]; }; - HPAanalyze = derive2 { name="HPAanalyze"; version="1.14.0"; sha256="0w69qs669l36n287n3dqz3ym81m5ww3191xd6ixrxz4c4jph16d5"; depends=[dplyr ggplot2 gridExtra openxlsx tibble xml2]; }; - HPiP = derive2 { name="HPiP"; version="1.2.0"; sha256="19pay1091q5w0kmcx1f2843dm1lk3f7p2nd9ffvgynxg84k873i8"; depends=[caret corrplot dplyr ggplot2 httr igraph magrittr MCL pROC protr PRROC purrr readr stringr tibble tidyr]; }; - HTSFilter = derive2 { name="HTSFilter"; version="1.36.0"; sha256="0s47sd83ih69r8m7q4llnscwpljbiraam16mwz29jwij5nqlaa1q"; depends=[Biobase BiocParallel DESeq2 edgeR]; }; - HTSeqGenie = derive2 { name="HTSeqGenie"; version="4.25.1"; sha256="0g1qkp8h4cmsisvjkv8qgm6aq4yifkr9bs1rxzlva0hlxlllg5k8"; depends=[BiocGenerics BiocParallel Biostrings Cairo chipseq GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gmapR hwriter IRanges Rsamtools rtracklayer S4Vectors ShortRead SummarizedExperiment VariantAnnotation VariantTools]; }; - HTqPCR = derive2 { name="HTqPCR"; version="1.50.0"; sha256="0am98rzwpi3kybq1l27c5qn3n1pg5aqwmh6jq9q0lzbjjin3haqc"; depends=[affy Biobase gplots limma RColorBrewer]; }; - Harman = derive2 { name="Harman"; version="1.24.0"; sha256="1rcn9i6mav40c1awxpnrn7lqxqmxhsm1mdgawcvx10xflyy7gqik"; depends=[Ckmeans_1d_dp matrixStats Rcpp]; }; - Harshlight = derive2 { name="Harshlight"; version="1.68.0"; sha256="152gxcngniw14kmminf9fcc0jkvi4dab1j88mp13nv05nmkd7c7l"; depends=[affy altcdfenvs Biobase]; }; - Heatplus = derive2 { name="Heatplus"; version="3.4.0"; sha256="0b1mzxysmrqinp93p587apna8p0llmawblwj93icydqxxm2jkhb1"; depends=[RColorBrewer]; }; - HelloRanges = derive2 { name="HelloRanges"; version="1.22.0"; sha256="1mmp19gpmpgn3kw9wjgsdc25hf4jfgg9bkjplg2qaf8rvm0mj8ih"; depends=[BiocGenerics BiocIO Biostrings BSgenome docopt GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; - HiCBricks = derive2 { name="HiCBricks"; version="1.14.0"; sha256="0zf4mpq1bv7hhylrwnz3ia26mxwjyfx6rr9l9hxcjvm6zxh856dc"; 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.4.2"; sha256="0psww4sl4m5ynkv53xzyrigxzbypjdhqivg4r64993dlgcdsyi48"; 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.18.0"; sha256="0bgfa085x3w8g005iwnydv1c5i2sz12h5pksmki3427im6khycmr"; depends=[BiocParallel data_table dplyr GenomicRanges ggplot2 gridExtra gtools InteractionSet IRanges KernSmooth mgcv pheatmap QDNAseq rhdf5 S4Vectors]; }; - HiLDA = derive2 { name="HiLDA"; version="1.10.0"; sha256="0rf96isx2qwy7fs8y43bamfcdypiwbh5gggxqmdwdgkk0zhcpnls"; 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.40.0"; sha256="1pkshlrra26cad0hf8a54brlkazni6rsvrplh36azxapx5rpps4s"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; }; - HilbertCurve = derive2 { name="HilbertCurve"; version="1.26.0"; sha256="0ay05dh8n98v1fasj9dw195vi24wry40xnzzcf57wfvxrn18ps34"; depends=[circlize GenomicRanges HilbertVis IRanges png polylabelr]; }; - HilbertVis = derive2 { name="HilbertVis"; version="1.54.0"; sha256="0vci86nzwynzv95v90c48nkrwnf55z3a8ah2k6q5d17v8jd9p9b5"; depends=[lattice]; }; - HilbertVisGUI = derive2 { name="HilbertVisGUI"; version="1.54.0"; sha256="19x99ah99a7fh1h7lhpxjs0ibnh7bcy6ri250clvv54pv2znindi"; depends=[HilbertVis]; }; - HubPub = derive2 { name="HubPub"; version="1.4.0"; sha256="1xixk2vm9ipm9rpdhcvs66gar2f7wlnx72pwfmlr0s75v6d5y0a5"; depends=[available aws_s3 BiocManager biocthis dplyr fs usethis]; }; - HumanTranscriptomeCompendium = derive2 { name="HumanTranscriptomeCompendium"; version="1.12.0"; sha256="0b76awzcz8nf6hpipfiylz2rn40zi443wld4v087baljb7y41wyr"; depends=[S4Vectors shiny ssrch SummarizedExperiment]; }; - HybridMTest = derive2 { name="HybridMTest"; version="1.40.0"; sha256="0wf002nrfr5ndkr2am555ifnx39iwygd5i2294z84vbfpxdi39rs"; depends=[Biobase fdrtool MASS survival]; }; - IHW = derive2 { name="IHW"; version="1.24.0"; sha256="1gsfy75dz7xh16z844llcmjnp0a0ridszmrbbv2bdaa43na5msmf"; depends=[BiocGenerics fdrtool lpsymphony slam]; }; - ILoReg = derive2 { name="ILoReg"; version="1.6.0"; sha256="091z51j8whfg02g2lbfrjm53vcyncrc8v6g2agkr7p8ji2ms09la"; depends=[aricode cluster cowplot dendextend DescTools doRNG doSNOW dplyr fastcluster foreach ggplot2 LiblineaR Matrix parallelDist pheatmap plyr reshape2 RSpectra Rtsne S4Vectors scales SingleCellExperiment SparseM SummarizedExperiment umap]; }; - IMAS = derive2 { name="IMAS"; version="1.20.0"; sha256="07gb5k0xjwpq74ziknl3y9448591z6cxc7yza16x3vaz3927y7nz"; depends=[AnnotationDbi BiocGenerics BiocParallel doParallel foreach GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggfortify ggplot2 gridExtra IRanges IVAS lattice lme4 Matrix Rsamtools S4Vectors survival]; }; - IMMAN = derive2 { name="IMMAN"; version="1.16.0"; sha256="1fg0vcckibrn59lcjvp3bjx1bzzvgl8wvbwj65zs22bkaw0g14h5"; depends=[Biostrings igraph seqinr STRINGdb]; }; - IMPCdata = derive2 { name="IMPCdata"; version="1.32.0"; sha256="09x3bnwdjrs3p3mkafln4fxxf1v4yglffwsj7bypfl04d4nqvsn6"; depends=[rjson]; }; - INDEED = derive2 { name="INDEED"; version="2.10.0"; sha256="09d694i2rjgaw4f3jsm41x0b1jhzxizbnvi9vvr8sd535cgzgczz"; depends=[devtools glasso igraph visNetwork]; }; - INPower = derive2 { name="INPower"; version="1.32.0"; sha256="0zszizdpb4b3lwp9561a1rq415vxns3w5dky2g1121p7b0pn3wdq"; depends=[mvtnorm]; }; - INSPEcT = derive2 { name="INSPEcT"; version="1.26.0"; sha256="0jx887vhxwd8zlqajr9czvn9nx88ryyxlnl58hxrlajjpcjkz9ax"; depends=[Biobase BiocGenerics BiocParallel DESeq2 deSolve gdata GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges KernSmooth plgem pROC rootSolve Rsamtools rtracklayer S4Vectors shiny SummarizedExperiment TxDb_Mmusculus_UCSC_mm9_knownGene]; }; - IONiseR = derive2 { name="IONiseR"; version="2.20.0"; sha256="0cgx1dcfh617l9vr4r3ky8w7f0snl0vpavfd9n1h5n68p0p42dwi"; depends=[BiocGenerics BiocParallel Biostrings bit64 dplyr ggplot2 magrittr rhdf5 ShortRead stringr tibble tidyr XVector]; }; - IPO = derive2 { name="IPO"; version="1.22.1"; sha256="00wzavqw8qldwqsj46z97wi32yxacwf64xjywr2ck6kjicz4d245"; depends=[BiocParallel CAMERA rsm xcms]; }; - IRISFGM = derive2 { name="IRISFGM"; version="1.4.0"; sha256="13c9xk3gmqg0chzhmd6kj9fwmc11mc2j3wqin5202dkkn7x9b170"; 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.30.1"; sha256="1r01c9lczkchgd9hbxxd6wrd5avhy52mfqjck7l9avjq1jimvzv3"; depends=[BiocGenerics S4Vectors]; }; - ISAnalytics = derive2 { name="ISAnalytics"; version="1.6.2"; sha256="10arh47m7pg81rry1hb4pdfd0b5rdcj81lz9i32xlxanh3sp8kjv"; depends=[BiocParallel bslib data_table datamods dplyr forcats fs ggplot2 ggrepel glue lifecycle lubridate magrittr psych purrr Rcapture readr readxl rlang shiny shinyWidgets stringr tibble tidyr]; }; - ISoLDE = derive2 { name="ISoLDE"; version="1.24.0"; sha256="13cgy5hr4y6l3fkq2fx43wm4aypn5k3wp159kdqgp00lywd7pzxp"; depends=[]; }; - ITALICS = derive2 { name="ITALICS"; version="2.56.0"; sha256="150kfwhf47ipr2aql5cxli2hhs3cmgcya9aag0il41xy0wgc96k5"; depends=[affxparser DBI GLAD ITALICSData oligo oligoClasses pd_mapping50k_xba240]; }; - IVAS = derive2 { name="IVAS"; version="2.16.0"; sha256="1flsha57b7p2rnnrg4vs9dpghr9kf6g92r0xng3rrmxzb9i88kzw"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges ggfortify ggplot2 IRanges lme4 Matrix S4Vectors]; }; - IWTomics = derive2 { name="IWTomics"; version="1.20.0"; sha256="0yqgvyybfqpp4s44if323ipvxl8mpnjbsfvibbmhq108radzv488"; depends=[fda GenomicRanges gtable IRanges KernSmooth S4Vectors]; }; - Icens = derive2 { name="Icens"; version="1.68.0"; sha256="0jnbfv7js8bw0ginql90krrpk0p54whj9igw0zk3jc45jqvj2vyc"; depends=[survival]; }; - IdeoViz = derive2 { name="IdeoViz"; version="1.32.0"; sha256="1wwh3ifdijhpm58lw7cmnx084xwfxnc7i0206w8rhrjnvnq6ljh3"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges RColorBrewer rtracklayer]; }; - IgGeneUsage = derive2 { name="IgGeneUsage"; version="1.10.0"; sha256="08rm56fniyg6lp8psmh0z6f2hvngvpy0q8fzcxxsizff87mqf0hq"; depends=[Rcpp reshape2 rstan StanHeaders SummarizedExperiment]; }; - ImmuneSpaceR = derive2 { name="ImmuneSpaceR"; version="1.24.0"; sha256="12hk0bq0fgna8dbahgc04lm9bgv2jp8lh1qirjs5x45gjz896mbz"; depends=[Biobase curl data_table digest flowCore flowWorkspace ggplot2 gplots heatmaply httr jsonlite pheatmap plotly preprocessCore R6 Rlabkey rmarkdown scales]; }; - InPAS = derive2 { name="InPAS"; version="2.4.0"; sha256="17ndjhf0kngpp7l48xbzc4p10h8zrmk76kjf05dw6ifpg50plqip"; depends=[AnnotationDbi batchtools Biobase Biostrings BSgenome cleanUpdTSeq depmixS4 dplyr flock future future_apply GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges limma magrittr parallelly plyranges preprocessCore readr reshape2 RSQLite S4Vectors]; }; - InTAD = derive2 { name="InTAD"; version="1.16.0"; sha256="1xjzml66a1sfqi0lai2jflfxwfc4k6n4cbram50sn21h7lkq330k"; depends=[Biobase BiocGenerics GenomicRanges ggplot2 ggpubr IRanges mclust MultiAssayExperiment qvalue rtracklayer S4Vectors SummarizedExperiment]; }; - Informeasure = derive2 { name="Informeasure"; version="1.6.0"; sha256="0rna7pgsgq4amjmq91y40gxrqv0rw3vc1rfk5g5bq2ki3lqqvi0s"; depends=[entropy]; }; - IntEREst = derive2 { name="IntEREst"; version="1.20.0"; sha256="10rnm2va657zqcmbrd2f19ypmm0s8kyljy0b22kx8qn0zr7zcis3"; depends=[BiocGenerics BiocParallel Biostrings DBI DESeq2 DEXSeq edgeR GenomicAlignments GenomicFeatures GenomicRanges IRanges RMySQL Rsamtools S4Vectors seqinr seqLogo SummarizedExperiment]; }; - InterCellar = derive2 { name="InterCellar"; version="2.2.0"; sha256="136hcjhn1mgvmvxqfmmwrclqm4qrfkhwfkkcn008ga9i01s94yvp"; depends=[biomaRt circlize colorspace colourpicker ComplexHeatmap config data_table dendextend dplyr DT factoextra fmsb fs ggplot2 golem htmltools htmlwidgets igraph plotly plyr readxl rlang scales shiny shinyalert shinycssloaders shinydashboard shinyFeedback shinyFiles signal tibble tidyr umap visNetwork wordcloud2]; }; - InterMineR = derive2 { name="InterMineR"; version="1.18.0"; sha256="09qsh1ha2f5lipm3hnjpq7ra5xx2fqll9jkkq20w9xqn2b8a59mr"; depends=[Biostrings GenomicRanges httr igraph IRanges RCurl RJSONIO S4Vectors sqldf SummarizedExperiment XML xml2]; }; - InteractionSet = derive2 { name="InteractionSet"; version="1.24.0"; sha256="0qjimx25jvm8siq8hmlbf2z6mknzpbq945p06fsj826k57bpcsm5"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges Matrix Rcpp S4Vectors SummarizedExperiment]; }; - InteractiveComplexHeatmap = derive2 { name="InteractiveComplexHeatmap"; version="1.4.0"; sha256="13pij41vhafipf96069hv6qkja75vkdxj5iicpbq409d8sdghbj2"; depends=[clisymbols ComplexHeatmap digest fontawesome GetoptLong htmltools IRanges jsonlite kableExtra RColorBrewer S4Vectors shiny svglite]; }; - IntramiRExploreR = derive2 { name="IntramiRExploreR"; version="1.18.0"; sha256="0w8zvlx4il5fh9fczfabac9mvzvxbrskn7pf0cc49s5ja8267vpq"; depends=[FGNet igraph knitr]; }; - IsoCorrectoR = derive2 { name="IsoCorrectoR"; version="1.14.0"; sha256="1g4xv5x9g5ijjq80k8jswil7crhmwqv2j29rialx9z980nvkphyr"; depends=[dplyr magrittr pracma quadprog readr readxl stringr tibble WriteXLS]; }; - IsoCorrectoRGUI = derive2 { name="IsoCorrectoRGUI"; version="1.12.0"; sha256="10ysfzhycawlhm6zxxk1flwgz9si09vxv4hjygmjp2nn23py4ivm"; depends=[IsoCorrectoR readxl tcltk2]; }; - IsoGeneGUI = derive2 { name="IsoGeneGUI"; version="2.31.0"; sha256="1w7zxsvmcrz8cj8g8xa1vqbzfycdhgsclhcjmkqjw1hwz6fp3xgn"; depends=[Biobase ff geneplotter goric Iso IsoGene jpeg multtest ORCME ORIClust RColorBrewer Rcpp relimp tkrplot xlsx]; }; - IsoformSwitchAnalyzeR = derive2 { name="IsoformSwitchAnalyzeR"; version="1.18.0"; sha256="0n1gb9azxa1mxpsqvw3i3kf72f45nyjj1kgwwrzhd88n3g63lvkd"; depends=[Biobase BiocGenerics Biostrings BSgenome DBI DEXSeq dplyr DRIMSeq edgeR futile_logger GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges limma magrittr plyr RColorBrewer RCurl readr reshape2 rtracklayer stringr tibble tximeta tximport VennDiagram XVector]; }; - KBoost = derive2 { name="KBoost"; version="1.4.0"; sha256="03rlkz6sblc6x2g1qy2n3di4gpribhxyivm2ddqsxzlm74f24mc1"; depends=[]; }; - KCsmart = derive2 { name="KCsmart"; version="2.54.0"; sha256="1qw4ag113rkg6lv556m0wv5c89r86f9sw1jzdg6mx4vrprnl64lv"; depends=[BiocGenerics KernSmooth multtest siggenes]; }; - KEGGREST = derive2 { name="KEGGREST"; version="1.36.3"; sha256="0lzb3z6pzm323q70931b7220ygml7jb4g81dybwa79wqiqz15pni"; depends=[Biostrings httr png]; }; - KEGGgraph = derive2 { name="KEGGgraph"; version="1.56.0"; sha256="15pq040pcg8hr18xixmjp59xb7mgvygjv6kisqk8yv99l1611ndx"; depends=[graph RCurl Rgraphviz XML]; }; - KEGGlincs = derive2 { name="KEGGlincs"; version="1.22.0"; sha256="1lrs6nqsfsafnvkyj46851r7m6b10dq8f6jfikqyhbv4cisw4kln"; depends=[AnnotationDbi gtools hgu133a_db httr igraph KEGGgraph KEGGREST KOdata org_Hs_eg_db plyr RJSONIO XML]; }; - KinSwingR = derive2 { name="KinSwingR"; version="1.14.0"; sha256="1703kfmgp52v6yd5pjj8d7s8j725xq4xgrzsi015jgrka76q1860"; depends=[BiocParallel data_table sqldf]; }; - KnowSeq = derive2 { name="KnowSeq"; version="1.10.2"; sha256="0lvxkn2jcyyfwiz9l670dpb6fiyffp0dgsyy9dl5ja7vwrphkv45"; depends=[caret cqn e1071 edgeR ggplot2 gridExtra Hmisc httr jsonlite kernlab limma praznik R_utils randomForest reshape2 rlist rmarkdown stringr sva XML]; }; - LACE = derive2 { name="LACE"; version="2.0.0"; sha256="0msm6hw4jkhgi4idz8xd8xjnywhz9sp5bh9xkwamc7854nfq5bqw"; depends=[biomaRt bsplus callr configr curl data_table data_tree doParallel dplyr DT foreach fs htmltools htmlwidgets igraph jsonlite Matrix purrr RColorBrewer readr Rfast shiny shinyBS shinydashboard shinyFiles shinyjs shinythemes sortable stringi stringr SummarizedExperiment tidyr]; }; - LBE = derive2 { name="LBE"; version="1.64.0"; sha256="1zlz3z9pin4aikdqwzs8p1y4mmkmjaj28hghv55lp2ygfy3z63y5"; depends=[]; }; - LEA = derive2 { name="LEA"; version="3.8.0"; sha256="0x5pwlk24f3mksd1wzgb09majsln4v10j54np1jlvydgcrd5pzf0"; depends=[]; }; - LOBSTAHS = derive2 { name="LOBSTAHS"; version="1.22.0"; sha256="0scjl3g6bw3mh3ba7p4wa88vpa91msb6sridx0dn7v1vyi4c46q9"; depends=[CAMERA xcms]; }; - LOLA = derive2 { name="LOLA"; version="1.26.0"; sha256="142xwvx7bz5c8qg2kyi336bhrvvvmz8p5jjccciay59ywrwj6glq"; depends=[BiocGenerics data_table GenomicRanges IRanges reshape2 S4Vectors]; }; - LPE = derive2 { name="LPE"; version="1.70.0"; sha256="03h2ipcj8zndj5rz1b9cwrdlxkxy0n7jalxmd75bwv3fyw82zdyq"; depends=[]; }; - LPEadj = derive2 { name="LPEadj"; version="1.56.0"; sha256="0w33bk7f0cbs8s7ay0q5h7khkxrg3i3h6cbpdz80r7p175rzn430"; depends=[LPE]; }; - LRBaseDbi = derive2 { name="LRBaseDbi"; version="2.6.0"; sha256="03h7dp2s2salrydvdwf323bhipfalhz8y59da44cjqbccmvq6l7r"; depends=[AnnotationDbi Biobase DBI RSQLite]; }; - LRcell = derive2 { name="LRcell"; version="1.4.0"; sha256="0yl32x1rx195csgv2sr3skw1089l5sb1k2da4x4shjjyljcvbj3y"; depends=[AnnotationHub BiocParallel dplyr ExperimentHub ggplot2 ggrepel magrittr]; }; - LedPred = derive2 { name="LedPred"; version="1.30.0"; sha256="17yqi84qmcwyg01swqzilinrjnlk8fq5x673nvz0l9cjbkq8nya3"; depends=[akima e1071 ggplot2 irr jsonlite plot3D plyr RCurl ROCR testthat]; }; - LinTInd = derive2 { name="LinTInd"; version="1.0.0"; sha256="1bj2j8hgs8rdk304i1i16xf6qwglyhxpcbw63zsmhqp4d1yw490g"; depends=[ape BiocGenerics Biostrings cowplot data_tree dplyr ggnewscale ggplot2 ggtree IRanges networkD3 pheatmap purrr reshape2 rlist S4Vectors stringdist stringr]; }; - LineagePulse = derive2 { name="LineagePulse"; version="1.16.0"; sha256="0h5s52iyfqnv6wrwb13qzv18dr2nrvxp359vxs8yrvynwl2ffhz5"; depends=[BiocParallel circlize ComplexHeatmap ggplot2 gplots knitr Matrix RColorBrewer SingleCellExperiment SummarizedExperiment]; }; - LinkHD = derive2 { name="LinkHD"; version="1.10.0"; sha256="0f2qqvas1nvj5j22ihclxiv4sb0k7jyyygcn4bfrxv3pd29nhq47"; depends=[cluster data_table emmeans ggplot2 ggpubr gridExtra MultiAssayExperiment reshape2 rio scales vegan]; }; - Linnorm = derive2 { name="Linnorm"; version="2.20.0"; sha256="1002lllgns5klv3q2wsikkbypa2bafpka7a8mri0y5bfxncfr2zb"; depends=[amap apcluster ellipse fastcluster fpc ggdendro ggplot2 gmodels igraph limma MASS mclust Rcpp RcppArmadillo Rtsne statmod vegan zoo]; }; - LiquidAssociation = derive2 { name="LiquidAssociation"; version="1.50.0"; sha256="123qlv58y4vhsjnqgxs0w8zylnvib0hjb3jlg5cl74xzdb2gfl0f"; depends=[Biobase geepack org_Sc_sgd_db yeastCC]; }; - LoomExperiment = derive2 { name="LoomExperiment"; version="1.14.0"; sha256="1rnnvnbpxlvy85fdyz9zxsn4r6j4x8fydblz00jjl3mk9943538j"; depends=[BiocIO DelayedArray GenomicRanges HDF5Array Matrix rhdf5 S4Vectors SingleCellExperiment stringr SummarizedExperiment]; }; - LowMACA = derive2 { name="LowMACA"; version="1.26.2"; sha256="0inx7lgywi6687i5kdifmfx8b4q3gbbiz9vn0mlfp8kwhjirb551"; depends=[BiocParallel Biostrings cBioPortalData data_table gridBase httr LowMACAAnnotation motifStack plyr RColorBrewer reshape2 stringr]; }; - LymphoSeq = derive2 { name="LymphoSeq"; version="1.24.0"; sha256="12habp9qw5pi6ylfwraqayxfhmrxx2334gcj0k3c8awgxnb20hc1"; depends=[Biostrings circlize data_table dplyr ggplot2 ggtree ineq LymphoSeqDB msa phangorn plyr RColorBrewer reshape stringdist UpSetR VennDiagram]; }; - M3C = derive2 { name="M3C"; version="1.18.0"; sha256="120gd7gkgc98d1l6hl2ij799b3jksdnga5iyb44ps9mbc79hl012"; depends=[cluster corpcor doParallel doSNOW foreach ggplot2 Matrix matrixcalc Rtsne umap]; }; - M3Drop = derive2 { name="M3Drop"; version="1.22.0"; sha256="0h8qj7hwkm007717yv2j6bx5ri0zi71yd2bdl45rh68j30qv62ab"; depends=[bbmle gplots Hmisc irlba Matrix matrixStats numDeriv RColorBrewer reldist statmod]; }; - MACPET = derive2 { name="MACPET"; version="1.15.1"; sha256="0742i3fxg2793lhgpxb4whh6mwvzd4bn86ykd0rv8sgilxyq5zsl"; depends=[BH bigmemory BiocParallel Biostrings futile_logger GenomeInfoDb GenomicAlignments GenomicRanges GEOquery gtools InteractionSet intervals IRanges knitr plyr Rbowtie Rcpp Rsamtools rtracklayer S4Vectors ShortRead]; }; - MACSQuantifyR = derive2 { name="MACSQuantifyR"; version="1.10.0"; sha256="060ja4q3nh8vl2gmdhdi028kqbk108mgmzmlvi68v3ndlhn535fq"; depends=[ggplot2 ggrepel gridExtra lattice latticeExtra png prettydoc readxl rmarkdown rvest xml2]; }; - MACSr = derive2 { name="MACSr"; version="1.4.0"; sha256="1m35zsd20cfj715hxdn0sglr3k6yc18danhi422wx9mqnrig9grh"; depends=[AnnotationHub basilisk ExperimentHub reticulate S4Vectors]; }; - MADSEQ = derive2 { name="MADSEQ"; version="1.22.0"; sha256="0wv6c1hmpsmzlxbx4vxvb7259ywy15knwkw3k6cdn15sxfkyviaf"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 coda GenomeInfoDb GenomicAlignments GenomicRanges IRanges preprocessCore rjags Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation vcfR VGAM zlibbioc]; }; - MAGAR = derive2 { name="MAGAR"; version="1.4.0"; sha256="1kgbs5ym43sdgqg1424s7pgz0jchqn19i73srsrl4icbizdig9c7"; depends=[argparse bigstatsr crlmm data_table doParallel ff HDF5Array igraph impute jsonlite plyr reshape2 rjson RnBeads RnBeads_hg19 snpStats UpSetR]; }; - MAGeCKFlute = derive2 { name="MAGeCKFlute"; version="2.0.0"; sha256="0vcf7p585mw6avvs7rh2ffdhw2j5v9fcppdcp3a8lc99gxz2302m"; depends=[Biobase clusterProfiler depmap DOSE enrichplot ggplot2 ggrepel gridExtra msigdbr pathview reshape2]; }; - MAI = derive2 { name="MAI"; version="1.2.0"; sha256="1p2rimkrpg3r0pdd37wcr21lsbysmpvs318r477s0amvnbcqi9ni"; depends=[caret doParallel e1071 foreach future future_apply missForest pcaMethods S4Vectors SummarizedExperiment tidyverse]; }; - MAIT = derive2 { name="MAIT"; version="1.30.0"; sha256="0bhvhnxkhwjs0ilfa4y9a4wpiqg77hfpydfdx7v95fhgnwwcayii"; depends=[agricolae CAMERA caret class e1071 gplots MASS pls plsgenomics Rcpp xcms]; }; - MANOR = derive2 { name="MANOR"; version="1.68.0"; sha256="1z0222fb2xkyi0wylcvlpzz8gdlh1174jxyv5ihz0wxxa2w07kdf"; depends=[GLAD]; }; - MAST = derive2 { name="MAST"; version="1.22.0"; sha256="1kmrqxcfzzcs8l33n9qn0vahc6wxq6ks3cjx95vg96maf2qzhzzi"; depends=[abind Biobase BiocGenerics data_table ggplot2 plyr progress reshape2 S4Vectors SingleCellExperiment stringr SummarizedExperiment]; }; - MBASED = derive2 { name="MBASED"; version="1.30.0"; sha256="1hg8jg898zr0ighg64jzkb513vbjr1a76mc203pgh6h3gmdn56px"; depends=[BiocGenerics BiocParallel GenomicRanges RUnit SummarizedExperiment]; }; - MBAmethyl = derive2 { name="MBAmethyl"; version="1.30.0"; sha256="0kz8brk08d32b1iqp6lrwksfpwwiqbmdgni54pwy36n0n7biir9k"; depends=[]; }; - MBCB = derive2 { name="MBCB"; version="1.50.0"; sha256="1qslgqivsg8hjvyyw59d192jramla88lnx22zixm8jnjs7r4w4fi"; depends=[preprocessCore tcltk2]; }; - MBECS = derive2 { name="MBECS"; version="1.0.0"; sha256="0z9mhqg6f6gylw5q6hi0ll4nv0b5crzwp217i1n05psg8dg7wzi3"; depends=[cluster dplyr ggplot2 gridExtra limma lme4 lmerTest magrittr Matrix pheatmap phyloseq rmarkdown ruv sva tibble tidyr vegan]; }; - MBQN = derive2 { name="MBQN"; version="2.8.0"; sha256="0dml5ysapdmcf6qlv33v69007zj9bgz0gqdj4ywfwcsmjyvscdp6"; depends=[BiocFileCache ggplot2 limma PairedData preprocessCore rappdirs RCurl rmarkdown SummarizedExperiment xml2]; }; - MBttest = derive2 { name="MBttest"; version="1.24.0"; sha256="0ydlbn2rh7b83l6fg2qrcr6a2vx2h29mv2ifi59dnybczwx8krx1"; depends=[gplots gtools]; }; - MCbiclust = derive2 { name="MCbiclust"; version="1.20.0"; sha256="12j1ghn3gccm6nsjp1faki2ncbxhpirp8bchm42mmqava5j7rgym"; depends=[AnnotationDbi BiocParallel cluster GGally ggplot2 GO_db org_Hs_eg_db scales WGCNA]; }; - MDTS = derive2 { name="MDTS"; version="1.16.0"; sha256="0hsbw98i88pls8744nj6z6lar4m649jdjgqrh6k692zmh5d8n52a"; depends=[Biostrings DNAcopy GenomicAlignments GenomicRanges IRanges Rsamtools stringr]; }; - MEAL = derive2 { name="MEAL"; version="1.26.0"; sha256="1d1daf2xj3bwvcgwd2dbf27vmw6n5rk1kk4crc61v0dra8j9dsqf"; depends=[Biobase BiocGenerics GenomicRanges ggplot2 Gviz IRanges isva limma matrixStats minfi missMethyl MultiDataSet permute S4Vectors SmartSVA SummarizedExperiment vegan]; }; - MEAT = derive2 { name="MEAT"; version="1.8.0"; sha256="0s0mbfl1p6w3xpv27wjy6i8gddkr8prc6fhglfmklci791gxmjja"; depends=[dplyr dynamicTreeCut glmnet impute minfi RPMM stringr SummarizedExperiment tibble wateRmelon]; }; - MEB = derive2 { name="MEB"; version="1.10.0"; sha256="02zp4zk2986xajp91rak4pg8vwxp1f78wv3qwjmc8pig5m65a22j"; depends=[e1071 SummarizedExperiment]; }; - MEDIPS = derive2 { name="MEDIPS"; version="1.48.0"; sha256="1qxg2a7jqhnbn7zvlvn4i4kjg010ab34afds2sgcsvl4qpqcj9d0"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; }; - MEDME = derive2 { name="MEDME"; version="1.56.0"; sha256="0jfqr2bc8v45j38nmk9k03p02imvmrhfbd7b2gj9zcnbj4j3z6rz"; depends=[Biostrings drc MASS]; }; - MEIGOR = derive2 { name="MEIGOR"; version="1.30.0"; sha256="1qfb969jjm6xyrnq1l108mhjrgzm886aiakiacagsbivjcq7ianf"; depends=[CNORode deSolve Rsolnp snowfall]; }; - MGFM = derive2 { name="MGFM"; version="1.30.0"; sha256="0f0flpv2i6531k4vdkwljpzzljpdsyj32arf56q362vq0zpaf0k9"; depends=[annotate AnnotationDbi]; }; - MGFR = derive2 { name="MGFR"; version="1.22.0"; sha256="1v9aljss454kjqzrwzgfirqfpi59f36l9jgmfd8zwkljwgi8i6fn"; depends=[annotate biomaRt]; }; - MIGSA = derive2 { name="MIGSA"; version="1.20.0"; sha256="0ijf33z9xgqb67zhym0zn7jjfyh8kr7bvhm341b517r5igb311fb"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel data_table edgeR futile_logger ggdendro ggplot2 GO_db GOstats graph GSEABase ismev jsonlite limma matrixStats org_Hs_eg_db RBGL reshape2 Rgraphviz vegan]; }; - MIMOSA = derive2 { name="MIMOSA"; version="1.34.0"; sha256="0j2bf365ycs5z7vprm247g22cjfsq9g9z7x4h5g90nvkzz7cbx4r"; depends=[Biobase coda data_table dplyr Formula ggplot2 MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape rlang scales testthat tidyr]; }; - MIRA = derive2 { name="MIRA"; version="1.18.0"; sha256="17wxks9hbyy8hxmv0sfnd3wn1zfq33yy1p3lvbzsgzh1r2sgc2x1"; depends=[Biobase BiocGenerics bsseq data_table GenomicRanges ggplot2 IRanges S4Vectors]; }; - MLInterfaces = derive2 { name="MLInterfaces"; version="1.76.0"; sha256="179d19kxjipfkc40z15337x1vzqd7vz3gbmr2lw5w7x9l857ngs5"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter magrittr MASS mlbench pls RColorBrewer Rcpp rpart sfsmisc shiny threejs]; }; - MLP = derive2 { name="MLP"; version="1.44.0"; sha256="169ck10y0md887x0agigbrzsdncd50sxxwrm17iz6qais9adikqa"; depends=[AnnotationDbi gplots]; }; - MLSeq = derive2 { name="MLSeq"; version="2.14.0"; sha256="0ajkxa6wm215df6i8y7z9ha68m25p5kg5hzk2ni4v07w6mn3cikj"; depends=[Biobase caret DESeq2 edgeR foreach ggplot2 limma pamr plyr sSeq SummarizedExperiment testthat VennDiagram xtable]; }; - MMAPPR2 = derive2 { name="MMAPPR2"; version="1.10.0"; sha256="1w8ajra7ip9yfmzinvdgxcm1n808saj0shfx0irflmz54a829kfr"; 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.24.0"; sha256="031d3j2d6rqj5adaflbhq1q40h1573mg44vxk07hg3ky6w55mv82"; depends=[Biobase Biostrings BSgenome GenomicRanges ggplot2 locfit RColorBrewer Rsamtools S4Vectors shiny]; }; - MMUPHin = derive2 { name="MMUPHin"; version="1.10.3"; sha256="0kg4zwwwbxzzl4cddbcn2ww93z5z17n6d2imw2gfr8jcpzxysd3n"; depends=[cowplot dplyr fpc ggplot2 igraph Maaslin2 metafor stringr tidyr]; }; - MODA = derive2 { name="MODA"; version="1.22.0"; sha256="1aa5g2zy251q3rpy83c4siyvdnrzw5cb3a136qrxd69z6pfpnkx3"; depends=[AMOUNTAIN cluster dynamicTreeCut igraph RColorBrewer WGCNA]; }; - MOFA2 = derive2 { name="MOFA2"; version="1.6.0"; sha256="1cdx2zgmicn5qa59x794mjcnz9csgmsscl21qd9yhwc5n9fj0zqw"; 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.6.0"; sha256="1wgpr6ci1hmzl1racszxfvgk95q5x4ca21rxhimimgag1gkk472b"; depends=[BiocParallel igraph RCy3 RUnit stringr]; }; - MOMA = derive2 { name="MOMA"; version="1.8.0"; sha256="1fkmjaja97lnicxd6inwas5hfvpl0nz3my1cryidkc2ycsmslk8s"; depends=[circlize cluster ComplexHeatmap dplyr ggplot2 magrittr MKmisc MultiAssayExperiment qvalue RColorBrewer readr reshape2 rlang stringr tibble tidyr]; }; - MOSim = derive2 { name="MOSim"; version="1.10.0"; sha256="0vvigfn830z4cqgywglk6fd8vxakf68l9k076l5a7c52zq5l2vsl"; depends=[Biobase dplyr ggplot2 HiddenMarkov IRanges lazyeval matrixStats purrr rlang S4Vectors scales stringi stringr tibble tidyr zoo]; }; - MPFE = derive2 { name="MPFE"; version="1.32.0"; sha256="10s0lyga44c1xnpv269sifhir1r208gf5p5ww41y6wp42rnr9shl"; depends=[]; }; - MPRAnalyze = derive2 { name="MPRAnalyze"; version="1.14.0"; sha256="0pxp5k38fqxx8ncr8v1qv4mnckjyypq8s49h2vb64x7hrdiygvbx"; depends=[BiocParallel progress SummarizedExperiment]; }; - MQmetrics = derive2 { name="MQmetrics"; version="1.4.0"; sha256="0fyh9pqrfjav3ygvjvg90jv3vw81ngsxpgmkdwvdwpzrmqn2ngp9"; depends=[cowplot dplyr ggforce gghalves ggplot2 ggpubr ggrepel gridExtra gtable knitr magrittr plyr purrr RColorBrewer readr reshape2 rlang rmarkdown scales stringr tidyr]; }; - MSA2dist = derive2 { name="MSA2dist"; version="1.0.0"; sha256="075zq2rdxdjs7a777nxwqm0jm7g6qfvnijfrdrk3pckqg34z83bn"; depends=[ape Biostrings doParallel dplyr foreach GenomicRanges IRanges Rcpp RcppThread rlang seqinr stringi stringr tibble tidyr]; }; - MSPrep = derive2 { name="MSPrep"; version="1.6.0"; sha256="1g0kd405iypvl0vkc190a1mm4gf17pdvk32ij3m23d03pz6qsdpg"; depends=[crmn dplyr magrittr missForest pcaMethods preprocessCore rlang S4Vectors stringr SummarizedExperiment sva tibble tidyr VIM]; }; - MSnID = derive2 { name="MSnID"; version="1.30.0"; sha256="1yiw95p40nz0pvq7s4i0xg02r9yqmnknak00z4lkw8jij3w3rkkq"; 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.22.0"; sha256="1xzn0k3c2wn6c6gv90hddy3c201sg927342zrw9ig2xap0r053x3"; 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.4.1"; sha256="0n03spd9a57wqsl3hmz5flsh8ijzgykg2iv7f05n0a7iwrq75ms4"; depends=[checkmate data_table ggplot2 ggrepel gplots limma lme4 marray MASS MSstatsConvert preprocessCore Rcpp RcppArmadillo survival]; }; - MSstatsConvert = derive2 { name="MSstatsConvert"; version="1.6.0"; sha256="01rh07a5ibk3fn7dvmmj4665xki03jvlybv40sa0fzf25z07nsfg"; depends=[checkmate data_table log4r stringi]; }; - MSstatsLOBD = derive2 { name="MSstatsLOBD"; version="1.4.0"; sha256="177fz522fx2bph66gm945jrg5wvr7cz98n0wbn7ndym85v6dql32"; depends=[ggplot2 minpack_lm Rcpp]; }; - MSstatsLiP = derive2 { name="MSstatsLiP"; version="1.2.1"; sha256="1yx686wk5ykl31qq3fxcsvh8bw5hrv3yiqrkc1jngxjph1xzx2bg"; 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.6.0"; sha256="1zpgisvnnqnp9x1ylzfkhdw2z3d9vfgig560xjl5vwmj3vhix7i3"; depends=[Biostrings checkmate data_table dplyr ggplot2 ggrepel gridExtra MSstats MSstatsConvert MSstatsTMT Rcpp stringr]; }; - MSstatsQC = derive2 { name="MSstatsQC"; version="2.14.0"; sha256="0bgkwgcghdmccza7f4fkza3drjarl3b3prbzq7kf88k7k7zvknzr"; depends=[dplyr ggExtra ggplot2 MSnbase plotly qcmetrics]; }; - MSstatsQCgui = derive2 { name="MSstatsQCgui"; version="1.16.0"; sha256="0nrhqznkg61vmv9g3zly0p26dvkbcf4lqx48yj9k8rbrfkg06bdk"; depends=[dplyr ggExtra gridExtra MSstatsQC plotly shiny]; }; - MSstatsSampleSize = derive2 { name="MSstatsSampleSize"; version="1.10.0"; sha256="09cclwrf2s0ld3cvvs0drkfk8xgq6la9cc9mqn4kjw355zqwb7lp"; depends=[BiocParallel caret ggplot2 gridExtra MSstats reshape2]; }; - MSstatsTMT = derive2 { name="MSstatsTMT"; version="2.4.1"; sha256="1g3vljkfddq95m31r53vcjnk785ikw8ml1clmfii10s66y852c4j"; depends=[checkmate data_table ggplot2 limma lme4 lmerTest MSstats MSstatsConvert]; }; - MVCClass = derive2 { name="MVCClass"; version="1.70.0"; sha256="0apcjlq4i2mg8mlfqgvlcsqkiy51whzid3nd0m830jff0ywgh47g"; depends=[]; }; - MWASTools = derive2 { name="MWASTools"; version="1.20.0"; sha256="17j82k7nrw8lsvvzlzaq6134gckkrxgff3yi8s4jwlzi1grzgjc7"; depends=[boot car ComplexHeatmap ggplot2 glm2 gridExtra igraph KEGGgraph KEGGREST ppcor qvalue RCurl SummarizedExperiment]; }; - Maaslin2 = derive2 { name="Maaslin2"; version="1.10.0"; sha256="1qw2vmxg5z8lirj2pknfsybn9vhrifqh3j7p2xyhnjsbsfw5ix70"; 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]; }; - Macarron = derive2 { name="Macarron"; version="1.0.0"; sha256="03mkvs3wwhs3xbyqm62db6x3r8djw57bkmrv1sxvz437khn12szp"; depends=[BiocParallel data_table DelayedArray dynamicTreeCut ff logging Maaslin2 plyr psych RCurl RJSONIO SummarizedExperiment WGCNA xml2]; }; - MantelCorr = derive2 { name="MantelCorr"; version="1.66.0"; sha256="1gkf6i63933ip5w41ba146d9sa3zxrq212cvk5pbma7mcflb4hdc"; depends=[]; }; - MassArray = derive2 { name="MassArray"; version="1.48.0"; sha256="1pa4mavjbd015cjmjy5kzzzkv60268a5yifzxhrdskjjigg6jd0k"; depends=[]; }; - MassSpecWavelet = derive2 { name="MassSpecWavelet"; version="1.62.0"; sha256="0g9izdy3f7h1zmsfbq45ahdz0ak5013rp3vxc4ijb1mpqx8ldd39"; depends=[]; }; - MatrixGenerics = derive2 { name="MatrixGenerics"; version="1.8.1"; sha256="1liblnpziyyjxzrhdd5d89ilvfqqhbl87h3hsmdm0kwnmc73r37f"; depends=[matrixStats]; }; - MatrixQCvis = derive2 { name="MatrixQCvis"; version="1.4.0"; sha256="11d8w1w2vy4wwvyd7wxg65j0jlfwk19ys5q1cfwmizlr048mhnv5"; 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.28.0"; sha256="1x35yjmgrnp327na3wnj7m42v71kgjhja3c80535042vgj6rilqp"; depends=[Biostrings IRanges S4Vectors TFBSTools XVector]; }; - MeSHDbi = derive2 { name="MeSHDbi"; version="1.32.0"; sha256="07mcs3hj8z8bij09l58805rjff54d5599b12gxli56v2b5lk2ksw"; depends=[AnnotationDbi Biobase RSQLite]; }; - MeasurementError_cor = derive2 { name="MeasurementError.cor"; version="1.68.0"; sha256="165chxcqbklamrrx6c2dmvxf4gj0mbmxy4wa3yxkn8kx9rxazn3f"; depends=[]; }; - Melissa = derive2 { name="Melissa"; version="1.12.0"; sha256="1acf89vy246gzs3xpnl1khc0jp8i7gh503r6f64a5452jpmwmbbh"; depends=[assertthat BiocStyle BPRMeth cowplot data_table doParallel foreach GenomicRanges ggplot2 magrittr matrixcalc mclust MCMCpack mvtnorm ROCR truncnorm]; }; - Mergeomics = derive2 { name="Mergeomics"; version="1.24.0"; sha256="1r2bx5w3xxamdzgnijffqn6rfw69320hk0glrsm9abssnfh1aygc"; depends=[]; }; - MesKit = derive2 { name="MesKit"; version="1.6.0"; sha256="1484x2sbbliiyjfmdx0kl11h24rgjd5xyzl34d3d2q56dgpf8plr"; 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.26.0"; sha256="09skarxg69c3h0cgabm5rib10w6bkhxb8bjwdr6vsq1snzrw2p0n"; depends=[amap circlize ggplot2 MSnbase S4Vectors scales shiny]; }; - MetID = derive2 { name="MetID"; version="1.14.0"; sha256="02i4n39zar5ybzz0l051ik835q4yf4cps7hsv2yyna3misp22gpa"; depends=[ChemmineR devtools igraph Matrix stringr]; }; - MetNet = derive2 { name="MetNet"; version="1.14.0"; sha256="01vm4km6xs55nkw7gbvf73c55x0izi4kfc58ppcd5bjgsmwvzw0k"; depends=[BiocParallel bnlearn dplyr GeneNet GENIE3 ggplot2 parmigene psych rlang S4Vectors stabs SummarizedExperiment tibble tidyr]; }; - MetaCyto = derive2 { name="MetaCyto"; version="1.18.0"; sha256="0l5q6hiz9hjjpd8y255v34487yv7ianfq8rd7py76686l9l82rya"; depends=[cluster fastcluster flowCore FlowSOM ggplot2 metafor tidyr]; }; - MetaNeighbor = derive2 { name="MetaNeighbor"; version="1.16.0"; sha256="1fjggizwmm2db4plqqcfk49rvsm6jy116lb2sbyzvhs3bmp8nrx7"; depends=[beanplot dplyr ggplot2 gplots igraph Matrix matrixStats RColorBrewer SingleCellExperiment SummarizedExperiment tibble tidyr]; }; - MetaVolcanoR = derive2 { name="MetaVolcanoR"; version="1.10.0"; sha256="0mdjl3vvf4ymc7rg9r08dgq0n0n7wc4lgz6ayjhp049ar0ry8yhr"; depends=[cowplot data_table dplyr ggplot2 htmlwidgets metafor metap plotly rlang tidyr topconfects]; }; - Metab = derive2 { name="Metab"; version="1.30.0"; sha256="1hy9h8q61did3j3md72gdjsnxv6x7vgkqidaffn8c66xcbc98pw5"; depends=[pander svDialogs xcms]; }; - MetaboAnnotation = derive2 { name="MetaboAnnotation"; version="1.0.0"; sha256="08xdp7s5c4xb9qhg91mgyb07d21l327bjyqzvrnwbn8ynkqyv3wh"; depends=[BiocGenerics BiocParallel MetaboCoreUtils MsCoreUtils ProtGenerics QFeatures S4Vectors Spectra SummarizedExperiment]; }; - MetaboCoreUtils = derive2 { name="MetaboCoreUtils"; version="1.4.0"; sha256="0lvc8hzn0czzrz01hwkkhrsshq5k5nikc5irn6hbi3sv93r2bzka"; depends=[MsCoreUtils]; }; - MetaboSignal = derive2 { name="MetaboSignal"; version="1.26.2"; sha256="1cvzm0dgk09angkdmp27f0nfh0glz8zlljz2zg4gs2ng15virp4n"; depends=[AnnotationDbi biomaRt EnsDb_Hsapiens_v75 hpar igraph KEGGgraph KEGGREST MWASTools mygene org_Hs_eg_db RCurl]; }; - MethPed = derive2 { name="MethPed"; version="1.24.0"; sha256="145pm17h164qqj4vhdrgrqqj5j1axls0841c6ikz5yp0l13065ij"; depends=[Biobase randomForest]; }; - MethReg = derive2 { name="MethReg"; version="1.6.0"; sha256="1133ndj4q6ddmq6rjjljj8f01zrh5rn09pgj6g0yp4yfpymbkj04"; depends=[AnnotationHub DelayedArray dplyr ExperimentHub GenomicRanges ggplot2 ggpubr IRanges MASS Matrix plyr progress pscl readr rlang S4Vectors sesame sesameData sfsmisc stringr SummarizedExperiment tibble tidyr]; }; - MethTargetedNGS = derive2 { name="MethTargetedNGS"; version="1.28.0"; sha256="06cvyic6y1g6j397j9xvsqhjhwlarldxqfg28i00ym6l6hzcad4l"; depends=[Biostrings gplots seqinr stringr]; }; - MethylAid = derive2 { name="MethylAid"; version="1.30.0"; sha256="02m1f64734akq7fjklxlckxh0jvw6qvkwkcy86fnn4kp06z28vcq"; depends=[Biobase BiocGenerics BiocParallel ggplot2 gridBase hexbin matrixStats minfi RColorBrewer shiny SummarizedExperiment]; }; - MethylMix = derive2 { name="MethylMix"; version="2.26.0"; sha256="1fdsia49km7rha9m05zn37arjdxhvji4hb5zf6s1fapfy9nvlfyy"; depends=[data_table digest foreach ggplot2 impute limma R_matlab RColorBrewer RCurl RPMM]; }; - MethylSeekR = derive2 { name="MethylSeekR"; version="1.36.0"; sha256="141ms4dy49pvfkvhrkvpffx3wcn68zz2c99cxajhymv7346qi9sz"; depends=[BSgenome geneplotter GenomicRanges IRanges mhsmm rtracklayer]; }; - Mfuzz = derive2 { name="Mfuzz"; version="2.56.0"; sha256="0rz5gpw3p2qcghi1gd3sdxcbwm0f2b4hqdr461wlz0r0dbnnwhh4"; depends=[Biobase e1071 tkWidgets]; }; - MiChip = derive2 { name="MiChip"; version="1.50.0"; sha256="10z06f0i41yckxvs32hnd6k1q5l4fvdvr27rgjrkk817k14shn59"; depends=[Biobase]; }; - MiPP = derive2 { name="MiPP"; version="1.68.0"; sha256="080cc1y32yi046xsj05vppp1l3c2sdyjclw8p439kmakcrf0sigf"; depends=[Biobase e1071 MASS]; }; - MiRaGE = derive2 { name="MiRaGE"; version="1.38.0"; sha256="0w4c41izigparfaddj5ffccxw7v33gc11zh0b1cdyz2hacmw03ly"; depends=[AnnotationDbi Biobase BiocGenerics BiocManager S4Vectors]; }; - MicrobiomeProfiler = derive2 { name="MicrobiomeProfiler"; version="1.2.0"; sha256="0czli81lqbx1xkhj5yqlixjgszk4whvckhjpw9k70ggcx9svc249"; depends=[clusterProfiler config DT enrichplot ggplot2 golem htmltools magrittr shiny shinycustomloader shinyWidgets]; }; - MicrobiotaProcess = derive2 { name="MicrobiotaProcess"; version="1.8.2"; sha256="1v7drwwn1qflrxi25nllk84xr7v24qypdnq7pz7nkxganfdnw7xh"; depends=[ape Biostrings coin dplyr dtplyr foreach ggplot2 ggrepel ggsignif ggstar ggtree ggtreeExtra magrittr MASS patchwork pillar plyr rlang SummarizedExperiment tibble tidyr tidyselect tidytree treeio vegan zoo]; }; - MineICA = derive2 { name="MineICA"; version="1.36.1"; sha256="0552rxj4blisxyzrjm59qxmqnrfg9x1kygr6d2knhnzyasprwl5p"; 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.40.0"; sha256="0409nqlhjnx0l8zcy71zrawjbml1rmjkgch9a87zcc1j2phnpdch"; depends=[Biobase BiocGenerics data_table DNAcopy ff foreach GenomeInfoDb GenomicRanges IRanges lattice MatrixGenerics matrixStats oligoClasses S4Vectors SummarizedExperiment VanillaICE]; }; - MobilityTransformR = derive2 { name="MobilityTransformR"; version="1.0.0"; sha256="0x3xxh54sdlb6dan9rrrg116vfr1q4b0z9fdjaqh52qbwchy1x82"; depends=[MetaboCoreUtils MSnbase Spectra xcms]; }; - ModCon = derive2 { name="ModCon"; version="1.4.0"; sha256="1av9ragz32ss6y0hh36hc8zldg5qmgz4kxjkgi649v2l2fb5yn8h"; depends=[data_table]; }; - Modstrings = derive2 { name="Modstrings"; version="1.12.1"; sha256="1854yzhr3k4x72d5ix5c14m6b3hhxlg2pvmyifvqx3j65rbinq37"; depends=[BiocGenerics Biostrings crayon GenomicRanges IRanges S4Vectors stringi stringr XVector]; }; - MoonlightR = derive2 { name="MoonlightR"; version="1.22.0"; sha256="1yigaiychilz0v847vvqwxdgn5gcfxih1nxf7586g0w9g147srd9"; depends=[Biobase circlize clusterProfiler doParallel DOSE foreach GEOquery gplots HiveR limma parmigene randomForest RColorBrewer RISmed SummarizedExperiment TCGAbiolinks]; }; - Motif2Site = derive2 { name="Motif2Site"; version="1.0.0"; sha256="1lrzl082gb2l2y5skmra9kl2rns19xdbxaw5cki3n7831s476kq2"; depends=[BiocGenerics Biostrings BSgenome edgeR GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS mixtools S4Vectors]; }; - MotifDb = derive2 { name="MotifDb"; version="1.38.0"; sha256="1cyfz0l0yvdii3idaiq5w39yzxlzfpifa4v5pv7hdjfjj83a8rbi"; depends=[BiocGenerics Biostrings GenomicRanges IRanges rtracklayer S4Vectors splitstackshape]; }; - MouseFM = derive2 { name="MouseFM"; version="1.6.0"; sha256="1z5qlkcgjrj2hhjqh5zirp940brsc92c9ss28f4fq35j2x4zhmx5"; depends=[biomaRt curl data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gtools httr IRanges jsonlite reshape2 rlist scales tidyr]; }; - MsBackendMassbank = derive2 { name="MsBackendMassbank"; version="1.4.0"; sha256="1jabh2xr27c12628bfsn6jywbygmisaggvkvazaf8qx14xdi5d7c"; depends=[BiocParallel DBI IRanges MsCoreUtils ProtGenerics S4Vectors Spectra]; }; - MsBackendMgf = derive2 { name="MsBackendMgf"; version="1.4.0"; sha256="1m06akw50rrpj5h3r78a5c4cbq52j8ni5kkk1fw7221z8j65sy8c"; depends=[BiocParallel IRanges MsCoreUtils S4Vectors Spectra]; }; - MsBackendMsp = derive2 { name="MsBackendMsp"; version="1.0.0"; sha256="0p6df64w9d79i7xzwg19pqwn074slfp2izh7hiflncdxffp412i1"; depends=[BiocParallel IRanges MsCoreUtils S4Vectors Spectra]; }; - MsBackendRawFileReader = derive2 { name="MsBackendRawFileReader"; version="1.2.0"; sha256="1zlgdj7ycf3is9wv5w0fbrzf4w7fh3k21id1s6gwr5zdws9zbhs6"; depends=[BiocParallel IRanges MsCoreUtils rawrr S4Vectors Spectra]; }; - MsCoreUtils = derive2 { name="MsCoreUtils"; version="1.8.0"; sha256="077x1zcy27x8akmagjn75j97082cgnahrbfw0qx08q455m5x3xzh"; depends=[clue MASS Rcpp S4Vectors]; }; - MsFeatures = derive2 { name="MsFeatures"; version="1.4.0"; sha256="111iqcq4q315pb4j8z427shin9b00p179m2s9h6dd7imvbd68yq3"; depends=[MsCoreUtils ProtGenerics SummarizedExperiment]; }; - MuData = derive2 { name="MuData"; version="1.0.0"; sha256="11plrz8mfaj1nrw6igxxk6hmrhnxyfs7cw3bmj3f1fg6sa9nr76j"; depends=[DelayedArray Matrix MultiAssayExperiment rhdf5 S4Vectors SingleCellExperiment SummarizedExperiment]; }; - Mulcom = derive2 { name="Mulcom"; version="1.46.0"; sha256="1fs3wl9x7ww6q15ichi3jxfjvafsa2vdghds948vwwn9jpv79bhc"; depends=[Biobase fields]; }; - MultiAssayExperiment = derive2 { name="MultiAssayExperiment"; version="1.22.0"; sha256="1wnp52l9vifxn1wzqgndzp9b6ih0s1cflxx1fhw32k32d05cw9q1"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors SummarizedExperiment tidyr]; }; - MultiBaC = derive2 { name="MultiBaC"; version="1.6.0"; sha256="028jc5kr84qi9m38g6xqf7cizif2qzg2j4ypvyav7syqb9n0927s"; depends=[ggplot2 Matrix MultiAssayExperiment pcaMethods plotrix ropls]; }; - MultiDataSet = derive2 { name="MultiDataSet"; version="1.24.0"; sha256="0rfs6jkzh1i4mj1pgfk4lwzmcl8pcwizra3q3282x3d8h2g98qnf"; depends=[Biobase BiocGenerics GenomicRanges ggplot2 ggrepel IRanges limma qqman S4Vectors SummarizedExperiment]; }; - MultiMed = derive2 { name="MultiMed"; version="2.18.0"; sha256="1cdkkspmwn67d685kgna8fr9w3mqrzg6qbv6vzr81knrwmhgxp1z"; depends=[]; }; - MungeSumstats = derive2 { name="MungeSumstats"; version="1.4.5"; sha256="14c8gx5pjppf7z0dcwdrg6cmbwg7k7k4782a13v47xiwhpxszxd2"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges googleAuthR httr IRanges jsonlite magrittr R_utils RCurl rtracklayer VariantAnnotation]; }; - MutationalPatterns = derive2 { name="MutationalPatterns"; version="3.6.0"; sha256="113b2hrc0n47qz144xhky93jcm6qh6flzadq5y0plga5jrz0rnwg"; 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.20.0"; sha256="0ynwf5ij694a46qa2fl4xvvxalh8a9mh6k0gxd3dfbi692lm6ihv"; 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.12.0"; sha256="0rgyhijlv7knnb5z2zswxdicyblrxrnyliw1hlppdwsjwjyd3ixj"; depends=[BiocParallel DESeq2 genefilter mgcv S4Vectors SummarizedExperiment]; }; - NBSplice = derive2 { name="NBSplice"; version="1.14.0"; sha256="1hkcjn1icc6rmg13gnkya6xsmxa71pggdc9fzg8i47bs4cw0y6fb"; depends=[BiocParallel car edgeR ggplot2 MASS reshape2]; }; - NCIgraph = derive2 { name="NCIgraph"; version="1.44.0"; sha256="15srh42yrax35kkxiansx9aabraifyh70dxv17fg0vkf9pdndxic"; depends=[graph KEGGgraph R_methodsS3 RBGL RCy3]; }; - NOISeq = derive2 { name="NOISeq"; version="2.40.0"; sha256="0ah6adlhv4254jkssinn2ik8n811hd1nw85bnzqk2kwhl49nrk27"; depends=[Biobase Matrix]; }; - NPARC = derive2 { name="NPARC"; version="1.8.0"; sha256="1c9zi2a3jki589brg09hzmlzqxzlnq2xwd1674v0vrc70d99ybs9"; depends=[BiocParallel broom dplyr magrittr MASS rlang tidyr]; }; - NTW = derive2 { name="NTW"; version="1.46.0"; sha256="1nqf9nm86lirwrzn6mipj9y7j9zi2jl4675y66k92pvdh0cvcyxx"; depends=[mvtnorm]; }; - NanoMethViz = derive2 { name="NanoMethViz"; version="2.2.0"; sha256="0qxk3zhpd5axyzh5sa1dvvls386dzjmas2xkf0gpkgjyq4c7p2l1"; depends=[AnnotationDbi assertthat BiocSingular bsseq cpp11 data_table dplyr e1071 forcats fs GenomicRanges ggplot2 glue limma patchwork purrr Rcpp readr rlang Rsamtools RSQLite S4Vectors scales scico stringr SummarizedExperiment tibble tidyr withr zlibbioc]; }; - NanoStringDiff = derive2 { name="NanoStringDiff"; version="1.26.0"; sha256="0kqhdcqaikvrnfnw24m0sk569674zv3rvq345ysnmgyhj7xw3vpv"; depends=[Biobase matrixStats Rcpp]; }; - NanoStringNCTools = derive2 { name="NanoStringNCTools"; version="1.4.0"; sha256="19ah6rlqahkrb02zm2hrbdkz4z7rdpgzg6rm77q5pras9q6r75c7"; depends=[Biobase BiocGenerics Biostrings ggbeeswarm ggiraph ggplot2 ggthemes IRanges pheatmap RColorBrewer S4Vectors]; }; - NanoStringQCPro = derive2 { name="NanoStringQCPro"; version="1.28.0"; sha256="1vjhxzi4d66kmsm22dwbzq9w5i7y7ldfh41krb2755q23f7pd4rs"; depends=[AnnotationDbi Biobase knitr NMF org_Hs_eg_db png RColorBrewer]; }; - NanoTube = derive2 { name="NanoTube"; version="1.2.0"; sha256="0f50xb155dwxkzvirqhz1l4iqbs8m6qp6klihjlww12yhv967b67"; depends=[Biobase fgsea ggplot2 limma reshape]; }; - Nebulosa = derive2 { name="Nebulosa"; version="1.6.0"; sha256="0i37bsvppfn2djivg7hnvpjxnw0h42cxa31590w18c0mjgy7a553"; depends=[ggplot2 ks Matrix patchwork Seurat SingleCellExperiment SummarizedExperiment]; }; - NeighborNet = derive2 { name="NeighborNet"; version="1.14.0"; sha256="0s0aqnd91jylkkcrwm00dmvfd25fyfzdb7n0y0kbnc8d5m8njqkq"; depends=[graph]; }; - NetPathMiner = derive2 { name="NetPathMiner"; version="1.32.0"; sha256="10rgiy57ifmvz0m7z35q0xighxj4wnb0gvak45s249wagishppji"; depends=[igraph]; }; - NetSAM = derive2 { name="NetSAM"; version="1.36.0"; sha256="1vc4qnjr1qwcws3z5a665y790f5nw4ipv6ld5lzr5vdq09sxd5gr"; depends=[AnnotationDbi biomaRt DBI doParallel foreach GO_db igraph R2HTML seriation survival WGCNA]; }; - NeuCA = derive2 { name="NeuCA"; version="1.2.0"; sha256="0x2q7la9b3nfwlca0vnrkgankwpsrch2jhglrjn7qvnmc1zlk99p"; depends=[e1071 keras limma SingleCellExperiment]; }; - NewWave = derive2 { name="NewWave"; version="1.6.0"; sha256="1k4zyvylkidnkkqgjcqk1w43sx93ss86h6bsa62h7qa9186wxivb"; depends=[BiocSingular DelayedArray irlba Matrix SharedObject SingleCellExperiment SummarizedExperiment]; }; - NoRCE = derive2 { name="NoRCE"; version="1.8.0"; sha256="17awsr3l50p4isfpmvw1v6mk8lygc8xrhwdxgqp1icbng5i620j2"; depends=[AnnotationDbi biomaRt DBI dbplyr dplyr GenomicFeatures GenomicRanges ggplot2 GO_db igraph IRanges KEGGREST png RCurl reactome_db readr reshape2 RSQLite rtracklayer rWikiPathways S4Vectors SummarizedExperiment tidyr zlibbioc]; }; - NormalyzerDE = derive2 { name="NormalyzerDE"; version="1.14.0"; sha256="13z5vgnmx6d85ygb1hj3s24mq4jcnfhx6pgigi9ha73p8rimixs8"; depends=[ape Biobase car ggforce ggplot2 limma MASS matrixStats preprocessCore raster RcmdrMisc SummarizedExperiment vsn]; }; - NormqPCR = derive2 { name="NormqPCR"; version="1.42.0"; sha256="1jrif7cqippczyzf3nszbwxn0a58fvlmkcwb9as0ymv9qvh372vx"; depends=[Biobase qpcR RColorBrewer ReadqPCR]; }; - NuPoP = derive2 { name="NuPoP"; version="2.4.0"; sha256="0gxanqk1xarjgnczll3fj48hx0b7iizkixy8z94d3q28y5zcqvfz"; depends=[]; }; - NxtIRFcore = derive2 { name="NxtIRFcore"; version="1.2.1"; sha256="1mjd09ywdsmzn46qgh3gzalvid3d9b6wajwkj8siibx7rpmc0rwz"; depends=[AnnotationHub BiocFileCache BiocGenerics BiocParallel Biostrings BSgenome data_table DelayedArray DelayedMatrixStats fst genefilter GenomeInfoDb GenomicRanges ggplot2 HDF5Array IRanges magrittr NxtIRFdata plotly R_utils Rcpp RcppProgress rhdf5 rtracklayer S4Vectors SummarizedExperiment zlibbioc]; }; - OCplus = derive2 { name="OCplus"; version="1.70.0"; sha256="0smrb7k510x19pgpk53xl6c8gc8bccasg6d461jwzblx01mm4l2x"; depends=[akima multtest]; }; - ODER = derive2 { name="ODER"; version="1.2.0"; sha256="1vj3l4032sbjmbi508lzhl41gr3wpyma2ch8fm7arv5csksnn20s"; depends=[BiocFileCache BiocGenerics dasper data_table derfinder dplyr GenomeInfoDb GenomicRanges ggplot2 ggpubr ggrepel IRanges magrittr megadepth plyr purrr rtracklayer S4Vectors stringr tibble]; }; - OGRE = derive2 { name="OGRE"; version="1.0.0"; sha256="1lm6hqi9lc5xpdgbvwcjzhcjw7qp2ympi7w17s90mmki0g36rf6x"; depends=[AnnotationHub assertthat data_table DT GenomeInfoDb GenomicRanges ggplot2 Gviz IRanges rtracklayer S4Vectors shiny shinyBS shinydashboard shinyFiles tidyr]; }; - OLIN = derive2 { name="OLIN"; version="1.74.1"; sha256="0yv767qf9h6d9hyzlpwq2y5l874gyfn9mvrs8m5kjvzspnm6sisk"; depends=[limma locfit marray]; }; - OLINgui = derive2 { name="OLINgui"; version="1.70.0"; sha256="0pdnxp9i08faljafy91kxg7xiv9b2fh3k5c3gqdfrvwggx3d839x"; depends=[marray OLIN tkWidgets widgetTools]; }; - OMICsPCA = derive2 { name="OMICsPCA"; version="1.14.0"; sha256="0fldppwhjijw53s6q44g92n59pfmlz5049qsmna7nzqdh06l8wh6"; 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.18.0"; sha256="1k4qfbg29lll9hpkzbcbhfipyjn4rdpfyhm2wmr8a9jcp04fpl43"; depends=[MASS qvalue tibble]; }; - ORFhunteR = derive2 { name="ORFhunteR"; version="1.4.0"; sha256="1381knb35njc4dvbdr9jbkmyfyc87aacvham3ljmdq7llis0zz7b"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg38 data_table Peptides randomForest Rcpp rtracklayer stringr xfun]; }; - ORFik = derive2 { name="ORFik"; version="1.16.6"; sha256="0yiby6z7bx5n7p32nz8yhv630m3laawq07ck11lp6vw0sn9dg6s1"; depends=[AnnotationDbi BiocGenerics BiocParallel biomaRt biomartr Biostrings BSgenome cowplot data_table DESeq2 fst GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gridExtra httr IRanges jsonlite R_utils Rcpp Rsamtools rtracklayer S4Vectors SummarizedExperiment xml2]; }; - OSAT = derive2 { name="OSAT"; version="1.44.0"; sha256="1hd1qmxbsqr1x1k8iihji48n5dqqg0zpk0ccvgaq2qkdkf9ayp06"; depends=[]; }; - OTUbase = derive2 { name="OTUbase"; version="1.46.0"; sha256="1s41amahlqpb5gffmxd4rgdc1wwdjfzsr3jikv7flbb48965rjin"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; }; - OUTRIDER = derive2 { name="OUTRIDER"; version="1.14.0"; sha256="0app3h20d76nrrrm2yc856fsz6wvjm3rl0irlr8vfb85qws7zrfi"; 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]; }; - OVESEG = derive2 { name="OVESEG"; version="1.12.0"; sha256="19z51p11g7a3bdr8ipq1pq7006z69n5qbfpj6xg50jbqv6vl7j6i"; depends=[BiocParallel fdrtool limma Rcpp SummarizedExperiment]; }; - OmaDB = derive2 { name="OmaDB"; version="2.12.0"; sha256="1ydpfdfa6gx2ca5damy5l806i9wjvpphz8wjzfbb3ijgza0dwl15"; depends=[ape Biostrings GenomicRanges httr IRanges jsonlite plyr topGO]; }; - OmicCircos = derive2 { name="OmicCircos"; version="1.34.0"; sha256="0644xcyk0li39xcyldqy927k06q6p6b8y07s3wl75dmd8gqwgvdp"; depends=[GenomicRanges]; }; - OmicsLonDA = derive2 { name="OmicsLonDA"; version="1.12.0"; sha256="125ijszmi6igsxhdg4kmgkc1sbsvsqk6ybqab73d1ly17w612z5q"; depends=[BiocGenerics BiocParallel ggplot2 gss plyr pracma SummarizedExperiment zoo]; }; - Omixer = derive2 { name="Omixer"; version="1.6.0"; sha256="12avwqrb27ljish8xk4gryjisa6zslx8b977k2dmgp19wm7f2f9x"; depends=[dplyr forcats ggplot2 gridExtra magrittr readr stringr tibble tidyselect]; }; - OmnipathR = derive2 { name="OmnipathR"; version="3.4.7"; sha256="1042hif90kcq8vf0qmqkkhmx014ammg5m7j96mxkd139nrdc6hzs"; depends=[checkmate crayon curl digest dplyr httr igraph jsonlite later logger magrittr progress purrr rappdirs readr readxl rlang rmarkdown stringr tibble tidyr tidyselect withr xml2 yaml]; }; - OncoScore = derive2 { name="OncoScore"; version="1.24.0"; sha256="02s6y5p1ncmlbaqf4fmgkvkbf913d6czz3gd9dqfwblsycxy2cxp"; depends=[biomaRt]; }; - OncoSimulR = derive2 { name="OncoSimulR"; version="3.4.0"; sha256="0ixlyrj7112rn2dnrfx226kqxfsisi2rccan9rxfcz1l1slkjvwk"; depends=[car data_table dplyr ggplot2 ggrepel graph gtools igraph RColorBrewer Rcpp Rgraphviz smatr stringr]; }; - OpenStats = derive2 { name="OpenStats"; version="1.8.0"; sha256="08r2id3f6gx5s1va4gr6m191c9y44m2c6s5lbxr8xhrnpi4c61p0"; depends=[AICcmodavg car Hmisc jsonlite knitr MASS nlme rlist summarytools]; }; - OrderedList = derive2 { name="OrderedList"; version="1.68.0"; sha256="15085hiyqn5ci5ahc674hp1j2lszdm6gm8acs1b87rg6pp5zjl4q"; depends=[Biobase twilight]; }; - Organism_dplyr = derive2 { name="Organism.dplyr"; version="1.24.0"; sha256="0j29f85d66c45ww3417xx376vpz0mmvga5n7h2cl1sd4h70b55as"; depends=[AnnotationDbi AnnotationFilter BiocFileCache DBI dbplyr dplyr GenomeInfoDb GenomicFeatures GenomicRanges IRanges rlang RSQLite S4Vectors tibble]; }; - OrganismDbi = derive2 { name="OrganismDbi"; version="1.38.1"; sha256="0mxnxj8x4hc21psz39mf7qwvh1fsn6qyjgl5qffk1xxmasf69619"; depends=[AnnotationDbi Biobase BiocGenerics BiocManager DBI GenomicFeatures GenomicRanges graph IRanges RBGL S4Vectors]; }; - Oscope = derive2 { name="Oscope"; version="1.26.0"; sha256="0rbz82k96k7d8nrbcr8mnz24kq8x95yw7m55vg64i66gm5gks168"; depends=[BiocParallel cluster EBSeq testthat]; }; - PAA = derive2 { name="PAA"; version="1.30.0"; sha256="0nq79hwinz95f0rifpk18r26vfvymns8dvib0mx4jjd13k75xgzz"; depends=[e1071 gplots gtools limma MASS mRMRe randomForest Rcpp ROCR sva]; }; - PADOG = derive2 { name="PADOG"; version="1.38.0"; sha256="156w598w39gf1mc4jm0p7c7hip4vlsms7jvb3dj5h789bgr0whnq"; depends=[AnnotationDbi Biobase doRNG foreach GSA hgu133a_db hgu133plus2_db KEGGdzPathwaysGEO KEGGREST limma nlme]; }; - PAIRADISE = derive2 { name="PAIRADISE"; version="1.12.0"; sha256="1p0wyxdbhcv88x0yrg03z1ml4qx6j7544z1xpgmz1i6sxp8k18mk"; depends=[abind BiocParallel nloptr S4Vectors SummarizedExperiment]; }; - PANR = derive2 { name="PANR"; version="1.42.0"; sha256="1g3165x4zgrw0x3yacq25k9jvfnad0yi1zbkmqxccivgnxh572ah"; depends=[igraph MASS pvclust RedeR]; }; - PAST = derive2 { name="PAST"; version="1.12.0"; sha256="14kv16nwgpdb7sqx6ba41pkdxqv2vpsfn6d8fwv24c7iihl8vac9"; depends=[doParallel dplyr foreach GenomicRanges ggplot2 iterators qvalue rlang rtracklayer S4Vectors]; }; - PCAN = derive2 { name="PCAN"; version="1.24.0"; sha256="1c4rwima7jzk18ib370rnyxraknzhkpil2jh2q22qhj5sgrnkpcx"; depends=[BiocParallel]; }; - PCAtools = derive2 { name="PCAtools"; version="2.8.0"; sha256="03s4dh008fys2rrcpzanc0892p63f6jyyvzc9m42jbi1dlkyx26v"; depends=[beachmat BH BiocParallel BiocSingular cowplot DelayedArray DelayedMatrixStats dqrng ggplot2 ggrepel lattice Matrix Rcpp reshape2]; }; - PDATK = derive2 { name="PDATK"; version="1.4.0"; sha256="1psnpjii3a2hv6nrlzxn4xb5180n6wwylv0csx5akgbn3mdqwm8n"; depends=[BiocGenerics BiocParallel caret clusterRepro ConsensusClusterPlus CoreGx data_table dplyr genefu ggplot2 ggplotify igraph MatrixGenerics matrixStats MultiAssayExperiment piano plyr pROC RColorBrewer reportROC rlang S4Vectors scales SummarizedExperiment survcomp survival survminer switchBox verification]; }; - PECA = derive2 { name="PECA"; version="1.32.0"; sha256="17lhbcq9pn9zi86vpv4b6ywj91aas4cyj17qv161jb093yfx8vwq"; depends=[affy aroma_affymetrix aroma_core genefilter limma preprocessCore ROTS]; }; - PERFect = derive2 { name="PERFect"; version="1.10.0"; sha256="036bvk3bbrpvg8dzikw2di76k9vmdd7i1x0hfdr24l4wdq81jaa6"; depends=[fitdistrplus ggplot2 Matrix phyloseq psych sn zoo]; }; - PFP = derive2 { name="PFP"; version="1.4.0"; sha256="1dglmiq24gmnw5lhi509d1f5w7iabgiyndr36cz7j9wzqrxnzf09"; depends=[clusterProfiler ggplot2 graph igraph KEGGgraph magrittr plyr tidyr]; }; - PICS = derive2 { name="PICS"; version="2.40.0"; sha256="04hysyaikw0dl2visnhyzvj21k6gamzsh5awlrgczaqcpxh5j7gf"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools]; }; - PING = derive2 { name="PING"; version="2.40.0"; sha256="0x75lq8igf5ppdbr7vs672cs6qi15wxrh4v5ir3qsyfv96n3i9dl"; depends=[BiocGenerics BSgenome fda GenomicRanges Gviz IRanges PICS S4Vectors]; }; - PLPE = derive2 { name="PLPE"; version="1.56.0"; sha256="07s2xgz733zr3a7z3nzvb3iimb2pb1xpixp8xwmyzi624ndms0v3"; depends=[Biobase LPE MASS]; }; - POMA = derive2 { name="POMA"; version="1.6.0"; sha256="1jd1k0kvxkinnd74kcm6yhihfal4d1b17zpwjg3m3492x2hg79dd"; depends=[broom caret ComplexHeatmap dplyr e1071 ggplot2 ggrepel glasso glmnet impute knitr limma magrittr mixOmics randomForest RankProd rmarkdown SummarizedExperiment tibble tidyr vegan]; }; - POWSC = derive2 { name="POWSC"; version="1.4.0"; sha256="071bvywmnjc08yrs912m7cfb0s9rf8rvsqyg0dnqsyh16cyc4nxw"; depends=[Biobase ggplot2 limma MAST pheatmap RColorBrewer SingleCellExperiment SummarizedExperiment]; }; - PPInfer = derive2 { name="PPInfer"; version="1.22.0"; sha256="0y7wagkskw8m22bq7sd99hqc1zn583lljqddncz2kcd8x57pims2"; depends=[biomaRt fgsea ggplot2 httr igraph kernlab STRINGdb yeastExpData]; }; - PREDA = derive2 { name="PREDA"; version="1.42.0"; sha256="10vl8d57x3hyn3145nyi2jg3fyb8xjhbgiica8fy90x6759avaqg"; depends=[annotate Biobase lokern multtest]; }; - PROMISE = derive2 { name="PROMISE"; version="1.48.0"; sha256="0pic8mvlv87hz9cmscr74vaxg4wnlsgmxlybhy4xnyzidg2cadyi"; depends=[Biobase GSEABase]; }; - PROPER = derive2 { name="PROPER"; version="1.28.0"; sha256="01frrjg3rwg2vwsg7hq27kp4k7in1y0fckz9xdfv0b0737ps7j1y"; depends=[edgeR]; }; - PROPS = derive2 { name="PROPS"; version="1.18.0"; sha256="1y2n16gnmqfp187sylh7v0fvsd4p9ij773ngviv57idwg9nrb8a1"; depends=[Biobase bnlearn reshape2 sva]; }; - PROcess = derive2 { name="PROcess"; version="1.72.0"; sha256="03ppx9zm9mvqb5r1mkrr3pxids8nllw2phqzpsb3bmz1x0yab4nh"; depends=[Icens]; }; - PSEA = derive2 { name="PSEA"; version="1.30.0"; sha256="0wdljlx7jvq78g9qp330ccqld4n9ilaaykqh527lljzc8p5vvbjx"; depends=[Biobase MASS]; }; - PSICQUIC = derive2 { name="PSICQUIC"; version="1.34.0"; sha256="0gkkxxbc2a7cin92qwn1masqfigyz9s4fhyy2daa17r3ckk4ccgx"; depends=[BiocGenerics biomaRt httr IRanges plyr RCurl]; }; - PSMatch = derive2 { name="PSMatch"; version="1.0.0"; sha256="027r2r70n9v54m6kww6bzaqvf7ahn42vh7fdbbb4m6xzbl62frmq"; depends=[BiocGenerics BiocParallel igraph Matrix MsCoreUtils ProtGenerics QFeatures S4Vectors]; }; - PWMEnrich = derive2 { name="PWMEnrich"; version="4.32.0"; sha256="031j563jcaakiasx1r8aflhqm0vq7j5628f9bv4kkyi5rhr3aix9"; depends=[BiocGenerics Biostrings evd gdata S4Vectors seqLogo]; }; - PanomiR = derive2 { name="PanomiR"; version="1.0.2"; sha256="14cmhsns15620ggqp41hl1dahanvqdlydxgr1aysq0h1145yhw31"; depends=[clusterProfiler dplyr forcats GSEABase igraph limma metap org_Hs_eg_db preprocessCore RColorBrewer rlang tibble withr]; }; - Path2PPI = derive2 { name="Path2PPI"; version="1.26.0"; sha256="0csqciqavnamyhsf7hx5c6x3ranr1h8wskzz09hf7rw65gxbn6jp"; depends=[igraph]; }; - PathNet = derive2 { name="PathNet"; version="1.36.0"; sha256="1xbwzvbnjgxby7xwgpl20qnx172lpzhm5z8rm3q1n3ww0n4z7pfk"; depends=[]; }; - PathoStat = derive2 { name="PathoStat"; version="1.22.0"; sha256="1f01vrncrw50jcvaivgqpjyc6h0ccphzifcw1aq03w39nrw55mz9"; 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]; }; - PeacoQC = derive2 { name="PeacoQC"; version="1.6.0"; sha256="1b2jhph8nhx9iqia6cbs84aaz7srm7fchn7r0d55fmfnzg5cdr7z"; depends=[circlize ComplexHeatmap flowCore flowWorkspace ggplot2 gridExtra plyr]; }; - PepsNMR = derive2 { name="PepsNMR"; version="1.14.0"; sha256="04q4xminxkqzc88dqyrpddzdmcnj1n4ssspk3wnraplwrxhg1kcx"; depends=[ggplot2 gridExtra Matrix matrixStats ptw reshape2]; }; - PhIPData = derive2 { name="PhIPData"; version="1.4.0"; sha256="06fc0h2jn2v6n921rmxb37rdkk60v9il9x32w1ky2n5xaiqhx3yl"; depends=[BiocFileCache BiocGenerics cli edgeR GenomicRanges IRanges S4Vectors SummarizedExperiment]; }; - PharmacoGx = derive2 { name="PharmacoGx"; version="3.0.2"; sha256="16mpqz4amzydwihniwz7ivj8z9lb0z9rmldk3j4f2f8gy49l63pi"; depends=[Biobase BiocGenerics BiocParallel boot caTools checkmate coop CoreGx data_table downloader ggplot2 jsonlite magicaxis MultiAssayExperiment RColorBrewer Rcpp reshape2 S4Vectors SummarizedExperiment]; }; - PhenStat = derive2 { name="PhenStat"; version="2.32.0"; sha256="1g8g7452vkl06vphmmb7vv090dng58cx9v3d1vhsxsf6bzqny4ql"; depends=[car corrplot ggplot2 graph knitr lme4 logistf MASS msgps nlme nortest pingr reshape SmoothWin]; }; - PhenoGeneRanker = derive2 { name="PhenoGeneRanker"; version="1.4.0"; sha256="0wzf9c3iimcq8hc78ai188slbhkgzq94nmzcd4gxzlgmk44524ap"; depends=[doParallel dplyr foreach igraph Matrix]; }; - PhosR = derive2 { name="PhosR"; version="1.6.0"; sha256="0rgqr458m5hbai1jmcxv73ay74bgd44iwjz98b848qgx4imz8jp2"; 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.10.5"; sha256="1ij0mjz9arpfp67vjv6mp3h2w1marwqqdbvb2sc7vmqd0wj8bnvg"; 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.8.0"; sha256="0vpvpq7ss4x6qcz525zl71ysfh65zcqp13qym03s0v6r491gndnv"; 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.22.0"; sha256="11bx3ivzfzh0bnmz77psz4vah0gm0vaa7pwbbkwjcra85sbzyxiz"; depends=[BiocStyle bnlearn C50 clusterProfiler DBI DOSE dplyr gdata ggplot2 GO_db graph impute MASS matrixStats openxlsx partykit pheatmap preprocessCore ReactomePA Rgraphviz WGCNA]; }; - PloGO2 = derive2 { name="PloGO2"; version="1.8.2"; sha256="0icflih4wkddj87zvq1f188v0rqb57cw9l9vygmz7vvlxis2x9ny"; depends=[GO_db GOstats httr lattice openxlsx xtable]; }; - PoDCall = derive2 { name="PoDCall"; version="1.4.0"; sha256="1k47igncvcz4sqpv59148nqcinabz5ifpl6xkcrry20gvbngnrca"; depends=[diptest DT ggplot2 gridExtra LaplacesDemon mclust purrr readr rlist shiny shinyjs]; }; - PoTRA = derive2 { name="PoTRA"; version="1.12.0"; sha256="0k93zj0mfs8pkr5cnf2y7bg9ynnwwr1acylsav8dcyz8vkc9r25k"; depends=[BiocGenerics graph graphite igraph org_Hs_eg_db]; }; - PrInCE = derive2 { name="PrInCE"; version="1.12.0"; sha256="02vnpdmns14g0qhizpify2p4mzkacj31ar31jmbxzg3bcbq2nz84"; depends=[Biobase dplyr forecast Hmisc LiblineaR magrittr MSnbase naivebayes progress purrr ranger Rdpack robustbase speedglm tester tidyr]; }; - PrecisionTrialDrawer = derive2 { name="PrecisionTrialDrawer"; version="1.11.0"; sha256="1miw8rj1zn1xv97dkgs66k9g21i6gp3j2m1l1akysskczgam3i2c"; depends=[BiocParallel biomaRt brglm 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.28.6"; sha256="1kjwzb94g91g9nw2kx8dcqq7iwld3flkaxaisvjg5rzi3306s96g"; depends=[DAPAR data_table highcharter htmlwidgets later MSnbase RColorBrewer rhandsontable shiny shinyAce shinyBS shinycssloaders shinyjqui shinyWidgets]; }; - ProtGenerics = derive2 { name="ProtGenerics"; version="1.28.0"; sha256="04hcgj4q8dbzp1a29rbww2bxxrg679pgys3m09p0ydkpsx76rq05"; depends=[]; }; - ProteoDisco = derive2 { name="ProteoDisco"; version="1.2.0"; sha256="1929aarf9al6di1r6z2n2ggdzblmfidikwswfg53nqanwwms31wa"; 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.14.0"; sha256="0l5h4s77bv5wj6kj0zyj517acydqvd2sbxgl2fd22c1igwj9iqyl"; depends=[biomaRt gdata ggplot2 ggrepel gtools matrixStats]; }; - PubScore = derive2 { name="PubScore"; version="1.8.0"; sha256="18bmzvv6mxrdlh297i29q24vi5rc4x2mjaryi5asiki186x0hy8d"; depends=[dplyr ggplot2 ggrepel igraph intergraph network progress rentrez sna]; }; - PureCN = derive2 { name="PureCN"; version="2.2.0"; sha256="1rd6a9x2jsha5l1nw2xn57q7nr7jxjg1wylnv7iib77nwrb0sjfv"; 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.30.0"; sha256="0ipsf10h9qbpmc4jj04x5gvxkbihicza8fw3qlh5qmwj83xyw5py"; depends=[Biostrings biovizBase data_table GenomicRanges Gviz IRanges]; }; - QDNAseq = derive2 { name="QDNAseq"; version="1.32.0"; sha256="0s360s72lfn9vjml88gg1m40n61s0dc66ilzgfjdcp65djdxxfvm"; depends=[Biobase CGHbase CGHcall DNAcopy future_apply GenomicRanges IRanges matrixStats R_utils Rsamtools]; }; - QFeatures = derive2 { name="QFeatures"; version="1.6.0"; sha256="1yz1wh81v4d7y109kbr51gial69l0g6mv7n28askbzpn5dl4gvwp"; depends=[AnnotationFilter Biobase BiocGenerics igraph IRanges lazyeval MsCoreUtils MultiAssayExperiment plotly ProtGenerics S4Vectors SummarizedExperiment]; }; - QSutils = derive2 { name="QSutils"; version="1.14.0"; sha256="0bbyk568z0bd2pmlw28hdibbwvfhs6wgcjdvyr8az6kqpz3yg326"; depends=[ape BiocGenerics Biostrings psych]; }; - QUBIC = derive2 { name="QUBIC"; version="1.24.0"; sha256="00annp5savi5z4f7m7kwsnijmhg7z4pwfj4lapr2wpsl51kga4fj"; depends=[biclust Matrix Rcpp RcppArmadillo]; }; - Qtlizer = derive2 { name="Qtlizer"; version="1.10.0"; sha256="023yr1szcsz8x78k2209242c21drszcmiyb7bs1n39qd2vi8ilhg"; depends=[curl GenomicRanges httr stringi]; }; - QuartPAC = derive2 { name="QuartPAC"; version="1.28.0"; sha256="1xfnnk896kng4m694rablk8gxq254d7nf5y8iz1gb0s688b20lyh"; depends=[data_table GraphPAC iPAC SpacePAC]; }; - QuasR = derive2 { name="QuasR"; version="1.36.0"; sha256="1m0c0rdakkdn4rr6dh51c6rs40cbxkvz93n6s0m2kc6fqjv9zplf"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicFiles GenomicRanges IRanges Rbowtie Rhtslib Rsamtools rtracklayer S4Vectors ShortRead]; }; - QuaternaryProd = derive2 { name="QuaternaryProd"; version="1.30.0"; sha256="0cq79377z73hhcvhzv5l8frss6wz6hmf7zvjh4v9jvrk8n0p3h7g"; depends=[dplyr Rcpp yaml]; }; - R3CPET = derive2 { name="R3CPET"; version="1.28.0"; sha256="1igxbx8wvf7jgzss2zv9w8bq7pdqr8g64dqm4j9nv20gagz6sh9m"; depends=[BiocGenerics clValid data_table GenomeInfoDb GenomicRanges ggbio ggplot2 Hmisc igraph IRanges pheatmap Rcpp RCurl reshape2 S4Vectors]; }; - R453Plus1Toolbox = derive2 { name="R453Plus1Toolbox"; version="1.46.0"; sha256="1vxgkhigmsk4f1cdn83rr8ysw3mj1lp0h7wjmxmm9pj97ig31v9b"; depends=[Biobase BiocGenerics biomaRt Biostrings BSgenome GenomicRanges IRanges R2HTML Rsamtools S4Vectors ShortRead SummarizedExperiment TeachingDemos VariantAnnotation xtable XVector]; }; - R4RNA = derive2 { name="R4RNA"; version="1.24.0"; sha256="12861114yw3dx2acqk2if5h11agfsdzl23pxzqy23gymxc1wm0z1"; depends=[Biostrings]; }; - RAREsim = derive2 { name="RAREsim"; version="1.0.0"; sha256="1q2cvjikisxzpiz9zqgldlyrz0ah19vnapn4c2p4yc1k5fqhc02f"; depends=[nloptr]; }; - RBGL = derive2 { name="RBGL"; version="1.72.0"; sha256="0ph089vxla49sng0pdwiyh9rpk9i96cbsx5q2jn46jj4x51ijc7y"; depends=[BH graph]; }; - RBM = derive2 { name="RBM"; version="1.28.0"; sha256="1yiyd78nkjh24dvj3vj86mc44bw9bb9maarji0w307bw71s94mgk"; depends=[limma marray]; }; - RBioinf = derive2 { name="RBioinf"; version="1.56.0"; sha256="1mm3i5fqvqal2y0lq2cdngy445dp8yv8rzvi59bjviwqzxp44m63"; depends=[graph]; }; - RCAS = derive2 { name="RCAS"; version="1.22.0"; sha256="05sj2ab7bxgf41gkmjaskhqm0198xlir1sw3f73x8rjg14rssmqf"; depends=[BiocGenerics Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 cowplot data_table DT genomation GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo gprofiler2 IRanges knitr pbapply pheatmap plotly plotrix proxy ranger rmarkdown RSQLite rtracklayer S4Vectors]; }; - RCASPAR = derive2 { name="RCASPAR"; version="1.42.0"; sha256="0zzg0gsg6hcinskdj3625vk1pbzaxsfxf2m9d17gzc2jydjysfbz"; depends=[]; }; - RCM = derive2 { name="RCM"; version="1.12.0"; sha256="0v1dv69qlv0knaf96imi94mbpr8qz2a46hjn6rw7yfzfgsprnx7s"; depends=[alabama DBI edgeR ggplot2 MASS nleqslv phyloseq RColorBrewer reshape2 tensor tseries VGAM]; }; - RCSL = derive2 { name="RCSL"; version="1.4.0"; sha256="1b15jjd6v2slw94fd54y2xf638yrzqaw6qs4vzwan5ima6yl0bhk"; depends=[ggplot2 igraph NbClust pracma RcppAnnoy Rtsne umap]; }; - RCX = derive2 { name="RCX"; version="1.0.1"; sha256="1xrarll3fh8a3zgv507944klyq7kym87rpn7rk1kfsxs3zd94fsq"; depends=[igraph jsonlite plyr]; }; - RCy3 = derive2 { name="RCy3"; version="2.16.0"; sha256="0xbvi9k4lvva4njmgcjz2yjbhjp7n6if5622swnkyb01s178a7vi"; depends=[base64enc base64url BiocGenerics fs glue graph httr IRdisplay IRkernel RColorBrewer RCurl RJSONIO uchardet uuid XML]; }; - RCyjs = derive2 { name="RCyjs"; version="2.18.0"; sha256="105spxlmmr23h43hrym10h5jgizq3m5g1kmxzf42q8jzns042dqs"; depends=[base64enc BiocGenerics BrowserViz graph httpuv]; }; - RDRToolbox = derive2 { name="RDRToolbox"; version="1.46.0"; sha256="13c7701g9n6irqpfc1bcamg2pys8vsryq1y6q9mw28im73wf0caw"; depends=[MASS rgl]; }; - REBET = derive2 { name="REBET"; version="1.14.0"; sha256="03v6qdc9hz2p74s64v0vk4wxc4nkl4g465ygdnnyxk2qz99q79qa"; depends=[ASSET]; }; - REDseq = derive2 { name="REDseq"; version="1.42.0"; sha256="16iqqzk7jlwb3yzsamxmpm0424a7hphv5ajbfw9fzmsshll3q18p"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome BSgenome_Celegans_UCSC_ce2 ChIPpeakAnno IRanges multtest]; }; - REMP = derive2 { name="REMP"; version="1.20.1"; sha256="0176p0bjlmyp95ssiqkziyasm247n2jgv2ijcl34zy1d5jndv4gj"; depends=[AnnotationHub BiocGenerics BiocParallel Biostrings BSgenome caret doParallel foreach GenomeInfoDb GenomicRanges impute IRanges iterators kernlab minfi org_Hs_eg_db ranger readr rtracklayer S4Vectors settings SummarizedExperiment]; }; - RGMQL = derive2 { name="RGMQL"; version="1.16.0"; sha256="1bwcqh6hmxjwzszd2747yc9wadh1jj0dm04d9752vyf1hz5nnhkv"; depends=[BiocGenerics data_table dplyr GenomicRanges glue httr plyr RGMQLlib rJava rtracklayer S4Vectors xml2]; }; - RGSEA = derive2 { name="RGSEA"; version="1.30.0"; sha256="0p03fxf725c9ayk29ah48jd96ry3i0360mxphzmsdycc3sna6mrq"; depends=[BiocGenerics]; }; - RGraph2js = derive2 { name="RGraph2js"; version="1.24.0"; sha256="14ffqx419vd5qz1fbbdszvzvx4m8mqmd7sh4d0dyxy37k19l60q3"; depends=[digest graph rjson whisker]; }; - RIPAT = derive2 { name="RIPAT"; version="1.6.0"; sha256="0xqj14lgvgs2mms0khxvjl5pkacvv5b6vg5acn01dhg3bs83lbr6"; depends=[biomaRt GenomicRanges ggplot2 IRanges karyoploteR openxlsx plyr regioneR rtracklayer stringr]; }; - RITAN = derive2 { name="RITAN"; version="1.20.0"; sha256="0scn410jri1a1zr1j9kbk9884js6ps1v9a873fpzfdrrvb31dksd"; depends=[AnnotationFilter BgeeDB dynamicTreeCut EnsDb_Hsapiens_v86 ensembldb GenomicFeatures ggplot2 gplots gridExtra gsubfn hash igraph knitr linkcomm MCL plotrix png RColorBrewer reshape2 RITANdata sqldf STRINGdb]; }; - RIVER = derive2 { name="RIVER"; version="1.20.0"; sha256="1x02pkb7ff9zxlmwcdc8ck841bikhm8rpsn4jlkywy22s4mb074w"; depends=[Biobase ggplot2 glmnet pROC]; }; - RImmPort = derive2 { name="RImmPort"; version="1.24.0"; sha256="0ay2604wdksppbhgrd9zig380r7392zjaypfv6gd011wjh8gh05f"; depends=[data_table DBI dplyr plyr reshape2 RSQLite sqldf]; }; - RJMCMCNucleosomes = derive2 { name="RJMCMCNucleosomes"; version="1.20.0"; sha256="0m8rsvlyicp2bk6ax5sfssw6378z42d9bdp22v3j33vii3mla1fi"; depends=[BiocGenerics BiocParallel consensusSeekeR GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; }; - RLMM = derive2 { name="RLMM"; version="1.58.0"; sha256="0rmir7ab8bs45c1q49yf6apx9i4sr673b33zw12hmp76zlgabwsi"; depends=[MASS]; }; - RLSeq = derive2 { name="RLSeq"; version="1.2.0"; sha256="0lka8q9hpv3kx8xlx6glsdhc1z7y0ihfdi2qglsggy4iyzdnav0d"; depends=[AnnotationHub aws_s3 callr caretEnsemble circlize ComplexHeatmap dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggplotify ggprism pheatmap RColorBrewer regioneR RLHub rtracklayer valr VennDiagram]; }; - RLassoCox = derive2 { name="RLassoCox"; version="1.4.0"; sha256="19kvnhxwvw652cng9ngq2d9dnfaqxxd9qjsvhaqv8kb4kz2r9bfb"; depends=[glmnet igraph Matrix survival]; }; - RMassBank = derive2 { name="RMassBank"; version="3.6.1"; sha256="013j46ypgvr99j2grcxp251q8178a0x0xcsn9spdwba0cis2p836"; depends=[assertthat Biobase ChemmineOB ChemmineR data_table digest enviPat httr logger MSnbase mzR R_utils rcdk Rcpp RCurl readJDX rjson S4Vectors webchem XML yaml]; }; - RNAAgeCalc = derive2 { name="RNAAgeCalc"; version="1.8.0"; sha256="10d320bcdmn6mzcvivbphygnirs1znf1rnmirhzl1f978m50jp9j"; depends=[AnnotationDbi ggplot2 impute org_Hs_eg_db recount SummarizedExperiment]; }; - RNASeqPower = derive2 { name="RNASeqPower"; version="1.36.0"; sha256="0bv9xkkg30vr9lmybiialh0mimcvmcrsf0wm23r6jsmm8pqgv7wd"; depends=[]; }; - RNAdecay = derive2 { name="RNAdecay"; version="1.16.0"; sha256="0skv7hx83yq9c426am81555imdbbkysckv8py5ng3q56r67cgy45"; depends=[ggplot2 gplots nloptr scales TMB]; }; - RNAinteract = derive2 { name="RNAinteract"; version="1.44.0"; sha256="1f0kvpmkq6djfr6qx95fhmb2wblzz0iaffwwrqi6ibwbp4s3dmzv"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; }; - RNAmodR = derive2 { name="RNAmodR"; version="1.10.0"; sha256="0nih7ix5bw9zc7grlw8a0yipx15r6n9ias1y30i6gr0z612whv6g"; depends=[BiocGenerics BiocParallel Biostrings BSgenome colorRamps GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 Gviz IRanges matrixStats Modstrings RColorBrewer reshape2 ROCR Rsamtools rtracklayer S4Vectors]; }; - RNAmodR_AlkAnilineSeq = derive2 { name="RNAmodR.AlkAnilineSeq"; version="1.10.0"; sha256="0qdh9h4vw0fc3dnsm1mb232pladp5hc0k8irxdmrs5akfqfcfc29"; depends=[BiocGenerics GenomicRanges Gviz IRanges RNAmodR S4Vectors]; }; - RNAmodR_ML = derive2 { name="RNAmodR.ML"; version="1.10.0"; sha256="17br1v3v36h11b3hc3qnxdic9zk2q5g8p99h2350nhq54z54g9j3"; depends=[BiocGenerics GenomicRanges IRanges ranger RNAmodR S4Vectors]; }; - RNAmodR_RiboMethSeq = derive2 { name="RNAmodR.RiboMethSeq"; version="1.10.0"; sha256="1g4ds43xaw6rzj5jxnahkbgpgarfjp4mygh8q5a80b7zi8z4w948"; depends=[BiocGenerics GenomicRanges Gviz IRanges RNAmodR S4Vectors]; }; - RNAsense = derive2 { name="RNAsense"; version="1.10.0"; sha256="19r4vvz9mj1jw5cw1afs4sx010vd2ssz2c4qspi2y6x12gnbhmnf"; depends=[ggplot2 NBPSeq qvalue SummarizedExperiment]; }; - ROC = derive2 { name="ROC"; version="1.72.0"; sha256="0yfq0d0j2bzqdnjs6l2h6p48kmv9wfphlqym3brgndlnadipq1v2"; depends=[knitr]; }; - ROCpAI = derive2 { name="ROCpAI"; version="1.8.0"; sha256="0vakvv2n5pzsfyy0iryafysrwrpzl15mg1wq1qs8y7hrrpc18cry"; depends=[boot fission knitr SummarizedExperiment]; }; - ROSeq = derive2 { name="ROSeq"; version="1.8.0"; sha256="00cp1293359s3h73xwjfnhdvl04h61f5jjbkzqan2q59j8bc5n92"; depends=[edgeR limma pbmcapply]; }; - ROTS = derive2 { name="ROTS"; version="1.24.0"; sha256="021a578p8kcl5yd9myiy0h2qp10r30ggnip2kp6xs7dx8nzic96r"; depends=[Biobase Rcpp]; }; - ROntoTools = derive2 { name="ROntoTools"; version="2.24.0"; sha256="1p84vx25lgynsbb7ng62wmbhjhk2qippfpar9nsbv7vhdl6yriyy"; depends=[boot graph KEGGgraph KEGGREST Rgraphviz]; }; - RPA = derive2 { name="RPA"; version="1.52.0"; sha256="0kwipm60h3g02xm0v8x8c18az4zqm2fqsn9m3n2wvy59lyzgd4cp"; depends=[affy BiocGenerics BiocStyle phyloseq rmarkdown]; }; - RProtoBufLib = derive2 { name="RProtoBufLib"; version="2.8.0"; sha256="1mvqwrm1y0vij66gdwgpf5l1h660wsi9jzjfs4ihw3zm4cb0q5pp"; depends=[]; }; - RRHO = derive2 { name="RRHO"; version="1.36.0"; sha256="1ryfalc6h465w5zv03jq8cgbslvzk70l83bfj5cy2fcxsjgzi1z9"; depends=[VennDiagram]; }; - RSVSim = derive2 { name="RSVSim"; version="1.36.0"; sha256="1x72ksb9r7850xpmi5qhw6fnmz6p831mdf1s9s9bgn67kz7940d5"; depends=[Biostrings GenomicRanges IRanges ShortRead]; }; - RSeqAn = derive2 { name="RSeqAn"; version="1.16.0"; sha256="0i16z4vqp7mqjjkn8xzzxadh88r3ikl04h7jkjnn777cn4596svm"; depends=[Rcpp]; }; - RTCA = derive2 { name="RTCA"; version="1.48.0"; sha256="06bcy13i6j2y4fxizhg9k6yv2grvb2fi4w98f3q4pf8b6w6hcczb"; depends=[Biobase gtools RColorBrewer]; }; - RTCGA = derive2 { name="RTCGA"; version="1.26.0"; sha256="1r8ivxgqi9c33rzg0bx699grgzpikiqhbdznnck1daj66ab78shs"; depends=[assertthat data_table dplyr ggplot2 ggthemes knitr purrr rvest scales stringi survival survminer viridis XML xml2]; }; - RTCGAToolbox = derive2 { name="RTCGAToolbox"; version="2.26.1"; sha256="12h5lj1a6v8cbmxvg8cw0iqzci3sl6ixv49qzzyz5srq4kidh40j"; depends=[BiocGenerics data_table DelayedArray GenomeInfoDb GenomicRanges httr limma RaggedExperiment RCircos RCurl RJSONIO S4Vectors stringr SummarizedExperiment survival TCGAutils XML]; }; - RTN = derive2 { name="RTN"; version="2.20.0"; sha256="06gxc3qpvkd488m4wsy0xqwgdpfakas934k3pqs8knq5ivc5hy2a"; depends=[car data_table igraph IRanges limma minet mixtools pheatmap pwr RedeR S4Vectors snow SummarizedExperiment viper]; }; - RTNduals = derive2 { name="RTNduals"; version="1.20.0"; sha256="0lglzmd4hsc4nlf6j7c5ixgkvs5dxgb1jmr3b5080flcn24s5a3p"; depends=[RTN]; }; - RTNsurvival = derive2 { name="RTNsurvival"; version="1.20.0"; sha256="1vw185sskn59b647gfk1hqdmbm4kkb856wmv8dqlnw88mj5pls14"; depends=[data_table dunn_test egg ggplot2 pheatmap RColorBrewer RTN RTNduals scales survival]; }; - RTopper = derive2 { name="RTopper"; version="1.42.0"; sha256="01rn7ak7h7q9clwkbgal8n9ivb27ppzqq9s3sxp44s3dz6x07835"; depends=[Biobase limma multtest]; }; - RUVSeq = derive2 { name="RUVSeq"; version="1.30.0"; sha256="001h07b074hvj16bjdp9llb9psphw7r6kpwhq61bj4519y6lpg7x"; depends=[Biobase EDASeq edgeR MASS]; }; - RUVcorr = derive2 { name="RUVcorr"; version="1.28.0"; sha256="1fwmghmzyjfbifb4mchp64v3n9fwzdc0bzlcvb96q6d1vwb9vs9k"; depends=[BiocParallel bladderbatch corrplot gridExtra lattice MASS psych reshape2 snowfall]; }; - RUVnormalize = derive2 { name="RUVnormalize"; version="1.30.0"; sha256="02jphy9y90jcl1i2pmsai188whb7ivb4zq0l2whzsz8hyanqgbwv"; depends=[Biobase RUVnormalizeData]; }; - RVS = derive2 { name="RVS"; version="1.18.0"; sha256="0yzzbj31gb86gvcchs6bbi69hbd39f2y4d3zv1g4lmyhbxzqw6zb"; depends=[GENLIB gRain kinship2 snpStats]; }; - RadioGx = derive2 { name="RadioGx"; version="2.0.0"; sha256="0biajaa10skv55r7g8gfa1gkz9cav1g9rr9bj6zfqdcyg4i9a9hi"; depends=[assertthat Biobase BiocGenerics BiocParallel caTools CoreGx data_table downloader magicaxis matrixStats RColorBrewer reshape2 S4Vectors scales SummarizedExperiment]; }; - RaggedExperiment = derive2 { name="RaggedExperiment"; version="1.20.1"; sha256="0j784nixky7rzfzwzmgfv7cd7x3lv1dkhnqg9j8g7jxgc8prha2v"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges Matrix MatrixGenerics S4Vectors SummarizedExperiment]; }; - RandomWalkRestartMH = derive2 { name="RandomWalkRestartMH"; version="1.16.0"; sha256="1cy4c1gw7gmz15hvl2bx6r4r1hjslymw74gmqir068qgbnn9jz86"; depends=[dnet igraph Matrix]; }; - RankProd = derive2 { name="RankProd"; version="3.22.0"; sha256="0rq14h9kjj84krgvfa09jbc5s8yks37fjbcv8z88daaib0j3fq2d"; depends=[gmp Rmpfr]; }; - RareVariantVis = derive2 { name="RareVariantVis"; version="2.24.0"; sha256="0m6r8ldilv8hl3qhvbxafv928f7xma7w1rj7nv0hzi21hg741kp1"; depends=[BiocGenerics BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb GenomicFeatures GenomicRanges GenomicScores googleVis gtools IRanges phastCons100way_UCSC_hg19 S4Vectors SummarizedExperiment TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; }; - RbcBook1 = derive2 { name="RbcBook1"; version="1.64.0"; sha256="1ivk4hjx1jzjg46cwwjmk7anqxwa9ddr34zf0xgbyfrbg25ilf44"; depends=[Biobase graph rpart]; }; - Rbec = derive2 { name="Rbec"; version="1.4.0"; sha256="0870yy8j77yw67y3ihyb10w8a6py33h4p27bgikqq2b9830f5cpw"; depends=[dada2 doParallel foreach ggplot2 Rcpp readr]; }; - Rbowtie = derive2 { name="Rbowtie"; version="1.36.0"; sha256="1ya1irwshsyy9l1fj51b04nv1ahq7a47ck7q19h2cly6yskc4x1q"; depends=[]; }; - Rbowtie2 = derive2 { name="Rbowtie2"; version="2.2.0"; sha256="0dhdx27vrkhd4fak0qb5q9amlcpi97xhf3ry39zk0ifx5zpjynkg"; depends=[magrittr Rsamtools]; }; - Rbwa = derive2 { name="Rbwa"; version="1.0.0"; sha256="1rf43p87p5397cbh9znl0qvrplid102qd3bgf310kk3kpkjdw56q"; depends=[]; }; - Rcade = derive2 { name="Rcade"; version="1.37.0"; sha256="1x8a4kas3bd4dzlwwiw781l9j2xa4sqmwbzblmsc23cp7kfbvffg"; depends=[baySeq GenomeInfoDb GenomicAlignments GenomicRanges IRanges plotrix rgl Rsamtools S4Vectors]; }; - RcisTarget = derive2 { name="RcisTarget"; version="1.16.0"; sha256="17fnjkg6rjqj33v7slg81skqag10y6dc14g5iv69gqshjal4w4im"; depends=[arrow AUCell BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges GSEABase R_utils S4Vectors SummarizedExperiment tibble]; }; - Rcpi = derive2 { name="Rcpi"; version="1.32.2"; sha256="0rnwnybsllq2lh5c3v3pz5c010522wmhq2q8nlqws1yl4vyq82c2"; depends=[Biostrings doParallel foreach GOSemSim rcdk RCurl rjson]; }; - Rcwl = derive2 { name="Rcwl"; version="1.12.0"; sha256="1q10gzh3m46jaac1w5hhfv166vrh23q3fwn377cy0p0cq6mhqk9j"; depends=[basilisk batchtools BiocParallel codetools DiagrammeR R_utils S4Vectors shiny yaml]; }; - RcwlPipelines = derive2 { name="RcwlPipelines"; version="1.12.0"; sha256="1lcx926y437jkphldnydw71k64mibgh5k0cwxzsf8f9b0lwmhl02"; depends=[BiocFileCache git2r httr rappdirs Rcwl S4Vectors]; }; - Rdisop = derive2 { name="Rdisop"; version="1.56.0"; sha256="0cy1m1mch6d7csvlaacb5c54nz3f4caddjyfwbxq74qbzgx8mq07"; depends=[Rcpp]; }; - ReQON = derive2 { name="ReQON"; version="1.42.0"; sha256="1f5pplm8fy3wvl0b6n18gph4dq9i9x5qiyjrj0bk0kwlkbpba74r"; depends=[rJava Rsamtools seqbias]; }; - ReactomeContentService4R = derive2 { name="ReactomeContentService4R"; version="1.4.0"; sha256="1v4r1jybffjjz45ya2a8vx81i5fm911vqrba5qc846c5mikwxifp"; depends=[data_table doParallel foreach httr jsonlite magick]; }; - ReactomeGSA = derive2 { name="ReactomeGSA"; version="1.10.0"; sha256="1al69vrxsc3yw7d7vi8zvx6s5cac9dm0dzhkd96gqixjfr8lbsiq"; depends=[dplyr ggplot2 gplots httr jsonlite progress RColorBrewer tidyr]; }; - ReactomeGraph4R = derive2 { name="ReactomeGraph4R"; version="1.4.0"; sha256="07psjmygwvjkrz4dsgsa6hbw15dn97lkl5h1hk386yj94d5aplbk"; depends=[data_table doParallel foreach getPass jsonlite magrittr neo4r purrr ReactomeContentService4R rlang]; }; - ReactomePA = derive2 { name="ReactomePA"; version="1.40.0"; sha256="1fd72m2afxbbvbgwy8knp6fiq1h561plmsh4r8a08w21ngmkz2s5"; depends=[AnnotationDbi DOSE enrichplot ggplot2 ggraph graphite igraph reactome_db]; }; - ReadqPCR = derive2 { name="ReadqPCR"; version="1.42.0"; sha256="1999bn50w4sm8lr8ly6n773kswffcyrj3l6if37z1c17krfp58vl"; depends=[Biobase]; }; - RedeR = derive2 { name="RedeR"; version="2.0.1"; sha256="163rxsnj00nyxy96jx36z08wahbxr5lgh5r7rlk2kc1r5mv9hypn"; depends=[igraph]; }; - RefPlus = derive2 { name="RefPlus"; version="1.66.0"; sha256="0q0jklcbf7przhaxdb4w2qalin7ypds8s6v1yjlriqj62zkvd9bk"; depends=[affy affyPLM Biobase preprocessCore]; }; - RegEnrich = derive2 { name="RegEnrich"; version="1.6.0"; sha256="0nfdnbw69dl6zba3mrvjb1v4h8avgn30kzpfwl5fi5n07x6s7xpb"; depends=[BiocParallel BiocSet DESeq2 DOSE dplyr fgsea ggplot2 limma magrittr randomForest reshape2 S4Vectors SummarizedExperiment tibble WGCNA]; }; - RepViz = derive2 { name="RepViz"; version="1.12.0"; sha256="1y60br7rk1834izrsi74cnmw90klxdxgbwhlxcqsmvr3r1nblgwq"; depends=[biomaRt GenomicRanges IRanges Rsamtools S4Vectors]; }; - Repitools = derive2 { name="Repitools"; version="1.42.0"; sha256="1jasydq3wai7zxkgjph7fgy77i65qrsf520chaq474xf1j9hr9j8"; depends=[BiocGenerics Biostrings BSgenome cluster DNAcopy edgeR GenomeInfoDb GenomicAlignments GenomicRanges gplots gsmoothr IRanges MASS Ringo Rsamtools Rsolnp rtracklayer S4Vectors]; }; - ReportingTools = derive2 { name="ReportingTools"; version="2.36.0"; sha256="0r8cdqzfh1jxkghhk3j8x3y9kkmdyg9ibfhsic15jqkmp1im6khh"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category DESeq2 edgeR ggbio ggplot2 GOstats GSEABase hwriter IRanges knitr lattice limma PFAM_db R_utils XML]; }; - ResidualMatrix = derive2 { name="ResidualMatrix"; version="1.6.1"; sha256="1530706c7b53h9m8smgnaj63rgdbm3hd09n7jwy6zc0y6qcffckd"; depends=[DelayedArray Matrix S4Vectors]; }; - Rfastp = derive2 { name="Rfastp"; version="1.6.0"; sha256="06zzmdym2x72a99853qvh1a4snbmgysnmi6yckakdg6isizxm14p"; depends=[ggplot2 Rcpp reshape2 Rhtslib rjson zlibbioc]; }; - Rgin = derive2 { name="Rgin"; version="1.15.0"; sha256="1x5zj2d5rvsr2xh0ifpnrys9v91dal1xxhv5mmk16rs8wzwqpqba"; depends=[RcppEigen]; }; - Rgraphviz = derive2 { name="Rgraphviz"; version="2.40.0"; sha256="1r6ff7w2bmyfl1vzjvpgnhb8f5arwjlpab8fw5ph8fgyiqbcx94l"; depends=[graph]; }; - Rhdf5lib = derive2 { name="Rhdf5lib"; version="1.18.2"; sha256="1jpb8h7c724yz51zjfqs90bsqxgmy1rry2ra9qamsgqpr2j9764g"; depends=[]; }; - Rhisat2 = derive2 { name="Rhisat2"; version="1.12.0"; sha256="0hzair41l47kzykymd169a34pfhb98vrjgkgdf15m17csyz7pnv7"; depends=[GenomicFeatures GenomicRanges SGSeq]; }; - Rhtslib = derive2 { name="Rhtslib"; version="1.28.0"; sha256="07kws6afkxbmxq4w357mwwl712pdd16alvz7iqijjd2x7rjchj2f"; depends=[zlibbioc]; }; - RiboCrypt = derive2 { name="RiboCrypt"; version="1.2.0"; sha256="071y96ilsb9l5jfdsyhjpm69aqz8v8hjis2izvqwvds4ia2j1mhh"; depends=[BiocGenerics BiocParallel Biostrings data_table dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges ORFik plotly rlang]; }; - RiboDiPA = derive2 { name="RiboDiPA"; version="1.4.1"; sha256="1qr7505kvgabxmr5mp4smvz0x7pwp6n64s60iynsz08r2p3cf77c"; depends=[BiocFileCache BiocGenerics data_table DESeq2 doParallel elitism foreach GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges matrixStats qvalue Rcpp reldist Rsamtools S4Vectors]; }; - RiboProfiling = derive2 { name="RiboProfiling"; version="1.26.0"; sha256="08m4rc530bkzcc43iwzg2fw9cjlf4wc2d8akv5vblsb42xdn8sqp"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr reshape2 Rsamtools rtracklayer S4Vectors sqldf]; }; - Ringo = derive2 { name="Ringo"; version="1.60.0"; sha256="1znmxzp1g1jim5za2gi7mk0r2ac4q3wd609xncvq23s0jww0nzpc"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; }; - Risa = derive2 { name="Risa"; version="1.38.0"; sha256="0l3k04s0wh82bfhy561m2j7zj2ckx1rdgvlbdnbkx3qr6d905cj9"; depends=[affy Biobase biocViews Rcpp xcms]; }; - Rmagpie = derive2 { name="Rmagpie"; version="1.52.0"; sha256="1i9cs3jxg9izskq2n2f4n5k9dkivnm64knmzgmdl9xhsqdabih2v"; depends=[Biobase e1071 kernlab pamr]; }; - Rmmquant = derive2 { name="Rmmquant"; version="1.14.0"; sha256="1s2sb2f4kc20anmhcrgy988yam1iyk383ia7mci0gb32dsblrpfk"; depends=[BiocStyle DESeq2 devtools GenomicRanges org_Mm_eg_db Rcpp S4Vectors SummarizedExperiment TBX20BamSubset TxDb_Mmusculus_UCSC_mm9_knownGene]; }; - RnBeads = derive2 { name="RnBeads"; version="2.14.0"; sha256="1r5njn90893j3p0sz335w8xq0fkf6q7ai2w23qacnm2zfhh6k345"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr S4Vectors]; }; - RnaSeqSampleSize = derive2 { name="RnaSeqSampleSize"; version="2.6.0"; sha256="1v5bjdwzv0kram0q0cyghjn8cc2zd58qbbz6s8xa12avl0cbnxhn"; depends=[biomaRt dplyr edgeR ggplot2 ggpubr heatmap3 KEGGREST matlab Rcpp recount RnaSeqSampleSizeData SummarizedExperiment tidyr tidyselect]; }; - Rnits = derive2 { name="Rnits"; version="1.29.0"; sha256="0m6afic9p7synmngkn7zyf53saqnrmgydjbk41k0w814i46dcd6h"; depends=[affy Biobase boot ggplot2 impute limma qvalue reshape2]; }; - RolDE = derive2 { name="RolDE"; version="1.0.0"; sha256="0jynxvwrz8f40sj2iha3g25znv4z097hm3snhzm36bs0h7nvv8sq"; depends=[doParallel doRNG foreach matrixStats nlme qvalue rngtools ROTS SummarizedExperiment]; }; - RpsiXML = derive2 { name="RpsiXML"; version="2.38.0"; sha256="0x4nph4xss4piq4fgijjjj33yrqqfdbsgn9wvqy17nglvz5gi7bi"; depends=[annotate AnnotationDbi Biobase graph hypergraph RBGL XML]; }; - Rqc = derive2 { name="Rqc"; version="1.30.0"; sha256="11j8m69zdcmpjb3xzr4s8sqmv8aqgl8q7k81gnd09l3nyjzy0h1k"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings biovizBase GenomicAlignments GenomicFiles ggplot2 IRanges knitr markdown plyr Rcpp reshape2 Rsamtools S4Vectors shiny ShortRead]; }; - Rsamtools = derive2 { name="Rsamtools"; version="2.12.0"; sha256="1wll703if12qrn0d11ljwf7rqhs4lb27fzyyz1hqwvzn3v361s10"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges Rhtslib S4Vectors XVector zlibbioc]; }; - Rsubread = derive2 { name="Rsubread"; version="2.10.5"; sha256="0n9qqbkj2lgxkia6kfpfz06wbc1lvw24qyvn88f48zw5nh0rsrs2"; depends=[Matrix]; }; - Rtpca = derive2 { name="Rtpca"; version="1.6.0"; sha256="1cv0yj3j2cndyb0827raw3x7gi3li0nj2q0s71apj2bvl74y2h27"; depends=[Biobase dplyr fdrtool ggplot2 pROC tibble tidyr]; }; - Rtreemix = derive2 { name="Rtreemix"; version="1.58.0"; sha256="0n9pmmn0mzj6zi303zzkmcww8f23xydgvw6bz5cx7sswlqvsixvm"; depends=[Biobase graph Hmisc]; }; - S4Vectors = derive2 { name="S4Vectors"; version="0.34.0"; sha256="0j3ybhzdhlhw8527nks3mjja28asjya2n0m0rjkh4bw66rkfys4k"; depends=[BiocGenerics]; }; - SAIGEgds = derive2 { name="SAIGEgds"; version="1.10.0"; sha256="0qvwyaiqkgdi9aqhx7w3cv1rrap5c6zcnprac6lixp5ib9a5nc7i"; depends=[gdsfmt Rcpp RcppArmadillo RcppParallel SeqArray SPAtest]; }; - SANTA = derive2 { name="SANTA"; version="2.32.0"; sha256="0d501mb84a95n3r8zirrhkm6l7kl47rfkzcrag3cpmd2zl0nppq0"; depends=[igraph Matrix]; }; - SBGNview = derive2 { name="SBGNview"; version="1.10.0"; sha256="0d4phx2bc77cvvy7lkn2mvkwwy5mld73rpis8q88c85sda07yakl"; depends=[AnnotationDbi bookdown httr igraph KEGGREST knitr pathview Rdpack rmarkdown rsvg SBGNview_data SummarizedExperiment xml2]; }; - SBMLR = derive2 { name="SBMLR"; version="1.92.0"; sha256="05qs42b8ssxqlapcy9cn99hkgr3yak0bb97zbc548wp1yfhwmdqb"; depends=[deSolve XML]; }; - SC3 = derive2 { name="SC3"; version="1.24.0"; sha256="179x0x9zr5ffqhr33va3x7ph5r1mzhy1j9xdmmf8qga0jw80alz2"; depends=[BiocGenerics cluster doParallel doRNG e1071 foreach ggplot2 pheatmap Rcpp RcppArmadillo robustbase ROCR rrcov S4Vectors shiny SingleCellExperiment SummarizedExperiment WriteXLS]; }; - SCAN_UPC = derive2 { name="SCAN.UPC"; version="2.38.0"; sha256="0riz6fmq9rsdkpfwyzva15xrfhdpab42yn2zklv6663pwha64wjj"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; }; - SCANVIS = derive2 { name="SCANVIS"; version="1.10.0"; sha256="136kzmgpyn3jxnsc60x6x93zb5c65ji5221z89178yfvr7h48v17"; depends=[IRanges plotrix RCurl rtracklayer]; }; - SCATE = derive2 { name="SCATE"; version="1.6.0"; sha256="14zm5y3m03wxjd8fbl0hn5fvmyv5hlwcfh38hzzv68jfmhyyasfh"; depends=[GenomicAlignments GenomicRanges mclust preprocessCore Rtsne SCATEData splines2 xgboost]; }; - SCArray = derive2 { name="SCArray"; version="1.4.0"; sha256="1yd251b5wdgjg9g2xjj0b4h5bbfj9mhpsll5kzq5cmw31qz6q6b9"; depends=[BiocGenerics DelayedArray DelayedMatrixStats gdsfmt IRanges S4Vectors SingleCellExperiment SummarizedExperiment]; }; - SCBN = derive2 { name="SCBN"; version="1.14.0"; sha256="1hg2rwaag0vnh8wq2lwi62qjk13apdwhhbxnp93sry4h7gvkpxaa"; depends=[]; }; - SCFA = derive2 { name="SCFA"; version="1.6.0"; sha256="0kqwjhrjqj8q9zijajyyw7yy9dbzacard8imgc0p3p9iyssa9g9n"; depends=[BiocParallel cluster clusterCrit glmnet igraph keras Matrix matrixStats psych RhpcBLASctl survival tensorflow]; }; - SCOPE = derive2 { name="SCOPE"; version="1.8.0"; sha256="1vif96msq93j0rmz5ak898wbjbw6l649n0jhbd5jqjyg9h47rm8s"; depends=[BiocGenerics Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 DescTools DNAcopy doParallel foreach GenomeInfoDb GenomicRanges gplots IRanges RColorBrewer Rsamtools S4Vectors]; }; - SCnorm = derive2 { name="SCnorm"; version="1.18.0"; sha256="0bd1y7nakacc1hl6dn8g47wx1z132qpi459626szc2ahmi62bq5d"; depends=[BiocGenerics BiocParallel cluster data_table forcats ggplot2 moments quantreg S4Vectors SingleCellExperiment SummarizedExperiment]; }; - SDAMS = derive2 { name="SDAMS"; version="1.16.0"; sha256="1gqyzd3dmb3ba9ymjk4x9kbj10cx7iggbp3iv2a3nl2il7h3kkq1"; depends=[qvalue SummarizedExperiment trust]; }; - SELEX = derive2 { name="SELEX"; version="1.28.0"; sha256="0kf81k9r5rsihx7w5rh0hb7b6pwmn0qxikwy443q6j30m2b26rbw"; depends=[Biostrings rJava]; }; - SEPIRA = derive2 { name="SEPIRA"; version="1.16.0"; sha256="0dz7d0vvzg9ak2gs2pgciqabpjgqwhs236gfa48m71cy13khsdpz"; depends=[corpcor limma]; }; - SEtools = derive2 { name="SEtools"; version="1.10.0"; sha256="0s382ph3v3ynx5j90rzsh6ix9h8776m7dmn0pr8shc9gy5ixv54z"; depends=[BiocParallel data_table DESeq2 edgeR Matrix openxlsx S4Vectors sechm SummarizedExperiment sva]; }; - SGSeq = derive2 { name="SGSeq"; version="1.30.0"; sha256="0hz45367i70wl97silnimicdvs3g41zyf8syc6igz6471wbwkxwp"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer RUnit S4Vectors SummarizedExperiment]; }; - SIAMCAT = derive2 { name="SIAMCAT"; version="2.0.1"; sha256="05r9sv41l812hnz6dq2hzgk29y25raqqzn0mcw4lcqv6zlm60k0s"; depends=[beanplot corrplot glmnet gridBase gridExtra infotheo lgr LiblineaR lmerTest matrixStats mlr3 mlr3learners mlr3tuning paradox phyloseq pROC progress PRROC RColorBrewer scales stringr]; }; - SICtools = derive2 { name="SICtools"; version="1.26.0"; sha256="1vj5y3xysvf113f2iy2n10yzm3xy30m7g3brirydrj9vk73ssdcs"; depends=[Biostrings doParallel GenomicRanges IRanges matrixStats plyr Rsamtools stringr]; }; - SIM = derive2 { name="SIM"; version="1.66.0"; sha256="0kvayxf4h7l9410v0gafbg31xkc8xcl1cbilfgln4l5pv42wnrl4"; depends=[globaltest quantreg quantsmooth]; }; - SIMAT = derive2 { name="SIMAT"; version="1.28.0"; sha256="06f4py4gk2gqdas1gwz43by1m4k5b617l58a36rm294w9hvwi03b"; depends=[ggplot2 mzR Rcpp reshape2]; }; - SIMD = derive2 { name="SIMD"; version="1.14.0"; sha256="1sbqfrawrh2yndzwl0c0dlpsj5zy264r725r4awzzawnxac3c0k7"; depends=[edgeR methylMnM statmod]; }; - SIMLR = derive2 { name="SIMLR"; version="1.22.0"; sha256="1y26296n42w18ra9c35qfqlxgxk16hz051139g82ki9aydh6b0mm"; depends=[Matrix pracma Rcpp RcppAnnoy RSpectra]; }; - SISPA = derive2 { name="SISPA"; version="1.26.0"; sha256="17zljr5vr9zh5cwah6dya3nyzv1266wlfm558r8j1zccirahjvf7"; depends=[changepoint data_table genefilter ggplot2 GSVA plyr]; }; - SLqPCR = derive2 { name="SLqPCR"; version="1.62.0"; sha256="1336jfm13yhn1anzl7kjgqhvvk6gy8h0ikzi9iqrrm0sxhjyyb74"; depends=[]; }; - SMAD = derive2 { name="SMAD"; version="1.12.0"; sha256="1qwdwslb5sx07sgjafv7yd69isbn7sf60yisfry64bkc3h8rrmmb"; depends=[dplyr magrittr Rcpp RcppAlgos tidyr]; }; - SMAP = derive2 { name="SMAP"; version="1.60.0"; sha256="11c0br8kv93bzdn4y4xrkl6pkqdpn4zzyx31dqkq5bz4vvjfmz47"; depends=[]; }; - SMITE = derive2 { name="SMITE"; version="1.24.0"; sha256="0klqxzaypidfzgcxfa1lnrlsv08zkqwf5y82ldac7bpnnyr91z1b"; depends=[AnnotationDbi Biobase BioNet geneLenDataBase GenomicRanges ggplot2 goseq Hmisc igraph IRanges KEGGREST org_Hs_eg_db plyr reactome_db S4Vectors scales]; }; - SNAGEE = derive2 { name="SNAGEE"; version="1.36.0"; sha256="0zjn0qjyhpnfzabgi5rv1zhblfwz4rdldp7pa18zkayflhfhql5i"; depends=[SNAGEEdata]; }; - SNPRelate = derive2 { name="SNPRelate"; version="1.30.1"; sha256="1j3cz45g0bm48hqm6zm8zyfsmjb08cb7p52yw8r4jmld3jci33cr"; depends=[gdsfmt]; }; - SNPediaR = derive2 { name="SNPediaR"; version="1.22.0"; sha256="1qg1arrf9pv59hzmncmfhw9w2npk6mm068c6ghx527vja7g3lcxd"; depends=[jsonlite RCurl]; }; - SNPhood = derive2 { name="SNPhood"; version="1.26.0"; sha256="186qcscxgpjxc3c875yvnc75xv4dmmjpy7ci2glabw9sy5p2vz2a"; depends=[BiocGenerics BiocParallel Biostrings checkmate cluster data_table DESeq2 GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges lattice RColorBrewer reshape2 Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; }; - SOMNiBUS = derive2 { name="SOMNiBUS"; version="1.4.0"; sha256="0xjrn2anfsw6d48lb2kp1zxj2d4cn6gr6wb6cfllwxiwdq635lyc"; depends=[Matrix mgcv VGAM]; }; - SPEM = derive2 { name="SPEM"; version="1.36.0"; sha256="1nnyx7jaqz2cj7zmm4dfv5n9m4willwv411q0wiqsjbgm60j37ak"; depends=[Biobase Rsolnp]; }; - SPIA = derive2 { name="SPIA"; version="2.48.0"; sha256="1s6mx463xgy8hdifksb824brmrr07k38yksdrbk38v0zniyns97w"; depends=[KEGGgraph]; }; - SPLINTER = derive2 { name="SPLINTER"; version="1.22.0"; sha256="1kvin1kma85p4q3jasm0q631dalndq021r4wx4vls34mhglhrrzx"; depends=[biomaRt Biostrings BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 googleVis Gviz IRanges plyr S4Vectors seqLogo stringr]; }; - SPONGE = derive2 { name="SPONGE"; version="1.18.1"; sha256="071w946cdvc8x277893ji74l336j99j73k3cxawi64k39c1qqsnd"; depends=[Biobase biomaRt caret ComplexHeatmap cvms data_table doRNG dplyr expm foreach ggplot2 ggpubr ggridges glmnet gRbase igraph iterators logging MASS MetBrewer miRBaseConverter ppcor randomForest rlang stringr tidyr tidyverse tnet]; }; - SPOTlight = derive2 { name="SPOTlight"; version="1.0.0"; sha256="1h6w02ya3fcg13rb0phzfx6qdw4mhbgsq6jai1h2jab8whcggfpn"; depends=[ggplot2 Matrix matrixStats NMF nnls SingleCellExperiment]; }; - SPsimSeq = derive2 { name="SPsimSeq"; version="1.6.0"; sha256="11symjnpyp6yb26071gnzgp3immhjyyzirwb6j7gnh8hmgzmcpz9"; depends=[edgeR fitdistrplus Hmisc limma mvtnorm phyloseq SingleCellExperiment WGCNA]; }; - SQLDataFrame = derive2 { name="SQLDataFrame"; version="1.10.3"; sha256="0fxl2if1bnw79md4lkz8lq51j7hi05bhf2k66605xwgfmz5q9lyf"; depends=[BiocGenerics DBI dbplyr dplyr lazyeval RSQLite S4Vectors tibble]; }; - SQUADD = derive2 { name="SQUADD"; version="1.46.0"; sha256="13g381j3xbzdh6xwmgf3d1jsr39zd523q1kldpw3cmp01asykcwm"; depends=[RColorBrewer]; }; - SRAdb = derive2 { name="SRAdb"; version="1.58.1"; sha256="11590a9zayqy4h1f9mfq9mdfj0d4i3amlb4q5vpc5ibir7l9a4bk"; depends=[GEOquery graph RCurl RSQLite]; }; - STAN = derive2 { name="STAN"; version="2.24.0"; sha256="18qa8fa6n9n965h0rwbsyfd14snh2n96rwfi1l1dg7wdrksyr8wx"; depends=[BiocGenerics GenomeInfoDb GenomicRanges Gviz IRanges poilog Rsolnp S4Vectors]; }; - STATegRa = derive2 { name="STATegRa"; version="1.32.0"; sha256="157jm77mh12p5wdik1xm00p8r7x692gw5sb2dphkjf6fkc53sxk0"; depends=[affy Biobase calibrate edgeR foreach ggplot2 gplots gridExtra limma MASS]; }; - STRINGdb = derive2 { name="STRINGdb"; version="2.8.4"; sha256="1jn6080v6097zpqsr4gfbx31gqqdhpzjrk63avk3v3xwawmf2379"; depends=[gplots hash igraph plotrix plyr png RColorBrewer RCurl sqldf]; }; - STROMA4 = derive2 { name="STROMA4"; version="1.20.0"; sha256="14qz7napk9kmga7gvhp34zh0kdkwzqx57q79famz1lyanzvibcij"; depends=[Biobase BiocParallel cluster matrixStats]; }; - STdeconvolve = derive2 { name="STdeconvolve"; version="1.0.0"; sha256="092gsmnp70wqpw21yxicpm29qwp27zxz60d026i6mfszhd48abxx"; depends=[BiocParallel clue ggplot2 liger Matrix mgcv reshape2 scatterpie slam topicmodels viridis]; }; - SWATH2stats = derive2 { name="SWATH2stats"; version="1.26.0"; sha256="0n6ap58lbn3rbaqb50244byam2fc62q85zl2a5bws5bsfccnvzk3"; depends=[biomaRt data_table ggplot2 reshape2]; }; - SamSPECTRAL = derive2 { name="SamSPECTRAL"; version="1.50.0"; sha256="0p4a9f4aa714jn1z4r9177jqin11qi3ln3pdjb0vblcj435yhpdm"; depends=[]; }; - Scale4C = derive2 { name="Scale4C"; version="1.18.0"; sha256="0n63sp8jalm8il1vyl1ls9cbbzs3jb227kq6rdw436mmnk5d7hik"; depends=[GenomicRanges IRanges smoothie SummarizedExperiment]; }; - ScaledMatrix = derive2 { name="ScaledMatrix"; version="1.4.1"; sha256="05gxr41nb1jqhv357rfha4062kszvrmkr36mhkjsf7kgnzf0p8hz"; depends=[DelayedArray Matrix S4Vectors]; }; - Sconify = derive2 { name="Sconify"; version="1.16.0"; sha256="0nm6z5dmnqd1bw1xpw7ljjlrbccqjmpcb1ds83yjy5wc9i0m2jdb"; depends=[dplyr flowCore FNN ggplot2 magrittr readr Rtsne tibble]; }; - SemDist = derive2 { name="SemDist"; version="1.30.0"; sha256="01pjcxhbyhbdcfw8jrjq04n4xi659ah3mx176rf0x7dll732y161"; depends=[annotate AnnotationDbi GO_db]; }; - SeqArray = derive2 { name="SeqArray"; version="1.36.3"; sha256="0b1zcays48s23k3z7p0k7l6sb89a8zn73xpdg38hbna016g92wjx"; depends=[Biostrings gdsfmt GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; - SeqGSEA = derive2 { name="SeqGSEA"; version="1.36.0"; sha256="0jpj0hksbbgzfr0k5f4zwm2ivdwrm00mcz8n8q0m35k44bj311b0"; depends=[Biobase biomaRt DESeq2 doParallel]; }; - SeqGate = derive2 { name="SeqGate"; version="1.6.0"; sha256="0fa5spf66d1x0747ikgk822mpcjbvb0y4slmq636njxgi6n739wk"; depends=[BiocManager GenomicRanges S4Vectors SummarizedExperiment]; }; - SeqSQC = derive2 { name="SeqSQC"; version="1.18.0"; sha256="1687klbjypwhd6qg7s965s7n47wf0kyfsn734wg27zv6mvfhck9r"; depends=[e1071 ExperimentHub gdsfmt GenomicRanges GGally ggplot2 IRanges rbokeh RColorBrewer reshape2 rmarkdown S4Vectors SNPRelate]; }; - SeqVarTools = derive2 { name="SeqVarTools"; version="1.34.0"; sha256="1giabkg0q9fyqqm1fqw05h6dhvs58w3x1d8jp7xddh5dqisk4b3a"; depends=[Biobase BiocGenerics data_table gdsfmt GenomicRanges GWASExactHW IRanges logistf Matrix S4Vectors SeqArray]; }; - SharedObject = derive2 { name="SharedObject"; version="1.10.0"; sha256="0z33jp0vlx2d9wn8zi28hd5ilzp1rql5zvylx1vm71bfsjpy7nlc"; depends=[BH BiocGenerics Rcpp]; }; - ShortRead = derive2 { name="ShortRead"; version="1.54.0"; sha256="0303198b4v2wjah9kc829kn01030996l6di4jpf8q5ccd212rjhq"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rhtslib Rsamtools S4Vectors XVector zlibbioc]; }; - SigCheck = derive2 { name="SigCheck"; version="2.28.0"; sha256="0xagj5zfm25d8ld497pvbx23pwbds1pkg68zlk908zwhy7g26512"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; }; - SigFuge = derive2 { name="SigFuge"; version="1.34.0"; sha256="1kqpkl6b742z9jldnxkji7ng4w9yaj76s86njkw94qyzrvkn6xcg"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; }; - SigsPack = derive2 { name="SigsPack"; version="1.10.0"; sha256="1c3xnk90gy60jzjgydg0vr1xmlcad4dkk45skyh42abzqxlwj5yd"; depends=[Biobase Biostrings BSgenome GenomeInfoDb GenomicRanges quadprog rtracklayer SummarizedExperiment VariantAnnotation]; }; - SimBindProfiles = derive2 { name="SimBindProfiles"; version="1.34.0"; sha256="1ndim53fhx0naj1r5zwq4d655nbdvclfi40m3fqg891hzz370sd6"; depends=[Biobase limma mclust Ringo]; }; - SimFFPE = derive2 { name="SimFFPE"; version="1.8.0"; sha256="0i2ah49bajhjf0yjjhm84vpc8brs8y3c016l4sbwhpb2nhcqgvgj"; depends=[Biostrings doParallel dplyr foreach GenomicRanges IRanges Rsamtools truncnorm]; }; - SingleCellExperiment = derive2 { name="SingleCellExperiment"; version="1.18.1"; sha256="13iq480xbgqriyjrlknamym1wspdh54i9jahgvk726ksfzf19vx0"; depends=[BiocGenerics DelayedArray GenomicRanges S4Vectors SummarizedExperiment]; }; - SingleCellSignalR = derive2 { name="SingleCellSignalR"; version="1.8.0"; sha256="0c0fsr1b0mc5a7qfa7cjipx50fscb120747c9xjp5n55jv5hwd9c"; depends=[BiocManager circlize data_table edgeR foreach gplots igraph limma multtest pheatmap Rtsne scran SIMLR stringr]; }; - SingleMoleculeFootprinting = derive2 { name="SingleMoleculeFootprinting"; version="1.4.0"; sha256="0kayi1cahn57ysdhykk4h3a93ajnr41p7xbf1v04mvbz9gq9piqf"; depends=[BiocGenerics Biostrings BSgenome data_table GenomeInfoDb GenomicRanges IRanges plyr QuasR RColorBrewer]; }; - SingleR = derive2 { name="SingleR"; version="1.10.0"; sha256="0qbyc6ygw2xv3li9187i3axsw6ihwpa7pkvxvy9cagv7xck45c5y"; depends=[beachmat BiocNeighbors BiocParallel BiocSingular DelayedArray DelayedMatrixStats Matrix Rcpp S4Vectors SummarizedExperiment]; }; - SomaticSignatures = derive2 { name="SomaticSignatures"; version="2.32.0"; sha256="1ydnp54laznzpi08s403kxhnr5nqhvm3iilaxlcdlz0ngxhm6vx6"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; }; - SpacePAC = derive2 { name="SpacePAC"; version="1.34.0"; sha256="0i0bl55cbrhj9zvlvh3wbxgjaq5g1xvxdd6gpnj0barr5p8bx7x2"; depends=[iPAC]; }; - Spaniel = derive2 { name="Spaniel"; version="1.10.0"; sha256="19280ardr91mk0l60nxprq9405drwmnc4jlbrzx1lz6951k07zj0"; depends=[dplyr DropletUtils ggplot2 igraph jpeg jsonlite magrittr png S4Vectors scater scran Seurat shiny SingleCellExperiment SummarizedExperiment]; }; - SparseSignatures = derive2 { name="SparseSignatures"; version="2.6.0"; sha256="1ks4279slgyn2fnwmafgcmmhq69fx6jpvafjahpvnvh6jlf9dxy9"; depends=[Biostrings BSgenome data_table GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges NMF nnlasso nnls reshape2]; }; - SpatialCPie = derive2 { name="SpatialCPie"; version="1.12.0"; sha256="06axh7wnf19hs7y6skik2yff3xyd06y4x9jrx1996hjliyhdv88v"; depends=[colorspace data_table digest dplyr ggforce ggiraph ggplot2 ggrepel igraph lpSolve purrr readr rlang shiny shinycssloaders shinyjs shinyWidgets SummarizedExperiment tibble tidyr tidyselect zeallot]; }; - SpatialDecon = derive2 { name="SpatialDecon"; version="1.6.0"; sha256="12fyzsrgz76wndxk59p8aknxvj62g4b9k21hla4m2zj1cav46lhc"; depends=[Biobase GeomxTools Matrix repmis SeuratObject]; }; - SpatialExperiment = derive2 { name="SpatialExperiment"; version="1.6.1"; sha256="1ddsdh6c1hwyaqf664ih0midfgc6crh17g2kx2glnzl29vhidr9i"; depends=[BiocFileCache BiocGenerics DropletUtils magick rjson S4Vectors SingleCellExperiment SummarizedExperiment]; }; - SpeCond = derive2 { name="SpeCond"; version="1.50.0"; sha256="051p6npzjpwagd0bnzpbdjcmgkasr8d74a42ppmlc9hsfg8pzqcw"; depends=[Biobase fields hwriter mclust RColorBrewer]; }; - Spectra = derive2 { name="Spectra"; version="1.6.0"; sha256="0kzz7par5zwk4qypicmz39d6bc4aqmflzzxfrpng2y3id7f15jks"; depends=[BiocGenerics BiocParallel fs IRanges MsCoreUtils ProtGenerics S4Vectors]; }; - SpectralTAD = derive2 { name="SpectralTAD"; version="1.12.0"; sha256="0svv4mp6qk2k3clz8qdigzhawh4cglzwrb8frh5c6mgrgdbf53g5"; depends=[BiocParallel cluster dplyr GenomicRanges HiCcompare magrittr Matrix PRIMME]; }; - SpidermiR = derive2 { name="SpidermiR"; version="1.26.1"; sha256="0zwnl1pyclg994l8ikp13zlzh13daph113d8brg37cjmrvag4abm"; depends=[AnnotationDbi gdata httr igraph miRNAtap miRNAtap_db org_Hs_eg_db]; }; - SplicingFactory = derive2 { name="SplicingFactory"; version="1.4.0"; sha256="11kkr4c2ilwbr2h80aqiphxihwzs4sr23hq3q6w22w3wqqp7w24k"; depends=[SummarizedExperiment]; }; - SplicingGraphs = derive2 { name="SplicingGraphs"; version="1.36.0"; sha256="1c8m8ab5jrwa8fryrdww4r41svkv864l2pr1hy1kil3njyaam0ml"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; }; - StarBioTrek = derive2 { name="StarBioTrek"; version="1.22.0"; sha256="10wf96rn0d1srwkp980www7w5jjxzrq1li8d7n7069z3ja01p4ca"; depends=[AnnotationDbi e1071 ggplot2 graphite igraph MLmetrics reshape2 ROCR SpidermiR]; }; - Streamer = derive2 { name="Streamer"; version="1.42.0"; sha256="0v2cgi38blr8ydsnkyf50raqh7kcjzz0bpw27sl4ayprxbqg8nda"; depends=[BiocGenerics graph RBGL]; }; - Structstrings = derive2 { name="Structstrings"; version="1.12.0"; sha256="175g2wpsvmh8vj3pqv55mczhfzxip64rilynprywll9njk72ayb0"; depends=[BiocGenerics Biostrings crayon IRanges S4Vectors stringi stringr XVector]; }; - StructuralVariantAnnotation = derive2 { name="StructuralVariantAnnotation"; version="1.12.0"; sha256="0f3x74ic3blg8nm5xlv79k0n8j3fpl98mmhfanqfzmdl0g3j6wx6"; depends=[assertthat BiocGenerics Biostrings dplyr GenomeInfoDb GenomicFeatures GenomicRanges IRanges rlang rtracklayer S4Vectors stringr SummarizedExperiment VariantAnnotation]; }; - SubCellBarCode = derive2 { name="SubCellBarCode"; version="1.12.0"; sha256="1gj49s99sfcnvpd04h9y4mil1x4d4s33jadljfpwwavhqnbqbp0w"; depends=[AnnotationDbi caret e1071 ggplot2 ggrepel gridExtra networkD3 org_Hs_eg_db Rtsne scatterplot3d]; }; - SummarizedBenchmark = derive2 { name="SummarizedBenchmark"; version="2.14.0"; sha256="04w3mb5f3wj8n82fzhfvhaq986k1nfji8v4w7pnrbprizq6a5clf"; depends=[BiocGenerics BiocParallel crayon digest dplyr ggplot2 mclust rlang S4Vectors sessioninfo stringr SummarizedExperiment tibble tidyr UpSetR]; }; - SummarizedExperiment = derive2 { name="SummarizedExperiment"; version="1.26.1"; sha256="02vlqzmslyijs09jl0gdjxqjjnnl4yqbqqqlb4vb7nr0fspmyz39"; depends=[Biobase BiocGenerics DelayedArray GenomeInfoDb GenomicRanges IRanges Matrix MatrixGenerics S4Vectors]; }; - Summix = derive2 { name="Summix"; version="2.2.0"; sha256="08f7dr3ni2dkd55m7rgfc9s6xxn1na9xp9vpnmr3rcimp9w6lhwb"; depends=[nloptr]; }; - Sushi = derive2 { name="Sushi"; version="1.34.0"; sha256="0adswrbzd93rhy3q56ypwkrk6155vd4zxapvznswyjlxp8ha813q"; depends=[biomaRt zoo]; }; - SwathXtend = derive2 { name="SwathXtend"; version="2.18.0"; sha256="02lkh200pvzps2vp0i4fjm96zi1fy8x21kvd0sa599yks7vimzp4"; depends=[e1071 lattice openxlsx VennDiagram]; }; - SynExtend = derive2 { name="SynExtend"; version="1.8.0"; sha256="0z30izc2wnbbhv19xf5dnnls8j42v38771yv78im75li88zxl91m"; depends=[Biostrings DECIPHER IRanges S4Vectors]; }; - SynMut = derive2 { name="SynMut"; version="1.12.1"; sha256="0smrqh2gk1cy8aqqrfx7whwdcsn5s57w6crkah2v50p1q9xbvgjm"; depends=[BiocGenerics Biostrings seqinr stringr]; }; - TADCompare = derive2 { name="TADCompare"; version="1.6.0"; sha256="0ramji5pn5w7ch83slflsw1wxhy451zw99rkhzb4slvgqi8v7bk8"; depends=[cluster cowplot dplyr ggplot2 ggpubr HiCcompare magrittr Matrix PRIMME RColorBrewer reshape2 tidyr]; }; - TAPseq = derive2 { name="TAPseq"; version="1.8.0"; sha256="0ls9l12fp04j2asr25cbz6xs38y3znhgcphfglbc13li3aa77gx0"; depends=[BiocGenerics BiocParallel Biostrings BSgenome dplyr GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges S4Vectors tidyr]; }; - TBSignatureProfiler = derive2 { name="TBSignatureProfiler"; version="1.8.0"; sha256="1npcdr3grm6qq4lqan6z9czkiwyz74pi741jwahzr0q93ah25kks"; 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.36.0"; sha256="077gj5f1iwb3xwy29p5q5fr3459nq9swybn7504dyxb93259qxzi"; depends=[baySeq DESeq2 edgeR ROC]; }; - TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.24.3"; sha256="0visvfhzaf0p1rb5vjkmw1c91zfxpks8nl9nbl9xlnpm8lkmmkms"; 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.22.0"; sha256="1rav6nmbq8sn60x6cdc5zmvwwpiyfjc6n8hlzyjsg2yy3h3ij0qp"; 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.16.1"; sha256="0lsnqxv0zbx4b3dfm3x5bf7i88y9wpq39faff84lrqk4nz9v4svn"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicDataCommons GenomicFeatures GenomicRanges IRanges MultiAssayExperiment RaggedExperiment rvest S4Vectors stringr SummarizedExperiment xml2]; }; - TCseq = derive2 { name="TCseq"; version="1.20.0"; sha256="0wqkbvg41xbkfc0xs44ckpzagwyfmqrdr69fj7am51khzv7gznrk"; depends=[BiocGenerics cluster e1071 edgeR GenomicAlignments GenomicRanges ggplot2 IRanges locfit reshape2 Rsamtools SummarizedExperiment]; }; - TDARACNE = derive2 { name="TDARACNE"; version="1.46.0"; sha256="1ryrnaaq15sgji2j4js5vgsr2j7dl4dd0shmz7qayyq0k7ai2yaq"; depends=[Biobase Rgraphviz]; }; - TEKRABber = derive2 { name="TEKRABber"; version="1.0.1"; sha256="0pilrjrvd43jr8h6s2zcc6rk0p4q2l3bhz6lm344a7y5wyvccly6"; depends=[apeglm biomaRt DESeq2 Rcpp SCBN SummarizedExperiment]; }; - TEQC = derive2 { name="TEQC"; version="4.18.0"; sha256="1n0ifh86z4635x8hk4yv8n1ay35725i7y0n8j2gdp7si5y3nsfnv"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; }; - TFARM = derive2 { name="TFARM"; version="1.18.0"; sha256="0rmw7r6k8mb5672aap26liqblrmasxvccxd4fjw2sdb449wbd9dl"; depends=[arules fields GenomicRanges gplots stringr]; }; - TFBSTools = derive2 { name="TFBSTools"; version="1.34.0"; sha256="0l6j1r2cx7jfd39qzbyynk4jvzd81ys6yypzxjc97js4kkyrx29w"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome caTools CNEr DBI DirichletMultinomial GenomeInfoDb GenomicRanges gtools IRanges RSQLite rtracklayer S4Vectors seqLogo TFMPvalue XML XVector]; }; - TFEA_ChIP = derive2 { name="TFEA.ChIP"; version="1.16.0"; sha256="0ckc4azfd9li5qd07ylprmds8qyq78bf8blbqgrkrgig9jpzn92s"; depends=[biomaRt dplyr GenomicFeatures GenomicRanges IRanges org_Hs_eg_db R_utils]; }; - TFHAZ = derive2 { name="TFHAZ"; version="1.18.4"; sha256="07vfy39fa0nx685wj248q19h0733p773vhad893ds4ikbylmy6mg"; depends=[GenomicRanges IRanges ORFik S4Vectors]; }; - TFutils = derive2 { name="TFutils"; version="1.16.0"; sha256="1awzxj668ldh44fl0izvbm73cgm60rw93rfqfbhsflsx984rhzj9"; depends=[AnnotationDbi BiocFileCache dplyr DT GSEABase httr magrittr miniUI org_Hs_eg_db readxl rjson Rsamtools shiny]; }; - TIN = derive2 { name="TIN"; version="1.28.0"; sha256="1kgs45dif5fdmxlzhd6971mlhg0y1a41srnrx7irm4s4wckrpg4n"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; }; - TMixClust = derive2 { name="TMixClust"; version="1.18.0"; sha256="11ypr523hzbrynr1l68l7grn32499bl3j5wb7ic5i265r2kjcz4w"; depends=[Biobase BiocParallel cluster flexclust gss mvtnorm SPEM zoo]; }; - TNBC_CMS = derive2 { name="TNBC.CMS"; version="1.12.0"; sha256="12w43p3fpcn98h3p9brkc9fdsn0wn73bzyrz63gm43q1jw0zpizd"; depends=[e1071 forestplot GGally ggplot2 ggpubr GSVA pheatmap pracma quadprog R_utils RColorBrewer SummarizedExperiment survival]; }; - TOAST = derive2 { name="TOAST"; version="1.10.1"; sha256="08pqriz9x32ixkjajh2wlh1cb7y8xmxna7by2qm5pjrrzblq96bh"; depends=[corpcor doParallel EpiDISH GGally ggplot2 limma nnls quadprog SummarizedExperiment tidyr]; }; - TPP = derive2 { name="TPP"; version="3.24.0"; sha256="0w0gwhvc2mra0jd81pskhqsdayikz3fpbcx0sf45iac918dd2m4l"; 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.12.0"; sha256="1567r1v92skhlvjysh5v32h6c50grm8qm7wbwdvr52pjqc7kvfb4"; depends=[BiocParallel doParallel dplyr foreach ggplot2 limma MASS openxlsx RCurl stringr tidyr]; }; - TREG = derive2 { name="TREG"; version="1.0.1"; sha256="1d0ynkj1iiirigrzbnfclzcvvz1yx8c0ykqhz5vg8bhaw1h0ry3j"; depends=[Matrix purrr rafalib SummarizedExperiment]; }; - TRESS = derive2 { name="TRESS"; version="1.2.0"; sha256="17g37g8kbis42iv980002py225cxy0gvjfnjda760am387gb9hqm"; depends=[AnnotationDbi GenomicFeatures GenomicRanges IRanges Matrix matrixStats Rsamtools rtracklayer S4Vectors]; }; - TRONCO = derive2 { name="TRONCO"; version="2.28.0"; sha256="1ynf41bpc0v51sv6mig84n778kpfq0l9g50xff1bwz7zl1iab4al"; depends=[bnlearn circlize doParallel foreach gridExtra gtable gtools igraph iterators R_matlab RColorBrewer Rgraphviz scales xtable]; }; - TSCAN = derive2 { name="TSCAN"; version="1.34.0"; sha256="0a8f38jbb2lhqavqgbvm0d9xfy1cgjq4l7vs5h6kr45ij09wr6pm"; depends=[combinat DelayedArray fastICA ggplot2 gplots igraph Matrix mclust mgcv plyr S4Vectors shiny SingleCellExperiment SummarizedExperiment TrajectoryUtils]; }; - TTMap = derive2 { name="TTMap"; version="1.18.0"; sha256="01kj5snbf435d073xdh0pya2rmd1h3cxsagn0mqq5vvf46246258"; depends=[Biobase colorRamps rgl SummarizedExperiment]; }; - TVTB = derive2 { name="TVTB"; version="1.22.0"; sha256="006xyify2vy8jblzwi1hayn4yvvqpyz9is2z1z0lrcy7krhdmx8s"; depends=[AnnotationFilter BiocGenerics BiocParallel Biostrings ensembldb ensemblVEP GenomeInfoDb GenomicRanges GGally ggplot2 Gviz IRanges limma reshape2 Rsamtools S4Vectors SummarizedExperiment VariantAnnotation]; }; - TarSeqQC = derive2 { name="TarSeqQC"; version="1.25.1"; sha256="0g6zpbyn7ysvlply9sqbw3pw504nk5g342vv5n59czrr9nyymics"; depends=[BiocGenerics BiocParallel Biostrings cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 Hmisc IRanges openxlsx plyr reshape2 Rsamtools S4Vectors]; }; - TargetDecoy = derive2 { name="TargetDecoy"; version="1.2.0"; sha256="15z2nzaikgbp0y56v0cifbk2w1c1akgqb5d5zgbcbpih0kawhfjd"; depends=[ggplot2 ggpubr mzID mzR]; }; - TargetScore = derive2 { name="TargetScore"; version="1.34.0"; sha256="1yrcjdv5g3nx8m95wf1nilrmi1sppii4i4da19sm5ys4idl60213"; depends=[Matrix pracma]; }; - TargetSearch = derive2 { name="TargetSearch"; version="1.52.0"; sha256="0pgj9h5sfwgx1rrlxd9zrvmbj0z26jxmhdx6f2khbgk7i2c1hxpd"; depends=[assertthat ncdf4]; }; - TileDBArray = derive2 { name="TileDBArray"; version="1.6.0"; sha256="0n600170qabrswjch922skfsbwr7hnyxzmg015bxm5kfmwhab9pd"; depends=[DelayedArray Rcpp S4Vectors tiledb]; }; - TimeSeriesExperiment = derive2 { name="TimeSeriesExperiment"; version="1.13.0"; sha256="0bdpxxr739qdg92qabfx122k9f43vw2hyxp4yxqlbp37vzgcdf2c"; depends=[DESeq2 dplyr dynamicTreeCut edgeR ggplot2 Hmisc limma magrittr proxy S4Vectors SummarizedExperiment tibble tidyr vegan viridis]; }; - TimiRGeN = derive2 { name="TimiRGeN"; version="1.6.0"; sha256="1x8s0k938vfdadf6b33ha7ffvd2sn16scxii0wlzzm9s4v65vsvy"; depends=[biomaRt clusterProfiler dplyr FreqProf ggdendro gghighlight ggplot2 gplots gtools igraph Mfuzz MultiAssayExperiment RCy3 readxl reshape2 rWikiPathways scales stringr tidyr]; }; - TissueEnrich = derive2 { name="TissueEnrich"; version="1.16.0"; sha256="1l8qza4dmacp2rgx0z9nmya6jhidymx14wnz0vza0bm9409kaw41"; depends=[dplyr ensurer ggplot2 GSEABase SummarizedExperiment tidyr]; }; - TitanCNA = derive2 { name="TitanCNA"; version="1.34.0"; sha256="14mxskynm6rjh8c7nzkp06c7a3a5rlcj88s9c6brzgx7gm3k7j3x"; depends=[BiocGenerics data_table dplyr foreach GenomeInfoDb GenomicRanges IRanges VariantAnnotation]; }; - TnT = derive2 { name="TnT"; version="1.18.0"; sha256="01c4lhy9k2wiy7m7685qy4bj5q9bys7xqxfy9x3kpcn7by3dix83"; depends=[Biobase data_table GenomeInfoDb GenomicRanges htmlwidgets IRanges jsonlite knitr S4Vectors]; }; - ToxicoGx = derive2 { name="ToxicoGx"; version="2.0.0"; sha256="0d331md9cq2h44zq8wvj2167994i097drfgljhwj1nnfsx9agqn1"; depends=[assertthat Biobase BiocGenerics BiocParallel caTools CoreGx data_table downloader dplyr ggplot2 jsonlite limma magrittr reshape2 S4Vectors scales SummarizedExperiment tibble tidyr]; }; - TraRe = derive2 { name="TraRe"; version="1.4.0"; sha256="1vrafzf8qk6nnav1m4ym26n8f0nfbsxqnmymv9a7k8yfxry3jnn8"; depends=[BiocParallel dqrng ggplot2 glmnet gplots gtools hash igraph matrixStats pvclust R_utils SummarizedExperiment]; }; - TrajectoryGeometry = derive2 { name="TrajectoryGeometry"; version="1.4.0"; sha256="13dxsk2dq5bsf9bwq4618kr6wsbmvzqnqh8i8zqrx4i818wd571s"; depends=[ggplot2 pracma rgl]; }; - TrajectoryUtils = derive2 { name="TrajectoryUtils"; version="1.4.0"; sha256="07hcr3zplxlzlwc13wh9006m5kaqm57cm1b2x74bpp857f2q93dj"; depends=[igraph Matrix S4Vectors SingleCellExperiment SummarizedExperiment]; }; - TransView = derive2 { name="TransView"; version="1.40.0"; sha256="1k3fs0wxh2m2mp7i6hqnpgf60jikgjn7cdv2mmnz77ignp37xr4f"; depends=[BiocGenerics GenomicRanges gplots IRanges Rhtslib S4Vectors zlibbioc]; }; - Travel = derive2 { name="Travel"; version="1.4.0"; sha256="1k3wv2a38cfmyxci8pi8i6vqj0q3prqdh1hid2sa40slapk6h30z"; depends=[Rcpp]; }; - TreeAndLeaf = derive2 { name="TreeAndLeaf"; version="1.8.0"; sha256="0wxgwcf2g2siz3kv19an1qv45xap8cdi4gblc9kssg0pjbxyhqnh"; depends=[ape igraph RedeR]; }; - TreeSummarizedExperiment = derive2 { name="TreeSummarizedExperiment"; version="2.4.0"; sha256="0bqqnx89bcknlrpxm5n3wbmfw99gfrpaxi5n6fv4pmqyrd0rwcx7"; depends=[ape BiocGenerics BiocParallel Biostrings dplyr IRanges rlang S4Vectors SingleCellExperiment SummarizedExperiment treeio]; }; - Trendy = derive2 { name="Trendy"; version="1.18.0"; sha256="06rjim93kqrf7l2m16vgi567fi9cdblgbf9khnmmbg73kaa346zz"; depends=[BiocParallel DT gplots magrittr S4Vectors segmented shiny shinyFiles SummarizedExperiment]; }; - TurboNorm = derive2 { name="TurboNorm"; version="1.44.0"; sha256="00rggbdsk7xprkry8bi17mf143kqgw63cb315d9dc1qrc9vyz568"; depends=[affy convert lattice limma marray]; }; - TypeInfo = derive2 { name="TypeInfo"; version="1.62.0"; sha256="17cj4yd6lpckidzh5f3jb3vbwyimlnmsb3v5as4f91h2vnymwpax"; depends=[]; }; - UCell = derive2 { name="UCell"; version="2.0.1"; sha256="08wh5fch4sb1ijjz8rr8jkz3vvskb7k7948fd2b7bb104qmyhv41"; depends=[BiocParallel data_table Matrix SingleCellExperiment SummarizedExperiment]; }; - UMI4Cats = derive2 { name="UMI4Cats"; version="1.6.0"; sha256="0216qwriwjm0m7rzq8qjrvhnmn0fyqsv13cx24is53wqkqbqnavm"; depends=[annotate BiocFileCache BiocGenerics Biostrings BSgenome cowplot DESeq2 dplyr fda GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges magick magrittr org_Hs_eg_db R_utils rappdirs Rbowtie2 RColorBrewer regioneR reshape2 rlang Rsamtools S4Vectors scales ShortRead stringr SummarizedExperiment TxDb_Hsapiens_UCSC_hg19_knownGene zoo]; }; - UNDO = derive2 { name="UNDO"; version="1.38.0"; sha256="0fasad2y0cnrdlfarqxlmgn30hjfqksddnvq5yia3ps50wzj7xyr"; depends=[Biobase BiocGenerics boot MASS nnls]; }; - Ularcirc = derive2 { name="Ularcirc"; version="1.14.0"; sha256="0pqinw35vd94gk78i45rdyl4gyp6q8dmzc5kz72mcfg702wh7g8h"; depends=[AnnotationDbi AnnotationHub BiocGenerics Biostrings BSgenome data_table DT GenomeInfoDb GenomeInfoDbData GenomicAlignments GenomicFeatures GenomicRanges ggplot2 ggrepel gsubfn mirbase_db moments Organism_dplyr plotgardener R_utils S4Vectors shiny shinydashboard shinyFiles shinyjs yaml]; }; - UniProt_ws = derive2 { name="UniProt.ws"; version="2.36.5"; sha256="1q5wdfww4pdsqyxjvv2dw88b3kwddvj94p17yxbnnrs4ra6jcfdn"; depends=[AnnotationDbi BiocFileCache BiocGenerics cellxgenedp httpcache httr jsonlite progress RSQLite]; }; - Uniquorn = derive2 { name="Uniquorn"; version="2.16.0"; sha256="0hf2gs0aw0jw9qw1bqhsvxvw5grppbi3wxbfiynkbvza11aglifw"; depends=[doParallel foreach GenomicRanges IRanges R_utils stringr VariantAnnotation WriteXLS]; }; - VAExprs = derive2 { name="VAExprs"; version="1.2.1"; sha256="19jhjayyaga1lyswhbibgva32mdmfvkdidcvxgl22728c6ppkg61"; depends=[CatEncoders DeepPINCS DiagrammeR keras mclust purrr scater SingleCellExperiment SummarizedExperiment tensorflow]; }; - VCFArray = derive2 { name="VCFArray"; version="1.12.0"; sha256="17zgwv8nc192jyzlym09zyqppbg6zlid60xzh921mvp41sprf2j9"; depends=[BiocGenerics DelayedArray GenomicFiles GenomicRanges Rsamtools S4Vectors VariantAnnotation]; }; - VERSO = derive2 { name="VERSO"; version="1.6.0"; sha256="13s91s03l15sha9sqcwazhhzph7s7ivbijlq1cz6c04x54bsdncn"; depends=[ape Rfast]; }; - VaSP = derive2 { name="VaSP"; version="1.8.0"; sha256="10fvdlxj4flv4zssaprhzg76l0jlin015pha7dmvfmjda4xm2zrl"; depends=[ballgown cluster GenomeInfoDb GenomicAlignments GenomicRanges IRanges matrixStats Rsamtools S4Vectors]; }; - VanillaICE = derive2 { name="VanillaICE"; version="1.58.0"; sha256="1m3fi8snnf5rklhnwj2wndk86ry27anpa9pkk43v35qx5cvm1q9p"; depends=[Biobase BiocGenerics BSgenome_Hsapiens_UCSC_hg18 crlmm data_table foreach GenomeInfoDb GenomicRanges IRanges lattice MatrixGenerics matrixStats oligoClasses S4Vectors SummarizedExperiment]; }; - VarCon = derive2 { name="VarCon"; version="1.4.0"; sha256="0l0vgs2hmykkxp2s14pzwjzg3xbhcj5md3hfz85n0cn4j8qgf4hz"; depends=[Biostrings BSgenome GenomicRanges ggplot2 IRanges shiny shinycssloaders shinyFiles]; }; - VariantAnnotation = derive2 { name="VariantAnnotation"; version="1.42.1"; sha256="12d5hkx6pby6l2asyg4jp4jb2x17ybwhqd55rl64h37mwcndbdg1"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges MatrixGenerics Rhtslib Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; }; - VariantExperiment = derive2 { name="VariantExperiment"; version="1.10.0"; sha256="17xrlmr25iilrnmsicf42qc7alh8qfqg6v7sd5mpw4lzwxim1mqv"; depends=[Biostrings DelayedArray DelayedDataFrame GDSArray gdsfmt GenomicRanges IRanges S4Vectors SeqArray SeqVarTools SNPRelate SummarizedExperiment]; }; - VariantFiltering = derive2 { name="VariantFiltering"; version="1.32.0"; sha256="1bjqn8qik221x0bqvgd99p87v45iihwp6cxckh4ks964pd0c1xk8"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicFeatures GenomicRanges GenomicScores graph Gviz IRanges RBGL Rsamtools S4Vectors shiny shinyjs shinythemes shinyTree SummarizedExperiment VariantAnnotation XVector]; }; - VariantTools = derive2 { name="VariantTools"; version="1.38.0"; sha256="18nxcamfgnw4n2ab0czxglw0sqc9wzdqzpjv43lcyyal23lzzsix"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; - VegaMC = derive2 { name="VegaMC"; version="3.34.0"; sha256="172sa4zy4azyq50gxz9p4w23ac2xczwbq3nyp95q9zw9q6k7zcsk"; depends=[Biobase biomaRt]; }; - VennDetail = derive2 { name="VennDetail"; version="1.12.0"; sha256="0z98xhc636c291n76x9zxfcplgd3gc83fdvfbm8hjsmbp0fwca83"; depends=[dplyr futile_logger ggplot2 magrittr purrr tibble UpSetR VennDiagram]; }; - ViSEAGO = derive2 { name="ViSEAGO"; version="1.10.0"; sha256="0s5x81cd7az9bx74rpfqy1lcf4p494mcj5bgvb0ky7fgnfcn6b6d"; 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.6.0"; sha256="0k2gg4kjkhlha95yxknp16sj6idz7jsqimna7grcfabclqilypms"; depends=[cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges magrittr RColorBrewer reshape2 Rsamtools S4Vectors zoo]; }; - Wrench = derive2 { name="Wrench"; version="1.14.0"; sha256="1zx65s4m71wj85s2sq8ip54pq12r4sxfv8b2rxc41gfc5aj0zzca"; depends=[limma locfit matrixStats]; }; - XDE = derive2 { name="XDE"; version="2.42.0"; sha256="02nvrkj2pjc8jv57zilmx39bn9vxpj95f68gvf3sp6g3gffblv0d"; depends=[Biobase BiocGenerics genefilter GeneMeta gtools mvtnorm RColorBrewer siggenes]; }; - XINA = derive2 { name="XINA"; version="1.14.0"; sha256="03gf7mqpnwx12kny9fsaskgrw83b0wi2cf1j4dbq46pfxjx34v1g"; depends=[alluvial ggplot2 gridExtra igraph mclust plyr STRINGdb]; }; - XNAString = derive2 { name="XNAString"; version="1.4.0"; sha256="07y0n21i83izlnavwbxlhmrsa074k73d9p2cl19bj704sylw0g1j"; depends=[Biostrings BSgenome data_table formattable future_apply GenomicRanges IRanges Rcpp S4Vectors stringi stringr]; }; - XVector = derive2 { name="XVector"; version="0.36.0"; sha256="1f3sbqy279gb9k13l73j00ixywa1havlqy81zx766r1xkz15nvhk"; depends=[BiocGenerics IRanges S4Vectors zlibbioc]; }; - Xeva = derive2 { name="Xeva"; version="1.12.0"; sha256="1ajgaf00bik6dfk3zj0m211g38lxqdg99r99rz1n21nms6a4qzia"; depends=[BBmisc Biobase ComplexHeatmap doParallel downloader ggplot2 nlme PharmacoGx Rmisc scales]; }; - YAPSA = derive2 { name="YAPSA"; version="1.22.0"; sha256="1klqfif4sadkxw7agywk2ncvcdqsnfb1d6adnacdfdasr8abvhid"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 circlize ComplexHeatmap corrplot dendextend doParallel dplyr GenomeInfoDb GenomicRanges GetoptLong ggbeeswarm ggplot2 gridExtra gtrellis KEGGREST limSolve magrittr PMCMRplus pracma reshape2 SomaticSignatures VariantAnnotation]; }; - a4 = derive2 { name="a4"; version="1.44.0"; sha256="1zs8fs6mdd7fhsmx4k824mid0jk400cm6dwfhl8z5lg85y8y2n0r"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; }; - a4Base = derive2 { name="a4Base"; version="1.44.0"; sha256="15zqirz16gpks9f5d3d76h85b936za2jih74vfr55l5arqrrvvsn"; depends=[a4Core a4Preproc annaffy Biobase genefilter glmnet gplots limma mpm multtest]; }; - a4Classif = derive2 { name="a4Classif"; version="1.44.0"; sha256="1v61vgpqrf7bhk44n2gkxb8dm5d0rr8c9rd6fdcjs50nhij0lbiw"; depends=[a4Core a4Preproc Biobase glmnet pamr ROCR varSelRF]; }; - a4Core = derive2 { name="a4Core"; version="1.44.0"; sha256="1ky1lphq6bqxj6h12pg06cvs451fziqam8gd56wmpk6r5pbg4390"; depends=[Biobase glmnet]; }; - a4Preproc = derive2 { name="a4Preproc"; version="1.44.0"; sha256="098yzy7x5536bj76iavismdsdn7x6x07aw0j3knj6i9www9y8yz9"; depends=[Biobase BiocGenerics]; }; - a4Reporting = derive2 { name="a4Reporting"; version="1.44.0"; sha256="03sypayh187gqc6hykkqr1g0vb3zxc2c3xyp00jfbn12b35acnb0"; depends=[xtable]; }; - aCGH = derive2 { name="aCGH"; version="1.74.0"; sha256="00ni0kwy68v33ggfi8g5vffirhmbhaxg4l54hcqhx75m535z1x7d"; depends=[Biobase cluster multtest survival]; }; - abseqR = derive2 { name="abseqR"; version="1.14.0"; sha256="0jh3rj6ag07vpw6fymqm6m4jkrm9mgf50zkjncahxdf52mna8a9b"; depends=[BiocParallel BiocStyle circlize flexdashboard ggcorrplot ggdendro ggplot2 gridExtra knitr plotly plyr png RColorBrewer reshape2 rmarkdown stringr vegan VennDiagram]; }; - acde = derive2 { name="acde"; version="1.26.0"; sha256="0lgq546y4qklfzbc6fjr3d656hn76p6dn4694qfiafql2nlsjbj2"; depends=[boot]; }; - adSplit = derive2 { name="adSplit"; version="1.66.0"; sha256="1wl2gd0b7krf485clw67cxayp0g9argklkzn8nw1vrkil0vvr4jm"; depends=[AnnotationDbi Biobase cluster GO_db KEGGREST multtest]; }; - adductomicsR = derive2 { name="adductomicsR"; version="1.12.0"; sha256="0623qf06xgdsyz0in2wnxwvpdw8kj6cnwf8vlqmgp7g0n3w701ys"; depends=[adductData ade4 AnnotationHub bootstrap data_table doSNOW dplyr DT ExperimentHub fastcluster foreach fpc mzR OrgMassSpecR pastecs pracma RcppEigen reshape2 rvest smoother zoo]; }; - affxparser = derive2 { name="affxparser"; version="1.68.1"; sha256="16x92gwsy7zdyz4md4cw847xn2ymqd6gqsn0rlr2nnf3qmnjnils"; depends=[]; }; - affy = derive2 { name="affy"; version="1.74.0"; sha256="02l77y4d4m4jwgkb3jdaskv6shmba5292whp0i29mg9asxv4rdc7"; depends=[affyio Biobase BiocGenerics BiocManager preprocessCore zlibbioc]; }; - affyContam = derive2 { name="affyContam"; version="1.54.0"; sha256="1pyd4rj6pp139kvhh97whi4afvx029w5lglr4mnscw7m3f618v0p"; depends=[affy affydata Biobase]; }; - affyILM = derive2 { name="affyILM"; version="1.48.0"; sha256="1rk68bhz2pyca4saiwd0kcw7sh2gs6d4c482jj4kx9r216mpb4q6"; depends=[affxparser affy Biobase gcrma]; }; - affyPLM = derive2 { name="affyPLM"; version="1.72.0"; sha256="1m3n5mvpg9g46rrglhdh94pppf71xp344yrcnw1i60vwv41vhbck"; depends=[affy Biobase BiocGenerics gcrma preprocessCore zlibbioc]; }; - affycomp = derive2 { name="affycomp"; version="1.72.0"; sha256="0aq5p56sqpvba0yhgd75302s9bazchh1izgymng6cpb78y5wfpj0"; depends=[Biobase]; }; - affycoretools = derive2 { name="affycoretools"; version="1.68.1"; sha256="05x64hy5jpmg973biwq4q9gzy1n0iqc0pxrix1f6bri1w6vil3ww"; depends=[affy AnnotationDbi Biobase BiocGenerics DBI edgeR gcrma ggplot2 Glimma GOstats gplots hwriter lattice limma oligoClasses ReportingTools RSQLite S4Vectors xtable]; }; - affyio = derive2 { name="affyio"; version="1.66.0"; sha256="19cw82qvzkz6vh2gm302y7digsf6xif7c9l2q9s6lkx2yflqpgfp"; depends=[zlibbioc]; }; - affylmGUI = derive2 { name="affylmGUI"; version="1.70.0"; sha256="0ic8cmssjpjkblrblfdpqqcaxn1izxk1hmcfdk1sphm7wfiw8l2n"; depends=[affy affyio affyPLM AnnotationDbi BiocGenerics BiocManager gcrma limma R2HTML tkrplot xtable]; }; - aggregateBioVar = derive2 { name="aggregateBioVar"; version="1.6.0"; sha256="0ngg12bgr95m4wm12scmrb55dgy4909c6qrg169l6dkng99v4nx1"; depends=[Matrix rlang S4Vectors SingleCellExperiment SummarizedExperiment tibble]; }; - agilp = derive2 { name="agilp"; version="3.28.0"; sha256="1pm329y2nfcnx98ggxq0prdd5pxfcl5iylvsjjnhw5lyz1awg1yf"; depends=[]; }; - airpart = derive2 { name="airpart"; version="1.4.0"; sha256="0ljankgvgf8rby4z340wxx8v7acs9yz955p3a40jl6y8rz1svc06"; depends=[apeglm clue ComplexHeatmap dplyr dynamicTreeCut emdbook forestplot ggplot2 lpSolve matrixStats mclust pbapply plyr RColorBrewer rlang S4Vectors scater SingleCellExperiment smurf SummarizedExperiment]; }; - alevinQC = derive2 { name="alevinQC"; version="1.12.1"; sha256="0g75qnz7ah0widdjn99lhvnacz38vgl9j86n65wyswsf413hz3bb"; depends=[cowplot dplyr DT GGally ggplot2 Rcpp rjson rlang rmarkdown shiny shinydashboard tximport]; }; - alpine = derive2 { name="alpine"; version="1.22.0"; sha256="1nl1hxwakh5m9rqm3ksn2jzknsj9xnwl51bmc30knknm4q35wdv9"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph IRanges RBGL Rsamtools S4Vectors speedglm stringr SummarizedExperiment]; }; - altcdfenvs = derive2 { name="altcdfenvs"; version="2.58.0"; sha256="0caw9h0gw3qfrg4iqrydjdbagm059if513qjp1869cb0cq1w45r6"; depends=[affy Biobase BiocGenerics Biostrings hypergraph makecdfenv S4Vectors]; }; - amplican = derive2 { name="amplican"; version="1.18.0"; sha256="0q1c0g93xl0s2i6b1g21s11dngh7fbz63sn48yfiasvpxxlbag5q"; 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.12.0"; sha256="144949zlamwh0ykkw2n0qr019cn5pml95s3g59k5xkb85q6wykqc"; 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.68.0"; sha256="1fbqknwbl4534h66xrhcryg9pavm9fkja47gqbsxf8bd5yhk5mgq"; depends=[AnnotationDbi Biobase BiocManager DBI GO_db]; }; - annmap = derive2 { name="annmap"; version="1.38.0"; sha256="0ywqbb8jia7rrkzcsf6a11kqf8dnx96z8n8xw7067mahycykbixv"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; }; - annotate = derive2 { name="annotate"; version="1.74.0"; sha256="0x6vddpiw2g713vicf70198x8dlrwf36p8jjygdsfnl56ls5bh2g"; depends=[AnnotationDbi Biobase BiocGenerics DBI httr XML xtable]; }; - annotationTools = derive2 { name="annotationTools"; version="1.70.0"; sha256="122b424zida3j0vqkn8d06sg3jpc3ngsgidr8kgg00n4cjngkc51"; depends=[Biobase]; }; - annotatr = derive2 { name="annotatr"; version="1.22.0"; sha256="1fbax9v3d486c8lwf3yfjbf4w7zf53wmdpxk2clwm8ngm7w0pqm0"; depends=[AnnotationDbi AnnotationHub dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges readr regioneR reshape2 rtracklayer S4Vectors]; }; - anota = derive2 { name="anota"; version="1.44.0"; sha256="1x75r5znl8jllqsgzpxsqj62ch11bpwhmyzmbjmb8sz8f8ww923c"; depends=[multtest qvalue]; }; - anota2seq = derive2 { name="anota2seq"; version="1.18.0"; sha256="0mjgw1ncdl2pqqbkgsj8ws9nkj6zfh1dlygmh535jck6gg2rh454"; depends=[DESeq2 edgeR limma multtest qvalue RColorBrewer SummarizedExperiment]; }; - antiProfiles = derive2 { name="antiProfiles"; version="1.36.0"; sha256="1277kg5xpyb2yriyjy18p437q5lj22h4al7z7pygkzxzywxv9g40"; depends=[locfit matrixStats]; }; - apComplex = derive2 { name="apComplex"; version="2.62.0"; sha256="1h5xn9wm75rphikyjdnamyvlvqvy3hlgf4qgx540va9w7v9gfhqc"; depends=[graph org_Sc_sgd_db RBGL Rgraphviz]; }; - apeglm = derive2 { name="apeglm"; version="1.18.0"; sha256="1ppwk4g66x46hpqsfsvhl12398d1srqr47nmp0y2gz212kff0rby"; depends=[emdbook GenomicRanges Rcpp RcppEigen RcppNumerical SummarizedExperiment]; }; - appreci8R = derive2 { name="appreci8R"; version="1.14.0"; sha256="0r7x9dhy1bivcpqrcq43w2awg7y2ql92rarbvylxbzch8x07f70h"; 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.26.0"; sha256="1240v9wvsf205g998ms19hncki8g6shidg09dy5np9pqpiix4vys"; depends=[matrixStats R_methodsS3 R_oo R_utils]; }; - arrayMvout = derive2 { name="arrayMvout"; version="1.54.0"; sha256="1wh4hhd9qq14137yp0zi39wh9m458vfcfff7dsfdzpra565sdrjn"; depends=[affy affyContam Biobase lumi mdqc parody]; }; - arrayQuality = derive2 { name="arrayQuality"; version="1.74.0"; sha256="0bqxnny60sx474kk5cxd0id6gm1slypp8sqah1m80wd0vpwmp575"; depends=[gridBase hexbin limma marray RColorBrewer]; }; - arrayQualityMetrics = derive2 { name="arrayQualityMetrics"; version="3.52.0"; sha256="0dqfl9agfr11mn38ibrf4jrfbhy4vcvn7ajd2mp7w2nmrfr0720i"; depends=[affy affyPLM beadarray Biobase genefilter gridSVG Hmisc hwriter lattice latticeExtra limma RColorBrewer setRNG svglite vsn XML]; }; - artMS = derive2 { name="artMS"; version="1.14.0"; sha256="0mdcvlpnjkkgp08kh3smx49pw1bav5zsynp4vak6m937ngccnzsr"; 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.12.0"; sha256="0dmv34xqwr3l2rznapxmyrkyf1w78qzxdv88s5nn8s1m8qdkgwkz"; depends=[BiocFileCache BiocParallel BSgenome data_table ggplot2 lifecycle motifStack rappdirs Rcpp testthat]; }; - atena = derive2 { name="atena"; version="1.2.2"; sha256="0b89wb7cc44c8jd6868dn8pwgid768bprkncsi87qkdz0abbhzhp"; depends=[AnnotationHub BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges Matrix Rsamtools S4Vectors scales sparseMatrixStats SQUAREM SummarizedExperiment]; }; - attract = derive2 { name="attract"; version="1.48.0"; sha256="0f1fsv278kpnxvqg9qa5rw2k3zr8zws0ab73ldl60h6pv9cy8x82"; depends=[AnnotationDbi Biobase cluster GOstats KEGGREST limma org_Hs_eg_db reactome_db]; }; - autonomics = derive2 { name="autonomics"; version="1.4.0"; sha256="00k04pp81s6s3dyzykh0cqn27gxyk2brkl0k8g40b8rh13s1w8qy"; 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.4.0"; sha256="0iw3zycmj95rmdx7f2w0j4yxkzd90y87lrzgdn9cyvvzi5avflav"; depends=[SummarizedExperiment]; }; - bacon = derive2 { name="bacon"; version="1.24.0"; sha256="1zvcxdj3r892898ik5gq3jdbfig1438qws4bwd465ik8vi7g39v8"; depends=[BiocParallel ellipse ggplot2]; }; - ballgown = derive2 { name="ballgown"; version="2.28.0"; sha256="0l8q3fymskxmsi5jcikzjz5xi66lpzgv7bjymir4izah2v68z708"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; }; - bambu = derive2 { name="bambu"; version="2.2.0"; sha256="0dc2hpnykr575jbrq9whmdabknl70s2hcs6gkmkl4kpv7xfqdq6w"; 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.28.0"; sha256="0ywbxq829hclhr5bb6p77rspxvfs580zlwd2f5kr3an6rdgyx9ky"; depends=[BiocGenerics GenomicRanges IRanges Rcpp Rhtslib zlibbioc]; }; - bandle = derive2 { name="bandle"; version="1.0.0"; sha256="1f18k23hdjasbds37dsmd31ns4p1jm6bqfllw5za64z0mzd3dd29"; depends=[BH Biobase BiocParallel BiocStyle circlize dplyr ggalluvial ggplot2 ggrepel knitr lbfgs MSnbase plyr pRoloc pRolocdata Rcpp RcppArmadillo rlang robustbase S4Vectors tidyr]; }; - banocc = derive2 { name="banocc"; version="1.20.0"; sha256="10vaggq1w5jkxd8r2k1mhymzvb7x3h8afwn2pvmcpj022ka7xhbx"; depends=[coda mvtnorm rstan stringr]; }; - barcodetrackR = derive2 { name="barcodetrackR"; version="1.4.0"; sha256="0yxa15xkgqazw31vq4wm8v747bw4qb18m6i602pvynk0n5bgg3d3"; depends=[circlize cowplot dplyr ggdendro ggplot2 ggridges magrittr plyr proxy RColorBrewer rlang S4Vectors scales shiny SummarizedExperiment tibble tidyr vegan viridis]; }; - basecallQC = derive2 { name="basecallQC"; version="1.20.0"; sha256="07mcg0bs13apabhsip997nj6riqdrv9247azg379z6anaa0b0vpd"; depends=[data_table dplyr DT ggplot2 knitr lazyeval magrittr prettydoc raster rmarkdown ShortRead stringr tidyr XML yaml]; }; - basilisk = derive2 { name="basilisk"; version="1.8.1"; sha256="134xix2iq5l7783dng2jjklxd3m5lh4snb7bjhslrs2r1j3p8jpk"; depends=[basilisk_utils dir_expiry reticulate]; }; - basilisk_utils = derive2 { name="basilisk.utils"; version="1.8.0"; sha256="1jnqv0rlljkq27rd4ixl763v335f2aanm4fzr386yc81fj4vnmhk"; depends=[dir_expiry]; }; - batchelor = derive2 { name="batchelor"; version="1.12.3"; sha256="00ix3hvhgalxg63qnynv2waa273jk336lg47k72qwxfzimsxfjxc"; depends=[beachmat BiocGenerics BiocNeighbors BiocParallel BiocSingular DelayedArray DelayedMatrixStats igraph Matrix Rcpp ResidualMatrix S4Vectors ScaledMatrix scuttle SingleCellExperiment SummarizedExperiment]; }; - bayNorm = derive2 { name="bayNorm"; version="1.14.0"; sha256="12896sryq5bfbqglpk3dg9cdsq6rk3jhzdqcpyasvk6w7v1w8bin"; depends=[BB BiocParallel doSNOW fitdistrplus foreach iterators locfit MASS Matrix Rcpp RcppArmadillo RcppProgress SingleCellExperiment SummarizedExperiment]; }; - baySeq = derive2 { name="baySeq"; version="2.30.0"; sha256="1yqykndyv32s2rk7x86qf410qr0pigc8z4gdkl8vhj4dgyr47n2j"; depends=[abind edgeR GenomicRanges]; }; - bcSeq = derive2 { name="bcSeq"; version="1.18.0"; sha256="0bn3maqxayprrd73gwvxgqkk0zqc0nanw29wsnmvw7z1bd15zqy0"; depends=[Biostrings Matrix Rcpp]; }; - beachmat = derive2 { name="beachmat"; version="2.12.0"; sha256="0fc6vvjjq1mfjfj2zqkap3rwvinnfqjs0cpk1447sspvd1rjya8c"; depends=[BiocGenerics DelayedArray Matrix Rcpp]; }; - beadarray = derive2 { name="beadarray"; version="2.46.0"; sha256="09n38fmckc0zbsv150x8k7l0xqbbjjkxnyqx84lfxqjxs592dvjy"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 hexbin illuminaio IRanges limma reshape2]; }; - beadarraySNP = derive2 { name="beadarraySNP"; version="1.62.0"; sha256="0f07mjxm3d5636rd668i5710r57zkhn1j642ivghs61bjgmb3a01"; depends=[Biobase quantsmooth]; }; - beer = derive2 { name="beer"; version="1.0.0"; sha256="15s7ygx63by28hjks3b5w5ig72zvlzb8lxp1mv9vzzxjhp8jq33p"; depends=[BiocParallel cli edgeR PhIPData progressr rjags SummarizedExperiment]; }; - benchdamic = derive2 { name="benchdamic"; version="1.2.5"; sha256="16mrc5mybi8sz0v7xh5z4i5vd7p9wg8cry83gj62ka3vznd7y9qk"; depends=[ALDEx2 ANCOMBC BiocParallel cowplot dearseq DESeq2 edgeR ggdendro ggplot2 ggridges limma MAST metagenomeSeq MGLM NOISeq phyloseq plyr RColorBrewer reshape2 Seurat SummarizedExperiment tidytext TreeSummarizedExperiment zinbwave]; }; - bgx = derive2 { name="bgx"; version="1.62.0"; sha256="0q2y4n6bcc9pvz5sgfkw1lrb00rrp7q29i1vh7srdfmfhgpyz6bk"; depends=[affy Biobase gcrma Rcpp]; }; - bigPint = derive2 { name="bigPint"; version="1.12.0"; sha256="1hp69j2qcidrxqs3dxjjngb09nbzp5x2yy4jz1rjmv6ghif9ccfj"; depends=[DelayedArray dplyr GGally ggplot2 gridExtra hexbin Hmisc htmlwidgets plotly plyr RColorBrewer reshape shiny shinycssloaders shinydashboard stringr SummarizedExperiment tidyr]; }; - bigmelon = derive2 { name="bigmelon"; version="1.22.0"; sha256="1msch4qbifkdqv0bbw03xj6d9w28z91mf4ki41rqg6048cq17h2k"; depends=[Biobase BiocGenerics gdsfmt GEOquery illuminaio methylumi minfi wateRmelon]; }; - bioCancer = derive2 { name="bioCancer"; version="1.24.01"; sha256="0dyxwms1s19bmj5691fqk51ig2b0s5yf62j12gpd0xv1arcc2zy1"; depends=[AlgDesign AnnotationDbi Biobase clusterProfiler DiagrammeR DOSE dplyr DT geNetClassifier GO_db htmlwidgets httr org_Bt_eg_db org_Hs_eg_db plyr r_import R_methodsS3 R_oo radiant_data reactome_db ReactomePA shiny shinythemes tibble visNetwork XML]; }; - bioDist = derive2 { name="bioDist"; version="1.68.0"; sha256="04nrvrcvpj0sn8p2i8n3ggsl2s7r4na576174i7bn1sj21vr0yb0"; depends=[Biobase KernSmooth]; }; - bioassayR = derive2 { name="bioassayR"; version="1.34.0"; sha256="0zbrci0vgk4qca28i0qb2izhyrz3r95l1w54h9h3zj9f3vd61wrz"; depends=[BiocGenerics ChemmineR DBI Matrix rjson RSQLite XML]; }; - biobroom = derive2 { name="biobroom"; version="1.28.0"; sha256="04x1z9nchm4mbhqr31011zdprc4md156j4zf003s7xx0n278xsgh"; depends=[Biobase broom dplyr tidyr]; }; - biobtreeR = derive2 { name="biobtreeR"; version="1.8.0"; sha256="0cx46hdqqm6mbj0vp4y86axv0qccd4sgk2jwwjvnqp5pynq9bbqa"; depends=[httpuv httr jsonlite stringi]; }; - biocGraph = derive2 { name="biocGraph"; version="1.58.0"; sha256="1y59a7c4ahhn1g2wz2hkx83izfn8i85mmxxp63jdd0rg7zwhr6nn"; depends=[BiocGenerics geneplotter graph Rgraphviz]; }; - biocViews = derive2 { name="biocViews"; version="1.64.1"; sha256="0ixcx9qqpmwmnhml3klk5z075km8g2l4q0iqc1dbniga87qgyl38"; depends=[Biobase BiocManager graph RBGL RCurl RUnit XML]; }; - biocthis = derive2 { name="biocthis"; version="1.6.0"; sha256="1hdgjp00d2si3mr7m1d289i9wn7g927z6n8n27d5sm94lb91qln0"; depends=[BiocManager fs glue rlang styler usethis]; }; - biodb = derive2 { name="biodb"; version="1.4.2"; sha256="0f3clqmrpaawhjjyb4x5mnbhsam56r0av05b5cl5p4waylp8qbs1"; depends=[BiocFileCache chk jsonlite lgr lifecycle openssl plyr progress R6 rappdirs Rcpp RCurl RSQLite stringr testthat withr XML yaml]; }; - biodbChebi = derive2 { name="biodbChebi"; version="1.2.0"; sha256="14sgjlklrvdz6wrsk8qbfmv98q8wcr229w1ra1kif7agvdqdw0ad"; depends=[biodb R6]; }; - biodbExpasy = derive2 { name="biodbExpasy"; version="1.0.0"; sha256="1a2g0i5jb6i3qvldiy1msdcpv3w65jpay2iavzmzsp228jp49v5f"; depends=[biodb chk R6 stringr]; }; - biodbHmdb = derive2 { name="biodbHmdb"; version="1.2.0"; sha256="16vmp1z1b0jsap7xd7wcr0fbpl75srrswmqhcq26biy23w1r93kj"; depends=[biodb R6 Rcpp testthat]; }; - biodbKegg = derive2 { name="biodbKegg"; version="1.2.1"; sha256="0227nnqfyylghn3gb5ps26ak18hvbjhplxrnwg2lcccd5mi67hwh"; depends=[biodb chk lifecycle R6]; }; - biodbLipidmaps = derive2 { name="biodbLipidmaps"; version="1.2.0"; sha256="0zbw7jmkq3zaf2mp86yizsfm4nyamgi2fnlhn5bl0wvd01jrjlc0"; depends=[biodb lifecycle R6]; }; - biodbMirbase = derive2 { name="biodbMirbase"; version="1.0.0"; sha256="1ci7wf0wkqvrwqw04z57i0l9ldgzgmhwfwv69yrrz1a9yjfq82q6"; depends=[biodb chk R6 stringr]; }; - biodbNcbi = derive2 { name="biodbNcbi"; version="1.0.0"; sha256="1ymngw0wy2jr853v0r1gf3nb1q596f03gjhxxf0x2pkblpp85mqz"; depends=[biodb chk R6 XML]; }; - biodbNci = derive2 { name="biodbNci"; version="1.0.0"; sha256="19gv91mqscdzpxcia32hc03v62icjd79c8bkkmi2nmvaa4zsyjii"; depends=[biodb chk R6 Rcpp testthat]; }; - biodbUniprot = derive2 { name="biodbUniprot"; version="1.2.1"; sha256="1cxmjq5f92is9ckqm61fj6syb2yw9i1pxj54yr268l2l67kz89vn"; depends=[biodb R6]; }; - biomaRt = derive2 { name="biomaRt"; version="2.52.0"; sha256="0yn3kanyrplc89a900xiz33nw1v23mkljvd5isizgs8gzvwzf8xg"; depends=[AnnotationDbi BiocFileCache digest httr progress rappdirs stringr XML xml2]; }; - biomformat = derive2 { name="biomformat"; version="1.24.0"; sha256="12wqjipxhngmlnrdmx329dqmkmy2wa4nkkrhwaqv2nwy90dncs9n"; depends=[jsonlite Matrix plyr rhdf5]; }; - biomvRCNS = derive2 { name="biomvRCNS"; version="1.36.0"; sha256="0i576g7pkivqaxff1pkb760mdpx8v9fh071aic1mwfnlfa7k87ln"; depends=[GenomicRanges Gviz IRanges mvtnorm]; }; - biosigner = derive2 { name="biosigner"; version="1.24.2"; sha256="0vdv2by3qv7y8vzr8qgg7apwwgsa0fhlfrhzns7g3nas7883c89m"; depends=[Biobase e1071 MultiAssayExperiment MultiDataSet randomForest ropls SummarizedExperiment]; }; - biotmle = derive2 { name="biotmle"; version="1.20.0"; sha256="1frig90krvfdk6nwpmslpj0pvligyzwzfwwci7hzwcmbglk5jj22"; depends=[assertthat BiocGenerics BiocParallel dplyr drtmle ggplot2 ggsci limma S4Vectors SummarizedExperiment superheat tibble]; }; - biovizBase = derive2 { name="biovizBase"; version="1.44.0"; sha256="1ffzf7yvl47l8v8a50m8g9q33hgwvxg4fcm8ld2yy8hd2zl86zyd"; depends=[AnnotationDbi AnnotationFilter BiocGenerics Biostrings dichromat ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Hmisc IRanges RColorBrewer rlang Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; }; - biscuiteer = derive2 { name="biscuiteer"; version="1.10.0"; sha256="0y7vbdaafiga16yr0d22w1v4p0jmczndcar0r0km06f5y1b74amr"; depends=[Biobase BiocGenerics BiocParallel biscuiteerData bsseq data_table DelayedMatrixStats dmrseq GenomeInfoDb GenomicRanges gtools HDF5Array Homo_sapiens impute IRanges Matrix matrixStats Mus_musculus QDNAseq qualV R_utils readr Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; - blacksheepr = derive2 { name="blacksheepr"; version="1.10.0"; sha256="1b3ij0rzri4xxldinpk632m2px228xl1fy6vgj4f8mawymlfl6h7"; depends=[circlize ComplexHeatmap pasilla RColorBrewer SummarizedExperiment viridis]; }; - blima = derive2 { name="blima"; version="1.30.0"; sha256="1h3bnwlsi14l1f4kdmv6qqypfa09gml812k6fdni0i6m9g79yylv"; depends=[beadarray Biobase BiocGenerics Rcpp]; }; - bluster = derive2 { name="bluster"; version="1.6.0"; sha256="1g496yc7mdhshf6r0n8xhj7ax936ia5z2cx72lqyk2vzzzl5c4v8"; depends=[BiocNeighbors BiocParallel cluster igraph Matrix Rcpp S4Vectors]; }; - bnbc = derive2 { name="bnbc"; version="1.18.0"; sha256="1d2m98vpjl2ibzx61rr9a95v7wa5zz2s2bnymwmm08445dv33sy2"; depends=[BiocGenerics data_table EBImage GenomeInfoDb GenomicRanges IRanges matrixStats preprocessCore Rcpp rhdf5 S4Vectors SummarizedExperiment sva]; }; - bnem = derive2 { name="bnem"; version="1.4.0"; sha256="1qh3kxy09q29s9sg17gg3yhvcq3p99mnvr6zm91izf8fgyivz912"; depends=[affy binom Biobase CellNOptR cluster epiNEM flexclust graph limma matrixStats mnem RColorBrewer Rgraphviz rmarkdown snowfall sva vsn]; }; - borealis = derive2 { name="borealis"; version="1.0.1"; sha256="0glldfg1h480fpm5wpsqq6mffnkwvfknpl2hdvxvwnarqv0qiz7s"; depends=[Biobase bsseq cowplot doParallel dplyr DSS foreach gamlss gamlss_dist GenomicRanges ggplot2 plyr purrr R_utils rlang snow]; }; - brainflowprobes = derive2 { name="brainflowprobes"; version="1.10.0"; sha256="0vyzw4i28bz15z06rz57h1ipcxs5lqlwcpf58a1wz0gzn5na11js"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 bumphunter cowplot derfinder derfinderPlot GenomicRanges GenomicState ggplot2 RColorBrewer]; }; - branchpointer = derive2 { name="branchpointer"; version="1.22.0"; sha256="0rsfx60l6972nz4kpjly0h4sm48flfrwskgh1shl3hbq3bnli18b"; depends=[biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg38 caret cowplot data_table gbm GenomeInfoDb GenomicRanges ggplot2 IRanges kernlab plyr rtracklayer S4Vectors stringr]; }; - breakpointR = derive2 { name="breakpointR"; version="1.14.0"; sha256="0mx8lk8q69jq5wqwhp7qvqv1zvm3hj6z53z3sil0470ri7jdyh6l"; depends=[BiocGenerics breakpointRdata cowplot doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gtools IRanges Rsamtools S4Vectors]; }; - brendaDb = derive2 { name="brendaDb"; version="1.10.0"; sha256="0wg52zq664zdv8lh4s6662wrwwxf9blrpag7b89ywz8p8rsnnmvm"; depends=[BiocFileCache BiocParallel crayon curl dplyr magrittr purrr rappdirs Rcpp rlang stringr tibble tidyr xml2]; }; - bridge = derive2 { name="bridge"; version="1.60.0"; sha256="0w8l5fzid3iz7pb8wdggx2xli2jgcgyxvgnij2jl5blkg1dfzhc5"; depends=[rama]; }; - bsseq = derive2 { name="bsseq"; version="1.32.0"; sha256="1jpfib2vb6hd7pgh3d33jgch24lba175zmbalwsbgvlmmyyf1ki5"; 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.2.2"; sha256="0jrvxlpc18gr5ba5r4pqrwzy9q6v03q26v150b2cb5b5nz4k8mbk"; depends=[BiocFileCache vroom]; }; - bumphunter = derive2 { name="bumphunter"; version="1.38.0"; sha256="0k92ps9chqsimbc7vsr8swg679zfv8nfn5zahbqq4nknhhy7hwxw"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; }; - cBioPortalData = derive2 { name="cBioPortalData"; version="2.8.2"; sha256="09bjlyr4l7iifgk39kkn3bq9lddvsgg2qj362xxy6z8igzblm05x"; depends=[AnVIL BiocFileCache digest dplyr GenomeInfoDb GenomicRanges httr IRanges MultiAssayExperiment RaggedExperiment readr RTCGAToolbox S4Vectors SummarizedExperiment TCGAutils tibble tidyr]; }; - cTRAP = derive2 { name="cTRAP"; version="1.14.1"; sha256="1dsn2g0qnvv2qvkd9c1la20585z7pvhzzbr30y45sh271s27pa12"; 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.25.0"; sha256="10i4imjihmssdwfys21fsqng8zfp7sxzkc58m8qmnh6s5sccb3sz"; depends=[bc3net igraph]; }; - cageminer = derive2 { name="cageminer"; version="1.2.5"; sha256="1aq9q9cl75zscddmr3ijzyr9cn9cjdirvi0rl4jlnrpqkyh60x1i"; depends=[BioNERO GenomeInfoDb GenomicRanges ggbio ggplot2 ggtext IRanges reshape2]; }; - calm = derive2 { name="calm"; version="1.10.0"; sha256="0fmi5s7g9xcbznd4g4hngp1rgy4anwdqxi1isp40anyhgmn3i3kj"; depends=[mgcv]; }; - canceR = derive2 { name="canceR"; version="1.30.01"; sha256="1fv3dl7r67xhzzdrcwqyhr3g5pz8im0ll2rnyixskp1w55b98kjg"; depends=[Biobase circlize Formula geNetClassifier GSEABase httr phenoTest plyr R_methodsS3 R_oo rpart RUnit survival tkrplot]; }; - cancerclass = derive2 { name="cancerclass"; version="1.40.0"; sha256="1s80w8ksf735ps677c7dcwkkpq1ynjqmp2r4biqav4j1y50nbi57"; depends=[binom Biobase]; }; - casper = derive2 { name="casper"; version="2.30.0"; sha256="0rx23ppj78m7dinvrim3hdh330xdlv2yw5405akd32dxr5dhp0wh"; 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.40.0"; sha256="1bidg957kjfg16w07gdbb8ygzipg2c47by9wilj4ijm32czv2ls7"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category colorspace GOstats graph GSEABase hwriter RCy3]; }; - cbaf = derive2 { name="cbaf"; version="1.18.4"; sha256="1iqjqigb24qkj4wyci2q9f5nrgz1fnm0fl9xfjpjw1sx2csqgirz"; depends=[BiocFileCache cBioPortalData genefilter gplots openxlsx RColorBrewer]; }; - cbpManager = derive2 { name="cbpManager"; version="1.4.0"; sha256="0h60a4cx3cgzbs9mchdasy7vgh6rm8vqp5w770328jwq9wyj3xkr"; depends=[basilisk dplyr DT htmltools jsonlite magrittr markdown plyr rapportools reticulate rintrojs shiny shinyBS shinycssloaders shinydashboard vroom]; }; - ccfindR = derive2 { name="ccfindR"; version="1.16.0"; sha256="1gg5508qxhv0g4k3m1iy3bzs53wlqbvnx3lsm77zmxhng38zzniv"; depends=[ape gtools irlba Matrix RColorBrewer Rcpp RcppEigen Rdpack Rmpi Rtsne S4Vectors SingleCellExperiment SummarizedExperiment]; }; - ccmap = derive2 { name="ccmap"; version="1.22.0"; sha256="03rw2k0ln1lr4c0sz06x1b8wyriq659bvngbb9wyr4mkcbjz5jy7"; depends=[AnnotationDbi BiocManager ccdata data_table doParallel foreach lsa xgboost]; }; - ccrepe = derive2 { name="ccrepe"; version="1.32.0"; sha256="04dmka519ppp6c68wdw98qfi897jad5wr9az0j09kyzk92mkcl10"; depends=[infotheo]; }; - ceRNAnetsim = derive2 { name="ceRNAnetsim"; version="1.8.0"; sha256="1bl7nasll5p18b0g8q1d0wfx2min8897pkkw0hfp6ir6d85fkj4f"; depends=[dplyr furrr future ggplot2 ggraph igraph purrr rlang tibble tidygraph tidyr]; }; - celaref = derive2 { name="celaref"; version="1.14.0"; sha256="0pnnk7rq4yrl33ycxsxak3zz104350rzldi7hdnrp5aghr0jxjl6"; depends=[BiocGenerics DelayedArray dplyr ggplot2 magrittr MAST Matrix readr rlang S4Vectors SummarizedExperiment tibble]; }; - celda = derive2 { name="celda"; version="1.12.0"; sha256="1qqm4pags5bp08w70419qlaghfr3r3pmb870k8ax9snbiqx32sp3"; 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.60.0"; sha256="1mrf7mdhcbvvcizc8nr8mr6xp6k9zv6v97p3zz173iqhlwf0mvvn"; depends=[Biobase BiocGenerics Category genefilter GSEABase hwriter locfit RColorBrewer splots vsn]; }; - cellTree = derive2 { name="cellTree"; version="1.26.0"; sha256="0zpf05w4bcnjfzb8jqq936rs5ji84gpn72bndsk6ipg8s4lh0bav"; depends=[gplots igraph maptpx slam topGO topicmodels xtable]; }; - cellbaseR = derive2 { name="cellbaseR"; version="1.20.1"; sha256="15y11jykxm3c681lr277zvzwsfbz0rxfzmdwanlmh0akafyl6nr6"; depends=[BiocParallel data_table doParallel foreach httr jsonlite pbapply R_utils Rsamtools tidyr]; }; - cellity = derive2 { name="cellity"; version="1.24.0"; sha256="0ywghrfj6m6hcz9yvpq0ww3p05rxdrfjna7il9faa76va5m8ssly"; depends=[AnnotationDbi e1071 ggplot2 mvoutlier org_Hs_eg_db org_Mm_eg_db robustbase topGO]; }; - cellmigRation = derive2 { name="cellmigRation"; version="1.4.0"; sha256="09c6rmraajiqx7hgxmjyx4h32gdjy849ymyid0zvxqq4cfrx0pbs"; depends=[doParallel FactoMineR FME foreach Hmisc matrixStats reshape2 sp SpatialTools tiff vioplot]; }; - cellscape = derive2 { name="cellscape"; version="1.20.0"; sha256="1k0z7sw4d3wxy4sz42b6aplq2njm673sfqgzzyf6m8iax2rvgvhs"; depends=[dplyr gtools htmlwidgets jsonlite plyr reshape2 stringr]; }; - cellxgenedp = derive2 { name="cellxgenedp"; version="1.0.1"; sha256="1p2ajvsnrsz3kl1xkpvja5pxk3qycx0dvmnrwxwij3z15kgbcm2b"; depends=[cpp11 curl dplyr DT httr jsonlite shiny]; }; - censcyt = derive2 { name="censcyt"; version="1.4.0"; sha256="03cr3l893b6250339d60xpf5mqcjl38fa9cpihy5gl83iy3dz9x4"; depends=[BiocParallel broom_mixed diffcyt dirmult dplyr edgeR fitdistrplus lme4 magrittr MASS mice multcomp purrr rlang S4Vectors stringr SummarizedExperiment survival tibble tidyr]; }; - cfDNAPro = derive2 { name="cfDNAPro"; version="1.2.0"; sha256="1bbmp324nl2ijbifhqyw074s2na391c359iyq03w73yd86w8fcc0"; depends=[dplyr ggplot2 magrittr quantmod rlang Rsamtools stringr]; }; - cghMCR = derive2 { name="cghMCR"; version="1.54.0"; sha256="0761pjajxgavxmrljzwksw0awdqrqxbi9cadqgixc0sj94rz82rd"; depends=[BiocGenerics CNTools DNAcopy limma]; }; - chimeraviz = derive2 { name="chimeraviz"; version="1.22.0"; sha256="06m60db90fnhm3r82n5zdbnwqlqnnc93cacaidizm5c29f7f3h40"; depends=[AnnotationDbi AnnotationFilter BiocStyle Biostrings checkmate data_table dplyr DT ensembldb GenomeInfoDb GenomicAlignments GenomicRanges graph gtools Gviz IRanges magick org_Hs_eg_db org_Mm_eg_db plyr RCircos RColorBrewer Rgraphviz rmarkdown Rsamtools S4Vectors]; }; - chipenrich = derive2 { name="chipenrich"; version="2.20.0"; sha256="0nfxhghkygn16j21031kdwh27vmwzlvsj6cn7a9bcd2vr34kq31g"; depends=[AnnotationDbi BiocGenerics chipenrich_data GenomeInfoDb GenomicRanges IRanges lattice latticeExtra MASS mgcv org_Dm_eg_db org_Dr_eg_db org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db plyr rms rtracklayer S4Vectors stringr]; }; - chipseq = derive2 { name="chipseq"; version="1.46.0"; sha256="1vh0hvgnw7ykj401v1q807sl14s4nixp1d8xbm41n01q6w8x834i"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; }; - chopsticks = derive2 { name="chopsticks"; version="1.62.0"; sha256="0zhf3s8pbgvk1g2qkp1hs1yhsg87hpf71pf9v9sczcggnwcrgj8r"; depends=[survival]; }; - chromDraw = derive2 { name="chromDraw"; version="2.26.0"; sha256="0x6znw33r7791cs7504kih12r9alcvsvk2z8in98nhndzlfr99qh"; depends=[GenomicRanges Rcpp]; }; - chromPlot = derive2 { name="chromPlot"; version="1.24.0"; sha256="02k7l22hjvmkvnva28plbrxv87v7krbjivs2bxrl5jw6ksc5m4mj"; depends=[biomaRt GenomicRanges]; }; - chromVAR = derive2 { name="chromVAR"; version="1.18.0"; sha256="0vhsvkm4kvln0002f13ayk57f9fmiz1kw9vwpsm1vds1vahd656m"; depends=[BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicRanges ggplot2 IRanges Matrix miniUI nabor plotly RColorBrewer Rcpp RcppArmadillo Rsamtools Rtsne S4Vectors shiny SummarizedExperiment TFBSTools]; }; - chromstaR = derive2 { name="chromstaR"; version="1.22.0"; sha256="1xjwmnr4hk8v3nwvhqd6ixk5qr2dv0n4mb9wd6nl7cgjfhjsdgj7"; depends=[bamsignals BiocGenerics chromstaRData doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges mvtnorm reshape2 Rsamtools S4Vectors]; }; - chromswitch = derive2 { name="chromswitch"; version="1.18.0"; sha256="1sdgmigr89kbbm2rcbjkjv9z8ig332a1lnk3mqpa15bkpapw7abm"; depends=[Biobase BiocParallel cluster dplyr GenomicRanges gplots IRanges lazyeval magrittr matrixStats NMF rtracklayer S4Vectors tidyr]; }; - cicero = derive2 { name="cicero"; version="1.14.0"; sha256="1ip12ijazlmcfbym078slxykpkz7d1zwvs8l8aqdnqpxjfk1ipx5"; depends=[assertthat Biobase BiocGenerics data_table dplyr FNN GenomicRanges ggplot2 glasso Gviz igraph IRanges Matrix monocle plyr reshape2 S4Vectors stringi stringr tibble tidyr VGAM]; }; - circRNAprofiler = derive2 { name="circRNAprofiler"; version="1.10.0"; sha256="1gwm416shhv2p3gh1n6kv1rvx0n0imy25b7z62z4s8b3gs3nfp5j"; depends=[AnnotationHub Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 DESeq2 dplyr edgeR GenomeInfoDb GenomicRanges ggplot2 gwascat IRanges magrittr R_utils readr reshape2 rlang rtracklayer S4Vectors seqinr stringi stringr universalmotif]; }; - cisPath = derive2 { name="cisPath"; version="1.36.0"; sha256="07h948mxn2zjylv2y5q5w6rwqqmmha21xgwqpckzhgjh310jj674"; depends=[]; }; - cleanUpdTSeq = derive2 { name="cleanUpdTSeq"; version="1.34.0"; sha256="1n1j9cz2v5bd0dbmpbb7pggixjsvyx3dfqjkmmqxir3dddbp6d0c"; depends=[Biostrings BSgenome BSgenome_Drerio_UCSC_danRer7 e1071 GenomeInfoDb GenomicRanges IRanges S4Vectors seqinr stringr]; }; - cleaver = derive2 { name="cleaver"; version="1.34.1"; sha256="1ycrx0n2ignhmgb87is4qm6sv1z0m6a5c8sg3xn0cw9y4abjkgdf"; depends=[Biostrings IRanges S4Vectors]; }; - cliProfiler = derive2 { name="cliProfiler"; version="1.2.0"; sha256="08hvj9zk42hf4r0cdd5pqxm2mk15salhk031fqbbks048hnqs42v"; depends=[Biostrings BSgenome dplyr GenomicRanges ggplot2 rtracklayer S4Vectors]; }; - clippda = derive2 { name="clippda"; version="1.46.0"; sha256="1nhkf1nchxf26b05bdi4qz1asyrbxgi80irx80w1scijn33yv3d7"; depends=[Biobase lattice limma rgl scatterplot3d statmod]; }; - clipper = derive2 { name="clipper"; version="1.36.1"; sha256="0c58kwrlfbrnzwgh3amjby1bbk519rx4l6767b2ivx6qrpxcng6p"; depends=[Biobase corpcor graph gRbase igraph KEGGgraph Matrix qpgraph RBGL Rcpp]; }; - cliqueMS = derive2 { name="cliqueMS"; version="1.10.0"; sha256="1fp5222wi91wk1fnw29gaiv02asidhrxzaq3da9isgjjvvr1gx63"; depends=[BH igraph matrixStats MSnbase qlcMatrix Rcpp RcppArmadillo xcms]; }; - clonotypeR = derive2 { name="clonotypeR"; version="1.34.0"; sha256="15nnj6c23bcnln1xsmxs7f13m13lvn6did7lvp7ij8gcb0vg2g6q"; depends=[]; }; - clst = derive2 { name="clst"; version="1.44.0"; sha256="0smr6kh6rk10zd2k8si79l3wdl2gdk6h3fh345a8m19rkv6sy455"; depends=[lattice ROC]; }; - clstutils = derive2 { name="clstutils"; version="1.44.0"; sha256="0w2gki24xf9m8qh1289hns8bkr7gj6big21lyb4p2mp652z1daw7"; depends=[ape clst lattice rjson RSQLite]; }; - clustComp = derive2 { name="clustComp"; version="1.24.0"; sha256="1svj1xvg8cn1hm5snw8yv764382vc41m7q2qjwv7cfyv7ri3ai42"; depends=[sm]; }; - clusterExperiment = derive2 { name="clusterExperiment"; version="2.16.0"; sha256="1xd2kxmdg51hhj0zvz7pxmpdvb1sya7prsf9ny2wj2y8ivrqgn4f"; 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.4.4"; sha256="0k5jhry0j6wa7779n3hrw4ld4bvyahpgpbwi2a0g704m3dd3mqp5"; depends=[AnnotationDbi DOSE downloader dplyr enrichplot GO_db GOSemSim magrittr plyr qvalue rlang tidyr yulab_utils]; }; - clusterSeq = derive2 { name="clusterSeq"; version="1.20.0"; sha256="0rh9ql3f1z79hxwlnsv5r8l0cpqyr6jxlz38f1aakshdlwdxlkiq"; depends=[baySeq BiocGenerics BiocParallel]; }; - clusterStab = derive2 { name="clusterStab"; version="1.68.0"; sha256="0p5dk9s3zrd5d2ap5i445jlkhjp7f8vh3dj3h59wya2n4phpigb4"; depends=[Biobase]; }; - clustifyr = derive2 { name="clustifyr"; version="1.8.0"; sha256="1c1lbgsmwafg9aa8j95x235270axp1g7mq41hmidc9mf4f6vclxc"; depends=[cowplot dplyr entropy fgsea ggplot2 httr Matrix matrixStats proxy readr rlang S4Vectors scales SingleCellExperiment stringr SummarizedExperiment tibble tidyr]; }; - cmapR = derive2 { name="cmapR"; version="1.8.0"; sha256="0hh9if8zhb4nfh2l76fjj364kcp0km78qlb0i67xlhj8py27bhij"; depends=[data_table flowCore matrixStats rhdf5 SummarizedExperiment]; }; - cn_farms = derive2 { name="cn.farms"; version="1.44.0"; sha256="1dy0hd55h8ly4j4n713wal655j6p1sfpnhswczhn3k2xkzykb974"; depends=[affxparser Biobase DBI DNAcopy ff lattice oligo oligoClasses preprocessCore snow]; }; - cn_mops = derive2 { name="cn.mops"; version="1.42.0"; sha256="152l9nnncyyz182cnafw8ipy94jf7mizhr6xmvp3l4qj9yixr0y5"; depends=[Biobase BiocGenerics exomeCopy GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors]; }; - cnvGSA = derive2 { name="cnvGSA"; version="1.40.0"; sha256="0wvkn62i4g3r5fg7am6mmwri01gr5g5dil5mp5w4na57h1svsksc"; depends=[brglm doParallel foreach GenomicRanges splitstackshape]; }; - coGPS = derive2 { name="coGPS"; version="1.40.0"; sha256="1211fvcf6li32575p8638a6hf4a6bqqkx4jyfb8hpymhj5d4z5lx"; depends=[]; }; - coMET = derive2 { name="coMET"; version="1.28.0"; sha256="03b7a1b0g3zrh34ifjrylqdd1yi033lda6q71mir6plqr9y7fva1"; depends=[biomaRt corrplot GenomicRanges gridExtra Gviz hash IRanges psych rtracklayer S4Vectors]; }; - coMethDMR = derive2 { name="coMethDMR"; version="1.0.0"; sha256="0n89jv29mqrc2qjn7fv7zcn1ycsfrlsfs5ps1yiw5p77mq2rapp4"; depends=[AnnotationHub BiocParallel bumphunter ExperimentHub GenomicRanges IRanges lmerTest]; }; - coRdon = derive2 { name="coRdon"; version="1.14.0"; sha256="1kiw6kbbwqmr89mzppmgral0zxd5shmp53xyvbcr26fxs0xn1np2"; depends=[Biobase Biostrings data_table dplyr ggplot2 purrr stringr]; }; - codelink = derive2 { name="codelink"; version="1.64.0"; sha256="0r1srzx7z2833yvbnmdmbpkhy7irs4hdy2901bzqcwp91b4n6q75"; depends=[annotate Biobase BiocGenerics limma]; }; - cogena = derive2 { name="cogena"; version="1.30.0"; sha256="0xibcmnbaxsgq06wmh45263gp2f8m9llk2v5m2n1qlvcykyr7vwr"; depends=[amap apcluster Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots kohonen mclust reshape2 stringr tibble tidyr]; }; - cogeqc = derive2 { name="cogeqc"; version="1.0.7"; sha256="1dxywmwn0wsfvhpsyvrrav33bf4d0lszrll1f83514ycc9xvzqby"; depends=[Biostrings ggplot2 ggtree igraph patchwork reshape2]; }; - cola = derive2 { name="cola"; version="2.2.0"; sha256="1940aqpqnb31kkypnhrrp7lbsv70bxcqkcrjgjmc1ag58148mnka"; 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]; }; - comapr = derive2 { name="comapr"; version="1.0.0"; sha256="1m8jzgnkghwn7ci8jqr7zs4sj6lisnxri0wiw92m1vz9zibz3w5q"; depends=[BiocParallel circlize dplyr foreach GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz IRanges Matrix plotly plyr RColorBrewer reshape2 rlang S4Vectors scales SummarizedExperiment tidyr]; }; - combi = derive2 { name="combi"; version="1.8.0"; sha256="12rv2ic1y4ab4mj5jlrfgph9fbm44sqla8kqsjn2fwfw2zfzyfq4"; depends=[alabama BB Biobase cobs DBI ggplot2 limma Matrix nleqslv phyloseq reshape2 SummarizedExperiment tensor vegan]; }; - compEpiTools = derive2 { name="compEpiTools"; version="1.30.0"; sha256="1b7aasmm56ckfhb8b6im0p6yvlbn6njmn2jyvc8n1x0bxrpy3nv3"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges GO_db gplots IRanges methylPipe Rsamtools S4Vectors topGO XVector]; }; - compartmap = derive2 { name="compartmap"; version="1.14.0"; sha256="0iq19ca8jmdviacrm5aw6bicgnrkc84s1ywva8mc7lgwnc2fjrnw"; depends=[BiocSingular DelayedArray DelayedMatrixStats GenomicRanges ggplot2 HDF5Array Matrix RaggedExperiment reshape2 RMTstat rtracklayer scales SummarizedExperiment]; }; - compcodeR = derive2 { name="compcodeR"; version="1.32.1"; sha256="09jc7h0i5821piga3prqkhzk8zp29iac7r9z9m2rxlsv7lk2ynnk"; depends=[ape caTools edgeR ggplot2 gplots gtools KernSmooth knitr lattice limma markdown MASS matrixStats modeest phylolm ROCR sm stringr vioplot]; }; - conclus = derive2 { name="conclus"; version="1.3.3"; sha256="1lgr0k1wf6a0dn4zvb6hpknr3dh10r3v81l3zlwnyfii5bnpi4a6"; depends=[AnnotationDbi Biobase BiocFileCache biomaRt clusterProfiler dbscan doParallel dplyr factoextra foreach fpc GEOquery ggplot2 gridExtra org_Hs_eg_db org_Mm_eg_db pheatmap rlang Rtsne scales scater scran SingleCellExperiment stringr SummarizedExperiment]; }; - condiments = derive2 { name="condiments"; version="1.4.0"; sha256="15b6zpj9ivj8i2rykd39ywmb8gyllgfkbmswrjb5jhkinqcj53lf"; depends=[BiocParallel distinct dplyr Ecume igraph magrittr matrixStats mgcv pbapply RANN SingleCellExperiment slingshot SummarizedExperiment TrajectoryUtils]; }; - consensus = derive2 { name="consensus"; version="1.14.0"; sha256="0hw9z5mqgnb0zy9sx5w96zsnnzywmlg7pqvvbs6lk33wyi7q42k6"; depends=[gplots matrixStats RColorBrewer]; }; - consensusDE = derive2 { name="consensusDE"; version="1.14.0"; sha256="1vgkvqxybpnw0sifp3lxvg9fd0y93p5x5xx7acay0mlg1vnbs3hp"; depends=[airway AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings data_table dendextend DESeq2 EDASeq edgeR EnsDb_Hsapiens_v86 ensembldb GenomicAlignments GenomicFeatures limma org_Hs_eg_db pcaMethods RColorBrewer Rsamtools RUVSeq S4Vectors SummarizedExperiment TxDb_Dmelanogaster_UCSC_dm3_ensGene]; }; - consensusOV = derive2 { name="consensusOV"; version="1.18.0"; sha256="0m1jw434b6pn7ymx9829nrvy1viqpl50d4mhvkpkx37qnv45qdfa"; depends=[Biobase gdata genefu GSVA limma matrixStats randomForest]; }; - consensusSeekeR = derive2 { name="consensusSeekeR"; version="1.24.0"; sha256="1nc1ylr7mkj6bgxhyccxrvp3ybndr185c7ah9d3msvzp17497r13"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges IRanges rtracklayer S4Vectors stringr]; }; - contiBAIT = derive2 { name="contiBAIT"; version="1.24.0"; sha256="19spydvgkypf695lb8pvhslf8sv340ancz5hdhvmfdb1ghhb62lk"; depends=[BH BiocGenerics BiocParallel clue cluster colorspace data_table diagram DNAcopy exomeCopy GenomicAlignments GenomicFiles GenomicRanges ggplot2 gplots gtools IRanges Rcpp reshape2 Rsamtools rtracklayer S4Vectors TSP]; }; - conumee = derive2 { name="conumee"; version="1.30.0"; sha256="1pzg6vvzskxdfkwwshqa0vi498vi9341bkc5dinihm8qvjn2h268"; depends=[DNAcopy GenomeInfoDb GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest IRanges minfi rtracklayer]; }; - convert = derive2 { name="convert"; version="1.72.0"; sha256="0xj4k82q9547cls3dcs2wnlk6ssvcgawynsbmry9kqmjrl44ng20"; depends=[Biobase limma marray]; }; - copa = derive2 { name="copa"; version="1.64.0"; sha256="09g05jy46mq570dm0hs65j5axqswkyf0an68aqhl8g8kw0nq888j"; depends=[Biobase]; }; - copynumber = derive2 { name="copynumber"; version="1.36.0"; sha256="1gr8q9ri49x8qlmbsi6k6wcak1w9v48wr1qy7axc86brzx6z6mhd"; depends=[BiocGenerics GenomicRanges IRanges S4Vectors]; }; - corral = derive2 { name="corral"; version="1.6.0"; sha256="028av863qqqgvkcsnl5180h7ryxx0xs5ya0zpj04a80vlcb0ikbz"; depends=[ggplot2 ggthemes gridExtra irlba Matrix MultiAssayExperiment pals reshape2 SingleCellExperiment SummarizedExperiment transport]; }; - coseq = derive2 { name="coseq"; version="1.20.0"; sha256="02w3s64d186qhivd2a6adxi8jwdxd5cs0mpbfrijiyxd37allhpx"; depends=[BiocParallel capushe compositions corrplot DESeq2 e1071 edgeR ggplot2 HTSCluster HTSFilter mvtnorm Rmixmod S4Vectors scales SummarizedExperiment]; }; - cosmiq = derive2 { name="cosmiq"; version="1.30.0"; sha256="1a0lqd4lgn2qx4p8d77dcn9gnymv42iv6jyz61rzawh6vkmj6f4m"; depends=[faahKO MassSpecWavelet pracma Rcpp xcms]; }; - cosmosR = derive2 { name="cosmosR"; version="1.4.0"; sha256="1i2a5xajxzkk7m50vavygsnb4wadmf9qkfip90554l69ylvvafj7"; depends=[CARNIVAL dorothea dplyr GSEABase igraph progress purrr rlang stringr visNetwork]; }; - countsimQC = derive2 { name="countsimQC"; version="1.14.0"; sha256="0a5i0mb19ck65mqr4l695ngwj1qjapb3s7h52pn128qyywr02gla"; depends=[caTools DESeq2 dplyr DT edgeR genefilter GenomeInfoDbData ggplot2 randtests rmarkdown SummarizedExperiment tidyr]; }; - covEB = derive2 { name="covEB"; version="1.22.0"; sha256="0l04bsqcdb8m61mwrvq0d2gx2iz1kn2fbryxvhj5rsjrf72r6slk"; depends=[Biobase gsl igraph LaplacesDemon Matrix mvtnorm]; }; - covRNA = derive2 { name="covRNA"; version="1.22.0"; sha256="031vxazqss5mi5clc15iw38xgc079vd17wf53fik1fynr84g5xpi"; depends=[ade4 Biobase genefilter]; }; - cpvSNP = derive2 { name="cpvSNP"; version="1.28.0"; sha256="0npggmics5lng86zsg132khak4hn15sb8w8qhxl19kdxiayf9dpa"; depends=[BiocParallel corpcor GenomicFeatures ggplot2 GSEABase plyr]; }; - cqn = derive2 { name="cqn"; version="1.42.0"; sha256="1qipaskv2bqgc733sssalzygcbhdlnh6cxvk3w7nz3wlmjar2yqp"; depends=[mclust nor1mix preprocessCore quantreg]; }; - crisprBase = derive2 { name="crisprBase"; version="1.0.0"; sha256="0bcdnp56qyw2a4qmc5jkmq8cvn2n4kbmz0yavi8692myfdr35vlq"; depends=[BiocGenerics Biostrings GenomicRanges IRanges S4Vectors stringr]; }; - crisprBowtie = derive2 { name="crisprBowtie"; version="1.0.0"; sha256="1gdkpx81gg7m1s956n57r6bk5vi3f9qypl93762x1hr0pd03xy01"; depends=[BiocGenerics Biostrings BSgenome crisprBase GenomeInfoDb GenomicRanges IRanges Rbowtie readr stringr]; }; - crisprBwa = derive2 { name="crisprBwa"; version="1.0.0"; sha256="157nxk2ymjikw2madbyjxbihcdjav3gg5xmr6i5jp8jsm0m4hpjc"; depends=[BiocGenerics BSgenome crisprBase GenomeInfoDb Rbwa readr stringr]; }; - crisprScore = derive2 { name="crisprScore"; version="1.0.0"; sha256="19vwvjq7pw6m813saldns38y3rhg7a63f5cd5sly3qiai8qfa3bb"; depends=[basilisk BiocGenerics Biostrings crisprScoreData IRanges randomForest reticulate stringr XVector]; }; - crisprseekplus = derive2 { name="crisprseekplus"; version="1.22.0"; sha256="18xiwjbssyz7dphiafqza5awxb6b4g023r3lq51mggbqczhrqwfp"; depends=[AnnotationDbi BiocManager BSgenome CRISPRseek DT GenomicFeatures GenomicRanges GUIDEseq hash shiny shinyjs]; }; - crlmm = derive2 { name="crlmm"; version="1.54.0"; sha256="0znspkc8mvfq94687dzmzix1dnnz32nvv2pdhv9cay2q6sv3d6z5"; depends=[affyio beanplot Biobase BiocGenerics ellipse ff foreach illuminaio lattice limma matrixStats mvtnorm oligoClasses preprocessCore RcppEigen VGAM]; }; - crossmeta = derive2 { name="crossmeta"; version="1.22.1"; sha256="1qqbs11b5srm063igwddgnkmk65fsi7zy3ncl80q0bikn9d9dbcs"; depends=[affxparser affy AnnotationDbi Biobase BiocGenerics BiocManager data_table DBI DT edgeR fdrtool GEOquery limma matrixStats metaMA miniUI oligo RCurl reader readxl RSQLite shiny shinyBS shinyjs shinypanel shinyWidgets stringr sva tibble XML]; }; - csaw = derive2 { name="csaw"; version="1.30.1"; sha256="12fyrg251g0c25vff3badi3mrw6lwhlxnq1xc9q5m1mq9p6151d3"; depends=[BiocGenerics BiocParallel edgeR GenomeInfoDb GenomicRanges IRanges limma Matrix metapod Rcpp Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; }; - csdR = derive2 { name="csdR"; version="1.2.0"; sha256="02r3waqvv4v7pjbw2xv41y46ammlm5s04hg0pwpb327ia6pz9c1v"; depends=[glue matrixStats Rcpp RhpcBLASctl WGCNA]; }; - ctc = derive2 { name="ctc"; version="1.70.0"; sha256="0c9pgp25dqx12fmi4cqm7xyxjmy6g7wv9vbljgdjghaij2lrc4pb"; depends=[amap]; }; - ctgGEM = derive2 { name="ctgGEM"; version="1.7.0"; sha256="0hmapz96r024r3bws1wf0spd0i81viyma859y9nn93jrwxscrcdb"; depends=[Biobase BiocGenerics igraph Matrix monocle sincell SummarizedExperiment TSCAN]; }; - ctsGE = derive2 { name="ctsGE"; version="1.22.0"; sha256="0scqb397cx61sn9xsclg80wwjh3fvlc8a7l3fakmdmy3jc667ny8"; depends=[ccaPP ggplot2 limma reshape2 shiny stringr]; }; - cummeRbund = derive2 { name="cummeRbund"; version="2.38.0"; sha256="1p4anmi436zykp0ir307g75g23kj8b7shxg4r65qq6zdwflphm0q"; depends=[Biobase BiocGenerics fastcluster ggplot2 Gviz plyr reshape2 RSQLite rtracklayer S4Vectors]; }; - customCMPdb = derive2 { name="customCMPdb"; version="1.6.0"; sha256="1h5zpxlvnywafbssf8pk143xw5b8n7ixl1dq76msvvhgharqhl87"; depends=[AnnotationHub BiocFileCache ChemmineR rappdirs RSQLite XML]; }; - customProDB = derive2 { name="customProDB"; version="1.36.0"; sha256="0bypa4xww5hsby7hs7l4p1lz790d8sk0qvjvciq0ai4f7nb4gwjr"; depends=[AhoCorasickTrie AnnotationDbi biomaRt Biostrings DBI GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr RCurl Rsamtools RSQLite rtracklayer S4Vectors stringr VariantAnnotation]; }; - cyanoFilter = derive2 { name="cyanoFilter"; version="1.4.0"; sha256="0r30q9lxc3nwz90sv6ra7y2fdj04k0q1dz2hhw979v1yjndjqr6q"; depends=[Biobase cytometree flowClust flowCore flowDensity GGally ggplot2 mrfDepth]; }; - cycle = derive2 { name="cycle"; version="1.50.0"; sha256="0kwn6wbxc5zd0cp9wpb7x9yaf3zcrrs1bjq83y5wp9xxj2cbmn4k"; depends=[Biobase Mfuzz]; }; - cydar = derive2 { name="cydar"; version="1.20.0"; sha256="07lz3smlc4lsl3r2dnjjfvpymcw8msh2695v41vnrpabij489srl"; depends=[Biobase BiocGenerics BiocNeighbors BiocParallel flowCore Rcpp S4Vectors shiny SingleCellExperiment SummarizedExperiment viridis]; }; - cytoKernel = derive2 { name="cytoKernel"; version="1.2.0"; sha256="1h49gmldw3bwwqsn05shsqxfwysxq5v06awn4v0dwnrxqgra0qym"; depends=[ashr BiocParallel circlize ComplexHeatmap data_table dplyr magrittr Rcpp rlang S4Vectors SummarizedExperiment]; }; - cytoMEM = derive2 { name="cytoMEM"; version="1.0.0"; sha256="0p822gg2r1842csyyyrxwh8pr8qa452zij8h0n5wi52wwmgdli6l"; depends=[flowCore gplots matrixStats]; }; - cytolib = derive2 { name="cytolib"; version="2.8.0"; sha256="18b532sicca5l8sn334prrm7g1z1cakiwydccz4i833168pnsjyg"; depends=[BH Rcpp RcppArmadillo RcppParallel Rhdf5lib RProtoBufLib]; }; - cytomapper = derive2 { name="cytomapper"; version="1.8.0"; sha256="1svr120n0a7mphi1nr6qds7iqj9dgdi2q0l6lfkx37dc89wd3nwr"; depends=[BiocParallel DelayedArray EBImage ggbeeswarm ggplot2 HDF5Array matrixStats nnls raster RColorBrewer rhdf5 S4Vectors shiny shinydashboard SingleCellExperiment SummarizedExperiment svglite svgPanZoom viridis]; }; - dStruct = derive2 { name="dStruct"; version="1.2.0"; sha256="1wxvqs09aflwfrka8aij0sxwqwzm8ma2ab06wcs778l2gki230dv"; depends=[ggplot2 IRanges purrr reshape2 rlang S4Vectors zoo]; }; - daMA = derive2 { name="daMA"; version="1.68.0"; sha256="1mpjvl24wsdmpgra3iasgfvy29m71318gj6j1gg6081w0n4cq72m"; depends=[MASS]; }; - dada2 = derive2 { name="dada2"; version="1.24.0"; sha256="0nvjnmcjh0i660y8s3rh9b3zl163wxdx7qm2n36m6vf0iy987l4x"; depends=[BiocGenerics Biostrings ggplot2 IRanges Rcpp RcppParallel reshape2 ShortRead XVector]; }; - dagLogo = derive2 { name="dagLogo"; version="1.34.0"; sha256="1k7a750gf0ww0s3pzxbd6ff5725321bq787z2r2lg6ysxh387f1l"; depends=[BiocGenerics biomaRt Biostrings motifStack pheatmap UniProt_ws]; }; - dasper = derive2 { name="dasper"; version="1.6.0"; sha256="0cv51fkmi29cnba750fkayycfgsn93wh5xll0m5rjpqz7lxzc83s"; 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.24.0"; sha256="1p0i81bh6knkyy0d86icsa4dcdx0mahhdgcg3fyqnzn6bhwhk3bg"; depends=[BiocParallel Matrix]; }; - dcanr = derive2 { name="dcanr"; version="1.12.0"; sha256="0c4x3b8azcrqlkhbs7db4qh7828yx311bx1bng6wy7121asni4kz"; depends=[circlize doRNG foreach igraph Matrix plyr RColorBrewer reshape2 stringr]; }; - dce = derive2 { name="dce"; version="1.4.99"; sha256="140w6zf3vzi40n1gvlln88b0fk2dgyqfnjznizhsk9wnapqq3540"; depends=[assertthat dplyr edgeR epiNEM expm ggplot2 ggraph glm2 glue graph graphite harmonicmeanp igraph logger magrittr MASS Matrix metap mnem naturalsort org_Hs_eg_db pcalg ppcor purrr reshape2 Rgraphviz rlang shadowtext tidygraph tidyverse]; }; - ddCt = derive2 { name="ddCt"; version="1.52.0"; sha256="03vgihxh8k33vdd1g96iwy69lf9zl3rg2bn0zdnbhrj7rfiqvj3q"; depends=[Biobase BiocGenerics lattice RColorBrewer xtable]; }; - ddPCRclust = derive2 { name="ddPCRclust"; version="1.16.0"; sha256="0pfscgbc241if2bj1xsj56nxcd31qq0wm39daznnjk155j5bfmx4"; depends=[clue flowCore flowDensity flowPeaks ggplot2 openxlsx plotrix R_utils SamSPECTRAL]; }; - dearseq = derive2 { name="dearseq"; version="1.8.4"; sha256="1zsqsgf243gq1k57mw11d6apzccnq531mwg2wzw9mjrs1m0jsfzl"; depends=[CompQuadForm dplyr ggplot2 KernSmooth magrittr matrixStats patchwork pbapply reshape2 rlang statmod survey tibble viridisLite]; }; - debCAM = derive2 { name="debCAM"; version="1.14.0"; sha256="1ynz57kkxl8nx80zhh1vhhydqb5n6r9d7p69f0k9nj8rp4hdgng7"; depends=[apcluster Biobase BiocParallel corpcor DMwR2 geometry NMF nnls pcaPP rJava SummarizedExperiment]; }; - debrowser = derive2 { name="debrowser"; version="1.24.1"; sha256="064dsvy5p9dibnk77iyq9ha4dqpbnr5gfmfykzhwgnkcxli9anhd"; depends=[annotate AnnotationDbi apeglm ashr clusterProfiler colourpicker DESeq2 DOSE DT edgeR enrichplot GenomicRanges ggplot2 gplots Harman heatmaply igraph IRanges jsonlite limma org_Hs_eg_db org_Mm_eg_db pathview plotly RColorBrewer RCurl reshape2 S4Vectors shiny shinyBS shinydashboard shinyjs stringi SummarizedExperiment sva]; }; - deco = derive2 { name="deco"; version="1.12.0"; sha256="18n5zgln33c79jbjzjlivs8ihyg8zci6minfqlvagxgzcpa67k0m"; depends=[ade4 AnnotationDbi Biobase BiocParallel BiocStyle cluster foreign gdata ggplot2 gplots gridExtra limma locfit made4 RColorBrewer reshape2 scatterplot3d sfsmisc SummarizedExperiment]; }; - decompTumor2Sig = derive2 { name="decompTumor2Sig"; version="2.12.0"; sha256="04hg9bbga2s8scjxfd8wjlmr45nzzvh8d6gr0w929sybx4nj2qz6"; depends=[BiocGenerics Biostrings BSgenome_Hsapiens_UCSC_hg19 data_table GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo gridExtra Matrix plyr quadprog readxl S4Vectors SummarizedExperiment TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; }; - decontam = derive2 { name="decontam"; version="1.16.0"; sha256="1g9hcfcfnpq6z21069yw0pyzncwznmvxb2xalg4y6y1604dy98q9"; depends=[ggplot2 reshape2]; }; - deconvR = derive2 { name="deconvR"; version="1.2.0"; sha256="091z3lncamscsvzj63zzbw7dr7vnkn0jwfkm5ljq4112w4rxgrm3"; depends=[assertthat BiocGenerics data_table dplyr e1071 foreach GenomicRanges IRanges magrittr MASS matrixStats methylKit nnls quadprog rsq S4Vectors tidyr]; }; - decoupleR = derive2 { name="decoupleR"; version="2.2.2"; sha256="0q1w8yw3bwx8ai5z8rw8lz97w4cplxijq93634hza2vgkig1ck9m"; depends=[broom dplyr magrittr Matrix purrr rlang stringr tibble tidyr tidyselect withr]; }; - deepSNV = derive2 { name="deepSNV"; version="1.42.1"; sha256="0bgj1grv3a5bqhcdsw445x49kl3pz367svy6fnrzfsk9bmj46kgn"; depends=[Biostrings GenomicRanges IRanges Rhtslib SummarizedExperiment VariantAnnotation VGAM]; }; - deltaCaptureC = derive2 { name="deltaCaptureC"; version="1.10.0"; sha256="1v15v7lhxaymj2940k11z5bg5zpqsgncdpc4sxw8ff89m1ilwrlk"; depends=[DESeq2 GenomicRanges ggplot2 IRanges SummarizedExperiment tictoc]; }; - deltaGseg = derive2 { name="deltaGseg"; version="1.36.0"; sha256="1a2p4mx88n2hrg30gkilhisjf1hbnjqqv86hcji2ypz54axx7jdv"; depends=[changepoint fBasics ggplot2 pvclust reshape scales tseries wavethresh]; }; - densvis = derive2 { name="densvis"; version="1.6.1"; sha256="0is5gxdd2m9qhdzkr8cs22f3kp5qjy45x9hcws01189px637pk64"; depends=[assertthat basilisk Rcpp reticulate]; }; - derfinder = derive2 { name="derfinder"; version="1.30.0"; sha256="1zyrfz26k8mscssfk7f0sjqgaf3xbp6ns89b4sfj2mpmf7m4m7rv"; depends=[AnnotationDbi BiocGenerics BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; }; - derfinderHelper = derive2 { name="derfinderHelper"; version="1.30.0"; sha256="0r7zbx5bfmh5cjs12y8d9qwz53nz340gdy3sx7zcn4rzn7rpslp5"; depends=[IRanges Matrix S4Vectors]; }; - derfinderPlot = derive2 { name="derfinderPlot"; version="1.30.0"; sha256="0wp4bj9fccqccyz6nal2y52j88sb9llli65psnvnz2kv2m30j23p"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer reshape2 S4Vectors scales]; }; - destiny = derive2 { name="destiny"; version="3.10.0"; sha256="1c85ky5ggdsi0ab1l4ipl85gc1kj1zv3wp08qrvslax3z0yw0ljy"; 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.78.0"; sha256="17m2m4srjafdj2c16lrh9kp82il5pnbcfhzn3kcyb1am2yyr6whi"; depends=[minpack_lm]; }; - diffHic = derive2 { name="diffHic"; version="1.28.0"; sha256="1gj3691ngsxkbh9n985jnm387xgcwy943fnjwfd03ycgpl5lv5js"; 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.4.0"; sha256="018bpkg39mgw0y67d9b2n1h0i4p0383wj1kk4jfldvh9qa3hl3n5"; depends=[ComplexHeatmap DEXSeq dplyr edgeR ensembldb GenomeInfoDb GenomicRanges ggplot2 ggrepel IRanges limma matrixStats Rsubread rtracklayer S4Vectors stringi SummarizedExperiment viridisLite]; }; - diffcoexp = derive2 { name="diffcoexp"; version="1.16.0"; sha256="0l9gx1bvr0s9nys8qicw04s6kp5h7dg377bmlnjylygxn4znkjdf"; depends=[BiocGenerics DiffCorr igraph psych SummarizedExperiment WGCNA]; }; - diffcyt = derive2 { name="diffcyt"; version="1.16.0"; sha256="0mysylzmg24g7lm1xan4yklzqmskfgh53j6vjcz2gzakz5rq3rdb"; depends=[circlize ComplexHeatmap dplyr edgeR flowCore FlowSOM limma lme4 magrittr multcomp reshape2 S4Vectors SummarizedExperiment tidyr]; }; - diffloop = derive2 { name="diffloop"; version="1.24.0"; sha256="0v0jg9y08xzw775x2lm82ig1ag4wjf4z2l6a66zmk6qbn59dwj1g"; depends=[Biobase biomaRt data_table dplyr edgeR foreach GenomeInfoDb GenomicRanges ggplot2 IRanges limma locfit matrixStats pbapply plyr readr reshape2 rtracklayer S4Vectors statmod Sushi]; }; - diffuStats = derive2 { name="diffuStats"; version="1.16.0"; sha256="0pkr77x48p3k5ahn7jfshd1zrzwqy57ynp8crh1ji0288hzrw78n"; depends=[checkmate expm igraph MASS Matrix plyr precrec Rcpp RcppArmadillo RcppParallel]; }; - diggit = derive2 { name="diggit"; version="1.28.0"; sha256="084nbx8sgdk3madsqgpia6jcl4fw20dzwbvphhbkws5yghf49pg8"; depends=[Biobase ks viper]; }; - dir_expiry = derive2 { name="dir.expiry"; version="1.4.0"; sha256="098wzm8hlpy70c99k2sl4k8z2dllhw7rwdj8dhcskr7kaw71k3sq"; depends=[filelock]; }; - discordant = derive2 { name="discordant"; version="1.20.0"; sha256="0896ch07zpbwif48nz9n91gzsdkf7ax68vylhlfvz5mbgdd1cc3f"; depends=[Biobase biwt dplyr gtools MASS Rcpp]; }; - distinct = derive2 { name="distinct"; version="1.8.0"; sha256="0g7591km80zz1jhy5d8ys9snmva79prx2v4sdm57whn93mxqyp0l"; depends=[doParallel doRNG foreach ggplot2 limma Matrix Rcpp RcppArmadillo Rfast scater SingleCellExperiment SummarizedExperiment]; }; - dittoSeq = derive2 { name="dittoSeq"; version="1.8.1"; sha256="0vi0hcyffaxp6yxsrq95bdlrhr85dvbqm9c7rg6a6blkfgwhlzb4"; depends=[colorspace cowplot ggplot2 ggrepel ggridges gridExtra pheatmap reshape2 S4Vectors SingleCellExperiment SummarizedExperiment]; }; - divergence = derive2 { name="divergence"; version="1.12.0"; sha256="0zh38cl5rsi7mx9nijhz8qrbjgfzrc4hgkcyywxady315zxfbl7y"; depends=[SummarizedExperiment]; }; - dks = derive2 { name="dks"; version="1.42.0"; sha256="1ljxin1c36glri7cq5mgw929gaivdakqhssdyblciy4y8qpkxa3s"; depends=[cubature]; }; - dmrseq = derive2 { name="dmrseq"; version="1.16.0"; sha256="1c99l62fi26bnbvpzrlsvvs722za0l5vfhddcrhzzzasabhccb4n"; depends=[AnnotationHub annotatr BiocParallel bsseq bumphunter DelayedMatrixStats GenomeInfoDb GenomicRanges ggplot2 IRanges locfit matrixStats nlme outliers RColorBrewer rtracklayer S4Vectors]; }; - doppelgangR = derive2 { name="doppelgangR"; version="1.24.0"; sha256="01n0xkd0fkdwiwrnd28pk08yf2n0004q7n2w87wirw65g04f56zd"; depends=[Biobase BiocParallel digest impute mnormt SummarizedExperiment sva]; }; - doseR = derive2 { name="doseR"; version="1.12.0"; sha256="1g793np07a9npv7vl8fwr9ijd7hbka6k101py3m99rw4wnp6dv0w"; depends=[digest edgeR lme4 matrixStats mclust RUnit S4Vectors SummarizedExperiment]; }; - dpeak = derive2 { name="dpeak"; version="1.8.0"; sha256="07cv8yd95diwz9aw4d4wqhb5v75rjh8rcii62x0dqb0nf6x47gcn"; depends=[BSgenome IRanges MASS Rcpp]; }; - drawProteins = derive2 { name="drawProteins"; version="1.16.0"; sha256="1rg0kji5rn4zp111cl09dkdd6bichrgd87kqa1623mcxa9xcn7np"; depends=[dplyr ggplot2 httr readr tidyr]; }; - drugTargetInteractions = derive2 { name="drugTargetInteractions"; version="1.4.1"; sha256="1i9c9c7c83z3i3ldm7qz4wmf4p8aaafakcfyfgzdafhaacxgz4y9"; depends=[AnnotationFilter BiocFileCache biomaRt dplyr ensembldb rappdirs RSQLite S4Vectors UniProt_ws]; }; - dupRadar = derive2 { name="dupRadar"; version="1.26.1"; sha256="0lffngmhbld8w2j1njbrk1y41iwbigm1ssac23hlq3p0djad4fxn"; depends=[KernSmooth Rsubread]; }; - dyebias = derive2 { name="dyebias"; version="1.56.0"; sha256="0xciqggk4vm31y9zq05iirkrhb9wy5m8pzzdjkzd4k80dvsiny30"; depends=[Biobase marray]; }; - easier = derive2 { name="easier"; version="1.2.2"; sha256="1l2245qcbji1cv2rzvl3sf8xailr4rr0hiw0lqafk885qdqlxg7v"; depends=[BiocParallel coin DESeq2 dorothea dplyr easierData ggplot2 ggpubr ggrepel matrixStats progeny quantiseqr reshape2 rlang ROCR rstatix]; }; - easyRNASeq = derive2 { name="easyRNASeq"; version="2.32.0"; sha256="1dy1prn7qjvw7kjmq5cgdd0yvpw167f9m2azg1wxn2xfrdyb5ipr"; depends=[Biobase BiocFileCache BiocGenerics BiocParallel biomaRt Biostrings edgeR GenomeInfoDb genomeIntervals GenomicAlignments GenomicRanges IRanges locfit LSD rappdirs Rsamtools S4Vectors ShortRead SummarizedExperiment]; }; - easyreporting = derive2 { name="easyreporting"; version="1.8.0"; sha256="1jpgaa55zqnhqla0kid200c63ghwv0apm7p1g1z5ybrfxdlfrrkv"; depends=[rlang rmarkdown shiny]; }; - ecolitk = derive2 { name="ecolitk"; version="1.68.0"; sha256="07dax788x8p5dxwkw24hnlzkcpy72swzxl4ynhivjwixwy248diz"; depends=[Biobase]; }; - edge = derive2 { name="edge"; version="2.28.1"; sha256="1yp80qc6ji11ln8zxs3g3rm6k0jh2v20sqfm5h2pqlfw3nn5yqal"; depends=[Biobase MASS qvalue snm sva]; }; - edgeR = derive2 { name="edgeR"; version="3.38.4"; sha256="1ww69xrg9qrmq7dix2k48j6akgn58ss3340hm7pjvzx508x1j6n6"; depends=[limma locfit Rcpp]; }; - eegc = derive2 { name="eegc"; version="1.22.0"; sha256="16ixc3bn5qkqy5w38428avzrd078xq5h2r8g0csms9b09hxmj65z"; depends=[AnnotationDbi clusterProfiler DESeq2 DOSE edgeR ggplot2 gplots igraph limma org_Hs_eg_db org_Mm_eg_db pheatmap R_utils S4Vectors sna wordcloud]; }; - eiR = derive2 { name="eiR"; version="1.36.0"; sha256="0pnv2cfdkagq31v2q7x9yfzi1q79nj76k1i0d92wzkxh8j2rnmhh"; depends=[BiocGenerics ChemmineR DBI digest RcppAnnoy RCurl RUnit snow snowfall]; }; - eisaR = derive2 { name="eisaR"; version="1.8.0"; sha256="1c1nmrc6xvmxk40wiwrqysvnslrfr318lypd6qbgh7h3z5n70s0w"; depends=[BiocGenerics edgeR GenomicRanges IRanges limma S4Vectors SummarizedExperiment]; }; - enhancerHomologSearch = derive2 { name="enhancerHomologSearch"; version="1.2.0"; sha256="06wycza921fqycwff7fbyjxp64p7lyqinjglvwgv9jk85pxm1dxp"; depends=[BiocFileCache BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges httr IRanges jsonlite Matrix motifmatchr Rcpp rtracklayer S4Vectors]; }; - enrichTF = derive2 { name="enrichTF"; version="1.12.0"; sha256="0fv50ma7jaqqbrzaznzvk6vza76if40f5vbxvl22s1ymk5chwk50"; 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.16.2"; sha256="0qh7bci3rn6y2fl45izrdb62jcm6j0zxxg4pyp4mvvgjvka5lnss"; depends=[aplot DOSE ggplot2 ggraph ggtree GOSemSim igraph magrittr plyr purrr RColorBrewer reshape2 scatterpie shadowtext yulab_utils]; }; - ensemblVEP = derive2 { name="ensemblVEP"; version="1.38.0"; sha256="1xllmsdxz0v0fg62piwxh2r96k1s4fykkznpn6dzqg749x1nzb68"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges S4Vectors SummarizedExperiment VariantAnnotation]; }; - ensembldb = derive2 { name="ensembldb"; version="2.20.2"; sha256="12n21dcimdhgyjzk33m6xbv0m9ihgyzcf66vr1jr5ycv3rq2s7xc"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges ProtGenerics Rsamtools RSQLite rtracklayer S4Vectors]; }; - epiNEM = derive2 { name="epiNEM"; version="1.20.0"; sha256="1bi0pjmdvlvfjvl6m6r7hd3bd6jdh18i3bnk3s6vpnb52hi35a07"; depends=[BoolNet e1071 graph gtools igraph latex2exp lattice latticeExtra minet mnem pcalg RColorBrewer]; }; - epialleleR = derive2 { name="epialleleR"; version="1.4.0"; sha256="0qw2wvrbfin2l80id06pr779l1mkvlafadkl3ja4s4nmn2ip5yfn"; depends=[BH BiocGenerics data_table GenomeInfoDb GenomicRanges Rcpp Rhtslib stringi SummarizedExperiment VariantAnnotation zlibbioc]; }; - epidecodeR = derive2 { name="epidecodeR"; version="1.4.0"; sha256="1fingfn0rbygvlhkgva6999sw4xc8g7k6w8nm86vw3dz5c77mq5f"; depends=[dplyr EnvStats GenomicRanges ggplot2 ggpubr IRanges rstatix rtracklayer]; }; - epigenomix = derive2 { name="epigenomix"; version="1.36.0"; sha256="15drlib696rylc4952rjnxrc0hfn5nskap93sz6f98b9v1g9gsmk"; depends=[beadarray Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges MCMCpack Rsamtools S4Vectors SummarizedExperiment]; }; - epigraHMM = derive2 { name="epigraHMM"; version="1.4.0"; sha256="13cfc86yz7wvjm3mqnmmcqq0q01w35s4vwzjhvrkwck1yn4kkpf4"; 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.12.0"; sha256="0v002h96b4p2sb30iszcvfvnzqm5dnw8klypmd0496zcr7dqk8jk"; depends=[data_table doParallel foreach GenomicRanges ggplot2 igraph IRanges pheatmap qvalue ReactomePA Rtsne S4Vectors WGCNA]; }; - epimutacions = derive2 { name="epimutacions"; version="1.0.3"; sha256="1ga5z7w5gimzzf0zhqv3ina7vhjkas0pngjmjxpgmpk4c5z6v76j"; depends=[BiocGenerics BiocParallel biomaRt bumphunter epimutacionsData GenomicFeatures GenomicRanges ggplot2 IRanges isotree matrixStats minfi robustbase S4Vectors SummarizedExperiment]; }; - epistack = derive2 { name="epistack"; version="1.2.0"; sha256="0vlxdl99y1hl6pzsc55khgw5r102vvlfqlm2d7z21vnvxr4dwijr"; depends=[BiocGenerics GenomicRanges IRanges plotrix S4Vectors SummarizedExperiment viridisLite]; }; - epivizr = derive2 { name="epivizr"; version="2.26.0"; sha256="1hzhx062qwfzg2fr61zzsnfzzkyn3z0i5b1pdxc99ba32qx1bphz"; depends=[bumphunter epivizrData epivizrServer GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; - epivizrChart = derive2 { name="epivizrChart"; version="1.18.0"; sha256="0pyyypp75nbbxqcsid50r16qdhj280snl4jwbxqfjnqiyjh7wsrm"; depends=[BiocGenerics epivizrData epivizrServer htmltools rjson]; }; - epivizrData = derive2 { name="epivizrData"; version="1.24.0"; sha256="0givnx3if0jrxaflrz89g0qfzd9vnbm4dxc9mkyi06z8nbnhvwd0"; depends=[Biobase ensembldb epivizrServer GenomeInfoDb GenomicFeatures GenomicRanges IRanges OrganismDbi S4Vectors SummarizedExperiment]; }; - epivizrServer = derive2 { name="epivizrServer"; version="1.24.0"; sha256="0qs9l270pbpgrc1fim1spylbncgjkjrkd2mv2xvq7bvfc2h52wqk"; depends=[httpuv mime R6 rjson]; }; - epivizrStandalone = derive2 { name="epivizrStandalone"; version="1.24.0"; sha256="1i8s27sw7dpsd6cmpfchc4qby34jbyqabdm0xplva89jfjn40gda"; depends=[BiocGenerics epivizr epivizrServer GenomeInfoDb GenomicFeatures git2r S4Vectors]; }; - erccdashboard = derive2 { name="erccdashboard"; version="1.30.0"; sha256="1nnxp34cj9zgk0bspq92jx9hi33777wdcvw3acykq9vy536ndi80"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr qvalue reshape2 ROCR scales stringr]; }; - erma = derive2 { name="erma"; version="1.12.0"; sha256="1ilq01cr2ipxpmp422fikiz6nj4nasjhj0ikcagjn2zmmarpgi1b"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel GenomeInfoDb GenomicFiles GenomicRanges ggplot2 Homo_sapiens IRanges rtracklayer S4Vectors shiny SummarizedExperiment]; }; - esATAC = derive2 { name="esATAC"; version="1.18.0"; sha256="043r0mh4m26bx1r07alvidhl4bs8hxz5cmpkj6inl3q7xcv5wx0b"; depends=[AnnotationDbi BiocGenerics BiocManager Biostrings BSgenome ChIPseeker clusterProfiler corrplot digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 igraph IRanges JASPAR2018 knitr magrittr motifmatchr pipeFrame R_utils Rbowtie2 Rcpp rJava rmarkdown Rsamtools rtracklayer S4Vectors ShortRead TFBSTools VennDiagram]; }; - escape = derive2 { name="escape"; version="1.6.0"; sha256="0llvja5aaqybr3ksyl7f1qjga0ax920y5mgnc5qbqbgzn02zh1fg"; depends=[BiocParallel broom data_table dplyr ggplot2 ggridges GSEABase GSVA Matrix MatrixGenerics msigdbr patchwork reshape2 rlang SingleCellExperiment stringr SummarizedExperiment UCell]; }; - esetVis = derive2 { name="esetVis"; version="1.22.0"; sha256="1nsh1hybcjf8gc79zzsbjjfr6l40l4n5jrnhrx6my35fmfn1c482"; depends=[Biobase hexbin MASS MLP mpm Rtsne]; }; - eudysbiome = derive2 { name="eudysbiome"; version="1.26.0"; sha256="1pmk1x221hpds68yq2izwrfmvwd6v0gi0r40ggnlc9zrpx2s9fpm"; depends=[Biostrings plyr R_utils Rsamtools]; }; - evaluomeR = derive2 { name="evaluomeR"; version="1.12.0"; sha256="0wvha5ppx937b6qhxf95j0bwav07gq1bs2hw2q487mssksd7s1r2"; depends=[class cluster corrplot flexmix fpc ggdendro ggplot2 kableExtra MASS matrixStats mclust MultiAssayExperiment plotrix prabclus randomForest Rdpack reshape2 SummarizedExperiment]; }; - exomeCopy = derive2 { name="exomeCopy"; version="1.42.0"; sha256="0wfigjicbz22dijibbcz38j7javlj891q2f9mgwjpg6pwb0xi178"; depends=[GenomeInfoDb GenomicRanges IRanges Rsamtools]; }; - exomePeak2 = derive2 { name="exomePeak2"; version="1.8.1"; sha256="1vr5sijfddzss96zw560i46dgjw5jwrmi5dbgqjvbrrrr371sbk2"; depends=[BiocGenerics BiocParallel Biostrings BSgenome DESeq2 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges magrittr mclust Rsamtools rtracklayer S4Vectors speedglm SummarizedExperiment]; }; - extraChIPs = derive2 { name="extraChIPs"; version="1.0.4"; sha256="1b6kfs0lngvl6wy6a5d5qavls8jakbkjhyq7acrjgqnd94cqndr5"; depends=[BiocIO BiocParallel broom ComplexUpset csaw dplyr edgeR EnrichedHeatmap forcats GenomeInfoDb GenomicInteractions GenomicRanges ggforce ggplot2 ggrepel ggside glue Gviz InteractionSet IRanges limma RColorBrewer rlang Rsamtools rtracklayer S4Vectors scales stringr SummarizedExperiment tibble tidyr tidyselect vctrs VennDiagram]; }; - fCCAC = derive2 { name="fCCAC"; version="1.22.0"; sha256="1dn8srjg505725l3arx3cajd2zf0lipq9sqhqrym7km4vlpj58qn"; depends=[ComplexHeatmap fda genomation GenomicRanges ggplot2 IRanges RColorBrewer S4Vectors]; }; - fCI = derive2 { name="fCI"; version="1.26.0"; sha256="17gdknml04m18ds0yjik8h8c778r0jqpd182yhzfzq2gldngnaya"; depends=[FNN gtools psych rgl VennDiagram zoo]; }; - fabia = derive2 { name="fabia"; version="2.42.0"; sha256="04apwymadah5vidbyg0ayp1lx6955c2626zgb6lhj6jhkhzqqxdv"; depends=[Biobase]; }; - factDesign = derive2 { name="factDesign"; version="1.72.0"; sha256="0q6bd3fv6s3br19wivaf2qpcxafw244nvipxixp8ss7a4zgn4qf7"; depends=[Biobase]; }; - famat = derive2 { name="famat"; version="1.6.6"; sha256="1fj4j3i632dysj5mj03dlbhjs7zmyrh485z5sqdxkj5cr3gjiw24"; depends=[BiasedUrn clusterProfiler dplyr DT GO_db gprofiler2 KEGGREST magrittr mgcv ontologyIndex org_Hs_eg_db plotly reactome_db rWikiPathways shiny shinyBS shinydashboard stringr tidyr]; }; - farms = derive2 { name="farms"; version="1.48.0"; sha256="1mnmgd846ayjx1g31pwk186pq6pv0sdq114axpq41728ai3v347c"; depends=[affy Biobase MASS]; }; - fastLiquidAssociation = derive2 { name="fastLiquidAssociation"; version="1.32.0"; sha256="0q6zx6kwgv3lzl2gi8f6c9yzc6vl7kafjfbqnaa7q3a2h26dw9y4"; depends=[doParallel Hmisc impute LiquidAssociation preprocessCore WGCNA]; }; - fastreeR = derive2 { name="fastreeR"; version="1.0.0"; sha256="1skqg527nfpwknyj9k369l4qkzdm02dn262g8v3m4y75i9dw9s58"; depends=[ape data_table dynamicTreeCut R_utils rJava stringr]; }; - fastseg = derive2 { name="fastseg"; version="1.42.0"; sha256="1cr1b1jbgp1z1zpf71kl7mljbm2jpi6b97bf3bll3gnagfm489hy"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors]; }; - fcScan = derive2 { name="fcScan"; version="1.10.0"; sha256="0yv7ifw0xxx1v9z8dxszv0cb72q3frd74dyxfbvrcs6x9y9v3jzp"; depends=[doParallel foreach GenomicRanges IRanges plyr rtracklayer SummarizedExperiment VariantAnnotation]; }; - fcoex = derive2 { name="fcoex"; version="1.10.0"; sha256="0rkxxf71c5w4pfbzndp7mvq5aqz6qab4msb8xafhf1qakm4gc66m"; depends=[clusterProfiler data_table dplyr FCBF ggplot2 ggrepel igraph intergraph Matrix network pathwayPCA progress scales SingleCellExperiment sna stringr]; }; - fdrame = derive2 { name="fdrame"; version="1.68.0"; sha256="0a0vlji2knqkqa6waf6jcvvkhddn3gni0nnzwyhl1b48spqsim5l"; depends=[]; }; - fedup = derive2 { name="fedup"; version="1.4.0"; sha256="1qf9mf9zzli1l8m47slzxpb6j5gwn5khjgvw0abmw5y3m82r2fiq"; depends=[data_table dplyr forcats ggplot2 ggthemes openxlsx RColorBrewer RCy3 tibble]; }; - ffpe = derive2 { name="ffpe"; version="1.40.0"; sha256="034w4q9rgzad5mhk1vjpsgdzcp3snh9bk322gc581sls17502wdb"; depends=[affy Biobase BiocGenerics lumi methylumi sfsmisc TTR]; }; - fgga = derive2 { name="fgga"; version="1.4.0"; sha256="0m2vr8ny5m635ycsk819l65ppfwlyymb5vkzma0w0f25z328cg2b"; depends=[BiocFileCache curl e1071 graph gRbase jsonlite RBGL]; }; - fgsea = derive2 { name="fgsea"; version="1.22.0"; sha256="0innyggai6l4fpl4qrblzdc52vqw9jaszmip0yr1lv7rzwyl6mpg"; depends=[BH BiocParallel data_table fastmatch ggplot2 gridExtra Matrix Rcpp]; }; - fishpond = derive2 { name="fishpond"; version="2.2.0"; sha256="0svp4yh0srhzbbxy1grchzdd9yzchadjp3d2sy2n9xpwxzpkhrym"; depends=[abind GenomicRanges gtools IRanges jsonlite Matrix matrixStats qvalue Rcpp S4Vectors SingleCellExperiment SummarizedExperiment svMisc]; }; - flagme = derive2 { name="flagme"; version="1.52.0"; sha256="147m79v00gfk4fqjy9skacscnfyslxz0i9y4g7a5vwxz3mrrzidc"; depends=[CAMERA gcspikelite gplots MASS SparseM xcms]; }; - flowAI = derive2 { name="flowAI"; version="1.26.0"; sha256="19964p0gni9x61fx24alb713dqyqd816l8s6azm6q0v89y15rqzl"; depends=[changepoint flowCore ggplot2 knitr plyr RColorBrewer reshape2 rmarkdown scales]; }; - flowBeads = derive2 { name="flowBeads"; version="1.34.0"; sha256="1nn19kv3z0pv3hbvazp1x1lmm8rjw392q4d74rsz1hfwz0vj9j97"; depends=[Biobase flowCore knitr rrcov xtable]; }; - flowBin = derive2 { name="flowBin"; version="1.32.0"; sha256="10h7jhadmr1l8qw94fsxcrq581ir9136w91ah84c95m7297nr5r8"; depends=[BiocGenerics class flowCore flowFP limma snow]; }; - flowCHIC = derive2 { name="flowCHIC"; version="1.30.0"; sha256="0zj76ymr6cs27pg0k9gwzr67y5c3iav40fs4rjcjsi26bv5vxpsy"; depends=[EBImage flowCore ggplot2 hexbin vegan]; }; - flowCL = derive2 { name="flowCL"; version="1.34.0"; sha256="05dcxl99sw6d1ngq3wl61y1knmyrf4l9b7nrfmcbigb1isxgjy26"; depends=[graph Rgraphviz]; }; - flowClean = derive2 { name="flowClean"; version="1.34.1"; sha256="0zqgccbfqm6hpi07i5nq5gd626imb6w5xkfb6q8pc0nkkz48mrfh"; depends=[bit changepoint flowCore sfsmisc]; }; - flowClust = derive2 { name="flowClust"; version="3.34.0"; sha256="055vm9s8aha92znhpjqkipzprw8bkrinwjaik4ygmhym7w6vbblk"; depends=[Biobase BiocGenerics flowCore graph]; }; - flowCore = derive2 { name="flowCore"; version="2.8.0"; sha256="17nci6rc4i0vs0ibw5q8zy30ap7q4550qpq4ifkbblqbyzxlzkhr"; depends=[BH Biobase BiocGenerics cytolib matrixStats Rcpp RcppArmadillo RProtoBufLib S4Vectors]; }; - flowCut = derive2 { name="flowCut"; version="1.6.0"; sha256="0p8mgx1q3hw9pfhg41mv9pigx0rakvhsdx5f3dlsqdv2ll85gi98"; depends=[Cairo e1071 flowCore flowDensity]; }; - flowCyBar = derive2 { name="flowCyBar"; version="1.32.0"; sha256="0hrccry4a5m3gg9zkawvhhlr4a3062vrq50gg5c48s0jvdng03hx"; depends=[gplots vegan]; }; - flowDensity = derive2 { name="flowDensity"; version="1.30.0"; sha256="0g8h43w9cb8l8dz14lahxqgy7ras48dl06c38b8j9bpissav68f3"; depends=[car flowCore flowViz flowWorkspace gplots RFOC rgeos sp]; }; - flowFP = derive2 { name="flowFP"; version="1.54.0"; sha256="0hmlajm6vdzrx3vmhi4wv4l0qszqc7z18ls361zrk1679nyxa4ms"; depends=[Biobase BiocGenerics flowCore flowViz]; }; - flowGraph = derive2 { name="flowGraph"; version="1.4.0"; sha256="0im9mjyynfl7yda6xcwbzai42p2q0q3g0f0j82hh044lidhpc14d"; depends=[data_table effsize furrr future ggiraph ggplot2 ggrepel gridExtra htmlwidgets igraph Matrix matrixStats purrr Rdpack stringi stringr visNetwork]; }; - flowMap = derive2 { name="flowMap"; version="1.34.0"; sha256="1yiw3fs850yi712bcx5j1v8sh0yavqzr0hnlxjbx6rpfp9wnrs5a"; depends=[abind ade4 doParallel Matrix reshape2 scales]; }; - flowMatch = derive2 { name="flowMatch"; version="1.32.0"; sha256="095azgkvjc5h4ycjgdw846gn4qizw29xmk4l5mqir4yvnlhxzaw9"; depends=[Biobase flowCore Rcpp]; }; - flowMeans = derive2 { name="flowMeans"; version="1.56.0"; sha256="1n4li43ydwwf5gvgmdml4ba28cxymybg5wnz6jvp35n959fwxv6y"; depends=[Biobase feature flowCore rrcov]; }; - flowMerge = derive2 { name="flowMerge"; version="2.44.0"; sha256="00sypimyhjgy44jh0ba200by79kgypm7yyqy7hr7y80rzxgkn55s"; depends=[feature flowClust flowCore foreach graph Rgraphviz rrcov snow]; }; - flowPeaks = derive2 { name="flowPeaks"; version="1.42.0"; sha256="1a35ss0szgscfkvqvpdvvb9vgclhml27ggj7rpw4ndkl0m61565f"; depends=[]; }; - flowPloidy = derive2 { name="flowPloidy"; version="1.22.0"; sha256="0v5yci4zlf94wf0zgzdbmmlx0hcx5rz2d1dzmb0w8b6sckfvi3b6"; depends=[car caTools flowCore knitr minpack_lm rmarkdown shiny]; }; - flowPlots = derive2 { name="flowPlots"; version="1.44.0"; sha256="0z38qvn2hd4ar17g8vp8fyj595nsys3yhb0m3fvv24mh48vasp4y"; depends=[]; }; - flowSpecs = derive2 { name="flowSpecs"; version="1.10.0"; sha256="1kjcphza5prrzc52aavshyshs2ck0spayp5jvrgk26a2dpk6xqhk"; depends=[Biobase BiocGenerics BiocParallel flowCore ggplot2 hexbin reshape2 zoo]; }; - flowStats = derive2 { name="flowStats"; version="4.8.2"; sha256="1x01gg5ifxh3wp0cp5a23lr9v6l9q5qg8145q2pgn904jkx5wldc"; depends=[Biobase BiocGenerics cluster corpcor fda flowCore flowViz flowWorkspace KernSmooth ks lattice MASS mnormt ncdfFlow RColorBrewer rrcov]; }; - flowTime = derive2 { name="flowTime"; version="1.20.0"; sha256="1vv6s87brnfrs52s8rspq1xrs6ymq6gcb78ci7dvjj26y3p8pkfn"; depends=[dplyr flowCore magrittr plyr rlang tibble]; }; - flowTrans = derive2 { name="flowTrans"; version="1.48.0"; sha256="03amxbhfi3fkk9ip16bvdfnlqzi1by2xywcm8bd9ndimpqq12y8s"; depends=[flowClust flowCore flowViz]; }; - flowUtils = derive2 { name="flowUtils"; version="1.59.0"; sha256="11x362dqb9mjlsbq6g1qkb8hhnkvm22z5s3wkgmpyy9kyifjkm26"; depends=[Biobase corpcor flowCore graph RUnit XML]; }; - flowVS = derive2 { name="flowVS"; version="1.28.0"; sha256="1fhfmwh7ji3n823zl410zcgz0nmjmbc0awl3149vvl2s0p93jj2d"; depends=[flowCore flowStats flowViz]; }; - flowViz = derive2 { name="flowViz"; version="1.60.2"; sha256="08rwzc26jns0wwjsqqmf60bpxsckr5x8skdn9iwl8grp81npcc95"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; }; - flowWorkspace = derive2 { name="flowWorkspace"; version="4.8.0"; sha256="0riyi9628cx1j5x6hmdd28yq75xh25j8ckcdz8dnb94dpvnhaqss"; depends=[aws_s3 aws_signature BH Biobase BiocGenerics cytolib data_table DelayedArray digest dplyr flowCore ggplot2 graph lattice latticeExtra matrixStats ncdfFlow RBGL Rcpp RcppArmadillo RcppParallel Rgraphviz Rhdf5lib RProtoBufLib S4Vectors scales XML]; }; - flowcatchR = derive2 { name="flowcatchR"; version="1.30.0"; sha256="1ixq18rmarg4kr6l747699b48zz6cj131zyfbmj5i28sdmbwjk1d"; depends=[abind BiocParallel colorRamps EBImage plotly shiny]; }; - fmcsR = derive2 { name="fmcsR"; version="1.38.0"; sha256="1mblmk21dxc9v2fikhvfg2njwgl190gkysppl6msxizwcmxsmh30"; depends=[BiocGenerics ChemmineR RUnit]; }; - fmrs = derive2 { name="fmrs"; version="1.6.0"; sha256="1jds04azfjdpn9pmmh0ghc274h4iqz5334gv6aq30w2m7gws35nz"; depends=[survival]; }; - fobitools = derive2 { name="fobitools"; version="1.4.0"; sha256="1y50xyiy02zpnvvxfp0sskgrp515m2d54nn6gqjsdv0vv8wlkvcs"; depends=[clisymbols crayon dplyr fgsea ggplot2 ggraph magrittr ontologyIndex purrr RecordLinkage stringr textclean tictoc tidygraph tidyr vroom]; }; - frenchFISH = derive2 { name="frenchFISH"; version="1.8.0"; sha256="12nixzdqkaxfv3jwcbf20npc9hpzkxpsm4a5znivg8ac60cw286p"; depends=[MCMCpack NHPoisson]; }; - frma = derive2 { name="frma"; version="1.48.0"; sha256="1w0q34jkmzqwdjxl4xrvg5nmv11n4l2qf180fwrknvp8am6nf6yx"; depends=[affy Biobase BiocGenerics DBI MASS oligo oligoClasses preprocessCore]; }; - frmaTools = derive2 { name="frmaTools"; version="1.48.0"; sha256="0paas86hfqkvcgv00bbgidcaps8p3gvmfy8prq4rcda4lv8i67bl"; depends=[affy Biobase DBI preprocessCore]; }; - funtooNorm = derive2 { name="funtooNorm"; version="1.20.0"; sha256="02wkjj2nbghwa0ybmh58hl7r2863h9nw95rsd42xzvcp9vxkpfzz"; depends=[GenomeInfoDb IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest matrixStats minfi pls]; }; - gCrisprTools = derive2 { name="gCrisprTools"; version="2.2.2"; sha256="023csgiik16k72jnb3322qvbrz0vl6pkmdmki29jlj1wmdfz7x6j"; depends=[Biobase ComplexHeatmap ggplot2 limma rmarkdown RobustRankAggreg SummarizedExperiment]; }; - gaga = derive2 { name="gaga"; version="2.42.0"; sha256="17a2a73lgmgmrkznysd23c1qbddxcsnjdma7xa0pfjwrwskcisxb"; depends=[Biobase coda EBarrays mgcv]; }; - gage = derive2 { name="gage"; version="2.46.1"; sha256="01y04jcy7a9fksyhj0nq37n1inkrpqf4qv117lflvipbx0dsw4gl"; depends=[AnnotationDbi GO_db graph KEGGREST]; }; - gaggle = derive2 { name="gaggle"; version="1.64.0"; sha256="1w2819cx7s2hazifhv8iw54jjcvzacjwcpix045ay4fa98ryg7fz"; depends=[graph rJava RUnit]; }; - gaia = derive2 { name="gaia"; version="2.39.0"; sha256="023mw2dy6dni7h7a1ild1y6l741kp9bmjzzfyi70jipji1jig4pa"; depends=[]; }; - garfield = derive2 { name="garfield"; version="1.24.0"; sha256="1dp8z778ca4pj8da9nlhm80845mv4k7njnz5q4cdy7w1bhlfcjb7"; depends=[]; }; - gcapc = derive2 { name="gcapc"; version="1.20.0"; sha256="18y1xs8zy76j9vbxmx7d6g3rd2mw8diib083948l4sr2ipnb9rvl"; depends=[BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS matrixStats Rsamtools S4Vectors]; }; - gcatest = derive2 { name="gcatest"; version="1.26.0"; sha256="1b6iscydh2c70dv2m5qdjf6zc3wbmk2jk18x00rbcxl10ckc451a"; depends=[lfa]; }; - gcrma = derive2 { name="gcrma"; version="2.68.0"; sha256="13a8igr2b02gsa6n3437kb33wg6h7si82fmqi35dzpfzhvx0qf6d"; depends=[affy affyio Biobase BiocManager Biostrings XVector]; }; - gdsfmt = derive2 { name="gdsfmt"; version="1.32.0"; sha256="1cdwyivgfc6yw5hj9b3j57wx55gckwhx6fwx2lvqynrjzjyzf3q0"; depends=[]; }; - geNetClassifier = derive2 { name="geNetClassifier"; version="1.36.0"; sha256="1kh7mp5h0n7yd1klcd7w4v7i3fh9pkmvgf7189wangfzbcsr4f70"; depends=[Biobase e1071 EBarrays minet]; }; - gemini = derive2 { name="gemini"; version="1.10.0"; sha256="0kx38b5xaksn9ikk98b60hnalnxlcb9xs3vwbwsn90cg9h94cdar"; depends=[dplyr ggplot2 magrittr mixtools pbmcapply scales]; }; - genArise = derive2 { name="genArise"; version="1.72.0"; sha256="0jmk7ddwvh8hy9ri6a6rfhmbaglpqq43qxh1hjdw5k4ci87l7kd3"; depends=[locfit tkrplot xtable]; }; - genbankr = derive2 { name="genbankr"; version="1.24.0"; sha256="141adiac75vn232cn8bp1skzn2h4ns85k3g5wq179b6y6mr4zcv6"; depends=[Biobase BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges rtracklayer S4Vectors VariantAnnotation]; }; - geneAttribution = derive2 { name="geneAttribution"; version="1.22.0"; sha256="0f0nralfhzv59q9ia3mjdhdsrvi34z5mafgxb6gsb3ilbvx0yvz7"; depends=[BiocGenerics GenomeInfoDb GenomicFeatures GenomicRanges IRanges org_Hs_eg_db rtracklayer]; }; - geneClassifiers = derive2 { name="geneClassifiers"; version="1.20.0"; sha256="10kb03lkac3cc1pagl6az0phhw8nhmrckarshf9xqncj99rslbcw"; depends=[Biobase BiocGenerics]; }; - geneRecommender = derive2 { name="geneRecommender"; version="1.68.0"; sha256="1sl8mlz7nzskixjh5358wx4jvamzp5792dj2irjbfab2cr3kj8lc"; depends=[Biobase]; }; - geneRxCluster = derive2 { name="geneRxCluster"; version="1.32.0"; sha256="1q9l7734n2w23945x5sfi5yrvs09fq9b62y1li240amajpdqws1z"; depends=[GenomicRanges IRanges]; }; - geneXtendeR = derive2 { name="geneXtendeR"; version="1.22.0"; sha256="0qbhgarlr71fpg1ggxbqnj4h5n2wywl2zm95vdqr6vypplg6hjfa"; depends=[AnnotationDbi BiocStyle data_table dplyr GO_db networkD3 org_Rn_eg_db RColorBrewer rtracklayer SnowballC tm wordcloud]; }; - genefilter = derive2 { name="genefilter"; version="1.78.0"; sha256="1lp3alnljhsil8zylf8rvf8ik4wmsyciy3ij4rr9l4191dkkp4aq"; depends=[annotate AnnotationDbi Biobase BiocGenerics survival]; }; - genefu = derive2 { name="genefu"; version="2.28.0"; sha256="1a3q0qh5z5zva0d4jz521pcmig12h1hib3prbnnw1a74jxryan1i"; depends=[AIMS amap biomaRt iC10 impute limma mclust survcomp]; }; - geneplast = derive2 { name="geneplast"; version="1.22.0"; sha256="1k3s6ic2bawa690s641bqa3s412rk628cc55dwd3i43064ff25rc"; depends=[ape data_table igraph snow]; }; - geneplotter = derive2 { name="geneplotter"; version="1.74.0"; sha256="13230mzrdralnvf9jp032s16a8mk3kx5476nnvpa4pvcgp1i1ijc"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; }; - genoCN = derive2 { name="genoCN"; version="1.48.0"; sha256="0646y4y2wv367gdj0cy78hddyy0h964zz5ij8v9lzs0w63a72497"; depends=[]; }; - genomation = derive2 { name="genomation"; version="1.28.0"; sha256="0rvay7gs4g2wi6h42kln8xwy9b05axj1x8mkfayl6pnnlva6xj79"; depends=[Biostrings BSgenome data_table GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges matrixStats plotrix plyr Rcpp readr reshape2 Rsamtools rtracklayer S4Vectors seqPattern]; }; - genomeIntervals = derive2 { name="genomeIntervals"; version="1.52.0"; sha256="1b2i1bdl9n1a7c9v8757w76s1aahhph6y0a7z9axanb8g8gx7bdp"; depends=[BiocGenerics GenomeInfoDb GenomicRanges intervals IRanges S4Vectors]; }; - genomes = derive2 { name="genomes"; version="3.26.0"; sha256="1a8cla2k3x5x3pvxahzl5vfym5dxcffggk1jwzp91qqkp6dss0jf"; depends=[curl readr]; }; - genomicInstability = derive2 { name="genomicInstability"; version="1.2.0"; sha256="1lx4ln867wxc2bhn24s7b4xsrb1lymq48lw6dkc4s9dm98h49y4z"; depends=[checkmate mixtools SummarizedExperiment]; }; - genotypeeval = derive2 { name="genotypeeval"; version="1.28.0"; sha256="13pyr82xcwzmch9w0rlzlwzis5qs9fqsy0dknn7n79jj5ws6snr6"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer VariantAnnotation]; }; - genphen = derive2 { name="genphen"; version="1.24.0"; sha256="1m60qagcxviix4zjzfhvrwchbjq2clss6mivb8q07bcq369yw1b8"; depends=[Biostrings doParallel e1071 foreach ranger Rcpp rPref rstan]; }; - gep2pep = derive2 { name="gep2pep"; version="1.16.0"; sha256="1ry5h095gg1kq9idsq94dz843ldf6jz1pyg9sryfkszzyi7ddfhh"; depends=[Biobase digest foreach GSEABase iterators repo rhdf5 XML]; }; - gespeR = derive2 { name="gespeR"; version="1.28.0"; sha256="0i2r79k77rkw7yhwvpzif1m0llfxv42i9inad7i46630dxpwa1bf"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; }; - getDEE2 = derive2 { name="getDEE2"; version="1.6.0"; sha256="0c2air5mra7g80y7r7qpy2hplrh2k38jj5zn4sa5a4fcpniifx7v"; depends=[htm2txt SummarizedExperiment]; }; - geva = derive2 { name="geva"; version="1.4.0"; sha256="0zc9zxw2bifkkiqivmg8bf8xn9sff13bih55k9nxdabsgkkwhyad"; depends=[dbscan fastcluster matrixStats]; }; - ggbio = derive2 { name="ggbio"; version="1.44.1"; sha256="0iyhjalwq1jmldpn20iv8l2kmz6sm20ddry2yz2zn7yq0wszp3vg"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings biovizBase BSgenome ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 rlang Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; }; - ggcyto = derive2 { name="ggcyto"; version="1.24.1"; sha256="1cw60x78vqzjmgb5xd3sxyz6zwdaffp3byk34z8d4b3wkh530325"; depends=[data_table flowCore flowWorkspace ggplot2 gridExtra hexbin ncdfFlow plyr RColorBrewer rlang scales]; }; - ggmanh = derive2 { name="ggmanh"; version="1.0.0"; sha256="0bcdjvhablnxvakin5a4yhdpv5y5n9rqm21yz51mwjdfgz00p2mb"; depends=[gdsfmt ggplot2 ggrepel RColorBrewer rlang scales SeqArray]; }; - ggmsa = derive2 { name="ggmsa"; version="1.2.3"; sha256="12s6bs8b8lgcllc540dn4mjdvij2cx28l7zgnz8yzcb05dqnisbr"; depends=[aplot Biostrings dplyr ggalt ggforce ggplot2 ggtree magrittr R4RNA RColorBrewer seqmagick statebins tidyr]; }; - ggspavis = derive2 { name="ggspavis"; version="1.2.0"; sha256="0m0wfswz1jn7zhq527qa7q1x028zzrhg1zkw781w5p5i7ky0qzqf"; depends=[ggplot2 ggside SingleCellExperiment SpatialExperiment SummarizedExperiment]; }; - ggtree = derive2 { name="ggtree"; version="3.4.4"; sha256="0h1qlhn4rj7jgd9vrja7lykaglyfvnzwkghvsqj1mvp4niwli7y5"; depends=[ape aplot dplyr ggfun ggplot2 magrittr purrr rlang scales tidyr tidytree treeio yulab_utils]; }; - ggtreeExtra = derive2 { name="ggtreeExtra"; version="1.6.1"; sha256="0jhk2wqw8mi99n9063wllbl4ajrz1lzqdn7b827316q7ynh8z6ma"; depends=[ggnewscale ggplot2 ggtree rlang tidytree]; }; - girafe = derive2 { name="girafe"; version="1.48.0"; sha256="0633w8dyzrwqgnzj7zhr1hwqh617qpcp7cvs33pgsyxmdh52i32p"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; }; - glmGamPoi = derive2 { name="glmGamPoi"; version="1.8.0"; sha256="0k1qyljg89jvc4g3ixv8n50a1fmw3yfa7xjdvrfhbk3xsm6n1lh9"; depends=[beachmat BiocGenerics DelayedArray DelayedMatrixStats HDF5Array matrixStats Rcpp RcppArmadillo SummarizedExperiment]; }; - glmSparseNet = derive2 { name="glmSparseNet"; version="1.14.1"; sha256="0xpbxgrfrgysnfcj757a0i9235pivwpga5xz052izyw2p5nfrlr2"; depends=[biomaRt digest dplyr forcats futile_logger futile_options ggplot2 glmnet glue httr Matrix MultiAssayExperiment readr reshape2 stringr SummarizedExperiment survminer]; }; - globalSeq = derive2 { name="globalSeq"; version="1.24.0"; sha256="03fb4cd4nbyik7qjblq1fr94gn2xv6jvnb0jzxksdfb7lj8b0axi"; depends=[]; }; - globaltest = derive2 { name="globaltest"; version="5.50.0"; sha256="0mdh9xm9l70i5y4783xv76arx0601w6sz3l8h5bmpsavsz8kc9s5"; depends=[annotate AnnotationDbi Biobase survival]; }; - gmapR = derive2 { name="gmapR"; version="1.38.0"; sha256="0xmc9js5wpnaggf3ldplyxw5w4f2abavlsfzirr2qpik0ha8f7v8"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; - gmoviz = derive2 { name="gmoviz"; version="1.8.0"; sha256="110pdblqnr2flmb2gvba6l22p6mrkrqzd1fi3c6pr80hshs7gc95"; depends=[BiocGenerics Biostrings circlize colorspace ComplexHeatmap GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gridBase IRanges pracma Rsamtools rtracklayer S4Vectors]; }; - goProfiles = derive2 { name="goProfiles"; version="1.58.0"; sha256="1cdnqsb00gbf9ff9bl19inkh20vmppnda2ib85alvwdbzmhsgflw"; depends=[AnnotationDbi Biobase CompQuadForm GO_db stringr]; }; - goSTAG = derive2 { name="goSTAG"; version="1.20.0"; sha256="12ks45lglc23ipkbn89vdlf8l441g9kd2xh49qwinsj6c8zvmd75"; depends=[AnnotationDbi biomaRt GO_db memoise]; }; - goTools = derive2 { name="goTools"; version="1.70.0"; sha256="1bxxwrn420vlwkc9jn8jjrvykzzsr7j11lb6mv0i1zrkwpmcmcgp"; depends=[AnnotationDbi GO_db]; }; - goseq = derive2 { name="goseq"; version="1.48.0"; sha256="1w0rwzhqkvp2x7y5v0qcyjbss0p95gb1jrnx5sdkqginbvrmrd48"; depends=[AnnotationDbi BiasedUrn BiocGenerics geneLenDataBase GO_db mgcv]; }; - gpart = derive2 { name="gpart"; version="1.13.0"; sha256="1518wjkaw22ckgpwl6si83bhijvib0r0kgs9s4das41f0ygi92sd"; depends=[AnnotationDbi biomaRt data_table GenomicRanges Homo_sapiens igraph IRanges OrganismDbi Rcpp TxDb_Hsapiens_UCSC_hg38_knownGene]; }; - gpls = derive2 { name="gpls"; version="1.68.0"; sha256="0ai49lk7pba7k42p9wb67sp744gvkkb2rgfqzdpdwnjmndfxqyib"; depends=[]; }; - gprege = derive2 { name="gprege"; version="1.39.0"; sha256="12yjyb7a7jc86hdi3a3cavqxfzkhmds1m2vigzw5ihhx6028pa78"; depends=[]; }; - gpuMagic = derive2 { name="gpuMagic"; version="1.12.0"; sha256="1g6zxs0wjj6fh23iv65iagyc8lrnzdjkbjv1yf8fq57brzhdl8zl"; depends=[BiocGenerics Deriv DescTools digest pryr Rcpp stringr]; }; - granulator = derive2 { name="granulator"; version="1.4.0"; sha256="0bw07kcrg3cwd73crfgm71hdjrp9pprrg5mzx55rmabymn78915s"; depends=[cowplot dplyr dtangle e1071 epiR ggplot2 ggplotify limSolve magrittr MASS nnls pheatmap purrr rlang tibble tidyr]; }; - graper = derive2 { name="graper"; version="1.12.0"; sha256="18dfk4d9cxgzmgb8wbagd1qlvlpwgs6nzdz6nzif6n4l6jg8x4b7"; depends=[BH cowplot ggplot2 Matrix matrixStats Rcpp RcppArmadillo]; }; - graph = derive2 { name="graph"; version="1.74.0"; sha256="1b8hrjwjg82kicls1496fxfzv75xjvq2k6r9apzsd3qlbyg3ilg4"; depends=[BiocGenerics]; }; - graphite = derive2 { name="graphite"; version="1.42.0"; sha256="0nl5mkgrvf7vsqjy48ij9b1dmxfvp9lf8cpay55h93c4qz4x606g"; depends=[AnnotationDbi graph httr rappdirs rlang]; }; - groHMM = derive2 { name="groHMM"; version="1.30.1"; sha256="0v2mk7xcy483w2nygpmyjp73kj3v5pkk1kf1wr41n33dxqlddqai"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; }; - gscreend = derive2 { name="gscreend"; version="1.10.0"; sha256="1dymj9s11nqjv25a3adnhllkgi5dw5lvhgxkg6sd7qpkh1bvbmrx"; depends=[BiocParallel fGarch nloptr SummarizedExperiment]; }; - gsean = derive2 { name="gsean"; version="1.16.1"; sha256="1wmz760qyg281i62xmizy3p2ajfb4s99wnss9h9yys2skmqcl1vg"; depends=[fgsea PPInfer]; }; - gtrellis = derive2 { name="gtrellis"; version="1.28.0"; sha256="1s4xczzv6hz2kyv32xgcq84540w75qr3f644w1s4c3kwxgyq2gff"; depends=[circlize GenomicRanges GetoptLong IRanges]; }; - gwascat = derive2 { name="gwascat"; version="2.28.1"; sha256="19ymdxj8966i4yk0zalfw23938cpv4q7pywg4qb242p44na5y9sl"; depends=[AnnotationDbi AnnotationHub BiocFileCache Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges readr S4Vectors snpStats VariantAnnotation]; }; - gwasurvivr = derive2 { name="gwasurvivr"; version="1.14.0"; sha256="1cdknh3ib417ni76wcbns54syqycslj0nzip4pw3sqnsif361ak0"; depends=[GWASTools matrixStats SNPRelate SummarizedExperiment survival VariantAnnotation]; }; - h5vc = derive2 { name="h5vc"; version="2.30.0"; sha256="01vvf4bf4a5sfj5rz1b3bc8smvw3j260q4q11bqbq2xaw5lg64q7"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra h5vcData IRanges reshape rhdf5 Rhtslib Rsamtools S4Vectors]; }; - hapFabia = derive2 { name="hapFabia"; version="1.38.0"; sha256="1l50p1hnym8amvdfazp36zp3ijbfsgd8sddbcqivd3rp01898mmr"; depends=[Biobase fabia]; }; - hca = derive2 { name="hca"; version="1.4.3"; sha256="1ryac7jcv17lcns8fja24iwayq4sl76yh4xcyv12pp5f5jgpsv1y"; depends=[BiocFileCache digest dplyr httr jsonlite readr tibble tidyr]; }; - heatmaps = derive2 { name="heatmaps"; version="1.20.0"; sha256="137cblqfn3w2nrlkffrxhpv1fd0ygy8njqf3n09gf2qw4vgzyz0g"; depends=[BiocGenerics Biostrings EBImage GenomeInfoDb GenomicRanges IRanges KernSmooth Matrix plotrix RColorBrewer]; }; - hermes = derive2 { name="hermes"; version="1.0.1"; sha256="0l4rynsz03s4rrdf6pn7sq6x9ra11lal9w65fwxvg1qk83b1gcx4"; depends=[assertthat Biobase BiocGenerics biomaRt checkmate circlize ComplexHeatmap DESeq2 dplyr edgeR EnvStats forcats GenomicRanges ggfortify ggplot2 ggrepel IRanges lifecycle limma magrittr matrixStats MultiAssayExperiment purrr R6 Rdpack rlang S4Vectors SummarizedExperiment tidyr]; }; - hiAnnotator = derive2 { name="hiAnnotator"; version="1.30.0"; sha256="0f1imlql09dgckcvf3dr7knr26yjs0r1ryrq54r1lwz57s3rn152"; depends=[BSgenome dplyr foreach GenomicRanges ggplot2 iterators rtracklayer scales]; }; - hiReadsProcessor = derive2 { name="hiReadsProcessor"; version="1.32.0"; sha256="0cf0ris5c2xbbmsjnww9lwmmlhya21gmhxfsmcid4bi9gs94qpci"; depends=[BiocGenerics BiocParallel Biostrings dplyr GenomicAlignments GenomicRanges hiAnnotator readxl sonicLength]; }; - hierGWAS = derive2 { name="hierGWAS"; version="1.26.0"; sha256="0n8rbk3whs6ysjkdz6zwvdbw5gqrriyzdmyz2b09h6w1dl61cy43"; depends=[fastcluster fmsb glmnet]; }; - hierinf = derive2 { name="hierinf"; version="1.14.0"; sha256="0vls36kpz72vahjgx9ghb6aql2f9r5ny9nyg161jjfs1k4s2pr6d"; depends=[fmsb glmnet]; }; - hipathia = derive2 { name="hipathia"; version="2.12.0"; sha256="15ggym814jkcbx4kn2d9zi430vcgr50wbzvzj2f1d5qbdhbci9sh"; depends=[AnnotationHub coin DelayedArray igraph limma matrixStats MultiAssayExperiment preprocessCore S4Vectors servr SummarizedExperiment]; }; - hmdbQuery = derive2 { name="hmdbQuery"; version="1.16.0"; sha256="0njxxbm58r6ikdh8j3765zy15paips94qyfhbbpb0xpqz7i1idcf"; depends=[S4Vectors XML]; }; - hopach = derive2 { name="hopach"; version="2.56.0"; sha256="0c2dx9l2dvhx74z4g2wvbz7m1h77jr257snlqsv2fkdv32m623k4"; depends=[Biobase BiocGenerics cluster]; }; - hpar = derive2 { name="hpar"; version="1.38.0"; sha256="07c6r703d5xp7y9bqmqalxgna2qrbk1h5s0d992m7360k259mgrj"; depends=[]; }; - hummingbird = derive2 { name="hummingbird"; version="1.6.0"; sha256="1zy35sayjclwcvv6agnvshxhr6l7nd9l0pxyxcfhj1hrqnw5xn14"; depends=[GenomicRanges IRanges Rcpp SummarizedExperiment]; }; - hypeR = derive2 { name="hypeR"; version="1.12.0"; sha256="1yk5119jv523kdh3sb85sdkbvrjj4xml8697l3d3f1n84qkicks4"; depends=[dplyr ggforce ggplot2 htmltools httr igraph kableExtra magrittr msigdbr openxlsx purrr R6 reactable reshape2 rlang rmarkdown scales shiny stringr visNetwork]; }; - hyperdraw = derive2 { name="hyperdraw"; version="1.48.0"; sha256="0ndw4y6b15jy4w86vfkahmdc81d3ycjsvqy1mxi55dwvd8xq0ap6"; depends=[graph hypergraph Rgraphviz]; }; - hypergraph = derive2 { name="hypergraph"; version="1.68.0"; sha256="0xmryqj5yw1ns6wbhjqbb6h14jlj89zrznzvqnvd4n03ci20kzzp"; depends=[graph]; }; - iASeq = derive2 { name="iASeq"; version="1.40.0"; sha256="1cwx3pc17lrrskzrq2ghj1vgjc2gmnwbkid531qpvdw0ixqb9jhr"; depends=[]; }; - iBBiG = derive2 { name="iBBiG"; version="1.40.0"; sha256="10p9iky61ym8bj1mpyjpslg2ixb3abic5bpfp4yqaqg4vq7a7wip"; depends=[ade4 biclust xtable]; }; - iBMQ = derive2 { name="iBMQ"; version="1.36.0"; sha256="0715hr72wvm14f6vb3j4ns94ii8g7kp6fgb7zjdjmqab92hqm1rd"; depends=[Biobase ggplot2]; }; - iCARE = derive2 { name="iCARE"; version="1.24.0"; sha256="1b09q6z240rc4cx9mz61f1l65khwxlq03f2sal0cf1y2584p4hxl"; depends=[gtools Hmisc plotrix]; }; - iCNV = derive2 { name="iCNV"; version="1.16.0"; sha256="12fyj9nxsfzckyb7qjwg8a4v335hzg0d0fgav3g00i30c7ldqlam"; depends=[CODEX data_table dplyr fields ggplot2 rlang tidyr truncnorm]; }; - iCOBRA = derive2 { name="iCOBRA"; version="1.24.1"; sha256="1gvra5bgsf6lvs4f2md3xx7xxsx4j8079c2nr8vz9lvy2sfyl6s9"; depends=[dplyr DT ggplot2 limma markdown reshape2 ROCR scales shiny shinyBS shinydashboard UpSetR]; }; - iCheck = derive2 { name="iCheck"; version="1.26.0"; sha256="0phc4xr9vclmd2xkcjaa5l8w6v1748hs63asfbl0xl6xgj5475mc"; depends=[affy Biobase GeneSelectMMD gplots limma lmtest lumi MASS preprocessCore randomForest rgl scatterplot3d]; }; - iChip = derive2 { name="iChip"; version="1.50.0"; sha256="0p5n20yjr94l76ibmlcvbq48zw9a14dpdza0k0mg16vq17lqz2rf"; depends=[limma]; }; - iClusterPlus = derive2 { name="iClusterPlus"; version="1.32.0"; sha256="0xzx3vly3p99zc5a69pra4jjp8d3bdhx7dl1l76w459cs58zy0sm"; depends=[]; }; - iGC = derive2 { name="iGC"; version="1.26.0"; sha256="1brdkdclmydj44485irzwva375zp13mf9vjw5xd5lhdq88ishnsc"; depends=[data_table plyr]; }; - iPAC = derive2 { name="iPAC"; version="1.40.0"; sha256="1h7dxq6isc5zbpi01zj4xsncs9a5l4x5lflqv0lfi2n11y8y4x40"; depends=[Biostrings gdata multtest scatterplot3d]; }; - iPath = derive2 { name="iPath"; version="1.2.0"; sha256="1gkw3j3fc5rydxzm3dhv10wwvnhgfb8hic1842irmnb3rqwg0khw"; depends=[BiocParallel ggplot2 ggpubr matrixStats mclust Rcpp RcppArmadillo survival survminer]; }; - iSEE = derive2 { name="iSEE"; version="2.8.0"; sha256="1smpd3hfs415g4qiz3s9d8qsy5n84ppy23q0vwhfg8gh2lypikzh"; depends=[BiocGenerics circlize colourpicker ComplexHeatmap DT ggplot2 ggrepel igraph mgcv rintrojs S4Vectors shiny shinyAce shinydashboard shinyjs shinyWidgets SingleCellExperiment SummarizedExperiment vipor viridisLite]; }; - iSEEu = derive2 { name="iSEEu"; version="1.8.0"; sha256="1j0ksx6sdk0g44yi3dccgnqhf9jqfzmax131d52q2s6yfn1m1dhw"; depends=[colourpicker DT ggplot2 IRanges iSEE S4Vectors shiny shinyAce SingleCellExperiment SummarizedExperiment]; }; - iSeq = derive2 { name="iSeq"; version="1.48.0"; sha256="09zba3mr55n42kyw89r4vbykczq3y97hsy2a55a2b8zmsh27w2dc"; depends=[]; }; - iasva = derive2 { name="iasva"; version="1.14.0"; sha256="070bda8fxm1gby2jq5zpbd85l10kxhsy7a8jac3s6rpf1saz70m1"; depends=[BiocParallel cluster irlba SummarizedExperiment]; }; - ibh = derive2 { name="ibh"; version="1.44.0"; sha256="0l7436yk3hv73zljg00mxa5nyilsxphhwliy5h3a4ci02pdfa92k"; depends=[simpIntLists]; }; - icetea = derive2 { name="icetea"; version="1.14.0"; sha256="1n642pa32yr6lmz4362875p5f6z1zdxdg96ljxfc1fsfkvdhjv0c"; depends=[BiocGenerics BiocParallel Biostrings csaw DESeq2 edgeR GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges limma Rsamtools rtracklayer S4Vectors ShortRead SummarizedExperiment TxDb_Dmelanogaster_UCSC_dm6_ensGene VariantAnnotation]; }; - ideal = derive2 { name="ideal"; version="1.20.0"; sha256="0bgc7f2c1m777acmfx1lcsiga8kf4db6wx0rb56hwhq2yw2h1x7r"; depends=[AnnotationDbi base64enc BiocParallel DESeq2 dplyr DT GenomicRanges ggplot2 ggrepel GO_db goseq GOstats gplots heatmaply IHW IRanges knitr limma pcaExplorer pheatmap plotly rentrez rintrojs rlang rmarkdown S4Vectors shiny shinyAce shinyBS shinydashboard stringr SummarizedExperiment topGO UpSetR]; }; - idiogram = derive2 { name="idiogram"; version="1.72.0"; sha256="1w749dmbmgwrbxdpcakd48l6sfcshafqhlkrq5gzb6bhq1ll3xwy"; depends=[annotate Biobase plotrix]; }; - idpr = derive2 { name="idpr"; version="1.6.0"; sha256="1xl73m1lwy0336r5aan8sam8ac61h2flapj7m1ag0acpy0bhvg23"; depends=[Biostrings dplyr ggplot2 jsonlite magrittr plyr rlang]; }; - idr2d = derive2 { name="idr2d"; version="1.10.0"; sha256="0la044qyjnic6cbnvsas1dx7xgiz64qp4ygpsb1g6qhk2m0ybzj1"; depends=[dplyr futile_logger GenomeInfoDb GenomicRanges ggplot2 idr IRanges magrittr reticulate scales stringr]; }; - igvR = derive2 { name="igvR"; version="1.16.0"; sha256="0jaj600dcis1xd4hp6zw3j92zqi476zxlnb3lhcsszx7rg6lqnfp"; depends=[BiocGenerics BrowserViz GenomicAlignments GenomicRanges httpuv MotifDb RColorBrewer rtracklayer seqLogo VariantAnnotation]; }; - illuminaio = derive2 { name="illuminaio"; version="0.38.0"; sha256="1xk057a9w4ps8xi8jyw8imkjcicfmzns8g92grn4af7yiip68h62"; depends=[base64]; }; - imageHTS = derive2 { name="imageHTS"; version="1.45.1"; sha256="18cv1mss1vgm4zwx37nijc1riw2n9lwl73l2cfiqglblgdmyq2sm"; depends=[Biobase cellHTS2 e1071 EBImage hwriter vsn]; }; - imcRtools = derive2 { name="imcRtools"; version="1.2.3"; sha256="1a2gapm9642x7a4m9cl95fpl6qq3zrhgvib8rqzx465d0p47szfw"; 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.28.0"; sha256="10dwlg91wg38s97hivd8fm4wkmv0nv7xcw8dwdh2g7m5pip7nchp"; depends=[flowCore lattice]; }; - immunotation = derive2 { name="immunotation"; version="1.4.0"; sha256="06yknvqz65x3vgc9xykdwhsgqhz75jr038fwnjjr2ir8x9h6fri5"; depends=[curl ggplot2 maps ontologyIndex readr rlang rvest stringr tidyr xml2]; }; - impute = derive2 { name="impute"; version="1.70.0"; sha256="11b0z7py0im6y43k55xpzz5jnvc0ram9rk3n1n4mwhvs0vhy39r2"; depends=[]; }; - infercnv = derive2 { name="infercnv"; version="1.12.0"; sha256="01f021fdxm058733rky46dlvqg7dmf5mn5x9lnq0fspp5665w3bl"; depends=[ape argparse BiocGenerics caTools coda coin digest doParallel dplyr edgeR fastcluster fitdistrplus foreach futile_logger future ggplot2 gplots gridExtra HiddenMarkov leiden Matrix parallelDist phyclust RANN RColorBrewer reshape rjags SingleCellExperiment SummarizedExperiment tidyr]; }; - infinityFlow = derive2 { name="infinityFlow"; version="1.6.0"; sha256="14qdamv4ydbqwxw7gfm1yqzgihb7zxpi9irji0a5mnvvyrkzrfpz"; depends=[Biobase flowCore generics gtools matlab pbapply png raster uwot xgboost]; }; - intansv = derive2 { name="intansv"; version="1.36.0"; sha256="1x7386g0f1amjhvpb75ma86ifagh73d3yqmh1aq25r3cwgkgi9lc"; depends=[BiocGenerics GenomicRanges ggbio IRanges plyr]; }; - interacCircos = derive2 { name="interacCircos"; version="1.6.0"; sha256="1jk2mr271dabwjxz3a0habpy0cs6gh4wcdkl9yfb17g41qr3gd1s"; depends=[htmlwidgets plyr RColorBrewer]; }; - interactiveDisplay = derive2 { name="interactiveDisplay"; version="1.34.0"; sha256="0flfn30q4qd0dp39qqswvg83vs568spbyiplqnsrp85nprnrxk9g"; depends=[AnnotationDbi BiocGenerics Category ggplot2 gridSVG interactiveDisplayBase plyr RColorBrewer reshape2 shiny XML]; }; - interactiveDisplayBase = derive2 { name="interactiveDisplayBase"; version="1.34.0"; sha256="0fdwx5ch0ch8axdkfiq7zzhhq5hwcvd6kf8fggw9nd3ah1yjwbdg"; depends=[BiocGenerics DT shiny]; }; - inveRsion = derive2 { name="inveRsion"; version="1.43.0"; sha256="0h2q10xf4x22hy7780w4pvq488921wzjngly8qcc97sa8iacssk3"; depends=[haplo_stats]; }; - ipdDb = derive2 { name="ipdDb"; version="1.14.0"; sha256="12wnl8gpkwvp3lvdw5qfjy8n2wpwgm7hgp0cx4lysyr7hchfjzi1"; depends=[AnnotationDbi AnnotationHub assertthat Biostrings DBI GenomicRanges IRanges RSQLite]; }; - isobar = derive2 { name="isobar"; version="1.42.0"; sha256="1z8qxdd4kqdi55g84lb8268nd270y4knzrpcm3b1gvxd91pynbq4"; depends=[Biobase biomaRt distr ggplot2 plyr]; }; - isomiRs = derive2 { name="isomiRs"; version="1.24.1"; sha256="14a9a5k435yn4csbhmh9yplyn2k889jhrav31bsaiixfms16v3k8"; depends=[AnnotationDbi assertive_sets Biobase BiocGenerics broom cluster cowplot DEGreport DESeq2 dplyr GenomicRanges GGally ggplot2 gplots gridExtra gtools IRanges limma RColorBrewer readr reshape rlang S4Vectors stringr SummarizedExperiment tibble tidyr]; }; - iterClust = derive2 { name="iterClust"; version="1.18.0"; sha256="11j6ssy88v0wxqkx9b4skqi8jww8b4nh1gjl8smlnw98lvf5vwl4"; depends=[Biobase cluster]; }; - iterativeBMA = derive2 { name="iterativeBMA"; version="1.54.0"; sha256="1ykn4cac33w85gxh1bbqcg06xx0jsx1ivq4477h0057y3vf09cck"; depends=[Biobase BMA leaps]; }; - iterativeBMAsurv = derive2 { name="iterativeBMAsurv"; version="1.54.0"; sha256="0fll6aqmh4dbrn4pv8nwp5cnsc2jd40clfnb76zzgi6qka5h2kms"; depends=[BMA leaps survival]; }; - iteremoval = derive2 { name="iteremoval"; version="1.15.1"; sha256="0bwl8lzxvf5azwyacv9x16l4kyi8l00xny2s83gp2kng5gyz8602"; depends=[GenomicRanges ggplot2 magrittr SummarizedExperiment]; }; - ivygapSE = derive2 { name="ivygapSE"; version="1.18.0"; sha256="04ril40rs4y4j8b8pbxxgj3qzxy5n7vcd9wfdmfr10c9j489sixw"; depends=[ggplot2 hwriter plotly S4Vectors shiny SummarizedExperiment survival survminer UpSetR]; }; - karyoploteR = derive2 { name="karyoploteR"; version="1.22.0"; sha256="0hawq9wi3ikvlcdgnjfy5fiiwfq22zwx1p8xf5h4bpypp96pknsk"; depends=[AnnotationDbi bamsignals bezier biovizBase digest GenomeInfoDb GenomicFeatures GenomicRanges IRanges memoise regioneR Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; - kebabs = derive2 { name="kebabs"; version="1.30.0"; sha256="04ipdf3vcmg2817i314vkxw8yy358iwq9i23f1bwa86qq0a1q6f0"; depends=[apcluster Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; }; - keggorthology = derive2 { name="keggorthology"; version="2.48.0"; sha256="1a5cjsp610pvr7s27schr3hi06i47v73f0f6n5wzf6062cjvrrbh"; depends=[AnnotationDbi DBI graph hgu95av2_db]; }; - kissDE = derive2 { name="kissDE"; version="1.16.0"; sha256="16gx3cpmi1xb78g12aiajm6k93fx5wk0j82kv682dd2j8qzfxq1n"; depends=[ade4 aods3 Biobase DESeq2 doParallel DSS DT factoextra foreach ggplot2 gplots matrixStats shiny shinycssloaders]; }; - lapmix = derive2 { name="lapmix"; version="1.62.0"; sha256="15ydcqvawmwradx20x5jz0lrvfrgfjxgnfcnrxxknv5iqh2d035y"; depends=[Biobase]; }; - ldblock = derive2 { name="ldblock"; version="1.26.0"; sha256="08ss03b93czwb4x60hsi30ad4lmamvq5mxa8nj0g18z68qcraijm"; depends=[BiocGenerics EnsDb_Hsapiens_v75 ensembldb GenomeInfoDb GenomicFiles httr Matrix Rsamtools snpStats VariantAnnotation]; }; - lefser = derive2 { name="lefser"; version="1.6.0"; sha256="0n3gf60c4r1p81ifn4xklmm3npp790p8vw7mdi1f6bb5vm373rj0"; depends=[coin ggplot2 MASS SummarizedExperiment]; }; - les = derive2 { name="les"; version="1.46.0"; sha256="07c805gcyc7b462hbkvkkjajk8sn735j1js452lz67ixf03pwcaq"; depends=[boot fdrtool gplots RColorBrewer]; }; - levi = derive2 { name="levi"; version="1.14.0"; sha256="1dh314yd0zpnmi2vfnf41fhzpg76cgwgzkbm93vcxwrszj53cljc"; depends=[colorspace dplyr DT ggplot2 httr igraph knitr RColorBrewer Rcpp reshape2 rmarkdown shiny shinydashboard shinyjs testthat xml2]; }; - lfa = derive2 { name="lfa"; version="1.26.0"; sha256="044866h4fnxmzb3sh9vmrd2smgsbcqgvd19dgwxisi418cad577l"; depends=[corpcor]; }; - limma = derive2 { name="limma"; version="3.52.4"; sha256="14xy3qyra2crz31sxgz768mhnhhvcpfhfcigf4xsii643lqcz75h"; depends=[]; }; - limmaGUI = derive2 { name="limmaGUI"; version="1.72.0"; sha256="1sq20bdnc9j93iink9cs1p50alzgqfjcxikr8p0dfvd96c4js5b7"; depends=[limma R2HTML tkrplot xtable]; }; - lineagespot = derive2 { name="lineagespot"; version="1.0.0"; sha256="0bn0rr7c8x576p53d7p7q0hs7dh5y7dm4z5dgcrp9m8pqgdq3n9h"; depends=[data_table httr MatrixGenerics stringr SummarizedExperiment VariantAnnotation]; }; - lionessR = derive2 { name="lionessR"; version="1.10.0"; sha256="182hyz7acnlmprfn3555d1li73abahkylznrnqzizyi20r3nwczq"; depends=[S4Vectors SummarizedExperiment]; }; - lipidr = derive2 { name="lipidr"; version="2.10.0"; sha256="053q300caqn2a5rjxxc6c9b5drrk1y6bllm96rb7nxlwxzkkjlpg"; depends=[data_table dplyr fgsea forcats ggplot2 imputeLCMD limma magrittr rlang ropls S4Vectors SummarizedExperiment tidyr]; }; - lisaClust = derive2 { name="lisaClust"; version="1.4.0"; sha256="0411vkzz5rh937qcamrsmyvrjbncjgj961lmvd9vqpbf2srvd902"; depends=[BiocGenerics BiocParallel class concaveman data_table dplyr ggplot2 purrr S4Vectors spatstat_core spatstat_geom spicyR tidyr]; }; - lmdme = derive2 { name="lmdme"; version="1.38.0"; sha256="1x56d40v9v0jz9dmxqkvpc756fqwh31119qx1bsamrz03263fhw8"; depends=[limma pls stemHypoxia]; }; - loci2path = derive2 { name="loci2path"; version="1.16.0"; sha256="03gqzjn619fz7c53lcj3p7kycdl7minmv81zszf0jw5m8xgab7a5"; depends=[BiocParallel data_table GenomicRanges pheatmap RColorBrewer S4Vectors wordcloud]; }; - logicFS = derive2 { name="logicFS"; version="2.16.0"; sha256="06y064fkns71m4h7w7mmf75myd22zv000g7drkxwx25x6jqghcgg"; depends=[LogicReg mcbiopi survival]; }; - logitT = derive2 { name="logitT"; version="1.54.0"; sha256="0z8yphvca5glhwbrzdd5vz07243akm0fyyx8x9004frsyqrsyyva"; depends=[affy]; }; - lpNet = derive2 { name="lpNet"; version="2.28.0"; sha256="17l7k07vf21y4yw5s640xp4lh686y74sd773ij92r2spc3vk4bnm"; depends=[lpSolve]; }; - lpsymphony = derive2 { name="lpsymphony"; version="1.24.0"; sha256="0kc708ss5byzw8qh439mb4nq6hsfmz73gfamiznw3lv352brd33g"; depends=[]; }; - lumi = derive2 { name="lumi"; version="2.48.0"; sha256="06zmll5j1yymsm3byarhllrz4q1w5mzv267a9g6visn73wan8y9d"; depends=[affy annotate AnnotationDbi Biobase DBI GenomicFeatures GenomicRanges KernSmooth lattice MASS methylumi mgcv nleqslv preprocessCore RSQLite]; }; - m6Aboost = derive2 { name="m6Aboost"; version="1.2.0"; sha256="0qi7l52c3m08i4c4vj44azycb5qj99qnjmkpl5j9j13scpancnpw"; depends=[adabag Biostrings BSgenome dplyr ExperimentHub GenomicRanges IRanges rtracklayer S4Vectors]; }; - mAPKL = derive2 { name="mAPKL"; version="1.26.0"; sha256="0zzfdwjssig6km1c630jx8pl0q20c5y16z6jrms43zhbk52h2p1s"; depends=[AnnotationDbi apcluster Biobase clusterSim e1071 igraph limma multtest parmigene reactome_db]; }; - mBPCR = derive2 { name="mBPCR"; version="1.50.0"; sha256="1gdd5jj0dpimp0ix2i7dspkkggn0m5d36cvhsvyr0y5k3gq5cail"; depends=[Biobase GWASTools oligoClasses]; }; - mCSEA = derive2 { name="mCSEA"; version="1.16.0"; sha256="10g46k9ryg183dhaakmbjnpqhx4a4q9r1fjf9gfnpaycspmh7hx8"; depends=[biomaRt fgsea GenomicFeatures GenomicRanges ggplot2 Gviz Homo_sapiens IRanges limma mCSEAdata S4Vectors SummarizedExperiment]; }; - maCorrPlot = derive2 { name="maCorrPlot"; version="1.66.0"; sha256="018hc5sqp23cmfdr0k4dgx9rwl3f6f9fgab99h5hlg8rrqhy2abm"; depends=[lattice]; }; - maPredictDSC = derive2 { name="maPredictDSC"; version="1.34.0"; sha256="0rn3s0lpbrdkhbqsg94x4b2fwybrpfyys0ih2dkdscdc9h9dapyw"; depends=[affy AnnotationDbi caret class e1071 gcrma hgu133plus2_db limma LungCancerACvsSCCGEO MASS ROC ROCR]; }; - maSigPro = derive2 { name="maSigPro"; version="1.68.0"; sha256="1l478qjx3cx6xc9j5gl3hv3dbrglrd2dgsifvpmw64y6a00zz09g"; depends=[Biobase MASS mclust venn]; }; - maanova = derive2 { name="maanova"; version="1.66.0"; sha256="0nh2wn8zyipm2sxxqlj0nnghybnxc2y77h031c3maab1c6kjmjiq"; depends=[Biobase]; }; - macat = derive2 { name="macat"; version="1.70.0"; sha256="1w3a0s5p93zhx8vrf0qmspisnm3gf0j1z8l38wgc86k0d9zjcbs8"; depends=[annotate Biobase]; }; - made4 = derive2 { name="made4"; version="1.70.0"; sha256="1wrv9d2mp799qzy1bsaj4w7wx12gdhfv9qvklz7z41vfz59d6bq5"; depends=[ade4 Biobase gplots RColorBrewer scatterplot3d SummarizedExperiment]; }; - maftools = derive2 { name="maftools"; version="2.12.0"; sha256="1gqfi95v4fs64n4walij0g2kds3fbbwp6lih5yakmgf6kj8fpkk6"; depends=[data_table DNAcopy RColorBrewer Rhtslib survival zlibbioc]; }; - maigesPack = derive2 { name="maigesPack"; version="1.60.0"; sha256="1imqs7jr3hnib90dclwfxx5cagf0in8zd0hz3jqw5x2xyfq2mzbp"; depends=[convert graph limma marray]; }; - makecdfenv = derive2 { name="makecdfenv"; version="1.72.0"; sha256="03lqcrbyasqychzay8iflkdfqsbsncvaxmn3g3nwr9p7l726gsik"; depends=[affy affyio Biobase zlibbioc]; }; - mapscape = derive2 { name="mapscape"; version="1.20.0"; sha256="1x9446fakxmnpkzfk541kihc95y2ilnvq7v9icky4175s70492w4"; depends=[base64enc htmlwidgets jsonlite stringr]; }; - marr = derive2 { name="marr"; version="1.6.0"; sha256="1y7s30wxk75qk2w19irs77kkg7kghs247h6n4abxvnv3wq4ygwmd"; depends=[dplyr ggplot2 magrittr Rcpp rlang S4Vectors SummarizedExperiment]; }; - marray = derive2 { name="marray"; version="1.74.0"; sha256="0awfz0akz3sylyw1jxhxgadv1rqdzvy9v11933yxkl9a8m9ngm8i"; depends=[limma]; }; - martini = derive2 { name="martini"; version="1.16.0"; sha256="043pl5r2ahnv6i7x1yd9pvs0v4xpajyxick1liivp4zrgxskpfs4"; depends=[igraph Matrix Rcpp RcppEigen snpStats]; }; - maser = derive2 { name="maser"; version="1.14.0"; sha256="0zl390lcahk9ipadi8jj25jf50dv6sxsmi54qj1nzq0q6qh0hyay"; depends=[BiocGenerics data_table dplyr DT GenomeInfoDb GenomicRanges ggplot2 Gviz IRanges reshape2 rtracklayer]; }; - maskBAD = derive2 { name="maskBAD"; version="1.40.0"; sha256="05aznwh5jmv4bd5s2gb6kjwz0zn7523qkpygdlrb5pxhh1vw1b5j"; depends=[affy gcrma]; }; - massiR = derive2 { name="massiR"; version="1.32.0"; sha256="179f1fd6xxaq7hwk6pixp3pbqmlx06mb7kin4ajwl5gch7kkr2qn"; depends=[Biobase cluster diptest gplots]; }; - matchBox = derive2 { name="matchBox"; version="1.38.0"; sha256="14jhbfvi6rwal693zbmb00pkzhpzmhib5ihr63m2y1ccmisnfqkp"; depends=[]; }; - matter = derive2 { name="matter"; version="1.22.0"; sha256="0pgi7vq1arrdhqyc34dkylbz6s4f1wx8j38ddk9yfi8m45nbhqig"; depends=[biglm BiocGenerics BiocParallel digest irlba Matrix ProtGenerics]; }; - mbOmic = derive2 { name="mbOmic"; version="1.0.0"; sha256="13lb639g3cg5k6y215r40hxn2g5i4flz0cyxgs3nfn7wf3y2cfyi"; depends=[cluster clusterSim data_table doParallel igraph psych visNetwork WGCNA]; }; - mbkmeans = derive2 { name="mbkmeans"; version="1.12.0"; sha256="1f5krzlyqljz763vkp1a50danjn78xhn35s8qqdvzrmwyx0fzphg"; depends=[beachmat benchmarkme BiocParallel ClusterR DelayedArray Matrix Rcpp RcppArmadillo Rhdf5lib S4Vectors SingleCellExperiment SummarizedExperiment]; }; - mdp = derive2 { name="mdp"; version="1.16.0"; sha256="1r7w7mzq6a31rjfnpbanvvk95nai189bggw4kj8y08k8kf44hsji"; depends=[ggplot2 gridExtra]; }; - mdqc = derive2 { name="mdqc"; version="1.58.0"; sha256="132spf0yhc864f8adsavyljcnmq28p1cpw8clb0rsi1v3hrj6kn5"; depends=[cluster MASS]; }; - megadepth = derive2 { name="megadepth"; version="1.6.0"; sha256="0qq82dmd3drr2bhn51bgbc6ml40klfmmhj6wdj72n9ya6n60lwy8"; depends=[cmdfun dplyr fs GenomicRanges magrittr readr xfun]; }; - memes = derive2 { name="memes"; version="1.4.1"; sha256="1s0mdfhvq52vg3494wgh4ar8vax5bc99gqsaism3d7vi4h9wnhzn"; 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.22.0"; sha256="1affs7w2rwzkl2gh895ixwpvmp158acx1i4vcjg25gvak3wnwapq"; depends=[AnnotationDbi AnnotationHub DOSE enrichplot GOSemSim MeSHDbi yulab_utils]; }; - meshr = derive2 { name="meshr"; version="2.2.0"; sha256="1gaxjz5day6xipfh8dy0nxf7vxnvdy9b9hfdp83ysyhxszb36fdl"; depends=[BiocGenerics BiocStyle Category fdrtool knitr markdown MeSHDbi rmarkdown RSQLite S4Vectors]; }; - messina = derive2 { name="messina"; version="1.32.0"; sha256="1avfj9xdx1mi7f1sdl9j1xf1jhj5cibkiwwy7aa1w7chz1mz8hr4"; depends=[foreach ggplot2 plyr Rcpp survival]; }; - metaCCA = derive2 { name="metaCCA"; version="1.24.0"; sha256="1shpb8p7rxf101k8vy4nd6fllgfm3jazv87h5qk5mhfcfrja0819"; depends=[]; }; - metaMS = derive2 { name="metaMS"; version="1.32.0"; sha256="00mdv3k3qndjznxixvnb7v764wz8c6zh2jzm0h948ra3ap345fga"; depends=[BiocGenerics CAMERA Matrix robustbase xcms]; }; - metaSeq = derive2 { name="metaSeq"; version="1.36.0"; sha256="0775xgvmcaqf6pgm8651pcnlkd3adwpdzac295g1xmcwfj3r7sav"; depends=[NOISeq Rcpp snow]; }; - metabCombiner = derive2 { name="metabCombiner"; version="1.6.0"; sha256="1vnh0bqfzknpflk0j5y9jxggmc3m4irxyfbkm9jf6k5a30fnmmxb"; depends=[caret dplyr matrixStats mgcv rlang S4Vectors tidyr]; }; - metabolomicsWorkbenchR = derive2 { name="metabolomicsWorkbenchR"; version="1.6.0"; sha256="0mg7wrg8qgv11w7179nrw5w7209qjqbirm9niz2ygw1pidg0slc8"; depends=[data_table httr jsonlite MultiAssayExperiment struct SummarizedExperiment]; }; - metabomxtr = derive2 { name="metabomxtr"; version="1.30.0"; sha256="0z02b91gd71b5ksfk2ql5jldicsqh66z2yvv5yyws98xl0qqrrxw"; depends=[Biobase BiocParallel Formula ggplot2 multtest optimx plyr]; }; - metagene = derive2 { name="metagene"; version="2.28.1"; sha256="1r6kjwbwhksmk9kpvpmn9zwlfllznpam880ma4imsz6pgzfxsskw"; depends=[BiocParallel data_table EnsDb_Hsapiens_v86 ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gplots IRanges magrittr matrixStats purrr R6 Rsamtools rtracklayer stringr]; }; - metagene2 = derive2 { name="metagene2"; version="1.12.0"; sha256="1606i1kw8i4q1m07x2yax2mfmj9knzd7jiqgzq3fn792z1yj1bsb"; depends=[BiocParallel data_table dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges magrittr purrr R6 reshape2 Rsamtools rtracklayer]; }; - metagenomeSeq = derive2 { name="metagenomeSeq"; version="1.38.0"; sha256="0v8h8ld4gzq0v90hfprw3v8j2hlac44wxyj2m6qmz0y5hml97k02"; depends=[Biobase foreach glmnet gplots limma Matrix matrixStats RColorBrewer Wrench]; }; - metahdep = derive2 { name="metahdep"; version="1.54.0"; sha256="1y8pr873jy1ax8n8qp8kihagddk5j03pjwmxff03amnqrnxyphlv"; depends=[]; }; - metapod = derive2 { name="metapod"; version="1.4.0"; sha256="19g9c08alg4qqr710si465wlb5dy759m5d8wn91zwj24077dds7b"; depends=[Rcpp]; }; - metapone = derive2 { name="metapone"; version="1.2.0"; sha256="11q90c6qif030xffhfr8ii7vffbg2q2y6n2w8fj0x39yis6qcgf9"; depends=[BiocParallel fdrtool fgsea fields ggplot2 ggrepel markdown]; }; - metaseqR2 = derive2 { name="metaseqR2"; version="1.8.2"; sha256="1zrbn45r62nzb1rq8xlksl6dr1zlvy6zg3dgqg7ks9aqv5grd7w4"; depends=[ABSSeq baySeq Biobase BiocGenerics BiocParallel biomaRt Biostrings corrplot DESeq2 DSS DT EDASeq edgeR genefilter GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gplots harmonicmeanp heatmaply htmltools httr IRanges jsonlite lattice limma locfit log4r magrittr MASS Matrix NBPSeq pander qvalue rmarkdown rmdformats Rsamtools RSQLite rtracklayer S4Vectors stringr SummarizedExperiment survcomp VennDiagram vsn yaml zoo]; }; - metavizr = derive2 { name="metavizr"; version="1.20.0"; sha256="0sjz94a46a3frij3vx7dp4xhxn0snhrr219hg53v5ypnfbqyyxin"; depends=[Biobase data_table digest epivizr epivizrData epivizrServer epivizrStandalone GenomeInfoDb httr metagenomeSeq phyloseq vegan]; }; - methInheritSim = derive2 { name="methInheritSim"; version="1.18.0"; sha256="1g7wygaqhn1fsxaijzcil7inby25c1m85ph3xrkjn12m9lhxzzxv"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges methylKit msm S4Vectors]; }; - methimpute = derive2 { name="methimpute"; version="1.18.0"; sha256="1d197yf3hfnag6s2pr7vy69vmrh1v8bdxwfylb7v7xsjkhjb1nv7"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges ggplot2 IRanges minpack_lm Rcpp reshape2]; }; - methrix = derive2 { name="methrix"; version="1.10.0"; sha256="0717pazv7yakj3b0c8p7rzb4iykyiv8vh02c4357qc3kwarkpncj"; depends=[BSgenome data_table DelayedArray DelayedMatrixStats GenomicRanges ggplot2 HDF5Array IRanges matrixStats rtracklayer SummarizedExperiment]; }; - methylCC = derive2 { name="methylCC"; version="1.10.0"; sha256="0sigx62cy47cmpirr6nqcdik5dxkn79j2xjap36jmipaa2i914s2"; depends=[Biobase bsseq bumphunter dplyr FlowSorted_Blood_450k genefilter GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IRanges magrittr minfi plyranges quadprog S4Vectors]; }; - methylGSA = derive2 { name="methylGSA"; version="1.14.0"; sha256="0lmzipk9mn3m0nv9fmfc5q53w7f1pz37cyj18n501p3p6ljqhz3r"; depends=[AnnotationDbi BiocParallel clusterProfiler ggplot2 GO_db IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylationEPICanno_ilm10b4_hg19 missMethyl org_Hs_eg_db reactome_db RobustRankAggreg shiny stringr]; }; - methylInheritance = derive2 { name="methylInheritance"; version="1.20.0"; sha256="0a0rgi396jghxpsq44ybn518r8qkz329kpnpfb0jggwc8ygg56id"; depends=[BiocParallel GenomicRanges ggplot2 gridExtra IRanges methylKit rebus S4Vectors]; }; - methylKit = derive2 { name="methylKit"; version="1.22.0"; sha256="00asjzv05avfg0rrkmfbdqd6xx8d18zi72n3b1kf9wj81z2d2a35"; 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.34.0"; sha256="1mxkxs06j8mi44rqnzz52dnarhh1x120qqxwkdlggl8ll36zkhrm"; depends=[edgeR statmod]; }; - methylPipe = derive2 { name="methylPipe"; version="1.30.0"; sha256="15wssa2mp3rx4ccgnmq8bb4b7h0g6vccy2i18vc45v79gq3bn3if"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; }; - methylSig = derive2 { name="methylSig"; version="1.8.0"; sha256="1qmd2hkinr7d4dd026r3ah0k5hrdpv1zazr8vqvx7rvxmkzz55g5"; depends=[bsseq DelayedArray DelayedMatrixStats DSS GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; - methylclock = derive2 { name="methylclock"; version="1.2.1"; sha256="08a4yapgdryz410b8s42f1wiy1zzkk6xmvsqmbmb2gsxsfiv48a7"; depends=[Biobase devtools dplyr dynamicTreeCut ExperimentHub ggplot2 ggpmisc ggpubr gridExtra impute methylclockData minfi PerformanceAnalytics planet preprocessCore quadprog Rcpp RPMM tibble tidyr tidyverse]; }; - methylscaper = derive2 { name="methylscaper"; version="1.4.0"; sha256="19vp4hp67qvjxhbkhhhsgxa91hq5p19qsk5rjmksd5xqvgs1g4gw"; depends=[BiocParallel Biostrings data_table Rfast seqinr seriation shiny shinyFiles shinyjs SummarizedExperiment]; }; - methylumi = derive2 { name="methylumi"; version="2.42.0"; sha256="0klkinq55lfj1d4z8gkrv98849079x1l5gd15habw7jq9xxvhjww"; depends=[annotate AnnotationDbi Biobase BiocGenerics FDb_InfiniumMethylation_hg19 genefilter GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 illuminaio IRanges lattice matrixStats minfi reshape2 S4Vectors scales SummarizedExperiment]; }; - mfa = derive2 { name="mfa"; version="1.18.0"; sha256="0xwrwaldj78rmr1zyvz8mw9rxqdp8vr4s9k2776ijx7s71zklh8z"; depends=[Biobase coda dplyr ggmcmc ggplot2 magrittr MCMCglmm MCMCpack Rcpp tibble]; }; - mgsa = derive2 { name="mgsa"; version="1.44.0"; sha256="1g6chz14q0vpfr6x7pcv3icx3c50lppwcv231j1a3iirz30n8d6w"; depends=[gplots]; }; - miQC = derive2 { name="miQC"; version="1.4.0"; sha256="056sy6qk04gaqzcxvxpxskq7wzbgbfa8yclp2r0ry6i9qh7f8imm"; depends=[flexmix ggplot2 SingleCellExperiment]; }; - miRBaseConverter = derive2 { name="miRBaseConverter"; version="1.20.0"; sha256="0z2rjf95maqalqbdw2v5vhwhj7fjaijp74rmmxfkciwrja25xq57"; depends=[]; }; - miRLAB = derive2 { name="miRLAB"; version="1.26.0"; sha256="0dhdzmv02vg0wj32bs0rqpax1k1m9vvyn31i95c40nbh245hfjyk"; depends=[Category ctc dplyr energy entropy glmnet GOstats gplots Hmisc httr impute InvariantCausalPrediction limma org_Hs_eg_db pcalg RCurl stringr SummarizedExperiment TCGAbiolinks]; }; - miRNAmeConverter = derive2 { name="miRNAmeConverter"; version="1.24.0"; sha256="10v192wykdgbjbdbg5jc4y8zkyknqi35zx0gb39nby2ss5sh01k8"; depends=[AnnotationDbi DBI miRBaseVersions_db reshape2]; }; - miRNApath = derive2 { name="miRNApath"; version="1.56.0"; sha256="0993zpv9zl31r3x6ifi44syw8w6f6rcwrambvhfy7f22bifz66cl"; depends=[]; }; - miRNAtap = derive2 { name="miRNAtap"; version="1.30.0"; sha256="171c1zvc8z2hdzfkdm19w4qbi2pqsis0pjqyca4w1fr3gkrx519n"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; }; - miRSM = derive2 { name="miRSM"; version="1.14.0"; sha256="0h13ig1mvciagyifzgi2paag2ypw5kwpjn7k2a1am6fgabywp5b5"; 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.26.0"; sha256="1vf3q3132bn0qxs047yh7bi3cq5rfirmyhs2f4m05kiwc3ipmc3a"; depends=[Biobase KernSmooth miRcompData]; }; - miRmine = derive2 { name="miRmine"; version="1.18.0"; sha256="089r950x369z3a47jxcankvq0aqv6jkpjqkssfmzg5cp55hxzrhc"; depends=[SummarizedExperiment]; }; - miRspongeR = derive2 { name="miRspongeR"; version="2.0.0"; sha256="0ri5afvazrq1zq5f8ddma3qx34ifr4bd3858g14rq28fia9khl1s"; depends=[clusterProfiler corpcor doParallel DOSE foreach igraph linkcomm MCL org_Hs_eg_db Rcpp ReactomePA SPONGE survival]; }; - mia = derive2 { name="mia"; version="1.4.0"; sha256="15pa9q6s9bq0xachfk122p7nz0bad438rfa0zx7zsm99kaygacmk"; 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.2.0"; sha256="0dc6nqmnj4phqqvs04hzcrl4w0w80j7cbmhlzdxp01rszzzr1yzw"; depends=[deSolve gtools MatrixGenerics poweRlaw S4Vectors SummarizedExperiment TreeSummarizedExperiment]; }; - miaViz = derive2 { name="miaViz"; version="1.4.0"; sha256="1bdbvbh8mkl1gk10zf11b8wqwwr1ybbd6r7dpgh4y35ayscpvdqn"; 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.54.0"; sha256="1bd38qxcd0lb44wgnns5jsn65b3mvgxfalfz7wpysv6sikmlagx4"; depends=[Biostrings]; }; - microbiome = derive2 { name="microbiome"; version="1.18.0"; sha256="1z9arkjp5xszlg07mzb4p163i74jfbd9p4gbwv5syivnpl040k12"; depends=[Biostrings compositions dplyr ggplot2 phyloseq reshape2 Rtsne scales tibble tidyr vegan]; }; - microbiomeDASim = derive2 { name="microbiomeDASim"; version="1.10.0"; sha256="05lj8ihx8cpx2casxbpyn7n3zwia0bmj0lyn9prqial56s0zmsaj"; depends=[Biobase ggplot2 MASS Matrix metagenomeSeq mvtnorm pbapply phyloseq tmvtnorm]; }; - microbiomeExplorer = derive2 { name="microbiomeExplorer"; version="1.6.1"; sha256="0sccij5f0h6gg3gi3qsirqc3v17qc6wv6rvh601rgn0zhbdf6hl7"; 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.2.2"; sha256="0bd5a92na9hk2hpmqphpdhn24pk1p2gk5nsbslp8yk5c4161qxmk"; depends=[ALDEx2 ANCOMBC Biobase BiocGenerics BiocParallel biomformat Biostrings caret coin ComplexHeatmap DESeq2 dplyr edgeR ggplot2 ggsignif ggtree IRanges limma magrittr MASS metagenomeSeq multtest patchwork phyloseq plotROC pROC purrr rlang S4Vectors tibble tidyr tidytree vegan yaml]; }; - midasHLA = derive2 { name="midasHLA"; version="1.4.0"; sha256="1xvqrsp6rkcnr8fnjr9g62krwwshiy3xapxlmbi4bhm6605b0ccy"; depends=[assertthat broom dplyr formattable HardyWeinberg kableExtra knitr magrittr MultiAssayExperiment qdapTools rlang S4Vectors stringi SummarizedExperiment tibble]; }; - miloR = derive2 { name="miloR"; version="1.4.0"; sha256="1jz9p3grnczx0bpdw6j64x21in8zgm3qy19hmm296har2rx9m5zs"; depends=[BiocGenerics 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.20.0"; sha256="1iy1bghz3wqn80444h9aq81mz1pw7wcx0m6bjj33qxdzcr66jbgl"; depends=[affy affyPLM Biobase BiocGenerics DBI gtable oligo oligoClasses preprocessCore S4Vectors scales]; }; - mina = derive2 { name="mina"; version="1.4.0"; sha256="0csvsfld45cqcsnpprviggbb4lsqjsyz00iy02zmzi6kz2djhwil"; depends=[apcluster biganalytics bigmemory foreach ggplot2 Hmisc MCL parallelDist plyr Rcpp RcppArmadillo RcppParallel reshape2 RSpectra stringr]; }; - minet = derive2 { name="minet"; version="3.54.0"; sha256="0q6jw2jqkl9qynjpzaygz45c7dmx1l5y2d8s1illpcf87siawcam"; depends=[infotheo]; }; - minfi = derive2 { name="minfi"; version="1.42.0"; sha256="0255z7w5i5k01w8wn7jkb37h3q7m7vg0szqgk76h330yydnmkrq6"; depends=[beanplot Biobase BiocGenerics BiocParallel Biostrings bumphunter data_table DelayedArray DelayedMatrixStats genefilter GenomeInfoDb GenomicRanges GEOquery HDF5Array illuminaio IRanges lattice limma MASS mclust nlme nor1mix preprocessCore quadprog RColorBrewer reshape S4Vectors siggenes SummarizedExperiment]; }; - mirIntegrator = derive2 { name="mirIntegrator"; version="1.26.0"; sha256="1qgz9l4bpkgvahdm2vi0s9amakxw4zhjndc5k8d598vmwa35zjvf"; depends=[AnnotationDbi ggplot2 graph org_Hs_eg_db Rgraphviz ROntoTools]; }; - mirTarRnaSeq = derive2 { name="mirTarRnaSeq"; version="1.4.0"; sha256="10w0y3dflyyaaz8wk2p0pzv62pa2pq28aw0l5q8bvw8as0h6bpy1"; depends=[assertthat caTools corrplot data_table dplyr ggplot2 MASS pheatmap pscl purrr R_utils reshape2]; }; - missMethyl = derive2 { name="missMethyl"; version="1.30.0"; sha256="0ini4a6brxsmd1k73g7q671g0ddrbajz5gcgxk1dbny33fcixyl1"; depends=[AnnotationDbi BiasedUrn Biobase BiocGenerics GenomicRanges GO_db IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b4_hg19 IlluminaHumanMethylationEPICmanifest IRanges limma methylumi minfi org_Hs_eg_db ruv S4Vectors statmod stringr SummarizedExperiment]; }; - missRows = derive2 { name="missRows"; version="1.16.0"; sha256="17hfm5jvdxb3hlv7hvq7m2a1s4bxzzxv1gakxk9nb26mcw01b29z"; depends=[ggplot2 gtools MultiAssayExperiment plyr S4Vectors]; }; - mistyR = derive2 { name="mistyR"; version="1.4.0"; sha256="1b8ndp5wrzy37gspw15s8xv78nk493xwi9wvjav8k4m6cyspgr0q"; depends=[assertthat caret deldir digest distances dplyr filelock furrr ggplot2 purrr R_utils ranger readr ridge rlang rlist stringr tibble tidyr withr]; }; - mitch = derive2 { name="mitch"; version="1.8.0"; sha256="0wxgrfnih9ygpyznlr6c8sgpy8ca6k9a5jcniiwy1c43cxarvx3p"; depends=[beeswarm echarts4r GGally ggplot2 gplots gridExtra knitr MASS plyr reshape2 rmarkdown]; }; - mitoClone2 = derive2 { name="mitoClone2"; version="1.2.0"; sha256="1w5083f5g9dz3lwhfminz4l6yrn7zjysbwlib75n53grkhgwkivz"; depends=[deepSNV GenomicRanges ggplot2 pheatmap reshape2 Rhtslib S4Vectors]; }; - mixOmics = derive2 { name="mixOmics"; version="6.20.0"; sha256="0fwc2w7frj0bjijzfckkxf7ipx1z13gw7907q4zr5qfl9mh127w7"; depends=[BiocParallel corpcor dplyr ellipse ggplot2 ggrepel gridExtra igraph lattice MASS matrixStats rARPACK RColorBrewer reshape2 tidyr]; }; - mnem = derive2 { name="mnem"; version="1.12.0"; sha256="04wc6za7vxq2sbspn69lszn6k83s7q0yfgns1052c2jqhfmxgp80"; depends=[cluster data_table e1071 flexclust ggplot2 graph lattice Linnorm matrixStats naturalsort Rcpp RcppEigen Rgraphviz snowfall tsne wesanderson]; }; - moanin = derive2 { name="moanin"; version="1.4.0"; sha256="0k3k554ncm4j3zkz67dlzdvii9m6k117gryj7lk9wrbsv1a0y7if"; depends=[ClusterR edgeR limma MASS matrixStats NMI reshape2 S4Vectors SummarizedExperiment topGO viridis zoo]; }; - mogsa = derive2 { name="mogsa"; version="1.30.0"; sha256="1yxnkwf6f356nm999b2ng54zb4cdi94pxhpwzj3f3rnr31jawvlp"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; }; - monaLisa = derive2 { name="monaLisa"; version="1.2.0"; sha256="0rqqkry54cz7id87znc59d8x49z8cwckmx30nxr6razmyl5bqmx6"; depends=[BiocGenerics BiocParallel Biostrings BSgenome circlize ComplexHeatmap GenomeInfoDb GenomicRanges glmnet IRanges S4Vectors stabs SummarizedExperiment TFBSTools vioplot XVector]; }; - monocle = derive2 { name="monocle"; version="2.24.1"; sha256="11g1wx0f1yzhg3x1aa3d5l7pqlzxj16s0gha21skxkgld8k2x8xn"; depends=[Biobase BiocGenerics biocViews cluster combinat DDRTree dplyr fastICA ggplot2 HSMMSingleCell igraph irlba leidenbase limma MASS Matrix matrixStats pheatmap plyr proxy qlcMatrix RANN Rcpp reshape2 Rtsne slam stringr tibble VGAM viridis]; }; - mosaics = derive2 { name="mosaics"; version="2.34.0"; sha256="196wz422a284akariq5iicknaqqcm50v63b57gsi2pzmv6qfmf5y"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges lattice MASS Rcpp Rsamtools S4Vectors]; }; - mosbi = derive2 { name="mosbi"; version="1.2.0"; sha256="00l9kykr9n8ys3riw4pjqsdskf8klv9j62v0nr66z66646c1a7vp"; depends=[akmbiclust BH biclust fabia igraph isa2 QUBIC RColorBrewer Rcpp RcppParallel xml2]; }; - motifStack = derive2 { name="motifStack"; version="1.40.0"; sha256="0d2ihx73chczbv6f91n04qb372plrdv7k4qws8shyw1fmvb1rq0z"; depends=[ade4 Biostrings ggplot2 htmlwidgets TFBSTools XML]; }; - motifbreakR = derive2 { name="motifbreakR"; version="2.10.2"; sha256="0xmakbas2hhp0lknnfkdh73pm5z2dm4mrzixkx1sf69q7gq2g8gg"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges Gviz IRanges matrixStats MotifDb motifStack rtracklayer S4Vectors stringr SummarizedExperiment TFMPvalue VariantAnnotation]; }; - motifcounter = derive2 { name="motifcounter"; version="1.20.0"; sha256="06yy1ngf703ba6m9vs2jk3w1bds1s8hd4nlr3xrxfj3h7gs9dlak"; depends=[Biostrings]; }; - motifmatchr = derive2 { name="motifmatchr"; version="1.18.0"; sha256="1ssn00mxwk23zr5na0vcmxvm69i68f0ga0wqlv1nk2isg0wpv878"; depends=[Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp RcppArmadillo Rsamtools S4Vectors SummarizedExperiment TFBSTools]; }; - mpra = derive2 { name="mpra"; version="1.18.0"; sha256="0hbsaw39k7yryl1bf45kzsnwv479minydvxc6kd0sr9qsvlhn6dc"; depends=[BiocGenerics limma S4Vectors scales statmod SummarizedExperiment]; }; - msImpute = derive2 { name="msImpute"; version="1.6.0"; sha256="11sqb0sj3g224fnx1kkxy9j4r5ggnp09wm902dlgkgyqj7fywlnv"; depends=[data_table dplyr FNN limma matrixStats mvtnorm pdist reticulate scran softImpute tidyr]; }; - msPurity = derive2 { name="msPurity"; version="1.22.0"; sha256="0ag1x4smva0zn377s29ff16xpwhcwb7c4yhhl1wx5fvgg9p4kn0i"; depends=[DBI dbplyr doSNOW dplyr fastcluster foreach ggplot2 magrittr mzR plyr Rcpp reshape2 RSQLite stringr]; }; - msa = derive2 { name="msa"; version="1.28.0"; sha256="0vlhpv4hh3m2wb8bfr0hn0xfycd6x80zyjf275swx46mssdqwzyp"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; }; - msgbsR = derive2 { name="msgbsR"; version="1.20.0"; sha256="00r3kfimcjy02bb0i8przj45rfkdv3ddaxfjnmi1bb6j5l5sp17b"; depends=[BSgenome easyRNASeq edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr R_utils Rsamtools S4Vectors SummarizedExperiment]; }; - msmsEDA = derive2 { name="msmsEDA"; version="1.34.0"; sha256="0jnaq9ar4mnf3pfhka9hvk61p51ny9jws49xi8z29dq288b42b42"; depends=[gplots MASS MSnbase RColorBrewer]; }; - msmsTests = derive2 { name="msmsTests"; version="1.34.0"; sha256="1wzdz0p9wmr243xkmymx9fwskafkyxgmlip4sd1fy2s06px7r0xi"; depends=[edgeR msmsEDA MSnbase qvalue]; }; - msqrob2 = derive2 { name="msqrob2"; version="1.4.0"; sha256="0023mippnmmpz0r4f2h5r8g7z3yvhm6vfvkwp9ndsl1r1rpv801w"; depends=[BiocParallel codetools limma lme4 MASS Matrix purrr QFeatures SummarizedExperiment]; }; - multiClust = derive2 { name="multiClust"; version="1.26.0"; sha256="0dkj479id0kz8afmaskgn5dnfg26q47qf7gwm9qq3r9n51hbglsb"; depends=[amap cluster ctc dendextend mclust survival]; }; - multiGSEA = derive2 { name="multiGSEA"; version="1.6.0"; sha256="0nsab0ip3qnic5q15kmv42d4wf0vys5n4d539x0jq1i3mi3zpfbb"; depends=[AnnotationDbi dplyr fgsea graphite magrittr metap rappdirs rlang]; }; - multiHiCcompare = derive2 { name="multiHiCcompare"; version="1.14.0"; sha256="0mff46n168bxrg8y5dj38p2dfb0mhxf6z55fnmpfc2kahfa5bkk7"; depends=[aggregation BiocParallel data_table dplyr edgeR GenomeInfoDb GenomeInfoDbData GenomicRanges HiCcompare pbapply pheatmap qqman]; }; - multiMiR = derive2 { name="multiMiR"; version="1.18.0"; sha256="1wlr21v8brl20cphbvr5vcfy3ilamb7a1sd261i7lkdj4if8bxfx"; depends=[AnnotationDbi BiocGenerics dplyr purrr RCurl tibble XML]; }; - multiOmicsViz = derive2 { name="multiOmicsViz"; version="1.20.0"; sha256="0cbz32ma935ci4aq83dq55ks66v7pz9rpaqfjvkd9gz3c5s88p16"; depends=[doParallel foreach SummarizedExperiment]; }; - multiSight = derive2 { name="multiSight"; version="1.4.0"; sha256="1nkx92kyyimgz2jm4dl2izir0z3qbf9fibgxr5r9j3l3zjwbbd08"; depends=[anyLib biosigner caret clusterProfiler config DESeq2 dplyr DT easyPubMed enrichplot ggnewscale golem htmltools igraph infotheo metap mixOmics networkD3 ppcor R6 ReactomePA rmarkdown rWikiPathways shiny shinydashboard stringr]; }; - multicrispr = derive2 { name="multicrispr"; version="1.6.0"; sha256="0smljmmwlkawbd4hdwgzvl25zynij4ssn4fjdhkgrmszsq79wscy"; depends=[assertive BiocGenerics Biostrings BSgenome CRISPRseek data_table GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 karyoploteR magrittr plyranges Rbowtie reticulate rtracklayer stringi tidyr tidyselect]; }; - multiscan = derive2 { name="multiscan"; version="1.56.0"; sha256="0wxpm0np4721nw2gz4db4a1wdi06pnnziyj0mwkwpsll7mgz337p"; depends=[Biobase]; }; - multtest = derive2 { name="multtest"; version="2.52.0"; sha256="037wcmwk1wvhjxgmlvnk289pkwishi1753ajkmy9x14xlmldix82"; depends=[Biobase BiocGenerics MASS survival]; }; - mumosa = derive2 { name="mumosa"; version="1.4.0"; sha256="1zrbajjfjq8mp6qq10xfrq2m2yrnda37s2aba32dwdk1gpkxx9g4"; 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.10.1"; sha256="1j3zkhqgza92vdykb1yia1jjwsdqra6q9c0jk6p5p2x0778xqgfd"; 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.38.0"; sha256="16qfnf02lmfk1cwwql5airkpv7c90lvpyjjrwicid55gqhajfzhx"; depends=[Biostrings]; }; - musicatk = derive2 { name="musicatk"; version="1.6.0"; sha256="1j3402ywcma83zxbhwlazr0s57c8b11xzg41qfxc6k2dngv3h06z"; 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.32.0"; sha256="0j1cwz95hx2wl6mf6kycrw0xlsi4j6s7y4jjm87dq52dnwnh8svy"; depends=[GenomicFeatures Hmisc httr jsonlite plyr S4Vectors sqldf]; }; - myvariant = derive2 { name="myvariant"; version="1.26.0"; sha256="096zkpmllf58x3pz571h0y2v1klpw82xs6ffgg78hz3kayxbyqr9"; depends=[GenomeInfoDb Hmisc httr jsonlite magrittr plyr S4Vectors VariantAnnotation]; }; - mzID = derive2 { name="mzID"; version="1.34.0"; sha256="1q1aqyya9nd494s7m3rdaf3kixipdrwbj825g40kdljwrg85y961"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; }; - mzR = derive2 { name="mzR"; version="2.30.0"; sha256="1dqa03hb42kbqfg15ksijdkyf9pr54gcl3in4mzjkld5sdi8ncds"; depends=[Biobase BiocGenerics ncdf4 ProtGenerics Rcpp Rhdf5lib]; }; - nanotatoR = derive2 { name="nanotatoR"; version="1.12.0"; sha256="13r462fn6mfqknvizfbsim9dic6zw2wznmdhzwfwiax4b1ccjkk0"; depends=[AnnotationDbi curl dplyr GenomicRanges hash httr knitr openxlsx org_Hs_eg_db rentrez rlang stringr testthat tidyverse VarfromPDB XML XML2R]; }; - ncGTW = derive2 { name="ncGTW"; version="1.10.0"; sha256="1xcwh6xd0jhiq40rvswzngddndmvday0c8rni0sq43y9ng901jnd"; depends=[BiocParallel Rcpp xcms]; }; - ncRNAtools = derive2 { name="ncRNAtools"; version="1.6.0"; sha256="10ajjvhaagvgjcjfjkgviwdrk4962gb35lknwpab9mzdvgkwjb95"; depends=[GenomicRanges ggplot2 httr IRanges S4Vectors xml2]; }; - ncdfFlow = derive2 { name="ncdfFlow"; version="2.42.1"; sha256="0759xvkp22dnbhq5wpgvpk8p61w0d50r5jrbh9n7sj8sga4lvvv7"; depends=[BH Biobase BiocGenerics flowCore Rcpp RcppArmadillo Rhdf5lib zlibbioc]; }; - ndexr = derive2 { name="ndexr"; version="1.18.0"; sha256="0l6bfzkrd8n719fqll4v202dm19hgdn9l8n56l8bykfsa3sff0lj"; depends=[httr igraph jsonlite plyr RCX tidyr]; }; - nearBynding = derive2 { name="nearBynding"; version="1.6.0"; sha256="0gf0gm9aqxxhblhfjab61j0bmyh2lij9bcpk2jvb55gmdaqc1vxg"; depends=[BiocGenerics dplyr GenomeInfoDb GenomicRanges ggplot2 gplots magrittr matrixStats plyranges R_utils rlang Rsamtools rtracklayer S4Vectors transport TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; }; - nempi = derive2 { name="nempi"; version="1.4.0"; sha256="1hl1znxwdhsixv1cxq04nzsj982hjhpd5jc3pl6xdcivr0jbb405"; depends=[e1071 epiNEM matrixStats mnem naturalsort nnet randomForest]; }; - netDx = derive2 { name="netDx"; version="1.8.0"; sha256="0v6760mghq6ynmzfll16gc2q7c4l7gqlxilx6np6aha2qcwgr4cl"; depends=[bigmemory BiocFileCache combinat doParallel foreach GenomeInfoDb GenomicRanges ggplot2 glmnet httr igraph IRanges MultiAssayExperiment plotrix pracma rappdirs RColorBrewer reshape2 ROCR Rtsne S4Vectors]; }; - netOmics = derive2 { name="netOmics"; version="1.2.0"; sha256="11yjlp1siq80492sywpkwghcsnqmwvmx0rbw9wm58j61qdlywcb5"; depends=[AnnotationDbi dplyr ggplot2 GO_db gprofiler2 igraph magrittr minet purrr RandomWalkRestartMH tibble tidyr]; }; - netSmooth = derive2 { name="netSmooth"; version="1.16.0"; sha256="0jzid8svq21i5kbc3c908dqmf0i4mlsnfa4bq7avp9ynv195nc4q"; depends=[cluster clusterExperiment data_table DelayedArray entropy HDF5Array Matrix scater SingleCellExperiment SummarizedExperiment]; }; - netZooR = derive2 { name="netZooR"; version="1.0.0"; sha256="03a1i508hm8i86nnlj1i4hz83fz1krp3qfbiyv2yhrdq3f5ra1yr"; depends=[AnnotationDbi assertthat Biobase data_table doParallel dplyr foreach ggdendro ggplot2 GO_db GOstats gplots igraph MASS Matrix matrixStats nnet org_Hs_eg_db pandaR penalized RCy3 reshape reshape2 reticulate STRINGdb tidyr vegan viridisLite yarn]; }; - netbiov = derive2 { name="netbiov"; version="1.30.0"; sha256="1c63ywyp7zcszrrkyx3q4xnkzij17km675825gcmfgk3h0g96lx7"; depends=[igraph]; }; - netboost = derive2 { name="netboost"; version="2.4.1"; sha256="11rayvp15ysk2fkpsw3w3ivkxfk8dznz6zdrnbmfhv1814mbfvk7"; depends=[colorspace dynamicTreeCut impute R_utils Rcpp RcppParallel WGCNA]; }; - netboxr = derive2 { name="netboxr"; version="1.7.1"; sha256="06pc0qw275r1ksj07hvkfvcvxl9dg539wja07j7lbqvnp6hzl0xd"; depends=[clusterProfiler data_table DT gplots igraph jsonlite plyr RColorBrewer]; }; - nethet = derive2 { name="nethet"; version="1.28.0"; sha256="1c6is3w1saw5i2akmxf6272qlbxpf40ayfh19jialmmqsdhik01z"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network]; }; - netprioR = derive2 { name="netprioR"; version="1.22.0"; sha256="0wbhcr0qkcsnakfpx49hkjhwbmrc9n76rbs75pc3da4z9wv89qg3"; depends=[doParallel dplyr foreach ggplot2 gridExtra Matrix pROC sparseMVN]; }; - netresponse = derive2 { name="netresponse"; version="1.56.1"; sha256="0vzvmbb01f4dqy6g9yvwl078zmrnvzgdx12d91k43cw289z3ykvz"; depends=[BiocStyle ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape2 Rgraphviz rmarkdown]; }; - networkBMA = derive2 { name="networkBMA"; version="2.35.0"; sha256="0xa0b977apbr6p9kqk38582af635kp99csj32bsn2bf8pjsmd4d2"; depends=[BH BMA leaps Rcpp RcppArmadillo RcppEigen]; }; - ngsReports = derive2 { name="ngsReports"; version="1.12.4"; sha256="16nc7yl9gaxj7j3dggnd02jn157nndjgxpbvjwa78gxag1lp5fld"; depends=[BiocGenerics Biostrings checkmate dplyr DT forcats ggdendro ggplot2 lifecycle lubridate pander plotly readr reshape2 rmarkdown scales stringr tibble tidyr tidyselect zoo]; }; - nnNorm = derive2 { name="nnNorm"; version="2.60.0"; sha256="09xr73xpfzj0w9wx23bqzkcnxlvgc50lazbfpd5phl0ravsl5spl"; depends=[marray nnet]; }; - nnSVG = derive2 { name="nnSVG"; version="1.0.4"; sha256="033210n4i52kdm2qv6m3f6pkmb0ll7lwanwn2nz9kzig55mgmn23"; depends=[BiocParallel BRISC Matrix matrixStats SingleCellExperiment SpatialExperiment SummarizedExperiment]; }; - nondetects = derive2 { name="nondetects"; version="2.26.0"; sha256="1y31pzsihqmlhprdgl9xwspbfj2k9zgp15d905v6y9zjzjdxfdhf"; depends=[arm Biobase HTqPCR limma mvtnorm]; }; - normalize450K = derive2 { name="normalize450K"; version="1.24.0"; sha256="03cmxljvcfmzkvsrzhc4si17g68fcb8877pzf6960cvbhv00d4ys"; depends=[Biobase illuminaio quadprog]; }; - normr = derive2 { name="normr"; version="1.22.0"; sha256="1v1x54k8kphq3xrnv5m2ya4viyg22msgviv6hg6qg8fb4hqp9ich"; depends=[bamsignals GenomeInfoDb GenomicRanges IRanges qvalue Rcpp rtracklayer]; }; - npGSEA = derive2 { name="npGSEA"; version="1.32.0"; sha256="05l9dd4w013k9m6yckidal2q2b991nkir78543rzjh81x9kqz229"; depends=[Biobase BiocGenerics GSEABase]; }; - nuCpos = derive2 { name="nuCpos"; version="1.14.0"; sha256="1lx3d1iadhah35hc30wmmki8yxqqw5qs0h0h1wjd6qyg0hyxskq7"; depends=[]; }; - nucleR = derive2 { name="nucleR"; version="2.28.0"; sha256="1878hzdffsz4hsghk9y9m8bdqcy75z5hipj264dawvp89lm57sfg"; depends=[Biobase BiocGenerics Biostrings dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges magrittr Rsamtools S4Vectors ShortRead]; }; - nucleoSim = derive2 { name="nucleoSim"; version="1.24.0"; sha256="0s81vjca93afz9ysjz16pkdsn7x206lr7mbj9lnrllffhy4n4n59"; depends=[IRanges S4Vectors]; }; - nullranges = derive2 { name="nullranges"; version="1.2.0"; sha256="00zx8xq8hz2pz3x6x5lmq78nvrzpzmkjwm364d9qswjvcxdgmcvb"; depends=[data_table GenomeInfoDb GenomicRanges ggplot2 ggridges InteractionSet IRanges ks plyranges progress rlang S4Vectors scales speedglm]; }; - occugene = derive2 { name="occugene"; version="1.56.0"; sha256="1cbi3h0m48vdy1jd5zqmwvrxgc7dn9jxadg1drc3sfbba5y85bsh"; depends=[]; }; - odseq = derive2 { name="odseq"; version="1.24.0"; sha256="1j8fv35z3wlc6y5ms34fd0z1r7w9hkr6fzb5rxx2ylc6nfgcsymv"; depends=[kebabs mclust msa]; }; - oligo = derive2 { name="oligo"; version="1.60.0"; sha256="0y7j96rafm9b85sxq2483i73685i3j67lk33fn8nfcav6lmsv5vy"; depends=[affxparser affyio Biobase BiocGenerics Biostrings DBI ff oligoClasses preprocessCore RSQLite zlibbioc]; }; - oligoClasses = derive2 { name="oligoClasses"; version="1.58.0"; sha256="1m4x50gl1fm5waa531v7ml0q229q65qn9cgiwnvjg721fvra7mdk"; depends=[affyio Biobase BiocGenerics BiocManager Biostrings DBI ff foreach GenomicRanges IRanges RSQLite S4Vectors SummarizedExperiment]; }; - omicRexposome = derive2 { name="omicRexposome"; version="1.18.0"; sha256="0gpd1hqniz6m0q1r6ijbr9kj7j9k4lzxqw9r906hlrh3jkwdyw21"; depends=[Biobase ggplot2 ggrepel gridExtra isva limma MultiDataSet omicade4 PMA rexposome SmartSVA stringr SummarizedExperiment sva]; }; - omicade4 = derive2 { name="omicade4"; version="1.36.0"; sha256="1l7w3sczsimg640klq8navgdcwjj090wjqd40n4mw76pny2xj2lj"; depends=[ade4 Biobase made4]; }; - omicplotR = derive2 { name="omicplotR"; version="1.16.0"; sha256="0sqh8nympgrig01x4j302xsya10sbrpn75sjwy16srxxiagkrlzk"; depends=[ALDEx2 compositions DT jsonlite knitr matrixStats rmarkdown shiny vegan zCompositions]; }; - omicsPrint = derive2 { name="omicsPrint"; version="1.16.0"; sha256="08gv2qzv7a1jsyqqm802w3awymnnyyy84ic56wzhcdimhqgs0an3"; depends=[MASS matrixStats MultiAssayExperiment RaggedExperiment SummarizedExperiment]; }; - omicsViewer = derive2 { name="omicsViewer"; version="1.0.1"; sha256="1dndhjwi7n0syp6dq84008df12f628pr0h880qvgfgzfy63g0vnz"; depends=[beeswarm Biobase curl DT fastmatch fgsea flatxml ggplot2 ggseqlogo htmlwidgets httr Matrix matrixStats networkD3 openxlsx plotly psych RColorBrewer reshape2 RSQLite S4Vectors shiny shinybusy shinycssloaders shinyjs shinythemes shinyWidgets stringr SummarizedExperiment survival survminer]; }; - ompBAM = derive2 { name="ompBAM"; version="1.0.0"; sha256="0pjkp6vhnnbdflgg15f9cvlx8cdmbd3y09d7i1dk421z28jlwzrs"; depends=[Rcpp zlibbioc]; }; - oncomix = derive2 { name="oncomix"; version="1.18.0"; sha256="0yj0p2vkph8qy1hhfv8nc15ac0z506xazzsmq6a7pvz5yqw7hxqc"; depends=[ggplot2 ggrepel mclust RColorBrewer SummarizedExperiment]; }; - oneSENSE = derive2 { name="oneSENSE"; version="1.18.0"; sha256="189zhz5glffh0q368mj8z7q7kvdpx2yl7xvwz5q20ckqj3xyyf10"; depends=[flowCore gplots plotly Rtsne scatterplot3d shiny shinyFiles webshot]; }; - onlineFDR = derive2 { name="onlineFDR"; version="2.4.0"; sha256="0l2sc6kzwg1y68b4hh8xq075kkb1iz6l5ns417z36hwzb5sl0jxr"; depends=[dplyr ggplot2 progress Rcpp RcppProgress tidyr]; }; - ontoProc = derive2 { name="ontoProc"; version="1.18.0"; sha256="01wc7yk44zkylkx1blh7a299696pvf2smya728v3f8axvk8n5hyp"; depends=[AnnotationDbi AnnotationHub Biobase BiocFileCache dplyr DT graph igraph magrittr ontologyIndex ontologyPlot Rgraphviz S4Vectors shiny]; }; - openCyto = derive2 { name="openCyto"; version="2.8.4"; sha256="0fa3hbbrjw458dhmxdjypcjgyxmphp9kdr3r62qqf803i4wsxfk0"; depends=[Biobase BiocGenerics clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; }; - openPrimeR = derive2 { name="openPrimeR"; version="1.18.0"; sha256="1lxs08x6xw80rw6q15qda1668yil53pwcwcm1kryibjx78rng3mf"; depends=[ape BiocGenerics Biostrings DECIPHER digest distr distrEx dplyr fitdistrplus foreach GenomicRanges ggplot2 Hmisc IRanges lpSolveAPI magrittr openxlsx plyr RColorBrewer reshape2 S4Vectors scales seqinr stringdist stringr uniqtag XML]; }; - openPrimeRui = derive2 { name="openPrimeRui"; version="1.18.0"; sha256="1gkqka5i3advring4ajhkad183j27lik605hhnww0fm8n7qmgz7l"; depends=[DT openPrimeR rmarkdown shiny shinyBS shinyjs]; }; - oposSOM = derive2 { name="oposSOM"; version="2.14.0"; sha256="0fglnzab8p2za8d3d3cpia2rai64jyra1yazkfk718bin6nx2bpg"; depends=[ape Biobase biomaRt fastICA fdrtool graph igraph pixmap png Rcpp RcppParallel RCurl scatterplot3d tsne XML]; }; - oppar = derive2 { name="oppar"; version="1.24.0"; sha256="0p5r98v5f969hllm0ywqfi67gaxlgxba506qvlq2rd870bv5bgmk"; depends=[Biobase GSEABase GSVA]; }; - oppti = derive2 { name="oppti"; version="1.10.0"; sha256="0rwgyq4qx4bgz1rl6z93yiadpslnj8v1aj84pdhjdd7gcn0xyc4g"; depends=[devtools ggplot2 knitr limma parallelDist pheatmap RColorBrewer reshape]; }; - optimalFlow = derive2 { name="optimalFlow"; version="1.8.0"; sha256="0h6a1cv7gc9pbahn3jpxayxqn9gl9qdygvmppz0za4bmi7jsc03i"; depends=[dbscan doParallel dplyr ellipse flowMeans foreach optimalFlowData randomForest Rfast rgl rlang robustbase transport]; }; - orthogene = derive2 { name="orthogene"; version="1.2.1"; sha256="1ckzzqglidwb8kmmd93aq2fm8ip95ac3hrf7f8kq27v2z62ykmjk"; depends=[babelgene data_table DelayedArray DelayedMatrixStats dplyr ggplot2 ggpubr ggtree gprofiler2 grr homologene jsonlite Matrix patchwork repmis]; }; - pRoloc = derive2 { name="pRoloc"; version="1.36.0"; sha256="11nznxcw06v9z5l9zlkqqpqzb5iaabvfbww0d0y1blgzhf06mfpz"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class coda dendextend e1071 FNN ggplot2 gtools hexbin kernlab knitr LaplacesDemon lattice MASS mclust mixtools MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo sampling scales]; }; - pRolocGUI = derive2 { name="pRolocGUI"; version="2.6.0"; sha256="0j48nky1gl1jggpikq60zxcnd4l3ka7l7wwsg0mn3i99ak1x55xh"; depends=[Biobase BiocGenerics colorspace colourpicker dplyr DT ggplot2 MSnbase pRoloc scales shiny shinydashboard shinydashboardPlus shinyhelper shinyjs shinyWidgets]; }; - packFinder = derive2 { name="packFinder"; version="1.8.0"; sha256="0swvwh8wx871yppzi5mail4hrm8cvfyic4yqnwr32sihipsr9sgq"; depends=[ape Biostrings GenomicRanges IRanges kmer S4Vectors]; }; - padma = derive2 { name="padma"; version="1.6.0"; sha256="1rp0l035dcqb3vr6rh2q8x9169abcv02g71a6gvbzrs6zipp1183"; depends=[FactoMineR MultiAssayExperiment S4Vectors SummarizedExperiment]; }; - pageRank = derive2 { name="pageRank"; version="1.6.0"; sha256="0ad9c6zrfajlkw0d1xhk2b4lggaj37iw92n2lj9qmw9jcdbpqlnq"; depends=[GenomicRanges igraph motifmatchr]; }; - paircompviz = derive2 { name="paircompviz"; version="1.34.0"; sha256="00fqwm8f2aw8lif3hpf7lh68b1gyffi18c97q2y4nh97zf94da0i"; depends=[Rgraphviz]; }; - pairkat = derive2 { name="pairkat"; version="1.2.0"; sha256="05ci3mbbfri30xxhi7ssj1wc35qbl1q5aaybqvfk9s8l14ax0izy"; depends=[CompQuadForm data_table igraph KEGGREST magrittr SummarizedExperiment tibble]; }; - pandaR = derive2 { name="pandaR"; version="1.28.0"; sha256="1l0iz2pyw728vi6smc1gk1sxjczfgdfv805fdc8bby0qapl7v85r"; depends=[Biobase BiocGenerics ggplot2 hexbin igraph matrixStats plyr reshape RUnit]; }; - panelcn_mops = derive2 { name="panelcn.mops"; version="1.18.0"; sha256="1pi6xva3s7avcdayqhh5xyrv00dv2gkv4pwxp3f5k8biz2i5qn0x"; depends=[cn_mops GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors]; }; - panp = derive2 { name="panp"; version="1.66.0"; sha256="0bvl3jrsqvf0955mjzqn4nzj3anhhhhn6id57icsmjq15gviajzl"; depends=[affy Biobase]; }; - pareg = derive2 { name="pareg"; version="1.0.0"; sha256="1kzs349cbz81ba1jm7vjqypn1041l5p8qrg9r596b9d902hiqfjg"; depends=[DOSE dplyr furrr ggplot2 ggraph glue igraph keras magrittr Matrix matrixLaplacian nloptr progress proxy purrr reticulate rlang shadowtext stringr tensorflow tfprobability tibble tidygraph tidyr]; }; - parglms = derive2 { name="parglms"; version="1.28.0"; sha256="0h9bd3rv2cbn8rfv4d1c2ah0pp7bsiziyj7zwslgwa2ycqrarpqa"; depends=[BatchJobs BiocGenerics doParallel foreach]; }; - parody = derive2 { name="parody"; version="1.54.0"; sha256="0g974q140byiniixgsq717vz66wrsfwhrv76w0c4by23kvmkyrz7"; depends=[]; }; - pathRender = derive2 { name="pathRender"; version="1.64.0"; sha256="07mad39y9l4c1mb66psi5d9vqd7lwkin3psrszqhl5kd6fi6z3in"; depends=[AnnotationDbi cMAP graph RColorBrewer Rgraphviz]; }; - pathVar = derive2 { name="pathVar"; version="1.26.0"; sha256="1q7dryn1h98cfr03xc7bm84rc0xsdhpc1mizd169cyck0jj70siq"; depends=[data_table EMT ggplot2 gridExtra Matching mclust]; }; - pathifier = derive2 { name="pathifier"; version="1.34.0"; sha256="0aanvd9sgicnbl87wwfr7sdh6bjy6knhcx1x1d5g34pqbzkwfzwq"; depends=[princurve R_oo]; }; - pathview = derive2 { name="pathview"; version="1.36.1"; sha256="11g4zhy4qfq0gmy588334f7s2w1acs2dz9kimax5ya2b8jjibk71"; depends=[AnnotationDbi graph KEGGgraph KEGGREST org_Hs_eg_db png Rgraphviz XML]; }; - pathwayPCA = derive2 { name="pathwayPCA"; version="1.12.0"; sha256="13ny1z0i7zywpk8lk8qpbj2zpgznq3l4q1vyg1r0rc265p8c3031"; depends=[lars survival]; }; - paxtoolsr = derive2 { name="paxtoolsr"; version="1.30.0"; sha256="0kzszgk69078kg5v6blnr1bbhhin8rx62s40xx1abm6pm0k87kli"; depends=[httr igraph jsonlite plyr R_utils rappdirs readr rJava rjson XML]; }; - pcaExplorer = derive2 { name="pcaExplorer"; version="2.22.0"; sha256="0xkafpi6y5n8hljdaj183hd5z4ik7lpbklg2cbx1hwfz4n4hh1bl"; depends=[AnnotationDbi base64enc biomaRt DESeq2 DT genefilter GenomicRanges ggplot2 ggrepel GO_db GOstats heatmaply IRanges knitr limma NMF pheatmap plotly plyr rmarkdown S4Vectors scales shiny shinyAce shinyBS shinydashboard SummarizedExperiment threejs tidyr topGO]; }; - pcaMethods = derive2 { name="pcaMethods"; version="1.88.0"; sha256="1087sl7y707zld7zpf3ly51gnmdp93vn90dwa5440v7qawvg2h9b"; depends=[Biobase BiocGenerics MASS Rcpp]; }; - pcxn = derive2 { name="pcxn"; version="2.18.0"; sha256="08w3b8ngbrv7nhc6ybmzwkahk89ixxq67f9zjwinajw3svfi7yw8"; depends=[pcxnData pheatmap]; }; - pdInfoBuilder = derive2 { name="pdInfoBuilder"; version="1.60.0"; sha256="14lhkhkgslwls86p7y04k0vjg5yqd2js9j4hnvkn89zydv7r29r0"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; - peakPantheR = derive2 { name="peakPantheR"; version="1.10.0"; sha256="0ais6q8vl16x9prf8xsairrhjaaq246zw5n90g2zmh0nnb6674hw"; depends=[bslib doParallel DT foreach ggplot2 gridExtra minpack_lm MSnbase mzR pracma scales shiny shinycssloaders stringr XML]; }; - peco = derive2 { name="peco"; version="1.8.0"; sha256="12mq87cyndl7zgwn155vbd8lh3yil9l6slmyjin971hlw53qvikn"; depends=[assertthat circular conicfit doParallel foreach genlasso scater SingleCellExperiment SummarizedExperiment]; }; - pengls = derive2 { name="pengls"; version="1.2.0"; sha256="0zk8f9yzxc1mnyyv1g2rfjlcc0hz2dgavjrlgfqajzss4m5dilqs"; depends=[BiocParallel glmnet nlme]; }; - pepStat = derive2 { name="pepStat"; version="1.30.0"; sha256="1fj32n61zxm7ls7qk0ncpmm1g2xpf60i0310axniyxlxcbyds0b3"; depends=[Biobase data_table fields GenomicRanges ggplot2 IRanges limma plyr]; }; - pepXMLTab = derive2 { name="pepXMLTab"; version="1.30.0"; sha256="11fnm35cbnwy9l09mci9846xcv2mxvknv9hb1bs1i8381q8ysvws"; depends=[XML]; }; - periodicDNA = derive2 { name="periodicDNA"; version="1.6.0"; sha256="0ak5i5pqhjyz99lhbiqxjymsars3pajfwd2snzlyc7xd1fjxg06s"; depends=[BiocParallel Biostrings BSgenome cowplot GenomeInfoDb GenomicRanges ggplot2 IRanges magrittr rtracklayer S4Vectors zoo]; }; - pgca = derive2 { name="pgca"; version="1.20.0"; sha256="1mrn054flab2v18za40fhfxn691g3gq93p1ciyxfakbyb89ryi5x"; depends=[]; }; - phantasus = derive2 { name="phantasus"; version="1.16.2"; sha256="0r860hs25higr4crq1jf0s9a8pzrxbswdmz2zyx5bx0p1b78m6si"; depends=[AnnotationDbi assertthat Biobase ccaPP curl data_table 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.12.0"; sha256="0nn0qgb0rz4j2xsjq0wydjhg5pmf2ra67rm9fdm4m1izmzwa0nhs"; 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.44.0"; sha256="0dm3h7ax83j3izcij7cdf8wg9cl4409vwnmzfbymf33y2l2z8csx"; 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.20.0"; sha256="114v90my05q89bgyjgl2ix62h3l4xcy96j2fncmpa89l7zax9fr2"; depends=[dplyr ggplot2 Rcpp SummarizedExperiment tibble tidyr]; }; - philr = derive2 { name="philr"; version="1.22.0"; sha256="1mj6mzl74dbpdhc5laiax5h20i0rh9n2rkip7vgwr5qc26a16kcw"; depends=[ape ggplot2 ggtree phangorn tidyr]; }; - phosphonormalizer = derive2 { name="phosphonormalizer"; version="1.20.0"; sha256="0mcgxwg3igji0a3nwhjby10yy6p1hlh1pfcx973vi7fy3w5inm19"; depends=[matrixStats plyr]; }; - phyloseq = derive2 { name="phyloseq"; version="1.40.0"; sha256="0hcyv4ziyaw74mc9vf7bad3q9izi9p0whg3hspbs6w8b3hp34y2k"; depends=[ade4 ape Biobase BiocGenerics biomformat Biostrings cluster data_table foreach ggplot2 igraph multtest plyr reshape2 scales vegan]; }; - piano = derive2 { name="piano"; version="2.12.1"; sha256="0my7pkd565mkx8b8v008yayh5a0wkp25hwy7fpslygs5ycmr872h"; depends=[Biobase BiocGenerics DT fgsea gplots htmlwidgets igraph marray relations scales shiny shinydashboard shinyjs visNetwork]; }; - pickgene = derive2 { name="pickgene"; version="1.68.0"; sha256="1zdiaw0n72sc98qz5fl5xq34s1sqjmp45p2m8m882cv17d81fdgm"; depends=[MASS]; }; - pipeComp = derive2 { name="pipeComp"; version="1.6.0"; sha256="0m3kp996x248jvcy3d2d8hfw53vzj24k1jkcdw02lcc8p0rcy0zm"; depends=[aricode BiocParallel circlize clue cluster ComplexHeatmap cowplot dplyr ggplot2 intrinsicDimension knitr Matrix matrixStats randomcoloR RColorBrewer reshape2 Rtsne S4Vectors scales scater scran Seurat SingleCellExperiment SummarizedExperiment uwot viridisLite]; }; - pipeFrame = derive2 { name="pipeFrame"; version="1.12.0"; sha256="13xxkk7ja7f7kzn5pxcikdczc5y8f42l4xx3qbw837jxl5sxk2fy"; depends=[Biostrings BSgenome digest GenomeInfoDb magrittr rmarkdown visNetwork]; }; - pkgDepTools = derive2 { name="pkgDepTools"; version="1.62.0"; sha256="1fpdlvivarilkbd5zanqpss1irr3a1y10qqj2k8zmh3rxw6gd99g"; depends=[graph RBGL]; }; - planet = derive2 { name="planet"; version="1.4.0"; sha256="0gqcflfn3l4dia6bi9jbadmhhp1flh3fss8glnlqxwgh4znlgj2x"; depends=[dplyr magrittr tibble]; }; - plethy = derive2 { name="plethy"; version="1.34.0"; sha256="1lj31iizb042zxqr5hma25p0clwc5d034bdbrwcpsfi6gq50ca42"; depends=[Biobase BiocGenerics DBI ggplot2 IRanges plyr RColorBrewer reshape2 RSQLite S4Vectors Streamer]; }; - plgem = derive2 { name="plgem"; version="1.68.0"; sha256="07zxflxcay17hxjw3wh5kfdwl2x8537csb18p1qzmyrkvscnja77"; depends=[Biobase MASS]; }; - plier = derive2 { name="plier"; version="1.66.0"; sha256="0zs053ih93klbdwz4gg8m5kizn9ifdccvgm21ddphv9jyn0sic4b"; depends=[affy Biobase]; }; - plotGrouper = derive2 { name="plotGrouper"; version="1.14.0"; sha256="1v8yjpavyz6gkm9wpv1ja3ifgdm25x7yw3rsb40py3bfz6wq50pr"; 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.2.10"; sha256="1azl98gnr6019hzl8c6j3cs7wnq8wicwydxc7wga0882l4jaiv5c"; depends=[curl data_table dplyr ggplotify IRanges plyranges purrr RColorBrewer Rcpp rlang strawr]; }; - plyranges = derive2 { name="plyranges"; version="1.16.0"; sha256="16af5v9k40sc152bgywkhzxbwx3gyljmn4whx0idfr58q5lafk90"; depends=[BiocGenerics dplyr GenomeInfoDb GenomicAlignments GenomicRanges IRanges magrittr rlang Rsamtools rtracklayer S4Vectors tidyselect]; }; - pmm = derive2 { name="pmm"; version="1.28.0"; sha256="1s2b4n91chjsplcmk8zj1sc8fm834vq1rygj10fvap9cnacc53pr"; depends=[lme4]; }; - pmp = derive2 { name="pmp"; version="1.8.0"; sha256="12bfbcvsxvlrv4znb7sy5ysmqr3rgpf24axcd5clhbw4xxsasak9"; depends=[ggplot2 impute matrixStats missForest pcaMethods reshape2 S4Vectors SummarizedExperiment]; }; - podkat = derive2 { name="podkat"; version="1.28.0"; sha256="1fv0xpir46hfm85lcp3r0wwwf95w3frxn869m41qqqd20l45dbv7"; depends=[Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp Rhtslib Rsamtools]; }; - pogos = derive2 { name="pogos"; version="1.16.0"; sha256="1yqz6zayjpgbjfv2b2xy1hrriyjp9p62sgz0m3wzc036ki6hdgj5"; depends=[ggplot2 httr ontoProc rjson S4Vectors shiny]; }; - polyester = derive2 { name="polyester"; version="1.32.0"; sha256="1l25aggq6yx00rcbqqmpn9w48lj28z1m4s52ngmd2yxvr1kfwz7y"; depends=[Biostrings IRanges limma logspline S4Vectors zlibbioc]; }; - powerTCR = derive2 { name="powerTCR"; version="1.16.0"; sha256="0wdaxhhsr0zap3mmcfsky5qxka38q86qm3fwdpxq3dprq87i4gyi"; depends=[cubature doParallel evmix foreach magrittr purrr truncdist vegan VGAM]; }; - ppcseq = derive2 { name="ppcseq"; version="1.4.0"; sha256="0m5cw7xjzway21ys1ihyp6s1ni05hxzswhixzig5w375m4qq32zp"; depends=[benchmarkme BH dplyr edgeR foreach furrr future ggplot2 lifecycle magrittr purrr Rcpp RcppEigen rlang rstan rstantools StanHeaders tibble tidybayes tidyr]; }; - ppiStats = derive2 { name="ppiStats"; version="1.62.0"; sha256="0w5gkfah2y50x4wj5fn8i6ycx1x013mn9w4bs8r2vfqabpws1a81"; depends=[Biobase Category graph lattice RColorBrewer]; }; - pqsfinder = derive2 { name="pqsfinder"; version="2.12.0"; sha256="1mzl1n5vag59m0i30p839dba400pl41kzqk6mqlysysrbhy55mq4"; depends=[BH Biostrings GenomicRanges IRanges Rcpp S4Vectors]; }; - pram = derive2 { name="pram"; version="1.12.0"; sha256="1shri7kc33wfliv6bjgcx9xxgblz6kg791r2zpbmj0mc1dwzvqz4"; depends=[BiocGenerics BiocParallel data_table GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; }; - prebs = derive2 { name="prebs"; version="1.36.0"; sha256="0v72wxmv790bbwx5fblp90a3rxqg7g19ryv6xbi23753jd4l6290"; depends=[affy Biobase GenomeInfoDb GenomicAlignments GenomicRanges IRanges RPA S4Vectors]; }; - preciseTAD = derive2 { name="preciseTAD"; version="1.6.0"; sha256="0zj90y364yfdg6sws32b71n9wdjbw5rhygihcimnwszfhqkfm7hg"; depends=[caret cluster dbscan doSNOW e1071 foreach GenomicRanges gtools IRanges ModelMetrics pbapply pROC PRROC randomForest rCGH S4Vectors]; }; - preprocessCore = derive2 { name="preprocessCore"; version="1.58.0"; sha256="1sqpp00hhv6gypflrjw8qpqyqgdcp29m86gmi1di1574x8casdkf"; depends=[]; }; - primirTSS = derive2 { name="primirTSS"; version="1.14.0"; sha256="19m448jiww7z5jf54k625fqljh34nnaxrs9pz2by24kb1iwq9bml"; depends=[BiocGenerics Biostrings BSgenome_Hsapiens_UCSC_hg38 dplyr GenomicRanges GenomicScores Gviz IRanges JASPAR2018 phastCons100way_UCSC_hg38 purrr R_utils rtracklayer S4Vectors shiny stringr TFBSTools tibble tidyr]; }; - proActiv = derive2 { name="proActiv"; version="1.6.0"; sha256="1m3rcd6qffd27kdrac5zvriy04p22pky2ldb70069vlhykh979hm"; depends=[AnnotationDbi BiocParallel data_table DESeq2 dplyr GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gplots IRanges rlang S4Vectors scales SummarizedExperiment tibble]; }; - proBAMr = derive2 { name="proBAMr"; version="1.30.0"; sha256="06k52jjii9mmy6nyq49f42j8z15snhq58zjj35piyj9vb8x5nl3n"; depends=[AnnotationDbi Biostrings GenomicFeatures GenomicRanges IRanges rtracklayer]; }; - proBatch = derive2 { name="proBatch"; version="1.11.0"; sha256="1296zlqpkf6pcdxn42sfb8sr8yml7fx97i6iw3ivq98fbgikrad6"; depends=[Biobase corrplot data_table dplyr ggfortify ggplot2 lazyeval lubridate magrittr pheatmap preprocessCore purrr pvca RColorBrewer reshape2 rlang scales sva tibble tidyr viridis wesanderson WGCNA]; }; - proDA = derive2 { name="proDA"; version="1.10.0"; sha256="13an4g1m671if0jvnxvcbvidlaycfyva6bipairjakzvisc3v7df"; depends=[BiocGenerics extraDistr S4Vectors SummarizedExperiment]; }; - proFIA = derive2 { name="proFIA"; version="1.22.0"; sha256="0cprrdb3mqx9vfqfhx64s0ix22piqy1g2vqjwzxsh5330rg9x4jd"; depends=[Biobase BiocParallel minpack_lm missForest pracma ropls xcms]; }; - procoil = derive2 { name="procoil"; version="2.24.0"; sha256="1yw59sjljwa4minnlf8w2cbasyf0xyfm3y7r7nw2cl9pkil7q8lh"; depends=[Biostrings kebabs S4Vectors]; }; - profileScoreDist = derive2 { name="profileScoreDist"; version="1.24.0"; sha256="04kvrw09zacvl9cxycw691vhijmhm9whb56iw19jh9w6910bd8g6"; depends=[BiocGenerics Rcpp]; }; - profileplyr = derive2 { name="profileplyr"; version="1.12.0"; sha256="0i4nrq3n122hz6y6fxnx9crv4k9dk1q75b0f38lclblm897vxhnw"; depends=[BiocGenerics BiocParallel ChIPseeker circlize ComplexHeatmap dplyr EnrichedHeatmap GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges magrittr org_Hs_eg_db org_Mm_eg_db pheatmap R_utils rGREAT rjson rlang Rsamtools rtracklayer S4Vectors soGGi SummarizedExperiment tidyr tiff TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene]; }; - progeny = derive2 { name="progeny"; version="1.18.0"; sha256="1rhy2l2yf9ndxlvff8756s6n8qyi42nz7a75lgygj5aqqckkj21b"; depends=[Biobase decoupleR dplyr ggplot2 ggrepel gridExtra reshape2 tidyr]; }; - projectR = derive2 { name="projectR"; version="1.12.0"; sha256="06xnygqzs4pbdilrm482dxv700bwwy94fkcqgzg1y93bg2pc9jcx"; depends=[cluster CoGAPS dplyr ggalluvial ggplot2 limma NMF RColorBrewer reshape2 ROCR scales viridis]; }; - protGear = derive2 { name="protGear"; version="1.0.0"; sha256="19kzjlm7d9yc8zr38cda9c8ijrakiv795av59gvi2h6hkbawh3z1"; depends=[Biobase data_table dplyr factoextra FactoMineR flexdashboard genefilter GGally ggplot2 ggpubr gtools htmltools kableExtra Kendall knitr limma magrittr MASS pheatmap plotly plyr purrr readr remotes rlang rmarkdown shiny shinydashboard styler tibble tidyr vsn]; }; - proteinProfiles = derive2 { name="proteinProfiles"; version="1.36.0"; sha256="0d229pa4drqpmx8557rc9ic4hck6p0b4kjrvcql97zxbawd42p9l"; depends=[]; }; - psichomics = derive2 { name="psichomics"; version="1.22.1"; sha256="01dgp09219abcvy1kc8hwkpx40rqsyl5g2i5x99c31zsnm4bmhrg"; 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.28.0"; sha256="1yak827sma4l90k7hvsknkiacbvz3q4rfbxc3v5m5hk0xdwh26fi"; depends=[BgeeDB Biobase biomaRt ggplot2 GO_db igraph labeling RCurl reshape2 stringr topGO]; }; - ptairMS = derive2 { name="ptairMS"; version="1.4.1"; sha256="0pdsb98gf11hh93h9ml546s36vsn9x2vq2fkq3zgyj708prpp7s7"; 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.9.1"; sha256="1zb8xzs9h4rcrnmsfvrwb1qixn3jbnzxdwqgdrb82hgmxabmajlb"; depends=[cowplot ggplot2 ggridges MuMIn R_utils robustbase S4Vectors SummarizedExperiment UpSetR]; }; - puma = derive2 { name="puma"; version="3.38.0"; sha256="0nvyn5j3j5054ifwc9mngf37hq40qdhrhfih195qalpkj6il2b1b"; depends=[affy affyio Biobase mclust oligo oligoClasses]; }; - pvac = derive2 { name="pvac"; version="1.44.0"; sha256="0vmfnc5cb1xxbhjaxz8rdvdx2w3dg0i8jnc4i9wa67x6rb3g19ba"; depends=[affy Biobase]; }; - pvca = derive2 { name="pvca"; version="1.36.0"; sha256="1356hc5zvfhkn7xgnxs1qm6w0fadb1nqsclgc5mlr15ckf1pr8gr"; depends=[Biobase lme4 Matrix vsn]; }; - pwOmics = derive2 { name="pwOmics"; version="1.28.0"; sha256="0viy8k7dcx1cgq23mq2779d8hfn4wffq4xi483fjizihs11hr6yy"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics biomaRt data_table GenomicRanges gplots graph igraph rBiopaxParser STRINGdb]; }; - pwrEWAS = derive2 { name="pwrEWAS"; version="1.10.0"; sha256="1xfb9sqz6r21qgdqfs2jzlgky9myzdcqpv4vavh2g33bbnqbkknf"; depends=[abind BiocManager CpGassoc doParallel doSNOW foreach genefilter ggplot2 limma pwrEWAS_data shiny shinyBS shinyWidgets truncnorm]; }; - qPLEXanalyzer = derive2 { name="qPLEXanalyzer"; version="1.14.0"; sha256="18ma0calaywm4jdlr2v1vzhr4xiswqih9r72ggj9h0vvwwc7gfjw"; depends=[assertthat Biobase BiocGenerics Biostrings dplyr ggdendro ggplot2 IRanges limma magrittr MSnbase preprocessCore purrr RColorBrewer readr rlang scales stringr tibble tidyr tidyselect]; }; - qckitfastq = derive2 { name="qckitfastq"; version="1.12.0"; sha256="1xj882jm4fi7cy8lixzyliaxa617k7wx70bjkzwhd5k9hww28ld1"; depends=[data_table dplyr ggplot2 magrittr Rcpp reshape2 rlang RSeqAn seqTools zlibbioc]; }; - qcmetrics = derive2 { name="qcmetrics"; version="1.34.0"; sha256="1xr2j7d7k8fi4bfvgzmi100zhln7a7jq0jw0vn0b1jjs5zwlcikc"; depends=[Biobase knitr pander S4Vectors xtable]; }; - qmtools = derive2 { name="qmtools"; version="1.0.0"; sha256="17absfbzih3jam158byykpywlphvzjp3f59dzkjzx7x0wfps4mlz"; depends=[ggplot2 heatmaply igraph MsCoreUtils patchwork rlang scales SummarizedExperiment VIM]; }; - qpcrNorm = derive2 { name="qpcrNorm"; version="1.54.0"; sha256="06k1ymzylfsrfbs9cz6m8snrl841fbrrklymfxyrqd20kgfw13xi"; depends=[affy Biobase limma]; }; - qpgraph = derive2 { name="qpgraph"; version="2.30.2"; sha256="095d3qbi7852islcr30h5s5pny0ci8k60isbczajnfrf79zgad15"; depends=[annotate AnnotationDbi Biobase BiocParallel GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges Matrix mvtnorm qtl Rgraphviz S4Vectors]; }; - qrqc = derive2 { name="qrqc"; version="1.50.0"; sha256="0dv6x2g5xkncvzrh37mxlf6hin46qdbj0hrnm83fapw2jb5bfy05"; depends=[Biostrings biovizBase brew ggplot2 plyr reshape Rhtslib testthat xtable]; }; - qsea = derive2 { name="qsea"; version="1.22.0"; sha256="0ir752k7is9ns6jxvdsxpjw6byxywl8kakvvfpya763rck014rw0"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges gtools HMMcopy IRanges limma Rsamtools rtracklayer zoo]; }; - qsmooth = derive2 { name="qsmooth"; version="1.12.0"; sha256="0fvmb4dd6hfh0m0zssisd3fgd2j93js45gqklpvldpcm76g0dnw7"; depends=[Hmisc SummarizedExperiment sva]; }; - qsvaR = derive2 { name="qsvaR"; version="1.0.0"; sha256="1gm2n5085jvz615lcd5qdpqlpk1wmrr395hgaixqgzxagwr5v6ll"; depends=[ggplot2 SummarizedExperiment sva]; }; - quantiseqr = derive2 { name="quantiseqr"; version="1.4.1"; sha256="0yvrgqnf3n5fb49sqcmi34hcvzbnkhndd5i9jq5haw23ns9czmva"; depends=[Biobase ggplot2 limSolve MASS preprocessCore rlang SummarizedExperiment tidyr]; }; - quantro = derive2 { name="quantro"; version="1.30.0"; sha256="1zfrz7lxyrbf0c8d277npzj1h4six9whkqplvcjmn3li0xj5qng3"; depends=[Biobase doParallel foreach ggplot2 iterators minfi RColorBrewer]; }; - quantsmooth = derive2 { name="quantsmooth"; version="1.62.0"; sha256="027am11ilisdn82k0f62dj0csninfxph1bsv5ff71hsjd9wghars"; depends=[quantreg]; }; - qusage = derive2 { name="qusage"; version="2.30.0"; sha256="0ljch8y7985c0q9mfkl0sxdacwyqflszi34qm8gc9lrjf67p0q21"; depends=[Biobase emmeans fftw limma nlme]; }; - qvalue = derive2 { name="qvalue"; version="2.28.0"; sha256="0cvhm5cldcnnxwa293dig1pj9lvj2hnz9zh4gfr25sw0xlcjzmyw"; depends=[ggplot2 reshape2]; }; - r3Cseq = derive2 { name="r3Cseq"; version="1.42.0"; sha256="1dzckmciyx985zc23im5dp8jrirscdrcwyacsck8w68i37aasrl1"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges IRanges qvalue RColorBrewer Rsamtools rtracklayer sqldf VGAM]; }; - rBiopaxParser = derive2 { name="rBiopaxParser"; version="2.36.0"; sha256="05yh4zcqjwra301xala6b3wjx3i8dliifg1kydpy36gxm2qiy5l2"; depends=[data_table XML]; }; - rCGH = derive2 { name="rCGH"; version="1.26.0"; sha256="1a0dwqcs4mpwqqqxw07vphmvbqwh6989ifd7jkls0jcpn2zxsk9g"; depends=[aCGH affy AnnotationDbi DNAcopy GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges lattice limma mclust org_Hs_eg_db plyr shiny TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; }; - rDGIdb = derive2 { name="rDGIdb"; version="1.22.0"; sha256="11zqkxvbha38riah0j25crg9lwmwp9017a37ap95bh65cvxr9870"; depends=[httr jsonlite]; }; - rGADEM = derive2 { name="rGADEM"; version="2.44.1"; sha256="052z9iavnmkaz9jzz7ycpb8z7qqq3s5k6a04icrwl00wff7zqa2q"; depends=[Biostrings BSgenome GenomicRanges IRanges seqLogo]; }; - rGREAT = derive2 { name="rGREAT"; version="1.28.0"; sha256="0px72r8mjimf5mxfwb9qz46kqpgjw5gaqq41hy0212ymjd8whaky"; depends=[GenomicRanges GetoptLong IRanges RCurl rjson]; }; - rGenomeTracks = derive2 { name="rGenomeTracks"; version="1.2.0"; sha256="06fgw2sfnpbnaaa1clj4ahvx19pqkylyka62mdhh34sq9majxisq"; depends=[imager reticulate rGenomeTracksData]; }; - rRDP = derive2 { name="rRDP"; version="1.30.0"; sha256="091picbs0cmvn1a0pmgpxg5j2gxcdj24d1vm1gz6dch8x9sl2ly2"; depends=[Biostrings]; }; - rSWeeP = derive2 { name="rSWeeP"; version="1.8.0"; sha256="063assf7vhf62ygd58bwhixbglhjvjd9qg9vxgzid3yhjdpn2rry"; depends=[pracma]; }; - rScudo = derive2 { name="rScudo"; version="1.12.0"; sha256="08yn4biv5cadby0pvg1zhy14yc9y90z203hm7wv329x217ccm90m"; depends=[Biobase BiocGenerics igraph S4Vectors stringr SummarizedExperiment]; }; - rTRM = derive2 { name="rTRM"; version="1.34.0"; sha256="17kgipd3nr9l20x5nak24zjfpfslcm8cbj7bhmq8ch9w2ysimpw9"; depends=[AnnotationDbi DBI igraph RSQLite]; }; - rTRMui = derive2 { name="rTRMui"; version="1.34.0"; sha256="1gzw30kcnrnmjx5pn7xr1kgkgwyyjl138nsiqly5xh7h9b1is0sm"; depends=[MotifDb org_Hs_eg_db org_Mm_eg_db rTRM shiny]; }; - rWikiPathways = derive2 { name="rWikiPathways"; version="1.16.0"; sha256="05nxgjc119yhkckykjzribawjxlg95qy9pb7yq1m7rv2j44izmfk"; depends=[data_table httr RCurl rjson tidyr XML]; }; - rain = derive2 { name="rain"; version="1.30.0"; sha256="1fn62w0d86lc1iilmi11cwqg2sk7fkhg9asdxnglsyiq8hz512ci"; depends=[gmp multtest]; }; - rama = derive2 { name="rama"; version="1.70.0"; sha256="1l10yq28d3qswcbza9f9jk1vx2cqzqn7r1ixwkvhj87yiqz99rhc"; depends=[]; }; - ramr = derive2 { name="ramr"; version="1.4.0"; sha256="06davx5rkcgms5423aksrcg07y4gg9xsaabhzy6adf7058xbl6dn"; depends=[BiocGenerics doParallel doRNG EnvStats ExtDist foreach GenomicRanges ggplot2 IRanges matrixStats reshape2 S4Vectors]; }; - ramwas = derive2 { name="ramwas"; version="1.20.0"; sha256="1an7ppyhnxcg2px9ydc9x623wi8vwbhxdxvvsvlna383j402r1xn"; depends=[BiocGenerics biomaRt Biostrings digest filematrix GenomicAlignments glmnet KernSmooth Rsamtools]; }; - randPack = derive2 { name="randPack"; version="1.42.0"; sha256="1mn1hwdmcvsijf5dvxvgj0pyg12m1ca4b6n0myjk5pva6xykwvhg"; depends=[Biobase]; }; - randRotation = derive2 { name="randRotation"; version="1.8.0"; sha256="0s92pvy6vw3jd2brvgnjdh3wacy3m0702qrn6wv5scsrn2b1kwxn"; depends=[Rdpack]; }; - rawrr = derive2 { name="rawrr"; version="1.4.0"; sha256="0828fmxn0bz0s01fjpripc1jg5jsdnq5l8m4c9bfwx5xnvcgsml4"; depends=[]; }; - rbsurv = derive2 { name="rbsurv"; version="2.54.0"; sha256="0dvf7nvafap2k5f3ap38zp0m4c12ih1jzg05c2n3l0wivimyp10s"; depends=[Biobase survival]; }; - rcellminer = derive2 { name="rcellminer"; version="2.18.0"; sha256="0spjill74i15j6l0ckg9yvans07fsxvim5gpq7rfxv2zblfvhaqb"; depends=[Biobase ggplot2 gplots rcellminerData shiny stringr]; }; - rebook = derive2 { name="rebook"; version="1.6.0"; sha256="02bg0gmxlcg3wj628wda41q58qjb3swqnf67nyyczjv17f4cpd8j"; depends=[BiocStyle CodeDepends dir_expiry filelock knitr rmarkdown]; }; - receptLoss = derive2 { name="receptLoss"; version="1.8.0"; sha256="0lymq3im87k8qv1f1aga08y45zssnb4f3z3hjzmk1ndzfkqb7ds2"; depends=[dplyr ggplot2 magrittr SummarizedExperiment tidyr]; }; - reconsi = derive2 { name="reconsi"; version="1.8.0"; sha256="0vpx9a9bwwnsgaxazmdggqvw1ap34xj30rshkq0imwfw8s1hagsq"; depends=[ggplot2 ks Matrix matrixStats phyloseq reshape2]; }; - recount = derive2 { name="recount"; version="1.22.0"; sha256="1mipj8nrihn7gmxn81l9bxv0rbr9zly7s3vfrbzimvg56iq8wrly"; depends=[BiocParallel derfinder downloader GenomeInfoDb GenomicRanges GEOquery IRanges RCurl rentrez rtracklayer S4Vectors SummarizedExperiment]; }; - recount3 = derive2 { name="recount3"; version="1.6.0"; sha256="0322vplaz77dmvkb7f2ybfgm5bidfq97zrprhvyn28zw2qllr8vg"; depends=[BiocFileCache data_table GenomicRanges Matrix R_utils RCurl rtracklayer S4Vectors sessioninfo SummarizedExperiment]; }; - recountmethylation = derive2 { name="recountmethylation"; version="1.6.1"; sha256="1k582mnq0vdjsz1jyb7h45p6klz9lc35law4x6ydjiv6z0wld55i"; depends=[BiocFileCache HDF5Array IlluminaHumanMethylation450kmanifest minfi R_utils RCurl rhdf5 S4Vectors]; }; - recoup = derive2 { name="recoup"; version="1.24.0"; sha256="1qrlhfrg991x0w5p4jlyra6wdvnqljiicckw0iqzybwp5xha8wkp"; depends=[BiocGenerics biomaRt Biostrings circlize ComplexHeatmap GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 httr IRanges Rsamtools RSQLite rtracklayer S4Vectors stringr]; }; - regionReport = derive2 { name="regionReport"; version="1.30.0"; sha256="1qqii65xvmj7fgsx45n6szpr0l3z6q2c9s76mx4977wq5rhx8w09"; depends=[BiocStyle DEFormats derfinder DESeq2 GenomeInfoDb GenomicRanges knitr knitrBootstrap RefManageR rmarkdown S4Vectors SummarizedExperiment]; }; - regioneR = derive2 { name="regioneR"; version="1.28.0"; sha256="11whi2v211xiz9s7cjl14d8vavlry2fmhvx12rma25wkjmhrpa3f"; depends=[Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges memoise rtracklayer S4Vectors]; }; - regsplice = derive2 { name="regsplice"; version="1.22.0"; sha256="0lfgihf3v2ipw13nshwk6nzqv8qajry45zi30qhibpjdi6d3fsjd"; depends=[edgeR glmnet limma pbapply S4Vectors SummarizedExperiment]; }; - regutools = derive2 { name="regutools"; version="1.8.0"; sha256="1r8qxl5md44vvywfvfpkqg5jqb8zkw7hwdh2qpii20jxfd8nf77c"; depends=[AnnotationDbi AnnotationHub BiocFileCache Biostrings DBI GenomicRanges Gviz IRanges RCy3 RSQLite S4Vectors]; }; - restfulSE = derive2 { name="restfulSE"; version="1.18.0"; sha256="09alrj7q373w01vylnymna8hjsgs5gg9ngadglasncnk3yswjg3d"; depends=[AnnotationDbi AnnotationHub bigrquery Biobase DBI DelayedArray dplyr ExperimentHub GO_db magrittr reshape2 rhdf5client rlang S4Vectors SummarizedExperiment]; }; - rexposome = derive2 { name="rexposome"; version="1.18.2"; sha256="07vmprnv5rg42ddq3bwh3d9m488rnfsn82wpkd3l5lx4mlzp81g5"; depends=[Biobase circlize corrplot FactoMineR ggplot2 ggrepel glmnet gplots gridExtra gtools Hmisc imputeLCMD lme4 lsr mice pryr reshape2 S4Vectors scales scatterplot3d stringr]; }; - rfPred = derive2 { name="rfPred"; version="1.34.2"; sha256="1ccicwvsfb0b4cmiykswmrhjzpycbfwvfpwz3n23yq594i7658v7"; depends=[data_table GenomeInfoDb GenomicRanges IRanges Rsamtools]; }; - rfaRm = derive2 { name="rfaRm"; version="1.8.0"; sha256="1brzplaw5nrwmayfjdqbwyd6xqq2h8421njpi63w6njjc41j9mhh"; depends=[Biostrings data_table httr IRanges magick rsvg rvest S4Vectors stringi xml2]; }; - rgoslin = derive2 { name="rgoslin"; version="1.0.99"; sha256="01gkgpqz5xb785par8xrx8mf8icbazxcskn9x2ailk5laaxd73sp"; depends=[dplyr Rcpp]; }; - rgsepd = derive2 { name="rgsepd"; version="1.28.0"; sha256="08b11x5qhkq5q17mbr4a2q5r6hz8rrd2xgssclm0flwp2czvnldx"; depends=[AnnotationDbi biomaRt DESeq2 GO_db goseq gplots org_Hs_eg_db SummarizedExperiment]; }; - rhdf5 = derive2 { name="rhdf5"; version="2.40.0"; sha256="00cp90mnb8p83jiflm6x4x0qf4p7gvgh47jk9jry6j3qyvfqaiff"; depends=[rhdf5filters Rhdf5lib]; }; - rhdf5client = derive2 { name="rhdf5client"; version="1.18.0"; sha256="1mxbpnyqhzvxqc34fyd31pai242ivzs0l28z2zssj8ja463fif9f"; depends=[DelayedArray httr R6 rjson S4Vectors]; }; - rhdf5filters = derive2 { name="rhdf5filters"; version="1.8.0"; sha256="1ipg0v8nqz1imj63scqmpiswcxbl4ankg3knfq4p06ic6ypbbmvs"; depends=[Rhdf5lib]; }; - riboSeqR = derive2 { name="riboSeqR"; version="1.30.0"; sha256="1zs3y0icsqrndjp9wwqz3jxysvyc9pch45y49j6g9b5b2l44ma26"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools seqLogo]; }; - ribor = derive2 { name="ribor"; version="1.8.0"; sha256="1jwzxcn2civ5g2wcdzi8a10lc0y96b7xpgdb2z3yq4s9sipmbw0j"; depends=[dplyr ggplot2 hash rhdf5 rlang S4Vectors tidyr yaml]; }; - ribosomeProfilingQC = derive2 { name="ribosomeProfilingQC"; version="1.8.0"; sha256="1f57r81g1gvfs84si4mz8r7058ga525hwdf71991z58hiyxbr7xd"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome cluster EDASeq GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggfittext ggplot2 ggrepel IRanges motifStack Rsamtools Rsubread rtracklayer RUVSeq S4Vectors scales XVector]; }; - rifi = derive2 { name="rifi"; version="1.0.0"; sha256="15rqmlx3cnl9n8y821v42ganfyazqg85jd757mwrkmvi4xwnbmpw"; depends=[car cowplot doMC dplyr egg foreach ggplot2 nls2 nnet rlang rtracklayer S4Vectors scales stringr SummarizedExperiment tibble]; }; - rmelting = derive2 { name="rmelting"; version="1.12.0"; sha256="1ag2cr4mlb824la0yywjrjkjsnxxmjp5svg2jv4017syl1l5dj2x"; depends=[Rdpack rJava]; }; - rmspc = derive2 { name="rmspc"; version="1.2.0"; sha256="1hj93l3l4maigqd9b4vhsa24x3fjqgqw0d81gm6rjv09pyn4zclh"; depends=[BiocManager GenomicRanges processx rtracklayer stringr]; }; - rnaEditr = derive2 { name="rnaEditr"; version="1.6.0"; sha256="1js6a0y5hmkilsq1vgnkjk798z6dnz0acphgfq40p7i6182w1bx8"; depends=[BiocGenerics bumphunter corrplot GenomeInfoDb GenomicRanges IRanges logistf plyr S4Vectors survival]; }; - rnaseqcomp = derive2 { name="rnaseqcomp"; version="1.26.0"; sha256="1gpdlv980nid6nsjg1prahdxwp1a8ij00xgzf08ir4ywpvy61ilz"; depends=[RColorBrewer]; }; - roar = derive2 { name="roar"; version="1.32.0"; sha256="0zq1praf5h9294cvmrb06l3chx8v40xw2sfvhlnh1516x9sjkwfc"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicRanges IRanges rtracklayer S4Vectors SummarizedExperiment]; }; - rols = derive2 { name="rols"; version="2.24.4"; sha256="1hgd4zl8r3xxl5jc8yqyxdqsqpvn9dkmkf79ndqzldq8hmgrpdn9"; depends=[Biobase BiocGenerics httr jsonlite progress]; }; - ropls = derive2 { name="ropls"; version="1.28.2"; sha256="07gpx15r8c3wljiwxnff2zp7wxbhzz9r7njk8zg8hpy2q5qm3i6c"; depends=[Biobase MultiAssayExperiment MultiDataSet SummarizedExperiment]; }; - rprimer = derive2 { name="rprimer"; version="1.0.0"; sha256="040fy6zjvjjgz9syczvy8dpv02jnl3pv8vb75n40622z0c2hl1nx"; depends=[Biostrings bslib DT ggplot2 IRanges mathjaxr patchwork reshape2 S4Vectors shiny shinycssloaders shinyFeedback]; }; - rpx = derive2 { name="rpx"; version="2.4.1"; sha256="169yyyjvr46kis18yxlsznbdb5mdxnlxi6l9nrq5z49wnwx69vav"; depends=[BiocFileCache curl jsonlite RCurl xml2]; }; - rqt = derive2 { name="rqt"; version="1.22.0"; sha256="0039sk0dx4d7fqc9yl0grwlv5k18sv08piqyc3fyp66302p38wrj"; depends=[car CompQuadForm glmnet Matrix metap pls ropls RUnit SummarizedExperiment]; }; - rqubic = derive2 { name="rqubic"; version="1.42.0"; sha256="108mw7xx04lgkj38k017mw7na1jglsbw0rx1ixb1d7hcgaqjcs63"; depends=[biclust Biobase BiocGenerics]; }; - rrvgo = derive2 { name="rrvgo"; version="1.8.0"; sha256="1r90q18nhmzh45djbi1i5x3bcyzbybkp9d5j8i8yqxphs29sr5vx"; depends=[AnnotationDbi ggplot2 ggrepel GO_db GOSemSim pheatmap shiny tm treemap wordcloud]; }; - rsbml = derive2 { name="rsbml"; version="2.54.0"; sha256="1v11pspkml6xdsacgwxw8r4qdhbnn2h2sqgpm9aidaq9p2085b0v"; depends=[BiocGenerics graph]; }; - rsemmed = derive2 { name="rsemmed"; version="1.6.0"; sha256="0dw607kxcwv5dig5y3gja5916bpjki3bkphc7jxs79y9sl22zg4p"; depends=[dplyr igraph magrittr stringr]; }; - rtracklayer = derive2 { name="rtracklayer"; version="1.56.1"; sha256="10qy9s6253mgj871qfqn03i8yw10mz7id4cxfyf67qxczz2xmjls"; depends=[BiocGenerics BiocIO Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl restfulr Rsamtools S4Vectors XML XVector zlibbioc]; }; - runibic = derive2 { name="runibic"; version="1.18.0"; sha256="04a12w2hnybw5h27b7szd4v4r4p3z359xkrpqpqp9hmvbrx6apa6"; depends=[biclust Rcpp SummarizedExperiment testthat]; }; - sRACIPE = derive2 { name="sRACIPE"; version="1.12.0"; sha256="0q749j2pqhnmlx8d6vak3ig4ggqqwv74sfapfysbfg4n1v6cpkhp"; depends=[BiocGenerics ggplot2 gplots gridExtra htmlwidgets MASS RColorBrewer Rcpp reshape2 S4Vectors SummarizedExperiment umap visNetwork]; }; - sSNAPPY = derive2 { name="sSNAPPY"; version="1.0.2"; sha256="0in95n2nwqg63i0a8zi8hh0gp3m78qxrf4qp94xnxihiry8h1dam"; depends=[BiocParallel dplyr edgeR ggplot2 ggraph graphite igraph magrittr org_Hs_eg_db plyr purrr Rcpp RcppArmadillo reshape2 rlang SummarizedExperiment tibble]; }; - sSeq = derive2 { name="sSeq"; version="1.34.0"; sha256="0cc1kz4fqf87xiq00vli8fcp4lix723vsa9ax4g55l5lqxp3k8pv"; depends=[caTools RColorBrewer]; }; - safe = derive2 { name="safe"; version="3.36.0"; sha256="19hxp2zg48dmw1j5jsp2i9n6ccw4613i5bhi5wg6kld4wy8k496v"; depends=[AnnotationDbi Biobase SparseM]; }; - sagenhaft = derive2 { name="sagenhaft"; version="1.66.0"; sha256="0czbjc83df4xgavkqf4qvypcy0wzlzpdysjmyd189jqinagifzjy"; depends=[SparseM]; }; - sampleClassifier = derive2 { name="sampleClassifier"; version="1.20.0"; sha256="1gx76wcln8nxfm4h9klndi7rpzqpcci4h0fxqqhpsd0x19yw6rz2"; depends=[annotate e1071 ggplot2 MGFM MGFR]; }; - sangeranalyseR = derive2 { name="sangeranalyseR"; version="1.6.1"; sha256="0qp36w1mfwj0kzx055sc3gfyi0b86zahlsjvdiiclpwxh7wizkc4"; depends=[ape BiocStyle Biostrings data_table DECIPHER DT excelR ggdendro gridExtra knitr logger openxlsx phangorn plotly reshape2 rmarkdown sangerseqR seqinr shiny shinycssloaders shinydashboard shinyjs shinyWidgets stringr zeallot]; }; - sangerseqR = derive2 { name="sangerseqR"; version="1.32.0"; sha256="12rh6y38j66l21dlb1199imp4jwkpv19l306lj7qi7prcfwzhmmy"; depends=[Biostrings shiny]; }; - sarks = derive2 { name="sarks"; version="1.8.0"; sha256="1da5vxbf7r2yla1l1m5gcbqbka33c2ry7gwnmjixr6xlv9vs4209"; depends=[binom Biostrings cluster IRanges rJava]; }; - satuRn = derive2 { name="satuRn"; version="1.4.2"; sha256="1iyym6hakzwd6vcgmkgvgk593ikbjzcwh16r2j9zb2z4bf7y9wwz"; depends=[BiocParallel boot ggplot2 limma locfdr Matrix pbapply SummarizedExperiment]; }; - savR = derive2 { name="savR"; version="1.34.0"; sha256="04zlf3lyr6vnpj80m6fd2is2f7302sxwih8nzzjnc4ss972jid2k"; depends=[ggplot2 gridExtra reshape2 scales XML]; }; - scAlign = derive2 { name="scAlign"; version="1.9.0"; sha256="0g209c1m06wn66n4zm0gyy1pg41y39d9a14dlpahni7f5zs0zmvd"; depends=[FNN ggplot2 irlba purrr Rtsne Seurat SingleCellExperiment tensorflow]; }; - scAnnotatR = derive2 { name="scAnnotatR"; version="1.2.0"; sha256="067q57kabhqd1z8l3d91fw74aaw89nb48gm6fll4hv00nqza3n5b"; depends=[AnnotationHub ape caret data_tree dplyr e1071 ggplot2 kernlab pROC ROCR Seurat SingleCellExperiment SummarizedExperiment]; }; - scBFA = derive2 { name="scBFA"; version="1.10.0"; sha256="1w9jy37626ap1lfg7lg672nmbwq8w277mdk7b8xwif4hrjdzkl2f"; depends=[copula DESeq2 ggplot2 MASS Matrix Seurat SingleCellExperiment SummarizedExperiment zinbwave]; }; - scCB2 = derive2 { name="scCB2"; version="1.6.0"; sha256="0mlkm43piaw2krbh7sh7q26lzj0zvwnwhiw37i59va0kp1zg43h5"; depends=[doParallel DropletUtils edgeR foreach iterators Matrix rhdf5 Seurat SingleCellExperiment SummarizedExperiment]; }; - scClassify = derive2 { name="scClassify"; version="1.8.0"; sha256="0c4nrgwr7mzb888g27ak0gfz6hvm02n6y0y37z3c7xch71l0lqx0"; depends=[BiocParallel Cepo cluster diptest ggplot2 ggraph hopach igraph limma Matrix mgcv minpack_lm mixtools proxy proxyC S4Vectors statmod]; }; - scDD = derive2 { name="scDD"; version="1.20.0"; sha256="0bjww338z5qf2g97kbh85h9kpagjr59ff9f4alm33h16xz5mb7k0"; depends=[arm BiocParallel EBSeq fields ggplot2 mclust outliers S4Vectors scran SingleCellExperiment SummarizedExperiment]; }; - scDataviz = derive2 { name="scDataviz"; version="1.6.0"; sha256="0h7jb0pwff7vq5yarab1c242g1gx21y6h6a8pj7v9yi0i62j3p6n"; depends=[corrplot flowCore ggplot2 ggrepel MASS matrixStats RColorBrewer reshape2 S4Vectors scales Seurat SingleCellExperiment umap]; }; - scDblFinder = derive2 { name="scDblFinder"; version="1.10.0"; sha256="0y14dvdm16b3bvlrnz03adfylm1kj6jrp2fwciyldij2lfal90y0"; depends=[BiocGenerics BiocNeighbors BiocParallel BiocSingular bluster DelayedArray GenomeInfoDb GenomicRanges igraph IRanges MASS Matrix Rsamtools rtracklayer S4Vectors scater scran scuttle SingleCellExperiment SummarizedExperiment xgboost]; }; - scFeatureFilter = derive2 { name="scFeatureFilter"; version="1.16.0"; sha256="0nnw9di62r68ih25l11755aikgh2p577dnla1yb0q9gdxcvbyxai"; depends=[dplyr ggplot2 magrittr rlang tibble]; }; - scGPS = derive2 { name="scGPS"; version="1.10.0"; sha256="0z5my7x2yigl024nl0vx1261amf66q7vdgpam2wxqrsvw4f7ylvz"; depends=[caret DESeq2 dplyr dynamicTreeCut fastcluster ggplot2 glmnet locfit Rcpp RcppArmadillo RcppParallel SingleCellExperiment SummarizedExperiment]; }; - scHOT = derive2 { name="scHOT"; version="1.8.0"; sha256="05qkq5bg351rpx01q1c1hs7y1zygp6m6r7javia67j8r5w7iir3p"; depends=[BiocParallel ggforce ggplot2 igraph IRanges Matrix reshape S4Vectors SingleCellExperiment SummarizedExperiment]; }; - scMAGeCK = derive2 { name="scMAGeCK"; version="1.8.0"; sha256="0qmqn2w16wzgyrbfgh16xaw2kccm6nhdib9nva6w6mg29xa5ifkb"; depends=[ggplot2 Seurat]; }; - scMerge = derive2 { name="scMerge"; version="1.12.0"; sha256="0p55zp02zkdn7g6hdv7ilv7h4ii4988gkd6kf2naq83xs201m2k3"; depends=[BiocParallel BiocSingular cluster DelayedArray DelayedMatrixStats distr igraph M3Drop pdist proxy ruv S4Vectors SingleCellExperiment SummarizedExperiment]; }; - scPCA = derive2 { name="scPCA"; version="1.10.0"; sha256="1ia5z1qf2jvilamkw3vgxshw14bzl4xk19s1bm9f4p08ghvx6px0"; depends=[assertthat BiocParallel cluster coop DelayedArray dplyr elasticnet kernlab Matrix MatrixGenerics matrixStats origami purrr Rdpack RSpectra ScaledMatrix sparsepca stringr tibble]; }; - scPipe = derive2 { name="scPipe"; version="1.18.0"; sha256="13wam3qbp9c8qgsp7hm7jq7q0a1ala6mw2xnp3nfbyz39aiwbix9"; depends=[AnnotationDbi BiocGenerics biomaRt dplyr GenomicRanges GGally ggplot2 glue hash magrittr MASS mclust org_Hs_eg_db org_Mm_eg_db Rcpp reshape Rhtslib rlang robustbase rtracklayer S4Vectors scales scater SingleCellExperiment stringr SummarizedExperiment testthat zlibbioc]; }; - scReClassify = derive2 { name="scReClassify"; version="1.2.0"; sha256="1afwxnvn17a5awcggifas7zaiw2r556l9iq1yl4kq06s73c1dfws"; depends=[e1071 randomForest SingleCellExperiment SummarizedExperiment]; }; - scRecover = derive2 { name="scRecover"; version="1.12.0"; sha256="0p3j54ii9assvhpyy8x8zwibv56h7mf4clvahgp0shp0qg4x7zjv"; depends=[bbmle BiocParallel doParallel foreach gamlss kernlab MASS Matrix penalized preseqR pscl rsvd SAVER]; }; - scRepertoire = derive2 { name="scRepertoire"; version="1.6.0"; sha256="0an485i5myfiv2zzwd3ql7ckawid894md3k2603mz2yz6qfsl8yj"; depends=[doParallel dplyr ggalluvial ggplot2 igraph plyr powerTCR reshape2 rlang SeuratObject stringdist stringr SummarizedExperiment vegan]; }; - scShapes = derive2 { name="scShapes"; version="1.2.0"; sha256="1ammb3a7ddys5zl2maggx3xqvdycy9dn9fl4kffrnqv4abfkvs9c"; depends=[BiocParallel dgof emdbook magrittr MASS Matrix pscl VGAM]; }; - scTGIF = derive2 { name="scTGIF"; version="1.10.0"; sha256="0vmr6fginvs1zdzzqmvw8yz25s3w58fwb9ifk8rca922af4m72jx"; depends=[Biobase BiocStyle ggplot2 GSEABase igraph knitr msigdbr nnTensor plotly RColorBrewer Rcpp rmarkdown S4Vectors scales schex SingleCellExperiment SummarizedExperiment tagcloud tibble]; }; - scTHI = derive2 { name="scTHI"; version="1.8.0"; sha256="1izl8fk4p1ihxb42d4vi5pnxwi2v2j1630sbw70yajxav6i7riav"; depends=[BiocParallel Rtsne]; }; - scTensor = derive2 { name="scTensor"; version="2.6.0"; sha256="0g3qjxq48aq1kx3b7ma1faxyqvz1qxphvin5byhbird9hn36fljw"; depends=[abind AnnotationDbi AnnotationHub BiocManager BiocStyle Category ccTensor checkmate crayon DOSE ggplot2 GOstats heatmaply igraph knitr MeSHDbi meshr nnTensor outliers plotly plotrix reactome_db ReactomePA rmarkdown RSQLite rTensor S4Vectors schex SingleCellExperiment SummarizedExperiment tagcloud visNetwork]; }; - scTreeViz = derive2 { name="scTreeViz"; version="1.2.0"; sha256="005pin0wvq4vws436jqjnpxrgqy0c5pbfg1g3j6mwfpn970frawp"; depends=[clustree data_table digest epivizr epivizrData epivizrServer ggplot2 ggraph httr igraph Matrix Rtsne S4Vectors scater scran Seurat SingleCellExperiment SummarizedExperiment sys]; }; - scanMiR = derive2 { name="scanMiR"; version="1.2.0"; sha256="177v72kgzkh2mvbj1sz2c833w51dgknx23h04awi5kh1gxfbhshk"; depends=[BiocParallel Biostrings cowplot data_table GenomeInfoDb GenomicRanges ggplot2 ggseqlogo IRanges S4Vectors stringi]; }; - scanMiRApp = derive2 { name="scanMiRApp"; version="1.2.0"; sha256="1m24vq9cq8n912hx6l0q2miwz8ln235j74514lf97jc9srm60scm"; depends=[AnnotationDbi AnnotationFilter AnnotationHub BiocParallel Biostrings data_table digest DT ensembldb fst GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 htmlwidgets IRanges Matrix plotly rintrojs rtracklayer S4Vectors scanMiR scanMiRData shiny shinycssloaders shinydashboard shinyjqui waiter]; }; - scater = derive2 { name="scater"; version="1.24.0"; sha256="0dqirggw7my5nq4ln9q0ya18ciqplkz9gx318ffias9ag3yii5rw"; depends=[beachmat BiocGenerics BiocNeighbors BiocParallel BiocSingular DelayedArray DelayedMatrixStats ggbeeswarm ggplot2 ggrepel gridExtra Matrix RColorBrewer RcppML rlang Rtsne S4Vectors scuttle SingleCellExperiment SummarizedExperiment viridis]; }; - scatterHatch = derive2 { name="scatterHatch"; version="1.2.0"; sha256="0a35xbd9ziph7h0dc6qc8816frkjqiawxwdyiac80s0r7r8x8mpx"; depends=[ggplot2 plyr spatstat_geom]; }; - sccomp = derive2 { name="sccomp"; version="1.0.0"; sha256="0acch9aa6w5lqkcvjcpzmaii65r1zb0hssndmjbbwn3zhm8ryirc"; depends=[BH boot dplyr forcats ggplot2 ggrepel lifecycle magrittr patchwork purrr Rcpp RcppEigen RcppParallel readr rlang rstan rstantools scales SeuratObject SingleCellExperiment StanHeaders stringr tibble tidyr tidyselect]; }; - scde = derive2 { name="scde"; version="2.24.0"; sha256="074rhfxv80hg4sfl4ksyqz6wz108zwp5bfi602p81i0zfprvkg3g"; depends=[BiocParallel Cairo edgeR extRemes flexmix MASS mgcv nnet pcaMethods quantreg RColorBrewer Rcpp RcppArmadillo rjson RMTstat Rook]; }; - scds = derive2 { name="scds"; version="1.12.0"; sha256="0zmqhsfdx60g1caxbf4vh356wf06v7fgfv7lng5y13vqlf5d875h"; depends=[dplyr Matrix pROC S4Vectors SingleCellExperiment SummarizedExperiment xgboost]; }; - schex = derive2 { name="schex"; version="1.10.0"; sha256="0kv0sagxkdqj5jd58hj7w7v0swrvnd162wqg31zb32iwxb8y012w"; depends=[cluster concaveman dplyr entropy ggforce ggplot2 hexbin scales Seurat shiny SingleCellExperiment]; }; - scmap = derive2 { name="scmap"; version="1.18.0"; sha256="0pfwaa9pgml11b84rpf7afdkmg8kxb4srgpc56571vaz388xrv7l"; depends=[Biobase BiocGenerics dplyr e1071 ggplot2 googleVis matrixStats proxy randomForest Rcpp RcppArmadillo reshape2 S4Vectors SingleCellExperiment SummarizedExperiment]; }; - scmeth = derive2 { name="scmeth"; version="1.16.0"; sha256="15v1f641zdk70l5ss08kgvvq5h7b213f6zc5bg8jakqx2cj99xx9"; depends=[AnnotationHub annotatr Biostrings BSgenome bsseq DelayedArray DT GenomeInfoDb GenomicRanges HDF5Array knitr reshape2 rmarkdown SummarizedExperiment]; }; - scone = derive2 { name="scone"; version="1.20.0"; sha256="05id34n6min03ha1chg5mrvx399qm2mby9kxkaz5w8fbidp97851"; depends=[aroma_light BiocParallel boot class cluster compositions diptest edgeR fpc gplots hexbin limma MatrixGenerics matrixStats mixtools rARPACK RColorBrewer rhdf5 RUVSeq SingleCellExperiment SummarizedExperiment]; }; - scoreInvHap = derive2 { name="scoreInvHap"; version="1.18.0"; sha256="10ipfhmp93jjw5ijqiv34vkl79i0wmc9mwwrz2j641qlbkyxziaq"; depends=[BiocParallel Biostrings GenomicRanges snpStats SummarizedExperiment VariantAnnotation]; }; - scp = derive2 { name="scp"; version="1.6.0"; sha256="09gjq6n7rp4wngfq1yplcrkjrc7yw9w6rg7d2jr6lfj1x74p8syn"; depends=[dplyr magrittr matrixStats MsCoreUtils MultiAssayExperiment QFeatures rlang S4Vectors SingleCellExperiment SummarizedExperiment]; }; - scran = derive2 { name="scran"; version="1.24.1"; sha256="1a6vlq8i5gh7zxm6igmy75187pkx42z28qjag50m49xy5valw3ni"; depends=[beachmat BH BiocGenerics BiocParallel BiocSingular bluster DelayedArray DelayedMatrixStats dqrng edgeR igraph limma Matrix metapod Rcpp S4Vectors scuttle SingleCellExperiment statmod SummarizedExperiment]; }; - scruff = derive2 { name="scruff"; version="1.14.0"; sha256="0y5p27ih1v4qz47i83zvwwk1d4qkw6i9hwkfpdma3fw87ffxdy0q"; depends=[AnnotationDbi BiocGenerics BiocParallel Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 ggthemes plyr Rsamtools Rsubread rtracklayer S4Vectors scales ShortRead SingleCellExperiment stringdist SummarizedExperiment]; }; - scry = derive2 { name="scry"; version="1.8.0"; sha256="16mj21r91jy8ircdz8rfrdli9gjy0hrx90kf6ghs305d3d4dl193"; depends=[BiocSingular DelayedArray glmpca HDF5Array Matrix SingleCellExperiment SummarizedExperiment]; }; - scuttle = derive2 { name="scuttle"; version="1.6.3"; sha256="1w1jy5fqkp2d03lp84d49fsksnl0pcg0wgqyd49d5k1mipdw4671"; depends=[beachmat BiocGenerics BiocParallel DelayedArray DelayedMatrixStats GenomicRanges Matrix Rcpp S4Vectors SingleCellExperiment SummarizedExperiment]; }; - sechm = derive2 { name="sechm"; version="1.4.1"; sha256="1rimldsflmaa0ljrhi4am91hvkx6k8xvx5b0q3yl5ndblv2i6rvc"; depends=[circlize ComplexHeatmap matrixStats randomcoloR S4Vectors seriation SummarizedExperiment]; }; - segmentSeq = derive2 { name="segmentSeq"; version="2.30.0"; sha256="16ijs06ccm36z634qyrs3pjcnv0ssdzbvd4r76n55qq0mb10fgcq"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; }; - segmenter = derive2 { name="segmenter"; version="1.2.0"; sha256="1q3dx6j3d85f94ki67lga81d7nk0swy5y8ip3fab186i3amdlwjk"; depends=[bamsignals ChIPseeker chromhmmData ComplexHeatmap GenomicRanges IRanges S4Vectors SummarizedExperiment]; }; - selectKSigs = derive2 { name="selectKSigs"; version="1.8.0"; sha256="00wbbakdd5jggd1wrv7cra1mrzs6r5jg21b760ym056wcmqggn09"; depends=[gtools HiLDA magrittr Rcpp]; }; - semisup = derive2 { name="semisup"; version="1.20.0"; sha256="0676sb39kz3aw70s87snj38kcdc3dhxq4i9wlbmafj4qxrly0l01"; depends=[VGAM]; }; - seq2pathway = derive2 { name="seq2pathway"; version="1.28.0"; sha256="0258fck970ryg3k5ilp5nhxpr3q6hgj3rgjnbxcmvmyclp3bfn8f"; depends=[biomaRt GenomicRanges GSA nnet seq2pathway_data WGCNA]; }; - seqArchR = derive2 { name="seqArchR"; version="1.0.0"; sha256="1qivaakafyr080a1r544hfkn109y6ahjpjprkr5qjcb89q5yi0pn"; depends=[BiocParallel Biostrings cli cluster cvTools fpc ggplot2 ggseqlogo MASS Matrix matrixStats prettyunits reshape2 reticulate]; }; - seqCAT = derive2 { name="seqCAT"; version="1.18.0"; sha256="0fjx1rl4jm2jil126iy594la13ai8yf4j2axyxhhs69v5wss2d8s"; depends=[dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges rlang rtracklayer S4Vectors scales SummarizedExperiment tidyr VariantAnnotation]; }; - seqCNA = derive2 { name="seqCNA"; version="1.42.0"; sha256="0jkg85ymhz0m7s910x9fp0jxq054j972ljzhvxah9b3y4q4nmxi1"; depends=[adehabitatLT doSNOW GLAD seqCNA_annot]; }; - seqLogo = derive2 { name="seqLogo"; version="1.62.0"; sha256="1lk3238m17acmd6lgjjbpscyxw8fm63wv34kbbr478wcih1wbwxr"; depends=[]; }; - seqPattern = derive2 { name="seqPattern"; version="1.28.0"; sha256="0nrrlr1nl9zxmp88qq8jn7wgmda6jh0xvp4nph94w4nwjsyb7xqn"; depends=[Biostrings GenomicRanges IRanges KernSmooth plotrix]; }; - seqTools = derive2 { name="seqTools"; version="1.30.0"; sha256="0cbikjgg6b5mpr8p8d3mfnyzz917qcvc3bsn3z2c3qq5kllp0qmd"; depends=[zlibbioc]; }; - seqbias = derive2 { name="seqbias"; version="1.44.0"; sha256="085nq6pf0bdn17wsbr5jnyy512v7rf67xff9rp5wz47mcifbv6rg"; depends=[Biostrings GenomicRanges Rhtslib]; }; - seqcombo = derive2 { name="seqcombo"; version="1.18.0"; sha256="1y8pv1zl0vv5ng9nl0rgsgig6k6n6v9jhmax7wgrplz056x1ha8p"; depends=[ggplot2 igraph yulab_utils]; }; - seqsetvis = derive2 { name="seqsetvis"; version="1.16.0"; sha256="0yzr1xcyhmziajj8c0v6gxsy5hz01i2ld0m4dvgx51f91gdv4q3p"; depends=[cowplot data_table eulerr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 ggplotify IRanges limma pbapply pbmcapply png RColorBrewer Rsamtools rtracklayer S4Vectors UpSetR]; }; - sesame = derive2 { name="sesame"; version="1.14.2"; sha256="1lpx2w21993i7jzwphf4hwl3d1da9qq6wcn8nr6rglfc23h0cj0i"; depends=[BiocFileCache BiocParallel dplyr GenomeInfoDb GenomicRanges ggplot2 illuminaio IRanges MASS preprocessCore readr reshape2 S4Vectors sesameData stringr SummarizedExperiment tibble wheatmap]; }; - sevenC = derive2 { name="sevenC"; version="1.16.0"; sha256="0gv319qrm37yrzvrv9ns0vsar18i0b94mgqbsnkw3122mzrlhfy1"; depends=[BiocGenerics boot data_table GenomeInfoDb GenomicRanges InteractionSet IRanges purrr readr rtracklayer S4Vectors]; }; - sevenbridges = derive2 { name="sevenbridges"; version="1.26.0"; sha256="170msiz4n1n16m3cddnw6jpwvh2j7y6gi6cvbzr4psqabynlvn7x"; depends=[curl data_table docopt httr jsonlite objectProperties S4Vectors stringr uuid yaml]; }; - shinyMethyl = derive2 { name="shinyMethyl"; version="1.32.0"; sha256="1636y3f9653l5dn4pyrq7kz54vjy2fmg4qrr9pav0215rfilgzyy"; depends=[BiocGenerics IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; }; - shinyepico = derive2 { name="shinyepico"; version="1.4.2"; sha256="1pq6kmsq3b965vqc0y2aqniimwpv8i11af22qypcv0mhqk1xlx1m"; depends=[data_table doParallel dplyr DT foreach GenomicRanges ggplot2 gplots heatmaply limma minfi plotly reshape2 rlang rmarkdown rtracklayer shiny shinycssloaders shinyjs shinythemes shinyWidgets statmod tidyr zip]; }; - sigFeature = derive2 { name="sigFeature"; version="1.14.0"; sha256="0770hqhq7y1q3mknsfjh0x2rwlmm85wqhi7375bpj612npaqdc7m"; depends=[BiocParallel biocViews e1071 Matrix nlme openxlsx pheatmap RColorBrewer SparseM SummarizedExperiment]; }; - sigPathway = derive2 { name="sigPathway"; version="1.64.0"; sha256="1c2kwhbxgf66az7ssm2mab9n5x59zy4kxq8vblz5r9636xqaysif"; depends=[]; }; - siggenes = derive2 { name="siggenes"; version="1.70.0"; sha256="0amjqm2c8p1vjzx109p7n81wbsbx8rljwn6mbkl7dpi834im9d7l"; depends=[Biobase multtest scrime]; }; - sights = derive2 { name="sights"; version="1.22.0"; sha256="040qm341bk62pqdl58dninh8mbh7spn8m21vp2nhnmgdqy1v4kqp"; depends=[ggplot2 lattice MASS qvalue reshape2]; }; - signatureSearch = derive2 { name="signatureSearch"; version="1.10.0"; sha256="1kjxbfvbhhxlxg4ms74pz03vmpn39315rw2p0gq2amr94dqv6yd5"; depends=[AnnotationDbi BiocGenerics BiocParallel clusterProfiler data_table DelayedArray DOSE dplyr ExperimentHub fastmatch fgsea ggplot2 GSEABase HDF5Array magrittr Matrix qvalue Rcpp reactome_db readr reshape2 rhdf5 RSQLite scales SummarizedExperiment visNetwork]; }; - signeR = derive2 { name="signeR"; version="1.22.0"; sha256="13jv0f90p462clwncp2ggky0n1xx4vaicak8712dnqzfzch04pzm"; depends=[BiocGenerics Biostrings class GenomeInfoDb GenomicRanges IRanges nloptr NMF PMCMRplus Rcpp RcppArmadillo VariantAnnotation]; }; - sigsquared = derive2 { name="sigsquared"; version="1.28.0"; sha256="13dvbl3s345yqmdxcrk19ql1asspgcc08p9sfyx1n6caamwg90a9"; depends=[Biobase survival]; }; - similaRpeak = derive2 { name="similaRpeak"; version="1.28.0"; sha256="14bkmfwwx0x8gz78bzyhfgy5rpvvafxq5z9r8knv4qj6hp1kalsh"; depends=[R6]; }; - simplifyEnrichment = derive2 { name="simplifyEnrichment"; version="1.6.1"; sha256="0qblgdxmr7zc981529cca3ykakql618q1im6gaxw8pwws5jgpyk6"; depends=[AnnotationDbi BiocGenerics circlize clue cluster colorspace ComplexHeatmap digest GetoptLong GlobalOptions GO_db GOSemSim Matrix org_Hs_eg_db proxyC slam tm]; }; - sincell = derive2 { name="sincell"; version="1.28.0"; sha256="152hlryc3xhkyp2v7fq20f0d04b2wvr09fl5p8fhiw1r0465vyab"; depends=[cluster entropy fastICA fields ggplot2 igraph MASS proxy Rcpp reshape2 Rtsne scatterplot3d statmod TSP]; }; - single = derive2 { name="single"; version="1.0.0"; sha256="1nx6cglidcmxznmvpkydj1lhgb2wyisl3yqqj0kfzbng2mxv6g0r"; depends=[BiocGenerics Biostrings dplyr GenomicAlignments IRanges reshape2 rlang Rsamtools stringr tidyr]; }; - singleCellTK = derive2 { name="singleCellTK"; version="2.6.0"; sha256="06hvxxdd8sdx8idgfqpnlxap7mq80asqgl5iq2paa1p6zvjk0w1b"; depends=[ape batchelor Biobase BiocParallel celda celldex circlize cluster colorspace colourpicker ComplexHeatmap cowplot data_table DelayedArray DelayedMatrixStats DESeq2 dplyr DropletUtils DT enrichR ExperimentHub fields fishpond generics ggplot2 ggplotify ggrepel ggtree gridExtra GSEABase GSVA GSVAdata igraph KernSmooth limma magrittr MAST Matrix matrixStats metap msigdbr multtest plotly plyr R_utils reshape2 reticulate rlang rmarkdown ROCR Rtsne S4Vectors scater scDblFinder scds scMerge scran scRNAseq scuttle Seurat shiny shinyalert shinycssloaders shinyjs SingleCellExperiment SingleR SoupX SummarizedExperiment sva TENxPBMCData tibble TrajectoryUtils TSCAN tximport VAM withr yaml zinbwave]; }; - singscore = derive2 { name="singscore"; version="1.16.0"; sha256="0jnncpv9bjpp8xlzpx6ks78pil87cg0a3i5ihsp0yrs676dmhhhr"; depends=[Biobase BiocParallel edgeR ggplot2 ggrepel GSEABase magrittr matrixStats plotly plyr RColorBrewer reshape reshape2 S4Vectors SummarizedExperiment tidyr]; }; - sitadela = derive2 { name="sitadela"; version="1.4.0"; sha256="162y2xfnv3bpgcmzrr9mhbgns3q1sfpsiif163r3p667iic80ffv"; depends=[Biobase BiocGenerics biomaRt Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools RSQLite rtracklayer S4Vectors]; }; - sitePath = derive2 { name="sitePath"; version="1.12.0"; sha256="0kxg6zpljzqbvz00k2akv3fl5kwf90lldmgjzr429gwcip5ggzdf"; depends=[ape aplot ggplot2 ggrepel ggtree gridExtra RColorBrewer Rcpp seqinr tidytree]; }; - sizepower = derive2 { name="sizepower"; version="1.66.0"; sha256="0f5y2b4zx978js5y3vm77dcc1lvn9lqyjnpi5mdqxcmp6n5sbwgl"; depends=[]; }; - skewr = derive2 { name="skewr"; version="1.28.0"; sha256="0b800yjyfdqwzaxrkair1dgd54l5bdw72ppln464fppqq3lmr9l3"; depends=[IlluminaHumanMethylation450kmanifest methylumi minfi mixsmsn RColorBrewer S4Vectors wateRmelon]; }; - slalom = derive2 { name="slalom"; version="1.18.0"; sha256="04yy7h4d9jm44alg4w0yzslk4h8qrlz1ij9d5i40hlbra79nsy69"; depends=[BH ggplot2 GSEABase Rcpp RcppArmadillo rsvd SingleCellExperiment SummarizedExperiment]; }; - slingshot = derive2 { name="slingshot"; version="2.4.0"; sha256="0xapi66l5z2qdqns3fcjqcjal6npqj7rxra60lwjvbrq49pq69p2"; depends=[igraph matrixStats princurve S4Vectors SingleCellExperiment SummarizedExperiment TrajectoryUtils]; }; - snapCGH = derive2 { name="snapCGH"; version="1.66.0"; sha256="03mz36ghpj4fvl9klhjgkqnxds6ickva2azq3hnxmb7jnak3rnlq"; depends=[aCGH cluster DNAcopy GLAD limma tilingArray]; }; - snapcount = derive2 { name="snapcount"; version="1.8.0"; sha256="0dh7havwzl1fhypf5aygi56agf6hqps714viq9rjzk4bd9shmcna"; depends=[assertthat data_table GenomicRanges httr IRanges jsonlite magrittr Matrix purrr R6 rlang stringr SummarizedExperiment]; }; - snifter = derive2 { name="snifter"; version="1.6.0"; sha256="09hp1lchzhm8iilc34lnyaxr5002zcg3ihcfv4fv07vc5i52ydmw"; depends=[assertthat basilisk irlba reticulate]; }; - snm = derive2 { name="snm"; version="1.44.0"; sha256="08vpzp7xr2w2qg1zcxqqj4wayik661cv2s5niivb7r82jxf6rm6i"; depends=[corpcor lme4]; }; - snpStats = derive2 { name="snpStats"; version="1.46.0"; sha256="0a5b5nqc7n965jk45ijwkzbn416ib4gfhp8xl39z8f2bdskip4a2"; depends=[BiocGenerics Matrix survival zlibbioc]; }; - soGGi = derive2 { name="soGGi"; version="1.28.0"; sha256="0hdqikcisva4blak5znwwv4xxvxxkg5n3jx0q4mhbqk7sp28p8vp"; depends=[BiocGenerics BiocParallel Biostrings chipseq GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges preprocessCore reshape2 Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; - sojourner = derive2 { name="sojourner"; version="1.10.0"; sha256="19gg70hjydxqj46ll6hanl3yvcpc9kmy65i1hh1w6yqph05xralb"; depends=[dplyr EBImage fitdistrplus ggplot2 gridExtra lattice MASS mclust minpack_lm mixtools mltools nls2 pixmap plyr R_matlab Rcpp reshape2 rlang scales shiny shinyjs sp truncnorm]; }; - sparrow = derive2 { name="sparrow"; version="1.2.0"; sha256="0asmqfadqjc99dvrcdsz6jcvqkkqd5d3cf822jpf93ywk75a7gww"; depends=[babelgene BiocGenerics BiocParallel BiocSet checkmate circlize ComplexHeatmap data_table DelayedMatrixStats edgeR ggplot2 GSEABase irlba limma Matrix plotly viridis]; }; - sparseDOSSA = derive2 { name="sparseDOSSA"; version="1.20.0"; sha256="16wgj99i05s4gvv8i7k8ycdmyjs2bp6n61ahab0x10qhw823yy4s"; depends=[MASS MCMCpack optparse tmvtnorm]; }; - sparseMatrixStats = derive2 { name="sparseMatrixStats"; version="1.8.0"; sha256="0p12kay7p5zbfm2589wdx0n9jhgpf5fb2fsmkhn3p4ck4xcy13x2"; depends=[Matrix MatrixGenerics matrixStats Rcpp]; }; - sparsenetgls = derive2 { name="sparsenetgls"; version="1.14.0"; sha256="0818i5hk62gynb3f5slrw5b86n9gj14p9kabk1lhmdhqpbynpar5"; depends=[glmnet huge MASS Matrix]; }; - spatialDE = derive2 { name="spatialDE"; version="1.2.0"; sha256="1hbs8z8hfgmnj4zzjppg5zpkv6i4baaqargiwf8gqdv1abzi3dbn"; depends=[basilisk checkmate ggplot2 ggrepel gridExtra Matrix reticulate S4Vectors scales SpatialExperiment SummarizedExperiment]; }; - spatialHeatmap = derive2 { name="spatialHeatmap"; version="2.2.0"; sha256="1jl9p53k7sxjg4nn5qkfcsf0p1warg26j488x5nkpnqhng59pg0q"; depends=[av BiocFileCache BiocParallel data_table DESeq2 distinct dynamicTreeCut edgeR flashClust genefilter ggdendro ggplot2 ggplotify gplots gridExtra grImport HDF5Array htmlwidgets igraph limma magick Matrix plotly pROC rappdirs reshape2 rols rsvg S4Vectors scater scran scuttle shiny shinydashboard SingleCellExperiment SummarizedExperiment UpSetR visNetwork WGCNA xml2 yaml]; }; - spatzie = derive2 { name="spatzie"; version="1.2.0"; sha256="0zgy1m4ljsr51mdd8bqv64gx08yqk9r3cgbszyq4k0sjk136xg2m"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicFeatures GenomicInteractions GenomicRanges ggplot2 IRanges matrixStats motifmatchr S4Vectors SummarizedExperiment TFBSTools]; }; - specL = derive2 { name="specL"; version="1.30.0"; sha256="0xrjbwsjc02amgmmsj5s63fdlimf4726d9s22jmm243b6s16nbh6"; depends=[DBI protViz RSQLite seqinr]; }; - spicyR = derive2 { name="spicyR"; version="1.8.0"; sha256="1znndd64nz9jgw2paj5qb9wr7zrdl905q7kz0g159syl8lzlixg7"; 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.56.0"; sha256="1sjy783ab394x3f3wqsh1slcq6i2xdns25w1pkp7hvjwsrmmq8f4"; depends=[]; }; - spiky = derive2 { name="spiky"; version="1.2.0"; sha256="0nfazdrlzgh1p3rsfmaibkyag5h0mmbbmnhaqg6nxnv92yddqfyr"; depends=[bamlss Biostrings BlandAltmanLeh BSgenome GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges Rsamtools S4Vectors scales]; }; - spkTools = derive2 { name="spkTools"; version="1.52.0"; sha256="006v158b9397r1w64ah7rqxdzj4sxha5cb82rdcxssbwkz7zmghl"; depends=[Biobase gtools RColorBrewer]; }; - splatter = derive2 { name="splatter"; version="1.20.0"; sha256="1bh5w1jsxaizs0n9f9pv2s84l6j4k3fgdbyxwvzzva602kwhxbqf"; depends=[BiocGenerics BiocParallel checkmate crayon edgeR fitdistrplus ggplot2 locfit matrixStats S4Vectors scales scater SingleCellExperiment SummarizedExperiment]; }; - splineTimeR = derive2 { name="splineTimeR"; version="1.24.0"; sha256="1b0mlfmy237s4pw8ycf4z9qjq41kk1ayky6ga211bik35x0k6yzs"; depends=[Biobase FIs GeneNet GSEABase gtools igraph limma longitudinal]; }; - splots = derive2 { name="splots"; version="1.62.0"; sha256="08mrk44v90zs7hj7k809d6ay88rj7cpx3ijmnshp7fmf998l3pfm"; depends=[RColorBrewer]; }; - spqn = derive2 { name="spqn"; version="1.8.0"; sha256="02dd1irl15nb9ydwsjbdx1n01xiav0aylnmyipv1rjajciyg0xsq"; depends=[BiocGenerics ggplot2 ggridges matrixStats SummarizedExperiment]; }; - srnadiff = derive2 { name="srnadiff"; version="1.16.0"; sha256="1g2g6y2mlqq7p79q5xm11i963gjxbzzxvggz5lzpl55kaz8bxxlr"; depends=[baySeq BiocManager BiocParallel BiocStyle DESeq2 devtools edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges Rcpp Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; - ssPATHS = derive2 { name="ssPATHS"; version="1.10.0"; sha256="0zf9mpjsrcvp4mj41dz9r8q0r94b5rsgm9f17qv2pyl7a33daivv"; depends=[dml MESS ROCR SummarizedExperiment]; }; - sscore = derive2 { name="sscore"; version="1.68.0"; sha256="10zvpqjg19l1jwcvbz5bc2gm0gr25apnzl19y7d886bkd9xc68wl"; depends=[affy affyio]; }; - sscu = derive2 { name="sscu"; version="2.26.0"; sha256="1dd1kf6h062d2billx632ykbjyzygsmjlkvy7cfqq690bi54kqpj"; depends=[BiocGenerics Biostrings seqinr]; }; - ssize = derive2 { name="ssize"; version="1.70.0"; sha256="08bdw9x6dj52fv3jhp27pkbpri81mpn8rggawb5lp1si4fwaxzgk"; depends=[gdata xtable]; }; - ssrch = derive2 { name="ssrch"; version="1.12.0"; sha256="0l9rhi66knb9d9v93qbxf9vwz9wpz82vlfs39i5bwd3mprlzp6kx"; depends=[DT shiny]; }; - ssviz = derive2 { name="ssviz"; version="1.30.0"; sha256="0hnbcxn4m1q2yffi3xrxk4mbjxjn5axl5p8ffli145jjr00n0mq5"; depends=[Biostrings ggplot2 RColorBrewer reshape Rsamtools]; }; - staRank = derive2 { name="staRank"; version="1.38.0"; sha256="0jbyg1b2gc9snnqnybapqmp5mwyhh9b3l4dswfxbx3jdl514wamr"; depends=[cellHTS2]; }; - stageR = derive2 { name="stageR"; version="1.18.0"; sha256="0ns3ih6l4na6irshrc5iy4d9qf7hrnqq3ndnlcjb2i1cn38l2w9y"; depends=[SummarizedExperiment]; }; - standR = derive2 { name="standR"; version="1.0.0"; sha256="0cqsvnm4ffg0gq5qlx81hmhz8cjpsc451jmwlvfzrhhxy3i9d1v5"; depends=[Biobase BiocGenerics dplyr edgeR ggplot2 limma mclustcomp patchwork readr rlang ruv S4Vectors SingleCellExperiment SpatialExperiment SummarizedExperiment tibble tidyr]; }; - statTarget = derive2 { name="statTarget"; version="1.26.0"; sha256="0k182sp8vzrwn3zxxqyi11bq0ca90w5ly0pdc03kflgr4z186fs8"; depends=[impute pdist pls plyr randomForest ROC rrcov]; }; - stepNorm = derive2 { name="stepNorm"; version="1.68.0"; sha256="1czlhb9cqhacl4g87ydgsb8i9ilcxr9gb64kx7vxk49dv6ffyszi"; depends=[marray MASS]; }; - strandCheckR = derive2 { name="strandCheckR"; version="1.14.0"; sha256="15r5ng9z9zyijm7w562dml56lxjvj290cxbjm8r59dvb7g9br07b"; 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.8.0"; sha256="03cd2v72m0p0k99qhvpsbhvdlvx608a7765h6zcawbys35h7k020"; depends=[knitr ontologyIndex rols S4Vectors SummarizedExperiment]; }; - structToolbox = derive2 { name="structToolbox"; version="1.8.0"; sha256="015iabqbjy4zar42dnrnj3602y89rc0ln2y3chrwfk3bd00317dj"; depends=[ggplot2 ggthemes gridExtra scales sp struct]; }; - subSeq = derive2 { name="subSeq"; version="1.26.0"; sha256="1fwnjw0bqjqwb39i4cy34ipa6nw6jmk01d4la7r3fmf57xz73sp7"; depends=[Biobase data_table digest dplyr ggplot2 magrittr qvalue tidyr]; }; - supersigs = derive2 { name="supersigs"; version="1.4.0"; sha256="0llhk099ql7xv5wcb710pgz6r5ljiac5g9bjwwvzvg3rnjnsq9im"; depends=[assertthat Biostrings caret dplyr rlang rsample SummarizedExperiment tidyr]; }; - supraHex = derive2 { name="supraHex"; version="1.34.0"; sha256="1677sffcndrymh8dlahl7qh35zs9k5h0h4x040a7lal1iaqzgxdi"; depends=[ape dplyr hexbin igraph magrittr MASS purrr readr stringr tibble tidyr]; }; - surfaltr = derive2 { name="surfaltr"; version="1.2.2"; sha256="1dx8nfvyknqahszg94064mkvb45b79biibagqz6w24lmymdvxv0v"; depends=[biomaRt Biostrings dplyr ggplot2 httr msa protr readr seqinr stringr testthat xml2]; }; - survcomp = derive2 { name="survcomp"; version="1.46.0"; sha256="1b39s6v0awmznfs2gkklps1x3pnk0b4420vhrhgfv5lakz89f1zi"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; }; - survtype = derive2 { name="survtype"; version="1.12.0"; sha256="0ihq2js9j2wkbqpgvpk8mzd0rrjvwmmdph84nhm20z04mfbsl4k5"; depends=[clustvarsel pheatmap SummarizedExperiment survival survminer]; }; - sva = derive2 { name="sva"; version="3.44.0"; sha256="0ka259rn0la0hjslj7w24q1dyyh79h84nw6mxp7armqbfjb207a4"; depends=[BiocParallel edgeR genefilter limma matrixStats mgcv]; }; - svaNUMT = derive2 { name="svaNUMT"; version="1.2.0"; sha256="13kk77bqsm8pk8kwjk8ag4mg7f8fqgpypwkdv5zhqds51zb14pkm"; depends=[assertthat BiocGenerics Biostrings dplyr GenomeInfoDb GenomicFeatures GenomicRanges rlang rtracklayer S4Vectors stringr StructuralVariantAnnotation VariantAnnotation]; }; - svaRetro = derive2 { name="svaRetro"; version="1.2.0"; sha256="15q7k9rjds0qzyighfp1bn6j8jr36h9wckvb1sfg0zk3lhzr04sz"; depends=[assertthat BiocGenerics Biostrings dplyr GenomeInfoDb GenomicFeatures GenomicRanges rlang rtracklayer S4Vectors stringr StructuralVariantAnnotation VariantAnnotation]; }; - swfdr = derive2 { name="swfdr"; version="1.22.0"; sha256="1gkam38fcn0i5vrkngapf2wbbixbr059xi1xl04iwnllz1xg0sny"; depends=[]; }; - switchBox = derive2 { name="switchBox"; version="1.32.0"; sha256="0fyysinxa14fx2lwmpishyva7jn4m4k9cipxmbhinf2v5z5h3qj5"; depends=[gplots pROC]; }; - switchde = derive2 { name="switchde"; version="1.22.0"; sha256="0mgif3d6pkhivk8yrjdp4xm6kad5vm9g18mvn617zd71zfqd902y"; depends=[dplyr ggplot2 SingleCellExperiment SummarizedExperiment]; }; - synapsis = derive2 { name="synapsis"; version="1.2.0"; sha256="1m8js52l8spp3w40pypbha1ydgbjz0ypylk08gjxclw3jp9abwjy"; depends=[EBImage]; }; - synapter = derive2 { name="synapter"; version="2.20.1"; sha256="193j8r44msr0hhb9hvpk5yl0i2ns1lpzbfb585jfiji6w37lskrp"; depends=[Biobase Biostrings cleaver lattice MSnbase multtest qvalue RColorBrewer readr rmarkdown]; }; - synergyfinder = derive2 { name="synergyfinder"; version="3.4.5"; sha256="01m56wbb9qlyv4fj939h68g31vm0c1rfj0xammc5g2lwwwnnascz"; 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.26.0"; sha256="0zygs6gskgddb68as4yh3bw1kjlsxk60rym1f6yxj5vzln0ka53c"; depends=[doBy dplyr ggplot2 magrittr RankProd RColorBrewer reshape2]; }; - systemPipeR = derive2 { name="systemPipeR"; version="2.2.2"; sha256="1yybbff29gwv6rm0nw4yjw73bbl5prfj8gj4zky917smjfd459im"; depends=[BiocGenerics Biostrings crayon GenomicRanges ggplot2 htmlwidgets magrittr Rsamtools S4Vectors ShortRead stringr SummarizedExperiment yaml]; }; - systemPipeShiny = derive2 { name="systemPipeShiny"; version="1.6.1"; sha256="1b0x9vy7mkppf20c0i5p65wjicz12njx7in9w4vjqggvixbc9cjn"; 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]; }; - systemPipeTools = derive2 { name="systemPipeTools"; version="1.4.0"; sha256="0zandgmzwj5b3hk8w60rmmc40hkpsvg9vynpix50hi81s8vwj26j"; depends=[ape DESeq2 dplyr DT GGally ggplot2 ggrepel ggtree glmpca magrittr pheatmap plotly Rtsne SummarizedExperiment tibble]; }; - tLOH = derive2 { name="tLOH"; version="1.4.0"; sha256="03ap5c7pznmflnlx7q9bwl8d64x68vz849ld6lxhm7j6wsva2c9m"; depends=[data_table dplyr GenomicRanges ggplot2 MatrixGenerics purrr scales VariantAnnotation]; }; - tRNA = derive2 { name="tRNA"; version="1.14.0"; sha256="140lpja0brw898is5xazxdz1h1agfzwwx9w63fhxacyx1ll43h41"; depends=[BiocGenerics Biostrings GenomicRanges ggplot2 IRanges Modstrings S4Vectors scales stringr Structstrings XVector]; }; - tRNAdbImport = derive2 { name="tRNAdbImport"; version="1.14.0"; sha256="1c3jmx3ddr7yiijpv08lzgk52r49g2ir4xayf65fzqb90ni6k04q"; depends=[BiocGenerics Biostrings GenomicRanges httr IRanges Modstrings S4Vectors stringr Structstrings tRNA xml2]; }; - tRNAscanImport = derive2 { name="tRNAscanImport"; version="1.16.0"; sha256="1zfk4a4qm76ah2z0bmkl0h0xpbqfjlkgmiy478gi7xvnd5rm0gwy"; depends=[BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors stringr Structstrings tRNA XVector]; }; - tRanslatome = derive2 { name="tRanslatome"; version="1.34.0"; sha256="0pv11lrg0fsfpv933k7zjlqswb5zqqxx12cwrfkz91v3x3ivsbza"; depends=[anota Biobase DESeq2 edgeR GOSemSim gplots Heatplus limma org_Hs_eg_db plotrix RankProd sigPathway topGO]; }; - tanggle = derive2 { name="tanggle"; version="1.2.0"; sha256="1r04qmxq9ww0ly4mzpkxqv7xyva3mqy02lh3vw13v4dp9d9zaf7c"; depends=[ape ggplot2 ggtree phangorn]; }; - target = derive2 { name="target"; version="1.10.0"; sha256="00dwbwzv6y9nfs1cc2jv39b0fcjcbzwfnqmv3zicwfq1lsa4z9mv"; depends=[BiocGenerics GenomicRanges IRanges matrixStats shiny]; }; - tenXplore = derive2 { name="tenXplore"; version="1.18.1"; sha256="0abybqmmn5ah189c38j7l1msm985vdzk42a1cw0pkskvan62hw50"; depends=[AnnotationDbi matrixStats ontoProc org_Mm_eg_db restfulSE shiny SummarizedExperiment]; }; - ternarynet = derive2 { name="ternarynet"; version="1.40.0"; sha256="02r53h6224f8jwwvnv1n09s8i8akhq2qf562crq14m8qk5xw4scf"; depends=[BiocParallel igraph]; }; - terraTCGAdata = derive2 { name="terraTCGAdata"; version="1.0.0"; sha256="16sc6n1cgrxr425024k37vzy1n2pij8n7lzxq383r73wyp5z3zkc"; depends=[AnVIL BiocFileCache dplyr GenomicRanges MultiAssayExperiment RaggedExperiment readr S4Vectors TCGAutils tidyr]; }; - tidySingleCellExperiment = derive2 { name="tidySingleCellExperiment"; version="1.6.3"; sha256="1b90n9sirpff8dh8kh8m2p4lnpfpqfh0zwvhpk5ymnw7j7x1vw7n"; depends=[cli dplyr ellipsis fansi ggplot2 lifecycle magrittr pillar plotly purrr rlang S4Vectors SingleCellExperiment stringr SummarizedExperiment tibble tidyr tidyselect ttservice vctrs]; }; - tidySummarizedExperiment = derive2 { name="tidySummarizedExperiment"; version="1.6.1"; sha256="0y30479w9nim6yap55fcg99qi4599rnliacqaiq693qwnrglksmg"; depends=[cli dplyr ellipsis fansi ggplot2 lifecycle magrittr pillar plotly purrr rlang S4Vectors stringr SummarizedExperiment tibble tidyr tidyselect vctrs]; }; - tidybulk = derive2 { name="tidybulk"; version="1.8.2"; sha256="0ma28j78hcmhwzz6fcc9gp0rpwd1j2wf5nwhnc1xq66sm0wn299g"; depends=[dplyr GenomicRanges lifecycle magrittr preprocessCore purrr readr rlang scales stringi stringr SummarizedExperiment tibble tidyr tidyselect]; }; - tigre = derive2 { name="tigre"; version="1.50.0"; sha256="0a4nn8q6iz20xfpwjvdp387cc3w0wdd9rpn6p8gh3dkqh8wsnggd"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; }; - tilingArray = derive2 { name="tilingArray"; version="1.74.0"; sha256="17n30c0nybsqvmm920zfxfx82yz0afnv1p14jcrnhf3qi9ipdjna"; depends=[affy Biobase genefilter pixmap RColorBrewer strucchange vsn]; }; - timeOmics = derive2 { name="timeOmics"; version="1.7.1"; sha256="0s3h8rk7k2s6fnac3v5m8hc2mmdnb4dvbld6ad1as9ac0nvz3521"; depends=[dplyr ggplot2 ggrepel lmtest magrittr mixOmics plyr propr purrr stringr tibble tidyr]; }; - timecourse = derive2 { name="timecourse"; version="1.68.0"; sha256="10gin2dmg955ksg5s81kahracf889vdzjkj1f5nk59bpdyps2ga0"; depends=[Biobase limma marray MASS]; }; - timescape = derive2 { name="timescape"; version="1.20.0"; sha256="0w7jbk49647hzx1ny8xa8mf5q8nyfdn92xmw4k4lm8d7w1xbjx75"; depends=[dplyr gtools htmlwidgets jsonlite stringr]; }; - tkWidgets = derive2 { name="tkWidgets"; version="1.74.0"; sha256="0b7ic4sz8d93b4cp4idhcywc9j9y8dvamz5y4mm9p0xhn404s4k0"; depends=[DynDoc widgetTools]; }; - tomoda = derive2 { name="tomoda"; version="1.6.0"; sha256="032h10674vyp017jww0rfpgs8jn7kl5m9w36j3azzvjh5p04n9s7"; depends=[ggplot2 ggrepel RColorBrewer reshape2 Rtsne SummarizedExperiment umap]; }; - tomoseqr = derive2 { name="tomoseqr"; version="1.0.0"; sha256="0afxzfqllr1l8mhkv75wismhsb1ipsspws18x3gyx2cvwi3yz5mw"; depends=[animation BiocFileCache dplyr purrr readr shiny stringr tibble]; }; - topGO = derive2 { name="topGO"; version="2.48.0"; sha256="125r42ymk1irjmwk4sywjkcshs71s26p3zsvryfdvf56k5w162v6"; depends=[AnnotationDbi Biobase BiocGenerics DBI GO_db graph lattice matrixStats SparseM]; }; - topconfects = derive2 { name="topconfects"; version="1.12.0"; sha256="0v1cq7gvbwdqxczmy5vrw8yqk7h1bvx3rils4pkv7w9nhqps5g4k"; depends=[assertthat ggplot2]; }; - topdownr = derive2 { name="topdownr"; version="1.18.0"; sha256="1qrjgbs2lh851d22bcl75574jnyc554aqqxb34zdnpvpwavaqaya"; depends=[Biobase BiocGenerics Biostrings ggplot2 Matrix MSnbase mzR ProtGenerics S4Vectors]; }; - trackViewer = derive2 { name="trackViewer"; version="1.32.1"; sha256="0hifh15z5d83qmrvh3kpi8i18dfqqfj6kn4kqkkcyxbfm1yx62h1"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph grImport Gviz htmlwidgets InteractionSet IRanges plotrix Rcpp Rgraphviz rhdf5 Rsamtools rtracklayer S4Vectors scales]; }; - tracktables = derive2 { name="tracktables"; version="1.30.0"; sha256="0xv4n8avwls10dk2kn2mhjq69cfqkackdn1jdz85xq5z42qnkl10"; depends=[GenomicRanges IRanges RColorBrewer Rsamtools stringr tractor_base XML XVector]; }; - tradeSeq = derive2 { name="tradeSeq"; version="1.10.0"; sha256="0v9nqxrwa69qhmyaicn2vvs8haha4kzs93iqim306331vadp9qm0"; depends=[Biobase BiocParallel edgeR ggplot2 igraph magrittr MASS Matrix matrixStats mgcv pbapply princurve RColorBrewer S4Vectors SingleCellExperiment slingshot SummarizedExperiment tibble TrajectoryUtils viridis]; }; - transcriptR = derive2 { name="transcriptR"; version="1.24.0"; sha256="1zc6aasd5nzwl9jxr0rdriiq85adqdbfi5b9m3jyf69pa71sgy03"; depends=[BiocGenerics caret chipseq e1071 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges pROC reshape2 Rsamtools rtracklayer S4Vectors]; }; - transcriptogramer = derive2 { name="transcriptogramer"; version="1.18.0"; sha256="1zwyiabw3iagbp95q16pzwdx1i8w77ibqi5wawn1j046q9qi20fh"; depends=[biomaRt data_table doSNOW foreach ggplot2 igraph limma progress RedeR snow tidyr topGO]; }; - transformGamPoi = derive2 { name="transformGamPoi"; version="1.2.0"; sha256="0nc2524yfq44zlfiv8nawaj83i04kpmrmr18jg81gjcya6n0xayq"; depends=[DelayedArray glmGamPoi HDF5Array Matrix MatrixGenerics Rcpp SummarizedExperiment]; }; - transite = derive2 { name="transite"; version="1.14.0"; sha256="0h6d9akl1amz0b0k6f39pfg8szd7z85lxicw2bzy74pfmcdig3an"; depends=[BiocGenerics Biostrings dplyr GenomicRanges ggplot2 ggseqlogo gridExtra Rcpp scales TFMPvalue]; }; - transomics2cytoscape = derive2 { name="transomics2cytoscape"; version="1.6.1"; sha256="15a75mzbdzd8fm65mp7qpzwhgl0hy1r9ny02m97c4cm7qq0rl2hm"; depends=[dplyr KEGGREST purrr RCy3 tibble]; }; - traseR = derive2 { name="traseR"; version="1.26.0"; sha256="1saas8qiiir4hafshs8i8pbpj3rfnsngrfg9a4ryalnwnbqyh519"; depends=[BSgenome_Hsapiens_UCSC_hg19 GenomicRanges IRanges]; }; - traviz = derive2 { name="traviz"; version="1.2.0"; sha256="1y2gckk7nm1yb8qv1llkal3mzmdk11kgmdagflymhla4nx2gdgay"; depends=[Biobase ggplot2 mgcv princurve RColorBrewer rgl SingleCellExperiment slingshot SummarizedExperiment viridis]; }; - treeio = derive2 { name="treeio"; version="1.20.2"; sha256="1jymbyl82n88ckw0nkbj72rvlxbk5m7xmcmq3fyi885z7aasc0x1"; depends=[ape dplyr jsonlite magrittr rlang tibble tidytree]; }; - treekoR = derive2 { name="treekoR"; version="1.4.0"; sha256="0sd1vk1hzvma0644p8wz4037gmm5wpf1d8n22fa0d5m7c97qijrl"; depends=[ape data_table diffcyt dplyr edgeR ggiraph ggplot2 ggtree hopach lme4 multcomp patchwork SingleCellExperiment tidyr]; }; - trena = derive2 { name="trena"; version="1.18.1"; sha256="1d8rf8403by7bfqckhv25qz8bhx4ph0hq48w17d255awb1i8z6ly"; depends=[AnnotationDbi biomaRt Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 BSgenome_Mmusculus_UCSC_mm10 DBI GenomicRanges glmnet lassopv MotifDb org_Hs_eg_db randomForest RMySQL RPostgreSQL RSQLite SNPlocs_Hsapiens_dbSNP150_GRCh38 WGCNA xgboost]; }; - tricycle = derive2 { name="tricycle"; version="1.4.0"; sha256="0bjkajcz6xcfak6071d0ihakrvgf7s0pmkn6vqkjd6yxbfld7zln"; depends=[AnnotationDbi circular dplyr GenomicRanges ggnewscale ggplot2 IRanges RColorBrewer S4Vectors scater scattermore SingleCellExperiment SummarizedExperiment]; }; - trigger = derive2 { name="trigger"; version="1.42.0"; sha256="09gbchwpifx5dkmw3irshb63jl22fn2sxsj450krqjjq1gjq1xhx"; depends=[corpcor qtl qvalue sva]; }; - trio = derive2 { name="trio"; version="3.34.0"; sha256="1d6gwzx99np8yrsmqnn23s94ib6k41290sv2h4nmzblsidsimlbs"; depends=[LogicReg siggenes survival]; }; - triplex = derive2 { name="triplex"; version="1.36.0"; sha256="07yfm0vvrvw21hvdrprsw8crjb07hvz36w83avrqq16v3l64xgq8"; depends=[Biostrings GenomicRanges IRanges S4Vectors XVector]; }; - tripr = derive2 { name="tripr"; version="1.2.0"; sha256="0v5yqzh20ha7zbl3d8xl04gw3qq9mfpnggk4aw3k8ckqasii10q7"; 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.8.0"; sha256="0i8d739xd39bvj05bx4x98nhpdl1mjsdsci1vdw6ri2kh7hrihji"; depends=[class cluster dplyr dtw GenomicRanges ggplot2 gridExtra IRanges kmlShape knitr latex2exp prettydoc RColorBrewer rmarkdown S4Vectors SummarizedExperiment]; }; - tspair = derive2 { name="tspair"; version="1.53.0"; sha256="04xxrm313mnknhc38vl1sx6hic2g1x1xaa5772qlc7ip957hz85k"; depends=[Biobase]; }; - ttgsea = derive2 { name="ttgsea"; version="1.4.0"; sha256="15kzy6ah7yz1ldx79g3z3n2ipfc842hg1l72ijcrsni47l6gs8ss"; depends=[data_table DiagrammeR keras purrr stopwords text2vec textstem tm tokenizers]; }; - tweeDEseq = derive2 { name="tweeDEseq"; version="1.42.0"; sha256="152alh46baz6kjfqsawyh74if4jnyqq4axxw7ihj4b4c79r5bq9g"; depends=[cqn edgeR limma MASS]; }; - twilight = derive2 { name="twilight"; version="1.72.0"; sha256="1s0xv8kh5mfwa9z3f5096bq99g8ncnygcih7xb0fpvj6knpp0w5k"; depends=[Biobase]; }; - twoddpcr = derive2 { name="twoddpcr"; version="1.20.0"; sha256="0gjsbn47a8rid73krlip1nczhwnfi85a7023pchc9j98y85lv8w9"; depends=[class ggplot2 hexbin RColorBrewer S4Vectors scales shiny]; }; - txcutr = derive2 { name="txcutr"; version="1.2.0"; sha256="016y2g0n1394n3ynfxszxsnh9874r1f1jy4yh9c48c3ivkp36nk1"; depends=[AnnotationDbi BiocGenerics BiocParallel Biostrings GenomicFeatures GenomicRanges IRanges rtracklayer S4Vectors]; }; - tximeta = derive2 { name="tximeta"; version="1.14.1"; sha256="0hxq5lkrdiz0a3xpl88adrv4m55jr6g46a5m9pamc0w4bxddirr8"; depends=[AnnotationDbi AnnotationHub BiocFileCache Biostrings ensembldb GenomeInfoDb GenomicFeatures GenomicRanges IRanges jsonlite Matrix S4Vectors SummarizedExperiment tibble tximport]; }; - tximport = derive2 { name="tximport"; version="1.24.0"; sha256="1cnra82pvwz79a1hkw0phc6aa3v43r5p4nx8xyx5wzmkd7rjkc8x"; depends=[]; }; - uSORT = derive2 { name="uSORT"; version="1.22.0"; sha256="1fq9zqa0kgdzvc0bhr60kqkl27b5y525czfm0w7qmbv3a832mhhd"; depends=[Biobase BiocGenerics cluster fpc gplots igraph Matrix monocle plyr RANN RSpectra VGAM]; }; - uncoverappLib = derive2 { name="uncoverappLib"; version="1.6.0"; sha256="0r0vgi7pq93vpw7mcqw96ixfgkhwllw16v20jsk3v27jx5gvr31c"; depends=[BiocFileCache BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 condformat DT EnsDb_Hsapiens_v75 EnsDb_Hsapiens_v86 GenomicRanges Gviz Homo_sapiens markdown openxlsx org_Hs_eg_db OrganismDbi processx rappdirs rlist Rsamtools S4Vectors shiny shinyBS shinycssloaders shinyjs shinyWidgets stringr TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; }; - unifiedWMWqPCR = derive2 { name="unifiedWMWqPCR"; version="1.32.0"; sha256="1skfs94a6bv05c844zf5vfqw1fbgxyppgdnckdbhxg2a2470a4wh"; depends=[BiocGenerics HTqPCR]; }; - universalmotif = derive2 { name="universalmotif"; version="1.14.1"; sha256="1sm54z8aq3534qjsa19wychhwcvwnjlkydmiqqvidiiwcxwqpjsr"; depends=[BiocGenerics Biostrings ggplot2 IRanges MASS Rcpp RcppThread rlang S4Vectors yaml]; }; - updateObject = derive2 { name="updateObject"; version="1.0.0"; sha256="0ng927m9hrmwlnx02pm35b5173a0wx1b2k54gww9xc1pz9b5zp24"; depends=[BiocGenerics digest S4Vectors]; }; - variancePartition = derive2 { name="variancePartition"; version="1.26.0"; sha256="0wk1xql8b0gxyrqz9hs54xvmp7qdw9b8jnv88p4vgv061iwyk7wv"; depends=[aod Biobase BiocParallel doParallel foreach ggplot2 gplots iterators limma lme4 lmerTest MASS Matrix pbkrtest progress Rdpack reshape2 RhpcBLASctl rlang scales]; }; - vbmp = derive2 { name="vbmp"; version="1.64.0"; sha256="02xxvam2dmhhqvm30gxh2v16894qbqha1mc7bl78gq5sc067yr0n"; depends=[]; }; - velociraptor = derive2 { name="velociraptor"; version="1.6.0"; sha256="07hbrjqwlxpjrznd9jbv3psqgrsadpa626acgzc02wkl9vfgg5bc"; depends=[basilisk BiocGenerics BiocParallel BiocSingular DelayedArray Matrix reticulate S4Vectors scuttle SingleCellExperiment SummarizedExperiment zellkonverter]; }; - veloviz = derive2 { name="veloviz"; version="1.2.1"; sha256="0k84ghg5c0qlkmd1ck3k1gly8gyd7l1qysm2jmw60nf1b8w8lxxz"; depends=[igraph Matrix mgcv Rcpp RSpectra]; }; - vidger = derive2 { name="vidger"; version="1.16.0"; sha256="0kn06i2kb6drq4g5y1xx8wrw4fp5q9147d5mnfj0jvi5db7cmsav"; depends=[Biobase DESeq2 edgeR GGally ggplot2 ggrepel knitr RColorBrewer rmarkdown scales SummarizedExperiment tidyr]; }; - viper = derive2 { name="viper"; version="1.30.0"; sha256="0ii6fg0bzgnwfrhlvkh34c17xg2wpyqvb1hg1qsh7prv8dij4q0x"; depends=[Biobase e1071 KernSmooth mixtools]; }; - vissE = derive2 { name="vissE"; version="1.4.0"; sha256="01gw1cjm9nz804hw64vsk2jicb86p0dl1qrgkadnixxzcksgb3gz"; depends=[ggforce ggplot2 ggraph ggrepel ggwordcloud GSEABase igraph msigdb plyr RColorBrewer reshape2 scales scico textstem tidygraph tm]; }; - vsn = derive2 { name="vsn"; version="3.64.0"; sha256="1ja7vdjvgx671l57f9fzfn4vc6q7xzfmqs4krg2rdyfaaf531gqf"; depends=[affy Biobase ggplot2 lattice limma]; }; - vtpnet = derive2 { name="vtpnet"; version="0.36.0"; sha256="10sr9rpq5bb1a76wa4r80w01cm5wmijc83f0aq2idbw8qbvxn39c"; depends=[doParallel foreach GenomicRanges graph gwascat]; }; - vulcan = derive2 { name="vulcan"; version="1.18.0"; sha256="0f9gmypm1n3g0a7k76kkzyxa3pm3jsqyb75d1xf148gr1n0qqf2w"; depends=[Biobase caTools ChIPpeakAnno csaw DESeq2 DiffBind GenomicRanges gplots locfit S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene viper wordcloud zoo]; }; - waddR = derive2 { name="waddR"; version="1.10.0"; sha256="15sg5912vvl3bhw1cfrk22r5azisp18dawipybj78rgzbqvrzga3"; depends=[arm BiocFileCache BiocParallel eva Rcpp RcppArmadillo SingleCellExperiment]; }; - wateRmelon = derive2 { name="wateRmelon"; version="2.2.0"; sha256="0adqyfabrvfcaj3mwp0rbqlcgpj92yb205cyhibbrs5gdr5ri4pv"; depends=[Biobase IlluminaHumanMethylation450kanno_ilmn12_hg19 illuminaio limma lumi matrixStats methylumi ROC]; }; - wavClusteR = derive2 { name="wavClusteR"; version="2.30.0"; sha256="04di095i9i19j9ppx8gdsk7n18vd02d4rjdi9d4a3p0xv05ihnb6"; depends=[BiocGenerics Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer S4Vectors seqinr stringr]; }; - weaver = derive2 { name="weaver"; version="1.62.0"; sha256="10d3pnrs26xmk2dpnfvkd5ngl9l5xcfcsch4za8jkissfs3w9y24"; depends=[codetools digest]; }; - webbioc = derive2 { name="webbioc"; version="1.68.0"; sha256="1g3srxsa2fqcn3r4wz4y19fwjmw3vawlcvdw6lbjdnvbgcafq1ah"; depends=[affy annaffy Biobase BiocManager gcrma multtest qvalue vsn]; }; - weitrix = derive2 { name="weitrix"; version="1.8.0"; sha256="0xkmh3k174jywrvaqanbbw4xinymx1fgds1n4i2qnv6bkdpcjfi1"; depends=[assertthat BiocGenerics BiocParallel Ckmeans_1d_dp DelayedArray DelayedMatrixStats dplyr ggplot2 glm2 limma purrr reshape2 RhpcBLASctl rlang S4Vectors scales SummarizedExperiment topconfects]; }; - widgetTools = derive2 { name="widgetTools"; version="1.74.0"; sha256="10w1s5h4za6ibmphvj145ir3lp22qgah2z8fvmipmf8ciq1jf86d"; depends=[]; }; - wiggleplotr = derive2 { name="wiggleplotr"; version="1.20.0"; sha256="0s128mm5w8n072k6j0fv1mxnxjpwisjp5lpz8a9z96cnn69bnr0i"; depends=[assertthat cowplot dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges purrr rtracklayer S4Vectors]; }; - wpm = derive2 { name="wpm"; version="1.6.0"; sha256="12b3sf1xzxynv7c7r24rgzfzgznw3s00rwyg26f9c2agk8pz1cjq"; depends=[Biobase cli config dplyr DT ggplot2 golem logging RColorBrewer rlang shiny shinycustomloader shinydashboard shinyWidgets stringr SummarizedExperiment]; }; - wppi = derive2 { name="wppi"; version="1.4.0"; sha256="1008s39bb7sd261cy1vfgdah7bmhfw9qq322fh7g4wvpfw63ii9f"; depends=[dplyr igraph logger magrittr Matrix OmnipathR progress purrr RCurl rlang tibble tidyr]; }; - xcms = derive2 { name="xcms"; version="3.18.0"; sha256="0p2zd2728lj5q8y24gdfvsjijd6zl2i73hrcf017n32jq7vn71xm"; depends=[Biobase BiocGenerics BiocParallel IRanges lattice MassSpecWavelet MsCoreUtils MsFeatures MSnbase mzR plyr ProtGenerics RANN RColorBrewer robustbase S4Vectors SummarizedExperiment]; }; - xcore = derive2 { name="xcore"; version="1.0.0"; sha256="1czys3nbw1hzy0p6bblqa6qvp68xd7iifi2isw9dhsn2k4nkr0xf"; depends=[DelayedArray edgeR foreach GenomicRanges glmnet IRanges iterators magrittr Matrix MultiAssayExperiment S4Vectors]; }; - xmapbridge = derive2 { name="xmapbridge"; version="1.54.0"; sha256="1n3nxc4jwxf5z32i70sza52nyk29adhp8vc3hac7r5b8mbi6gg10"; depends=[]; }; - yamss = derive2 { name="yamss"; version="1.22.0"; sha256="1lcfxw73cxvpy3bnq28pxdy5128mpq5xklsa0mzxdjyqc4g55hy8"; depends=[BiocGenerics data_table EBImage IRanges limma Matrix mzR S4Vectors SummarizedExperiment]; }; - yarn = derive2 { name="yarn"; version="1.22.0"; sha256="0z5202pqq02fwm8qf1g36004k7sv668s1xacbpr1cvw5sl452lbg"; depends=[Biobase biomaRt downloader edgeR gplots limma matrixStats preprocessCore quantro RColorBrewer readr]; }; - zFPKM = derive2 { name="zFPKM"; version="1.18.0"; sha256="1h7g553rgb5mkmmsp8dyqqs9n9x17xmmcg3iijhb54nyrr2j1mji"; depends=[checkmate dplyr ggplot2 SummarizedExperiment tidyr]; }; - zellkonverter = derive2 { name="zellkonverter"; version="1.6.5"; sha256="0rxpjkisjj1xjchjjm72k8za5hn48wbdahmbllljvxm5ii6k36k6"; depends=[basilisk cli DelayedArray Matrix reticulate S4Vectors SingleCellExperiment SummarizedExperiment]; }; - zinbwave = derive2 { name="zinbwave"; version="1.18.0"; sha256="0vpz721sciw5b4ypxj5lj8p53gwkpfwlwkn6k3y8i65zg80p1g6i"; depends=[BiocParallel edgeR genefilter Matrix SingleCellExperiment softImpute SummarizedExperiment]; }; - zlibbioc = derive2 { name="zlibbioc"; version="1.42.0"; sha256="0w0y9jixdk6akmasn55g9g0nhlh93hbca5bwx5w1fypnvqrqpxzv"; depends=[]; }; + ABSSeq = derive2 { name="ABSSeq"; version="1.52.0"; sha256="1ypd0wg3k2zzl0zf15c16dc38hfpsm5vv4x0x0yf90x0f8b6jpaz"; depends=[limma locfit]; }; + ABarray = derive2 { name="ABarray"; version="1.66.0"; sha256="02rjxzbrzphl28z8zpgw3gavzlzlx71n5ld8sb3im6xpn81ykvfh"; depends=[Biobase multtest]; }; + ACE = derive2 { name="ACE"; version="1.16.0"; sha256="12gmdkzm9wnrq793xqvw3mzwmmsm1vkh36llapr7m7q4dmcfgxr0"; depends=[Biobase GenomicRanges ggplot2 QDNAseq]; }; + ACME = derive2 { name="ACME"; version="2.54.0"; sha256="0prcaxqmzm4hhpv228xh0glhm166gs17sa9h4lqrm03pwrjrdqdw"; depends=[Biobase BiocGenerics]; }; + ADAM = derive2 { name="ADAM"; version="1.14.0"; sha256="1s1mzjxqld8gllfh6z9kg30klb4y1jrkrif7vwr18c0mhamf47a6"; depends=[dplyr DT GO_db KEGGREST knitr pbapply Rcpp stringr SummarizedExperiment]; }; + ADAMgui = derive2 { name="ADAMgui"; version="1.14.0"; sha256="1ks799kgdmlxn5iyj6rzj04cm28klivclz3bg6bc4wad2q7h4ra9"; depends=[ADAM colorRamps data_table dplyr DT ggplot2 ggpubr ggrepel ggsignif GO_db gridExtra knitr RColorBrewer reshape2 shiny shinyjs stringi stringr testthat varhandle]; }; + ADImpute = derive2 { name="ADImpute"; version="1.8.0"; sha256="0wrprxd91vi4wwh9wixhx1ppbjsb56r4kcxgqz8w6ahr3z2387im"; depends=[BiocParallel checkmate data_table DrImpute kernlab MASS Matrix rsvd S4Vectors SAVER SingleCellExperiment SummarizedExperiment]; }; + ADaCGH2 = derive2 { name="ADaCGH2"; version="2.38.0"; sha256="0g9x3lnr56035wq9ijdcri4sz5pwj8184yxm415gmsxrii9xvpfd"; depends=[aCGH bit cluster DNAcopy ff GLAD snapCGH tilingArray waveslim]; }; + AGDEX = derive2 { name="AGDEX"; version="1.46.0"; sha256="0yvdx32yr4mv7dl5ycpbxhrkm6csrr7k3398ggjavdcfhz54dgr8"; depends=[Biobase GSEABase]; }; + AIMS = derive2 { name="AIMS"; version="1.30.0"; sha256="1civ4a14ynccv6xs27fm95fw6254l1z0q37546ivyv2mhbz0d2i1"; depends=[Biobase e1071]; }; + ALDEx2 = derive2 { name="ALDEx2"; version="1.30.0"; sha256="0585s5pb8zr9il1vhxw9vjzzajmdcjmf9zz3zlc5vpczd3fnzfkf"; depends=[BiocParallel GenomicRanges IRanges multtest Rfast S4Vectors SummarizedExperiment zCompositions]; }; + AMARETTO = derive2 { name="AMARETTO"; version="1.13.0"; sha256="18w65sf3h4yzw9v5xgkalxnkmgzgsx100v7qc7z4ifx10lgpji5n"; depends=[BiocFileCache callr circlize ComplexHeatmap curatedTCGAData doParallel dplyr DT foreach ggplot2 glmnet gridExtra httr impute knitr limma Matrix matrixStats MultiAssayExperiment Rcpp readr reshape2 rmarkdown tibble]; }; + AMOUNTAIN = derive2 { name="AMOUNTAIN"; version="1.24.0"; sha256="0zzl5dv64yhdivsm2pgsfjikygib9pkfiv34h1lnmqrj6yivvvw8"; depends=[]; }; + ANCOMBC = derive2 { name="ANCOMBC"; version="2.0.1"; sha256="1bwzvi6j3s66dcll1lb4xy25j4nfn1ln6mc3flh0wgy13l26x8m6"; depends=[CVXR DescTools doParallel doRNG dplyr emmeans energy foreach Hmisc lme4 lmerTest magrittr MASS mia nloptr Rdpack rlang rngtools S4Vectors SingleCellExperiment SummarizedExperiment tibble tidyr TreeSummarizedExperiment]; }; + ANF = derive2 { name="ANF"; version="1.20.0"; sha256="0yfwvgx7144r894fr13sx4gyyq6ljh7y734wx74sb7q80cl2gs1j"; depends=[Biobase igraph MASS RColorBrewer survival]; }; + APAlyzer = derive2 { name="APAlyzer"; version="1.12.0"; sha256="1iaz9ircfh5x3z5pibn5vnd4lbbr7m5ypk97xnizn22z41aqrxn3"; depends=[DESeq2 dplyr GenomicAlignments GenomicFeatures GenomicRanges ggplot2 ggrepel HybridMTest repmis Rsamtools Rsubread rtracklayer SummarizedExperiment tidyr VariantAnnotation]; }; + APL = derive2 { name="APL"; version="1.2.0"; sha256="1i02m70aa67m1h81q9lz3qmc52sc6cjicgxd9krqm9r6fpgcf22g"; depends=[ggplot2 ggrepel magrittr org_Hs_eg_db org_Mm_eg_db plotly reticulate rlang Seurat SingleCellExperiment SummarizedExperiment topGO viridisLite]; }; + ARRmNormalization = derive2 { name="ARRmNormalization"; version="1.38.0"; sha256="14mffjsy7cwpa2xf8zdqwdk6mnfj3lf06y8s59ndh531b45nw5wc"; depends=[ARRmData]; }; + ASAFE = derive2 { name="ASAFE"; version="1.24.0"; sha256="1q4i33rw1qb8bnvkl06izl4nyl9lzgwy8rwrmvbrz1c384pmy8yj"; depends=[]; }; + ASEB = derive2 { name="ASEB"; version="1.42.0"; sha256="1kr6l2ma7wzy8i9dn86zx927yvx1l4bnkxhv97ra3sh5vr6m8ywa"; depends=[]; }; + ASGSCA = derive2 { name="ASGSCA"; version="1.32.0"; sha256="12wap8xbq6xl7p430yd9yy5kdhs15n7nmv2h3k9bsi0f4m6md02i"; depends=[MASS Matrix]; }; + ASICS = derive2 { name="ASICS"; version="2.14.0"; sha256="0c2b3gdza58vqhharhw8967p2w2knnrm5s2svvnnjbf67qbg45b7"; depends=[BiocParallel ggplot2 glmnet gridExtra Matrix mvtnorm PepsNMR plyr quadprog ropls SummarizedExperiment zoo]; }; + ASSET = derive2 { name="ASSET"; version="2.16.0"; sha256="13zwnjap4y0s3qqv10mv2i4mqan9nmkm2l29i448h1j3wwfq18j2"; depends=[MASS msm rmeta]; }; + ASSIGN = derive2 { name="ASSIGN"; version="1.34.0"; sha256="0y1j9j9g8mlrrxz8ggi45lb9gvdsmcq94c0pzj8y8lm7hmsmixwg"; depends=[ggplot2 gplots msm Rlab sva yaml]; }; + ASURAT = derive2 { name="ASURAT"; version="1.2.0"; sha256="1n5wvdyf80c0yhw8mxzkawxk0bkvy3qysxb9vgw1pj75nrp7ml7i"; depends=[circlize cluster ComplexHeatmap plot3D Rcpp S4Vectors SingleCellExperiment SummarizedExperiment]; }; + ASpediaFI = derive2 { name="ASpediaFI"; version="1.11.0"; sha256="13jny6ca8hdf269z37baaggfs7jss00ln09apn42pj411g3p7nms"; depends=[BiocParallel biomaRt dplyr DRaWR e1071 fgsea GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 Gviz igraph IRanges IVAS limma Matrix reshape2 ROCR Rsamtools rtracklayer S4Vectors scales SummarizedExperiment]; }; + ASpli = derive2 { name="ASpli"; version="2.8.0"; sha256="0gwp5ijpxjy6hd1090cmwbfrfac1qqrzxc06n1j89c0va7wm9l4k"; depends=[AnnotationDbi BiocGenerics BiocStyle data_table DT edgeR GenomicAlignments GenomicFeatures GenomicRanges Gviz htmltools igraph IRanges limma MASS pbmcapply Rsamtools S4Vectors tidyr UpSetR]; }; + ATACCoGAPS = derive2 { name="ATACCoGAPS"; version="1.0.0"; sha256="1n389l4b17j6q36irpd3gbdn5hlfk47315rx30jmsiwyid17qm4j"; depends=[BSgenome_Hsapiens_UCSC_hg19 BSgenome_Mmusculus_UCSC_mm10 chromVAR CoGAPS dplyr fgsea GeneOverlap GenomicFeatures GenomicRanges gplots gtools Homo_sapiens IRanges JASPAR2016 motifmatchr msigdbr Mus_musculus projectR rGREAT stringr TFBSTools tidyverse]; }; + ATACseqQC = derive2 { name="ATACseqQC"; version="1.22.0"; sha256="12ggi2dzf8qyzjrxprvk099f61yrabg2d84iqnjxzrn77v6z19b2"; depends=[BiocGenerics Biostrings BSgenome ChIPpeakAnno edgeR GenomeInfoDb GenomicAlignments GenomicRanges GenomicScores IRanges KernSmooth limma motifStack preseqR randomForest Rsamtools rtracklayer S4Vectors]; }; + ATACseqTFEA = derive2 { name="ATACseqTFEA"; version="1.0.1"; sha256="0p7cs8a6ywh4k80q3hjbh8gd3599209li8igzkilaa4z7gvhj0fi"; depends=[BiocGenerics dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 ggrepel IRanges limma Matrix motifmatchr pracma Rsamtools S4Vectors SummarizedExperiment TFBSTools]; }; + AUCell = derive2 { name="AUCell"; version="1.20.2"; sha256="1qb13qd5xzgrpx6jlg3ll0ff5spz3y06ji31vvqzm759almg2w3s"; depends=[BiocGenerics data_table DelayedArray DelayedMatrixStats GSEABase Matrix mixtools R_utils shiny SummarizedExperiment]; }; + AWFisher = derive2 { name="AWFisher"; version="1.12.0"; sha256="1psbxxrwb6mk2jwjw963vwdczb3i5590rcm7hk43kpiw45i1q1j9"; depends=[edgeR limma]; }; + AffiXcan = derive2 { name="AffiXcan"; version="1.16.0"; sha256="1jsdl477qhsq3rpqvgdm7navr4izpppfkiw0fvlhxwspgp3fjs6c"; depends=[BiocParallel crayon MultiAssayExperiment SummarizedExperiment]; }; + AffyCompatible = derive2 { name="AffyCompatible"; version="1.58.0"; sha256="1bg7iqasvfsgd9x3ykgpblqnz1q06g3ifmzj4jf2kn8kxj63wfbl"; depends=[Biostrings RCurl XML]; }; + AffyRNADegradation = derive2 { name="AffyRNADegradation"; version="1.44.0"; sha256="1n6x2c0h6xmcll7mxq4n1y8ahqfmba8ppdcrjk9hf3nh5wngprkz"; depends=[affy]; }; + AgiMicroRna = derive2 { name="AgiMicroRna"; version="2.48.0"; sha256="0q3hynyd4dhhh1a2b27y3rrshgvxfwv17k7yabh6g4pc12c33mf7"; depends=[affy affycoretools Biobase limma preprocessCore]; }; + AllelicImbalance = derive2 { name="AllelicImbalance"; version="1.36.0"; sha256="0zn8pp4pl5wr957mf6agjpn61f9qpnjx0nbxb5wnbr40672x0263"; 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.12.0"; sha256="000apg879li9wkbyrl8cm73z6h0xasqp41h9ir9hywy2v38rmc5b"; depends=[BiocParallel data_table dplyr expm ggplot2 gtools igraph optimx plotly stringr]; }; + AlpsNMR = derive2 { name="AlpsNMR"; version="4.0.2"; sha256="1y4qqc6l8flv5ns4qwzjwmcykm6zcm4jg097mn8xyp7mnxymy7pl"; depends=[baseline BiocParallel dplyr fs future generics ggplot2 glue htmltools magrittr matrixStats mixOmics pcaPP purrr readxl reshape2 rlang rmarkdown scales signal speaq stringr tibble tidyr tidyselect vctrs]; }; + AnVIL = derive2 { name="AnVIL"; version="1.10.1"; sha256="0iqsffkrxv28g9cddx2w05f2dbscwxhh6bpizwa8xaxhvn5bcpsv"; depends=[BiocManager dplyr DT futile_logger htmltools httr jsonlite miniUI rapiclient rlang shiny tibble tidyr tidyselect]; }; + AnVILBilling = derive2 { name="AnVILBilling"; version="1.8.0"; sha256="13qcp2s012ai44dkddk71ga44y87jnl0vljyd93lj1dlh8nw7c00"; depends=[bigrquery DBI dplyr DT ggplot2 lubridate magrittr plotly shiny shinytoastr]; }; + AnVILPublish = derive2 { name="AnVILPublish"; version="1.8.0"; sha256="1i5zf7pyrzi6v13gpscmdb5qdb5gknicc8fk9s9nmsl1wpj6wlsw"; depends=[AnVIL httr jsonlite readr rmarkdown whisker yaml]; }; + Anaquin = derive2 { name="Anaquin"; version="2.22.0"; sha256="08y2syaacy15rxcf3x2r3906kfm58fkx7ainaqvy5inlc9f670j5"; depends=[DESeq2 ggplot2 knitr locfit plyr qvalue ROCR]; }; + AneuFinder = derive2 { name="AneuFinder"; version="1.26.0"; sha256="154cg63n7h9h5jkj00aqf0hzbmmjg16bzvvk50fyixwq0a4q1j00"; depends=[AneuFinderData bamsignals BiocGenerics Biostrings cowplot DNAcopy doParallel ecp foreach GenomeInfoDb GenomicAlignments GenomicRanges ggdendro ggplot2 ggrepel IRanges mclust reshape2 Rsamtools S4Vectors]; }; + AnnotationDbi = derive2 { name="AnnotationDbi"; version="1.60.0"; sha256="1srv0jizmwgmsmgb9cfgy5nbgd3jsgxgzzax6wfsahckb5zihrqp"; depends=[Biobase BiocGenerics DBI IRanges KEGGREST RSQLite S4Vectors]; }; + AnnotationFilter = derive2 { name="AnnotationFilter"; version="1.22.0"; sha256="0m16kfssxbblf03ykawkmqa038cl90prhb23k6y88g2hwm00wynk"; depends=[GenomicRanges lazyeval]; }; + AnnotationForge = derive2 { name="AnnotationForge"; version="1.40.0"; sha256="15shh8rmcx69g3zd256720vh0c3qbly5zrvwm463dws41cjla48x"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl RSQLite S4Vectors XML]; }; + AnnotationHub = derive2 { name="AnnotationHub"; version="3.6.0"; sha256="1hk02q6mwx49khbhydndfa1qry8ylhmwz2dff8845a510hm0di7n"; depends=[AnnotationDbi BiocFileCache BiocGenerics BiocManager BiocVersion curl dplyr httr interactiveDisplayBase rappdirs RSQLite S4Vectors yaml]; }; + AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.28.0"; sha256="0mcx09kcxccw2gkf4c3w7sxgb7v3gwbvahvx9wgq8f93q85yzg95"; 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.57.0"; sha256="1fzi951mjc4kbkkvlfvwlfrpfnjckkmw4xz4m5dapy1z2jkgp8w6"; depends=[Biobase limma oligo XML]; }; + ArrayExpressHTS = derive2 { name="ArrayExpressHTS"; version="1.47.0"; sha256="0fndc7xifzj2wq8si8q8zjjkly5ckgr28jrm3m887s7kivbvjzvv"; 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.16.0"; sha256="125qkjsjyxp6zk3nzfamakyfgm7wd7w9vv1vn7xyyylpqpa8rpml"; depends=[Biostrings DECIPHER GenomicRanges IRanges]; }; + BAC = derive2 { name="BAC"; version="1.58.0"; sha256="00dkhns9n1x4wmlxjcw75h7iwwk37zlv1c2fi0g1mmsw1xvdjzp6"; depends=[]; }; + BADER = derive2 { name="BADER"; version="1.36.0"; sha256="1hkvmfik4m2yw5xg4k2g551l27i64blbsdvp1kmvvyix66p53hsr"; depends=[]; }; + BAGS = derive2 { name="BAGS"; version="2.38.0"; sha256="0rnaahbdqpgl666w9xlm6prrrnks2k6p83r625j1lcj2v533232r"; depends=[Biobase breastCancerVDX]; }; + BANDITS = derive2 { name="BANDITS"; version="1.14.0"; sha256="18xq8gg1j07gbbxy7r0cc34zwn40mh4fr39zzi8l3z0cymw73qs8"; depends=[BiocParallel data_table doParallel doRNG DRIMSeq foreach ggplot2 MASS R_utils Rcpp RcppArmadillo]; }; + BASiCS = derive2 { name="BASiCS"; version="2.10.2"; sha256="06mp74kchxj2gq0n4rgxfvsm2p92hwd0zy05zq5fnig8mkqkq8sq"; depends=[assertthat Biobase BiocGenerics BiocParallel coda cowplot ggExtra ggplot2 hexbin MASS Matrix matrixStats Rcpp RcppArmadillo reshape2 S4Vectors scran scuttle SingleCellExperiment SummarizedExperiment viridis]; }; + BASiCStan = derive2 { name="BASiCStan"; version="1.0.0"; sha256="1an4kiipb3y1xixynpka0k2pdsi7a4s6h2mw2yfnwab1q6qf97kj"; depends=[BASiCS BH glmGamPoi Rcpp RcppEigen RcppParallel rstan rstantools scran scuttle SingleCellExperiment StanHeaders SummarizedExperiment]; }; + BBCAnalyzer = derive2 { name="BBCAnalyzer"; version="1.28.0"; sha256="01n9msbnr4x6hjlvz9z43lyrbxnmhi6bc655ir4cq0vizm1mk84m"; depends=[Biostrings GenomicRanges IRanges Rsamtools SummarizedExperiment VariantAnnotation]; }; + BCRANK = derive2 { name="BCRANK"; version="1.60.0"; sha256="01ibjaym2kyv4x0fwv8mk5mq550lm1pqgrq40spmyrgb4vnwkh0h"; depends=[Biostrings]; }; + BDMMAcorrect = derive2 { name="BDMMAcorrect"; version="1.16.0"; sha256="0d73w5pcca6d4dscw12hwy823ls4xhvdyi2xbiixm9n0rx23wls1"; depends=[ape ellipse ggplot2 Rcpp RcppArmadillo RcppEigen SummarizedExperiment vegan]; }; + BEARscc = derive2 { name="BEARscc"; version="1.18.0"; sha256="1j430ijy2b2j5x1y276vya25pw0qrcl2q11smr394jf4b9hm60qr"; depends=[data_table ggplot2 SingleCellExperiment]; }; + BEAT = derive2 { name="BEAT"; version="1.36.0"; sha256="0b48ravaaqbqvw35bamalrjnp77gqf13rp11wpd86m9ghpjl4gr0"; depends=[Biostrings BSgenome GenomicRanges ShortRead]; }; + BEclear = derive2 { name="BEclear"; version="2.14.0"; sha256="05znaj2fialxi937mhj2dlrm3v4j2wgqafcy78qrkz7xxn13pr01"; depends=[abind BiocParallel data_table dixonTest futile_logger ids Matrix Rcpp Rdpack]; }; + BGmix = derive2 { name="BGmix"; version="1.58.0"; sha256="0r4cxrjvf3qr5514lsw1s53h4by3djb9ipkz7bi979w343dn9xfx"; depends=[KernSmooth]; }; + BHC = derive2 { name="BHC"; version="1.50.0"; sha256="0ryd9lg8pywqlxj802y9jad5nxy40ivnzdq2ldldypwyalgk9ahm"; depends=[]; }; + BLMA = derive2 { name="BLMA"; version="1.22.0"; sha256="0jxxf4g0j5prarjq18ab435h963h1d7mlb4ssj2919lf98rhxl0r"; depends=[Biobase graph GSA limma metafor PADOG ROntoTools]; }; + BOBaFIT = derive2 { name="BOBaFIT"; version="1.2.0"; sha256="0shv241jkzcyp1mydxpg6sjf74zxmc8dpsxdniw7c6arjfv4b39z"; depends=[dplyr GenomicRanges ggbio ggforce ggplot2 magrittr NbClust plyranges stringr tidyr]; }; + BPRMeth = derive2 { name="BPRMeth"; version="1.24.0"; sha256="0w97b34d6i0n4bvq8a63da1bnkmhhd2sclwhsixlacisgy5hdfls"; depends=[assertthat BiocStyle cowplot data_table doParallel e1071 earth foreach GenomicRanges ggplot2 IRanges kernlab magrittr MASS matrixcalc mvtnorm randomForest Rcpp RcppArmadillo S4Vectors truncnorm]; }; + BRAIN = derive2 { name="BRAIN"; version="1.44.0"; sha256="1rp2aa7jigi8h3qa55a1pf5zj06a5fpyqxwpc92w8gb0flmmdbn8"; depends=[Biostrings lattice PolynomF]; }; + BRGenomics = derive2 { name="BRGenomics"; version="1.10.0"; sha256="1mdf8v2768vm1wfrcia9cs0biv51hybwa6nraddhccx25cnz1prj"; depends=[DESeq2 GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; + BSgenome = derive2 { name="BSgenome"; version="1.66.1"; sha256="1gzpvajw5n3qmym3312qaks450sq3w456kj4gqwaabgpjxbq7frm"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges matrixStats Rsamtools rtracklayer S4Vectors XVector]; }; + BUMHMM = derive2 { name="BUMHMM"; version="1.22.0"; sha256="1llxj25bjq68963nvr4b1n84400w6qb2gaa8jv7if4w8kslv5wvf"; depends=[Biostrings devtools gtools IRanges stringi SummarizedExperiment]; }; + BUS = derive2 { name="BUS"; version="1.54.0"; sha256="1bv50vx4dyb1cz502nqknyss5vfh9cwnms65gcyrii5xydjxr1ch"; depends=[infotheo minet]; }; + BUScorrect = derive2 { name="BUScorrect"; version="1.16.0"; sha256="05a8sn7rd4d3qx46gr742aqgf0968ni2s238z0gxbg8sifjphii7"; depends=[gplots SummarizedExperiment]; }; + BUSpaRse = derive2 { name="BUSpaRse"; version="1.12.0"; sha256="1hnlgqd6igcpq6kfmj82v1m07ndq3nsx4iiv3j37gxy5pi367026"; depends=[AnnotationDbi AnnotationFilter BH BiocGenerics biomaRt Biostrings BSgenome dplyr ensembldb GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges magrittr Matrix plyranges Rcpp RcppArmadillo RcppProgress S4Vectors stringr tibble tidyr zeallot]; }; + BUSseq = derive2 { name="BUSseq"; version="1.4.0"; sha256="0ydryxgas192fsyvivwjjrghz9jgxnvaq3igchmwvl50yxnggmzb"; depends=[gplots S4Vectors SingleCellExperiment SummarizedExperiment]; }; + BaalChIP = derive2 { name="BaalChIP"; version="1.24.0"; sha256="16s67v6mkv14dkk1r7c50brm7198b84h87h1wrahmrrcnzq8pi0n"; depends=[coda doBy doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges reshape2 Rsamtools scales]; }; + BadRegionFinder = derive2 { name="BadRegionFinder"; version="1.26.0"; sha256="0bsgdjchwsfc8aiwiacr454kw97dbymq6v450m1fx7hxmmpqz1sm"; depends=[biomaRt GenomicRanges Rsamtools S4Vectors VariantAnnotation]; }; + BaseSpaceR = derive2 { name="BaseSpaceR"; version="1.42.0"; sha256="07pqs0jkwcbxavc65sanvhvzc9spkk46bqnwz162f3pvrz15b5h7"; depends=[RCurl RJSONIO]; }; + Basic4Cseq = derive2 { name="Basic4Cseq"; version="1.34.0"; sha256="1zzh7d9c319lfncz73i1mcldiinqfss0b2jl0nhm836ygksykc3x"; depends=[Biostrings BSgenome_Ecoli_NCBI_20080805 caTools GenomicAlignments GenomicRanges RCircos]; }; + BasicSTARRseq = derive2 { name="BasicSTARRseq"; version="1.26.0"; sha256="1yk4zpgwy5dcgimqp9w7hscvg2irgr281f8zv8rp576c8xbzqgqz"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges S4Vectors]; }; + BatchQC = derive2 { name="BatchQC"; version="1.26.0"; sha256="1rjqldr9vp8ppcwbclm8cvkpsncss31n449s6nsczmv517mjna1q"; depends=[corpcor ggvis gplots heatmaply knitr limma Matrix matrixStats MCMCpack moments pander reshape2 rmarkdown shiny sva]; }; + BayesKnockdown = derive2 { name="BayesKnockdown"; version="1.24.0"; sha256="1r4d3h6fvn946czpf81prqwycvkgmzlcypy8dl54diagvdp3dr9y"; depends=[Biobase]; }; + BayesSpace = derive2 { name="BayesSpace"; version="1.8.0"; sha256="1hqlr82fribkw9vs7fjwqr0impz7f5wfdm7q19ny17k8ald6mh21"; depends=[assertthat BiocFileCache BiocSingular coda DirichletReg ggplot2 Matrix mclust purrr Rcpp RcppArmadillo RcppDist RcppProgress RCurl rhdf5 S4Vectors scales scater scran SingleCellExperiment SummarizedExperiment xgboost]; }; + BeadDataPackR = derive2 { name="BeadDataPackR"; version="1.50.0"; sha256="0309cvc9aq4nb06zysb7jvzd844pvw6jbjiqwhar6fg01cx255j0"; depends=[]; }; + BgeeCall = derive2 { name="BgeeCall"; version="1.14.0"; sha256="05w6b10vc4mmwdqnkcj7vnfigk03f03n776vqhlb38k0lx8k4hk3"; depends=[biomaRt Biostrings data_table dplyr GenomicFeatures jsonlite rhdf5 rslurm rtracklayer sjmisc tximport]; }; + BgeeDB = derive2 { name="BgeeDB"; version="2.24.0"; sha256="14fja1dikzq60zjx1arcv1q16qd0hmibqjy0nbaivmk3zh16spkc"; depends=[Biobase curl data_table digest dplyr graph R_utils RCurl RSQLite tidyr topGO]; }; + BiFET = derive2 { name="BiFET"; version="1.18.0"; sha256="0awzq3i7ga6jsh7xgmrpzz8klx69p8cxj73p6h7ya43bgcr0iff0"; depends=[GenomicRanges poibin]; }; + BiGGR = derive2 { name="BiGGR"; version="1.34.0"; sha256="07b80qpkbas3x2yhndcm6vdkba0cpricyvnjf18dxklj5j612wfy"; depends=[hyperdraw hypergraph LIM limSolve rsbml stringr]; }; + BiRewire = derive2 { name="BiRewire"; version="3.30.0"; sha256="0nr40nm87qzbni3w0cik887csc899jh7j8z82i94v15fc30vfilh"; depends=[igraph Matrix Rtsne slam]; }; + BiSeq = derive2 { name="BiSeq"; version="1.38.0"; sha256="0k9s0l2whvlhb2zmp7119drb8nlv8nlmipvws42vb87xb9hg4a4g"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; }; + BicARE = derive2 { name="BicARE"; version="1.56.0"; sha256="1z7x30705a4ww9vdam2668pk064na5ispigqnaqy8zqvlfvp3c8d"; depends=[Biobase GSEABase multtest]; }; + BindingSiteFinder = derive2 { name="BindingSiteFinder"; version="1.4.0"; sha256="01gazqcvw9z112wlcljmb83vxz3bns9wgbfsccr54h8c957ynpbq"; depends=[dplyr GenomeInfoDb GenomicRanges ggforce ggplot2 Gviz matrixStats plyr rtracklayer S4Vectors tibble tidyr]; }; + BioCor = derive2 { name="BioCor"; version="1.22.0"; sha256="0a8xyrmarb2ja5zyvx5sndd67hylmwi29gpr5lwrzinww8w8b8w6"; depends=[BiocParallel GSEABase Matrix]; }; + BioMM = derive2 { name="BioMM"; version="1.14.0"; sha256="06c36lpbmcz0s8v6dsjbmlmisab3h02jx67ycwlnymfwzw1hq1cb"; depends=[BiocParallel CMplot e1071 ggplot2 glmnet imager lattice nsprcomp precrec ranger rms topGO vioplot xlsx]; }; + BioMVCClass = derive2 { name="BioMVCClass"; version="1.66.0"; sha256="1xclmwxps7yvqnaw8kn6z4mlpx6v8xfzyly4cadsjaj2qm535xxk"; depends=[Biobase graph MVCClass Rgraphviz]; }; + BioNAR = derive2 { name="BioNAR"; version="1.0.0"; sha256="1z0ln7j4ack0pv8bzxjfrq6ncsnd0jif5s42njm94c7j408fj9kz"; depends=[AnnotationDbi clusterCons dplyr fgsea ggplot2 ggrepel GO_db igraph latex2exp org_Hs_eg_db poweRlaw Rdpack RSpectra rSpectral scales stringr synaptome_db WGCNA]; }; + BioNERO = derive2 { name="BioNERO"; version="1.6.0"; sha256="10nwgp8a9chn33p5k7cdp920rraiw187xfrylyd9bq010c7vp7xh"; depends=[BiocParallel ComplexHeatmap dynamicTreeCut GENIE3 ggnetwork ggnewscale ggplot2 ggrepel igraph intergraph matrixStats minet NetRep networkD3 patchwork RColorBrewer reshape2 SummarizedExperiment sva WGCNA]; }; + BioNet = derive2 { name="BioNet"; version="1.58.0"; sha256="12c6m7dzwkdh4bk1c5xmzm5ajrsba7v62mag1f3rrpmrapdh6s0j"; depends=[AnnotationDbi Biobase graph igraph RBGL]; }; + BioNetStat = derive2 { name="BioNetStat"; version="1.18.0"; sha256="1h99d6gnqw5v9ha2169zfhw9cvxhyjgkf4zm8qj1i03h2cywapgv"; depends=[BiocParallel DT ggplot2 Hmisc igraph knitr markdown pathview pheatmap plyr psych RColorBrewer RJSONIO rmarkdown shiny shinyBS whisker yaml]; }; + BioQC = derive2 { name="BioQC"; version="1.26.0"; sha256="1ssxsxdm8vmlrmvvdz5p98apd3xsal1h3ss8556g83kgw830zsxf"; depends=[Biobase edgeR Rcpp]; }; + BioTIP = derive2 { name="BioTIP"; version="1.12.0"; sha256="1n90n4vz0cwz8irwpmrkm9qcyvk5rssl2v6wrzny4zwhzjkmvlni"; depends=[cluster GenomicRanges igraph MASS psych scran stringr]; }; + Biobase = derive2 { name="Biobase"; version="2.58.0"; sha256="0rp541nphbcya6kbk1nzrrb05g5m6pxb3yqz5cj873di9vsqlyfv"; depends=[BiocGenerics]; }; + BiocBaseUtils = derive2 { name="BiocBaseUtils"; version="1.0.0"; sha256="0p6siidrx8q6qr36fc67hzi091m2zwik3zngj27yllbfz6sn5k69"; depends=[]; }; + BiocCheck = derive2 { name="BiocCheck"; version="1.34.2"; sha256="1zj43kbzvi2ws8c182fp6vn5r6iiqsr6p2iyy3k8n3ifm2acqw2h"; depends=[BiocManager biocViews codetools graph httr knitr stringdist]; }; + BiocDockerManager = derive2 { name="BiocDockerManager"; version="1.10.0"; sha256="13l5shmiiv4wl9m5xnwzagjxqrchjg9znvcgf7hv8f263l2yc8qm"; depends=[dplyr httr memoise readr whisker]; }; + BiocFHIR = derive2 { name="BiocFHIR"; version="1.0.0"; sha256="1b0mychyv778cf2jmib15jpjmh83s4sjr69qrjgmv0c7kvv4msf7"; depends=[BiocBaseUtils DT graph igraph jsonlite shiny tidyr visNetwork]; }; + BiocFileCache = derive2 { name="BiocFileCache"; version="2.6.0"; sha256="0skrvmkm6ch8gbpdi4wr59zk5vxzxs7cyqvz3jhki9d8w492wylg"; depends=[curl DBI dbplyr dplyr filelock httr rappdirs RSQLite]; }; + BiocGenerics = derive2 { name="BiocGenerics"; version="0.44.0"; sha256="17dhr7vaph8dnvyklszyas7y8i64mxqxhnfhb6q3l47gq5if8645"; depends=[]; }; + BiocIO = derive2 { name="BiocIO"; version="1.8.0"; sha256="15d4xsn3k32q7lzcyxvs70f0jbh9fgwl3vi7xd6sqpggar12hh9f"; depends=[BiocGenerics S4Vectors]; }; + BiocNeighbors = derive2 { name="BiocNeighbors"; version="1.16.0"; sha256="09f00rf5gwwlxxaycsciq4l53gjg5kjayx8xzhns2yf1fv297j9p"; depends=[BiocParallel Matrix Rcpp RcppHNSW S4Vectors]; }; + BiocOncoTK = derive2 { name="BiocOncoTK"; version="1.18.0"; sha256="1x4mzzjvjgcxg5xyxjib8r2n55hpf2vzcci0xkb7d8frakfncn9s"; depends=[bigrquery car ComplexHeatmap curatedTCGAData DBI dplyr DT GenomicFeatures GenomicRanges ggplot2 ggpubr graph httr IRanges magrittr plyr Rgraphviz rjson S4Vectors scales shiny SummarizedExperiment]; }; + BiocParallel = derive2 { name="BiocParallel"; version="1.32.4"; sha256="1m4i27zx3ajwygwp38lrxf36rs575dkaxxc6jawpj1kzn7whi5ym"; depends=[BH codetools cpp11 futile_logger snow]; }; + BiocPkgTools = derive2 { name="BiocPkgTools"; version="1.16.0"; sha256="1av7vnw6z9cw7j4d3vpi8mfs5h4pn4yr2wc8ybg7ad1d686ah845"; depends=[BiocFileCache BiocManager biocViews dplyr DT gh graph htmltools htmlwidgets httr igraph jsonlite magrittr RBGL readr rlang rorcid rvest stringr tibble xml2]; }; + BiocSet = derive2 { name="BiocSet"; version="1.12.0"; sha256="197cy5gdlvac7jqwb4dm4dbqfms2nvc3paqs75nsg9mpp1h5z8l8"; depends=[AnnotationDbi BiocIO dplyr KEGGREST ontologyIndex plyr rlang S4Vectors tibble tidyr]; }; + BiocSingular = derive2 { name="BiocSingular"; version="1.14.0"; sha256="041izymcifvi0pa97fh5000bwlyl0mdk9003i5bbvlld6mbbv2kk"; depends=[beachmat BiocGenerics BiocParallel DelayedArray irlba Matrix Rcpp rsvd S4Vectors ScaledMatrix]; }; + BiocSklearn = derive2 { name="BiocSklearn"; version="1.20.0"; sha256="049j8rq17k84mw4pa9zgcn6814bdq4m5xcrxp730j183h8wly742"; depends=[basilisk basilisk_utils reticulate SummarizedExperiment]; }; + BiocStyle = derive2 { name="BiocStyle"; version="2.26.0"; sha256="092hpmyhra755j32vc8w2l6xqwg09jm8apnk5rvxi1cm5034yvsl"; depends=[BiocManager bookdown knitr rmarkdown yaml]; }; + BiocVersion = derive2 { name="BiocVersion"; version="3.16.0"; sha256="1djp23y131dyx4g22f9r7an177bq0mky94bvpqvc8b14166g0ynw"; depends=[]; }; + BiocWorkflowTools = derive2 { name="BiocWorkflowTools"; version="1.24.0"; sha256="00cy5lqmfap57bm2s00bis9ddci2lv1lrp0mk5ydgx061p4ym29i"; depends=[BiocStyle bookdown git2r httr knitr rmarkdown rstudioapi stringr usethis]; }; + Biostrings = derive2 { name="Biostrings"; version="2.66.0"; sha256="1z86s8ncl91pxcjnv8fwvgwjjnd384dn5paylwyymrigph4ca4kk"; depends=[BiocGenerics crayon GenomeInfoDb IRanges S4Vectors XVector]; }; + BitSeq = derive2 { name="BitSeq"; version="1.41.0"; sha256="185cssrvaw2x0r3y5fqnfqm31924ccwg33qpj3v8ywrh3x7qn22p"; depends=[IRanges Rhtslib Rsamtools S4Vectors]; }; + BloodGen3Module = derive2 { name="BloodGen3Module"; version="1.6.0"; sha256="01hxz2y906lx848pw64j78bwzm5yx9cjw0yshicnv0n2kbw1w53g"; depends=[circlize ComplexHeatmap ExperimentHub ggplot2 gtools limma matrixStats preprocessCore randomcoloR reshape2 SummarizedExperiment testthat V8]; }; + BrainSABER = derive2 { name="BrainSABER"; version="1.8.0"; sha256="1nxcjvaip7pp387bhdc2pmjai3chib1n63ig0cslhppzzjp2y6jd"; depends=[BiocFileCache biomaRt data_table lsa S4Vectors shiny SummarizedExperiment]; }; + BridgeDbR = derive2 { name="BridgeDbR"; version="2.8.0"; sha256="03zpgd836c4qdbp8fmz0yb20pdyszs2pra9ih3b68pv4b6rx25jz"; depends=[curl rJava]; }; + BrowserViz = derive2 { name="BrowserViz"; version="2.20.0"; sha256="010hmaba81swqsv0nqzs3ybg31n0b9zyjgxgp270az4bkrw59gjs"; depends=[BiocGenerics httpuv jsonlite]; }; + BubbleTree = derive2 { name="BubbleTree"; version="2.28.0"; sha256="0rw7127hgpzw7akga8daw6gzlqfamx347l53v6sx05xdgn451097"; depends=[Biobase BiocGenerics BiocStyle biovizBase dplyr e1071 GenomicRanges ggplot2 gridExtra gtable gtools IRanges limma magrittr plyr RColorBrewer WriteXLS]; }; + BufferedMatrix = derive2 { name="BufferedMatrix"; version="1.62.0"; sha256="08b8pm1vkwvkbv3dqldb9h1n7aiwih7dw66w8ag1xjp0sn9v9d7d"; depends=[]; }; + BufferedMatrixMethods = derive2 { name="BufferedMatrixMethods"; version="1.62.0"; sha256="1b0c0dick3gxdlrfjgx4dpgaqry5rd9gmpvdinfs94f9bfp89xyf"; depends=[BufferedMatrix]; }; + BumpyMatrix = derive2 { name="BumpyMatrix"; version="1.6.0"; sha256="1w7vfmpjhm2jdykzfqkfwz0hg52c3h1d3kq3j0mh340l0pc0bdzx"; depends=[IRanges Matrix S4Vectors]; }; + CAEN = derive2 { name="CAEN"; version="1.6.0"; sha256="04zdsvkdb532l9bnm14p5ycq4wjqgvvjsr9cq6gwsa87ly1wf72l"; depends=[PoiClaClu SummarizedExperiment]; }; + CAFE = derive2 { name="CAFE"; version="1.34.0"; sha256="03riynxr0gqf5qapplr78sffbdv52x3vp6x5yjzai09xhky9qa7s"; depends=[affy annotate Biobase biovizBase GenomicRanges ggbio ggplot2 gridExtra IRanges]; }; + CAGEfightR = derive2 { name="CAGEfightR"; version="1.18.0"; sha256="1iw8bf7dcgg3vd5l29pcrvbrx3ksc3dlp5nbhcfcqp5mgr65j4ny"; depends=[assertthat BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicInteractions GenomicRanges Gviz InteractionSet IRanges Matrix pryr rtracklayer S4Vectors SummarizedExperiment]; }; + CAGEr = derive2 { name="CAGEr"; version="2.4.0"; sha256="1lcajai32pnnjv4yp6flblv37a0f54mz4sxv6jljpgw6iyfy49p0"; 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.54.0"; sha256="17ygir00xjjxwlgmlxm0sw5sf645fxabjdziw4ja1ia641cpd6mm"; depends=[Biobase graph Hmisc igraph RBGL xcms]; }; + CARNIVAL = derive2 { name="CARNIVAL"; version="2.8.0"; sha256="0qdydrrdim99aggm001380r8g6vny4wxb6kx2dbhk7b283whx0q3"; depends=[dplyr igraph lpSolve readr rjson rmarkdown stringr tibble tidyr]; }; + CATALYST = derive2 { name="CATALYST"; version="1.22.0"; sha256="0n3x5w074x5hhgdf2qa0pkma4vrjwrcgjna7hx0az6ixkgpbkrpv"; 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]; }; + CBEA = derive2 { name="CBEA"; version="1.2.0"; sha256="0nycc7xql3f589pwdzw19pmvbhz3zxa88dkdq0746di9agn6wfdd"; depends=[BiocParallel BiocSet dplyr fitdistrplus generics glue goftest lmom magrittr mixtools Rcpp rlang SummarizedExperiment tibble tidyr TreeSummarizedExperiment]; }; + CCPROMISE = derive2 { name="CCPROMISE"; version="1.24.0"; sha256="1iwvmw7k64n41qggxjxk3jbhrhpdnwfgn6vbm3cy467kpfzbzrzg"; depends=[Biobase CCP GSEABase PROMISE]; }; + CEMiTool = derive2 { name="CEMiTool"; version="1.22.0"; sha256="15dm4ajhnf7wv1cs6kfpp4sxfqyl0x11d1bzjagwxk7c911p4a8x"; 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]; }; + CFAssay = derive2 { name="CFAssay"; version="1.32.0"; sha256="0lm7281d7gvdlkk35195zi2kjs0xj7jnr3gwkjgrvn6qhi0dk2vr"; depends=[]; }; + CGEN = derive2 { name="CGEN"; version="3.34.1"; sha256="12xnnnllpkgxi7vl8x97ib5mldh2b2kh66klhm1hkk0yfj3nrax8"; depends=[mvtnorm survival]; }; + CGHbase = derive2 { name="CGHbase"; version="1.58.0"; sha256="01n1z525h4h6yr3jfalgjg2g6lhd77sc3n33q0485x7l6xqv1dvp"; depends=[Biobase marray]; }; + CGHcall = derive2 { name="CGHcall"; version="2.60.0"; sha256="0860w2vf662qqii09pjdx85yl346jcldxiikhbwv0vg86blwb2g2"; depends=[Biobase CGHbase DNAcopy impute snowfall]; }; + CGHnormaliter = derive2 { name="CGHnormaliter"; version="1.52.0"; sha256="08s3mdsaqv92f6mjj4mg1m7b13zpfm7c144mv754pnpfay2slw88"; depends=[Biobase CGHbase CGHcall]; }; + CGHregions = derive2 { name="CGHregions"; version="1.56.0"; sha256="1r6zi99jfq14jgw4v7nvad2fans0nd08xyg03qmc1j37hsnac769"; depends=[Biobase CGHbase]; }; + CHETAH = derive2 { name="CHETAH"; version="1.14.0"; sha256="0cizc0i5gqbn12kd4l5ym35w3k2ydqf0nmdhn7p3486ivp81f5rq"; depends=[bioDist corrplot cowplot dendextend ggplot2 pheatmap plotly reshape2 S4Vectors shiny SingleCellExperiment SummarizedExperiment]; }; + CHRONOS = derive2 { name="CHRONOS"; version="1.26.0"; sha256="0akw9l0l23kc18d9m5sgfcsnc22py07k77l0wqikpsyjzvvj94aw"; depends=[biomaRt circlize doParallel foreach graph igraph openxlsx RBGL RCurl rJava XML]; }; + CIMICE = derive2 { name="CIMICE"; version="1.6.0"; sha256="0w3rx643ing2i1b71fhcmqm9pbrw7q206lk7ncml3gaaw13lf6hc"; depends=[assertthat dplyr expm ggcorrplot ggplot2 ggraph glue igraph maftools Matrix networkD3 purrr tidygraph tidyr visNetwork]; }; + CINdex = derive2 { name="CINdex"; version="1.26.0"; sha256="186akmq5s81849pa56f3cqdacrmip2h9i0n67qkv9jnxk1l3h2x3"; depends=[bitops dplyr GenomeInfoDb GenomicRanges gplots gridExtra IRanges png S4Vectors som stringr]; }; + CMA = derive2 { name="CMA"; version="1.56.0"; sha256="13qdhg5w1yga5sb4vack2srx5ly126g740wbxb55cg1kyqnzs1pd"; depends=[Biobase]; }; + CNAnorm = derive2 { name="CNAnorm"; version="1.44.1"; sha256="1f7y609q007mrjjwrs2q26yfgafaydim0van3v6p42x20k0n30y8"; depends=[DNAcopy]; }; + CNEr = derive2 { name="CNEr"; version="1.34.0"; sha256="15y27ca14fdhn2prqgkyikff7p7490xn0bp2c7cnwhw173mm1syw"; depends=[annotate BiocGenerics Biostrings DBI GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 GO_db IRanges KEGGREST poweRlaw R_utils readr reshape2 RSQLite rtracklayer S4Vectors XVector]; }; + CNORdt = derive2 { name="CNORdt"; version="1.40.0"; sha256="0ybxps1dnl7v7p68vkxqjr7f7zbmaqnh9x2gq1vzhcgzv767p1jz"; depends=[abind CellNOptR]; }; + CNORfeeder = derive2 { name="CNORfeeder"; version="1.38.0"; sha256="0y8wmm4sb28k4hk9cc59wqk1im79z13ahm232dcqh78772cw5w0h"; depends=[CellNOptR graph]; }; + CNORfuzzy = derive2 { name="CNORfuzzy"; version="1.40.0"; sha256="1d5ckcmj9dzxi5qxny0yqb6ygh0aqxfm31ccnr38awr9y2ysp9n1"; depends=[CellNOptR nloptr]; }; + CNORode = derive2 { name="CNORode"; version="1.40.0"; sha256="1f1699gwfvwsqmv7154h44jli5i49y8skha7p8mvawxm1cr86mg0"; depends=[CellNOptR genalg knitr]; }; + CNTools = derive2 { name="CNTools"; version="1.54.0"; sha256="18rl79i66z8d3addinp76krnyp9hzvprrihrksvcjkvrrl14adaz"; depends=[genefilter]; }; + CNVMetrics = derive2 { name="CNVMetrics"; version="1.2.0"; sha256="11i47ml2y5s8adh3qysasjl8b3w4xhg5h7v9rcdmd1hysjl4d4hi"; depends=[BiocParallel GenomicRanges gridExtra IRanges magrittr pheatmap S4Vectors]; }; + CNVPanelizer = derive2 { name="CNVPanelizer"; version="1.30.0"; sha256="02k6bbzaj7q87nsg9zqda8dz44q3wshsps5pzm2764gxcwn4sz0z"; 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.14.0"; sha256="1if6k9iakrvq0fw6j2xpd26l13ikkpni8px3w76c9z0wsvbjf0cc"; 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.12.1"; sha256="0jkd65ncsbgwrrg0xs8ycj2lm9ailrayqqd6a453sbhx74gjsnyy"; depends=[assertthat Biostrings CopyNumberPlots GenomeInfoDb GenomicRanges IRanges karyoploteR pracma regioneR Rsamtools SummarizedExperiment VariantAnnotation]; }; + CNVgears = derive2 { name="CNVgears"; version="1.6.0"; sha256="0gqw8l7pswamjm4j1jr8ri1rpf31szlx9ba6b99j3iypisxq1r1r"; depends=[data_table ggplot2]; }; + CNViz = derive2 { name="CNViz"; version="1.6.0"; sha256="1nm8k4ry8p6k8cb6bqi6dyffi48fyhv1gq1277cz1nys31y0pdnv"; depends=[CopyNumberPlots dplyr DT GenomicRanges karyoploteR magrittr plotly scales shiny]; }; + CNVrd2 = derive2 { name="CNVrd2"; version="1.36.0"; sha256="0jr9m08ip17l9w9i62nqdv13p5f3s7n0zyj4y3vy671s6c1syfiv"; depends=[DNAcopy ggplot2 gridExtra IRanges rjags Rsamtools VariantAnnotation]; }; + COCOA = derive2 { name="COCOA"; version="2.12.0"; sha256="01879lxdzxbg77sd5r8rw59kaa9s5jrsfnd2na68hsv41vhs64xf"; depends=[Biobase BiocGenerics ComplexHeatmap data_table fitdistrplus GenomicRanges ggplot2 IRanges MIRA S4Vectors simpleCache tidyr]; }; + CODEX = derive2 { name="CODEX"; version="1.30.0"; sha256="1wrxzdk0ldkb2svgi84gvmkg97m3fv71937harzhmwhfwbk2mlc6"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb IRanges Rsamtools S4Vectors]; }; + COHCAP = derive2 { name="COHCAP"; version="1.44.0"; sha256="0nmnvnz8qli5xxzdnps0ndyjniixd4qpm8kbigmyqi0zviha588i"; depends=[BH COHCAPanno gplots RColorBrewer Rcpp RcppArmadillo WriteXLS]; }; + COMPASS = derive2 { name="COMPASS"; version="1.36.0"; sha256="16wc5cipsl37707v1ffqpr55dks0m9ygv5a8v2llgdjd176dz1pd"; depends=[abind BiocStyle clue coda data_table dplyr foreach knitr magrittr pdist plyr RColorBrewer Rcpp reshape2 rlang rmarkdown scales tidyr]; }; + CONFESS = derive2 { name="CONFESS"; version="1.26.0"; sha256="10yz0nwssgak0gndw9py5yksdq1syb7dfa33kvkhf5ljwyxf955c"; depends=[changepoint cluster contrast data_table EBImage ecp flexmix flowClust flowCore flowMeans flowMerge flowPeaks foreach ggplot2 limma MASS moments outliers plotrix raster readbitmap reshape2 SamSPECTRAL waveslim wavethresh zoo]; }; + CONSTANd = derive2 { name="CONSTANd"; version="1.6.0"; sha256="1mkzmjqsm9kqlabw50d8jn0jqx2iad1wn10il4j473bhamanwqg4"; depends=[]; }; + CORREP = derive2 { name="CORREP"; version="1.64.0"; sha256="07pr5v8sqzlvag1yapaz01pl54c8ab1gdq2hinhwv2kiyyxpkq11"; depends=[e1071]; }; + COSNet = derive2 { name="COSNet"; version="1.32.0"; sha256="1w1rh8c7nwxwi9szkij1k675dp0rg0li2ppzskkwpxm6vddyspm8"; depends=[]; }; + COTAN = derive2 { name="COTAN"; version="1.2.0"; sha256="1i19p2a3c1z7j4fc88k2ynvk7siwbl320jhlnm2b3giim7rs9xp9"; depends=[circlize ComplexHeatmap dplyr ggplot2 ggrepel irlba Matrix Rfast rlang scales tibble tidyr]; }; + CRISPRseek = derive2 { name="CRISPRseek"; version="1.38.0"; sha256="1658awsdc1qqm3qss3h8cbnapahn9rd476rhfsrckcq7gdqqg69h"; depends=[BiocGenerics Biostrings BSgenome data_table DelayedArray dplyr GenomeInfoDb GenomicRanges hash IRanges keras mltools reticulate rhdf5 S4Vectors seqinr XVector]; }; + CRImage = derive2 { name="CRImage"; version="1.46.0"; sha256="0m097an8v06nx3alyj1gxz6i6g33ryrk1wc6pxia9kdb11rwzwkq"; depends=[aCGH DNAcopy e1071 EBImage foreach MASS sgeostat]; }; + CSAR = derive2 { name="CSAR"; version="1.50.0"; sha256="09js7lh1ga8l3kfkqc2vzrg83r3jckhcr5fdx1078sp2rc1dpv2y"; depends=[GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + CSSP = derive2 { name="CSSP"; version="1.36.0"; sha256="1hnpg6ba73h5r83g8ziiwcai8blan5piir8n1r7rnf6ixr20f352"; depends=[]; }; + CSSQ = derive2 { name="CSSQ"; version="1.10.0"; sha256="11msiwpk2swb5ijs59adp794fa50c42v6sb2i4hgpiayqfbmiiig"; depends=[GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; + CTDquerier = derive2 { name="CTDquerier"; version="2.6.0"; sha256="15p4fb3p1i3i2fy0n3qz8p9psikhdfk59wdypn0rivmp0g35rvdi"; depends=[BiocFileCache ggplot2 gridExtra igraph RCurl S4Vectors stringdist stringr]; }; + CTSV = derive2 { name="CTSV"; version="1.0.0"; sha256="11simigbrqlmr4b3ywi83zb6jc4f21ava9vyyk5y4qfndn16lijh"; depends=[BiocParallel knitr pscl qvalue SpatialExperiment SummarizedExperiment]; }; + CancerInSilico = derive2 { name="CancerInSilico"; version="2.18.0"; sha256="0szbz88wnr3dbf7k9bhihv6hkr29gsp9vrllr201wx5qfzl2gncy"; depends=[BH Rcpp]; }; + CancerSubtypes = derive2 { name="CancerSubtypes"; version="1.24.0"; sha256="1dp7h2bgpiy9ywv4l9gii1pkm1z7zsilpadb3l2piyd3r747dwy1"; depends=[cluster ConsensusClusterPlus impute limma NMF sigclust survival]; }; + Cardinal = derive2 { name="Cardinal"; version="3.0.1"; sha256="0n8760dfwc5qna6v4b7sxwr20rk10pj2alp259ypgmpb2ryk01sl"; depends=[Biobase BiocGenerics BiocParallel EBImage irlba magrittr Matrix matter mclust nlme ProtGenerics S4Vectors signal sp viridisLite]; }; + Category = derive2 { name="Category"; version="2.64.0"; sha256="1j62b3ycvb27p80k1a1qj4pdf8cjynf5fkj65v74c3l1hgl9qxnh"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI genefilter graph GSEABase Matrix RBGL]; }; + CausalR = derive2 { name="CausalR"; version="1.30.0"; sha256="0nxiwnln696v3hw1m19whpajzqfb6y0c9dn3v154l7n84v0j5wd2"; depends=[igraph]; }; + CeTF = derive2 { name="CeTF"; version="1.9.0"; sha256="07hzw8ynywfyvac3xm7llvs67mnlixjw5y9rz3sfvbfssnz5ihh2"; depends=[circlize clusterProfiler ComplexHeatmap DESeq2 dplyr GenomicTools_fileHandler GGally ggnetwork ggplot2 ggpubr ggrepel igraph Matrix network Rcpp RcppArmadillo RCy3 S4Vectors SummarizedExperiment]; }; + CellBarcode = derive2 { name="CellBarcode"; version="1.4.0"; sha256="0kiariwn252ri27gsdy7924i98akx8bmpgr76f7s395hrhlrc36d"; depends=[BH Biostrings Ckmeans_1d_dp data_table egg ggplot2 magrittr plyr Rcpp S4Vectors seqinr ShortRead stringr zlibbioc]; }; + CellBench = derive2 { name="CellBench"; version="1.14.0"; sha256="0p5bs7v5ya31z0hxaw52ccx8qv8yq86q6k0qcd2z20fia0f9471v"; depends=[BiocFileCache BiocGenerics BiocParallel dplyr glue lubridate magrittr memoise purrr rappdirs rlang SingleCellExperiment tibble tidyr tidyselect]; }; + CellMapper = derive2 { name="CellMapper"; version="1.24.0"; sha256="172bmzk5g18slvym5w557c9wy7irb0mp81kanwn1csk0va3cl9pc"; depends=[S4Vectors]; }; + CellMixS = derive2 { name="CellMixS"; version="1.14.0"; sha256="1nl39wrrfp7kfxmm0m2n1x9rgwyykxpkmbpgvipgs5rp818ghalg"; depends=[BiocGenerics BiocNeighbors BiocParallel cowplot dplyr ggplot2 ggridges kSamples magrittr purrr scater SingleCellExperiment SummarizedExperiment tidyr viridis]; }; + CellNOptR = derive2 { name="CellNOptR"; version="1.44.0"; sha256="1ym74v3kq6656vvd02y1m2czil9mgdr1bay3q6zlgcygmllq8n14"; depends=[ggplot2 graph igraph RBGL RCurl Rgraphviz rmarkdown stringi stringr XML]; }; + CellScore = derive2 { name="CellScore"; version="1.18.0"; sha256="1790p98zhjl3lpm4xcn3rjwizmzgpylzk7c0ndn5hlrz5ck3qmbm"; depends=[Biobase gplots lsa RColorBrewer squash]; }; + CellTrails = derive2 { name="CellTrails"; version="1.16.0"; sha256="02jwp5ypp32hs8sxgi8ifv62sadlpgd8g8i6i03yahwz7pd8d3ry"; depends=[Biobase BiocGenerics cba dendextend dtw EnvStats ggplot2 ggrepel igraph maptree mgcv reshape2 Rtsne SingleCellExperiment SummarizedExperiment]; }; + CellaRepertorium = derive2 { name="CellaRepertorium"; version="1.8.0"; sha256="144d1h73x4gbymjka5a4i5nvqj7fmmhw9kdq1a9qmf0bah2xwcv0"; depends=[BiocGenerics Biostrings dplyr forcats generics glue Matrix progress purrr Rcpp reshape2 rlang S4Vectors stringr tibble tidyr]; }; + CelliD = derive2 { name="CelliD"; version="1.6.0"; sha256="1qg14d4fv2wbwcs0gsw0vvn3lny9sdk3k1ybxci8sd847r7jrahm"; 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.4.0"; sha256="07ymk3kw0r8sdk3fyssh93ap3fx2xq5mhznksdvi2i1k4rv2pc07"; depends=[BiocParallel DelayedArray DelayedMatrixStats dplyr ggplot2 GSEABase HDF5Array patchwork reshape2 rlang S4Vectors SingleCellExperiment SummarizedExperiment]; }; + CexoR = derive2 { name="CexoR"; version="1.36.0"; sha256="0bd3kd3d67h3wbp7wbccwqppm3pfmvb45k4k13w772mawzr2k6ja"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; }; + ChAMP = derive2 { name="ChAMP"; version="2.28.0"; sha256="10ss0a3miqrx92vy1r1h5rv3mnjn4iyl32q86s0x59d3fvqp2cx1"; depends=[bumphunter ChAMPdata combinat dendextend DMRcate DNAcopy doParallel DT GenomicRanges ggplot2 globaltest goseq Hmisc Illumina450ProbeVariants_db IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b4_hg19 IlluminaHumanMethylationEPICmanifest illuminaio impute isva kpmt limma marray matrixStats minfi missMethyl plotly plyr preprocessCore prettydoc quadprog qvalue RColorBrewer rmarkdown RPMM shiny shinythemes sva wateRmelon]; }; + ChIC = derive2 { name="ChIC"; version="1.18.0"; sha256="1z00d2952qwscx5ljr7zvxm6kydmk188iiky0zprxl9hzp69iv17"; depends=[BiocGenerics caret caTools ChIC_data genomeIntervals GenomicRanges IRanges progress randomForest Rsamtools S4Vectors]; }; + ChIPComp = derive2 { name="ChIPComp"; version="1.28.0"; sha256="1wnc7zrnnxk3nlk2l9y4il75dzirndp4vs5ivxn5rzqr6p7h4bhw"; depends=[BiocGenerics BSgenome_Hsapiens_UCSC_hg19 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges limma Rsamtools rtracklayer S4Vectors]; }; + ChIPQC = derive2 { name="ChIPQC"; version="1.34.0"; sha256="1kkrr0i30m1mnp274db2q9rwrgsrc4659smck62r07k8dympdhk8"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors TxDb_Celegans_UCSC_ce6_ensGene TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene]; }; + ChIPXpress = derive2 { name="ChIPXpress"; version="1.42.0"; sha256="06yg5fvq0z63iz9jfpjl4bd5bzppz8ai9j3am1m5h1632xdlp3bh"; depends=[affy biganalytics bigmemory Biobase ChIPXpressData frma GEOquery]; }; + ChIPanalyser = derive2 { name="ChIPanalyser"; version="1.20.0"; sha256="04gdhzvhqnq2w0dcx2153bkg2ywrmz2zjg323sajl1gm32dn036g"; depends=[BiocManager Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges RColorBrewer RcppRoll ROCR rtracklayer S4Vectors]; }; + ChIPexoQual = derive2 { name="ChIPexoQual"; version="1.22.0"; sha256="0k4vbdwpp7z06fzjgqnmrx2yllayc0z2baj26bh4vji5vb48k9ik"; 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.32.0"; sha256="13syh3mvqpaqgfndcrwdmn7815f4myxhzjga9a9q3lspci25rvy6"; 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.34.1"; sha256="0jr9mc79di0r3xrc7m27vwk85qa4fpcwp4nb77pr9s6jbv23773r"; 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.52.0"; sha256="0h4bb676s8xz57pcwp421563fxapqpkxisikrjk6z5vb8c5az7vi"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; }; + ChIPsim = derive2 { name="ChIPsim"; version="1.52.0"; sha256="1g0i15lijpl0wrzcr9difblh6zi4ba1p2c5kvdgqjjnw5gc7c09i"; depends=[Biostrings IRanges ShortRead XVector]; }; + ChemmineOB = derive2 { name="ChemmineOB"; version="1.36.0"; sha256="0jm2igxkxzyfl6phxa1305cddfgslbrydbr26ngwy5403vhnfg1w"; depends=[BH BiocGenerics Rcpp zlibbioc]; }; + ChemmineR = derive2 { name="ChemmineR"; version="3.50.0"; sha256="0rk4ydanqxjh5yj0m9qlj06a12j7rkx9gxv6x7zpiyvnscahw63i"; depends=[base64enc BH BiocGenerics DBI digest DT ggplot2 gridExtra jsonlite png Rcpp RCurl rjson rsvg stringi]; }; + Chicago = derive2 { name="Chicago"; version="1.26.0"; sha256="1b24iiy6d5kzpixgpdkg4s1cb50jdrmgn9sjgvwr1qinckwz6zdn"; depends=[data_table Delaporte Hmisc MASS matrixStats]; }; + ChromHeatMap = derive2 { name="ChromHeatMap"; version="1.52.0"; sha256="1kfm73kma072g2hd4r65d7nq0ydnar7c63j658vjxi2r05yr6iaw"; depends=[annotate AnnotationDbi Biobase BiocGenerics GenomicRanges IRanges rtracklayer]; }; + ChromSCape = derive2 { name="ChromSCape"; version="1.8.0"; sha256="0zvvc826zqi88gr2m4lzgmc2mgh83f9vc6f033l77a367v7p5cnk"; depends=[batchelor BiocParallel colorRamps colourpicker ConsensusClusterPlus coop DelayedArray dplyr DT edgeR forcats fs GenomicRanges gggenes ggplot2 ggrepel gridExtra IRanges irlba jsonlite kableExtra Matrix matrixTests msigdbr plotly qs qualV Rcpp rlist Rsamtools rtracklayer Rtsne S4Vectors scater scran shiny shinycssloaders shinydashboard shinydashboardPlus shinyFiles shinyhelper shinyjs shinyWidgets SingleCellExperiment stringdist stringr SummarizedExperiment tibble tidyr umap viridis]; }; + CircSeqAlignTk = derive2 { name="CircSeqAlignTk"; version="1.0.0"; sha256="0jc63nmlkvx829h85fk8wh9sma200hv0g3a94slxhdiidnjph7l6"; depends=[BiocGenerics Biostrings dplyr ggplot2 IRanges magrittr Rbowtie2 Rhisat2 rlang Rsamtools S4Vectors ShortRead tidyr]; }; + CiteFuse = derive2 { name="CiteFuse"; version="1.10.0"; sha256="04zf5bvwqgr8rk4mzdglrbys62qsqgm4d5yzn2gpyk74qb8jcbir"; depends=[cowplot dbscan ggplot2 ggraph ggridges gridExtra igraph Matrix mixtools pheatmap randomForest reshape2 rhdf5 rlang Rtsne S4Vectors scales scran SingleCellExperiment SummarizedExperiment uwot]; }; + ClassifyR = derive2 { name="ClassifyR"; version="3.2.6"; sha256="0rbb0z1xixbgiig56n67cjqcnwgg3yj82bwg6zla5zm7i2mi72dc"; depends=[BiocParallel dplyr genefilter generics MultiAssayExperiment ranger rlang S4Vectors survival tidyr]; }; + Clomial = derive2 { name="Clomial"; version="1.34.0"; sha256="03xbkszrp760d7qzfflzrcj9hq42r1w2692nzsdzs7c5d4pcavss"; depends=[matrixStats permute]; }; + Clonality = derive2 { name="Clonality"; version="1.46.0"; sha256="13fnw8l11gzvsn95kcskd0q064nay04x9q12h7wb2n9wbmi7s4av"; depends=[DNAcopy]; }; + CluMSID = derive2 { name="CluMSID"; version="1.14.0"; sha256="0lgajn2zyanz8fjq9rmhc6pmg3f32zsb6n9b4n60kx2wva3jmna9"; depends=[ape Biobase dbscan GGally ggplot2 gplots MSnbase mzR network plotly RColorBrewer S4Vectors sna]; }; + ClusterJudge = derive2 { name="ClusterJudge"; version="1.20.0"; sha256="0qbd2hq6phs6vkvz63xdr3xmil9fngaphh3a5s452p0sk8ijzrj2"; depends=[httr infotheo jsonlite lattice latticeExtra]; }; + ClusterSignificance = derive2 { name="ClusterSignificance"; version="1.26.0"; sha256="1sa5nddssny2nhylm0560nm4bddn8irckanr0fj0s0klsmssrsl2"; depends=[pracma princurve RColorBrewer scatterplot3d]; }; + CoCiteStats = derive2 { name="CoCiteStats"; version="1.70.0"; sha256="11p7gz6bzc8znjqhpa0wj8fyh2f1xi0f53vfihivl7ladyml19lz"; depends=[AnnotationDbi org_Hs_eg_db]; }; + CoGAPS = derive2 { name="CoGAPS"; version="3.18.0"; sha256="0cc9anznijn3klfkp6hiqzwxwq3la9k5k6c88h37x9zh9r7sdp4a"; depends=[BH BiocParallel cluster gplots RColorBrewer Rcpp rhdf5 S4Vectors SingleCellExperiment SummarizedExperiment]; }; + CoRegNet = derive2 { name="CoRegNet"; version="1.36.0"; sha256="0z9b7azardbfqkwdn5bd2wnja6xzxm9qfhpcaar9xp45mz0a34h7"; depends=[arules igraph shiny]; }; + Cogito = derive2 { name="Cogito"; version="1.4.0"; sha256="14xaf6kfxj46fp4v1d35am700r5isn1h026ai3y85l5ilrhb4kky"; depends=[AnnotationDbi BiocManager entropy GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 jsonlite magrittr rmarkdown S4Vectors TxDb_Mmusculus_UCSC_mm9_knownGene]; }; + ComPrAn = derive2 { name="ComPrAn"; version="1.6.0"; sha256="1zn93iwmayrqwsk94bcswm295ihn0v3yksliq7w92y6abb4vx4yh"; depends=[data_table dplyr DT forcats ggplot2 magrittr purrr RColorBrewer rio rlang scales shiny shinydashboard shinyjs stringr tibble tidyr VennDiagram]; }; + ComplexHeatmap = derive2 { name="ComplexHeatmap"; version="2.14.0"; sha256="1mf0h2j31m57jd3s1sj8ijn9wdgbg452d79drdkxypxqvpm7b927"; depends=[circlize clue codetools colorspace digest doParallel foreach GetoptLong GlobalOptions IRanges matrixStats png RColorBrewer]; }; + CompoundDb = derive2 { name="CompoundDb"; version="1.2.1"; sha256="0f7jj0bphgjjba7dgrmgar6l3zv8ln3dsaq2adcy22hkryfidm55"; depends=[AnnotationFilter Biobase BiocGenerics ChemmineR DBI dbplyr dplyr IRanges jsonlite MetaboCoreUtils MsCoreUtils ProtGenerics RSQLite S4Vectors Spectra tibble xml2]; }; + ConsensusClusterPlus = derive2 { name="ConsensusClusterPlus"; version="1.62.0"; sha256="15cz3bbl21vzf5xn5xb791sy2yvzir7h4fdqm0a5anhbh8jg0iaq"; depends=[ALL Biobase cluster]; }; + CopyNumberPlots = derive2 { name="CopyNumberPlots"; version="1.14.0"; sha256="1pbi17z8fmyr0n8yvvpa5lw36pqb4mv6apcakdq39s7wzzczgpms"; depends=[cn_mops GenomeInfoDb GenomicRanges IRanges karyoploteR regioneR rhdf5 Rsamtools SummarizedExperiment VariantAnnotation]; }; + CopywriteR = derive2 { name="CopywriteR"; version="2.29.0"; sha256="1h4cyrjwdazgk49yzi9lvya8bfz9r4cpq19hyzikvc81ia8zdxs6"; depends=[BiocParallel chipseq CopyhelpeR data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; }; + CoreGx = derive2 { name="CoreGx"; version="2.2.0"; sha256="0j10crmgsi0sm3cx27qbnl8d9yfn9w4wpkqaqdizpj3g5bby3knd"; depends=[bench Biobase BiocGenerics BiocParallel BumpyMatrix checkmate crayon data_table glue lsa MatrixGenerics MultiAssayExperiment piano rlang S4Vectors SummarizedExperiment]; }; + Cormotif = derive2 { name="Cormotif"; version="1.44.0"; sha256="1wbqycmmi307z61fwi2smaavh9rwjd65ifbrwkb2wlhffnnp0852"; depends=[affy limma]; }; + CoverageView = derive2 { name="CoverageView"; version="1.36.0"; sha256="0cqvwp0ybxgnk9kif3ly780v23pwv4cyh46kk47gxcxqqkjv36ld"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; }; + CrispRVariants = derive2 { name="CrispRVariants"; version="1.26.0"; sha256="184bn5gyjj0s7wpnyrqxrsh47f7f9w020p5fbhbi48nnks38j7ca"; depends=[AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges reshape2 Rsamtools S4Vectors]; }; + CyTOFpower = derive2 { name="CyTOFpower"; version="1.4.0"; sha256="0g3629xi5hvkds2ixibr9p2ipjyr341nksafh38ap2w870whc31j"; depends=[CytoGLMM diffcyt dplyr DT ggplot2 magrittr rlang shiny shinyFeedback shinyjs shinyMatrix SummarizedExperiment tibble tidyr]; }; + CytoDx = derive2 { name="CytoDx"; version="1.18.0"; sha256="1w5xy40wpyw6fj42zj2zf79r0kkdhn6h7wxzilh1dhnqkd0k8ay1"; depends=[doParallel dplyr flowCore glmnet rpart rpart_plot]; }; + CytoGLMM = derive2 { name="CytoGLMM"; version="1.6.0"; sha256="1vvzw440blicfmdidr1sh8wiyfwmgrhmvazikm4f7g8jcw0cn9dm"; depends=[BiocParallel caret cowplot doParallel dplyr factoextra flexmix ggplot2 ggrepel logging magrittr MASS Matrix mbest pheatmap RColorBrewer rlang speedglm stringr strucchange tibble tidyr]; }; + CytoML = derive2 { name="CytoML"; version="2.10.0"; sha256="105vdmwwglknwk7x7cb6b2jf6bngbxsly0ymjf8175p2lfv98jsa"; depends=[BH Biobase cpp11 cytolib data_table dplyr flowCore flowWorkspace ggcyto graph jsonlite openCyto RBGL Rgraphviz Rhdf5lib RProtoBufLib tibble XML yaml]; }; + DAMEfinder = derive2 { name="DAMEfinder"; version="1.10.1"; sha256="1cgykb70mxnhilwwp1jr4dr523zvjxpix173s4ldfh49064gzwc1"; depends=[BiocGenerics Biostrings bumphunter cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges limma plyr readr reshape2 Rsamtools S4Vectors stringr SummarizedExperiment VariantAnnotation]; }; + DAPAR = derive2 { name="DAPAR"; version="1.30.2"; sha256="13lhckx9nk1av23y0agkscdsqbb46q64h1s4mwm6846kd88w6rvv"; depends=[Biobase DAPARdata foreach highcharter MSnbase]; }; + DART = derive2 { name="DART"; version="1.46.0"; sha256="08nmnnvz4iy70jsd0cnp41mzh2l9mccxnf62lbrhm95kxpsyaxvj"; depends=[igraph]; }; + DECIPHER = derive2 { name="DECIPHER"; version="2.26.0"; sha256="01hzxd5f5v2kspx5jd7l21bn87cfgm9aah3zd4d6kyxv98h5a3n1"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; }; + DEComplexDisease = derive2 { name="DEComplexDisease"; version="1.18.0"; sha256="12gw9b0gdwyih51j2gzay6vxhycgc52n8svd0slv6wsbw5rc19lh"; depends=[BiocParallel ComplexHeatmap DESeq2 edgeR Rcpp SummarizedExperiment]; }; + DEFormats = derive2 { name="DEFormats"; version="1.26.0"; sha256="1mcjwck06akl8zm6bkrcjqvqrfdzrcd59qvnxw5iri46i8vd7jac"; depends=[checkmate data_table DESeq2 edgeR GenomicRanges S4Vectors SummarizedExperiment]; }; + DEGraph = derive2 { name="DEGraph"; version="1.50.0"; sha256="1g0hbkwr0fwgy9zryn3bmp1lfqpplqh3489bb1z7w12sydphi5ik"; depends=[graph KEGGgraph lattice mvtnorm NCIgraph R_methodsS3 R_utils RBGL Rgraphviz rrcov]; }; + DEGreport = derive2 { name="DEGreport"; version="1.34.0"; sha256="0i75hdainn9sppvix2j2m0faprq1ajdkjm8bl2h1hxq8s7djmq6c"; depends=[Biobase BiocGenerics broom circlize cluster ComplexHeatmap ConsensusClusterPlus cowplot DESeq2 dplyr edgeR ggdendro ggplot2 ggrepel knitr logging magrittr psych RColorBrewer reshape rlang S4Vectors scales stringr SummarizedExperiment tibble tidyr]; }; + DEGseq = derive2 { name="DEGseq"; version="1.52.0"; sha256="15x3hb767j1s9snx3zk2vbyz3nvb33gsilpkidcncswj140h9cr6"; depends=[qvalue]; }; + DEP = derive2 { name="DEP"; version="1.20.0"; sha256="13c1g4dqbrvw1cjfgxjgc5rwp5zvfrh5sghjlpzssc0l5m5y5c7s"; depends=[assertthat circlize cluster ComplexHeatmap dplyr DT fdrtool ggplot2 ggrepel gridExtra imputeLCMD limma MSnbase purrr RColorBrewer readr rmarkdown shiny shinydashboard SummarizedExperiment tibble tidyr vsn]; }; + DEScan2 = derive2 { name="DEScan2"; version="1.18.0"; sha256="0an41nr2xy3c2f5fnh6krkbyvs8w7dx1828yv1anb6d23lnqbz66"; depends=[BiocGenerics BiocParallel ChIPpeakAnno data_table DelayedArray GenomeInfoDb GenomicAlignments GenomicRanges glue IRanges plyr Rcpp RcppArmadillo rtracklayer S4Vectors SummarizedExperiment]; }; + DESeq2 = derive2 { name="DESeq2"; version="1.38.1"; sha256="0xp3rfhwn8k1bqzqnjzjqlaq8lqyad7kqjhb29vkbxgzjvafvxmk"; depends=[Biobase BiocGenerics BiocParallel geneplotter GenomicRanges ggplot2 IRanges locfit matrixStats Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; }; + DEWSeq = derive2 { name="DEWSeq"; version="1.12.0"; sha256="0y3v46ib9g581mkmhjr8avqj1lw2kgn9wdgylpggfvbv9wfyjkwc"; depends=[BiocGenerics BiocParallel data_table DESeq2 GenomeInfoDb GenomicRanges R_utils S4Vectors SummarizedExperiment]; }; + DEXSeq = derive2 { name="DEXSeq"; version="1.44.0"; sha256="01728hag1c5fh4n0v57k1p9ss5rqgckab4cnj5flp750myi1fbps"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; }; + DEqMS = derive2 { name="DEqMS"; version="1.16.0"; sha256="0v0jaynssmf8pyyjkdr3yg5p7y6zpjikwl5hdv2k7i52lnimr2r0"; depends=[ggplot2 limma matrixStats]; }; + DEsingle = derive2 { name="DEsingle"; version="1.18.0"; sha256="1644cq4ryzjw2q8y8jz4pyzs4wd0nsm5kny6s5spfg7xx543qaap"; depends=[bbmle BiocParallel gamlss MASS Matrix maxLik pscl VGAM]; }; + DEsubs = derive2 { name="DEsubs"; version="1.24.0"; sha256="0z2ghrmnr4cmzw5vrqjf351p09vprir9kwwish65byifw4s65rv9"; depends=[circlize DESeq2 EBSeq edgeR ggplot2 graph igraph jsonlite limma locfit Matrix NBPSeq pheatmap RBGL]; }; + DExMA = derive2 { name="DExMA"; version="1.6.0"; sha256="04j5h3ijmhzkgs02r0vsq3p00i4ydcnnis4kn1a69bp3x1bnv0n9"; depends=[Biobase bnstruct DExMAdata GEOquery impute limma pheatmap plyr RColorBrewer scales snpStats sva swamp]; }; + DFP = derive2 { name="DFP"; version="1.56.0"; sha256="1pkg4461ib1iplcrlwkwrqzdzqixj2rhwwfkhjw87z4rx04hz3gf"; depends=[Biobase]; }; + DIAlignR = derive2 { name="DIAlignR"; version="2.6.0"; sha256="04kpdab8h0krxqzsxl3sb1gsxqwrrdpsn7irgdpns8qqjlzcbzv5"; depends=[ape bit64 data_table DBI dplyr ggplot2 magrittr mzR phangorn pracma Rcpp RcppEigen reticulate rlang RMSNumpress RSQLite signal tidyr zoo]; }; + DMCFB = derive2 { name="DMCFB"; version="1.12.0"; sha256="00j362frx70vj326xjppkzfd36mvfq3ym58dnckz3c0jb2dxv3wr"; depends=[arm benchmarkme BiocParallel data_table fastDummies GenomicRanges IRanges MASS matrixStats rtracklayer S4Vectors speedglm SummarizedExperiment tibble]; }; + DMCHMM = derive2 { name="DMCHMM"; version="1.20.0"; sha256="1cf5i3ikn81qw0s3kbx2yl15fmgwal22yqpys8wya8pd2agbi4lj"; depends=[BiocParallel calibrate fdrtool GenomicRanges IRanges multcomp rtracklayer S4Vectors SummarizedExperiment]; }; + DMRScan = derive2 { name="DMRScan"; version="1.20.0"; sha256="1mx0kk1rbn0mkk94mm1a7mk64ia315fvwwb34adyslmyq5gq93i5"; depends=[GenomeInfoDb GenomicRanges IRanges MASS Matrix mvtnorm RcppRoll]; }; + DMRcaller = derive2 { name="DMRcaller"; version="1.30.0"; sha256="03d7rl5z1pxdwxya53mkf8a8n9jzp8rb8awhfhfd22dgdf2l327h"; depends=[betareg GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; }; + DMRcate = derive2 { name="DMRcate"; version="2.12.0"; sha256="0iphlsbam5fcxbj5j0cmqk3wz5ykwz0mvk3qbrhzxbpf2h4w2qib"; depends=[bsseq DSS edgeR ExperimentHub GenomeInfoDb GenomicRanges Gviz IRanges limma minfi missMethyl plyr S4Vectors SummarizedExperiment]; }; + DMRforPairs = derive2 { name="DMRforPairs"; version="1.34.0"; sha256="1amrbmijqv0w96qc813abl12xr3sz8a92gfjwg7zm7l7dz2gjss9"; depends=[GenomicRanges Gviz R2HTML]; }; + DNABarcodeCompatibility = derive2 { name="DNABarcodeCompatibility"; version="1.14.0"; sha256="1kjfpysf70lxc2sw0ggrnir91d6kl9gvc6vhx3ivzxah92zvp643"; depends=[DNABarcodes dplyr numbers purrr stringr tidyr]; }; + DNABarcodes = derive2 { name="DNABarcodes"; version="1.28.0"; sha256="18sivwzl8gk52dnhwls0i4imw78rkjlwbfrcaas1i53q0bmw15i5"; depends=[BH Matrix Rcpp]; }; + DNAcopy = derive2 { name="DNAcopy"; version="1.72.1"; sha256="1y2qnagjrbjxn4xglv2sxr6fallkbmbms8fq9icv27pm5030y4xz"; depends=[]; }; + DNAfusion = derive2 { name="DNAfusion"; version="1.0.0"; sha256="1b1k5gs1rfk02p9j7xl186ynvsxax8sc2l9r8vwr53w37x3fzh43"; depends=[bamsignals BiocBaseUtils GenomicAlignments GenomicRanges IRanges Rsamtools S4Vectors]; }; + DNAshapeR = derive2 { name="DNAshapeR"; version="1.26.0"; sha256="0cj1nff3kn0d5djddapn37gi47739c69r61wp9v3bcvwcvq6nlqa"; depends=[Biostrings fields GenomicRanges Rcpp]; }; + DOSE = derive2 { name="DOSE"; version="3.24.2"; sha256="0scp6sgb1iwwfh7gdak4dxf1hb870745km9nc9hga8pnsnqi5v3g"; depends=[AnnotationDbi BiocParallel fgsea ggplot2 GOSemSim HDO_db qvalue reshape2]; }; + DRIMSeq = derive2 { name="DRIMSeq"; version="1.26.0"; sha256="0cj3fyb99fh30f35ra1gpvzwplszbwvwk33ppgyh1zx2axsx164w"; depends=[BiocGenerics BiocParallel edgeR GenomicRanges ggplot2 IRanges limma MASS reshape2 S4Vectors]; }; + DSS = derive2 { name="DSS"; version="2.46.0"; sha256="1qm0pq6495fn2zrbddaadb1w01ry76rg8mmbmxf3zws9pww48jgf"; depends=[Biobase BiocParallel bsseq]; }; + DTA = derive2 { name="DTA"; version="2.44.0"; sha256="0s7z24ka29ki3gvx0831k4cxlnismk6gh92rqg3sx4qk4srlplhx"; depends=[LSD scatterplot3d]; }; + DaMiRseq = derive2 { name="DaMiRseq"; version="2.10.0"; sha256="10qpr9p6sqljq05rc2gkh45yh5rsmkh51prqq349b3733d1ld03y"; depends=[arm caret corrplot DESeq2 e1071 EDASeq edgeR FactoMineR FSelector ggplot2 Hmisc ineq kknn limma lubridate MASS pheatmap pls plsVarSel plyr randomForest RColorBrewer reshape2 RSNNS SummarizedExperiment sva]; }; + DeMAND = derive2 { name="DeMAND"; version="1.28.0"; sha256="1x0hyna6qgz5w9y7j95wyyrvg7rx8pdpyp9dzmic7q0hycjmg33n"; depends=[KernSmooth]; }; + DeMixT = derive2 { name="DeMixT"; version="1.14.0"; sha256="02hkkxkj6fv4jxlq3mj1hxd1zi42pvis8ffcwxf25jk8j19j124c"; depends=[base64enc dendextend DSS ggplot2 KernSmooth knitr matrixcalc matrixStats psych Rcpp rmarkdown SummarizedExperiment sva truncdist]; }; + DeconRNASeq = derive2 { name="DeconRNASeq"; version="1.40.0"; sha256="05rwqchfspy8i9fcj9526rl5vvk0rrgr95nvxzdj0sa2136my8y4"; depends=[ggplot2 limSolve pcaMethods]; }; + DeepBlueR = derive2 { name="DeepBlueR"; version="1.24.0"; sha256="1as3jjsk77aczikd7lniiqih5x20f0wgf5biy4rlnhr0mlr05di6"; depends=[data_table diffr dplyr filehash foreach GenomeInfoDb GenomicRanges R_utils RCurl rjson rtracklayer settings stringr withr XML]; }; + DeepPINCS = derive2 { name="DeepPINCS"; version="1.6.0"; sha256="1n81lsllbbdkl97dlw7lnpg815siiwk3xsivdfy166dh5jm104yl"; depends=[CatEncoders keras matlab PRROC purrr rcdk reticulate stringdist tensorflow tokenizers ttgsea webchem]; }; + DegNorm = derive2 { name="DegNorm"; version="1.8.0"; sha256="077mi8986l1f9nzjxijwwvbwlzj840y4wc3qh2kvfvk9k5a81pi9"; depends=[data_table doParallel foreach GenomicAlignments GenomicFeatures GenomicRanges ggplot2 heatmaply IRanges plotly plyr Rcpp RcppArmadillo Rsamtools S4Vectors viridis]; }; + DelayedArray = derive2 { name="DelayedArray"; version="0.24.0"; sha256="0nl1v0mxb759wiia2rsxay0cv0q631gqyzgaa10s175lhzsb8r6p"; depends=[BiocGenerics IRanges Matrix MatrixGenerics S4Vectors]; }; + DelayedDataFrame = derive2 { name="DelayedDataFrame"; version="1.14.0"; sha256="1r2fgww105433nk2r9sakqszh39l1zhh377wl5q9vnf00iasm2cr"; depends=[BiocGenerics DelayedArray S4Vectors]; }; + DelayedMatrixStats = derive2 { name="DelayedMatrixStats"; version="1.20.0"; sha256="0qcn7rlq0bsj11sc31wzks2xv900fpmbsblxp9cng5lj5cn2djk3"; depends=[DelayedArray IRanges Matrix MatrixGenerics matrixStats S4Vectors sparseMatrixStats]; }; + DelayedRandomArray = derive2 { name="DelayedRandomArray"; version="1.6.0"; sha256="15g6agzfcp64dqs0mi0fjggkn8cqi9d116j8i0kjpb9sjh9882i3"; depends=[BH DelayedArray dqrng Rcpp]; }; + DelayedTensor = derive2 { name="DelayedTensor"; version="1.4.0"; sha256="1lahwbgwnkiw98ij2vjvf81baas3s35i357392jz3ps8sw7m7vs8"; depends=[BiocSingular DelayedArray DelayedRandomArray einsum HDF5Array irlba Matrix rTensor]; }; + DepInfeR = derive2 { name="DepInfeR"; version="1.2.0"; sha256="0887lyqq6sc12c9rzida2r56mnbrw313wyysy7g5cf18bcd2xcmx"; depends=[BiocParallel glmnet matrixStats]; }; + DepecheR = derive2 { name="DepecheR"; version="1.14.0"; sha256="1j4gxgw1s3a0nm888k02qi1smxqsplc42827ks666md025h9bxcj"; depends=[beanplot doSNOW dplyr FNN foreach ggplot2 gmodels gplots MASS matrixStats mixOmics moments Rcpp RcppEigen reshape2 robustbase viridis]; }; + DiffBind = derive2 { name="DiffBind"; version="3.8.3"; sha256="039gy9ll6ingh3y5h2hp3rhbh2imaryjxzgf8ysk87irlbpnx1qs"; 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.22.0"; sha256="0n6nyw0vb0hvi9awpx6igdgdsfd91fs520aspbxlb33jcd3x0aaz"; depends=[cba]; }; + DifferentialRegulation = derive2 { name="DifferentialRegulation"; version="1.2.0"; sha256="0qhbnac9726ywci7bbmgvjbyyxzqjp0rxynfha4769lmgl6fi1s0"; depends=[BANDITS data_table doParallel doRNG foreach ggplot2 MASS Matrix Rcpp RcppArmadillo SingleCellExperiment SummarizedExperiment]; }; + Dino = derive2 { name="Dino"; version="1.4.0"; sha256="1jvhcs24bi0g0hzi3dk6ny6wq8h2950whkqimdqyyglwy7lcbz1f"; depends=[BiocParallel BiocSingular Matrix matrixStats S4Vectors scran Seurat SingleCellExperiment SummarizedExperiment]; }; + Director = derive2 { name="Director"; version="1.24.0"; sha256="0bnvagsqm5cm8l2g18fyavaf7s93hwfi75zmggxiy46xqn7s1718"; depends=[htmltools]; }; + DirichletMultinomial = derive2 { name="DirichletMultinomial"; version="1.40.0"; sha256="009nnl3zwcsg6mh7wl3j856dpi7awkyxdy660rqmiskn7m2ah4l1"; depends=[BiocGenerics IRanges S4Vectors]; }; + DiscoRhythm = derive2 { name="DiscoRhythm"; version="1.14.0"; sha256="1fky7w82zx1ynmzfrslsih2639ihhzlj0pa14bwzj1g7xr5p49bi"; 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.18.0"; sha256="15k62maqj4kbv2184h5j0j8rkmbcskvmjjn8z26kw296ihifis6w"; depends=[AnnotationDbi biomaRt Biostrings data_table GenomeInfoDb GenomicRanges IRanges SummarizedExperiment VariantAnnotation]; }; + Doscheda = derive2 { name="Doscheda"; version="1.20.0"; sha256="0y0lxbjd1kqds3rx77sb4agk8j35xh8k698assrbjjhwg5gjfgid"; 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.38.0"; sha256="0sryp2w0lzalqhk2aizj0lrbxj60illfzg6vzg8isqzv9ic4gnqd"; depends=[]; }; + DropletUtils = derive2 { name="DropletUtils"; version="1.18.1"; sha256="0rshaskx9nwd57aliwhk9gc0h6ccrvzbaikyjpbdz1i1zf4fsf77"; 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.40.0"; sha256="13xry8cdcidc7g2hl30pwyi9gg1kx2zw7w504fncmjk9niz5m95w"; 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.10.0"; sha256="03kjhck5ypydzz23cp5avah9kpz74i61v9mi89rr7wqdsad3zyif"; depends=[aricode BiocParallel dplyr gganimate ggplot2 magrittr purrr RColorBrewer SummarizedExperiment tidyr]; }; + DynDoc = derive2 { name="DynDoc"; version="1.76.0"; sha256="0w8x997npnphd91s3nc9f0s4vb94ikszw5mrpf5lfv3n25sqgvhb"; depends=[]; }; + EBImage = derive2 { name="EBImage"; version="4.40.0"; sha256="1k6gbivwlai451whq2vr3c0shzs9p4g188jn5waw7973gdzdi00q"; depends=[abind BiocGenerics fftwtools htmltools htmlwidgets jpeg locfit png RCurl tiff]; }; + EBSEA = derive2 { name="EBSEA"; version="1.26.0"; sha256="1pfcpawbax3ld4wwn98b13aqrwzdgz8k4x63ncckd2jdanq1l01r"; depends=[DESeq2 EmpiricalBrownsMethod]; }; + EBSeq = derive2 { name="EBSeq"; version="1.38.0"; sha256="1gh1cyb76gv2h0knh780648gsbgpn76adfj6x3pjzily5m5bmin0"; depends=[blockmodeling gplots testthat]; }; + EBSeqHMM = derive2 { name="EBSeqHMM"; version="1.32.0"; sha256="1k6c2qc7xvv3f094zddjdbjj4hlfxsv04gf5b0zdphmrhbhb8r9m"; depends=[EBSeq]; }; + EBarrays = derive2 { name="EBarrays"; version="2.62.0"; sha256="0kg22appd9sd6knm129hchkamzilwr3h8wi4ibrvllbfmx31v9q8"; depends=[Biobase cluster lattice]; }; + EBcoexpress = derive2 { name="EBcoexpress"; version="1.42.0"; sha256="0was3sjr5q420inj42bl0ifyd55b2brzbv2nskswskar7myad3yn"; depends=[EBarrays mclust minqa]; }; + EDASeq = derive2 { name="EDASeq"; version="2.32.0"; sha256="0hx4als33lvdchz5s6cv2axvjyp0k8p3v0lm51jayhjcjpmihqzp"; depends=[AnnotationDbi aroma_light Biobase BiocGenerics BiocManager biomaRt Biostrings GenomicFeatures GenomicRanges IRanges Rsamtools ShortRead]; }; + EGAD = derive2 { name="EGAD"; version="1.26.0"; sha256="01wxhrfbmhabh8ci95c3drll7g9lc9zpgmlac5b5blp1ar60a2if"; depends=[Biobase GEOquery gplots igraph impute limma MASS plyr RColorBrewer RCurl zoo]; }; + EGSEA = derive2 { name="EGSEA"; version="1.26.0"; sha256="1cjld33vrnlm6l8ssg6x4w7b4ack2xa1lpy924phx64zv44fi3s9"; depends=[AnnotationDbi Biobase DT edgeR EGSEAdata gage ggplot2 globaltest gplots GSVA HTMLUtils htmlwidgets hwriter limma metap org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db PADOG pathview plotly RColorBrewer safe stringi topGO]; }; + ELMER = derive2 { name="ELMER"; version="2.22.0"; sha256="1cyyl3596dqs3qyz2ngdlbz8pl8hr5y2gnh5yby8pab4z1sxpr79"; depends=[biomaRt circlize ComplexHeatmap DelayedArray doParallel downloader dplyr ELMER_data GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggpubr ggrepel gridExtra Gviz IRanges lattice magrittr Matrix MultiAssayExperiment plotly plyr progress purrr readr reshape reshape2 rmarkdown rtracklayer rvest S4Vectors scales stringr SummarizedExperiment TCGAbiolinks tibble tidyr xml2]; }; + EMDomics = derive2 { name="EMDomics"; version="2.28.0"; sha256="0fz8p3g9cb25v25cmmkwldxijplcm1wn99aa9i7s0zi3i8426vv5"; depends=[BiocParallel CDFt emdist ggplot2 matrixStats preprocessCore]; }; + ENmix = derive2 { name="ENmix"; version="1.34.0"; sha256="0zg64c18ag11yqxayir9s5xgmani5pkpv074c95vnf0pysi7v6s4"; depends=[AnnotationHub Biobase doParallel dynamicTreeCut ExperimentHub foreach genefilter geneplotter gplots gtools illuminaio impute IRanges matrixStats minfi preprocessCore quadprog RPMM S4Vectors SummarizedExperiment]; }; + ERSSA = derive2 { name="ERSSA"; version="1.16.0"; sha256="03ns14cbi1c9jcmxf4fhv5f7r7hvql33wz9n9ddcrn43xki8r6vw"; depends=[BiocParallel DESeq2 edgeR ggplot2 plyr RColorBrewer]; }; + EWCE = derive2 { name="EWCE"; version="1.6.0"; sha256="1d2sw63i5jy1fa1q3cwdvd05xd8bb0k66zjdvpgsds9m7mvw75vb"; depends=[BiocParallel data_table DelayedArray dplyr ewceData ggplot2 HGNChelper limma Matrix orthogene reshape2 RNOmni SingleCellExperiment stringr SummarizedExperiment]; }; + EasyCellType = derive2 { name="EasyCellType"; version="1.0.0"; sha256="1xry2kgb7ha2hg82jap88px9xxcq609il85xi0k0gilla1swvjc1"; depends=[AnnotationDbi clusterProfiler dplyr forcats ggplot2 magrittr org_Hs_eg_db org_Mm_eg_db rlang]; }; + EmpiricalBrownsMethod = derive2 { name="EmpiricalBrownsMethod"; version="1.26.0"; sha256="1vws49a204xkwixdvp5l62in7vxbpf4qsfcnm34zkc4kx5hval9j"; depends=[]; }; + EnhancedVolcano = derive2 { name="EnhancedVolcano"; version="1.16.0"; sha256="1nbg2r097rz24ybzh9ww6myd6kc2rz02vbg6g0rb3dlng0002xsm"; depends=[ggplot2 ggrepel]; }; + EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.27.2"; sha256="1il5cj5zmjwp3drw9psj1nsp94yxd421kd7jqrv34p4r1v0zw5z5"; depends=[circlize ComplexHeatmap GenomicRanges GetoptLong IRanges locfit matrixStats Rcpp]; }; + EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.28.0"; sha256="0sjm4myq5nqrkk10z8k3i4az46zwcrr20rrs4vrvlmvz7fzspamx"; depends=[AnnotationDbi BiocFileCache BiocManager edgeR GO_db graph graphite GSEABase hwriter KEGGgraph KEGGREST limma pathview Rgraphviz S4Vectors safe SPIA SummarizedExperiment]; }; + EpiCompare = derive2 { name="EpiCompare"; version="1.2.0"; sha256="0h0ap1xa0g57zh4djr263d97firklsvb6nwq0dk1h39j8wyp5j54"; depends=[AnnotationHub BiocGenerics BRGenomics ChIPseeker data_table genomation GenomeInfoDb GenomicRanges ggplot2 htmltools IRanges plotly reshape2 rmarkdown rtracklayer stringr]; }; + EpiDISH = derive2 { name="EpiDISH"; version="2.14.1"; sha256="02pf0y8sj1j48qfmfjckr4vx9rz3aypb6iydlpfvhcm829jr51cl"; depends=[e1071 locfdr MASS Matrix matrixStats quadprog stringr]; }; + EpiMix = derive2 { name="EpiMix"; version="0.99.16"; sha256="1lqjfi8q3fbqqbd3ykpb68php1iwy93n59dgjj14z1xb56hfwjna"; depends=[AnnotationDbi AnnotationHub Biobase biomaRt data_table doParallel doSNOW downloader dplyr ELMER_data EpiMix_data ExperimentHub foreach GenomeInfoDb GenomicFeatures GenomicRanges GEOquery ggplot2 impute IRanges limma plyr progress R_matlab RColorBrewer RCurl rlang RPMM S4Vectors SummarizedExperiment tibble tidyr]; }; + EpiTxDb = derive2 { name="EpiTxDb"; version="1.10.0"; sha256="152snn75nixdas9n3g80f32hmdrqdyv71cl8fkax5jl4mqrp6px5"; depends=[AnnotationDbi BiocFileCache BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges httr IRanges Modstrings RSQLite S4Vectors tRNAdbImport xml2]; }; + EventPointer = derive2 { name="EventPointer"; version="3.6.0"; sha256="0z9bcqfwi8mym1pwywmvdmiszw0whpz4svh7jgwjvza94z5w5ly5"; depends=[abind affxparser Biostrings BSgenome cobs doParallel fgsea 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.16.0"; sha256="0m635as5xigkjqlmwh32afbbxffjf6ahrr83gr8z886z365h4m81"; depends=[GenomicRanges IRanges matrixStats Rsubread rtracklayer]; }; + ExiMiR = derive2 { name="ExiMiR"; version="2.40.0"; sha256="02aw2kjpg2xfmx0xjphsalw81gixwd2yrw73rcbcxyz7fpq98c5h"; depends=[affy affyio Biobase limma preprocessCore]; }; + ExperimentHub = derive2 { name="ExperimentHub"; version="2.6.0"; sha256="1j71zmxwiz82gg6kii2bmynzwll1r6fmsq972kmvxvm6crpvi15s"; depends=[AnnotationHub BiocFileCache BiocGenerics BiocManager curl rappdirs S4Vectors]; }; + ExperimentHubData = derive2 { name="ExperimentHubData"; version="1.24.0"; sha256="0jkbp0pc6zjjwmklrd23grxrk200rw1wbd78w3qcicgzfnz90gar"; depends=[AnnotationHubData BiocGenerics BiocManager curl DBI ExperimentHub httr S4Vectors]; }; + ExperimentSubset = derive2 { name="ExperimentSubset"; version="1.8.0"; sha256="1jfzxca82cyd4hh4jk9nmwjwq608i8zs2nfjiclkpk0hh0bf6j22"; depends=[Matrix S4Vectors SingleCellExperiment SpatialExperiment SummarizedExperiment TreeSummarizedExperiment]; }; + ExploreModelMatrix = derive2 { name="ExploreModelMatrix"; version="1.10.0"; sha256="18dbcalpk4m8ziqksgp6kxd4gm8ip0l5sydnqfd7mjzymhvxsbv9"; depends=[cowplot dplyr DT ggplot2 limma magrittr MASS rintrojs S4Vectors scales shiny shinydashboard shinyjs tibble tidyr]; }; + ExpressionAtlas = derive2 { name="ExpressionAtlas"; version="1.26.0"; sha256="0z9x1j9wrqqzqdg8c1vy20lgd9dfq9z74af813nkag8qph2nhnm9"; depends=[Biobase BiocStyle httr jsonlite limma RCurl S4Vectors SummarizedExperiment XML xml2]; }; + FCBF = derive2 { name="FCBF"; version="2.6.0"; sha256="124c25x18xkhyrizfzchj4xkg5hwdw3935gyibbvgxj6b3l1ph97"; depends=[ggplot2 gridExtra mclust pbapply SummarizedExperiment]; }; + FEAST = derive2 { name="FEAST"; version="1.6.0"; sha256="1yk2k0n6nafzh594rydnnpwmznv64iqan9p7137n72vpbcav9ql4"; depends=[BiocParallel irlba matrixStats mclust SC3 SingleCellExperiment SummarizedExperiment TSCAN]; }; + FELLA = derive2 { name="FELLA"; version="1.18.0"; sha256="09rl9zna99rydqk8vfdlmfx0g4cg0zaw27r153ll7hpcnnkx18z1"; depends=[igraph KEGGREST Matrix plyr]; }; + FGNet = derive2 { name="FGNet"; version="3.32.0"; sha256="1jg7qiq7fdlw2fg362sjhalrdbvqxxrzb0q7l6ih4vq6qxjlyyyz"; depends=[hwriter igraph plotrix png R_utils RColorBrewer reshape2 XML]; }; + FISHalyseR = derive2 { name="FISHalyseR"; version="1.32.0"; sha256="18sj688bm80zldj6d6w1ic66pk2qzp7liwp9vjmh8a80i6xxlnkm"; depends=[abind EBImage]; }; + FLAMES = derive2 { name="FLAMES"; version="1.4.1"; sha256="0fbf8v1daw77a7cy03hfhd7rj70wld6rbphgvp095i3xgw9j0p1v"; depends=[bambu basilisk BiocGenerics Biostrings circlize ComplexHeatmap cowplot dplyr DropletUtils GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 gridExtra igraph jsonlite magrittr Matrix MultiAssayExperiment RColorBrewer Rcpp reticulate Rhtslib Rsamtools rtracklayer S4Vectors scater scran scuttle SingleCellExperiment stringr SummarizedExperiment tidyr withr zlibbioc]; }; + FRASER = derive2 { name="FRASER"; version="1.10.0"; sha256="1ql4h8j4yzd408w1frvzyf90ksddy6jgg6gcqhfx0qh114b12r7c"; depends=[AnnotationDbi BBmisc Biobase BiocGenerics BiocParallel biomaRt BSgenome cowplot data_table DelayedArray DelayedMatrixStats extraDistr generics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 ggrepel HDF5Array IRanges matrixStats OUTRIDER pcaMethods pheatmap plotly PRROC R_utils RColorBrewer Rcpp RcppArmadillo rhdf5 Rsamtools Rsubread S4Vectors SummarizedExperiment tibble VGAM]; }; + FRGEpistasis = derive2 { name="FRGEpistasis"; version="1.34.0"; sha256="0xnrrrhxdgcn6033kj1v780s7m58j2krc8hj1y554ddilf90jwy5"; depends=[fda MASS]; }; + FScanR = derive2 { name="FScanR"; version="1.8.0"; sha256="1i0w5ai5si9a4m3s96grm75wwdx5g2ah4vg0q95sgjj68gx4ln2c"; depends=[]; }; + FamAgg = derive2 { name="FamAgg"; version="1.26.0"; sha256="17avlg6x7kan3lq5ffvzq7lmrscnm0h5vj29hhspf6zn8gwpi86f"; depends=[BiocGenerics gap igraph kinship2 Matrix survey]; }; + FastqCleaner = derive2 { name="FastqCleaner"; version="1.16.1"; sha256="1xy4b1ppm9jlrxzzr18f0vcj91wpai328c1l49jkrz3cc6s0hap2"; depends=[Biostrings DT htmltools IRanges Rcpp S4Vectors shiny shinyBS ShortRead]; }; + FilterFFPE = derive2 { name="FilterFFPE"; version="1.8.0"; sha256="0i7737mzg557yg23h730pvxz1gx37blbh7krla4p4nqmic2qdrcy"; depends=[doParallel foreach GenomicRanges IRanges Rsamtools S4Vectors]; }; + FindIT2 = derive2 { name="FindIT2"; version="1.4.0"; sha256="0cid8lvh5zck421ajfca320n4lxr7jafmipgcvk86zd89izz72pa"; depends=[BiocGenerics BiocParallel dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel glmnet IRanges MultiAssayExperiment patchwork progress purrr qvalue rlang rtracklayer S4Vectors stringr SummarizedExperiment tibble tidyr withr]; }; + FitHiC = derive2 { name="FitHiC"; version="1.24.0"; sha256="1c7jscl82knbh5ha1i1hlm46nnhz6aw5h0j5xnl4hlgx8mnn05fl"; depends=[data_table fdrtool Rcpp]; }; + FlowSOM = derive2 { name="FlowSOM"; version="2.6.0"; sha256="1s7xilhhc55igq0zmvpfzhnh5df8bzmm3daknz75xhzhhg5b7z1c"; depends=[BiocGenerics colorRamps ConsensusClusterPlus dplyr flowCore ggforce ggnewscale ggplot2 ggpubr igraph magrittr rlang Rtsne tidyr XML]; }; + FoldGO = derive2 { name="FoldGO"; version="1.16.0"; sha256="1b4h4gggxfv12lvxsjk1c8rn9rrlcl63p8p61i7wfbh3nkzx62r0"; depends=[ggplot2 tidyr topGO]; }; + FunChIP = derive2 { name="FunChIP"; version="1.24.0"; sha256="1wjbjmppizpgdxlkq19wa5v1yvkgh6cal2cqiby90267djq9m8y5"; depends=[doParallel fda foreach GenomeInfoDb GenomicAlignments GenomicRanges RColorBrewer Rcpp Rsamtools shiny]; }; + FuseSOM = derive2 { name="FuseSOM"; version="1.0.1"; sha256="0wx7f7y81sr0qmz8sza1rpg3v8d9z6rc2z6df83ws1rwsaz5zn0f"; depends=[analogue cluster coop diptest fastcluster FCPS fpc ggplot2 ggplotify ggpubr pheatmap proxy psych Rcpp S4Vectors stringr SummarizedExperiment]; }; + GA4GHclient = derive2 { name="GA4GHclient"; version="1.22.0"; sha256="09kfjrsbz6sk3g304kqk0zy39v10sb758alyvajvjj7pfkdv67ak"; depends=[BiocGenerics Biostrings dplyr GenomeInfoDb GenomicRanges httr IRanges jsonlite S4Vectors VariantAnnotation]; }; + GA4GHshiny = derive2 { name="GA4GHshiny"; version="1.20.0"; sha256="0zal12pb48hwam9zan1a865i5njrvzg9dc7mpd9jiffp7q9rrwi9"; depends=[AnnotationDbi BiocGenerics dplyr DT GA4GHclient GenomeInfoDb GenomicFeatures openxlsx purrr S4Vectors shiny shinyjs shinythemes tidyr]; }; + GARS = derive2 { name="GARS"; version="1.18.0"; sha256="12mfqv9ag1rrig8wcpl5zwvb68j7g1cdrw5ynlkbrgxcwnibpmnq"; depends=[cluster DaMiRseq ggplot2 MLSeq SummarizedExperiment]; }; + GAprediction = derive2 { name="GAprediction"; version="1.24.0"; sha256="0x2mkm6fq7772fql2whjp1xcf5pqi06ywzj8prb51yz8s8zqvzl2"; depends=[glmnet Matrix]; }; + GBScleanR = derive2 { name="GBScleanR"; version="1.2.4"; sha256="1jdldghw6kmck732bn38ix66ys7l2dx0nj0136m8rvsxab980kxv"; depends=[expm gdsfmt ggplot2 Rcpp RcppParallel SeqArray tidyr]; }; + GCSscore = derive2 { name="GCSscore"; version="1.12.0"; sha256="11d8ygc8lfyzz7vmwvi6yy3lf6pd8fsichg6ki0lkp459nivbdi8"; depends=[affxparser Biobase BiocManager data_table devtools dplR RSQLite stringr]; }; + GDCRNATools = derive2 { name="GDCRNATools"; version="1.18.0"; sha256="0f2nqdcygpmcwjngadqxri3y87ylrg0f67ihg7gwd4afqsbckd62"; 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.18.0"; sha256="1knaqi5pslqkkx7fd93vmkwcxii7rbyj13s89iy54snlw29lbchj"; depends=[BiocGenerics DelayedArray gdsfmt S4Vectors SeqArray SNPRelate]; }; + GEM = derive2 { name="GEM"; version="1.24.0"; sha256="0lbs7igiq8v0y66pbr0jvxcadp7ni47mjynag7m352k87633nann"; depends=[ggplot2]; }; + GENESIS = derive2 { name="GENESIS"; version="2.28.0"; sha256="0lca67dxnwpignglimc67hpyhjg6ybwqz9sqhg4yqg6m05ym15fa"; depends=[Biobase BiocGenerics BiocParallel data_table gdsfmt GenomicRanges GWASTools igraph IRanges Matrix reshape2 S4Vectors SeqArray SeqVarTools SNPRelate]; }; + GENIE3 = derive2 { name="GENIE3"; version="1.20.0"; sha256="096crx7n75x60s9sx3l7nld3yvrsqs0clvjsdarxc6bbn2qxk81i"; depends=[dplyr reshape2]; }; + GEOexplorer = derive2 { name="GEOexplorer"; version="1.4.0"; sha256="1gjb0xsfg745sckzwz0v4g1jh6ikwkbvb5k9cw15g3cnqc5xlqjl"; 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.6.0"; sha256="1k62g3k60rzddg6k7f88pkb19ip6zshm2ymi1gz10kf9xrfj0d97"; depends=[doParallel foreach plyr RCurl rvest stringr xml2]; }; + GEOmetadb = derive2 { name="GEOmetadb"; version="1.60.0"; sha256="09xfacrfdnnm43pi0a96zmw1awqgffq1izdyzpnjd23ks4hjw9hk"; depends=[GEOquery RSQLite]; }; + GEOquery = derive2 { name="GEOquery"; version="2.66.0"; sha256="0ck2aml1kxdahwcszi3j7hcikwi8fdnzphlrsn3h2q4dkk5x00kn"; depends=[Biobase curl data_table dplyr limma magrittr R_utils readr tidyr xml2]; }; + GEOsubmission = derive2 { name="GEOsubmission"; version="1.50.0"; sha256="1vqdh9nbib40xcwc2j239ijjdrlgyx20qb5ji99639v6ibia02wm"; depends=[affy Biobase]; }; + GEWIST = derive2 { name="GEWIST"; version="1.42.0"; sha256="1hkqv11apwhvg89ky792m6y0aml6hmxbqkk622r4zr1snkc6ggxw"; depends=[car]; }; + GGPA = derive2 { name="GGPA"; version="1.10.0"; sha256="16yz5vjf76bj3jkds32fxbk3032ni57aafz2crp2rzrq0rlvk1bq"; depends=[GGally matrixStats network Rcpp RcppArmadillo scales sna]; }; + GIGSEA = derive2 { name="GIGSEA"; version="1.16.0"; sha256="1gf4zzxcbh4g54div9ckjcx6yha74ilzqbmjzifjg1ybixy9d2mw"; depends=[locfdr MASS Matrix]; }; + GISPA = derive2 { name="GISPA"; version="1.22.0"; sha256="0j448iqr71hqbfv9r9f4rccy4phfhcgy7w8kij0idw2mjpvkpyvr"; depends=[Biobase changepoint data_table genefilter GSEABase HH lattice latticeExtra plyr scatterplot3d]; }; + GLAD = derive2 { name="GLAD"; version="2.62.0"; sha256="0gb52ic5r6nkgm2ynm174vcvbmkbhhjgv71lsmxpxzcsb6rr7qj6"; depends=[aws]; }; + GMRP = derive2 { name="GMRP"; version="1.26.0"; sha256="1q79q958wpfrl6q4g1yl6kxcw38817rpbdnjl4k4xzk3hf5jmd7h"; depends=[diagram GenomicRanges plotrix]; }; + GNET2 = derive2 { name="GNET2"; version="1.14.0"; sha256="0vhdn8nrp9fj2g1qdng0zdw5crmzcck3rwvvzcswh2p9pwg1cfzb"; depends=[DiagrammeR dplyr ggplot2 igraph matrixStats Rcpp reshape2 SummarizedExperiment xgboost]; }; + GOSemSim = derive2 { name="GOSemSim"; version="2.24.0"; sha256="14wc7qgk1psknld05246cn0nqxpbjprax7j75h5yyd0w7hjyly2s"; depends=[AnnotationDbi GO_db Rcpp]; }; + GOSim = derive2 { name="GOSim"; version="1.36.0"; sha256="0hxy1x1mkygd0r7n38plpb3wj443kak413ml813zzmhvrs39zvnf"; depends=[annotate AnnotationDbi cluster corpcor flexmix GO_db graph Matrix org_Hs_eg_db RBGL Rcpp topGO]; }; + GOTHiC = derive2 { name="GOTHiC"; version="1.34.0"; sha256="117vbz1yasav1p92x2wylmsc9kc5z0qv4jsvd1nf9b2ndxcrgxd5"; depends=[BiocGenerics BiocManager Biostrings BSgenome data_table GenomeInfoDb GenomicRanges ggplot2 IRanges Rsamtools rtracklayer S4Vectors ShortRead]; }; + GOexpress = derive2 { name="GOexpress"; version="1.32.0"; sha256="1wccyfy8wkgns12r2mh7w6zfwjqiqhv1riyk0s4ivax2vyqmhb65"; depends=[Biobase biomaRt ggplot2 gplots randomForest RColorBrewer RCurl stringr]; }; + GOfuncR = derive2 { name="GOfuncR"; version="1.18.0"; sha256="0d0xis4nns5icsr16w4ik2d95n3p2h93c47jvlp22crv7f4rlaa5"; depends=[AnnotationDbi GenomicRanges gtools IRanges mapplots Rcpp vioplot]; }; + GOpro = derive2 { name="GOpro"; version="1.24.0"; sha256="04kr02whakm65gqy1h4vxl9m6s9zl6hgwd3dfdk8106npyrjqlsb"; depends=[AnnotationDbi BH dendextend doParallel foreach GO_db IRanges MultiAssayExperiment org_Hs_eg_db Rcpp S4Vectors]; }; + GOstats = derive2 { name="GOstats"; version="2.64.0"; sha256="07chyfkq8nwxjgnlrrwza8jw996dq0ki4bzdfalj9yl1iac1pnys"; depends=[annotate AnnotationDbi AnnotationForge Biobase Category GO_db graph RBGL Rgraphviz]; }; + GOsummaries = derive2 { name="GOsummaries"; version="2.34.0"; sha256="1fgalk4gs1vajax7zngq9caqdw0r9ryjz0vydjr4n21ypjbc9476"; depends=[ggplot2 gProfileR gtable limma plyr Rcpp reshape2]; }; + GPA = derive2 { name="GPA"; version="1.10.0"; sha256="0gd7ln4xiagibzdzhfqy8m7v35yp6vm07xhbp7ky5ipq1j2nzpcc"; depends=[DT ggplot2 ggrepel plyr Rcpp shiny shinyBS vegan]; }; + GRENITS = derive2 { name="GRENITS"; version="1.50.0"; sha256="0bfi8y0ps4flir7yvl9wgdpy9hiii79awc20rp8qw5d5j3wbb9by"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; }; + GRaNIE = derive2 { name="GRaNIE"; version="1.2.0"; sha256="1qxfjgv2z7b97m9mcs6h0qfg7pwkai0bhv8mprgl3j1cra9zl9li"; depends=[biomaRt Biostrings checkmate circlize colorspace ComplexHeatmap data_table DESeq2 dplyr forcats futile_logger GenomeInfoDb GenomicRanges ggplot2 gridExtra igraph limma magrittr Matrix matrixStats patchwork progress RColorBrewer readr reshape2 rlang S4Vectors scales stringr SummarizedExperiment tibble tidyr tidyselect viridis]; }; + GRmetrics = derive2 { name="GRmetrics"; version="1.24.0"; sha256="08jjmlr1xiilfji6c42bcaf22vjvizhj1vgxxxzmda349cxyc1fv"; depends=[drc ggplot2 plotly S4Vectors SummarizedExperiment]; }; + GRridge = derive2 { name="GRridge"; version="1.22.0"; sha256="0vmwm50dwk3im3qx40vh9ipmfqywzz5fmmm79b74zjcd3qjrznf3"; depends=[glmnet graph Iso mvtnorm penalized survival]; }; + GSALightning = derive2 { name="GSALightning"; version="1.26.0"; sha256="08zkd2vganx424g8kkp2ny9dzpggcvj53avsjk7gx2fr1l8zxhmd"; depends=[data_table Matrix]; }; + GSAR = derive2 { name="GSAR"; version="1.32.0"; sha256="17i6v0wmcl7qz96aqaf596zrdfndja9nvrzy298vsz3xgb9x0jx2"; depends=[igraph]; }; + GSCA = derive2 { name="GSCA"; version="2.28.0"; sha256="0svf5cz8dq6ghv6qvpzrhziks9nchkg3izw3ivqnqgc9b7h54cds"; depends=[ggplot2 gplots RColorBrewer reshape2 rhdf5 shiny sp]; }; + GSEABase = derive2 { name="GSEABase"; version="1.60.0"; sha256="0i8fliln3v9sw9x34pqafdx1z6jkys8b11fkz4ihmw8lc8lfd0x5"; depends=[annotate AnnotationDbi Biobase BiocGenerics graph XML]; }; + GSEABenchmarkeR = derive2 { name="GSEABenchmarkeR"; version="1.18.0"; sha256="11j46g9knb7da3xh5fq68w3d3z2h73w08dc7ml35a3336f52604w"; depends=[AnnotationDbi AnnotationHub Biobase BiocFileCache BiocParallel edgeR EnrichmentBrowser ExperimentHub KEGGandMetacoreDzPathwaysGEO KEGGdzPathwaysGEO S4Vectors SummarizedExperiment]; }; + GSEAlm = derive2 { name="GSEAlm"; version="1.58.0"; sha256="0xzywh8824xiggwgw88x2x83z75wwrajiv7qk7hgp1zw2mg2k15y"; depends=[Biobase]; }; + GSEAmining = derive2 { name="GSEAmining"; version="1.8.0"; sha256="0dlj9s2070bms5ih896sffniygcnwbvbq6wphiwsljgcs4fb94sf"; depends=[dendextend dplyr ggplot2 ggwordcloud gridExtra rlang stringr tibble tidytext]; }; + GSRI = derive2 { name="GSRI"; version="2.46.0"; sha256="13nhiz25h66c8ql2mcdx9zvlvqyxvhvy2xcsh2z42jggrnbq026p"; depends=[Biobase fdrtool genefilter GSEABase les]; }; + GSReg = derive2 { name="GSReg"; version="1.32.0"; sha256="0zz1xlf3n0bwlvpn8r8bi5q54rjaj2clnzg773ksnc59nw1bkxzq"; depends=[AnnotationDbi GenomicFeatures Homo_sapiens org_Hs_eg_db]; }; + GSVA = derive2 { name="GSVA"; version="1.46.0"; sha256="1vpnxcjd9npbmqpffdr6gl89b17jcjykkr725z9144xkaqclbw65"; depends=[Biobase BiocParallel BiocSingular DelayedArray DelayedMatrixStats GSEABase HDF5Array IRanges Matrix S4Vectors SingleCellExperiment sparseMatrixStats SummarizedExperiment]; }; + GSgalgoR = derive2 { name="GSgalgoR"; version="1.8.0"; sha256="176qh1cfmy1cv3773fhy5x0g7qx9rnawmkk7n77mikbp45c8yvi9"; depends=[cluster doParallel foreach matchingR nsga2R proxy survival]; }; + GUIDEseq = derive2 { name="GUIDEseq"; version="1.28.0"; sha256="0bvns0sqwmqybfjcy9cbdwm3gglf7fisllxmvqxk9ky270jc31zg"; depends=[BiocGenerics Biostrings BSgenome ChIPpeakAnno CRISPRseek data_table dplyr GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 hash IRanges limma matrixStats multtest openxlsx patchwork purrr rio rlang Rsamtools S4Vectors stringr tidyr]; }; + GWAS_BAYES = derive2 { name="GWAS.BAYES"; version="1.8.0"; sha256="1h481k2sz3mbj5wq8xfi78gc97p2370yadj37pb0hw1mi460xx4c"; depends=[caret doParallel GA ggplot2 Matrix memoise Rcpp RcppEigen reshape2]; }; + GWASTools = derive2 { name="GWASTools"; version="1.44.0"; sha256="02fi0vqk554l3akh841lam4wfknzi31rpbgj560vjfgpwvhz5r9q"; depends=[Biobase data_table DBI DNAcopy gdsfmt GWASExactHW lmtest logistf quantsmooth RSQLite sandwich survival]; }; + GWENA = derive2 { name="GWENA"; version="1.8.0"; sha256="1w27nwgs6087a5s0vh70365ikv60ahp3jvhridsqy9n038wp2yhq"; depends=[cluster dplyr dynamicTreeCut ggplot2 gprofiler2 igraph magrittr matrixStats NetRep purrr RColorBrewer rlist stringr SummarizedExperiment tibble tidyr WGCNA]; }; + GateFinder = derive2 { name="GateFinder"; version="1.18.0"; sha256="1s37haxmdh84fxqjvvb3dvaha8ds2khhnfk8z7jpsx1arzzlm9r0"; depends=[diptest flowCore flowFP mvoutlier splancs]; }; + GenProSeq = derive2 { name="GenProSeq"; version="1.2.0"; sha256="1fmmyb2lhnnvr8s9l8pljrkpzlzhbchy0sv6q72lgqbnxr5p2a5f"; depends=[CatEncoders DeepPINCS keras mclust reticulate tensorflow ttgsea word2vec]; }; + GenVisR = derive2 { name="GenVisR"; version="1.29.3"; sha256="0qqcdxjpkj8dlwq0najlbvp6lqby6x812w0h3ds9n8b06mxddzp2"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome data_table DBI GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra gtable gtools IRanges plyr reshape2 Rsamtools scales VariantAnnotation viridis]; }; + GeneAccord = derive2 { name="GeneAccord"; version="1.15.0"; sha256="1dlnqdcrl1fv5yf0zwfgkqfd2x19fv6q84p7c730nmnnaqal6md1"; depends=[biomaRt caTools dplyr ggplot2 ggpubr gtools magrittr maxLik RColorBrewer reshape2 tibble]; }; + GeneBreak = derive2 { name="GeneBreak"; version="1.28.0"; sha256="1rq7zw6d6i4qrich9g00pshily56y704q6llwgb39609m1h9828c"; depends=[CGHbase CGHcall GenomicRanges QDNAseq]; }; + GeneExpressionSignature = derive2 { name="GeneExpressionSignature"; version="1.44.0"; sha256="16cgfw2fdggkzklb13qf7mravbjymg6yazl7q6iqdrkwlhpxl0f7"; depends=[Biobase]; }; + GeneGA = derive2 { name="GeneGA"; version="1.48.0"; sha256="136z3sxjps1k63ivr0cmqg7xkvbzf7j69vwkfbc1n00yfapiprm2"; depends=[hash seqinr]; }; + GeneGeneInteR = derive2 { name="GeneGeneInteR"; version="1.24.0"; sha256="1j8jkg5cfkizd62rqmagwnmbi5f3c9bix7q5si115wxnc1nfc8cd"; depends=[data_table FactoMineR GenomicRanges igraph IRanges kernlab mvtnorm Rsamtools snpStats]; }; + GeneMeta = derive2 { name="GeneMeta"; version="1.70.0"; sha256="1ggjnbsmjnprdmbpcb0ghqaydr95d7vf9q27z0kg1mb6djd92n26"; depends=[Biobase genefilter]; }; + GeneNetworkBuilder = derive2 { name="GeneNetworkBuilder"; version="1.40.0"; sha256="023ibp69gb322csc8g7yz2l1khhsh20zdqxf1apcv0mr5ils6nga"; depends=[graph htmlwidgets plyr Rcpp Rgraphviz rjson XML]; }; + GeneOverlap = derive2 { name="GeneOverlap"; version="1.34.0"; sha256="0ii3ymysqkhyvj204zigpgjny0cglggqmvw311gvgkdi16dib1qs"; depends=[gplots RColorBrewer]; }; + GeneRegionScan = derive2 { name="GeneRegionScan"; version="1.54.0"; sha256="1q7fgxgak5fahmxy17ys3g3k1mqihinyhnm0f7dfvydmd25cfx84"; depends=[affxparser Biobase Biostrings RColorBrewer S4Vectors]; }; + GeneSelectMMD = derive2 { name="GeneSelectMMD"; version="2.42.1"; sha256="0cg5zkkg1bd3nxaxpvw46xbi4b7k1wnl0zb40qh2xizvsmrkw8n2"; depends=[Biobase limma MASS]; }; + GeneStructureTools = derive2 { name="GeneStructureTools"; version="1.18.0"; sha256="0kn3qgdzi6wdr6r34s646j082lv11hng71l8waqiip2xn7xqnjww"; depends=[Biostrings BSgenome_Mmusculus_UCSC_mm10 data_table GenomicRanges Gviz IRanges plyr rtracklayer S4Vectors stringdist stringr]; }; + GeneTonic = derive2 { name="GeneTonic"; version="2.2.0"; sha256="113h6s9xak7qpc6wgkr33sqr7s62xnx78ciz0jhhw4ya5vbh90pj"; depends=[AnnotationDbi backbone bs4Dash circlize colorspace colourpicker ComplexHeatmap ComplexUpset 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.60.1"; sha256="1haqy46wfkgwbv86k5fw6q0hxd98i75z5rxjkzpl2dhara0zmkna"; depends=[gdata genetics MASS]; }; + GenomAutomorphism = derive2 { name="GenomAutomorphism"; version="1.0.2"; sha256="1qcc6k6nnx6p4g8pzzdvpqg3wc8b26ml3l6c24mjki7630xvgxy5"; depends=[BiocGenerics BiocParallel Biostrings data_table doParallel dplyr foreach GenomeInfoDb GenomicRanges IRanges numbers S4Vectors]; }; + GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.34.4"; sha256="1nskqmlar85zg96c1fbacl7dqg6r0gl814rc7yh482y4wgmwyg0r"; depends=[BiocGenerics GenomeInfoDbData IRanges RCurl S4Vectors]; }; + GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.34.0"; sha256="0y9yjyzch0cn2j4yrwfp0z8qw3yqvl8h1dlrl7ylzy9mwsqc6wg5"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; }; + GenomicDataCommons = derive2 { name="GenomicDataCommons"; version="1.22.0"; sha256="0wzkhbv1zalx05l3vwr9qjr8335iwyp47pjnapcn5if49a55m8c1"; depends=[dplyr GenomicRanges httr IRanges jsonlite magrittr rappdirs readr rlang tibble xml2]; }; + GenomicDistributions = derive2 { name="GenomicDistributions"; version="1.6.0"; sha256="0kknl7ras2wir8775m0spl8dya6pf68l1br14wzjrxxwsdlbfx7c"; depends=[Biostrings broom data_table dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges plyr reshape2 scales]; }; + GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.50.3"; sha256="14pn7lngayascj5k84g2g748assbivpiakss247cdj9ngzx5sfwz"; depends=[AnnotationDbi Biobase BiocGenerics BiocIO biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors XVector]; }; + GenomicFiles = derive2 { name="GenomicFiles"; version="1.34.0"; sha256="0k64m9f5y88p90wd87hy0ixj5ly5yi413al9p2bn10b1fjx2c451"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges MatrixGenerics Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; + GenomicInteractionNodes = derive2 { name="GenomicInteractionNodes"; version="1.2.0"; sha256="12mrnc2wpsj87qkff5kxz58058wzvr8s94pc98lvf8csha6sf6rc"; depends=[AnnotationDbi GenomeInfoDb GenomicFeatures GenomicRanges GO_db graph IRanges RBGL S4Vectors]; }; + GenomicInteractions = derive2 { name="GenomicInteractions"; version="1.32.0"; sha256="0l14hz5pr0wlin46y8ycpvk5hp2ld9ajx11y85rw5hlwv50byfbb"; depends=[Biobase BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph InteractionSet IRanges Rsamtools rtracklayer S4Vectors stringr]; }; + GenomicOZone = derive2 { name="GenomicOZone"; version="1.12.0"; sha256="0jq8llksadhls1174g22kjr0k5vdsz99k9h2ypwfji2j05c4843a"; depends=[biomaRt Ckmeans_1d_dp GenomeInfoDb GenomicRanges ggbio ggplot2 gridExtra IRanges lsr plyr Rdpack S4Vectors]; }; + GenomicRanges = derive2 { name="GenomicRanges"; version="1.50.1"; sha256="14m4pvvd9m8kpc7k905km9vib7giq0i9g11bxc1ygw30ifi96966"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; }; + GenomicScores = derive2 { name="GenomicScores"; version="2.10.0"; sha256="1sz0gmwc5iam83pxnc702pd5h6nsa46kb0wsqs8ysb1ximbkfh5h"; depends=[AnnotationHub Biobase BiocFileCache BiocGenerics BiocManager Biostrings DelayedArray GenomeInfoDb GenomicRanges HDF5Array httr IRanges rhdf5 S4Vectors XML]; }; + GenomicSuperSignature = derive2 { name="GenomicSuperSignature"; version="1.6.0"; sha256="0mzwn9fchaxkpd4f85bj63gnwnrxba47slrcxmgv7a39b1yjh46y"; depends=[Biobase BiocFileCache ComplexHeatmap dplyr flextable ggplot2 ggpubr irlba plotly S4Vectors SummarizedExperiment]; }; + GenomicTuples = derive2 { name="GenomicTuples"; version="1.32.0"; sha256="1wahzm5vk1l5gcj8y8ngkp9w1yzk0b5hsvx53mpcis08np9x64bk"; depends=[BiocGenerics data_table GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; }; + GeoDiff = derive2 { name="GeoDiff"; version="1.4.0"; sha256="0ycfzy05kr638a4hydhxl36n9qmdjb2gp8njbc49xgq5qby6qpgc"; depends=[Biobase GeomxTools lme4 Matrix NanoStringNCTools plyr Rcpp RcppArmadillo robust roptim testthat withr]; }; + GeomxTools = derive2 { name="GeomxTools"; version="3.2.0"; sha256="1rhld2s6ixq8djnqpmxjbibkrksxgvn4giyrqm8pmmkqy3awczs6"; depends=[Biobase BiocGenerics data_table dplyr EnvStats GGally ggplot2 lmerTest NanoStringNCTools readxl reshape2 rjson rlang S4Vectors SeuratObject stringr]; }; + GladiaTOX = derive2 { name="GladiaTOX"; version="1.14.0"; sha256="02svr9mnqzp3gy8gd5b5d53mc0gdw8vkdzyhxarq52bp711q8g03"; depends=[brew data_table DBI ggplot2 ggrepel numDeriv RColorBrewer RCurl RJSONIO RMySQL RSQLite stringr tidyr XML xtable]; }; + Glimma = derive2 { name="Glimma"; version="2.8.0"; sha256="1fskabpd3xlrbhqvzam9ibpxmbdys7y1b265np8hz4k704ww1g22"; depends=[DESeq2 edgeR htmlwidgets jsonlite limma S4Vectors SummarizedExperiment]; }; + GlobalAncova = derive2 { name="GlobalAncova"; version="4.16.0"; sha256="0z3c9kcd17chsnypl5kbrdaz1pdlaq687aq9y9yqasqp8bb8lqwv"; depends=[annotate AnnotationDbi Biobase corpcor dendextend globaltest GSEABase VGAM]; }; + GmicR = derive2 { name="GmicR"; version="1.12.0"; sha256="08a296vyl3bcrak3bpgb7il1r8w1mf7hwhc1qvrxfjlj7w1v1yfm"; depends=[AnnotationDbi ape bnlearn Category data_table doParallel DT foreach GOstats gRain gRbase GSEABase org_Hs_eg_db org_Mm_eg_db reshape2 shiny WGCNA]; }; + GraphAT = derive2 { name="GraphAT"; version="1.70.0"; sha256="1y4fbxvcrb6gndz69g17ya1ad11anbxbiymdvxp9rs363kg563ll"; depends=[graph MCMCpack]; }; + GraphAlignment = derive2 { name="GraphAlignment"; version="1.62.0"; sha256="004ivwdz8xdpvdakc9i32skh9f7rj8d5mf3r1ap2n1al53ymbjlj"; depends=[]; }; + GraphPAC = derive2 { name="GraphPAC"; version="1.40.0"; sha256="08kpnqpmicm3jydnx4p9yxmqf7rj4br8jsi6zv04qq4f3mz1l1ii"; depends=[igraph iPAC RMallow TSP]; }; + GreyListChIP = derive2 { name="GreyListChIP"; version="1.30.0"; sha256="02qzvs8fmh79g4cc5j2gxj1wazpmly7vjr527qlsgi3jmc3swxgz"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer SummarizedExperiment]; }; + Guitar = derive2 { name="Guitar"; version="2.14.0"; sha256="0lrw1v82amr54bkfh98953b16fhlgd1i6kz1g7zy8gj0hd417ms1"; depends=[AnnotationDbi dplyr GenomicFeatures GenomicRanges ggplot2 knitr magrittr rtracklayer]; }; + Gviz = derive2 { name="Gviz"; version="1.42.0"; sha256="09j94kk3dd3bbfw6a2l14i7vd4rh11g9lxhw4zsm15vg71cm1lv9"; 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.26.0"; sha256="1y25mlsqf2inij6w2825xxl30bdba971az6rjf7j9bnya3gpvi6h"; depends=[BiocGenerics DelayedArray IRanges Matrix rhdf5 rhdf5filters Rhdf5lib S4Vectors]; }; + HDTD = derive2 { name="HDTD"; version="1.32.0"; sha256="1x3j104sa69qcymxzsda460fcwphk2kfy9hbh4jj92jqglqv6npp"; depends=[Rcpp RcppArmadillo]; }; + HELP = derive2 { name="HELP"; version="1.56.0"; sha256="1j5wa3w32rsj4pzvx4dyg43m2kqmnxxyrd2gaplnq9riwgmqgs0j"; depends=[Biobase]; }; + HEM = derive2 { name="HEM"; version="1.70.0"; sha256="03m1ciknphvh6vf0jl2n53jjqdggjaakvfpyx6ba0zspa88pw2lk"; depends=[Biobase]; }; + HGC = derive2 { name="HGC"; version="1.6.0"; sha256="0lxjfzwcmksfrfgs49ad7idv93z7y7g35vir2sxacnmprs451nar"; depends=[ape dendextend dplyr ggplot2 Matrix mclust patchwork RANN Rcpp RcppEigen]; }; + HIBAG = derive2 { name="HIBAG"; version="1.34.0"; sha256="11ybx1r91r6m8hflmj5bl0531yfqpcjclkm38xjq51g4q5kjypbx"; depends=[RcppParallel]; }; + HIPPO = derive2 { name="HIPPO"; version="1.10.0"; sha256="136wsy70p87yva1ipdxg27gsz9mran9q9050frrx91d0fl1q7d94"; depends=[dplyr ggplot2 ggrepel gridExtra irlba magrittr Matrix reshape2 rlang Rtsne SingleCellExperiment umap]; }; + HIREewas = derive2 { name="HIREewas"; version="1.16.0"; sha256="1mrymcipll2rj8xkh0h7ggvkazdlrhw16px6kc4xfwkr65vs4p7g"; depends=[gplots quadprog]; }; + HMMcopy = derive2 { name="HMMcopy"; version="1.40.0"; sha256="0p1jn2lyvwy9kx83kmpxjma0fcar8gngp3hmv35qc2qa0ns6ji5v"; depends=[data_table]; }; + HPAStainR = derive2 { name="HPAStainR"; version="1.8.0"; sha256="0h2i5aihrwhka4qq5xka1l1k5kwx1sn2j0xccgiwkm27743y1l68"; depends=[data_table dplyr scales shiny stringr tibble tidyr]; }; + HPAanalyze = derive2 { name="HPAanalyze"; version="1.16.0"; sha256="0kfmlsar5a8ypq412fzm473phadqy9s1icn1idwbk9hrv6a9h0ch"; depends=[dplyr ggplot2 gridExtra openxlsx tibble xml2]; }; + HPiP = derive2 { name="HPiP"; version="1.4.0"; sha256="0rpfkkicc1bhzwxfkh29wz154vn651aydjvri9m8py0fw5lwjc21"; depends=[caret corrplot dplyr ggplot2 httr igraph magrittr MCL pROC protr PRROC purrr readr stringr tibble tidyr]; }; + HTSFilter = derive2 { name="HTSFilter"; version="1.38.0"; sha256="15fxsdh2zaz42i3zrpk8yrvgwg8f1jk8f184wjdrkw3jlxh46k55"; depends=[Biobase BiocParallel DESeq2 edgeR]; }; + HTSeqGenie = derive2 { name="HTSeqGenie"; version="4.27.0"; sha256="14w7fmxmcs81m9nkq33nrsk98pb55zprnzhrg6whzkid9g7fg4y0"; depends=[BiocGenerics BiocParallel Biostrings Cairo chipseq GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gmapR hwriter IRanges Rsamtools rtracklayer S4Vectors ShortRead SummarizedExperiment VariantAnnotation VariantTools]; }; + HTqPCR = derive2 { name="HTqPCR"; version="1.52.0"; sha256="1kclvh8f2sf534cjw07ry9nx74n6p7r0vmc3mk2nr37yvpf26b3q"; depends=[affy Biobase gplots limma RColorBrewer]; }; + Harman = derive2 { name="Harman"; version="1.26.0"; sha256="1gfdmcjgr3vnafyddcg8kvw0ls7303r2z7ql2lls31x4cz9las3w"; depends=[Ckmeans_1d_dp matrixStats Rcpp]; }; + Harshlight = derive2 { name="Harshlight"; version="1.70.0"; sha256="0asjgcnwawg8x7ql0srhb2011rvb4kr2cpsa1cy28nfmjfvdf0qm"; depends=[affy altcdfenvs Biobase]; }; + Heatplus = derive2 { name="Heatplus"; version="3.6.0"; sha256="0zbjw9f616dz1fpp6q6whbmlrf2gypq8pp9i66c376cs2aifp1si"; depends=[RColorBrewer]; }; + HelloRanges = derive2 { name="HelloRanges"; version="1.24.0"; sha256="049841bzm0mbj3vhy70yp1r4kc95lqn1yz52ld24b9m2svwzwzhc"; depends=[BiocGenerics BiocIO Biostrings BSgenome docopt GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; + Herper = derive2 { name="Herper"; version="1.8.1"; sha256="18jmxkw6j7y10958q48phs5hanw3aqdnjx64r9qymg8jbf4z5gnr"; depends=[reticulate rjson withr]; }; + HiCBricks = derive2 { name="HiCBricks"; version="1.16.0"; sha256="03m80snh7k7gmkjj19rxgch2bhwlwiibrpg3wc2gyqiv0007c6nl"; 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.6.0"; sha256="0kq6p1v4d29f9x1b1bfad4gqmi61cjv8h10lzlfkybiqvqgv717d"; depends=[bbmle Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicInteractions GenomicRanges InteractionSet IRanges MASS pscl R_utils Rcpp rlang rtracklayer S4Vectors tibble tidyr]; }; + HiCDOC = derive2 { name="HiCDOC"; version="1.0.0"; sha256="06814r4nmznixr9iq7kkfr5cj8wpgyfykscz454pvz3fzflfxvr1"; depends=[BiocGenerics BiocParallel data_table GenomeInfoDb GenomicRanges ggExtra ggplot2 ggpubr gridExtra gtools InteractionSet multiHiCcompare pbapply Rcpp rhdf5 S4Vectors SummarizedExperiment zlibbioc]; }; + HiCcompare = derive2 { name="HiCcompare"; version="1.20.0"; sha256="0hvv3bp0fk03bg7ndnr7j4p1a56xavbpl84941fngc45xybdqjmf"; depends=[BiocParallel data_table dplyr GenomicRanges ggplot2 gridExtra gtools InteractionSet IRanges KernSmooth mgcv pheatmap QDNAseq rhdf5 S4Vectors]; }; + HiContacts = derive2 { name="HiContacts"; version="1.0.0"; sha256="1sbvlfldfbill61vih6ankmqz63r9ym6p3l3j7fy8pl4q1bwv5xf"; depends=[BiocGenerics dplyr GenomeInfoDb GenomicInteractions GenomicRanges ggplot2 ggrastr glue HiContactsData InteractionSet IRanges Matrix reticulate rhdf5 S4Vectors scales stringr tibble tidyr vroom]; }; + HiLDA = derive2 { name="HiLDA"; version="1.12.0"; sha256="0jlx7x06lrxh86sbkcnyabbv1g1jyf06dwj0wmlx9q1q7n0wn08d"; 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.42.0"; sha256="10m3pq22a8m8bbfkmq5r44ydg2668g6dxmxp7km47jxgf9hlqhcl"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; }; + HilbertCurve = derive2 { name="HilbertCurve"; version="1.28.0"; sha256="09l6lllp0sqb1m7fgdxmq05ng4qr6817l360s7ly6cigkaylq6s1"; depends=[circlize GenomicRanges HilbertVis IRanges png polylabelr]; }; + HilbertVis = derive2 { name="HilbertVis"; version="1.56.0"; sha256="15xql3rq1g2p0ih1ahjv2y9rwfrzrhj9f4sp7qrrhha9izas4v6d"; depends=[lattice]; }; + HilbertVisGUI = derive2 { name="HilbertVisGUI"; version="1.56.0"; sha256="1x4clsjdg95wn4n65jyh1fyhnamma1897mq9jg16akvg7d48q60m"; depends=[HilbertVis]; }; + HubPub = derive2 { name="HubPub"; version="1.6.0"; sha256="014alfgyrqk8l74jsnz9lkjfiracrrdg7xv757qawvkwzl4phs89"; depends=[available aws_s3 BiocManager biocthis dplyr fs usethis]; }; + HumanTranscriptomeCompendium = derive2 { name="HumanTranscriptomeCompendium"; version="1.14.0"; sha256="1jlq5np9sxdznxmbqjxlasx8ksy2lzhx98sf6svkxjw9p5qxpxlk"; depends=[S4Vectors shiny ssrch SummarizedExperiment]; }; + HybridMTest = derive2 { name="HybridMTest"; version="1.42.0"; sha256="0mv092lq8548l306ghgvh8yka1fnyvs7w1yzfjzcchj8vlsb0qns"; depends=[Biobase fdrtool MASS survival]; }; + IHW = derive2 { name="IHW"; version="1.26.0"; sha256="04vbf42bzqydf5mi4mqmcyh0xdx4phs4cjhsm6fimhmjhxm8jyry"; depends=[BiocGenerics fdrtool lpsymphony slam]; }; + ILoReg = derive2 { name="ILoReg"; version="1.8.0"; sha256="1zqlj87p641xi77vgdskxyspg2pnwmva3a4sn62w7r8blik4j3z1"; depends=[aricode cluster cowplot dendextend DescTools doRNG doSNOW dplyr fastcluster foreach ggplot2 LiblineaR Matrix parallelDist pheatmap plyr reshape2 RSpectra Rtsne S4Vectors scales SingleCellExperiment SparseM SummarizedExperiment umap]; }; + IMAS = derive2 { name="IMAS"; version="1.22.0"; sha256="1kc30iq5myxqx81kl9pkwm2lydg0n8prch7f4nvm175myyni0950"; depends=[AnnotationDbi BiocGenerics BiocParallel doParallel foreach GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggfortify ggplot2 gridExtra IRanges IVAS lattice lme4 Matrix Rsamtools S4Vectors survival]; }; + IMMAN = derive2 { name="IMMAN"; version="1.18.0"; sha256="1kmpg3zlhdg9b4dgj2r1v67kdpj17383v85ycik35lvpa2dh9xa6"; depends=[Biostrings igraph seqinr STRINGdb]; }; + IMPCdata = derive2 { name="IMPCdata"; version="1.34.0"; sha256="1gasv2i11sfdsinpg46b1lmjc8g864wzjg3791zx43ls1qnslgdh"; depends=[rjson]; }; + INDEED = derive2 { name="INDEED"; version="2.12.0"; sha256="14ivj70sdzii9cqm5qh76r92i7pscr4scix7pn6s5zfs7g2z5sri"; depends=[devtools glasso igraph visNetwork]; }; + INPower = derive2 { name="INPower"; version="1.34.0"; sha256="07sjr0z3m1jchlxc1pqp97l4mydskbkh1xw41cwsw39r9ssimpni"; depends=[mvtnorm]; }; + INSPEcT = derive2 { name="INSPEcT"; version="1.28.0"; sha256="126cbanan2fr916spacw6lm8hzkys56k7z3gq0r351zd7q13gky3"; depends=[Biobase BiocGenerics BiocParallel DESeq2 deSolve gdata GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges KernSmooth plgem pROC rootSolve Rsamtools rtracklayer S4Vectors shiny SummarizedExperiment TxDb_Mmusculus_UCSC_mm9_knownGene]; }; + IONiseR = derive2 { name="IONiseR"; version="2.22.0"; sha256="1xkxqavhcw22lhij87cpd5ps1ldkzzi0pp93d38pxbbhj15gc3d3"; depends=[BiocGenerics BiocParallel Biostrings bit64 dplyr ggplot2 magrittr rhdf5 ShortRead stringr tibble tidyr XVector]; }; + IPO = derive2 { name="IPO"; version="1.24.0"; sha256="0hj1kprkkv9ab0akblb89ww0iwsqlnr0r6d8i079fif197ikfr08"; depends=[BiocParallel CAMERA rsm xcms]; }; + IRISFGM = derive2 { name="IRISFGM"; version="1.6.0"; sha256="1dhnv62p9crdrqi4kla33hykl4ag7agcb298ycgszc4h8mmslgrc"; 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.32.0"; sha256="0jvavhl6p2di0n5176gg7shfmpg79rngl2gaw423icswdf8kay89"; depends=[BiocGenerics S4Vectors]; }; + ISAnalytics = derive2 { name="ISAnalytics"; version="1.8.1"; sha256="0lshyr3mg3w3h4annx0ssjv9njlyz3z79gl3sw2dq0g7viipd6pv"; depends=[bslib data_table datamods dplyr forcats fs ggplot2 ggrepel glue lifecycle lubridate magrittr psych purrr Rcapture readr readxl rlang shiny shinyWidgets stringr tibble tidyr]; }; + ISLET = derive2 { name="ISLET"; version="1.0.0"; sha256="0iwcdvq5dzvdsiwchlmlzfay10x5ci35i905xkiil6a77l9s57iq"; depends=[BiocGenerics BiocParallel Matrix SummarizedExperiment]; }; + ISoLDE = derive2 { name="ISoLDE"; version="1.26.0"; sha256="07xw0cg121xcv85d4ah67a38x3y8h6gxx8zwrwqffp86vfzqwcgl"; depends=[]; }; + ITALICS = derive2 { name="ITALICS"; version="2.58.0"; sha256="0g937h9zxkxnm424wh58b46mfasdd7pqy5c04r0a46mx9lxibgbs"; depends=[affxparser DBI GLAD ITALICSData oligo oligoClasses pd_mapping50k_xba240]; }; + IVAS = derive2 { name="IVAS"; version="2.18.0"; sha256="0nhmxxj0gdbsx18a2cn2905ylf1m6h514ak51fxfrl3krcjz3flr"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges ggfortify ggplot2 IRanges lme4 Matrix S4Vectors]; }; + IWTomics = derive2 { name="IWTomics"; version="1.22.0"; sha256="18mdhld2m3pjfmnaryfvdaa0z6h87hjcy0dkx5vkpjn9ph0cc7pq"; depends=[fda GenomicRanges gtable IRanges KernSmooth S4Vectors]; }; + Icens = derive2 { name="Icens"; version="1.70.0"; sha256="13ygc467nqh0235sf1ags1ihv7pg2yriva6qi7z46c534vxv6b8n"; depends=[survival]; }; + IdeoViz = derive2 { name="IdeoViz"; version="1.34.0"; sha256="0jpj8bkfm3jcb5fj0xhh13vqh2dcgdgi4i1qk3wx1301irkk7fgf"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges RColorBrewer rtracklayer]; }; + IgGeneUsage = derive2 { name="IgGeneUsage"; version="1.12.0"; sha256="1bzj6ckkwj430pwzy4nysk0k0vbjpa9mgibgabl03m7n33irxvza"; depends=[BH Rcpp RcppEigen RcppParallel reshape2 rstan rstantools StanHeaders SummarizedExperiment]; }; + ImmuneSpaceR = derive2 { name="ImmuneSpaceR"; version="1.26.0"; sha256="16nf2m2vij7vx8nxmwk6pc1im5mia1x1y7kbwn0jcfm5ac57mzpd"; depends=[Biobase curl data_table digest flowCore flowWorkspace ggplot2 gplots heatmaply httr jsonlite pheatmap plotly preprocessCore R6 Rlabkey rmarkdown scales]; }; + InPAS = derive2 { name="InPAS"; version="2.6.0"; sha256="1xbkz7g8yw43dbqkck42ikgrwi7yym39kbj65gpc4fyjyg5wkhln"; depends=[AnnotationDbi batchtools Biobase Biostrings BSgenome cleanUpdTSeq depmixS4 dplyr flock future future_apply GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges limma magrittr parallelly plyranges preprocessCore readr reshape2 RSQLite S4Vectors]; }; + InTAD = derive2 { name="InTAD"; version="1.18.0"; sha256="1fgrais14665nz0cbsmzgzawp6vzlv5v4qdbn56lvwfr4svd39ly"; depends=[Biobase BiocGenerics GenomicRanges ggplot2 ggpubr IRanges mclust MultiAssayExperiment qvalue rtracklayer S4Vectors SummarizedExperiment]; }; + Informeasure = derive2 { name="Informeasure"; version="1.8.0"; sha256="0ywffwxl3nx7w7p54ixlr058l92s2d17mrnfj9ngqxl7w3g16vfp"; depends=[entropy]; }; + IntEREst = derive2 { name="IntEREst"; version="1.22.2"; sha256="0cb3bwjcjh8ixqiys7279w12mwcx3fz5k31qpakc1mgj2nvgqsnf"; depends=[BiocGenerics BiocParallel Biostrings DBI DESeq2 DEXSeq edgeR GenomicAlignments GenomicFeatures GenomicRanges IRanges RMySQL Rsamtools S4Vectors seqinr seqLogo SummarizedExperiment]; }; + InterCellar = derive2 { name="InterCellar"; version="2.4.0"; sha256="1aqx98w4nnmb2xmrs70wqpywvq39qdmsna021ywxnyapd27w27l1"; depends=[biomaRt circlize colorspace colourpicker ComplexHeatmap config data_table dendextend dplyr DT factoextra fmsb fs ggplot2 golem htmltools htmlwidgets igraph plotly plyr readxl rlang scales shiny shinyalert shinycssloaders shinydashboard shinyFeedback shinyFiles signal tibble tidyr umap visNetwork wordcloud2]; }; + InterMineR = derive2 { name="InterMineR"; version="1.20.0"; sha256="0rp6fyhlk3dp22z5anfzx2fjw23azm4hajv67spayh8j8q9fsmkm"; depends=[Biostrings GenomicRanges httr igraph IRanges RCurl RJSONIO S4Vectors sqldf SummarizedExperiment XML xml2]; }; + InteractionSet = derive2 { name="InteractionSet"; version="1.26.0"; sha256="14fb780f2g24ay28dy9xkmfziavbkj75v4vc2cmqbxfdsfp4yn0w"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges Matrix Rcpp S4Vectors SummarizedExperiment]; }; + InteractiveComplexHeatmap = derive2 { name="InteractiveComplexHeatmap"; version="1.6.0"; sha256="14slb0g72d8ikfl7f2ir6gmxdkry6gsjgh3irxgkkjy9q880zpqi"; depends=[clisymbols ComplexHeatmap digest fontawesome GetoptLong htmltools IRanges jsonlite kableExtra RColorBrewer S4Vectors shiny svglite]; }; + IntramiRExploreR = derive2 { name="IntramiRExploreR"; version="1.20.0"; sha256="1l6bf5v1mvsmj4zqv19zfji52d6w1y08p1grqlzh6j01xjhvpz5a"; depends=[FGNet igraph knitr]; }; + IsoCorrectoR = derive2 { name="IsoCorrectoR"; version="1.16.0"; sha256="1a298xaf8ricx09bv8hxy4d67ii57vz53rbac2kqszdg2pkfayzp"; depends=[dplyr magrittr pracma quadprog readr readxl stringr tibble WriteXLS]; }; + IsoCorrectoRGUI = derive2 { name="IsoCorrectoRGUI"; version="1.14.0"; sha256="1rm1vspgfd2733y1y828awz4hwn3qqhmfsx8lld6814iqrv63mxh"; depends=[IsoCorrectoR readxl tcltk2]; }; + IsoformSwitchAnalyzeR = derive2 { name="IsoformSwitchAnalyzeR"; version="1.20.0"; sha256="06kcx0a7xxzqhf4y8l69my5chh06sfahsaz6anhana7shym3yif5"; depends=[Biobase BiocGenerics Biostrings BSgenome DBI DEXSeq dplyr DRIMSeq edgeR futile_logger GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges limma magrittr plyr RColorBrewer RCurl readr reshape2 rtracklayer stringr tibble tximeta tximport VennDiagram XVector]; }; + KBoost = derive2 { name="KBoost"; version="1.6.0"; sha256="1w7m30dpjwbkgvvhvllgycnrzalah4lnan08xpr3cyx7nbr0pbsb"; depends=[]; }; + KCsmart = derive2 { name="KCsmart"; version="2.56.0"; sha256="1v7hl0lwr407fap71q8wsdz3d3ac2nq1blaz9wn8jb5j3yqkdwy3"; depends=[BiocGenerics KernSmooth multtest siggenes]; }; + KEGGREST = derive2 { name="KEGGREST"; version="1.38.0"; sha256="0623p6px259v000pp14c2rknjgivx9c90b626q9bln0qw6wy97zc"; depends=[Biostrings httr png]; }; + KEGGgraph = derive2 { name="KEGGgraph"; version="1.58.0"; sha256="0hpsb009qmhy9p67d5wd0cl60smhgjlhxsz5f52i1c6qy4jk1niq"; depends=[graph RCurl Rgraphviz XML]; }; + KEGGlincs = derive2 { name="KEGGlincs"; version="1.24.0"; sha256="1xq10x5cirp2x3amrvprggsf8mvibfh40wa7fdnmkj8y2igf2r4z"; depends=[AnnotationDbi gtools hgu133a_db httr igraph KEGGgraph KEGGREST KOdata org_Hs_eg_db plyr RJSONIO XML]; }; + KinSwingR = derive2 { name="KinSwingR"; version="1.16.0"; sha256="051z4fcwis14ic4mz36d4aiixx3m6nndi2kj3yzykf1p1hwksq3g"; depends=[BiocParallel data_table sqldf]; }; + KnowSeq = derive2 { name="KnowSeq"; version="1.12.0"; sha256="0cxr3f67654h3nyjm4yaghw22wdb67jqg37685haffv1dkvfkcwl"; depends=[caret cqn e1071 edgeR ggplot2 gridExtra Hmisc httr jsonlite kernlab limma praznik R_utils randomForest reshape2 rlist rmarkdown stringr sva XML]; }; + LACE = derive2 { name="LACE"; version="2.2.0"; sha256="16z28avyljma30kpp4ygw76yc7h3brz4sldpr6zailnrqaxkrzmd"; depends=[biomaRt bsplus callr configr curl data_table data_tree doParallel dplyr DT foreach fs htmltools htmlwidgets igraph jsonlite logr Matrix purrr RColorBrewer readr Rfast shiny shinyBS shinydashboard shinyFiles shinyjs shinythemes shinyvalidate sortable stringi stringr SummarizedExperiment tidyr]; }; + LBE = derive2 { name="LBE"; version="1.66.0"; sha256="00460w36ayf0b9ln7v42i3wwmxyfy1hdm0snc01gaxf5276mvrai"; depends=[]; }; + LEA = derive2 { name="LEA"; version="3.10.0"; sha256="0an9m4qca9slcp847zqxxc5mk26lmmlrd755r1pfircgaaixda3f"; depends=[]; }; + LOBSTAHS = derive2 { name="LOBSTAHS"; version="1.24.0"; sha256="0xhrdq5s5cn6vvp2h1pp871vncmxjkr9dmzb9hrykpc8pfvbj9w7"; depends=[CAMERA xcms]; }; + LOLA = derive2 { name="LOLA"; version="1.28.0"; sha256="00fk1drjwc7smbykq3qcl382qqd7kcjpcamklq48pqgy2mbjyk9d"; depends=[BiocGenerics data_table GenomicRanges IRanges reshape2 S4Vectors]; }; + LPE = derive2 { name="LPE"; version="1.72.0"; sha256="06wmkwx633a3jjqhcp586x9jqic51sxyy11l8zhipzvj07fcsy70"; depends=[]; }; + LPEadj = derive2 { name="LPEadj"; version="1.58.0"; sha256="0cm8hdwfs0nrxyf6z1xwfjkpxawlh9mszmng4jakppcr9rl843ir"; depends=[LPE]; }; + LRBaseDbi = derive2 { name="LRBaseDbi"; version="2.8.0"; sha256="1fgvck20w1gix7slszgsjnss4b85mp0nkb9x4sl3a0nl9qfsjz1a"; depends=[AnnotationDbi Biobase DBI RSQLite]; }; + LRcell = derive2 { name="LRcell"; version="1.6.0"; sha256="0n5z47b4gdfyrzqrjc7dw0ja2526k71axjr3001gdfm7mx09gvmv"; depends=[AnnotationHub BiocParallel dplyr ExperimentHub ggplot2 ggrepel magrittr]; }; + LedPred = derive2 { name="LedPred"; version="1.32.0"; sha256="11rjnc9l88hlfwz7ppmliisx3m55nllmnikxiwjr6a6fx7rbhnk4"; depends=[akima e1071 ggplot2 irr jsonlite plot3D plyr RCurl ROCR testthat]; }; + LinTInd = derive2 { name="LinTInd"; version="1.2.0"; sha256="0nxjy9lrfid73dspmxdpc7davcnckl63s9bl796r6vmwkkcqfy76"; depends=[ape BiocGenerics Biostrings cowplot data_tree dplyr ggnewscale ggplot2 ggtree IRanges networkD3 pheatmap purrr reshape2 rlist S4Vectors stringdist stringr]; }; + LineagePulse = derive2 { name="LineagePulse"; version="1.18.0"; sha256="197ki29dbnm5lidlp45nidvskxpa7mdhihmlfz6qkvnbfr8c3rhg"; depends=[BiocParallel circlize ComplexHeatmap ggplot2 gplots knitr Matrix RColorBrewer SingleCellExperiment SummarizedExperiment]; }; + LinkHD = derive2 { name="LinkHD"; version="1.12.0"; sha256="02yr5lmqxkpsgqfb1jjzy1cd9mfcg2q50szjji3mdadyg2c8i8rg"; depends=[cluster data_table emmeans ggplot2 ggpubr gridExtra MultiAssayExperiment reshape2 rio scales vegan]; }; + Linnorm = derive2 { name="Linnorm"; version="2.22.0"; sha256="0ndhvdd9gkqyayxqgj5320sgj15di7ji945lpdi3rj5lwldh7na0"; depends=[amap apcluster ellipse fastcluster fpc ggdendro ggplot2 gmodels igraph limma MASS mclust Rcpp RcppArmadillo Rtsne statmod vegan zoo]; }; + LiquidAssociation = derive2 { name="LiquidAssociation"; version="1.52.0"; sha256="0jf0njw4xib0wf24k2g64jg3agglf0jc9fymcjvagc70z9pm18k3"; depends=[Biobase geepack org_Sc_sgd_db yeastCC]; }; + LoomExperiment = derive2 { name="LoomExperiment"; version="1.16.0"; sha256="1bjqg5krzxm3v1mcy208ccbs2d1aljkbpav6qz6zgwmwpsci99dz"; depends=[BiocIO DelayedArray GenomicRanges HDF5Array Matrix rhdf5 S4Vectors SingleCellExperiment stringr SummarizedExperiment]; }; + LowMACA = derive2 { name="LowMACA"; version="1.28.0"; sha256="0j5233xziszwak65rypd9f8lsp25sdr4j5nm5kanj4d4wd0zsdqv"; depends=[BiocParallel Biostrings cBioPortalData data_table gridBase httr LowMACAAnnotation motifStack plyr RColorBrewer reshape2 stringr]; }; + LymphoSeq = derive2 { name="LymphoSeq"; version="1.26.0"; sha256="1wlyk3gpy7j5ml3n3xs6mmxi9bv1ixs6gw7i2rkb513wnrxb9bg7"; depends=[Biostrings circlize data_table dplyr ggplot2 ggtree ineq LymphoSeqDB msa phangorn plyr RColorBrewer reshape stringdist UpSetR VennDiagram]; }; + M3C = derive2 { name="M3C"; version="1.20.0"; sha256="1djgbnxsdp1w9hhc6346gmvad3x8avy8nc85gpvg9i4x52wcrn4j"; depends=[cluster corpcor doParallel doSNOW foreach ggplot2 Matrix matrixcalc Rtsne umap]; }; + M3Drop = derive2 { name="M3Drop"; version="1.24.0"; sha256="1h8y27d0dnmg4k31wl2k556r4h7n7iq2536770z7ci0ir0i0y4b6"; depends=[bbmle gplots Hmisc irlba Matrix matrixStats numDeriv RColorBrewer reldist statmod]; }; + MACSQuantifyR = derive2 { name="MACSQuantifyR"; version="1.12.0"; sha256="1lxq7fanfypbzrh2il4ib9fplz6hmr0y3cdg9waplvrf1scqc8pp"; depends=[ggplot2 ggrepel gridExtra lattice latticeExtra png prettydoc readxl rmarkdown rvest xml2]; }; + MACSr = derive2 { name="MACSr"; version="1.6.0"; sha256="0ksbmj8jh87nb60h1lfwz4gx40lpryc125dh554wsy48i0kv82cs"; depends=[AnnotationHub basilisk ExperimentHub reticulate S4Vectors]; }; + MADSEQ = derive2 { name="MADSEQ"; version="1.24.0"; sha256="025ny68gcsd5pbj9g8vrnzymgq52nq72zbwsvgjl7f2b6jnbd6w9"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 coda GenomeInfoDb GenomicAlignments GenomicRanges IRanges preprocessCore rjags Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation vcfR VGAM zlibbioc]; }; + MAGAR = derive2 { name="MAGAR"; version="1.6.0"; sha256="145xnlnkpqmb18jawwizr53y4lw9d1nxc4k60lpvl2z2fn8hm3v5"; depends=[argparse bigstatsr crlmm data_table doParallel ff HDF5Array igraph impute jsonlite plyr reshape2 rjson RnBeads RnBeads_hg19 snpStats UpSetR]; }; + MAGeCKFlute = derive2 { name="MAGeCKFlute"; version="2.2.0"; sha256="1p58hcsmhgia1rlr064nfbd3kf0rlmnvabxlr2hpkw8b1hmcvrz0"; depends=[Biobase clusterProfiler depmap DOSE enrichplot ggplot2 ggrepel gridExtra msigdbr pathview reshape2]; }; + MAI = derive2 { name="MAI"; version="1.4.0"; sha256="01cpiiwzxkar8zr4q6bs2mbkh1hqszr71gzmbbp9z0b88805arm8"; depends=[caret doParallel e1071 foreach future future_apply missForest pcaMethods S4Vectors SummarizedExperiment tidyverse]; }; + MAIT = derive2 { name="MAIT"; version="1.32.0"; sha256="0i5n1bjc8bn4cx5b17d57m6fhk4m486cqnj6cn1zyyw0zy8z5sg4"; depends=[agricolae CAMERA caret class e1071 gplots MASS pls plsgenomics Rcpp xcms]; }; + MANOR = derive2 { name="MANOR"; version="1.70.0"; sha256="16b30bmyzml97cjdbh6h9ky5c4h5ws2a3g2xkxnd55sd3jg64jgx"; depends=[GLAD]; }; + MAST = derive2 { name="MAST"; version="1.24.0"; sha256="133ijkw5sd0gl38dfr7qfqvvp2df7lg6j8vkvy54zlpamkg6l2x1"; depends=[abind Biobase BiocGenerics data_table ggplot2 plyr progress reshape2 S4Vectors SingleCellExperiment stringr SummarizedExperiment]; }; + MBASED = derive2 { name="MBASED"; version="1.32.0"; sha256="09v229vgxwhf3vx8nx2zb0g6rzqgfs91w44ly5y5r8rq2n9qa0lz"; depends=[BiocGenerics BiocParallel GenomicRanges RUnit SummarizedExperiment]; }; + MBAmethyl = derive2 { name="MBAmethyl"; version="1.32.0"; sha256="06jhcv8nw21qnzbf9law4dvrgga47di02q3124sf5v365zasnzr5"; depends=[]; }; + MBCB = derive2 { name="MBCB"; version="1.52.0"; sha256="1376537z1hzc3wb791nr13icp1h04z4jmfga2kszxsza4iw01hnr"; depends=[preprocessCore tcltk2]; }; + MBECS = derive2 { name="MBECS"; version="1.2.0"; sha256="10pyc41h3r2z5f0r7l7cg0cdyaxc2psm4q2d08dsddh8lpyc4v85"; depends=[cluster dplyr ggplot2 gridExtra limma lme4 lmerTest magrittr Matrix pheatmap phyloseq rmarkdown ruv sva tibble tidyr vegan]; }; + MBQN = derive2 { name="MBQN"; version="2.10.0"; sha256="138a7qfqcy904vlycbaif3wn9k1iwjafwvadbm3nscpz4k9x7phb"; depends=[BiocFileCache ggplot2 limma PairedData preprocessCore rappdirs RCurl rmarkdown SummarizedExperiment xml2]; }; + MBttest = derive2 { name="MBttest"; version="1.26.0"; sha256="0jgyigd60bbqrkg640i6lv2lx6k52il0k9lnrcg67v5z0xrhrrqx"; depends=[gplots gtools]; }; + MCbiclust = derive2 { name="MCbiclust"; version="1.22.0"; sha256="09sl5bk56wgs0hih492n4qscdc6nx68w6nx0cxr0pjhdvgrybli0"; depends=[AnnotationDbi BiocParallel cluster GGally ggplot2 GO_db org_Hs_eg_db scales WGCNA]; }; + MDTS = derive2 { name="MDTS"; version="1.18.0"; sha256="1jbkv7fpqla3l9hpr1g6yn152653agvmnpcljgnl01mx392xnblf"; depends=[Biostrings DNAcopy GenomicAlignments GenomicRanges IRanges Rsamtools stringr]; }; + MEAL = derive2 { name="MEAL"; version="1.28.0"; sha256="17wy534ir65vjv69m55pd6vvfdhyl5w170wbm91r5l7ri1y0r9sl"; depends=[Biobase BiocGenerics GenomicRanges ggplot2 Gviz IRanges isva limma matrixStats minfi missMethyl MultiDataSet permute S4Vectors SmartSVA SummarizedExperiment vegan]; }; + MEAT = derive2 { name="MEAT"; version="1.10.0"; sha256="150cs39xf0fnvwh76vvhf6f6ill5gqmh7cf2svhi19lldg4a569n"; depends=[dplyr dynamicTreeCut glmnet impute minfi RPMM stringr SummarizedExperiment tibble wateRmelon]; }; + MEB = derive2 { name="MEB"; version="1.12.0"; sha256="0axd2kahwy5sc6pp2bxdi4ahb6mwfsgbhbcm51l3g5jr898z8xia"; depends=[e1071 SummarizedExperiment]; }; + MEDIPS = derive2 { name="MEDIPS"; version="1.50.0"; sha256="1zb0w4d6qvzrb5xp0bfcc2mfxyj618ghw3ifhx9yhl7pqp8c8ny1"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; }; + MEDME = derive2 { name="MEDME"; version="1.58.0"; sha256="0qli5ipyv3q5qvpmp1cdqvgzl6giarg458apqyspzapwvvnn9967"; depends=[Biostrings drc MASS]; }; + MEIGOR = derive2 { name="MEIGOR"; version="1.31.0"; sha256="134253lygmwszxq2bj38iydd44rkas10cbjnz3dikn90gg0xhada"; depends=[CNORode deSolve Rsolnp snowfall]; }; + MGFM = derive2 { name="MGFM"; version="1.32.0"; sha256="0ih7hkziajyf9flxg0grfydqylvk0qr7v1wrbp1wyfh2d1bkl8l9"; depends=[annotate AnnotationDbi]; }; + MGFR = derive2 { name="MGFR"; version="1.24.0"; sha256="0r7gka30g17v22rsc059p6fwdcdpyb7n2pl93prpbkpv39lzcik3"; depends=[annotate biomaRt]; }; + MIGSA = derive2 { name="MIGSA"; version="1.21.0"; sha256="0b7w9lzi8xb1vzh7zahw7wh9jm7x1y04rs2gvvjmfbdfw085rdpm"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel data_table edgeR futile_logger ggdendro ggplot2 GO_db GOstats graph GSEABase ismev jsonlite limma matrixStats org_Hs_eg_db RBGL reshape2 Rgraphviz vegan]; }; + MIMOSA = derive2 { name="MIMOSA"; version="1.36.0"; sha256="10c07s0l2hshcvy4ym3mgq7k9569l5am2k4mx83wxwicidv607hi"; depends=[Biobase coda data_table dplyr Formula ggplot2 MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape rlang scales testthat tidyr]; }; + MIRA = derive2 { name="MIRA"; version="1.20.0"; sha256="0709kl7m1nj5jbvlsr4hfk5pr268vgvig8wq353wc7wqwq0j1yhn"; depends=[Biobase BiocGenerics bsseq data_table GenomicRanges ggplot2 IRanges S4Vectors]; }; + MLInterfaces = derive2 { name="MLInterfaces"; version="1.78.0"; sha256="0xnaghm65ydk01gzx5g38jyq7vfdw206c2w59k0qg8lhy9fqky9x"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter magrittr MASS mlbench pls RColorBrewer Rcpp rpart sfsmisc shiny SummarizedExperiment threejs]; }; + MLP = derive2 { name="MLP"; version="1.46.0"; sha256="024h8mrwpfp6nkdzk6y6v0jhng1z78h47mxb36gy1mbklhknllbv"; depends=[AnnotationDbi gplots]; }; + MLSeq = derive2 { name="MLSeq"; version="2.16.0"; sha256="040gm8bnp110mhj05whkdrfl46lrm82fkyh6zba50aap8s2mp2b4"; depends=[Biobase caret DESeq2 edgeR foreach ggplot2 limma pamr plyr sSeq SummarizedExperiment testthat VennDiagram xtable]; }; + MMAPPR2 = derive2 { name="MMAPPR2"; version="1.12.0"; sha256="0rvhvsyg2g1i8kipvg83c19nyr7xj061fnda9j771mbgagcbwma5"; 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.26.0"; sha256="0rhnlzci5zs2if3lzzn2nif3x72a42fpxkm6v83d3krw9kb9jvvd"; depends=[Biobase Biostrings BSgenome GenomicRanges ggplot2 locfit RColorBrewer Rsamtools S4Vectors shiny]; }; + MMUPHin = derive2 { name="MMUPHin"; version="1.12.0"; sha256="0swazk8zh6s88994w5jd3n8s6mfhsis4i9hahihdxqah9i21ihwg"; depends=[cowplot dplyr fpc ggplot2 igraph Maaslin2 metafor stringr tidyr]; }; + MODA = derive2 { name="MODA"; version="1.24.0"; sha256="17bfazy4wxb8idrn8frf43nrggn5n0w4bsxzmlhxjq0jm0c9ki25"; depends=[AMOUNTAIN cluster dynamicTreeCut igraph RColorBrewer WGCNA]; }; + MOFA2 = derive2 { name="MOFA2"; version="1.8.0"; sha256="1i8i7n9iki16nmwmh5fs9afj0vqls38sj7vgxjacdsldcdwxz6h0"; 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.8.0"; sha256="0rpz06rvxxxsgwb6xnk65mp2kz4jvhsr06qvkkknmyxc7q66ycb0"; depends=[BiocParallel igraph RCy3 RUnit stringr]; }; + MOMA = derive2 { name="MOMA"; version="1.10.0"; sha256="048lvnqa3wpi4bg7j8kh8dl358zppzrb3xg5ghdgk99xbanwmkqy"; depends=[circlize cluster ComplexHeatmap dplyr ggplot2 magrittr MKmisc MultiAssayExperiment qvalue RColorBrewer readr reshape2 rlang stringr tibble tidyr]; }; + MOSim = derive2 { name="MOSim"; version="1.12.0"; sha256="0x49p6f9q6vc8yn5nql9ryjd85zcimw3hy8n5wklwpx4bc3xadjs"; depends=[Biobase dplyr ggplot2 HiddenMarkov IRanges lazyeval matrixStats purrr rlang S4Vectors scales stringi stringr tibble tidyr zoo]; }; + MPFE = derive2 { name="MPFE"; version="1.34.0"; sha256="0xr4cpvr83c7mmcbm99bbgg05qd20y5vha73m4if4d8ba1l7k2mv"; depends=[]; }; + MPRAnalyze = derive2 { name="MPRAnalyze"; version="1.16.0"; sha256="1pgl0q4il2ywnbdb8pmhrwqlmjk4i5xkv8va933748fijy194pw8"; depends=[BiocParallel progress SummarizedExperiment]; }; + MQmetrics = derive2 { name="MQmetrics"; version="1.6.0"; sha256="0ch0qcgdzdz0035b2nm468q0vsvk9blws6szq7261znfvwmqpzxw"; depends=[cowplot dplyr ggforce gghalves ggplot2 ggpubr ggrepel gridExtra gtable knitr magrittr plyr purrr RColorBrewer readr reshape2 rlang rmarkdown scales stringr tidyr]; }; + MSA2dist = derive2 { name="MSA2dist"; version="1.2.0"; sha256="1248xchv7nk47w1lp61nqyhmmrfnm9vgjiiwn7ikb417hxcryay7"; depends=[ape Biostrings doParallel dplyr foreach GenomicRanges IRanges Rcpp RcppThread rlang seqinr stringi stringr tibble tidyr]; }; + MSPrep = derive2 { name="MSPrep"; version="1.8.0"; sha256="05bq27v2iwmrf92y6fyzczvnrwmpqy5b7faa3z4si68fhpa81p2s"; depends=[crmn dplyr magrittr missForest pcaMethods preprocessCore rlang S4Vectors stringr SummarizedExperiment sva tibble tidyr VIM]; }; + MSnID = derive2 { name="MSnID"; version="1.32.0"; sha256="1ljhxbyq5pa32sh44f06cwcdq79xh5nm51bpx1i8xig3bvwyg7p9"; 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.24.0"; sha256="16apm4qn7sbv06pk2i8k5z7qgkv0yq0h8ri32vikdplqxxh7h0cz"; 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.6.0"; sha256="1zgzqrwmgwc68xdkwfaxpgsiqmypq03skn3ks83nfy1i4dfh3ni9"; depends=[checkmate data_table ggplot2 ggrepel gplots limma lme4 marray MASS MSstatsConvert preprocessCore Rcpp RcppArmadillo survival]; }; + MSstatsConvert = derive2 { name="MSstatsConvert"; version="1.8.0"; sha256="1nnfjlxd3g69kscs0k1pywk4m9v1ixf6wwd909sl16gjb81ipmn9"; depends=[checkmate data_table log4r stringi]; }; + MSstatsLOBD = derive2 { name="MSstatsLOBD"; version="1.6.0"; sha256="1hg9bjx9rwsdpj65mzd931lbyj4gb26x32mly4n1gkk1rf6iplry"; depends=[ggplot2 minpack_lm Rcpp]; }; + MSstatsLiP = derive2 { name="MSstatsLiP"; version="1.4.1"; sha256="0hj10r3x1pql0497x3clk9wlv8xvbcvbv35q45x1ki8hfc5b3ifc"; 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="2.0.0"; sha256="1mawiphdv4syh6ch4fa4jin7dfyqy3klxl4yla4vv25sal9byn3j"; depends=[Biostrings checkmate data_table dplyr ggplot2 ggrepel gridExtra MSstats MSstatsConvert MSstatsTMT Rcpp stringr]; }; + MSstatsQC = derive2 { name="MSstatsQC"; version="2.16.0"; sha256="1x55d2saf8y45pp4rsln6km8iqzv14pzrsw3bjc2x6z67v837f5i"; depends=[dplyr ggExtra ggplot2 MSnbase plotly qcmetrics]; }; + MSstatsQCgui = derive2 { name="MSstatsQCgui"; version="1.18.0"; sha256="0mbflhwlvrq18k6gavsj2d32ihxgnaww8zdncadxwnlgv6p083kd"; depends=[dplyr ggExtra gridExtra MSstatsQC plotly shiny]; }; + MSstatsSampleSize = derive2 { name="MSstatsSampleSize"; version="1.12.0"; sha256="1xwb8bm92jlm2q1047v02x9v69h305l940s2a8dxjqpb42bhg1nf"; depends=[BiocParallel caret ggplot2 gridExtra MSstats reshape2]; }; + MSstatsShiny = derive2 { name="MSstatsShiny"; version="1.0.5"; sha256="01v9gnplf30jpycqkfssa5pi2fwv20shfqp1cd29m05canj1ni36"; depends=[data_table dplyr DT ggplot2 ggrepel gplots Hmisc htmltools marray MSstats MSstatsConvert MSstatsPTM MSstatsTMT shiny shinyBS shinybusy shinyjs tidyr uuid]; }; + MSstatsTMT = derive2 { name="MSstatsTMT"; version="2.6.0"; sha256="01kbdkxdgy3rj04ihzr11ljr6mrwdlks97ygwdmdn3lf1jcsb49k"; depends=[checkmate data_table ggplot2 limma lme4 lmerTest MSstats MSstatsConvert]; }; + MVCClass = derive2 { name="MVCClass"; version="1.72.0"; sha256="1yzb7m7vk50f9x1g8yb95wlmpccj3n4qgczz46lvhsk7hkifybzq"; depends=[]; }; + MWASTools = derive2 { name="MWASTools"; version="1.22.0"; sha256="1j6ixgir3mjx8xdclh2wisp82xx6ardm4rm6cz6ihdss2y34w6wi"; depends=[boot car ComplexHeatmap ggplot2 glm2 gridExtra igraph KEGGgraph KEGGREST ppcor qvalue RCurl SummarizedExperiment]; }; + Maaslin2 = derive2 { name="Maaslin2"; version="1.12.0"; sha256="0ncvsywn9f8766gjb8nxzg82p3w30g8pjs85sy8s0bz9ilanpy89"; 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]; }; + Macarron = derive2 { name="Macarron"; version="1.2.0"; sha256="14fbijbjs73piprh6irlclr4yv87waiw6wv91sz5iw1pxrhp7pli"; depends=[BiocParallel data_table DelayedArray dynamicTreeCut ff logging Maaslin2 plyr psych RCurl RJSONIO SummarizedExperiment WGCNA xml2]; }; + MantelCorr = derive2 { name="MantelCorr"; version="1.68.0"; sha256="0d42m4zbc6pzfph2ydb11rcxq7h64fvv286zx1vh2scvi8j9655a"; depends=[]; }; + MassArray = derive2 { name="MassArray"; version="1.50.0"; sha256="0jxlnl466dgbn0817h5vk5h52cblyq1r48pvk9v76dzdc86llskx"; depends=[]; }; + MassSpecWavelet = derive2 { name="MassSpecWavelet"; version="1.64.0"; sha256="0l86gwq073nbx973v99b0lr9cz0pb72c4asmgj5w16jykicrnxn9"; depends=[]; }; + MatrixGenerics = derive2 { name="MatrixGenerics"; version="1.10.0"; sha256="05a83gh5bvgadi2msgql5nmcgr8zp398rhdbmiqna608hqbymyq9"; depends=[matrixStats]; }; + MatrixQCvis = derive2 { name="MatrixQCvis"; version="1.6.1"; sha256="1l0wnfyg3wgjr35qrqdh1916bklbvf7s43nsc05vqfsccs9a9a7k"; depends=[ComplexHeatmap dplyr ggplot2 Hmisc htmlwidgets impute imputeLCMD limma MASS pcaMethods plotly proDA rlang rmarkdown Rtsne shiny shinydashboard shinyhelper shinyjs SummarizedExperiment tibble tidyr umap UpSetR vsn]; }; + MatrixRider = derive2 { name="MatrixRider"; version="1.30.0"; sha256="1y4h57n7bg6hmaszq1bzf1qlyl2p378928inca7s68ygigibsh6l"; depends=[Biostrings IRanges S4Vectors TFBSTools XVector]; }; + MeSHDbi = derive2 { name="MeSHDbi"; version="1.34.0"; sha256="1lg13vqlw3ibjpssbgwg1mpy778v22xnrr92wjfqpn8s4h057z9f"; depends=[AnnotationDbi Biobase RSQLite]; }; + MeasurementError_cor = derive2 { name="MeasurementError.cor"; version="1.70.0"; sha256="1j6scmghs6mmi0wyfxy6hsf363r90wy7njq1334xaq4crbj3kag9"; depends=[]; }; + Melissa = derive2 { name="Melissa"; version="1.14.0"; sha256="005am6j14nxp0qwyvg870349szpybx3p0fmyiwjl3zghzma41xfa"; depends=[assertthat BiocStyle BPRMeth cowplot data_table doParallel foreach GenomicRanges ggplot2 magrittr matrixcalc mclust MCMCpack mvtnorm ROCR truncnorm]; }; + Mergeomics = derive2 { name="Mergeomics"; version="1.26.0"; sha256="1svw7jk4xv0xm66qr5w2m2fz9k4ifd8dv52b5157p5apv45jdd45"; depends=[]; }; + MesKit = derive2 { name="MesKit"; version="1.8.0"; sha256="04c6y9hv49db4dy8iv122lvawhc9f8vj66ipzh6qfvgbhqm8lgc0"; 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.28.0"; sha256="1vpn9mpn6fyrvnp4rfc37s5z80bamb73d2w8484x1aim3vl467ly"; depends=[amap circlize ggplot2 MsCoreUtils S4Vectors scales shiny Spectra]; }; + MetID = derive2 { name="MetID"; version="1.16.0"; sha256="1zxhqvx6zhy8zxckih3pnafzqyivygq2iw5scvv0cv01hhkj1ac5"; depends=[ChemmineR devtools igraph Matrix stringr]; }; + MetNet = derive2 { name="MetNet"; version="1.16.0"; sha256="0d52ib51j44ic8zy0x1hmmi0q1l71n03qcra7sza0d46dpna6k8g"; depends=[BiocParallel bnlearn corpcor dplyr GeneNet GENIE3 ggplot2 parmigene psych rlang S4Vectors stabs SummarizedExperiment tibble tidyr]; }; + MetaCyto = derive2 { name="MetaCyto"; version="1.20.0"; sha256="007lwh9yxvvdr5xhnrz3krh6v9vfi386jh1040x2cnw2x5p2hjjd"; depends=[cluster fastcluster flowCore FlowSOM ggplot2 metafor tidyr]; }; + MetaNeighbor = derive2 { name="MetaNeighbor"; version="1.18.0"; sha256="1gjjp5qlmv26sd3fvrd8cgv3invckxr8ldjpizpqm4mxjzifxwpm"; depends=[beanplot dplyr ggplot2 gplots igraph Matrix matrixStats RColorBrewer SingleCellExperiment SummarizedExperiment tibble tidyr]; }; + MetaPhOR = derive2 { name="MetaPhOR"; version="1.0.0"; sha256="12imh3zwgrcaqc6gb0p6jhhb37km8j7n6cfp3d5s1rhcg2c180kx"; depends=[clusterProfiler ggplot2 ggrepel pheatmap RCy3 RecordLinkage stringr]; }; + MetaVolcanoR = derive2 { name="MetaVolcanoR"; version="1.12.0"; sha256="08m1a3gpl2zx8yw60h3y430jflagcl7c5gn9wljl043vr84rnxpi"; depends=[cowplot data_table dplyr ggplot2 htmlwidgets metafor metap plotly rlang tidyr topconfects]; }; + Metab = derive2 { name="Metab"; version="1.32.0"; sha256="0qllncdvvab093gns9jb39kqvb4v8mm61aiva4hmy5hc2sk32blv"; depends=[pander svDialogs xcms]; }; + MetaboAnnotation = derive2 { name="MetaboAnnotation"; version="1.2.0"; sha256="03731wq7vx52l986fg32mw42f95mvzmrarppnrjfg80dwsnj9qgp"; depends=[BiocGenerics BiocParallel CompoundDb MetaboCoreUtils MsCoreUtils ProtGenerics QFeatures S4Vectors Spectra SummarizedExperiment]; }; + MetaboCoreUtils = derive2 { name="MetaboCoreUtils"; version="1.6.0"; sha256="14y53snkyis1njx0vr7hy9jmn4lbw72k14x74spmsslcik2zadav"; depends=[MsCoreUtils]; }; + MetaboSignal = derive2 { name="MetaboSignal"; version="1.28.0"; sha256="1771mmdlk1i17lx51fcjv0lifc11rkk6x6qv5k03bq1fka5nfnnl"; depends=[AnnotationDbi biomaRt EnsDb_Hsapiens_v75 hpar igraph KEGGgraph KEGGREST MWASTools mygene org_Hs_eg_db RCurl]; }; + MethCP = derive2 { name="MethCP"; version="1.11.0"; sha256="099jaadjfalvxpwq3k630yrqa1dfbp8rqn2fahz1rsha3y5z9bys"; depends=[BiocParallel bsseq DNAcopy DSS GenomeInfoDb GenomicRanges IRanges methylKit S4Vectors]; }; + MethPed = derive2 { name="MethPed"; version="1.26.0"; sha256="02vjnxzl72np2skgr6kj2vfkpf9i1ll0sdicfajr5rgsjzlnjpjh"; depends=[Biobase randomForest]; }; + MethReg = derive2 { name="MethReg"; version="1.8.0"; sha256="09vzarsmjm06fvgay0ysmi5f81g921dx513i1w2s6k97d8zv7z3f"; depends=[AnnotationHub DelayedArray dplyr ExperimentHub GenomicRanges ggplot2 ggpubr IRanges MASS Matrix plyr progress pscl readr rlang S4Vectors sesame sesameData sfsmisc stringr SummarizedExperiment tibble tidyr]; }; + MethTargetedNGS = derive2 { name="MethTargetedNGS"; version="1.30.0"; sha256="1rz12vh0j96wh7chzbk88f97fbg49g433ahb0c55lkgqn6ql7r1g"; depends=[Biostrings gplots seqinr stringr]; }; + MethylAid = derive2 { name="MethylAid"; version="1.32.0"; sha256="1kzfwvjb8rzv5jghvzgfc9p85727b0v13lc8dibn4016mgap06vk"; depends=[Biobase BiocGenerics BiocParallel ggplot2 gridBase hexbin matrixStats minfi RColorBrewer shiny SummarizedExperiment]; }; + MethylMix = derive2 { name="MethylMix"; version="2.28.0"; sha256="0687kfbcj11x5idbdkkhymqxjl2f2k877wqzx506djmxlbqgac60"; depends=[data_table digest foreach ggplot2 impute limma R_matlab RColorBrewer RCurl RPMM]; }; + MethylSeekR = derive2 { name="MethylSeekR"; version="1.38.0"; sha256="0db4fxli829x3na4adzmk41rf3zwp33xzmj49w9n9c8s8k5bhagj"; depends=[BSgenome geneplotter GenomicRanges IRanges mhsmm rtracklayer]; }; + Mfuzz = derive2 { name="Mfuzz"; version="2.58.0"; sha256="01kdccfjs01a2ya22g9zig78pjvi96aq9d14js8jvf8h868wmffz"; depends=[Biobase e1071 tkWidgets]; }; + MiChip = derive2 { name="MiChip"; version="1.52.0"; sha256="1ichljymsal8mnanqck89243lwpf184r47jknd56ksvpn2s6a0ja"; depends=[Biobase]; }; + MiPP = derive2 { name="MiPP"; version="1.70.0"; sha256="08ini3nj077k7knp3zsmw33yc0wpsnszd75dnp9vdn141d1kvsmx"; depends=[Biobase e1071 MASS]; }; + MiRaGE = derive2 { name="MiRaGE"; version="1.40.0"; sha256="19jgv2sgqiqqyqcbfivj8a4qrb18ryyl74rpp3805iisx44rnbkl"; depends=[AnnotationDbi Biobase BiocGenerics BiocManager S4Vectors]; }; + MicrobiomeProfiler = derive2 { name="MicrobiomeProfiler"; version="1.4.0"; sha256="1pl2kd24h88xs0asby3zz2agx64carkd0sjm5l3mj1340b77qk5l"; depends=[clusterProfiler config DT enrichplot ggplot2 golem htmltools magrittr shiny shinycustomloader shinyWidgets]; }; + MicrobiotaProcess = derive2 { name="MicrobiotaProcess"; version="1.10.2"; sha256="0p74n2nkh341bknlkjsff4cm8hlbdnaxj4n35bhp07q6vlaclxf9"; depends=[ape Biostrings coin data_table dplyr dtplyr foreach ggplot2 ggrepel ggsignif ggstar ggtree ggtreeExtra magrittr MASS patchwork pillar plyr rlang SummarizedExperiment tibble tidyr tidyselect tidytree treeio vegan zoo]; }; + MineICA = derive2 { name="MineICA"; version="1.38.0"; sha256="0qfk61qfw94r3ynzzvqxr9flswxbrfriw3n3yv499gk33cswb459"; 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.42.0"; sha256="0r59a27nl6l28ck3mm4icpahplgxqpqzibiahw265fsl8yzx2zk7"; depends=[Biobase BiocGenerics data_table DNAcopy ff foreach GenomeInfoDb GenomicRanges IRanges lattice MatrixGenerics matrixStats oligoClasses S4Vectors SummarizedExperiment VanillaICE]; }; + MobilityTransformR = derive2 { name="MobilityTransformR"; version="1.2.0"; sha256="0i8ljpjhvvfa1wg8ycm9pl0l0v3zwr4q7yr4n99nb88d54z89a5q"; depends=[MetaboCoreUtils MSnbase Spectra xcms]; }; + ModCon = derive2 { name="ModCon"; version="1.6.0"; sha256="1whwmf7qma0xz8bjqww6vr2idazgqlykd5mmf0xzryr1xdfbk54h"; depends=[data_table]; }; + Modstrings = derive2 { name="Modstrings"; version="1.14.0"; sha256="0r9smk5026pv6487xna1qsv9a6lc044xpzslbrddxyhgv0d8dz2m"; depends=[BiocGenerics Biostrings crayon GenomicRanges IRanges S4Vectors stringi stringr XVector]; }; + MoonlightR = derive2 { name="MoonlightR"; version="1.24.0"; sha256="17xff4sp4raqwcqgl2fc1j0k2s299cd3g0d5kdmmily7wvjnfrgz"; depends=[Biobase circlize clusterProfiler doParallel DOSE foreach GEOquery gplots HiveR limma parmigene randomForest RColorBrewer RISmed SummarizedExperiment TCGAbiolinks]; }; + Motif2Site = derive2 { name="Motif2Site"; version="1.2.0"; sha256="19qjkcqrsag2gycwqmmn19d2vnkn2graa8sidhi1vl0nna5ycm36"; depends=[BiocGenerics Biostrings BSgenome edgeR GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS mixtools S4Vectors]; }; + MotifDb = derive2 { name="MotifDb"; version="1.40.0"; sha256="122ifxmbi0v3192cd9chq265i3dyw3hzwsndq3w97f4d68vll7gl"; depends=[BiocGenerics Biostrings GenomicRanges IRanges rtracklayer S4Vectors splitstackshape]; }; + MouseFM = derive2 { name="MouseFM"; version="1.8.0"; sha256="0cp0y793d4mvz5kh7rl7ysl969qvwg7dvrvqjh2i9hax47s865jg"; depends=[biomaRt curl data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gtools httr IRanges jsonlite reshape2 rlist scales tidyr]; }; + MsBackendMassbank = derive2 { name="MsBackendMassbank"; version="1.6.0"; sha256="1n5mbd8mmsci8pvn3884i2vvr4dydw083kc851y4cx4ldbbfsfnk"; depends=[BiocParallel DBI IRanges MsCoreUtils ProtGenerics S4Vectors Spectra]; }; + MsBackendMgf = derive2 { name="MsBackendMgf"; version="1.6.0"; sha256="0r02fl6fq0g7l7mdlza89x1zkm3c16sf4wr1yrqygfmxf47q58xa"; depends=[BiocParallel IRanges MsCoreUtils S4Vectors Spectra]; }; + MsBackendMsp = derive2 { name="MsBackendMsp"; version="1.2.0"; sha256="122s5agwac8wzsdj1igjyk8dgi5vgxd2bhymcp61sx5l1x7c0678"; depends=[BiocParallel IRanges MsCoreUtils S4Vectors Spectra]; }; + MsBackendRawFileReader = derive2 { name="MsBackendRawFileReader"; version="1.4.0"; sha256="13bkjbk5h4dr719942bghiqprrkgwg7z82vh88cn8jf8vg2bd43d"; depends=[BiocParallel IRanges MsCoreUtils rawrr S4Vectors Spectra]; }; + MsCoreUtils = derive2 { name="MsCoreUtils"; version="1.10.0"; sha256="1shrvb2vmvk1m6xk59jqpvrxi8vzcr978aalbx1gjcmaqf6abzcq"; depends=[clue MASS Rcpp S4Vectors]; }; + MsExperiment = derive2 { name="MsExperiment"; version="1.0.0"; sha256="031j106yaf1nal7nf5avg6kg216w3fplcnici8j45dwfd31kjis9"; depends=[IRanges ProtGenerics QFeatures S4Vectors Spectra SummarizedExperiment]; }; + MsFeatures = derive2 { name="MsFeatures"; version="1.6.0"; sha256="1q1224w31wdaagfv8ysc1w0d0n34y547c0jzkff1vxri9pb0w1j1"; depends=[MsCoreUtils ProtGenerics SummarizedExperiment]; }; + MuData = derive2 { name="MuData"; version="1.2.0"; sha256="0xi8ldjv7nij11fggaqk91wdyf1nbv66hzqxy3y67hj0rkqxakv5"; depends=[DelayedArray Matrix MultiAssayExperiment rhdf5 S4Vectors SingleCellExperiment SummarizedExperiment]; }; + Mulcom = derive2 { name="Mulcom"; version="1.48.0"; sha256="0r900mhq2yi7gv1y9vh9lvaz97mk785ih8lvndncg0q6xg0mfq4v"; depends=[Biobase fields]; }; + MultiAssayExperiment = derive2 { name="MultiAssayExperiment"; version="1.24.0"; sha256="00lhnqa4yz3lm5kl79bghad93iijihnassy2caf87czc540why09"; depends=[Biobase BiocBaseUtils BiocGenerics DelayedArray GenomicRanges IRanges S4Vectors SummarizedExperiment tidyr]; }; + MultiBaC = derive2 { name="MultiBaC"; version="1.8.0"; sha256="0a3snl5djp9z0ggd39dmz0qgr0cvapsd2zs3xbwqah3dxafwsh2k"; depends=[ggplot2 Matrix MultiAssayExperiment pcaMethods plotrix ropls]; }; + MultiDataSet = derive2 { name="MultiDataSet"; version="1.26.0"; sha256="1qja5xd42wh8qbcil4hhnmh9zlby2gfglax2qbf5bzg3h6yzpy4g"; depends=[Biobase BiocGenerics GenomicRanges ggplot2 ggrepel IRanges limma qqman S4Vectors SummarizedExperiment]; }; + MultiMed = derive2 { name="MultiMed"; version="2.20.0"; sha256="09snrrgifz5wl9a0av87rccq8fh1d03h38i6x2lfmpak5m1vc270"; depends=[]; }; + MungeSumstats = derive2 { name="MungeSumstats"; version="1.6.0"; sha256="1sng3gra750pa0nm1jfpri2pha9n8rs1ncn42ddjfm330w45wqpg"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges googleAuthR httr IRanges jsonlite magrittr R_utils RCurl rtracklayer stringr VariantAnnotation]; }; + MutationalPatterns = derive2 { name="MutationalPatterns"; version="3.8.0"; sha256="071s1hfxln8zdr303g0ifmajd3kcfxxb6dds0pz67chc2gmgnd9q"; 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.22.0"; sha256="0gbcfyda6liqimd4rcjbmfcjj4zymibfm94g46xv75ahypf5rm6z"; 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.14.0"; sha256="12axvrs0zbp82n4lv89299vm6v696352d0jzm398vpbkdk3jn6y2"; depends=[BiocParallel DESeq2 genefilter mgcv S4Vectors SummarizedExperiment]; }; + NBSplice = derive2 { name="NBSplice"; version="1.15.0"; sha256="0yn7s7igshall34cflmdwvmknv8h1zdi6vg8svvcyn9fvzlgjdm8"; depends=[BiocParallel car edgeR ggplot2 MASS reshape2]; }; + NCIgraph = derive2 { name="NCIgraph"; version="1.46.0"; sha256="06y04lbp1wn1w9xy3lsqcdsycp4cdlrcyhga5kn1a4skb48bc6rc"; depends=[graph KEGGgraph R_methodsS3 RBGL RCy3]; }; + NOISeq = derive2 { name="NOISeq"; version="2.42.0"; sha256="1j0yafl5r1vsn99zkhvaz2mrwv37l4p8ldgiq09d9hxpjq9ls7i2"; depends=[Biobase Matrix]; }; + NPARC = derive2 { name="NPARC"; version="1.10.0"; sha256="0zph5lxw7ysra897jkbrmxjvb4zd5q2knl07xw8q5dyphjw8bbr3"; depends=[BiocParallel broom dplyr magrittr MASS rlang tidyr]; }; + NTW = derive2 { name="NTW"; version="1.48.0"; sha256="0vx5swxmw76vba5wwl1qjyyb2dm7vg9wa7jsky93knhdl0s2fli9"; depends=[mvtnorm]; }; + NanoMethViz = derive2 { name="NanoMethViz"; version="2.4.0"; sha256="1ybbpc6v6al0vdgcbsyj921hpcyaaghdaf4cfwrd8wmlha75c2y3"; depends=[AnnotationDbi assertthat BiocSingular bsseq cpp11 data_table dplyr e1071 forcats fs GenomicRanges ggplot2 ggrastr glue limma patchwork purrr R_utils Rcpp readr rlang Rsamtools RSQLite S4Vectors scales scico stringr SummarizedExperiment tibble tidyr withr zlibbioc]; }; + NanoStringDiff = derive2 { name="NanoStringDiff"; version="1.28.0"; sha256="1fjmp78q3hsnslarb7w39r3kcvf8m9jrzcw4na6k55dqp5917lys"; depends=[Biobase matrixStats Rcpp]; }; + NanoStringNCTools = derive2 { name="NanoStringNCTools"; version="1.6.0"; sha256="09g94vksn5zmwxj25q00ja3zk259psrj0vvn95hx4k5ldjby10ys"; depends=[Biobase BiocGenerics Biostrings ggbeeswarm ggiraph ggplot2 ggthemes IRanges pheatmap RColorBrewer S4Vectors]; }; + NanoStringQCPro = derive2 { name="NanoStringQCPro"; version="1.30.0"; sha256="1wfqrnbz2wcgxf2hz67z39zgy41m0ygf8a7gk1x22ry8y2irkipm"; depends=[AnnotationDbi Biobase knitr NMF org_Hs_eg_db png RColorBrewer]; }; + NanoTube = derive2 { name="NanoTube"; version="1.4.0"; sha256="0gyjlj15bymib12b8j5ng66h6ixqj9w2arcd3x042djfqnx2crj9"; depends=[Biobase fgsea ggplot2 limma reshape]; }; + Nebulosa = derive2 { name="Nebulosa"; version="1.8.0"; sha256="1irjgvvycw1kx2nisqn7982hn843v4jncld7j712hv0kn2py3hn6"; depends=[ggplot2 ks Matrix patchwork Seurat SingleCellExperiment SummarizedExperiment]; }; + NeighborNet = derive2 { name="NeighborNet"; version="1.16.0"; sha256="04yxkrc2qscx9ckday90b6hmar4zfqjdan0phmpgv622spnk16f3"; depends=[graph]; }; + NetActivity = derive2 { name="NetActivity"; version="1.0.0"; sha256="0jf406i34n4j3mx3x9543h5a8pngbj5hsl62kx38f387bvki6zb3"; depends=[airway DelayedArray DelayedMatrixStats DESeq2 NetActivityData SummarizedExperiment]; }; + NetPathMiner = derive2 { name="NetPathMiner"; version="1.34.0"; sha256="19pybhh43a9bzfgq7j4pk7w1flqx1mpz8pyqazgzichpgc5wbzx0"; depends=[igraph]; }; + NetSAM = derive2 { name="NetSAM"; version="1.38.0"; sha256="0d3b2h0d8d9zdqa1wjn3a6r55aa978gma4ajf7pgbp1p0y81smm8"; depends=[AnnotationDbi biomaRt DBI doParallel foreach GO_db igraph R2HTML seriation survival WGCNA]; }; + NeuCA = derive2 { name="NeuCA"; version="1.4.0"; sha256="0v6m022y7xb70f5z5hzsdg2rv5gdsldjd34bni8k9r8fd04d2q18"; depends=[e1071 keras limma SingleCellExperiment]; }; + NewWave = derive2 { name="NewWave"; version="1.8.0"; sha256="13zwn5qzh9mjhp6d72yndymwbmi4hb7s8qg6ji0nmqp53gj30lc8"; depends=[BiocSingular DelayedArray irlba Matrix SharedObject SingleCellExperiment SummarizedExperiment]; }; + NoRCE = derive2 { name="NoRCE"; version="1.10.0"; sha256="0bmqgpiwm65wqr5wr6il131kllzpxc0mgx38adrncggcgxx3risg"; depends=[AnnotationDbi biomaRt DBI dbplyr dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 GO_db igraph IRanges KEGGREST png RCurl reactome_db readr reshape2 RSQLite rtracklayer rWikiPathways S4Vectors stringr SummarizedExperiment tidyr zlibbioc]; }; + NormalyzerDE = derive2 { name="NormalyzerDE"; version="1.16.0"; sha256="0fhm924r32sw5kjnpj9s79c6s6davb97whi2g8m62aii3c9di2zc"; depends=[ape Biobase car ggforce ggplot2 limma MASS matrixStats preprocessCore raster RcmdrMisc SummarizedExperiment vsn]; }; + NormqPCR = derive2 { name="NormqPCR"; version="1.44.0"; sha256="09cj78p7d11sichaxh5cgvd44i7mv8fs71j4sjianzky9y19474y"; depends=[Biobase qpcR RColorBrewer ReadqPCR]; }; + NuPoP = derive2 { name="NuPoP"; version="2.6.1"; sha256="0gn1nbri1jpa0sf751fgyk4x80930g9dcw5cxim7i4n6isb33xaz"; depends=[]; }; + NxtIRFcore = derive2 { name="NxtIRFcore"; version="1.4.0"; sha256="1k923fqfjqfhlp648bs09xm1nb23gmh8n4y9jkdrdf05czyl73az"; depends=[AnnotationHub BiocFileCache BiocGenerics BiocParallel Biostrings BSgenome data_table DelayedArray DelayedMatrixStats fst genefilter GenomeInfoDb GenomicRanges ggplot2 HDF5Array IRanges magrittr NxtIRFdata plotly R_utils Rcpp RcppProgress rhdf5 rtracklayer S4Vectors SummarizedExperiment zlibbioc]; }; + OCplus = derive2 { name="OCplus"; version="1.72.0"; sha256="0517ib36cppxwf8kpyxcrm5hnvzd2z1gpahslfr7cns1r3si0byr"; depends=[interp multtest]; }; + ODER = derive2 { name="ODER"; version="1.4.0"; sha256="09zvr01cgwc3rbqlbj8dr6yh4ghv1yha6ygl222458iq8vcwf6cv"; depends=[BiocFileCache BiocGenerics dasper data_table derfinder dplyr GenomeInfoDb GenomicRanges ggplot2 ggpubr ggrepel IRanges magrittr megadepth plyr purrr rtracklayer S4Vectors stringr tibble]; }; + OGRE = derive2 { name="OGRE"; version="1.2.0"; sha256="0rnrg6xwi9xgxyzzk1qkyqh4k9yzq4q6wpliwgp8myf37yb8sjcy"; depends=[AnnotationHub assertthat data_table DT GenomeInfoDb GenomicRanges ggplot2 Gviz IRanges rtracklayer S4Vectors shiny shinyBS shinydashboard shinyFiles tidyr]; }; + OLIN = derive2 { name="OLIN"; version="1.76.0"; sha256="060d4hflnrk17vs651cfh2dazyc6avp3gjvp9w52y8jbfnnwyvqg"; depends=[limma locfit marray]; }; + OLINgui = derive2 { name="OLINgui"; version="1.72.0"; sha256="0rqrzaz052kggi970whqiaf6sjs66dfcys1jrmx3909fz65cz9mg"; depends=[marray OLIN tkWidgets widgetTools]; }; + OMICsPCA = derive2 { name="OMICsPCA"; version="1.16.0"; sha256="0kirg4xnj19igyyxzybdjl3y833zniki2s20lcg6ygsr7kmrc1g4"; 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.20.0"; sha256="17lhz1sf158y5adsw9ibww6jdmrsqihm6g9nhk673wvd8i9kg3s4"; depends=[MASS qvalue tibble]; }; + ORFhunteR = derive2 { name="ORFhunteR"; version="1.6.0"; sha256="0220mwfpxals7p03l11banpg7i593bxmk3dqp63jfx40m7v1x6v6"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg38 data_table Peptides randomForest Rcpp rtracklayer stringr xfun]; }; + ORFik = derive2 { name="ORFik"; version="1.18.0"; sha256="1pgp4g6jf1rmfgfk3ggms7fs5r81hygbcp3z4hj5l665sl5n22kz"; depends=[AnnotationDbi BiocGenerics BiocParallel biomaRt biomartr Biostrings BSgenome cowplot data_table DESeq2 fst GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gridExtra httr IRanges jsonlite R_utils Rcpp Rsamtools rtracklayer S4Vectors SummarizedExperiment xml2]; }; + OSAT = derive2 { name="OSAT"; version="1.46.0"; sha256="1w86yf0bxrrfmmqknw59z2p2a0gfpnf54r139isd3irk0jhwwk50"; depends=[]; }; + OTUbase = derive2 { name="OTUbase"; version="1.48.0"; sha256="029f1hjvl5wzydn6k7436hhmgvhf7wgnmacf9wvar6gfj09n9n7d"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; }; + OUTRIDER = derive2 { name="OUTRIDER"; version="1.16.0"; sha256="14784178jlf7sddm9vkqvhpjsy4ppblacassna7bsx46xszx53jn"; 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]; }; + OVESEG = derive2 { name="OVESEG"; version="1.14.0"; sha256="1lbv1p3pwggn1i75w4xkf4nfd4ff1fd9qkm65l7g7d98jinwa1wm"; depends=[BiocParallel fdrtool limma Rcpp SummarizedExperiment]; }; + OmaDB = derive2 { name="OmaDB"; version="2.14.0"; sha256="0hvsang8qlddd8andinl6p5ip823bg08c146p72glfa87bkf8xh6"; depends=[ape Biostrings GenomicRanges httr IRanges jsonlite plyr topGO]; }; + OmicCircos = derive2 { name="OmicCircos"; version="1.36.0"; sha256="0lqv04hjc2z3qnq4ijd9iym3mlbvxrhrxpaxdhs6w9dd32b8n8mh"; depends=[GenomicRanges]; }; + OmicsLonDA = derive2 { name="OmicsLonDA"; version="1.14.0"; sha256="0wax0bplaibb27cvvqab3lpjb7qzy66dc5fs10mxadcbihl48fsb"; depends=[BiocGenerics BiocParallel ggplot2 gss plyr pracma SummarizedExperiment zoo]; }; + Omixer = derive2 { name="Omixer"; version="1.8.0"; sha256="080x94lhqml1fwvs0n8j6kvy2v2x3ij64960lhwjf8k1r8vyq4d5"; depends=[dplyr forcats ggplot2 gridExtra magrittr readr stringr tibble tidyselect]; }; + OmnipathR = derive2 { name="OmnipathR"; version="3.5.25"; sha256="1a0d4vf8i45h1fifswx9lhk6fk0z8sxfnav35psz9kvmxxab9698"; depends=[checkmate crayon curl digest dplyr httr igraph jsonlite later logger magrittr progress purrr rappdirs readr readxl rlang rmarkdown rvest stringr tibble tidyr tidyselect withr xml2 yaml]; }; + OncoScore = derive2 { name="OncoScore"; version="1.26.0"; sha256="01qrlifbhfnq5liyiqa05pwjcr659v2i32ns2g6hc2crcf7nf5zz"; depends=[biomaRt]; }; + OncoSimulR = derive2 { name="OncoSimulR"; version="4.0.0"; sha256="1zxzl78l1vs1s4njs99mb5f97sxgffh6nycy0b5yhzw317kj1rdn"; depends=[car data_table dplyr ggplot2 ggrepel graph gtools igraph RColorBrewer Rcpp Rgraphviz smatr stringr]; }; + OpenStats = derive2 { name="OpenStats"; version="1.10.0"; sha256="1jr0yshp4qy1869kv2cncy77kqnb2vi3m4cdh0v79w062qxbi7p7"; depends=[AICcmodavg car Hmisc jsonlite knitr MASS nlme rlist summarytools]; }; + OrderedList = derive2 { name="OrderedList"; version="1.70.0"; sha256="06vl8miwzwl2i0ik3p50fs9z65d65bd793z5kvnn80dk2zbnj6qk"; depends=[Biobase twilight]; }; + Organism_dplyr = derive2 { name="Organism.dplyr"; version="1.26.0"; sha256="1hawn8pp63kal5ml0sm3h1j1wnkq02z64sliyaf6apv7vl60ja9g"; depends=[AnnotationDbi AnnotationFilter BiocFileCache DBI dbplyr dplyr GenomeInfoDb GenomicFeatures GenomicRanges IRanges rlang RSQLite S4Vectors tibble]; }; + OrganismDbi = derive2 { name="OrganismDbi"; version="1.40.0"; sha256="11l1xqwbqs129vxd6lxdaizpp6j08spyh6799rv5wqmlymap1ykw"; depends=[AnnotationDbi Biobase BiocGenerics BiocManager DBI GenomicFeatures GenomicRanges graph IRanges RBGL S4Vectors]; }; + Oscope = derive2 { name="Oscope"; version="1.28.0"; sha256="0454f9yc0jmg3mcq9264wb5v2n8n0kaf801hlvsiy1xa3baj3h29"; depends=[BiocParallel cluster EBSeq testthat]; }; + PAA = derive2 { name="PAA"; version="1.32.0"; sha256="1zyms2s98bhjjl8bx86yznn87k8sv7dgadpgfall279q7av3vkgb"; depends=[e1071 gplots gtools limma MASS mRMRe randomForest Rcpp ROCR sva]; }; + PADOG = derive2 { name="PADOG"; version="1.40.0"; sha256="1irx2cv9k0wcx4aq1liyka9badgf4f20rxis7y4jz9wd9hhakilx"; depends=[AnnotationDbi Biobase doRNG foreach GSA hgu133a_db hgu133plus2_db KEGGdzPathwaysGEO KEGGREST limma nlme]; }; + PAIRADISE = derive2 { name="PAIRADISE"; version="1.14.0"; sha256="1mpz4afz6mx7a696pylzlar2jspkflkp15g4kzvk1sjkmwb6k9pj"; depends=[abind BiocParallel nloptr S4Vectors SummarizedExperiment]; }; + PANR = derive2 { name="PANR"; version="1.44.0"; sha256="0ma44mv7v0bcdzgzg575ky8h1mdffk426r18gjcg3v5xbjjargw5"; depends=[igraph MASS pvclust RedeR]; }; + PAST = derive2 { name="PAST"; version="1.14.0"; sha256="0mbqw5kffv7jfz37ydfmbwgcxf7baxghsbs163fpi9qksn37d1v7"; depends=[doParallel dplyr foreach GenomicRanges ggplot2 iterators qvalue rlang rtracklayer S4Vectors]; }; + PCAN = derive2 { name="PCAN"; version="1.26.0"; sha256="0ya9s06dxrwzw0d4r08h5nddklyw3qbgwffbinwy84vgipkki0cz"; depends=[BiocParallel]; }; + PCAtools = derive2 { name="PCAtools"; version="2.10.0"; sha256="1r32ajjmrhlwl0ylwavlfzph6m01mq3y7r87x8mbkmqw9ld1y2fd"; depends=[beachmat BH BiocParallel BiocSingular cowplot DelayedArray DelayedMatrixStats dqrng ggplot2 ggrepel lattice Matrix Rcpp reshape2]; }; + PDATK = derive2 { name="PDATK"; version="1.6.0"; sha256="1s6j4j4s5vq2zfiz0axzmxcvfypwhn6wr1f0pm6f6kfaymkpp1xb"; depends=[BiocGenerics BiocParallel caret clusterRepro ConsensusClusterPlus CoreGx data_table dplyr genefu ggplot2 ggplotify igraph MatrixGenerics matrixStats MultiAssayExperiment piano plyr pROC RColorBrewer reportROC rlang S4Vectors scales SummarizedExperiment survcomp survival survminer switchBox verification]; }; + PECA = derive2 { name="PECA"; version="1.34.0"; sha256="1yp4nw6agcrcy0ib4c293hd4j2waw5x7zjn2x175n3dq02hplpvq"; depends=[affy aroma_affymetrix aroma_core genefilter limma preprocessCore ROTS]; }; + PERFect = derive2 { name="PERFect"; version="1.12.0"; sha256="1l9p2cs8hypihrl57bsyszzk9kwlp03pl3pskhgwsn5vzjmfgymg"; depends=[fitdistrplus ggplot2 Matrix phyloseq psych sn zoo]; }; + PFP = derive2 { name="PFP"; version="1.6.0"; sha256="06fg96phldv4rlkq4zrmvkkc19r57f7c9vrq51g8p54byj58rjbp"; depends=[clusterProfiler ggplot2 graph igraph KEGGgraph magrittr plyr tidyr]; }; + PICS = derive2 { name="PICS"; version="2.42.0"; sha256="0snl32fk5vglww4rh3nmai86kxc55qwnhvbad2gqk821xh1idl70"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools]; }; + PING = derive2 { name="PING"; version="2.42.0"; sha256="1j4jx9lr1kia7880xvv87mv72ish490sn4kirkpp4jzcz3n99bh6"; depends=[BiocGenerics BSgenome fda GenomicRanges Gviz IRanges PICS S4Vectors]; }; + PLPE = derive2 { name="PLPE"; version="1.58.0"; sha256="1v30v0i3awq8vfid77hgcwxallq0swarvrsszs1jff9wq9gnr6vi"; depends=[Biobase LPE MASS]; }; + POMA = derive2 { name="POMA"; version="1.8.0"; sha256="0ll61s9ylymsha2mvys36hr3ximx91ldbzb4k34gmy8rxjgb2ima"; depends=[broom caret ComplexHeatmap dbscan DESeq2 dplyr ggplot2 ggrepel glasso glmnet impute limma magrittr mixOmics randomForest RankProd rmarkdown SummarizedExperiment tibble tidyr uwot vegan]; }; + POWSC = derive2 { name="POWSC"; version="1.6.0"; sha256="08cahszklxj42cpaklzil7q3jkmrigsqkbbklfkq74q8sa65ry3j"; depends=[Biobase ggplot2 limma MAST pheatmap RColorBrewer SingleCellExperiment SummarizedExperiment]; }; + PPInfer = derive2 { name="PPInfer"; version="1.24.2"; sha256="16nkqn6d8pakkbl3r2rvxzfjcsx5calyjcxnysy3g84lflv4lfid"; depends=[biomaRt fgsea ggplot2 httr igraph kernlab STRINGdb yeastExpData]; }; + PREDA = derive2 { name="PREDA"; version="1.44.0"; sha256="1j2v7h7xajdlmbvi397qrn61w6zvrckql7hzzk0bhly3lcfsr5ij"; depends=[annotate Biobase lokern multtest]; }; + PROMISE = derive2 { name="PROMISE"; version="1.50.0"; sha256="0981l0yssnfjlxdqjv4r0a7a4gp01v1zqrpk9c19c1hpklzjzn9s"; depends=[Biobase GSEABase]; }; + PROPER = derive2 { name="PROPER"; version="1.30.0"; sha256="1fx832vinc5rfb52g2f62480sga3lh6hslz19v6whjadrqaxi1kv"; depends=[edgeR]; }; + PROPS = derive2 { name="PROPS"; version="1.20.0"; sha256="1arz8wq4k3dzsqzq39g95pyl934h3kdyqh2hahjpb2qpz0dnr1mk"; depends=[Biobase bnlearn reshape2 sva]; }; + PROcess = derive2 { name="PROcess"; version="1.74.0"; sha256="1vnj82yhc949hbn6crbqq6jk919b7fc43vrr4bbqls0czdajs42l"; depends=[Icens]; }; + PSEA = derive2 { name="PSEA"; version="1.32.0"; sha256="1rx7p8k6rwdx5lclz85h5qabkl0lvjprk6cx8xaaabg2g1i4d99y"; depends=[Biobase MASS]; }; + PSMatch = derive2 { name="PSMatch"; version="1.2.0"; sha256="03nkkx0chmz4ms9zkhjdjylzk4i3s1r51h955nn2qr236vi5h60p"; depends=[BiocGenerics BiocParallel igraph Matrix MsCoreUtils ProtGenerics QFeatures S4Vectors]; }; + PWMEnrich = derive2 { name="PWMEnrich"; version="4.34.0"; sha256="02rjdq4sbbb3w91p2k8bbbwwgb4caipbkj338lx0alc58ax0c0fh"; depends=[BiocGenerics Biostrings evd gdata S4Vectors seqLogo]; }; + PanViz = derive2 { name="PanViz"; version="1.0.0"; sha256="19av4p7v215yb8scp6v161j1wj9ib98yxw7xkrryn7ad3j361a92"; depends=[colorspace data_table dplyr easycsv futile_logger igraph magrittr RColorBrewer rentrez rlang stringr tibble tidyr]; }; + PanomiR = derive2 { name="PanomiR"; version="1.2.0"; sha256="02kmlv258cvg7zqzb1wh48zxgbhpxqf3avfhlg2w0cf5kwmbxb2w"; depends=[clusterProfiler dplyr forcats GSEABase igraph limma metap org_Hs_eg_db preprocessCore RColorBrewer rlang tibble withr]; }; + Path2PPI = derive2 { name="Path2PPI"; version="1.28.0"; sha256="1psnkgi565gyv7jskpfjcsyvnlgarmqpa1ywzg9z6cfplfly550c"; depends=[igraph]; }; + PathNet = derive2 { name="PathNet"; version="1.38.0"; sha256="02371m21xh684hcrbhfdk9hg1jgcdgrnbn1h6vv7avaz6rc07iki"; depends=[]; }; + PathoStat = derive2 { name="PathoStat"; version="1.24.0"; sha256="17d3csjf8xxl3xq8kqyzkjlcd1xyq1wx5rln45nmancd3qsff9l4"; 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]; }; + PeacoQC = derive2 { name="PeacoQC"; version="1.8.0"; sha256="06n9clc7bngw1fmbl0n25765svvc1r3n923ai50r9xpc75wygh0a"; depends=[circlize ComplexHeatmap flowCore flowWorkspace ggplot2 gridExtra plyr]; }; + PepsNMR = derive2 { name="PepsNMR"; version="1.16.0"; sha256="02i29jinawssqlb33wvj0h9w6cfcvamlyfxdynd38jmwx23l15l5"; depends=[ggplot2 gridExtra Matrix matrixStats ptw reshape2]; }; + PhIPData = derive2 { name="PhIPData"; version="1.6.0"; sha256="1gm1zr532vzz605sah2b2qmp95mnh68lqyp0kjb8l4qjz06vgawd"; depends=[BiocFileCache BiocGenerics cli edgeR GenomicRanges IRanges S4Vectors SummarizedExperiment]; }; + PharmacoGx = derive2 { name="PharmacoGx"; version="3.2.0"; sha256="1wd6s9qsfhgc7krkhq26bmdgrcqz8w7nnl580hy0b0lqwnfrd86a"; depends=[Biobase BiocGenerics BiocParallel boot caTools checkmate coop CoreGx data_table downloader ggplot2 jsonlite magicaxis MultiAssayExperiment RColorBrewer Rcpp reshape2 S4Vectors SummarizedExperiment]; }; + PhenStat = derive2 { name="PhenStat"; version="2.34.0"; sha256="1gjji1l1a39bbmq0dm533f9y10yg455zh8syz4ymp21ipshmh8x9"; depends=[car corrplot ggplot2 graph knitr lme4 logistf MASS msgps nlme nortest pingr reshape SmoothWin]; }; + PhenoGeneRanker = derive2 { name="PhenoGeneRanker"; version="1.6.0"; sha256="0y6nay90b50b0cgg532vqk4cfdgvhcw4ianqxh3l4y8gz85136dz"; depends=[doParallel dplyr foreach igraph Matrix]; }; + PhosR = derive2 { name="PhosR"; version="1.8.0"; sha256="1g8ia2f1di5qd7rkgirgpzwmhxx1j2pmid8cqqpb3gmqv39dj5r7"; 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.12.2"; sha256="007zr6fgrdrjg3g1zypcvh3966xzfwz4aghhivkcslyvl25smygv"; 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.10.0"; sha256="09rv07k7sj6l5h00wm5z7hsq1nr084i4xdpy6sgc1kb7hksihcs0"; 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.24.0"; sha256="0djknlcwhwfswi3wvy9zmi11ldv97zfq2p5rh5xv3ma4zfhrbh9d"; depends=[BiocStyle bnlearn C50 clusterProfiler DBI DOSE dplyr gdata ggplot2 GO_db graph impute MASS matrixStats openxlsx partykit pheatmap preprocessCore ReactomePA Rgraphviz WGCNA]; }; + PloGO2 = derive2 { name="PloGO2"; version="1.10.0"; sha256="0sq2x68bcslzldrh367hh9r1vrnk56mkc6iqiq3zy7rzgxhjigpl"; depends=[GO_db GOstats httr lattice openxlsx xtable]; }; + PoDCall = derive2 { name="PoDCall"; version="1.6.0"; sha256="1x368wc96nn4k17kbbwavriqfp6qywxivdas6sp069c053xkjxrq"; depends=[diptest DT ggplot2 gridExtra LaplacesDemon mclust purrr readr rlist shiny shinyjs]; }; + PoTRA = derive2 { name="PoTRA"; version="1.13.0"; sha256="1a32d1wndb24pxza3h53yddj9z2clff5srny2k00pbbfq1h99mjf"; depends=[BiocGenerics graph graphite igraph org_Hs_eg_db]; }; + PrInCE = derive2 { name="PrInCE"; version="1.14.0"; sha256="07q3x6rx3raz187akwfdd01x57hxbf6njbrydnl9r6a8q0b0gb0b"; depends=[Biobase dplyr forecast Hmisc LiblineaR magrittr MSnbase naivebayes progress purrr ranger Rdpack robustbase speedglm tester tidyr]; }; + Prostar = derive2 { name="Prostar"; version="1.30.2"; sha256="17aljj7r41cmgvf2xfvjglglf4zrcajdm0zm2vifvlmkr2bs95pi"; depends=[DAPAR DAPARdata data_table future ggplot2 gplots highcharter htmlwidgets later promises rhandsontable shiny shinyAce shinyBS shinycssloaders shinyjqui shinyjs shinythemes tibble vioplot webshot]; }; + ProtGenerics = derive2 { name="ProtGenerics"; version="1.30.0"; sha256="1k5pg0zbhz9mjsl5i3j33p7qv2adax2lf7yqv6qz229fxxaxs5li"; depends=[]; }; + ProteoDisco = derive2 { name="ProteoDisco"; version="1.4.0"; sha256="0df39hwg5kmc900b57dxw76mz11a7h4nb9kq1z1wl6ampx27w0ks"; 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.16.0"; sha256="00hivafxnk9kcji6k4r0ajrdlnlmpmaij6jqiaj9ghfcdqza2fjz"; depends=[biomaRt gdata ggplot2 ggrepel gtools matrixStats]; }; + PureCN = derive2 { name="PureCN"; version="2.4.0"; sha256="0x69n8v5fadx3my9s68j9wadicd8q07gmh40drrcd99n8xfrp41b"; 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.32.0"; sha256="12j3piy8c0d3vd6kqn0i65g96xj8x8p5px4rprw2mw9jnaydavwj"; depends=[Biostrings biovizBase data_table GenomicRanges Gviz IRanges]; }; + QDNAseq = derive2 { name="QDNAseq"; version="1.34.0"; sha256="1qv3vmc6i7r35pqhi45hmvg8h7v3bl82lv7yifs59k250zsdls59"; depends=[Biobase CGHbase CGHcall DNAcopy future_apply GenomicRanges IRanges matrixStats R_utils Rsamtools]; }; + QFeatures = derive2 { name="QFeatures"; version="1.8.0"; sha256="00f2j2kmvap9h7xxayy83g91zm41jd52vi9iyxhfk1lvmzpipa7h"; depends=[AnnotationFilter Biobase BiocGenerics igraph IRanges lazyeval MsCoreUtils MultiAssayExperiment plotly ProtGenerics S4Vectors SummarizedExperiment]; }; + QSutils = derive2 { name="QSutils"; version="1.16.0"; sha256="09zfjc1m8h7v18mccp3krk732ls3z64q21179r0dy4snb0xighln"; depends=[ape BiocGenerics Biostrings psych]; }; + QUBIC = derive2 { name="QUBIC"; version="1.26.0"; sha256="0cq98y7gl1ifx45j0ilwf70h873hwfdv3y4n2yxalk1rqbvwg5dg"; depends=[biclust Matrix Rcpp RcppArmadillo]; }; + Qtlizer = derive2 { name="Qtlizer"; version="1.12.0"; sha256="1mqf7cbm9x0jvz52cmks6kyv8i3ccc80m5pn7z4mrmip782ddjav"; depends=[curl GenomicRanges httr stringi]; }; + QuartPAC = derive2 { name="QuartPAC"; version="1.30.0"; sha256="19r8h639iyc32p2yxz2j89igwl2286jv08hw5a05k4532qdkygj5"; depends=[data_table GraphPAC iPAC SpacePAC]; }; + QuasR = derive2 { name="QuasR"; version="1.38.0"; sha256="1pp94368aj5wx0zcnbbm6zrxrfhixmbcdzpj2lka3blvq5j7sncj"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicFiles GenomicRanges IRanges Rbowtie Rhtslib Rsamtools rtracklayer S4Vectors ShortRead]; }; + QuaternaryProd = derive2 { name="QuaternaryProd"; version="1.32.0"; sha256="1ij17xccnz4m9wvvrwql4ha790qj0x155286rkr9ybwww0ipr20i"; depends=[dplyr Rcpp yaml]; }; + R3CPET = derive2 { name="R3CPET"; version="1.30.0"; sha256="0xhb514qnxswsv58ycsfibi4yxbwfpxn6yp5mv891y7sdb6hkniz"; depends=[BiocGenerics clValid data_table GenomeInfoDb GenomicRanges ggbio ggplot2 Hmisc igraph IRanges pheatmap Rcpp RCurl reshape2 S4Vectors]; }; + R453Plus1Toolbox = derive2 { name="R453Plus1Toolbox"; version="1.48.0"; sha256="1xx4ssqw5x9y87hmb9h2xkqyvxl41nqfkarwzdlgfd3sqni808s9"; depends=[Biobase BiocGenerics biomaRt Biostrings BSgenome GenomicRanges IRanges R2HTML Rsamtools S4Vectors ShortRead SummarizedExperiment TeachingDemos VariantAnnotation xtable XVector]; }; + R4RNA = derive2 { name="R4RNA"; version="1.26.0"; sha256="13zscbrarxma3p49yfgvpj4rrycra4cnnlcxw8032g4y5v75jzpd"; depends=[Biostrings]; }; + RAREsim = derive2 { name="RAREsim"; version="1.2.0"; sha256="1r4am6k9q922wxxjdq84lbhvxql6padrgh811s73r99lfsxwfxg9"; depends=[nloptr]; }; + RBGL = derive2 { name="RBGL"; version="1.74.0"; sha256="0dccxsynfnhjzjk22hr5kg068zbg33g6kyhlhlhqh78582181j9m"; depends=[BH graph]; }; + RBM = derive2 { name="RBM"; version="1.30.0"; sha256="01842vqv2zl3n5y3xhzr07kclm5rhjv3i0cb315kzssbvrvgsfp2"; depends=[limma marray]; }; + RBioinf = derive2 { name="RBioinf"; version="1.58.0"; sha256="11sfsbbkz482m8jiz21czmhp2ha06ii9h1b6ww8gaka9y0pm8pgc"; depends=[graph]; }; + RCAS = derive2 { name="RCAS"; version="1.24.0"; sha256="0wja7m3b3zr0m8nwcq5m5appsr09jdwkvvvxzh2r5mhksn0abs6p"; depends=[BiocGenerics Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 cowplot data_table DT genomation GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo gprofiler2 IRanges knitr pbapply pheatmap plotly plotrix proxy ranger rmarkdown RSQLite rtracklayer S4Vectors]; }; + RCASPAR = derive2 { name="RCASPAR"; version="1.44.0"; sha256="0v233p8lfgscqsi9d5sszbqhihqd44gs1rnvf8g8nh3090rc8asn"; depends=[]; }; + RCM = derive2 { name="RCM"; version="1.14.0"; sha256="1iaxkj8cm0f7vx2ypicls016kwfkqvarr3xway0n3brvzirmcv9m"; depends=[alabama DBI edgeR ggplot2 MASS nleqslv phyloseq RColorBrewer reshape2 tensor tseries VGAM]; }; + RCSL = derive2 { name="RCSL"; version="1.6.0"; sha256="0j2kcdkjpdlqg1ix0v2yq75w7phmhlrzzbaj3zwrljwzdr70wvh1"; depends=[ggplot2 igraph NbClust pracma RcppAnnoy Rtsne umap]; }; + RCX = derive2 { name="RCX"; version="1.2.0"; sha256="14fcipa1w7xpmvnq67lsk0xq03s9rc747jpx4w76xfwc1jy75799"; depends=[igraph jsonlite plyr]; }; + RCy3 = derive2 { name="RCy3"; version="2.18.0"; sha256="09rikpi8bkh3p7vpwip865vyw9gdr1n28y5azid6ja1wav315s3n"; depends=[base64enc base64url BiocGenerics fs glue gplots graph httr IRdisplay IRkernel RColorBrewer RCurl RJSONIO uchardet uuid XML]; }; + RCyjs = derive2 { name="RCyjs"; version="2.20.0"; sha256="0bkjyzphxn62hfmz2hpk9lbxikgv0gp56smss79abi3yx0841dpg"; depends=[base64enc BiocGenerics BrowserViz graph httpuv]; }; + RDRToolbox = derive2 { name="RDRToolbox"; version="1.48.0"; sha256="1i9ma3pi9b425jrgv0pry03id9dc3k0yjr7spfnvbz4xz8ifgllm"; depends=[MASS rgl]; }; + REBET = derive2 { name="REBET"; version="1.16.0"; sha256="18a201k2zdin3k5g5vpwlq8n6z2h6z7849zcz8rf3yzlfmbs2mx1"; depends=[ASSET]; }; + REDseq = derive2 { name="REDseq"; version="1.44.0"; sha256="13r04w1alpjs11kfm6cfqa4rf54z6yhhn8q754jxn8v2ivp7cwgy"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome BSgenome_Celegans_UCSC_ce2 ChIPpeakAnno IRanges multtest]; }; + REMP = derive2 { name="REMP"; version="1.22.0"; sha256="1rqkvm1s7wb2cbkr8c8dxb8qaydspz83q03xdfgc656jd7431i70"; depends=[AnnotationHub BiocGenerics BiocParallel Biostrings BSgenome caret doParallel foreach GenomeInfoDb GenomicRanges impute IRanges iterators kernlab minfi org_Hs_eg_db ranger readr rtracklayer S4Vectors settings SummarizedExperiment]; }; + RESOLVE = derive2 { name="RESOLVE"; version="1.0.0"; sha256="1r91nmzw7ll22qxazaagxi0zv8l5kh6rf54alfy9nqx5w10ni78y"; depends=[Biostrings BSgenome BSgenome_Hsapiens_1000genomes_hs37d5 cluster data_table GenomeInfoDb GenomicRanges ggplot2 glmnet gridExtra IRanges lsa NMF nnls reshape2]; }; + RGMQL = derive2 { name="RGMQL"; version="1.18.0"; sha256="1yl0rpah721z0h8r5bsqhrj4nmyqn23sfn3zld59wc9pn8azsqsv"; depends=[BiocGenerics data_table dplyr GenomicRanges glue httr plyr RGMQLlib rJava rtracklayer S4Vectors xml2]; }; + RGSEA = derive2 { name="RGSEA"; version="1.32.0"; sha256="1psrm5qd7kk1h01rb73mf0zi159lpd59awfhslkxaq8b1ifck7ny"; depends=[BiocGenerics]; }; + RGraph2js = derive2 { name="RGraph2js"; version="1.26.0"; sha256="0yvjp8hzbiivmkb2bbwkgznmkgwxr31sr76hjh25cqgfwgj0rrzr"; depends=[digest graph rjson whisker]; }; + RIPAT = derive2 { name="RIPAT"; version="1.8.0"; sha256="0z0g9k09g4g0i2h0lq2f651q0336q6x3rzli6xh7a4pj4gqcbnsw"; depends=[biomaRt GenomicRanges ggplot2 IRanges karyoploteR openxlsx plyr regioneR rtracklayer stringr]; }; + RITAN = derive2 { name="RITAN"; version="1.22.0"; sha256="0ha5qn1l4518ks8bghsb4lmj1ch3ak4gwq8m29xq5wcyg932np7m"; depends=[AnnotationFilter BgeeDB dynamicTreeCut EnsDb_Hsapiens_v86 ensembldb GenomicFeatures ggplot2 gplots gridExtra gsubfn hash igraph knitr linkcomm MCL plotrix png RColorBrewer reshape2 RITANdata sqldf STRINGdb]; }; + RIVER = derive2 { name="RIVER"; version="1.22.0"; sha256="0ycb97npqrhavm6i8idhdaah3h4i7m73zmqnlki2spg49j6qkh1p"; depends=[Biobase ggplot2 glmnet pROC]; }; + RImmPort = derive2 { name="RImmPort"; version="1.26.0"; sha256="0hwwkdzzh118vw4k3pxxmd7yzxdbjwp5z0vzss1pvmkgidf4sy94"; depends=[data_table DBI dplyr plyr reshape2 RSQLite sqldf]; }; + RJMCMCNucleosomes = derive2 { name="RJMCMCNucleosomes"; version="1.22.0"; sha256="13k01nclhl82kjyh16r5g2xx6f6inp5m7fkkd45pvahalx1cq0lm"; depends=[BiocGenerics BiocParallel consensusSeekeR GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; }; + RLMM = derive2 { name="RLMM"; version="1.60.0"; sha256="1kqxvrjfqf0l98nlj5fx36gh3n5gnxsks0gxpg9b5civjnmaxilv"; depends=[MASS]; }; + RLSeq = derive2 { name="RLSeq"; version="1.4.1"; sha256="12dbvvh7vg9bzyj64jans0p165lz2ca26d9ilg3nka4qii37q23m"; depends=[AnnotationHub aws_s3 callr caretEnsemble circlize ComplexHeatmap dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggplotify ggprism pheatmap RColorBrewer regioneR RLHub rtracklayer valr VennDiagram]; }; + RLassoCox = derive2 { name="RLassoCox"; version="1.6.0"; sha256="0hh84631r6rm5sxpp40v8blrf142rlm4sfyww933yw9khvyxvbnc"; depends=[glmnet igraph Matrix survival]; }; + RMassBank = derive2 { name="RMassBank"; version="3.8.0"; sha256="1zlv2vyarj0przwdn39iybk9fkghqbiic5y24i603jzajv9hqxz0"; depends=[assertthat Biobase ChemmineOB ChemmineR data_table digest enviPat httr logger MSnbase mzR R_utils rcdk Rcpp RCurl readJDX rjson S4Vectors webchem XML yaml]; }; + RNAAgeCalc = derive2 { name="RNAAgeCalc"; version="1.10.0"; sha256="0zj6ham16bjycdh1qids0pfq6xdbp8y1hdjm966ba6cwl9xxwl5d"; depends=[AnnotationDbi ggplot2 impute org_Hs_eg_db recount SummarizedExperiment]; }; + RNASeqPower = derive2 { name="RNASeqPower"; version="1.38.0"; sha256="1f8jiljxacqjj0vf2v01fclhl3i0w7xddxcs6ajxzlmmpqs19b8a"; depends=[]; }; + RNASeqR = derive2 { name="RNASeqR"; version="1.15.1"; sha256="0rkn98mp6d9lzm82r37mixfq7vka71c9nwkzkixajpsba2915sh6"; depends=[ballgown Biostrings clusterProfiler corrplot DESeq2 DOSE edgeR factoextra FactoMineR ggplot2 gridExtra org_Hs_eg_db org_Sc_sgd_db pathview PerformanceAnalytics pheatmap rafalib reshape2 reticulate Rsamtools stringr systemPipeR systemPipeRdata]; }; + RNAdecay = derive2 { name="RNAdecay"; version="1.18.0"; sha256="1zf5gg25lyn4z8yq8mmysxzpm7jkpspawyv7siwzb0m80h59rpiy"; depends=[ggplot2 gplots nloptr scales TMB]; }; + RNAinteract = derive2 { name="RNAinteract"; version="1.46.0"; sha256="18yhkkwq4gvwvph8pz53cl7id644vv1n2d3jngwrfk918jay5d0s"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; }; + RNAmodR = derive2 { name="RNAmodR"; version="1.12.0"; sha256="0xhz2fz0lw2yw14cw8fcnghk9y9q0v75b4bkf7bg5v0jrcgg6bc4"; depends=[BiocGenerics BiocParallel Biostrings BSgenome colorRamps GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 Gviz IRanges matrixStats Modstrings RColorBrewer reshape2 ROCR Rsamtools rtracklayer S4Vectors]; }; + RNAmodR_AlkAnilineSeq = derive2 { name="RNAmodR.AlkAnilineSeq"; version="1.12.0"; sha256="1ckd5n79psinpvw45ysnkw8n3r8g0njbd9f1a555dwl29vb7ay83"; depends=[BiocGenerics GenomicRanges Gviz IRanges RNAmodR S4Vectors]; }; + RNAmodR_ML = derive2 { name="RNAmodR.ML"; version="1.12.0"; sha256="08nkscr9164gpdyp3g3ypm7l7gn5lj034nj7hwmgjp4qihsnfliy"; depends=[BiocGenerics GenomicRanges IRanges ranger RNAmodR S4Vectors]; }; + RNAmodR_RiboMethSeq = derive2 { name="RNAmodR.RiboMethSeq"; version="1.12.0"; sha256="14zkhq86sz7sj9nacfcsqb9g5w3nx9318aaqfqhkckk17nvrzhcg"; depends=[BiocGenerics GenomicRanges Gviz IRanges RNAmodR S4Vectors]; }; + RNAsense = derive2 { name="RNAsense"; version="1.12.0"; sha256="130hbqhsvqm0sb39051b7s2asmvxv3pij0a5d03g7v828cbc96fh"; depends=[ggplot2 NBPSeq qvalue SummarizedExperiment]; }; + ROC = derive2 { name="ROC"; version="1.74.0"; sha256="00pw6xmxjzprbx8wskq6gbyqkfak764vic5yxrzs6wpram352vmv"; depends=[knitr]; }; + ROCpAI = derive2 { name="ROCpAI"; version="1.10.0"; sha256="0inil870ingad37gv6bc0hakizwb7lpg8s9disz888314f3xqmwz"; depends=[boot fission knitr SummarizedExperiment]; }; + ROSeq = derive2 { name="ROSeq"; version="1.10.0"; sha256="09jx7m25y7c0ihsv9a6cj002395kg3whrvzphgwbcipwdly1ag8f"; depends=[edgeR limma pbmcapply]; }; + ROTS = derive2 { name="ROTS"; version="1.26.0"; sha256="1wirblji4ckiwrvnh14cfwc9cjypazbaqr00ka5ndyz39cc31shn"; depends=[Biobase Rcpp]; }; + ROntoTools = derive2 { name="ROntoTools"; version="2.26.0"; sha256="0x0icx2r3vdn2a3615hfaqgp95p0d4cwz64231hqg1xji63b0q0s"; depends=[boot graph KEGGgraph KEGGREST Rgraphviz]; }; + RPA = derive2 { name="RPA"; version="1.54.0"; sha256="1981822904nc6slkqs8mhcm82ys3s8l0yjcbg0n7ki7pibfyd87g"; depends=[affy BiocGenerics BiocStyle phyloseq rmarkdown]; }; + RProtoBufLib = derive2 { name="RProtoBufLib"; version="2.10.0"; sha256="07d5skr8cp0hyjbs7whw4h8scrf2w4hyn0wzj3khqdss53zmmr2m"; depends=[]; }; + RRHO = derive2 { name="RRHO"; version="1.38.0"; sha256="1fng44mhqxjq4xczw7hj32v09l1dl58azfd8cgc9jg1j2d5whjs6"; depends=[VennDiagram]; }; + RSVSim = derive2 { name="RSVSim"; version="1.38.0"; sha256="1zby1b7zic28x32m7w39lnp4cc1ksip08k5xq30wa7radlafagfn"; depends=[Biostrings GenomicRanges IRanges ShortRead]; }; + RSeqAn = derive2 { name="RSeqAn"; version="1.18.0"; sha256="0fjcwm3fw13yv3vdawwdbmbqws3n47f5s10rcvllm3wrbb1zrwb6"; depends=[Rcpp]; }; + RTCA = derive2 { name="RTCA"; version="1.50.0"; sha256="1jd5rknlbhdi650xg1isqxmgvi797c4jimn53x4nzaq88b8rabsc"; depends=[Biobase gtools RColorBrewer]; }; + RTCGA = derive2 { name="RTCGA"; version="1.28.0"; sha256="1h7x1hb7lnjaq842k72l76j7l4d9130vfh8flvsjvzyc3l98cywq"; depends=[assertthat data_table dplyr ggplot2 ggthemes htmltools knitr purrr RCurl rmarkdown rvest scales stringi survival survminer viridis XML xml2]; }; + RTCGAToolbox = derive2 { name="RTCGAToolbox"; version="2.28.0"; sha256="0w02191nj94wapywy43r33f04ck92mww49lg1gik38pbafaahv68"; depends=[BiocGenerics data_table DelayedArray GenomeInfoDb GenomicRanges httr limma RaggedExperiment RCircos RCurl RJSONIO rvest S4Vectors stringr SummarizedExperiment survival TCGAutils XML]; }; + RTN = derive2 { name="RTN"; version="2.22.1"; sha256="0ga96f1qmbq5a8nxb94b60ml2fwynnz590xjbzcx1g5vhrblkj42"; depends=[car data_table igraph IRanges limma minet mixtools pheatmap pwr RedeR S4Vectors snow SummarizedExperiment viper]; }; + RTNduals = derive2 { name="RTNduals"; version="1.22.0"; sha256="0m3h0rkix48pr4jywvm0h1pbqlv62gdzq3safwgqpgb7m0pg6d08"; depends=[RTN]; }; + RTNsurvival = derive2 { name="RTNsurvival"; version="1.22.0"; sha256="00naywzamklldsvipyg3q2c16s84y8cw1bngdw2l1d8yra4qpq9r"; depends=[data_table dunn_test egg ggplot2 pheatmap RColorBrewer RTN RTNduals scales survival]; }; + RTopper = derive2 { name="RTopper"; version="1.44.1"; sha256="0g31606wsd8z2rpriad2fk9v8n27vp6gyk02nmq46s9c0jpf3s7p"; depends=[Biobase limma multtest]; }; + RUVSeq = derive2 { name="RUVSeq"; version="1.32.0"; sha256="1qb4k7pm8w86d2p9q2r4n63iyi34wdib5x9rsjx4vhcxrnzyyygm"; depends=[Biobase EDASeq edgeR MASS]; }; + RUVcorr = derive2 { name="RUVcorr"; version="1.30.0"; sha256="1g4krs3d7sr56chapaxxkr4bxyays8lv6kkdds8b3q89acwzq66l"; depends=[BiocParallel bladderbatch corrplot gridExtra lattice MASS psych reshape2 snowfall]; }; + RUVnormalize = derive2 { name="RUVnormalize"; version="1.32.0"; sha256="0cn38bdc72qw5g9qwwpaql72684501nrk562xpvymw5nkgw28v6i"; depends=[Biobase RUVnormalizeData]; }; + RVS = derive2 { name="RVS"; version="1.20.0"; sha256="0cm8j9j1s77lklgadgbb1i774l2b2s62dsjg8y1i1w4mnb9a1sn9"; depends=[GENLIB gRain kinship2 snpStats]; }; + RadioGx = derive2 { name="RadioGx"; version="2.2.0"; sha256="1n11dkbqrlxgv6asl0qdd9d4xwbbciyh6ag5dhgkzv7fyp1kxd12"; depends=[assertthat Biobase BiocGenerics BiocParallel caTools CoreGx data_table downloader magicaxis matrixStats RColorBrewer reshape2 S4Vectors scales SummarizedExperiment]; }; + RaggedExperiment = derive2 { name="RaggedExperiment"; version="1.22.0"; sha256="0gclfng9rhw32r3z22nc3bna87z45jq83y5czd3865g6lwvpp04l"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges Matrix MatrixGenerics S4Vectors SummarizedExperiment]; }; + RandomWalkRestartMH = derive2 { name="RandomWalkRestartMH"; version="1.18.0"; sha256="0s13jgk4si3a2bnqavk2n420kh3iggap7kbrjfawadnjdj2ic34c"; depends=[dnet igraph Matrix]; }; + RankProd = derive2 { name="RankProd"; version="3.24.0"; sha256="1dyjm4wwjq8aqx7sbr4jqxjw1d55w2jzdl6f8cxslc63q2sjnpa3"; depends=[gmp Rmpfr]; }; + RareVariantVis = derive2 { name="RareVariantVis"; version="2.26.0"; sha256="1bkww57sv3jim07cawhfkm856p3ylyv0a89k7mr3lrnxfgxgnll9"; depends=[BiocGenerics BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb GenomicFeatures GenomicRanges GenomicScores googleVis gtools IRanges phastCons100way_UCSC_hg19 S4Vectors SummarizedExperiment TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; }; + RbcBook1 = derive2 { name="RbcBook1"; version="1.66.0"; sha256="06ddf30kpdmv7zs4n4q0jnnk0fsp0vb5263haw9bky45v56v4ghl"; depends=[Biobase graph rpart]; }; + Rbec = derive2 { name="Rbec"; version="1.6.0"; sha256="1n6cl79lvd4h249mvm6bzgcdgdpnw2683imlqxi74wd5aviw5shw"; depends=[dada2 doParallel foreach ggplot2 Rcpp readr]; }; + Rbowtie = derive2 { name="Rbowtie"; version="1.38.0"; sha256="1kbpqhidj2bwhp9gxqx2qjaby6fc2dfrnnyjkciswgxckis6h2pc"; depends=[]; }; + Rbowtie2 = derive2 { name="Rbowtie2"; version="2.4.0"; sha256="05cczwkhv7kfnhlr0qznk6vdjncaj907895923f8mwx4j4cy5gcz"; depends=[magrittr Rsamtools]; }; + Rbwa = derive2 { name="Rbwa"; version="1.2.0"; sha256="0s6a4miawnsicysq9g8k0c5aycrq5bnx8pq07hsd86pbbmw57nhx"; depends=[]; }; + Rcade = derive2 { name="Rcade"; version="1.39.1"; sha256="05cli4h96xcsf6xas9z5ma8bzh10grlwkfgmz4a115ykblwyaj4r"; depends=[baySeq GenomeInfoDb GenomicAlignments GenomicRanges IRanges plotrix rgl Rsamtools S4Vectors]; }; + RcisTarget = derive2 { name="RcisTarget"; version="1.18.2"; sha256="02lz2m2zhwy1dvmjvlss6qg0dh574qhnvn7al3wx7ck1hkz0dgi2"; depends=[arrow AUCell BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges GSEABase R_utils S4Vectors SummarizedExperiment tibble]; }; + Rcpi = derive2 { name="Rcpi"; version="1.34.0"; sha256="0y64c3z7g8vsziphq39wypcncd3alvakd3ndwv7fgijpxf1rq4hf"; depends=[Biostrings doParallel foreach GOSemSim rcdk RCurl rjson]; }; + Rcwl = derive2 { name="Rcwl"; version="1.14.0"; sha256="17g2k748n4p7v7xvw5lrl5sw31w363hiqj8iaq6mclil7pyi90d7"; depends=[basilisk batchtools BiocParallel codetools DiagrammeR R_utils S4Vectors shiny yaml]; }; + RcwlPipelines = derive2 { name="RcwlPipelines"; version="1.14.0"; sha256="0b5v4x4v0ygkbfc8f8310bw2q8zsmqf9f8f2rynqmd5r7r5c8518"; depends=[BiocFileCache git2r httr rappdirs Rcwl S4Vectors]; }; + Rdisop = derive2 { name="Rdisop"; version="1.58.0"; sha256="0109isvqjf18y5nryw98kvc4m5jq63jvlxlvdm7sqqikcq6irraj"; depends=[Rcpp]; }; + ReQON = derive2 { name="ReQON"; version="1.44.0"; sha256="1r4dzwnqv6a4zy5q9l3axqq23sbk9pjfb2y3fmwxjvdwq6c1qnp0"; depends=[rJava Rsamtools seqbias]; }; + ReactomeContentService4R = derive2 { name="ReactomeContentService4R"; version="1.6.0"; sha256="0dwzamd82n598bj80cjp49mzjdfwrf4ajkb42fcp67j1w6zh6g73"; depends=[data_table doParallel foreach httr jsonlite magick]; }; + ReactomeGSA = derive2 { name="ReactomeGSA"; version="1.12.0"; sha256="09sd33dji4bz6ym9hf1gpiamqm0cz45120p2k9rq70pwvra1ipcn"; depends=[dplyr ggplot2 gplots httr jsonlite progress RColorBrewer tidyr]; }; + ReactomeGraph4R = derive2 { name="ReactomeGraph4R"; version="1.6.0"; sha256="0by0k2gj48y3ng0ckn46g2nfxn4jkh6qdd49w07bqvx8bmap1k3m"; depends=[data_table doParallel foreach getPass jsonlite magrittr neo4r purrr ReactomeContentService4R rlang]; }; + ReactomePA = derive2 { name="ReactomePA"; version="1.42.0"; sha256="06994hk9nrzlgz8sby61656rdbf1r954v71djl1i7141dgw5rif2"; depends=[AnnotationDbi DOSE enrichplot ggplot2 ggraph graphite gson igraph reactome_db]; }; + ReadqPCR = derive2 { name="ReadqPCR"; version="1.44.0"; sha256="1ss2mz31v2hps9hs34iz6cswynizw2qy64jzy72fgk4zi7a37wkv"; depends=[Biobase]; }; + RedeR = derive2 { name="RedeR"; version="2.2.0"; sha256="0icnd1cbmi410grzy0gxn7d8wp7avxffvzr8hk4qj6n2j46pd1y0"; depends=[igraph]; }; + RedisParam = derive2 { name="RedisParam"; version="1.0.0"; sha256="0jlkgkgfi7y5mmsqphp18qg1vnmrryq6xl6hdmafnh1skpn01mzn"; depends=[BiocParallel futile_logger redux withr]; }; + RefPlus = derive2 { name="RefPlus"; version="1.68.0"; sha256="1gi3z78g5z85sawqc4g056m8wgnbddyc0x9pdr0kjxr80kmm8jm3"; depends=[affy affyPLM Biobase preprocessCore]; }; + RegEnrich = derive2 { name="RegEnrich"; version="1.8.0"; sha256="0pjscj7zsd7kcmv23pndwasy4nf80ji8ynprl1xv1gxy0wbazxd4"; depends=[BiocParallel BiocSet DESeq2 DOSE dplyr fgsea ggplot2 limma magrittr randomForest reshape2 S4Vectors SummarizedExperiment tibble WGCNA]; }; + RepViz = derive2 { name="RepViz"; version="1.14.0"; sha256="0pbnca9srv6r5h5bin80xx95b9vx25y2kgfznydl6h6dp8vrxjdm"; depends=[biomaRt GenomicRanges IRanges Rsamtools S4Vectors]; }; + Repitools = derive2 { name="Repitools"; version="1.44.0"; sha256="148m0pnp40bc8hnq72gxivyhylnzjwh5bwpsv6yvjjc5d9b4h003"; depends=[BiocGenerics Biostrings BSgenome cluster DNAcopy edgeR GenomeInfoDb GenomicAlignments GenomicRanges gplots gsmoothr IRanges MASS Ringo Rsamtools Rsolnp rtracklayer S4Vectors]; }; + ReportingTools = derive2 { name="ReportingTools"; version="2.38.0"; sha256="1nrgnb002qv0yzmrvg59i9b5wzxda0fdkrmdi6vr15g0g7j3yry0"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category DESeq2 edgeR ggbio ggplot2 GOstats GSEABase hwriter IRanges knitr lattice limma PFAM_db R_utils XML]; }; + ResidualMatrix = derive2 { name="ResidualMatrix"; version="1.8.0"; sha256="0zqifr1zhsfhrkjlp0ajqiqc9f96yz8zr13yhl19lvw30pwg9rj9"; depends=[DelayedArray Matrix S4Vectors]; }; + Rfastp = derive2 { name="Rfastp"; version="1.8.0"; sha256="0vc03bch0j2zv468sb7prnc4ppxj45c21sgzkxx22gx019889qf2"; depends=[ggplot2 Rcpp reshape2 Rhtslib rjson zlibbioc]; }; + RgnTX = derive2 { name="RgnTX"; version="1.0.0"; sha256="1a70hwc1268qf0z2wyan1zgkgjc1z4fgbb8xlrbmv8nq0hblxfs7"; depends=[GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges regioneR S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene]; }; + Rgraphviz = derive2 { name="Rgraphviz"; version="2.42.0"; sha256="0blymdax10zzg2lpj4hgvyh9c01b1qaivrc0gx95swji37zkqnwm"; depends=[graph]; }; + Rhdf5lib = derive2 { name="Rhdf5lib"; version="1.20.0"; sha256="0zxgpc2krfwqzm8c05cdlfs3dyyf5ll43ff9mw8xzj89wcmlcfx7"; depends=[]; }; + Rhisat2 = derive2 { name="Rhisat2"; version="1.14.0"; sha256="19dc9fadgl55icqc5xv834kigicxxr6cny83247jjbgf5zp16piv"; depends=[GenomicFeatures GenomicRanges SGSeq]; }; + Rhtslib = derive2 { name="Rhtslib"; version="2.0.0"; sha256="1ri76wwv44hgxji2bmlqi6v8gbvhr72q0d6nlgpfgfwb9sgvz62h"; depends=[zlibbioc]; }; + RiboCrypt = derive2 { name="RiboCrypt"; version="1.4.0"; sha256="0656cgcb5k2ky3850pf7il61dr5nb3i2cdk93x3xllcacp64h4mm"; depends=[BiocGenerics BiocParallel Biostrings data_table dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges ORFik plotly rlang]; }; + RiboDiPA = derive2 { name="RiboDiPA"; version="1.6.0"; sha256="16i271hdibwv29883wxrzjhcilri4ydnyq5znl0dcqj2fbfr3y46"; depends=[BiocFileCache BiocGenerics data_table DESeq2 doParallel elitism foreach GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges matrixStats qvalue Rcpp reldist Rsamtools S4Vectors]; }; + RiboProfiling = derive2 { name="RiboProfiling"; version="1.28.0"; sha256="0wmmpcabi1ngwmvfhxkp44kj1wvzyrcckkrzpjlzcq016lr67iwn"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr reshape2 Rsamtools rtracklayer S4Vectors sqldf]; }; + Ringo = derive2 { name="Ringo"; version="1.62.0"; sha256="0l9lpf6a2cj88hm75f8qy7h13lvwc1ldykvqkd0zxzdwx1s64gzr"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; }; + Risa = derive2 { name="Risa"; version="1.40.0"; sha256="1id6xgm74zj1h1kig2apg119ms8n6z9pnjfwyxlbkdzyyn040rl0"; depends=[affy Biobase biocViews Rcpp xcms]; }; + Rmagpie = derive2 { name="Rmagpie"; version="1.54.0"; sha256="00ys66bbj8c61dr23zj1r0gn5lkmih15b2cbcvxxllzyy9smcdpa"; depends=[Biobase e1071 kernlab pamr]; }; + Rmmquant = derive2 { name="Rmmquant"; version="1.16.0"; sha256="0x8s2whkg9x3r1hk973zwkaby2d616cvfzkg3qp77nqn0sip91r8"; depends=[BiocStyle DESeq2 devtools GenomicRanges org_Mm_eg_db Rcpp S4Vectors SummarizedExperiment TBX20BamSubset TxDb_Mmusculus_UCSC_mm9_knownGene]; }; + RnBeads = derive2 { name="RnBeads"; version="2.16.0"; sha256="1cjzdwfjcb4wqwm5kwzyvf7f6c3glxjvhi4w9f26n1g9ifli9725"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr S4Vectors]; }; + RnaSeqSampleSize = derive2 { name="RnaSeqSampleSize"; version="2.8.0"; sha256="0v120ckw1b4j3fm80amm7qihrrczh3s291n2snrpai34xhpfbrva"; depends=[biomaRt dplyr edgeR ggplot2 ggpubr heatmap3 KEGGREST matlab Rcpp recount RnaSeqSampleSizeData SummarizedExperiment tidyr tidyselect]; }; + RolDE = derive2 { name="RolDE"; version="1.2.0"; sha256="0agxqynb58ky0z0dzhz3j7c2n1yz4njwk651jjikb9z3c4k67kiv"; depends=[doParallel doRNG foreach matrixStats nlme qvalue rngtools ROTS SummarizedExperiment]; }; + Rqc = derive2 { name="Rqc"; version="1.32.0"; sha256="02k64pjd1dlz5sksdbkbii9z4ihf1833ws7wwj81w3757zzabx0x"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings biovizBase GenomicAlignments GenomicFiles ggplot2 IRanges knitr markdown plyr Rcpp reshape2 Rsamtools S4Vectors shiny ShortRead]; }; + Rsamtools = derive2 { name="Rsamtools"; version="2.14.0"; sha256="0wd4hsn19msz0fkwfq7gvi97vlfpsbzzw3rjj4b6z7s5a83zir2z"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges Rhtslib S4Vectors XVector zlibbioc]; }; + Rsubread = derive2 { name="Rsubread"; version="2.12.2"; sha256="1gvd8vmglvzc3bixqxrm4k7yikl2as5l4x6bvvvnwsgx2i7vz7dm"; depends=[Matrix]; }; + Rtpca = derive2 { name="Rtpca"; version="1.8.0"; sha256="0n2k1pqba4fnf0mpkxywd93yzv9dk37c134pna3f25mgzgd84qj3"; depends=[Biobase dplyr fdrtool ggplot2 pROC tibble tidyr]; }; + Rtreemix = derive2 { name="Rtreemix"; version="1.60.0"; sha256="0pkc4xsqqfdvszbb0xwx3hbxl1f7kcx3vm9bhjd7zkwls1jvv2n8"; depends=[Biobase graph Hmisc]; }; + S4Vectors = derive2 { name="S4Vectors"; version="0.36.1"; sha256="16lssnmhy3klqp4sw1328f38cixkjh9317gdyikcrmsbcwg2ak6v"; depends=[BiocGenerics]; }; + SAIGEgds = derive2 { name="SAIGEgds"; version="1.12.0"; sha256="1dlkljzm0ji3hkck3w5p69x5ld1pw2yaz3j3v34az1v9xdkzq1j1"; depends=[gdsfmt Rcpp RcppArmadillo RcppParallel SeqArray SPAtest]; }; + SANTA = derive2 { name="SANTA"; version="2.34.0"; sha256="1i99s33id75srjr0x3yfz1gdyxw6766pr9w4afs8varfq8gxyc48"; depends=[igraph Matrix]; }; + SBGNview = derive2 { name="SBGNview"; version="1.12.0"; sha256="0644hd9m4d1s9y000yh831pwyx7q1dzr69fjqf15bby78xkn70yn"; depends=[AnnotationDbi bookdown httr igraph KEGGREST knitr pathview Rdpack rmarkdown rsvg SBGNview_data SummarizedExperiment xml2]; }; + SBMLR = derive2 { name="SBMLR"; version="1.94.0"; sha256="1x7p27abv9yc9mxbnprlwh5ph50jkycmlb90qib0mj361g4sr72d"; depends=[deSolve XML]; }; + SC3 = derive2 { name="SC3"; version="1.26.0"; sha256="0f1k27czkccgpgrmlr6bk5ajcbfr99iv9dyjxrmd0l86dm1afab9"; depends=[BiocGenerics cluster doParallel doRNG e1071 foreach ggplot2 pheatmap Rcpp RcppArmadillo robustbase ROCR rrcov S4Vectors shiny SingleCellExperiment SummarizedExperiment WriteXLS]; }; + SCAN_UPC = derive2 { name="SCAN.UPC"; version="2.40.0"; sha256="1hrfwkn1gd1r2clk09a2i4sqc92bmw1c7h5ddrdnlcpgfdlsdnxp"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; }; + SCANVIS = derive2 { name="SCANVIS"; version="1.12.0"; sha256="0hs065lsfwjdz8b6kic1gjpak8xd5p08k957f9zsz32shp0gp976"; depends=[IRanges plotrix RCurl rtracklayer]; }; + SCATE = derive2 { name="SCATE"; version="1.8.0"; sha256="1zxliw0q979jps5lrmwks5m39qjd827jbvax1ndkd8p6lp1pcm2h"; depends=[GenomicAlignments GenomicRanges mclust preprocessCore Rtsne SCATEData splines2 xgboost]; }; + SCArray = derive2 { name="SCArray"; version="1.6.0"; sha256="0crh2ddh87j5qbxnslr1f94nsf24rzqz61ng6v3g8zpsldkrw09b"; depends=[BiocGenerics DelayedArray DelayedMatrixStats gdsfmt IRanges S4Vectors SingleCellExperiment SummarizedExperiment]; }; + SCBN = derive2 { name="SCBN"; version="1.16.0"; sha256="1lan5anf451dmb19sra79d4w2qi9kk7xw3zijswlbhfnd4fv9kgz"; depends=[]; }; + SCFA = derive2 { name="SCFA"; version="1.8.0"; sha256="02g7hzgg68y8ckwhdwlp86574x0ffjp86nwg11whyira80v5y97y"; depends=[BiocParallel cluster clusterCrit coro glmnet igraph Matrix matrixStats psych RhpcBLASctl survival torch]; }; + SCOPE = derive2 { name="SCOPE"; version="1.10.0"; sha256="1z9v27l8bs7gkbgp1kd1q9nyq77x46anc0x0c1as0m04qq7c5xbj"; depends=[BiocGenerics Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 DescTools DNAcopy doParallel foreach GenomeInfoDb GenomicRanges gplots IRanges RColorBrewer Rsamtools S4Vectors]; }; + SCnorm = derive2 { name="SCnorm"; version="1.20.0"; sha256="0zv4pf650crwliby34cjv7kxkrbqhc7xvz15n39hz5d0fk7ablgd"; depends=[BiocGenerics BiocParallel cluster data_table forcats ggplot2 moments quantreg S4Vectors SingleCellExperiment SummarizedExperiment]; }; + SDAMS = derive2 { name="SDAMS"; version="1.18.0"; sha256="0i9i9w24qb66rbvkpjn2fin8x0mxd7g767i4ly0s75v9kbbp3ca6"; depends=[qvalue SummarizedExperiment trust]; }; + SELEX = derive2 { name="SELEX"; version="1.30.0"; sha256="0b5dcx9djh9d0zi12bnzq81jjzcqam1i59a05d3p917gf0n058ms"; depends=[Biostrings rJava]; }; + SEPIRA = derive2 { name="SEPIRA"; version="1.18.0"; sha256="1vm4zy6a0hff6j6ysbnrxa51irc4mh98rxs2f253f50rwsbasxlv"; depends=[corpcor limma]; }; + SEtools = derive2 { name="SEtools"; version="1.12.0"; sha256="0q47pw3yvk13ld9zwpc6lihf9y4z2dq81y81zyz5b8mxnlkhwixa"; depends=[BiocParallel circlize data_table DESeq2 edgeR Matrix openxlsx pheatmap S4Vectors sechm SummarizedExperiment sva]; }; + SGSeq = derive2 { name="SGSeq"; version="1.32.0"; sha256="03ddz0mpgqqb52r7wa46bcr1ybf40126pg0n0n0pv6fnbq0ifwyc"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer RUnit S4Vectors SummarizedExperiment]; }; + SIAMCAT = derive2 { name="SIAMCAT"; version="2.2.0"; sha256="1fx355rwaqg057f6qyynmnhqvf74c818irfaii6y3s46g455nvwk"; depends=[beanplot corrplot glmnet gridBase gridExtra infotheo lgr LiblineaR lmerTest matrixStats mlr3 mlr3learners mlr3tuning paradox phyloseq pROC progress PRROC RColorBrewer scales stringr]; }; + SICtools = derive2 { name="SICtools"; version="1.28.0"; sha256="1zjwph09shvjzzhsnh8mfzqypj2s66r6irq1bms2zw1mqpjcb2fx"; depends=[Biostrings doParallel GenomicRanges IRanges matrixStats plyr Rsamtools stringr]; }; + SIM = derive2 { name="SIM"; version="1.68.0"; sha256="0vrz9cmzjy20h02gsi79svrh9ffrxkkzbnfa0azcgycz6h5ywggs"; depends=[globaltest quantreg quantsmooth]; }; + SIMAT = derive2 { name="SIMAT"; version="1.30.0"; sha256="1zwmwblzr9r66a5d9xrjb43id9fl5m4fbzgn04yx9bmvxywa4xfw"; depends=[ggplot2 mzR Rcpp reshape2]; }; + SIMD = derive2 { name="SIMD"; version="1.16.0"; sha256="18wwn76kd826jgqqdrdmsjq5m6mfn3kp3w2h2p5qwb4w5zqdw2ir"; depends=[edgeR methylMnM statmod]; }; + SIMLR = derive2 { name="SIMLR"; version="1.24.0"; sha256="1v5ias6m7p7bww4kslp61nzd6aqcgwwqjb9sxi0arizl5ddwnn0j"; depends=[Matrix pracma Rcpp RcppAnnoy RSpectra]; }; + SISPA = derive2 { name="SISPA"; version="1.28.0"; sha256="08ks8nlc200yz8r3qr45g03k4bpi4dfvdd7sin1yadazfil1s6kr"; depends=[changepoint data_table genefilter ggplot2 GSVA plyr]; }; + SLqPCR = derive2 { name="SLqPCR"; version="1.64.0"; sha256="0s3gs5q5h4vrjaqwdr6gjfsl1pj286sim2cx9abvjj9hpcjk08vx"; depends=[]; }; + SMAD = derive2 { name="SMAD"; version="1.14.1"; sha256="1scmpagh86s9f8qsa89vi8l221asbygpv4mkg7bsv5943aqbknpm"; depends=[dplyr magrittr Rcpp RcppAlgos tidyr]; }; + SMAP = derive2 { name="SMAP"; version="1.62.0"; sha256="152lrwn5rr9vlkgj22sgzg0winnhzvvlg6nvzd717bjngjjfj8nq"; depends=[]; }; + SMITE = derive2 { name="SMITE"; version="1.26.0"; sha256="0jkxchbwjjid2r8z1dipjp6rzmj0qs9afrvd4jamvx1gg9xwr6b3"; depends=[AnnotationDbi Biobase BioNet geneLenDataBase GenomicRanges ggplot2 goseq Hmisc igraph IRanges KEGGREST org_Hs_eg_db plyr reactome_db S4Vectors scales]; }; + SNAGEE = derive2 { name="SNAGEE"; version="1.38.0"; sha256="1hbcibv4yhk7hw4w41nq85szk41vrfyfv7cv4qzn0xhv3cacivj1"; depends=[SNAGEEdata]; }; + SNPRelate = derive2 { name="SNPRelate"; version="1.32.0"; sha256="00b45rfsandmp6bc458lz7w3vkgc0vsr8wd7xbjq8rnzxpj3bzdj"; depends=[gdsfmt]; }; + SNPediaR = derive2 { name="SNPediaR"; version="1.24.0"; sha256="1afz3d8vbldd5q38nsqwblap4rgxhjqq6yixh5vgk0qbcmhhhb8g"; depends=[jsonlite RCurl]; }; + SNPhood = derive2 { name="SNPhood"; version="1.28.0"; sha256="0kn0ini79lp2c3mav1hf54jg3lw2ggdbi03nrxxp9iinzs83q9d2"; depends=[BiocGenerics BiocParallel Biostrings checkmate cluster data_table DESeq2 GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges lattice RColorBrewer reshape2 Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; }; + SOMNiBUS = derive2 { name="SOMNiBUS"; version="1.6.0"; sha256="04lkkhq3im7cyi0ibm8i53092hjlwaz0v32chp487pwdpz87c650"; depends=[Matrix mgcv VGAM]; }; + SPEM = derive2 { name="SPEM"; version="1.38.0"; sha256="1763qcs36vsvbd7rv3s40lgq6yq7b2dcjadgcqmh081hc4zz63cb"; depends=[Biobase Rsolnp]; }; + SPIA = derive2 { name="SPIA"; version="2.50.0"; sha256="1zrjjlji7whpvgpznslswxs6nj29n40x02z0v62j1x7r0y4rkn7b"; depends=[KEGGgraph]; }; + SPIAT = derive2 { name="SPIAT"; version="1.0.2"; sha256="1lajmcg75nypl3ms1dsjxj5fiwi0ncc4405makkczm0gs6d06qch"; depends=[alphahull apcluster ComplexHeatmap dbscan dittoSeq dplyr elsa ggplot2 gridExtra gtools mmand plotly pracma RANN raster reshape2 rlang Rtsne sp SpatialExperiment spatstat_explore spatstat_geom SummarizedExperiment tibble umap vroom xROI]; }; + SPLINTER = derive2 { name="SPLINTER"; version="1.24.0"; sha256="01rq0x3v5byqwj0mlxv207hkf2zhadyq28qnr49mx25xanb714ah"; depends=[biomaRt Biostrings BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 googleVis Gviz IRanges plyr S4Vectors seqLogo stringr]; }; + SPONGE = derive2 { name="SPONGE"; version="1.20.0"; sha256="0wlm7xbnz50avlyx0gpxqbwsascwg777sc39h01a3qxbfz91ia4w"; depends=[Biobase biomaRt caret ComplexHeatmap cvms data_table doRNG dplyr expm foreach ggplot2 ggpubr ggridges glmnet gRbase igraph iterators logging MASS MetBrewer miRBaseConverter ppcor randomForest rlang stringr tidyr tidyverse tnet]; }; + SPOTlight = derive2 { name="SPOTlight"; version="1.2.0"; sha256="03zvbhr1k4zwnzkza99295fp7j1pihjfz8gs1v0kgksj340nwfvf"; depends=[ggplot2 Matrix matrixStats NMF nnls SingleCellExperiment]; }; + SPsimSeq = derive2 { name="SPsimSeq"; version="1.8.0"; sha256="1rhvxqldzv7if8r8x7xnszb68r6qcbysazddbbil0drvi1dxsl0z"; depends=[edgeR fitdistrplus Hmisc limma mvtnorm phyloseq SingleCellExperiment WGCNA]; }; + SQLDataFrame = derive2 { name="SQLDataFrame"; version="1.12.0"; sha256="06sppcwx5xm1z2dyqfxl9ml3wpyblvcvy0jsc4dqyw5d8np87m5d"; depends=[BiocGenerics DBI dbplyr dplyr lazyeval RSQLite S4Vectors tibble]; }; + SQUADD = derive2 { name="SQUADD"; version="1.48.0"; sha256="174gbzjjvyz0m4ldr0blg82xd7r3av7frzw199ignhflyxy6brsx"; depends=[RColorBrewer]; }; + SRAdb = derive2 { name="SRAdb"; version="1.60.0"; sha256="1j88gk2dr2anh61acvdyqf2gvy3d1dzdssfj1fwpwppy2p0gy0xr"; depends=[GEOquery graph RCurl RSQLite]; }; + STAN = derive2 { name="STAN"; version="2.26.0"; sha256="0lmgplv4fffcq6vp5083hz0y1di7m5zm9dpbkcbm2aq85idyswyr"; depends=[BiocGenerics GenomeInfoDb GenomicRanges Gviz IRanges poilog Rsolnp S4Vectors]; }; + STATegRa = derive2 { name="STATegRa"; version="1.34.0"; sha256="1l9xzkd1hwiah7bwm23clwc62gs1jks9hgkympwyr5in33fy6z61"; depends=[affy Biobase calibrate edgeR foreach ggplot2 gplots gridExtra limma MASS]; }; + STRINGdb = derive2 { name="STRINGdb"; version="2.10.0"; sha256="1md79vx4270wgh07g3m1mypdki1b9d4a558zxplcalwppqh0dsmp"; depends=[gplots hash igraph plotrix plyr png RColorBrewer RCurl sqldf]; }; + STROMA4 = derive2 { name="STROMA4"; version="1.22.0"; sha256="0cyyjly4wpzjyf130shcpy9q734l32wk3a3c2wymbvxxlphk9353"; depends=[Biobase BiocParallel cluster matrixStats]; }; + STdeconvolve = derive2 { name="STdeconvolve"; version="1.2.0"; sha256="1f5b3vnswpj6sja05g9lnx3lygzkh162kynja0xfjd0rksp4n0h5"; depends=[BiocParallel clue ggplot2 liger Matrix mgcv reshape2 scatterpie slam topicmodels viridis]; }; + SUITOR = derive2 { name="SUITOR"; version="1.0.0"; sha256="0ms36d1ay3w1ynrj6672yhvdv0fsvrlwx6fqrp56f5ibvmh3nchd"; depends=[BiocParallel ggplot2]; }; + SWATH2stats = derive2 { name="SWATH2stats"; version="1.28.0"; sha256="1mab1q9xv0pzm97lpsnvn3hhybqrmy29gcdcdxd4myf6zqg1j0a3"; depends=[biomaRt data_table ggplot2 reshape2]; }; + SamSPECTRAL = derive2 { name="SamSPECTRAL"; version="1.52.0"; sha256="1sphi1y61abx428624nrk8srlcp405ssqzzxwrpjrd325gj5ry5q"; depends=[]; }; + Scale4C = derive2 { name="Scale4C"; version="1.20.0"; sha256="1fqzfq782xb378p3f8cyd2pd81iwpw5vf9ssq9349vwz1qzycm8a"; depends=[GenomicRanges IRanges smoothie SummarizedExperiment]; }; + ScaledMatrix = derive2 { name="ScaledMatrix"; version="1.6.0"; sha256="0lxr6z9zdrgvm06inc1d8gl2agqmbjvgs8f5ryn5x68hqlnchnl1"; depends=[DelayedArray Matrix S4Vectors]; }; + Sconify = derive2 { name="Sconify"; version="1.18.0"; sha256="09jhbvqrwkwp0lg8ixxja9hg88virvpj7bglcmws4z6ch98g42cy"; depends=[dplyr flowCore FNN ggplot2 magrittr readr Rtsne tibble]; }; + ScreenR = derive2 { name="ScreenR"; version="1.0.0"; sha256="1907v37z3lrqmlghx4kja5pfii1hbifdxka32yqqrnb5zzw4lgxz"; depends=[dplyr edgeR ggplot2 ggvenn limma magrittr patchwork purrr rlang scales stringr tibble tidyr tidyselect]; }; + SemDist = derive2 { name="SemDist"; version="1.32.0"; sha256="1w8jbzz5b9ggc696hbj7vy4n6j2h047raw3x9k6y3vf7b4g83nl6"; depends=[annotate AnnotationDbi GO_db]; }; + SeqArray = derive2 { name="SeqArray"; version="1.38.0"; sha256="12q4n2whcnp011xqlb6hfagk5d6yl24w5i68iz3j7m9cbcxwv6cn"; depends=[Biostrings gdsfmt GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + SeqGSEA = derive2 { name="SeqGSEA"; version="1.38.0"; sha256="1d88glq8k5bv76s3iq39s5vzzzpcg61r5rfbgw7kdcawing485fq"; depends=[Biobase biomaRt DESeq2 doParallel]; }; + SeqGate = derive2 { name="SeqGate"; version="1.8.0"; sha256="0j515d63xmy1p7d7f8cbg0dz5d61vznsfdw8id8cr32jz7ciz1y4"; depends=[BiocManager GenomicRanges S4Vectors SummarizedExperiment]; }; + SeqSQC = derive2 { name="SeqSQC"; version="1.20.0"; sha256="12czsf0nphqqrwh5iyragjmms4srjklqdzv3232p39vm5zy5p6c0"; depends=[e1071 ExperimentHub gdsfmt GenomicRanges GGally ggplot2 IRanges rbokeh RColorBrewer reshape2 rmarkdown S4Vectors SNPRelate]; }; + SeqVarTools = derive2 { name="SeqVarTools"; version="1.36.0"; sha256="0cy85fzrbd646yc774y0v8qiccjhx7f6ysk399zgdfrkq6r458yd"; depends=[Biobase BiocGenerics data_table gdsfmt GenomicRanges GWASExactHW IRanges logistf Matrix S4Vectors SeqArray]; }; + SharedObject = derive2 { name="SharedObject"; version="1.12.0"; sha256="11rrnm7kjm6z8j4ga88s4cafcdj83pvhnybp7ns5pn7s2ln8044d"; depends=[BH BiocGenerics Rcpp]; }; + ShortRead = derive2 { name="ShortRead"; version="1.56.1"; sha256="1dvnjjc6cwn9wicki3ff3w3zx7i0szj0lnfw4n6lbmipg4ia5bkb"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rhtslib Rsamtools S4Vectors XVector zlibbioc]; }; + SigCheck = derive2 { name="SigCheck"; version="2.30.0"; sha256="0j8m04csgyz3ph6xp1qd5fzsqh83717366f136vgqr6y4msv6jyj"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; }; + SigFuge = derive2 { name="SigFuge"; version="1.36.0"; sha256="1bqj490afai01bkkxkc3pph2vix0hjvkixrndks57bwh94r9k876"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; }; + SigsPack = derive2 { name="SigsPack"; version="1.12.0"; sha256="0bwhpaj1wr67nhljslpvr25yz1y1zxnha2w58g8bmbxxfp8353zc"; depends=[Biobase Biostrings BSgenome GenomeInfoDb GenomicRanges quadprog rtracklayer SummarizedExperiment VariantAnnotation]; }; + SimBindProfiles = derive2 { name="SimBindProfiles"; version="1.36.0"; sha256="12383rvcq7l2b3ik2gi741d33shrijj09gqpkbvbksj046j90swm"; depends=[Biobase limma mclust Ringo]; }; + SimBu = derive2 { name="SimBu"; version="1.0.0"; sha256="0hnvhl15jp3kdzijczii8z18533as496f17566kqjz9zrkahlldj"; depends=[basilisk BiocParallel data_table dplyr ggplot2 Matrix phyloseq proxyC RColorBrewer RCurl reticulate sparseMatrixStats SummarizedExperiment tidyr]; }; + SimFFPE = derive2 { name="SimFFPE"; version="1.10.0"; sha256="1mlmlbnqqzxmjmir9lnqnqqb6hmj6wfxhy6wpmf6sv9y2vi2cvjz"; depends=[Biostrings doParallel dplyr foreach GenomicRanges IRanges Rsamtools truncnorm]; }; + SingleCellExperiment = derive2 { name="SingleCellExperiment"; version="1.20.0"; sha256="1y9c9wf3009w4qh03zpsmc0ff0nkzal673a4nql5c11cn55sza2g"; depends=[BiocGenerics DelayedArray GenomicRanges S4Vectors SummarizedExperiment]; }; + SingleCellSignalR = derive2 { name="SingleCellSignalR"; version="1.10.0"; sha256="194gnss397wv3pxh1vf8gfikbz519l8hx3w4fm2hxvjs6q8k2234"; depends=[BiocManager circlize data_table edgeR foreach gplots igraph limma multtest pheatmap Rtsne scran SIMLR stringr]; }; + SingleMoleculeFootprinting = derive2 { name="SingleMoleculeFootprinting"; version="1.6.0"; sha256="0dqyx3w8mxhf04xczzdv49lc2jkyamv1vlbdvfj0556y54z45cgg"; depends=[BiocGenerics Biostrings BSgenome data_table GenomeInfoDb GenomicRanges IRanges plyr QuasR RColorBrewer]; }; + SingleR = derive2 { name="SingleR"; version="2.0.0"; sha256="05rw6l0d4n9m1dd7dp55zfripx036x1riwy83sx3aj5mw4r1awb6"; depends=[beachmat BiocNeighbors BiocParallel BiocSingular DelayedArray DelayedMatrixStats Matrix Rcpp S4Vectors SummarizedExperiment]; }; + SomaticSignatures = derive2 { name="SomaticSignatures"; version="2.34.0"; sha256="0xyh4pwwbpa1bmamqdhp84qhjdc2qsxc43xgknjrrja24d06ji2j"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; }; + SpacePAC = derive2 { name="SpacePAC"; version="1.36.0"; sha256="0pbbqadais7lvkiz1cj1gpx35l28nb5mm53nmkif4jbd9a2p7lh5"; depends=[iPAC]; }; + Spaniel = derive2 { name="Spaniel"; version="1.12.0"; sha256="1sxjdcc31dl7ljbayrykjr0pq6yywxcysiiclziv62msyk9v4hfx"; depends=[dplyr DropletUtils ggplot2 igraph jpeg jsonlite magrittr png S4Vectors scater scran Seurat shiny SingleCellExperiment SummarizedExperiment]; }; + SparseSignatures = derive2 { name="SparseSignatures"; version="2.8.0"; sha256="05zsmm8s23wms8arf2hrjx8vzklkq5py9wbqvvnp7989kb2r0bfn"; depends=[Biostrings BSgenome data_table GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges NMF nnlasso nnls reshape2]; }; + SpatialCPie = derive2 { name="SpatialCPie"; version="1.14.0"; sha256="07pl9wnn5b1ia71npvcfbm8virydj3fjrpr33gmk081yzvkqr52q"; depends=[colorspace data_table digest dplyr ggforce ggiraph ggplot2 ggrepel igraph lpSolve purrr readr rlang shiny shinycssloaders shinyjs shinyWidgets SummarizedExperiment tibble tidyr tidyselect zeallot]; }; + SpatialDecon = derive2 { name="SpatialDecon"; version="1.8.0"; sha256="0an0wkblfv5bzsvlq7bz01hcc1vaj16l28yk621jpyb4bjva795z"; depends=[Biobase GeomxTools logNormReg Matrix repmis SeuratObject]; }; + SpatialExperiment = derive2 { name="SpatialExperiment"; version="1.8.0"; sha256="1cjrgcn4cbflbfllrfjvn0nzz9xvyflr2pd8zjqgdqxyj7rxpng7"; depends=[BiocFileCache BiocGenerics DropletUtils magick rjson S4Vectors SingleCellExperiment SummarizedExperiment]; }; + SpatialFeatureExperiment = derive2 { name="SpatialFeatureExperiment"; version="1.0.2"; sha256="0jd4d1djrcqydyy182zd28fffvzkph4krlsk7sk1avk1nj5x2jg2"; depends=[BiocGenerics BiocParallel rjson S4Vectors sf SingleCellExperiment SpatialExperiment spdep SummarizedExperiment]; }; + SpeCond = derive2 { name="SpeCond"; version="1.52.0"; sha256="09f5nz799ai7y4ig6y24xnldd37qvv7yd1k258z3s9ckc76cdgd4"; depends=[Biobase fields hwriter mclust RColorBrewer]; }; + Spectra = derive2 { name="Spectra"; version="1.8.1"; sha256="13vm0szpsac29sys1wmqi9mjxgmascn00vr01wdlg22789hvnzkd"; depends=[BiocGenerics BiocParallel fs IRanges MsCoreUtils ProtGenerics S4Vectors]; }; + SpectralTAD = derive2 { name="SpectralTAD"; version="1.14.0"; sha256="1sfbbwl9i0615rapmlycr2c41vlw5yvip1qkkwjq3hmyvj4bs0rd"; depends=[BiocParallel cluster dplyr GenomicRanges HiCcompare magrittr Matrix PRIMME]; }; + SpidermiR = derive2 { name="SpidermiR"; version="1.28.0"; sha256="13dbz24g7l25d26piq00cpyll4cf8ss5l1kih7nvp8lrb540h6df"; depends=[AnnotationDbi gdata httr igraph miRNAtap miRNAtap_db org_Hs_eg_db]; }; + SpliceWiz = derive2 { name="SpliceWiz"; version="1.0.1"; sha256="0sncnp8csvz1vg5b74mqfsf3bmscqjzk1nzd66pz4vf5dm1px3qj"; depends=[AnnotationHub BiocFileCache BiocGenerics BiocParallel Biostrings BSgenome data_table DelayedArray DelayedMatrixStats DT fst genefilter GenomeInfoDb GenomicRanges ggplot2 HDF5Array heatmaply IRanges magrittr matrixStats NxtIRFdata ompBAM pheatmap plotly progress R_utils RColorBrewer Rcpp RcppProgress rhandsontable rhdf5 rtracklayer S4Vectors shiny shinydashboard shinyFiles shinyWidgets SummarizedExperiment XML zlibbioc]; }; + SplicingFactory = derive2 { name="SplicingFactory"; version="1.6.0"; sha256="1l92i96n7pgwrrl4ywwmbpl1al5x3lamn9wrplclkh0l8yx8c033"; depends=[SummarizedExperiment]; }; + SplicingGraphs = derive2 { name="SplicingGraphs"; version="1.38.0"; sha256="0bqgn2lcmf6n188mj70cczwaps97dghmsililviq9sll91dj1gn8"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; }; + SpotClean = derive2 { name="SpotClean"; version="1.0.1"; sha256="1sxmj1zgx7xf3f29l9qws4sf9k6v1wwh94brawqd6qq1plv79g51"; depends=[dplyr ggplot2 Matrix RColorBrewer readbitmap rhdf5 rjson rlang S4Vectors Seurat SpatialExperiment SummarizedExperiment tibble viridis]; }; + StarBioTrek = derive2 { name="StarBioTrek"; version="1.24.0"; sha256="02j6l2dmygwmsg1kyb3wpd9qsph5a9wim6gzaljzfa3y2gcv7sx3"; depends=[AnnotationDbi e1071 ggplot2 graphite igraph MLmetrics reshape2 ROCR SpidermiR]; }; + Statial = derive2 { name="Statial"; version="1.0.1"; sha256="1d9crknbxrdpdvmjkm0y2im3har486dlgy5k40njiff7wcm9g4ms"; depends=[BiocParallel concaveman data_table dplyr ggplot2 SingleCellExperiment spatstat_explore spatstat_geom stringr tibble tidyr tidyselect tidyverse]; }; + Streamer = derive2 { name="Streamer"; version="1.44.0"; sha256="14wr5q5dkc5b8hb1zkh03hk7bx51hicshwjvwvy01yxfyi1jkszq"; depends=[BiocGenerics graph RBGL]; }; + Structstrings = derive2 { name="Structstrings"; version="1.14.0"; sha256="0sw8jv3qhfr0r13dpyhml3xrmvf35cnqai20mk123iq160zjq74s"; depends=[BiocGenerics Biostrings crayon IRanges S4Vectors stringi stringr XVector]; }; + StructuralVariantAnnotation = derive2 { name="StructuralVariantAnnotation"; version="1.13.0"; sha256="11z3acsbaifrxkghd7i8503ki9s1lc6c22880yna6qcfprlzb44g"; depends=[assertthat BiocGenerics Biostrings dplyr GenomeInfoDb GenomicFeatures GenomicRanges IRanges rlang rtracklayer S4Vectors stringr SummarizedExperiment VariantAnnotation]; }; + SubCellBarCode = derive2 { name="SubCellBarCode"; version="1.14.0"; sha256="192yj32aj012ww5yz3v5x4xplrkr5k8zp9yvmfq86hzn4jwcpdxx"; depends=[AnnotationDbi caret e1071 ggplot2 ggrepel gridExtra networkD3 org_Hs_eg_db Rtsne scatterplot3d]; }; + SummarizedBenchmark = derive2 { name="SummarizedBenchmark"; version="2.16.0"; sha256="1q63aqxrk3s944kld2ji0ghng7yyy8a2d4bwar3wpp1plhkiirrq"; depends=[BiocGenerics BiocParallel crayon digest dplyr ggplot2 mclust rlang S4Vectors sessioninfo stringr SummarizedExperiment tibble tidyr UpSetR]; }; + SummarizedExperiment = derive2 { name="SummarizedExperiment"; version="1.28.0"; sha256="0897v6x1ki4m7kajnd60yv5qj6xa1293sj572b4dhcnfjvsf9rcn"; depends=[Biobase BiocGenerics DelayedArray GenomeInfoDb GenomicRanges IRanges Matrix MatrixGenerics S4Vectors]; }; + Summix = derive2 { name="Summix"; version="2.4.0"; sha256="0da94002spi4hv6a42aahdcazq66lf2nf4r6l2zg3hqxw0v6kph9"; depends=[nloptr]; }; + SwathXtend = derive2 { name="SwathXtend"; version="2.20.0"; sha256="0bki0cl034zlccqg59dmvr9g57fz6qm57kr28arsl2w1bwjmng8d"; depends=[e1071 lattice openxlsx VennDiagram]; }; + SynExtend = derive2 { name="SynExtend"; version="1.10.2"; sha256="1cbbhyqyhwdzcsphaqirm2mas8yb6mgs2pmm1x2krfypq200sji1"; depends=[Biostrings DECIPHER IRanges S4Vectors]; }; + SynMut = derive2 { name="SynMut"; version="1.14.0"; sha256="0dq5cy79pdi4ibkyvac315f14xxwahpyznpgzjybksr8xqsa5lsc"; depends=[BiocGenerics Biostrings seqinr stringr]; }; + TADCompare = derive2 { name="TADCompare"; version="1.8.0"; sha256="197cbbi7wnw0j6i8fvl051zhmjl9cgiy45pq7fcjc48vnrv5vw6y"; depends=[cluster cowplot dplyr ggplot2 ggpubr HiCcompare magrittr Matrix PRIMME RColorBrewer reshape2 tidyr]; }; + TAPseq = derive2 { name="TAPseq"; version="1.10.0"; sha256="0ilpziqzbk4qlka4dmvbkv8dr3w86hpsxm0nlakkps895z8x59sz"; depends=[BiocGenerics BiocParallel Biostrings BSgenome dplyr GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges S4Vectors tidyr]; }; + TBSignatureProfiler = derive2 { name="TBSignatureProfiler"; version="1.10.0"; sha256="0v4xi6hbzw2x0ipg49xn41fdn6mksfnmsikg9nqvq28m55hkxxmc"; 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.38.0"; sha256="17kkn8xfkf7g8y51nnzsrgn8v65qlh8a4jysn03phk7pnfrmj7jl"; depends=[baySeq DESeq2 edgeR ROC]; }; + TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.25.3"; sha256="0daq7093yipry8pp6fj6pj8x1njxs8j6cz7875qkfmzqkbis4vql"; 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.23.0"; sha256="16757szccczlv1q35y1cnmlkr12s46f63z7ijffpb15q85xlaqdx"; 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.18.0"; sha256="0vhpamn5ak3b7dr3f4a4z6f7xfsprryjw8nax4f4p3flifim9kmx"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicDataCommons GenomicFeatures GenomicRanges IRanges MultiAssayExperiment RaggedExperiment rvest S4Vectors stringr SummarizedExperiment xml2]; }; + TCseq = derive2 { name="TCseq"; version="1.22.0"; sha256="07zk4c8d9jf8d8f71jbd57c4dhi8g23avwhr2smzi7xqhy12zfp5"; depends=[BiocGenerics cluster e1071 edgeR GenomicAlignments GenomicRanges ggplot2 IRanges locfit reshape2 Rsamtools SummarizedExperiment]; }; + TDARACNE = derive2 { name="TDARACNE"; version="1.47.0"; sha256="19zf7x2wcfnij1nlh623kim63d6wb3p42mwsn35msds778jvcbxq"; depends=[Biobase Rgraphviz]; }; + TEKRABber = derive2 { name="TEKRABber"; version="1.2.0"; sha256="139lblpf5vcpr2mni4x2l5ba4dcixnzbvav8cb90586myrwxkxf3"; depends=[apeglm biomaRt DESeq2 Rcpp SCBN SummarizedExperiment]; }; + TENxIO = derive2 { name="TENxIO"; version="1.0.0"; sha256="0qva89qpb8zhshq0b77js1m3hc81jpk53yi6vygwfmassg0s7wyz"; depends=[BiocBaseUtils BiocGenerics BiocIO GenomeInfoDb GenomicRanges Matrix MatrixGenerics R_utils RCurl readr S4Vectors SingleCellExperiment SummarizedExperiment]; }; + TEQC = derive2 { name="TEQC"; version="4.20.0"; sha256="124y6kmwk1cx3k5rjr36lx1ii6fr5xllxniggd59a8k5gdrfizg2"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; }; + TFARM = derive2 { name="TFARM"; version="1.20.0"; sha256="189h3cc113ikk7ixwrww7ahd20l4dnsnppylphkmxp2p1zhg8ny8"; depends=[arules fields GenomicRanges gplots stringr]; }; + TFBSTools = derive2 { name="TFBSTools"; version="1.36.0"; sha256="05kgkwmh5mcrm0xd81rzicysgknb8wrf71y2llikvma1b9c1g789"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome caTools CNEr DBI DirichletMultinomial GenomeInfoDb GenomicRanges gtools IRanges RSQLite rtracklayer S4Vectors seqLogo TFMPvalue XML XVector]; }; + TFEA_ChIP = derive2 { name="TFEA.ChIP"; version="1.18.0"; sha256="0ylcr59zxyka3yngf419gzc6jqcg5yrvwsaclvaiz8fcnw0rymmv"; depends=[biomaRt dplyr GenomicFeatures GenomicRanges IRanges org_Hs_eg_db R_utils]; }; + TFHAZ = derive2 { name="TFHAZ"; version="1.20.0"; sha256="16b3m09kn6kq8fhl873dg4h00mdnazk7kz5aipqn6nl3n5pxdpb7"; depends=[GenomicRanges IRanges ORFik S4Vectors]; }; + TFutils = derive2 { name="TFutils"; version="1.18.0"; sha256="1spfa75rxfkss8fipyq9bfdm3p71y2kabwcgjpq97q1b5wnfqazd"; depends=[AnnotationDbi BiocFileCache dplyr DT GSEABase httr magrittr miniUI org_Hs_eg_db readxl rjson Rsamtools shiny]; }; + TIN = derive2 { name="TIN"; version="1.30.0"; sha256="01cpi05y1x9d0i97w1bifi43spa9rkblqpvdx8vvbkzhxbmzkhi8"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; }; + TMixClust = derive2 { name="TMixClust"; version="1.20.0"; sha256="1l06mlz9fsxn552b28japiw4h5h4wjf4jcrqbpcisbrxnnp6480i"; depends=[Biobase BiocParallel cluster flexclust gss mvtnorm SPEM zoo]; }; + TNBC_CMS = derive2 { name="TNBC.CMS"; version="1.14.0"; sha256="0i17bikrsh408n75msli2h291iypi2higr4gr1lf76rg98lf5l4i"; depends=[e1071 forestplot GGally ggplot2 ggpubr GSVA pheatmap pracma quadprog R_utils RColorBrewer SummarizedExperiment survival]; }; + TOAST = derive2 { name="TOAST"; version="1.12.0"; sha256="1v9nsbgwp5476ddn3irqiq4cxnpqs49w70l3qbhkm5ydg2ym3cvs"; depends=[corpcor doParallel EpiDISH GGally ggplot2 limma nnls quadprog SummarizedExperiment tidyr]; }; + TPP = derive2 { name="TPP"; version="3.26.0"; sha256="1vgvsf94rqabh6bpl73ml10ka91ky4xd0fk7l74vkxrshv02qk6f"; 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.14.0"; sha256="1hba901gfm1saqyh8yf18nn4r5s6i1bpxsync0hcsy46lwx7gbwg"; depends=[BiocParallel doParallel dplyr foreach ggplot2 limma MASS openxlsx RCurl stringr tidyr]; }; + TREG = derive2 { name="TREG"; version="1.2.0"; sha256="1skk9hqc5kyhj2jfy0lwywc3lwf6d15mfz05j57bx9z27gjkbkj4"; depends=[Matrix purrr rafalib SummarizedExperiment]; }; + TRESS = derive2 { name="TRESS"; version="1.4.0"; sha256="0ybyjkcj4xpha5c0afyx7ps13kdl45v9mbgpb75j15f76dw64162"; depends=[AnnotationDbi GenomicFeatures GenomicRanges IRanges Matrix matrixStats Rsamtools rtracklayer S4Vectors]; }; + TRONCO = derive2 { name="TRONCO"; version="2.30.0"; sha256="0xr3vbs239zs5fgdkka4a51vf3q35w7h811qlix9kg549vabi5ir"; depends=[bnlearn circlize doParallel foreach gridExtra gtable gtools igraph iterators R_matlab RColorBrewer Rgraphviz scales xtable]; }; + TSCAN = derive2 { name="TSCAN"; version="1.36.0"; sha256="0aqn1rxzbil9m9mpcdfc0k75s5k6ljy0k4bjrn0zq3492zz4x1qi"; depends=[combinat DelayedArray fastICA ggplot2 gplots igraph Matrix mclust mgcv plyr S4Vectors shiny SingleCellExperiment SummarizedExperiment TrajectoryUtils]; }; + TTMap = derive2 { name="TTMap"; version="1.20.0"; sha256="1vfj2zq4k4fzjnq48pckxkl3bwxwghhfwq8cz14hhwf10f735pq7"; depends=[Biobase colorRamps rgl SummarizedExperiment]; }; + TVTB = derive2 { name="TVTB"; version="1.24.0"; sha256="16lhbbisgxmvp86qfkp0cdd8akjld0ryklw41hi3k4ndimzax6hf"; depends=[AnnotationFilter BiocGenerics BiocParallel Biostrings ensembldb ensemblVEP GenomeInfoDb GenomicRanges GGally ggplot2 Gviz IRanges limma reshape2 Rsamtools S4Vectors SummarizedExperiment VariantAnnotation]; }; + TarSeqQC = derive2 { name="TarSeqQC"; version="1.27.0"; sha256="0iiv7c3jd1iw7i5nn65370zbvi11s9qn72zig9rw1gz8nvnmdgpq"; depends=[BiocGenerics BiocParallel Biostrings cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 Hmisc IRanges openxlsx plyr reshape2 Rsamtools S4Vectors]; }; + TargetDecoy = derive2 { name="TargetDecoy"; version="1.4.0"; sha256="1xx9y5faf5ic14h7cnxpb83nr34mqzz0c846g1z28f3x9d0kg9kz"; depends=[ggplot2 ggpubr miniUI mzID mzR shiny]; }; + TargetScore = derive2 { name="TargetScore"; version="1.36.0"; sha256="00z2zv5yhxriagvcz3bwkpr9ii0r9lw4vcf7kjp7x5pjzcc6q6wq"; depends=[Matrix pracma]; }; + TargetSearch = derive2 { name="TargetSearch"; version="2.0.0"; sha256="1m5v2d67w0hi3x1b6nlsq97z197djnr23d6lj9krib1im70cclwy"; depends=[assertthat ncdf4]; }; + TileDBArray = derive2 { name="TileDBArray"; version="1.8.0"; sha256="0xmf28h7bsbdr6kds7a99y1y2j52wppxsd1zrhbsipssdhxyir15"; depends=[DelayedArray Rcpp S4Vectors tiledb]; }; + TimiRGeN = derive2 { name="TimiRGeN"; version="1.8.0"; sha256="1jy700y81jjh03y7j66c2m150wl5l31mfd4xpm5jffq4361pwnjj"; depends=[biomaRt clusterProfiler dplyr FreqProf ggdendro gghighlight ggplot2 gplots gtools igraph Mfuzz MultiAssayExperiment RCy3 readxl reshape2 rWikiPathways scales stringr tidyr]; }; + TissueEnrich = derive2 { name="TissueEnrich"; version="1.18.0"; sha256="0mkxkmc7pmyqs7nayhhxqpi3a7vwydadzzb6gizliv0w9ic3fznv"; depends=[dplyr ensurer ggplot2 GSEABase SummarizedExperiment tidyr]; }; + TitanCNA = derive2 { name="TitanCNA"; version="1.36.0"; sha256="135l414wk4mh3hbb17djh8pw5lvhl9yf28azc6g95djrahyhgi2g"; depends=[BiocGenerics data_table dplyr foreach GenomeInfoDb GenomicRanges IRanges VariantAnnotation]; }; + TnT = derive2 { name="TnT"; version="1.20.0"; sha256="0mn6n5cbpivf1d8n5ili4fnc663xkn90g3jbhdzk1pgi8lkk40fl"; depends=[Biobase data_table GenomeInfoDb GenomicRanges htmlwidgets IRanges jsonlite knitr S4Vectors]; }; + ToxicoGx = derive2 { name="ToxicoGx"; version="2.2.0"; sha256="0bi7hf05a2nyd1yqz7sl961s7b5v4lx1p68xiyk91qnxm3ipcxn0"; depends=[assertthat Biobase BiocGenerics BiocParallel caTools CoreGx data_table downloader dplyr ggplot2 jsonlite limma magrittr reshape2 S4Vectors scales SummarizedExperiment tibble tidyr]; }; + TraRe = derive2 { name="TraRe"; version="1.5.0"; sha256="06w5rk2wjam5dhiya9n6kjbjahw4i46cb05zvakcy0f8gwrvb9ic"; depends=[BiocParallel dqrng ggplot2 glmnet gplots gtools hash igraph matrixStats pvclust R_utils SummarizedExperiment]; }; + TrajectoryGeometry = derive2 { name="TrajectoryGeometry"; version="1.6.0"; sha256="02di1ijfv4rfjc1qn6zkg3bkxdc1y96dkbzhl8b4qzj23wzjy9x9"; depends=[ggplot2 pracma rgl]; }; + TrajectoryUtils = derive2 { name="TrajectoryUtils"; version="1.6.0"; sha256="130w4vpsmrkg458n3wbhvlchg171gjqybvs2w14bxa608f3fzw03"; depends=[igraph Matrix S4Vectors SingleCellExperiment SummarizedExperiment]; }; + TransView = derive2 { name="TransView"; version="1.42.0"; sha256="0447jwij6bamx91gm92mjf5xc3pb4jlzsqnyragwr8wy9a3k5w2d"; depends=[BiocGenerics GenomicRanges gplots IRanges Rhtslib S4Vectors zlibbioc]; }; + Travel = derive2 { name="Travel"; version="1.6.0"; sha256="074v9hl4gzy8081mlas3mjaplchjrmk2bl4f5nkdjclh46xf3wgg"; depends=[Rcpp]; }; + TreeAndLeaf = derive2 { name="TreeAndLeaf"; version="1.10.0"; sha256="0ykcngj7mf1hs6i801ivzncsd99qhmcwm9s3yr8j3qsy2d1nzki6"; depends=[ape igraph RedeR]; }; + TreeSummarizedExperiment = derive2 { name="TreeSummarizedExperiment"; version="2.6.0"; sha256="136zgpn1l059i64gj6iappr6nz42z4wbxlg3zpc5npwkqrz3val2"; depends=[ape BiocGenerics BiocParallel Biostrings dplyr IRanges rlang S4Vectors SingleCellExperiment SummarizedExperiment treeio]; }; + Trendy = derive2 { name="Trendy"; version="1.20.0"; sha256="0wn0alaqrcakz1rycyvr6ya7cvx28an9haa1azcfcr17ajlhdy2b"; depends=[BiocParallel DT gplots magrittr S4Vectors segmented shiny shinyFiles SummarizedExperiment]; }; + TurboNorm = derive2 { name="TurboNorm"; version="1.46.0"; sha256="1dr1nvajgk5y695y2zjzaz57qxcb24zbcv82k953hha6hzmbknyq"; depends=[affy convert lattice limma marray]; }; + TypeInfo = derive2 { name="TypeInfo"; version="1.64.0"; sha256="0f5jm3pgrq3qawd42295n5x6qm5j2kl4xgj2l7jxwy6pd1hlnwmw"; depends=[]; }; + UCell = derive2 { name="UCell"; version="2.2.0"; sha256="1g7lgpcl9p0369q9mlvpax44fk3522y6ks2k112sk057fwnjpjp3"; depends=[BiocNeighbors BiocParallel data_table Matrix SingleCellExperiment SummarizedExperiment]; }; + UMI4Cats = derive2 { name="UMI4Cats"; version="1.8.0"; sha256="19ixkpr20n5gzml3yj4vrxzbvfzwc9n14a5w9zi39hxy6f0fcyp8"; depends=[annotate BiocFileCache BiocGenerics Biostrings BSgenome cowplot DESeq2 dplyr fda GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges magick magrittr org_Hs_eg_db R_utils rappdirs Rbowtie2 RColorBrewer regioneR reshape2 rlang Rsamtools S4Vectors scales ShortRead stringr SummarizedExperiment TxDb_Hsapiens_UCSC_hg19_knownGene zoo]; }; + UNDO = derive2 { name="UNDO"; version="1.40.0"; sha256="0yjxa0dv4j369m4hrvx163x0c9f8y68fnsq3zab9k8idfxbim500"; depends=[Biobase BiocGenerics boot MASS nnls]; }; + Ularcirc = derive2 { name="Ularcirc"; version="1.16.0"; sha256="1z10y0ix10fb4v3yf11vgh9zwbqnczrb7s0jsdn8jpkjq5nijrdy"; depends=[AnnotationDbi AnnotationHub BiocGenerics Biostrings BSgenome data_table DT GenomeInfoDb GenomeInfoDbData GenomicAlignments GenomicFeatures GenomicRanges ggplot2 ggrepel gsubfn mirbase_db moments Organism_dplyr plotgardener R_utils S4Vectors shiny shinydashboard shinyFiles shinyjs yaml]; }; + UniProt_ws = derive2 { name="UniProt.ws"; version="2.38.0"; sha256="0qhww6sjjdrxbjn2gx886dnk4qr8d20a8gnvcqfg4i5i232icz1f"; depends=[AnnotationDbi BiocBaseUtils BiocFileCache BiocGenerics httpcache httr jsonlite progress rjsoncons RSQLite]; }; + Uniquorn = derive2 { name="Uniquorn"; version="2.18.0"; sha256="1b9cfyxszdxc7ja6g3nyn7dg4zk45mhn6l9jglhwcl6v1xnc8jay"; depends=[data_table doParallel foreach GenomicRanges IRanges R_utils stringr VariantAnnotation WriteXLS]; }; + VAExprs = derive2 { name="VAExprs"; version="1.4.0"; sha256="10scvyn6m0aaygg0xy7j5978kfi3rm1yjdmas7b3l1cx58356s9k"; depends=[CatEncoders DeepPINCS DiagrammeR keras mclust purrr scater SingleCellExperiment SummarizedExperiment tensorflow]; }; + VCFArray = derive2 { name="VCFArray"; version="1.14.0"; sha256="1zcd7lx9vypym4svpg47lgnmrczgrswzpr5dwcfm6h7c3jwnbnhs"; depends=[BiocGenerics DelayedArray GenomicFiles GenomicRanges Rsamtools S4Vectors VariantAnnotation]; }; + VDJdive = derive2 { name="VDJdive"; version="1.0.0"; sha256="0qc95d6b3gy4rh90xp1iib88yjhr9v3jgja805an3rqr3c6r7a0m"; depends=[basilisk BiocParallel cowplot ggplot2 gridExtra IRanges Matrix RColorBrewer reticulate S4Vectors SingleCellExperiment SummarizedExperiment]; }; + VERSO = derive2 { name="VERSO"; version="1.8.0"; sha256="1535si34m13w7z2k6ys2xvj73kdwik618iy8swvb44z73vg2xkp8"; depends=[ape Rfast]; }; + VaSP = derive2 { name="VaSP"; version="1.10.0"; sha256="1zvva74lwhng0j4k1kya6q07xgrav2f9pzxsdzgm1rrmnqcihdyb"; depends=[ballgown cluster GenomeInfoDb GenomicAlignments GenomicRanges IRanges matrixStats Rsamtools S4Vectors]; }; + VanillaICE = derive2 { name="VanillaICE"; version="1.60.0"; sha256="148xbymfn3za74z5ml4csj6q875r7hk3iafgcifc797gnw203sl8"; depends=[Biobase BiocGenerics BSgenome_Hsapiens_UCSC_hg18 crlmm data_table foreach GenomeInfoDb GenomicRanges IRanges lattice MatrixGenerics matrixStats oligoClasses S4Vectors SummarizedExperiment]; }; + VarCon = derive2 { name="VarCon"; version="1.6.0"; sha256="0y0arfjx5v6b4fc26xyv8ycvy5a2k77dkxgn7if7svjwkk39sgwk"; depends=[Biostrings BSgenome GenomicRanges ggplot2 IRanges shiny shinycssloaders shinyFiles]; }; + VariantAnnotation = derive2 { name="VariantAnnotation"; version="1.44.0"; sha256="08rm27jcx6amawqdh59291r0qzkr5cdhbhm0xbjbd5mvdpp1icl8"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges MatrixGenerics Rhtslib Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; }; + VariantExperiment = derive2 { name="VariantExperiment"; version="1.12.0"; sha256="129a0ya2jq600r0dfx3n70kqchh9a8d23xvc1ym2zlm407hi0bnj"; depends=[Biostrings DelayedArray DelayedDataFrame GDSArray gdsfmt GenomicRanges IRanges S4Vectors SeqArray SeqVarTools SNPRelate SummarizedExperiment]; }; + VariantFiltering = derive2 { name="VariantFiltering"; version="1.34.0"; sha256="110db9gcla796mbll3pin0hv2qp8r6khx0zzqfgzkp4mcyjxi62y"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicFeatures GenomicRanges GenomicScores graph Gviz IRanges RBGL Rsamtools S4Vectors shiny shinyjs shinythemes shinyTree SummarizedExperiment VariantAnnotation XVector]; }; + VariantTools = derive2 { name="VariantTools"; version="1.40.0"; sha256="181igcmlyx3ddmhml9wqcgw6ffdrqpmg4imd6ipf68c90agdgaz0"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; + VegaMC = derive2 { name="VegaMC"; version="3.36.0"; sha256="07lpzzkwx9g2gcyqg33xxshwylmyzgbf2p63ck3kkyqv64ylkhw0"; depends=[Biobase biomaRt]; }; + VennDetail = derive2 { name="VennDetail"; version="1.14.0"; sha256="0976zqbp3xgxlq0b28r0z7shhmn7nrphhxqv8j3wdk3xxbgy4mzg"; depends=[dplyr futile_logger ggplot2 magrittr purrr tibble UpSetR VennDiagram]; }; + ViSEAGO = derive2 { name="ViSEAGO"; version="1.12.0"; sha256="0y177yjw9bnsnfqnylwv8zhk7fyspx9qv94yw7jmfhxsh7azpafk"; depends=[AnnotationDbi AnnotationForge biomaRt data_table dendextend DiagrammeR DT dynamicTreeCut fgsea ggplot2 GO_db GOSemSim heatmaply htmlwidgets igraph plotly processx R_utils RColorBrewer scales topGO UpSetR]; }; + Voyager = derive2 { name="Voyager"; version="1.0.6"; sha256="09kq47b7n1sqpsiypp2iiq9agq2b9n8w160245pq4pqlp5xix5dy"; depends=[BiocParallel bluster ggnewscale ggplot2 Matrix patchwork rlang S4Vectors scales scico sf SingleCellExperiment SpatialExperiment SpatialFeatureExperiment spdep SummarizedExperiment]; }; + VplotR = derive2 { name="VplotR"; version="1.8.0"; sha256="0v9qbz9vg3cd7jjb0bhl2qp8dbwi4f98l4wmppzkz3il624w8ny5"; depends=[cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges magrittr RColorBrewer reshape2 Rsamtools S4Vectors zoo]; }; + Wrench = derive2 { name="Wrench"; version="1.16.0"; sha256="0n7mvj9jdp8w5w64i49kkqzbrvpv2vzx6y6fb7g2sqp24wqrn39x"; depends=[limma locfit matrixStats]; }; + XDE = derive2 { name="XDE"; version="2.44.0"; sha256="1djsr92zyh4739ra8v36nylxr3z7rx9lll25mm06vc3l77jxlfzp"; depends=[Biobase BiocGenerics genefilter GeneMeta gtools mvtnorm RColorBrewer siggenes]; }; + XINA = derive2 { name="XINA"; version="1.16.0"; sha256="1c97lsb5shixh4n4mi9kh4gz4qnia9vq736rnzxbs03n5bvlmwlq"; depends=[alluvial ggplot2 gridExtra igraph mclust plyr STRINGdb]; }; + XNAString = derive2 { name="XNAString"; version="1.6.0"; sha256="05bs972b132mccf7k0v6rmacbck0ydi5x06fgzs05m48ykkbx988"; depends=[Biostrings BSgenome data_table formattable future_apply GenomicRanges IRanges Rcpp S4Vectors stringi stringr]; }; + XVector = derive2 { name="XVector"; version="0.38.0"; sha256="0ygdyh3s4qsaay930a5lbnmgh6a4gqp5ck9ww466yk0jyk1hxfp9"; depends=[BiocGenerics IRanges S4Vectors zlibbioc]; }; + Xeva = derive2 { name="Xeva"; version="1.14.0"; sha256="1qy3hj0dijb859q7a2ygb6il4mn2m3f9chy8lkj6lkq64xlayjxg"; depends=[BBmisc Biobase ComplexHeatmap doParallel downloader ggplot2 nlme PharmacoGx Rmisc scales]; }; + YAPSA = derive2 { name="YAPSA"; version="1.24.0"; sha256="17yxzqvyaa423k0rskahlgqxcsi70flgsxniry3f4m8yvmghxxkz"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 circlize ComplexHeatmap corrplot dendextend doParallel dplyr GenomeInfoDb GenomicRanges GetoptLong ggbeeswarm ggplot2 gridExtra gtrellis KEGGREST limSolve magrittr PMCMRplus pracma reshape2 SomaticSignatures VariantAnnotation]; }; + a4 = derive2 { name="a4"; version="1.46.0"; sha256="1sis4hwrxyn2x96yysz82gffl2kkj68ry945y15zwikwk80s31hb"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; }; + a4Base = derive2 { name="a4Base"; version="1.46.0"; sha256="14diri7gswd6h5p3bdhh20fy7i54d270mq985qcdvdyhx4kpw6g6"; depends=[a4Core a4Preproc annaffy Biobase genefilter glmnet gplots limma mpm multtest]; }; + a4Classif = derive2 { name="a4Classif"; version="1.46.0"; sha256="0lirj0qzzrm996g8yh30x61cg1qkh436qd8xzgv3y3y3n5jj5d3w"; depends=[a4Core a4Preproc Biobase glmnet pamr ROCR varSelRF]; }; + a4Core = derive2 { name="a4Core"; version="1.46.0"; sha256="0plgfzsvg220v6k6p0g7izsfw2lj78331lqyvz0p9vd91ynwp41k"; depends=[Biobase glmnet]; }; + a4Preproc = derive2 { name="a4Preproc"; version="1.46.0"; sha256="00xs1vayl8v6in79iv7lwbn52yyyq4lv6k3k727g7il8x17mi8i0"; depends=[Biobase BiocGenerics]; }; + a4Reporting = derive2 { name="a4Reporting"; version="1.46.0"; sha256="09q8ng5kp47bqpj7m2y2112fkjxcnhzxk9v80hqksm8h1df46riv"; depends=[xtable]; }; + aCGH = derive2 { name="aCGH"; version="1.76.0"; sha256="05q303bf8acvhbdzqxqk2gf12vg0fdqknlxryn2cs8nijx40zp46"; depends=[Biobase cluster multtest survival]; }; + abseqR = derive2 { name="abseqR"; version="1.16.0"; sha256="1z5an4vsm55a0qr46qmp8562vc3xdam5f3840r8hcdnn5dvzw414"; depends=[BiocParallel BiocStyle circlize flexdashboard ggcorrplot ggdendro ggplot2 gridExtra knitr plotly plyr png RColorBrewer reshape2 rmarkdown stringr vegan VennDiagram]; }; + acde = derive2 { name="acde"; version="1.28.0"; sha256="1d47hbna68qm517afk1wb0w9gb8j52p7nqh5axcc6h76zppsc1sp"; depends=[boot]; }; + adSplit = derive2 { name="adSplit"; version="1.68.0"; sha256="0a05j1g42wnw5lcn6g6vp2z3mnjz185b2hvdg362ln270r19gch6"; depends=[AnnotationDbi Biobase cluster GO_db KEGGREST multtest]; }; + adductomicsR = derive2 { name="adductomicsR"; version="1.14.0"; sha256="0h180k4r1lrij1smpibbqgiki1hb2q87n5ay6habig4bxzbx773x"; depends=[adductData ade4 AnnotationHub bootstrap data_table doSNOW dplyr DT ExperimentHub fastcluster foreach fpc mzR OrgMassSpecR pastecs pracma RcppEigen reshape2 rvest smoother zoo]; }; + affxparser = derive2 { name="affxparser"; version="1.70.0"; sha256="0p42rpyh96aph9jr8kiyjvv860jn7m7ji2nrib2vr2nl0jyaxqjs"; depends=[]; }; + affy = derive2 { name="affy"; version="1.76.0"; sha256="1iix9mq4aph6avs2qr64a7hip461cif56k6npvs5g69nj3rn50gj"; depends=[affyio Biobase BiocGenerics BiocManager preprocessCore zlibbioc]; }; + affyContam = derive2 { name="affyContam"; version="1.56.0"; sha256="0phf9rvxr45zq9m5rcjsiixmj9ilz518l628l8cd1hzfdk240ffy"; depends=[affy affydata Biobase]; }; + affyILM = derive2 { name="affyILM"; version="1.50.0"; sha256="0i2hjaqjz06ym5kbw5da1h3cahc630mjwljsji1l2ks0gjcipll0"; depends=[affxparser affy Biobase gcrma]; }; + affyPLM = derive2 { name="affyPLM"; version="1.74.0"; sha256="1dvkjj0fm3wlkvm8w7cmhdhchpm3sai305gpihrnhxdvr57lv27a"; depends=[affy Biobase BiocGenerics gcrma preprocessCore zlibbioc]; }; + affycomp = derive2 { name="affycomp"; version="1.74.0"; sha256="18bxnjcl7cbgwm3yf58608ghwnpci94xgil11zmbpgzgrpv9pkrs"; depends=[Biobase]; }; + affycoretools = derive2 { name="affycoretools"; version="1.70.0"; sha256="17slls8dihjnpm6bynic8cm2fbnfl5iqwimz0wz7c9x44d1bxi4l"; depends=[affy AnnotationDbi Biobase BiocGenerics DBI edgeR gcrma ggplot2 Glimma GOstats gplots hwriter lattice limma oligoClasses ReportingTools RSQLite S4Vectors xtable]; }; + affyio = derive2 { name="affyio"; version="1.68.0"; sha256="1bdcz9sz4khs7p4ddryc4ir0fwcjrkwqka8y0c9n36ykiv4myfib"; depends=[zlibbioc]; }; + affylmGUI = derive2 { name="affylmGUI"; version="1.72.0"; sha256="0jds73pxqf522wcg8qd4b4k1qbhn51av5md1nhgcdnb6is0lzvxi"; depends=[affy affyio affyPLM AnnotationDbi BiocGenerics BiocManager gcrma limma R2HTML tkrplot xtable]; }; + aggregateBioVar = derive2 { name="aggregateBioVar"; version="1.8.0"; sha256="1snsc2430cc7cd0k01n1rwa6vympd79g1mcch0paxxkq7msvfn42"; depends=[Matrix rlang S4Vectors SingleCellExperiment SummarizedExperiment tibble]; }; + agilp = derive2 { name="agilp"; version="3.30.0"; sha256="15cw004g1vxfwvf939018vmlv9gym4r473jissamkygqdv78hcr0"; depends=[]; }; + airpart = derive2 { name="airpart"; version="1.6.0"; sha256="07zxv0sjhlajaw4gxpjni14qyyqn70ar8ph5cpibzcky1lx6pmkl"; depends=[apeglm clue ComplexHeatmap dplyr dynamicTreeCut emdbook forestplot ggplot2 lpSolve matrixStats mclust pbapply plyr RColorBrewer rlang S4Vectors scater SingleCellExperiment smurf SummarizedExperiment]; }; + alevinQC = derive2 { name="alevinQC"; version="1.14.0"; sha256="0rd64j4hkdk2d6mlld6qkv2m96lqc93807xjdf05xm8qkyx8g8y2"; depends=[cowplot dplyr DT GGally ggplot2 Rcpp rjson rlang rmarkdown shiny shinydashboard tximport]; }; + alpine = derive2 { name="alpine"; version="1.24.0"; sha256="0rjnwljh4c2f7ml0m14pllns4pvyjwwf23qsn6zjygm5x04bapf0"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph IRanges RBGL Rsamtools S4Vectors speedglm stringr SummarizedExperiment]; }; + altcdfenvs = derive2 { name="altcdfenvs"; version="2.60.0"; sha256="0fm4l93j6nm1w1w57zzryc1hkzapp8l16pkwjzdzllvwvsnsg8r0"; depends=[affy Biobase BiocGenerics Biostrings hypergraph makecdfenv S4Vectors]; }; + amplican = derive2 { name="amplican"; version="1.20.0"; sha256="1c990i6gxbarcpbdpkz017x94spwzap95l95synlizbkyif4z8ij"; 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.14.0"; sha256="1alpsamrglgvzhcibkaf7m3gyiv61wbj1gvsq4lw6vjka100j9qr"; 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.70.0"; sha256="0qxihlhx7ijspvgzdp8zxzrc44y9pwkygvsllh4v47p85ham49fg"; depends=[AnnotationDbi Biobase BiocManager DBI GO_db]; }; + annmap = derive2 { name="annmap"; version="1.40.0"; sha256="18ia189qgsbcivpfsfss05dnd3kdc6gmswq8i1whwf9n227b2cv3"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; }; + annotate = derive2 { name="annotate"; version="1.76.0"; sha256="06jmnv36y3n6pl1vs6mp14sgyzl4l37g13diaa49k7qwp1kdpl3a"; depends=[AnnotationDbi Biobase BiocGenerics DBI httr XML xtable]; }; + annotationTools = derive2 { name="annotationTools"; version="1.72.0"; sha256="1z5vgblhi1kj2n9d4kbqgvwnm48372q0szgjshch8g39dypijvhd"; depends=[Biobase]; }; + annotatr = derive2 { name="annotatr"; version="1.24.0"; sha256="08f3xikgb0z1j7n8i04yn1dlfj8rxc76nmf5b7i5ljcp0jqiv07n"; depends=[AnnotationDbi AnnotationHub dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges readr regioneR reshape2 rtracklayer S4Vectors]; }; + anota = derive2 { name="anota"; version="1.46.0"; sha256="1a9xgcp48zjql6an3kiv8li4saw10k1dl7qzyyw84xvx856ilv97"; depends=[multtest qvalue]; }; + anota2seq = derive2 { name="anota2seq"; version="1.20.0"; sha256="14ggggfa6mdqcb2hfvann9mb66s7a9nxlnh31zblb3mrrjizg1x3"; depends=[DESeq2 edgeR limma multtest qvalue RColorBrewer SummarizedExperiment]; }; + antiProfiles = derive2 { name="antiProfiles"; version="1.38.0"; sha256="0f32373ncfjbvy05yngmfhhdgyc99a4idz3ry2xlabdmrbs5yac3"; depends=[locfit matrixStats]; }; + apComplex = derive2 { name="apComplex"; version="2.64.0"; sha256="0ycchrdhx7zh62f0p0gxm7g58m2w3c2lfkaasrwydspd3jx0rsna"; depends=[graph org_Sc_sgd_db RBGL Rgraphviz]; }; + apeglm = derive2 { name="apeglm"; version="1.20.0"; sha256="1hk2y7r734wdd56f18l03kyq9p35kv653a5f7z2cjkq37gvcqrd1"; depends=[emdbook GenomicRanges Rcpp RcppEigen RcppNumerical SummarizedExperiment]; }; + appreci8R = derive2 { name="appreci8R"; version="1.16.0"; sha256="1ssldnz4k21i4zpa6r9ja9wvzdlgbrr53pmivwjj7kbvy02906p7"; 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.28.0"; sha256="01g9vfkmpfkn9nv71jyybq93lid6x93jbadjahngy98w67n3sin4"; depends=[matrixStats R_methodsS3 R_oo R_utils]; }; + arrayMvout = derive2 { name="arrayMvout"; version="1.56.0"; sha256="0g66s64n4qlvhkanp33bbvpi93rsdx5xq0mjr96d0195qbf6k156"; depends=[affy affyContam Biobase lumi mdqc parody]; }; + arrayQuality = derive2 { name="arrayQuality"; version="1.76.0"; sha256="0b5q71bpl9ln26622jvchd4f9i4kwayqkm9b75yj0a69imbfcn4s"; depends=[gridBase hexbin limma marray RColorBrewer]; }; + arrayQualityMetrics = derive2 { name="arrayQualityMetrics"; version="3.54.0"; sha256="0jz9b3f8x1aal4sskq1a09jpavhm8alggwbj3ka42fb89xymrz33"; depends=[affy affyPLM beadarray Biobase genefilter gridSVG Hmisc hwriter lattice latticeExtra limma RColorBrewer setRNG svglite vsn XML]; }; + artMS = derive2 { name="artMS"; version="1.16.0"; sha256="17pb8ba2p8kk72b1p9x46h7xw3z2js5612388d4lsm4gl2flczyd"; 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.14.0"; sha256="12za1agpbjjg4i94mikbkdbwqnkzzwz07v0gwdc7lpa9899q2ycb"; depends=[BiocFileCache BiocParallel BSgenome data_table ggplot2 lifecycle motifStack rappdirs Rcpp testthat]; }; + atena = derive2 { name="atena"; version="1.4.0"; sha256="1a3qv66caz2pg67ff9c5424pygsgqnfx67ybzc3zkzaw4fj8cp54"; depends=[AnnotationHub BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges Matrix matrixStats Rsamtools S4Vectors scales sparseMatrixStats SQUAREM SummarizedExperiment]; }; + attract = derive2 { name="attract"; version="1.50.0"; sha256="0r5vykjqq33gchqv0wp2i6wpnk95cv26w5j4yqxcnw0bnqfhrgkm"; depends=[AnnotationDbi Biobase cluster GOstats KEGGREST limma org_Hs_eg_db reactome_db]; }; + autonomics = derive2 { name="autonomics"; version="1.6.0"; sha256="1nbfp2p33ana2dpadf5m7s1xl1z0ccxhxkrmd5ya5n44rvk1drrq"; 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.6.0"; sha256="0dvzkqpjv7whns9q8zj6n2nyvnaw2ib7i53vf049n94x52vh9x15"; depends=[SummarizedExperiment]; }; + bacon = derive2 { name="bacon"; version="1.26.0"; sha256="1v5kvvbc5fwvs84d2aq6gq6f6z0l68n7626gcnc8mh3sc27lxz53"; depends=[BiocParallel ellipse ggplot2]; }; + ballgown = derive2 { name="ballgown"; version="2.30.0"; sha256="0iy24vj4lg1k4fzdxf9blc47xsp4dmplajgabsb2s925l7jpxfvw"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; }; + bambu = derive2 { name="bambu"; version="3.0.4"; sha256="174ww8fz8hzybc005w6jbxx4dzgn3samwwfmgl6ais4vyvp9hkf1"; 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.30.0"; sha256="059pkm5pg9ssd0l8xrm13d0hscqnmlqcb4qb5p4fbzgx6088zg05"; depends=[BiocGenerics GenomicRanges IRanges Rcpp Rhtslib zlibbioc]; }; + bandle = derive2 { name="bandle"; version="1.2.0"; sha256="0xam7d7d43k5n4k855if0j21z4vk5igm0vldg31jh4pm3h4j7i1n"; depends=[BH Biobase BiocParallel BiocStyle circlize dplyr ggalluvial ggplot2 ggrepel knitr lbfgs MSnbase plyr pRoloc pRolocdata Rcpp RcppArmadillo rlang robustbase S4Vectors tidyr]; }; + banocc = derive2 { name="banocc"; version="1.22.0"; sha256="0d7ss3df6zcfsh8kgy35ghxa6f27ynjhdbi6mdypgk9q24f64r78"; depends=[coda mvtnorm rstan stringr]; }; + barcodetrackR = derive2 { name="barcodetrackR"; version="1.6.0"; sha256="1b3z83nkl8csxs88rcbmkkfjps71mwnylvpy3kjzyi02xw0kh0c1"; depends=[circlize cowplot dplyr ggdendro ggplot2 ggridges magrittr plyr proxy RColorBrewer rlang S4Vectors scales shiny SummarizedExperiment tibble tidyr vegan viridis]; }; + basecallQC = derive2 { name="basecallQC"; version="1.22.0"; sha256="0zaqgijazcii983agdhav2kn64kpdlmnmw54ipdgcbza6ky26hvh"; depends=[data_table dplyr DT ggplot2 knitr lazyeval magrittr prettydoc raster rmarkdown ShortRead stringr tidyr XML yaml]; }; + basilisk = derive2 { name="basilisk"; version="1.10.2"; sha256="14sgm3ia7jj5jckysqkljrffafg6rl8i7fgzsxv8ycnrwbd05d09"; depends=[basilisk_utils dir_expiry reticulate]; }; + basilisk_utils = derive2 { name="basilisk.utils"; version="1.10.0"; sha256="0gh29w8arg0glawprwshaixv07y756c4lx21h8jjbqlsrbspp8fw"; depends=[dir_expiry]; }; + batchelor = derive2 { name="batchelor"; version="1.14.0"; sha256="1cdpq8zfn718qmsqjp79siddh3kzag4a90p276v261xbjvrxavjv"; depends=[beachmat BiocGenerics BiocNeighbors BiocParallel BiocSingular DelayedArray DelayedMatrixStats igraph Matrix Rcpp ResidualMatrix S4Vectors ScaledMatrix scuttle SingleCellExperiment SummarizedExperiment]; }; + bayNorm = derive2 { name="bayNorm"; version="1.16.0"; sha256="02kkp7c7d57pj51vs7sxi7gpjip7dspd72m4hpvjs5s7bjfxi0f3"; depends=[BB BiocParallel doSNOW fitdistrplus foreach iterators locfit MASS Matrix Rcpp RcppArmadillo RcppProgress SingleCellExperiment SummarizedExperiment]; }; + baySeq = derive2 { name="baySeq"; version="2.31.0"; sha256="0lq2wfm3ibrpha9mqhhp6dgsx4jm2kwxvvrj0b62dzqspvg743wh"; depends=[abind edgeR GenomicRanges]; }; + bcSeq = derive2 { name="bcSeq"; version="1.20.0"; sha256="1dynr37kqs0p0as3psa7bw3lxnqwy7aj58mxk8xjsfm8xf7v4733"; depends=[Biostrings Matrix Rcpp]; }; + beachmat = derive2 { name="beachmat"; version="2.14.0"; sha256="0sa1wh997jfiz2y0dr7v12b7pvlf7icgv6arlyqy57winbnqa96m"; depends=[BiocGenerics DelayedArray Matrix Rcpp]; }; + beadarray = derive2 { name="beadarray"; version="2.48.0"; sha256="0fr24gj6h2rr1r4l3n8myjaihjqi5yinwdsxqa5ih8m3v72dlrby"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 hexbin illuminaio IRanges limma reshape2]; }; + beadarraySNP = derive2 { name="beadarraySNP"; version="1.64.0"; sha256="06hy89pclbyxjw5yf5i9bc3wr789b9pmhd9sdchgljlijs9vcj6g"; depends=[Biobase quantsmooth]; }; + beer = derive2 { name="beer"; version="1.2.0"; sha256="0njilbdgrv59ny4vks4xamf00qp3xagkks0sszwqq49lpzdicglj"; depends=[BiocParallel cli edgeR PhIPData progressr rjags SummarizedExperiment]; }; + benchdamic = derive2 { name="benchdamic"; version="1.4.0"; sha256="1f4rnbxxjbd3jyvl6m94hyl15bzxs1zbwyxqkypfmxa7gmj2vcrq"; depends=[ALDEx2 ANCOMBC BiocParallel corncob cowplot dearseq DESeq2 edgeR ggdendro ggplot2 ggridges limma MAST metagenomeSeq MGLM NOISeq phyloseq plyr RColorBrewer reshape2 Seurat SummarizedExperiment tidytext TreeSummarizedExperiment zinbwave]; }; + bgx = derive2 { name="bgx"; version="1.64.0"; sha256="1ylg9bnq8iwax0ap4c19v4mkbq673s8dfv49d94znsryg3fp93dl"; depends=[affy Biobase gcrma Rcpp]; }; + bigPint = derive2 { name="bigPint"; version="1.14.0"; sha256="1smf3w5a60jc0bpip5131ad9ykmnrcd33qi3pc3m50g6kn023wz2"; depends=[DelayedArray dplyr GGally ggplot2 gridExtra hexbin Hmisc htmlwidgets plotly plyr RColorBrewer reshape shiny shinycssloaders shinydashboard stringr SummarizedExperiment tidyr]; }; + bigmelon = derive2 { name="bigmelon"; version="1.24.0"; sha256="094d43yv8af8sijp43ndcaincnsf3ng32vgwh6bfazlq5d601r6y"; depends=[Biobase BiocGenerics gdsfmt GEOquery illuminaio methylumi minfi wateRmelon]; }; + bioCancer = derive2 { name="bioCancer"; version="1.26.0"; sha256="17bwd313dnlmb2h78b4ymlih024v9bkmadcaqjdkhai45wbqzwgy"; depends=[AlgDesign AnnotationDbi Biobase clusterProfiler DiagrammeR DOSE dplyr DT geNetClassifier GO_db htmlwidgets httr org_Bt_eg_db org_Hs_eg_db plyr r_import R_methodsS3 R_oo radiant_data reactome_db ReactomePA shiny shinythemes tibble visNetwork XML]; }; + bioDist = derive2 { name="bioDist"; version="1.70.0"; sha256="1fnx3q5arsilrvnhndplap8h4ydi9bvmlpfllj1li124hn5n2w3d"; depends=[Biobase KernSmooth]; }; + bioassayR = derive2 { name="bioassayR"; version="1.36.0"; sha256="0r56r4qxibgblriyfbd46i8jhc2bfr9ndr8i30920v9kc3n83cav"; depends=[BiocGenerics ChemmineR DBI Matrix rjson RSQLite XML]; }; + biobroom = derive2 { name="biobroom"; version="1.30.0"; sha256="02gdc26bs0yx7hb53b8ncipsaw6ynfvjcx64qxkxxq1c4awjkhzy"; depends=[Biobase broom dplyr tidyr]; }; + biobtreeR = derive2 { name="biobtreeR"; version="1.10.0"; sha256="1j6w19k124x46gj2p8f1z0i2c03yhiiy1w0fqf504b2r7wy90jxc"; depends=[httpuv httr jsonlite stringi]; }; + biocGraph = derive2 { name="biocGraph"; version="1.60.0"; sha256="0ysdmv2hyl8jnmr42lkyvgfqb0z89f5p649ahx0ygs6fw0z226xa"; depends=[BiocGenerics geneplotter graph Rgraphviz]; }; + biocViews = derive2 { name="biocViews"; version="1.66.0"; sha256="1rgn0agw5m4y8838lxzq1r658h1pblaidmm444yfimjffa8znj23"; depends=[Biobase BiocManager graph RBGL RCurl RUnit XML]; }; + biocthis = derive2 { name="biocthis"; version="1.8.1"; sha256="0zmiaixknwxv72l4fygrn0qr3mvl7kqfbqgflnavs0wxx6xdjqgn"; depends=[BiocManager fs glue rlang styler usethis]; }; + biodb = derive2 { name="biodb"; version="1.6.1"; sha256="0mbqsias2ajw29d1wgl10y2cjqv3slrsgifccz0kh9l5r6bk28vz"; depends=[BiocFileCache chk jsonlite lgr lifecycle openssl plyr progress R6 rappdirs Rcpp RCurl RSQLite stringr testthat withr XML yaml]; }; + biodbChebi = derive2 { name="biodbChebi"; version="1.4.0"; sha256="02c0zvchkd9xf2gakd2ksa4mk8hd8bvg80paq2hx96xqdznhsh49"; depends=[biodb R6]; }; + biodbExpasy = derive2 { name="biodbExpasy"; version="1.2.0"; sha256="16g7xy6r8ggbvjxjl4frfsvsar8hcwgla7q4mmpr01gv9xjvn059"; depends=[biodb chk R6 stringr]; }; + biodbHmdb = derive2 { name="biodbHmdb"; version="1.4.0"; sha256="0zhwf313wilwmxxyibxx62bp9h6rp9jc7c9l46sbdgbcfkk3zdws"; depends=[biodb R6 Rcpp testthat]; }; + biodbKegg = derive2 { name="biodbKegg"; version="1.4.0"; sha256="1027jxyhz1spc9wk41xscnbhzimfji0xa6zfgld9gzpjms48gp49"; depends=[biodb chk lifecycle R6]; }; + biodbLipidmaps = derive2 { name="biodbLipidmaps"; version="1.4.1"; sha256="0n5c5h0jq8hkmf9hw1phz46qz66jagd5waaf8mi14qnll532xhwx"; depends=[biodb lifecycle R6]; }; + biodbMirbase = derive2 { name="biodbMirbase"; version="1.2.0"; sha256="1mx95sfga6x5cwd9x4ql7r14rm7s26d2vvdkwhhia1m8qwinzvl7"; depends=[biodb chk R6 stringr]; }; + biodbNcbi = derive2 { name="biodbNcbi"; version="1.2.0"; sha256="0bjw5q9ls7p5pi13rzmax4iqfi5l7b0inga9b96bz18mcq071pqp"; depends=[biodb chk R6 XML]; }; + biodbNci = derive2 { name="biodbNci"; version="1.2.0"; sha256="18kjpc71gis82hkg6h7jn0qqwc3m2dlc6ddmyr9cfmm1wvr3fdc6"; depends=[biodb chk R6 Rcpp testthat]; }; + biodbUniprot = derive2 { name="biodbUniprot"; version="1.4.0"; sha256="1xg4f72maczqm2srscnzj3fhibnsya49d9a00d5r6qg1avc3g33v"; depends=[biodb R6]; }; + biomaRt = derive2 { name="biomaRt"; version="2.54.0"; sha256="0c6agi652kbffqwd1r3c22ncisqaiy3gqbc9fz13767rr71im6lq"; depends=[AnnotationDbi BiocFileCache digest httr progress rappdirs stringr XML xml2]; }; + biomformat = derive2 { name="biomformat"; version="1.26.0"; sha256="0728fpj05bvna5lpm29pdbn4slfmq16nz35as086ddbl2hhc9ni1"; depends=[jsonlite Matrix plyr rhdf5]; }; + biomvRCNS = derive2 { name="biomvRCNS"; version="1.38.0"; sha256="0n026b744ah5kcnipsyiqqs7vlz5n5im1kgv35i2pgxyzvf7a8sn"; depends=[GenomicRanges Gviz IRanges mvtnorm]; }; + biosigner = derive2 { name="biosigner"; version="1.26.0"; sha256="11ncmxy4wqdg30w8a6dgcsywyzda49f9al435fz3pfj5rmlbbrlj"; depends=[Biobase e1071 MultiAssayExperiment MultiDataSet randomForest ropls SummarizedExperiment]; }; + biotmle = derive2 { name="biotmle"; version="1.22.0"; sha256="1sbwbz0xdws31lsh46mfcijqmi6rm050r1d6vwii65q686x5j43w"; depends=[assertthat BiocGenerics BiocParallel dplyr drtmle ggplot2 ggsci limma S4Vectors SummarizedExperiment superheat tibble]; }; + biovizBase = derive2 { name="biovizBase"; version="1.46.0"; sha256="0k56bq3g5vwnd0vkqg7x7v7i9bakwb8s1yl7k5nwj26k4aw96lw6"; depends=[AnnotationDbi AnnotationFilter BiocGenerics Biostrings dichromat ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Hmisc IRanges RColorBrewer rlang Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; }; + biscuiteer = derive2 { name="biscuiteer"; version="1.12.0"; sha256="1fq2nj0vclpxavqj5qx7jc3ympg00izxn9fpy4mlhyp9l921z13m"; depends=[Biobase BiocGenerics BiocParallel biscuiteerData bsseq data_table DelayedMatrixStats dmrseq GenomeInfoDb GenomicRanges gtools HDF5Array Homo_sapiens impute IRanges Matrix matrixStats Mus_musculus QDNAseq qualV R_utils readr Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; + blacksheepr = derive2 { name="blacksheepr"; version="1.12.0"; sha256="0a30w7n4rcsq4h7ggji8nbk1zx4h9ci7di01xnhks898f59w9ii0"; depends=[circlize ComplexHeatmap pasilla RColorBrewer SummarizedExperiment viridis]; }; + blima = derive2 { name="blima"; version="1.32.0"; sha256="1myq7giagr5bhkk96w9dijl01pcqkv288hakv7xbawv5wf5mcima"; depends=[beadarray Biobase BiocGenerics Rcpp]; }; + bluster = derive2 { name="bluster"; version="1.8.0"; sha256="1xi9vl09nm95l35kb9n3pn3j9qxw8976lss3cx0ppwnxd2mjr6vy"; depends=[BiocNeighbors BiocParallel cluster igraph Matrix Rcpp S4Vectors]; }; + bnbc = derive2 { name="bnbc"; version="1.20.0"; sha256="18wwic1d13ywn85p415pwg2bh32qiri0kzwsa9yk7m415l87i123"; depends=[BiocGenerics data_table EBImage GenomeInfoDb GenomicRanges IRanges matrixStats preprocessCore Rcpp rhdf5 S4Vectors SummarizedExperiment sva]; }; + bnem = derive2 { name="bnem"; version="1.6.0"; sha256="0v7xn2hj8q53vjhzjrc0vvqvw13waf3mkf4zs0nakiwrdhbr0117"; depends=[affy binom Biobase CellNOptR cluster epiNEM flexclust graph limma matrixStats mnem RColorBrewer Rgraphviz rmarkdown snowfall sva vsn]; }; + borealis = derive2 { name="borealis"; version="1.2.0"; sha256="0ld4q8i8v0q1cjn5kpjxs8f69jrzjrkdp9smdmzqsa9qngl75syx"; depends=[Biobase bsseq cowplot doParallel dplyr DSS foreach gamlss gamlss_dist GenomicRanges ggplot2 plyr purrr R_utils rlang snow]; }; + brainflowprobes = derive2 { name="brainflowprobes"; version="1.12.0"; sha256="17fdig1ja8mqx6jhpplqmyq8314gk2fid8dd2bfbwj61421gqp4d"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 bumphunter cowplot derfinder derfinderPlot GenomicRanges GenomicState ggplot2 RColorBrewer]; }; + branchpointer = derive2 { name="branchpointer"; version="1.24.0"; sha256="1900czfg3a9x8fqqqs3x7saph7k4ky6wk0f41d8fjdj88fyxkgsk"; depends=[biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg38 caret cowplot data_table gbm GenomeInfoDb GenomicRanges ggplot2 IRanges kernlab plyr rtracklayer S4Vectors stringr]; }; + breakpointR = derive2 { name="breakpointR"; version="1.16.0"; sha256="0j1f43lhgkapjyxlil9fflqh9nf3andhmvirdcv45y60wvljn4gx"; depends=[BiocGenerics breakpointRdata cowplot doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gtools IRanges Rsamtools S4Vectors]; }; + brendaDb = derive2 { name="brendaDb"; version="1.11.0"; sha256="1xardg6ysz9jijsd9rwbcr7dgks61kdlknpvx10r675hsvy4laz6"; depends=[BiocFileCache BiocParallel crayon curl dplyr magrittr purrr rappdirs Rcpp rlang stringr tibble tidyr xml2]; }; + bridge = derive2 { name="bridge"; version="1.62.0"; sha256="02rf15f3r1kazxml8mk9mi1zxgglsdfrpbg7ny9w0s65f413grg8"; depends=[rama]; }; + bsseq = derive2 { name="bsseq"; version="1.34.0"; sha256="0rd0ihr1ai1kvly2zf5y2qx3qyhk3ag2mdsrwqnzs67xkv99glsf"; 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.4.1"; sha256="17pkpnyxfdbff3yiqh04fdpr6953vcllm0wa2sqafy817kz3vrpy"; depends=[BiocFileCache vroom]; }; + bumphunter = derive2 { name="bumphunter"; version="1.40.0"; sha256="0jwbhd2fhm1w5slwhz8krnw835a8qb4akm3n3pv867bvi0xnp3g2"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; }; + cBioPortalData = derive2 { name="cBioPortalData"; version="2.10.1"; sha256="13vvlv2qbrir8582w4p6rq1xkwb0px5sr0k9pk5426vdq7nsw1q1"; depends=[AnVIL BiocFileCache digest dplyr GenomeInfoDb GenomicRanges httr IRanges MultiAssayExperiment RaggedExperiment readr RTCGAToolbox S4Vectors SummarizedExperiment TCGAutils tibble tidyr]; }; + cTRAP = derive2 { name="cTRAP"; version="1.16.0"; sha256="1k2zd67x5j1w4ra87y3w1zkn7ssld6f7siq6ibx3bks3h54rvj1x"; depends=[AnnotationDbi AnnotationHub binr cowplot data_table dplyr DT fastmatch fgsea ggplot2 ggrepel highcharter htmltools httr limma pbapply purrr qs R_utils readxl reshape2 rhdf5 rlang scales shiny shinycssloaders tibble]; }; + cageminer = derive2 { name="cageminer"; version="1.4.0"; sha256="0nwphmmg0ylw9v9mx88ygv37qaq02n2ypgbvnqx08hb15bk4cr5b"; depends=[BioNERO GenomeInfoDb GenomicRanges ggbio ggplot2 ggtext IRanges reshape2]; }; + calm = derive2 { name="calm"; version="1.12.0"; sha256="16ab0hxfk9m3jplwrf5ybxikz7ai54l7xmgv2kcc98ima8lbaml6"; depends=[mgcv]; }; + canceR = derive2 { name="canceR"; version="1.32.0"; sha256="1w5nsbw2m3dbzj5nph5p5rzl0476j2zacd735f1yzl0y2241vrjx"; depends=[Biobase circlize Formula geNetClassifier GSEABase httr phenoTest plyr R_methodsS3 R_oo rpart RUnit survival tkrplot]; }; + cancerclass = derive2 { name="cancerclass"; version="1.42.0"; sha256="1px53j601a17gslyla7msq6cvxghjqpy818cqdxp4ffq13wsrydr"; depends=[binom Biobase]; }; + cardelino = derive2 { name="cardelino"; version="1.0.0"; sha256="1ma4clkrkrjvy12ln2d2smyzzsz9y9554f5wgwmh9kv6s4xc66qs"; depends=[combinat GenomeInfoDb GenomicRanges ggplot2 ggtree Matrix matrixStats pheatmap S4Vectors snpStats VariantAnnotation vcfR]; }; + casper = derive2 { name="casper"; version="2.32.0"; sha256="0ibdfx7fb99zp5p94f5aga6kpnwg19500pg4nlf2yiqddpsc864s"; 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.42.0"; sha256="1m9kj5ks35wklb30zamzk450sgf01mc1k7a4wi8y1jrp7i32d5ci"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category colorspace GOstats graph GSEABase hwriter RCy3]; }; + cbaf = derive2 { name="cbaf"; version="1.20.0"; sha256="1r34z9v82i5m2mmdrgi6wid2yyys655qp6bi4j637ljh79c1f80s"; depends=[BiocFileCache cBioPortalData genefilter gplots openxlsx RColorBrewer]; }; + cbpManager = derive2 { name="cbpManager"; version="1.6.0"; sha256="0qvlyy5m00nxzyaap8lwc9l5mdgr5pya7x7p56cwcwfhlji1d0wm"; depends=[basilisk dplyr DT htmltools jsonlite magrittr markdown plyr rapportools reticulate rintrojs shiny shinyBS shinycssloaders shinydashboard vroom]; }; + ccImpute = derive2 { name="ccImpute"; version="1.0.0"; sha256="1w5fwmf619y8ywzi3ksbssqcfkq1hr0jjjl7bcylbvckm3p4bfa6"; depends=[BiocParallel matrixStats Rcpp RcppEigen SIMLR]; }; + ccfindR = derive2 { name="ccfindR"; version="1.18.0"; sha256="0snxm5zqa93q9hmqlkbij8saw2q0hhh95d12jmffp5yf1n1d8r9s"; depends=[ape gtools irlba Matrix RColorBrewer Rcpp RcppEigen Rdpack Rmpi Rtsne S4Vectors SingleCellExperiment SummarizedExperiment]; }; + ccmap = derive2 { name="ccmap"; version="1.24.0"; sha256="1cb6z30vx3r2d1qdvrjb9qa6m5dglar8yji9dg9mz5yiygdbvwf7"; depends=[AnnotationDbi BiocManager ccdata data_table doParallel foreach lsa xgboost]; }; + ccrepe = derive2 { name="ccrepe"; version="1.34.0"; sha256="1xnlsf0gird9ya0gd2xqjy6c85q5yrbaxv2kg31cn0wdlg55dgfh"; depends=[infotheo]; }; + ceRNAnetsim = derive2 { name="ceRNAnetsim"; version="1.10.0"; sha256="1phrn8aisjnbzqh7npvngrnk9m1bxwv6d0as1sf1gy8ks4piy4r7"; depends=[dplyr furrr future ggplot2 ggraph igraph purrr rlang tibble tidygraph tidyr]; }; + celaref = derive2 { name="celaref"; version="1.16.0"; sha256="13a0hb72i9vnslsmidgwzdsma6qfxq1syfbij726viwaxl6zmxp7"; depends=[BiocGenerics DelayedArray dplyr ggplot2 magrittr MAST Matrix readr rlang S4Vectors SummarizedExperiment tibble]; }; + celda = derive2 { name="celda"; version="1.14.0"; sha256="1ygp9qz5cs190w3758f0h369rg1ngqsrgyp1nw13jxqz9cig47dx"; 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.62.0"; sha256="0gkdvdda90m9qq2j5svmrip0kc601zbg7kca4m71qymwvvrdj4nl"; depends=[Biobase BiocGenerics Category genefilter GSEABase hwriter locfit RColorBrewer splots vsn]; }; + cellTree = derive2 { name="cellTree"; version="1.27.0"; sha256="0yfr59fcbdj03ikkpvw1qcxqrjbkz7nkfmb5m1xr4k9qs39bq9sb"; depends=[gplots igraph maptpx slam topGO topicmodels xtable]; }; + cellbaseR = derive2 { name="cellbaseR"; version="1.22.0"; sha256="0i1b5lavzd0jqa5r1l1b3c22ana5vrk7f68385n7g1l8i5fl5ldr"; depends=[BiocParallel data_table doParallel foreach httr jsonlite pbapply R_utils Rsamtools tidyr]; }; + cellity = derive2 { name="cellity"; version="1.26.0"; sha256="0f1d83q3nbvjsk3077793i234yqy71yq6plvvya93vxq32b7ppsh"; depends=[AnnotationDbi e1071 ggplot2 mvoutlier org_Hs_eg_db org_Mm_eg_db robustbase topGO]; }; + cellmigRation = derive2 { name="cellmigRation"; version="1.6.0"; sha256="0aj7px50vy27ijx1sgszsxpv13rzsjlsa14m11hwmxdnz1yiihyf"; depends=[doParallel FactoMineR FME foreach Hmisc matrixStats reshape2 sp SpatialTools tiff vioplot]; }; + cellscape = derive2 { name="cellscape"; version="1.22.0"; sha256="0bbsq5hqhsv5zs79256iv2w6pid3fdg6yjv86n4fc7qzh9lgkxf5"; depends=[dplyr gtools htmlwidgets jsonlite plyr reshape2 stringr]; }; + cellxgenedp = derive2 { name="cellxgenedp"; version="1.2.1"; sha256="1cgbgv6kx6wkqml4pc9ik9n8gb8q1j8nrdbl6kwl77gx97zn1shg"; depends=[curl dplyr DT httr jsonlite rjsoncons shiny]; }; + censcyt = derive2 { name="censcyt"; version="1.6.0"; sha256="0di9d50ak07d8svcq8zhb3bbbr8hjycgh5rhiv4vsi86plj4r7iw"; depends=[BiocParallel broom_mixed diffcyt dirmult dplyr edgeR fitdistrplus lme4 magrittr MASS mice multcomp purrr rlang S4Vectors stringr SummarizedExperiment survival tibble tidyr]; }; + cfDNAPro = derive2 { name="cfDNAPro"; version="1.4.0"; sha256="0441gyjfbi35444hng16zwjmyj74yfnq6m4l1wlcz8bpss57axkj"; depends=[BiocGenerics dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges magrittr plyranges quantmod rlang Rsamtools stringr tibble]; }; + cghMCR = derive2 { name="cghMCR"; version="1.56.0"; sha256="1c1h987c61camgz8wjlfg7jlkvfgz3xxkjflrnn97dx8kqzd20ll"; depends=[BiocGenerics CNTools DNAcopy limma]; }; + chimeraviz = derive2 { name="chimeraviz"; version="1.24.0"; sha256="05yg31s2jqdpk8rc1jkb7ah6hws4m11jz5chg5mmxadq78qxngzp"; depends=[AnnotationDbi AnnotationFilter BiocStyle Biostrings checkmate data_table dplyr DT ensembldb GenomeInfoDb GenomicAlignments GenomicRanges graph gtools Gviz IRanges magick org_Hs_eg_db org_Mm_eg_db plyr RCircos RColorBrewer Rgraphviz rmarkdown Rsamtools S4Vectors]; }; + chipenrich = derive2 { name="chipenrich"; version="2.22.0"; sha256="02cy0lk2gllrizmk8fwnzk07k2kd4ha3xiynqvp9zgg0hr6wjyd3"; depends=[AnnotationDbi BiocGenerics chipenrich_data GenomeInfoDb GenomicRanges IRanges lattice latticeExtra MASS mgcv org_Dm_eg_db org_Dr_eg_db org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db plyr rms rtracklayer S4Vectors stringr]; }; + chipseq = derive2 { name="chipseq"; version="1.48.0"; sha256="1gmspbf5bmlqgbq280lnh4m9bmhzv6d0aj15dmggizsgb9d34vp5"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; }; + chopsticks = derive2 { name="chopsticks"; version="1.64.0"; sha256="1kc9a0ir7wz338c5y0lrrn74ik3i4fnh2m3ag5z2kx2xaxp4w90i"; depends=[survival]; }; + chromDraw = derive2 { name="chromDraw"; version="2.28.0"; sha256="0lc782v1m5rm6a0mr8fzhvnv9dw5z3q1rdq6g4yd8vv70579g0ir"; depends=[GenomicRanges Rcpp]; }; + chromPlot = derive2 { name="chromPlot"; version="1.26.0"; sha256="0s9x125mnfxsznbsyylgnax4529zvqdqszmgghgin213dx6jhfcm"; depends=[biomaRt GenomicRanges]; }; + chromVAR = derive2 { name="chromVAR"; version="1.20.0"; sha256="1rwgbicbmszdkr05ksxfsisyhk0a4pvc3jrxbzjyc13jj5h6m5kp"; depends=[BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicRanges ggplot2 IRanges Matrix miniUI nabor plotly RColorBrewer Rcpp RcppArmadillo Rsamtools Rtsne S4Vectors shiny SummarizedExperiment TFBSTools]; }; + chromstaR = derive2 { name="chromstaR"; version="1.24.0"; sha256="17p22vsmb9h8ap0f2rzyg2r71srj3sxiapzyaz1csad2vfjxfi2r"; depends=[bamsignals BiocGenerics chromstaRData doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges mvtnorm reshape2 Rsamtools S4Vectors]; }; + chromswitch = derive2 { name="chromswitch"; version="1.20.0"; sha256="0ch4jcyr4f130d6cmqqkcvnwq3xfisnns3266m3sf62ng4w1akq5"; depends=[Biobase BiocParallel cluster dplyr GenomicRanges gplots IRanges lazyeval magrittr matrixStats NMF rtracklayer S4Vectors tidyr]; }; + cicero = derive2 { name="cicero"; version="1.16.0"; sha256="0grzp9k06dz04bw07nf9qka19mara1kplyd24y8mg8208wk949f6"; depends=[assertthat Biobase BiocGenerics data_table dplyr FNN GenomicRanges ggplot2 glasso Gviz igraph IRanges Matrix monocle plyr reshape2 S4Vectors stringi stringr tibble tidyr VGAM]; }; + circRNAprofiler = derive2 { name="circRNAprofiler"; version="1.12.0"; sha256="07l8vaqbw36hvs8pyn1gk6dglnmkcmbafvd4rdrhg2wqwnlpsf40"; depends=[AnnotationHub Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 DESeq2 dplyr edgeR GenomeInfoDb GenomicRanges ggplot2 gwascat IRanges magrittr R_utils readr reshape2 rlang rtracklayer S4Vectors seqinr stringi stringr universalmotif]; }; + cisPath = derive2 { name="cisPath"; version="1.38.0"; sha256="0g3sl12hrh9asghm3ylz1l1v4hlcrsz47jpihqgkh829w0dz67rf"; depends=[]; }; + cleanUpdTSeq = derive2 { name="cleanUpdTSeq"; version="1.36.0"; sha256="0bklip44ls8i8baq8cqh4wm5y4jxn0dyg035iszm209qgkxk8n17"; depends=[Biostrings BSgenome BSgenome_Drerio_UCSC_danRer7 e1071 GenomeInfoDb GenomicRanges IRanges S4Vectors seqinr stringr]; }; + cleaver = derive2 { name="cleaver"; version="1.36.0"; sha256="0pmgnw807wn22zxz3z3f2gfjqfqi555858anhp125n2hf8pj6k16"; depends=[Biostrings IRanges S4Vectors]; }; + cliProfiler = derive2 { name="cliProfiler"; version="1.4.0"; sha256="1m7iwmhwlf9xmbmjnlgrxdd5fhawx76sz5lskrphskj0g2xasajc"; depends=[Biostrings BSgenome dplyr GenomicRanges ggplot2 rtracklayer S4Vectors]; }; + clippda = derive2 { name="clippda"; version="1.48.0"; sha256="16wcnc0pnxj50bzwlkfsh56g0cdagfk2yjvaz5yqsrh4p609l0y3"; depends=[Biobase lattice limma rgl scatterplot3d statmod]; }; + clipper = derive2 { name="clipper"; version="1.38.0"; sha256="0isjvpndqgn615vw75kzhy3nr34q18w096y5s3536y8zrdj0ibag"; depends=[Biobase corpcor graph gRbase igraph KEGGgraph Matrix qpgraph RBGL Rcpp]; }; + cliqueMS = derive2 { name="cliqueMS"; version="1.12.0"; sha256="1z92mdm5xcnzql63il3pyj6ak31l8phd3qp7scpkbmzcd2311jhm"; depends=[BH igraph matrixStats MSnbase qlcMatrix Rcpp RcppArmadillo xcms]; }; + clst = derive2 { name="clst"; version="1.46.0"; sha256="0ff9mp78jslqw7b240h84s4n4vii5ga2bam9416fzgs0q8pz1whg"; depends=[lattice ROC]; }; + clstutils = derive2 { name="clstutils"; version="1.46.0"; sha256="02x8z1z0h4j6qrv4pyskfbkylzgnzhfyvb31d3jd6gyarazadzrs"; depends=[ape clst lattice rjson RSQLite]; }; + clustComp = derive2 { name="clustComp"; version="1.26.0"; sha256="0zpyxy7zba8j8zx3zr3ph4xvn6q6jp8lv3x99760aw98ccjm6l3h"; depends=[sm]; }; + clusterExperiment = derive2 { name="clusterExperiment"; version="2.18.0"; sha256="04kdiwz8qzr7cr1an1c7a684wqv9pkca0iaym5f069pdjhqvvq0a"; 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.6.0"; sha256="0fm2cz2464xh075p4yl6bha9m6didc41ng4a3flkw1f1cvvpi4g0"; depends=[AnnotationDbi DOSE downloader dplyr enrichplot GO_db GOSemSim gson magrittr plyr qvalue rlang tidyr yulab_utils]; }; + clusterSeq = derive2 { name="clusterSeq"; version="1.22.0"; sha256="05ap73pyax6nfb474d2xda5279c8z84pvkshzxwp1q3rb8fn4s6d"; depends=[baySeq BiocGenerics BiocParallel]; }; + clusterStab = derive2 { name="clusterStab"; version="1.70.0"; sha256="0kmmb33mq0rgzp83rih8hb7gv51djfn6iak0b2b9806jx3c1cw5y"; depends=[Biobase]; }; + clustifyr = derive2 { name="clustifyr"; version="1.10.0"; sha256="1y7ndmc6mjs841a6nk4b4njpkjaanardpkh0bzacfj288znpx7dg"; depends=[cowplot dplyr entropy fgsea ggplot2 httr Matrix matrixStats proxy readr rlang S4Vectors scales SingleCellExperiment stringr SummarizedExperiment tibble tidyr]; }; + cmapR = derive2 { name="cmapR"; version="1.10.0"; sha256="1cgjwnn7w944id42qhnh5xw45hjijl4w26j50fcdiwwl18fdpdxf"; depends=[data_table flowCore matrixStats rhdf5 SummarizedExperiment]; }; + cn_farms = derive2 { name="cn.farms"; version="1.46.0"; sha256="1l1y1974bibqymibz7smmn8rgn27y3wh5kqkbshh1rd6b9xml0zj"; depends=[affxparser Biobase DBI DNAcopy ff lattice oligo oligoClasses preprocessCore snow]; }; + cn_mops = derive2 { name="cn.mops"; version="1.44.0"; sha256="1nvh23v63fj5l53bdipkqh1nvr307n4hsr2qi5ba4qs2hpf94wcz"; depends=[Biobase BiocGenerics exomeCopy GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors]; }; + cnvGSA = derive2 { name="cnvGSA"; version="1.42.0"; sha256="11xlk9ljwn5zzjawf3gj7715rxxsh67gxrn2agrfzdhxickf8x4k"; depends=[brglm doParallel foreach GenomicRanges splitstackshape]; }; + coGPS = derive2 { name="coGPS"; version="1.42.0"; sha256="12dxim7dd6nh3pgyn5yg4xkmvv5wpxy202qnarliv2smgs5f9w30"; depends=[]; }; + coMET = derive2 { name="coMET"; version="1.30.0"; sha256="0i9r9gs7s8ami9hpfkmw4hshgly6107ib91n7l7l8dkpljndicfa"; depends=[biomaRt corrplot GenomicRanges gridExtra Gviz hash IRanges psych rtracklayer S4Vectors]; }; + coMethDMR = derive2 { name="coMethDMR"; version="1.2.0"; sha256="1d602pg9aaqvjwpdjnn67fb98n6sy557lkqfg8rybybjzx705g4h"; depends=[AnnotationHub BiocParallel bumphunter ExperimentHub GenomicRanges IRanges lmerTest]; }; + coRdon = derive2 { name="coRdon"; version="1.16.0"; sha256="095vk28v1a62cqz0vavvbvjij3azr5sr2n1px31zpx91m9jy616v"; depends=[Biobase Biostrings data_table dplyr ggplot2 purrr stringr]; }; + codelink = derive2 { name="codelink"; version="1.66.0"; sha256="0w3ddmz22dw7nvgl1wxahlqjw2qsjyh0p001mq5kyqsk0b7zdx0y"; depends=[annotate Biobase BiocGenerics limma]; }; + coexnet = derive2 { name="coexnet"; version="1.19.1"; sha256="0zw8a8pqmajqnv5n6i7fn7krwax81sd4c6wqm4zr61fy2blqzv3h"; depends=[acde affy Biobase GEOquery igraph limma minet rmarkdown siggenes STRINGdb SummarizedExperiment vsn]; }; + cogena = derive2 { name="cogena"; version="1.32.0"; sha256="0hxxk7ijrbji40v5y4y5r6zv6j6z1vn5dwxfxqz4x91igmv8p3qc"; depends=[amap apcluster Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots kohonen mclust reshape2 stringr tibble tidyr]; }; + cogeqc = derive2 { name="cogeqc"; version="1.2.0"; sha256="1wjybj2aq84c2lrmfpqcawy6gsvb16vz4qkfwicfbff7bq0nd9qs"; depends=[Biostrings ggplot2 ggtree igraph patchwork reshape2]; }; + cola = derive2 { name="cola"; version="2.4.0"; sha256="0hwkcpbxnh3n4iik492dsxzh1kimg6cwsdlgdjqrzid61rbg5zax"; 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]; }; + comapr = derive2 { name="comapr"; version="1.2.0"; sha256="1b2727fr7fczcy420rg64xhls63pyw7lqzcv8rjcbazjl6673rkb"; depends=[BiocParallel circlize dplyr foreach GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz IRanges Matrix plotly plyr RColorBrewer reshape2 rlang S4Vectors scales SummarizedExperiment tidyr]; }; + combi = derive2 { name="combi"; version="1.10.0"; sha256="1522np734gbk4g6m64832f32fsq9fsv0gjgk0qf3axny8l7g3pxy"; depends=[alabama BB Biobase cobs DBI ggplot2 limma Matrix nleqslv phyloseq reshape2 SummarizedExperiment tensor vegan]; }; + compEpiTools = derive2 { name="compEpiTools"; version="1.32.0"; sha256="0v5rwcahqz77dcg57agllbvrnfk4cfngzgzib2c2xkjdvyz8bd72"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges GO_db gplots IRanges methylPipe Rsamtools S4Vectors topGO XVector]; }; + compartmap = derive2 { name="compartmap"; version="1.16.0"; sha256="0vm5ip7gxs2s0lij3qf3fjgfd4b08f5c8visq9dhjx87bc9dgbcz"; depends=[BiocSingular DelayedArray DelayedMatrixStats GenomicRanges ggplot2 HDF5Array Matrix RaggedExperiment reshape2 RMTstat rtracklayer scales SummarizedExperiment]; }; + compcodeR = derive2 { name="compcodeR"; version="1.34.0"; sha256="1cavvgi6gfd06krsabd5amvjlyclnc5lzpy1jl37a5ssppfmymzr"; depends=[ape caTools edgeR ggplot2 gplots gtools KernSmooth knitr lattice limma markdown MASS matrixStats modeest phylolm ROCR sm stringr vioplot]; }; + conclus = derive2 { name="conclus"; version="1.5.0"; sha256="09rk73sxqxsy0zq07n67jxqbzb1rlxlj0phg6987szdjwxmag6jc"; depends=[AnnotationDbi Biobase BiocFileCache biomaRt clusterProfiler dbscan doParallel dplyr factoextra foreach fpc GEOquery ggplot2 gridExtra org_Hs_eg_db org_Mm_eg_db pheatmap rlang Rtsne scales scater scran SingleCellExperiment stringr SummarizedExperiment]; }; + condiments = derive2 { name="condiments"; version="1.6.0"; sha256="0wf1nrwp4inzwnw29s7ig2601hi3ppwq50vp1vfd65krfkj5ww3w"; depends=[BiocParallel distinct dplyr Ecume igraph magrittr matrixStats mgcv pbapply RANN SingleCellExperiment slingshot SummarizedExperiment TrajectoryUtils]; }; + consICA = derive2 { name="consICA"; version="1.0.0"; sha256="0rfy6v601sxdpsjkli21927w56jjw0dcav1vnp2sibbb7r2ymrwc"; depends=[BiocParallel fastICA GO_db graph org_Hs_eg_db pheatmap sm SummarizedExperiment survival topGO]; }; + consensus = derive2 { name="consensus"; version="1.16.0"; sha256="180klz7minp2i4v50nkk2svjkhsl5mbv025d2a0h6klmlsmnvyi0"; depends=[gplots matrixStats RColorBrewer]; }; + consensusDE = derive2 { name="consensusDE"; version="1.16.0"; sha256="0v093plal029m3gvn6ng7i130c6dflwjvjvqipfq37cchkqpibf4"; depends=[airway AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings data_table dendextend DESeq2 EDASeq edgeR EnsDb_Hsapiens_v86 ensembldb GenomicAlignments GenomicFeatures limma org_Hs_eg_db pcaMethods RColorBrewer Rsamtools RUVSeq S4Vectors SummarizedExperiment TxDb_Dmelanogaster_UCSC_dm3_ensGene]; }; + consensusOV = derive2 { name="consensusOV"; version="1.20.0"; sha256="0lixy4qg618vqv1i9mjz0v12rnzlakpdbv9wjkbxfc8l5yybqpmh"; depends=[Biobase gdata genefu GSVA limma matrixStats randomForest]; }; + consensusSeekeR = derive2 { name="consensusSeekeR"; version="1.26.0"; sha256="1cn556l4s498sa5immf310ljf7vfwd1vkxk16nsjcf29m91823ms"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges IRanges rtracklayer S4Vectors stringr]; }; + contiBAIT = derive2 { name="contiBAIT"; version="1.26.0"; sha256="0yw06870jvgzyangyf8sz5sa07zmb7iq1vhlw96gq2jlxzq4s32h"; depends=[BH BiocGenerics BiocParallel clue cluster colorspace data_table diagram DNAcopy exomeCopy GenomicAlignments GenomicFiles GenomicRanges ggplot2 gplots gtools IRanges Rcpp reshape2 Rsamtools rtracklayer S4Vectors TSP]; }; + conumee = derive2 { name="conumee"; version="1.32.0"; sha256="0w4g0ybcxzbbnzdywm0n9ycmbb11jxjgr7fiwmb60483p25hx6z2"; depends=[DNAcopy GenomeInfoDb GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest IRanges minfi rtracklayer]; }; + convert = derive2 { name="convert"; version="1.74.0"; sha256="14cnr2b8ijnyk8syz211pnr5246hnsj0qia6b07gz372llv0mk2w"; depends=[Biobase limma marray]; }; + copa = derive2 { name="copa"; version="1.66.0"; sha256="1jznqf2n8c2w9d36xp2qwbyfap7kyp4qs3d8bpb8s75hi9yzr04z"; depends=[Biobase]; }; + copynumber = derive2 { name="copynumber"; version="1.38.0"; sha256="1a664bllaq9pbb5cpd01j919qirylvnm8qd49lwlz89jvqjdri19"; depends=[BiocGenerics GenomicRanges IRanges S4Vectors]; }; + corral = derive2 { name="corral"; version="1.8.0"; sha256="1xzajapql5dx4chbbcz47qgfm21k82fsd3d0q8626rpgi8lfc5wl"; depends=[ggplot2 ggthemes gridExtra irlba Matrix MultiAssayExperiment pals reshape2 SingleCellExperiment SummarizedExperiment transport]; }; + coseq = derive2 { name="coseq"; version="1.22.0"; sha256="1fw10gqzxjn8j8109ahcz8a6yyfpxlifwfmj78m5q72nba0vi4aq"; depends=[BiocParallel capushe compositions corrplot DESeq2 e1071 edgeR ggplot2 HTSCluster HTSFilter mvtnorm Rmixmod S4Vectors scales SummarizedExperiment]; }; + cosmiq = derive2 { name="cosmiq"; version="1.32.0"; sha256="0yy6q8b4il7khwar9rbjn9g2jb10ck4lm6znh2lajblsr3zfgl9w"; depends=[faahKO MassSpecWavelet pracma Rcpp xcms]; }; + cosmosR = derive2 { name="cosmosR"; version="1.6.0"; sha256="17mjjm3mri34m1ksck8dj7bf8ym10kzinq6zn8plns15zljy4cxp"; depends=[CARNIVAL dorothea dplyr GSEABase igraph progress purrr rlang stringr visNetwork]; }; + countsimQC = derive2 { name="countsimQC"; version="1.16.0"; sha256="0jzxss3lh4jcl8ly3n5jd7xb1zfkg4wwj84q07l0dpnnj0zp3sj0"; depends=[caTools DESeq2 dplyr DT edgeR genefilter GenomeInfoDbData ggplot2 ragg randtests rmarkdown SummarizedExperiment tidyr]; }; + covEB = derive2 { name="covEB"; version="1.24.0"; sha256="19km0q0nmgfvsz5w8k74f735j9sa8s90nvz77lv8afjq04spznxy"; depends=[Biobase gsl igraph LaplacesDemon Matrix mvtnorm]; }; + covRNA = derive2 { name="covRNA"; version="1.24.0"; sha256="1p3kl3qwriab2c6f8qxl65ssys759fwvcp7jvsc3bbpbkldirz59"; depends=[ade4 Biobase genefilter]; }; + cpvSNP = derive2 { name="cpvSNP"; version="1.30.0"; sha256="0hkrf1488jj8wzzbsxsc71winrmckcql449jawvxsz9ps92r3314"; depends=[BiocParallel corpcor GenomicFeatures ggplot2 GSEABase plyr]; }; + cqn = derive2 { name="cqn"; version="1.44.0"; sha256="1y8g4dx86s95w0h1y98r2hfyphzw648jz5lhrs6xbrnhz6ficzvn"; depends=[mclust nor1mix preprocessCore quantreg]; }; + crisprBase = derive2 { name="crisprBase"; version="1.2.0"; sha256="1ym9hm6q124mzjf7a0fky4qray8ylkjga17lbfr083prnb9jkgi8"; depends=[BiocGenerics Biostrings GenomicRanges IRanges S4Vectors stringr]; }; + crisprBowtie = derive2 { name="crisprBowtie"; version="1.2.0"; sha256="1gzil30hnbrv95y4pr8mzvm5xq8xn19c8lh4kk93480ki8j5ll5s"; depends=[BiocGenerics Biostrings BSgenome crisprBase GenomeInfoDb GenomicRanges IRanges Rbowtie readr stringr]; }; + crisprBwa = derive2 { name="crisprBwa"; version="1.2.0"; sha256="1qyi4vpmharkv8h94rqnm85bg56ks16ba5pcbrcmiwm1mr5v33lp"; depends=[BiocGenerics BSgenome crisprBase GenomeInfoDb Rbwa readr stringr]; }; + crisprDesign = derive2 { name="crisprDesign"; version="1.0.0"; sha256="15icrrg5ha16g3pbbsxck8zl7x8j433jif7l4l6vf3z67x9pyz75"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome crisprBase crisprBowtie crisprScore GenomeInfoDb GenomicFeatures GenomicRanges IRanges Matrix MatrixGenerics rtracklayer S4Vectors VariantAnnotation]; }; + crisprScore = derive2 { name="crisprScore"; version="1.2.0"; sha256="01zz9hffns2papwczckfhcq7nq832l0hc621k1hx5r2mzrdzsa8g"; depends=[basilisk basilisk_utils BiocGenerics Biostrings crisprScoreData IRanges randomForest reticulate stringr XVector]; }; + crisprVerse = derive2 { name="crisprVerse"; version="1.0.0"; sha256="0l1iv9kwwwncav9y2zpkfk937r9bwni6k2ca0c3yafqwpyljn94f"; depends=[BiocManager cli crisprBase crisprBowtie crisprDesign crisprScore crisprViz rlang]; }; + crisprViz = derive2 { name="crisprViz"; version="1.0.0"; sha256="1f4iv2iy751dvik2awwlk46fqnfgqwn9r2kv2iypiyysk1bgwq8d"; depends=[BiocGenerics Biostrings BSgenome crisprBase crisprDesign GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges S4Vectors]; }; + crisprseekplus = derive2 { name="crisprseekplus"; version="1.24.0"; sha256="1hmyla7qppbd81jans5kxd6z11vrqhgza7gvibyih4czria5sb05"; depends=[AnnotationDbi BiocManager BSgenome CRISPRseek DT GenomicFeatures GenomicRanges GUIDEseq hash shiny shinyjs]; }; + crlmm = derive2 { name="crlmm"; version="1.56.0"; sha256="0nhvwdzl71z3c01vlazrarbrz77c8rf5qmsfc9w9fr054dc9r71i"; depends=[affyio beanplot Biobase BiocGenerics ellipse ff foreach illuminaio lattice limma matrixStats mvtnorm oligoClasses preprocessCore RcppEigen VGAM]; }; + crossmeta = derive2 { name="crossmeta"; version="1.24.0"; sha256="0b8l44j9jnn1d79m718cyrggfhy5bq59rws2fjvcal0p8mlsl2n8"; depends=[affxparser affy AnnotationDbi Biobase BiocGenerics BiocManager data_table DBI DT edgeR fdrtool GEOquery limma matrixStats metaMA miniUI oligo RCurl reader readxl RSQLite shiny shinyBS shinyjs shinypanel shinyWidgets stringr sva tibble XML]; }; + csaw = derive2 { name="csaw"; version="1.32.0"; sha256="1nv8mch67mhzwj793w2lcf98x6iz7kin7xp6ipn6p06a4fxzglz7"; depends=[BiocGenerics BiocParallel edgeR GenomeInfoDb GenomicRanges IRanges limma Matrix metapod Rcpp Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; }; + csdR = derive2 { name="csdR"; version="1.4.0"; sha256="1xyskzy5khbsn1q0fa1824asm2ib8jdaz324dqr6vg7kngqn8sf3"; depends=[glue matrixStats Rcpp RhpcBLASctl WGCNA]; }; + ctc = derive2 { name="ctc"; version="1.72.0"; sha256="098a65fk9la639sqihhsghhgb3hyzv35j6akph908zwq5grsv0c5"; depends=[amap]; }; + ctsGE = derive2 { name="ctsGE"; version="1.24.0"; sha256="18rnpxm55w4gr78a64i20yg7jz04cyjr4rgd88czkkwhkj73q465"; depends=[ccaPP ggplot2 limma reshape2 shiny stringr]; }; + cummeRbund = derive2 { name="cummeRbund"; version="2.40.0"; sha256="1fzkhnlgv4zd0slr12d5aichyxsca86p82fyjymiz7f5fqdvqmd9"; depends=[Biobase BiocGenerics fastcluster ggplot2 Gviz plyr reshape2 RSQLite rtracklayer S4Vectors]; }; + customCMPdb = derive2 { name="customCMPdb"; version="1.8.0"; sha256="1jqr80qgnhvsxaagpg7ww115wq0m8jh8sf5pg09xmwh3909y48cr"; depends=[AnnotationHub BiocFileCache ChemmineR rappdirs RSQLite XML]; }; + customProDB = derive2 { name="customProDB"; version="1.38.0"; sha256="0qc3as0cmhjw9gv5akb35x8vq8ksn14ycs8yajfaczg8g7216x1i"; depends=[AhoCorasickTrie AnnotationDbi biomaRt Biostrings DBI GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr RCurl Rsamtools RSQLite rtracklayer S4Vectors stringr VariantAnnotation]; }; + cyanoFilter = derive2 { name="cyanoFilter"; version="1.6.0"; sha256="0c440ryv56r7ck2l9i93nzaj5wkmnahhkig3l8nvbq0iq22qccir"; depends=[Biobase cytometree flowClust flowCore flowDensity GGally ggplot2 mrfDepth]; }; + cycle = derive2 { name="cycle"; version="1.52.0"; sha256="1lahh78i8qv7xfm0k2qkh4chpjl9jp51z4n9q1xks0y5v2934mvs"; depends=[Biobase Mfuzz]; }; + cydar = derive2 { name="cydar"; version="1.22.0"; sha256="02ci2kl4pq47n0bsd19514g8f098249lqldq2ywhrrql0wibggh3"; depends=[Biobase BiocGenerics BiocNeighbors BiocParallel flowCore Rcpp S4Vectors shiny SingleCellExperiment SummarizedExperiment viridis]; }; + cytoKernel = derive2 { name="cytoKernel"; version="1.4.0"; sha256="1mq3b6fjns0q5pr2vc37lnviy2jq02lsx0bhpc43yna5gv45qv6p"; depends=[ashr BiocParallel circlize ComplexHeatmap data_table dplyr magrittr Rcpp rlang S4Vectors SummarizedExperiment]; }; + cytoMEM = derive2 { name="cytoMEM"; version="1.2.0"; sha256="1pz4sfp43d85xd8dkbdpr9kzl6w6g7lm98zqf3cmiz4mnb7rzjwp"; depends=[flowCore gplots matrixStats]; }; + cytolib = derive2 { name="cytolib"; version="2.10.0"; sha256="1y06x7z3p938kfvjx6zqab9hh1xzlrlhdxczyprx7lsd34ylz46n"; depends=[BH Rhdf5lib RProtoBufLib]; }; + cytomapper = derive2 { name="cytomapper"; version="1.10.0"; sha256="1rh0nfvj97x4p0sx9yiqaxc6c4c4xqaapacjj55d93y3k46d0ii5"; depends=[BiocParallel DelayedArray EBImage ggbeeswarm ggplot2 HDF5Array matrixStats nnls raster RColorBrewer rhdf5 S4Vectors shiny shinydashboard SingleCellExperiment SpatialExperiment SummarizedExperiment svglite svgPanZoom viridis]; }; + dStruct = derive2 { name="dStruct"; version="1.4.0"; sha256="0f83w1fgjrlp91ibcb3xxqvbi27rj3a7fxlg5bwlzaq8lg1yrwdn"; depends=[ggplot2 IRanges purrr reshape2 rlang S4Vectors zoo]; }; + daMA = derive2 { name="daMA"; version="1.70.0"; sha256="062nxfry9w674ja3q9zs4df2hvf4wws9jdqpy84g6nb0309vbhqf"; depends=[MASS]; }; + dada2 = derive2 { name="dada2"; version="1.26.0"; sha256="1cdfq4qa4kkfkqnkyxyr109hbvj5li396rm3p2b11qm2pxmfd7kc"; depends=[BiocGenerics Biostrings ggplot2 IRanges Rcpp RcppParallel reshape2 ShortRead XVector]; }; + dagLogo = derive2 { name="dagLogo"; version="1.36.0"; sha256="0kr61rpw54gjp16nimpj42anr5xn77lnz4bn1dr4d42z7l4ar0zg"; depends=[BiocGenerics biomaRt Biostrings httr motifStack pheatmap UniProt_ws]; }; + dasper = derive2 { name="dasper"; version="1.7.0"; sha256="0r7pv3cv48w3kx89x59yjcfxa9p7sc3aac09vm3g2xm9zhfjny81"; 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.26.0"; sha256="05vs7lbdgh1sh7l30ypm86gs2p9a8485qcpdl27y3rqsn4vb97al"; depends=[BiocParallel Matrix]; }; + dcanr = derive2 { name="dcanr"; version="1.14.0"; sha256="0vy6ahav3p8vxj3i9sixdpjz40lgvsp5cz9y62xx1kg641406xpy"; depends=[circlize doRNG foreach igraph Matrix plyr RColorBrewer reshape2 stringr]; }; + dce = derive2 { name="dce"; version="1.6.0"; sha256="1r3dwp0s4hsfzpqa8k0mjffgay5hvz9snsb2ym21n2654k1bg071"; depends=[assertthat dplyr edgeR epiNEM expm ggplot2 ggraph glm2 glue graph graphite harmonicmeanp igraph logger magrittr MASS Matrix metap mnem naturalsort org_Hs_eg_db pcalg ppcor purrr reshape2 Rgraphviz rlang shadowtext tidygraph tidyverse]; }; + ddCt = derive2 { name="ddCt"; version="1.54.0"; sha256="1q98qqxh13ibfxc9cclf3cqawax2qbysg193p0bdh878iyrsvc1y"; depends=[Biobase BiocGenerics lattice RColorBrewer xtable]; }; + ddPCRclust = derive2 { name="ddPCRclust"; version="1.18.0"; sha256="0b1pp1njpm8c48kagy7c1qa82bc8wsfxysgjljh4j7fi4alhcxy2"; depends=[clue flowCore flowDensity flowPeaks ggplot2 openxlsx plotrix R_utils SamSPECTRAL]; }; + dearseq = derive2 { name="dearseq"; version="1.10.0"; sha256="1f9hz4jp862jm1grf4qzdvnzp17ri0n1rhfafgkc1j73z6whw1b0"; depends=[CompQuadForm dplyr ggplot2 KernSmooth magrittr matrixStats patchwork pbapply reshape2 rlang scattermore statmod survey tibble viridisLite]; }; + debCAM = derive2 { name="debCAM"; version="1.16.0"; sha256="09dm861adbxdy3ncfdxq46wjr4hpn56c66n64xm9gwzkzsrxyc2a"; depends=[apcluster Biobase BiocParallel corpcor DMwR2 geometry NMF nnls pcaPP rJava SummarizedExperiment]; }; + debrowser = derive2 { name="debrowser"; version="1.26.0"; sha256="0iq7j09xgvhkf671b0f0mpv60mwxpg5yg8b173q54zkcqcsww1ck"; depends=[annotate AnnotationDbi apeglm ashr clusterProfiler colourpicker DESeq2 DOSE DT edgeR enrichplot GenomicRanges ggplot2 gplots Harman heatmaply igraph IRanges jsonlite limma org_Hs_eg_db org_Mm_eg_db pathview plotly RColorBrewer RCurl reshape2 S4Vectors shiny shinyBS shinydashboard shinyjs stringi SummarizedExperiment sva]; }; + deco = derive2 { name="deco"; version="1.13.0"; sha256="0d4abif3v62cbas6hl7pfw8q8jihh7nsra76k9cm6kz54qw4fbnw"; depends=[ade4 AnnotationDbi Biobase BiocParallel BiocStyle cluster foreign gdata ggplot2 gplots gridExtra limma locfit made4 RColorBrewer reshape2 scatterplot3d sfsmisc SummarizedExperiment]; }; + decompTumor2Sig = derive2 { name="decompTumor2Sig"; version="2.14.0"; sha256="0agvmgwyk458lhhhspd8243n4897f0q7jf9yqhwsl5wi8011vmqd"; depends=[BiocGenerics Biostrings BSgenome_Hsapiens_UCSC_hg19 data_table GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo gridExtra Matrix plyr quadprog readxl S4Vectors SummarizedExperiment TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; }; + decontam = derive2 { name="decontam"; version="1.18.0"; sha256="0bk7ia2flnxwa99b8mf3xdvap3xqa4pvpsrgbnyapxbaqxr5zf82"; depends=[ggplot2 reshape2]; }; + deconvR = derive2 { name="deconvR"; version="1.4.3"; sha256="1jz7q4rv3m85bcvarjhqsyc2330fynb0wr5ajd2qffznczk846xb"; depends=[assertthat BiocGenerics data_table dplyr e1071 foreach GenomicRanges IRanges magrittr MASS matrixStats methylKit minfi nnls quadprog rsq S4Vectors tidyr]; }; + decoupleR = derive2 { name="decoupleR"; version="2.4.0"; sha256="1872pi2v9gymdpqdhab10ash4b2w8sbk1p635lf0p6s4679syhdi"; depends=[broom dplyr magrittr Matrix purrr rlang stringr tibble tidyr tidyselect withr]; }; + deepSNV = derive2 { name="deepSNV"; version="1.44.0"; sha256="051xcg9lx8plbfhiacrv1wsxfac0qqspysq960ppibkf4m8crk81"; depends=[Biostrings GenomicRanges IRanges Rhtslib SummarizedExperiment VariantAnnotation VGAM]; }; + deltaCaptureC = derive2 { name="deltaCaptureC"; version="1.12.0"; sha256="1ygsnhrqsr1pa61s7pq7wmyk1i4hcxyylpinnhbav04zjs8rhg1b"; depends=[DESeq2 GenomicRanges ggplot2 IRanges SummarizedExperiment tictoc]; }; + deltaGseg = derive2 { name="deltaGseg"; version="1.38.0"; sha256="1m4jdps2x3qx8mal4ryjffi0ph2kzkpqspfz4dq08mn46qn8nxfi"; depends=[changepoint fBasics ggplot2 pvclust reshape scales tseries wavethresh]; }; + demuxmix = derive2 { name="demuxmix"; version="1.0.0"; sha256="0glqwysbz5vx272s38g4zk0d4zzdnhlsc57yv52g2bxi1vij70an"; depends=[ggplot2 gridExtra MASS Matrix]; }; + densvis = derive2 { name="densvis"; version="1.8.0"; sha256="0fn9m7yykcrxfa7r7hkkh617k3q1xrpwh31dyd0ldwy84cwrldg0"; depends=[assertthat basilisk irlba Rcpp reticulate]; }; + derfinder = derive2 { name="derfinder"; version="1.32.0"; sha256="0v9h3hyfvk72r0d0fx2avmm65dvzb2i06vdx1c3jld8b676ss87r"; depends=[AnnotationDbi BiocGenerics BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; }; + derfinderHelper = derive2 { name="derfinderHelper"; version="1.32.0"; sha256="118rjmqy53viczdwj70kaszkpg2r2zbq60k49jg7fqb81prdwy04"; depends=[IRanges Matrix S4Vectors]; }; + derfinderPlot = derive2 { name="derfinderPlot"; version="1.32.0"; sha256="1pdfjppzg3l2mh7d29gn22hgkm48bznpalks2jd89wajxkhb6cd2"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer reshape2 S4Vectors scales]; }; + destiny = derive2 { name="destiny"; version="3.12.0"; sha256="0rgd723azjrdxv441k96vircqb18w31q0ljhksbdrvcp9qb85r6i"; 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.80.0"; sha256="0k0zd15jlffphg6m3c5jfnn5iilmb1g9sdgjzar4m6yyfzl1m51w"; depends=[minpack_lm]; }; + diffHic = derive2 { name="diffHic"; version="1.30.0"; sha256="1rffxh74bfzzi6dm90b7q0hv50pzb1mrmdicz1jrnksjk5hphfap"; 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.6.0"; sha256="104pfcrnkya4pra7ch2dlb2218f1vkp4xk3l8xn8k726kil56z4s"; depends=[ComplexHeatmap DEXSeq dplyr edgeR ensembldb GenomeInfoDb GenomicRanges ggplot2 ggrepel IRanges limma matrixStats Rsubread rtracklayer S4Vectors stringi SummarizedExperiment viridisLite]; }; + diffcoexp = derive2 { name="diffcoexp"; version="1.18.0"; sha256="1p7ksn9ly9if8yf4p9x6kya1vh5z68fjgv7acd417k6c1pznzcqf"; depends=[BiocGenerics DiffCorr igraph psych SummarizedExperiment WGCNA]; }; + diffcyt = derive2 { name="diffcyt"; version="1.18.0"; sha256="10xhvksnnn4m1hly16fwmbr28xgym6a9zkqj8y476jph4wpnhc2s"; depends=[circlize ComplexHeatmap dplyr edgeR flowCore FlowSOM limma lme4 magrittr multcomp reshape2 S4Vectors SummarizedExperiment tidyr]; }; + diffuStats = derive2 { name="diffuStats"; version="1.18.0"; sha256="1p8v2358kkdj50cbw5vvwkcc1dv470ifcggb5cmq2cqxx2ipf3z5"; depends=[checkmate expm igraph MASS Matrix plyr precrec Rcpp RcppArmadillo RcppParallel]; }; + diggit = derive2 { name="diggit"; version="1.30.0"; sha256="0w3m7azy7r2bf9z8sdf7lz7jhnzg9hks4zxrjn30yq6hh8qs53gs"; depends=[Biobase ks viper]; }; + dir_expiry = derive2 { name="dir.expiry"; version="1.6.0"; sha256="1ix31jcfi3dg12pa0sz4k4izwc9rsydy6krl7f949lkam2g7s5f8"; depends=[filelock]; }; + discordant = derive2 { name="discordant"; version="1.22.0"; sha256="1zhnfah6md93d7ksq94xq0462vmcs5gfk1fcs18wwqw3bq967pgb"; depends=[Biobase biwt dplyr gtools MASS Rcpp]; }; + distinct = derive2 { name="distinct"; version="1.10.0"; sha256="09cwkbgvbjbxl7z138fmiyssr8c5sdhlvnn99ga3xm27ma5jj5xv"; depends=[doParallel doRNG foreach ggplot2 limma Matrix Rcpp RcppArmadillo Rfast scater SingleCellExperiment SummarizedExperiment]; }; + dittoSeq = derive2 { name="dittoSeq"; version="1.10.0"; sha256="0sxpwg2cjw70pzdxbdw68nic521w65ryn83mj0pb2m1ncpimin4b"; depends=[colorspace cowplot ggplot2 ggrepel ggridges gridExtra pheatmap reshape2 S4Vectors SingleCellExperiment SummarizedExperiment]; }; + divergence = derive2 { name="divergence"; version="1.14.0"; sha256="1khxmngdqsvn77hfiyz732q4z268qwk0r9ydmipz25lnddb25p7m"; depends=[SummarizedExperiment]; }; + dks = derive2 { name="dks"; version="1.44.0"; sha256="1vg6xlw5ia6r1xycd5hrh6s2nxrkrgi34dsd1kfzhkf11d40ydfh"; depends=[cubature]; }; + dmrseq = derive2 { name="dmrseq"; version="1.18.0"; sha256="1zx62lbj0am85p0c1vk06s7qf8294vk8yyh67nkiqc7xgqqwybyk"; depends=[AnnotationHub annotatr BiocParallel bsseq bumphunter DelayedMatrixStats GenomeInfoDb GenomicRanges ggplot2 IRanges locfit matrixStats nlme outliers RColorBrewer rtracklayer S4Vectors]; }; + doppelgangR = derive2 { name="doppelgangR"; version="1.26.0"; sha256="1qfgfvxj44zyqfcj57lphrqgh7yb3lv807bl9xhg7k2gc3rmy5n1"; depends=[Biobase BiocParallel digest impute mnormt SummarizedExperiment sva]; }; + doseR = derive2 { name="doseR"; version="1.14.0"; sha256="0cpjy8whi7nhpyhyz8k2g70l7rhfpg2xcgclxdasbrj695qy79f0"; depends=[digest edgeR lme4 matrixStats mclust RUnit S4Vectors SummarizedExperiment]; }; + dpeak = derive2 { name="dpeak"; version="1.10.0"; sha256="1cnbvi8x3zjfvbsc71gz8pk7x7fglydhnc8msp6c10sd06blpibs"; depends=[BSgenome IRanges MASS Rcpp]; }; + drawProteins = derive2 { name="drawProteins"; version="1.18.0"; sha256="1gsa1gkpawg5w869syd1anf9j1xz3vd9fxhs170x0jmplvnykgqc"; depends=[dplyr ggplot2 httr readr tidyr]; }; + drugTargetInteractions = derive2 { name="drugTargetInteractions"; version="1.6.0"; sha256="04y6kh1nw8rlinv33pyavwrvz900283kigjakv5az95fwchc7zap"; depends=[AnnotationFilter BiocFileCache biomaRt dplyr ensembldb rappdirs RSQLite S4Vectors UniProt_ws]; }; + dupRadar = derive2 { name="dupRadar"; version="1.28.0"; sha256="107m3y9d123cvh5cxlpd6xibi569jzpj4whn8rsbrmgbrj6qghcr"; depends=[KernSmooth Rsubread]; }; + dyebias = derive2 { name="dyebias"; version="1.58.0"; sha256="1jjy1z4f5yg63ds43nrf9gdsq7vsjblfnqc6c12q63l4qgxvbsw5"; depends=[Biobase marray]; }; + easier = derive2 { name="easier"; version="1.4.0"; sha256="1fdfn9bs8676l87jhbpm24c1gz6i272syfp00qwzj2491vibnndp"; depends=[BiocParallel coin DESeq2 dorothea dplyr easierData ggplot2 ggpubr ggrepel matrixStats progeny quantiseqr reshape2 rlang ROCR rstatix]; }; + easyRNASeq = derive2 { name="easyRNASeq"; version="2.34.0"; sha256="0851zpqhks96l0bqbay15nglycg3l354av77crmbdjgii5573f53"; depends=[Biobase BiocFileCache BiocGenerics BiocParallel biomaRt Biostrings edgeR GenomeInfoDb genomeIntervals GenomicAlignments GenomicRanges IRanges locfit LSD rappdirs Rsamtools S4Vectors ShortRead SummarizedExperiment]; }; + easyreporting = derive2 { name="easyreporting"; version="1.10.0"; sha256="1aaymshvz3pcpqzjv57f55w8jzvm905w1v7q6kfp4phd79zdvba8"; depends=[rlang rmarkdown shiny]; }; + ecolitk = derive2 { name="ecolitk"; version="1.70.0"; sha256="0xvlqfb061a53vqfalz1byrrmc24mdqasm3img1i35izqvxz90bi"; depends=[Biobase]; }; + edge = derive2 { name="edge"; version="2.30.0"; sha256="0sqkzmfxnh4zf2lijaizdv4l07qa0fj75axsw76zzsi1pr91yrbn"; depends=[Biobase MASS qvalue snm sva]; }; + edgeR = derive2 { name="edgeR"; version="3.40.0"; sha256="18vap3qp9blncr4sdl9q1szb4qhm46gldhxy3k3abw9fckcvggwg"; depends=[limma locfit Rcpp]; }; + eds = derive2 { name="eds"; version="1.0.0"; sha256="1jfv281pwr3ibr9rnnf41jj1sfj25k0yaln1h175flxkvvhnisba"; depends=[Matrix Rcpp]; }; + eegc = derive2 { name="eegc"; version="1.24.0"; sha256="1rla8x3w4r7da79kxaijgz804ma3s71xs7hm4xj5ccrvg4rvsr61"; depends=[AnnotationDbi clusterProfiler DESeq2 DOSE edgeR ggplot2 gplots igraph limma org_Hs_eg_db org_Mm_eg_db pheatmap R_utils S4Vectors sna wordcloud]; }; + eiR = derive2 { name="eiR"; version="1.38.0"; sha256="0f9s20b219scx6al1rb8hzq79d40amvc7rg31kvdknfadqsjv5v1"; depends=[BiocGenerics ChemmineR DBI digest RcppAnnoy RCurl RUnit snow snowfall]; }; + eisaR = derive2 { name="eisaR"; version="1.10.0"; sha256="0ilm97h7rwiz7za9n4dwsvk1r7q0fbb5dbb1z13dwal7c367c2a7"; depends=[BiocGenerics edgeR GenomicRanges IRanges limma S4Vectors SummarizedExperiment]; }; + enhancerHomologSearch = derive2 { name="enhancerHomologSearch"; version="1.4.0"; sha256="1mn3v88w465779zjbz2csdx0n9fjb39wnbc0s5004f8q54jsw0k5"; depends=[BiocFileCache BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges httr IRanges jsonlite Matrix motifmatchr Rcpp rtracklayer S4Vectors]; }; + enrichTF = derive2 { name="enrichTF"; version="1.14.0"; sha256="17jzm9x86rdqn59gr79kl9af9l0scaz20xnv7b273xpscwrxi139"; 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.18.3"; sha256="0nzcr23m58z3h0n0frxf26z14j7ilcl4fjy7rqm7f2i1wyld70zl"; depends=[aplot DOSE ggnewscale ggplot2 ggraph ggtree GOSemSim igraph magrittr plyr purrr RColorBrewer reshape2 rlang scatterpie shadowtext yulab_utils]; }; + ensemblVEP = derive2 { name="ensemblVEP"; version="1.40.0"; sha256="1g7574d813p43qcl82vqw8vd3rn485wi3ckb8b6bkjhw09wikb9r"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges S4Vectors SummarizedExperiment VariantAnnotation]; }; + ensembldb = derive2 { name="ensembldb"; version="2.22.0"; sha256="1v1in3imqbwak3v9w99l6hq8kihai5xvpgxvg7imna7jn1w8kmji"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges ProtGenerics Rsamtools RSQLite rtracklayer S4Vectors]; }; + epiNEM = derive2 { name="epiNEM"; version="1.22.0"; sha256="1j41l2qm83cdhm56bnzx0wp31yph7shfxr0kav7wc6dqxkjjhjjf"; depends=[BoolNet e1071 graph gtools igraph latex2exp lattice latticeExtra minet mnem pcalg RColorBrewer]; }; + epialleleR = derive2 { name="epialleleR"; version="1.6.0"; sha256="01g58msm7dnnxgjl2q3c3dfrcw7zvivhvbyxlk3z14y6qcyhn5gq"; depends=[BH BiocGenerics data_table GenomeInfoDb GenomicRanges Rcpp Rhtslib stringi SummarizedExperiment VariantAnnotation zlibbioc]; }; + epidecodeR = derive2 { name="epidecodeR"; version="1.6.0"; sha256="0qfb912xsyp4cvblhpwpa22iziwqz39hfnf8x68d23pnfwnb1v74"; depends=[dplyr EnvStats GenomicRanges ggplot2 ggpubr IRanges rstatix rtracklayer]; }; + epigenomix = derive2 { name="epigenomix"; version="1.38.0"; sha256="0vdrnn2qmcy3znz534m5iynvzw208whcyypw7mhdqvrfzkzb4m4a"; depends=[beadarray Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges MCMCpack Rsamtools S4Vectors SummarizedExperiment]; }; + epigraHMM = derive2 { name="epigraHMM"; version="1.6.0"; sha256="1pi1mm0m9pzsjm84na046gl4xr9f0jn95mwq8zpg239yj4wa6898"; 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.13.0"; sha256="1p5sgb438yj6h0fv0v17dhz1pl32vai5zcbmgpgagrd5829a6a7r"; depends=[data_table doParallel foreach GenomicRanges ggplot2 igraph IRanges pheatmap qvalue ReactomePA Rtsne S4Vectors WGCNA]; }; + epimutacions = derive2 { name="epimutacions"; version="1.2.0"; sha256="1anpx122fcrwldkv5bz5c1cmf6a7y1ai8pc5wjpch7c0nim4a8xg"; depends=[AnnotationDbi AnnotationHub BiocGenerics BiocParallel biomaRt bumphunter ensembldb epimutacionsData ExperimentHub GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel gridExtra Gviz Homo_sapiens IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest IRanges isotree matrixStats minfi purrr reshape2 robustbase rtracklayer S4Vectors SummarizedExperiment tibble TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; }; + epistack = derive2 { name="epistack"; version="1.4.0"; sha256="06z380js0hgnps8nkfrk2ay7s8fyqbndipavk5ipihbp80yzmgpx"; depends=[BiocGenerics GenomicRanges IRanges plotrix S4Vectors SummarizedExperiment viridisLite]; }; + epistasisGA = derive2 { name="epistasisGA"; version="1.0.0"; sha256="1qgq3j71sr0rlbp0h9xniy4nhsi9dhlxqky78fk2dwly27fqlrni"; depends=[batchtools BiocParallel data_table ggplot2 igraph matrixStats qgraph Rcpp RcppArmadillo survival]; }; + epivizr = derive2 { name="epivizr"; version="2.28.0"; sha256="13y9wc28fkn2zvl68qf1jwxcd3kph98iyfw6p7i7c3ghsphmml56"; depends=[bumphunter epivizrData epivizrServer GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + epivizrChart = derive2 { name="epivizrChart"; version="1.20.0"; sha256="1yr03i5da7nwyg750ikm6m10x9w4pi34s19xszg87qh2hd15h2ll"; depends=[BiocGenerics epivizrData epivizrServer htmltools rjson]; }; + epivizrData = derive2 { name="epivizrData"; version="1.26.0"; sha256="0g68ncr2gxzb6s98aal7fb64bpbyzfya9bv6b6n0kqv6xvvm88yb"; depends=[Biobase ensembldb epivizrServer GenomeInfoDb GenomicFeatures GenomicRanges IRanges OrganismDbi S4Vectors SummarizedExperiment]; }; + epivizrServer = derive2 { name="epivizrServer"; version="1.26.0"; sha256="1db4hgnal7lrzp8b3dmsqv8z4ddw0lsgjmivl1s5dihvnmpsj1k8"; depends=[httpuv mime R6 rjson]; }; + epivizrStandalone = derive2 { name="epivizrStandalone"; version="1.26.0"; sha256="0g5qpw9kcsrrqi86h0pz4jlz82h3czs34hpxzz0b2bnqrx44ys5m"; depends=[BiocGenerics epivizr epivizrServer GenomeInfoDb GenomicFeatures git2r S4Vectors]; }; + erccdashboard = derive2 { name="erccdashboard"; version="1.32.0"; sha256="12wvbikm11kyvy81gyw513q2mjh4vai0l8lwdnaazan1x1k8pgr8"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr qvalue reshape2 ROCR scales stringr]; }; + erma = derive2 { name="erma"; version="1.14.0"; sha256="06zxqzbzb0jrk357900gv1r2n81i49rbmrxla02f879kq2ik9cyd"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel GenomeInfoDb GenomicFiles GenomicRanges ggplot2 Homo_sapiens IRanges rtracklayer S4Vectors shiny SummarizedExperiment]; }; + esATAC = derive2 { name="esATAC"; version="1.20.0"; sha256="1ndv5102aycv5swi08c9gvy66cpx2p2k18bncbl134y1c9ss86fk"; depends=[AnnotationDbi BiocGenerics BiocManager Biostrings BSgenome ChIPseeker clusterProfiler corrplot digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 igraph IRanges JASPAR2018 knitr magrittr motifmatchr pipeFrame R_utils Rbowtie2 Rcpp rJava rmarkdown Rsamtools rtracklayer S4Vectors ShortRead TFBSTools VennDiagram]; }; + escape = derive2 { name="escape"; version="1.8.0"; sha256="1wb8876506m5bprzbkp6zfa3mv87qyadkffv6ph5m207ixwx502d"; depends=[BiocParallel broom data_table dplyr ggplot2 ggridges GSEABase GSVA Matrix MatrixGenerics msigdbr patchwork reshape2 rlang SingleCellExperiment stringr SummarizedExperiment UCell]; }; + esetVis = derive2 { name="esetVis"; version="1.24.0"; sha256="1vnld99li8a5391k185q0xf5fl00q0k76dk9k95b4nx2zmajs7sv"; depends=[Biobase hexbin MASS MLP mpm Rtsne]; }; + eudysbiome = derive2 { name="eudysbiome"; version="1.28.0"; sha256="0q6x3nlvarhgc1fq5j4h7hxq5dcmfm0fgm3lmgz63bcbpsf60n5g"; depends=[Biostrings plyr R_utils Rsamtools]; }; + evaluomeR = derive2 { name="evaluomeR"; version="1.14.0"; sha256="0wjmm2wzqprn0v0vn90cc3b3wsa274b305p661fdpsql4714jmrq"; depends=[class cluster corrplot flexmix fpc ggdendro ggplot2 kableExtra MASS matrixStats mclust MultiAssayExperiment plotrix prabclus randomForest Rdpack reshape2 SummarizedExperiment]; }; + exomeCopy = derive2 { name="exomeCopy"; version="1.44.0"; sha256="11a95rpqzc5502s75ar703bv9hisgfx7yqdf03n0q1qh6ykil35g"; depends=[GenomeInfoDb GenomicRanges IRanges Rsamtools]; }; + exomePeak2 = derive2 { name="exomePeak2"; version="1.10.0"; sha256="1j8l3q5bq3yb1889vjpk8l9qzrmg7lv38m7jb57cb9q67sflqjzs"; depends=[BiocGenerics BiocParallel Biostrings BSgenome DESeq2 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges magrittr mclust Rsamtools rtracklayer S4Vectors speedglm SummarizedExperiment]; }; + extraChIPs = derive2 { name="extraChIPs"; version="1.2.2"; sha256="1cshpsbabzhz36c9vvzlpmbqlaqgy7x1sah2ikgdh8rzgqny65gk"; depends=[BiocIO BiocParallel broom ComplexUpset csaw dplyr edgeR EnrichedHeatmap forcats GenomeInfoDb GenomicInteractions GenomicRanges ggforce ggplot2 ggrepel ggside glue Gviz InteractionSet IRanges limma RColorBrewer rlang Rsamtools rtracklayer S4Vectors scales stringr SummarizedExperiment tibble tidyr tidyselect vctrs VennDiagram]; }; + fCCAC = derive2 { name="fCCAC"; version="1.24.0"; sha256="1r4rdbv1xv8rwsna8w89fzd76hzspf825fxzcn475ll31gmsxsrv"; depends=[ComplexHeatmap fda genomation GenomicRanges ggplot2 IRanges RColorBrewer S4Vectors]; }; + fCI = derive2 { name="fCI"; version="1.28.0"; sha256="1jiws5q3ppq0z0s71nhb6fs63470v2di45y0gdf7anjnpxgjcjq9"; depends=[FNN gtools psych rgl VennDiagram zoo]; }; + fabia = derive2 { name="fabia"; version="2.44.0"; sha256="1fjysjnanjpaywcb4jk8n66mjc3ffn4jscvwqfkpjh7d757xc716"; depends=[Biobase]; }; + factDesign = derive2 { name="factDesign"; version="1.74.0"; sha256="1wimcf0xnrpfahda9lj90xqcnq76yw7swbgasrdinay37a3dv0ki"; depends=[Biobase]; }; + factR = derive2 { name="factR"; version="1.0.0"; sha256="1ql328w2g6ds74vby36h4d9c7drwby2ah82mqgkjbqw01qr6gk75"; depends=[BiocGenerics BiocParallel Biostrings crayon data_table dplyr drawProteins GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges pbapply purrr RCurl rlang rtracklayer S4Vectors stringr tibble tidyr wiggleplotr XML]; }; + famat = derive2 { name="famat"; version="1.8.0"; sha256="1l54ggmqbwj0p3zwln237pggalykmkd46jddaz85gvfhv664bvfn"; depends=[BiasedUrn clusterProfiler dplyr DT GO_db gprofiler2 KEGGREST magrittr mgcv ontologyIndex org_Hs_eg_db plotly reactome_db rWikiPathways shiny shinyBS shinydashboard stringr tidyr]; }; + farms = derive2 { name="farms"; version="1.50.0"; sha256="1zd5f6prz2g00nvchfx4zaw3v722dn9149y205n3c0zv5q6p4w70"; depends=[affy Biobase MASS]; }; + fastLiquidAssociation = derive2 { name="fastLiquidAssociation"; version="1.34.0"; sha256="0c85gwdbkw6z8xli3c7q6smwpalllr3ad4x5j40mjndnqrl0pzmm"; depends=[doParallel Hmisc impute LiquidAssociation preprocessCore WGCNA]; }; + fastreeR = derive2 { name="fastreeR"; version="1.2.0"; sha256="04srd57vv4hhrqbysjh0v9cdhchixif4rkl10aqfjflyw72q5his"; depends=[ape data_table dynamicTreeCut R_utils rJava stringr]; }; + fastseg = derive2 { name="fastseg"; version="1.44.0"; sha256="1m1x7xmbxwa15vzd45h16pnib944f20pwinx1pyhba5hcngkikfi"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors]; }; + fcScan = derive2 { name="fcScan"; version="1.12.0"; sha256="0z83ncjxw9x8nvc6pncrvpf6lmamvgrv56j96s1f0x9jydk18chy"; depends=[doParallel foreach GenomicRanges IRanges plyr rtracklayer SummarizedExperiment VariantAnnotation]; }; + fcoex = derive2 { name="fcoex"; version="1.12.0"; sha256="01k8v41yqrlcq8x9aaxjfxd477g219jlawnjm2c6k34028ybsc52"; depends=[clusterProfiler data_table dplyr FCBF ggplot2 ggrepel igraph intergraph Matrix network pathwayPCA progress scales SingleCellExperiment sna stringr]; }; + fdrame = derive2 { name="fdrame"; version="1.70.0"; sha256="1p382fak15w2ny5kbvlwdl8iyi28y1avrsl0xk0ds4a0njljxp06"; depends=[]; }; + fedup = derive2 { name="fedup"; version="1.6.0"; sha256="0x0y32zr2h0x8ziv6z0q3dyalpbc4xbd3axqgdqf70mapf8wa5gc"; depends=[data_table dplyr forcats ggplot2 ggthemes openxlsx RColorBrewer RCy3 tibble]; }; + ffpe = derive2 { name="ffpe"; version="1.42.0"; sha256="0r0xw11c14bkzwis8ppfm8s6mw6k9fx14bnp4r02bcjgq5ih1jvq"; depends=[affy Biobase BiocGenerics lumi methylumi sfsmisc TTR]; }; + fgga = derive2 { name="fgga"; version="1.6.0"; sha256="18c2klg52kmnx0rrb3n0y12l1xq9yl0krjpzifb3i1gl7k66clcf"; depends=[BiocFileCache curl e1071 graph gRbase jsonlite RBGL]; }; + fgsea = derive2 { name="fgsea"; version="1.24.0"; sha256="1frl5mchbrgqyxxdlw76qqq5i8vv2fdmy8xl8h8c8cvvmlz393qk"; depends=[BH BiocParallel cowplot data_table fastmatch ggplot2 Matrix Rcpp]; }; + fishpond = derive2 { name="fishpond"; version="2.4.0"; sha256="112jd53wbiv1w0n8dc4qn6257wbbbg5i20s9wlvaw98jma94afa6"; depends=[abind GenomicRanges gtools IRanges jsonlite Matrix matrixStats qvalue S4Vectors SingleCellExperiment SummarizedExperiment svMisc]; }; + flagme = derive2 { name="flagme"; version="1.54.0"; sha256="112vib2g3cvniqn800pn2ifalp5q2l1l7mvqfq8zhwp64i6qxivm"; depends=[CAMERA gcspikelite gplots MASS SparseM xcms]; }; + flowAI = derive2 { name="flowAI"; version="1.28.0"; sha256="18zrlnjw89iglxhw65ys8x4r44pdzp5chrgwx7w44sh7yd8576g9"; depends=[changepoint flowCore ggplot2 knitr plyr RColorBrewer reshape2 rmarkdown scales]; }; + flowBeads = derive2 { name="flowBeads"; version="1.36.0"; sha256="1ng2c0vm2qldipzjnks2qyv9ngwc489jwqfsa4kfiyvhm5dwm1hw"; depends=[Biobase flowCore knitr rrcov xtable]; }; + flowBin = derive2 { name="flowBin"; version="1.34.0"; sha256="1d6bkidvxw76jj8c64d2r0bggxss3xyy97w3qrhix8613w63adcs"; depends=[BiocGenerics class flowCore flowFP limma snow]; }; + flowCHIC = derive2 { name="flowCHIC"; version="1.32.0"; sha256="18mcywl4857wmka63rcnvp2xvh8wj5r8gvbsri9a3f4190wg8yn9"; depends=[EBImage flowCore ggplot2 hexbin vegan]; }; + flowCL = derive2 { name="flowCL"; version="1.35.0"; sha256="1jxr0zn3fgm5nqishssxh332mmxfz3fc9zgshn0lbq4avxc2x128"; depends=[graph Rgraphviz]; }; + flowClean = derive2 { name="flowClean"; version="1.36.0"; sha256="1wqwq8fw0dk78l43p4cjzll3psc0d4mg7gjckddvpmzlg6w4ha3k"; depends=[bit changepoint flowCore sfsmisc]; }; + flowClust = derive2 { name="flowClust"; version="3.36.0"; sha256="1l1lfgm6x06gyzda36m6gvqmb91zbrz8m83b1fnfzpxkhqha20yq"; depends=[Biobase BiocGenerics flowCore graph]; }; + flowCore = derive2 { name="flowCore"; version="2.10.0"; sha256="0j0ryyz3vcih964is5gdm2jp39ssdli9q6r03q6rj9nwzplq5asj"; depends=[BH Biobase BiocGenerics cpp11 cytolib matrixStats Rcpp RProtoBufLib S4Vectors]; }; + flowCut = derive2 { name="flowCut"; version="1.8.0"; sha256="0p66wcr940m5nvl024izqn3w0x6zmp0n7j43xj70arfcxrxp9gxd"; depends=[Cairo e1071 flowCore flowDensity]; }; + flowCyBar = derive2 { name="flowCyBar"; version="1.34.0"; sha256="1nbg49s18mxvr5pzv4lx4hvdrwxn5spagxn71zid5kgk13f142a6"; depends=[gplots vegan]; }; + flowDensity = derive2 { name="flowDensity"; version="1.32.0"; sha256="1gflq7s7akfjha7ijddgh9qshzwi1yhgp2s5p6gll0rsfaicaxs9"; depends=[car flowCore flowViz flowWorkspace gplots RFOC rgeos sp]; }; + flowFP = derive2 { name="flowFP"; version="1.56.3"; sha256="04f67vnn2ccxp8mw2sk2riqh0v4hk46fz1i66jsdp6j1vd650r7y"; depends=[Biobase BiocGenerics flowCore flowViz]; }; + flowGraph = derive2 { name="flowGraph"; version="1.6.0"; sha256="1srpzkvk69v90bqxz9mivfp69zvn45x6jbgvfnxwq0yz3s6x95is"; depends=[data_table effsize furrr future ggiraph ggplot2 ggrepel gridExtra htmlwidgets igraph Matrix matrixStats purrr Rdpack stringi stringr visNetwork]; }; + flowMap = derive2 { name="flowMap"; version="1.36.0"; sha256="11dvjmbyv46l55cp4jklqwx4000xhc3pxmwrpa1z2sbladmd9hiq"; depends=[abind ade4 doParallel Matrix reshape2 scales]; }; + flowMatch = derive2 { name="flowMatch"; version="1.34.0"; sha256="1c0qxypv5814m9fwrpzl44hii8fcn35xmj6wyimclnar3q0r4rs6"; depends=[Biobase flowCore Rcpp]; }; + flowMeans = derive2 { name="flowMeans"; version="1.58.0"; sha256="1hmr2i5svg1wvdgqhnp25k1c21p2pdd0ia9py5kp9sm5qvc9vngw"; depends=[Biobase feature flowCore rrcov]; }; + flowMerge = derive2 { name="flowMerge"; version="2.46.0"; sha256="1sr1icmkd27k7zzykwml44aqkk6fk1p697ndw9qsw6vvv0zp4d1n"; depends=[feature flowClust flowCore foreach graph Rgraphviz rrcov snow]; }; + flowPeaks = derive2 { name="flowPeaks"; version="1.44.0"; sha256="0n3sbb9acvj5srrlxv58n858s9nns62y0pj46pplx5gv7i8hxbcp"; depends=[]; }; + flowPloidy = derive2 { name="flowPloidy"; version="1.24.0"; sha256="0x6cd0ng39jgwd3hxwfwqkk3grqb3dalv84yyp7cfc0y64nkpv64"; depends=[car caTools flowCore knitr minpack_lm rmarkdown shiny]; }; + flowPlots = derive2 { name="flowPlots"; version="1.46.0"; sha256="1vqx2qww5y5p1mcv99qlm1k077gnd4dwmi83ax31rz5kqip2g7b0"; depends=[]; }; + flowSpecs = derive2 { name="flowSpecs"; version="1.12.0"; sha256="1xf0mf9s0srn7ch5hkl37d5igp20pi8jl52b06azdblqsgv3h0cr"; depends=[Biobase BiocGenerics BiocParallel flowCore ggplot2 reshape2 zoo]; }; + flowStats = derive2 { name="flowStats"; version="4.10.0"; sha256="10xq0rfnshvam2yh34566ywmsby44aa1fg8wqwmllm202rhcgl2p"; depends=[Biobase BiocGenerics cluster corpcor fda flowCore flowViz flowWorkspace KernSmooth ks lattice MASS mnormt ncdfFlow RColorBrewer rrcov]; }; + flowTime = derive2 { name="flowTime"; version="1.22.2"; sha256="0qmd2a50qy1fldqhp25nzafxi0jv7x2v2fhpmfckwn0qwkg3splp"; depends=[dplyr flowCore magrittr plyr rlang tibble]; }; + flowTrans = derive2 { name="flowTrans"; version="1.50.0"; sha256="0adhha052by515v43z5kvcr4hzv6z1mhx3jry1x4x75zj51wj8pm"; depends=[flowClust flowCore flowViz]; }; + flowVS = derive2 { name="flowVS"; version="1.30.0"; sha256="0sv05dzcik2qqvja0ag3ag3qpg5r89rzynil81z5m3b62xq1i6nz"; depends=[flowCore flowStats flowViz]; }; + flowViz = derive2 { name="flowViz"; version="1.62.0"; sha256="0yz2b3l0bv5i7vrr893wrs3jl215i17m2hr92iisdc6mh9i0lpz8"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; }; + flowWorkspace = derive2 { name="flowWorkspace"; version="4.10.0"; sha256="07w2pnnzmivfc621c8pvndqrn1k245cwjrb0nnk2i85i3si4j9c3"; depends=[BH Biobase BiocGenerics cpp11 cytolib data_table DelayedArray dplyr flowCore ggplot2 graph matrixStats ncdfFlow RBGL Rgraphviz Rhdf5lib RProtoBufLib S4Vectors scales XML]; }; + flowcatchR = derive2 { name="flowcatchR"; version="1.32.0"; sha256="1flq3n3j57yxq00dqqwl45xxacw7qgn2raqmnczgnsflihyysldz"; depends=[abind BiocParallel colorRamps EBImage plotly shiny]; }; + fmcsR = derive2 { name="fmcsR"; version="1.40.0"; sha256="00xi01wz61ip8pnbrpnpp8hncb8gyiw69qkbg0cl425rv6qjb3mr"; depends=[BiocGenerics ChemmineR RUnit]; }; + fmrs = derive2 { name="fmrs"; version="1.8.0"; sha256="1nw7ibbqw30p9mj3vi7pd3ixry6fwai02mg3rys48bld0aipw21l"; depends=[survival]; }; + fobitools = derive2 { name="fobitools"; version="1.6.0"; sha256="0i3bdg22750hf9l3hkgz5vjq0ysvr99571zrdabmq7m54788fl9w"; depends=[clisymbols crayon dplyr fgsea ggplot2 ggraph magrittr ontologyIndex purrr RecordLinkage stringr textclean tictoc tidygraph tidyr vroom]; }; + frenchFISH = derive2 { name="frenchFISH"; version="1.10.0"; sha256="1iylq196bl7ysypvcfqpp5gz5c8ax79p3icbyl31cxmj9ssf486a"; depends=[MCMCpack NHPoisson]; }; + frma = derive2 { name="frma"; version="1.50.0"; sha256="0pn8b7fgz1ys3pm603ya6nkngbc9q8dsx3zxijdzf1v0b1sm1fi1"; depends=[affy Biobase BiocGenerics DBI MASS oligo oligoClasses preprocessCore]; }; + frmaTools = derive2 { name="frmaTools"; version="1.50.0"; sha256="0j6z94icgs9j1ryxr1a2fv9p14nzl3zy695fbc6d87gm0ccjy745"; depends=[affy Biobase DBI preprocessCore]; }; + funtooNorm = derive2 { name="funtooNorm"; version="1.22.0"; sha256="0qf2c28r6jv4cf8qpag4zi8k64b5x3mqs9jc6g8iy9v6323vdcpy"; depends=[GenomeInfoDb IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest matrixStats minfi pls]; }; + gCrisprTools = derive2 { name="gCrisprTools"; version="2.4.0"; sha256="0rmxrvb97844qjis945drmk3z63ks89c587ysxc1ldka503za7rj"; depends=[Biobase ComplexHeatmap ggplot2 limma rmarkdown RobustRankAggreg SummarizedExperiment]; }; + gaga = derive2 { name="gaga"; version="2.44.0"; sha256="19sjqlrjxcphs5a3mzwr0a7a504ap2zpwnzlrzmhad7v1dgicn5g"; depends=[Biobase coda EBarrays mgcv]; }; + gage = derive2 { name="gage"; version="2.48.0"; sha256="08qvg1cmrln7w5z33r81kz1zjs8fcj3qbxm1crbsazvb6gdpqyyi"; depends=[AnnotationDbi GO_db graph KEGGREST]; }; + gaggle = derive2 { name="gaggle"; version="1.66.0"; sha256="16w40jkaz1nhvzwg3q62mzigh9kpvhhyky1bnz2bwjbl49fspvqg"; depends=[graph rJava RUnit]; }; + garfield = derive2 { name="garfield"; version="1.26.0"; sha256="0cm2lg9qsnlp60i3rc2c4d6xc73r285rznkgdkw646c62s48lhs8"; depends=[]; }; + gcapc = derive2 { name="gcapc"; version="1.22.0"; sha256="1n3g6fvj86q9n6q3ccmj6ns0gdd4sqfdm43sh1hpxkid9v88209y"; depends=[BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS matrixStats Rsamtools S4Vectors]; }; + gcatest = derive2 { name="gcatest"; version="1.28.0"; sha256="0c92g636x8kcsypw8slmnib472prh7mqbkn1wn5silprs6akfg9g"; depends=[lfa]; }; + gcrma = derive2 { name="gcrma"; version="2.70.0"; sha256="0a3wjwjgjkpmfvgg0b4jc1rkwzsqrjbaziydjfnkll4rw9xcavy1"; depends=[affy affyio Biobase BiocManager Biostrings XVector]; }; + gdsfmt = derive2 { name="gdsfmt"; version="1.34.0"; sha256="1ck3qq4vhjp6vvicpldr7d2rkpspp5albjkbqjbshnbq11fhrk06"; depends=[]; }; + geNetClassifier = derive2 { name="geNetClassifier"; version="1.38.0"; sha256="1ahlml1ssjmg126ki1phdprq4v0nawzbbfq8jray5ypaj32qx3r2"; depends=[Biobase e1071 EBarrays minet]; }; + gemini = derive2 { name="gemini"; version="1.12.0"; sha256="12p44p3nzn32am2m609k64iy4lfj42dygdxmb770ld8lpihhrkmz"; depends=[dplyr ggplot2 magrittr mixtools pbmcapply scales]; }; + gemma_R = derive2 { name="gemma.R"; version="1.0.0"; sha256="1xgjms6hk4b0ilm769abqkvqs3zs6za1kbg2banl1z99b5ksvyqf"; depends=[Biobase bit64 data_table glue httr jsonlite lubridate magrittr memoise rappdirs rlang S4Vectors stringr SummarizedExperiment tibble tidyr]; }; + genArise = derive2 { name="genArise"; version="1.74.0"; sha256="19yrrmqb83zg075cbwfb2k3s96fvhl19bhjc5v9xva12k3n14dxh"; depends=[locfit tkrplot xtable]; }; + genbankr = derive2 { name="genbankr"; version="1.26.0"; sha256="06nkwpsaqrmja9731d3i420f1i8v3vzq20ih44cwxnd7a0zja288"; depends=[Biobase BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges rtracklayer S4Vectors VariantAnnotation]; }; + geneAttribution = derive2 { name="geneAttribution"; version="1.24.0"; sha256="00imcb2slqfflcm3jalcjspqv8m9kyfvv1m1nxlxbdaa4qgrn9yx"; depends=[BiocGenerics GenomeInfoDb GenomicFeatures GenomicRanges IRanges org_Hs_eg_db rtracklayer]; }; + geneClassifiers = derive2 { name="geneClassifiers"; version="1.22.0"; sha256="03ccb749frf3pp2rqcyf1jly7rpld3nrg61507xvk3x841nxnas4"; depends=[Biobase BiocGenerics]; }; + geneRecommender = derive2 { name="geneRecommender"; version="1.70.0"; sha256="0iki40fg9mdkj131sc3f4wj6b4mz0jidpbzyxskcdm4l81ar8amv"; depends=[Biobase]; }; + geneRxCluster = derive2 { name="geneRxCluster"; version="1.34.0"; sha256="0amxn2gw2k4hvhxy446v7f4s4jcgm5mrv1l1afv3svmlpq57llrb"; depends=[GenomicRanges IRanges]; }; + geneXtendeR = derive2 { name="geneXtendeR"; version="1.24.0"; sha256="0b0p0p00261g296a0bwzl9fnmd5gky8l3dd33l8a4v5p08kfciz9"; depends=[AnnotationDbi BiocStyle data_table dplyr GO_db networkD3 org_Rn_eg_db RColorBrewer rtracklayer SnowballC tm wordcloud]; }; + genefilter = derive2 { name="genefilter"; version="1.80.1"; sha256="0zi53qi0qxcndf4305vknywgclbz7fm96sgl9vr4gf7725ji4j0i"; depends=[annotate AnnotationDbi Biobase BiocGenerics survival]; }; + genefu = derive2 { name="genefu"; version="2.30.0"; sha256="0s10bz0iis6kwbb9ss9m0bz7al52yq9r0i9gcn8zvzb3533zr5mk"; depends=[AIMS amap biomaRt iC10 impute limma mclust survcomp]; }; + geneplast = derive2 { name="geneplast"; version="1.24.0"; sha256="161bgb6b4bq923zpjla4z8c0xw4q754igimpf7kv8kqnbpnmncx1"; depends=[ape data_table igraph snow]; }; + geneplotter = derive2 { name="geneplotter"; version="1.76.0"; sha256="094v4skdvsnc7bp3acj801ih022w9k96f2b857326vd19khz0ava"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; }; + genoCN = derive2 { name="genoCN"; version="1.50.0"; sha256="1m53f6yd692rsrhhr1kq4mwv13kmjlkq8cvcbkn736vbpq07j743"; depends=[]; }; + genomation = derive2 { name="genomation"; version="1.30.0"; sha256="098ldnh45f48145jfsbdw5dqv5yiqkfci1fy6h6gjz7nh3dvnil5"; depends=[Biostrings BSgenome data_table GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges matrixStats plotrix plyr Rcpp readr reshape2 Rsamtools rtracklayer S4Vectors seqPattern]; }; + genomeIntervals = derive2 { name="genomeIntervals"; version="1.54.0"; sha256="0kl280hdqiqkzb21l4z49jkidvr8s5bzdxpl38ci8ljia5imi38y"; depends=[BiocGenerics GenomeInfoDb GenomicRanges intervals IRanges S4Vectors]; }; + genomes = derive2 { name="genomes"; version="3.28.0"; sha256="1lsmcz2l4mv62q7w2rncb0m92jwhz4p05yfqqk0apjv1hffc3y9j"; depends=[curl readr]; }; + genomicInstability = derive2 { name="genomicInstability"; version="1.4.0"; sha256="0553wd872zlfwqily7pww9frpn40jqp8i0hgg8sf1qmjn9apj24f"; depends=[checkmate mixtools SummarizedExperiment]; }; + genotypeeval = derive2 { name="genotypeeval"; version="1.30.0"; sha256="0mi1d86i4v8gafwszy978n61s5pszrsmbh1in4nggdqwvwnvkqnl"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer VariantAnnotation]; }; + gep2pep = derive2 { name="gep2pep"; version="1.18.0"; sha256="1bijky1qjp5nw3w27nsl9w4bq41zqx98ki7w2s3mz0qz6hwahnw1"; depends=[Biobase digest foreach GSEABase iterators repo rhdf5 XML]; }; + gespeR = derive2 { name="gespeR"; version="1.30.0"; sha256="0mrfc7mfb7q2vlw4bppjgpgna4h7s3sidiv5lpjqxbi6cmva6ka0"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; }; + getDEE2 = derive2 { name="getDEE2"; version="1.8.0"; sha256="1yclldn6hfjdbb5gc6q2kdfz65hxx2ija3apramvhwcbq2h1ygpp"; depends=[htm2txt SummarizedExperiment]; }; + geva = derive2 { name="geva"; version="1.6.0"; sha256="00vkg5gil1jr1hv1swccxhs9iyrn2vjrggrf04y6svfqcs3h9hh8"; depends=[dbscan fastcluster matrixStats]; }; + ggbio = derive2 { name="ggbio"; version="1.46.0"; sha256="1gm3y1nx0ah8wcrg2dh1xd688izm2sijz7bhgsasxckmmkmkp60g"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings biovizBase BSgenome ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 rlang Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; }; + ggcyto = derive2 { name="ggcyto"; version="1.26.3"; sha256="0ml07pj1pimr7gd0hv814aarg0g8xndq1j4yn3p8x01c2drrrlzw"; depends=[data_table flowCore flowWorkspace ggplot2 gridExtra hexbin ncdfFlow plyr RColorBrewer rlang scales]; }; + ggmanh = derive2 { name="ggmanh"; version="1.2.0"; sha256="1igvm20k3y0kfa5ia45ynyp9d90c5czjbdz95dvj1gzjy7ql5c4j"; depends=[gdsfmt ggplot2 ggrepel RColorBrewer rlang scales SeqArray]; }; + ggmsa = derive2 { name="ggmsa"; version="1.4.0"; sha256="0pqxf7dlb403xj4d5s683k5zdakwgq3ic98lk43dl0ib19mg3dih"; depends=[aplot Biostrings dplyr ggalt ggforce ggplot2 ggtree magrittr R4RNA RColorBrewer seqmagick statebins tidyr]; }; + ggspavis = derive2 { name="ggspavis"; version="1.4.0"; sha256="00s1xadh164adziszqjfzcznjjpbcf805xshp0c8qr24g0d86jim"; depends=[ggplot2 ggside SingleCellExperiment SpatialExperiment SummarizedExperiment]; }; + ggtree = derive2 { name="ggtree"; version="3.6.2"; sha256="177nq6arhxp0x6zsf2c6cn3xxwfk65dihbpni6mb9ifgnmfqdjmx"; depends=[ape aplot cli dplyr ggfun ggplot2 magrittr purrr rlang scales tidyr tidytree treeio yulab_utils]; }; + ggtreeDendro = derive2 { name="ggtreeDendro"; version="1.0.0"; sha256="1i562x3f28wm5ac5izzpriwh9ywqq40zbbv5g70vjyqcwsh35wh4"; depends=[ggplot2 ggtree tidytree]; }; + ggtreeExtra = derive2 { name="ggtreeExtra"; version="1.8.1"; sha256="0sbjkljv8zj5plr4az5hiz2m0bjnqfgrwcd02rmlrnxhbzj2kcj6"; depends=[cli ggnewscale ggplot2 ggtree rlang tidytree]; }; + girafe = derive2 { name="girafe"; version="1.50.0"; sha256="0kv6s77fs6rgrrv5hcr8qc86ida0qrwcfzby2xcyris0fk56k5sc"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; }; + glmGamPoi = derive2 { name="glmGamPoi"; version="1.10.0"; sha256="12jbqigg4k2ngrk2anbrrxrwkp57bbzdz492lg8lc6w1gygp5yip"; depends=[beachmat BiocGenerics DelayedArray DelayedMatrixStats HDF5Array MatrixGenerics matrixStats Rcpp RcppArmadillo rlang SingleCellExperiment SummarizedExperiment]; }; + glmSparseNet = derive2 { name="glmSparseNet"; version="1.16.0"; sha256="1573cclc2qn4mhw24k7ab75a9inc7z205b0j85favmvv1zcyqal4"; depends=[biomaRt digest dplyr forcats futile_logger futile_options ggplot2 glmnet glue httr Matrix MultiAssayExperiment readr reshape2 stringr SummarizedExperiment survminer]; }; + globalSeq = derive2 { name="globalSeq"; version="1.26.0"; sha256="0l4n755v8gxxrxqgzhks4yz06rr3m703zaaavh0fyryk2mnijpip"; depends=[]; }; + globaltest = derive2 { name="globaltest"; version="5.52.0"; sha256="1qcrs7dasb1aaws3zkiipznlc1z6i7zijhcsfv6hw3d9wpb0np9k"; depends=[annotate AnnotationDbi Biobase survival]; }; + gmapR = derive2 { name="gmapR"; version="1.40.0"; sha256="03fi4ld4f102xch75z6s67kb27mvyg5zik5n59ni4zdiipi9i2cl"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; + gmoviz = derive2 { name="gmoviz"; version="1.10.0"; sha256="0vafsa3i8z08bfl4x0adlg3bf0jdw4a7zb459cw7bfdkkw8g4850"; depends=[BiocGenerics Biostrings circlize colorspace ComplexHeatmap GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gridBase IRanges pracma Rsamtools rtracklayer S4Vectors]; }; + goProfiles = derive2 { name="goProfiles"; version="1.60.0"; sha256="0wkvb79lb309ff6iv8p23z9rwrrv7qha86ngs0ag670mpm9yra5j"; depends=[AnnotationDbi Biobase CompQuadForm GO_db stringr]; }; + goSTAG = derive2 { name="goSTAG"; version="1.22.0"; sha256="06wp18i25c35w651gz9xl9x4yklx52vrz6r5pr5z15pgwjc0n5hy"; depends=[AnnotationDbi biomaRt GO_db memoise]; }; + goSorensen = derive2 { name="goSorensen"; version="1.0.0"; sha256="0vv8wx6213wawr9zvy0x8nlr4cj6ccpgfasynn7qi85hmsx3ygfm"; depends=[clusterProfiler GO_db goProfiles org_Hs_eg_db]; }; + goTools = derive2 { name="goTools"; version="1.72.0"; sha256="1h9aj2n8w7z04jjhd8gabmsvr4ib0vhms3iiry00g3xp68yc8zdg"; depends=[AnnotationDbi GO_db]; }; + goseq = derive2 { name="goseq"; version="1.50.0"; sha256="0x89lv84l3qcahca54njcza326553zij2xyagy18mwlprdrq4iy8"; depends=[AnnotationDbi BiasedUrn BiocGenerics geneLenDataBase GO_db mgcv]; }; + gpls = derive2 { name="gpls"; version="1.70.0"; sha256="0kxk22l9rm4kxlf0mr4zb01nr2vlia1g4xq9fsd6fdn6d535k1ci"; depends=[]; }; + gpuMagic = derive2 { name="gpuMagic"; version="1.14.0"; sha256="02ksc7cls7q8yrcsr0i15i6rb3nyzxapafg0zkwgj55x28gy0q9x"; depends=[BiocGenerics Deriv DescTools digest pryr Rcpp stringr]; }; + granulator = derive2 { name="granulator"; version="1.6.0"; sha256="0im7xhvdxm97hda6zwj22xlcinyjqi2jfykw7mi091z2d0by7rln"; depends=[cowplot dplyr dtangle e1071 epiR ggplot2 ggplotify limSolve magrittr MASS nnls pheatmap purrr rlang tibble tidyr]; }; + graper = derive2 { name="graper"; version="1.14.0"; sha256="12r1h17w9fcjn18kijb40a1hrpxd8acagva5hhzxsfj67q76chnn"; depends=[BH cowplot ggplot2 Matrix matrixStats Rcpp RcppArmadillo]; }; + graph = derive2 { name="graph"; version="1.76.0"; sha256="1hdbxjvgkxb9m341i9qbskb41g2z8qifkhgkpj2xb20s2dnxn3cc"; depends=[BiocGenerics]; }; + graphite = derive2 { name="graphite"; version="1.44.0"; sha256="0gkjab12ncag1vslc5bwlr0m5ac3ifq9ka5nfq7ckrpns98s7k0w"; depends=[AnnotationDbi graph httr purrr rappdirs rlang]; }; + groHMM = derive2 { name="groHMM"; version="1.32.0"; sha256="1as3k6avyc4l7saw02x0ql68c06msvs1s824vc1xg6lkdsi4lsyc"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; }; + gscreend = derive2 { name="gscreend"; version="1.12.0"; sha256="0d8ffg4mis6hy4xx6f8ry5vxd2cilzxws56jqpv8diw0dnvfv1dz"; depends=[BiocParallel fGarch nloptr SummarizedExperiment]; }; + gsean = derive2 { name="gsean"; version="1.18.0"; sha256="0gvir3pdshsv22v2q619lzsi2wwyb5bql3vsgmzc3z1nj6jij0zr"; depends=[fgsea PPInfer]; }; + gtrellis = derive2 { name="gtrellis"; version="1.30.0"; sha256="09f20qam59iwr48g854b7ydbsbqy90mdy83i2i0am4gybv5isgqg"; depends=[circlize GenomicRanges GetoptLong IRanges]; }; + gwascat = derive2 { name="gwascat"; version="2.30.0"; sha256="0sj51cli1p8k7z1nl5rfswjlzrk9cqnpr1a1pr618gk74kfwqf5a"; depends=[AnnotationDbi AnnotationHub BiocFileCache Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges readr S4Vectors snpStats VariantAnnotation]; }; + gwasurvivr = derive2 { name="gwasurvivr"; version="1.16.0"; sha256="0rrcykwn922wwqrz6gayvwid8hpfqms14cgzvnqh9gcwgcjjrica"; depends=[GWASTools matrixStats SNPRelate SummarizedExperiment survival VariantAnnotation]; }; + h5vc = derive2 { name="h5vc"; version="2.32.0"; sha256="09dczq9yl28zy2jih24blxlpsmkphwaks0hlp3yl5ibfwdnihnk9"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra h5vcData IRanges reshape rhdf5 Rhtslib Rsamtools S4Vectors]; }; + hapFabia = derive2 { name="hapFabia"; version="1.40.0"; sha256="09c5ra1smy38w75dqzsamynp8xny6hzb75vn1207hq7z5km8lb9c"; depends=[Biobase fabia]; }; + hca = derive2 { name="hca"; version="1.6.0"; sha256="1z20rlyc4920hdx0npqhbpmplawlwz8d5gyy5rf95g84d6klxs7c"; depends=[BiocFileCache digest dplyr DT httr jsonlite miniUI readr shiny tibble tidyr]; }; + heatmaps = derive2 { name="heatmaps"; version="1.22.0"; sha256="01jvfjfh3ji0f6wf3xwmz0abpm23x1aan7dw0nycm5cm0bxjwgh4"; depends=[BiocGenerics Biostrings EBImage GenomeInfoDb GenomicRanges IRanges KernSmooth Matrix plotrix RColorBrewer]; }; + hermes = derive2 { name="hermes"; version="1.2.0"; sha256="1akh46jvhl63lva8jfpqzckczvdw0yjpkw5c0qnvgxl3sajvbw0n"; depends=[assertthat Biobase BiocGenerics biomaRt checkmate circlize ComplexHeatmap DESeq2 dplyr edgeR EnvStats forcats GenomicRanges ggfortify ggplot2 ggrepel IRanges lifecycle limma magrittr matrixStats MultiAssayExperiment purrr R6 Rdpack rlang S4Vectors SummarizedExperiment tidyr]; }; + hiAnnotator = derive2 { name="hiAnnotator"; version="1.32.0"; sha256="05l07ycm72i2qv7wlbssk1wh3ly961x444hwbpaii8fm65x5a0k2"; depends=[BSgenome dplyr foreach GenomicRanges ggplot2 iterators rtracklayer scales]; }; + hiReadsProcessor = derive2 { name="hiReadsProcessor"; version="1.34.0"; sha256="00m0vkdb552nw0yn6wx01wdvf6g8i33q0wl4ishscmvcwld803vj"; depends=[BiocGenerics BiocParallel Biostrings dplyr GenomicAlignments GenomicRanges hiAnnotator readxl sonicLength]; }; + hierGWAS = derive2 { name="hierGWAS"; version="1.28.0"; sha256="04jbrin7jyj72bfxp3rgmmr796gy2v3mvnb593w9ldq5620az20b"; depends=[fastcluster fmsb glmnet]; }; + hierinf = derive2 { name="hierinf"; version="1.16.0"; sha256="0f8m0wbghwjlavkj4r089z7xix27jnc57d0sddw4hamv9hi6zm95"; depends=[fmsb glmnet]; }; + hipathia = derive2 { name="hipathia"; version="2.14.0"; sha256="0ghav95b2cv0y61m14yq332yzrjhipm01dnc9qvb9zqdnwwqhdj1"; depends=[AnnotationHub coin DelayedArray igraph limma matrixStats MultiAssayExperiment preprocessCore S4Vectors servr SummarizedExperiment]; }; + hmdbQuery = derive2 { name="hmdbQuery"; version="1.18.0"; sha256="12q6cr8fwl298vd2v3cdzm6cjkmwfssn4h1cy3f7ky1n7dkpnw30"; depends=[S4Vectors XML]; }; + hopach = derive2 { name="hopach"; version="2.58.0"; sha256="06qpg76d8ycpgvxfblz4va7i2f705rv3bi19c2lw84vnkmhzdcf6"; depends=[Biobase BiocGenerics cluster]; }; + hpar = derive2 { name="hpar"; version="1.40.0"; sha256="1dls59d2ysk8ngk5c6nx7xqgc2iygbdlzf88gccf2wm8zhy8m3f4"; depends=[]; }; + hummingbird = derive2 { name="hummingbird"; version="1.8.0"; sha256="1glnxhqvdxb1n8xk3pjh68nyg5vqvxszd7q24qir380x8d9ncrpg"; depends=[GenomicRanges IRanges Rcpp SummarizedExperiment]; }; + hypeR = derive2 { name="hypeR"; version="1.14.0"; sha256="0vni4s1rvdjm4l5jaa2kq0i1z87jw09vd1pw63aa0v6qk1vr96vc"; depends=[dplyr ggforce ggplot2 htmltools httr igraph kableExtra magrittr msigdbr openxlsx purrr R6 reactable reshape2 rlang rmarkdown scales shiny stringr visNetwork]; }; + hyperdraw = derive2 { name="hyperdraw"; version="1.50.0"; sha256="1fl4ia2jskvmbwk0y1wd0x4dgqph0av7bx2zffrvd1a5ppcjmsra"; depends=[graph hypergraph Rgraphviz]; }; + hypergraph = derive2 { name="hypergraph"; version="1.70.0"; sha256="1jvnvzjivjwqxh19c3g37kpyl6i6mxw99ma3ypjjgxzx898nsg45"; depends=[graph]; }; + iASeq = derive2 { name="iASeq"; version="1.42.0"; sha256="1v7ax7847ygdy6mxwbg6awy52dms0nirbyn1z0cwsjssvi4q4hd5"; depends=[]; }; + iBBiG = derive2 { name="iBBiG"; version="1.42.0"; sha256="0yhvp522s23y6239v340ilbyaii5qfj7vc76x0j6c56yd807zmhb"; depends=[ade4 biclust xtable]; }; + iBMQ = derive2 { name="iBMQ"; version="1.38.0"; sha256="1k08dslcyfyzyb9zn1r0ddnvrrp2370n4w3762xz1zdsfs7h551k"; depends=[Biobase ggplot2]; }; + iCARE = derive2 { name="iCARE"; version="1.26.0"; sha256="1x47wy0spsfv58b96ys2ym0f3ivs6b68a2h82wyp5viyq7imphbn"; depends=[gtools Hmisc plotrix]; }; + iCNV = derive2 { name="iCNV"; version="1.18.0"; sha256="1j1cvk42l9p2r6n6zhijw26ydwki6fpj8d70592mqhv9m38ms9i3"; depends=[CODEX data_table dplyr fields ggplot2 rlang tidyr truncnorm]; }; + iCOBRA = derive2 { name="iCOBRA"; version="1.26.0"; sha256="0mh7arn5rv26picz05ywil5ynras91xv6diwh47s9ip75vp9s3cy"; depends=[dplyr DT ggplot2 limma markdown reshape2 ROCR scales shiny shinyBS shinydashboard UpSetR]; }; + iCheck = derive2 { name="iCheck"; version="1.28.0"; sha256="0aa76j1vlrhyfppqa91dfzrh5ljxx7zylycrmjy35hx0ja0zck00"; depends=[affy Biobase GeneSelectMMD gplots limma lmtest lumi MASS preprocessCore randomForest rgl scatterplot3d]; }; + iChip = derive2 { name="iChip"; version="1.52.0"; sha256="1c3l24v0hm2dnidg8l9v6gqwrm51pqhw3mjg4x1a4vy1rq3j6jrj"; depends=[limma]; }; + iClusterPlus = derive2 { name="iClusterPlus"; version="1.34.1"; sha256="0k0vl7ddkpdv9y8whkv512jc7a4wxyi00jf393bjdppgjj4yk79s"; depends=[]; }; + iGC = derive2 { name="iGC"; version="1.28.0"; sha256="1knvx7b4h85ldqxq3a54fm05axb8zcvqm5by98wsdz4h6dzikxjh"; depends=[data_table plyr]; }; + iPAC = derive2 { name="iPAC"; version="1.42.0"; sha256="0dsmjqipj871ygjzc8js5xvy5xpfj22853c4a3wdf2qhriw1c0ms"; depends=[Biostrings gdata multtest scatterplot3d]; }; + iPath = derive2 { name="iPath"; version="1.4.0"; sha256="0df426fjw00wawl5an91l59i6k811pi9069ayxv6ysq4vhjk4dwq"; depends=[BiocParallel ggplot2 ggpubr matrixStats mclust Rcpp RcppArmadillo survival survminer]; }; + iSEE = derive2 { name="iSEE"; version="2.10.0"; sha256="1l2bwqk7ivj79xxjzc0hc3x5v5h19zpk9pa0vbpb5p64z1pshnjn"; depends=[BiocGenerics circlize colourpicker ComplexHeatmap DT ggplot2 ggrepel igraph mgcv rintrojs S4Vectors shiny shinyAce shinydashboard shinyjs shinyWidgets SingleCellExperiment SummarizedExperiment vipor viridisLite]; }; + iSEEhex = derive2 { name="iSEEhex"; version="1.0.0"; sha256="06n9ls71rg2kilr3kjlwwk5rnj8v68svjmzcr2hg0gwwyaxcyk9w"; depends=[ggplot2 hexbin iSEE shiny SummarizedExperiment]; }; + iSEEhub = derive2 { name="iSEEhub"; version="1.0.0"; sha256="1ggkm7931axcl0464h0d5cnf5lbd6nx3fbac1zrlkwyb2lym7wi8"; depends=[AnnotationHub BiocManager DT ExperimentHub iSEE rintrojs S4Vectors shiny shinydashboard shinyjs SingleCellExperiment SummarizedExperiment]; }; + iSEEu = derive2 { name="iSEEu"; version="1.10.0"; sha256="0040k9p1bmlg2065s3a124qvx5qgqqs4kgbkkz0k9vsdvr3z87zs"; depends=[colourpicker DT ggplot2 IRanges iSEE iSEEhex S4Vectors shiny shinyAce SingleCellExperiment SummarizedExperiment]; }; + iSeq = derive2 { name="iSeq"; version="1.50.0"; sha256="1h0da0298g2lvvqbys3jh2acjjzh1dvivfpl07g319nafxkfsi1q"; depends=[]; }; + iasva = derive2 { name="iasva"; version="1.16.0"; sha256="192cpnpyyjf16pqnzj70nsqkzv6wp4acia7fciz1zvz5jhncrsva"; depends=[BiocParallel cluster irlba SummarizedExperiment]; }; + ibh = derive2 { name="ibh"; version="1.46.0"; sha256="0kxqpb9711yxg5xz2mhpwjw9nwixmfzzy6qql1sifi4mp6bh2fzf"; depends=[simpIntLists]; }; + icetea = derive2 { name="icetea"; version="1.16.0"; sha256="03v3ymmzj8dbpayjjpxm3cm8c2ysyd2p7yq0hp7lmv8pyq9x05xy"; depends=[BiocGenerics BiocParallel Biostrings csaw DESeq2 edgeR GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges limma Rsamtools rtracklayer S4Vectors ShortRead SummarizedExperiment TxDb_Dmelanogaster_UCSC_dm6_ensGene VariantAnnotation]; }; + ideal = derive2 { name="ideal"; version="1.22.0"; sha256="19byvmqv5bx2s4jsjr317xwpd96miz83gdamw9xx1byzka6wz29m"; depends=[AnnotationDbi base64enc BiocParallel DESeq2 dplyr DT GenomicRanges ggplot2 ggrepel GO_db goseq GOstats gplots heatmaply IHW IRanges knitr limma pcaExplorer pheatmap plotly rentrez rintrojs rlang rmarkdown S4Vectors shiny shinyAce shinyBS shinydashboard stringr SummarizedExperiment topGO UpSetR]; }; + idiogram = derive2 { name="idiogram"; version="1.74.0"; sha256="094n43lv6v1l1hcrfvgyx8a5dp7sk154f25dwrxb0b2k4g2kxdn0"; depends=[annotate Biobase plotrix]; }; + idpr = derive2 { name="idpr"; version="1.8.0"; sha256="06apnwy114hbjmfvyc47zajchhi9l7zmnxbdqx13d9gazj2sigbf"; depends=[Biostrings dplyr ggplot2 jsonlite magrittr plyr rlang]; }; + idr2d = derive2 { name="idr2d"; version="1.12.0"; sha256="1qrrjb67wymak2nl8jisjv5xrp3sjmyx19rr7wrp7ffh84y8dm1b"; depends=[dplyr futile_logger GenomeInfoDb GenomicRanges ggplot2 idr IRanges magrittr reticulate scales stringr]; }; + igvR = derive2 { name="igvR"; version="1.18.0"; sha256="06rnq6miqy5s4fcmlblwsvl0limynsr73s2lzbxd4dly7ypp4d32"; depends=[BiocGenerics BrowserViz GenomicAlignments GenomicRanges httpuv httr RColorBrewer rtracklayer VariantAnnotation]; }; + illuminaio = derive2 { name="illuminaio"; version="0.40.0"; sha256="1cw526mbhh0czkwk99qnr6hfwi4k4xi2bm5p14kw9sr00if59x12"; depends=[base64]; }; + imageHTS = derive2 { name="imageHTS"; version="1.48.0"; sha256="124pksw08b88bj7l8pckzvgk6sf54d633cnbq2r5il7a09i4caim"; depends=[Biobase cellHTS2 e1071 EBImage hwriter vsn]; }; + imcRtools = derive2 { name="imcRtools"; version="1.4.2"; sha256="0d3gcqq1jc7h9mvhvmyf5b524pyd9cqnwx2ci2y75l81jqyqb0hb"; depends=[abind BiocNeighbors BiocParallel concaveman cytomapper data_table distances dplyr DT EBImage ggplot2 ggraph igraph magrittr MatrixGenerics pheatmap readr RTriangle S4Vectors scuttle sf SingleCellExperiment SpatialExperiment stringr SummarizedExperiment tidygraph tidyselect viridis vroom]; }; + immunoClust = derive2 { name="immunoClust"; version="1.30.0"; sha256="0isqbgg5bmxlcw4nhhsz2dgpzhjkyz690kgj4qbrx00k0xq1wkn4"; depends=[flowCore lattice]; }; + immunotation = derive2 { name="immunotation"; version="1.5.0"; sha256="09fahcn8jcf7xdjhqjiaphnkn8v303ancb0ixc03frhqk1k8srqv"; depends=[curl ggplot2 maps ontologyIndex readr rlang rvest stringr tidyr xml2]; }; + impute = derive2 { name="impute"; version="1.72.1"; sha256="0862mpbmznizcq5bgnp85dl9q0bip76jkga45gssdrv90wsi2192"; depends=[]; }; + infercnv = derive2 { name="infercnv"; version="1.14.0"; sha256="11hgw6c67gd3ih5q14a520sjmnlv56qw19z0i6s5pz2slmgflpry"; depends=[ape argparse BiocGenerics caTools coda coin digest doParallel dplyr edgeR fastcluster fitdistrplus foreach futile_logger future ggplot2 gplots gridExtra HiddenMarkov igraph Matrix parallelDist phyclust RANN RColorBrewer reshape2 rjags Seurat SingleCellExperiment SummarizedExperiment tidyr]; }; + infinityFlow = derive2 { name="infinityFlow"; version="1.8.0"; sha256="03kmx5hsqzcjc1vw84ylnahq8ys42lanbir7a20lrhb3r7380swa"; depends=[Biobase flowCore generics gtools matlab pbapply png raster uwot xgboost]; }; + intansv = derive2 { name="intansv"; version="1.38.0"; sha256="15nrx15jpm4dpv249vxvgkvz2hh8980hqlr3vv4m24a2gcrn6sn1"; depends=[BiocGenerics GenomicRanges ggbio IRanges plyr]; }; + interacCircos = derive2 { name="interacCircos"; version="1.8.0"; sha256="0yx7am1w9facdj7i1kcrhh65saq2bll7q6vh0i39dhw6fwciih17"; depends=[htmlwidgets plyr RColorBrewer]; }; + interactiveDisplay = derive2 { name="interactiveDisplay"; version="1.36.0"; sha256="0zh6l2qdl4hvplc3d1p6y0fvr5wv7nijagj4laf2jb0y2jrs8c00"; depends=[AnnotationDbi BiocGenerics Category ggplot2 gridSVG interactiveDisplayBase plyr RColorBrewer reshape2 shiny XML]; }; + interactiveDisplayBase = derive2 { name="interactiveDisplayBase"; version="1.36.0"; sha256="1j2cz929q9hwkchnzcs3mnbmhg68mm06r9bgylnbll4j5ibqicrz"; depends=[BiocGenerics DT shiny]; }; + ipdDb = derive2 { name="ipdDb"; version="1.16.0"; sha256="0kza7156a4b79jswxwj7knc4sgknpv9sm4l41lgjrzzm0vipczn0"; depends=[AnnotationDbi AnnotationHub assertthat Biostrings DBI GenomicRanges IRanges RSQLite]; }; + isobar = derive2 { name="isobar"; version="1.44.0"; sha256="1p9kwkj0yr8in4hxhvy85wvgf5zc9m57b8skgwb2331fmbq8iipn"; depends=[Biobase biomaRt distr ggplot2 plyr]; }; + isomiRs = derive2 { name="isomiRs"; version="1.26.0"; sha256="0ybnr5y3ji3v7b7wn6762v92xvy6y6zl0vq4z8mz6mnqr3245zc6"; depends=[AnnotationDbi assertive_sets Biobase BiocGenerics broom cluster cowplot DEGreport DESeq2 dplyr GenomicRanges GGally ggplot2 gplots gridExtra gtools IRanges limma RColorBrewer readr reshape rlang S4Vectors stringr SummarizedExperiment tibble tidyr]; }; + iterClust = derive2 { name="iterClust"; version="1.20.0"; sha256="1rdn88c65ybalr6sv7vlcmw3272l59gvnrv8xc81phlszzv1nqd5"; depends=[Biobase cluster]; }; + iterativeBMA = derive2 { name="iterativeBMA"; version="1.56.0"; sha256="0pplkj731v94aq9jkwcxcr5ddd88qssnvl8r03vwll3c003pp3yk"; depends=[Biobase BMA leaps]; }; + iterativeBMAsurv = derive2 { name="iterativeBMAsurv"; version="1.56.0"; sha256="02zcwrb9kj9q444rg3qqsms80qapxfx9mpwam6gbbz6ziqp3pzcb"; depends=[BMA leaps survival]; }; + ivygapSE = derive2 { name="ivygapSE"; version="1.20.0"; sha256="0axxj9i83djpms8xhgw2ishac1p9866v4dbsy9fgs3plym7jzm8g"; depends=[ggplot2 hwriter plotly S4Vectors shiny SummarizedExperiment survival survminer UpSetR]; }; + karyoploteR = derive2 { name="karyoploteR"; version="1.24.0"; sha256="1dcxq3651903wwzr7bww8c4wd8h5h7rklnqfgklqpss0psx59d2w"; depends=[AnnotationDbi bamsignals bezier biovizBase digest GenomeInfoDb GenomicFeatures GenomicRanges IRanges memoise regioneR Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; + katdetectr = derive2 { name="katdetectr"; version="1.0.0"; sha256="15mbn0n2g58jfmvwaczd34fhhd1bj9sd7kd9bnvb0y89i8f7k1d7"; depends=[Biobase BiocParallel BSgenome BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 changepoint changepoint_np checkmate dplyr GenomeInfoDb GenomicRanges ggplot2 ggtext IRanges maftools plyranges Rdpack rlang S4Vectors tibble tidyr VariantAnnotation]; }; + kebabs = derive2 { name="kebabs"; version="1.32.0"; sha256="0cry6mb4k128afl7r2jld1g7nl12qvihn59j7867v4k70ia33lxz"; depends=[apcluster Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; }; + keggorthology = derive2 { name="keggorthology"; version="2.50.0"; sha256="1znc7lw6dh5yb94fcx46l2lvbnxki0pilcamzmjc5x8r2bhvjrrr"; depends=[AnnotationDbi DBI graph hgu95av2_db]; }; + kissDE = derive2 { name="kissDE"; version="1.18.0"; sha256="0yrpz3sq6acx2200malb05b4wcw4p1vf8wlyc3dgswnqi61wgpnl"; depends=[ade4 aods3 Biobase DESeq2 doParallel DSS DT factoextra foreach ggplot2 gplots matrixStats shiny shinycssloaders]; }; + lapmix = derive2 { name="lapmix"; version="1.64.0"; sha256="0rhdzvbhsvnhlqd1bkbi9p8fqpc0lvm6jw4923dlmv68lxlfy9sb"; depends=[Biobase]; }; + ldblock = derive2 { name="ldblock"; version="1.28.0"; sha256="0i8v4wfp207f5dpf3y2n8fqn7mc4khj92gb209vzc3y3kbwp2c6n"; depends=[BiocGenerics httr Matrix rlang]; }; + lefser = derive2 { name="lefser"; version="1.8.0"; sha256="07bymf3gzb74d8m9ddsz1vjdg1f1a1j41nqpn6iz7mqkf83dh46c"; depends=[coin ggplot2 MASS SummarizedExperiment]; }; + les = derive2 { name="les"; version="1.48.0"; sha256="0rsg0q437sm33byg3ksvckmparym9k168vm9jicf0q92g4cq146m"; depends=[boot fdrtool gplots RColorBrewer]; }; + levi = derive2 { name="levi"; version="1.16.0"; sha256="13adc39arg071hjw84lawr8rabfz1v7c6cjcbidsw6mz470x0v8h"; depends=[colorspace dplyr DT ggplot2 httr igraph knitr RColorBrewer Rcpp reshape2 rmarkdown shiny shinydashboard shinyjs testthat xml2]; }; + lfa = derive2 { name="lfa"; version="1.28.0"; sha256="1l3ip0bsvbz9nagzv47qjh5hf7qf8ffk4hlnkwagngiwyq84vyp1"; depends=[corpcor]; }; + limma = derive2 { name="limma"; version="3.54.0"; sha256="1jy75nbkhl0kgv4gw88acx58r9f1kywrd36405x6g05xy05bprma"; depends=[]; }; + limmaGUI = derive2 { name="limmaGUI"; version="1.74.0"; sha256="0ff4k88szb4bfjgcflq9jls4wlchw0izr0ibjb8hrmz877w6370f"; depends=[limma R2HTML tkrplot xtable]; }; + lineagespot = derive2 { name="lineagespot"; version="1.2.0"; sha256="13h6xxdmsgb6gxqdwzr544758y8plsm934rk81p1fzw94xs4hk1d"; depends=[data_table httr MatrixGenerics stringr SummarizedExperiment VariantAnnotation]; }; + lionessR = derive2 { name="lionessR"; version="1.12.0"; sha256="1gih08dd35rmmynwwr86szfb5ygcsf1jh077nsf048x6xfaq4wp1"; depends=[S4Vectors SummarizedExperiment]; }; + lipidr = derive2 { name="lipidr"; version="2.12.0"; sha256="1kr7s5lq8l25c7c1qarpj879l2l93bc9677yjkb0xgwi8h8zkwnn"; depends=[data_table dplyr fgsea forcats ggplot2 imputeLCMD limma magrittr rlang ropls S4Vectors SummarizedExperiment tidyr]; }; + lisaClust = derive2 { name="lisaClust"; version="1.6.1"; sha256="1p0q6bfkw53qhqw9zqh1avcw0yf3pskqr0iqzcyhwq4vnf59clw2"; depends=[BiocGenerics BiocParallel class concaveman data_table dplyr ggplot2 pheatmap purrr S4Vectors SingleCellExperiment SpatialExperiment spatstat_explore spatstat_geom spicyR SummarizedExperiment tidyr]; }; + lmdme = derive2 { name="lmdme"; version="1.40.0"; sha256="13nyndbmxmyyrs84fpgnak6zxikrhzbmkaykiffr7khpknszx388"; depends=[limma pls stemHypoxia]; }; + loci2path = derive2 { name="loci2path"; version="1.18.0"; sha256="1l9mv3cg08wqi81m4clz3y7yr4l38s44s384gl2hcw64xp55ar3g"; depends=[BiocParallel data_table GenomicRanges pheatmap RColorBrewer S4Vectors wordcloud]; }; + logicFS = derive2 { name="logicFS"; version="2.18.0"; sha256="17sy0bkcwxqlxrl44i5ncf203ds5a25d6p23vkkj64fiszkyq8p0"; depends=[LogicReg mcbiopi survival]; }; + logitT = derive2 { name="logitT"; version="1.56.0"; sha256="1mi2psbmz1cd5ms084wpljiv8kh1fdpwkaasj1j4axcw5wds7bqd"; depends=[affy]; }; + lpNet = derive2 { name="lpNet"; version="2.30.0"; sha256="148kvxav3mqxa7z6m8wp8qxlv1w7ladw7za1d7qaly7hbpll21yy"; depends=[lpSolve]; }; + lpsymphony = derive2 { name="lpsymphony"; version="1.26.1"; sha256="02lyi2ijzd204rnd4xm3jh3d2a7d634abivjz3p7l5in8phx1mpw"; depends=[]; }; + lumi = derive2 { name="lumi"; version="2.50.0"; sha256="1091458is69dxnjrcd11czqy55c68sdnkrmpvlm6hw2cbghs2bjq"; depends=[affy annotate AnnotationDbi Biobase DBI GenomicFeatures GenomicRanges KernSmooth lattice MASS methylumi mgcv nleqslv preprocessCore RSQLite]; }; + m6Aboost = derive2 { name="m6Aboost"; version="1.4.0"; sha256="093fz8yh5hd478q4hvgmpi5kbjbh820mmjvx108n2lic6pp3j285"; depends=[adabag Biostrings BSgenome dplyr ExperimentHub GenomicRanges IRanges rtracklayer S4Vectors]; }; + mAPKL = derive2 { name="mAPKL"; version="1.28.0"; sha256="0nj2r54djps19lar2sp6bhdi5nkid195xyaqzzam2r7piwr8xv8s"; depends=[AnnotationDbi apcluster Biobase clusterSim e1071 igraph limma multtest parmigene reactome_db]; }; + mBPCR = derive2 { name="mBPCR"; version="1.52.0"; sha256="18nzcglzh97g7hxbphn0gl1k8q1fp0055djrw10vq9rxc5sqx9s0"; depends=[Biobase GWASTools oligoClasses]; }; + mCSEA = derive2 { name="mCSEA"; version="1.18.0"; sha256="1j5kyjm2llwqvf63ah65hjci56xhjhsvjw77ra9k6fiyz7phfli2"; depends=[biomaRt fgsea GenomicFeatures GenomicRanges ggplot2 Gviz Homo_sapiens IRanges limma mCSEAdata S4Vectors SummarizedExperiment]; }; + maCorrPlot = derive2 { name="maCorrPlot"; version="1.68.0"; sha256="07z6amr19dg2i5zvz86xs7f5nk82b5qj9slv69r9pbiifn6pci9d"; depends=[lattice]; }; + maPredictDSC = derive2 { name="maPredictDSC"; version="1.36.0"; sha256="0kbpckkm29x6n29a4jgb3l7bip5smrkl2jrqv5iix8d6lm21pq1s"; depends=[affy AnnotationDbi caret class e1071 gcrma hgu133plus2_db limma LungCancerACvsSCCGEO MASS ROC ROCR]; }; + maSigPro = derive2 { name="maSigPro"; version="1.70.0"; sha256="048h2n50fjr1sxm6ls4d7g5jwhdlb65admnvwvdrzhs788vi0hx0"; depends=[Biobase MASS mclust venn]; }; + maanova = derive2 { name="maanova"; version="1.68.0"; sha256="0i2nx81m8q4561w240i36cg80l0x2ag0ivz1qw6anj6z4rbxx7ih"; depends=[Biobase]; }; + macat = derive2 { name="macat"; version="1.72.0"; sha256="11sjkk5d0r9fhxjmv4m078dyy4zb7nn7zbasn7fa16g37xyhrbb6"; depends=[annotate Biobase]; }; + made4 = derive2 { name="made4"; version="1.72.0"; sha256="0ylcigzbahic99afqk1q29d4wczmsqmp2hasvihcykybb440a6f2"; depends=[ade4 Biobase gplots RColorBrewer scatterplot3d SummarizedExperiment]; }; + maftools = derive2 { name="maftools"; version="2.14.0"; sha256="1f1r0frikaj6aw137dk523gagkxdygg7gzc3pd303ds5cqynwiqx"; depends=[data_table DNAcopy RColorBrewer Rhtslib survival zlibbioc]; }; + magrene = derive2 { name="magrene"; version="1.0.0"; sha256="1r7pri63lwr7hkqn2wkz782sgnx1v7z0fkd5x6yim141hm1y9xii"; depends=[BiocParallel]; }; + maigesPack = derive2 { name="maigesPack"; version="1.62.0"; sha256="0bl6g2aqyq1yh6v42y8jyqxz6lprkizaxm423ll5cmmw77lh82x0"; depends=[convert graph limma marray]; }; + makecdfenv = derive2 { name="makecdfenv"; version="1.74.0"; sha256="0bvj5dg6yfjnhga1z8788zmb98d8shyz8pzz0ggnml87c1p2gy25"; depends=[affy affyio Biobase zlibbioc]; }; + mapscape = derive2 { name="mapscape"; version="1.22.0"; sha256="0an5ylv1pjgqfaj8ic35l1f4bp12lbr1h7rx2n0qwgms2wkc80zg"; depends=[base64enc htmlwidgets jsonlite stringr]; }; + marr = derive2 { name="marr"; version="1.8.0"; sha256="1v1mpqvhivirsy1f6zhb0n69zjvad5saw892psh8v5n8nyywi0kr"; depends=[dplyr ggplot2 magrittr Rcpp rlang S4Vectors SummarizedExperiment]; }; + marray = derive2 { name="marray"; version="1.76.0"; sha256="1bad4cjxv22h6vxxn86mxp7xvxhhzj81pikxq3h3hc2a858qfkgs"; depends=[limma]; }; + martini = derive2 { name="martini"; version="1.18.0"; sha256="0ix29f7qx3lxg338jb5sc6kdil4cpd6i9a77n4zjk87n8xp6dhbs"; depends=[igraph Matrix Rcpp RcppEigen snpStats]; }; + maser = derive2 { name="maser"; version="1.16.0"; sha256="1zycx8s046g4d3w5qrn950bmi0nrnq1g7fvqji48mr6hmsyzplvv"; depends=[BiocGenerics data_table dplyr DT GenomeInfoDb GenomicRanges ggplot2 Gviz IRanges reshape2 rtracklayer]; }; + maskBAD = derive2 { name="maskBAD"; version="1.42.0"; sha256="0mp0wcpki7nh0i5vgzv9fvqmxwb2bn9rjszk4swg4zhgh37iids5"; depends=[affy gcrma]; }; + massiR = derive2 { name="massiR"; version="1.34.0"; sha256="1dxhp4pykq9ghqsnm1ylz3j3rvyglkjpbam9ngcsqa2jj0jh5cym"; depends=[Biobase cluster diptest gplots]; }; + matchBox = derive2 { name="matchBox"; version="1.40.0"; sha256="0s7pmrbbzy87xf2596m6ix14p02dfr8db0jgx5vzidfvplh7rwsx"; depends=[]; }; + matter = derive2 { name="matter"; version="2.0.1"; sha256="0vbc6fj3is3iv2w5fdd2vdw6lr6kz3fq5d4mpg3skfcnndnb7l2j"; depends=[biglm BiocGenerics BiocParallel digest irlba Matrix ProtGenerics]; }; + mbOmic = derive2 { name="mbOmic"; version="1.2.0"; sha256="01zn60gqbzq3c4nzfdk2dhj515qlill9cs5n8lba9553j0sg739q"; depends=[cluster clusterSim data_table doParallel igraph psych visNetwork WGCNA]; }; + mbkmeans = derive2 { name="mbkmeans"; version="1.14.0"; sha256="1ghv2j88p3sppqph3wxpm8z84nw7bi4idkn11wf806d8h1krfjm7"; depends=[beachmat benchmarkme BiocParallel ClusterR DelayedArray Matrix Rcpp RcppArmadillo Rhdf5lib S4Vectors SingleCellExperiment SummarizedExperiment]; }; + mdp = derive2 { name="mdp"; version="1.18.0"; sha256="0z7d08kzqxabmd1anqa8k5rljz0mhwy1wzk5cghr770492ax9yap"; depends=[ggplot2 gridExtra]; }; + mdqc = derive2 { name="mdqc"; version="1.60.0"; sha256="1hn6m0z8q3jnzb0h8m29khgm0cx81cfs3s1j6hlg4wsrwkha1i3w"; depends=[cluster MASS]; }; + megadepth = derive2 { name="megadepth"; version="1.8.0"; sha256="1krk5iqqzkkkxfgsvi9j6mj14i2rzisrrq0xmxjsrkgfh19awhr8"; depends=[cmdfun dplyr fs GenomicRanges magrittr readr xfun]; }; + memes = derive2 { name="memes"; version="1.6.0"; sha256="0480pq3n99r6h7gvhw30j4ql259q8jq88lzjb6ik69g5xlgdrg68"; 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.24.0"; sha256="1qdzjyh6jj8jr74xjpqdfyak0alx6n7bi3zp0sjblmlzd5mydk53"; depends=[AnnotationDbi AnnotationHub DOSE enrichplot GOSemSim MeSHDbi yulab_utils]; }; + meshr = derive2 { name="meshr"; version="2.4.0"; sha256="14kdb9wa99pb9jbsnhz86a5ajp6vwaqkkkj3x63ng0wl4pyh90lx"; depends=[BiocGenerics BiocStyle Category fdrtool knitr markdown MeSHDbi rmarkdown RSQLite S4Vectors]; }; + messina = derive2 { name="messina"; version="1.34.0"; sha256="1pa8xl98xzadzh2q8y4j446947lapxyz2aijx8xp3dv62i5cbv0p"; depends=[foreach ggplot2 plyr Rcpp survival]; }; + metaCCA = derive2 { name="metaCCA"; version="1.26.0"; sha256="1jvzp9fzggvavg4jbmmyb6cibgll0yglmc3nsfgygsh7z20yss36"; depends=[]; }; + metaMS = derive2 { name="metaMS"; version="1.34.0"; sha256="113w3zk32xg0f8ik09w8wl5zr02wmfkp05nqgp8615j7kqrnr91d"; depends=[BiocGenerics CAMERA Matrix robustbase xcms]; }; + metaSeq = derive2 { name="metaSeq"; version="1.38.0"; sha256="0bfsmsy1zpzrmah6y52yb3g2qy8c30s74l9w98rrisq0jfhldvdp"; depends=[NOISeq Rcpp snow]; }; + metabCombiner = derive2 { name="metabCombiner"; version="1.8.0"; sha256="1s9vccbd2abaz2dsg7gm0amdvwb5iildz0pavfhhssl0np07h9rf"; depends=[caret dplyr matrixStats mgcv rlang S4Vectors tidyr]; }; + metabinR = derive2 { name="metabinR"; version="1.0.0"; sha256="1qyy2l5y18v1jg54lk7sv9f1wcmrzbff4yk921m9gn4jcxdn59l9"; depends=[rJava]; }; + metabolomicsWorkbenchR = derive2 { name="metabolomicsWorkbenchR"; version="1.8.0"; sha256="02azijq6hq4141zh8nls1xg5h1hlgyb130b6l47966pn1drm5q9l"; depends=[data_table httr jsonlite MultiAssayExperiment struct SummarizedExperiment]; }; + metabomxtr = derive2 { name="metabomxtr"; version="1.32.0"; sha256="0b01h0dd1hnlnx89i347rca032lk48d49xfb03r15di1gcwwrw5q"; depends=[Biobase BiocParallel Formula ggplot2 multtest optimx plyr]; }; + metagene = derive2 { name="metagene"; version="2.30.0"; sha256="09z4hgcp7lnybv4hq2dybc8zq6mwndls7p8y30lzb6rw2fryhkhq"; depends=[BiocParallel data_table EnsDb_Hsapiens_v86 ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gplots IRanges magrittr matrixStats purrr R6 Rsamtools rtracklayer stringr]; }; + metagene2 = derive2 { name="metagene2"; version="1.14.0"; sha256="12knh4bri4j5sf12wf129kg484xbc37hkfkyw39rkz2arx465giw"; depends=[BiocParallel data_table dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges magrittr purrr R6 reshape2 Rsamtools rtracklayer]; }; + metagenomeSeq = derive2 { name="metagenomeSeq"; version="1.40.0"; sha256="01wjw4kcm8ysa5sn3cqg4a9i5pyksnwmbdqp5fr6n2l9hllkc9jy"; depends=[Biobase foreach glmnet gplots limma Matrix matrixStats RColorBrewer Wrench]; }; + metahdep = derive2 { name="metahdep"; version="1.56.0"; sha256="1fyphlk6v5va7yr7ihb4yman0sd3jywscqx6an6zv1jkwvp9hpd1"; depends=[]; }; + metapod = derive2 { name="metapod"; version="1.6.0"; sha256="06ala1qz9bfq7nnj92m0c5r85kk7h4zrljjh0hgrap5sjlsm09bb"; depends=[Rcpp]; }; + metapone = derive2 { name="metapone"; version="1.4.0"; sha256="13fnh1n2ydykkvpj9s9xvikfgahsi827rmwzb4zyk9h2g4dx5jk2"; depends=[BiocParallel fdrtool fgsea fields ggplot2 ggrepel markdown]; }; + metaseqR2 = derive2 { name="metaseqR2"; version="1.10.0"; sha256="0m5dyg0gsvif02mgz0mcdk8annmqy4a6s5ldk3d9hjjzcgchpkpv"; depends=[ABSSeq baySeq Biobase BiocGenerics BiocParallel biomaRt Biostrings corrplot DESeq2 DSS DT EDASeq edgeR genefilter GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gplots harmonicmeanp heatmaply htmltools httr IRanges jsonlite lattice limma locfit log4r magrittr MASS Matrix NBPSeq pander qvalue rmarkdown rmdformats Rsamtools RSQLite rtracklayer S4Vectors stringr SummarizedExperiment survcomp VennDiagram vsn yaml zoo]; }; + metavizr = derive2 { name="metavizr"; version="1.21.0"; sha256="1d88f854sn5m2pklsyvkmq05yzjanxlnkz5gpzban62qq1mpvims"; depends=[Biobase data_table digest epivizr epivizrData epivizrServer epivizrStandalone GenomeInfoDb httr metagenomeSeq phyloseq vegan]; }; + methInheritSim = derive2 { name="methInheritSim"; version="1.20.0"; sha256="1mkh8j1kccc95r1xj77hkpal0zdj0g923p8xr7vm1rxz98fpw30n"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges methylKit msm S4Vectors]; }; + methimpute = derive2 { name="methimpute"; version="1.20.0"; sha256="0pksjz8i42wvg830rlwyfk5wv0mymnxpv65swjgbkxhd1hx0s1nf"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges ggplot2 IRanges minpack_lm Rcpp reshape2]; }; + methrix = derive2 { name="methrix"; version="1.12.0"; sha256="08p6zq9pbqa21awgm7qfxwb81600i9c1af536zwp4a8fqn7vphhs"; depends=[BSgenome data_table DelayedArray DelayedMatrixStats GenomicRanges ggplot2 HDF5Array IRanges matrixStats rtracklayer SummarizedExperiment]; }; + methylCC = derive2 { name="methylCC"; version="1.12.0"; sha256="0m0zs1nj2xmslfj35khmyy5nzrq49q5mpyv9ymq07wja54qpxx5l"; depends=[Biobase bsseq bumphunter dplyr FlowSorted_Blood_450k genefilter GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IRanges magrittr minfi plyranges quadprog S4Vectors]; }; + methylGSA = derive2 { name="methylGSA"; version="1.16.0"; sha256="1xzgv5r62pbn9y7bc2rih5073n4qzx9fhkvja2pr0irlx2jr4arm"; depends=[AnnotationDbi BiocParallel clusterProfiler ggplot2 GO_db IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylationEPICanno_ilm10b4_hg19 missMethyl org_Hs_eg_db reactome_db RobustRankAggreg shiny stringr]; }; + methylInheritance = derive2 { name="methylInheritance"; version="1.22.0"; sha256="0rf6gw8b4v20q9lhzgxskyxga9iszfgdvgdhs53x0xkfa2sagddr"; depends=[BiocParallel GenomicRanges ggplot2 gridExtra IRanges methylKit rebus S4Vectors]; }; + methylKit = derive2 { name="methylKit"; version="1.24.0"; sha256="0w6wv8x1jggbvymb07b2z47myf239mwpwbgz5p5yi60qb0k7p2q9"; 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.36.0"; sha256="0mj34ch1k216k42qj9wyf5yshl1qjb6hvpxs5y2rk21w6dwziklk"; depends=[edgeR statmod]; }; + methylPipe = derive2 { name="methylPipe"; version="1.32.0"; sha256="1za6f3y5mfgk8pfsv487q1xbigrv85vs0q1j71zcbc3lminsfzyp"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; }; + methylSig = derive2 { name="methylSig"; version="1.10.0"; sha256="1yg9lkgqgdlb5d8wiprnilw4nmwgq1nsz2p8v5zm09sfyvkl05gx"; depends=[bsseq DelayedArray DelayedMatrixStats DSS GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + methylclock = derive2 { name="methylclock"; version="1.4.0"; sha256="0pzpxdm3z6payp5mh45a939zk4kqg08rkm4c96ryd2j7a4yvk55q"; depends=[Biobase devtools dplyr dynamicTreeCut ExperimentHub ggplot2 ggpmisc ggpubr gridExtra impute methylclockData minfi PerformanceAnalytics planet preprocessCore quadprog Rcpp RPMM tibble tidyr tidyverse]; }; + methylscaper = derive2 { name="methylscaper"; version="1.6.0"; sha256="08lrc54safmb9ygg4vpqjfn5ycps19j7gbgi3rjcjzc7qv6zgjwp"; depends=[BiocParallel Biostrings data_table Rfast seqinr seriation shiny shinyFiles shinyjs SummarizedExperiment]; }; + methylumi = derive2 { name="methylumi"; version="2.44.0"; sha256="07kfyv3kkayzh0akxfl3p9gckw8qiplkxbyxw8npc7cb03ihgmc4"; depends=[annotate AnnotationDbi Biobase BiocGenerics FDb_InfiniumMethylation_hg19 genefilter GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 illuminaio IRanges lattice matrixStats minfi reshape2 S4Vectors scales SummarizedExperiment]; }; + mfa = derive2 { name="mfa"; version="1.20.0"; sha256="0xrgl1nzyvwm34249ijw0ld4dkz0001ck8cv780yx2dk92lp9ky2"; depends=[Biobase coda dplyr ggmcmc ggplot2 magrittr MCMCglmm MCMCpack Rcpp tibble]; }; + mgsa = derive2 { name="mgsa"; version="1.46.0"; sha256="1h559i80hd8ajvimj3qs9c2yayl4cz8kr7irn4184wcql61dq5md"; depends=[gplots]; }; + miQC = derive2 { name="miQC"; version="1.6.0"; sha256="1fy4iqm5frmnrlmcpikhrvr59hv2cbsrgrn6xkcq9jxcwnm7zxnz"; depends=[flexmix ggplot2 SingleCellExperiment]; }; + miRBaseConverter = derive2 { name="miRBaseConverter"; version="1.22.0"; sha256="1srx066gsqcngngjpac29wnqf4n5r297h5wbbgjdvkkvyc7fhvwy"; depends=[]; }; + miRLAB = derive2 { name="miRLAB"; version="1.28.0"; sha256="1fj8vgwym7w65z84w043v75j0cn6nb882sk91mdmp1q0xwmn4jq0"; depends=[Category ctc dplyr energy entropy glmnet GOstats gplots Hmisc httr impute InvariantCausalPrediction limma org_Hs_eg_db pcalg RCurl stringr SummarizedExperiment TCGAbiolinks]; }; + miRNAmeConverter = derive2 { name="miRNAmeConverter"; version="1.26.0"; sha256="0wvz9gz7zh5qzf146hz788rc289mb22bi78ffjh8xmyfhc3jxmpj"; depends=[AnnotationDbi DBI miRBaseVersions_db reshape2]; }; + miRNApath = derive2 { name="miRNApath"; version="1.58.0"; sha256="0h6q3p29pvzfk8ggb97akbh0lmawypwp9rs4bmnj52599ws4x3n1"; depends=[]; }; + miRNAtap = derive2 { name="miRNAtap"; version="1.32.0"; sha256="05pxcqaw7hkfchmy8m6ywrblh3kj2zwargrw1v969af24lgaa3fa"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; }; + miRSM = derive2 { name="miRSM"; version="1.16.0"; sha256="153bdgwkqkcidvracjwxa249j6nl2fbsdg9wabnjd67qph8sa8rn"; 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.28.0"; sha256="1xnw6gv6h0b7fzmcirwdkp6hn33wc8k1dify5xy6r17sgfy51xm9"; depends=[Biobase KernSmooth miRcompData]; }; + miRmine = derive2 { name="miRmine"; version="1.20.0"; sha256="1mn9cjx6hqgqsmjg3rjkdyfs0d4ji12k5s2mw2rc87bwcl3d0rai"; depends=[SummarizedExperiment]; }; + miRspongeR = derive2 { name="miRspongeR"; version="2.2.0"; sha256="0nm4zzwpl4xzrc2v3br7963w2mfmlsg32pr4j4qqf090gjqj2k3k"; depends=[clusterProfiler corpcor doParallel DOSE foreach igraph linkcomm MCL org_Hs_eg_db Rcpp ReactomePA SPONGE survival]; }; + mia = derive2 { name="mia"; version="1.6.0"; sha256="0yz88ggv6d5rccdwzixwg9y1bc4xysazlmv1ph88wxs8r6fcmync"; 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.4.0"; sha256="01rvvjm6q1b7pdi89jvlhiqv70rms128f08frhvfxj6m4wr432hj"; depends=[deSolve gtools MatrixGenerics poweRlaw S4Vectors SummarizedExperiment TreeSummarizedExperiment]; }; + miaViz = derive2 { name="miaViz"; version="1.6.0"; sha256="18gp77islzfy1ll7yxk3l8l1q8kj4hxj0qns6mk9i0pb1vqs1lk7"; 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.56.0"; sha256="002wagng2zqa2cl8140im2fzbic6mqr2mp6qbaqk5ary5m8c0bkq"; depends=[Biostrings]; }; + microbiome = derive2 { name="microbiome"; version="1.20.0"; sha256="1j3lrrz6yxfzsr037c0bbdhrs0ll7jg0mpcvk3iqdryi5rysnx0x"; depends=[Biostrings compositions dplyr ggplot2 phyloseq reshape2 Rtsne scales tibble tidyr vegan]; }; + microbiomeDASim = derive2 { name="microbiomeDASim"; version="1.12.0"; sha256="0gfldxhrz70drr9g4g1bpk0ncazldyc32z9by0ri881hyqah3d9x"; depends=[Biobase ggplot2 MASS Matrix metagenomeSeq mvtnorm pbapply phyloseq tmvtnorm]; }; + microbiomeExplorer = derive2 { name="microbiomeExplorer"; version="1.8.0"; sha256="1y9n12vmqr1l7c33smfl0wm33nzww84593y6azbhyj0sl50gk4a2"; 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.4.0"; sha256="022hzblxs2b3vlj3d9xicqyap8gr5r0dk29wz2n09d759aawc0nr"; depends=[ALDEx2 ANCOMBC Biobase BiocGenerics BiocParallel biomformat Biostrings caret coin ComplexHeatmap DESeq2 dplyr edgeR ggplot2 ggsignif ggtree IRanges limma magrittr MASS metagenomeSeq multtest patchwork phyloseq plotROC pROC purrr rlang S4Vectors tibble tidyr tidytree vegan yaml]; }; + midasHLA = derive2 { name="midasHLA"; version="1.6.0"; sha256="0j4sw8vbkksgm4g2wlzyanvmin7izv7209kqk3nnyx1g2crgh5ki"; depends=[assertthat broom dplyr formattable HardyWeinberg kableExtra knitr magrittr MultiAssayExperiment qdapTools rlang S4Vectors stringi SummarizedExperiment tibble]; }; + miloR = derive2 { name="miloR"; version="1.6.0"; sha256="07p9rs1jmgxqaahjbrnvvs94c142n2qfw8ip3qqkr6mhzwr19ly3"; depends=[BiocGenerics 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.22.0"; sha256="1q11i2k78nk8nga0sy4zps86i5n650km8v9h4yz12k12akwwp156"; depends=[affy affyPLM Biobase BiocGenerics DBI gtable oligo oligoClasses preprocessCore S4Vectors scales]; }; + mina = derive2 { name="mina"; version="1.6.0"; sha256="0w2m191lxy34c22qbds00g4advczzic4rvq6g78lmbpmf8xzj5sx"; depends=[apcluster biganalytics bigmemory foreach ggplot2 Hmisc MCL parallelDist plyr Rcpp RcppArmadillo RcppParallel reshape2 RSpectra stringr]; }; + minet = derive2 { name="minet"; version="3.56.0"; sha256="1xknyc2m03dyqrnx6np2y2lr41w06arl114f6cncl6wsnanqxzrz"; depends=[infotheo]; }; + minfi = derive2 { name="minfi"; version="1.44.0"; sha256="15989zilgy2j4k4nw046qg8wli7ynjh2b1yzfv7cwgn87mp618lc"; depends=[beanplot Biobase BiocGenerics BiocParallel Biostrings bumphunter data_table DelayedArray DelayedMatrixStats genefilter GenomeInfoDb GenomicRanges GEOquery HDF5Array illuminaio IRanges lattice limma MASS mclust nlme nor1mix preprocessCore quadprog RColorBrewer reshape S4Vectors siggenes SummarizedExperiment]; }; + mirIntegrator = derive2 { name="mirIntegrator"; version="1.28.0"; sha256="0662jsrw745973kf3f95l3n6i5s9h2nk2ap6alv8sb5rkykva2in"; depends=[AnnotationDbi ggplot2 graph org_Hs_eg_db Rgraphviz ROntoTools]; }; + mirTarRnaSeq = derive2 { name="mirTarRnaSeq"; version="1.6.0"; sha256="07lfh8c7ks9lbnskvqjhjrssp0wk1kpp7mbh7c7cg6q1kxcxpqyx"; depends=[assertthat caTools corrplot data_table dplyr ggplot2 MASS pheatmap pscl purrr R_utils reshape2]; }; + missMethyl = derive2 { name="missMethyl"; version="1.32.0"; sha256="10r3yvamkd1h291lmbas66mshrmy7djkz6pldh8lpqngm0rpgdr6"; depends=[AnnotationDbi BiasedUrn Biobase BiocGenerics GenomicRanges GO_db IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b4_hg19 IlluminaHumanMethylationEPICmanifest IRanges limma methylumi minfi org_Hs_eg_db ruv S4Vectors statmod stringr SummarizedExperiment]; }; + missRows = derive2 { name="missRows"; version="1.18.0"; sha256="0kwbmhz80an07fcp6skv4bik0ncszxcllfi7jv9h0k814qciij0y"; depends=[ggplot2 gtools MultiAssayExperiment plyr S4Vectors]; }; + mistyR = derive2 { name="mistyR"; version="1.6.0"; sha256="1fyzxswad1naa86647szqwsf0m929l3l3c00v5y28cpfz20qzlr5"; depends=[assertthat caret deldir digest distances dplyr filelock furrr ggplot2 purrr R_utils ranger readr ridge rlang rlist stringr tibble tidyr tidyselect withr]; }; + mitch = derive2 { name="mitch"; version="1.10.0"; sha256="174hiq8xzbvdkfxdgm742sjs7qcmnkb9shcid1p8x8ci6fk9vs61"; depends=[beeswarm echarts4r GGally ggplot2 gplots gridExtra knitr MASS plyr reshape2 rmarkdown]; }; + mitoClone2 = derive2 { name="mitoClone2"; version="1.4.0"; sha256="07yi1pz05na7w4ppp0kcrylny4p1ca9w1rxwmph70i81paf5kpfn"; depends=[deepSNV GenomicRanges ggplot2 pheatmap reshape2 Rhtslib S4Vectors]; }; + mixOmics = derive2 { name="mixOmics"; version="6.22.0"; sha256="0w6shihvnvkjycba1hy8drd8wcxxcl2rimkrb4vdl8aygdifrarx"; depends=[BiocParallel corpcor dplyr ellipse ggplot2 ggrepel gridExtra igraph lattice MASS matrixStats rARPACK RColorBrewer reshape2 tidyr]; }; + mnem = derive2 { name="mnem"; version="1.14.0"; sha256="1midn7hqi037fwk3pxrzlc0a7fgs0ylxpd312ghjb45g1anxdc0s"; depends=[cluster data_table e1071 flexclust ggplot2 graph lattice Linnorm matrixStats naturalsort Rcpp RcppEigen Rgraphviz snowfall tsne wesanderson]; }; + moanin = derive2 { name="moanin"; version="1.6.0"; sha256="0cj9ym1iw4xpc9nmswhv9pnd2yr5mqmjzs43y7dd0c6x5nq90l13"; depends=[ClusterR edgeR limma MASS matrixStats NMI reshape2 S4Vectors SummarizedExperiment topGO viridis zoo]; }; + mogsa = derive2 { name="mogsa"; version="1.32.0"; sha256="1qr8ncs2993pz80idbz2paappn0pw0akjv25zkqc084bm74q0qb9"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; }; + monaLisa = derive2 { name="monaLisa"; version="1.4.0"; sha256="1hljdgb7cjhcjvjl4ffwjsn0har7p7rhg07320575s738pzm3wj3"; depends=[BiocGenerics BiocParallel Biostrings BSgenome circlize ComplexHeatmap GenomeInfoDb GenomicRanges glmnet IRanges S4Vectors stabs SummarizedExperiment TFBSTools vioplot XVector]; }; + monocle = derive2 { name="monocle"; version="2.26.0"; sha256="1d3xgh9xgqa28bgyd06zkjmg75lq7hdah3d140l1bqq2ii1bv62g"; depends=[Biobase BiocGenerics biocViews cluster combinat DDRTree dplyr fastICA ggplot2 HSMMSingleCell igraph irlba leidenbase limma MASS Matrix matrixStats pheatmap plyr proxy qlcMatrix RANN Rcpp reshape2 Rtsne slam stringr tibble VGAM viridis]; }; + mosaics = derive2 { name="mosaics"; version="2.36.0"; sha256="146fwpzmri7rlz1rq92xh70wrvmbfa5ysa6gv1akajbchgnrmikq"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges lattice MASS Rcpp Rsamtools S4Vectors]; }; + mosbi = derive2 { name="mosbi"; version="1.4.0"; sha256="04fdphz8jcmpxql9v496r7xikqhcbm1kn8a9j6hav9z4w8slg31l"; depends=[akmbiclust BH biclust fabia igraph isa2 QUBIC RColorBrewer Rcpp RcppParallel xml2]; }; + motifStack = derive2 { name="motifStack"; version="1.42.0"; sha256="18gfx5dq83s2ny39a7cgg4r3b05gg9l0kfg83brwrm1cby08jdhm"; depends=[ade4 Biostrings ggplot2 htmlwidgets TFBSTools XML]; }; + motifbreakR = derive2 { name="motifbreakR"; version="2.12.0"; sha256="0lq79as9gb48hf3v2xj895s0nsjr37fqah4p405kdybzry56gvrq"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges Gviz IRanges matrixStats MotifDb motifStack rtracklayer S4Vectors stringr SummarizedExperiment TFMPvalue VariantAnnotation]; }; + motifcounter = derive2 { name="motifcounter"; version="1.22.0"; sha256="0vsjnp19c8wscb3n2wkqvmssx052fr8wcfb6y67393mq1pqa719m"; depends=[Biostrings]; }; + motifmatchr = derive2 { name="motifmatchr"; version="1.20.0"; sha256="01k2ngf4nj2cazb3a2c96by86xwdkdngzwhb73n2wadibamnqnfv"; depends=[Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp RcppArmadillo Rsamtools S4Vectors SummarizedExperiment TFBSTools]; }; + mpra = derive2 { name="mpra"; version="1.20.0"; sha256="04pqnpsdak6yqmd99bfkild15s6szlwy86dxlnbd1fxvpyarfnf9"; depends=[BiocGenerics limma S4Vectors scales statmod SummarizedExperiment]; }; + msImpute = derive2 { name="msImpute"; version="1.8.0"; sha256="0mlybbrs6k5z41lhd3pvmvakqd1d1pkrvf0jkrbdwzs9grb5d4nn"; depends=[data_table dplyr FNN limma matrixStats mvtnorm pdist reticulate scran softImpute tidyr]; }; + msPurity = derive2 { name="msPurity"; version="1.24.0"; sha256="1w998i5lv1c2485cmdzk31inykhl64s7njaj725cs1r3gzi4l7h4"; depends=[DBI dbplyr doSNOW dplyr fastcluster foreach ggplot2 magrittr mzR plyr Rcpp reshape2 RSQLite stringr]; }; + msa = derive2 { name="msa"; version="1.30.1"; sha256="064hmry0zhmpchxgjsw0krsybr9v9gbsz26zmj2a39pg1nggwbq4"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; }; + msgbsR = derive2 { name="msgbsR"; version="1.22.0"; sha256="0g6d0gx5af61svxjdzx438vz24sd81qml7f755kq8nrr89pacvh0"; depends=[BSgenome easyRNASeq edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr R_utils Rsamtools S4Vectors SummarizedExperiment]; }; + mslp = derive2 { name="mslp"; version="1.0.1"; sha256="01w9lzfl1vci4z63yzcjk9fn7yzkcxiw6ms528qbg3nmfq08kx5a"; depends=[data_table doRNG fmsb foreach magrittr org_Hs_eg_db pROC randomForest RankProd]; }; + msmsEDA = derive2 { name="msmsEDA"; version="1.36.0"; sha256="17xklsg483zd205q5hyxy6b3cgrb53pplb1wc7pmv5638y7nsq2v"; depends=[gplots MASS MSnbase RColorBrewer]; }; + msmsTests = derive2 { name="msmsTests"; version="1.36.0"; sha256="10frsvqhi3i0v2w4q4q9xz1ykyf6s3nrjlmn94x3kd06p3s839k3"; depends=[edgeR msmsEDA MSnbase qvalue]; }; + msqrob2 = derive2 { name="msqrob2"; version="1.6.0"; sha256="1namy5kjxw963aywynyqqg0d0fzjdx5hxszah7765d10r3hhk0l7"; depends=[BiocParallel codetools limma lme4 MASS Matrix MultiAssayExperiment purrr QFeatures SummarizedExperiment]; }; + multiClust = derive2 { name="multiClust"; version="1.28.0"; sha256="0mw48jm154c0k9nhal56xc4jv0n3ms0s1770g2i2lxkr37905swq"; depends=[amap cluster ctc dendextend mclust survival]; }; + multiGSEA = derive2 { name="multiGSEA"; version="1.8.0"; sha256="0ynjagm3djfvg69lwbhsl896wv46mkr6x7m8f28c8a9v42xrw4pk"; depends=[AnnotationDbi dplyr fgsea graphite magrittr metap rappdirs rlang]; }; + multiHiCcompare = derive2 { name="multiHiCcompare"; version="1.16.0"; sha256="0mwb61c6yqq1frnsgp3nafmlrl1zi8sxckp5yw7z083805y3fbyr"; depends=[aggregation BiocParallel data_table dplyr edgeR GenomeInfoDb GenomeInfoDbData GenomicRanges HiCcompare pbapply pheatmap qqman]; }; + multiMiR = derive2 { name="multiMiR"; version="1.20.0"; sha256="1zfjr1cw1qpi70wxrkw32y3dmwhbsdzd2522cgkj4x97g4d5cn99"; depends=[AnnotationDbi BiocGenerics dplyr purrr RCurl tibble XML]; }; + multiOmicsViz = derive2 { name="multiOmicsViz"; version="1.22.0"; sha256="0g28ksb9vf2lpv15s9s64nnz6smhxrf9cbsw4kba0dlyrrzzha4a"; depends=[doParallel foreach SummarizedExperiment]; }; + multiSight = derive2 { name="multiSight"; version="1.6.0"; sha256="1rpikqpg6y2dzgfb3wz92cf45kbvcd4izybkil54gls7wvq0a79i"; depends=[anyLib biosigner caret clusterProfiler config DESeq2 dplyr DT easyPubMed enrichplot ggnewscale golem htmltools igraph infotheo metap mixOmics networkD3 ppcor R6 ReactomePA rmarkdown rWikiPathways shiny shinydashboard stringr]; }; + multicrispr = derive2 { name="multicrispr"; version="1.8.0"; sha256="17b2c387f7xb8gcsbxqks9j7jr2yi1hysrjdl1vqxzwlzzz7v4az"; depends=[assertive BiocGenerics Biostrings BSgenome CRISPRseek data_table GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 karyoploteR magrittr plyranges Rbowtie reticulate rtracklayer stringi tidyr tidyselect]; }; + multiscan = derive2 { name="multiscan"; version="1.58.0"; sha256="1fj9fap9nz3cr9hvdhjnw4qbv684vsqjaf29sjcjvsay5f919gfy"; depends=[Biobase]; }; + multtest = derive2 { name="multtest"; version="2.54.0"; sha256="0ciz0fl0pzm4hjqw8af32s540lwjbkwvwnzgbfwadax40hgjs0g7"; depends=[Biobase BiocGenerics MASS survival]; }; + mumosa = derive2 { name="mumosa"; version="1.6.0"; sha256="0g0597dlzc1z4giq3qn9cy9hm1fywf5qv33lnac4zwb2hvg4qc42"; 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.12.0"; sha256="07b1z8rd0zibmv3rm4zggjf49lh37p2bp1h919zcw3n0fy2hax1k"; 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.40.0"; sha256="14dqhmvfdcm8fn27ih5q654rla4qgikj4761lhhnhzyvhqvnmglk"; depends=[Biostrings]; }; + musicatk = derive2 { name="musicatk"; version="1.8.0"; sha256="1l45jkhjciwvpy86c5ql3j6s8cm4d8crwdp45gj01xl23x1gkdgf"; 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.34.0"; sha256="1aldf0x5vivjbhp169chg5k3fq5r41fiykxii8f7z580h3spmapm"; depends=[GenomicFeatures Hmisc httr jsonlite plyr S4Vectors sqldf]; }; + myvariant = derive2 { name="myvariant"; version="1.28.0"; sha256="14p8x89ff9j4qzq4mghnxiwk6hac22hrq0zsvj2918srmwx18cjr"; depends=[GenomeInfoDb Hmisc httr jsonlite magrittr plyr S4Vectors VariantAnnotation]; }; + mzID = derive2 { name="mzID"; version="1.36.0"; sha256="0h5w5ykbziaif6m61pa5x92f2rblfgldvj9vajfhkmxj1b2ks9za"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; }; + mzR = derive2 { name="mzR"; version="2.32.0"; sha256="0p7mkvvaf25si95lpwpr65jm3dzxmgs9i0wilyb2mbxkdcz9vm71"; depends=[Biobase BiocGenerics ncdf4 ProtGenerics Rcpp Rhdf5lib]; }; + nanotatoR = derive2 { name="nanotatoR"; version="1.14.0"; sha256="1lb9jn0wi1rn3dcgc5b5fg3xvpm8dcws3ryxb29nvxjhiy7ry90z"; depends=[AnnotationDbi curl dplyr GenomicRanges hash httr knitr openxlsx org_Hs_eg_db rentrez rlang stringr testthat tidyverse VarfromPDB XML XML2R]; }; + ncGTW = derive2 { name="ncGTW"; version="1.12.0"; sha256="0jxchaq442kmprz65pv43xjj4cwv29aq28jz8l3ih70k873g8ap9"; depends=[BiocParallel Rcpp xcms]; }; + ncRNAtools = derive2 { name="ncRNAtools"; version="1.8.0"; sha256="0mbf3x2bf1qk2y7a0xjyvlj591b5dcl51f21vvkb0ikdm3bjiqz5"; depends=[GenomicRanges ggplot2 httr IRanges S4Vectors xml2]; }; + ncdfFlow = derive2 { name="ncdfFlow"; version="2.44.0"; sha256="0ak1rrd0r899nz4zdg9v3pkvlp94sbcc3q6xl249krgbx0a3sizm"; depends=[BH Biobase BiocGenerics cpp11 flowCore Rhdf5lib zlibbioc]; }; + ndexr = derive2 { name="ndexr"; version="1.20.1"; sha256="0m6p9h431xdb0r6q1xsqkdmm7cwrpdizlcisz30dl6f7nlm5pjyv"; depends=[httr jsonlite plyr RCX tidyr]; }; + nearBynding = derive2 { name="nearBynding"; version="1.8.0"; sha256="17fwk2863jb0y980y7f1in04x8529is6bvr2bymnsg7kkk1spvv6"; depends=[BiocGenerics dplyr GenomeInfoDb GenomicRanges ggplot2 gplots magrittr matrixStats plyranges R_utils rlang Rsamtools rtracklayer S4Vectors transport TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; }; + nempi = derive2 { name="nempi"; version="1.6.0"; sha256="0x15n5k9jbimg6rljj028dnmnymj9g8ylrds58sa7yxpp0aa9gyl"; depends=[e1071 epiNEM matrixStats mnem naturalsort nnet randomForest]; }; + netDx = derive2 { name="netDx"; version="1.9.0"; sha256="1k6grq4gxr507m43x1srszbic4chvj9qba52h6gdgmpmimfyg5bm"; depends=[bigmemory BiocFileCache combinat doParallel foreach GenomeInfoDb GenomicRanges ggplot2 glmnet httr igraph IRanges MultiAssayExperiment plotrix pracma rappdirs RColorBrewer reshape2 ROCR Rtsne S4Vectors]; }; + netOmics = derive2 { name="netOmics"; version="1.4.0"; sha256="0fpnydck4vqly14y718bm823b5lxn71k1df60vjfcg9ymxk8qz5z"; depends=[AnnotationDbi dplyr ggplot2 GO_db gprofiler2 igraph magrittr minet purrr RandomWalkRestartMH tibble tidyr]; }; + netSmooth = derive2 { name="netSmooth"; version="1.18.0"; sha256="1vivvzv4bl0i5y7mg1dm1rp87vch3k6byrapif3nwzj02f2fwriq"; depends=[cluster clusterExperiment data_table DelayedArray entropy HDF5Array Matrix scater SingleCellExperiment SummarizedExperiment]; }; + netZooR = derive2 { name="netZooR"; version="1.2.0"; sha256="00drgnk8fvjfsbmlj8nh20yvly4z0a0xfsxxcany2kygi8r1yq7h"; depends=[AnnotationDbi assertthat Biobase data_table doParallel dplyr foreach ggdendro ggplot2 GO_db GOstats gplots igraph MASS Matrix matrixStats nnet org_Hs_eg_db pandaR penalized RCy3 reshape reshape2 reticulate STRINGdb tidyr vegan viridisLite yarn]; }; + netbiov = derive2 { name="netbiov"; version="1.31.0"; sha256="0ldpbq8d7hq6sa5qcc5qh23plczg35170v3fifyz6a47vghr5ff9"; depends=[igraph]; }; + netboost = derive2 { name="netboost"; version="2.6.0"; sha256="16af13gzzgs9250jxs4w6vnv79fvqgh5v8db6skfccnnq6x2v1md"; depends=[colorspace dynamicTreeCut impute R_utils Rcpp RcppParallel WGCNA]; }; + netboxr = derive2 { name="netboxr"; version="1.9.0"; sha256="1brnm60745s2axls4p6qcxipjjr3ph9ijg1q604fgm42rf6i7qzm"; depends=[clusterProfiler data_table DT gplots igraph jsonlite plyr RColorBrewer]; }; + nethet = derive2 { name="nethet"; version="1.30.0"; sha256="0dhyjphj0134kx91ny94g0yd6kbjxb5qlbrds2z31bgxcxpms9gb"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network]; }; + netprioR = derive2 { name="netprioR"; version="1.24.0"; sha256="18cmg460hqygxxdsq3d4ns9aqbvj5knh9lv1d45fd3k1k9fhvsql"; depends=[doParallel dplyr foreach ggplot2 gridExtra Matrix pROC sparseMVN]; }; + netresponse = derive2 { name="netresponse"; version="1.58.0"; sha256="1d1285sgk86yi4sc93dhyizzs1a6333z6kcmpk3a7ki6z27a3jjk"; depends=[BiocStyle ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape2 Rgraphviz rmarkdown]; }; + ngsReports = derive2 { name="ngsReports"; version="2.0.2"; sha256="0yyqbrykzww68s7f5n7nswfj8lsif5gv6jl1i9fmlklslp9sk997"; depends=[BiocGenerics Biostrings checkmate dplyr DT forcats ggdendro ggplot2 lifecycle lubridate pander patchwork plotly readr reshape2 rlang rmarkdown scales stringr tibble tidyr tidyselect zoo]; }; + nnNorm = derive2 { name="nnNorm"; version="2.62.0"; sha256="0n01vsqhr9pgsyijvlp9k89l7yzs99f4xi1p7i5zmiffd39p013d"; depends=[marray nnet]; }; + nnSVG = derive2 { name="nnSVG"; version="1.2.0"; sha256="1mxsii17msqww37q5zgfmdyd6sv00mn1yz44lqkaa7pbldyhhixk"; depends=[BiocParallel BRISC Matrix matrixStats SingleCellExperiment SpatialExperiment SummarizedExperiment]; }; + nondetects = derive2 { name="nondetects"; version="2.28.0"; sha256="0n1ikrxz6gr27i86vv0j7x8m63rwl07wn72jzn4p4h1j46fzqdvp"; depends=[arm Biobase HTqPCR limma mvtnorm]; }; + normalize450K = derive2 { name="normalize450K"; version="1.26.0"; sha256="1a9q6dwkqg2s5q29rpx9lvhws8hnzdjc8dk6c56mh1q02gpxz8v3"; depends=[Biobase illuminaio quadprog]; }; + normr = derive2 { name="normr"; version="1.24.0"; sha256="1vx9v22am8vc5r9fml1nblm2x64zrifsqxlav9y0af4mbpd76d34"; depends=[bamsignals GenomeInfoDb GenomicRanges IRanges qvalue Rcpp rtracklayer]; }; + npGSEA = derive2 { name="npGSEA"; version="1.34.0"; sha256="014w7f95h44da6c7kwsddzp3wjbfyy3f697wykgz659hv86zdx0h"; depends=[Biobase BiocGenerics GSEABase]; }; + nuCpos = derive2 { name="nuCpos"; version="1.16.1"; sha256="07870x1c6r05difar1vkk92vgkp2d30k29rgf3l8zqc7fbx11mca"; depends=[]; }; + nucleR = derive2 { name="nucleR"; version="2.30.0"; sha256="0j8g0lf6pzqzak259fp6xckgcjrabqgd28bwy9fbx3pd1qj5yrh0"; depends=[Biobase BiocGenerics Biostrings dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges magrittr Rsamtools S4Vectors ShortRead]; }; + nucleoSim = derive2 { name="nucleoSim"; version="1.26.0"; sha256="0cgljwk9car3s5ncslx0j0bya6hchfv1zk09q8r0y6258mim4qy6"; depends=[IRanges S4Vectors]; }; + nullranges = derive2 { name="nullranges"; version="1.4.0"; sha256="01f7x99nzgi0si02p5bsjvf0mybl52kxnkm2j1f1s2rai5srkca4"; depends=[data_table GenomeInfoDb GenomicRanges ggplot2 ggridges InteractionSet IRanges ks plyranges progress rlang S4Vectors scales speedglm]; }; + occugene = derive2 { name="occugene"; version="1.58.0"; sha256="13hv71w25jzlf0fs5wx400m1zh4l4vxlvv42vidiyggj894ky5a3"; depends=[]; }; + octad = derive2 { name="octad"; version="1.0.0"; sha256="0qa407rhi9z1n2hif40j27vbfsy222wi2hh26qn4s0s7f2fnfyfl"; depends=[AnnotationHub Biobase data_table DESeq2 dplyr EDASeq edgeR ExperimentHub foreach ggplot2 GSVA htmlwidgets httr limma magrittr octad_db plotly reshape2 Rfast rhdf5 RUVSeq S4Vectors]; }; + odseq = derive2 { name="odseq"; version="1.26.0"; sha256="0p51lay3xasqg55j99gdx1gpk93p4m2czvbw912h559v2s4hnzqq"; depends=[kebabs mclust msa]; }; + oligo = derive2 { name="oligo"; version="1.62.0"; sha256="0l6yb58frh4c080k6h8wyipc5kiz4qi7jimnr62jg8d737rrvnk2"; depends=[affxparser affyio Biobase BiocGenerics Biostrings DBI ff oligoClasses preprocessCore RSQLite zlibbioc]; }; + oligoClasses = derive2 { name="oligoClasses"; version="1.60.0"; sha256="1ik9xfx6g4gf54hm5f5prip1iz6694czpbhlgwd3p9qh8ddndgp8"; depends=[affyio Biobase BiocGenerics BiocManager Biostrings DBI ff foreach GenomicRanges IRanges RSQLite S4Vectors SummarizedExperiment]; }; + omada = derive2 { name="omada"; version="1.0.0"; sha256="1p9nywbh81d91cah8in5aa4say3zd9159f266k8qbk1psy93zz07"; depends=[clusterCrit clValid diceR dplyr fpc ggplot2 glmnet kernlab pdfCluster Rcpp reshape]; }; + omicRexposome = derive2 { name="omicRexposome"; version="1.20.0"; sha256="13xgp6hnn9py8400k1411fyzlxskdlams2x0p7skn44219iqpqwj"; depends=[Biobase ggplot2 ggrepel gridExtra isva limma MultiDataSet omicade4 PMA rexposome SmartSVA stringr SummarizedExperiment sva]; }; + omicade4 = derive2 { name="omicade4"; version="1.38.0"; sha256="1w9fsg0r6ir9nmmpf08b1mh8mnrzxk3f398y1w5dg34fdz4phgpg"; depends=[ade4 Biobase made4]; }; + omicplotR = derive2 { name="omicplotR"; version="1.18.0"; sha256="1h3r0lhkaqhl6cc05m4qjwl3hyz8ayig6xmj1jqi1kcm291js54c"; depends=[ALDEx2 compositions DT jsonlite knitr matrixStats rmarkdown shiny vegan zCompositions]; }; + omicsPrint = derive2 { name="omicsPrint"; version="1.18.0"; sha256="0zjidzy0nd9pb8f704xasm2nindaz953pmmv86c9fq0dmcv63wz4"; depends=[MASS matrixStats MultiAssayExperiment RaggedExperiment SummarizedExperiment]; }; + omicsViewer = derive2 { name="omicsViewer"; version="1.2.0"; sha256="1di3wyf6nzl39shbqmcxjr2kxmn7gghh0z977ax6lfzzwmqvqgzr"; depends=[beeswarm Biobase curl DT fastmatch fgsea flatxml ggplot2 ggseqlogo htmlwidgets httr Matrix matrixStats networkD3 openxlsx plotly psych RColorBrewer reshape2 RSQLite S4Vectors shiny shinybusy shinycssloaders shinyjs shinythemes shinyWidgets stringr SummarizedExperiment survival survminer]; }; + ompBAM = derive2 { name="ompBAM"; version="1.2.0"; sha256="0kfym9xlhjqrlcdzpvl0533f7pgyffgb4adwda6wiyq3mbyag5l6"; depends=[Rcpp zlibbioc]; }; + oncomix = derive2 { name="oncomix"; version="1.20.0"; sha256="0mdjyq2awrvh0r5sivb5zk0zg13100am8dd6r2bvw8nhn1ns5xby"; depends=[ggplot2 ggrepel mclust RColorBrewer SummarizedExperiment]; }; + oncoscanR = derive2 { name="oncoscanR"; version="1.0.0"; sha256="05rnw08rc9x65rgkw553szjjwqx0b9i6brg7hc0x8r180il22z9k"; depends=[GenomicRanges IRanges magrittr readr S4Vectors]; }; + oneSENSE = derive2 { name="oneSENSE"; version="1.20.0"; sha256="1lzb8i3frv3va2q28glwnjwszrynhky5y8fx10q4h52p2wqgc4v3"; depends=[flowCore gplots plotly Rtsne scatterplot3d shiny shinyFiles webshot]; }; + onlineFDR = derive2 { name="onlineFDR"; version="2.6.0"; sha256="0a66qyhd22vkn58m844fm8y22pv5s52r2hivvq0d9sqns7f8q286"; depends=[progress Rcpp RcppProgress]; }; + ontoProc = derive2 { name="ontoProc"; version="1.20.0"; sha256="1p7849msd9181f3y20n67rac5dbbq5a7z9cggw8y4yh4a9zjz4r0"; depends=[AnnotationHub Biobase BiocFileCache dplyr DT graph igraph magrittr ontologyIndex ontologyPlot Rgraphviz S4Vectors shiny SummarizedExperiment]; }; + openCyto = derive2 { name="openCyto"; version="2.10.1"; sha256="16wsa9dhnz8gz1siyhfxvnbfg142g7fmhxiqxr7n69qpq9w8yhr0"; depends=[BH Biobase BiocGenerics cpp11 data_table flowClust flowCore flowViz flowWorkspace graph ncdfFlow RBGL RColorBrewer]; }; + openPrimeR = derive2 { name="openPrimeR"; version="1.20.0"; sha256="0vc9fj4qz741px820m4yzl0nmfszb9pp8jz0mgm0bn8rypibhs1c"; depends=[ape BiocGenerics Biostrings DECIPHER digest distr distrEx dplyr fitdistrplus foreach GenomicRanges ggplot2 Hmisc IRanges lpSolveAPI magrittr openxlsx plyr RColorBrewer reshape2 S4Vectors scales seqinr stringdist stringr uniqtag XML]; }; + openPrimeRui = derive2 { name="openPrimeRui"; version="1.20.0"; sha256="0m98qwpb84bs0qfk17ibbxkjnknnqlkb21hmhqkjnd3hxrk615zc"; depends=[DT openPrimeR rmarkdown shiny shinyBS shinyjs]; }; + oposSOM = derive2 { name="oposSOM"; version="2.16.0"; sha256="0czk9bgi381vxa4n8hqamsq7aih26xi8wg3j8c1f2wlxhg6ha5ka"; depends=[ape Biobase biomaRt fastICA fdrtool graph igraph pixmap png Rcpp RcppParallel RCurl scatterplot3d tsne XML]; }; + oppar = derive2 { name="oppar"; version="1.26.0"; sha256="1ikivqi8dw8dsfbv115g79j7pkk37dxw2bwfdk0bmn0y1qnwr60l"; depends=[Biobase GSEABase GSVA]; }; + oppti = derive2 { name="oppti"; version="1.12.0"; sha256="0v3fahv6miy3zgaypmnp1f1b84l5zz3s3spimhxl1jbm26safj13"; depends=[devtools ggplot2 knitr limma parallelDist pheatmap RColorBrewer reshape]; }; + optimalFlow = derive2 { name="optimalFlow"; version="1.10.0"; sha256="1g47mw0i2gn08f4j7fb190jgb5ap02vaxgs615wnihrnljsihiky"; depends=[dbscan doParallel dplyr ellipse flowMeans foreach optimalFlowData randomForest Rfast rgl rlang robustbase transport]; }; + orthogene = derive2 { name="orthogene"; version="1.4.1"; sha256="1bg73n1z0v5py2w5rdvy49793v4l820fwrjd7gsdi8vf5z06hq52"; depends=[babelgene data_table DelayedArray dplyr ggplot2 ggpubr ggtree gprofiler2 grr homologene jsonlite Matrix patchwork repmis]; }; + pRoloc = derive2 { name="pRoloc"; version="1.38.0"; sha256="1rcvqcvvsp0ml6w86n794yw31sxqcwypjr5fb6slkm7bpql1gzij"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class coda dendextend e1071 FNN ggplot2 gtools hexbin kernlab knitr LaplacesDemon lattice MASS mclust mixtools MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo sampling scales]; }; + pRolocGUI = derive2 { name="pRolocGUI"; version="2.8.0"; sha256="0s6pyim5b3qm12ig8amkrf0r5clpk6021b08iw9jfc60qg68hmr2"; depends=[Biobase BiocGenerics colorspace colourpicker dplyr DT ggplot2 MSnbase pRoloc scales shiny shinydashboard shinydashboardPlus shinyhelper shinyjs shinyWidgets]; }; + packFinder = derive2 { name="packFinder"; version="1.10.0"; sha256="1vg5pmra6l75qx8q4pcvfxiz8rcagh9syca5r5xbzi1gwrj4mgvs"; depends=[ape Biostrings GenomicRanges IRanges kmer S4Vectors]; }; + padma = derive2 { name="padma"; version="1.8.0"; sha256="02i67ck4wnb7jp88bwnx763ijk7ayk69jrr0n0vzfgr408zvv4ir"; depends=[FactoMineR MultiAssayExperiment S4Vectors SummarizedExperiment]; }; + pageRank = derive2 { name="pageRank"; version="1.8.0"; sha256="00irmzaj7d2hdyc3lf1n2rpl7adsff4hjxxxc0ln1h2lbwhzbm90"; depends=[GenomicRanges igraph motifmatchr]; }; + paircompviz = derive2 { name="paircompviz"; version="1.36.0"; sha256="1nrxn494is198j1yc3janhf8d1vh772k5k5x3qfs75wcz1vwcihh"; depends=[Rgraphviz]; }; + pairkat = derive2 { name="pairkat"; version="1.4.0"; sha256="19z3ymlm93rl9fqcax9m4l7hayqp4vm38lcw9kk3k9pya2yrv8ry"; depends=[CompQuadForm data_table igraph KEGGREST magrittr SummarizedExperiment tibble]; }; + pandaR = derive2 { name="pandaR"; version="1.30.0"; sha256="057hcmgzcp15l8ylgw1rjh5vldsdz6wvf78q3j2m32iw2xrma262"; depends=[Biobase BiocGenerics ggplot2 hexbin igraph matrixStats plyr reshape RUnit]; }; + panelcn_mops = derive2 { name="panelcn.mops"; version="1.20.0"; sha256="1wr6sxky839plyshd4yqfsj08v1vqfk0g1z0wbb645n8cn43zawn"; depends=[cn_mops GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors]; }; + panp = derive2 { name="panp"; version="1.68.0"; sha256="17jci5fikyjwkd9h9rysiag8zkzckw3w0z3rxkv6gvazlmiqnyrn"; depends=[affy Biobase]; }; + pareg = derive2 { name="pareg"; version="1.2.0"; sha256="1b5ymhnznjx00vf4y09y2fw75czsd6g75bin4f6h33lpidl8z38x"; depends=[DOSE dplyr furrr ggplot2 ggraph glue igraph keras magrittr Matrix matrixLaplacian nloptr progress proxy purrr reticulate rlang shadowtext stringr tensorflow tfprobability tibble tidygraph tidyr]; }; + parglms = derive2 { name="parglms"; version="1.30.0"; sha256="1c4lhc1ixb765rqkshzlnjqbfx9smqgn40lnizhg84624jcbfmxc"; depends=[BatchJobs BiocGenerics doParallel foreach]; }; + parody = derive2 { name="parody"; version="1.56.0"; sha256="12i5g4ai7a0p81kvqvz1qw099cy3g71n69pij8w760r3jn0c9ilw"; depends=[]; }; + pathRender = derive2 { name="pathRender"; version="1.66.0"; sha256="08g645cjzm4ayj7bxsdlh776h4yg761iqbqs1xzh7ifim6ibzh6f"; depends=[AnnotationDbi cMAP graph RColorBrewer Rgraphviz]; }; + pathVar = derive2 { name="pathVar"; version="1.28.0"; sha256="1ygydyynfj5bqjkrrikxxqhj4bvnrif1hy0csfhm9dj19rwb891n"; depends=[data_table EMT ggplot2 gridExtra Matching mclust]; }; + pathifier = derive2 { name="pathifier"; version="1.36.0"; sha256="158dblhgx10wi78k8y48g9x7rw70pydc6bjrx65nzkl1h6i4km9s"; depends=[princurve R_oo]; }; + pathview = derive2 { name="pathview"; version="1.38.0"; sha256="0p7cdq03863zpw009prs1yh3gps1kw135anjfq6wpdkwza7xy4py"; depends=[AnnotationDbi graph KEGGgraph KEGGREST org_Hs_eg_db png Rgraphviz XML]; }; + pathwayPCA = derive2 { name="pathwayPCA"; version="1.14.0"; sha256="1ss71zs4jshvl3i2li0jfny5xr4lq9p25hbcm1kznpx3l9g9lklj"; depends=[lars survival]; }; + paxtoolsr = derive2 { name="paxtoolsr"; version="1.32.0"; sha256="02cwf2sypdf4fiyns1vfqy3djn6plq9w0zsisl2xlyrln7apmsl1"; depends=[httr igraph jsonlite plyr R_utils rappdirs readr rJava rjson XML]; }; + pcaExplorer = derive2 { name="pcaExplorer"; version="2.24.0"; sha256="0gs4az4h5mwnr3s8fq7im5p3mm4mhc0x5amjr2badqkw1fih3jp7"; depends=[AnnotationDbi base64enc biomaRt DESeq2 DT genefilter GenomicRanges ggplot2 ggrepel GO_db GOstats heatmaply IRanges knitr limma NMF pheatmap plotly plyr rmarkdown S4Vectors scales shiny shinyAce shinyBS shinydashboard SummarizedExperiment threejs tidyr topGO]; }; + pcaMethods = derive2 { name="pcaMethods"; version="1.90.0"; sha256="1cjmkfpbbfzkx6bi3r9jjx54iwkm4gl8hqa1776hxicq2x2c83s4"; depends=[Biobase BiocGenerics MASS Rcpp]; }; + pcxn = derive2 { name="pcxn"; version="2.20.0"; sha256="04h3nmm3xmzlgzqm6wnlw4mzhazy0ngbif9w35y9caazf2d0f7k8"; depends=[pcxnData pheatmap]; }; + pdInfoBuilder = derive2 { name="pdInfoBuilder"; version="1.62.0"; sha256="06gplxjpkv9hkcvf536hr3w5fj3gfdc3klfxf7d15ivy4szr0nm5"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + peakPantheR = derive2 { name="peakPantheR"; version="1.12.2"; sha256="0fdpg17m4dsq53nynbqw08i3qiplvsm0bzaj6bcslr5rc2psnpxy"; depends=[bslib doParallel DT foreach ggplot2 gridExtra lubridate minpack_lm MSnbase mzR pracma scales shiny shinycssloaders stringr XML]; }; + peco = derive2 { name="peco"; version="1.10.0"; sha256="1pmq3rag4qn62yicrafl5yrkhqb383iz5jv5d6v9fsf4jjs1048j"; depends=[assertthat circular conicfit doParallel foreach genlasso scater SingleCellExperiment SummarizedExperiment]; }; + pengls = derive2 { name="pengls"; version="1.4.0"; sha256="1cmpwdq1b5sz1nwvzh25xmv5x37dcnhxz5i7fwjyqa9my2m0r6is"; depends=[BiocParallel glmnet nlme]; }; + pepStat = derive2 { name="pepStat"; version="1.32.0"; sha256="06m1ny2wa41sfaz9inmj2wi58j6qd49ncd9yx79hkrh3zymz0fc4"; depends=[Biobase data_table fields GenomicRanges ggplot2 IRanges limma plyr]; }; + pepXMLTab = derive2 { name="pepXMLTab"; version="1.32.0"; sha256="13bwyxlf8nx86ldzj01qlfba6yh75pzb1kjkpi7p7hs1b0yvb5xp"; depends=[XML]; }; + periodicDNA = derive2 { name="periodicDNA"; version="1.8.0"; sha256="03wdxbgsrj2c7j3fgxigjbq349y5c8cw80xvb5ja7lbi1isfb785"; depends=[BiocParallel Biostrings BSgenome cowplot GenomeInfoDb GenomicRanges ggplot2 IRanges magrittr rtracklayer S4Vectors zoo]; }; + pgca = derive2 { name="pgca"; version="1.22.0"; sha256="0bcq1qks87jjgd2bwpds6xvcvidcvl9pq53mi0dafihgd0s2ycfn"; depends=[]; }; + phantasus = derive2 { name="phantasus"; version="1.18.2"; sha256="05js71pilnkkdycir1v46rf5l9vgkqnijavbm99csrqzr5dgwgrx"; depends=[AnnotationDbi assertthat Biobase ccaPP curl data_table DESeq2 fgsea GEOquery ggplot2 gtable htmltools httpuv httr jsonlite limma Matrix opencpu pheatmap protolite rhdf5 Rook scales stringr svglite]; }; + phenoTest = derive2 { name="phenoTest"; version="1.46.0"; sha256="0rcgbnqglfs9asyrssnhy7h99kikmnr7s1827y8q2agq3pl96q13"; depends=[annotate AnnotationDbi Biobase biomaRt BMA Category ellipse genefilter ggplot2 gplots GSEABase Heatplus hgu133a_db Hmisc hopach limma mgcv survival xtable]; }; + phenomis = derive2 { name="phenomis"; version="1.0.2"; sha256="15lk3wapaaqqrlp02b2cvdlx8dgcvc3vjsfv8i70qh89rljialf8"; depends=[Biobase biodb biodbChebi data_table futile_logger ggplot2 ggrepel htmlwidgets igraph limma MultiAssayExperiment MultiDataSet plotly PMCMRplus ranger RColorBrewer ropls SummarizedExperiment tibble tidyr VennDiagram]; }; + phenopath = derive2 { name="phenopath"; version="1.22.0"; sha256="0p2lh858ykhqz0zj4h1vmjd27szwkrlswanapz4shhmvb4plrlbv"; depends=[dplyr ggplot2 Rcpp SummarizedExperiment tibble tidyr]; }; + philr = derive2 { name="philr"; version="1.24.0"; sha256="0k93rl2wm9hzp9bcq2v35hn1p4wy8xarb5rzl92wa5w3fj0j4nlw"; depends=[ape ggplot2 ggtree phangorn tidyr]; }; + phosphonormalizer = derive2 { name="phosphonormalizer"; version="1.22.0"; sha256="1gap3ihi1xymfp3nymxss4fnhyrpzbva29ki6wdrsizr188d7b0k"; depends=[matrixStats plyr]; }; + phyloseq = derive2 { name="phyloseq"; version="1.42.0"; sha256="07zi059v6zwrm31qwc7fmg35fwqlqfb6c30wwj9q4m2y67srnskk"; depends=[ade4 ape Biobase BiocGenerics biomformat Biostrings cluster data_table foreach ggplot2 igraph multtest plyr reshape2 scales vegan]; }; + piano = derive2 { name="piano"; version="2.14.0"; sha256="10bq5k93gx35ysi7ja3821scrn455cyy8syc6aivaz00hcf7mzd8"; depends=[Biobase BiocGenerics DT fgsea gplots htmlwidgets igraph marray relations scales shiny shinydashboard shinyjs visNetwork]; }; + pickgene = derive2 { name="pickgene"; version="1.70.0"; sha256="0f6p41ryssw50il1hys6nhm818yzm4ppbksqm0mm7v6knk0mywzi"; depends=[MASS]; }; + pipeComp = derive2 { name="pipeComp"; version="1.8.0"; sha256="1nkfhza6nn0gzlfpg0c24rysz43vkx9syaccsrsn3a9i3vm76jh5"; depends=[aricode BiocParallel circlize clue cluster ComplexHeatmap cowplot dplyr ggplot2 intrinsicDimension knitr Matrix matrixStats randomcoloR RColorBrewer reshape2 Rtsne S4Vectors scales scater scran Seurat SingleCellExperiment SummarizedExperiment uwot viridisLite]; }; + pipeFrame = derive2 { name="pipeFrame"; version="1.14.0"; sha256="1wa06z8q7cxjaaq6fjvs69hd1yrl8s0gjn0733drrwsvsclp43ay"; depends=[Biostrings BSgenome digest GenomeInfoDb magrittr rmarkdown visNetwork]; }; + pkgDepTools = derive2 { name="pkgDepTools"; version="1.63.0"; sha256="10q0z1ps073py82zqii4sfdhnpvcyj4sx1yx3lzy5c41l8py6lag"; depends=[graph RBGL]; }; + planet = derive2 { name="planet"; version="1.6.0"; sha256="0260kdkambx29bl449a8ydysw99gq5pydaj8dq9bpn7p9rqd29xs"; depends=[dplyr magrittr tibble]; }; + plethy = derive2 { name="plethy"; version="1.36.0"; sha256="09929w6rd84hvz6fiydd5v0php9gvbvxgvsnxvkzwyxfmmmx1dzr"; depends=[Biobase BiocGenerics DBI ggplot2 IRanges plyr RColorBrewer reshape2 RSQLite S4Vectors Streamer]; }; + plgem = derive2 { name="plgem"; version="1.70.0"; sha256="0hnhfdrlg4907dc4s17cy4kgmq5nr616f1wi7jn72acxwqfl4bk8"; depends=[Biobase MASS]; }; + plier = derive2 { name="plier"; version="1.68.0"; sha256="116d55v0jwlb11imac8swi7l4prn829sq2jvr1iqsijb7vqlvqli"; depends=[affy Biobase]; }; + plotGrouper = derive2 { name="plotGrouper"; version="1.16.0"; sha256="19d4rgrvk96fm1w0iqx0nyfxgxkwh6xmvgw8bxj7rf8z5qmin9hm"; 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.4.2"; sha256="0c9n5hj3ib3nz3qc8jb2hvbl72c5pjpiny9hrygcw52aikj2wwjy"; depends=[curl data_table dplyr ggplotify IRanges plyranges purrr RColorBrewer Rcpp rlang strawr]; }; + plyranges = derive2 { name="plyranges"; version="1.18.0"; sha256="0lz43rwj7198s80lj2xk4r3dn3l1cpwxwvln5wz19l9131d8hclv"; depends=[BiocGenerics dplyr GenomeInfoDb GenomicAlignments GenomicRanges IRanges magrittr rlang Rsamtools rtracklayer S4Vectors tidyselect]; }; + pmm = derive2 { name="pmm"; version="1.30.0"; sha256="1yma0zpas34wh8axmq3q8hv3gp5vq9zsjvkbmzqd8mnvmkd4pbkg"; depends=[lme4]; }; + pmp = derive2 { name="pmp"; version="1.10.0"; sha256="10307945brcglm0c3ixbbn0icvb9aaclj0fvp1v56c9p2820j4ix"; depends=[ggplot2 impute matrixStats missForest pcaMethods reshape2 S4Vectors SummarizedExperiment]; }; + podkat = derive2 { name="podkat"; version="1.30.0"; sha256="0nd32qksdja1p1q7qcn87l4fyd7cqr8n6zgdqhhl811ag9pviizr"; depends=[Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp Rhtslib Rsamtools]; }; + pogos = derive2 { name="pogos"; version="1.18.0"; sha256="12z4nw4by4ms86m5n92p2a13b8pm88xrg34159pa4qpn874y4g91"; depends=[ggplot2 httr ontoProc rjson S4Vectors shiny]; }; + polyester = derive2 { name="polyester"; version="1.34.0"; sha256="16wa4ylipkpk6a1vyaiic1vs73x0xif7ik1w5rrh9mkr16lbdixs"; depends=[Biostrings IRanges limma logspline S4Vectors zlibbioc]; }; + powerTCR = derive2 { name="powerTCR"; version="1.18.0"; sha256="1d4wcvhkzzvm4g6v70dfx29iwrlry44bymprwir77y2dbwwr142f"; depends=[cubature doParallel evmix foreach magrittr purrr truncdist vegan VGAM]; }; + ppcseq = derive2 { name="ppcseq"; version="1.6.0"; sha256="1qywxjk2m8hxazw0238pdwzw2c6p7vhzx1m6bs3dkzn09jwpgav2"; depends=[benchmarkme BH dplyr edgeR foreach furrr future ggplot2 lifecycle magrittr purrr Rcpp RcppEigen rlang rstan rstantools StanHeaders tibble tidybayes tidyr]; }; + pqsfinder = derive2 { name="pqsfinder"; version="2.14.0"; sha256="116rzlhgyndnx9vylbiw2qgjns58gdzxc6bnxq0n6j81q3ny4a2k"; depends=[BH Biostrings GenomicRanges IRanges Rcpp S4Vectors]; }; + pram = derive2 { name="pram"; version="1.14.0"; sha256="0jxsd9wydj0y5zyfdglh2ik8ba9mzc5y6qw4lpqqwsd0wc99bi94"; depends=[BiocGenerics BiocParallel data_table GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; }; + prebs = derive2 { name="prebs"; version="1.38.0"; sha256="0s0ci8dn53b2h9z4vxbwaz58yj8w4s5kzjl5i516gzmhh6s1ss3g"; depends=[affy Biobase GenomeInfoDb GenomicAlignments GenomicRanges IRanges RPA S4Vectors]; }; + preciseTAD = derive2 { name="preciseTAD"; version="1.8.0"; sha256="002pnnbllb4bnaf1h1giavs4fbwhc7bdf5202nk734c08si33fi8"; depends=[caret cluster dbscan doSNOW e1071 foreach GenomicRanges gtools IRanges ModelMetrics pbapply pROC PRROC randomForest rCGH S4Vectors]; }; + preprocessCore = derive2 { name="preprocessCore"; version="1.60.0"; sha256="1l0m591scln024jdpib47fndhx2wfp9jgkj3mdmwd9nkc5y0qjda"; depends=[]; }; + primirTSS = derive2 { name="primirTSS"; version="1.16.0"; sha256="00h9m37ga3wsbcafg4c338457xqjlmgmhhkcrvm38x39h20kxrqy"; depends=[BiocGenerics Biostrings BSgenome_Hsapiens_UCSC_hg38 dplyr GenomicRanges GenomicScores Gviz IRanges JASPAR2018 phastCons100way_UCSC_hg38 purrr R_utils rtracklayer S4Vectors shiny stringr TFBSTools tibble tidyr]; }; + proActiv = derive2 { name="proActiv"; version="1.8.0"; sha256="150n6nglbji1510g6kkq6b7i0nix70c6zahdrr4a6p1dpg15gfgv"; depends=[AnnotationDbi BiocParallel data_table DESeq2 dplyr GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gplots IRanges rlang S4Vectors scales SummarizedExperiment tibble]; }; + proBAMr = derive2 { name="proBAMr"; version="1.32.0"; sha256="1pn48pmiz6cgc3hjczhpzgld69my7xk37d1k7k37gm0dwzpd85c3"; depends=[AnnotationDbi Biostrings GenomicFeatures GenomicRanges IRanges rtracklayer]; }; + proBatch = derive2 { name="proBatch"; version="1.13.0"; sha256="1z55rbgjzxkj0i9gwwbh3wa82w9xflnipkkx58bgnni1nfnbia9k"; depends=[Biobase corrplot data_table dplyr ggfortify ggplot2 lazyeval lubridate magrittr pheatmap preprocessCore purrr pvca RColorBrewer reshape2 rlang scales sva tibble tidyr viridis wesanderson WGCNA]; }; + proDA = derive2 { name="proDA"; version="1.12.0"; sha256="1b1p8sh80x5967rakyq75cj0sz01303w7p05b9irfr69yvfvlj45"; depends=[BiocGenerics extraDistr S4Vectors SummarizedExperiment]; }; + proFIA = derive2 { name="proFIA"; version="1.23.0"; sha256="0y08vj401f45dvgxjwjx94hvd0rk1wljk8n1irpkdafg24gv4fvj"; depends=[Biobase BiocParallel minpack_lm missForest pracma ropls xcms]; }; + procoil = derive2 { name="procoil"; version="2.26.0"; sha256="1ncls2bgdaaq1kc728p5ay95ypm5byyhpzjck34hfpq867lp7x7m"; depends=[Biostrings kebabs S4Vectors]; }; + profileScoreDist = derive2 { name="profileScoreDist"; version="1.26.0"; sha256="0bc2y8xy4nfainz7s2phmhmdpii1ws7k4cylvqjmr52fnssnxyl3"; depends=[BiocGenerics Rcpp]; }; + profileplyr = derive2 { name="profileplyr"; version="1.14.0"; sha256="1gd231y73ms8n6vyqwwfxl1fm7428amay5lc8ws7ap6q0wlal03a"; depends=[BiocGenerics BiocParallel ChIPseeker circlize ComplexHeatmap dplyr EnrichedHeatmap GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges magrittr org_Hs_eg_db org_Mm_eg_db pheatmap R_utils rGREAT rjson rlang Rsamtools rtracklayer S4Vectors soGGi SummarizedExperiment tidyr tiff TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene]; }; + progeny = derive2 { name="progeny"; version="1.20.0"; sha256="0f5sfi9r9dr6w3xmspsbzby8dpza8x7djif7p2h6l99kwkf68jsb"; depends=[Biobase decoupleR dplyr ggplot2 ggrepel gridExtra reshape2 tidyr]; }; + projectR = derive2 { name="projectR"; version="1.14.0"; sha256="08abn5ghixlj4sw8ibfnd9ngs0kvgyc8g7p54wm8q1k45vknvszm"; depends=[cluster CoGAPS dplyr ggalluvial ggplot2 limma NMF RColorBrewer reshape2 ROCR scales viridis]; }; + protGear = derive2 { name="protGear"; version="1.2.0"; sha256="0vk1h7zp9hvzilvwdq4346d55axcwbsvjp3vpzwnsjdidszs7q7r"; depends=[Biobase data_table dplyr factoextra FactoMineR flexdashboard genefilter GGally ggplot2 ggpubr gtools htmltools kableExtra Kendall knitr limma magrittr MASS pheatmap plotly plyr purrr readr remotes rlang rmarkdown shiny shinydashboard styler tibble tidyr vsn]; }; + proteasy = derive2 { name="proteasy"; version="1.0.0"; sha256="186g1g5c4i1pdgqc1nwdxlm1nwzggvqswa0ny0195kgqd5ifw5j4"; depends=[AnnotationFilter data_table EnsDb_Hsapiens_v86 EnsDb_Mmusculus_v79 EnsDb_Rnorvegicus_v79 ensembldb Rcpi stringr]; }; + proteinProfiles = derive2 { name="proteinProfiles"; version="1.38.0"; sha256="0a4nwd9dabl3l8bx9fq4dfmqnvmhf8lj832kiswbdb0p8q3dhqvb"; depends=[]; }; + psichomics = derive2 { name="psichomics"; version="1.24.0"; sha256="16i4w3f31qj5n0hcqbli65c3hqf8wx8vdc3sa1axjazrdbjj02sd"; 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.30.0"; sha256="00isn3avis6j2hdpamy5ps8lvmv6h93cwaimnvhcvnanb5wwksxr"; depends=[BgeeDB Biobase biomaRt ggplot2 GO_db igraph labeling RCurl reshape2 stringr topGO]; }; + ptairMS = derive2 { name="ptairMS"; version="1.6.0"; sha256="0gmzmqqq9w3a9m3nkiv9j7bhqk7yx3vg9d5cqhr8n64yh97nq06f"; 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]; }; + puma = derive2 { name="puma"; version="3.40.0"; sha256="1wdn5mgfig1pa153j2z6xa1k7qvha84yyyjc5a7yisrfnfrc9lcx"; depends=[affy affyio Biobase mclust oligo oligoClasses]; }; + pvac = derive2 { name="pvac"; version="1.46.0"; sha256="0ahcgw6kvkq0lrx4sbv902yz3gdkygxsqkd18kf45r0jzwd92k2s"; depends=[affy Biobase]; }; + pvca = derive2 { name="pvca"; version="1.38.0"; sha256="1cpyxgw1ynq3dms5yvcwaqd3s55ky80dgy811nl226mji278v9cl"; depends=[Biobase lme4 Matrix vsn]; }; + pwOmics = derive2 { name="pwOmics"; version="1.30.0"; sha256="1mklwy9p6miwzvcjzin5q0qcg9625bmbj5hi9dvm6cq48r0x5gwp"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics biomaRt data_table GenomicRanges gplots graph igraph rBiopaxParser STRINGdb]; }; + pwrEWAS = derive2 { name="pwrEWAS"; version="1.12.0"; sha256="1y8knyl0axnbidkg1z9n1dmchdb79ixr7d6m1g2zhlzp10kmi4pk"; depends=[abind BiocManager CpGassoc doParallel doSNOW foreach genefilter ggplot2 limma pwrEWAS_data shiny shinyBS shinyWidgets truncnorm]; }; + qPLEXanalyzer = derive2 { name="qPLEXanalyzer"; version="1.16.0"; sha256="18hswwff9smiz9dr28mmh7fh58wknb8cfzxvg5xdw4fw09cb48m9"; depends=[assertthat Biobase BiocGenerics Biostrings dplyr ggdendro ggplot2 IRanges limma magrittr MSnbase preprocessCore purrr RColorBrewer readr rlang scales stringr tibble tidyr tidyselect]; }; + qckitfastq = derive2 { name="qckitfastq"; version="1.14.0"; sha256="0220r27adgm8mj348602hzgrbj8f94d0xbcrfg9r5sjaajqbmf8w"; depends=[data_table dplyr ggplot2 magrittr Rcpp reshape2 rlang RSeqAn seqTools zlibbioc]; }; + qcmetrics = derive2 { name="qcmetrics"; version="1.36.0"; sha256="1ab6w3ghalgjarkq91ci85dwpwp1dqdsj2m9adlmx05wpljg9qc4"; depends=[Biobase knitr pander S4Vectors xtable]; }; + qmtools = derive2 { name="qmtools"; version="1.2.0"; sha256="19zn0q493vn45wllzbzqfgnazr5x6ik2hvh7pay3s95421vls1bd"; depends=[ggplot2 heatmaply igraph MsCoreUtils patchwork rlang scales SummarizedExperiment VIM]; }; + qpcrNorm = derive2 { name="qpcrNorm"; version="1.56.0"; sha256="0am89s61dzzycnih78ywnp955yn2jw728i2r8f4qb37asjbaf8ah"; depends=[affy Biobase limma]; }; + qpgraph = derive2 { name="qpgraph"; version="2.32.0"; sha256="1rzf4r4dfsrcp0flphsd4dc2b2bplkcpnzs1rlvknbmkg2p3hw8j"; depends=[annotate AnnotationDbi Biobase BiocParallel GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges Matrix mvtnorm qtl Rgraphviz S4Vectors]; }; + qrqc = derive2 { name="qrqc"; version="1.52.0"; sha256="0411477y7nazlwbz3pfszr1wfas6qd0g0iz0p9pmq16dw8pzkgg6"; depends=[Biostrings biovizBase brew ggplot2 plyr reshape Rhtslib testthat xtable]; }; + qsea = derive2 { name="qsea"; version="1.24.0"; sha256="1x3xv6r4qf8c3swycrmh83cigblsg37wjgxlw86gd78a58q84sim"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges gtools HMMcopy IRanges limma Rsamtools rtracklayer zoo]; }; + qsmooth = derive2 { name="qsmooth"; version="1.14.0"; sha256="0rgwvcydgmbj16bgxrs5yy1i4vikl9pakfdk6jxacr5p85v9ln07"; depends=[Hmisc SummarizedExperiment sva]; }; + qsvaR = derive2 { name="qsvaR"; version="1.2.0"; sha256="1g0ib16vflc3ncc8drq051r33cd0lavn7y7zw1xskmijxqxymkqh"; depends=[ggplot2 SummarizedExperiment sva]; }; + quantiseqr = derive2 { name="quantiseqr"; version="1.6.0"; sha256="0nxr4h3zwbvi80b5snz6diqm68w7dix0zk5p0zqp28nh1l45cl4w"; depends=[Biobase ggplot2 limSolve MASS preprocessCore rlang SummarizedExperiment tidyr]; }; + quantro = derive2 { name="quantro"; version="1.32.0"; sha256="0f274wh0w6nyipac05y6s2m2p60vkls5j4fwa5bc419j68h4znnz"; depends=[Biobase doParallel foreach ggplot2 iterators minfi RColorBrewer]; }; + quantsmooth = derive2 { name="quantsmooth"; version="1.64.0"; sha256="1adwws3brb01d4g6yidipnd8akkiyc3gpdr876hy57qnmcq8xipp"; depends=[quantreg]; }; + qusage = derive2 { name="qusage"; version="2.32.0"; sha256="1k2437hpds42ps3qfj828qv3wxw7w3xkhi6zk7fp24sfbq959nf5"; depends=[Biobase emmeans fftw limma nlme]; }; + qvalue = derive2 { name="qvalue"; version="2.30.0"; sha256="1dsia1c9ir989aqrgl5j5v4bysm3pyw9225yrcajiwgl8fxymph4"; depends=[ggplot2 reshape2]; }; + r3Cseq = derive2 { name="r3Cseq"; version="1.44.0"; sha256="1w2brdw6w3fws6p92k6n9bivzrfwa06iwsdzkliy3z4dn13mc3rv"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges IRanges qvalue RColorBrewer Rsamtools rtracklayer sqldf VGAM]; }; + rBiopaxParser = derive2 { name="rBiopaxParser"; version="2.38.0"; sha256="01b5sbh1cdri7fj5ffhmpby3h4qg2lgfyn0jg4zdv8rcj6gagcvw"; depends=[data_table XML]; }; + rCGH = derive2 { name="rCGH"; version="1.28.0"; sha256="0r4jj34p8qinfsl8yvcyijkrcap2ik5qfdyl43az1x13c57724mk"; depends=[aCGH affy AnnotationDbi DNAcopy GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges lattice limma mclust org_Hs_eg_db plyr shiny TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; }; + rDGIdb = derive2 { name="rDGIdb"; version="1.24.0"; sha256="0ghj9712f28y4afgdnpvf11kxi5nghis1rgppx3wfck566yi7s7h"; depends=[httr jsonlite]; }; + rGADEM = derive2 { name="rGADEM"; version="2.46.0"; sha256="070i3jdq8b5w7k42xw2fc3vcmv312i19fa1am4fbk3g3ssnm61p3"; depends=[Biostrings BSgenome GenomicRanges IRanges seqLogo]; }; + rGREAT = derive2 { name="rGREAT"; version="2.0.2"; sha256="1vmm7s5p8wqz1r8g1hy1l3mra3kkf76qgy5jkf84jxz7pi0clbld"; depends=[AnnotationDbi circlize digest doParallel DT foreach GenomeInfoDb GenomicFeatures GenomicRanges GetoptLong GlobalOptions GO_db IRanges org_Hs_eg_db progress RColorBrewer Rcpp RCurl rjson S4Vectors shiny TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; }; + rGenomeTracks = derive2 { name="rGenomeTracks"; version="1.4.0"; sha256="0mj9md7cv1i206a0b3pqmkq9frg5k6k22hqjbsmvjvsql3ir9gcl"; depends=[imager reticulate rGenomeTracksData]; }; + rRDP = derive2 { name="rRDP"; version="1.32.0"; sha256="1fpj6syb1k8kababm7bzgkr2qqqx83vnfm9dnr577yfxldbpfjb6"; depends=[Biostrings]; }; + rSWeeP = derive2 { name="rSWeeP"; version="1.10.0"; sha256="16r6qfphaiwjvwmfxbaxdlfmc5bjyx2n7anlsavfgvh00jp31hm2"; depends=[pracma]; }; + rScudo = derive2 { name="rScudo"; version="1.14.0"; sha256="1bk7w1rb87j6c3280r6bwnvfhfzdv0ck9g96y0a8k1g297gvyvcc"; depends=[Biobase BiocGenerics igraph S4Vectors stringr SummarizedExperiment]; }; + rTRM = derive2 { name="rTRM"; version="1.36.0"; sha256="11dp7vz1343hmaa7lly5m9h9fx94cpqqhsrvbb6vy57bh8nb6v4v"; depends=[AnnotationDbi DBI igraph RSQLite]; }; + rTRMui = derive2 { name="rTRMui"; version="1.36.0"; sha256="1gindmnq5vkapmfjpy9hglbk79g0s1sgzdljmhn3m5925h2al4k0"; depends=[MotifDb org_Hs_eg_db org_Mm_eg_db rTRM shiny]; }; + rWikiPathways = derive2 { name="rWikiPathways"; version="1.18.0"; sha256="0vk6j07xxkpdaybsiip41xavsiwc8qr165sxab5fy1r13w3ya4d3"; depends=[data_table httr RCurl rjson tidyr XML]; }; + rain = derive2 { name="rain"; version="1.32.0"; sha256="0zlb52z0wk6057ph12lj7313bfkpbn502568cgdwify8s6q9g8ms"; depends=[gmp multtest]; }; + rama = derive2 { name="rama"; version="1.72.0"; sha256="0i6crxnzhwxnc55xh2rv36jfwh4bd30alw1f05ixdrxwqwsslbpy"; depends=[]; }; + ramr = derive2 { name="ramr"; version="1.6.0"; sha256="1rn5jvrcl3823124iwwbrjx89yyp3yflhlvjwnf6jldvm5bwqwpz"; depends=[BiocGenerics doParallel doRNG EnvStats ExtDist foreach GenomicRanges ggplot2 IRanges matrixStats reshape2 S4Vectors]; }; + ramwas = derive2 { name="ramwas"; version="1.22.0"; sha256="1qrsv88q18aqfgznli3y54n3ml3f3fc888kipdqj1akxj70fxlsm"; depends=[BiocGenerics biomaRt Biostrings digest filematrix GenomicAlignments glmnet KernSmooth Rsamtools]; }; + randPack = derive2 { name="randPack"; version="1.44.0"; sha256="15afb49v7fjhlmnm9g2vnjcql288qsxlc0vyyki4m9w24kn8pvsa"; depends=[Biobase]; }; + randRotation = derive2 { name="randRotation"; version="1.10.0"; sha256="1siw6y3izcaw84pccxa1lklcl9y16hay4vn1nippqv47bd1ynawv"; depends=[Rdpack]; }; + rawrr = derive2 { name="rawrr"; version="1.6.0"; sha256="11n29nniqwbbfac05nw72rp6fm2309vwyll0lga6mkpjy71lq9zl"; depends=[]; }; + rbsurv = derive2 { name="rbsurv"; version="2.56.0"; sha256="0icqp84ppmj67vx0w69b7lh437fhydp6y8fi50qj6j8m6la4xr5k"; depends=[Biobase survival]; }; + rcellminer = derive2 { name="rcellminer"; version="2.20.0"; sha256="02nxyqr90izpzmvwi3pighnpf82m5b8rma1l2y24cnrymhrijmji"; depends=[Biobase ggplot2 gplots rcellminerData shiny stringr]; }; + rebook = derive2 { name="rebook"; version="1.8.0"; sha256="0albrc12i00xwwk7ck1f07vxn0i53pzdhvwgx2x64clz4z2pqhxv"; depends=[BiocStyle CodeDepends dir_expiry filelock knitr rmarkdown]; }; + receptLoss = derive2 { name="receptLoss"; version="1.10.0"; sha256="0vzikln11ychk9sx7wi8mpb2vqdh98by308jj4773qnk5flyg7b1"; depends=[dplyr ggplot2 magrittr SummarizedExperiment tidyr]; }; + reconsi = derive2 { name="reconsi"; version="1.10.0"; sha256="1hzwjmnbkdb4v8nvsk06vmyh5hm1snjn1a2q21jingppjs0dzvik"; depends=[ggplot2 ks Matrix matrixStats phyloseq reshape2]; }; + recount = derive2 { name="recount"; version="1.24.0"; sha256="1fgqrkgqdn03c32xlhry7ma638l42mnqqvci27j6pa1c5d1l8gva"; depends=[BiocParallel derfinder downloader GenomeInfoDb GenomicRanges GEOquery IRanges RCurl rentrez rtracklayer S4Vectors SummarizedExperiment]; }; + recount3 = derive2 { name="recount3"; version="1.8.0"; sha256="1syfy713ybsl8vlvfag6i85icv34k1y0f6g6v168snc2z1xq4yrd"; depends=[BiocFileCache data_table GenomicRanges Matrix R_utils RCurl rtracklayer S4Vectors sessioninfo SummarizedExperiment]; }; + recountmethylation = derive2 { name="recountmethylation"; version="1.8.0"; sha256="03zaphvsd61m707czcb02za2brsas51l6l7nidpq9iisiy58fwzk"; depends=[BiocFileCache HDF5Array IlluminaHumanMethylation450kmanifest minfi R_utils RCurl rhdf5 S4Vectors]; }; + recoup = derive2 { name="recoup"; version="1.26.0"; sha256="00ia9a9kqmcn329pvipaz15xfci6rw4377hpf7gnxhjkxx4b1rna"; depends=[BiocGenerics biomaRt Biostrings circlize ComplexHeatmap GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 httr IRanges Rsamtools RSQLite rtracklayer S4Vectors stringr]; }; + regionReport = derive2 { name="regionReport"; version="1.32.0"; sha256="0ilqm51dnhv5bhda7ljdn1x4hwr4infpngsvwn7wvssvsgp1pcz0"; depends=[BiocStyle DEFormats derfinder DESeq2 GenomeInfoDb GenomicRanges knitr knitrBootstrap RefManageR rmarkdown S4Vectors SummarizedExperiment]; }; + regioneR = derive2 { name="regioneR"; version="1.30.0"; sha256="01anwhz0axdl0g2zsaqz1qdxswxrryarbw6pmn5kmlpz4ipiq049"; depends=[Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges memoise rtracklayer S4Vectors]; }; + regioneReloaded = derive2 { name="regioneReloaded"; version="1.0.0"; sha256="1m04wsciqdqjsfqkyb9rpq44jlcwiq0chr441jprg5h905xwcyda"; depends=[cluster ggplot2 ggrepel RColorBrewer regioneR reshape2 Rtsne scales umap]; }; + regsplice = derive2 { name="regsplice"; version="1.24.0"; sha256="06pp0m5y7y7f6bbwrgln76kskffy1mhcz1546657bsaqr67iaxmz"; depends=[edgeR glmnet limma pbapply S4Vectors SummarizedExperiment]; }; + regutools = derive2 { name="regutools"; version="1.10.0"; sha256="198pypw448vp3wa17xw5ygvpidw4fry3qyf5q0z5rv5aq7dwd0ay"; depends=[AnnotationDbi AnnotationHub BiocFileCache Biostrings DBI GenomicRanges Gviz IRanges RCy3 RSQLite S4Vectors]; }; + restfulSE = derive2 { name="restfulSE"; version="1.20.0"; sha256="10v569icyhnqqmplx21na6jyv5ipf5fbgygpd05fbjy447p8fhay"; depends=[AnnotationDbi AnnotationHub bigrquery Biobase DBI DelayedArray dplyr ExperimentHub GO_db magrittr reshape2 rhdf5client rlang S4Vectors SummarizedExperiment]; }; + rexposome = derive2 { name="rexposome"; version="1.20.0"; sha256="19kmfwpqyjl40nny5y8wy9yjbsv798bmd6q08ayk95n8gn7vhpx5"; depends=[Biobase circlize corrplot FactoMineR ggplot2 ggrepel glmnet gplots gridExtra gtools Hmisc imputeLCMD lme4 lsr mice pryr reshape2 S4Vectors scales scatterplot3d stringr]; }; + rfPred = derive2 { name="rfPred"; version="1.36.0"; sha256="13nmym6qvfxp85n9qh597vz4w0c4cvpqi9jj68dqvc2z0dhlcij7"; depends=[data_table GenomeInfoDb GenomicRanges IRanges Rsamtools]; }; + rfaRm = derive2 { name="rfaRm"; version="1.10.2"; sha256="0i7w6062dl9plf839ildynldgbc1gjis1hw3y2flvkj9q5b32iar"; depends=[Biostrings data_table httr IRanges magick rsvg rvest S4Vectors stringi xml2]; }; + rgoslin = derive2 { name="rgoslin"; version="1.2.0"; sha256="0zcxd91qsz0p8z10cm1d2y81cj5ga7002p5sxzrzay33zcaa0f59"; depends=[dplyr Rcpp]; }; + rgsepd = derive2 { name="rgsepd"; version="1.30.0"; sha256="1bk6i336x2ng1kvgywcs18v6sn47cndahfbpcagl17x77pcna7by"; depends=[AnnotationDbi biomaRt DESeq2 GO_db goseq gplots org_Hs_eg_db SummarizedExperiment]; }; + rhdf5 = derive2 { name="rhdf5"; version="2.42.0"; sha256="1vxs227d1295fz8irr6fsv603cw96a801j8njhblvs0cry38d087"; depends=[rhdf5filters Rhdf5lib]; }; + rhdf5client = derive2 { name="rhdf5client"; version="1.20.0"; sha256="0wf0mv1kc3gd7vpazdip9253c1727ns9xysqfipg9lf1ydjny1fq"; depends=[DelayedArray httr R6 rjson S4Vectors]; }; + rhdf5filters = derive2 { name="rhdf5filters"; version="1.10.0"; sha256="17x2a3122mm3z9qnalw25am2x08cfpm17nwhigabid3ha3d2mgz1"; depends=[Rhdf5lib]; }; + riboSeqR = derive2 { name="riboSeqR"; version="1.32.0"; sha256="0la8kmxxh5jnqsrmmvyhi313bjdbqkiq16hcxar6mgyjhxlsm610"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools seqLogo]; }; + ribor = derive2 { name="ribor"; version="1.10.0"; sha256="16ikb3815cmwagjjjcv8rmshybpjl0vfc20mpl5xr92dzbnn7jj2"; depends=[dplyr ggplot2 hash rhdf5 rlang S4Vectors tidyr yaml]; }; + ribosomeProfilingQC = derive2 { name="ribosomeProfilingQC"; version="1.10.0"; sha256="04r0nhjfm659i5n2351f67dghjm9jrfvcnzbf7ylqgnhym4ibzrn"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome cluster EDASeq GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggfittext ggplot2 ggrepel IRanges motifStack Rsamtools Rsubread rtracklayer RUVSeq S4Vectors scales XVector]; }; + rifi = derive2 { name="rifi"; version="1.2.0"; sha256="0lfs8v0nk19ywj2qz3bws8cpw9z44x2rjcg48ffaj0dan3xazs44"; depends=[car cowplot doMC dplyr egg foreach ggplot2 nls2 nnet reshape2 rlang rtracklayer S4Vectors scales stringr SummarizedExperiment tibble]; }; + rmelting = derive2 { name="rmelting"; version="1.14.0"; sha256="0j3k68ms5iarqr7c0haijgxkqai5282awxbjg7cwsman5658l30y"; depends=[Rdpack rJava]; }; + rmspc = derive2 { name="rmspc"; version="1.4.0"; sha256="0lcygxazp137v9m3l7vkp4vpc9v0ahggvy4k53nx8sp84nljgpbh"; depends=[BiocManager GenomicRanges processx rtracklayer stringr]; }; + rnaEditr = derive2 { name="rnaEditr"; version="1.8.0"; sha256="1sk69a2cnnjfm2a9fdyj07zkgnjnzlpx2rdbz2lihck3pf3b63l3"; depends=[BiocGenerics bumphunter corrplot GenomeInfoDb GenomicRanges IRanges logistf plyr S4Vectors survival]; }; + rnaseqcomp = derive2 { name="rnaseqcomp"; version="1.28.0"; sha256="1znbydb4pdmchrwr94r87v3k6zmdh6f2d5vrs3wvs4ak343k86x4"; depends=[RColorBrewer]; }; + roar = derive2 { name="roar"; version="1.34.0"; sha256="1bf3ii3zaxkzw5y1wc5c474bq4cgavb67df54czmd3zi1lbhzphd"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicRanges IRanges rtracklayer S4Vectors SummarizedExperiment]; }; + rols = derive2 { name="rols"; version="2.26.0"; sha256="0y7r7anz68jl8f6q2v8f4gh32v946xkkk3kzgd38y8lklwdmrf0w"; depends=[Biobase BiocGenerics httr jsonlite progress]; }; + ropls = derive2 { name="ropls"; version="1.30.0"; sha256="0vjwci0z83b56q1wi1k00926f0vh3220a44m0zzfxg2cm5j3fwxb"; depends=[Biobase ggplot2 MultiAssayExperiment MultiDataSet plotly SummarizedExperiment]; }; + rprimer = derive2 { name="rprimer"; version="1.2.0"; sha256="0067jsxs627fmxm8zd5zpycgcyir7mkcph91nn2kawxkhjgxx9wk"; depends=[Biostrings bslib DT ggplot2 IRanges mathjaxr patchwork reshape2 S4Vectors shiny shinycssloaders shinyFeedback]; }; + rpx = derive2 { name="rpx"; version="2.6.0"; sha256="1530qv4z17lilly3qnpibcw7la10giwbvzwfwz6bg4p4q3l2zl6q"; depends=[BiocFileCache curl jsonlite RCurl xml2]; }; + rqt = derive2 { name="rqt"; version="1.24.0"; sha256="063prv68avs1nwjwvp3685v1n8xvcpg7zsiy613mqg2k3fp3hjcj"; depends=[car CompQuadForm glmnet Matrix metap pls ropls RUnit SummarizedExperiment]; }; + rqubic = derive2 { name="rqubic"; version="1.44.0"; sha256="0cmwx499a3s6a336afzx0h2mkhbxsrh4gpd486y5wxsbq2bva7zh"; depends=[biclust Biobase BiocGenerics]; }; + rrvgo = derive2 { name="rrvgo"; version="1.10.0"; sha256="0zh621sgy56phjm6h5733845js56s33zrww8z62l31v2yg0ff3zq"; depends=[AnnotationDbi ggplot2 ggrepel GO_db GOSemSim pheatmap shiny tm treemap umap wordcloud]; }; + rsbml = derive2 { name="rsbml"; version="2.56.0"; sha256="1syg49qz6vwzyw2zrxwrfb7kzgk0lim1q674f7mfvjah1fnv8bgc"; depends=[BiocGenerics graph]; }; + rsemmed = derive2 { name="rsemmed"; version="1.8.0"; sha256="0y7np05hcq7rhr0c56yiv4y1xqk7kjrlbwad0rqgpnlfscxclcav"; depends=[dplyr igraph magrittr stringr]; }; + rtracklayer = derive2 { name="rtracklayer"; version="1.58.0"; sha256="1qxr0ffmmkbfkbijz7pbks3kvms9k4a5rmma4j9p7ar477fxvlmk"; depends=[BiocGenerics BiocIO Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl restfulr Rsamtools S4Vectors XML XVector zlibbioc]; }; + runibic = derive2 { name="runibic"; version="1.20.0"; sha256="0g7hqgsq7h0338fmlb4ipv1kwiijcrfajhgwchn5akhspvsch269"; depends=[biclust Rcpp SummarizedExperiment testthat]; }; + sRACIPE = derive2 { name="sRACIPE"; version="1.14.0"; sha256="079lmgi6az5ri05lvca58msh678r7k1xwk3xhq8iffqh87wy6cmj"; depends=[BiocGenerics ggplot2 gplots gridExtra htmlwidgets MASS RColorBrewer Rcpp reshape2 S4Vectors SummarizedExperiment umap visNetwork]; }; + sSNAPPY = derive2 { name="sSNAPPY"; version="1.2.2"; sha256="1bg14wwcix64jkl5gbdy3jy2k50q7799swsadj4c5a6hk7bjk6jc"; depends=[BiocParallel dplyr edgeR ggforce ggnewscale ggplot2 ggraph graphite igraph magrittr org_Hs_eg_db pheatmap purrr Rcpp RcppArmadillo reshape2 rlang SummarizedExperiment tibble]; }; + sSeq = derive2 { name="sSeq"; version="1.36.0"; sha256="1w0iq7pih9z8662wj2lj1xbg66n752mx4g2q33ck5vwdxg10ry4c"; depends=[caTools RColorBrewer]; }; + safe = derive2 { name="safe"; version="3.38.0"; sha256="1gza1liz0y2i6f5nnnwbwl99fjp3cr1aknxiy3rmbjydfq8yxbrw"; depends=[AnnotationDbi Biobase SparseM]; }; + sagenhaft = derive2 { name="sagenhaft"; version="1.68.0"; sha256="0hh9gkv07qrlnarrj7h579dhisyq01c5jjl3rvq5w086wfy9154m"; depends=[SparseM]; }; + sampleClassifier = derive2 { name="sampleClassifier"; version="1.22.0"; sha256="0yvqr3xvji7zj6cw6kdr64k4sr71kpw3vwdv1dgi10ws3ygls65m"; depends=[annotate e1071 ggplot2 MGFM MGFR]; }; + sangeranalyseR = derive2 { name="sangeranalyseR"; version="1.8.0"; sha256="0b72lqn394l73ck857dfs7iyxidzcjcy9hfamfy72g4p7804xpan"; depends=[ape BiocStyle Biostrings data_table DECIPHER DT excelR ggdendro gridExtra knitr logger openxlsx phangorn plotly reshape2 rmarkdown sangerseqR seqinr shiny shinycssloaders shinydashboard shinyjs shinyWidgets stringr zeallot]; }; + sangerseqR = derive2 { name="sangerseqR"; version="1.34.0"; sha256="1i8zxqw48az743q1gziwp1ah7dkvy0gp26sfa2j20i7lard663mw"; depends=[Biostrings shiny]; }; + sarks = derive2 { name="sarks"; version="1.10.0"; sha256="1f3yypn7dzjq58jnkv3jc0330mddpapzn1wlvq2crjbh161mxaym"; depends=[binom Biostrings cluster IRanges rJava]; }; + satuRn = derive2 { name="satuRn"; version="1.6.0"; sha256="1gldcdnpbxc2bgi5sr3g0cgkfx8gx2jmyadnxzm07zcmi724nsyx"; depends=[BiocParallel boot ggplot2 limma locfdr Matrix pbapply SummarizedExperiment]; }; + savR = derive2 { name="savR"; version="1.36.0"; sha256="1b7kjgj2r6lgkdnrq91wcwvwb5an0gfdsbyp7j0pvn2byfm4lply"; depends=[ggplot2 gridExtra reshape2 scales XML]; }; + scAlign = derive2 { name="scAlign"; version="1.11.0"; sha256="01gy9p07nyx42i0phgc89yhjavpykzgh1mwr11358ddbwz41hxnr"; depends=[FNN ggplot2 irlba purrr Rtsne Seurat SingleCellExperiment tensorflow]; }; + scAnnotatR = derive2 { name="scAnnotatR"; version="1.4.0"; sha256="0rc035kzbzrxvlcpphzg0yg7q82jvlxpi9xjq8q59hvbpyg1sz93"; depends=[AnnotationHub ape caret data_tree dplyr e1071 ggplot2 kernlab pROC ROCR Seurat SingleCellExperiment SummarizedExperiment]; }; + scBFA = derive2 { name="scBFA"; version="1.12.0"; sha256="0884s9laa63yf2p9wf66a67ipkc2x075c432x8p96vr326p4h8nf"; depends=[copula DESeq2 ggplot2 MASS Matrix Seurat SingleCellExperiment SummarizedExperiment zinbwave]; }; + scBubbletree = derive2 { name="scBubbletree"; version="1.0.0"; sha256="0ivyp3zf7clr4zbdv2srjv42dx2zvlaq4yprccxb3yimrnmihks6"; depends=[ape future future_apply ggplot2 ggtree patchwork reshape2 scales Seurat]; }; + scCB2 = derive2 { name="scCB2"; version="1.8.0"; sha256="1r1iyw7wyvapnzxclrm036jfjnvlgpjpcwg635g0mwa4wyahsxnl"; depends=[doParallel DropletUtils edgeR foreach iterators Matrix rhdf5 Seurat SingleCellExperiment SummarizedExperiment]; }; + scClassify = derive2 { name="scClassify"; version="1.10.0"; sha256="0i7r9yiw13lzwvy2vxwkfkj3x7a54gv6r8syxib7qj8yr53nmyiy"; depends=[BiocParallel Cepo cluster diptest ggplot2 ggraph hopach igraph limma Matrix mgcv minpack_lm mixtools proxy proxyC S4Vectors statmod]; }; + scDD = derive2 { name="scDD"; version="1.22.0"; sha256="0kmnmlzww2xfd04lp9nsh0wkigab9ipgqlsn2jrd77fizpd0kvwg"; depends=[arm BiocParallel EBSeq fields ggplot2 mclust outliers S4Vectors scran SingleCellExperiment SummarizedExperiment]; }; + scDDboost = derive2 { name="scDDboost"; version="1.0.0"; sha256="066cp50n7cxr7wbcgz0207gh5a6h3lwbpfkn5w17w06k24f3zjkb"; depends=[BH BiocParallel cluster EBSeq ggplot2 mclust Oscope Rcpp RcppEigen SingleCellExperiment SummarizedExperiment]; }; + scDataviz = derive2 { name="scDataviz"; version="1.8.0"; sha256="0spw9m2grza3n2ghsw6z534xsd786rmww66l2xz7i37wjfdpv26a"; depends=[corrplot flowCore ggplot2 ggrepel MASS matrixStats RColorBrewer reshape2 S4Vectors scales Seurat SingleCellExperiment umap]; }; + scDblFinder = derive2 { name="scDblFinder"; version="1.12.0"; sha256="0gslh28rycx0p6a6fmzbsqy1hg2sn3pp5blxgw01qk9f0ank7szi"; depends=[BiocGenerics BiocNeighbors BiocParallel BiocSingular bluster DelayedArray GenomeInfoDb GenomicRanges igraph IRanges MASS Matrix Rsamtools rtracklayer S4Vectors scater scran scuttle SingleCellExperiment SummarizedExperiment xgboost]; }; + scFeatureFilter = derive2 { name="scFeatureFilter"; version="1.18.0"; sha256="04q0132vdcpxkwma91j29pac82fcjgvhhx42ppmxkmdjc3q3adzq"; depends=[dplyr ggplot2 magrittr rlang tibble]; }; + scGPS = derive2 { name="scGPS"; version="1.12.0"; sha256="1ymcrlwxjnq6l8k2dd90iv95ha1x6l29v33106wigiziaw5y1vxs"; depends=[caret DESeq2 dplyr dynamicTreeCut fastcluster ggplot2 glmnet locfit Rcpp RcppArmadillo RcppParallel SingleCellExperiment SummarizedExperiment]; }; + scHOT = derive2 { name="scHOT"; version="1.10.0"; sha256="0d065rg1942ynvzch3d34hjywgscp8wz1c4i71zmxm5rznkpzsxw"; depends=[BiocParallel ggforce ggplot2 igraph IRanges Matrix reshape S4Vectors SingleCellExperiment SummarizedExperiment]; }; + scMAGeCK = derive2 { name="scMAGeCK"; version="1.9.1"; sha256="1i6l8jxrd66aqk3m9212wsi8jqklvs0agsqrllvf9mrh16js4vby"; depends=[ggplot2 Seurat]; }; + scMET = derive2 { name="scMET"; version="1.0.0"; sha256="0j6zfb1qlqbvfgfr4nqn43lxwgslaxj3dqd2wbnnmmq7zv2hxmdl"; depends=[assertthat BH BiocStyle coda cowplot data_table dplyr ggplot2 logitnorm MASS Matrix matrixStats Rcpp RcppEigen RcppParallel rstan rstantools S4Vectors SingleCellExperiment StanHeaders SummarizedExperiment VGAM viridis]; }; + scMerge = derive2 { name="scMerge"; version="1.14.0"; sha256="0rwhii3ypvv0frbfmlkhyfzwgy2wcrd3kn09w9ikwi8pn8pivcjy"; depends=[BiocParallel BiocSingular cluster DelayedArray DelayedMatrixStats distr igraph M3Drop pdist proxy ruv S4Vectors SingleCellExperiment SummarizedExperiment]; }; + scPCA = derive2 { name="scPCA"; version="1.12.0"; sha256="1r84lnhmmhvb4qfmi575gjb2nrd4izaz9f4dzb1k8bmy83fkyfmv"; depends=[assertthat BiocParallel cluster coop DelayedArray dplyr elasticnet kernlab Matrix MatrixGenerics matrixStats origami purrr Rdpack RSpectra ScaledMatrix sparsepca stringr tibble]; }; + scPipe = derive2 { name="scPipe"; version="1.20.2"; sha256="1qy0chb4w30lpywmyd1a0xfa8r58n95pd9hnr2cx5y38vhz8x9b8"; depends=[AnnotationDbi BiocGenerics biomaRt dplyr GenomicRanges GGally ggplot2 glue hash magrittr MASS mclust org_Hs_eg_db org_Mm_eg_db Rcpp reshape Rhtslib rlang robustbase rtracklayer S4Vectors scales scater SingleCellExperiment stringr SummarizedExperiment testthat zlibbioc]; }; + scReClassify = derive2 { name="scReClassify"; version="1.4.0"; sha256="0jq5ygm9s2sxh7z7hdrjgzm7kvyba6lrxnva6nv8qvlhkcczfnl0"; depends=[e1071 randomForest SingleCellExperiment SummarizedExperiment]; }; + scRecover = derive2 { name="scRecover"; version="1.13.0"; sha256="1qwdgs4jf3xy4x9jdd0m4c9iawq3kdghdswicyf85wrw08hlggc2"; depends=[bbmle BiocParallel doParallel foreach gamlss kernlab MASS Matrix penalized preseqR pscl rsvd SAVER]; }; + scRepertoire = derive2 { name="scRepertoire"; version="1.8.0"; sha256="06807wfmj5gdjh55fx2fphalbms3a83mpyrhyigpb2whbr9yzmql"; depends=[doParallel dplyr ggalluvial ggplot2 ggraph igraph plyr powerTCR reshape2 rlang SeuratObject SingleCellExperiment stringdist stringr SummarizedExperiment tidygraph vegan]; }; + scShapes = derive2 { name="scShapes"; version="1.4.0"; sha256="1n0y86kd5cf4wz035q1pflifd5c455l2x57vfsfixmn5inixg6g1"; depends=[BiocParallel dgof emdbook magrittr MASS Matrix pscl VGAM]; }; + scTGIF = derive2 { name="scTGIF"; version="1.12.0"; sha256="0fx0n7ll5p3fxhd0v5366knpnisrbsadimpd9z0l3zw9818kr12p"; depends=[Biobase BiocStyle ggplot2 GSEABase igraph knitr msigdbr nnTensor plotly RColorBrewer Rcpp rmarkdown S4Vectors scales schex SingleCellExperiment SummarizedExperiment tagcloud tibble]; }; + scTHI = derive2 { name="scTHI"; version="1.10.0"; sha256="1x0yhqa7h1gfz1z1hm051b2ml1q8nlc9q0rm1mp38nc23hcjaj7n"; depends=[BiocParallel Rtsne]; }; + scTensor = derive2 { name="scTensor"; version="2.8.0"; sha256="0i15w3vl1yydag30kk7q5w95gjksb9ashann73xlp7v3j8ap1apq"; depends=[abind AnnotationDbi AnnotationHub BiocManager BiocStyle Category ccTensor checkmate crayon DOSE ggplot2 GOstats heatmaply igraph knitr MeSHDbi meshr nnTensor outliers plotly plotrix reactome_db ReactomePA rmarkdown RSQLite rTensor S4Vectors schex SingleCellExperiment SummarizedExperiment tagcloud visNetwork]; }; + scTreeViz = derive2 { name="scTreeViz"; version="1.4.0"; sha256="19pccz1j8pdx9a155hcs7f28p34zk3m3jaiywsbmxaxxd93bg084"; depends=[clustree data_table digest epivizr epivizrData epivizrServer ggplot2 ggraph httr igraph Matrix Rtsne S4Vectors scater scran Seurat SingleCellExperiment SummarizedExperiment sys]; }; + scanMiR = derive2 { name="scanMiR"; version="1.4.0"; sha256="009i4dkagv0mpmx8k8rdr1sl9n79kayfjj953h11b1x8i9gkshkj"; depends=[BiocParallel Biostrings cowplot data_table GenomeInfoDb GenomicRanges ggplot2 ggseqlogo IRanges S4Vectors stringi]; }; + scanMiRApp = derive2 { name="scanMiRApp"; version="1.4.0"; sha256="1cd77fij54iadbwlyl3l1w6fma85y2n9azmg5mbqr0sa977swgqr"; depends=[AnnotationDbi AnnotationFilter AnnotationHub BiocParallel Biostrings data_table digest DT ensembldb fst GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 htmlwidgets IRanges Matrix plotly rintrojs rtracklayer S4Vectors scanMiR scanMiRData shiny shinycssloaders shinydashboard shinyjqui waiter]; }; + scater = derive2 { name="scater"; version="1.26.1"; sha256="1mjnf2y41lvni77g9hyw8qlvlsi5nxv5ha0fnch1kmw9814nycq3"; depends=[beachmat BiocGenerics BiocNeighbors BiocParallel BiocSingular DelayedArray DelayedMatrixStats ggbeeswarm ggplot2 ggrastr ggrepel gridExtra Matrix pheatmap RColorBrewer RcppML rlang Rtsne S4Vectors scuttle SingleCellExperiment SummarizedExperiment uwot viridis]; }; + scatterHatch = derive2 { name="scatterHatch"; version="1.4.0"; sha256="0fig318c9njgl3ficp7fnriip3k9ig72g0r2jvp9q7aahjap586v"; depends=[ggplot2 plyr spatstat_geom]; }; + sccomp = derive2 { name="sccomp"; version="1.1.0"; sha256="1bx7zknpd377ailidgn0p6xl9bx0j7lpxkm4igjpy8lr6mya6fq3"; depends=[BH boot dplyr forcats ggplot2 ggrepel lifecycle magrittr patchwork purrr Rcpp RcppEigen RcppParallel readr rlang rstan rstantools scales SeuratObject SingleCellExperiment StanHeaders stringr tibble tidyr tidyselect]; }; + scde = derive2 { name="scde"; version="2.26.0"; sha256="0qwfhqph5nl45y68bb5083l5q9zjydhs3wv2i70mcfrzcayqqrhl"; depends=[BiocParallel Cairo edgeR extRemes flexmix MASS mgcv nnet pcaMethods quantreg RColorBrewer Rcpp RcppArmadillo rjson RMTstat Rook]; }; + scds = derive2 { name="scds"; version="1.14.0"; sha256="0zdf9yf5s0l8ma7d8yhi7bjd964yj84f5h6aq2p0sypjlnc515hd"; depends=[dplyr Matrix pROC S4Vectors SingleCellExperiment SummarizedExperiment xgboost]; }; + schex = derive2 { name="schex"; version="1.12.0"; sha256="08xfbf8yiwzhzi0p1cix5hdnshlib5mg42qpk7ir5667i5lp5l1h"; depends=[cluster concaveman dplyr entropy ggforce ggplot2 hexbin scales Seurat shiny SingleCellExperiment]; }; + scifer = derive2 { name="scifer"; version="1.0.0"; sha256="12zd13awjvwpgyinrixr7ys9989m2zs0w009r0nk0mgy0fh8vwhp"; depends=[Biostrings data_table DECIPHER dplyr flowCore ggplot2 gridExtra kableExtra knitr plyr rlang rmarkdown sangerseqR scales stringr tibble]; }; + scmap = derive2 { name="scmap"; version="1.20.0"; sha256="14vyjvfs2n4h0xsy25xg4zdmc8dqbg5vyl3qns6f0rh4bsshqdlm"; depends=[Biobase BiocGenerics dplyr e1071 ggplot2 googleVis matrixStats proxy randomForest Rcpp RcppArmadillo reshape2 S4Vectors SingleCellExperiment SummarizedExperiment]; }; + scmeth = derive2 { name="scmeth"; version="1.18.0"; sha256="1gqgq6ganjm8madimxbqyw3z2fxq8d3pjhrfjvmkwgd2fzk3wb4a"; depends=[AnnotationHub annotatr Biostrings BSgenome bsseq DelayedArray DT GenomeInfoDb GenomicRanges HDF5Array knitr reshape2 rmarkdown SummarizedExperiment]; }; + scone = derive2 { name="scone"; version="1.22.0"; sha256="0pg09r28xqjlvb6nbswglnmwi05q63fag6rp3sw41g6z8gm5wap7"; depends=[aroma_light BiocParallel boot class cluster compositions diptest edgeR fpc gplots hexbin limma MatrixGenerics matrixStats mixtools rARPACK RColorBrewer rhdf5 RUVSeq SingleCellExperiment SummarizedExperiment]; }; + scoreInvHap = derive2 { name="scoreInvHap"; version="1.20.0"; sha256="1y0vinj3si683z1d9hfaxfwgn6jshi7h689ixqygqciq63gac5wj"; depends=[BiocParallel Biostrings GenomicRanges snpStats SummarizedExperiment VariantAnnotation]; }; + scp = derive2 { name="scp"; version="1.8.0"; sha256="0n238jfn97y3njgfjqjf0baqr1l5pv2jm5zamyxyrz86p2811flf"; depends=[dplyr magrittr matrixStats MsCoreUtils MultiAssayExperiment QFeatures S4Vectors SingleCellExperiment SummarizedExperiment]; }; + scran = derive2 { name="scran"; version="1.26.0"; sha256="11iwpw44600pfx01vqil97k728m1wf4dljr27k2ak4s7z75kxfih"; depends=[beachmat BH BiocGenerics BiocParallel BiocSingular bluster DelayedArray DelayedMatrixStats dqrng edgeR igraph limma Matrix metapod Rcpp S4Vectors scuttle SingleCellExperiment statmod SummarizedExperiment]; }; + scruff = derive2 { name="scruff"; version="1.16.0"; sha256="0hg0f8k3mxhz4mk5r6qdhkr5h8rd1zv0x54bm1fq9pfc9vp90b8b"; depends=[AnnotationDbi BiocGenerics BiocParallel Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 ggthemes plyr Rsamtools Rsubread rtracklayer S4Vectors scales ShortRead SingleCellExperiment stringdist SummarizedExperiment]; }; + scry = derive2 { name="scry"; version="1.10.0"; sha256="0vx6fi8hnxms6d3hm3qxkrdx1qpyd7vhwdk7ds98ads070miqr21"; depends=[BiocSingular DelayedArray glmpca HDF5Array Matrix SingleCellExperiment SummarizedExperiment]; }; + scuttle = derive2 { name="scuttle"; version="1.8.2"; sha256="0anzmrhm6480p7xqsvpbihrrsv2bvz8znnlf46drwf1bd8n2hc3l"; depends=[beachmat BiocGenerics BiocParallel DelayedArray DelayedMatrixStats GenomicRanges Matrix Rcpp S4Vectors SingleCellExperiment SummarizedExperiment]; }; + sechm = derive2 { name="sechm"; version="1.6.0"; sha256="124dmcksw1yl7p0rwsp1ddlfv3ing56ggkaln421n9jnmj13fv0l"; depends=[circlize ComplexHeatmap matrixStats randomcoloR S4Vectors seriation SummarizedExperiment]; }; + segmentSeq = derive2 { name="segmentSeq"; version="2.32.0"; sha256="059q1wr1sfpi7vh7lrkpfzjd8rz19ya837y7hack0i9icygwjmk3"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; }; + segmenter = derive2 { name="segmenter"; version="1.4.0"; sha256="05ichsmjn3pklrknc95yz9ghhvwjg0y2jw6wcx2pf4d6iiwg7d5c"; depends=[bamsignals ChIPseeker chromhmmData ComplexHeatmap GenomicRanges IRanges S4Vectors SummarizedExperiment]; }; + selectKSigs = derive2 { name="selectKSigs"; version="1.10.0"; sha256="1pnqywp3wabd586xhlvxkrjvc1fyl4b0b6945rpz3qbaw1475pa6"; depends=[gtools HiLDA magrittr Rcpp]; }; + semisup = derive2 { name="semisup"; version="1.22.0"; sha256="1wn2a86rdvh8p37iifhmsq149j135dyp1h0xr86xfj88ffzj0y9n"; depends=[VGAM]; }; + seq2pathway = derive2 { name="seq2pathway"; version="1.30.0"; sha256="0g43693cqqi51fbfr28hbhcmnjam6vvf1llzn1wizbahcchgjvwx"; depends=[biomaRt GenomicRanges GSA nnet seq2pathway_data WGCNA]; }; + seqArchR = derive2 { name="seqArchR"; version="1.2.0"; sha256="03j4vff2lp1zzikhfa5sflnc0bd63r72aqim3jdsyrk5ic6355d3"; depends=[BiocParallel Biostrings cli cluster cvTools fpc ggplot2 ggseqlogo MASS Matrix matrixStats prettyunits reshape2 reticulate]; }; + seqCAT = derive2 { name="seqCAT"; version="1.20.0"; sha256="0hv0sabc82ak49di42xf7an9csgp9q0d9wkx7d1sjlfm9ayza88z"; depends=[dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges rlang rtracklayer S4Vectors scales SummarizedExperiment tidyr VariantAnnotation]; }; + seqCNA = derive2 { name="seqCNA"; version="1.44.0"; sha256="08hhjp5prgnr3c2j2r69f5sl2wf5jd1mrdy43b1kmnlpnm3yz16i"; depends=[adehabitatLT doSNOW GLAD seqCNA_annot]; }; + seqLogo = derive2 { name="seqLogo"; version="1.64.0"; sha256="1xlxi1iaqj7iabzbx15j6pk4551dyj6pa6a6qf5ffr3v7k2pmznp"; depends=[]; }; + seqPattern = derive2 { name="seqPattern"; version="1.30.0"; sha256="17nvxy8kdc1k0kyf0qny6jp3gzr024q37mmh5x18jjr794hnf9s5"; depends=[Biostrings GenomicRanges IRanges KernSmooth plotrix]; }; + seqTools = derive2 { name="seqTools"; version="1.32.0"; sha256="0ya3y3zam68zyw7ky2k8nswk4zd8c0fhihyg6qdw43aicisykms2"; depends=[zlibbioc]; }; + seqbias = derive2 { name="seqbias"; version="1.46.0"; sha256="0mc6lv7vkch138n46gk1q1hfhv37mfxjij39q36wa0jy7s8cagfa"; depends=[Biostrings GenomicRanges Rhtslib zlibbioc]; }; + seqcombo = derive2 { name="seqcombo"; version="1.20.0"; sha256="1q0yfcw30rgnz7l3miy1024vhjlqrhf2w0b3yvs4df6sb2w37q5m"; depends=[ggplot2 igraph yulab_utils]; }; + seqsetvis = derive2 { name="seqsetvis"; version="1.18.0"; sha256="07hsapdr1562jkf7xacpx97lq1rc3935smkxy22w4nzk7a6715sw"; depends=[cowplot data_table eulerr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 ggplotify IRanges limma pbapply pbmcapply png RColorBrewer Rsamtools rtracklayer S4Vectors UpSetR]; }; + sesame = derive2 { name="sesame"; version="1.16.1"; sha256="01b2a06xz9cggr57m920dh1pylac30l5w8mxq5vcb4jbl1flh6py"; depends=[BiocFileCache BiocParallel dplyr GenomeInfoDb GenomicRanges ggplot2 illuminaio IRanges MASS preprocessCore readr reshape2 S4Vectors sesameData stringr SummarizedExperiment tibble wheatmap]; }; + sevenC = derive2 { name="sevenC"; version="1.18.0"; sha256="1xw0whm905zm644iadv7yiqid82pxw46mv0n6m24591hc7p0xjyf"; depends=[BiocGenerics boot data_table GenomeInfoDb GenomicRanges InteractionSet IRanges purrr readr rtracklayer S4Vectors]; }; + sevenbridges = derive2 { name="sevenbridges"; version="1.28.0"; sha256="1sfwa4i3ak87wfj04y5gi4a5cw9by27xqv41gz29sgclh61gmpc0"; depends=[curl data_table docopt httr jsonlite objectProperties S4Vectors stringr uuid yaml]; }; + shinyMethyl = derive2 { name="shinyMethyl"; version="1.34.0"; sha256="1xbadc4xszcqh211r8z0wp417f17aczz834icli17mcsl996ln3a"; depends=[BiocGenerics IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; }; + shinyepico = derive2 { name="shinyepico"; version="1.6.0"; sha256="00ma5la96w5djjcmz42jc6bzp8b9jk398y0s4sbqg6pkwcw235hd"; depends=[data_table doParallel dplyr DT foreach GenomicRanges ggplot2 gplots heatmaply limma minfi plotly reshape2 rlang rmarkdown rtracklayer shiny shinycssloaders shinyjs shinythemes shinyWidgets statmod tidyr zip]; }; + sigFeature = derive2 { name="sigFeature"; version="1.16.0"; sha256="0ivfi4cr2lw59cj0c3biqbbc1m3vnv480gmijfk9hx86g60wx5fp"; depends=[BiocParallel biocViews e1071 Matrix nlme openxlsx pheatmap RColorBrewer SparseM SummarizedExperiment]; }; + sigPathway = derive2 { name="sigPathway"; version="1.66.0"; sha256="0vb6v61ak8z3hx7d65lr1hrxk89n36j0zi3x0pp828khdyh3zvag"; depends=[]; }; + siggenes = derive2 { name="siggenes"; version="1.72.0"; sha256="0gis34s56y4xa61a9gywjwgd6525ywasa6r4xxhj3rshh1dz5jkv"; depends=[Biobase multtest scrime]; }; + sights = derive2 { name="sights"; version="1.24.0"; sha256="1qwm470ysc4jlp6pazpmyb8wpcisv2397328f0x37g5a5vilzx7c"; depends=[ggplot2 lattice MASS qvalue reshape2]; }; + signatureSearch = derive2 { name="signatureSearch"; version="1.12.0"; sha256="1wzhli6da0x7126av9jx1qar04wlwx16krzspglfg0c1xagvm7sk"; depends=[AnnotationDbi BiocGenerics BiocParallel clusterProfiler data_table DelayedArray DOSE dplyr ExperimentHub fastmatch fgsea ggplot2 GSEABase HDF5Array magrittr Matrix org_Hs_eg_db qvalue Rcpp reactome_db readr reshape2 rhdf5 RSQLite scales SummarizedExperiment tibble visNetwork]; }; + signeR = derive2 { name="signeR"; version="2.0.0"; sha256="0pygcq7xc15xmab71dxqsw14rg50mnszlnmx39wz6gp75m3n41c5"; depends=[ada BiocFileCache BiocGenerics Biostrings BSgenome bsplus class clue cowplot dplyr DT e1071 future future_apply GenomeInfoDb GenomicRanges ggplot2 ggpubr glmnet IRanges kknn listenv magrittr MASS maxstat nloptr NMF pheatmap PMCMRplus ppclust pROC proxy pvclust randomForest RColorBrewer Rcpp RcppArmadillo readr reshape2 rtracklayer scales shiny shinycssloaders shinydashboard shinyWidgets survival survivalAnalysis survminer tibble tidyr VariantAnnotation VGAM]; }; + signifinder = derive2 { name="signifinder"; version="1.0.0"; sha256="0gbhi9sklknnc4hp2w5wp2bj2rq0hmfqzcx3nqqf78fh00gz5bk5"; depends=[AnnotationDbi BiocGenerics ComplexHeatmap consensusOV DGEobj_utils dplyr ensembldb ggplot2 ggridges GSVA IRanges magrittr matrixStats maxstat openair org_Hs_eg_db patchwork RColorBrewer SummarizedExperiment survival survminer TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene viridis]; }; + sigsquared = derive2 { name="sigsquared"; version="1.30.0"; sha256="0xai7gk3kq669ngfdf7cpizaxv42sj50dzvc6xcqkzahn7l3y9pw"; depends=[Biobase survival]; }; + similaRpeak = derive2 { name="similaRpeak"; version="1.30.0"; sha256="0ncx8r62lvj0711f37szd9998cfpq5nsw6nq00xvkd781p3jf0gn"; depends=[R6]; }; + simpleSeg = derive2 { name="simpleSeg"; version="1.0.0"; sha256="1i4pzi66hlfmyd23mk3rck4zainaj3nsz2ksc3cvi2vrk0whm4ds"; depends=[BiocParallel cytomapper EBImage S4Vectors spatstat_geom SummarizedExperiment terra]; }; + simplifyEnrichment = derive2 { name="simplifyEnrichment"; version="1.8.0"; sha256="130x5hy6jzglc6clwanh2kmhw567i802w620ffs3977kjfpjsjgy"; depends=[AnnotationDbi BiocGenerics circlize clue cluster colorspace ComplexHeatmap digest GetoptLong GlobalOptions GO_db GOSemSim Matrix org_Hs_eg_db proxyC slam tm]; }; + sincell = derive2 { name="sincell"; version="1.30.0"; sha256="0dsl7p18nw7db7g7fx3l4x6mpj4krkxxacl8gddq91xiggjiib1l"; depends=[cluster entropy fastICA fields ggplot2 igraph MASS proxy Rcpp reshape2 Rtsne scatterplot3d statmod TSP]; }; + single = derive2 { name="single"; version="1.2.0"; sha256="0dszp2w7qxx4cnlm1bsy89dfmwqmg2fr337wqdbv42cgniyscxwa"; depends=[BiocGenerics Biostrings dplyr GenomicAlignments IRanges reshape2 rlang Rsamtools stringr tidyr]; }; + singleCellTK = derive2 { name="singleCellTK"; version="2.8.0"; sha256="03jiqf23f04cvzrrwq29kwd1x84dnv5nf41hbzmi3jd6rjzdnd5s"; depends=[AnnotationHub ape batchelor Biobase BiocParallel celda celldex circlize cluster colorspace colourpicker ComplexHeatmap cowplot data_table DelayedArray DelayedMatrixStats DESeq2 dplyr DropletUtils DT enrichR ensembldb ExperimentHub fields fishpond ggplot2 ggplotify ggrepel ggtree gridExtra GSEABase GSVA GSVAdata igraph KernSmooth limma magrittr MAST Matrix matrixStats metap msigdbr multtest plotly plyr R_utils reshape2 reticulate rlang rmarkdown ROCR Rtsne S4Vectors scater scDblFinder scds scMerge scran scRNAseq scuttle Seurat shiny shinyalert shinycssloaders shinyjs SingleCellExperiment SingleR SoupX SummarizedExperiment sva TENxPBMCData tibble TrajectoryUtils TSCAN tximport VAM withr yaml zinbwave]; }; + singscore = derive2 { name="singscore"; version="1.18.0"; sha256="10hffcscysv8n1iijn2pqzkn9rhnh0xp07hl9b3688jzi1ydjj3k"; depends=[Biobase BiocParallel edgeR ggplot2 ggrepel GSEABase magrittr matrixStats plotly plyr RColorBrewer reshape reshape2 S4Vectors SummarizedExperiment tidyr]; }; + sitadela = derive2 { name="sitadela"; version="1.6.0"; sha256="1vqs5vdj12dll199cmsx6l1brfk36cgmv89lqxgf6bl0570gl6ls"; depends=[Biobase BiocGenerics biomaRt Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools RSQLite rtracklayer S4Vectors]; }; + sitePath = derive2 { name="sitePath"; version="1.14.0"; sha256="06l55v7s8sh2gj687pdp93ffkaw57ad68sbkf616hdr199dfj1la"; depends=[ape aplot ggplot2 ggrepel ggtree gridExtra RColorBrewer Rcpp seqinr tidytree]; }; + sizepower = derive2 { name="sizepower"; version="1.68.0"; sha256="10wsvs54qdvwhpy865dlpjwzq7l1cnsg8hq1vs1jp36vspwwxzrg"; depends=[]; }; + skewr = derive2 { name="skewr"; version="1.30.0"; sha256="1dwckg1i55dgz6r19gkvpa1k7j2xdhzr0g408q951npi1hzq1hmb"; depends=[IlluminaHumanMethylation450kmanifest methylumi minfi mixsmsn RColorBrewer S4Vectors wateRmelon]; }; + slalom = derive2 { name="slalom"; version="1.20.0"; sha256="02j7i5wkip4ybkc61alxq4fnlmmam4jilxbxzxnq9w5cwkaf776h"; depends=[BH ggplot2 GSEABase Rcpp RcppArmadillo rsvd SingleCellExperiment SummarizedExperiment]; }; + slingshot = derive2 { name="slingshot"; version="2.6.0"; sha256="00h9iid2z9r55l4hlaa1q0nkbcfq0f7k2afkw4ymjwhm1b8yqj33"; depends=[igraph matrixStats princurve S4Vectors SingleCellExperiment SummarizedExperiment TrajectoryUtils]; }; + snapCGH = derive2 { name="snapCGH"; version="1.68.0"; sha256="1zxvl8mkby7yb5kppddag6k9w78d1fm6adx52h4cgrfckn28w64q"; depends=[aCGH cluster DNAcopy GLAD limma tilingArray]; }; + snapcount = derive2 { name="snapcount"; version="1.10.0"; sha256="0y30ndqgld4c5ql8xp68xv3bi92njjqh9jcj2pxvkf7h9r3j8lad"; depends=[assertthat data_table GenomicRanges httr IRanges jsonlite magrittr Matrix purrr R6 rlang stringr SummarizedExperiment]; }; + snifter = derive2 { name="snifter"; version="1.8.0"; sha256="0n39vlfkljckh9hpjwfyxbxd2747ss7y9nxb0hb0188p75q2dfkl"; depends=[assertthat basilisk irlba reticulate]; }; + snm = derive2 { name="snm"; version="1.46.0"; sha256="19gxs81i4ghwdjfi86xxsgxniha1wkmm2ivddcv5nhv90d3lai2j"; depends=[corpcor lme4]; }; + snpStats = derive2 { name="snpStats"; version="1.48.0"; sha256="14rkrav4iydc85194skdy33sk365pjmmvxxvzaxxh0k9ds009qwx"; depends=[BiocGenerics Matrix survival zlibbioc]; }; + soGGi = derive2 { name="soGGi"; version="1.30.0"; sha256="08prw50z7rdcys8gbc0sn55i8zkydijjpjcqpz5hw7bcdcqkbd37"; depends=[BiocGenerics BiocParallel Biostrings chipseq GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges preprocessCore reshape2 Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; + sojourner = derive2 { name="sojourner"; version="1.11.0"; sha256="1s0iqzn65s9g4yymy059z122i9wvgkcb5718snzxhj7mkqjzwhhc"; depends=[dplyr EBImage fitdistrplus ggplot2 gridExtra lattice MASS mclust minpack_lm mixtools mltools nls2 pixmap plyr R_matlab Rcpp reshape2 rlang scales shiny shinyjs sp truncnorm]; }; + spaSim = derive2 { name="spaSim"; version="1.0.2"; sha256="0qp2qr2my4s8yxkzyhsajzvgy3w5zsx70z2kp44sfpgh52krijmx"; depends=[dplyr ggplot2 RANN SpatialExperiment spatstat_geom spatstat_random SummarizedExperiment]; }; + sparrow = derive2 { name="sparrow"; version="1.4.0"; sha256="04cshh2ilp5h5ls7zj018imgp1s8lw42i0x0vb171nrjnav7a8pl"; depends=[babelgene BiocGenerics BiocParallel BiocSet checkmate circlize ComplexHeatmap data_table DelayedMatrixStats edgeR ggplot2 GSEABase irlba limma Matrix plotly viridis]; }; + sparseDOSSA = derive2 { name="sparseDOSSA"; version="1.22.0"; sha256="1c8dlfc1jmr3c4s1fnr31444mh92sn21bw8rjcr6andx4cmlryz2"; depends=[MASS MCMCpack optparse tmvtnorm]; }; + sparseMatrixStats = derive2 { name="sparseMatrixStats"; version="1.10.0"; sha256="1rq23ra4nnz9dx0gsg9bh8zcbz6s0pyvjwq30xl6g4hbqz927xb0"; depends=[Matrix MatrixGenerics matrixStats Rcpp]; }; + sparsenetgls = derive2 { name="sparsenetgls"; version="1.16.0"; sha256="1d4gpf919rl50cbnk849bgp7wz3iiczzg94v856z2r7d52f4qx86"; depends=[glmnet huge MASS Matrix]; }; + spatialDE = derive2 { name="spatialDE"; version="1.4.0"; sha256="0j6i3ky6i9hzib2zqszzjqm002k6ssy3c4nwk462l0bjy720whrk"; depends=[basilisk checkmate ggplot2 ggrepel gridExtra Matrix reticulate S4Vectors scales SpatialExperiment SummarizedExperiment]; }; + spatialHeatmap = derive2 { name="spatialHeatmap"; version="2.4.0"; sha256="0swqmynvhr1vdmrr465aja6zln19psai5ymv07kpakb5dxhfpsgp"; depends=[BiocFileCache BiocParallel data_table dplyr dynamicTreeCut edgeR flashClust genefilter ggdendro ggplot2 ggplotify gplots gridExtra grImport htmlwidgets igraph limma Matrix plotly rappdirs reshape2 rsvg S4Vectors scater scran scuttle shiny shinydashboard SingleCellExperiment SummarizedExperiment tibble UpSetR visNetwork WGCNA xml2 yaml]; }; + spatzie = derive2 { name="spatzie"; version="1.4.0"; sha256="040s8nmg5hr6rjb7cn2jxjihr8m80v1bdbcynikqxn6vw1cqr3h2"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicFeatures GenomicInteractions GenomicRanges ggplot2 IRanges matrixStats motifmatchr S4Vectors SummarizedExperiment TFBSTools]; }; + specL = derive2 { name="specL"; version="1.32.1"; sha256="088fgp8lz6bnrx0ddn61x25vrp672q7cr0ky4x2vh31q4rd0j4zw"; depends=[DBI protViz RSQLite seqinr]; }; + spicyR = derive2 { name="spicyR"; version="1.10.5"; sha256="16rn43z6dih1ik7443b1pk1ccwfh0flncab6w6b1xvnn8p6nc8na"; depends=[BiocGenerics BiocParallel concaveman data_table dplyr ggforce ggplot2 IRanges lme4 lmerTest mgcv pheatmap rlang S4Vectors scam SingleCellExperiment SpatialExperiment spatstat_explore spatstat_geom SummarizedExperiment tidyr]; }; + spikeLI = derive2 { name="spikeLI"; version="2.58.0"; sha256="1wv6xybjf7m9rlylr2dbh5d9kx5vxc0l72y0581fj7l9352qgznh"; depends=[]; }; + spiky = derive2 { name="spiky"; version="1.4.0"; sha256="0pdsxidi0pwmwb94iv4l7346vsy9ccwqlr8l62c7ykgnvgn0v1ji"; depends=[bamlss Biostrings BlandAltmanLeh BSgenome GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges Rsamtools S4Vectors scales]; }; + spkTools = derive2 { name="spkTools"; version="1.54.0"; sha256="14nx30vhimx251w2fixbiis72wi2v8f9rcdbx18rkf6wg0iz2wbj"; depends=[Biobase gtools RColorBrewer]; }; + splatter = derive2 { name="splatter"; version="1.22.0"; sha256="179vyapbq9h25h2sv2ai3k94m8k8qn4winvic43dgw6wz15jcvab"; depends=[BiocGenerics BiocParallel checkmate crayon edgeR fitdistrplus ggplot2 locfit matrixStats S4Vectors scales scater SingleCellExperiment SummarizedExperiment]; }; + splineTimeR = derive2 { name="splineTimeR"; version="1.26.0"; sha256="125g0sxlkj8f699f0arnq43inx9w4a05bb5jfn6nw9xiqv5pqgah"; depends=[Biobase FIs GeneNet GSEABase gtools igraph limma longitudinal]; }; + splots = derive2 { name="splots"; version="1.64.0"; sha256="0malaw94s55qh7x7x98s472vnr2rgylgfvkrf0113h2l1v92nhmy"; depends=[RColorBrewer]; }; + spqn = derive2 { name="spqn"; version="1.10.0"; sha256="024zjcf2wwj2i85zkwdcqxxr88066dsbw2i44mmihk121yhf6qg4"; depends=[BiocGenerics ggplot2 ggridges matrixStats SummarizedExperiment]; }; + srnadiff = derive2 { name="srnadiff"; version="1.18.0"; sha256="1fkkbhdwrirq5z1435l3vi1xy324s5ywlg17npdk30k06xa9bpfr"; depends=[baySeq BiocManager BiocParallel BiocStyle DESeq2 devtools edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges Rcpp Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; + ssPATHS = derive2 { name="ssPATHS"; version="1.12.0"; sha256="08wcv1jni9vhqnzvn41nsq9254px3qdf2wv60zkyrw8wpwkpyfy8"; depends=[dml MESS ROCR SummarizedExperiment]; }; + sscore = derive2 { name="sscore"; version="1.70.0"; sha256="07rzrac3v1lz4qas0zl6b9mjh5kvpd2wjgczc92dsl9x7ac4nn9i"; depends=[affy affyio]; }; + sscu = derive2 { name="sscu"; version="2.28.0"; sha256="0c1g5220bk5rrhngbjdix6bj03vd9vx62z3hmjkx3dq88p1wfkq6"; depends=[BiocGenerics Biostrings seqinr]; }; + ssize = derive2 { name="ssize"; version="1.72.0"; sha256="1cgh2yniw4mlbmfcmawpv9kf8fkjw6w8b58vkndwcpf6pz7bznbk"; depends=[gdata xtable]; }; + ssrch = derive2 { name="ssrch"; version="1.14.0"; sha256="0w4b7xg0qxsn7sn9skqa1qvjrmicr8baxlasaza1gjxlqngvj95c"; depends=[DT shiny]; }; + ssviz = derive2 { name="ssviz"; version="1.32.0"; sha256="1zplxlbd2f5h86dzgfw55q09jpd27fkaslswj6lrvavw9a89pmc8"; depends=[Biostrings ggplot2 RColorBrewer reshape Rsamtools]; }; + stJoincount = derive2 { name="stJoincount"; version="1.0.0"; sha256="0lphq2dff2dpbjixwf83dazb2fkncfn8jbaqsnhbskd8ansmydid"; depends=[dplyr ggplot2 magrittr pheatmap raster Seurat sp SpatialExperiment spdep SummarizedExperiment]; }; + staRank = derive2 { name="staRank"; version="1.40.0"; sha256="1f92yc538dvyqyxswrqwf1c0r8kaj45wpcpikrs9vr1g0s072lv5"; depends=[cellHTS2]; }; + stageR = derive2 { name="stageR"; version="1.20.0"; sha256="1layvv9akzijw2br9jzw6cwxn2rimha4m48fm8wn465n1nqcns0m"; depends=[SummarizedExperiment]; }; + standR = derive2 { name="standR"; version="1.2.0"; sha256="177kk3kcydwhb2ha9jxw0zlfzv93ga20pv7mkd1m5x0nwf400q8d"; depends=[Biobase BiocGenerics dplyr edgeR ggalluvial ggplot2 limma mclustcomp patchwork readr rlang ruv RUVSeq S4Vectors SingleCellExperiment SpatialExperiment SummarizedExperiment tibble tidyr]; }; + statTarget = derive2 { name="statTarget"; version="1.28.0"; sha256="1cd5rbwrf9ybh08zfb7wagr5p9172xrblf5k8kh9hd7v0qd8ax1j"; depends=[impute pdist pls plyr randomForest ROC rrcov]; }; + stepNorm = derive2 { name="stepNorm"; version="1.70.0"; sha256="0b26habd4gs0iy8vrq6mfink8yy93sn5hgq5jlx6c65rba8cs1nq"; depends=[marray MASS]; }; + strandCheckR = derive2 { name="strandCheckR"; version="1.16.0"; sha256="17ibvcff0qdjrwvbhjzphxc8xyk8hv0rn5kyfjnwzkqsqvippx9g"; 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.10.0"; sha256="0piz8kgxv1l78k5abvmzb42p0rc29j1r3iyj4izh2rpn0k8lpwpf"; depends=[knitr ontologyIndex rols S4Vectors SummarizedExperiment]; }; + structToolbox = derive2 { name="structToolbox"; version="1.10.0"; sha256="0gncd3f86067j9c8cwfnqrkpwizjm5irvhlnc0ibb3vzp3ymbr83"; depends=[ggplot2 ggthemes gridExtra scales sp struct]; }; + subSeq = derive2 { name="subSeq"; version="1.28.0"; sha256="0q5snp5k3fdzp3bk125ix9ksnn5w81hp9bq7hx7vr5pkcr27y2jr"; depends=[Biobase data_table digest dplyr ggplot2 magrittr qvalue tidyr]; }; + supersigs = derive2 { name="supersigs"; version="1.6.0"; sha256="1dy4l467xj77bragcshwyildnlybx3g4gf1sds005yf6766kmjr9"; depends=[assertthat Biostrings caret dplyr rlang rsample SummarizedExperiment tidyr]; }; + supraHex = derive2 { name="supraHex"; version="1.36.0"; sha256="060z35h4d48xq3pv3i00pa8m5vjg15qama8s2pd5vwgnyi0pv2l1"; depends=[ape dplyr hexbin igraph magrittr MASS purrr readr stringr tibble tidyr]; }; + surfaltr = derive2 { name="surfaltr"; version="1.4.0"; sha256="0lbdcx88j3icrfg5py3iarmjrb3a6ybzkdvq25q51qzzlwixzll7"; depends=[biomaRt Biostrings dplyr ggplot2 httr msa protr readr seqinr stringr testthat xml2]; }; + survcomp = derive2 { name="survcomp"; version="1.48.0"; sha256="0a6sqzgvxfgjr6yrpv1vaza6yni6n1gminr2g0912rhkaz1c7z6z"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; }; + survtype = derive2 { name="survtype"; version="1.14.0"; sha256="0z3vgiryafqsqwxk5gzpkp7svkhxyqvl2sbh5vvfpdb5jil93dgg"; depends=[clustvarsel pheatmap SummarizedExperiment survival survminer]; }; + sva = derive2 { name="sva"; version="3.46.0"; sha256="0c1b7w4rvyy8i0jygj8g9xgf46rmgx8bpdlp2x4fdjr9xsrsl23g"; depends=[BiocParallel edgeR genefilter limma matrixStats mgcv]; }; + svaNUMT = derive2 { name="svaNUMT"; version="1.4.0"; sha256="0vhl1d8b4ys1nd44pf5z6kr4gl5cww9ml8pnf7fphzz6d0r8hg89"; depends=[assertthat BiocGenerics Biostrings dplyr GenomeInfoDb GenomicFeatures GenomicRanges rlang rtracklayer S4Vectors stringr StructuralVariantAnnotation VariantAnnotation]; }; + svaRetro = derive2 { name="svaRetro"; version="1.4.0"; sha256="04z604mkpzmbflf34338011dmbwzhws294jzc06akxg98220airv"; depends=[assertthat BiocGenerics Biostrings dplyr GenomeInfoDb GenomicFeatures GenomicRanges rlang rtracklayer S4Vectors stringr StructuralVariantAnnotation VariantAnnotation]; }; + swfdr = derive2 { name="swfdr"; version="1.24.0"; sha256="0svvmssp4jlhcs8agihpc4hlar83d5czrlp7l5xlzf4cagzx2nv9"; depends=[]; }; + switchBox = derive2 { name="switchBox"; version="1.34.0"; sha256="0mi9wwlv8rlcf4lsmingnb7d195ji19s264kfdsp5gpc7vg9arli"; depends=[gplots pROC]; }; + switchde = derive2 { name="switchde"; version="1.24.0"; sha256="0j1a1a1zg0f9xirbva42w48k06b9kbk340jygcj3gp18ii207wql"; depends=[dplyr ggplot2 SingleCellExperiment SummarizedExperiment]; }; + synapsis = derive2 { name="synapsis"; version="1.4.0"; sha256="127yx1a56r0fh8n9ir2zlhxs2fj47pfdxn8dssdmns0d77rhnnvc"; depends=[EBImage]; }; + synapter = derive2 { name="synapter"; version="2.22.0"; sha256="1zl8nqyaqrp424k0a06s4h7ffaxixhf1i39zx3kl3bhvayqmqviw"; depends=[Biobase Biostrings cleaver lattice MSnbase multtest qvalue RColorBrewer readr rmarkdown]; }; + synergyfinder = derive2 { name="synergyfinder"; version="3.6.0"; sha256="1b07cqv3jqsz5xpins63maalwjljj21wps79d029r9xsppv1271y"; 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.28.0"; sha256="12hmzwfd31nhnxcjxcpyw5q5rsgky99q446qk52dy7vqy5achld3"; depends=[doBy dplyr ggplot2 magrittr RankProd RColorBrewer reshape2]; }; + syntenet = derive2 { name="syntenet"; version="1.0.3"; sha256="0pl0gxxjwxqv8gq6a0fkq32c4vq4cpp3aa77cmc1r4bqz0laykr0"; depends=[Biostrings GenomicRanges ggnetwork ggplot2 igraph intergraph networkD3 pheatmap RColorBrewer Rcpp rlang rtracklayer testthat]; }; + systemPipeR = derive2 { name="systemPipeR"; version="2.4.0"; sha256="0lwc4d4k6qmnwsh8fpp5rmiaxhzwl2f0dhzs23ska5xy04466r49"; depends=[BiocGenerics Biostrings crayon GenomicRanges ggplot2 htmlwidgets magrittr Rsamtools S4Vectors ShortRead stringr SummarizedExperiment yaml]; }; + systemPipeShiny = derive2 { name="systemPipeShiny"; version="1.8.1"; sha256="193c7si0jkkfz2p3sd8am4mga721mkxxf2wyv6b7yqarhvi5cdc2"; 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]; }; + systemPipeTools = derive2 { name="systemPipeTools"; version="1.6.0"; sha256="0qj8c652ms4ja4bjp57gx75xr4m3haj9bh3q337cqqr0wk02gn80"; depends=[ape DESeq2 dplyr DT GGally ggplot2 ggrepel ggtree glmpca magrittr pheatmap plotly Rtsne SummarizedExperiment tibble]; }; + tLOH = derive2 { name="tLOH"; version="1.6.0"; sha256="1clpyiz04scsknvq5y1kk8ipx1a9ljrb1127wrsjvrgj6q4fjilj"; depends=[bestNormalize data_table depmixS4 dplyr GenomicRanges ggplot2 MatrixGenerics naniar purrr scales stringr VariantAnnotation]; }; + tRNA = derive2 { name="tRNA"; version="1.16.0"; sha256="12vw3wj8gn827vc1hwfqsm4cp4qs2k3vy17y4i4k33z9iwkvlsxh"; depends=[BiocGenerics Biostrings GenomicRanges ggplot2 IRanges Modstrings S4Vectors scales stringr Structstrings XVector]; }; + tRNAdbImport = derive2 { name="tRNAdbImport"; version="1.16.0"; sha256="1zmqdh9va0sxzf9jfngrhh5kdbkshz0n5x7fqf23anyhwwzr8z1p"; depends=[BiocGenerics Biostrings GenomicRanges httr IRanges Modstrings S4Vectors stringr Structstrings tRNA xml2]; }; + tRNAscanImport = derive2 { name="tRNAscanImport"; version="1.18.0"; sha256="1hnd953pbhzx6b3hqn8mx5d6bv43pc6dw3n7a9z393rkydn21wdg"; depends=[BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors stringr Structstrings tRNA XVector]; }; + tRanslatome = derive2 { name="tRanslatome"; version="1.36.0"; sha256="1w2fii837md64pg4d79shxmk658vi0dkqggl6r6b11f6m2ja946v"; depends=[anota Biobase DESeq2 edgeR GOSemSim gplots Heatplus limma org_Hs_eg_db plotrix RankProd sigPathway topGO]; }; + tanggle = derive2 { name="tanggle"; version="1.4.0"; sha256="11mhavfy1fscndz5yiihxb9davmwvxslwj6ph7251787h1sr337g"; depends=[ape ggplot2 ggtree phangorn]; }; + target = derive2 { name="target"; version="1.12.0"; sha256="135hphjpp8326gbsl2j115082pnazpr6n5rj9ppync6bbl1iisq1"; depends=[BiocGenerics GenomicRanges IRanges matrixStats shiny]; }; + tenXplore = derive2 { name="tenXplore"; version="1.20.0"; sha256="0di434q3xch7hb93cnaa7zac4s8jx0k7wbvf6rl0j0rk35zdp3lx"; depends=[AnnotationDbi matrixStats ontoProc org_Mm_eg_db restfulSE shiny SummarizedExperiment]; }; + ternarynet = derive2 { name="ternarynet"; version="1.42.0"; sha256="01z262509vka2sfhzccwlmgi5frf56x07gbsan762hgvrcscg8jb"; depends=[BiocParallel igraph]; }; + terraTCGAdata = derive2 { name="terraTCGAdata"; version="1.2.0"; sha256="1yfvqdsgd3apan43cbjin95mwnbym1m0f1c8x212k277cc3rm22r"; depends=[AnVIL BiocFileCache dplyr GenomicRanges MultiAssayExperiment RaggedExperiment readr S4Vectors TCGAutils tidyr]; }; + tidySingleCellExperiment = derive2 { name="tidySingleCellExperiment"; version="1.8.0"; sha256="0kkxd64rlksw7l0hw53ckc9mhsvsb0yj8w078bh4rd16iqk3jnnc"; depends=[cli dplyr ellipsis fansi ggplot2 lifecycle magrittr pillar plotly purrr rlang S4Vectors SingleCellExperiment stringr SummarizedExperiment tibble tidyr tidyselect ttservice]; }; + tidySummarizedExperiment = derive2 { name="tidySummarizedExperiment"; version="1.8.0"; sha256="0y7k0svcjx0lvxn3jw8g7vkrvwhvj9b7mhb0igavad1rc5pc54f3"; depends=[cli dplyr ellipsis fansi ggplot2 lifecycle magrittr pillar plotly purrr rlang S4Vectors stringr SummarizedExperiment tibble tidyr tidyselect vctrs]; }; + tidybulk = derive2 { name="tidybulk"; version="1.10.0"; sha256="1n31wqad7wdfyfy1mcjsq68rlyyyd15srcrvz6ylp2pi8nbwxfly"; depends=[crayon dplyr GenomicRanges lifecycle magrittr preprocessCore purrr readr rlang S4Vectors scales stringi stringr SummarizedExperiment tibble tidyr tidyselect]; }; + tigre = derive2 { name="tigre"; version="1.52.0"; sha256="1cj4yqdad1xs8k682qx92b03nbyx51qdqsf7y90bll3z51xhwvdq"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; }; + tilingArray = derive2 { name="tilingArray"; version="1.76.0"; sha256="19bkgblpkcp3w3sdyn82c37gkz1sv3r4d546zpbnh36q2pi3l4zd"; depends=[affy Biobase genefilter pixmap RColorBrewer strucchange vsn]; }; + timeOmics = derive2 { name="timeOmics"; version="1.10.0"; sha256="1szhdd29gfa7ah7yf683d69s2w0w6r8nh3kc7fii3vnyqspspb19"; depends=[dplyr ggplot2 ggrepel lmtest magrittr mixOmics plyr purrr stringr tibble tidyr]; }; + timecourse = derive2 { name="timecourse"; version="1.70.0"; sha256="0lq5haikg76vbrf3jmyxx6s7kglwaabdbwza2sd6zg84lbpyw3nv"; depends=[Biobase limma marray MASS]; }; + timescape = derive2 { name="timescape"; version="1.22.0"; sha256="0i0v10gaj47dw53am4z1rdhzbdfh8nybgdb204h928jfnc1ag20f"; depends=[dplyr gtools htmlwidgets jsonlite stringr]; }; + tkWidgets = derive2 { name="tkWidgets"; version="1.76.0"; sha256="09zhzm42h814srqzkzdswp4y450j24166r87szlimzcdjm38xnkj"; depends=[DynDoc widgetTools]; }; + tomoda = derive2 { name="tomoda"; version="1.8.0"; sha256="1sfn1l0bys7bmfglhn73jw7qzniabgv3ffbns4ci17d29zzf0akk"; depends=[ggplot2 ggrepel RColorBrewer reshape2 Rtsne SummarizedExperiment umap]; }; + tomoseqr = derive2 { name="tomoseqr"; version="1.2.0"; sha256="1x583lzmf2dslvm2a103i7k5gkd6spavnrrxxp6v35dmj1g531fg"; depends=[animation BiocFileCache dplyr ggplot2 plotly purrr readr shiny stringr tibble]; }; + topGO = derive2 { name="topGO"; version="2.50.0"; sha256="1ripdn7mcabh96bm4p807dbwj7jv05a54kss4snhz84svqq383m4"; depends=[AnnotationDbi Biobase BiocGenerics DBI GO_db graph lattice matrixStats SparseM]; }; + topconfects = derive2 { name="topconfects"; version="1.14.0"; sha256="00bpbkwafvcak847grg2ypmnagwr2imdg4vmsm3f5s3qd97ra69f"; depends=[assertthat ggplot2]; }; + topdownr = derive2 { name="topdownr"; version="1.20.0"; sha256="1m5213k4drmicswjsphzz7m9d93275vlwy1fzp2iiaqjr7w12b6a"; depends=[Biobase BiocGenerics Biostrings ggplot2 Matrix MSnbase mzR ProtGenerics S4Vectors]; }; + trackViewer = derive2 { name="trackViewer"; version="1.34.0"; sha256="1gd95f947lw4yp8l9azlfg5hylg6bxfc10dxw5cgpsacny9lnbkr"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph grImport Gviz htmlwidgets InteractionSet IRanges plotrix Rcpp Rgraphviz rhdf5 Rsamtools rtracklayer S4Vectors scales]; }; + tracktables = derive2 { name="tracktables"; version="1.32.0"; sha256="1cp9n1sa028xh6265gn83xjy6bqc05gnghdr6lnwmb75pv7sliyg"; depends=[GenomicRanges IRanges RColorBrewer Rsamtools stringr tractor_base XML XVector]; }; + tradeSeq = derive2 { name="tradeSeq"; version="1.12.0"; sha256="0wkbjhwqk094nd5h6sl2nw5jp5vmkh9why635l8qkqmxa2jm3gh0"; depends=[Biobase BiocParallel edgeR ggplot2 igraph magrittr MASS Matrix matrixStats mgcv pbapply princurve RColorBrewer S4Vectors SingleCellExperiment slingshot SummarizedExperiment tibble TrajectoryUtils viridis]; }; + transcriptR = derive2 { name="transcriptR"; version="1.26.0"; sha256="03v8xn777vyma82ma5dzk07i1g7406cvsybdz4bf6hj8bgx5ynw7"; depends=[BiocGenerics caret chipseq e1071 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges pROC reshape2 Rsamtools rtracklayer S4Vectors]; }; + transcriptogramer = derive2 { name="transcriptogramer"; version="1.20.0"; sha256="0m9kqshmvfyj30ssxp9qx15780zpmxsq7vgidmz66pqv36cn06vh"; depends=[biomaRt data_table doSNOW foreach ggplot2 igraph limma progress RedeR snow tidyr topGO]; }; + transformGamPoi = derive2 { name="transformGamPoi"; version="1.4.0"; sha256="1ihk1bml8kjzhfx52zj8xxbrqb12p2jphymxi7rh0df038khj4sr"; depends=[DelayedArray glmGamPoi HDF5Array Matrix MatrixGenerics Rcpp SummarizedExperiment]; }; + transite = derive2 { name="transite"; version="1.16.0"; sha256="0kgh4npxfkbmd525pmpf08247wrdary863qhvmkwc3z7i91973sj"; depends=[BiocGenerics Biostrings dplyr GenomicRanges ggplot2 ggseqlogo gridExtra Rcpp scales TFMPvalue]; }; + transomics2cytoscape = derive2 { name="transomics2cytoscape"; version="1.8.0"; sha256="0r5cc3r2x1gjr5f6wkwk8jw812f6asfk6r5qr9wl5iad4h1i2d20"; depends=[dplyr KEGGREST purrr RCy3 tibble]; }; + traseR = derive2 { name="traseR"; version="1.28.0"; sha256="0pya0d9mng8lizc0x08pai6bjvaxj740h903p4y9b1fshl27r6mk"; depends=[BSgenome_Hsapiens_UCSC_hg19 GenomicRanges IRanges]; }; + traviz = derive2 { name="traviz"; version="1.4.0"; sha256="17nazzn7h5hmmrb6dfxybnfj4yhc0qikn32q7ari7v5bg6fz6bky"; depends=[Biobase ggplot2 mgcv princurve RColorBrewer rgl SingleCellExperiment slingshot SummarizedExperiment viridis]; }; + treeio = derive2 { name="treeio"; version="1.22.0"; sha256="1xl8497ya79hlp3v3fihnz9grwni29v6860i273lrpcljv8868l9"; depends=[ape dplyr jsonlite magrittr rlang tibble tidytree]; }; + treekoR = derive2 { name="treekoR"; version="1.6.0"; sha256="1ii65rd30zcwsi782wjklwhhg5frr0ajb1cfmfcpprrh9841fmin"; depends=[ape data_table diffcyt dplyr edgeR ggiraph ggplot2 ggtree hopach lme4 multcomp patchwork SingleCellExperiment tidyr]; }; + trena = derive2 { name="trena"; version="1.20.0"; sha256="0c2m825p2fggr8y6zmqa2nlhvh28k6miga6812900fcc1r82fv2n"; depends=[AnnotationDbi biomaRt Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 BSgenome_Mmusculus_UCSC_mm10 DBI GenomicRanges glmnet lassopv MotifDb org_Hs_eg_db randomForest RMySQL RPostgreSQL RSQLite SNPlocs_Hsapiens_dbSNP150_GRCh38 WGCNA xgboost]; }; + tricycle = derive2 { name="tricycle"; version="1.6.0"; sha256="0b5agqhywg23zxf0f9s1vfbzs7s7ijf9c716s7hwjprxfdz5znvw"; depends=[AnnotationDbi circular dplyr GenomicRanges ggnewscale ggplot2 IRanges RColorBrewer S4Vectors scater scattermore SingleCellExperiment SummarizedExperiment]; }; + trigger = derive2 { name="trigger"; version="1.44.0"; sha256="0h9zv5ak3arp436ivxqz7xmfanqk6m8k7xs0y5c6586fjzrhz7y5"; depends=[corpcor qtl qvalue sva]; }; + trio = derive2 { name="trio"; version="3.36.0"; sha256="1gccqcyrq5di7763q4mpl28fj64bpjm5s1vwjy5cwkhhkp90kr23"; depends=[LogicReg siggenes survival]; }; + triplex = derive2 { name="triplex"; version="1.38.0"; sha256="1zd0r8xn8ri357x95cbd67vcsvjicq8fzqj0gp18v70vq22k331i"; depends=[Biostrings GenomicRanges IRanges S4Vectors XVector]; }; + tripr = derive2 { name="tripr"; version="1.4.0"; sha256="0kwmi1s9v0rwpf9qgdah8s5c93f17qcs8s5hhhd2z2rh9lm7sgx3"; 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.10.0"; sha256="1i372yw3rf1s1zr5dn7p2w9p0qgmghl1b1is8wq20g8zz3hf0aka"; depends=[class cluster dplyr dtw GenomicRanges ggplot2 gridExtra IRanges kmlShape knitr latex2exp prettydoc RColorBrewer rmarkdown S4Vectors SummarizedExperiment]; }; + ttgsea = derive2 { name="ttgsea"; version="1.6.3"; sha256="1c4ngsrczca10fnlrnr8n1h55j6g1xj3laklr8aahhgdq5isajr7"; depends=[data_table DiagrammeR keras purrr stopwords text2vec textstem tm tokenizers]; }; + tweeDEseq = derive2 { name="tweeDEseq"; version="1.44.0"; sha256="09rdcax78vbcrl7q7i457n18jk298lxagxm0v89x3s6izvqr025p"; depends=[cqn edgeR limma MASS]; }; + twilight = derive2 { name="twilight"; version="1.74.0"; sha256="1lia4q637ngh47zlr5g18isp9acrb4d9g1fzck2akldqa0pnn66r"; depends=[Biobase]; }; + twoddpcr = derive2 { name="twoddpcr"; version="1.22.0"; sha256="01bfphc5hi8mk5j72f95pdqbi28bj4nfdvr0lzp9xs38qfnb80h7"; depends=[class ggplot2 hexbin RColorBrewer S4Vectors scales shiny]; }; + txcutr = derive2 { name="txcutr"; version="1.4.0"; sha256="05skv6ks1gq2wbx9gm5c3gk5k77vy248brhcay43ni900xwn10zi"; depends=[AnnotationDbi BiocGenerics BiocParallel Biostrings GenomicFeatures GenomicRanges IRanges rtracklayer S4Vectors]; }; + tximeta = derive2 { name="tximeta"; version="1.16.0"; sha256="0v1s5ssinyrizpg2i88dn2ckzs4i16hjfg2pzxhal3ypsiw24qna"; depends=[AnnotationDbi AnnotationHub BiocFileCache Biostrings ensembldb GenomeInfoDb GenomicFeatures GenomicRanges IRanges jsonlite Matrix S4Vectors SummarizedExperiment tibble tximport]; }; + tximport = derive2 { name="tximport"; version="1.26.0"; sha256="1w1m6r85a5nvcfxbkq5dmczaar8vf3vbrgrmxqkjqhlpcq58z5ng"; depends=[]; }; + uSORT = derive2 { name="uSORT"; version="1.24.0"; sha256="1fhhl00qdj7ihvb3ia2nd215m1ylbaszpyq1w7bmgv89v5ghhsgf"; depends=[Biobase BiocGenerics cluster fpc gplots igraph Matrix monocle plyr RANN RSpectra VGAM]; }; + uncoverappLib = derive2 { name="uncoverappLib"; version="1.7.0"; sha256="1fsn5wpknx1f6sj12x9q456iqi68kwgcqzkk3343hfg185rnn8sh"; depends=[BiocFileCache BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 condformat DT EnsDb_Hsapiens_v75 EnsDb_Hsapiens_v86 GenomicRanges Gviz Homo_sapiens markdown openxlsx org_Hs_eg_db OrganismDbi processx rappdirs rlist Rsamtools S4Vectors shiny shinyBS shinycssloaders shinyjs shinyWidgets stringr TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; }; + unifiedWMWqPCR = derive2 { name="unifiedWMWqPCR"; version="1.34.0"; sha256="0zkqr1s8gagwsh33kzp0n2n7ff5jhfn6a60gvab5spk7vr76j442"; depends=[BiocGenerics HTqPCR]; }; + universalmotif = derive2 { name="universalmotif"; version="1.16.0"; sha256="1vfg703wxbgxw2cwqqz3kfyqj4za5n3skxxzi8c31azamg4hxs18"; depends=[BiocGenerics Biostrings ggplot2 IRanges MASS Rcpp RcppThread rlang S4Vectors yaml]; }; + updateObject = derive2 { name="updateObject"; version="1.2.0"; sha256="13rq1hv0rg8cj3z8d2b9mfih5sybicb4razv8vaic1i7c7sbypwf"; depends=[BiocGenerics digest S4Vectors]; }; + variancePartition = derive2 { name="variancePartition"; version="1.28.0"; sha256="1mn91r0yrhz08m3vs2h3i35rcbxyc7sdfknmk6vcw1z75znjsnpl"; depends=[aod Biobase BiocParallel doParallel foreach ggplot2 gplots iterators limma lme4 lmerTest MASS Matrix pbkrtest progress Rdpack reshape2 RhpcBLASctl rlang scales]; }; + vbmp = derive2 { name="vbmp"; version="1.66.0"; sha256="1gfvk1g9q73p9z91zasblya1w218yhzawp6dgyf0lnldx36kpvc9"; depends=[]; }; + velociraptor = derive2 { name="velociraptor"; version="1.8.0"; sha256="07nwx9cahia4a6g15xhccdlwxnhvwq46dy2hqcqqzydgpsapa6wv"; depends=[basilisk BiocGenerics BiocParallel BiocSingular DelayedArray Matrix reticulate S4Vectors scuttle SingleCellExperiment SummarizedExperiment zellkonverter]; }; + veloviz = derive2 { name="veloviz"; version="1.4.0"; sha256="01f2d28h0gnh38g50yphmg3aqy1ya2ysj1xabs2a6y3wnqzrahzk"; depends=[igraph Matrix mgcv Rcpp RSpectra]; }; + vidger = derive2 { name="vidger"; version="1.18.0"; sha256="086q79hf689hslsrxzzif9f7cwkm80djfl0vn75cd0xbhsqpsayf"; depends=[Biobase DESeq2 edgeR GGally ggplot2 ggrepel knitr RColorBrewer rmarkdown scales SummarizedExperiment tidyr]; }; + viper = derive2 { name="viper"; version="1.32.0"; sha256="11i2q9nakh534nx2l736id7k1yqhk7jpg32sbfl4vrnh398q86h6"; depends=[Biobase e1071 KernSmooth mixtools]; }; + vissE = derive2 { name="vissE"; version="1.6.0"; sha256="1wfdrqvsqxc3jllmqbrrcwy7737kifxzmgrlr220zfzhc5hf4888"; depends=[ggforce ggplot2 ggraph ggrepel ggwordcloud GSEABase igraph msigdb plyr RColorBrewer reshape2 scales scico textstem tidygraph tm]; }; + vsclust = derive2 { name="vsclust"; version="1.0.0"; sha256="05lzdrjira4ck0b3jjfs3n7fhd8p65pvy4p96241j0lng1q9bwgm"; depends=[limma matrixStats MultiAssayExperiment qvalue Rcpp shiny]; }; + vsn = derive2 { name="vsn"; version="3.66.0"; sha256="1k77rg5jf646m1pn59qhlsbb9fzhlpnrj4dzxagknawcbpnnjl0z"; depends=[affy Biobase ggplot2 lattice limma]; }; + vtpnet = derive2 { name="vtpnet"; version="0.38.0"; sha256="17b744wiknlgwq3c404ijnd3nqp1hran2v315gis0y20kb9xbjm3"; depends=[doParallel foreach GenomicRanges graph gwascat]; }; + vulcan = derive2 { name="vulcan"; version="1.20.0"; sha256="01cz2kv9ayb0819kqc65qhjs9ny3549a8af5c1lwrqxss8bg9s6b"; depends=[Biobase caTools ChIPpeakAnno csaw DESeq2 DiffBind GenomicRanges gplots locfit S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene viper wordcloud zoo]; }; + waddR = derive2 { name="waddR"; version="1.12.0"; sha256="00yjkphzj7yfz57d6i64w75x4mc8i6sjvb0v0jjmkg2vpbmzbfnk"; depends=[arm BiocFileCache BiocParallel eva Rcpp RcppArmadillo SingleCellExperiment]; }; + wateRmelon = derive2 { name="wateRmelon"; version="2.4.0"; sha256="0m8mra0jb6sgm13dagqn1pj81dha4dyj65xc6r2sh0yc3pyjb20h"; depends=[Biobase IlluminaHumanMethylation450kanno_ilmn12_hg19 illuminaio limma lumi matrixStats methylumi ROC]; }; + wavClusteR = derive2 { name="wavClusteR"; version="2.32.0"; sha256="1z7y3wnrqr2xqrvs2xwmv419aqlizq0az17dpxmj1hg9knyls1bx"; depends=[BiocGenerics Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer S4Vectors seqinr stringr]; }; + weaver = derive2 { name="weaver"; version="1.64.0"; sha256="1ykdr01sichl615m6m5dbaarsz4b3fg59fd9cg3gicp01nvba6mz"; depends=[codetools digest]; }; + webbioc = derive2 { name="webbioc"; version="1.70.0"; sha256="1mgag0gjavpld4xxlpfafq6fhzjafxgqyf677xrm6ff26z6z1ja2"; depends=[affy annaffy Biobase BiocManager gcrma multtest qvalue vsn]; }; + weitrix = derive2 { name="weitrix"; version="1.10.0"; sha256="1mh2847rxs35n1dmzpx0yjaszhqb67ff2qdzcn0k5ki2acm0f4l5"; depends=[assertthat BiocGenerics BiocParallel Ckmeans_1d_dp DelayedArray DelayedMatrixStats dplyr ggplot2 glm2 limma purrr reshape2 RhpcBLASctl rlang S4Vectors scales SummarizedExperiment topconfects]; }; + widgetTools = derive2 { name="widgetTools"; version="1.76.0"; sha256="1p93dzf7w9z1ria0f8n32aymam9abxyg50ngnh7s6a8n24mvvjy5"; depends=[]; }; + wiggleplotr = derive2 { name="wiggleplotr"; version="1.22.0"; sha256="1yp9siy4249wkwd0yy5lkwp79xir53f8mihiv4dkir8fscgampl3"; depends=[assertthat cowplot dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges purrr rtracklayer S4Vectors]; }; + wpm = derive2 { name="wpm"; version="1.8.0"; sha256="05zpj0i4741xn1g0yhkq3mg9zjppfryrfc47pxnys9bjfij0az52"; depends=[Biobase cli config dplyr DT ggplot2 golem logging RColorBrewer rlang shiny shinycustomloader shinydashboard shinyWidgets stringr SummarizedExperiment]; }; + wppi = derive2 { name="wppi"; version="1.6.0"; sha256="0kc3nkim8fhajhai5bwzwirsg74zbdib3dd7cfr75ddwd8myc913"; depends=[dplyr igraph logger magrittr Matrix OmnipathR progress purrr RCurl rlang tibble tidyr]; }; + xcms = derive2 { name="xcms"; version="3.20.0"; sha256="1gj0nd90c6ykwn1n7xndzrgfv5dzy0y2lh3bf8120nacccgxl2qx"; depends=[Biobase BiocGenerics BiocParallel IRanges lattice MassSpecWavelet MsCoreUtils MsFeatures MSnbase mzR plyr ProtGenerics RANN RColorBrewer robustbase S4Vectors SummarizedExperiment]; }; + xcore = derive2 { name="xcore"; version="1.2.0"; sha256="195gcnpyqn2slvjnj0cvsc79csj505ky8g3pghhjijdjybpbqg4z"; depends=[DelayedArray edgeR foreach GenomicRanges glmnet IRanges iterators magrittr Matrix MultiAssayExperiment S4Vectors]; }; + xmapbridge = derive2 { name="xmapbridge"; version="1.56.0"; sha256="0wxr3db2daj4xlr9df6iqwm00m71kln7rhqnq2ckdsricblanhs7"; depends=[]; }; + yamss = derive2 { name="yamss"; version="1.24.0"; sha256="0bh06mncjrkihz2j29hasbipfl50x7393wshdcnlxrs5rrq73r0n"; depends=[BiocGenerics data_table EBImage IRanges limma Matrix mzR S4Vectors SummarizedExperiment]; }; + yarn = derive2 { name="yarn"; version="1.24.0"; sha256="0sqbll7ja0qr8r28dqmydmkvg4ijfm7z8hbrsrz3xxdan70bmd2r"; depends=[Biobase biomaRt downloader edgeR gplots limma matrixStats preprocessCore quantro RColorBrewer readr]; }; + zFPKM = derive2 { name="zFPKM"; version="1.20.0"; sha256="1wsmv4fld4s7l0qh84ghizq8k388ybdz9hzzis2gn1nn57q1c7wi"; depends=[checkmate dplyr ggplot2 SummarizedExperiment tidyr]; }; + zellkonverter = derive2 { name="zellkonverter"; version="1.8.0"; sha256="0b14v6lyhfapmfj8j729k5cmgxc4df6wsk2rds0q4y6z4hiwgmxy"; depends=[basilisk cli DelayedArray Matrix reticulate S4Vectors SingleCellExperiment SummarizedExperiment]; }; + zenith = derive2 { name="zenith"; version="1.0.0"; sha256="19kwldj2wxpzyxdjh4ls86li2v477swl6zxkzr9rl7r183z4b5ha"; depends=[EnrichmentBrowser ggplot2 GSEABase limma msigdbr progress Rdpack reshape2 Rfast tidyr variancePartition]; }; + zinbwave = derive2 { name="zinbwave"; version="1.20.0"; sha256="1356ms5y6fg7ndn8hvs6zsyr0jg6ah7a56qxd2x4xgyjj3xcakbv"; depends=[BiocParallel edgeR genefilter Matrix SingleCellExperiment softImpute SummarizedExperiment]; }; + zlibbioc = derive2 { name="zlibbioc"; version="1.44.0"; sha256="0c75mf0iw6bgwrn3zxpz1dz03aw7p6a1mfhssk6i1mp24avic9lb"; depends=[]; }; ABAEnrichment = derive2 { name="ABAEnrichment"; version="1.24.0"; sha256="1sp3f72rzlr822dxx42bswynrwwfx6f520hdhfdikqp13p2y4044"; depends=[ABAData data_table GOfuncR gplots gtools Rcpp]; broken = true; }; 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; }; + BioPlex = derive2 { name="BioPlex"; version="1.2.3"; sha256="0cn0x6ij2a3xy61bq0qy5amp0ipj4r4shh7g0vlwbkrclj9w347r"; depends=[BiocFileCache GenomeInfoDb GenomicRanges GEOquery graph SummarizedExperiment]; broken = true; }; + CAnD = derive2 { name="CAnD"; version="1.27.0"; sha256="14x0m5iv7dm1iii5zsny9wnf4j5ddh0kij2jm658r3i4wnc99mkb"; depends=[ggplot2 reshape]; 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; }; + CytoTree = derive2 { name="CytoTree"; version="1.6.0"; sha256="1dsdhwjkd3ngnw50fs6vz048afk47r95vhi0wqj8sip11nhndkd8"; depends=[Biobase BiocNeighbors cluster destiny flowCore FlowSOM flowUtils ggplot2 gmodels igraph limma Matrix matrixStats mclust pheatmap prettydoc RANN Rcpp Rtsne scatterpie scatterplot3d stringr sva umap]; broken = true; }; EasyqpcR = derive2 { name="EasyqpcR"; version="1.31.0"; sha256="0lb2px789668fr1gxghycy7lbdkpwmippv6xmmwws6rbanvfd6v4"; depends=[matrixStats plotrix plyr]; broken = true; }; + EnMCB = derive2 { name="EnMCB"; version="1.8.2"; sha256="1kna7s4rz5mlaj7vwc0mrzaziadvai7zq8ajiy4jya8xw78llyw4"; depends=[BiocFileCache boot e1071 ggplot2 glmnet igraph Matrix mboost rms survival survivalROC survivalsvm]; 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; }; + GAPGOM = derive2 { name="GAPGOM"; version="1.11.0"; sha256="0sl97w5zx4zdrdbcwayqyvgxspaxpbils3mpsrim0zlspjrjcy6z"; depends=[AnnotationDbi Biobase BiocFileCache data_table dplyr fastmatch GEOquery GO_db GOSemSim graph igraph magrittr Matrix matrixStats org_Hs_eg_db org_Mm_eg_db plyr RBGL]; broken = true; }; + GCSConnection = derive2 { name="GCSConnection"; version="1.7.0"; sha256="1psmw3825whyzvbzqpqksgcl09b6kfyb8k5vny6ljkjbac1jzvnf"; depends=[googleAuthR googleCloudStorageR httr jsonlite Rcpp]; broken = true; }; + GCSFilesystem = derive2 { name="GCSFilesystem"; version="1.6.0"; sha256="0qk8xyg06f71y4r1q1zpcj89irh9i6cd9z6nqlx635x8if84sh6d"; depends=[]; broken = true; }; GeneAnswers = derive2 { name="GeneAnswers"; version="2.36.0"; sha256="1f8q3hi913khyy1cc3yp2635gaik47alsqmhi0mi24cy340faplz"; depends=[annotate Biobase downloader Heatplus igraph KEGGREST MASS RBGL RColorBrewer RCurl RSQLite XML]; broken = true; }; 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; }; + IsoGeneGUI = derive2 { name="IsoGeneGUI"; version="2.31.0"; sha256="1w7zxsvmcrz8cj8g8xa1vqbzfycdhgsclhcjmkqjw1hwz6fp3xgn"; depends=[Biobase ff geneplotter goric Iso IsoGene jpeg multtest ORCME ORIClust RColorBrewer Rcpp relimp tkrplot xlsx]; broken = true; }; + MACPET = derive2 { name="MACPET"; version="1.15.1"; sha256="0742i3fxg2793lhgpxb4whh6mwvzd4bn86ykd0rv8sgilxyq5zsl"; depends=[BH bigmemory BiocParallel Biostrings futile_logger GenomeInfoDb GenomicAlignments GenomicRanges GEOquery gtools InteractionSet intervals IRanges knitr plyr Rbowtie Rcpp Rsamtools rtracklayer S4Vectors ShortRead]; broken = true; }; MSEADbi = derive2 { name="MSEADbi"; version="1.2.0"; sha256="1g1kg3nh7iwg5nrpmig6srw6as4yfwmbqn965pffrk0zp19llsbf"; depends=[AnnotationDbi Biobase DBI RSQLite]; broken = true; }; MSGFgui = derive2 { name="MSGFgui"; version="1.28.0"; sha256="0dkj2nbv5xv4v4bbmf91av0ryh9pxdfp7fmbqlma4xyf1r7zmx4c"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; broken = true; }; MSGFplus = derive2 { name="MSGFplus"; version="1.28.0"; sha256="1k0qm049gk4gjhd88zhxxrpc944r7ndq8dys08ai2kbaqignvb7y"; depends=[mzID ProtGenerics]; 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; }; + PSICQUIC = derive2 { name="PSICQUIC"; version="1.34.0"; sha256="0gkkxxbc2a7cin92qwn1masqfigyz9s4fhyy2daa17r3ckk4ccgx"; depends=[BiocGenerics biomaRt httr IRanges plyr RCurl]; broken = true; }; PanVizGenerator = derive2 { name="PanVizGenerator"; version="1.22.0"; sha256="0rhx2jc5kc9bl00v16frh8b4075n0jqn4s37pkvqp3ypcbqws32d"; depends=[igraph jsonlite pcaMethods shiny]; broken = true; }; + PrecisionTrialDrawer = derive2 { name="PrecisionTrialDrawer"; version="1.11.0"; sha256="1miw8rj1zn1xv97dkgs66k9g21i6gp3j2m1l1akysskczgam3i2c"; depends=[BiocParallel biomaRt brglm data_table DT GenomicRanges ggplot2 ggrepel googleVis httr IRanges jsonlite LowMACAAnnotation magrittr matrixStats RColorBrewer reshape2 S4Vectors shiny shinyBS stringr XML]; broken = true; }; ProteomicsAnnotationHubData = derive2 { name="ProteomicsAnnotationHubData"; version="1.24.0"; sha256="0qs5hbx7pww7qxxaimp2xqvs3lwcd41ndls0xcvvlk7pnp4i4sk8"; depends=[AnnotationHub AnnotationHubData Biobase BiocManager Biostrings GenomeInfoDb MSnbase mzR RCurl]; broken = true; }; + PubScore = derive2 { name="PubScore"; version="1.8.0"; sha256="18bmzvv6mxrdlh297i29q24vi5rc4x2mjaryi5asiki186x0hy8d"; depends=[dplyr ggplot2 ggrepel igraph intergraph network progress rentrez sna]; broken = true; }; RGalaxy = derive2 { name="RGalaxy"; version="1.38.0"; sha256="0vfsn8cj5c8n58ra1qz85gwmm1747lm3xdz17m20f73g8q78nymd"; depends=[Biobase BiocGenerics optparse roxygen2 XML]; broken = true; }; - RNASeqR = derive2 { name="RNASeqR"; version="1.12.0"; sha256="1f2rrk4lb8mawgy6pzkpdmjp85pl23mb89b45ay54jp28j16dgr5"; depends=[ballgown Biostrings clusterProfiler corrplot DESeq2 DOSE edgeR factoextra FactoMineR ggplot2 gridExtra org_Hs_eg_db org_Sc_sgd_db pathview PerformanceAnalytics pheatmap rafalib reshape2 reticulate Rsamtools stringr systemPipeR systemPipeRdata]; broken = true; }; + Rgin = derive2 { name="Rgin"; version="1.15.0"; sha256="1x5zj2d5rvsr2xh0ifpnrys9v91dal1xxhv5mmk16rs8wzwqpqba"; depends=[RcppEigen]; broken = true; }; RmiR = derive2 { name="RmiR"; version="1.49.0"; sha256="16nwh4a97qvyicm4f102xs52lx8cld0b80fykgil86kkd6v8zlja"; depends=[DBI RmiR_Hs_miRNA]; broken = true; }; + Rnits = derive2 { name="Rnits"; version="1.29.0"; sha256="0m6afic9p7synmngkn7zyf53saqnrmgydjbk41k0w814i46dcd6h"; depends=[affy Biobase boot ggplot2 impute limma qvalue reshape2]; broken = true; }; + RpsiXML = derive2 { name="RpsiXML"; version="2.38.0"; sha256="0x4nph4xss4piq4fgijjjj33yrqqfdbsgn9wvqy17nglvz5gi7bi"; depends=[annotate AnnotationDbi Biobase graph hypergraph RBGL XML]; broken = true; }; SLGI = derive2 { name="SLGI"; version="1.54.0"; sha256="03jwdq4k44rys3f773c6l985a6v1bacbdghw97p0qpwspmzra8rs"; depends=[AnnotationDbi Biobase BiocGenerics GO_db lattice]; 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; }; + Sushi = derive2 { name="Sushi"; version="1.34.0"; sha256="0adswrbzd93rhy3q56ypwkrk6155vd4zxapvznswyjlxp8ha813q"; depends=[biomaRt zoo]; broken = true; }; SwimR = derive2 { name="SwimR"; version="1.29.0"; sha256="0n58x3i4k3icvhg8z60zlhpszv8bb9pain07nl9rszyvmpi71vg2"; depends=[gplots R2HTML signal]; broken = true; }; TSRchitect = derive2 { name="TSRchitect"; version="1.20.0"; sha256="1v9zz8ny9rwkyz98cv49l9ilh68h8mvm2x44n8i8rvjayc50zi9i"; depends=[AnnotationHub BiocGenerics BiocParallel dplyr GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges readxl Rsamtools rtracklayer S4Vectors SummarizedExperiment]; broken = true; }; + TimeSeriesExperiment = derive2 { name="TimeSeriesExperiment"; version="1.13.0"; sha256="0bdpxxr739qdg92qabfx122k9f43vw2hyxp4yxqlbp37vzgcdf2c"; depends=[DESeq2 dplyr dynamicTreeCut edgeR ggplot2 Hmisc limma magrittr proxy S4Vectors SummarizedExperiment tibble tidyr vegan viridis]; 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; }; alsace = derive2 { name="alsace"; version="1.30.0"; sha256="17adr64g3l2syj0shi57nrvx105w7wrkiqm0qp3hwlk1ivmnadzn"; depends=[ALS ptw]; 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; }; + caOmicsV = derive2 { name="caOmicsV"; version="1.25.0"; sha256="10i4imjihmssdwfys21fsqng8zfp7sxzkc58m8qmnh6s5sccb3sz"; depends=[bc3net igraph]; broken = true; }; + clonotypeR = derive2 { name="clonotypeR"; version="1.34.0"; sha256="15nnj6c23bcnln1xsmxs7f13m13lvn6did7lvp7ij8gcb0vg2g6q"; depends=[]; broken = true; }; + ctgGEM = derive2 { name="ctgGEM"; version="1.7.0"; sha256="0hmapz96r024r3bws1wf0spd0i81viyma859y9nn93jrwxscrcdb"; depends=[Biobase BiocGenerics igraph Matrix monocle sincell SummarizedExperiment TSCAN]; broken = true; }; + diffloop = derive2 { name="diffloop"; version="1.24.0"; sha256="0v0jg9y08xzw775x2lm82ig1ag4wjf4z2l6a66zmk6qbn59dwj1g"; depends=[Biobase biomaRt data_table dplyr edgeR foreach GenomeInfoDb GenomicRanges ggplot2 IRanges limma locfit matrixStats pbapply plyr readr reshape2 rtracklayer S4Vectors statmod Sushi]; broken = true; }; dualKS = derive2 { name="dualKS"; version="1.53.0"; sha256="16cfcylmmcj8x2808529lbpm7qbbrxygic0jkaglhqcdxgrqw3rw"; depends=[affy Biobase]; broken = true; }; + flowUtils = derive2 { name="flowUtils"; version="1.59.0"; sha256="11x362dqb9mjlsbq6g1qkb8hhnkvm22z5s3wkgmpyy9kyifjkm26"; depends=[Biobase corpcor flowCore graph RUnit XML]; broken = true; }; + gaia = derive2 { name="gaia"; version="2.39.0"; sha256="023mw2dy6dni7h7a1ild1y6l741kp9bmjzzfyi70jipji1jig4pa"; depends=[]; broken = true; }; + genphen = derive2 { name="genphen"; version="1.24.0"; sha256="1m60qagcxviix4zjzfhvrwchbjq2clss6mivb8q07bcq369yw1b8"; depends=[Biostrings doParallel e1071 foreach ranger Rcpp rPref rstan]; broken = true; }; + gpart = derive2 { name="gpart"; version="1.13.0"; sha256="1518wjkaw22ckgpwl6si83bhijvib0r0kgs9s4das41f0ygi92sd"; depends=[AnnotationDbi biomaRt data_table GenomicRanges Homo_sapiens igraph IRanges OrganismDbi Rcpp TxDb_Hsapiens_UCSC_hg38_knownGene]; broken = true; }; + gprege = derive2 { name="gprege"; version="1.39.0"; sha256="12yjyb7a7jc86hdi3a3cavqxfzkhmds1m2vigzw5ihhx6028pa78"; depends=[]; broken = true; }; + inveRsion = derive2 { name="inveRsion"; version="1.43.0"; sha256="0h2q10xf4x22hy7780w4pvq488921wzjngly8qcc97sa8iacssk3"; depends=[haplo_stats]; broken = true; }; + iteremoval = derive2 { name="iteremoval"; version="1.15.1"; sha256="0bwl8lzxvf5azwyacv9x16l4kyi8l00xny2s83gp2kng5gyz8602"; depends=[GenomicRanges ggplot2 magrittr SummarizedExperiment]; 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; }; + networkBMA = derive2 { name="networkBMA"; version="2.35.0"; sha256="0xa0b977apbr6p9kqk38582af635kp99csj32bsn2bf8pjsmd4d2"; depends=[BH BMA leaps Rcpp RcppArmadillo RcppEigen]; 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.12.0"; sha256="0nn0qgb0rz4j2xsjq0wydjhg5pmf2ra67rm9fdm4m1izmzwa0nhs"; 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; }; + ppiStats = derive2 { name="ppiStats"; version="1.62.0"; sha256="0w5gkfah2y50x4wj5fn8i6ycx1x013mn9w4bs8r2vfqabpws1a81"; depends=[Biobase Category graph lattice RColorBrewer]; broken = true; }; predictionet = derive2 { name="predictionet"; version="1.40.0"; sha256="1f3ghlcfnls9mx2hbs923rdz7kn0wdhy2csp1y1286c5q5dybrgh"; depends=[catnet igraph MASS penalized RBGL]; broken = true; }; + pulsedSilac = derive2 { name="pulsedSilac"; version="1.9.1"; sha256="1zb8xzs9h4rcrnmsfvrwb1qixn3jbnzxdwqgdrb82hgmxabmajlb"; depends=[cowplot ggplot2 ggridges MuMIn R_utils robustbase S4Vectors SummarizedExperiment UpSetR]; broken = true; }; scClassifR = derive2 { name="scClassifR"; version="1.2.0"; sha256="0p9l9q5ina0axrqvqn1y5wkfqi0nacxm3nm6ny34j53znv07b2zz"; depends=[ape caret data_tree dplyr e1071 ggplot2 kernlab pROC ROCR Seurat SingleCellExperiment SummarizedExperiment]; broken = true; }; slinky = derive2 { name="slinky"; version="1.12.0"; sha256="05ywydvyz3jnzbhabhz1sd61hpy9nb22512zpbi48mv5wic1sv3v"; depends=[curl dplyr foreach httr jsonlite readr rhdf5 SummarizedExperiment tidyr]; broken = true; }; tofsims = derive2 { name="tofsims"; version="1.22.0"; sha256="0da4843wbcr821yp8z3z4vd81qpm2lblckgd01fm89lmwj393z65"; depends=[ALS alsace KernSmooth ProtGenerics Rcpp RcppArmadillo signal]; broken = true; }; + tspair = derive2 { name="tspair"; version="1.53.0"; sha256="04xxrm313mnknhc38vl1sx6hic2g1x1xaa5772qlc7ip957hz85k"; depends=[Biobase]; broken = true; }; } diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index d9ae842f48a4..24b97075ac27 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-10-30"; }; +let derive2 = derive { snapshot = "2022-12-13"; }; in with self; { A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; }; AATtools = derive2 { name="AATtools"; version="0.0.2"; sha256="10adwxyqnbjw2a0pxrp4qbs68fn2bdxwcbaqmvx5xfgrj4skl68z"; depends=[doParallel dplyr foreach magrittr]; }; @@ -17,8 +17,8 @@ in with self; { ABPS = derive2 { name="ABPS"; version="0.3"; sha256="0n3f66nmfi5v94il1mxy026mi84w01ph2aljk60vn3mrz8kwf2ll"; depends=[kernlab]; }; ACA = derive2 { name="ACA"; version="1.1"; sha256="1i3hm27nvnkvc39xlh0d1blq8q0q02czmvgi3cazmjx3jvxay0vq"; 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.1"; sha256="129ykw0j8z30mr4c01qzx6qy6h4bl87zxvmps0vkh8cqb7akninq"; depends=[dplyr ggplot2 plyr Rsolnp zoo]; }; - ACEP = derive2 { name="ACEP"; version="0.0.1"; sha256="1xpn3x89zdwkwvki4hij2r2fknn75qhjxhdcmlj8hk86fwhsqfm4"; depends=[]; }; + ACDm = derive2 { name="ACDm"; version="1.0.4.2"; sha256="00i33b76gqllyc6ywwwrgyjvxfspqb3jf52b9sjaazlfwgn5xyjf"; depends=[dplyr ggplot2 plyr Rsolnp zoo]; }; + ACEP = derive2 { name="ACEP"; version="0.0.21"; sha256="1c3krdxfpdmpj8z3bwi6gqq621n1hvna593bhcmrzkyv2jkc0k7a"; depends=[httr]; }; ACEsearch = derive2 { name="ACEsearch"; version="1.0.0"; sha256="1ssq8avj20dk2mal0j5dvshf7qgk0as90sgl71cn91cq8lbiilpn"; depends=[httr testthat]; }; ACEsimFit = derive2 { name="ACEsimFit"; version="0.0.0.9"; sha256="0ifwgpnql14z1qzw8fmllgzl97bwd35f0558ymmcxz1mhgh6cb2v"; depends=[OpenMx]; }; ACEt = derive2 { name="ACEt"; version="1.8.2"; sha256="0583c9dg2yf01zf5p0bf24zipkm8yp7rwhn1dxyw2d0v881bbli6"; depends=[BH MASS Rcpp RcppArmadillo]; }; @@ -54,6 +54,7 @@ in with self; { AGSDest = derive2 { name="AGSDest"; version="2.3.4"; sha256="140bqzgaagdyzgxsn998jw2sxak448i47xyacn2psfnps440gfjr"; depends=[ldbounds]; }; AHM = derive2 { name="AHM"; version="1.0.1"; sha256="00r1rn7d64a18rckbxvla5yapqv00p9ajxv72fx7s6p80kfal89w"; depends=[devtools dplyr glmnet Matrix mixexp plgp quadprog tibble tidyr]; }; AHMbook = derive2 { name="AHMbook"; version="0.2.6"; sha256="055li8mj863icvcrp23wfsg7gf8zmi8zn0hck2yraygazv2xk97k"; depends=[coda fields mvtnorm plotrix raster sp spdep unmarked]; }; + AHPWR = derive2 { name="AHPWR"; version="0.1.0"; sha256="1g7d1vbjxb232fk6wjah73kjm6pj81acls8wqssphgnfiffgrrq6"; depends=[dplyr formattable ggplot2 igraph magrittr readxl tibble tidyr xlsx]; }; AHPhybrid = derive2 { name="AHPhybrid"; version="0.1.0"; sha256="1hf2ba52nim13jwkq857vnmnnb1yhgdz6kipqg3mmqrgz7kg52v1"; depends=[]; }; AHSurv = derive2 { name="AHSurv"; version="0.1.0"; sha256="051q6iamqhhkrq7bfhq40n9svd4wfqyxscgwfnsflqdmbgm6gghs"; depends=[flexsurv rootSolve]; }; AICcmodavg = derive2 { name="AICcmodavg"; version="2.3-1"; sha256="1c2qqizssy7jvzkndlljazk28rjq5csgawzs43gv3s9qbahpslfh"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; }; @@ -67,12 +68,12 @@ in with self; { 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]; }; - AMAPVox = derive2 { name="AMAPVox"; version="0.12.0"; sha256="11achgmgh42q3m50ilxw7laa5v93nq254rl373z7zqk1hvpyy3xk"; depends=[curl data_table dplyr rappdirs rvest stringr]; }; + ALassoSurvIC = derive2 { name="ALassoSurvIC"; version="0.1.1"; sha256="0asaip7mq1brahirm025d57gk1fgysbmhi6jypf2jihai7dl4jg2"; depends=[Rcpp]; }; + AMAPVox = derive2 { name="AMAPVox"; version="0.12.1"; sha256="0hn9c0kasyvmfavk8ppfasl3p171xi5p3qzydsk41szvkm9wx6qy"; depends=[curl data_table dplyr rappdirs rvest stringr]; }; AMCP = derive2 { name="AMCP"; version="1.0.1"; sha256="14fbb2p4dbgi7i31xxavrldw4wnd4cjjh56ys63rivkswi1hhzj2"; depends=[]; }; AMCTestmakeR = derive2 { name="AMCTestmakeR"; version="1.0.0"; sha256="1vgncc61gmqhax2a7072jb36bzkycv80xqihkr5qs8jxnqqkndxd"; depends=[]; }; AMModels = derive2 { name="AMModels"; version="0.1.4"; sha256="18h075bzk8s75b3zmjd0x8c6dpl40445d4kv8n0p4ldnx80b1aha"; depends=[unmarked]; }; - AMPLE = derive2 { name="AMPLE"; version="1.0.0"; sha256="1lcwwf41i0mkg2bv8z5mzrj6h3pa31h33mrmbxbndjgb3ivz2wf5"; depends=[ggplot2 markdown R6 RColorBrewer scales shiny shinyjs shinyscreenshot]; }; + AMPLE = derive2 { name="AMPLE"; version="1.0.1"; sha256="1bi39liky0lmv56rxcrf4m9vc3s4xi1z2wcigfkpvsap4gy67qph"; depends=[ggplot2 markdown R6 RColorBrewer scales shiny shinyjs shinyscreenshot]; }; AMR = derive2 { name="AMR"; version="1.8.2"; sha256="1d47akk1amf9x28a3ss0j2453hk9rdqkzdklxnv40b13hvjd8l0n"; 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]; }; @@ -82,8 +83,7 @@ in with self; { ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.1.5"; sha256="1d2r2cwpn9rdfbmiccag487pvsq6adn7b321c5z8i7n671h2wi26"; depends=[quadprog shiny]; }; ANTs = derive2 { name="ANTs"; version="0.0.16"; sha256="1bvbr9m5fbq3x5mfn4xhfm2x7a8zs616cf02gzv65r8k9q2348ll"; depends=[gtools Kendall lme4 Rcpp RcppArmadillo RcppEigen rstudioapi]; }; AOV1R = derive2 { name="AOV1R"; version="0.1.0"; sha256="0dv7k0mifybkarpwqyla5j6cvw9dcch09wvdq09ra9bsf4vyk652"; depends=[cellranger data_table lazyeval purrr]; }; - 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]; }; + APCI = derive2 { name="APCI"; version="1.0.6"; sha256="0lfbx067vqh2yn15jmiicva8h38k0vgdr3s6m2jgswfbp11a8pjh"; 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=[]; }; @@ -98,7 +98,7 @@ in with self; { AR = derive2 { name="AR"; version="1.1"; sha256="1wn4g2997c4vc3mzq2pv8ld0ryp0i78v4zlqqryvhshxgnz4f2pr"; depends=[DISTRIB]; }; ARCensReg = derive2 { name="ARCensReg"; version="2.1"; sha256="05zjk1wxqfigzg80lvx1940a059jfdr9zbzgzmz2n01glj1lvj63"; depends=[msm mvtnorm numDeriv tmvtnorm]; }; ARCokrig = derive2 { name="ARCokrig"; version="0.1.2"; sha256="0pk0y0gsw681py0vwizxvh1jqjnapzqfr0mbdpli1sray55xbjr2"; depends=[ggplot2 mvtnorm Rcpp RcppArmadillo RcppEigen]; }; - ARDL = derive2 { name="ARDL"; version="0.2.0"; sha256="19ggs0ipqnivdwvx5ry7i7p2yvrrqj8bydcka44plh44kqa35kc8"; depends=[aod dplyr dynlm lmtest msm stringr zoo]; }; + ARDL = derive2 { name="ARDL"; version="0.2.1"; sha256="151mw6z67ssa3pykmbcijgcw4msbrpn1l4b5qj3pz9v9k3j05idl"; depends=[aod dplyr dynlm lmtest msm stringr zoo]; }; ARHT = derive2 { name="ARHT"; version="0.1.0"; sha256="1fz81a202r8vk655dg6a03zfq3gfkimqjvmc95k3j02xz0iv58kn"; depends=[]; }; ARIMAANN = derive2 { name="ARIMAANN"; version="0.1.0"; sha256="0n4n9srl56s6pxjib43ksb9rahmsb509sfvpjk4py8m4r01ab2m2"; depends=[forecast tseries]; }; ARIbrain = derive2 { name="ARIbrain"; version="0.2"; sha256="18c7yxkrnqh18gcfzvdc5wqig6ywdmjcy8rlz0fdj3b8fb84dfpr"; depends=[hommel plyr RNifti]; }; @@ -113,12 +113,13 @@ in with self; { ASGS_foyer = derive2 { name="ASGS.foyer"; version="0.3.1"; sha256="089c4vm629rni0dfgg3r2a9s9yisdx1qs2dwssg44qw1w4hf1f50"; depends=[sp]; }; ASIP = derive2 { name="ASIP"; version="0.4.9"; sha256="06f1nvy920vyx3bmdi77mwvfsn32xsfxaslhagnf1zh652vfkbwi"; depends=[raster rgdal stringr]; }; ASMap = derive2 { name="ASMap"; version="1.0-4"; sha256="0xnrl8jhbvbc789w5gc9dz7j7gzc7wsc94a3d2wdplrmxn186nrb"; depends=[fields gtools lattice qtl RColorBrewer]; }; + ASRgenomics = derive2 { name="ASRgenomics"; version="1.1.3"; sha256="1yl3q1fjfyl0v0wpbgnbh8zj5j8zi1imf19cj66fdvji3i4c4lsi"; depends=[AGHmatrix cowplot crayon data_table ellipse factoextra ggplot2 Matrix scattermore superheat]; }; ASSA = derive2 { name="ASSA"; version="2.0"; sha256="10r5406g6i0959k1zm5h9cbwqmnyf7zy80ahiqsyrapm3g5rphxg"; depends=[]; }; - ASSISTant = derive2 { name="ASSISTant"; version="1.4.2"; sha256="1vh1glk83lg010v2fc289gr6xy0dzbrqcjfva2mmaymk6v78a1w5"; depends=[dplyr knitr magrittr mvtnorm R6]; }; + ASSISTant = derive2 { name="ASSISTant"; version="1.4.3"; sha256="0apaj4lfkbg08xrw8mknf50s1vyd4j5mbwciwgblq7ydh3pyjxaj"; depends=[dplyr knitr magrittr mvtnorm R6]; }; AST = derive2 { name="AST"; version="0.1.0"; sha256="0z5dw5qw0i61v4796ms7pp66f9y4ylxrcls31ixzcmkklh3rcnp3"; depends=[]; }; ASV = derive2 { name="ASV"; version="1.1.1"; sha256="1cwsfc5mylivg65mb93d0v8kalirq5vwjx78fjyylsdc4w33gzqb"; depends=[freqdom Rcpp RcppArmadillo RcppProgress]; }; ATAforecasting = derive2 { name="ATAforecasting"; version="0.0.57"; sha256="15ih8jmgp20iskgbn8v5gbbh3d724gmv0943lc09yvja7b6wxvba"; depends=[forecast Rcpp RcppArmadillo Rdpack seasonal stlplus stR timeSeries TSA tseries xts]; }; - ATNr = derive2 { name="ATNr"; version="1.0.1"; sha256="1ryh99yifldml6fpprz01lap1nzlifjb2w8wgnmx95byz7gayrm9"; depends=[deSolve Rcpp RcppArmadillo]; }; + ATNr = derive2 { name="ATNr"; version="1.0.2"; sha256="0p6pya91aklylig80xca68n5xx0ngzn8p0ba8sfrznqj53g8x4r5"; 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]; }; AUC = derive2 { name="AUC"; version="0.3.2"; sha256="07xf47kypqbsg2mixmq6mnh4s89aqan9bgl6kfv6lbx8ajv2asw3"; depends=[]; }; @@ -134,6 +135,7 @@ in with self; { AcrossTic = derive2 { name="AcrossTic"; version="1.0-3"; sha256="03180h79jhjd66ibrnsfp3yyp2jlfysp7cymw46phzj2palghsc0"; depends=[lpSolve treeClust]; }; ActCR = derive2 { name="ActCR"; version="0.3.0"; sha256="1w3xkq3wanpa2j3rfzzdvad2r3vzzvp76kp56mh2s07p3xql6rv0"; depends=[cosinor cosinor2 dplyr minpack_lm zoo]; }; ActFrag = derive2 { name="ActFrag"; version="0.1.1"; sha256="08r3gwjz4fkyy85dxqix0ffm5xyq45032qv3snnzxnlqxslxbqn1"; depends=[accelerometry dplyr ineq survival tidyr]; }; + ActiSleep = derive2 { name="ActiSleep"; version="0.2.1"; sha256="0nkfddfv0g1bvsg6811lrmy0cx7knmi225snyp22bh9ly9fnlqp8"; depends=[accelerometry DBI dplyr lazyeval lubridate RSQLite stringr tibble]; }; ActiveDriver = derive2 { name="ActiveDriver"; version="1.0.0"; sha256="10c7ga48fwvpd5mc4dqiyw4kc2l0iz5qn4hg7xk15r1qmm5rsipa"; depends=[MASS]; }; ActiveDriverWGS = derive2 { name="ActiveDriverWGS"; version="1.2.0"; sha256="0xnplgwxd197a4d422bsxg753q158i12ils16awd1cw30wafdxkk"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 BSgenome_Mmusculus_UCSC_mm10 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; ActivePathways = derive2 { name="ActivePathways"; version="1.1.1"; sha256="1crq164vyqhdq5y3q09k3m5zljqrhcd5ak0jrc0xqvzf0pasml2m"; depends=[data_table ggplot2]; }; @@ -142,7 +144,6 @@ in with self; { 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]; }; AdapSamp = derive2 { name="AdapSamp"; version="1.1.1"; sha256="1jayjrsiib2ij4rxxj59g71r3xhzl5yqh0lhi8k6cfy03i7dkvis"; depends=[pracma]; }; - AdaptFitOS = derive2 { name="AdaptFitOS"; version="0.69"; sha256="0mclsnsxjyg1q7p7654gjsczzdzpa6avx3b9jpmdb0n63zdgmwy3"; 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,7 +156,7 @@ in with self; { AeroSampleR = derive2 { name="AeroSampleR"; version="0.1.14"; sha256="027lf82kpllz8v0g2mbbjx1yc2nmw5i0pfhmnhay3ms0yc4p4sbm"; depends=[dplyr flextable ggplot2 ggthemes purrr stringr tidyr tidyselect]; }; AggregateR = derive2 { name="AggregateR"; version="0.1.1"; sha256="1s2q888bqx6ilisv5s4g8ryja97nz6cz4ycm4sw1i63l5wjrwljc"; depends=[data_table NCmisc tibble]; }; AgreementInterval = derive2 { name="AgreementInterval"; version="0.1.1"; sha256="1bvinzylvsaipa8mq15f45b6h37znavlrdl0rbrx1pqw52r7z8kv"; depends=[psych]; }; - AgroR = derive2 { name="AgroR"; version="1.3.1"; sha256="1a08wm33rpnchxwy1pn298wwgg2zw5a9xih92i843ch43pw02dis"; depends=[cowplot crayon drc dunn_test emmeans ggplot2 ggrepel gridExtra gtools lme4 lmtest MASS multcomp multcompView nortest RColorBrewer]; }; + AgroR = derive2 { name="AgroR"; version="1.3.2"; sha256="098ichvfsx7v1mawwy4mcxw7llfxkp7iqhnkawqq5f4lsjhr376h"; depends=[cowplot crayon drc dunn_test emmeans ggplot2 ggrepel gridExtra gtools knitr lme4 lmtest MASS multcomp multcompView nortest RColorBrewer]; }; AgroReg = derive2 { name="AgroReg"; version="1.2.7"; sha256="0kn7prhd9fzp2ibj12nz5cj5lag6bn7bmgva2xl7cf2b6pwmfijl"; depends=[boot broom dplyr drc egg ggplot2 minpack_lm rcompanion]; }; AgroTech = derive2 { name="AgroTech"; version="1.0.2"; sha256="0pfw0sps9fbzzyy4d803j9fbg6a23nj18rks0bnrj9hms7a3vwfs"; depends=[crayon ggplot2 ggrepel gridExtra lmtest nortest readxl xlsx]; }; AhoCorasickTrie = derive2 { name="AhoCorasickTrie"; version="0.1.2"; sha256="0zh3y5jd8m0xbj6lqr01zvwj9qd1xr3iq7vd6sgr3g3qh4kqm5pq"; depends=[Rcpp]; }; @@ -166,10 +167,10 @@ in with self; { AlleleRetain = derive2 { name="AlleleRetain"; version="2.0.2"; sha256="0b6h5giskqbjbrk8nf29i75wrhxsjw1c87laiqzrpbp9n717bl20"; depends=[]; }; AlleleShift = derive2 { name="AlleleShift"; version="1.1"; sha256="1cmmxwp3qq28hln6k9hfv61b53nwx08iidhcxj8bdwv7msyp9f8k"; depends=[adegenet BiodiversityR vegan]; }; Allspice = derive2 { name="Allspice"; version="1.0.5"; sha256="0a99iqb01snza0ad07lrzmn88vpq8wvx5vjr8fk0wbzihxzbzn4y"; depends=[]; }; - AlphaHull3D = derive2 { name="AlphaHull3D"; version="1.1.0"; sha256="131wcx5yagsl42qwwcx84shd4v1sh8g2381njcqq5lsa2y2rsarh"; depends=[BH Rcpp RcppCGAL RcppEigen rgl Rvcg]; }; - AlphaPart = derive2 { name="AlphaPart"; version="0.9.7"; sha256="0v1ywxlx248v6nqxcfh0d1mgpzs08vxww807c60mq7d4hqdlar82"; depends=[directlabels dplyr ggplot2 magrittr pedigree Rcpp reshape tibble]; }; - AlphaSimR = derive2 { name="AlphaSimR"; version="1.3.1"; sha256="1i972xax6axrmxjqh5v217f3zwmdbfhm0zfjc6gkmhydddp0zn8k"; depends=[BH R6 Rcpp RcppArmadillo Rdpack]; }; - Amelia = derive2 { name="Amelia"; version="1.8.0"; sha256="0plrnmlwn91bmrx8ip83nqb15ykjxjl6m49788sinq5cinkdbh9y"; depends=[foreign Rcpp RcppArmadillo]; }; + AlphaHull3D = derive2 { name="AlphaHull3D"; version="2.0.0"; sha256="1jp4m2yd9z8m4gz5hfa08qm02kalrzy6pbjf3rfcb0xjglk1lngr"; depends=[BH Rcpp RcppCGAL RcppEigen rgl Rvcg]; }; + AlphaPart = derive2 { name="AlphaPart"; version="0.9.8"; sha256="1ih76v3kgnladqq3nvlqrz5sqkg1j97m778kchz6k05cjxhj8l4q"; depends=[directlabels dplyr ggplot2 magrittr pedigree Rcpp reshape tibble]; }; + AlphaSimR = derive2 { name="AlphaSimR"; version="1.3.4"; sha256="0b8qp3azia9sfl458y8zgxxxpzs7l2bwpkdnh1vza2ak61f4q85w"; depends=[BH R6 Rcpp RcppArmadillo Rdpack]; }; + Amelia = derive2 { name="Amelia"; version="1.8.1"; sha256="1r27zjlr8ld932lr6dn79cravss17gry6p0mxgdlbj6g58mfc30j"; depends=[foreign Rcpp RcppArmadillo rlang]; }; AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; }; AmesHousing = derive2 { name="AmesHousing"; version="0.0.4"; sha256="080r0fkmqsdrjgwbmdzacnkmd8py611z54i6r7nzj14r295d5qhk"; depends=[dplyr magrittr]; }; AmigaFFH = derive2 { name="AmigaFFH"; version="0.4.1"; sha256="1iv89nqlqc5lrnz9r56ajgmb54pkk1zafihh1m0528i0hg4l7qxm"; depends=[tuneR vctrs]; }; @@ -185,7 +186,7 @@ in with self; { Andromeda = derive2 { name="Andromeda"; version="0.6.1"; sha256="08n6ccx009mfnzmhgwzracwyf8ad40crmvb0wyg304dn2abgybn8"; 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]; }; + AnnoProbe = derive2 { name="AnnoProbe"; version="0.1.7"; sha256="0715bpifj8r4ji0m89wk4x7vd3pwx8kqy9vs8m0ivmq7bb56nx0b"; depends=[Biobase curl DT ggplot2 ggpubr httr pheatmap xml2]; }; 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]; }; @@ -193,6 +194,7 @@ in with self; { AnthropMMD = derive2 { name="AnthropMMD"; version="3.1.0"; sha256="10ms5akc2r9dmcm8dd8bn7qn0bq71c270yhs61981n4mxsvgjmnr"; depends=[plotrix scatterplot3d shiny smacof]; }; Anthropometry = derive2 { name="Anthropometry"; version="1.17"; sha256="0vxjlzxv16bygw8n57f25msq5bd1dydg41my92ximah0nzzvbg41"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; }; AntibodyTiters = derive2 { name="AntibodyTiters"; version="0.1.24"; sha256="1400n46kmaa074m6yilmkvcn83dyxk2w76x8cny1dygfzsnhhjxl"; depends=[DescTools openxlsx]; }; + AnxietySleep = derive2 { name="AnxietySleep"; version="0.0.1"; sha256="07im2gjq62y3vgim9j0ar29qhmi7r79zbjdi024h04mxrwpic5z6"; depends=[data_table lifecycle]; }; Aoptbdtvc = derive2 { name="Aoptbdtvc"; version="0.0.2"; sha256="1bygvf8vgzz3wa4485x2xxpk784zmw1nwsjjjysm12brrldh8zzh"; depends=[lpSolve MASS]; }; 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]; }; @@ -206,7 +208,7 @@ in with self; { ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.8"; sha256="00d8lpasz96l55v3982mqg85b237lxvsjl65p288yzj87860v2kj"; depends=[coda digest dplyr ggalt ggplot2 ggraph gplots gtools hdrcde magrittr readr reshape2 shiny 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.22.1-1"; sha256="15cd85zkjzpz321pnnjwn0g2v4rza6cdqanx89p5j3nrfihjrh32"; depends=[]; }; + AsioHeaders = derive2 { name="AsioHeaders"; version="1.22.1-2"; sha256="192qxayrpvi02wrqq2h5cjc92aaxrsgw7z32r8qk5imqg3mc0a8n"; depends=[]; }; AssetAllocation = derive2 { name="AssetAllocation"; version="1.0.0"; sha256="02r9a21696y1gj5qw01jddnyda6hm962l1am7igrqyywh05canch"; depends=[NMOF PerformanceAnalytics quantmod riskParityPortfolio RiskPortfolios xts zoo]; }; AssetCorr = derive2 { name="AssetCorr"; version="1.0.4"; sha256="0r98li2lxhfap1hn6h0l78phpm9m1nlcqhwzpq0ahhw0b1rd4qkf"; depends=[boot ggplot2 knitr mvQuad mvtnorm numDeriv qpdf Rdpack VineCopula]; }; AssetPricing = derive2 { name="AssetPricing"; version="1.0-3"; sha256="199ygwfddpzxnj388gxkn7xyhnvjr24f5jg4lnydh0z7pb96pm5r"; depends=[deSolve polynom]; }; @@ -253,13 +255,14 @@ in with self; { BAMBI = derive2 { name="BAMBI"; version="2.3.4"; sha256="0ksc4nccd89fsdmm70q9al0ww3y645navkvqmh7lb1imgnl5bwph"; depends=[bridgesampling coda future_apply gtools label_switching lattice loo mvtnorm numDeriv qrng RColorBrewer Rcpp RcppArmadillo scales]; }; BAMMtools = derive2 { name="BAMMtools"; version="2.1.10"; sha256="1ng7pf08nk7y00146qvqr9099kpvbgn1swi3cawzr9zd55gv7qvr"; depends=[ape gplots Rcpp]; }; BANOVA = derive2 { name="BANOVA"; version="1.2.1"; sha256="07ghmzsb77vcd3snmg59spp60j603gawnqs847x1x44pnxs9l4wl"; depends=[coda rjags rstan runjags]; }; + BAR = derive2 { name="BAR"; version="0.1.1"; sha256="0bcq6lvijq1vxri2dbhnqcn46f799h3ag974zgcdpx4c5apph04w"; depends=[]; }; BARIS = derive2 { name="BARIS"; version="1.1.3"; sha256="1ccwxc7s1qk9zcs546kkpwzv26rxswrydnblvg4b8vbm5790n0gv"; depends=[checkmate data_table downloader dplyr glue httr janitor jsonlite magrittr memoise miniUI rgdal rio rstudioapi sf shiny stringi stringr XML]; }; BART = derive2 { name="BART"; version="2.9"; sha256="1yzwiyjc2gq2vvw5z2psmyqbbb1kq0xvsb0zingcn8qikw45mm5m"; depends=[nlme nnet Rcpp survival]; }; - BAS = derive2 { name="BAS"; version="1.6.3"; sha256="0l7x1zi1q1yjmaw0wwrp0aarlbjd6zxzi7brc5q4ipb52hw8xljr"; depends=[]; }; + BAS = derive2 { name="BAS"; version="1.6.4"; sha256="1w7y3cp6j1pak2wq6wf9wffas0yvsz716qbva2bx9nln72gr05z5"; depends=[]; }; BASS = derive2 { name="BASS"; version="1.2.2"; sha256="14zimfdkpsil22n1z4ldpi9smmja5kf7qqlklr5sr7y5avnh0hd9"; depends=[hypergeo truncdist]; }; BASiNET = derive2 { name="BASiNET"; version="0.0.5"; sha256="09g2h38kz1g9kkjc69si5d6z6fkayys9hinjs3p6dn7sx7zn2bx1"; depends=[Biostrings igraph randomForest rJava rmcfs RWeka]; }; BASiNETEntropy = derive2 { name="BASiNETEntropy"; version="0.99.5"; sha256="06nshxxcj9nqdvdhr9lb55p2hsnbcdcqhnp0r9hs8yp3d1h7cv08"; depends=[Biostrings igraph randomForest]; }; - BAT = derive2 { name="BAT"; version="2.9.0"; sha256="1i47yr0q9v4ryqwx0rlyp0kjjczgiprm7by4ykbwmgzyl9y0gkgp"; depends=[ape geometry hypervolume MASS nls2 raster vegan]; }; + BAT = derive2 { name="BAT"; version="2.9.2"; sha256="1h90fqcnd6w4w0bjccz5zghqb05gddbiz3imfpbw14p23h11w3wq"; depends=[ape geometry hypervolume MASS nls2 raster vegan]; }; BAYSTAR = derive2 { name="BAYSTAR"; version="0.2-10"; sha256="1yn79nkwi33d6qsiklay3ngk26dvi44lap59zp545gidvn9fbir6"; depends=[coda mvtnorm]; }; BAwiR = derive2 { name="BAwiR"; version="1.2.7"; sha256="1vvym7bbfbi1x91962nfcqql0fiyv4svdk5329rq43nnh188i456"; depends=[Anthropometry dplyr ggplot2 ggthemes httr lubridate magrittr plyr purrr reshape2 rvest rworldmap scales stringi stringr tibble tidyr xml2]; }; BB = derive2 { name="BB"; version="2019.10-1"; sha256="0kf9sfsm3n036a8a8gjfpc9qdryvadb019kqjh80n1szdv7bdl04"; depends=[quadprog]; }; @@ -285,13 +288,13 @@ in with self; { BDEsize = derive2 { name="BDEsize"; version="1.6"; sha256="0dyjd5f1cqmzqnrbxz06pbxrk6gjrmsh2x6p7qllczvlmm7jdm5i"; depends=[fpow ggplot2]; }; BDP2 = derive2 { name="BDP2"; version="0.1.3"; sha256="14m85sigx6hk0qzhfgih43m2lxp9xczmp9g3z4pping6msbnbdrz"; depends=[rmarkdown shiny shinyBS]; }; BDWreg = derive2 { name="BDWreg"; version="1.2.0"; sha256="07j6dy69q1as1nwgp2790wzpzmjich2256cddhl7n3h2rs1dja74"; depends=[coda doParallel DWreg foreach MASS]; }; - BDgraph = derive2 { name="BDgraph"; version="2.70"; sha256="1s148fvvg1c0n4swsvcinlwckj86jys5nvwp4wlyzh3aw9siyqz7"; depends=[ggplot2 igraph pROC]; }; + BDgraph = derive2 { name="BDgraph"; version="2.71"; sha256="1lihsbliq7f91ywdq5cabzd5fbyhb10h62ss3n2l7i2fdglb77d1"; depends=[ggplot2 igraph pROC]; }; BE = derive2 { name="BE"; version="0.2.3"; sha256="1k2895w8jd0scd6nxh3jyxd7vz9hcapna9xkmis6i3byly5bvvan"; depends=[rtf]; }; BEACH = derive2 { name="BEACH"; version="1.3.1"; sha256="0biq6c74k8vb8ykafzf3blyi08rp65x1vaw3bfpwdc1ihc9wrgjr"; depends=[devtools DT haven plyr rJava rtf sas7bdat shiny WriteXLS xtable]; }; - BED = derive2 { name="BED"; version="1.4.8"; sha256="0626v6qrj2rhjfq0pbk2js5asrc810hxq5169xq5armmg7hblg4r"; depends=[dplyr DT miniUI neo2R readr rstudioapi shiny stringr visNetwork]; }; + BED = derive2 { name="BED"; version="1.4.11"; sha256="0rhpy80fc5vm6zphcs34fxmy0jlpx3dsapcsksxagprm7ijjdmh0"; depends=[dplyr DT miniUI neo2R readr rstudioapi shiny stringr visNetwork]; }; BEDASSLE = derive2 { name="BEDASSLE"; version="1.6"; sha256="0zqqjyal9wjjl1aayp324wdrq3aaqr7s5j912yb3rrvq4gqcfy0d"; depends=[emdbook MASS matrixcalc]; }; BEDMatrix = derive2 { name="BEDMatrix"; version="2.0.3"; sha256="1pq333x1shxw3wcqgcb4gqg6rwa0hyc24rib235q4zg10r2gyrbm"; depends=[crochet]; }; - BEKKs = derive2 { name="BEKKs"; version="1.3.1"; sha256="0awlvd20gsrzbpnhkk7sqsxb4g13y6h42pxgj3isck9d0kdfs7i3"; depends=[forecast future future_apply GAS ggfortify ggplot2 gridExtra ks lubridate mathjaxr moments numDeriv pbapply Rcpp RcppArmadillo reshape2 xts]; }; + BEKKs = derive2 { name="BEKKs"; version="1.4.0"; sha256="12amk1p99nrh747m832b8sd4lrm88s0dax6fphxcx9dm57r94av5"; depends=[forecast future future_apply GAS ggfortify ggplot2 gridExtra ks lubridate mathjaxr moments numDeriv pbapply Rcpp RcppArmadillo reshape2 xts]; }; BENMMI = derive2 { name="BENMMI"; version="4.3-7"; sha256="1v96g4l1zkpvvx8jdifnafyaz4ml8v1bxbl97r1n5n6mgw88gk77"; depends=[benthos dplyr ggplot2 jsonlite knitr markdown purrr readr tidyr xtable]; }; BEST = derive2 { name="BEST"; version="0.5.4"; sha256="109zl99bz1bndan1pm3hm0f1da86a18lcyzl0741z14l0m0d91a9"; depends=[coda HDInterval rjags]; }; BESTree = derive2 { name="BESTree"; version="0.5.2"; sha256="0yij6xdlvhbqifckaylgbhszwwp38d9x6vbpr1nl40mwwnv4bswz"; depends=[plyr]; }; @@ -310,7 +313,7 @@ in with self; { BHAI = derive2 { name="BHAI"; version="0.99.2"; sha256="1hawa55mk590is8ziav7fdszsa3a42bqb0znzqsazz5lkg4daaa7"; depends=[MCMCpack plotrix prevtoinc]; }; BHH2 = derive2 { name="BHH2"; version="2016.05.31"; sha256="1m4fcx979nbm97hi89vbjjix0sx6qhdzs486risck9bi7yzih5k4"; depends=[]; }; BHMSMAfMRI = derive2 { name="BHMSMAfMRI"; version="2.1"; sha256="1wcsgzx69qrw1bnipb9ry6162mirk6miw62w8pcvazqj91aljfhd"; depends=[oro_nifti Rcpp RcppArmadillo wavethresh]; }; - BHSBVAR = derive2 { name="BHSBVAR"; version="3.0.1"; sha256="0k4iklbazw4fbwfd0nhg943ndwrhpxxlbzmfj3c10in84vz2p6v0"; depends=[Rcpp RcppArmadillo]; }; + BHSBVAR = derive2 { name="BHSBVAR"; version="3.1.1"; sha256="184dhaajjzplslbfjmdm9zyr7h39zi1h3p549lac2sy6mrkglrc0"; depends=[Rcpp RcppArmadillo]; }; BHTSpack = derive2 { name="BHTSpack"; version="0.6"; sha256="01y3ly83i70lkg2kgbw1r7r1g4k9rk41qyzzscbp8zgc9z63ll8z"; depends=[R2HTML xtable]; }; BI = derive2 { name="BI"; version="1.1.0"; sha256="1iv721wbh64qyij58llkxgz1s1rsc3x68h5gz69fxbf4x9cv2vlr"; depends=[]; }; BICORN = derive2 { name="BICORN"; version="0.1.0"; sha256="0mqk8vgp6jdk7f0paa06yqlibkd1y3vs69pg7i9mkvxmda7p4nkq"; depends=[]; }; @@ -322,11 +325,12 @@ in with self; { BINtools = derive2 { name="BINtools"; version="0.2.0"; sha256="0x97h0b2krdgrd0x266fidj77an3dq8mf9lnbas9112p4mhkmk58"; depends=[BH combinat dplyr mvtnorm Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders stringi tibble]; }; BIOMASS = derive2 { name="BIOMASS"; version="2.1.8"; sha256="18ypdqh5fc9a7yq8y5insadmvamrzrd9yn00g1cj1lxii0jn4r43"; depends=[data_table jsonlite minpack_lm proj4 rappdirs raster sp]; }; BIOdry = derive2 { name="BIOdry"; version="0.9"; sha256="1j6fbrvhiaz04fpybdldjk2prg3n5ayzvxqbx0g0vbna54kd1vz6"; depends=[ecodist nlme]; }; - BISdata = derive2 { name="BISdata"; version="0.2-0"; sha256="0d5dxb0jmiazbkmjmm0babv3hxgx74b9v7j08yhy5w3zl1fvlyr2"; depends=[]; }; + BIS = derive2 { name="BIS"; version="0.3.1"; sha256="1nmbcdk4p34grss2bwwqw5zynp5c2xfhhqs9h9s85nhdm7ark78v"; depends=[dplyr readr rvest tidyr tidyselect xml2]; }; + BISdata = derive2 { name="BISdata"; version="0.2-1"; sha256="0xmm40d9ag2g5j0lsy46ig3plzcqrw2p3iaciimw2y0v4fa8n3gh"; depends=[]; }; BLCOP = derive2 { name="BLCOP"; version="0.3.3"; sha256="08y9vmx3cknjvk6ngfwxlfnc03cqpj97i1ijrs1cw5sahjc0vmhc"; depends=[fBasics fMultivar fPortfolio knitr MASS quadprog rmarkdown RUnit timeSeries]; }; BLModel = derive2 { name="BLModel"; version="1.0.2"; sha256="0l5f2v5ggadmrci3qhhmxm3j9i6jii0anq5rv5vk50y2qzii2q15"; depends=[]; }; BLOQ = derive2 { name="BLOQ"; version="0.1-1"; sha256="0qs4pnzpfwkii6wpd8my34zw9k003b3is0y0aj1lhcm0qnn1p8h4"; depends=[maxLik mvtnorm]; }; - BLPestimatoR = derive2 { name="BLPestimatoR"; version="0.3.2"; sha256="0prc2m3hixv8hmnyhr5549406ln509llkhpqra2ifpzif0waw704"; depends=[Formula Matrix mvQuad numDeriv randtoolbox Rcpp RcppArmadillo]; }; + BLPestimatoR = derive2 { name="BLPestimatoR"; version="0.3.4"; sha256="07q5ifsvw1ccxys6y01ldh2n9v7chyv88rda1jbznb3nnwka2wh0"; depends=[Formula Matrix mvQuad numDeriv randtoolbox Rcpp RcppArmadillo]; }; BLR = derive2 { name="BLR"; version="1.6"; sha256="1wivqh19kxgr7nwa09s5ay6x1yidjk4hqanv0mzb1nbik98w9024"; depends=[]; }; BLRPM = derive2 { name="BLRPM"; version="1.0"; sha256="15q0jkw4swz35c58nv23k8g1dy1kkbqh5aydjck7pd0fmppqrhpx"; depends=[R6]; }; BLRShiny = derive2 { name="BLRShiny"; version="0.1.0"; sha256="0z3gr0bvjs7y0jkygh7h9habnk2807cwziajpgfmb7dxdrhccj68"; depends=[caret dplyr e1071 ggplot2 rhandsontable rmarkdown shiny]; }; @@ -343,18 +347,16 @@ in with self; { 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.5"; sha256="0pdp8cnqj8cmyhppxrkqlckg3xlcswra9vsnjwwdlnvn8b00m5d1"; depends=[data_table Rcpp RcppArmadillo]; }; - 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]; }; BNPdensity = derive2 { name="BNPdensity"; version="2021.5.4"; sha256="16hm81wn08fjdamikzrmhpbsz31phkqxdqhp23w0pbxczk9gll47"; depends=[coda dplyr ggplot2 gridExtra survival tidyr viridis]; }; BNPmix = derive2 { name="BNPmix"; version="1.0.2"; sha256="114gn80b7yyl6hi5cdnc0rp2hzy7pp8z6q4is1h29yxlqa6acbq4"; depends=[coda ggplot2 ggpubr Rcpp RcppArmadillo RcppDist]; }; BNSL = derive2 { name="BNSL"; version="0.1.4"; sha256="0nrlx55364kgvkdpyaimgjxwnzmmdl1gmvyv3wkm8n2jyki92xxp"; depends=[bnlearn igraph Rcpp]; }; - BNSP = derive2 { name="BNSP"; version="2.1.6"; sha256="0ig531n9sj50wn5nwljc2x4wijv5i28jx73knzz2kshb56p8sl7l"; depends=[coda corrplot cubature Formula ggplot2 gridExtra label_switching mgcv plot3D plyr threejs]; }; + BNSP = derive2 { name="BNSP"; version="2.2.0"; sha256="105564bhknhrcv92fbzk4vka8jsvq75rdzvlzgxy8cgiraxqldv0"; depends=[coda corrplot cubature Formula ggplot2 gridExtra label_switching mgcv plot3D plyr threejs]; }; BNrich = derive2 { name="BNrich"; version="0.1.1"; sha256="0m3cz7npc7mwq2vj68hllbd2vf5xqw00jaxv1pm3c28mq7pb459j"; depends=[bnlearn corpcor glmnet graph]; }; BOIN = derive2 { name="BOIN"; version="2.7.2"; sha256="03h6s1nn87xgkk830wls06mgflg0arq084k74gfp1k4wccwkjr5y"; depends=[Iso]; }; BOJ = derive2 { name="BOJ"; version="0.3"; sha256="1x9lz01fjdk0aybs6zsbbq2xfjvh99qiimmnrkbcd6sj880vn3a3"; depends=[dplyr readr rvest tidyr tidyselect xml2]; }; BOSO = derive2 { name="BOSO"; version="1.0.3"; sha256="0zax40x2d62vcn8zznmzmykk33mv4vbjfl88i3r1djbvalcdf5cf"; depends=[MASS Matrix]; }; BOSSreg = derive2 { name="BOSSreg"; version="0.2.0"; sha256="0ln4nx0jlvz5kqk9qkcl8a2cyhsdcqqfs5112qcaabjiwjnvla7w"; depends=[glmnet Matrix Rcpp RcppArmadillo]; }; - BPEC = derive2 { name="BPEC"; version="1.3.1"; sha256="0jvq56cq1wnhwd6wvg02hbx4b5vc2hz1lyxi63pl41rk0xva615a"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools sp]; }; BPM = derive2 { name="BPM"; version="1.0.0"; sha256="17k2d1xjfz85ygx0xnh6yqca9nyypd32d7sbna3k33ynsjqay3x8"; depends=[limma]; }; BRACoD_R = derive2 { name="BRACoD.R"; version="0.0.2.0"; sha256="1jxxrgq2s5fqflp9ac4fx51jhlx33pdwijsp4vq63y430k79vcpp"; depends=[reticulate]; }; BRDT = derive2 { name="BRDT"; version="0.1.0"; sha256="1yv2fh4cc9h35l8cngpxnqa83a7bx79pr7c1gp9h84p1pigg8282"; depends=[]; }; @@ -365,11 +367,13 @@ in with self; { BRugs = derive2 { name="BRugs"; version="0.9-1"; sha256="1m3dlw6201bzf6fcm4qscpsmgjkpidwiil3m4iwfn0b0iv3dclcv"; depends=[coda]; }; BSBT = derive2 { name="BSBT"; version="1.2.1"; sha256="0ibqg3jr7l25aikz09s8v5w1z541dsw8pr30ixf6d1bly5bw5ahy"; depends=[expm igraph MASS]; }; BSDA = derive2 { name="BSDA"; version="1.2.1"; sha256="0vcf3h1rkgs0mr6rri2zjkb3c62dmndm281zh4ddz2vyw27wpwg2"; depends=[e1071 lattice]; }; - 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]; }; + BSGW = derive2 { name="BSGW"; version="0.9.4"; sha256="05gr0p9fmj5560s083iss8j4gyh5rk0kdi3qhq5dzr9mfzy0n12q"; depends=[doParallel foreach MfUSampler survival]; }; + BSL = derive2 { name="BSL"; version="3.2.5"; sha256="12fksih33a4r6dd8flv7s1hidazhfqcbyvvnppp25rn6jb7p6344"; depends=[coda copula doRNG foreach ggplot2 glasso gridExtra MASS mvtnorm Rcpp RcppArmadillo Rdpack stringr whitening]; }; BSPADATA = derive2 { name="BSPADATA"; version="1.1.0"; sha256="190zmjvw5q5gg47g21n2imclz1qg585cvjxl501mm910gx50rldb"; depends=[coda mvtnorm pbapply pscl spdep]; }; - BSPBSS = derive2 { name="BSPBSS"; version="1.0.4"; sha256="05wfcybcygwswm4syhcaa8fzbmk044lh7mm85m1fapgwgqviswkl"; depends=[BayesGPfit ggplot2 glmnet gplots gridExtra gtools ica movMF neurobase oro_nifti RandomFieldsUtils Rcpp RcppArmadillo rstiefel svd]; }; + BSPBSS = derive2 { name="BSPBSS"; version="1.0.5"; sha256="0ax92x657f8jm731wc1qry19mbi4d3xxcxh5zd07w3705va4k82y"; depends=[BayesGPfit ggplot2 glmnet gplots gridExtra gtools ica movMF neurobase oro_nifti Rcpp RcppArmadillo rstiefel svd]; }; 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]; }; + BSSoverSpace = derive2 { name="BSSoverSpace"; version="0.1.0"; sha256="117av0y5bw44z6293fvbxmf1xqhar7c4lf5z09xrs78dn1xdsnbs"; depends=[expm rSPDE SpatialBSS]; }; BSSprep = derive2 { name="BSSprep"; version="0.1"; sha256="0dkhx8vx9kg902i6nzkzbighf2szq12l0p8iwinlpb2qdf526lk6"; depends=[Rcpp RcppArmadillo]; }; BSW = derive2 { name="BSW"; version="0.1.1"; sha256="0l6sw8lyk9mxfdw4s72hz6a0b30gi2a2vlcndkgahjlym6i5bz83"; depends=[Matrix matrixStats quadprog]; }; BSagri = derive2 { name="BSagri"; version="0.1-10"; sha256="096l2ilr4x2fbjxchkksxkbiyaf7wwdmzn4xyjx001w873x9dgf6"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; }; @@ -386,10 +390,8 @@ in with self; { BWGS = derive2 { name="BWGS"; version="0.2.1"; sha256="1473lvkmpf2dsgnccwl5a8wp9yvddciqdql4naba4lwghimxy39w"; depends=[BGLR brnn e1071 glmnet randomForest rrBLUP stringi]; }; BWStest = derive2 { name="BWStest"; version="0.2.2"; sha256="02amzlfprmw5pyis0dg0kg0x8xqh50a4vfdcxxmklrzik3b1vzzs"; depends=[memoise Rcpp]; }; BaM = derive2 { name="BaM"; version="1.0.3"; sha256="1mfbz8hp6cd170d5y6iva2dbd31rlg6z2dgnfvjp9myqa4cjy40y"; depends=[MASS mice]; }; - BaPreStoPro = derive2 { name="BaPreStoPro"; version="0.1"; sha256="0zyyyrr5h8dhjsmgaii8jmb8ignvixpc9nzbfishw9yymjswvm57"; depends=[]; }; BaSTA = derive2 { name="BaSTA"; version="1.9.5"; sha256="09wvfg44g9j3gq9arkm2ajm8l4y7gna4fh49ihvmjzqdvsl6gkq6"; 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.6.3"; sha256="0sarc0xmlg7w4j125i1igbwrqdwfxxb5jcdl44b70q672y6z30vr"; depends=[Rcpp SamplingBigData]; }; Ball = derive2 { name="Ball"; version="1.3.12"; sha256="103lm9mlrqlqqn40bj4bsw0g9in5vka6q4kpqqzw6y3pbgd6596p"; depends=[gam mvtnorm survival]; }; @@ -406,6 +408,7 @@ in with self; { BatchJobs = derive2 { name="BatchJobs"; version="1.9"; sha256="0xsw25j2ks9bqgz189qdcyj8hzz93snknlik83nj04s6vy0w7aax"; depends=[backports BBmisc brew checkmate data_table DBI digest RSQLite sendmailR stringi]; }; BayLum = derive2 { name="BayLum"; version="0.2.1"; sha256="0h0x18al2rqs6wjf4jayc1qv8lkn7rvkbjmr5h1gcggn2c4byyjn"; depends=[ArchaeoPhases coda hexbin KernSmooth Luminescence rjags runjags]; }; BayesARIMAX = derive2 { name="BayesARIMAX"; version="0.1.1"; sha256="1rcfq0r8sqiqs65mbpcr8i4667cdb50k6bx6wdh9spr0djh8gfv0"; depends=[coda forecast]; }; + BayesBEKK = derive2 { name="BayesBEKK"; version="0.1.1"; sha256="1vlljv7xdfvbrbxqdi91xrz1aga04aa1pb23kvnmahm2s261map1"; 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.2.3"; sha256="12vw401d692x2692sykhngi5fk8l6z5724lym97zz9z2wyj29zyk"; depends=[coda forestplot lme4 metafor Rdpack rjags]; }; @@ -427,14 +430,15 @@ in with self; { BayesLogit = derive2 { name="BayesLogit"; version="2.1"; sha256="0w3bzk39sxdskwikcz5i0xwfsll4sqgkpr8vw8jvzlcy6dl3yhis"; depends=[]; }; BayesMFSurv = derive2 { name="BayesMFSurv"; version="0.1.0"; sha256="1yxxzwjh1fgfh7qkzf9dfm3x0vbgb0v4p6bf6b5w14kvm06rzhkg"; depends=[coda FastGP MCMCpack mvtnorm Rcpp RcppArmadillo]; }; BayesMRA = derive2 { name="BayesMRA"; version="1.0.0"; sha256="005pygpa8bmr153naxnag7kn876lqwq34d8pzbj954nivlxl4zaw"; depends=[fields igraph Matrix mvnfast Rcpp RcppArmadillo spam]; }; - BayesMallows = derive2 { name="BayesMallows"; version="1.2.0"; sha256="1dgvrr6ihfxrvpp5s2fmbl4kp8sh0xvpjggv47gb2c917ppjpjrq"; depends=[cowplot ggplot2 HDInterval igraph PerMallows Rcpp RcppArmadillo Rdpack relations rlang sets testthat]; }; + BayesMallows = derive2 { name="BayesMallows"; version="1.2.1"; sha256="100mfsar76yk8cqp55r6lwd973l8s7yg249vfssx327a31rh665m"; depends=[cowplot ggplot2 HDInterval igraph Rcpp RcppArmadillo Rdpack relations rlang sets testthat]; }; BayesMassBal = derive2 { name="BayesMassBal"; version="1.1.0"; sha256="1cgcx8kvn0bmn8kmq8ri3k98yx085d2qndislbwhn833ws6vkl88"; depends=[coda HDInterval LaplacesDemon Matrix pracma Rdpack tmvtnorm]; }; BayesMixSurv = derive2 { name="BayesMixSurv"; version="0.9.1"; sha256="19kf39881q00pap9afwvvggk4s4w3qpz17b7065nig1mvk8dnp8r"; depends=[survival]; }; BayesMultMeta = derive2 { name="BayesMultMeta"; version="0.1.1"; sha256="09x41r5lhr2dq56b05f0aj8v4s7084d4z90qjqwdkv8zgk664ki0"; depends=[assertthat Rdpack]; }; BayesMultiMode = derive2 { name="BayesMultiMode"; version="0.1.1"; sha256="0kjv9snqnpamb0ph6qdimn1zdyp961yfi98xmbdy5dcqd5jcy3jg"; depends=[dplyr ggh4x ggplot2 ggpubr gtools magrittr Rdpack stringr tidyr]; }; BayesNSGP = derive2 { name="BayesNSGP"; version="0.1.2"; sha256="0va4gvyfwfdk3yvhdyxc49qlmzxfblwlmwqh79b93zkv8239kkk1"; depends=[FNN Matrix nimble StatMatch]; }; BayesNetBP = derive2 { name="BayesNetBP"; version="1.6.1"; sha256="1c6a82qlcrpbb2c4zp3gk24wcgw6x62lm8hm6n2l1r307dxm2rpb"; depends=[bnlearn doBy fields graph igraph RColorBrewer]; }; - BayesPPD = derive2 { name="BayesPPD"; version="1.0.7"; sha256="1px8qkkranycj9q3ym7cj3g24y0wkayvp23175x1xp1i3k9k2ray"; depends=[Rcpp RcppArmadillo RcppEigen RcppNumerical]; }; + BayesOrdDesign = derive2 { name="BayesOrdDesign"; version="0.1.2"; sha256="1417zd1n5sip999n6q6bgs85c0000ksl73a4p94y0lmdn27i8pmj"; depends=[coda ggplot2 gsDesign madness ordinal R2jags rjags rjmcmc schoolmath superdiag]; }; + BayesPPD = derive2 { name="BayesPPD"; version="1.1.0"; sha256="0nyzkg2lcvfk61xmxv7fjz626ik5bf9dbxfh6zyvjd9kjzw9kgdl"; depends=[Rcpp RcppArmadillo RcppEigen RcppNumerical]; }; BayesPieceHazSelect = derive2 { name="BayesPieceHazSelect"; version="1.1.0"; sha256="0znbmv7crqycdx75jh02h6z8d6cifjszbrldv2yva4mkjxsydag5"; depends=[mvtnorm]; }; BayesPiecewiseICAR = derive2 { name="BayesPiecewiseICAR"; version="0.2.1"; sha256="1qrmw7zmygdzz84p76hyh2d8dx88b8xhbbd7radqm39g35zq5wz6"; depends=[mvtnorm]; }; BayesPostEst = derive2 { name="BayesPostEst"; version="0.3.2"; sha256="0r05by4w80j6hb22v3ibj686ixxbj7lkxq499fciz5lqs4lxzf3h"; depends=[brms carData caTools coda dplyr ggplot2 ggridges HDInterval MCMCpack R2jags R2WinBUGS reshape2 rjags rlang ROCR rstanarm runjags texreg tidyr]; }; @@ -454,9 +458,9 @@ 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]; }; - BayesVarSel = derive2 { name="BayesVarSel"; version="2.0.1"; sha256="1107amhj3bclc434qizffjfmsa2w36qkp6gq7vgl0hwv0ncc0vyn"; depends=[MASS mvtnorm]; }; + BayesVarSel = derive2 { name="BayesVarSel"; version="2.2.3"; sha256="0kdi1v7wi22p83fl7ldyzhc6gh4pn8ig339yz7a36wl5xr80cij0"; depends=[MASS mvtnorm]; }; BayesX = derive2 { name="BayesX"; version="0.3-1.1"; sha256="0630p904fba4ink1rkccarhlqkz73fxqiy255jc5vb1qi2awl5vd"; depends=[coda colorspace maptools shapefiles sp]; }; - BayesXsrc = derive2 { name="BayesXsrc"; version="3.0-2"; sha256="04p17d87b2gg3p08jmdmg570ppdzci8r4qxcq115qs58bvqih47v"; depends=[]; }; + BayesXsrc = derive2 { name="BayesXsrc"; version="3.0-3"; sha256="1c598sir81xpb35famip6lcfr4cnvm903f1vhajjz04yd13fbwh9"; depends=[]; }; 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]; }; BayesianMediationA = derive2 { name="BayesianMediationA"; version="1.0.1"; sha256="1ygc0xhk7mk7pkqn0v9n23j1m75rr1r2ar30r386c1av3jh7krnw"; depends=[car gplots lattice R2jags survival]; }; @@ -465,13 +469,13 @@ in with self; { BayesianReasoning = derive2 { name="BayesianReasoning"; version="0.4.1"; sha256="0j8fzn6xza3vg7qbfxwhjncll9yx985660dr75y9qhhz84jis3dv"; depends=[dplyr ggforce ggplot2 magrittr reshape2 tibble tidyr]; }; Bayesiangammareg = derive2 { name="Bayesiangammareg"; version="0.1.0"; sha256="0b0fqmig7vgmlrq2884q0apfd89nn5k4dj8rqjizkkbw4qpzmylb"; depends=[mvtnorm]; }; Bayesiantreg = derive2 { name="Bayesiantreg"; version="1.0"; sha256="0m8snwhjskwxdm0a2wsmf1j7d0xxvg4sh0ix64zss71l610wica7"; depends=[MASS Matrix mvtnorm]; }; - Bayesrel = derive2 { name="Bayesrel"; version="0.7.4.4"; sha256="0i5kma649f2f079205kki05js0i1aw2j10aj6fgmg3mjj8q9cn0p"; depends=[coda LaplacesDemon lavaan MASS Rcpp RcppArmadillo Rdpack]; }; + Bayesrel = derive2 { name="Bayesrel"; version="0.7.5"; sha256="06y3f69hccpf92mrdw03alcmnn5r4rg9svcqyvz44x1hjn02l2ah"; depends=[coda LaplacesDemon lavaan MASS 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]; }; BeastJar = derive2 { name="BeastJar"; version="1.10.6"; sha256="0581q9m7lb681d12vld231vn6wqv5s2sqkvav4fd0xllvjighlx7"; depends=[rJava]; }; BeeGUTS = derive2 { name="BeeGUTS"; version="1.0.0"; sha256="0b0r8srh68m2kxdyvfx5kxrpchish5la7h44wkxfa59gcbsg96rc"; depends=[BH cowplot data_table dplyr ggplot2 gridExtra magrittr odeGUTS Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tidyr]; }; - Benchmarking = derive2 { name="Benchmarking"; version="0.30"; sha256="0jmdp8qkbg0vjxbvx7mjh3l0yfq2zs63g6bsm6ksi56yvx7l9rvi"; depends=[lpSolveAPI quadprog Rcpp ucminf]; }; + Benchmarking = derive2 { name="Benchmarking"; version="0.31"; sha256="0gg4yay098ga08ns5ybn7s467prwbq0a94a0nfah30jy36ggdfs2"; depends=[lpSolveAPI quadprog Rcpp ucminf]; }; BenfordTests = derive2 { name="BenfordTests"; version="1.2.0"; sha256="1nnj0w0zwcmg7maqmmpixx7alvsyxva370ssc26ahg6kxy5a621w"; depends=[]; }; Bergm = derive2 { name="Bergm"; version="5.0.5"; sha256="0plidwnyh38hrkbd3ild476f54bz6i70r0h3chxh3wp35rl04ikl"; depends=[coda ergm Matrix matrixcalc MCMCpack mvtnorm network Rglpk statnet_common]; }; Bessel = derive2 { name="Bessel"; version="0.6-0"; sha256="0iwm08nhlivi4zwcqdi296a1l4n4lfanfxhaysh9vcsyk1kpiacf"; depends=[Rmpfr]; }; @@ -493,7 +497,7 @@ in with self; { BiasedUrn = derive2 { name="BiasedUrn"; version="2.0.8"; sha256="0mmq8zf52p6y76nqm0fcvvg8bdlrfl12mlfr9fznz9zvm26pypi0"; depends=[]; }; BibPlots = derive2 { name="BibPlots"; version="0.0.8"; sha256="0zvbyh8spr0ywj64b2rc8jcq4fgn87858km4mkkh17g30ympg767"; depends=[]; }; BifactorIndicesCalculator = derive2 { name="BifactorIndicesCalculator"; version="0.2.2"; sha256="1vnwksw0j4lc2knlcmm5748pf4d7r44sn34s1mrv9p50hlnkk85p"; depends=[lavaan mirt mnormt MplusAutomation tidyr]; }; - BigQuic = derive2 { name="BigQuic"; version="1.1-11"; sha256="1dxzkj26hd05mi02i35k7dknlikjfbsgvjrqwf42k3kjpf501xh4"; depends=[Matrix Rcpp scalreg]; }; + BigQuic = derive2 { name="BigQuic"; version="1.1-13"; sha256="14mz9ry72zc4c0fhc59dima66qnksr1masvhzm1j8z8r11w7qjhd"; depends=[Matrix Rcpp scalreg]; }; BigVAR = derive2 { name="BigVAR"; version="1.1.1"; sha256="1pv2xc6j7szcaqqqjnriaxd17snls37b7nckmk97dan4zxc2vr6v"; depends=[abind 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]; }; @@ -508,22 +512,19 @@ in with self; { BinaryEPPM = derive2 { name="BinaryEPPM"; version="2.3"; sha256="0fydh3pp7y0glk2rhihcslzx10hgn5la922jbnqzg2nplvzv7ybj"; depends=[expm Formula lmtest numDeriv]; }; BinarybalancedCut = derive2 { name="BinarybalancedCut"; version="0.2"; sha256="1rs7x7ggqzaz9r2912g0fi9x7przd8gjy6pianx457w5f39fqx4v"; depends=[ggplot2 reshape2]; }; BioCircos = derive2 { name="BioCircos"; version="0.3.4"; sha256="1gl57r47p5z1wzs94xzc26j2r8z5hpqr4163b01x6jwzvbrlfwhz"; depends=[htmlwidgets jsonlite plyr RColorBrewer]; }; - BioFTF = derive2 { name="BioFTF"; version="1.2-0"; sha256="03r6fhpc4dqrcnbl73j9kav1l7rblgfldpbkl2p367vv20xggqih"; depends=[]; }; BioInsight = derive2 { name="BioInsight"; version="0.3.1"; sha256="129w9643l01y316hm0qcsmxzh5lsdmq6xmiz4rhmdh0dcnw2s93n"; depends=[edgeR knitr limma RColorBrewer wordcloud]; }; BioMark = derive2 { name="BioMark"; version="0.4.5"; sha256="1ifc72bayy3azbilajqqzl0is6z7l1zaadchcg3n8lhmjrv5sk3m"; depends=[glmnet MASS pls st]; }; BioPET = derive2 { name="BioPET"; version="0.2.2"; sha256="0zgq7i37d0rnjhlkcrl44x62vhz0njsv2fldm64j9r4wc02z1q9n"; depends=[ggplot2 gridExtra pROC VGAM]; }; BioPETsurv = derive2 { name="BioPETsurv"; version="0.1.0"; sha256="0svwf8pzvlmlp8aacf70hzlg2h81m6lyhh4p73ixqw5v9bnyq6m0"; depends=[ggplot2 gridExtra survival]; }; BioProbability = derive2 { name="BioProbability"; version="1.0"; sha256="051m761zf079s0p4q0ambwqc22qjz2yajxrsmnjnxvqiaadaj1q7"; depends=[]; }; BioRssay = derive2 { name="BioRssay"; version="1.1.0"; sha256="0bs05vkidf7rfhb9s9vby7k4q9w7vwanlvk034kspqp4ydkhpm5n"; depends=[colorspace]; }; - BioStatR = derive2 { name="BioStatR"; version="3.1.2"; sha256="1fs5hzsb770ygcysmwl8dyfkrq3nwhsfw4jd73gbdw3x8dqxc6c4"; depends=[ggplot2]; }; + BioStatR = derive2 { name="BioStatR"; version="4.0.0"; sha256="0gfwjvxbgfaw7mrbac011x09lxcmsdbp3ljc36hpfa54gqj2ckkc"; depends=[ggplot2]; }; BioVenn = derive2 { name="BioVenn"; version="1.1.3"; sha256="0nwqfb65vhr2246w17nv27v186gzl5n3jxnqx7r9rq525qvyx0rg"; depends=[biomaRt plotrix svglite]; }; BiocManager = derive2 { name="BiocManager"; version="1.30.19"; sha256="1qhq1k1sr23bi2kmnd99mjs3ns0c2p20pmr2iq8a6bxbb0fap5v8"; 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.14-4"; sha256="05080cfqcmhxnbd4fyxhdd2kxp4ps413mk44wdh7hijayk4df7q0"; depends=[ggplot2 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.1"; sha256="0xj7ab9a463p4a67y0hlv6mfd08xf8didkn2mwrfa7gxjqqvix4z"; depends=[bigmemory bio3d circular igraph]; }; Biostatistics = derive2 { name="Biostatistics"; version="1.0.4"; sha256="1fcrj53rqg7mdhrrsl95l0n6hycb0863isch2f6zzsqdqbxhq7dh"; depends=[learnr]; }; BipartiteModularityMaximization = derive2 { name="BipartiteModularityMaximization"; version="1.22.415.2"; sha256="05a00zwhdmh614m937mx6alarac5inrzp78xjhqhwf26gvg7lpb9"; depends=[Rcpp]; }; @@ -555,22 +556,23 @@ in with self; { BoneProfileR = derive2 { name="BoneProfileR"; version="2.4"; sha256="0mm2vjg43p9abfydaw7qw0q9cwpvzxic914rpdk2dshyva6dxyx5"; depends=[HelpersMG imager knitr rmarkdown shiny]; }; BoolFilter = derive2 { name="BoolFilter"; version="1.0.0"; sha256="14z4fzf8p4wgi939qs6v39a3xizccjcx7j4szsydllpkvxbwggbw"; depends=[BoolNet Rlab]; }; BoolNet = derive2 { name="BoolNet"; version="2.1.7"; sha256="1b87ncwz1bsjym328qyjwhxqi7c6x05y6g1nc43y2fz5l5312nmv"; depends=[igraph XML]; }; - Boom = derive2 { name="Boom"; version="0.9.10"; sha256="1w513z3bqr9fbvml1qycaaivsvwyx77wq11w76dzggddwgwisg20"; depends=[MASS]; }; + Boom = derive2 { name="Boom"; version="0.9.11"; sha256="17kp3vla2z9kgcqgwcslcp0wl7k1k2rbc8nr3b785hv23gww11bi"; depends=[MASS]; }; BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="1.2.5"; sha256="1y1bn9490g3qvvjvxk8sc0312hmzwj0n5rg9fsa7k4av0yasv25w"; depends=[Boom]; }; BoostMLR = derive2 { name="BoostMLR"; version="1.0.3"; sha256="0gk8jf04qda1qsc6987d8nfa453v9cqkjsvvrrg68yx3fd96m8aj"; depends=[nlme Rcpp RcppArmadillo]; }; BootMRMR = derive2 { name="BootMRMR"; version="0.1"; sha256="07am80603pv1dh5ma3zb0idnslkzm5m3ym8sd1nhkh8zbc6qqmzs"; depends=[]; }; BootPR = derive2 { name="BootPR"; version="0.70"; sha256="1bhdmbg3i7r9v563v84sh4kcl7r036h6aqrwjwr9r3r56l3834bb"; depends=[]; }; BootWPTOS = derive2 { name="BootWPTOS"; version="1.2.1"; sha256="1s6qvc2nvkqfxl8d4cy7ckvn6l0svq85g274pvjjxg8f883hax0j"; depends=[tseries wavethresh]; }; BootstrapQTL = derive2 { name="BootstrapQTL"; version="1.0.5"; sha256="04lyr9x6lz4q5y70p92ffdil2i9f1fsykw5wh6wsv0qcqypdmawy"; depends=[data_table foreach MatrixEQTL]; }; + Boov = derive2 { name="Boov"; version="1.0.0"; sha256="0vj57rlgabgs08sxi8vghkij22av99mbihrqw69d99xy8vjaf277"; depends=[BH data_table gmp PolygonSoup Rcpp RcppCGAL RcppEigen]; }; 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]; }; + Boruta = derive2 { name="Boruta"; version="8.0.0"; sha256="1irx7qg1sw69ggsk4jgxfd3pp741kd944fipnda1qbcbphg5prrq"; depends=[ranger]; }; BosonSampling = derive2 { name="BosonSampling"; version="0.1.3"; sha256="0dxvjdvzv2b3763x4wrkw02q57l42286w9bg2xhcngmcpdhnkg51"; depends=[Rcpp RcppArmadillo]; }; BoundEdgeworth = derive2 { name="BoundEdgeworth"; version="0.1.1"; sha256="1lj98v3h0hlv22s76gcf5bbyq2qnl692hagrprxjsyd79slc6gk1"; depends=[expint mathjaxr]; }; BoutrosLab_plotting_general = derive2 { name="BoutrosLab.plotting.general"; version="7.0.3"; sha256="07vfaxgxnzj3dlv116x32bndzqmdbpc5szpjw73a9km8f2fkkb2k"; 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.2.0"; sha256="0a95jlbll4smi32z7ykf64cyrkscnb7shzj10i1p1hsf90dwi7sv"; depends=[glmnet MASS]; }; - BranchGLM = derive2 { name="BranchGLM"; version="1.3.2"; sha256="0isxc8r6i9iiklm9kwvk7lp9yp9kbz2s3jsk4d4l50z2vrkkw9qd"; depends=[BH Rcpp RcppArmadillo]; }; + BranchGLM = derive2 { name="BranchGLM"; version="2.0.0"; sha256="16f1q3jrg07kd89syjngg844m8x5r4fk0j01w8iisbi7pk17x20v"; depends=[BH Rcpp RcppArmadillo]; }; Branching = derive2 { name="Branching"; version="0.9.4"; sha256="1c209gdasm7qipv2gg4d1hr0jmhnzz5rddgjxb7xacazc0c2mhff"; depends=[]; }; BrazilMet = derive2 { name="BrazilMet"; version="0.2.0"; sha256="0pcr665j4balmcm4sq6l19nmhpbs7ayw5dljsdxr91bn6srb33b3"; depends=[dplyr readxl stringr]; }; BreakPoints = derive2 { name="BreakPoints"; version="1.2"; sha256="125fvzkmfnriyd4y4nywj5ihm766xlsyi7dpnq57fa9d38ffbyf2"; depends=[MASS zoo]; }; @@ -588,16 +590,16 @@ in with self; { Bvalue = derive2 { name="Bvalue"; version="1.0"; sha256="17zlllzjrcq4grggal3hlg384990n62wnflr2g21fa6hcnglwy7d"; depends=[]; }; BwQuant = derive2 { name="BwQuant"; version="0.1.0"; sha256="0pna0ppj9hkxpc2mbyy0ss7zrl5y736h5xsfkhmqr0389vmgibrj"; depends=[KernSmooth nleqslv quantreg]; }; C19dNUTS = derive2 { name="C19dNUTS"; version="1.0.1"; sha256="09iclbkgaxz946nj4ppdzyr5ssipcip4nscxs10j0209frjgjhap"; depends=[]; }; - 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]; }; + C443 = derive2 { name="C443"; version="3.3"; sha256="1ngk95m67aplpvcva02y3njwv4gcdh4yf0jgkdjzw6prg4h70jla"; depends=[cluster ggplot2 gridExtra igraph MASS partykit plyr randomForest ranger RColorBrewer rpart]; }; + C50 = derive2 { name="C50"; version="0.1.7"; sha256="1q76bnnw79i7q7afxdh2pdampbacbkvscc5q8r78jailx5cr18dy"; depends=[Cubist partykit]; }; CA3variants = derive2 { name="CA3variants"; version="3.3.1"; sha256="0nc82xw341bv01knr2ksyifl0bkriwg4dfkw0fdkzh0b6dw2wfzr"; depends=[ggforce ggplot2 ggrepel gridExtra multichull plotly]; }; CACIMAR = derive2 { name="CACIMAR"; version="1.0.0"; sha256="0fdi2ls0j10fky3jygqx93h8m1957cdbn1vxdi69bq08xf2c5n5h"; depends=[dplyr pbapply pheatmap psych reshape2 ROCR Seurat viridisLite]; }; 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]; }; + CAISEr = derive2 { name="CAISEr"; version="1.0.17"; sha256="01gxxq9bfrrishzawmqh47byhc3szfss9bmcsh1p2gi9ml6aqcay"; depends=[assertthat ggplot2 gridExtra pbmcapply]; }; CALANGO = derive2 { name="CALANGO"; version="1.0.12"; sha256="1v5dkcakphyzlan4byrxp5kyhaysrpi6bzivx814hhkwx08wfm02"; depends=[ape assertthat BiocManager dendextend DT ggplot2 heatmaply htmltools htmlwidgets knitr nlme pbmcapply pkgdown plotly rmarkdown taxize]; }; CALF = derive2 { name="CALF"; version="1.0.17"; sha256="021x1gp0493g6qnfih755c0xcddz77i3p22bgjlx1lpzgqmrgrki"; depends=[data_table ggplot2]; }; - CALIBERrfimpute = derive2 { name="CALIBERrfimpute"; version="1.0-6"; sha256="0ghi6pkv9ki0iz4lkli3hkrsk6xiph2ha2pij6dg4wi7mcjdhsbi"; depends=[mice mvtnorm randomForest]; }; + CALIBERrfimpute = derive2 { name="CALIBERrfimpute"; version="1.0-7"; sha256="1fspn6wgr0kc7j4ixx24c706kzrgjhi1b1w28izpfxm4r89zk08s"; depends=[mice mvtnorm randomForest]; }; CAMAN = derive2 { name="CAMAN"; version="0.75"; sha256="1r6bxqg9wrllznrm5n5a5kcskcj6cd9l5lm5hkyq1v2vb751z6i2"; depends=[mvtnorm sp]; }; CAMML = derive2 { name="CAMML"; version="0.2.3"; sha256="0qzp5hmsrq89jvizsvjrp1q01f9nc3fbn7ka964xp75f6pvckph6"; depends=[AnnotationDbi BiocManager edgeR MASS Matrix org_Dr_eg_db org_Hs_eg_db org_Mm_eg_db Seurat SeuratObject VAM]; }; CANSIM2R = derive2 { name="CANSIM2R"; version="1.14.1"; sha256="1dnzbd9lyqj3w80lx12qxcsbmv8wy6hxknyi5ijp99cfv7kaq1kc"; depends=[downloader Hmisc reshape2]; }; @@ -608,11 +610,12 @@ in with self; { CARlasso = derive2 { name="CARlasso"; version="0.1.2"; sha256="05r5n5bh0fpwfigr6czh9pg29zyrw73idfvs9qm8vr3dvcmvc42r"; depends=[coda ggplot2 ggraph igraph MASS Matrix Rcpp RcppArmadillo RcppProgress]; }; CASCORE = derive2 { name="CASCORE"; version="0.1.1"; sha256="19v0cki0hdnw5nakakpahc5yz32ih379kagpv2aygzgq9mfwnfam"; depends=[igraph pracma reshape2]; }; CASMAP = derive2 { name="CASMAP"; version="0.6.1"; sha256="1447d4gflan2093fb68inb2ysx5svb9vhnjc7lnkgpjsiam4p8yy"; depends=[Rcpp]; }; + CASMI = derive2 { name="CASMI"; version="1.0.0"; sha256="0nhjkvaa27l8j390sl220ckkjbgqj3dm8pnvw58fnprjhi9203sc"; depends=[entropy EntropyEstimation]; }; CAST = derive2 { name="CAST"; version="0.7.0"; sha256="0kvipagrf7qsp6wjmh1vjzdjpj9px9xn8a8b32h9cxq6fpxzd14j"; depends=[caret data_table FNN ggplot2 lattice plyr reshape zoo]; }; CATT = derive2 { name="CATT"; version="2.0"; sha256="12xdspl1gbf51snyrl44nn7alfyccdfihibkgvzr66lrby8b8fhg"; depends=[]; }; CATTexact = derive2 { name="CATTexact"; version="0.1.1"; sha256="07ciln6cfvqya7dwwn6mhd9lk2833hypm4badizgfi2k749d1p00"; depends=[]; }; CAinterprTools = derive2 { name="CAinterprTools"; version="1.1.0"; sha256="07rvi91ysqyfwagmip0cnqjahv1n8slicd5hznqf5v3l841xh7p7"; depends=[ca classInt cluster FactoMineR ggplot2 ggrepel Hmisc RcmdrMisc reshape2]; }; - CAvariants = derive2 { name="CAvariants"; version="5.6"; sha256="1rv3r27m43q8z9hiac5fj3kx77j0sfmcgxwcl6mdfgx0jwq7pi3s"; depends=[ggforce ggplot2 ggrepel gridExtra plotly]; }; + CAvariants = derive2 { name="CAvariants"; version="5.7"; sha256="0jxz0db034fhiqbfbpzqakrmlibay9rzyxavprvans93k45zigfs"; depends=[ggforce ggplot2 ggrepel gridExtra plotly]; }; CB2 = derive2 { name="CB2"; version="1.3.4"; sha256="0431bd956hmkrhs9x845vjwbzzwzd7n9nfx9y95mv6qv84zd4wv2"; depends=[dplyr ggplot2 glue magrittr metap pheatmap R_utils Rcpp RcppArmadillo readr stringr tibble tidyr]; }; CBCgrps = derive2 { name="CBCgrps"; version="2.8.2"; sha256="0z34vcdq5lp1l15l3a67lpvfla0g0qsb5ijbc9h575h7fpf28jqf"; depends=[nortest]; }; CBPS = derive2 { name="CBPS"; version="0.23"; sha256="0bdkx7phi58200jgijqmv5d7v2kiksj07sxx2sjmkd1dcjdy13zd"; depends=[glmnet MASS MatchIt nnet numDeriv]; }; @@ -620,7 +623,7 @@ in with self; { CBT = derive2 { name="CBT"; version="1.0"; sha256="13h6sf7w03nfq2arqymwww13ywnv9xnqbqazlzn856mj3ggaqda7"; depends=[]; }; CC = derive2 { name="CC"; version="1.0"; sha256="189si37ggichqmzy8m686zw1cijix7yfy8ma5iqpnq1q9vm3pcvy"; depends=[]; }; CCA = derive2 { name="CCA"; version="1.2.1"; sha256="1l4vp8yd42rpsm40szjfzhvbb5c7kl7yf4346i0940s6gk7bzzi8"; depends=[fda fields]; }; - CCAMLRGIS = derive2 { name="CCAMLRGIS"; version="4.0.1"; sha256="0jfk1ii6001xp2j13dwhb58dy1b7bq5rhmy9fdfyr3ss4kqdnqaq"; depends=[dplyr geosphere magrittr raster sf sp terra]; }; + CCAMLRGIS = derive2 { name="CCAMLRGIS"; version="4.0.2"; sha256="1spjf6rjqqn90c9acdb0z7ysdkzia9fgnwbp4n0cycd3wc7pngf0"; depends=[dplyr geosphere magrittr raster sf sp stars terra]; }; CCM = derive2 { name="CCM"; version="1.2"; sha256="1mhl7yppniybdffylddbbb65n7gmv029fb46wlsxm4yf2xkplmwy"; depends=[]; }; CCP = derive2 { name="CCP"; version="1.2"; sha256="067nf1gag3ya7v9vzcpvallga5dr243q0q07fd370k0zynmhcfby"; depends=[]; }; CCTpack = derive2 { name="CCTpack"; version="1.5.2"; sha256="1kkxsk9x4jz2bvldmba7fsri3zc1cjz15z0xicjmfc7lj72ngdig"; depends=[MASS mvtnorm polycor psych R2jags rjags]; }; @@ -628,11 +631,11 @@ in with self; { CDFt = derive2 { name="CDFt"; version="1.2"; sha256="19axaf3bh9gasnsfamd5ych1jn751scaplgwpmsf3liazcqqpa61"; depends=[]; }; CDLasso = derive2 { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; }; CDM = derive2 { name="CDM"; version="8.2-6"; sha256="1lcq3i5rlyqkc12c26kj0x4fm2gh1jsisp6kbf59y3hjdkiqajhl"; depends=[mvtnorm polycor Rcpp RcppArmadillo]; }; - CDMConnector = derive2 { name="CDMConnector"; version="0.1.0"; sha256="0872k9a2xm6y55qb17hjjsh7kygx0grfkf064i1f9cvmdyw9mw7a"; depends=[arrow checkmate cli DBI dbplyr dplyr glue magrittr pillar purrr readr rlang tidyselect waldo]; }; + CDMConnector = derive2 { name="CDMConnector"; version="0.3.1"; sha256="15nlx4db6pix17l657pacadvbgfll6ky3bczayyjd6jraww32k9q"; depends=[arrow checkmate cli DBI dbplyr dplyr glue jsonlite lifecycle magrittr pillar pkgfilecache purrr readr rlang SqlRender tibble tidyselect waldo withr]; }; CDNmoney = derive2 { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; }; CDROM = derive2 { name="CDROM"; version="1.1"; sha256="0mvhqs4m8jp39x1rk31a1sqqmfq1avcnasgh8bizlyxx62igmi1b"; depends=[]; }; CDVineCopulaConditional = derive2 { name="CDVineCopulaConditional"; version="0.1.1"; sha256="1wyy324vrwipdsq0p021bj1gdhyxg09g3dkw8wv5v6rfrrs84m9k"; depends=[combinat VineCopula]; }; - CDatanet = derive2 { name="CDatanet"; version="2.0.1"; sha256="0slw0lz0k6706hww7msfkal1nwq1252cnxswpi9b9yjm9qnmj1hs"; depends=[ddpcr Formula formula_tools Matrix Rcpp RcppArmadillo RcppDist RcppEigen RcppNumerical RcppProgress]; }; + CDatanet = derive2 { name="CDatanet"; version="2.0.3"; sha256="0736j23qnds21qsblwh08dj4ylcs70bpqw5pr0hxmnilkk6jgyj2"; depends=[ddpcr Formula formula_tools Matrix Rcpp RcppArmadillo RcppDist RcppEigen RcppNumerical RcppProgress]; }; CEDA = derive2 { name="CEDA"; version="1.1.0"; sha256="1m03l552zql3cqra1r1zdjcw6abpfdhvn3dkbhdhmnmg59fb6bfb"; depends=[dplyr ggplot2 ggprism ggridges ggsci limma mixtools]; }; CEDARS = derive2 { name="CEDARS"; version="1.90"; sha256="1fngyc08kvilfd2d75gjg0s6c5zvjywym35sk568yzxnsz89b7yy"; depends=[fastmatch jsonlite mongolite readr shiny udpipe]; }; CEGO = derive2 { name="CEGO"; version="2.4.2"; sha256="00nc6c1b6ylqlh6hm8lh8nasz7q12pqckdqbf1yq21khki9ldbll"; depends=[DEoptim fastmatch MASS Matrix ParamHelpers quadprog]; }; @@ -641,12 +644,12 @@ in with self; { CERFIT = derive2 { name="CERFIT"; version="0.1.0"; sha256="1mhyn5iyvnqqx881jfvacyxaldvn5q9h1jpsfy14sgkdjf75274s"; depends=[CBPS glmnet partykit randomForest Rcpp RcppArmadillo twang]; }; CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; }; 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]; }; CFF = derive2 { name="CFF"; version="1.0"; sha256="04z3q0s4b1yns5l7lplw8qrcdjzsdy9crnhakyzd6r449hjfsvnz"; depends=[]; }; CFilt = derive2 { name="CFilt"; version="0.2.1"; sha256="1iah41s0pd8s4vmg7r6npsgmfr6mvyp5wfnyimx51fqr2f3narwf"; depends=[]; }; CGE = derive2 { name="CGE"; version="0.3.3"; sha256="0q1fv62159cx9z25488fxf6a6fi1m59hdh60ldypsjwil77q0s3i"; depends=[]; }; CGGP = derive2 { name="CGGP"; version="1.0.3"; sha256="1g70hjpc33dnr6yw42kjhy9ngba05qzk5mr7md6pqhmbx0ykhr6g"; depends=[Rcpp RcppArmadillo]; }; CGManalyzer = derive2 { name="CGManalyzer"; version="1.3"; sha256="1wmp5im18s447rjkj891skrm7558xkqlbx43n9hyxiqg49zq1ng9"; depends=[]; }; + CGNM = derive2 { name="CGNM"; version="0.5.1"; sha256="0li1cg0hxj5i9dxl2s06rwnssiyd2af90g34knmhlpn3f2pzb690"; depends=[ggplot2 MASS]; }; 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]; }; CHFF = derive2 { name="CHFF"; version="0.1.0"; sha256="0jv75p1bnwsad2vpxf1zwq97al9xxhk2hpnpsilf0jn0w7g9b2d3"; depends=[]; }; @@ -660,7 +663,6 @@ in with self; { CICA = derive2 { name="CICA"; version="0.1.0"; sha256="0f765c1sqvcg11071008vn6gnk0v0lwmlhnqxgqy0r8cw05s2ggq"; depends=[ica NMFN]; }; CIDER = derive2 { name="CIDER"; version="0.99.1"; sha256="0ag2gyrjjyq4r4xssmz05cg1sh8mmq54d5mynhwm5k53zcpk8i8r"; depends=[dbscan doParallel edgeR foreach ggplot2 igraph kernlab limma pheatmap Seurat viridis]; }; CIEE = derive2 { name="CIEE"; version="0.1.1"; sha256="03kq9cp0v41y0r2l9j5imcrsail2xsvlzhhhsrw454d4s9gqdql9"; depends=[survival]; }; - CIFsmry = derive2 { name="CIFsmry"; version="1.0.1.1"; sha256="1m2m2zvg9ghy3bm2sll7jp4xm2vw58kc5xaxd2c9k82771m3a4j0"; depends=[]; }; CIM = derive2 { name="CIM"; version="1.0.0"; sha256="02l8rspiiv6vj6k0q6wpiazny3f2s4dsivsm7zb9cm90qh1rv2d7"; depends=[]; }; CIMTx = derive2 { name="CIMTx"; version="1.2.0"; sha256="1jx99vh620zqwp7p4bjcxa3n0kg6w6q88kklv9f9x44894mrd56a"; depends=[arm BART cowplot doParallel dplyr foreach ggplot2 magrittr Matching metR mgcv nnet stringr SuperLearner tidyr tmle twang WeightIt]; }; CINE = derive2 { name="CINE"; version="0.1.3"; sha256="0y5xadsvmciv9cqx6sa8qs1ss7zm55l3304gzdaadmqbsnsq75j8"; depends=[dplyr tidyr tidytext tm]; }; @@ -701,12 +703,12 @@ in with self; { COINr = derive2 { name="COINr"; version="1.1.0"; sha256="0vi89kfma2r8wkfxrfi8hb5m6pvhqbl5ja3kzqriwv4qpzg8syyg"; depends=[ggplot2 openxlsx readxl rlang]; }; COLP = derive2 { name="COLP"; version="1.0.0"; sha256="0259s058rn7fyprma5frx7sdjv4qk9hxijpi9xh7qyz5jzzsi660"; depends=[combinat MASS]; }; COMBAT = derive2 { name="COMBAT"; version="0.0.4"; sha256="0m700pl33frdpc9y16y4zyh1ixpardh0r5kmz8a78jrh1acn30id"; depends=[corpcor mvtnorm]; }; - COMIX = derive2 { name="COMIX"; version="0.1.6"; sha256="0x3x09jvplap1wgg4y80gymxzh9mac8np7wmqldhjnmkqs9bwc42"; depends=[Rcpp RcppArmadillo RcppEigen RcppNumerical]; }; - COMPoissonReg = derive2 { name="COMPoissonReg"; version="0.7.0"; sha256="144vf3vfn5msc8p67q65frza8xyi9nqccjq47fnv33w5h0d9wlxj"; depends=[Rcpp]; }; + COMIX = derive2 { name="COMIX"; version="1.0.0"; sha256="0dhc3zb8jkfq8b9vj8m2a9jbd9fc7xxvhz16l8xhz9v5iffgk6hh"; depends=[coda dplyr ggplot2 Rcpp RcppArmadillo RcppEigen RcppNumerical rlang stringr tidyr]; }; + COMPoissonReg = derive2 { name="COMPoissonReg"; version="0.8.0"; sha256="0yaq7mfqcdyp077xhmqd3rx0b77y2rg1yz89q4llgiwfg244y6mp"; depends=[numDeriv Rcpp]; }; CONCUR = derive2 { name="CONCUR"; version="1.4"; sha256="0455jmc8grcpmipcz2rr6zdhxjfi0gd5zj46lyvh75k6wn2p6265"; depends=[CompQuadForm dplyr mgcv]; }; COR = derive2 { name="COR"; version="0.0.1"; sha256="0flir1mwqqs418hwcwdg72a1r89hamf6zd8jaf8g7hm4lp3i1cgf"; depends=[]; }; CORE = derive2 { name="CORE"; version="3.2"; sha256="10y404xkd4pqlh9w5hcx6laxpqy0831v61nacih094m0q6af9brl"; depends=[]; }; - CORElearn = derive2 { name="CORElearn"; version="1.56.0"; sha256="0zdx9ljxjzkj4kbrv856l3jaiv2s7dqycr3b3x7k5g05iv1ic6lv"; depends=[cluster nnet plotrix rpart_plot]; }; + CORElearn = derive2 { name="CORElearn"; version="1.57.3"; sha256="1kgnjl8g2njrc4xnsvz76mjzp2z93klps6k1msni1fsjbg0vvl05"; depends=[cluster nnet plotrix rpart_plot]; }; 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]; }; COVID19 = derive2 { name="COVID19"; version="3.0.2"; sha256="0ljhvip944gv44b5nswcp59n0qjsyniynq2wiwcb03lv6pvvmz1x"; depends=[data_table R_utils]; }; @@ -714,8 +716,8 @@ in with self; { 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]; }; - CPC = derive2 { name="CPC"; version="2.2.1"; sha256="0nb5ghcrzjncqwpk0x7k4l4mkhrra46dqbbk5clpld56r7j4cn0b"; depends=[cluster dbscan Rfast]; }; - CPGLIB = derive2 { name="CPGLIB"; version="1.1.0"; sha256="01klcg6ik7f9p2cy8m0j8qrmy4rah49pv2fyhqvqfbcxibmjbgxy"; depends=[Rcpp RcppArmadillo]; }; + CPC = derive2 { name="CPC"; version="2.3.0"; sha256="1lh6g2d2xk41nnafcx2qvcigb957ccwq19vp1fcmxq8gmzcg3yr4"; depends=[cluster dbscan Rfast]; }; + CPGLIB = derive2 { name="CPGLIB"; version="1.1.1"; sha256="10pv9f36cg4ahgcbl3agc6zvgh3bmv78rc2vl6xhm1jpijhxqk93"; 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=[]; }; CPP = derive2 { name="CPP"; version="0.1.0"; sha256="1kdf43pnavjbmxkvrj78fiwl0ykln9x9ck8pcivhj9q5rsfbhbh4"; depends=[ineq kappalab mc2d]; }; @@ -728,20 +730,21 @@ in with self; { CREDS = derive2 { name="CREDS"; version="0.1.0"; sha256="1llgxsmpk13gq75y2r3qiwwjcl87bknkryaw5dq0ndf17rj31mw8"; depends=[MASS]; }; CRF = derive2 { name="CRF"; version="0.4-3"; sha256="0jlcc1ffd2z7sz1szbi4vrp5rihmcp18bsw27x02ivi6l21nyivf"; depends=[Matrix]; }; CRM = derive2 { name="CRM"; version="1.2.4"; sha256="0jv2z1y3zyj1m86p4pmqww58hj8pvid1ss6ym67y46n9srzxsmj5"; depends=[]; }; + CRMetrics = derive2 { name="CRMetrics"; version="0.2.2"; sha256="0q0d0g1iblwgm21kdrcj06ish9aif223rj9ykh0j9lvafgigc77f"; depends=[cowplot dplyr ggbeeswarm ggplot2 ggpmisc ggpubr ggrepel magrittr Matrix R6 scales sccore sparseMatrixStats tibble tidyr]; }; CRTConjoint = derive2 { name="CRTConjoint"; version="0.1.0"; sha256="1lp3rxjd8pilin6kvl49vm11bjd6dzhalmwf99j3jsiiavxc6baq"; depends=[doSNOW foreach Rcpp snow]; }; CRTSize = derive2 { name="CRTSize"; version="1.1"; sha256="1hwvfzbicz8p452k3qyschpn7q8drnhbln6ny6nx4ncgrdr8lsd0"; depends=[]; }; CRTgeeDR = derive2 { name="CRTgeeDR"; version="2.0.1"; sha256="0sqsgs8qbc6gvzr3l2r8y83nbhz12q3jf2cjlb2xgif15r7sbnxx"; depends=[ggplot2 MASS Matrix]; }; CRWRM = derive2 { name="CRWRM"; version="0.0.1"; sha256="0w6lg5q2c0w5p9vg5qr32pycyl8d1zp0s55jlvf2xhmqx34677hd"; depends=[]; }; CSCDRNA = derive2 { name="CSCDRNA"; version="1.0.3"; sha256="0ym6bzk8n9kf0pvd3h4dv2hhxmmrr54hvs7vccmxrhxikr8ix5iy"; depends=[Biobase BisqueRNA limSolve MAST nlshrink plyr Seurat]; }; - CSCNet = derive2 { name="CSCNet"; version="0.1.1"; sha256="02kv2d0xjmkmzzys04r8jczc51kdrm77rk48q6j3cl73zpcv3z99"; depends=[caret dplyr furrr future glmnet magrittr prodlim purrr recipes riskRegression stringr survival tibble tidyverse]; }; + CSCNet = derive2 { name="CSCNet"; version="0.1.2"; sha256="0amsrjzpfga66mh6x589whz70xpl0sg10f80x87apxz312rb4r8m"; depends=[caret dplyr furrr future glmnet magrittr prodlim purrr recipes riskRegression stringr survival tibble tidyverse]; }; CSESA = derive2 { name="CSESA"; version="1.2.0"; sha256="0pv6iabq1w22qbhlsbckdvva4n7igpzrjnrahmq83a6wxgvjbf5j"; depends=[Biostrings]; }; CSFA = derive2 { name="CSFA"; version="1.2.0"; sha256="1nkyhk8qhrrlx8v26yw86l954m4xfcxma4pqbhgw95jvqql5h3li"; depends=[elasticnet fabia FactoMineR pls randomcoloR snowFT]; }; CSGo = derive2 { name="CSGo"; version="0.6.7"; sha256="19awbblkx0g58gvd43xs1dmcsn588k185njw3fri8xxbn26xp5jy"; depends=[dplyr extrafont furrr future fuzzyjoin ggplot2 httr jsonlite magrittr purrr stringr]; }; - CSHShydRology = derive2 { name="CSHShydRology"; version="1.2.10"; sha256="1h3lcixsq19si1lbzzm8h9h0k4p01z2s8zzdw5az4vlsbg7wv1gl"; depends=[dplyr fields ggplot2 ggspatial httr Kendall lubridate magrittr plotrix raster sf stringr tidyhydat timeDate whitebox]; }; + CSHShydRology = derive2 { name="CSHShydRology"; version="1.3.0"; sha256="0jmc0d3lpnjf0srh3s3zy2d941xah4y7sq1zkw21a6gmxd82a3ww"; depends=[circular dplyr fields ggplot2 ggspatial httr Kendall lubridate magrittr plotrix raster sf stringr tidyhydat timeDate whitebox]; }; CSIndicators = derive2 { name="CSIndicators"; version="0.0.2"; sha256="12kbc289a3q1zjg19wcwng29hrjy76jmj3fd8c9064lj0xns5jjh"; depends=[ClimProjDiags multiApply s2dv]; }; CSMES = derive2 { name="CSMES"; version="1.0.0"; sha256="1ddr2b39d7nwan6dqf5xx9h6gzfxxk50r1d9vbpb9hc8a7d15vnp"; depends=[caTools data_table mco ROCR rpart zoo]; }; CSTE = derive2 { name="CSTE"; version="2.0.0"; sha256="0r38pvd83aw9zrq43malw50vlbnknh3b53x3ydj0wxrk95wsmy46"; depends=[dfoptim fda locpol Rcpp survival]; }; - CSTools = derive2 { name="CSTools"; version="4.1.0"; sha256="0r7bbaaapk5f32b6qwmmanddk1gqs7vq6461vf29pi7qsr2jlq9y"; depends=[abind ClimProjDiags data_table easyVerification ggplot2 maps multiApply ncdf4 plyr qmap rainfarmr RColorBrewer reshape2 s2dv verification]; }; + CSTools = derive2 { name="CSTools"; version="4.1.1"; sha256="1a05wv9isrlf7pzhychczvnpvsppnnriaz4jsm78ccg0m9y3wabj"; depends=[abind ClimProjDiags data_table easyVerification ggplot2 maps multiApply ncdf4 plyr qmap rainfarmr RColorBrewer reshape2 s2dv verification]; }; CSclone = derive2 { name="CSclone"; version="1.0"; sha256="0lqsqsgh2sf44fr1r7g179556v294yr1wy7x4320g7adxshrwyh5"; depends=[DNAcopy lpSolve mcclust moments]; }; CSeqpat = derive2 { name="CSeqpat"; version="0.1.2"; sha256="1nqk873cagpn4fba4rmyzb6hni1p5lqcvsr9givrcm0gfx756w1h"; depends=[NLP tm]; }; CTAShiny = derive2 { name="CTAShiny"; version="0.1.0"; sha256="18qw8nx1r4gwlxj9zxn4hllpn29fv3i4fgwyl5fh3qsv9hmbvi0x"; depends=[epitools rpivotTable shiny shinyMatrix]; }; @@ -762,7 +765,7 @@ in with self; { CVR = derive2 { name="CVR"; version="0.1.1"; sha256="1y8m9r409jq5h6xx1rvz7c7aj882jldfxly89zf3cvp2qg3jh7rj"; depends=[PMA Rcpp RcppArmadillo]; }; CVST = derive2 { name="CVST"; version="0.2-3"; sha256="0bgk0d6w3dyhb5s30idnp6jpb3m8wf3b79wqlg127wwm0cird8pg"; depends=[kernlab Matrix]; }; CVThresh = derive2 { name="CVThresh"; version="1.1.2"; sha256="14fgm5kzp1sscklv2pra800p12ga2hlqmm8s6zs5hdhlyvf0kj6v"; depends=[EbayesThresh wavethresh]; }; - CVXR = derive2 { name="CVXR"; version="1.0-10"; sha256="0cklfwsr3p4x4w7n6y3h3m4i3si8q0pwyp2vzv7kzawrmqc80484"; depends=[bit64 ECOSolveR gmp Matrix osqp R6 Rcpp RcppEigen Rmpfr scs]; }; + CVXR = derive2 { name="CVXR"; version="1.0-11"; sha256="0alp1g4bszxqcrjbn54bz1zswg8y10372fwwlbi0jjazycw9cap9"; depends=[bit64 ECOSolveR gmp Matrix osqp R6 Rcpp RcppEigen Rmpfr scs]; }; CVglasso = derive2 { name="CVglasso"; version="1.0"; sha256="1bh09cd0yabhqv5yfahhvayx3f09yqapzl1yr9nc9xqwyx1d0cfd"; depends=[doParallel dplyr foreach ggplot2 glasso]; }; CVrisk = derive2 { name="CVrisk"; version="1.1.0"; sha256="0xnpnjncdal2akdnkb52s7r82p2di0rc48h6nswbclkl5xf3snd6"; depends=[]; }; CaDENCE = derive2 { name="CaDENCE"; version="1.2.5"; sha256="1z3p5y1l67r470x6wrhnyjvw1ndppcm08fpj99x122j7kn6byff2"; depends=[pso]; }; @@ -780,8 +783,8 @@ in with self; { Canopy = derive2 { name="Canopy"; version="1.3.0"; sha256="0979hpphzhf4v71jx0shh3l8nffmpsn9l6f8ip2wxzcyx571i1wd"; depends=[ape fields pheatmap scatterplot3d]; }; CarletonStats = derive2 { name="CarletonStats"; version="2.0"; sha256="0pgzvw6gf8kjv8ndprwp4wlgdgh5sb75ga8z5syfw57fb05v7ac3"; depends=[]; }; Carlson = derive2 { name="Carlson"; version="1.1.0"; sha256="1ygsv2zdlm4yg35lqryb6hdn6wjm5yf1wdqbpd3vzmcag9m29nzq"; depends=[]; }; - Cascade = derive2 { name="Cascade"; version="2.0"; sha256="0zd9krlklmsy03kya5bdx2hj25fvfhwcx431q618ccw44c11b590"; depends=[abind animation cluster igraph lars lattice limma magic nnls survival tnet VGAM]; }; - CascadeData = derive2 { name="CascadeData"; version="1.3"; sha256="0vmr9gfmgrgan9q5hsavqfdd76dpm19a53m9s8jkj14rsd47bpll"; depends=[]; }; + Cascade = derive2 { name="Cascade"; version="2.1"; sha256="1hfbv9129rnrjqspjd8wnhw0qrp1m142bixlwddzr6j2sg7r8s20"; depends=[abind animation cluster igraph lars lattice limma magic nnls survival tnet VGAM]; }; + CascadeData = derive2 { name="CascadeData"; version="1.4"; sha256="0cbnp8mqv3alsz7b5fa8djg1yd46zkn1f3b0pqww2yn8zavd4fih"; depends=[]; }; CatDataAnalysis = derive2 { name="CatDataAnalysis"; version="0.1-5"; sha256="19bbilvz9h2bswpm5992c48cm4slc73kf0ny2mp78vhcfadri9cb"; depends=[]; }; CatDyn = derive2 { name="CatDyn"; version="1.1-1"; sha256="0gkaxs7apqhq7mp3chjsyhrnk3qkk11f8p7smmyj6h73888ry8jn"; depends=[BB optimx]; }; CatEncoders = derive2 { name="CatEncoders"; version="0.1.1"; sha256="1q9wzq06lac8z9y8b65alsxpb48bw8wqmifd893kknk51xq6r9kl"; depends=[data_table Matrix]; }; @@ -792,10 +795,10 @@ in with self; { CausCor = derive2 { name="CausCor"; version="0.1.2"; sha256="1m41i4knqh4hddz3s3p62qhx2dmdypm8gfdwlczlja89llx9737b"; depends=[cowplot dplyr ggplot2 magrittr WriteXLS]; }; CausalGAM = derive2 { name="CausalGAM"; version="0.1-4"; sha256="1riz11hfg96iks7734rg692l75nfrd3hmr9gw563j27rkk1nfkl6"; depends=[gam]; }; CausalGPS = derive2 { name="CausalGPS"; version="0.2.8"; sha256="1frzxmnqfskvlpxy7byy96i1yw88h9vjxc54fhn523d4676k6bmj"; 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]; }; + CausalImpact = derive2 { name="CausalImpact"; version="1.3.0"; sha256="0h3sh35962vdph72svfdvk6b1gl7wnj2kfkkpcjldbiszlfxp7wx"; depends=[assertthat Boom bsts 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]; }; - CausalModels = derive2 { name="CausalModels"; version="0.1.0"; sha256="0njvszf6b161lq8g94aawwb9pwbf0gdb2by8g8n6s67vbl7lyq0w"; depends=[boot causaldata multcomp]; }; + CausalModels = derive2 { name="CausalModels"; version="0.2.0"; sha256="19m1qfzssrwmsxiiyqiqby102qmxxcmbyxhggd9bb44z2iicf8cl"; depends=[boot causaldata geepack multcomp]; }; CausalQueries = derive2 { name="CausalQueries"; version="0.1.0"; sha256="1m7i5v4im85lzn9agf9nlf458y76k21h59avg4924bm4hn709lls"; depends=[BH dagitty dirmult dplyr ggdag ggplot2 latex2exp lifecycle Rcpp RcppEigen repr rlang rstan rstantools StanHeaders stringr]; }; CautiousLearning = derive2 { name="CautiousLearning"; version="1.0.1"; sha256="1m5x93l4bscrpcxk0pva6d6n2qnzhzxh0a6a81p97l8lqgs1qw2q"; depends=[BH Rcpp sitmo spc]; }; CePa = derive2 { name="CePa"; version="0.8.0"; sha256="1wjm6nyjaz3z0g2dxk1k82va86qxx2xsgx02y9ipyzf1ldxclm1s"; depends=[graph igraph Rgraphviz]; }; @@ -809,14 +812,14 @@ in with self; { ChainLadder = derive2 { name="ChainLadder"; version="0.2.16"; sha256="04ch0aimxc81i1isv6clpwx0bsbrpq5ncjww9dapa4v5rgxc4n2q"; depends=[actuar cplm ggplot2 lattice MASS Matrix statmod systemfit tweedie]; }; ChangePointTaylor = derive2 { name="ChangePointTaylor"; version="0.2"; sha256="0rf3h7l8l6fw2i489ldcqhsf9ppjzpx298p5ciyp9iyc0zcykz38"; depends=[bench dplyr ggplot2 magrittr purrr Rcpp rlang tidyr]; }; ChangepointTesting = derive2 { name="ChangepointTesting"; version="1.1"; sha256="0gasqf39hhrd2pg2rq4a2aaxwi3syjvmgdiss42wdwb47dww8wil"; depends=[]; }; - ChannelAttribution = derive2 { name="ChannelAttribution"; version="2.0.5"; sha256="09qdj93al6r7pg9s2xvwks7d73bgjsn1k7h8rcdzf245r89l8726"; depends=[Rcpp RcppArmadillo]; }; + ChannelAttribution = derive2 { name="ChannelAttribution"; version="2.0.6"; sha256="174mv7b9jfw240i29b457994iza3wwqx0mjxbpl28af0fba1h4xl"; 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.3"; sha256="0xayap1gs36p9cvlyf5s562vy5pahqcwlwnr355i34zw616yg76l"; depends=[colorRamps ggplot2 gridExtra plot3D RColorBrewer rgl]; }; + ChaosGame = derive2 { name="ChaosGame"; version="1.4"; sha256="06d2jm8b3l242yqgbfsr1cclph0l8xdxqfq7xvbghsavzk3lf367"; depends=[colorRamps ggplot2 gridExtra plot3D RColorBrewer rgl]; }; CheckDigit = derive2 { name="CheckDigit"; version="1.0.0"; sha256="19apm7hr1k693w2ybv7vmaw5mxnhdjggpnr4m8phyvv8by345rxs"; depends=[]; }; ChemoSpec = derive2 { name="ChemoSpec"; version="6.1.4"; sha256="0dnpwfx1p3p8qfxxiz1r6hipdpklhyz88sd2mq2ap24pn7xqdhf1"; 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]; }; + ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="1.0.2"; sha256="0px9aqkkpkhcnjjan22cr43d1qrgrkb2fgdam5cpmv1cfygckwvj"; depends=[data_table ggplot2 ggrepel magrittr plotly]; }; 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]; }; @@ -844,17 +847,17 @@ in with self; { ClimClass = derive2 { name="ClimClass"; version="2.1.0"; sha256="1r836md31z2r5d9xckkbalzbhm4kf5paljv71kxpy53q92k7yi91"; depends=[geosphere ggplot2 reshape2]; }; ClimInd = derive2 { name="ClimInd"; version="0.1-3"; sha256="0n5kd001nkpks16c3msvn2qvzyrjawa2rqwh8zph2qr5hgpwcpg7"; depends=[chron SPEI weathermetrics]; }; ClimMobTools = derive2 { name="ClimMobTools"; version="0.5"; sha256="14ysx7q92hgmkrwgnkdb3h38jz1zjsadzm8zwma63hhrrcmig2j1"; depends=[httr jsonlite Matrix RSpectra]; }; - ClimProjDiags = derive2 { name="ClimProjDiags"; version="0.1.3"; sha256="1grhg0ajf5lfm7pi5mm0hgp0cmln1jwrgkrfb4ci85fpqn96ddji"; depends=[climdex_pcic multiApply PCICt plyr]; }; + ClimProjDiags = derive2 { name="ClimProjDiags"; version="0.2.1"; sha256="1xb2vhv6haql1xqx9ic9hikshfi47lxv874mfwv1jll4fq95saia"; 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]; }; ClinicalUtilityRecal = derive2 { name="ClinicalUtilityRecal"; version="0.1.0"; sha256="17xj9cmdkjrzx7mshka2hlkxh8887sprdqix7fd8jcr9bmc6ad9r"; depends=[caret cowplot ggplot2 lattice nloptr]; }; - CliquePercolation = derive2 { name="CliquePercolation"; version="0.3.0"; sha256="0wd8pbi0p19vyhnf6yjwhfzc4s95hhpp26hy97jwx9bg8ahcd4hj"; depends=[colorspace igraph magrittr Matrix pbapply Polychrome qgraph]; }; + CliquePercolation = derive2 { name="CliquePercolation"; version="0.4.0"; sha256="17m8pj8wg2ngzip1ag3jm5fqi083ilrsi0rvpcg5jmqflwlka8h3"; depends=[colorspace igraph lessR magrittr Matrix ohenery pbapply Polychrome qgraph]; }; CloneSeeker = derive2 { name="CloneSeeker"; version="1.0.11"; sha256="19aj4c2q3wp4vp08j72700wwyqmkqxwml2fwmz0wsxdam8vp1ydi"; depends=[combinat mc2d quantmod]; }; CluMP = derive2 { name="CluMP"; version="0.8.1"; sha256="1vpxl2rcknqx32b94b48iirkh7r7cdri9mcljrw29gsbvhrfc46k"; depends=[amap data_table dplyr ggplot2 MASS NbClust rlang tableone]; }; ClueR = derive2 { name="ClueR"; version="1.4"; sha256="0awl3ag48idg0396hcgqrh5f16mbgximr5xbxjiimib5zysdc558"; depends=[e1071]; }; ClusBoot = derive2 { name="ClusBoot"; version="1.0"; sha256="1wh9mv932zarl8w098lgv2jpanp6r8nzdkyayv8nxk7nddl0bn1k"; depends=[]; }; ClusPred = derive2 { name="ClusPred"; version="1.1.0"; sha256="12pm5vkfxpaincv9ajid0p07l0mjc2kfqqfg0ls2pcxmmkh8wwb4"; depends=[ald ALDqr quantreg Rcpp RcppArmadillo VGAM]; }; - ClusROC = derive2 { name="ClusROC"; version="1.0.1"; sha256="0nndzm5ap5fmvgc74kcx1h3jv4wpjg9rr4vj1lvxz8zyw3kacfrh"; depends=[car doSNOW foreach ggplot2 ggpubr nlme numDeriv rgl snow]; }; + ClusROC = derive2 { name="ClusROC"; version="1.0.2"; sha256="055ppcnzwkapnyf9xvld4bvkccwf494gqcb2qq0vnsa8n6bz5k46"; depends=[doParallel ellipse foreach ggplot2 ggpubr iterators nlme numDeriv Rcpp RcppArmadillo rgl]; }; ClusTorus = derive2 { name="ClusTorus"; version="0.2.2"; sha256="052jq96xr9qrc203ib11qsni50j0jzdpfwmbnd5rypfvff6w5kxc"; depends=[BAMBI cowplot ggplot2 igraph purrr rlang]; }; ClusVis = derive2 { name="ClusVis"; version="1.2.0"; sha256="06yckdl3gxjia1gjjqpc29lvy4f7qf47fncslng9ggjnks6il145"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod VarSelLCM]; }; ClussCluster = derive2 { name="ClussCluster"; version="0.1.0"; sha256="1436849m2mnm8j7lf653zv8lcvvg2ch8kkks4bvr39kx21wxy8ss"; depends=[ggplot2 reshape2 rlang scales VennDiagram]; }; @@ -867,7 +870,7 @@ in with self; { ClustVarLV = derive2 { name="ClustVarLV"; version="2.1.1"; sha256="0maylgf6czlll5zn3xj68acmllxi4x2r4ri6bdx8vl9apzax1rgy"; 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.7"; sha256="1sl218scrf5s02v54bmmk2sz1vrnlq16c14c0lcg1n7x8d76sgk6"; depends=[ggplot2 gmp gtools lifecycle Rcpp RcppArmadillo]; }; + ClusterR = derive2 { name="ClusterR"; version="1.2.8"; sha256="04p0bjqi18b6qvvximad5yf5v5zalhjbl9j3m405g942kp0a48xh"; depends=[ggplot2 gmp gtools lifecycle 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]; }; @@ -880,7 +883,7 @@ in with self; { CoOL = derive2 { name="CoOL"; version="1.1.2"; sha256="18z7s8bvnym4xj0hh5m6bwm86ddmsgivqv4g5zbd9m87l7khl9pn"; depends=[ClustGeo data_table ggplot2 mltools plyr pROC Rcpp RcppArmadillo wesanderson]; }; CoRpower = derive2 { name="CoRpower"; version="1.0.4"; sha256="08chsbbl74rskinp68pwzpvnxx5lkfqf71j7ryp1cwy7199h3jyw"; depends=[osDesign survival]; }; CoSMoS = derive2 { name="CoSMoS"; version="2.1.0"; sha256="149mybfxaqssawp8fqhjiv3xljzflc02y4pfvavz7rklfplidqkb"; depends=[animation cowplot data_table directlabels ggplot2 ggquiver mAr Matrix matrixcalc MBA mvtnorm nloptr plot3D pracma]; }; - CoTiMA = derive2 { name="CoTiMA"; version="0.5.4"; sha256="02bg0bckg5h8bk4plxjni5kya9rmqhz5d9dvfa19hmyd384hdxhv"; depends=[abind crayon ctsem doParallel foreach lavaan MASS MBESS OpenMx openxlsx psych rootSolve RPushbullet scholar stringi zcurve]; }; + CoTiMA = derive2 { name="CoTiMA"; version="0.6.2"; sha256="0394a6m1hg9klcgpk4s51rql8k2084cbs6bzpgrsbk3gnvcxy8s3"; depends=[abind crayon ctsem doParallel foreach lavaan MASS MBESS OpenMx openxlsx psych rootSolve RPushbullet scholar stringi zcurve]; }; 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]; }; CohensdpLibrary = derive2 { name="CohensdpLibrary"; version="0.5.8"; sha256="1kvg5wgzgscwqm9hbng92alka2jrar7yfx3s707gj11ck5ldhhmf"; depends=[Rdpack]; }; @@ -905,12 +908,11 @@ in with self; { Compack = derive2 { name="Compack"; version="0.1.0"; sha256="1bl1drbkak7r7scfiij6sf8fjzq01y3p05mjlkknhi9k1l6jq0mi"; depends=[fda MASS orthogonalsplinebasis plyr Rcpp RcppArmadillo]; }; CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.2.6.2"; sha256="0r8gdr834jqqwiq9h4yz19gcg92rbdd4fr3fwi083vfjml82f0v0"; depends=[data_table expm Matrix]; }; CompareTests = derive2 { name="CompareTests"; version="1.2"; sha256="1z96kh851bpr2szgyjszkpv6m5ma6abz7hrm50fgvfpgxkj7f4yi"; depends=[]; }; - ComparisonCR = derive2 { name="ComparisonCR"; version="1.0.4"; sha256="10xw3ppkzpc3njc409ln7g6bg33csf2ilw3f11hn60ry5xbnn82y"; depends=[boot CIFsmry cmprsk]; }; ComparisonSurv = derive2 { name="ComparisonSurv"; version="1.1.1"; sha256="0lidakxb1ab6bpb7sf2arjl1xpym1lzxbh63g0x4c2dm7h0kzkwi"; depends=[muhaz survival survRM2 TSHRC]; }; Compind = derive2 { name="Compind"; version="2.6"; sha256="17gqjqpnq7925gx9p2q068zcrdjkkjjmm9zgn2rmpmgzsp7ww3j6"; 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.9"; sha256="1w5ybdsbshlxd82zks2jiwbc2jnn5fjcj0pmdffq6n0z36myxgzd"; 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=[]; }; + Compositional = derive2 { name="Compositional"; version="6.0"; sha256="0f17yj4zr69g70kayp0r25j6z2nqmhh06byp4vks8xiphah3jx4w"; 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.2.0"; sha256="0dlkkr26f07g0q3kcg0byvvlnf2hd5i8h9p1mkba333wh6af21ic"; depends=[]; }; ConConPiWiFun = derive2 { name="ConConPiWiFun"; version="0.4.6.1"; sha256="1ziy646lbx297kia797xjxa8hyl826x1hiighyjslvnlvrhapx08"; depends=[Rcpp]; }; ConNEcT = derive2 { name="ConNEcT"; version="0.7.27"; sha256="1j66qmvgm9yrgnrcg600s25haq9imcshmy6fv9vd84mhy21md85h"; depends=[qgraph]; }; ConR = derive2 { name="ConR"; version="1.3.0"; sha256="1q93x2b7a2jgkybazk24x8gvwvjjvkhi1gy5zx1sc2f4arm73myq"; depends=[doSNOW fields foreach geosphere raster rgdal rgeos rnaturalearth sf snow sp tibble writexl]; }; @@ -950,7 +952,7 @@ in with self; { CopulaCenR = derive2 { name="CopulaCenR"; version="1.2.1"; sha256="0dkjdzd720wnmfashvg3q0hl0dw9w99m972jwrjrzh24498rlq1m"; depends=[caret copula corpcor flexsurv icenReg magrittr plotly pracma survival]; }; CopulaREMADA = derive2 { name="CopulaREMADA"; version="1.5.1"; sha256="027007xrzd2m7pgv8ki901aaf2957ih1lqh881viyd8hbfcfaghy"; depends=[matlab mc2d statmod tensor]; }; CorBin = derive2 { name="CorBin"; version="1.0.0"; sha256="0mjvhj9cw21xjg96fz5bcyfxgwdw367l1942a38by77ylypdfq3y"; depends=[]; }; - CorMID = derive2 { name="CorMID"; version="0.1.6"; sha256="0grwaaj06clg27lssa9zhlv2siyrraxjc4sy5nj6mffncs10d52c"; depends=[plyr Rdisop]; }; + CorMID = derive2 { name="CorMID"; version="0.1.7"; sha256="1i51zn8m2lpdv3dqq4cqyvyzqv9wf1flw7g83j8dj8r6nlasfva5"; depends=[plyr Rdisop]; }; Corbi = derive2 { name="Corbi"; version="0.6-2"; sha256="13lbh6fcfrpgz459mjdnfkd8kys2350s8j0vv9ps18092264gh42"; depends=[CRF igraph MASS Matrix]; }; CornerstoneR = derive2 { name="CornerstoneR"; version="2.0.2"; sha256="04dvryhcyi7f6bmm4067cn5vmy7kdqi3bys7ln8nnsc0kkdjxhi5"; depends=[checkmate data_table minpack_lm ranger SpatialTools vcd]; }; CorrBin = derive2 { name="CorrBin"; version="1.6"; sha256="0iwad5qf7hqii02s5f85155c5s7v8ghnac4l6l3c45dshrpapp2m"; depends=[boot combinat dirmult geepack mvtnorm]; }; @@ -962,7 +964,7 @@ in with self; { CosW = derive2 { name="CosW"; version="0.1"; sha256="12l4w8b5jnr8773hxk7khrdn705x6bdbw7s8z8w95bfbbi12dj6v"; depends=[fdrtool pracma]; }; Counterfactual = derive2 { name="Counterfactual"; version="1.2"; sha256="1spryxvnkdz728rl4nb7zlqhynnh0b4m7lnhq4i1n13gfsz1m5j4"; depends=[doParallel doRNG foreach Hmisc quantreg survival]; }; Counternull = derive2 { name="Counternull"; version="0.1.0"; sha256="1vnjhqif8ydnp6fb225hml1d2sincscs4q1vacbzxah628ac9yhp"; depends=[effsize]; }; - Countr = derive2 { name="Countr"; version="3.5.5"; sha256="0w2bdcr84zjcgcn2vrx2nib7dxq8vm12di3ni57z4yx4syskg3ik"; depends=[boot car dplyr flexsurv Formula lattice lmtest MASS Matrix numDeriv optimx pscl RColorBrewer Rcpp RcppArmadillo Rdpack standardize VGAM xtable]; }; + Countr = derive2 { name="Countr"; version="3.5.6"; sha256="0zmg0hy9h2rjj3a6h05q8xxg0q2q65agmpm0gxk0qjl97wrh1fcy"; depends=[boot car dplyr flexsurv Formula lattice lmtest MASS Matrix numDeriv optimx pscl RColorBrewer Rcpp RcppArmadillo Rdpack standardize VGAM xtable]; }; CountsEPPM = derive2 { name="CountsEPPM"; version="3.0"; sha256="0iw7sfrb4yyaagwm1f4q9av5zvzia1mp2ns287ppsw3k248lz0kb"; depends=[expm Formula lmtest numDeriv]; }; CovCombR = derive2 { name="CovCombR"; version="1.0"; sha256="07yd0zbvc9db2jw6xigfhxnbkxwb3gxlmywadz7fs3rva2if2ffx"; depends=[CholWishart Matrix nlme]; }; CovRegRF = derive2 { name="CovRegRF"; version="1.0.1"; sha256="0fldvdjxysg6r7p6vxnnfjih68j8igxva57fs5rygxmi51l2vl6n"; depends=[data_table data_tree DiagrammeR]; }; @@ -979,15 +981,15 @@ in with self; { Cprob = derive2 { name="Cprob"; version="1.4.1"; sha256="1m4ys8xpj1jbn3lf8fym935y94dxipiimsf9zxwyw5sy71y7skgq"; depends=[geepack lattice lgtdl prodlim tpr]; }; 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]; }; - CropScapeR = derive2 { name="CropScapeR"; version="1.1.4"; sha256="0rs428sz2fd4ysz1k5i2zkjg4vga2rczlbdd042sdjq501nk2462"; depends=[data_table dplyr httr magrittr raster RJSONIO sf]; }; 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]; }; + Crosstabs_Loglinear = derive2 { name="Crosstabs.Loglinear"; version="0.1.1"; sha256="0238652k1mv396wjxm058xvhp7rss0nkmn48bvkhq6pcryna2lzb"; depends=[]; }; CruzPlot = derive2 { name="CruzPlot"; version="1.4.8"; sha256="19dza13mdd67g7710bzzg1bi32nhgr3c5vcyh98igw3q8hfk7ac8"; depends=[dplyr DT geosphere mapdata maps marmap shiny shinydashboard shinyjs stringr swfscDAS]; }; CryptRndTest = derive2 { name="CryptRndTest"; version="1.2.7"; sha256="0skk0mgnkfknlbdidfh2jca1wa8rzgd29ypwpa8kdh83l9jhdi5g"; depends=[gmp kSamples LambertW Rmpfr sfsmisc tseries]; }; 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.4.0"; sha256="0y2mjqg8285vprm42z1dsqhs5k6g3703ysg3225a7qq08ga787rs"; depends=[lattice reshape2]; }; + Cubist = derive2 { name="Cubist"; version="0.4.1"; sha256="0ab1zdc1ddc6x7j2y53ccvqwaap6v26i447hn8lwlnz6i7c3idlz"; 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]; }; @@ -1012,6 +1014,7 @@ in with self; { DAP = derive2 { name="DAP"; version="1.0"; sha256="0zzb05yxfaqp6qnr979q20rqy8sl5l825mxs0x9366qr7mz5k5ws"; depends=[MASS]; }; DATAstudio = derive2 { name="DATAstudio"; version="1.1"; sha256="1gwm53pgab5qn0p46bxs0790n7bbfl7b66i84xsa6bb4zdw5jdzb"; depends=[data_table ggplot2 scales]; }; DArand = derive2 { name="DArand"; version="0.0.1.2"; sha256="1pwd5srrjy8mhs40k6g6x5j3vk9cr5hylk8sdyiiqalpq490nzqy"; depends=[]; }; + DBERlibR = derive2 { name="DBERlibR"; version="0.1.3"; sha256="19hqp0q7j6b7h9bamn3v2d1kdwzi0mlqvx7b618fkixpibqndzn7"; depends=[car dplyr emmeans ggplot2 ggpubr ggrepel psych readr reshape rstatix tibble]; }; DBEST = derive2 { name="DBEST"; version="1.8"; sha256="1a598g02hpfgv572gchllqkppynnsp4lx764jg0g66w3b66k0kdy"; depends=[zoo]; }; DBI = derive2 { name="DBI"; version="1.1.3"; sha256="13a2656w5j9shpcwa7gj2szy7nk9sajjhlisi5wdpgd57msk7frq"; depends=[]; }; DBIsqldf = derive2 { name="DBIsqldf"; version="0.9.9-2"; sha256="1yp9xqrf6dbq9478w0bd55rzhqf78anwrqzlkphbl7fk2d2ipy6i"; depends=[DBI]; }; @@ -1027,7 +1030,7 @@ in with self; { DCEtool = derive2 { name="DCEtool"; version="1.0.0"; sha256="0l6m0dpr83fi22sp8vwc7jxw598j91jhz55s51ihii0wfiwk26ym"; depends=[adjustedcranlogs bslib dfidx DT fastDummies ggplot2 htmltools idefix knitr magrittr matrixStats mlogit mvtnorm readxl remotes rlist rmarkdown shiny shinyBS shinycssloaders shinythemes shinyWidgets stringi survival tibble tidyr tidyverse writexl]; }; DCG = derive2 { name="DCG"; version="0.9.3"; sha256="08718x6v3g7kpfv0gpgm19cn3d3ynj7yagzs0jic1j5rwvn04pfb"; depends=[]; }; DCL = derive2 { name="DCL"; version="0.1.2"; sha256="0r9zigbxaa9w8501mishydyp47rpzfrx717m0ysly6nkxfm6g6d6"; depends=[lattice latticeExtra]; }; - DCLEAR = derive2 { name="DCLEAR"; version="1.0.8"; sha256="1riqsrzx9liq9fq9b4bfyfkixq879rzwa2yl202if8py42k1rnk5"; depends=[ape BiocGenerics BiocParallel dplyr igraph Matrix matrixStats phangorn purrr rBayesianOptimization Rcpp RcppArmadillo rlang stringr tidyr tidyverse]; }; + DCLEAR = derive2 { name="DCLEAR"; version="1.0.11"; sha256="0s56qyp9jrfkqf946w9hin2qfkmxcgg3ymcwj3v24gabvyqivjdm"; depends=[ape BiocGenerics BiocParallel dplyr igraph Matrix matrixStats phangorn purrr rBayesianOptimization Rcpp RcppArmadillo rlang stringr tensorflow tidyr tidyverse]; }; DCODE = derive2 { name="DCODE"; version="1.0"; sha256="19dwms88q0ylxd92l3ivig8p8jjyhk8mhgz0l36m9pcq11gyjc0n"; depends=[seqinr]; }; DCPO = derive2 { name="DCPO"; version="0.5.3"; sha256="1h14xnii6kv6sc7pfxalif3bj0mifnxg46x4lwbixx9vzxxz96sq"; depends=[beepr BH dplyr forcats janitor purrr Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; }; DCSmooth = derive2 { name="DCSmooth"; version="1.1.2"; sha256="19pkj8z9wm4g8kxz1j3jw2n0bwldsyakipxvqpwnmlg2g5j8f5b1"; depends=[doParallel foreach fracdiff plotly Rcpp RcppArmadillo]; }; @@ -1036,7 +1039,7 @@ in with self; { DCluster = derive2 { name="DCluster"; version="0.2-8"; sha256="1ixn81jn0vmfi3hyqs1lq3dhpw2f5xkvq8r34pj8x3n664z2h8q4"; depends=[boot MASS spdep]; }; DClusterm = derive2 { name="DClusterm"; version="1.0-1"; sha256="04i9fyph2k3ffds0nv49371p8lw6dkzcf27pc98f99x0l6c8k5iq"; depends=[DCluster lme4 sp spacetime xts]; }; DDD = derive2 { name="DDD"; version="5.0"; sha256="13kqgj45afd0c5jkwi36j94v7l2bz60i3583z1jcvdxq913wwv5b"; depends=[ape BH deSolve expm Matrix phytools Rcpp SparseM subplex]; }; - DDHFm = derive2 { name="DDHFm"; version="1.1.2"; sha256="0lgh6kcfas06p2yy7zy21r05k5521xbj5af3wwwssp5li1cia35g"; depends=[lokern wavethresh]; }; + DDHFm = derive2 { name="DDHFm"; version="1.1.3"; sha256="1xkjbhqipz6kqd6kw9682q5sbrvbpq4jn8nms3cv63b8x9nl1k55"; depends=[lokern wavethresh]; }; DDIwR = derive2 { name="DDIwR"; version="0.13"; sha256="0vczy1614k31s3skblzznpagwyf9qr3wdfrwvxdvck1c4albkmrp"; depends=[admisc declared haven readxl writexl xml2]; }; DDL = derive2 { name="DDL"; version="1.0.1"; sha256="176hvm3gl6dv9na3jjkqb27b8n4fwxsg8cazwkabv9jn12w4a93p"; depends=[glmnet Matrix]; }; DDM = derive2 { name="DDM"; version="1.0-0"; sha256="19g06qk3lzasj294x9wfij729mlq6ryvjqkn3rgl5xp1w0gx9wi2"; depends=[]; }; @@ -1047,12 +1050,13 @@ in with self; { DECIDE = derive2 { name="DECIDE"; version="1.3"; sha256="04hqr3r2ys6xni3a2mr2j45415wm3iix38xfxccrnx2wjk5w3b5b"; depends=[]; }; DEET = derive2 { name="DEET"; version="1.0.6"; sha256="0mx3v8bylckh808wdgbinnm9rl4jhgazfl8fh2xrlj4yxfwcsrd5"; depends=[ActivePathways downloader dplyr ggplot2 ggrepel glmnet pbapply]; }; DEEVD = derive2 { name="DEEVD"; version="1.2.3"; sha256="1wa3h0z5sk8zrwblzb8w7hgj9yqw56vqi3vsnpva53qynf42r2n7"; depends=[evd]; }; + DEGRE = derive2 { name="DEGRE"; version="0.2.0"; sha256="040hfpvqwl8r0iazwpnq7fmkydsxqc7mck7wbjqf6c19cw3zziz7"; depends=[car dplyr foreach ggplot2 ggpubr ggrepel glmmTMB parglm tibble]; }; DELTD = derive2 { name="DELTD"; version="2.6.8"; sha256="0s5qiy2cb6fcm9fnbzmqs2x39im5r1vb45avh9isc71f7xl3my36"; depends=[]; }; DEM = derive2 { name="DEM"; version="0.0.0.2"; sha256="17ibq5cavzkl2vfrmrkz77m28l4xpj97skad5pfvk1nhzyrg2k1l"; depends=[mvtnorm]; }; DEMOVA = derive2 { name="DEMOVA"; version="1.0"; sha256="09dqhhhihphhdnplmhdq4q5zwc0qvqhirdrxa9x6fr43vwa5zfp4"; depends=[leaps]; }; DEPONS2R = derive2 { name="DEPONS2R"; version="1.1.6"; sha256="1r37w7j46djpdcw1zw82c83r5ndqpdwham0g95qsqlhmvg709i9q"; depends=[jsonlite raster rgdal rgeos sp xml2]; }; DES = derive2 { name="DES"; version="1.0.0"; sha256="16p38i8ykwc8gjw6c9dhdwjjpa1b17n9wqhz3rhkbzjh978pky31"; depends=[]; }; - DEoptim = derive2 { name="DEoptim"; version="2.2-6"; sha256="1qg2d4d076a99qdjfg0yyq5z1xc1zlwydwry00nj2rx0hdykjqwc"; depends=[]; }; + DEoptim = derive2 { name="DEoptim"; version="2.2-8"; sha256="0k7mvf7j8y1sqv8zpiwkw4xcmgki37drkxjijrsmmhkfybfan7k3"; depends=[]; }; DEoptimR = derive2 { name="DEoptimR"; version="1.0-11"; sha256="0nqn12n5qlyk2zsgh57dvizy5z71xgqrhrcqj6lbzybm9c7v6x0q"; depends=[]; }; DFA = derive2 { name="DFA"; version="0.9.0"; sha256="0nk8k6xxqbbk1zhq3xsm59azvkj9499vp92pjl9xygasarim90rl"; depends=[]; }; DFA_CANCOR = derive2 { name="DFA.CANCOR"; version="0.2.5"; sha256="0c0590dzfvpmpjbgbnzpdgzmr3v97l136wzpjpbdw4c6pn3pyklw"; depends=[BayesFactor MVN]; }; @@ -1077,10 +1081,10 @@ in with self; { DIMORA = derive2 { name="DIMORA"; version="0.3.1"; sha256="11cq1fxlzs8m7hp6jchkz7fq7k50xm62aylv62m2ywyigk52hg84"; 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=[]; }; - DIZtools = derive2 { name="DIZtools"; version="0.0.5"; sha256="1c66kpdaxbw4vnz3zwh5v35iy9ryb67pk34r1y9m1yvkwm0i8qaz"; depends=[cleaR config data_table logger magrittr parsedate]; }; + DIZtools = derive2 { name="DIZtools"; version="0.0.6"; sha256="1rc972cqdfx0pjj9g3k2ggfsf9mhs62d72zpn0r6m3i6b6aa64q9"; depends=[cleaR config data_table logger magrittr parsedate]; }; DIZutils = derive2 { name="DIZutils"; version="0.1.1"; sha256="0023zja8vsqsfndbi37ykr6838zakd5sz1w62kzaj9x05biqsi9v"; 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]; }; + DImodels = derive2 { name="DImodels"; version="1.2"; sha256="0fylyadx7dph8iv5q25s86laxgwlsi399fj9l36g9dm3ngsffbsf"; depends=[hnp multcomp rootSolve]; }; DIscBIO = derive2 { name="DIscBIO"; version="1.2.0"; sha256="1m1c9ivblk3sir6lfq0msx2vlrx37dd5v7y6003k6fmsgrfpi9fs"; depends=[AnnotationDbi boot cluster fpc ggplot2 httr igraph impute mclust NetIndices org_Hs_eg_db philentropy png RColorBrewer rpart rpart_plot RWeka SingleCellExperiment statmod TSCAN tsne]; }; DJL = derive2 { name="DJL"; version="3.8"; sha256="0ry8zyr86qdb80fd9x2inrpdasfj13k2andm0wapd1k250018js8"; depends=[car lpSolveAPI]; }; DLASSO = derive2 { name="DLASSO"; version="2.0.2"; sha256="0xdygf6h89d9z4kqb46iqfxgdzq9dmkrxf9ypw78l4d8n9xx2gaa"; depends=[MASS]; }; @@ -1091,7 +1095,7 @@ in with self; { DMLLZU = derive2 { name="DMLLZU"; version="0.1.1"; sha256="0ck87abcd5gkq69q1g5g0yshfhx94m3vgayvxgzgnkidn9mivx22"; depends=[caret gbm ISLR lmtest nnet randomForest rlang sandwich]; }; DMMF = derive2 { name="DMMF"; version="0.5.1.2"; sha256="0p82cfp0561j4ki20rznx46z7vqdxh128a0m0zj8d2wp3csn1aag"; depends=[raster rgdal sp]; }; DMRMark = derive2 { name="DMRMark"; version="1.1.1"; sha256="15wr6j0v9kvbv8y6flkp4svfqy059ziv89nxv91vp0pjmavhpdlz"; depends=[ellipse MCMCpack mvtnorm]; }; - DMRnet = derive2 { name="DMRnet"; version="0.3.2"; sha256="0lk20addc4dwgcl39p1wahqj3ivx4qhv1s776blwvwwkig8mma68"; depends=[glmnet grpreg]; }; + DMRnet = derive2 { name="DMRnet"; version="0.3.3"; sha256="05d3qmz83p5nb5ib7fffn80g0qfvpnrz7s85fqa5ajfy72f4lmgc"; depends=[glmnet grpreg]; }; DMTL = derive2 { name="DMTL"; version="0.1.2"; sha256="0z6l1sylw4ib1mgqjnrmxh2q56vazg2i7xxiw1g4gm28iq44r2n0"; depends=[caret glmnet kernlab ks randomForest]; }; DMtest = derive2 { name="DMtest"; version="1.0.0"; sha256="1bziiyv63lcbmd79fykjj6b63igbbw0pwiq37k7q9l5vij6jfcj9"; depends=[doParallel foreach matrixStats]; }; DMwR2 = derive2 { name="DMwR2"; version="0.0.2"; sha256="1vzfbz2k05j8r2hpig3d2grb99rnnh2s1sviii3prcyqicxfh0i9"; depends=[class DBI dplyr quantmod readr rpart xts zoo]; }; @@ -1111,18 +1115,18 @@ in with self; { DOvalidation = derive2 { name="DOvalidation"; version="1.1.0"; sha256="1mzws3w7djpxnfqxjcqwgia7p17kb0qlnzj6qcfg2m1vamb1cn2z"; depends=[]; }; DPBBM = derive2 { name="DPBBM"; version="0.2.5"; sha256="1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2"; depends=[CEoptim gplots tmvtnorm VGAM]; }; DPP = derive2 { name="DPP"; version="0.1.2"; sha256="1qalcm4gwh03qpy07d0p323ccq8xmk04v6z30g7wg6ic613bqg7m"; depends=[coda Rcpp]; }; - DPQ = derive2 { name="DPQ"; version="0.5-2"; sha256="1x7rri6jh7832hka11wfm49qrxmk8kxbmcr79fq6flzmad64g5gv"; depends=[sfsmisc]; }; + DPQ = derive2 { name="DPQ"; version="0.5-3"; sha256="1jhvbyciqpbxsyi4zgn827nr3fywjc5q3ynji4i8x39i3lbwarw5"; depends=[sfsmisc]; }; DPQmpfr = derive2 { name="DPQmpfr"; version="0.3-1"; sha256="0f3l6dhiqnlix5vdz65pnxic43hcd4xiz64sh3cp8xs8cbmlnqcw"; depends=[DPQ gmp Rmpfr]; }; DPpack = derive2 { name="DPpack"; version="0.0.11"; sha256="1i2ic9w42pc1a5aqsy972rdk297q98vkqypj2vaxx0pav4m3l6lh"; depends=[dplyr e1071 ggplot2 MASS nloptr R6 Rdpack rmutil]; }; DPtree = derive2 { name="DPtree"; version="1.0.1"; sha256="0d7zf695lwkx4gv50f08cbi3p3mjjay0qgrbmvybf9m15i4zmyd7"; depends=[MASS MCMCpack plyr Rdpack]; }; DQAgui = derive2 { name="DQAgui"; version="0.2.1"; sha256="0k2nzkah8bjpipwaind5h1l7hpx4115kjwzncblwl5s63l7bg2gd"; depends=[data_table daterangepicker DIZtools DIZutils DQAstats DT jsonlite knitr lubridate magrittr parsedate shiny shinyalert shinydashboard shinyFiles shinyjs shinyWidgets waiter]; }; DQAstats = derive2 { name="DQAstats"; version="0.3.1"; sha256="1yyfab37rqfm77pb89vfkks5rz8il27h1kqlg6lq1q8sf2jqb2hn"; depends=[data_table DIZtools DIZutils future future_apply jsonlite kableExtra knitr magrittr parsedate rmarkdown tinytex]; }; - DR_SC = derive2 { name="DR.SC"; version="2.9"; sha256="0n2dv5ja7fyj54cd9y30mqyna3hdniwsk9xdjix6bgl1h0sj6phc"; depends=[CompQuadForm cowplot ggplot2 GiRaF MASS Matrix mclust purrr RColorBrewer Rcpp RcppArmadillo S4Vectors Seurat spatstat_geom]; }; + DR_SC = derive2 { name="DR.SC"; version="3.0"; sha256="0mbq5mjgkn807zd5nkpd2j29v0kz4q6jw09cnzavgr1gqza1pbix"; depends=[CompQuadForm cowplot ggplot2 GiRaF irlba MASS Matrix mclust purrr RColorBrewer Rcpp RcppArmadillo S4Vectors Seurat spatstat_geom]; }; DRAYL = derive2 { name="DRAYL"; version="1.0"; sha256="0cf5pyx6nwh8srdylpnmymv3dr67fm6qqpwd1hvj1wmyfc8fznpp"; depends=[cubature pracma RConics rmutil]; }; DRDID = derive2 { name="DRDID"; version="1.0.4"; sha256="09dpl6fcl557vwhcr4zs5fdyfdd65jzj3hznkf1g138szpzqnphf"; depends=[BMisc trust]; }; DRDRtest = derive2 { name="DRDRtest"; version="0.1"; sha256="1vrvwr441w526a80s0r2fwqlllvn05ir8v2152jz2wxrwhnpq1s0"; depends=[KernSmooth SuperLearner]; }; DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; }; - DRHotNet = derive2 { name="DRHotNet"; version="2.0"; sha256="1hj321qy6jvdicxksnrkzwhdgzjs7pl1bxj6bm0135qjpfmj3v8m"; depends=[maptools PBSmapping raster sp spatstat spatstat_core spatstat_geom spatstat_linnet spdep]; }; + DRHotNet = derive2 { name="DRHotNet"; version="2.1"; sha256="0w1bi7amr0701m6gx9b4pm35qs4my9dgs1dwh2qklrk8b29jv2b3"; depends=[maptools PBSmapping raster sp spatstat spatstat_geom spatstat_linnet spdep]; }; DRIP = derive2 { name="DRIP"; version="1.7"; sha256="1926qmxxmmhbr6hwn4jkm553h5lj84g37rgvjy36kb4b8vpnlkd5"; depends=[]; }; DRR = derive2 { name="DRR"; version="0.0.4"; sha256="1y70si1gig4l7jx5jiqsqliyywfsvimkx53x3zh1lc3yj2j6bqwk"; depends=[CVST kernlab Matrix]; }; DRaWR = derive2 { name="DRaWR"; version="1.0.3"; sha256="1pschc911zrcgy6vmh9aylz79qfifxvxrm5gxwah7xv50plpar78"; depends=[Matrix ROCR]; }; @@ -1151,7 +1155,7 @@ in with self; { DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; }; DTRlearn2 = derive2 { name="DTRlearn2"; version="1.1"; sha256="0l756zb1wkpa1z5zjkc8jndmh2630gckxxfqslabzjmgsjf7fjgm"; depends=[foreach glmnet kernlab MASS Matrix]; }; DTRreg = derive2 { name="DTRreg"; version="1.7"; sha256="0fr2c8fg1acs2kk0r67zml5fp71mvxw116ixqf7yq34n9ljd5yph"; depends=[dplyr MASS]; }; - DTSEA = derive2 { name="DTSEA"; version="0.0.2"; sha256="00jndqn4vyjymy6ys2rqxqd1fwf6bdqiv831g905k6nczxh8d7wv"; depends=[dplyr fgsea igraph magrittr tibble tidyr]; }; + DTSEA = derive2 { name="DTSEA"; version="0.0.3"; sha256="1f1di9ypq6f0929pq15xncf7zw16wlqap4rchbia27n39cv15dni"; depends=[BiocParallel dplyr fgsea igraph magrittr stringr tibble tidyr]; }; DTSg = derive2 { name="DTSg"; version="1.1.1"; sha256="1pg3xqkwv75pla3x3vdffmvzsjcaq5b91svykrr8q25p3ikfj6b6"; depends=[checkmate data_table R6]; }; DTWBI = derive2 { name="DTWBI"; version="1.1"; sha256="06lp4yc5nhacrgic78l014g2w1ibwgs8dp8zrahk5aripaczl25y"; depends=[dtw e1071 entropy lsa rlist]; }; DTWUMI = derive2 { name="DTWUMI"; version="1.0"; sha256="0pybgbfs2yp2ljbs0kra5z70x3llkiwdngp6cadgs3j9rar4vq4q"; depends=[dtw DTWBI e1071 entropy lsa rlist]; }; @@ -1184,18 +1188,18 @@ in with self; { DataViz = derive2 { name="DataViz"; version="0.2.8"; sha256="1dr5nvdzc63x9ymlysvv5i8b7zcffq13pa39q0ychdwr1s3x7vzw"; depends=[Rcpp tibble]; }; DatabaseConnector = derive2 { name="DatabaseConnector"; version="5.1.0"; sha256="0vc6rszv148qcjc8j4snskw9xlxb1mk3hbi3lnwllp9vxydqw1yf"; 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]; }; + DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.1.6"; sha256="0i96664h4d6b76xk7c2vdma2am627acfzr79wyy8i17ciis452ph"; 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.2-0"; sha256="0n2pqipv0b1w2zjvycms0kyk7h8ps49f5jlzgyxhy9dlyr0ivaml"; depends=[mathjaxr]; }; DeCAFS = derive2 { name="DeCAFS"; version="3.3.1"; sha256="1508pl1jwp9ypfg31ygyrx1abckivv3xb69qd7hq6w1xvlkc83qr"; depends=[ggplot2 Rcpp robustbase]; }; DeRezende_Ferreira = derive2 { name="DeRezende.Ferreira"; version="0.1.0"; sha256="05c99z3hlwwm0p02cl9z6gjwfxfq2b2qn90l85270bi16llgf42h"; depends=[xts]; }; DeclareDesign = derive2 { name="DeclareDesign"; version="1.0.0"; sha256="151139zq0sx4mlskc054jn408j90l8603shrwx1qcgr2dljbwnfh"; depends=[estimatr fabricatr generics randomizr rlang]; }; - DecomposeR = derive2 { name="DecomposeR"; version="1.0.4"; sha256="0px999jzxnsl9mg4nch0zwzfjpm5mfj1yk5q42vbb7q42iv1ifbf"; depends=[colorRamps dplyr hexbin hht StratigrapheR tictoc usethis]; }; + DecomposeR = derive2 { name="DecomposeR"; version="1.0.5"; sha256="011j577gslh8nfykpxph4bprvv48nw9asy2j40dw016ai07h8n0s"; depends=[colorRamps dplyr hexbin StratigrapheR tictoc usethis]; }; DecorateR = derive2 { name="DecorateR"; version="0.1.2"; sha256="1za2qvdq96f75rmnm421xmq8s01ny4666ghv14i72iy3s4ml2hq9"; depends=[rJava RWeka RWekajars]; }; Deducer = derive2 { name="Deducer"; version="0.7-9"; sha256="14kakyf28i654pndlswjzp6h3h7szpznrg6xznqg150mmn0bs3s6"; depends=[car e1071 effects foreign ggplot2 JGR MASS multcomp plyr rJava scales]; }; DeductiveR = derive2 { name="DeductiveR"; version="1.0.0"; sha256="0bx1ad2gw0pf03z0im31mzaa26jxwws6fkbcj319kd8b4s4wp92y"; depends=[dplyr ggplot2 moments reshape2]; }; Delaporte = derive2 { name="Delaporte"; version="8.0.3"; sha256="1d1jkbxlwnqznh9pkjpkr7np2nmqzjvrdmlb210y1lb08mqmb73w"; depends=[]; }; - DelayedEffect_Design = derive2 { name="DelayedEffect.Design"; version="0.0.4"; sha256="0n1dw9bqisfarg7him49mzqn60gcfr660d5x9k6b37r12dnmy48v"; depends=[msm survival]; }; + DelayedEffect_Design = derive2 { name="DelayedEffect.Design"; version="1.1.2"; sha256="1qx82r04d0bnr8k961fgp4rmy62rw0xfzzdamyfc8f5r92lk18yr"; depends=[]; }; Delta = derive2 { name="Delta"; version="0.2.0.3"; sha256="0bi9qca4ky481zycp8r7ihvqfjkpvi7hb9wrjsw9avawqa6ck9bv"; depends=[]; }; DeltaMAN = derive2 { name="DeltaMAN"; version="0.5.0"; sha256="08barq4s7m3migjs80207n6l10pr3v2hb1dy72fi59j9x9xgnn4v"; depends=[knitr shiny shinyBS shinyMatrix xtable]; }; DemoDecomp = derive2 { name="DemoDecomp"; version="1.0.1"; sha256="0m24ld8s3ph8qcbkqma5y5k5nv0d0vgb7wz8q20gxnfbj2kbcvjv"; depends=[Rdpack]; }; @@ -1205,6 +1209,7 @@ in with self; { DendroSync = derive2 { name="DendroSync"; version="0.1.4"; sha256="0jypfdjcjqv2vd3l52hq696gdni303dw5l0nq9hhngc18v2imqa2"; depends=[ggplot2 gridExtra nlme]; }; DensParcorr = derive2 { name="DensParcorr"; version="1.1"; sha256="1ifkg7cpimf27yhr60rks77r16kmhwa5h10wv7b64sbfncnyzfmj"; depends=[clime gplots]; }; DepLogo = derive2 { name="DepLogo"; version="1.2"; sha256="13y3akmrj5x1mn1sgha1jryzswg4kqxwswbm3m5z92mcm2zw4r9l"; depends=[]; }; + DependencyReviewer = derive2 { name="DependencyReviewer"; version="1.0.0"; sha256="1pa5cvh29kvv80nfganfd16xmrwpp51qwy6q0qwk0y8wy66isd26"; depends=[cli desc dplyr DT GGally ggplot2 ggraph glue here knitr lintr magrittr pak readr rlang shiny shinyAce stringr tidygraph tidyverse]; }; 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.47"; sha256="0dd1n2dwyh8sdsmmsqj670hmawffqck35qdanrgb4yfcc0zzmd1j"; depends=[BH boot data_table Exact expm gld httr MASS mvtnorm Rcpp readxl rstudioapi]; }; @@ -1219,7 +1224,6 @@ in with self; { DetLifeInsurance = derive2 { name="DetLifeInsurance"; version="0.1.3"; sha256="15yh66mn84cm5ix99lg5lp783dp8il03dyirkhil7m5pwzss42r4"; depends=[]; }; DetMCD = derive2 { name="DetMCD"; version="0.0.5"; sha256="034wb5hwpikli6h2rwiqr19qvzxrr4qwi4q436y7c5a5wgkfzgl5"; depends=[pcaPP Rcpp RcppEigen robustbase]; }; DetR = derive2 { name="DetR"; version="0.0.5"; sha256="1dd4nzkgj5pl9397aa0z3q5fpl27xbdf7q0pqbs821dyynylxzn9"; depends=[MASS pcaPP Rcpp RcppEigen robustbase]; }; - DetSel = derive2 { name="DetSel"; version="1.0.4"; sha256="01mpjy1cmgbrchdjl0gmrq3zx3mlkznml1qcradj2v5mgz26ifrv"; depends=[ash]; }; DevTreatRules = derive2 { name="DevTreatRules"; version="1.1.0"; sha256="1h4p78mwl5ir31hfb38x1dwq5xxbdlsasvk5vxa3c7xdvhsd2yrf"; depends=[DynTxRegime glmnet modelObj]; }; Devore7 = derive2 { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[lattice MASS]; }; Dforest = derive2 { name="Dforest"; version="0.4.2"; sha256="19jyph2zqfyq9vv22kb6fqy89l0vcviv19zgk10hbd7q850f6ryn"; depends=[ggplot2 rpart]; }; @@ -1240,7 +1244,6 @@ in with self; { DidacticBoost = derive2 { name="DidacticBoost"; version="0.1.1"; sha256="0z1h61n6nfjvb64fgkzi1sq7ag747crhh593hxkx0cpza29778rz"; depends=[rpart]; }; Diderot = derive2 { name="Diderot"; version="0.13"; sha256="04d1drxn99r0fqq3zym7yyip9c8rfqhghq20q4zyb42l3hfgv9ai"; depends=[data_table doParallel foreach igraph RCurl splitstackshape stringi]; }; DiffCorr = derive2 { name="DiffCorr"; version="0.4.2"; sha256="0q7slvyqajbr1pa4k3dc7jfn6qi6i2fnvh7hl49qi3a60yr55mir"; depends=[fdrtool igraph multtest pcaMethods]; }; - DiffNet = derive2 { name="DiffNet"; version="1.0-0"; sha256="04dvf0qxnc6jizwfjxw731j7d2fxyapk06rmqvga6h3p075q0mqk"; depends=[data_table doParallel foreach gplots Hmisc igraph lsa Matrix qlcMatrix Rcpp RcppEigen]; }; DiffXTables = derive2 { name="DiffXTables"; version="0.1.3"; sha256="0a0q1fz80jlcrk4rw70yjb8djxgsm5axih45vi4dqpg6n8xlrzw2"; depends=[pander Rdpack]; }; DirStats = derive2 { name="DirStats"; version="0.1.8"; sha256="0drk6b7nncsydvikxy2jh7kmsjvkwx32csh0r8ygn9hdqliw4pfk"; depends=[movMF rotasym]; }; Dire = derive2 { name="Dire"; version="2.1.0"; sha256="1hpa8mgb7mpnq679qbb37wll9ng1ar4zbqr0ca16kn26rg95ywbp"; depends=[foreach haven iterators MASS Matrix Rcpp RcppArmadillo]; }; @@ -1260,7 +1263,8 @@ in with self; { 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.2"; sha256="0aws4qs6802y42m07ca9m4i0lza282g6kfzx64q652y52md862gk"; depends=[colourpicker dplyr DT extraDistr ggplot2 rio scales shiny shinyalert shinyBS shinyjs shinyWidgets stringi stringr]; }; - Distance = derive2 { name="Distance"; version="1.0.6"; sha256="07cqamddcycyjwppnxjccyq33nycb9kf76irfr8x634wr9ybwn4k"; depends=[dplyr mrds rlang]; }; + Distance = derive2 { name="Distance"; version="1.0.7"; sha256="1ilp1gmxk92ycipzzvwpnry62kw0jdfch3ga2y0jhxsbp41km13p"; depends=[dplyr mrds rlang]; }; + DistatisR = derive2 { name="DistatisR"; version="1.1.1"; sha256="0r8gp84kbl8kbsw3kbp8sk0xc2gav074qc9qlkq06bp0sxycwhyw"; depends=[car dplyr prettyGraphs readxl tidytext]; }; DistributionFitR = derive2 { name="DistributionFitR"; version="0.1"; sha256="0wg43gqsdy1ja0l489k27k9q1w2zq45wzmqnv9wfc734rf8kvlba"; depends=[doParallel foreach stringr]; }; DistributionOptimization = derive2 { name="DistributionOptimization"; version="1.2.6"; sha256="0pp0f7c9szyx426bnnz4fz4vh5q73m8x896z6pqgx04b6v445361"; depends=[AdaptGauss GA ggplot2 pracma]; }; DistributionTest = derive2 { name="DistributionTest"; version="1.1"; sha256="11xhr6yv42s1i4qqlb1pvzm8q2116v10gjlkhl0ml3id6lx27nmj"; depends=[MASS]; }; @@ -1279,7 +1283,7 @@ in with self; { DoseFinding = derive2 { name="DoseFinding"; version="1.0-2"; sha256="15wpr8wiqjar9hlgcv8y2gjxv6531q3b69jxh2kq10k7bni3rshb"; depends=[lattice mvtnorm]; }; DoubleCone = derive2 { name="DoubleCone"; version="1.1"; sha256="1kbvsj93nn2306s6pgqiiznmlcn2nqsgcxinihl613ivczxhzpqg"; depends=[coneproj MASS Matrix]; }; DoubleExpSeq = derive2 { name="DoubleExpSeq"; version="1.1"; sha256="00xpj5xmpgmvp6h76imkmghrnlfk6c50ydvv0jram6m6ix3z8323"; depends=[numDeriv]; }; - DoubleML = derive2 { name="DoubleML"; version="0.5.1"; sha256="0v4dyjgs1gim06cjv1hi7n2zpjzj16405rh24rvcixr60n8gzqh5"; depends=[checkmate clusterGeneration data_table mlr3 mlr3learners mlr3misc mlr3tuning mvtnorm R6 readstata13]; }; + DoubleML = derive2 { name="DoubleML"; version="0.5.2"; sha256="1984slxllcl9kk7zch8xz8w1asnnqscf4mn0cy3wqbl7vd8dc01z"; 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.6"; sha256="1623h8s6y4klq8xmj480ga2wl6n4c2f26v1dwysyvcrk6lnaghdm"; depends=[ade4 coda MASS Matrix rstan sde]; }; @@ -1288,19 +1292,19 @@ in with self; { DramaAnalysis = derive2 { name="DramaAnalysis"; version="3.0.2"; sha256="0nsnwais0r592c50nphfzkr1bbygl67mriwsx7dxbvmpdsswlvl1"; depends=[data_table git2r httr readr reshape2 stringr tokenizers xml2]; }; DriftBurstHypothesis = derive2 { name="DriftBurstHypothesis"; version="0.4.0.1"; sha256="1pmsbv1rl79s520nxj536m8gf7xyfjskj8r88rxmxscbgp8c1xz2"; depends=[Rcpp RcppArmadillo xts zoo]; }; DrillR = derive2 { name="DrillR"; version="0.1"; sha256="0n7pim5kk0wfdjcc67v4vvdb7wyhn5bcgi2a12nbyfyydss7pk1g"; depends=[httr]; }; - DriveML = derive2 { name="DriveML"; version="0.1.4"; sha256="0177bglwzxsglv5aaddl03fvxyq31ikcwfyws36jg8q8s7p60w49"; depends=[caTools data_table ggplot2 iml mlr ParamHelpers rmarkdown sampling SmartEDA]; }; + DriveML = derive2 { name="DriveML"; version="0.1.5"; sha256="0gbrrlz40cs95ml92k7q1lrxkm9iv5bjsr2sy9c7jzygnrlmnmms"; depends=[caTools data_table ggplot2 iml mlr ParamHelpers rmarkdown sampling SmartEDA]; }; DrugClust = derive2 { name="DrugClust"; version="0.2"; sha256="0acvjqwzkbjmy101m501l7fkfxzkp6zflwvn56li5307xv9ggnfg"; depends=[cclust cluster e1071 MESS ROCR]; }; + DrugSim2DR = derive2 { name="DrugSim2DR"; version="0.1.0"; sha256="16m1gqs5m7pi8nlr6n8wh7dk3wjjiwhiqm96h8jxavfizv0bkj6n"; depends=[ChemmineR igraph pheatmap reshape2 rvest sp tidyr]; }; DstarM = derive2 { name="DstarM"; version="0.4.0"; sha256="0wm5kr2pkgbvh9svjq8zq46zn50hwf58rs3y1ybnwcfjc2q75h1s"; depends=[DEoptim ggplot2 Rcpp RcppArmadillo rtdists RWiener]; }; DtD = derive2 { name="DtD"; version="0.2.2"; sha256="1czspjdxjhbfk2df7wk0x3d1ilwrjqw4s4gdc4hq0gjcjqyx0c39"; depends=[checkmate Rcpp RcppArmadillo]; }; DySS = derive2 { name="DySS"; version="1.0"; sha256="1aa67m224bhzzg089rhxwqgbmwwq5py8ikix8khwraz5cnjz2f83"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo]; }; Dykstra = derive2 { name="Dykstra"; version="1.0-0"; sha256="1rc1409ky0ysqr3ccq28yhbs94m6d0z2dfa66k4c7irxjvbagwz6"; depends=[]; }; DynClust = derive2 { name="DynClust"; version="3.24"; sha256="0nbbzx0ixblpcbjxx0gp7082nz6nh5vc2l5nzdfq1mqzlq9jy2xn"; depends=[]; }; - DynComm = derive2 { name="DynComm"; version="2020.1.6"; sha256="09nhcp9rldwrybwhyg86mgpgwq4hzlpp4rm5a5gl33nnhvcdm0mx"; depends=[igraph Rcpp Rdpack]; }; - DynForest = derive2 { name="DynForest"; version="1.0.0"; sha256="1ldwhn971sr6cxbk2z5kd6wfwqhv5bjcb5rqzf29wqskqb5rjh4p"; depends=[cmprsk DescTools doParallel foreach ggplot2 lcmm pbapply pec prodlim stringr survival zoo]; }; + DynForest = derive2 { name="DynForest"; version="1.1.0"; sha256="0fnszfbk2gkgff48cv6ij87w44hspkw62flvgvkwf6hlbb5j64k7"; depends=[cmprsk DescTools doParallel foreach ggplot2 lcmm pbapply pec prodlim stringr survival zoo]; }; DynNom = derive2 { name="DynNom"; version="5.0.2"; sha256="1zs8chdw83qjsi5k1m9cvk48swqz3gadycmhk4prxmjzwcl5z4i1"; depends=[BBmisc compare dplyr ggplot2 magrittr plotly prediction rms shiny stargazer survival]; }; DynTxRegime = derive2 { name="DynTxRegime"; version="4.11"; sha256="181hmfkv0sgxlllfhx0rwl57r1ql2iy19iipsrvkabflqhzdr8cc"; depends=[dfoptim kernlab modelObj rgenoud]; }; DynaRankR = derive2 { name="DynaRankR"; version="1.1.0"; sha256="1fzicainh1dm016cglm2x6j1i2g5r71vgrj0dnsflbxc5v426sqm"; depends=[dplyr rlang]; }; - DynamicGP = derive2 { name="DynamicGP"; version="1.1-8"; sha256="1ivrxm0asagvp0ay6hp1l29fv3mcfmad938mwxdcq3iaaj31ilvc"; depends=[lhs]; }; + DynamicGP = derive2 { name="DynamicGP"; version="1.1-9"; sha256="00hf3r39b9xid129kzgdnwdfrwrspxkz7dydgna3c5lrl7670paz"; depends=[lhs]; }; DynareR = derive2 { name="DynareR"; version="0.1.3"; sha256="06n0gsbn8gphsirj3l1izd84dnjnik6n5l4vkp8flkzynccx3rps"; depends=[kableExtra knitr magrittr]; }; DysPIA = derive2 { name="DysPIA"; version="1.3"; sha256="0ih8sl89h6xbmmjjsbxcvgp6wqk7f1wqzwkc43k3i5w7fgb0hlpc"; depends=[BiocParallel data_table DysPIAData fastmatch parmigene Rcpp]; }; DysPIAData = derive2 { name="DysPIAData"; version="0.1.2"; sha256="1i4z9xhnzih7jnj3l1d6wpgfsayb452sh4q99w2npg1iipsjb1vl"; depends=[]; }; @@ -1314,12 +1318,13 @@ in with self; { ECGofTestDx = derive2 { name="ECGofTestDx"; version="0.4"; sha256="0y8bw1k9spwxyzc7vsi2iblnmjsidxbybjrzzh2j6frjmv3rk4g1"; depends=[bootstrap orthopolynom]; }; ECLRMC = derive2 { name="ECLRMC"; version="1.0"; sha256="01z2hmbpb754s2rsvx3i5wf7kkkr2mvs2g89ih2bqrif7w5rmgyg"; depends=[softImpute]; }; ECOSolveR = derive2 { name="ECOSolveR"; version="0.5.4"; sha256="0973m346vakgddp92dzqlky0wa196hj341r9y7rz67bc2zl8jx2x"; depends=[]; }; - ECOTOXr = derive2 { name="ECOTOXr"; version="0.1.1"; sha256="1pwncfvjcaniixc3iljjapp1d2pvf5xqj060jbf9bpdfyn6lrcdj"; depends=[crayon dplyr rappdirs readr RSQLite rvest stringr]; }; + ECOTOXr = derive2 { name="ECOTOXr"; version="0.2.0"; sha256="0gpzf957ya02695ga8cv3mw17jb027w10pjxq9r5ziky54wnh7qh"; depends=[crayon dbplyr dplyr httr purrr rappdirs readr rlang RSQLite rvest stringr tibble tidyr tidyselect]; }; ECTTDNN = derive2 { name="ECTTDNN"; version="0.1.0"; sha256="1ddwf040yp4c7nxvivml0xhad5qdc6jlf17c1lh4mssm5c0pp14w"; depends=[forecast urca vars]; }; ECctmc = derive2 { name="ECctmc"; version="0.2.5"; sha256="0prryvc17bm1xrhzlqk2w9nj181bg99j1dph3d36h0n1vfq1d7if"; depends=[Rcpp RcppArmadillo]; }; ECharts2Shiny = derive2 { name="ECharts2Shiny"; version="0.2.13"; sha256="0dq8ja4ydxnc7qx35qhh9ryqgi7ambwz6ka2821mmq3p994crswn"; depends=[jsonlite shiny]; }; ECoL = derive2 { name="ECoL"; version="0.3.0"; sha256="02j4yl6hi83f6m529r6n0gaz8wsy2pi0ncy2g95fjhs8ib0kfn4f"; depends=[cluster e1071 FNN igraph MASS]; }; EDA = derive2 { name="EDA"; version="1.3"; sha256="08zqykvga7w07iy00c94q03mrxmjv649ggk7lmksjzy5j3wgyb6d"; depends=[ggplot2]; }; + EDCimport = derive2 { name="EDCimport"; version="0.2.1"; sha256="1d80dsfi94yg95lcnq60nnfpfd2bphqrd68k7ilcs809v95da4nx"; depends=[cli dplyr forcats glue haven labelled purrr readr rlang stringr tibble tidyr]; }; EDFtest = derive2 { name="EDFtest"; version="0.1.0"; sha256="1z6ayi0513ibyk0gjfxcd1rybp5374xhbf9zkkm669wdmfggx26h"; depends=[CompQuadForm rmutil]; }; EDISON = derive2 { name="EDISON"; version="1.1.1"; sha256="12cc13ng5fc4nm0nvqxqplpb2ycz4cln73xqkk85dka2fnpykjc7"; depends=[corpcor MASS]; }; EDIutils = derive2 { name="EDIutils"; version="1.0.2"; sha256="1yfn26js5sdr7k07s45mqxla6apzb4ykwa5pa634zgivqs6g9jry"; depends=[curl httr jsonlite xml2]; }; @@ -1341,12 +1346,12 @@ in with self; { EGAnet = derive2 { name="EGAnet"; version="1.2.3"; sha256="10vfv8fkk8kfcspp4p8avz16ipj58231q43rzrmwmcfx362q3g48"; depends=[GGally ggdendro ggplot2 ggpubr glasso igraph lavaan Matrix matrixcalc network OpenMx pbapply qgraph semPlot]; }; EGRET = derive2 { name="EGRET"; version="3.0.7"; sha256="1fxpcdsq7njf1hjy3a4i0fx0ah9v7jzmdwg4c7009nikyhx5ri6x"; depends=[dataRetrieval fields foreach MASS survival truncnorm]; }; EGRETci = derive2 { name="EGRETci"; version="2.0.4"; sha256="1g01a03smn5yp261cyk3x310m1mcv4bqyh8y123wam9gpa7dxrp6"; depends=[binom EGRET]; }; + EGRNi = derive2 { name="EGRNi"; version="0.1.6"; sha256="0wgdhlmnch6gpypqlwd5z56ia03lbbimr4ci9gcfs8f881dh92dy"; depends=[fdrtool gdata MASS readr]; }; EHR = derive2 { name="EHR"; version="0.4-10"; sha256="062smk24f3jv7m0833h6nygrk7pq3n85a5sq1j752i0z1j2px3np"; 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.3"; sha256="0cx8x16jn8pfik7yd6vfqh23fqlfxnfj3ya42h5zbvsbka8rislh"; depends=[httr XML xts zoo]; }; 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.1"; sha256="0a6zbsq37miy7mv1b2gn3nlddlxpl6v5338lqxa2hn8ykj4vbs63"; 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]; }; @@ -1362,7 +1367,7 @@ in with self; { EMDANNhybrid = derive2 { name="EMDANNhybrid"; version="0.1.0"; sha256="0mm5zfkrja9pz58psp7b6r1lpixaa9y685xxv9srv9l9cl8d892j"; depends=[EMD forecast nnfor]; }; EMDSVRhybrid = derive2 { name="EMDSVRhybrid"; version="0.1.0"; sha256="0wis8dh4xd5xldrrfzfr625pix2fvp139q6kj9ff2m6p5wafiabw"; depends=[e1071 EMD]; }; EML = derive2 { name="EML"; version="2.0.6.1"; sha256="1k2chfz6qixa6jsikqgilqp8j49mcshn725ck1h77bacfxfhf7za"; depends=[digest dplyr emld jqr jsonlite rmarkdown uuid xml2]; }; - EMLI = derive2 { name="EMLI"; version="0.1.0"; sha256="17gcrqw3dnv48jiqxldf0y00ncr75521r4cp4p4q0v2cj3h6fl2h"; depends=[]; }; + EMLI = derive2 { name="EMLI"; version="0.2.0"; sha256="0zwbbxsmkyrgmva5h8l78f181nz5asc7dpdcmajvj2y3yl1rb278"; depends=[]; }; EMMAgeo = derive2 { name="EMMAgeo"; version="0.9.7"; sha256="1wz4zw45xfqbk589cpd188j7619h2ar2czfkisil9x8ksijfixls"; depends=[caTools GPArotation limSolve matrixStats shiny]; }; EMMIXSSL = derive2 { name="EMMIXSSL"; version="1.1.1"; sha256="1z8mqh4d0vlxhk2mvpxwypr5labra3z4xsvpm4li1v4hga791h0v"; depends=[mvtnorm]; }; EMMIXgene = derive2 { name="EMMIXgene"; version="0.1.3"; sha256="0a5q78s9y6ba1641lrv87kglg39x9wbk5xg7ihzbpl4adrb5sz4f"; depends=[BH ggplot2 mclust Rcpp RcppArmadillo reshape scales]; }; @@ -1375,10 +1380,9 @@ in with self; { EMSS = derive2 { name="EMSS"; version="1.1.1"; sha256="0zkr2xfvwlqxcfj59801vm54l38agipbkd9qgq6jkmqkdbkfv3yr"; depends=[mvtnorm sampleSelection]; }; EMSaov = derive2 { name="EMSaov"; version="2.3"; sha256="1hpvwimhkl7za5s8j9n4a8883vy89jrxrhlh0k3cfprnndh4zz05"; depends=[shiny]; }; EMT = derive2 { name="EMT"; version="1.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.6"; sha256="0idjq7jk1yrbk9w0799x991n1sj71j09hkgn6dhwshgpyxh7c4qj"; depends=[dismo ENMeval forcats ggplot2 ggpubr gridExtra knitr lhs magrittr raster rgdal rgeos sp spatstat_geom spatstat_random]; }; + ENMTools = derive2 { name="ENMTools"; version="1.0.7"; sha256="1sm64c9d5ph8sp5lzkzkd93iy8hls73xfshvjgnmqmd6zh4xp70g"; 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=[]; }; EPT = derive2 { name="EPT"; version="0.7.6"; sha256="1hkisfisi63dd9lai662y387av1g77fkbai0p2a346n8zgahysji"; depends=[]; }; @@ -1390,7 +1394,8 @@ in with self; { ERSA = derive2 { name="ERSA"; version="0.1.3"; sha256="0djh633vmc89vl4bp7p4bazlb0pshpd2yckfj0yjk6vc9lrbql69"; depends=[broom car combinat dplyr ggplot2 leaps miniUI purrr RColorBrewer shiny tidyr]; }; ESG = derive2 { name="ESG"; version="1.2"; sha256="17kw82dikcibqsdb1fvbx2x2f3shzbqggygabprcvwki8bg9hgni"; depends=[]; }; 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.9"; sha256="11sv5slr3s6w82ksgbw0qlzi9palznbzprq2n9iiifxz6ff5drvd"; depends=[fields goftest lattice maps Rcpp spatstat_core spatstat_geom spatstat_random]; }; + EScvtmle = derive2 { name="EScvtmle"; version="0.0.1"; sha256="09sh9njnrv8bh6xlni3jmhwrp3yb6xxfx6di2ykam6mi50djknbf"; depends=[dplyr ggplot2 gridExtra MASS origami stringr SuperLearner tidyselect]; }; + ETAS = derive2 { name="ETAS"; version="0.5.1"; sha256="03721z7fsbkqv5wiybm01nxbl99x8wf2214y3w139k0zr42xk94s"; depends=[fields goftest lattice maps Rcpp spatstat_explore spatstat_geom spatstat_random]; }; ETC = derive2 { name="ETC"; version="1.5"; sha256="16ciff8bf2p56941r83y7405sp5pfms63dwjd232ih3mnznjpc0f"; depends=[mvtnorm]; }; ETLUtils = derive2 { name="ETLUtils"; version="1.5"; sha256="0s0q4f3wzpdd87l3pnzysa8aq7zgz29589xnm65a6xfy9znbpzs3"; depends=[bit ff]; }; EUfootball = derive2 { name="EUfootball"; version="0.0.1"; sha256="0h36cqi752zs32gs55rdniabldr8jph7gc1y2yb9983cl4mfrjv0"; depends=[]; }; @@ -1401,7 +1406,7 @@ in with self; { EXRQ = derive2 { name="EXRQ"; version="1.0"; sha256="1iqsr52sl2j5q03122a7rsp6n6a2bkysk2r908c89l36gk4sj2i5"; depends=[mnormt quantreg]; }; EZtune = derive2 { name="EZtune"; version="3.1.1"; sha256="0scslbgbbwma7sr0w9awg58ly5jwn877xsk6q1gq0ss3rd17pmfk"; depends=[ada BiocStyle e1071 GA gbm glmnet optimx ROCR rpart]; }; 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]; }; - Ease = derive2 { name="Ease"; version="0.1.1"; sha256="1aydwpb5wl3jvqkgf9gp4cc72rmh6206ci6p4v77jwbyzak53ldc"; depends=[Rcpp RcppProgress]; }; + Ease = derive2 { name="Ease"; version="0.1.2"; sha256="0llx3pdpzjsw94nk62h6cif4gn97rhbq38vsqpdarx201q8qq2qx"; depends=[Rcpp RcppProgress]; }; EasyABC = derive2 { name="EasyABC"; version="1.5"; sha256="17qv6y8sf2iwwqcv5wfg6sii259gv5jyr72dnfpir2bw78wb3mqx"; depends=[abc lhs MASS mnormt pls tensorA]; }; 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]; }; @@ -1409,6 +1414,7 @@ in with self; { Ecdat = derive2 { name="Ecdat"; version="0.4-2"; sha256="1vyc4ynkd65mng2x8wvzn47crsvaqfz97n89jxn12xv13bpsbs7c"; depends=[Ecfun]; }; Ecfun = derive2 { name="Ecfun"; version="0.3-2"; sha256="1q0mx70hy18rabpabxghaixkb3r1432cxln844cac4dqxhvzcqgy"; depends=[BMA fda jpeg MASS mvtnorm rvest stringi TeachingDemos tis xml2]; }; EcoDiet = derive2 { name="EcoDiet"; version="1.0.1"; sha256="1yc120fs4bprn9ifh59n6y671wa5vi7r6k0ldp9fzy5asax00ds8"; depends=[coda ggplot2 rjags]; }; + EcoEnsemble = derive2 { name="EcoEnsemble"; version="1.0.1"; sha256="1b0zm8d4dc2drdy08s5gskjdjl0i91ng78xk6aga17bjgm5hjqsi"; depends=[BH cowplot dplyr ggplot2 matrixcalc Rcpp RcppEigen RcppParallel reshape2 rstan rstantools StanHeaders tibble]; }; EcoIndR = derive2 { name="EcoIndR"; version="1.8"; sha256="008wgp9zc8a8knz9ighgavrdm0yf37m5jahnq5kndjhld0359z6h"; depends=[rgeos]; }; EcoNetGen = derive2 { name="EcoNetGen"; version="0.2.3"; sha256="05j8m9vzkwlsw1h69s5myhbg85vyhqdxcl9r5mdwsrk9f58wajmz"; depends=[ggplot2 igraph]; }; EcoTroph = derive2 { name="EcoTroph"; version="1.6.1"; sha256="0nrq6n7amz8l6rk0wfyrih7rkic96yc02rpk4szis81v7yvm7346"; depends=[XML]; }; @@ -1433,7 +1439,7 @@ in with self; { EloSteepness = derive2 { name="EloSteepness"; version="0.4.6"; sha256="09rdiy50zxj61vs1pq522l36g0zkhvrdf6kgb1r11jjryxrik8zq"; depends=[aniDom BH EloRating Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; ElstonStewart = derive2 { name="ElstonStewart"; version="1.2"; sha256="1lsapsz8w8srdqdkxvlg5nsn157wbihxjgdaf53r5iaxzcljkzxc"; depends=[digest kinship2]; }; EmbedSOM = derive2 { name="EmbedSOM"; version="2.1.2"; sha256="0k4hja5y7qd0n3gfaxzxrz4wpxc1w9d4d4xbb63rq2nfk3lj7a42"; depends=[FNN ggplot2 igraph Matrix Rtsne umap uwot]; }; - EmiR = derive2 { name="EmiR"; version="1.0.3"; sha256="0cf05k8iaa18j4hqyz713ibaw03h9pcf440n0yc6l256iq5xwsrx"; depends=[data_table dplyr gganimate ggplot2 mathjaxr plot3D Rcpp RcppProgress Rdpack testthat tibble tictoc tidyr]; }; + EmiR = derive2 { name="EmiR"; version="1.0.4"; sha256="1xhsf9n5af6z7v62vpnqjlp20s6fp7jf1wmgxgv77hxm4g5cm0q7"; depends=[data_table dplyr gganimate ggplot2 mathjaxr plot3D Rcpp RcppProgress Rdpack tibble tictoc tidyr]; }; EmiStatR = derive2 { name="EmiStatR"; version="1.2.3.0"; sha256="1cwzzkynhnpjd1slnifdmkrshfpv99ryilxj27f98kwgbnb6i81a"; depends=[doParallel foreach lattice xts zoo]; }; EmissV = derive2 { name="EmissV"; version="0.665.6.3"; sha256="1cazd2njbiacwwkxrs0qvy6p533wal18s9cjvavxcx0c2607r725"; depends=[data_table ncdf4 raster sf sp units]; }; EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="3.1.1"; sha256="11kam8scb5hbp6bfk41xwjfmrwnvwaba2xksjsw1rdlrfbljs8p1"; depends=[ggplot2 gridExtra Rcpp rlang]; }; @@ -1461,7 +1467,7 @@ in with self; { EpiEstim = derive2 { name="EpiEstim"; version="2.2-4"; sha256="12zv1mlb0gqsvff1s0fvqgxqk42c7y9gz3h94mjmf1wbmhsjcqnf"; depends=[coarseDataTools coda fitdistrplus ggplot2 gridExtra incidence reshape2 scales]; }; EpiILM = derive2 { name="EpiILM"; version="1.5.2"; sha256="0drs4qywx9axs7k5qk7sp5r3g8pykn4lqqbm0hxyl24r6b5l3d6b"; depends=[adaptMCMC coda LaplacesDemon]; }; EpiILMCT = derive2 { name="EpiILMCT"; version="1.1.7"; sha256="1yjcjxf5m1qbb6p09g34wkr4q13g65ly11kxh95r22cdl85jmlq3"; depends=[coda igraph]; }; - EpiInvert = derive2 { name="EpiInvert"; version="0.2.1"; sha256="0ghfs8g4fj4yr8scmvnqbc7j1pj5yjwlvqb2xbkisvvli82qhrk3"; depends=[Rcpp]; }; + EpiInvert = derive2 { name="EpiInvert"; version="0.3.0"; sha256="03xvcrh2gf5rnisq0kza5ny066asjq2igk53a423xq7i09xlr1zg"; depends=[Rcpp]; }; EpiLPS = derive2 { name="EpiLPS"; version="1.0.6"; sha256="0453vi4h988syd9jab0xmy19vl2m8z30jcymc1a1hcfpnw88hl8z"; depends=[coda crayon EpiEstim ggplot2 gridExtra MASS progress Rcpp RcppArmadillo]; }; EpiModel = derive2 { name="EpiModel"; version="2.3.1"; sha256="1fwk6wkqy2z3cv0jhi6mz077qjwlcqhd57lpiv6i6iajizcf4bas"; depends=[ape coda deSolve doParallel dplyr ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer Rcpp rlang statnet_common tergm tibble]; }; EpiReport = derive2 { name="EpiReport"; version="1.0.2"; sha256="1dh9rjdjgmwzvfslzgnmd37ipj7ydbn4pnngz4sw7nknqy7r4dpx"; depends=[dplyr flextable ggplot2 officer png tidyr tidyselect zoo]; }; @@ -1476,7 +1482,7 @@ in with self; { EstMix = derive2 { name="EstMix"; version="1.0.1"; sha256="13zwhxm0qm83c8k5k4slvq2snkmbq1zz3i5cqvxxwhvkb4b8aja4"; depends=[PSCBS Rcpp RcppArmadillo]; }; EstimDiagnostics = derive2 { name="EstimDiagnostics"; version="0.0.3"; sha256="036kz4zdrgqab2mbzxmbknr9314ap5b2dp75syqhg2mmzw3zf3li"; depends=[foreach ggplot2 goftest reshape2 rlang testthat]; }; EstimateGroupNetwork = derive2 { name="EstimateGroupNetwork"; version="0.3.1"; sha256="06ihyiq9dw7yg8qpq3yckpd0jk4gjajgvavbj302sj0qssrxgyzh"; depends=[dplyr ggplot2 igraph qgraph]; }; - EstimationTools = derive2 { name="EstimationTools"; version="2.1.0"; sha256="1dpn4jb746ax3s7p7hkrk85hkxjayxp641vxbfp155v0m2gr8ar2"; depends=[autoimage BBmisc boot DEoptim matrixStats numDeriv Rdpack stringr survival]; }; + EstimationTools = derive2 { name="EstimationTools"; version="4.0.0"; sha256="1hwlrsxl42n4i25f1izhccj755aydl2r98w1jn12z9a62wk9nnzy"; depends=[autoimage BBmisc boot DEoptim GA gaussquad numDeriv Rdpack stringr survival]; }; EthSEQ = derive2 { name="EthSEQ"; version="3.0.0"; sha256="1gmyf0qsixc8nsl9zzk7rb230zjv0p9vvp2zhr5q3xsic594mf1v"; depends=[data_table gdsfmt geometry MASS plot3D Rcpp SNPRelate]; }; EuclideanSD = derive2 { name="EuclideanSD"; version="0.1.0"; sha256="1w5s1zkb81v150nvaygvyla2x0vh4c99vd5jw53jcq68sv9hby3i"; depends=[shiny]; }; EurosarcBayes = derive2 { name="EurosarcBayes"; version="1.1"; sha256="12311s6ibw9q6kykhh689r93r7mwjhwrhkzdpc75grvw6ilgjmpm"; depends=[clinfun data_table plyr shiny VGAM]; }; @@ -1492,7 +1498,7 @@ in with self; { EventWinRatios = derive2 { name="EventWinRatios"; version="1.0.0"; sha256="1hsq4g7hh71lzxzkmhm15mk3xpxaq75rqhgslf4qif6x7pm0p859"; depends=[]; }; EvidenceSynthesis = derive2 { name="EvidenceSynthesis"; version="0.3.0"; sha256="1qpvbs8a1xbm6vim82xxarhmbj999f4wangav5hcnmbwbrvxihxx"; depends=[BeastJar coda Cyclops EmpiricalCalibration ggplot2 gridExtra HDInterval meta rJava rlang survival]; }; EviewsR = derive2 { name="EviewsR"; version="0.1.5"; sha256="0dybfkpg5zr6bh84dh7v4vyxk4xv09v9hv8ijxj0h41mi5zpqap9"; depends=[knitr magrittr xts zoo]; }; - EvoPhylo = derive2 { name="EvoPhylo"; version="0.3"; sha256="102f45wgyxrkz4snmv03z5xjli92z54l9mas38ndpg0fs8czqznv"; depends=[ape cluster deeptime dplyr ggplot2 ggrepel ggtree patchwork Rtsne treeio unglue]; }; + EvoPhylo = derive2 { name="EvoPhylo"; version="0.3.2"; sha256="1jgvvi355dxrjqniwcga7gzfj0jw3hgwbii2cv055rq9z5f442mr"; depends=[ape cluster deeptime devtools dplyr ggplot2 ggrepel ggtree patchwork Rtsne treeio unglue]; }; EvolutionaryGames = derive2 { name="EvolutionaryGames"; version="0.1.2"; sha256="0aaqd4q8imm2wgkgdpwwdl6nxgr3apgb3l24f2lwxgv2y045309d"; depends=[deSolve geometry ggplot2 interp MASS reshape2]; }; Evomorph = derive2 { name="Evomorph"; version="0.9"; sha256="1br2fyggwz2mxpic8sk384xq1lpbpv0j5gf6xyzhkn2n7kfpf6d5"; depends=[geomorph ggplot2 reshape2 stringr]; }; EwR = derive2 { name="EwR"; version="1.4"; sha256="1i0cwyylr1lqilykn1q2y1ad2gawfqkw9c51g04yn061c623pkam"; depends=[]; }; @@ -1508,12 +1514,13 @@ in with self; { ExcessMass = derive2 { name="ExcessMass"; version="1.0.1"; sha256="1ycvv3bm9qq11imc09jhwhb1vb2cbngckmb3ibj4hfl697gaby5v"; depends=[]; }; ExclusionTable = derive2 { name="ExclusionTable"; version="1.0.0"; sha256="1adanj3rnk9vhz89rgl25w10ghm2xn1rl99ilnmpkq5jdblcifkx"; depends=[dplyr magrittr]; }; ExhaustiveSearch = derive2 { name="ExhaustiveSearch"; version="1.0.1"; sha256="1wb3bf1ilml5cilm740rh8ngiybxhxg6h6nzh1rlqd6wgfp17mzh"; depends=[Rcpp RcppArmadillo]; }; + ExomeDepth = derive2 { name="ExomeDepth"; version="1.1.16"; sha256="1r7b9h5i562fa67ghisyw6ciwawfyjwrpn95kdws4dd4gqgbb9kv"; depends=[aod Biostrings dplyr GenomicAlignments GenomicRanges IRanges magrittr Rsamtools VGAM]; }; ExpAnalysis3d = derive2 { name="ExpAnalysis3d"; version="0.1.1"; sha256="0gch9q19l3lqb35vfq1kcrga9jzqvrxr7d6x9lk7nzb78y735wa2"; depends=[crayon fields magrittr plotly]; }; 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]; }; ExpGenetic = derive2 { name="ExpGenetic"; version="0.1.0"; sha256="096cxaqbc9y0bnj70fxk94585c880020pqqcx0dwwj839qkry4ha"; depends=[DESeq2 futile_logger ggplot2 ggsci plyr VennDiagram]; }; - ExpImage = derive2 { name="ExpImage"; version="0.6.0"; sha256="1m6s5prwas82s1ypylwcpmfqkrjskb7ms1592bj4gvvhgmlqc9h3"; depends=[crayon doParallel foreach ggplot2 progress raster rstudioapi schemr]; }; + ExpImage = derive2 { name="ExpImage"; version="0.7.0"; sha256="0wzq10qv6m3r65g8gzv4ikpwmymmf5rspba5slrqrclmpl1wgvn5"; depends=[crayon doParallel foreach ggplot2 progress raster rstudioapi schemr]; }; 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]; }; @@ -1528,7 +1535,7 @@ in with self; { FABInference = derive2 { name="FABInference"; version="0.1"; sha256="0d11vxxa0mry735n7an8n97wmxyffsj4hirxlysljs941zhkhhw4"; depends=[MASS]; }; FACTMLE = derive2 { name="FACTMLE"; version="1.1"; sha256="0qz2i0hnn84bpps1h8jmfkgp5p59axr0wayj9dvl839radrvpqvy"; depends=[rARPACK]; }; FADA = derive2 { name="FADA"; version="1.3.5"; sha256="0srv3rghbkgyxbcjc1v68c5qgcir1d618skpc8imfmdaz9pnxchn"; depends=[corpcor crossval elasticnet glmnet MASS matrixStats mnormt sda sparseLDA]; }; - FADPclust = derive2 { name="FADPclust"; version="0.1.0"; sha256="0b4b77wi25ldrq4w2vqhh3g1sm89ad0ghajfmfaqp84v30d8hcpw"; depends=[cluster fda fda_usc funData MFPCA]; }; + FADPclust = derive2 { name="FADPclust"; version="1.1.1"; sha256="111lpq5hdrpyj8wdscjswk5p4akxhj3jbj5xk6ias2s5gfprla14"; depends=[cluster fda fda_usc fpc funData MFPCA]; }; FAIRmaterials = derive2 { name="FAIRmaterials"; version="0.0.2"; sha256="169hcwjm0plhkqbhz3b5cqgc2nnkibn94cimrs39sn9z62radb7x"; depends=[dplyr glue stringr]; }; FAMT = derive2 { name="FAMT"; version="2.6"; sha256="0msb02fz8blm6wgg31xwwxv8phg35w7844q1xz4v307ixz2qgs1h"; depends=[impute mnormt]; }; FAMetA = derive2 { name="FAMetA"; version="0.1.4"; sha256="1c5y3x06ln1w8nkwmnc13hn8jhj0vbmwbx70kylcf93a1fq5rkbz"; depends=[accucor gplots gtools knitr LipidMS minpack_lm plyr rmarkdown scales tidyr]; }; @@ -1559,17 +1566,17 @@ in with self; { FER = derive2 { name="FER"; version="0.94"; sha256="0319dz0qvk8s9cfngqas3j212bw0f4rzw3gqcd7r7sl0249dla7p"; depends=[statmod]; }; FESta = derive2 { name="FESta"; version="1.0.0"; sha256="1kf5iqw8x8079gjaxicrgax5l798l8hxcc5y83l5pqh0ync5bxm6"; depends=[]; }; FEprovideR = derive2 { name="FEprovideR"; version="1.1"; sha256="02hfdk9qhaq4y19p700w2i7qsdp4z2kyww0pr0pijfivkqks0vpi"; depends=[ggplot2 Matrix poibin]; }; - FFD = derive2 { name="FFD"; version="1.0-8"; sha256="0kb654pvb0z0zpf88yc3dkd8n3qfiqjhdmv9rk5y06f2hjydn0i3"; depends=[R2HTML]; }; + FFD = derive2 { name="FFD"; version="1.0-9"; sha256="1478sxfz4cv43nmvhg0d0w82kmyr4rfhhrrlrq4aanbxnriggkxr"; depends=[R2HTML]; }; FFTrees = derive2 { name="FFTrees"; version="1.7.5"; sha256="0aqi8r5nrsvlzlw9aiqmqk8r0h5nng3cj57h23a3iqgzv7nwb443"; depends=[caret crayon dplyr e1071 knitr magrittr progress randomForest rpart scales stringr testthat tibble tidyselect]; }; - FFdownload = derive2 { name="FFdownload"; version="1.0.6"; sha256="1n5mmx7mgdfbxqqgv1hv3l9z7vwykp17r1ca9l7d8jcwslygbbyz"; depends=[plyr rvest xml2 xts zoo]; }; + FFdownload = derive2 { name="FFdownload"; version="1.1.0"; sha256="050mn48q36585s2xf0dbsb385rla1jnnlkppnagrijdpmkvjzfy9"; depends=[plyr rvest timetk xml2 xts zoo]; }; FGLMtrunc = derive2 { name="FGLMtrunc"; version="0.1.0"; sha256="15pj2dmgbjbx4xi585rqggnp05xzpg9pn2iy76ibgkdvjqknkwii"; depends=[foreach glmnet Rcpp RcppArmadillo splines2]; }; FGSG = derive2 { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; }; FGalgorithm = derive2 { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; }; 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=[]; }; - FIESTA = derive2 { name="FIESTA"; version="3.4.2"; sha256="1wcd18y9az52grc95s2g88z7qwf7q5fnzrxn3znfcnj6g44fybll"; depends=[data_table DBI FIESTAutils largeList rgdal RSQLite sf sqldf]; }; - FIESTAutils = derive2 { name="FIESTAutils"; version="1.1.3"; sha256="0c3b17i01cikryj3yiixjd589jsz9i5f7fn2mvknv9rwls3wpjri"; depends=[data_table DBI hbsae JoSAE largeList mase nlme RColorBrewer Rcpp rgdal RPostgreSQL RSQLite sae sf sp sqldf units xml2]; }; + FIESTA = derive2 { name="FIESTA"; version="3.5.0"; sha256="1jg8s08iz6l3pggybdsrzi91r5nxm8yvy1cabrxl0s861h98r3m3"; depends=[data_table DBI FIESTAutils largeList rgdal RSQLite sf sqldf]; }; + FIESTAutils = derive2 { name="FIESTAutils"; version="1.1.4"; sha256="0zciqzp7cwgz5awxnfhdi9d8akaylvicwnnwkpn3lv4135rvkwhi"; depends=[data_table DBI hbsae JoSAE largeList 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=[]; }; @@ -1591,7 +1598,6 @@ in with self; { FMsmsnReg = derive2 { name="FMsmsnReg"; version="1.0"; sha256="0d58n7lz8d6xgzvyznmhw1byshyiiwk8dc462qr18cl51p0lqnkv"; depends=[mvtnorm]; }; FNN = derive2 { name="FNN"; version="1.1.3.1"; sha256="0nmynpiy3d2dnd5ngjf4m79jy02byhk43gj0xny9a6j8243f5c2j"; depends=[]; }; FOCI = derive2 { name="FOCI"; version="0.1.3"; sha256="0iax5569a0v18j2l52mw26yimx11fqqbxj5q7jgba9jf7ylp410w"; depends=[data_table gmp proxy RANN]; }; - FORTLS = derive2 { name="FORTLS"; version="1.1.0"; sha256="08g674ig8fn2mlwqrhd5lkvy64n9jqvla7nflswpbp4vhjgcmy9k"; depends=[dbscan Distance htmlwidgets lidR moments plotly progress raster Rcpp RcppEigen RCSF scales sf sp tidyr VoxR 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.2"; sha256="0h9yfiyf8xhvdyzjwgh9s8immnfx6yidz4irn8nyp14ifhq1ad61"; depends=[cluster ExPosition GGally ggplot2 klaR MASS mvtnorm rootSolve ThreeWay]; }; @@ -1607,7 +1613,7 @@ in with self; { FRI = derive2 { name="FRI"; version="1.0"; sha256="17ddbr0hndpr5627n67467787rq8hidi1jn1c3xf7f7qz800jjf5"; depends=[forcats ggplot2 neuralnet RSNNS]; }; FRK = derive2 { name="FRK"; version="2.1.0"; sha256="0lsqd043xyy951yqms5393kshnjcrjq2gckkjyj10q8lp75iyw3m"; 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=[]; }; + FSAdata = derive2 { name="FSAdata"; version="0.4.0"; sha256="0wqviw5achsl9q7v8z8zzbnhq9gryfj793hi61js2z30m5dgjvm7"; depends=[]; }; FSDAM = derive2 { name="FSDAM"; version="2020.11-18"; sha256="09l7zvmbvmbcr5pxizdhs5fn79r6cl4ic0hsz2bazdymsqv3s3nm"; depends=[kyotil reticulate]; }; FSInteract = derive2 { name="FSInteract"; version="0.1.2"; sha256="1aci1398aaz0nrl5jy6yh7xik355wf7pwngrsak4qsi94vdj05iy"; depends=[Matrix Rcpp]; }; FSK2R = derive2 { name="FSK2R"; version="0.1.3"; sha256="0hsrg49q42by4i3dywi59wwy5h56fnfdr10s6rk1y9dyliksmj43"; depends=[dplyr purrr R_utils readtext readxl rjson rlang shiny tibble tidyr XML xml2 zip]; }; @@ -1625,11 +1631,12 @@ in with self; { FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.8"; sha256="1m2005yywdh9ir61sdh10ssp1y26d9xgx9rivvilbk9grc9qyjzg"; depends=[FactoMineR ggplot2 rmarkdown]; }; FactoMineR = derive2 { name="FactoMineR"; version="2.6"; sha256="0xcg4vjs5v9k28hhxhkfkks7nvpxpp2cvim00kh67f4pq041c9l1"; depends=[car cluster DT ellipse emmeans flashClust ggplot2 ggrepel lattice leaps MASS multcompView scatterplot3d]; }; FactorAssumptions = derive2 { name="FactorAssumptions"; version="2.0.1"; sha256="0d7dh67r8s0v952palhx9h6bhhlxw9xcjbj7dxsp2hdhwap72s2y"; depends=[MASS psych]; }; - FactorCopula = derive2 { name="FactorCopula"; version="0.8.1"; sha256="1hdmmm9vl1kyg4i4gchl837q6lfga5qfay6wv5z0xn84rmifqnpr"; depends=[abind matlab polycor statmod VineCopula]; }; + FactorCopula = derive2 { name="FactorCopula"; version="0.9.2"; sha256="129ik9fxjhkb4z94nv8xp8qizbypx2v0kbmfvqy0ljifrskbga75"; depends=[abind igraph matlab polycor statmod VineCopula]; }; FactorsR = derive2 { name="FactorsR"; version="1.5"; sha256="1rla44g75hrqalrblr1yaawmyixmivlacn50marqgd9fjh8blgcd"; depends=[]; }; Factoshiny = derive2 { name="Factoshiny"; version="2.4"; sha256="0szdpdghaqrfjdx3c9klgww8i09dh69500sls2lyjz6c8gi80vcx"; depends=[colourpicker DT FactoInvestigate FactoMineR ggplot2 ggrepel missMDA shiny shinydashboard shinyjqui]; }; Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; }; FairMclus = derive2 { name="FairMclus"; version="2.2.1"; sha256="0mhccn6yyf35qb856psh3dpiwdf24l3w2lqr643lkn38lhbmyvn8"; depends=[cluster data_table doParallel dplyr foreach irr magrittr rlist tidyr]; }; + FamEvent = derive2 { name="FamEvent"; version="3.0"; sha256="1f2cfbd799gkva0jyf7x6x37x95nlg1zv85h85irkwh0kfwk55gh"; depends=[cmprsk eha kinship2 MASS pracma survival truncnorm]; }; Families = derive2 { name="Families"; version="1.0.1"; sha256="1ravgcn3jkhfx6q4wqxld2mdmibdm07ywzy3za3hws6a04zgsbvn"; depends=[msm reshape]; }; FamilyRank = derive2 { name="FamilyRank"; version="1.0"; sha256="0v1b3a6rxbbl7xdy977j02x1ni66879x98vg6ngbaqvh7v9vl82x"; depends=[plyr Rcpp RcppArmadillo]; }; FarmSelect = derive2 { name="FarmSelect"; version="1.0.2"; sha256="174rzv9k0hdcfdkv7bisy70rip2iy0bnj3qa54i00wqwjdglgjdn"; depends=[fBasics ncvreg Rcpp RcppArmadillo]; }; @@ -1650,10 +1657,10 @@ in with self; { FateID = derive2 { name="FateID"; version="0.2.2"; sha256="0sgvaqhqkmmkcsl53bm1jlfpzrvzfb5cz8k513nizfsi638vydlm"; depends=[locfit matrixStats pheatmap princurve randomForest RColorBrewer Rtsne som umap]; }; FaultTree = derive2 { name="FaultTree"; version="0.99.5"; sha256="1sg5bidp1wv02xf828g97syh5w6ik5z8ssl7a0hd3ikvh80k4yll"; depends=[Rcpp RcppArmadillo]; }; FeaLect = derive2 { name="FeaLect"; version="1.20"; sha256="1dfi0v313x4a4ck98zlk6yr3nfjrdwr5649x9dx3i7yfkypk2k5c"; depends=[lars rms]; }; - FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.4"; sha256="00yrji3grqgzg8c1hwqq5kb9xgqlnzwymy0b38cwixadc5w5lq8m"; depends=[BH digest magrittr Matrix Rcpp]; }; + FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.5"; sha256="1hfa2p78a7hhn5p0xhsha6pl2aisvkjd791j61s73w99vbysmmpl"; depends=[BH digest magrittr Matrix Rcpp]; }; FeatureImpCluster = derive2 { name="FeatureImpCluster"; version="0.1.5"; sha256="1ifxw6rd870g258fkyyy3mhghxm7486nvgnp3lh5ih2i1v34dgig"; depends=[data_table ggplot2]; }; FeatureTerminatoR = derive2 { name="FeatureTerminatoR"; version="1.0.0"; sha256="036ip8jm4d5ybyqmvrnjqp4hl8gsmd346737ghipnmmyaml9xfs5"; depends=[caret dplyr e1071 ggplot2 lattice randomForest tibble]; }; - FedData = derive2 { name="FedData"; version="3.0.0"; sha256="0qvjm909cj7l2v6rwvvx1kbv2rmca30dahkmsx5w664cqdfdbzgg"; depends=[curl data_table dplyr httr igraph jsonlite lifecycle lubridate magrittr progress purrr raster readr sf sp stringr terra tibble tidyr xml2]; }; + FedData = derive2 { name="FedData"; version="3.0.1"; sha256="1k02icjqghv2hklhqjn63l8phmaxj6vclqcrsm35aa4clax8hhr2"; depends=[curl data_table dplyr httr igraph jsonlite lifecycle lubridate magrittr progress purrr raster readr sf sp stringr terra tibble tidyr xml2]; }; FeedbackTS = derive2 { name="FeedbackTS"; version="1.5"; sha256="120labhmisw1x1bq8c4bl6l14vayvb9xcm6jsj1awacypgrr2ar2"; depends=[automap gstat mapdata maps proj4 sp]; }; FertBoot = derive2 { name="FertBoot"; version="0.5.0"; sha256="168xfxpb43brfnp6c6b4chhpzb9z0aiqa6fawc8m09an5ggh05jp"; depends=[nls_multstart simpleboot]; }; Fgmutils = derive2 { name="Fgmutils"; version="0.9.5"; sha256="05n8lvx3cs1ckliaj7ni2rbfcrdl7d0pzf9bkwlyd1779h684cxz"; depends=[data_table devEMF ggplot2 gridExtra plyr png sqldf stringr]; }; @@ -1700,7 +1707,6 @@ in with self; { ForecastTB = derive2 { name="ForecastTB"; version="1.0.1"; sha256="1wqgw4i65ajwj8la8mgv2qqm4ydgk90i6chdkd8h33rlwh8yddc6"; depends=[circlize decomposedPSF forecast ggplot2 gridExtra imputeTestbench PSF RColorBrewer reshape2]; }; ForestDisc = derive2 { name="ForestDisc"; version="0.1.0"; sha256="1mzlrqjxsja51yyxckj4ym1vpfpq30vlhvs8clrg8jv7kz86hdwk"; depends=[moments nloptr randomForest]; }; ForestFit = derive2 { name="ForestFit"; version="1.2.3"; sha256="02qhfp08jcylzjwvdr47gv37rbj8bw6nwlx45ax67429f2g971d2"; depends=[ars pracma]; }; - ForestGapR = derive2 { name="ForestGapR"; version="0.1.6"; sha256="1m3fn7gqwch14nilid9fmxwlm4x9qslr3czb44iwiff9i69csnvk"; depends=[igraph poweRlaw raster rgeos sp spatstat_core spatstat_geom VGAM viridis]; }; ForestTools = derive2 { name="ForestTools"; version="0.2.5"; sha256="0v6m6br54cj0a218ddgkhmqr6ldk29g03pddyqh9krihq37wnjsa"; depends=[APfun doParallel foreach imager plyr progress raster Rcpp rgeos sp]; }; Formula = derive2 { name="Formula"; version="1.2-4"; sha256="1bsw282i5m8rlirbhz7hqvf25zbxschk7yrp152whbzdnmry6w6b"; depends=[]; }; FossilSim = derive2 { name="FossilSim"; version="2.3.1"; sha256="110r1797cbzym2d96h8gchk47kaqf4h6xyma9v1g9jyxnq8zxyiw"; depends=[ape TreeSim]; }; @@ -1727,7 +1733,7 @@ in with self; { FusionLearn = derive2 { name="FusionLearn"; version="0.2.1"; sha256="09mwllnp7sdk7x97s3kv2lka6smpf54svmxw5hv6zlh1hvjnyg50"; depends=[]; }; Fuzzy_p_value = derive2 { name="Fuzzy.p.value"; version="1.1"; sha256="13h6armh9g57zqxyjqk6mq81jlfqxqrg2sb5p9rrhslka5m01zis"; depends=[FuzzyNumbers]; }; FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.9.5"; sha256="02sx32vlvnr0fzw8rf0f6hiikqn7xp1ibpqzxhxwv8yij2qkiyci"; depends=[MASS]; }; - FuzzyClass = derive2 { name="FuzzyClass"; version="0.1.2"; sha256="1kp6zl90fpcjh95bxvaapnjb0k7n7zc2jv5nbqjdxaid86s4x09y"; depends=[caTools doParallel e1071 EnvStats foreach MASS Rdpack rootSolve]; }; + FuzzyClass = derive2 { name="FuzzyClass"; version="0.1.3"; sha256="0vlx0l6zlfghabikssi29n275frb3if6w0qyjldm6ypkgangnzmn"; depends=[caTools doParallel e1071 EnvStats foreach MASS purrr Rdpack rootSolve]; }; 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]; }; @@ -1735,7 +1741,7 @@ in with self; { 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.4.2"; sha256="0pgfx78xyq37ffaxvyxv4fh6p3dfxkgw2xi5p35hjv1hgsmi17s8"; depends=[]; }; + FuzzyResampling = derive2 { name="FuzzyResampling"; version="0.5.0"; sha256="1cryrz18zyp5mzjixhfn4d5207csaadspp3hhbly1k5wwcf6mnyf"; depends=[]; }; 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=[]; }; @@ -1745,6 +1751,7 @@ in with self; { GACFF = derive2 { name="GACFF"; version="1.0"; sha256="0lhjzb6cj8838dh4423929z7bwpa6cv3dn84rccwi3382vsq9g2c"; depends=[]; }; GAD = derive2 { name="GAD"; version="1.1.1"; sha256="0lyrw0d7i7yn1wkqlbf3rg3dnijfwsjn3kdbsg19hmvwq6qpsak2"; depends=[matrixStats R_methodsS3]; }; GADAG = derive2 { name="GADAG"; version="0.99.0"; sha256="1ycg48idrq2yrk1fxs16yl5wwg3kbfki8xppmh311rrzf75c6z4g"; depends=[igraph MASS Rcpp RcppArmadillo]; }; + GAGAs = derive2 { name="GAGAs"; version="0.5.1"; sha256="1qh5cnxjb2fjl442iva4pbln019ycv13vngvlds30ql17cnf679b"; depends=[Rcpp RcppEigen survival]; }; GAIPE = derive2 { name="GAIPE"; version="1.1"; sha256="035x5x8ig85q51bf4qgj5n5qq6clwjp4xk5bf35gswn7qxd13yls"; depends=[]; }; GALLO = derive2 { name="GALLO"; version="1.3"; sha256="0nfzm5cm93m3x0vqmjvhxznj5i913ssn9awpfvk932j829kz6zbc"; depends=[circlize data_table doParallel dplyr DT foreach ggplot2 lattice RColorBrewer rtracklayer stringr unbalhaar webshot]; }; GAMens = derive2 { name="GAMens"; version="1.2.1"; sha256="1z10wxcg277fra2lch464l0kb02lspw9qr1i2wmq11wcz0k9qnl8"; depends=[caTools gam mlbench]; }; @@ -1760,7 +1767,7 @@ in with self; { GB2group = derive2 { name="GB2group"; version="0.3.0"; sha256="1dbyc7izyggfrsq2gj7rwff5qjyy6bx6ip09xvbj73xqczv8fkcd"; depends=[GB2 ineq minpack_lm numDeriv]; }; GBJ = derive2 { name="GBJ"; version="0.5.3"; sha256="12lsddkcxz37hn2fvjq158wb1bc6b3hx6wj8q8nj21zpmyl3n2qh"; depends=[BH mvtnorm Rcpp SKAT]; }; GCD = derive2 { name="GCD"; version="4.0.7"; sha256="1259z76hajapzzq75fas2sq19r0wapn1ybghdaqdc6dksifdz6fv"; depends=[raster]; }; - GCPBayes = derive2 { name="GCPBayes"; version="3.1.0"; sha256="1239pr1i9q4sfy7az6jc8sh10xil5m2a70v9sm29ll53vsza73jj"; depends=[arm gdata invgamma MASS mvtnorm postpack Rcpp truncnorm usethis wiqid]; }; + GCPBayes = derive2 { name="GCPBayes"; version="4.0.0"; sha256="1ab0vp948dyj9b6yh5gixlqim2xklhy6gsbgi641knzc30paiwj4"; depends=[gdata invgamma MASS mvtnorm postpack truncnorm wiqid]; }; GCPM = derive2 { name="GCPM"; version="1.2.2"; sha256="0k2ng78bk3bxpj6nz80j5cvjd56zjz328ga68vyyc3hvdjgpspqj"; depends=[Rcpp RcppProgress]; }; GCSM = derive2 { name="GCSM"; version="0.1.1"; sha256="0apz1wh6nfpg2gyx12xnbdb3hjyrrpwlcrh5khn6cxhxm06q9l95"; depends=[Rcpp RcppArmadillo]; }; GCalcium = derive2 { name="GCalcium"; version="1.0.0"; sha256="0r84qmdsqsgpaqr08imh48mdvy26s2b62hi0hxxwhr9kg7qvj0rd"; depends=[caTools dplyr]; }; @@ -1771,7 +1778,7 @@ in with self; { GDINA = derive2 { name="GDINA"; version="2.9.3"; sha256="0bwg9sfsqs5nsqwhjnbb631fbhj0mx2dc4c185qkym9cjb5lfkm9"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; }; GDPuc = derive2 { name="GDPuc"; version="0.9.2"; sha256="13izxvkl250jw66fkwwnj3s0mgmiwkza9marrrfhwvpx6ja2w37i"; depends=[cli crayon dplyr glue lifecycle magrittr rlang tibble tidyselect withr]; }; GDSARM = derive2 { name="GDSARM"; version="0.1.1"; sha256="0id3z450prnrd6rdcv4xaizmjkdhjv8vdbpbnpniaml66kqsadvh"; depends=[lpSolve]; }; - GE = derive2 { name="GE"; version="0.3.1"; sha256="0cwbwngjs2l83a7j2acbl1h2d10vfnw2cils5m108ysx1p93kryb"; depends=[CGE data_tree DiagrammeR]; }; + GE = derive2 { name="GE"; version="0.3.2"; sha256="0fl06kdaxq39xhjb0mm19vq1kkdvl2ab7c2f08sqf2vnlxn8irrz"; 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]; }; @@ -1779,17 +1786,18 @@ in with self; { GENEAclassify = derive2 { name="GENEAclassify"; version="1.5.3"; sha256="0yqinjamb5qfnkyk9snyqw2kcl8120k6fcpg9y1qz14i6qzin2wq"; depends=[changepoint GENEAread MASS rpart signal]; }; GENEAread = derive2 { name="GENEAread"; version="2.0.9"; sha256="00whn2xqlcdcgmrifng04j2csxynfb1dmj9wkx981ylz13jsnwm9"; depends=[bitops mmap]; }; GENEAsphere = derive2 { name="GENEAsphere"; version="1.5.1"; sha256="1kgj7i9v2yn0b8lvvsf0nc6lg3i2syrcygwa51pcrzp57vv7hxn5"; depends=[GENEAread ggplot2 MASS misc3d rgl]; }; - GENLIB = derive2 { name="GENLIB"; version="1.1.6"; sha256="134j9v0pbljqspbic2phsxgp5y25v4k4jzjdwisxgrcrxi6hg1pn"; depends=[BH bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; }; - GENMETA = derive2 { name="GENMETA"; version="0.1"; sha256="1mxwqnbg5bvx1qg62xcd62dl81k11l64yckhl3v854asnaczq3pp"; depends=[magic MASS Matrix]; }; + GENLIB = derive2 { name="GENLIB"; version="1.1.7"; sha256="1f4ybng05dsbw6sd7s93y3b8ls0s139zhzpwajzjq4340czshkg2"; depends=[BH bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; }; + GENMETA = derive2 { name="GENMETA"; version="0.2.0"; sha256="11wlcnj919jws62ngf29gr2p0shdlm917hkz5iwfss1m8gcbfjnl"; depends=[magic MASS Matrix pracma]; }; GEOmap = derive2 { name="GEOmap"; version="2.5-0"; sha256="14qhvgh7jcrfknhihsnsvz6b7dz796v659ksqqmn6c3kva761rc2"; depends=[fields MBA RPMG splancs]; }; GESE = derive2 { name="GESE"; version="2.0.1"; sha256="0h3s2sbnv5wilr2mj6bnl2892p16pxrs341gg6jql1a540p669sk"; depends=[kinship2]; }; - GET = derive2 { name="GET"; version="0.3-1"; sha256="1m9p2r0pxa9m9f37pwg03gnaahyrfas9r8xv7bcxh7r5zb6v66yq"; depends=[cluster ggplot2 gridExtra viridisLite]; }; + GET = derive2 { name="GET"; version="0.3-2"; sha256="0n0frlr4nxl62ffh8mir2pwgkp5d1bkazsrff0v6k0amibqknlly"; depends=[cluster ggplot2 gridExtra viridisLite]; }; + GETdesigns = derive2 { name="GETdesigns"; version="1.1.0"; sha256="1rc8vcpfv240qmg3xgqx1rlygw7l3hjkh1napj3pc9j6ffpyyk2a"; depends=[]; }; GEVACO = derive2 { name="GEVACO"; version="1.0.1"; sha256="0zkan4w96g3qc1hgla90mh32b55bk58gax095p4nxrfi46f8w3rf"; depends=[nlme RLRsim]; }; GEVcdn = derive2 { name="GEVcdn"; version="1.1.6-2"; sha256="0vmm9fhyrk5m0zwy7fpq5j9zinws0gn2saf4j9plqc9gj1gphjn0"; depends=[]; }; GEint = derive2 { name="GEint"; version="1.0"; sha256="0srja3kwm4yjmh1vpzfwrx7ii4s9xj9j88pgcm299dnqxkv59y3r"; depends=[bindata geepack mvtnorm nleqslv pracma rje speedglm]; }; GFA = derive2 { name="GFA"; version="1.0.3"; sha256="10sivsqxliwcrp0ay3n2my28zki6f8vpv8i9lbld8qinx1iv2mq3"; depends=[]; }; 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]; }; + GFDsurv = derive2 { name="GFDsurv"; version="0.1.1"; sha256="0qq66f8ddw92m9k9raid89rggla9691xi2sn1w3r7lmwqf6ajsl4"; depends=[gridExtra magic MASS plyr shiny shinyjs shinythemes survival survminer tippy]; }; GFE = derive2 { name="GFE"; version="0.1.0"; sha256="0ywrg23z13kp8ggw4wbm4jvr2rvb6kra7ma0mgfj8xzkrxs6vi6m"; depends=[data_table dplyr TeachingSampling]; }; GFGM_copula = derive2 { name="GFGM.copula"; version="1.0.4"; sha256="0cw8ih9dj86cvks0qcpffzjx8lv6qiwvk3f1wri8zashj8lk9am6"; depends=[cmprsk compound_Cox joint_Cox]; }; GFM = derive2 { name="GFM"; version="1.1.0"; sha256="02k1g2rq32ghd3yivjrfz0wjid1kbkraqrb5cmc8640lv7k8l0xr"; depends=[doSNOW MASS]; }; @@ -1797,7 +1805,7 @@ in with self; { GGClassification = derive2 { name="GGClassification"; version="0.1"; sha256="03wis5ng2mnfhp33xrag8xbmvjagzr1909a6x94wv7s2spji00rp"; depends=[Rcpp RcppEigen]; }; GGEBiplots = derive2 { name="GGEBiplots"; version="0.1.3"; sha256="0h7irlmq283bx1hlqyv8bi228kd6xkc7sdw6nq18v3s7b0a9bhcm"; depends=[ggforce ggplot2 scales]; }; GGIR = derive2 { name="GGIR"; version="2.8-2"; sha256="1njf49ywp8j8vrk66f7q4ndd20102i3xfz843f3nakdnmvl63xkm"; depends=[ActCR data_table doParallel foreach GENEAread GGIRread ineq read_gt3x signal tuneR unisensR zoo]; }; - GGIRread = derive2 { name="GGIRread"; version="0.2.4"; sha256="0pqh7cs1zp0mdmkbbiyarjvijcgsxa0p0c0vmia2gkbb072f2ajw"; depends=[bitops matlab Rcpp tuneR]; }; + GGIRread = derive2 { name="GGIRread"; version="0.2.6"; sha256="10zgdac4vjf63s3d210v6b5lgfwj7an6xfjr4m1rfg7cm5qr2pps"; depends=[bitops matlab Rcpp tuneR]; }; GGMncv = derive2 { name="GGMncv"; version="2.1.1"; sha256="0lih9dyb5aqrawhiy2vhv63b132hhzq6zq0x6rbrhy8kbkldhigr"; depends=[GGally ggplot2 glassoFast MASS mathjaxr network numDeriv pbapply Rcpp RcppArmadillo Rdpack reshape sna]; }; GGMnonreg = derive2 { name="GGMnonreg"; version="1.0.0"; sha256="1bhqk172ddc7xq1hqj1i6q8np6jvmf2xypvd8kp3w1bcsafsbms8"; depends=[bestglm corpcor doParallel foreach GGally GGMncv ggplot2 MASS Matrix network poibin psych Rdpack sna]; }; GGMridge = derive2 { name="GGMridge"; version="1.2"; sha256="1bv6k9krkb6mx6p4kx24cgyix1jnpk0257a59i59h7chij9y7nf7"; depends=[MASS mvtnorm]; }; @@ -1840,11 +1848,12 @@ in with self; { GNE = derive2 { name="GNE"; version="0.99-4"; sha256="1ncg9yys5hr2v74h8f5mr2w0iay8zybaxj76qv2cilx8d8qzi6b4"; depends=[alabama BB nleqslv SQUAREM]; }; GNRS = derive2 { name="GNRS"; version="0.3.4"; sha256="0aq6rq5b3jq9yj8hhyxjin38f2008qsix4zm20nyhqx0k0hizql1"; depends=[httr jsonlite RCurl]; }; GNSSseg = derive2 { name="GNSSseg"; version="6.0"; sha256="1zkj98xh63wfyyygg2ahq3m54xlvi3x9sy0rhcn2dlfvbxaxfl4k"; depends=[capushe robustbase]; }; - GOCompare = derive2 { name="GOCompare"; version="1.0.1"; sha256="0ssppp61ssirkcz9wni48n9jm6yv89lzxkgb90njslhb3aa07pbh"; depends=[ape ggplot2 ggrepel igraph stringr vegan]; }; + GOCompare = derive2 { name="GOCompare"; version="1.0.2.1"; sha256="0h4235bs9aszil20bxyscxv2z96rw9gdp87va8bmvj15cg2lfvgv"; depends=[ape ggplot2 ggrepel igraph mathjaxr stringr vegan]; }; GOFShiny = derive2 { name="GOFShiny"; version="0.1.0"; sha256="04m08d9w8qqbql86c18qpnwym7agry8wspfwrnbbyp52h2pn2gxb"; depends=[rhandsontable rmarkdown shiny]; }; GORCure = derive2 { name="GORCure"; version="2.0"; sha256="1hazin0q74hf16azxa5h08kfj7g1079q77n2fn4fahpfxb8hmvwm"; depends=[ICsurv MASS pracma survival]; }; GOplot = derive2 { name="GOplot"; version="1.0.2"; sha256="1y8dv0kbzpr9za91njw0x233vx5d13vqml9hmpddcyi9s6va5nix"; depends=[ggdendro ggplot2 gridExtra RColorBrewer]; }; GOxploreR = derive2 { name="GOxploreR"; version="1.2.6"; sha256="1s2f0ns09vvk6q7fd9fgdw7mcr7qib8mvia1xp9dw4rnq0i6ca1k"; depends=[annotate biomaRt dplyr ggplot2 ggraph GO_db gontr igraph network]; }; + GPArotateDF = derive2 { name="GPArotateDF"; version="2022.12-1"; sha256="0j1hi761grjsv6bgvgjigbysk565f3kf8ynf93q7wsx1m38wv4pk"; depends=[GPArotation]; }; GPArotation = derive2 { name="GPArotation"; version="2022.10-2"; sha256="05qrwbfr19mj4f4fxnh7lwvq8ai7xiiyajwhvzsls84w7a7jvxq4"; depends=[]; }; GPBayes = derive2 { name="GPBayes"; version="0.1.0-4"; sha256="1lng6ghbwqdrir17n9x0arch55ynaw37fyj8nbppmfwn3drdndcv"; depends=[Rcpp RcppEigen RcppProgress]; }; GPCERF = derive2 { name="GPCERF"; version="0.1.0"; sha256="054hyprd1g4qlf35imw42n8hizds6qxrp3y64k38j4bh9smkv59f"; depends=[data_table ggplot2 logger MASS Matrix Rcpp RcppArmadillo rlang spatstat_geom xgboost]; }; @@ -1873,8 +1882,9 @@ in with self; { GREMLINS = derive2 { name="GREMLINS"; version="0.2.0"; sha256="0wdqikz6k5d2cxcb347lhy7rj54blgf1m4sjv64zd4nx6c4r0ai8"; depends=[aricode blockmodels igraph mclust pbmcapply R6]; }; GRIDCOPULA = derive2 { name="GRIDCOPULA"; version="1.0.0"; sha256="02xyklc8648z3c3pfd3xshlfn5wpkyglc84dqh8sbpba7017gcvr"; depends=[fields ggplot2 limSolve pracma reshape2 Rsolnp]; }; GRNNs = derive2 { name="GRNNs"; version="0.1.0"; sha256="1c36km6g4fcsvpirlh88fl3zq9pdpdyfilahfx949salj0gnqsn6"; depends=[cvTools rdist scales vegan]; }; - GROAN = derive2 { name="GROAN"; version="1.3.0"; sha256="0gkb1bg5sls2kc6qqy0nigqyk6iq3bfnmj0lf7z7f8nddd33i9ca"; depends=[plyr rrBLUP]; }; + GROAN = derive2 { name="GROAN"; version="1.3.1"; sha256="1g6n00gnz47w06wkx0sha97qxxyhc8n2y8zaagqx7krgzx7lkha3"; depends=[plyr rrBLUP]; }; GRS_test = derive2 { name="GRS.test"; version="1.2"; sha256="1g560n81kqf81n1z3s4yxl24r386q21avjknz6msqzp4xhxhr4l6"; depends=[]; }; + GRSxE = derive2 { name="GRSxE"; version="1.0.0"; sha256="1mfsfkfgz12vm99jsln8fimmy852dx20xfnj6ibqrjhjpniv8x5d"; depends=[glmnet ranger]; }; GRTo = derive2 { name="GRTo"; version="1.3"; sha256="1xkcx2agvrpfnmplgaqx70vz303v8rhwnxdyr4hmdlf4h92lbv8i"; depends=[bootstrap]; }; GSA = derive2 { name="GSA"; version="1.03.2"; sha256="1f1mrxxdbdlnibgav6nsvbpniz2x3km2svc0hf43spb4zicn0z8p"; depends=[]; }; GSA_UN = derive2 { name="GSA.UN"; version="1.0.0"; sha256="1jj9scv9x32zb24114a4sa43xvjmf3gmq8lnfablldjn7p7yx9cv"; depends=[e1071]; }; @@ -1898,8 +1908,8 @@ in with self; { 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="2.1"; sha256="1vwq1gpq76f0icpzb9l2dl1yg6akr4jcscxfxnirb0zfpnibhn9v"; depends=[fastglm horseshoe mombf Rcpp RcppArmadillo]; }; - GWASinspector = derive2 { name="GWASinspector"; version="1.5.7.2"; sha256="0n1k6x38j4sxrsh5mgbcvi4vf6g1mh5xa61k0jaf2pgy2fig5kxr"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr R_utils rmarkdown RSQLite]; }; + GWASinlps = derive2 { name="GWASinlps"; version="2.2"; sha256="1q5gaam554r2wxwsdgxjx6hngs2q850hbrkz8y5248i46pz16pcc"; depends=[fastglm horseshoe mombf Rcpp RcppArmadillo survival]; }; + GWASinspector = derive2 { name="GWASinspector"; version="1.6.0"; sha256="0d2r5l7934ksxjqmqa3c7vy0p81vzdqlamlrj3r26cxwpm3icyhw"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr openxlsx R_utils rmarkdown RSQLite]; }; GWEX = derive2 { name="GWEX"; version="1.0.2"; sha256="0iykciifbskcrx1qv4874nxli1sq6nbmlfinq4ksir3p93y7ds87"; depends=[abind doParallel EnvStats fGarch foreach lmomco MASS mvtnorm nleqslv Renext]; }; 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]; }; @@ -1914,17 +1924,19 @@ in with self; { GameTheoryAllocation = derive2 { name="GameTheoryAllocation"; version="1.0"; sha256="0733vmyr0d9scjd5ixpnggr548snd7nj70knf5hbzc59nmbc5y11"; depends=[e1071 lpSolveAPI]; }; Gammareg = derive2 { name="Gammareg"; version="3.0"; sha256="1wh5k3nazycki0h094m4d0nnign8yksgnrrnrm3yka1s7mqzv781"; depends=[]; }; GapAnalysis = derive2 { name="GapAnalysis"; version="1.0.2"; sha256="0ky1njrymh102dy7sna2cm5f5gyx4s7k77bnsdal1yndgw7ppqvx"; depends=[data_table fasterize geosphere raster rmarkdown sf sp tmap]; }; + GauPro = derive2 { name="GauPro"; version="0.2.6"; sha256="03xlfwr3wwxcbkicfnrncqnzpsmvwb98vbv3cca9rw13pp449h12"; depends=[lbfgs R6 Rcpp RcppArmadillo]; }; GaussSuppression = derive2 { name="GaussSuppression"; version="0.5.0"; sha256="1lfywz2iar2nclxkwii7d58b665szlx1xafabqcafb8accxbdmb4"; depends=[Matrix RegSDC SSBtools]; }; GaussianHMM1d = derive2 { name="GaussianHMM1d"; version="1.0.1"; sha256="1j1cwh0p7czy2l4qf6nymqcp8kkfaki0j2rj8p99nqn2vgc3vcax"; depends=[doParallel foreach]; }; GeDS = derive2 { name="GeDS"; version="0.1.3"; sha256="1ddq4hnyl3m3s4cchccxiqphi742ljcm86zqpa01a5nrjbnr87x6"; depends=[Matrix Rcpp Rmpfr]; }; GeNetIt = derive2 { name="GeNetIt"; version="0.1-4"; sha256="1z9h3prlf5r7ks0ys4wy0i5i3giaplqmngsqwxllsy70jjb9s90h"; depends=[exactextractr nlme raster rgeos sf sp spdep]; }; GenAlgo = derive2 { name="GenAlgo"; version="2.2.0"; sha256="1pihqxif2v62hwf5761fshyhigcjmlgbvp2j7immxlsysjfw5xgq"; depends=[ClassDiscovery MASS oompaBase]; }; GenBinomApps = derive2 { name="GenBinomApps"; version="1.2"; sha256="03pgzrj5d3cjhadv4f6an4vm90fj0wxcsi9lx7znrlrjp8qvyjvh"; depends=[]; }; - GenEst = derive2 { name="GenEst"; version="1.4.6"; sha256="0qvxbm8vb39p7s6ajhr9fhkxi9qjw066ghv4vx8wn72vmgs9d4ic"; depends=[corpus DT gsl gtools hellno htmltools htmlwidgets lubridate MASS matrixStats mvtnorm Rcpp shiny shinyjs survival]; }; + GenEst = derive2 { name="GenEst"; version="1.4.8"; sha256="0kz9n0af79k9f03jrmqbjbspwn87hpbf0jav3nafg8m3ynvzjb3m"; depends=[corpus DT gsl gtools hellno htmltools lubridate MASS matrixStats mvtnorm Rcpp shiny shinyjs survival]; }; GenMarkov = derive2 { name="GenMarkov"; version="0.1.0"; sha256="06bq43ry25g75qxlnrz02s393sv4r5v7m8gw0d96gpmldc76aax1"; depends=[alabama fastDummies Hmisc matrixcalc maxLik nnet]; }; GenOrd = derive2 { name="GenOrd"; version="1.4.0"; sha256="17mfrj1fwj8mri1w0bl2pw1rqriidmd67i7gpn9v56g9dzw5rzms"; depends=[MASS Matrix mvtnorm]; }; GenSA = derive2 { name="GenSA"; version="1.1.7"; sha256="03xqwxm7v7rnihx730a4p65dfwhjh4345r3d78y0qxxplk8d76cx"; depends=[]; }; GenTag = derive2 { name="GenTag"; version="1.0"; sha256="0yirl7n7p7w1dfbbr48v1151qyqm7p9m00vc6jq0s2d6bjdspin9"; depends=[]; }; + GenWin = derive2 { name="GenWin"; version="1.0"; sha256="0fy5ws481xxk16x6wj7z8mwdzy044lqkqkw36xf1yxq18yxcg9xj"; depends=[pspline]; }; GenderInfer = derive2 { name="GenderInfer"; version="0.1.0"; sha256="1bdihxxwmp8ffb5blc8hkxnxh2z72vkq1sjak25njq8b1kwnazvn"; depends=[binom ggplot2]; }; GeneCycle = derive2 { name="GeneCycle"; version="1.1.5"; sha256="08pr8xgcznm04c4lhvzv2qnzij5vj7pjzyj9pr1pqpmc977h8dvg"; depends=[fdrtool longitudinal MASS]; }; GeneF = derive2 { name="GeneF"; version="1.0.1"; sha256="04fmnlj42m9ahq1504pymhq930azr8a5lyggc3bl5awqv1agpzf6"; depends=[]; }; @@ -1932,21 +1944,19 @@ in with self; { GeneralOaxaca = derive2 { name="GeneralOaxaca"; version="1.0"; sha256="19j5c5xr6mdb6pmih94wbjas4yh0dmsqfggg8clvdxkpwk0h338v"; depends=[boot]; }; GeneralisedCovarianceMeasure = derive2 { name="GeneralisedCovarianceMeasure"; version="0.2.0"; sha256="0xgxmfcpx3mnmp5hxdy5wiihj693qlksv6jxfb9ba4dy2glzdacf"; depends=[CVST kernlab mgcv xgboost]; }; GeneralizedHyperbolic = derive2 { name="GeneralizedHyperbolic"; version="0.8-4"; sha256="01gqfvmzfslhxdnigzbl3rd55hk6r0kgd8fm9xjl0kb9vmb735lm"; depends=[DistributionUtils MASS]; }; - GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="1.2.4"; sha256="1hlq7q3pq7vh2jba82rwm6lrxsv8nr7xyp6fji78ar4rlcqi071i"; depends=[ggplot2 Rcpp RcppArmadillo RcppParallel]; }; + GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="1.2.5"; sha256="0rdqf9idrgkl7b1pz0ys7a4j73jkz748rnk23v388vl7948zvxsa"; depends=[ggplot2 Rcpp RcppArmadillo RcppParallel]; }; GeneralizedWendland = derive2 { name="GeneralizedWendland"; version="0.5-2"; sha256="04f52ilvijjm740vciys4vhcsxj9j10p7y4pphqawh4yvdc6fanv"; depends=[BH fields Matrix optimParallel Rcpp RcppEigen spam spam64]; }; GenericML = derive2 { name="GenericML"; version="0.2.2"; sha256="1r2jl3say11by21ja7m6m55yzmgrdmp4nlanvh8h4cm8v37bzql7"; depends=[abind ggplot2 lmtest mlr3 mlr3learners sandwich splitstackshape]; }; GeneticSubsetter = derive2 { name="GeneticSubsetter"; version="0.8"; sha256="0bd4snv3dwabc7mknmd2rjmffj67xq535x0bycajhd83d1jhjars"; depends=[]; }; GenoScan = derive2 { name="GenoScan"; version="0.1"; sha256="0p98imfvvz7l94kim3pxypyjs2pbxng4a2nagbafbady82ylr2vi"; depends=[data_table MASS Matrix seqminer SKAT]; }; GenomeAdapt = derive2 { name="GenomeAdapt"; version="1.0.0"; sha256="0jsxqhx62vbsr0hcqk9wrfsg3l3wbnx64pzxx18ps366vg7fxmii"; depends=[gdsfmt qvalue robust SNPRelate]; }; GenomeAdmixR = derive2 { name="GenomeAdmixR"; version="2.1.7"; sha256="14qnabg1pj8sg2bvd3k4m467bh1q2zfjr0ljxn1ny031sqwis4cy"; depends=[ggplot2 ggridges hierfstat Rcpp RcppArmadillo RcppParallel rlang stringr tibble vcfR]; }; - GenomicMating = derive2 { name="GenomicMating"; version="2.0"; sha256="02v1pkarmardf7g8hf2n4jj4cq4707g5lcc7gnwsiyyh7pknd1y6"; depends=[dplyr emoa kohonen LowRankQP magrittr plotly qtl Rcpp RcppArmadillo scatterplot3d SOMbrero]; }; GenomicTools_fileHandler = derive2 { name="GenomicTools.fileHandler"; version="0.1.5.9"; sha256="09l87wf78bj49cdh7r3x81hn15c4pihxih8l59xxrpgdhp69268c"; depends=[data_table snpStats]; }; GeoBoxplot = derive2 { name="GeoBoxplot"; version="1.0"; sha256="164dh49ac3fx38fdglv32lmz92ca8jdd98cbhz6mxsk8r0jcladw"; depends=[]; }; GeoFIS = derive2 { name="GeoFIS"; version="1.0.4"; sha256="095lwn9kldhs8nhpp0b6fzhwn5b8ar8511b4144xjks70f7kg7ym"; depends=[BH data_tree FisPro foreach nnls R6 Rcpp Rdpack rgeos sp]; }; - GeoModels = derive2 { name="GeoModels"; version="1.0.3"; sha256="09gj4nmnvvzq36gch6jbhqjhz1fnl2hrymmcacpq2zch7xrp5ngl"; depends=[codetools data_table dfoptim dotCall64 fields GpGp GPvecchia hypergeo lamW mapproj nabor numDeriv optimParallel pbivnorm plotrix pracma scatterplot3d shape sn spam ucminf VGAM zipfR]; }; + GeoModels = derive2 { name="GeoModels"; version="1.0.5"; sha256="1aac0srxva1pyqriwk7dykx2nh05bnagi2nm1vhvqwb2y24lsk42"; depends=[codetools data_table dfoptim dotCall64 fields GpGp GPvecchia hypergeo lamW mapproj nabor numDeriv optimParallel pbivnorm plotrix pracma scatterplot3d shape sn spam ucminf VGAM zipfR]; }; GeoMongo = derive2 { name="GeoMongo"; version="1.0.3"; sha256="0m5nz5q81jz2v2bl2dbgdbdprrkckxr2c67qn0cg9vms0pi3fawr"; depends=[data_table geojsonR R6 reticulate]; }; GeoRange = derive2 { name="GeoRange"; version="0.1.0"; sha256="0krj9570wkhdvpaqkq3nf0maglqd44mpwn4v1bymvgpk1i1wf5p3"; depends=[moments proj4 raster sp velociraptr]; }; - GeoTcgaData = derive2 { name="GeoTcgaData"; version="1.1.1.992"; sha256="0xzz5sg9ywmpwym50hbvb1z7f8wwbbr4shiir8kj4mwf22snsk6d"; depends=[cqn data_table dplyr magrittr plyr topconfects]; }; GeoWeightedModel = derive2 { name="GeoWeightedModel"; version="1.0.2"; sha256="0nff8whj5306mbi668y3i31sfbdslyd7cdm6rxafxhii643bm93a"; depends=[beepr cartography dplyr DT GWmodel raster readxl shiny shinyalert shinyBS shinybusy shinydashboard shinyjs shinyWidgets sp spdep]; }; GeodRegr = derive2 { name="GeodRegr"; version="0.2.0"; sha256="029yclgi4np000yh42j68v32m32lq2hmkh94q33hh1qkx8rilfa7"; depends=[MASS zipfR]; }; GeodesiCL = derive2 { name="GeodesiCL"; version="1.0.0"; sha256="1i3i6vlh3nnb7z6qzh2cd6cqka78bfdly952x5ryl7cb2590a4pc"; depends=[dplyr htmltools leaflet leafpop magrittr mapview profvis readr rgdal sp tibble]; }; @@ -1956,7 +1966,7 @@ in with self; { 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.6.2"; sha256="1gn79q9zlx73mmy8q2sy8ah7bvhdns6z4ayhihnn090ch8v0pzdg"; depends=[dplyr lubridate magrittr memoise purrr RCurl readr rvest shiny stringr tidyr writexl xml2]; }; GetFREData = derive2 { name="GetFREData"; version="0.8.1"; sha256="15rca6pfsx5hcl1lnz49904b2ps0312mwjv8d4f0g76jhkvqfvss"; depends=[dplyr GetDFPData2 lubridate magrittr purrr readr rvest stringr XML xml2]; }; - GetLattesData = derive2 { name="GetLattesData"; version="1.4.1"; sha256="0bfvkq5i8b0qz98c5ycv5v1sjp0jvv6la7bl3di6q7c3651nh7nl"; depends=[curl dplyr readr stringdist stringr XML]; }; + GetLattesData = derive2 { name="GetLattesData"; version="1.4.2"; sha256="13g54m19lw9nw1a8f45fysxzgf66g94mrgvyqrhx6mfdw6lkig72"; 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]; }; GetTDData = derive2 { name="GetTDData"; version="1.5.1"; sha256="0w77bc03k6qdpx1c87rdmnz976q9a5n84bav5xv78rg7yw7q5ksy"; depends=[bizdays curl dplyr readxl rvest stringr tidyr xml2]; }; GetoptLong = derive2 { name="GetoptLong"; version="1.0.5"; sha256="00fpm6nd3kqa2ikasxa62jzywi46fvvmx1mdavcp5yrxxn37j8wc"; depends=[crayon GlobalOptions rjson]; }; @@ -1973,11 +1983,9 @@ in with self; { GiniWegNeg = derive2 { name="GiniWegNeg"; version="1.0.1"; sha256="1wqwjalsyp55si839cil6na3khigm0mwn6qkg0kjylq10pabfk2a"; depends=[]; }; GlarmaVarSel = derive2 { name="GlarmaVarSel"; version="1.0"; sha256="080v2qckihhacclxi2zscslbwbc6179pc7g02lyqaicf9wrsr8ff"; depends=[ggplot2 glmnet Matrix]; }; GlmSimulatoR = derive2 { name="GlmSimulatoR"; version="0.2.5"; sha256="114mhhpv7phvrzvzar4s1a9032iyhcvixjx4h7b5vd1p23m9sayz"; depends=[assertthat cplm dplyr ggplot2 magrittr MASS statmod stringr tweedie]; }; - 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.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.7"; sha256="0m9fp54y4m1xxjqphpnxhw2hspzdca9qc9l60znpnynyj5m6cy2k"; 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]; }; + Gmisc = derive2 { name="Gmisc"; version="3.0.1"; sha256="05g7hdqnp8bjyn7lblnfnl9xjcrbbg6l06sackm38ilyba1hzy9g"; depends=[abind checkmate forestplot glue Hmisc htmlTable knitr lattice lubridate magrittr Rcpp rlang rmarkdown stringr XML yaml]; }; GmptzCurve = derive2 { name="GmptzCurve"; version="0.1.0"; sha256="00n28difj8qs3i539fsd2x07qakyjxf77l8rq5fy07h4f4cpyd0x"; depends=[]; }; GoFKernel = derive2 { name="GoFKernel"; version="2.1-1"; sha256="0xygsdmggl35fafyp431mkwalwixw2r3f32qll1pf72dfwd8y8d3"; depends=[KernSmooth]; }; GofCens = derive2 { name="GofCens"; version="0.92"; sha256="09qy8rsgywdlq04kn6dzdzahhminnx39ih9i84399kn2pnr9vlzi"; depends=[actuar fitdistrplus ggplot2 gridExtra survival survsim]; }; @@ -1993,15 +2001,16 @@ in with self; { GrapheR = derive2 { name="GrapheR"; version="1.9-86-3"; sha256="0wpq7w4lclkzj9ffmqwk2qp5r6kwggh7by47lvhmai4j8g2ha56c"; depends=[]; }; GrassmannOptim = derive2 { name="GrassmannOptim"; version="2.0.1"; sha256="1gdjx9dazrff2nj16044b7vr7jwddf5cj0iwnlhan46fnibsfwjf"; depends=[Matrix]; }; GreedyEPL = derive2 { name="GreedyEPL"; version="1.2"; sha256="19bgrgzb7jdqpljcbhr3d98y331k1b8fbwgcipak6zkhk2vr6vqz"; depends=[Rcpp RcppArmadillo]; }; - GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.4"; sha256="0j2grrnd4yn4d1ly62dzqq0y7l7mh3lpnlfpf5n41a9w489m03hw"; depends=[checkmate GreedyExperimentalDesignJARs kernlab nbpMatching Rcpp rJava survey]; }; + GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.5.5"; sha256="13xdynx28hx06gl0wjzxzbjh8q4chmvpma059lr46j3vzhwhzwik"; depends=[checkmate kernlab nbpMatching Rcpp rJava stringi stringr survey]; }; GreedyExperimentalDesignJARs = derive2 { name="GreedyExperimentalDesignJARs"; version="1.0"; sha256="14i6m5qlh1fca9xmzid01hicd3bkf6rzl139ss78gvw544zrapw7"; depends=[rJava]; }; - Greg = derive2 { name="Greg"; version="2.0.0"; sha256="0vqzjznwfzis5nylv889f06zhi4mb9mhd108ljgn8xlbcmkgmz1n"; depends=[broom dplyr Epi forestplot glue Gmisc Hmisc htmlTable knitr nlme purrr rlang rms sandwich stringr tibble tidyr tidyselect]; }; + Greg = derive2 { name="Greg"; version="2.0.1"; sha256="1c6bplnw7baya2jgqbhwl5rbd8mjrzhq9k8ljd0hwp1z4cxq5m4c"; depends=[broom dplyr Epi forestplot glue Gmisc Hmisc htmlTable knitr nlme purrr rlang rms sandwich stringr tibble tidyr tidyselect]; }; GreyModel = derive2 { name="GreyModel"; version="0.1.0"; sha256="0vxl4kgihcyl96qiz6sz5icznaa1jpsqqbn1irwmzyngwsh1qvzw"; depends=[]; }; - Greymodels = derive2 { name="Greymodels"; version="1.0"; sha256="1libv79qvh925ar8pyd9k18xcyvwbksr5gmlsbwin3z5q765ksgx"; depends=[cmna dplyr expm ggplot2 Metrics particle_swarm_optimisation plotly readxl scales shiny shinydashboard shinyWidgets]; }; + Greymodels = derive2 { name="Greymodels"; version="2.0.1"; sha256="0gv4kqgn10l3pknx7w26yas1h70gsb2h8a82w2ykxs134xl4vpll"; depends=[cmna dplyr expm ggplot2 Metrics particle_swarm_optimisation plotly readxl scales shiny shinydashboard shinyWidgets]; }; 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.4.2"; sha256="01207wc0z9z7m38lnmaf4hml6nva5bcld52clpr2dy9pfcd1x1pd"; depends=[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]; }; @@ -2012,10 +2021,10 @@ in with self; { HACSim = derive2 { name="HACSim"; version="1.0.6-1"; sha256="0hdczpn1x6zcxya8qlp82fzzpli3z2kfvynk5sqk97h1d55d27i4"; depends=[ape data_table matrixStats pegas Rcpp RcppArmadillo shiny]; }; HARModel = derive2 { name="HARModel"; version="1.0"; sha256="17sajqi2g5z69gvnfhkn850jkavi8syhm58xadd2khrm73nvwh2i"; depends=[Rcpp RcppArmadillo sandwich xts zoo]; }; HBSTM = derive2 { name="HBSTM"; version="1.0.2"; sha256="1rw0sav1xrw5sraah3yhw5ypyf99pi9h323nf02qidqfzr9xb214"; depends=[fBasics maps MASS]; }; - HBV_IANIGLA = derive2 { name="HBV.IANIGLA"; version="0.2.1"; sha256="08876xg44md619m8cj1xb34g8xyrp8231nh5z0q6dzggdyfvicir"; depends=[Rcpp]; }; + HBV_IANIGLA = derive2 { name="HBV.IANIGLA"; version="0.2.6"; sha256="1ngvw17k4i4cxdr59fsbm437fn1wqxjz7zn1l6aciygy3rlcncw9"; depends=[Rcpp]; }; HCR = derive2 { name="HCR"; version="0.1.1"; sha256="14s46dyw3ifp3pwwlcwbbl47i6hy2whjj1n65i28am5a33nycgha"; depends=[data_table]; }; HCT = derive2 { name="HCT"; version="0.1.3"; sha256="18k6p9y3vl39mxbvdjanyj3w74jqy2rym6rdbfrx5crvqm9k8hcp"; depends=[rstan]; }; - HCTDesign = derive2 { name="HCTDesign"; version="0.7.1"; sha256="0gwj4z2qwxqzx8b3hnb4bfg1pm78n9g4j5x8gis1rcfrk68sl7d5"; depends=[diversitree flexsurv mvtnorm Rdpack survival]; }; + HCTDesign = derive2 { name="HCTDesign"; version="0.7.2"; sha256="1nncyyw1dlbdl9f1pncwa9xdqrd7w2aw4ghnf01vwyq0m7pj90l1"; depends=[crayon diversitree flexsurv mvtnorm Rdpack survival]; }; HCTR = derive2 { name="HCTR"; version="0.1.1"; sha256="1hg8mpallwxpmamk6q8x87w5hlqqwvbahfw5zmr9pisiagbwcsay"; depends=[glmnet harmonicmeanp MASS ncvreg Rdpack]; }; HCV = derive2 { name="HCV"; version="1.2.0"; sha256="00ry36w2v4h3vkf2jq3djcma23xflr7fx7icy2vzwk9ffnmzvpxd"; depends=[BLSM cluster geometry M3C MASS Matrix rgeos sp]; }; HDBRR = derive2 { name="HDBRR"; version="1.1.4"; sha256="03jl1m099z6gj2ipi7rnjnrd2rmk4zs54332rwlqyf40dv7ndbz1"; depends=[bigstatsr MASS numDeriv]; }; @@ -2023,18 +2032,18 @@ in with self; { HDCurves = derive2 { name="HDCurves"; version="0.1.1"; sha256="1i4axgrm718wm9azrmdwwfysp9lfhn07kr1vgs0dnac1zaf5qzcs"; depends=[]; }; 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=[]; }; + HDInterval = derive2 { name="HDInterval"; version="0.2.4"; sha256="1xlljhzd30mi7pic7q55h7hv0bccxfc2g32piv8jx830svnz01xv"; depends=[]; }; HDLSSkST = derive2 { name="HDLSSkST"; version="2.1.0"; sha256="19snvpgiq8kxzqv6yimzn7nfxkch2xkm0sk41m7g4xwr412dn49j"; depends=[Rcpp]; }; HDMT = derive2 { name="HDMT"; version="1.0.5"; sha256="11wr7n6gj75k3a339h9hm167pni3vdbbnwwblc2b0wfljxsif6hf"; depends=[fdrtool qvalue]; }; HDOMDesign = derive2 { name="HDOMDesign"; version="1.0-1"; sha256="1wfq4w73dkkmfwn3n9rwpjlpvm1ak76dv9ymh6zqfls5whdmp59g"; depends=[HadamardR]; }; - HDShOP = derive2 { name="HDShOP"; version="0.1.2"; sha256="0qnxgp7fjinj9c96w724nxvmb2xbihj2wd6ysibr5dk4rvlq16p0"; depends=[Rdpack]; }; + HDShOP = derive2 { name="HDShOP"; version="0.1.3"; sha256="18i17vv71wc0rqfl2i9bcfl1ry3bd61x9nd6g57x37ggjp7i6j5k"; depends=[Rdpack]; }; HDSpatialScan = derive2 { name="HDSpatialScan"; version="1.0.3"; sha256="12aqqzqbapdh3zg2klhqwlhdvg35ayw126x54mj1iwlkmraxq2iv"; depends=[DT fmsb matrixStats pbapply plotrix purrr Rcpp RcppArmadillo rgeos sf sp SpatialNP swfscMisc TeachingDemos]; }; HDStIM = derive2 { name="HDStIM"; version="0.1.0"; sha256="0v43lwszxmka5li6mp10i2c6zq4si5hm2qsb27lib5gq5cxm23r7"; depends=[Boruta broom dplyr ggplot2 ggridges scales tibble tidyr tidyselect uwot]; }; HDTSA = derive2 { name="HDTSA"; version="1.0.1"; sha256="09b3jz552v3hmnhi6ag0dhc7nr5gdc688mcf3n9q8qzvc3l6dglc"; depends=[clime Rcpp RcppEigen sandwich]; }; HDclassif = derive2 { name="HDclassif"; version="2.2.0"; sha256="1l5zxhayhzh7q50ycl481hy0br66ylxyvzw1ahmjjrdkm8s3czyj"; depends=[MASS rARPACK]; }; HDclust = derive2 { name="HDclust"; version="1.0.3"; sha256="18l4qp261gj3kscfxs3s03kmb9y5ml31vnpgpm1iy125bks4mr2y"; depends=[Rcpp RcppProgress Rtsne]; }; HDcpDetect = derive2 { name="HDcpDetect"; version="0.1.0"; sha256="0ai35d9df5pmva52sb1rr20f11h0mbal6d179g865b7w6n90kfr1"; depends=[]; }; - HDiR = derive2 { name="HDiR"; version="1.1.2"; sha256="0hkpc5sap1xvl8difmivharfbxh6vzimh9642d9l48kmp7i1g9hb"; depends=[circular Directional movMF NPCirc rgl]; }; + HDiR = derive2 { name="HDiR"; version="1.1.3"; sha256="1qwd3y9645m8v2gdrb4xjpq86ixs9rgrw7iv3m5lm7nnf87qm350"; depends=[circular Directional movMF NPCirc rgl]; }; 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.2"; sha256="0m8xg6fkn81ni1npfadhv2b2zy7nazg46217hr3xw9y53d1a90gk"; depends=[]; }; @@ -2053,7 +2062,7 @@ in with self; { HLMdiag = derive2 { name="HLMdiag"; version="0.5.0"; sha256="0yy0qf9iw5gr40vlmm697rvvvgp077f08fialx3ijn0vfpsjbl2v"; depends=[diagonals dplyr ggplot2 ggrepel janitor magrittr MASS Matrix mgcv plyr purrr Rcpp RcppArmadillo reshape2 rlang stringr tibble tidyselect]; }; HLSM = derive2 { name="HLSM"; version="0.9.0"; sha256="1nvjgv8lbqpig9snnxm3k1qs1r7bf43gw7a3prj9l3kmqdd0i4j3"; depends=[abind coda igraph MASS]; }; HMB = derive2 { name="HMB"; version="1.1"; sha256="19z3d0b98fyjcnbxh3g6h2g927nv0408sbxjlzalrjlw9mbpzd2b"; depends=[Rcpp RcppArmadillo]; }; - HMDHFDplus = derive2 { name="HMDHFDplus"; version="1.9.18"; sha256="1npl0q75vfb7wi4fi6mn2grxswd0n612gxldggwkyz35s3fc4hbk"; depends=[httr rvest XML]; }; + HMDHFDplus = derive2 { name="HMDHFDplus"; version="1.9.19"; sha256="0wvlbgi95wibl40xhib0jlnxiddwhjv9v9qljxcg1bh7b76y7al5"; depends=[dplyr httr janitor lubridate readr rlang rvest stringr tidyr XML]; }; HMM = derive2 { name="HMM"; version="1.0.1"; sha256="03b548bnwqpnd7zypb4gvy9chyi5li2hp99a9vrh4qszxg2ihas7"; depends=[]; }; HMMEsolver = derive2 { name="HMMEsolver"; version="0.1.2"; sha256="0msin7rq3npz221mvrw3zcs6bwz439six99iblx5p3hkp1n1ljf3"; depends=[Rcpp RcppArmadillo Rdpack]; }; HMMcopula = derive2 { name="HMMcopula"; version="1.0.4"; sha256="1gmvav02r3miaq4jx05qjcgzw5qv6w1j77vck5gpps8p38zcp34m"; depends=[copula doParallel foreach matrixcalc mvtnorm]; }; @@ -2077,9 +2086,10 @@ in with self; { HSPOR = derive2 { name="HSPOR"; version="1.1.9"; sha256="06lr8l71y5fcqcnmgq7cgiab1pcc98wnqzndbxcbikbh33cx7nxv"; depends=[corpcor npregfast]; }; HTLR = derive2 { name="HTLR"; version="0.4-4"; sha256="0mi03r9izipvmla5pm0s42vm85ishr3bb8pjdw906s4q7lkxjivz"; depends=[BCBCSF glmnet magrittr Rcpp RcppArmadillo]; }; HTMLUtils = derive2 { name="HTMLUtils"; version="0.1.8"; sha256="1jfhcyibvxqc96sig81a2fj2gplmwxm5h000xlihkbjk7k9fdsrz"; depends=[R2HTML]; }; - HTRX = derive2 { name="HTRX"; version="1.0.7"; sha256="0ydzakwz1cy96z0fg29snxdwcn5czsvgxk2p1al9fh51llqrpbvb"; depends=[caret fastglm]; }; + HTRX = derive2 { name="HTRX"; version="1.1.0"; sha256="0hi52vamlhr81v6q9dk8gs199j6bzx0j9336nx97wzbxz2swkrbh"; depends=[caret fastglm glmnet]; }; HTSCluster = derive2 { name="HTSCluster"; version="2.0.10"; sha256="0scn4fsfmlkzxibfhsh6krm2cl9c8hsmyjgn48k9dyjf0ylyxg9n"; depends=[capushe edgeR plotrix]; }; HTSSIP = derive2 { name="HTSSIP"; version="1.4.1"; sha256="1j2f6f3i4di4bvsk44gxz0narg45ld2rahfn23wpgni5bszy0vb3"; depends=[ape coenocliner DESeq2 dplyr ggplot2 igraph lazyeval magrittr phyloseq plyr stringr tidyr vegan]; }; + HTT = derive2 { name="HTT"; version="0.1.1"; sha256="14a96p8vhb6acsjic66nsc9llvxyqd0ry1yccsjlxw12mami0vs0"; depends=[ggplot2 ggraph igraph Rcpp]; }; HUM = derive2 { name="HUM"; version="2.0"; sha256="06jx3f2zb52gjp05bq3zmgjkyiaa2j9v0biq23gg88gplpign6jw"; depends=[gtools Rcpp rgl]; }; HWEintrinsic = derive2 { name="HWEintrinsic"; version="1.2.2"; sha256="035r5bi7m66g351cmrfmf4cj5qqm4fn5pgy3lzsp3gyp2dv0rkg5"; depends=[]; }; HYPEtools = derive2 { name="HYPEtools"; version="1.1.0"; sha256="1jjcjvr2yamvxwgyvypzh54s4q8nkra565gmq00cbrkff41356iv"; depends=[clipr data_table dplyr ggplot2 ggpubr hydroGOF ncdf4 patchwork pbapply purrr rlang sf stringr tidyr tidyselect]; }; @@ -2094,11 +2104,12 @@ 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.3"; sha256="06fa77lc42dkimn3h5lcxbp92myydsj91j0sskh0k4igwazxdrk6"; depends=[MomTrunc mvtnorm PerformanceAnalytics sampleSelection]; }; HellCor = derive2 { name="HellCor"; version="1.3"; sha256="1bzc2ipm7vw7s849d43lcs0xrk2rs67h223dn9kahqg152mmknza"; depends=[energy FNN orthopolynom]; }; - HelpersMG = derive2 { name="HelpersMG"; version="5.7"; sha256="1l0hy417r54ljk9mwgx8zzx95v4gvd5s6yhwy5fx7p44lidnanvr"; depends=[coda ggplot2 MASS Matrix rlang]; }; + HelpersMG = derive2 { name="HelpersMG"; version="5.8"; sha256="1ijibkb48qggvj51kyn5fnmq903pyf0w1ambvc5ksx199774ccf4"; depends=[coda ggplot2 MASS Matrix rlang]; }; HeritSeq = derive2 { name="HeritSeq"; version="1.0.2"; sha256="0jzf3pq43lllxvvmf0rqzxz9fx6931mgb0ipminlw1iakz8wa6w3"; depends=[cplm DESeq2 lme4 MASS pbapply SummarizedExperiment tweedie]; }; HeterFunctionalData = derive2 { name="HeterFunctionalData"; version="0.1.0"; sha256="0qrfmxwrxn0rd2ncy3afhraf7m0010nf9739jkj19h1j5vksi9n1"; depends=[]; }; HeteroGGM = derive2 { name="HeteroGGM"; version="0.1.0"; sha256="0cfzqhbnsy2254m1n6vbpcxlmiqw7cs26v81f5wyawlyyvdydmxi"; depends=[igraph MASS Matrix]; }; HextractoR = derive2 { name="HextractoR"; version="1.4"; sha256="1wp7n92wgrjyklq159ymrw8y5ads6lhj2fcz54rzdnccdyx5naxi"; depends=[doParallel foreach seqinr]; }; + HhP = derive2 { name="HhP"; version="1.0.0"; sha256="0rmvw52a7a75gcwsyv30wvxrb9ykhg4ji3pj2jhgbzjqdc4s9xzw"; depends=[fmrs MASS Matrix]; }; HiCfeat = derive2 { name="HiCfeat"; version="1.4"; sha256="1imz7zfax74aakzk8457jww9r66qxpr2ncyvjj0y5paxdn76lnnq"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; }; HiClimR = derive2 { name="HiClimR"; version="2.2.1"; sha256="11aip68cjyy70xr0la1apk6gbkabg8vnc3s5cbydyz7yl4v80nn8"; depends=[ncdf4]; }; HiCseg = derive2 { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; }; @@ -2113,9 +2124,10 @@ in with self; { HistData = derive2 { name="HistData"; version="0.8-7"; sha256="0cs231w4x8sw2dwy04xwiw01rr2brfz9smwmplw5g1jv1d7afnlj"; depends=[]; }; HistogramTools = derive2 { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; }; HiveR = derive2 { name="HiveR"; version="0.3.63"; sha256="1vi24k23a017czfy9kihmq4s1dywzm274dyhyp1imx94afsnmhc3"; depends=[jpeg plyr png RColorBrewer rgl]; }; - Hmisc = derive2 { name="Hmisc"; version="4.7-1"; sha256="0zrfi2mmi6wfl6440iqflzzmkina8dhxia2qsamqw6djd0d5fp9j"; depends=[base64enc cluster data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools lattice latticeExtra nnet rpart survival viridis]; }; + Hmisc = derive2 { name="Hmisc"; version="4.7-2"; sha256="0lyacs5q6mdg9lirixl9r2dqs9ljxyn5d53mmb04ci0jam3vk0wc"; depends=[base64enc cluster data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools lattice latticeExtra nnet rpart survival viridis]; }; Hmsc = derive2 { name="Hmsc"; version="3.0-13"; sha256="13gqwjniwxc5lgsj044qjq6ic0ibwvj3mviw4hq31s89m834gvyb"; depends=[abind ape BayesLogit coda fields FNN ggplot2 MASS Matrix matrixStats MCMCpack nnet pracma pROC rlang sp statmod truncnorm]; }; HoRM = derive2 { name="HoRM"; version="0.1.3"; sha256="09dkpzlwkkdn0z8g9fbb7hzxbrrq70x9v1zx254svck2jyk0hx58"; depends=[ggplot2 MASS orthopolynom quantmod rsm]; }; + HodgesTools = derive2 { name="HodgesTools"; version="1.0.0"; sha256="02i87pd5ah3mmf03878354p8nqh3bgn9cnrl1pnnrb3qw7afj19q"; depends=[data_table dplyr ggplot2 ini magrittr qqman RColorBrewer readr RecordLinkage]; }; Homeric = derive2 { name="Homeric"; version="0.1-3"; sha256="1vcs8fj39zpz45p7gph0mnx65hgr35na0b79i8llyw7i1h7zqzxr"; depends=[]; }; HomomorphicEncryption = derive2 { name="HomomorphicEncryption"; version="0.1.0"; sha256="1agw7s9ccj4hi74scqqs8v65gsavxb5c3217rw0kk9cibq7bma2v"; depends=[polynom]; }; HostSwitch = derive2 { name="HostSwitch"; version="0.1.2"; sha256="0gxln6375li33sl4ampw9d926d4bfd58ls7bgba6baqp87p9wq16"; depends=[checkmate ggplot2 purrr shiny tippy]; }; @@ -2123,7 +2135,7 @@ in with self; { HotellingEllipse = derive2 { name="HotellingEllipse"; version="1.1.0"; sha256="1xvm54iqgdnqjpkmgi4ssgpdz2pap60y9z9whrv2ky3q16mjqycz"; depends=[dplyr FactoMineR ggforce ggplot2 lifecycle magrittr purrr tibble]; }; HuraultMisc = derive2 { name="HuraultMisc"; version="1.1.1"; sha256="0bi1y7icrg0f4n9ah9dsrijnfr39bqg3799rz4hccd1b061f0rvj"; depends=[cowplot dplyr ggplot2 HDInterval Hmisc magrittr reshape2 rstan tidyr]; }; HurreconR = derive2 { name="HurreconR"; version="1.0"; sha256="0ga9dzywpn8hm2vq36y3mhsxzvs151xknjjljmcihaczph6yyny4"; depends=[raster rgdal]; }; - HyRiM = derive2 { name="HyRiM"; version="2.0.1"; sha256="09njf2gscn13x5mfd7g76cam9bzbibcnc383gb8h0kks7x16d3p9"; depends=[compare grImport2 orthopolynom purrr Rglpk]; }; + HyRiM = derive2 { name="HyRiM"; version="2.0.2"; sha256="02hb8kl02872xvyhg0k19xavcmhqmf0ddfnxx5nxlpzgzb432csd"; depends=[compare grImport2 polynom purrr Rglpk]; }; 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=[]; }; @@ -2141,7 +2153,7 @@ in with self; { IBDLabels = derive2 { name="IBDLabels"; version="1.1"; sha256="1m9fd058yjxva6hin7i72i2nl285wfm0jkdn5xcng27yqlijyrm9"; depends=[]; }; IBDsim = derive2 { name="IBDsim"; version="0.9-8"; sha256="1a0xz1khl6cz6ajcn903fcmsv8g7hfdh7684zhk0g6awsgwqdf5q"; depends=[paramlink]; }; IBMPopSim = derive2 { name="IBMPopSim"; version="0.3.1"; sha256="1infqxfwqg6y4d8g3wmi3wg243hqjjmzirm00dhxiav4ps8yrg1q"; depends=[checkmate dplyr ggplot2 purrr Rcpp readr reshape rlang tidyr]; }; - IBrokers = derive2 { name="IBrokers"; version="0.10-1"; sha256="0fvbgcbxmgjnzqrxwc4iq14li9gxkg0bd4yj9wgx4y6akn7xaykw"; depends=[xts zoo]; }; + IBrokers = derive2 { name="IBrokers"; version="0.10-2"; sha256="06pp2fgzbwpk95r0pvaskx44q33mlady8bq5i13c4qc60vkafyag"; depends=[xts zoo]; }; ICAMS = derive2 { name="ICAMS"; version="2.3.10"; sha256="0kkxn45addgl7mg8w4ybna7xaj11dgrwax06l0ml3bnk8h0nrgi5"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges IRanges RColorBrewer stringi zip]; }; ICAOD = derive2 { name="ICAOD"; version="1.0.1"; sha256="07fxh60vsndlvjijjsh1a9l2qkp78sb9nkg5x5mslh209lpjjhw1"; depends=[cubature mnormt mvQuad nloptr Rcpp RcppEigen sn]; }; ICBioMark = derive2 { name="ICBioMark"; version="0.1.4"; sha256="1bvlbczlkjdql98ds5wgmg3j2dxbfm5i4yzq98pdkzaiccg8sx2v"; depends=[dplyr gglasso ggplot2 glmnet latex2exp Matrix matrixStats PRROC purrr]; }; @@ -2163,6 +2175,7 @@ in with self; { ICSOutlier = derive2 { name="ICSOutlier"; version="0.3-0"; sha256="1vj1y4zw8pkghkg4qnmx0yk1yw4zzl9075n5czrna9ckk2p29fmh"; depends=[ICS moments mvtnorm]; }; ICSS = derive2 { name="ICSS"; version="1.1"; sha256="0kmsw8347ka5n0qncx7hqgs153ihkmxbl0wc5kqlb2l42sl6rp8x"; depends=[rstack]; }; ICSShiny = derive2 { name="ICSShiny"; version="0.5"; sha256="0a13vps0mkv5qs6qnl7ar0mdbkbd7i1c6kgwahmkb3id3n9bw0cl"; depends=[DT ICS ICSNP ICSOutlier rrcov shiny simsalapar]; }; + ICSsmoothing = derive2 { name="ICSsmoothing"; version="1.2.6"; sha256="14rs07594xzvsy62k3qacx5va4k7wq595bnp28vnvrmnqb219kk1"; depends=[ggplot2 polynom]; }; ICV = derive2 { name="ICV"; version="1.0"; sha256="1na87i39jy5d8ibldqcqz3a072ihkgcl0k629sxch9hk6v6j5lly"; depends=[]; }; ICcalib = derive2 { name="ICcalib"; version="1.0.8"; sha256="1y2w12ka0qxh9dg6dlcrnndz1xrv8gkppan64qkyk5vjrh18ajz4"; depends=[fitdistrplus icenReg ICsurv MASS msm numDeriv Rcpp RcppArmadillo survival]; }; ICcforest = derive2 { name="ICcforest"; version="0.5.1"; sha256="0z511d3drq5flxwvx7kjv3v5yanjhvs5ayvkm996jbiz3k49a12v"; depends=[icenReg ipred partykit survival]; }; @@ -2178,18 +2191,17 @@ in with self; { 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="2.4"; sha256="1ppbq27nw3xgvpr6lswx3hfx2jkr9rnkcq7hvzpz44x5mk8dc3vw"; depends=[base64enc doParallel foreach ggplot2 gridExtra IDSL_MXP png readxl RNetCDF xml2]; }; - IDSL_MXP = derive2 { name="IDSL.MXP"; version="1.6"; sha256="0mc3p7s9y0nm1xpajq06039bpfsq8qfwk1azicrkd53dsvqbbg45"; depends=[base64enc RNetCDF xml2]; }; + IDSL_IPA = derive2 { name="IDSL.IPA"; version="2.5"; sha256="0zfskczgpw57z94la0n5883mhcmijgknb7sf87cr5wz3kgp19qxd"; depends=[doParallel foreach IDSL_MXP readxl]; }; + IDSL_MXP = derive2 { name="IDSL.MXP"; version="1.7"; sha256="0mh15bcrv3iy033l9ry0j0b0my3xxyn32p52rrfya5ybc0d35c79"; depends=[base64enc xml2]; }; IDSL_SUFA = derive2 { name="IDSL.SUFA"; version="1.1"; sha256="1jfw96xgwd55lpif3wm0xj4ly48rff7ay8g0bx898jd4jyr05idz"; depends=[]; }; - IDSL_UFA = derive2 { name="IDSL.UFA"; version="1.6"; sha256="17x703za3smx2mlb1hvyx8agq8anw0932ssf2l14c09h5n139yh6"; depends=[base64enc doParallel foreach GA ggplot2 gridExtra IDSL_IPA IDSL_MXP readxl RNetCDF xml2]; }; - IDSL_UFAx = derive2 { name="IDSL.UFAx"; version="1.6"; sha256="09ghkvwywhi0790wql1lrpcgylpx3pxzclw1cbq2lcpmi9lyq0xw"; depends=[base64enc doParallel foreach IDSL_IPA IDSL_MXP IDSL_UFA RcppAlgos readxl RNetCDF xml2]; }; - IDSpatialStats = derive2 { name="IDSpatialStats"; version="0.3.12"; sha256="0gkicafnzq8aq9bmbbr9n868sh91dwkhs1dk4wry5vkbfaawfxis"; depends=[doParallel foreach igraph spatstat_core spatstat_geom]; }; + IDSL_UFA = derive2 { name="IDSL.UFA"; version="1.7"; sha256="0g3q2qih21kv72cl2bpcf84mdc9kg3jqcbpyd4phbsdq9bj519q8"; depends=[doParallel foreach IDSL_IPA readxl]; }; + IDSL_UFAx = derive2 { name="IDSL.UFAx"; version="1.7"; sha256="09g7zbvimhcfj2zwngsfgjfrrkj3ljfdibwdq4zrwijd0n09g9b3"; depends=[doParallel foreach IDSL_IPA IDSL_UFA RcppAlgos readxl]; }; 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.9"; sha256="0shgcwbcllf9xb97pdpf4mb1xzvh5b2q784qdliac7hzymd2jg62"; depends=[DescTools doParallel doRNG foreach glmnet HDCI mathjaxr Matrix MatrixExtra parallelly S4Vectors stringr SummarizedExperiment]; }; - IFC = derive2 { name="IFC"; version="0.1.7"; sha256="0nw0bkw9qk535q1cdhhb8j8k7hx56m62swlz91d57kqs064j9mkn"; depends=[DT gridExtra jpeg KernSmooth lattice latticeExtra png Rcpp RcppProgress tiff visNetwork xml2]; }; + IFAA = derive2 { name="IFAA"; version="1.1.0"; sha256="0rk9xwpcm2dhf1fxm9adyhmpvf8ibg8m2v4jn5x1alynnzwdm25j"; depends=[DescTools doParallel doRNG foreach glmnet HDCI mathjaxr Matrix MatrixExtra parallelly S4Vectors stringr SummarizedExperiment]; }; + IFC = derive2 { name="IFC"; version="0.1.8"; sha256="16ipdrn423x09wngv86a86gqh19fcpdy9gv2f08asfmyhz8jxkv6"; depends=[DT gridExtra gridGraphics jpeg KernSmooth lattice latticeExtra png Rcpp tiff visNetwork xml2]; }; IFP = derive2 { name="IFP"; version="0.2.4"; sha256="066wz6bjqcvq22gjg2wcmglp798f87rsc8yhm13p0dic3arb5ph6"; depends=[coda haplo_stats]; }; IGCities = derive2 { name="IGCities"; version="0.2.0"; sha256="1564bzvi6vgg9q8s97mxjwklr83vkcv8f526savkhnjxdzi1zmy0"; depends=[]; }; IGST = derive2 { name="IGST"; version="0.1.0"; sha256="12ycrfsgwakaj3k39k1j4ky58wr7a2ibyz6j9cznvjjv6cgz9zg5"; depends=[BootMRMR e1071]; }; @@ -2215,14 +2227,16 @@ in with self; { INTRIGUE = derive2 { name="INTRIGUE"; version="0.1.0"; sha256="1l1vfl0m4iqniwp4bp1bfjpqhwahg341fpyxhryr0j8lypqaw7si"; depends=[dplyr rlist SQUAREM]; }; IOHanalyzer = derive2 { name="IOHanalyzer"; version="0.1.6.3"; sha256="1y8qvjm9mrdfxzgxyn5w8798gay0mf4l5lw7s845bcglpyr91q6p"; depends=[colorRamps colorspace data_table dplyr ggplot2 httr knitr magrittr plotly RColorBrewer Rcpp reshape2 shiny stringi]; }; IOHexperimenter = derive2 { name="IOHexperimenter"; version="0.1.4"; sha256="0aacliznncl488rjsnx02pfj1mchhcyb36v816g959ll38pvc6bk"; depends=[assertthat BH magrittr Rcpp]; }; + IOLS = derive2 { name="IOLS"; version="0.1.1"; sha256="196lbdz5154j7s20cn1qb10kx6fk6mvn4dvm4pwrg8d1lj4nznfr"; depends=[boot matlib randomcoloR sandwich stringr]; }; IPCAPS = derive2 { name="IPCAPS"; version="1.1.8"; sha256="17ifkgjjnvvcc8dp065ng4ad9lr85lcdcb401vi84yy8m2llbypw"; depends=[apcluster expm fpc KRIS LPCM MASS Matrix Rmixmod]; }; IPCWK = derive2 { name="IPCWK"; version="1.0"; sha256="0hah1xl6zli0346jh57rjc5x8vynhaysj0l481rmvznsghv6im23"; depends=[MASS survival]; }; IPDFileCheck = derive2 { name="IPDFileCheck"; version="0.7.5"; sha256="1y0qq6q98lq1srsp1mlb7mr9zn2v4j7gpzim9fgh3xarw6a89i0h"; depends=[dplyr eeptools effsize gmodels gtsummary hash kableExtra lmtest lubridate stringr testthat tidyselect tidyverse zoo]; }; IPDfromKM = derive2 { name="IPDfromKM"; version="0.1.10"; sha256="1pqi6cshiha4gnra25fgpggyi42mn2hg25s9m9mh091rn5km44q0"; depends=[dplyr ggplot2 gridExtra readbitmap survival]; }; IPEC = derive2 { name="IPEC"; version="1.0.3"; sha256="1f5draxw3q26d03h6mcyc8zrd1gmizmc0v01sppdnx8a21878rqz"; depends=[MASS numDeriv]; }; - IPEDSuploadables = derive2 { name="IPEDSuploadables"; version="2.5.5"; sha256="04mliv44p3nfg898cxlw8k2kdpmfmyglvd2c4waka1qppinhvyap"; depends=[dplyr lubridate magrittr purrr rlang stringr svDialogs tidyr]; }; + IPEDS = derive2 { name="IPEDS"; version="0.1.0"; sha256="122v4m3lf5ix10a1ihw1qi8w975iamscaqg2vc5f5k6z8dy9s6ph"; depends=[dplyr readr rlang tidyr]; }; + IPEDSuploadables = derive2 { name="IPEDSuploadables"; version="2.6.5"; sha256="05klj38wh4bywgahkzwyajsvy2nc1jy86klkbhh7m8hs4qw6kh8r"; depends=[dplyr lubridate magrittr purrr rlang stringr svDialogs tidyr]; }; IPLGP = derive2 { name="IPLGP"; version="2.0.3"; sha256="02gjsbd5bfqi575xs3fq01r1cr01gmsxxb58bfj3npgwba8vah21"; depends=[ggplot2 sommer]; }; - IPMbook = derive2 { name="IPMbook"; version="0.1.3"; sha256="0wjzp3l7w4cp0g6c1q84l18pkb0sjjnspidxdv32pn7rqj7wsmcf"; depends=[abind]; }; + IPMbook = derive2 { name="IPMbook"; version="0.1.4"; sha256="152y6d949jjfdfmcjfi0g4p2d02pmqgamxmx5bi3wb352jbjxl08"; depends=[abind]; }; IPPP = derive2 { name="IPPP"; version="1.1"; sha256="19ccs25fd56ns7ssi51w2jzjd4d57vyimwmfvf27mmigb537bd5y"; depends=[]; }; IPV = derive2 { name="IPV"; version="1.0.0"; sha256="0h1x2scmwgzl7i0kk4pf7kfq55yiqn065s5r944rrfk09y9g2vgy"; depends=[ggforce ggplot2 lavaan Matrix reshape2 stringr]; }; IPWboxplot = derive2 { name="IPWboxplot"; version="0.1.1"; sha256="07qvdflwmyy0406xkkgja31cggfv4pak2hhnhh8fwggj2zkj9z8n"; depends=[isotone]; }; @@ -2235,13 +2249,13 @@ in with self; { IRTest = derive2 { name="IRTest"; version="0.0.2"; sha256="0fgr7s97mbqy561hwcll11cyx9b5csp0db3iashgs8jbv6q59vgk"; depends=[betafunctions dcurver ggplot2]; }; IRdisplay = derive2 { name="IRdisplay"; version="1.1"; sha256="0awdiv4rr93y8jb1d64sm1iy37ywyniqm7w98yv6qm0zz47h7sw3"; depends=[repr]; }; IRexamples = derive2 { name="IRexamples"; version="0.0.2"; sha256="0a8b5bfjg0f5l2awg1q80xb9i0fbvss466z7j61lzpps83059w9r"; depends=[DisImpact dplyr forcats geodist ggplot2 ggthemes maps RSelenium rstanarm rvest sf survey tidycensus tidygeocoder tigris twang]; }; - IRkernel = derive2 { name="IRkernel"; version="1.3"; sha256="00qrmsywpzw2hfp88020zjaijma7q4hqm9h2cz53rywdjzywnzss"; depends=[crayon digest evaluate IRdisplay jsonlite pbdZMQ repr uuid]; }; + IRkernel = derive2 { name="IRkernel"; version="1.3.1"; sha256="03343ds7sprql1c6h41dibk40rc3225mzxca452ns967fyhy71ii"; depends=[crayon digest evaluate IRdisplay jsonlite pbdZMQ repr uuid]; }; IRon = derive2 { name="IRon"; version="0.1.3"; sha256="0w2impcvy0chsq7y1dxrxmw70aagddnp3i2vcp4y0hnsqn34xzps"; depends=[ggplot2 ggpubr gridExtra Rcpp robustbase scam]; }; ISAT = derive2 { name="ISAT"; version="1.0.5"; sha256="0xlq568spfz527jxbqamrn1j87hnasg0kp2bcyjycaghmhsc6zmg"; depends=[gtools stringr]; }; ISCO08ConveRsions = derive2 { name="ISCO08ConveRsions"; version="0.1.1"; sha256="1vqg28alpjb1m33hzh4ixfd6f3gzc6l9989gpszvl3ishki05xqf"; depends=[]; }; ISEtools = derive2 { name="ISEtools"; version="3.2.0"; sha256="1dj8q1072j7sn7j9s2mjxm12k6kn5gcqpic8jp2k1f3f7b85dbij"; depends=[coda]; }; ISLR = derive2 { name="ISLR"; version="1.4"; sha256="1hr0r00m9y39gzb4q7nip07mhxmaly12zwmwkisyx641h0vcclbi"; depends=[]; }; - ISLR2 = derive2 { name="ISLR2"; version="1.3-1"; sha256="1hmcpw3nrldxayklp0whlgd5xi1zap8j5g2231i5hp3lsqh6skg6"; depends=[]; }; + ISLR2 = derive2 { name="ISLR2"; version="1.3-2"; sha256="0ljz5lb5srilziyqgka4rcp7d5r4hs6jq9fm3gi1g57agn896vyn"; depends=[]; }; ISM = derive2 { name="ISM"; version="0.1.0"; sha256="0by0w6zgnwcwzbmxx16s8mb1avhc6aiavqp0qkxx6hr70vrgb997"; depends=[rJava xlsx xlsxjars]; }; ISOcodes = derive2 { name="ISOcodes"; version="2022.09.29"; sha256="1rag5mb3bbyxp8n32rhfyy752cy9hh5j80lp9xljj70scvglzbjb"; depends=[]; }; ISOpureR = derive2 { name="ISOpureR"; version="1.1.3"; sha256="1ydhsh3v6n7prrg0dm7hsg8wx1244g791xnz1sjyhljhm31hgwc0"; depends=[futile_logger Rcpp RcppEigen]; }; @@ -2253,7 +2267,7 @@ in with self; { ITRLearn = derive2 { name="ITRLearn"; version="1.0-1"; sha256="03xdbpn3qddcq9krdpnywd3xbzfh2viym2qqx6rcqs7w7bdhhlk6"; depends=[Formula kernlab]; }; ITRSelect = derive2 { name="ITRSelect"; version="1.0-1"; sha256="0llr4hrlbnb728j5rw7vd3r9qlqf571hrldnm72kicis5di2v5di"; depends=[Formula Matrix ncvreg Rglpk svMisc]; }; IVYplot = derive2 { name="IVYplot"; version="0.1.0"; sha256="1v739xlim3mcw09cyp4z3cbb25ipkpwm9h378fwy2ycp8lmq32gy"; depends=[plyr]; }; - IceSat2R = derive2 { name="IceSat2R"; version="1.0.3"; sha256="1jlrp2rhxsmcryhcxn124m5m8cak148q5856j4ay1xn0bi4nwqxq"; depends=[data_table doParallel foreach glue httr leafgl leaflet leaflet_extras leafsync lubridate lwgeom magrittr miniUI rnaturalearth rvest sf shiny units]; }; + IceSat2R = derive2 { name="IceSat2R"; version="1.0.4"; sha256="1jwy1fwnc2rq3c643maa2h7hrwzq0sm6iv35kil95n3pw7pkgdy3"; depends=[data_table doParallel foreach glue httr leafgl leaflet leaflet_extras leafsync lubridate lwgeom magrittr miniUI rnaturalearth rvest sf shiny units]; }; IgAScores = derive2 { name="IgAScores"; version="0.1.2"; sha256="0ckqjbn0xc894dc23gbaqzr6z6rl5h0k8gc5gjhbhwvrc2zlyfsp"; depends=[]; }; ImaginR = derive2 { name="ImaginR"; version="0.1.7"; sha256="12ypfrqw6xym84i1axd3h0qd2md96rc0glas3rgzpdhdyw4lbfmn"; depends=[imager jpeg]; }; Immigrate = derive2 { name="Immigrate"; version="0.2.1"; sha256="0pnnvv63kkg7pgyblb1vlx54c6169n40fn58aypdy5xcnknabvxn"; depends=[pROC Rcpp]; }; @@ -2279,7 +2293,6 @@ in with self; { InflectSSP = derive2 { name="InflectSSP"; version="1.4.5"; sha256="02g8w4xfj0xs5fzjmx9vzhd7nn2aici8ircl8y4xr97pq3w7chg6"; depends=[data_table GGally ggplot2 httr jsonlite network plotrix RColorBrewer readxl svglite tidyr xlsx]; }; InfoTrad = derive2 { name="InfoTrad"; version="1.2"; sha256="0blfn59w73hjga15sw8plwvn6yq9fj95nxwp018mp1harl8wa5db"; depends=[nloptr]; }; Information = derive2 { name="Information"; version="0.0.9"; sha256="0pszwzj3r7vdvdsy9w1qz95zxp7y2bsyg36b58mm4qcvcvymd4kn"; depends=[data_table doParallel foreach ggplot2 iterators plyr]; }; - InformationValue = derive2 { name="InformationValue"; version="1.2.3"; sha256="1b5g2wyp7x5cdhmf4325n3q7afa6i352lh80j28c8s4356pr3w9j"; depends=[data_table ggplot2]; }; InformativeCensoring = derive2 { name="InformativeCensoring"; version="0.3.5"; sha256="1c8mfb82px9z27lc7br514mcbl65q7lfa3df9w3vvnk5g7ljswha"; depends=[boot dplyr survival]; }; Infusion = derive2 { name="Infusion"; version="2.0.0"; sha256="1f4j8qy6ykwp0xi8gbh2f4n6awc8zd5sqxgb7fgjmdw3k7gvs1ah"; depends=[blackbox foreach mvtnorm numDeriv pbapply proxy ranger spaMM viridis]; }; InjurySeverityScore = derive2 { name="InjurySeverityScore"; version="0.0.0.2"; sha256="0g52cksa774in18ykrym61l3my9zm343bgsq5mg7mki9x65xd35z"; depends=[dplyr rlang tidyr]; }; @@ -2297,8 +2310,8 @@ in with self; { InteractionPoweR = derive2 { name="InteractionPoweR"; version="0.2.0"; sha256="09d3v425nj8ph8qsm85z68rixq7k1yppf5v0jmh8klbhn5rikajn"; depends=[chngpt doParallel dplyr foreach ggbeeswarm ggplot2 MASS polynom rlang tidyr]; }; 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]; }; - InterpretMSSpectrum = derive2 { name="InterpretMSSpectrum"; version="1.2"; sha256="1iaw4i14l2vp1f163g2q4pwv9cnqrx14ik4s8zw0iha4zwcrc3ja"; depends=[DBI doParallel enviPat foreach plyr Rdisop RSQLite]; }; - IntervalQuestionStat = derive2 { name="IntervalQuestionStat"; version="0.1.0"; sha256="17q9y2if60g4546jwkyyi9p2vbkzbzgnf4zwbxw4fz3473w84sls"; depends=[]; }; + InterpretMSSpectrum = derive2 { name="InterpretMSSpectrum"; version="1.3.3"; sha256="1nvi5l0m5118b0m65l52mby34vw05nhp37pl6rba1220a10iasih"; depends=[enviPat plyr Rdisop]; }; + IntervalQuestionStat = derive2 { name="IntervalQuestionStat"; version="0.2.0"; sha256="0pvz5l0pvw8akmvv51c48fx1ppms9iq6s4bwscja8jk56akx2wlq"; depends=[]; }; IntervalSurgeon = derive2 { name="IntervalSurgeon"; version="1.1"; sha256="0dhsy40wx47g7h8ivriscyvxwl991lfal4nq0j476kamxax0yzbw"; depends=[Rcpp]; }; InvStablePrior = derive2 { name="InvStablePrior"; version="0.1.0"; sha256="1nkbly897prbffdrcrxdvr16f6ipm3if1dg3rm35jcl2ksya6snd"; depends=[fdrtool nimble]; }; InvariantCausalPrediction = derive2 { name="InvariantCausalPrediction"; version="0.8"; sha256="01ckyvjl9lxdpkr0v1da4n4lw3b5z1bxlmf0v6ibqly1mhfwybjl"; depends=[glmnet mboost]; }; @@ -2351,7 +2364,7 @@ in with self; { JWileymisc = derive2 { name="JWileymisc"; version="1.3.0"; sha256="1g1mpdxdl27y5ixyfa0fr0zzs0wmvkc2ddnc1bmjyk8xbf2kpd7y"; depends=[data_table digest emmeans extraoperators fst ggplot2 ggpubr ggthemes lavaan lme4 MASS mgcv mice multcompView psych quantreg rms robustbase VGAM]; }; JacobiEigen = derive2 { name="JacobiEigen"; version="0.3-4"; sha256="1jm63w2jn89pk725x3d9myq010mb0g5ir8vhv29mkiwgrqig6iw1"; depends=[Rcpp]; }; JamendoR = derive2 { name="JamendoR"; version="0.1.1"; sha256="0rrfbci413mqq53p5fyj8rjangdx21iyin6hzqkxyrxrv3n5mfbx"; depends=[dplyr httr jsonlite]; }; - JavaGD = derive2 { name="JavaGD"; version="0.6-4"; sha256="1q48iykjzy22avmx0yy03vv9c7h87qsphg5hsrzfmx5gvck61m06"; depends=[rJava]; }; + JavaGD = derive2 { name="JavaGD"; version="0.6-5"; sha256="1wl31k02x3j9hpf8c8gsmi3k3b3vz9a3y38pz6wa9r41r791rnr1"; depends=[rJava]; }; Jaya = derive2 { name="Jaya"; version="0.1.9"; sha256="0b23l7xp4waxjy1vkk09xaali5axr5900v9hkki4f75wh4gb1l53"; depends=[GA]; }; Jdmbs = derive2 { name="Jdmbs"; version="1.4"; sha256="14wprvxjyx1da1642z11wkzjiyxd5rbpaw1mzq4x6aw53dvh1kgv"; depends=[ggplot2 igraph png]; }; Jmisc = derive2 { name="Jmisc"; version="0.3.1.1"; sha256="0fcch7rg8gn92855smd7h2andr33h9dnccjy12w2bx0px8rnqa0s"; depends=[]; }; @@ -2378,7 +2391,7 @@ in with self; { KMsurv = derive2 { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; }; KMunicate = derive2 { name="KMunicate"; version="0.2.2"; sha256="13lkblm4kn8m4fr6cms8jz1ankxkynics04ajzfrxf6rd6b1xhc8"; depends=[checkmate cowplot ggplot2 pammtools survival tidyr]; }; KNNShiny = derive2 { name="KNNShiny"; version="0.1.0"; sha256="16zm8bhdivaap3mvhdx2qn1b1j2iqyarclb0y2qd1n4viwcfm9c1"; depends=[caret dplyr e1071 FNN psycho rhandsontable rmarkdown shiny]; }; - KODAMA = derive2 { name="KODAMA"; version="2.2"; sha256="0qis85v9g23f17grb1d69l8s7qdlya72fscvqh75k7sly5jlbpix"; depends=[minerva Rcpp RcppArmadillo Rtsne]; }; + KODAMA = derive2 { name="KODAMA"; version="2.3"; sha256="0b8kgr2y623nrw1658s3daja1x25sg4icxcmvlm1fvp0bs2k1w54"; depends=[minerva Rcpp RcppArmadillo Rtsne umap]; }; 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.2"; sha256="1i9kpr0pib6a8qn7ibmhbay4vxr96ca4kcp5aswmlvcv4ycmw6lx"; depends=[data_table kernlab mlpack proxy RANN]; }; @@ -2396,6 +2409,7 @@ in with self; { Karen = derive2 { name="Karen"; version="1.0"; sha256="1yy80j15lra1zmak3klvqspy9ikhr0v7csl88l9cpbdpp73972by"; depends=[abind expm gaussquad igraph MASS Matrix mvtnorm scales stringr tmvtnorm xtable]; }; KarsTS = derive2 { name="KarsTS"; version="2.4.1"; sha256="1km8321a8vzff26g3x2hvdv5ciyk3fdpcn7g1xqbsx96fzxyd22n"; depends=[circular forecast infotheo mgcv missForest MVN nonlinearTseries plot3D rgl stinepack stlplus tcltk2 tseries tseriesChaos zoo]; }; KbMvtSkew = derive2 { name="KbMvtSkew"; version="1.0.2"; sha256="14g27a0dkj4gpf5l2k96fd3aa21fz8b85lf5a1jxj0qgjmr4kib0"; depends=[]; }; + Kcop = derive2 { name="Kcop"; version="1.0.0"; sha256="0p9ik4z2jc2ib70v8lxxa40f13jbqgq6bb9s7yx335na9l43h1j8"; depends=[copula dplyr gtools orthopolynom]; }; KenSyn = derive2 { name="KenSyn"; version="0.3"; sha256="0s8sq3caxn4swac81196dp52r9lbmxb3ni45yaxh53f5g34slsi8"; depends=[lme4 metafor nlme]; }; Kendall = derive2 { name="Kendall"; version="2.2.1"; sha256="1xmk95l4i3kj9jn0xh1chi2rj322k29jq14ra5pa7316gwf9vx2m"; depends=[boot]; }; KernSmooth = derive2 { name="KernSmooth"; version="2.23-20"; sha256="0fgclmzk3ksjsh3j47jqzm3jhqrwn12rkp7f84yr6wr43q2pbsr0"; depends=[]; }; @@ -2404,7 +2418,7 @@ in with self; { 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.3"; sha256="1yfcn1r0zngc1nlj5axqps8an66p1q1qmxwagxq2q15d9qipb5wh"; depends=[ggplot2 Iso Rcpp]; }; KingCountyHouses = derive2 { name="KingCountyHouses"; version="0.1.0"; sha256="17l415v290lm99rsifpk6324mm1sk79ns4cvjkyh9ibj8n7l44c1"; depends=[]; }; - Kmedians = derive2 { name="Kmedians"; version="0.2.0"; sha256="1cyvmlyg44d8pyx3w9z02xkkr4zbqlnlfzix660bqnihs3ss6fhk"; depends=[capushe doParallel foreach genieclust ggplot2 Gmedian mvtnorm reshape2]; }; + Kmedians = derive2 { name="Kmedians"; version="1.2.0"; sha256="10akh0jbnk7hrgqp414p66ddlhs6rdgd1ifjx18wpnfn4c81xcnj"; depends=[capushe doParallel foreach genieclust ggplot2 Gmedian mvtnorm reshape2]; }; KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; }; KneeArrower = derive2 { name="KneeArrower"; version="1.0.0"; sha256="1blmim4l7375psa9c3wbpksywj5nfbawly4001n6311wcv4dybl5"; depends=[signal]; }; KnockoffScreen = derive2 { name="KnockoffScreen"; version="0.3.0"; sha256="01r04d9ha9l5pkz3lwdcb5x5qqwk8vil9avnbnfn76wg63mdfhbk"; depends=[bigmemory CompQuadForm data_table irlba Matrix seqminer SPAtest]; }; @@ -2451,7 +2465,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=[]; }; 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]; }; + LFApp = derive2 { name="LFApp"; version="1.3.1"; sha256="1vvlf3bwxkyl9gyzswc4wd201pav1q2hfbhwmiic4j4d8azsd2r8"; depends=[DT EBImage fs ggplot2 mgcv shiny shinyFiles shinyjs shinyMobile shinythemes]; }; LFDR_MLE = derive2 { name="LFDR.MLE"; version="1.0.1"; sha256="0ykcd24w71zxb53nch041g7xh83gmg1ia3sysdpn0yzkhm0w7cdl"; depends=[]; }; LFDR_MME = derive2 { name="LFDR.MME"; version="1.0"; sha256="1ln0s3ki37cz1a7r96xn0zqw42im7fcanmz2vjk5zycshb423y22"; depends=[]; }; LFDREmpiricalBayes = derive2 { name="LFDREmpiricalBayes"; version="1.0"; sha256="1imw3djmbpdyplv9dmdzzirp9imk88j0kcxcyfh8yr9ywgd77x6b"; depends=[matrixStats R6]; }; @@ -2498,7 +2512,7 @@ in with self; { LRTH = derive2 { name="LRTH"; version="1.3"; sha256="08vakwb7ca7956gifynzijka441yyx0wd5bq5jfhz56lzcxgfb99"; depends=[]; }; LRTesteR = derive2 { name="LRTesteR"; version="1.0.1"; sha256="1paglzznfcmkz9lk8smnbf84q3gdq1qdkn6p9bgydfj735hghkii"; depends=[rlang statmod]; }; LRcontrast = derive2 { name="LRcontrast"; version="1.0"; sha256="0fs06p853r42nws2camvs87py39hb1ssxhfm6d5n9kkq81snfx4q"; depends=[DoseFinding]; }; - LS2W = derive2 { name="LS2W"; version="1.3.5"; sha256="1lckwdc9jfnx5plslh72inkssnck217lrrqyfpm8zgbd47c3iwa0"; depends=[MASS wavethresh]; }; + LS2W = derive2 { name="LS2W"; version="1.3.6"; sha256="0qsrf9x45z0waiv10fh0a8rw0zyr5raj6l832yhq76vd9gjfpn9i"; depends=[MASS wavethresh]; }; LS2Wstat = derive2 { name="LS2Wstat"; version="2.1-4"; sha256="1y5q5sqzx3iwxdmxf6yz5c3hbw7sihxgr8sibr0v8s9dc6r4a2sf"; depends=[LS2W matrixStats spdep]; }; LSAfun = derive2 { name="LSAfun"; version="0.6.3"; sha256="1jsn3la2qfnvb5z2abx567zp8wrz5122ifgfzibw6fag6s3kl9ym"; depends=[lsa rgl]; }; LSAmitR = derive2 { name="LSAmitR"; version="1.0-3"; sha256="1c2i9wy72v9923ngkipwmc49nc6r3znibadgffzkhci583ib55ym"; depends=[Hmisc lme4]; }; @@ -2514,12 +2528,12 @@ in with self; { 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]; }; LSWPlib = derive2 { name="LSWPlib"; version="0.1.0"; sha256="1z4lcpmbm3wdzbi04flvspkimk4jfhjqi5pd0ab4pbb0ii1z26hs"; depends=[waveslim wavethresh]; }; - LSX = derive2 { name="LSX"; version="1.1.3"; sha256="0769g5w67549076b2rck7r46gg4jjdbk024qvcczdigr7cshzq39"; depends=[digest ggplot2 ggrepel irlba locfit Matrix proxyC quanteda quanteda_textstats reshape2 rsparse RSpectra rsvd stringi]; }; + LSX = derive2 { name="LSX"; version="1.2.0"; sha256="0imghgi95rdsxjfm4w2i6n8hb5p6y2dsdls0cw56hwlxcv5p2b4l"; depends=[digest ggplot2 ggrepel irlba locfit Matrix proxyC quanteda quanteda_textstats reshape2 rsparse RSpectra rsvd stringi]; }; LTASR = derive2 { name="LTASR"; version="0.1.0"; sha256="00l04zljpy9xjg3zpfchlwchmls1vgjfnjzyj016xvv3iivl9w3b"; depends=[dplyr knitr lubridate magrittr purrr readr rlang stringr tidyr XML zoo]; }; LTPDvar = derive2 { name="LTPDvar"; version="1.2.1"; sha256="0sdsdx71mpian7gfw7brkzyjjr7bai7dsdifwnib3jpq9p7w7n84"; depends=[]; }; LTRCforests = derive2 { name="LTRCforests"; version="0.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.2"; sha256="02dnhswmddyqq5vhmm7wfn76h4i8id2gfcfmc1cpclwyy006srb9"; depends=[boot glasso glmnet jsonlite mclust mix networkD3 nnet progress]; }; + LUCIDus = derive2 { name="LUCIDus"; version="2.2.1"; sha256="00qzx94hwkhm5yszkx1wkj592img5n504ybld272x0wps2bk6snp"; depends=[boot glasso glmnet jsonlite mclust mix networkD3 nnet progress]; }; LVGP = derive2 { name="LVGP"; version="2.1.5"; sha256="03sd777s16nv04ikn9b3rj67ad6n4bwi0rycc7wqdnq0dx6xgniy"; depends=[lhs randtoolbox]; }; LW1949 = derive2 { name="LW1949"; version="1.1.0"; sha256="147ymp7j98ihp1dcz3p5v9ar6h767phjdnga5q5vf1wwa2mxawg7"; depends=[MASS mgcv plotrix]; }; LWFBrook90R = derive2 { name="LWFBrook90R"; version="0.5.0"; sha256="057pacicjc87g12d44mfqm9vmk10lwsxkil51bp05ixxcqpp4dp1"; depends=[data_table doFuture foreach future iterators parallelly progressr vegperiod]; }; @@ -2530,17 +2544,18 @@ in with self; { LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.3.1"; sha256="1wdfcqjzjc0vwgzv85dfny2r3gsi26wmk85s75bz6hbnwp836sav"; depends=[data_table maptools rgdal rgeos sp spdep tmap]; }; LagSequential = derive2 { name="LagSequential"; version="0.1.1"; sha256="1i8h4acfx21r0kxbg4i0k48kvhwy2abri191wp4b22amhz4vqyyd"; depends=[]; }; Lahman = derive2 { name="Lahman"; version="10.0-1"; sha256="0k8vwcqnkp24n3micwwc63lagpll1np749az2imj4zyyhd8hyq7n"; depends=[dplyr]; }; + LakeMetabolizer = derive2 { name="LakeMetabolizer"; version="1.5.5"; sha256="09j4k5r441jpbxv9x6j9j5mlcl7yh2ydhfy55wx614wdlv862jn9"; depends=[plyr rLakeAnalyzer]; }; LambertW = derive2 { name="LambertW"; version="0.6.7-1"; sha256="0cdrq2nrvji8l5blswkffymm7cbjk5jzzx16js2a516cm3gjwxk4"; depends=[ggplot2 lamW MASS RColorBrewer Rcpp reshape2]; }; 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=[]; }; - LassoBacktracking = derive2 { name="LassoBacktracking"; version="1.0"; sha256="0waz4apjvgwn3ss7mqpndz5m9n7cpmhb3s2ngds04v0amprblddv"; depends=[Matrix Rcpp]; }; + LassoBacktracking = derive2 { name="LassoBacktracking"; version="1.1"; sha256="0xd9y11k1wqmmjb8jjws6ivgcr2x6n7ra27d7mpa3adbvyxzj8dl"; depends=[Matrix Rcpp]; }; LassoGEE = derive2 { name="LassoGEE"; version="1.0"; sha256="1zascnl9hihw0gx2ssmdiv8gcp2672kz9vmsp5vrc2wr9cdcdjz3"; depends=[caret MASS mvtnorm PGEE Rcpp RcppArmadillo SimCorMultRes]; }; LassoNet = derive2 { name="LassoNet"; version="0.8.3"; sha256="02m0g078wg9ka3ck92nrpqrm3msw1m7r8k43brcaiffqwhky99vy"; depends=[Rcpp]; }; LassoSIR = derive2 { name="LassoSIR"; version="0.1.1"; sha256="0ap8335ms12nsc7jvd48244zya54w05wj91qkhb0i63730r508c3"; depends=[glmnet]; }; Laterality = derive2 { name="Laterality"; version="0.9.4"; sha256="1p91xnqmiy232i18masqgly5wcp8zzx8kl8y5v0ra6548np31qmf"; depends=[ade4]; }; - LatticeDesign = derive2 { name="LatticeDesign"; version="2.0-4"; sha256="1spmm9gk09i5dkz6xh4qvmq9r7wd9r8a84xqh8d21678kvl2j3fc"; depends=[]; }; + LatticeDesign = derive2 { name="LatticeDesign"; version="2.0-5"; sha256="06pndvsp3v6gid46hcixh559pcmh2ckr9ss5065nbbrxhg2rf98b"; depends=[]; }; LatticeKrig = derive2 { name="LatticeKrig"; version="8.4"; sha256="153yaf0k4l5za8f13yh2mzjv66bnmi5kp6zaxq9vrisld4vdp58h"; depends=[fields spam]; }; LavaCvxr = derive2 { name="LavaCvxr"; version="1.0.2"; sha256="0gg14y8kngj3r4p4bl3ddnm9dxlklxhvnra5bmbjp1kmjhlg52rn"; depends=[CVXR Lavash pracma]; }; Lavash = derive2 { name="Lavash"; version="1.0"; sha256="0cjl8crk0rdkyzp069fk4k0sapcjmqm3q40z5mgl0i1n59kn4s07"; depends=[glmnet MASS pracma]; }; @@ -2557,8 +2572,7 @@ in with self; { LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.3.6"; sha256="088w6ks1scmzcq74v7izx8v62d99cp7iia4s02n5dj92nyn24w8x"; depends=[data_table pbapply quanteda quanteda_textstats stringdist stringi tibble]; }; LexisPlotR = derive2 { name="LexisPlotR"; version="0.4.0"; sha256="0vlm8wcaj3755cbxrfb7ybla9znd2cbklw2xwyyn6r9i4c9xsfih"; depends=[dplyr ggplot2 tidyr]; }; LibOPF = derive2 { name="LibOPF"; version="2.6.1"; sha256="01j3jzhi337dmblcm1d79i4cbp159z6k54ybpyzfasjfnp7qizz6"; depends=[]; }; - LiblineaR = derive2 { name="LiblineaR"; version="2.10-12"; sha256="0r5xbklbfgflwlmkh4i0bsdyqcjs1b4lvxr20f4fhajmkj83gqrs"; depends=[]; }; - LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; }; + LiblineaR = derive2 { name="LiblineaR"; version="2.10-22"; sha256="1gkp9q99n8cw8s0qamlpjpnlw597fn71dsr05haiyykkqi2l5h5w"; depends=[]; }; Libra = derive2 { name="Libra"; version="1.7"; sha256="1fdxvjv3pwpvfw3hnff09s89b2lv13v3ds91lyg3yi7am820dyzg"; depends=[nnls]; }; LifeHist = derive2 { name="LifeHist"; version="1.0-1"; sha256="0q6l6rva5kxl8yzqa7ni4sdj6p4c61sdsjx8zhckzxb7xlwg2hh0"; depends=[BB Hmisc optimx]; }; LifeInsuranceContracts = derive2 { name="LifeInsuranceContracts"; version="0.0.4"; sha256="02mk8n9rpnbbcgsq7j4b7arm28q1cnwwsswbf7cicahqi1gm3m4z"; depends=[abind dplyr kableExtra lubridate MortalityTables objectProperties openxlsx pander R6 rlang rmarkdown scales stringr tidyr]; }; @@ -2583,12 +2597,12 @@ in with self; { LoBrA = derive2 { name="LoBrA"; version="1.0"; sha256="0rsxkli6xhjwy058skgij2cf3n1lcjsaw3pd51i55l2bpwlrmci6"; depends=[lawstat nlme qpdf RColorBrewer]; }; LocKer = derive2 { name="LocKer"; version="1.1"; sha256="034r6215aigb5hdm2a7cs8qw3nikjdjqnqpn1g27p3lxwfp0n3pr"; depends=[fda Matrix psych]; }; LocalControl = derive2 { name="LocalControl"; version="1.1.3"; sha256="0pi5z3i5hmb8nrqg6nyqrd4hx80xjgc5m3ra1z5r8rvjhw4mz0ik"; depends=[cluster gss lattice Rcpp]; }; - LocalControlStrategy = derive2 { name="LocalControlStrategy"; version="1.3.3"; sha256="05vggk5d0w3f9w5217c9hzy5jhwv24p2g8pcj0l6zxkhic01nbrl"; depends=[cluster lattice]; }; + LocalControlStrategy = derive2 { name="LocalControlStrategy"; version="1.4"; sha256="1slkhgac7izkmp5g203lhzvh991mnqf2qz1m0nd1k89084wvkv7b"; depends=[cluster lattice]; }; Lock5Data = derive2 { name="Lock5Data"; version="3.0.0"; sha256="1407vkcdphy5pb4sgy2ms36vjffiwg2l2753gbszm9wv2m0wrnv4"; depends=[]; }; Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; }; - LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.6-5"; sha256="0pwq1bdmn040bkwal7xsmjv2asvpyshipbglqb16h2z7yq0vwmv7"; depends=[MASS mclust mvtnorm]; }; + LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.6-6"; sha256="0ig808d4zqmp4vli25g50s97b1iggrb92ih2s89w6l4vgixmrs92"; 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]; }; + LogicReg = derive2 { name="LogicReg"; version="1.6.5"; sha256="052rrjr3d01c3k1ifw639jhifc4qqy3bnmysckb5mfylwfqn00yy"; depends=[survival]; }; LogisticCurveFitting = derive2 { name="LogisticCurveFitting"; version="0.1.0"; sha256="0b564jc3gv6lnzyxmrmbrk9pa8c6v9vbn2q68h9v0d02n58h1kbl"; depends=[]; }; LogisticRCI = derive2 { name="LogisticRCI"; version="1.1"; sha256="158rl8jjmmhnja287i29rjiq309niwbvxmzx4f9lkl83nxn4mzf7"; depends=[]; }; LongCART = derive2 { name="LongCART"; version="3.2"; sha256="05jzl4wb52fa9781pn8a3wqdnpyfrr9fv7h3xfz81xm5bl5d8mf1"; depends=[Formula magic nlme rpart survival survminer]; }; @@ -2608,13 +2622,13 @@ in with self; { M2SMJF = derive2 { name="M2SMJF"; version="1.0"; sha256="0v4sg5h3h2pjp996jspv206c8cymjpn1fg38ivaw12s7bmx8j409"; depends=[dplyr MASS]; }; MAAPER = derive2 { name="MAAPER"; version="1.1.1"; sha256="05jjfnp1hwg8pk06np6fbdfxi6zn60wzhrkzlh8jkqgwxjhgnvai"; depends=[GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges MASS Rsamtools]; }; MABOUST = derive2 { name="MABOUST"; version="1.0.1"; sha256="044k29nibl5zc32zz2696kbhrz5dafgaikgmjqznsq25p48si453"; depends=[Rcpp RcppArmadillo]; }; - MACER = derive2 { name="MACER"; version="0.2.0"; sha256="1m3p1vkhs9f42xj99gnw66wds7jsrkihg3i1qq3cr94ahlp05b4v"; depends=[ape ggplot2 httr pbapply png rentrez]; }; + MACER = derive2 { name="MACER"; version="0.2.1"; sha256="02qqcaccw671773lp1zva340fd6wqbsx9v0yxy62cbjnyh3k260r"; depends=[ape ggplot2 httr pbapply png rentrez]; }; MADPop = derive2 { name="MADPop"; version="1.1.4"; sha256="0r8c31sjn3ma6fghc0kbq27djha4321jsdrpwvl65qd74ivp305v"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; }; MAGEE = derive2 { name="MAGEE"; version="1.2.0"; sha256="0xyz4m3b09yxjlzy3j2akwpngbqjqjcbsfkn6hig4wi4lw7szc8a"; 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.1"; sha256="0xljmnwl8v3y68xmfm5vbycsa5y5yi0p0n207hg7zjvfaf6gbfhj"; depends=[AUC grplasso]; }; - MALDIquant = derive2 { name="MALDIquant"; version="1.21"; sha256="1y1g3819ss06dry70kfhg2syddw71682qmzkcyppfsma6hhghw87"; depends=[]; }; + MALDIquant = derive2 { name="MALDIquant"; version="1.22"; sha256="05fhr7945m0qxh7f5c4ax9v2k32s4n4v4xc1dm1crk1vbzha40bv"; depends=[]; }; MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.13"; sha256="0xxdvfg9h6vl2g2wlxfmrskn8576rd958mn5jblryyqg9xbanlhr"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; }; MALDIrppa = derive2 { name="MALDIrppa"; version="1.1.0-1"; sha256="1gm5w614r66av6bvfiad5964hsr6hb0c03c90ck9lb251bns98wm"; depends=[lattice MALDIquant robustbase signal waveslim]; }; MAMS = derive2 { name="MAMS"; version="2.0.0"; sha256="05pnrxziwsgnhy05fac8smxcm65zxi2dl7lar2jakiamd2hxv3c2"; depends=[future future_apply mvtnorm]; }; @@ -2626,16 +2640,16 @@ in with self; { 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]; }; - MARVEL = derive2 { name="MARVEL"; version="1.3.0"; sha256="0016y7nycqpqaxcybgrdicp1q9kw7pbinbi54rja6npcyiz3li86"; depends=[ggplot2 scales]; }; + MARVEL = derive2 { name="MARVEL"; version="1.4.0"; sha256="1zsgj3dbqpfjv2x6xpp75n9jxf04svqffiy9gxlbxkns3clwqz5i"; depends=[ggplot2 Matrix plyr scales]; }; MASS = derive2 { name="MASS"; version="7.3-58.1"; sha256="080l4gqkaw9r4s7b0q9hda489rn24p4ma5xf4g8405qkzgif817p"; depends=[]; }; - MASSExtra = derive2 { name="MASSExtra"; version="1.1.2"; sha256="0jzzm3ahn1iisdp632hcn8lnk6hhh699jqfj6v0164qxd6487xvs"; depends=[demoKde MASS]; }; + MASSExtra = derive2 { name="MASSExtra"; version="1.2.0"; sha256="0mc5zpj2zp1gd8izyiji1hrklc4x3ixvcjxzfcs3bbhzk7qcm2n9"; depends=[demoKde MASS]; }; MASSTIMATE = derive2 { name="MASSTIMATE"; version="2.0-1"; sha256="1dvidwjw4zgflms5njbd9n85g1gbgfg6hk0fb63q5n65iyxxfmyh"; depends=[]; }; MAT = derive2 { name="MAT"; version="2.3.1"; sha256="0jr08j96agqw4hzdbk9ixdpngh60bd7w47192d0zm3byymcxpb0y"; depends=[Rcpp RcppArmadillo]; }; MATA = derive2 { name="MATA"; version="0.7.1"; sha256="0qydfp856qlmiwf3a2vs2dfk203sx8vvzrqn4hga9wi7bxdylk9f"; depends=[]; }; MAVE = derive2 { name="MAVE"; version="1.3.11"; sha256="01n204bxabbm8pcpayy2s0jvhg73r5cv0026lb3vbk0m40z02kcz"; depends=[mda Rcpp RcppArmadillo]; }; MAd = derive2 { name="MAd"; version="0.8-3"; sha256="0br099qzmzvdcx5pzb772dipyb279kgzhx6p2b7g0fp4r4bk7gbd"; depends=[]; }; MAnorm2 = derive2 { name="MAnorm2"; version="1.2.2"; sha256="0bs6x09mm8ln2c7himavm6bskdkxvx7id4dxpg20k4a5hcqpj3ab"; depends=[locfit scales statmod]; }; - MBA = derive2 { name="MBA"; version="0.0-9"; sha256="06kmrdkhwwvr3kd5w8ws6r528hhpvbhixyj98lv36kkwlx14x06g"; depends=[BH]; }; + MBA = derive2 { name="MBA"; version="0.1-0"; sha256="1bw3a8xcbjmhb3mfzblx8kpj3jiag8c95wm5g6xy52xrql2rj0vq"; depends=[BH]; }; MBAnalysis = derive2 { name="MBAnalysis"; version="0.1.0"; sha256="1hgx6lgyjbiq6y5cw720mnavll6mfrarwvhsm7pbr25q1d37jmg8"; depends=[ggplot2 ggrepel]; }; 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]; }; @@ -2669,7 +2683,6 @@ in with self; { MCPtests = derive2 { name="MCPtests"; version="1.0.1"; sha256="1lzlvzw60fb0mllbl0dx8s30zigzbl9shjas629syb9yw55ypxa2"; depends=[doParallel foreach SMR writexl xtable]; }; MCS = derive2 { name="MCS"; version="0.1.3"; sha256="1kiz1jq1bm2n8f33nsybp5jfrzzl9xbsi3m9l8818ybmph99xms6"; depends=[]; }; MCSim = derive2 { name="MCSim"; version="1.0"; sha256="1nqry41qa5c02an5fxm3y1g3w1vcqjgsy1an95i3szz1w1ndaj14"; depends=[CircStats MASS]; }; - MCTM = derive2 { name="MCTM"; version="1.0"; sha256="14xjfskyrqi0m58lkwjfjpss5j7wy3ajr148n526czrrpccg108j"; depends=[]; }; MChtest = derive2 { name="MChtest"; version="1.0-3"; sha256="1b3p6ry8gkvyphakn3504ibl2x8dbhx95saild0mj0iwm3sjyspf"; depends=[]; }; MDBED = derive2 { name="MDBED"; version="1.0.0"; sha256="1r3sizb2mqd4pqjy25krwmsjfkr6cl7lkd8db5jn3hgxx3qh6sgc"; depends=[doParallel foreach ggplot2 lattice orthopolynom psych Rdpack]; }; MDFS = derive2 { name="MDFS"; version="1.3.0"; sha256="0sv6j8arfh4w333y1mp3n65bzi2kz9zrk2wpw80z5vci2489s50d"; depends=[]; }; @@ -2724,9 +2737,9 @@ in with self; { MKLE = derive2 { name="MKLE"; version="1.0.0"; sha256="0pnz99z2ms8j0acnpim0z7n7m0x6rkvzi5dhq8jhx0dnry4mznn0"; depends=[]; }; MKMeans = derive2 { name="MKMeans"; version="2.1"; sha256="1zhas96xvjyphmrs48k3nza1ayv9nfj0c760ifb57p8yk28m0bfy"; depends=[]; }; MKclass = derive2 { name="MKclass"; version="0.3"; sha256="0sw0h99k24418iqvvq247kg5558y9mgashr5amay7gbf2va79v6j"; depends=[]; }; - MKdescr = derive2 { name="MKdescr"; version="0.7"; sha256="056gp5fig8l4wgv3hzphr5q81z1zi6x88abc4kzgg8f1ljpn37xf"; depends=[ggplot2 scales]; }; - MKinfer = derive2 { name="MKinfer"; version="0.7"; sha256="1b1qwz6dwkwh0wc61j7jxkrcf5h97p56vj15zpki13lmaw779swi"; depends=[arrangements boot ggplot2 MKdescr nlme]; }; - MKmisc = derive2 { name="MKmisc"; version="1.8"; sha256="1d94vnj0ffw15gd0xfpz245y0qi7xw61qwsqan3bahskjdwrgdgl"; depends=[ggplot2 limma RColorBrewer robustbase scales]; }; + MKdescr = derive2 { name="MKdescr"; version="0.8"; sha256="0y4mg3lg94nvyvj8rns5lffd6qjw1yn6yw8kn03n94rig857amwp"; depends=[ggplot2 scales]; }; + MKinfer = derive2 { name="MKinfer"; version="0.9"; sha256="1n4qj595bi1mykhk7pc9lkgfr6qjk6c23f9iwzc6b7ijgh44a19h"; depends=[arrangements boot exactRankTests ggplot2 MKdescr nlme]; }; + MKmisc = derive2 { name="MKmisc"; version="1.9"; sha256="09kdwsfx5w3q88jbnxbaxzbzyx9fhhphqqaxn5qghhh1z2vpmy93"; depends=[ggplot2 limma RColorBrewer robustbase scales]; }; MKomics = derive2 { name="MKomics"; version="0.7"; sha256="0ck8i7ip12bb6wilmwhdrbdmf56ymm3rp6973lr1p4bc2m2kvhif"; depends=[circlize ComplexHeatmap limma RColorBrewer robustbase]; }; MKpower = derive2 { name="MKpower"; version="0.5"; sha256="1yr9yk7x8da2b8hj71v4f5c2nikljbr6ayqp004whdi2bh67v95n"; depends=[coin ggplot2 matrixTests MKdescr MKinfer qqplotr]; }; ML_MSBD = derive2 { name="ML.MSBD"; version="1.2.1"; sha256="1cpwq0vilbyz837d8k8pjipw3cwdsggbs88nwp827s4w2f1m7pap"; depends=[ape foreach]; }; @@ -2735,6 +2748,7 @@ in with self; { MLCM = derive2 { name="MLCM"; version="0.4.3"; sha256="1sz5c3wxvnyxd3bf53i8x2jw591phx2np6c6bj4cqppb98ab83f3"; depends=[]; }; MLDS = derive2 { name="MLDS"; version="0.4.901"; sha256="0zswlng1vksnx1m6ycna2hbqmzzcfpqz1wgy519fr0j87bqxks69"; depends=[MASS]; }; MLDataR = derive2 { name="MLDataR"; version="1.0.1"; sha256="0sbm79hpgxiqnqjyr5n88rhs29lkp17czz9jmhd2d5x97ncpqw9f"; depends=[caret ConfusionTableR dplyr ggplot2 OddsPlotty parsnip ranger recipes rsample varhandle workflows]; }; + MLEce = derive2 { name="MLEce"; version="1.0.1"; sha256="0m5fa2167dyprcc3agmdvfjgd0qvnnqn5y6xqm2w3rmgvilhp24r"; depends=[ggplot2 LaplacesDemon mvtnorm nleqslv reshape sirt]; }; MLEcens = derive2 { name="MLEcens"; version="0.1-7"; sha256="1kdnm5ilfn5fclry3f1d518761hykrqgjhv69kc881r2fpcfa1lv"; depends=[]; }; MLFS = derive2 { name="MLFS"; version="0.4.2"; sha256="0xrc266hz69vpfi2h59lma0wbyi1wfcw4wb3dbjbnqqwsq1hc0dz"; depends=[brnn dplyr magrittr naivebayes pscl ranger reshape2 tidyr tidyselect]; }; MLGL = derive2 { name="MLGL"; version="0.6.7"; sha256="13wg7hdvn1sp207rj0cckc98lfx62nwm4nma9qmvlvgrs7pdqk58"; depends=[FactoMineR fastcluster gglasso MASS Matrix parallelDist]; }; @@ -2773,24 +2787,23 @@ in with self; { MNP = derive2 { name="MNP"; version="3.1-3"; sha256="1kaw8kvmi1m4a7k17l6ikp89fksh6l2f53bz1h3n80da259rbhbi"; depends=[MASS]; }; MNS = derive2 { name="MNS"; version="1.0"; sha256="0if46a6rw0f2d72wnykkaa5z5b1p2c0r43il6cbwbcnnb3zd8acb"; depends=[doParallel glmnet igraph MASS mvtnorm]; }; MOCCA = derive2 { name="MOCCA"; version="1.4"; sha256="0g70s7hnmrp4sm8gx49vsijj54y4amlcy6axc4k37k4c9g4sdics"; depends=[cclust class clue cluster]; }; + MOCHA = derive2 { name="MOCHA"; version="0.1.0"; sha256="1cc817p7v9zs8nmbl7461m5hfwg0swb9y8dygljq2gfkvbxjqfb5"; depends=[AnnotationDbi assertthat BiocGenerics biovizBase data_table dplyr ensembldb GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 ggrepel ggridges IRanges magrittr matrixStats MultiAssayExperiment OrganismDbi plyranges qvalue RaggedExperiment rlang S4Vectors scales stringr SummarizedExperiment tidyr wCorr]; }; MODIS = derive2 { name="MODIS"; version="1.2.9"; sha256="1272b0swij6h6xm18vpjzv0n0l47ck391wgik665bjsdky21d3sm"; depends=[bitops curl devtools mapdata mapedit maps maptools ptw raster rgdal rgeos sf sp]; }; MODISTools = derive2 { name="MODISTools"; version="1.1.2"; sha256="1br5kpkz3addnndh6740ppkg3xswpdc6fj9x776rswrjmrhazzm7"; depends=[httr jsonlite memoise raster sf]; }; MODIStsp = derive2 { name="MODIStsp"; version="2.0.9"; sha256="143jby0838xaihk37l29hqxqyk2v24qs0f20q3wc6krmz7a2i70w"; depends=[assertthat bitops data_table gdalUtilities geojsonio httr jsonlite raster sf stringr xml2 xts]; }; - MOEADr = derive2 { name="MOEADr"; version="1.1.1"; sha256="0aqkqw5ph5rvsgpasc94i264lxapr37gpjhk4rkkynph2gnvq1zx"; depends=[assertthat FNN]; }; MOFAT = derive2 { name="MOFAT"; version="1.0"; sha256="00b9ss777zr5ysh98yllyicqwgnzccmjf20g7w20zvn2blhs2np0"; depends=[SLHD]; }; MOLHD = derive2 { name="MOLHD"; version="0.2"; sha256="1lrl24x7iig15jwxigvqm3jdwnxkn948sxmywn6zi2b1a5hqz05k"; depends=[arrangements fields]; }; MOQA = derive2 { name="MOQA"; version="2.0.0"; sha256="17w4iwf38k0r2fiwqr420hkbbz1a3r89sqwnd2yn300zmaz64hpr"; depends=[gplots psych readr]; }; MOSS = derive2 { name="MOSS"; version="0.2.2"; sha256="0gjsyv74hhjknlnplc8157mmypnfy1yjrs400pz0p4744k5c8c7s"; depends=[cluster dbscan Rtsne]; }; MOST = derive2 { name="MOST"; version="0.1.2"; sha256="07y3aw2ldgq4jiz2kk2rkbqd4l298wsa5sq3xs5p21k7g33gxxnv"; depends=[]; }; MOTE = derive2 { name="MOTE"; version="1.0.2"; sha256="17y2l2rmw7fhvknyh5z09i7hd8nhamx12g00rcymp75gqkz9lzc7"; depends=[ez MBESS reshape]; }; - MPBoost = derive2 { name="MPBoost"; version="0.1-4"; sha256="1sr2cxngfm8ykr4cagx7r6fbn5g6rdpxrxzq3sz7g9acy329qzxx"; depends=[BH Rcpp]; }; + MPBoost = derive2 { name="MPBoost"; version="0.1-5"; sha256="13ijn48dg20kz0zwr0f0vp4162dv9hqnmnzzbdp30nhh0bqdbk4k"; depends=[BH Rcpp]; }; MPCI = derive2 { name="MPCI"; version="1.0.7"; sha256="1l55q09lliv0y4q1hc0jgzls47wkmsfag6b4iq5y6wrllr5wq7sa"; depends=[]; }; MPDiR = derive2 { name="MPDiR"; version="0.1-20"; sha256="1mm4mv042jr0n7z5cdaij39zrg2475p83gd3dxq6krz9yq8ii1q3"; depends=[]; }; MPGE = derive2 { name="MPGE"; version="1.0.0"; sha256="10lzkk8fhpxd1z4yp051q3k36fsvddrwssv7nn03r2bkp6q8rpzb"; depends=[car purrr]; }; MPI = derive2 { name="MPI"; version="0.1.0"; sha256="081yhbk3qz5935yz5n1391x3hpj8m0cbj1p81snhb9n8h0agwgv0"; depends=[doParallel dplyr foreach purrr tidyr]; }; MPLikelihoodWB = derive2 { name="MPLikelihoodWB"; version="1.1"; sha256="0xgj349jkv29ldia4lmsiwnkhrk99aqcrvyiy3si5knmi1jvx9q0"; depends=[MASS survival]; }; 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.4-1"; sha256="0cq7vyyif7gxywrj420msscjf1aq427g88x8yvxf3a5a6mqapkr8"; depends=[ape MASS]; }; MPTinR = derive2 { name="MPTinR"; version="1.14.1"; sha256="0jywv5kim3vdfq0dfaxjksq8l2i6ny45rn5ibmb7ximwfjm3syp0"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; }; @@ -2810,11 +2823,11 @@ in with self; { MRTSampleSizeBinary = derive2 { name="MRTSampleSizeBinary"; version="0.1.1"; sha256="01kg6frglrhi55px2hsadjn9dbfz61hwj1q2m6jrm59b4cws0gcb"; depends=[dplyr ggplot2 Matrix]; }; MRmediation = derive2 { name="MRmediation"; version="1.0.1"; sha256="0v0kn6x4fwj35imj1fb2f2024ifb7081z4cwlhjmdxhabcy6xbx7"; depends=[fda MASS]; }; MSCMT = derive2 { name="MSCMT"; version="1.3.4"; sha256="1vh0i9nxqiy3qdnb7z7cn5kpp2jahdmaqpnv7q5650pkswhwmfpc"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; }; - MSCquartets = derive2 { name="MSCquartets"; version="1.1.1"; sha256="1dv6g860yxhkk6dd0sr0vvnpwb3fbpz7fvqjlcs5kcqisvcv5ya0"; depends=[ape doParallel foreach phangorn RandomFieldsUtils Rdpack zipfR]; }; + MSCquartets = derive2 { name="MSCquartets"; version="1.1.2"; sha256="1q85h3jm2llkm8dpqdxgjxzg7iwlmhx41n3hlk1ybvxw2c0jb3rd"; depends=[ape doParallel foreach phangorn Rdpack zipfR]; }; MSCsimtester = derive2 { name="MSCsimtester"; version="1.0.0"; sha256="0k04fdprwa56vm6n372lipybgq1plhmjbxvp58wqmpgzpnhcxkvd"; depends=[ape kSamples Rdpack]; }; MSEtool = derive2 { name="MSEtool"; version="3.6.0"; sha256="1hwh55fh9rab1hda6a2ks7r2bdwgy16wz4c6jrfa80ifkfki32hi"; depends=[abind dplyr ggplot2 ggrepel gridExtra Rcpp RcppArmadillo snowfall]; }; MSG = derive2 { name="MSG"; version="0.8"; sha256="178209p30fmh3c03w8iakz306h2xswcj4ffxg1s9s8md156rbj7s"; depends=[RColorBrewer]; }; - MSGARCH = derive2 { name="MSGARCH"; version="2.50"; sha256="0gq0n9v2vdsg899bic24hdp72sr39xcmc3iam4h4yx2b8bl7mxdb"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; }; + MSGARCH = derive2 { name="MSGARCH"; version="2.51"; sha256="1n8v9017p8iw9mai3yqh294v7kyj458a6vj9ma20gzd94nhyhlxh"; 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=[]; }; @@ -2824,7 +2837,7 @@ in with self; { MSSQL = derive2 { name="MSSQL"; version="1.0.0"; sha256="15glgn2dr1yygxps0mx68435zqc2hi4hvgr4rvgrwyxdnlm5g35y"; depends=[RODBC]; }; MST = derive2 { name="MST"; version="2.2"; sha256="0p833nyq9p0r0hy02f4sy6gv1wm9flj3dxkv73ihy8503r89bbzz"; depends=[Formula MASS partykit survival]; }; MSTest = derive2 { name="MSTest"; version="0.1.0"; sha256="09njnxfj7i3gf91qayabhadzlwszh81pznyir0fqpsns8hzbmk4p"; depends=[foreach GA GenSA lmf nloptr numDeriv pso Rcpp RcppArmadillo rlang]; }; - MSbox = derive2 { name="MSbox"; version="1.4.6"; sha256="1wlfbkjsw2bzznh6fwhfllgnj80zpfab82x43a83k3mjd41rf9f9"; depends=[crayon ggfortify ggplot2 plotly reshape2 stringr xml2]; }; + MSbox = derive2 { name="MSbox"; version="1.4.8"; sha256="1cppzy3kri2zmhyk34scffix28v1bjb0fhk51kb33amg6vz5mnj3"; depends=[crayon stringr xml2]; }; MSclassifR = derive2 { name="MSclassifR"; version="0.3.1"; sha256="14fnq5xyflx9m35lppjdlz89cmwd8dmijn449r222hvpmv68vdhw"; depends=[car caret cp4p dplyr e1071 fuzzyjoin ggplot2 glmnet limma MALDIquant MALDIquantForeign MALDIrppa mclust metap mixOmics mltools nnet performanceEstimation reshape2 statmod UBL VSURF xgboost]; }; MSclust = derive2 { name="MSclust"; version="1.0.2"; sha256="0i88179z6h2lllkbhp5jfwxnamj1n45v3i3cizzqk217ch3nfjwd"; depends=[cluster GGally ggplot2 gtools Matrix mclust mnormt mvtnorm psych]; }; MScombine = derive2 { name="MScombine"; version="1.4"; sha256="0s3gbf3s5mf00d5mkbqhd9wwnyps7qb4r3zbal8j8nsaspql9nd3"; depends=[plyr]; }; @@ -2858,12 +2871,12 @@ in with self; { MaOEA = derive2 { name="MaOEA"; version="0.6.2"; sha256="0s8jvp7821mb6xff8xwnh78mhz4qfrbk4g7sp4dfnm2ii7ah9c6b"; depends=[e1071 gtools lhs MASS nnet nsga2R pracma randtoolbox reticulate stringr]; }; MachineShop = derive2 { name="MachineShop"; version="3.6.0"; sha256="1gfwqzfmkv48d5is112qpylmmr3b1jrx8ckf2l6agijmvarf7z21"; 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]; }; - MagmaClustR = derive2 { name="MagmaClustR"; version="1.0.1"; sha256="0gf0xlsh5wkvbp331z7c55ypfkg9rmmakykbqliswiyrfgbczk9g"; depends=[broom dplyr ggplot2 magrittr mvtnorm Rcpp rlang tibble tidyr tidyselect]; }; MainExistingDatasets = derive2 { name="MainExistingDatasets"; version="1.0.1"; sha256="1828pj76122z1aahrv82il05wy7lz87s8vwn024150cvsqh3lgrj"; depends=[config dplyr DT glue golem htmltools htmlwidgets magrittr openxlsx pkgload processx rlang sf shiny spData tidyr tmap tmaptools]; }; MajKMeans = derive2 { name="MajKMeans"; version="0.1.0"; sha256="1zphrxyx3jd6rnh1y1qnc6bip34kfqk1a5ms4ps39gfngznh482m"; depends=[MASS]; }; MakeYourPalette = derive2 { name="MakeYourPalette"; version="0.1.3"; sha256="0snawchc2rkxglmcg093gik3gwasn4pxqsvz6rm2r1gkbwbazmh4"; depends=[prismatic raster rgdal]; }; MakefileR = derive2 { name="MakefileR"; version="1.0"; sha256="1pfjic2lsar8ghbb6byr4rqrs30qrgfih092z4rxdpsiwkk3y7l1"; depends=[magrittr]; }; ManagedCloudProvider = derive2 { name="ManagedCloudProvider"; version="1.0.0"; sha256="0glhx9ylpx2s8mi711gblapw6qnv80nd4wahph65g6ddngvmgv73"; depends=[adagio DockerParallel jsonlite]; }; + MandalaR = derive2 { name="MandalaR"; version="0.1.0"; sha256="13shj6r416cz11qlwrha468gx1y76vx28xyhap3k0c0b2jxn699b"; depends=[ggplot2]; }; Mangrove = derive2 { name="Mangrove"; version="1.21"; sha256="1qf3fjzf0sb6fqbfdbxwbw6wah3gg2qran4mgg13hcmk4n3j0hxp"; depends=[]; }; ManifoldOptim = derive2 { name="ManifoldOptim"; version="1.0.1"; sha256="0vp064ayniwqc8wck9n5y7s5y22x2jq55n8l5q4vjb8q7idvy6xd"; depends=[Rcpp RcppArmadillo]; }; ManlyMix = derive2 { name="ManlyMix"; version="0.1.14"; sha256="0zpcc74965n435d4fah41r9nz0kjyn46hkjl1s0kvlllqj6n69wg"; depends=[]; }; @@ -2882,11 +2895,11 @@ in with self; { MasterBayes = derive2 { name="MasterBayes"; version="2.58"; sha256="0s6zry5nhwg3zbfgqd6zdrys0irf6336gfcba77z7xwssd4gh9j5"; depends=[coda genetics gtools kinship2]; }; MatManlyMix = derive2 { name="MatManlyMix"; version="1.1.1"; sha256="1d2vd5b9lirdybjclxh0nn4mghq64qjj4l8vnj95cni5pfa18a2c"; depends=[]; }; MatSkew = derive2 { name="MatSkew"; version="0.1.5"; sha256="019v2b1r0bvw84xs50smjb3jdz7gd2adz5d84xd8zq43lnml96d1"; depends=[]; }; - MatchIt = derive2 { name="MatchIt"; version="4.4.0"; sha256="01kc7qr9clps1ls033hl9fpfwf3nr45mr1cwhfd855r0jzkrd6p7"; depends=[backports Rcpp RcppProgress]; }; + MatchIt = derive2 { name="MatchIt"; version="4.5.0"; sha256="0wk1gjhdmf8wl92k3b9xgjfxxn5sqgddn9gcywch96237q8vlpr3"; depends=[backports Rcpp RcppProgress]; }; MatchLinReg = derive2 { name="MatchLinReg"; version="0.8.1"; sha256="1spkjpm4pviqv52nknhww1vcjc61sgsfsvp0ilpp4srh0ykc8ihh"; 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.10-4"; sha256="1ssgcq4n3sm2j3xbclfqqhkbs8i320yn7d8g69aymv28q67kh2ky"; depends=[MASS]; }; - Matrix = derive2 { name="Matrix"; version="1.5-1"; sha256="0pap6pb0is2s02l43y982p7banwi844bjpgbcgf6fb8pb01vlzam"; depends=[lattice]; }; + Matching = derive2 { name="Matching"; version="4.10-8"; sha256="16m4mmlvyslnn77idragbjf2ygmd7r6kwrgwkwcfnphzvlnjwhal"; depends=[MASS]; }; + Matrix = derive2 { name="Matrix"; version="1.5-3"; sha256="03g0zqkbaa1k52i0d0yyn7vclmg93hdqaid48sbc1ccpvi70ywjf"; depends=[lattice]; }; MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.10.0"; sha256="1na3y1crlj57c1xq9ja3v94cx2dr0myrlx9bxvhhwss3q3r1lgby"; depends=[plotrix pracma progress Rcpp RcppArmadillo RSpectra]; }; MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.3"; sha256="10r6h5bidj44kfbwiml9pkysbikqphfb21ig61qnx0qa12xcl6l8"; depends=[]; }; MatrixExtra = derive2 { name="MatrixExtra"; version="0.1.13"; sha256="1s8y8zp9k7rsnyi1d8ghi4brjbbdwxijc9chhla24qm3fi6np33a"; depends=[float Matrix Rcpp RhpcBLASctl]; }; @@ -2900,8 +2913,8 @@ in with self; { MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.4.13"; sha256="1jd3lnd5zdfipg5l8f7y52vy1pa9mfkjnspk50z881557k6pwmnf"; depends=[devtools digest dplyr futile_logger lubridate magrittr purrr rlang rvest stringr tibble xml2]; }; MazamaLocationUtils = derive2 { name="MazamaLocationUtils"; version="0.3.8"; sha256="1vjbbbdq3nlgp7fdzrsb568v37s3iszcm6c93yz2ckgqxy7m4sli"; depends=[dplyr geodist httr jsonlite leaflet lubridate magrittr MazamaCoreUtils MazamaSpatialUtils readr rlang stringr tidygeocoder]; }; 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]; }; + MazamaSpatialPlots = derive2 { name="MazamaSpatialPlots"; version="0.2.0"; sha256="1i8gqywl2w7zjl1m5qw8vmy7wn44cp8fkiw4m2iwvf4s9q43xjnc"; depends=[dplyr magrittr MazamaCoreUtils MazamaSpatialUtils rlang sf tmap]; }; + MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.8.1"; sha256="1pw4hgd4bjzm0vbkry6ajndlb337x257amr5zwxr8zaal4j0zrgq"; depends=[countrycode dplyr magrittr MazamaCoreUtils rlang rmapshaper sf stringr]; }; MazamaTimeSeries = derive2 { name="MazamaTimeSeries"; version="0.2.8"; sha256="0png8yfnn5wch04c9krxnvy4bbpz0syrir8i536giw6fbk7hfy1y"; depends=[dplyr geodist lubridate magrittr MazamaCoreUtils MazamaRollUtils rlang stringr]; }; Mcomp = derive2 { name="Mcomp"; version="2.8"; sha256="1wz5fr3dhxn4s0qvxm2mzq9dbz3x0vgh6pixjrgk9d4i9w2p7s60"; depends=[forecast ggplot2]; }; MeTo = derive2 { name="MeTo"; version="0.1.1"; sha256="0zn63qljsw3bnxpj823lrkcl3rnxksjsaxzn6dbddw41j80mmfa4"; depends=[lubridate]; }; @@ -2910,11 +2923,12 @@ in with self; { 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.9"; sha256="0vvmp6bf5ka8ivi1z6rl6rcvbks14c7g1f0sisqqjwsza3fi5s9m"; depends=[devEMF doParallel doRNG flextable foreach lme4 lmerTest MASS mvtnorm officer pbkrtest Rcpp RcppEigen RcppNumerical rootSolve shiny shinydashboard shinyMatrix]; }; + MedianaDesigner = derive2 { name="MedianaDesigner"; version="0.10"; sha256="04say70f7wsa245apak44r7jz2gp2vp3zppg1sqs5pxn9009ah9m"; depends=[devEMF doParallel doRNG flextable foreach lme4 lmerTest MASS mvtnorm officer pbkrtest Rcpp RcppEigen RcppNumerical rootSolve shiny shinydashboard shinyMatrix]; }; Mega2R = derive2 { name="Mega2R"; version="1.0.9"; sha256="1wpn03csv88958ppg4idwidcdvr1gf3bps4c0sf5z3ri78awb28f"; depends=[AnnotationDbi DBI famSKATRC gdsfmt GenomeInfoDb kinship2 pedgene Rcpp RSQLite SKAT]; }; MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.6.0"; sha256="0qf2kb04ia5rdasvs34ziwyan5k327gi45frjkhmi5qsz64z51bg"; depends=[ggplot2 glmnet iterpc knitr Matrix plotly quantreg rjson rmarkdown robustbase]; }; Mercator = derive2 { name="Mercator"; version="1.1.2"; sha256="1iixn75vp66gbhllppm8xaxxqg8qbp4m5db8qznnysm8gn5wcl7f"; depends=[ClassDiscovery cluster dendextend flexmix igraph KernSmooth kohonen Polychrome Rtsne Thresher umap]; }; MeshesTools = derive2 { name="MeshesTools"; version="1.0.0"; sha256="0vr7l9g53h1rxyhn8c8l3hmbsh7c2cfl3jvlrnm2jhpfcsp8851g"; depends=[BH data_table gmp PolygonSoup Rcpp RcppCGAL RcppEigen rgl Rvcg]; }; + Mestim = derive2 { name="Mestim"; version="0.1.0"; sha256="1alav9xihq7mdz9cd24sh5nkblh8nm5h2zsrqizqg3w4dw288dgj"; depends=[]; }; MetAlyzer = derive2 { name="MetAlyzer"; version="0.1.0"; sha256="1mqc2037q71n1k7ncym52vn0cc5ndsxq4r87k492lp1b3i7h1wi3"; depends=[agricolae dplyr openxlsx rlang tibble tidyr]; }; MetBrewer = derive2 { name="MetBrewer"; version="0.2.0"; sha256="0x51g5z9cdl043rna9qh4cj16qxahb6ccj9d8rr9d43d860jigp7"; depends=[ggplot2]; }; MetGen = derive2 { name="MetGen"; version="0.5"; sha256="00yzaicrpwfnxi5mdzwx1ai721vczkkf2yl50q9wwpxhmfx0xbbh"; depends=[chron glmnet MASS]; }; @@ -2941,9 +2955,10 @@ in with self; { MethodCompare = derive2 { name="MethodCompare"; version="0.1.2"; sha256="1nxr2fgmfixjkdparavi156qqqchjwaxpjk9i2xgc1yhp1p01pll"; depends=[nlme]; }; Metrics = derive2 { name="Metrics"; version="0.1.4"; sha256="0fh8qbjlwzagh272lgwr4bxcqcjb1qpz53mgs8rzlvncax6nk5bk"; depends=[]; }; MetricsWeighted = derive2 { name="MetricsWeighted"; version="0.5.4"; sha256="1hv2bgd64km303l09kva0pa9wx95f82qa9c4zl8nrmfhi2dvckqh"; depends=[]; }; + MfUSampler = derive2 { name="MfUSampler"; version="1.1.0"; sha256="0jzql2hs335gd4kwj18yi8ygsi3190wacfs3mgrmshdjb2frkh15"; depends=[ars coda dlm]; }; MiDA = derive2 { name="MiDA"; version="0.1.2"; sha256="144gxsxqljzskxsw5k0y69ix0pxlfvyyznxkjpf2ng4l47pg11z5"; depends=[caret gbm genefilter limma preprocessCore pROC SQN]; }; MiMIR = derive2 { name="MiMIR"; version="1.4"; sha256="0gy4mp4dc25jzks62rw1w3xwrr4zs4q4cix2mlcmhh807km0g3xf"; depends=[caret dplyr DT foreach fs ggplot2 heatmaply matrixStats plotly pROC purrr shiny shinycssloaders shinydashboard shinyFiles shinyjs shinyWidgets survival survminer]; }; - MiRKAT = derive2 { name="MiRKAT"; version="1.2.1"; sha256="1ypxs6p8jzd2y5rxbfrr2z1xib6im9i58wvcz4cqcgpw298w7ard"; depends=[CompQuadForm GUniFrac lme4 MASS Matrix mixtools PearsonDS permute quantreg survival]; }; + MiRKAT = derive2 { name="MiRKAT"; version="1.2.2"; sha256="1ia5by9gnm9lbflp2lcqm04z3z1jh7h33p238k8ycypbbx2yy12i"; 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]; }; @@ -2967,7 +2982,6 @@ in with self; { 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.7"; sha256="0l1qivl9a5b8rayg9srxlgkk4wilv2m9yw4lsca29s5wd3wpyksv"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; }; - MixMAP = derive2 { name="MixMAP"; version="1.3.4"; sha256="0gxghym5ghbyxf589hda2fhv5l3x5jvm6i40x5xdwx4hadcn8k9a"; depends=[lme4]; }; MixMatrix = derive2 { name="MixMatrix"; version="0.2.6"; sha256="007vx59v5h3pfawg6slqgbs3b8dvbhcfh4cvasfydidiiyaggjdc"; depends=[CholWishart Rcpp RcppArmadillo]; }; MixOptim = derive2 { name="MixOptim"; version="0.1.2"; sha256="14blyb1dqbdb14rby4nrggpqdx6b43lbb2xwi3059biq9mrj3a2x"; depends=[desirability ggplot2 patchwork rlang]; }; MixRF = derive2 { name="MixRF"; version="1.0"; sha256="1av1wx7wmfc3z8a4bc6g3i3b807nc28n3s2rs3yh0rcwq1pfl0ir"; depends=[doParallel foreach lme4 randomForest]; }; @@ -2991,7 +3005,7 @@ in with self; { MoTBFs = derive2 { name="MoTBFs"; version="1.4.1"; sha256="03c1k5vvswlhbsivw6yznw1v0cdl8avs514iaa2v2994j2yk40j6"; depends=[bnlearn ggm lpSolve Matrix quadprog]; }; MobileTrigger = derive2 { name="MobileTrigger"; version="0.0.31"; sha256="1zbnxdxh6gr4sgpi10i0pnd85f7i842105jgjswacziqamby6mcy"; depends=[caret ggplot2 kableExtra knitr mailR plyr XML yaml]; }; ModEstM = derive2 { name="ModEstM"; version="0.0.1"; sha256="136g7rdphprx5b2xmb4jnixaam23g78m3fyfwz3mfx1w23ajf4r1"; depends=[dplyr rlang]; }; - ModStatR = derive2 { name="ModStatR"; version="1.3.1"; sha256="16mfggplpmjz2kspfa99q4gbm4avm306d83n8hiki382094li1ni"; depends=[boot ellipse gsl hypergeo jmuOutlier]; }; + ModStatR = derive2 { name="ModStatR"; version="1.3.2"; sha256="18xsdflns5w5p5aqxmjh8xcnh13r5wy1m4skm257r3mg1d5b2agw"; depends=[boot ellipse gsl hypergeo jmuOutlier]; }; ModTools = derive2 { name="ModTools"; version="0.9.4"; sha256="111rhdw917rynwsh6l6nsma5pjyi3ix9gjy5fx620d6ywcq7b227"; depends=[AER C50 car class DescTools e1071 lattice lmtest MASS naivebayes NeuralNetTools nnet pROC pscl randomForest relaimpo robustbase rpart rpart_plot sandwich survival]; }; Modalclust = derive2 { name="Modalclust"; version="0.7"; sha256="0ymzdxp6rh6baih1xm6kj8l8jxjclvnmq0gfp38cl8lpskspb26x"; depends=[class mvtnorm zoo]; }; ModelMatrixModel = derive2 { name="ModelMatrixModel"; version="0.1.0"; sha256="0w8j32b2yw7x8lr1a9bgs4ylxfsxw8m06q7xpgsiz6sjicspc714"; depends=[Matrix]; }; @@ -3011,7 +3025,7 @@ 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.5"; sha256="1yqqvbj53111wlmi9c8xg7yylgasl97mn5bx0w5zkmnx0xvq004i"; depends=[lavaan Matrix]; }; Morpho = derive2 { name="Morpho"; version="2.10"; sha256="039gnlfgwi5qvffpx0b9v7chhj9acrnxybm56ssam5znri3wbqyw"; depends=[bezier colorRamps doParallel foreach jsonlite MASS Matrix Rcpp RcppArmadillo rgl Rvcg sf]; }; - MorphoTools2 = derive2 { name="MorphoTools2"; version="1.0.0.0"; sha256="09s00spslzsf4x8i29fs0nggwa1afh772hkg7r6pvkam88p0x1y8"; depends=[ade4 candisc car class ellipse heplots MASS plot3D StatMatch vegan]; }; + MorphoTools2 = derive2 { name="MorphoTools2"; version="1.0.1.0"; sha256="096siq21z4gsyn7hhkddmxvc6n9vl2diiybfjimycrb0dh17xgy4"; depends=[ade4 candisc car class ellipse heplots MASS plot3D StatMatch vegan]; }; Morphoscape = derive2 { name="Morphoscape"; version="1.0.0"; sha256="1kmr9pf5a6lyhmzbzs8h8fvr4lhm5f9k5a1bbglw369m053rgd4c"; depends=[automap concaveman ggplot2 sp]; }; MortCast = derive2 { name="MortCast"; version="2.7-0"; sha256="1hw20wb0sl8q09vv68hid90ma2ml866kglsjf38kqky1whmihfbc"; depends=[wpp2017]; }; MortalityGaps = derive2 { name="MortalityGaps"; version="1.0.0"; sha256="0nfm8xa7gnshrl8hsvmvr3za8nbppp7f7i5h4ni204w7xwvh8jxc"; depends=[crch forecast MASS pbapply]; }; @@ -3030,7 +3044,7 @@ in with self; { MultBiplotR = derive2 { name="MultBiplotR"; version="1.3.30"; sha256="0cnn8m4yd2w0izbsvrlqgxif41554nq3hj7m169lxwxrb0csybcf"; depends=[car dae deldir dunn_test geometry GPArotation gplots Hmisc lattice MASS mirt mvtnorm optimr polycor rgl scales xtable]; }; MultEq = derive2 { name="MultEq"; version="2.4"; sha256="0x0mfmrfcjdv7v5nlakmjh2ilmgn15xgzc4qgm6djkif6565v46i"; depends=[]; }; MultIS = derive2 { name="MultIS"; version="0.6.2"; sha256="02ca1r8qfsl1b8rfawdn4xrlwhg5yab260rrsx8ckyv3v75knk8f"; depends=[cluster clv clValid dplyr foreach ggplot2 igraph ltm plyr poweRlaw RColorBrewer reshape2 rlang rmutil]; }; - MultNonParam = derive2 { name="MultNonParam"; version="1.3.7"; sha256="10a4nsgwhg2sz9byxhng9clgrqp2zqawcrhzwb8jllw38y2mg1wp"; depends=[ICSNP]; }; + MultNonParam = derive2 { name="MultNonParam"; version="1.3.8"; sha256="0j6ma63yq4nj22vqlpbid24cdva8pj2d03ym9irwx5mp70f5zk55"; 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.2.4"; sha256="11x6yah7a825wyycq32jpajrh4y45sss10p2w5zpavij37kn4hms"; depends=[ggplot2 hablar pracma wrapr zoo]; }; @@ -3067,7 +3081,7 @@ in with self; { Mychisq = derive2 { name="Mychisq"; version="0.1.3"; sha256="0667ldi1qm47cpdr0j7gv7c6f8s5wj7naqcgv9harrsmm4vsr4w6"; depends=[]; }; N2H4 = derive2 { name="N2H4"; version="0.8.2"; sha256="1bqkjfw14jlk3hr10g5djp358qj07c8x4xyjsrcs86zx6yq2gbda"; depends=[httr2 jsonlite magrittr purrr rvest tibble]; }; N2R = derive2 { name="N2R"; version="1.0.1"; sha256="12bv7xx6j6222qgpv6g61i68017fz0x6fjg9a9k5yhgw3zk05hpk"; depends=[Matrix Rcpp RcppEigen RcppSpdlog]; }; - NACHO = derive2 { name="NACHO"; version="2.0.0"; sha256="1nd2sxgj8yyjynn0bd6k7pq40isxycr9a5bz0g42ndm4kyd1vjva"; depends=[data_table ggbeeswarm ggforce ggplot2 ggrepel knitr rmarkdown shiny shinyWidgets]; }; + NACHO = derive2 { name="NACHO"; version="2.0.2"; sha256="1y1169r8cm5dv4sir5840y9vr78jfzym917807hydrkplr8ifh4h"; depends=[data_table ggforce ggplot2 ggrepel knitr rmarkdown shiny shinyWidgets]; }; NADA = derive2 { name="NADA"; version="1.6-1.1"; sha256="0jp4mqr77cx7q5lff84s6wb0dwjy9mi0jyhbjc5fsx50bdczc3v7"; depends=[survival]; }; NADA2 = derive2 { name="NADA2"; version="1.1.0"; sha256="0fpxcyxwjz20h5dcyijbd09msw2c0l9fd2z5schdqhhfb6ravzcl"; depends=[cenGAM coin EnvStats fitdistrplus Kendall mgcv multcomp NADA perm survival survminer vegan]; }; NADIA = derive2 { name="NADIA"; version="0.4.2"; sha256="19545sc75a82smjvvyd353wjlh3wwzhwapcrk9fkg3ffjv9p4a3n"; depends=[Amelia data_table doParallel foreach glmnet mice missForest missMDA missRanger mlr3 mlr3learners mlr3pipelines paradox rpart softImpute testthat VIM]; }; @@ -3118,7 +3132,7 @@ in with self; { NLRoot = derive2 { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; }; NMADiagT = derive2 { name="NMADiagT"; version="0.1.2"; sha256="0fskc3ldfdl17gazpfr2hixy79n7db4c1f5yl1jalhwxiabnxjwp"; depends=[coda ggplot2 imguR ks MASS MCMCpack plotrix Rdpack reshape2 rjags]; }; NMAoutlier = derive2 { name="NMAoutlier"; version="0.1.18"; sha256="0h0pxjg6ppz9zv7wcv1dka5g0f9wxk3bnwicfpsv1advcam4vmmn"; depends=[ggplot2 gridExtra MASS meta netmeta reshape2]; }; - NMF = derive2 { name="NMF"; version="0.24.0"; sha256="14yxra6in5c1md5nr75y8cdmh9pg0lxqabqflvlhgg1vbg9i2628"; depends=[Biobase BiocManager cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; }; + NMF = derive2 { name="NMF"; version="0.25"; sha256="0kdl7yz4v7pms6y2lff4x5w7pwkx54488qx0v539qmvcbxv1if98"; depends=[Biobase BiocManager cluster codetools colorspace digest doParallel foreach ggplot2 gridBase RColorBrewer registry reshape2 rngtools stringr]; }; NMFN = derive2 { name="NMFN"; version="2.0.1"; sha256="1fdrw69zz2ri6wi1kd7v960kykacjxyr37iv8q5h7kwiidl0ha76"; depends=[]; }; NMI = derive2 { name="NMI"; version="2.0"; sha256="1rxphy9rhy9zhdiz48dvl9m26x6k681lnyn39lqxs0a6jhrxg7y3"; depends=[]; }; NMMIPW = derive2 { name="NMMIPW"; version="0.1.0"; sha256="13mv6dpmlldqxkxq6kiydsfwyys5w7i8ws80a5l3377i5chdqi2c"; depends=[lava nloptr numDeriv]; }; @@ -3126,17 +3140,18 @@ in with self; { NMTox = derive2 { name="NMTox"; version="0.1.0"; sha256="1slz6bq57l3f2wqd2nhm3b7dag6vg7wy9zi5rpl7ld1yyqfb0wfp"; depends=[dplyr forcats ggplot2 gridExtra Iso tidyr]; }; NMVANOVA = derive2 { name="NMVANOVA"; version="1.1.0"; sha256="1jlqyg5vn7j8srvifjghd5a7820kadl8kbwib4qxalrfprq81h8p"; depends=[]; }; NMcalc = derive2 { name="NMcalc"; version="0.0.1"; sha256="15jf38yvyiasq6bvnv23znp64njag432f1jb9zayghsny63m3dcl"; depends=[data_table]; }; - NMdata = derive2 { name="NMdata"; version="0.0.13"; sha256="038zps1017yw6varc3dgijhakx3z2sp5hrp9k03pgp6g2ygchi6v"; depends=[data_table]; }; + NMdata = derive2 { name="NMdata"; version="0.0.15"; sha256="11nj9s7bzzhgxgniyxlwakk06xkjhw1j8lv0skgwxb1lw6nb3maa"; depends=[data_table]; }; NMproject = derive2 { name="NMproject"; version="0.6.9"; sha256="0br58m07yf5bxizz3m14rbskhracyg99gq6di9a5rgzycgs3rvg4"; depends=[crayon diffobj dplyr DT dygraphs git2r htmltools lifecycle magrittr miniUI 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.9.2.1"; sha256="05prbxvbrkg00kj78m6i9402z1mwswh780va20dc5cm7bm4in0si"; depends=[caret data_table doParallel meboot MESS quantmod Rcpp RcppParallel Rfast rgl stringr xts zoo]; }; + NNS = derive2 { name="NNS"; version="0.9.4"; sha256="0yr9pw198wdd064lvxbnnw8nd6x94xf80im0r02kwf6b2l3zxz8g"; depends=[caret data_table doParallel meboot quantmod Rcpp RcppParallel Rfast rgl stringr xts zoo]; }; NNTbiomarker = derive2 { name="NNTbiomarker"; version="0.29.11"; sha256="0sqlf7vzhpmq2g98c2qlrcqn3ba4ycfxbczgcjiqqhqsvgkpacc1"; depends=[magrittr mvbutils shiny stringr xtable]; }; NNbenchmark = derive2 { name="NNbenchmark"; version="3.2.0"; sha256="086smk3xy6p6ianw41h3gx806q7h28v1dg9d3khsrwyyf9gn8xyp"; depends=[pkgload R6]; }; - NO_PING_PONG = derive2 { name="NO.PING.PONG"; version="0.1.4"; sha256="10q5h9kafni3wlnn1gdsgd9a90km5snrjz1nr0ilafmdvw9vg6v1"; depends=[MASS MCMCglmm metafor]; }; + NO_PING_PONG = derive2 { name="NO.PING.PONG"; version="0.1.6"; sha256="1i8pwk4p43yqmk8irkmvza080sngmng0wv1yr847253a0frjg9mr"; depends=[MASS MCMCglmm metafor]; }; NORMA = derive2 { name="NORMA"; version="0.1"; sha256="193q6dwn8v7k8xq0amjpvb3v6mn7c6agqa487gvjj78dy1qz720a"; depends=[rootSolve]; }; NPBayesImputeCat = derive2 { name="NPBayesImputeCat"; version="0.5"; sha256="05zwa7hhf8p1icgdvvla0r70fgvjm7s38gp69h7wgsq8yl6vd876"; depends=[bayesplot dplyr ggplot2 Rcpp reshape2 rlang]; }; NPCD = derive2 { name="NPCD"; version="1.0-11"; sha256="107i33z4q5w2828sm0pm8234kmp1v3a2w72lmhvi0rpnjhg0x120"; depends=[BB R_methodsS3]; }; - NPCirc = derive2 { name="NPCirc"; version="3.0.1"; sha256="0hljqfyrb8r76f6lkjn0jgr15wnyqv3pc3bv23bdw0hxq574aiwc"; depends=[circular misc3d movMF plotrix rgl shape]; }; + NPCirc = derive2 { name="NPCirc"; version="3.1.1"; sha256="0qcam9n9llsblrpa2w0yj0axh79qwinz4wwbf4gvyrajfv935i8i"; depends=[Bolstad2 circular misc3d movMF plotrix Rcpp RcppArmadillo rgl shape]; }; + NPCox = derive2 { name="NPCox"; version="1.1"; sha256="09cyaj2xlad8277bw5nbdi51imhw5dr78zqks0cz3513igc262sa"; depends=[]; }; NPHMC = derive2 { name="NPHMC"; version="2.3"; sha256="0mi92rnpm96nc2ip10022qa7cjrlry9aibw8yx9xmn826bqipwir"; depends=[smcure survival]; }; NPHazardRate = derive2 { name="NPHazardRate"; version="0.1"; sha256="0na4iphva1dadz457ii8kxrhnki2asaxpbwr824rljyrldj9rcgg"; depends=[survival]; }; NPIstats = derive2 { name="NPIstats"; version="0.1.0"; sha256="0hbx2mzz1z2158c943dqfn0pq1aybj1xxy55mmvld4djr5zrlz9w"; depends=[dplyr]; }; @@ -3168,11 +3183,10 @@ in with self; { NetCoupler = derive2 { name="NetCoupler"; version="0.1.0"; sha256="1xycg179anf78kd1xfwzlmfp8igrl7k2bv105w3s2df5pd8gnpbg"; depends=[checkmate dplyr ids igraph lifecycle magrittr pcalg ppcor purrr rlang tibble tidygraph tidyselect]; }; NetDA = derive2 { name="NetDA"; version="0.2.0"; sha256="149wadsw6h2nlw8fpn1n9ami484zyzhbss5fdhc84bvcs21ivl81"; depends=[glasso]; }; NetExplorer = derive2 { name="NetExplorer"; version="0.0.2"; sha256="0k8jhl0p2dp45lx4h77r0bkcff8vn1f9gvr475cshpmyipziiwnq"; depends=[]; }; - NetFACS = derive2 { name="NetFACS"; version="0.4.0"; sha256="1g4m4iwdyfvs9cfmcagxs5j0pm223m0p73szg8np16y2rappk55m"; depends=[arrangements doParallel dplyr ggplot2 ggraph igraph magrittr patchwork picante Rfast rlang tibble tidygraph tidyr vctrs]; }; + NetFACS = derive2 { name="NetFACS"; version="0.5.0"; sha256="05lqfawirdw4fh0hawm815hjdpyli7025dz3a5fsm6jh3l906z9i"; depends=[arrangements doParallel dplyr ggplot2 ggraph igraph magrittr patchwork picante Rfast rlang tibble tidygraph tidyr vctrs]; }; NetIndices = derive2 { name="NetIndices"; version="1.4.4.1"; sha256="0zi3b9i2apfdcm85k7ah6r6ad0v6rji5gysb410vc3bgrixa03lk"; depends=[MASS]; }; NetInt = derive2 { name="NetInt"; version="1.0.0"; sha256="08vmqjai1lakbb4zs895fn0hn3gw2q7zsdkx6yxidfff5qn4mq6b"; depends=[mathjaxr]; }; - NetLogoR = derive2 { name="NetLogoR"; version="0.3.11"; sha256="0pppcpij4wn1gig7lyh122x52dx8x1dy98v5cphmrap8mpj4x7h2"; depends=[abind CircStats data_table matrixStats quickPlot raster sf sp SpaDES_tools]; }; - NetMix = derive2 { name="NetMix"; version="0.2.0"; sha256="097cyk0lf3h4v3ff0icqj7a80yvs06damw1sc4hdqf2f21d6qihh"; depends=[clue gtools igraph lda MASS Matrix poisbinom Rcpp RcppArmadillo]; }; + NetMix = derive2 { name="NetMix"; version="0.2.0.1"; sha256="0363z06y7ildk7bifhj2lmva0hf591nyp10x9ccd6csj387n968p"; depends=[clue gtools igraph lda MASS Matrix poisbinom Rcpp RcppArmadillo]; }; NetOrigin = derive2 { name="NetOrigin"; version="1.1-4"; sha256="061hfllic8z3ps4znk3c7qjhzqdifk99ikvczxacih5hw86a9j4m"; depends=[colorspace corpcor Hmisc igraph mvtnorm plyr]; }; NetPreProc = derive2 { name="NetPreProc"; version="1.2"; sha256="07drrgvgl3msbcxi113hinqss30lkzrv9hqkzwa41bpssfq8x68c"; depends=[graph]; }; NetRep = derive2 { name="NetRep"; version="1.2.4"; sha256="1swlb2k9bc7whvslxbklz864j9ynvna73hvq5rhv61cv5vy05ksd"; depends=[abind BH foreach RColorBrewer Rcpp RcppArmadillo RhpcBLASctl statmod]; }; @@ -3183,7 +3197,7 @@ in with self; { 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="1.0.0"; sha256="0mnvidqbmd11aq6kh7m4y36lxaz0ks5h69ilskl49562ggxm741q"; depends=[broom doParallel dplyr foreach ggplot2 igraph magrittr MASS network purrr scales sna tidyr]; }; + NetworkExtinction = derive2 { name="NetworkExtinction"; version="1.0.2"; sha256="19rgz2v4p0q6j7q3gs695j2jpxzlwvx06bhcji68hkrn78745ag0"; depends=[broom doParallel dplyr foreach ggplot2 igraph magrittr MASS network purrr scales sna tidyr]; }; NetworkInference = derive2 { name="NetworkInference"; version="1.2.4"; sha256="1x63szbns8wf3k89ibk2p66prngw4fr2ckfn1568mnxdwnzvhrb4"; depends=[assertthat checkmate ggplot2 ggrepel Rcpp RcppProgress]; }; 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]; }; @@ -3204,14 +3218,14 @@ in with self; { NobBS = derive2 { name="NobBS"; version="0.1.0"; sha256="0i0jyny1c29knpcl4szqwyxvdc3dqjfk5lf2xvwjdx3qas92w03l"; depends=[coda dplyr magrittr rjags]; }; NonCompart = derive2 { name="NonCompart"; version="0.6.0"; sha256="0cda8rd45irx8q33zs9hcfhsanq09hnx3fpkpa9173pn0j6iw0zv"; depends=[]; }; NonNorMvtDist = derive2 { name="NonNorMvtDist"; version="1.0.2"; sha256="11xqdrx03q3anavyxpzb0hz6mcbdy252rzzjlpa2byfdlrfvn178"; depends=[cubature]; }; - NonParRolCor = derive2 { name="NonParRolCor"; version="0.6.0"; sha256="0z4c5f2x995k2lgfwnylag69sgrzq1n3qg9c8fn1mhzkdw4y4108"; depends=[colorspace doParallel foreach gtools pracma scales]; }; + NonParRolCor = derive2 { name="NonParRolCor"; version="0.8.0"; sha256="1rh345vydbg31pbkagyb2xmsy8riam9zj7sc86m6dqvl19lglvg5"; depends=[colorspace doParallel foreach gtools pracma scales]; }; NonProbEst = derive2 { name="NonProbEst"; version="0.2.4"; sha256="1w2ihnwwdnxlnphyd26261lsxaknpi51c15rmn9m183djz9gsvdv"; depends=[caret e1071 glmnet Matrix sampling]; }; NonlinearTSA = derive2 { name="NonlinearTSA"; version="0.5.0"; sha256="1z3fqw19kksadc31f1idrj37gzajrx91pprd07xdar7j6hddf4sn"; depends=[car minpack_lm tsDyn]; }; Nonpareil = derive2 { name="Nonpareil"; version="3.4.0"; sha256="130aags0pgry0d34mj1n4lavc8q43hls7c3jhmkr8k6vyg3ij372"; depends=[]; }; NormExpression = derive2 { name="NormExpression"; version="0.1.0"; sha256="1j4q8mb70ig40acfd9kfy12vxdvq3qpf53rxh47kkw8mywnd0449"; depends=[]; }; NormPsy = derive2 { name="NormPsy"; version="1.0.8"; sha256="13w4xjdjjg9mzmfaflc0gp306kazyvxshpj4vnl6gym3vpi9qax8"; depends=[lcmm]; }; NormalLaplace = derive2 { name="NormalLaplace"; version="0.3-0"; sha256="0njgjdx2yvvy5jb5zn6zr7jdz5hck5bbkicv15z4ai4ibmckqjmh"; depends=[DistributionUtils GeneralizedHyperbolic]; }; - NormalityAssessment = derive2 { name="NormalityAssessment"; version="0.0.2"; sha256="0i02mqxgyzm6y02rbk6skqp58hf35cg4wpfa9abx8rsmbg09jpxj"; depends=[dplyr DT ggplot2 rio shiny shinyalert shinyBS stringi stringr]; }; + NormalityAssessment = derive2 { name="NormalityAssessment"; version="0.1.0"; sha256="0r9a51z614si3b45g01lfgapmgc4smjf2hylgy5kvq8w0yh0w5y6"; depends=[dplyr DT ggplot2 rio rmatio shiny shinyalert shinyBS stringi stringr]; }; NostalgiR = derive2 { name="NostalgiR"; version="1.0.2"; sha256="0rpvwi815sdhaxqpji1y6g0vy8mkn5k6wci0a4jf54pkywwkwrwp"; depends=[txtplot]; }; NovelDistns = derive2 { name="NovelDistns"; version="0.1.0"; sha256="073969vk2vg58fx5h0v92m3zb1rdzlvv809vyahy3gxrj9n13lmh"; depends=[AdequacyModel gsl rootSolve]; }; Nozzle_R1 = derive2 { name="Nozzle.R1"; version="1.1-1.1"; sha256="0fanf7cl8dlb8iqw8ww03dd5s6mrpr97m2c511clqkaavbd0yzkp"; depends=[]; }; @@ -3220,7 +3234,7 @@ in with self; { OAIHarvester = derive2 { name="OAIHarvester"; version="0.3-3"; sha256="00j5f6kw67qr83cmds9y5rzwiv2sb2b2bfbr5cclpr3wcsw278fs"; depends=[curl xml2]; }; OBASpatial = derive2 { name="OBASpatial"; version="1.9"; sha256="13jx5f5piii9cys7xyhfwilyg87zsi632fscy8902mlhbgg7abkp"; depends=[cubature HDInterval invgamma LaplacesDemon modeest mvtnorm truncdist]; }; OBIC = derive2 { name="OBIC"; version="2.0.1"; sha256="0yrgnrhxn5nv0gbhzj2psskr12yaygv7bns64al1cgk18dlrsgb0"; depends=[checkmate data_table]; }; - OBL = derive2 { name="OBL"; version="0.2.0"; sha256="03a8xk7gakziw9bd25izpsby0r7b28wyhd785p22m4dfl46663pg"; depends=[dplyr forcats foreach forecast ggplot2 tibble]; }; + OBL = derive2 { name="OBL"; version="0.2.1"; sha256="06icw1dnmavgaf51fs2nfi6582cpjrnlii1j9s62nwnwfnqw00v3"; depends=[dplyr forcats foreach forecast ggplot2 tibble]; }; OBMbpkg = derive2 { name="OBMbpkg"; version="1.0.0"; sha256="01wch8wwij3fd0jambk0hpkhlnp4ryrq8qnnr2w1iad9zssjyii5"; depends=[]; }; OBsMD = derive2 { name="OBsMD"; version="6.1"; sha256="0jvvcx2lc39rdnlbhykam6cf94lbci9zc1vshwfhvygblnmjgrzr"; depends=[]; }; OCNet = derive2 { name="OCNet"; version="0.5.0"; sha256="111sk662a3qrkknlvw1x605gg5rskyayd1scafbswp6zjgrczgh4"; depends=[fields igraph rgdal rgl sp spam SSN]; }; @@ -3271,10 +3285,10 @@ in with self; { Observation = derive2 { name="Observation"; version="0.3.0"; sha256="1z9ldp050f7jy76s8yk509nwjx1ymvk5k9d19i67brd7xcawxnr3"; depends=[svDialogs]; }; OceanView = derive2 { name="OceanView"; version="1.0.6"; sha256="1ww6xhpvs3y0zx7pgj8083a8v4l4cm0b0b497b4gsjbcbnbnal9c"; depends=[plot3D plot3Drgl rgl shape]; }; OddsPlotty = derive2 { name="OddsPlotty"; version="1.0.2"; sha256="0adgbrni7yrarybh0djmq68hifwqzn2rn9mfqgwqma1d7mg3ai93"; depends=[caret e1071 ggplot2 ggthemes magrittr mlbench rmarkdown tibble tidymodels]; }; - OenoKPM = derive2 { name="OenoKPM"; version="0.1.2"; sha256="1rw740zw38k3q9kl89rvn740d5v4k1hhmlz4bp9ynhnq34g9p9rq"; depends=[extrafont ggplot2 ggtext minpack_lm openxlsx]; }; + OenoKPM = derive2 { name="OenoKPM"; version="2.1.3"; sha256="14hl749zbvw45gnd8iqg630iwfd694rjgjasc91vcrfylaqqhyhj"; depends=[ggplot2 minpack_lm openxlsx]; }; Ohit = derive2 { name="Ohit"; version="1.0.0"; sha256="132d4drc2phw9ppxnczb1ycdg3dv085k8p6bcaj3v866j0hfxjgb"; depends=[]; }; OkNNE = derive2 { name="OkNNE"; version="1.0.0"; sha256="0ggx508cqkqc51qw10cajm8r3k5h474n7y8dgck2fr4db047zmcm"; depends=[FNN]; }; - OlinkAnalyze = derive2 { name="OlinkAnalyze"; version="3.1.0"; sha256="0cmd6clj18ix64iax6j93ydgbr8gad4pn8cwh401sbbilsc9yi31"; depends=[broom car dplyr emmeans forcats generics ggplot2 ggpubr ggrepel lme4 lmerTest magrittr readxl rlang rstatix stringr tibble tidyr tidyselect zip]; }; + OlinkAnalyze = derive2 { name="OlinkAnalyze"; version="3.2.2"; sha256="1fbq3pw8x9bfnr42is0l4vfzdzp52lf9p9j6x0qgndhqiw9rzg90"; depends=[broom car dplyr emmeans forcats generics ggplot2 ggpubr ggrepel lme4 lmerTest magrittr readxl rlang rstatix stringr tibble tidyr tidyselect zip]; }; OmegaG = derive2 { name="OmegaG"; version="1.0.1"; sha256="1aihcrgml67rvnx9vpnq2nnbc79kicw4ks1fradsa36ykkdz6b1g"; depends=[]; }; OmicKriging = derive2 { name="OmicKriging"; version="1.4.0"; sha256="08frr38yf5d0l3zwkbq9465xrbyzsn8sx9icqc3yvfnxrkhrpzig"; depends=[doParallel foreach irlba ROCR]; }; OmicNavigator = derive2 { name="OmicNavigator"; version="1.11.5"; sha256="0c34gcwwqsl1sxsq54i4lx6ih19jqcfxqbq948rknxz3l5f00jm6"; depends=[data_table jsonlite]; }; @@ -3285,7 +3299,7 @@ in with self; { OnboardClient = derive2 { name="OnboardClient"; version="1.0.0"; sha256="15ymf163a80s4yvi5z884irvkb1ivnxpr505z96s23hs8ibhk2bh"; depends=[data_table dplyr httr jsonlite lubridate plyr rrapply rstudioapi stringr tibble tidyr tidyselect]; }; OncoBayes2 = derive2 { name="OncoBayes2"; version="0.8-7"; sha256="0psw7hily07xz61x25mg7iirr8aic32ny0770ks8ldy5rq2qjg86"; depends=[abind assertthat bayesplot BH checkmate dplyr Formula ggplot2 matrixStats posterior Rcpp RcppEigen RcppParallel rlang rstan rstantools scales StanHeaders tibble tidyr tidyselect]; }; Oncotree = derive2 { name="Oncotree"; version="0.3.4"; sha256="11pn50zshv1rl2mvars5iwzqfzlm9i8rd1rlz3pn1nn94051d8ab"; depends=[boot]; }; - OneArm2stage = derive2 { name="OneArm2stage"; version="1.1.4"; sha256="0c014kr46rzgcpjq3n2lr2i66gvkqd60m2l5hfc7i5956ia7fvxq"; depends=[flexsurv IPDfromKM survival]; }; + OneArm2stage = derive2 { name="OneArm2stage"; version="1.1.5"; sha256="14vrf3x625c0xad18pajbgb4d4l57f1gqhy4y2l3wg1m1i2kiyns"; depends=[flexsurv IPDfromKM survival]; }; OneArmTTE = derive2 { name="OneArmTTE"; version="1.0"; sha256="186386pjjvlfq38950n1sdx0wq31q8ggjlqlrn07v68bcqjl70y6"; depends=[dplyr survival tibble tidyr]; }; OneR = derive2 { name="OneR"; version="2.2"; sha256="1k7rzhcwq5b2yi4zfsc1r0yb6w65gxj9835d2a1dclallja3zav2"; depends=[]; }; OneSampleMR = derive2 { name="OneSampleMR"; version="0.1.2"; sha256="1g2ia06450xy6mbkn13r9wzap1jxz1iw36jiy3699zm9azndd002"; depends=[Formula gmm ivreg lmtest msm]; }; @@ -3337,10 +3351,9 @@ in with self; { PAFit = derive2 { name="PAFit"; version="1.2.5"; sha256="07n27g2yy2lskna7qa4j6am3prdcwfnx98ppvcarsxgzvywz0scv"; depends=[ggplot2 igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; }; PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; }; PALMO = derive2 { name="PALMO"; version="0.1.2"; sha256="0vh0i5qb26267w5dzply091dh4mcxyza7yyhh7sy2wmwb04834ak"; depends=[circlize ComplexHeatmap cowplot dplyr factoextra ggforce ggplot2 ggrepel knitr lme4 MAST pbapply pheatmap reshape2 Rtsne Seurat tidyverse]; }; - 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.9.5"; sha256="1jlfp0b2ipvkzk3715igfqhiha294bn99zi1dc5shr9c47rs44v3"; depends=[dplyr geosphere ggplot2 hoardr httr lubridate magrittr ncdf4 PamBinaries purrr RcppRoll rerddap RSQLite seewave stringr tuneR 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]; }; + PAMpal = derive2 { name="PAMpal"; version="0.17.0"; sha256="09rd9h67y27xwgwfxp6k8nvhi0ccsw6h2kx1m1dd90iicbb03yk2"; depends=[data_table dplyr gam ggplot2 knitr lubridate manipulate PamBinaries PAMmisc purrr reticulate rlang RSQLite seewave signal stringr tidyr tuneR xml2]; }; PAS = derive2 { name="PAS"; version="1.2.5"; sha256="175p3bnpnhknfsc29hri0l2ipz1x6qcxs2bq7awns8lccam466r2"; depends=[glmnet]; }; PASSED = derive2 { name="PASSED"; version="1.2-1"; sha256="1qzxc2xwqw1vc4ld8iask1aijmsl0jhw17rgph08hwl8cqmnm4nd"; depends=[betareg rootSolve]; }; PASWR = derive2 { name="PASWR"; version="1.3"; sha256="1p4896r4k6c0aaag4mwds2azp41amf726c4v62zca92cpsay4nml"; depends=[e1071 lattice MASS]; }; @@ -3356,12 +3369,12 @@ in with self; { PBNPA = derive2 { name="PBNPA"; version="0.0.3"; sha256="1wmgcmspilfv6pjy7696j2xmq8m41p27plnr1qr0fnzyz66pf37m"; depends=[metaRNASeq]; }; PBRF = derive2 { name="PBRF"; version="1.0.0"; sha256="1ibwywgbxnxcb3z2kl2bgh7fz512nhgy2zcdym67asp76c6rkqg6"; depends=[]; }; PBSadmb = derive2 { name="PBSadmb"; version="1.1.4"; sha256="11dxy6rdhwairymigwqxd51hxz82011sx0gzzphcs6i4gr0c54c3"; depends=[PBSmodelling]; }; - PBSddesolve = derive2 { name="PBSddesolve"; version="1.12.6"; sha256="0570q1h91695qw9gnkv3d2bip40pzaapy66042qac4yjsg7wca2z"; depends=[]; }; + PBSddesolve = derive2 { name="PBSddesolve"; version="1.13.1"; sha256="062biynya1nr75awri60ak60hs07h7cdnaibjn9943s7gzxgsgi4"; depends=[]; }; PBSmapping = derive2 { name="PBSmapping"; version="2.73.2"; sha256="0glkqcgykhcnh0si0j3f12kapb2w1fglgfll0jrnjikajwvj3fpm"; depends=[]; }; 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.2"; sha256="1dpilm3f6jylm2zggdpdz1gx0z6i56p8rxj744d9lqs1lp6nf37y"; depends=[]; }; + PCAmatchR = derive2 { name="PCAmatchR"; version="0.3.3"; sha256="0ycplivjiz2w3wiqnqga0ywwdbd9mxqzm92k3bjva8009jxxijax"; depends=[]; }; PCAmixdata = derive2 { name="PCAmixdata"; version="3.1"; sha256="0flrsnbchwk06dmkg3vqykp9n4pqs265szn1r10navp8ki3rrmvh"; depends=[]; }; PCDimension = derive2 { name="PCDimension"; version="1.1.13"; sha256="0mpf7m4daqaip18yfsyanrmbjq4ib9fw1b65ajdazicm400bw6gb"; depends=[changepoint ClassDiscovery cpm kernlab oompaBase]; }; PCFAM = derive2 { name="PCFAM"; version="1.0"; sha256="196jzv0f6j60zkyagm9n98339ipn8mrhmhl3q4g053z8f6mm9zmv"; depends=[]; }; @@ -3369,7 +3382,7 @@ in with self; { PCICt = derive2 { name="PCICt"; version="0.5-4.3"; sha256="1xihjyhp1mfbm07sy250ijrk4ljz80l5z5w6x2m1j0yss0r6mrqf"; depends=[]; }; PCL = derive2 { name="PCL"; version="1.0"; sha256="0sqlwg0aiw9f1z4x5nixv4x3rq5rnm5i1hijdqygnh9dvckfrgs0"; depends=[]; }; PCLassoReg = derive2 { name="PCLassoReg"; version="1.0.0"; sha256="1m79aiij4dglfz5qhm5h76hxpgszrpzfw37nvx2y6gcq6dya8krl"; depends=[grpreg survival]; }; - PCMBase = derive2 { name="PCMBase"; version="1.2.12"; sha256="0p18g660yax8mmnhq1pd4nax4saf8syqj7c1xpspjbfkr78kh15q"; depends=[ape data_table expm ggplot2 mvtnorm xtable]; }; + PCMBase = derive2 { name="PCMBase"; version="1.2.13"; sha256="152zs0v64rcw2mgqd2pxydxpdx5ygvl3hd3m9xjv70im6zw43myv"; depends=[ape data_table expm ggplot2 mvtnorm xtable]; }; PCMBaseCpp = derive2 { name="PCMBaseCpp"; version="0.1.9"; sha256="0k40mxs8w1vk7qwpkv8gnq6cq3kpj7wvf0i6f1qn1wmm2vvz1kfy"; depends=[abind data_table PCMBase Rcpp RcppArmadillo]; }; PCMRS = derive2 { name="PCMRS"; version="0.1-4"; sha256="0bf85zv3nl13gsdi96cd2qg7mfppsccs0ci7l204hws8nmbvri83"; depends=[cubature ltm mvtnorm Rcpp RcppArmadillo statmod]; }; PCPS = derive2 { name="PCPS"; version="1.0.7"; sha256="0gxymz0yws1q1bxkpxi0lmbv57xx62h3dl7z3i2cnbagswkax3zh"; depends=[ape nlme phylobase picante RcppArmadillo SYNCSA vegan]; }; @@ -3377,7 +3390,7 @@ in with self; { PCS = derive2 { name="PCS"; version="1.3"; sha256="0v9vczc9hml6mzxglh106a9f5gy3x5m471lkzaw3ps8z76sgrpyr"; depends=[multtest statmod]; }; PCSinR = derive2 { name="PCSinR"; version="0.1.0"; sha256="1z8yjryw3c43vc6fxcwiindmyq6r63pc1zr3aybwmys6mv697bb4"; depends=[]; }; PCovR = derive2 { name="PCovR"; version="2.7.1"; sha256="1lvj3kf4pnvbr7lk3kzvh72akga49zx25b3w7nq24925s129sqx1"; depends=[GPArotation MASS Matrix ThreeWay]; }; - PDE = derive2 { name="PDE"; version="1.4.0"; sha256="0qizclfaig2a6ybpa1qid2lhzasfb6i30vy6n4mv2765db7h5dkf"; depends=[tcltk2]; }; + PDE = derive2 { name="PDE"; version="1.4.2"; sha256="032r72dmxv8far305y9738grylp0g96p7jkmk0dg5cwm02570zy5"; depends=[tcltk2]; }; PDFEstimator = derive2 { name="PDFEstimator"; version="4.3"; sha256="1pnkds7m7g58ci4n35szdrpq3fpxkblvbyvyf9qwrm8casijfsqs"; depends=[MultiRNG plot3D]; }; PDM = derive2 { name="PDM"; version="0.1"; sha256="1pbdy13ji9c6krgh2r1qgrzmf4hdmrdzylsr71n3hh5jq4n9xg8x"; depends=[jpeg]; }; PDMIF = derive2 { name="PDMIF"; version="0.1.0"; sha256="0mlc31f4z0k5xk1fil0hx5dcbm7afia74kxb7xmnx4jcblidxnd2"; depends=[diagonals ncvreg quantreg]; }; @@ -3385,9 +3398,10 @@ in with self; { PDQutils = derive2 { name="PDQutils"; version="0.1.6"; sha256="0mmfi0ifwbkjm0274sddpwkj27cvdkwngnka8vdmfm4b2nn7vgsp"; depends=[moments orthopolynom]; }; PDSCE = derive2 { name="PDSCE"; version="1.2.1"; sha256="1amy4rnvlcfvpma8pqd6wli1j0pjjk49i1qywa43lzgdwgd5dl9v"; depends=[]; }; PDShiny = derive2 { name="PDShiny"; version="0.1.0"; sha256="0s09sywvy83dj06rkxzyi06wfymwnfpgf3lpgjbb8ps8q3byd4vs"; depends=[shiny]; }; - PDtoolkit = derive2 { name="PDtoolkit"; version="0.4.0"; sha256="02gw4l4wqz6hccb35ip4ynjqs6dhllkpvglmlzav9djvv3yj83fg"; depends=[dplyr monobin rpart]; }; + PDtoolkit = derive2 { name="PDtoolkit"; version="1.0.0"; sha256="170f5cwq3v8qhj39jms291khz72x9ajswx2sx9m6d2gpf89nwwh5"; depends=[dplyr monobin rpart]; }; PEACH = derive2 { name="PEACH"; version="0.1.1"; sha256="0ciq2cci35rv39pgpp7i30jxlmr85726kh07ww22ryq3bm04ylg8"; depends=[MASS metap mnormt]; }; PEGroupTesting = derive2 { name="PEGroupTesting"; version="1.0"; sha256="1z863ard0cc2g8ibxnmxhiqhvs53r6b8gpnavnfchm9432ifcbwi"; depends=[]; }; + PEIMAN2 = derive2 { name="PEIMAN2"; version="0.1.0"; sha256="01jsyp9yk576v3bc0a33y0f8w9v4b47g5hc0zahf3zl4bkp8i4wv"; depends=[dplyr forcats ggplot2 glue lifecycle magrittr purrr rlang stringr tidyverse]; }; PEIP = derive2 { name="PEIP"; version="2.2-3"; sha256="1ljalgffgrn9l3q914jjxrn1j740jqk4j8q1vzn3si4np9mz92vp"; depends=[bvls fields geigen Matrix pracma RSEIS]; }; PELVIS = derive2 { name="PELVIS"; version="2.0.3"; sha256="1sym6lbspzqcmg0k0r07kv65pswq39fxx5xdyiv6pm2r3v49p8jq"; depends=[DT htmlwidgets MASS shiny]; }; PERMANOVA = derive2 { name="PERMANOVA"; version="0.2.0"; sha256="1lmnp1g1i1kqa30cvakkl8g2m2h5jl73qx8dy37kv62mv0knlg5m"; depends=[deldir MASS Matrix scales xtable]; }; @@ -3398,7 +3412,7 @@ in with self; { PGRdup = derive2 { name="PGRdup"; version="0.2.3.7"; sha256="0zm0cm98nps2bfr66mb4j7a0v3s407zqrl2l2nvzg9yyqlaznzc3"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; }; PH1XBAR = derive2 { name="PH1XBAR"; version="0.10.1"; sha256="0b9g2mz0vcaqmbpm0cisr6c9l2bk5y3bn0s9096dl5fq9hyma7na"; depends=[forecast mvtnorm pracma]; }; PHENIX = derive2 { name="PHENIX"; version="1.3.1"; sha256="1gd9ycrwawi81al4f5v559km1112giwqnwvvk8ynj4kdb5bqpyq4"; depends=[ppcor SuppDists]; }; - PHEindicatormethods = derive2 { name="PHEindicatormethods"; version="1.4.1"; sha256="0w3qnlvh7mpzninmhfcifygh2mlwmr5hzfkfnigvsxr8jfnn2s25"; depends=[broom dplyr lifecycle purrr rlang tibble tidyr]; }; + PHEindicatormethods = derive2 { name="PHEindicatormethods"; version="1.4.2"; sha256="1qlb0qd4iljgjkpj0yj63p588k4qw8af8civ3hvf32iq8pmnfrkr"; depends=[broom dplyr lifecycle purrr rlang tibble tidyr tidyselect]; }; PHInfiniteEstimates = derive2 { name="PHInfiniteEstimates"; version="2.5"; sha256="0q7gxpfyigvzk7xdpy0bdvvmac7ww1m20il5qgb0bv91rninmr91"; depends=[coxphf lpSolve 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=[]; }; @@ -3409,7 +3423,7 @@ in with self; { PINSPlus = derive2 { name="PINSPlus"; version="2.0.6"; sha256="0mws1064kwfm3csdzpfn4g2pwjasdmx9nz5x28znxv8hwrlgm2zw"; depends=[cluster doParallel entropy FNN foreach impute irlba matrixStats mclust Rcpp RcppArmadillo RcppParallel]; }; PINstimation = derive2 { name="PINstimation"; version="0.1.1"; sha256="0n1jn33ckd00j6k4ij941gg8b7qq4vr7sk0zls0irxz6gbasz1zn"; depends=[coda dplyr furrr future knitr nloptr Rdpack rmarkdown skellam]; }; PK = derive2 { name="PK"; version="1.3-5"; sha256="1wzz2qv6h6nc2hcsg4098951i608xbbhc9f9ngamfigh5sbmzbh6"; depends=[]; }; - PKI = derive2 { name="PKI"; version="0.1-11"; sha256="17czxqilgbh2v1kgjvqcz8m1cbjv4iygi5vn27wh1pyaga6sv8z9"; depends=[base64enc]; }; + PKI = derive2 { name="PKI"; version="0.1-12"; sha256="0nidg6l9nrmpyimi502fydy22r247w9i4ngb2xdbxjvfhr17m0xd"; depends=[base64enc]; }; PKLMtest = derive2 { name="PKLMtest"; version="1.0.1"; sha256="0i1kxczlhn95jw1w7vw87svqhpq9j6xi4fhy974yjx9xhax171hq"; depends=[ranger]; }; PKNCA = derive2 { name="PKNCA"; version="0.10.0"; sha256="1vivg8mh5aizqnw6a47k9i0sv8s7sidfaap4n5nv078vncmh9l96"; depends=[checkmate digest dplyr nlme purrr rlang tibble tidyr]; }; PKPDsim = derive2 { name="PKPDsim"; version="1.1.1"; sha256="0h9rxwjh2cxn3mlpgwy86lrq6y820rhxjyxhjyi4l0k7j6cshlbd"; depends=[BH data_table jsonlite magrittr MASS randtoolbox Rcpp stringr]; }; @@ -3431,14 +3445,15 @@ in with self; { PMCMR = derive2 { name="PMCMR"; version="4.4"; sha256="05n13pp5yff6pzk4ry07crddfaj3jlglrd1vkcnacyd8jpaxkd77"; depends=[]; }; PMCMRplus = derive2 { name="PMCMRplus"; version="1.9.6"; sha256="1mvj3cwrdkl3frk7fvh6l7v7yya5p3xm4z0qhc4fvykxdmb92ivz"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; }; PMwR = derive2 { name="PMwR"; version="0.18-0"; sha256="1d3bd1k5jqfx0nfac97ghlch5br6d8xh31was4m6skvs1ikqq53h"; depends=[datetimeutils fastmatch NMOF orgutils textutils zoo]; }; - PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.7.0"; sha256="0bjqahrnsgc5i506jcjcin62lgn9zx2hrpflpnqzhshkhinnxnbz"; depends=[dplyr httr magrittr projmgr RCurl readr readxl survey tibble timeDate]; }; - PNAR = derive2 { name="PNAR"; version="1.2"; sha256="0m11c07c34cfmjdrb21xb5blbgrkyjgvnighh20jf1skxbl6i1wl"; depends=[doParallel foreach igraph nloptr Rfast Rfast2]; }; + PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.7.1"; sha256="0dxbx8585irfaaf1yll8jmfa719s07b6aflj8g39zw79lry5fl9d"; depends=[dplyr httr magrittr projmgr RCurl readr readxl survey tibble timeDate]; }; + PNAR = derive2 { name="PNAR"; version="1.3"; sha256="0flc02rmyw8q410xcyg2ad00ck7b8jyjqw7xym3yaxg6nfbq8w77"; depends=[doParallel foreach igraph nloptr Rfast Rfast2]; }; PNSIBGE = derive2 { name="PNSIBGE"; version="0.1.7"; sha256="0cs0bpb4fdkgznds579q7fblj0jay6wjyfhwpwc4y6z8ai1rhgja"; depends=[dplyr httr magrittr projmgr RCurl readr readxl survey tibble timeDate]; }; PNWColors = derive2 { name="PNWColors"; version="0.1.0"; sha256="1phplnclkficfv8s6wsyrckk4ixzbayiy5iix6dddg40485l9nyj"; depends=[]; }; POCRE = derive2 { name="POCRE"; version="0.6.0"; sha256="0kni15dr7qhldn68w51mzg6pyk95dx717qy0f9230hpbg97791hz"; depends=[EbayesThresh ggplot2 pracma]; }; POD = derive2 { name="POD"; version="1.2.0"; sha256="1xg2xzfmzg2qrwd02xy4fwsfmccigw6lm5266z6w1kxzb7p7bbw0"; depends=[]; }; POET = derive2 { name="POET"; version="2.0"; sha256="0w3jhj45sxisyrpcsazbrbcsz7rmraw71jjm0zixbcgc4klb98ar"; depends=[]; }; POINT = derive2 { name="POINT"; version="1.2"; sha256="0b97ish2xxvp7xy0qqbg68hy0nvdvhi8zpgd4wvczn5r8586qk6g"; depends=[CompQuadForm Matrix rARPACK]; }; + POMADE = derive2 { name="POMADE"; version="0.1.0"; sha256="1f9r7bmmc1lblvmb834ss38x2ki4c19mkx9h8i8ygkcdsb931xdv"; depends=[dplyr furrr future ggplot2 magrittr purrr stringr tibble tidyr]; }; POMaSPU = derive2 { name="POMaSPU"; version="1.0.0"; sha256="0jz3jgzdykv0xvfw3ix0hbs32as6dp7p5v8bj5nddknx10d0siya"; depends=[MASS matrixStats Rcpp RcppArmadillo]; }; POSSA = derive2 { name="POSSA"; version="0.6.1"; sha256="0w45rhj9qn8fwsy8s1xbpns6vzybcjgmcbwwhqdbyp76w6h3lbk3"; depends=[data_table]; }; POSTm = derive2 { name="POSTm"; version="1.2"; sha256="1fckd5c4hdviwy1b7cmwv8nqkaipfv838yjfsyacj8hxlzdlwlhj"; depends=[ape CompQuadForm]; }; @@ -3451,7 +3466,7 @@ in with self; { PPCI = derive2 { name="PPCI"; version="0.1.5"; sha256="141811iq0g2rq7lxpz9a44kyjfylj85yqgcjq7b23xfg2wbcp8dd"; depends=[rARPACK]; }; 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.7"; sha256="0259vg89v3k1h5mf896xf4dihyv1n535ypn1h0syk8sb7f4qr3q9"; depends=[Rcpp settings]; }; + PPRL = derive2 { name="PPRL"; version="0.3.8"; sha256="1m49n7kl9675hrlh6vqq69sp7bdiv4fwlncqpp58kz67jk1ypnf0"; depends=[Rcpp settings]; }; PPSFS = derive2 { name="PPSFS"; version="0.1.0"; sha256="180brwqcs2qjh01a1qwdy2a8g19scn4mxzc3s6pw8gyl2r3fzxi7"; depends=[brglm2 Rcpp RcppArmadillo]; }; PPTcirc = derive2 { name="PPTcirc"; version="0.2.3"; sha256="07py7zdl7nhc1a425mz7cmgl25k0k9fdid754pnkffn5n5xkbca1"; depends=[circular progress]; }; PPforest = derive2 { name="PPforest"; version="0.1.3"; sha256="1byn2l91nws91xgjjal610vv4yns12z861rq3iks4kv4giwgdfq1"; depends=[doParallel dplyr magrittr plyr Rcpp RcppArmadillo tibble tidyr]; }; @@ -3483,7 +3498,7 @@ in with self; { PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.1.2"; sha256="1gs2wdi5mcwvn8jqc7ximll05m824jib6hmxm8b850yy2cb3n1l4"; depends=[]; }; 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.5"; sha256="00zwbw9bn5bs181m831nb08wwrmp2jpmqmriy8j52njq289hnc32"; depends=[cluster data_table]; }; - PSGD = derive2 { name="PSGD"; version="1.0.1"; sha256="0yf1cmanm41i71c3fzkp1mmd2v9sn5yn3hadxrmvmrql1i9j2s4x"; depends=[Rcpp RcppArmadillo]; }; + PSGD = derive2 { name="PSGD"; version="1.0.2"; sha256="1dqm1pv6cqcf69bxywwg0q5n98g95b363gszi2k19bkwvh4a1jq9"; depends=[Rcpp RcppArmadillo]; }; PSLM2015 = derive2 { name="PSLM2015"; version="0.2.0"; sha256="1f8kzlqil2ac8a9fbj9fhdni2narh2yaaz044mlx7gsv2ns3ai19"; depends=[dplyr ggplot2 magrittr]; }; PSPManalysis = derive2 { name="PSPManalysis"; version="0.3.8"; sha256="0vccvhda86430w3gkjhg565i77dci1aa6pizs61w1xjc75rrbnan"; depends=[pkgbuild rstudioapi]; }; PSS_Health = derive2 { name="PSS.Health"; version="0.5.1"; sha256="0rdqkwry6zpf0nm3in8agb3kw1g705i3knydzs8bpsnhna4ap802"; depends=[dplyr DT easypower EnvStats epiR ggplot2 ICC_Sample_Size kappaSize longpower plotly powerMediation powerSurvEpi presize pROC pwr pwr2 shiny shinycssloaders shinyFeedback shinyhelper writexl]; }; @@ -3491,6 +3506,7 @@ in with self; { PSSMCOOL = derive2 { name="PSSMCOOL"; version="0.2.4"; sha256="0iyhs2sas08kjl6hd0y4n4rz4lvvvlrz3w3izl3may6mscykrciy"; depends=[dtt gtools infotheo phonTools]; }; PST = derive2 { name="PST"; version="0.94"; sha256="0f28zrnlficbi9iil6wbh51k9mghpkz63hw05lpmlpx1yl5nd0a6"; depends=[RColorBrewer TraMineR]; }; PSW = derive2 { name="PSW"; version="1.1-3"; sha256="0ahm7rp795d7j88n15b3q0gl573p3g0krc7jd1zv87g4bsdc9b5x"; depends=[gtools Hmisc]; }; + PScr = derive2 { name="PScr"; version="1.0"; sha256="0376dddwydgnwdpxdvv9cp8nk2j57dsqmfa94njxw9a19r7g3xw5"; depends=[gtools LambertW mstate nlme pracma survival VGAM]; }; PSweight = derive2 { name="PSweight"; version="1.1.8"; sha256="0vawkkgm72s17cjfww9175dyr100lxdv4gf35p2lz8wcnbsklnv5"; depends=[gbm ggplot2 lme4 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]; }; @@ -3533,15 +3549,15 @@ in with self; { PantaRhei = derive2 { name="PantaRhei"; version="0.1.2"; sha256="0lv04aa70yd5gr0zfh2gmah4d4h3kw0lym6284akcvll8mhdi8dd"; depends=[]; }; ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="1.2.6"; sha256="0g5i4908fl2j1a4jfsg1xs4q92mc29zp8dyf52a370ki2512w6h1"; depends=[crayon data_table dbscan DiceKriging foreach ggplot2 ggpubr lhs]; }; ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; }; - ParallelDSM = derive2 { name="ParallelDSM"; version="0.3.5"; sha256="02sixlx3lmr58hkcxlbmiw27pvz777ngkz3mfz4qaii8yhxsjvy9"; depends=[caret gstat pryr quantregForest randomForest raster rgdal snowfall sp stringr]; }; - ParallelLogger = derive2 { name="ParallelLogger"; version="3.0.1"; sha256="14kqqyfgj5mhm42fqpqw5r409qjnrk38nsls4svm4p7qvyvvhxm2"; depends=[jsonlite snow xml2]; }; + ParallelDSM = derive2 { name="ParallelDSM"; version="0.3.7"; sha256="10yqq7hki08qvymlw6f1w6rrg6381bzhyqa1v2ryxszx3prxxcps"; depends=[caret gstat pryr quantregForest randomForest raster rgdal snowfall sp stringr]; }; + ParallelLogger = derive2 { name="ParallelLogger"; version="3.1.0"; sha256="1cjm498831wzcdfbj6r75agbhw99mccrfvzjcvj7jzz0k82ha4b7"; depends=[jsonlite snow xml2]; }; ParallelPC = derive2 { name="ParallelPC"; version="1.2"; sha256="07y7xb16865khxkvwsk1yglzyy7ja4aj2wpkipaz48i77c3x8bi2"; depends=[]; }; ParamHelpers = derive2 { name="ParamHelpers"; version="1.14.1"; sha256="088sl3az4ysq8cyw82brdn9xm5yy7rqskxih462d1m5hi62gyl04"; depends=[backports BBmisc checkmate fastmatch]; }; Pareto = derive2 { name="Pareto"; version="2.4.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=[]; }; - 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]; }; + Patterns = derive2 { name="Patterns"; version="1.4"; sha256="12ci26i0ks23ff11g3pmsns5f3crnrac2hnlqc2pglhrv180m37r"; depends=[abind gplots igraph jetset lars lattice limma Mfuzz movMF nnls plotrix repmis SelectBoost tnet VGAM WGCNA]; }; PdPDB = derive2 { name="PdPDB"; version="2.0.1"; sha256="05aqg0rqrnlmvjxa32ms1vywgwhw5zlfkyf2ij0fn06rp8l2z3lv"; depends=[dendextend plyr tseries]; }; Peacock_test = derive2 { name="Peacock.test"; version="1.0"; sha256="0ypvwywipyh8lm8xkazsfjgjpvvyi2g8kid63qff11372p33m6xs"; depends=[]; }; PeakError = derive2 { name="PeakError"; version="2021.7.1"; sha256="0rsh81p0w11zp8rgxx9cm8537gxhf9hx6xizpbflfx60xhr96is5"; depends=[]; }; @@ -3557,7 +3573,6 @@ in with self; { PepSAVIms = derive2 { name="PepSAVIms"; version="0.9.1"; sha256="0m4jrq6wcjy0k80gvrnm9f7kvi1ifx9182xfq0psyaxpj0ggvzij"; depends=[elasticnet]; }; Peptides = derive2 { name="Peptides"; version="2.4.4"; sha256="1yppbcsa0rb74mmspb6f6c9slcjy5x6c484dk9gy48sg33chp1zw"; depends=[Rcpp]; }; PerFit = derive2 { name="PerFit"; version="1.4.6"; sha256="13917nvxii8pg69h1wcpmlv45sdrdldd3zxdrypr4mn456ff74k4"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; }; - PerMallows = derive2 { name="PerMallows"; version="1.13"; sha256="0ny2vc8f0npixaw1kp2d93xr4g46nsg8jjwvi6afv9xjvaz0i6wy"; depends=[Rcpp]; }; Perc = derive2 { name="Perc"; version="0.1.6"; sha256="1nwbj56m7pxrg8dyv36501b0lvpq8gbhcr07vs4nps8n3rqwwg81"; depends=[]; }; PerfMeas = derive2 { name="PerfMeas"; version="1.2.5"; sha256="13yjk0kwpbsqwl056hzf0zj2br1mk4faqcn1whdfxmq348c14hjb"; depends=[graph limma RBGL]; }; PerformanceAnalytics = derive2 { name="PerformanceAnalytics"; version="2.0.4"; sha256="0ci26hsj4wnw9g0mh4vrn0cg986cpcpx169rvw6v6rbnjxq718bq"; depends=[quadprog xts zoo]; }; @@ -3573,6 +3588,7 @@ in with self; { PhageCocktail = derive2 { name="PhageCocktail"; version="1.0.3"; sha256="0lr1gnwpaqrf8ny5ssx2cjv8hi6q2ilmr7qif3jl9agh4w0nkp89"; depends=[bipartite factoextra readxl RJSONIO smerc stringr]; }; 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]; }; + PhaseType = derive2 { name="PhaseType"; version="0.2.0"; sha256="0vcmvixb2flrn7qz3568whg5njkxny4hxlmf3ybyi9shfb7jss0a"; depends=[coda ggplot2 reshape]; }; PhaseTypeR = derive2 { name="PhaseTypeR"; version="1.0.4"; sha256="063hl41jnzya189g8pm0kjvh7w4h31hfb4zhvrnh6nk4kr5xa70m"; depends=[expm igraph]; }; PheCAP = derive2 { name="PheCAP"; version="1.2.1"; sha256="00dfy0iby21kqfxz2npz4dn1klxcdlll8xrk2hsmc56fjfidbdhz"; depends=[glmnet RMySQL]; }; PheNorm = derive2 { name="PheNorm"; version="0.1.0"; sha256="10223yfaajzq1ip5qj3kk6iyjzrbb619jkrsxawb0dpkrj56d8v7"; depends=[]; }; @@ -3632,7 +3648,6 @@ in with self; { PooledMeanGroup = derive2 { name="PooledMeanGroup"; version="1.0"; sha256="0i9s7qskjnji3mf6clsi69rnni57v8cysgr9gh3hvxjzlf1sq8y7"; depends=[]; }; PopED = derive2 { name="PopED"; version="0.6.0"; sha256="0s8lr17s6w8isjig4z8jzgpnpsb1kg98d32y7kslbwzl08cbnza0"; depends=[boot codetools dplyr ggplot2 gtools magrittr MASS mvtnorm purrr stringr tibble]; }; PopGenReport = derive2 { name="PopGenReport"; version="3.0.7"; sha256="0drf3yaxrcypl3b6qdl4kkn8zw31hrnkp49lxpisfjsaybj5lk40"; depends=[ade4 adegenet calibrate dismo gap gdistance genetics GGally ggplot2 knitr lattice mmod pegas plyr R_utils raster reshape rgdal RgoogleMaps sp vegan xtable]; }; - 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]; }; PopulationGrowthR = derive2 { name="PopulationGrowthR"; version="0.1.1"; sha256="0cq7vnmslb4y9d9a4jk7z5xajw4vr2q1qqhkak9m9gidyr4dp5zl"; depends=[dplyr]; }; PortRisk = derive2 { name="PortRisk"; version="1.1.0"; sha256="05yxqcv0cijy3s9zx68f9xy59jv55kmj3v0pz5pgl17j23kb9rlc"; depends=[copula MASS MCMCpack tseries zoo]; }; @@ -3694,7 +3709,7 @@ in with self; { Przewodnik = derive2 { name="Przewodnik"; version="0.16.12"; sha256="1aq80aqflfm1ypqa51h10mc3g0qdr651j6g1b7008k7h0ryq42gv"; depends=[PBImisc PogromcyDanych]; }; Pstat = derive2 { name="Pstat"; version="1.2"; sha256="17bqkaf9590jhiaamaafmvkqmy2aqkcfqhk8m4w35g58j48yk4yx"; depends=[]; }; PsyControl = derive2 { name="PsyControl"; version="1.0.0.0"; sha256="1c5ml6s3c8kzf7p0mig84bmq40b0491ah713bm6jpy2s3nwnmafs"; depends=[irtoys ltm]; }; - PsychWordVec = derive2 { name="PsychWordVec"; version="0.1.0"; sha256="1b8s1w391f81adw4im1w5nw3g495iq9d2fmg4535zmh5kyqpkhpa"; depends=[bruceR data_table dplyr fastTextR ggplot2 ggrepel rgl rsparse Rtsne stringr text2vec vroom word2vec]; }; + PsychWordVec = derive2 { name="PsychWordVec"; version="0.2.0"; sha256="0afl7n8zzkylm51nm5hhjrahk8h96jvxz6hysyc2bmhpkrh9bp94"; depends=[bruceR cli corrplot data_table dplyr fastTextR ggplot2 ggrepel psych purrr reticulate rgl rsparse Rtsne stringr text text2vec vroom word2vec]; }; PtProcess = derive2 { name="PtProcess"; version="3.3-16"; sha256="1d5i847jy9i1llbfsdkqcjmiids3kjxnqscinrwqyv7mwb9ijk2z"; depends=[]; }; PubMedMining = derive2 { name="PubMedMining"; version="1.0.0"; sha256="03lhml5jk69racmhlh6xa8j2rv8xb87vg6hr1caiqpd4kqg16n1q"; depends=[easyPubMed stringr]; }; PubMedWordcloud = derive2 { name="PubMedWordcloud"; version="0.3.6"; sha256="1wfp1fpr4an7psrwidx38brvhvghmvfsgjy4gdx81p1bdsdn2kw2"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; }; @@ -3728,11 +3743,10 @@ in with self; { 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=[]; }; QR = derive2 { name="QR"; version="0.1.3"; sha256="1xar0mj8s2nb8sks8dzf4wn1axc4rhmhx1qsjn2blsi4i8gfncka"; depends=[tinytest]; }; QRAGadget = derive2 { name="QRAGadget"; version="0.1.0"; sha256="0vmhbpfbbpbcs6s9zjam893yl54spbx4x4698c504g96hcc19kkp"; depends=[htmlwidgets leaflet magrittr miniUI raster scales shiny sp]; }; - QRISK3 = derive2 { name="QRISK3"; version="0.3.0"; sha256="0aqqncmlhb5iks8081y34ydlls3g31j994fqqzsbsc3ckcks87qj"; depends=[]; }; + QRISK3 = derive2 { name="QRISK3"; version="0.4.0"; sha256="1cya1va5msjrlfn49npvfqiyq9sm4kfxsaszxqwkxvxk8aw9ns1i"; depends=[]; }; QRIpkg = derive2 { name="QRIpkg"; version="0.2.2"; sha256="0xqc72p3jm61kifha77c8sfk7b1p7cfdskzkm29w4j06009qd8a8"; depends=[ggplot2 quantreg]; }; QRM = derive2 { name="QRM"; version="0.4-31"; sha256="15dyk3zfy92vj4xny04dh5mqcyb8qh61566m313qs17mxwibvn2a"; depends=[gsl Matrix mgcv mvtnorm numDeriv Rcpp timeDate timeSeries]; }; QRank = derive2 { name="QRank"; version="1.0"; sha256="1f924r5bf5vjfl12hk1n5m3f94g30f6vmvzq2bn8295dflyndck0"; depends=[quantreg]; }; @@ -3741,7 +3755,7 @@ in with self; { 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.3"; sha256="1f0mb2v785qmjk7w6bmc0028q9rfm45i1abmpcbwq4qj1lb4s8zc"; depends=[mvtnorm]; }; - QTLRel = derive2 { name="QTLRel"; version="1.11"; sha256="1ylqzccjrysg7mhyphgzfbbdm7ylpvzjq02lirng1kbm1b8dxiyy"; depends=[gdata lattice]; }; + QTLRel = derive2 { name="QTLRel"; version="1.12"; sha256="1cc89z8yzvxcyx85q0bdn8c4y73db7i81pzqjhw8yssmkhxjwgww"; depends=[gdata lattice]; }; QTOCen = derive2 { name="QTOCen"; version="0.1.1"; sha256="0wlbxk1rd56k02jf3pfzbx6xx5mmf6sb7gvds0067cvb7m42ghcr"; depends=[MatrixModels quantreg Rdpack rgenoud survival]; }; QUALYPSO = derive2 { name="QUALYPSO"; version="2.0"; sha256="1g87763x5dzjlbq15wrpv46pgv5ds8gf9c4pqjj3l43827wzqxpb"; depends=[doParallel expm foreach MASS Rfast]; }; QWDAP = derive2 { name="QWDAP"; version="1.1.17"; sha256="1yq2xm5a1im8g65j89d6xqfbknlrpfh9lpm1ggmn5fw8wq4519ni"; depends=[CORElearn pls Rcpp RcppEigen]; }; @@ -3775,7 +3789,7 @@ in with self; { R_oo = derive2 { name="R.oo"; version="1.25.0"; sha256="1vxy8yw4yblb3vgl64yh0b6zf1d51rnc2c23kmyyw629fxhr1cdq"; depends=[R_methodsS3]; }; R_rsp = derive2 { name="R.rsp"; version="0.45.0"; sha256="192x8cvna1j0sx37xh3ha8bjjyx39pn5wnxzn5gs3z5j93a4d055"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; }; R_temis = derive2 { name="R.temis"; version="0.1.3"; sha256="1qa381fv1hxd1fv9d22772aibiia6m2ycm69znjy3ah2w986hjfh"; depends=[crayon explor FactoMineR igraph NLP slam SnowballC stringi testthat tm tm_plugin_alceste tm_plugin_europresse tm_plugin_factiva tm_plugin_lexisnexis wordcloud]; }; - R_utils = derive2 { name="R.utils"; version="2.12.0"; sha256="00v5hpdid6h1yiwpf631xf1dk1z6dcx7dx83qn56a7pa4194bpkl"; depends=[R_methodsS3 R_oo]; }; + R_utils = derive2 { name="R.utils"; version="2.12.2"; sha256="0dl8rc7s7vg4g2pkmrwwqx7dkm02096jk439x4s0cm21hsmg2g7y"; depends=[R_methodsS3 R_oo]; }; R0 = derive2 { name="R0"; version="1.2-10"; sha256="10ynx3qrw2nr5zd5zws9sbr5qabx6f9i7y7isi915hrqpfddf1pb"; depends=[MASS]; }; R1magic = derive2 { name="R1magic"; version="0.3.3"; sha256="0klfaab1abfq662p5c93h6y222nqphhq6m65hdjms04gl44bk3ww"; depends=[]; }; R2Addhaz = derive2 { name="R2Addhaz"; version="0.1.0"; sha256="1xaqbzq2chsgkg1gc163fq8qcgzq9wwn2bm4mwvc31ay0gg4f3xi"; depends=[ahaz caTools pracma Rdpack survival zoo]; }; @@ -3785,9 +3799,9 @@ in with self; { R2HTML = derive2 { name="R2HTML"; version="2.3.3"; sha256="12qg9rp1j26h2f48dfg5k9jds26ycacv3f3ymk686ks43hd1hzja"; 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-7"; sha256="1pr3klgb731zwhwkz2c0wj2mvhy5qixzg1x451ik683ycni81qlw"; depends=[sysfonts]; }; + R2SWF = derive2 { name="R2SWF"; version="0.9-8"; sha256="1nlb2fshc5g53yqbq92z899mv9rknwah0p0s2l5r0rzp3v2np5yd"; 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]; }; + R2admb = derive2 { name="R2admb"; version="0.7.16.3"; sha256="1sv20hkgz3vvqkwzj7i2xn7sb8skzhdl7jnrk85m6zza65917f32"; depends=[coda lattice]; }; R2jags = derive2 { name="R2jags"; version="0.7-1"; sha256="0si2f0lmnpjcsmy54k51kwj1fkx24dshiidv46h8j2xjq1hp429v"; depends=[abind coda R2WinBUGS rjags]; }; R2sample = derive2 { name="R2sample"; version="1.0.0"; sha256="1gvx4npmqnfpl11wvhslm0icwj0alg9bzwvv00acawcv04jv10yz"; depends=[ggplot2 microbenchmark Rcpp shiny]; }; R2ucare = derive2 { name="R2ucare"; version="1.0.2"; sha256="0940c9zw3fifs7m4hrx9aqv4d56q3263bl12lzk2mx2sfjp9rzlw"; depends=[RMark stringr]; }; @@ -3797,7 +3811,7 @@ in with self; { R62S3 = derive2 { name="R62S3"; version="1.4.1"; sha256="0g01izg77spn79xqwva2gzrvk66i20xlb789wl5rgcz7pz7gpjd2"; depends=[data_table]; }; R6DS = derive2 { name="R6DS"; version="1.2.0"; sha256="0ai1yqfhn634vm88waxdb6j24vwcna29gdqzdrwm0nxwf7l6g0m3"; depends=[R6]; }; R6P = derive2 { name="R6P"; version="0.3.0"; sha256="18qy69zwyzp27fiqlplcjh0034d2pn9dhnfkraarh4jxnbi7masm"; depends=[collections dplyr purrr R6 stringr tibble tidyr]; }; - R6causal = derive2 { name="R6causal"; version="0.6.1"; sha256="0ykwcymqzjcvin6agy5yyzjw484rz4zmhajq0w3dpd8hgy8vyclg"; depends=[causaleffect data_table dosearch igraph R6]; }; + R6causal = derive2 { name="R6causal"; version="0.7.0"; sha256="17dfr8gl83qsarj538zd4010mhp5lzgd9awasq1x4yb4973q3sv1"; depends=[causaleffect data_table dosearch igraph R6]; }; RABR = derive2 { name="RABR"; version="0.1.1"; sha256="1ckh0cw5xaqbzx8f7i6lsbspblfm0mmmadaifmln2rz3vr0hf1f4"; depends=[asd cubature data_table doParallel foreach ggplot2 multcomp multxpert survival]; }; RAC = derive2 { name="RAC"; version="1.5"; sha256="0q0kk9j3blrnhv0rfmryc35lli5j4kds2vmjdpg77znagb45609k"; depends=[maps maptools matrixStats ncdf4 plotrix raster rgdal rgeos rstudioapi sp]; }; RADanalysis = derive2 { name="RADanalysis"; version="0.5.5"; sha256="1py07p24i1pky8wwyy8ajmkg6h2n7nbpxp1w6lrkiyl0p2kgjm20"; depends=[scales sfsmisc]; }; @@ -3815,7 +3829,7 @@ in with self; { RAT = derive2 { name="RAT"; version="0.3.1"; sha256="0234z9a1aqhdfwm6k3g8vw88dwx9n1d1mnnxl1y5qslv429kf23v"; depends=[ggplot2 mapproj stringr]; }; RATest = derive2 { name="RATest"; version="0.1.10"; sha256="019jcwb62w7da2hfys7xhfdxcywj6qn9pd2x6l61704n7bjj0s20"; 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=[]; }; + RApiDatetime = derive2 { name="RApiDatetime"; version="0.0.7"; sha256="0a6wnx87cizs3cfx94mczf8cm7hwkn9rfckmk738cajgs4ahnwwr"; depends=[]; }; RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.2"; sha256="02k0l8bi849b2102ysb102xky4p84i9v2r4w6fab7bgf32wvph4w"; depends=[]; }; RAppArmor = derive2 { name="RAppArmor"; version="3.2.3"; sha256="04hxqwi75npayd3ghghswxc51k2xb525drixxk1fvp6hrhdkap5h"; depends=[unix]; }; RAthena = derive2 { name="RAthena"; version="2.6.0"; sha256="1i4jp10qlnpg9acq6jh6ypd8n4kix05czazm7qwdpppvmv1s6vj0"; depends=[data_table DBI reticulate uuid]; }; @@ -3823,7 +3837,7 @@ in with self; { 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.1.1"; sha256="03p0c89pcx3inxa4qlyhvf3hm48rfp5j46b0qkszm96yf3g2b01m"; depends=[data_table dplyr httr magrittr openssl pingr R6 RCurl rex stringr tibble]; }; + RBaseX = derive2 { name="RBaseX"; version="1.1.2"; sha256="1f7lgfsxwqjplv8kk81sw3zmwqi9kxc8g328ylb2c2hiyq4fg49k"; depends=[data_table dplyr httr magrittr openssl pingr R6 RCurl rex stringr tibble]; }; RBesT = derive2 { name="RBesT"; version="1.6-4"; sha256="0i9i1hifr7ljccmr3rd1rxfngimwdr88njr7lqba179g87jg1l42"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 matrixStats mvtnorm Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; RBtest = derive2 { name="RBtest"; version="1.1"; sha256="09da721zfj6cw4i9gifn5f0sv3nj0qfjb96c5w9g9gzx55ihssnk"; depends=[mice nnet psych]; }; RCA = derive2 { name="RCA"; version="2.0"; sha256="0pidb5czrf0dc3ywy6cwm5akgsc62pvf94kfyxibzmd1favykx1h"; depends=[gplots igraph]; }; @@ -3856,7 +3870,7 @@ in with self; { RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; }; RCurl = derive2 { name="RCurl"; version="1.98-1.9"; sha256="1iff8cbfrz94mp1m82ai448zhipm8xv6zlxmbysd5hsycxqli3gj"; depends=[bitops]; }; RCytoGPS = derive2 { name="RCytoGPS"; version="1.2.1"; sha256="1ppxyrm9h09kk6lnr6yg3n3xl08l9zp4rqliz92k5h42hmgj6f02"; depends=[rjson]; }; - RCzechia = derive2 { name="RCzechia"; version="1.9.4"; sha256="048421nv41zny9mk9l1v59hn3nlci5rcvq3yq2277jj2phsh09kp"; depends=[curl httr jsonlite magrittr sf]; }; + RCzechia = derive2 { name="RCzechia"; version="1.10.0"; sha256="1pda05ykbqa2nskgvlq3mn2m8ag1daq7c002adlrnvs21db7q6rz"; depends=[curl httr jsonlite magrittr sf]; }; RDML = derive2 { name="RDML"; version="1.0"; sha256="13ly1p42njbcygwvkyii8sjqbsywjy5w5g1kd7m8kswi5dsk3qqv"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; }; RDP = derive2 { name="RDP"; version="0.2.3"; sha256="0fmssv33lxfxk61609dd7865n9w7i6wlap9g5aaa2b0319sbclpd"; depends=[Rcpp]; }; RDS = derive2 { name="RDS"; version="0.9-3"; sha256="0kcq5ym6l80shzxf9zv2rwb84r0q9qr2cwimcg76r97sfx7c2kp2"; depends=[anytime ergm ggplot2 gridExtra Hmisc igraph isotone network reshape2 scales statnet_common]; }; @@ -3872,7 +3886,7 @@ in with self; { RECA = derive2 { name="RECA"; version="1.7"; sha256="1xikj20flqajpkw4wyynmqd1pafbylzwfrmc8bz9pqgggjjhrqql"; depends=[]; }; REDCapExporter = derive2 { name="REDCapExporter"; version="0.2.2"; sha256="0w7c1y58vnkbd11ndkcn5s5c54pmvyqhflwgg2q6dc3n671yp9wx"; depends=[curl data_table keyring lubridate]; }; REDCapR = derive2 { name="REDCapR"; version="1.1.0"; sha256="02d41mbplc7fb0yf6sf62fzfzai95vjqxhz2hkz7135w17s31j8r"; depends=[checkmate dplyr httr jsonlite magrittr readr rlang tibble tidyr]; }; - REDCapTidieR = derive2 { name="REDCapTidieR"; version="0.1.3"; sha256="1s479fcxgm5wmk2jf8psi921q8vzhv3zjqs5lsakjjfahj7md4gh"; depends=[checkmate dplyr purrr REDCapR rlang stringi stringr tibble tidyr tidyselect]; }; + REDCapTidieR = derive2 { name="REDCapTidieR"; version="0.2.0"; sha256="1hgxj0vp5k9hc1fids2379qkja0s3jankiqvi9pm7h4gvk33p7fx"; depends=[checkmate cli dplyr formattable lifecycle lobstr purrr REDCapR rlang stringi stringr tibble tidyr tidyselect]; }; REEMtree = derive2 { name="REEMtree"; version="0.90.4"; sha256="11m9k6xli3gqw2f9vwa9abpwsnxawi675zmi916yq2shws49m8xn"; depends=[nlme rpart]; }; REGENT = derive2 { name="REGENT"; version="1.0.6"; sha256="1f2sjqkhw3rbmwbcmx7l7imj696kblisi8y3fz77xygbcbxa6rmq"; depends=[]; }; REPLesentR = derive2 { name="REPLesentR"; version="0.4.1"; sha256="0rwd7hxk12f4f1kpj6sl424yhbxi3h9dz6km5awijazmgv95carz"; depends=[dat knitr modules]; }; @@ -3880,7 +3894,6 @@ in with self; { REPPlabShiny = derive2 { name="REPPlabShiny"; version="0.4.1"; sha256="0wim27jm01xbi316jfz5j30sid7z1wsznhrpmxrbd97d4312449w"; depends=[DT REPPlab shiny]; }; REPTILE = derive2 { name="REPTILE"; version="1.0"; sha256="11swy4jrmmb0xjjxm1wyxd628fxxcqnialvijdrjwjpdbvraz4gq"; depends=[doParallel flux foreach optparse randomForest]; }; REQS = derive2 { name="REQS"; version="0.8-13"; sha256="1yzd37kqkg477p501l6s8iah9pkjsnsbxmk32w0rji7jpj7r2rs5"; depends=[gtools]; }; - REREFACT = derive2 { name="REREFACT"; version="1.0"; sha256="0nggva4qfqlcs58df3sgiigw0z75l5kg8c1yh0k5qsvjnhiq19vn"; depends=[combinat gdata Matrix psych]; }; RESI = derive2 { name="RESI"; version="1.0.5"; sha256="1synv78b06v552glpj15jc5cfa5i5i8bcn1hqyvsv4d5d94qj4i3"; depends=[aod car clubSandwich lmtest nlme regtools sandwich]; }; RESS = derive2 { name="RESS"; version="1.3"; sha256="1vddmifp47ia0sk35rnjpvw6gr9ygygafqczq268h17i1qs6ar22"; depends=[]; }; REdaS = derive2 { name="REdaS"; version="0.9.4"; sha256="1bi04zaqg4plp1byspn97lrlny47l521y1jhiixy093g6p6lqj11"; depends=[]; }; @@ -3890,6 +3903,7 @@ in with self; { RFCCA = derive2 { name="RFCCA"; version="1.0.9"; sha256="15zabdqkgji58yxh3nndaj8ipap8av353d0cvx54y2gx7cxlmdf3"; depends=[CCA PMA]; }; RFLPtools = derive2 { name="RFLPtools"; version="2.0"; sha256="07hw0hyyxqy31qakkb410gb3i0g5jvpmigv5cqhxqss2cwzpch0d"; depends=[RColorBrewer]; }; RFOC = derive2 { name="RFOC"; version="3.4-6"; sha256="0cs5wmpvrlag9aisbfiwkvwcb3skv5z4sawl30krmsq49mzj7yhd"; depends=[GEOmap MASS RPMG RSEIS splancs]; }; + RFPM = derive2 { name="RFPM"; version="1.0"; sha256="1rhi1nn1xxc5qvxk2vwd96325pqwz45b2bvaq994glvlxniki3c1"; depends=[dplyr lawstat reshape2]; }; RFclust = derive2 { name="RFclust"; version="0.1.2"; sha256="04cynwsfs07j6kbpnpk4kx7p2a33y5qylpvydv29975z7p871vsm"; depends=[ConsensusClusterPlus randomForest]; }; RFishBC = derive2 { name="RFishBC"; version="0.2.4"; sha256="1wh1j5lciff1vgjwrmc2hhr0yfq289l6k917pzhpl5bk6r4ml0fs"; depends=[cli clisymbols crayon readbitmap rlang settings stringr tidyr withr]; }; RFmerge = derive2 { name="RFmerge"; version="0.1-10"; sha256="1gcdd0a0czimzmzq2izskdaj26cc7qchrwlhssvnh5k59yx54r4l"; depends=[pbapply randomForest raster sf sp zoo]; }; @@ -3918,7 +3932,7 @@ in with self; { RHMS = derive2 { name="RHMS"; version="1.7"; sha256="1fld5y39a4xq40wh23944ngcrkqk2pw8w9raxir9wn2z2nysr7zg"; depends=[GGally ggplot2 Hmisc network pso]; }; RHPCBenchmark = derive2 { name="RHPCBenchmark"; version="0.1.0"; sha256="1f94d8z15ybqgc2pccsi1m6563xf26ygri6f4pwxkqjmxkxnk34y"; depends=[cluster Matrix mvtnorm]; }; RHRT = derive2 { name="RHRT"; version="1.0.1"; sha256="0km93m1bgh64r174bm5pj2hhsa39kghjrzjlmpdrxr9wa1z8wdni"; depends=[]; }; - RHRV = derive2 { name="RHRV"; version="4.2.6"; sha256="1rdfq1xnimli709waypwhw1v277hxhmiy7ziizgqi4522nip4h49"; depends=[lomb nonlinearTseries waveslim]; }; + RHRV = derive2 { name="RHRV"; version="4.2.7"; sha256="0w4r2sk1h9wxmhs5l2dk9gzr85wrss3m4qi67mj37cjd4qmmn1wi"; depends=[lomb nonlinearTseries waveslim]; }; RHSDB = derive2 { name="RHSDB"; version="0.2.0"; sha256="0k23vdb9p2c2hnac8rk2dnls47fw5qc66ifhx47q8myi1479vvll"; depends=[]; }; RHawkes = derive2 { name="RHawkes"; version="1.0"; sha256="1ishfdbyk9g6lh5q6apbaw7vh9cfwyykag27imrfpx3c40sbwmd4"; depends=[IHSEP]; }; RHclust = derive2 { name="RHclust"; version="1.1.0"; sha256="1i28bxkgdxlc216vsgambzc027wjnw0iaibry6m1vz9as2yy1fry"; depends=[Runuran]; }; @@ -3926,9 +3940,9 @@ in with self; { RI2by2 = derive2 { name="RI2by2"; version="1.3"; sha256="0smc0fb9anq5ih9zx2slfbqyx02njm0hc7g22gpfggskmxf2l509"; depends=[gtools Rcpp]; }; RIA = derive2 { name="RIA"; version="1.6.0"; sha256="0vj92plwmklb0i9h6zr18dnfwi3p7wkajjjxg0vfvm4pps9pkfwp"; depends=[nat oro_dicom oro_nifti reticulate]; }; RIFS = derive2 { name="RIFS"; version="0.1.6"; sha256="0cbz2vg8adqjkbn9r8cikqxlzhk01ba3nlnh8rqbwdcpiz90l1ip"; depends=[]; }; - RISCA = derive2 { name="RISCA"; version="1.0.1"; sha256="1r58s8ss64l7pckc5k2sqdsnp4kq2aagclbj5dxw6662y159m84d"; depends=[caret cubature date doParallel dplyr dvmisc flexsurv foreach glmnet glmnetUtils hdnom kernlab MASS mosaic mosaicCalc mvtnorm nlme nnet prodlim randomForestSRC relsurv reticulate rpart statmod SuperLearner survival survivalmodels timeROC zoo]; }; + RISCA = derive2 { name="RISCA"; version="1.0.3"; sha256="0r4wcyfa4nx9473hacm4dpz374zbp23idgbyanl6wcaw4mx085v0"; depends=[caret cubature date doParallel dplyr flexsurv foreach glmnet glmnetUtils hdnom kernlab MASS mosaic mosaicCalc mvtnorm nlme nnet prodlim randomForestSRC relsurv reticulate rpart statmod SuperLearner survival survivalmodels timeROC zoo]; }; RISmed = derive2 { name="RISmed"; version="2.3.0"; sha256="0vpi88gzi9r85v6nhjz9jbw671zkrmyazwna2z881346wfyr3l8b"; depends=[httr xml2]; }; - RIbench = derive2 { name="RIbench"; version="1.0.1"; sha256="0l42yf2gzsi1c46gijc7581bdc856345ylsw10acmzhhhlj16sw1"; depends=[data_table digest optparse RColorBrewer]; }; + RIbench = derive2 { name="RIbench"; version="1.0.2"; sha256="0dfxwcm3q8bgwprv0vn440w3186g04a4rm4i33pnpvg2c0qph0sp"; depends=[data_table digest optparse RColorBrewer]; }; RIdeogram = derive2 { name="RIdeogram"; version="0.2.2"; sha256="0wvzlnisnxwzdzfh8ph4yspr8abi5qk6p4z2qa14ykzn8yry61ni"; depends=[ggplot2 grImport2 rsvg scales tidyr]; }; RImageJROI = derive2 { name="RImageJROI"; version="0.1.2"; sha256="1rsc8iv80zyjzpj80yyyhndxvskdbldsfc2gskrr1r8yh5gmhn23"; depends=[spatstat spatstat_geom]; }; RImagePalette = derive2 { name="RImagePalette"; version="0.1.1"; sha256="054w8xzsn330qg7piq6ajhji9na2swkkdis2567cy3q099npfl5v"; depends=[ggplot2]; }; @@ -3937,11 +3951,11 @@ in with self; { RInside = derive2 { name="RInside"; version="0.2.17"; sha256="0j23h8qxqn95d0hqx9wcb52hc8w9qacjnk96lxlsdjrlxr28rqhb"; depends=[Rcpp]; }; RItools = derive2 { name="RItools"; version="0.3-1"; sha256="07i08cjscdylxbxl53qvr38pagssiqx3zcd0gyj28w0n6k3rq10x"; depends=[abind dplyr ggplot2 SparseM survival svd tibble tidyr xtable]; }; RJDBC = derive2 { name="RJDBC"; version="0.2-10"; sha256="06b2gw76jwmm3lw3knmn6slc6824d4gzry94n96d97ii4fm4gwrp"; depends=[DBI rJava]; }; - RJDemetra = derive2 { name="RJDemetra"; version="0.2.0"; sha256="1l97zicd0n3kvyjcrfq09wc8wawnfrs59n5nrx6s2dzh3cvyxvxr"; depends=[rJava]; }; + RJDemetra = derive2 { name="RJDemetra"; version="0.2.1"; sha256="1g54kzfb97zba5898bz90cba5nyjkhd00hw3azsaic6xa7dwz5gr"; depends=[rJava]; }; RJSDMX = derive2 { name="RJSDMX"; version="2.3-3.1"; sha256="1sp20dcg6d0yrmllqsh486v8frgi9bssd8zibc9165y5v8yjg9y6"; 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.1.1"; sha256="1rv1daz1d5iak5s71ldvdqwcrxzgfzd2cl27hgd9y2spwfk81fns"; depends=[bbmle binom dplyr ggplot2 mvtnorm numDeriv openxlsx Rcpp readxl stringr]; }; + RJafroc = derive2 { name="RJafroc"; version="2.1.2"; sha256="1immjb2313ss7pc61m3y59h6m3i0257lhvrkkvhrprl9jsyanfca"; depends=[bbmle binom dplyr ggplot2 mvtnorm numDeriv openxlsx Rcpp readxl stringr]; }; 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]; }; @@ -3973,6 +3987,7 @@ in with self; { RMOPI = derive2 { name="RMOPI"; version="1.1"; sha256="0jjli73b1xinrkq0fndfaan1mgf6yb29skqvva4lib0zgd8p1v21"; depends=[fPortfolio ggplot2 lubridate MASS PerformanceAnalytics rugarch tibble timeDate timeSeries TTR xts]; }; RMPSH = derive2 { name="RMPSH"; version="1.1.1"; sha256="0jffp8942ydwain23kvy7q6avpxxsb77jj1mg4bq43fwgfc9nqjy"; depends=[Rcpp]; }; RMSNumpress = derive2 { name="RMSNumpress"; version="1.0.1"; sha256="1y86dpa8kpq2bkvl90qwghxrnll5h3y9ycyvmamm4kd7ivy59sxi"; depends=[Rcpp]; }; + RMT4DS = derive2 { name="RMT4DS"; version="0.0.1"; sha256="05fwhd36lvi21gr5nz8mgxk5qzw4vxkrgw499p11aa9qhcn8xq4g"; depends=[lpSolve MASS mpoly nleqslv pracma quadprog rARPACK RMTstat rootSolve]; }; RMTL = derive2 { name="RMTL"; version="0.9.9"; sha256="1wyv9l1xgdm4s8ibjw3kwfsr77hxkxj80cgvkfv4mdir0bxm84b4"; depends=[corpcor doParallel foreach MASS psych]; }; RMThreshold = derive2 { name="RMThreshold"; version="1.1"; sha256="0wkc42vcggib002ad6ch43h6avpdgl12szrrrfd2p0wl72cwn5n1"; depends=[Matrix png]; }; RMTstat = derive2 { name="RMTstat"; version="0.3.1"; sha256="1r1a2sdqv64m9cpm2pz6r8abf7l810126ayd8iq3gx86c7bjfj5v"; depends=[]; }; @@ -3985,7 +4000,7 @@ in with self; { RMixtComp = derive2 { name="RMixtComp"; version="4.1.3"; sha256="0v1qhqvl0s2b93xhykjr99h5gbz48l9npp0vyazh0ncx8gnxrzfl"; depends=[ggplot2 plotly RMixtCompIO RMixtCompUtilities scales]; }; RMixtCompIO = derive2 { name="RMixtCompIO"; version="4.0.8"; sha256="0q8k8arnrgwvrsl6f2p0a53vk5krynwgjfsdp71z9c1wjq22zsa3"; 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.24"; sha256="0hbjcf0gzkkg8h50msj4a6ymax9s3j4aw44jl1mqcxkdmfn9l6ya"; depends=[DBI]; }; + RMySQL = derive2 { name="RMySQL"; version="0.10.25"; sha256="1527ba5vqg4ss6rqxrkxa1a66r1m9h4zmdnv9xdzva8fv2dhy4zd"; depends=[DBI]; }; RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.4"; sha256="16ab0p0378j4vvcazynffsgx1rq32llf1sz4h4pp5lrx820j6qvx"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; }; RNAseqQC = derive2 { name="RNAseqQC"; version="0.1.4"; sha256="0f9k3ba2w75sjywngmvp7g10837wx65v112inpag3rplk9ljahvp"; depends=[AnnotationFilter AnnotationHub circlize ComplexHeatmap cowplot DESeq2 dplyr ensembldb gghighlight ggplot2 ggpointdensity ggrepel ggsci magrittr matrixStats patchwork purrr RColorBrewer stringr SummarizedExperiment tibble tidyr tidyselect vsn]; }; RNAsmc = derive2 { name="RNAsmc"; version="0.7.0"; sha256="13biayrgs9qb06w3rkwrmplnrm93zlygsfm7chy6jbp15xl3bf0c"; depends=[circlize RRNA]; }; @@ -4001,8 +4016,8 @@ in with self; { RNetCDF = derive2 { name="RNetCDF"; version="2.6-1"; sha256="02llp0ar5i81lxmsr1iznwhxk37ihkplbyi7f0za2dnqp1b0qrwz"; 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.4.1"; sha256="058jzhw91wd4hb9l06mn0ihf1yp2fapz1fyb32w9bjwxq7qxvii2"; depends=[Rcpp]; }; - RNiftyReg = derive2 { name="RNiftyReg"; version="2.7.0"; sha256="0y7s2zcjjnb9jakdhyd6hmdj9axdpvbnhijs2finnlwc0d09jpz1"; depends=[ore Rcpp RcppEigen RNifti]; }; + RNifti = derive2 { name="RNifti"; version="1.4.3"; sha256="1w627brzag9laxsfrr1kxh07glycl8l1n5xf5frn8m0jzvrn3d50"; depends=[Rcpp]; }; + RNiftyReg = derive2 { name="RNiftyReg"; version="2.7.1"; sha256="1hmcd89c1qw6zyhshz1myyf2xjwhz5gl3hr46nny5qgh3z4ylyb1"; 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]; }; @@ -4013,7 +4028,7 @@ in with self; { ROCket = derive2 { name="ROCket"; version="1.0.1"; sha256="1p5b1408fdq8z64b7ihwcdxprg5rfiq4z5annxzvmizzr6qwn8qa"; depends=[data_table]; }; ROCnReg = derive2 { name="ROCnReg"; version="1.0-7"; sha256="09v7qi5q5m969j1g6fwgb4nsls60vcfrz1z1v111mv9dzq85dxxp"; depends=[lattice MASS Matrix moments nor1mix np pbivnorm spatstat spatstat_geom]; }; ROCpsych = derive2 { name="ROCpsych"; version="1.3"; sha256="0fcrhhxmvrrchbswb94liahbgz5pfhs86fbj0vby7vnakrhngh7v"; depends=[pROC reportROC]; }; - RODBC = derive2 { name="RODBC"; version="1.3-19"; sha256="1zjf5mfv906kxy4cn2l10z35l7m5878aqjx9yj6pr2ydfxlbvz1s"; depends=[]; }; + RODBC = derive2 { name="RODBC"; version="1.3-20"; sha256="1mpv2315jbbg085wbrgzvlk11apkn32slq3j4jjbw0i5rb8pn5bz"; depends=[]; }; RODBCDBI = derive2 { name="RODBCDBI"; version="0.1.1"; sha256="0jkcc1lm8drsx1pkfj5h6rlbr98cgpvbf9ndzdwr048f3s8gd26i"; depends=[DBI RODBC]; }; ROI = derive2 { name="ROI"; version="1.0-0"; sha256="0hd3l219wanhanbf4pgrh1pbxah50gf5qg2gff1djdr1xns7zn5h"; depends=[registry slam]; }; ROI_models_globalOptTests = derive2 { name="ROI.models.globalOptTests"; version="1.1-1"; sha256="1zj636cmjhhqbn6hh6760bi5y8lf6y7qqkz72yijq7dj2y1za2ph"; depends=[globalOptTests ROI]; }; @@ -4040,11 +4055,11 @@ in with self; { ROOPSD = derive2 { name="ROOPSD"; version="0.3.8"; sha256="0bndjhnshifbx02scw7d48wszar51vyv735a2r0chzq7qjj7drc3"; depends=[Lmoments numDeriv R6]; }; ROSE = derive2 { name="ROSE"; version="0.0-4"; sha256="0y3v9zkgaxpv4f4zn22ra1gkkqg5hdz8js47ppciqahfydjbfl3p"; depends=[]; }; ROlogit = derive2 { name="ROlogit"; version="0.1.2"; sha256="09j9c24f7plzpnnhpmzdi4gapb7w1377ksjwk6i2xpyr4bfsrr5k"; depends=[evd survival]; }; - ROpenCVLite = derive2 { name="ROpenCVLite"; version="4.60.2"; sha256="1k9s5irb1k01f7y5islyvh6wm23fpys7wzkqgv2zgbmvqqaxj7ji"; depends=[pkgbuild]; }; + ROpenCVLite = derive2 { name="ROpenCVLite"; version="4.60.3"; sha256="1529c5wnz7y50pzgq9m7gg7p2pmasdzpyqfmab6zxg87bmab4y61"; 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]; }; - ROptEst = derive2 { name="ROptEst"; version="1.2.1"; sha256="0gjdgynmg8499jm5gbnmjipnn1bl7h1rja8lhgbaw48lmq5sr801"; depends=[distr distrEx distrMod MASS RandVar RobAStBase startupmsg]; }; + ROptEst = derive2 { name="ROptEst"; version="1.3.1"; sha256="1p0aapqyb22z48b44yh88wzrn36bq9djdajgrc0w5z1p0kj3vq0b"; depends=[distr distrEx distrMod MASS RandVar RobAStBase startupmsg]; }; ROptEstOld = derive2 { name="ROptEstOld"; version="1.2.0"; sha256="08njyxb8bnjb9nas3szqvqkfv83lc0187b7biis2nl2rgq6rljzy"; depends=[distr distrEx evd RandVar]; }; ROptRegTS = derive2 { name="ROptRegTS"; version="1.2.0"; sha256="1wy54kjrpfvj2k9ndmq27zzgx6aygh85f7c83g7gn8d5b2y91qy4"; depends=[distr distrEx RandVar ROptEstOld]; }; ROptSpace = derive2 { name="ROptSpace"; version="0.2.3"; sha256="18fz285hr4fdkkbs4b13gmwz0sqbgk6di6m3c6ic0wvs35mpmcfz"; depends=[Rcpp RcppArmadillo Rdpack]; }; @@ -4063,9 +4078,9 @@ in with self; { RPhosFate = derive2 { name="RPhosFate"; version="1.0.2"; sha256="17905kbi8mh6356kkn5slyqk6r134j28ipk0sdv0y1jxrgjdyvzq"; depends=[checkmate hydroGOF raster Rcpp RcppArmadillo spatstat_geom yaml]; }; RPostgreSQL = derive2 { name="RPostgreSQL"; version="0.7-4"; sha256="1ijnsly8wgy6cfib4xvdaz2g9hk1gzg7q52r37zkvc7jjh0gdbdn"; depends=[DBI]; }; RPostgres = derive2 { name="RPostgres"; version="1.4.4"; sha256="1z6diaq4kwinl97d1v9cb96j8mrkj2s2v4ml1vykgy1jqi40dk69"; depends=[bit64 blob DBI hms lubridate plogr Rcpp withr]; }; - RPresto = derive2 { name="RPresto"; version="1.4.0"; sha256="1w6wq4j6c4xdsr0n5yf8fcmgm5yp2nsfydi4zdi1s7chkhr9y50d"; depends=[bit64 DBI dbplyr dplyr httr jsonlite lifecycle lubridate openssl progress purrr rlang stringi tibble]; }; + RPresto = derive2 { name="RPresto"; version="1.4.1"; sha256="04xvy6mnmi6aymwm7wp97i85q7hh80fkjibjnbpi76i0lpa06wzh"; depends=[bit64 DBI dbplyr dplyr httr jsonlite lifecycle lubridate openssl progress purrr rlang stringi tibble]; }; RProbSup = derive2 { name="RProbSup"; version="3.0"; sha256="1z53zgx26fwfhb1vxad0l51v34y2lsplhwbjaf4r44rngdaw9h5n"; depends=[]; }; - RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.19"; sha256="0iwaclf5xh4792l7pmp64y9lymq1jy8dv6byc0059jak1p7wsyb3"; depends=[Rcpp]; }; + RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.20"; sha256="1q5wd586334472584r93whnwxy4yyycn9l891g6m6wh7v0884q76"; depends=[Rcpp]; }; RPscoring = derive2 { name="RPscoring"; version="0.1.0"; sha256="063w83k9krwv3wvw2iq8bqkhjaj26as14d9g99l8jxfc02ljv1rr"; depends=[]; }; RPtests = derive2 { name="RPtests"; version="0.1.5"; sha256="04j4nqy2qxn1pa8ar0j0wgzkpd624983wwhd73l1ax7fnskx0yhh"; depends=[glmnet randomForest Rcpp]; }; RPublica = derive2 { name="RPublica"; version="0.1.3"; sha256="1w2pn1g44a00ls8kkzj53a739pq6vzp38px2k0yh10rlzimmb21l"; depends=[curl httr jsonlite]; }; @@ -4084,9 +4099,10 @@ in with self; { 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.7.0"; sha256="09d3nbm47rhn9z0s5x4ly541m3b3hcsfsxd1dnrxkiqkyjy7c4h0"; depends=[ape doParallel emmeans foreach phytools]; }; + RRreg = derive2 { name="RRreg"; version="0.7.5"; sha256="105hv4izzbm5b89mg1k99zkms8ppjafj6x2fvh71yhaszh79fh88"; 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=[]; }; - RSAGA = derive2 { name="RSAGA"; version="1.3.0"; sha256="1y1zhy2bxkfsv8vmnxjdg9i5rqkvs32kw8h5z1mclv953srgkpn9"; depends=[gstat magrittr plyr rgdal shapefiles stringr]; }; + RSAGA = derive2 { name="RSAGA"; version="1.4.0"; sha256="0mdirx7d3z4l0k54wa6rb1c5gma470ypifd3flj2287m8y2wjqq5"; depends=[gstat magrittr plyr shapefiles stringr]; }; RSAlgaeR = derive2 { name="RSAlgaeR"; version="1.0.0"; sha256="1hp0v2vkj9ixiv541d53kyl0ph3jsdc5w98r81gv5ck5ixrp6bxp"; depends=[cvTools ggplot2 hydroGOF lubridate mblm plyr]; }; RSBJson = derive2 { name="RSBJson"; version="1.1.2"; sha256="1bzy0pgj6kg447xnnjj643hk8gyzzaaliiw0z98r19959bqbvgq3"; depends=[jsonlite]; }; RSC = derive2 { name="RSC"; version="2.0.2"; sha256="0d7b8q5r3sb29h3kj0dpd1ldm6lymqkpdjsg216m4lgqcikkng6l"; depends=[doParallel foreach Matrix]; }; @@ -4100,23 +4116,22 @@ in with self; { RSKC = derive2 { name="RSKC"; version="2.4.2"; sha256="0r9gpwhzscb6rbba3dg13p78pvskahgvsd59biag0shyii3xvwpm"; depends=[flexclust]; }; RSNNS = derive2 { name="RSNNS"; version="0.4-14"; sha256="081c20dcac8xxb0sp7kwzm4b7h5jrgcxxsfckjbxbda95g5n4qkz"; depends=[Rcpp]; }; RSQL = derive2 { name="RSQL"; version="0.2.1"; sha256="10s71kgsa37m937lr7kai8c73iw5fwb9rnhkf65wz0w2qha01zaz"; depends=[DBI lgr R6]; }; - RSQLite = derive2 { name="RSQLite"; version="2.2.18"; sha256="1sjbjh4rhaagmhiv2rg3csakbsc62qwyawz5vhywg3mdcbdnl6b2"; depends=[bit64 blob DBI memoise pkgconfig plogr Rcpp]; }; + RSQLite = derive2 { name="RSQLite"; version="2.2.19"; sha256="11jzg3ywzaql3zwp7cwql1nilz8pvbz903whyh0d447rs0xnn3vj"; 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-8"; sha256="0iy2y63yl35im6n8hg77gzfr6mk7z4yi4lpl50mig1jj9rvqw3n5"; depends=[]; }; - RSeed = derive2 { name="RSeed"; version="0.1.60"; sha256="0rvb6w4z5c2wcdgx5w6vv7c8il8d0096pgv3fyvw21ag25z605jc"; depends=[graph RBGL sybil]; }; + RSclient = derive2 { name="RSclient"; version="0.7-9"; sha256="04xppfz2gxf21jmcz9phxpaxys06kqnw77v1sy9qqd3n0yywzihv"; depends=[]; }; RSelenium = derive2 { name="RSelenium"; version="1.7.9"; sha256="18hd0gfpblg9ij99ik7ccc60q9dxha89n5rrwrrzx498c5sscjg2"; depends=[caTools httr wdman]; }; RSentiment = derive2 { name="RSentiment"; version="2.2.2"; sha256="15d1llzxg1apkwykpb7pic2d5lfj9i9a55hab067wrz2yq5jsyfa"; depends=[NLP openNLP plyr stringr]; }; - RSiena = derive2 { name="RSiena"; version="1.3.13"; sha256="0rc56g4f75s4nxmja4117mhynwh340kidp0amm2jdm1gda9wwp32"; depends=[lattice MASS Matrix xtable]; }; + RSiena = derive2 { name="RSiena"; version="1.3.14"; sha256="1g36l9j68d4lgwx5m67ccny7kjjv3lk5lxqawv1pz1l0d4vdmhsd"; depends=[lattice MASS Matrix xtable]; }; RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.16"; sha256="1plcmxj6sahdy3vvcmxry8cbq1j23bqzhnhn593bkwmzczka24cy"; depends=[base64enc digest httr jsonlite plyr stringr]; }; RSizeBiased = derive2 { name="RSizeBiased"; version="0.1.0"; sha256="0qh1f9998c62cph590mszbwh12mpbvcnvffmxw4mib6wd4dgl723"; depends=[pracma]; }; RSmallTelescopes = derive2 { name="RSmallTelescopes"; version="1.0.4"; sha256="16c0pfq9qp0c9b7aljp753iilk3dys14h77anwps8xg7j2lizvbh"; depends=[]; }; RSmartlyIO = derive2 { name="RSmartlyIO"; version="0.1.3"; sha256="02zswadv65a5p5q9rr12f819mh7jjqk8xj1kc1c0wqvr8dgz7fx9"; depends=[RCurl]; }; - RSocrata = derive2 { name="RSocrata"; version="1.7.11-2"; sha256="0pwfz18931594n84b5l0y8bplqz5iw622ji4f2l9qkbg29jxq5gg"; depends=[httr jsonlite mime plyr]; }; + RSocrata = derive2 { name="RSocrata"; version="1.7.12-4"; sha256="07m8jp6av12z0csl4xln1y22s3nq0jwx7bk1brs3v0v38m86j86w"; depends=[httr jsonlite mime plyr]; }; RSpectra = derive2 { name="RSpectra"; version="0.16-1"; sha256="16ij84wgpsmqmnxqiii8dgihy3bfxazry9znmckhwzba7m0d79fb"; depends=[Matrix Rcpp RcppEigen]; }; RSpincalc = derive2 { name="RSpincalc"; version="1.0.2"; sha256="09fjwfz1bzpbca1bpzxj18ki8wh9mrr5h6k75sc97cyhlixqd37s"; depends=[]; }; RSqlParser = derive2 { name="RSqlParser"; version="1.5"; sha256="0q5wa7bq7m94xx8hcf9p29v5vvkrqzygs3v6yy5xl6jgvshvscvi"; depends=[stringi stringr]; }; @@ -4125,18 +4140,17 @@ in with self; { 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]; }; - RSurvey = derive2 { name="RSurvey"; version="0.9.3"; sha256="0yk969jdvpgv01zbmk4zyxcmrbdizh37bddj1k128ndyf191z37x"; depends=[colorspace inlmisc MBA raster rgdal rgeos sp]; }; RTCC = derive2 { name="RTCC"; version="0.1.1"; sha256="0bnm0qwikbbpq3i5q5fwmsgi8fn7w0xk993ngpiqbrf5my3h93kc"; depends=[matrixStats Rcpp testthat vegan]; }; RTD = derive2 { name="RTD"; version="0.4.1"; sha256="0zsv62hx1y9q5a6rd8ri91ff64671b84jr3f88h0q4yni2mribhr"; depends=[dplyr httr jsonlite purrr RcppMsgPack readr urltools uuid]; }; RTDE = derive2 { name="RTDE"; version="0.2-1"; sha256="1dkv0g760384jmyypffl5kbnsancjx272j91ffpgmg3lmsy8nhqq"; depends=[]; }; RTIGER = derive2 { name="RTIGER"; version="1.99.0"; sha256="018y0hs06cpmb2k74xdj0cnlzr9aljbizj5jf9h8frpn9p57d6rv"; depends=[e1071 GenomeInfoDb GenomicRanges ggplot2 IRanges JuliaCall qpdf reshape2 TailRank]; }; - RTL = derive2 { name="RTL"; version="1.2.0"; sha256="0k68505zs08l8gpn7f5r3la5f2053laganl8af3b8shi5ymqv68g"; depends=[dplyr ggplot2 glue httr jsonlite lifecycle lubridate magrittr plotly purrr Rcpp RCurl readr rlang stringr tibble tidyr timetk tsibble xts zoo]; }; + RTL = derive2 { name="RTL"; version="1.3.1"; sha256="1ncbv5mk339xjf4jwbgz2bdxbv53rf9557krp9g1nazzcs1wlvjg"; depends=[dplyr ggplot2 glue httr jsonlite lifecycle lubridate magrittr plotly purrr Rcpp RCurl readr rlang stringr tibble tidyr tidyselect timetk tsibble TTR xts zoo]; }; RTOMO = derive2 { name="RTOMO"; version="1.1-6"; sha256="03jb96ahzgp662vj2v65giv8ss61vad5w26kvq8hg9q06z879jza"; depends=[GEOmap RPMG RSEIS splancs]; }; 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]; }; RTransferEntropy = derive2 { name="RTransferEntropy"; version="0.2.14"; sha256="0sy2jgdy8lmvazgyv196z327r14202243f5g8wl4nck737x0i7qh"; depends=[future future_apply Rcpp]; }; - RTriangle = derive2 { name="RTriangle"; version="1.6-0.10"; sha256="07ya95gmv53i2argqwgad6wd4sslql2wl1rkvsmgsvmhsb4wp9hd"; depends=[]; }; + RTriangle = derive2 { name="RTriangle"; version="1.6-0.11"; sha256="0m6r1k7ryl6nxxfkqhq2wrg6878yirp5mdmyaxpg8wxkribp7yr3"; depends=[]; }; 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]; }; @@ -4162,10 +4176,10 @@ in with self; { RZigZag = derive2 { name="RZigZag"; version="0.2.1"; sha256="1civ8qrk5y95775vzkd2m5arqczgan584r632ixy4q76nd5wa8zc"; depends=[Rcpp RcppEigen]; }; RZooRoH = derive2 { name="RZooRoH"; version="0.3.1"; sha256="090mcy6czipvidprj87vyfb2wdipy08xjn130qzs5qdq9bnb6a14"; depends=[data_table doParallel foreach iterators RColorBrewer]; }; RaJIVE = derive2 { name="RaJIVE"; version="1.0"; sha256="1r3csf3xpk6rx494bqamb9b8dhj1169cng6gdi52h62m8vchnak5"; depends=[doParallel foreach ggplot2]; }; - RaMS = derive2 { name="RaMS"; version="1.0.0"; sha256="101vdghn18w2cj8n5bm1gd81c298w2drs1d2sjaijkji7i74z2c6"; depends=[base64enc data_table xml2]; }; + RaMS = derive2 { name="RaMS"; version="1.3.0"; sha256="0428ys9mpw483g8i5cvnps7nhvcfg7iafma8vwf641hf7c9da0f6"; depends=[base64enc data_table xml2]; }; RaProR = derive2 { name="RaProR"; version="1.1-5"; sha256="11hwg609pjcd13qnbchbs86c3q8f4nmh1xfxg3dsiijljl6lzx3n"; depends=[]; }; RaSEn = derive2 { name="RaSEn"; version="3.0.0"; sha256="1a7jvyvvhzn4aifnhjldn5jr6sxh16b67x335p8wh8g24yvvglvw"; depends=[caret class doParallel e1071 FNN foreach formatR ggplot2 glmnet gridExtra KernelKnn MASS ModelMetrics nnet randomForest ranger rpart]; }; - RaceID = derive2 { name="RaceID"; version="0.2.6"; sha256="0kx56ibp4kf8k6m9mx2cgvra53wanfi7q99pwzlhcj7a3p2xs7yf"; depends=[cluster coop FateID FNN fpc ggplot2 harmony ica igraph irlba leiden locfit MASS Matrix matrixStats pheatmap princurve propr quadprog randomForest RColorBrewer Rcpp Rtsne runner umap vegan]; }; + RaceID = derive2 { name="RaceID"; version="0.2.8"; sha256="0pfs4hf52xnb55pmcl3ypzqv77vn61v6q7485yr36agz42y6jmmg"; depends=[cluster coop FateID FNN fpc ggplot2 harmony ica igraph irlba leiden locfit MASS Matrix matrixStats pheatmap princurve quadprog randomForest RColorBrewer Rcpp Rtsne runner umap vegan]; }; RadData = derive2 { name="RadData"; version="1.0.1"; sha256="053i6r0j58dws1qisl2701n0fwzrfn5brdx3dcab8xmpzg6s0036"; depends=[]; }; RadOnc = derive2 { name="RadOnc"; version="1.1.8"; sha256="0nc8f2f2yvfvx81xm87zr08asisyar9zdx3fwqz0lvz5xgrwkp3x"; depends=[oro_dicom ptinpoly]; }; RadialVisGadgets = derive2 { name="RadialVisGadgets"; version="0.2.0"; sha256="18a2c89jpdaln9cl5y4w161121fld08wm57m40qacsj1vlnkh6j9"; depends=[caret dplyr ggplot2 miniUI r_import rlang shiny shinyjs shinyscreenshot tidyr]; }; @@ -4179,7 +4193,6 @@ in with self; { RandMeta = derive2 { name="RandMeta"; version="0.1.0"; sha256="0bh3rkdfmwqym47q8f90pw3mmx7q8jyp4rz16ggqrmk1b5bdyqjb"; depends=[]; }; 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]; }; - RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="1.2.5"; sha256="0bjfz3bla6pr7wq4mqqcd4gmxqdx32gci4f71arfski31yx8ihlc"; depends=[]; }; RandomForestsGLS = derive2 { name="RandomForestsGLS"; version="0.1.4"; sha256="1viq8vv4f0l0ywcr9s1n1vk23a917yj35lgvrpac9rf0vvk70an7"; 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]; }; @@ -4187,7 +4200,7 @@ in with self; { RankAggreg = derive2 { name="RankAggreg"; version="0.6.6"; sha256="1g70njfv776qgp3i52kr6yxg7x9qliqaj33jm5vkgbajw1ampsdx"; depends=[gtools]; }; RankAggregator = derive2 { name="RankAggregator"; version="0.0.1"; sha256="0j4s4fv28fbc6ij6fzpmza9n5lfrql8ll33fi65vhczz9pjhpjii"; depends=[]; }; RankResponse = derive2 { name="RankResponse"; version="4.0.0"; sha256="1i686wgqz8pxdjsgyqr9i8fq1779h3jpzzrmh407pknawyii1vmy"; depends=[]; }; - Rankcluster = derive2 { name="Rankcluster"; version="0.94.5"; sha256="1ddfcmiqy20s7sfjbxax0rvc9vb1ckr46icy1zsa103hhbp5pjqb"; depends=[Rcpp RcppEigen]; }; + Rankcluster = derive2 { name="Rankcluster"; version="0.98.0"; sha256="0lipl57xx6ik66579vmhammy86iwjlnc7qmkjn9xcj3prkqy5p2i"; depends=[Rcpp RcppEigen]; }; RankingProject = derive2 { name="RankingProject"; version="0.4.0"; sha256="11i47arl3r32iky29wjawb26g0hiji0ddl70gcrcy8v9j0h01vap"; depends=[]; }; RapidPolygonLookup = derive2 { name="RapidPolygonLookup"; version="0.1.1"; sha256="0h4snn3haa4a5rkafg98419by4nnz219wsm3y0dqgm4hw4bvha0g"; depends=[PBSmapping RANN RgoogleMaps sp]; }; RapidoPGS = derive2 { name="RapidoPGS"; version="2.2.0"; sha256="0p19jc7cn2s8nnc0nblbl7k42srgm1risxggzb2rd1ngr93z757p"; depends=[bigreadr bigsnpr coloc curl data_table dplyr GenomicRanges IRanges RCurl]; }; @@ -4199,9 +4212,9 @@ in with self; { Rata = derive2 { name="Rata"; version="0.0.2"; sha256="1s7am08691lil5hbd8jpa5wnbvr0qqf0gkxczpm6yvizbjpx16qx"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2 Rirt]; }; RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.4"; sha256="1d37l4xgg1iba2rbhp4c5i7igrcy0zgbdvzk3yc0wj2x1mm5dayk"; depends=[ggplot2 pROC]; }; RationalExp = derive2 { name="RationalExp"; version="0.2.2"; sha256="0a51sfps3sfb71m93jdsmbvj6kafbyfrq790ix238j570f5xafpg"; depends=[snowfall]; }; - Ravages = derive2 { name="Ravages"; version="1.1.0"; sha256="0fabwbrkgj48m0hgq2s2c3ah7r7xbbbkz4svrkfb2jpaw2dq8vhk"; depends=[bedr BH curl data_table dfidx Formula gaston mlogit Rcpp RcppEigen RcppParallel]; }; + Ravages = derive2 { name="Ravages"; version="1.1.1"; sha256="1lkdw9ilkrsa6zc7s3ljjnjzjwhxfy0w9p6jlqmrj9j81kydyxbz"; depends=[bedr BH curl data_table dfidx Formula gaston mlogit Rcpp RcppEigen RcppParallel]; }; RavenR = derive2 { name="RavenR"; version="2.2.0"; sha256="17m6q6v3s3maj3wlic9id4bll4n3waa34sj8580l1kd5knhybmil"; depends=[colorspace cowplot crayon DiagrammeR dplyr dygraphs gdata ggplot2 igraph lubridate magrittr purrr Rcpp RCurl scales stringr tidyr visNetwork xts zoo]; }; - RawHummus = derive2 { name="RawHummus"; version="0.2.2"; sha256="04lj7dxfz7hhcwlwbigra2sgf1aafmx88169mdsw381m9c29xaj2"; depends=[data_table dplyr kableExtra markdown plotly purrr RaMS RColorBrewer rmarkdown shiny shinycustomloader shinydashboard shinydashboardPlus shinyFiles shinyMatrix shinyvalidate]; }; + RawHummus = derive2 { name="RawHummus"; version="0.2.3"; sha256="0g20qlv9vij6cw8b3smg26i0qxh83w9z4gvnpp9h0sc2qg4incr1"; 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.5"; sha256="0b0arw8db731lpym28v98gc28ka4c94b50blh3zps84ydbd3ql4w"; 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]; }; @@ -4226,8 +4239,9 @@ in with self; { RcmdrPlugin_DCCV = derive2 { name="RcmdrPlugin.DCCV"; version="0.1-1"; sha256="1snlzffs9f300iyxsbarykc53pfa8h9qsk354xki7n0wz5jp1lc3"; depends=[DCchoice Rcmdr]; }; RcmdrPlugin_DCE = derive2 { name="RcmdrPlugin.DCE"; version="0.1-2"; sha256="04c6xig7a8rbwy1cwahxxk5x5vzdijrq0dl2hr8dlivpyv2pjq73"; depends=[Rcmdr support_CEs survival]; }; RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-4"; sha256="0iwl2g1xjr30xdgpy7wiw5c6j0amag57ia5qvcpgxwj3pnyxa2lx"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc]; }; + RcmdrPlugin_EACSPIR = derive2 { name="RcmdrPlugin.EACSPIR"; version="0.2-3"; sha256="0v7pw0m8cxpnkdm47b8jb3z94p1igi98s4r8i0gm7x7ad4fzccww"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; }; RcmdrPlugin_EBM = derive2 { name="RcmdrPlugin.EBM"; version="1.0-10"; sha256="02zips1jbfn7cshjlrm1gr632px2zxlys8i0f1nrf1gifl44v1qw"; depends=[abind epiR Rcmdr]; }; - RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.60"; sha256="1wamdlhd2zi5ykd5f32is4n4nwn26h6dldvxnnd5k340wvd30bhn"; depends=[Rcmdr readstata13]; }; + RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.61"; sha256="1d97lans5w14scfn4z0nxpgfdlmspbzq2c6vl02pf5z3rrqfnbrq"; depends=[Rcmdr readstata13]; }; 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]; }; @@ -4262,15 +4276,15 @@ in with self; { RcppAPT = derive2 { name="RcppAPT"; version="0.0.9"; sha256="03q2i1b9lrb0sn0vq4jyqjiy2zwi2ydhzlnw1b8nj9xdfxx804mx"; depends=[Rcpp]; }; RcppAlgos = derive2 { name="RcppAlgos"; version="2.6.0"; sha256="11dvh0ba3chsqf3vw8g9h1754arxgwqryayavx3n6vm5daz2krqa"; depends=[cpp11 gmp]; }; RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.20"; sha256="11fgxbx3w36937h22v9pqx0nk5vpxp3hybj7k1b0lk8mj7hcginw"; depends=[Rcpp]; }; - RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.11.4.0.1"; sha256="1qrpdalcvn9bkhiq4l2jflicy6116l5j913h8clyf8yaygsxvr0c"; depends=[Rcpp]; }; - RcppBDT = derive2 { name="RcppBDT"; version="0.2.5"; sha256="1yx6rlidcz5yygzk1kvc5b5vclvdkv96v1y3nghj1523nnapbyxy"; depends=[BH Rcpp]; }; + RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.11.4.2.1"; sha256="172vz9j1hck6iwk56hgsrg91n4f11df1n6hy1crbv3cb53rkyjgn"; depends=[Rcpp]; }; + RcppBDT = derive2 { name="RcppBDT"; version="0.2.6"; sha256="11l70rlayg2xzmg34sg3896adzpfpvplciyicjpk963bddjb2ys8"; depends=[BH Rcpp]; }; RcppBigIntAlgos = derive2 { name="RcppBigIntAlgos"; version="1.0.1"; sha256="157a14kqcf0q3z01mn4w1194k2l39dd4qmqs0i115p8bvkjc6ncd"; depends=[gmp Rcpp RcppThread]; }; - RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.11"; sha256="0vpz34ri1p41kcdzm3ymxz2zg2lqighrfy5adsbamhrz941n99jw"; depends=[Rcpp]; }; + RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.12"; sha256="1jr4hi3zbm935q6ykkvnywlma36d3jl7fxmqhxs62jxbnyyqf81a"; depends=[Rcpp]; }; RcppCGAL = derive2 { name="RcppCGAL"; version="5.4.1"; sha256="1ymnamvnhbx0nbqrlrk8f57py3ccdhirydn1ilvsn6yf1z9bs3sm"; depends=[Rcpp]; }; RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.11"; sha256="0m9g37hrx33mmxhhzi6qakgiqh6w0c2s624fkgbny9vcabr3dfsx"; depends=[Rcpp]; }; RcppCWB = derive2 { name="RcppCWB"; version="0.5.4"; sha256="0myyasiglgm1zmka3gz7vq08hqz5ag2y21ri4a0ck026dxdi6jmc"; depends=[fs Rcpp]; }; RcppCensSpatial = derive2 { name="RcppCensSpatial"; version="0.3.0"; sha256="0ghywbg2zrhd72y3hf99niqlw04gvfzfa02pa581lvvd67z19gjp"; depends=[ggplot2 gridExtra MomTrunc mvtnorm Rcpp RcppArmadillo RcppProgress Rdpack relliptical roptim StempCens]; }; - RcppClassic = derive2 { name="RcppClassic"; version="0.9.12"; sha256="0v9v34i1c4dkplavdl14kz1k2rnk4hsaiyv6rkc9403z9isvzzr0"; depends=[Rcpp]; }; + RcppClassic = derive2 { name="RcppClassic"; version="0.9.13"; sha256="18kn9r7h5qqf6a6f28rjynrvp0yg0v82hxyv9z6cg254qnzd3bvj"; depends=[Rcpp]; }; RcppClassicExamples = derive2 { name="RcppClassicExamples"; version="0.1.2"; sha256="0dr2104miy7psr73nicfs84652ai0d5liw6wxcwyrx7fmys3p638"; depends=[Rcpp RcppClassic]; }; RcppClock = derive2 { name="RcppClock"; version="1.1"; sha256="0h59s6f9ib6d2n1fi94bcbqw0gcpbd5zvnc3pk4kb9lm7ih4dw7b"; depends=[ggplot2 Rcpp]; }; RcppColors = derive2 { name="RcppColors"; version="0.1.1"; sha256="10lylgdbiqnvz4r60xb71sk3lxmrvk5nclm4wnwqyz7gbja3xs9g"; depends=[Rcpp]; }; @@ -4279,13 +4293,13 @@ in with self; { RcppDate = derive2 { name="RcppDate"; version="0.0.3"; sha256="1nwb4fdjxwn0c1ckj1fpsxl2hxk5z3sk3y5giwgdag6nfv7yfplw"; depends=[]; }; RcppDist = derive2 { name="RcppDist"; version="0.1.1"; sha256="02g57xwfipdcljv06krhm02dbqn9kfyj2km6rdg0a7vq9prwdz1x"; depends=[Rcpp RcppArmadillo]; }; RcppDynProg = derive2 { name="RcppDynProg"; version="0.2.0"; sha256="10nc0sx3n83kg8rddbajifr9q8iyjmm59z5xcpqfmmfi345i26al"; depends=[Rcpp RcppArmadillo wrapr]; }; - RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.9.2"; sha256="14ylrq7mmylmi513zkwyqqy43kqbz95fc6fzpagqvyx6snaffir5"; depends=[Matrix Rcpp]; }; + RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.9.3"; sha256="0xhwgn77166ir7qnzl25mj0byskkqr0b36hihrpr2zaqsrzs8wsq"; depends=[Matrix Rcpp]; }; RcppEigenAD = derive2 { name="RcppEigenAD"; version="1.0.0"; sha256="18zm9hsfqwiicxsdm87ix3qc261ljxxn2s736p6aayx82b6vwkz6"; depends=[BH functional memoise Rcpp RcppEigen Rdpack readr]; }; RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.19.0.1"; sha256="0cc67nx8iddi70m8s2b683k4zcfakqw90rxm8wmaa2g3vpjbvadl"; depends=[Rcpp RcppArmadillo]; }; RcppExamples = derive2 { name="RcppExamples"; version="0.1.9"; sha256="0568zipgjxgmx086mlfpp5n7v8kf50gwrylvhl1bgvzb2vvr9dhj"; depends=[Rcpp]; }; RcppFarmHash = derive2 { name="RcppFarmHash"; version="0.0.2"; sha256="0nkismq7hmp1ahwv4z438zrcj7mqsfmas2yd6av6k2cmkgklqkbk"; depends=[Rcpp]; }; RcppFastFloat = derive2 { name="RcppFastFloat"; version="0.0.3"; sha256="1926hz4q6qqvz8zpabgvk04a18cm1xaqcf30yjgcrslgaf8l8h0n"; depends=[Rcpp]; }; - RcppGSL = derive2 { name="RcppGSL"; version="0.3.11"; sha256="1a5dms0axlzgpv1z2bhfrb77497h0ch1yslq0gidj14vr4kfm57h"; depends=[Rcpp]; }; + RcppGSL = derive2 { name="RcppGSL"; version="0.3.12"; sha256="1qmrwd0zc0kwbhpwxg5s5fxp0pmfh0hwcli8vqh1q41997yyy14m"; depends=[Rcpp]; }; RcppGetconf = derive2 { name="RcppGetconf"; version="0.0.3"; sha256="1qcnn482h9b8aw798frnkza4bzzpihp0pf4s1mj6zmn2ar01hsl0"; depends=[Rcpp]; }; RcppGreedySetCover = derive2 { name="RcppGreedySetCover"; version="0.1.0"; sha256="1v84i9gsmvpkmgd4niqnzp58nhrgn2j4rggsrnlh391ikdfrl51x"; depends=[BH data_table Rcpp]; }; RcppHMM = derive2 { name="RcppHMM"; version="1.2.2"; sha256="0scdzmns1yw2gbarblzd6cbvndlysz54ff17qijiz17ql5cyzly6"; depends=[Rcpp RcppArmadillo]; }; @@ -4299,11 +4313,11 @@ in with self; { 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.1"; sha256="06ahzp0rvk3wrrj46dmszkmpnybaa5hrpbs2cs5h3jn633k67zj6"; depends=[BH Rcpp]; }; - RcppRedis = derive2 { name="RcppRedis"; version="0.2.1"; sha256="1pcfdg499vakn5rn3jald2hhrzhzsggwg95zm2293ma3pihrjvqa"; depends=[RApiSerialize Rcpp]; }; + RcppRedis = derive2 { name="RcppRedis"; version="0.2.2"; sha256="1xlmw410bli99wjlh6kv5q1nz886vapma23mzrh083fizw3adzfk"; 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.8"; sha256="1fzawv385d2dbplg84s9qxcjjh29q6wfdslfaarlcz1y6m34vnq5"; depends=[Rcpp]; }; - RcppSpdlog = derive2 { name="RcppSpdlog"; version="0.0.8"; sha256="1z5fg1i9splph4nfxnra07yjgss9g6g5rcsz492aa0zd8xi7z3za"; depends=[Rcpp]; }; + RcppSpdlog = derive2 { name="RcppSpdlog"; version="0.0.10"; sha256="19931fgjmzrp65vci3s8gypipg761ajalnn75pdi1x8a2bgz1jhf"; 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]; }; @@ -4311,7 +4325,7 @@ in with self; { RcppUUID = derive2 { name="RcppUUID"; version="1.1.1"; sha256="0sxdj5ay90i1bs3wizij31n21ym8l0q0c79959arp1gd303sd8b8"; depends=[BH Rcpp]; }; RcppXPtrUtils = derive2 { name="RcppXPtrUtils"; version="0.1.2"; sha256="0hm57nf4dzgsmg4hjj6wikwjx93fgfwkmybw6ly4b58wi6qwml1l"; depends=[Rcpp]; }; RcppXsimd = derive2 { name="RcppXsimd"; version="7.1.6"; sha256="1iwiz4964dw015cbxcanks8xkjan39hfzf8x6bhvf6dqqwkc4bh7"; depends=[Rcpp]; }; - RcppXts = derive2 { name="RcppXts"; version="0.0.5"; sha256="1vzq6z5m48cpkbcx2fw7r102jdjfc776d5q3b7yxqsv07r6y2lav"; depends=[Rcpp xts]; }; + RcppXts = derive2 { name="RcppXts"; version="0.0.6"; sha256="1ljwscw8ykyqadjc98r9p6z4qjjfm79n9l618pmhh842l68kag28"; depends=[Rcpp xts]; }; RcppZiggurat = derive2 { name="RcppZiggurat"; version="0.1.6"; sha256="0wgd1v2p7zajnbrjf3hfi56p3pk3ld6iwkanbb04bjbnlif2ay4w"; depends=[Rcpp RcppGSL]; }; Rcrawler = derive2 { name="Rcrawler"; version="0.1.9-1"; sha256="1m6b1h72h8qjqcg3lzw6im6lpnkxhjg65g9fdjjqay6vy52ynznj"; depends=[callr data_table doParallel foreach httr jsonlite selectr webdriver xml2]; }; Rcriticor = derive2 { name="Rcriticor"; version="2.0"; sha256="1cnmmcdp2g3syrlld1pm7101cbzxh02cpvqvgsj7mp6zxm2k5plv"; depends=[]; }; @@ -4322,7 +4336,7 @@ in with self; { Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.14"; sha256="1d45dn1vxx5vq53m8as4fyq7077s1vw9xxq5r7f4fajybpqiby18"; depends=[formatR roxygen2 xfun]; }; 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.1.0"; sha256="12xj079n0khl17yq4mhkxql1afpva797iz5c2z3m7giv7cflc513"; depends=[CVXR maotai MASS mclustcomp RANN Rcpp RcppArmadillo RcppDE RcppDist Rcsdp Rdpack RSpectra]; }; + Rdimtools = derive2 { name="Rdimtools"; version="1.1.1"; sha256="0mih0ad04ipk9mmcp7i78v7zsdi6np4sl1x1z4gg1s5ww8ci02sk"; depends=[ADMM CVXR maotai MASS mclustcomp RANN Rcpp RcppArmadillo RcppDE RcppDist Rdpack RSpectra]; }; Rdpack = derive2 { name="Rdpack"; version="2.4"; sha256="109mylzmlncq5a09ayy4g2g0frj1k843lj8j78gvmz1h5g8sslkn"; 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]; }; @@ -4340,8 +4354,8 @@ in with self; { RecAssoRules = derive2 { name="RecAssoRules"; version="1.0"; sha256="0jvl9yl1rg69bqb1cimi8r0bry73jhsq73fxfyy33ljwym2cdgv6"; depends=[Rcpp]; }; Recocrop = derive2 { name="Recocrop"; version="0.4-1"; sha256="1drh1qssnb42p1zl45phpggxhx6is435k9f1vzga0q0dddr5q770"; 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.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]; }; + RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-12.4"; sha256="0jfissk9gcf1w78dhly01dpjlb8nyk32iz1s2n38ggk8ywd4zgbk"; depends=[ada data_table DBI e1071 evd ff ipred nnet rpart RSQLite xtable]; }; + RecordTest = derive2 { name="RecordTest"; version="2.1.1"; sha256="01l16i0i58nsaa2vpfywmqa6srgym4vzybrgbgcv8cpf31w8ly7w"; depends=[ggplot2]; }; Records = derive2 { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; }; 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]; }; @@ -4356,10 +4370,9 @@ in with self; { Relatedness = derive2 { name="Relatedness"; version="2.0"; sha256="1aidklwk8q2wdfsmhlbd3vzq9kzsyh4wn1g28biyb6lq7iwq1hl4"; depends=[]; }; Relectoral = derive2 { name="Relectoral"; version="0.1.0"; sha256="0kpdafdvpcs6iicpc10i634nlk7dqk2nymdnnlkpp5frdxlbycvx"; depends=[dplyr ggforce ggplot2 readxl rmarkdown sf xlsx]; }; RelimpPCR = derive2 { name="RelimpPCR"; version="0.2.4"; sha256="0svfyh313wawzqx9hfb4cg0wn2ir6nd769z1k3dckdsb8d7xkh3q"; depends=[caret ggplot2 relaimpo reshape2 Rmisc]; }; - Renext = derive2 { name="Renext"; version="3.1-0"; sha256="074djs4y71667aylpgh514pzijr90rgpzm4w5ayq9cgaqz22m3am"; depends=[evd numDeriv]; }; + Renext = derive2 { name="Renext"; version="3.1-3"; sha256="0m5br76n0vd6q1kkjp6w7qxhvrplc63dxm5zcw6cy9f302x76jdk"; depends=[evd numDeriv]; }; RenvModule = derive2 { name="RenvModule"; version="1.1"; sha256="1wmz6k0f9lpa8d7qxqm308l7h11k0cj07q3qisfjic5sp308c3d2"; depends=[]; }; Renvlp = derive2 { name="Renvlp"; version="3.2"; sha256="1fmziz6s1i1vgk58pi5k5h37ys04ngrb8d1avpbvv9pgm557yll8"; depends=[orthogonalsplinebasis Rsolnp]; }; - ReorderCluster = derive2 { name="ReorderCluster"; version="2.0"; sha256="0zq143xvv2br7016f9b1501ymcpkjqm3al1dn5qfm21axyi2p1iq"; depends=[gplots gtools Rcpp]; }; RepaymentPlan = derive2 { name="RepaymentPlan"; version="0.1.0"; sha256="1fd4n24bd5s2kqmls7mmsidblaf8nzm97kz52mfsb6i6fci0pgah"; depends=[]; }; 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]; }; @@ -4367,7 +4380,8 @@ in with self; { ReplicationSuccess = derive2 { name="ReplicationSuccess"; version="1.2"; sha256="0x470102sr819jgm1h5b228qcckghnfv8badgb53jy05ral7lrc2"; depends=[]; }; Repliscope = derive2 { name="Repliscope"; version="1.1.1"; sha256="04sxcnsd8vz5kbzqz52iqzwayrmkzc51bcwnfkp53wymiw4vppiz"; 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.1.4"; sha256="132sawllsw4vnm5b836rmzzimqy9rralvkigi5jqiv07z37xlmqn"; depends=[data_table]; }; + Require = derive2 { name="Require"; version="0.2.5"; sha256="1crj73a22cap9www7fjvqzr3qb2mwx4cwmm02mpv9npqrvv9ybpp"; depends=[data_table]; }; + ResPBIBD = derive2 { name="ResPBIBD"; version="0.1.0"; sha256="00a3qbam4dc9lwfyqq63j8q9yppd4nr7pk0wbikjfw6rnbjsl1sh"; depends=[]; }; ResearchAssociate = derive2 { name="ResearchAssociate"; version="1.0.1"; sha256="00j339ngc72gn2gyn1irjmazrv6l5nbsy3z25r6j1zrjwsbay15p"; depends=[ggplot2 plyr rentrez XML]; }; ResidentialEnergyConsumption = derive2 { name="ResidentialEnergyConsumption"; version="1.1.0"; sha256="0m24x5mha58ihsd06jkcb3wi796v3gkjg78w8vah21p9gqdmqxw1"; depends=[]; }; ResistorArray = derive2 { name="ResistorArray"; version="1.0-32"; sha256="0zqnl0bbqrj5hn5ywhlqyrlz5ryql88qahlgs9989v4rljcxxlam"; depends=[]; }; @@ -4376,6 +4390,7 @@ in with self; { RestRserve = derive2 { name="RestRserve"; version="1.2.1"; sha256="1xfcp0y9l31815g1jk33mnkb6z68qpjl0gb4fj7f4578kx3v1c8p"; depends=[checkmate digest jsonlite mime R6 Rcpp Rserve uuid]; }; RestoreNet = derive2 { name="RestoreNet"; version="1.0"; sha256="015j8kw0msixjxljhpj4hnj67k9z89zcsyga0jva4ig5ri24rj34"; depends=[ggplot2 Matrix RColorBrewer scales scatterpie stringr xtable]; }; RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; }; + RevGadgets = derive2 { name="RevGadgets"; version="1.1.0"; sha256="1d14wf6zya1p9wrh1yvrl1gryldvnq7zvhi3b99002w9jph5zp25"; depends=[ape deeptime dplyr ggimage gginnards ggplot2 ggplotify ggpp ggthemes ggtree phytools png reshape scales tibble tidyr tidytree treeio]; }; ReviewR = derive2 { name="ReviewR"; version="2.3.8"; sha256="19cj92v7356n3910dx2z8xzi78fynd32kb9132ll2xw295mfk61i"; depends=[bigrquery config dashboardthemes DBI dbplyr dplyr DT gargle glue golem httr jsonlite magrittr purrr redcapAPI REDCapR rlang RPostgres RSQLite shiny shinycssloaders shinydashboard shinydashboardPlus shinyjs shinyWidgets snakecase stringr tibble tidyr]; }; Revticulate = derive2 { name="Revticulate"; version="1.0.0"; sha256="00pz8nnbl7dcbbqw8kdbdai1i3jc941l42nppaa1kxk6i3dci7gs"; depends=[ape comprehenr jsonlite knitr rstudioapi stringr usethis]; }; Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; }; @@ -4384,9 +4399,9 @@ in with self; { Rfast = derive2 { name="Rfast"; version="2.0.6"; sha256="0zxykq021h57mq0n6giqbx8ncjsdly0arhmaj3fcp3yfcxf4ns9l"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; Rfast2 = derive2 { name="Rfast2"; version="0.1.3"; sha256="1bqaazgna9vradgs8naqnyv5y1q4fq67hm18k22bcb5vycci3m5k"; depends=[RANN Rcpp RcppArmadillo Rfast]; }; Rfit = derive2 { name="Rfit"; version="0.24.2"; sha256="1b3pza2xdpifvrcqbdp5r2wy82ws1844bnpna01hqj65xbw2iix8"; depends=[]; }; - Rfmtool = derive2 { name="Rfmtool"; version="4.1.8"; sha256="1p4b9wgcdvlhfcf1rq15wcx2qjn2hgqp6gv7wx40dziqa8csrlpk"; depends=[]; }; + Rfmtool = derive2 { name="Rfmtool"; version="4.1.9"; sha256="1rkzczif7v8dqmivyfc4wblymf482ddjllabzz14bswv7mfnly5k"; depends=[]; }; Rfolding = derive2 { name="Rfolding"; version="1.0"; sha256="15lf73zxr1slin9faj9k0z8qkb1g9nb7h080nfv99gsi2ks68ssg"; depends=[]; }; - Rforestry = derive2 { name="Rforestry"; version="0.9.0.116"; sha256="0px9w40d5qd5br1ypbdfdwmhfj9mxdn915ijg077bs3h52fv00z0"; depends=[dplyr glmnet onehot Rcpp RcppArmadillo RcppThread visNetwork]; }; + Rforestry = derive2 { name="Rforestry"; version="0.9.0.144"; sha256="1hgrphvjkl9794fmbpismh30z4gw5lfcx8vh2f1cljp4wg7h94ca"; 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.1.0"; sha256="0ww4s5vhqhdw9rr8maqgzwx6kvj196z339maxd3xx29qxgp6j1ml"; depends=[dplyr fda ggplot2 httr lattice markdown plotly Rcpp RcppArmadillo RcppEigen RSpectra Rssa shiny tibble]; }; Rga4gh = derive2 { name="Rga4gh"; version="0.1.1"; sha256="0h5y722blkkwn6ask6vjnhl22v9l6511chdm50ig6xcs5dvjam2m"; depends=[httr jsonlite]; }; @@ -4399,6 +4414,7 @@ in with self; { RiemBase = derive2 { name="RiemBase"; version="0.2.5"; sha256="1ikv7n8hp23a5dbmnfypdkx74vxwjd9br0hvysnhhpg1ffvr5vhi"; depends=[pracma Rcpp RcppArmadillo Rdpack]; }; 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]; }; + Rigma = derive2 { name="Rigma"; version="0.2.1"; sha256="0h0fblnsbrkkvd0cimywa3gq4q7ay9p39f7x2rpis58kj28ra6fn"; depends=[bslib checkmate dplyr fs glue httr2 lubridate magrittr png purrr rlang tibble tidyr withr xml2]; }; 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]; }; @@ -4412,7 +4428,6 @@ in with self; { RkMetrics = derive2 { name="RkMetrics"; version="1.3"; sha256="1k6vnr1r4h69iznib638z45gd0f8wc4g4h0ji9f0017883g77li1"; depends=[]; }; Rlab = derive2 { name="Rlab"; version="4.0"; sha256="019rmciqza5rd5z9hvh8xk20c2rjhzyzp1k5731qm1d3jz5lwx5k"; depends=[]; }; Rlabkey = derive2 { name="Rlabkey"; version="2.9.0"; sha256="0337vdwbhxk463a0hbi3xvdnzl6wb4jcqvwzfl5qw5200j66v6cc"; 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-4"; sha256="11nhgzdf37345m5k153pfrdsqbg6gpp4g8xig19pcf4sbmqq2k5l"; depends=[BH forecast Rcpp RcppEigen RcppParallel rstan rstantools sn StanHeaders]; }; Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.2"; sha256="0hzsnrz30429pavf7qghknykah9ks4msb96zwa1xgvqb4zd512dg"; depends=[Rcpp]; }; Rlinkedin = derive2 { name="Rlinkedin"; version="0.2"; sha256="15sbiis1d0s466nqk1adjhflb01sb9kn25f4y6sagkdggvyz6b56"; depends=[httpuv httr XML]; }; @@ -4436,7 +4451,7 @@ in with self; { RoBMA = derive2 { name="RoBMA"; version="2.3.1"; sha256="0cj360bbhcsljhz0zm1ivmqwh37g83mrcv2yvrvnfffaarziflj9"; depends=[BayesTools bridgesampling coda extraDistr ggplot2 mvtnorm psych Rdpack rjags runjags scales]; }; RoBSA = derive2 { name="RoBSA"; version="1.0.0"; sha256="0r6qsjsb646s4li78nz94xkgmpbdndl71j6ra74fd6bx1gkysxqw"; depends=[BayesTools bridgesampling coda Rdpack rjags runjags scales survival]; }; RoBTT = derive2 { name="RoBTT"; version="1.0.0"; sha256="146pvhl214kbhhxqay85789n5mwrn2hk47s8jwh8r04c6jcdlsi7"; depends=[BayesTools BH bridgesampling Rcpp RcppEigen RcppParallel Rdpack rstan rstantools StanHeaders]; }; - RobAStBase = derive2 { name="RobAStBase"; version="1.2.2"; sha256="18rk8rry7y17kk262308hf6nsvr7syzyqx0n0sjhqcc82j2bamxl"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; }; + RobAStBase = derive2 { name="RobAStBase"; version="1.2.3"; sha256="02gapmpwkqy0n65nfaa9rvpx6693j9h93hfhn6s41q7833gvcx3z"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; }; RobAStRDA = derive2 { name="RobAStRDA"; version="1.2.0"; sha256="1s84j5in4av9zbbszv8j2rpigrd9ws9h4hz64jw7xagsj3xb49kz"; depends=[]; }; RobExtremes = derive2 { name="RobExtremes"; version="1.2.0"; sha256="150p94f0g75g54qcaq4x45lk4sxiyvv1zs4hxkicf46raybvsv89"; depends=[actuar distr distrEx distrMod evd RandVar RobAStBase RobAStRDA robustbase ROptEst startupmsg]; }; RobGARCHBoot = derive2 { name="RobGARCHBoot"; version="1.2.0"; sha256="142r6cmzwhg4xfbpbgrvngncm2wczly2arg6p8612ypjsk4yinrf"; depends=[doParallel doRNG foreach Rcpp RcppArmadillo]; }; @@ -4449,7 +4464,7 @@ in with self; { RobStatTM = derive2 { name="RobStatTM"; version="1.0.5"; sha256="192acs7fwkw760d58s0byd5zk3j0gysa158wa2ygfkifzwbagc89"; depends=[pyinit robustbase rrcov]; }; RobinHood = derive2 { name="RobinHood"; version="1.6.5"; sha256="0j54dhb6bss9dkkphfs18mmnk7n0qmxzykch1ivqqr4m8gbq3x8r"; depends=[dplyr httr jsonlite lubridate magrittr profvis uuid]; }; RobustAFT = derive2 { name="RobustAFT"; version="1.4-5"; sha256="1i119qqlavfj7k0srb8fbbyy2nhsjv9rgrni854liizr9m51cgac"; depends=[robustbase survival]; }; - RobustANOVA = derive2 { name="RobustANOVA"; version="0.1.0"; sha256="1qxmrf115iyzfafd52m3sy87hbhga5byrwq83l13bxwairvfy0ar"; depends=[optimbase PEIP]; }; + RobustANOVA = derive2 { name="RobustANOVA"; version="0.3.0"; sha256="1kpvahxipcmsqk6mv2zagcvw0glmsj0xkpf6f3gjnckin6mxnjyv"; depends=[optimbase PEIP]; }; RobustBF = derive2 { name="RobustBF"; version="0.2.0"; sha256="137lsk72sx29lhkc1s698k015vvbmdzb23i8pnlk5204bjfqzch8"; depends=[]; }; RobustBayesianCopas = derive2 { name="RobustBayesianCopas"; version="2.0"; sha256="0cbibfp4y45cc1disp2r37v0jln0cd9gy3d77z3k9ybj1gg8wa88"; depends=[rjags statip]; }; RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.3"; sha256="1fz0lhgj70zfh5mlcfswxz168hpir68pdz7lszz21ixr73hjdhxb"; depends=[nloptr Rcpp RcppEigen RobustGaSP]; }; @@ -4462,7 +4477,7 @@ in with self; { Rogue = derive2 { name="Rogue"; version="2.1.3"; sha256="00phrxhsszp98wa9wxbx51z2zrrwpdwamym1k19493ppn7vz22ix"; 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]; }; + Rook = derive2 { name="Rook"; version="1.2"; sha256="0qjziszrrwsp1mbykps3yf5r98q83cyd4jzpgi7gvbsd2ssy96n7"; depends=[brew]; }; RootsExtremaInflections = derive2 { name="RootsExtremaInflections"; version="1.2.1"; sha256="0qd6cmzp8fkb75ac79xbh4032vqwax7nk7d6yykpdbn0bnk2kvdi"; depends=[doParallel foreach inflection iterators]; }; Ropj = derive2 { name="Ropj"; version="0.3-2"; sha256="1c9d2paa5b2ym8qn608hyimr3fbns7nxrhk1bms87cgd8a7sqaf0"; depends=[Rcpp]; }; Rosenbrock = derive2 { name="Rosenbrock"; version="0.1.0"; sha256="0qfdyr66g244jvbnssbnj2b2ng740dr4qmillpnwl4h2hh811syv"; depends=[MASS]; }; @@ -4476,7 +4491,7 @@ in with self; { Rpoet = derive2 { name="Rpoet"; version="1.1.0"; sha256="11gp4zg0wc2a21956355rkr3i3dyaabfz0z30z4phn8s7y3yqr92"; depends=[]; }; Rpolyhedra = derive2 { name="Rpolyhedra"; version="0.5.4"; sha256="00wmxk8j89lyzbb7fws4g8znnqbw5dh64vqhxjg5rxjdpr3vibl8"; depends=[digest geometry git2r lgr R6 rgl stringr XML]; }; Rpoppler = derive2 { name="Rpoppler"; version="0.1-1"; sha256="1hx3c6iqkxfwppv9168d2wrgfsxi1zl29cbi684w7ndvchfly49v"; depends=[]; }; - RprobitB = derive2 { name="RprobitB"; version="1.1.1"; sha256="1f5bnzqj58m07lp17fckwc9h55ngv5l3da54xzrvyzasvjk79031"; depends=[crayon doSNOW foreach ggplot2 gridExtra MASS mixtools mvtnorm plotROC progress Rcpp RcppArmadillo rlang viridis]; }; + RprobitB = derive2 { name="RprobitB"; version="1.1.2"; sha256="1acxgxv4v7id7smrg9f8dfxx9y17pvqwsbfg0n8zdd99q724bpx5"; depends=[cli crayon doSNOW foreach ggplot2 gridExtra MASS mixtools mvtnorm plotROC progress Rcpp RcppArmadillo rlang viridis]; }; Rprofet = derive2 { name="Rprofet"; version="2.2.1"; sha256="150123vxdd31p96f3vsri46ryfng2xvnjgm6mdiqczg48xyfpbdp"; depends=[binr ClustOfVar ggplot2 gridExtra plyr sqldf stringr]; }; Rquake = derive2 { name="Rquake"; version="2.4-4"; sha256="1929qxqbb6s316zb9x2q1kwz2pvwpvqr1w6iw8vm5vijyf1nvv30"; depends=[GEOmap MBA minpack_lm RPMG RSEIS]; }; Rquefts = derive2 { name="Rquefts"; version="1.2-1"; sha256="1v548wys8fd6xqz4hfvqkckl6szjf6zr383n1x0kc6f2pfrc6jnf"; depends=[meteor Rcpp]; }; @@ -4484,10 +4499,11 @@ in with self; { Rraven = derive2 { name="Rraven"; version="1.0.13"; sha256="0nlqr1hzbzbz4rb3hjy01iw8czhaqvwmy9hh728fgl5vajwqwn8g"; depends=[NatureSounds pbapply seewave tuneR warbleR]; }; Rrdap = derive2 { name="Rrdap"; version="1.0.6"; sha256="0lwp80622xnjgfljds0fs64l3c30ijmz495v48j564za4ss4yx9q"; depends=[curl rjson stringr]; }; Rrdrand = derive2 { name="Rrdrand"; version="0.1-16"; sha256="0j9yyvq8r1cgwj3kw1ak6hyazr67f2q0c1m651wdm0wcvm1ajx7f"; depends=[]; }; + RsSimulx = derive2 { name="RsSimulx"; version="2.0.2"; sha256="04z71idb9jhm7cmgm3vwr6y9wlji2q82gd3f73sy0n9sg0cl60dj"; depends=[ggplot2 gridExtra]; }; Rsagacmd = derive2 { name="Rsagacmd"; version="0.2.0"; sha256="1z92fk7j2n6zzplfc3xlhnaynn2i2cp6cq6hw621fmnf09ccq005"; 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]; }; - Rserve = derive2 { name="Rserve"; version="1.8-10"; sha256="0b2x6kqrc23xah6bg7c6ncmq8wkj4z898r2qjwjyinsq965a4qxg"; depends=[]; }; + Rserve = derive2 { name="Rserve"; version="1.8-11"; sha256="118vmylh14avsq4ckx0933hk8j200jkbz88j5rfyx31z95l1vywx"; depends=[]; }; Rsfar = derive2 { name="Rsfar"; version="0.0.1"; sha256="1xskvvvavkdyjhb99qlii9qc0q1m36mxx6g0ybgwbq26lq4ypq7l"; depends=[fda]; }; Rsgf = derive2 { name="Rsgf"; version="1.0.0"; sha256="1d2bk20ixnfkzbimvsj56arf7brgkwlyrs80snfn5cnvmwic0h8i"; depends=[ggplot2 png stringi stringr]; }; RsimMosaic = derive2 { name="RsimMosaic"; version="1.0.3"; sha256="0jlzrs9xxlpazvq3iw8znk0bd00bzlry7bgxsxq7xl23akizj0ji"; depends=[fields jpeg RANN]; }; @@ -4496,7 +4512,7 @@ in with self; { Rsomoclu = derive2 { name="Rsomoclu"; version="1.7.6"; sha256="1jbi4nib0a749k7vkqzhdb5l2jipxq9k8vi5x7i06qns8sb3ajil"; depends=[kohonen Rcpp]; }; 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]; }; - RsqMed = derive2 { name="RsqMed"; version="0.1.7.1"; sha256="18r78svwbnri5283s5nxg4vrp29r6xx13h0n6w634jdpwaiw56gk"; depends=[GMMAT SIS]; }; + RsqMed = derive2 { name="RsqMed"; version="0.2.1.0"; sha256="0answ66a9gi38lw48xjvb0f2cpifxi9c5iwlghwh26baffqp9m64"; depends=[GMMAT SIS]; }; Rssa = derive2 { name="Rssa"; version="1.0.5"; sha256="0bajpvrj7cfch7v83dl2swa62kd59xk0lavjcx20lczvd9iijn27"; depends=[forecast lattice svd]; }; Rstg = derive2 { name="Rstg"; version="0.0.1"; sha256="1rghac9sjld03rw1sbq2r7rs2fzf3a2xikjb47cfdnk1r73ziysf"; depends=[reticulate]; }; RstoxData = derive2 { name="RstoxData"; version="1.2.1"; sha256="0xfznv0nl7xymlxbd7g0lbxqw1zcyc9mm4mx0nwpw896vz7dvyvw"; depends=[data_table Rcpp stringi units xml2 xslt]; }; @@ -4513,9 +4529,8 @@ in with self; { Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.11"; sha256="1fbls9hy4s0hdszg449bpapx2mhknwiasvr15djf9f1hm0b2908p"; depends=[]; }; Rtwalk = derive2 { name="Rtwalk"; version="1.8.0"; sha256="0zxf66lsfq8by40flv34xzd5yy0wa1ah9li1d0h7f0yh9nbwhxl5"; depends=[]; }; Runuran = derive2 { name="Runuran"; version="0.37"; sha256="18gvv8kih58dw1xz57xnz86mhd0mpn311m1mkjqhcj0z4gkjiwwh"; depends=[]; }; - Rvcg = derive2 { name="Rvcg"; version="0.21"; sha256="13b3l72ii7ndzmglf48xz1lm7kkpsca2q6148ihgbrpnv9n0w5r1"; depends=[Rcpp RcppArmadillo RcppEigen]; }; + Rvcg = derive2 { name="Rvcg"; version="0.22"; sha256="1c9s0wp4n5bz32s5h9h18sxk69fri7ikl8yx490inb6znwh7hkgc"; depends=[Rcpp RcppArmadillo RcppEigen]; }; Rvmmin = derive2 { name="Rvmmin"; version="2018-4.17.1"; sha256="0kl1h4mlvb1bngb40r3dhrjkpnh3lsqddis65hbjzm2pzz20l02m"; depends=[optextras]; }; - Rvoterdistance = derive2 { name="Rvoterdistance"; version="1.1"; sha256="16il36hkq1j6gyl5d8bx5khiiv6fy2m8vkhwiaaiqsliw2sspy4j"; depends=[Rcpp]; }; Rwave = derive2 { name="Rwave"; version="2.6-5"; sha256="1r72kcc5f9k38ks39nh9x1y7k1kxrbyv7lywqpsy7wknnddzg7kc"; depends=[]; }; Rwclust = derive2 { name="Rwclust"; version="0.1.0"; sha256="0c7q2i9n22sqj3wq9m0j49y5h14848myjbixrdkic8lvv91dm438"; depends=[checkmate Matrix]; }; RweaveExtra = derive2 { name="RweaveExtra"; version="1.0-0"; sha256="1jg4dn2x8d74z0wy9j9azvb8f1g0449ji5yl6g964lv2g3fpq6qh"; depends=[]; }; @@ -4523,7 +4538,6 @@ in with self; { 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.2"; sha256="0lxjzznigk4i8lzga88m0i6x2j5c5q79rvs5knd762ycfxwlmx6w"; 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]; }; 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]; }; @@ -4544,12 +4558,14 @@ in with self; { SAMM = derive2 { name="SAMM"; version="1.1.1"; sha256="175jk3s9w68ccw1h019380lp9cajfsy3zigcnplp87pcn3qg7x2i"; depends=[Rcpp RcppArmadillo]; }; SAMTx = derive2 { name="SAMTx"; version="0.3.0"; sha256="18r03w74fcra3c0xa76jnkkms9pjirdmgb2k1dnz7symqf9cvc5l"; depends=[BART]; }; SAMUR = derive2 { name="SAMUR"; version="1.1"; sha256="1ihxr455hxpk3mz113j7ai36lw9i4v60yd4x50j7npzcpq5r0mwk"; depends=[Matching]; }; - SAMtool = derive2 { name="SAMtool"; version="1.4.0"; sha256="09waiyiq4nvc5dx2dycb4xxb83k7k4z3yv3lx8cdh5d4lx9v6hj7"; depends=[corpcor dplyr gplots MSEtool RcppEigen rmarkdown snowfall TMB vars]; }; + SAMtool = derive2 { name="SAMtool"; version="1.4.1"; sha256="0628iahnik4k67lfk06h6g5bn47584mxi4pia0cyi79nzbw0782k"; depends=[corpcor dplyr gplots MSEtool RcppEigen rmarkdown snowfall TMB vars]; }; + SAP = derive2 { name="SAP"; version="1.0"; sha256="129szqkh4snlqn5q09yaqf6sd04nvai3a0ifk0b36yrqj92v6fd1"; depends=[BSDA]; }; 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]; }; + SARP_moodle = derive2 { name="SARP.moodle"; version="0.9.1"; sha256="115zr99lwlrgy56xrls1x0wa64jm04xwr2a39kihy3wx8j49rb2n"; depends=[base64enc]; }; SAScii = derive2 { name="SAScii"; version="1.0.1"; sha256="04cns0mvff7crbsv8vld3qwjrj280jzbx25m9d03l9wa4ba2djny"; depends=[]; }; + SASdates = derive2 { name="SASdates"; version="0.1.0"; sha256="1413x0biid7972zz2qqv22h26a738mp7n97gpxxs9rykxkw3bfr5"; depends=[]; }; SASmarkdown = derive2 { name="SASmarkdown"; version="0.8.0"; sha256="16bfad9rp0yi9pph2m3f7bkkaiv2q41gkw5ji15x3ngqibv0khyi"; depends=[knitr xfun]; }; SASmixed = derive2 { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; }; SAVER = derive2 { name="SAVER"; version="1.1.2"; sha256="1s1kw8idkaj7j90fw4qn9k0wd4vz0sblsk06ry6lm4afcar0p158"; depends=[doParallel foreach glmnet iterators Matrix]; }; @@ -4558,7 +4574,6 @@ in with self; { 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]; }; SBSDiff = derive2 { name="SBSDiff"; version="0.1.0"; sha256="0mw1646dmhxw6zz4pq7j0g3mf9bjn72g43sq7m72r8ma8ciqj7r2"; depends=[]; }; SBdecomp = derive2 { name="SBdecomp"; version="1.2"; sha256="0p3f028c674j6bl82sgmbwlim2hljxm38qiff78pzn5yx34y3r0b"; depends=[survey twang]; }; SBmedian = derive2 { name="SBmedian"; version="0.1.1"; sha256="1pxwsp6z1qvhmzprhr8f8i1id5zy4ppq7dxbd6ny2h1r1zvy16xm"; depends=[expm Rcpp RcppArmadillo Rdpack]; }; @@ -4589,7 +4604,7 @@ in with self; { SCRT = derive2 { name="SCRT"; version="1.3.1"; sha256="0wkxc22hv08riivjl09lhxvffqxxdy4xnvdmc2y69gssyinkbln1"; depends=[]; }; SCVA = derive2 { name="SCVA"; version="1.3.1"; sha256="1gdicpnbr8bdgrbwwslpwpzw2adpp94p8nhsrkdx0bjlpfhd4g9h"; depends=[ggExtra ggplot2 plotly scales]; }; SCperf = derive2 { name="SCperf"; version="1.1.1"; sha256="1kqi3sv9ds58l20pdcnjrrbf7fin82j73yqj5rbx4kjdw560ylb2"; depends=[]; }; - SCpubr = derive2 { name="SCpubr"; version="1.0.2"; sha256="0zkp7has7y571kq1bf840mrgwwqi0ks2ka94gax3m8z205w5z3ns"; depends=[]; }; + SCpubr = derive2 { name="SCpubr"; version="1.0.4"; sha256="10np0w5zqmqjg6k8cnipclh8pqrw81187q0zlicm42w4q4dyvgzn"; depends=[]; }; SCtools = derive2 { name="SCtools"; version="0.3.2.1"; sha256="0pw0kpqv4hzskfigl7ch509jj2cmp674l9ms2ivbx3sxq9l0hhj1"; depends=[cvTools dplyr furrr future ggplot2 magrittr purrr stringr Synth]; }; SDAR = derive2 { name="SDAR"; version="0.9-55"; sha256="1a1dy4wpzhfaqxv4x8knazh4kjx042rnkmvxf62r6wkgbfvq4r6b"; depends=[grImport2 linbin readxl]; }; SDAResources = derive2 { name="SDAResources"; version="0.1.1"; sha256="13zb8sx7913wpj1jhi5sb0ps8fgzxfvjx75p218n166w54rxjqjs"; depends=[]; }; @@ -4598,6 +4613,7 @@ in with self; { SDLfilter = derive2 { name="SDLfilter"; version="2.3.0"; sha256="1187mcn41l7qqxq130qk5cyh7dcv69b5n07hjcilkpaz5rl6wl2w"; depends=[data_table dplyr emmeans geosphere ggmap ggplot2 ggsn gridExtra lubridate maps plotKML pracma sf stars]; }; SDMPlay = derive2 { name="SDMPlay"; version="2.0"; sha256="1qdvpa57p4p3949rjmvvvz41a3hm3jb34dnn8s2pi04rzrjkys0f"; depends=[dismo raster]; }; SDMtune = derive2 { name="SDMtune"; version="1.1.6"; sha256="13q3yy6jj6b42k2bgwv40m06kpl5hpc9f4ysvdh6p3x80qxq3cgh"; depends=[dismo gbm ggplot2 jsonlite maxnet nnet progress randomForest raster Rcpp rlang rstudioapi stringr whisker]; }; + SDPDmod = derive2 { name="SDPDmod"; version="0.0.1"; sha256="17wyymjip84dxpncz6kqg32wlwn5qgw7x54djg301wqmvpjyl2y8"; depends=[Matrix plm RSpectra sf sp spdep]; }; SDPrism2D = derive2 { name="SDPrism2D"; version="0.1.1"; sha256="1f1k6lk0fh9dz11703fpbmvjl2gyq4y7l4khigl1h69j9xv97yf3"; depends=[]; }; SDT = derive2 { name="SDT"; version="1.0.0"; sha256="1jwpfd1pnzy9wcl90qv5bgwi19shsw9064dvml9zwbif8yw8dzjj"; depends=[quadprog]; }; SDaA = derive2 { name="SDaA"; version="0.1-5"; sha256="1gs29jaj46i2bhbnpa0s6bhdrylz1s6wnif5cyc5m7xl19s413gb"; depends=[]; }; @@ -4624,7 +4640,7 @@ in with self; { SGPdata = derive2 { name="SGPdata"; version="26.0-0.0"; sha256="1l0d9l25nzmiwmwh0b3cm7c854h56ir0qmb70mi8jawnirmilpp2"; depends=[crayon data_table]; }; SHAPforxgboost = derive2 { name="SHAPforxgboost"; version="0.1.1"; sha256="106nsf02b1w3yshb55lwnyw1rl1a60162v2wk8znjz3b4ln3mqj5"; depends=[BBmisc data_table ggExtra ggforce ggplot2 ggpubr RColorBrewer xgboost]; }; SHELF = derive2 { name="SHELF"; version="1.8.0"; sha256="05kr2y5wqbpw3ajf5pbhhfyqv7n3zw3kb7ba2j24sr62jlin3avv"; depends=[ggExtra ggplot2 ggridges gridExtra Hmisc MASS rmarkdown scales shiny shinyMatrix tidyr]; }; - SHT = derive2 { name="SHT"; version="0.1.7"; sha256="0dj6z07qagk9wjp50b9w078zcvdss99cj0xalykwl63l1l96w6cw"; depends=[flare pracma Rcpp RcppArmadillo Rdpack]; }; + SHT = derive2 { name="SHT"; version="0.1.8"; sha256="03mzjm0hx1i8jz7gam19zyr5w6whwk7a3gfid68h5hj8x60p04wx"; depends=[flare pracma Rcpp RcppArmadillo Rdpack]; }; SI = derive2 { name="SI"; version="0.2.0"; sha256="0i6kpaw5yk39skm77nf56ai25clkparz3l8qx0223jrmdqbf97b7"; depends=[]; }; SIBER = derive2 { name="SIBER"; version="2.1.6"; sha256="1ymr1y2c984nnjkj5nwc1mi4ixdwg8d191nn58i0dvckzm922z80"; depends=[dplyr ggplot2 hdrcde magrittr mnormt purrr rjags spatstat spatstat_geom spatstat_utils tidyr]; }; SIBERG = derive2 { name="SIBERG"; version="2.0.3"; sha256="1d8kx5m86qil50d8fhwn7lwaigdnppzk0cwyh4hv54lwffpclnki"; depends=[mclust]; }; @@ -4634,6 +4650,7 @@ in with self; { 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]; }; SIMEXBoost = derive2 { name="SIMEXBoost"; version="0.1.0"; sha256="0gxw8xb2hvsizawfd863c268q5wq1cdsmdsand5iys2b9gry1pmq"; depends=[MASS]; }; + SIMICO = derive2 { name="SIMICO"; version="0.2.0"; sha256="0inyiv2ccz6amdwy94liln0lfs9f12nwq6l0wcqvj42idyjas4ky"; depends=[bindata CompQuadForm fastGHQuad ICSKAT]; }; SIMMS = derive2 { name="SIMMS"; version="1.3.2"; sha256="1pdbgqndnhgyfcwgr5ijnnmn64cwlalwbanb2grkm7h80bpql3lw"; depends=[doParallel foreach glmnet MASS randomForestSRC survival]; }; SIMPLE_REGRESSION = derive2 { name="SIMPLE.REGRESSION"; version="0.1.5"; sha256="01bqakis3piwdpm04h9k7p9qyzfaxw9lf6r70rja1kv8w4aprlxm"; depends=[nlme]; }; SIPDIBGE = derive2 { name="SIPDIBGE"; version="0.1.7"; sha256="0n937v4m5a39waqqks640bvmnclzg4r2x4v36nr985xw153m9pj9"; depends=[cli COVIDIBGE PNADcIBGE png PNSIBGE purrr rstudioapi tibble]; }; @@ -4676,7 +4693,7 @@ in with self; { SMVar = derive2 { name="SMVar"; version="1.3.4"; sha256="1mh15iggzbd7ip15pkwzmiy8p712cvvns5pgdyw1pvkcvbvkxsma"; depends=[]; }; SNFtool = derive2 { name="SNFtool"; version="2.3.1"; sha256="05hz230aq5wbzhknxzr4iqv3nqjhbpf66n6bp1rc5h2jgz2yfbwq"; depends=[alluvial ExPosition]; }; SNPannotator = derive2 { name="SNPannotator"; version="0.2.5.0"; sha256="1fkiv1xifkwcsh26dca6jr6plqxwbnmlbs9amimdn3hljkzmlxbf"; depends=[data_table doParallel foreach ggplot2 httr jsonlite kableExtra openxlsx progress rmarkdown xml2]; }; - SNPassoc = derive2 { name="SNPassoc"; version="2.0-17"; sha256="12pzkrxd6hi76x160xkgbg7csqp2jw5yvj9sz0079zry7n03kqlc"; depends=[BiocStyle Biostrings GenomicRanges ggplot2 haplo_stats IRanges mvtnorm org_Hs_eg_db plyr poisbinom S4Vectors survival tidyr TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; }; + SNPassoc = derive2 { name="SNPassoc"; version="2.0-18"; sha256="0karxsv4ilxscm51sj9yhm17xfnxvh3bkxvsmmvsypf4mpa1ks0a"; depends=[Biostrings ggplot2 haplo_stats mvtnorm plyr poisbinom survival tidyr]; }; SNPfiltR = derive2 { name="SNPfiltR"; version="1.0.0"; sha256="03a6ym4pc39yb2ijyw957aisksz7m8lrpjbrnyqzndxyvdn5pgbi"; depends=[adegenet cluster ggplot2 ggridges gridExtra Rtsne vcfR]; }; SNPknock = derive2 { name="SNPknock"; version="0.8.2"; sha256="121pdgvdffj61hw8x8m76na0cg5iw5gb586q05ikw5d959mmbzrs"; depends=[Rcpp RcppArmadillo RcppProgress Rdpack]; }; SNSchart = derive2 { name="SNSchart"; version="1.4.0"; sha256="18rpg2zkqa6bxnbq3s0hlsg4wizz6iw3vckf5z66q3awxqycabg9"; depends=[MASS]; }; @@ -4719,7 +4736,7 @@ in with self; { SPREDA = derive2 { name="SPREDA"; version="1.1"; sha256="0fn4p5apjq8zgd3zms2b88ga5wbsv86y59ac5x06w75rf071xglv"; depends=[nlme survival]; }; SPSL = derive2 { name="SPSL"; version="0.1-9"; sha256="0kf6mmbvavid3dw2l4fkclk669wi13wkyykhwn5272d6qnhlhhca"; depends=[]; }; SPSP = derive2 { name="SPSP"; version="0.1.1"; sha256="0bzlgjijwp5y6lk9hjqc2p8b1i6mp8jd7j7gsl47whc3lavr1nn8"; depends=[glmnet lars Rcpp]; }; - 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]; }; + SPUTNIK = derive2 { name="SPUTNIK"; version="1.4.1"; sha256="0446qh43q09l7kvcgsp4gkp7p9v9448xx0xwngxgghnnmwh8fa4p"; depends=[doSNOW e1071 edgeR foreach ggplot2 imager infotheo irlba reshape spatstat_explore spatstat_geom viridis]; }; SPYvsSPY = derive2 { name="SPYvsSPY"; version="0.1.1"; sha256="1hxc73wwrzqh1r1xr9yd4hy4ma24virg4iv978lfyc9f9n56znp5"; depends=[]; }; SPlit = derive2 { name="SPlit"; version="1.2"; sha256="0n9458sj5sw4k9qd11gvmqmjf9hy1hh0bwx1jzm6r901l1wbp7xi"; depends=[Rcpp RcppArmadillo]; }; SPmlficmcm = derive2 { name="SPmlficmcm"; version="1.4"; sha256="1acs3560a7h6xx286m40abr9b7i5qihn6wni8flj0biahmsszzx6"; depends=[nleqslv]; }; @@ -4729,9 +4746,9 @@ in with self; { SQUAREM = derive2 { name="SQUAREM"; version="2021.1"; sha256="0n1s32l9p4vdm3h5q6g43s0qbpzry08difsh0yay80wrla6f3rb6"; depends=[]; }; SRCS = derive2 { name="SRCS"; version="1.1"; sha256="13zf3cqs53w68f9zc1fkb9ql84rvzn7g1hbykqrbvss8hjaq8x1r"; depends=[]; }; SRS = derive2 { name="SRS"; version="0.2.3"; sha256="0nx1sj91xkwplcmflq9c21zndaa4m21m9iqax86v947k070q48ql"; depends=[DT shiny shinybusy shinycssloaders vegan]; }; - SRTsim = derive2 { name="SRTsim"; version="0.99.2"; sha256="156vks38apxpx7v7qljmhn6lka2lmrd8p939d69ykrvmpi3cnqyw"; depends=[concaveman dashboardthemes ggplot2 ggpubr magrittr MASS Matrix matrixStats Morpho pdist plotly S4Vectors sf shiny shinyBS shinydashboard sp spatstat_geom spatstat_random viridis]; }; + SRTsim = derive2 { name="SRTsim"; version="0.99.3"; sha256="1l59x6gv6ya2s2wn7ccrn0jvb0hsc6f8wxvn3pwklz37467b94s6"; depends=[concaveman dashboardthemes ggplot2 ggpubr magrittr MASS Matrix matrixStats Morpho pdist plotly S4Vectors sf shiny shinyBS shinydashboard sp spatstat_geom spatstat_random viridis]; }; SRTtools = derive2 { name="SRTtools"; version="1.2.0"; sha256="1203i6nqclx0faxyvhdaapmfxy8h95jj83svxriqh1hpava5s1dy"; depends=[magrittr]; }; - SSBtools = derive2 { name="SSBtools"; version="1.3.4"; sha256="11hmabl79p67j5yn6wan4ahiqn84mbsw0k6zkasc5wkfscxl1p5d"; depends=[MASS Matrix stringr]; }; + SSBtools = derive2 { name="SSBtools"; version="1.3.8"; sha256="1vc15wcg8469vplxykzs3g5nb7a5nr2v8zdypj1gaghalv00iadf"; depends=[MASS Matrix stringr]; }; SSDM = derive2 { name="SSDM"; version="0.2.8"; sha256="19l78dkjk76ababkd7xsfn0fy99khfa4i502q4vllpvch4cjz51c"; depends=[dismo e1071 earth gbm ggplot2 mgcv nnet poibin randomForest raster reshape2 rpart scales shiny shinydashboard shinyFiles sp spThin]; }; SSDforR = derive2 { name="SSDforR"; version="1.5.28"; sha256="197rg6mar869wc83khzgdv28kpsc5b8gd0pqczvfcxzvqmwaiwgw"; depends=[Kendall MAd MASS metafor psych SingleCaseES TTR]; }; SSHAARP = derive2 { name="SSHAARP"; version="1.1.0"; sha256="0x8dinhhfk4q1cck7ms78f4k23430c4wyvlh2qclq0c83acjj4y9"; depends=[BIGDAWG data_table DescTools dplyr filesstrings gmt gtools stringr]; }; @@ -4739,7 +4756,7 @@ in with self; { SSLR = derive2 { name="SSLR"; version="0.9.3.3"; sha256="0fv1jqri3gpzcfs429pgx4hjqmjrglb4g7nfqdihd2hjmq9k4sql"; depends=[conclust dplyr foreach generics magrittr parsnip plyr proxy purrr RANN Rcpp RcppArmadillo rlang RSSL]; }; SSM = derive2 { name="SSM"; version="1.0.1"; sha256="1h8yyzh5rn5jay70kyzvwirfndi049a5w28qigrjv5rxd7ml84l7"; depends=[]; }; SSN = derive2 { name="SSN"; version="1.1.15"; sha256="057lh2ym82ff3c25vyh97csns4jwlbvxwc4jai0i4yplxf0ccmha"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; }; - SSNbayes = derive2 { name="SSNbayes"; version="0.0.1"; sha256="0kp7c4pynisqji6lfwnklsvjbwx44424qkyd4syhsn3rrr510ph5"; depends=[dplyr plyr rstan SSN]; }; + SSNbayes = derive2 { name="SSNbayes"; version="0.0.2"; sha256="0y5n9c9a6kd53ijai18arpsm09jp3v3f31zgg22y0pz6i3y24hm3"; depends=[dplyr plyr rstan SSN]; }; SSOSVM = derive2 { name="SSOSVM"; version="0.2.1"; sha256="11wlalpw6yhvv95xr8vvgxgl4jafc2ghzsk5wqyv71ahxarmrlss"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; }; SSP = derive2 { name="SSP"; version="1.0.1"; sha256="0ccg81rsjki1fcqvj6lgmmmy5yw1gxy8khajl1i80qyi4v7ny9hk"; depends=[ggplot2 sampling vegan]; }; SSRA = derive2 { name="SSRA"; version="0.1-0"; sha256="1d0lg2dz8vf1d63366s5apm0ygrsfxivbrsij907r244zj6i1c37"; depends=[shape stringr]; }; @@ -4763,16 +4780,18 @@ in with self; { STMr = derive2 { name="STMr"; version="0.1.5"; sha256="1wz88y1fr2z7jwmni063j4rk1smbpbmgz6aw9cgfivz7gsps879n"; depends=[dplyr ggfittext ggplot2 magrittr nlme quantreg tidyr]; }; STOPES = derive2 { name="STOPES"; version="0.2"; sha256="0dlr9hasily74wlwb44qadql9qdii326xhdnam1anszsvijzs4dk"; depends=[changepoint cvTools glmnet MASS]; }; STPGA = derive2 { name="STPGA"; version="5.2.1"; sha256="0mwjv9r7x925ljmbwk2fl0xvf2n2hnf5n5z5p5rxr57ywvirqw1b"; depends=[AlgDesign emoa scales scatterplot3d]; }; + STREAK = derive2 { name="STREAK"; version="0.1.0"; sha256="0y6m7m2wpksymqnp4h1vangg70nz3qk1crd12g69smr02lg3amnk"; depends=[Ckmeans_1d_dp Matrix Seurat SPECK VAM]; }; STRMPS = derive2 { name="STRMPS"; version="0.5.8"; sha256="0vlmhrna0laqzjpbg4sgnscrli3cly2lc5d69n6iqfl213zsfz78"; depends=[Biostrings dplyr IRanges purrr ShortRead stringr tibble tidyr]; }; 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]; }; SUMMER = derive2 { name="SUMMER"; version="1.3.0"; sha256="082ziawqkqgq18ghy46fgk7l5d1k9ls135qbzqkmb4xwiy1v2avm"; depends=[data_table ggplot2 ggridges Matrix RColorBrewer reshape2 scales shadowtext sp spdep survey survival viridis]; }; SUNGEO = derive2 { name="SUNGEO"; version="0.2.292"; sha256="1xav5by7sl21cwfg9m1ij1lz1kvdlqkkp2ah67rnj9vp4vk7nkfg"; depends=[automap cartogram data_table dplyr fasterize httr jsonlite measurements packcircles purrr RANN raster Rcpp RCurl rlang rmapshaper sf sp spdep]; }; - SVDNF = derive2 { name="SVDNF"; version="0.1.0"; sha256="13cangmx4srinrm42vc9qy24qghs2m8zb7lf0p3mc412z9n0r4px"; depends=[Rcpp]; }; + SUSY = derive2 { name="SUSY"; version="0.1.0"; sha256="0l0mxvas80d9n3vv9bqxw2dk8q1ikwg616hraprcs70aabh7717w"; depends=[]; }; + SVDNF = derive2 { name="SVDNF"; version="0.1.1"; sha256="1di3x4yx5hv0lzy7mydaq927qyl69dybqd6mh99h9scyxdilvjyd"; depends=[Rcpp]; }; SVMMaj = derive2 { name="SVMMaj"; version="0.2.9.1"; sha256="08f9sndcjgmmxl3zlbq86d8z0dbciv0ab1v9zx80svka7ckfv9z3"; depends=[dplyr ggplot2 gridExtra kernlab reshape2 scales]; }; SVN = derive2 { name="SVN"; version="1.0.1"; sha256="0n93lqb1f2s2qvzc8lrcqmr0fhd57xqbi0ymrqqmll31ns679m92"; depends=[data_table igraph memoise]; }; SWIM = derive2 { name="SWIM"; version="1.0.0"; sha256="1pfrwxn4rha7a68b82lq18x6acyhjy9d8nn2hdwd9hhf576vkvhg"; depends=[ggplot2 Hmisc nleqslv plyr Rdpack reshape2]; }; - SWMPr = derive2 { name="SWMPr"; version="2.4.1"; sha256="1dqhsqigfbfj167mp2h0wfybaymj9zlywh5d3syrrmpr694f9kz5"; depends=[data_table dplyr ggplot2 gridExtra httr lattice maptools oce openair RColorBrewer reshape2 tictoc tidyr XML zoo]; }; + SWMPr = derive2 { name="SWMPr"; version="2.4.2"; sha256="0lllfc5ixhhpx17fmm6rziphikc3r4k3i8cr8gjwghg9j94rc5mp"; depends=[data_table dplyr ggplot2 gridExtra httr lattice maptools oce openair RColorBrewer reshape2 tictoc tidyr XML zoo]; }; SWMPrExtension = derive2 { name="SWMPrExtension"; version="2.2.3"; sha256="1ig5wvf1h89v65xh1p69ab57flmlafjc02kgkcq3nfvm904ida4i"; depends=[broom dplyr EnvStats flextable ggimage ggplot2 ggthemes lubridate magrittr officer purrr RColorBrewer rlang scales sf SWMPr tidyr tidyselect]; }; SWTools = derive2 { name="SWTools"; version="0.2.4"; sha256="1azhmsb00mndqza0cb0nslyyc1c2d9lc1y6p19ibisizqdr04sqx"; 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]; }; @@ -4781,7 +4800,7 @@ in with self; { SampleSize4ClinicalTrials = derive2 { name="SampleSize4ClinicalTrials"; version="0.2.3"; sha256="0s8svsgwh79rcwnskz0my2xqasyp370hn7aixqm9m6zqlvf42zc2"; 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-3"; sha256="0lqzj91qx52icvcswhv81y9ck78gcjycnj0z36mgks6zs9zfpiyv"; depends=[doParallel glue memoise pbapply SamplingBigData]; }; + SamplingStrata = derive2 { name="SamplingStrata"; version="1.5-4"; sha256="093x9rfilxhgf75p0rfsvglz0sg3imhdm15azxnjiblamyxbhfjm"; depends=[doParallel glue memoise pbapply SamplingBigData]; }; SanFranBeachWater = derive2 { name="SanFranBeachWater"; version="0.1.0"; sha256="18w2q3hzcrbmagnjyrn1ikwiyjh723mjb2vy0d8p1a6za0460p9w"; depends=[dplyr lubridate magrittr readr rvest tibble xml2]; }; SangerTools = derive2 { name="SangerTools"; version="1.0.2"; sha256="0ijxfa1h3mx86jk1s27qp7l4sz2d7i7llkwjvgnih9zjk0ybrdzw"; depends=[DBI dplyr ggplot2 ggtext ggthemes janitor magrittr odbc readr readxl rlang scales tibble]; }; ScaleSpikeSlab = derive2 { name="ScaleSpikeSlab"; version="1.0"; sha256="11n3pi15x77by0ikiawhnvlky6hp6qzwmsmp4l2hjng1469y7gg6"; depends=[Rcpp RcppEigen TruncatedNormal]; }; @@ -4809,8 +4828,7 @@ in with self; { Sejong = derive2 { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; }; SeleMix = derive2 { name="SeleMix"; version="1.0.2"; sha256="03q5pdgxdfx944zwpl2w7gzf23va4flbd8in3g03980smq0ai2c1"; depends=[mvtnorm]; }; Select = derive2 { name="Select"; version="1.4"; sha256="1qx4wwxxwjq31vf645xvwb0y2z5h4v6ca8fcrfpaj5kc33f333v2"; depends=[ade4 FD lattice latticeExtra Rsolnp]; }; - SelectBoost = derive2 { name="SelectBoost"; version="2.2.0"; sha256="1j525phl1b2b0f4b08az8p74mcgcnmv261d0sqrii8p44474zsy4"; depends=[abind Cascade glmnet igraph lars msgps Rfast spls varbvs]; }; - SelvarMix = derive2 { name="SelvarMix"; version="1.2.1"; sha256="02d16ffw5syq0d3yiim9jgrjlz99n956zxp23idpsmq6lb2whq66"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; }; + SelectBoost = derive2 { name="SelectBoost"; version="2.2.2"; sha256="189hdr50sikg6pr9x9amjmgg9z0c95j65bddmifsy7zvjhllzjiy"; depends=[abind Cascade glmnet igraph lars msgps Rfast spls varbvs]; }; 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.2.0"; sha256="1yhhva79hhj1imzw0n8wkyrb6pmxcqs7kq9czs392xzc6lqk9xr2"; depends=[easycsv knitr]; }; @@ -4839,8 +4857,8 @@ in with self; { 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.2.0"; sha256="1vzb2k21nnzlky5dbf586wnixffz7wc9ncrpbgdw8md2kcmd58r2"; 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.1.2"; sha256="03bd4fazcafaf5mp37cf9w6bxm9zwrlxkrqm9bjdnwxm07slanba"; depends=[future future_apply Matrix progressr Rcpp RcppEigen rgeos rlang sp]; }; + Seurat = derive2 { name="Seurat"; version="4.3.0"; sha256="0z7rzxi1gli56k50s6w1363ndw18wykgk5xmc3g7jhpphqxwpfky"; depends=[cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges httr ica igraph irlba jsonlite KernSmooth leiden lmtest MASS Matrix matrixStats miniUI patchwork pbapply plotly png progressr RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR Rtsne scales scattermore sctransform SeuratObject shiny spatstat_explore spatstat_geom tibble uwot]; }; + SeuratObject = derive2 { name="SeuratObject"; version="4.1.3"; sha256="1lw6v5mwq0sngjr33j99r5h42kaxlbq271a51xzkcnhnyra2fpaq"; depends=[future future_apply Matrix progressr Rcpp RcppEigen rlang sp]; }; ShapeChange = derive2 { name="ShapeChange"; version="1.4"; sha256="1ch7avx8mxjk8vrp17inaihmbsv968wflyk1n4fbjvacbl24vn2b"; depends=[coneproj quadprog]; }; ShapePattern = derive2 { name="ShapePattern"; version="2.2.0"; sha256="0x4a9qg5g44kdras8j7f0yyw44qfpizpmj657xgmbrwcai4ic1dh"; depends=[igraph landscapemetrics raster rgdal rgeos sp]; }; ShapeRotator = derive2 { name="ShapeRotator"; version="0.1.0"; sha256="1pg2m1wh7fbchm8gp3mngfnf5g2rbhvzim1bpzqyvxqpx6ynicsa"; depends=[plot3D]; }; @@ -4865,7 +4883,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.5.1"; sha256="1wb7w0pfahl3c8w8a8finlmrnvsickip17immriibanl3ppyrxzz"; depends=[formula_tools Matrix msm mvtnorm plyr survey]; }; - Signac = derive2 { name="Signac"; version="1.8.0"; sha256="01nxl6v6zr14m4n6f8z9r004766s7945j5nxwv3i2w879lzi4jww"; depends=[BiocGenerics data_table dplyr fastmatch future future_apply GenomeInfoDb GenomicRanges ggplot2 IRanges irlba Matrix patchwork pbapply Rcpp RcppRoll Rsamtools S4Vectors scales SeuratObject stringi tidyr tidyselect vctrs]; }; + Signac = derive2 { name="Signac"; version="1.9.0"; sha256="1a5gwfsr7fdc8405d23zxs9m54viik7m07xa1m1gs6argr13dzxq"; depends=[BiocGenerics data_table dplyr fastmatch future future_apply GenomeInfoDb GenomicRanges ggplot2 IRanges irlba Matrix patchwork pbapply Rcpp RcppRoll Rsamtools S4Vectors scales SeuratObject stringi tidyr tidyselect vctrs]; }; SignacX = derive2 { name="SignacX"; version="2.2.5"; sha256="0b38k3lxca985mqwvbbdczkjnn2x79kga05yw995gb6d20cjh96v"; depends=[igraph jsonlite lme4 Matrix neuralnet pbmcapply RColorBrewer RJSONIO Seurat]; }; SignifReg = derive2 { name="SignifReg"; version="4.3"; sha256="1f57zbc7746jr2hfgri29whw5nb7w8h9nwk2p2n851b1rf7q0mgp"; depends=[car]; }; Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="4.8"; sha256="16pzcs1g5ihza9a2glnkgd5pxi77l6w34vkn0vxcb78gc6syhbrd"; depends=[Deriv MASS]; }; @@ -4888,8 +4906,9 @@ in with self; { SimRVPedigree = derive2 { name="SimRVPedigree"; version="0.4.4"; sha256="0z7wwwl814bwaijkmg9wcdj5xisiamc9yqypmk0hzj950569aj8p"; depends=[dplyr kinship2]; }; SimReg = derive2 { name="SimReg"; version="3.3"; sha256="1liwwbi3zqrcbqx5przdlzhnq7jvyjd6yhaxalhwggzf9zv7w8ci"; depends=[ontologyIndex ontologyPlot ontologySimilarity Rcpp]; }; SimSCRPiecewise = derive2 { name="SimSCRPiecewise"; version="0.1.1"; sha256="0mhlx9m5db8a40wf275qh59345676m8bpjjmyx1v22f6m9p3b2n4"; depends=[]; }; + SimSST = derive2 { name="SimSST"; version="0.0.4.7"; sha256="0gjk9crif1z2kcqrk8ry6v72ykn0y5k9b1ar9qa8rqbq860f7wmx"; depends=[dplyr gamlss_dist]; }; SimSeq = derive2 { name="SimSeq"; version="1.4.0"; sha256="068gg484w07qb4wajik2s3z79xfj0jg5l4pz69267dxi5kzd9fas"; depends=[fdrtool]; }; - SimSurvNMarker = derive2 { name="SimSurvNMarker"; version="0.1.2"; sha256="1k62n56mzxv40j0g7631g6r18sgddwsl59wlyi0s5rzwjmiwpbgk"; depends=[Rcpp RcppArmadillo]; }; + SimSurvNMarker = derive2 { name="SimSurvNMarker"; version="0.1.3"; sha256="0ngr6cbhg3ccsm0v5mf3871pzxzmdprdap3kljfi8w6rrah830fx"; depends=[Rcpp RcppArmadillo]; }; SimSurvey = derive2 { name="SimSurvey"; version="0.1.5"; sha256="1i417kp7lcd7a19bna2y29sirgv30bb3xs8i4a2l6zmbq0kqsgf8"; depends=[data_table doParallel foreach magrittr plotly progress raster rlang sp]; }; SimTimeVar = derive2 { name="SimTimeVar"; version="1.0.0"; sha256="1x0lkgqwx1vz1gbyvy0hx20n638n30j0dny1iz5vs0cvviq3cdv8"; depends=[car corpcor ICC metafor miscTools mvtnorm plyr psych]; }; SimVitD = derive2 { name="SimVitD"; version="1.0.2"; sha256="1ddzp43bnna6n96h6qkqfis1l7mihf20wcy98cn37ri96zacwly4"; depends=[simpleboot]; }; @@ -4915,8 +4934,8 @@ in with self; { Sleuth3 = derive2 { name="Sleuth3"; version="1.0-3"; sha256="0ngwri80cwqs50wjza8qyzzwign4ag1ck7fa1x7q5x08w9x6w08m"; depends=[]; }; SlidingWindows = derive2 { name="SlidingWindows"; version="0.2.0"; sha256="0hvxg4hrk3rb1wxhi71rgamxd8wcwys569137znfs0y8j6yvf0jj"; depends=[DCCA nonlinearTseries PerformanceAnalytics TSEntropies]; }; SmCCNet = derive2 { name="SmCCNet"; version="0.99.0"; sha256="0ixvh1pd1gzbscwg4xjlcgxq5c9vqahil0fysfjc3fnba3wiidzx"; depends=[igraph Matrix pbapply PMA]; }; - SmallCountRounding = derive2 { name="SmallCountRounding"; version="1.0.2"; sha256="1alcy02qz5fkk24xaja0cgnf36sn0rv0439d2w8sj2vw1dsrzm87"; depends=[Matrix SSBtools]; }; - SmartEDA = derive2 { name="SmartEDA"; version="0.3.8"; sha256="07686x8l25pd0166n6s86zlnj8s10g6by2kd55rfh5didqx8zmsv"; depends=[data_table GGally ggplot2 gridExtra ISLR qpdf rmarkdown sampling scales]; }; + SmallCountRounding = derive2 { name="SmallCountRounding"; version="1.0.3"; sha256="1jnhfzjd2x54h35si1wrr91dkzdzc502m07mvvb894y5pq5q823a"; depends=[Matrix SSBtools]; }; + SmartEDA = derive2 { name="SmartEDA"; version="0.3.9"; sha256="0fmqi3kl20xdrnpbbsk22rrhj2xqckb777mcwdjgwxvc77r88bjf"; depends=[data_table GGally ggplot2 gridExtra ISLR qpdf rmarkdown sampling scales]; }; SmartMeterAnalytics = derive2 { name="SmartMeterAnalytics"; version="1.0.3"; sha256="0i8my7ngzdbay3cld8axhvbri0nh0dd1dmv2lbsgyx4adr5hb30f"; depends=[FNN futile_logger plyr stinepack zoo]; }; SmartSVA = derive2 { name="SmartSVA"; version="0.1.3"; sha256="10a8s2znsg8ywqkq9fsxiyqfsprrx33pqissazp2vmabs11mg4np"; depends=[isva Rcpp RcppEigen RSpectra sva]; }; SmarterPoland = derive2 { name="SmarterPoland"; version="1.8"; sha256="19pxr1zch2bm5jw676dp0p2crvmdmvzyxz07vhx926axpb4i0xbp"; depends=[ggplot2 htmltools httr jsonlite rjson]; }; @@ -4926,7 +4945,6 @@ in with self; { Snake = derive2 { name="Snake"; version="1.0"; sha256="10i1bqsva70lzavfqvc56ga70ddjfwf0hqpspj8fqwa0jw86jmbh"; depends=[]; }; SnakesAndLaddersAnalysis = derive2 { name="SnakesAndLaddersAnalysis"; version="2.1.0"; sha256="0h3664h6d32q201qfyv9y2gg4fhg3azdpwpmx4qfbc10hsc1ghl9"; depends=[]; }; SnowballC = derive2 { name="SnowballC"; version="0.7.0"; sha256="1wwm71mp4b2mjb5985x782p6xj519dfrpd40qli7lmig6afyw3xi"; depends=[]; }; - SoDA = derive2 { name="SoDA"; version="1.0-6.1"; sha256="0d3jb1dsg1q06c08ldmhj0q2sb1pc0g08rfal29ddng3b4qm1lhh"; depends=[]; }; SobolSequence = derive2 { name="SobolSequence"; version="1.0"; sha256="1vmp5jix3zvasvdirv8m88jc0cd8f34b4m1jvhs8g3v9lk8pxrrr"; depends=[Rcpp]; }; SocialPosition = derive2 { name="SocialPosition"; version="1.0.1"; sha256="1rrrjlq6czzhzipvkisbq024ca22v2vzx7wa4ddr9j7hnyyzzpic"; depends=[]; }; Sofi = derive2 { name="Sofi"; version="0.16.4.8"; sha256="0h9ir0xrwmsabfhwsr9hbpwabh1fsb3p51y8qcgm92iyvc6dl3mf"; depends=[foreign sampling shiny]; }; @@ -4944,19 +4962,15 @@ in with self; { SortedEffects = derive2 { name="SortedEffects"; version="1.7.0"; sha256="188qlgg3m8f07hbjim65yw3qy6200y0b54imkdqm8mq0f14nmi0f"; depends=[boot Hmisc pbapply quantreg SparseM]; }; SoundShape = derive2 { name="SoundShape"; version="1.2.1"; sha256="1fkwvvb5pw2qf950hb1d1y6bkazs09hgxd6nn933lhn8ci2v9bzc"; depends=[abind geomorph plot3D reshape2 seewave tuneR]; }; SoundexBR = derive2 { name="SoundexBR"; version="1.2"; sha256="0chc332v3wcz30v70yvdxhvcfdmvf4fj193cn00gl899xfxal89p"; depends=[]; }; - SoupX = derive2 { name="SoupX"; version="1.6.1"; sha256="083kyikziwai7dgj4gl758vy5nss2ppnmvc6ily5wzz4v4g3ff95"; depends=[ggplot2 Matrix Seurat]; }; + SoupX = derive2 { name="SoupX"; version="1.6.2"; sha256="19g3gqgiqllpafc9ihlm083d47zqiygh4p2dhy54k486gk6jcqlv"; depends=[ggplot2 Matrix Seurat]; }; + SourceSet = derive2 { name="SourceSet"; version="0.1.5"; sha256="17dbxdqm9jkhyip6xdwrxsqqyncs5skclbi9drjbdcw745p7c6lh"; depends=[graph gRbase gtools igraph plyr progress reshape2 scales]; }; SoyNAM = derive2 { name="SoyNAM"; version="1.6.2"; sha256="1ajsk51bd9aajlyv9q6yjmdm9xs9jf07j5m189m00mhl21xpzn0b"; depends=[lme4 NAM Rcpp RcppEigen reshape2]; }; SoyURT = derive2 { name="SoyURT"; version="1.0.0"; sha256="0l710ijqmqvpcsxaqia1g1bm5317qp1cc2nsf5ccz1vmgqxrxn1g"; depends=[]; }; - SpATS = derive2 { name="SpATS"; version="1.0-17"; sha256="0f8mwycm0344crvp8y04ccq6rvxmvwcz43l24av3hlx7wk392c3a"; depends=[data_table fields spam]; }; + SpATS = derive2 { name="SpATS"; version="1.0-18"; sha256="1p7ibi4593a6f5ww02l74afxaxgk2nh8h67l43vm2p7zfmdxx2b3"; depends=[data_table fields spam]; }; SpNMF = derive2 { name="SpNMF"; version="0.1.1"; sha256="1xybxx47i3ww5d7chwl38xc48fbsclgyxcki8h85c6dkm49dxy8i"; depends=[NMF]; }; - 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]; }; SpTe2M = derive2 { name="SpTe2M"; version="1.0.1"; sha256="1qcjxr25v5m0nab3xq4bgzilmx2vgibgxnax5bhybfdaskgflhz5"; depends=[glmnet MASS]; }; SpaCCr = derive2 { name="SpaCCr"; version="0.1.0"; sha256="0qm1fr6nnax3i1i77fi73x1z8db557avh6kivs0nskb1dfj8ri4m"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo tidyr]; }; - SpaDES = derive2 { name="SpaDES"; version="2.0.9"; sha256="11acb05b957qwbii701y1b4lvcnvmiixkrlmqkccc8n9icqq107n"; depends=[quickPlot reproducible SpaDES_core SpaDES_tools]; }; - SpaDES_addins = derive2 { name="SpaDES.addins"; version="0.1.4"; sha256="0ly411y95rcm30slaj02vn7clmyq3dvinzg1x40vbsqzcjjg1h6l"; depends=[magrittr miniUI reproducible rstudioapi shiny SpaDES_core stringi]; }; - SpaDES_core = derive2 { name="SpaDES.core"; version="1.1.0"; sha256="0rmdwyk4733skf3mgi879lcg5hjiv72mf96yby3a0x9v2lzlzbv7"; depends=[crayon data_table fastdigest igraph lobstr qs quickPlot raster reproducible Require whisker]; }; - SpaDES_tools = derive2 { name="SpaDES.tools"; version="1.0.0"; sha256="1p1mj9gfgikqng5p9yj01ykxnrqvxcgd6ghi7amgqlkhv9mbjwhi"; depends=[backports checkmate CircStats data_table fastmatch fpCompare magrittr quickPlot raster Rcpp Require rgeos sp]; }; - SpaceTimeBSS = derive2 { name="SpaceTimeBSS"; version="0.1-0"; sha256="0rf07v3hcdqd0lp1jzbr08ijg23z6dp6kypxnq1fh1yvyq9nzy87"; depends=[JADE Matrix Rcpp RcppArmadillo]; }; + SpaceTimeBSS = derive2 { name="SpaceTimeBSS"; version="0.2-0"; sha256="1s4q7nb00616s229p7jrap8df8d8p5bxflskprq2h62mx22dlfsz"; depends=[JADE Matrix Rcpp RcppArmadillo]; }; SpadeR = derive2 { name="SpadeR"; version="0.1.1"; sha256="0iy2rkq4vvps1a73kqq37zpsyl4pvl3vh07dwvpfhvp7f8nxbx99"; depends=[]; }; SparseBiplots = derive2 { name="SparseBiplots"; version="4.0.1"; sha256="0jiyafhsddqa3llrp62lf8bgcvs3wp2pxc8ppaxx4zphkifw2yhr"; depends=[ggplot2 ggrepel gtable rlang sparsepca testthat]; }; SparseChol = derive2 { name="SparseChol"; version="0.1.1"; sha256="1agfl3a7vxjxx64qf76v6a796vmviv3dcp4h7127nr2lg5nx4446"; depends=[Matrix Rcpp]; }; @@ -4969,15 +4983,15 @@ in with self; { SparseMSE = derive2 { name="SparseMSE"; version="2.0.1"; sha256="1alpvj0ya3r64wwfdzz2aaxgaf6512glzl65p97606c2fwrm6db7"; depends=[lpSolve Rcapture]; }; SparseTSCGM = derive2 { name="SparseTSCGM"; version="4.0"; sha256="01lfb3j907244hgapb85kba7zdmgzhw452gri208qgrjzfv2x9yh"; depends=[abind glasso huge longitudinal MASS mvtnorm network]; }; SparseVFC = derive2 { name="SparseVFC"; version="0.1.0"; sha256="1qv7vnalwp2jn302r53c3yfiyz51qzr0fi1ishmbal2bh3j910b7"; depends=[pdist purrr]; }; - SpatEntropy = derive2 { name="SpatEntropy"; version="2.1-1"; sha256="0navil5wjzw67diz87ijnaikx4ws7fnbqqbmpdxhla6dfdd8yhd5"; depends=[spatstat spatstat_core spatstat_geom spatstat_linnet spatstat_random]; }; + SpatEntropy = derive2 { name="SpatEntropy"; version="2.2-0"; sha256="0vp4mns6izycz9sznzqmww4h34gbk5nwfnnx10yba4l7y78zjjkg"; depends=[spatstat spatstat_geom 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]; }; + SpatialBSS = derive2 { name="SpatialBSS"; version="0.13-0"; sha256="15bv6w576ch5fb7limnpm7m4n9yws8qsrmgvgvxqaq8fb5c5n8mr"; depends=[distances JADE Rcpp RcppArmadillo robustbase sp SpatialNP]; }; SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.7"; sha256="0hfspksv9dgi98kcjwa291x8dglskfl4d1cjkd2hqxlf73havpzx"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; }; SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.1-0"; sha256="0z1swxp1syz8hdskarjxx4sdd7wx835kcnb783bwqm235yh991j3"; depends=[fields maps]; }; SpatialGEV = derive2 { name="SpatialGEV"; version="1.0.0"; sha256="0g4v84a4c14a2vf7y055j9jgcki7q4182lmmmphrahiqwnjxhm1b"; depends=[evd mvtnorm TMB]; }; SpatialGraph = derive2 { name="SpatialGraph"; version="1.0-2"; sha256="0cwswa5g3a6ng8qkwi04jz9pma4i0c16m7jpq6z3djzjin0znyk2"; depends=[igraph rgeos shape sp splancs]; }; SpatialKDE = derive2 { name="SpatialKDE"; version="0.8.0"; sha256="0qnyriiy1401darnmjdcpsyp76ib822djz8bsgv4xnx9armhkh6a"; depends=[cpp11 dplyr glue magrittr progress raster rlang sf vctrs]; }; - SpatialKWD = derive2 { name="SpatialKWD"; version="0.4.0"; sha256="0nsrf30bl3yc1h1kldv1ah1jjb4qh4hd99rd1nz9q9rqmdp0dcrw"; depends=[Rcpp]; }; + SpatialKWD = derive2 { name="SpatialKWD"; version="0.4.1"; sha256="0b5vfsmpl3zxcwsg7bj85kfbyv8a2bgfq72b3rk4r6ms7ngc5i16"; depends=[Rcpp]; }; SpatialML = derive2 { name="SpatialML"; version="0.1.5"; sha256="13didlxl9fn5h48fyz29f2vh3vi8g2fisbnaraqlgwn5fbsg3ihd"; depends=[caret ranger]; }; SpatialNP = derive2 { name="SpatialNP"; version="1.1-5"; sha256="0cxh1f4182mfihq6m82zh2lgafrsiqvgrfxbk66zkjrrbfn8gkcl"; depends=[]; }; SpatialPOP = derive2 { name="SpatialPOP"; version="0.1.0"; sha256="0pgd4injkimjp6pid42arhfbavx2i8crkdvqr35bjvf26p7hbvv3"; depends=[MASS numbers qpdf]; }; @@ -4987,7 +5001,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="1.0"; sha256="1320dl8sr9zqka2pa361gsi3sr4clzz7bp7zj1p07khyz3xchinf"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat spatstat_core spatstat_geom spatstat_linnet turboEM waveslim]; }; + SpatialVx = derive2 { name="SpatialVx"; version="1.0-1"; sha256="06l2p3p24s08diq6g6301hk8fmc4wd43wc94a4jl31lq6zjihiwc"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat spatstat_geom spatstat_linnet spatstat_model turboEM waveslim]; }; SpatialfdaR = derive2 { name="SpatialfdaR"; version="1.0.0"; sha256="14l3fvwrzyrldbk8d2p0syk9lmhn208yi20493qd41babsaaxll3"; depends=[fda geometry knitr rgl rmarkdown]; }; Spbsampling = derive2 { name="Spbsampling"; version="1.3.5"; sha256="0p98l58qfc4ddimmqca77cr536q2pnrlcb3r344c7apnakidz7ng"; depends=[Rcpp RcppArmadillo]; }; SpeTestNP = derive2 { name="SpeTestNP"; version="1.1.0"; sha256="1767xhnfdq9qm626j8jr0l6vnr7kkljsyarz3y318y33ja3rx71j"; depends=[doParallel foreach]; }; @@ -5000,15 +5014,14 @@ in with self; { SphereOptimize = derive2 { name="SphereOptimize"; version="0.1.1"; sha256="1b01jpj0sagi3hwfvgd346wvrcypv5b3hh0xfdd8qqnwjgkq8ixi"; depends=[]; }; SphericalCubature = derive2 { name="SphericalCubature"; version="1.5"; sha256="03j9f9v3zrykrd4lc74i19s3xyc0z3l2kg3056qg591sxw64h7vh"; depends=[abind cubature mvmesh SimplicialCubature]; }; SphericalK = derive2 { name="SphericalK"; version="1.2"; sha256="18py4ylm10s75pihjvcy7w948379zy9l9azriw7g7pyp7px29wda"; depends=[]; }; - Spillover = derive2 { name="Spillover"; version="0.1.0.2"; sha256="0a9gvr2p4xdd47k8vfjyq952svfxvfvqzp6bkbsjj0mdjvjq3kaj"; depends=[dplyr fastSOM ggplot2 tidyr vars zoo]; }; Splinets = derive2 { name="Splinets"; version="1.0.0"; sha256="1fws9svxvn03xgfqmqwr169wgl544zv87yrdi4nl5z32cq5c9yk5"; depends=[]; }; - SplitGLM = derive2 { name="SplitGLM"; version="1.0.4"; sha256="0wi2zmd1fc2k1xdnjidihbv33iyiwxqqng3pnk3alf4x7ka67pb3"; depends=[Rcpp RcppArmadillo]; }; + SplitGLM = derive2 { name="SplitGLM"; version="1.0.5"; sha256="0i9fs09bch3qsf6b6sws82hd5rzhhfcf17f30b5w7b2rr0sc9dxa"; depends=[Rcpp RcppArmadillo]; }; SplitKnockoff = derive2 { name="SplitKnockoff"; version="1.2"; sha256="1ywh86gkkcc2dddqfgs5w8w9wyjfqmvcr31jga41ddvj5rb8zkhx"; 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=[]; }; 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.10.0"; sha256="0rkmja3da8fn5klmd4wyg3ws0k2gbk2cxxj69cnhm4q7vxywwwl7"; depends=[checkmate rJava rlang]; }; + SqlRender = derive2 { name="SqlRender"; version="1.11.0"; sha256="0n2gxfvzjsg3p0wgras394lf182gi9nwn9v3cn8isyqg61zsl2p1"; depends=[checkmate rJava rlang]; }; SqueakR = derive2 { name="SqueakR"; version="1.3.0"; sha256="09l6dj1xq2zxxy6jnh1dl4rlcbx06fvf0jp2nypv3497dn97jsrh"; depends=[dplyr ggcorrplot ggeasy gghighlight ggplot2 ggpubr googlesheets4 MASS plotly RColorBrewer readxl report rlist rstatix shiny shinydashboard]; }; Sshaped = derive2 { name="Sshaped"; version="1.1"; sha256="0jy926ykyw7a2q0wabbvm2sm2g4d5y8wl6na4xjmf0ybr6rma458"; depends=[Rcpp RcppArmadillo]; }; Sstack = derive2 { name="Sstack"; version="1.0.1"; sha256="137vsas2kw3l37c141g51sgx0j6z8ys6hbxjmsdymz1fxsjr4adg"; depends=[doParallel dplyr foreach randomForest]; }; @@ -5026,6 +5039,7 @@ in with self; { StatMatch = derive2 { name="StatMatch"; version="1.4.1"; sha256="1iavyaj6q8rbvhki98q8zwikfrgjrp6w8prhnqhiv0yb8k27jm0c"; depends=[ggplot2 lpSolve proxy survey]; }; 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]; }; + StatTeacherAssistant = derive2 { name="StatTeacherAssistant"; version="0.0.1"; sha256="0n9na9mzjzcgkq97ix1v3dxhzbc6c9s8g3rm4ikwsa2j4asrfbrd"; depends=[DescTools dplyr DT ggplot2 plotly rhandsontable rio rmatio shiny shinyalert shinyBS shinyjs sortable stringi stringr teachingApps tidyr]; }; Statsomat = derive2 { name="Statsomat"; version="1.1.0"; sha256="1lfgbbf1pcfbih5nfb6rbiq2h0hlxg1fzmcf4330yc48r998q4x6"; depends=[car corrplot data_table DDoutlier energy ggplot2 gridExtra kableExtra knitr readr reshape2 rmarkdown shiny shinydisconnect]; }; SteinIV = derive2 { name="SteinIV"; version="0.1-1"; sha256="1bm4lc7g9h9jkb1dpzb84289bwxcywp0a8vylv6ipvhiqbqk5d95"; depends=[]; }; SteinerNet = derive2 { name="SteinerNet"; version="3.1.0"; sha256="03wr746dkwp8vg91y986q0xvgz1y9b5q25g0kig2sx6m75li3yif"; depends=[igraph]; }; @@ -5046,7 +5060,7 @@ in with self; { StratifiedMedicine = derive2 { name="StratifiedMedicine"; version="1.0.5"; sha256="0q1d5jar5x2v9bsrfzv73wirgbkvy16ibzq93qv9b6c4zj3q75r7"; depends=[coin dplyr ggparty ggplot2 glmnet mvtnorm partykit ranger survival]; }; StratifiedRF = derive2 { name="StratifiedRF"; version="0.2.2"; sha256="0a5djia6xacs17nnr5knr1acwzicrffz73q9nvnhdmihazq8v27d"; depends=[C50 dplyr]; }; StratifiedSampling = derive2 { name="StratifiedSampling"; version="0.4.1"; sha256="15gg1qc2znyba2y6kq8qq6wz69lq3kkpps0a3j9jdq8n67x65zkp"; depends=[MASS Matrix proxy Rcpp RcppArmadillo Rglpk sampling transport]; }; - StratigrapheR = derive2 { name="StratigrapheR"; version="1.2.5"; sha256="0wc4q3y8n9wd79dwjn5i4y4b5h8yk3g9x3ifg7dxsryk5i2wml0c"; depends=[diagram dplyr reshape shiny stringr XML]; }; + StratigrapheR = derive2 { name="StratigrapheR"; version="1.3.0"; sha256="01pj1in36cjsfpavhlx56by3pxxxqy1chvfpa73xsdbrqmjs975s"; depends=[diagram dplyr reshape shiny stringr XML]; }; StreamMetabolism = derive2 { name="StreamMetabolism"; version="1.1.2"; sha256="1sv30i7armk7jhxg5x9lh0r9qq3xixn1k2h0q89halkh1yraal8a"; depends=[chron maptools zoo]; }; StressStrength = derive2 { name="StressStrength"; version="1.0.2"; sha256="1fq26bzmwsk4nzz9bgasyxz9alw8x2ssahz67mham7vw483w79pd"; depends=[]; }; String2AdjMatrix = derive2 { name="String2AdjMatrix"; version="0.1.0"; sha256="058r30kjjna02nmd6ngqfcnn1yk5390i20xvl6qb5qk3bcp2wmxn"; depends=[stringr]; }; @@ -5074,10 +5088,11 @@ in with self; { Superpower = derive2 { name="Superpower"; version="0.2.0"; sha256="0bv2jx3hadp5d9c3q790in3m728c8jc1nkp9wqvzcdip1d29hyin"; depends=[afex dplyr emmeans ggplot2 gridExtra magrittr MASS mvtnorm reshape2 tidyr tidyselect]; }; SuppDists = derive2 { name="SuppDists"; version="1.1-9.7"; sha256="025b9nlxz62wk84295csyzbncpn80i3iby3sxdigf3swcgi2fmbb"; depends=[]; }; SurfaceTortoise = derive2 { name="SurfaceTortoise"; version="1.0.2"; sha256="1l586x9np5rclqdrnv8b72ixlppzlnsq4yf99ny6aq5a9lwzmcgm"; depends=[gstat raster rgeos sp]; }; - Surrogate = derive2 { name="Surrogate"; version="2.4"; sha256="1fp9dps1z8wjdbhzkz1wnr7ffpv2nm9cbqns03x5aj290h83bpza"; depends=[extraDistr ks lattice latticeExtra lme4 logistf MASS mixtools msm nlme pbapply rms rootSolve survival]; }; + Surrogate = derive2 { name="Surrogate"; version="2.5"; sha256="1zbzsjxsrmz1xh3ldxgas0yv2v9l6jqdr9hr002gq9hk5qhspk9m"; depends=[copula dplyr extraDistr flexsurv kdecopula ks lattice latticeExtra lme4 logistf MASS msm mvtnorm nlme pbapply rms rvinecopulib survival]; }; SurrogateOutcome = derive2 { name="SurrogateOutcome"; version="1.1"; sha256="1wiqn9gfvj225dvmp49fyybp77np507s04f28a9wa9jiyvqf7m97"; depends=[survival]; }; SurrogateRegression = derive2 { name="SurrogateRegression"; version="0.6.0"; sha256="0815zskr4g960wm6jcjn0ykmc0db8fg6vzfw97lfgm5m9bjd4h5c"; depends=[Rcpp RcppArmadillo]; }; SurrogateTest = derive2 { name="SurrogateTest"; version="1.3"; sha256="0vs1ii3l6i6cmswyv6xjbya5filfixppyzmnw099g9s4x8kn0kq7"; depends=[survival]; }; + SurvCorr = derive2 { name="SurvCorr"; version="1.1"; sha256="0pccjc9zdvbb869wfywm23l63h1bpi5px4q5x7fq54pm0iyi1k73"; depends=[fields survival]; }; SurvDisc = derive2 { name="SurvDisc"; version="0.1.1"; sha256="0ajvnm0a4krbm0m584bg58hd7dzl0f2rz5as1zsajx8agywb5qmv"; depends=[cubature MASS mvtnorm nlme simex survival]; }; SurvHiDim = derive2 { name="SurvHiDim"; version="0.1.1"; sha256="1kix00zfrbx11pwx2dfag8vz5nvf8siw2kbxi8g4fb7xib9wh2na"; depends=[factoextra glmnet igraph Rdpack readr survival tidyverse useful]; }; SurvLong = derive2 { name="SurvLong"; version="1.2"; sha256="15a92lj29ggxwyn52iiq1ns7jp8l8grk17wapffv109fypwhdnh1"; depends=[]; }; @@ -5085,7 +5100,6 @@ in with self; { SurvMetrics = derive2 { name="SurvMetrics"; version="0.5.0"; sha256="14hpvqg0k3ww5qla4s08nrqwcy27y76kfp7b0g1hzs3vv046fb7i"; depends=[MASS pec randomForestSRC survival survminer]; }; SurvRegCensCov = derive2 { name="SurvRegCensCov"; version="1.5"; sha256="0p39xqrnx2x0fgdfdr9ffv2x9zcgi53kqya821gpbnn3ccjzxx58"; depends=[numDeriv survival]; }; SurvTrunc = derive2 { name="SurvTrunc"; version="0.2.0"; sha256="0zkjlndmg0rc7ycqy2v42nyzs4sd9z1y9y9kwfdci9qrc88nnfmn"; depends=[survival]; }; - SurvivalPath = derive2 { name="SurvivalPath"; version="1.3.2"; sha256="17glrkz63ms76cmg7lfz0nay131ngwxigwfs0rzgfjna9gy06dgi"; depends=[dplyr ggplot2 ggtree Hmisc rms survival survivalROC survminer treeio]; }; SvyNom = derive2 { name="SvyNom"; version="1.2"; sha256="0s9gn10v6a8n6898g0gmdrw51z7y98klji59sn06dfbsxlswlv11"; 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]; }; @@ -5098,10 +5112,9 @@ in with self; { SyncRNG = derive2 { name="SyncRNG"; version="1.3.1"; sha256="05a5ifv5yy7brl76cmq7mgqm9s9gm7qgc1cfzih7q1jrw955k400"; depends=[]; }; SynchWave = derive2 { name="SynchWave"; version="1.1.2"; sha256="1y53235523z0nf4pmskdiz3xq4p8hdzvf5jy4ml4isj6nqzy6b88"; depends=[fields]; }; Synth = derive2 { name="Synth"; version="1.1-6"; sha256="0qi8534rw0z20l1m4hhcn2xm16g8rrqfvpy0fs4hik4xc5cjgmbg"; depends=[kernlab LowRankQP optimx rgenoud]; }; - 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]; }; - Sysrecon = derive2 { name="Sysrecon"; version="0.1.0"; sha256="190djsdiqrkz21hpmzgf0ip3np60plpj0a34qxvp2y6lwygvmxpa"; depends=[ape dplyr ggplot2 ggtree patchwork plyr RColorBrewer readr readxl rlang SnowballC stringr tidyverse tm]; }; + Sysrecon = derive2 { name="Sysrecon"; version="0.1.2"; sha256="0qj0yvbfig6aphc7s10v5hhd30mn7rvdbzxkjfqnbzbfbvr5r2mz"; depends=[ape dplyr ggplot2 ggtree patchwork plyr RColorBrewer readr readxl rlang SnowballC stringr tidyverse tm]; }; SystemicR = derive2 { name="SystemicR"; version="0.1.0"; sha256="1vk08w734zxvrwzd81iy0azwcj53k6wvgc1qlaxw96hirdwdg6zr"; depends=[igraph Matrix quantreg xts]; }; T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; }; T2Qv = derive2 { name="T2Qv"; version="0.1.0"; sha256="1zx7r0axa7b83pynilp0rmw6apilzsqjacn426q4i4jlsvr1ba3k"; depends=[ca dplyr highcharter htmltools purrr shiny shinycssloaders shinydashboard shinydashboardPlus stringr tables tidyr]; }; @@ -5120,11 +5133,11 @@ in with self; { TCA = derive2 { name="TCA"; version="1.2.1"; sha256="1gyps0m7r44vcbzpbrs3xy2kyb2xsvmfzk1c0aq04s4ndcksplwb"; depends=[config data_table futile_logger gmodels Matrix matrixcalc matrixStats nloptr pbapply pracma quadprog rsvd]; }; TCGAretriever = derive2 { name="TCGAretriever"; version="1.5"; sha256="1xg1rz2h5jbpdd5axli3ripqxb0bj64yrd4y5nzr8axajiaybkj9"; depends=[httr]; }; TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.6"; sha256="15f3w6vhbqy4xzidxasjnqigxchd3jbr2kpm3gggjnkp7rzsfgaf"; depends=[httr jsonlite]; }; - TDA = derive2 { name="TDA"; version="1.8.7"; sha256="0jppqk7h9nq1ysdgkqbywsc313v9gvmnlrmsvidgdc9sa1qxw6di"; depends=[BH FNN igraph Rcpp RcppEigen scales]; }; + TDA = derive2 { name="TDA"; version="1.8.8"; sha256="174fy3m5l1hlkhiyg2zbi4aq4anmyb1gm0nqmydbp80mbf84krj1"; depends=[BH FNN igraph Rcpp RcppEigen scales]; }; TDAkit = derive2 { name="TDAkit"; version="0.1.2"; sha256="1gvcv3016kjk98qm07i972fi66bcljj1avmagyc8qxs29cq3ngg3"; depends=[energy ggplot2 maotai Rcpp RcppArmadillo Rdpack T4cluster TDAstats]; }; - TDApplied = derive2 { name="TDApplied"; version="0.1.3"; sha256="17x9mfvygv5jmrymkkig1b882j3w7cww0xxcb4hvnc9ia01xcj8y"; depends=[clue doParallel foreach iterators kernlab parallelly rdist]; }; + TDApplied = derive2 { name="TDApplied"; version="2.0.0"; sha256="07vw667v5cnh6dxsggxb6028yl2xlxbqw0wr90whd45q61cjmfkv"; depends=[clue doParallel foreach iterators kernlab parallelly rdist]; }; TDAstats = derive2 { name="TDAstats"; version="0.4.1"; sha256="1zmickqk60vm9rzy67hib835v3c45aqjk441p31vpbvhbiy58nq5"; depends=[ggplot2 Rcpp]; }; - TDAvec = derive2 { name="TDAvec"; version="0.1.2"; sha256="1zw5yaym5q358vrppzdgqxwb4hhbqav69pvxb2wlanxap9rkxix8"; depends=[microbenchmark Rcpp TDA]; }; + TDAvec = derive2 { name="TDAvec"; version="0.1.3"; sha256="0g449p1y16sl35md9c4qnj3n7i5nx9appqx22d7ijjhr7zpv0p1s"; depends=[microbenchmark Rcpp TDA]; }; TDCor = derive2 { name="TDCor"; version="0.1-2"; sha256="18085prcwhl5w717f1f7jcqskw2jvigvjjs2l5y6106ibiam6hxx"; depends=[deSolve]; }; TDPanalysis = derive2 { name="TDPanalysis"; version="1.0"; sha256="0kvbsgwl7b9a3hn4d3snajqmynbajd2d8lc1na0hri2cv8qm8x9h"; depends=[plyr]; }; TDbook = derive2 { name="TDbook"; version="0.0.6"; sha256="127bvwy65fr0nm7gw4mqcjm6dfrvlnl77z4ig2bpfxy7a0xq67gp"; depends=[]; }; @@ -5141,7 +5154,7 @@ in with self; { TGST = derive2 { name="TGST"; version="1.0"; sha256="1xnb41ksggdi57gnkjaab98c4nfdkxqx53rv9pyh3j0cg0kbkk9v"; depends=[ggplot2 knitr]; }; TH_data = derive2 { name="TH.data"; version="1.1-1"; sha256="0ynxacnz002bjsp2ybql7rdqw4zd14af8r7w44nwbx22n4bapwzd"; depends=[MASS survival]; }; 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]; }; + TIMP = derive2 { name="TIMP"; version="1.13.6"; sha256="1if2qm40nlz54pylqvdp4pk2jmicn8wkdlywrkr5hn80c0yyy879"; 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]; }; TKCat = derive2 { name="TKCat"; version="1.0.6"; sha256="1z4ili1hn4nfkg4v84s8xamwxpyfjdyi0b7xpw795d6x80ar3ssk"; depends=[base64enc ClickHouseHTTP DBI dplyr DT future getPass htmltools jsonlite jsonvalidate magrittr markdown Matrix promises readr ReDaMoR rlang shiny shinydashboard tidyselect uuid visNetwork xml2]; }; TLMoments = derive2 { name="TLMoments"; version="0.7.5.3"; sha256="096sr0j4vhlfsaxc565zgw0mjk4sxkl03i7ip3hzcfph1c05yj6h"; depends=[ggplot2 hypergeo lmomco Rcpp]; }; @@ -5190,6 +5203,7 @@ in with self; { TSPred = derive2 { name="TSPred"; version="5.1"; sha256="14dzpm5i5iml9kb49rnw7kq1ga03l4c6m485b1p8p3ya0n6mivkl"; depends=[dplyr e1071 elmNNRcpp EMD forecast keras KFAS magrittr ModelMetrics MuMIn nnet plyr randomForest Rlibeemd RSNNS tfdatasets vars wavelets]; }; TSS_RESTREND = derive2 { name="TSS.RESTREND"; version="0.3.1"; sha256="1la1ff9ajcabdsz5f2761647304fpwp779gv0gjds4mg25rf6n2f"; depends=[bfast broom ggplot2 mblm RcppRoll strucchange]; }; TSSS = derive2 { name="TSSS"; version="1.3.1"; sha256="06wnbj741yyi5b483zhbaccvqpbg8lh3z9vnrxy64x28hnn79cly"; depends=[]; }; + TSSVM = derive2 { name="TSSVM"; version="0.1.0"; sha256="07jf5s557j2xr5918fa0rkzz0ivb01acyzw2cbky92wjd21qa97s"; depends=[e1071 forecast]; }; TSTutorial = derive2 { name="TSTutorial"; version="1.2.4"; sha256="0kbs703nmi1z19r6bcz243sm50ijxwmsx6kcw0g18wmz7v8bj9c5"; depends=[MASS]; }; 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]; }; @@ -5237,15 +5251,16 @@ in with self; { 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]; }; + TensorPreAve = derive2 { name="TensorPreAve"; version="0.1.1"; sha256="01dd9ny8ikrhdsi3rv9nhs10rn0ps8dly8qpqk576qqc8yb0d506"; depends=[MASS pracma rTensor]; }; TensorTest2D = derive2 { name="TensorTest2D"; version="1.1.1"; sha256="1yx1ggsbximbsrwimyg7jblbqr0f75z278f38hg61qjxzf9m4ndk"; depends=[]; }; - Ternary = derive2 { name="Ternary"; version="2.1.1"; sha256="119jb2j17qhahybl46h8bnijaq5mprssk58c1lbyc57agk0pafiw"; depends=[shiny sp viridisLite]; }; + Ternary = derive2 { name="Ternary"; version="2.1.2"; sha256="11g5ya43xgw45y8lngqj3xgbxxglnankj8fj40qij3f1qjggzwnw"; depends=[shiny sp viridisLite]; }; TesiproV = derive2 { name="TesiproV"; version="0.9.2"; sha256="00igkm0y9v363djhig4ydn3bfadqf6rrrdhkai2pl1w876xk2ydw"; 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.3.4"; sha256="1fz1krvl62bk97sw2swj5cwji34kwc6ni3l10p2xnisfnhll28m7"; depends=[crayon foreach logitnorm lpSolve Rcpp RcppArmadillo]; }; TestDimorph = derive2 { name="TestDimorph"; version="0.5.5"; sha256="00mh7g6ijlimkfk35yjkmhbx1aqc511v3002q73ppx5977a7zwf0"; depends=[corrplot dplyr ggplot2 Morpho multcompView tidyr tmvtnorm truncnorm]; }; TestFunctions = derive2 { name="TestFunctions"; version="0.2.0"; sha256="018nkz8r6vqahrzq3d588i3ffb1bmd1pdk87j4ivcdsx99mq15sn"; depends=[]; }; - TestGardener = derive2 { name="TestGardener"; version="3.0.0"; sha256="1d479myp6f8w358ywjjvpayz1kx5rmyzkgr72nhxjwg0rgw9chgp"; depends=[dplyr fda ggplot2 ggpubr knitr pracma rgl rmarkdown stringr tidyr utf8]; }; + TestGardener = derive2 { name="TestGardener"; version="3.1.0"; sha256="1fwad1hanslrxi8vhwd2v99qsd5bnz8nd0knxcq1q0mdp6i7lbxb"; depends=[dplyr fda ggplot2 ggpubr knitr pracma rgl rmarkdown stringr tidyr utf8]; }; TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; }; TestingSimilarity = derive2 { name="TestingSimilarity"; version="1.1"; sha256="1iq0wh13rl6rby44ql4d286r1akzwmbpsvnq9p8lkl8709z0d34w"; depends=[alabama DoseFinding lattice]; }; TexExamRandomizer = derive2 { name="TexExamRandomizer"; version="1.2.3"; sha256="0l0vpx4rkib2m8hwhwy9j8pqyf7gpb9qg8wpnh3238snwpadgy3a"; depends=[assertthat jsonlite Rcpp stringr]; }; @@ -5257,22 +5272,20 @@ in with self; { 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]; }; ThomasJeffersonUniv = derive2 { name="ThomasJeffersonUniv"; version="0.1.0"; sha256="0w2n7jwns82zljkfz509hkkplda5mpbcqk5gzi2y75vlika0rg18"; depends=[lubridate timeDate zoo]; }; - ThreeArmedTrials = derive2 { name="ThreeArmedTrials"; version="1.0-3"; sha256="06jhgl1fzvkvnhrjs4xcyw6yymwl499rw9xnfwpx44dzxi7nynxj"; depends=[MASS numDeriv]; }; ThreeGroups = derive2 { name="ThreeGroups"; version="0.21"; sha256="0hipxa45v9ysb2qbk33kjycnvqar7bff1ajxd6fzhpc3jc9hflw4"; depends=[]; }; ThreeWay = derive2 { name="ThreeWay"; version="1.1.3"; sha256="17yl8zq029wiy3c0f4ssljx85dnm9n862wj2d24w7p0lxlvarmz6"; depends=[]; }; ThreeWiseMonkeys = derive2 { name="ThreeWiseMonkeys"; version="0.1.0"; sha256="1qdb3m15q0gg8dk2znc2syy2jdqsp2893a7ilfa8rg3r2vps86yg"; depends=[stringr tuneR]; }; Thresher = derive2 { name="Thresher"; version="1.1.3"; sha256="16zf5cwc2c5j61xcrqsycwrsc162spyqgk9mac7n37mymn5agbwp"; depends=[ade4 ClassDiscovery colorspace MASS movMF oompaBase PCDimension]; }; ThresholdROC = derive2 { name="ThresholdROC"; version="2.9.0"; sha256="1mzz05aqq6crcfm5bbv0gbpvndk0yy1lf4fxz8zva790g16cilq0"; depends=[ks MASS numDeriv pROC]; }; - ThresholdROCsurvival = derive2 { name="ThresholdROCsurvival"; version="1.0.2"; sha256="1mk2ijh86y065z8y9p255dj09s0nh2h7i33d0z9ww81g6wxbvagy"; depends=[boot InformativeCensoring pROC psych survival survivalROC ThresholdROC]; }; + ThresholdROCsurvival = derive2 { name="ThresholdROCsurvival"; version="1.0.3"; sha256="19xgyrdnwfv4rqvrj7d2603jy0wvi5r17l85lvvv0z56pdcqagl3"; depends=[boot InformativeCensoring pROC psych survival ThresholdROC]; }; TiPS = derive2 { name="TiPS"; version="1.2.1"; sha256="0crni6cam3dwpjrgmr0bmp2czmbycg05sl585ldn4cg38c4dppwh"; depends=[gtools inline Rcpp stringr]; }; TideCurves = derive2 { name="TideCurves"; version="0.0.5"; sha256="1cnfnmwmlicsi243058zq3302niwk2l1agrrjy4k7rf1v7gfy6xx"; depends=[chron data_table fields]; }; TideHarmonics = derive2 { name="TideHarmonics"; version="0.1-1"; sha256="1g1v99gh6mns4l8ipmw7kpalbk07m92ybcqjq7b0wsjmdvs1y67s"; depends=[]; }; TideTables = derive2 { name="TideTables"; version="0.0.3"; sha256="0xfwikz9f58pw1j5vp45wp44lbr8b8ijlac474nzahq46d411afp"; depends=[chron data_table]; }; Tides = derive2 { name="Tides"; version="2.1"; sha256="0da3z010ali83qf8mf1znicqv8vvsa5r93mc40ax60ln2w33nlrm"; depends=[]; }; TidyConsultant = derive2 { name="TidyConsultant"; version="0.1.0"; sha256="1ipv0nx0xmba62c7qjgadpjsr850d9dl0z5zjkh1rj6kfxdgiis2"; depends=[autostats badger framecleaner pacman presenter tidybins validata]; }; - TidyDensity = derive2 { name="TidyDensity"; version="1.2.3"; sha256="0fryb0icgf3vfzcs4qzwkl58rp6a53caq2bq719abk7ya57zd1gw"; depends=[actuar broom data_table dplyr ggplot2 magrittr nloptr patchwork plotly purrr rlang stringr survival tidyr tidyselect]; }; + TidyDensity = derive2 { name="TidyDensity"; version="1.2.4"; sha256="1dv035cj40817aya10vl8g9ij8wdxzxy2r2r3kfz44jhhynfr2hb"; depends=[actuar broom data_table dplyr ggplot2 magrittr nloptr patchwork plotly purrr rlang survival tidyr tidyselect]; }; TidyMultiqc = derive2 { name="TidyMultiqc"; version="1.0.3"; sha256="1gnkq2ssc9lvkz1j52c2l4v1frxfcnw3j186kf3xbx8qx1aikyqr"; depends=[assertthat dplyr jsonlite magrittr purrr rlang stringr tibble]; }; - TileManager = derive2 { name="TileManager"; version="0.4.1"; sha256="0pcskdqxxm07j47bw1j4d3jqf64pk0jqwcp5379hnpi6kr7f5gvh"; depends=[APfun raster rgeos sp XML]; }; TimeSeries_OBeu = derive2 { name="TimeSeries.OBeu"; version="1.2.4"; sha256="0ihigrbdkfbqqjxqfx3y5q8ii8n60301s7190jr50a88l1xzgmh8"; depends=[forecast jsonlite locfit trend tseries]; }; TimeVTree = derive2 { name="TimeVTree"; version="0.3.1"; sha256="124kg9zcq4b2j4qvg9f6gykbmzf69qjnnw54nv213ip2h4rdkv32"; depends=[survival]; }; TimeVarConcurrentModel = derive2 { name="TimeVarConcurrentModel"; version="1.0"; sha256="0fq05yni8hasivwmv5dk5ivwkprh4fkaa7h1bv8b60savvh0zs23"; depends=[Bolstad2 fda]; }; @@ -5291,19 +5304,18 @@ 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=[]; }; - ToxicR = derive2 { name="ToxicR"; version="22.8.1.0.3"; sha256="0sc7i3jzqhjwhcz83p7vgjmlpz4f27k0phbi2q5c8gxcnkzbffwp"; depends=[coda doBy dplyr forcats ggplot2 ggridges multcomp Rcpp RcppEigen RcppGSL scales shiny tidyverse]; }; - Tplyr = derive2 { name="Tplyr"; version="1.0.1"; sha256="10kai38z0mxm7s6x1vjl2vgvwwkz2lzy04irvxxink5xfs8dqkpd"; depends=[assertthat dplyr forcats lifecycle magrittr purrr rlang stringr tibble tidyr tidyselect]; }; - TraMineR = derive2 { name="TraMineR"; version="2.2-5"; sha256="0xjyfqac96nf9zrbc5v03253lzyqvzib7j1j27nrxsslkq7dwpk5"; depends=[boot cluster colorspace RColorBrewer vegan]; }; + Tplyr = derive2 { name="Tplyr"; version="1.0.2"; sha256="1wnhw2y6pl6i3syg7qrl16k9gids6qr7sp2z6b88vphz7p9jqi9p"; depends=[assertthat dplyr forcats lifecycle magrittr purrr rlang stringr tibble tidyr tidyselect]; }; + TraMineR = derive2 { name="TraMineR"; version="2.2-6"; sha256="1rqkhfns0i1nfjs6kdvpvjzy6zwiclxhhiscr4zmp4mzj9b5pxp7"; depends=[boot cluster colorspace RColorBrewer vegan]; }; TraMineRextras = derive2 { name="TraMineRextras"; version="0.6.5"; sha256="0y1f296l5fjdiidiyk50vgnn2srzvb6x2ddizay9yv4lichxy4w1"; depends=[cluster colorspace doParallel foreach RColorBrewer survival TraMineR]; }; TraceAssist = derive2 { name="TraceAssist"; version="0.1.0"; sha256="03x071nsfgz1z2qp1zn1y3hfx8ydpj0z4rcfk2i588ad53z86w4c"; depends=[glmnet keras Matrix quadprog]; }; TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.3"; sha256="0x2wydp9qj2r2rsv0kmwlq4y7mr391ya13rpnj3mdgl0pjdp445s"; depends=[fields RColorBrewer]; }; Trading = derive2 { name="Trading"; version="2.5"; sha256="0k048pn06qc1kvz0bj3bgfvaf3nqw6flqn4kvxj6vxhzlz3km9qs"; depends=[data_table PerformanceAnalytics reticulate]; }; - TrafficBDE = derive2 { name="TrafficBDE"; version="0.1.1"; sha256="03cr1cmiygi0kq37zs8dnp1rd670yzd4z1wgj31ahnld1siqb30g"; depends=[caret data_table DescriptiveStats_OBeu dplyr lubridate RCurl zoo]; }; TraitStats = derive2 { name="TraitStats"; version="1.0.2"; sha256="07jiipxkidr0hnb3lbbb8yj007m5qzcbq9p5py276sckalamzri0"; depends=[gridExtra lattice qpdf rlist]; }; TrajDataMining = derive2 { name="TrajDataMining"; version="0.1.6"; sha256="1n5qcyc1kb8rdrqaji7pp63l2gyr6jim8spm8ydb4lnqfcnrin9g"; depends=[geosphere rgdal RPostgreSQL sp spacetime trajectories xts]; }; TransModel = derive2 { name="TransModel"; version="2.3"; sha256="1wyg3cn7wp1jird16n88ygikf7qpqv3xhnyj3sv4l7gmwvjp5v5a"; depends=[MASS survival]; }; TransP = derive2 { name="TransP"; version="0.1"; sha256="0p6pfcp8qjdah0lfhx0a396nxjzp3ckpda9hl3snpppx79iyww55"; depends=[]; }; TransPhylo = derive2 { name="TransPhylo"; version="1.4.5"; sha256="0g92kwi1nlmpc8m4pc9kv9xhczryr2kn9icfr3js7da7vy8g50xy"; depends=[ape Rcpp]; }; + TransTGGM = derive2 { name="TransTGGM"; version="1.0.0"; sha256="0c815qp0nb4c8ymq9gm9yr37vkzlb6fja9j0czl6ww7rvr8fplrn"; depends=[doParallel expm glasso MASS Matrix rTensor Tlasso]; }; Tratamentos_ad = derive2 { name="Tratamentos.ad"; version="0.2.4"; sha256="15xba5g5b9rxpndgmhlnnq35xjic9v7ymgpyaaj6fn0kziphip84"; depends=[crayon]; }; TreatmentSelection = derive2 { name="TreatmentSelection"; version="2.1.1"; sha256="1pw64hx697jg2f1r2zd8y98g3ivj2gm8fnixcjfn4drsd0xixb4p"; depends=[binom ggplot2 survival]; }; TreeBUGS = derive2 { name="TreeBUGS"; version="1.4.9"; sha256="1jr3xjdb909rlc698swpi5znmam2v73mp717vfg157df36930yj8"; depends=[coda hypergeo logspline MASS Rcpp RcppArmadillo rjags runjags]; }; @@ -5314,7 +5326,7 @@ in with self; { TreeSearch = derive2 { name="TreeSearch"; version="1.2.0"; sha256="1fl399p3bv5f8vlbzhq3sxc40vi4hfa6jn3cgpy2qv79jggfpzh1"; depends=[ape cli cluster fastmatch future 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.8.0"; sha256="1gi8k60paliid6jlbagw14j3873rfrn0p22i52lskxq6dhhm4clh"; depends=[ape bit64 colorspace fastmatch lifecycle R_cache Rcpp Rdpack]; }; + TreeTools = derive2 { name="TreeTools"; version="1.9.0"; sha256="05h9l71mg1b9wx4w9ls25qm3agx9rp6hs0rkn6aqyll9js8mcfh7"; depends=[ape bit64 colorspace fastmatch lifecycle R_cache Rcpp Rdpack]; }; TrenchR = derive2 { name="TrenchR"; version="0.1.1"; sha256="03w010s3zxbrn7nh439d5mg1670k2hylci28i74q39b9235xn8vz"; depends=[deSolve msm Rdpack zoo]; }; TrendInTrend = derive2 { name="TrendInTrend"; version="1.1.3"; sha256="0ijkijyhxhjc7202qssa9wnrmwgv4miv5n8jbml4qqj80kcsbdwp"; depends=[nleqslv pracma pROC rms]; }; TrendSLR = derive2 { name="TrendSLR"; version="1.0"; sha256="1x8j2dg3m7b22gva33y4s318a41wl60sz93y868z4j65hp13jb5k"; depends=[changepoint forecast imputeTS plyr Rssa tseries zoo]; }; @@ -5348,7 +5360,7 @@ in with self; { UBCRM = derive2 { name="UBCRM"; version="1.0.2"; sha256="0cfdgarlks0hkx4fnlm0i2fwpl057vxq58n3xfv718w3cs2nx9wc"; depends=[]; }; UBL = derive2 { name="UBL"; version="0.0.7"; sha256="1zppc8mgmj4ymxfdvhqiirlf80wh65y58wqm92fgjdn7s06v5skf"; depends=[automap gstat MBA randomForest sp]; }; UCR_ColumnNames = derive2 { name="UCR.ColumnNames"; version="0.1.0"; sha256="1nwwq93f60r9aik51l7mzckg81f81nz5kgzynyzp5sm4y2wmpzwn"; depends=[]; }; - UCSCXenaShiny = derive2 { name="UCSCXenaShiny"; version="1.1.8"; sha256="0am18hxmcr671pzpms2x6gyndnd8h0dsq72v28ik6c2fjh2wz5x1"; depends=[dplyr ezcox forcats ggplot2 ggpubr magrittr ppcor psych purrr shiny stringr tibble tidyr UCSCXenaTools]; }; + UCSCXenaShiny = derive2 { name="UCSCXenaShiny"; version="1.1.9"; sha256="0bqj6vbhjn2wgq2486qyfl8wfsgz1gd0kwxrvjxp8fvx96nsrx1l"; depends=[dplyr ezcox forcats ggplot2 ggpubr magrittr ppcor psych purrr shiny stringr tibble tidyr UCSCXenaTools]; }; UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.4.8"; sha256="0w0rps6jsiw67k6h8j1g0nqzwwhl1kb2by90xd4w61i71vk0fda7"; depends=[digest dplyr httr jsonlite magrittr readr rlang]; }; UComp = derive2 { name="UComp"; version="2.2.3"; sha256="11vhkpz1nvqfldksaa8rdhpn0f05x4h2dfpaabr0w274rwad93ap"; depends=[Rcpp RcppArmadillo]; }; UKB_COVID19 = derive2 { name="UKB.COVID19"; version="0.1.3"; sha256="053hsdaa7xnzk95bdp0i1jr6pzq50zvfn1m5sm0znsrk59m5xhgm"; depends=[data_table dplyr here magrittr questionr tidyverse]; }; @@ -5387,9 +5399,10 @@ in with self; { UpSetVP = derive2 { name="UpSetVP"; version="1.0.0"; sha256="1v6djfwaix978vzfjnj0vd3r0m3svfqkn9aqnf9qz2xsjk43m9zr"; depends=[ggplot2 patchwork rdacca_hp]; }; UsingR = derive2 { name="UsingR"; version="2.0-7"; sha256="17ljllslhfmi80yj1336lx9pmzy2i8zdb6byky5yay1lry7s1g30"; depends=[HistData Hmisc MASS]; }; UtilityFrailtyPH12 = derive2 { name="UtilityFrailtyPH12"; version="1.0"; sha256="06f5gmwwk1r14ab6v5jcxz0pmdph7ffi4y57mjg9byn7pjnibflk"; depends=[bindata mvtnorm Phase123 Rcpp RcppArmadillo]; }; - V8 = derive2 { name="V8"; version="4.2.1"; sha256="1w1zihmhrygn2i674wimbv7xqjnwlld4x3ndvh5dl4cdg7s1m24r"; depends=[curl jsonlite Rcpp]; }; + V8 = derive2 { name="V8"; version="4.2.2"; sha256="0friwpw3cbg40hfsqnlp8g3a6l4zhfag6lh005ya6dw634kkarah"; depends=[curl jsonlite Rcpp]; }; VAJointSurv = derive2 { name="VAJointSurv"; version="0.1.0"; sha256="19ib4b1kf1zg4l571f2asxkwbab44pzs954agj0wx1p6kb2v608q"; depends=[lme4 Matrix psqn Rcpp RcppArmadillo RcppEigen SimSurvNMarker survival testthat]; }; VALERIE = derive2 { name="VALERIE"; version="1.1.0"; sha256="15z8234jhh7hv3gijrvy8hap6gdgvm6qll9b00qbji7vyc3dg4pg"; depends=[GenomicAlignments GenomicRanges ggplot2 ggplotify ggpubr IRanges pheatmap plyr Rsamtools scales]; }; + VALIDICLUST = derive2 { name="VALIDICLUST"; version="0.1.0"; sha256="1glcvzrbc7glxmbmas3zzb114a5cfl7gsf7xlxaifrrgvcahrvnx"; depends=[diptest dplyr]; }; VAM = derive2 { name="VAM"; version="1.0.0"; sha256="04lq8i4zwdc9a4n4hvabdyv4a4cmmqbf534cdnnck7jc0dk5rphr"; depends=[MASS Matrix]; }; VAR_etp = derive2 { name="VAR.etp"; version="1.0"; sha256="0pm2m1wwsyrfwvqibf4mn6wbnslynvb1964i79iqhy5qp4nflajp"; depends=[]; }; VARDetect = derive2 { name="VARDetect"; version="0.1.6"; sha256="1yrlyg4b53bdmfjcqi07l0gr3f01h8jwj6g6av3plyk96cvl4svb"; depends=[igraph lattice MTS mvtnorm pracma Rcpp RcppArmadillo sparsevar]; }; @@ -5406,7 +5419,7 @@ in with self; { VDSPCalibration = derive2 { name="VDSPCalibration"; version="1.0"; sha256="1hrmmhvk3mhd3bdl0msnm5shcj4cjgd3pn1rkfkv8fh4llqvz7w8"; depends=[]; }; VEwaning = derive2 { name="VEwaning"; version="1.2"; sha256="1438j8dlfmn2yacg1haa66fmmv11x49b38qyl03jvw9vcxi1gz4x"; depends=[ggplot2 survival]; }; VEwaningVariant = derive2 { name="VEwaningVariant"; version="1.3"; sha256="1w0d7z86gg16vjg3bd9flr53q02wjz5hzs0460hx167ixi13m5jv"; depends=[ggplot2 Rcpp RcppArmadillo survival]; }; - VFP = derive2 { name="VFP"; version="1.4"; sha256="0p964fag5a0p23x6jgyc5bx4kp3ar9jdh88n4nybiv884sdfbk90"; depends=[gnm MASS VCA]; }; + VFP = derive2 { name="VFP"; version="1.4.1"; sha256="14idww1vy695mp9v2h0nxqi6flmm41cr30i0yd2nwjsnriwqgzak"; depends=[gnm MASS VCA]; }; VFS = derive2 { name="VFS"; version="1.0.2"; sha256="1b8sl8id2gj4iqkpjzd3giybbix2jvskwsbw1kqj3zqr77hygxwg"; depends=[e1071 nleqslv]; }; VGAM = derive2 { name="VGAM"; version="1.1-7"; sha256="0zkmj7crkkvi7ki88f6vfn7x8gf0ycrbg13wann7wirj4cwjvid4"; depends=[]; }; VGAMdata = derive2 { name="VGAMdata"; version="1.1-6"; sha256="14s8118k66yy0dljr364dbq1hrvjwmg69n3ls3dbmxfm1f9vrmnw"; depends=[VGAM]; }; @@ -5416,6 +5429,7 @@ in with self; { VIFCP = derive2 { name="VIFCP"; version="1.2"; sha256="0w41k25vss806m5vpwmmcfsmwaixmln0pliql3a6xlwsihha5i34"; depends=[]; }; VIGoR = derive2 { name="VIGoR"; version="1.1.1"; sha256="1dpl9y86i8hcrbyvgfkix4vpg5rsz5y6g8m73jl8kzpi686r9ikv"; depends=[]; }; VIM = derive2 { name="VIM"; version="6.2.2"; sha256="1r0myxcx8y1a3fkf9ssk882f09snn2j6zilsygpld32hahn4k9xg"; depends=[car colorspace data_table e1071 laeken magrittr MASS nnet ranger Rcpp robustbase sp vcd]; }; + VIMean = derive2 { name="VIMean"; version="0.1.0"; sha256="0kxrcigp94h2j1vx5pj24sp73iqxldc1ygm5bak4jrld66r0nb5b"; depends=[]; }; 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.1"; sha256="096a7nx60qm4b7fil4s3r4mlp8fq60v0lq893jh3ij6gm63mfcim"; depends=[]; }; VLMC = derive2 { name="VLMC"; version="1.4-3-1"; sha256="0cwfpxcj8g68j9z9fl66i0amj8ypf199iv3yyxzsmniqv4w5x4ar"; depends=[MASS]; }; @@ -5424,6 +5438,7 @@ in with self; { VMDecomp = derive2 { name="VMDecomp"; version="1.0.1"; sha256="0iq2lj7n77qmryf95cjl2y869bhy6i0mx44qls7xc07g0qplwqx3"; depends=[data_table glue Rcpp RcppArmadillo]; }; VOSONDash = derive2 { name="VOSONDash"; version="0.5.7"; sha256="1qivx5ddl9jsn6q6ic2w8jrczxlx23z087k5arfz2rixgj7rndyg"; depends=[data_table httpuv httr igraph lattice magrittr RColorBrewer shiny SnowballC systemfonts syuzhet textutils tm vosonSML wordcloud]; }; VPdtw = derive2 { name="VPdtw"; version="2.1-14"; sha256="1pr8jrd7ymgf46h2gbvanqjrvpc4xs39sk86vvxhawzf3w31g257"; depends=[]; }; + VSOLassoBag = derive2 { name="VSOLassoBag"; version="0.99.0"; sha256="1pp1rycxfzg3cif73q5z6c06ln6h31b24mxgbh48nhirjgp8b6g1"; depends=[ggplot2 glmnet pbapply POT SummarizedExperiment survival]; }; 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]; }; VTShiny = derive2 { name="VTShiny"; version="0.1.0"; sha256="1zq6irla3q7hqs8jpjdya7vy3frqrj72rwmd1sgxwrkgpmpxw6x7"; depends=[EnvStats rmarkdown shiny]; }; @@ -5442,7 +5457,7 @@ in with self; { VennDiagram = derive2 { name="VennDiagram"; version="1.7.3"; sha256="0ilcxcp8qskmb5cp7fyb7i0qizg42lrx0ny8ws3if90kfrglghp7"; depends=[futile_logger]; }; VertexSimilarity = derive2 { name="VertexSimilarity"; version="0.1"; sha256="0f638y272dbmz5747wxqy9pxasxk3a9f9wf31gf297qx7268ab1m"; depends=[igraph]; }; VertexSort = derive2 { name="VertexSort"; version="0.1-1"; sha256="0n9m5l85ylin6756rsksak94nv0626qd7czhhj6plz4nfrr27sgl"; depends=[igraph snowfall]; }; - VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.8"; sha256="0yvm3kkc7ssk85ripdgbxj8gazqb1dfswgjy63c3gb135zi2cbqk"; depends=[Rcpp]; }; + VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.9"; sha256="08gpsi6vrink2dd1ngwbhi8yxrasgh0xi5klc64v7ig49hky9wma"; depends=[Rcpp]; }; VetResearchLMM = derive2 { name="VetResearchLMM"; version="1.0.0"; sha256="1a7wm04bsr5shak7l8ypxlhlnx3qkq1jdpjnji1n05p6b00ih9h1"; depends=[ggplot2 lme4 lmerTest multcomp nlme]; }; ViSiElse = derive2 { name="ViSiElse"; version="1.2.2"; sha256="1ay09dahlqnfrgf4gl4s45a4ahrk2xliagxqz5h826w2vzsawqcc"; depends=[chron colorspace ggplot2 Matrix reshape2 stringr]; }; VicmapR = derive2 { name="VicmapR"; version="0.1.9"; sha256="0c1mmnng0i7lzgp745h59w34fl94pl5cwsz65wy7pm2sy5p80mjb"; depends=[cli curl DBI dbplyr dplyr glue httr kableExtra knitr leaflet lubridate magrittr mapview purrr rlang rvest sf xml2]; }; @@ -5451,7 +5466,7 @@ in with self; { VirtualPop = derive2 { name="VirtualPop"; version="1.0.2"; sha256="0g3yzv9fqmxydqq6b56l6abz03slk7425aahixs3q26gwp587rz4"; depends=[HMDHFDplus msm]; }; VisitorCounts = derive2 { name="VisitorCounts"; version="1.0.1"; sha256="155ibah6qg5xdyp8vnpwgv0clqhr6ys3310dd9sipawz0730kcgw"; depends=[Rssa]; }; Visualize_CRAN_Downloads = derive2 { name="Visualize.CRAN.Downloads"; version="1.0.1"; sha256="0z2v2izn4aj3i6f5gh8r7pkrqpbb82bv9v4s4vqxgm066a51m4p2"; depends=[cranlogs htmlwidgets plotly]; }; - VisualizeSimon2Stage = derive2 { name="VisualizeSimon2Stage"; version="0.1.0"; sha256="19x4x6liv6782pxc9ai82m4g2z5xv9m5d3snl7k7vfnpqia71rh1"; depends=[ggplot2]; }; + VisualizeSimon2Stage = derive2 { name="VisualizeSimon2Stage"; version="0.1.1"; sha256="1xb001jdhf0z96zg51pkg9jng4nb4f7asqip7s5kx46fmzd1343s"; depends=[ggplot2]; }; VorteksExport = derive2 { name="VorteksExport"; version="0.1.8"; sha256="0r9wmd9bdarjkqmpwp85xz27nbyhjkcpxm8qb8bqjmxq4nds6nxx"; depends=[]; }; Voss = derive2 { name="Voss"; version="0.1.5"; sha256="00f3ljm85z8gr1qyc6nj9g35ywzm78khy8r82wb5ys8fx68n0vwl"; depends=[fields]; }; VoxR = derive2 { name="VoxR"; version="1.0.0"; sha256="16r9ggc5x889g8rjqvp1q2kgf5asjzhykd1ldjy3ny9m48p501ad"; depends=[circular data_table dplyr fastcluster FNN geometry raster Rfast rgl]; }; @@ -5535,7 +5550,7 @@ in with self; { 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.6"; sha256="1yd4mbsa6y69lfyx78lda5a65jj6zahxi2yjbn6vfr0l9pvvjcxj"; depends=[rJava]; }; XLS = derive2 { name="XLS"; version="0.1.0"; sha256="0a4jbfz9x9rn4k5v7qh3r9p7pal4piqg01469237lkq00m3lijy5"; depends=[mpoly]; }; - XML = derive2 { name="XML"; version="3.99-0.12"; sha256="053dlc1762qjqmqiq0sb9qnrpg8rx1a8inizq1fl1gw6r0jr886b"; depends=[]; }; + XML = derive2 { name="XML"; version="3.99-0.13"; sha256="0fppx0jnqxx3l7y8ivb56sq0fjcqv3fn226i4s03mi7hwak6iic5"; 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]; }; @@ -5556,12 +5571,13 @@ in with self; { Z10 = derive2 { name="Z10"; version="0.1.0"; sha256="02kxlzplmss68zj1z97fvpcjyhhpic9hlx8f5j3gqn3m1mqm1dja"; depends=[dplyr lubridate magrittr rjson stringr]; }; ZIBseq = derive2 { name="ZIBseq"; version="1.2"; sha256="13rjy4jl9wil6hhpra4qmdis0iyqxchzsf9l7q6r0dz1f7dpd2nq"; depends=[gamlss gamlss_dist nlme]; }; ZIM = derive2 { name="ZIM"; version="1.1.0"; sha256="0scyfjn4ilsvha3x41c3b8bcfi31hlhwm77wn2a8hj5dsvnnmzig"; depends=[MASS]; }; + ZINAR1 = derive2 { name="ZINAR1"; version="0.1.0"; sha256="1didfjb4215k9q82n1vaqln6f7fszsycsflydak2zl7xwficwhy6"; depends=[gamlss_dist gtools MASS scales statmod VGAM]; }; ZINARp = derive2 { name="ZINARp"; version="0.1.0"; sha256="1s5nvxcc7nw2kz90i7fqw5fi2qzzbsm5ppn92695v44q38h8jw9s"; depends=[progress]; }; ZIPBayes = derive2 { name="ZIPBayes"; version="1.0.2"; sha256="0j56smgf44fki70jc6aypksbl70pyppc6s3xv82yrq5rndym077k"; depends=[MASS Rcpp]; }; ZIPFA = derive2 { name="ZIPFA"; version="0.8.1"; sha256="134pkdn4slhiv27rdkkmh2z7xch30ns0jhzxgd7r05bky0z1iri1"; depends=[doParallel foreach Matrix optimx trustOptim]; }; ZIprop = derive2 { name="ZIprop"; version="0.1.1"; sha256="1gvf6z7mx543a0hiqcknwhkplqa3mfmw3swi8n9vma10bqmgysx7"; depends=[data_table purrr rgenoud]; }; ZRA = derive2 { name="ZRA"; version="0.2"; sha256="1sx1q5yf68hhlb5j1hicpj594rmgajqr25llg7ax416j0m2rnagi"; depends=[dygraphs forecast]; }; - ZVCV = derive2 { name="ZVCV"; version="2.1.1"; sha256="0gc76j9i8fkm2v638nyzzb1qxl4zmapbspkkaffb8gi5qyjja448"; depends=[abind BH dplyr glmnet magrittr mvtnorm Rcpp RcppArmadillo Rlinsolve]; }; + ZVCV = derive2 { name="ZVCV"; version="2.1.2"; sha256="0ws0v7i6r7skb8lv6j718k29v5qsy1b007jxidv81iv0jcz9zfpy"; depends=[abind BH dplyr glmnet magrittr mvtnorm Rcpp RcppArmadillo Rlinsolve]; }; ZeBook = derive2 { name="ZeBook"; version="1.1"; sha256="0v98kbz9njjdx60x9dn8hl8mc6x19i5knjyg2gkwfd667yy1rkl6"; depends=[deSolve triangle]; }; ZetaSuite = derive2 { name="ZetaSuite"; version="1.0.1"; sha256="10b0acz88vc80x49wwv581abym75wswi4z92mnl4xn0vw62vjpqa"; depends=[dplyr e1071 ggplot2 gridExtra mixtools RColorBrewer reshape2 Rtsne]; }; ZillowR = derive2 { name="ZillowR"; version="1.0.0"; sha256="1q0hdm654p6vkmajwrhx18ifm9sc4czdfd7cabhkqdky4p07c89r"; depends=[RCurl XML]; }; @@ -5586,11 +5602,11 @@ in with self; { abclass = derive2 { name="abclass"; version="0.4.0"; sha256="1cg8xfzxya585wzk6y2kf4flgjxlspzqqqksbig8nlxmwxxj413p"; depends=[Rcpp RcppArmadillo]; }; abcrf = derive2 { name="abcrf"; version="1.9"; sha256="08mh1a6gxp0mfx6qnp1qzcrfx7xp64qj9kad4ziyswfx22ykdsxi"; depends=[doParallel foreach MASS matrixStats ranger Rcpp RcppArmadillo readr stringr]; }; abcrlda = derive2 { name="abcrlda"; version="1.0.3"; sha256="04pcdnk2szfpc2ylcw5ds7y895ivy03bycal03kxw7cwylzxasks"; depends=[]; }; - abctools = derive2 { name="abctools"; version="1.1.3"; sha256="07s9dg10i8lsxl73b4n2hynca2fjgb0ykb0dz8c3zv6cgw3cyx97"; depends=[abc abind Hmisc plyr]; }; + abctools = derive2 { name="abctools"; version="1.1.4"; sha256="02c473fqj7yd27flma2x7flqzqbrnba2xfcjy466nww0sm1vvhjg"; depends=[abc abind Hmisc plyr]; }; abd = derive2 { name="abd"; version="0.2-8"; sha256="191gspqzdv573vaw624ri0f5cm6v4j524bjs74d4a1hn3kn6r9b7"; depends=[lattice mosaic nlme]; }; abdiv = derive2 { name="abdiv"; version="0.2.0"; sha256="053l94br8sdy30078ssncq5i5zvdxa3m72ymbwbh0cm3zmsljj29"; depends=[ape]; }; abe = derive2 { name="abe"; version="3.0.1"; sha256="1f19h3xzzmjhvwc1rrb8z0rai3ip03y4gdi2gg9bfr5sg2nfklk6"; depends=[]; }; - abess = derive2 { name="abess"; version="0.4.5"; sha256="0lv9cggbc33xpc3h6a8nsa72r7217lb4qzwvxmy7kg4f6ny1r0rs"; depends=[MASS Matrix Rcpp RcppEigen]; }; + abess = derive2 { name="abess"; version="0.4.6"; sha256="08dyhn8a5lnizlyj33i1fr4mh52yzcnla4q9sanfg17705vvjk6m"; depends=[MASS Matrix Rcpp RcppEigen]; }; abglasso = derive2 { name="abglasso"; version="0.1.1"; sha256="0h8p912l0202wyr5vjsbzw5mr70m56ab39wv833g6c4c3187479y"; depends=[MASS pracma statmod]; }; abind = derive2 { name="abind"; version="1.4-5"; sha256="0b1zd8jbnl6l292cr9rb50m09fy3ylxvzkpgi5lfb1nbzddcwfis"; depends=[]; }; abjData = derive2 { name="abjData"; version="1.1.2"; sha256="0q7l9lxm41pjkdv98axx87wcxjxfyccfwi2k1b29g07pfjszs0hv"; depends=[]; }; @@ -5634,7 +5650,7 @@ in with self; { act = derive2 { name="act"; version="1.1.9"; sha256="094sm7afkjrgyhc1p7wj7akrlm65fxwkljgnlldq0z2bf2df07ab"; depends=[openxlsx progress stringi stringr textutils XML xml2]; }; actel = derive2 { name="actel"; version="1.2.1"; sha256="10gv6vc921ma6ckck9807j3j7z0m8kalwv5aj8xg6i2yqnia2zgs"; depends=[circular data_table DiagrammeR DiagrammeRsvg fasttime ggplot2 knitr readr reshape2 rmarkdown rsvg scales stringi stringr svglite]; }; actilifecounts = derive2 { name="actilifecounts"; version="1.1.0"; sha256="1v423byxanbvqk3s76s67r6ivqcg3ld4yddcvf7cmwwlrkd72ck4"; depends=[gsignal pracma]; }; - activAnalyzer = derive2 { name="activAnalyzer"; version="1.0.5"; sha256="1xy98lrlq9rn3v5699jw031wka4fyd7gydgxd5897amnc9in9z31"; depends=[dbplyr dplyr flextable forcats ggplot2 golem hms lubridate magrittr modelr patchwork PhysicalActivity reactable rmarkdown RSQLite shiny shinycssloaders shinydashboard shinydashboardPlus shinyFeedback shinyjs stringr tidyr zoo]; }; + activAnalyzer = derive2 { name="activAnalyzer"; version="1.1.0"; sha256="1fmh7jyvxlik229g136qvd1flzgklv8yn1i60lvngw29zkw95cvn"; depends=[dbplyr dplyr flextable forcats ggplot2 golem hms lubridate magrittr modelr patchwork PhysicalActivity reactable rmarkdown RSQLite shiny shinycssloaders shinydashboard shinydashboardPlus shinyFeedback shinyjs stringr tidyr zoo]; }; activPAL = derive2 { name="activPAL"; version="0.1.3"; sha256="1h6hp5z89ji73gdzxy1dgbfwjysiy5lvcqh90xagpb7sa7ahs3na"; depends=[devtools dplyr ggplot2 lubridate magrittr tidyr]; }; activatr = derive2 { name="activatr"; version="0.1.0"; sha256="0c0sn0b5w1k7kgrx8b6vanamlxsr9nqvkwhm0d8imghq8wl90h43"; depends=[dplyr geosphere ggmap glue httr lubridate magrittr rlang tibble timetk xml2]; }; activegp = derive2 { name="activegp"; version="1.1.0"; sha256="1yfib5q649kag45ryyqsbq9lq9yd74rrjjk65a6c9rkfa4f6w8xv"; depends=[hetGP lhs MASS numDeriv Rcpp RcppArmadillo RcppProgress]; }; @@ -5654,11 +5670,12 @@ in with self; { adana = derive2 { name="adana"; version="1.1.0"; sha256="0zi3a17rapc1z074k3yzgjv2b6ba6c9d54b1hm0ivvgfd335981f"; depends=[optimx ROI ROI_plugin_optimx]; }; adapt4pv = derive2 { name="adapt4pv"; version="0.2-2"; sha256="08zgzidw0wmpvhzsn4h8yhzgc45zh16grjp4y8mcc9lhk7pikhy5"; depends=[doParallel foreach glmnet Matrix speedglm xgboost]; }; adaptDiag = derive2 { name="adaptDiag"; version="0.1.0"; sha256="02xpphdhvryc06yji89mn7m2djgkpy19ph4sd52rhfsma7xn6hyf"; depends=[doParallel extraDistr foreach pbmcapply]; }; + adaptIVPT = derive2 { name="adaptIVPT"; version="1.0.0"; sha256="1zjz61zk0q9d1ih3ghzmiz1sxjpdypbx1vl72iw51sqz0nl89n95"; depends=[Rcpp RcppArmadillo RcppProgress rgl]; }; adaptMCMC = derive2 { name="adaptMCMC"; version="1.4"; sha256="0yydliqhkz1y8lm4sb2biikbk8wmcyfqmamhm059843yk46nr6an"; depends=[coda Matrix ramcmc]; }; adaptMT = derive2 { name="adaptMT"; version="1.0.0"; sha256="1yllz1zd4cryf5bj8b2lcrj6zl79yjkllyh9p02ikryy5qmg419b"; depends=[]; }; adaptTest = derive2 { name="adaptTest"; version="1.1"; sha256="1qfhb3c64a5pl23vk7z6a3h46yb69cvzp1bpxnpybhxs42s80l5q"; depends=[lattice]; }; 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]; }; + adaptiveGPCA = derive2 { name="adaptiveGPCA"; version="0.1.3"; sha256="1766b3d9ysa9axfxqwy6gzj0z8hsl34pic6l63nbidqas55vnjqa"; depends=[ape ggplot2 phyloseq shiny]; }; adaptivetau = derive2 { name="adaptivetau"; version="2.2-3"; sha256="1jficl4yidix35q8yqs3pcv813wq3pg4hpw4ah4dprvg95bl7wwx"; depends=[]; }; adaptr = derive2 { name="adaptr"; version="1.1.1"; sha256="0vq3qavydqyd3vyv6jpgig2qrv8lcnbyy81n3k8sbfcf16p7p0ip"; depends=[]; }; adaptsmoFMRI = derive2 { name="adaptsmoFMRI"; version="1.2"; sha256="00npcl2js9vj5r3l66cp5d2l807klia581pig1gsyjjq4rvmfa7v"; depends=[coda Matrix MCMCpack mvtnorm spatstat spatstat_geom]; }; @@ -5673,7 +5690,7 @@ in with self; { additiveDEA = derive2 { name="additiveDEA"; version="1.1"; sha256="15nxpdybsda6yhjk23bpafr8v1zdx8332pcxf26k795q3ypjpiy2"; depends=[Benchmarking lpSolveAPI]; }; additivityTests = derive2 { name="additivityTests"; version="1.1-4.1"; sha256="00kzfv86z6kk0gvbz9mg3p6xi5fb8cn74rhslr17rdpd02md0884"; depends=[]; }; addreg = derive2 { name="addreg"; version="3.0"; sha256="13bwmgxylwi02g60j1rr51cr5jvvkl2nvf2lnnhnq46fhvs2ma7s"; depends=[combinat glm2 turboEM]; }; - ade4 = derive2 { name="ade4"; version="1.7-19"; sha256="1vv5y6badksnpjb3bcphhjdzzh6i2grmwnsalcf2cfpr3y412lf8"; depends=[MASS pixmap sp]; }; + ade4 = derive2 { name="ade4"; version="1.7-20"; sha256="0yxd9dgci3rzz807wsb76wis12ipgjv9w86smdyz20jrnn45giyx"; depends=[MASS pixmap sp]; }; ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.3-1"; sha256="1y0f62n8iv002ayd1nyl3bmszw558niwnfzjpvk0a7cbvfdyvwcg"; depends=[ade4 adegraphics lattice]; }; adea = derive2 { name="adea"; version="1.3.1"; sha256="0jvxgqwfga4gsn5jcdklfq2qci3xyvmkdfjappjwf72swb2rkv0n"; depends=[Benchmarking combinat knitr lpSolveAPI rmarkdown]; }; adegenet = derive2 { name="adegenet"; version="2.1.8"; sha256="09ahgz1ddsdn30fmi5kimdcrcnw18ryqpjcixhyp4xz0xwz2rmw0"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny vegan]; }; @@ -5688,20 +5705,21 @@ in with self; { adeptdata = derive2 { name="adeptdata"; version="1.1"; sha256="0wzavbwc1slyr3wh5jkapghpa748rc86pbw5b4gcxki73r08r7j2"; depends=[]; }; adespatial = derive2 { name="adespatial"; version="0.3-20"; sha256="1sv4kc30l226x24s3gvv8dq0p2y33h8vv474bfpm4z08cfah13pq"; depends=[ade4 adegraphics adephylo lattice MASS shiny sp spdep vegan]; }; adfExplorer = derive2 { name="adfExplorer"; version="0.1.6"; sha256="06sk68580i7jg9lk4jj64ns04y4q6amzsh0k7nxhfdib107yajnp"; depends=[]; }; + adformR = derive2 { name="adformR"; version="0.1.0"; sha256="02krkpqsj53j4mprbw25bycbb2xlhcgnglcp0dl24zw44mfxy9n7"; depends=[jsonlite]; }; adheRenceRX = derive2 { name="adheRenceRX"; version="1.0.0"; sha256="19kimj88dmcc8mq3s4l7pph9jz8p57gbjyn0pn5zkrcjdrwncslm"; depends=[anytime dplyr lubridate purrr Rcpp rlang tidyr]; }; adimpro = derive2 { name="adimpro"; version="0.9.3"; sha256="0njw38vcdm02sni193nj10mpv7hiklpamrkjlz5bnhjxx9mvf4cl"; depends=[awsMethods]; }; adiv = derive2 { name="adiv"; version="2.2"; sha256="0qmykswwirhas4rrwb4jaqicjkqsmq6k11718hzk65h3xdnpg6kr"; depends=[ade4 adegraphics ape cluster lpSolve phylobase phytools rgl]; }; adjROC = derive2 { name="adjROC"; version="0.2.0"; sha256="0ipvp7f7asg8pbzbm3rnn8hp20gs3aqispvagddjw1yd39h0zgrk"; depends=[ggplot2 ROCit]; }; adjSURVCI = derive2 { name="adjSURVCI"; version="1.0"; sha256="0nv6m7ds57d0h44d745s0424ssrgn39ihd294dgrzrpmh8gxhq95"; depends=[Rcpp RcppArmadillo survival]; }; adjclust = derive2 { name="adjclust"; version="0.6.6"; sha256="0kin57r12g1cv4pi6br3c71rpjhfvpkysx7jly3wf0ilj6bfs6vk"; depends=[capushe Matrix Rcpp RcppArmadillo sparseMatrixStats]; }; - adjustedCurves = derive2 { name="adjustedCurves"; version="0.9.0"; sha256="1p8zfswd9b98mgffq9znq7npajr7gh0v82faxajxh4mxqfb1rdjk"; depends=[doParallel doRNG dplyr foreach R_utils rlang]; }; + adjustedCurves = derive2 { name="adjustedCurves"; version="0.9.1"; sha256="1mhl4mzw4286kp9khlv2kpfvzhnvwkmdicwc0z7mlqyi46znylib"; depends=[doParallel doRNG dplyr foreach R_utils rlang]; }; 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-3"; sha256="1lj99vm014fglw57qc00wzxbx4kzb4ky5iisqd756dfg3k41wa55"; depends=[EbayesThresh]; }; - admiral = derive2 { name="admiral"; version="0.8.4"; sha256="0d7ikgxyvb14p3g3vjjkqhr5yhm7pa3wfr9mb3ann42lnzn5950b"; depends=[admiraldev assertthat dplyr hms lifecycle lubridate magrittr purrr rlang stringr tidyr tidyselect]; }; - admiral_test = derive2 { name="admiral.test"; version="0.3.0"; sha256="14b53g951aay1xq9qz1dw07lm00ijd244laabcxmid1ndqyqbjfr"; depends=[]; }; - admiraldev = derive2 { name="admiraldev"; version="0.1.0"; sha256="07lbb0cgadbs0yvn0rm713hm66pwqmzmfryy0h7p6jd6kqmx014a"; depends=[assertthat dplyr hms lifecycle lubridate magrittr purrr rlang stringr tidyr tidyselect]; }; - admiralonco = derive2 { name="admiralonco"; version="0.1.0"; sha256="17c52zaqw3p9bd4gi93rbam367rldp12xsk1ayl4dyxyamazcksg"; depends=[admiral admiraldev dplyr lubridate magrittr rlang tidyselect]; }; + adlift = derive2 { name="adlift"; version="1.4-4"; sha256="1rxwsmic17kgbhh50m87mh8ag8l6b1n4p96k0qn6mkgqfiqngam5"; depends=[EbayesThresh]; }; + admiral = derive2 { name="admiral"; version="0.9.0"; sha256="1qylcl7s4sh91h18qpj6s9l61pc1c8iy1nmp7qgl1rcb6xhkn49x"; depends=[admiraldev dplyr hms lifecycle lubridate magrittr purrr rlang stringr tidyr tidyselect]; }; + admiral_test = derive2 { name="admiral.test"; version="0.4.0"; sha256="1abf7zrqj2bia784rvl3y4awyi3vpaj57lqyak2zpxiykhs8fg4s"; depends=[]; }; + admiraldev = derive2 { name="admiraldev"; version="0.2.0"; sha256="0rclhf3d2mhsbxc4imp14kpjxw6g0hdy6v4y86qnvvyrb3cik46v"; depends=[dplyr hms lifecycle lubridate magrittr purrr rlang stringr tidyr tidyselect]; }; + admiralonco = derive2 { name="admiralonco"; version="0.2.0"; sha256="1dimbbj2yb24zyfgxqkhgkq0rk69hs8yy8xq4k05v99rwj3lyng8"; depends=[admiral admiraldev dplyr lifecycle lubridate magrittr rlang tidyselect]; }; admisc = derive2 { name="admisc"; version="0.30"; sha256="01b2qjxz0qicqjm1swvm04qkiwhr7zjn7lhqv26l6rj4yb43y339"; depends=[]; }; admix = derive2 { name="admix"; version="0.4.0"; sha256="1vfga2l6yay4l8q53siibf1ljr77fmcgbddlag414jmv2awckr0c"; 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]; }; @@ -5709,8 +5727,8 @@ in with self; { adnuts = derive2 { name="adnuts"; version="1.1.2"; sha256="0nkciv5sfj3bws6kpgrnaq4ziasibaz44w64mb86zmr8420nyc1q"; depends=[ellipse ggplot2 R2admb rlang rstan snowfall]; }; adobeanalyticsr = derive2 { name="adobeanalyticsr"; version="0.3.3"; sha256="1x1mkprp42xyfgiyffkj9lwzfv79dfwdg9alxfcpmgcvcrnbxcwi"; depends=[assertthat dplyr ggplot2 glue httr jose jsonlite lifecycle lubridate memoise openssl progress purrr R6 rlang scales stringr tibble tidyr vctrs]; }; adoptr = derive2 { name="adoptr"; version="1.0.0"; sha256="08d2fsqh5vczfr9cc8l554p6f0x85g58i5zg5j2m0chlmcispfk2"; depends=[glue nloptr]; }; - adpss = derive2 { name="adpss"; version="0.1.1"; sha256="0p2gyfc4rxmms8zdsq4hjsh1njfl2s736arq8aq1am2wh1w9k5ch"; depends=[Rcpp]; }; - ads = derive2 { name="ads"; version="1.5-7"; sha256="016zpkpf1c57djqn31qwpp3qk65xdacl7x7s72y4a02pimk735bv"; depends=[ade4 spatstat_geom]; }; + adpss = derive2 { name="adpss"; version="0.1.2"; sha256="1nk12yn1n483scnphf8pab8w633dk64c8n17zlq851zywbncs0gk"; depends=[Rcpp]; }; + ads = derive2 { name="ads"; version="1.5-8"; sha256="01iyjkxk2d86nl3kd498xaaw4b8y9l142pkbyr49w1h299d3d7f7"; depends=[ade4 spatstat_geom]; }; adsDataHubR = derive2 { name="adsDataHubR"; version="0.1.1"; sha256="19csivbg3f0g2r11l7jrciqq2lhg50km7qv29xfs6ba5cf678hb9"; depends=[httr jsonlite lubridate]; }; 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.2.1"; sha256="0yynzw4sxz42vqq4dxb0cs123mbir5nnsq45v9agjw889m7k7prj"; depends=[geosphere terra]; }; @@ -5718,18 +5736,19 @@ in with self; { adwordsR = derive2 { name="adwordsR"; version="0.3.1"; sha256="1w5qg4psm8pj89f09pz7in8zkafaimik1n6hx29y55jpmbxbk2gn"; depends=[RCurl rjson]; }; afc = derive2 { name="afc"; version="1.4.0"; sha256="1iy1wa88kf6zi6x7lbd0jdir653cvzvdraliqpxbac413wwb5gwl"; depends=[]; }; afdx = derive2 { name="afdx"; version="1.1.1"; sha256="1654vxakdd11b5zhwy1vcv127xk5rifan6fs1k6w1qsk74j4drqv"; depends=[dplyr magrittr maxLik tidyr]; }; - afex = derive2 { name="afex"; version="1.1-1"; sha256="09q426s2zmzxx5ilxy0x5mflpb38pl075ss1s8xvpswkn6cia0b6"; depends=[car lme4 lmerTest pbkrtest reshape2]; }; + afex = derive2 { name="afex"; version="1.2-0"; sha256="1hii6mx4qbmv4m1hy44sp19xf0r7mc68p767bwc58qrgpawgymwb"; 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.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.2"; sha256="1z0r4r7prxbhadmkdg6345g0b5vq9dqyyw9hh3fpad9zkc7k6xbc"; depends=[]; }; - africamonitor = derive2 { name="africamonitor"; version="0.2.1"; sha256="02fgl63f460v3ssh5z5nd0gw3rny3nxs245am6slnk1l3v1pi5cj"; depends=[collapse data_table DBI RMySQL]; }; + africamonitor = derive2 { name="africamonitor"; version="0.2.2"; sha256="06k600wbvzxy3lk7niil84xndcnbar88z07qxyqwklvl07jcpc9h"; depends=[collapse data_table DBI RMySQL]; }; 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]; }; afttest = derive2 { name="afttest"; version="4.2.1.1"; sha256="06l11gjfv2a4jsdi7f88w7pk04a2mfl2jx969z7w4n4nlmz0bz8z"; depends=[aftgee ggplot2 gridExtra Rcpp RcppArmadillo survival]; }; ag5Tools = derive2 { name="ag5Tools"; version="0.0.1"; sha256="1390acslndzvvhdc6pk9cfvhval1wqgiic353f03qv0rvhxbyzad"; depends=[fs reticulate terra]; }; agRee = derive2 { name="agRee"; version="0.5-3"; sha256="1wi8jn14kpsj5z49my6fz8j6zxysddxm8svw86cnzsmnbj6mzq7x"; depends=[coda lme4 miscF R2jags]; }; + ageg = derive2 { name="ageg"; version="1.0.0"; sha256="0dcmwgznxf1jjsifpm3nn3jk25mm27l6f6f6jfi2n3crxgqfizyv"; depends=[]; }; aggregation = derive2 { name="aggregation"; version="1.0.1"; sha256="0j9g604m2ccc7hcy02539yja9cf3xcbl25gvp838bp4x8w18my46"; depends=[]; }; 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]; }; @@ -5759,15 +5778,18 @@ in with self; { 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.7.0"; sha256="0miqkhapw3ch4wss8dkygf5j5rj9jwdm7xdb4c5jfdnxdbbsxwjs"; depends=[]; }; + airGRdatasets = derive2 { name="airGRdatasets"; version="0.1.4"; sha256="1gz7irz0kzdni0dksi4qa0xa6n018l31xjdh4w1r40v38g4c6hai"; depends=[]; }; airGRdatassim = derive2 { name="airGRdatassim"; version="0.1.3"; sha256="05c108rcj4rlzrbabai95abxhyjsrrrsgvds4zamvyzpjl64f9ps"; depends=[airGR]; }; 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]; }; + airnow = derive2 { name="airnow"; version="0.1.0"; sha256="0dpx2hkh0y6769pi8xzyi327lygxysckqz85z40ps50ghw02r8bh"; depends=[cli glue httr2 jsonlite lifecycle rlang tibble]; }; airportr = derive2 { name="airportr"; version="0.1.3"; sha256="1h8h0cdfqgxv8cf9hp82sx5n4a1z88qyyxicj7d2kmmybqqz2r5n"; depends=[dplyr]; }; airports = derive2 { name="airports"; version="0.1.0"; sha256="1ahfqqfcvr731hj0h7d00jd87h1adiryh42sv4mh318lk5rglm6f"; depends=[]; }; airqualityES = derive2 { name="airqualityES"; version="1.0.0"; sha256="1kf673ajk06ggy9524lip5flpfgq0gql7d46kgnri8l3kbzw7zcj"; depends=[tibble]; }; airr = derive2 { name="airr"; version="1.4.1"; sha256="1zr8nzhy75v82sk1lxp8xk34hxz84zjk9nrgx10kzrycpyrbfjw0"; depends=[jsonlite readr stringi yaml]; }; airt = derive2 { name="airt"; version="0.2.1"; sha256="1az5fd9zr6lgmcim4v6rzckl9yyw9myvhmzs76n71864gnzkbna4"; depends=[dplyr EstCRM magrittr mirt pracma rlang tibble tidyr]; }; + aisoph = derive2 { name="aisoph"; version="0.2"; sha256="1c64slva2yb3phflxslxbpp4iydxx92hrj9xi7dv1bsbag8n9xd7"; depends=[Iso Rcpp survival]; }; ajv = derive2 { name="ajv"; version="1.0.0"; sha256="1qd5ncb7rdnnvqfknsvq9nrpxrh0zv3jyh4b91dcvfvhp262vfrm"; depends=[RJSONIO V8 yaml]; }; akc = derive2 { name="akc"; version="0.9.8.1"; sha256="0prqvjbcm9aagjhxpzidi2jr2yddzqwqrwp5rm3ki8215fwr9mln"; 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]; }; @@ -5791,7 +5813,7 @@ in with self; { 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.2"; sha256="0g0j6q810665lfa3a9xwmv0hkgcp2a8g0xq0vfpvyykyqykgid3z"; depends=[broom dplyr ggplot2 speedglm stringr survival tibble tidyr]; }; - allhomes = derive2 { name="allhomes"; version="0.3.0"; sha256="1z39qd7hkl2xy0lhf8sgc4rjf4ihi3zbsadchc97h7p7cn9mjbpk"; depends=[dplyr htmltab httr jsonlite magrittr purrr readr rlang stringr tibble tidyr]; }; + allomr = derive2 { name="allomr"; version="0.1.0"; sha256="0iprldmqww928m3mic3lcb8vhsr4ihrn83lvlx3wr3n7zch72771"; depends=[]; }; 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.7"; sha256="0sdwphzxjh8y4gi3pnsdddra0x085h30m520j8im25z1bhxp0sq7"; depends=[caTools cli dlookr dplyr future ggmosaic ggplot2 glmnet MASS MLmetrics parallelly party purrr randomForest ranger rlang ROCR rpart tibble tidyr tidyselect xgboost]; }; @@ -5803,7 +5825,7 @@ in with self; { 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]; }; - alqrfe = derive2 { name="alqrfe"; version="1.0"; sha256="0prrrbkbqq9k9xx2b6ism6wvn90iwy9sx57g9f9c8djhkmyd90pc"; depends=[MASS Rcpp RcppArmadillo]; }; + alqrfe = derive2 { name="alqrfe"; version="1.1"; sha256="0lzw1sk4iaqzmg1a39v3wxcgj9hchyjcxq7b3nm83al8r75rfvdk"; depends=[MASS Rcpp RcppArmadillo]; }; 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]; }; @@ -5852,15 +5874,16 @@ in with self; { aniview = derive2 { name="aniview"; version="0.1.0"; sha256="1klakkmdk4xllaxd0pllvxi4396n6rz2idz55niy91mp0fhcjhwf"; depends=[htmltools jsonlite]; }; anndata = derive2 { name="anndata"; version="0.7.5.5"; sha256="1ync82qp0v6zszibz8bwhlyknf99v3iki8cwq4n4vwmg9z7hrb54"; depends=[assertthat Matrix R6 reticulate]; }; annotater = derive2 { name="annotater"; version="0.2.2"; sha256="1yzsamy4zrr7v0kjnc3x034a7ffw1zj7cc5dx11pcwyhk88yba7z"; depends=[dplyr purrr readr rlang rstudioapi stringi stringr tibble tidyr]; }; + annotator = derive2 { name="annotator"; version="0.0.1"; sha256="1llr17ac1sr5ih8k5gy8rzmbjhqr3iv0xz3bh3havhlcwlcrpvj0"; depends=[glue htmlwidgets imager knitr shiny stringr]; }; anocva = derive2 { name="anocva"; version="0.1.1"; sha256="1byg40jla71k1901js5h9yq89j63d00vkm60id1fxlpv95c4wdrr"; depends=[cluster]; }; anomalize = derive2 { name="anomalize"; version="0.2.2"; sha256="13ncx17hdwv7799s7y6p3wvf59dad97y8rs9p56cbd91f6jkjgs5"; depends=[cli crayon dplyr ggplot2 glue purrr rlang rstudioapi sweep tibble tibbletime tidyr timetk]; }; anomaly = derive2 { name="anomaly"; version="4.0.2"; sha256="110rdzz6l80vjc0q0gb0f829vb70r97p19ywa7gbl2cbkj2s1cci"; depends=[assertive BH caTools cowplot dplyr ggplot2 magrittr Rcpp Rdpack reshape2 rlang robust robustbase runner xts zoo]; }; anovir = derive2 { name="anovir"; version="0.1.0"; sha256="1x7lvj7xchbv6siyc9miivmf0rlxrjflal4icyvbxgdr285s2s9w"; depends=[bbmle]; }; anscombiser = derive2 { name="anscombiser"; version="1.1.0"; sha256="1hakvxgc50zshi5kplg90r0499mihhwvhhz7bshndjxxci1ashkl"; depends=[]; }; - antaresEditObject = derive2 { name="antaresEditObject"; version="0.3.0"; sha256="04rdq3kbliac1iaxqflf3qhh58qgl9pxb2qh44wkknb91ga0845x"; depends=[antaresRead assertthat data_table doParallel pbapply whisker]; }; + antaresEditObject = derive2 { name="antaresEditObject"; version="0.4.0"; sha256="03zpg86hx3a99vvhbyj06b34lqd791l0qbs4a3g8xnd2gkmmjr75"; depends=[antaresRead assertthat cli data_table doParallel httr jsonlite pbapply whisker]; }; antaresProcessing = derive2 { name="antaresProcessing"; version="0.18.1"; sha256="1dlq850xqh9534ws88ma3vv5r79cbabn6r6a2jmicxx116s7wjrz"; depends=[antaresRead data_table]; }; - antaresRead = derive2 { name="antaresRead"; version="2.3.0"; sha256="12pvg2w7j0aaqn2xf5rgr4d25002xjbisxiva0q7rmi35jl1xkqh"; 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]; }; + antaresRead = derive2 { name="antaresRead"; version="2.3.1"; sha256="1hiyjg4qa6qpyfbwlwa787sacf23z1mjaws24nj3h18zvwq2wk87"; depends=[bit64 data_table doParallel httr jsonlite lubridate pbapply plyr shiny stringr]; }; + antaresViz = derive2 { name="antaresViz"; version="0.17.1"; sha256="072nh0x0qrbi9va27r20vjzjsbjriqbzbpwc7vl40pimjd0hd2x4"; depends=[antaresProcessing antaresRead assertthat data_table dygraphs geojsonio htmltools htmlwidgets leaflet leaflet_minicharts lubridate manipulateWidget plotly rAmCharts raster rgeos shiny sp spMaps webshot]; }; anthro = derive2 { name="anthro"; version="1.0.0"; sha256="169h2vhdd2kxh4228lx1ab3fipixvka4686ngx6h8g15li9828s9"; depends=[survey]; }; anthroplus = derive2 { name="anthroplus"; version="0.9.0"; sha256="1wnj2idgdnh2gdw34x40adijf2sxp3k72j45pqqxg4aqc1wrvvv1"; depends=[anthro]; }; anticlust = derive2 { name="anticlust"; version="0.6.1"; sha256="1f06968i5hpfavcwmcqij0mb13jhp02gbkqiijilyiz2kc8p0nfc"; depends=[Matrix RANN]; }; @@ -5870,42 +5893,43 @@ in with self; { anybadger = derive2 { name="anybadger"; version="0.1.0"; sha256="1aa09v5k5nlvhlir8saa5gnrq7cb1djbdc8y85cjgb3skay94hzv"; depends=[config glue magrittr purrr R6]; }; anyflights = derive2 { name="anyflights"; version="0.3.3"; sha256="1iwiil15zc4zq6y7ns8r6w27w75v72fm3syn46bxrspw0iy0lj3v"; depends=[curl dplyr glue httr lubridate progress purrr readr roxygen2 stringr usethis vroom]; }; anytime = derive2 { name="anytime"; version="0.3.9"; sha256="0jjpqynai5nd7mfy1smb44356f3d5bmpxhs1i9x9jw5c959c35hh"; depends=[BH Rcpp]; }; - ao = derive2 { name="ao"; version="0.2.3"; sha256="165hgrxj2gsvkczb32480i31zs82c5mamvy2c47gsz777mw9sw1h"; depends=[ggplot2 lifecycle optimizeR rlang]; }; + ao = derive2 { name="ao"; version="0.2.4"; sha256="1wdnb1hlhi52y0jg9fpxzvhmn1sjgsh4g3vg7vc0jlbsjw9fssp9"; depends=[ggplot2 optimizeR rlang]; }; aod = derive2 { name="aod"; version="1.3.2"; sha256="0p2i536s0aa54rah1l465g77k2ldn6jm6s25y9vc06mk29xvx1cv"; depends=[]; }; aods3 = derive2 { name="aods3"; version="0.4-1.2"; sha256="0rd4xr7nwac49m8h4pr8hv79giyv2rrlnz78r7mxa6lpgkmgqp4d"; depends=[]; }; aoos = derive2 { name="aoos"; version="0.5.0"; sha256="0y92vs27i0mkpjdclqzq4j9g1axkymhi3v8xp1v6hazh35yzjkfj"; depends=[magrittr roxygen2]; }; aopdata = derive2 { name="aopdata"; version="1.0.1"; sha256="11d9aipqcasrpi0fl2qnnqmg4wlsj3y9vy9cym4ka9jn2x1xxjns"; depends=[checkmate curl data_table httr sf]; }; aoristic = derive2 { name="aoristic"; version="1.1.1"; sha256="1zanf21qmnjmwzzccpdm1bwnyhv9zqjirrylfwmbpkzlmvp0a4pb"; depends=[dplyr ggplot2 lubridate openxlsx plyr scales tidyr]; }; - aorsf = derive2 { name="aorsf"; version="0.0.3"; sha256="1ckv7bz62cxmlj7i00piqyqk851fqk8rq2xk54hchvhbqi9x9s1w"; depends=[data_table Rcpp RcppArmadillo]; }; + aorsf = derive2 { name="aorsf"; version="0.0.4"; sha256="1pq4cllksky81qw0pblygsssxmw1rarygzzkmsln9jlcjgwxvw3f"; depends=[collapse data_table Rcpp RcppArmadillo]; }; aos = derive2 { name="aos"; version="0.1.0"; sha256="0nkl7dkqjfp4ahwmn3vs0akx6x2brf0m5gzzzx6pf54j1qwypbhf"; depends=[htmltools jsonlite]; }; apTreeshape = derive2 { name="apTreeshape"; version="1.5-0.1"; sha256="1wxhfp21ir9yv4wnbh7ay2x05k822nsyd5smlxmk67wm5w4vr1v1"; depends=[ape coda cubature pbapply quantreg]; }; apa = derive2 { name="apa"; version="0.3.3"; sha256="1nvhl5fqramsdrkpl1nmgr1vmki5c1lkdi1kkx7ihf0cz35f7c2a"; depends=[dplyr magrittr MBESS purrr rmarkdown stringr tibble]; }; apaTables = derive2 { name="apaTables"; version="2.0.8"; sha256="0jy6x0z9ivqqkjihqhyg3fxyghqa9gs6q2bpxzjdnbcb3kq151vd"; depends=[boot broom car dplyr MBESS tibble]; }; apaText = derive2 { name="apaText"; version="0.1.1"; sha256="1r217k60w027i63nbj24b1rm37m4qf7a6iirc941s945babkxcmb"; depends=[dplyr]; }; - apache_sedona = derive2 { name="apache.sedona"; version="1.2.1"; sha256="0iif2j6nsafjs496vj8k04z9bgzfv4y92j0a6r0a51c0i7a9k5yx"; depends=[DBI dbplyr dplyr rlang sparklyr]; }; + apache_sedona = derive2 { name="apache.sedona"; version="1.3.0"; sha256="0d9l0n0qnjx42ia53s9fss856iz9caxaa876ccbcaxavh7l7km56"; depends=[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.2.0"; sha256="0r107kl7s2zaa5mvm3926ww01k4brh4qn7y729f7l2lnmy3zidx5"; depends=[Rcpp wk]; }; + apcf = derive2 { name="apcf"; version="0.3.0"; sha256="194w409gz052a8gcsdn3v68sqjcwrhb1ck712nljd0iy1mgdz6cs"; depends=[Rcpp wk]; }; apcluster = derive2 { name="apcluster"; version="1.4.10"; sha256="1820j1xjlbmw6j2fwwv2g806dqpk5qrbbaqsrbrn6igql8pzf552"; depends=[Matrix Rcpp]; }; apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; }; 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.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]; }; + aphid = derive2 { name="aphid"; version="1.3.5"; sha256="1pwr1i3wxh0l24cqp59q6n59p21v81fmgxkb4jmf50a3ggb1lcdj"; depends=[kmer openssl Rcpp]; }; api2lm = derive2 { name="api2lm"; version="0.1.4"; sha256="1hxamdf1332z8gfp5crvjhl26v9g3ibsg68vm0pas2aprh18rpjs"; depends=[]; }; apisensr = derive2 { name="apisensr"; version="0.3.0"; sha256="1mis266s4m0hp34m7b7p008dvw7780r8rypgbpk7h5hgd1w5d7m0"; depends=[config episensr ggplot2 ggraph glue golem htmltools igraph rhandsontable rmarkdown shiny shinyjs shinymaterial]; }; aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; }; - aplot = derive2 { name="aplot"; version="0.1.8"; sha256="17256cdn46cii97s0h2zmah9vs116ybnih78734lpkn7kmvdfcfr"; depends=[ggfun ggplot2 ggplotify magrittr patchwork]; }; + aplot = derive2 { name="aplot"; version="0.1.9"; sha256="04mv2jhkk47sqmm69dbcmy84han2k19sv6vnmk572xbm19i661xg"; depends=[ggfun ggplot2 ggplotify magrittr patchwork]; }; 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.8"; sha256="129qa303fckan6n8zdgsa08720aiyv623rz5mdv4l2by53i7lb2s"; depends=[coda Deriv matrixStats maxLik mnormt mvtnorm numDeriv randtoolbox Rcpp RcppArmadillo RcppEigen RSGHB stringr tibble]; }; + appleadsR = derive2 { name="appleadsR"; version="0.1.0"; sha256="19xkzykk6zdbswdkfix9nqnfgab4r9c21rqwpma1r6fjapsp81jf"; depends=[jsonlite]; }; appler = derive2 { name="appler"; version="0.1.4"; sha256="0a3xhr2zbzni81y00sa1d35spcd1f6blhnkmyf76wf00z3vhrk2i"; depends=[glue httr jsonlite rvest xml2]; }; applicable = derive2 { name="applicable"; version="0.1.0"; sha256="1n81aa5by0fd47wjksdl0zpzf0w4vgrns6iqv5i9lqs7g64zggs0"; depends=[dplyr ggplot2 glue hardhat Matrix proxyC purrr rlang tibble tidyr tidyselect]; }; appnn = derive2 { name="appnn"; version="1.0-0"; sha256="0wkpr6lcd68wlzk6n622ab7sd99l837073czn4k56hw8bw9v68j3"; depends=[]; }; approxOT = derive2 { name="approxOT"; version="1.0.2"; sha256="1j17dcs4nxss81q1d3mf6h7nkzrq202n7pqb7phza085xmjvpksx"; depends=[BH Rcpp RcppCGAL RcppEigen]; }; approximator = derive2 { name="approximator"; version="1.2-7"; sha256="0smqjdla9mvzy164nsb0pw0sgal3w2wnyhqidp74h0smyczrr1zw"; depends=[emulator mvtnorm]; }; approxmatch = derive2 { name="approxmatch"; version="2.0"; sha256="1n6v1h4zf1nf8j1a5d0h95v6q8dff39v9061i7zzi9ci3lw04748"; depends=[]; }; + appsflyeR = derive2 { name="appsflyeR"; version="0.1.0"; sha256="1ch0cjxl7jzrdch3mz1cayc88mbf2dgp0l775c3li44204pxp8wl"; depends=[jsonlite]; }; 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]; }; @@ -5929,10 +5953,11 @@ in with self; { 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.7"; sha256="1nbz5br6vm0ka9jn2cnkf2g90l6d0pzvma2x5dlq5arpg5jmca4b"; 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]; }; + arctools = derive2 { name="arctools"; version="1.1.6"; sha256="01a1kmkmnwm8ryv1hr0w79ghbk844w7fnv1yiq9mmwrs4jbgfrcf"; depends=[lubridate runstats]; }; + ardl_nardl = derive2 { name="ardl.nardl"; version="1.2.1"; sha256="1hx2zhb1qxvg9adyx72ddw2b0b1c93qxk4zy6r7zqybcd3lrmqwb"; depends=[car dplyr gets lmtest nardl rlist sandwich stringr texreg tseries]; }; areabiplot = derive2 { name="areabiplot"; version="1.0.0"; sha256="0izgvlg174jbr3fm3qc8zh23kfs7hn9bwd40x6vm90iivrrgdcp7"; depends=[nipals]; }; areal = derive2 { name="areal"; version="0.1.8"; sha256="14hwif59lxjdf0crq5mp2w2rhz9b7l1b33r0ssd1j60ml2fv6488"; depends=[dplyr glue purrr rlang sf]; }; - areaplot = derive2 { name="areaplot"; version="1.2.2"; sha256="0vyhf3662ppcahaw2zrxgpcxcn8fysd6lhl8vgr7cs8kl6fm4x47"; depends=[]; }; + areaplot = derive2 { name="areaplot"; version="1.2.3"; sha256="1j342mgjfxca38j4xx0bp35fjdx1xsfp1czdlpahavg5xm94lwbf"; depends=[]; }; arena2r = derive2 { name="arena2r"; version="1.0.0"; sha256="14zjpglp389pldi436935fz6mgi4jdgfii1m035nsvihrms9gqkh"; depends=[dplyr ggplot2 magrittr purrr rlang shiny shinyBS shinydashboard shinyjs tidyr]; }; 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.8-1"; sha256="1msbd52989yqxqxgapgjvzfzzpkr2w9dp7ig8racqpzwqnjhpswb"; depends=[ltsa]; }; @@ -5942,7 +5967,7 @@ in with self; { argonDash = derive2 { name="argonDash"; version="0.2.0"; sha256="1wykr7y5375g1nb18ynybccxmd948xrr0gdwxxqsfjf782vlgd2d"; depends=[argonR htmltools shiny]; }; argonR = derive2 { name="argonR"; version="0.2.0"; sha256="15hlvansqnky9bnq4r7xza3hb1hzylmhz8117wxz9lxa1wiky2is"; depends=[htmltools rstudioapi]; }; argosfilter = derive2 { name="argosfilter"; version="0.70"; sha256="1cqhpq5z807azpc45d00031bhw5q69111jsblyqdp5bg6qinrj9c"; depends=[]; }; - argparse = derive2 { name="argparse"; version="2.1.6"; sha256="14p57nm0w3siqd473snzhpmnvsgl72x92pdcd64vhy2qg6nzmmra"; depends=[findpython jsonlite R6]; }; + argparse = derive2 { name="argparse"; version="2.2.1"; sha256="193pjjy4vkmzmsc1w69szafgrisvn08gddilbxcg671sdk0dxd7k"; depends=[findpython jsonlite R6]; }; argparser = derive2 { name="argparser"; version="0.7.1"; sha256="0xcl0ivsbc4iw8s7027q4cx68j6s5lihbby0xa9pmlv4wjmcvdr6"; depends=[]; }; argus = derive2 { name="argus"; version="0.1"; sha256="0k016fpz03gzsy165cqk1gbszrk7xr330hxcnjl1d5r2hnfxgvxl"; depends=[Runuran]; }; ari = derive2 { name="ari"; version="0.3.5"; sha256="03w99c918jp23d0kl26vx4m7xjicpgwl5rhn9d0fsm4kvv7j87li"; depends=[hms progress purrr rmarkdown rvest text2speech tuneR webshot xml2]; }; @@ -5956,12 +5981,12 @@ in with self; { aroma_affymetrix = derive2 { name="aroma.affymetrix"; version="3.2.1"; sha256="1yzmqh7f3x5mzws7azxa6rgqv8kcm861y9pc5ppc0vsgz7fvpvvs"; depends=[aroma_apd aroma_core future listenv MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; }; aroma_apd = derive2 { name="aroma.apd"; version="0.6.1"; sha256="0by8nss4m1hrd33bv9vdqgf67117a48y3wdkyc3q35anlz7kn3yk"; depends=[R_huge R_methodsS3 R_oo R_utils]; }; aroma_cn = derive2 { name="aroma.cn"; version="1.7.0"; sha256="0d4wgc9vyr89i1588zh61f5wjsizv9j5y0j8zhrw65r9y8ffwa0w"; depends=[aroma_core future_apply matrixStats PSCBS R_cache R_filesets R_methodsS3 R_oo R_utils]; }; - aroma_core = derive2 { name="aroma.core"; version="3.2.2"; sha256="0ma84hhqn0g4pw0b8zkdcrz96z3j3lnw3yka0gd9861s80p33q1m"; depends=[BiocManager future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; }; + aroma_core = derive2 { name="aroma.core"; version="3.3.0"; sha256="12118xdb74c4b2ca5dq57zxkrrcjjji10b5a1qxpixkrc36bfskv"; depends=[BiocManager future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; }; arpr = derive2 { name="arpr"; version="0.1.2"; sha256="02qsvmgnyr7aqgpij8m5yg9cww8wbrg6a33vxxvy3sl9v5f7vzh5"; depends=[magrittr rlang]; }; 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="10.0.0"; sha256="04qsj68zsqcwkv1ryp4l0is474siyi1b64dy41fr74ryj7mbamg8"; depends=[assertthat bit64 cpp11 glue purrr R6 rlang tidyselect vctrs]; }; + arrow = derive2 { name="arrow"; version="10.0.1"; sha256="0dwdi9sq7wv34ia6kg446pqf5za75hl6zrb2ly51p2zdr4g69p0y"; depends=[assertthat bit64 cpp11 glue purrr R6 rlang tidyselect vctrs]; }; ars = derive2 { name="ars"; version="0.6"; sha256="0zs1rk3i7pc9wcvxrvjcls194mfbvmkz7cb6pwd1cm3fzjwsyxsp"; depends=[]; }; arse = derive2 { name="arse"; version="1.0.0"; sha256="0ssaalc058m09gfcr1n0s729rx2plia3zkhlynj67drclyvhyb0i"; depends=[dplyr pracma]; }; arsenal = derive2 { name="arsenal"; version="3.6.3"; sha256="0qvs3ld28djnjnggdhqjwq8sbv8zz322qahlvf7dnx35yqf6xkms"; depends=[knitr]; }; @@ -5970,14 +5995,14 @@ in with self; { arules = derive2 { name="arules"; version="1.7-5"; sha256="0d04w28hl9gcrvkj0v0q77x4a89jhvzf1imw58xfgncap8mc6555"; depends=[generics Matrix]; }; arulesCBA = derive2 { name="arulesCBA"; version="1.2.5"; sha256="13p876k3wg84khvzf6kkjpna0l9yjxyq43nh9dnpma7sidq5ldi0"; depends=[arules discretization glmnet Matrix]; }; arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-8"; sha256="0kqvi7dzq3mrn6cq22gwxh4p54mgfn9s1sd2cfnbw1f9zp078lsn"; depends=[arules rJava]; }; - arulesSequences = derive2 { name="arulesSequences"; version="0.2-26"; sha256="09571bqqbf19w80nbs34k1zq54c6yyfcqm2a2jpkd41jmij6pvj5"; depends=[arules]; }; + arulesSequences = derive2 { name="arulesSequences"; version="0.2-27"; sha256="12x9zfl1qp88d28k7lpai0ksgkwvanqf7cw7ig6sjsg067x7pzz1"; depends=[arules]; }; arulesViz = derive2 { name="arulesViz"; version="1.5-1"; sha256="06mqdqg5amcrb75lf77wilb9v8c7f50b54p0pk76q0jvirycqrzc"; depends=[arules dplyr DT ggplot2 ggraph igraph plotly scatterplot3d seriation tibble tidyr vcd visNetwork]; }; asaur = derive2 { name="asaur"; version="0.50"; sha256="0c1rgic76w3i2xhna7i52lyc0p01s5b1mxyn55gqw6i19v9mq0b3"; depends=[]; }; - asbio = derive2 { name="asbio"; version="1.8-2"; sha256="05f0b9zl5zayrkqxfmpljwp2q3sbw8khrdqg5m3f6ic339f8iyka"; depends=[deSolve gWidgets2 gWidgets2tcltk lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; }; + asbio = derive2 { name="asbio"; version="1.8-3"; sha256="1p0hfgkfcnxdf2jivn1mm3rjdqs4arik6ajc1gc1mmdwfwh82s5x"; depends=[deSolve gWidgets2 gWidgets2tcltk lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; }; ascentTraining = derive2 { name="ascentTraining"; version="1.0.0"; sha256="1dwmr33jc2fp9x51kzlqa4vib7xmzvz9a7qlfgvhxhld2bxlrrgi"; depends=[]; }; ascii = derive2 { name="ascii"; version="2.4"; sha256="0k675an7sl00bslx4yb6vvvgnp1kl244cfjljv632asqdm3rkmrv"; depends=[codetools digest survival]; }; asciiSetupReader = derive2 { name="asciiSetupReader"; version="2.4.0"; sha256="02s3p0qqa9h1kyx96c29blwgfkdm50p10kr14wklh19gibiznyfj"; depends=[data_table haven miniUI readr rstudioapi shiny stringr vroom zoo]; }; - asciicast = derive2 { name="asciicast"; version="2.2.0"; sha256="14pbhywiv99hmmmmsr55yf8i1lwryzxply2gwikpddiqfl07fi96"; depends=[cli curl jsonlite magick processx tibble V8 withr]; }; + asciicast = derive2 { name="asciicast"; version="2.3.0"; sha256="1nz0gbfk92p8c4940wmhm28l1jvgx459hspjbjl6b52v897wv3q2"; depends=[cli curl jsonlite magick processx tibble V8 withr]; }; asciichartr = derive2 { name="asciichartr"; version="0.1.0"; sha256="1b73bbysnxy3x3gwhm80xry45m18yh716wrc93v1awk3c1p2cv3m"; depends=[]; }; asciiruler = derive2 { name="asciiruler"; version="0.2"; sha256="0xhkbsy9dypk09avazgxczyfkh3rhdxhwci688dw1lxnhxv1hj24"; depends=[stringr]; }; ascotraceR = derive2 { name="ascotraceR"; version="0.0.1"; sha256="0h7q49pdchw0apyrm813qrl4sp6hym31awh1bjlk06fd76ynj72y"; depends=[circular data_table lubridate lutz purrr sf terra]; }; @@ -5992,7 +6017,7 @@ in with self; { aspect = derive2 { name="aspect"; version="1.0-6"; sha256="13pb1pslyka706v13b7hdrzzn5bxmj2l5irpd9f1pm1n8a1ivrrl"; depends=[]; }; aspi = derive2 { name="aspi"; version="0.2.0"; sha256="0rhvxw243vvdv3hxa6pi343gcjc2cbxq1jzqirl9k1l4i3897l87"; depends=[]; }; aspline = derive2 { name="aspline"; version="0.2.0"; sha256="1a68x6jvsaxviy2w361f19iqzsdsaf9kcqw5cknf4yz9fvkqhjny"; depends=[dplyr ggplot2 magrittr mgcv Rcpp rlang splines2 tidyr]; }; - asremlPlus = derive2 { name="asremlPlus"; version="4.3.36"; sha256="0hbg7asd7z0112jarprxkanqh3f2rlrbm6hkayv0spyn4z6hpqgl"; depends=[dae doParallel dplyr foreach ggplot2 RColorBrewer reshape2 sticky stringr]; }; + asremlPlus = derive2 { name="asremlPlus"; version="4.3.40"; sha256="03w16mlri6mb4zigb9fj8rfz10kwwwdkqf4l9x8az5z52aq7b7zc"; depends=[dae doParallel dplyr foreach ggplot2 RColorBrewer reshape2 sticky stringr]; }; r_assert = derive2 { name="assert"; version="1.0.1"; sha256="0n5l48yb0djl6rdj50p1dslpw3c5kbi15yz6z6rdgic575gjwzdc"; depends=[]; }; assertable = derive2 { name="assertable"; version="0.2.8"; sha256="1cciil1nzxd8gbj49w99jiv077lbpb59vx7bmb4p218aj2h5hqq4"; depends=[data_table]; }; 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]; }; @@ -6011,7 +6036,7 @@ in with self; { assertive_sets = derive2 { name="assertive.sets"; version="0.0-3"; sha256="1cqvh2syvh5b6d85h601zjmsdbbf3h8q98ids4dfl4frdshpasc7"; depends=[assertive_base]; }; assertive_strings = derive2 { name="assertive.strings"; version="0.0-3"; sha256="0n6jrk88670g4ym0r8ii40a08a90z1xadj8wcryk8h0nl04dchfm"; depends=[assertive_base assertive_types stringi]; }; assertive_types = derive2 { name="assertive.types"; version="0.0-3"; sha256="0zxq1jfrzgw95ll7alvm0xnk7aihjdksngq4ya2whyvfjbmv4vdb"; depends=[assertive_base assertive_properties codetools]; }; - assertr = derive2 { name="assertr"; version="2.8"; sha256="00764vv86r3bn4r85in4w637harffyw605fgq0dj6mrbrwcfb650"; depends=[dplyr MASS rlang]; }; + assertr = derive2 { name="assertr"; version="3.0.0"; sha256="1wi3mz968clvwqg6mbm32zhj4vyfskklk72b4028cjsfdry6bpfp"; depends=[dplyr MASS rlang]; }; assertthat = derive2 { name="assertthat"; version="0.2.1"; sha256="17wy5bdfzg73sg2clisg1k3zyn1adkj59x56m5nwia2k8z67zkw5"; depends=[]; }; assignPOP = derive2 { name="assignPOP"; version="1.2.4"; sha256="1zzapgzf09l39bckwykzr8im2wxmndpmzykll2wi7njwlklpjry3"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; }; assignR = derive2 { name="assignR"; version="2.2.1"; sha256="1v9vc5klyk713xp1xhcndfq0qprh0553a6wr9yb6c5p5r7mwgrlh"; depends=[geosphere maptools mvnfast raster rgdal rlang sp]; }; @@ -6039,7 +6064,7 @@ in with self; { atime = derive2 { name="atime"; version="2022.9.16"; sha256="07zmnbsglaaczn0sdzqz8749hsv578lr5w8qvjwl83sqpqmfs81y"; depends=[bench data_table git2r lattice]; }; atlas = derive2 { name="atlas"; version="1.0.0"; sha256="02wm22j40llmdi6z3rzgbc5fpkzmjfq0xar33bypvj1dx1zxygnd"; depends=[httr testthat]; }; atmopt = derive2 { name="atmopt"; version="0.1.0"; sha256="1h79ngq1236gz4w29fs3nj46a3m1x8a28z3xnhc6wn3a46cf8zzi"; depends=[DoE_base gtools hierNet]; }; - atom4R = derive2 { name="atom4R"; version="0.3-1"; sha256="0a3q76rl2gr2yvsbq5czbglvrwvkndbw6sskbrf86gmdksyb3ssc"; depends=[httr jsonlite keyring R6 rdflib readr XML zip]; }; + atom4R = derive2 { name="atom4R"; version="0.3-3"; sha256="08n9apmliwri1vyqwfvyqi7m8b9nj7zpi1vg8gcqlg17skxndm2m"; depends=[httr jsonlite keyring R6 rdflib readr XML zip]; }; atpolR = derive2 { name="atpolR"; version="0.1.1"; sha256="1mi2xghd5vxy6qx621dihx70wk3w1nqvm2h3j2drrb84b8zbvcvh"; depends=[Rdpack sf stringr terra]; }; atsd = derive2 { name="atsd"; version="1.2.0"; sha256="0jan8r5f2r3l2xpdf9rrv4smkr2l645rfdgdfjb1xa54jd3pqvqs"; depends=[httr RCurl]; }; attachment = derive2 { name="attachment"; version="0.3.0"; sha256="0rw1dqglnfwhql8342h15xq9qbvcsxd5cvipjvlz827ri428r8r0"; depends=[cli desc glue knitr magrittr rmarkdown roxygen2 stringr withr]; }; @@ -6076,16 +6101,16 @@ in with self; { autocogs = derive2 { name="autocogs"; version="0.1.4"; sha256="0v27l9a0ysj7x9wjka1jl1bq9rmxmzldclcp1w59a6807wjlszhx"; depends=[broom checkmate diptest dplyr ggplot2 hexbin MASS mclust moments progress tibble]; }; autoencoder = derive2 { name="autoencoder"; version="1.1"; sha256="0ly1aanayk28nx6yqfhl7d0zm4vg6rfjikf5ibn8zhmkrfyflj1y"; depends=[]; }; autoharp = derive2 { name="autoharp"; version="0.0.10"; sha256="0jn7nya4lb1pvdy7yyimxga4gn042jqwl3w82m6c244kqydm5fi0"; depends=[dplyr igraph knitr lintr magrittr pryr rlang rmarkdown shiny stringr tibble tidyr]; }; - autohrf = derive2 { name="autohrf"; version="1.0.4"; sha256="1fg3zxq39fiwj8jgxjzp71df7dkxy4srn2z3lfabacvlxg4q3r5k"; depends=[cowplot doParallel dplyr foreach ggplot2 gtools lubridate magrittr RColorBrewer]; }; + autohrf = derive2 { name="autohrf"; version="1.1.0"; sha256="1zmnrfak91q10aa9a3i816hln2skvbnamigcbsc1dbkj0j6mdqwd"; depends=[cowplot doParallel dplyr foreach ggplot2 gtools lubridate magrittr RColorBrewer]; }; autoimage = derive2 { name="autoimage"; version="2.2.3"; sha256="1jhkd7mbig6wpyc69iynfrj5i62lrwcwqbgjkmq8b9p5raglm1g2"; depends=[colorspace fields ggplot2 mapproj maps MBA]; }; autokeras = derive2 { name="autokeras"; version="1.0.12"; sha256="0wyqz40fc277z1q1zxdmmjzksnmlh58r27a6hx08h6hmzvng5avy"; depends=[keras reticulate]; }; automagic = derive2 { name="automagic"; version="0.5.1"; sha256="1mmm6kj6mxrn3s4v8ryszkxr9z7bh9cvhin7xjq111fkwly7wjkq"; depends=[dplyr formatR knitr magrittr purrr remotes yaml]; }; automap = derive2 { name="automap"; version="1.0-16"; sha256="0jz0p28gmx9cpzv4cz0xhbml3w1inf2nsd2ynbhmfxg5rm2f7dca"; depends=[ggplot2 gstat lattice maptools reshape sp]; }; automl = derive2 { name="automl"; version="1.3.2"; sha256="1nrg8q3y6rv69nmnsylg8rps4b4prx46j5a8ljlr24yc34504ck3"; depends=[]; }; - autonewsmd = derive2 { name="autonewsmd"; version="0.0.3"; sha256="0r642l1ifkj9dnzi7jbxfx9l40sm4yyjrbzb9v9w5dlmswlbay3b"; depends=[data_table git2r magrittr R6 rmarkdown]; }; + autonewsmd = derive2 { name="autonewsmd"; version="0.0.4"; sha256="0bpwg9gr55c9fyj9xhm8hr2zhw2skghqahdw4k2l402kx8aciq1p"; depends=[data_table git2r magrittr R6 rmarkdown]; }; autoplotly = derive2 { name="autoplotly"; version="0.1.4"; sha256="1z577jvadgiz028z7x0786d3qhlkrvv9i34xmllizvg94kxv3bl1"; depends=[ggfortify ggplot2 plotly]; }; autoshiny = derive2 { name="autoshiny"; version="0.0.2"; sha256="0s06ynnirgsh19x8qq4020piirkhvjqpvz372syygvlal062y6cn"; depends=[shiny]; }; - autostats = derive2 { name="autostats"; version="0.3.1"; sha256="1yn1p7zkswx0jswvfnizh5lzzwihn2wlwjw7bcv55zjpm9r3mhi8"; depends=[agtboost broom data_table dials doParallel dplyr flextable FOCI forcats framecleaner ggeasy ggplot2 ggthemes gtools janitor jtools lubridate magrittr nnet parsnip party patchwork presenter purrr readr recipes recosystem rlang rlist rsample stringr tibble tidyr tidyselect tune workflows xgboost XICOR yardstick]; }; + autostats = derive2 { name="autostats"; version="0.4.0"; sha256="0xyfv2akv308g3r0wq2dcg7l24p6bf3524x1ikj1lfmw07hca6k6"; depends=[broom data_table dials dplyr framecleaner ggeasy ggplot2 ggthemes gtools janitor jtools magrittr nnet parsnip party patchwork presenter purrr recipes recosystem rlang rlist rsample stringr tibble tidyr tidyselect tune workflows xgboost yardstick]; }; autostsm = derive2 { name="autostsm"; version="3.0.3"; sha256="1d80l7lxzrpwdd92cc41ykj2ylkdhndamqphprw9a3wf0zn7l39d"; depends=[data_table doSNOW foreach forecast ggplot2 ggrepel gridExtra kalmanfilter lmtest lubridate maxLik progress 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.8.2"; sha256="08h99iy05s1r9ix1i0mbzpz14hhvk0ima9165hhlxkl7w6qqld9j"; depends=[]; }; @@ -6097,6 +6122,7 @@ in with self; { avocado = derive2 { name="avocado"; version="0.1.0"; sha256="0qy9ripwydm3f70rpxwk0asc7r25hg8jcbrr4rz8bxs93q1lsz8x"; depends=[]; }; aweSOM = derive2 { name="aweSOM"; version="1.3"; sha256="0nfbn7rgazvc5nljf8i7bwpxy5j0w404bnrvi02k97jvmrra1dyb"; depends=[bslib cluster data_table DT e1071 fields foreign ggplot2 haven htmltools htmlwidgets kernlab kohonen rclipboard RColorBrewer readODS readxl rmarkdown shiny viridis]; }; aweek = derive2 { name="aweek"; version="1.0.3"; sha256="14n1xmargr89mf4n0bdzdwn7qh314a1xg1bid5px762vk0qf4fws"; depends=[]; }; + awinR = derive2 { name="awinR"; version="0.1.0"; sha256="09cp9wfb4aslfddlk72n0kawfghyn1fcjya5afjhiffwww5ps3iy"; depends=[jsonlite]; }; aws = derive2 { name="aws"; version="2.5-1"; sha256="1fhm87iax6bkvd4vszvjbcqw3b2drs11rjxr7zf2w4sgc72svaz8"; depends=[awsMethods gsl]; }; 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]; }; @@ -6113,7 +6139,6 @@ in with self; { awsMethods = derive2 { name="awsMethods"; version="1.1-1"; sha256="0hbmrcpdyg15zg4rysscsmxpxlpy0dkxx2aa63qibq7l1k14v4sh"; depends=[]; }; aziztest = derive2 { name="aziztest"; version="0.2.1"; sha256="0rpnyrb7zi42l1fc8ni0r5d0y6a4dr56917z8i54mv1jrk4hijjd"; depends=[]; }; azuremlsdk = derive2 { name="azuremlsdk"; version="1.10.0"; sha256="0s64kjrmcdnjdwh5mdm5vxgvrl9ghvfv6bair7qfzz32jlab99m0"; depends=[DT ggplot2 htmltools plyr reticulate rstudioapi servr shiny shinycssloaders]; }; - bRacatus = derive2 { name="bRacatus"; version="1.0.9"; sha256="0rwa452izd453nllirdvngcrf1inpc7njfhdlpwjvgsx9k3ri908"; depends=[data_table geojsonio jsonlite maptools plotfunctions raster rgbif rgdal rgeos rworldmap sp]; }; bReeze = derive2 { name="bReeze"; version="0.4-3"; sha256="17nc6qvw9l6sq8knd1mk193md2y3z1jlcjymqzl389yxj8s0i2il"; depends=[lubridate]; }; bSims = derive2 { name="bSims"; version="0.3-0"; sha256="055hqa5w4gaqz9mms9yj85wg0pgl6xa568nbjxm4qc75rsy91qg5"; depends=[deldir intrval MASS mefa4 pbapply]; }; bWGR = derive2 { name="bWGR"; version="2.1"; sha256="0sqr0ylap610bw5v52hr8z3kl7c09rfs3l12zgc56cl04i0dab85"; depends=[Matrix Rcpp RcppEigen]; }; @@ -6135,7 +6160,7 @@ 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]; }; - badger = derive2 { name="badger"; version="0.2.1"; sha256="0ni3ns235n1haxrldk7s3zbgsg8q245jhki9b3r10yxlp94c2djs"; depends=[desc dlstats rvcheck usethis]; }; + badger = derive2 { name="badger"; version="0.2.2"; sha256="1y2yfd31nb16g0zwhwaqwb2k3v9f5yr5fvgd0y458v4066svhk70"; depends=[desc dlstats rvcheck usethis]; }; baffle = derive2 { name="baffle"; version="0.2.1"; sha256="09yfxxq252sbfx0yh6m0zkjvwdwgsj6ycr4n8llkqpf8qjspk22a"; depends=[]; }; bagged_outliertrees = derive2 { name="bagged.outliertrees"; version="1.0.0"; sha256="0fcd54j6vci2yvlb609dck4pwbn54irkdk472cjc965rcw6dz9z7"; depends=[data_table doSNOW dplyr foreach outliertree rlist]; }; baggr = derive2 { name="baggr"; version="0.6.21"; sha256="08f6wn1r3rxdlvchgxkrwpl08qlqqj6arvw4kkncvnb94g83cy4y"; depends=[bayesplot BH crayon forestplot ggplot2 gridExtra Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders testthat]; }; @@ -6148,7 +6173,7 @@ in with self; { bamboo = derive2 { name="bamboo"; version="0.9.25"; sha256="1il8sn8ck36b1m9hazhf6gmr58iqi2hjn0rrpcv1laij0lybrcws"; depends=[rscala]; }; bambooHR = derive2 { name="bambooHR"; version="0.1.0"; sha256="1m9kzr698lgcilmr5w5zs6q9rgpcdvqiavrhh6c4ar6ii07n274s"; depends=[cli curl dplyr fs glue httr janitor jsonlite lubridate magrittr purrr rlang stringr testthat tibble tidyr withr]; }; bamdit = derive2 { name="bamdit"; version="3.4.0"; sha256="0x7dl2f8qg8df07g4k692501rqn3q5zf12npx9zbbbvv7zb23rlf"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; }; - bamlss = derive2 { name="bamlss"; version="1.1-8"; sha256="1338g401rvpi5ch7z50hm5zp375zpqvwv6b3szn4llf7pfr316fr"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp survival]; }; + bamlss = derive2 { name="bamlss"; version="1.1-9"; sha256="1zlcgjd08adr5c8jk16aw98lp5bsr1c03f29lhr4nzxjyppfn98c"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp survival]; }; bamp = derive2 { name="bamp"; version="2.1.3"; sha256="0qzcndjdwbgiwyvc7ikb7jr0n7cmn78v56h5in22j24jjj740l2z"; depends=[abind coda]; }; bandit = derive2 { name="bandit"; version="0.5.1"; sha256="0zj98x4kwv8fr6j78vg0hzlsjd4w5l4nbazkpxqkn5yyd6g0v9h4"; depends=[boot gam]; }; bang = derive2 { name="bang"; version="1.0.1"; sha256="0m7p9gzspkyp40ir842ff4b1827w9rh7x49kpp3y4dpi83krqy5a"; depends=[bayesplot rust]; }; @@ -6196,7 +6221,7 @@ in with self; { bate = derive2 { name="bate"; version="0.1.0"; sha256="1jrf614g5699ygw73pda7dk79ydx57sc8wpq4vg51yy98arhidc2"; depends=[concaveman dplyr ggplot2 latex2exp magrittr purrr tidyselect vtable]; }; batman = derive2 { name="batman"; version="0.1.0"; sha256="0ccgx506p4iri23k2ikb8jmh04dp08w66785bv52iy8kd359h43f"; depends=[Rcpp]; }; batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; }; - bayMDS = derive2 { name="bayMDS"; version="1.6"; sha256="1g4haskms28rn5wpkqn7rgaqpx5n4x3rz48n292l1vknb4mjwm8n"; depends=[ggplot2 ggpubr gridExtra progress Rcpp RcppArmadillo rgl shiny shinythemes]; }; + bayMDS = derive2 { name="bayMDS"; version="2.0"; sha256="1l5srpaichn598a3a9pj7pwp35jvbwb65d37l9ngvdq3rja8xm0s"; depends=[ggplot2 ggpubr progress Rcpp RcppArmadillo shiny shinythemes]; }; baycn = derive2 { name="baycn"; version="1.2.0"; sha256="1ykz1brs3mz94n86d5qaq25vf24j5adyzpddxqmn7qklbxxr6fh5"; depends=[egg ggplot2 gtools igraph MASS]; }; bayefdr = derive2 { name="bayefdr"; version="0.2.1"; sha256="178s559p1mgzp2b23plq3dcl5p0mg1d5cy6477knbaq711awzz3j"; depends=[assertthat cowplot ggExtra ggplot2 reshape2]; }; bayes4psy = derive2 { name="bayes4psy"; version="1.2.8"; sha256="0fmp88mrnmx4langd014l6jf06zmvwhclw4k0aw88v996hzv76bx"; depends=[BH circular cowplot dplyr emg ggplot2 mcmcse metRology Rcpp RcppEigen reshape rstan rstantools scales StanHeaders]; }; @@ -6208,11 +6233,12 @@ in with self; { bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.10"; sha256="1jb7jfyxp210pc8myv9lnwb55hy19d39m10kkhs5lyjwc2lv0401"; depends=[coda mvtnorm]; }; bayesImageS = derive2 { name="bayesImageS"; version="0.6-1"; sha256="0hz6ynvrhsxp097zswdlascza5n27cq4hfaqdc3r8b7crmh7lrim"; depends=[Rcpp RcppArmadillo]; }; bayesLife = derive2 { name="bayesLife"; version="5.0-3"; sha256="1dlaqp6qd6qi8p8ni3z7adjrsn44njzvngyga4a97crp3jfqpx7k"; depends=[bayesTFR car coda data_table hett wpp2019]; }; + bayesMRM = derive2 { name="bayesMRM"; version="2.3.0"; sha256="1am9valflwzs71vbfsz4glfzb4wnqsn4baryjk8srwkg37p5v2mm"; depends=[coda ggplot2 gridExtra rgl rjags shiny shinythemes]; }; bayesPO = derive2 { name="bayesPO"; version="0.3.1"; sha256="1n9m89lhdj0ng3570x23kcjyjv85bky0hqrs1sl7qxjdzxacsisl"; depends=[coda Rcpp RcppEigen RcppProgress]; }; bayesPop = derive2 { name="bayesPop"; version="9.0-1"; sha256="15lisc0wvijmdjgw7n5fadbz4g702v9rp748h5xp5r6qk32g3njx"; depends=[abind bayesLife bayesTFR data_table fields googleVis MortCast plyr reshape2 rworldmap wpp2012 wpp2019]; }; bayesQR = derive2 { name="bayesQR"; version="2.3"; sha256="1c6y7r9h9626ghp68pl5k1g0l95fwd6dp0jfznmhy53qza0ny8z4"; depends=[]; }; - bayesSurv = derive2 { name="bayesSurv"; version="3.5"; sha256="0bk3yd7myycfbmfrw9nbsdzqf1qzmzdckgi951fdqllj3m037gyx"; depends=[coda smoothSurv survival]; }; - bayesTFR = derive2 { name="bayesTFR"; version="7.2-0"; sha256="0iax6z6c6vxgq5v1n357i8grdrbymgc7dv091bhdgrd7352cpqxc"; depends=[coda data_table lifecycle MASS mvtnorm wpp2019]; }; + bayesSurv = derive2 { name="bayesSurv"; version="3.6"; sha256="1y1jqd1c2rg4s73ffyq8wjkpq35321nzywigcgh6vkjpd8r8xhpx"; depends=[coda smoothSurv survival]; }; + bayesTFR = derive2 { name="bayesTFR"; version="7.2-2"; sha256="1z816jdva0z103bibx1c8f5yn5zbfxr4cfwh1wn29p6f1j6madcc"; depends=[coda data_table lifecycle MASS mvtnorm wpp2019]; }; bayesZIB = derive2 { name="bayesZIB"; version="0.0.4"; sha256="02n76vw38xd1p6j2r505mkbfvnwij7i5lx8x6w9hrsnh9q0dy6dw"; depends=[BH ggplot2 Rcpp RcppEigen rstan rstantools StanHeaders]; }; bayesammi = derive2 { name="bayesammi"; version="0.1.0"; sha256="1vfcmk47x71c5akj3ppxzb74293pikspknkkv08f8p15v0chk7fs"; depends=[dplyr ggplot2 lme4 magrittr MASS mvtnorm rlang rstiefel scales tibble tidyr tmvtnorm]; }; bayesanova = derive2 { name="bayesanova"; version="1.5"; sha256="1h2z5r1ikrdi1j0cpzy3qdw28m1i6ddz6006amdnz2r3b0wivffm"; depends=[MCMCpack]; }; @@ -6231,13 +6257,13 @@ in with self; { bayeslm = derive2 { name="bayeslm"; version="1.0.1"; sha256="0mnzxzdz456qxfszl8vhnvb1875hxn8b57wi6dhr9g668da2zdin"; depends=[coda Rcpp RcppArmadillo RcppParallel]; }; 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]; }; + bayesm = derive2 { name="bayesm"; version="3.1-5"; sha256="18j7h32nq4hx1qnxfgfgz3q39q35lmvsq3im90xjkphyli60f8zj"; depends=[Rcpp RcppArmadillo]; }; bayesmeta = derive2 { name="bayesmeta"; version="3.2"; sha256="12lgbbvg6ywpr42ig8rfbki1fv9j294jr1nsq0gpr2khj4nw6npi"; depends=[forestplot metafor mvtnorm numDeriv]; }; bayesmix = derive2 { name="bayesmix"; version="0.7-5"; sha256="0s1a221vwia92pinja2r5b5abm4dhcrs81m4frqnf0522qh0y75f"; depends=[coda rjags]; }; bayesmove = derive2 { name="bayesmove"; version="0.2.1"; sha256="1l6i8qh7l53x0133gjc5jvri4vnnfviq9y3mcr1kfa5j84gfnmsf"; depends=[dplyr dygraphs furrr future ggplot2 leaflet lubridate magrittr MCMCpack progress progressr purrr Rcpp RcppArmadillo rlang sf shiny tictoc tidyr]; }; - bayesnec = derive2 { name="bayesnec"; version="2.0.2.4"; sha256="1jiyx9kmlabximslmp8m0f35qc7ngh59jxkf4im3qmqfn36b6q3m"; depends=[brms dplyr evaluate extraDistr formula_tools ggplot2 loo purrr rlang tidyr tidyselect]; }; + bayesnec = derive2 { name="bayesnec"; version="2.0.2.5"; sha256="0mfmpbfwysk298lc81g9yp29jj3ayral3p9fd8vf0vby3jkmppbc"; 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]; }; - bayesplot = derive2 { name="bayesplot"; version="1.9.0"; sha256="0hqy597ang53phxnl084hak35ffqz9lw9hygax7370gpkjws908a"; depends=[dplyr ggplot2 ggridges glue posterior reshape2 rlang tibble tidyselect]; }; + bayesplot = derive2 { name="bayesplot"; version="1.10.0"; sha256="1zqka7lg7a6ccli1yzhk1n13vbrlp8m0kjxmykjqmkz438mvjk5v"; depends=[dplyr ggplot2 ggridges glue posterior reshape2 rlang tibble tidyselect]; }; bayesreg = derive2 { name="bayesreg"; version="1.2"; sha256="0yrx7y39xxmm0z4myj6ma24dkkhgcily5baxr6yf9balgvhd5wf4"; depends=[pgdraw]; }; bayesrules = derive2 { name="bayesrules"; version="0.0.2"; sha256="0a1a1aq91ary985xd0qqc1sgjlyfcrjh7ngzcy4f7j09a7ch3j4b"; depends=[dplyr e1071 ggplot2 groupdata2 janitor magrittr purrr rstanarm]; }; bayess = derive2 { name="bayess"; version="1.5"; sha256="1dhkyz3dz04rghl5fpjdz1n5d6v053km25hkq0ssdcvrbsms62c8"; depends=[combinat gplots mnormt]; }; @@ -6253,7 +6279,7 @@ in with self; { bbknnR = derive2 { name="bbknnR"; version="1.0.2"; sha256="018szrk8xskvill181jc3xji9gapn4z6ps1rfh7fgga9334726vs"; depends=[dplyr glmnet Matrix Rcpp RcppAnnoy reticulate Rtsne Seurat SeuratObject tidytable uwot]; }; bbl = derive2 { name="bbl"; version="1.0.0"; sha256="135i619lliy93dvgb7ymrcdh20y2b1j7s0y6awzcs3w0hbyd8j5z"; depends=[pROC RColorBrewer Rcpp]; }; bbmle = derive2 { name="bbmle"; version="1.0.25"; sha256="0mdj21q7k0fp4cj7la14vmcjmp49zqm57g7r6zrwmxpv0acwda46"; depends=[bdsmatrix lattice MASS Matrix mvtnorm numDeriv]; }; - bbotk = derive2 { name="bbotk"; version="0.6.0"; sha256="0ingnvfps46bysi8k2rqnvlh577bzk6fih6hcf20mjspdxx1as3v"; depends=[checkmate data_table lgr mlr3misc paradox R6]; }; + bbotk = derive2 { name="bbotk"; version="0.7.2"; sha256="1gw0rkbiv93ifl9110r9sr0p9g4vg7qc11mznmmjq0a5vzmqgpm9"; 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.5.2"; sha256="0wczfhck5gvmpv7z4d5db3qmdincw8q5hhchn2y47mzvpwfvwzwg"; depends=[dplyr geofacet ggplot2 ggrepel jagsUI mgcv progress rappdirs sbtools sf stringr]; }; @@ -6265,7 +6291,7 @@ in with self; { bccp = derive2 { name="bccp"; version="0.5.0"; sha256="0g9yzqzf977rx97c77krdhl7c499r58xcbzx0nihk73143ynf17w"; depends=[pracma]; }; bcdata = derive2 { name="bcdata"; version="0.3.2"; sha256="0wmhk80r0d5k5f97r379g743a8r49jv7lj3i7fjaxb21az063ga6"; 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.1"; sha256="04vjvzh8y1dfk6ms5zwbylbfalwngvyjbjcszx26v2fakdk990p7"; depends=[Rcpp RcppArmadillo]; }; - bcfrailph = derive2 { name="bcfrailph"; version="0.1.0"; sha256="0l5v3bc8xw71cj012sbmq1f0glg7m545jzqyg01gzl8kbgm3lbbj"; depends=[survival]; }; + bcfrailph = derive2 { name="bcfrailph"; version="0.1.1"; sha256="0qq885wfd7sr8cjxygw33l321q7jk4b6996p0j6inzlwycs8d6bc"; 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]; }; bcmaps = derive2 { name="bcmaps"; version="1.0.3"; sha256="1qr7jkybrg80pb0hhqmcpp66gkk5w74cjgyg7mnm9czz1j47wsl4"; depends=[bcdata httr jsonlite progress rappdirs sf xml2]; }; @@ -6283,7 +6309,7 @@ in with self; { bde = derive2 { name="bde"; version="1.0.1.1"; sha256="0idawsykqz7ybnnfcs0946wd1q8aaw1xdx2w3zzgjz7faxbvznb9"; depends=[ggplot2 shiny]; }; 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.1.0"; sha256="02lgpgkhzyq9qaf18mzq2708ps00lsxm69apfsaq5m34zxkynq5z"; depends=[data_table ggplot2 gridExtra mvtnorm nlme]; }; + bdots = derive2 { name="bdots"; version="1.2.0"; sha256="0k1865vkg0s6jhw2k3w7gqw9v94rchfwpsbaf1cxbg0rpy1f0c0b"; depends=[data_table ggplot2 gridExtra mvtnorm nlme]; }; bdpar = derive2 { name="bdpar"; version="3.0.3"; sha256="17xrkizwdg1jz2glmmhlk153x75kylfv0pw7dn5x85m6sbah6zb1"; depends=[digest R6 rlist]; }; bdpopt = derive2 { name="bdpopt"; version="1.0-1"; sha256="1z7mdqklw3frsdzyhvx8s8wvblwm28fr1gca2yrivqjng0r47lx4"; depends=[coda rjags]; }; bdpv = derive2 { name="bdpv"; version="1.3"; sha256="0wcnmamqrbqwskgv2yhnxq2kb179n63c825y9hsl20rfca0ijh6m"; depends=[]; }; @@ -6332,7 +6358,8 @@ in with self; { betaBayes = derive2 { name="betaBayes"; version="1.0.1"; sha256="1a7ng6ym47scgj47frrhs76r6ipq6mhgf3ivbg2npqpg7hjcz2ci"; depends=[betareg Rcpp RcppArmadillo]; }; betaSandwich = derive2 { name="betaSandwich"; version="1.0.2"; sha256="035rkz27c156kwaibz0jrhfrdfvxv20fcynqgflxll62n4zhw010"; depends=[]; }; betacal = derive2 { name="betacal"; version="0.1.0"; sha256="19wgpgf9yhckl9qx9v24f4yh055wfalphcxwm7lg68px6ap2pxl9"; depends=[]; }; - betafunctions = derive2 { name="betafunctions"; version="1.8.0"; sha256="0naydz3l37pd1jciachi5ra3pv07fhjpfhbfqvf3qgqvnmvanbwl"; depends=[]; }; + betaclust = derive2 { name="betaclust"; version="1.0.0"; sha256="1h3fcvs22spxhphcfg7zl75cpa5yycyl2yy0bgyy0hwkwh8cwpza"; depends=[doParallel foreach ggplot2 plotly scales]; }; + betafunctions = derive2 { name="betafunctions"; version="1.8.1"; sha256="0xvg5d04icsb0v9f7gnvpw345sik8xla5p55cdpbm8c3wwfk1d1m"; depends=[]; }; betapart = derive2 { name="betapart"; version="1.5.6"; sha256="08rphgdqxgkih70kqnn7x1hkahl309pa363zbqsdwk0lmfq2azkh"; depends=[ape doSNOW fastmatch foreach geometry itertools picante rcdd snow]; }; betaper = derive2 { name="betaper"; version="1.1-2"; sha256="0gh5xjimg0wgv626g3y34mvgrji2aylnm89iwadg7d6g4s457ynp"; depends=[vegan]; }; betareg = derive2 { name="betareg"; version="3.1-4"; sha256="00c1l5ah74vf7ljpja4iwyf9cwcvb1c835hmc98jp2x6jrh9h1ji"; depends=[flexmix Formula lmtest modeltools sandwich]; }; @@ -6343,7 +6370,7 @@ in with self; { beyondWhittle = derive2 { name="beyondWhittle"; version="1.1.3"; sha256="0hx1j6vgq25qk966wkc8pq0y6whxqnp1nglm3d4majqp55iqi1lx"; depends=[BH forecast ltsa MASS 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-45"; sha256="1vgzf3nxavnydbfcg539xb0kr220yqd053697yhq84j0g2an10xg"; depends=[Rcpp]; }; + bfp = derive2 { name="bfp"; version="0.0-46"; sha256="129pnd3hkaan26dxjs9qp49yhbq9r7mhmp780x6yzcdn74xzwfnw"; depends=[Rcpp]; }; bfsMaps = derive2 { name="bfsMaps"; version="0.9.8"; sha256="00lp22bmhww7f95bpy4di4fk3r5gnscqcvb9ha7d4gygqy0dzskv"; 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.2"; sha256="0qgq47axa0r9653d1sjm00fvfx49v28id5sngwyrgkppcngmbg9p"; depends=[circlize coda data_table dplyr ggplot2 magrittr MASS officer plyr png runjags rvg scales]; }; @@ -6359,7 +6386,7 @@ in with self; { 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]; }; 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]; }; + biblio = derive2 { name="biblio"; version="0.0.7"; sha256="1mknfrkpapa88hlnzssv4k79xx9lg0ab34v88yhbnkm1xmmwrwq8"; depends=[stringr yamlme]; }; bibliometrix = derive2 { name="bibliometrix"; version="4.0.1"; sha256="00c0dfnv989sf206qsh6gk2s0h73xqq0vd2a9sr2zh5rxf9x9c24"; 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.3.0"; sha256="0dkg5g9il95w9glzvhjdgp8z30prydspvpz5bb403vaizykwv9kl"; depends=[]; }; biblionetwork = derive2 { name="biblionetwork"; version="0.1.0"; sha256="0nhx9bk7r5l0bvj98clnmwf53ihghf48zai4nj6pcgr2rb69fvjj"; depends=[data_table Rdpack]; }; @@ -6391,13 +6418,13 @@ in with self; { bigmatch = derive2 { name="bigmatch"; version="0.6.4"; sha256="1a3qiljarnv14dmpr5g2nfxzaf4wmw88md4kjrlrlgxcgmijlwm6"; depends=[liqueueR mvnfast plyr rcbalance]; }; bigmds = derive2 { name="bigmds"; version="2.0.1"; sha256="05sph85z4c4fiwd429hx9chgd7rsn48irr168yy1dj9daaqm49pl"; depends=[]; }; bigmemory = derive2 { name="bigmemory"; version="4.6.1"; sha256="0hainqkm7cs8gjm42vkpdrr0284smsbwdfackp34yv7dhxy1avmm"; depends=[BH bigmemory_sri Rcpp uuid]; }; - bigmemory_sri = derive2 { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; }; + bigmemory_sri = derive2 { name="bigmemory.sri"; version="0.1.6"; sha256="03468ak0lgd9m0f7synxms2zzr8f7n2nm1gmhcraj3nfcv4nmyiv"; depends=[]; }; bignum = derive2 { name="bignum"; version="0.3.0"; sha256="0r7vmix40646vdiw9mzzbz5ihrr08rldnpvy8l9ilp73cn9189mj"; depends=[BH cpp11 rlang vctrs]; }; bigparallelr = derive2 { name="bigparallelr"; version="0.3.2"; sha256="14rkcig4j93c231sfm43331ykmvxjx2fiz5nhblj2rfzkxli4css"; depends=[bigassertr doParallel flock foreach parallelly RhpcBLASctl]; }; - bigreadr = derive2 { name="bigreadr"; version="0.2.4"; sha256="0650mbgbzl2582d02ma3kd8iqdimjajk9gnx70hdjl489q15w80f"; depends=[bigassertr data_table parallelly Rcpp]; }; + bigreadr = derive2 { name="bigreadr"; version="0.2.5"; sha256="15wy5rphk2l59k8fk68a15xsvy8nxj1srnc2c86i7y5ym04a856k"; depends=[bigassertr data_table parallelly Rcpp]; }; bigrquery = derive2 { name="bigrquery"; version="1.4.1"; sha256="1rcz1zq0azrrchhxz4b0g4m9c3ymp4pasi7ji1nvx25w5x41sdmv"; depends=[assertthat bit64 brio 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.11.4"; sha256="0jvvwrpbf74w999ifm721ckhp42ywffbx3ij6xqg1v9gvzpgni4c"; depends=[bigassertr bigparallelr bigreadr bigsparser bigstatsr bigutilsr data_table doRNG foreach ggplot2 magrittr Matrix Rcpp RcppArmadillo rmio roptim runonce vctrs]; }; + bigsnpr = derive2 { name="bigsnpr"; version="1.11.6"; sha256="0d7ysy4zwv4fkivn05lfi1bwdix6ms1b0h9n4nl3qbyangfcz52a"; depends=[bigassertr bigparallelr bigreadr bigsparser bigstatsr bigutilsr data_table doRNG foreach ggplot2 magrittr Matrix Rcpp RcppArmadillo rmio roptim runonce vctrs]; }; bigsparser = derive2 { name="bigsparser"; version="0.6.1"; sha256="0b6hh1rvi7qnz9kfnckjglcv240inpnc5f50cyrpfq5gdyppzhy1"; depends=[bigassertr Matrix Rcpp RcppEigen rmio]; }; bigsplines = derive2 { name="bigsplines"; version="1.1-1"; sha256="1kf04p2lglzdi1fdryk27nmj2a2jca2ii7ki8vak93sq21isb179"; depends=[quadprog]; }; bigstatsr = derive2 { name="bigstatsr"; version="1.5.12"; sha256="1wj169j91yjlb12dzy80q7rvi102l7fhlzfvc93rxifq2w3px9x8"; depends=[bigassertr bigparallelr cowplot foreach ggplot2 ps Rcpp RcppArmadillo rmio RSpectra tibble]; }; @@ -6439,7 +6466,7 @@ in with self; { binsegRcpp = derive2 { name="binsegRcpp"; version="2022.7.21"; sha256="15qiqzwy64xz6pbwy8mvw6xnmz52bjqbc0p6l5gsfkh6g489xjb0"; depends=[data_table Rcpp]; }; binseqtest = derive2 { name="binseqtest"; version="1.0.3"; sha256="0661a2bqmv6bckq23c6m04ggwrp8z10lfgjg9dgkz4bfxsd297gs"; depends=[clinfun]; }; binsmooth = derive2 { name="binsmooth"; version="0.2.2"; sha256="1sidv8ra377glaacib1j4ksg5bg759hk7h6fadrfzip3hgxgjg9x"; depends=[ineq pracma triangle]; }; - binspp = derive2 { name="binspp"; version="0.1.24"; sha256="0k4ljmw5snjvyad8vgx370q91v7yj39c479q9jzld1brh2gpasr9"; depends=[cluster mvtnorm Rcpp RcppArmadillo RcppEigen spatstat spatstat_core spatstat_geom spatstat_random VGAM]; }; + binspp = derive2 { name="binspp"; version="0.1.26"; sha256="0ah002lvimniwmwgn2syw9saxgzpdhs5vins0f3kb98p5k3gdxqk"; depends=[cluster mvtnorm Rcpp RcppArmadillo RcppEigen spatstat spatstat_geom spatstat_model spatstat_random VGAM]; }; binsreg = derive2 { name="binsreg"; version="0.7"; sha256="1qxf5096vzf2j9d7yya0pr1hgxgkxm5llvz5ddyf0hqp22cjcsf7"; depends=[ggplot2 matrixStats quantreg sandwich]; }; binst = derive2 { name="binst"; version="0.2.1"; sha256="09kzk7n1j9nzgyijwirzk33z6p6hc67zkd05hv1i9qfijy31gci4"; depends=[rpart]; }; bio_infer = derive2 { name="bio.infer"; version="1.3-6"; sha256="1hs11c9qpdsl1awgk3b34mcsnr8g1xpg3zd9dlrqrz6ppdqkgxmn"; depends=[]; }; @@ -6452,18 +6479,18 @@ in with self; { bioassays = derive2 { name="bioassays"; version="1.0.1"; sha256="1y32wxkv14l7r0f35y4hxxxh3zpw2gd4hsjmkajhmzmnvg5jdw78"; depends=[dplyr ggplot2 magrittr nplr reshape2 rlang]; }; bioclim = derive2 { name="bioclim"; version="0.3.0"; sha256="1qiz7bwy44xlgj52cy46bg762fg3llgzzn9a2bclyx42v12z8p6q"; depends=[berryFunctions ggplot2 reshape2 rmarkdown terra]; }; biocompute = derive2 { name="biocompute"; version="1.1.1"; sha256="102n8y83z8568lwil2fb28wrjkymwmw9rzvk0a4zgsx5a3l7wl01"; depends=[cli crayon curl digest httr jsonlite jsonvalidate magrittr rmarkdown stringr uuid yaml]; }; - biodosetools = derive2 { name="biodosetools"; version="3.6.0"; sha256="06i6vg0n98x91j8mkh0mbh4m7a34ghr22x6msrhdig0xh522ia5z"; depends=[bsplus cli config dplyr ggplot2 golem htmltools magrittr MASS maxLik mixtools msm pkgload rhandsontable rlang rmarkdown shiny shinydashboard shinyWidgets tidyr]; }; + biodosetools = derive2 { name="biodosetools"; version="3.6.1"; sha256="013nqdqrv5h3swzqss2kazsp06wrs57zri3aaidy92wrd6v24bsh"; depends=[bsplus cli config dplyr ggplot2 golem magrittr MASS maxLik mixtools msm rhandsontable rlang rmarkdown shiny shinydashboard shinyWidgets tidyr]; }; biogas = derive2 { name="biogas"; version="1.23.2"; sha256="05g6nyi872skvr34kw5c71ggnnjc3fv95imc327yjqhmqmwx3m19"; depends=[]; }; biogeo = derive2 { name="biogeo"; version="1.0"; sha256="14sqgg8b06gp5dajxvyj9s3ndsk7jpkfr0mkyl2l61kgp6qx53rh"; depends=[maptools raster sp stringr vegan]; }; biogeom = derive2 { name="biogeom"; version="1.2.1"; sha256="1hwb99b0yrm6a11jkas0fikcbamzi41a4j5j9qnp474bkj9a5jd2"; depends=[spatstat_geom]; }; biogram = derive2 { name="biogram"; version="1.6.3"; sha256="1y7yaa6xwv11b6a4qf4qb3d7rsz0yiiq1k5mb0dbm3avydnl9c4b"; depends=[combinat entropy partitions slam]; }; - biogrowth = derive2 { name="biogrowth"; version="1.0.0-3"; sha256="0hyx6j1lj1igm0c2pgjbx3gk77q8x2jlcpslky7p9fplc92baig6"; depends=[cowplot deSolve dplyr FME formula_tools ggplot2 lamW lifecycle MASS purrr rlang tibble tidyr]; }; + biogrowth = derive2 { name="biogrowth"; version="1.0.1"; sha256="0hlpnx86bfk16mw5yhrwlf8qz9f52wx88n5iy3lw6qhq65a6ja2f"; depends=[cowplot deSolve dplyr FME formula_tools ggplot2 lamW lifecycle MASS purrr rlang tibble tidyr]; }; bioimagetools = derive2 { name="bioimagetools"; version="1.1.8"; sha256="1b7nxjis0p1hiv3w0cr3cyc2xz6sn9qbpssvlp2d7c5gm8x2gnj7"; depends=[EBImage httr tiff]; }; bioinactivation = derive2 { name="bioinactivation"; version="1.2.3"; sha256="0gz1bbakf6b23jsbvrr8314yxajxcr1akm5srgm883lrf1p5ax13"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS purrr rlang]; }; 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="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.1.1"; sha256="0r96qkhs05czdvx89ndx3z4yz35va3653waql8ygfhn65r9gzis9"; depends=[agricolae cowplot curl farver ggplot2 lattice multcompView pracma predictmeans rlang scales stringi withr]; }; + biometryassist = derive2 { name="biometryassist"; version="1.1.2"; sha256="176j3qvvhg9qj87zqzxyc95npjwrv346lsa8f0plgp0llk9ka8vj"; depends=[agricolae cowplot curl farver ggplot2 lattice multcompView pracma predictmeans rlang scales stringi withr]; }; biomod2 = derive2 { name="biomod2"; version="4.1-2"; sha256="1vwcbikpd8x7i9jy6g20wdwxpf0d6n2sbj6npbadj75mxmda0r6c"; depends=[abind data_table dplyr earth foreach gbm ggplot2 MASS maxnet mda nnet PresenceAbsence pROC randomForest raster reshape reshape2 rpart sp]; }; bionetdata = derive2 { name="bionetdata"; version="1.1"; sha256="14ll1m85pcr0xycczk1y9jxiqxfy5daiigfhqn4f6sfk2afy07yr"; depends=[]; }; bios2mds = derive2 { name="bios2mds"; version="1.2.3"; sha256="1k0r3fnkzfczx3wp3m8zpndk6gxca7idsp0z13rw84zjrgqaw6jm"; depends=[amap cluster e1071 rgl scales]; }; @@ -6471,7 +6498,7 @@ in with self; { bioseq = derive2 { name="bioseq"; version="0.1.4"; sha256="0m93s7vrpd392w2mcv3sdf5kcmpn1671ksplx1fiz7wdakck9fxq"; depends=[ape crayon dplyr pillar readr rlang stringdist stringi stringr tibble vctrs]; }; biosignalEMG = derive2 { name="biosignalEMG"; version="2.1.0"; sha256="0bbkrfqkmks4z8c7rh0k43lvm71vn3fzrw3kpj012ym77whwkvay"; depends=[signal]; }; biospear = derive2 { name="biospear"; version="1.0.2"; sha256="10y4hbncwiqpxzqvzjrmfgp804zczdgvwpjcj0dzaa0sx1njdzja"; depends=[cobs corpcor devtools glmnet grplasso MASS Matrix mboost pkgconfig plsRcox pROC PRROC RCurl survAUC survival]; }; - biostat3 = derive2 { name="biostat3"; version="0.1.6"; sha256="12i8ki1yair4sycfcwrhl10khfxzx5q2slzqjwcrqfxg69q8ak4l"; depends=[MASS muhaz survival]; }; + biostat3 = derive2 { name="biostat3"; version="0.1.8"; sha256="19qsg42nyisqfxl5y9ayd6hj82plnnqvryqkwdd6nfascn0zw44y"; depends=[MASS muhaz survival]; }; biosurvey = derive2 { name="biosurvey"; version="0.1.1"; sha256="1hhch5qagn86pcn43qlmv0azfbjc9yv58yp9v1p5s6r5ffxkgs95"; depends=[diptest doParallel foreach ks maps picante raster rgdal rgeos sp spatstat_geom vegan]; }; biotic = derive2 { name="biotic"; version="0.1.2"; sha256="1p18jkdd263dgk90626n9awkj6m4zn1n7897596fzrzrahksa978"; depends=[]; }; biotools = derive2 { name="biotools"; version="4.2"; sha256="1dyy9mk2afjbc8g1qygy6h1aksbhndm53c4sb5mfzriydl03ibxv"; depends=[boot MASS]; }; @@ -6487,7 +6514,7 @@ in with self; { 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.1.1"; sha256="0lk4kbxrnkr66cnyalzl2m18wwzf4y23r016nl1n52209vviql95"; 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=[]; }; + bit = derive2 { name="bit"; version="4.0.5"; sha256="1g5zakrzkhrqh3d7p1zka6zzzw11rdlbrvxsh05s7dkli1m57wph"; depends=[]; }; bit64 = derive2 { name="bit64"; version="4.0.5"; sha256="0y0m7q1rwam1g88cjx7zyi07mj5dipxd9jkl90f294syx8k6ipr5"; depends=[bit]; }; bite = derive2 { name="bite"; version="0.3"; sha256="00sph3pdbb9p21s3263ni4by2ivvya1sbjm9wvwx1rwjr4f31jps"; depends=[ape coda MASS phytools sm vioplot xml2]; }; bitmexr = derive2 { name="bitmexr"; version="0.3.2"; sha256="19nvrq75j2b2w6frz73rq3hx8bgwwrxjqfjgj10kdvc7gw8vx7mx"; depends=[attempt curl digest dplyr httr jsonlite lubridate magrittr progress purrr rlang stringr]; }; @@ -6500,7 +6527,7 @@ in with self; { biwavelet = derive2 { name="biwavelet"; version="0.20.21"; sha256="0v7arwmng2i22svj836i57q8by9x5pghjv7d35g7r35wakrm8jyx"; depends=[fields foreach Rcpp]; }; biwt = derive2 { name="biwt"; version="1.0.1"; sha256="0gg381jhwdc0kc8v0yn7wcgjkpn8dfnnn20m5ycjv66jlk2jhdcw"; depends=[MASS robustbase]; }; bizdays = derive2 { name="bizdays"; version="1.0.12"; sha256="0645x590vzaa2a7srhjpg9s9g613z4yxbbrsnncflr2lmkky44xl"; depends=[jsonlite]; }; - bizicount = derive2 { name="bizicount"; version="1.2.0"; sha256="0bmp2x2wdqy0dsax375fl57m6w6xjapnn6rhkrvrmc8wj1cklvqw"; depends=[DHARMa Formula MASS numDeriv pbivnorm rlang texreg]; }; + bizicount = derive2 { name="bizicount"; version="1.3.0"; sha256="10alimshxvbd755w655b0h1zwi2nakjinf4nlhiyz9mw2sclaars"; 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.2"; sha256="1bzr39a53p1xkq2fi2fphv2rpsml2z25xb1ycs63p3y7qis9zlky"; depends=[dplyr fields magrittr MASS nlme tibble tidyr tmvtnorm truncnorm]; }; bkmrhat = derive2 { name="bkmrhat"; version="1.1.3"; sha256="0l575dav5wyia37vm5j1dyljgk0k6l1hwfwsqr2gq3sb0iim4my4"; depends=[bkmr coda data_table future rstan]; }; @@ -6513,6 +6540,7 @@ in with self; { blavaan = derive2 { name="blavaan"; version="0.4-3"; sha256="0x0vx0gj0z1i1mczvi2j2g2zmdals7wz1ja0jcbpyzmb5arzgyd9"; depends=[bayesplot BH coda future_apply lavaan loo Matrix mnormt nonnest2 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tmvnsim]; }; blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; }; blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; }; + blindrecalc = derive2 { name="blindrecalc"; version="1.0.0"; sha256="0ymcmakk8wwg72rcwj1nankw3bbdp29mr5vymaw04padwsrmbf20"; depends=[Rcpp]; }; blink = derive2 { name="blink"; version="1.1.0"; sha256="053nw592sglzh6fgz7hj8ra6q7lqs83hhv14kcgs67b56q8a3crb"; depends=[plyr stringdist]; }; bliss = derive2 { name="bliss"; version="1.0.4"; sha256="02kln40z10wngydn7y4x5shd2dff74gb340nhagf49k8ql9p78xw"; depends=[MASS Rcpp RcppArmadillo]; }; blm = derive2 { name="blm"; version="2022.0.0.1"; sha256="0pmh3fw5iv9xhr08gji1q5vcaaai5s2qq40wisqdrqn5xhk9rh2h"; depends=[]; }; @@ -6523,11 +6551,12 @@ in with self; { blockForest = derive2 { name="blockForest"; version="0.2.5"; sha256="11lfwh5skzbvyyh25hk0sxk21833ah9f8zybvqsn3m9109c9whsw"; depends=[Matrix Rcpp RcppEigen survival]; }; blocklength = derive2 { name="blocklength"; version="0.1.5"; sha256="06d62hgkf2pphr6h3nba1b5r0izr45bvmrymrzq0lyc7xiwrh6na"; depends=[tseries]; }; blockmatrix = derive2 { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; }; - blockmodeling = derive2 { name="blockmodeling"; version="1.1.3"; sha256="19mxmxsnl6rrh85p0sak91vcaw4dz2cnm70hdzfwnvdrr695yw2z"; depends=[Matrix]; }; + blockmodeling = derive2 { name="blockmodeling"; version="1.1.4"; sha256="1f6jx8pwp3pnhs4wwxdrd1ska3h4w2423dpd11illxfajvnigkk9"; 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.13"; sha256="1ag7hidz43zd3kdmm25v7x6w02v0lzw7l4hspwh4zrvigar3dbhc"; depends=[bookdown htmltools httpuv jsonlite knitr later rmarkdown servr xfun yaml]; }; + blocs = derive2 { name="blocs"; version="0.1.0"; sha256="18bajdr56d60fp1irgc3iyq758c1gwprvm3v9cvx9zvx9kdgnpa3"; depends=[collapse dplyr ggplot2 ks mgcv rlang tibble]; }; + blogdown = derive2 { name="blogdown"; version="1.15"; sha256="0299pf06ls16cyk5f3k73zwp2g094zgafdja9ibmwcpv64qmb1hs"; depends=[bookdown htmltools httpuv jsonlite knitr later rmarkdown servr xfun yaml]; }; blorr = derive2 { name="blorr"; version="0.3.0"; sha256="1ynvg6ar7c7p01225q9czy4gxks0p1vw3sx207l7vzqxw20wb1bn"; depends=[car data_table ggplot2 gridExtra lest Rcpp]; }; blrm = derive2 { name="blrm"; version="1.0-2"; sha256="1lk7s7myxflr9as88944kvg8vn7m2ansg2caizr6h4d3690vr4m7"; depends=[boot mvtnorm openxlsx reshape2 rjags shiny]; }; blsR = derive2 { name="blsR"; version="0.4.0"; sha256="00xip7j9zkv62dkw2gcfiivaws0pri3jijcppb5xyz681k2jqdpz"; depends=[dplyr httr purrr readr rlang stringr]; }; @@ -6542,13 +6571,12 @@ in with self; { bmggum = derive2 { name="bmggum"; version="0.1.0"; sha256="1r0j5gklmknyan68nc3vfn96ck414v75547486ic70v2pdr3xnpf"; depends=[BH edstan ggplot2 GGUM loo Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; bmixture = derive2 { name="bmixture"; version="1.7"; sha256="09ahs2dwrbqhk4aki9291v5lr5fa9mvi087zrqjmv2057ypyv2n5"; depends=[BDgraph]; }; bmlm = derive2 { name="bmlm"; version="1.3.12"; sha256="0lzayz56knc1bj9r985kz91bfcjacs3zzz64b9dgbj0y2l7gd0xa"; depends=[BH ggplot2 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; - bmotif = derive2 { name="bmotif"; version="2.0.2"; sha256="1zy153z7kasfivj0mvrkyn96s0sgdp34w4pdjpcvfnym3lr02f0m"; depends=[gtools Rcpp reshape2 tensor]; }; bmp = derive2 { name="bmp"; version="0.3"; sha256="0jd67r11bn98hjwgyr6gas423787xy7ji2hq7ay80blkkcj91xxx"; depends=[]; }; bmrm = derive2 { name="bmrm"; version="4.1"; sha256="1brdd5mhr5282wkdc62lgsqcxw077p69rknjk7fjcs282ahcik2s"; depends=[LowRankQP lpSolve matrixStats Rcpp]; }; bmscstan = derive2 { name="bmscstan"; version="1.2.1.0"; sha256="05w6pz0mwqighhdl36f2ya1b4dw0xdhpfcbq6saw73ag5hvl57i9"; depends=[bayesplot ggplot2 LaplacesDemon logspline loo rstan]; }; bmstdr = derive2 { name="bmstdr"; version="0.3.0"; sha256="00msf9x6b1zg4y8xbyjz6yynvhl17krxlxgyy7ip9nnwsnkwlq6g"; depends=[BH CARBayes CARBayesST ggplot2 ggpubr inlabru MCMCpack mnormt Rcpp RcppEigen Rdpack rstan spBayes spTDyn spTimer StanHeaders]; }; bnClustOmics = derive2 { name="bnClustOmics"; version="1.1.1"; sha256="1pmg0q5jay8wkn24yv3j7xrdd8k6y8yjq6crjxg22yzfbbb0ws8g"; depends=[BiDAG clue graph gRbase mclust plotrix RBGL RColorBrewer]; }; - bnclassify = derive2 { name="bnclassify"; version="0.4.6"; sha256="00akv7mg4mn7kk98r6ja3yx9h822b8hnv1k890i8kwsra3c2qgid"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; }; + bnclassify = derive2 { name="bnclassify"; version="0.4.7"; sha256="010447r21i5r2nk843v8dmfncqgmp4yf71ahcrppqv8vxfywcg6i"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; }; bndovb = derive2 { name="bndovb"; version="1.1"; sha256="16mvkvwnx61jrvraagvxf56pvmf5klm8lnkqq4s5y2z92kd0clgp"; depends=[dplyr factormodel MASS nnet np pracma]; }; bnlearn = derive2 { name="bnlearn"; version="4.8.1"; sha256="1b6k9jjwfxll7w3gnwnx8r912f9kfrxikhq8143f53m3ngq1ng32"; depends=[]; }; bnma = derive2 { name="bnma"; version="1.5.0"; sha256="0h7nk28ny4capnji1j5m2kzsc7l8a1z7icx0iak87pk4abzqlzmm"; depends=[coda ggplot2 igraph rjags]; }; @@ -6557,7 +6585,7 @@ 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.13"; sha256="0naclrnhnqc87w6nw0yl3rhslqw3784hqqvmyfdg2508k9x913g3"; depends=[bitops igraph]; }; + bnstruct = derive2 { name="bnstruct"; version="1.0.14"; sha256="1igdr538d2nfx3ap13y6p6wb6jfvb3hcg80fapjvnzc2304sk95p"; depends=[bitops igraph]; }; bnviewer = derive2 { name="bnviewer"; version="0.1.6"; sha256="036jmypxg2ciiz388f90vm73l9djhpi6gzp1ibn9l0x3d072r7zz"; depends=[assertthat bnlearn caret e1071 igraph shiny visNetwork]; }; boa = derive2 { name="boa"; version="1.1.8-2"; sha256="04lhqk5qfvaz1jk90glr2yi5vq7cdy0w8m6g2lnzk359l9y41zhp"; depends=[]; }; bodenmiller = derive2 { name="bodenmiller"; version="0.1.1"; sha256="0rdbk3f95iw4352fl9d81ir503q072chbb4hn1k12sp1wjc3apid"; depends=[]; }; @@ -6566,13 +6594,13 @@ in with self; { bolasso = derive2 { name="bolasso"; version="0.2.0"; sha256="1fbd39jyxq0zfbybrzzwnyql2w8hf2b9133jj0nl99d1326wr7dh"; depends=[future_apply gamlr ggplot2 glmnet Matrix progressr Rdpack tibble]; }; bold = derive2 { name="bold"; version="1.2.0"; sha256="0r54ylxgmq9qnh1f36k4hafh80n86ibk4a994f8b1rnb9bq9f5cg"; depends=[crul data_table jsonlite plyr reshape stringr tibble xml2]; }; bondAnalyst = derive2 { name="bondAnalyst"; version="1.0.1"; sha256="0bygaldjgxbjqjnlgs64vdayr7kp6sjl6qffdywxpi7v0yfi072a"; depends=[Rdpack]; }; - bonsai = derive2 { name="bonsai"; version="0.2.0"; sha256="0haqdvvh5ydyzifr9mzyyfa2sj6n9kfvj5w5wj815n9p0mw67r8h"; depends=[dials dplyr foreach glue parsnip purrr rlang tibble]; }; - bookdown = derive2 { name="bookdown"; version="0.29"; sha256="08zpky94bdbjsbhi90pymxpczpfkjxwbx7p1v7ip8raw9b23skjv"; depends=[htmltools jquerylib knitr rmarkdown tinytex xfun yaml]; }; + bonsai = derive2 { name="bonsai"; version="0.2.1"; sha256="048nfgnzsi0zz0nsxl30nsjg63nszy44881s49g9hgs3vng2vmp2"; depends=[cli dials dplyr glue parsnip purrr rlang tibble]; }; + bookdown = derive2 { name="bookdown"; version="0.30"; sha256="1i54sbrdv2c9l6pcm3229wlwdnhn0x6f2918adszm5k8qdp0h74i"; depends=[htmltools jquerylib knitr rmarkdown tinytex xfun yaml]; }; bookdownplus = derive2 { name="bookdownplus"; version="1.5.8"; sha256="1cdxz5c69cgdk7wxr0xwhzw361rpg7j8xjv9hjf1877qqmhxbrkd"; depends=[bookdown knitr magick xaringan]; }; boostmtree = derive2 { name="boostmtree"; version="1.5.1"; sha256="17na38k052lzjrssvxssllm9fwpnzhr29g9wwcfkbja6rv2pw9p1"; depends=[nlme randomForestSRC]; }; - boot = derive2 { name="boot"; version="1.3-28"; sha256="0cjafhqv1c1mrjjcasqr767vs96wjcc6am9r1icryr8l4zymhwcz"; depends=[]; }; + boot = derive2 { name="boot"; version="1.3-28.1"; sha256="0lzz08fpn80qzm197s4806hr6skanr3r3rlx6bx7zk4cripygkfl"; depends=[]; }; boot_heterogeneity = derive2 { name="boot.heterogeneity"; version="1.1.5"; sha256="0g4zkvx8krqh54xvjh1a0ybwl3v5bg3l670ycgnps8kkw32w5p1f"; depends=[HSAUR3 knitr metafor pbmcapply rmarkdown]; }; - boot_pval = derive2 { name="boot.pval"; version="0.4"; sha256="05gxpky92f9jhvhv4faj49ql8a9mrfqdgk802i0hdw4lmnn90k7j"; depends=[boot car lme4 Rdpack survival]; }; + boot_pval = derive2 { name="boot.pval"; version="0.4.1"; sha256="0igrxp5ii7wxpx7i8z8dws41yjhiysdhvl19ppcicfx54z62c09d"; depends=[boot car lme4 Rdpack survival]; }; bootCT = derive2 { name="bootCT"; version="1.1.1"; sha256="172a4a2plvhwqvippwbrshbn2n237qnadl4pwx7f5bfs25ichqn0"; depends=[aod ARDL dplyr dynamac gtools pracma Rcpp RcppArmadillo stringr usethis vars]; }; bootComb = derive2 { name="bootComb"; version="1.1.2"; sha256="0gg07ck2nf0ddqc5nflk5ms16m3c6dlf1a77m58q581mkavj6gyb"; depends=[MASS]; }; bootES = derive2 { name="bootES"; version="1.2.1"; sha256="16b14bycy3ds09hsxnk738k2xq9qmwcy3kzdqd6rw9w4j7167kf0"; depends=[boot]; }; @@ -6597,6 +6625,7 @@ in with self; { boussinesq = derive2 { name="boussinesq"; version="1.0.4"; sha256="1gl3hapb31qgdh6jr15czlvdmr58vz2vmlv7p89zpqnyl9lc7vgm"; depends=[]; }; boutliers = derive2 { name="boutliers"; version="1.1-1"; sha256="01dp1w5lxmn6nixajg6dz0qincm0i1in03q7g284v37qnszyimqs"; depends=[metafor]; }; box = derive2 { name="box"; version="1.1.2"; sha256="10hgq9v0bjzkcnya0k7fjlidri02c1p6ph70q3gvi29qp3b22plq"; depends=[]; }; + boxfilter = derive2 { name="boxfilter"; version="0.1"; sha256="1q3vs2js1l5416rc1krsglfv4hz00xdgb2cmmxdmhr6bzxq8mxdc"; depends=[ggplot2 gridExtra]; }; boxplotdbl = derive2 { name="boxplotdbl"; version="1.4.0"; sha256="0yfkkafrq329l6yxbnpwm8yqidixxh7k124xjy5xa92pbng2clbd"; 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.1.0"; sha256="0qdpm5nfx2jhc0s77x839jdmk07c88xf739dwf2n8hqhk24y0cdr"; depends=[cowplot dplyr ggplot2 gridExtra gtable lubridate magrittr tibble tidyr tidyselect]; }; @@ -6625,9 +6654,9 @@ in with self; { brassica = derive2 { name="brassica"; version="1.0.2"; sha256="1av52p39jsv54q02v8xa7xilwmz5vzj6zy68y9m5lgl6s86r509y"; depends=[]; }; 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.2.3"; sha256="04kgr0f6m1mfczyp46gafkcfxs6lz2yf6qwzbyh04z4psnn3xpyh"; depends=[data_table dplyr stringr]; }; + bread = derive2 { name="bread"; version="0.3.1"; sha256="0pgcrasqmsa5hq9a50w03fay898zzh2h0lb755pfbna70s6gxxgs"; depends=[data_table]; }; breakDown = derive2 { name="breakDown"; version="0.2.1"; sha256="1jm9zmyfcnr9mjz7b30k34h47msvik9ngfysi6dc48gvrk41yk9q"; depends=[ggplot2]; }; - breakaway = derive2 { name="breakaway"; version="4.8.2"; sha256="1mfbzfsqqyfmhkm32qb5237q9n8qwjbqk5vsszs5lkfwi42fz3by"; depends=[ggplot2 lme4 magrittr MASS phyloseq tibble]; }; + breakaway = derive2 { name="breakaway"; version="4.8.4"; sha256="08mxp41d79iaqbz96bpzw7halasijghv0557ccz5p563y5lk3n3m"; depends=[ggplot2 lme4 magrittr MASS phyloseq tibble]; }; breakfast = derive2 { name="breakfast"; version="2.3"; sha256="03qkablrfgxp5c0kpyj38z831f6dwxwql2xkfpkpfjdiaqs7snrd"; 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.4"; sha256="01hqcbqifvq38a1ab0q2c02zavnlajaa41ia0r63d2m6plmdpbsf"; depends=[assertthat broom dplyr ggfittext ggplot2 MASS multcomp nlme purrr readr readxl signal stringr tibble tidyr xml2]; }; @@ -6640,6 +6669,7 @@ in with self; { 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]; }; + brif = derive2 { name="brif"; version="1.2.0"; sha256="1z9jz2diwy5n07dd370wsbjl7dz62cai2biwnlk29cfp4rq5l83k"; depends=[Rcpp]; }; brinton = derive2 { name="brinton"; version="0.2.6"; sha256="1zhiz93n9pclib2aczp7qslydjn9l5j17881gg0cga59f96bkwfw"; depends=[forcats GGally ggplot2 glue gridExtra lubridate pander RColorBrewer rmarkdown sm tibble]; }; brio = derive2 { name="brio"; version="1.1.3"; sha256="1inwzvlf6zj6gi47gd0byzqv02qajb3l475z8pjvx2b1hm0r1a7a"; depends=[]; }; briqr = derive2 { name="briqr"; version="0.1.0"; sha256="073pdk1094ng4kggzdjvihl791r2qlja1j2w3pfmh2027kn520r8"; depends=[dplyr httr jsonlite magrittr tibble]; }; @@ -6650,11 +6680,11 @@ in with self; { brms = derive2 { name="brms"; version="2.18.0"; sha256="04g10yx66izpghrqip5h9i0w0bds4xw2vlhp6crydi6i7kh4p4b3"; depends=[abind backports bayesplot bridgesampling coda future ggplot2 glue loo Matrix matrixStats mgcv nleqslv nlme posterior Rcpp rstan rstantools shinystan]; }; brmsmargins = derive2 { name="brmsmargins"; version="0.2.0"; sha256="1qdfig1cy5cf3csky995m0jybb2hyp7yq7ka67wircrln919c1nm"; depends=[bayestestR brms data_table extraoperators posterior Rcpp RcppArmadillo]; }; brnn = derive2 { name="brnn"; version="0.9.2"; sha256="17vsvncilisjp3sjblwg0knn8l4984p4ndql6rbq3wg8n677sy9x"; depends=[Formula truncnorm]; }; - brokenstick = derive2 { name="brokenstick"; version="2.3.0"; sha256="18bxfj79s4gynp1g13gav7lf3xi8cf3ff7dkfs997lg1ajqfkmq2"; depends=[coda dplyr lme4 matrixsampling rlang tidyr]; }; + brokenstick = derive2 { name="brokenstick"; version="2.4.0"; sha256="012r5y2w8y721a3n027j6mc6iz78q1rylr89bshnq0r6g522vw2c"; 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.80"; sha256="02k8bxv8kpkasxn2m1z5ccvr9gg9lc8k3hskyaf7gvr4khhf575s"; depends=[ggplot2]; }; broom = derive2 { name="broom"; version="1.0.1"; sha256="14i8729m38nxf5q344isgq4006p3b50wi3q8jgckxqphhnj5lpjb"; depends=[backports dplyr ellipsis generics ggplot2 glue purrr rlang stringr tibble tidyr]; }; - broom_helpers = derive2 { name="broom.helpers"; version="1.9.0"; sha256="09ygd6fpm5hb5gjaqy7ihc4k6gj1mbb54f95saj49wmdkcsm292m"; depends=[broom cli dplyr labelled lifecycle purrr rlang stringr tibble tidyr]; }; + broom_helpers = derive2 { name="broom.helpers"; version="1.10.0"; sha256="1kimf5i3i9c5s383rvn1cdwzs1rcknxahhmcn63hkydds0wx2car"; depends=[broom cli dplyr labelled lifecycle purrr rlang stringr tibble tidyr]; }; broom_mixed = derive2 { name="broom.mixed"; version="0.2.9.4"; sha256="1ck0dk5fnacvwsvhp43m983gkmskw1a7f1bjkq5hacka64lwscbn"; depends=[broom coda dplyr forcats furrr nlme purrr stringr tibble tidyr]; }; brotli = derive2 { name="brotli"; version="1.3.0"; sha256="0zivyhyf6g7lb8r919a1cc2xvi36g6cszpl9rr200nfvvw6r6zf1"; depends=[]; }; brpop = derive2 { name="brpop"; version="0.1.5"; sha256="12ngmyqbrqv1hwyh9y8wf9dyr816fxan8vqw0r2jgymsir9c5k6s"; depends=[dplyr future magrittr multidplyr rlang]; }; @@ -6671,19 +6701,21 @@ in with self; { bsamGP = derive2 { name="bsamGP"; version="1.2.4"; sha256="1zga3h747fh61n9m88gazc2p2i905cwvwdkql3rh65h26cphvvs6"; depends=[ggplot2 gridExtra MASS]; }; bsearchtools = derive2 { name="bsearchtools"; version="0.0.61"; sha256="11fqz8kdhqpc3jq34vgv3frzawgsl5y0s83rb2p54yb5yhd3p68w"; depends=[Rcpp]; }; bshazard = derive2 { name="bshazard"; version="1.1"; sha256="1kidypyqlilf794mksjvhja8bmnd9hdhz91ywy0mcddgc6wbar4h"; depends=[Epi survival]; }; - bslib = derive2 { name="bslib"; version="0.4.0"; sha256="1hkmaj0mpygbf6qr1955biv9z4q3khflyqi5x0c3dwi6qz74xspv"; depends=[cachem htmltools jquerylib jsonlite memoise rlang sass]; }; + bsicons = derive2 { name="bsicons"; version="0.1"; sha256="1506p4sskwgszam1vk5slw9nznki6gdf1s95s8cpfa3dih3lbjby"; depends=[htmltools]; }; + bslib = derive2 { name="bslib"; version="0.4.1"; sha256="0bz6w34shk2pijq5hvjv2bg8xhhg4yazn4wcix7436yi9k41zgaf"; depends=[cachem htmltools jquerylib jsonlite memoise rlang sass]; }; bsnsing = derive2 { name="bsnsing"; version="1.0.1"; sha256="1a1vxh1fc5vz7wk73m093bvpz9qb52cfrxcj5yiqm56v309jckzk"; depends=[Rcpp]; }; bspec = derive2 { name="bspec"; version="1.6"; sha256="19l1sagx6kn6i8mcs3i0h6rh7rwsyhphncv55jywpv4g6616kqcv"; depends=[]; }; bspline = derive2 { name="bspline"; version="2.1"; sha256="17k9phl5xlk5gqr220gp2cz749apqfi94kka7q6rzywkn1fb85ff"; depends=[arrApply nlsic Rcpp RcppArmadillo]; }; bsplinePsd = derive2 { name="bsplinePsd"; version="0.6.0"; sha256="0f785l02hiq3f7anxqhm09f7lrqgkkqhly7f1x78cxm22hvrqyhg"; depends=[Rcpp]; }; - 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.10"; sha256="1yv9wmsa9xipgv3l1rgdkfbr5ysx5b317xsw0smwsyn7rd6fj02d"; depends=[]; }; + bsplus = derive2 { name="bsplus"; version="0.1.4"; sha256="0bf8qvj7pk3xn7g4p89as1xzx56c75n842g27rj6lcgsf9rdmv9g"; depends=[glue htmltools jsonlite lubridate magrittr purrr rmarkdown stringr]; }; + bspm = derive2 { name="bspm"; version="0.4.0"; sha256="05v0sxa9cs8k0c47hwkfmadfy9ibl0nhs9gjpf6p2hh56q75fbsq"; depends=[]; }; bspmma = derive2 { name="bspmma"; version="0.1-2"; sha256="1a3p1h7bks5yrxv791wfa680v4a6q10p59iz6wvfifhf3ndlaw49"; depends=[]; }; bsreg = derive2 { name="bsreg"; version="0.0.2"; sha256="13701llj5k7vssmgb4fvxswcf9bsc4pxjvh67znbsvrv5cmjh5x3"; depends=[Matrix R6]; }; bssm = derive2 { name="bssm"; version="2.0.1"; sha256="19ii7hs4plgq31yiyr0258y22xckd5dv7k5dp2cwkzrr3h544ylz"; depends=[checkmate coda diagis dplyr magrittr posterior ramcmc Rcpp RcppArmadillo rlang sitmo tidyr]; }; 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]; }; - bsts = derive2 { name="bsts"; version="0.9.8"; sha256="14008fcrnpvnwgx7dp0v14ax4iw8p3772jf7fbz26vfv5g6z73lc"; depends=[Boom BoomSpikeSlab xts zoo]; }; + bstrl = derive2 { name="bstrl"; version="1.0.2"; sha256="10ncaicda2rwwrl2ykbrdhh51fziy3ahwp8z859cr2k4v19lviv0"; depends=[BRL doParallel extraDistr foreach]; }; + bsts = derive2 { name="bsts"; version="0.9.9"; sha256="0zaic91yw214bq3285kw7wj8h1jf4g1z9lahgpmikvlqhgy5744g"; depends=[Boom BoomSpikeSlab xts zoo]; }; bsub = derive2 { name="bsub"; version="1.1.0"; sha256="112hlvg15jlzg3drfzkslaly42vnvsycn9vif0w3iaw5fzsaa954"; depends=[clisymbols crayon digest GetoptLong GlobalOptions]; }; bsvars = derive2 { name="bsvars"; version="1.0.0"; sha256="0d5c8fjnigm4zsfzhki1vsdgc310dba716sdiag8vqq7m1r3g2yc"; depends=[GIGrvg R6 Rcpp RcppArmadillo RcppProgress RcppTN]; }; btb = derive2 { name="btb"; version="0.2.0"; sha256="1gm03md6ky134nzmnnp054mi2w8kl4bgcgg4k65zf2cyniz4arxq"; depends=[BH dplyr magrittr mapsf Rcpp RcppArmadillo RcppParallel sf]; }; @@ -6712,6 +6744,7 @@ in with self; { bursts = derive2 { name="bursts"; version="1.0-2"; sha256="0cbksnxavkssp3mz80rz0sdvbg21m5yzjn009wclinz12mm1p9rq"; depends=[]; }; busdater = derive2 { name="busdater"; version="0.2.0"; sha256="0hib73zay9r7rv49zv1lx0l15jzjyli9f1vrk414l8apggvx4c6s"; depends=[lubridate]; }; butcher = derive2 { name="butcher"; version="0.3.0"; sha256="1pq86hn6fcrcwccx82msmmn2s0qxp1k6mybip3yygfpl0cvl0zd3"; depends=[cli lobstr purrr rlang tibble vctrs]; }; + butterflyOptions = derive2 { name="butterflyOptions"; version="1.0.1"; sha256="0kmzrk8gqyqrpp4wfsl04cff13m6aiag7d6fbq7kbb6ln8fa6as9"; depends=[dplyr ggplot2 magrittr tibble]; }; bvarsv = derive2 { name="bvarsv"; version="1.1"; sha256="1bv4fbbi8bn7sqqpjlf8w5jpgydjr15wv5v9940wc42yk792yjrx"; depends=[Rcpp RcppArmadillo]; }; bvartools = derive2 { name="bvartools"; version="0.2.1"; sha256="18spmp2w6gzh3pyfa3x609jp7f3asmkba74kpmb5sqgjvrhxybxa"; depends=[coda Rcpp RcppArmadillo]; }; bvls = derive2 { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; }; @@ -6735,8 +6768,7 @@ in with self; { 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]; }; - cSEM = derive2 { name="cSEM"; version="0.4.0"; sha256="1h9n33akvh7cyl1r3pa64nxzr9z1723fqcfxa4p3kh6jp5ysqlvp"; depends=[abind alabama cli crayon expm future future_apply lavaan lifecycle magrittr MASS Matrix matrixcalc matrixStats polycor progressr psych purrr Rdpack rlang symmoments]; }; + cSEM = derive2 { name="cSEM"; version="0.5.0"; sha256="0a0pv01ynlac53rdwjhw20alx72ip23izvcxv8bdkdxa41ai3bi5"; depends=[alabama cli crayon expm future future_apply lavaan lifecycle magrittr MASS Matrix matrixcalc matrixStats polycor progressr psych purrr Rdpack rlang symmoments TruncatedNormal]; }; ca = derive2 { name="ca"; version="0.71.1"; sha256="095lk7p2b9835hc3a03c4019wg0baf0dhz6c2vqpaq1m9k4jy304"; depends=[]; }; caMST = derive2 { name="caMST"; version="0.1.6"; sha256="0zg4j81ikm8izgvn4p80z2bxrrg4qlccq4cs3pn2iwy25d6aiknn"; depends=[catR diagram mstR]; }; caROC = derive2 { name="caROC"; version="0.1.5"; sha256="0cklvzfg95yyr37hdfmrna2z6lnhf9f6rrqcjsba1wjmqs8abgsh"; depends=[quantreg RColorBrewer]; }; @@ -6764,8 +6796,8 @@ in with self; { calibrateBinary = derive2 { name="calibrateBinary"; version="0.1"; sha256="1k6sl4bg05piyczpk6wsva914gcmy8viyz4423gx9i6ddflb7xdb"; depends=[gelnet GPfit kernlab randtoolbox]; }; calibrationband = derive2 { name="calibrationband"; version="0.2.1"; sha256="1m3dp7h9dy1ipji3vinknqyhbw1gbv48473rbhpykps8hzrqg206"; depends=[dplyr ggplot2 magrittr Rcpp rlang sp tibble tidyr tidyselect]; }; calibrator = derive2 { name="calibrator"; version="1.2-8"; sha256="1m9g1pmnr6d9jkg5ab0l0cbqfj7kmx7sdmcdqdhn9ifyhhn7812y"; depends=[cubature emulator mvtnorm]; }; - calidad = derive2 { name="calidad"; version="0.3.0"; sha256="1wqb3bc5y0dlny2h476li8zqm83y8388zqhmaiy8hvh350wnq3s5"; depends=[dplyr haven kableExtra purrr rlang stringr survey tidyr]; }; - callr = derive2 { name="callr"; version="3.7.2"; sha256="01q3b0w1cbrryvv1dwvnyd3j1f09xmhnwg1wskc51r3r4qhqmnhj"; depends=[processx R6]; }; + calidad = derive2 { name="calidad"; version="0.4.0"; sha256="1b64wqfr4zb1r5bjbw5jbhs2yi1w91nv66s57h0fnija839zr9kw"; depends=[dplyr haven kableExtra purrr rlang stringr survey tidyr]; }; + callr = derive2 { name="callr"; version="3.7.3"; sha256="0knh5yxhxwjz96kbjrq524w4j8cac10k6mghhmblq79s0zgzwysn"; depends=[processx R6]; }; 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]; }; camcorder = derive2 { name="camcorder"; version="0.1.0"; sha256="10w93897708rcbab4l8942h3grlsw822mqkj7hcp1p8fakgnrxkd"; depends=[ggplot2 gifski jsonlite magick rlang rsvg svglite]; }; @@ -6780,13 +6812,13 @@ in with self; { canadamaps = derive2 { name="canadamaps"; version="0.1"; sha256="1i3yjhr5p06k6id3gws5dzdhf4jy143brbfhi2z4srq67xlz5agl"; depends=[dplyr magrittr rlang rmapshaper sf]; }; canadianmaps = derive2 { name="canadianmaps"; version="1.0.0"; sha256="1r45d65w8yfgwj8xf6lhsw0fi1b8j8gyayxrcs7wy56kacjjvym8"; depends=[dplyr ggplot2 ggrepel RColorBrewer rgdal sp]; }; canaper = derive2 { name="canaper"; version="1.0.0"; sha256="18b1sr6xpf4iljjb5jcxldlfk4x1d4w9j2pw8196r1k02qpg79ki"; depends=[ape assertr assertthat dplyr future_apply phyloregion progressr purrr tibble vegan]; }; - cancensus = derive2 { name="cancensus"; version="0.5.3"; sha256="0lrw983bml8l130kcampzacrdxa0frm80h7vpr9n6wwnq4vmcbr4"; depends=[digest dplyr httr jsonlite rlang]; }; + cancensus = derive2 { name="cancensus"; version="0.5.4"; sha256="0pzm58fxhd330m5iq2k6527p5jsbfp2fj05mma39ib3gxliniwni"; 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.2"; sha256="1lwlgzy0gxp7jrak838awmqz3w0x7qd51bkyhydb1s61073w77x8"; depends=[CHNOSZ MASS rmarkdown xtable]; }; - cansim = derive2 { name="cansim"; version="0.3.12"; sha256="1vc92kv5d517gzwp6mbi3913d8bkikjxbaj4jyf9981zdqzgc3b8"; depends=[DBI digest dplyr httr jsonlite purrr readr rlang RSQLite rvest stringr tibble xml2]; }; - canvasXpress = derive2 { name="canvasXpress"; version="1.40.6"; sha256="1jdx3yfl10s1y4wxa48dydrfb3j8a8b9aismvmqyf8gm11l4y218"; depends=[htmltools htmlwidgets httr jsonlite]; }; + cansim = derive2 { name="cansim"; version="0.3.13"; sha256="0jxgrybrilqbnsrrd9k3hnjcyi1pvrdlb6ni3qgi3sj1x3zbkj3i"; depends=[DBI digest dplyr httr jsonlite purrr readr rlang RSQLite rvest stringr tibble xml2]; }; + canvasXpress = derive2 { name="canvasXpress"; version="1.40.6-2"; sha256="0fxnki66y7i0gqhjnjz673nmngq7scc3dasc2frn8w2ysj7v32j5"; depends=[htmltools htmlwidgets httr jsonlite]; }; canvasXpress_data = derive2 { name="canvasXpress.data"; version="1.34.2"; sha256="10fdlb1yp5x9533jdammncfrrlxzpcz9as8i0209pwzjywvxby3s"; depends=[]; }; cap = derive2 { name="cap"; version="1.0"; sha256="1pv8hskxjbp589dn7rx80yaa1ld76x1w37bss2fyrys1p3qr78aa"; depends=[MASS multigroup]; }; cape = derive2 { name="cape"; version="3.1.1"; sha256="0srgajj77a66pxj4kghjv4hjswv8arfmxbq25mpccc0fzalz1zlp"; depends=[abind caTools corpcor doParallel evd foreach here igraph Matrix pheatmap pracma propagate qtl qtl2 qtl2convert R6 RColorBrewer regress shape yaml]; }; @@ -6802,7 +6834,7 @@ in with self; { 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.2"; sha256="0my74q2l4vncans5s541mphl5pvkd4knxb0i396yf5w6a1vnqwlw"; depends=[magrittr reticulate]; }; - carat = derive2 { name="carat"; version="2.0.2"; sha256="0f6r4x5skjq7vcmwfhnrzrf69ry360y7wqrr5gsys8l5nv6qbjii"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo stringr]; }; + carat = derive2 { name="carat"; version="2.1.0"; sha256="12b6n99m1zcqxqsa2dk36i6g9qwmd8lzr3mlvj5454n4bgvqb4h0"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo stringr]; }; carbonate = derive2 { name="carbonate"; version="0.1.4"; sha256="01k8c49v8ybgcwdr9ipw319lxw4p14w9bzl54j1ljbajdzgzcgwk"; depends=[clipr details httpuv httr jsonlite magick R6 RSelenium rtweet wdman yaml]; }; carcass = derive2 { name="carcass"; version="1.6"; sha256="0nhp35nxjqqmy15rf9vc0qyymy7d0v8mc84570b9nc62g5xac8xy"; depends=[arm expm lme4 MASS survival]; }; card = derive2 { name="card"; version="0.1.0"; sha256="1api0j06fp5av5a48vnnm1wvwdcskynf0xsj9pb41njxdh9v8daf"; depends=[broom data_table dplyr generics ggplot2 ggrepel hardhat Hmisc lubridate lutz magrittr purrr readr recipes rlang sf stringr survival tibble tidyr]; }; @@ -6814,7 +6846,7 @@ in with self; { caretForecast = derive2 { name="caretForecast"; version="0.1.1"; sha256="0z8r64cb3w0m5a7khysvfmnf1ywa7svi5lvxiwx1a6j6868zbxlr"; depends=[caret dplyr forecast generics magrittr]; }; carfima = derive2 { name="carfima"; version="2.0.2"; sha256="1n68jqn42m54xn7jq8qywrpnvggrcsgvgnlqg6nw0pgiplbkynih"; depends=[DEoptim invgamma mvtnorm pracma truncnorm]; }; caribou = derive2 { name="caribou"; version="1.1-1"; sha256="1spz5ymqv8k48yg0rrdrs9ylasdif2jwcq2z33gagd6yrim1a3q3"; depends=[]; }; - caroline = derive2 { name="caroline"; version="0.8.0"; sha256="0xhr4g020xyd2jzzpknw6zdh33ihsclwxrkkl4mclybj3xqn9x2q"; depends=[]; }; + caroline = derive2 { name="caroline"; version="0.9.0"; sha256="1j1s4jli3pjl815fhmhz063y8aimz1qr14gacf9rvs7hyandlcbj"; depends=[]; }; carpenter = derive2 { name="carpenter"; version="0.2.2"; sha256="13ahhdc6f5ngrhb7slqbxzfs3wswixh0argyr6l46cv4fdkaa80s"; depends=[dplyr lazyeval magrittr pander tibble tidyr]; }; carrier = derive2 { name="carrier"; version="0.1.0"; sha256="0bqnwnnjqjk9q0lxq6kkz9s75ss10lfyyywyyi24m8wppxpw1vqc"; depends=[pryr rlang]; }; cartograflow = derive2 { name="cartograflow"; version="1.0.3"; sha256="09n3pgm70frrx9li1djrwkf4lzcq9c1xjs037vmsb1as0xvd19a1"; depends=[dplyr ggplot2 igraph maptools plotly reshape2 rgeos rlang sf sp]; }; @@ -6822,18 +6854,19 @@ in with self; { cartogramR = derive2 { name="cartogramR"; version="1.0-9"; sha256="0j8xa11g3m9sp2vcx0z6lk6cpdd8f83r2qx1ibcz28h5s6nmvn69"; depends=[data_table sf]; }; cartography = derive2 { name="cartography"; version="3.0.1"; sha256="1ginq160ag0sv5xfiqc5a5vizsqvl3maw61yskwhfnjb2lcgk2yg"; depends=[classInt curl png raster Rcpp rgeos sf slippymath sp]; }; casabourse = derive2 { name="casabourse"; version="2.0.0"; sha256="1s7zp44cmfnq4l9rzydqpnv9s2z4v7bvng8diz3bhzkg2zhpglnq"; depends=[gsheet R_utils RJSONIO rvest]; }; + caschrono = derive2 { name="caschrono"; version="2.3"; sha256="06q327cqa0hb0q60zyyj6r7ydcw9big597nwmmhb8px9j9d4pxdr"; 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]; }; + casebase = derive2 { name="casebase"; version="0.10.3"; sha256="0my4vsirm4n8qd3b81ml1hkllimz41l0819njc92znfyg7y6pj63"; depends=[data_table ggplot2 mgcv survival VGAM]; }; casino = derive2 { name="casino"; version="0.1.0"; sha256="07fphn46718gr1zm0xr43mwv7yk697xrc40lxxin315cf3gm0cka"; depends=[crayon dplyr ggplot2 magrittr purrr R6 tibble tidyr]; }; cassandRa = derive2 { name="cassandRa"; version="0.1.0"; sha256="0rwqzxbflxn1iyggm3mq6pkbl61mhk4vdwqwzlwrhrvvr2ib236r"; depends=[bipartite boot dplyr ggplot2 magrittr purrr reshape2 tidyr vegan]; }; cassowaryr = derive2 { name="cassowaryr"; version="2.0.0"; sha256="1gk54haciy3vj7xj6cji1v90xh7g8790zq1rykyispx09jr2dpx3"; depends=[alphahull dplyr energy ggplot2 igraph interp magrittr progress splancs tibble tidyselect]; }; - castor = derive2 { name="castor"; version="1.7.4"; sha256="0d0i974sa289pv0yw7wi3cdd8gpn3nyxfvm3vjgvr0hdr7bah6cp"; depends=[Matrix naturalsort Rcpp RSpectra]; }; + castor = derive2 { name="castor"; version="1.7.5"; sha256="0dfs0rjrw9zrs9n0avy3fq5r7vi4alvd55l7582j47dbwj82i1a5"; depends=[Matrix naturalsort Rcpp RSpectra]; }; cat = derive2 { name="cat"; version="0.0-7"; sha256="1a5csycaddg7cmfn51sw520b9bbpp07a08hsi2f6lpzqiszhczj1"; depends=[]; }; cat2cat = derive2 { name="cat2cat"; version="0.4.5"; sha256="07c6km66rps24z8mwa588gigl67j50icmvbqb7x9acz1938sqlwg"; depends=[MASS]; }; catIrt = derive2 { name="catIrt"; version="0.5.1"; sha256="1wagk9f9mvf3b5yvwpas9yqjzpcp786d37wn71jj1af0khry8k62"; depends=[numDeriv]; }; catR = derive2 { name="catR"; version="3.17"; sha256="178pq6cy3kjpd7mpaky2y8f18561gsf727y0y6rmgm2bn71p2i76"; depends=[]; }; - catSurv = derive2 { name="catSurv"; version="1.4.0"; sha256="02hrq51yk7zxz6vr4ykjwjnim9g09d63vpy3g0sm9hidbxryq139"; depends=[BH jsonlite ltm plyr Rcpp RcppArmadillo RcppGSL RcppParallel]; }; + catSurv = derive2 { name="catSurv"; version="1.5.0"; sha256="0jw7jlam7d44g9sbwmxckm4mywhky2a6h1w5w849g47p7mvi32dc"; depends=[BH jsonlite ltm plyr Rcpp RcppArmadillo RcppGSL RcppParallel]; }; cata = derive2 { name="cata"; version="0.0.10.9"; sha256="1226la2gm0r5wayharpmgm6lm7nr681xnzc0rpk8p39wwdyixmmr"; depends=[]; }; catalog = derive2 { name="catalog"; version="0.1.1"; sha256="1j43c34qdklv8pskaidq5fxrygv9lngamdcrkij9c844qj7iff14"; depends=[dplyr sparklyr]; }; catch = derive2 { name="catch"; version="1.0.1"; sha256="1a63d1a6pzzirdzswngjj036jmg41hbiadwriws7k05qp95jdh6a"; depends=[MASS Matrix tensr]; }; @@ -6842,17 +6875,16 @@ in with self; { catdata = derive2 { name="catdata"; version="1.2.2"; sha256="14kx7yi0cv6dyh9wjasb8gn6cp1bhglgwql7dc2a7lqvdcp0d5vj"; depends=[MASS]; }; cate = derive2 { name="cate"; version="1.1.1"; sha256="0wqfblyr7rjx9wnpbnv5lw2zv7nw3mbdjn866l1ng779vka1wdc5"; depends=[corpcor esaBcv leapp MASS Matrix ruv sva]; }; 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.4"; sha256="02g33kkp97kswiyjsd378zpa3fc9rjk2d9f4l1gdh7pzglabsmgl"; depends=[ade4 ape e1071 FD geometry hypervolume nlme rasterVis vegan]; }; catlearn = derive2 { name="catlearn"; version="0.9.1"; sha256="0l7ns9dmgl5k9nmywknna9hi8bmvlijds89pppywd7karksr5i66"; 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.2"; sha256="1rwp2ca6m4k104yc5pim66r5fpcakvzmkpg732jz3j34pw3w6nss"; depends=[dplyr magrittr plotly rlang]; }; - catnet = derive2 { name="catnet"; version="1.15.7"; sha256="015qh9k0jj5plp777j3kl20601qiwadkaqrdb0483h3gwqwy828g"; depends=[]; }; cats = derive2 { name="cats"; version="1.0.2"; sha256="0snc5vrf8qm53yd42gskhnpp6lfgfkldgpjj3jbcry0wpbfc0dv0"; depends=[doParallel dplyr epitools forcats foreach ggplot2 mvtnorm openxlsx plotly purrr tidyr zoo]; }; catseyes = derive2 { name="catseyes"; version="0.2.5"; sha256="11n2kxkqv4hqymkj6lkpcvhq6325q8f5w384xf8zb71jl8vx616l"; depends=[]; }; catsim = derive2 { name="catsim"; version="0.2.3"; sha256="1gz38xrzbray5ciiimkzdass8bhmiqxh6bcngjm5i8dvafk5gf9g"; depends=[Rcpp testthat]; }; cattonum = derive2 { name="cattonum"; version="0.0.5"; sha256="11h9nh2i2bmd0b562l5avhwpj9ppnfmzd9nsv94cymhwn5h6nmg6"; depends=[dplyr purrr Rcpp rlang tibble tidyselect]; }; + cauchypca = derive2 { name="cauchypca"; version="1.0"; sha256="1325cr6799ky3hxvhkb30xjq9pvk1wsm3rj0y11slwhs33hvl621"; depends=[doParallel foreach Rfast]; }; causact = derive2 { name="causact"; version="0.4.2"; sha256="059s70q7pdhbym2aj8ww35j6iv9n3am4nh7ywqg41ahyhc7mm9k0"; depends=[coda cowplot DiagrammeR dplyr forcats ggplot2 greta htmlwidgets igraph lifecycle magrittr purrr rlang rstudioapi stringr tidyr]; }; causal_decomp = derive2 { name="causal.decomp"; version="0.0.1"; sha256="08ccdzb5ssqhzkr3z3b8vz762mwflh33s6rrmsb9srvkk661lly2"; depends=[CBPS MASS nnet PSweight spelling SuppDists]; }; causalDisco = derive2 { name="causalDisco"; version="0.9.1"; sha256="1lni0y76prhvw60m0awwgmfadwlv1ciywlr85sr8ig2vaxf1smh9"; depends=[clipr gtools igraph pcalg RColorBrewer scales]; }; @@ -6864,11 +6896,12 @@ in with self; { causaloptim = derive2 { name="causaloptim"; version="0.9.2"; sha256="02d5rrs1h80c49664bicqh7il6x1r4wfid9791si7a35jz8gq0h2"; depends=[igraph rcdd Rcpp shiny]; }; causalsens = derive2 { name="causalsens"; version="0.1.2"; sha256="1xy8nybflbw6hymc15mmz27ic6hcq89wryb8q6d4zi216lwv2nww"; depends=[]; }; causalweight = derive2 { name="causalweight"; version="1.0.3"; sha256="1v1vmm5kfay3padkkr87yp5g539lqk5h3rl6w982glpqs8q80c59"; depends=[e1071 fastDummies glmnet hdm LARF mvtnorm np ranger SuperLearner xgboost]; }; - cba = derive2 { name="cba"; version="0.2-21"; sha256="0j2hbp0xlfp28gqgnkcvmb4yp1kc5m2bp5x7pr4m1pz2b1s7h7m6"; depends=[proxy]; }; + caviarpd = derive2 { name="caviarpd"; version="0.3.4"; sha256="1rc2h6a4i0n4wf0masyrq21vazm96kzhb7gz73h08a2ig1s66vhp"; depends=[]; }; + cba = derive2 { name="cba"; version="0.2-23"; sha256="18al5kavn3q2h6gl4s1hgxhy9ysv9fq602ffmzla251g380b166n"; depends=[proxy]; }; cbanalysis = derive2 { name="cbanalysis"; version="0.2.0"; sha256="0h0h8krlb6rckjpcw0jbbr8pcy3jm0cszimbm56l0ca668kiix06"; depends=[]; }; cbinom = derive2 { name="cbinom"; version="1.6"; sha256="1vi2kjlss4fmra1h8r6xgk4y66gzpdp61hcyzby2rqji93sib195"; depends=[Rcpp]; }; cbioportalR = derive2 { name="cbioportalR"; version="1.0.1"; sha256="01gfzghfww4dfc6sliy4vfxjghncchlyn1f37prbjbvfx921v7xp"; depends=[cli dplyr glue httr jsonlite magrittr purrr rlang stringr tibble tidyr]; }; - cbl = derive2 { name="cbl"; version="0.1.1"; sha256="0hk2c92vmka17hbc1dy0mz86v888drh6qbgd1dvjzszqimx1si4i"; depends=[data_table foreach glmnet lightgbm]; }; + cbl = derive2 { name="cbl"; version="0.1.2"; sha256="1yrhpzwj1mzyrb38fxljq3w93s2ab2ann2ryywai3g7gdmfsn20q"; depends=[data_table doRNG foreach glmnet lightgbm]; }; cbq = derive2 { name="cbq"; version="0.2.0.2"; sha256="0vg1mhk147pib61v4im3ikc551c2nmmcfah9fjw9c978gf81g32n"; depends=[BH Formula Rcpp RcppEigen rstan rstantools StanHeaders]; }; cbsodataR = derive2 { name="cbsodataR"; version="0.5.1"; sha256="02dalankaa4lfv9r7bc9cphmwb0mq6an7bs44rihipj8dsjd0v9y"; depends=[jsonlite whisker]; }; ccRemover = derive2 { name="ccRemover"; version="1.0.4"; sha256="1npd0vx2hyg7qbwd650987i49v5cxr6i1hlj5rw6fxc0b808s596"; depends=[]; }; @@ -6910,12 +6943,11 @@ in with self; { cdrcR = derive2 { name="cdrcR"; version="0.0.1"; sha256="1z6z27rnqg07i5j09q0xwy9bvwci1vc2vijp6r733diivyhcraiv"; depends=[dplyr httr jsonlite magrittr purrr rjson rlang rlist sf tidyr tidyselect urltools]; }; 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]; }; - 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]; }; cellOrigins = derive2 { name="cellOrigins"; version="0.1.3"; sha256="0nxhyz9bz0f598wpr10hm1d0zx83450xf9jkrl279v46x8sx36n4"; depends=[iterpc]; }; cellVolumeDist = derive2 { name="cellVolumeDist"; version="1.4"; sha256="1pbssq8zf1cmihs3fg5zgb3k876magxl84jld6vcfvvp76sxhr7l"; depends=[gplots minpack_lm]; }; - cellWise = derive2 { name="cellWise"; version="2.4.0"; sha256="1pqs7zw06ycr7413xxrnyrvq7m8ykhvni42n9s236822a0pbrpyb"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 robustbase rrcov scales svd]; }; + cellWise = derive2 { name="cellWise"; version="2.5.0"; sha256="1ls455d4y3mfkhz0g45qkhhd4jl7awipakcrsi87lskixzza73rr"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 robustbase rrcov scales shape svd]; }; cellpypes = derive2 { name="cellpypes"; version="0.1.3"; sha256="0wyf0p5x7dz8qy7xayp8n52cvk73fai13vzsknfk1qvs8wygnlfp"; depends=[cowplot dplyr ggplot2 Matrix rlang scales scattermore scUtils viridis]; }; cellranger = derive2 { name="cellranger"; version="1.1.0"; sha256="16fgi3annn34c3cxi0pxf62mmmmxi21hp0zzlv7bkfsjqy4g4f2x"; depends=[rematch tibble]; }; celltrackR = derive2 { name="celltrackR"; version="1.1.0"; sha256="08hbgpwcpf7v8l7qmszhjh0w4f4zjcizrdsxksihxpwdi9r4al3w"; depends=[ellipse pracma]; }; @@ -6923,14 +6955,14 @@ in with self; { cenGAM = derive2 { name="cenGAM"; version="0.5.3"; sha256="0qic2g2bq24k9jimxdk8g7bsmi4br2r6159ipdhh5ym81ji3sf5p"; depends=[mgcv]; }; censCov = derive2 { name="censCov"; version="1.0-0"; sha256="0i9vmyi12f1m5xnrl4cxk3z9qv7ymzxsyf4gbnpg1ph63yfnhv3g"; depends=[survival]; }; censReg = derive2 { name="censReg"; version="0.5-36"; sha256="0r8pyscsw3m8lf6mx70sjk70k7i1jfjkk2qzq19m85q3byx447n6"; 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]; }; + censable = derive2 { name="censable"; version="0.0.5"; sha256="15p4ggnkcddm2lglf798bcjghppx0pqzc8nyljyiw0hwsw14c7yg"; depends=[censusapi dplyr magrittr memoise purrr rlang sf stringr tibble tinytiger]; }; censo2017 = derive2 { name="censo2017"; version="0.6.1"; sha256="02q25kxv6kxj3634xk7vd3mwa8qvnmagwyh020z9yq6l6qfn2s6b"; depends=[cli crayon DBI duckdb httr purrr rstudioapi tibble]; }; censorcopula = derive2 { name="censorcopula"; version="2.0"; sha256="16pk4xlpliif02qznrhvl8qmrr6k4kknygqxcm83nsjxy6dcyga8"; depends=[copula]; }; censored = derive2 { name="censored"; version="0.1.1"; sha256="1878791vrm564mvlw0cw4spls03y7vgyc9r1qcfq98diffm9cqln"; depends=[dials dplyr generics glue hardhat mboost parsnip prettyunits purrr rlang survival tibble tidyr]; }; censusGeography = derive2 { name="censusGeography"; version="0.1.0"; sha256="1ncgd05ml571g3vy1g4p5xxg2bm08hbb6d5r3hpz7frn7w3l8l1d"; depends=[qdapTools]; }; censusapi = derive2 { name="censusapi"; version="0.8.0"; sha256="1wswd6kmb0fbyc3zs3q3dhhaa1la1z5alz4vg485ac9wacnab60r"; depends=[httr jsonlite]; }; censusr = derive2 { name="censusr"; version="0.0.4"; sha256="1n9571fyr46wj1dcxc2xgns9865655yzlq7yfz8im014wh0ycwqc"; depends=[dplyr httr stringr]; }; - censusxy = derive2 { name="censusxy"; version="1.1.0"; sha256="07xjkkfgr9q4g3hs6fr24rvmhhg4abxp6zxzq6qwc0r499qbx33y"; depends=[doParallel foreach httr]; }; + censusxy = derive2 { name="censusxy"; version="1.1.1"; sha256="1gdry73xzcixa3hfchlf2xmmlnhk1vsg7k3axvynvlr493i7qf2a"; depends=[doParallel foreach httr]; }; censys = derive2 { name="censys"; version="0.1.0"; sha256="0r0yvaidn0qn96hx461415hywsjfgaz9wvvdssx7w97v2ndnk9sy"; depends=[httr jsonlite purrr stringi]; }; centiserve = derive2 { name="centiserve"; version="1.0.0"; sha256="1m6gqz2rk7023340laa5pc0ncbfka2qi9ajvh65fwijd7xvv3n5c"; depends=[igraph Matrix]; }; centralplot = derive2 { name="centralplot"; version="0.1.0"; sha256="1slzvbm1vvgj1gkcx9pb46fz8q55vfyqrxsvx4qzi5kp7d9h4dy2"; depends=[ggplot2]; }; @@ -6949,7 +6981,7 @@ in with self; { cfda = derive2 { name="cfda"; version="0.10.1"; sha256="0v81wgqkp48gf11nxpg1dfj93qk55n8d7mfc1cyymkkhxzzdar44"; depends=[diagram fda ggplot2 mgcv msm pbapply]; }; cfdecomp = derive2 { name="cfdecomp"; version="0.4.0"; sha256="0g61gpihk5kbbrqzn15fqjv3bawsq1vq3sdssbzs5j96afmf2aq8"; depends=[]; }; cffdrs = derive2 { name="cffdrs"; version="1.8.20"; sha256="0x2gzqcif79hkrchx50j5yvxwwpgv8g8bxisfsa1xd7sja609hw7"; depends=[data_table doParallel foreach geosphere raster rgdal]; }; - cffr = derive2 { name="cffr"; version="0.3.0"; sha256="1hncf2bd8s7a77aay3iaz3k8l5wba7c89yiz1yap506ihjzbb94j"; depends=[crayon desc jsonlite jsonvalidate yaml]; }; + cffr = derive2 { name="cffr"; version="0.4.0"; sha256="0vyg3cl1vkz40ds2birlxn5ip24gfn5i4405vvnnb6gjp9ymmcpv"; depends=[crayon desc jsonlite jsonvalidate yaml]; }; cfid = derive2 { name="cfid"; version="0.1.4"; sha256="1jd66vy71b5y4ng4k5ln08cm0pa1xrzd9in1l4d1qq4cnw5qa724"; depends=[]; }; cfma = derive2 { name="cfma"; version="1.0"; sha256="006z5g3rqpg44jqdf6ivyxr47sxm5cd9cqhayfi8qk73xx5w4lv9"; depends=[]; }; cfmortality = derive2 { name="cfmortality"; version="0.3.0"; sha256="0dgwv89fzylznc6jr41ixzfs1gfs3np4gf46bk6pcd09l1kbx3lc"; depends=[]; }; @@ -6959,19 +6991,20 @@ in with self; { cgAUC = derive2 { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp]; }; cgaim = derive2 { name="cgaim"; version="1.0.0"; sha256="0bi8rmykgynkkbpkvm3n9ihl8x41n4msgz17ilwpa1xw9lf3pcj6"; depends=[cgam coneproj doParallel foreach gratia limSolve MASS Matrix mgcv osqp quadprog scam scar TruncatedNormal]; }; cgal4h = derive2 { name="cgal4h"; version="0.1.0"; sha256="0ghcwjfqlhqysnl8mgz6zp7dyqh8pvnpvphwjwk6zqi24n3nhac2"; depends=[]; }; - cgam = derive2 { name="cgam"; version="1.19"; sha256="1iw5wky4fr24jggwvink0frxy7qpgnvf08csfk240qk54spjbi81"; depends=[coneproj lme4 Matrix statmod svDialogs]; }; + cgalMeshes = derive2 { name="cgalMeshes"; version="1.0.0"; sha256="0580yf3sy7xxs629zhdl16agawfm7db7zvdi99a0sr0ab9h7nhj3"; depends=[BH data_table R6 Rcpp RcppCGAL RcppEigen rgl]; }; + cgam = derive2 { name="cgam"; version="1.20"; sha256="0mrd574zyajs46wgdyyly3vxpbpnvp5p8m4n1hsqyrjn6ba3lws4"; depends=[coneproj lme4 Matrix statmod svDialogs]; }; cghRA = derive2 { name="cghRA"; version="1.6.0"; sha256="16dlw27s8wckc75xcwc2g74pw6bar0y0ii3h53w1hql05d4f7sb8"; depends=[DNAcopy Rgb]; }; cglasso = derive2 { name="cglasso"; version="2.0.5"; sha256="0lmdsqk4fl9n02akm8ri4vrqjhxm0cxrbl0l2kywnvb1zckn75g3"; depends=[igraph MASS]; }; cglm = derive2 { name="cglm"; version="1.1"; sha256="1r3wrds5lbirzzqsi12prwykxa5361jb95pq7j95nlp6y8kcb94j"; depends=[data_table nleqslv Rcpp RcppArmadillo]; }; cgmanalysis = derive2 { name="cgmanalysis"; version="2.7.6"; sha256="0vs7n77p4midyfm8ng0sjanalvb9b7qgzhn6gazh51wjzczg759n"; depends=[ggplot2 lubridate parsedate pastecs pracma readr readxl XML zoo]; }; cgmquantify = derive2 { name="cgmquantify"; version="0.1.0"; sha256="11pw1layzx9a8qy7n06nyc59mi5r07krhxw6hhybbqkdglzp511w"; depends=[dplyr ggplot2 hms magrittr tidyverse]; }; - cgraph = derive2 { name="cgraph"; version="6.0.1"; sha256="0hmp07iz7ya3j8jaghm4pa0b84lsinc48rsibbh47sd3i6pkxfik"; depends=[]; }; cgrcusum = derive2 { name="cgrcusum"; version="0.1.0"; sha256="1pmni0bw7yp8alqyd88ysl858jkp926my2c5g6z31izzyih29s0z"; depends=[ggplot2 survival]; }; cgwtools = derive2 { name="cgwtools"; version="3.3"; sha256="1dl9ghwfzjrl5pd6izy4c5qyfq2s8ywnqh97y1bhwmcw2qwb4ci6"; depends=[gmp]; }; ch = derive2 { name="ch"; version="0.1.0.2"; sha256="1ryh2xr1ix4qznq1svi4gdr4qy6v6rg597z2zl6zw32s2xq6ssx6"; depends=[clipr crayon ggplot2 magrittr MASS polynom pracma Ryacas]; }; chameleon = derive2 { name="chameleon"; version="0.2-3"; sha256="0a3azp0zaakpqqx0pp94hkj3vgb2apnf8gb5ga0as4i8lrn9dz8i"; depends=[clue ggplot2 umap]; }; chandwich = derive2 { name="chandwich"; version="1.1.5"; sha256="1i3gg3ib4j33i5f3a6x9k2g8d5ccbdmv2pb2bdhiwwsjy8bfmsvq"; depends=[numDeriv]; }; - changepoint = derive2 { name="changepoint"; version="2.2.3"; sha256="1hpdxz9kqgvn5059sj2pmr7bg208ba950aidy256lad5hdjz2mcj"; depends=[zoo]; }; + changeRangeR = derive2 { name="changeRangeR"; version="1.0.1"; sha256="1lqml0lran2ggq0f855517lxbyscbymn7f5zvjwak433yr8y8p95"; depends=[dplyr phylobase rangeModelMetadata raster rgeos sf sp]; }; + changepoint = derive2 { name="changepoint"; version="2.2.4"; sha256="16v4p2c9zi2w3anwf5y9snl5dy1g5aidiqz1vn2p64qhfvg6yqxc"; depends=[zoo]; }; changepoint_geo = derive2 { name="changepoint.geo"; version="1.0.1"; sha256="1jlixdrq97n6bh09jq3hamlwkqfqbmqs14kr8swx20f8fvfr3fj2"; depends=[changepoint changepoint_np ggplot2 Rdpack]; }; changepoint_influence = derive2 { name="changepoint.influence"; version="1.0.1"; sha256="03m7vyqy0qdvkrr0cgxc2g019rjkmsc0fwnzkp2gxbbhvwhs4qzd"; depends=[changepoint data_table ggplot2 gridExtra reshape]; }; changepoint_np = derive2 { name="changepoint.np"; version="1.0.5"; sha256="1kyj1z0mmbk1i71d5xxw8h3468afvwlqma659yjck3y5dszb1vn9"; depends=[changepoint Rdpack zoo]; }; @@ -6991,7 +7024,6 @@ in with self; { 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-638"; sha256="0y1kmm14f7fkxxyjvxiavzcy2bfflwp98yx7z98ib0v7dnn86vmx"; depends=[]; }; - cheem = derive2 { name="cheem"; version="0.2.0"; sha256="0l8mbhl8jhwsikhy2nakdp21zz9k71fanhznjcqlpy7m7aqagp7i"; depends=[data_table DT ggplot2 magrittr plotly Rcpp shiny shinycssloaders shinythemes spinifex]; }; cheese = derive2 { name="cheese"; version="0.1.1"; sha256="1r4n9li33am0bsyl57kzg1m9g4w0pzbw6garcdp3qk7lwqxy2y26"; depends=[dplyr forcats kableExtra knitr magrittr purrr rlang stringr tibble tidyr tidyselect]; }; chemCal = derive2 { name="chemCal"; version="0.2.3"; sha256="0f0d0ljym745scnfdx0n0jp86g4r51gylcab3h7ykpaizgpah24r"; depends=[]; }; chemmodlab = derive2 { name="chemmodlab"; version="2.0.0"; sha256="01af0j24vymxiqahwhcf4kp0x603yllvlgcxnybsi2wnzm71swk7"; depends=[caret class e1071 elasticnet KernSmooth lars MASS MSQC nnet pls pROC randomForest rpart tree]; }; @@ -7000,11 +7032,9 @@ 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]; }; - chessR = derive2 { name="chessR"; version="1.5.2"; sha256="1czv5y4ybbi15b87959vri25fy31yv2l2cdd5q6p9fw291kj1qnp"; depends=[curl dplyr httr 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=[]; }; 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.3"; sha256="1a58s0zph4mfmh9sdfbv7yaa20lx5gi0mca0ikzarfwxjl5knp39"; depends=[DBI dbplyr dplyr jsonlite magrittr purrr RMySQL]; }; childsds = derive2 { name="childsds"; version="0.8.0"; sha256="1vv02kbw17b8zva2yc1qgi750z9yhyfv5xbig29dhyzvj8k00yvb"; depends=[boot class dplyr gamlss gamlss_dist magrittr purrr purrrlyr reshape2 tibble tidyr VGAM]; }; @@ -7029,7 +7059,6 @@ in with self; { choroplethrMaps = derive2 { name="choroplethrMaps"; version="1.0.1"; sha256="0ghqb2d1h0qkbcsll6ck2qk5sfvdwsrlh3phlbsjbak30832j7fr"; depends=[]; }; christmas = derive2 { name="christmas"; version="1.1.1"; sha256="0lxz71vbfqngkn4mg0c74ainww3vbzn8f4s5kmnw5bsd2mmwism7"; depends=[animation]; }; chromConverter = derive2 { name="chromConverter"; version="0.2.1"; sha256="0mpakgcqmpw0s7vcndqfmd2n2imn35nh5nkps07aj0vgd7z9ib8w"; depends=[magrittr purrr readr readxl reticulate stringr tidyr xml2]; }; - chromatographR = derive2 { name="chromatographR"; version="0.4.4"; sha256="15m74ijyh7dw4g2yigw4nf0gwbx7qlqb05pd2kzxbjckyhd449nb"; depends=[chromConverter dynamicTreeCut fastcluster lattice minpack_lm ptw pvclust scales smoother]; }; chromer = derive2 { name="chromer"; version="0.3"; sha256="08sj7x391y8jv3wc3v3blvsl501jkx3li928hb16niszx6a4w58x"; depends=[dplyr httr tibble]; }; chromoMap = derive2 { name="chromoMap"; version="4.1.1"; sha256="1067h5d6jdbm811n7ayikhqfbcqmxbz5jgp05vf1sbln7qgn9l43"; depends=[htmltools htmlwidgets]; }; chromote = derive2 { name="chromote"; version="0.1.1"; sha256="0aa9lsnvcq25xd7hk2n33vlrvihad7943x9fda891adjvsnjg57q"; depends=[curl fastmap jsonlite later magrittr processx promises R6 rlang websocket]; }; @@ -7037,7 +7066,7 @@ in with self; { chron = derive2 { name="chron"; version="2.3-58"; sha256="1l36yy9jq6hxkg9rfbsggwhjsb33scb56di0klmw4c73rllcczq5"; depends=[]; }; chronicle = derive2 { name="chronicle"; version="0.3"; sha256="0yfrxr93fbxgpxjs1gb56pdx1kk4nn9xvy2csgl1rhzrgbl343m3"; depends=[data_table dplyr DT dygraphs ggplot2 glue knitr magrittr plotly prettydoc purrr readr rlang rmarkdown rmdformats scales skimr viridis zoo]; }; chronicler = derive2 { name="chronicler"; version="0.2.0"; sha256="0nnv8mflvd8hw8dkgqcx9kb3dwzrzfr7hrk2l5kjdzs8xj3v6g63"; depends=[clipr diffobj dplyr maybe rlang stringr tibble]; }; - chronochrt = derive2 { name="chronochrt"; version="0.1.1"; sha256="0jk9qw82nq5db3b4lzny3mmbynahs862yxgs2zliliwpzfgb8vxm"; depends=[dplyr ggplot2 magick magrittr readr rlang tibble tidyr tidyselect]; }; + chronochrt = derive2 { name="chronochrt"; version="0.1.2"; sha256="0r8aqx74c4rxacqf47hinpf5fy3lypxd5a1g7iqb1rbk1z4mkfj6"; depends=[dplyr ggplot2 magick magrittr readr rlang tibble tidyr tidyselect]; }; chronosphere = derive2 { name="chronosphere"; version="0.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.6.0"; sha256="1j16am4nzwy2ckisksl5mk8h05ala6lpdd5qrb1gwyrhli4lx45a"; depends=[DBI dplyr LaF progress rlang]; }; @@ -7053,6 +7082,7 @@ in with self; { cinaR = derive2 { name="cinaR"; version="0.2.3"; sha256="0kdf3xbhg7yhpr67fqbbwqm16fvv3dj9f7bvfqliy3xhpxpg23qi"; depends=[ChIPseeker DESeq2 dplyr edgeR fgsea GenomicRanges ggplot2 ggrepel limma pheatmap preprocessCore RColorBrewer sva TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene writexl]; }; cinaRgenesets = derive2 { name="cinaRgenesets"; version="0.1.1"; sha256="0pz3iw559d8rsxmnwd1cqcpv8qnnh9bfvc9ydzwznx8jczbldls8"; depends=[]; }; cinterpolate = derive2 { name="cinterpolate"; version="1.0.0"; sha256="1aw6hs41xin2hhgmi4pr5510v4sn6x735lachpc5gpbxch5h3f82"; depends=[]; }; + cipheR = derive2 { name="cipheR"; version="1.0.0"; sha256="01h8mh2xlz1kkwm3nbiw8lpjlkjc19x5x8dq1yxfwdkq5yjjkyaa"; depends=[]; }; cir = derive2 { name="cir"; version="2.2.1"; sha256="19xnqd13b5adwnzq7m0zgwrbs03fz11krlnkxza3kmcz0xzyd2s0"; depends=[]; }; circacompare = derive2 { name="circacompare"; version="0.1.1"; sha256="15vpnh20wni2wmp86xql9737kbxbi28s9a4pi3rihr1w5mcgqfaj"; depends=[ggplot2]; }; circle = derive2 { name="circle"; version="0.7.2"; sha256="0nn14ky8df8ra03sh9ds7lkcksf9lysc1981dh19pca7iqbdydkx"; depends=[cli httr jsonlite]; }; @@ -7068,7 +7098,7 @@ in with self; { cities = derive2 { name="cities"; version="0.1.0"; sha256="0cka12km9fyqjsj7yl3wpzsq9pln7yzjxdq430441hsww8rr80l7"; depends=[dplyr ggplot2 ggthemes plotly tidyr]; }; cito = derive2 { name="cito"; version="1.0.0"; sha256="1mrcnrflhkzihjzpgaw4sq6a2p56p184dz3qfk2g50m0rism2qmr"; depends=[checkmate coro torch]; }; citrus = derive2 { name="citrus"; version="1.0.2"; sha256="1pzzyppqfh3qvc1xi2947lnshv7z2c21r8fribhc1avj76j26q5y"; depends=[clustMixType dplyr GGally ggplot2 RColorBrewer rlang rpart rpart_plot stringr tibble treeClust]; }; - ciu = derive2 { name="ciu"; version="0.5.0"; sha256="01fg5awbf35qparry0z3kl60kww8rbaqgi2b81vmbl77bls0my7l"; depends=[crayon ggplot2 Rcpp]; }; + ciu = derive2 { name="ciu"; version="0.6.0"; sha256="0pqs8ivbybbrjar978bl05awgaks33nqfm7l9z68iv2sj4a9hv21"; depends=[crayon ggplot2 Rcpp]; }; ciuupi2 = derive2 { name="ciuupi2"; version="1.0.1"; sha256="04x02qmqqyrc4h4z4mpl4zn5vr9y28k6j6n30fbr9q238zd543db"; depends=[functional nloptr pracma PreciseSums statmod]; }; civis = derive2 { name="civis"; version="3.0.0"; sha256="12q96bj21832zqqbisfxmnpqw7w72v350lyf7cpjgr7cq7b51brd"; depends=[future httr jsonlite memoise]; }; cjar = derive2 { name="cjar"; version="0.1.2"; sha256="0rq9ryhp2h3p927227chzwbjn7x22h9ckkha2kclhx0jh7swf5y7"; depends=[assertthat dplyr glue httr jose jsonlite lubridate magrittr memoise openssl progress purrr R6 rlang stringr tibble tidyr vctrs]; }; @@ -7106,7 +7136,7 @@ in with self; { 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.3"; sha256="1cwf41j4l9y5vji6zwj7j2na0xg5jfwjqgygqmpwb1gffqxak319"; 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]; }; - clidatajp = derive2 { name="clidatajp"; version="0.5.0"; sha256="15nqv6b7hwsh97wjwlanfbzaiilz2lwmb2pm89vm3lsik3m3nvph"; depends=[dplyr magrittr rlang rvest stringi stringr tibble tidyr]; }; + clidatajp = derive2 { name="clidatajp"; version="0.5.1"; sha256="1s64vsnam64n1jvwc7sw5nd256gs2w69f7ywgcpq1ypa8vaw0qs4"; depends=[curl dplyr httr magrittr rlang rvest stringi stringr tibble tidyr]; }; cliff = derive2 { name="cliff"; version="0.1.2"; sha256="0d7aswvsqlyai3rxxbfy08cs4qbi9fjjls62y1p95bmnhq1b3bwf"; depends=[ellipsis processx rlang]; }; clifford = derive2 { name="clifford"; version="1.0-8"; sha256="0gi4jajng1v0a45dl5qv8v279bm4lzfbkdsqp0bd1vil2ns1934j"; depends=[BH disordR magrittr mathjaxr partitions Rcpp]; }; clifro = derive2 { name="clifro"; version="3.2-5"; sha256="1p2xy5r9axkj8yk6ywaq0w5i00bdfm15drjz227nx8p4vd3q6si8"; depends=[ggplot2 httr lubridate magrittr RColorBrewer reshape2 rvest scales stringr xml2]; }; @@ -7117,7 +7147,6 @@ in with self; { climatrends = derive2 { name="climatrends"; version="0.4"; sha256="0w1qanbmannz7bmibss6s5blcx68gjl7c2r5h2n1irpdxs0s5sz3"; depends=[]; }; climdex_pcic = derive2 { name="climdex.pcic"; version="1.1-11"; sha256="01ax0kas43g3h21ixzc80f9gl4m9846gmk8v48rr0gkhcmbcc6jx"; depends=[PCICt Rcpp]; }; clime = derive2 { name="clime"; version="0.5.0"; sha256="15xc4cvllf6qpwa8a0lvsbivx4cricbgn0v3wc70xy69ngfa7zaj"; depends=[lpSolve]; }; - climetrics = derive2 { name="climetrics"; version="1.0-5"; sha256="0jy6npilv21hm0cwv5dmxwbz1x5lw75a14n9nbp743864z6jrz30"; depends=[raster rts sp terra xts yaImpute zoo]; }; climextRemes = derive2 { name="climextRemes"; version="0.3.0"; sha256="0c3zh64pipdq5266g8p6c6h0qdwfmigfh6s63ljqvr1ysv32k57g"; depends=[boot extRemes]; }; climwin = derive2 { name="climwin"; version="1.2.3"; sha256="1r2x5941k8l9z3517389y120sfhrskdpchc0pkibznza8aa95r85"; depends=[evd ggplot2 gridExtra lme4 lubridate Matrix MuMIn nlme numDeriv RcppRoll reshape]; }; clinDR = derive2 { name="clinDR"; version="2.3.5"; sha256="0p5pq0kpm8sfxv1a1dp2wyykp1qqbxbjz0c4f20igc25aazd7kaz"; depends=[doParallel DoseFinding dplyr foreach ggplot2 glue magrittr purrr rstan shiny tibble tidyr waiter]; }; @@ -7125,11 +7154,11 @@ in with self; { clinPK = derive2 { name="clinPK"; version="0.11.1"; sha256="1mzws5pgczdghxl2h0zgrp44in80kplnhy3gc7g4g8wssjwywbb3"; depends=[]; }; clinUtils = derive2 { name="clinUtils"; version="0.1.3"; sha256="1qv7xxcmvrsm7lldfa4az9vbwzldgg5xs1312xqhalvc4v6pi0bg"; depends=[crosstalk data_table DT haven htmlwidgets knitr plyr viridisLite]; }; clinfun = derive2 { name="clinfun"; version="1.1.0"; sha256="1fca5nd36xzb50ccbwrb4xxvzhqg7s60smwr42k5z9sfywfh79y8"; depends=[mvtnorm]; }; - clinicalsignificance = derive2 { name="clinicalsignificance"; version="1.0.0"; sha256="0nkf60jgl2w4f0j8kxb7pf2xf9718lnia2sl0ihj29fnl4kmhxs1"; depends=[checkmate crayon dplyr ggplot2 insight lme4 magrittr purrr rlang tibble tidyr]; }; + clinicalsignificance = derive2 { name="clinicalsignificance"; version="1.2.0"; sha256="017myylm3hh256zqis80f3y7y44p706wzkf8klw4d0frai7mrfwv"; depends=[checkmate crayon dplyr ggplot2 insight lme4 magrittr purrr rlang tibble tidyr]; }; clinmon = derive2 { name="clinmon"; version="0.6.0"; sha256="0cd5mrirfll0zbm9k8glwdqnh4qy4dlfnsypr3xhyf6ppgm35hlv"; depends=[signal]; }; clinsig = derive2 { name="clinsig"; version="1.2"; sha256="1wgfl9kks57yizrf8z6x7dhmbl3a80q8nnj3a5n2hpc9yr8l9ijf"; depends=[]; }; clinspacy = derive2 { name="clinspacy"; version="1.0.2"; sha256="134nvkircy1a1rmsg2nszk2r8bcdmikmrx6plchdz8gxyjd6jmya"; depends=[assertthat data_table magrittr rappdirs reticulate]; }; - clintools = derive2 { name="clintools"; version="0.9.6"; sha256="0zgv8vwa3ab2zwdrj8r7rc65ajpc2av9zks5vs9q93byzrxnz0f7"; depends=[ggplot2 lme4 signal xml2]; }; + clintools = derive2 { name="clintools"; version="0.9.7"; sha256="0v74706imgk5kkya3cj14c78dxji2zgxyasfm4x7k2jda20z3fap"; depends=[ggplot2 lme4 signal xml2]; }; clipp = derive2 { name="clipp"; version="1.1.1"; sha256="1yddihmjg90j9id825lyanqpfm4i67mdgvdm53pz20p8fcq4mlzw"; depends=[]; }; clipr = derive2 { name="clipr"; version="0.8.0"; sha256="1s9vvv3cxnz8w11gsi8z9ddv9jzib5qf5qqxnwqrrv7vj8cr7hij"; depends=[]; }; clisymbols = derive2 { name="clisymbols"; version="1.2.0"; sha256="1q7gi2zmykhzas9v8fdnbpdq7pzdcpbhim1yxvd2062l777g4j86"; depends=[]; }; @@ -7147,11 +7176,12 @@ in with self; { clr = derive2 { name="clr"; version="0.1.2"; sha256="088ks9lrhlyvg3yvlfmb0091yp6qp5bzg9h5r6ryv3bk6y56sajx"; depends=[dplyr lubridate magrittr]; }; clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; }; clubSandwich = derive2 { name="clubSandwich"; version="0.5.8"; sha256="1y894n35l4lzqm15ifxjnpnh95dldsfivv4098571yqf1z4a253q"; depends=[sandwich]; }; - clue = derive2 { name="clue"; version="0.3-62"; sha256="1lhybs6rhq8zs7q15ahng7c93liiygr64i2zwg3ya6maqji3ynjp"; depends=[cluster]; }; + clue = derive2 { name="clue"; version="0.3-63"; sha256="0c402fb3r1cxd0j6ikjhssq2k22lbnsq4k7vjpgvyx4a4ly2h4yr"; 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-3"; sha256="0m5yggbmp3kjh98nkmwy4k8lnd2jxp4c5gyysgvpp5zypakjc1cc"; depends=[MASS Rcpp]; }; clust_bin_pair = derive2 { name="clust.bin.pair"; version="0.1.2"; sha256="11lqd3vmx4kg08n6iv9na8rra49dkldx4f8jyf43hppbjrbvfinm"; depends=[]; }; + clustAnalytics = derive2 { name="clustAnalytics"; version="0.5.2"; sha256="1p9417l9ccfgng616cy6rl2i3rik4i5m4frpcw5k4szrxa3rdb81"; 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.3.0"; sha256="1j8v0qm6mqbh08kq8jahpgg6ygab6ac22lzzpcc2h72zm7r7cacr"; depends=[cluster fda ggplot2 ggpubr qrcm]; }; clustMD = derive2 { name="clustMD"; version="1.2.1"; sha256="0w4s9dab2mm5x0xibyl6s101c64if945a2cmwin9psd95p76mcny"; depends=[ggplot2 MASS mclust msm mvtnorm reshape2 truncnorm viridis]; }; @@ -7185,13 +7215,14 @@ in with self; { cmaRs = derive2 { name="cmaRs"; version="0.1.2"; sha256="1s92rmb5wxll2bwmmc95z59plpxfz0qn1l5qaf95zgp1ynwzybnm"; depends=[AUC earth Matrix Rmosek ROCR Ryacas0 stringr]; }; cmaes = derive2 { name="cmaes"; version="1.0-12"; sha256="0wk8zkf585ipnxajmibip85cyz7wc5br0cph3cvnacbh7yf2zvay"; depends=[]; }; cmaesr = derive2 { name="cmaesr"; version="1.0.3"; sha256="03zx2nrw24wmmjjpyh8pswasjjq0amf0g375fm2b3s111dx8fbj9"; depends=[BBmisc checkmate ggplot2 ParamHelpers smoof]; }; - 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]; }; + cmbClust = derive2 { name="cmbClust"; version="0.0.1"; sha256="01yjiscnligy6wpn752sqm53xhx0qxjbfd4dc8p7c31kbzfpif2x"; depends=[]; }; + cmcR = derive2 { name="cmcR"; version="0.1.11"; sha256="15d85mjy6y68jysji0910kg9vp69iz4pbb2l4vmn501xq4md3kx3"; depends=[dplyr ggnewscale ggplot2 ggplotify imager magrittr patchwork 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.2"; sha256="0v3fassl21wdyx7s4shsib936fr41qr9hxjgcjc2f8az0ljd1p70"; depends=[glmnet hierNet MASS Rcpp RcppArmadillo sparsenet]; }; - cmfrec = derive2 { name="cmfrec"; version="3.4.3-2"; sha256="0qzbkzsgr9haf48rhi70chsxbppmq7l19q3hmggfp12rziaa8y5l"; depends=[]; }; + cmfrec = derive2 { name="cmfrec"; version="3.5.0"; sha256="1x51pfjyxyjrpzrh0aglnm8z9wa9dqdjxpzwirxw8099wf647w67"; depends=[]; }; cmhc = derive2 { name="cmhc"; version="0.2.3"; sha256="17m4kiyw7x3sz7zb446y8sxq2s6f3yyqsqmll2k9d0sccrnah5f3"; depends=[aws_s3 digest dplyr httr readr rlang stringr tibble]; }; - cml = derive2 { name="cml"; version="0.0.5"; sha256="0j1awj84b68j13f7s0bs294sx7cdn9dch0vjclsnarwzv2alavx1"; depends=[MASS vegan]; }; + cml = derive2 { name="cml"; version="0.1.0"; sha256="10qwpgs64zhizid3l7i9ryx214w0kx0121dfkjmvmf00pdb685im"; depends=[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=[]; }; @@ -7215,11 +7246,10 @@ in with self; { 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.3"; sha256="09dq4xxpi632jb9vh96rsy2g51sn6apbccx9c8073hfsm078b4w6"; depends=[]; }; - coala = derive2 { name="coala"; version="0.7.0"; sha256="00rwjdl3nscrl7ldb9j5l12xhjg1fi8li5l9xyx9gw28ixkznl6a"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; }; coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-4"; sha256="09abhcp6y98378kf018inhxpkkirch5636nskywn0p6shp2q278x"; depends=[ape coda lattice Matrix phangorn]; }; coalitions = derive2 { name="coalitions"; version="0.6.24"; sha256="1ya9g2i1ds2w4hxbacmql67a3hh1grycj74g6b7xb05h478ym87n"; 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.4.0"; sha256="00zggkpqvgsabddrg1cmdvwk8rx4zfdyila9qdg000x7bbbm8nix"; depends=[backports crayon ggplot2 gridExtra gtable rlang]; }; + cobalt = derive2 { name="cobalt"; version="4.4.1"; sha256="1h4z6v5k9v4fsgygbc6v20p1ld1d7f9jgygasyk40abx1rd0r8sf"; 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-5"; sha256="04f6a6gp11p93j2k35mbrfqgjx5qsgi3dj1085a5v5s0z6l7vbkz"; depends=[quantreg SparseM]; }; coca = derive2 { name="coca"; version="1.1.0"; sha256="1lh7q3ip1jaz5zj5zcnd5whwpjw6zcrxs6j0j8mnmjsnw2kr4m5n"; depends=[caret cluster fpc glmnet Matrix nnet pheatmap RColorBrewer sparcl]; }; @@ -7229,7 +7259,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.5.2"; sha256="0pcgjsfcgz5fj949szahkppb9rb9cba47b1galm4i6c3qp0yn18a"; depends=[jsonlite Matrix Rcpp RcppArmadillo]; }; - coda4microbiome = derive2 { name="coda4microbiome"; version="0.1.1"; sha256="0ckd20wajqj2mxz7l8w12pvc54xys0a9fg0h2qw7kjbhgx5hmi6j"; depends=[corrplot ggplot2 ggpubr glmnet plyr pROC qpdf]; }; + coda4microbiome = derive2 { name="coda4microbiome"; version="0.1.2"; sha256="1f05lnv59scq2m3jj9fajmcivnfkpnwzqdxkmxa9ik0ydsa4h5wn"; depends=[corrplot ggplot2 ggpubr glmnet plyr pROC]; }; codacore = derive2 { name="codacore"; version="0.0.4"; sha256="047klw705a4x0b93xvwd6839j30gg9jl1dgwdnkcqjiwn9jx8fb3"; depends=[gtools keras pROC R6 tensorflow]; }; 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]; }; @@ -7247,7 +7277,7 @@ in with self; { codified = derive2 { name="codified"; version="0.3.0"; sha256="0a5k0zqw1dxa3v1hzh3s43zlpyzpgxnbq2rhz8kq0g8lxqlki3pc"; depends=[checkmate dplyr kableExtra knitr rlang tibble tidyr]; }; codingMatrices = derive2 { name="codingMatrices"; version="0.3.4"; sha256="05ndy51wpqyk1b3nq95zn6lxgzg5hzqbr2w7b2v8ar291sxvc4g7"; depends=[fractional Matrix]; }; codyn = derive2 { name="codyn"; version="2.0.5"; sha256="1iqlh3ydnqi7s2b3fa2zgb05j763qgxriys4piawwmgrdrvd3d9q"; depends=[assertthat permute vegan]; }; - coefa = derive2 { name="coefa"; version="1.0.1"; sha256="1zi5x3wpdjbf22p50aax8h22hw96knwp9s3fzaz2v5p6j0b13dnj"; depends=[openxlsx psych purrr]; }; + coefa = derive2 { name="coefa"; version="1.0.2"; sha256="0qb78kbr7z307165j7q17bm1p9aq6p4iy2j1sbpqks4bvkih9drs"; depends=[openxlsx psych purrr]; }; coefficientalpha = derive2 { name="coefficientalpha"; version="0.7"; sha256="0li1js501sa8m0ba76ymn4lz5y4np7kf96gnxz9kypg50kd58yis"; depends=[lavaan rsem]; }; coefplot = derive2 { name="coefplot"; version="1.2.8"; sha256="0qxa57sm5hncmd4mxab1c7hk34n2s5fsn51ck6ik2ciynhgcqxvn"; depends=[dplyr dygraphs ggplot2 magrittr plotly plyr purrr reshape2 tibble useful]; }; coenocliner = derive2 { name="coenocliner"; version="0.2-3"; sha256="07hik9y84nj1l83spcp1hq9lj960zsg3v0i8rk0xfv25grrakp85"; depends=[]; }; @@ -7260,7 +7290,7 @@ in with self; { cognitoR = derive2 { name="cognitoR"; version="1.0.2"; sha256="1pz4wk7vdc1nhm76kz912hyyc9c408qsldfr9dygqvran4xvqm9g"; depends=[base64enc config dplyr httr jsonlite paws shiny shinyjs yaml]; }; cohortBuilder = derive2 { name="cohortBuilder"; version="0.1"; sha256="1j6ksdynss3wmizcqb2in7fpcllfpsd4xw0xklcn9r94cdnhgrz4"; depends=[dplyr formatR ggplot2 glue jsonlite magrittr purrr R6 rlang tidyr yaml]; }; cohorts = derive2 { name="cohorts"; version="1.0.1"; sha256="0g3xllmk5n4s2w10a2460v735bsc2xnkxgcr9zkvl8sz8rczrs2n"; depends=[data_table dplyr dtplyr magrittr tibble tidyr zoo]; }; - cohorttools = derive2 { name="cohorttools"; version="0.1.4"; sha256="1zpf3qgzkn34wc36r89ymzfx4fvlgl7x1yiwdwzzd20xv3nx2b5h"; depends=[cmprsk DiagrammeR DiagrammeRsvg Epi ggplot2 rsvg survival]; }; + cohorttools = derive2 { name="cohorttools"; version="0.1.6"; sha256="17gz4887vhkk0qr5mcv0vcfaxiws1pk1fdd4y8wqbl57ikn5i9vs"; depends=[cmprsk DiagrammeR DiagrammeRsvg Epi ggplot2 mgcv rsvg survival]; }; coil = derive2 { name="coil"; version="1.2.3"; sha256="023sn4waf8wb99ryxf0biag8rfg3j3sslf8fw7d00llzci8px5zj"; depends=[ape aphid seqinr]; }; coin = derive2 { name="coin"; version="1.4-2"; sha256="1cpv7jx840inzg98bkhrb5yscx0gpag6br237r5qpnc2gbrd2ikm"; depends=[libcoin matrixStats modeltools multcomp mvtnorm survival]; }; coinmarketcapr = derive2 { name="coinmarketcapr"; version="0.4"; sha256="1h95fm32w03gxjka71n41lxkinfwpal4dl6hmhfdph8wywn7y50j"; depends=[cli crayon curl data_table ggplot2 jsonlite]; }; @@ -7310,6 +7340,7 @@ in with self; { combinIT = derive2 { name="combinIT"; version="2.0.0"; sha256="1l2ypnrm2qi1z10c2qyyaqqcjgk3mgsh80b3j9zrjwq9zdakrhi5"; depends=[mvtnorm Rcpp RcppArmadillo]; }; combinat = derive2 { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; }; combinationpvalues = derive2 { name="combinationpvalues"; version="0.1.4"; sha256="0n5dhgss8mrxshfixpc10g1p7l06hcn3fbk7l9sp92ap64kalz6c"; depends=[chi dplyr spatstat_utils]; }; + combinatorics = derive2 { name="combinatorics"; version="0.1.0"; sha256="02v0fz6qw08v4krnaj6ph76d6n2al12c48vl81ajj5hvlnjwldhg"; depends=[]; }; combinedevents = derive2 { name="combinedevents"; version="0.1.1"; sha256="0fwsxn2ziapax1wy9k57n76z3nxqb22vfbp5r3y6xg3aparxdxpz"; depends=[lubridate magrittr rlang stringr]; }; combiroc = derive2 { name="combiroc"; version="0.2.3"; sha256="0plg8w96jr5lnishjmcxa1a3nw14jyfaybgr0vcimhx32zv6b14c"; depends=[devtools dplyr ggplot2 gtools moments pROC stringr tidyr]; }; combiter = derive2 { name="combiter"; version="1.0.3"; sha256="11pcvrpbvkzkjwks2z6ww7s9d5fkh8zl0jw52a5ya3y1wkqcs3n6"; depends=[iterators itertools Rcpp]; }; @@ -7317,6 +7348,7 @@ in with self; { cometExactTest = derive2 { name="cometExactTest"; version="0.1.5"; sha256="0ar9axm9cd1wd937xcmsmd7xqilnfyab8gsrpkiqpc3fjh86qyrp"; depends=[dplyr]; }; cometr = derive2 { name="cometr"; version="0.2.0"; sha256="0fbg1lfw0q4lfk4svflfwjfmwxbrdvmrvxry90xp39i7g8zd2ahd"; depends=[callr httr jsonlite R_utils R6 yaml]; }; comf = derive2 { name="comf"; version="0.1.11"; sha256="17hby9qah3bd4p3rfhd1lf3yaz5qxxd4p5aaq1ql7jdixb9p51q0"; depends=[plyr reshape]; }; + commafree = derive2 { name="commafree"; version="0.1.0"; sha256="0dn6ps6nvinwaxc8js5bq2kg78nzrf7ijbi77c7jan8z50d19m0p"; depends=[]; }; commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; }; common = derive2 { name="common"; version="1.0.5"; sha256="06xjpbrpmzkphwxr2z8di8qig9qf0d2g9jg7142nvwmm2mf05iwg"; depends=[this_path]; }; commonmark = derive2 { name="commonmark"; version="1.8.1"; sha256="1gjwpmcxv15y1jg9f7kzp49s68kj1skjsh5g264f9lp37l4wpbcn"; depends=[]; }; @@ -7329,7 +7361,7 @@ in with self; { compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; }; compareC = derive2 { name="compareC"; version="1.3.2"; sha256="0r3d03yj5fjzfc6awc16x9420366dcy3nhvibjlrn0m10il714pc"; depends=[]; }; compareDF = derive2 { name="compareDF"; version="2.3.5"; sha256="1sq30ndlidpmyvpqkzhq5shy52i22p80lcfar3p8dqymndg1bgyl"; depends=[data_table dplyr htmlTable openxlsx rlang stringr tibble tidyr]; }; - compareGroups = derive2 { name="compareGroups"; version="4.5.1"; sha256="0ll770lj2j6nnjdpkij1wadd2nqppkdjcfglfx13kk5r5ldmfyq1"; depends=[chron flextable HardyWeinberg kableExtra knitr officer rmarkdown survival writexl]; }; + compareGroups = derive2 { name="compareGroups"; version="4.6.0"; sha256="0w44dk3ba9dq68kl2y5665h6l8j0w59mx70rwi58c77w3bqz0jry"; depends=[chron flextable HardyWeinberg kableExtra knitr officer rmarkdown survival writexl]; }; compareMCMCs = derive2 { name="compareMCMCs"; version="0.5.0"; sha256="0g3fzazfs6f8ni251ilzk0q65hvgfhglly7v4rmkl4jwhzvsz1yr"; depends=[coda ggplot2 nimble R6 reshape2 xtable]; }; comparer = derive2 { name="comparer"; version="0.2.2"; sha256="1rhx9an7qi9r3cv2zpnb9qw0byg06zabg99v51mal218080r6rvm"; depends=[R6]; }; comparison = derive2 { name="comparison"; version="1.0-5"; sha256="0vg8s9j2xjzv7bidd59givxgcqzhdd29q84dj4ww2a6vkmq269r7"; depends=[isotone]; }; @@ -7339,13 +7371,13 @@ in with self; { competitiontoolbox = derive2 { name="competitiontoolbox"; version="0.7.1"; sha256="0s8n62hssx0qkznf0x6gw9yzlngiqgjw34k9wyhlh5iiwq4fyc3x"; depends=[antitrust ggplot2 rhandsontable shiny trade]; }; compicc = derive2 { name="compicc"; version="0.1.0"; sha256="1j2yy4dw3g96vpm3dq81dixhfzm3nqqawphmmg9hcsqir5f6xg9a"; depends=[irr]; }; completejourney = derive2 { name="completejourney"; version="1.1.0"; sha256="0ysbpmd7rglz3diy2cpcgvmmcnysradb4ddiwix7kbhzrhvhrdrs"; depends=[curl dplyr progress stringr tibble zeallot]; }; - complexNet = derive2 { name="complexNet"; version="0.1.0"; sha256="0jswxr16j7irjbfc5p5vgdaksh3gs8gyx3cwbs0acrpyykxpi5k7"; depends=[]; }; + complexNet = derive2 { name="complexNet"; version="0.2.0"; sha256="199zxqsbasd1j598srpb10y8mjw2l4plra1121i9sdsf40bvd7aw"; depends=[]; }; complexity = derive2 { name="complexity"; version="1.1.2"; sha256="0y1rlz456mny4d0kr8rx26qg5frr3zxsbzm1cc76h475vad4ns28"; 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-4"; sha256="1bqg0qqzsf92q0jb7hdjycr54bwv8rk7ajhvxgch5yslyqxpm73v"; depends=[bayesm MASS robustbase tensorA]; }; composits = derive2 { name="composits"; version="0.1.1"; sha256="0njz6yn3dxi5czzmp93lcz2xr5gphiii857s5jggygq0xdszlx86"; depends=[anomalize dobin dplyr fastICA forecast ggplot2 gridExtra ICS kableExtra otsad pracma rlang tibble tidyr tsoutliers]; }; - compound_Cox = derive2 { name="compound.Cox"; version="3.21"; sha256="0n0g56698w8mhlhizx8ji0q0r3qjmsjpyv5pfgy4xp4k3hi518l5"; depends=[numDeriv survival]; }; + compound_Cox = derive2 { name="compound.Cox"; version="3.23"; sha256="1iqhqwnrvvrzk0jyqgpsq7aa1pglmqsgxinxpv20588nhvjkxn60"; depends=[MASS numDeriv survival]; }; comprehenr = derive2 { name="comprehenr"; version="0.6.10"; sha256="1wlc06swm45nxg9hgik3wj832sr074i3p0j5kxm0i2r74klfy22w"; depends=[]; }; compute_es = derive2 { name="compute.es"; version="0.2-5"; sha256="00133s3l3g70xrfnxgxhvbjr8izvaj9h0c73iaiyjmlgj84x69m8"; depends=[]; }; comsimitv = derive2 { name="comsimitv"; version="0.1.5"; sha256="0g1b14bx0dgy7y24gxlj0r2sgiild14cvr1zmf37df7g3bswn112"; depends=[MASS vegan]; }; @@ -7353,7 +7385,6 @@ in with self; { con2aqi = derive2 { name="con2aqi"; version="0.1.0"; sha256="1gdd1y6xg26fz199hvryzsnp16qbsz13chqqxyxnkgrai1l72mhf"; depends=[]; }; con2lki = derive2 { name="con2lki"; version="0.1.0"; sha256="005bk3y7il94h7zlkdjlibm1zm9yplbbzlybdjxmckh67sr6d03x"; depends=[]; }; conStruct = derive2 { name="conStruct"; version="1.0.4"; sha256="1klhzsxrkbz16dnm3r2qxyq2z02zqrps9kij2jy6241ni9qmnn2f"; depends=[BH caroline doParallel foreach gtools Rcpp RcppEigen rstan rstantools StanHeaders]; }; - conText = derive2 { name="conText"; version="1.1.0"; sha256="04zqahx01rqpa6wm4krnr7vfafcxgqblrd911qw7pfwvmjl2w92s"; depends=[dplyr fastDummies ggplot2 Matrix quanteda reshape2 stringr text2vec tidyr]; }; concatenate = derive2 { name="concatenate"; version="1.0.0"; sha256="1kvsw7vwa3hn97ff7r6z21h5ajs74azwv2dk4pzgyaasnbp778hw"; depends=[]; }; concatipede = derive2 { name="concatipede"; version="1.0.1"; sha256="1cmc0pcy9di1bxzj4kgbnvv1avd7xd6jzk43kni7fc5fkcq2jj3x"; depends=[ape dplyr igraph magrittr qualV readxl stringdist stringr tibble writexl]; }; concaveman = derive2 { name="concaveman"; version="1.1.0"; sha256="0b3fx3y60ibb73pqx5591jq1n86242qajfxbz3vzz6rxxspddlcz"; depends=[dplyr jsonlite magrittr sf V8]; }; @@ -7366,9 +7397,8 @@ in with self; { cond = derive2 { name="cond"; version="1.2-3.1"; sha256="1j0gf28mg2j6ahs83nk662bix1lb2c9184vn8sblw433zxqaa2ny"; depends=[statmod survival]; }; condGEE = derive2 { name="condGEE"; version="0.2.0"; sha256="09vbwpn4i37cn8gs9pr62mvzzbqrfm756370zas97kjbnmx8glbj"; depends=[numDeriv rootSolve]; }; condMVNorm = derive2 { name="condMVNorm"; version="2020.1"; sha256="115pxnff2ckdxx0avbs0hfdhh1sljiz1y6h7ggd5hidrxd3559m4"; depends=[mvtnorm]; }; - condSURV = derive2 { name="condSURV"; version="2.0.2"; sha256="1zw79rll44dx5vysfixfp684gf8c3c37xazwgrfzjbq54i3jwmir"; depends=[doParallel doRNG foreach KernSmooth np survival]; }; condTruncMVN = derive2 { name="condTruncMVN"; version="0.0.2"; sha256="1dicfa82yg8k83lnb5c17jnqwgkazpb8404kfzdf6ikmndwjn0zg"; depends=[condMVNorm matrixNormal tmvmixnorm tmvtnorm truncnorm]; }; - condformat = derive2 { name="condformat"; version="0.9.0"; sha256="151rpnrnbj5ilckf99m6k3c26r1sr94496kws9w91faxilvl180b"; depends=[dplyr gridExtra gtable htmlTable htmltools knitr magrittr openxlsx rlang rmarkdown scales tibble tidyselect]; }; + condformat = derive2 { name="condformat"; version="0.10.0"; sha256="1iyvghcz5x9kg4jbh4fl97rcwcvi8rcp6rngvgqiyzdg8sbfxkr6"; depends=[dplyr gridExtra gtable htmlTable htmltools knitr magrittr openxlsx rlang rmarkdown scales tibble tidyselect]; }; condir = derive2 { name="condir"; version="0.1.3"; sha256="09b0nfdi39mq0531bjzmk8wnmzkyvcd2q5fyk8lnam3n6fz3dg2y"; depends=[BayesFactor effsize knitr psych shiny xtable]; }; conditionz = derive2 { name="conditionz"; version="0.1.0"; sha256="0ijnsg6n3p3y8y9il012xg5if57hdzvrgxjcykfrrlil4m7ixn6c"; depends=[R6 uuid]; }; condmixt = derive2 { name="condmixt"; version="1.1"; sha256="1x6n3ylaa9ywvz7v63i2pvd2lxm95wq19xy741g9hy73ld7hd7zn"; depends=[evd]; }; @@ -7393,7 +7423,7 @@ in with self; { conformalInference_multi = derive2 { name="conformalInference.multi"; version="1.1.1"; sha256="1xc879ygv9avamy29a6rdfb6pknaz82f3k6392c8a90sgfn3bx3d"; depends=[future future_apply ggplot2 glmnet gridExtra hrbrthemes]; }; conformalbayes = derive2 { name="conformalbayes"; version="0.1.2"; sha256="0pl1ajix5v3zckny5angk1rqnalln4agf65yrdva210zl6wp7fzm"; depends=[cli loo matrixStats rstantools]; }; 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.6.0-3"; sha256="0lijjj355y5ihf3djh9swfk0x0xa4307y6a1i864xp2jh2v79hs9"; depends=[gmp vcd]; }; + confreq = derive2 { name="confreq"; version="1.6.1-1"; sha256="05bwsj4xa3k7gngnf3ni8j0qw7yd7iycqkarpxm60dy8ayy68bs8"; depends=[gmp vcd]; }; congress = derive2 { name="congress"; version="0.0.1"; sha256="0fkdffapylsqd1xwxrq6jxcas2amaz9xhap6lbyy6grw0ww7phr7"; depends=[cli dplyr glue httr2 purrr rlang stringr tibble tidyr]; }; conicfit = derive2 { name="conicfit"; version="1.0.4"; sha256="1d704xgiyqmbwfxnsmhqg885x10q8yqxmrk4khqpg3lh696bw97d"; depends=[geigen pracma]; }; conjoint = derive2 { name="conjoint"; version="1.41"; sha256="1iq3226a6fn1gddmh2nxlzvjcvbj7502r9520g9d4xdmk8smfx33"; depends=[AlgDesign broom cluster fpc ggfortify ggplot2]; }; @@ -7413,14 +7443,14 @@ in with self; { consortr = derive2 { name="consortr"; version="0.9.1"; sha256="1c71wvr7sckrv4k65l71l160z6d9amzyydbi6mf2b79zh9zv8g1g"; depends=[data_table DiagrammeR dplyr magrittr purrr rlang shiny shinydashboard tibble]; }; constants = derive2 { name="constants"; version="1.0.1"; sha256="11nliijwphqphik95b3xpawpjg7w4s089wdhjci5bw4va4bgd1xm"; depends=[]; }; constellation = derive2 { name="constellation"; version="0.2.0"; sha256="1d49rnyf2z3bvx158nsmgmb0x7xcgxl9f8y98pwg5wlqck7af99q"; depends=[data_table]; }; - contFracR = derive2 { name="contFracR"; version="1.0"; sha256="115gx38lqf2059fr76xyms2kzjqkg6g7inmfdh7a0c9qn4xjhk3q"; depends=[gmp go2bigq Rmpfr]; }; + contFracR = derive2 { name="contFracR"; version="1.2"; sha256="1pb1xbmgdpg1svxvhq3jx5dmxszivwzmhd18hmg4rlhym454sh1b"; depends=[gmp go2bigq Rmpfr]; }; contTimeCausal = derive2 { name="contTimeCausal"; version="1.1"; sha256="0r2mg0b65xk020v0im2nzfq9644nx0ns2vddiybwz3x5c7z1bpvg"; 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=[]; }; - contentid = derive2 { name="contentid"; version="0.0.15"; sha256="0r5lrq82vfv698g8md8kdhl83gi8rx5hrhk2qddykxlxk4krzagi"; depends=[curl fs httr openssl]; }; + container = derive2 { name="container"; version="1.0.4"; sha256="0vpha9s5d8mxqdzmbfy92qz78b6gfibwgp1ijq70c5vqs2clkzb1"; depends=[data_table R6]; }; + contentid = derive2 { name="contentid"; version="0.0.16"; sha256="17zb7fpnr1a2ixanxmgk9awwmb3njw1lk97s3a0w6cvd7dwz8iz2"; depends=[curl fs httr openssl]; }; contfrac = derive2 { name="contfrac"; version="1.1-12"; sha256="0sq5c7ny235yrkv2xc4insgxby6rvzc1qsj8h301cd2if3lwbgwm"; depends=[]; }; - contingency = derive2 { name="contingency"; version="0.0.6"; sha256="0bwvrwsa41s24j612w4jyhlfp2r6qa37ljsb3lxx27mkd9r0286d"; depends=[rje]; }; - contingencytables = derive2 { name="contingencytables"; version="1.0.2"; sha256="09biny56xvp9bmhm53vcw6985hk2b4bbzyj8y25wzg3idznxihlf"; depends=[boot MASS]; }; + contingency = derive2 { name="contingency"; version="0.0.10"; sha256="155pzw1ifm1c4pjd5wxj9lb89a6wc9l5g1v2rhq8rfswzds89gjv"; depends=[rje]; }; + contingencytables = derive2 { name="contingencytables"; version="1.0.4"; sha256="18j7iaficb0lhl6g83cgr346a1wq19s20nmiclrxryyk88pswzak"; depends=[boot MASS]; }; contourPlot = derive2 { name="contourPlot"; version="0.2.0"; sha256="0bjwq3p57d6hadln8vwjkh7c9sbb466h3zcq9kpx7kd31z6x8gnz"; depends=[interp RColorBrewer]; }; contoureR = derive2 { name="contoureR"; version="1.0.5"; sha256="1izq1alkf24zd2sf2ir2adyrkwhdj7n89cv6z0dfh5mfqld5bkdn"; depends=[geometry plyr Rcpp reshape]; }; contrast = derive2 { name="contrast"; version="0.24.2"; sha256="1k7gdjmzgsw3rm90k9gpzlg4b8ma7vxamdj106b6r40q1ypaqha5"; depends=[nlme rms sandwich]; }; @@ -7438,6 +7468,7 @@ in with self; { convey = derive2 { name="convey"; version="0.2.5"; sha256="0vji97sip7p2xpbd3mhx2a6aw46zjky561rypa3hb8xpag16fna5"; depends=[survey]; }; convoSPAT = derive2 { name="convoSPAT"; version="1.2.7"; sha256="1pmiirigjdkrb3pzqcw6qlh6418z384mvaxqw5mrcm1gxzrqp649"; depends=[ellipse fields MASS plotrix StatMatch]; }; cooccur = derive2 { name="cooccur"; version="1.3"; sha256="1wlaghhi4f3v8kzwhcgq3c6as7v3zlpkzhb232qz1amr7f0058kv"; depends=[ggplot2 gmp reshape2]; }; + cookies = derive2 { name="cookies"; version="0.2.0"; sha256="14rz7wfv3pfgj7j6i11kawavz161k7kdpz0lzjyy756mbrd5cpky"; depends=[cli clock glue htmltools httpuv jsonlite purrr rlang shiny vctrs]; }; cooltools = derive2 { name="cooltools"; version="2.0"; sha256="1ak4kkmi0m38rmwk3d4r5y9224awhx65gbb2i2nhw4cfhnzdyg0k"; depends=[bit64 celestial cubature data_table jpeg 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]; }; @@ -7448,15 +7479,15 @@ in with self; { coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.3"; sha256="1chwsfyaf5rmlsypr43n7px8b2220dfa5mzcriq1swylgbx4181l"; depends=[]; }; copre = derive2 { name="copre"; version="0.1.0"; sha256="1mvh2fyxsc8v2cwlppsnx29dn5s1vg5pg22cd5acidsnk5lvbr86"; depends=[abind BH dirichletprocess ggplot2 pracma Rcpp RcppArmadillo]; }; cops = derive2 { name="cops"; version="1.2-0"; sha256="0bw13yhvnq5qw9rgmvf7w3kmygbpx58168rm546x8v155ywccvfx"; depends=[cmaes cordillera crs dfoptim GenSA MASS minqa NlcOptim nloptr pso rgenoud Rsolnp scatterplot3d smacof subplex]; }; - copula = derive2 { name="copula"; version="1.1-0"; sha256="096rfnm14lp2pldqdphhf1v8bqv7ihxi901qinhv4kakari6xdws"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm numDeriv pcaPP pspline stabledist]; }; + copula = derive2 { name="copula"; version="1.1-1"; sha256="1qz1hpqn7nsajsfvnyn4l1zqzkvmv1174dbb7cjps0q9dsvalx2l"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm numDeriv pcaPP pspline stabledist]; }; copulaData = derive2 { name="copulaData"; version="0.0-1"; sha256="1s917g8wasxndg1xq4b4fjaq29nyzzigpflgqcy4rxdb7r54dl0z"; depends=[]; }; copulaSim = derive2 { name="copulaSim"; version="0.0.1"; sha256="12mnh0gpxz046kywki9jr6gj574kfwcs1gczzr7zfkvkm5qgga65"; depends=[dplyr magrittr mvtnorm rlang tibble]; }; copulaboost = derive2 { name="copulaboost"; version="0.1.0"; sha256="12mx048mxglaxdkskp9b31rkmhsyfay8m62134nh9k04iqb8zjap"; depends=[rvinecopulib]; }; copulaedas = derive2 { name="copulaedas"; version="1.4.3"; sha256="01wp8jnz7kndknj7lh9ia7mm41k1vbaksalyy9v19bb77yhgzmba"; depends=[copula mvtnorm truncnorm vines]; }; copulareg = derive2 { name="copulareg"; version="0.1.0"; sha256="0wn40rvh2dg60h45qbzy7nwcy2rhrnxf1rykl1ycs75mrimaayn9"; depends=[rvinecopulib]; }; - copyseparator = derive2 { name="copyseparator"; version="1.1.0"; sha256="0v0z5fnbvhvpbx9gr6wnq22ijjyvlnnh7q4nbvffh7wdsnwijmi8"; depends=[ape beepr Biostrings DECIPHER kmer seqinr stringr]; }; + copyseparator = derive2 { name="copyseparator"; version="1.2.0"; sha256="0dywnrqjb6x7v8icx117vsjb6zzb0brmmz1xwdc8a26lgcqmbvgv"; depends=[ape beepr Biostrings DECIPHER doParallel foreach kmer seqinr stringr]; }; corHMM = derive2 { name="corHMM"; version="2.8"; sha256="1pxn5vx5pxrys5ql393bibfij1922pbm2v5vr0h5gcdjym0ndr6n"; depends=[ape corpcor expm GenSA igraph MASS nloptr nnet numDeriv phangorn phytools Rmpfr viridis]; }; - corTESTsrd = derive2 { name="corTESTsrd"; version="0.9-2"; sha256="18mrcdqw853v2x57kg4zfpygnsxvcpc2sh61lrg3higdkb8svcpd"; depends=[]; }; + corTESTsrd = derive2 { name="corTESTsrd"; version="1.0-0"; sha256="0as1xnc38jm1hay2dqib6y8mas9ip1qz55d1bcnpkaxdfaydzpcw"; depends=[]; }; corTest = derive2 { name="corTest"; version="1.0.7"; sha256="1gip8rxvbhrckwmjwmxbmycndg4jrl75x8qda9l35znfv9r7p0nq"; depends=[Biobase clusterGeneration ggplot2 igraph MASS Matrix]; }; cora = derive2 { name="cora"; version="0.1.0"; sha256="0mx7dn05js8hqr3xgrbp2kv25y6qjlm86y6asy17hwbbvbsmama9"; depends=[]; }; corazon = derive2 { name="corazon"; version="0.1.0"; sha256="1advzmbmnpq18ym2k8rcxhsdzfscl68jss8wbqcir68951x2aqi3"; depends=[htmltools]; }; @@ -7470,7 +7501,7 @@ in with self; { corels = derive2 { name="corels"; version="0.0.4"; sha256="1ygbvhnz304y4y708ygr4x6kbwv7bfpjd5hhcrcc6lma59h7arfn"; depends=[Rcpp]; }; corkscrew = derive2 { name="corkscrew"; version="1.1"; sha256="1nb81r4lsrajcj3xz3f7p6xznnb38yg3rnnh44rd3kabca4d8r1s"; depends=[ggplot2 gplots igraph RColorBrewer]; }; corlink = derive2 { name="corlink"; version="1.0.0"; sha256="06n9pcvbn8y9gy0mn9c0sw05424ss8smpaw3ly6a785cmj3d9b6m"; depends=[]; }; - corncob = derive2 { name="corncob"; version="0.3.0"; sha256="1ahlhc3vjqiw87xk03ws4ii295gimjwxzs6lk9nz94qyc4hq200h"; depends=[detectseparation dplyr ggplot2 magrittr numDeriv optimr phyloseq scales trust VGAM]; }; + corncob = derive2 { name="corncob"; version="0.3.1"; sha256="0y1iw8kdd8smw2j590s4ndnzihh3g9hlq49dcw38zcf7jqydjw28"; depends=[detectseparation dplyr ggplot2 magrittr numDeriv optimr phyloseq scales trust VGAM]; }; cornet = derive2 { name="cornet"; version="0.0.6"; sha256="1psvsc0w5nr7fd83w6wk0q6y8cz2kjjv6slkihghavp6azrhx45k"; depends=[glmnet palasso]; }; coro = derive2 { name="coro"; version="1.0.3"; sha256="0wvxdpdh3xrskz5s5wfkva856x849knx1jigbf0ff6s6n6qjjxsf"; depends=[rlang]; }; coroICA = derive2 { name="coroICA"; version="1.0.2"; sha256="0pcz2256liczrn2gik8b5331rgzlxjrm7rzn1ialhifkiinifnva"; depends=[MASS]; }; @@ -7508,7 +7539,7 @@ in with self; { cosmoFns = derive2 { name="cosmoFns"; version="1.1-1"; sha256="0py0wmdpxk8ldq1wbwg4x1hxkjblar83x3ya30n4377d4lbc3xb7"; depends=[]; }; 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.4-1"; sha256="1myfyx1bp50jywccns65hkxd2vs2zr0jmwj4i6h986n2zs6vdy60"; depends=[alabama basefun Matrix mlt survival tram variables]; }; + cotram = derive2 { name="cotram"; version="0.4-2"; sha256="0qgbckdjp53xd40b83xbnadgn375lmm69hvilmc4ka9h5drj2igb"; depends=[alabama basefun Matrix mlt survival tram variables]; }; cotrend = derive2 { name="cotrend"; version="1.0.2"; sha256="17h67vnpnlv11bf3ka5mlnah9bizxjhvicsvbygy91dqbhjhj9wb"; depends=[xts]; }; couchDB = derive2 { name="couchDB"; version="1.4.1"; sha256="1n99amvnsjp88y091603hjsvp243c5i6dbrsvdjfmzgj5dsrv70m"; depends=[bitops httr RCurl rjson]; }; countHMM = derive2 { name="countHMM"; version="0.1.0"; sha256="12z0nz7in2msb5wa5yyjxx19ih8psw06m7xwlapvjksslippp6gs"; depends=[]; }; @@ -7572,9 +7603,9 @@ in with self; { cplm = derive2 { name="cplm"; version="0.7-10"; sha256="0mqjk10265hq9bc5ihmgbx1l8fzay1gpdlvx3pirqmvr3w1kwlxk"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; }; cplots = derive2 { name="cplots"; version="0.5-0"; sha256="12nac8hywhsfh2fcv30w36la46hvvp5mwc2rrq34smraig0dq8f3"; depends=[circular]; }; cpm = derive2 { name="cpm"; version="2.3"; sha256="07zbvc5jkwv76lkzby6r073fxjsqgnrdl2w9lcph577knnip89jx"; depends=[]; }; - cpop = derive2 { name="cpop"; version="1.0.3"; sha256="1vyjfxd9j5k1ya4bzi3gsdy34pvgi0y1a8h4qgr24bc661s48c66"; depends=[crops ggplot2 mathjaxr pacman pracma Rcpp Rdpack]; }; + cpop = derive2 { name="cpop"; version="1.0.6"; sha256="0f7rxyh8m6w45cja02mip91p72bjlygrc0rdggbls50l63w1qczj"; depends=[crops ggplot2 mathjaxr pacman pracma Rcpp Rdpack]; }; cpp11 = derive2 { name="cpp11"; version="0.4.3"; sha256="1wcq4lq7xa62xn6zsg6r8nf6vdlvnlwxgfqndb7vnvd8f54hx9pi"; depends=[]; }; - cppRouting = derive2 { name="cppRouting"; version="2.0"; sha256="0yfiyg1clnl85lk5ah8dcchv71drk6r093vpl82xnczyan5z94sr"; depends=[data_table Rcpp RcppParallel RcppProgress]; }; + cppRouting = derive2 { name="cppRouting"; version="3.1"; sha256="1mhp6k2kwlhyrswlxi9f0f6ndvm5968ljp3k97c2m2sfbxaablxy"; depends=[data_table Rcpp RcppParallel RcppProgress]; }; cppcheckR = derive2 { name="cppcheckR"; version="1.0.0"; sha256="1f3b8gadpiyxwxp34pd3i7s715dkm23427fp86vvnqvy9schg3ga"; depends=[htmlwidgets rmarkdown rstudioapi shiny V8 xml2]; }; 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]; }; @@ -7606,13 +7637,12 @@ in with self; { 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.2.0"; sha256="1dr2xzr72cm0i7ldgx0kf96r0q1qa18fq6zivck1qd1gwy22iiq9"; depends=[clipr DBI openxlsx plot3D plyr raster rgdal rgeos RPostgres RSQLite scales sp stringr viridis]; }; - crfsuite = derive2 { name="crfsuite"; version="0.4"; sha256="0arxbszaf1y8cqgzbq9a5l58n3c3rhjfp78lnhdxg95cdmdzhcfd"; depends=[data_table Rcpp]; }; + crfsuite = derive2 { name="crfsuite"; version="0.4.1"; sha256="0vm4gpyb9qxlj0xixnmjs8hv3xi3ydzd8dbymk7f78nafdvqwkxy"; depends=[data_table Rcpp]; }; cricketdata = derive2 { name="cricketdata"; version="0.2.1"; sha256="1w9bikx06brq5d02nmqljdx8yhxf8gqlkwr1xkg10zjiclv6kn0r"; depends=[dplyr janitor 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.3.1"; sha256="16xccfh64qza617d7k9swahchij57skh8wwnj7gxlpasknx11wwf"; depends=[digest dplyr httr purrr rlang sf stringr]; }; - crimelinkage = derive2 { name="crimelinkage"; version="0.0.4"; sha256="1zzk50kyccvnp51vzp28c9yi23hsp25arrgdn88lwfwa0m43rlar"; depends=[geosphere igraph]; }; - crimeutils = derive2 { name="crimeutils"; version="0.3.0"; sha256="1g7na36k1na7bsq8xqi01ja2fpb09r2davpi56jn5k1lih93kp8k"; depends=[dplyr ggplot2 gridExtra gt magrittr readr rlang scales tidyr]; }; + crimeutils = derive2 { name="crimeutils"; version="0.5.1"; sha256="0jsh2b1kv8r9x8sx1s2x6dpc8jyfnjsinycqb5wck5jcsswswgd6"; depends=[dplyr ggplot2 gridExtra gt magrittr readr rlang scales stringr tidyr]; }; crisp = derive2 { name="crisp"; version="1.0.0"; sha256="1gs8jnd9y9pd55w6kwv9mvmg3wd8hjiw3lwx7k242pxccsxklfxq"; depends=[MASS Matrix]; }; crispRdesignR = derive2 { name="crispRdesignR"; version="1.1.6"; sha256="1h9153iv55qkx9hyf3gs118m99mkzj5mbj6i3jg58chfp0m6jx78"; depends=[BiocGenerics Biostrings DT gbm GenomeInfoDb GenomicRanges IRanges rtracklayer S4Vectors shiny stringr vtreat]; }; criticality = derive2 { name="criticality"; version="0.9.2"; sha256="0177dx8y93gg37244615y17lidk7hmji5k1dlrm3670flfnigf28"; depends=[bnlearn caret dplyr evd fitdistrplus ggplot2 keras magrittr reticulate scales]; }; @@ -7627,9 +7657,9 @@ in with self; { crone = derive2 { name="crone"; version="0.1.1"; sha256="03qznxml940rl3kfxy4jkg9nsx9ss0gf2ck0ry000xglw6rm2s42"; depends=[]; }; cronologia = derive2 { name="cronologia"; version="0.2.0"; sha256="143wc9i9d99cybnjzg4dj7jn7sv3cc4bq3hh6mp50j9hwxnr1xhh"; depends=[glue htmltools]; }; crop = derive2 { name="crop"; version="0.0-2"; sha256="1yjpk7584wrz9hjqs21irjnrlnahjg8lajra9yfdp6r927iimg1l"; depends=[]; }; - cropDemand = derive2 { name="cropDemand"; version="1.0.1"; sha256="0h4blvddk2ma3dm1k9r8gl54fg384r214hsx31w1qndwcj7gfpbh"; depends=[dplyr ggplot2 ncdf4 raster rgdal tidyr]; }; - cropZoning = derive2 { name="cropZoning"; version="1.0.1"; sha256="19082p5c322m684fkjcxa1bcmk3vzga2x75lid9zrsrh6knrqsbz"; depends=[ggplot2 ncdf4 raster rgdal tidyr]; }; - cropcircles = derive2 { name="cropcircles"; version="0.1.0"; sha256="1y4bnavz8bkp9b3yxnqzfai4hsn8cag4walkwa0vi5892gma5az5"; depends=[glue magick purrr]; }; + cropDemand = derive2 { name="cropDemand"; version="1.0.2"; sha256="0fffrwwk91gzhb2gn8m0nlnv3gmhdv2srzjblysgkh4bnqmrjvq2"; depends=[dplyr ggplot2 ncdf4 raster rgdal tidyr]; }; + cropZoning = derive2 { name="cropZoning"; version="1.0.2"; sha256="134spdw7qfp0f7xsjyz35xfmabqdbx37z8isf5mfg6q8rqnjhc9y"; depends=[ggplot2 ncdf4 raster rgdal tidyr]; }; + cropcircles = derive2 { name="cropcircles"; version="0.1.1"; sha256="1as2znv307mzsnq4rh9zfi3g7jff77dgsbn3hp47qm97jznvhgkg"; depends=[glue magick purrr]; }; cropdatape = derive2 { name="cropdatape"; version="1.0.0"; sha256="19bn0apx4p8hnz388zg7sq59qv89vv8k5php317kcv7ai2k2gh34"; depends=[]; }; cropgrowdays = derive2 { name="cropgrowdays"; version="0.1.1"; sha256="0jgdfhywnlsz2mxb4skkrxf9fb55qyidd6y6nhb9324jm8d3xl0a"; depends=[dplyr httr lubridate magrittr purrr purrrlyr tibble]; }; crops = derive2 { name="crops"; version="1.0.3"; sha256="0c1xvfnr4dh720x0i3f6nvmzgv8zbs7cvp8vfa341yb92pz4d6s0"; depends=[cowplot ggplot2 magrittr memoise Rdpack reshape sets tibble tidyverse]; }; @@ -7639,7 +7669,7 @@ in with self; { crossrun = derive2 { name="crossrun"; version="0.1.1"; sha256="1v2khjb77g63ls6s15z9hy81z4hyf89g58jxjl94jrkznq1c4fa4"; depends=[Rmpfr]; }; crosstable = derive2 { name="crosstable"; version="0.5.0"; sha256="0gaxg4y9fpx9h1yhay449mnwpl2lpfa1cvkg9d83ddgdg7n8hkss"; depends=[checkmate cli 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]; }; - crosstalkr = derive2 { name="crosstalkr"; version="0.8.0"; sha256="07wimbwm521l88xcidn78gxl4hwfksd5xxvkydzy372ybqqi5aqk"; depends=[doParallel dplyr EnsDb_Hsapiens_v79 ensembldb foreach ggplot2 igraph magrittr Matrix readr rlang STRINGdb stringr tibble tidyr withr]; }; + crosstalkr = derive2 { name="crosstalkr"; version="0.9.0"; sha256="0zydsyi0banjwkk4q1b231f1smww3xwmxfm5ibj2az41ppj39m2j"; depends=[doParallel dplyr EnsDb_Hsapiens_v79 ensembldb foreach ggplot2 igraph magrittr Matrix readr rlang STRINGdb stringr tibble tidyr withr]; }; crossurr = derive2 { name="crossurr"; version="1.0.6"; sha256="16fq6hdfc6nsdijj63fji3bn3hp40m350qjxhf8a3xs5j86vf43j"; depends=[dplyr gbm glmnet glue pbapply purrr ranger RCAL rlang SIS SuperLearner tibble tidyr]; }; crossval = derive2 { name="crossval"; version="1.0.4"; sha256="0vshlyc6w4kfs03n56ylapiqgdyday7068wmfsphj4lhw322s4yp"; depends=[]; }; crossvalidationCP = derive2 { name="crossvalidationCP"; version="1.0-2"; sha256="0gwlpfqk3jsamkdx0sjvn4wmmcrdicgparks298hvi4gjlibp7mc"; depends=[changepoint FDRSeg stepR wbs]; }; @@ -7659,7 +7689,7 @@ in with self; { crsuggest = derive2 { name="crsuggest"; version="0.4"; sha256="044llamxlrva5va39yzpvsmdjqn56ij7jjll73mmjg7ka0rqc5dj"; depends=[dplyr mapview purrr sf units]; }; crtests = derive2 { name="crtests"; version="0.2.1"; sha256="0z8idz37dgwvi1q2vryldii7fn9yxd32gds77ml76jfplxbkikpd"; depends=[caret plyr stringr]; }; crul = derive2 { name="crul"; version="1.3"; sha256="0b8y12wb5kjylr8b4a2iarb5rpw1ydinw3lxp2ssq91pidyn2n40"; depends=[curl httpcode jsonlite mime R6 urltools]; }; - crunch = derive2 { name="crunch"; version="1.30.0"; sha256="0ysk4hpymkby80j8snyziqigsr4nda8zm3b8frxmvk42psy7m7hh"; depends=[abind crayon curl httpcache httr jsonlite]; }; + crunch = derive2 { name="crunch"; version="1.30.1"; sha256="1qq9qddabq3x5kznxi6c9bm6jnr43559rmfdsp4xwqhgqpffrcfy"; 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.5.1"; sha256="0n1yyjkqj0kqs53g27chl7lhk07f7aj81jwyvaxfmfkp03xzjj0d"; depends=[ggplot2 zoo]; }; @@ -7670,6 +7700,7 @@ in with self; { csa = derive2 { name="csa"; version="0.7.0"; sha256="0cmabcvfxfplnzx7mdsfas3jhgz44y86411amaphm75zmv8khcif"; depends=[data_table doParallel foreach ggplot2 ggpubr Lmoments moments raster reshape2 scales]; }; csampling = derive2 { name="csampling"; version="1.2-2.1"; sha256="0kqx7j96yafsqi9cz551fqpwkbcabxl8zpwa2jms862z41xbgsv3"; depends=[marg statmod survival]; }; csci = derive2 { name="csci"; version="0.9.3"; sha256="00s1gx5h141w1vjw8j3k7bn71c4dy80m6wakd1c1z7rmx1jbfp6m"; depends=[exactci]; }; + csdata = derive2 { name="csdata"; version="2022.11.22"; sha256="0gcjdkhbfg3dwivk0w23rdrjcq5vsa96x8l1fwjr86q4h4dyl8lw"; depends=[data_table]; }; cshapes = derive2 { name="cshapes"; version="2.0"; sha256="0c3q85whvp28zlm4k1570kwc5qvl2fmaszx9dpmfcdqv6m19f9ks"; depends=[rmapshaper sf sp]; }; csn = derive2 { name="csn"; version="1.1.3"; sha256="102w1qh9hgz4j9lh5hnbw1z3b7p034si73q4pkk564a2mhzlksw4"; depends=[mvtnorm]; }; csodata = derive2 { name="csodata"; version="1.3.0"; sha256="11y3gr7b5m0zh3vbl4izy454mrcxj144vfvafxlxgp2aplzim3s8"; depends=[dplyr httr jsonlite lubridate R_cache reshape2 rjstat sf]; }; @@ -7678,36 +7709,37 @@ in with self; { csppData = derive2 { name="csppData"; version="0.2.61"; sha256="1q9a11v512dc96lrrd03w06s8x6c1a0j4z5x8qvq48f4q7k30l1r"; depends=[]; }; 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]; }; + cstime = derive2 { name="cstime"; version="2022.11.22"; sha256="12nammfv9abf888zkhg3ng59r1v2pmxk9363p97mv8ssbjiil46x"; depends=[data_table dplyr magrittr purrr stringr]; }; csurvey = derive2 { name="csurvey"; version="1.4"; sha256="0d005vyz2q06xp07gssxxjwmi0m4kal839wsghqg5mldvi5qn2g4"; depends=[cgam coneproj dplyr MASS Matrix purrr survey tidyselect]; }; + csutil = derive2 { name="csutil"; version="2022.11.24"; sha256="0wa7isv73f7hn5s58w0wrbfb91i6j01vsy3n5iryj19wjw9a34cq"; depends=[data_table ggplot2 magrittr]; }; csv = derive2 { name="csv"; version="0.6.2"; sha256="1mynaia16jm28qi597xg7kf4w85vsxg5p83xbcbbr9di49vxqlr8"; depends=[data_table stringi]; }; csvread = derive2 { name="csvread"; version="1.2.1"; sha256="1r9jvf7nbkxgl6dycdnb89yh39vacrzy8z04g8qz225rklg5b288"; depends=[]; }; - csvwr = derive2 { name="csvwr"; version="0.1.6"; sha256="1wwj0zx4jawfl5264qxa90qwll971c24hyk645r0c7wwvwa8dd9r"; depends=[jsonlite magrittr purrr readr rlang stringr]; }; + csvwr = derive2 { name="csvwr"; version="0.1.7"; sha256="1yh330kh1q06f2vn8jvgirz4q7wld1ylnkjpnjh17nqq0d2lsmk2"; depends=[cli 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]; }; + ctbi = derive2 { name="ctbi"; version="2.0.4"; sha256="15dvxrir9rahr50kp1q884l06sjlb4fd9b92k3ib4d75c58bp72q"; 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="1.2.1"; sha256="1v377i3d26m6arl04iqqvj2ghc0bhns8nrgvk677gkki34ndbcz5"; depends=[assertthat dplyr httr jsonlite magrittr polite RCurl 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-7"; sha256="1a01rha6sgv8zmcfjb1c438s9d9bjzdjf2pmyml1m5jmz93q70ds"; depends=[MASS qtl]; }; ctmcd = derive2 { name="ctmcd"; version="1.4.2"; sha256="1gmm64z4p1vkh2fkbm4ayc67i6rxkxvha8fwg4zaf59bmxi7qnnc"; depends=[coda expm numDeriv Rcpp RcppArmadillo]; }; ctmcmove = derive2 { name="ctmcmove"; version="1.2.9"; sha256="1pxyxbbhfa8arqfb7qw10ya1b8hy9ylqbqqzys6d9dsixvdk98h0"; depends=[fda gdistance Matrix raster sp]; }; ctmle = derive2 { name="ctmle"; version="0.1.2"; sha256="0qc1ji8fjpr88dn6mrpijfcx1ij4zkrxsbcw405hxal7rli0gyp3"; depends=[glmnet SuperLearner tmle]; }; - ctmm = derive2 { name="ctmm"; version="1.0.0"; sha256="0c8xw8fhgnnagldqid6hnk4ql7dyjw2zqwfysnhgcgvc7hmcbpk9"; depends=[Bessel data_table digest expm fasttime Gmedian gsl manipulate MASS numDeriv pbivnorm pracma raster rgdal shape sp statmod]; }; + ctmm = derive2 { name="ctmm"; version="1.1.0"; sha256="1npx017c4w8689ig36r54fbl40h0hd0crh3n64ypbid2xxb2j0ck"; depends=[Bessel data_table digest expm fasttime Gmedian gsl manipulate MASS numDeriv pbivnorm pracma raster rgdal shape sp statmod]; }; ctmva = derive2 { name="ctmva"; version="1.0"; sha256="0pf113y62kfdc717bmbh82d8x42wd54fk8p6q8i9zh83ylazkpf0"; depends=[fda polynom]; }; ctpm = derive2 { name="ctpm"; version="1.0.1"; sha256="1bycdh3mbimmfvv3yb50c8rwcmkbjj0jwnfiynsp2h56y3dmzc1r"; depends=[ape ClusterR ctmm slouch]; }; ctqr = derive2 { name="ctqr"; version="2.0"; sha256="0srrlgqxpp4a46wqr83zpb3xr49pf70b0n8bv9qp8ffak20d2hpj"; depends=[pch survival]; }; - ctrdata = derive2 { name="ctrdata"; version="1.10.2"; sha256="0gp7c71izpybp0sv7xrm8ndc1sih2bibj2p2404nkfjam559rwp7"; depends=[clipr curl dplyr httr jsonlite lubridate nodbi rvest stringi xml2]; }; + ctrdata = derive2 { name="ctrdata"; version="1.11.1"; sha256="076v3bll8s6m61wcbwgrgrm34g0wa7gsc90mbwxwap1xfxyzjjsg"; depends=[clipr curl dplyr httr jsonlite lubridate 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.7.1"; sha256="1m07mha1nfss1ilcx7dna0k1p5jh4659p6rvy1hk8dk87f9kqyd8"; depends=[BH cOde data_table Deriv expm ggplot2 MASS Matrix mize mvtnorm plyr Rcpp RcppEigen RcppParallel rstan StanHeaders tibble]; }; + ctsem = derive2 { name="ctsem"; version="3.7.2"; sha256="0pr98lqga6lw7lp2l084jcda5b9j0wn3bwxg243p9qbqlf5q495l"; depends=[BH cOde data_table Deriv expm ggplot2 MASS Matrix mize mvtnorm 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-3"; sha256="0rwsiipnxjlj3pq97zh2hnbv1jigys32yl3zdp34x9z2xj3v4kg9"; depends=[]; }; + ctv = derive2 { name="ctv"; version="0.9-4"; sha256="1m9gmfy05zn51qsvck2rg4nshn3rrpgbbsxvap2f3hp7mgc8nizw"; depends=[]; }; cuRe = derive2 { name="cuRe"; version="1.1.0"; sha256="19rz0wxdjsgvsckn4r6kf1x018zdsbxsd2xj82ddhwp6b1gm7iai"; depends=[date numDeriv relsurv reshape2 rstpm2 statmod survival]; }; cubature = derive2 { name="cubature"; version="2.0.4.5"; sha256="08whkhvn218089r930spn97m91vv1njgh2amksia8l3rbf7127x8"; depends=[Rcpp]; }; - cubble = derive2 { name="cubble"; version="0.1.1"; sha256="1dibxxcp92grjk4x0fgkqi37xvmb851gqc5h1za45if8fidd5zsw"; depends=[cli clipr dplyr geosphere ggplot2 glue lubridate ncdf4 pillar rlang sf stringr styler tibble tidyr tidyselect tsibble vctrs whisker]; }; - cubelyr = derive2 { name="cubelyr"; version="1.0.1"; sha256="1g3pvam1fkqh63snibqcfaazvj7lrkfip8w9pjvwdclj0l8382kl"; depends=[dplyr glue pillar purrr rlang tibble tidyselect]; }; + cubble = derive2 { name="cubble"; version="0.2.0"; sha256="1ldlbqbgd4sd8k1srpmjxvn3jad03bknzgfv5m09ki980m9vjq2d"; depends=[cli dplyr geosphere ggplot2 glue lubridate ncdf4 pillar rlang sf stringr tibble tidyr tidyselect tsibble vctrs]; }; + cubelyr = derive2 { name="cubelyr"; version="1.0.2"; sha256="154vwf5pj2jh66wqdh78nc0v722b4rh88hss24g5lc31wlghzc8q"; depends=[dplyr glue pillar purrr rlang tibble tidyselect]; }; cubeview = derive2 { name="cubeview"; version="0.2.0"; sha256="1352hi2j9x9rx4iy3xvsca86nsh39x1vnymd17f5qc8c3plfm8db"; depends=[base64enc htmltools htmlwidgets lattice raster stars viridisLite]; }; cubfits = derive2 { name="cubfits"; version="0.1-4"; sha256="1dg60162s77p82v8vig52yl8ar8h0pijps8kqq35v1hvp5a3ny5q"; depends=[coda foreach]; }; cubicBsplines = derive2 { name="cubicBsplines"; version="1.0.0"; sha256="1dzwadhhrxgral9x4hxyyy1fyn45pmbwv6wiwfxhivkxmd3s2xdr"; depends=[]; }; @@ -7716,6 +7748,7 @@ in with self; { 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]; }; + cumprinc = derive2 { name="cumprinc"; version="0.1"; sha256="153cjl6x6mm6dix77bv9614nrd7x7qimwkw96mgxwarfpf1172nn"; depends=[]; }; cumstats = derive2 { name="cumstats"; version="1.0"; sha256="119w751z9dg6pjyk389pbl8ab8pirf9sqndi4nxi89ix2bby4xz8"; depends=[]; }; cumulocityr = derive2 { name="cumulocityr"; version="0.1.0"; sha256="0ybvh5args3s1f3nra58bnfwgrlrdpw40by68az84s90v88bbz2q"; depends=[httr jsonlite]; }; cuperdec = derive2 { name="cuperdec"; version="1.1.0"; sha256="1vvkbkb3dp38xzxxdm20n6vr8yifppn1clzzcvb2rhqk9d17cdiw"; depends=[dplyr ggplot2 magrittr readr rlang tidyr]; }; @@ -7726,27 +7759,28 @@ in with self; { cursr = derive2 { name="cursr"; version="0.1.0"; sha256="08051bnxags2arn296mxwc84j55shhsfym9hd062amdvm23nxd18"; depends=[keypress]; }; curstatCI = derive2 { name="curstatCI"; version="0.1.1"; sha256="0igqdv0fzzji10gz3j3ir8qxpy7vdjfl137067rc28qzbrl2sy2c"; depends=[Rcpp]; }; curtailment = derive2 { name="curtailment"; version="0.2.0"; sha256="1pk3vx9lbmvc1sj9n4n9vgbpx3xj71by0pl82ii10g69qwfllmph"; depends=[data_table ggplot2 ggthemes gridExtra pkgcond]; }; - curvHDR = derive2 { name="curvHDR"; version="1.2-1"; sha256="1a6b29kklyphv9iirm8xaxcdfcssk7ah4wm9ll53ls0alnzb15nw"; depends=[feature geometry hdrcde KernSmooth ks misc3d ptinpoly rgl]; }; + curvHDR = derive2 { name="curvHDR"; version="1.2-1.1"; sha256="0fr1qiq2qkd2nmkz6n9vrc42jdsyaz1h7qf2n5aapnpk7155c869"; depends=[feature geometry hdrcde KernSmooth ks misc3d ptinpoly rgl]; }; curveDepth = derive2 { name="curveDepth"; version="0.1.0.9"; sha256="10mhy2nyll4d1q71qnlsal0raccz3awd0j0vi5w58di9wlv1c241"; depends=[ddalpha Rcpp RcppArmadillo]; }; curvecomp = derive2 { name="curvecomp"; version="0.1.0"; sha256="0ykgbwnh32w61cjcg1nyqak42hx0jrsrpbra2wh3pgj9clg1qad2"; depends=[multcomp]; }; cusp = derive2 { name="cusp"; version="2.3.6"; sha256="0rpljddawrbq2q04fc426s57wbl3adp6mfkdv8bpjkfcyq2swbdh"; depends=[]; }; + custom_gauss_quad = derive2 { name="custom.gauss.quad"; version="1.0.0"; sha256="1rpg3wrpvmn24a8kmm3mwyqmrcx2pxhhrf40wp31nv8jfy7cfm7c"; depends=[Rmpfr]; }; customizedTraining = derive2 { name="customizedTraining"; version="1.2"; sha256="0kjp22bzv7a3xynhm9xmabfcms21586p8caz1nk1w88qdvidqfqd"; depends=[FNN glmnet]; }; cusum = derive2 { name="cusum"; version="0.4.1"; sha256="0vjq3slkjdgls41xm637xkrg8jhv6y75xiyfcgpwrp32ixmakpcd"; depends=[checkmate data_table Rcpp]; }; cusumcharter = derive2 { name="cusumcharter"; version="0.1.0"; sha256="0ljprnn48nfl8n0zmvc547rcg4cwrfhq3zjkkimgdnf7z2d130q6"; depends=[data_table ggplot2 rlang]; }; cutoff = derive2 { name="cutoff"; version="1.3"; sha256="0anrvmlvcxah620il3fkq6ldp7hx4nwdnzcpmfc5mhlsry0lp178"; depends=[do ROCit set survival]; }; cutpointr = derive2 { name="cutpointr"; version="1.1.2"; sha256="1qxnh20hs3bh9v04ls7gwwl7lfc6bwl8c88dn8lkcdqyp3nyr01j"; depends=[dplyr foreach ggplot2 gridExtra purrr Rcpp rlang tibble tidyr tidyselect]; }; cvAUC = derive2 { name="cvAUC"; version="1.1.4"; sha256="1m2y50a1yapf1c74km9a4r47ds2z2bfp4wwwkqin7swv9v1s7d28"; depends=[data_table ROCR]; }; - cvCovEst = derive2 { name="cvCovEst"; version="1.1.1"; sha256="1imz2aync46s4ji7i5pnnv8shy247pazxa79m120k3pgq7p5bnly"; depends=[assertthat coop dplyr ggplot2 ggpubr Matrix matrixStats origami purrr RColorBrewer Rdpack rlang RMTstat RSpectra stringr tibble]; }; + cvCovEst = derive2 { name="cvCovEst"; version="1.2.0"; sha256="1787dw3vg1w6mv621qhcdcfmfcxwrjwrwc3hwxqqkhgimnwrn0hy"; depends=[assertthat coop dplyr ggplot2 ggpubr Matrix matrixStats origami purrr RColorBrewer Rdpack rlang RMTstat 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]; }; cvap = derive2 { name="cvap"; version="0.1.1"; sha256="1vrbbn0bfyl5spnbz7vq60vgvh787vwsk6awc510x7vrqzn4yyza"; depends=[censable cli dplyr fs magrittr purrr readr rlang stringr tidyr]; }; - cvar = derive2 { name="cvar"; version="0.4.1"; sha256="14mivxlgsx1fz3602pzhd9b5p5aa9hhdif6dhg9q82kd4kz58bdy"; depends=[fGarch gbutils Rdpack]; }; + cvar = derive2 { name="cvar"; version="0.5"; sha256="066vn8flw9j0idmpi9wzvybgihdhwg3fjslx2isbrb11ldl1lwky"; depends=[gbutils Rdpack]; }; cvcrand = derive2 { name="cvcrand"; version="0.1.0"; sha256="0zdf41sjqyi7mybxhypfx1vpc15w7qj9jg9bav64qbk0q5nk7jyc"; depends=[tableone]; }; cvequality = derive2 { name="cvequality"; version="0.2.0"; sha256="1im839vzfqylphp2vr20avnzkyl02n88fngbs63d4ik7c72d9992"; depends=[]; }; cvmdisc = derive2 { name="cvmdisc"; version="0.1.0"; sha256="19b9kxqgbk1d631l3jph87pzhk4zf3xd5q5j2xsrbqz8zmm96sn9"; depends=[CompQuadForm]; }; cvmgof = derive2 { name="cvmgof"; version="1.0.3"; sha256="0s78w8ivxzscn6jbwsw0m15n3xwgbbjdqwpp4dsy3gi0nsmngjyc"; depends=[lattice]; }; - cvms = derive2 { name="cvms"; version="1.3.6"; sha256="1smz0xcbg0a69wlzlva4vicw97qylyla359zjw8q0kwa1hna0c8y"; depends=[checkmate data_table dplyr ggplot2 lifecycle lme4 MuMIn parameters plyr pROC purrr rearrr recipes rlang stringr tibble tidyr]; }; + cvms = derive2 { name="cvms"; version="1.3.7"; sha256="1n46bg760ad0r4fy27fp9rljwn2q6yyj3jn71hnww6ph0jp5f76s"; depends=[checkmate data_table dplyr ggplot2 groupdata2 lifecycle lme4 MuMIn parameters plyr pROC purrr rearrr recipes rlang stringr tibble tidyr]; }; cvsem = derive2 { name="cvsem"; version="1.0.0"; sha256="148v8axwxfr328l709b6q1fmqnzmiw9g7589zgwha4d6lrx4ak4i"; depends=[lavaan Rdpack]; }; cvwrapr = derive2 { name="cvwrapr"; version="1.0"; sha256="17h017p76y7sjcwik48ravygmyivj6kvkhqy5s9ch0nwzzcrzvj3"; depends=[foreach survival]; }; cwbtools = derive2 { name="cwbtools"; version="0.3.8"; sha256="1v7pan3d00km7yq03ym3xdvlqhwrlxg5w8y2dl34dlsm67xysxh1"; depends=[cli curl data_table fs httr jsonlite lifecycle pbapply R6 RcppCWB rstudioapi stringi xml2 zen4R]; }; @@ -7774,7 +7808,7 @@ in with self; { d3plus = derive2 { name="d3plus"; version="0.1.0"; sha256="0kadz83pals03n0v3zqhmhf6visigk52yn58xckhb57fid4xzj5w"; depends=[htmlwidgets magrittr]; }; d3po = derive2 { name="d3po"; version="0.3.2"; sha256="0qhdk2ap9bkf4xfbpyh1k6s2kb6lgr2vgn5ns228vrckghwxhkri"; depends=[assertthat dplyr htmlwidgets magrittr purrr rlang]; }; d3r = derive2 { name="d3r"; version="1.0.0"; sha256="1qijkllfaaw0lb29j8mappm8jz9kg8gkihxq5wqhb4gabsazdwva"; depends=[dplyr htmltools rlang tidyr]; }; - d4storagehub4R = derive2 { name="d4storagehub4R"; version="0.4-1"; sha256="0z8y61b0sl8y7hbpvpp8aiyvq574m4pdipmshnbg114swyx52d0k"; depends=[httr jsonlite keyring R6 XML xml2]; }; + d4storagehub4R = derive2 { name="d4storagehub4R"; version="0.4-2"; sha256="0fkg14zjnlgz988pb76ihi5ajilnqji7mwnc4a3qsfjkx1acib96"; depends=[httr jsonlite keyring R6 XML xml2]; }; dBlockmodeling = derive2 { name="dBlockmodeling"; version="0.2.0"; sha256="0c1hvawb9gw6vckims3g8kzn2c4f0as5x1vw39sdvkwc92xy26lv"; depends=[]; }; dCUR = derive2 { name="dCUR"; version="1.0.0"; sha256="12i2qcjq9i1ycs6z6g3yr1imv7v4g19kdhf1vg9xkvh43pagb6h7"; depends=[dplyr ggplot2 magrittr MASS mclust ppcor Rdpack stackoverflow]; }; dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; }; @@ -7796,7 +7830,7 @@ in with self; { 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]; }; + dafishr = derive2 { name="dafishr"; version="1.0.0"; sha256="1n6b1r1awwxvdhn4znwp1p4jp3gvrjz017darjagx4cix0iisw1p"; depends=[dplyr fst ggplot2 lubridate magrittr mixtools readr readxl rlang sf stringr tibble tidyr tidyselect vroom]; }; dafs = derive2 { name="dafs"; version="1.0-38"; sha256="0ljhpw2f4hbkqh6c6gwqwwdsa4kp5qvyphig5zcn6qrb9ryf3wh1"; depends=[s20x]; }; dagR = derive2 { name="dagR"; version="1.2.1"; sha256="16dx7gpbq61xwnk3769mf6nsynqb3zgjl6l0zcvh8j0cp1s35m82"; depends=[]; }; dagirlite = derive2 { name="dagirlite"; version="0.1.0"; sha256="12j5mfxcv32qgx1yklcq8yl2kx4lkxap4biywjrj0sjx6zj60f8l"; depends=[knitr Rdpack]; }; @@ -7804,6 +7838,7 @@ in with self; { dagwood = derive2 { name="dagwood"; version="0.1.4"; sha256="1lp6swfmfzv28cfybmvj7czkfljd0sldv2qqi83q0fwcb7kxgdfz"; 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.4"; sha256="0v6kx4lcrizx1mpdh5dly1clmdv7aa14xc5qlhk73zqi1shc3h6r"; depends=[dplyr magrittr readr stopwords stringr tidytext]; }; + daiquiri = derive2 { name="daiquiri"; version="1.0.3"; sha256="1fgblq35fm73d7ck9mqdyv1sza371fdky9d97lkmn05gdnqr1xj7"; depends=[cowplot data_table ggplot2 reactable readr rmarkdown scales]; }; 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]; }; @@ -7816,14 +7851,15 @@ in with self; { dapr = derive2 { name="dapr"; version="0.0.3"; sha256="136chxijyxrl5sbiggxf56zga26zqds647z1z2igwn5mdff1wxyb"; depends=[]; }; daqapo = derive2 { name="daqapo"; version="0.3.2"; sha256="1c00ppsqzjmrw16zdifkcigi4ll2nd2hlhj17lydmin0djg5cpby"; depends=[bupaR dplyr edeaR glue lubridate magrittr miniUI purrr readr rlang shiny stringdist stringr tibble tidyr xesreadR]; }; darksky = derive2 { name="darksky"; version="1.3.0"; sha256="1740cw5qifgvqa0nafd6lmllxi32n1zm45zlify1yn3h1qdcszhb"; depends=[ggplot2 gridExtra gtable httr plyr]; }; - dartR = derive2 { name="dartR"; version="2.0.4"; sha256="18nqiim4c1h4hyw5pa706f0kf5jxhm48p902i893s6gvqnzq5fj5"; depends=[adegenet ape crayon data_table dplyr fields foreach ggplot2 gridExtra MASS patchwork plyr PopGenReport raster reshape2 shiny SNPRelate sp StAMPP stringr tidyr vegan]; }; + dartR = derive2 { name="dartR"; version="2.7.2"; sha256="0fl78j67dab8rgddjlqvnck5qy3la7phimjrm170hirzx2dy8gah"; depends=[adegenet ape crayon dartR_data data_table dplyr fields foreach ggplot2 gridExtra MASS patchwork plyr PopGenReport raster reshape2 shiny SNPRelate sp StAMPP stringr tidyr vegan]; }; + dartR_data = derive2 { name="dartR.data"; version="1.0.2"; sha256="0gi6hgvfvh1hp60fvmij2r4fgv1qigs2biw2hw05rbl55xv93ni5"; depends=[adegenet]; }; dashCoreComponents = derive2 { name="dashCoreComponents"; version="1.10.0"; sha256="11jrlls6k6qlvi81741ga908aw22m05fhhr9jpzli982s611jrwl"; depends=[]; }; dashHtmlComponents = derive2 { name="dashHtmlComponents"; version="1.0.3"; sha256="01zrwjlhwwajk2lnv7is1r6nril83l65pynx856y9mvnm05xkb7m"; depends=[]; }; dashPivottable = derive2 { name="dashPivottable"; version="0.0.2-1"; sha256="1fv5pnvimf7w1k1lsijh9y2zk4z1z00m6m640jxvqla5i1rqy8cq"; depends=[]; }; dashTable = derive2 { name="dashTable"; version="4.7.0"; sha256="0iy07dxa90vsp3rfk8ij78j9ajz1mpxywmclxzkfj7axjyydxh5w"; depends=[]; }; dashboardthemes = derive2 { name="dashboardthemes"; version="1.1.6"; sha256="0yki4gmklrkhs6ldznabdr04smw3a112ask313z1h93dnvabr06c"; depends=[htmltools]; }; dat = derive2 { name="dat"; version="0.5.0"; sha256="1d3q4bang6pm06rfzh6h947xy3wwqn3l6ri0h4hzklg5pzwpsajd"; depends=[aoos data_table Formula magrittr progress]; }; - data_table = derive2 { name="data.table"; version="1.14.4"; sha256="1w28wg119w8pnzfdwp5yw7jgk7vv80b6cagms67i02c3dv1afqj8"; depends=[]; }; + data_table = derive2 { name="data.table"; version="1.14.6"; sha256="05h99rk2s1ds9igrqw2nhnk6yahgssszqlnw0y0p9p83lsndp30x"; 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.9"; sha256="15934ixmzw3iyqazhlz6s5cimmasf062fc8al0wdyij1f4cjcgny"; depends=[data_table jsonlite reshape2]; }; @@ -7832,7 +7868,7 @@ in with self; { dataMeta = derive2 { name="dataMeta"; version="0.1.1"; sha256="13xxayqxbps07h0xr5b7sb7q30gy5zm7jzzaq4k20fskkjrzhzcm"; depends=[dplyr]; }; dataPreparation = derive2 { name="dataPreparation"; version="1.0.5"; sha256="1lf7acdslnynp65qcxhy4p291jficz47znl9jk5143q9795kbb6w"; 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.11"; sha256="0dhayggsnxjqr4wpplydayya3cns78iikmzsn3dclvyr3aw8352r"; depends=[curl httr jsonlite lubridate readr xml2]; }; + dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.12"; sha256="0jixlppbd5xmkdcsymnq0za94a466r2fq2153wdfg919z3wzbsi8"; 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]; }; datadictionary = derive2 { name="datadictionary"; version="0.1.0"; sha256="006hzgsrnwrvsccski5xsnazz33y44h64q0fzq66vybv7y3zq3rc"; depends=[chron data_table dplyr haven Hmisc lubridate magrittr openxlsx tibble tidyr tidyselect]; }; datadogr = derive2 { name="datadogr"; version="0.1.2"; sha256="10zbxb9gkymw78ras9y4wrifz7cxh3y630yzjcf9ds2p557vcjzp"; depends=[anytime dplyr glue httr lubridate purrr stringr tibble tidyr]; }; @@ -7840,21 +7876,23 @@ 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]; }; - datamods = derive2 { name="datamods"; version="1.3.4"; sha256="07ya01ifif6rjrzmy4asn6y6wkvd7a5amjmiq954iv03iyrkgvsp"; depends=[data_table htmltools htmlwidgets phosphoricons reactable readxl rio rlang shiny shinyWidgets tibble]; }; + datamods = derive2 { name="datamods"; version="1.4.0"; sha256="04qgfbmnf6rcfca5dmvjcfi6mnn4xmqpivhdblr7gv4qab1javqv"; depends=[data_table htmltools htmlwidgets phosphoricons reactable readxl rio rlang shiny shinybusy shinyWidgets tibble writexl]; }; + datana = derive2 { name="datana"; version="1.0.2"; sha256="00a6r4af96v4wqbqk28hr8k75wqy24z5hann1rkglifw2vj1q6vn"; depends=[ggplot2]; }; 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.2"; sha256="0509dmvf3kgk15cjbz3m9fzanbdpa5r0rz921m776a4bsjsilv4i"; depends=[base64enc datapack httr jsonlite parsedate plyr stringi stringr uuid XML]; }; datapack = derive2 { name="datapack"; version="1.4.1"; sha256="14vlcgk5sckzkc15cjvrbs113y65rqlwm1az7nsvnsqfx4x76jb1"; depends=[digest fs redland uuid XML zip]; }; datapasta = derive2 { name="datapasta"; version="3.1.0"; sha256="0sqv29iv2rv50rbw1601rn8p7gv7rsw00djhl7h1znr0igzi5b82"; depends=[clipr readr rstudioapi]; }; dataprep = derive2 { name="dataprep"; version="0.1.5"; sha256="1v48ry6xk0qg73j6js6m6fqd1bdhjv500bndb60zzl2qifrjfk2a"; depends=[data_table doParallel dplyr foreach ggplot2 reshape2 scales zoo]; }; - dataquieR = derive2 { name="dataquieR"; version="1.0.11"; sha256="16i3kwy6ash8fw4v1bpsc32y6nf3jnsbq0pi05vp0k5dz3p3ji1w"; depends=[dplyr emmeans ggplot2 ggpubr lme4 lubridate MASS MultinomialCI parallelMap patchwork R_devices reshape rlang robustbase]; }; + dataquieR = derive2 { name="dataquieR"; version="1.0.13"; sha256="03fsdqihznbwr386p5grf31qjgir3hbq16zq4nhgsw6qfpyja3j1"; depends=[dplyr emmeans ggplot2 ggpubr lme4 lubridate MASS MultinomialCI parallelMap patchwork R_devices reshape rlang robustbase]; }; datardis = derive2 { name="datardis"; version="0.0.3"; sha256="1z6rjgj7hri09nb7dldhgry4dlyx9v8zf1lqlrs7r1fwsl6znibw"; depends=[dplyr magrittr]; }; dataresqc = derive2 { name="dataresqc"; version="1.1.0"; sha256="1m7c93yk3dp1l5ysgscjvmv7z0xnmgaz4bkci4ljmmmn5a9v6r3c"; depends=[]; }; datarium = derive2 { name="datarium"; version="0.1.0"; sha256="1v98yxsxhfqlalz5qy3x5axb7fy067vf3y0qg7ngixphmy9qybym"; depends=[]; }; datarobot = derive2 { name="datarobot"; version="2.18.2"; sha256="1k6nqkcxjnhv4j11lm204nl85dibljfx3w2214mz0g9d7zjqrwbi"; depends=[httr jsonlite yaml]; }; - datasailr = derive2 { name="datasailr"; version="0.8.10"; sha256="03bnrgpwhmh67zrvap3cbaqd5k6nkp63b2h8m08xrdp1ngp5inik"; depends=[Rcpp]; }; + datasailr = derive2 { name="datasailr"; version="0.8.11"; sha256="0ym1aqrlglha36z883yf92rm0fydg1qsdgdy48z32yk41xbhp5iy"; depends=[Rcpp]; }; datasauRus = derive2 { name="datasauRus"; version="0.1.6"; sha256="0vgylf3bab0xcfg08xwvfq9yhxy6w0fxi7wp4kkxfyjb0pw15qxk"; depends=[]; }; dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; }; + dataset = derive2 { name="dataset"; version="0.1.9"; sha256="1yhr7yk1gw98macfvjz4ckgsaqw7yrszqdf11gj5b1qwgp0l53pk"; depends=[assertthat ISOcodes]; }; datasets_load = derive2 { name="datasets.load"; version="2.1.0"; sha256="1j6agly8icyn4kj88c69qzc1gyvjzhfg9ipax48qcm2m0wxzkk7n"; 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]; }; @@ -7862,7 +7900,7 @@ in with self; { datastructures = derive2 { name="datastructures"; version="0.2.9"; sha256="0prw24iy1af02g1nzw588dv085bdnl6pzvizpxspmwzj6vrfbaav"; depends=[BH purrr Rcpp]; }; dataverse = derive2 { name="dataverse"; version="0.3.11"; sha256="1h4bbmnzssk1bycimks6536f3n9g6bb41hdycxyx8ald2gnx1c06"; depends=[checkmate httr jsonlite readr xml2]; }; dataversionr = derive2 { name="dataversionr"; version="0.9.0"; sha256="013c45fbak32bcda9zj8dk0jw57xpbriymks4n38d9nliflqr6z5"; depends=[arrow diffdfs dplyr lubridate magrittr purrr rlang tidyr]; }; - datawizard = derive2 { name="datawizard"; version="0.6.3"; sha256="0cn9ixljf4l333d401pz5rcwqkzpl6d90as153j1wrkz9rjzm6i7"; depends=[insight]; }; + datawizard = derive2 { name="datawizard"; version="0.6.4"; sha256="0iv3h08bzmijrxyv2jz70jf53i2bk14kh0vq9a93fms5z08jv19p"; depends=[insight]; }; datazoom_amazonia = derive2 { name="datazoom.amazonia"; version="0.3.0"; sha256="13nqvpc2gbz0pz2bnq2n6qa3qcwmfjfr15rznrsasl82s3myvfgk"; depends=[data_table dplyr Hmisc janitor labelled lubridate magrittr purrr RCurl readr readxl sf sidrar stringi stringr tibble tidyr XML]; }; date = derive2 { name="date"; version="1.2-40"; sha256="1kqiy0nvdcm8mrkm6kzz5wjxv4f58710sk7fycfcnlpf4ndn30ly"; depends=[]; }; datefixR = derive2 { name="datefixR"; version="1.3.1"; sha256="1mc0s0qv90j2qaqkkmx3k054vsir8zb2n6lwx6ybkn5k48cw8zwm"; depends=[lifecycle Rcpp rlang stringr]; }; @@ -7881,6 +7919,7 @@ in with self; { dawai = derive2 { name="dawai"; version="1.2.5"; sha256="0g52bm66jnvga4sf5n5m18k5jx56vqpn886jk0k6lydj78nkq88q"; depends=[boot ibdreg mvtnorm]; }; daySupply = derive2 { name="daySupply"; version="0.1.0"; sha256="1317g60cmqlw1wy7n7x5ifh544lzsysif6192s2k16jmgzj6cz2s"; depends=[dplyr lme4 magrittr rlang]; }; daymetr = derive2 { name="daymetr"; version="1.6"; sha256="04dyc890kqr24n0lv1dl23p6s086hcgh5l6r496yycjzlyi8bm44"; depends=[httr raster sf tibble tidyr]; }; + dbGaPCheckup = derive2 { name="dbGaPCheckup"; version="1.0.0"; sha256="0gi1n4nbzz2d3z2y39x6n8l15w6x4vh47332rkpl2iba69xhjcb5"; depends=[dplyr formatR ggplot2 labelled magrittr pander purrr questionr readxl rlang rmarkdown tibble tidyr]; }; dbMC = derive2 { name="dbMC"; version="1.0.0"; sha256="0gcgn3m10sx0naim206jkw7szl0mr7vbnkn25avvv9f8iy3y9vcv"; depends=[softImpute]; }; dbWebForms = derive2 { name="dbWebForms"; version="0.1.0"; sha256="0diz5mh4fhwrwqa7jr70vzj2jks7h2n91v2hr1mvvlbc7rzd9yki"; depends=[data_table DBI html5 stringi]; }; dbarts = derive2 { name="dbarts"; version="0.9-22"; sha256="02hmqzfk9sgz4vndnpnpcav7wlpy9xna8zdnlwgcj4a84zz2pyk8"; depends=[]; }; @@ -7889,27 +7928,27 @@ in with self; { dbflobr = derive2 { name="dbflobr"; version="0.2.2"; sha256="04gh0xfdp077f3ppf8i101q17n2r711y47qnxb9nq5ksnf37s5jp"; 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-10"; sha256="0fr28wvv8c4h4flklxaffxijgk5cy96p5sbf90yqfascqgmvvd9y"; depends=[cubature ggplot2 Rcpp RcppParallel reshape2 rlang spatstat_core spatstat_geom spatstat_random spatstat_utils tibble]; }; + dbmss = derive2 { name="dbmss"; version="2.7-11"; sha256="0d5pvn7k6m39m0bs76y5p9qbbrahsbdxx1fkmv33gg4kpk83bbl9"; depends=[cubature ggplot2 Rcpp RcppParallel reshape2 rlang spatstat_explore spatstat_geom spatstat_random spatstat_utils tibble]; }; dbnR = derive2 { name="dbnR"; version="0.7.8"; sha256="10lw8ax33l0q52pm07fi66fhm06n3yg48plgvz5cg14l98v7g7s5"; depends=[bnlearn data_table magrittr MASS 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.2.1"; sha256="1xqdrfpl5l94cw717d90xx1hs5aswl6s38wr7qximzk8q12gdwx6"; depends=[assertthat blob cli DBI dplyr glue lifecycle magrittr pillar purrr R6 rlang tibble tidyselect vctrs withr]; }; dbscan = derive2 { name="dbscan"; version="1.1-11"; sha256="0bz66lvvg7290c5260ph92k4r7adgisbx3vml9096qhjwrkqwjgh"; depends=[Rcpp]; }; - dbstats = derive2 { name="dbstats"; version="2.0.0"; sha256="1njgl7slfwp9ymnz2lf1bbw99cddkwwwldjz9f86q1gfnhi5a8lj"; depends=[cluster pls]; }; + dbstats = derive2 { name="dbstats"; version="2.0.1"; sha256="1sa33ir8hj0z0d2ry4w7bhilx94alhdvjc4bzaj09alv6w39gpcn"; depends=[cluster pls]; }; dbx = derive2 { name="dbx"; version="0.2.8"; sha256="0pdf0l9h44666bmfsa43nrmi77ffzygb5mzjfrv7pk99qi7ryw46"; depends=[DBI]; }; dc3net = derive2 { name="dc3net"; version="1.2.0"; sha256="19ibsvbnq6y88vqvgkm31zrqwjhpml59d792bz0zkk50r1q5bnyr"; depends=[c3net igraph RedeR]; }; dcGOR = derive2 { name="dcGOR"; version="1.0.6"; sha256="0rvwa25r23yayx1i6xhkfaw2z85d2iyfx3slg3aq1m0fa7kj380p"; depends=[dnet igraph Matrix]; }; 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]; }; - dcifer = derive2 { name="dcifer"; version="1.1.1"; sha256="1lsfwla9dhdcdkyms10djac0vvns4f341z2467j0djgkdafdilc3"; depends=[]; }; + dcifer = derive2 { name="dcifer"; version="1.2.0"; sha256="0h7wir2xd2lr6h9hh8wr335lxr5w7grf7gjhqpg3a36ycd8mibbv"; depends=[]; }; 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]; }; 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.3.1"; sha256="1ahrsh9xlp9c7gaz1zcp2bwlb2c4nxcchw89d1r45dvqspj4c8fn"; depends=[DBI dbplyr dcmodify dplyr validate]; }; + dcortools = derive2 { name="dcortools"; version="0.1.6"; sha256="1qcblwcv2rwrl502hiv0l0r137sa4k0kx892k2w1chm40y5vri3b"; depends=[ggplot2 Hmisc pheatmap Rcpp RcppArmadillo RcppEigen Rdpack Rfast]; }; dcov = derive2 { name="dcov"; version="0.1.1"; sha256="0c3a5dzpizsxlsh723pcd0d7n0mgfc9y35vrfhmskp3c1x639mh3"; depends=[Rcpp RcppArmadillo]; }; dcurver = derive2 { name="dcurver"; version="0.9.2"; sha256="1v4h480lff1cyjjwb80dksiffh0y4b3s07lq2l2r21rn1l4mav6c"; depends=[Rcpp RcppArmadillo]; }; dcurves = derive2 { name="dcurves"; version="0.3.0"; sha256="0aw297hgvy25hs7cajm3xbh1q1gwk55491cs0d0gxdca58vr08sl"; depends=[broom dplyr ggplot2 glue purrr rlang scales survival tibble]; }; @@ -7920,15 +7959,16 @@ in with self; { ddp = derive2 { name="ddp"; version="0.0.3"; sha256="03gszqzh73zq04hqa2zgxn4fkiyr1fbhx3byxsdfzmmji46f8qip"; depends=[]; }; ddpca = derive2 { name="ddpca"; version="1.1"; sha256="1qsanid7sr2nc9pwzyz4cbjc1vg0rj255d3rnh1rb22agrgj2bc1"; depends=[MASS Matrix quantreg RSpectra]; }; ddpcr = derive2 { name="ddpcr"; version="1.15"; sha256="04q2k6kag3qx9g6iarb84ski7s895xdd20zlaw7wmidfv038kmws"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs tibble]; }; + ddplot = derive2 { name="ddplot"; version="0.0.1"; sha256="03zcnc6is4qdpz3krhhz820j0an6dr7562bnmzj787xf5parwq6r"; depends=[r2d3]; }; ddst = derive2 { name="ddst"; version="1.4"; sha256="1y0immm337adkd2bjx8c5pf02w9wysv3gj26f4qf0jiba0f2wk8n"; depends=[evd orthopolynom]; }; - deBInfer = derive2 { name="deBInfer"; version="0.4.3"; sha256="0dqsbwkj3k2hm2ks13p8rsd2vh1jlw0si0xc09cqb2nwir9zvdrv"; depends=[coda deSolve MASS mvtnorm PBSddesolve plyr RColorBrewer truncdist]; }; + deBInfer = derive2 { name="deBInfer"; version="0.4.4"; sha256="1l4wim82n5q51c1f7193d3i22qrn9kfcsddyrn8izhlwsjb9q3kp"; depends=[coda deSolve MASS mvtnorm PBSddesolve plyr RColorBrewer truncdist]; }; deBif = derive2 { name="deBif"; version="0.1.5"; sha256="03n20p7vpa28laxhxvm7drq89vr1hadxaxhwjqc1wb44bwhy4cvy"; depends=[deSolve rootSolve rstudioapi shiny shinydashboard shinydashboardPlus shinyjs]; }; deSolve = derive2 { name="deSolve"; version="1.34"; sha256="08czbjvq07ax6q3k303w37q8lq50547cdx7yhp32mqnx8igk0m12"; 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.3.1"; sha256="1yrn3d4gnaimzfwq5m1kz9mchp1b2gikqxqplpl08dvlnshajjmr"; depends=[dplyr ggplot2 gridExtra igraph lpSolve plotly tidyr writexl]; }; + deaR = derive2 { name="deaR"; version="1.3.2"; sha256="0si8yxbx6zvzai046gjrdyb5yv33hxijizkmgsd5p9q3h3g54aq0"; 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=[]; }; + deal = derive2 { name="deal"; version="1.2-42"; sha256="0d516gvhqw6nfv9ijda9j04nlcjgdnnlgcf5774n8fgwjhm4azx1"; depends=[]; }; debar = derive2 { name="debar"; version="0.1.0"; sha256="03xlhnbvmkg93f6zl3x22rfwvs17fscvl8irmnm19pifk4bvbpyd"; depends=[ape aphid seqinr]; }; debugme = derive2 { name="debugme"; version="1.1.0"; sha256="1c9sg55zvf10h8198jdnpamm6f66lzw3c3jnmdp9ls6na0j0xbjd"; depends=[crayon]; }; debugr = derive2 { name="debugr"; version="0.0.1"; sha256="0lfq0s0hibd00558vl3dmvrkzxjc7q62xr8sqzai0pv9a9lhixcn"; depends=[rprojroot rstudioapi]; }; @@ -7955,13 +7995,14 @@ in with self; { deepboost = derive2 { name="deepboost"; version="0.1.6"; sha256="1nf9gjk9gjl2dz7cr3vh5lg8nxkbqwr82a132nw853axbdgbs9ga"; depends=[Rcpp]; }; deepdep = derive2 { name="deepdep"; version="0.4.1"; sha256="0w8wls8ivy4c0vdaxvmp8030wzww73i60nan9vriwbgk7vsjk16q"; depends=[cranlogs httr jsonlite]; }; deepdive = derive2 { name="deepdive"; version="1.0.4"; sha256="0q4jjq11bd52bx0vqjxsh0fz1b72pfy4gpj5p19z7p4czf4a46c6"; depends=[data_table fastDummies plyr rpart stringr treeClust]; }; - deepgmm = derive2 { name="deepgmm"; version="0.1.62"; sha256="1cllbq87xxzgba3a1prkjg7hdfkxjnmi8fgizqrlsvbxdhpg61yh"; depends=[corpcor mclust mvtnorm]; }; + deepgmm = derive2 { name="deepgmm"; version="0.2.1"; sha256="0vwh8wgbva2a47b2yiiqjwq5qww2ckb4l66265sbp1lbis0g96li"; depends=[corpcor mclust mvtnorm]; }; deepgp = derive2 { name="deepgp"; version="1.0.1"; sha256="0n3awf535jin1m7sirlcdj2b3skzssl6my7chlq392rrxfhpqnyr"; depends=[doParallel FNN foreach GpGp Matrix mvtnorm Rcpp RcppArmadillo]; }; deeplr = derive2 { name="deeplr"; version="2.0.0"; sha256="189kfcsd3cr0397krbfqh56x7h0v6i27s5jbfwr5zrf3jazllall"; depends=[httr purrr tibble tokenizers utf8]; }; deepnet = derive2 { name="deepnet"; version="0.2.1"; sha256="0gnf50007sj28daaz2r1rp8mvz1xpc2901bxl4yb1v4s4rcx6rhg"; 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.2"; sha256="0bdzpxlf0vkgqx4kc5bflfarx3ivmg3pcw1m7nhbsrvw1zx70isz"; depends=[dplyr keras magrittr Matrix mgcv R6 reticulate tensorflow tfprobability tfruns]; }; - deeptime = derive2 { name="deeptime"; version="0.2.3"; sha256="0lzivg7nv9jyybjwcqpp3czj34f5jmwy6j0mbggq6rm935cn0jfn"; depends=[curl ggfittext ggforce ggnewscale ggplot2 gridExtra gtable lattice rlang scales]; }; + deepregression = derive2 { name="deepregression"; version="0.3.1"; sha256="1fc4av1kbxhqbf6px2370whpqyv34nczb5ryv6znikhb30d37y3f"; depends=[dplyr keras magrittr Matrix mgcv R6 reticulate tensorflow tfprobability tfruns]; }; + deeptime = derive2 { name="deeptime"; version="0.3.0"; sha256="1pl3zrdjq66bq8z97a55gksx13qmibdk8shfx8h43j7mlplv9bxn"; depends=[cli curl ggfittext ggforce ggnewscale ggplot2 gridExtra gtable lattice rlang scales]; }; + deeptrafo = derive2 { name="deeptrafo"; version="0.1-1"; sha256="16lxxd75j9bwapfx716b9fmqfz6ms4x5g98wc1yykiahjpbj8156"; depends=[deepregression Formula keras mlt purrr R6 reticulate survival tensorflow tfprobability variables]; }; default = derive2 { name="default"; version="1.0.0"; sha256="0hzxgp9la9kll5cw3m4gd02rii571xsn1v53kz407k7k6rfg5mda"; depends=[]; }; defineR = derive2 { name="defineR"; version="0.0.4"; sha256="1wm6ynicwk2dlx8m0k45kc1pa8i3z8w78xk3v40szy2ys5j80m7v"; depends=[common glue libr openxlsx readxl reporter xml2 xslt]; }; deflateBR = derive2 { name="deflateBR"; version="1.1.2"; sha256="17zsy10k12gmffbk7nagi60xj347q0bf7wr885fiylqz2xiy9fl9"; depends=[dplyr httr lubridate]; }; @@ -7986,7 +8027,7 @@ in with self; { demogR = derive2 { name="demogR"; version="0.6.0"; sha256="06x82ffbdv6ifl8xh52d3npdwha67v1ylfjp78j5pa4wdqkg221b"; depends=[]; }; demography = derive2 { name="demography"; version="1.22"; sha256="1m15capbfknr4rqxmfgj1vb7rmgambk6r9ic37149525sg7wn3j6"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; }; 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]; }; + dendRoAnalyst = derive2 { name="dendRoAnalyst"; version="0.1.4"; sha256="0v9fgrp5vxhzc7vh1p9mmlqhs4djzizvbp5zcp0dm3ssh6wfrska"; depends=[boot pspline zoo]; }; dendextend = derive2 { name="dendextend"; version="1.16.0"; sha256="0rl4f0b73s1gdjfxgpnz87lhv131qazxb6vsv2935ad266fd0bzc"; depends=[ggplot2 magrittr viridis]; }; dendroTools = derive2 { name="dendroTools"; version="1.2.8"; sha256="095599qgikx7xbs82x4v4h555rss6vhh8b9mnpk5dj9p2lx7nf9x"; 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=[]; }; @@ -8023,7 +8064,7 @@ in with self; { descstatsr = derive2 { name="descstatsr"; version="0.1.0"; sha256="1pz5lww1dkkqvsq6h0vkch39bj76qffmmag3zlag5in75s4wj0wl"; depends=[moments zoo]; }; desctable = derive2 { name="desctable"; version="0.3.0"; sha256="1i0124lnmzdbx468lyqmzbd6disxjifqjy8ss10fl8cin4f868lb"; depends=[dplyr DT htmltools pander rlang tidyr]; }; desiR = derive2 { name="desiR"; version="1.2.2"; sha256="149wgg5mbq95wizpc24mwb8qfxjdia4qkz66bnzjgiiyfh6r46wp"; depends=[]; }; - designer = derive2 { name="designer"; version="0.1.0"; sha256="04i5pfiz43c6khz6x5pzn67n6z24dc9yvg9fs67qwp1s1vp5572i"; depends=[bslib cicerone config golem htmltools jsonlite shinipsum shiny shinyscreenshot]; }; + designer = derive2 { name="designer"; version="0.2.0"; sha256="0k14x0gn217lvd6vr4aszy2ngm3w7b45bas3g6vmik2q7h0klvqx"; depends=[bs4Dash bslib cicerone config fontawesome golem htmltools jsonlite shinipsum shiny shinyscreenshot]; }; designmatch = derive2 { name="designmatch"; version="0.4.1"; sha256="1qjyicjvlk2xp0c9p35y8ih7l6h0416nzqfsqb5psgr1p6i1vh7s"; depends=[lattice MASS Rglpk slam]; }; designr = derive2 { name="designr"; version="0.1.12"; sha256="1sn5cnqpczzvxmcib4mcwys8y98vx3pxdxcpy2v6rvrhjsqrc207"; depends=[crossdes dplyr lme4 MASS tibble]; }; designsize = derive2 { name="designsize"; version="0.1.0"; sha256="1c9b320vssw3s1ybyialg5s85k1vfllbw40qfgmvnsr3imc2inb2"; depends=[]; }; @@ -8031,7 +8072,7 @@ in with self; { desla = derive2 { name="desla"; version="0.2.0"; sha256="1m094k06bmi1bzdwdd4yrrjynpw0n5fvbv2phfanx7q10dm51f6l"; depends=[parallelly Rcpp RcppArmadillo RcppProgress Rdpack]; }; desplot = derive2 { name="desplot"; version="1.9"; sha256="0dg8j3l6x12g4h5hsxwhxvc8i03gwlvm80l03rx3wwqsx070if1y"; depends=[ggplot2 lattice reshape2]; }; details = derive2 { name="details"; version="0.3.0"; sha256="0mygkmfmfp3a2hgql514zyh4rw3v8i4g4cls6rss0fplg4pskwc7"; depends=[clipr desc htmltools httr knitr magrittr png withr xml2]; }; - detect = derive2 { name="detect"; version="0.4-4"; sha256="1gzd98b4kg5rw0kpgznrb1wmr3iavdq5983n6wqx33lga1lqq9d6"; depends=[Formula Matrix pbapply]; }; + detect = derive2 { name="detect"; version="0.4-5"; sha256="12z7ci5vblksyiprlcv8gw61cl19swq0jxk0cidlfqhwvhp19inb"; depends=[Formula Matrix pbapply]; }; detectR = derive2 { name="detectR"; version="0.1.0"; sha256="1l93b8xx6xridwcvs15xgfm7w05p3r233rxpakpii3d71rnbs8cy"; depends=[doParallel foreach glasso lavaan LogConcDEAD signal]; }; detectRUNS = derive2 { name="detectRUNS"; version="0.9.6"; sha256="0yl1x0jz66hingbl094picsiyrxzxvnz0grq63rva6nwn7pv1c0b"; depends=[data_table ggplot2 gridExtra iterators itertools plyr Rcpp reshape2]; }; detectnorm = derive2 { name="detectnorm"; version="1.0.0"; sha256="1cr5i73iigmsg0ywlm61iv1yw91vafbbf4dhvcd448qnv05cjlaw"; depends=[ggplot2 nleqslv psych Rdpack truncnorm]; }; @@ -8042,12 +8083,12 @@ in with self; { detrendeR = derive2 { name="detrendeR"; version="1.0.5"; sha256="1kx404z0xp22d1jhpn217l8wcn6p587by908a6465dfpkhc8vyyb"; depends=[dplR tkRplotR]; }; detrendr = derive2 { name="detrendr"; version="0.6.14"; sha256="18yb14blw3md83lnlzalq3aqih56nndwwljds1pjqpm0ssf1d3p0"; depends=[arrayhelpers autothresholdr checkmate doParallel dplyr filesstrings foreach ijtiff iterators magrittr plyr purrr Rcpp RcppParallel rlang stringr withr]; }; detzrcr = derive2 { name="detzrcr"; version="0.3.1"; sha256="0afi1ir8il5xmzkpmbc2m5mvmgzlqw8qdn04gbnwl74a03yaxxmj"; depends=[DT ggplot2 MASS shiny]; }; - devEMF = derive2 { name="devEMF"; version="4.1"; sha256="1n10rpripqz7x7xcrylbdq2mgzf5bprkplbxqkpws5as1rnz4q21"; depends=[]; }; + devEMF = derive2 { name="devEMF"; version="4.1-1"; sha256="0mfj2brd8rcs84v5yx2hszc21qnn5jqihb50s85nnpi8n1gj36cp"; depends=[]; }; devFunc = derive2 { name="devFunc"; version="0.1"; sha256="0f2s5gssk9napmah7zcss1rnh7pzlq90gzwcnvyr9rrq6k118n8q"; depends=[plyr stringr]; }; devRate = derive2 { name="devRate"; version="0.2.3"; sha256="05jmxlbxqx8czaxy9lhanvcz6qjwp8r33a22njr52xhfk0d4yivk"; depends=[]; }; devoid = derive2 { name="devoid"; version="0.1.1"; sha256="14cf75wih7401vmrfmswc9cihgmbyn90wg2vjkzv628mm5fgg01h"; depends=[]; }; devtools = derive2 { name="devtools"; version="2.4.5"; sha256="0jwh14clyj5flygpmifk01avs7mbnj2s1686pxzfrkcshfyhw5iq"; depends=[cli desc ellipsis fs lifecycle memoise miniUI pkgbuild pkgdown pkgload profvis rcmdcheck remotes rlang roxygen2 rversions sessioninfo testthat urlchecker usethis withr]; }; - dexter = derive2 { name="dexter"; version="1.2.1"; sha256="1v96wgr07qj39i2vh675fsp2zv11hzfksv1ipq7jpy0y7fiyn1v7"; depends=[DBI dplyr MASS Rcpp RcppArmadillo rlang RSQLite tidyr]; }; + dexter = derive2 { name="dexter"; version="1.2.2"; sha256="1bvrxbg564y5wwndl92xhz628c7qpjz7vh44a0r0rc7lrc8h0hsx"; 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.6"; sha256="10v3djwani0zd27cjlf7lch7rfipnmb2p5wa7n2y5qxjqxli9z3x"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets jsonlite networkD3 RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; }; dfCompare = derive2 { name="dfCompare"; version="1.0.0"; sha256="1lhx69j0bkjbnp5jz23hrbxjcf04vf3big4k593ixz003xs2077f"; depends=[]; }; @@ -8081,8 +8122,8 @@ in with self; { diagonals = derive2 { name="diagonals"; version="6.4.0"; sha256="1c5pf23bcq47m9n2s5m5bkcksnifz9g06xc9149163i8mqhzia7l"; depends=[]; }; diagram = derive2 { name="diagram"; version="1.6.5"; sha256="1r3lyl0h7mk9cfg8smr3jydfkjdawaphnxibkxfjqa7029vkxh79"; depends=[shape]; }; dialr = derive2 { name="dialr"; version="0.4.1"; sha256="01vry39wc9ssmzkpp07szzbkigazj3l23bgrva3qmpbn5jjdi2ba"; depends=[dialrjars rJava]; }; - dialrjars = derive2 { name="dialrjars"; version="8.12.54"; sha256="1xzkxn8lvlgw0y0nhp411ikqpdqj5kfd605ycmx643rbz7m2fnjd"; depends=[rJava]; }; - dials = derive2 { name="dials"; version="1.0.0"; sha256="0flpd7bxknsscv0gk6c7zz1aid9y3z6sibkvjp9zcyc5wnqldrvj"; depends=[DiceDesign dplyr glue hardhat lifecycle pillar purrr rlang scales tibble vctrs withr]; }; + dialrjars = derive2 { name="dialrjars"; version="8.13.2"; sha256="1h9b2mvjbsxyclklc8lx8mymkbq8c5p06j5dxnxgk4mkpiazgr7i"; depends=[rJava]; }; + dials = derive2 { name="dials"; version="1.1.0"; sha256="1ly675h6shfclikwg82x8vwvrb63qmklamrbsqxsa0npbafqgvpb"; depends=[cli DiceDesign dplyr glue hardhat lifecycle pillar purrr rlang scales tibble vctrs withr]; }; diaplt = derive2 { name="diaplt"; version="1.4.0"; sha256="103hq13ql8xs1zb90is2r1lanj5vpvz9rk315zvbd8am00fshc9n"; depends=[]; }; diathor = derive2 { name="diathor"; version="0.1.0"; sha256="0nbqjaxb2fzcg9w67nbrszwv9swr1kjmg4dximfc8qdya1kmv8z9"; depends=[data_table ggplot2 purrr stringdist stringr tibble tidyr vegan]; }; dibble = derive2 { name="dibble"; version="0.2.1"; sha256="14gzr7wpfv10pkk794bnvainf8z01s0nkaz9q6by8jllbpl49pm3"; depends=[dplyr memoise pillar purrr rlang tibble tidyr tidyselect vctrs]; }; @@ -8120,9 +8161,10 @@ in with self; { diffusion = derive2 { name="diffusion"; version="0.2.7"; sha256="1j9s9vw5sc4k956bk4yp3bf4fnp7lhhkwcvlzvsh1w4dyaj8l35h"; depends=[dfoptim nloptr systemfit]; }; diffusionMap = derive2 { name="diffusionMap"; version="1.2.0"; sha256="1rvk7069brlm1s9kqj4c31mwwr3mw4hmhay95cjjjfmw5xclff2j"; depends=[igraph Matrix scatterplot3d]; }; diffusr = derive2 { name="diffusr"; version="0.1.4"; sha256="1f3h387kblw1xzdnxphwgfl1n7f6i07kk7kfslvbfxkalbish6ii"; depends=[igraph Rcpp RcppEigen]; }; + diffval = derive2 { name="diffval"; version="1.0.0"; sha256="1jz5zqk6pkprkiln8finnifh3l2859mql156rklsaabhbb6x2ras"; depends=[]; }; diffviewer = derive2 { name="diffviewer"; version="0.1.1"; sha256="01phkaaa0zylyi23siwam18i1ggfgq2m66d69lnz9ips1yh12yca"; depends=[htmlwidgets jsonlite]; }; - digest = derive2 { name="digest"; version="0.6.30"; sha256="19va0z7blshsai1jjys9vdahpfz1klicrpv8682sdnz77fa5k03v"; depends=[]; }; - digiRhythm = derive2 { name="digiRhythm"; version="1.0"; sha256="15q6iiwp9dznvmc81hwb1ni46gmkra5m9cwdf41jgv5bb35qyc0g"; depends=[crayon dplyr ggplot2 lubridate magrittr pracma readr stringr tidyr xts zoo]; }; + digest = derive2 { name="digest"; version="0.6.31"; sha256="1f9isi4i2502f88c2sh4l461hgyary2aa02zd47pb9mc1r4lya2s"; depends=[]; }; + digiRhythm = derive2 { name="digiRhythm"; version="1.1"; sha256="0wdlwgfr9rppwssh3xpsj78rqan1lsjw3nx5f855w2hh873sakwb"; depends=[crayon dplyr ggplot2 lubridate magrittr pracma readr stringr tidyr xts zoo]; }; digitTests = derive2 { name="digitTests"; version="0.1.2"; sha256="0giz0zr8rcvfv36qmqy6fpamjcansrq4bs3znnq0g97iprj0x3i5"; depends=[]; }; digitalDLSorteR = derive2 { name="digitalDLSorteR"; version="0.3.1"; sha256="1wglj3vg2d233wv431b7zla27sj9gbv1k5h66547v079qb8zvm1d"; depends=[dplyr ggplot2 ggpubr gtools keras Matrix pbapply RColorBrewer reshape2 reticulate rlang S4Vectors SingleCellExperiment SummarizedExperiment tensorflow tidyr zinbwave]; }; digitalPCR = derive2 { name="digitalPCR"; version="1.1.0"; sha256="0hwqq84yr1hnvf4bygc5425887dhqjjjyy1ils71iavcal04s8pb"; depends=[]; }; @@ -8154,7 +8196,6 @@ in with self; { discAUC = derive2 { name="discAUC"; version="0.4.0"; sha256="1l80xz5wrcikrs2b2i05jq3qkx468k891gwmmy5d1mymp4si3z0h"; depends=[dplyr glue rlang tibble]; }; discSurv = derive2 { name="discSurv"; version="2.0.0"; sha256="0k585cyz02vqk4w7w20rhn6g9rspmmlbdpv7k837021iyhwwb838"; depends=[data_table functional geepack mgcv mvnfast mvtnorm ranger Rdpack rpart treeClust VGAM]; }; discfrail = derive2 { name="discfrail"; version="0.1"; sha256="1ll8c0fwwmz2yw8w582422r8bk9lr1570d7m7w2n1flrnqpqmk8j"; depends=[Matrix numDeriv survival]; }; - 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.1"; sha256="0qsycr04xz1h90jyzxwagfkc4rkc8mb9srasvhrp7grynjxlbb9f"; depends=[]; }; disclapmix = derive2 { name="disclapmix"; version="1.7.4"; sha256="1rc5kv4abx1hxgkp3vb3f247nv887vrh9l2y189blq0p6k258575"; depends=[cluster disclap MASS Rcpp RcppProgress]; }; @@ -8173,7 +8214,7 @@ in with self; { 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-9"; sha256="1vmyjch2nv7x80kj453bjbzfsdyhcmf9hw68lh2b05kpnqfm491r"; depends=[raster Rcpp sp terra]; }; - disordR = derive2 { name="disordR"; version="0.0-9-2"; sha256="168k9hybndrwaspxq5sax2aa6431cj5x5gr0vpngjfwkkq51x6l4"; depends=[digest Matrix]; }; + disordR = derive2 { name="disordR"; version="0.0-9-4"; sha256="1p8lfwyc3214nc0lm2limnnx0d7vrwq7gxp18fgdxbxknd1rfk0s"; depends=[digest Matrix]; }; dispRity = derive2 { name="dispRity"; version="1.7.0"; sha256="0qrmhlmbkg0jr9dhfmx46y8vh7nmydmm0sscnj4zrz7wf7myavrm"; depends=[ade4 ape castor Claddis ellipse geometry MASS mnormt phangorn phyclust scales vegan]; }; disparityfilter = derive2 { name="disparityfilter"; version="2.2.3"; sha256="0dkk3qws631mf0g02di5rsrvh5954cykysyri0g8aqgik0j9dg06"; depends=[igraph]; }; dispeRse = derive2 { name="dispeRse"; version="1.0"; sha256="1x2v9lkmbqa4mn5rflmln4j85jhz08aa54pj9d01rxm4nnd23qdd"; depends=[raster rgdal sp]; }; @@ -8198,15 +8239,15 @@ in with self; { distillery = derive2 { name="distillery"; version="1.2-1"; sha256="1ymmxyamkq0zbz2m4gllln1ihks2hcib6gs0mls92as79srz122b"; depends=[]; }; 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]; }; - 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]; }; - distrMod = derive2 { name="distrMod"; version="2.8.5"; sha256="0bgi9vrbi6mg01i1iip3b8bqa7qzbcnd6b1w8qqr02xyqnpil9yi"; depends=[distr distrEx MASS RandVar sfsmisc startupmsg]; }; - distrRmetrics = derive2 { name="distrRmetrics"; version="2.8.0"; sha256="17kbl8b4q8w7il1f02yqr11filhbd5axjwwna20gvjim501jizwi"; depends=[distr fBasics fGarch startupmsg]; }; - 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.1"; sha256="0ssy72clpffby4b07ynvmyfm5q4m93c204v70w5428kkjq6imf5w"; depends=[distr distrEx startupmsg]; }; + distr = derive2 { name="distr"; version="2.9.1"; sha256="0pqss05qs209nbv78n01zhap15pshjkpvk4czz3ja06l1flr1dw2"; depends=[MASS sfsmisc startupmsg]; }; + distrDoc = derive2 { name="distrDoc"; version="2.8.1"; sha256="1lrh3ml47h3d3j59dfqlbza1vh11b5m16am8ilc2dfbm230xnmf9"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg]; }; + distrEllipse = derive2 { name="distrEllipse"; version="2.8.1"; sha256="0nv87i05aa72x9pj26z37j9cwlyzyhgjbv8bphnhvzf7df1a40r2"; depends=[distr distrEx distrSim mvtnorm setRNG startupmsg]; }; + distrEx = derive2 { name="distrEx"; version="2.9.0"; sha256="0dgv81bilq5yhwqd7qnp30q8nsaw7vpmh27xw2sl20a0mm3ihz88"; depends=[distr startupmsg]; }; + distrMod = derive2 { name="distrMod"; version="2.9.0"; sha256="0y1fig29saf070phm8gh08vbjr3jl8gjbcwdi6sz4manpl8i81w7"; depends=[distr distrEx MASS RandVar sfsmisc startupmsg]; }; + distrRmetrics = derive2 { name="distrRmetrics"; version="2.8.1"; sha256="12ig5yqn0k1f14zi96ladl3f491jrmlpii2zi49n17rp7214ny14"; depends=[distr fBasics fGarch startupmsg]; }; + distrSim = derive2 { name="distrSim"; version="2.8.1"; sha256="1z6x3bsxp9mrnnygx1048v4iadjs8kkqywjclsixmngb0nm69h61"; depends=[distr setRNG startupmsg]; }; + distrTEst = derive2 { name="distrTEst"; version="2.8.1"; sha256="0s22g7sf2q0kj8qcl09vq8prnahmm3iqc0v66kzm6hmhc314k509"; depends=[distrSim setRNG startupmsg]; }; + distrTeach = derive2 { name="distrTeach"; version="2.9.0"; sha256="0jf1v4nb900z7jcy3d34z86ykrn52xnimir1l0iv78dkh1kvwsqn"; depends=[distr distrEx startupmsg]; }; distreg_vis = derive2 { name="distreg.vis"; version="1.7.3"; sha256="1dnpcd0dpbgvnwcc83n15gr9risyzvnp5f45wg11l9fp5yi63s8j"; depends=[bamlss betareg formatR gamlss gamlss_dist ggplot2 magrittr rhandsontable shiny]; }; distributional = derive2 { name="distributional"; version="0.3.1"; sha256="0pr34yq6igb7ciqss2ldwa7gc55xvla040x8rkd8m2hcrz5mczkj"; depends=[digest farver generics ggplot2 lifecycle numDeriv rlang scales vctrs]; }; distributions3 = derive2 { name="distributions3"; version="0.2.1"; sha256="19c8s5qshqzhvl01c7nd9912vyy0nnmc7rfg8iih2jlcpqrdql86"; depends=[ellipsis ggplot2 glue]; }; @@ -8218,7 +8259,7 @@ in with self; { dittodb = derive2 { name="dittodb"; version="0.1.4"; sha256="19qw7xjrix8vlaivha2iaff7rx8i2gp1fk135y59p4rdmm05xfd1"; depends=[DBI digest glue lifecycle]; }; div = derive2 { name="div"; version="0.3.1"; sha256="1k4c34wpwfj7yqnk1x9sjzn3dc2vdzhpy8g4c00aqs3nbgcknyn8"; depends=[dplyr ggplot2 gridExtra kableExtra magrittr plotly pryr rlang rpart stringr tibble tidyr tidyverse]; }; divDyn = derive2 { name="divDyn"; version="0.8.2"; sha256="1rqk7ih0j6d3ykx7d0r0c33bcbksw4paman5f92ragw2a96d04cf"; depends=[Rcpp]; }; - diveMove = derive2 { name="diveMove"; version="1.6.0"; sha256="0ddlc89wi76kja8zz9j72p57hz3rw9xjzrj6k5h60573c5b9b1ig"; depends=[geosphere KernSmooth plotly quantreg uniReg]; }; + diveMove = derive2 { name="diveMove"; version="1.6.1"; sha256="1jq24qys802s9cab3r9fag9jq994wjg6vni6sxd2psng846hixic"; depends=[geosphere KernSmooth plotly quantreg uniReg]; }; diveR = derive2 { name="diveR"; version="0.1.2"; sha256="0n0ldc3k0ryr20794kvqxpnk8m3qc13lkl6rxw043pkwbjqj7291"; depends=[cli crayon ggmulti loon loon_data loon_ggplot loon_shiny loon_tourr rstudioapi zenplots]; }; diveRsity = derive2 { name="diveRsity"; version="1.9.90"; sha256="11pfq3syvjmfwfimjc2jnlprcnynvargr4yjd8h0aa6qzgdrrx5q"; depends=[ggplot2 qgraph Rcpp shiny]; }; diverge = derive2 { name="diverge"; version="2.0.4"; sha256="11hhak3ldnf83aaq7wd8f2wqcd3lqgmda78zdgcd6ksljq3mvwcx"; depends=[truncnorm]; }; @@ -8235,11 +8276,12 @@ in with self; { dkanr = derive2 { name="dkanr"; version="0.1.3"; sha256="1zic7qhwq3s9w70zi1f6qyf7pzm69k5a1p5fd4n3z4nbga54njxd"; depends=[assertthat dplyr httr jsonlite purrr stringr tibble]; }; dlbayes = derive2 { name="dlbayes"; version="0.1.0"; sha256="058kkh67npai2ffrjdpjn4pzj8f233znl16nj6yx8wz8lkb17cb0"; depends=[expm GIGrvg glmnet LaplacesDemon MASS]; }; dlib = derive2 { name="dlib"; version="1.0.3.1"; sha256="1rchl4f3zj0azz8d4n139daba2gz6vnm60jq45vgc9gphk2mrnnb"; depends=[Rcpp]; }; + dlm = derive2 { name="dlm"; version="1.1-6"; sha256="0mxfakryagyg2idjhw1ydp4xqk57s3z17cv69hj16lisx8q43pc9"; depends=[]; }; dlnm = derive2 { name="dlnm"; version="2.4.7"; sha256="0mbww28n95vnd6wrn1b4mfsdvnyffa8mr6ws4jqmqdc23nydl9p4"; depends=[mgcv nlme tsModel]; }; - dlookr = derive2 { name="dlookr"; version="0.6.0"; sha256="0i1w3cakp72qlq9yc6ija0qb12gyb043mj1wj6f25hh75jrg3brw"; depends=[dplyr ggplot2 gridExtra hrbrthemes htmltools kableExtra knitr mice pagedown partykit purrr reactable rlang rmarkdown shiny showtext sysfonts tibble tidyr tidyselect]; }; + dlookr = derive2 { name="dlookr"; version="0.6.1"; sha256="0lnnx9r0ai79cbg4dq2aqprfql7s31y7777v1bw0931ia3nd9s51"; depends=[dplyr ggplot2 gridExtra hrbrthemes htmltools kableExtra knitr mice pagedown partykit purrr reactable rlang rmarkdown shiny showtext sysfonts tibble tidyr tidyselect]; }; 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.5"; sha256="00lk6fnyziaqz3hc5jvdybgsywlad755dcr9l41aqwx6gx2k1wrg"; depends=[ggplot2 jsonlite magrittr RColorBrewer scales]; }; + dlstats = derive2 { name="dlstats"; version="0.1.6"; sha256="0bs7kgllii2nhb1sspajhlldhjav9gl0y96c949pgfijwbr01vn0"; depends=[ggplot2 jsonlite magrittr RColorBrewer scales]; }; dm = derive2 { name="dm"; version="1.0.3"; sha256="13sh6f5da1dzd8517cgsr3lig8bihlms7bzrwgs0m4fswvj5fgfj"; depends=[backports cli DBI dplyr glue igraph lifecycle magrittr memoise pillar purrr rlang tibble tidyr tidyselect vctrs]; }; dma = derive2 { name="dma"; version="1.4-0"; sha256="003snr09hazszwqnvjrbv8vyz6ihgcfcfhrlshg451dddn920615"; depends=[MASS]; }; dmai = derive2 { name="dmai"; version="0.4.0"; sha256="0ma89jl0l598sffpikvjj40f2djjcnjq29k6y1bav4dm2g51qgmq"; depends=[dplyr ggplot2 magrittr stringr tibble tidyr]; }; @@ -8256,7 +8298,7 @@ in with self; { dng = derive2 { name="dng"; version="0.2.1"; sha256="0yi1fs4yvlsy3j128l7s5kwq8mhdd5fr74y2bzj7cjrxi7wgz2hg"; depends=[Rcpp]; }; dnr = derive2 { name="dnr"; version="0.3.5"; sha256="16s06jvwmvhxgvrmfav1xfszjrn7j2cm4jw5xyx6w5lb5434kzcq"; depends=[arm ergm glmnet igraph network sna]; }; do = derive2 { name="do"; version="2.0.0.0"; sha256="16c6ksdas678k1285vk526ga3qkfb658nq4j5z9safjkyl1d5lrp"; depends=[crayon data_table desc httr openxlsx plyr reshape2 rstudioapi rvest stringr tidyr tidyselect tmcn usethis xml2]; }; - doBy = derive2 { name="doBy"; version="4.6.14"; sha256="1ps6r7yxs0a6rpfi2yzrb9j41862za3gdl1aq9vw3j5cmgrk8w1n"; depends=[broom Deriv dplyr ggplot2 magrittr MASS Matrix microbenchmark pbkrtest tibble]; }; + doBy = derive2 { name="doBy"; version="4.6.15"; sha256="14asz3bpyvxakvpap2aajk6f5j2d3d6vrvrgnlixg5q6gdbh465m"; depends=[broom Deriv dplyr ggplot2 magrittr MASS Matrix microbenchmark pbkrtest tibble]; }; doFuture = derive2 { name="doFuture"; version="0.12.2"; sha256="0w07pmzpsfq4kvfc745s1i9b6dfn1df1wrfi4s9ys4ir3g2s8nk1"; depends=[foreach future globals iterators]; }; doMC = derive2 { name="doMC"; version="1.3.8"; sha256="18qrcvqwm4cclvk8spvyi281y8prwzivj52xmzk1l9a82j2ny65j"; depends=[foreach iterators]; }; doMPI = derive2 { name="doMPI"; version="0.2.2"; sha256="0ahwm17p3gq1yvc8v6sr6sb8z7i6zws8d1pf46qynl0gd4amg938"; depends=[foreach iterators Rmpi]; }; @@ -8270,7 +8312,7 @@ in with self; { doc2vec = derive2 { name="doc2vec"; version="0.2.0"; sha256="0249hm0103kxxsi4gks4h20wf6p00gbrk9jf8c148mbja1l56f6v"; depends=[Rcpp]; }; dockerfiler = derive2 { name="dockerfiler"; version="0.2.0"; sha256="1j773kpbg38bh7y60s4mysz67kxqhm4ziammy07iw680rpqffvms"; depends=[attempt cli desc fs glue jsonlite pak pkgbuild R6 remotes renv usethis]; }; docknitr = derive2 { name="docknitr"; version="1.0.1"; sha256="1mhdjv6yznzyx911f0m3m0i7jlzj7h12ikkxb9b6zj68bdplv30b"; depends=[knitr rstudioapi sys]; }; - doconv = derive2 { name="doconv"; version="0.1.4"; sha256="1vg45x3wwqhkwq9sw4lrni31bmzql7a70ncbjw2dj5ja8l22jjdk"; depends=[locatexec magick pdftools processx]; }; + doconv = derive2 { name="doconv"; version="0.2.0"; sha256="1pvzpxv60ghninmn5sawqqx988yl2151kqs4qj5qrb7fpgph481w"; depends=[locatexec magick pdftools processx]; }; 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]; }; @@ -8278,12 +8320,12 @@ in with self; { 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]; }; documenter = derive2 { name="documenter"; version="0.1.2"; sha256="1q04b95h6va3178lwp56zc45vh838vxl071w1ym60n5v6v4jsc4f"; depends=[htmltools magrittr officer xml2 yaml]; }; - docxtools = derive2 { name="docxtools"; version="0.2.2"; sha256="0ds8qy21x7cq9qmnn6gggzf8kxdphq7nf2mx5gqx829zgkripsfq"; depends=[dplyr ggplot2 lubridate purrr rlang stringr tidyr]; }; + docxtools = derive2 { name="docxtools"; version="0.3.0"; sha256="0zfmmwnjzja80krflg2cl9a1ldg6qj1m0gppralfs59ag1jr7kqh"; depends=[dplyr ggplot2 lubridate purrr rlang stringr tidyr]; }; docxtractr = derive2 { name="docxtractr"; version="0.6.5"; sha256="1kki49g0sfhbx2d4swrkv21akws8ayrsd4h3v148xmzdlsrvhhiw"; depends=[dplyr httr magrittr purrr xml2]; }; - dodgr = derive2 { name="dodgr"; version="0.2.16"; sha256="0djml4z5hbr4xdj1a7syijysjxi9myb5xfrsy5r2db5m609s27sj"; depends=[callr digest fs magrittr osmdata Rcpp RcppParallel RcppThread]; }; + dodgr = derive2 { name="dodgr"; version="0.2.18"; sha256="1xnb4kdqjllg048y2bnl1pzq7xq15fg1nizr7ibhsfscjsgysgqg"; depends=[callr digest fs magrittr osmdata Rcpp RcppParallel RcppThread]; }; doebioresearch = derive2 { name="doebioresearch"; version="0.1.0"; sha256="1rmvb6pa71frvjszpsjaw3ahm70kyykrq6zfjqk8smgcg397k9pi"; depends=[agricolae]; }; doex = derive2 { name="doex"; version="1.2"; sha256="1r999z30ipa04pgck0hfalqxihb1bj8sdhlkkhf4plb7maaz3qm3"; depends=[]; }; - dogesr = derive2 { name="dogesr"; version="0.1.0"; sha256="1465vq5yhvhmc0apj8vlwmrqsy3g51iyn3ndv8rwd2zgbbfzcp30"; depends=[dplyr]; }; + dogesr = derive2 { name="dogesr"; version="0.1.5"; sha256="086x3hvsmx5phxrp5mpy9l6z28xxgc4n3mgrg2byix2l8klhp0cg"; depends=[dplyr ggplot2 knitr qpdf rmarkdown]; }; domino = derive2 { name="domino"; version="0.3.1"; sha256="0f67w0z5jy82kgm3l1rji430ayigw30vmmwp3i1nz0xibsx7jxv4"; depends=[]; }; domir = derive2 { name="domir"; version="1.0.0"; sha256="10kqza6r8nxlvmcx3bfqfyfvivv4pdkm7qqc859384n7dyjx88nx"; depends=[]; }; donut = derive2 { name="donut"; version="1.0.2"; sha256="0idynkhcdn9va32m1n1rxjyb7ghbkhyy1959wks2bn1a7k4yg87i"; depends=[]; }; @@ -8310,7 +8352,7 @@ in with self; { 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]; }; dowser = derive2 { name="dowser"; version="1.1.0"; sha256="1yp8l6ffmrl5xph35gg49yiavisxg710djbnwnqn12m4q6cpsa7a"; depends=[alakazam ape Biostrings dplyr ggplot2 ggtree gridExtra markdown phangorn phylotate RColorBrewer rlang shazam stringr tidyr tidyselect]; }; - dparser = derive2 { name="dparser"; version="1.3.1-8"; sha256="096zpbfyi3pja17i3wgi85fm7j8abrqpp20fy52nfy1pzrm4mmhi"; depends=[digest]; }; + dparser = derive2 { name="dparser"; version="1.3.1-9"; sha256="0ln3dg3mwfqf3pjvssqnqasq87yqqp3raf5f88zrzmibvq13d6i7"; depends=[digest]; }; dpcc = derive2 { name="dpcc"; version="1.0.0"; sha256="1f4c68bvkwg82k1zanjhqqika2bfjv83mbr2khl5lhvfjwvpi1m0"; depends=[Rcpp]; }; dplR = derive2 { name="dplR"; version="1.7.4"; sha256="1gnihbgbw5dimnzf23fhlkwairfdaixs7ss6rkhk45y551hbwf65"; depends=[boot digest lattice Matrix matrixStats plyr png R_utils signal stringi stringr XML]; }; dplbnDE = derive2 { name="dplbnDE"; version="0.1.1"; sha256="0hwb4lvydqlkbcxp3jwgzkqk6sqdjkcmkya1cah60sc15n816ksd"; depends=[bnclassify]; }; @@ -8334,7 +8376,7 @@ in with self; { drawer = derive2 { name="drawer"; version="0.2.0.1"; sha256="165w0lk6kp0hw85y1q3wj50jn5jbi4rn00vgz8q0wy68qw2ymhh5"; depends=[bsplus glue htmltools magrittr shiny stringr]; }; drawsample = derive2 { name="drawsample"; version="1.0.1"; sha256="018v4amapfwxx6k4s9drcv2vwil7cplnkwlrhy9djc0a02jxx2l5"; depends=[dplyr lattice moments psych readxl shiny shinycssloaders shinydashboard tibble xlsx]; }; drc = derive2 { name="drc"; version="3.0-1"; sha256="0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y"; depends=[car gtools MASS multcomp plotrix scales]; }; - drda = derive2 { name="drda"; version="2.0.1"; sha256="1ilcjlcryi7yyqm2k27ylk8gvmkjcr308px97ija69gynjbg981s"; depends=[]; }; + drda = derive2 { name="drda"; version="2.0.2"; sha256="0vp6i62j0jgw1vh6vrlj5svzbxrpxpkgv4m4fp33k8nq4zz7af6v"; depends=[]; }; dreamer = derive2 { name="dreamer"; version="3.1.0"; sha256="10yvdg5nkw4nawy9hdqyrsgh01xga8l3hn3qi1sbjzniv7903v7d"; depends=[coda dplyr ellipsis ggplot2 purrr rjags rlang rootSolve tidyr tidyselect]; }; dreamerr = derive2 { name="dreamerr"; version="1.2.3"; sha256="0g3gl4nzfw02alhyjw9flylfr2awyijjim50j1jdnp677zqlxkmf"; depends=[Formula]; }; drf = derive2 { name="drf"; version="1.1.0"; sha256="13b31rynknzirnvgygs1ar5968xdh8dhg60ibn0g359gnzadn7ad"; depends=[fastDummies Matrix Rcpp RcppEigen transport]; }; @@ -8355,16 +8397,17 @@ in with self; { ds = derive2 { name="ds"; version="4.0"; sha256="1iic5fb27cnhsa83zg28hydrhzc01i9z0711xvk95c3gv7mbfp2p"; depends=[]; }; ds4psy = derive2 { name="ds4psy"; version="0.9.0"; sha256="1w2234bnvniivivaa9k09fblw3l7dy2fiwk611x1iwp58xjmpr7c"; 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="1.0.2"; sha256="155ajjpy8g0afk2l9gmagzmn2mac0sni0rwcb9r1h97wdjcyl7pl"; depends=[limma magrittr mclust]; }; - dscore = derive2 { name="dscore"; version="1.4.0"; sha256="0vjrxdgss79pmd8vkarvgqqm465byz17r7r93k5i3923xm02kavr"; depends=[dplyr Rcpp RcppArmadillo stringr tidyr tidyselect]; }; + dscore = derive2 { name="dscore"; version="1.7.0"; sha256="0nkfx4ghnsn8ks6cxmyfhm61jli73ybv477i7q86xj2yb013vdyp"; depends=[dplyr Rcpp RcppArmadillo stringr tidyr tidyselect]; }; + dsdp = derive2 { name="dsdp"; version="0.1.0"; sha256="02646y75gng5ifblib834i19qc9jgl6i3grlk4p3nsy7xs8cl02s"; depends=[ggplot2 rlang]; }; dse = derive2 { name="dse"; version="2020.2-1"; sha256="170rxrniszs8h59ah4mn4mz8d7kzix4g3vlz4icd8w6bl40c6ykc"; depends=[setRNG tfplot tframe]; }; - dsfa = derive2 { name="dsfa"; version="1.0.0"; sha256="13y25bgy9qyncgm3z10irpnjw5bgqsqq2wmkmi5yqpdw3xm5d5f6"; depends=[copula gratia mgcv Rdpack sn]; }; + dsfa = derive2 { name="dsfa"; version="1.0.1"; sha256="0ai7hdr1jbp842ixjcvadksi4pcjplyglp27dlmfkjp0p0jsfbww"; depends=[copula gratia mgcv Rdpack sn]; }; dsims = derive2 { name="dsims"; version="1.0.1"; sha256="15yy3kivg26pmzaby0kaj4vq4526jrnvpiqj24bcvh7sskv8myif"; depends=[Distance dssd ggplot2 gridExtra mgcv mrds rgeos rlang rstudioapi sf sp]; }; dslabs = derive2 { name="dslabs"; version="0.7.4"; sha256="05v51rckpfjz2cbms250sv0q34l0ip841w9ardvs51s2x7r8qypc"; depends=[ggplot2]; }; dslice = derive2 { name="dslice"; version="1.2.0"; sha256="1k9hxpmr563p8bpd9m991lx5ig366mzk9j1lzldci9pq4jiayin1"; depends=[ggplot2 Rcpp scales]; }; dsm = derive2 { name="dsm"; version="2.3.3"; sha256="159hlllbp4qy5dxmxgsjcl2ksflq7z7v1ra5d7piyanm9c632q8a"; depends=[ggplot2 mgcv mrds nlme numDeriv plyr statmod]; }; dsmisc = derive2 { name="dsmisc"; version="0.3.3"; sha256="19760hcb5154rayhj72r48r7glh2qyaf178zkxplywmsw338kws4"; depends=[Rcpp stringr]; }; + dsmmR = derive2 { name="dsmmR"; version="0.0.96"; sha256="1857jxx22jvs3022qdf1nr2krds8g7b8lkd5vchvf01h1fqja2nj"; depends=[DiscreteWeibull]; }; dsos = derive2 { name="dsos"; version="0.1.1"; sha256="0fb2wwv7g829yvvgkkhsmcgspkx316zr828vqs0hbrr6ll7f8sfa"; depends=[data_table future_apply ggplot2 scales simctest]; }; dsrTest = derive2 { name="dsrTest"; version="1.0.0"; sha256="1nfwcab6p7swki8d2j2dywj93xidkjqcq84majvq90yabx353jd3"; depends=[asht exactci loglognorm]; }; dssd = derive2 { name="dssd"; version="1.0.0"; sha256="1svzd3d32lw6qvrpkgnidyrpq1903y2a1xplyq51gf2niwjyaxa0"; depends=[ggplot2 rgdal sf]; }; @@ -8386,11 +8429,10 @@ in with self; { dtwSat = derive2 { name="dtwSat"; version="0.2.8"; sha256="1k4xdnx2ca2sr4pba59q86860bzwxsg94mzr56gjdyfp1rmasqv3"; depends=[caret data_table dtw foreach ggplot2 lubridate mgcv plyr proxy raster RColorBrewer Rdpack reshape2 rgdal scales sp xtable zoo]; }; dtwclust = derive2 { name="dtwclust"; version="5.5.11"; sha256="1n4xgjd712agkhbqyyc4jy661rg1lmjfqwg778bfma17y6ad7gzp"; depends=[clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix proxy Rcpp RcppArmadillo RcppParallel RcppThread reshape2 RSpectra shiny shinyjs]; }; dual = derive2 { name="dual"; version="0.0.4"; sha256="0ssdq9gjys9iskwpkllp0m2ig2s7j6jmyq1b5j5lkns5f5aqa7j6"; depends=[]; }; - dual_spls = derive2 { name="dual.spls"; version="0.1.2"; sha256="0cy3l715bf8l6yx5sdqmz9v5an3jr0zqhc99hzqv8iyzrdrd8hwd"; depends=[pdist]; }; 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.5.1"; sha256="0pn1d7jvv6hd8glaj4vd60q2clb68l5ncm85mw057nhqllqjzram"; depends=[DBI]; }; + duckdb = derive2 { name="duckdb"; version="0.6.1"; sha256="085cpb0rhiyipffzdqqscblrwav5hfz57r3475ccjn9xyf7n0pmw"; 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]; }; dummy = derive2 { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; }; @@ -8404,25 +8446,25 @@ in with self; { 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.2.1"; sha256="0nx4gx51p0qz1565yn7xg0ijrkqvn9ql9hrmp5lwl4lxvsjnwki1"; depends=[CholWishart MASS mvtnorm RcppZiggurat Rfast]; }; - dycdtools = derive2 { name="dycdtools"; version="0.4.2"; sha256="0i5wrmcmryf6pl07c08hk8hzchdal63czh280g040n8c4i9gkz6b"; depends=[dplyr ggplot2 hydroGOF lubridate ncdf4 R_utils RColorBrewer tidyr]; }; + dycdtools = derive2 { name="dycdtools"; version="0.4.3"; sha256="06hm00mfkkg5yxpf30xb4i21bna0hpa0g86vx9qz9vf7f7cvdwjx"; depends=[dplyr ggplot2 hydroGOF lubridate ncdf4 R_utils RColorBrewer tidyr]; }; dydea = derive2 { name="dydea"; version="0.1.0"; sha256="15alr3f6wkkpjd5wmcjazi58yc8gwcqr662mjwlfg15r94fzqrlg"; depends=[Chaos01]; }; dygraphs = derive2 { name="dygraphs"; version="1.1.1.6"; sha256="022j007mzfa9k2n31yg4aizcsf571vv3jip092h23rqj03rk3ly3"; depends=[htmltools htmlwidgets magrittr xts zoo]; }; dymo = derive2 { name="dymo"; version="1.1.0"; sha256="0s1gpi5qiafkf91awyx52qw15qs7m18bql51jibgh1lqnqgv1757"; depends=[fANCOVA ggplot2 greybox imputeTS lubridate MASS matlib modeest moments narray purrr readr scales tictoc]; }; dyn = derive2 { name="dyn"; version="0.2-9.6"; sha256="16fqv9k7yxdgybwzafjkyqm16qpgqz13lcjpi6a1nc8xbzlzh0gb"; depends=[zoo]; }; dyn_log = derive2 { name="dyn.log"; version="0.4.0"; sha256="0vlzv6zy29qhygm77kww65wpnp77a93ja13vr4p2yyychrjspqx3"; depends=[crayon glue R6 rlang stringr yaml]; }; dynBiplotGUI = derive2 { name="dynBiplotGUI"; version="1.1.6"; sha256="04026jz4vdyj2a2kry5kk5k84cy4vqqrcn328hxwnwh7r8i7klvn"; depends=[tcltk2]; }; - dynConfiR = derive2 { name="dynConfiR"; version="0.0.1"; sha256="1ndm5ccs8lpp00mb184paq84kzs9p7a39yzqpcyfdy7w7cl618bd"; depends=[dplyr Hmisc logger magrittr minqa progress Rcpp rlang rtdists]; }; + dynConfiR = derive2 { name="dynConfiR"; version="0.0.2"; sha256="11grish5x9xiw6gkr2bmg1vpi2hdqw7j52czhgc9d9gxvxlyjxp8"; depends=[dplyr magrittr minqa progress Rcpp rlang]; }; dynCorr = derive2 { name="dynCorr"; version="1.1.0"; sha256="0l5k764j1zhsqpgp0ndihah63hsk3zv9hviixfmh4h3i0sr0q52p"; depends=[lpridge]; }; - dynRB = derive2 { name="dynRB"; version="0.17"; sha256="0zihmhky087l8hl5jmwlkjmiihn4v3bqwfzyjzzc62g8kcmq0mkp"; depends=[corrplot dplyr foreign ggplot2 RColorBrewer reshape2 vegan]; }; + dynRB = derive2 { name="dynRB"; version="0.18"; sha256="0sz0a1g6z48f0s7ch86y9mvazwk4gdswjj179a13d0yjhy9rgpk0"; depends=[corrplot dplyr foreign ggplot2 RColorBrewer reshape2 vegan]; }; dynaSpec = derive2 { name="dynaSpec"; version="1.0.1"; sha256="0wzfy50602wlsh4sbfjadsr01f3az2lvk5c4px3qmcvv5gybd6w0"; depends=[ari av gganimate ggplot2 magrittr NatureSounds pbapply png scales seewave tuneR viridis]; }; dynaTree = derive2 { name="dynaTree"; version="1.2-14"; sha256="11aq7z6ayz9yi6hjc4nw1fa1sq4c9sgpiqp2ihznfq06zj8rd7nl"; depends=[]; }; - dynamAedes = derive2 { name="dynamAedes"; version="2.1.0"; sha256="0zpqkn8z4rcyrg5yh45ncaz7j3knc8vgl28k0kfp5dr2q7i4zsbm"; depends=[doParallel drc fields foreach insol raster slam sp]; }; - dynamac = derive2 { name="dynamac"; version="0.1.11"; sha256="0dzw4h128z53vwdpkikhxqil0xjrcjrp1zmz0fy2qhq0n74sdyar"; depends=[lmtest MASS]; }; + dynamAedes = derive2 { name="dynamAedes"; version="2.1.1"; sha256="0a4wc8sx4mh2dpsp998raapi2bd5gb9bfd0b0a54z6j0lfsjkv5v"; depends=[doParallel drc fields foreach insol raster slam sp]; }; + dynamac = derive2 { name="dynamac"; version="0.1.12"; sha256="0gggzhidn5z4g7pzqx1bg56prnh9krph65k3yj677qrff12abbx9"; depends=[lmtest MASS]; }; dynamic = derive2 { name="dynamic"; version="1.1.0"; sha256="15jxly44rj2x79jvps2ln0hrm1384p56yll9jk96w1vhaf3gbsxm"; depends=[dplyr ggplot2 lavaan magrittr patchwork purrr simstandard stringr tibble tidyr]; }; dynamicTreeCut = derive2 { name="dynamicTreeCut"; version="1.63-1"; sha256="1fadbql7g5r2vvlkr89nlrjxwp4yx4xrdqmv077qvmnx9vv0f4w3"; depends=[]; }; dynamichazard = derive2 { name="dynamichazard"; version="1.0.2"; sha256="1khfy2fhvzgp165arj1yqvqi5p6lg94sxikwp5s5dxnsgzny00xm"; depends=[boot Rcpp RcppArmadillo survival]; }; dynatop = derive2 { name="dynatop"; version="0.2.3"; sha256="06wp8ld22k3r76imsj8wkrpplmbdlgbl71p94ddglwp8yfq1igsp"; depends=[R6 Rcpp xts zoo]; }; - dynatopGIS = derive2 { name="dynatopGIS"; version="0.2.3"; sha256="00mzyq2fl725yq8laijdi8v8ibq2c9ndjxx6xddbiqfyisy6g1x1"; depends=[jsonlite R6 raster]; }; + dynatopGIS = derive2 { name="dynatopGIS"; version="0.2.4"; sha256="0g4v48nvzsby6h2rr65s7palc3bsp552cmrsins56kmh0dmwdm0c"; depends=[jsonlite R6 terra]; }; 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]; }; @@ -8489,30 +8531,30 @@ in with self; { easypower = derive2 { name="easypower"; version="1.0.1"; sha256="1vf0zv55yf96wjxja6ifdjvgc9nw0jl0hnc1ygyjd8pmwbgdz9bl"; depends=[pwr]; }; easyr = derive2 { name="easyr"; version="0.5-10"; sha256="1qiw3bvhn2zdl6gzj90zl09mqk8ba6cd5pbl917hpfa818z98z82"; depends=[data_table digest dplyr foreign glue Hmisc lubridate openssl readxl readxlsb rlang rprojroot stringr XML]; }; easyreg = derive2 { name="easyreg"; version="4.0"; sha256="1w4wlhziyhdyldm0zgnm73fnxrh0fv8hwcw5j8ircxb4npx7bcgg"; depends=[nlme]; }; - easystats = derive2 { name="easystats"; version="0.5.2"; sha256="0yyvcla46yvbaa0ss2adfz5arxw6pw1if2bjf2lg9k1p6knhvs64"; depends=[bayestestR correlation datawizard effectsize insight modelbased parameters performance report see]; }; + easystats = derive2 { name="easystats"; version="0.6.0"; sha256="09a2gshg0h01w79g3zq66v5h0vbkrz9pgj3dijmccix28bmmqar3"; depends=[bayestestR correlation datawizard effectsize insight modelbased parameters performance report see]; }; eat = derive2 { name="eat"; version="0.1.3"; sha256="09lbgzc6qzvgksk0gdwlldd928mdibh5w2397nnjg4qx27lvj9yq"; depends=[conflicted dplyr ggparty ggplot2 ggrepel lpSolveAPI partykit Rdpack reshape2]; }; - eatATA = derive2 { name="eatATA"; version="1.1.0"; sha256="15fwwvgvjk87llaslz2n0sy51178b97f1apcrycw3mc23iib5r4h"; depends=[lpSolve mathjaxr Matrix Rglpk]; }; + eatATA = derive2 { name="eatATA"; version="1.1.1"; sha256="1pm66hvjqcgjbdkvfwxn3myzb6a458hkwg7cd6lhkp1mmj7anigs"; depends=[lpSolve mathjaxr Matrix Rglpk]; }; eatDB = derive2 { name="eatDB"; version="0.5.0"; sha256="0lym1g411ykb2vzi5yr570lmyh30br667wkm5dvnvfs7bsmk05il"; depends=[DBI RSQLite]; }; eatGADS = derive2 { name="eatGADS"; version="0.20.0"; sha256="1wr186fzrpi3dix27m55xvkx55rgbdzx5zgs6gngwjzljqzhwa92"; depends=[data_table eatDB eatTools haven hms plyr stringi tibble]; }; - eatRep = derive2 { name="eatRep"; version="0.14.5"; sha256="12s2qpacb15jx1ra0n8423mdk00waqhp1lb7b3cm11c5kp6kag5n"; 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.3"; sha256="13i5ldaqxx3qch6pwm647m73k7wqzv585bf6krb0yns1a3kagm76"; depends=[data_table]; }; + eatRep = derive2 { name="eatRep"; version="0.14.6"; sha256="1pmjfz2m7z0n32cdzhxjxx3cllvhrd8nap9lqbfj8avd5sbsvfbp"; depends=[BIFIEsurvey boot car combinat eatGADS eatTools EffectLiteR estimatr fmsb Hmisc janitor lavaan lme4 mice miceadds msm plyr progress reshape2 survey tidyr]; }; + eatTools = derive2 { name="eatTools"; version="0.7.4"; sha256="0qmbwwvqfkyd4z41hihza0996dvsvqshs3pqblfzdlbzyn7glh5b"; depends=[data_table]; }; ebGenotyping = derive2 { name="ebGenotyping"; version="2.0.1"; sha256="1jllzc7kvvckrws8qhgvwy626llyb68sp1davp7swx48sf7rwcxc"; depends=[]; }; eba = derive2 { name="eba"; version="1.10-0"; sha256="03jr54xq109x9bf8kcs8mi7am17l9ya3xdkdppd8imwd2paqrssk"; depends=[nlme psychotools]; }; ebal = derive2 { name="ebal"; version="0.1-8"; sha256="06hkk0fargzhzqn841c406r72y7jd53mjxgi4hzb2ahnpaiq2q1l"; depends=[]; }; ebci = derive2 { name="ebci"; version="1.0.0"; sha256="00fa2y4ha9nlbjd01qckrrn721s63ja61n5jr4wm7ac6y7xivb2i"; depends=[]; }; ebdbNet = derive2 { name="ebdbNet"; version="1.2.6"; sha256="1qzwpr76nwvgylqdg7vhrbvh2lb1zrxx3g120yz156hhs4awv4kz"; depends=[igraph]; }; - ebirdst = derive2 { name="ebirdst"; version="1.2020.1"; sha256="16k4w1nn5f2pj57k9mrgknw67svdngwmykajvcwdps763kl3s28j"; depends=[DBI dplyr gbm ggplot2 gridExtra jsonlite magrittr mgcv precrec PresenceAbsence raster rgdal rlang RSQLite sf stringr tidyr viridisLite]; }; + ebirdst = derive2 { name="ebirdst"; version="1.2021.1"; sha256="19hz86a0za72av6gdbjsxx0m0cmgrnsbqnj1kksw7zhcwsa4za6p"; depends=[DBI dplyr gbm ggplot2 gridExtra jsonlite magrittr mgcv precrec PresenceAbsence raster rgdal rlang RSQLite sf stringr tidyr viridisLite]; }; ebmc = derive2 { name="ebmc"; version="1.0.1"; sha256="1z6s1blc2b6b13pk2sd6lcczdcldgjh65cnycjcw7d2g2hnxcifh"; depends=[C50 e1071 pROC randomForest rpart smotefamily]; }; ebnm = derive2 { name="ebnm"; version="1.0-9"; sha256="0izzfylcmq6zajngjyw85kbr8jys49qcgsadqkj85v2k1hg2jw7q"; depends=[ashr deconvolveR dplyr ggplot2 horseshoe magrittr mixsqp rlang truncnorm trust]; }; ebreg = derive2 { name="ebreg"; version="0.1.3"; sha256="1xrs9afjd5hkdmhglj3md5i5hm7awlcdlccz3y2lw4c73lx31ywz"; depends=[lars Rdpack]; }; + ebvcube = derive2 { name="ebvcube"; version="0.1.2"; sha256="02zmq4437r6d2988vwlb21x6i4hgvg3mn790qqxsz5qjivpnfz21"; depends=[checkmate curl DelayedArray ggplot2 HDF5Array jsonlite memuse ncdf4 ncmeta reshape2 rhdf5 stringr terra tidyterra withr]; }; ec50estimator = derive2 { name="ec50estimator"; version="0.1.0"; sha256="1zg4p1734q2jzifzfi2lf9wz3687s3cdn0yzkiwbc6w49mgdw877"; depends=[dplyr drc magrittr tibble tidyr]; }; - ecb = derive2 { name="ecb"; version="0.4.0"; sha256="0hn1d1hxilwxxmxzzpdcj81d4vy8fbjk1z09kw7j0b2p04wrdlkc"; depends=[curl httr rsdmx xml2]; }; ecd = derive2 { name="ecd"; version="0.9.2.4"; sha256="0cdfdbkjjxs78bvvy5zrax0qgcc5fzhlxl3wqapfxigf5xlxlavh"; depends=[digest ggplot2 gridExtra gsl moments optimx polynom Rmpfr RSQLite stabledist xtable xts yaml zoo]; }; ecdfHT = derive2 { name="ecdfHT"; version="0.1.1"; sha256="1n3n9n86pj8c54l3xvp7knvi0ajbnjmz9pi79p7wfq92a90fqx48"; depends=[rgl]; }; - ecespa = derive2 { name="ecespa"; version="1.1-15"; sha256="1rr9b9bz8xqadj7mnix6dbs04dfbw8p9wyfilks9slkf1232nyav"; depends=[spatstat spatstat_core spatstat_geom spatstat_random]; }; + ecespa = derive2 { name="ecespa"; version="1.1-16"; sha256="1hlfrbwy119gwqf39z81j3nsc1y6gsyh2jy7qid7hp5llbmym10k"; depends=[spatstat spatstat_explore spatstat_geom spatstat_model spatstat_random]; }; ech = derive2 { name="ech"; version="0.1.2.0"; sha256="0xkgbqs6wmfp6a7dih4n850dw6ky596hlpmfrv72lnp77w03pll9"; depends=[assertthat curl dplyr fs geouy glue haven janitor labelled laeken purrr readxl rlang srvyr statar stringr survey tidyr]; }; echarts4r = derive2 { name="echarts4r"; version="0.4.4"; sha256="1xwr6282mnbg4hmljfanvdkya3hk8hix4g1pzw69w8x715p2b142"; depends=[broom corrplot countrycode dplyr htmltools htmlwidgets jsonlite purrr rstudioapi scales shiny]; }; - echarty = derive2 { name="echarty"; version="1.4.7"; sha256="0h2zassbc3r99466swlc5j991xpmiwqql57vwls74yn2pi1cavdc"; depends=[data_tree dplyr htmltools htmlwidgets jsonlite shiny]; }; + echarty = derive2 { name="echarty"; version="1.5.0"; sha256="0ipnci76yn8gqa5jk51aprywd54933fgqf2mdp2zfwcwirgz1642"; depends=[data_tree dplyr htmltools htmlwidgets jsonlite shiny]; }; echelon = derive2 { name="echelon"; version="0.1.0"; sha256="0dw15igx8jwgfr1f7p5pspxjiqhqmfp7shdhq8g07f4bj76irzm4"; depends=[]; }; echo_find = derive2 { name="echo.find"; version="4.0.1"; sha256="1nadqqpxgx2ck16nzjp5ajm6714452qzllg5cq1jpisv1yb31db2"; depends=[boot minpack_lm]; }; echogram = derive2 { name="echogram"; version="0.1.2"; sha256="0kir7x32fk3fc63kr3b2j0hfkmivs2pwrlxyjvdg7xqc59hjp3ma"; depends=[geosphere readHAC]; }; @@ -8522,10 +8564,10 @@ in with self; { ecm = derive2 { name="ecm"; version="6.3.0"; sha256="1g8y8wks7asjyybdh4nf19w5v8kvl56n69dl0sd0mlir98i4jmr3"; depends=[car earth lmtest sandwich urca]; }; ecmwfr = derive2 { name="ecmwfr"; version="1.4.0"; sha256="1l2w8rgxb8dphnfwvhxf09k8h79zy0qxlwz6rf2gbx0kyh5h7zi8"; depends=[curl getPass httr keyring memoise R6]; }; 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.9"; sha256="1sz58rxwkq387pbc1hdc7g0swk054shz5xpfij9wdz7llx0pjvk4"; depends=[getPass ggplot2 httr landscapemetrics lattice raster rasterDT rasterVis rlang sf sp tibble]; }; + ecochange = derive2 { name="ecochange"; version="2.9.1"; sha256="1m27m0m7ccirjdr4c76lnj1ilw979i8wfc2xjja0drcnihlbspqa"; depends=[getPass ggplot2 httr landscapemetrics lattice raster rasterDT rasterVis rlang sf sp tibble]; }; 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.9"; sha256="1m78bgbr7xjlc01q4n921y3aq2nkdbdkv9qpppfarw0d77pqpsdf"; depends=[]; }; - ecolMod = derive2 { name="ecolMod"; version="1.2.6.3"; sha256="17lsakz4kjc34v04c2j1blnskxpv4qv6phlp5ah691f2v4p147hx"; depends=[deSolve diagram rootSolve shape]; }; + ecolMod = derive2 { name="ecolMod"; version="1.2.6.4"; sha256="1kbllyh986468182q28g0hhyf2y58lcqd0wc7izi0fcw3ww2xyh6"; depends=[deSolve diagram rootSolve shape]; }; ecolTest = derive2 { name="ecolTest"; version="0.0.1"; sha256="0gkhf8gdjvkys54x0qx0h5i0lz0ksba6xdy15wzblzhym43vh9wf"; depends=[]; }; ecolottery = derive2 { name="ecolottery"; version="1.0.0"; sha256="0w5aq1aaqzz74vlj8hgnmn60l8rdrchx022dpspqnpvpzdlh65z5"; depends=[abc ggplot2]; }; econet = derive2 { name="econet"; version="1.0.0"; sha256="1igcyhn0gzv82rm5ki59ivmr3q9ryrimyfwybnppcpvg38wdpvwj"; depends=[bbmle doParallel dplyr foreach formula_tools igraph intergraph MASS Matrix minpack_lm plyr progressr sna spatstat_utils]; }; @@ -8537,7 +8579,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.3"; sha256="0gh4n6d4fcnlpp1xd12j881v40lvph4f4pg1j4hj0w17xjzz9zcf"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo ecodist foreach gbm gtools Hmisc ks maptools matrixStats nabor poibin PresenceAbsence randomForest raster sp vegan]; }; + ecospat = derive2 { name="ecospat"; version="3.4"; sha256="0l93v8rbq41ll36riq6vhb22g5prp2rnlbn8i4lq85vvg1l00zfy"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo ecodist foreach gbm gtools Hmisc ks maptools matrixStats nabor poibin PresenceAbsence randomForest raster sp vegan]; }; ecostats = derive2 { name="ecostats"; version="1.1.11"; sha256="11h5s196aap64jch1123srbwy3907cvc4vgh0lvn5wkxbszrzypc"; depends=[ecoCopula GET MASS mgcv mvabund mvtnorm]; }; ecostatscale = derive2 { name="ecostatscale"; version="1.0"; sha256="14i5wg5qxqn3qzycgqda6blb0imkckq23gl3c3whfa72a3a8y30q"; depends=[deSolve mvtnorm]; }; ecotox = derive2 { name="ecotox"; version="1.4.4"; sha256="01sc2lf2kca7wqqyd3gk48va39gb7ijzgs2smgb2k4xbzjqndg08"; depends=[tibble]; }; @@ -8555,14 +8597,14 @@ in with self; { edcpR = derive2 { name="edcpR"; version="1.0.1"; sha256="02d33cd9pkcjrbl9qipcjzkhrc68j7bybg1hpnsngiz4wmf3bfik"; depends=[]; }; eddington = derive2 { name="eddington"; version="2.1.1"; sha256="0v88v2xmvirnj661jsg2qh7n8afaw71mqks9csnmmz3c16agp7b6"; depends=[Rcpp]; }; edeaR = derive2 { name="edeaR"; version="0.9.1"; sha256="1zv6fr7n8arx610ccbml04gfrzm9ry3s0lw68hhyijw43xvxrd3z"; depends=[bupaR cli data_table dplyr ggplot2 ggthemes glue hms lifecycle lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr zoo]; }; - edecob = derive2 { name="edecob"; version="1.2.1"; sha256="1lb2df0w4hf2gchdfbyw1ykb8db5bkilgyml1lhdnv209anwjh2n"; depends=[ggplot2 rlang]; }; + edecob = derive2 { name="edecob"; version="1.2.2"; sha256="1k9790xamyw8ksfgvd8gka1f5mghfma6akdj7bqmlqv3yrlpgbxr"; depends=[ggplot2 rlang]; }; 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.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=[]; }; - edgebundle = derive2 { name="edgebundle"; version="0.4.0"; sha256="0f6kqyvx52qgm9qzl0vjlh53bdjiwscfjhk9yqvgxf9ih33718hi"; depends=[igraph interp Rcpp reticulate]; }; + edgebundle = derive2 { name="edgebundle"; version="0.4.1"; sha256="196np22ibvj31f5f45gl5ni5byj1z2h4vyxxcqarny2zfk00qg9j"; depends=[igraph interp Rcpp reticulate]; }; edgebundleR = derive2 { name="edgebundleR"; version="0.1.4"; sha256="0pajr95qqppk2m4l7rfi46rll32z8a7lmq0vmb3p8n0aks5ajn1n"; depends=[htmlwidgets igraph rjson shiny]; }; edgedata = derive2 { name="edgedata"; version="0.2.0"; sha256="11sc7x0m00yhn2c4601dpjv3brmf57i8barsl3p7bawcvka8z5lr"; depends=[]; }; edibble = derive2 { name="edibble"; version="0.1.2"; sha256="1a06p6jy7j4ml8q71s6mcpp1qm39vv7nz21ac0y0wssqmicsr5x3"; depends=[AlgDesign cli dae magrittr nestr pillar R6 rlang tibble tidyselect vctrs]; }; @@ -8570,7 +8612,7 @@ in with self; { 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]; }; + edlibR = derive2 { name="edlibR"; version="1.0.1"; sha256="0ibl8zcaf2p2xb3498zbin7g4ipanyxc9m9zkcj43h2r0304xgsk"; 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=[]; }; edstan = derive2 { name="edstan"; version="1.0.6"; sha256="1gm1rxwywigyfdlcm2yj1m9qjb4s6w7chr1ck7b32x1pdxdl3ns5"; depends=[ggplot2 rstan]; }; @@ -8592,7 +8634,7 @@ in with self; { eff2 = derive2 { name="eff2"; version="1.0.1"; sha256="0872xms2i8k128h3cn2n9dwa4apdyvxhb1h759cmyw63fw4wm8kx"; depends=[igraph pcalg RBGL]; }; effectR = derive2 { name="effectR"; version="1.0.2"; sha256="1icr1sx98x3h8rbky1agdh809arhjqcypyajl7y50yis8a5pkycb"; depends=[ggplot2 reshape2 rmarkdown seqinr shiny viridis]; }; effects = derive2 { name="effects"; version="4.2-2"; sha256="0nlj79am9a1yg737dhfa8dj1kj2hly9pfknmphsbcvlgxqn35vig"; depends=[carData colorspace estimability insight lattice lme4 nnet survey]; }; - effectsize = derive2 { name="effectsize"; version="0.8.1"; sha256="0rc4kkqp45wa5zsgyrg6wfkrz9ynwa7j71hl0swzvcp4wg2lsp06"; depends=[bayestestR datawizard insight parameters performance]; }; + effectsize = derive2 { name="effectsize"; version="0.8.2"; sha256="1ibkvvpkd4md73d53823wnwzk3iqi1k4vr99jkyiiybcn6mv5qkc"; 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=[]; }; @@ -8602,7 +8644,7 @@ in with self; { egg = derive2 { name="egg"; version="0.4.5"; sha256="1fy7srpiavfn8kyrr1m84an7acgwi6ydzrg71m3b0vk7y9ybmj0m"; depends=[ggplot2 gridExtra gtable]; }; eggCounts = derive2 { name="eggCounts"; version="2.3-2"; sha256="1hb7a78db97xz5hm311d60n2kg1wdlrf57vg4ixamqihyrcs5r4v"; depends=[BH boot coda lattice numbers Rcpp RcppEigen RcppParallel rootSolve rstan rstantools StanHeaders]; }; egor = derive2 { name="egor"; version="1.22.5"; sha256="03bsqldkvwfxwk5hy74ilhkkyhpd6sx7x39ayl0ap354gmyfmzgg"; depends=[dplyr purrr rlang srvyr tibble tidygraph tidyr]; }; - eha = derive2 { name="eha"; version="2.10.0"; sha256="03lxrdwf6kkjl6qh21xfj13956wd0b85hcj6grprnjh3hwv73m14"; depends=[survival]; }; + eha = derive2 { name="eha"; version="2.10.1"; sha256="132n988b4wpx5m2bilc9cqgpxf8j8gkhymh3xvbp88am6iy8155f"; depends=[survival]; }; ehaGoF = derive2 { name="ehaGoF"; version="0.1.1"; sha256="15hpzj3ridl6w3pd5z86d88cc88jw09qpqhsdwkar4dby8lgxhi0"; depends=[]; }; ehelp = derive2 { name="ehelp"; version="1.2"; sha256="0264nx4bidrbwhlxx9llarvh4zb3xnzln8km14823q1hclkpm2fq"; depends=[]; }; ei = derive2 { name="ei"; version="1.3-3"; sha256="0i8pvpal23zwsqldhmm3iis4vw9s08mlydpshaig2dsd9549gn11"; depends=[cubature eiPack ellipse foreach MASS mnormt msm mvtnorm plotrix sp tmvtnorm ucminf]; }; @@ -8620,9 +8662,9 @@ in with self; { eive = derive2 { name="eive"; version="3.1.0"; sha256="1livknaplgbw0338kz10hgxrwbm05hhggi5h9klfc2gpw62z6hhs"; depends=[Rcpp]; }; eivtools = derive2 { name="eivtools"; version="0.1-8"; sha256="0ynmrql6dv10m7cwba5mzwlbvp6ab53nzqqvk3ihwyiqzmnnmpk4"; depends=[R2jags]; }; eixport = derive2 { name="eixport"; version="0.5.4"; sha256="0q6djpp6x0hzzk2sh36rfgzch3n6v4af9knvwv0fnlh72n2cj0b8"; depends=[cptcity data_table ncdf4 raster rgdal sf sp]; }; - eks = derive2 { name="eks"; version="1.0.1"; sha256="0vl5q4n3jk4zx8wgq5cx6x3yrr8ivbm0ha2z0rsicf7c6ky9pmvj"; depends=[dplyr ggplot2 isoband ks mapsf sf]; }; + eks = derive2 { name="eks"; version="1.0.2"; sha256="101dq01ngixaab7zj09bcy7jyaa27qf9rb3jsz03j1mrapzipnlv"; depends=[dplyr ggplot2 isoband ks mapsf sf]; }; elaborator = derive2 { name="elaborator"; version="1.1"; sha256="1kq3qqqywpzrk1ichsljvfijhsybmj7s0scmswmwi2crqi67gzp8"; depends=[bsplus dendextend dplyr forcats haven purrr RColorBrewer reshape2 rlang seriation shape shiny shinydashboard shinyWidgets tidyr]; }; - elasdics = derive2 { name="elasdics"; version="0.2.0"; sha256="059mcnf8ym8xjibs0lkr7drvwls3qcfivlls10yl7ss4ial324qp"; depends=[numDeriv]; }; + elasdics = derive2 { name="elasdics"; version="1.1.1"; sha256="1zpwkch4h463d1ad681iid668909w74xb0wyfjqshdvznb4pxp5i"; depends=[numDeriv]; }; elasso = derive2 { name="elasso"; version="1.1"; sha256="0nz3vw803dvk4s45zc9swyrkjwna94z84dn4vfj3j17h74a0cij2"; depends=[glmnet SiZer]; }; elastes = derive2 { name="elastes"; version="0.1.6"; sha256="1j28vqiflc6ij2yp9cniqs3vcjm597mrzdjvfg3235r9m6gf5yij"; depends=[elasdics mgcv orthogonalsplinebasis sparseFLMM]; }; elastic = derive2 { name="elastic"; version="1.2.0"; sha256="0k98ziacyxl1pyhyynmswcncqwl0a05sawypncdpdd9xr77nvgi6"; depends=[crul curl jsonlite R6]; }; @@ -8631,6 +8673,7 @@ in with self; { elec = derive2 { name="elec"; version="0.1.2.2"; sha256="1qc2hzbkmxvk4zrmdr935klhxvvdc7rmximqybb5aammd351qh2a"; depends=[]; }; elect = derive2 { name="elect"; version="1.2"; sha256="1hjqhmdklspssa75x8xdhv2narqgw80qh259hyfwfgnvva97w2ja"; depends=[msm nnet]; }; elections = derive2 { name="elections"; version="1.0"; sha256="0ig3pd1dw978g2sg4ynzd3p15nk6hx17pxvbxfi5rm131mjdmjdm"; depends=[]; }; + elections_dtree = derive2 { name="elections.dtree"; version="1.1.0"; sha256="1j0knxi2vv65pizpz8v26az9k422msn8i7d55hyzy8h1q1bbcy8y"; depends=[R6 Rcpp RcppThread Rdpack testthat]; }; electionsBR = derive2 { name="electionsBR"; version="0.3.2"; sha256="05wxzfgh0f3n6w8ah32q2v4f67g6w4qri4dv1linmlax77clv9fn"; depends=[data_table dplyr haven magrittr readr]; }; electivity = derive2 { name="electivity"; version="1.0.2"; sha256="0clxsn9zkpdlq9jgq029ag310ji0hd0l23wfyqh8gkkj0091ip5a"; depends=[]; }; electoral = derive2 { name="electoral"; version="0.1.3"; sha256="0r15ghnblp5f2g9hpw187clfpj1cgplqyn9mhyvlcmz5ql60glsj"; depends=[dplyr ineq tibble]; }; @@ -8653,19 +8696,19 @@ in with self; { 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.13"; sha256="1z6yd9m6vggbp42qms2sg0rbxjpg15x9m8gkdz1p3q4aqrc2ncj0"; depends=[pscl Rcpp RcppArmadillo]; }; - emayili = derive2 { name="emayili"; version="0.7.11"; sha256="1x9wjvb314995bi0sv06p62n5x2b0lqdjjdcm2in8gdljnah0vqs"; depends=[base64enc commonmark curl digest dplyr glue htmltools httr logger magrittr mime purrr rmarkdown rvest stringi stringr tidyr urltools xfun xml2]; }; + emayili = derive2 { name="emayili"; version="0.7.13"; sha256="13ndi1khnsf75xrh04jy9jpqi94rwnwlyp3jp8b8jyyd1pplhxlw"; 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="1.0.0"; sha256="1yvw24yi4j1xlbm6w1g49mcp6wqnn69191sys1fr8wsvrag79gfn"; depends=[dplyr generics glue keras lifecycle purrr recipes rlang rsample tensorflow tibble tidyr uwot withr]; }; embryogrowth = derive2 { name="embryogrowth"; version="8.7"; sha256="1fayl1wxpw9903psrjichrbf6rx38d7shnsjpxdwljw67g6pr5g7"; 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.2"; sha256="072izm7rs728zhwa3zf30kklfy3q8xldhw62bc274dwd7axms5yh"; depends=[boot formula_tools ggplot2 gridExtra HLMdiag MASS moments MuMIn nlme openxlsx parallelMap readODS reshape2 saeRobust spdep stringr]; }; + emdi = derive2 { name="emdi"; version="2.1.3"; sha256="0s190p6zhsj2yc1xy1px5sk8aqn6q8b26g7zsnpa9rvih9h2667r"; depends=[boot formula_tools ggplot2 gridExtra HLMdiag MASS moments MuMIn nlme openxlsx parallelMap readODS reshape2 saeRobust spdep stringr]; }; emdist = derive2 { name="emdist"; version="0.3-2"; sha256="05mv6xhm15b0mq9kzyiblkb14bdqmjrwl64ghdk66il0w8i7p6nh"; depends=[]; }; 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]; }; - emmeans = derive2 { name="emmeans"; version="1.8.2"; sha256="02fj957f67m1ik9n31h1p726hjnlhwlvd1wz93glfrcagm2p6nbq"; depends=[estimability mvtnorm numDeriv xtable]; }; + emmeans = derive2 { name="emmeans"; version="1.8.3"; sha256="004fd6kzky44xixd87q2nl1sn37krmqfas5gsylbc1cbrwnjzxlz"; depends=[estimability mvtnorm numDeriv]; }; emoa = derive2 { name="emoa"; version="0.5-0.1"; sha256="0rkr4d4fyqxmsrlbzar27z97qkw4cl1dkvfnhbdwpgg9fi1cixmz"; depends=[]; }; - emoji = derive2 { name="emoji"; version="0.2.0"; sha256="06bsz0hsaqa2lzqpyqhsfp07p8ri5frvhiza0s8aali7w3cr2szh"; depends=[glue stringr tibble]; }; + emoji = derive2 { name="emoji"; version="15.0"; sha256="1xscypzz17a7nrajnl7isy2nrm9cyr97l0mi9vp0daqvzgyfajba"; depends=[glue stringr tibble]; }; emojifont = derive2 { name="emojifont"; version="0.5.5"; sha256="1hhrwilv36hd9gs1kcl2zsi6519md0h9aixjrm6lfclxvz8r6k1i"; depends=[ggplot2 proto showtext sysfonts]; }; emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; }; emov = derive2 { name="emov"; version="0.1.1"; sha256="04w0bjyxvfb4ky573byp7j9b7x4gqycr5pgpnsl6rzag00zsf45a"; depends=[]; }; @@ -8681,7 +8724,7 @@ 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]; }; + endogeneity = derive2 { name="endogeneity"; version="2.1.2"; sha256="1dmb3gnkb6nxvcyzh7vhh0ra8164b337ir7higc5d3dmmssn81yy"; depends=[data_table MASS maxLik pbivnorm Rcpp RcppArmadillo statmod]; }; endogenous = derive2 { name="endogenous"; version="1.0"; sha256="079fmfxl9gf080zq5m1ixmgry9dawg2y6ixbfyc5da5jxf3zk9h8"; depends=[mvtnorm]; }; endorse = derive2 { name="endorse"; version="1.6.2"; sha256="16cbqg3z71c36j2zzw3xr09p6kpjwim7610sss1ayjh3xs0isa2l"; depends=[coda]; }; endtoend = derive2 { name="endtoend"; version="2.29"; sha256="0dqzh2blb2h8ngchvfvnzx0gmilvx9ydvzqwfy4d9f58ixybn4d9"; depends=[ggplot2 pastecs]; }; @@ -8691,6 +8734,7 @@ in with self; { enetLTS = derive2 { name="enetLTS"; version="1.1.0"; sha256="1lah9ai9skshz0rq3r1smvy69j443m22h1dihl42gy2568998q4v"; depends=[cvTools ggplot2 glmnet reshape robustbase robustHD]; }; english = derive2 { name="english"; version="1.2-6"; sha256="1g3nmy5p8wj3ix1vp1qmkmy3dyqisrw0md8cjrx4klqkp0wqlms9"; depends=[]; }; engsoccerdata = derive2 { name="engsoccerdata"; version="0.1.5"; sha256="06fdgjgnk4lwshrkd0jad411x5nz9sxlri9fdhxrf2dr2hik4l8q"; depends=[dplyr magrittr tidyr]; }; + enmSdmX = derive2 { name="enmSdmX"; version="1.0.0"; sha256="1j0yz5s7c7sk8sk6scb389py64r6f3fqbxq0a1bi1z4ddzmiaviw"; depends=[boot dismo doParallel foreach gbm ks maxnet mgcv MuMIn omnibus randomForest scales sf terra]; }; enpls = derive2 { name="enpls"; version="6.1"; sha256="12088v9xnj5b3dlakqz1hbzxz4mdai7xi7s2fpx8lj3y3lx7znmb"; depends=[doParallel foreach ggplot2 plotly pls reshape2 spls]; }; enrichR = derive2 { name="enrichR"; version="3.1"; sha256="0ad7jp398prvmm2fym07268qhv40mg67dx55ml4ayqkwxwffr1i9"; depends=[curl ggplot2 httr rjson]; }; enrichwith = derive2 { name="enrichwith"; version="0.3.1"; sha256="05fhx323ani86wdxbjp8dgw4d1iq4kr1887646w072a6iq93bwhm"; depends=[]; }; @@ -8725,7 +8769,7 @@ 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.5.1"; sha256="12j8qmscsz381i9fs3slva2wl7pk7zxa38shaj4m595lswsixvi8"; depends=[assertthat attempt curl dplyr expss glue htmltools janitor leaflet magrittr purrr readr readxl rlang rvest stringr tibble tidyr tidyverse xml2 zoo]; }; epiDisplay = derive2 { name="epiDisplay"; version="3.5.0.2"; sha256="0430mwnaa0qamdyvmwkh37ic0kp4hq8mr5nxkc97mhhl7djw0y92"; depends=[foreign MASS nnet survival]; }; - epiR = derive2 { name="epiR"; version="2.0.52"; sha256="1jgbxl787rfqrr9jr7yzsclx1s3lr3ys2w5kg59dj8zglm0csbwj"; depends=[BiasedUrn flextable lubridate officer pander sf survival zoo]; }; + epiR = derive2 { name="epiR"; version="2.0.54"; sha256="0x8h4ry4dx01s0rvihv7qjdyhdgncjip10xi13iac6ra910znzdr"; depends=[BiasedUrn flextable lubridate officer 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]; }; @@ -8735,7 +8779,7 @@ in with self; { 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]; }; - epimdr2 = derive2 { name="epimdr2"; version="1.0-7"; sha256="1gxbp6vqk5124pi6xq7ga8dd9456b3idq2qm8wviryc1d05dqfih"; depends=[deSolve ggplot2 phaseR plotly polspline shiny]; }; + epimdr2 = derive2 { name="epimdr2"; version="1.0-8"; sha256="02iiam536jfd1wpr3glrksdpx0lqdh4k21ayy7igkv71p4y071i9"; depends=[deSolve ggplot2 phaseR plotly shiny]; }; epinet = derive2 { name="epinet"; version="2.1.8"; sha256="10bgq66n99kkz0nhmsz508aypxk57zk19p5l3xrb28n72k4rfgrf"; depends=[network]; }; epinetr = derive2 { name="epinetr"; version="0.96"; sha256="0jg8pwbxlgrk7mqawsrifk724pi5qn0amh6x2fq54a0hmqdpdjns"; depends=[GA ggplot2 igraph Rcpp RcppAlgos reshape2 vcfR]; }; episcan = derive2 { name="episcan"; version="0.0.1"; sha256="02687f8gpc2czn19lapvazd6mnm8902ay0lhgi3wdrzfhir42m4r"; depends=[]; }; @@ -8745,8 +8789,8 @@ in with self; { epitools = derive2 { name="epitools"; version="0.5-10.1"; sha256="0jqn3pas4lsans50jwakmvpyc7m7x0kxq6dzyckd3vgww56qa65l"; depends=[]; }; epitopR = derive2 { name="epitopR"; version="0.1.2"; sha256="0bqj62jl48pql7dbmq96fgs0pza3krycd9i6fj0sjz7yxg4i46q6"; depends=[Biostrings dplyr fs here httr janitor purrr readr seqinr stringr tibble tidyverse]; }; epitrix = derive2 { name="epitrix"; version="0.2.2"; sha256="1rqpvdky002h6mz636b77l4kd0im16pww62l6vnwh83si1m9pkki"; depends=[distcrete sodium stringi]; }; - 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.2"; sha256="0zcxmgqpc9v50b4dl1ksadrh4g5dpk9f5icv757pr08sp55qkrmv"; depends=[callr checkmate cli crayon data_table hms lubridate processx progress R6 RSQLite stringi units]; }; + epitweetr = derive2 { name="epitweetr"; version="2.2.13"; sha256="0vv4y1c8nfcdv2hmv6vvi5jh6ykrbvna2p2gwpcl9q4j7b4wp9jc"; depends=[bit64 crul curl dplyr DT emayili future ggplot2 htmltools httpuv httr janitor jsonlite keyring knitr lifecycle magrittr openxlsx plotly plyr processx readxl rgdal rlang rmarkdown rnaturalearthdata rtweet shiny sp stringr tibble tidytext tidyverse tokenizers xml2 xtable]; }; + eplusr = derive2 { name="eplusr"; version="0.15.3"; sha256="04qbvawxzily2cd76lahi3nba49c2j4skjvqk8xy2rin7p0w6fxs"; 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]; }; epm = derive2 { name="epm"; version="1.1.0"; sha256="0vr1qydafkj0xlm395alpjkck6ahspi89pjk3zp31f2i6cx71hcx"; depends=[ape pbapply Rcpp RcppProgress sf terra viridisLite]; }; epoc = derive2 { name="epoc"; version="0.2.6-1.1"; sha256="1qlj4cl7mh5k52v2ippfs3cish5iadnix5w46p25hjqiriksclna"; depends=[elasticnet irr lassoshooting Matrix survival]; }; @@ -8758,7 +8802,7 @@ in with self; { epubr = derive2 { name="epubr"; version="0.6.3"; sha256="1cpsxx02qcj3brr3ddy8dbnaf6wxf42s9y3kx8fq5ki3pmlwry7g"; depends=[dplyr magrittr tibble tidyr xml2 xslt]; }; epwshiftr = derive2 { name="epwshiftr"; version="0.1.3"; sha256="11vfs2r2fzbdd3r0s8ikafgq9ins06ym73wqxyijz60h75py4ic7"; depends=[checkmate data_table eplusr fst future_apply jsonlite progressr psychrolib rappdirs RNetCDF units]; }; epxToR = derive2 { name="epxToR"; version="0.4-1"; sha256="00m64ham9fd9dsw37ic2m62fy4pvmwfwmjx8cg6n4rwbgq9q49sg"; depends=[httr XML]; }; - eq5d = derive2 { name="eq5d"; version="0.12.0"; sha256="0gf7xs66j6x7yf1g7h1krig4956c2f86q9lcm9zx29dimyrq4yas"; depends=[]; }; + eq5d = derive2 { name="eq5d"; version="0.13.0"; sha256="1l4867x00iz6wq1w7glcpbmsyxy881wpng3hjf3pmr5yb8lhqmxm"; depends=[]; }; 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.2.0"; sha256="039v1lj8ydw3lji8ycklbprd569f7g0lc11sb2ij262wlr0prm1m"; depends=[katex xml2 xslt]; }; @@ -8769,25 +8813,23 @@ in with self; { 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.4.0"; sha256="1r726zcaayg6chh1466z9q4y3vd1z5hbz3kvqbfp6dqj7dx8qhgw"; depends=[pillar rlang vctrs]; }; + era = derive2 { name="era"; version="0.4.1"; sha256="10hrbdxdvfgz8namczzfwwdhzwf5gsfv6jp9ikiasmjdlyn9jpps"; depends=[pillar rlang vctrs]; }; erah = derive2 { name="erah"; version="1.1.2"; sha256="0dyjb2ja5199z8is11in11a95l2dbhaa2qj42pikh0ydk47qhd6v"; depends=[igraph ncdf4 nnls quantreg Rcpp signal XML]; }; ercv = derive2 { name="ercv"; version="1.0.1"; sha256="0rs4yhm9sjnqkrgqqy6b8wj9fgk910hxc8d7zi4qwql0v1gid27l"; depends=[]; }; erer = derive2 { name="erer"; version="3.1"; sha256="03pdq3p5c5f20959hgk5q2cx5x10bpgf0qg4z1nvsf31vc5ni77v"; depends=[lmtest systemfit tseries urca]; }; ergMargins = derive2 { name="ergMargins"; version="0.1.3"; sha256="0liq64qjd3b0v5pcsvfmvmv7dr0ak4ld2mbin8w2wcdnvpfajjy5"; depends=[btergm ergm Matrix network numDeriv sna statnet_common]; }; - ergm = derive2 { name="ergm"; version="4.2.3"; sha256="124jmrjqwiia542dn33f15r4phvadhfch4rpxdr5hi58sirm7l9m"; depends=[coda knitr lpSolveAPI magrittr MASS Matrix memoise network purrr rlang rle robustbase statnet_common stringr tibble trust]; }; + ergm = derive2 { name="ergm"; version="4.3.2"; sha256="0dghylkwy7acwjpydkbxgfp4sfs9gcgl9l038rm0393cbyfs1phq"; depends=[coda knitr lpSolveAPI magrittr MASS Matrix memoise network purrr rlang rle robustbase statnet_common stringr tibble trust]; }; ergm_count = derive2 { name="ergm.count"; version="4.1.1"; sha256="0cj9jdxxpkgvs658nxxndd9pbxb7l52vzhipkjiimd6q99hr6s24"; depends=[ergm network statnet_common]; }; ergm_ego = derive2 { name="ergm.ego"; version="1.0.1"; sha256="153xdry9y2wyqkq2hacy3gh4h6jwwyn0p0dakxmrrpfsa1my5h9f"; depends=[dplyr egor ergm network purrr RColorBrewer statnet_common survey tibble]; }; ergm_rank = derive2 { name="ergm.rank"; version="4.1.0"; sha256="1ivwqlyx48smm9dmam9z0x6yqhmy1ypmmhzfhs5j3pq5vfwfc87c"; depends=[ergm network statnet_common]; }; - ergmclust = derive2 { name="ergmclust"; version="1.0.0"; sha256="18vx02vr2wi0gw09g4hxb8glf38y06v4a0c6q666qv8bgcb0pgkw"; depends=[igraph lda MASS quadprog Rcpp RcppArmadillo viridis]; }; ergmharris = derive2 { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; }; - ergmito = derive2 { name="ergmito"; version="0.3-0"; sha256="0ajfx8g31p0lf0ajrgssb9lkhs1bxkz19z3q99l500znlivc2fy2"; depends=[ergm MASS network Rcpp RcppArmadillo texreg]; }; erify = derive2 { name="erify"; version="0.4.0"; sha256="014q4crfa92i4fb4mrbl68ai0l8asjwwnv3l2m11gfnny41p4bks"; depends=[glue]; }; erp_easy = derive2 { name="erp.easy"; version="1.1.0"; sha256="193n45w0rq3cy0nmxvv0h6s3yr8kfjlg90nd4dnqlsq85zlsizij"; depends=[gtools plyr signal]; }; err = derive2 { name="err"; version="0.2.0"; sha256="1915b0vmqdd8whwdrqjphld1jaxawh5b7di6wf7q3sx779lblsrs"; depends=[]; }; errint = derive2 { name="errint"; version="1.0"; sha256="1ya7fsvwhmgxw87r32m4345n8pw2pbpv026xvml03s1kiam8qwbw"; depends=[rootSolve VGAM]; }; errorist = derive2 { name="errorist"; version="0.1.0"; sha256="0zq5h2wffn9d3f3blzh736478k91smlvz5hxy55hcjqffpxcp4ah"; depends=[searcher]; }; errorlocate = derive2 { name="errorlocate"; version="1.1"; sha256="1p9a5nc0ckbdapahf5nkxnsgwvqh2llv3kc2wzwawn131rdaj1qi"; depends=[lpSolveAPI validate]; }; - errors = derive2 { name="errors"; version="0.3.6"; sha256="1404314glbqnicrwnfzmxxf7l97pgrb2gjkgkwn100p0sj83kjdg"; depends=[]; }; + errors = derive2 { name="errors"; version="0.4.0"; sha256="15hmsyfcsjy33601a7v2r7sfk2kxbm4a8xwkgjppmf84vhpqplbx"; depends=[]; }; errum = derive2 { name="errum"; version="0.0.3"; sha256="18frrfnhnmg4fjlpfwj8aklzfwafpwqvagm0aschkqc8mz6wnjbz"; depends=[Rcpp RcppArmadillo]; }; es_dif = derive2 { name="es.dif"; version="1.0.2"; sha256="1swxg8mdp9jj9f0x0cawhhbx8gmmpsgqlbifx2v04a2vkgdkigqf"; depends=[]; }; esDesign = derive2 { name="esDesign"; version="1.0.3"; sha256="0lnz40d8s9pmxccsbd9g80n0k454xgicjfdpbfrq7rnyb4pdk9l2"; depends=[]; }; @@ -8802,7 +8844,7 @@ 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]; }; - espadon = derive2 { name="espadon"; version="1.1.1"; sha256="0blawgnw2zg3pyrzzfsf5iriqml0z5fhcws2pnah2b3pzl336q5w"; depends=[colorspace DT igraph js mathjaxr Matrix misc3d openxlsx progress qs Rcpp Rdpack rgl Rvcg shiny shinyWidgets sp]; }; + espadon = derive2 { name="espadon"; version="1.2.0"; sha256="06lri62bpv4hspvwwxq5r1qypj63jw9kshz4wplmywazf8bpif61"; depends=[colorspace DT igraph js mathjaxr Matrix misc3d openxlsx progress qs Rcpp Rdpack rgl Rvcg shiny shinyWidgets sp]; }; esquisse = derive2 { name="esquisse"; version="1.1.2"; sha256="180kdcqf93rkfzmjlysi53646ypkqi1r383n8p9jmj6xh9aag8rl"; depends=[datamods ggplot2 htmltools jsonlite phosphoricons rlang rstudioapi scales shiny shinyWidgets]; }; esreg = derive2 { name="esreg"; version="0.6.0"; sha256="0q8na05dq1gacpijv005bzan8skyzzhj8z00fzx46d27xdz7qisw"; depends=[Formula quantreg Rcpp RcppArmadillo]; }; ess = derive2 { name="ess"; version="1.1.2"; sha256="1cmw20nn39ssyqiyn50w0ws28mq4cd26yhzr7mv97haaqjjjkv5h"; depends=[igraph Rcpp]; }; @@ -8812,11 +8854,13 @@ in with self; { estadistica = derive2 { name="estadistica"; version="0.2.2"; sha256="05ad1wfy4682icprp7jgx09p8azjnk8wlxhpzjdkm6mz0ix7zqp5"; depends=[data_table dplyr forecast ggplot2 gridExtra knitr 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.4.1"; sha256="090i1xwdp4fwj8jr8nk13w49516lfkk5mq1w7l0lff9g8lgaynn6"; depends=[]; }; + estimateW = derive2 { name="estimateW"; version="0.0.1"; sha256="0fgbyfnxxs6kp9p17ljvj72q5vd4xn7kwh4zbmzjx45cdq101bjv"; depends=[Matrix matrixcalc plot_matrix R6]; }; estimatr = derive2 { name="estimatr"; version="1.0.0"; sha256="1px9j7nlxgx5g7fi57hpx0fsjxhkwjcxbkic0lqf1m3pgxxcxj59"; depends=[Formula generics Rcpp RcppEigen rlang]; }; estimraw = derive2 { name="estimraw"; version="1.0.0"; sha256="0z591mblbzc3qv9pyv8zn0r5r3d8f1l02sxdc649gl1lb40kalz0"; depends=[dplyr]; }; estmeansd = derive2 { name="estmeansd"; version="1.0.0"; sha256="1jmi78gmddhqpg3n7jywkbsq8amxa641s8rhzzg6jmmh4w09dg9s"; depends=[metaBLUE]; }; estprod = derive2 { name="estprod"; version="1.2"; sha256="0pnpg8w6i1dmkcn6afj2jsm5mzvbxka80np1bldcxgmylrp5s35p"; depends=[boot Formula gmm lazyeval minpack_lm]; }; esvis = derive2 { name="esvis"; version="0.3.1"; sha256="0bb91khnrn8v3d6hbbin72032w7w8p0jchbr0bzwyfq5f6l4hwka"; depends=[dplyr ggplot2 Hmisc magrittr purrr rlang sfsmisc tibble tidyr]; }; + et_nwfva = derive2 { name="et.nwfva"; version="0.1.1"; sha256="01jhy5043axgmv51ri2k3gl1shvsh569h9xy4y1ya1qjpdlbv0ky"; depends=[]; }; etable = derive2 { name="etable"; version="1.3.1"; sha256="17dga1hz29jjdclhhwn1hrvlkdfbcbqmk233vc00s59pbmgsav06"; depends=[Hmisc]; }; etasFLP = derive2 { name="etasFLP"; version="2.2.0"; sha256="1030l3g6hghgcmji934g5pc01p2hld09mv3zna58xzzb4wsmz167"; depends=[fields mapdata maps]; }; ether = derive2 { name="ether"; version="0.1.6"; sha256="1f3phh5vdfvlxqrpzsn6ysz0q3mbhr862fzsd3sp8m8qhry86cbx"; depends=[dplyr httr jsonlite Rmpfr]; }; @@ -8830,8 +8874,8 @@ in with self; { etrunct = derive2 { name="etrunct"; version="0.1"; sha256="0ayazgyqlc8jcqr03cwfmfhm4pck6xri1r6vkgqy4arqkrrnrcqr"; depends=[]; }; 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.4.2"; sha256="0xyxdn0qqp7irwj0g6fpm16c1qr88l7bq0s3bjb8anrk0fisfghp"; depends=[antiword curl dplyr httr magrittr pdftools readr rlang rvest stringr tidyr xml2]; }; + eulerr = derive2 { name="eulerr"; version="7.0.0"; sha256="16a84a2xgv1iqsir0hzn6qclljni4f3prpycb7qpp06vrd0yn8lw"; depends=[GenSA polyclip polylabelr Rcpp RcppArmadillo]; }; + eurlex = derive2 { name="eurlex"; version="0.4.4"; sha256="0ncbzixrr0fxjgyhwjwa2y8aqpq7c9m9v3g733n2zg88jpkqqr0q"; depends=[antiword curl dplyr httr magrittr pdftools readr rlang rvest stringr tidyr xml2]; }; eurocordexr = derive2 { name="eurocordexr"; version="0.2.2"; sha256="081p9qs09xif2cck0gmmqgzaly1r2p77kla2nhcvjgxgdylbsdkd"; depends=[data_table fs lubridate magrittr ncdf4 ncdf4_helpers PCICt]; }; eurodata = derive2 { name="eurodata"; version="1.5.0"; sha256="00h8pnfvg5bq7174pzj7773xcm2h2gw88kjh9skxjs8zhrqafipk"; depends=[data_table magrittr memoise R_utils Rcpp stringr xml2 xtable]; }; europeanaR = derive2 { name="europeanaR"; version="0.1.0"; sha256="11cr8n64yv50zwib9wkvk1j43p9a1cmxmzznxykczv43l193kjg7"; depends=[data_table httr jsonlite magrittr Rdpack]; }; @@ -8842,7 +8886,7 @@ in with self; { evabic = derive2 { name="evabic"; version="0.1.1"; sha256="0f34shsacf9lyb2hlp2f0nhqy2ihy1zqg52npx8ap2li0s4y0x24"; depends=[]; }; evalITR = derive2 { name="evalITR"; version="0.3.0"; sha256="16xx6blq51hck04zxvya4iyv9d6i1zkrqyfg10vc0kc3626vnlrn"; depends=[dplyr MASS Matrix quadprog]; }; evalR = derive2 { name="evalR"; version="0.0.1"; sha256="0gb9bi9kfpqv0asbrcz2kdf1grxbjipdq97jmlgbzr5rn9jski01"; depends=[Rcpp]; }; - evaluate = derive2 { name="evaluate"; version="0.17"; sha256="0qx9dgwcz0xmf4k8hy45p50dhb3nldhmhmg5y0d92rxr9k4l7is9"; depends=[]; }; + evaluate = derive2 { name="evaluate"; version="0.18"; sha256="0dmznan8zajzb5f31yabcgpkinlqczz59i1rg9f6sa5cjzffqkkz"; 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-6.1"; sha256="0wc95hfj0gwkyghipdrhwd3s6q2agh9x2wy6y7dr6mjw7wnmjb36"; depends=[]; }; @@ -8861,19 +8905,20 @@ in with self; { 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]; }; - evolqg = derive2 { name="evolqg"; version="0.2-9"; sha256="1y1pq2hdilqkj6hk02km9aaaynz1calcw00r5k1rxlc4wfq1wx70"; depends=[ape coda expm ggplot2 igraph Matrix MCMCpack mvtnorm plyr Rcpp RcppArmadillo reshape2 vegan]; }; evolvability = derive2 { name="evolvability"; version="2.0.0"; sha256="0l81d48zvvnbxlx1mj4qwga1kdzk05pzdvsp4ghi93pzzynfqn9s"; depends=[ape coda lme4 Matrix]; }; evoper = derive2 { name="evoper"; version="0.5.0"; sha256="064fcpd04ws8v6sl0bakiw34jmmfpg1w5pkq94y2gh1c576x4vwz"; depends=[boot data_table deSolve futile_logger ggplot2 plot3D plyr reshape RNetLogo rrepast]; }; evtclass = derive2 { name="evtclass"; version="1.0"; sha256="1ny43sry257cxlg56f0lj1szv9ci3ymskj6l5sn43l5a2pq62g4l"; depends=[evd fitdistrplus RANN]; }; evtree = derive2 { name="evtree"; version="1.0-8"; sha256="1dmzbsyrg8wwzzqcxzqmgm7yai37lh9lkjhizhr2h0k03s5xdv1k"; depends=[partykit]; }; ewoc = derive2 { name="ewoc"; version="0.3.0"; sha256="0r8b5vq0qzp3f0dasxmrngldqlymca90sj019rzs1a0qf28wlgbr"; depends=[coda doParallel doRNG foreach Formula ggplot2 rjags]; }; exCon = derive2 { name="exCon"; version="0.2.5"; sha256="0gqnv01dw4ncf3x3p74pc6f14a1ixq7icl2p18hsmvxdqqg7kgy7"; depends=[jsonlite]; }; + exDE = derive2 { name="exDE"; version="1.0.0"; sha256="15z1gdbpnps9idlw8bw3n0wsayjpvv0f5mb8hihi0kvbys8q4sfa"; depends=[deSolve expm MASS]; }; exact_n = derive2 { name="exact.n"; version="1.1.0"; sha256="0sjiv55455274d2gfhkkdwbpq15wka947ajn9gyypfyc4fmzbqcn"; depends=[]; }; exact2x2 = derive2 { name="exact2x2"; version="1.6.6"; sha256="1c7lsl2zvnighzylp7z3w74rl7p8zfg0fphw5fxv2i0m8sslzq73"; depends=[exactci ssanv]; }; + exactLTRE = derive2 { name="exactLTRE"; version="0.1.0"; sha256="0fhzymvsmp1hcq32nwka745jhbf51iyb9hp6ix9rm88kyclcwhrl"; depends=[matrixcalc popdemo]; }; exactRankTests = derive2 { name="exactRankTests"; version="0.8-35"; sha256="1qv9i57chhz8xiv0j8r47rbigyqs72fa7ssz99inyc0s8gzskd3y"; depends=[]; }; exactci = derive2 { name="exactci"; version="1.4-2"; sha256="08phqmpj7f6mjbwfnykqmfmg7g9h6ksj3hyryn79d7kwxyh994i7"; depends=[ssanv testthat]; }; - exactextractr = derive2 { name="exactextractr"; version="0.9.0"; sha256="13di9s0lv9kdv2p3hp9ksrr0rh98z6m998pj5a1xq9zl6iakankh"; depends=[raster Rcpp sf]; }; - exampletestr = derive2 { name="exampletestr"; version="1.6.5"; sha256="144rfi83g79xhw3v5vn4qfqmxixy9pk2ir8dm42qk0jhd9v2awng"; depends=[checkmate fs magrittr ore purrr readr rlang roxygen2 rstudioapi strex stringr styler usethis withr]; }; + exactextractr = derive2 { name="exactextractr"; version="0.9.1"; sha256="18glacc1v0kj65g6fbqnhvgg83sr334chdfll7nhjnx44my3dkzh"; depends=[raster Rcpp sf]; }; + exampletestr = derive2 { name="exampletestr"; version="1.7.0"; sha256="0853p0w4qcd76h964bxvmlnzbhgxp7cv057lczgw0y4h73hk85fq"; depends=[checkmate fs magrittr purrr readr rlang roxygen2 rstudioapi strex stringr styler usethis withr]; }; exams = derive2 { name="exams"; version="2.4-0"; sha256="0g2m51i7lf62hy4v9ns3l7bv3jh367fwi6hgz94iw7n8pjhkh47v"; depends=[base64enc knitr rmarkdown]; }; exams_mylearn = derive2 { name="exams.mylearn"; version="1.4"; sha256="0cswbynd1acrvdwhgg3vlgl80v0qk22kg2hacbc6y08s4367srly"; depends=[exams glue pkgbuild stringi stringr xml2]; }; exams2learnr = derive2 { name="exams2learnr"; version="0.1-0"; sha256="0laimld71p3w2r01d0xm7ly7brvahhagmx4972amv4xvn66y3xv4"; depends=[exams knitr learnr rmarkdown]; }; @@ -8889,30 +8934,31 @@ in with self; { exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; }; exifr = derive2 { name="exifr"; version="0.3.2"; sha256="0iqm513h7951q3hg8maf2hbprqmsm93cb3mbg3g91qawpx77494c"; depends=[curl jsonlite plyr rappdirs tibble]; }; exiftoolr = derive2 { name="exiftoolr"; version="0.2.0"; sha256="17s4rk3fn4lh1hqnayya32rcb28j59hpq4rqfb8w6m96zxx8l44n"; depends=[backports curl data_table jsonlite zip]; }; - exp2flux = derive2 { name="exp2flux"; version="0.1"; sha256="1b3ychb4wcf6dbccx2ddms5xygdgc296cnw4474fm81yrfjznplv"; depends=[gage igraph sybil]; }; expDB = derive2 { name="expDB"; version="0.1.0"; sha256="0h7f9127vrd45lg7k0bkgq3cghxwv2z11p4pak20pakk13g82hj4"; depends=[DBI dplyr lubridate magrittr png readxl reshape2 rlang RSQLite stringr tibble tidyr tidyverse weaana]; }; expSBM = derive2 { name="expSBM"; version="1.3.5"; sha256="0k8nkwqrcmmhv0x8a2np1rm5cyc9glyvndwdbnp03v0wrg8121sw"; depends=[blockmodels gtools mclust Rcpp RcppArmadillo]; }; expandFunctions = derive2 { name="expandFunctions"; version="0.1.0"; sha256="0661l4ab0xhjidmh8ycvymhp3wgxafm7nd1c59bfpxhyhz76n1p4"; depends=[glmnet orthopolynom plyr polynom]; }; expectreg = derive2 { name="expectreg"; version="0.52"; sha256="1cb2k3ndzxw9sd9znmmd0f2pfpa1lvvvm9vvj3z44b4vcb2lf9vl"; depends=[BayesX colorspace fields Matrix mboost quadprog Rcpp RcppEigen]; }; experDesign = derive2 { name="experDesign"; version="0.1.0"; sha256="1v2j3jyxyzwkzc3y5n6pzd31yigkfwcmf12df3104m3kn86iq81r"; depends=[]; }; + experiences = derive2 { name="experiences"; version="0.1.1"; sha256="1fqcq9jaw79nafm4qqbwm9qg2xlscjcyx3rmk7677xxrz7kywn94"; depends=[cli dplyr huxtable magrittr scales stringr tibble]; }; experiment = derive2 { name="experiment"; version="1.2.1"; sha256="0lzxwpcz7m4wngfw0wyazkhh4icn9zjd8jmgf6ym2zzk3xc4dji1"; depends=[boot MASS]; }; experimentr = derive2 { name="experimentr"; version="0.1.0"; sha256="0ji2031r108rzna00zhsh70kfcnhcscz0an0jv0vvj00hrakl0yr"; depends=[]; }; expint = derive2 { name="expint"; version="0.1-8"; sha256="1cn6c84pqf8bgk109qm4znn186h6s6cpll3d11cw144h0vh4yr8j"; depends=[]; }; - expirest = derive2 { name="expirest"; version="0.1.3"; sha256="0bjwia1fvavids4yfac085wqg6sraxs30vwmk6jbls5r0ki1ijva"; depends=[ggplot2]; }; + expirest = derive2 { name="expirest"; version="0.1.5"; sha256="08gwy1fikj7kg7h6fc7w15621jc0prdqdhzx14ad6dvdi5rd33gv"; depends=[ggplot2 rlang]; }; 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.9.0"; sha256="0hi4aqjgj66v69ip821jd7l7c8viq39g9mp9jhxy8h79cf6k65br"; depends=[assertthat broom dplyr DT forcats ggplot2 gridExtra magrittr MASS rlang rmarkdown rpart rpart_plot shiny stringr tibble tidyr]; }; + explore = derive2 { name="explore"; version="1.0.0"; sha256="0ihg4yd9k979aidjmcnvy65zlwqpyssw1d7p8i0d8z7aim7g2kqd"; 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]; }; + export = derive2 { name="export"; version="0.3.0"; sha256="1b238d6aa1m2pcg7vdjbrvjj748j3fim5zvhng7lgkag2rzjqa56"; depends=[broom devEMF flextable officer openxlsx rgl rvg stargazer xml2 xtable]; }; 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.11.2"; sha256="12hg75k1mmbkf9rcdz9c13c36cjh7x2zj0mpwh3kwk6jv63cqn1c"; depends=[data_table htmlTable maditr matrixStats]; }; - expstudy = derive2 { name="expstudy"; version="1.0.2"; sha256="1c83lad5pva1wsbgmdcbl10c3xnkmiklpjk6hiik0p79n8vqv2mm"; depends=[assertthat checkmate data_table dplyr dtplyr glue lifecycle magrittr pillar purrr rlang stringr tibble tidyr tidyselect]; }; + expss = derive2 { name="expss"; version="0.11.4"; sha256="1c7a50dv265872ng891jcipa5anrq5c5xpx81rix85l95mzwfzix"; depends=[data_table htmlTable maditr matrixStats]; }; + expstudy = derive2 { name="expstudy"; version="1.0.3"; sha256="0xvrwhgfwddgn943shpmh8ifsa7hyandrpgp1yg9n9iqwmmddg77"; depends=[assertthat checkmate data_table dplyr dtplyr glue lifecycle magrittr pillar purrr rlang stringr tibble tidyr tidyselect]; }; exreport = derive2 { name="exreport"; version="0.4.1"; sha256="0vj60rchhrc5q6x1kv7b95fcmh2a5qynli2w54rrrw1nx54xm8c2"; depends=[ggplot2 reshape2]; }; extRC = derive2 { name="extRC"; version="1.2"; sha256="0mkvic9nr0asd0g04nlfiy81d7am9a3i65ibxyvbdwsxnf92p8ya"; depends=[MASS]; }; extRatum = derive2 { name="extRatum"; version="1.0.4"; sha256="1w4xfr7ps565xczmn6pr7g4551rj28df1j0y9vckvxdbb4dk1p11"; depends=[dplyr sf tidyr]; }; - extRemes = derive2 { name="extRemes"; version="2.1-2"; sha256="19q560prq02h3bwk01jb68693qb5bhsv8wiqhia7v5knm34qv8x7"; depends=[distillery Lmoments]; }; + extRemes = derive2 { name="extRemes"; version="2.1-3"; sha256="0h1w177vz3z58vbqrfbiqapf9z2qsd7gcbv8fnbyn0i5akfz1k71"; depends=[distillery Lmoments]; }; extdplyr = derive2 { name="extdplyr"; version="0.1.5"; sha256="1zbnp0h0lv1dr40dhdw6ii8rmc5lxcq4wjsm83xpd3y8x9xpglnl"; depends=[dplyr lazyeval tidyr]; }; extendedFamily = derive2 { name="extendedFamily"; version="0.2.1"; sha256="0h1wply55cjclhblxmb4pd9qmiwk8vha7vk0i00ab46n7dc1yqa0"; depends=[assertthat numDeriv]; }; exteriorMatch = derive2 { name="exteriorMatch"; version="1.0.0"; sha256="0cdfj1n502iws1g03rk7x0c18zyazqf3vci9kjm6lrv4j2qwrvip"; depends=[]; }; @@ -8922,13 +8968,13 @@ in with self; { extrafontdb = derive2 { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; }; extrafrail = derive2 { name="extrafrail"; version="1.2"; sha256="1yzbpzfqf1l0530m1qyw0c781rvyj3czfv5jxg0s4ss4srj2kzzb"; depends=[expint pracma survival]; }; extraoperators = derive2 { name="extraoperators"; version="0.1.1"; sha256="1clyp97ssmdq9ggbv3w5yskx7khnlm4ji7ym3k3b4bx1pazcw4q4"; depends=[]; }; - extras = derive2 { name="extras"; version="0.4.0"; sha256="0c2r5b3fhwv2spvakxilz46pdv8q9b0s0sii2gl8zm2cv83zmsyj"; depends=[chk lifecycle]; }; + extras = derive2 { name="extras"; version="0.5.0"; sha256="1y9i2vxp06yy0p26n8l4ky9i5zwdhdny1nw62lk6h3yk4rn63qca"; depends=[chk lifecycle]; }; extraterrestrial = derive2 { name="extraterrestrial"; version="0.1.0"; sha256="0clss1zwgw1497n2xif82kplr1w1ajs4xs02041ads3l8craj7y1"; depends=[]; }; extremeIndex = derive2 { name="extremeIndex"; version="0.0.3"; sha256="19zkqabk7n5v4nnwlkxbrym4rf1ljbpblggiqd9s9f6ylir417pv"; depends=[boot evd evir gmm]; }; - extremeStat = derive2 { name="extremeStat"; version="1.5.2"; sha256="1cq1wfjdq3kmcaygyd158g660hr3b7zbl7hy6sn7gcz83fycihnq"; depends=[berryFunctions evd evir extRemes fExtremes ismev lmomco pbapply RColorBrewer Renext]; }; + extremeStat = derive2 { name="extremeStat"; version="1.5.3"; sha256="17l7ccnyg09dg9a3204b51axmj46gghmlqkd4kq6fsldmwic1zv6"; depends=[berryFunctions evd evir extRemes fExtremes ismev lmomco pbapply RColorBrewer Renext]; }; extremefit = derive2 { name="extremefit"; version="1.0.2"; sha256="07gx6dp0kz4y1jn90hsfvkhn6k7i4flh7ghdz9v5nwda86f55q2s"; depends=[]; }; extremevalues = derive2 { name="extremevalues"; version="2.3.3"; sha256="0ijha5zzmv3qr0czm4qxk28kg3ql5jh3nk9fr0flzl8d9n3z0jx6"; depends=[gWidgets2 gWidgets2tcltk]; }; - extremis = derive2 { name="extremis"; version="1.2"; sha256="1gvizxv1ay788a21qjslrmi7qdbr8s2ryibyri6sp7xdkaqiixsn"; depends=[emplik evd MASS]; }; + extremis = derive2 { name="extremis"; version="1.2.1"; sha256="11y3cb5z6vsrpdffdr44afz3is0ikxvpb81a8pwc7p8q63rxq4a2"; depends=[emplik evd MASS]; }; extremogram = derive2 { name="extremogram"; version="1.0.2"; sha256="13k869v6j4ik9p8w0gf1absvb45xbd3nnwghsz0ix7y0vyvry358"; depends=[boot MASS]; }; exuber = derive2 { name="exuber"; version="1.0.0"; sha256="05p6izwcw3qr6rl9f0qj96g4inn1hlacy7mmnr1mh0vz9x4b2mig"; depends=[cli doRNG doSNOW dplyr foreach generics ggplot2 glue lubridate progress purrr Rcpp RcppArmadillo rlang tibble tidyr]; }; eye = derive2 { name="eye"; version="1.2.1"; sha256="0la9hlpryqczi6v6pyjx2hdhhdgm3aijs45v1nj76a867zmf77k9"; depends=[cli dplyr english lubridate magrittr pillar purrr rlang stringr tibble tidyr tidyselect]; }; @@ -8947,7 +8993,7 @@ in with self; { ezglm = derive2 { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; }; ezknitr = derive2 { name="ezknitr"; version="0.6"; sha256="060a2175zh1nhzmqgz1mpj2c6721n5w5bv695jj4rbl2s2b2h4qj"; depends=[knitr markdown R_utils]; }; ezmmek = derive2 { name="ezmmek"; version="0.2.4"; sha256="0x62nzs1kayv95a6ldav732v79gahrri2khy1w678rxbzfx5wkqy"; depends=[assertable dplyr ggplot2 magrittr nls2 purrr rlang tidyr]; }; - ezplot = derive2 { name="ezplot"; version="0.7.3"; sha256="07lndf2g4z6gcrg85linjiph04464k3ccxcw0n3zd75zxqbsrhfr"; depends=[dplyr forcats ggplot2 lubridate rlang]; }; + ezplot = derive2 { name="ezplot"; version="0.7.5"; sha256="1706cb52pl9v7r3mrlcjvybb2b2r5x92sw7dmk1hk34w7wp4sifx"; depends=[dplyr forcats ggplot2 lubridate rlang]; }; ezr = derive2 { name="ezr"; version="0.1.5"; sha256="0r4zq0864xpnmczg1zpaasi348j1fllrn0rqfa5fmjh245chcpd4"; depends=[data_table DT ggplot2 ggridges moments shiny shinydashboard weights]; }; fANCOVA = derive2 { name="fANCOVA"; version="0.6-1"; sha256="04mw0blgpwdk6wdg8llrig43psgc0vb42cbimvzbnym8v503dsn3"; depends=[]; }; fAssets = derive2 { name="fAssets"; version="3042.84"; sha256="0aj3gjd54ajviikwh075bympw7dx2dcsgj5p8j96vx2qbbwjmgvb"; depends=[ecodist energy fBasics fMultivar MASS mvnormtest robustbase sn timeDate timeSeries]; }; @@ -8955,11 +9001,12 @@ in with self; { fBonds = derive2 { name="fBonds"; version="3042.78"; sha256="1yb5vyqj66m82xks5qi5cnsppylpprbk656z4lxzg30873hi8pcf"; depends=[fBasics timeDate timeSeries]; }; fCopulae = derive2 { name="fCopulae"; version="4021.84"; sha256="1c0alrrf85biqdwwdjcnn2k06jkhbligvlkgxbbj5jv3pjvf6s19"; depends=[fBasics fMultivar timeDate timeSeries]; }; fExtremes = derive2 { name="fExtremes"; version="4021.83"; sha256="0i0sabk5clk50r9qk69d0rqzkx95x3x9fnwqr8kx40d7v55s1blb"; depends=[fBasics fGarch timeDate timeSeries]; }; - fGarch = derive2 { name="fGarch"; version="4021.88"; sha256="10wrbcgi6v0cpy6rpwln42bhlwds1nm40mg6jwqv4pxzxhx4zlwi"; depends=[fastICA fBasics Matrix timeDate timeSeries]; }; + fGarch = derive2 { name="fGarch"; version="4022.89"; sha256="1v60k30lsdhpilpqwl9yl6mifr6aanwd8bq9byhl9wfmv5xp5a5l"; depends=[cvar fastICA fBasics Matrix timeDate timeSeries]; }; fHMM = derive2 { name="fHMM"; version="1.0.3"; sha256="1jv1pfaxmma3lq7igxdckl650hxa682v1brsq6h03h97jnhlyaw5"; depends=[foreach MASS progress Rcpp RcppArmadillo]; }; fICA = derive2 { name="fICA"; version="1.1-2"; sha256="0dqw3qybnpdnvhfh5inkc4011bzhsxvhpv8zzmkm3q5m6hkc6rlg"; depends=[JADE Rcpp RcppArmadillo]; }; fImport = derive2 { name="fImport"; version="4021.86"; sha256="011hrbwxf6v4abxsk4zw26awnh1nxmn3vgsx58awbx2jg6gcc9cj"; depends=[timeDate timeSeries]; }; fMRIscrub = derive2 { name="fMRIscrub"; version="0.11.2"; sha256="0n8vc5l7y14ifsw4lkgk9jvmplxfimi4l9a4spzw3daaqjk3cph5"; depends=[e1071 MASS pesel robustbase]; }; + fMRItools = derive2 { name="fMRItools"; version="0.1.3"; sha256="0c4gkjrki9126blaq1iy32q1rraw8kp3vwqf50ncwhhc7msjsf37"; depends=[pesel robustbase]; }; fMultivar = derive2 { name="fMultivar"; version="4021.83"; sha256="09jb2zhyji2yxn5ks1ghi33y83vlpkyacxqc0g223fl62ff2ac6d"; depends=[cubature fBasics mvtnorm sn]; }; fNonlinear = derive2 { name="fNonlinear"; version="4021.81"; sha256="1dpzg880wnja357qy3r4v5qbqhx7pkknd0rph75xvvn38p4rc0ca"; depends=[fBasics timeDate timeSeries]; }; fPortfolio = derive2 { name="fPortfolio"; version="3042.83.1"; sha256="1knyrjgfzwf4ppvnb5n325p5f6sidr6q53ss0zw8binhj22gli4y"; depends=[fAssets fBasics fCopulae kernlab MASS quadprog Rglpk rneos robustbase Rsolnp slam timeDate timeSeries]; }; @@ -8970,7 +9017,6 @@ in with self; { fUnitRoots = derive2 { name="fUnitRoots"; version="4021.80"; sha256="1ycsa5mw43mdrp4xb39j8n0c393qmmnyc7ncbkcjgyms2xk8fhjh"; depends=[fBasics timeSeries urca]; }; fabCI = derive2 { name="fabCI"; version="0.2"; sha256="1vga322xpqzsh40n74v8vqiq8zbzrabvg58mp50bcx2ml0dikgnm"; depends=[MASS]; }; fabMix = derive2 { name="fabMix"; version="5.0"; sha256="1gii3mdii9nw423xxn9mhv1pjbw967wdarn828w04zm9dkdcwm48"; depends=[coda corrplot doParallel foreach ggplot2 label_switching MASS mclust mvtnorm RColorBrewer Rcpp RcppArmadillo]; }; - fabisearch = derive2 { name="fabisearch"; version="0.0.4.4"; sha256="02xpndws34wh6kfk677kmpnhhxyxnwpg6asdfdn3wr44rcr7zk2v"; depends=[doParallel doRNG foreach NMF pkgmaker reshape2 rgl]; }; fable = derive2 { name="fable"; version="0.3.2"; sha256="0wwxh76s2f3lgqj2k7l5dd8i215qq55y81pjwrf2fsq0ij99p9br"; 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]; }; @@ -8979,6 +9025,8 @@ in with self; { fabricerin = derive2 { name="fabricerin"; version="0.1.2"; sha256="0ynvnxzxx1iybyy5pvwfsj5y9jjixyrpji9vcl5fq5mjnpg8mpqk"; depends=[glue htmltools]; }; face = derive2 { name="face"; version="0.1-7"; sha256="08ri7mrp3az82x3yyydg7vrla8cdl8bxpcnxfv4cfdhxslks9qb7"; depends=[Matrix matrixcalc mgcv]; }; facebookadsR = derive2 { name="facebookadsR"; version="0.1.0"; sha256="1jj3kq7j4ifscj7vbhnp738ny866njkdxi1n0scc0cyxq8gc7glj"; depends=[jsonlite]; }; + facebookleadsR = derive2 { name="facebookleadsR"; version="0.1.0"; sha256="0azy822s5266vxk0fvxfkgl9i3q3djv7yh3w53znjjvfmmzj1qwz"; depends=[jsonlite]; }; + facebookorganicR = derive2 { name="facebookorganicR"; version="0.1.0"; sha256="0j4zx4gf3k81pv5kfq3ki44rfn1411n7840m1zih3hfvpdd761a0"; depends=[jsonlite]; }; facerec = derive2 { name="facerec"; version="0.1.0"; sha256="1dipcnxjz6yd34w0jrrvj5p0pwdgz1l5m9zvri7mflnz7g34gmaj"; depends=[dplyr httr jsonlite knitr magrittr rlang snakecase stringr]; }; 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]; }; @@ -8998,7 +9046,7 @@ in with self; { fairmodels = derive2 { name="fairmodels"; version="1.2.1"; sha256="0wxk2z5xh2dc9m9z6dz8cq911n4fd4a5zl03bg32nh05zq09xhwp"; depends=[DALEX ggplot2 patchwork scales]; }; fairness = derive2 { name="fairness"; version="1.2.2"; sha256="12jf2p8gmj5d6r9h9cwy208qwyqi606b54v0d99vpr171yijqvqk"; depends=[caret devtools e1071 ggplot2 pROC]; }; fairsubset = derive2 { name="fairsubset"; version="1.0"; sha256="0iw16fs2mb9p14vr34izw3sirbndyy8w07df3scy7gkkcx2nz2bz"; depends=[matrixStats]; }; - fake = derive2 { name="fake"; version="1.0.0"; sha256="0c2vgqm45sg2n0mjzi1qpvy63vm4k3bdymxfkifhw6z34f3lw3c3"; depends=[huge igraph MASS Rdpack withr]; }; + fake = derive2 { name="fake"; version="1.3.0"; sha256="09pl3q8q9pxmqbz19p4gi4xxqzyg99gs6wgd6wa80vjfc7xjqh87"; depends=[huge igraph MASS Rdpack withr]; }; fakmct = derive2 { name="fakmct"; version="0.1.0"; sha256="172g7gx6019bimfg4lm253sp9c7rcmm56c5wmxv1g575fr393n8k"; depends=[]; }; falcon = derive2 { name="falcon"; version="0.2"; sha256="09hlvwwj3k3nhcsxijjvv8x74a9m200ayjjplrp4baxvczwyq341"; depends=[]; }; falconx = derive2 { name="falconx"; version="0.2"; sha256="0648mvbc7ga7vr2xqzyln3dgd11h5s4bqhv3p55mj7smr4qv7hv9"; depends=[]; }; @@ -9006,9 +9054,10 @@ in with self; { 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.4"; sha256="01k7pc2li1la0b0rxs2r2vb5k5qllhm6ykvs4xl455g6gg4pcbrc"; depends=[DepthProc ggplot2 matrixStats]; }; - familiar = derive2 { name="familiar"; version="1.3.0"; sha256="1m73pyhq28qxhz90l9l2hvxh9cisa42f2m9355fcfjwrmwff97xw"; depends=[data_table rlang rstream survival]; }; - fanc = derive2 { name="fanc"; version="2.3.5"; sha256="17zvd3y81vqc1cwk5xidgikjxclx36ydp3mj1ps0zxzl3dz5a50f"; depends=[ellipse Matrix]; }; + familiar = derive2 { name="familiar"; version="1.4.0"; sha256="1q8h7z4d545s1md5m37g2033yw0q7f2jdc0jf2mrf1hqj12vmvak"; depends=[data_table rlang rstream survival]; }; + fanc = derive2 { name="fanc"; version="2.3.9"; sha256="02w10lm4nggab5q16ld9xgpa4x4bygfiigs8m12yiah5ah1n5vk8"; depends=[ellipse Matrix]; }; fancycut = derive2 { name="fancycut"; version="0.1.2"; sha256="1xg5qjxf77g10h07x6rvb8c3klc9gbr77bkw352qpas268pkswl2"; depends=[]; }; + fangs = derive2 { name="fangs"; version="0.2.2"; sha256="0gcwrnp06g0rwlkfi7qz2i2l56pqmrlb6knkqsaa3n3nx2d46x1k"; depends=[]; }; fanovaGraph = derive2 { name="fanovaGraph"; version="1.5"; sha256="1hffda52yk24slbgsfdgkpg3vsryfnhlw09r39cbyz483i7xd8d0"; depends=[DiceKriging igraph sensitivity]; }; fanplot = derive2 { name="fanplot"; version="4.0.0"; sha256="08zd2af26ah1rdkzxi1sv4c4l06jpxd6m38q3xy657k2jm90rkkc"; depends=[]; }; fansi = derive2 { name="fansi"; version="1.0.3"; sha256="0sn0kflgcn2qrrv646pzqylm02cx8l5ws473ppmvla4xihyvi9w6"; depends=[]; }; @@ -9020,10 +9069,9 @@ in with self; { farr = derive2 { name="farr"; version="0.2.27"; sha256="0xffahbj5dxdlg25k3nj554np85h51d6yarxxam9ndxqmrva6k0y"; depends=[DBI dbplyr dplyr lubridate magrittr readr rlang stringr tibble tidyr]; }; farrell = derive2 { name="farrell"; version="0.2.1"; sha256="0i546w5p40j9wqiq7qvbxw0426msavbdpnh258jcg6bagc6bywh8"; depends=[Benchmarking data_table dplyr DT magrittr miniUI readr rlang shiny shinycssloaders shinyWidgets tibble]; }; farver = derive2 { name="farver"; version="2.1.1"; sha256="1klnr73fhm7n46q85in1v9gi99y6rcdzzg4h4wvnbx23lxndmkqd"; depends=[]; }; - fasano_franceschini_test = derive2 { name="fasano.franceschini.test"; version="2.1.0"; sha256="1vxkq7pj2gsln3vyj3g0qx1ycvar1qrrv4hla33wz3a5g2fy9fnx"; depends=[Rcpp RcppParallel]; }; + fasano_franceschini_test = derive2 { name="fasano.franceschini.test"; version="2.1.1"; sha256="0h28ph562ac345l022x9jblzhkk7qn2knrp5jh38flw0xkv9g2yf"; depends=[Rcpp RcppParallel]; }; fasjem = derive2 { name="fasjem"; version="1.1.2"; sha256="1bbrcyyg96hakgla3604byrkn9034197vy2is048kdq20yr2y11n"; depends=[igraph]; }; fasstr = derive2 { name="fasstr"; version="0.5.0"; sha256="1cpzihrniyg7scxbj349ahvp9p1ji4r1498fh5hv38qas6pk3vil"; depends=[dplyr e1071 fitdistrplus ggplot2 lubridate openxlsx PearsonDS plyr purrr RcppRoll scales tidyhydat tidyr zyp]; }; - fastCorrDiff = derive2 { name="fastCorrDiff"; version="0.5"; sha256="0fis04xfarvmhpdkh7524ffga8f8svpcn3837rqwy0g039dcfa64"; depends=[irlba Matrix plyr RSpectra]; }; fastDummies = derive2 { name="fastDummies"; version="1.6.3"; sha256="1pw1bpp69sbs8yc1s5ffz11q249ljfwbgfrq6irg5pyp37z38fdx"; depends=[data_table stringr tibble]; }; fastGHQuad = derive2 { name="fastGHQuad"; version="1.0.1"; sha256="1zj7nsbnx4g253m3dpz9vi3zk3jxwrixwjw1ks6n4shpb4dlkp2w"; depends=[Rcpp]; }; fastGLCM = derive2 { name="fastGLCM"; version="1.0.2"; sha256="1f7mafhsygbz1vrjvpva2zql0d6dphzr31skh9agancghh8hnm3q"; depends=[OpenImageR R6 Rcpp RcppArmadillo rlang]; }; @@ -9040,9 +9088,9 @@ in with self; { fastRhockey = derive2 { name="fastRhockey"; version="0.4.0"; sha256="1xw4ylrsf9wylym79svazrmw2c9fmqk8n0sz1vypsm29dsic879k"; depends=[cli data_table dplyr glue httr janitor jsonlite lubridate magrittr progressr purrr Rcpp RcppParallel rlang rvest stringr tibble tidyr]; }; fastSOM = derive2 { name="fastSOM"; version="1.0.1"; sha256="1fzy7lfx1fn9993h0qh6vbwq0w4gfgbdrprmzb1z3aqq6nqvmngm"; depends=[]; }; fastText = derive2 { name="fastText"; version="1.0.3"; sha256="1kb0ig17rq4iyqqlppf39ixgfqgm22wmv27xji2rknsq9df3c4kr"; depends=[data_table ggplot2 glue Rcpp]; }; - fastTextR = derive2 { name="fastTextR"; version="2.0.0"; sha256="1ggmwsw2qnq8v3s8iaxi8q66c898pc15wfgpsp6h0mc761qih5lf"; depends=[Rcpp slam]; }; + fastTextR = derive2 { name="fastTextR"; version="2.0.1"; sha256="1f1b9dsir0dxw2psp721vgpjj6pwrx1xxsd0cqxnfq8mpwswf125"; depends=[Rcpp slam]; }; fastTopics = derive2 { name="fastTopics"; version="0.6-142"; sha256="0fchwd54dn6abw5z8wk4wcysn9amjxmkayz8wzl3nwfr0ldjkc67"; depends=[ashr cowplot dplyr ggplot2 ggrepel htmlwidgets irlba Matrix MCMCpack pbapply plotly progress quadprog Rcpp RcppArmadillo RcppParallel Rtsne uwot]; }; - fastWavelets = derive2 { name="fastWavelets"; version="1.0.0"; sha256="1w2dbibl3291bqygwl2pn7jdskq6sy713r39hr4jjbh0zf0jlxdd"; depends=[Rcpp]; }; + fastWavelets = derive2 { name="fastWavelets"; version="1.0.1"; sha256="1kz49iw3d37kby6hdk7zvsahms735w46pky186jz0qq9vh4agxn9"; depends=[Rcpp]; }; fasta = derive2 { name="fasta"; version="0.1.0"; sha256="0wnppxn3039dj58xm0b66fsyq537bk8k8m56im11xj1iwc3zc6vw"; depends=[]; }; fastadi = derive2 { name="fastadi"; version="0.1.1"; sha256="1hvi430ws1yzw10fp4z177wc1bnj11pxmvjsbmx0p54bcbb3a32a"; depends=[ellipsis glue logger LRMF3 Matrix Rcpp RcppArmadillo RSpectra]; }; fastai = derive2 { name="fastai"; version="2.2.0"; sha256="19hybrmcrlgawayvl0wxr646dmxmwjap64wdhd023rclby1nsg4c"; depends=[generics ggplot2 ggpubr glue png reticulate]; }; @@ -9053,7 +9101,7 @@ 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]; }; - fasterize = derive2 { name="fasterize"; version="1.0.3"; sha256="10bzl77c1b9jhcn1xp467qzp2n8c7s3wpxn53qjh1nwvbri5kd32"; depends=[raster Rcpp RcppArmadillo sp]; }; + fasterize = derive2 { name="fasterize"; version="1.0.4"; sha256="1ckxi2iyxdahhgbliblcrkzziblfagzr54srjk27yp1lcgivvvs4"; depends=[raster Rcpp RcppArmadillo sp]; }; fastglm = derive2 { name="fastglm"; version="0.0.3"; sha256="0283kgk81cxbii7ljmp1rzqg5mzkvf7cj7lflhhhkgj5ljqina2i"; depends=[BH bigmemory Rcpp RcppEigen]; }; fasthplus = derive2 { name="fasthplus"; version="1.0"; sha256="05j4lg1gkkz1vi99dx73igvk9xyrli8j6m4hzhpcnyhy0h9bxiqj"; depends=[]; }; fastkmedoids = derive2 { name="fastkmedoids"; version="1.2"; sha256="1z98ndxhq2ag870g0xqkw04b4k722994vh0pq46bw8bqc9v7bpkk"; depends=[Rcpp]; }; @@ -9073,7 +9121,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.1-0"; sha256="00290sxfa6nihahm3s9bslpsmyfm0cpziajmr9mg7grxrzx53ia6"; depends=[]; }; - fastverse = derive2 { name="fastverse"; version="0.2.4"; sha256="07nzhyfvs52b4bhm7c0m9iizw4mwkgnj1h5vvpxr04d5zkrkk7y0"; depends=[collapse data_table fst kit magrittr matrixStats]; }; + fastverse = derive2 { name="fastverse"; version="0.3.0"; sha256="0sr2nwqwxcvn118srrpws2cw0vpimchrv0k03z0f7i07989fqfc7"; depends=[collapse data_table kit magrittr]; }; fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.5"; sha256="08bbd17aqmfcacvk283bpf9cp1isf5pgfdciwxn0f7ahdzd81g4s"; depends=[kinship2 multgee]; }; faux = derive2 { name="faux"; version="1.1.0"; sha256="0cmgsm8c8w5d5zk00j4872x7fby0rdi7lmw0w0ncahlnh72grpjm"; depends=[dplyr ggplot2 jsonlite lme4 rlang truncnorm]; }; fauxnaif = derive2 { name="fauxnaif"; version="0.7.1"; sha256="1d2sfcknlaa4m3sq3cg65iq17x3ax0zgkgxkcyin3d8r3sw9k3p6"; depends=[cli rlang]; }; @@ -9085,14 +9133,14 @@ in with self; { fbati = derive2 { name="fbati"; version="1.0-5"; sha256="037rzw2mnhb7m83hrx8pzwy2n4fyhbjzg2nhmlgxyr1qra638p3v"; depends=[fgui pbatR rootSolve]; }; fbnet = derive2 { name="fbnet"; version="1.0.1"; sha256="17kafsnzijjkjlp15yv3qy1vga7vsgna74ax5yk0mvdninl3dxha"; depends=[assertthat igraph Rsolnp]; }; fbroc = derive2 { name="fbroc"; version="0.4.1"; sha256="1v73wl3yckcqx43fz1lzcsy6v08vmbmi7yi623yhgqywixxv2bx3"; depends=[ggplot2 Rcpp]; }; - fbst = derive2 { name="fbst"; version="1.9"; sha256="0lfi2rh84qijjcwxycf6v78qfk8d67vpbcjlaaplvaq6k2h68bby"; depends=[bayestestR cubature ks rstanarm viridis]; }; + fbst = derive2 { name="fbst"; version="2.1"; sha256="15d73hngw8607la36cpl5z7ac18cpwkmqzp67ga2c5n94z2h8asc"; depends=[bayestestR cubature ks rstanarm viridis]; }; 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.2.0"; sha256="04hmyndadrm6bs5vxbyh9wii6xm3vw71dy06q5b69x2344y3p5a9"; depends=[forcats fractional glue magrittr Matrix POSetR purrr R6 Rcpp registry settings stringr tibble tikzDevice]; }; fcci = derive2 { name="fcci"; version="1.0.1"; sha256="02q6q0q7fqdbp20fdf33jbkh0aj9nzl6dwysr0nn146ciz3vqgin"; depends=[assertthat Rcpp rlang]; }; fcfdr = derive2 { name="fcfdr"; version="1.0.0"; sha256="16mnpr64x00qwbgq9pw69k941yb0i7mx7ncsilahicprxqyfpfww"; depends=[bigsplines cowplot data_table dplyr fields ggplot2 hexbin Hmisc locfdr MASS polyCub spatstat_geom]; }; fcirt = derive2 { name="fcirt"; version="0.1.0"; sha256="1wiyiz51mkm5kd95xmpvlwng51awpp4y133dd5q88mnafrxyij1h"; depends=[BH numDeriv Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; - fclust = derive2 { name="fclust"; version="2.1.1"; sha256="11dsf7mb075m1m1ilqsacc0s4907wq6alvdfh6nizsyr01wiqw3b"; depends=[MASS Rcpp RcppArmadillo]; }; + fclust = derive2 { name="fclust"; version="2.1.1.1"; sha256="1d5qa30jlx6qn6npvccl97fcmh5a4wf3nw0d7jvn3y7mcb5yqlqk"; depends=[MASS Rcpp RcppArmadillo]; }; fcm = derive2 { name="fcm"; version="0.1.3"; sha256="1mqk6szczsixdvw0inkypij4cw2syng5l5ccw0xk55kc21l1lzn0"; depends=[ggplot2 reshape2]; }; fcr = derive2 { name="fcr"; version="1.0"; sha256="17jrz5zp1msd2khl1lwnb5sgxcigagni556rhn7qm9g0aykbh8yj"; depends=[face fields mgcv]; }; fcros = derive2 { name="fcros"; version="1.6.1"; sha256="04yr6lqs38lczsmdvdm78qn63836qj7xwspgh3h3n3gh8cssd83x"; depends=[]; }; @@ -9104,7 +9152,7 @@ in with self; { fdaACF = derive2 { name="fdaACF"; version="1.0.0"; sha256="0qrsj25p6h2xg25v0ayk8x31d4whyy0mpf2xdpw3hcwhb71mbfhn"; depends=[CompQuadForm fda pracma vars]; }; fdaMixed = derive2 { name="fdaMixed"; version="0.6"; sha256="0hyhb67qvvhyq68k5h4ffvsl4lmw66nfy5l14kwxnn42h3b810sc"; depends=[Formula Rcpp RcppArmadillo]; }; fdaMocca = derive2 { name="fdaMocca"; version="0.1-1"; sha256="0y54d8a38d5hjnh8iw2r4zl2d2xz72hjddhxbar91jk6zf3kzpsy"; depends=[doParallel fda foreach Matrix mvtnorm]; }; - fdaPDE = derive2 { name="fdaPDE"; version="1.1-8"; sha256="0na5rylh5lcs33xgxb4zjwmr3in5220vjhml0hlh5017hbxfgcam"; depends=[geometry Matrix plot3D RcppEigen rgl]; }; + fdaPDE = derive2 { name="fdaPDE"; version="1.1-11"; sha256="09ba71fnblv9r2c22amy92wv3xpa395rf7x681p8zs5rldhk8i5a"; depends=[Matrix plot3D Rcpp RcppEigen rgl]; }; fdaPOIFD = derive2 { name="fdaPOIFD"; version="1.0.3"; sha256="0c773hidrg69gs9lzdcwf4hzzmid3kwf73pw6c807y1b4lgiai20"; depends=[FastGP fdapace ggplot2 magrittr MASS patchwork reshape2 tibble]; }; fdacluster = derive2 { name="fdacluster"; version="0.1.1"; sha256="1rr1hcnpzya53h09p4yc1784kzrw7wlcylax4x2pdp1grzf1wakq"; depends=[dplyr ggplot2 magrittr nloptr purrr Rcpp RcppArmadillo tibble tidyr]; }; fdaconcur = derive2 { name="fdaconcur"; version="0.1.0"; sha256="1xlhn9di70z49y79l2pwffqykmz8j5p09hihhf6rsbsrjy42nwbv"; depends=[fdapace]; }; @@ -9115,7 +9163,6 @@ in with self; { fdasrvf = derive2 { name="fdasrvf"; version="1.9.8"; sha256="1x8djgy3p8phqq0d3hbfhjk5h30sx05y7k5nqfrw8k8ix0x040p4"; depends=[coda doParallel fields foreach lpSolve Matrix matrixcalc mvtnorm Rcpp RcppArmadillo testthat tolerance viridisLite]; }; fdatest = derive2 { name="fdatest"; version="2.1.1"; sha256="13sd85ypx2z07qxsqhsbc5w0yasf01yw06qx91ymh0yr8538x3x3"; depends=[fda]; }; fddm = derive2 { name="fddm"; version="0.5-2"; sha256="0sh3qnsakl02wpzwhxyqdikn7xx5crh401w3d149ww2jxvagjmsf"; depends=[Rcpp]; }; - fdistr = derive2 { name="fdistr"; version="0.1.0"; sha256="1i9nq4jmszbmwk4m6jfn7rifsn7aay40cj6kz23b9ihj3phqffi8"; depends=[dplyr ggplot2 magrittr usethis]; }; fdm2id = derive2 { name="fdm2id"; version="0.9.8"; sha256="1j6cbgvkf6glx1c77pqzbk2qbii128ycgm3x75k3qq840b2ma0cc"; depends=[arules arulesViz FactoMineR mclust nnet pls]; }; fdq = derive2 { name="fdq"; version="0.12"; sha256="198nsyzv0ni2mjx12wik58c7z5vrc1mfk80k3iv94dz1iq9fprqf"; depends=[data_table Fgmutils ggplot2 randomcoloR sqldf]; }; fdrDiscreteNull = derive2 { name="fdrDiscreteNull"; version="1.4"; sha256="1lwznpwfnhhv0h7qwy9jc7li752bq7hgmkh86qzyqz7k18zgx4iw"; depends=[MCMCpack qvalue]; }; @@ -9146,6 +9193,9 @@ in with self; { fergm = derive2 { name="fergm"; version="1.1.4"; sha256="1d979z2m5f13i1w9d8kh9rnaafavsap169w0nycpd5j2f3dfhyn7"; depends=[ergm extrafont ggplot2 matrixStats network reshape2 rstan]; }; fermicatsR = derive2 { name="fermicatsR"; version="1.4"; sha256="1587f67fypj22rdi1319zq765lcc9z518bzl1jr4lz6c8lrzfm9i"; depends=[]; }; ferrn = derive2 { name="ferrn"; version="0.0.2"; sha256="0yxw18yzj5j2fpj4rf9flmmng4s2ldgx4yaywa2hrclbnl43c578"; depends=[dplyr geozoo gganimate ggforce ggplot2 ggrepel magrittr purrr rlang scales stringr tibble tidyr tourr]; }; + fertilmodel = derive2 { name="fertilmodel"; version="1.0"; sha256="1mznpay0ibdgm67k5xjfwfb5lp07r4163h3ad33k2zsyk2f31nsq"; depends=[]; }; + fetchGoogleAnalyticsR = derive2 { name="fetchGoogleAnalyticsR"; version="0.1.0"; sha256="12s18jicx9rd5dhc8l7hm09lr71nhz6k72j3w4c1j5ds9h522krg"; depends=[jsonlite]; }; + fetchSalesforceR = derive2 { name="fetchSalesforceR"; version="0.1.0"; sha256="1826i031wndasgcxxa0bh88vp1r49flzphyfk79pixvlrfjn6gi8"; depends=[jsonlite]; }; ff = derive2 { name="ff"; version="4.0.7"; sha256="1yl3ipzz9bjkfy9bbna7xz5n7iz4lchnw5l7agww7by764yk6iqa"; depends=[bit]; }; fflr = derive2 { name="fflr"; version="2.1.0"; sha256="0982h1r2hjn54xvnkxn999r4hlgxm6c1xw98hvnpa4zhk7959wsw"; depends=[httr jsonlite tibble]; }; ffmanova = derive2 { name="ffmanova"; version="1.1.1"; sha256="19kdlcslqnwcsdjxx0n86is5cjz21sn8vpylyq8s4i7q7nrlyxwp"; depends=[]; }; @@ -9166,7 +9216,7 @@ in with self; { 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]; }; fgui = derive2 { name="fgui"; version="1.0-8"; sha256="024fzd1c7iwqprn26hwjb9l2qlvvyzl449d7iixy0x69djwsrysv"; depends=[]; }; - fhircrackr = derive2 { name="fhircrackr"; version="2.0.0"; sha256="1vjlslf3zg1c3vmblfsh8brmy4ikvir22xnmbp1529fs9kyr8b3y"; depends=[data_table httr lifecycle stringr xml2]; }; + fhircrackr = derive2 { name="fhircrackr"; version="2.1.0"; sha256="07zngm3dad242aabi4gz9vzvhdcfksbg18vlswvp036fbyw63p4j"; depends=[data_table httr lifecycle stringr xml2]; }; fiberLD = derive2 { name="fiberLD"; version="0.1-7"; sha256="04rqqg8zr6adhcls0d381fjrrc797aqy84gzl9gx3qiwlwcw8x0d"; depends=[BH doParallel foreach Matrix Rcpp RcppArmadillo VGAM]; }; fic = derive2 { name="fic"; version="1.0.0"; sha256="18xz94w1ab17jfi61bdg9z3pm63g488v17ns2ivizkza4gg07pv8"; depends=[abind ggplot2 mvtnorm numDeriv scales survival tensor]; }; fidelius = derive2 { name="fidelius"; version="0.0.2"; sha256="18dsw069j3jzl0splgjjdsybny1hq0dmiyygri8nlfwshijkw15h"; depends=[askpass fs htmltools readr rlang rmarkdown rstudioapi sodium whisker]; }; @@ -9175,9 +9225,11 @@ in with self; { fields = derive2 { name="fields"; version="14.1"; sha256="0d2lm4s9p3rv676z291fynpx3vdmi6cikcqlj23fxlj34icwbi2p"; depends=[maps spam viridis]; }; fiery = derive2 { name="fiery"; version="1.1.4"; sha256="0wfn7l766074pm8a821sx9z1xprq2ps90ayhs5l4pfppqz91kdf3"; depends=[assertthat crayon future glue httpuv later R6 reqres stringi uuid]; }; fig = derive2 { name="fig"; version="1.0.0"; sha256="1mzvng4r4xmkmbl55pspjk9bcvkri96vkmjaqkjn8nqxv39sy1pr"; depends=[R6]; }; + figir = derive2 { name="figir"; version="0.1.6.8"; sha256="0jbl6bxms4g6m3qamcgl5z0k57f2r3444577hi78gpsbwwx0n022"; depends=[]; }; + figma = derive2 { name="figma"; version="0.1.0"; sha256="10lznzqlrnnp44sfqdv6x2c2prp9yb7g64dv59b0bv094jx1cg82"; depends=[dplyr httr purrr rlang tibble]; }; figpatch = derive2 { name="figpatch"; version="0.2"; sha256="0sy63131al6z0hlhpb11aphlxdigb0pqk9bq9mxc9nbc59036jjq"; depends=[ggplot2 magick magrittr patchwork]; }; figuRes2 = derive2 { name="figuRes2"; version="1.0.0"; sha256="1s1bvhgzczkpxfmi1cyz4cfvpxvq28fm5867a4w5q0wpjcbhlma4"; depends=[ggplot2 gridExtra gtable plyr reshape2 scales stringr survival]; }; - file2meco = derive2 { name="file2meco"; version="0.4.0"; sha256="1wfg1mfj52ghkvyb84q2j9kxq7szx6mr64v3bspi410gr7n1vpd2"; depends=[ape dplyr magrittr Matrix microeco rhdf5 tidyr yaml]; }; + file2meco = derive2 { name="file2meco"; version="0.5.0"; sha256="04rvmkw9b640ras11z8na9ac8kddrdphbjhq8il3pyh0jrf15yvh"; depends=[ape dplyr magrittr Matrix microeco rhdf5 tidyr yaml]; }; filearray = derive2 { name="filearray"; version="0.1.5"; sha256="0s7qy4rf02i7r6xfysdlflgk3jwqvi2zzvk8zxhnb1x1wqncmfng"; 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-3"; sha256="1ga17smgjd4qsnf5a7qk0giwhpc5969ylqj520favs1k6b4y557k"; depends=[]; }; @@ -9191,7 +9243,8 @@ in with self; { fillr = derive2 { name="fillr"; version="1.0.0"; sha256="1gx1ihp8j90ywmm6mmmfq4jd6apxawk9s5dfw3jq0wm1c290zqpv"; depends=[]; }; filterNHP = derive2 { name="filterNHP"; version="0.1.2"; sha256="0kk6548nr5786ywa83v8by4c1n7ljh9sy4fshpfqizp49fv9zv22"; depends=[data_tree rclipboard shiny shinyBS shinyjs shinyWidgets]; }; finalfit = derive2 { name="finalfit"; version="1.0.5"; sha256="0h7wzpmsr0bfk4y3k49c2vyd4ianvvhrnh7j0nxpia1qvrakyvf9"; depends=[bdsmatrix boot broom dplyr forcats GGally ggplot2 gridExtra lme4 magrittr mice pillar pROC purrr scales stringr survival tidyr tidyselect]; }; - finbif = derive2 { name="finbif"; version="0.7.0"; sha256="0sfmmxnbr3x6fgjg13b0i0va8vbqvqpf4y661z6mn3yrq0rizrva"; depends=[digest httr jsonlite lubridate lutz]; }; + finalsize = derive2 { name="finalsize"; version="0.1"; sha256="0ir5xgr4qc0bl5c3gl06afcvbkhixaadwlyh0np5fmzlfsl8mpv1"; depends=[Rcpp RcppEigen]; }; + finbif = derive2 { name="finbif"; version="0.7.1"; sha256="1fsap2saq8xr9s440h195851987sp3aaw8bjg66s3bsk78bvap1s"; depends=[digest httr lubridate lutz]; }; finch = derive2 { name="finch"; version="0.4.0"; sha256="0q7riaxms460c6z2gb8i0q4pb348bnvry46bjd7pb9mh8fnl1i8b"; depends=[data_table digest EML hoardr xml2]; }; findInFiles = derive2 { name="findInFiles"; version="0.4.0"; sha256="1saxi8l4006wwxrw18g7wx0pj7l427a2rnb723k0irlhvq0icgwq"; depends=[crayon htmlwidgets shiny stringi stringr tibble vctrs]; }; findInGit = derive2 { name="findInGit"; version="0.1.1"; sha256="1j5mvp34nsczmvp5jx7c9gp20q7aqaxrqm2zvj8aq31rc8mfaxk9"; depends=[crayon htmlwidgets stringr]; }; @@ -9204,7 +9257,7 @@ in with self; { 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]; }; finnishgrid = derive2 { name="finnishgrid"; version="0.1.0"; sha256="0gndrllz3y7yqrg5vw6ba7dg7hn4w3085rpy7h9hdd8swxqfvlc6"; depends=[httr jsonlite]; }; - finnts = derive2 { name="finnts"; version="0.2.0"; sha256="113nwwy494vghqrmxdnbgnkd6kzmdkba144q46ldfiif2gyx44g3"; 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]; }; + finnts = derive2 { name="finnts"; version="0.2.1"; sha256="0ih4z51n3g1villz59l0fbb9lwrs4cv46chmh9nv6ry3rmskrj41"; 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]; }; fipio = derive2 { name="fipio"; version="1.1.1"; sha256="0wvx64nazbv44hdsj3q6mz70m81asmwgxp28sapaaal36l180jfs"; depends=[]; }; fipp = derive2 { name="fipp"; version="1.0.0"; sha256="0wr3czwsqwa1bpdcjk0r1739vjanxc0fv0vnl3r5lgykrbhw9v3r"; depends=[matrixStats Rcpp RcppArmadillo]; }; @@ -9221,6 +9274,7 @@ in with self; { fitConic = derive2 { name="fitConic"; version="1.2"; sha256="0mwnbq32mpj8d4127jwb283mn3gs4hm0klwk9prsrfkdnhqai41i"; depends=[pracma]; }; fitHeavyTail = derive2 { name="fitHeavyTail"; version="0.1.4"; sha256="1cb7cnir7fpvf8j8abw8imz6zxg4dznjmkyrbcx0yr09qvjal81b"; depends=[ghyp ICSNP mvtnorm numDeriv]; }; fitODBOD = derive2 { name="fitODBOD"; version="1.4.1-1"; sha256="0sx7la3bcii8fh8ril5ibbr4x97zgqwl7h889gnk6j733pcmgx0p"; depends=[bbmle hypergeo]; }; + fitPS = derive2 { name="fitPS"; version="0.2"; sha256="13xn30nbq928v6dmcjjl2vhrvc8qs6m7ldc2wzl14aanprcjiw18"; depends=[dplyr readxl VGAM]; }; fitPoly = derive2 { name="fitPoly"; version="3.0.0"; sha256="0ws1vsh8if9i9i7820ak32b0bysjc0z09nbrk17qpms0b11cpc3g"; depends=[foreach]; }; fitbitScraper = derive2 { name="fitbitScraper"; version="0.1.8"; sha256="0b4d7xw6inp6l1dkfwyrzxwg4vspp4vzlwrhv14ajxrqz6irj8a0"; depends=[httr jsonlite stringr]; }; 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]; }; @@ -9251,6 +9305,7 @@ in with self; { flashCard = derive2 { name="flashCard"; version="0.1.0"; sha256="1l1g3hy0gchsmdj04d065rl71hkvxydyqsmav5qwxyz2mdkknkhi"; depends=[htmlwidgets jsonlite]; }; flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; }; flashlight = derive2 { name="flashlight"; version="0.8.0"; sha256="0gzpq3cmb8kspjhk74qrhlkdj8fjw75sywnwvkwbvy3cp11hffp6"; depends=[cowplot dplyr ggplot2 MetricsWeighted rpart rpart_plot tidyr tidyselect withr]; }; + flashr = derive2 { name="flashr"; version="0.1.0"; sha256="0w3fs6psarqp19zc8qpmg2744cd64lxgi4hbkp5nl6v00p53nkvc"; depends=[cli curl gh httr memoise revealjs rmarkdown testthat]; }; flatness = derive2 { name="flatness"; version="0.1.4"; sha256="0zl1x4wn5wgm9aksb96ghh395z7fz1awglfjdiid4ak5ssbqgsbq"; depends=[data_table lattice xtable]; }; flatr = derive2 { name="flatr"; version="0.1.1"; sha256="10l98a3f57wahfpdqxj70r25zfhk4vzzd014pdnriy458yrfd7rw"; depends=[dplyr magrittr tibble]; }; flattabler = derive2 { name="flattabler"; version="1.2.0"; sha256="156q3af7bmqcaxvl35634ph8dzs6gdjxqqkgwi214kj2pywpqg2a"; depends=[dplyr readxl stringr tibble tidyr]; }; @@ -9264,15 +9319,15 @@ in with self; { flexmix = derive2 { name="flexmix"; version="2.3-18"; sha256="0lcvsvmhkbwac50l109an6prl1ng4mkyvr436344b20897ph28j6"; depends=[lattice modeltools nnet]; }; flexmixNL = derive2 { name="flexmixNL"; version="0.0.1"; sha256="0bk5v0cnsn1qkd1b86vj0bnpr4l9d6523kpkgzb1l1sqyscawfmm"; depends=[flexmix gnm]; }; flexpolyline = derive2 { name="flexpolyline"; version="0.2.6"; sha256="1h4csrcx193372aw6di2wr0zzd71w1bdf0b9zqqwak1q3mdszgl6"; depends=[Rcpp sf]; }; - flexrsurv = derive2 { name="flexrsurv"; version="2.0.11"; sha256="0wxv4zch353zmkfmcm61w39sli6h553bpj27mf4hi51n1p8ajkx1"; depends=[Epi Formula formula_tools Matrix numDeriv orthogonalsplinebasis R_utils statmod survival]; }; - flexsiteboard = derive2 { name="flexsiteboard"; version="0.0.6"; sha256="1wrzm3nm5hngk30zzcn18f8jcvfsxw751zgvw4fkff6hqbj2yf6l"; depends=[flexdashboard htmltools htmlwidgets jsonlite knitr rmarkdown yaml]; }; + flexrsurv = derive2 { name="flexrsurv"; version="2.0.13"; sha256="06xzfbn8i6jkgq0q71a5wxq6f1g6nkw47akp1bhj93qfyvfryp9l"; depends=[Epi Formula formula_tools Matrix numDeriv orthogonalsplinebasis R_utils statmod survival]; }; + flexsiteboard = derive2 { name="flexsiteboard"; version="0.0.7"; sha256="0msbz3x7lsi6xcw8dcqzwnylaj76f8mgj6cf3hqscrfjzhs86rym"; depends=[flexdashboard htmltools htmlwidgets jsonlite knitr rmarkdown yaml]; }; flexsurv = derive2 { name="flexsurv"; version="2.2"; sha256="0244amsyf2izih6008n2535r3ddksgdnys8pyslrcb1c09spmjrw"; depends=[assertthat deSolve dplyr generics ggplot2 magrittr Matrix mstate muhaz mvtnorm numDeriv purrr quadprog Rcpp rlang rstpm2 statmod survival tibble tidyr tidyselect]; }; - flexsurvcure = derive2 { name="flexsurvcure"; version="1.3.0"; sha256="0zbbjfc8inqwhafb8202djy05h577qjy2xrkbkjy2kcfj8lvqps2"; depends=[boot flexsurv survival]; }; - flextable = derive2 { name="flextable"; version="0.8.2"; sha256="054rkx98qhwp8i4fj9jkv5297sc4g193wfs6b537q62iyqmcjlx3"; depends=[base64enc data_table gdtools htmltools knitr officer rlang rmarkdown uuid xml2]; }; + flexsurvcure = derive2 { name="flexsurvcure"; version="1.3.1"; sha256="0mhpzcrqxsi7f2m565qy648vg26rsvy7d249ia7y7kd5wcildw8b"; depends=[boot flexsurv survival]; }; + flextable = derive2 { name="flextable"; version="0.8.3"; sha256="0fqc0zq1w7fdnql2m96g0rpichfpwrhyinnld29ddaw0d742gfj5"; 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]; }; 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.2.0"; sha256="16cn3m73pd2lp6p5ixswxjdbzwj6hq60jwzymp3r30rwzcqrh4wh"; depends=[data_table httr parzer pbapply rvest]; }; - flimo = derive2 { name="flimo"; version="0.1.2"; sha256="0a7azwrxfwj66672s1rpvp1nqkbd9g7gyppkzf779yg0phisva8w"; depends=[ggplot2 gridExtra JuliaConnectoR latex2exp]; }; + flightsbr = derive2 { name="flightsbr"; version="0.2.1"; sha256="10bsfn7a8zzsrf2fr9svsfx50dv1vlivq8dd82yn18i1vf1hzaib"; depends=[data_table httr parzer pbapply rvest]; }; + flimo = derive2 { name="flimo"; version="0.1.3"; sha256="0xgxbcik40fjqzz55wraljcp8j1pvhm5zzgin7l50xk24yyiyvrh"; depends=[ggplot2 JuliaConnectoR]; }; 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]; }; @@ -9304,14 +9359,13 @@ in with self; { 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.3"; sha256="1gi94xr0b1yk9xzwfprfafxi25yic1lcivd66p73n6iqfzdaimbk"; depends=[]; }; + fmsb = derive2 { name="fmsb"; version="0.7.4"; sha256="1rmmvx38rmamiw0ajqhlksgxj6fgm8ymq903yxqq2bzxx8fhj5n2"; depends=[]; }; fmt = derive2 { name="fmt"; version="2.0"; sha256="04df84979a8vaacfhxsb58zci1mmh113ir7qnkniv5qnyvdabacm"; depends=[limma]; }; fmtr = derive2 { name="fmtr"; version="1.5.9"; sha256="0n62jrbxpb82d6rnbf6qxi8971cn0ywfl43r1d47j6dmjbl0dhq8"; depends=[common crayon Rcpp tibble]; }; focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; }; foghorn = derive2 { name="foghorn"; version="1.5.1"; sha256="0fbr38hxl2qwr1pbvbwwnkr9dk8saq13w0ld6waky70g7k7va8m4"; depends=[clisymbols crayon curl httr2 rlang rvest tibble xml2]; }; - 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.2.0"; sha256="1d5xf0bhzmmh7n9rsysbp4cxipcxplmlj154lrnbwzic5jmjn80m"; depends=[]; }; + folio = derive2 { name="folio"; version="1.3.0"; sha256="1jkix4hjb6whv1bz8gjrclwlsc415vccvldvi5l998r0bsnbm04c"; depends=[]; }; fomantic_plus = derive2 { name="fomantic.plus"; version="0.1.0"; sha256="0zj50v036zal51b7744bp62c1bzjwdvzw1qwy0lyhgjxly6kb2hy"; depends=[htmltools jsonlite shiny shiny_semantic]; }; fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; }; fontLiberation = derive2 { name="fontLiberation"; version="0.1.0"; sha256="1w1rl0g4ayyp8lwppmz9yzj9cizg7i50g07216jkm1q5w0is9pmc"; depends=[]; }; @@ -9330,13 +9384,13 @@ in with self; { forceR = derive2 { name="forceR"; version="1.0.15"; sha256="025kpa5mnv336b1ghxdilw4kc0razgvjvlc5k5r435zi6gf4ny7w"; depends=[dplyr filesstrings magrittr purrr readr roll stringr]; }; foreSIGHT = derive2 { name="foreSIGHT"; version="1.1.0"; sha256="0a018hc8pavb8sqizc5922gmiwsdlq3hgwkx29pzpajjlhrybgpj"; depends=[cowplot directlabels doParallel fields GA ggplot2 jsonlite lattice moments mvtnorm progress RColorBrewer rcorpora Rcpp rlang scales viridisLite]; }; 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.18"; sha256="1pfq2b1ppkbg3a9bag4jrfsjclf0c7mdqbhf1l08h6fqv6lbl82r"; depends=[colorspace fracdiff generics ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; }; + forecTheta = derive2 { name="forecTheta"; version="2.6.2"; sha256="0xw5xl6famx0wy68a32f8vgqk02lkymvxq082yp16giidvzvqjwd"; depends=[forecast tseries]; }; + forecast = derive2 { name="forecast"; version="8.19"; sha256="1l3mdldghsf319fh8gx81w8f5i5mnrcn70rjjylzk4j8n7gicpih"; depends=[colorspace fracdiff generics ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; }; forecastHybrid = derive2 { name="forecastHybrid"; version="5.0.19"; sha256="1pg3wbmlagr01j3nikfh4dvh5lvbdfp7069wx9h9xsl7d4481ly1"; depends=[doParallel foreach forecast ggplot2 purrr thief zoo]; }; forecastML = derive2 { name="forecastML"; version="0.9.0"; sha256="01lqbmdmd6sk5xka19i9d466bzihxgp652v0kr13r82b591f67vq"; depends=[data_table dplyr dtplyr future_apply ggplot2 lubridate magrittr purrr rlang tibble tidyr]; }; forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.3-0"; sha256="0p47x7ic2ib7znqbp8br4b2ci75f5w8x413z9g4n30m002p7irp1"; depends=[Rcpp]; }; forecasteR = derive2 { name="forecasteR"; version="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-83"; sha256="06vj61h52idbjbgmbd6ml9541q3vr38j2gjvlkqbqsqbg0zygsl7"; depends=[]; }; + foreign = derive2 { name="foreign"; version="0.8-84"; sha256="0jc5r5wiqqbkni2xjdd24hic1xvfi151m9lnqhni52jnqw1g7v8p"; depends=[]; }; 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=[]; }; @@ -9345,13 +9399,14 @@ in with self; { forestinventory = derive2 { name="forestinventory"; version="1.0.0"; sha256="1v5gyx8i64zn1cinwvm86syq26vhfzw2maaiymy32fphzybwxivf"; depends=[ggplot2 plyr tidyr]; }; 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="3.1.0"; sha256="0xk30mpb87sab2afnk2j474qjjf4j6x1ifh9j5n7w690f481iqqb"; depends=[abind checkmate]; }; - forestploter = derive2 { name="forestploter"; version="0.2.2"; sha256="0gmcmjr8r4xklzqdx2i2aimmwas50v6g7lmib3v5xxlq8rfxm0ad"; depends=[gridExtra gtable]; }; + forestplot = derive2 { name="forestplot"; version="3.1.1"; sha256="0jf7sl7z963r92l5r2irvnakmbmx554vbprg51smj6qns5a6dfcj"; depends=[abind checkmate]; }; + forestploter = derive2 { name="forestploter"; version="0.2.3"; sha256="1x63sz8diw2agyxkmhr2li29vz0x8j9v8v9y14v8qsmh5gfnwska"; 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]; }; forge = derive2 { name="forge"; version="0.2.0"; sha256="0pjfzsc35agkh0zfw2czwajkbsyn6liys5irl5bhz5r1vim3jmwa"; depends=[magrittr rlang]; }; formatR = derive2 { name="formatR"; version="1.12"; sha256="12wch1774113nlrc0lihfn5rbh4hln9sg6dv6zc2bvyb8fzyyllb"; depends=[]; }; + formatdown = derive2 { name="formatdown"; version="0.1.1"; sha256="0hfpn7j8svv9yj1zpbszl79xshyi7kc20vv3kmp0z0r0lnv89vpg"; depends=[checkmate data_table wrapr]; }; formattable = derive2 { name="formattable"; version="0.2.1"; sha256="1vdxi0xmg019qyzjrp8bkjxciz245jcxsrkhfzd44ynqcwi4s3ag"; depends=[htmltools htmlwidgets knitr rmarkdown]; }; formatters = derive2 { name="formatters"; version="0.3.2"; sha256="0fq7ygy1dbz2ncb2f979dfajlcbzrwljn6qkfx0rjvl1vwcvi9hk"; depends=[htmltools]; }; formula_tools = derive2 { name="formula.tools"; version="1.7.1"; sha256="15d3ikfmsh9zszfgfkrxb3jkipl41inm7n6bhs73kwlnklnygq2g"; depends=[operator_tools]; }; @@ -9385,7 +9440,7 @@ in with self; { fpp3 = derive2 { name="fpp3"; version="0.4.0"; sha256="1920hlckc1bvdhqrp6mdl900c34k62v87k5l22zwwycx5gcicrxh"; depends=[cli crayon dplyr fable fabletools feasts ggplot2 lubridate magrittr purrr rstudioapi tibble tidyr tsibble tsibbledata urca]; }; fptdApprox = derive2 { name="fptdApprox"; version="2.4"; sha256="0ql52rx5wc7h5vxl567i065lmj4ygai3xpjwp7qrndl16x1j4k9l"; depends=[]; }; fqar = derive2 { name="fqar"; version="0.2.1"; sha256="1db96y5gisrkw1wzsbq7lw5ghly6jbga054n7xkn4rk0kvvb3a6b"; depends=[dplyr httr jsonlite rlang tidyr]; }; - fracdiff = derive2 { name="fracdiff"; version="1.5-1"; sha256="1dhfjlhr9sb38qgpsx0sm73l9lgc13d0fk32l7fmjfnalhr3n45q"; depends=[]; }; + fracdiff = derive2 { name="fracdiff"; version="1.5-2"; sha256="0dzl011c92skf7hmx1zvdwsrashmfkxy9p2wig35nzr8609qhpxc"; depends=[]; }; fracdist = derive2 { name="fracdist"; version="0.1.1"; sha256="0ssg8h1mvkzpwq4dn9fdxjg1vzhcv6606wsy0xrm1wz9p6s5rx74"; depends=[]; }; fracprolif = derive2 { name="fracprolif"; version="1.0.7"; sha256="124p5x59smqf8ba0xwhlq69w77zga2bv9plzwkadf700lzvaj2wx"; depends=[emg numDeriv]; }; fractD = derive2 { name="fractD"; version="0.1.0"; sha256="1cnp8qrc6jpdj0grwkvn5jkdymjfhg5ybbhqvknxirc4g981q8bj"; depends=[imager plyr]; }; @@ -9405,7 +9460,7 @@ in with self; { 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]; }; free = derive2 { name="free"; version="1.0.1"; sha256="0r9vd1d4pi19mnvdchx95axp0hiqs8lpgp0fn40dm89h5fd6zyb0"; depends=[Rcpp RcppArmadillo]; }; - freealg = derive2 { name="freealg"; version="1.0-8"; sha256="1mpqda4xk3hkr24a47kg8jzd23y7svvs5pcfgbhlmvpchsgxqzsd"; depends=[disordR mathjaxr partitions Rcpp]; }; + freealg = derive2 { name="freealg"; version="1.1-0"; sha256="10xc8d4ymx53hifmji3ag0svxpp833vndiylsrk5brhv9rg8wfb5"; depends=[disordR mathjaxr partitions Rcpp]; }; freebird = derive2 { name="freebird"; version="1.0"; sha256="1rxn4xdp801sng3dzfwm7j001igkn51qx2kc4bcpbczdhb43bzaw"; depends=[MASS Matrix Rmosek scalreg]; }; 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]; }; @@ -9425,7 +9480,7 @@ in with self; { frequentistSSD = derive2 { name="frequentistSSD"; version="0.1.1"; sha256="1d54zr87795gm4qc6aw3nv9i83rhnhv14rcpkrivdxhxv8rnhnn9"; depends=[survival]; }; fresh = derive2 { name="fresh"; version="0.2.0"; sha256="1787mm6w2s5x9scxy7r9cb77rgpmy4ngwkn4z8g3gs48mrab4bd9"; depends=[htmltools rstudioapi sass shiny]; }; freshr = derive2 { name="freshr"; version="1.0.2"; sha256="1vzwdy5cssk9r3fvw0w1pxkn203whzycmvz9fdm08lkd538zwdnj"; depends=[]; }; - frictionless = derive2 { name="frictionless"; version="1.0.1"; sha256="0risjx7ahs2ysqfrlvyb88ab2r6wsfqsz4yiyac02j52lmgxncp4"; depends=[assertthat dplyr glue httr jsonlite purrr readr yaml]; }; + frictionless = derive2 { name="frictionless"; version="1.0.2"; sha256="0821j53jnkak4nfzqyqrm07qz79laxvwsx78bbn4y1765awyxvaw"; depends=[assertthat dplyr glue httr jsonlite purrr readr yaml]; }; friends = derive2 { name="friends"; version="0.1.0"; sha256="164p9g07vq3xs2lgg250yvzca4b0mp81pqbnjfdkzcqh5hmahsan"; depends=[tibble]; }; frmhet = derive2 { name="frmhet"; version="1.1.3"; sha256="07sgsfhzrci8g1b0gicjfca1mgd8ppfqpkpp4q9bdxnjvdvlf45s"; depends=[]; }; frmpd = derive2 { name="frmpd"; version="1.1.0"; sha256="0irgqdr0vr8k408lsxcrjkjbjvqvmy5mnjw9c1ghs86isrp5mciz"; depends=[]; }; @@ -9459,6 +9514,7 @@ in with self; { fuel = derive2 { name="fuel"; version="1.2.0"; sha256="0pzb77g6l8cz5p7y6czck23kp7hs5zp78k87b5yh0avjlr7ads74"; depends=[]; }; fueleconomy = derive2 { name="fueleconomy"; version="1.0.0"; sha256="16a8wyliiidi6rw14ksimygfkl4a7yhxvss7l9bcvr1wfiplrn65"; depends=[]; }; fugue = derive2 { name="fugue"; version="0.1.7"; sha256="1myvi9cizxvahb6wn2k26v3x958xsrm2p414ar05injmfjdfnsmi"; depends=[]; }; + fuj = derive2 { name="fuj"; version="0.1.1"; sha256="14q2qzvpapm1qi5r0dqcw47ngakl2ppd5zmx2lalqwvi012xh25b"; depends=[]; }; fullROC = derive2 { name="fullROC"; version="0.1.0"; sha256="0pn4lh59snfcyyi28350lm4n9xh6y25hpjr38dc33bic4cfbqiyr"; depends=[]; }; fullfact = derive2 { name="fullfact"; version="1.5"; sha256="1p2f4rf54hd0icy49fkq6p973rqisjjmmr1brwcv0fg22nv2kidg"; depends=[afex lme4]; }; fun = derive2 { name="fun"; version="0.3"; sha256="09601ma4irmpkgjspq6zmr383m1pbgyfdkf7gw8w8gp0q7ab89aq"; depends=[]; }; @@ -9474,9 +9530,10 @@ in with self; { 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.3"; sha256="0p831i8l81dbrncmr69024gm5g14p0xiv7li0ljdlqnrbc0fj64n"; depends=[dplyr magrittr purrr stringr tibble tidyr tidyselect]; }; - fundiversity = derive2 { name="fundiversity"; version="1.0.0"; sha256="1vkr955rl7ws1ypf6lpwx4pbqjhdqkvg6i3ca8q03ym4hdmcr0yz"; depends=[future_apply geometry Matrix vegan]; }; + fundiversity = derive2 { name="fundiversity"; version="1.1.1"; sha256="1wp2v7bd1vc8gs9g41s77pazkrv3mdw2m3pgjr7k6wdch0a9qhx2"; depends=[future_apply geometry Matrix vegan]; }; fungible = derive2 { name="fungible"; version="2.2.2"; sha256="1y90vlszrir2lmvp9nnnj7nqj6a03x03fmdypagzvsszqkdsr7db"; depends=[clue CVXR DEoptim GPArotation lattice MASS mvtnorm nleqslv pbmcapply Rcsdp RSpectra]; }; funique = derive2 { name="funique"; version="0.0.1"; sha256="0p9k4nxjns1xid9vmslkaap0hm6yq6pbyvylgygd808if4q1z8k6"; depends=[]; }; + funkyheatmap = derive2 { name="funkyheatmap"; version="0.1.0"; sha256="0q5cfn7k0rh8694sldichvakqq4mxbfsya610dzn07q8jlri6ax5"; depends=[assertthat cli cowplot dplyr dynutils ggforce ggplot2 purrr RColorBrewer stringr tibble tidyr]; }; funmediation = derive2 { name="funmediation"; version="1.0.1"; sha256="1h4jic73f7ywk2g1mkg188q0bq6x8sn9sm7jhr8gvrnmh167ajw7"; depends=[boot refund tvem]; }; funnelR = derive2 { name="funnelR"; version="0.1.0"; sha256="143lb048krgh8rkkz6sm8h464kdy62w29fvvyar795vqi10bb5fy"; depends=[ggplot2]; }; funneljoin = derive2 { name="funneljoin"; version="0.1.0"; sha256="17g1mvq9z5m29r0v2r2nn8980j515jamnpwvvnzj83vk84bz94rq"; depends=[broom dplyr glue magrittr purrr rlang tibble tidyr]; }; @@ -9494,28 +9551,26 @@ in with self; { futile_logger = derive2 { name="futile.logger"; version="1.4.3"; sha256="1r3nayk0z9n1svbf8640vw90dal5q07nkn0gv4bnva3pbzb352sy"; depends=[futile_options lambda_r]; }; futile_options = derive2 { name="futile.options"; version="1.0.1"; sha256="0w15agpi88y3qkv6fl72zy2pzyplzgvnj41a4ixhg64mw1sck73s"; depends=[]; }; futility = derive2 { name="futility"; version="0.4"; sha256="0zjb87brz7pkx3nq3q30y69cmcxpqqsra447p60qh7005kgr9vx4"; depends=[]; }; - future = derive2 { name="future"; version="1.28.0"; sha256="1xhv0nf97yxxxsmxczyqqbnb4yn5sfn5vzvhm9dmw9csrmmadpbg"; depends=[digest globals listenv parallelly]; }; - future_apply = derive2 { name="future.apply"; version="1.9.1"; sha256="0cr141mamjxby79sww02493yal9lahslvp3a3ic7f856rbawq8jg"; depends=[future globals]; }; + future = derive2 { name="future"; version="1.29.0"; sha256="0ws3jp82qjpnvgn5xrxdq7hg7r97rkylj329f9jqr69g3paiyvc5"; depends=[digest globals listenv parallelly]; }; + future_apply = derive2 { name="future.apply"; version="1.10.0"; sha256="1all7ri4nsjxfakw8pssif22j33ch1nhw3sc0raqrzhj93c2vsfy"; 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.8.0"; sha256="1nhkmxaaii647gizrxa8zj1iakivml7zrqi4bvvs5yshc7m9slg9"; depends=[callr future]; }; - future_tests = derive2 { name="future.tests"; version="0.3.0"; sha256="1ssr0sd9h10151m5iaad17zqii7d18nnszq2svj0i8izk83xhrik"; depends=[cli crayon future prettyunits sessioninfo]; }; + future_tests = derive2 { name="future.tests"; version="0.4.0"; sha256="1knm3zxc61g6xgvp2wws405jp7ygva8nzqm9q8cvxdl7fk2l9q0a"; 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]; }; fuzzyRankTests = derive2 { name="fuzzyRankTests"; version="0.4"; sha256="04841fh4nf7qriqk0b2ny943bji60bj42j8czg056d2dza4q4039"; depends=[]; }; - fuzzySim = derive2 { name="fuzzySim"; version="4.3"; sha256="1dzjl8d9kal4rvlgb0y5jdmakgnhgzpmzqpbac50qq5zqc34462c"; depends=[modEvA]; }; + fuzzySim = derive2 { name="fuzzySim"; version="4.9.2"; sha256="1l6mmpla0azayqsyqdlrgb40fr5vnmy82wl6a54qwinnz7vghmdn"; depends=[modEvA]; }; fuzzyforest = derive2 { name="fuzzyforest"; version="1.0.8"; sha256="0sb7qia01a5h6p12riq6vdq9likmqb6i949axsxszy5sf1zk50v5"; depends=[doParallel foreach ggplot2 mvtnorm randomForest]; }; fuzzyjoin = derive2 { name="fuzzyjoin"; version="0.1.6"; sha256="0s5rhqz8vih4za3a8k1k7i3gq8hj0w7bqnakw40k6mg87jvyzsj7"; depends=[dplyr geosphere purrr stringdist stringr tibble tidyr]; }; fuzzyreg = derive2 { name="fuzzyreg"; version="0.6"; sha256="1v100flbnw3mjmakgswj0zfla2rm0s0vpg8w8v7j1lr9sfjz4s7c"; depends=[limSolve quadprog]; }; fuzzywuzzyR = derive2 { name="fuzzywuzzyR"; version="1.0.5"; sha256="1g73xivxyh5fvppccgnxhgar6jsl6zsr2djkg0bhh10i633l56ia"; depends=[R6 reticulate]; }; fwb = derive2 { name="fwb"; version="0.1.1"; sha256="0hgbzmlbj1hhckpxv9zhchk8x8lq0ahcpvhcyibybkwxydii3dd4"; depends=[chk pbapply rlang]; }; fwi_fbp = derive2 { name="fwi.fbp"; version="1.7"; sha256="1wk9cr0kk6zkbf111bv87n7b1wwx1qrsbjxydvbjvy8bgz0nfa62"; depends=[]; }; - fwildclusterboot = derive2 { name="fwildclusterboot"; version="0.12"; sha256="08rcyqh0nwpjjybks05klpb3ghry5n2652y5vxz7f5wdvlzjkhwz"; depends=[collapse dqrng dreamerr Formula generics gtools JuliaConnectoR MASS Matrix Rcpp RcppArmadillo RcppEigen summclust]; }; fwsim = derive2 { name="fwsim"; version="0.3.4"; sha256="0fy87c1x5hihfcppv1pvk3b0pwl6ygqpka40x55gbpkgssdigb1l"; depends=[Rcpp]; }; - fxTWAPLS = derive2 { name="fxTWAPLS"; version="0.1.1"; sha256="1c3zdzyh8dz0vmbvd6942az95wqwrg70yr6xqsd7014p119dklb0"; depends=[doFuture foreach future geosphere ggplot2 JOPS MASS progressr]; }; + fxTWAPLS = derive2 { name="fxTWAPLS"; version="0.1.2"; sha256="1bxrwkf65qw3k6mqvp27lqw6i2r7bdbilnl9406k1nva353gcxxm"; 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=[]; }; - g2f = derive2 { name="g2f"; version="0.2"; sha256="1jsmiv6v8ilpxg1k1npcgqa467hpyw7mzh5m8dp7bxar4j5npsp4"; depends=[KEGGREST minval sybil]; }; g3viz = derive2 { name="g3viz"; version="1.1.5"; sha256="0pjn1rgqbrkbdrcnf01j9lm3257fnp7b0p5p3hyhg8srd990wp61"; depends=[cBioPortalData htmlwidgets jsonlite stringr]; }; gCat = derive2 { name="gCat"; version="0.2"; sha256="0n1x039a0pm4sz2rwsgq82n423zgp4xni69129dh3nvxfrc0hzc5"; depends=[]; }; gDefrag = derive2 { name="gDefrag"; version="0.3"; sha256="016vpj03drygxsa06jin225rfgjvjm938x65990ms15xcwrgv8nb"; depends=[igraph maptools rgdal rgeos sp]; }; @@ -9525,10 +9580,9 @@ in with self; { gMCP = derive2 { name="gMCP"; version="0.8-15"; sha256="01048j9489rrhv9syqrbw4c5i5gsll41ysm27awxw6l1rshbqsqn"; depends=[CommonJavaJars JavaGD MASS Matrix multcomp mvtnorm PolynomF rJava xlsxjars]; }; gMCPLite = derive2 { name="gMCPLite"; version="0.1.2"; sha256="1vaqwbj64m7xvr9vhpy0vb3l88sp1cbnpnxvw20ma62qvrayk2yn"; depends=[ggplot2 MASS mvtnorm]; }; gMOIP = derive2 { name="gMOIP"; version="1.4.7"; sha256="1qg0ba3crky35l9qlcqg37bzrr9ilh8df1y110r2pqnkdns7ikj6"; depends=[dplyr geometry ggplot2 ggrepel MASS Matrix plyr png purrr Rfast rgl rlang sp tibble tidyr tidyselect]; }; - gMWT = derive2 { name="gMWT"; version="1.2"; sha256="0gy8mm6ajbd2nl059nrb24wkh06qbbbg2h8m6fl58n5wgsjns1va"; depends=[clinfun Rcpp RcppArmadillo]; }; gProfileR = derive2 { name="gProfileR"; version="0.7.0"; sha256="1h1v0kgpsn04ald2izznh7fr2riwisj5hcgz4k7h3qc931rf0r4k"; depends=[plyr RCurl]; }; - gRain = derive2 { name="gRain"; version="1.3.11"; sha256="1knaa410rkx88aphjxd64mn6z83r7fdiny4vdgdnhk3vsqcc0swh"; depends=[graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; - gRbase = derive2 { name="gRbase"; version="1.8.8"; sha256="1nzrmi0sy1jv565csl04nj80mrhh59jrl3115fyyhx6vib5d3mgx"; depends=[BiocManager graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; + gRain = derive2 { name="gRain"; version="1.3.12"; sha256="0l4wrbsjzkv3fhvkwc0pxccqcc3d6vkx2qgayiqgrq90nc458fhr"; depends=[broom graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; + gRbase = derive2 { name="gRbase"; version="1.8.9"; sha256="0zix34w60l94qsfh6gxw9qf4l564fmml9s4nc4y5kr4nv11b9jns"; depends=[BiocManager graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; gRc = derive2 { name="gRc"; version="0.4.4"; sha256="0p1m816al9djv5fhzgsgrbbbcpx5c5wjxvxwni6gs2cwxbxmdvcp"; depends=[gRbase magrittr MASS Rcpp RcppArmadillo]; }; gRim = derive2 { name="gRim"; version="0.2.10"; sha256="1h5fds5paqg0bxdpbk6cz2wclw9sbwaw08zrp7dxims0n5fcc8zp"; depends=[gRain graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; gSEM = derive2 { name="gSEM"; version="0.4.3.4"; sha256="18kh41ibvfflz59gykiq7j2c6a72i8b0w8c2mcprd1nzhnyhvmhy"; depends=[DiagrammeR htmlwidgets knitr MASS]; }; @@ -9539,7 +9593,8 @@ in with self; { gWQS = derive2 { name="gWQS"; version="3.0.4"; sha256="1yhbcmznii3n2sbw0z2rw1sdn0zlk5v2z7ww3nl7rn005g4q04hi"; depends=[broom cowplot dplyr future future_apply ggplot2 ggrepel kableExtra knitr MASS Matrix nnet plotROC pscl reshape2 rlist]; }; gWidgets2 = derive2 { name="gWidgets2"; version="1.0-9"; sha256="1ifljpdazzmwf3mgkg9g76365n2cmw8dd3da161fpvw84xxyznfl"; depends=[digest]; }; gWidgets2tcltk = derive2 { name="gWidgets2tcltk"; version="1.0-8"; sha256="02ic4avpa33dnqsnm1mzg7ci1psngk1p169pqf259szf6v39qf8h"; depends=[digest gWidgets2 memoise]; }; - gadget2 = derive2 { name="gadget2"; version="2.3.7"; sha256="1p7jpwy65gdl6kli1h2m9yi5p5ah1vm23xs03sm9l42fcbn7ffdw"; depends=[]; }; + gadget2 = derive2 { name="gadget2"; version="2.3.9"; sha256="1cha4n0bd1imlvpzsgd337p0my75kakjsxdmmgx8p519r2dl07vz"; depends=[]; }; + gadget3 = derive2 { name="gadget3"; version="0.8-4"; sha256="12s91c0wy0xvy5f89w05rsa8299hbywsp98z0a14l8s18dbgwfrf"; depends=[digest Matrix rlang TMB]; }; 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]; }; @@ -9548,7 +9603,7 @@ in with self; { 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]; }; - gam = derive2 { name="gam"; version="1.20.2"; sha256="1ndgnaq5fk1w6l6z93w5gd22887yxkykrchbdbx366qmz8v8wcyg"; depends=[foreach]; }; + gam = derive2 { name="gam"; version="1.22"; sha256="0gyrg73f63ccars1639n0gv6cnh8ixp7p7lgdxb2yjl240lk0c9i"; depends=[foreach]; }; gamCopula = derive2 { name="gamCopula"; version="0.0-7"; sha256="0zi9g2vxkn1hxc2qyyr1x8p1f9w7fc1j5dmm2mmm333gixkkz9nb"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; }; gamRR = derive2 { name="gamRR"; version="0.7.0"; sha256="0zn8921a4i1lz5wpdfbd72pqb25r12abyqw7y2w53kfhdzs57f3l"; depends=[boot mgcv]; }; gamair = derive2 { name="gamair"; version="1.0-2"; sha256="1cjrd576l9md1jb1fc1y6iay5y49i0d8by024qsc7yik6f6mdl13"; depends=[]; }; @@ -9560,7 +9615,7 @@ in with self; { gameR = derive2 { name="gameR"; version="0.0.3"; sha256="09z10gavska02d6nfi36qlbl6ln25h83knrhib3n9c5bmycc8z8d"; depends=[]; }; 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.4-3"; sha256="0xih19zqgpjl5qv5j38ana6x29y84shn2jfl2lk4kaw3q7yx86b6"; depends=[gamlss_data gamlss_dist MASS nlme survival]; }; + gamlss = derive2 { name="gamlss"; version="5.4-10"; sha256="1cm0rvihniad309j26ll8kabndqzs3wdh5dak70b60z4kljrfx4c"; 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]; }; @@ -9568,7 +9623,7 @@ in with self; { gamlss_demo = derive2 { name="gamlss.demo"; version="4.3-3"; sha256="01p6abppwbnh2a2ks1g08z4iwq2fxf125y9s4qzssybsn76a3gf3"; depends=[gamlss_dist gamlss_tr rpanel]; }; gamlss_dist = derive2 { name="gamlss.dist"; version="6.0-5"; sha256="03m275qvrmpzmc10hs48277kxp503riz8sz6xk9pkpj8n7gsz20g"; depends=[MASS]; }; gamlss_foreach = derive2 { name="gamlss.foreach"; version="1.1-6"; sha256="1bld98lfbgj1v6l4vq3yysg1lnvpgj2r9vykkfy0q1yipv2xbnqb"; depends=[doParallel foreach gamlss gamlss_data gamlss_dist glmnet]; }; - gamlss_ggplots = derive2 { name="gamlss.ggplots"; version="1.0-0"; sha256="0z19jvgan08jijijcx5aswq2c4c5pbdyhhgb9idvhv7bir5qim06"; depends=[ellipse gamlss gamlss_dist gamlss_foreach ggplot2 ggridges]; }; + gamlss_ggplots = derive2 { name="gamlss.ggplots"; version="2.0-1"; sha256="1nzjfki007zky79xwi1mld7pxl6yg8snxdyh3zd9prndnbj6c85s"; depends=[ellipse gamlss gamlss_dist gamlss_foreach gamlss_inf ggplot2 ggridges]; }; gamlss_inf = derive2 { name="gamlss.inf"; version="1.0-1"; sha256="0m091zxjm5wvhm6mzbpzkr275n3qnlb3v4099k0a1jymahk4w7vr"; depends=[gamlss gamlss_dist]; }; gamlss_lasso = derive2 { name="gamlss.lasso"; version="1.0-1"; sha256="03c8k6hl23ag98dihznfz1h0qc3pwxbnpv58pvmx3xbb3lipfjfb"; depends=[gamlss glmnet lars Matrix]; }; gamlss_mx = derive2 { name="gamlss.mx"; version="6.0-0"; sha256="0b06nb6nq36ay0p5z57j5d4hrly5917wcsal7986mp1270iwnpip"; depends=[gamlss gamlss_dist nnet]; }; @@ -9599,12 +9654,12 @@ in with self; { gasfluxes = derive2 { name="gasfluxes"; version="0.4-4"; sha256="0gi0zk0h5rw75n6znada0cwa9qzy8higsiiqwgdm3q827j1x8iva"; depends=[AICcmodavg data_table MASS sfsmisc]; }; gasmodel = derive2 { name="gasmodel"; version="0.1.0"; sha256="0xyhkafjyh6x87l79yz1g8byj6gdvppci46d4brl32gcf2n28kh8"; depends=[abind arrangements Matrix mvnfast nloptr numDeriv pracma]; }; gastempt = derive2 { name="gastempt"; version="0.5.5"; sha256="0pz580nhr9hnpzdi59l00jv34jmy5iyh5skbwslq6gzjdw3jgsf4"; depends=[assertthat BH dplyr ggplot2 nlme Rcpp RcppEigen RcppParallel rstan shiny StanHeaders stringr tibble utf8]; }; - gaston = derive2 { name="gaston"; version="1.5.7"; sha256="14z94dpln4dvgrv2w7w9ik7h6rpvbf02qhq1hqzx8c2cndzxr21i"; depends=[Rcpp RcppEigen RcppParallel]; }; - gateR = derive2 { name="gateR"; version="0.1.11"; sha256="0c40wbymirc72l14hpz1gknhhhpinh7z50vdhbshi0iii6nlcmcr"; depends=[fields lifecycle raster rlang sparr SpatialPack spatstat_geom tibble]; }; + gaston = derive2 { name="gaston"; version="1.5.8"; sha256="1pv37csq3gvkld7hfxgbq72n35gx1wg3bvrcvzzzf0qsfb6g42cc"; depends=[Rcpp RcppEigen RcppParallel]; }; + gateR = derive2 { name="gateR"; version="0.1.12"; sha256="1yc400fq58zbl467rdr5rqsgf4gs9yalg7bibsdfdwh7wavd6zj0"; 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.8"; sha256="1k58x5ksf76ilj4h3qmknq60vq0mwwgxzllyh5r33jindn5q8nmh"; depends=[]; }; + gausscov = derive2 { name="gausscov"; version="1.0.0"; sha256="0xc7cp56f5a3y9pghhmpvqb67dbs11n3irla1xdzf06yddzndnb6"; depends=[]; }; gaussfacts = derive2 { name="gaussfacts"; version="0.0.2"; sha256="095x7k7m7sy1gqkbm6wiqn26252dclz62sbnkv6cjvmbdxajl7m9"; depends=[]; }; gaussplotR = derive2 { name="gaussplotR"; version="0.2.5"; sha256="0amkgzgh6764ri30210nhbi3wcll3248fmkpclx010dxc3hllfdx"; depends=[ggplot2 metR rgl viridisLite]; }; gaussquad = derive2 { name="gaussquad"; version="1.0-3"; sha256="04689l076agncsxqcbkx76z89cvjigs8p8v58p5kad655gjpqcx3"; depends=[orthopolynom polynom]; }; @@ -9632,15 +9687,15 @@ in with self; { gclm = derive2 { name="gclm"; version="0.0.1"; sha256="0b1nr8k8m48x78m6fkga11ikkcxyjsjpvqcd1lp6n9n4hv7akmfp"; depends=[]; }; gclus = derive2 { name="gclus"; version="1.3.2"; sha256="1cz0g0i972955hhaji30rx8448x7f3as7z1sww9i5h86ybgirilw"; depends=[cluster]; }; gcmr = derive2 { name="gcmr"; version="1.0.3"; sha256="0m4px1w41226clczzmnzal3hs0qwrvlhhdnkcxj1i7qp358ksxvm"; depends=[betareg car Formula lmtest nlme sandwich sp]; }; - gconsensus = derive2 { name="gconsensus"; version="0.3.1"; sha256="0zray67q5saqs4n3k2v3hm7ly7hpfibvpvlzvqfhbfj98accm7in"; depends=[coda MASS rjags]; }; + gconsensus = derive2 { name="gconsensus"; version="0.3.2"; sha256="065i587611nh3fiaxlp88qzd12cjxpbdvxn8pvd99fmk88d809zs"; depends=[coda MASS rjags]; }; gcookbook = derive2 { name="gcookbook"; version="2.0"; sha256="11g1q187l4j31b6cdzdx5z3s14z3s09l7ynl36pzzn9j19l8cmrc"; depends=[]; }; - gdalUtilities = derive2 { name="gdalUtilities"; version="1.2.1"; sha256="172a47dcd6virqxg15vanypi2lwkjb4n4k2pkpd75ybv0w6cqpcg"; depends=[sf]; }; + gdalUtilities = derive2 { name="gdalUtilities"; version="1.2.2"; sha256="0k777x18w2r86jz5gk96fyjjyg7wd0phn57dwfq18kg9vrzs1d73"; depends=[sf]; }; gdalcubes = derive2 { name="gdalcubes"; version="0.6.2"; sha256="1fx1h2jwp2i72jky44arrlf37in3p8gv7ph6xn1f5qszrgmi4q48"; depends=[jsonlite ncdf4 Rcpp]; }; gdata = derive2 { name="gdata"; version="2.18.0.1"; sha256="1n9jw136kk5ld27qvny7cx2s8l34jdgmzlx40x62mmcqjddksbsy"; 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-4"; sha256="0n50q4nghwdp70q69skn6s5vp366bz0fqavlq597267a18vsfnm6"; depends=[magick pdftools]; }; gdistance = derive2 { name="gdistance"; version="1.6"; sha256="1pjzslcnhqfs41zlxnwshq34pmnjh49lb239v74vjxq4rb2h5nrx"; depends=[igraph Matrix raster sp]; }; - gdm = derive2 { name="gdm"; version="1.5.0-3"; sha256="1vj38p7l36znha56c9dfm75z8rfpjhpmhzrsp3sqiwpvb650mmk8"; depends=[doParallel foreach pbapply raster Rcpp reshape2 vegan]; }; + gdm = derive2 { name="gdm"; version="1.5.0-9.1"; sha256="10c4fk6pbd946is8h8cr8qblrq6cch5zhlhrxqd8ix5wknm8cqn8"; depends=[doParallel foreach pbapply raster Rcpp reshape2 vegan]; }; gdpc = derive2 { name="gdpc"; version="1.1.3"; sha256="1ba7ma1y4pxvx7byg19fzgpp1zswcihdaifyhb7zdadizxjzyj43"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; }; gds = derive2 { name="gds"; version="0.1.1"; sha256="0gwq0k80rnbg4ibz6dz8sk6hqaklrdbv4vzv8zyk74am3aqipn20"; depends=[]; }; gdtools = derive2 { name="gdtools"; version="0.2.4"; sha256="0a1hqg5b484ji4g9dy0zi06wn9w7pk6hiy5ljzc1zgj9mbhlr21j"; depends=[Rcpp systemfonts]; }; @@ -9679,9 +9734,9 @@ in with self; { genderBR = derive2 { name="genderBR"; version="1.1.2"; sha256="19n3d6ps0wswq1bxgfqifq26svqf8q696im14wfglrl731mr0qbm"; depends=[dplyr httr jsonlite magrittr purrr tibble]; }; gendist = derive2 { name="gendist"; version="2.0"; sha256="0rs0sn1sb6j3pk2xncix04a093awlm2nw70g0rjhr7dlzmigspgb"; depends=[]; }; geneExpressionFromGEO = derive2 { name="geneExpressionFromGEO"; version="0.9"; sha256="15dvx2f4nsmw1mgjfpcdcfnx8335fd043xb4hdnqcbjzf9h228bp"; depends=[annotate Biobase BiocManager GEOquery markdown R_utils xml2]; }; - geneHapR = derive2 { name="geneHapR"; version="1.1.1"; sha256="037yy4xpw5vfxbf0z12hdaibzzppbkbsyb0xgvj5hilwj4ar57jy"; depends=[ape Biostrings GenomicRanges ggplot2 ggpubr IRanges magrittr maps muscle pegas reshape2 rlang rtracklayer stringdist stringr tibble tidyr trackViewer vcfR]; }; + geneHapR = derive2 { name="geneHapR"; version="1.1.6"; sha256="0wh2778vwslfvcv85f86nsr086msm21p578grqpnrk2iivp3wp48"; depends=[ape Biostrings genetics GenomicRanges ggplot2 ggpubr IRanges maps pegas reshape2 rlang rtracklayer shiny shinyjs stringdist stringr tibble tidyr trackViewer vcfR]; }; geneHummus = derive2 { name="geneHummus"; version="1.0.11"; sha256="1m6yyjsvmn3w87cw4da8js5vi74k5y739gxdx1yscx1n50bc3m34"; depends=[curl dplyr httr rentrez stringr]; }; - genekitr = derive2 { name="genekitr"; version="1.0.3"; sha256="0s4hzfbc41pxlhc0ra4l6ip0zmzx8vr2xwklm3lmkqip6i7m00dq"; depends=[clusterProfiler DOSE dplyr europepmc fst geneset ggplot2 ggraph igraph magrittr openxlsx rlang stringi stringr tidyr VennDiagram]; }; + genekitr = derive2 { name="genekitr"; version="1.0.8"; sha256="1ymsyrk8vradb0yp02r9xrm944d6dwv8757sqg1rcr9n44lcr4p2"; depends=[clusterProfiler dplyr europepmc fst geneset ggplot2 ggraph igraph magrittr openxlsx rlang stringi stringr 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]; }; @@ -9690,15 +9745,14 @@ in with self; { generator = derive2 { name="generator"; version="0.1.0"; sha256="0xjvnmnpdms8rrxxcz6pd8w4rnbv3ghzqv4m63zxia2l98x7z4rf"; depends=[]; }; generics = derive2 { name="generics"; version="0.1.3"; sha256="0lyhhwik0w7m5h3fbwl2f52gc1v2g6g6h6sc47sa9f58pxin213m"; depends=[]; }; genero = derive2 { name="genero"; version="0.1.0"; sha256="0akwwy5xbh7s40v8dr1zr7jfglv0iyh4zn0sb0rnz4r57qr6nh8w"; depends=[]; }; - geneset = derive2 { name="geneset"; version="0.2.6"; sha256="19a1ngw3916mykh2a99jaw80bpgrflqh6qs12mj7slgwih12g5px"; depends=[dplyr fst RCurl stringi stringr]; }; - genesysr = derive2 { name="genesysr"; version="1.0.0"; sha256="05jp8z7313r5wi9a5yw7fh198l7nd2ywzwg4f23yp4kfrkkgawn5"; depends=[dplyr httr jsonlite]; }; + geneset = derive2 { name="geneset"; version="0.2.7"; sha256="1fiyrlsy5zqmxdj71w5m0h70ln5b84y7mlhv2j8lad623gpng3l6"; depends=[dplyr fst RCurl stringi stringr]; }; + genesysr = derive2 { name="genesysr"; version="1.0.1"; sha256="0p1mzhwcffifph640qvb2g7qkj0gpjivsmwvih52fd9nwvqpmk9q"; depends=[dplyr httr jsonlite readr]; }; geneticae = derive2 { name="geneticae"; version="0.4.0"; sha256="0ka0m4dq8a9bzdk3gi7gj6dnc2a7c4chrzixw2g4qd7md31z33vx"; depends=[calibrate dplyr GGEBiplots ggforce ggplot2 MASS matrixStats missMDA pcaMethods prettydoc reshape2 rlang rrcov scales tidyr]; }; genetics = derive2 { name="genetics"; version="1.3.8.1.3"; sha256="0lljxvz7nc6y2z303icphar2niir0i407w5cyhy2pwspd9gwkwpy"; depends=[combinat gdata gtools MASS mvtnorm]; }; genie = derive2 { name="genie"; version="1.0.5"; sha256="07w6rf4a3d34j7dwz9zcxshg2sk1cd5v59xs3jxph17c9gga0nlq"; depends=[genieclust Rcpp]; }; genieBPC = derive2 { name="genieBPC"; version="1.0.1"; sha256="0zc0qbzj5a6rxzddw6jmk3rbbig09gcnb58003f4qkrm9mzc42gm"; depends=[cli dplyr dtplyr httr jsonlite purrr rlang stringr sunburstR tibble tidyr]; }; genieclust = derive2 { name="genieclust"; version="1.1.0"; sha256="1hwda0jkw67b6fnqpjl4axbaigbvlz0y2rfb7y06a8bhw2xq3mcy"; depends=[Rcpp]; }; genio = derive2 { name="genio"; version="1.1.1"; sha256="0cqn17k4is8lf8yym2h6l7nc51nzpx6br71z4bi12dm4ni0c0k6y"; depends=[dplyr Rcpp readr tibble]; }; - genius = derive2 { name="genius"; version="2.2.3"; sha256="03j6yry39nn8bccrnwjx1y36rdw167gjlkzl56g5lqwbrgx26bqy"; depends=[dplyr magrittr purrr reshape2 rlang rvest stringr tibble tidyr tidytext]; }; geniusr = derive2 { name="geniusr"; version="1.2.1"; sha256="14flyjrnw3l4j02dnr8495r5xdsr83firz0irpqbxw0jrajbj5dq"; depends=[curl dplyr httr purrr rvest stringr tibble xml2]; }; genlasso = derive2 { name="genlasso"; version="1.6.1"; sha256="0bhpsz4qcvnmf09l1j6r94ljrdfxidjrsmggb3q4xvyf2xxnnbfx"; depends=[igraph Matrix]; }; genlogis = derive2 { name="genlogis"; version="1.0.0"; sha256="01av5invhviii7adqihh10ib47rjzwfsqdgw3lfg1c72kzrqywgr"; depends=[distr doParallel foreach ggplot2 manipulate]; }; @@ -9722,12 +9776,12 @@ in with self; { geoFourierFDA = derive2 { name="geoFourierFDA"; version="0.1.0"; sha256="1a5ggjyfj5ic9h7fqvy3r7s0i6bmbwk95bf7y3vrmmmj0sxdm1mf"; depends=[magrittr orthopolynom Rcpp RcppArmadillo]; }; geoR = derive2 { name="geoR"; version="1.9-2"; sha256="1ndrah1aj996s3pdkixai5438xsfcfxcl21an9qxxa9kd8jzbqvw"; depends=[MASS sp splancs]; }; geoSAE = derive2 { name="geoSAE"; version="0.1.0"; sha256="16fkai95cqwxkylpk1gddyzja80036ghfb4ps3rz1vbbqzhg01x8"; depends=[MASS nlme]; }; - geoTS = derive2 { name="geoTS"; version="0.1.3"; sha256="12v50r2ym3nb21sskq7h4xsk6nzci06l9iync2ny91iwl7c9nrjc"; depends=[doParallel ff foreach iterators raster sp]; }; + geoTS = derive2 { name="geoTS"; version="0.1.8"; sha256="0hjhc68pl1gq9wcgvvagn903vlhwsayf7kka88rdcb6y7rgdlp5v"; depends=[doParallel ff foreach raster robustbase sp]; }; geobr = derive2 { name="geobr"; version="1.7.0"; sha256="0yx9mk5l2wh34xqg2v7p3p9hwdg2lpzd8bpgq4sm2qs0xk69sdw3"; depends=[curl data_table httr sf]; }; geocacheR = derive2 { name="geocacheR"; version="0.1.0"; sha256="04ckxmird6n179xvsx50cjdz046igjxxqdnz5pfxi8pdklnky20c"; depends=[dplyr magrittr stringr threewords tibble]; }; geocmeans = derive2 { name="geocmeans"; version="0.3.1"; sha256="1h51sxn8clw62j0r5rk4zi7s1hyrjzslmgrv2lgwx4s816cdhy19"; depends=[dplyr fclust fmsb future_apply ggplot2 leaflet matrixStats plotly progressr raster Rcpp RcppArmadillo Rdpack reldist reshape2 sf shiny spdep tmap]; }; geodaData = derive2 { name="geodaData"; version="0.1.0"; sha256="003m5wff0q4fdlg64qispmhj2aw83isxg3ijxwkwhvi33bpwpq4z"; depends=[]; }; - geodata = derive2 { name="geodata"; version="0.4-11"; sha256="02dhg84zzkf0hhh5nbj56w297ry4y8vpd7naimx5gkqfqh1qw21b"; depends=[terra]; }; + geodata = derive2 { name="geodata"; version="0.5-3"; sha256="1341wia70hmiaw4cwlld5x83mc10b85ji0mxfc75ar4w4yzplh6z"; depends=[terra]; }; geodetector = derive2 { name="geodetector"; version="1.0-4"; sha256="00zyx68jjl4mldah8mxfvwvv5yfkd4f1s2rlx6fsw6h8y2cwzj3l"; depends=[maptools rgdal rgeos sp]; }; geodimension = derive2 { name="geodimension"; version="1.0.0"; sha256="0mh16cdac7vi8zv98g3s06109fpadan441zd80x9yfsypx75sdz0"; depends=[dplyr generics magrittr pander readr rlang sf tibble tidyr tidyselect]; }; geodist = derive2 { name="geodist"; version="0.0.8"; sha256="09758v53r057rjsn844g2dc455ccndw1qlndl1xsm2gcp6ch2hr3"; depends=[]; }; @@ -9739,38 +9793,36 @@ in with self; { geofd = derive2 { name="geofd"; version="2.0"; sha256="1rsgy4nxfp1gi4vwh8zfzksr6sr2ga31kmd56q5m56gw530570ra"; depends=[fda]; }; geofi = derive2 { name="geofi"; version="1.0.7"; sha256="0x52g2d2h7rcz15bw5hdz2zzy1fbrajpdglmpbiij7mwwmpgc05d"; 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=[]; }; + geohashTools = derive2 { name="geohashTools"; version="0.3.2"; sha256="04xn0512b36rn473a8j025x5dqwi8kc45rr3iap5ai4wdcrb712z"; 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.10.0"; sha256="1laksjn2yh5lr8qd1j2vfkyvxyy2a0lylqs7cfc7vkpa7bbplrg2"; depends=[crul geojson geojsonsf jqr jsonlite lifecycle 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.3"; sha256="1la6zfzv14ascwds0bp67d7x3am0v14mylc4b2lyd0nrf93a2p17"; depends=[geometries jsonify rapidjsonr Rcpp sfheaders]; }; - geoknife = derive2 { name="geoknife"; version="1.6.8"; sha256="0qxj86zb5zvjp9p235z16vkbydfykw3dx2xdcvkjcfxzg0c5ym3z"; depends=[curl httr progress sf whisker xml2]; }; + geoknife = derive2 { name="geoknife"; version="1.6.9"; sha256="1x2q3g31nha9dc96a0ch4pbxyx090wr4hndk704b5rm646ifv6pz"; depends=[curl httr progress sf whisker xml2]; }; geomander = derive2 { name="geomander"; version="2.1.0"; sha256="1ban8kss608fx4w64xl3m9zc1bf05alqfqrgv35rdrxw756iqv6a"; depends=[censable cli dataverse dplyr geos ggplot2 magrittr Rcpp readr rlang sf stringr tibble tidyr tigris]; }; geomapdata = derive2 { name="geomapdata"; version="2.0-0"; sha256="0mq7hxyyi1ikwdmh7ns9rnkvp2q5s48441i8msx8621scxdv6ga4"; depends=[]; }; geomaroc = derive2 { name="geomaroc"; version="0.1.1"; sha256="09j48ms1j7sqakznd2bj6sks1b6ckhch7ydhbdky4jk2acvl7lqw"; depends=[jsonlite sf]; }; - geomerge = derive2 { name="geomerge"; version="0.3.2"; sha256="1i6n88k8icwihr9w7ipjb50f68zad602dipb3hd887y4kyf14wni"; depends=[geosphere ggplot2 gridExtra inlmisc lubridate raster scales sp spdep]; }; + geomerge = derive2 { name="geomerge"; version="0.3.3"; sha256="043dg8q9jjfql4wlya17zqz33wg6c6crvxbsq3srlp7mppvapylh"; depends=[geosphere ggplot2 gridExtra lubridate raster scales sp spdep]; }; geometa = derive2 { name="geometa"; version="0.7-1"; sha256="18gr82k665y00h8mrq97mrr9l7p4m9m8b49dbgsh22hbz7j7c542"; depends=[crayon httr jsonlite keyring R6 readr 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.6.1"; sha256="0wplszaxi6phxffp3zww5alwnfbh9521qi43h65w057lrm1pmj2j"; depends=[linprog lpSolve magic Rcpp RcppProgress]; }; geomorph = derive2 { name="geomorph"; version="4.0.4"; sha256="02kbihr5r0zj24x499zhfvpqx7zadyhxmznnq0fvy1mwf28d5pnz"; depends=[ape ggplot2 jpeg Matrix rgl RRPP]; }; geomtextpath = derive2 { name="geomtextpath"; version="0.1.1"; sha256="0i5m1v8mn23krp7ha502v3kv5wpwdy8na4x3nqlg3zld293dybz4"; depends=[ggplot2 rlang scales systemfonts textshaping]; }; geonames = derive2 { name="geonames"; version="0.999"; sha256="0yz1b7y3vwa4izrhpry4n3iwzb7y67s5p3kgnd7d29cl5pcbpmqx"; depends=[rjson]; }; geonapi = derive2 { name="geonapi"; version="0.6-1"; sha256="1gmz05nwqbx4dc3zpd58an86101r6345cja386dgi2hyggg5cqbn"; depends=[geometa httr keyring openssl R6 XML]; }; - geonet = derive2 { name="geonet"; version="0.7.3"; sha256="0kp0a1bd8yyvp8w044arawyfmxwmqln3dqk0jzvz1vhbhldgy27s"; 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]; }; geos = derive2 { name="geos"; version="0.2.2"; sha256="0hmiskdwzlgabwhayw7hwi6nqria976xzz6xm95644w7fx723wd7"; depends=[libgeos wk]; }; geosapi = derive2 { name="geosapi"; version="0.6-4"; sha256="1h3yfhp68i4zm53mgpfq323fw3v9c3z5va2y296jgwhazypjhz9r"; depends=[httr keyring openssl R6 readr XML]; }; geoscale = derive2 { name="geoscale"; version="2.0.1"; sha256="1ykzxbwjdy0xi5hj5r201j3wrgahcxvxrgp40mqlw7zj80wgdgif"; depends=[]; }; geosed = derive2 { name="geosed"; version="0.1.1"; sha256="07j4q6sgrf83h2gi2j5qap5rifz8gimdacd3b7ld1p3b6ai6kv3r"; depends=[]; }; - geosimilarity = derive2 { name="geosimilarity"; version="1.1"; sha256="1pailxz87f50p7w8r2ryb7zsvwzgiz1l4iwj47kj633h5vbakx5r"; depends=[SecDim]; }; + geosimilarity = derive2 { name="geosimilarity"; version="2.2"; sha256="1mkab3377r04zybqsswakcgqwgby9iwb8bhxkr8s27blxha44jcp"; depends=[DescTools dplyr ggplot2 ggrepel SecDim]; }; geospark = derive2 { name="geospark"; version="0.3.1"; sha256="004axa0k9xg1hra8jihwgnc379k8pib1h0zkr82j0m9sii4wrk6r"; depends=[dbplyr dplyr sparklyr]; }; - geosphere = derive2 { name="geosphere"; version="1.5-14"; sha256="0bg4vfmrw140j2ax0p6bflvb77w03ir39wa87l96rj473jpa9hzj"; depends=[sp]; }; + geosphere = derive2 { name="geosphere"; version="1.5-18"; sha256="1h6sqvxwxv22js6hz4s8sjk50ygw0y34icbbbdb2v36ca3q6zzwr"; depends=[Rcpp sp]; }; geospt = derive2 { name="geospt"; version="1.0-2"; sha256="1814nn0naxvbn0bqfndpmizjbqcs6rm87g2s378axkn6qpii4bh8"; depends=[fields genalg gsl gstat limSolve MASS minqa plyr sgeostat sp TeachingDemos]; }; geosptdb = derive2 { name="geosptdb"; version="1.0-1"; sha256="1n1jvigavcxlbc5wki74lnhax3060i44m1cvkcr664wsjqhx3kl2"; depends=[FD fields geospt gsl limSolve minqa sp StatMatch]; }; - geostan = derive2 { name="geostan"; version="0.4.0"; sha256="1lp1bfpcj7809wmw9hkdzqxdfld9vlr3g5x1m0zhi61zz6g73nld"; depends=[BH ggplot2 gridExtra MASS Matrix Rcpp RcppEigen RcppParallel rstan rstantools sf signs spdep StanHeaders truncnorm]; }; + geostan = derive2 { name="geostan"; version="0.4.1"; sha256="0ld8mhlii8hrzlxqm9wj4kzwafink5zm45mah804qa7p4i78l363"; depends=[BH ggplot2 gridExtra MASS Matrix Rcpp RcppEigen RcppParallel rstan rstantools sf signs spdep StanHeaders truncnorm]; }; geostats = derive2 { name="geostats"; version="1.5"; sha256="18f4b6l2qm72dc561q304azi5z4nrlg99zzgkxc406473qadqy0w"; depends=[]; }; geotools = derive2 { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; }; geotopbricks = derive2 { name="geotopbricks"; version="1.5.4"; sha256="1mn15mchxkv9qqjrcsyx0pf56sdz0ba7i5jd1ci1ilr6rig81ckz"; depends=[raster rgdal stringr zoo]; }; @@ -9780,7 +9832,7 @@ in with self; { geozoo = derive2 { name="geozoo"; version="0.5.1"; sha256="0g91yhg7zw1bp0lxxblr2irckjg2rl4pg1vgglccnmxkzn0ji2qi"; depends=[bitops]; }; gepaf = derive2 { name="gepaf"; version="0.1.1"; sha256="0n36w40jrq3qkgmhz9wrnhp6fczw7bm96g950sa4nq33872xhfgm"; depends=[bitops]; }; germinationmetrics = derive2 { name="germinationmetrics"; version="0.1.7"; sha256="03573110wrmr9m2zvcmqqhrlm8k24x1z1vslyry75bcs2jm8fk4z"; depends=[broom data_table ggplot2 ggrepel mathjaxr minpack_lm plyr Rdpack]; }; - gert = derive2 { name="gert"; version="1.9.1"; sha256="1p8z5qap06qf680r25y78wgnprzl9ib3xp3kvsw01bh819v1h7bm"; depends=[askpass credentials openssl rstudioapi sys zip]; }; + gert = derive2 { name="gert"; version="1.9.2"; sha256="0pk6mf300kh6wwzvaqymwzlikkbf8zj0xpslgyydn7zvr95ipjj2"; depends=[askpass credentials openssl rstudioapi sys zip]; }; 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.2.0"; sha256="0p8xrlmc81irh9s2c57sxgmvdjmmgmya0h31904c4cwi9aa32f4z"; depends=[rlang]; }; @@ -9792,11 +9844,10 @@ in with self; { 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=[]; }; + getip = derive2 { name="getip"; version="0.1-2"; sha256="0qk994ip5d4m827n0lz6lhpvdbmz2gqpl4513r82s7ckkzg2rvyp"; depends=[]; }; getlandsat = derive2 { name="getlandsat"; version="0.2.0"; sha256="15450v93lc4i2qda0zlb5vplwbarkmf3f6sb4rlrdpv9vlj85hff"; depends=[crul data_table rappdirs readr tibble xml2]; }; getmstatistic = derive2 { name="getmstatistic"; version="0.2.2"; sha256="100m5cbwx9anlh1hzjv7d1h1viqsxb0bx0ksc1dsjx3gqrf77q1n"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; }; getopt = derive2 { name="getopt"; version="1.20.3"; sha256="0zzmzgwl9a4y3s34600vmih22d6y32294f9bvxrnmffnvkgmy7sk"; depends=[]; }; - getpublist = derive2 { name="getpublist"; version="0.1.0"; sha256="0p6l7qha6i7vhqvav74yxpa6qph35g41v00173mjjqsvyhd0qc5i"; depends=[dplyr magrittr rvest stringr tibble tidyr xml2]; }; gets = derive2 { name="gets"; version="0.37"; sha256="1h7hn8n08sqnygbzyiq9zg11b5i9g6islc72c0qypx4j4wba5z55"; depends=[zoo]; }; getspres = derive2 { name="getspres"; version="0.2.0"; sha256="190y4qrm1wawp0787zhw3g8h9s2smacvvxbs70pxbhysq4bkzcdd"; depends=[colorRamps colorspace dplyr metafor plotrix RColorBrewer]; }; gettz = derive2 { name="gettz"; version="0.0.5"; sha256="0dgzw5mji5983588vj6q2kyjv9dngmrd0ilrkhfc3b4ngvfq61mf"; depends=[]; }; @@ -9815,6 +9866,7 @@ in with self; { gfpop = derive2 { name="gfpop"; version="1.1.0"; sha256="0kqvna57q8a1ybzj5svw1k5qvnpd9n7c0jg6gyx1y00si3vazd84"; depends=[Rcpp]; }; gg_gap = derive2 { name="gg.gap"; version="1.3"; sha256="0m66050ryn31xmsmmikjsssllasvjdmp9yjbwfdwfpwdv106zn9h"; depends=[cowplot ggplot2]; }; ggBubbles = derive2 { name="ggBubbles"; version="0.1.4"; sha256="116rl8j0s9xwhh9jl5yj9fspkhv2zrirbx9247hhns9ngrdn4i3x"; depends=[dplyr ggplot2]; }; + ggChernoff = derive2 { name="ggChernoff"; version="0.3.0"; sha256="0dkr3vl4a3css19j53x1c1gxxgjg57d444ahxrrrxsyva49lnq1y"; depends=[ggplot2 scales]; }; ggDCA = derive2 { name="ggDCA"; version="1.1"; sha256="0jpg7n6nk2jgq668ff0l9zk26zk39abc74f6w5x8gf4zsb8y0zp9"; depends=[base_rms do ggplot2 rms set survival]; }; ggDoE = derive2 { name="ggDoE"; version="0.7.8"; sha256="1732jbrqhygip1g8l7zlsz57bqkmandh15w5r94nm1g6s48f7aak"; depends=[data_table ggplot2 insight]; }; ggDoubleHeat = derive2 { name="ggDoubleHeat"; version="0.1.1"; sha256="0s9dpjkphmavvhcrsdjr7i4nq39cp55k43y6jhkx2glc198a73fq"; depends=[ggnewscale ggplot2 rlang]; }; @@ -9830,6 +9882,7 @@ in with self; { ggThemeAssist = derive2 { name="ggThemeAssist"; version="0.1.5"; sha256="1biw91a8p13h62v4w3yim6ghr98khmyhb3qd0h04asf91vvmpxbv"; depends=[formatR ggplot2 miniUI rstudioapi shiny]; }; ggTimeSeries = derive2 { name="ggTimeSeries"; version="1.0.2"; sha256="0sd39svwi3ai81szahd49a8qvsydi1922z4q6r2r70fpbfwi4qrq"; depends=[data_table ggplot2]; }; ggVennDiagram = derive2 { name="ggVennDiagram"; version="1.2.2"; sha256="1l4cincm7c2q9x3djiv1lm9bvivaqk7kincx19b8f760wz9hp74k"; depends=[dplyr ggplot2 magrittr plotly purrr RVenn sf tibble yulab_utils]; }; + ggalignment = derive2 { name="ggalignment"; version="1.0.1"; sha256="1rqndv1xqz350v6a23pfrl4zkwjyh4zg633kwcxnv57v0g01mmif"; depends=[dplyr ggimage ggplot2 magrittr rlang]; }; ggallin = derive2 { name="ggallin"; version="0.1.1"; sha256="0hrxa7m07ppvnndivxcgxksdyblb6fw17aw46maqavlvcrz3fjgm"; depends=[ggplot2 scales]; }; ggalluvial = derive2 { name="ggalluvial"; version="0.12.3"; sha256="0mkan9gxg3yxjism22yxbhvlh2lh7wpbrqpb355za790prcmjbh3"; depends=[dplyr ggplot2 lazyeval rlang tidyr tidyselect]; }; ggalt = derive2 { name="ggalt"; version="0.4.0"; sha256="0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc"; depends=[ash dplyr extrafont ggplot2 gtable KernSmooth maps MASS plotly proj4 RColorBrewer scales tibble]; }; @@ -9838,21 +9891,21 @@ in with self; { ggarchery = derive2 { name="ggarchery"; version="0.4.1"; sha256="12wikn28pm6mvl87f91fn21dayrs2jjy5wqy7mba0lnc1zkszd0y"; depends=[dplyr ggplot2 glue magrittr purrr rlang tidyr]; }; ggasym = derive2 { name="ggasym"; version="0.1.6"; sha256="1vgsqq2m4w5clmf27mmj6jqn2s8m1izz3gj2bxqpmdcvzf5vxkgr"; depends=[dplyr ggplot2 magrittr purrr rlang scales stringr tibble tidyr]; }; ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.6.0"; sha256="0crk29p5vi1r3a988kms4y7r0iqwgwzsikgvh18r9wbzyr98bb5v"; depends=[beeswarm ggplot2 vipor]; }; - ggblanket = derive2 { name="ggblanket"; version="1.5.0"; sha256="18690ayh9y219xxs1x2aa9pf8w508vzgsyz4g8fbikrw7vwp8m4w"; depends=[dplyr forcats ggplot2 hms lubridate magrittr purrr rlang scales snakecase tidyr tidyselect viridis]; }; + ggblanket = derive2 { name="ggblanket"; version="1.6.1"; sha256="1yjmyjs1s50zds5qmlvi8j0q3d97sivd4ra2b7418wm7qnkl9zjz"; depends=[dplyr forcats ggplot2 hms lubridate magrittr purrr rlang scales snakecase stringr tidyr tidyselect viridis]; }; ggborderline = derive2 { name="ggborderline"; version="0.2.0"; sha256="1acb3z2dwasmn4ngc7wqk3y4n34ah3fhdxsbdl3dmbc75nmdsn5a"; depends=[cli ggplot2 rlang vctrs]; }; + ggbrain = derive2 { name="ggbrain"; version="0.8.0"; sha256="1c5lcmvsgjvwabwvkq7g19p35fzb25q5919ia1adzqfwr8a2zhpy"; depends=[checkmate data_table dplyr ggnewscale ggplot2 ggrepel glue imager Matrix patchwork Rcpp RcppArmadillo rlang RNifti tibble tidyr tidyselect]; }; ggbreak = derive2 { name="ggbreak"; version="0.1.1"; sha256="1jscvyphjx837lbb9mxdqaaknkp8krgapak91ykv1xv150xwr7cs"; 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]; }; ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.4"; sha256="186a0mpdpipp24fjbd52l1gdgpqm6vl83ff8069d8nngyqbrx0jr"; depends=[ggplot2 reshape2]; }; - ggcorset = derive2 { name="ggcorset"; version="0.3.0"; sha256="1md6krsq4qmdix4x141azyaa02f64shzkw591zz9ay7jhpx70r59"; depends=[dplyr gghalves ggplot2 ggstance]; }; + ggcorset = derive2 { name="ggcorset"; version="0.4.5"; sha256="18i7xj3h0v556y2m7b1cnlqhzfp9jv5gpchhz5rmm8d6y3k4czii"; depends=[dplyr gghalves ggplot2 ggstance]; }; ggcoverage = derive2 { name="ggcoverage"; version="0.7.1"; sha256="088gyc6054d8xx3k3pg5i40cnvyryyq4k6rn214li0yslj3fphyi"; depends=[Biostrings BSgenome dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggbio ggh4x ggplot2 ggrepel IRanges magrittr patchwork RColorBrewer reshape2 rlang Rsamtools rtracklayer S4Vectors scales seqinr]; }; ggdag = derive2 { name="ggdag"; version="0.2.7"; sha256="1p31806zm2fg8b3lq1v1j0k4bzak0yi73sqzc0gm7piwqswfny70"; depends=[dagitty dplyr forcats ggplot2 ggraph ggrepel igraph magrittr pillar purrr rlang stringr tibble tidygraph]; }; ggdark = derive2 { name="ggdark"; version="0.2.1"; sha256="1w93g2j4g45x9s841v9zi18lxzda81ipa13fajqc6p9xk8frvgrf"; depends=[ggplot2]; }; - ggdemetra = derive2 { name="ggdemetra"; version="0.2.2"; sha256="1j0nwmv2acyrkpn230jj6yf5nnl40kpqdqaglrnrfqw5rp357krp"; depends=[ggplot2 ggrepel gridExtra RJDemetra]; }; + ggdemetra = derive2 { name="ggdemetra"; version="0.2.3"; sha256="1vyjg7kzf9xq0kxrcjzr2nmd74dc35i9kpahz1wf9jvvq8l33w60"; depends=[ggplot2 ggrepel gridExtra RJDemetra]; }; ggdendro = derive2 { name="ggdendro"; version="0.1.23"; sha256="1f4fz9llmbpb8gh90aid7dvriadx16xdhsl7832yw4pyqj4fjcrs"; depends=[ggplot2 MASS]; }; ggdensity = derive2 { name="ggdensity"; version="0.1.1"; sha256="05brrczlvrqkcjizla920490h3fbcfldpysrv7xj4jy7hpzwfn16"; depends=[ggplot2 isoband MASS scales tibble vctrs]; }; ggdist = derive2 { name="ggdist"; version="3.2.0"; sha256="0ihy27d45gifxn8yc9w5g3cn3kmbk268mxipmvmdd0mjxgcqkj89"; depends=[distributional dplyr ggplot2 glue HDInterval numDeriv rlang scales tibble tidyselect vctrs withr]; }; @@ -9862,23 +9915,23 @@ in with self; { ggedit = derive2 { name="ggedit"; version="0.3.1"; sha256="10fbjqq6l7wfibi65mq423w7v8gymr541if749qhsnd9b2jyhaj5"; depends=[colourpicker dplyr ggplot2 magrittr miniUI plyr purrr rlang rstudioapi scales shiny shinyAce shinyBS tidyr]; }; ggeffects = derive2 { name="ggeffects"; version="1.1.4"; sha256="1j3l5v00f3xx2pwwfg1z9y31h8qja88nx7lycwj1y55ry5i6drr1"; depends=[insight]; }; ggenealogy = derive2 { name="ggenealogy"; version="1.0.1"; sha256="19six9ln1yaqv268abm9qvb61nl8zdz3gghwr8hmwsa94xwhzhkq"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; }; - ggetho = derive2 { name="ggetho"; version="0.3.6"; sha256="1iv0vad8y85bvz8rx0flqyrb38d79j9fhmd6ay5siyccigi88clj"; depends=[behavr data_table ggplot2 labeling rlang scales stringr]; }; + ggetho = derive2 { name="ggetho"; version="0.3.7"; sha256="0bdqx3x42jp22bs297nhdgzvywhq4cy0lwmwprl7vmjjh8lwvkxk"; depends=[behavr cli data_table ggplot2 labeling rlang scales stringr]; }; ggfan = derive2 { name="ggfan"; version="0.1.3"; sha256="1p3hbznpsaznlk0lnjyazc130www0p5919qplg3kspng7qh8p22w"; depends=[colorspace dplyr ggplot2 rstan]; }; ggfittext = derive2 { name="ggfittext"; version="0.9.1"; sha256="0yckj6awx42yrlv7lfq9jplnzqv5lpvgmb0327bx14pc3q36055f"; depends=[ggplot2 shades stringi]; }; ggfocus = derive2 { name="ggfocus"; version="1.0.0"; sha256="03q0rz7flm8sc8hrlkcm5fz66qiyxb8z8q4bh9dglhw0jc8q1fvb"; depends=[dplyr ggplot2 magrittr RColorBrewer rlang]; }; ggforce = derive2 { name="ggforce"; version="0.4.1"; sha256="0wqq8l7lq96k4w0vq12jcg7clvgia8s35jjbqq1s0py4cgxijhml"; depends=[cli ggplot2 gtable lifecycle MASS polyclip Rcpp RcppEigen rlang scales systemfonts tidyselect tweenr vctrs withr]; }; ggformula = derive2 { name="ggformula"; version="0.10.2"; sha256="0xb39gjn6q7va1d1fhvf2dw9428s1q13wasx4y3cz2f0lls1r2wl"; 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.7"; sha256="0x71p3mm0sw72hv92368wy2yiy7zv826p3kddpwndqv1bywmyfx8"; depends=[ggplot2 rlang]; }; + ggfortify = derive2 { name="ggfortify"; version="0.4.15"; sha256="1cfwv8jjy1yk0l5wnp48ql1javvrzq1wnh1lv49xp6rynz00lxm8"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; }; + ggfun = derive2 { name="ggfun"; version="0.0.9"; sha256="04kn367mzgrfwnwz97vw5jqp2kig94hmxmhyyic7ddvk3sfhwx2w"; depends=[ggplot2 rlang]; }; ggfx = derive2 { name="ggfx"; version="1.0.1"; sha256="1lys5lzlilzvd6dm7rkxv7nvnp80fajl5yzhpwcbb5az5832ik27"; depends=[ggplot2 gtable magick ragg rlang]; }; gggap = derive2 { name="gggap"; version="1.0.1"; sha256="1iidxm7qcrg0isw2q27cmjbfb3pkfj5jcg1nj8lgy6xmydw3vrw3"; depends=[cowplot ggplot2]; }; gggenes = derive2 { name="gggenes"; version="0.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.2-0"; sha256="0g8msi5qpnr2npcgjvdjncrq6p61ddpzasy5g0fxqbybbpfxsyi8"; depends=[ggplot2]; }; - ggh4x = derive2 { name="ggh4x"; version="0.2.2"; sha256="11mskrby3gyjhkvnkcwl2ar1bdh4h45y48dfnm4kzgc7nwvdl3ia"; depends=[cli ggplot2 gtable lifecycle rlang scales vctrs]; }; + ggh4x = derive2 { name="ggh4x"; version="0.2.3"; sha256="0da5r8zfx1ixhk266byspfm2aifhm0jrvbk264xya712pxayiw4a"; depends=[cli ggplot2 gtable lifecycle rlang scales vctrs]; }; gghalfnorm = derive2 { name="gghalfnorm"; version="1.1.2"; sha256="1sy0m6pqmnjbqv60rljyblhis0dxwkhw751jhlad5arcgrcwf4k8"; depends=[ggplot2 ggrepel]; }; - gghalves = derive2 { name="gghalves"; version="0.1.3"; sha256="1lj4c38fzxwg8gy57ymf00lqjdplb7v2a0lnd262c1d5cavqiws4"; depends=[ggplot2 gtable]; }; + gghalves = derive2 { name="gghalves"; version="0.1.4"; sha256="1qsxq2zbz4zcpqc7949apznn9f2c959jwwx010bl4gf2p6vchfx7"; depends=[ggplot2 gtable]; }; gghdr = derive2 { name="gghdr"; version="0.2.0"; sha256="1id0ky2mf656xqsmg76f627zw8iff4q1wzgih32nryk0hfvm2gfi"; depends=[digest farver ggplot2 hdrcde scales tibble]; }; ggheatmap = derive2 { name="ggheatmap"; version="2.2"; sha256="13cf3xk5drb6dfr3gcbgfi0hk6akk9b3g9f3c2jy6hz8rz5xnyn6"; depends=[aplot factoextra ggplot2 ggpubr patchwork tibble tidyr]; }; gghighlight = derive2 { name="gghighlight"; version="0.4.0"; sha256="0vfcn3gg6j7g20n2z1iwr94jnpqn0zl5j9jfc8bnbsrmz49dzqpd"; depends=[dplyr ggplot2 ggrepel lifecycle purrr rlang tibble]; }; @@ -9887,17 +9940,17 @@ in with self; { ggimg = derive2 { name="ggimg"; version="0.1.2"; sha256="1ynfq8lwlw851j00k7mm63w5yyqkd7v67fs8g2nwxk7ac0wb44ph"; depends=[abind ggplot2 jpeg png]; }; gginference = derive2 { name="gginference"; version="0.1.3"; sha256="1r960cglnkii8xih4r1r7wd857jqn53f08zi9dnj54bpqrs374zx"; depends=[ggplot2 rlang]; }; gginnards = derive2 { name="gginnards"; version="0.1.1"; sha256="0rwg9yan73ca4s8nd8x6xyjs68mvz4lxns5xmkvb8lf0fs9pkahn"; depends=[ggplot2 magrittr rlang stringr tibble]; }; - ggip = derive2 { name="ggip"; version="0.2.2"; sha256="1mqjd3bf05dln15s3qlf508260dzz888sm3n0a2ghd67x5jnxpqi"; depends=[dplyr ggplot2 glue ipaddress Rcpp rlang tidyr vctrs]; }; - ggiraph = derive2 { name="ggiraph"; version="0.8.3"; sha256="0vq5ymgnipzflgzhm880kyyrp784v6fvndmffzzn2q0pfjj772rr"; depends=[ggplot2 htmltools htmlwidgets purrr Rcpp rlang systemfonts uuid]; }; + ggip = derive2 { name="ggip"; version="0.3.0"; sha256="1wh7yj445152p9ynq2l1cp1cm2si88s3dbb9qpszimlzgqvzv8la"; depends=[cli dplyr ggplot2 ipaddress Rcpp rlang tidyr vctrs]; }; + ggiraph = derive2 { name="ggiraph"; version="0.8.5"; sha256="1fnv4bsm2avgaklmsbqs1gbixipifb8sfwiwnrbnsqycqh56n6wc"; depends=[ggplot2 htmltools htmlwidgets purrr Rcpp rlang systemfonts uuid vctrs]; }; 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]; }; ggisotonic = derive2 { name="ggisotonic"; version="0.1.2"; sha256="1jz1qhx51gzq6lbk24pjxc55nhzc6alsy9h870jn88mn9fpx4lhp"; depends=[dplyr fdrtool ggplot2]; }; ggjoy = derive2 { name="ggjoy"; version="0.4.1"; sha256="012md2m0jqfcccb933j423m3ck31v3p0pd41gjxpyg9082y7ixyj"; depends=[ggplot2 ggridges]; }; gglasso = derive2 { name="gglasso"; version="1.5"; sha256="12l0ac1n54z41yw7c00fm6q2mjmhp9blk4f8vp7q2my2xxwh1fmj"; depends=[]; }; - gglgbtq = derive2 { name="gglgbtq"; version="0.1.0"; sha256="1a5hnmmiw3prqg8w34da0g9x59a7zywlp1fcn6bdv589m68kbx53"; depends=[ggplot2]; }; - gglm = derive2 { name="gglm"; version="0.1.0"; sha256="12bqqh9614v0cv45czqh6w0in4hbhwmicvcw8l07zdhrn9aq7y9m"; depends=[ggplot2 patchwork rlang]; }; + gglgbtq = derive2 { name="gglgbtq"; version="0.1.1"; sha256="0z03rckalci6g9cd69mz3b7mz8q5z8313ci0q0qcfpkvfxmrz2py"; depends=[ggplot2]; }; + gglm = derive2 { name="gglm"; version="1.0.0"; sha256="1aq49lvscgxbf8nzxb67bzrn86lb02qg189qpgmvhdlynhzry05h"; depends=[broom broom_mixed dplyr ggplot2 metafor patchwork purrr rlang tibble tidyr vctrs]; }; 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]; }; + ggmap = derive2 { name="ggmap"; version="3.0.1"; sha256="0pg38zyxv1j6mwdwdqljynqrg7zjwqpsh65xdwmvbl0zgxa4p0pw"; depends=[bitops cli digest dplyr ggplot2 glue httr jpeg magrittr plyr png purrr RgoogleMaps rlang scales stringr tibble tidyr]; }; ggmatplot = derive2 { name="ggmatplot"; version="0.1.2"; sha256="0k062kqa9hrq1iyjwjj670sdk559zx1nxpbkk0sxkda2h235lxjr"; depends=[ggplot2]; }; ggmcmc = derive2 { name="ggmcmc"; version="1.5.1.1"; sha256="1y6ya2qihm8h6ds84akhmsxn9c8jriw03wakaqzsmi21agz87n21"; depends=[dplyr GGally ggplot2 tidyr]; }; ggmice = derive2 { name="ggmice"; version="0.0.1"; sha256="06asqqzjnlx8hl63nfl83l8x1bga59vhn4x2sl8j0v6bmcj0fnqm"; depends=[dplyr ggplot2 magrittr mice purrr rlang stringr tidyr]; }; @@ -9906,24 +9959,24 @@ in with self; { ggmotif = derive2 { name="ggmotif"; version="0.2.1"; sha256="1pqkl5zw4v6b81nbxcrpz44sjs4j65iw23j9xiy4d7yqj1bx7604"; depends=[ape cowplot data_table dplyr ggplot2 ggsci ggseqlogo ggtree magrittr memes patchwork stringr tidyverse treeio universalmotif XML]; }; ggmr = derive2 { name="ggmr"; version="0.1.1"; sha256="0941rvh7m5knlhp0m0mhm4j8spmch0pyvwhzs3bycq3vzlvzv1w7"; depends=[MASS]; }; ggmuller = derive2 { name="ggmuller"; version="0.5.4"; sha256="0y7bm9fm5i8acpy6fa903ca2r9yasky7kg2hicm4xz5ni09jm20x"; depends=[ape dplyr ggplot2]; }; - ggmulti = derive2 { name="ggmulti"; version="1.0.5"; sha256="1dgx161xsnvv2bg5ja2caxyc9sc6wahx4gwc3nk70m3nq9ibmqva"; depends=[dplyr ggplot2 tidyr]; }; + ggmulti = derive2 { name="ggmulti"; version="1.0.6"; sha256="0cynzl5aamm8ra6jz3j6n2frd680f35p3f38gcx12zsk1vzsl4fr"; depends=[cli 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.8"; sha256="004p5ai6rc5y8f6966k894jzw9v3m4zy36z50yapig7c85lzmzn7"; 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]; }; ggpackets = derive2 { name="ggpackets"; version="0.2.1"; sha256="1fdyr0m5rf1wy2pydvk12g7lw338iw026rxz98mv8kryrs32q7kh"; depends=[ggplot2 rlang]; }; - ggpacman = derive2 { name="ggpacman"; version="0.1.0"; sha256="1040d6aciyllrpszh7l7y55fw4dx8cya2yvj0x4i2fibvygz83p6"; depends=[dplyr gganimate ggforce ggplot2 magrittr purrr rlang tidyr]; }; ggpage = derive2 { name="ggpage"; version="0.2.3"; sha256="1qi8ydq3fxb1smk0jg9z1cv2xjq8c1lsnmz8l7c61rvdbjm3710v"; depends=[dplyr ggplot2 magrittr purrr rlang stringr tidytext]; }; ggparallel = derive2 { name="ggparallel"; version="0.2.0"; sha256="0zxaff0jbqkbavsmh1yyp3vdrxsam6a66hjw8lamv9pksdw1s2wf"; depends=[ggplot2 plyr reshape2]; }; 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]; }; ggpath = derive2 { name="ggpath"; version="1.0.0"; sha256="065h4yzg3x9c14393222vakskg3bzi5j6ys96wszls3sy35v1rvg"; depends=[cachem cli ggplot2 magick memoise rappdirs rlang]; }; - ggpattern = derive2 { name="ggpattern"; version="1.0.0"; sha256="09djvwdzvmqj6jk56vspbcvp598vkb9zvyvf83ym5mfp05yf3sf7"; depends=[ggplot2 glue gridpattern rlang scales]; }; + ggpattern = derive2 { name="ggpattern"; version="1.0.1"; sha256="1b9bfxlg64gr39bz58fp6jmg4nziwk8rk94rzpjsqhfhpwi2lrgr"; depends=[ggplot2 glue gridpattern rlang scales]; }; + ggpcp = derive2 { name="ggpcp"; version="0.2.0"; sha256="1xkxsxnxcyy8rrazzbl38g405cxjjjz6a720cdm4bsk03q2q4rar"; depends=[assertthat dplyr ggplot2 rlang tibble tidyr tidyselect]; }; ggperiodic = derive2 { name="ggperiodic"; version="1.0.2"; sha256="14x8gg54l18z12cgvka2qf1clhi8zlma5xb71yl4j32gbffhpybp"; depends=[data_table dplyr ggplot2 sticky tidyselect]; }; - ggpie = derive2 { name="ggpie"; version="0.2.4"; sha256="15r8cx07y0glwvb5xlqdkxfrxcwhwlp6w6ah13z96mgdpvqh0p3i"; depends=[cowplot dplyr ggnewscale ggplot2 ggrepel magrittr RColorBrewer rlang scales stringr tibble]; }; + ggpie = derive2 { name="ggpie"; version="0.2.5"; sha256="11c431ggrhyxiql1v9qajp568jri6hlp1kgl334j4f7sgyh73ng5"; depends=[dplyr ggnewscale ggplot2 ggrepel magrittr RColorBrewer rlang scales stringr tibble]; }; ggplot_multistats = derive2 { name="ggplot.multistats"; version="1.0.0"; sha256="1afzfa86vc484bcwpg7m1ky03jpax584rigzgai8w06pifkmz0il"; depends=[ggplot2 hexbin rlang scales]; }; - ggplot2 = derive2 { name="ggplot2"; version="3.3.6"; sha256="1aa377jdfajj8ld2fh159y8havlibsr4pjisf6mkzk8g5awlxjxz"; depends=[digest glue gtable isoband MASS mgcv rlang scales tibble withr]; }; + ggplot2 = derive2 { name="ggplot2"; version="3.4.0"; sha256="0gj7n2y8msnmhk3x4r481biknvn2dqhahwazfqwr8f3lz599wbx8"; depends=[cli glue gtable isoband lifecycle MASS mgcv rlang scales tibble vctrs withr]; }; ggplot2movies = derive2 { name="ggplot2movies"; version="0.0.1"; sha256="067ld6djxcpbliv70r2c1pp4z50rvwmn1xbvxfcqdi9s3k9a2v8q"; depends=[]; }; ggplotAssist = derive2 { name="ggplotAssist"; version="0.1.3"; sha256="1g0s1dkbrxmwqjqppagdbnx24s0nbjn09xwxix3dkfssz6drhala"; depends=[dplyr editData gcookbook ggplot2 ggthemes magrittr miniUI moonBook rstudioapi scales shiny shinyAce shinyWidgets stringr tibble tidyverse]; }; ggplotgui = derive2 { name="ggplotgui"; version="1.0.0"; sha256="1yfglg5438mwyml845isimzma5q6824x19jka509ng49bzmf1za0"; depends=[ggplot2 haven plotly RColorBrewer readr readxl shiny stringr]; }; @@ -9935,9 +9988,9 @@ in with self; { ggpol = derive2 { name="ggpol"; version="0.0.7"; sha256="11xr26kwmkjjb51wm44ydv0vcinc6k6faqwx4s2faj4iwidlys1m"; depends=[dplyr ggplot2 glue gtable plyr rlang tibble]; }; ggpolar = derive2 { name="ggpolar"; version="0.2.2"; sha256="18m0nd74cz30gr961404wnib5v2wddpf1iv453s5dri0vxlmdl6w"; depends=[ggplot2 rlang]; }; ggpolypath = derive2 { name="ggpolypath"; version="0.2.0"; sha256="1ii9a0f0aniwf989n72dy9bh9f708qxhdy5xgml23ln6n4wf9wr0"; depends=[ggplot2]; }; - ggpp = derive2 { name="ggpp"; version="0.4.5"; sha256="02inwvfz2zxsj7bq0nz11c5spnyaf8zhjnlfllpwfjfy46qrx2p9"; depends=[dplyr ggplot2 glue gridExtra lubridate magrittr MASS polynom rlang scales stringr tibble xts zoo]; }; - ggprism = derive2 { name="ggprism"; version="1.0.3"; sha256="09dh0r8r5s61i5dbk6rswajc2vm7k8wvlqyvzq8wr160676lycjp"; depends=[digest ggplot2 glue gtable rlang scales tibble]; }; - ggpubr = derive2 { name="ggpubr"; version="0.4.0"; sha256="0x86lmghr25k8w90yrp360dn42dhp5cjvjpdiv2s2gxfn701xcmb"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif glue gridExtra magrittr polynom purrr rlang rstatix scales tibble tidyr]; }; + ggpp = derive2 { name="ggpp"; version="0.5.0"; sha256="0zmxnzsdmwv9v77fifgiknalwif59261kslq8848x1xch8f82l77"; depends=[dplyr ggplot2 glue gridExtra lubridate magrittr MASS polynom rlang scales stringr tibble xts zoo]; }; + ggprism = derive2 { name="ggprism"; version="1.0.4"; sha256="0ycklp7764cw65hqh9r61im8vqfd7sjayyw1gvprxzg7k217gnl3"; depends=[digest ggplot2 glue gtable rlang scales tibble]; }; + ggpubr = derive2 { name="ggpubr"; version="0.5.0"; sha256="0fbm3rcpsabb7j7sdr69scqiq1bnx2623ji9ap9v4rmqqy8s08gv"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif glue gridExtra magrittr polynom purrr rlang rstatix scales tibble tidyr]; }; ggpval = derive2 { name="ggpval"; version="0.2.5"; sha256="09wjfkmsh165xiw1dab6c8qb9wrnzm1q1sbfnbzyg99wsk480bgy"; depends=[data_table ggplot2]; }; ggquickeda = derive2 { name="ggquickeda"; version="0.2.2"; sha256="15rla5gi6m10dsmx501wfhs4lfa1wf007nimyr22qbcabd7277zc"; depends=[colourpicker dplyr DT Formula GGally ggbeeswarm ggplot2 ggpmisc ggpubr ggrepel gridExtra Hmisc markdown plotly quantreg rlang RPostgres scales shiny shinyFiles shinyjqui shinyjs stringr survival survminer table1 tidyr zoo]; }; ggquiver = derive2 { name="ggquiver"; version="0.3.2"; sha256="1nzqfm9byr0bmj0l6fdf8afymbhc6qjq5iff3wnng7gqqaa9s6dc"; depends=[ggplot2]; }; @@ -9945,37 +9998,39 @@ in with self; { ggraptR = derive2 { name="ggraptR"; version="1.3"; sha256="1i6jp0n1sz5b4sv3d4h5624zhlknih2qp6p2m2ri6s3gsh1pl9zz"; depends=[dplyr ggplot2 pacman purrr shiny]; }; ggrasp = derive2 { name="ggrasp"; version="1.2"; sha256="0jl4bmhsisqc7nam8r027lr1qp0yr6bvdiyycknp7bkl65cg2x1z"; depends=[ape bgmm colorspace ggplot2 mixtools]; }; ggrastr = derive2 { name="ggrastr"; version="1.0.1"; sha256="07sx5wlawfyb0zy5am2q1ajhkdym5r9ih47p57l8bv4dlc7ykml2"; depends=[Cairo ggbeeswarm ggplot2 png ragg]; }; - ggrcs = derive2 { name="ggrcs"; version="0.2.4"; sha256="193alhp305flr1pbpi7szp6i2h1idalfd4z7n2fpbhwnkdxpvhv4"; depends=[ggplot2 rms scales]; }; - ggrepel = derive2 { name="ggrepel"; version="0.9.1"; sha256="1z5xyr5f4aryy0v1gzz9m8m4s5fzzwbrf0fxll1nbflr8xnr3yr9"; depends=[ggplot2 Rcpp rlang scales]; }; + ggrcs = derive2 { name="ggrcs"; version="0.2.6"; sha256="1hvyvvm6nlgqfh7lmgqyqsi2gy43k5n5a6205hx85da9h9qw8n8s"; depends=[ggplot2 rms scales]; }; + ggredist = derive2 { name="ggredist"; version="0.0.2"; sha256="1p5bzqi4g5ri0m0nlwra6vps4sil7qc56cd8nzp0xh7k1gl598ig"; depends=[ggplot2 scales]; }; + ggrepel = derive2 { name="ggrepel"; version="0.9.2"; sha256="123lh86qs7w1i3v8i1a08jxlwx4sy32bpznyclm8wlkph728hc0a"; depends=[ggplot2 Rcpp rlang scales]; }; ggridges = derive2 { name="ggridges"; version="0.5.4"; sha256="0lfqx21g09s3fp74mld47qfx1nnav18xqj37griyqk406hh1rxrb"; depends=[ggplot2 scales withr]; }; ggrisk = derive2 { name="ggrisk"; version="1.3"; sha256="02df3gcviax747d33v30m97jsazj7zdpjnhypfy38cg70yxidwg9"; depends=[cutoff do egg ggplot2 nomogramFormula reshape2 rms set survival]; }; ggroups = derive2 { name="ggroups"; version="2.1.2"; sha256="0fb6awfm4vn67pgmz50fljvp9mfxx1q29pirgv04dya8751srxgi"; depends=[]; }; ggsci = derive2 { name="ggsci"; version="2.9"; sha256="0g73x6grbka7ahjh6z23m3wrcifp5rdfdiasbl8lq4sp6rplxwaa"; depends=[ggplot2 scales]; }; ggseas = derive2 { name="ggseas"; version="0.5.4"; sha256="1jpdijwll5l7bg7cmjnklkxffysi9ckzg50rw2a2cd00zwby11q9"; depends=[ggplot2 rlang seasonal zoo]; }; + ggsector = derive2 { name="ggsector"; version="1.6.6"; sha256="0qaf8wl1mmwl3razyif08sh329p9j1jgqc0ls5szqirq3db4315i"; depends=[dplyr ggplot2 magrittr Matrix prettydoc rlang Seurat tibble tidyr]; }; ggseg = derive2 { name="ggseg"; version="1.6.5"; sha256="0495g3l71lagrmz3s3lxy4rkfr7gin8vn1m59fvcv7hmycn39i0k"; depends=[dplyr ggplot2 sf tidyr vctrs]; }; ggseg3d = derive2 { name="ggseg3d"; version="1.6.3"; sha256="1rpq2wgyyladz5nkngkvbf3cy4pw212dj1vfh7ksh0bxi7v1k6mh"; depends=[dplyr magrittr plotly scales tidyr]; }; ggseqlogo = derive2 { name="ggseqlogo"; version="0.1"; sha256="13q6kcpxrqxqbji889fx63p0nsi08lk5yymkchig75r5k1d18ky1"; depends=[ggplot2]; }; ggseqplot = derive2 { name="ggseqplot"; version="0.8.1"; sha256="1m4n4qfl21dafkl27ajvxj5vw99z9282qzcqk03z90nsnydbqm2r"; depends=[colorspace dplyr forcats ggh4x ggplot2 ggrepel ggtext glue patchwork purrr Rdpack tidyr TraMineR usethis]; }; - ggshadow = derive2 { name="ggshadow"; version="0.0.2"; sha256="08bnjl7zsa4kkjl4kadmwss84bngd36xqqly91lvv359qrzr9hzq"; depends=[ggplot2 glue rlang scales]; }; - ggside = derive2 { name="ggside"; version="0.2.1"; sha256="1vl7kzgmi5xxxsqvyg4cm4xwd3lfjgysay1lw6hri5vj22mnga5h"; depends=[ggplot2 glue gtable rlang scales tibble]; }; + ggshadow = derive2 { name="ggshadow"; version="0.0.5"; sha256="0cakz31hp97kdvdcyrp9p03nz81kypsn9sn6nxl7kb0n3rrrlav0"; depends=[cli ggplot2 glue rlang scales vctrs]; }; + ggside = derive2 { name="ggside"; version="0.2.2"; sha256="1z50z4xpxfpqdz26hja6xw3q403p00cr5qawjxl0qg4jixl7j65p"; depends=[ggplot2 glue gtable rlang scales tibble vctrs]; }; ggsignif = derive2 { name="ggsignif"; version="0.6.4"; sha256="02mjailzyqkdnzky60dgampw2sq6mnn7s66fk0lhy32s8apm280i"; depends=[ggplot2]; }; ggsn = derive2 { name="ggsn"; version="0.5.0"; sha256="04vnap83w06hbqqi5kgxmrdb3a13n5mcdk5lllymv6nrzvl84f2x"; depends=[ggmap ggplot2 maptools png sf]; }; ggsoccer = derive2 { name="ggsoccer"; version="0.1.6"; sha256="1b3cx2ym3pknshrxmdgwzyx92c1hl6kyvxm2s8izlaa21z8v6z59"; depends=[ggplot2]; }; ggsolvencyii = derive2 { name="ggsolvencyii"; version="0.1.2"; sha256="0jzj4iglgzwp6pfs5zr7mirdiqrrmbwdvl245b1fwf42rnxbqrq6"; depends=[dplyr ggplot2 magrittr tidyr]; }; ggsom = derive2 { name="ggsom"; version="0.4.0"; sha256="0qsih00rm3ng2zh6p2s7a35rh1qlvbkn82s53v765w60fjmhwkwf"; depends=[assertthat data_table dplyr entropy ggplot2 kohonen magrittr tibble tidyr]; }; - ggspatial = derive2 { name="ggspatial"; version="1.1.6"; sha256="0biisbbqgp5hfgkpvc88xf8xclq1hr95sxcv1jf819rm45ggmc9l"; depends=[abind ggplot2 glue rlang rosm scales sf tibble tidyr]; }; + ggspatial = derive2 { name="ggspatial"; version="1.1.7"; sha256="15v7g2ywxvy64ixl55j58qfzi41c7ykkh2ind4npf7n76q4ixpc3"; depends=[abind ggplot2 glue rlang rosm scales sf tibble tidyr]; }; ggspectra = derive2 { name="ggspectra"; version="0.3.9"; sha256="1x561b8vpiajj5icmcw99vcmkg451y7aimqzdz3vi8qmjmgshvi6"; depends=[ggplot2 ggrepel lubridate photobiology photobiologyWavebands rlang 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]; }; - ggstats = derive2 { name="ggstats"; version="0.1.0"; sha256="1ivkh5kni11ldwbgn322apcx4xqn6lhmh8g8fwq1cclr3w8pm12d"; depends=[broom_helpers cli dplyr forcats ggplot2 lifecycle magrittr scales tidyr]; }; - ggstatsplot = derive2 { name="ggstatsplot"; version="0.9.5"; sha256="0csgbqr8b9ar5x52y79fi91p6hpf4w94rj6pzl41a29d6x91d1fb"; depends=[correlation datawizard dplyr ggplot2 ggrepel ggsignif glue insight paletteer parameters patchwork performance purrr rlang statsExpressions tidyr]; }; + ggstance = derive2 { name="ggstance"; version="0.3.6"; sha256="0wk3gbi5365sndi02gwd4c33vcrj5p8cfwakwjg010y5hgxx96nd"; depends=[cli ggplot2 plyr rlang withr]; }; + ggstar = derive2 { name="ggstar"; version="1.0.4"; sha256="0m2knp1jf1x62nqd8ln4haw90jv69l7vjrhn4pdrywgmwhdrp8gd"; depends=[cli ggplot2 gridExtra scales]; }; + ggstats = derive2 { name="ggstats"; version="0.1.1"; sha256="1rjasjgyg64wcj2w701xkwg31rn2pirh2r5m7kj153k8gx3bx356"; depends=[broom_helpers cli dplyr forcats ggplot2 lifecycle magrittr scales tidyr]; }; + ggstatsplot = derive2 { name="ggstatsplot"; version="0.10.0"; sha256="1baph4gkih2f7wbgrr4xpcghmz9srzk1a5a8bi8r88217mx6ssjr"; depends=[correlation datawizard dplyr ggplot2 ggrepel ggsignif glue insight paletteer parameters patchwork performance purrr rlang statsExpressions tidyr]; }; ggstream = derive2 { name="ggstream"; version="0.1.0"; sha256="0d6g5916mfrg2srcqjhlpm4acp4g16vq9ks4x37yzkpr34vi5x7j"; depends=[dplyr forcats ggplot2 magrittr purrr tidyr]; }; ggstudent = derive2 { name="ggstudent"; version="0.1.1-1"; sha256="0qs27b4lksaaaspavkycbzf8cfjxjli7xrfjby71sl0lca3fwm1g"; depends=[dplyr ggplot2]; }; ggsurvey = derive2 { name="ggsurvey"; version="1.0.0"; sha256="1a50ac2546pxa35k59j4ih0csiyfjdgqfqwm3fb5ny7jx1mk0hmi"; depends=[dplyr ggplot2 hexbin survey]; }; - ggsurvfit = derive2 { name="ggsurvfit"; version="0.2.0"; sha256="0q7vg9sp1jwc29mdjwpp308h1wpzx6llriziql0w43lzxlrq34nl"; depends=[broom cli dplyr ggplot2 glue gtable patchwork rlang scales survival tidyr]; }; + ggsurvfit = derive2 { name="ggsurvfit"; version="0.2.1"; sha256="021gb8sdai7bsqjbq94bmzgszk2mibjdkg86rzm4grx8v91cr6lk"; depends=[broom cli dplyr ggplot2 glue gtable patchwork rlang survival tidyr]; }; ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; }; ggtea = derive2 { name="ggtea"; version="0.1.1"; sha256="04g8g17ziw13rxjzkvgy5yd0z15ypxk0b8fq2y1vk8acsqr2dv11"; depends=[ggplot2]; }; - ggtern = derive2 { name="ggtern"; version="3.3.5"; sha256="15hhn8msy0l8zbq8ms0zvg1iajn1c28gd77v3hp6dvwwsla8zzbd"; depends=[compositions ggplot2 gridExtra gtable hexbin latex2exp lattice MASS plyr proto scales]; }; + ggtern = derive2 { name="ggtern"; version="3.4.1"; sha256="0w0kg6755kfpczqpaly251fgqv31js9gdzr17x734l2adycji3yr"; depends=[compositions ggplot2 gridExtra gtable hexbin latex2exp lattice MASS plyr proto scales]; }; ggtext = derive2 { name="ggtext"; version="0.1.2"; sha256="10vrrxviv4yp9lqsanqvwsvbj64vn66hwm1w7860x1g58hf1g0l7"; depends=[ggplot2 gridtext rlang scales]; }; ggthemes = derive2 { name="ggthemes"; version="4.2.4"; sha256="0rw5f6axyz1pqn6qx9jwm38hjzn8bqs1nfjkvm96z3xnyn61cdbv"; depends=[ggplot2 purrr scales stringr tibble]; }; ggtikz = derive2 { name="ggtikz"; version="0.1.1"; sha256="1xrmarmils56myi2sgn6gy69dyqfgbp1bj49g3zzpr3pwby3gqvq"; depends=[dplyr ggplot2 stringr tikzDevice]; }; @@ -9989,21 +10044,22 @@ 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.1"; sha256="1vqjhqlhvvqq8w2cqbgrkqphj0ga5s6fbl4zhcl3vc6fvsms5bpv"; depends=[cli gitcreds httr ini jsonlite]; }; + ghapps = derive2 { name="ghapps"; version="1.0.0"; sha256="12z234lc7iy8svnm37ybj9ym0zd3jq5q9fng9h7dxdw2p9id7y30"; depends=[gh jose openssl]; }; ghclass = derive2 { name="ghclass"; version="0.2.1"; sha256="0jpfc2mjwi6i3bcrfjjl6k4im4m110pq2n00mij2n9czz6v2chla"; depends=[base64enc cli dplyr fs gh glue httr lubridate purrr rlang tibble whisker withr]; }; ghcm = derive2 { name="ghcm"; version="3.0.0"; sha256="0byzi0q3amz7q6if0y54mk3wac0pycci9ypagr65p8rlhx04gqv3"; depends=[CompQuadForm MASS Rcpp refund]; }; ghibli = derive2 { name="ghibli"; version="0.3.3"; sha256="0kl98vxlk86jsqqklzcqr5a65lhqyday3vax374ai6pc24pjymcg"; depends=[prismatic]; }; ghql = derive2 { name="ghql"; version="0.1.0"; sha256="19awg98r2hwwwwrwh0166y8ij1clf58vrf02i8fhhfzddx3an6bz"; depends=[crul graphql jsonlite R6]; }; - ghyp = derive2 { name="ghyp"; version="1.6.2"; sha256="0ci3xz5v5r9vysfx2y3cgy706wssk9pw505mb57rb4yy0mhry19i"; depends=[MASS numDeriv]; }; + ghyp = derive2 { name="ghyp"; version="1.6.3"; sha256="0jc4rrw0ny0x15im2r9kyrlg9qdnljnbpg5pq4avy997nfdgyhav"; depends=[MASS numDeriv]; }; ghypernet = derive2 { name="ghypernet"; version="1.1.0"; sha256="0k4w37vnhpanpa80la8rscgimnnzzid5v59109xfbbz1xxx1bb49"; depends=[dplyr extraDistr numbers pbmcapply plyr purrr reshape2 rlang rootSolve texreg]; }; gibble = derive2 { name="gibble"; version="0.4.0"; sha256="19il4si7ch5jr7plr8qwv7jrc5kfkxmh5jrcdvbn688gxcnv7bs0"; depends=[dplyr rlang tibble]; }; - giedata = derive2 { name="giedata"; version="0.1.0"; sha256="0hz8kr1qsbg89icqvpx3d8rhi3vakhsnnq97jmnxj5d6s7c41qiv"; depends=[dplyr httr lubridate magrittr purrr]; }; + giedata = derive2 { name="giedata"; version="0.1.1"; sha256="19sr8phsay7bpqrbh776ms0aw9xgiv0x9knmn88ydzpkcdcd1z9j"; depends=[curl dplyr httr lubridate magrittr purrr]; }; gif = derive2 { name="gif"; version="0.1.0"; sha256="119d7q9xs6xpncv1r2w008kld9z07ckyj1kja9b8n2lnlb8532pk"; depends=[MASS Matrix Rcpp RcppEigen]; }; gifski = derive2 { name="gifski"; version="1.6.6-1"; sha256="1qfhg19iclsdyb583sf25fh7am951c7q53z1s64r3vv1ivdnn18k"; depends=[]; }; gifti = derive2 { name="gifti"; version="0.8.0"; sha256="1gb3x4rln9vayjd9fgzb434mm3dwcqgrvlv6rmh4b39mjfm73sly"; depends=[base64enc R_utils xml2]; }; giftwrap = derive2 { name="giftwrap"; version="0.0.4"; sha256="1zsw529h69x9yaq2csfws4iqn3mm39z34kwzj0b2y850wzbn2dvp"; depends=[namespace processx readr tibble]; }; gigg = derive2 { name="gigg"; version="0.2.1"; sha256="0qb8w455a8wxc5ljmydq4xag2kbj5yk06an0pd9hd4k48wssg8la"; depends=[BH Rcpp RcppArmadillo]; }; gim = derive2 { name="gim"; version="0.33.1"; sha256="1km8pyr1qfzffm33ihhlgvc0qxgxxfi161vkrz77d1b7jkpdyxjj"; depends=[numDeriv]; }; - gimme = derive2 { name="gimme"; version="0.7-8"; sha256="1rapjjivhpj1fv9p9wcdvgzz2vjlsmndi3kkpyhn0sqvycyb2453"; depends=[aTSA data_tree igraph imputeTS lavaan MASS MIIVsem mvtnorm nloptr qgraph]; }; + gimme = derive2 { name="gimme"; version="0.7-9"; sha256="1z6rqgk42p1zzf5vjz6hbzpnpal5mvhfbv30g8n7shnxpim7zakv"; depends=[aTSA data_tree igraph imputeTS lavaan MASS MIIVsem mvtnorm nloptr qgraph]; }; gimmeTools = derive2 { name="gimmeTools"; version="0.1"; sha256="1g170rz3c3qx27yy67f7xab4gkm0pbbvwlwkcsczfxphad609ryl"; depends=[easycsv magrittr miniUI rhandsontable rintrojs rstudioapi shiny shinyjs shinyWidgets]; }; gimms = derive2 { name="gimms"; version="1.2.1"; sha256="1ykc8ji8cyrz5vg9if7lzx5iqm5wvabcyaigfvh014w82i12pfg8"; depends=[curl Kendall ncdf4 raster zyp]; }; giphyr = derive2 { name="giphyr"; version="0.2.0"; sha256="0273f7lama8bhaalafs66m6ksp32vx0j6rmh1qr4484i7wkmdfqn"; depends=[dplyr httr miniUI purrr rstudioapi shiny tibble]; }; @@ -10039,11 +10095,11 @@ in with self; { gld = derive2 { name="gld"; version="2.6.6"; sha256="1i7xpyxd7r1fkjy9zkzd3rfsnb35v5c5fkafs1zd9d8729wfj8za"; depends=[e1071 lmom]; }; gldrm = derive2 { name="gldrm"; version="1.5"; sha256="1mbdxqjw6sa47kigwrjq1gn6vi36zhg9j2lck144iwa10ms0y9xp"; depends=[]; }; glinternet = derive2 { name="glinternet"; version="1.0.12"; sha256="0aphdscj0s6kqxlkgqkw2d6snrylz6hiis6307pl8ldh7q5cvm33"; depends=[]; }; - glinvci = derive2 { name="glinvci"; version="1.1.18"; sha256="0bsyiy3q86xbjgpka8j4fg55a0wjxm9p0vb2a1b88q8bx8zs7w4b"; depends=[ape BB lbfgsb3c numDeriv plyr Rcgmin rlang]; }; + glinvci = derive2 { name="glinvci"; version="1.1.21"; sha256="114fxkn271askxqjnzk0pd3s11n0r9qw1nfxpnqq332hv3skl2h8"; depends=[ape BB lbfgsb3c numDeriv plyr Rcgmin rlang]; }; gllm = derive2 { name="gllm"; version="0.38"; sha256="06sq7yk11rbqj8i900ss987fg9b232cirjxhdm1yl9xqz4inxvlg"; 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]; }; - glm_predict = derive2 { name="glm.predict"; version="4.1-0"; sha256="10grj73lwiv1czim787vq5h4cyn3xl028rs3a8l3l4vbg8z7y6py"; depends=[AER dfidx MASS mlogit nnet survey survival]; }; + glm_predict = derive2 { name="glm.predict"; version="4.2-0"; sha256="1696zjn6mqxvvzvbg282p2rxy2r81v46gx1vv0hxkphcrarv4dxs"; depends=[AER dfidx lme4 MASS mlogit nnet survey survival]; }; glm2 = derive2 { name="glm2"; version="1.2.1"; sha256="1byqlvpls23gzy7xlbs1kgfr4bsrmsrpc8rzzacf9czap1nlw39y"; depends=[]; }; glmbb = derive2 { name="glmbb"; version="0.5-1"; sha256="1jy77z5fr781rm5mx6kszwi2zlvnpfwi24fn9vw1kza4jzcw9pjw"; depends=[digest]; }; glmc = derive2 { name="glmc"; version="0.3-1"; sha256="0x6jk2l5rpjkp5x815gpiwv8maa7mhmy6m8gaxbv1cbn3zyccynn"; depends=[emplik]; }; @@ -10059,10 +10115,10 @@ in with self; { glmmML = derive2 { name="glmmML"; version="1.1.4"; sha256="0xs6vn245y32pshlslblrj6517dwwmk0ffp2rzji8d8h0lsxidxx"; depends=[]; }; glmmPen = derive2 { name="glmmPen"; version="1.5.1.10"; sha256="0qgmyp708qm8pvb62bw8qqk5is1bdbkwmkf0f3cn6z4hkjfgjfns"; depends=[BH bigmemory ggplot2 lme4 MASS Matrix mvtnorm ncvreg Rcpp RcppArmadillo RcppEigen reshape2 rstan rstantools StanHeaders stringr]; }; glmmSeq = derive2 { name="glmmSeq"; version="0.5.5"; sha256="182pgwqqbgpkcvapkps7ahxa4ppic44j10081q0v9lp2cjdiv4qy"; depends=[car ggplot2 ggpubr glmmTMB lme4 lmerTest MASS pbapply pbmcapply plotly qvalue]; }; - glmmTMB = derive2 { name="glmmTMB"; version="1.1.4"; sha256="1ldly6qn8iwqr41ndqlwsdz4v2n36giavsmx33vybn9g7r2fq4m7"; depends=[lme4 Matrix nlme numDeriv RcppEigen TMB]; }; + glmmTMB = derive2 { name="glmmTMB"; version="1.1.5"; sha256="1yh8q0l3l8hm408k8khjj1hff3nkqx0wq6a41fddwfmrq1alfjrk"; 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]; }; - glmmrBase = derive2 { name="glmmrBase"; version="0.1.2"; sha256="04xhp70wnxhfkbj7zqkyvggll22gwdm1fhhg6dg0kn7xmklkbjp3"; depends=[Matrix R6 Rcpp RcppArmadillo RcppParallel]; }; - glmnet = derive2 { name="glmnet"; version="4.1-4"; sha256="1y80a3b5s24ywhlil3r7b3a0vs9j59d7jkxrqa8zz09x1c5ggc7n"; depends=[foreach Matrix Rcpp RcppEigen shape survival]; }; + glmmrBase = derive2 { name="glmmrBase"; version="0.2.3"; sha256="0anf428nv1h3xabn0268kr6miwiwcsrmscdhnjbfkp6ckd5247hc"; depends=[digest Matrix R6 Rcpp RcppEigen]; }; + glmnet = derive2 { name="glmnet"; version="4.1-6"; sha256="0c3y9g3k0f0yclcffxzgfhfylb3py0iydhyspcjdrl44lb7cdi5y"; depends=[foreach Matrix Rcpp RcppEigen shape survival]; }; glmnetSE = derive2 { name="glmnetSE"; version="0.0.1"; sha256="0qj3c8qrx3vl0dr9prravfjwzqv1yfi771xfss9d44wlvjz5f4gp"; depends=[boot glmnet]; }; glmnetUtils = derive2 { name="glmnetUtils"; version="1.1.8"; sha256="1k8ivzjgpkm2a948qxx3wmkhlppbk31qc76spv2pscmp24x0lxyn"; depends=[glmnet Matrix]; }; glmnetcr = derive2 { name="glmnetcr"; version="1.0.6"; sha256="0cs0yj2js0920iggcw2vci5y9hnsm3hd7wpd7mwnx8mszwrklawg"; depends=[glmnet]; }; @@ -10077,24 +10133,24 @@ in with self; { glmvsd = derive2 { name="glmvsd"; version="1.5"; sha256="0im3143xvlsgkknsjnifx9zh7jsdm9bsmgiwrk0r2iil2ns22wgy"; depends=[brglm glmnet MASS ncvreg]; }; glmx = derive2 { name="glmx"; version="0.1-3"; sha256="0wfwzc6r5xcaaz6knj2chzwjvryfigpazrbd0kn82k0mprsm1vqz"; depends=[Formula lmtest MASS sandwich]; }; glmxdiag = derive2 { name="glmxdiag"; version="1.0.0"; sha256="0m077j7prjc38yshq8ahprfsai0rc20qma2njjbdi975mrwxi25c"; depends=[VGAM]; }; - globalKinhom = derive2 { name="globalKinhom"; version="0.1.4"; sha256="0ah05yl0fxiih3lfh8gxls01ikanwg3z8npbgv625zjfrqp1qwsw"; depends=[spatstat_core spatstat_geom spatstat_random]; }; + globalKinhom = derive2 { name="globalKinhom"; version="0.1.5"; sha256="1a1y6nhwgwf14ajagz7qllncw3hvhs2fs0nmf46wypvxplnicjaf"; depends=[spatstat_explore spatstat_geom spatstat_random]; }; globalOptTests = derive2 { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; }; - globals = derive2 { name="globals"; version="0.16.1"; sha256="158y39qv99f1kc2i7w8d4lm2ls96plb43fzamz31im9xb9bkmxpp"; depends=[codetools]; }; + globals = derive2 { name="globals"; version="0.16.2"; sha256="02kpdlrx1bannaixz03c0f7bii9g36iy2nw779mfgi56byljcb38"; depends=[codetools]; }; globaltrends = derive2 { name="globaltrends"; version="0.0.12"; sha256="1a9zl12zcy4qzs89vda8zhgqx97fkj0xi9xacbavr0is7k8s7hjp"; depends=[DBI dbplyr dplyr forcats forecast ggplot2 glue gtrendsR ineq lubridate maps purrr rlang RSQLite stringr tibble tidyr WDI zoo]; }; globe = derive2 { name="globe"; version="1.2-0"; sha256="0xa0q5dac0g7xdlr679f3km8nqxlm7gi4msp9fbfivfvy0rmri96"; depends=[]; }; glogis = derive2 { name="glogis"; version="1.0-2"; sha256="15zk11p10v8fmqvmg9gdhxa0h6s5axvmdkxkpwrg8sgp2ln94fr9"; depends=[sandwich zoo]; }; glossr = derive2 { name="glossr"; version="0.6.1"; sha256="0lwwsnpcgnbagzqxnlp69z8cg0p40lvrjy31kyg80lrh14p94sxa"; depends=[cli dplyr flextable knitr magrittr purrr rlang stringr tibble tidyr]; }; glottospace = derive2 { name="glottospace"; version="0.0.112"; sha256="1bgyxki16mh38pw1476hq9f9r2899vs6ax7dsyrn1xzcad6x91y3"; depends=[dplyr ggplot2 magrittr purrr readxl rlang rnaturalearth rnaturalearthdata sf tibble tidyr tmap units writexl]; }; 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=[]; }; + glpkAPI = derive2 { name="glpkAPI"; version="1.3.4"; sha256="1cr40jksm27h0j1j0q1ngcf4cbrhrjz48m6z3c3jns8h17h8g8qh"; 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]; }; + gluedown = derive2 { name="gluedown"; version="1.0.6"; sha256="1rvkgfsjlp9zrpgb0kvr2n6wfja5j1yz62sc9kmbizbph6yvrins"; depends=[glue magrittr]; }; gluvarpro = derive2 { name="gluvarpro"; version="7.0"; sha256="04npfllnl0x7w8z693p4zixgkrcvvvjbp9047b231pbldfirx0hy"; depends=[ggplot2 gridExtra pracma scales tidyr zoo]; }; glvmfit = derive2 { name="glvmfit"; version="0.1.0"; sha256="1nb34dm4m0nq7cr9f9jsacnk0xjv451m419sdwbk11ykpqkh9cdk"; depends=[]; }; glycanr = derive2 { name="glycanr"; version="0.4.0"; sha256="1ic2v2dim0a8kzl38vx8an80jrbzimng0plrx62a1ps1jnczihl9"; depends=[coin dplyr ggplot2 tidyr]; }; gm = derive2 { name="gm"; version="1.0.2"; sha256="1g0frcfk2ybhhz0sixdmj8h3z61acaxs10ybja60q91mxlyix2zx"; depends=[base64enc glue htmltools knitr magick magrittr MASS rlang rstudioapi stringr]; }; gmDatabase = derive2 { name="gmDatabase"; version="0.5.0"; sha256="0prap4a8pvylmvakd2ii87jz9bqf0vvfsxdi4iwa40nx444hqhx2"; depends=[DBI digest foreach RMySQL shiny]; }; - gmGeostats = derive2 { name="gmGeostats"; version="0.11.1"; sha256="0dbvvd9ab6ik5a9fhzk6md4y5lbjib4axhml0i09w1kd3p4y55jy"; depends=[boot compositions foreach gstat RColorBrewer sp]; }; + gmGeostats = derive2 { name="gmGeostats"; version="0.11.2"; sha256="182sqhlnvax09jbz53bfgp9wr9f309y84zk6dfgkj8la5yz273ni"; depends=[boot compositions foreach gstat RColorBrewer sp]; }; gma = derive2 { name="gma"; version="1.0"; sha256="08hxbs9z4vq5zjis0lgdcvlysaj1k7i0icdk3wsyqf3wd9znsibi"; depends=[car MASS nlme]; }; gmailr = derive2 { name="gmailr"; version="1.0.1"; sha256="1cfirp7a5jg9mprzj55ppyag4l527l8czrq4a1cxc8qrm8kpzx0b"; depends=[base64enc crayon gargle httr jsonlite lifecycle magrittr mime rematch2]; }; gmapsdistance = derive2 { name="gmapsdistance"; version="4.0.0"; sha256="1qi9xsm0izkgj1lfg353lsg4hl0gz0jadkygrbyimpiqcfl9w6jg"; depends=[RCurl XML]; }; @@ -10105,11 +10161,12 @@ in with self; { gmm = derive2 { name="gmm"; version="1.7"; sha256="12lg2j67z7s75fk9l8npiv8g8mz4rhvhrq7lc2d49jj4wsipah0r"; 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.1"; sha256="158y7yh4maawn9vki8cq4sil48xib2bbpl6qgj5gvlkw3c14hzfs"; depends=[gdata MASS]; }; - gmp = derive2 { name="gmp"; version="0.6-7"; sha256="119z6q3xca1ysdpjfmq3crplj355vlwggxvqh2gs4yi63xlzwcv3"; depends=[]; }; + gmp = derive2 { name="gmp"; version="0.6-8"; sha256="0fba80f28fcb2w2spiy6wg7dr5cz7w6gf9z3yrkc6p60zbxdaccf"; depends=[]; }; gmpoly = derive2 { name="gmpoly"; version="1.1.0"; sha256="0rlmwlxyg9b8gqyrc7mbqv7x86v9pqj51pd847raq7x1smjnz1kg"; depends=[english gmp mvp purrr]; }; gms = derive2 { name="gms"; version="0.4.0"; sha256="1m7bhy4vsz6l09pal9ibjlskmbyjmc29hqwjim1x8yansd5bxpzv"; depends=[dplyr rlang stringr yaml]; }; gmt = derive2 { name="gmt"; version="2.0.3"; sha256="1clnhwxn1z1iyzx9ps9rkfv2xqdyqc73mcc77ysmlg5cncvm1hac"; depends=[]; }; gmvarkit = derive2 { name="gmvarkit"; version="2.0.5"; sha256="10wb9gk5l8jhq55rxcyqbq6jmcd6xzfabg9x5hfmss34d0gdv7vb"; depends=[Brobdingnag gsl mvnfast pbapply]; }; + gmvjoint = derive2 { name="gmvjoint"; version="0.1.0"; sha256="1c2w4c4hvk554m8vsi5fz8j5fyn2rav1r1wqbzvpmqqxbqmzbm4y"; depends=[glmmTMB MASS Matrix mvtnorm pracma Rcpp RcppArmadillo statmod survival]; }; gmwmx = derive2 { name="gmwmx"; version="1.0.2"; sha256="1h6p581cgz739hvdlr0kn3h981mhlklngfvzbkm7f9g5abaqa2nb"; depends=[fs longmemo ltsa Matrix Rcpp RcppArmadillo rjson stringi wv]; }; gnFit = derive2 { name="gnFit"; version="0.2.0"; sha256="0cji4zjslh18dfj0l827r6br4hx2f0akiaxrg7fhhyyyhgdcjnsm"; depends=[ismev rmutil]; }; gnlm = derive2 { name="gnlm"; version="1.1.1"; sha256="1krbz791l5qc06sh6my0bkq420b5afncw87lhyx1yiml2yg46zrk"; depends=[rmutil]; }; @@ -10120,6 +10177,7 @@ in with self; { 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]; }; go2bigq = derive2 { name="go2bigq"; version="1.0"; sha256="007sk6i10phxfmrgn03pa43ixfp1v27nxyvgmhzwrj5l9b532f0d"; depends=[gmp Rmpfr]; }; + goalp = derive2 { name="goalp"; version="0.3.1"; sha256="1xr9bgizzsjr4nn41q1zi049wg9cw6qril60bri96x0xgc00qdpz"; depends=[lpSolve]; }; 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]; }; @@ -10134,7 +10192,6 @@ in with self; { goldilocks = derive2 { name="goldilocks"; version="0.3.0"; sha256="1h16kfalyklc7i3rix1ml83wjcbi9wv3z3rwxa83gp2h6nfpzpwl"; depends=[dplyr fastlogranktest pbmcapply PWEALL rlang survival]; }; golem = derive2 { name="golem"; version="0.3.5"; sha256="0rjkl1r83h0hcn30zssx64qm07sdx3g4v5rdxn56gbzfghw7ddcl"; depends=[attempt cli config crayon desc fs here htmltools pkgload roxygen2 rstudioapi shiny usethis yaml]; }; gomms = derive2 { name="gomms"; version="1.0"; sha256="1i9d5y28wrhal990x7xxy99v3z9y2pzlakj7wnynd3dpx5pqr0jj"; depends=[]; }; - gompertztrunc = derive2 { name="gompertztrunc"; version="0.1.0"; sha256="1qcx4s4lz2gsjr0nmwaih7pdh2anibrri7zfpsrl65lndkwy6hg4"; depends=[broom cowplot data_table dplyr flexsurv ggplot2 ggsci magrittr modelr rlang stringr tibble tidyr]; }; 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.4"; sha256="039ivcb54v58fic8sy445s053yii34nzb170yn3fz6662ik8m8ax"; depends=[clisymbols covr crayon cyclocomp desc jsonlite lintr praise rcmdcheck rstudioapi whoami withr xml2 xmlparsedata]; }; @@ -10152,12 +10209,13 @@ in with self; { googlePubsubR = derive2 { name="googlePubsubR"; version="0.0.3"; sha256="114yhhqjpg7khgq82y1qdpnm6pbqinlgwh5n1lx6fzsm1ajhl0kv"; depends=[cli googleAuthR magrittr]; }; googleTagManageR = derive2 { name="googleTagManageR"; version="0.2.0"; sha256="0ia3ndz5vf3bc5kckyxwn71nngml6p67v8r3n6h79s12xn9jzylg"; depends=[assertthat dplyr future googleAuthR httr jsonlite purrr]; }; googleVis = derive2 { name="googleVis"; version="0.7.0"; sha256="1s82xcs6zrlmnhay764bspzwvabfyi35nq6fwdrrk3v79q13c5jz"; depends=[jsonlite]; }; - googleadsR = derive2 { name="googleadsR"; version="0.1.2"; sha256="1f934i4b5sfpwfhg8w2jbmlqid4h5kyzrlicsw1la7ap0b22fn0z"; depends=[jsonlite]; }; + googleadsR = derive2 { name="googleadsR"; version="1.0.0"; sha256="02zr7y485bpp11z9njcb3c07aw454pvf8zsdqb4qswps6l1ni0gc"; 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]; }; googlesheets4 = derive2 { name="googlesheets4"; version="1.0.1"; sha256="14b5lzn6vjn72mw7vf3lzm2ppbjf0wr0n6sw0v5r6h4lk37cnki8"; depends=[cellranger cli curl gargle glue googledrive httr ids magrittr purrr rematch2 rlang tibble vctrs]; }; + googletraffic = derive2 { name="googletraffic"; version="0.1.0"; sha256="14wpra27z4jqgyc9mzfjh4k0f6z3cdp01fbv833ld11l5ays0qnb"; depends=[dplyr googleway htmlwidgets plotwidgets png raster sf sp stringr webshot]; }; 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]; }; @@ -10170,7 +10228,7 @@ in with self; { 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.9"; sha256="1xvm0z132dn5in3j06qz4bsixa8dw215amrvlbb4g7dkg2934am4"; depends=[data_table Matrix R6 RJSONIO]; }; + gpboost = derive2 { name="gpboost"; version="0.8.0"; sha256="066qd921pxcb2frlnia7zdldg49rgd5qrpk2gzkbxcklmjf8j923"; depends=[data_table Matrix R6 RJSONIO]; }; gpclib = derive2 { name="gpclib"; version="1.5-6"; sha256="11jjgg74l8hy9jz4jylhriqnzv8jcf12y1bkx22v29z3fhgkwkps"; depends=[]; }; gpg = derive2 { name="gpg"; version="1.2.8"; sha256="1yysjv335mq6lpdc01yiv56zhs0085bdlanh74k3ahjbszh9cy27"; depends=[askpass curl]; }; gpindex = derive2 { name="gpindex"; version="0.4.3"; sha256="1msbp424100agcmrwiirb2i1p5q6n0nfjwysyzh08p8c6c85i4vv"; depends=[]; }; @@ -10178,13 +10236,13 @@ in with self; { gplite = derive2 { name="gplite"; version="0.13.0"; sha256="0nxms34dfmbi3rz6x0yz8pn9a1v6w4k2w6jz1qrbqclmlg66g8vs"; depends=[Matrix Rcpp RcppArmadillo]; }; gplm = derive2 { name="gplm"; version="0.7-4"; sha256="0apvj14nl5qbi4dhhdx5nih5lvjwfcipvr8cyk6xsz4r5gfr2iw4"; depends=[AER]; }; gplots = derive2 { name="gplots"; version="3.1.3"; sha256="05k7a8x62qs5g6mps62vb3mwjdnfjzvjb20yws3x0r2j42g3p1cz"; depends=[caTools gtools KernSmooth]; }; - gplsim = derive2 { name="gplsim"; version="0.9.2"; sha256="1gkirnjjlja4z2ynrjc83wqf4q7zib44jgfsljpxmlala797qp7f"; depends=[mgcv minpack_lm]; }; + gplsim = derive2 { name="gplsim"; version="0.9.3"; sha256="16xanzrapz0gnbd4zm6jm305w00c3qspcvjq7vw2r4zry0sr96pa"; depends=[mgcv minpack_lm]; }; 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]; }; 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]; }; - gquad = derive2 { name="gquad"; version="2.1-1"; sha256="19k7cqp2j5vb6m9hxdm951wfjh6nsswb64pdz9g93ypcqrg02wa4"; depends=[ape seqinr]; }; + gquad = derive2 { name="gquad"; version="2.1-2"; sha256="09hcs2lgqnim29gpd805b5ndxi22z2xwsf25rb1zckxf9c7bn7sj"; depends=[ape seqinr]; }; grImport = derive2 { name="grImport"; version="0.9-5"; sha256="0pbzc45wgp0cpycnw0bzn65ckdszzay0zrp7c7ssxdkifp8bai3a"; depends=[XML]; }; grImport2 = derive2 { name="grImport2"; version="0.2-0"; sha256="19q0dd8fpp1g4xf6sg5f8dxybwxjfw553ra6wgjd8b74fzca40m1"; depends=[base64enc jpeg png XML]; }; grPipe = derive2 { name="grPipe"; version="0.1.0"; sha256="0m9zxnmg8gfzridzk4lhhp1gw3nrygarn90ppwyi67bqdpp5hkfh"; depends=[DiagrammeR DiagrammeRsvg dplyr magrittr png rsvg]; }; @@ -10209,15 +10267,15 @@ in with self; { 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]; }; graphhopper = derive2 { name="graphhopper"; version="0.1.2"; sha256="1zrnwh86jv37z07b6l1i94dgjn8k3b3a3f76gfjsyyxvlc64i76x"; depends=[dplyr googlePolylines httr jsonlite magrittr tibble]; }; - graphicalExtremes = derive2 { name="graphicalExtremes"; version="0.1.0"; sha256="1cc4xcb72yci2gq2zn3g1nh3ba802anpymm0hajdbz3kb0wz1gyn"; depends=[igraph matrixcalc mvtnorm Rdpack]; }; + graphicalExtremes = derive2 { name="graphicalExtremes"; version="0.2.0"; sha256="00nfm6dkmx9cv9j6462vvkd72x72r4yyibg5hh9jifnss9p7smjh"; depends=[corpcor edmcr glassoFast glmnet igraph mvtnorm osqp Rdpack]; }; graphicalVAR = derive2 { name="graphicalVAR"; version="0.3"; sha256="1mvv03zkqp5f7q2nnvpj2gq1v67vp42qr7cm0a20cfvp2gsxq0h5"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo rlang]; }; graphkernels = derive2 { name="graphkernels"; version="1.6.1"; sha256="1fwl5a13mdmia374zas0vvd4dlfnp4in9gj42c0iq01icy1wq0la"; depends=[igraph Rcpp RcppEigen]; }; - graphlayouts = derive2 { name="graphlayouts"; version="0.8.3"; sha256="08a4cpy0n90hw8xzmxck13hp76yh40r0njb2m7mwdldljkbybr7r"; depends=[igraph Rcpp RcppArmadillo]; }; + graphlayouts = derive2 { name="graphlayouts"; version="0.8.4"; sha256="1zch8v0fc9lrm1pklcvi7g4g7zmqq3gxprm7pbdx018b35z8z3bp"; depends=[igraph Rcpp RcppArmadillo]; }; graphon = derive2 { name="graphon"; version="0.3.5"; sha256="1x61pdsb3s1vi1iiy9pjq0iz0m5j5b6q3rqhwvx9kvmg4r8yifpv"; depends=[Rdpack ROptSpace]; }; graphql = derive2 { name="graphql"; version="1.5.1"; sha256="10zpibqh1vsin60pl5dnk4z2kzrfc3aqrhijcn36zq7f97629wv8"; depends=[jsonlite Rcpp]; }; graphsim = derive2 { name="graphsim"; version="1.0.3"; sha256="16djk5zm2pnvfyb2783rdyi6a0gspm23br7xxgb2c8wfd9gf430n"; depends=[gplots igraph Matrix matrixcalc mvtnorm]; }; graphx = derive2 { name="graphx"; version="1.0"; sha256="1k7vq0j58yskmaqknpkhccrc5n1hh8p2fsw7419r7k6a2c3syj8a"; depends=[cubature docore jpeg magicaxis MASS plotrix png pracma raster sp]; }; - grates = derive2 { name="grates"; version="0.3.0"; sha256="0ycgh6fzrsjv3n0wzcaybk686lq074krayz5jfx690iqj5fjkjqi"; depends=[clock ellipsis rlang vctrs]; }; + grates = derive2 { name="grates"; version="0.3.1"; sha256="1a7f0ij415spfg20h5qqvmk46zh768l34jk61a45y1ywzs1cb3ki"; depends=[clock ellipsis rlang vctrs]; }; gratia = derive2 { name="gratia"; version="0.7.3"; sha256="1m1jc4qjcxkr6w75hirqwkn2sdrly7ydc3kcd33m4jhjzp7nysb2"; 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="1.0.0"; sha256="0dkgbha7ijwvddqxcnfn9gfz29kjzykifbr252qp3qjzkdqw50hi"; depends=[doRNG dplyr foreach forecast GA generics magrittr mvtnorm polynom purrr shiny tibble tsfeatures tsibble]; }; @@ -10251,7 +10309,7 @@ in with self; { gridGraphviz = derive2 { name="gridGraphviz"; version="0.3-1"; sha256="0yzy7w4bk3rn9yjqy06gzkcs0dla3n49z3v1z0mjikg8cd97d5ni"; depends=[graph Rgraphviz]; }; gridOT = derive2 { name="gridOT"; version="1.0.1"; sha256="106h1lk2fyfl68iwmbqbm9h8ip75ibanr1dsi6nrmd54pz475ry8"; depends=[Rcpp RcppArmadillo]; }; gridSVG = derive2 { name="gridSVG"; version="1.7-4"; sha256="1jspjn56yrkx98hhs98npzm0k0kwpv8x1hg40kphx5ikhvincxmr"; depends=[jsonlite XML]; }; - gridpattern = derive2 { name="gridpattern"; version="1.0.1"; sha256="0ia0n5k72a3a2c2hhgg0ykmbbq42yr1jf81xvmqq28jd4nzvzqn1"; depends=[glue memoise png rlang sf]; }; + gridpattern = derive2 { name="gridpattern"; version="1.0.2"; sha256="13yypjsbpr61yn15y4cyz6s8jvcgg3mmr8rncskinpk8lsa8h2h4"; depends=[glue memoise png rlang sf]; }; gridsampler = derive2 { name="gridsampler"; version="0.6"; sha256="0wqpqg9c372sv8zqks6v93gawiyfghw58hn7m8q45dxpqm16ss3k"; depends=[BiasedUrn ggplot2 plyr reshape2 shiny shinyBS shinythemes]; }; gridstackeR = derive2 { name="gridstackeR"; version="0.1.0"; sha256="01yazynwprzjygkh0dwrlvbjsmxvfy1pxr0nldnbngmq10wvpp2n"; depends=[checkmate htmltools shiny shinyjs]; }; gridtext = derive2 { name="gridtext"; version="0.1.5"; sha256="0f7i2qb8fawi8agy2iz2c173kfwj7cbb5ikjix64nmzqc5j7363d"; depends=[curl jpeg markdown png Rcpp rlang stringr xml2]; }; @@ -10267,7 +10325,7 @@ in with self; { groupRemMap = derive2 { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; }; groupTesting = derive2 { name="groupTesting"; version="1.0.0"; sha256="00jy1gw6whslmfcqic99hmbxh2z75rj14cjzrm5mnpcajn37s66j"; depends=[pracma]; }; groupWQS = derive2 { name="groupWQS"; version="0.0.3"; sha256="1c5yrsfgkhbg1fcjbrilfmf0phjry5z34536yfizc8wbc7mmmj0c"; depends=[glm2 MASS rjags Rsolnp]; }; - groupdata2 = derive2 { name="groupdata2"; version="2.0.1"; sha256="1gppn1d456chmcqn2zxssijvkl8ww23pbnxikd4jmsl1735wiw9h"; depends=[checkmate dplyr lifecycle numbers plyr purrr rearrr rlang tibble tidyr]; }; + groupdata2 = derive2 { name="groupdata2"; version="2.0.2"; sha256="1icqy5g0xww7f4aimawbbanqma6vbyln3xivhz0i8x3pdnkf1gl5"; depends=[checkmate dplyr lifecycle numbers plyr purrr rearrr rlang tibble tidyr]; }; groupedSurv = derive2 { name="groupedSurv"; version="1.0.4.3"; sha256="1j6n09cr3wk7l77pgnabqhxm6cfjvvxndd5bgybr4jljfv7rh92y"; 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=[]; }; @@ -10275,8 +10333,8 @@ in with self; { 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]; }; - growthPheno = derive2 { name="growthPheno"; version="1.0-34"; sha256="073pbi3xyqr828gilrv3w42xv28flf8dld4j60xqqjr7g4dcllpk"; depends=[dae GGally ggplot2 Hmisc RColorBrewer readxl reshape stringi]; }; - growthcleanr = derive2 { name="growthcleanr"; version="2.0.2"; sha256="07icwy0zdba1l0gac0zmd97xsk3lilfa2r565pf74fi29mp85y9z"; depends=[data_table doParallel dplyr foreach labelled magrittr plyr R_utils tidyr]; }; + growthPheno = derive2 { name="growthPheno"; version="2.1.16"; sha256="095lwl8dj6xqwqar28q40iwq325kiylfidgmrx2rdfz2cgmvlybs"; depends=[dae GGally ggplot2 Hmisc JOPS RColorBrewer readxl reshape stringi]; }; + growthcleanr = derive2 { name="growthcleanr"; version="2.0.3"; sha256="1qdm91mpa36vpxz43fx2dv7qwg9wd6zasc7plalqyf60p3iw8r7d"; depends=[data_table doParallel dplyr foreach labelled magrittr plyr R_utils tidyr]; }; growthcurver = derive2 { name="growthcurver"; version="0.3.1"; sha256="1l3dqcl395nh406s7d5554r5ynk1a7v5ba5kmnv9r7lj7h9nfdjj"; depends=[minpack_lm]; }; growthmodels = derive2 { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; }; growthrate = derive2 { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[clime Matrix mvtnorm]; }; @@ -10315,25 +10373,27 @@ in with self; { gsubfn = derive2 { name="gsubfn"; version="0.7"; sha256="00j6b8b6xsx6v370h220x233rpk6asca78165y3d48jpwvwisdc9"; depends=[proto]; }; gsw = derive2 { name="gsw"; version="1.1-1"; sha256="10nxyi1kqq9ypincpr347iqixfz17nd69g7ikhyid1djqfy1v8nj"; depends=[]; }; gsynth = derive2 { name="gsynth"; version="1.2.1"; sha256="1a4s8ghxc5zw295ys8hp22nx93gc1vyakn7r1dcq3ghikh02nzaa"; depends=[abind doParallel doRNG foreach future GGally ggplot2 lfe MASS mvtnorm Rcpp RcppArmadillo]; }; - gt = derive2 { name="gt"; version="0.7.0"; sha256="00v9xmxyjfdcvswr8479a8is7rlkyhpkdnk7syp80h7qwfjv2mfq"; depends=[base64enc bitops cli commonmark dplyr fs ggplot2 glue htmltools magrittr rlang sass scales stringr tibble tidyselect]; }; + gt = derive2 { name="gt"; version="0.8.0"; sha256="1yg91nnx1d6d6mmjhbqbcy7ya69sd7sbhlj2fsw79k01849lxdsy"; depends=[base64enc bigD bitops cli commonmark dplyr fs ggplot2 glue htmltools juicyjuice magrittr rlang sass scales tibble tidyselect]; }; gt4ireval = derive2 { name="gt4ireval"; version="2.0"; sha256="1d567iz57xqszm45l1wq4n2qrrmyz8ssll1vllfmncb9ibbnx4f3"; depends=[]; }; - gtExtras = derive2 { name="gtExtras"; version="0.4.2"; sha256="0vy93jjibkgak2ml9a1a98rxrk0d15xqvavh7d1ysk3vc6b7h61f"; depends=[commonmark dplyr fontawesome ggplot2 glue gt htmltools paletteer rlang scales]; }; + gtExtras = derive2 { name="gtExtras"; version="0.4.5"; sha256="04vl7i9qllfn5977y47kc4355rpk9m63rii2c0v27i9lbvr3z4fr"; depends=[commonmark dplyr fontawesome ggplot2 glue gt htmltools paletteer rlang scales]; }; gtWAS = derive2 { name="gtWAS"; version="1.1.0"; sha256="1kbkz0iwc3gfj982m93m2wdr1xm5rhy70k6bdc7kms9ivh5fh6sh"; depends=[]; }; gtable = derive2 { name="gtable"; version="0.3.1"; sha256="1dbwxhxawwbmaixwxxglazv5bici56qvmjk7sqa8j66m49bjrmlb"; depends=[]; }; gte = derive2 { name="gte"; version="1.2-3"; sha256="0fnrpgfji5f1n8nra0d8xghqgsjil7r2j6xnbmfm7mjafcav4wwk"; depends=[survival]; }; + gtfs2emis = derive2 { name="gtfs2emis"; version="0.1.0"; sha256="1nh3m57xhh12sm18d5lvf0i9z4ayn6kgbmp036lw89wz10s42w6z"; depends=[checkmate data_table furrr future gtfs2gps sf sfheaders terra units]; }; gtfs2gps = derive2 { name="gtfs2gps"; version="2.1-0"; sha256="1z9nlc5lcn9vhqc1y25m5cqvgb8rnnrwnqsxrnmq7cr9shs6dkm5"; depends=[checkmate data_table furrr future gtfstools lwgeom progressr Rcpp 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.1.0"; sha256="1ms4xjbnaggakccwmd8bhi061rlbznx3bczaa35df19saw5z66cz"; depends=[checkmate cpp11 data_table gtfsio sf sfheaders units]; }; + gtfstools = derive2 { name="gtfstools"; version="1.2.0"; sha256="03gc784dvskvg8m0fcqc966ka0slnh10in5gk7bba8h7lnfb893w"; depends=[checkmate cpp11 curl data_table gtfsio processx sf sfheaders units zip]; }; gtheory = derive2 { name="gtheory"; version="0.1.2"; sha256="1xc1jl69z5csalqk3hx83s53awcl1fjq6p0x2pczhs7dsvwd6lks"; depends=[lme4]; }; - gtools = derive2 { name="gtools"; version="3.9.3"; sha256="0criwc0jmbrgaslh2kdjirgdzbf0ycry8yjryi95fb9qgckm7yvs"; depends=[]; }; + gtools = derive2 { name="gtools"; version="3.9.4"; sha256="04gihp78x2caahqvf0mlv1cqy1m121l6hkdvbp01r2z99wcqpksr"; depends=[]; }; gtop = derive2 { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; }; gtreg = derive2 { name="gtreg"; version="0.2.0"; sha256="0ivg1chwn4igy9df5c8dmq5r2ryjwasqvdi8q4xfysjxij97hd6s"; depends=[broom_helpers cli dplyr forcats glue gtsummary purrr rlang stringr tibble tidyr]; }; gtrendsR = derive2 { name="gtrendsR"; version="1.5.1"; sha256="05bfcc77bg2ndl83l0lv7rs4slxcflv9h2pfij8a3j1k9r9lwp2x"; depends=[anytime curl ggplot2 jsonlite]; }; - gtsummary = derive2 { name="gtsummary"; version="1.6.2"; sha256="0naa0jzv6cgnrglcis4h3i0y11sgh8fj0mm9wg8rzdg9hir861hq"; depends=[broom broom_helpers cli dplyr forcats glue gt knitr lifecycle purrr rlang stringr tibble tidyr]; }; + gtsummary = derive2 { name="gtsummary"; version="1.6.3"; sha256="0hwl4vzny8xzi8bzlmaj9i4rlxxs851m8jsx1p96j9j7ncdsmpsc"; 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]; }; + guiplot = derive2 { name="guiplot"; version="0.3.1"; sha256="0h8jjilkxcqgmyr7pcri8kilww44yrdvk9qfbvyr6gk7smvb9y0c"; depends=[DT excelR ggplot2 magrittr R6 rlang shiny svglite]; }; guix_install = derive2 { name="guix.install"; version="1.0.0"; sha256="0s3wb5781yc43c9zwrn7i87zcbrlx7xr0ms0v9hvgs7qsv02id9j"; depends=[RUnit]; }; gumbel = derive2 { name="gumbel"; version="1.10-2"; sha256="0s9idcrssnl683abwky9zvqylciy0b51z935yfvb2bm8b0b0b4ij"; depends=[]; }; gumboot = derive2 { name="gumboot"; version="1.0.0"; sha256="0c31rxkq08wzycwiwii7q166pzwfbdg35259rymwy0g38pnjnjp6"; depends=[dplyr ggplot2 hydroGOF lubridate ncdf4 reshape2 stringr]; }; @@ -10367,7 +10427,7 @@ in with self; { hSDM = derive2 { name="hSDM"; version="1.4.1"; sha256="1jwqjzr0zpckzh2jpqh17v6ypq4mzn5khlv6p37y59zz8bh9mvxp"; depends=[coda]; }; haarfisz = derive2 { name="haarfisz"; version="4.5.3"; sha256="1qrp4hwxrj7nf7lrxvhwgi9vky0wbyfd165b8idavj0b2n29s98n"; depends=[wavethresh]; }; habCluster = derive2 { name="habCluster"; version="1.0.5"; sha256="1cjmhq8krkv4g1vy70kc3j667djzmq38xlqn568f437f6jaglvkp"; depends=[igraph raster Rcpp sf stars]; }; - hablar = derive2 { name="hablar"; version="0.3.0"; sha256="12gm5n3p2kmjwhkf60n4bjn3lrj7lrs5sgmvads9sfp2ckhaiysk"; depends=[dplyr lubridate purrr]; }; + hablar = derive2 { name="hablar"; version="0.3.1"; sha256="02d5rssggf8n67psjn8sw106y4vzndyp7sq43hfm4zqnpsxp0hgq"; depends=[dplyr lubridate purrr]; }; hackeRnews = derive2 { name="hackeRnews"; version="0.1.0"; sha256="0vrdbk4dxbykb3hs35nxkl3s2ds92gs5qz66p85w8j5zjmwbw2x6"; depends=[future_apply httr jsonlite tibble]; }; hacksaw = derive2 { name="hacksaw"; version="0.0.2"; sha256="1ls4l53bsaxyd6lwka9z9sb6ypa2ymbxpfxhsj9k966031jv2vk3"; depends=[dplyr magrittr purrr rlang tibble tidyselect zeallot]; }; hacksig = derive2 { name="hacksig"; version="0.1.2"; sha256="0sc35vyi00r2b3hgn1xw2zffd704adschjwhx0niv5a1l33dxbkp"; depends=[dplyr future_apply rlang tibble tidyr]; }; @@ -10385,17 +10445,17 @@ in with self; { hansard = derive2 { name="hansard"; version="0.8.0"; sha256="00mcy58nhlphb0v0wchbaw1qamm0435s09nxxw6rr5z872rhyf5a"; depends=[dplyr jsonlite lubridate snakecase tibble tidyr]; }; hapassoc = derive2 { name="hapassoc"; version="1.2-9"; sha256="09ijc4sbw743z74fzklmvig11ndkycg6j86k4214wfsj1yj6j9x6"; depends=[]; }; haplo_ccs = derive2 { name="haplo.ccs"; version="1.3.2"; sha256="103i1fxk990drlsdhjrh9p6rp05g7gqzmlqfcdx9a1di1qrhw5qh"; depends=[haplo_stats survival]; }; - haplo_stats = derive2 { name="haplo.stats"; version="1.8.9"; sha256="0np9kw4f30xbvwr4f79g909ilis5n273ridmlwyzjxiskiry6mx0"; depends=[arsenal rms]; }; + haplo_stats = derive2 { name="haplo.stats"; version="1.9.2"; sha256="1397rxcqqz29yaf3f2gphg1jhmfw3wvvjvqk7cz01jdh3pihdh56"; depends=[arsenal rms]; }; 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.6"; sha256="0vbyw8017jbad1f1zd6ccaf68p1863r7qrli8nj47si7ivs0qv3s"; depends=[archive checkmate curl dplyr httr2 magrittr sf terra xml2]; }; + happign = derive2 { name="happign"; version="0.1.7"; sha256="1zxm9hg9jq0xzw6has9blskvy0cz6c8b3qqysaca1569zmyfgw8n"; depends=[archive checkmate dplyr geojsonsf httr2 magrittr sf terra 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="1.2.0"; sha256="0y5dxpd4gsrs365x1v4qf2vq7hq2qb6f6x50dyj29xmmn760wcpr"; depends=[glue rlang tibble vctrs]; }; harmonicmeanp = derive2 { name="harmonicmeanp"; version="3.0"; sha256="17irfw8788yhh36698p9w8wab6wcin1yzfinlbs3gdg70d42zcnd"; depends=[FMStable]; }; - harmonizer = derive2 { name="harmonizer"; version="0.3.0"; sha256="116vby0n3vj2gc46s629ppq3kxsjvgdfmc6fdjz0rxyjcgjdqwxz"; depends=[]; }; - harmony = derive2 { name="harmony"; version="0.1.0"; sha256="0jkj9y4j6ja2d6y5j0akmkkgpppprk65i6bwwhs163g918i8qng0"; depends=[cowplot dplyr ggplot2 irlba Matrix Rcpp RcppArmadillo RcppProgress rlang tibble tidyr]; }; + harmonizer = derive2 { name="harmonizer"; version="0.3.1"; sha256="1zckf30bpjxnpb5ymz1razdbzjpvq8gf3a3si5grm0c5m4gmypj7"; depends=[]; }; + harmony = derive2 { name="harmony"; version="0.1.1"; sha256="0pcvfy2gpkgwws09cnd6qkr62w53rdhiiz98jr9w19m15gc8skvm"; 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]; }; hash = derive2 { name="hash"; version="2.2.6.2"; sha256="17scs675a86c34hjbxmwi8kny4yyv97x3515s449zafj2i0ad8vm"; depends=[]; }; @@ -10412,8 +10472,9 @@ in with self; { hbsae = derive2 { name="hbsae"; version="1.2"; sha256="0fg782gxivkkwhqvxf09j1q20f2dqm7bd1y9bp99fy7mg88zp0gn"; depends=[Matrix]; }; hcandersenr = derive2 { name="hcandersenr"; version="0.2.0"; sha256="0r8z8kb9hwvgcsxbd7arbmqclhwlbcjpnf3p9mp5vgyxm84iz515"; depends=[]; }; hcci = derive2 { name="hcci"; version="1.0.0"; sha256="11piy1ajg3j3dbh66szzf7lhc3x28fz75ai39vlx0gl5nc2v5zs5"; depends=[]; }; - hce = derive2 { name="hce"; version="0.0.2"; sha256="1h8ixf93x97gcfzlf2mk796lqq92vmk2g74s8811087rlkcdk8ik"; depends=[]; }; + hce = derive2 { name="hce"; version="0.0.8"; sha256="10wxr6v4mwr6map3rl3ds3bfpqw2jq3vlqyhic1jiwjx7dl41913"; depends=[]; }; hchinamap = derive2 { name="hchinamap"; version="0.1.0"; sha256="1pia593g50zf3286f9g51slkvrpj1iy7lws9d7a3nqgb2v3yji1y"; depends=[htmlwidgets]; }; + hcidata = derive2 { name="hcidata"; version="0.1.0"; sha256="16qzll0rhfc6szi9y5hxycq5462jm78kla70fnv1sqw7n34pvpg5"; depends=[Rdpack]; }; hctrial = derive2 { name="hctrial"; version="0.1.0"; sha256="19li8i8hx0r3b63q80cnj6pr72rdbmykxq0kcfbn4azq3sdd046y"; depends=[clinfun GenBinomApps]; }; hdImpute = derive2 { name="hdImpute"; version="0.1.1"; sha256="16p5mkapgsnb8mr74388hzrvbmn2njql3v3lk9902mdp565pk9ya"; depends=[cli dplyr magrittr missRanger plyr purrr tibble tidyselect]; }; hda = derive2 { name="hda"; version="0.2-14"; sha256="0azfxyws7yslcqplfddmdp5ngk91j5h7llvrg77yh5z0kkd09j1b"; depends=[e1071]; }; @@ -10434,12 +10495,11 @@ in with self; { hds = derive2 { name="hds"; version="0.8.1"; sha256="1smg5ixrl7f2x3wn7s5i26dyadn5sigpf4jsk236z1bhnz617ax4"; depends=[survival tensor]; }; hdtg = derive2 { name="hdtg"; version="0.2.0"; sha256="11shszhgpm8aka2awxyrnxpq8f8sdgw9b97mvdz5yb9xbm9kl57z"; depends=[mgcv Rcpp RcppEigen RcppParallel RcppXsimd Rdpack]; }; headliner = derive2 { name="headliner"; version="0.0.2"; sha256="0ylvibi8nlsz5is5rv4m25a7jajidy59k2d19dqw059qh49jd64f"; depends=[dplyr glue lubridate purrr rlang tibble tidyr]; }; - healthcareai = derive2 { name="healthcareai"; version="2.5.1"; sha256="0ah855wvb2v8b8zz5a64q8psjrkpgq9xzyrla3mdpm5xx2gh0z0p"; 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.2.0"; sha256="0fyaamw06kv2gsz2r9fiys2wf48h0k2x1z133682p3hs37g36kr0"; 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.9"; sha256="053bvzw41qlqrii133cnjfx430vjd46b0gzpfa4359vzpwl71win"; depends=[broom dials dplyr forcats ggplot2 ggrepel h2o magrittr modeltime parsnip purrr recipes rlang tibble tidyr tune workflows yardstick]; }; + healthyR_ai = derive2 { name="healthyR.ai"; version="0.0.10"; sha256="0yzi2gnzhsp1rxcq5c38d4ih14ix5mbcmz7yyrxmcq61zqpgfhgx"; depends=[broom dials dplyr forcats ggplot2 ggrepel h2o magrittr modeltime parsnip purrr recipes rlang tibble tidyr tune workflows yardstick]; }; healthyR_data = derive2 { name="healthyR.data"; version="1.0.1"; sha256="18b7aqdy9a0ldf2ib2d0a07k6bfmgdp61y8hl8yl19v35nqj6dvh"; depends=[]; }; - healthyR_ts = derive2 { name="healthyR.ts"; version="0.2.3"; sha256="0kiq0jkp99pi8l367v6iy255g44yw3cm6b8laayzvanfaq7zdn89"; depends=[cowplot dplyr forcats ggplot2 hardhat lubridate magrittr modeltime parsnip plotly purrr recipes rlang stringi tibble tidyr timetk workflowsets]; }; + healthyR_ts = derive2 { name="healthyR.ts"; version="0.2.5"; sha256="1v35l9q6a3naszs9mi3ahjkv8yknli5h6h22dzbshr9r9f6d7gjh"; depends=[cowplot dplyr forcats ggplot2 hardhat lubridate magrittr modeltime parsnip plotly purrr recipes rlang stringi tibble tidyr timetk workflowsets]; }; healthyverse = derive2 { name="healthyverse"; version="1.0.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=[]; }; @@ -10456,16 +10516,17 @@ in with self; { helixvis = derive2 { name="helixvis"; version="1.0.1"; sha256="113rnpnrcnw18ks78fgq79zdrw3kmpzpimlc45gvj0za2fbyci3p"; depends=[ggforce ggplot2 rlang]; }; hellno = derive2 { name="hellno"; version="0.0.1"; sha256="1j787rw9hh75bvkckmlz5xkgwc22gd7si3mgjd7v60dd6lykfa88"; depends=[]; }; helloJavaWorld = derive2 { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; }; - helminthR = derive2 { name="helminthR"; version="1.0.9"; sha256="1s5vxpii1zryflafqxn0fwx3xnkbi2115f36fd7jq9l9y7grpqz9"; depends=[httr magrittr plyr rvest taxize xml2]; }; - helsinki = derive2 { name="helsinki"; version="1.0.5"; sha256="1vf023n93cq67dk139rszj3y8bc91z7rlagrv2z0y8mqpndi03am"; depends=[curl dplyr httpcache httr jsonlite purrr sf xml2]; }; + hellorust = derive2 { name="hellorust"; version="1.0.1"; sha256="10vkj15jz0qdgxcj2dksizkw2x15bhwnh4q0sp0g8854x88b7f7x"; depends=[]; }; + helminthR = derive2 { name="helminthR"; version="1.0.10"; sha256="0ssw0smxc5zx3d189fq8c6kdg6d7db1sd5iblhz54pg41j9fvqhq"; depends=[httr magrittr plyr rvest taxize xml2]; }; + helsinki = derive2 { name="helsinki"; version="1.0.6"; sha256="1hsmxnfzbi8xvqz97rmq225w9prhxc558slmfxg03y5wpjqdpq4a"; depends=[curl dplyr httr jsonlite purrr sf xml2]; }; heplots = derive2 { name="heplots"; version="1.4-2"; sha256="1knk7w23x3ycxr79vfp9399xfcrrj46bkzxbav3m9z9r36bx6j2x"; depends=[broom car magrittr MASS purrr tibble]; }; here = derive2 { name="here"; version="1.0.1"; sha256="0srlr8h8qmr0wrmp7gs4g2ry5dni2hx8n947bik3s3a26f091v88"; depends=[rprojroot]; }; hereR = derive2 { name="hereR"; version="0.9.0"; sha256="1p5qvhqmh64dc9kxzv0cxf8v65q3d30yn6znd69bnaf3qn020lxw"; depends=[crul curl data_table flexpolyline jsonlite sf stringr]; }; - hergm = derive2 { name="hergm"; version="4.1-9"; sha256="0jqgkvg4kypialb0lrp4p8idxq9c3yalq5k1bv7602mlikyzy5w8"; depends=[ergm igraph intergraph latentnet Matrix mlergm network Rcpp sna stringr]; }; + hergm = derive2 { name="hergm"; version="4.1-10"; sha256="04vr5mmsr39rpjnans8xwp1z304rd3hi5za7qhjv7dn5s8c8pw9h"; depends=[ergm igraph intergraph latentnet Matrix mlergm network Rcpp sna stringr]; }; heritEWAS = derive2 { name="heritEWAS"; version="0.2.0"; sha256="0yss9vf2m9szq8xi5i2nhf85mfvzvhv6c1f4kvvb2z9lmaicjni5"; depends=[]; }; heritability = derive2 { name="heritability"; version="1.3"; sha256="0a0pw8hppkgypl4jaa38hks9nxfwz2zbsd4w6w40j1hxlyy4km8m"; depends=[MASS]; }; hermite = derive2 { name="hermite"; version="1.1.2"; sha256="0j9s7ayvbvmgwybrvf703b72qbn8gskb105pis19ig2sslllzda3"; depends=[maxLik]; }; - hermiter = derive2 { name="hermiter"; version="2.1.0"; sha256="1z9zrmyxx7dgsi0zblp15saw1iz79sc2r9zyirdzqmz010rnm19y"; depends=[BH Rcpp]; }; + hermiter = derive2 { name="hermiter"; version="2.2.0"; sha256="0cfww9klf6iziac6p8psjbjixq1p85bsb2fl8nldhjz9psi9fk5x"; depends=[BH Rcpp RcppParallel]; }; hero = derive2 { name="hero"; version="0.4.7"; sha256="129v2pjbxm5aalr5lfx0kh20rhwksnb80pc459pxg0xkwxvy1l3d"; depends=[fields Matrix optimx pbapply rgeos sp]; }; hesim = derive2 { name="hesim"; version="0.5.3"; sha256="115c6f0i0j7i4k2rf5m6f4a9v8mz99mfvv560v0v12g9gjj9lncb"; depends=[data_table flexsurv ggplot2 MASS msm R6 Rcpp RcppArmadillo survival]; }; hetGP = derive2 { name="hetGP"; version="1.1.4"; sha256="1nm4kkg0jwlp21flviiw187jih4y1s6lqn3j0f2s1h81rh1vvvzf"; depends=[DiceDesign MASS Rcpp]; }; @@ -10493,8 +10554,7 @@ in with self; { 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.3.3"; sha256="1bi0jbzc8gk8l9x748281hlid9r8zrfzwjdjx3vhbsjcqf55299x"; 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]; }; - hibayes = derive2 { name="hibayes"; version="1.1.0"; sha256="0zypyrp0wlawbslavc8gj3vydr6jcrgg92ygfp4xi7s64l1gcqw3"; depends=[BH bigmemory Matrix Rcpp RcppArmadillo RcppProgress]; }; + hibayes = derive2 { name="hibayes"; version="2.0.0"; sha256="15kk6jpm9brrl6257dh57z57dd3zndqxz0qwj1nxfc06zrs3bppi"; depends=[BH bigmemory Matrix Rcpp RcppArmadillo RcppProgress stringr]; }; 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]; }; @@ -10514,8 +10574,8 @@ in with self; { 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.7"; sha256="1ylbmk6a2d6prwips2da6syzxpbfhda93abdw98pjj658p7l3m0r"; depends=[deldir fields ks maps Matrix mvtnorm rgeos spatstat spatstat_core spatstat_geom spatstat_random]; }; - highs = derive2 { name="highs"; version="0.1-4"; sha256="0yyfyk8dw1q7firqnq83ymwknbnaw3r9rzxdmw3f9pbvkcpgi4n3"; depends=[checkmate Rcpp]; }; + highriskzone = derive2 { name="highriskzone"; version="1.4.8"; sha256="167xj46v3m85pbwxw8cm0jcb1b8srqggsnk6wbjv2b0vgxm65rzg"; depends=[deldir fields ks maps Matrix mvtnorm rgeos spatstat spatstat_explore spatstat_geom spatstat_random]; }; + highs = derive2 { name="highs"; version="0.1-5"; sha256="1b59ip3y2kqcp4q035857ds1y75sll1n78x51zhfpqfwkdx5258j"; depends=[checkmate Rcpp]; }; 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]; }; hilbert = derive2 { name="hilbert"; version="0.2.1"; sha256="1vw1rn5adnqi99v5w47jmqx35rqv0slas3ldw7g34il1krz9xhms"; depends=[cpp11]; }; @@ -10524,7 +10584,7 @@ in with self; { hillR = derive2 { name="hillR"; version="0.5.1"; sha256="0yz2f3zz28k36f6afya5cg7k6kvyz6nzafr53pw6liy086nfrb9n"; depends=[ade4 ape FD geiger plyr tibble]; }; hilldiv = derive2 { name="hilldiv"; version="1.5.1"; sha256="1jp4xvrpqd575y2x0i73s0bq708bzi6gdhqgz85bia6d5kf05lq9"; depends=[ape data_table FSA geiger ggplot2 ggpubr qgraph RColorBrewer scales vegan]; }; hillshader = derive2 { name="hillshader"; version="0.1.0"; sha256="12phdpkjc4gyk9ri33x86dzxb03llhpqf43vin9ssfr23sbblnqh"; depends=[raster rayshader scales]; }; - himach = derive2 { name="himach"; version="0.3.0"; sha256="1v9pykliqrwab6vmjlbqbyq4i7xx7xy1l1fbmim45a924fx8ghqs"; depends=[cppRouting data_table dplyr geosphere ggplot2 lwgeom purrr s2 sf tidyr]; }; + himach = derive2 { name="himach"; version="0.3.1"; sha256="11p6g1w77yx8cxrvhy53dllyjk4z3jiq9mhz3bjr2kbzi954mysf"; depends=[cppRouting data_table dplyr geosphere ggplot2 lwgeom purrr s2 sf tidyr]; }; hindex = derive2 { name="hindex"; version="0.2.0"; sha256="01mcd2br33qqkfcyxl584f3l6kyb2cgzpd207p0mynzdaallgxgc"; depends=[foreach ggplot2 purrr]; }; hindexcalculator = derive2 { name="hindexcalculator"; version="1.0.0"; sha256="06b4dn629avmnyqxb0l39m00wz9cg9dddmm6qhgwgnzlxh14ifgk"; depends=[]; }; hint = derive2 { name="hint"; version="0.1-3"; sha256="00ppz8009cp0wbkmrxdg8x9jjqqb803bl6ki13hsqz07aya0j4iy"; depends=[]; }; @@ -10537,13 +10597,13 @@ in with self; { historicalborrow = derive2 { name="historicalborrow"; version="1.0.4"; sha256="0g7fs6qn957s3zw4ibbqszn2zpncpf6m41r68dw8g6x942mr0fhv"; depends=[dplyr ggplot2 Matrix posterior rjags rlang tibble tidyr tidyselect]; }; historicalborrowlong = derive2 { name="historicalborrowlong"; version="0.0.5"; sha256="0vw6sahdzcg32mnfja98ji8a4jg1hh3q0455x2shhkjv9rwyqsj4"; depends=[BH clustermq dplyr ggplot2 MASS Matrix posterior Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders tibble tidyr tidyselect trialr withr zoo]; }; historydata = derive2 { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; }; + histoslider = derive2 { name="histoslider"; version="0.1"; sha256="1458bh7by00izx4q9idl479f08i3gk2g59mmzfvh945vbf399km0"; depends=[htmltools reactR rlang shiny]; }; histry = derive2 { name="histry"; version="0.2.4"; sha256="01rdpzkfq7nyiq1gh0cm89dn3466cmhgfj9x19lhl2yvh8xsdz8x"; depends=[CodeDepends evaluate fastdigest roprov]; }; hit = derive2 { name="hit"; version="0.4.0"; sha256="1vyla7jlg61rlrmqjb1wya404xj90xys175h12qy30paxsl5icqz"; depends=[glmnet Rcpp speedglm]; }; hitandrun = derive2 { name="hitandrun"; version="0.5-6"; sha256="0r0iymcmhiv3q1n7mrn3zsz2libfq3cdsq517k7kdk9m35piqrcg"; depends=[rcdd]; }; hive = derive2 { name="hive"; version="0.2-2"; sha256="0ihghpfsk73lndrfrk5907kdsih9s0a7xq23zcyfaa05nk98510n"; depends=[rJava XML]; }; hkclustering = derive2 { name="hkclustering"; version="1.0.1"; sha256="19syq06y5dl0mcwyaxr7w1hj8ffp5s140j72djcz0lljhskzmp6f"; depends=[cluster]; }; hkdatasets = derive2 { name="hkdatasets"; version="1.0.0"; sha256="1a594fgwc5bvimwp5m2zpb6pjy4iavcylxdmsq3hrnh9ll5g5582"; depends=[fst]; }; - hkevp = derive2 { name="hkevp"; version="1.1.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.5"; sha256="1xfvishb5snrgf0sz3s46wq4v8w2mnyaasncflqvvdkj05xqyl9k"; depends=[devtools dplyr janitor purrr readr reshape2 schoolmath stringr tibble tidyr tidyverse]; }; hlidacr = derive2 { name="hlidacr"; version="0.2.0"; sha256="02l86bvb4w8wdq9mk9zh5wkf5i5y5jlgld0ciz851p5ra70c395p"; depends=[curl glue httr jsonlite purrr stringr urltools usethis]; }; @@ -10551,8 +10611,7 @@ in with self; { hmcdm = derive2 { name="hmcdm"; version="2.0.0"; sha256="06nc9w1fghxbxfjckqqq7z6c8kc3ksxasdkya987kx1qfgyph9r8"; depends=[bayesplot progress Rcpp RcppArmadillo rstantools]; }; hmclearn = derive2 { name="hmclearn"; version="0.0.5"; sha256="0zalvgnibd1kygryqcah5d008y6a0nxpy61yyiqsriw89r01jyjk"; depends=[bayesplot MASS mvtnorm]; }; hmeasure = derive2 { name="hmeasure"; version="1.0-2"; sha256="0l4nlny532kddiaa1nmgd37971whhwzb54mb1pvbwax7fsg6hmhw"; depends=[]; }; - hmer = derive2 { name="hmer"; version="1.0.1"; sha256="0rywb6xhgmyhg0lpjdz7n3n28bbx2b9npic7kjp2ksq18m9bwq7x"; depends=[GGally ggplot2 isoband lhs MASS mclust mvtnorm purrr R6 rlang stringr tidyr viridis]; }; - hmlasso = derive2 { name="hmlasso"; version="0.0.1"; sha256="0ydcyz9pw30ji8ghrvkgcbmp27d661vajl97b8cwis52605a3gfx"; depends=[BH MASS Matrix Rcpp RSpectra]; }; + hmer = derive2 { name="hmer"; version="1.2.0"; sha256="0piz1imjfhn3lqnl4j8rph79vrix3z1cjqcmxrq1fky1gcjsgwl1"; depends=[GGally ggplot2 isoband lhs MASS mclust mvtnorm pdist purrr R6 rlang stringr tidyr viridis]; }; hmm_discnp = derive2 { name="hmm.discnp"; version="3.0-9"; sha256="1cwsgjf258hwyf12sn54iqiliikmadbknlvhclhmqrr2vvj7561f"; depends=[nnet]; }; 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]; }; @@ -10589,7 +10648,7 @@ in with self; { howler = derive2 { name="howler"; version="0.2.1"; sha256="00l1952hf2ngypg67y88rgn0xiicsjsyl6xf8r9r65ar9k0fl3yb"; depends=[htmlwidgets shiny]; }; howmany = derive2 { name="howmany"; version="0.3-1"; sha256="045ck8qahfg2swbgyf7dpl32ryq1m4sbalhr7m5qdgpm62vz8h7f"; depends=[]; }; howzatR = derive2 { name="howzatR"; version="1.0.1"; sha256="00mv9qkn4ndp74jwqkjwqmy7j8ywhpl4ycg81yw3xlabbnqb292j"; depends=[magrittr rlang]; }; - hpa = derive2 { name="hpa"; version="1.2.1"; sha256="0z60j7ydbifwsp2flksgswnw3zrr0gamkng4nrbbsz7zxmagsxml"; depends=[Rcpp RcppArmadillo RcppParallel]; }; + hpa = derive2 { name="hpa"; version="1.3.0"; sha256="0vhpvvzwxbqv4qm9489rxs50pz0jcpd5dqpg5wi96i9npcymmqcb"; depends=[Rcpp RcppArmadillo RcppParallel]; }; hpackedbubble = derive2 { name="hpackedbubble"; version="0.1.0"; sha256="1br7q4958f1zgvisglsaf41nz2ahnqi3bzazvlfnmk3nq03cb1ri"; depends=[htmlwidgets]; }; hpcwld = derive2 { name="hpcwld"; version="0.6-5"; sha256="1w7jpfnaqm9qhr52ixyihzwqklhf2pccshhpvf57pra3vc6cwv2l"; depends=[]; }; hpiR = derive2 { name="hpiR"; version="0.3.2"; sha256="0gz9ngnjgys7hzijsma2iyywwiv7vjar5gls28ds11wq8pmsv96n"; depends=[dplyr forecast ggplot2 gridExtra imputeTS lubridate magrittr MASS pdp plyr purrr ranger rlang robustbase zoo]; }; @@ -10605,7 +10664,8 @@ in with self; { 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]; }; hsphase = derive2 { name="hsphase"; version="2.0.2"; sha256="1b62k9sc6604djy37anslvqjpbrj9wsc9mvnfbrnmhqf4g0nnpdq"; depends=[Rcpp RcppArmadillo snowfall]; }; - hsrecombi = derive2 { name="hsrecombi"; version="0.4.2"; sha256="1d2dah63gl8gfzjz9rq9d3d62fqc3q6p0yc81rbx543220q3ll7v"; depends=[curl data_table dplyr hsphase quadprog Rcpp rlist]; }; + hspm = derive2 { name="hspm"; version="1.0-0"; sha256="1fp2mf9rs7l3dhhc7njf2fbkq9pyszm3r3409jzrhmfjzfk61qwl"; depends=[Formula Matrix spdep sphet]; }; + hsrecombi = derive2 { name="hsrecombi"; version="0.5.1"; sha256="0ghkn5nbf5r4dy3z3kk1pnhmd6ds0xnhvkpx1dz6jgi55hswg3x3"; depends=[curl data_table dplyr hsphase Matrix quadprog Rcpp rlist]; }; hsstan = derive2 { name="hsstan"; version="0.8.1"; sha256="0k7sqwx73zid68ji9l2hfihqdlk3rdpid81pp8g3fmi8dpvrzkms"; depends=[BH ggplot2 loo pROC Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; htdp = derive2 { name="htdp"; version="0.1.4"; sha256="0w579qp0p544xryb5r08m1nhqf7rmgv9q0lyx6my4av62l70ka5w"; depends=[Rcpp]; }; htestClust = derive2 { name="htestClust"; version="0.2.2"; sha256="081kxhc7sn070ys94pfzjf3gi2kkqwrqx2sclbgz4ihahqkbnhhr"; depends=[bootstrap MASS]; }; @@ -10615,12 +10675,11 @@ in with self; { html5 = derive2 { name="html5"; version="1.0.2"; sha256="1icji4y2x7bn4nrsf99n8b6g5v053bb9hpwvmp8bf5wh63d1ns8l"; depends=[]; }; htmlTable = derive2 { name="htmlTable"; version="2.4.1"; sha256="14qg65nw0bpikqs1hb1x7apzdzrnnl3ykjnks67kkp46v1skwzrs"; depends=[checkmate htmltools htmlwidgets knitr magrittr rstudioapi stringr]; }; htmldf = derive2 { name="htmldf"; version="0.6.0"; sha256="19brwxqnsxzvgsqq3gsjkcyag9ag3xa3mrl5c4s7x48xx2knfh9q"; depends=[cld3 dplyr httr lubridate magrittr processx progress R_utils ranger rvest stringr tibble tidyr urltools xml2]; }; - htmltab = derive2 { name="htmltab"; version="0.8.2"; sha256="09hnf339f3hzll7a0shq615h9d6f6xqrcv0c9iid6575m5qsallf"; depends=[httr XML]; }; - htmltools = derive2 { name="htmltools"; version="0.5.3"; sha256="0krjyz99q7zvdfg60b128c0zwr36h54gb05jw9c874d8kqv1ni9c"; depends=[base64enc digest fastmap rlang]; }; + htmltools = derive2 { name="htmltools"; version="0.5.4"; sha256="0zij9zrgsi82q5c65sf4pbidnzrkfr763g0n4ypdhf8dd6l2i0h0"; depends=[base64enc digest ellipsis fastmap rlang]; }; htmlwidgets = derive2 { name="htmlwidgets"; version="1.5.4"; sha256="1hgz8sx8xrvfcdwa4q15k942w4qsqg8lyxbbf7qyfzbi807wcgqs"; depends=[htmltools jsonlite yaml]; }; htree = derive2 { name="htree"; version="2.0.0"; sha256="15bi5c2p4aghihp3k12s78447j2x9hbsaq56b5lc8jmd1vf0jdwb"; depends=[]; }; hts = derive2 { name="hts"; version="6.0.2"; sha256="06mmxdm7a2fb1r4mb2x12b00rnkaxlrmlkv5yizr3yixmn4is9wb"; depends=[forecast Matrix Rcpp RcppEigen SparseM]; }; - htsr = derive2 { name="htsr"; version="1.1.4"; sha256="1iz1zbcz6w06x83bj5dw4w6vlqx1gcpy0qhmdjbavn90a3rr2gq7"; depends=[DBI directlabels dplyr editData ggplot2 lubridate openair purrr raster RColorBrewer readr readxl RODBC RSQLite shiny stringr tibble WriteXLS zoo]; }; + htsr = derive2 { name="htsr"; version="1.1.5"; sha256="126nxqllsinky22zb8s9rwlms4daw664v9s8jqcffflab2v2xr7j"; depends=[DBI directlabels dplyr editData ggplot2 lubridate openair purrr raster RColorBrewer readr readxl RODBC RSQLite shiny stringr tibble WriteXLS zoo]; }; httk = derive2 { name="httk"; version="2.2.1"; sha256="1pxv6ph6qnc6i3sgx2l2ixnsmbqsi1qs5392qxjia3vvx7gd9cmk"; depends=[data_table deSolve magrittr msm mvtnorm purrr Rdpack survey truncnorm]; }; httpRequest = derive2 { name="httpRequest"; version="0.0.11"; sha256="0qsi01fcrkps0h6r7l3l5ph3zlq9gscmq19b9ah2q2qlcv3hk4cf"; depends=[]; }; httpcache = derive2 { name="httpcache"; version="1.2.0"; sha256="026sl19301al3sid9hlwq8jz5b0zvh9a4n3cl4niqvc2b57h133r"; depends=[digest httr]; }; @@ -10648,7 +10707,7 @@ in with self; { hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.1.1"; sha256="0a8xy71dkq2bzdnc90irxmbcxhi0anh87ic22x7b22c3m5605w6s"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate mapproj maps purrr RColorBrewer rlang stringr tidyr]; }; hutils = derive2 { name="hutils"; version="1.8.1"; sha256="0pdya5gdyab5pwpgiw9yfa95m5ynqk154sydsfg56dxq1ihzfr74"; depends=[data_table fastmatch magrittr]; }; hutilscpp = derive2 { name="hutilscpp"; version="0.9.3"; sha256="0sh7s1y8wxwrbhdf8kz3x7myzk5jxv0h1yz1lrh345bvw1jdqb9i"; depends=[data_table hutils magrittr]; }; - huxtable = derive2 { name="huxtable"; version="5.5.0"; sha256="0xc5ahbxprzlj6z5gj680b61na340vcvk3bc0gh9qjgknhdwgk8v"; depends=[assertthat commonmark fansi generics glue htmltools memoise R6 rlang stringi stringr tidyselect xml2]; }; + huxtable = derive2 { name="huxtable"; version="5.5.1"; sha256="1ybfqldsla9y04qr4svcw1v7f38kcn6fjsgikdhnfngdz79md3x3"; depends=[assertthat commonmark fansi generics glue htmltools memoise R6 rlang stringi stringr tidyselect xml2]; }; hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; }; hwep = derive2 { name="hwep"; version="2.0.0"; sha256="07ncpkv79nwk6c5a69iky3q01v24imcpszlhbhpsn739kdqdwa1p"; depends=[BH bridgesampling doFuture doRNG foreach future iterators pracma Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tensr updog]; }; hwig = derive2 { name="hwig"; version="0.0.2"; sha256="06a42a38qsjwijbbr2c8dsd7hjm751g1s4sgcmzvvfi6xy7svl3k"; depends=[asnipe data_table spatsoc]; }; @@ -10661,14 +10720,14 @@ 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.5.0"; sha256="1dhy4mafivp4c2l6klr98xi6963gcrnvgf88bzb0j30fwxqwwhyb"; depends=[ggplot2 gtools reshape2 tibble units]; }; + hydraulics = derive2 { name="hydraulics"; version="0.6.1"; sha256="1yk1s9fnphzmkpx9pfawm72i07kdj099q6i6cry9p08bzvac80xk"; depends=[ggplot2 gtools purrr reshape2 tibble units]; }; hydroEvents = derive2 { name="hydroEvents"; version="0.10"; sha256="1w7nswdmg52ldzzz4gphqnp5gfgh9pvgyq9w0phpzj5ff19bxbxz"; depends=[]; }; hydroGOF = derive2 { name="hydroGOF"; version="0.4-0"; sha256="0fw8b66k7gdkdjxgmdpp3lk9d8p0wmlvhq2rkcvajjb5wd09f43a"; depends=[hydroTSM xts zoo]; }; hydroPSO = derive2 { name="hydroPSO"; version="0.5-1"; sha256="16gdv19yqla80s9fjmvahfn21jv62zivirzs5ch4zm9db54g6bry"; depends=[data_table Hmisc hydroGOF hydroTSM lattice lhs scatterplot3d sp vioplot zoo]; }; hydroTSM = derive2 { name="hydroTSM"; version="0.6-0"; sha256="1msavd2k05apsky88zkk1l3c6y3v95fwhmr6xmwsap70bj25krsv"; depends=[automap e1071 gstat lattice maptools sp xts zoo]; }; hydroToolkit = derive2 { name="hydroToolkit"; version="0.1.0"; sha256="0bij4365hczvq17wj9hp0570v35m8ili11mp9dzfj3mvhhqrc9p4"; depends=[ggplot2 lubridate plotly readxl reshape2]; }; hydrogeo = derive2 { name="hydrogeo"; version="0.6-1"; sha256="16m6yvr9yhvb0vdh9pqd6gzf3h9km7gd89y6risjddv6g83469k8"; depends=[]; }; - hydropeak = derive2 { name="hydropeak"; version="0.1.1"; sha256="0hddzvk8bjc31l3qh2pmhxwi8c1zgv3mycw5ki786x4kaym23qiq"; depends=[]; }; + hydropeak = derive2 { name="hydropeak"; version="0.1.2"; sha256="06x1qahavvhaqwdsjg65ixgc6migbm188v3w3vjng5xl2g2ybhqc"; depends=[]; }; hydrorecipes = derive2 { name="hydrorecipes"; version="0.0.3"; sha256="0if79msr8rn1ylk36sqa7maynz20v4y6q7h6xiqijlbnikm7n502"; depends=[dplyr earthtide fftw generics Rcpp RcppArmadillo RcppParallel recipes rlang tibble tidyr]; }; hydroroute = derive2 { name="hydroroute"; version="0.1.1"; sha256="1a1vlbq5cnvhq5mjk9imvj869xmmhq814zvvfysw7jp63z5gvd47"; depends=[dplyr ggplot2 ggpmisc gridExtra hydropeak lubridate reshape2 scales]; }; hydrostats = derive2 { name="hydrostats"; version="0.2.9"; sha256="11ipfp5dnl336wbsw0nrrcd68hccp8igvlrr93rc3hrvif3slkim"; depends=[]; }; @@ -10683,17 +10742,17 @@ 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.4"; sha256="0wncmffj5rjpwwnfminjrmd3wj8x4yav87bbliffd520wrv758jz"; 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.1.0"; sha256="1zyp7w2mc5icp928m3lgvil6lk5ck8877kxbgz0wiimsxm0sdgcp"; 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]; }; hypothesisr = derive2 { name="hypothesisr"; version="0.1.1"; sha256="0z06risagphhvqiw4lrxy52q6q2yr10w2yxsm8iz1wh9ik097pcv"; depends=[dplyr httr jsonlite]; }; hypr = derive2 { name="hypr"; version="0.2.3"; sha256="08aga0cpmlq550f0k9gzfxgnwg9k5n8d7jcmvzz4k8bq2i3cnysk"; depends=[cli magrittr MASS Matrix pracma]; }; 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]; }; + hystReet = derive2 { name="hystReet"; version="0.0.3"; sha256="1vrby9lgy0nm5wa5r1y3k3l2s9fc8vdf4szy8isvnzayr464xvwi"; depends=[httr jsonlite lubridate]; }; hysteresis = derive2 { name="hysteresis"; version="2.7"; sha256="1nnfr50nafhimj2j5xpxly3i8xvkwwddz864gklwm9jzdpmv02yh"; depends=[car MASS msm]; }; i18n = derive2 { name="i18n"; version="0.2.0"; sha256="1ksvrrpymflfbr7acnv3sh4xa0xqjp44ngdpkp500p50mwpww1wr"; depends=[magrittr]; }; i2dash = derive2 { name="i2dash"; version="0.2.3"; sha256="0pj4s47nbs67jnnk0dsna59lrn983zzkybbf6hf4s77sikshmwf0"; depends=[assertive_sets assertive_types flexdashboard glue htmltools knitr magrittr rmarkdown stringi stringr xfun ymlthis]; }; i2extras = derive2 { name="i2extras"; version="0.1.2"; sha256="0h9hy9qbw2lk0pxhrn2gygmcx731r38pj08iyfci5axp8fs0cizs"; depends=[data_table dplyr ellipsis ggplot2 incidence2 rlang tibble tidyr tidyselect trending vctrs]; }; - iAR = derive2 { name="iAR"; version="1.1.0"; sha256="1zzfazrkxpfv6nsy5x2ik14zhslda6xnl5wcl059hjbj3vvlhlcp"; depends=[ggplot2 Rcpp RcppArmadillo Rdpack]; }; + iAR = derive2 { name="iAR"; version="1.2.0"; sha256="0svxn81a0yq3m51594zrpy99i8p9zcfjzbxsi19yyfcm6iymzv24"; depends=[ggplot2 Rcpp RcppArmadillo Rdpack]; }; iAdapt = derive2 { name="iAdapt"; version="2.0.1"; sha256="050kzacvf19m8s89layqqf0l85db1k4cd3akb16jrv9wjfi9k61v"; depends=[Matrix shiny shinydashboard]; }; iBATCGH = derive2 { name="iBATCGH"; version="1.3.1"; sha256="0xq4q4kc2f0whrxz1vmi2gca9pxqix2qm4sfkwbch85if2k8l8fj"; depends=[msm Rcpp RcppArmadillo]; }; iBST = derive2 { name="iBST"; version="1.1"; sha256="0nyyzhscysc7dail5mwnw5w044q88m8sk2lg4xdkw52pdkw1a9z0"; depends=[Rcpp rpart survival]; }; @@ -10736,13 +10795,13 @@ in with self; { iadf = derive2 { name="iadf"; version="0.1.2"; sha256="18r9qyhicbfrkpqnxnn5i854s0afq4pnbaw2ckw1qrhy3pzys6zp"; depends=[dplR dplyr manipulate rlang tibble tidyr tidyselect]; }; iai = derive2 { name="iai"; version="1.8.0"; sha256="0gmfvzzc9yaisjkwdjddwg3cpxcm0gij7q74xxvmp076zplg09jv"; depends=[cowplot ggplot2 JuliaCall lifecycle rappdirs rjson rlang stringr]; }; ialiquor = derive2 { name="ialiquor"; version="0.1.0"; sha256="0nrp75lzb49lhkxspvaq6wx5c48ny6fq9m3r1bz0v5f2fd5ilrdx"; depends=[]; }; - iapws = derive2 { name="iapws"; version="1.0"; sha256="1njbarbl0a146x8y9g9y1r0yd2hjr2r67nqzaqha85dgfxn4x84j"; depends=[]; }; + iapws = derive2 { name="iapws"; version="1.1"; sha256="115m678kb2bz450pjg8a5jrjj3g2q2cgpyg9cksz3ysm6j5vrb1a"; depends=[]; }; iarm = derive2 { name="iarm"; version="0.4.3"; sha256="0ib8b37inq1hdzjm9y9bvk8x1qzn08vkvj3y75gg1swsqxh8w106"; depends=[eRm ggplot2 gridExtra Hmisc psychotools vcdExtra]; }; ib = derive2 { name="ib"; version="0.2.0"; sha256="10h3b9ncz59rp8j628axnrl7gksjiyg576672dhcyd3ygd4by7p5"; depends=[betareg Formula lme4 MASS Matrix Rdpack VGAM]; }; ibawds = derive2 { name="ibawds"; version="0.5.0"; sha256="1w4hm4gn5v7xj3gn54c3r0276c7ic441hn34q3j5qxwmh16af6qy"; depends=[dplyr dslabs ggplot2 magrittr remotes rlang scales stringr]; }; ibb = derive2 { name="ibb"; version="0.0.2"; sha256="11rfrf0ap97rsq0yy23sjahp1bin3j31zdd61p8b5mbp0s0k7ci4"; depends=[dplyr httr jsonlite magrittr rlang tibble tidyselect]; }; ibd = derive2 { name="ibd"; version="1.5"; sha256="0rxvy4hn4fpbv6y214ggkmgfvzwns5mkanp4h8201rjk3v84mk2r"; depends=[car emmeans lpSolve multcomp]; }; - ibdreg = derive2 { name="ibdreg"; version="0.3.6"; sha256="1x8z0vr2cmdks12hxfm0wwxskb0cr669w5j5rpa2ln8q704yy41g"; depends=[]; }; + ibdreg = derive2 { name="ibdreg"; version="0.3.8"; sha256="0c4svyfd7xjx9k6pl40l7y9rc67zschs0nz1l386xi1m7arsp44n"; depends=[]; }; ibdsim2 = derive2 { name="ibdsim2"; version="1.5.0"; sha256="1qbgk77cszf7hzsvxv2yqz07rzdh4vksxglx3wrzn5v18fm01c2q"; depends=[ggplot2 glue pedtools Rcpp ribd]; }; ibelief = derive2 { name="ibelief"; version="1.3.1"; sha256="0fl2vvyl2qygppcycbnjkmlvq6rmxq18y1hk512d6szgi0czvpls"; depends=[]; }; ibm = derive2 { name="ibm"; version="0.1.0"; sha256="0g6wg2qpa4q142xw2vq5pca4ll6pb8hyll5g0c93kk8crddk51s7"; depends=[Rcpp]; }; @@ -10756,7 +10815,6 @@ in with self; { icRSF = derive2 { name="icRSF"; version="1.2"; sha256="1a7046lspk70cvrvzwzhnqcmc3cqa5a9bmzlw012jvcn39m2ca3l"; depends=[icensmis Rcpp]; }; ica = derive2 { name="ica"; version="1.0-3"; sha256="0rdqd3kz2cv3xvf6yz55bwhsg3k7j90d450i3azs2xkbn4q3aka7"; depends=[]; }; ical = derive2 { name="ical"; version="0.1.6"; sha256="1raanaagas1c8w66d8s045z5ip1i97xca4233d55jk6cazv0mb1w"; depends=[V8]; }; - icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; }; icardaFIGSr = derive2 { name="icardaFIGSr"; version="1.0.2"; sha256="1yysqkyr36388i8za8jhz0m1vdn3jv8kpb24pnhbxlwsq8r5x0jr"; depends=[caret doParallel dplyr foreach ggplot2 httr leaflet magrittr plotROC plyr raster reshape2 sp]; }; icarus = derive2 { name="icarus"; version="0.3.1"; sha256="0ipbhzvwdn1cnzgdw33cwv901768srxfi588bimjx2ssl80mqn3a"; depends=[]; }; iccCounts = derive2 { name="iccCounts"; version="1.1.1"; sha256="0h1bjnyl24i2y8z1pys4k89q2dy5cfd808bc7w54j1vyyap0k899"; depends=[Deriv dplyr ggplot2 glmmTMB gridExtra VGAM]; }; @@ -10779,7 +10837,7 @@ in with self; { icesSD = derive2 { name="icesSD"; version="2.0.0"; sha256="1k0i79hh63bmsqw5m6ym2h3dydrjji57lkysp5n9x293lgh04pf2"; depends=[httr icesConnect]; }; icesTAF = derive2 { name="icesTAF"; version="4.0.0"; sha256="1qzy0hplrxvdkvly25ny3fysqdhw538phwgnhshq761sa8gdq8vf"; depends=[purrr roxygen2 TAF]; }; icesVocab = derive2 { name="icesVocab"; version="1.2.0"; sha256="0cd2w0w2m176mpfd3lzvxl88bcli1qrkjrli539i764nlyh0ipl0"; depends=[xml2]; }; - ichimoku = derive2 { name="ichimoku"; version="1.4.2"; sha256="0jv7jli3kv8iqffhn6xvz0dhzkxgly546l154xx95jdapgvwmjgy"; depends=[ggplot2 jsonlite nanonext shiny xts zoo]; }; + ichimoku = derive2 { name="ichimoku"; version="1.4.3"; sha256="11vmjmi1csmnhwbkd4lspa7cmvh2rs2qrq7ncnl5wnnjf9ljrn2m"; depends=[ggplot2 nanonext RcppSimdJson shiny xts zoo]; }; icmm = derive2 { name="icmm"; version="1.2"; sha256="179q8w60g4yrv6wqgfmg47by1zc1mbhsdjgl7jq4wirqvwnxvgym"; depends=[EbayesThresh]; }; iconr = derive2 { name="iconr"; version="0.1.0"; sha256="17q7zj92yrj49slmrpwkxkjd0imrl9ildms9zj8qx7yc7dcv4c1s"; depends=[igraph magick rgdal]; }; icosa = derive2 { name="icosa"; version="0.10.1"; sha256="025bqlgx4p1kxpmizfzgiamcq2f5nj5m2ky25fpgdm714sybvwvi"; depends=[igraph Rcpp sp]; }; @@ -10787,7 +10845,7 @@ in with self; { icr = derive2 { name="icr"; version="0.6.2"; sha256="1xqvzn02x13d706irv83zycpxhm8yq1c34rh1nphddy5gri7gwjb"; depends=[Rcpp]; }; icrf = derive2 { name="icrf"; version="2.0.2"; sha256="1apd9klng8dhd9z9nzqzpx8i84rvpwgyam9mzyh8jk6vd49cgjaf"; depends=[]; }; icsw = derive2 { name="icsw"; version="1.0.0"; sha256="0g7bcqs0rpbs1p202i9wjbl8hhy3r196zambm044xyf7kvsbzzf6"; depends=[]; }; - idar = derive2 { name="idar"; version="1.3"; sha256="16n2vpc6zx8sz2pr8nmza7127s3vwinjrrmmxc63q8cmb1ifi3gv"; depends=[ape FD picante spatstat spatstat_core spatstat_geom spatstat_random]; }; + idar = derive2 { name="idar"; version="1.4"; sha256="082p469ng6gmn48l45n6j2wivv4nq9mkl0pb1nclri2f566l95mf"; depends=[ape FD picante spatstat spatstat_explore spatstat_geom spatstat_random]; }; 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.3"; sha256="0jqjrg0qfzij5bx8r60wpjghsxnszdxgp58ynj10n7q9hc4fhsys"; depends=[dfidx dplyr MASS Rcpp RcppArmadillo Rdpack scales shiny tmvtnorm]; }; @@ -10798,10 +10856,11 @@ in with self; { idm = derive2 { name="idm"; version="1.8.3"; sha256="04ac2yq983vk9v3iyd1p2sqxy8ppdr4p7bcvfbg2d9fanj4b1fa7"; depends=[animation ca corpcor ggplot2 ggrepel]; }; idmTPreg = derive2 { name="idmTPreg"; version="1.1"; sha256="1329sjb4dnw3yiyg16whbj4l2v0kg8phg1x4ysvyp2kqkmw14yq6"; depends=[doParallel foreach survival]; }; idmodelr = derive2 { name="idmodelr"; version="0.4.0"; sha256="11h7l1iv21jxmjwmg0klwiadvwpn1bj055y4a7fqfgsbbqraxlsj"; depends=[deSolve dplyr furrr future ggplot2 magrittr purrr rlang stringr tibble tidyr viridis]; }; + idopNetwork = derive2 { name="idopNetwork"; version="0.1.1"; sha256="0cqnand3yfw2pwanmradwqdd9dyrxw99iric023w12bva826aalz"; depends=[deSolve ggplot2 glmnet igraph mvtnorm orthopolynom patchwork reshape2 scales]; }; idr = derive2 { name="idr"; version="1.3"; sha256="1r6icxf0c0y9wvihwmkk5xqscr1qhacqk3w2076kjm2993f10fbb"; depends=[]; }; ids = derive2 { name="ids"; version="1.0.1"; sha256="1s6ga94gds5ydr9f8qbjfgfpg2dvbnkcrlybqlb33hk3c0c2l8dn"; depends=[openssl uuid]; }; idx2r = derive2 { name="idx2r"; version="1.0.0"; sha256="14d3rasnf8mghwzpg6h4larybgy7drrv0jh71x28qwry49acsqyh"; depends=[]; }; - ie2misc = derive2 { name="ie2misc"; version="0.8.8"; sha256="06nf5g6lcn8wif9k3qd580s2w30yyqqvybzg36q2mil8fnpl2568"; depends=[assertthat checkmate data_table gWidgets2 gWidgets2tcltk lubridate mgsub openxlsx reader readxl stringi]; }; + ie2misc = derive2 { name="ie2misc"; version="0.9.0"; sha256="0cawlkhyfrwwcnqcp1lc1wc4a42ax4r9g9nzbl88sfjxy3fyirkx"; depends=[assertthat checkmate data_table gWidgets2 lubridate mgsub openxlsx reader readxl stringi]; }; ie2miscdata = derive2 { name="ie2miscdata"; version="1.0.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]; }; @@ -10810,12 +10869,12 @@ in with self; { ifCNVR = derive2 { name="ifCNVR"; version="0.1.0"; sha256="0qcmgd3vi413n4ipa6ybkr7a1kwxyr2al8cw4gfr8fp2av1sk4vc"; depends=[data_table isotree rmarkdown]; }; ifaTools = derive2 { name="ifaTools"; version="0.23"; sha256="16xf3165gkmh3f9843m0n4wqdwwdfs6rjh64qcpz8srsm2z5y3l2"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; }; ifctools = derive2 { name="ifctools"; version="0.3.4"; sha256="1cxxk1ysb5ya81g669xyalzmkpfjsjsrrqmvnsg1z0kwh5yv54ds"; depends=[]; }; - ifs = derive2 { name="ifs"; version="0.1.9"; sha256="0gz2zwbv0qvlsc6cv9dk2wfni72ahb6rh1vcsbd52cd6bflh3nh0"; depends=[]; }; + ifs = derive2 { name="ifs"; version="0.1.10"; sha256="0w27z3fjv007717dsn72bm9hbpgzd6pfib6maf9ihnsjllb6k0v5"; depends=[]; }; ifultools = derive2 { name="ifultools"; version="2.0-26"; sha256="1lkmzrh65j6vdb8523axxk9gig5q4zxy08wiqsp16w482d2q2sl1"; 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]; }; - iglu = derive2 { name="iglu"; version="3.3.2"; sha256="1pki85jxdsd8pvandva6sxqy9ymr18izp88rpmmsvay14wk7jfwx"; depends=[caTools dplyr ggplot2 ggpubr gridExtra gtable hms lubridate magrittr patchwork scales shiny tibble tidyr zoo]; }; + iglu = derive2 { name="iglu"; version="3.4.2"; sha256="0ilfkmwmh3xshd67y45v9kvyd69xgf8wmxcw3hxi9zpsb0r4vmsb"; depends=[caTools dplyr ggplot2 ggpubr gridExtra gtable hms lubridate magrittr patchwork scales shiny tibble tidyr zoo]; }; igoR = derive2 { name="igoR"; version="0.1.4"; sha256="00ngw366ir3dxz73v6sc8q6y9hd5wzf09jy4fmwb8hsv4nplnbdk"; depends=[]; }; igraph = derive2 { name="igraph"; version="1.3.5"; sha256="1m4vbc1v2wvjn9df7w9ax0zpr3ys566bqazcakx7vddmnrkmsqcy"; depends=[magrittr Matrix pkgconfig rlang]; }; igraphdata = derive2 { name="igraphdata"; version="1.0.1"; sha256="19w5npa4b8c054v94xlr7nmhhg2fhq4m8jbds86skp8zvipl4rkl"; depends=[]; }; @@ -10824,10 +10883,9 @@ in with self; { igrf = derive2 { name="igrf"; version="1.0"; sha256="1287mx1fpbq9y8jbyb43hlignkqg313rn3kc52pm6b2n77ipkrc6"; depends=[]; }; ihclust = derive2 { name="ihclust"; version="0.1.0"; sha256="049jlx8bspl1md06zyh3m7fr666cymmcwarsjrkr8pdd7vlg918j"; depends=[doParallel factoextra foreach ggplot2]; }; iheatmapr = derive2 { name="iheatmapr"; version="0.5.1"; sha256="1pwkwh7ljlpr6zyz6j8knpz3iw60xzkw8amc98x4pc2mw148jvzx"; depends=[fastcluster ggdendro htmlwidgets jsonlite knitr magrittr RColorBrewer scales]; }; - iheiddown = derive2 { name="iheiddown"; version="0.9.5"; sha256="06daza20mxki18kxjc9ycyjm7vvvrrd44gzb9pcfd5cyfbg4h12v"; depends=[bib2df bookdown crayon dplyr fs gender ggplot2 pagedown pdftools readr rlang rmarkdown rstudioapi servr stringr tibble tidytext usethis xaringan]; }; + iheiddown = derive2 { name="iheiddown"; version="0.9.7"; sha256="1h7cb52wk0z5na543v78vjj2xh77kj3nwgl5vgqnf5186mrknh5v"; depends=[bib2df bookdown crayon dplyr fs gender ggplot2 pagedown pdftools readr rlang rmarkdown rstudioapi servr stringr tibble tidytext usethis xaringan]; }; ihpdr = derive2 { name="ihpdr"; version="1.2.1"; sha256="1qa9ndb5aqbmlqbl0ivh10ddah2rbhsc6928dml20fjgz7lggdww"; depends=[curl dplyr httr lubridate magrittr purrr readxl rlang rvest tidyr xml2]; }; - iilasso = derive2 { name="iilasso"; version="0.0.2"; sha256="043m1n5840459zsknkb54801apb0a2cqfprncmj2wp235rbqj832"; depends=[BH Matrix Rcpp]; }; - ijtiff = derive2 { name="ijtiff"; version="2.2.8"; sha256="0r7r2pxs0q97sm56ypg372aazvv85dx516sziw33gg4dn59b1qz3"; depends=[checkmate cli dplyr fs magrittr purrr readr rlang strex stringr withr zeallot]; }; + ijtiff = derive2 { name="ijtiff"; version="2.2.9"; sha256="1v8np6m8dqc6a3crz3gi6yl8i5y2a9sc2nxlds7as0m6gdqrwc69"; depends=[checkmate cli dplyr fs magrittr purrr readr rlang strex stringr withr zeallot]; }; imabc = derive2 { name="imabc"; version="1.0.0"; sha256="1p420jlvqqcqdjqp7y4mcjkzimw3qiygph5yrvmm75znax3fkg4z"; depends=[data_table foreach lhs MASS truncnorm]; }; image_CannyEdges = derive2 { name="image.CannyEdges"; version="0.1.0"; sha256="0c8pvk91xyys6d2i03yy88kylb3jli5jkpq2s069n7p0yl3z7rr1"; depends=[Rcpp]; }; image_ContourDetector = derive2 { name="image.ContourDetector"; version="0.1.1"; sha256="0h9nq6k99rfmldw1c00k2anlpbjbpm26pp1d7jg2wz334dvlvlij"; depends=[Rcpp sp]; }; @@ -10850,7 +10908,7 @@ in with self; { 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.4"; sha256="0bbkxhwicjy0h24v93h8cvi17ipy82kb4zwkm7pyg8q48bqssdp0"; 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]; }; + imbibe = derive2 { name="imbibe"; version="0.1.1"; sha256="03vaz5vippnmbgs2l4gxpmsnrkxjw7d156ng13r07zicq43g9gwp"; depends=[magrittr Rcpp RNifti]; }; imcExperiment = derive2 { name="imcExperiment"; version="0.99.0"; sha256="0fagasb94q7gxx49c7n4p2cb9j3n5qnfx86s7nvz4naicy96qbyr"; depends=[S4Vectors SingleCellExperiment spatstat_geom SummarizedExperiment]; }; imdbapi = derive2 { name="imdbapi"; version="0.1.0"; sha256="11v7c0s7qqf02b186md5lhgkgmywkn8lmmanlz3gfcxca26g047y"; depends=[dplyr httr stringr]; }; imgpalr = derive2 { name="imgpalr"; version="0.3.1"; sha256="0v9npy63mv9r9wnd8pcdw4rkr0bybhhmkj36sza7dah92i06il17"; depends=[downloader dplyr farver jpeg magrittr tibble]; }; @@ -10874,6 +10932,7 @@ in with self; { importar = derive2 { name="importar"; version="0.1.1"; sha256="0xv445fmjhsbdlsq03k2rlycnggn3rcyq5a49zrg4jvjamzr0rgr"; depends=[]; }; importinegi = derive2 { name="importinegi"; version="1.1.3"; sha256="1r0p01mc9wb24ifldn3dmi0fqxwkp0290h0qrgr72grd34v2xszc"; depends=[data_table dplyr foreign haven rgdal]; }; impressionist_colors = derive2 { name="impressionist.colors"; version="1.0"; sha256="03z5w7y7vbvlnn30r9y3ip93h364f87nhwdb9hcki26csiq2bnlv"; depends=[]; }; + imprinting = derive2 { name="imprinting"; version="0.1.0"; sha256="1rw9x9prw0by4r2prdypqkgs7d2vj5gdjxhw6gk9ikkb3zyvfgmz"; depends=[cowplot dplyr ggplot2 tidyr tidyselect]; }; 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]; }; @@ -10887,7 +10946,7 @@ in with self; { imputeYn = derive2 { name="imputeYn"; version="1.3"; sha256="1b21w1aa5f7yiq8k0wa86wvbg4ij7f6ldwn6asfqwb0b90rvsgvs"; depends=[boot emplik mvtnorm quadprog survival]; }; imsig = derive2 { name="imsig"; version="1.1.3"; sha256="175is0b39grc609dskv9274czv4iwnmlg81dl4nr01xdp6f7g487"; depends=[ggplot2 gridExtra HiClimR igraph RColorBrewer survival]; }; in2extRemes = derive2 { name="in2extRemes"; version="1.0-3"; sha256="1lgsqm29zmjyf8kynyra2p3q7bs4fyd7ac4v6s3pbahzhhzdk94y"; depends=[extRemes]; }; - inTextSummaryTable = derive2 { name="inTextSummaryTable"; version="3.2.0"; sha256="0c8kkvpiq4djfg1qc127iql4g1b4mzmhhx5hc9f2vi0rhicyng9k"; depends=[clinUtils cowplot flextable ggplot2 ggrepel magrittr officer plyr reshape2 scales]; }; + inTextSummaryTable = derive2 { name="inTextSummaryTable"; version="3.2.1"; sha256="0g4ckd7hicm62ki8yg0a7bkw91gjzdlcrhhvvgsyxb8xq66x28gx"; depends=[clinUtils cowplot flextable ggplot2 ggrepel magrittr officer plyr reshape2 scales]; }; inTrees = derive2 { name="inTrees"; version="1.3"; sha256="1afyjh2winb591am1cawchkysyslzv01nwyihvjb7n844pqr5s2j"; depends=[arules data_table gbm RRF xgboost xtable]; }; inaparc = derive2 { name="inaparc"; version="1.2.0"; sha256="0y3m2g5y12wj4af1wiqyi7nlb11avissd59g202rha0wqwzd8q3f"; depends=[kpeaks lhs]; }; inbreedR = derive2 { name="inbreedR"; version="0.3.3"; sha256="0g7h4jgmnbpm4c6pb6fkmpzdg4adkc0k72444jpxbvyddq3hqh24"; depends=[data_table]; }; @@ -10913,7 +10972,7 @@ in with self; { ineq = derive2 { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; }; ineqJD = derive2 { name="ineqJD"; version="1.0"; sha256="0anv384jwzn5gkc0jqsl81bkmrjd21br99c5q30xd6ncxavj4s57"; depends=[]; }; inet = derive2 { name="inet"; version="0.1.0"; sha256="1kjy2kgi5v29yk6pv776gwdqzkscjh96p3iv1j906vh47zp8wrag"; depends=[glmnet hdi MASS]; }; - infer = derive2 { name="infer"; version="1.0.3"; sha256="1m5srhcmkh8wq12pvy57g3g703wilkl8r3gmm5s7lbj103iz7v8b"; depends=[broom dplyr generics ggplot2 glue magrittr patchwork purrr rlang tibble tidyr]; }; + infer = derive2 { name="infer"; version="1.0.4"; sha256="1s4q0nslykl0pb2w1i6ni6hkpp7awvp0wks79br3gk5wa1qkvs19"; depends=[broom dplyr generics ggplot2 glue magrittr patchwork purrr rlang tibble tidyr]; }; 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]; }; @@ -10933,28 +10992,27 @@ in with self; { ingredients = derive2 { name="ingredients"; version="2.2.0"; sha256="11bv4l4fn9kr7y2nfzrwnaya8fi9w3nwcm9vzlqb7dva83rkqbsc"; depends=[ggplot2 gridExtra scales]; }; ini = derive2 { name="ini"; version="0.3.1"; sha256="04yqij344dwm0xqgara8xia42mlmij3i8711qbb5534w05a1l6bv"; depends=[]; }; injectoR = derive2 { name="injectoR"; version="0.2.4"; sha256="0sa32cspp6y3m04yfmd02kxx55mk7l9jxf4r9pk1a6k3sqnj6fl8"; depends=[]; }; - inlabru = derive2 { name="inlabru"; version="2.6.0"; sha256="0fjjw02scf2sr1i6cl6h28pj10vf6i2jysc8iha1gcc4j02qxfs0"; depends=[magrittr Matrix MatrixModels patchwork plyr rgdal rgeos rlang sf sp withr]; }; + inlabru = derive2 { name="inlabru"; version="2.7.0"; sha256="1b6ykgb1l1bq8mz4b40li6ypxh1r9yxl4jlcv8mwmkkfrgmz9rvp"; depends=[lifecycle magrittr Matrix MatrixModels patchwork plyr rgdal rlang sf sp withr]; }; 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.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.4"; sha256="0yzi5x4kyjnb6mjfknqs6415ryf44r55qifh9d2s9nzbhk5y11mg"; depends=[checkmate tm]; }; innsight = derive2 { name="innsight"; version="0.1.1"; sha256="0snnr0mqs0qhng4d73dqn2l6zzw11pdyipszxf1mhxh7mmssnn22"; depends=[checkmate ggplot2 R6 torch]; }; ino = derive2 { name="ino"; version="0.2.0"; sha256="16b38gf30n25dz205y77lr8aj0f39bamc6sbgjfq2kg2vbq700iw"; depends=[ao cli crayon doSNOW dplyr foreach ggplot2 mvtnorm optimizeR progress rlang]; }; 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]; }; + insane = derive2 { name="insane"; version="1.0.1"; sha256="0hzznlmvyw0v0a78q7mfnjps8453mmb3pig7srn98bkxv6f6vcp8"; depends=[broom dplyr DT ggplot2 ggpubr ggthemes glue patchwork purrr readxl shiny tidyr]; }; insect = derive2 { name="insect"; version="1.4.2"; sha256="0pbac9il1jrhii0hxvvqjc3phyr2iamxwzanxx5mrkyjh2wsl3jh"; depends=[ape aphid kmer openssl phylogram RANN seqinr xml2]; }; insectDisease = derive2 { name="insectDisease"; version="1.2.1"; sha256="0aa85sxmrhvhjrqnrv264bns577v0n0n6rqzm9m4cg9q7dilhxsn"; depends=[plyr taxize]; }; insee = derive2 { name="insee"; version="1.1.5"; sha256="1f6y19dysm0mh3fkrwnqcgi5j1lzy08m3ij3wrx26q2vgwv5lkfg"; depends=[crayon dplyr httr openssl purrr rappdirs rlang stringr tibble tidyselect xml2]; }; - insight = derive2 { name="insight"; version="0.18.6"; sha256="1bhwfx75lnjrvn6byl2dn8fzfh2in2msghxwyy9jwpvnxk4c63db"; depends=[]; }; + insight = derive2 { name="insight"; version="0.18.8"; sha256="01bm7w8f80i550gwv41kakaxp0d5a2pqa2s3ihz36snkczmdlapm"; depends=[]; }; insol = derive2 { name="insol"; version="1.2.2"; sha256="166kgxgzbh55y2qqya6c2si22x0v7asi70im054g6xxwc5187kh3"; depends=[raster]; }; inspectdf = derive2 { name="inspectdf"; version="0.0.12"; sha256="1k9dszjfpvpc10qr9nbw5r55mdwslgblhlrgnqjnwx9i89j03mlk"; depends=[dplyr ggfittext ggplot2 magrittr progress Rcpp rlang tibble tidyr]; }; inspector = derive2 { name="inspector"; version="1.0.3"; sha256="16gc98af6wmwf32fz8zml5v17g5lkiybzyzsqgphx0k19hrbc6kr"; depends=[Rdpack]; }; instaR = derive2 { name="instaR"; version="0.2.4"; sha256="0c4m471ragkpksr0h21cdgnjxcknf01xqz543dahxgzjg9ncjwhg"; depends=[httr jsonlite]; }; instagramadsR = derive2 { name="instagramadsR"; version="0.1.0"; sha256="1g2gikps3qraa12x8vfxsyanxg2mkcix57pcsh5myi1lcp5r2y5z"; depends=[jsonlite]; }; - install_load = derive2 { name="install.load"; version="1.2.3"; sha256="0z4klcpwdlmhwvk41z9q4c4382z8glad27h0gai93zyciy44sdyx"; depends=[assertthat checkmate fastmatch]; }; - installr = derive2 { name="installr"; version="0.23.2"; sha256="1xyzap1injimyib16srhbm0hchh1bcd5vg9d9wbvhf8dlpkaxw4q"; depends=[stringr]; }; + install_load = derive2 { name="install.load"; version="1.2.4"; sha256="0ylis31bxyqhjpwb1fwadgb8wwrcjq4p8mrznqckrx6a0f6sai0m"; depends=[assertthat checkmate fastmatch]; }; + installr = derive2 { name="installr"; version="0.23.4"; sha256="1qlwcww3bgbdfqk2qi1vvis11bnvkkwa6h2l195knhx0i0ha8pfj"; depends=[stringr]; }; insuranceData = derive2 { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; }; insurancerating = derive2 { name="insurancerating"; version="0.7.1"; sha256="0sd8bwfb7gv4yq2slm1msw5an19f5fc7a1w7c6byc26whkhdzj10"; 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=[]; }; @@ -10967,7 +11025,7 @@ in with self; { intePareto = derive2 { name="intePareto"; version="0.1.2"; sha256="0shq97r6x4j7p9vcf855jcvmfhghngbhk5dfqlqqhhcf8ibm2si5"; depends=[biomaRt DESeq2 GenomeInfoDb GenomicAlignments GenomicRanges IRanges rPref Rsamtools]; }; integIRTy = derive2 { name="integIRTy"; version="1.0.7"; sha256="15f04p97fvqdq971adyafm3ljirfxz90lv096fdqn2vk0sq5dwyj"; depends=[abind doParallel foreach ltm MASS mclust]; }; 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]; }; + intensegRid = derive2 { name="intensegRid"; version="0.1.2"; sha256="1dhk14rxy7c2pawcg89bhbnx30nzi5hppywmf41aa7f40x2m7wxs"; depends=[dplyr httr jsonlite lubridate magrittr purrr rlang tibble tidyr]; }; intensity_analysis = derive2 { name="intensity.analysis"; version="0.1.6"; sha256="1ydmn7njqk6i2667zaha8mvfndss4im39czadg1f3z6sndp2lsji"; depends=[diffeR ggplot2 raster reshape2 rgdal]; }; intensitynet = derive2 { name="intensitynet"; version="1.3.1"; sha256="0g0lkbfyg0f104avr0y46caaa300yibzqlbhn32hl03sa0dqd6c3"; depends=[ggplot2 igraph intergraph Matrix sna spatstat_geom spdep viridis]; }; interactionR = derive2 { name="interactionR"; version="0.1.6"; sha256="1k6fn0y69s8dq14yqqai4qm97cdyp7sfn8ni19xs2h8hwgmxdhf9"; depends=[car flextable msm officer]; }; @@ -10985,7 +11043,6 @@ in with self; { interp = derive2 { name="interp"; version="1.1-3"; sha256="0gzsnlg8f7knb100n6vv6307c3v2jd8f9qzrq62jkc6g71mn0kmp"; depends=[deldir Rcpp RcppEigen]; }; interplex = derive2 { name="interplex"; version="0.1.0"; sha256="04ylskk2i9pmidknz5wfwba87d710gycrw3p3d29nd2s433scrbk"; depends=[]; }; 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]; }; inters = derive2 { name="inters"; version="0.1"; sha256="0z0sx02ami2mk5ppdawy9j9lb7nmn25b9g6lanchqhxmiffzg3r1"; depends=[fixest glmnet]; }; @@ -10993,7 +11050,7 @@ in with self; { 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=[]; }; - inti = derive2 { name="inti"; version="0.5.7"; sha256="19b3f776aaldwiy7fpkgr92jnkajyz1fgci8s619qqq986jj7pah"; depends=[agricolae dplyr DT emmeans FactoMineR ggplot2 lme4 purrr shiny stringi stringr tibble tidyr]; }; + inti = derive2 { name="inti"; version="0.5.8"; sha256="1czzbf8lmhx7wh1skcv2fc2cizyrdr9hyjavl0cwicanq4jpvhmi"; 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]; }; @@ -11007,7 +11064,7 @@ in with self; { invctr = derive2 { name="invctr"; version="0.2.0"; sha256="1sywjw078rc6nqiz1j77sd7c15nbjjpwqqni3363zzw5c3hgrpx5"; depends=[plyr rlang]; }; inventorize = derive2 { name="inventorize"; version="1.1.1"; sha256="0pbm9iw4v6wqr4qs5g2nfkgiaq75qdfcdicazy94fwwfvx5xbgbv"; depends=[dplyr ggplot2 magrittr plotly plyr tidyr]; }; inverseRegex = derive2 { name="inverseRegex"; version="0.1.1"; sha256="1ca6adv602mh6fgkjy4qvmradki3wp44iak27i1k4cp3fi9cm986"; depends=[]; }; - invertiforms = derive2 { name="invertiforms"; version="0.1.0"; sha256="131h5dlyj38bis2rk2ji3dpdd45iiavfwb4d6cf0gn8rr7ldkwgl"; depends=[glue Matrix sparseLRMatrix]; }; + invertiforms = derive2 { name="invertiforms"; version="0.1.1"; sha256="0n3ksfdryk0g6f60acxh4i9f5z6gi9bsbal95z9pcd1vgvyhr1xw"; depends=[glue Matrix sparseLRMatrix]; }; investr = derive2 { name="investr"; version="1.4.2"; sha256="12hrvi3gi3hwianjnzfir4771kbrfbcy35xmfksp0lxrfxvm61ra"; depends=[nlme]; }; invgamma = derive2 { name="invgamma"; version="1.1"; sha256="12ga2y4wc9bc5zz6vimvxwgjpsx3ys3209nq63gscbw559ydxa5a"; depends=[]; }; io = derive2 { name="io"; version="0.3.2"; sha256="1cyl8wvbngdrdkkckng1bs699rjp737j99kbd8r155fjj0370nx4"; depends=[filenamer stringr]; }; @@ -11017,12 +11074,13 @@ in with self; { 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.9.1"; sha256="1xs6hfr1h8mpm2ksbrx7kjqi01rvgfczsnxmv70czwpsc3lbzrdf"; depends=[assertthat dplyr eurostat forcats glue kableExtra knitr lubridate magrittr plyr readxl rlang tibble tidyr tidyselect]; }; + iotarelr = derive2 { name="iotarelr"; version="0.1.2"; sha256="0dsbcjbval74xlcljjhl2lmr146kg8q3fwx9aw6y6spdfidj9cdc"; depends=[ggplot2 gridExtra Rcpp rlang]; }; 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.5"; sha256="0p6w6qbrpv68akpggqml4krgnazj14jbcafhkv0vk8z3sqskhxk5"; depends=[AsioHeaders Rcpp rlang vctrs]; }; + ipaddress = derive2 { name="ipaddress"; version="0.5.6"; sha256="1hyb29mwg16xk1887kiz68vvw4jpipylyqis16siwiwlzd2yjfn2"; 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="1.0-0"; sha256="1xar3i4d5pmhcfqjfh54d3qpjglsmnpyidxk29jziy6hwc4rsnaa"; depends=[gdistance raster rgeos sp]; }; @@ -11033,7 +11091,7 @@ in with self; { ipft = derive2 { name="ipft"; version="0.7.2"; sha256="0jifmkwac5yfl110200ljm3pas3321j068af9xqzqs0av20m8hps"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; }; ipkg = derive2 { name="ipkg"; version="1.0.5"; sha256="0y1gqc61fqjai3vfsn0rdjd0r8g46ls2jvb97h6gfhdafgfxrq7f"; depends=[remotes]; }; iplots = derive2 { name="iplots"; version="1.1-8"; sha256="01s8a43s2spxgmp6px5dpd96p8f4sfp98nxmxk763hg2868rksx3"; depends=[png rJava]; }; - ipmr = derive2 { name="ipmr"; version="0.0.5"; sha256="14hls6cvdfgkc253514vjrfw049ms846llv4677zsi0nqjzgbqkz"; depends=[magrittr purrr Rcpp rlang]; }; + ipmr = derive2 { name="ipmr"; version="0.0.6"; sha256="1h4y0ayq9bnspr17y65fwpa157iylrf0y0iza1zwy4scrvs39aw5"; depends=[magrittr purrr Rcpp rlang]; }; ipr = derive2 { name="ipr"; version="0.1.0"; sha256="1db06r784c6jga0anp6p5b3k47yfhr84nzxyjn52pc9zkg3yifjm"; depends=[]; }; ipred = derive2 { name="ipred"; version="0.9-13"; sha256="162ckhqn24l0l5ih7qi2k3lxw5iprm1g5a34q1ik0b9wv5ia0s31"; 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]; }; @@ -11041,7 +11099,7 @@ in with self; { ipsecr = derive2 { name="ipsecr"; version="1.3.0"; sha256="0rb2x91rq93kgk3pr6lmk0fsrs2x6w5zjh8vd66051wnz239aqbm"; depends=[BH MASS nlme Rcpp RcppArmadillo secr stringr]; }; ipsfs = derive2 { name="ipsfs"; version="1.0.0"; sha256="1cpa0m19nddpp852vyiqw0azx8idyaqv225akfyrych9y8kw9n4d"; depends=[]; }; iptools = derive2 { name="iptools"; version="0.7.2"; sha256="1jjzigv4rh5ds99z6lqqymfiwi4wzfiv3xpqaib10vrchbvlsrhr"; depends=[AsioHeaders BH Rcpp stringi triebeard]; }; - ipumsr = derive2 { name="ipumsr"; version="0.5.1"; sha256="05lm60362jrlyndh8rmn3kpagzpqvc3xjfwrn68g5pcnahp3cb5z"; depends=[dplyr haven hipread httr jsonlite purrr R6 readr rlang tibble tidyselect xml2 zeallot]; }; + ipumsr = derive2 { name="ipumsr"; version="0.5.2"; sha256="1zyd5yvasz8012hhwqihvbbsw8jc6si51gi8zzsqb4vvjwlp5ch3"; depends=[dplyr haven hipread httr jsonlite purrr R6 readr rlang tibble tidyselect xml2 zeallot]; }; 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.6"; sha256="18myhc0ilh2ngj67xq0inx88dzmn6c2q10qyzfpxy3al4zzg98fz"; depends=[Rcpp RcppEigen]; }; @@ -11056,10 +11114,11 @@ in with self; { irrCAC = derive2 { name="irrCAC"; version="1.0"; sha256="1j9z8vz5zcl51a8qq6maf9sw0dqaknkrai7gp31mzag7b6vwms06"; depends=[]; }; irrICC = derive2 { name="irrICC"; version="1.0"; sha256="0vi5g97kbyhwxz242d1hpqf11izd3kmlzh3997v07md1llcsp6s3"; depends=[]; }; irrNA = derive2 { name="irrNA"; version="0.2.3"; sha256="1s50k0vygqh3zcvy5j6h5krv9gfiv8sakmnbf90hpkh0rlirgf88"; depends=[]; }; - irt = derive2 { name="irt"; version="0.2.5"; sha256="13cfmzr7bw5jbcwykvjli5lsnbcr7n8w6nljwsmnsa42fa7f2159"; depends=[Rcpp]; }; + irt = derive2 { name="irt"; version="0.2.7"; sha256="1qckf91pady8gbp0bdbskijyqmmv2d9icb6ihmf0d2r49f37q4fh"; depends=[Rcpp]; }; irtDemo = derive2 { name="irtDemo"; version="0.1.4"; sha256="0rpwryybnj7b4bxn0mn1m496y85s2fpqdd78lmdl6jg1ck4j4pb3"; depends=[fGarch shiny]; }; irtGUI = derive2 { name="irtGUI"; version="0.2"; sha256="1hyabm9wvld1b1gvcn02yyd8j1wrpfmpxkcj505az64lqj4p7yj0"; depends=[irtoys magrittr mirt psych readxl shiny shinycssloaders shinydashboard WrightMap writexl]; }; irtoys = derive2 { name="irtoys"; version="0.2.2"; sha256="1qshz6czykgf53mq6xiswzv5xsjwrkrinpfkf1yavql4v08hs82b"; depends=[ltm sm]; }; + irtpwr = derive2 { name="irtpwr"; version="1.0.0"; sha256="009m14v1frwwqxi0vlvxk740ky34xj4k7pn4csl69yk429r8l9a2"; depends=[Deriv digest ggplot2 mirt spatstat_random]; }; irtrees = derive2 { name="irtrees"; version="1.0.0"; sha256="003gmnv2d0xsqd54chadkbd8c8kf8fwr4lza86k6qkfs7d3ifkjm"; depends=[DiagrammeR tidyr]; }; irtreliability = derive2 { name="irtreliability"; version="0.1-1"; sha256="15qs8bvgrwajj5kfd57rd34l1p2805ilyd7w60ngrqc14d6az9d2"; depends=[fastGHQuad ltm mirt]; }; isa2 = derive2 { name="isa2"; version="0.3.5"; sha256="17vm0906szhrh2k5x694vwcfijbzmd1v3axpszfybc0lgds437cv"; depends=[lattice]; }; @@ -11085,6 +11144,7 @@ in with self; { isogeochem = derive2 { name="isogeochem"; version="1.1.0"; sha256="0sypzabg1dqs3c0ph6h5qdjdn25hfvcsh3hhks60ylpnjn9ck3x0"; depends=[]; }; isokernel = derive2 { name="isokernel"; version="0.1.0"; sha256="04mrbq2822yhcq4q82xwm61a38zsk6w55jgjkp0xnardpv8a39pb"; depends=[Matrix RANN]; }; isoorbi = derive2 { name="isoorbi"; version="1.0.0"; sha256="1087k2xyfmbnwid787q0zypa788bixnmrjs3zm04gr5qhdbixc74"; depends=[dplyr magrittr readr rlang stringr tidyr]; }; + isopam = derive2 { name="isopam"; version="1.1.0"; sha256="0cj8gn5m7r1fs4riiw1d3cmpg7zy3dyfpcr40dy18zmp4kg6ff7m"; depends=[cluster future future_apply progressr proxy vegan]; }; isopat = derive2 { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; }; 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]; }; @@ -11106,10 +11166,10 @@ in with self; { itertools = derive2 { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj3ph4griykb9vam02hkrdmlr5a5wf660hg6xn"; depends=[iterators]; }; itertools2 = derive2 { name="itertools2"; version="0.1.1"; sha256="0yra3x9ddvn5pp3jibm69205zazv81bz0cflw4mdvxpqadaf9f96"; depends=[iterators]; }; itp = derive2 { name="itp"; version="1.2.0"; sha256="0vh5rpl88v5b6s2vfv42ahaphlspiapx82xa74ynic4rmc2ffjis"; depends=[Rcpp]; }; - itraxR = derive2 { name="itraxR"; version="1.4"; sha256="0gybgzc37q1i2zdik1xjn1l6p98jx8r8k722fsgfb17pxj4l4bkf"; depends=[broom compositions dplyr ggcorrplot ggfortify ggplot2 janitor readr rlang stringr tibble tidyr tiff]; }; + itraxR = derive2 { name="itraxR"; version="1.8"; sha256="1fl843dwvn92i4h0ccdp4xn5jwkkhzng367mmrr1ilwa3bq6ziqr"; depends=[broom compositions dplyr ggcorrplot ggplot2 janitor munsellinterpol readr rlang stringr tibble tidyr tiff]; }; its_analysis = derive2 { name="its.analysis"; version="1.6.0"; sha256="1ig7yq59y5xl1z182bbvgx8vsqs9sb1xscf6zxqn1qmy9f0ggf7v"; depends=[boot car forecast ggplot2 plyr]; }; itsadug = derive2 { name="itsadug"; version="2.4.1"; sha256="1sdqs279qxr3993hw08xg7b54yq03jw1597cqn6cf24sh9vpw9m1"; depends=[mgcv plotfunctions]; }; - itscalledsoccer = derive2 { name="itscalledsoccer"; version="0.2.0"; sha256="1ckb7qwy90pr676imr25j89cfy9mvgdy8c7xhrznkvyp154y7wdi"; depends=[clisymbols crayon data_table dplyr glue httpcache httr jsonlite magrittr R6 rlang stringi tidyr]; }; + itscalledsoccer = derive2 { name="itscalledsoccer"; version="0.2.1"; sha256="03nic9v4bc2blncqp7hjgj7381bw7d8izp76kv7pdpvjvrwz1yxc"; depends=[clisymbols crayon data_table dplyr glue httpcache httr jsonlite magrittr R6 rlang stringi tidyr]; }; itsdm = derive2 { name="itsdm"; version="0.1.3"; sha256="0d8d2lnw0k01bd1q09qrbazk8a8zphmcf5madw4zaavi4ljqrg5f"; depends=[checkmate dplyr fastshap ggplot2 isotree ncdf4 outliertree patchwork raster rlang ROCit sf stars stringr tidyselect]; }; itsmr = derive2 { name="itsmr"; version="1.10"; sha256="1dr8n95rjbsfvw82v2r8rsahxa26f75icp9fn3hfr0d6g0xpkb69"; depends=[]; }; iva = derive2 { name="iva"; version="0.1.0"; sha256="0dchb263ygilxapwsw2gpl18z12wcjsz8zz5fg7h068hmcysa88g"; depends=[Formula ucminf]; }; @@ -11137,13 +11197,16 @@ in with self; { jack = derive2 { name="jack"; version="3.0.0"; sha256="191daxlkkz4494nvnqq6rdk8gkm6ial39cp63dfmkhhd021ay9ld"; depends=[DescTools gmp gmpoly 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]; }; + jackknifeR = derive2 { name="jackknifeR"; version="0.1.1"; sha256="165df6yfkxlm2dy43fslhmh909sagbzzmdplvxa6zr3lk703z0ic"; depends=[]; }; jackstrap = derive2 { name="jackstrap"; version="0.1.0"; sha256="09y9pgb920lnbzlgm6j188q8lw1air83kx383a2f89zz7hhgg7jr"; depends=[Benchmarking doParallel dplyr fBasics foreach ggplot2 plyr reshape rlang scales tidyr]; }; + jackstraw = derive2 { name="jackstraw"; version="1.3.8"; sha256="04d0ribg8nbxazv92hmzzks2krsx024glfc90cm9dxz7if44cwc9"; depends=[cluster ClusterR corpcor irlba qvalue rsvd]; }; jacobi = derive2 { name="jacobi"; version="2.0.1"; sha256="14nd9bq09674jqbq20q8j7mphw68x2clnh7am1nwfghbjgv2l60c"; depends=[Carlson Rcpp rgl Rvcg]; }; jacpop = derive2 { name="jacpop"; version="0.6"; sha256="0kq6rn33civ2g6i5nwfqvcgmnn5k2dwmw60lkmz4ywm0y4xxlkai"; depends=[]; }; + jadeLizardOptions = derive2 { name="jadeLizardOptions"; version="1.0.1"; sha256="1919qm9b5nb6bjwbqhsnimgn5lhcrrhd90ndnsc9kj3z3khw9mkd"; depends=[dplyr ggplot2 magrittr tibble]; }; jaggR = derive2 { name="jaggR"; version="0.1.1"; sha256="0qd4kwcc8zcvg2p1njcv7z4y5ssg77zsylph5bcaqdjxq996q7rv"; depends=[formatR glue]; }; jagsUI = derive2 { name="jagsUI"; version="1.5.2"; sha256="1ig2v5k1xjggh694azr96cv80qapq8al7dhsjhvkx0dihp8kgad2"; depends=[coda rjags]; }; - jagshelper = derive2 { name="jagshelper"; version="0.1.8"; sha256="0kxgfjq58sx2vmxl12aarz74xqjsdqzbhf2rxnn2rqw09iy0wjgm"; depends=[jagsUI MASS]; }; - jagstargets = derive2 { name="jagstargets"; version="1.0.3"; sha256="0zq7jz2m4y8l7rd7gli2z4bg4q8v2p4yz0y9b3mgmbvqm6yr3xbf"; depends=[coda digest fst posterior purrr qs R2jags rjags rlang tarchetypes targets tibble withr]; }; + jagshelper = derive2 { name="jagshelper"; version="0.1.11"; sha256="0n8jzzqy4zpzqx461dkma5sg4hvdr15hz2xg1jy7dhf6gz4yljls"; depends=[jagsUI MASS]; }; + jagstargets = derive2 { name="jagstargets"; version="1.0.4"; sha256="08940ki6rfs014kkwsdsnvp45zd52j217n8y0z6mch8kpyawyial"; depends=[coda digest fst posterior purrr qs R2jags rjags rlang tarchetypes targets tibble withr]; }; jalcal = derive2 { name="jalcal"; version="0.1.0"; sha256="19smqrhvab8f2xb8pa8x6gmvr0r2lwvqisfahixs7aa8lxi708jw"; depends=[]; }; janeaustenr = derive2 { name="janeaustenr"; version="1.0.0"; sha256="1ap8p1lpbj2wz90mpf1vbyzhv2spzv03bi8lwzpsir2y77hjxhxl"; depends=[]; }; janitor = derive2 { name="janitor"; version="2.1.0"; sha256="09nqm957m2f54y2l30619b58x4i7gxwvr2lwg5kly5xy1ya1a1nn"; depends=[dplyr lifecycle lubridate magrittr purrr rlang snakecase stringi stringr tidyr tidyselect]; }; @@ -11157,19 +11220,18 @@ in with self; { jds_rmd = derive2 { name="jds.rmd"; version="0.3.1"; sha256="0mrldh031s5xirmpxr7dpjbz3ylcs7cavs3khhc0q5hhgq2zxydy"; depends=[bookdown rmarkdown]; }; jeek = derive2 { name="jeek"; version="1.1.1"; sha256="15n0k0i1wwp72g8zqrjmglnckab3p65q3rnpg6d6h8hjcpv82i7g"; depends=[igraph lpSolve pcaPP]; }; jenga = derive2 { name="jenga"; version="1.3.0"; sha256="0yq1nkaakzajjdk3w6hzikl6pwqx0546mcb1ik688b0l55vmwphc"; depends=[abind dplyr entropy fANCOVA fastDummies ggplot2 greybox imputeTS lubridate modeest moments narray philentropy purrr readr Rfast scales tictoc]; }; - jetpack = derive2 { name="jetpack"; version="0.5.4"; sha256="0rhr313lfvy160ccjdpvyfacskhqcdvglj0dl0krs1r8vv4fcc6m"; depends=[desc docopt remotes renv]; }; + jetpack = derive2 { name="jetpack"; version="0.5.5"; sha256="0c2vvayci7jm1p97ccgb5nccrgvdyid4fgh12cab18xwrwx1hzxx"; depends=[desc docopt remotes renv]; }; jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; }; jfa = derive2 { name="jfa"; version="0.6.4"; sha256="1ksp4jrch9rhjh1bdscim92sj29j2xn3q4nrddlp2jmhvzaa0dw2"; depends=[extraDistr]; }; jgcricolors = derive2 { name="jgcricolors"; version="1.0.0"; sha256="1lg6yzqly5y2cf396b6rvfqplnfyz9v9ay2g4q9m110mng5ln96l"; depends=[ggplot2 knitr markdown RColorBrewer stringr]; }; - jgsbook = derive2 { name="jgsbook"; version="1.0"; sha256="0n03qfi101ln5bp1fzck2dik5zwscl7lq4yxngqnx6rwpfyx8mlk"; depends=[statip]; }; jiebaR = derive2 { name="jiebaR"; version="0.11"; sha256="08v64xwr9jp4vh88x7y935khh4cmj8rwsjaxfd2c67n0445qppmd"; depends=[jiebaRD Rcpp]; }; jiebaRD = derive2 { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; }; jinjar = derive2 { name="jinjar"; version="0.3.0"; sha256="10lilj98ppy3cpimn5pzsfkvm5chz4bw1rx3a3frgy56nmapnmsv"; depends=[cli cpp11 fs jsonlite rlang]; }; jipApprox = derive2 { name="jipApprox"; version="0.1.4"; sha256="18ga798iafkqvjmra1xw3fpqzhd7c9qjcvklsifs2s6p8czy06v7"; depends=[sampling]; }; - jjAnno = derive2 { name="jjAnno"; version="0.0.3"; sha256="1xqkkqzdalpzc9d9kibc7b2lfmpzxn84f9y8pl1wjs7ins4dhsck"; depends=[dplyr ggiraphExtra ggplot2 magick magrittr]; }; jjb = derive2 { name="jjb"; version="0.1.1"; sha256="0y9yvnzg6xngz1fvzl5jm4yb1pg6wrp3id0gysv214wcznf3gna9"; depends=[]; }; jlctree = derive2 { name="jlctree"; version="0.0.2"; sha256="0l8piz0m9iv9lbw35yx1ww0db0pv0qhbvkz4l36fwjsgnjlh8f6a"; depends=[lme4 rpart survival]; }; jlsm = derive2 { name="jlsm"; version="0.1.0"; sha256="01wmm7555v31kbmy6lcv9j0rr0cav5vsyhl09l7zh0qm6m3ddw7p"; depends=[boot ellipse expm lvm4net MASS Matrix matrixcalc mvtnorm network pROC]; }; + jmatrix = derive2 { name="jmatrix"; version="1.1"; sha256="1rww7fji1angch5az9cs599fii96189p9f92s8h4fpw54snz2hrw"; depends=[memuse Rcpp]; }; jmcm = derive2 { name="jmcm"; version="0.2.4"; sha256="1dpm94k2s2vx3dvd5rk7xrsq786phl0hq7xi9fjjxbr8qfmxhsck"; depends=[Formula Rcpp RcppArmadillo roptim]; }; jmdem = derive2 { name="jmdem"; version="1.0.1"; sha256="15zrxgd5fgi4wzp4s963pnwj3vkgxs4ygqrcpncy9b6j2cxrivdc"; depends=[statmod VGAM]; }; jmetrik = derive2 { name="jmetrik"; version="1.1"; sha256="1if1kxx8apgkbxpkjnlj2lpsfnyj2splsg1p3j5vxa7q6wx70f9j"; depends=[]; }; @@ -11178,7 +11240,7 @@ in with self; { jmv = derive2 { name="jmv"; version="2.3.4"; sha256="0mhai7kvc6fpsybpgj6adnbqsg3nlx16zfjdg6lxkhzjdv0s4gpm"; depends=[afex BayesFactor car dplyr emmeans GGally ggplot2 ggrepel ggridges GPArotation jmvcore lavaan magrittr MASS multcomp mvnormtest nnet PMCMR psych R6 ROCR vcd vcdExtra]; }; jmvReadWrite = derive2 { name="jmvReadWrite"; version="0.3.3"; sha256="0jyrilrh85x5qrkmwp7fvwa9mg8p769qcfnrlj3chv1q2ddfn69j"; depends=[rjson zip]; }; jmvconnect = derive2 { name="jmvconnect"; version="2.3.13"; sha256="0b5klfn4986haw3hhy3aarf88g08s1d46b8xrpxxqnwqw8yd7l88"; depends=[BH evaluate httr jmvcore rappdirs Rcpp]; }; - jmvcore = derive2 { name="jmvcore"; version="2.3.12"; sha256="1vmjf9sszskf767n92rzpg8lai2g1qgkncgn96j39mgck92vrnqn"; depends=[base64enc jsonlite R6 rlang stringi]; }; + jmvcore = derive2 { name="jmvcore"; version="2.3.19"; sha256="0cwchz7n50sxin65nc1k5bygci2yxp68yypmvq2a0fyf56r53gdg"; depends=[base64enc jsonlite R6 rlang stringi]; }; job = derive2 { name="job"; version="0.3.0"; sha256="0d7pw3q5lqlgmav1vx63y8l6gdav96656bg378wj001rx5gx052h"; depends=[digest rstudioapi]; }; jocre = derive2 { name="jocre"; version="0.3.3"; sha256="1i9n3r16pq6r4sy3fc1rxpil5ws8v2is0xdxafinvwr1hzkv1gz6"; depends=[boot KernSmooth plyr TSP]; }; joinXL = derive2 { name="joinXL"; version="1.0.1"; sha256="1l76bckjz5r1kdsh0s10i0gpca12rkfkp14346fn7avdcw73v23i"; depends=[data_table openxlsx R_utils rChoiceDialogs Rcpp readxl rJava timeDate timeSeries]; }; @@ -11197,10 +11259,10 @@ in with self; { jot = derive2 { name="jot"; version="0.0.4"; sha256="0pzlj9vcz7p3zcg2y32cir593x193cxswkc3y9d1xh58vamrgs60"; depends=[cli yaml]; }; journalabbr = derive2 { name="journalabbr"; version="0.4.0"; sha256="17b9igqnd9f9pp1wkpg9zvkmvzhhhnr4nrkgzpvlb0f9hihaj60s"; depends=[data_table httr purrr shiny stringi stringr tidytable]; }; 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=[]; }; + jpeg = derive2 { name="jpeg"; version="0.1-10"; sha256="1jkqj58hj33ar9wyl7c1cnj3h42icq7crmjk93n933q8qc4zdnf8"; depends=[]; }; jpgrid = derive2 { name="jpgrid"; version="0.2.0"; sha256="15a5gv3jw3r320rnvi5dpwp3psfq08v7im95jnwvk1b53pmabc87"; depends=[dplyr geosphere magrittr purrr rlang sf stars stringr tibble tidyr 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.1"; sha256="1z7j5q081gs0qh7x0dcb4mrqmvnzymhmrbw3m0xs85sx5v88akca"; depends=[dplyr httr lubridate navigatr pillar progress purrr rlang stringi stringr tibble tidyr vctrs]; }; + jpstat = derive2 { name="jpstat"; version="0.3.0"; sha256="1q1zc2micb62sdkar9w9pn3sb42lhhbr5pkfn4rg5iyl0iqpn5sa"; depends=[dplyr httr lifecycle navigatr pillar progress purrr rlang stickyr stringr tibble tidyr vctrs]; }; jqr = derive2 { name="jqr"; version="1.2.3"; sha256="1a91zcjxdilhqdyr2lipnwc35f90h0wyqlbg0vw9ay7sq6llxgs9"; 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]; }; @@ -11213,20 +11275,22 @@ in with self; { jshintr = derive2 { name="jshintr"; version="0.1.0"; sha256="08j28c2ab9fh6g7qp2vl8j5hz5kkikvl2id979kv92ach9vranyd"; depends=[htmltools htmlwidgets rstudioapi]; }; jskm = derive2 { name="jskm"; version="0.4.3"; sha256="04bm4haylhjj5wf09jmpznav7shnlnhag7kxl4yqp3z5572dvj1g"; depends=[ggplot2 gridExtra scales survey survival]; }; jsmodule = derive2 { name="jsmodule"; version="1.3.3"; sha256="1n7kl0jmk3dg2vj4fnl85had2flyz16hynwzyzkankn417m25n2z"; depends=[data_table DT epiDisplay geepack GGally ggplot2 ggpubr haven Hmisc jskm jstable labelled MatchIt maxstat officer pROC purrr RColorBrewer readr readxl rstudioapi rvg see shiny shinycustomloader shinyWidgets survey survIDINRI survival timeROC]; }; + json2aRgs = derive2 { name="json2aRgs"; version="0.3.0"; sha256="0n1kj1kll6x7ar00y32pf8z38z7z1bnj29nlv9dx068n4kmy89v7"; depends=[jsonlite yaml]; }; json64 = derive2 { name="json64"; version="0.1.3"; sha256="19q8qgf4wnd3np12ajy180klpjy0g2csw5micwb4sl7qfzl6wc7j"; depends=[jsonlite]; }; - jsonStrings = derive2 { name="jsonStrings"; version="2.1.0"; sha256="0agpkshnqijivvi042f2wkdy34g3z7849rp2p3z0y72bk6a5b2jg"; depends=[R6 Rcpp]; }; - jsonify = derive2 { name="jsonify"; version="1.2.1"; sha256="1kpv6whi6bggi0ij7krzfr0fly6c2j9y54fr5ahgcjp36amr34cj"; depends=[rapidjsonr Rcpp]; }; + jsonStrings = derive2 { name="jsonStrings"; version="2.1.1"; sha256="0936nhm6zx4la7i6fwigz0kvgf9dirz422vhrzjr45f37pyfvkxy"; depends=[R6 Rcpp]; }; + jsonify = derive2 { name="jsonify"; version="1.2.2"; sha256="0bxgyj5b1hnijq5315g050giixy4k5mjz2zdx8yil0igb5ifji9p"; depends=[rapidjsonr Rcpp]; }; jsonld = derive2 { name="jsonld"; version="2.2"; sha256="0bplz2s97wl9yp383jazykh5647iw6kbr1zanqai2s0sxp1xbwn8"; depends=[curl jsonlite V8]; }; - jsonlite = derive2 { name="jsonlite"; version="1.8.3"; sha256="1w685bwhvqxh8y3b4rmzmbbxsj0sqrdad4rni7dxbiqzd2piszy5"; depends=[]; }; + jsonlite = derive2 { name="jsonlite"; version="1.8.4"; sha256="0y0jzf74c3q1sghgarvwmrkvxs7yahywd342m8c0jsr28bhapskr"; 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.4"; sha256="0jxqv3xa9yyzizx1rhxjv65c8b253shridy57skrd5kya701n460"; depends=[igraph Rcpp RcppArmadillo sparta]; }; - jtools = derive2 { name="jtools"; version="2.2.0"; sha256="1aafnjmldg01c25psi47xnqrf5p7kjfcffjknghgw6dczjpn500f"; depends=[crayon generics ggplot2 magrittr pander pkgconfig rlang tibble]; }; + jtools = derive2 { name="jtools"; version="2.2.1"; sha256="1z44rdywbaks471x8z36v3c0ydchycgksgxj9m408bbncb79y3n3"; depends=[crayon generics ggplot2 magrittr pander pkgconfig rlang tibble]; }; jubilee = derive2 { name="jubilee"; version="0.3.3"; sha256="1j2y44pfx9z2k169lh42b4dnfrrnk8jqsjn3wz4l9iscr6r91lx7"; depends=[data_table dplyr readxl xts yaml zoo]; }; juicr = derive2 { name="juicr"; version="0.1"; sha256="0vkbgbagcgaxj6k62b033ik85jnkzvshg8dm9cz7vq4yjqj3icip"; depends=[RCurl XML]; }; + juicyjuice = derive2 { name="juicyjuice"; version="0.1.0"; sha256="0ap1nsyihlagc1yqvwr2x9s16kzb3c8azfi50mzv95275a5l3xb4"; depends=[V8]; }; junctions = derive2 { name="junctions"; version="2.0.3"; sha256="0lm3n8n9dfi9nsdazj74pd57kxm2kzrd1gxdzd0izzwgkjnsrsqc"; depends=[nloptr Rcpp RcppParallel tibble]; }; just_install = derive2 { name="just.install"; version="1.0.2"; sha256="1g82g4lhdk8mf1v4j47y2pgdrryz4175djx42kmg85vw7mlpvlcj"; depends=[dplyr remotes]; }; justifier = derive2 { name="justifier"; version="0.2.4"; sha256="0a9liqxsaf4y02x40bancz5vvqhjzy99gaknmfvw5ngzg0svy55r"; depends=[data_tree DiagrammeR DiagrammeRsvg purrr yaml yum]; }; @@ -11238,18 +11302,18 @@ in with self; { kableExtra = derive2 { name="kableExtra"; version="1.3.4"; sha256="1c5vzy95cbz36jwyssr927qicrayifinv861rvnmg4nghb1gl7q9"; depends=[digest glue htmltools knitr magrittr rmarkdown rstudioapi rvest scales stringr svglite viridisLite webshot xml2]; }; kader = derive2 { name="kader"; version="0.0.8"; sha256="15f2swgngw5rdjdsh5kd55wm2nivlfs8pv4mdn0b75qihwgg1zkk"; depends=[]; }; kaigiroku = derive2 { name="kaigiroku"; version="0.5"; sha256="11f9lxk4kx3d65i2xnbpw1ixcc9qgahqdirl42aiyph4hzah1fhh"; depends=[dplyr jsonlite R_utils tidyr]; }; - kairos = derive2 { name="kairos"; version="1.1.0"; sha256="16lpza2vl32vhprz4a30jhqm99gd4pcg2k12hngcd4vf50z8cmqy"; depends=[arkhe boot dimensio extraDistr ggplot2 Hmisc rlang]; }; + kairos = derive2 { name="kairos"; version="1.2.0"; sha256="1fivyh61wqkq77aicqc90pihrn2kwir4mpbcp5jl9sklcdmh3l3w"; depends=[arkhe dimensio extraDistr ggplot2 Hmisc rlang]; }; kalmanfilter = derive2 { name="kalmanfilter"; version="2.0.0"; sha256="1i55cdlm3f4qmykv4p5q62yiw4bhkq5nnzd7wfpzf1hbnjp94d87"; depends=[Rcpp RcppArmadillo]; }; kamila = derive2 { name="kamila"; version="0.1.2"; sha256="01rwalv2qigxl3j3jyhrdbxlarwf0xdc8xa6c42sgcl6qpna5vn7"; depends=[abind gtools KernSmooth plyr Rcpp]; }; - kangar00 = derive2 { name="kangar00"; version="1.4"; sha256="0cgyxvgk6bxvh77y9vl0p024dya9ffr9fhmwlcxbysbr4p3kyiaj"; depends=[bigmemory biomaRt CompQuadForm data_table igraph KEGGgraph lattice sqldf]; }; + kangar00 = derive2 { name="kangar00"; version="1.4.1"; sha256="0c3wrzk7k322xj0yzladxdhh2j91qm7m0dyqqqfsshfkh8d22m48"; depends=[bigmemory biomaRt CompQuadForm data_table igraph KEGGgraph lattice sqldf]; }; kantorovich = derive2 { name="kantorovich"; version="3.0.1"; sha256="140fmbwaxn968n75my9336svgk7jw5zdq2ah1lcnl2m7qhxkvdxk"; depends=[CVXR gmp lpSolve rcdd Rglpk slam]; }; kaos = derive2 { name="kaos"; version="0.1.2"; sha256="0hzzb8ldydl4g3cl1579q8jv835q4cdmn8agafp6qqdhwi1xxw8k"; depends=[ggplot2 reshape2]; }; kaphom = derive2 { name="kaphom"; version="0.3"; sha256="081drgckirc0wv2viyhhnabrlfzi0nkpq6pffw2rxfjyxdsyvnwa"; depends=[]; }; kappaSize = derive2 { name="kappaSize"; version="1.2"; sha256="0lrcyj85zcl73m6bhbzl6rkprrfpfwmm4amyjkg1xsasy5zlwk67"; depends=[]; }; - kappalab = derive2 { name="kappalab"; version="0.4-7"; sha256="16bwbwwqmq2w7vy8p3wg0y80wfgc8q5l1ly1mqh51xi240z1qmq0"; depends=[kernlab lpSolve quadprog]; }; + kappalab = derive2 { name="kappalab"; version="0.4-8"; sha256="1ybr3nci04f9j91hwb5rv6ahwy89rdicxx2b2bl8rm70pj0vaq4r"; depends=[kernlab lpSolve quadprog]; }; karaoke = derive2 { name="karaoke"; version="1.0"; sha256="1kx11lijdffhhh8prjgsamshgg2v29b2i129fjqi079waa335352"; depends=[seewave tuneR]; }; karel = derive2 { name="karel"; version="0.1.1"; sha256="0nvzvd8aq0sipcvn8agjjd2k1wykpgc99nrrk2cxrlvsjbpd2w52"; depends=[dplyr gganimate ggplot2 gifski magrittr purrr tidyr]; }; - katex = derive2 { name="katex"; version="1.4.0"; sha256="0kgz2qck90h9kaxvy40nii03ib02z757bmw8sgacik82hmj0fxx8"; depends=[V8]; }; + katex = derive2 { name="katex"; version="1.4.1"; sha256="18cziglz8qy1v9gfcjiixq2d3l3na5p51zrxpy3x8asjiddq13d3"; depends=[V8]; }; kayadata = derive2 { name="kayadata"; version="1.2.0"; sha256="0dpfgqhhdfgkpp06y49c8rs6q0cnx9yvz6qya7jhwkanh8zj8pvq"; depends=[dplyr forcats ggplot2 magrittr purrr scales stringr tidyr]; }; kazaam = derive2 { name="kazaam"; version="0.1-0"; sha256="0j7vysnmiv9sggcxdn3nrgfvyl52pza4kkjnsa0xlb3fzq9qpwlz"; depends=[pbdMPI]; }; kcopula = derive2 { name="kcopula"; version="0.1.0"; sha256="07ddrq4lxp8i6n7c7ac7x9mdg9gfmlh7bv3n34qalwv0a6fa061w"; depends=[pracma]; }; @@ -11276,12 +11340,12 @@ in with self; { kernelPSI = derive2 { name="kernelPSI"; version="1.1.1"; sha256="1gnp3ixqmijy6xanlc4l8255biwxmlfyhd3y68arry9rzfjkmxpz"; depends=[CompQuadForm kernlab lmtest pracma Rcpp RcppArmadillo]; }; kernelPhil = derive2 { name="kernelPhil"; version="0.1"; sha256="0pzsknb0ibm3v0ibfaklb4g2mx7zrva4m29356cirwd29nmd8bqw"; depends=[benchmarkme directlabels dplyr ggplot2 gridExtra Hmisc pbapply reshape2 rgdal wordspace]; }; kernelboot = derive2 { name="kernelboot"; version="0.1.9"; sha256="1xqkkgy2b5x9ykwnk0pfhy7cmghzg5aivw6514cx9g0yvdprjmyy"; depends=[future future_apply parallelly Rcpp]; }; - kernelshap = derive2 { name="kernelshap"; version="0.3.0"; sha256="04y4z8zqafpy0a0191avx10rr7yvbdi748cgb86kabgzn5yzvhm6"; depends=[doRNG foreach MASS]; }; + kernelshap = derive2 { name="kernelshap"; version="0.3.1"; sha256="0y3cypdllmm9s4s3nca58962laxsd73zvy4iz9mbvgdpqwfxzk9h"; depends=[doRNG foreach MASS]; }; kernhaz = derive2 { name="kernhaz"; version="0.1.0"; sha256="1cxwjnfyhxfjdbhs21airycs704jic21pdpsbxsx37wkl11cxpai"; depends=[doParallel foreach GA rgl]; }; kernlab = derive2 { name="kernlab"; version="0.9-31"; sha256="12i7ffc1aacyy7bpjc0w60wwivn88wri8jz43h77irn5q5jwcnbk"; 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]; }; - kernstadapt = derive2 { name="kernstadapt"; version="0.0.1"; sha256="1b5gc2l1yf142pkw3bd5rnnvynwmnh90lqfpra9n4sbs9x9zmsci"; depends=[misc3d sparr spatstat_core spatstat_geom spatstat_random spatstat_utils]; }; + kernstadapt = derive2 { name="kernstadapt"; version="0.0.2"; sha256="0hbzc0xqlgs3kbblm247hkaic7s9a5slz22slh5dz9ddgfdy1z21"; depends=[misc3d sparr spatstat_explore spatstat_geom spatstat_random spatstat_utils]; }; 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.1"; sha256="0p6miqzmfm79j6j2yvgw6mwi51ad41pg0dgqz7zn7picwpya3h2p"; 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]; }; @@ -11294,6 +11358,7 @@ in with self; { kfa = derive2 { name="kfa"; version="0.2.1"; sha256="11v0w1j8vispzbrwvsjig83bhrzbdvv13li7ibzyi2n7d1bcrji2"; 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]; }; + kfino = derive2 { name="kfino"; version="1.0.0"; sha256="14gpc72nin96g2sqzbj7z9ca2gs3kjl2k0yg1zfdrv8fgjsn9s6i"; depends=[dplyr ggplot2]; }; kgc = derive2 { name="kgc"; version="1.0.0.2"; sha256="14zbcimnglh5jj07dcaxp1dfjaz8syswy29nf8z39qmslv1hg9kk"; depends=[plyr shiny shinythemes]; }; kgp = derive2 { name="kgp"; version="1.1.0"; sha256="0w5c507s7k7al0dc68iv8hjkz2r1zc5kzg7pm5nk7gq7gixpzpxp"; depends=[]; }; kgrams = derive2 { name="kgrams"; version="0.1.2"; sha256="0m1cw55lr0bl83p379wh3103d1rw9933lvf457kvxy56r1164l2h"; depends=[Rcpp RcppProgress Rdpack rlang]; }; @@ -11326,7 +11391,7 @@ in with self; { klsh = derive2 { name="klsh"; version="0.1.0"; sha256="1r354fd5da6mp7v3048ii09hnghhfwdg6pvmx2ib0cr88ql431sy"; depends=[blink plyr Rcpp SnowballC stringi]; }; klustR = derive2 { name="klustR"; version="0.1.0"; sha256="1g2q6h3cbm8v3gqz0f6v8bl5na9972k38d94czjfxmx4cv7wfgx8"; depends=[htmlwidgets jsonlite]; }; km_ci = derive2 { name="km.ci"; version="0.5-6"; sha256="18sc9vhbdgks8lhk2nfxkkayh8j4j227hl63fm5p04f7z4wm6wc1"; depends=[survival]; }; - kmc = derive2 { name="kmc"; version="0.2-4"; sha256="0y8bdgdxsz53fiqc2yr39agndxs4zxj7mmplj273map9k0slnnqk"; depends=[emplik Rcpp rootSolve]; }; + kmc = derive2 { name="kmc"; version="0.4-2"; sha256="0rnrwqsmxcmf4sjd9p2xz7w12lv58wmy2p349s0x4b34b5arf75d"; depends=[emplik Rcpp rootSolve]; }; kmed = derive2 { name="kmed"; version="0.4.2"; sha256="1pamwl28g6gc84x7sw9czqj8dpraq5pd3hdrf5m3yziwzkfxawnc"; depends=[ggplot2]; }; kmer = derive2 { name="kmer"; version="1.1.2"; sha256="0jimn9r0abglwxdl1zqz0lxa99cmj6haydkxjzqfbpx9by80wnww"; depends=[openssl phylogram Rcpp]; }; kmi = derive2 { name="kmi"; version="0.5.5"; sha256="1j6fyi004fl97l569sn05pb7bmc2jx5hi0blfd896qi309s9qkd8"; depends=[mitools survival]; }; @@ -11337,7 +11402,7 @@ in with self; { kmscv = derive2 { name="kmscv"; version="0.1.0"; sha256="053608dks4q8171wrm6izh4pf0glbq6zpw30i9yq36f5azgy59sk"; depends=[dplyr parsnip purrr rsample tibble]; }; knitLatex = derive2 { name="knitLatex"; version="0.9.0"; sha256="1igacc2sx8897wmnhh8kngd0fq6zqbi30chy5c8jw60zc38mi3wi"; depends=[knitr]; }; knitcitations = derive2 { name="knitcitations"; version="1.0.12"; sha256="1c7pl8jh61pv0brqanmyfy6s0ipxn312b2hjypcsjaph6b8mhj2q"; depends=[digest httr RefManageR]; }; - knitr = derive2 { name="knitr"; version="1.40"; sha256="1g1mhnkyxd2sv6p1l6iph9dnmpbwxhah78xx4kq543ks6vzrb3wv"; depends=[evaluate highr stringr xfun yaml]; }; + knitr = derive2 { name="knitr"; version="1.41"; sha256="1izv1m56ngc20wx4da9mmr5ll6ah14ka8dqn9i3pd7ah70lmya81"; depends=[evaluate highr stringr xfun yaml]; }; knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.2"; sha256="1aj60j7f0gcs120fdrnfbnb7vk7lfn1phil0mghg6a5zldz4cqs3"; depends=[knitr markdown rmarkdown]; }; knitrProgressBar = derive2 { name="knitrProgressBar"; version="1.1.0"; sha256="18v5jrscfrin3mcs63bpj0q1drxk3zkhlbw93sqh0qrq04d4x02v"; depends=[R_oo R6]; }; knitrdata = derive2 { name="knitrdata"; version="0.6.1"; sha256="1am79r4rkrw7vjmyzc0cq4p52l2ypdw99rfhrvdsaq11yllx08mx"; depends=[knitr xfun]; }; @@ -11365,7 +11430,7 @@ in with self; { kriging = derive2 { name="kriging"; version="1.2"; sha256="1s8cvc88g0wldr40hsv00145bym071bmp8klr0pbmvx0gfrqs8y8"; depends=[]; }; krippendorffsalpha = derive2 { name="krippendorffsalpha"; version="2.0"; sha256="0zzhpdmmaiaqrg1xi9jg6lzrhzpav8wyrc8z38rf8x6kxmr2bx3m"; depends=[]; }; krm = derive2 { name="krm"; version="2022.10-17"; sha256="142scj7cgg7sv0g17mivpgzk3h8jczf40h1padixfgx3204fj4xa"; depends=[kyotil]; }; - ks = derive2 { name="ks"; version="1.13.5"; sha256="05bqrjkbx2kn5aax0hy3xd6pf7nxka9bm1sp8ll1cc2gf1nx1i6i"; depends=[FNN kernlab KernSmooth Matrix mclust mgcv multicool mvtnorm plot3D pracma]; }; + ks = derive2 { name="ks"; version="1.14.0"; sha256="14a3pcxxcsfkqz5j6n2wlxkp0gsdp5mzdq7ipcjb65q2gdmwbf9d"; depends=[FNN kernlab KernSmooth Matrix mclust mgcv multicool mvtnorm plot3D pracma]; }; ksNN = derive2 { name="ksNN"; version="0.1.2"; sha256="06x471hck95xqy7rbh53ibhzh6kfjra7y9ipqdj2rqdkmfdj72q8"; depends=[Rcpp]; }; kselection = derive2 { name="kselection"; version="0.2.1"; sha256="03ax8b63fkq4sfsb9zvh2hk4g9nmd8wh5lla26wb7lan4s197dz6"; depends=[]; }; ksharp = derive2 { name="ksharp"; version="0.1.0.1"; sha256="1dnkj838y8c1b53mlljhjqs3nd864i9xcqsv9n4fw28b4br9m570"; depends=[]; }; @@ -11376,7 +11441,7 @@ in with self; { kstMatrix = derive2 { name="kstMatrix"; version="0.1-4"; sha256="0iy4dnl07pbgsv3343gh0szsab1kls2m5cskha08dchz0vqwpwf6"; depends=[igraph]; }; ktaucenters = derive2 { name="ktaucenters"; version="0.1.0"; sha256="15ddjr4c90b5hc4977gk35zb2kswrcvai3xighy7qj6g9lgiszgf"; depends=[dbscan dplyr GSE MASS]; }; ktsolve = derive2 { name="ktsolve"; version="1.3"; sha256="0brxqb60m1lyqhsmds1c3c6cmbcxlzk2nwvi0fhkc8ziwzlfmd09"; depends=[BB nleqslv]; }; - ktweedie = derive2 { name="ktweedie"; version="1.0.0"; sha256="1yr9rh2r7280kc78vq722vzp0n9mgfrczrhcgmzbdkcfvq1ivgj9"; depends=[]; }; + ktweedie = derive2 { name="ktweedie"; version="1.0.1"; sha256="1q946qdsbs7cjzfl97npi1lyqwrwxc72w4wv602faj74x33n0hjp"; depends=[]; }; kuiper_2samp = derive2 { name="kuiper.2samp"; version="1.0"; sha256="0gcgayh7qdic9zprdvs6r8qvpqs467zrm0qzp2acb7alcp01jhpi"; depends=[]; }; kutils = derive2 { name="kutils"; version="1.70"; sha256="06jk66wbq3jmdf2jdhqns6r3yk36l2x7c907x977zv80sqxa1l37"; depends=[foreign openxlsx plyr RUnit xtable]; }; kvh = derive2 { name="kvh"; version="1.4.2"; sha256="0lx7p2rgvcjgg99chcan0qb9hafx226sqvdb1g1xpkdwvzbyxci8"; depends=[Rcpp]; }; @@ -11405,7 +11470,7 @@ in with self; { lacrmr = derive2 { name="lacrmr"; version="1.0.5"; sha256="1lkn9hynqviz50h9k69wir4ajpymkdm1cfyg7hankjwnkypjp8rv"; depends=[dplyr httr janitor jsonlite magrittr sjmisc stringr]; }; lactater = derive2 { name="lactater"; version="0.1.1"; sha256="1bxdbksm1706fk2d7qhfcx4ns4775rayxvh2lxw3rpq3xlyb0prj"; 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-3"; sha256="0rf74mxylg9j5apcxk40wyfbwgsjwh322kc6wxbqxm4rgscs6shw"; depends=[RcppRoll spatstat spatstat_core spatstat_geom spatstat_random]; }; + lacunaritycovariance = derive2 { name="lacunaritycovariance"; version="1.1-4"; sha256="0w0xlc4xxy7yzscxvk3ls9pv1vw5ddx1zvx02pzvm4gc9mrfz2qr"; depends=[RcppRoll spatstat spatstat_explore spatstat_geom spatstat_random]; }; laeken = derive2 { name="laeken"; version="0.5.2"; sha256="1p3ccbaydlr52p8qmgmm2l6kryvq6jjjx7mqn2vv0gpjaxqhyy92"; depends=[boot MASS]; }; lagged = derive2 { name="lagged"; version="0.3.2"; sha256="1ss69jdmfz2al131mvhflaa4hcg71a0balpnc8vkf0f9svhkcs52"; depends=[]; }; lagsarlmtree = derive2 { name="lagsarlmtree"; version="1.0-1"; sha256="1v3a580scxb1v5na3ab3ax9qlzbnay7nhm3ln5l8f9zgsqrg5lyh"; depends=[Formula partykit spatialreg]; }; @@ -11422,7 +11487,7 @@ in with self; { landsat = derive2 { name="landsat"; version="1.1.0"; sha256="15ymmwhkgw0lqyy2sryss3nsmkrjf4cc0bzlsr41vh5c2636srfd"; depends=[lmodel2 mgcv rgdal sp]; }; landsat8 = derive2 { name="landsat8"; version="0.1-10"; sha256="169b5ka98ka9chbmksz6syaygc9wgl8i2gz1h2xkxj3lk9jcg01r"; depends=[rgdal sp]; }; 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]; }; + landscapemetrics = derive2 { name="landscapemetrics"; version="1.5.5"; sha256="1bk7zjmby5blpi9i51dz2ry6zjz4zm8frl61l27qw12dkhhyiyaj"; 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.2.2"; sha256="0pv2avabcs3kqygc6r3ggs368la0z0snfilp4q1jd46hww7ag9dj"; depends=[DBI deSolve doParallel fields foreach Matrix mvtnorm Rcpp RSQLite sf sp splancs testthat]; }; langevitour = derive2 { name="langevitour"; version="0.5"; sha256="0p7k159njgrfvw8adkzm6zma8b6ja2j9wwicrlywcqlbkwhbinbi"; depends=[assertthat htmlwidgets RANN]; }; @@ -11438,15 +11503,15 @@ in with self; { lassopv = derive2 { name="lassopv"; version="0.2.0"; sha256="0yawnjw063jypk3riy9xab9cmliv6c9dnabi18670khd3gzb2r9z"; depends=[lars]; }; lassoshooting = derive2 { name="lassoshooting"; version="0.1.5-1.1"; sha256="1hc05irjwcw54hdrdbwsxfr5b0qq7dysvybzm04jyixqs5b2m8wx"; depends=[]; }; latdiag = derive2 { name="latdiag"; version="0.3"; sha256="13wk8vhiwr9drcx5f4wlgbin6hc83zv54yr4h3qhjagm3hxcxbw0"; depends=[Rdpack]; }; - latentFactoR = derive2 { name="latentFactoR"; version="0.0.3"; sha256="0bm0avimfdhf9lgm4v5vrjbn7833klfp6166g6r8kmyvmn6gigqc"; depends=[BBmisc EGAnet fspe googledrive ineq mlr mvtnorm psych qgraph rstudioapi xgboost]; }; + latentFactoR = derive2 { name="latentFactoR"; version="0.0.4"; sha256="0kgzgympcfp6l4jysccrlxrbmqasz1v95wkmfsw8qgi7dzfsgywc"; depends=[BBmisc EGAnet fspe googledrive ineq Matrix mlr mvtnorm psych qgraph rstudioapi xgboost]; }; latentcor = derive2 { name="latentcor"; version="2.0.1"; sha256="0c8ygjdqxb9zs6b42ncqh5va80vxamdphja18x8dazygynmcgjr0"; depends=[doFuture doRNG fMultivar foreach future geometry ggplot2 heatmaply MASS Matrix microbenchmark mnormt pcaPP plotly]; }; latentgraph = derive2 { name="latentgraph"; version="1.1"; sha256="11h7nrd81licvdikiwwfkz4x9i7drz09w5ns672b7fw0pj4qqgsr"; depends=[glmnet MASS pracma Rcpp RcppArmadillo]; }; latentnet = derive2 { name="latentnet"; version="2.10.6"; sha256="0zkh75cvsiprxfbrzyqi72wvsljxzsifcd71kyrr2m761v3sqm16"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; }; later = derive2 { name="later"; version="1.3.0"; sha256="0acqg29hcm2iq1418b54np7zb5pnr3xzrwc3ijv2pz9wra10ix88"; depends=[Rcpp rlang]; }; - latex2exp = derive2 { name="latex2exp"; version="0.9.5"; sha256="153br3xflvnnxqhkhm1wgwb2664bw08alhslgdcgjdk73clafhla"; depends=[magrittr stringr]; }; + latex2exp = derive2 { name="latex2exp"; version="0.9.6"; sha256="1jp0l0hi5kv4yh28qg2yj2z5fj33gnfvdz2g2v4ibn516fj2d636"; 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.4.3"; sha256="1qqh2igwag57mm42nazszvlp5d4wddgaxmv1mh35jvrv0qwhc75j"; depends=[assertthat data_table foreach magrittr matrixStats R_utils Rdpack rlang rmarkdown]; }; + latrend = derive2 { name="latrend"; version="1.5.0"; sha256="0dh1l1fax7s46z6nh4srqnyhj881rb6mh1cjmcd5cy6xmv95wps9"; depends=[assertthat data_table foreach magrittr matrixStats R_utils Rdpack rlang rmarkdown]; }; latte = derive2 { name="latte"; version="0.2.1"; sha256="1dcwxxj3yran5a3a8vvdfmx4ap69ql2jncxvmci4p4vcw4ki9j9g"; depends=[dplyr ggplot2 glue magrittr memoise mpoly stringr usethis]; }; lattice = derive2 { name="lattice"; version="0.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]; }; @@ -11464,6 +11529,7 @@ in with self; { 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-18"; sha256="02phj1l92dh5qmcl9i8scxgj4v21knbfrwwixq74bgyzwb51ni4r"; depends=[]; }; lazyData = derive2 { name="lazyData"; version="1.1.0"; sha256="0mbmmx6dh8ph4lrx1b4gxbwz3jwxv4nqi0xvfzpzrm3bwbsjc634"; depends=[]; }; + lazyNumbers = derive2 { name="lazyNumbers"; version="1.2.1"; sha256="0dc0j79cv7j3y04mpb2pp3qrjwhiv74rypl9yplwyr36z6fgl00l"; depends=[BH Rcpp RcppCGAL RcppEigen]; }; lazyWeave = derive2 { name="lazyWeave"; version="3.0.2"; sha256="1a7l0rgkp3xq2s6bikciq778fwyr282baa6jk9ip4a71s931p2ag"; depends=[Hmisc labelVector]; }; lazyarray = derive2 { name="lazyarray"; version="1.1.0"; sha256="1bj1a8ab2479cl3d15h9f1fr1hh5d1p3sxpq8y84yzw0rrsxcldd"; depends=[fstcore R6 Rcpp yaml]; }; lazybar = derive2 { name="lazybar"; version="0.1.0"; sha256="1hv9ciznbxv7xnaijfjqisq3lx8nd4vkdkj9clxpdsspi3inlf53"; depends=[R6]; }; @@ -11530,14 +11596,13 @@ in with self; { learnPopGen = derive2 { name="learnPopGen"; version="1.0.4"; sha256="04wxina3n2bspxdp3d4bgqrwyxqxx46pfp8zgzr3rsj89ml8if9l"; depends=[gtools phytools]; }; learningr = derive2 { name="learningr"; version="0.29.1"; sha256="0z3rs7y9yd81f14sbk3dwq1ifr4vca2s3kl1gnkqlns3dycgyp08"; depends=[plyr]; }; learningtower = derive2 { name="learningtower"; version="1.0.0"; sha256="1q1k7wlklnxbb2yw3l96l7ha73vj3l3bnd4wlh2avmknqk2d8xcq"; depends=[dplyr tibble]; }; - learnr = derive2 { name="learnr"; version="0.11.1"; sha256="1p3943hv3ybmbcyfbxidd55dripi0570pf5l51hwz9r3635cx3zs"; depends=[checkmate curl digest ellipsis evaluate htmltools htmlwidgets jsonlite knitr lifecycle markdown promises rappdirs renv rlang rmarkdown rprojroot shiny withr]; }; + learnr = derive2 { name="learnr"; version="0.11.2"; sha256="1w8lcghnqvmggfp90hdpcjflvnxyp5shfk48vq5s4kci8414dm6j"; depends=[checkmate curl digest ellipsis evaluate htmltools htmlwidgets jsonlite knitr lifecycle markdown promises rappdirs renv rlang rmarkdown rprojroot shiny withr]; }; learnrbook = derive2 { name="learnrbook"; version="1.0.2"; sha256="13jd5j597pv3ainy6xx7ra402ymrh25hgfjzq0csq6d86n5fz3aj"; depends=[]; }; leastcostpath = derive2 { name="leastcostpath"; version="1.8.7"; sha256="0ivj15g3npwm0wpz6xaa8dj1am9diyvhyhnki8a3qfwsa7qv2n53"; depends=[gdistance gstat 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="5.5.0"; sha256="0zgd4d9zhjwhwm1z18xjk6qmfbknnxqkbxz48ml6xgabgk3h263l"; 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.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=[]; }; @@ -11547,14 +11612,14 @@ in with self; { leidenbase = derive2 { name="leidenbase"; version="0.1.12"; sha256="15qkvm3pbxlhf8c8732m7a2jfw044ks3gd3s6jg50cfmnn7h7rzq"; depends=[igraph]; }; leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; }; lemna = derive2 { name="lemna"; version="1.0.0"; sha256="1dm6kcbjkh12c7aa0kmygwj5vv61gmpmh06j0jsg0h7ys8hrdhjq"; depends=[deSolve ggplot2 gridExtra]; }; - lemon = derive2 { name="lemon"; version="0.4.5"; sha256="1y3ljidhqdakxlya2npj2w0az820g8kw6gl1cfm4f0cxvzgd1ly4"; depends=[ggplot2 gridExtra gtable knitr lattice plyr rlang scales]; }; + lemon = derive2 { name="lemon"; version="0.4.6"; sha256="0v1kbyk64yzsk92h6yq03kp9alc9632qprznsws61r8firiskim5"; depends=[ggplot2 gridExtra gtable knitr lattice plyr 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=[]; }; less = derive2 { name="less"; version="0.1.0"; sha256="1pgixa04rjngfg0yhxyg4qhd6g0pj8zyb3q8mfa3fjxzpywdy70a"; depends=[caret e1071 FNN MLmetrics pracma R6 randomForest RANN rpart wordspace]; }; - lessR = derive2 { name="lessR"; version="4.2.3"; sha256="0yirj4ai20ydnjr5xx7dxk4yxfjdimwgbkizx0jnr39ypq08314s"; depends=[colorspace ellipse knitr lattice latticeExtra leaps openxlsx robustbase shiny viridisLite]; }; + lessR = derive2 { name="lessR"; version="4.2.4"; sha256="1lcylsb70i7wyaqkwgwq8k62p265aa7azfq1a8n90lghjadckcck"; 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]; }; @@ -11568,9 +11633,10 @@ in with self; { lfe = derive2 { name="lfe"; version="2.8-8"; sha256="0wdbhnyzzvpkjyjsxidkcwpssij3k476lhlfdkk2xwhnz8l2khhg"; depends=[Formula Matrix sandwich xtable]; }; lfl = derive2 { name="lfl"; version="2.2.0"; sha256="02kd7fz12v6xl1f3lv7kkxccln4fm8dmvbn7m9prbiawrbmy16dx"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; }; lfmm = derive2 { name="lfmm"; version="1.1"; sha256="1v2sb2qghwcln3b5rpzhakg562izlzyxzvz49nz74y0rh2gx7g9i"; depends=[foreach ggplot2 knitr MASS purrr Rcpp RcppEigen readr rmarkdown RSpectra]; }; + lfstat = derive2 { name="lfstat"; version="0.9.12"; sha256="0hl5b78llydcphbrg04fi5b4v7p6xxwlcwpl70m2537gra52wvdr"; depends=[dygraphs lattice latticeExtra lmom lmomRFA plyr scales xts zoo]; }; lg = derive2 { name="lg"; version="0.4.1"; sha256="1srlklq6hkb4yd3lbbazswj866i3wzk2524hhj1v45yr7d5qhxv0"; depends=[ggplot2 ks localgauss logspline mvtnorm np tseries]; }; lgarch = derive2 { name="lgarch"; version="0.6-2"; sha256="05xksc4d6dbf5ls4lf2gpk9xyi99fikr7dva88b84rfgads1yhrh"; depends=[zoo]; }; - lgcp = derive2 { name="lgcp"; version="1.8"; sha256="1dw7zvl9mmwdx0kjrbfiq4c9x8ydg8kyf426xjpnmzf2jawmlqb0"; depends=[fields iterators maptools Matrix ncdf4 raster rgeos rpanel sp spatstat_core spatstat_geom spatstat_utils]; }; + lgcp = derive2 { name="lgcp"; version="1.8-2"; sha256="0q7w95gpvdzlli60dgpixl0rn05f4707xwyw215dsrc1z8znyk73"; depends=[fields iterators maptools Matrix ncdf4 raster rgeos rpanel sp spatstat_explore spatstat_geom spatstat_utils]; }; 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.4"; sha256="09x1vw6cnc1c0p0ylcz1q1vcxyaf1kljhh7ni3gl5jm19zii2h4c"; depends=[R6]; }; @@ -11581,13 +11647,12 @@ in with self; { lhs = derive2 { name="lhs"; version="1.1.5"; sha256="0fb3bc3s5pbwg92qkjbg7v8ah36wm6qs05vf098hwjakr7f6yg3s"; depends=[Rcpp]; }; liGP = derive2 { name="liGP"; version="1.0.1"; sha256="01yhrzx67gz7j201mkv1aracrvjh4hxkrc7jn48cfwz0dp1lznws"; depends=[doParallel foreach hetGP laGP]; }; liayson = derive2 { name="liayson"; version="1.0.5"; sha256="1h3xyy40zvmllqlskgnmm755m0xds66hgpgk48zc9i2i3qj6165j"; depends=[ape arules biomaRt distances e1071 gplots matlab phangorn plyr proxy RColorBrewer]; }; - libbib = derive2 { name="libbib"; version="1.6.3"; sha256="04skv3l8f48wbzm304l8fzk354wia102mrlbfysklszmxzy9vidx"; depends=[curl data_table pbapply stringr xml2]; }; + libbib = derive2 { name="libbib"; version="1.6.4"; sha256="1jcdsvg5xgc7yzdc00k2brsiviyzflsdgiyk77icw08bwlbxh9mk"; depends=[curl data_table pbapply stringr xml2]; }; libcoin = derive2 { name="libcoin"; version="1.0-9"; sha256="1syrcdj5qg5m3zd3dlxgpfklswbalfg42w058dr09hnzqsvx0z9d"; depends=[mvtnorm]; }; libgeos = derive2 { name="libgeos"; version="3.11.0-2"; sha256="0plm20y4c2x1qwjq3ds8fm3fjgv1rb2apvgyvrmvnwpsqhizbfzy"; depends=[]; }; libr = derive2 { name="libr"; version="1.2.8"; sha256="0kqjr327hck9p763wzzvh5skimn4larblfyhfqqyc2323z2g5d11"; depends=[common crayon data_table dplyr haven openxlsx Rcpp readr readxl tibble]; }; librarian = derive2 { name="librarian"; version="1.8.1"; sha256="0bbgx9pdwcv64p6zdrw3m0893ar4bw6z90vhbgplp53l65cch548"; depends=[BiocManager remotes]; }; librarysnapshot = derive2 { name="librarysnapshot"; version="0.1.2"; sha256="0v4x564zpm58kxs5n84bi6mcjhbzjg6a2lc30vsc8kbm3qy0nq38"; depends=[]; }; - 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="4.0.1"; sha256="0bfnnshnc3wcz8zghr71srfdhd32wmmwadg5qw85ydvz7bpsgv8i"; depends=[BH classInt data_table glue lazyeval raster Rcpp RcppArmadillo rgl rlas sf sp stars terra]; }; lidaRtRee = derive2 { name="lidaRtRee"; version="4.0.3"; sha256="076gf94kf1m7nxmwacd3fqqq09qn6lrpzm0535mmx0cb0cwy8vga"; depends=[car gvlma imager leaps lidR reldist sf terra]; }; @@ -11631,9 +11696,9 @@ in with self; { lineup = derive2 { name="lineup"; version="0.42"; sha256="1k6l3vl9g6cz3jl1fz6r1dm3lfpmis6yylra69c3s8l8l4fz0gzy"; depends=[class qtl]; }; lineup2 = derive2 { name="lineup2"; version="0.6"; sha256="0qkxwn30g0bjm9aq9a59pb3xq844qr43ribnk607zlf8lwbibsk2"; depends=[Rcpp]; }; lineupjs = derive2 { name="lineupjs"; version="4.6.0"; sha256="198a87hhn1f77ix3mrv8mi04qxlv392aw1cg852h8s6sr2ayxqgl"; depends=[htmlwidgets]; }; - lingglosses = derive2 { name="lingglosses"; version="0.0.4"; sha256="19nsdqvxj8xa0xaf5qbmwxs6fakax9invg36fc1npscf48d3fjl7"; depends=[htmltools kableExtra knitr rmarkdown]; }; + lingglosses = derive2 { name="lingglosses"; version="0.0.5"; sha256="0rwilnqv1lzmw61y1prjp3mvl4q61jr3pwkifq2mmw5vj307iciz"; depends=[htmltools kableExtra knitr rmarkdown]; }; lingmatch = derive2 { name="lingmatch"; version="1.0.4"; sha256="1n6d3xx2ilkp37ia6s578k8rlqq4faxd8k41xjgy866590jjjrmw"; depends=[Matrix Rcpp RcppParallel]; }; - lingtypology = derive2 { name="lingtypology"; version="1.1.9"; sha256="09z3fraycgzykwqiaidsnzgcq8zgl0msa40nz0gmxirrksw8dcq0"; depends=[jsonlite leaflet leaflet_minicharts stringdist]; }; + lingtypology = derive2 { name="lingtypology"; version="1.1.10"; sha256="0ir90f0zkafdmhmnsa8i24xhzn7bddfa7f2nfigpwxpll6q22113"; depends=[jsonlite leaflet leaflet_minicharts stringdist]; }; linguisticsdown = derive2 { name="linguisticsdown"; version="1.2.0"; sha256="1y2g8h0p4q4mjrawzyprsdw8ynqcbpnjypyhdaf03pcwqglcirkl"; depends=[DT knitr magrittr miniUI rstudioapi shiny stringr]; }; link2GI = derive2 { name="link2GI"; version="0.5-0"; sha256="0rpanjp6nwrffw02qsd3dq7x5f9pa4cq7cbny4bwiig4cdf7sgrk"; depends=[devtools R_utils raster roxygen2 sf stringr]; }; linkcomm = derive2 { name="linkcomm"; version="1.0-14"; sha256="15xm4c7sqpid1vjra250dnvdx98qgzbzmvaycf3zqqnqcmy5bw9n"; depends=[dynamicTreeCut igraph RColorBrewer]; }; @@ -11642,7 +11707,7 @@ in with self; { linkspotter = derive2 { name="linkspotter"; version="1.3.0"; sha256="0fwkbz84vq0v5n5xgv1n99ph7qdz08hjj46ac4q293zarg1xk328"; depends=[dplyr energy ggplot2 infotheo mclust minerva pbapply rAmCharts shiny shinybusy tidyr visNetwork]; }; 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]; }; + linpk = derive2 { name="linpk"; version="1.1.2"; sha256="0i87sfh01dl3xqs5vy3ha2prg952zpiq8fbl2amaiamg1qwl2y34"; depends=[mvtnorm]; }; linprog = derive2 { name="linprog"; version="0.9-4"; sha256="1d34m2nyk7m6j2dci69bhy5mlw479xax1517j7f14pq7vhpsm9l1"; depends=[lpSolve]; }; lintools = derive2 { name="lintools"; version="0.1.6"; sha256="1hh1wywa26a9aa2xrmaz2w95wgk8x7cj0b9731yfq0bzzphh6xdl"; depends=[]; }; lintr = derive2 { name="lintr"; version="3.0.2"; sha256="1j9l5lsa88hl5b3lw1789868pm0m2sbahyqayj9213d7zspp0slz"; depends=[backports codetools crayon cyclocomp digest glue jsonlite knitr rex xml2 xmlparsedata]; }; @@ -11658,7 +11723,7 @@ in with self; { listarrays = derive2 { name="listarrays"; version="0.3.1"; sha256="0nfpqywq9pl9yj566y0jw0h89g0ppsc614538ns1jc3l5r2myils"; depends=[]; }; 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.5.2"; sha256="0h36m1m598zrr37fsam51b54aqs0mi8qfj5pvhkl77n9c67y347f"; depends=[checkmate fs rmarkdown tibble yaml]; }; + listdown = derive2 { name="listdown"; version="0.5.4"; sha256="1pb738s1pm86k51yaffdzlkyhgsxs383mrlvpsqp8a7ii4nmbg3j"; depends=[checkmate fs rmarkdown tibble yaml]; }; listenv = derive2 { name="listenv"; version="0.8.0"; sha256="0ps8bk7zlhbviawrw7vw25skjq81hkk3ijyi6g74dmfqy8zsyapx"; depends=[]; }; listr = derive2 { name="listr"; version="0.1.0"; sha256="1k8djk2nvqyyl9ffmfr4djciryha9x22icq972k38990nx2w0al2"; depends=[rlang tidyselect]; }; listviewer = derive2 { name="listviewer"; version="3.0.0"; sha256="0zirxdj58h43062f68h6nqcgmpnvdglxx3kjbs4i4k0z9wvqhx8r"; depends=[htmltools htmlwidgets shiny]; }; @@ -11677,7 +11742,7 @@ in with self; { llbayesireg = derive2 { name="llbayesireg"; version="1.0.0"; sha256="0jhkmrjkqfm1flwsbpv6060j6g7cj4ngm0drvrlvsiqpni0k96mh"; depends=[coda ggplot2 llogistic MASS MCMCpack Rcpp rstan StanHeaders]; }; llogistic = derive2 { name="llogistic"; version="1.0.3"; sha256="0wfszgcdi0i3lsm7gsih6a411v353c2gpbg3f06n6c2n35939lsl"; depends=[]; }; lm_beta = derive2 { name="lm.beta"; version="1.6-2"; sha256="01ys268xx1bhirr6axbc3l6jqnks7d9y1wyqy66bf0fgyz6z4ppb"; depends=[]; }; - lm_br = derive2 { name="lm.br"; version="2.9.5"; sha256="0q9s2drfmbq78pbkk466nqli5wwqrgyszgp0g7f2hmpazhj89y3g"; depends=[Rcpp]; }; + lm_br = derive2 { name="lm.br"; version="2.9.6"; sha256="1gy6j7fk8maa98c0srx03jsjrhj8gcxq32gszxh95zl268hnyspy"; depends=[Rcpp]; }; lmDiallel = derive2 { name="lmDiallel"; version="0.9.5"; sha256="1hgd4j5f23b4am8d8ljnvks9jzcy0z592np0j2kfjpiwca1zl31w"; depends=[multcomp plyr sommer]; }; lmForc = derive2 { name="lmForc"; version="0.1.0"; sha256="0v1r7yv0i3sc6cii78d9f9d3a6rvpvwrs6k3byi825r497xjgw3j"; depends=[]; }; lmPerm = derive2 { name="lmPerm"; version="2.1.0"; sha256="1ss2hcfxqvfq4n6hypv7jp0n0apby9payxzaswaysr5368lkidn3"; depends=[]; }; @@ -11686,7 +11751,7 @@ in with self; { lmap = derive2 { name="lmap"; version="0.1.1"; sha256="0d9blb8hgq2b3klczml74sgpkzbg8v4kn5mzvmip50s1bkk0brfz"; depends=[dplyr ggforce ggplot2 ggrepel nnet tidyverse]; }; 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-30"; sha256="03rhg6cnsvdk06a1yxkivfvfwlx9934nd9q6jnp0bzscnv2dzazx"; depends=[boot lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; }; + lme4 = derive2 { name="lme4"; version="1.1-31"; sha256="1zgdfbzc8lv4rrsjdacagwa693ij2bmn6xkc1bnfbv1z7pix3zss"; depends=[boot lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; }; lmeInfo = derive2 { name="lmeInfo"; version="0.3.0"; sha256="1y1793h5wd6xqj46bkr0xw47287bczhs4kiv1v2cbi70nr628w0d"; depends=[nlme]; }; lmeSplines = derive2 { name="lmeSplines"; version="1.1-12"; sha256="140l95c6yys2rdpyh7clqx4x4qfd4w36hpz6jkb2ygbh90ikzi2r"; depends=[nlme]; }; lmerTest = derive2 { name="lmerTest"; version="3.1-3"; sha256="1zd8gqjkazhxgpnnr484xwsq30p62fq8592nzyc171zjyplpbaim"; depends=[ggplot2 lme4 MASS numDeriv]; }; @@ -11699,6 +11764,7 @@ in with self; { lmmpar = derive2 { name="lmmpar"; version="0.1.0"; sha256="1l3zjmlfjfn2wv4yayqzv6qrwaxk2sgx3hjx371b5fs54zspdj20"; depends=[bigmemory doParallel MASS matrixcalc mnormt plyr]; }; lmodel2 = derive2 { name="lmodel2"; version="1.7-3"; sha256="1fiin2nkffbihz1s8ixmw9lgf8mn3j9krr8iiflizk10mdv54hnb"; depends=[]; }; lmom = derive2 { name="lmom"; version="2.9"; sha256="145va4dhl767mywk36xcmqilm21sfkqhcqi0s07qgq3k39sn4gin"; depends=[]; }; + lmomPi = derive2 { name="lmomPi"; version="0.6.2"; sha256="0k1clrl3pbbnjaz1yp5syzdvy64zz1q1nd3xsbacwrl0q865xs3n"; depends=[lmom stringr]; }; lmomRFA = derive2 { name="lmomRFA"; version="3.4"; sha256="10mc411b19r7jxixkdy85s8b6r7q1gf3073442cszhymyrfdmvb7"; depends=[lmom]; }; lmomco = derive2 { name="lmomco"; version="2.4.7"; sha256="1hn74zj7c165qsq1icgx9qvdmgxxh4hhn062k7xnvm5yh94g4nvz"; depends=[goftest Lmoments MASS]; }; lmreg = derive2 { name="lmreg"; version="1.2"; sha256="02a4nqqcfkjlq21mpk8abd4lj4ib2nps3ndf7zgmzygkd1z0df18"; depends=[MASS]; }; @@ -11727,17 +11793,18 @@ in with self; { locationgamer = derive2 { name="locationgamer"; version="0.1.0"; sha256="0y99m003s177x57m4ynxd8jd2xzl5zb4bj7jnbc04h22ffdl6m6f"; depends=[]; }; locfdr = derive2 { name="locfdr"; version="1.1-8"; sha256="1falkbp2xz07am8jlhwlvyqvxnli4nwl188kd0g58vdfjcjy3mj2"; depends=[]; }; locfit = derive2 { name="locfit"; version="1.5-9.6"; sha256="0xilf6gp3m8xla2fvxr491j31pvim707mnhswvm9yxnb0d09xs0y"; depends=[lattice]; }; - locits = derive2 { name="locits"; version="1.7.5"; sha256="0il7wf3373kcziy6bia3w57mm7i5wcqbzarzr1v9d8r5zw7h96p1"; depends=[igraph wavethresh]; }; - locpol = derive2 { name="locpol"; version="0.7-0"; sha256="1p915n0l09kbwkly627074jslxl01yssp1rf0c7sygvsw6sgy5lm"; depends=[]; }; + locits = derive2 { name="locits"; version="1.7.6"; sha256="15jalcaqz5yymrhlzlsr3xmy34dspnv08lmychqjps8vv0irpr3j"; depends=[igraph wavethresh]; }; + locpol = derive2 { name="locpol"; version="0.8.0"; sha256="1bip9x45kdnwc14rvk3ckzfbs32yc2wiid1ypmbbin4mk7364zxk"; depends=[]; }; locpolExpectile = derive2 { name="locpolExpectile"; version="0.1.1"; sha256="1phwcnbk1vmdk3qmfx2nd6crplly2lb8gb57yl67ky3c4sryh358"; depends=[expectreg lestat locpol matrixcalc quantreg]; }; lodGWAS = derive2 { name="lodGWAS"; version="1.0-7"; sha256="0g5b44d3wb5hnx5l2n76myb1pc9ml3a052n1a4gvgqapa5as35s2"; depends=[rms survival]; }; loder = derive2 { name="loder"; version="0.2.0"; sha256="0m6g8c25dmq0wgpy8y6cbggymxdvqwb6lp2yzs5bgpq183512spb"; depends=[]; }; lodi = derive2 { name="lodi"; version="0.9.2"; sha256="16xqcza87gsqi6kzx0bdv3w9zyvvppjd20rq08lc8vb75nlkx1yb"; depends=[rlang]; }; lodr = derive2 { name="lodr"; version="1.0"; sha256="0bmdw489dv1069krnx9yi0bcgx1vx4ymc6s4pix4shha5c5fbiz4"; depends=[Rcpp RcppArmadillo Rdpack]; }; loe = derive2 { name="loe"; version="1.1"; sha256="1n16pgfxg9vcn729xxjbbvavg2ywbdcch9v2ph8nv3z7psc0q46c"; depends=[MASS]; }; + loedata = derive2 { name="loedata"; version="1.0.1"; sha256="01w0f83n1jzchw12w1wg18lq6idlp9ywr52nipg2l7pn9aa30gvv"; depends=[]; }; 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.1"; sha256="1vzssrg2qqxd27b9d36v3mmkhgkx8n724ql9yhl5p8dy28zgsdxd"; depends=[cli crayon R6]; }; - log4r = derive2 { name="log4r"; version="0.4.2"; sha256="0d7yxp3h7iy0miaprgp16n5vbxk0mvy8aci8r0mmml6wcl2h4jlj"; depends=[]; }; + log4r = derive2 { name="log4r"; version="0.4.3"; sha256="0k4hyln1mqxkp8y383mgs0ds0h05hs7d2mpicfnz7n586nfx9qyz"; 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=[]; }; logOfGamma = derive2 { name="logOfGamma"; version="0.0.1"; sha256="0r7di0l646ycfmdjk8hli6b0v7qj0i8z3i8i7rwd3fsblb2q22vd"; depends=[]; }; @@ -11764,12 +11831,12 @@ in with self; { lognorm = derive2 { name="lognorm"; version="0.1.10"; sha256="021g3g7hyxcrj2lzqfjxj2ypcn8c6qminr0l6sdydynvjdjjv0pc"; depends=[Matrix]; }; logr = derive2 { name="logr"; version="1.3.3"; sha256="08b32wddzs7jwhbkfvm2nz6s096kk31afv78hmdippykmzws37fj"; depends=[this_path withr]; }; logrx = derive2 { name="logrx"; version="0.1.1"; sha256="02xkx9sfis4rn3f9hdaj5idm104r0mpp7rx3spy294ylwv7bdv2a"; depends=[dplyr magrittr miniUI purrr rlang rstudioapi sessioninfo shiny stringi stringr tibble tidyr waiter]; }; - logspline = derive2 { name="logspline"; version="2.1.17"; sha256="05c8l22zcvb086909h9vw7icphww703vkcxp2h881y4n1232pdq3"; depends=[]; }; + logspline = derive2 { name="logspline"; version="2.1.19"; sha256="1527cnnn5qdjp8gr4yls0jp0aachjz5s2v79vs79vrfyvxp9w89p"; 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.1.0"; sha256="1hgf28bs5g07v7j05qxahs0q3j683401ssqk1r256pvk8x9j445l"; depends=[ggplot2 gridExtra plotly pracma]; }; - long2lstmarray = derive2 { name="long2lstmarray"; version="0.0.1"; sha256="1ms47aa5r8cr2w69nv11qjpzy4sh6acys8kq2n548jsdx4z1sc26"; depends=[abind dplyr]; }; + long2lstmarray = derive2 { name="long2lstmarray"; version="0.2.0"; sha256="1d0w5qqqq3jak72ci7p12rcs4hjwmvwlaf47pibc6y9lax609kxw"; depends=[abind dplyr]; }; 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]; }; @@ -11787,7 +11854,7 @@ in with self; { lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; }; loon = derive2 { name="loon"; version="1.4.0"; sha256="0sgvzq06qk7id7h1hr0pa8hc02zp4r25ys3ifv7q9119c618q9an"; depends=[gridExtra]; }; loon_data = derive2 { name="loon.data"; version="0.1.3"; sha256="0sdld3yggjadykqaljf0p4cymy2c47yaxjphc6jwyragzpv4awzw"; depends=[]; }; - loon_ggplot = derive2 { name="loon.ggplot"; version="1.3.2"; sha256="1cla27s6dd0mz2sann42waia800a7s42wchs7zb97qwjfl2gpmw5"; depends=[ggmulti ggplot2 gridExtra loon patchwork rlang scales]; }; + loon_ggplot = derive2 { name="loon.ggplot"; version="1.3.3"; sha256="15by2z3iy5p3frhb1y8rg17gbdds45b01qpcya210hia52b9vdlq"; depends=[cli ggmulti ggplot2 gridExtra loon patchwork rlang scales]; }; loon_shiny = derive2 { name="loon.shiny"; version="1.0.3"; sha256="1bv8a4rrrlf80r9pidjxaaql4rrm6gz13pjz1mii97q9s3xjn0id"; 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]; }; lordif = derive2 { name="lordif"; version="0.3-3"; sha256="1yby9fvzdi1dzvzp6d6h144k1p9nfacd8l5bd66dmhnc8sp2nlx5"; depends=[mirt rms]; }; @@ -11802,10 +11869,10 @@ in with self; { lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17.9"; sha256="04bqa719za6hbbip695190zcq6nkwqmm0qjfw8gpfkqpy7ryqlkv"; depends=[]; }; lpc = derive2 { name="lpc"; version="1.0.2.1"; sha256="1g1dzm7pcrbrdk1dmhbdhj58j69dzar41al3i8q4gysf3adqzsvv"; depends=[]; }; lpcde = derive2 { name="lpcde"; version="0.1.0"; sha256="0lr7g01ld9cq6xr5w1svlrrylba0kas0b2rzdmdnwf6jsf8296cz"; depends=[combinat ggplot2 MASS Matrix mvtnorm purrr Rcpp RcppArmadillo]; }; - lpdensity = derive2 { name="lpdensity"; version="2.3.1"; sha256="13yqllfffhkzsy8h8kisllw467vaajg4dk51sc6lmc63hs6v7y4r"; depends=[ggplot2 MASS]; }; + lpdensity = derive2 { name="lpdensity"; version="2.3.2"; sha256="1pyvqhxxvcd3l0wr0a3a39pxfbg7d66qdhynfb4jchd5sqj2p6a5"; depends=[ggplot2 MASS]; }; lphom = derive2 { name="lphom"; version="0.3.1-1"; sha256="18scyg2rd30haawmnlxrkxvg6d8w9qqs7vj9cxvkg9flalsd8isg"; depends=[lpSolve]; }; lpint = derive2 { name="lpint"; version="2.1"; sha256="0xakxmzgxlg3pmc978sgfnk0wgpbzmm5lbn1wqkz792j0g97jr31"; depends=[]; }; - lpirfs = derive2 { name="lpirfs"; version="0.2.1"; sha256="13wqf9c5pf1dgingy02y1cx2iw3grx7vkqiqhw2dc78q26mpwmlq"; depends=[doParallel dplyr foreach ggplot2 gridExtra lmtest plm Rcpp RcppArmadillo sandwich]; }; + lpirfs = derive2 { name="lpirfs"; version="0.2.2"; sha256="01cvdznz1pyvxj0vixwq9av4vys23mrzzbjd8vnngsm6rmrwci2z"; depends=[doParallel dplyr foreach ggplot2 gridExtra lmtest plm Rcpp RcppArmadillo sandwich]; }; lpl = derive2 { name="lpl"; version="0.11"; sha256="11w2cr5n72p4wds5dm039rdinhvxjfqvrmisksfpf47jddjxhm42"; depends=[MASS survival]; }; lpme = derive2 { name="lpme"; version="1.1.3"; sha256="1ch11cwjci98m7952p9wdsh9fj5y1mjya6ayq0q4wmbm824qfpzb"; depends=[decon flexmix locpol Rcpp RcppArmadillo]; }; lpridge = derive2 { name="lpridge"; version="1.0-8"; sha256="0jk4l95z9rcdqkc8lpp4sf1mg2dqj67rhqw1iafrxy5lx4jfaqqx"; depends=[]; }; @@ -11824,7 +11891,7 @@ in with self; { lsei = derive2 { name="lsei"; version="1.3-0"; sha256="1dka0rigfw4vj809qma2dkiwjb3nw5635ynnba5cm299cn7hb2b2"; depends=[]; }; lsirm12pl = derive2 { name="lsirm12pl"; version="1.1.0"; sha256="193l17z9saqxxyswgy9schrilgr9x2idc900vkblsfhy0nl71chr"; depends=[coda dplyr ggplot2 GPArotation MCMCpack pROC Rcpp RcppArmadillo rlang]; }; 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]; }; + lslx = derive2 { name="lslx"; version="0.6.11"; sha256="1mjkz3zgcajrrkq1igqq0a1rpxwvv41ankr5mj6mcjqpg4ggng1p"; depends=[ggplot2 R6 Rcpp RcppEigen]; }; 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]; }; @@ -11834,6 +11901,7 @@ in with self; { lsr = derive2 { name="lsr"; version="0.5.2"; sha256="00mbnla74k7xcs8640chkcjydi945dahs2d6h1lv89nsrm8hpzx9"; depends=[]; }; lss2 = derive2 { name="lss2"; version="1.1"; sha256="1rkv26zq36zyh891xkkllxphwplljmzpy15g619x1w4qvsajyyg8"; depends=[quantreg]; }; ltable = derive2 { name="ltable"; version="2.0.2"; sha256="05sjyzq3s1bldndpwbknl9md3vzf664wvpkckwxnrswl9i9av6fn"; depends=[clipr]; }; + lterpalettefinder = derive2 { name="lterpalettefinder"; version="1.0.0"; sha256="1rrivlzrk2fzcnhyy3sv0n76v7lv4c1nwiwbr9f6rinqwx02k2dd"; depends=[dplyr ggplot2 jpeg magick magrittr png tidyr tiff]; }; ltm = derive2 { name="ltm"; version="1.2-0"; sha256="0vhgbk6j0z3limsrbjkjkpfn2whiaij5j4jf1gg66mjs9dlylap1"; depends=[MASS msm polycor]; }; ltmix = derive2 { name="ltmix"; version="0.2.1"; sha256="03i0gr79xiqnny57g0y9w5dfpw51gqhrkff2rh8rggsni20pzm1h"; depends=[gtools pracma]; }; ltmle = derive2 { name="ltmle"; version="1.2-0"; sha256="1mqrf77319cjs3q48iigrkjc3rjibz7qyij49a7l0nim3c1hd0b0"; depends=[Matrix matrixStats speedglm]; }; @@ -11841,7 +11909,7 @@ in with self; { ltsk = derive2 { name="ltsk"; version="1.0.9"; sha256="1zrcfhsm4599dj8dywzgpqabcc4sbfm7d99lxxmhqagqiqwamqyc"; depends=[]; }; ltsspca = derive2 { name="ltsspca"; version="0.1.0"; sha256="0hgl2zd8y01z8mhnqg1hlv1l7klpwhwk7q8b99pw9vgnh1f2gnfs"; depends=[pracma Rcpp RcppArmadillo]; }; ltxsparklines = derive2 { name="ltxsparklines"; version="1.1.3"; sha256="0f2ycgjdw9z9m730wh3k362aq71mwmxhnsxhcjxhj8c4lknr50br"; depends=[]; }; - lubridate = derive2 { name="lubridate"; version="1.8.0"; sha256="199b00cql07gf3rf4hh5ba34amnk0ai40zhx73dq1mpkn7ynxml7"; depends=[cpp11 generics]; }; + lubridate = derive2 { name="lubridate"; version="1.9.0"; sha256="0flh3arja7al9xznj5jvicadvq1kb2s63zyg63wlx2bii8gh8dmr"; depends=[generics timechange]; }; luca = derive2 { name="luca"; version="1.0-6"; sha256="0zrxrwpk7iblpysd4fbh50s5bmvd5l1bzbd8rdyk06wby6bcs1rk"; depends=[genetics survival]; }; lucas = derive2 { name="lucas"; version="1.0"; sha256="1ws35f2pq2y7nnik40nj4qpz1d499gfc5isr1409pwy6r5knb78q"; depends=[DBI plyr rpostgis RPostgreSQL]; }; lucid = derive2 { name="lucid"; version="1.8"; sha256="1dhbyr0l7cp5r0r7xdgqqxlix5hhk0v4v0zghd904dvfyaz2zdwi"; depends=[nlme]; }; @@ -11853,15 +11921,14 @@ in with self; { lutz = derive2 { name="lutz"; version="0.3.1"; sha256="15b8gzwykxyqycjba319jpsbny07j8ny9y4lnrg8mcf488ycz57y"; depends=[lubridate Rcpp]; }; luz = derive2 { name="luz"; version="0.3.1"; sha256="1wm8w7x9232ns6b7jvzw3isqrwbq0d6w9an21nna05s39nzyvniq"; depends=[cli coro ellipsis fs generics glue magrittr prettyunits progress purrr R6 rlang torch zeallot]; }; luzlogr = derive2 { name="luzlogr"; version="0.2.0"; sha256="0n0cm94aianwcypa0gwdjvyy3dwbkfv6zi1gq2jn57b41fg20lq5"; depends=[assertthat]; }; - lvec = derive2 { name="lvec"; version="0.2.4"; sha256="0f8bn1p3i2myz8nbw2iw48wm1v81f34zk0aqiqbvhsbpcxba2gdf"; depends=[BH Rcpp]; }; + lvec = derive2 { name="lvec"; version="0.2.5"; sha256="12q486xvnfyga15yx8av56sflahcni2wm09rx8abj8yzkjgfdiva"; depends=[BH Rcpp]; }; lvm4net = derive2 { name="lvm4net"; version="0.3"; sha256="1iq93mrdhymdixnk7y7rkibm3cqljl4y9qkjq4mzkcwcp4960y5q"; depends=[corpcor ellipse ergm glmmML igraph MASS mvtnorm network]; }; lvmcomp = derive2 { name="lvmcomp"; version="1.2"; sha256="08hs97bdz4n0bdhvqqq5xywfy140s69c750rn38criq4cw4gm3z7"; depends=[coda Rcpp RcppArmadillo]; }; lvmisc = derive2 { name="lvmisc"; version="0.1.1"; sha256="06ry1azfpqdh1hblhnc47n9265dkzhm96rajl8y7xnvqmv6ad8jj"; depends=[cowplot dplyr ggplot2 glue purrr rlang rsample tibble tidyselect vctrs]; }; lvnet = derive2 { name="lvnet"; version="0.3.5"; sha256="1wqqxavs2s0hmlifyaa1jrlc8hj4z72fkgjckkmh9m2r4jp9zy0g"; depends=[corpcor dplyr glasso lavaan Matrix mvtnorm OpenMx psych qgraph semPlot]; }; lvplot = derive2 { name="lvplot"; version="0.2.1"; sha256="0zby40866kvqxdz4hk6r0f4rfh7rzmy0n899cjjg5rqzcap7s5di"; depends=[ggplot2 RColorBrewer tibble]; }; - lwgeom = derive2 { name="lwgeom"; version="0.2-9"; sha256="1a0s15rliqd4zr6pyj76xln41f64s9yfwblk074342zvvbps5ck9"; depends=[Rcpp sf units]; }; + lwgeom = derive2 { name="lwgeom"; version="0.2-10"; sha256="1gdvp2q4mzlg1kpjqxkiqxw1r5c4n5pxwvhdbzp89a3gyyjgh7zf"; depends=[Rcpp sf units]; }; lwqs = derive2 { name="lwqs"; version="0.5.0"; sha256="11hkz3b3sgm6v30gwaq463klljjf6c4qx26a5ccc1wl6r439gxqp"; depends=[data_table gamm4 ggplot2 gridExtra gWQS plyr]; }; - lxb = derive2 { name="lxb"; version="1.5"; sha256="16x1mvhxqhvibzmv6mlqcmkgic2sha1xagf7r2azmn4z8x1m9w6n"; depends=[]; }; m2b = derive2 { name="m2b"; version="1.0"; sha256="0agzw67mmwrw1f61yn24z5w1pgjssdapg3li0a53i3ylnij45mzr"; depends=[caret caTools e1071 geosphere ggplot2 randomForest]; }; m2r = derive2 { name="m2r"; version="1.0.2"; sha256="0vwvpalap4z5x2004c92n0ka7i4l64ry5n8pmxs4vjpd8fyx91gc"; depends=[gmp memoise mpoly Rcpp stringr usethis]; }; m5 = derive2 { name="m5"; version="0.1.1"; sha256="0cw9b31j564qc5s1b37r1p425p4gndlzgwy34cn0m2c65jwiyf6h"; depends=[data_table lubridate stringi]; }; @@ -11870,7 +11937,7 @@ in with self; { mBvs = derive2 { name="mBvs"; version="1.5"; sha256="1fmi4ap55jl06swivspk24acwf5n4wd9agiw330z15x427j579s3"; depends=[]; }; mDAG = derive2 { name="mDAG"; version="1.2.2"; sha256="0k85sl0jmpcpiz92cz6x3kd8jc6yyfv9z4wm1kyaikcf5q4qlad4"; depends=[bnlearn logistf mgm nnet pcalg Rcpp RcppArmadillo]; }; mExplorer = derive2 { name="mExplorer"; version="1.0.0"; sha256="1563d9r7f25vw5vsph21z3dwz9n40dpaiyx28ay1bbp5i1x2l3rb"; depends=[nnet qusage]; }; - mFD = derive2 { name="mFD"; version="1.0.1"; sha256="1hq3981xar786bhg4xdvp17v4nds0fd1pgj7pcn8zyykr3r44g84"; depends=[ade4 ape betapart cluster dendextend FactoMineR gawdis geometry ggplot2 ggrepel Hmisc patchwork reshape2 rstatix vegan]; }; + mFD = derive2 { name="mFD"; version="1.0.3"; sha256="1kxiyvq7cs2hjprnj7snrdm5i2cnd00l1k59v18612d3z78b0nih"; depends=[ade4 ape betapart cluster dendextend FactoMineR gawdis geometry ggplot2 ggrepel Hmisc patchwork reshape2 rstatix vegan]; }; mFDP = derive2 { name="mFDP"; version="0.1.0"; sha256="0mvqg3qpv1zcj5lsk36dw4qs75i66cmv4qazpmsilhfh0v46p2dx"; depends=[]; }; mFLICA = derive2 { name="mFLICA"; version="0.1.5"; sha256="0znjp95ifwqpqwrnlcb77r1cdwpvbpql6ggnck018xddc8x40hzv"; depends=[dtw ggplot2]; }; mFilter = derive2 { name="mFilter"; version="0.1-5"; sha256="0anc93mciq8j64knd0i38sfgv10w1gd375wnfzn1fq8sj3lby7kb"; depends=[]; }; @@ -11891,6 +11958,7 @@ in with self; { macc = derive2 { name="macc"; version="1.0.1"; sha256="1qj4mlikbqrxa6m46527xmxdbk7b3l95z6jdgpmi0ifywjiv52a4"; depends=[car lme4 MASS nlme optimx]; }; macleish = derive2 { name="macleish"; version="0.3.9"; sha256="06r97fsasjj7qdm4p8yhvi2hfs1qy35xs0ay9i3bv5k09z5zfia7"; depends=[dplyr etl lubridate phenocamr readr rvest sf stringr xml2]; }; maclogp = derive2 { name="maclogp"; version="0.1.1"; sha256="1fbwv4j4mb7zkyc5vspq7k17pwr49dbvqkssda54ggcf1nbqykmb"; depends=[BMA plot_matrix rlist]; }; + macroBiome = derive2 { name="macroBiome"; version="0.1.0"; sha256="04fv6vrc4lmz23y0g1yzrgf0r4rm8k1v6vnizb1h0g4xyjw4ij80"; depends=[palinsol raster rworldmap rworldxtra sp strex]; }; macrocol = derive2 { name="macrocol"; version="0.1.0"; sha256="1qz5hsxg4ga4blbrakn4bia2l4lh6h5kh4ix7vnm7rl2f7yk4r5a"; depends=[httr lubridate openxlsx R_utils readxl]; }; mactivate = derive2 { name="mactivate"; version="0.6.6"; sha256="0qqhniq0wdhazhfiiw7g2b0v8jkc8jl2m117k1c6gnajg8gs1ymn"; depends=[]; }; maczic = derive2 { name="maczic"; version="0.2.0"; sha256="0r60q34ff38cdxf20b1f07wc4rbac1ch0chri36x221k2cnpxnhh"; depends=[BB emplik MASS mathjaxr mediation pscl sandwich survival]; }; @@ -11905,7 +11973,7 @@ in with self; { 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]; }; magi = derive2 { name="magi"; version="1.2.0"; sha256="1psl3rxhhlm4a1qd3xv1k4lcbj52wpg5aj1lwb83rcpwp3h5blsr"; depends=[BH deSolve gridBase gridExtra Rcpp RcppArmadillo roptim]; }; - magic = derive2 { name="magic"; version="1.6-0"; sha256="1gybia2aq80ldk1d845y5srncfzbbmpqhgl7vfaz7qqqjs6d85j5"; depends=[abind]; }; + magic = derive2 { name="magic"; version="1.6-1"; sha256="0xkrrg5qk62pfqx0avijdjaljzslpwd0hv2m52qnqwrbx5xfqyfa"; depends=[abind]; }; magicLamp = derive2 { name="magicLamp"; version="0.1.0"; sha256="1nfcnbqd6vawz8l3vgkbhmm462xdvaa4pn6axzmz8hl05xv2k3cv"; depends=[httr tibble]; }; magicaxis = derive2 { name="magicaxis"; version="2.2.14"; sha256="1gqnivn6qjmf7axdi0pff6a40clklbipcr6qvm6ivzqbqhpbcb7v"; depends=[celestial mapproj MASS plotrix RANN sm]; }; magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; }; @@ -11918,6 +11986,7 @@ in with self; { maicChecks = derive2 { name="maicChecks"; version="0.1.2"; sha256="1c2n8avrhx0lvw9hi5slymm49lzf37hbkqzkqy230aikgmpv0cpa"; depends=[data_table ggplot2 lpSolve quadprog tidyr]; }; mail = derive2 { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; }; mailR = derive2 { name="mailR"; version="0.8"; sha256="0p6vxzpyms1pxdb0j07izzxinw8xfmmbsj35nkypxyjv92qi802k"; depends=[assertthat R_utils rJava stringr]; }; + mailchimpR = derive2 { name="mailchimpR"; version="0.1.0"; sha256="1f7zjclgcky1qb88638lqhr71gi5myk3d3vxkjl1xnikhcr5l9mp"; depends=[jsonlite]; }; mailmerge = derive2 { name="mailmerge"; version="0.2.5"; sha256="0i11kaxv57imyms96j8dbry8nkll3smb19ba8agcl4zxp5xxqj7a"; depends=[commonmark fs glue gmailr googledrive lifecycle magrittr miniUI purrr rmarkdown rstudioapi shiny]; }; mailtoR = derive2 { name="mailtoR"; version="0.1.0"; sha256="0mnzblhy2vbxkf0k49bw1g08jw84s59zxbjrva2j2q347wzf4rgk"; depends=[glue htmltools]; }; makeFlow = derive2 { name="makeFlow"; version="1.0.2"; sha256="0r7a0klgx144rnks0fhjflnf8vfyyx2544n86nnxkp6cdvw0b4pw"; depends=[dplyr RColorBrewer]; }; @@ -11925,7 +11994,7 @@ in with self; { 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.1.0"; sha256="1h5v1n6b318j36w1c225wq8rdvr3dwsy421x43z0ff9ixidhylbv"; depends=[ggplot2 MASS Matrix rlang shiny shinyBS shinyjs visNetwork]; }; - makepipe = derive2 { name="makepipe"; version="0.2.0"; sha256="1vkhjas5d55n6rs73rccjh53r5cr1i6cn8gnspwir6gmw5fp445a"; depends=[cli nomnoml R6]; }; + makepipe = derive2 { name="makepipe"; version="0.2.1"; sha256="0mhabnmpvjamgam63nrjdimn94azn8crafr9jcwsr08lzlbv9kmv"; depends=[cli nomnoml R6 roxygen2]; }; maketools = derive2 { name="maketools"; version="1.2.2"; sha256="1p98vg5404np5fbiqajznmiqah8lyfv2xf741wjfm2jqkki9nk40"; depends=[sys]; }; makeunique = derive2 { name="makeunique"; version="1.0.0"; sha256="0pf8cl6p3q9fzj20s4gm8amw29291xf6711v0pmp0rcnwva1zav0"; depends=[]; }; malan = derive2 { name="malan"; version="1.0.2"; sha256="0qwf0r2gwpb93gzvyp8vaw7j6rhghr6nbrfp8xw876n5j5b9jhj3"; depends=[dplyr igraph magrittr Rcpp RcppArmadillo RcppProgress tibble tidygraph]; }; @@ -11945,9 +12014,9 @@ in with self; { manifold = derive2 { name="manifold"; version="0.1.1"; sha256="1amvx0f0q4s2qgn7q23gp967bcm0djbnb8bmf1bf3fm3iyn432hv"; depends=[Matrix Rcpp RcppArmadillo]; }; manipulate = derive2 { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; }; manipulateWidget = derive2 { name="manipulateWidget"; version="0.11.1"; sha256="1dpgzmiv08afm57yxr017b014lfn9h3pa4w65prk5k3dgn6p4wsv"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny shinyjs webshot]; }; - manydata = derive2 { name="manydata"; version="0.7.5"; sha256="0msk835fq9py7ff7cglzpx0dnv3z2r0cqiv6q0cavhd4qliccyvn"; depends=[dplyr ggplot2 httr jsonlite lubridate messydates progress purrr remotes rlang stringr tibble usethis]; }; + manydata = derive2 { name="manydata"; version="0.8.2"; sha256="1l5g9169l2h4hp74cgnrnsfd0fmqirjk3g9csgxkyhggv2j6sb77"; depends=[cshapes dplyr ggplot2 ggraph httr janitor jsonlite messydates migraph plyr purrr remotes rlang stringr tibble tidyr usethis zoo]; }; manymodelr = derive2 { name="manymodelr"; version="0.3.7"; sha256="0kc4y9i21qkcg0pkwlas2mm06s54s70w5ybw4215qjwiy6xax268"; depends=[caret dplyr e1071 ggplot2 lme4 Metrics]; }; - manymome = derive2 { name="manymome"; version="0.1.4.3"; sha256="19snld2vanbdi0k0dqixx97m83k8nyn3pf6085gvcnvci73655bp"; depends=[boot ggplot2 lavaan pbapply]; }; + manymome = derive2 { name="manymome"; version="0.1.6"; sha256="06fxaanmmzvvmq68bjwrq63ndw16w8jg23b8v4cn1j543x7gaqxb"; depends=[boot ggplot2 igraph lavaan pbapply]; }; 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.6.2"; sha256="03j1i5sxxhdvg0g16jwx0n1nnf925clx3cig8bn8l61ab6grlmwm"; depends=[countrycode giscoR rappdirs sf]; }; @@ -11957,46 +12026,46 @@ in with self; { mapboxer = derive2 { name="mapboxer"; version="0.4.0"; sha256="0f873js87dgk8nqnhpxh88svvsbnk81vkm7gycb62mkr4xqsgqs7"; depends=[geojsonsf htmltools htmlwidgets magrittr purrr yaml]; }; mapcan = derive2 { name="mapcan"; version="0.0.1"; sha256="1a4135wc1h4nzcv6xq0bg75i744wyq8p7q0ix7y2x2gb6s35w46k"; depends=[dplyr ggplot2 magrittr]; }; mapchina = derive2 { name="mapchina"; version="0.1.0"; sha256="0f6ayq4izqxcj0hi2vfg0pc239hxgg7abb5476v5mfjjyi156mni"; depends=[sf]; }; - mapdata = derive2 { name="mapdata"; version="2.3.0"; sha256="0xnxh73rgcq55zrw81a2bq8yd67bxc2rafp4shf6nyrqj04iip0y"; depends=[maps]; }; + mapdata = derive2 { name="mapdata"; version="2.3.1"; sha256="1m2r4c8f7fp900g3sdjbfxxnxjla86hn75jd8hi96ms188p0j8b0"; depends=[maps]; }; 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="1.0.0"; sha256="0xdkc325y75mcx082b6ncp1n2mfq0yq67j2mkfdcpavnz6s8jdqg"; depends=[deformula Matrix R6 Rcpp]; }; mapi = derive2 { name="mapi"; version="1.0.5"; sha256="1yljvapzkb43i2sbqsmn5aqp95hm8gjkz8m41x1chwyfddrzjsbw"; depends=[data_table pbapply Rcpp sf]; }; mapiso = derive2 { name="mapiso"; version="0.2.0"; sha256="1vdy5chs45zhrvm4zcqmpsz3sqgzwp8z6ssghkslc3kp2ka8f4px"; depends=[isoband sf]; }; - maple = derive2 { name="maple"; version="0.99.5"; sha256="1cg7grvnrfzdqghlfv5bsii6ips3mykgaw85vx0z9jafhdfpd32f"; depends=[dbarts dplyr ggalluvial ggplot2 plotly rlang Seurat shiny spruce]; }; mapme_biodiversity = derive2 { name="mapme.biodiversity"; version="0.2.1"; sha256="0fmxyxs8kgbd4hdcmam3fd253qngnhl7by9xmca2zbr79m1zjkha"; depends=[curl dplyr httr magrittr pbapply purrr rvest sf stringr terra tibble tidyr tidyselect]; }; 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.3.1"; sha256="12lxn4angyac1vaq2vb0xvfd2m9f40l53h9d0ywn3qqiwa77q737"; depends=[cli crayon dendextend dplyr fields ggplot2 ggpubr ggsci magrittr plotly princurve Rcpp RcppParallel RCurl reshape2 rstudioapi scatterplot3d vcfR zoo]; }; + mappoly = derive2 { name="mappoly"; version="0.3.2"; sha256="14prd8aqqbdfjnc923vcxh5ph2d6wi2dfzzvxmj19hff30vimpb2"; depends=[cli crayon dendextend dplyr fields ggplot2 ggpubr ggsci magrittr plot3D plotly princurve Rcpp RcppParallel RCurl reshape2 rstudioapi smacof vcfR zoo]; }; mappp = derive2 { name="mappp"; version="1.0.0"; sha256="19c8575w9r1w32hqwdmmggh21lqahy73vw8g5qbxxna6r77zg5c7"; depends=[memoise parallelly pbmcapply progress purrr rlang]; }; - mapproj = derive2 { name="mapproj"; version="1.2.8"; sha256="10bpib827011fpgvzsmlv4j3i41s0r3cv1hvawwdlk753s7i0pw6"; depends=[maps]; }; + mapproj = derive2 { name="mapproj"; version="1.2.9"; sha256="10nzfbyfkc545qxf51i33g0f8iiidcnhj971ylphnbh7j2sgla6s"; 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=[]; }; + maps = derive2 { name="maps"; version="3.4.1"; sha256="0034114pdakxcx480b45qy9j4vq1v5ss961ssy92w4nqiqhsb4z6"; 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.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.5.0"; sha256="04fzrv1qjh0n1h1jzsj5drzi7ax56bj9bwlrqiscy1v3w9cjbavz"; depends=[classInt Rcpp sf]; }; - maptiles = derive2 { name="maptiles"; version="0.3.0"; sha256="025n9fpl55n9wnslpjqr4z5y0q4mn68dplb3fm7wyn968kw7sbig"; depends=[curl png sf slippymath terra]; }; + mapsf = derive2 { name="mapsf"; version="0.6.1"; sha256="0gzqz94d5skrvl41qh1iyjc1r1dd6ag1d5s00l9dlhaawhhz2wfz"; depends=[classInt Rcpp sf]; }; + maptiles = derive2 { name="maptiles"; version="0.4.0"; sha256="0454jnc1l9mr7yh8q4gi07nsqbixsbyadfxyz3bmfmf1zzrqrqmr"; depends=[curl png sf slippymath terra]; }; maptools = derive2 { name="maptools"; version="1.1-5"; sha256="1p155w26hpmqc589kxha0xgw5b4x6610a3im7ap4mjx1sfavvn9w"; depends=[foreign lattice sp]; }; maptpx = derive2 { name="maptpx"; version="1.9-7"; sha256="0f85i3vwr5rvz261z6j7x15gsahxrq4qqddfb0qyhypgihvwh857"; depends=[slam]; }; maptree = derive2 { name="maptree"; version="1.4-8"; sha256="1x35nk4fi2b62krcvcv187n5sbqrgvw4pbm7r19ps3jlanpi5ksm"; depends=[cluster rpart]; }; mapview = derive2 { name="mapview"; version="2.11.0"; sha256="02nkyh3m2l3jblii25c7p2yjjx7lka5l6hx7h882060959bczy47"; depends=[base64enc htmltools htmlwidgets lattice leafem leaflet leafpop png raster satellite scales servr sf sp webshot]; }; mar1s = derive2 { name="mar1s"; version="2.1.1"; sha256="1ljkvgxrramfx1rnp2rg6516mjxaa6s96amrnmqymnyjz7wlf37l"; depends=[cmrutils fda zoo]; }; - maraca = derive2 { name="maraca"; version="0.3.10"; sha256="00sz258pg4712j1727n3nxaw5br4hyp4jb6bayz7kqicwcg3rh8c"; depends=[checkmate dplyr ggfortify ggplot2 gridExtra sanon survival tidyr]; }; + maraca = derive2 { name="maraca"; version="0.4.0"; sha256="00qnknqzpw4y99v50r4pvyyn09183z4rc3c9v5z2h712cgnsp1ai"; depends=[checkmate dplyr ggfortify ggplot2 gridExtra hce survival tidyr]; }; march = derive2 { name="march"; version="3.3.2"; sha256="1qdjajb5mkq2r7p224kbxhf01s75hry5c5hx1cnsb48dfzd2s5xg"; depends=[]; }; marcher = derive2 { name="marcher"; version="0.0-2"; sha256="0hcxbfrwniih4kvx5sxhlffz1pc87kf52v8hvaf193rhhdykis5q"; depends=[magrittr Matrix minpack_lm mvtnorm numDeriv plyr RColorBrewer scales zoo]; }; marelac = derive2 { name="marelac"; version="2.1.10"; sha256="08phsghzvi0z78pkb5lkamni83fsw0bqfri99j6bjf6y14aygif9"; depends=[seacarb shape]; }; marg = derive2 { name="marg"; version="1.2-2.1"; sha256="1r6rl7dhvm8dghm7pm4hfw3924qja65hczl6d47v9ixnv4rxyzr9"; depends=[statmod survival]; }; margaret = derive2 { name="margaret"; version="0.1.4"; sha256="1hyflwfw9pphcbxnx9wf0alqi17s5k3j7wvh95ka2h9fvyrpj11r"; depends=[devtools dplyr httr igraph lubridate purrr readr rlang rvest scholar stringi stringr tibble tidyr tidytext tidyverse treemapify usethis widyr writexl]; }; - marginaleffects = derive2 { name="marginaleffects"; version="0.7.1"; sha256="1pvqjdy0j5d9gsplnw58c2fpsap6vv97bf2jz339dg9yrfl7af92"; depends=[checkmate data_table generics insight]; }; + marginaleffects = derive2 { name="marginaleffects"; version="0.8.1"; sha256="05ixa9sklk22qmfn7i1163w08zwb1lshf3xlnxrshvkr9bmlsv3x"; depends=[checkmate data_table 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.5.3"; sha256="01j6zji4mghihmywpdl33wj1pr8bf9vwkqgq50hagl09143d9zpr"; depends=[magrittr]; }; - markdown = derive2 { name="markdown"; version="1.3"; sha256="1w9hrc745zwgsnmr72jkwfh22xqgdsq089qcajlc69xrwya3wxxi"; depends=[commonmark mime xfun]; }; + markdown = derive2 { name="markdown"; version="1.4"; sha256="0ziwirplzjcci2km6wln035qfd2irjl58r77kl98r8s257kavqz0"; depends=[commonmark 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]; }; markerpen = derive2 { name="markerpen"; version="0.1.1"; sha256="0i9md9vbqkxibjkn37givxzq8mq0232cvv2fyz6g8cj6flxm6vzr"; depends=[Rcpp RcppEigen RSpectra]; }; @@ -12006,11 +12075,12 @@ in with self; { markophylo = derive2 { name="markophylo"; version="1.0.8"; sha256="05hfykjzx4wf2p1d6dvyx5lizfxmq3zprvnfg74r7l1izp7wpl38"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; }; markovMSM = derive2 { name="markovMSM"; version="0.1.1"; sha256="1y5brgpf52jws5s4hmki4q67pnji8vq9xbwiqp5pgdxz60byz1zx"; depends=[mstate survidm survival]; }; markovchain = derive2 { name="markovchain"; version="0.9.0"; sha256="050zfabmxs8pslsp5k0phflx8dqvfknnnpwc0wn9fm6i8npi42xm"; depends=[expm igraph Matrix Rcpp RcppArmadillo RcppParallel]; }; - marmap = derive2 { name="marmap"; version="1.0.6"; sha256="16r7in3m63l7fdwxwfdphcd4fr073fb675zabjxphpxmclikyxdz"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; }; + marmap = derive2 { name="marmap"; version="1.0.8"; sha256="06s5sqk63h160z3ly01aw4bjjqsl2585d94ln2vs1f1qhlqvs9ni"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; }; marp = derive2 { name="marp"; version="0.1.0"; sha256="0vywqsvmhghldrpnh2dpkgz41r7q463whfhgrn38pg8jnyhliiwi"; depends=[gtools statmod VGAM]; }; marqLevAlg = derive2 { name="marqLevAlg"; version="2.0.7"; sha256="0khmma0kd18js142cklw22kvqf64rsz8a7x0d43ykly584d4gdkw"; depends=[doParallel foreach]; }; + mas = derive2 { name="mas"; version="0.1"; sha256="07z0a6yis23zib16msjgx22mrag5xjbjpczj4kanvn8m3xikxrz3"; depends=[Rcpp RcppEigen truncdist]; }; mase = derive2 { name="mase"; version="0.1.3"; sha256="10wyrvh3p344inx5qbzkwh4rr3lmpnh1ikhrghmlqr5607kiy3fm"; depends=[boot dplyr glmnet magrittr Rdpack rpms survey]; }; - mashr = derive2 { name="mashr"; version="0.2.57"; sha256="1jjmqd3z3f7bxj6zw7yw6k9j6aiwnihd8cm14271kkpyy0id8slm"; depends=[abind ashr assertthat mvtnorm plyr Rcpp RcppArmadillo RcppGSL rmeta softImpute]; }; + mashr = derive2 { name="mashr"; version="0.2.69"; sha256="1m52bdyfni193fh8xhq6z372zj0cqc8x6wb8cwyls4qjwx3x263c"; depends=[abind ashr assertthat mvtnorm plyr Rcpp RcppArmadillo RcppGSL rmeta softImpute]; }; maskRangeR = derive2 { name="maskRangeR"; version="1.1"; sha256="1pdj0jdxrqss6hp20163fh1ywdd6wmwjl4s8gnpd3m9d1j955gr3"; depends=[dplyr e1071 lubridate magrittr raster sp]; }; mason = derive2 { name="mason"; version="0.3.0"; sha256="1x5wiagb1sy5gkp0xkbr1jzhrjg1c2bqdh4hy6igwcnws2cbhxyr"; depends=[broom dplyr magrittr purrr rlang tibble tidyr tidyselect]; }; masscor = derive2 { name="masscor"; version="0.0.7.1"; sha256="1153gx648csmzc2znf7l84f134qzp238hqj2s60r9najk1pczgf6"; depends=[metRology]; }; @@ -12018,7 +12088,7 @@ in with self; { mastif = derive2 { name="mastif"; version="1.0.1"; sha256="1jw7dz4qxyj848qm7lwg0klcw028260nizdi5gdwf7wd5a2nis9c"; depends=[corrplot RANN Rcpp RcppArmadillo repmis xtable]; }; matahari = derive2 { name="matahari"; version="0.1.3"; sha256="03mhn4qh1vcz2hr0mxp6gijwgrzvbpfb8dq7lqhchbk5gq5g3fnh"; depends=[clipr jsonlite purrr readr rlang rstudioapi tibble]; }; match2C = derive2 { name="match2C"; version="1.2.3"; sha256="1ccmva0qgks2r6ya39vvrk1dx8ixmqiy3p0iz8hxcg5qin2pfzgi"; depends=[ggplot2 mvnfast rcbalance Rcpp]; }; - matchMulti = derive2 { name="matchMulti"; version="1.1.10"; sha256="1cbxgqx36f19lccd9qjrq3zq3ghqbfjb5pim40k2aykpqp6wmqba"; depends=[coin dplyr Hmisc MASS mvtnorm plyr rcbsubset rlang sandwich tidyr weights]; }; + matchMulti = derive2 { name="matchMulti"; version="1.1.11"; sha256="070cp69snxg1z6b059h4ii9r3nh6b1j4l31j4ixfg1c9hzpb8s15"; depends=[coin dplyr magrittr MASS mvtnorm plyr rcbsubset rlang sandwich weights]; }; matchbook = derive2 { name="matchbook"; version="1.0.7"; sha256="0xfqg8z2zkn215kqmjjkqdwrgsk7cn4jdpxfgd6razhcbvflg48j"; depends=[]; }; matchingMarkets = derive2 { name="matchingMarkets"; version="1.0-2"; sha256="1jj5hzxiivqinkpddmkqdxgi83jm6blann9wgv4g8prn3lvp0i85"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; }; matchingR = derive2 { name="matchingR"; version="1.3.3"; sha256="1wr1faaixn5scx2c8g2jfvfm489k0ah9isza67gz0db8knja9nig"; depends=[Rcpp RcppArmadillo]; }; @@ -12029,16 +12099,16 @@ in with self; { mathjaxr = derive2 { name="mathjaxr"; version="1.6-0"; sha256="0yf1sfkb2kjsplipl2v4k2gp20li9xzsynclg228sy0v243pdi7c"; depends=[]; }; mathpix = derive2 { name="mathpix"; version="0.5.0"; sha256="0imd2rxzh3zndl3laa1fx3m90zr97l02y42s7dhi6b0g2m2lirz4"; depends=[base64enc httr magick purrr rstudioapi texPreview]; }; matlab = derive2 { name="matlab"; version="1.0.4"; sha256="1shnq9z7n8yp3l457swrhm3p3nm0j2q4xb9bbxblli030wia520r"; depends=[]; }; - matlab2r = derive2 { name="matlab2r"; version="1.2.0"; sha256="12g32495mzp4wpqm2hc4ayp55i89ksqwyz0vnws8jdjk6zrrd6gz"; depends=[styler]; }; + matlab2r = derive2 { name="matlab2r"; version="1.3.0"; sha256="1g99wv3ngfbc7c8lnx0pwzf4n7zmx2zb9nv50byz0avax99y4dwj"; depends=[styler]; }; 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]; }; + matlib = derive2 { name="matlib"; version="0.9.6"; sha256="0sm1mm5m242j472hddj9nzfyf235i7w8qxhcbgqwxf35fvdmah2h"; 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]; }; matpow = derive2 { name="matpow"; version="0.1.2"; sha256="1gjrq9bs94xqyms6sfyxp00f0x2gv4dfqcsz29ficzgl4iapns95"; depends=[]; }; matricks = derive2 { name="matricks"; version="0.8.2"; sha256="0ik61jxd4hpw149dbbmis3wsfsim60mw9d0qjwh047qfg6sm1vsc"; depends=[ggplot2 Rcpp reshape2 rlang]; }; matrixLaplacian = derive2 { name="matrixLaplacian"; version="1.0"; sha256="1ixqdv3sz3sc79wn3vqhlq79j7x7cvl878m5hgvbcg6klfvlmmci"; depends=[scatterplot3d]; }; matrixNormal = derive2 { name="matrixNormal"; version="0.1.1"; sha256="0l89s33sjxjb7dyzfny6v7cjw8qmlps4z1bjmlzvcka4qbn6kc2z"; depends=[mvtnorm]; }; matrixProfile = derive2 { name="matrixProfile"; version="0.5.0"; sha256="0nd54k878xf7hzwxawh03c3na4jfvb68afarkwrmmffjlp3i8a9g"; depends=[fftw signal TTR zoo]; }; - matrixStats = derive2 { name="matrixStats"; version="0.62.0"; sha256="1jjfsi5vzx6js7phlnd3v64fd05fg0jyz8iq5pivy36jdmmh3ql5"; depends=[]; }; + matrixStats = derive2 { name="matrixStats"; version="0.63.0"; sha256="0pqz6mn5l7inh464yj45i6rf8ycab0zdvvjczwsv0bkl442bc060"; depends=[]; }; matrixStrucTest = derive2 { name="matrixStrucTest"; version="1.0.0"; sha256="06la9xmpi1viyjml4m1akbna3lwkz5lnq95v1nnf73i9zpfwz03k"; depends=[]; }; matrixTests = derive2 { name="matrixTests"; version="0.1.9.1"; sha256="1fixzjbrwm0shyvkishff6l5yanqnvhcgbidkw8fsalf3jwwc0ix"; depends=[matrixStats]; }; matrixcalc = derive2 { name="matrixcalc"; version="1.0-6"; sha256="09pk0ym6qzribxc6v18cpb6478i4r4kzxpkljjbb3n323zqx5iqb"; depends=[]; }; @@ -12078,16 +12148,15 @@ in with self; { 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]; }; - mc2d = derive2 { name="mc2d"; version="0.1-21"; sha256="1vp7xai7pk260053g2g23wzwn6l1pai0n4vjwjg1j8qd6d95j8mi"; depends=[mvtnorm]; }; + mc2d = derive2 { name="mc2d"; version="0.1-22"; sha256="0811c8jjlbcnn6rlk8g1ny9gk3bll1229j3sdvwrnm87g2awvgdx"; depends=[mvtnorm]; }; mcBFtest = derive2 { name="mcBFtest"; version="0.1.0"; sha256="1fmn9pzbvk508ljspksppqxdvggx5bvipgs54nz9605y6p8zzmi5"; depends=[MASS]; }; mcMST = derive2 { name="mcMST"; version="1.0.1"; sha256="18ka76g9pgpycaw0hl8vxpabd8584q1l5d3xmrzy1zwincsg7vgs"; depends=[BBmisc checkmate ecr ggplot2 gtools lhs parallelMap reshape2 vegan]; }; 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]; }; - mcbette = derive2 { name="mcbette"; version="1.15"; sha256="0wilbz4zwjnzxfa3nail10a8y1cjq1myb2lqyj01k8s5kpwb0isq"; depends=[babette beastier beautier curl devtools mauricer Rmpfr testit txtplot]; }; mcbiopi = derive2 { name="mcbiopi"; version="1.1.6"; sha256="1caw2sy15hw2zw0bdynwnsa7hn4rly34hlxp06nwm5lssz8l2597"; depends=[]; }; mcboost = derive2 { name="mcboost"; version="0.4.2"; sha256="0748av1dy6fag33slhi24km17qpi7y6cydl1vmdhxz96902lcr5r"; depends=[backports checkmate data_table glmnet mlr3 mlr3misc mlr3pipelines R6 rmarkdown rpart]; }; mcca = derive2 { name="mcca"; version="0.7.0"; sha256="01nm0plgkik241qhd06v1vs84lf7agc0vkxa27cpr5qlfl4cm4zb"; depends=[caret e1071 MASS nnet pROC rgl rpart]; }; - mccca = derive2 { name="mccca"; version="0.1.1"; sha256="1rvyn4b72xa45r95jjl80b3wiq152hh3pndwbngmq1078wl84xbk"; depends=[ggplot2 magic RColorBrewer stringr wordcloud]; }; + mccca = derive2 { name="mccca"; version="1.1.0"; sha256="0iw4pgypdhxwny93b80y69kwwpqvmbv71qa05jlhylx7lqbsnbyb"; depends=[ggplot2 magic RColorBrewer Rcpp RcppArmadillo stringr wordcloud]; }; mccf1 = derive2 { name="mccf1"; version="1.1"; sha256="023pvjfc1iv7hac3gz5rakg6ljs92j0qfm4givad5iiwv5n4k3zr"; depends=[ggplot2 ROCR]; }; mcclust = derive2 { name="mcclust"; version="1.0.1"; sha256="1mifgrm2canfcrln9rspqwws1f61vrana5m4lap54lys0kiyrrqq"; depends=[lpSolve]; }; mccmeiv = derive2 { name="mccmeiv"; version="2.1"; sha256="1lkghvvwxvg474p37h1mpbackr5qmy05qkx8yiq4x066wrfq1w1i"; depends=[MASS numDeriv survival]; }; @@ -12099,11 +12168,11 @@ in with self; { mclcar = derive2 { name="mclcar"; version="0.2-0"; sha256="0zgf7ha22586nh1yzdnhz1rzrqkn6yzr12qva9ag297ry4z4bn5y"; depends=[fields maxLik nleqslv rsm spam spatialreg spdep]; }; mclm = derive2 { name="mclm"; version="0.2.7"; sha256="1vpg6xsa8im60ld5mlm6yhf2prs6kmwn0sn12b9g8v27dgw3h0iq"; depends=[ca crayon dplyr Rcpp readr stringi stringr tibble tm xml2 yaml]; }; mclogit = derive2 { name="mclogit"; version="0.9.6"; sha256="0sbglgak6jhhpx65jnj59hbpvzs8qjsdjc4w02z0m5j9hrnmzp4s"; depends=[Matrix memisc]; }; - mclust = derive2 { name="mclust"; version="5.4.10"; sha256="0wh6nsbma4b0wsmqm2ynbznl2wlwdly4vg583f6z0zd1qkrvn6ra"; depends=[]; }; - mclustAddons = derive2 { name="mclustAddons"; version="0.6"; sha256="1sk1inwln76k7ygja9sdzil1i1q8yqnvyd0l0vm81ih66ilivbzb"; depends=[foreach iterators mclust Rcpp RcppArmadillo]; }; + mclust = derive2 { name="mclust"; version="6.0.0"; sha256="0ahj5161lmid0gxyw6vidd4ig50l1374iisn9970zvx1rdp30z6y"; depends=[]; }; mclustcomp = derive2 { name="mclustcomp"; version="0.3.3"; sha256="1kxrms77m7n9lv32771zvwg82xqh5kx8al6f0bknsj8idq8aqbh3"; depends=[Rcpp RcppArmadillo Rdpack]; }; mcmc = derive2 { name="mcmc"; version="0.9-7"; sha256="0q42m8ab7b6bxhns494ksjdss5f3c5m2jjfdlfj6fk1nz7ax7i5p"; depends=[]; }; - mcmcOutput = derive2 { name="mcmcOutput"; version="0.1.1"; sha256="0nw33xb7x695g8i91hfj2apgywbyzf2k587drzridqnfmbm26pni"; depends=[coda HDInterval MASS]; }; + mcmcOutput = derive2 { name="mcmcOutput"; version="0.1.3"; sha256="1jw4wyppzlnxaa3iahbwx4gxs3zvppy980rc92dvy18y2sr5138v"; depends=[coda HDInterval MASS]; }; + mcmcabn = derive2 { name="mcmcabn"; version="0.5"; sha256="0mr6zqsqbd9pasdz5sz7capirvfz0gws2v0i914h6pxx3blws7m5"; depends=[abn coda cowplot ggplot2 ggpubr gRbase]; }; mcmcderive = derive2 { name="mcmcderive"; version="0.1.2"; sha256="0v89nyvr2d57zvjy9qq6drqb48s4n88hb65pima1gx4aqb479yfh"; depends=[abind chk extras mcmcr nlist purrr universals]; }; mcmcensemble = derive2 { name="mcmcensemble"; version="3.0.0"; sha256="1yf8mm0nmw0x89pj3is5rv3arcfbxvkfh8bip1sprcqzsrixa0s8"; depends=[future_apply progressr]; }; mcmcplots = derive2 { name="mcmcplots"; version="0.4.3"; sha256="0187z79gmvcrwqybxh3ckhcrqi0nqhvcvlczgxfkpq95y5czprdq"; depends=[coda colorspace denstrip sfsmisc]; }; @@ -12116,10 +12185,10 @@ in with self; { 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.3.0"; sha256="066hj3kpj252izq36a0m6a54kqybg52l7pxzaw1hjxx6yyr90aiv"; depends=[robslopes]; }; + mcr = derive2 { name="mcr"; version="1.3.1"; sha256="0ybhskszzs05m0ql231jj7c7039dwmghnq4gfzp2ww6vj1agshpl"; depends=[robslopes]; }; mcreplicate = derive2 { name="mcreplicate"; version="0.1.2"; sha256="12pmfp75sc00cdrkx4xniq74qqx3y67qxwdrrbp2mf562pdn2gmn"; depends=[]; }; mctest = derive2 { name="mctest"; version="1.3.1"; sha256="1d248r9ifwl1xhvka6z69l943rvbq7s7ag6vqp9lljkcybvg75f2"; depends=[]; }; - mctq = derive2 { name="mctq"; version="0.3.0"; sha256="09wdikzwfln7xmp7lsv58pzpwi08nx7srhsv9fjf40f6y39dvqv3"; depends=[checkmate cli dplyr hms lifecycle lubridate]; }; + mctq = derive2 { name="mctq"; version="0.3.1"; sha256="0ylk0bsgfs34b6213qsb1hrjfaqxnh6rz6in37l0xg00sqkl3ab2"; depends=[checkmate cli dplyr hms lifecycle lubridate]; }; mcunit = derive2 { name="mcunit"; version="0.3.2"; sha256="16nnm50g87iaf058b1w5w5hphx99xplczndcbv1356f2gs2gfy6l"; depends=[Rdpack rlang simctest testthat]; }; mcvis = derive2 { name="mcvis"; version="1.0.8"; sha256="0dc7jwdfzyn6x785lbwikpql96b3gh9fhb65fv4sk9ib28b2kpmy"; depends=[assertthat dplyr ggplot2 igraph magrittr psych purrr reshape2 rlang shiny]; }; mcwr = derive2 { name="mcwr"; version="1.0.0"; sha256="1aqmrxjmllq1waw3pzmwhqd07q02n1h1g6c0qi1fvay4xz0rwgik"; depends=[]; }; @@ -12127,7 +12196,7 @@ in with self; { md_log = derive2 { name="md.log"; version="0.2.0"; sha256="1k0l3imx1jdlf6fks7x8q8lg2l4090fq069h5x4i0nwq71sfslj0"; depends=[futile_logger]; }; mda = derive2 { name="mda"; version="0.5-3"; sha256="0qw4scc2w7jmnxssj5w2mdxb9rrl4dscqn54gplzm1gk2yf419mx"; depends=[class]; }; 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.13.0"; sha256="0mirlj79g2zy58dgg1yy2f1m5yr8w4rvf4hgs7q9vl50fiypv5hp"; depends=[Matrix]; }; + mdatools = derive2 { name="mdatools"; version="0.13.1"; sha256="19l51va1fl0cx18ml6n1kfgbc8in9isb1mzhl84gshs9f6hnrmzh"; depends=[Matrix]; }; mdbr = derive2 { name="mdbr"; version="0.1.2"; sha256="1c33v2dqz1jjh730p486bi07h9m9clpcfrbvhbvwb8fslqxg76qd"; depends=[readr]; }; mde = derive2 { name="mde"; version="0.3.2"; sha256="121bzypndsx4abls1f7rjrvg98rqkb155vd5aiql8vi1lwgzy9jl"; depends=[dplyr tidyr]; }; mded = derive2 { name="mded"; version="0.1-2"; sha256="1j8fcz5yc70p9qd9l010xj1b625scdps8z1pqh75b45p2hiqbhlc"; depends=[]; }; @@ -12174,7 +12243,7 @@ in with self; { mefa4 = derive2 { name="mefa4"; version="0.3-9"; sha256="0g46z14r7d8wkyxsp58i6007r9jljf269snrbachamy2wlmpc1g1"; depends=[Matrix]; }; meifly = derive2 { name="meifly"; version="0.3.1"; sha256="0pgmxa4g16zhx3jx5g56h2s1f4cr4bkz3bp7404dm2729083rvjx"; depends=[leaps MASS plyr]; }; mekko = derive2 { name="mekko"; version="0.1.0"; sha256="09y50k4r4mnx351a5zhkqg9s2xyl3d149dhmfy2z6hzm5yg2ajyi"; depends=[ggplot2]; }; - melt = derive2 { name="melt"; version="1.8.0"; sha256="0gfg09idkqvlvahxipabcipwqv6f11c4wcw9i0p1c66j70b5dcy3"; depends=[BH dqrng Rcpp RcppEigen]; }; + melt = derive2 { name="melt"; version="1.9.0"; sha256="04k8w06siskwn8g2x9p6p8gxl4l9mjmrk759czglpfb1h6lb953z"; depends=[BH dqrng Rcpp RcppEigen]; }; meltr = derive2 { name="meltr"; version="1.0.1"; sha256="0rg6frch51ydigsas6ycfhkgd0jldi95paq6gmja6rcq6vlwnhgj"; depends=[cli cpp11 R6 rlang tibble]; }; meltt = derive2 { name="meltt"; version="0.4.3"; sha256="1j2iz05xr9ddj9pk2yw7j7kjfr9rxmxkk123c6336fqdm14wvd21"; depends=[dplyr ggplot2 leaflet plyr Rcpp RcppArmadillo reticulate shiny shinyjs tibble tidyr]; }; mem = derive2 { name="mem"; version="2.17"; sha256="0nlw0mf5dhp9x5ymc33a600i199c5g3qi80g5jqacp0m0q6s2b8n"; depends=[boot dplyr EnvStats ggplot2 mclust purrr RColorBrewer RcppRoll sm tidyr]; }; @@ -12191,7 +12260,7 @@ in with self; { 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]; }; - memuse = derive2 { name="memuse"; version="4.2-1"; sha256="1wvwnjaaiv2647561z2b55dss35033ildx4kk8hzxfzgsjmdpsgm"; depends=[]; }; + memuse = derive2 { name="memuse"; version="4.2-2"; sha256="1rdp8wi9sd03qdak7mifvdc1szgk0fdzmhbikdfsza8xshm2pp33"; depends=[]; }; merDeriv = derive2 { name="merDeriv"; version="0.2-4"; sha256="1piswi4l7ri3251shmanhygipmsw8zg701jqd0am1s76kj16l9cc"; depends=[lavaan lme4 Matrix nonnest2 numDeriv sandwich]; }; merTools = derive2 { name="merTools"; version="0.5.2"; sha256="1ka9aa3fgs1kqfqhi1sz6v6g5mbbbzxyb7c0n8s981g8d04vsi00"; depends=[abind arm blme broom_mixed dplyr foreach ggplot2 lme4 mvtnorm shiny]; }; mergeTrees = derive2 { name="mergeTrees"; version="0.1.3"; sha256="17aqgfd1ky5zq6i9s1djvdqjdd8lzkblf0cdw82i9mpzfhcz1fav"; depends=[Rcpp]; }; @@ -12200,6 +12269,7 @@ in with self; { merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; }; meshed = derive2 { name="meshed"; version="0.2.3"; sha256="061q6b8603jbvlqkl6ddcmw1rgy53sqbxbsxhv218f7px392b1vf"; depends=[dplyr FNN glue magrittr Rcpp RcppArmadillo rlang]; }; messaging = derive2 { name="messaging"; version="0.1.0"; sha256="0q19cqp1zgh0yhk1ql0jqf414bhx6jwhkairq6wx2cmkli2g7k1y"; depends=[dplyr glue magrittr rlang stringr]; }; + messy_cats = derive2 { name="messy.cats"; version="1.0"; sha256="0znjp1wcrkpgm778z5iqw91bnk8vv0x04dpng8pcmh0igsmc3j68"; depends=[dplyr gt rapportools stringdist stringr varhandle]; }; messydates = derive2 { name="messydates"; version="0.3.1"; sha256="125jb6sv00i1f89p12dy0z4zfynlz829gvxs7rlvhlyaznj9csvk"; depends=[dplyr lubridate purrr stringr tibble]; }; metR = derive2 { name="metR"; version="0.13.0"; sha256="0cffi32glgnmjan2xy4cb836qf3nj6k2mjkni6mqlblz4gh128w1"; depends=[checkmate data_table digest Formula formula_tools ggplot2 gtable isoband lubridate memoise plyr purrr scales sp stringr]; }; metRology = derive2 { name="metRology"; version="0.9-28-1"; sha256="1syjwblyd18myxrs0hx4m91fgb6zs3r4g7w701j2f2pw6j9mvz0y"; depends=[MASS numDeriv robustbase]; }; @@ -12221,7 +12291,6 @@ in with self; { metaSurvival = derive2 { name="metaSurvival"; version="0.1.0"; sha256="05f103fi287y64gys73a55snw54bnph69q8dykfii10dykd44g0y"; depends=[mvtnorm survival]; }; metaboData = derive2 { name="metaboData"; version="0.6.3"; sha256="0a8jz7q0a5dri5p2qyw0ah0j4w0xjyfj6gkh2gcsazac1d5fl02i"; depends=[dplyr fs magrittr piggyback purrr readr rlang stringr tibble yaml]; }; metabolic = derive2 { name="metabolic"; version="0.1.1"; sha256="0rq4yi2r0l0ghn22pj2gmmhwqjykaxznbd185fjr5r1gzvlh45rv"; depends=[cli dplyr forcats ggfittext ggimage ggplot2 glue magrittr meta patchwork purrr rmarkdown scales stringr tibble tidyr usethis]; }; - metabolighteR = derive2 { name="metabolighteR"; version="0.1.3"; sha256="0ip7cy40jndcwp8yc42pjzklv35dkxjd3pdlpwk0r0jngp7nbjim"; depends=[crayon dplyr httr magrittr purrr]; }; metabolomicsR = derive2 { name="metabolomicsR"; version="1.0.0"; sha256="0b12nddczh8i6hnv679pa521yps26n98j2cnai8s67xiw5ir0y5v"; depends=[data_table ggplot2 plotROC]; }; metabup = derive2 { name="metabup"; version="0.1.3"; sha256="1lwndn46bayw6jzxxpd8hywnzxydiz0nlm33nxr855035rmv231k"; depends=[ggplot2 partitions]; }; metacart = derive2 { name="metacart"; version="2.0-3"; sha256="1wim72fvhx6cyc16c9gl8cwzbhlpzilk7q8gi4jnzzazqmc1kb5n"; depends=[ggplot2 gridExtra Rcpp rpart]; }; @@ -12229,7 +12298,7 @@ in with self; { metacom = derive2 { name="metacom"; version="1.5.3"; sha256="0c0gzn28cl2sl52wx2n36jm9c18d9s3yqjyx88kgbmd9069z1nvk"; depends=[vegan]; }; metaconfoundr = derive2 { name="metaconfoundr"; version="0.1.1"; sha256="13pm4hy68b3h6x8i3kbvgvprn6k9g5nn3agiplnqlng908mmlrzk"; depends=[dplyr forcats ggplot2 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.1.0"; sha256="1m7mri6mkk39m7311igvfv31v4fa8m38cljbzlmrl2rjmw544fnj"; depends=[dplyr magrittr purrr R6 readxl rlang stringr tibble tidyr tidyselect xml2]; }; + metacore = derive2 { name="metacore"; version="0.1.1"; sha256="0hcaf4fq5z1nv910yvs5gav9scfwrm0b60n80ycsspkimmg86cmj"; depends=[dplyr magrittr purrr R6 readxl rlang stringr tibble tidyr tidyselect xml2]; }; metadat = derive2 { name="metadat"; version="1.2-0"; sha256="1f7mb3pw5d0akr09jjva06ay223izhpzbr21bapnw99x1kiybk7h"; depends=[mathjaxr]; }; metadynminer = derive2 { name="metadynminer"; version="0.1.7"; sha256="0ch86qqs3872d28c8wrs24ryg2xahqsmndmzjc3z6qznkrq1adzh"; depends=[Rcpp]; }; metadynminer3d = derive2 { name="metadynminer3d"; version="0.0.2"; sha256="1y1csfp57qrv394hj96yr5v3brxw7v0a07k2pg7ypw08gshvgqjm"; depends=[metadynminer misc3d Rcpp rgl]; }; @@ -12247,6 +12316,7 @@ in with self; { metamicrobiomeR = derive2 { name="metamicrobiomeR"; version="1.2"; sha256="0fgdjy2s47pqmb9x79a4sf0kn4hbc49rd41jnzw0d3ll1l9kwy7f"; depends=[compositions dplyr gamlss gdata ggplot2 gridExtra lme4 lmerTest matrixStats meta plyr tidyr zCompositions]; }; metamisc = derive2 { name="metamisc"; version="0.4.0"; sha256="12ydvkpni7a7v0x8lfknsy4c6hmgjqri3l33m4fwsai3rhnq6hsa"; depends=[dplyr ggplot2 lme4 metafor mvtnorm plyr pROC]; }; metan = derive2 { name="metan"; version="1.17.0"; sha256="1d988svhwcg02qwag19265jvhrpnicgzzfxywh0w6rxy2w11394s"; depends=[dplyr GGally ggforce ggplot2 ggrepel lme4 lmerTest magrittr mathjaxr patchwork purrr rlang tibble tidyr tidyselect]; }; + metanetwork = derive2 { name="metanetwork"; version="0.7.0"; sha256="0rlnalmfmiih154zq6rk4sq12y7nr8fn1ws8mrlryy04gznz6igw"; depends=[dplyr GGally ggimage ggplot2 igraph intergraph magrittr Matrix network RColorBrewer rlang sna visNetwork]; }; metansue = derive2 { name="metansue"; version="2.5"; sha256="098f3jfqxraf86p6ciqpryqs1vwbhsmy3wngqj50d5ndf302qxmc"; depends=[]; }; metap = derive2 { name="metap"; version="1.8"; sha256="0asmypxfxly4xmcjf3yzid5zqlzg88z0brij2splfk4avsl035gf"; depends=[lattice mathjaxr mutoss qqconf Rdpack TFisher]; }; metapack = derive2 { name="metapack"; version="0.2.0"; sha256="0npyjj93kk8zc2xcsyfm3v09my89zw9f1smrnl4kpcpwyk3g1q6a"; depends=[BH Formula ggplot2 gridExtra Rcpp RcppArmadillo RcppProgress]; }; @@ -12272,19 +12342,19 @@ in with self; { 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.4"; sha256="0a4r86qqq2qxms9dilj7mhz1hgrc6yl7b7mi60wky0n8mjfw0ciz"; depends=[assertthat cachem crayon curl dplyr glue httr jsonlite lubridate magrittr memoise purrr rlang sf stringr tidyr units vctrs xml2]; }; - metevalue = derive2 { name="metevalue"; version="0.1.10"; sha256="1kwcxrp077zghpc04aykm0zcijdbvq00izf7dilk4s6llgmcacq2"; depends=[dplyr psych sqldf]; }; + metevalue = derive2 { name="metevalue"; version="0.1.13"; sha256="1xhzxw0wji7iiql7cs72lzvl5d52hjidxa0j72lkyzwdyq951q8d"; depends=[dplyr psych sqldf]; }; methcon5 = derive2 { name="methcon5"; version="0.1.0"; sha256="08xsi6j65izxqcrlh37f2d7m3pwna1v6zvdv96mqylsjqgqmbk5x"; depends=[dplyr magrittr purrr rlang]; }; metools = derive2 { name="metools"; version="1.0.0"; sha256="05l49ifx2nnlbdxh2qhdb0islf95fc67720rm5in7mrlida4khnq"; depends=[ggplot2 lubridate scales stringr tibble tidyr]; }; metrica = derive2 { name="metrica"; version="2.0.1"; sha256="1crxa05gyxl6g5h4vi930alg4n688nlw1nmyg3jv8if7yszldva2"; depends=[DBI dplyr energy ggplot2 ggpp minerva rlang RSQLite tidyr]; }; metricsgraphics = derive2 { name="metricsgraphics"; version="0.9.0"; sha256="1zbx82b34y0rr4w7rzvyc1nzk95w6cdkg0j1kkshbmkvplq6v9i4"; depends=[htmltools htmlwidgets magrittr]; }; - metrix = derive2 { name="metrix"; version="1.0.0"; sha256="121g2vflwrrix1jjx26g4jxd6chdw6wghyp2adyvky45zckc9zi7"; depends=[Matrix stringr vegan]; }; + metrix = derive2 { name="metrix"; version="1.1.0"; sha256="0ixp868pag05a6h4l8q4x55w0dg4xki4q6klfi9dzx82knzb7s9l"; depends=[Matrix stringr vegan]; }; metro = derive2 { name="metro"; version="0.9.1"; sha256="0agmwvbwhpn5nzzkyz20pspbv6i80i636fhf9sqydgl1fskknrf2"; depends=[geodist hms httr jsonlite tibble]; }; metropolis = derive2 { name="metropolis"; version="0.1.8"; sha256="031fcy0v13bvy7gg26988fvpqdsfndx2rynkhb1jvirnrf0fngy4"; depends=[coda]; }; mets = derive2 { name="mets"; version="1.3.1"; sha256="0kzmbwhziknk4djql88kvanb0pncnxq0c6b7rsfd1z7c0c8kpyv0"; depends=[lava mvtnorm numDeriv Rcpp RcppArmadillo survival timereg]; }; metsyn = derive2 { name="metsyn"; version="0.1.2"; sha256="0iwp0nz07yd33qd93fjblmvik1l1xkv6rkccn3054zs2bkrzjq4f"; depends=[foreach readr stringr tibble]; }; mev = derive2 { name="mev"; version="1.14"; sha256="0pxjvvmrhjrdcznknncyhjghscajkw0q0y4r3ai22nkx70gln6bv"; depends=[alabama evd nleqslv nloptr Rcpp RcppArmadillo]; }; mewAvg = derive2 { name="mewAvg"; version="0.3.1"; sha256="1pnjzfq4rdjjlqp1mxxlpkhkfgq1nym8pgaqrvpm76zw4xnx7p7m"; depends=[]; }; - mexhaz = derive2 { name="mexhaz"; version="2.3"; sha256="14zfk9wnb062zvqj1szkas02s5pvw0i7gc618x5dwddffvl6kpfi"; depends=[lamW MASS numDeriv statmod survival]; }; + mexhaz = derive2 { name="mexhaz"; version="2.4"; sha256="1dh92gawq6hdq0594m5ayzrafxi2mz3362dx3dgvdmznwcyqvsbz"; 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-4"; sha256="0svvnpka2y1p21gvdyc7csw6m0g3kziszw2ll9bq5gpcnl69qk4n"; depends=[face Matrix matrixcalc mgcv]; }; @@ -12293,11 +12363,10 @@ in with self; { mfp = derive2 { name="mfp"; version="1.5.2.2"; sha256="1w61hj0dizgcpa3qv9ks9lvvbic7xp2cnip4klkdb9ss63vws8bv"; depends=[survival]; }; mfpp = derive2 { name="mfpp"; version="0.0.4"; sha256="0n752nm102cxscbi76hy1bh8kqd1svwknkj6l63jq5zd1z63a2yg"; depends=[genalg ggplot2 igraph nsga2R pracma reshape2 Rfast]; }; mfx = derive2 { name="mfx"; version="1.2-2"; sha256="04pwp67i4sn4rf497pgy6qifwvrcmwyxn8x5sn96fy8qyrdzjfhj"; depends=[betareg lmtest MASS sandwich]; }; - mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.2"; sha256="1k4c34srnckbh5kchzmm44l91ma9sw0gi4y225igs3cl79212q9c"; depends=[mvtnorm tseries]; }; + mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.5"; sha256="0i5f8xghdch9d1cvfgiq2pscpq53ms7ik7jk16gss8i0cx2d3m94"; depends=[mvtnorm tseries]; }; mgc = derive2 { name="mgc"; version="2.0.2"; sha256="1l9qs4nz1rn56qp569nh26yz3c7i4zh3r43c209zh7kvizpagx0i"; depends=[abind boot energy MASS raster]; }; mgcViz = derive2 { name="mgcViz"; version="0.1.9"; sha256="09n18ypjdwcca38i2v636ijgnzwalv7wh55z82a0pfrbzabiynn1"; depends=[gamm4 GGally ggplot2 gridExtra KernSmooth matrixStats mgcv miniUI plyr qgam shiny viridis]; }; mgcv = derive2 { name="mgcv"; version="1.8-41"; sha256="14769zs1sh1bz3c87hs4vhy2y9n28vglfqfrdgpysxdyw87h6yig"; depends=[Matrix nlme]; }; - mgee2 = derive2 { name="mgee2"; version="0.2"; sha256="1bhjajcjvm8brc92v6ij378i0d3vniip77m4pz7n02sgswj0w61a"; depends=[ggplot2 MASS]; }; mggd = derive2 { name="mggd"; version="1.0.2"; sha256="1za864qwchji90q6p56qrxbwgn73shl8yf4b6giq5wc63m41hn1w"; depends=[MASS rgl]; }; mglasso = derive2 { name="mglasso"; version="0.1.2"; sha256="1896fg1gdgah8vmikz2br6v0rslhhh2frffkjiy6fnw4qxa5zsv9"; depends=[corpcor ggplot2 ggrepel gridExtra Matrix R_utils reticulate rstudioapi]; }; mglmn = derive2 { name="mglmn"; version="0.1.0"; sha256="1g642hhs28q6x34xgrfrmmsb2jsn9zy4jxad0x5ai3px48zzdb4r"; depends=[mvabund snowfall]; }; @@ -12326,8 +12395,8 @@ in with self; { micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-10"; sha256="0lrwa0h7xc8scb7rh1wq71srzbhnk174k2qk1jd4adqqr308bgzp"; depends=[MASS miscTools systemfit]; }; micar = derive2 { name="micar"; version="1.1.2"; sha256="1zx2x6r4m0ihwhjd2n4rmk9da7p9bpadk65h7mbb0rgvwrspkzf8"; depends=[httr jsonlite]; }; micd = derive2 { name="micd"; version="1.1.0"; sha256="07zq8g9nfhw4mdjp9cj8pg3nh68vd7wj6zxb3x9wn2wwmrssj6f9"; depends=[mice pcalg RBGL Rfast]; }; - mice = derive2 { name="mice"; version="3.14.0"; sha256="01fnfrr7adp29s5kic95r9q0rdznkz2pjmziyimnrqzyicyvfyzq"; depends=[broom cpp11 dplyr generics lattice Rcpp rlang tidyr withr]; }; - miceFast = derive2 { name="miceFast"; version="0.8.1"; sha256="01nxjh395wb1cs6h5drm9xy3ahxb4cybx7xhdjv6g5jqjv4229m6"; depends=[data_table Rcpp RcppArmadillo]; }; + mice = derive2 { name="mice"; version="3.15.0"; sha256="0yz88b40mpn24z40yfpxrkwrsxk362gwks3v5x69rkix1qkdsr1x"; depends=[broom cpp11 dplyr generics lattice Rcpp rlang tidyr]; }; + miceFast = derive2 { name="miceFast"; version="0.8.2"; sha256="0n4hi9f28mzc9h41g7y3nnkr5lq7npafk6ias17xsqw28agc95ir"; depends=[data_table Rcpp RcppArmadillo]; }; miceRanger = derive2 { name="miceRanger"; version="1.5.0"; sha256="0xm8fcvjf6pcfyyk1gnwfdac44q6b33i5byja9lqxy7vygbxmgxd"; depends=[corrplot crayon data_table DescTools FNN foreach ggplot2 ggpubr ranger]; }; miceadds = derive2 { name="miceadds"; version="3.15-21"; sha256="0ybjxny2v0dd357pk0a8rg3llm5qglr4q3jrgcjjxkxzl2m879bc"; depends=[mice mitools Rcpp RcppArmadillo]; }; miceafter = derive2 { name="miceafter"; version="0.5.0"; sha256="192widdnj4ahv2rp09jzzz68n0ycdplv24p50kqd3i6zqnr1cl0s"; depends=[car dplyr magrittr mice mitml mitools pROC purrr rlang rms stringr survival tibble tidyr]; }; @@ -12342,8 +12411,7 @@ in with self; { microbial = derive2 { name="microbial"; version="0.0.20"; sha256="1y5vhh4sq22c4wxb3c9rzj53niacn97vfg0484d9wkcjb179lc79"; depends=[broom DESeq2 dplyr edgeR ggplot2 ggpubr magrittr phangorn phyloseq plyr randomForest rlang rstatix S4Vectors SummarizedExperiment testthat tidyr vegan]; }; microclass = derive2 { name="microclass"; version="1.2"; sha256="0q6mn1hbi6nk29x2x5a1wcdqp06mjggbrpglk5i8pp4gkqlzhl8q"; depends=[dplyr microcontax microseq Rcpp RcppEigen RcppParallel rlang stringr tibble]; }; microcontax = derive2 { name="microcontax"; version="1.2"; sha256="004g979hyg0asbah7hxr445fidil4ibw1b8pqpjdbgmpm1qgvw7y"; depends=[microseq]; }; - microdemic = derive2 { name="microdemic"; version="0.6.0"; sha256="1w4zh0vagnar95l5b8cgmcvp8q7vk2iba5g8d8g2ywynqiqcx5fc"; depends=[crul data_table httpcode jsonlite tibble]; }; - microeco = derive2 { name="microeco"; version="0.12.0"; sha256="043jwk93621vry2rmmzjwyivpdip51q0j2yq41fb9qly0j84dj13"; depends=[ape data_table dplyr ggplot2 magrittr R6 RColorBrewer reshape2 rlang scales tibble vegan]; }; + microeco = derive2 { name="microeco"; version="0.13.0"; sha256="06f53lyvv8r9bsvx5b0gx0jacwfjpiw2ys0g9b3r53xbx4vb1gkd"; 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="2.0.1"; sha256="1pshb5w8v1j1ayff2b95fjcqj0ias5z2znhm6s9x1p38808l9rrk"; depends=[cleangeo labeling maptools pbapply RColorBrewer readxl rgdal rgeos rmapshaper sf sp spdep stringr writexl]; }; @@ -12360,9 +12428,10 @@ in with self; { 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]; }; + miesmuschel = derive2 { name="miesmuschel"; version="0.0.2"; sha256="1zk4yj62g47lkc0a6xixjkhspbngln6fnddm891y61pcki5zlqcd"; depends=[bbotk checkmate data_table lgr matrixStats mlr3misc paradox R6]; }; mifa = derive2 { name="mifa"; version="0.2.0"; sha256="1rj3ba746f8759gird0vpvyb4fl0z2ihccpiv3qkr3sc64wgplln"; depends=[checkmate dplyr mice]; }; migest = derive2 { name="migest"; version="2.0.3"; sha256="0v59yai9xs2yj17lvm7nmw7jzfgglilixwmwy9czi3z4bhb7gknl"; depends=[circlize dplyr forcats magrittr matrixStats migration_indices mipfp purrr stringr tibble tidyr]; }; - migraph = derive2 { name="migraph"; version="0.12.1"; sha256="1p81k4ifch10i60xz2b5rm360n2bzaj7dysw21ada93whgszj2f8"; depends=[BiocManager dplyr furrr future generics ggforce ggplot2 ggraph igraph network patchwork pillar purrr rlang sna tidygraph tidyr]; }; + migraph = derive2 { name="migraph"; version="0.13.0"; sha256="0xf9yr7mlw9xkb8jacchyf8j7670xhvzbgakvxc6bclyys9gp7rh"; depends=[BiocManager dplyr furrr future generics ggforce ggplot2 ggraph igraph network patchwork pillar purrr rlang sna tidygraph tidyr]; }; migrate = derive2 { name="migrate"; version="0.4.0"; sha256="0yf0c7gcn2q8sx0havhqaxk6z69bagfd58drpbqkkpsp62bnq875"; depends=[dplyr magrittr rlang tibble tidyr]; }; migration_indices = derive2 { name="migration.indices"; version="0.3.1"; sha256="198lxv6s1wc6j10ygbc4l2irmmv5448f9av9zsybnpijballx349"; depends=[calibrate]; }; migui = derive2 { name="migui"; version="1.3"; sha256="1y012la9vmchnlcigcciq878w9hlw8zgzp76b3h9b6fwhaa872pm"; depends=[arm gWidgets2 mi]; }; @@ -12393,10 +12462,11 @@ in with self; { minpack_lm = derive2 { name="minpack.lm"; version="1.2-2"; sha256="11yz6hk2r33571d16kq01cb1x6sgdzi6jmksqlrm8mr84l95c2f7"; depends=[]; }; minqa = derive2 { name="minqa"; version="1.2.5"; sha256="1gpli7f3piz3jqjj63a6bk9v1jlygjdaqqqvqsr083crj0imd0wv"; depends=[Rcpp]; }; minque = derive2 { name="minque"; version="2.0.0"; sha256="0pczdg22i3if048i64chzcpnv3ay8p0anmhwjmzm29577z0jgms8"; depends=[]; }; - minval = derive2 { name="minval"; version="0.8-2"; sha256="06anbb90c8wg0374ykmb6chcwrcdyi903jkbrmrv3kgx511l699z"; depends=[]; }; + minsample1 = derive2 { name="minsample1"; version="0.1.0"; sha256="13kmqxa3pbllv16fzn0v7msffsaar79y8xnvnbrcfhwa76031f8f"; depends=[]; }; + minsample2 = derive2 { name="minsample2"; version="0.1.0"; sha256="0q1rp6mdyhcp806a0m0sr4ldm5rj78wk2fljzylxfjs4c734lpbk"; depends=[]; }; mipfp = derive2 { name="mipfp"; version="3.2.1"; sha256="1gxazpg81vj5dywpb6jb29188jw28qil6pfygawa7znnjn3k5ca6"; depends=[cmm numDeriv Rsolnp]; }; mipplot = derive2 { name="mipplot"; version="0.3.1"; sha256="126arvxq6gmaiwk3n3p0slnb1mhs3qf993m4lx95nlmnv612ag66"; depends=[data_table dplyr ggplot2 readr readxl reshape reshape2 rlang shiny shiny_i18n shinyalert shinyWidgets showtext showtextdb stringr tidyr]; }; - mirai = derive2 { name="mirai"; version="0.7.0"; sha256="0jqvjxphalzchslzdq39d885kr923hg4bvwxd6chdsn2ii6w8aj6"; depends=[nanonext]; }; + mirai = derive2 { name="mirai"; version="0.7.1"; sha256="02qs2dncxmvfx0cm4fkm6qqvi6mw9zbmhxdcqzig8kspvvqhmfnr"; depends=[nanonext]; }; mirt = derive2 { name="mirt"; version="1.37.1"; sha256="0h6i6mlns696ak59p9blk498bpmyx8090hl5c59n46vznpz38cq6"; depends=[dcurver Deriv GPArotation gridExtra lattice Matrix mgcv pbapply Rcpp RcppArmadillo vegan]; }; mirtCAT = derive2 { name="mirtCAT"; version="1.12.2"; sha256="0xxbja9d1n9r633isa7jzz1b46ins97q18hvlq2p1dal1hzxxh16"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; }; mirtjml = derive2 { name="mirtjml"; version="1.4.0"; sha256="1zvm8acywpzi87lz0hpxmr8c9kyqkbx0490q3vlwxd90ffcdp9ml"; depends=[GPArotation Rcpp RcppArmadillo]; }; @@ -12405,7 +12475,7 @@ in with self; { misaem = derive2 { name="misaem"; version="1.0.1"; sha256="05m7k8mgbpkv5szislvf3q45pk5f8z54ibddhi8pkhwa9w00xkjk"; depends=[MASS mvtnorm norm]; }; misc3d = derive2 { name="misc3d"; version="0.9-1"; sha256="0r9x57s63kx9f6dgam2nhbziq8nrs9wd8pk7g76hds2kw46vnyx0"; depends=[]; }; miscF = derive2 { name="miscF"; version="0.1-5"; sha256="0g6wk2zxqq6j949hnbvwmfd72y25zjfbrfrfxsj21q84w41fgjkb"; depends=[MASS MCMCpack mvtnorm R2jags]; }; - miscFuncs = derive2 { name="miscFuncs"; version="1.5-2"; sha256="17vy9934ndd8wyhvnyixp2j7ckrksgyx2y8kgvryyp3xxw3bxsz7"; depends=[mvtnorm roxygen2]; }; + miscFuncs = derive2 { name="miscFuncs"; version="1.5-3"; sha256="09pprwqbwz8iiggjqvnv3m2mkiy26zncvs9rn0mba2wk0yfzq4py"; depends=[mvtnorm roxygen2]; }; miscIC = derive2 { name="miscIC"; version="0.1.0"; sha256="0pnwc3b318xxnmb7scrj4qkqlvqfyczspdg496kl0ixsiaafr1ad"; depends=[nnls]; }; miscTools = derive2 { name="miscTools"; version="0.6-26"; sha256="16pwfxpyl0zv3hjxx2kjchkg7p6kbj0s2rrpskj7rkhjr9imlg5y"; depends=[digest]; }; misclassGLM = derive2 { name="misclassGLM"; version="0.3.2"; sha256="1b344dy5fm45jkjrqcx16905n9x0iwihr73mq2m0qfq7ay87nsrh"; depends=[bigmemory foreach MASS Matrix mlogit numDeriv ucminf]; }; @@ -12451,6 +12521,7 @@ in with self; { mixdist = derive2 { name="mixdist"; version="0.5-5"; sha256="1wchhysd33xz395hq4wgd3zv1qc92pbiqxqd7g2v6m1pb0j8ma9g"; depends=[]; }; mixedCCA = derive2 { name="mixedCCA"; version="1.6.2"; sha256="07apl37kwj47w14jxsvwdiacnwd517zs3ff2c70fhb6ncbgp8adv"; depends=[fMultivar irlba latentcor MASS Matrix mnormt pcaPP Rcpp RcppArmadillo]; }; mixedClust = derive2 { name="mixedClust"; version="1.0.2"; sha256="10hysjsld58cv0xif01xw08r0alr8xsnbp931x59lb36yi9g6f0m"; depends=[fda Rcpp RcppArmadillo RcppProgress]; }; + mixedLSR = derive2 { name="mixedLSR"; version="0.1.0"; sha256="0a514w88k1lwcdmq7ginn4qmf0mdj747lhgxzx15nh0hp0xq26lc"; depends=[ggplot2 grpreg MASS purrr]; }; mixedMem = derive2 { name="mixedMem"; version="1.1.2"; sha256="1p0gplfcn663xp40dk0yg70qffn1fwa9gxv7bppflgm9wkn8g3l5"; depends=[BH gtools Rcpp RcppArmadillo]; }; mixedsde = derive2 { name="mixedsde"; version="5.0"; sha256="0ss1ng4nx91gxj85wxxfyh9ljxsj3ag6lsj1a5d2815p9jzl7dsv"; depends=[MASS moments plot3D sde]; }; mixexp = derive2 { name="mixexp"; version="1.2.7"; sha256="06bp8w9r6fxhnp2ga3hig7fbl2nsvfvwxggbfd7nfc60c91p80mq"; depends=[daewr lattice]; }; @@ -12459,17 +12530,18 @@ in with self; { 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.6"; sha256="1qccwiaqyvmpyklbbp6ay3xvln9wfizaxi6fjizzx2bjpng5043p"; depends=[car leaps multcomp pls pracma]; }; mixmeta = derive2 { name="mixmeta"; version="1.2.0"; sha256="093f6jjq0hc49k5kmjp17s2lv3swpssfxnra80bwv59ggav8w8d8"; depends=[]; }; + mixopt = derive2 { name="mixopt"; version="0.1.1"; sha256="0szqrlnnbq152343dic54rjj8rafrnwci1xfjy014q1nwjxz0wfd"; 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=[]; }; mixsmsn = derive2 { name="mixsmsn"; version="1.1-10"; sha256="1w31br65la62zw847bw4bz0shvgna680wagxnqmc71kpy4a9mv3x"; depends=[mvtnorm]; }; - mixsqp = derive2 { name="mixsqp"; version="0.3-43"; sha256="1qics04w0swyp216d6g8dmsph8q2kpadpacp66h2qih3521js12q"; depends=[irlba Rcpp RcppArmadillo]; }; - mixtools = derive2 { name="mixtools"; version="1.2.0"; sha256="08whic8hmmzi55b7azwj11l2x5r9s5qbyrv7s9jr08156vqkw0zg"; depends=[kernlab MASS segmented survival]; }; + mixsqp = derive2 { name="mixsqp"; version="0.3-48"; sha256="02cjg33m5iqziyy0xi11wvbm5qnlgfy51r1dbpjzyhqsrv1dfx48"; depends=[irlba Rcpp RcppArmadillo]; }; + mixtools = derive2 { name="mixtools"; version="2.0.0"; sha256="03by64xi7yka0hzc1qyz1jdqzah6isvr3cdsc7g5v6hb4f178kl5"; depends=[kernlab MASS plotly scales segmented survival]; }; mixtox = derive2 { name="mixtox"; version="1.4.0"; sha256="1lca26s80f92c18wkpp5gs2ifylnyqyg933w7r5ir3xvsfbk0lfh"; depends=[minpack_lm]; }; mixtur = derive2 { name="mixtur"; version="1.2.0"; sha256="1kdzhjad6bwg6ga4bm545iw147h6zhj1a038ajlnbgynd9j8h8nh"; depends=[dplyr ggplot2 RColorBrewer rlang tidyr]; }; mixture = derive2 { name="mixture"; version="2.0.5"; sha256="16ydhsgssd5jbhf03llxy2gjhv3h3bqi01s45jcb9dwc3mbd306b"; depends=[BH lattice Rcpp RcppArmadillo RcppGSL]; }; mize = derive2 { name="mize"; version="0.2.4"; sha256="1dfhldxsm1il9avfxvaiir9r878dp7swyc9c8ilm6llx208sd5d5"; depends=[]; }; mizer = derive2 { name="mizer"; version="2.3.1"; sha256="1r14mpwb96xhibf7j3735q67xl17pkjx9pb2m1j4l8rjjpdxl3l0"; depends=[assertthat deSolve dplyr ggplot2 ggrepel lifecycle lubridate plotly plyr progress Rcpp reshape2 rlang]; }; - mkin = derive2 { name="mkin"; version="1.1.1"; sha256="1z34z1bymki5x39pq9gxl7a0c9wki6yzjzrbbfmd2ghi55ick8wh"; depends=[deSolve inline lmtest nlme numDeriv pkgbuild purrr R6 saemix]; }; + mkin = derive2 { name="mkin"; version="1.2.1"; sha256="0k1c7rr8y12glg6n2lvhka2h7dipxjm3sjrav941l4lahpc60848"; depends=[deSolve inline lmtest nlme numDeriv pkgbuild R6 rlang saemix vctrs]; }; mknapsack = derive2 { name="mknapsack"; version="0.1.0"; sha256="1kzmx7d512681a4hjirfgcd7a8rvndb4da66p16gms5nnxzsby9c"; depends=[assertthat data_table lpSolve]; }; mkssd = derive2 { name="mkssd"; version="1.2"; sha256="1vgg5azr4qydqb6xbdbff9256bwz7gl3k3hpn7998rm9jhdmynnd"; depends=[]; }; mlVAR = derive2 { name="mlVAR"; version="0.5"; sha256="11mn7gaqlmw01gvg7psqkkr5bgv4iclv0590av4xzbvq8496f5g2"; depends=[abind arm clusterGeneration corpcor dplyr graphicalVAR lme4 MplusAutomation mvtnorm plyr qgraph rlang]; }; @@ -12484,49 +12556,50 @@ in with self; { mlergm = derive2 { name="mlergm"; version="0.8"; sha256="0bpdljmbn4lfm263jcsp0hrknixn49m7hqsx0jjk3pfwhgjlajh8"; depends=[cowplot ergm GGally ggplot2 lpSolve Matrix network plyr reshape2 sna stringr]; }; 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.30.0"; sha256="1px2ww12gm10np6h9cnikjl3czix8v2hjkggzxckm4fvrlckh4g0"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr yaml zeallot]; }; - mlim = derive2 { name="mlim"; version="0.2.0"; sha256="04ssk3syx3cb5rcmycqfdssxcnp5nlnmnc58mr9bis129shhmvdg"; depends=[curl h2o md_log memuse mice missRanger]; }; + mlflow = derive2 { name="mlflow"; version="2.0.1"; sha256="1h70cg8xd434f2lwam2zbsjkzvavzz5yqg3wa9v0289h6vp0v5zb"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr rlang swagger tibble withr yaml zeallot]; }; mlmRev = derive2 { name="mlmRev"; version="1.0-8"; sha256="0ln4nazhc1prnlmvhfzhx268vx3klb0xnz1nsiwh0pwyskskyzym"; depends=[lme4]; }; mlma = derive2 { name="mlma"; version="6.2-1"; sha256="1jvra77xhf0a6qb2kb953inpg2lzv0y88kb6zzcw35bb8gipzm78"; depends=[abind car coxme gplots lme4 survival]; }; mlmc = derive2 { name="mlmc"; version="1.0.0"; sha256="01h7w0ajyg3bccynlpbi3yjpy089wczbfbajpg6yw5v4dppw7k7a"; depends=[ggplot2 Rcpp]; }; + mlmhelpr = derive2 { name="mlmhelpr"; version="0.1.0"; sha256="1liqawmdz3a8jxnlbhxx9iz5nlybkyz7jr719y0xkqz4h741bj5s"; depends=[lme4 mathjaxr Rdpack]; }; 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=[]; }; mlmtools = derive2 { name="mlmtools"; version="1.0.2"; sha256="1fwa0cwrrhzxr5zkvmf0q1w2wlrhj58lwmrvqxfn00v0v9d6bi0g"; depends=[ggplot2 lme4]; }; - mlmts = derive2 { name="mlmts"; version="1.0.1"; sha256="1j6yq4aj2kpqli6xk09ki1vrx91r2n5jasqhx361qp5rn8cn66h7"; 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-7"; sha256="0q8c5897z8f519nf6p55ksc610a9dbpnah2rr4srij4gs9a4clx1"; depends=[abind BMA maxLik]; }; mlpack = derive2 { name="mlpack"; version="4.0.0"; sha256="1wly4md76hm75c4vhvgmd3akc1py4f19s6c4rbpq41qn3sf5iqmj"; depends=[Rcpp RcppArmadillo RcppEnsmallen]; }; mlpwr = derive2 { name="mlpwr"; version="1.0.0"; sha256="01kyyy3q7qd7wpccl1ibiq7fkbh552c6l4yflxvdy1j2fm8w5gic"; depends=[DiceKriging digest ggplot2 randtoolbox rgenoud rlist WeightSVM]; }; mlquantify = derive2 { name="mlquantify"; version="0.2.0"; sha256="1fpwvix0f4bmqb1y1b6wryndqp6j24dwsspbfx1zrnhzwj1v4i9i"; depends=[caret FNN randomForest]; }; mlr = derive2 { name="mlr"; version="2.19.1"; sha256="00jjhvaqifj6glqsyzixlp56bvlch5smck8kk3klcmwx9pasyllx"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; }; - mlr3 = derive2 { name="mlr3"; version="0.14.0"; sha256="0cnyby4947g1w0h45nd3ld5zr4k19xrwp565mq1hnqkjwmyjsgdj"; depends=[backports checkmate data_table evaluate future future_apply lgr mlbench mlr3measures mlr3misc palmerpenguins paradox parallelly R6 uuid]; }; + mlr3 = derive2 { name="mlr3"; version="0.14.1"; sha256="192hvc0may73m396j2igwm46ym6f345w6q0q69kqhia58fp6h3nd"; 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.4"; sha256="1h97fc2ffay6r2ql8py24kmw65pr9cxh11ni3i1bzllbn8skqrfn"; depends=[checkmate data_table ggplot2 mlr3misc R6]; }; - mlr3cluster = derive2 { name="mlr3cluster"; version="0.1.4"; sha256="1infwd275j0jkm62nzzpblkn67hjsbpxw0l1plc4gz8p9q1gwjj5"; depends=[backports checkmate clue cluster clusterCrit data_table mlr3 mlr3misc paradox R6]; }; + mlr3cluster = derive2 { name="mlr3cluster"; version="0.1.5"; sha256="049gxl66frhi0nhy0nlcbw5f969j5disln2cdj6sqdhz9hqjrm54"; depends=[backports checkmate clue cluster clusterCrit data_table mlr3 mlr3misc paradox R6]; }; mlr3data = derive2 { name="mlr3data"; version="0.6.1"; sha256="1nbasjmn2lkrn00qw2dv9qc3d21fdc6nrrr8qagd5v5z2afy08zc"; depends=[]; }; mlr3db = derive2 { name="mlr3db"; version="0.5.0"; sha256="0gvmn85sqn3klziy8nd726nim28cvfgdaddp4ilbq3v0jr745giz"; depends=[backports checkmate data_table mlr3 mlr3misc R6]; }; mlr3fairness = derive2 { name="mlr3fairness"; version="0.3.1"; sha256="09ybdgp659fnv20cm427kd5pirhw28q3q5zxgy5k699frzwm5fgq"; depends=[checkmate data_table ggplot2 mlr3 mlr3measures mlr3misc mlr3pipelines paradox R6]; }; mlr3filters = derive2 { name="mlr3filters"; version="0.6.0"; sha256="0v0jdgmdc7ihnpan1iqhldqd6qjpridaajnpzn2ga3bfl9g1nim0"; depends=[backports checkmate data_table mlr3 mlr3misc paradox R6]; }; - mlr3fselect = derive2 { name="mlr3fselect"; version="0.7.2"; sha256="102cv6is5wsj72i9ws1p5zzbv3rmgfhmj5g110n81vz0bqi0sz14"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc mlr3pipelines paradox R6]; }; - mlr3hyperband = derive2 { name="mlr3hyperband"; version="0.4.2"; sha256="1ybdbfsd7d8z8nhclrpp2by2yrfwfy1pgm2kbslqzvyhm7wpf038"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc mlr3tuning paradox R6]; }; - mlr3learners = derive2 { name="mlr3learners"; version="0.5.4"; sha256="0sa2qjvhvjzsfssln9ah08zknzdcps1z28xzgkdfgi6dj25a0y3k"; depends=[checkmate data_table mlr3 mlr3misc paradox R6]; }; + mlr3fselect = derive2 { name="mlr3fselect"; version="0.8.1"; sha256="1yilsw5vjmcr3v0mykxcgkl1qbkz8x20970bz0nk4diadfycd519"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc mlr3pipelines paradox R6]; }; + mlr3hyperband = derive2 { name="mlr3hyperband"; version="0.4.4"; sha256="02zyw4wir8gnqfv7g4b19ldfmnbxqgvbcnp744fcv67gigh8glsh"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc mlr3tuning paradox R6]; }; + mlr3learners = derive2 { name="mlr3learners"; version="0.5.5"; sha256="0m5s7jfqfh48gxllvi93wb5w2pzhzx8rcx5bz87lkmv1cnj65q84"; depends=[checkmate data_table mlr3 mlr3misc paradox R6]; }; + mlr3mbo = derive2 { name="mlr3mbo"; version="0.1.1"; sha256="0gm2waqp6mb2nf12rnwfyig9n9c2bxdyq4mhhray8cc6fcb100f0"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc mlr3tuning paradox R6]; }; mlr3measures = derive2 { name="mlr3measures"; version="0.5.0"; sha256="0k0i1xx63lds1870p2ljy1dlp2i376gdd0sq9s4xiqljqjb8va57"; depends=[checkmate PRROC]; }; mlr3misc = derive2 { name="mlr3misc"; version="0.11.0"; sha256="0haxj0zlflalw10nhdwmk45qsl164bgyjgnm101l2wybw795ixfi"; depends=[backports checkmate data_table digest R6]; }; - mlr3oml = derive2 { name="mlr3oml"; version="0.6.0"; sha256="1h7i0bczksv81gwyachcyv4wxfz02bm3j3i5azb0lykvrvfljkjh"; depends=[backports checkmate curl data_table jsonlite lgr mlr3 mlr3misc paradox R6 stringi uuid withr]; }; + mlr3oml = derive2 { name="mlr3oml"; version="0.7.0"; sha256="1gg60x5ysnhlkgqqrqkgkxz3b55yfmlz45bx1x18rjwr4szal26j"; depends=[backports checkmate curl data_table jsonlite lgr mlr3 mlr3misc paradox R6 stringi uuid withr]; }; mlr3pipelines = derive2 { name="mlr3pipelines"; version="0.4.2"; sha256="09pk3dwjcg5rbpwa1k21srdpvf2dlxq4b5p71cvkha85jx2gdgh6"; depends=[backports checkmate data_table digest lgr mlr3 mlr3misc paradox R6 withr]; }; mlr3shiny = derive2 { name="mlr3shiny"; version="0.2.0"; sha256="0s581aqi3a3kg35db0gnsmmg62zwl5bij4vbszjhc63i3xg0ayiz"; depends=[data_table DT e1071 mlr3 mlr3learners mlr3measures plyr purrr ranger readxl shiny shinyalert shinydashboard shinyjs shinythemes shinyWidgets stringr]; }; mlr3spatial = derive2 { name="mlr3spatial"; version="0.3.0"; sha256="0b36mjk1y3vdrgrhvdmc0qd7l19b7k9qbgyns4w0711riqz37al4"; depends=[checkmate data_table lgr mlr3 mlr3misc R6 sf terra]; }; - mlr3tuning = derive2 { name="mlr3tuning"; version="0.15.0"; sha256="13p0gcnl8sxvn3ig526pscl63g1dx7l5i9sfzi2yyrddg8vgik4g"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc paradox R6]; }; - mlr3tuningspaces = derive2 { name="mlr3tuningspaces"; version="0.3.1"; sha256="0c1m6cv6p54n3pd1li7ccpmcd830qshsw040swp2m8f75gklv8b1"; depends=[checkmate data_table mlr3 mlr3misc mlr3tuning paradox R6]; }; - mlr3verse = derive2 { name="mlr3verse"; version="0.2.5"; sha256="1mgspiibjbcv12vb2mqyj2n53vvmdqn8wcqcdhn6lzvblkpi2nbg"; depends=[bbotk data_table mlr3 mlr3cluster mlr3data mlr3filters mlr3fselect mlr3hyperband mlr3learners mlr3misc mlr3pipelines mlr3tuning mlr3tuningspaces mlr3viz paradox]; }; + mlr3spatiotempcv = derive2 { name="mlr3spatiotempcv"; version="2.0.3"; sha256="0lxdg82fcgfb57f9n2rwriw43cx10103ymjmz8y6dpx5n006m3d8"; depends=[checkmate data_table ggplot2 mlr3 mlr3misc paradox R6]; }; + mlr3tuning = derive2 { name="mlr3tuning"; version="0.17.1"; sha256="03habi7dm5xgwfb4zjn9nhvyym46qcljy31jz32fxalsap1mk9jb"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc paradox R6]; }; + mlr3tuningspaces = derive2 { name="mlr3tuningspaces"; version="0.3.3"; sha256="16yaah9zncl0daq453cl00mbpk9pvap8wv3myb5azj27v7pp1fb6"; depends=[checkmate data_table mlr3 mlr3misc mlr3tuning paradox R6]; }; + mlr3verse = derive2 { name="mlr3verse"; version="0.2.7"; sha256="0d8k5p3brhb1qxh6wwsqy6mfnlw2hipwqbqwpb0adwkqiwbnx520"; depends=[bbotk data_table mlr3 mlr3cluster mlr3data mlr3filters mlr3fselect mlr3hyperband mlr3learners mlr3misc mlr3pipelines mlr3tuning mlr3tuningspaces mlr3viz paradox]; }; mlr3viz = derive2 { name="mlr3viz"; version="0.5.10"; sha256="0bd7sgqfn4lkafzyrpjbgkm16hmzwlpl7yjkdjxxaj03g6dk7yf1"; depends=[checkmate data_table ggplot2 mlr3misc scales viridis]; }; - mlrCPO = derive2 { name="mlrCPO"; version="0.3.7-5"; sha256="0jbsy4ppq0l423fp8m7b0w5kslxmlslr2alm7k7x8s9fn3arnckl"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; }; + mlrCPO = derive2 { name="mlrCPO"; version="0.3.7-6"; sha256="1xvfh5b1806ycdh8brnl63cd3fzr919sdi82acq5n59pz39fz4cc"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; }; mlrMBO = derive2 { name="mlrMBO"; version="1.1.5.1"; sha256="16fwj7m28g4km7yalqppxmh3lw2jln0z072l6awia38qkdg6xwhc"; 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]; }; mlrpro = derive2 { name="mlrpro"; version="0.1.2"; sha256="1j8w8ji1n6cahcbyi1q4zq8gmhpcl15pb97f7bl1km29f4x4f272"; depends=[car dplyr MASS]; }; mlsbm = derive2 { name="mlsbm"; version="0.99.2"; sha256="1p6fflhjbbyzx51hb77aak1kdabjrmzd7b47vdcanhb0vd263aby"; depends=[Rcpp RcppArmadillo]; }; mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.2"; sha256="1icsssgi5xf420ajagr9nw0wgbxpfm7dsd5b7s77vyh5hsfzm1z3"; depends=[]; }; - mlt = derive2 { name="mlt"; version="1.4-2"; sha256="0ris1wfcyslbnn43b7s2p0nk01wzd5m3mm6dnzra73kgkjrdr8hz"; depends=[alabama basefun BB coneproj Matrix numDeriv sandwich survival variables]; }; + mlt = derive2 { name="mlt"; version="1.4-3"; sha256="06jkskmixzn70i7m0zj0rgqzknmrd6jnqrwadrhf7mva38rqvw99"; depends=[alabama basefun BB coneproj Matrix numDeriv sandwich survival variables]; }; mlt_docreg = derive2 { name="mlt.docreg"; version="1.1-6"; sha256="1ijfv3lwizk540g546pyi5i4sxcxwa3b2ylk0gsk68q5w704xpk6"; depends=[eha flexsurv lattice mlt multcomp numDeriv survival truncreg]; }; 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]; }; @@ -12545,6 +12618,8 @@ in with self; { mmeln = derive2 { name="mmeln"; version="1.4"; sha256="0q5w3ajc1v798dyvryny2a0c52hzhxrjm4md08mqvww65pdzhqc4"; depends=[]; }; mmmgee = derive2 { name="mmmgee"; version="1.20"; sha256="0y3pwnc9h7y2l9cvgfl62nl1vnnkla2y8082jhdvxsb3mk88rgad"; depends=[Matrix mvtnorm]; }; mmod = derive2 { name="mmod"; version="1.3.3"; sha256="1dz6887mlqbagjj98wcabmxj9hvsz8pgsizy1fqkwjhhs44c62y4"; depends=[adegenet pegas]; }; + mmodely = derive2 { name="mmodely"; version="0.2.2"; sha256="1xbnivb5xvivz8by5hrr3g8g5w7yyw5n65jl1qhxf2lzvdr3prcw"; depends=[ape caper caroline]; }; + mmpca = derive2 { name="mmpca"; version="2.0.3"; sha256="1kzjwl0sn8cdgw3jw95lg90vgh47iw293ffn7c0fb9kgxisd6dma"; depends=[digest Rcpp RcppEigen RcppGSL]; }; mmpf = derive2 { name="mmpf"; version="0.0.5"; sha256="1w1ll1l7yzwb1wmlrcfpgqyzni7yb20kxy422y867hx2ndxlfwpz"; depends=[checkmate data_table]; }; mmpp = derive2 { name="mmpp"; version="0.6"; sha256="16aypjf4i0ya3qgxqrrg8y0xbnq1pnqky1dpkgln5q494hphyg91"; depends=[]; }; mmr = derive2 { name="mmr"; version="0.1.0"; sha256="0by2v47b4kpjhfxzzl6kc1shw7g46nwnww4rq333r2cywvrbkk4w"; depends=[]; }; @@ -12566,10 +12641,11 @@ in with self; { mobr = derive2 { name="mobr"; version="2.0.2"; sha256="0dvsarxkjcjn3f40qkx5pdjpvq7hr6l5nvdz6adxlr1sdbadfcws"; depends=[dplyr egg geosphere ggplot2 pbapply plotrix purrr rlang scales tibble tidyr vctrs]; }; mockery = derive2 { name="mockery"; version="0.4.3"; sha256="0sj77m9vgn4bzb8c8nq93xb9lm8ih8rcb7sfccripraibibg3jcz"; depends=[testthat]; }; mockr = derive2 { name="mockr"; version="0.2.0"; sha256="0qxpyyg25ampjd6fjbhylzjfy15qng6w32yc17q5a2y6fz1scsy0"; depends=[rlang withr]; }; + mockthat = derive2 { name="mockthat"; version="0.2.8"; sha256="02j74gpppspf8ll3mvz879mnjm9wsj8dq5y3i0r8kzdizc6rxk3k"; depends=[rlang]; }; mod = derive2 { name="mod"; version="0.1.3"; sha256="0z5a6ps2m0cbw0n9kn44767m5jnbf1dl077i2p40fipv8xali9fb"; depends=[]; }; mod09nrt = derive2 { name="mod09nrt"; version="0.14"; sha256="1wn1y33bj9r712l0f063j5gcl423anjzmvgfy0ddihcrbpz4l7a0"; depends=[]; }; mod2rm = derive2 { name="mod2rm"; version="0.2.1"; sha256="1adx8ndz299hzlljahvbv1px60dfchwh2ic6njr12k3zcm52rsby"; depends=[ggplot2 scales]; }; - modEvA = derive2 { name="modEvA"; version="3.5"; sha256="17rhp2i09ps04vz43k0drjwwsdx5g1615grrg1b0bf7gzbc5b9iy"; depends=[terra]; }; + modEvA = derive2 { name="modEvA"; version="3.8.4"; sha256="1vq028rn4d5hlkvdp2z7a95dglw6vp4xdaia7wsbkhy3fv41mqzq"; depends=[terra]; }; modMax = derive2 { name="modMax"; version="1.1"; sha256="1mx4623az7vzaqf530pklx7j92qwwq93pa2416lnr24jjcxgva2h"; depends=[gtools igraph]; }; modQR = derive2 { name="modQR"; version="0.1.3"; sha256="15ks5i7s19r4s9faxn36qlcf4y150b6xji970kxgilcgxvfqkgd8"; depends=[geometry lpSolve]; }; modTurPoint = derive2 { name="modTurPoint"; version="0.1.0"; sha256="1m24vsi80ln1r7sr40pipaaanyc60yfxmjzf8l7nfy3yvyr8zqpn"; depends=[]; }; @@ -12580,7 +12656,6 @@ in with self; { model4you = derive2 { name="model4you"; version="0.9-7"; sha256="0pni9v3nradvy8sp2m07903vc7z610xrh426lf19dxss12kgrfi8"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; }; modelDown = derive2 { name="modelDown"; version="1.1"; sha256="1l0aggkh0ykpqrp59bdz1cyl1ai397cw4hya80b7fm7s49imwczg"; depends=[archivist auditor breakDown DALEX devtools drifter DT ggplot2 kableExtra psych svglite whisker]; }; modelObj = derive2 { name="modelObj"; version="4.2"; sha256="0qj8ri7aw9lc7cc7rcs618bcbarcs29zgbz8l74s55qajvwpssg0"; depends=[]; }; - modelROC = derive2 { name="modelROC"; version="1.0"; sha256="0iyx7c98ym7dy6pfssj7474h9wjpzjwy0fyc5bnqyi1lmjgd508k"; depends=[do ggplot2 ROCit survivalROC tmcn]; }; modelStudio = derive2 { name="modelStudio"; version="3.1.0"; sha256="0hd3x5jnj3s4b0hahxzjxfclhr92adf1xhs7hgc1k8bm9ngnqqxm"; depends=[DALEX digest iBreakDown ingredients jsonlite progress r2d3]; }; modelbased = derive2 { name="modelbased"; version="0.8.5"; sha256="1fm5d94bck4vkp0lf6qfjbjg1561hapr2dq06g8hahfw9wq6ak3l"; depends=[bayestestR datawizard effectsize insight parameters performance]; }; modelc = derive2 { name="modelc"; version="1.0.0.0"; sha256="0xz1zgv5yyvq0yfnhm1kvb4wvlyn4ccd0lkwji55vq8hndvjvk98"; depends=[]; }; @@ -12590,10 +12665,10 @@ in with self; { modelgrid = derive2 { name="modelgrid"; version="1.1.1.0"; sha256="1z6g0akczry7vldkk6anfq572zbsfzbd6qnyllgjpbxhy3rrrq0r"; depends=[caret dplyr ggplot2 lattice magrittr purrr]; }; 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.9"; sha256="1jd9vxirj5ii4ac0ka07g0rcq1c8yqv06jg27nmvp5a6kvlgvs8h"; depends=[broom magrittr purrr rlang tibble tidyr tidyselect vctrs]; }; - modelsummary = derive2 { name="modelsummary"; version="1.1.0"; sha256="1hfrgl6crmznbx2mkr5grd87zrgx8m5j7zjyq89yr5g0n6gl9ka2"; depends=[broom checkmate data_table generics glue insight kableExtra parameters performance tables]; }; + modelr = derive2 { name="modelr"; version="0.1.10"; sha256="0qqgdb7gpb1h9lf5zijg51gd0qmbzj8f37aykhv1w633cglacick"; depends=[broom magrittr purrr rlang tibble tidyr tidyselect vctrs]; }; + modelsummary = derive2 { name="modelsummary"; version="1.2.0"; sha256="0fcr1x1gjwhl46vikac2phms4ahlr1cpigj8p7kcdbhs9sc29drk"; depends=[broom checkmate data_table generics glue insight kableExtra parameters performance tables]; }; modeltests = derive2 { name="modeltests"; version="0.1.4"; sha256="0ii5sh8yz5yvf0gq41ia55dvbg8x9042x82j52ck6haxa0w8zpfy"; depends=[dplyr generics purrr testthat tibble]; }; - modeltime = derive2 { name="modeltime"; version="1.2.3"; sha256="0zb4q7m5wsism4n508hsya6ln0i14iclk6jy0l4cslz99lzb2v9q"; depends=[cli dials doParallel dplyr forcats foreach forecast ggplot2 glue gt hardhat janitor magrittr parallelly parsnip plotly prophet purrr reactable rlang scales StanHeaders stringr tibble tidyr timetk workflows xgboost yardstick]; }; + modeltime = derive2 { name="modeltime"; version="1.2.4"; sha256="11l4yysk5g4p0vh4h7dyqkzxa5cm3q3cjlimwhmbslfby36hki6x"; depends=[cli dials doParallel dplyr forcats foreach forecast ggplot2 glue gt hardhat janitor magrittr parallelly parsnip plotly prophet purrr reactable rlang scales StanHeaders stringr tibble tidyr timetk workflows xgboost yardstick]; }; modeltime_ensemble = derive2 { name="modeltime.ensemble"; version="1.0.2"; sha256="1yywl3vnc03wbz9fl3gq9cclvx8rsvnndyqb6d4ws9y5g60hnxhd"; 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]; }; @@ -12601,7 +12676,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.4"; sha256="0w4xj84f8dcq3ikxy3vhsyb85brsgcvnhzwawigh34mz64m7nhlc"; depends=[broom dplyr formula_tools ggplot2 glue infer janitor knitr magrittr rlang stringr tibble]; }; + moderndive = derive2 { name="moderndive"; version="0.5.5"; sha256="0bgq6wsyyi6nsxqqh2k3zsmk64pfvb57z8pzk8ych3xih491hzlm"; depends=[broom dplyr formula_tools ggplot2 glue infer janitor knitr magrittr rlang stringr tibble]; }; modest = derive2 { name="modest"; version="0.3-1"; sha256="07rs014hdcabp2n0gg14pz2gmqgbw38vjv7a80vkzzh3601hxqws"; depends=[knitr rhandsontable shiny shinyBS]; }; modesto = derive2 { name="modesto"; version="0.1.4"; sha256="12p5azbbng1hnvs5b86g85871dn5534iv7r6fw5v1iv1h1rcypcr"; depends=[markovchain Rcpp]; }; modgetxl = derive2 { name="modgetxl"; version="0.4"; sha256="0j9fmhy3wra9qr8753a495ligfz5fwgydv3ixlfzx3sgbq882hic"; depends=[DT readxl shiny shinydashboard]; }; @@ -12621,7 +12696,7 @@ in with self; { molaR = derive2 { name="molaR"; version="5.1"; sha256="1wqxyrsql36aqiwh0mcyv1ynbzn6p2was4wmaqrkpyxvnbl0f25y"; depends=[alphahull pracma rgl Rvcg]; }; molic = derive2 { name="molic"; version="2.0.3"; sha256="1qgb63wl5726mypv0f07wcf3aznl93vh045ghx66hiqj3kzfir2b"; depends=[doParallel ess foreach ggplot2 ggridges Rcpp]; }; molnet = derive2 { name="molnet"; version="0.1.0"; sha256="1ha1jyh3mmbv2zgr2zrrjmslwd1gyy04hvqjk4d3ap2kna35wlgk"; depends=[dplyr igraph magrittr readr Rfast rlang stringr tibble tidyr WGCNA]; }; - mombf = derive2 { name="mombf"; version="3.1.4"; sha256="08ppgryb6wgnl333dsm1schpw9gzjcq0a70h43k1f7s4m6r6549i"; depends=[glmnet mclust mgcv mvtnorm ncvreg pracma Rcpp RcppArmadillo sgd survival]; }; + mombf = derive2 { name="mombf"; version="3.2.0"; sha256="1a20bx37fpvyaal7ld279grym1fjciqsh03qxl6mkdiz6lxq4as3"; depends=[glmnet mclust mgcv mvtnorm ncvreg pracma Rcpp RcppArmadillo sgd survival]; }; momentchi2 = derive2 { name="momentchi2"; version="0.1.5"; sha256="1fv0jmwws4mkl9dsaybfpj29ncvqx2idsijgwz2qjblcg309a6k9"; depends=[]; }; momentfit = derive2 { name="momentfit"; version="0.3"; sha256="0v6s6zpbz3sgna9fyjiinqmsyx4m1cd53rlkws9q2fscvwgfxjv7"; depends=[sandwich]; }; moments = derive2 { name="moments"; version="0.14.1"; sha256="0r6qf3i1rzh2822bx1p0h8mh91gsbgg6asl2rzh2l4ys094bilif"; depends=[]; }; @@ -12630,7 +12705,7 @@ in with self; { monaco = derive2 { name="monaco"; version="0.2.2"; sha256="109m9rvy39bp7j3jj8y6qdr4dran0qqvcx267mvil9c8ipxr89ms"; depends=[htmltools htmlwidgets rstudioapi shiny]; }; monashtipr = derive2 { name="monashtipr"; version="0.1.0"; sha256="050xa9ghhf5xy76vndry7rhqn3hn0lhz6wjwz9vxk6mcfy5j2wq5"; depends=[glue httr lifecycle magrittr purrr rlang rvest xml2]; }; mondate = derive2 { name="mondate"; version="0.10.02"; sha256="18nsqldj1vvv882nh2dyilqvz1jbhqkz3q69cpjq1xfcj0z88qxz"; depends=[]; }; - mongolite = derive2 { name="mongolite"; version="2.6.2"; sha256="0xk49lsn8q9wm14zld1kmy0r4y7fzgj2av6sid9i43y7lr64dckg"; depends=[jsonlite mime openssl]; }; + mongolite = derive2 { name="mongolite"; version="2.7.0"; sha256="1n4mrzimk7i3jgdp0yxgs02ki76v5c8cnnfqy5zrxjrhgvhz4vq0"; depends=[jsonlite mime openssl]; }; mongopipe = derive2 { name="mongopipe"; version="0.1.1"; sha256="081l6d1kwh30wq5kwz9dd2a9221x9139x1xbvfiqixwv0g9sjjy0"; depends=[jsonlite magrittr rlang]; }; monitoR = derive2 { name="monitoR"; version="1.0.7"; sha256="1h1g0m1j13mz37xxwck4s7a0bfqvi0nrzfw60j7bkzaah8zxcc9n"; depends=[tuneR]; }; monmlp = derive2 { name="monmlp"; version="1.1.5"; sha256="19cx60csm8mnf6ksg64vlhi8wi1c7bmv9l55y9zmaljblr0kmzxf"; depends=[optimx]; }; @@ -12662,11 +12737,11 @@ in with self; { mosaicCore = derive2 { name="mosaicCore"; version="0.9.2.1"; sha256="1yns15yxr6215xf9qsxfvl24a9zvh1chw49n31dql7fy1zr1dkmp"; depends=[dplyr MASS rlang tidyr]; }; mosaicData = derive2 { name="mosaicData"; version="0.20.3"; sha256="1s97yq24z7yhzmx0dpspfadpd8hndyhn7aiw0nslwrhvilhwa409"; depends=[]; }; mosaicModel = derive2 { name="mosaicModel"; version="0.3.0"; sha256="1gx4rzh0h922gyb50vz6q5vqqp5ry5hf2mq95948q2gcady91k5w"; depends=[caret dplyr ggformula ggplot2 knitr lazyeval MASS mosaicCore testthat tibble tidyr tidyverse]; }; - mosmafs = derive2 { name="mosmafs"; version="0.1.2"; sha256="04syr5qr91hyv1m5hfrjsriq0qgidaln06m7f3jgc1qyrni930rw"; depends=[BBmisc checkmate ecr MASS mlr mlrCPO parallelMap ParamHelpers smoof]; }; + mosmafs = derive2 { name="mosmafs"; version="0.1.2-1"; sha256="0xv9gf85d2fy9xdiik2dqd44xygsr6yr8fvmqkak1bpxnrkkb4hl"; depends=[BBmisc checkmate ecr MASS mlr mlrCPO parallelMap ParamHelpers smoof]; }; mosqcontrol = derive2 { name="mosqcontrol"; version="0.1.0"; sha256="199rkfisagr4kfx358f8yrbls00fng0kq8siyrbfwwf8qrba9fla"; depends=[assertthat magrittr NlcOptim nloptr pracma sfsmisc]; }; mosum = derive2 { name="mosum"; version="1.2.7"; sha256="1zixjf3s381d44s63qzz4hpx4cd2d3rgzvzgg75gpzfkvxnf5f8c"; depends=[plot3D RColorBrewer Rcpp]; }; motif = derive2 { name="motif"; version="0.5.2"; sha256="15jdx822iskn73b6pzcxvawkyn45dp5vqwk78g80fackn6vf3ry5"; depends=[comat philentropy Rcpp RcppArmadillo sf stars tibble]; }; - motifcluster = derive2 { name="motifcluster"; version="0.2.2"; sha256="011mm601z7l9114z1b8p05pcmaya28iqnbawbbgnr16y73ar1hpj"; depends=[igraph Matrix RSpectra]; }; + motifcluster = derive2 { name="motifcluster"; version="0.2.3"; sha256="1ynfjz9di1f1cm6bmx81a8mzkjkhclk21mx8b6css953dih06ngb"; depends=[igraph Matrix RSpectra]; }; 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]; }; @@ -12681,7 +12756,7 @@ in with self; { movecost = derive2 { name="movecost"; version="1.8"; sha256="0cd13w8lpzprwry12q2zq6s79v339dnh21lx1ivmkyd6va864mid"; depends=[chron elevatr gdistance leastcostpath maptools raster rgdal rgeos sp spatstat_geom terra]; }; mp = derive2 { name="mp"; version="0.4.1"; sha256="0awvwqwb25q47j14b450k1k5mh2yzwhn7gizjv5j7lyiamk30iwq"; depends=[Rcpp RcppArmadillo]; }; mpath = derive2 { name="mpath"; version="0.4-2.22"; sha256="0i4vyli3sr1lzrj0ayzsq55cpsv0xrwn216lgzmfyjr5n8r9aw7r"; depends=[bst doParallel foreach glmnet MASS numDeriv pamr pscl WeightSVM]; }; - mpathsenser = derive2 { name="mpathsenser"; version="1.1.0"; sha256="13l64fkvbhgsi1p1fjwybgagxhnwcrkgy26z4bpjfc3xhc7mjnww"; depends=[DBI dbplyr dplyr furrr future jsonlite lubridate magrittr purrr rjson rlang RSQLite tibble tidyr]; }; + mpathsenser = derive2 { name="mpathsenser"; version="1.1.2"; sha256="1ykaxkidkihqsv2mrb67gy1xmpsnr0byd9gng0d30m8wc5f827gk"; depends=[DBI dbplyr dplyr furrr jsonlite lifecycle lubridate magrittr purrr rlang RSQLite tibble tidyr]; }; mplot = derive2 { name="mplot"; version="1.0.6"; sha256="15cmwk4lphxy5p3azy9lwhij76127h9g4g1j1sv59mbqvrqid0sk"; depends=[bestglm doParallel doRNG dplyr foreach ggplot2 glmnet googleVis leaps magrittr plyr reshape2 scales shiny shinydashboard tidyr]; }; mpm = derive2 { name="mpm"; version="1.0-23"; sha256="1jpv2ddmw7aarqbbyfys1yb840arw33319wnny3v2hk84hldmayj"; depends=[KernSmooth MASS]; }; mpmcorrelogram = derive2 { name="mpmcorrelogram"; version="0.1-4"; sha256="0gv9xswrfvndcjal0csab1w2cnl4rg8pznyxbz84b0qr95jg81ag"; depends=[vegan]; }; @@ -12700,20 +12775,19 @@ 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.5"; sha256="1zf4cf5zbw2wm4da7icwkdp0nb5aanjp578h26lsw7ac3nvmzpyd"; depends=[]; }; + mrbin = derive2 { name="mrbin"; version="1.7.1"; sha256="0k0jhssacy19l45pcypfg3g1cw9dz6fpf3dkgihx7pldyw4zfh5g"; depends=[]; }; mrbsizeR = derive2 { name="mrbsizeR"; version="1.2.1.1"; sha256="0v06sd5sh7ghlr8lgrv6l4glmv7chj3951pw4ssxrly4hz2rh6i0"; depends=[fields maps Rcpp]; }; - mrds = derive2 { name="mrds"; version="2.2.7"; sha256="18cl5w3f7pwj74fbfa69qs06qs7fz7gnchfncv5mw7nxn17507g0"; depends=[mgcv numDeriv optimx Rsolnp]; }; + mrds = derive2 { name="mrds"; version="2.2.8"; sha256="0pm3vn0cixkdafa789sfscf2zl3kxn192jp4h792n47k0w1add6x"; depends=[mgcv numDeriv optimx Rsolnp]; }; mreg = derive2 { name="mreg"; version="1.2.0"; sha256="1gz19d4l0q3xd1w72ip6mhv20w8fgaaczkkdv40bflwabpxdy420"; depends=[]; }; mregions = derive2 { name="mregions"; version="0.1.8"; sha256="16z610j01nf9k1hamsxydk2j6qdqpbyj29b5hm9r3fi8fm3smhd6"; depends=[data_table geojson geojsonio geojsonsf httr jsonlite rappdirs sf sp tibble xml2]; }; mrf = derive2 { name="mrf"; version="0.1.6"; sha256="0jqpx0ng0l8f7y941awpi82yqbv8ir0sixiw6zdkqpj82d9a7j9m"; depends=[DEoptim forecast limSolve monmlp nnfor]; }; mrf2d = derive2 { name="mrf2d"; version="1.0"; sha256="0fmxn178bkw77iz51bnjxala9xmhs44km57m8msvlw0k69sddyif"; depends=[dplyr ggplot2 Rcpp RcppArmadillo Rdpack tidyr]; }; mrfDepth = derive2 { name="mrfDepth"; version="1.0.13"; sha256="177331j30n707mcl1ghxjc53xjs9qsal15kccc71b0rabkjdq2wv"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; }; - mrfse = derive2 { name="mrfse"; version="0.4"; sha256="1kwnpmkrgc2ca90nszj4d1p04prv7rjd03qvk1bb2sclkfbhz4yp"; depends=[gtools Rcpp Rfast]; }; + mrfse = derive2 { name="mrfse"; version="0.4.1"; sha256="1kk6j7x4z4vaiwnd2mv2brzd1z7g4kyxxylxf31971i6klnsn4zb"; depends=[gtools Rcpp Rfast]; }; mrgsim_parallel = derive2 { name="mrgsim.parallel"; version="0.2.1"; sha256="074c47fkwy5n9x89dswi3ybnck1f0rlbyad6by32jyslw8bz76ln"; depends=[callr dplyr fst future future_apply mrgsolve]; }; mrgsim_sa = derive2 { name="mrgsim.sa"; version="0.1.0"; sha256="199m6ygwnw6fbld5fqsw1j5jz9x6l1ayrpsc0r51q4fr7nmmpfj2"; depends=[assertthat dplyr ggplot2 mrgsolve patchwork purrr rlang tibble tidyr tidyselect withr]; }; mrgsolve = derive2 { name="mrgsolve"; version="1.0.6"; sha256="0hxwqi4gahsissjsyyxddxk02a81hf2wb81jwfd53pc7x9pp41nh"; 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]; }; mrregression = derive2 { name="mrregression"; version="1.0.0"; sha256="1yy2sjs0b67bqyggzypp2g7x4fdmi86jx2nbcp2n7hcf9cdacysi"; depends=[data_table Rcpp]; }; ms_sev = derive2 { name="ms.sev"; version="1.0.4"; sha256="1sr2rgiskgwjhwif70qj6ga8i8kg4bh342hff66b2a54rxrchmw5"; depends=[]; }; @@ -12729,7 +12803,7 @@ in with self; { msaenet = derive2 { name="msaenet"; version="3.1"; sha256="067p97z54dwhxy0w4ihi8dddcbvglh8ssynbh29fl9jyxfwjr1ms"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; }; msamp = derive2 { name="msamp"; version="1.0.0"; sha256="0r5m50x8l5dijy7nzcbxl3ipfnkgvaa9r580b6b71ny3madsc8rh"; depends=[]; }; msce = derive2 { name="msce"; version="1.0.1"; sha256="1x9ivc2bjp07pdn15p3qds00m1m00amcg2dfcdjsgbkx9x1kkfab"; depends=[Rcpp RcppParallel]; }; - mschart = derive2 { name="mschart"; version="0.3.1"; sha256="1ryl221hl0ydpmfanhm3hk063kxvvzqfgwwz3ra37dgy1yamn1kq"; depends=[cellranger data_table htmltools officer writexl xml2]; }; + mschart = derive2 { name="mschart"; version="0.4.0"; sha256="0znylmkzqsk9qw640bhqnn4np748s9q1zcwgyavb3b808nfcv6ri"; depends=[cellranger data_table htmltools officer writexl xml2]; }; mscp = derive2 { name="mscp"; version="1.0"; sha256="18cy7nnvhpjl874bawsh8j1gry9wx134q6gk6j03s6546bzy8lgc"; depends=[]; }; mscstexta4r = derive2 { name="mscstexta4r"; version="0.1.2"; sha256="1hjcasmn33xav2mw085lcndv0432l6sz327aikf63491wj1sj7mw"; depends=[dplyr httr jsonlite pander stringi]; }; mscstts = derive2 { name="mscstts"; version="0.6.3"; sha256="1yqb9p7404yh9bjjjpy83k7yssvvpn3v9vddy47pgwjv4hbpbq19"; depends=[httr jsonlite tuneR]; }; @@ -12747,13 +12821,13 @@ in with self; { msir = derive2 { name="msir"; version="1.3.3"; sha256="1wm83m3cqd6llxb9p2jwim0wb81v84pgdmgcznygzaaq6kbn3n84"; depends=[mclust]; }; mskcc_oncotree = derive2 { name="mskcc.oncotree"; version="0.1.1"; sha256="1n79k3rp84r8j6paqshvingykszsw995fm7yxf1wl1jfp4hiyl4n"; depends=[dplyr glue httr2 magrittr memoise purrr readr rlang tibble tidyjson tidyr]; }; msltrend = derive2 { name="msltrend"; version="1.0"; sha256="1rwy77ijf3hzq2zp47cijwvqcq34rdlfxwhrd9l56bvmlmzr1dqx"; depends=[changepoint forecast plyr Rssa tseries zoo]; }; - msm = derive2 { name="msm"; version="1.6.9"; sha256="08vhazswyxr3y1zb9y60mbg3bappzlizxml8s08p65mh82xxkz5f"; depends=[expm mvtnorm survival]; }; + msm = derive2 { name="msm"; version="1.7"; sha256="1c0dvmrjxx551n207fq4yjr56rdchaf1zzldxx4rx4b6g7jgi2bz"; depends=[expm mvtnorm survival]; }; msma = derive2 { name="msma"; version="2.2"; sha256="1p6lm07wlwyymhj2bpwn9kvxf6q2c6rf9554swnm8gkm1z82324f"; depends=[]; }; msme = derive2 { name="msme"; version="0.5.3"; sha256="0mq57zdas1s87nblnvbif9lisgahfhvmabglvp9imr1mvpwybpbh"; depends=[lattice MASS]; }; msmtools = derive2 { name="msmtools"; version="2.0.1"; sha256="09an9bpr0gnqbglb8kj4x8bb7f5dm2lc3d01wx6dh7j1d99vrrdk"; depends=[data_table ggplot2 msm patchwork scales survival]; }; msos = derive2 { name="msos"; version="1.2.0"; sha256="1fg9q6269cckn4g6isv22k22mzglxhjxjg5npqsikmisribmr9kb"; depends=[mclust tree]; }; 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]; }; + mstDIF = derive2 { name="mstDIF"; version="0.1.7"; sha256="0krb3g1njm97cnjjhc2p5r8djgnzarn5gm65x76h1k43qxfb5iw1"; 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]; }; @@ -12765,13 +12839,14 @@ in with self; { mtb = derive2 { name="mtb"; version="0.1.8"; sha256="1xlm3s34y9g4g6nqzm7zwl08j6587qnzmr5xx0fwgiv5mr45jdz4"; depends=[data_table ggplot2 htmltools labeling scales]; }; mtdesign = derive2 { name="mtdesign"; version="0.1.0"; sha256="0fnyw6zcls12b6mmr9pxj3b9vs8pv1ik3h671kmxfgv1k6dwn6b9"; depends=[BH dplyr ggplot2 logger magrittr Rcpp rlang tibble tidyr]; }; mthapower = derive2 { name="mthapower"; version="0.1.1"; sha256="0g6dn0qn7z6qc1gbzspy1n7b803427bc9fv5yqk7j8i1is1p8h94"; depends=[]; }; + mtlgmm = derive2 { name="mtlgmm"; version="0.1.0"; sha256="0q2nl9sk03w0x8khsgwycp1c66nbgrf88hdp6gys7fmvgmaz3yj9"; depends=[caret doParallel foreach mclust]; }; mtsdi = derive2 { name="mtsdi"; version="0.3.5"; sha256="0j4hl690n8x7zfpygw5qv0m0jyl8dnz1d3r4314w06h7c578n2kp"; depends=[gam]; }; muHVT = derive2 { name="muHVT"; version="2.0.0"; sha256="0zcmm2vjw1wak4xzfw3ikd94gd6knzm795183pl4vma0q0ll5bd2"; depends=[cluster conf_design deldir dplyr ggplot2 gtools Hmisc magrittr MASS patchwork plyr polyclip purrr reshape2 rgeos scales sp splancs tidyr tidyverse]; }; muRL = derive2 { name="muRL"; version="0.1-12"; sha256="1nzi0nyspva5ach0q0rvlljlfgmac8vxxggkwdzz1pr1cxhkprwd"; depends=[maps stringr]; }; muRty = derive2 { name="muRty"; version="0.3.1"; sha256="0v7wfb6347h4inf9jcbp6n4xfsqjzgj0i5sdfgqmbw0d5pcpnvhz"; depends=[clue lpSolve]; }; muckrock = derive2 { name="muckrock"; version="0.1.0"; sha256="16lm1iiaaws7clby7qgblqdiznw6abjjgvsxlfpza7l2xdvplxpg"; depends=[]; }; mudata2 = derive2 { name="mudata2"; version="1.1.2"; sha256="0c8x39m7cy9l2r3ywbircgp79g7lmd37m2500z3icmkx6x6k6393"; depends=[dplyr fs ggplot2 glue jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect withr]; }; - mudens = derive2 { name="mudens"; version="1.3.2"; sha256="18kv8xfmmmk0dyw64lwrlrks0gana0s7gaff6nxs59ndgb1pj6yp"; depends=[Rcpp survival]; }; + mudfold = derive2 { name="mudfold"; version="1.1.21"; sha256="0bz0k490pda2a6lx9mmnpvnp6vrlyjd89bn05dsvqgbdfnyfs272"; depends=[boot broom dplyr ggplot2 glmnet mgcv reshape2 zoo]; }; mueRelativeRisk = derive2 { name="mueRelativeRisk"; version="0.1.1"; sha256="16yclfmgxc32pv00vyb9fjdh4syax8ynizr8a29haiq22q5fqclh"; depends=[]; }; muhaz = derive2 { name="muhaz"; version="1.2.6.4"; sha256="1ddy8ayr4rdhzcipdvxdwd7z5g9hfp0ppacl7xf6f2612cn1185g"; depends=[survival]; }; muir = derive2 { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; }; @@ -12796,7 +12871,7 @@ in with self; { multiUS = derive2 { name="multiUS"; version="1.1.0"; sha256="077qyqfbp2r5ah08biiswn4jg03h2jcvi0gij6h5wip16vr0d0yx"; depends=[gplots MASS]; }; multibiplotGUI = derive2 { name="multibiplotGUI"; version="1.1"; sha256="08vmdhrn6qqq57q818cqnmsw7qaa4gnw3m5myzp4dc85njgzzi02"; depends=[cluster dendroextras MASS Matrix plotrix rgl shapes tcltk2 tkrplot]; }; multiblock = derive2 { name="multiblock"; version="0.8.3"; sha256="0n1pyi3swq0hbabd2x5jp3jlnfjlbvpk09p0as61d34fwq97bs0b"; depends=[ade4 car FactoMineR geigen lme4 MASS mixlm plotrix pls plsVarSel pracma progress r_jive Rcpp RcppEigen RegularizedSCA RGCCA RSpectra SSBtools]; }; - multibridge = derive2 { name="multibridge"; version="1.1.0"; sha256="17xcngn6q2wgaxcspfigcvzp6zh2bq8vhmfb3gn9ryq1rf2fchfv"; depends=[Brobdingnag coda magrittr mvtnorm progress purrr Rcpp Rdpack stringr]; }; + multibridge = derive2 { name="multibridge"; version="1.2.0"; sha256="0akl9i3fhgd0pqsvgp7cv2l2l84cqc3cc4lambnjmwdyh7x4qcvd"; depends=[Brobdingnag coda magrittr mvtnorm progress purrr Rcpp Rdpack stringr]; }; multicastR = derive2 { name="multicastR"; version="2.0.0"; sha256="0zxv3kxk8gh2fgllzzg7k625n3p4q5pr465ja0mhvs48m4n262l9"; depends=[]; }; multichull = derive2 { name="multichull"; version="1.0.0"; sha256="1gc7kxxlbanc6rmmbf6h85jf7kj0a78h23m5vwwqqliv018qsv2n"; depends=[igraph plotly shiny shinythemes]; }; multiclassPairs = derive2 { name="multiclassPairs"; version="0.4.3"; sha256="0mz15dl3fiznbnfjjmnhr9z6qh43mwafnkisd7svc3cb0lrbbjci"; depends=[Boruta caret dunn_test e1071 ranger rdist]; }; @@ -12822,11 +12897,12 @@ in with self; { multimark = derive2 { name="multimark"; version="2.1.5"; sha256="09i3djdpwwxjjr2lcb3ghgz09v4gplh8bd2yr70q032hvs7qb9c3"; 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]; }; - multinet = derive2 { name="multinet"; version="4.1"; sha256="0msmm43x2z0iz4zkmpiksv89035l61ivdrmf2zjinskb09adswzy"; depends=[igraph RColorBrewer Rcpp]; }; + multiness = derive2 { name="multiness"; version="1.0.2"; sha256="08bgjs2mrmsdvha10dr74262yk5ghyflvs8pqbl7bc8aws7lv8f5"; depends=[glmnet Matrix RSpectra]; }; + multinet = derive2 { name="multinet"; version="4.1.1"; sha256="1sfnj8nmfx741xkrds0xbn62ky383l8sir5apv9sbxk3ps108ha2"; depends=[igraph RColorBrewer Rcpp]; }; multinets = derive2 { name="multinets"; version="0.2.2"; sha256="1i5jsq1xy0g0l5d1z3hz4gj6inj4rhd6lf2s5xzd5k8ccp5aba8c"; depends=[igraph Rcpp]; }; multinma = derive2 { name="multinma"; version="0.5.0"; sha256="0s7wybp56f102khxjvlmd55rm1yc728cgp948376vkj0lz4hnsvr"; 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]; }; multinomialLogitMix = derive2 { name="multinomialLogitMix"; version="1.0"; sha256="0ckw4gn428awka282cx8ddk9p62yp5za0d8hj1qjnkkdphaqzfil"; depends=[coda doParallel foreach ggplot2 label_switching MASS matrixStats mvtnorm RColorBrewer Rcpp RcppArmadillo]; }; - multinomineq = derive2 { name="multinomineq"; version="0.2.4"; sha256="1xxndf4jrh6ds6bpdv833bj64xldfwyr5f3sdd859hwwg9wkdhnb"; depends=[coda quadprog Rcpp RcppArmadillo RcppProgress RcppXPtrUtils Rglpk]; }; + multinomineq = derive2 { name="multinomineq"; version="0.2.5"; sha256="1lm5b3c8z6dqyipr9rwqsh0far4a9v9dfxdvrjlg0iyf723rr39k"; depends=[coda quadprog Rcpp RcppArmadillo RcppProgress RcppXPtrUtils Rglpk]; }; multiocc = derive2 { name="multiocc"; version="0.1.0"; sha256="1043cckddrr1sgnxd3fmj9kcgglmgw52lckxbzc91g6s7p9h7wgx"; depends=[fields interp MASS MCMCpack tmvtnorm truncnorm]; }; 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]; }; @@ -12845,7 +12921,7 @@ in with self; { 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.6.1"; sha256="0l3h4pg450brw27n0jhc3k5fsl57kczxsmzzs3ffj9lwrpnvvn7z"; depends=[berryFunctions collections dplyr evaluate formatR future_apply knitr magrittr purrr R6 rlang rstudioapi tibble tidyr tidyselect]; }; - multiview = derive2 { name="multiview"; version="0.4"; sha256="0yw4sn79rkw4sxpz25l1l153kbgm6wzg1cz51n38dm73y34k3y3y"; depends=[glmnet Matrix RColorBrewer Rcpp RcppEigen survival]; }; + multiview = derive2 { name="multiview"; version="0.7"; sha256="135krs4cz8d45jy6rqddq12jp8z1c2q3caw04h25839xxzamxcdl"; depends=[glmnet Matrix RColorBrewer Rcpp RcppEigen survival]; }; multiwave = derive2 { name="multiwave"; version="1.4"; sha256="19581kjcyw86cnzhvhhpn997fixm811ggmvb8jkb3dsxg8vp60jc"; depends=[]; }; multiway = derive2 { name="multiway"; version="1.0-6"; sha256="1y9cykarr2aysdrnyab5aklsrc5id5b58881q03lcb5kc385v3gv"; depends=[CMLS]; }; multiwayvcov = derive2 { name="multiwayvcov"; version="1.2.3"; sha256="1znsmca16jac8s5z0j64cck27pvf88anm1mfblabqchqqcz1ykfc"; depends=[boot sandwich]; }; @@ -12866,6 +12942,7 @@ in with self; { mvGPS = derive2 { name="mvGPS"; version="1.2.2"; sha256="1aanrv84c012ijyqql0pw2qlckrpv3wmfv16yhr465xb3rkzz4vj"; depends=[CBPS cobalt gbm geometry MASS matrixNormal Rdpack sp WeightIt]; }; mvLSW = derive2 { name="mvLSW"; version="1.2.5"; sha256="0qg6bn0din22fns0cb4m0dfzgg0slrkfimpx7fslnvncfmx36h66"; depends=[fields wavethresh xts zoo]; }; mvLSWimpute = derive2 { name="mvLSWimpute"; version="0.1.1"; sha256="1caf843cf139f3fiy3nsq6g83xfz70c20zlfwk4pg5jv4rh0jiyg"; depends=[binhf imputeTS mvLSW wavethresh xts zoo]; }; + mvMAPIT = derive2 { name="mvMAPIT"; version="2.0.0"; sha256="0r4pg8m142l1qjm4hggrj0f9g3y927rbva8mj2q16bzdh6fbxbzd"; depends=[checkmate CompQuadForm dplyr foreach harmonicmeanp logging mvtnorm Rcpp RcppArmadillo RcppParallel RcppSpdlog testthat tidyr]; }; mvMISE = derive2 { name="mvMISE"; version="1.0"; sha256="0lnc5g3ksl5cvwylh8p8baxyvq3z32a2i337q7lhg00j031ccy5c"; depends=[lme4 MASS]; }; mvMORPH = derive2 { name="mvMORPH"; version="1.1.6"; sha256="07hnpbc108x693wwx976ixi08q1n0siyz4ccv7024syrzf70ggxc"; depends=[ape corpcor glassoFast pbmcapply phytools spam subplex]; }; mvMonitoring = derive2 { name="mvMonitoring"; version="0.2.0"; sha256="0nfkcbi29fprz3mb7rrnn2rvixi4wmfmdsfsw219hj21vafk1bqz"; depends=[dplyr lazyeval plyr rlang robustbase xts zoo]; }; @@ -12919,12 +12996,12 @@ in with self; { nLTT = derive2 { name="nLTT"; version="1.4.8"; sha256="10njdpz0dl3ckj4ph6hl4ppj1dyj8chrlmq6cl286ayqqqzj8qap"; 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]; }; + naaccr = derive2 { name="naaccr"; version="2.0.2"; sha256="1j30fb7qvxzpx0y7hq8sbqvszwjfnc4r2g0j8885fmn2wxvcgzdx"; depends=[data_table stringi XML]; }; nabor = derive2 { name="nabor"; version="0.5.0"; sha256="1nj39cdfwrmhgsi3cq8imxv3n6xzc1v6dzdb2cf2hybjk368v4s7"; depends=[BH Rcpp RcppEigen]; }; - nadiv = derive2 { name="nadiv"; version="2.17.1"; sha256="1v1fbnps55pbaz0q88y8vrxjd503krymc7f8i0xx3yxgdxl56x8q"; depends=[Matrix]; }; + nadiv = derive2 { name="nadiv"; version="2.17.2"; sha256="0v2jw0md4bjn15g6slx2bx7ipr3r0s1zv3frjach3rd7b1bs9z7k"; depends=[Matrix]; }; naflex = derive2 { name="naflex"; version="0.1.0"; sha256="18fqfhm6p38z4h8dznac5v8yz53n86cw2x6ma29kvcbvdp4r3yd2"; depends=[]; }; - naijR = derive2 { name="naijR"; version="0.5.0"; sha256="1z57r70iv3bbdc6v00wnfpcq7bjqgpcsqhnrswqbngp5xl83xz1w"; depends=[lifecycle magrittr mapdata maps RColorBrewer rgdal rlang stringi]; }; - naive = derive2 { name="naive"; version="1.2.0"; sha256="0kgj9dixrdmyl7vgc9a9kxmz751kgrh7rzy3sfs7ihnxdvd2yyp4"; depends=[entropy fANCOVA fastDummies ggplot2 greybox imputeTS lubridate modeest moments philentropy purrr readr Rfast scales tictoc]; }; + naijR = derive2 { name="naijR"; version="0.5.1"; sha256="04wcdq0rw3may5hl7md31yiim730y6w5ly80bcdgjli9376qqkil"; depends=[lifecycle magrittr mapdata maps RColorBrewer rgdal rlang stringi]; }; + naive = derive2 { name="naive"; version="1.2.1"; sha256="10364ammzwhixz3s17f8vdag3zac0pwvcziy9z0ji19knyhdigmb"; depends=[entropy fANCOVA fastDummies ggplot2 greybox imputeTS lubridate modeest moments philentropy purrr readr Rfast scales tictoc]; }; 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]; }; @@ -12933,18 +13010,17 @@ in with self; { namedropR = derive2 { name="namedropR"; version="2.4.1"; sha256="06lg381imi8xnm6jlsxfffjyhzban6z29zwkw8bamglnk0frvzza"; depends=[bib2df dplyr htmltools lubridate qrcode R_utils readr stringr webshot]; }; namer = derive2 { name="namer"; version="0.1.6"; sha256="1h3nfxdhvjjiki1rqjpmiih9vj1hz9j8m5wkazskz8asza23898i"; depends=[cli dplyr fs glue magrittr purrr rstudioapi tibble]; }; namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; }; - nametagger = derive2 { name="nametagger"; version="0.1.1"; sha256="17g8y7x83p1pkgj5hgildndchxsp70va25h93p7r1yjllm56zqv8"; depends=[Rcpp]; }; + nametagger = derive2 { name="nametagger"; version="0.1.2"; sha256="1s3rsplia53cxqpxxkb7l7p56bkgvl5jcjcxgf1a8qaxxf5qngi5"; 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.6.0"; sha256="05naxc45y05w1x3qly3jqq8fs93z77vj950ggnlmvksp8nks6mdz"; depends=[]; }; - nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; }; + nanonext = derive2 { name="nanonext"; version="0.7.2"; sha256="0xnvnmph3wzdlw4hnwa73qiqdn1xyg12q21bkkk4r17cjilvjbz5"; depends=[]; }; nanostringr = derive2 { name="nanostringr"; version="0.4.0"; sha256="0df46pq93696xgdjky5qf5lk8caz48mb3a3fbrlda8z1rpv2i8bb"; depends=[assertthat ccaPP dplyr epiR forcats magrittr purrr rlang tibble tidyr]; }; nanotime = derive2 { name="nanotime"; version="0.3.7"; sha256="05fbdhbax6k1glidmgl0zjc7y7v1ppbpz4422q3jmxmfack7hwd7"; depends=[bit64 Rcpp RcppCCTZ RcppDate zoo]; }; naptanr = derive2 { name="naptanr"; version="1.0.1"; sha256="074pxm1c8k24b3gbn3ibbwpsixbmjq3wx9agxg3ljflny2s6hhqp"; depends=[data_table httr]; }; naptime = derive2 { name="naptime"; version="1.3.0"; sha256="1cadfv5sdsmz61kf96hf2gbnghf24q40g5c3h9b8prvkxslap691"; depends=[lubridate]; }; nardl = derive2 { name="nardl"; version="0.1.6"; sha256="1vf8im4zs4j0v3k617aaskq9n2fg8sn3j5bllcbz2ircrpijr21m"; depends=[car Formula gtools MASS strucchange tseries]; }; narray = derive2 { name="narray"; version="0.5.1"; sha256="0vpx1fl24ba1c5x3bw0n8bx5yp77gsqybaxgbq6mj6by29ggq73l"; depends=[progress Rcpp stringr]; }; - naryn = derive2 { name="naryn"; version="2.6.9"; sha256="1ipgayb0fcnbaqd9jzkf1lnpvb2jcxjiz2yvzwk9a26iz88ja6pc"; depends=[dplyr glue lifecycle magrittr purrr stringr tidyr]; }; + naryn = derive2 { name="naryn"; version="2.6.12"; sha256="0lz0vcgp0llwr94234aqa7na0rl1120db8mga5wryp3hhs8w7qc1"; depends=[dplyr glue lifecycle magrittr purrr stringr tidyr]; }; nasadata = derive2 { name="nasadata"; version="0.9.0"; sha256="0y88qdy8c1y0prsajxic5vdqfixv9knjsbhw3vbfac8wv3a69bjl"; depends=[dplyr jsonlite plyr png]; }; nasapower = derive2 { name="nasapower"; version="4.0.8"; sha256="1f3hpbfkfqvfv23fajmica1wql8qjsr55m3mmzvmcwpz7hvlky0i"; depends=[crul jsonlite lubridate readr tibble]; }; nasaweather = derive2 { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; }; @@ -12960,7 +13036,7 @@ in with self; { naturaList = derive2 { name="naturaList"; version="0.5.0"; sha256="15kpv73a5bcjhnqp2q6fbw3wdwr3f1zijvaj60hybxv652p8b71f"; 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.2"; sha256="05gmi2i15gfz2sjkxrfdypih7wzqnw439l8glkc1zci0clk0qwkw"; depends=[cli dplyr pillar purrr rlang tidyselect vctrs]; }; + navigatr = derive2 { name="navigatr"; version="0.2.0"; sha256="0gx8rv56j1jc0jgsbbvfham2cb80419sghda1i9mz1b5i99igdk1"; depends=[cli lifecycle pillar purrr rlang stickyr 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]; }; @@ -12974,9 +13050,9 @@ in with self; { ncappc = derive2 { name="ncappc"; version="0.3.0"; sha256="0bf00iskrd3x43839bwn957mi3qvm2dhcmqa7hl1ib0gp2r1cnzx"; depends=[bookdown Cairo dplyr ggplot2 gridExtra gtable knitr lazyeval magrittr PopED purrr readr reshape2 rlang rmarkdown scales tibble tidyr xtable]; }; ncar = derive2 { name="ncar"; version="0.4.5"; sha256="1ymxb3av7vd7vljr8h3ga6v01z6nf5j9mc095z0hi31d1khwrd02"; depends=[NonCompart rtf]; }; ncbit = derive2 { name="ncbit"; version="2013.03.29.1"; sha256="01352byijhwhcb7jji7bf5cm6v2yfz925f8wbivrx12x0c65fzw4"; depends=[]; }; - ncdf4 = derive2 { name="ncdf4"; version="1.19"; sha256="0qzvin2fjzcb7h2knlnw14s6043pwi1nm7yf6p27ax7w269173fb"; depends=[]; }; + ncdf4 = derive2 { name="ncdf4"; version="1.20"; sha256="1kpi5xygx1nj8ybxrn9z0jxi3lbcibdvc7mjgyvm6f9plwjlxjvq"; depends=[]; }; ncdf4_helpers = derive2 { name="ncdf4.helpers"; version="0.3-6"; sha256="0qnm41rbxb6v7aqh1mdkjhcc2rhs4wg6wmrllldzd99mzz8slv1r"; depends=[abind ncdf4 PCICt]; }; - ncdfgeom = derive2 { name="ncdfgeom"; version="1.1.3"; sha256="0218cv2jbb9n6wli8zlvmmqkiys09ccpphk506m8xqahq7w8ric7"; depends=[dplyr ncmeta RNetCDF sf stars]; }; + ncdfgeom = derive2 { name="ncdfgeom"; version="1.1.4"; sha256="15sl701snp3pm5wjhiabvwfa0x0vdfzp8ks3b9j8vgc3vsj7dlid"; depends=[dplyr ncmeta RNetCDF sf stars]; }; ncdump = derive2 { name="ncdump"; version="0.0.3"; sha256="09g98mzpky32z41jf23ahzhyv34l34y1gqq99j2hl4pqlvvhxs9i"; depends=[dplyr ncdf4]; }; ncf = derive2 { name="ncf"; version="1.3-2"; sha256="1lqswih19g76aswnf6xygficzf7ri3yayqicifj8cqx8iwvrk91y"; depends=[]; }; ncmeta = derive2 { name="ncmeta"; version="0.3.5"; sha256="1w47dn04brqac98k5s8a88nh6d6qnkcilq3w4pfczbdff1rv2xlk"; depends=[dplyr rlang RNetCDF tibble tidyr]; }; @@ -12984,19 +13060,18 @@ in with self; { ncpen = derive2 { name="ncpen"; version="1.0.0"; sha256="0vl4cbrsifr5s1691gacmp0lk3aqyq0yfafafzv6g3zygi4igrsa"; depends=[Rcpp RcppArmadillo]; }; ncvreg = derive2 { name="ncvreg"; version="3.13.0"; sha256="04r7nf6516wi0bfxgk5rgbkw6qqa8aprsjivvgym19z9i6qaxanm"; depends=[]; }; nda = derive2 { name="nda"; version="0.1.6"; sha256="0pc0aiyx0lyyirgpd5g5syrnpm8pihsq0x1k0d7s05ibw5k9hq1g"; depends=[energy igraph leidenAlg Matrix psych visNetwork]; }; - ndi = derive2 { name="ndi"; version="0.1.2"; sha256="0h9asj7dgbl3kd3a3xvsi02jkh00wl80d17ankdw46yra9dwv9vh"; depends=[dplyr MASS Matrix psych sf stringr tidycensus tidyr]; }; + ndi = derive2 { name="ndi"; version="0.1.3"; sha256="0f24lfw9mzhdf2afjjzsh0bhlj2gwndry7pgd7i4s0497w26ycbl"; depends=[dplyr MASS Matrix psych sf stringr tidycensus tidyr]; }; ndjson = derive2 { name="ndjson"; version="0.9.0"; sha256="18j5bibranvbv84hvbsg6glmvhfancdsf2w6j99n3nw53bcgb12d"; depends=[data_table Rcpp tibble]; }; ndl = derive2 { name="ndl"; version="0.2.18"; sha256="0b235v6jf98rrqp5aqw3jkk7mq8dbqmhb758zbzza1mavh4n2k7s"; depends=[Hmisc MASS Rcpp]; }; - ndtv = derive2 { name="ndtv"; version="0.13.2"; sha256="0symd0rwzk8kcq7f0flbw3pnyigybgsypjaaq5b5p1pjm1dz0c8j"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; }; + ndtv = derive2 { name="ndtv"; version="0.13.3"; sha256="05kaqd7p77rfls0s1gqv74j3svh5xdvqni0jin5vxl8y900yc56j"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; }; 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.4"; sha256="0673lg8mihz8xwh12q12wfn19w8vvnjb7pnz4x3cn2xhkyzwhxq5"; depends=[data_table Rcpp]; }; - neatStats = derive2 { name="neatStats"; version="1.11.0"; sha256="1vrpnd7xgp96rikjx50rh1mc3n2j6k86g0ax322s5ljlymwdh6sp"; depends=[BayesFactor bayestestR car data_table Exact ez fBasics ggplot2 ggpubr logspline MBESS pROC viridis]; }; + neatStats = derive2 { name="neatStats"; version="1.13.3"; sha256="1fj042mwmmjza8giv0f2m7y11j8rnzrcmifyxrv4z9rfqddcvh2s"; 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=[]; }; negligible = derive2 { name="negligible"; version="0.1.2"; sha256="11x199xpsrydsy0iwyivhp43x79a4v6wfz60yd9l6a5vwpn26j2v"; depends=[DescTools dplyr fungible ggplot2 lavaan MBESS nptest rockchalk tidyr WRS2]; }; neighbours = derive2 { name="neighbours"; version="0.1-2"; sha256="0sz8xmghv71ry884nyxma9y7wiqx0n82f3v5iw13dlgzr6z66qcz"; depends=[]; }; @@ -13006,26 +13081,27 @@ in with self; { neo4jshell = derive2 { name="neo4jshell"; version="0.1.2"; sha256="0dkdg8ljyv7pi6zkpsq5akkl35vrhkr78xvc2ky99gwjsr0z77hf"; 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]; }; neonOS = derive2 { name="neonOS"; version="1.0.0"; sha256="11jgsf8c7rjfdbn9qljirzwvpnn4wckid4p4syx6py3dqjb4r19f"; depends=[curl data_table httr jsonlite]; }; - neonUtilities = derive2 { name="neonUtilities"; version="2.1.4"; sha256="1nx0d6r8ai3035rkk2s52q9kz1kg2w3cpcrqjk06f84wqd8cxyiv"; depends=[curl data_table downloader httr jsonlite pbapply R_utils stringr tidyr]; }; + neonUtilities = derive2 { name="neonUtilities"; version="2.2.0"; sha256="0azzi8qybxfkrz4wmn7z2420jkq9z5klyqqdbs18w5zpr3x30hyy"; depends=[curl data_table downloader httr jsonlite pbapply R_utils stringr tidyr]; }; neonstore = derive2 { name="neonstore"; version="0.4.4"; sha256="0fhjm6513kd4y3lry8dwcwk13ns92yk5h3san7ww2ahhdhy4hx9c"; depends=[DBI duckdb httr progress R_utils thor vroom zip]; }; nephro = derive2 { name="nephro"; version="1.3"; sha256="08gryzr53cd5gc8ks7v9jicgk4lxcwcr7zd8vzsqvy04sh3scw9i"; depends=[]; }; neptune = derive2 { name="neptune"; version="0.2.3"; sha256="04d5rdcvnik9rj58npvs5z1r6ngs9hzc24wzix64czcynkkvkad0"; depends=[ggplot2 htmlwidgets plotly reticulate rstudioapi this_path]; }; nesRdata = derive2 { name="nesRdata"; version="0.3.1"; sha256="1lxvg11g8nizfn8sghirq2749fs9i4w1wiaz3v1djqbkzqcqfrcj"; depends=[dataone dplyr purrr rappdirs readr]; }; - nestedcv = derive2 { name="nestedcv"; version="0.4.0"; sha256="160d1smwlf83m593n1jgx5qgzqzvj4zxqcxfwzdc1mx9gsng3mgq"; depends=[Boruta caret CORElearn data_table doParallel foreach ggplot2 glmnet hsstan matrixStats matrixTests pROC randomForest RcppEigen Rfast rlang SuperLearner]; }; - nestedmodels = derive2 { name="nestedmodels"; version="1.0.1"; sha256="1r0h520m98ys2bdam0gggzac7ij62f2i2s4d8v3y6p2jvz0kmkhd"; depends=[cli dplyr forcats generics glue lifecycle magrittr parsnip purrr recipes rlang rsample stringr tibble tidyr vctrs]; }; + nestedcv = derive2 { name="nestedcv"; version="0.4.4"; sha256="1zfdr42idrr7v76mkpvv58di8rqlw79c2k2pynfyaqxj3ac53dq0"; depends=[Boruta caret CORElearn data_table doParallel foreach ggplot2 glmnet hsstan matrixStats matrixTests pROC randomForest RcppEigen Rfast rlang SuperLearner]; }; + nestedmodels = derive2 { name="nestedmodels"; version="1.0.2"; sha256="065x6ggbn0naybbi5gjnyx2ryxg6062ya0fgj1k4sz3i2nrhjvwq"; depends=[cli dplyr forcats generics glue lifecycle magrittr parsnip purrr recipes rlang rsample stringr tibble tidyr vctrs]; }; nestfs = derive2 { name="nestfs"; version="1.0.2"; sha256="18w8bp02w7p1k0dm85523rhmsxww581ma4srvxbxq39kp8mfyabk"; depends=[dgof pROC]; }; nestr = derive2 { name="nestr"; version="0.1.2"; sha256="0qgd1sl6x5y70r3l4vf0qqynlrkdyq7mmpb8mwjn7f1hjnym1gaj"; depends=[magrittr rlang tidyselect vctrs]; }; net4pg = derive2 { name="net4pg"; version="0.1.1"; sha256="1a00bqskgl053wcwgmg7xsccybrq76bqaipdnf5zbm1dslir0jdv"; depends=[data_table graph magrittr Matrix]; }; netClust = derive2 { name="netClust"; version="1.0.1"; sha256="1h58ispdx8ddsnqrrmcxn2rbqb0hb89gpjg4p14mr7vhxw5c9zva"; depends=[Rcpp RcppArmadillo]; }; netCoin = derive2 { name="netCoin"; version="2.0.20"; sha256="1kmv8sfzyh7cgp4s86rw4znjqpckgw8xiqs6a144g7k2vlfm28fk"; depends=[haven igraph Matrix rD3plot]; }; - netSEM = derive2 { name="netSEM"; version="0.6.0"; sha256="0f8d9lw2ahap8i4dcl7039q4959wpq7d8h5n3kz5kwylmkf70lmh"; depends=[DiagrammeR DiagrammeRsvg gtools htmlwidgets knitr magrittr MASS png rsvg segmented svglite]; }; + netSEM = derive2 { name="netSEM"; version="0.6.1"; sha256="01yhqlax9vyhipw5cjg2mg9cbxj44g7mxlrsfa4mfsw22bd6dc6i"; depends=[DiagrammeR DiagrammeRsvg gtools htmlwidgets knitr magrittr MASS png rsvg segmented svglite]; }; netShiny = derive2 { name="netShiny"; version="1.0"; sha256="1k6dmhkjf29ww31c15jms0yxwyiqq1z7a9115zwbg620cjd3m6fm"; depends=[colourpicker DT future future_callr ggplot2 ggVennDiagram igraph ipc magrittr Matrix netgwas plotly promises readxl shiny shinyBS shinycssloaders shinydashboard shinyjs shinyscreenshot shinyWidgets visNetwork]; }; netUtils = derive2 { name="netUtils"; version="0.8.0"; sha256="02ik399hq58lfy2l4rhc21kkfcjkzycgjhdhgrvycn34gkw3ahjl"; depends=[igraph Rcpp RcppArmadillo]; }; netassoc = derive2 { name="netassoc"; version="0.7.0"; sha256="0hbyg31r9sjp0dyxlbsbw7r1kb1dwr0apilsw8saf1vlqwsiasga"; 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.1"; sha256="06484f7i0rf7p6c6i3g1kshbnm6h30qj4xjryjmxcm7yy09m9hdb"; depends=[coda ggplot2 MASS MCMCpack mvtnorm Rcpp RcppArmadillo RcppProgress]; }; + netcmc = derive2 { name="netcmc"; version="1.0.2"; sha256="0w5xnnfglg0nm59wwqh2dpwkz0zlly3r2997wncf5whz5j4vcy88"; depends=[coda ggplot2 MASS MCMCpack mvtnorm Rcpp RcppArmadillo RcppProgress]; }; netcom = derive2 { name="netcom"; version="2.1.6"; sha256="1i9d7w497qqjkwqvskbm1k5jj03pf84am8jifhhmxmmvd9sk6ldw"; depends=[clue doParallel dplyr expm foreach GenSA ggfortify ggplot2 ggraph igraph magrittr Matrix optimx pdist pracma reshape2 rlang tibble vegan]; }; netcontrol = derive2 { name="netcontrol"; version="0.1"; sha256="1gskb728ycnhz9a9g9ghm0dz3ajf3dzgyv23bsk9i01wj9hrxhc0"; depends=[expm MASS Matrix pracma Rcpp RcppArmadillo Rdpack]; }; + netdiffuseR = derive2 { name="netdiffuseR"; version="1.22.5"; sha256="1brcqkxvc7h015hgmxff4449zvgzl7rx6lm52x0hchc6zjb0fi16"; depends=[boot igraph MASS MatchIt Matrix network networkDynamic Rcpp RcppArmadillo sna SparseM viridisLite]; }; netgen = derive2 { name="netgen"; version="1.3.2"; sha256="1yqi4rb6w9ipxgbl1j1s2s81cg7nzrn65irn5gs82hsq94d6vv2j"; depends=[BBmisc checkmate ggplot2 igraph lhs mvtnorm stringr]; }; netgsa = derive2 { name="netgsa"; version="4.0.4"; sha256="02127r3vskcksrd893qrs1wqwkbw3b8p33ybgvbwd9j4lxgifmr2"; depends=[AnnotationDbi corpcor data_table dplyr genefilter glassoFast glmnet graph graphite httr igraph jsonlite magrittr Matrix msigdbr org_Hs_eg_db quadprog Rcpp RcppEigen RCy3 reshape2 rlang]; }; netgwas = derive2 { name="netgwas"; version="1.14.1"; sha256="07nq2pb031grq7g4ysk9pk05dvn3x7cq2l9vdsggi1jvyv5fr4vv"; depends=[glasso huge igraph MASS Matrix qtl tmvtnorm]; }; @@ -13033,7 +13109,7 @@ in with self; { netjack = derive2 { name="netjack"; version="1.2.0"; sha256="060ygb0kxi0gx1ya38cmf5hhyy6jkwq5519azdqhq5i324cwzzm7"; depends=[brainGraph ggplot2 igraph Rdpack]; }; netmap = derive2 { name="netmap"; version="0.1.1"; sha256="0cqfxpn3pcbh56a26azxzm896g1m0z289870gb79n5nz69wm7dci"; depends=[ggnetwork igraph network rlang sf sna]; }; netmediate = derive2 { name="netmediate"; version="0.1.0"; sha256="1jk8knnqi59sfkpfaqi42y416j0qvmjy7ghjm2kkf2wvxwmym3q0"; depends=[btergm ergm ergMargins gam intergraph lme4 MASS network plm plyr RSiena sna VGAM]; }; - netmeta = derive2 { name="netmeta"; version="2.5-0"; sha256="07fr06za4k57kr84ni35gbfjwaxdfgrf9jpds7nlmkwhwybm4462"; depends=[ggplot2 magic MASS meta metafor]; }; + netmeta = derive2 { name="netmeta"; version="2.6-0"; sha256="1xihabkyv5hljyklmsi2h2w63yngibkbfv595r9nfgyp4b9pgslp"; depends=[ggplot2 magic MASS meta metafor]; }; netmhc2pan = derive2 { name="netmhc2pan"; version="1.3.1"; sha256="0q98rar7iglwxmf1274wrjcr7kp544ayrjhd286x68jmf51cqyrg"; depends=[assertive devtools dplyr rappdirs readr seqinr stringr testit tibble]; }; netplot = derive2 { name="netplot"; version="0.1-1"; sha256="11s6gcxcwbnd5x3sb4ryi4ks1bsbf7ylgc0yrygv58ipisxb2780"; depends=[igraph network sna]; }; netrankr = derive2 { name="netrankr"; version="1.2.0"; sha256="1b6wcvwqyqjfi1v8k8bf0ydsiyizpcgy47jf4z6v50sj22lwvxpn"; depends=[igraph Matrix Rcpp RcppArmadillo]; }; @@ -13042,6 +13118,7 @@ in with self; { nets = derive2 { name="nets"; version="0.9.1"; sha256="00adkyd2hm8aynpnk4avzss8fxkbaai74n5cf03vpwyc306jq0d7"; depends=[igraph]; }; netseg = derive2 { name="netseg"; version="1.0-1"; sha256="075qm8z8i2l1q3s22ql55ih752b2n5gnmhkmgbd7qa44zkf3rj0w"; depends=[igraph]; }; netstat = derive2 { name="netstat"; version="0.1.2"; sha256="0d26w0xyi5645132bxybsy8zadfcfifbwp5s22r0cnd546czjvz8"; depends=[]; }; + nett = derive2 { name="nett"; version="1.0.0"; sha256="1prb1zskhc50jzqmh1cdk4lljr4xqp4aaaaw1r66hmpy0d9ghhph"; depends=[foreach magrittr Matrix Rcpp RcppArmadillo]; }; nettskjemar = derive2 { name="nettskjemar"; version="0.1.4"; sha256="0cghjk9hw3m0b6xalqg0p7v60jvshcfy6z5sfl4p2z6y17pkf72b"; depends=[dplyr here httr jsonlite pbapply purrr rvest tidyr usethis xml2]; }; network = derive2 { name="network"; version="1.18.0"; sha256="0nyf8i94lnqm4gfjz1szbwvl4c438xg3rjdkqr18fz68fh0v3x2r"; depends=[magrittr statnet_common tibble]; }; networkABC = derive2 { name="networkABC"; version="0.8-1"; sha256="0754770z3db7faadh8bxk0h70frjk6v8zjklkhclxnach1vag2k6"; depends=[network RColorBrewer sna]; }; @@ -13071,22 +13148,22 @@ in with self; { newsmap = derive2 { name="newsmap"; version="0.8.1"; sha256="0r7ldw78wi66li6xgski5g0fa0sfwya6jw79ag06i9zgnzmswd85"; depends=[Matrix quanteda quanteda_textstats stringi]; }; newsmd = derive2 { name="newsmd"; version="0.4.0"; sha256="1pzsblkvs374nc6795llm9lbqj5z410g1mgr3q4fgpm0398zmsrv"; depends=[R6]; }; nextGenShinyApps = derive2 { name="nextGenShinyApps"; version="1.5"; sha256="1zj37yqrnxzlrjz8bcrskfl11ql1q27mfffx3342gllkfmpgd8vp"; depends=[htmltools shiny]; }; - nfer = derive2 { name="nfer"; version="1.1.0"; sha256="0kl7yks8m7ylm3vlmffjy1fgjchf4pym49jgpnq9jbkysvvbxpb0"; depends=[]; }; + nfer = derive2 { name="nfer"; version="1.1.1"; sha256="0g54jfy6cdzd9kamyqqcyx1v9pml2vzyi8jfmdpnw8r0jj6n7x2l"; depends=[]; }; nfl4th = derive2 { name="nfl4th"; version="1.0.2"; sha256="0dx5ipnfnsii0imnxsi3vyfvihfdg0sim5vhpchi0ggcnjpqm3k4"; depends=[dplyr glue httr janitor jsonlite magrittr mgcv nflfastR nflreadr purrr stringr tibble tidyr tidyselect xgboost]; }; - nflfastR = derive2 { name="nflfastR"; version="4.4.0"; sha256="0nbizfrc0cv9vi8izjc8r15jq4pyrxd0av37kycxfqmb6kr8z8ax"; depends=[cli curl data_table dplyr fastrmodels furrr future glue janitor mgcv nflreadr progressr rlang stringr tibble tidyr tidyselect xgboost]; }; + nflfastR = derive2 { name="nflfastR"; version="4.5.0"; sha256="0q88csinbns5khcnls891j3a8npskjr47g0rcqk5bxrr51p9i5yg"; depends=[cli curl data_table dplyr fastrmodels furrr future glue janitor mgcv nflreadr progressr rlang stringr tibble tidyr tidyselect xgboost]; }; nflplotR = derive2 { name="nflplotR"; version="1.1.0"; sha256="13ibhri9x5k4waay230s2xhc9i8qm51glq0bgdc1ily8grgrxhgs"; depends=[cachem cli data_table ggplot2 magick magrittr memoise nflreadr rappdirs rlang scales]; }; nflreadr = derive2 { name="nflreadr"; version="1.3.1"; sha256="1zh5dhj6fv7f1x36k597qwi28csbvvj4n6dgpsqzx0al0b0na44v"; depends=[cachem cli curl data_table glue memoise rappdirs rlang]; }; nflseedR = derive2 { name="nflseedR"; version="1.1.0"; sha256="16qpmhb9i220blihy6r8ak9rf3pb228q305qszz57zkz1hhk0508"; depends=[cli crayon curl dplyr furrr future glue gsubfn magrittr nflreadr progressr purrr readr rlang tibble tidyr]; }; nflverse = derive2 { name="nflverse"; version="1.0.2"; sha256="00mjclyf0ph2wi3jbbxyhgckj9kppm8xhy10z5n6kskyw4wnvab0"; depends=[cli crayon magrittr nfl4th nflfastR nflplotR nflreadr nflseedR rlang rstudioapi]; }; nftbart = derive2 { name="nftbart"; version="1.4"; sha256="1xg3p2bi4j6ijg20kj1wp3alrd8bnda02fk50vm5k507wcxf4473"; depends=[nnet Rcpp survival]; }; ngboostForecast = derive2 { name="ngboostForecast"; version="0.1.1"; sha256="019l9w7m6lkbf0m9mlsd24agjasbzi7dmy72faq1s4xg49a5xa9a"; depends=[dplyr forecast magrittr R6 reticulate]; }; - ngram = derive2 { name="ngram"; version="3.2.1"; sha256="1zjp5gn82b733a0glqrpvm1rqmqk0apni9fbm0jszbnc3y9h478z"; depends=[]; }; - ngramr = derive2 { name="ngramr"; version="1.9.0"; sha256="1imvfawavrr83bnmhwwr5icm43f7nmr77nwsz262zh39s4a55f4z"; depends=[cli curl dplyr ggplot2 httr rjson rlang scales stringr textutils tibble tidyr xml2]; }; + ngram = derive2 { name="ngram"; version="3.2.2"; sha256="04cafc0i3605vlxmiwfyf91572ppg3wmm0hi50y9x7ai12bznchc"; depends=[]; }; + ngramr = derive2 { name="ngramr"; version="1.9.1"; sha256="0vvlml9s6v5vix1h723bs3mbz6cpa2mv4gbh0mqvfxssba7ki05i"; depends=[cli curl dplyr ggplot2 httr 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.7.1"; sha256="0mjcb26irvhqsicnnhx8w32gx9w50jw0rwm2x33wvdf0qy42gzdw"; depends=[foreign magrittr plyr rvest stringr xml2]; }; nhdR = derive2 { name="nhdR"; version="0.5.9"; sha256="0zgcsj7469dpmfda62322yxamq9lahl3d9nxizdp48kh0xrmx8pl"; depends=[curl digest dplyr foreign ggplot2 httr maps memoise purrr rappdirs rgdal rlang rvest sf stringr units xml2]; }; - nhdplusTools = derive2 { name="nhdplusTools"; version="0.5.7"; sha256="00xr2s1ih86kfbxihqaar1drqqy6n967sxq19k669d0dg0r3pjzq"; depends=[dataRetrieval dplyr fst httr jsonlite magrittr pbapply prettymapr R_utils RANN rosm sf tidyr units xml2 zip]; }; + nhdplusTools = derive2 { name="nhdplusTools"; version="0.6.1"; sha256="063vskxilrhx801cgp7hl8w81k4qig6hsyj9xlfdzjjrhyan31pi"; depends=[dataRetrieval dplyr fst httr jsonlite magrittr pbapply prettymapr R_utils RANN rlang 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]; }; @@ -13097,16 +13174,17 @@ in with self; { 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=[]; }; + nieve = derive2 { name="nieve"; version="0.1.1"; sha256="10g3krcjzyjqhw6wdyk8ck009jalav1ybla93klzr894ildl1agh"; depends=[]; }; nifti_io = derive2 { name="nifti.io"; version="1.0.0"; sha256="03p0gn6id5bkn0qxf7v3splykpi9wpbasrhf2937gp25bsynrpjm"; depends=[]; }; nightmares = derive2 { name="nightmares"; version="0.0.2"; sha256="1dmqrb17ncwazy1nb0zzfy7fq51ah7rz0xmhmmx6d30paaix2vc7"; depends=[raster rgdal sp]; }; nilde = derive2 { name="nilde"; version="1.1-7"; sha256="014scmwhq9i66i2mhvrb71y6ccv0xzjqfgm2sqff9lzjv9smy2im"; depends=[]; }; nima = derive2 { name="nima"; version="0.6.2"; sha256="0n8r8h1m0v0ssbpv6p32jby49f45qbicwr0awm7x054p48qk49cy"; depends=[assertthat dplyr ggplot2 ggthemes gridExtra gtools scales]; }; - nimble = derive2 { name="nimble"; version="0.12.2"; sha256="06qs22q0l1iv82q5q48f5hpn0jxy8pds378k9cxhnzws2nms7xra"; depends=[coda igraph R6]; }; + nimble = derive2 { name="nimble"; version="0.13.0"; sha256="06y745jch8glixnxcgxi1dcawk8xz2gjjl4zb8c23xwfwa5lxp36"; depends=[coda igraph R6]; }; nimbleAPT = derive2 { name="nimbleAPT"; version="1.0.4"; sha256="0615fm6sa6nf607ay98r81m0pp8yvydpwzn3972imf87irps2k3l"; depends=[nimble]; }; nimbleCarbon = derive2 { name="nimbleCarbon"; version="0.2.1"; sha256="1dzkc0ay617a1l6m919sqxfcnx0z9kwfykn11f9hz6ddf4wgkysm"; depends=[coda doSNOW foreach nimble rcarbon snow]; }; nimbleEcology = derive2 { name="nimbleEcology"; version="0.4.1"; sha256="1z4byxsana1fa2y7qhmiqbb8ana6zbas0cmbgcc703mqh1642jb2"; depends=[nimble]; }; nimbleNoBounds = derive2 { name="nimbleNoBounds"; version="1.0.1"; sha256="0ac35ylwbgsw261l84fv11mnddrqxzdyvv1f9nk73jxv102z0ihj"; depends=[nimble]; }; - nimbleSCR = derive2 { name="nimbleSCR"; version="0.2.0"; sha256="19y93cvnp3x4jnff4210fc1cp04mv0mnm1as6svsp8swizm2sb95"; depends=[nimble]; }; + nimbleSCR = derive2 { name="nimbleSCR"; version="0.2.1"; sha256="1gyc93isivvq0b8fv4pb2g3mpr1n7jfpj9bs86a417iwbf34x4a4"; depends=[nimble]; }; nimbleSMC = derive2 { name="nimbleSMC"; version="0.10.1"; sha256="1bxm729v40zd9gflllp8plj7gk325mc4gdlmsvkrgp31rslkxx76"; depends=[nimble]; }; nipals = derive2 { name="nipals"; version="0.8"; sha256="0nv7h68hysxnpiinmgw6v3bz4ya53c0p96k9bfvcmalfb7hs8j5z"; depends=[]; }; nipnTK = derive2 { name="nipnTK"; version="0.1.0"; sha256="0imy2x1h9d842ssw7hmmh21c4mj7s6y05mmjin1270skbnrk2zmr"; depends=[bbw withr]; }; @@ -13119,6 +13197,7 @@ in with self; { nlaR = derive2 { name="nlaR"; version="0.4.0"; sha256="05ipw2j4w5r3bpmhqh742yqz5qihx36jnsq08bli8jwsqha9vm8h"; depends=[rappdirs]; }; nlcv = derive2 { name="nlcv"; version="0.3.5"; sha256="1ywnm8a13ifqa1bxnf659h1j6mg9iy02vaszyh9p966ps9c1pjab"; depends=[a4Core Biobase e1071 ipred kernlab limma MASS MLInterfaces multtest pamr randomForest RColorBrewer ROCR xtable]; }; nleqslv = derive2 { name="nleqslv"; version="3.3.3"; sha256="0cy65bqkmnnr8v0x1cag84caxwdxyr0yw4w443apxzfxjp7dyiif"; depends=[]; }; + nlgm = derive2 { name="nlgm"; version="1.0"; sha256="03byqqj8ayq7hbaab4cfrk0nbxmiiq2c2i98szfydzkimhrw922a"; depends=[ggplot2 Rfast Rfast2]; }; nlist = derive2 { name="nlist"; version="0.3.3"; sha256="1wq7bp834c7cl37wbrgd9ars3mm0s5c3l3fxlrry728a27c27f9h"; depends=[abind chk coda extras generics lifecycle purrr term tibble universals]; }; nlive = derive2 { name="nlive"; version="0.1.0"; sha256="03nxazkb0ndriafh28dfqmyrzcpxa0fqflnlpbkjaa83g4im75j3"; depends=[dplyr ggplot2 knitr lcmm nlraa Rmisc saemix sitar sqldf]; }; nlme = derive2 { name="nlme"; version="3.1-160"; sha256="024a1pfdbv5dp1cbfk424n1rwfxw4g92yrjcfy1v0xj834ilcifl"; depends=[lattice]; }; @@ -13126,9 +13205,11 @@ in with self; { nlmeVPC = derive2 { name="nlmeVPC"; version="2.5"; sha256="0jrbwai8q3qvr6zm5q8pn89gslh2kp2sddwkggcjisjcri3cny9f"; depends=[ggplot2 Hmisc optimx quantreg Rcpp RcppArmadillo timeDate]; }; nlmixr2 = derive2 { name="nlmixr2"; version="2.0.8"; sha256="14akzman4r99ynkdpif0y6fjgxahbha5bk49g59924azwnhin7hd"; depends=[lotri magrittr nlmixr2data nlmixr2est nlmixr2extra nlmixr2plot rxode2]; }; nlmixr2data = derive2 { name="nlmixr2data"; version="2.0.7"; sha256="06wchhd5rg76vws8lvh5yf8cia7d09ds61h9zizqk7j9azkx004j"; depends=[]; }; - nlmixr2est = derive2 { name="nlmixr2est"; version="2.1.1"; sha256="0bnm7zgbzarwj4xbimivpnxmxqih3h52c4hyb6wz1816z35cs8lc"; depends=[backports BH checkmate cli dparser knitr lbfgsb3c lotri magrittr Matrix minqa n1qn1 nlme nlmixr2data Rcpp RcppArmadillo RcppEigen rex Rvmmin rxode2 rxode2parse rxode2random StanHeaders symengine ucminf vpc]; }; + nlmixr2est = derive2 { name="nlmixr2est"; version="2.1.3"; sha256="1mxax6r5zlj96a5khfq4q7ksgzq577axll1aniqa76d1j9vjm5nq"; depends=[backports BH checkmate cli knitr lbfgsb3c lotri magrittr Matrix minqa n1qn1 nlme nlmixr2data Rcpp RcppArmadillo RcppEigen rex Rvmmin rxode2 rxode2parse rxode2random StanHeaders symengine ucminf vpc]; }; nlmixr2extra = derive2 { name="nlmixr2extra"; version="2.0.8"; sha256="1sxbkqwhj6lg49c3ah4kylvak1lgj2was6mqsh82klvp72fd61fd"; depends=[checkmate cli crayon data_table digest ggplot2 ggtext lotri nlme nlmixr2est Rcpp RcppArmadillo rxode2 symengine]; }; + nlmixr2lib = derive2 { name="nlmixr2lib"; version="0.1.0"; sha256="12nzkhz68kw4k21bgmp7w9dhcwq7q7lz09riambgyr8gqbmvzn3s"; depends=[checkmate cli nlmixr2est rxode2]; }; nlmixr2plot = derive2 { name="nlmixr2plot"; version="2.0.7"; sha256="0bpb9pxdjpwg3kqldbmw8vlq2w843dgyv0q13265kbcpwqhqmnma"; depends=[ggplot2 nlmixr2est nlmixr2extra rxode2 vpc xgxr]; }; + nlmixr2rpt = derive2 { name="nlmixr2rpt"; version="0.1.0"; sha256="0imkjshj2cibxs0zqddwfizpdf7v4b74m5p813j2laaydfnnlkyr"; depends=[cli dplyr flextable ggforce ggplot2 ggpubr nlmixr2extra onbrand rxode2 stringr xpose xpose_nlmixr2 yaml]; }; 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="2.0.3"; sha256="1mqnjswm0dl6vqc8b2s5k3n1mhanaha3l33vh68dh6zx8q9aq9kv"; depends=[testthat]; }; @@ -13160,7 +13241,7 @@ in with self; { nmslibR = derive2 { name="nmslibR"; version="1.0.6"; sha256="1biaaifcnzjpj6prq04avgfz29n1v65kgpir8jrg4ndb6krjwh94"; depends=[KernelKnn Matrix R6 Rcpp RcppArmadillo reticulate]; }; nmw = derive2 { name="nmw"; version="0.1.4"; sha256="1vj7b2p40x0h3xp45qzar86i9439mj8y3r5hnlbwa025jqdf2g0q"; depends=[numDeriv]; }; nnGarrote = derive2 { name="nnGarrote"; version="1.0.4"; sha256="0km7vx9qkfijj2af5ma4q88mhgkrw361hpv3n8dyzpr8654hrw4v"; depends=[glmnet]; }; - nnTensor = derive2 { name="nnTensor"; version="1.1.8"; sha256="12f2mfkzamrjd9yjgrljbw5y1jg5805pc8371zs7qfn6bganmhv8"; depends=[fields ggplot2 MASS plot3D rTensor tagcloud]; }; + nnTensor = derive2 { name="nnTensor"; version="1.1.10"; sha256="16lv17dgzyb5jgsl1j50q84jv78ppnfwk5hm7y4m9962c2dyqw33"; depends=[fields ggplot2 MASS plot3D rTensor tagcloud]; }; nna = derive2 { name="nna"; version="0.0.2.1"; sha256="17cz1jf7iv61wspqldfdwbdjhlr0wq09idkzlivfb8aik5w9f0z5"; depends=[]; }; nncc = derive2 { name="nncc"; version="1.0.0"; sha256="1kgsz28j4ra0x3i8454fjmil7g62r2mjvnbljcp008q4slnp47sv"; depends=[cluster dplyr formula_tools furrr ggplot2 igraph mgcv mice rlang tidyr]; }; nnet = derive2 { name="nnet"; version="7.3-18"; sha256="1l73v6l9ma0vsg4za3c6i3d6yjj7bpdmakbmrzp7205hbkxyp6nj"; depends=[]; }; @@ -13175,7 +13256,7 @@ in with self; { noaastormevents = derive2 { name="noaastormevents"; version="0.2.0"; sha256="1d93h8av0bbv7a56g6m000qpsnzqpfdla0fmcj5y8fbbqkipxnfr"; depends=[choroplethr choroplethrMaps data_table dplyr forcats ggplot2 hurricaneexposure lubridate magrittr maps plyr RColorBrewer RCurl rlang stringr tibble tidyr viridis XML]; }; noah = derive2 { name="noah"; version="0.1.0"; sha256="1ln23lp4c70fin9sjjhm4ngy47f8sk2mcljp5q449b7hq8gqi12c"; depends=[assertthat crayon digest dplyr hash magrittr purrr R6 rlang stringr]; }; noctua = derive2 { name="noctua"; version="2.6.0"; sha256="17j23sjr0wf9jipc12piq51w7drdm84qqd7jp4mvkym3lg4d19yb"; depends=[data_table DBI paws uuid]; }; - nodbi = derive2 { name="nodbi"; version="0.8.1"; sha256="0zslvf2hivc1hfp6c9sijc12mzdxy0byrhcs74f2bf0q0v9vcmx6"; depends=[DBI elastic jqr jsonify jsonlite mongolite RPostgres RSQLite sofa stringi uuid]; }; + nodbi = derive2 { name="nodbi"; version="0.9.1"; sha256="1hn0wy2ry9l3wwqrshmf82cxigkm16wycwprv458bcvb5k6ayy5m"; depends=[DBI jqr jsonify jsonlite stringi uuid]; }; node2vec = derive2 { name="node2vec"; version="0.1.0"; sha256="03gfpn4xgmdwlrpwi9pdpnh6k75mwp85j6vywkj0jsxhz3rbg95g"; depends=[data_table dplyr igraph rlist vctrs vegan word2vec]; }; nodeSub = derive2 { name="nodeSub"; version="1.2.5"; sha256="11a744gdfb2lwya01g1gg4165f692hjwym40r0rdi1y4l0jk8l8h"; depends=[ape apTreeshape assertthat babette beastier beautier DDD geiger mauricer pbapply phangorn phylobase rappdirs Rcpp Rmpfr stringr testit tibble tracerer]; }; nodiv = derive2 { name="nodiv"; version="1.4.0"; sha256="1k7pr9d1mgxw3szxcmnkkz498x7629wf2z65qlclywka3xgzpkxc"; depends=[ape picante raster sp vegan]; }; @@ -13187,7 +13268,7 @@ in with self; { noisySBM = derive2 { name="noisySBM"; version="0.1.4"; sha256="1zdkxr48kvpqs49figxxznq3d45nalja92lyal71m066s1blc6dg"; depends=[ggplot2 gtools RColorBrewer]; }; noisyr = derive2 { name="noisyr"; version="1.0.0"; sha256="05nvxz5qa4lsi62va74yq4m68nlacjkl8xj5nsq7dik3357y53dr"; depends=[doParallel dplyr foreach GenomicRanges ggplot2 IRanges magrittr philentropy preprocessCore Rsamtools tibble]; }; nombre = derive2 { name="nombre"; version="0.4.1"; sha256="16hpr628j8rzxg5k71qsgc9xhz1w4gpi3fry5vp1mbwvalmlish2"; depends=[fracture]; }; - nomclust = derive2 { name="nomclust"; version="2.5.0"; sha256="17vqxbx5bpja2fxp83w0sbgbs61b2vaak9zzvvxkicxqwk09ix2v"; depends=[cluster Rcpp]; }; + nomclust = derive2 { name="nomclust"; version="2.6.2"; sha256="16pxv2vqikias18835crjfx5yignckvrw4imwqi18463mg6y7v9b"; depends=[cluster Rcpp]; }; nominatimlite = derive2 { name="nominatimlite"; version="0.1.6"; sha256="1zzlqhn26bgag2sjq57crldyw0q0cs56l6c69xqp15w88022d32q"; depends=[dplyr jsonlite rlang sf tibble]; }; nomisr = derive2 { name="nomisr"; version="0.4.7"; sha256="0mf301nhsl71h79jxfkwa27j5nifsxp7y6vxbnx87rybr80b3hg1"; depends=[dplyr httr jsonlite rlang rsdmx snakecase tibble]; }; nomnoml = derive2 { name="nomnoml"; version="0.2.5"; sha256="1c1pv3c1s6cdc75malnhy69cc9za3hmikd46d35x1n2ww54lmldc"; depends=[htmlwidgets lifecycle png rlang webshot]; }; @@ -13211,7 +13292,7 @@ in with self; { nor1mix = derive2 { name="nor1mix"; version="1.3-0"; sha256="1817wcvlmxs70vs4db0jkxd7i037744zz8ay3c2a9949z29fxr4w"; depends=[]; }; nord = derive2 { name="nord"; version="1.0.0"; sha256="1gisqca85vzbqq5hs5bgqjgrjyksxj176x97kv9vv6mwll8kijl9"; depends=[ggplot2]; }; nordklimdata1 = derive2 { name="nordklimdata1"; version="1.2"; sha256="0c2hbh3qy8nrs275lxpzfgqsfgwp81m4kv0layvnjj09fcybm54x"; depends=[]; }; - norgeo = derive2 { name="norgeo"; version="2.1.1"; sha256="08arc9hkya2ckqp603ppxp6akfdwwgy2l2x6vcqw4saf9b2anzpy"; depends=[data_table DBI httr jsonlite magrittr odbc RSQLite writexl]; }; + norgeo = derive2 { name="norgeo"; version="2.1.2"; sha256="0ac0qc3vg012ndk8c50xma636k32mzhd7z9i434d1d6iz2fy3gn9"; depends=[data_table DBI httr jsonlite magrittr odbc RSQLite writexl]; }; norm = derive2 { name="norm"; version="1.0-10.0"; sha256="1iqcsa7mj9ahnkbsri0cf2wlhh2bv86vwsh3iwihh42cywd7k123"; depends=[]; }; norm2 = derive2 { name="norm2"; version="2.0.4"; sha256="0ahz6x59k00pqalzjc3ajiby1ysmarjssga9amwh9vd6vmzzyfb7"; depends=[]; }; normalizeH = derive2 { name="normalizeH"; version="1.0.0"; sha256="19lychfrv57yk245rzais4hx17csz1s6wm5vk6p7ypr6h9slf2cq"; depends=[]; }; @@ -13236,13 +13317,14 @@ in with self; { 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]; }; npcopTest = derive2 { name="npcopTest"; version="1.03"; sha256="1kpa3avi95aa93y038f4zqhhdp8vdscdk0c6397qmqjg34hf1dnr"; depends=[]; }; - npcp = derive2 { name="npcp"; version="0.2-2"; sha256="187vz2nvv7352qv9nry96rcjf0w4zi19xhpbg0jljbqqjfn7abi5"; depends=[]; }; + npcp = derive2 { name="npcp"; version="0.2-4"; sha256="0w3zimljr2cz1bjhpgcv8qvkrhhh3jbd7bqi2yvrh05lpcxxagh0"; depends=[sandwich]; }; npcs = derive2 { name="npcs"; version="0.1.0"; sha256="00gxi2yalp7pcykxmm1kafv3fpyqwc7xvmv10z6x3yngk62rj0r6"; depends=[caret dfoptim e1071 foreach formatR magrittr MASS naivebayes nnet randomForest rpart smotefamily]; }; npcure = derive2 { name="npcure"; version="0.1-5"; sha256="0hf6w8w76qmjdsd6zgg85jj5ypmmg1a1ryzqwnxcypsdjxaq539z"; depends=[permute zoo]; }; - npde = derive2 { name="npde"; version="3.2"; sha256="17p24djwl9nxhvzb9hg2iqj2vak0h55zshwgnsk98gj4z4zaqwwr"; depends=[ggplot2 gridExtra mclust rlang scales testthat]; }; + npde = derive2 { name="npde"; version="3.3"; sha256="1my925wrl3izhidim49z787pc6fvh41kzgdqx24llgz8wsa9xb6q"; depends=[ggplot2 gridExtra mclust rlang scales]; }; nph = derive2 { name="nph"; version="2.1"; sha256="100x7ar498s18rs8m4bx0kf4h8vqk1clb4z4kdnlni16lrpc90hy"; depends=[ggplot2 muhaz multcomp mvtnorm survival]; }; nphPower = derive2 { name="nphPower"; version="1.0.0"; sha256="0jqrbjm56nmhrmhsidz0bzyifq6kpqch8r64j8vd98b7xgcb6w4h"; depends=[MASS mvtnorm survival zoo]; }; nphRCT = derive2 { name="nphRCT"; version="0.1.0"; sha256="0b29izx3rz17g0jx72s33jj8ps0z3kq8fj2v0035hcjacnswz9ya"; depends=[ggplot2 purrr survival]; }; + npi = derive2 { name="npi"; version="0.2.0"; sha256="0akf9m46iy18nqm678sga1dxq1135jj33yrxz30yhd75w6nicgri"; depends=[checkLuhn checkmate curl dplyr glue httr magrittr purrr rlang stringr tibble tidyr]; }; nplplot = derive2 { name="nplplot"; version="4.6"; sha256="1sxmz0cl15fdc0s987nwjnl6ywxg4fqs8qnm5nkcbyj6b9jzcbwy"; depends=[]; }; nplr = derive2 { name="nplr"; version="0.1-7"; sha256="1h3qv9dlw2gx8km3slyvrl588nif1n87df8xwmm6p75ziqhn2f56"; depends=[]; }; nplyr = derive2 { name="nplyr"; version="0.1.0"; sha256="1cq4qq7d4xkvwdw1byxigxii2kmv899c4svjg0vg3sxxf8wvz6ix"; depends=[assertthat dplyr purrr rlang]; }; @@ -13253,7 +13335,6 @@ in with self; { npordtests = derive2 { name="npordtests"; version="1.2"; sha256="1axzcyy45h3rs67m0i3cvwbmza1mnmraxan9j4zlpxdd5x9nz4h8"; depends=[]; }; nppbib = derive2 { name="nppbib"; version="1.2-0"; sha256="1nn6wf89jhr3gy4rcd6px0cd5b1bsr7pbaxng4adba8n3yrss7vs"; depends=[]; }; npphen = derive2 { name="npphen"; version="1.5.2"; sha256="1d585rz07ldmmfcsrb11nl2f7jry2p0cc5dm8vlwr1jv7ag0r9y5"; depends=[ks lubridate raster rgdal snow]; }; - 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-9"; sha256="10pgcjhiannvxkbsw3ywkjzmgsq2m7dqwqhxkfcdnbc052n7s6di"; depends=[]; }; npregderiv = derive2 { name="npregderiv"; version="1.0"; sha256="1k873cs3rs15l13z8017n4anacandx7di6yk1zlamcc5p3vlh59n"; depends=[]; }; npregfast = derive2 { name="npregfast"; version="1.5.2"; sha256="1d2p23qqwa06rxfl5v9bcvq2j6pcsvjywq74qgrflkjk45g2kjb5"; depends=[doParallel foreach ggplot2 mgcv sfsmisc shiny shinyjs wesanderson]; }; @@ -13272,9 +13353,9 @@ in with self; { nsapi = derive2 { name="nsapi"; version="0.1.1"; sha256="06xf2p6f911vwpzky47r35fjgjvlhp13p9pf1zlvjrv66kdw8vbp"; depends=[crul xml2]; }; nsarfima = derive2 { name="nsarfima"; version="0.2.0.0"; sha256="0sv63anrsh0ajfvvkb44zsvc7sxws3xpsgwxqa951gy98w8h58g5"; depends=[]; }; nscancor = derive2 { name="nscancor"; version="0.6.1-25"; sha256="183kvzlln5lhmi51dm0skq1165c3hhy1yz5h2g7nxwqk2b4p23xj"; depends=[]; }; - nsdr = derive2 { name="nsdr"; version="0.1.1"; sha256="1p73aj465lk52n3dikkqi54zm2f9v00ikpmry10p42qhfkgrw61l"; depends=[]; }; - nse2r = derive2 { name="nse2r"; version="0.1.5"; sha256="1gwq8x3sn2f4p3yivmg2dljpdjcwsy2s6467pnwlcjdmr3sqgv2b"; depends=[httr jsonlite magrittr rvest xml2]; }; - nseval = derive2 { name="nseval"; version="0.4.2"; sha256="17zs7x86qv01c6s6mw49xdvslpxbz0cm3pfalli58qh83hh3rlks"; depends=[]; }; + nse = derive2 { name="nse"; version="1.21"; sha256="0mw2ijc6z0l8sa7z5fbcapp1rl87zhh5v32iw1mcjw4khwc93bk7"; depends=[coda mcmc mcmcse np Rcpp sandwich]; }; + nse2r = derive2 { name="nse2r"; version="0.1.6"; sha256="0b7ll490xf8r4787qkaz01z3djc7dzgzqg3w4nmmrnrfv36mkybf"; depends=[jsonlite magrittr yahoofinancer]; }; + nseval = derive2 { name="nseval"; version="0.4.3"; sha256="07pabn4msb6q50x67z84flb8fpzf43s1dy61cnqd7rn4l7zgc181"; depends=[]; }; nsga2R = derive2 { name="nsga2R"; version="1.1"; sha256="1b3kkd1mi6g13bl2mkzqyvz0ki296fa9pv055r8mpkdm6gk12lb4"; depends=[mco]; }; nsga3 = derive2 { name="nsga3"; version="0.0.3"; sha256="1jv3kw22jw24n7lnwhq3857mygr2yfv8c5xp3lbqqgz5840cdfa1"; depends=[mlr parallelMap rPref xgboost]; }; nsm3data = derive2 { name="nsm3data"; version="0.1"; sha256="15m3x7jmwmh3rs65v5j39672253crc379zq3k6xigi6p7qnba7sn"; depends=[]; }; @@ -13289,9 +13370,9 @@ in with self; { numGen = derive2 { name="numGen"; version="0.1.1"; sha256="1y41wq31r8126dz1sj23smq2k6v9yqczq4ddgzqb73dsrx9dmmc0"; depends=[]; }; numKM = derive2 { name="numKM"; version="0.2.0"; sha256="0g5jw12fmfc6nl6a3ghpslkjd2d7pbihl70sks35r7dalmr6ihzk"; depends=[survival]; }; numOSL = derive2 { name="numOSL"; version="2.6"; sha256="03h1p56650x4my5vq5jlmjsz5xj0w2j75qfr08rh7nr38dwgp1k8"; depends=[]; }; - numbat = derive2 { name="numbat"; version="1.0.2"; sha256="0qh37mw8kpajxxvnljla4bc590nd0br17zs9x3k8jhzsc25mffdc"; depends=[ape argparse caTools data_table dendextend dplyr GenomicRanges ggplot2 ggraph ggtree glue igraph IRanges logger magrittr Matrix parallelDist patchwork pryr purrr R_utils Rcpp RcppArmadillo RcppParallel reshape2 RhpcBLASctl roptim scales stringr tibble tidygraph tidyr tidyverse vcfR zoo]; }; + numbat = derive2 { name="numbat"; version="1.1.0"; sha256="0b7wdrkgswjp5pc9f3h86d0v0xmpifbv4q0zda46r7ijwxys1p9w"; depends=[ape caTools data_table dendextend dplyr GenomicRanges ggplot2 ggraph ggtree glue igraph IRanges logger magrittr Matrix optparse parallelDist patchwork pryr purrr R_utils Rcpp RcppArmadillo RhpcBLASctl roptim scales scistreer stringr tibble tidygraph tidyr tidyverse vcfR zoo]; }; numberofalleles = derive2 { name="numberofalleles"; version="1.0.1"; sha256="0rjl21844yqp2503gy71c6vg8xywc4lcx7qr9vwvkjw5wiwxls11"; depends=[partitions pedtools Rcpp ribd]; }; - numbers = derive2 { name="numbers"; version="0.8-2"; sha256="0gapcnk6zw9n77yddwsj0v6lzxm7ly2myjjj8kw5wjyng0l27b61"; depends=[]; }; + numbers = derive2 { name="numbers"; version="0.8-5"; sha256="02r2mlq3jygvwi7anbrrid6693qc7iklxhc9ksmqjdlmgzdxxmbp"; depends=[]; }; numbersBR = derive2 { name="numbersBR"; version="0.0.2"; sha256="0ihxlny745gpz1ngq862rydn1zwn8zni1xw9mmgw8hkylsrnjfq8"; depends=[stringr]; }; numform = derive2 { name="numform"; version="0.7.0"; sha256="0n96jm141h4awazr8sads9d99faw8kdy3vbhmjr58d8iqf7793f8"; depends=[glue]; }; nutriNetwork = derive2 { name="nutriNetwork"; version="0.1.1"; sha256="0ya95h88jkiwc7cg7ic8bmyd7b0lgnhxrywwqvi2j6m6nbvvaxzy"; depends=[glasso huge igraph Matrix tmvtnorm]; }; @@ -13299,7 +13380,7 @@ in with self; { nvmix = derive2 { name="nvmix"; version="0.1-0"; sha256="12lhch9sib2nx8j7500dchfi27fvpabbcdkcw9qh194fx22ycknx"; depends=[ADGofTest copula Matrix mnormt pcaPP pracma qrng]; }; nycflights13 = derive2 { name="nycflights13"; version="1.0.2"; sha256="07aa76c77pm1wpzkwjmzv8n6ir5i6fxawx8wx586gwc5wajcb1qf"; depends=[tibble]; }; nzelect = derive2 { name="nzelect"; version="0.4.0"; sha256="19kcbq454yg9g76ix7v3nibgw2203d7vv6f2d6d2zkcc0h08bjm7"; depends=[]; }; - nzffdr = derive2 { name="nzffdr"; version="2.0.0"; sha256="1g32bra2z6a20jjqm6d7irccmr0x36h576bws6kh5x3h25i3plfv"; depends=[curl httr stringi xml2]; }; + nzffdr = derive2 { name="nzffdr"; version="2.1.0"; sha256="14s2dfrrknaswg4l69lncsdbd7algpd9pzgrhpip0vbmyq9pa2ni"; depends=[curl httr rlang stringi tidyr xml2]; }; nzilbb_labbcat = derive2 { name="nzilbb.labbcat"; version="1.1-1"; sha256="1kzsmsliwv8776cyb3wmvzyrr6mqgrsxswxyj1fsxr4yxwlkyr98"; 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]; }; @@ -13307,7 +13388,7 @@ in with self; { 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]; }; - oai = derive2 { name="oai"; version="0.3.2"; sha256="1zcbcxhw692s0y6izvwazyzhgx0iwsxsbcan2nk0mb7n11p7bypb"; depends=[httr plyr stringr tibble xml2]; }; + oai = derive2 { name="oai"; version="0.4.0"; sha256="0czf8f2qcjl9lh48svicpis09d3iwz9cndfm7hq8wlz5dl3dwh7m"; depends=[httr plyr stringr tibble xml2]; }; oaqc = derive2 { name="oaqc"; version="1.0"; sha256="1rc0l79xygmr2rp5sjadzigbj65a13z5xlvrxzy26cl0wsxwhmjf"; depends=[]; }; oaxaca = derive2 { name="oaxaca"; version="0.1.5"; sha256="1z3sbkgzaqq6n1bz0f17gqrbfjbm8bp20384ryx3jq2v50b6gbry"; depends=[Formula ggplot2 reshape2]; }; obAnalytics = derive2 { name="obAnalytics"; version="0.1.1"; sha256="1l4ld120qk0adycmvqrkzada10kb7z03lj2njzqagmacl1z8598f"; depends=[ggplot2 reshape2 zoo]; }; @@ -13321,7 +13402,7 @@ in with self; { 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.6"; sha256="08bc0pi2i2fmc9fcmir150b7g8jnd58q3qaakw2gk25yjy14rp7j"; depends=[bib2df BIEN curl DBI dplyr ggplot2 htmltools httr leaflet lubridate RColorBrewer rgbif rlang RPostgreSQL stringr taxize tidyr viridis waffle]; }; - occTest = derive2 { name="occTest"; version="0.1"; sha256="1ligcwdwjq7hix7xn6k0ykvlnnsh3v7cx33xz52zrpbz2ljy29jr"; depends=[alphahull biogeo CoordinateCleaner countrycode data_table dataPreparation dplyr DT ggplot2 Matrix outliers pingr plyr raster rgbif rgdal rgeos rnaturalearth rnaturalearthdata sf sp spocc stringr svMisc tictoc tidyverse]; }; + occTest = derive2 { name="occTest"; version="0.1.1"; sha256="11dqkah6z50zbxiyniv4f2f0n742gmgzqdaarvc17vn750b6b595"; depends=[alphahull biogeo CoordinateCleaner countrycode data_table dataPreparation dplyr DT ggplot2 Matrix outliers pingr plyr raster rgbif rgdal rgeos rnaturalearth rnaturalearthdata sf sp spocc stringr svMisc tictoc tidyverse]; }; 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.7-10"; sha256="1zv8jpnmfwq59plsqzjjj0hi0bbg5zfm5w7hcl7m5xkkmsvyx6dq"; depends=[gsw Rcpp]; }; @@ -13346,10 +13427,10 @@ in with self; { oddstream = derive2 { name="oddstream"; version="0.5.0"; sha256="1nwjw7fq6b4jdq4m2w0a7xgmzjg5a6pbma1d3r9msiz8rnhb0c54"; depends=[dplyr ggplot2 kernlab ks magrittr MASS mgcv moments mvtsplot pcaPP RColorBrewer RcppRoll reshape tibble tidyr]; }; odeGUTS = derive2 { name="odeGUTS"; version="1.0.1"; sha256="1c3w934dwh5jsh5z169isv9kqh8xbfgp4rk7k1sp8mj0kvy8nqc4"; depends=[deSolve dplyr magrittr tidyr zoo]; }; odeintr = derive2 { name="odeintr"; version="1.7.1"; sha256="0wfb5lgv10p0qyfbn9hdg14bda37v43lpgbwv6nbw63zzbsbazqi"; depends=[BH Rcpp]; }; - odetector = derive2 { name="odetector"; version="1.0.0"; sha256="041diyzap14gfj73pi4qrfnmikm8xchyii9vrz8y411dgi17aiqg"; depends=[ppclust]; }; + odetector = derive2 { name="odetector"; version="1.0.1"; sha256="094i6ykv3s0c5yhdnlgpkz1wb6pr9k6r3vsh7zgkxyy5iayi6dlv"; depends=[ppclust]; }; odin = derive2 { name="odin"; version="1.2.4"; sha256="0m8afhbpjdcdscgw7ngsdr7n8qpxicn3pqjrsjbwi4hrk5aii7ry"; depends=[cinterpolate deSolve digest glue jsonlite R6 ring withr]; }; odk = derive2 { name="odk"; version="1.5"; sha256="0fcnr4c1clwx1sk6fgg4cx506gdi90n2h05g0i47p4s5bra0qwwl"; depends=[gsheet openxlsx]; }; - odns = derive2 { name="odns"; version="1.0.1"; sha256="00ihccylkn7q70f5c4qw19i82a80c5akwr7wh6whmqcmgj6bdq4i"; depends=[data_table glue httr jsonlite]; }; + odns = derive2 { name="odns"; version="1.0.2"; sha256="0a2ifmyrsfih5a7jwc0b6l9wl7c1s5x08fq5bfm27xm9jnb8fwsn"; depends=[data_table glue httr jsonlite]; }; odpc = derive2 { name="odpc"; version="2.0.5"; sha256="0cbkq8parb8br1j386xk5mgwz8gkmwvp79f9sjvzhs7z6wlbp0pv"; depends=[doParallel foreach forecast MASS Rcpp RcppArmadillo]; }; odr = derive2 { name="odr"; version="1.3.1"; sha256="185i81ixrm1mby5ryaymi4ixwxnx84g8f1zv6qbb1aj0wf1rxsng"; depends=[]; }; oem = derive2 { name="oem"; version="2.0.11"; sha256="0p9s68zgma9mcjnz0xg6h07yp38rqj209asg18hji8528iazbv8g"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; }; @@ -13385,14 +13466,16 @@ in with self; { onc_api = derive2 { name="onc.api"; version="2.0.1.0"; sha256="10scbhg6aniqzrbkblhfhz9ni710xzppbzfrr4wrhsy1z5y2nfwc"; depends=[anytime crayon httr humanize lubridate stringi testthat tictoc]; }; once = derive2 { name="once"; version="0.4.1"; sha256="0yshpww3rq68m0qx7kid3zlcxi1nf81vmziclyvpg61aikj8fhx5"; depends=[magrittr]; }; oncoPredict = derive2 { name="oncoPredict"; version="0.2"; sha256="1slq5vp78n5hcq24vlg35r6xansdgriyjw8y9iyb0lj3cdaq38c3"; depends=[BiocGenerics car gdata genefilter GenomicFeatures GenomicRanges glmnet IRanges maftools org_Hs_eg_db pls preprocessCore readxl ridge S4Vectors sva tidyverse TxDb_Hsapiens_UCSC_hg19_knownGene]; }; + oncomsm = derive2 { name="oncomsm"; version="0.1.2"; sha256="13h5ydw11kdjcdr48hqa4dv81qixj4l5qxrzwv4x3lqdnsvvnll1"; depends=[BH checkmate dplyr furrr ggplot2 magrittr purrr Rcpp RcppEigen RcppNumerical rlang rstan StanHeaders stringr tibble tidyr]; }; oncrawlR = derive2 { name="oncrawlR"; version="0.2.0"; sha256="0cm26diaf3jlzfrpgh13q0hakakmj6vy41wk9z0w81az4jcg9sn9"; depends=[caret DALEX dplyr e1071 formattable fs ggplot2 htmltools jsonlite pdp pROC RCurl readr rjson rlang rlist scales sparkline tidyr webshot xgboost]; }; ondisc = derive2 { name="ondisc"; version="1.0.0"; sha256="071jrldclkaz5lfp3k5fh1ilpgvvcnakh2vvnr69n3pri9dl3fls"; depends=[crayon data_table dplyr magrittr Matrix Rcpp readr rhdf5 Rhdf5lib]; }; oneclust = derive2 { name="oneclust"; version="0.2.2"; sha256="0qbwnfv5lk93nfwwzfjwla6lv6imfcvcvmlb9h7ij32zpqg1fzwk"; 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.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]; }; + onemap = derive2 { name="onemap"; version="3.0.0"; sha256="0h5bi4zyiglic60msrkfny28k1rb7avqbs87ipzwwayb452b970c"; depends=[dendextend dplyr ggplot2 ggpubr htmlwidgets plotly princurve RColorBrewer Rcpp rebus reshape2 smacof tidyr vcfR]; }; + onemapsgapi = derive2 { name="onemapsgapi"; version="1.1.0"; sha256="0q1i17dkgcxqswa9wckxzsf1wr118zsw7yhbrbkbikvm27hqrrva"; depends=[dplyr furrr future httr purrr rlang stringr tidyr]; }; onepass = derive2 { name="onepass"; version="0.1.2"; sha256="1r8wk00aqc0sc7l6mmy1k4hkijfikynysrx5vvahbd6mlcdb3bmp"; depends=[jsonlite]; }; + onetime = derive2 { name="onetime"; version="0.1.0"; sha256="17snjkldm11ry5f1mp18jkmlw7hk0zw5yl1qrmakh1lx7fq1326v"; depends=[filelock rappdirs]; }; 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.8"; sha256="1pwpnmpgh3hl8mv1pbn577dn832nxbsfaxn3hqghvs4dn06lwngf"; depends=[VIM]; }; @@ -13400,9 +13483,10 @@ in with self; { onlinePCA = derive2 { name="onlinePCA"; version="1.3.1"; sha256="08qivsfnwz5vp089lv9czsaz3nfi42kn9yhgzf27dji18y2xscic"; depends=[Rcpp RcppArmadillo RSpectra]; }; onlineforecast = derive2 { name="onlineforecast"; version="1.0.1"; sha256="0cpwb6bx1qcf05rbi5ycdpgmfb0c5lvhki1c77kzhds5bn3gw5k4"; depends=[digest pbs R6 Rcpp RcppArmadillo]; }; onlineretail = derive2 { name="onlineretail"; version="0.1.2"; sha256="0lid3g4v51c664304cxgjm209qxv88hqglv89frmj4afc0y6k7sc"; depends=[]; }; + onls = derive2 { name="onls"; version="0.1-2"; sha256="19pgrhr7xzas4s592l4sgv1dfynf3s3d227zwcdv6z6wrxh40hyj"; depends=[minpack_lm]; }; onmaRg = derive2 { name="onmaRg"; version="0.1.2"; sha256="1gvxnw53r5yan5dsp379psz3mnxpnc0wqmwmb2s5qf8ldq688zi1"; depends=[dplyr httr readxl sf stringr]; }; onnx = derive2 { name="onnx"; version="0.0.3"; sha256="1s0swrcff9v9ffbjkraahmb398gh2jrca2wf5k6gs8037frnl8wd"; depends=[reticulate]; }; - onpoint = derive2 { name="onpoint"; version="1.0.2"; sha256="0l1dblj6cr2qagxmgx5ma455qazg1br5y0zpl2dv7jcdb24f7pnq"; depends=[ggplot2 spatstat_core spatstat_geom spatstat_random]; }; + onpoint = derive2 { name="onpoint"; version="1.0.3"; sha256="0g0i88s4hwgjnwqljjgbibc6bks0hy0f27v94w0br45yklrdh73f"; depends=[ggplot2 spatstat_explore 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]; }; ontologics = derive2 { name="ontologics"; version="0.5.2"; sha256="074pqjfm24gd332xja6mgdy8grbbwa6r3yhclcpm1d7hx8dhy2g9"; depends=[checkmate dplyr httr magrittr purrr rdflib readr rlang stringr tibble tidyr tidyselect]; }; @@ -13411,11 +13495,11 @@ in with self; { ontologySimilarity = derive2 { name="ontologySimilarity"; version="2.5"; sha256="035z572lbsfcnr9c0hl8gir1kgk0dw8dxzr3v8dqd93k6jr6kaxb"; depends=[ontologyIndex Rcpp]; }; 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.2"; sha256="11c5h55xjvbavyqy9z2ch03ngy739zs61r8r4lc2gijscc7wn1s4"; depends=[]; }; + oompaData = derive2 { name="oompaData"; version="3.1.3"; sha256="0gdp7bghgpz3q0h06w8r926x7wkpcvkpyf0v5qfi1qixbpvk5fdf"; depends=[]; }; ooplah = derive2 { name="ooplah"; version="0.2.0"; sha256="1p74jh9g62yicrw0lhpbn0diqi2myl24z28kpd2b3mglyffadr0b"; depends=[R6]; }; oops = derive2 { name="oops"; version="0.2.0"; sha256="0xg69riqphvsqqa953v4mlcakvl0invf29678nrljibg31n4wak5"; depends=[]; }; oottest = derive2 { name="oottest"; version="0.9.1"; sha256="1y0k0jcncjkcgfxybs2yyfcc7ywa49jnalrw8mn7m04h58gqg77x"; depends=[]; }; - opGMMassessment = derive2 { name="opGMMassessment"; version="0.3.2"; sha256="0b57hkd7h0l5xdcg196dc2la67aslrrg30qzhaj33nirgy8cig81"; depends=[AdaptGauss caTools cluster ClusterR DataVisualizations DistributionOptimization doParallel dplyr foreach ggplot2 mclust mixAK mixtools multimode NbClust rlang]; }; + opGMMassessment = derive2 { name="opGMMassessment"; version="0.3.3"; sha256="1d9ll5shhbk93hjvxc3nhaffjg31l14w9nqcbwqjv43gjaz0yq3a"; depends=[AdaptGauss caTools cluster ClusterR DataVisualizations DistributionOptimization doParallel dplyr foreach ggplot2 mclust mixAK mixtools multimode NbClust rlang]; }; opa = derive2 { name="opa"; version="0.5.3"; sha256="14y3q7mblxc65lpsndsij1wgwd29wfzfc58g666dgs5fz7vdqf72"; depends=[cpp11 Rcpp]; }; opalr = derive2 { name="opalr"; version="3.2.0"; sha256="1k4qm25gs4gkk9ixxz89dqnz6wkidly13iv9r437fdwsm6m9bzyr"; depends=[httr jsonlite labelled mime progress]; }; opdisDownsampling = derive2 { name="opdisDownsampling"; version="0.8.2"; sha256="0laf24x2h6xwhd5wwcwi1iqg5gni29bmlfr86yrvpdrdgr7f4cha"; depends=[benchmarkme caTools doParallel foreach memuse pracma twosamples]; }; @@ -13428,9 +13512,9 @@ in with self; { openSkies = derive2 { name="openSkies"; version="1.1.6"; sha256="03nlbmxp36z82myrbamwl1zngsnfxfw80niisapv53n605p4lrg1"; depends=[cluster dbscan ggmap ggplot2 httr magick R6 ssh xml2]; }; openVA = derive2 { name="openVA"; version="1.1.0"; sha256="0j4lz66wcx20n0sdjrp06a6zwcz8jvcihmdaj1jr1rnrb5sags0z"; 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]; }; - openai = derive2 { name="openai"; version="0.1.0"; sha256="19h6sbsgqa81dq23whxxymp97f83x2bfyl2a5brim6l809xv5w1v"; depends=[assertthat glue httr jsonlite lifecycle magrittr]; }; - openair = derive2 { name="openair"; version="2.11"; sha256="0yak0n9ay7ikbmm8fchb2zpzk1sq9hnrrhjhcd5ak839k91lhj7c"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr Rcpp readr tidyr]; }; - openairmaps = derive2 { name="openairmaps"; version="0.5.1"; sha256="0b6ibb4846wnmv6pwl83j7544iyma2b0mxjkx6jic0g82m9r7f7a"; depends=[cli dplyr forcats leaflet lubridate magrittr openair purrr rlang stringr tibble tidyr]; }; + openai = derive2 { name="openai"; version="0.3.0"; sha256="18kr3g6896phmyjywx70nj8yy391w6bl83in9wz4fjrnn7b8j88l"; depends=[assertthat glue httr jsonlite lifecycle magrittr]; }; + openair = derive2 { name="openair"; version="2.12"; sha256="1mgawgf6y8bfb606y8ka7g920sqn3c322l1xkis25zgq2r1gk6js"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr Rcpp readr rlang tidyr]; }; + openairmaps = derive2 { name="openairmaps"; version="0.6.0"; sha256="15w5pwgdkmnyasrv3dwanaf9jz6iplq18zx53iz60nnn9bndy29n"; depends=[cli dplyr forcats leaflet lubridate magrittr openair purrr rlang stringr tibble tidyr tidyselect]; }; openalexR = derive2 { name="openalexR"; version="1.0.0"; sha256="0xyzlg3cyhbndnhc864g8447nffc2gg5si7s4h5l1jygyz3c8bki"; depends=[curl httr jsonlite progress tibble]; }; openbankeR = derive2 { name="openbankeR"; version="0.1.1"; sha256="04jh3nnp53dzbk96dcz0xi67jqmp66mzbj81cy8mhhd2rl5ry9cj"; depends=[dplyr glue httpcode httr jsonlite magrittr tidyr]; }; openblender = derive2 { name="openblender"; version="0.5.81"; sha256="01akixxj04kgrxhv04icrivfpnipnpg9j62i3y19q3jkl9846lh1"; depends=[httr jsonlite]; }; @@ -13439,14 +13523,14 @@ in with self; { opencv = derive2 { name="opencv"; version="0.2.3"; sha256="1kpkw3wkvfs2g9pdkk0s9q7a3pq3vq7n9hw55bz0v9c2mmdcz92b"; depends=[magrittr Rcpp]; }; opendatatoronto = derive2 { name="opendatatoronto"; version="0.1.5"; sha256="1fiviazs0ydxvmsqaayhwnxf4wl4sx1psn8i5mpis7218d9ihagy"; depends=[ckanr curl magrittr readxl sf tibble xml2]; }; opendotaR = derive2 { name="opendotaR"; version="0.1.4"; sha256="17cygsw3nkg6zincfrcdh1509rlz3n5zrv9wvv7mjngm61sn79nf"; depends=[dplyr jsonlite lubridate]; }; - openeo = derive2 { name="openeo"; version="1.2.2"; sha256="10lmkga3pm6h0sv0jccazi3xkda3fzqfk5nv5xf8hkm3g3kccs40"; depends=[base64enc htmltools httr2 IRdisplay jsonlite lubridate R6 rlang sf]; }; + openeo = derive2 { name="openeo"; version="1.3.0"; sha256="002zrvrm417ix80vrqnl2wygqh0vjymfi5hl88v6ajfspp9r73qn"; depends=[base64enc htmltools httr2 IRdisplay jsonlite lubridate R6 rlang sf]; }; openintro = derive2 { name="openintro"; version="2.4.0"; sha256="1svvlhdnv8dvqwphsn83asfd5xzvvar2bz334aqndqx76dv9j88j"; depends=[airports cherryblossom ggplot2 readr rmarkdown tibble usdata]; }; openmetrics = derive2 { name="openmetrics"; version="0.3.0"; sha256="0bcljsirlkxn0h87j2g2jb6spcik84h7nms06mcj40ckx188yr82"; depends=[R6]; }; - openssl = derive2 { name="openssl"; version="2.0.4"; sha256="1v2w19sffwqkgi9nj593ga46l9qp716lyb3gnjihq3624x8wd9d1"; depends=[askpass]; }; + openssl = derive2 { name="openssl"; version="2.0.5"; sha256="1lw60yq20r42l7y1wbp79s3mk3dwg62v0dh7jx1cdd7rb46i9hla"; depends=[askpass]; }; opentimsr = derive2 { name="opentimsr"; version="1.0.13"; sha256="0m4xp70cq4h76r4qk7krn5p9w3xv44z5lrkpys7kbvxr38g5y0il"; depends=[DBI Rcpp RSQLite]; }; 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.1"; sha256="1j2516plvlrp7l0mw7xqjhjjcidfdnfsybdhi2bx3n0910w29lk4"; depends=[Rcpp stringi zip]; }; - openxlsx2 = derive2 { name="openxlsx2"; version="0.3"; sha256="1hxz98nn09y86whx2z0dr0hxgg7cz8h10jz75ri4xpgcmlfxhhw6"; depends=[magrittr R6 Rcpp stringi zip]; }; + openxlsx2 = derive2 { name="openxlsx2"; version="0.4"; sha256="0rfp82abrhfc094xxa634r850gw8nx79ariw6kib6z1dh9bli17p"; depends=[magrittr R6 Rcpp stringi zip]; }; opera = derive2 { name="opera"; version="1.2.0"; sha256="09gh0c74y3n25f9p1rya8ybql5mfaqkcnr8i8wwwzfm67vqdfrnh"; depends=[alabama htmltools htmlwidgets pipeR rAmCharts Rcpp RcppEigen Rdpack]; }; operator_tools = derive2 { name="operator.tools"; version="1.6.3"; sha256="1v4dg7xhz24dnp0zxn815x1405ig64ibii6y40la1gvmzcc41dz5"; depends=[]; }; operators = derive2 { name="operators"; version="0.1-8"; sha256="0zgcv2q46qyqv4dhbd33s4044zjw38w8dqfpzs0c1lxjpkil3dnx"; depends=[]; }; @@ -13456,7 +13540,7 @@ in with self; { optR = derive2 { name="optR"; version="1.2.5"; sha256="0q7jf4m0gzm11izl5lff17pvr855smqmc6zzi1bc7m6h3z865l32"; depends=[]; }; optbdmaeAT = derive2 { name="optbdmaeAT"; version="1.0.1"; sha256="1y1mvcyjihpj1wgjmifhmd10717wr1srp7h87azs4gfypgsiqchn"; depends=[igraph MASS Matrix]; }; optbin = derive2 { name="optbin"; version="1.2"; sha256="08v8dn3jn75p1f04lc963gasyszjf57j7kajwpqv4w20lwjsw17w"; depends=[]; }; - 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]; }; + optedr = derive2 { name="optedr"; version="2.0.0"; sha256="17r0axfh7yjv5xj9060vi5vysnmi38pz5dsvm0fazfcpzzlxnld7"; depends=[cli crayon dplyr ggplot2 nleqslv purrr rlang shiny]; }; optextras = derive2 { name="optextras"; version="2019-12.4"; sha256="1sqkid6h13h8i8wzri26s828ycwlxlwpwxd85r8bw9h8hs1n602r"; depends=[numDeriv]; }; 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]; }; optiSolve = derive2 { name="optiSolve"; version="1.0"; sha256="0mhl5gdz3y3cs3p6v7z4n50na3sqj0w739gixcf4qgb1ppx0h1xa"; depends=[alabama cccp MASS Matrix nloptr plyr Rcpp shapes stringr]; }; @@ -13466,15 +13550,15 @@ in with self; { optigrab = derive2 { name="optigrab"; version="0.9.2.1"; sha256="1c3q4kx8rkgpjsy0hy2w2dd9kv51avnw1ab82hzmjgngfnvaig0n"; depends=[magrittr stringi]; }; optim_functions = derive2 { name="optim.functions"; version="0.1"; sha256="1la3v8yd9cdichp3mka4x86hr9lynh6qfg7h9ab6cwijw6kzkn6g"; depends=[lhs randtoolbox stringr]; }; optimCheck = derive2 { name="optimCheck"; version="1.0"; sha256="1qjkv1mfyn7sw0dkxxcdaqj85vl71cgffpf3k3mvzy0s8yhxjb4n"; depends=[]; }; - optimLanduse = derive2 { name="optimLanduse"; version="1.1.0"; sha256="0n30si6znvcyncvzbcm2149dvpqdmawamb5raz2fg19jjkj5qpfl"; depends=[dplyr lpSolveAPI tidyr]; }; + optimLanduse = derive2 { name="optimLanduse"; version="1.1.2"; sha256="0vrn794y6fp02ara6xa1vlfx7vim0gbx5bc1pkns2fh76gqpsa4n"; depends=[dplyr lpSolveAPI tidyr]; }; optimParallel = derive2 { name="optimParallel"; version="1.0-2"; sha256="178ayfaivkbxkghxbg97lx4gl27kxkmgaaw9y8q5206r4cncd6qg"; depends=[]; }; optimStrat = derive2 { name="optimStrat"; version="2.3"; sha256="1jkwhgpw7nknd7h8c01z25x566bw2qb388i6g5nwcygxsshdgpri"; depends=[cubature mvtnorm shiny]; }; optimalThreshold = derive2 { name="optimalThreshold"; version="1.0"; sha256="1m39q36p7i7z31b90awriq5jf9rfybyw5lj3m1w33v2ssipkzp1n"; depends=[ars coda HDInterval mgcv rjags]; }; - optimall = derive2 { name="optimall"; version="0.1.1"; sha256="15cq4b50j39ahpx84g0wrg7gs9n36rx4ij2srm14zcjsmvnxbv9p"; depends=[dplyr glue magrittr rlang tibble]; }; + optimall = derive2 { name="optimall"; version="0.1.2"; sha256="1lq1pd8ns6ivffp5kh3w1vczdwp41mgsywlaykyc7vb6j55qycy4"; depends=[dplyr glue magrittr rlang tibble]; }; optimbase = derive2 { name="optimbase"; version="1.0-10"; sha256="0hdzbqr03jwy1vz3q9iw0kvii5p9g1vm4c3hs3jxszcj1rgrfm12"; depends=[Matrix]; }; optimg = derive2 { name="optimg"; version="0.1.2"; sha256="0fc7d3g5nxjjcbwh6v5m0ryhanw80v250j8m7j2gv4c9ql4g650d"; depends=[ucminf]; }; optimization = derive2 { name="optimization"; version="1.0-9"; sha256="1pg9a78hhm0h4pfagj13r1dmynv714knhw2dxhzhcvlgk9inpam8"; depends=[colorspace Rcpp]; }; - optimizeR = derive2 { name="optimizeR"; version="0.1.1"; sha256="1laxj4x77ws3q1bvdb5vqx2i3fspqws65x5jfsfj73j4qlc04z56"; depends=[lifecycle]; }; + optimizeR = derive2 { name="optimizeR"; version="0.2.0"; sha256="10pnf20p544ppa6q5arzay73pakin8yc04ywh5k49v5px2j0l8zc"; depends=[]; }; 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]; }; @@ -13489,6 +13573,7 @@ in with self; { optparse = derive2 { name="optparse"; version="1.7.3"; sha256="1v87db7fm494dwxvdsnl1m2kj84nplq7pkh0g41najhx0npy31v2"; depends=[getopt]; }; optpart = derive2 { name="optpart"; version="3.0-3"; sha256="18h659gbgzflq81lcchc058xjgljkmhpsjkh51ylygwrv1qjrz2i"; depends=[cluster labdsv MASS plotrix]; }; optrcdmaeAT = derive2 { name="optrcdmaeAT"; version="1.0.0"; sha256="16g4612mwyfsckn6l71fbrjnnjv4yvnac1cccbrn3k8jh07qgb1h"; depends=[igraph MASS Matrix]; }; + optrefine = derive2 { name="optrefine"; version="1.0.0"; sha256="0s5gwshphjwl02vw22h9dckqix7yw0zzyvasfy594c7d1qw46y4p"; depends=[ggplot2 MASS Rglpk sampling]; }; optweight = derive2 { name="optweight"; version="0.2.5"; sha256="1mfk9sp47flqq7i762wip5191j8m0q9kbyxs4a7f0pd76qwf67q2"; depends=[ggplot2 Matrix osqp]; }; opusminer = derive2 { name="opusminer"; version="0.1-1"; sha256="1vw6pbk1iiaxmfws95wmwf56p3afk10s5c3x9f0lliamckpyzkck"; depends=[arules Matrix Rcpp]; }; ora = derive2 { name="ora"; version="2.0-1"; sha256="0albxqma220rnrpfdq3z9cawr83q1a0zzczbbcy4nijjm4mswphy"; depends=[DBI ROracle]; }; @@ -13504,10 +13589,10 @@ in with self; { orders = derive2 { name="orders"; version="0.1.6"; sha256="0b1ysq22qhdzs5fb63m786iil0rkb9qsj9p730izn7dg3zx36gl1"; depends=[actuar gamlss_dist Newdistns]; }; orderstats = derive2 { name="orderstats"; version="0.1.0"; sha256="0a3ga0cjryvbininspsx5wzc96s3fza06s3d5fhbllbixz0rap4a"; depends=[]; }; ordiBreadth = derive2 { name="ordiBreadth"; version="1.0"; sha256="04faqhas1p9lxhghd4xq07yq1nxv7ns18avhvkql7sy5a9g7bfs1"; depends=[vegan]; }; - ordinal = derive2 { name="ordinal"; version="2019.12-10"; sha256="09bpmjmbf4x82kgf6bm4bkncq2apdv9mk20zj4zgma2jx2vyfhbs"; depends=[MASS Matrix numDeriv ucminf]; }; + ordinal = derive2 { name="ordinal"; version="2022.11-16"; sha256="14yld28vjmvxbwz6mapfri4vrj3nsf9p73fn2z80j6jkz8fsv22l"; depends=[MASS Matrix nlme numDeriv ucminf]; }; ordinalClust = derive2 { name="ordinalClust"; version="1.3.5"; sha256="0hmqvhrmijgzanh08z5v82a07zl7xm69wl8zzj99fksahyrgxjdc"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; 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]; }; + ordinalForest = derive2 { name="ordinalForest"; version="2.4-3"; sha256="06blmwmn42dv6sri3j3473arrql5rihdlp7kgh56b2w1j2wdqq7s"; depends=[combinat nnet Rcpp verification]; }; ordinalLBM = derive2 { name="ordinalLBM"; version="1.0"; sha256="1sfzkm3f9s5nbalakgk5v919wr7hdlr5p280rw2p8dy4wxr3xk3s"; depends=[RColorBrewer reshape2]; }; ordinalNet = derive2 { name="ordinalNet"; version="2.12"; sha256="0ijgxp1lh4hbgks0p5041f5s6kpfrlm6f7hdz2nm3dn1rhq6bwvi"; depends=[]; }; ordinalRR = derive2 { name="ordinalRR"; version="1.1"; sha256="1sfkq8gryyls22208ympw5scgb4jkd27pyc1qklw4x7cz9wfnfbp"; depends=[rjags]; }; @@ -13515,17 +13600,17 @@ in with self; { ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.7"; sha256="0c1a4ziyh6jcqnblvc97gpv7bqyhd56gmxxyn1jascpvs2xxq2qy"; depends=[survival]; }; ordinalpattern = derive2 { name="ordinalpattern"; version="0.2.1"; sha256="1hlzi8rd24d9ab28dn70hf96d82r275l784ryk0c3hx574a1brlq"; depends=[gtools mvtnorm]; }; ordr = derive2 { name="ordr"; version="0.1.1"; sha256="07nsl6mdm4dmyl8vsqzcpd2mihcxsm68gjx3v1dfqgjqmz477nvf"; depends=[dplyr generics ggplot2 ggrepel labeling magrittr purrr rlang scales stringr tibble tidyr tidyselect]; }; - ore = derive2 { name="ore"; version="1.7.1.1"; sha256="0rs5r5h11x4l4nsbl4xqzbl4ahajd5374fq05abcmfjnjr9j64w5"; depends=[]; }; + ore = derive2 { name="ore"; version="1.7.2.1"; sha256="104506x9x14bs8lfhydwpgdh4qws2vqkvyy6xrlrviqlll6qbjgg"; depends=[]; }; oreo = derive2 { name="oreo"; version="1.0"; sha256="1qzv6fjana5fx45msqasqfniiancsch6j8r1llh1xyg2wjhqdj23"; depends=[fftwtools ggplot2 gridExtra openxlsx pracma scales spectral]; }; ores = derive2 { name="ores"; version="0.3.2"; sha256="0xzc0d38z7h5ghab3kqsv0r2cl3888j7vn94p51xlwcbhnq10kip"; depends=[httr]; }; orf = derive2 { name="orf"; version="0.1.4"; sha256="1njcnya5f2wx50l7gyf53js16xj1y6pwgbghxq4nm4grf2ck3mz1"; depends=[ggplot2 ranger Rcpp xtable]; }; - org = derive2 { name="org"; version="2022.7.21"; sha256="0gc01im9mpb7kj0dc4blgry868jrr1wy4v5wbfdsnbf5zy4xxivl"; depends=[]; }; + org = derive2 { name="org"; version="2022.11.23"; sha256="0ppiwdzy7x0fnqq5j23dim4g64cn3bq72v2vd91c2i3sg4n5ahlk"; depends=[]; }; orgR = derive2 { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[data_table ggplot2 ggthemes lubridate stringr]; }; organizr = derive2 { name="organizr"; version="0.1.0"; sha256="1i6j7c7d588gnjmh3ddknrs95mhw6ikq53c6wd3zy82lmjvh96bv"; depends=[fs here readr rlang rstudioapi stringr]; }; orgutils = derive2 { name="orgutils"; version="0.4-1"; sha256="1yc3avhq3786his7nd60zfbzd9inkfrfz938r8378z59zbb1mzqq"; depends=[textutils]; }; orientlib = derive2 { name="orientlib"; version="0.10.4"; sha256="0lds3y05byag466asi8hmv1yfllsdx7z5i8hq21r6dx3w4n4f46x"; depends=[]; }; origami = derive2 { name="origami"; version="1.0.7"; sha256="0b66alm1mr6vsgj5cgliqxw8vpm1x504qs42crlf0n6339a38h5l"; depends=[abind assertthat data_table future future_apply listenv]; }; - origin = derive2 { name="origin"; version="1.0.0"; sha256="0byzia26snxgwqzabbg634y1s2w7gbk065cbv6v9fxxkrjb5ifk3"; depends=[rstudioapi]; }; + origin = derive2 { name="origin"; version="1.1.0"; sha256="132ccdh40rz2rxabqjfjrmhpjrm5b5hm9zfqm3qwssgligf30vg3"; depends=[cli rstudioapi]; }; orloca = derive2 { name="orloca"; version="4.10"; sha256="113y76gyhslpfyq7n1nnbgnxhxgr213f28vnc3n3b9pghkkr0p4z"; depends=[knitr png rmarkdown ucminf]; }; orloca_es = derive2 { name="orloca.es"; version="4.9"; sha256="00zb08dqcsh1ljl4f2djm1pwbrfbaddgapn3v8nascmwxlhb2hkw"; depends=[orloca]; }; ormBigData = derive2 { name="ormBigData"; version="0.0.1"; sha256="1rq202k4assmij21bjjk1ba7121p5p3rp21k548cc6lk81xj1rcc"; depends=[benchmarkme doParallel foreach Hmisc iterators rms SparseM]; }; @@ -13547,8 +13632,7 @@ in with self; { oskeyring = derive2 { name="oskeyring"; version="0.1.5"; sha256="10ajmkw8sfcafs77flg0050s8vf88lq56rv2dxk9gv4pkvg8z498"; depends=[]; }; osmdata = derive2 { name="osmdata"; version="0.1.10"; sha256="0ysmjmab6yfqcwzbjjqlk0hbna0x8fg27p3svjs5y3qasyyx7wwq"; depends=[curl httr2 lubridate magrittr Rcpp reproj rvest sp tibble xml2]; }; osmextract = derive2 { name="osmextract"; version="0.4.1"; sha256="03bxdkykp081q3d9n14y0qp31vnllc4rzp2ldzs4s572xfcjd1hb"; depends=[httr jsonlite sf]; }; - osmplotr = derive2 { name="osmplotr"; version="0.3.3"; sha256="0p94phv7jn0q9k25300zz59ldfphm9xgy6i7n3r8xj4zay0c7mf2"; depends=[e1071 ggm ggplot2 mapproj osmdata rgeos sp spatstat spatstat_core spatstat_geom]; }; - osqp = derive2 { name="osqp"; version="0.6.0.6"; sha256="1q669vscwypz0vf6s38b5yzn178miql4xf5dg7b7y2fnjqdl6gw5"; depends=[Matrix R6 Rcpp]; }; + osqp = derive2 { name="osqp"; version="0.6.0.7"; sha256="00w2hr0pagnvpsk84z99c7alhv7xvs9wpcmkzbcg3qs14g888rgf"; depends=[Matrix R6 Rcpp]; }; osrm = derive2 { name="osrm"; version="4.0.0"; sha256="0lp5idik0lp2jn7mkgz512kpgp1zxxn4c7b1xb7aaia112p9fapp"; depends=[curl googlePolylines mapiso RcppSimdJson 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=[]; }; @@ -13580,7 +13664,7 @@ in with self; { 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.4.0"; sha256="1rp8rvqg292b88dxmm21cxnni4n7ciqckxxjan3h3skyss7mc95d"; depends=[curl dplyr forcats ggplot2 ggrepel htmltools httr jsonlite leaflet lifecycle 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.3-1"; sha256="0xi2xxyc6lxkwgaans0v2xj9jd0pvgxlyc5rmjilnc0afzwdv3x9"; depends=[geometa httr jsonlite keyring openssl R6 sf terra XML]; }; + ows4R = derive2 { name="ows4R"; version="0.3-2"; sha256="0p2yyzjxfkj3pr490ddcqxniyb3635rg26jmnc1hs29bv7aq014s"; depends=[geometa httr keyring openssl R6 sf terra XML]; }; ox = derive2 { name="ox"; version="0.1.0"; sha256="0j0va301bmppvmk6paqaqqaw85h8yf92i3pz7i59f2j8q9im82rx"; depends=[]; }; oxcAAR = derive2 { name="oxcAAR"; version="1.1.1"; sha256="1szifw978qr7v8n178jhg4ap2jwvfnwjl2izbbiydwx8q1fyj2q4"; depends=[jsonlite stringi stringr]; }; oysteR = derive2 { name="oysteR"; version="0.1.1"; sha256="11zg959h9104hh8wid4003s8c4z9xhmicj39cc5vq1j8g1g7ilr7"; depends=[cli dplyr glue httr jsonlite purrr rjson rlang stringr tibble tidyr yaml]; }; @@ -13597,7 +13681,7 @@ in with self; { pRF = derive2 { name="pRF"; version="1.2"; sha256="17srabk7mam16rdzc5g9ggdrhjjk8wibny40gxvgzkv7qgq7m80x"; depends=[dplyr ggplot2 multtest permute randomForest reshape2]; }; 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.4.0"; sha256="0k8800043dq9ddx0xwvpqvzkfdklbmsb1svn9kvls20c93rxwvf0"; depends=[data_table ggplot2 ggpubr ncdf4 R_utils raster sf]; }; + pRecipe = derive2 { name="pRecipe"; version="0.4.2"; sha256="0z1jsnc5f2j2gq55sgqxys94l9cpqynlrhn8nqqxg4a2vc2b59yp"; depends=[data_table ggplot2 ggpubr ncdf4 R_utils raster sf]; }; pRepDesigns = derive2 { name="pRepDesigns"; version="1.0.0"; sha256="189jmh78vcr174lf0s283pbhknr87h3bq02gvvpg5r2hv31gdgjl"; depends=[]; }; pTITAN2 = derive2 { name="pTITAN2"; version="1.0.2"; sha256="1mwx7k8ql4l572xvwb5gns9n4kqk779wwm4sg7nbgzz8xvcdh665"; depends=[data_table]; }; pa = derive2 { name="pa"; version="1.2-2"; sha256="0w76m169qghm8r3z319jv901ri136c9maa5j0r9kbgpdnq25v53w"; depends=[ggplot2]; }; @@ -13608,15 +13692,15 @@ in with self; { packageDiff = derive2 { name="packageDiff"; version="0.1"; sha256="0qxgx2ac0x7p9j9clj7hgjahf7xwzcjkcw0d2n6w0r9c4g0mw9w2"; depends=[diffr htmlwidgets]; }; packageRank = derive2 { name="packageRank"; version="0.7.2"; sha256="0z1ssfjkd831l6mf08qvch73h6sa3kpag46ybwyzbcx0hq6s0dqq"; depends=[cranlogs data_table ggplot2 ISOcodes memoise pkgsearch R_utils RCurl rversions sugrrants]; }; 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]; }; + packcircles = derive2 { name="packcircles"; version="0.3.5"; sha256="0m8ivgc5y1f9ramqw6sxb02ri6aqxz3av0l5csl32mdldrb126nc"; depends=[Rcpp]; }; packer = derive2 { name="packer"; version="0.1.3"; sha256="0b51nag4dmjxb8fb6z79j92dx1s6427rhmr2piaqdzrfbk9kd7dh"; depends=[assertthat cli fs htmlwidgets jsonlite roxygen2 rprojroot rstudioapi usethis]; }; packrat = derive2 { name="packrat"; version="0.8.1"; sha256="1ni3xn51xifdb2bya5z54jn4nxgss6f23b3hn126j2kaz80h7ns5"; 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]; }; + pacotest = derive2 { name="pacotest"; version="0.4.2"; sha256="0zdrvcrf6ynid2wpngdslxzkpc4grcvrf6bzbrni9rvp94sfzjlf"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; }; pacs = derive2 { name="pacs"; version="0.4.8"; sha256="0p27bhpq4dvgzqay33vaj3h77hcxr7d7r3f6hpb424c0sqil65v2"; depends=[curl jsonlite memoise stringi xml2]; }; pacviz = derive2 { name="pacviz"; version="1.0.2"; sha256="0br6gbxh010hybqlhsh90wgqj98wwach5a3hfb39kkj4xkk9il7q"; depends=[circlize e1071 plotrix]; }; - padr = derive2 { name="padr"; version="0.6.1"; sha256="0xgzkvygg4ss3c4q1fspmarbagr14i1z1ka6lnfcxmh4m5zcir17"; depends=[dplyr lubridate Rcpp rlang]; }; + padr = derive2 { name="padr"; version="0.6.2"; sha256="0mgjdva2yj9m0mps69gafy3w1c4zhik002b5b2j2zvbv3m34mw97"; depends=[dplyr lubridate Rcpp rlang]; }; pafdR = derive2 { name="pafdR"; version="1.0"; sha256="1yimsd4h23hcf752p5flda3dqk8hgn6qm9k0pmbapxj4jbsw14w5"; depends=[curl exams stringr]; }; pafr = derive2 { name="pafr"; version="0.0.2"; sha256="0ali4m1pv73y88x1dk5rvmg1ysy48janjnc1hnqfcndszfz2b0wm"; depends=[dplyr ggplot2 rlang stringr tibble]; }; pagedown = derive2 { name="pagedown"; version="0.19"; sha256="1x26na8mqfrnlj5h3v1wxw1dhdxm891ckh0d23854fmss0yf6qrx"; depends=[bookdown htmltools httpuv jsonlite later processx rmarkdown servr websocket xfun]; }; @@ -13624,7 +13708,7 @@ in with self; { 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.10"; sha256="18ip8j5l5c3hqw1xsf5wnyas55i2mhk09phy68kjkjdgcymmpg7c"; 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.13"; sha256="0y28y62sg3l5k840xm6pajc0rygqm822ypbzcwx1ks5iw288dgbp"; depends=[BiocGenerics Biostrings dendextend DT GenomicRanges ggfortify ggplot2 heatmaply magrittr plotly R6 reshape2 S4Vectors shiny shinydashboard shinyWidgets vegan]; }; + pagoo = derive2 { name="pagoo"; version="0.3.17"; sha256="0scf40vyw7lh5jh4p28894fa05nfl8n71g55w9bs9gbkszmn792k"; 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=[]; }; paintingr = derive2 { name="paintingr"; version="0.1.0"; sha256="0km21rv6f137nngx4nzamplzgzhfgijlh1skfvvkp0cbjxv17cpi"; depends=[]; }; @@ -13633,7 +13717,7 @@ in with self; { pairwise = derive2 { name="pairwise"; version="0.6.0-0"; sha256="0mcd5lm6yk1hd1r1ffs0l3gj85bamnjw77i6lh4973lggs0zxzdc"; depends=[]; }; pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-27"; sha256="0yp9nibdrsddjqq6vdlfbpvmfgm209h99b6qqqd6wgfzng327822"; depends=[boot coin MASS MCPAN mcprofile]; }; pak = derive2 { name="pak"; version="0.3.1"; sha256="11vs377jfwxf8qpzf0pv5pkkdjzb6l3l5a35f2w1y1s88xz5rl1d"; depends=[]; }; - palaeoSig = derive2 { name="palaeoSig"; version="2.0-3"; sha256="1sn2nbiq037l81qvrqbg7gf1312g8vy574hsfng07qk1jpx7vwkk"; depends=[assertr dplyr forcats ggplot2 ggrepel magrittr MASS mgcv purrr rioja rlang TeachingDemos tibble tidyr vegan]; }; + palaeoverse = derive2 { name="palaeoverse"; version="1.0.0"; sha256="0p70y0vp3afmfk73p7dnykcn7adssrckq8di0y0znfmya6mqk8gr"; depends=[ape deeptime geosphere h3jsr httr pbapply sf stringdist]; }; palasso = derive2 { name="palasso"; version="0.0.8"; sha256="0cgxfzhp394c8xprc2k0qx9c274bbp0cpazk7xilfrgcgk08156i"; depends=[glmnet Matrix survival]; }; pald = derive2 { name="pald"; version="0.0.2"; sha256="0xix3sf6zqpl10asad7lhqp6yk9v8kz81pqmxbwb85in5lngz5nr"; depends=[glue igraph]; }; paleoTS = derive2 { name="paleoTS"; version="0.5.3"; sha256="1hpgyjnviw9gzy21rsa4vqkiyfpim5y70yrbjyq5z3ifanszggi5"; depends=[doParallel foreach mnormt]; }; @@ -13676,15 +13760,15 @@ in with self; { 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.10.0"; sha256="08h92wk8splf0w3rach9zbk3xz13phgcd1yybmgbs0sj4vx93whd"; depends=[backports checkmate data_table mlr3misc R6]; }; + paradox = derive2 { name="paradox"; version="0.11.0"; sha256="03v26qb0l8yhys7z5v2p9pwnc5wh26fvq4p0a0rh67qap6157dyx"; 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.2.0"; sha256="04yr9fbvf3w0pw899zvk9ljjhsz775aiyhspm0bvaqaxzv8fkgx3"; depends=[htmlwidgets]; }; parallelly = derive2 { name="parallelly"; version="1.32.1"; sha256="146a9i999vrflr4g1fph1pgkl4bq0dw102bjw8pp1zy7kbsqbiii"; depends=[]; }; - paramGUI = derive2 { name="paramGUI"; version="2.1.4"; sha256="0k2wkl99ji3w7xmd9k7zzvrr3dbf3237q7lxm527dnrq331pmxmi"; depends=[colorspace fields shiny shinydashboard TIMP]; }; - parameters = derive2 { name="parameters"; version="0.19.0"; sha256="10cl8vgcjncnry6qkkr41yyh8ngxxn81hwqqqix9g7pwpbf3c2mf"; depends=[bayestestR datawizard insight]; }; + parallelpam = derive2 { name="parallelpam"; version="1.0"; sha256="0fml4cgwqpwj8dqfbih1py2pvqksfiqd9v9442g0ls6kacjdmaph"; depends=[memuse Rcpp]; }; + parameters = derive2 { name="parameters"; version="0.20.0"; sha256="16y92q4h385sqc7xgdcrdmdvw0l8plxxbhcdsnx4gqqgm8di9l9p"; depends=[bayestestR datawizard insight]; }; paramhetero = derive2 { name="paramhetero"; version="1.0.0"; sha256="1zkwzmh3igkwfq87v3rmp3axfspl20qn4qmpyqql6ain564yyabw"; depends=[ggplot2 MASS]; }; paramlink = derive2 { name="paramlink"; version="1.1-5"; sha256="0a21cy8q3zv96zdq5q2hfkb2ga1fham00in7wfyyd9wpck9gp009"; depends=[assertthat kinship2 maxLik]; }; paramlink2 = derive2 { name="paramlink2"; version="1.0.3"; sha256="0ypn0fdrphblw64sdnfmyf9q4zbakqvl4xzr451phvhx52n1gb73"; depends=[pedprobr pedtools]; }; @@ -13704,10 +13788,10 @@ in with self; { parsedate = derive2 { name="parsedate"; version="1.3.1"; sha256="1cfinqlbchmkhkgmdwiy3mnxb17lp02jfk2gpw56hq9vh6wimhqz"; depends=[]; }; parsel = derive2 { name="parsel"; version="0.2.1"; sha256="0p5w7gdnakkgh36p3mknlz0s8a0sawiwyas442zcxy35x3kymnyf"; depends=[lubridate purrr rlang RSelenium]; }; parsermd = derive2 { name="parsermd"; version="0.1.2"; sha256="15fy5vgzbrxq1yj4bgd0q1n5gjwvfh6s03ar5mj3hpp5mz6qmsdg"; depends=[BH checkmate cli dplyr lifecycle magrittr pillar purrr Rcpp readr rlang rmarkdown tibble tidyr tidyselect withr yaml]; }; - parsnip = derive2 { name="parsnip"; version="1.0.2"; sha256="171crglp6ncy41iyb60gj6xp7zn2vnbffgbgpszrahf6j2hhxvw4"; depends=[cli dplyr generics ggplot2 globals glue hardhat lifecycle magrittr pillar prettyunits purrr rlang tibble tidyr vctrs withr]; }; + parsnip = derive2 { name="parsnip"; version="1.0.3"; sha256="1s1d5zjwag5a13y67l7sz4zj1w0dv0k7vpb6inz4x87d5rgchfi1"; depends=[cli dplyr generics ggplot2 globals glue hardhat lifecycle magrittr pillar prettyunits purrr rlang tibble tidyr vctrs withr]; }; partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; }; partR2 = derive2 { name="partR2"; version="0.9.1"; sha256="06ky0hhrq0mcsn9rwrzvwn0rrjj0l8rxs0hqp10668gdq5hjk8bn"; depends=[dplyr ggplot2 lme4 magrittr pbapply purrr rlang tibble tidyr]; }; - partialised = derive2 { name="partialised"; version="0.1.0"; sha256="19rm2fcv5am5512y1p77nss715dcdfrg3hvrgy2b49jr0f9i8d25"; depends=[pillar purrr rlang vctrs]; }; + partialised = derive2 { name="partialised"; version="0.1.1"; sha256="0rb9d5p21f1y0c8arwh1lf516vw30qinf15rkrv49qw97dvvb9db"; depends=[pillar purrr rlang vctrs]; }; particle_swarm_optimisation = derive2 { name="particle.swarm.optimisation"; version="1.0"; sha256="0y3pq129irxifiph40mf027gbc02c4pwkchs305pcbj3vr9pwsyw"; depends=[R6 rgl]; }; particles = derive2 { name="particles"; version="0.2.3"; sha256="0x76q9qcfaraiy0w8hrdk4ws16w1a8m363a3l4cphpi6xi329027"; depends=[cpp11 digest dplyr igraph mgcv rlang tidygraph]; }; partition = derive2 { name="partition"; version="0.1.4"; sha256="19f1j6hm35c57r2x51nh2kns3jyd85xxg06lgd94kb13brr1hk2v"; depends=[crayon dplyr forcats ggplot2 infotheo magrittr MASS pillar purrr Rcpp RcppArmadillo rlang stringr tibble tidyr]; }; @@ -13717,6 +13801,7 @@ in with self; { partitions = derive2 { name="partitions"; version="1.10-7"; sha256="1kxiy1wl7dr39kyfg2y9hd67s32knd83r2jsb7j9p3vg8iqq7yqb"; depends=[gmp mathjaxr polynom Rdpack sets]; }; partools = derive2 { name="partools"; version="1.1.6"; sha256="0w7p88y4ab4v14k16k95cyb5f3yl2g6ban11775rmi2h9xqkfxk8"; depends=[data_table pdist regtools]; }; partsm = derive2 { name="partsm"; version="1.1-3"; sha256="17md3j41knscllckiqnvkqvf2v0fgsig101vgg6z5ic1yzvzfxgs"; depends=[]; }; + parttime = derive2 { name="parttime"; version="0.1.0"; sha256="0zc0gbmycbrp3f0wr5mw3mp6ighvrb0rw3d8ilr4b1kqa20ws54q"; depends=[crayon lubridate pillar vctrs]; }; party = derive2 { name="party"; version="1.3-11"; sha256="174cc5b5qwv9r4qmm65c4n4zk6cxjf6vjmznpp8cc2ylflbim91y"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; }; partykit = derive2 { name="partykit"; version="1.2-16"; sha256="1cnx6qbw5svwh3nq40n5vr20179ihd3jgznm7mz4k50qkkid8hz6"; depends=[Formula inum libcoin mvtnorm rpart survival]; }; parzer = derive2 { name="parzer"; version="0.4.1"; sha256="0v97cfjkggkdhv8gc0ffgbijgwxzpz7n44z7gsmkvggjj3wsxvpr"; depends=[Rcpp withr]; }; @@ -13727,7 +13812,6 @@ in with self; { password = derive2 { name="password"; version="1.0-0"; sha256="1ijzqdw54l8wvpy6ys28njvhplzjxzzi5i9y41vjnrr88n13977v"; depends=[]; }; pasteAsComment = derive2 { name="pasteAsComment"; version="0.2.0"; sha256="1837s2bfxpgjs15q1brr166iyar2xzvmdj0qxknb8hnqrmi207mf"; depends=[clipr rstudioapi]; }; pastecs = derive2 { name="pastecs"; version="1.3.21"; sha256="0z4dic94ar646w7zc2ggi5hgvf2qnznsani94c5pyql8zspz47lc"; depends=[boot]; }; - patPRO = derive2 { name="patPRO"; version="1.1.0"; sha256="1l6q6glklmfgivs4gw0v8q4qa57wr2bna477sn2v401hcwmgnfyn"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; }; patchDVI = derive2 { name="patchDVI"; version="1.10.1"; sha256="14zhl2skj20gc09ycrycdq2slqrpbh6nf0lcsxf55kvshnwnmknc"; depends=[]; }; patchSynctex = derive2 { name="patchSynctex"; version="0.1-4"; sha256="1li3kw7a77sx6dss8pnxzb0p0sdy1kfm1zdnmhhj043zihrryd5p"; depends=[stringr]; }; patchwork = derive2 { name="patchwork"; version="1.1.2"; sha256="0xw9mh1qakj131nw98icxrxwvdlwy2ngwvmagrqr3m84sz9dbffs"; depends=[ggplot2 gtable]; }; @@ -13736,14 +13820,14 @@ in with self; { path_chain = derive2 { name="path.chain"; version="0.2.0"; sha256="1p28mcar4krgvkgn02xrlwcpzchnppn2l2k2iwh511c3qrfpy653"; depends=[logger rlang stringi]; }; pathdiagram = derive2 { name="pathdiagram"; version="0.1.9.1"; sha256="018frv1n3x0bf1682jibnm5k2dlkg85xa9mps28l22a0z8bplbv5"; depends=[shape]; }; pathfindR = derive2 { name="pathfindR"; version="1.6.4"; sha256="140m63cwwk3xrmgr8jrxa0nv0wjmkzqlrdbgq6g2g837khwfjj7y"; depends=[AnnotationDbi DBI doParallel foreach fpc ggplot2 ggraph ggupset igraph KEGGgraph KEGGREST knitr magick msigdbr org_Hs_eg_db pathfindR_data R_utils rmarkdown]; }; - pathfindR_data = derive2 { name="pathfindR.data"; version="1.1.2"; sha256="0p0infg5hxw40bacgni5w1a8xb29wc0xrd8mjsnlfarr8wygd9fl"; depends=[]; }; + pathfindR_data = derive2 { name="pathfindR.data"; version="1.1.3"; sha256="1gvlfkpk4fxh10vs792qdj5k3yvlc3dizh780c5a2xvdy1jj6gwm"; depends=[]; }; pathlit = derive2 { name="pathlit"; version="0.1.0"; sha256="0harvldkhq2c1wb9i4n72w1s3frhjzyn4cjpwk1n350zg12kh9gz"; depends=[httr jsonlite testthat timeSeries usethis]; }; pathmapping = derive2 { name="pathmapping"; version="1.0.2"; sha256="0kx4wxf6lhi58sif8fzr5w4wa0i5253fq4v0ynp721fv1hkvmhvz"; depends=[]; }; pathmodelfit = derive2 { name="pathmodelfit"; version="1.0.5"; sha256="1nxcnmz9r99znqmwibvvix7h3acp22cs6wp1jmp21p862ncabll8"; depends=[lavaan]; }; paths = derive2 { name="paths"; version="0.1.1"; sha256="19fl54r2myb9ky8ffnx71xw23a8dlg15sj9v36xcpv79z61ryws9"; depends=[BART boot gbm ggplot2 metR pryr tidyr twang]; }; - pathviewr = derive2 { name="pathviewr"; version="1.1.3"; sha256="1xx73ah9af1q422rf346ip3w8jbxvs14qn9jv6bj7vnpw3nxndxq"; depends=[anomalize cowplot data_table dplyr fANCOVA ggplot2 lubridate magrittr purrr R_matlab stringr tibble tidyr tidyselect]; }; + pathviewr = derive2 { name="pathviewr"; version="1.1.5"; sha256="0b518jhksv790zzgmykr5panh8dgl8v4abbxlbr1zayhbfz213c0"; depends=[anomalize cowplot data_table dplyr fANCOVA ggplot2 lubridate magrittr purrr R_matlab stringr tibble tidyr tidyselect]; }; pathwayTMB = derive2 { name="pathwayTMB"; version="0.1.3"; sha256="1zrs7l9vifrsixk20p0nxs6s8kadc3l3mj933s7ribaby2fb0r8m"; depends=[BiocGenerics caret clusterProfiler data_table glmnet maftools pROC purrr randomForest RColorBrewer survival survminer]; }; - patientProfilesVis = derive2 { name="patientProfilesVis"; version="2.0.2"; sha256="0w85y74n46665w8d4lv9pb88hmarn6ax9qsv0sl1xw1q7iby2pzx"; depends=[clinUtils cowplot ggplot2 gridExtra knitr plyr reshape2 scales stringr]; }; + patientProfilesVis = derive2 { name="patientProfilesVis"; version="2.0.5"; sha256="0kb84jpcmnyakggbb8m96qbbc3a7yj1025k13nhirx4i459d0913"; depends=[clinUtils cowplot ggplot2 gridExtra knitr plyr reshape2 scales stringr]; }; patrick = derive2 { name="patrick"; version="0.2.0"; sha256="1ghjvm82hgal091hfjfyz3ndg32xsggip5pp4y0g7rmrzpfjmpjs"; depends=[dplyr purrr rlang testthat tibble]; }; patternator = derive2 { name="patternator"; version="0.1.0"; sha256="0s4vrhdfblllnhpz2awhhrkwm8d4170xg7fpsp7kvvqy8z8biwvi"; depends=[data_table]; }; patternize = derive2 { name="patternize"; version="0.0.3"; sha256="072wjjinbkvrijqb90hk6h964m1h2gznj69jq3pidbzcr1xl93g1"; depends=[abind ClusterR dplyr geomorph imager magrittr Morpho purrr raster rgdal RNiftyReg sp vegan]; }; @@ -13753,7 +13837,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.13"; sha256="0qxrjmqywp4ychjwfbripfin4vlv0k041ycmr3pjr6p3dg910i3w"; depends=[paws_common]; }; - paws_common = derive2 { name="paws.common"; version="0.5.1"; sha256="17cfvx2ma0zcrj3grpsadx8p5r97s2z6c23qqmzry7ys9mn6k9f1"; depends=[base64enc curl digest httr jsonlite Rcpp xml2]; }; + paws_common = derive2 { name="paws.common"; version="0.5.3"; sha256="090csb0wjnsfhkphws5anrnml18y1k54yi48lxav8wp5kqj4wlb6"; depends=[base64enc curl digest httr jsonlite Rcpp xml2]; }; paws_compute = derive2 { name="paws.compute"; version="0.1.13"; sha256="1s7g4y2h763xf32p08drs3ygkfqb2zjikkgxb7yl91gk13zp7kjm"; 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]; }; @@ -13766,7 +13850,7 @@ in with self; { paws_security_identity = derive2 { name="paws.security.identity"; version="0.1.12"; sha256="092lz2ipn5iqr593x7ra8c0bj64yf6315mdc3llgwrjyb4vfxif9"; depends=[paws_common]; }; paws_storage = derive2 { name="paws.storage"; version="0.1.12"; sha256="06m887vpqp5d6k3zxdlga599dsv8v3rladk7xqaxqnld1f17am04"; depends=[paws_common]; }; pbANOVA = derive2 { name="pbANOVA"; version="0.1.0"; sha256="0m7946jv4zbs0k74klxkl8nbwirc48g6paqrfl5fadkd17xxqq2j"; depends=[DescTools dplyr lmtest MASS plyr Rmisc]; }; - pbapply = derive2 { name="pbapply"; version="1.5-0"; sha256="0m8a0ygwl98cs0vcha5gs9f7z8whcplwxhravhs9bfp5hvigxzgg"; depends=[]; }; + pbapply = derive2 { name="pbapply"; version="1.6-0"; sha256="0qbzqgxz3lm97y0k9v2radqblzb4r5zkfrjw5wj1a91dvxz3xhg8"; depends=[]; }; 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]; }; pbcc = derive2 { name="pbcc"; version="0.0.3"; sha256="11qnmxky23s6dak0kpd22h9la7khn4zwr9msk0liry8i6slwhchg"; depends=[ggplot2 ggpubr qcc rgenoud]; }; @@ -13810,14 +13894,15 @@ in with self; { pcr = derive2 { name="pcr"; version="1.2.2"; sha256="1lmgm8k3s7780ivrdj0zk1ninx7b5jffir6q5p2p47h62qqjmp5d"; depends=[ggplot2]; }; pcse = derive2 { name="pcse"; version="1.9.1.1"; sha256="1rb9146vjkf36vc5v3frykmsff7kp6qp1hhmj8pak583in4rz8f8"; depends=[]; }; pcsstools = derive2 { name="pcsstools"; version="0.1.1"; sha256="1vp4lflxzzgjfh1nkkfvnb74pjmbcdgrc1hlakjd8i5rw7swvr20"; depends=[gtools Rdpack]; }; - pct = derive2 { name="pct"; version="0.9.3"; sha256="1y3cmqirh003hyg80bnl0rpbcp9h9bzlv0lbjxq0wmvsb84hbqbn"; depends=[boot readr sf stplanr]; }; + pct = derive2 { name="pct"; version="0.9.7"; sha256="08cw92b5kr3fwz9dj1hnfxiygcg6aqka4v90i7km86bsbicvia7j"; depends=[boot crul readr sf stplanr]; }; pcts = derive2 { name="pcts"; version="0.15.5"; sha256="03iammgirj3vnrwh0fxvy3r08z3da23jbjkb2fzpya1pxfb2rnjq"; depends=[BB gbutils lagged lubridate Matrix mcompanion PolynomF Rdpack sarima xts zoo]; }; + pcv = derive2 { name="pcv"; version="1.0.0"; sha256="1kszyww5n8j7kfb6s5wvn19ch7h1d64dhqgz6wvgx6vp21ya6qks"; depends=[]; }; pdR = derive2 { name="pdR"; version="1.8"; sha256="1sjlcd8g564jrwmlhpjypgwqywz3ggq4lb6xwqzc1basbsx5zfrn"; 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-2"; sha256="0qrf0igxzalvsanj1mqryi0xl9lq0wlpg8bbgasbx3ibq4yqwn0s"; depends=[plm]; }; - pdfCluster = derive2 { name="pdfCluster"; version="1.0-3"; sha256="13m7b2wivvf58vyqbysj4r04w0nj2b5x0xnaxip712a6c66x1h7l"; depends=[geometry]; }; + pdfCluster = derive2 { name="pdfCluster"; version="1.0-4"; sha256="0d52xmrzsjc51j0gzd3729rjqh391643yq840b6hlpc2w4ycc46m"; depends=[geometry]; }; pdfetch = derive2 { name="pdfetch"; version="0.2.7"; sha256="1pyx6h9s0y2qx3wrdjk5rfg2wh023zjhrkryvdaynz667rjxgr0w"; 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]; }; @@ -13840,19 +13925,18 @@ in with self; { pecora = derive2 { name="pecora"; version="0.1.1"; sha256="0l66brd5d24hn279ck785jy4qnxiv9lc3d1czh4f3l25d0hj99xi"; depends=[matrixStats Rcpp RcppArmadillo]; }; pedSimulate = derive2 { name="pedSimulate"; version="1.4.0"; sha256="0x1djd9kjnbp8wrx2iy1hh3psf77lmhyipzdbyysd95ym6wkldvk"; depends=[]; }; pedalfast_data = derive2 { name="pedalfast.data"; version="1.0.0"; sha256="02s6igrybcfs8nyxr50iiwclhrwnq3x2x5w886imrlp2wbkf13m4"; depends=[]; }; - pedbp = derive2 { name="pedbp"; version="1.0.1"; sha256="0wc8y9wfv7spwww4l15nmjhlmlx8mpm0l6msn3pymv5kw7jipdip"; depends=[ggplot2 scales]; }; + pedbp = derive2 { name="pedbp"; version="1.0.2"; sha256="0yc6185i3jzpwkpmkm38vggyfba0pvz6hvzqfkl6ch591dvkldch"; depends=[ggplot2 scales]; }; pedbuildr = derive2 { name="pedbuildr"; version="0.2.1"; sha256="19yzfg5jms2qnww4p8npmk9815hrgqsbd49h8pi62yy9kjqnccai"; depends=[forrel glue pedprobr pedtools]; }; pedgene = derive2 { name="pedgene"; version="3.6"; sha256="0h66yshna10fannpdvi0m83s53b1hmnjym2mvc7ypcgr1glq6j13"; depends=[CompQuadForm kinship2 Matrix survey]; }; pedigree = derive2 { name="pedigree"; version="1.4.2"; sha256="1b3zhjn6sl1pnkfqim6xzk6qdak6acdpim585xhjl1rbc41540qx"; depends=[HaploSim Matrix reshape]; }; - pedigreeTools = derive2 { name="pedigreeTools"; version="0.1"; sha256="0kgbjyw9dlp4s91cyg5w0p2vn2h9pg9ixrhc5pwvkp3v1acd0xfm"; depends=[Matrix]; }; pedigreemm = derive2 { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; }; pedmod = derive2 { name="pedmod"; version="0.2.4"; sha256="1xr98vp2s3s2cw4bjdw6156zas15jxvp9fbyz9rxd68i3zrblplx"; depends=[alabama BH psqn Rcpp RcppArmadillo testthat]; }; - pedmut = derive2 { name="pedmut"; version="0.3.0"; sha256="0w42jhgrkf5f1baz2jb94fyccm0wx94vg0g1px4p39jvpknz9d6a"; depends=[]; }; + pedmut = derive2 { name="pedmut"; version="0.4.0"; sha256="19m09mwxs58qsbc7h9vjax6dhjlcz65razhmdb6l5y8w1dq2v9gw"; depends=[]; }; pedometrics = derive2 { name="pedometrics"; version="0.12.1"; sha256="06s1iyv2nldqqkh1n3cgl3a7ribk17kyadgfx76lpgy016fi7vz5"; depends=[lattice latticeExtra Rcpp]; }; pedprobr = derive2 { name="pedprobr"; version="0.7.0"; sha256="089wrsx8qx2isz20xqjmnficzb62n8afyskkbz726dymf942pk3a"; depends=[pedmut pedtools]; }; - pedquant = derive2 { name="pedquant"; version="0.2.0"; sha256="1idi1vfhc8hs6lm6xzcn5jkgbjsn3fcj6c1c3c5ifzq1jckg48fa"; depends=[curl data_table echarts4r httr jsonlite lubridate PerformanceAnalytics readr readxl rvest stringi TTR webdriver xefun xml2 zoo]; }; + pedquant = derive2 { name="pedquant"; version="0.2.1"; sha256="0kg29nsywrx8xczk6zw2xl83f5g0wxf6iwkhgawq1am3anr64ck6"; depends=[curl data_table echarts4r httr jsonlite lubridate PerformanceAnalytics readr readxl rvest stringi TTR xefun 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.3.0"; sha256="0nn6vax46b8lrqrkq153kvnd9708zfz0wn07qkfhi3dj73inh8c9"; depends=[kinship2]; }; + pedtools = derive2 { name="pedtools"; version="2.0.0"; sha256="0svr7n5vy315dw3chj4q0xyc1wvc1z7kgb7n6izzgzjx4vaykwnp"; depends=[kinship2]; }; 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]; }; pell = derive2 { name="pell"; version="0.1.0"; sha256="1621lnv6sii072did3kj6wapgh9iiqajayvkrmz7q86bp89405sm"; depends=[]; }; @@ -13866,13 +13950,13 @@ in with self; { penalizedLDA = derive2 { name="penalizedLDA"; version="1.1"; sha256="1bw5wiixmmg1vr3v0d59vh67f0gy2rvr30bi58skvrkb25qcjq6l"; depends=[flsa]; }; penalizedSVM = derive2 { name="penalizedSVM"; version="1.1.3"; sha256="1mvp9qzk9gw8z13rsjkxgb98s6jqd8anzggfw71pziif0fd6zv10"; depends=[corpcor e1071 MASS mlegp statmod tgp]; }; penaltyLearning = derive2 { name="penaltyLearning"; version="2020.5.13"; sha256="0297rp5zn6d0axl44i3baq2vqvhrx6s8irrysvqdcx1rkishf4j0"; depends=[data_table ggplot2]; }; - pencal = derive2 { name="pencal"; version="1.2.2"; sha256="05fx8avdqhgshvx6q5yhkndjg77szls8i2n263kqzyk7qf8p0c4x"; depends=[doParallel dplyr foreach glmnet lcmm magic MASS Matrix nlme purrr survcomp survival survivalROC]; }; + pencal = derive2 { name="pencal"; version="1.3.1"; sha256="139hdgdpl55ag9azdm2rklnjmbg251517k4mi56xphzn78ji6ncc"; depends=[doParallel dplyr foreach glmnet lcmm magic MASS Matrix nlme purrr survcomp survival survivalROC]; }; pencopulaCond = derive2 { name="pencopulaCond"; version="0.2"; sha256="18hjjxnd0l2ms20ddqkghfbd4as5kq2rgwqzpz4y38k6nw76x511"; depends=[doParallel fda foreach igraph lattice latticeExtra pacotest quadprog TSP]; }; pendensity = derive2 { name="pendensity"; version="0.2.13"; sha256="1wcsib7m2161nqqrmgdvrj7lr8zq6njc9xr935hwfh3qbbgkmfjb"; depends=[fda lattice]; }; penfa = derive2 { name="penfa"; version="0.1.1"; sha256="1r8lq4kvlwlk7q0mdzkrdm9sx7lqq4l27jfxa1zcfh50sk1qlam2"; depends=[GJRM MASS mgcv trust]; }; penppml = derive2 { name="penppml"; version="0.2.0"; sha256="0r3wypzndg07vrbifs1h5wm4vcsd27z0gjhvlhgwq0pm1qgsgssc"; depends=[collapse devtools dplyr fixest glmnet magrittr matrixStats Rcpp RcppEigen rlang]; }; 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]; }; + pensim = derive2 { name="pensim"; version="1.3.6"; sha256="18z43p1iswmnvwaf3k5vhv6rzzmfn618har0a0bl9j5nfzx20rpx"; depends=[MASS penalized]; }; peopleanalytics = derive2 { name="peopleanalytics"; version="0.1.0"; sha256="0ay85yxx30p4i8icn8l8ppjddiwkbw1g6ymnmvw5gnd9hgmwbrx0"; depends=[]; }; peopleanalyticsdata = derive2 { name="peopleanalyticsdata"; version="0.2.1"; sha256="0ig65y4sl6wagzcvj8wwjw2dblb61hgbsqvp76wvxbhga1q0wnpf"; depends=[]; }; pepe = derive2 { name="pepe"; version="1.2.0"; sha256="1ihms63crxq0k7hd2yjyxmfw0yfy668srw012vi8mf8p31jdcr3j"; depends=[dplyr ggplot2 psych tidyr]; }; @@ -13886,7 +13970,7 @@ in with self; { perccalc = derive2 { name="perccalc"; version="1.0.5"; sha256="14557k7khc3l5m0vlam0fvbsb6p78v9gfcnx5ksxcvrab28xj7p3"; depends=[multcomp tibble]; }; percentiles = derive2 { name="percentiles"; version="0.2.2"; sha256="08gzl2qq0856nj20bdxl3r0a7p5f4cjmvxkaqkjvq4n275ghvskq"; depends=[assertive_types assertthat dplyr R6]; }; perfectphyloR = derive2 { name="perfectphyloR"; version="0.2.1"; sha256="1i1h5k2aqaqygd8gzq2bmz266mjzdi2mfikkz6hzmhi2il8708w9"; depends=[ape phytools Rcpp RcppArmadillo]; }; - performance = derive2 { name="performance"; version="0.10.0"; sha256="15yx75y17h3l1v7jpp8zbygy64lz7kds5yrgd7wrzw56564d2rhb"; depends=[bayestestR datawizard insight]; }; + performance = derive2 { name="performance"; version="0.10.1"; sha256="1m2zzznfbla8qdm0kxbj5vp431kpygpi4d70042hkg1ly3fyg7pz"; depends=[bayestestR datawizard insight]; }; performanceEstimation = derive2 { name="performanceEstimation"; version="1.1.0"; sha256="08jx2zl6xh0rp54xa70gb717wbfdzfrx9b47i3b3ly41qaf85vrc"; depends=[dplyr ggplot2 parallelMap tidyr]; }; pergola = derive2 { name="pergola"; version="1.0"; sha256="1650ipp2b455xdkznwm7bnxvimad7nbyr9i1lg2vdh64j1qfh7gl"; depends=[seriation]; }; periscope = derive2 { name="periscope"; version="1.0.1"; sha256="06rhi77a7561a0k99sn9h0pxfgar4s8iyg2mligyig2z8j66dcqb"; depends=[DT fresh ggplot2 lubridate shiny shinyBS shinydashboard writexl yaml]; }; @@ -13937,7 +14021,7 @@ in with self; { phangorn = derive2 { name="phangorn"; version="2.10.0"; sha256="1kjxp352jdk1amxpk9jrql490d0qy79zm65y8szyxrm1adqghlyi"; depends=[ape digest fastmatch generics igraph Matrix quadprog Rcpp]; }; pharmaRTF = derive2 { name="pharmaRTF"; version="0.1.4"; sha256="1h16r4yhlm6mbwq3k24ssm70bsrg2hvykqh8dayigz5wi2nq5c1f"; depends=[assertthat huxtable purrr stringr]; }; pharmr = derive2 { name="pharmr"; version="0.73.1"; sha256="1g37p9v7kn1x4f2fw8lz30cvfl11b8v2fignddfymllzwkz7xmgp"; depends=[altair reticulate]; }; - phase = derive2 { name="phase"; version="1.2.5"; sha256="0nnpki44qyikavx8dpayn0jk0jbznkb1w4jcp06j5b8c70a04gc9"; depends=[behavr circular lubridate plotly pracma signal zeitgebr zoo]; }; + phase = derive2 { name="phase"; version="1.2.7"; sha256="168b76kqfzazaszc2k6iha58pffi1g6rpq69ndr3p2xscvb9jcy8"; depends=[behavr circular lubridate plotly pracma signal zeitgebr zoo]; }; phase1PRMD = derive2 { name="phase1PRMD"; version="1.0.2"; sha256="0gr73nsp0an0ci6l86h9fw6l791jdw0b1497qi58w25zypggdyac"; depends=[arrayhelpers coda dplyr ggplot2 gridExtra kableExtra knitr MASS plyr RColorBrewer reshape2 rjags]; }; phase1RMD = derive2 { name="phase1RMD"; version="1.0.9"; sha256="0dnyqa6jias2jqjqjpiq32jnd21ghb2shw45vdq8b5xyb8rxclwj"; depends=[arrayhelpers boot coda ggplot2 mvtnorm rjags]; }; phaseR = derive2 { name="phaseR"; version="2.2.1"; sha256="1gq882r4jkq8f0xm3qmjh4zx540sgpdhlj8894dhf5g6vhgaa1kd"; depends=[deSolve]; }; @@ -13952,14 +14036,14 @@ in with self; { pheno = derive2 { name="pheno"; version="1.7-0"; sha256="1hg2gqz3ibawn5ah1hffgfp15cis75nwd04jha09mjpkn1w8h9lg"; depends=[nlme quantreg SparseM]; }; phenoCDM = derive2 { name="phenoCDM"; version="0.1.3"; sha256="1cyqwc36zwa2a4ljy0xnqz0hhw0r98qk2an5y002lrchkqydplwp"; depends=[rjags]; }; phenocamr = derive2 { name="phenocamr"; version="1.1.5"; sha256="1w9lzlmp4q2x12qhp4xmschcd79razy5fybq94381l7dshrwvzln"; depends=[changepoint daymetr httr jsonlite memoise MODISTools zoo]; }; - phenofit = derive2 { name="phenofit"; version="0.3.2"; sha256="1mmsaca52m4k73fbq8m29f118q02qps91glfxpw1jjbm5hqgazsv"; depends=[data_table dplyr ggplot2 gridExtra JuliaCall lubridate magrittr numDeriv optimx purrr Rcpp RcppArmadillo ucminf zeallot zoo]; }; + phenofit = derive2 { name="phenofit"; version="0.3.7"; sha256="1wmih8s56w54yi6wq5wrswi89i9wdyfsgz1xa1ca8vicmrn313br"; depends=[data_table dplyr ggplot2 gridExtra lubridate magrittr numDeriv optimx purrr Rcpp RcppArmadillo stringr ucminf zeallot zoo]; }; phenology = derive2 { name="phenology"; version="7.9"; sha256="0zacgrw5j6m5dhfkbbzawb832sp87nyp28g36nw150ha7q5qwjf2"; depends=[HelpersMG numDeriv optimx]; }; phenomap = derive2 { name="phenomap"; version="1.2.1"; sha256="0kpngxqrbahild5nblfvgx2kna43hqqldx5q3b127dnqwzbhfvbb"; depends=[doParallel dplyr phenex plyr raster rgdal stringr]; }; phenopix = derive2 { name="phenopix"; version="2.4.2"; sha256="0rrp4ch32hzlm727xpwsvfsw7d4qypv7iiq8hrg9az6nb39pbvp7"; depends=[bcp doParallel foreach gtools iterators jpeg plyr raster sp stringr strucchange zoo]; }; phers = derive2 { name="phers"; version="0.0.3"; sha256="1gyigamjsyfkmflp1i654csfsarx6jq984jbhbgwnsz6br0xppzh"; depends=[BEDMatrix checkmate data_table foreach iterators]; }; 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.6.0"; sha256="1dpf4hfflp4mcql4na46wzcq1flabkipiwyycz9wj5xbxlmcz2hk"; depends=[KernSmooth poorman Rcpp]; }; + philentropy = derive2 { name="philentropy"; version="0.7.0"; sha256="1dw46p2bk68hqbc44629lywg5r1mdaz37ahccgmsx07fg8rf4wnf"; depends=[KernSmooth poorman Rcpp]; }; phm = derive2 { name="phm"; version="1.1.0"; sha256="12g3pppy5hq5lwwbv511fx523cwn7gqg9fr861p8kmbvjwgpw1pp"; depends=[data_table Matrix NLP shiny smallstuff 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=[]; }; @@ -13976,7 +14060,7 @@ in with self; { photobiologySensors = derive2 { name="photobiologySensors"; version="0.5.0"; sha256="122cfy6nsxngd8hnbq5frkgnzrb9fxw83l7mfwk0wy6gx7zsfx5s"; depends=[photobiology]; }; photobiologySun = derive2 { name="photobiologySun"; version="0.4.1"; sha256="15wp8q29m5c4qplind9098ikxmm1r60lw8cm0pa48lmh33638ia3"; depends=[photobiology]; }; photobiologyWavebands = derive2 { name="photobiologyWavebands"; version="0.5.0"; sha256="04i2bm1chwj4mjfrvbiwl8p9h0jz4j04g6fg80fmppyd5mznay6r"; depends=[photobiology]; }; - photosynthesis = derive2 { name="photosynthesis"; version="2.0.3"; sha256="1f90j1a140nsxnibg3hz3vmad4542vny5ab331i887nkg0f5n5ar"; depends=[checkmate crayon dplyr furrr ggplot2 glue gunit magrittr minpack_lm nlme pkgnet purrr rlang stringr tealeaves tidyselect units]; }; + photosynthesis = derive2 { name="photosynthesis"; version="2.1.1"; sha256="17ipcgk11fnfrka5x95s4x5hncbfa38laav91475ghsni3hll4ay"; depends=[checkmate crayon dplyr furrr ggplot2 glue gunit lifecycle magrittr minpack_lm nlme purrr rlang stringr tealeaves tibble units]; }; phreeqc = derive2 { name="phreeqc"; version="3.7.4"; sha256="1xhpbi76y87phss10zlxpcz3fm3md3y4lh2cvypnx5ccxfdzflyl"; depends=[]; }; phuassess = derive2 { name="phuassess"; version="1.1"; sha256="0jplj9gih32dllx2hw5aqvc9b94sbrbv66s3a5r8mdbpjh93rhng"; depends=[]; }; phyclust = derive2 { name="phyclust"; version="0.1-32"; sha256="1ga2pzksp97psqbl484fikfnr4bl3bgyys86wb3ya904xxwghy6c"; depends=[ape]; }; @@ -13986,7 +14070,7 @@ in with self; { phylobase = derive2 { name="phylobase"; version="0.8.10"; sha256="0jzr1gdvmi4l640hwwzh9bxqmpja69bn3ygnaqx37awvyh7khi2s"; depends=[ade4 ape Rcpp rncl RNeXML]; }; phylocanvas = derive2 { name="phylocanvas"; version="0.1.3"; sha256="1l5br500lwwf7vp8wph5ykpkpqd15lypvhzy0c1cc8g8c6f7pckn"; depends=[ape htmlwidgets phylobase]; }; phyloclim = derive2 { name="phyloclim"; version="0.9.5"; sha256="107kilh0gwr84ig54g92zyk7zv553pky2bzpjqgf9fjwbm6fvmrs"; depends=[ape raster sp]; }; - phylocomr = derive2 { name="phylocomr"; version="0.3.2"; sha256="1qdhf6a7cqp12i4macy5wcbk6mf01fqbm4rc11yl63qr72zwrbhy"; depends=[sys tibble]; }; + phylocomr = derive2 { name="phylocomr"; version="0.3.3"; sha256="0l9ap65m927pqwxs051y4q7fmipn3kkpk1nkgis6q5fqgfxy0igi"; depends=[sys tibble]; }; phylogram = derive2 { name="phylogram"; version="2.1.0"; sha256="1p4h5pirc0m5pzc18q0jk3mcmb5n48gdf9abz03vml3a209xxl2v"; depends=[ape]; }; phylolm = derive2 { name="phylolm"; version="2.6.2"; sha256="04pz7i44s8w6py4nk2zilzjlkrf1c5dbb6jij7zfkk49hvslbynn"; depends=[ape future_apply]; }; phylometrics = derive2 { name="phylometrics"; version="0.0.1"; sha256="1pmr6l3wmaf91wdlsc5m63l07fibngnly2qzkma0rdi463ii03il"; depends=[mvtnorm]; }; @@ -14009,7 +14093,7 @@ in with self; { picker = derive2 { name="picker"; version="0.2.6"; sha256="1n7h1lvrivy7czzhisd9p3g187ivcyhzyjj7ahkimyb296gy8z1b"; depends=[htmlwidgets]; }; pid = derive2 { name="pid"; version="0.50"; sha256="05s3xqf95d4avh7gkr49jsm8jzacbv694c3wgppkkc40zip6vkc7"; depends=[DoE_base FrF2 FrF2_catlg128 ggplot2 png]; }; piecemaker = derive2 { name="piecemaker"; version="1.0.1"; sha256="1i9k88i0rqsbf2564ims69x1pind1xgvljaf9smnnjpi77442jiw"; depends=[rlang stringi stringr]; }; - piecepackr = derive2 { name="piecepackr"; version="1.12.0"; sha256="0w4dgxkvi339lxj37hmaa5pwb3a8smk27drdidrg36rwjbkkai79"; depends=[gridGeometry grImport2 jpeg png purrr R6 rlang stringr tibble]; }; + piecepackr = derive2 { name="piecepackr"; version="1.12.2"; sha256="0ky3nib84za7v27acpq5f5x8vpc6hsp5an7fid1vdzc6i1467mvr"; 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.4"; sha256="04d5rm6m94xiw70wh2wvdsd9zixkazsjl612afg5b0izw5snv7cy"; depends=[cli fs gh glue httr jsonlite lubridate memoise]; }; pillar = derive2 { name="pillar"; version="1.8.1"; sha256="1v47dm2v4nlswd1gmgcx5c7yrgn1ksdfr9lqkc63jf2nkv6af1ig"; depends=[cli fansi glue lifecycle rlang utf8 vctrs]; }; @@ -14034,7 +14118,6 @@ in with self; { pipenostics = derive2 { name="pipenostics"; version="0.1.7"; sha256="0c0qnh8kjgnmsg8arj7jhpdyjcdm58j9lzwi0yvl7ygk4k2klgv3"; depends=[checkmate]; }; pirate = derive2 { name="pirate"; version="1.0.0"; sha256="160mmyqdwbc4g7n7q9i4xcqp6h9bcpcz7vavsgdcpvs2mjfhfpjx"; depends=[ggplot2 MASS plyr Rcpp RcppArmadillo]; }; piratings = derive2 { name="piratings"; version="0.1.9"; sha256="0krrcf2bwicdf9fn657vkcjg5zliwi82hw3xmaqi46mdix8896gh"; depends=[ggplot2]; }; - pirouette = derive2 { name="pirouette"; version="1.6.5"; sha256="0fw6hbpywmk1mqfxn480sh403afrmm8shlzcbwx32pjri9ajrx1q"; depends=[ape babette beastier beautier DDD forcats magrittr mauricer mcbette nodeSub phangorn phytools plyr pryr readr stringr TESS tibble tidyr tracerer xtable]; }; pisaRT = derive2 { name="pisaRT"; version="2.0.1"; sha256="0g4z4ixg7bsig1rjhsymncmzpl135r6mr3pqlb60gmz11851bw9w"; depends=[]; }; pitchRx = derive2 { name="pitchRx"; version="1.8.2"; sha256="0lg0xab40r8wzrww986l5q9jkg1m83g4bhsbh0kr7f2rv90av662"; depends=[ggplot2 hexbin MASS mgcv plyr XML2R]; }; piton = derive2 { name="piton"; version="1.0.0"; sha256="1krf6zi238m275nxjlpyayv8y2drbgs2kg19dpkqm0lmlz5y5ar8"; depends=[Rcpp]; }; @@ -14050,7 +14133,7 @@ in with self; { pixmap = derive2 { name="pixmap"; version="0.4-12"; sha256="1v1a1adsgh5jlvvi98j4nhb1h681s97ip76zdrga12rlsjaahfw9"; depends=[]; }; 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]; }; + pkgbuild = derive2 { name="pkgbuild"; version="1.4.0"; sha256="1mjyln5njbvi0k97w8az2v5klmas6pqiz68mlylfll4nr503qzrm"; depends=[callr cli crayon desc prettyunits processx R6 rprojroot withr]; }; pkgcache = derive2 { name="pkgcache"; version="2.0.3"; sha256="0a50gnk68gdzmpd26qv3nsfc94gg6wyf2k3dacls1p8m1zbazpl0"; depends=[callr cli curl filelock 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=[]; }; @@ -14060,9 +14143,8 @@ in with self; { pkgfilecache = derive2 { name="pkgfilecache"; version="0.1.4"; sha256="1fr650yb4wjz6flq4f8p2p5bck5q4kkrhlhlwjn832payq9p4zsp"; depends=[downloader rappdirs]; }; pkggraph = derive2 { name="pkggraph"; version="0.2.3"; sha256="1isiywgm20rypc5qr03p0k7lis76zzd96x5ncbvia644d2n13brm"; depends=[curl data_table dplyr ggnetwork ggplot2 htmltools igraph intergraph Matrix network networkD3 plyr RColorBrewer tibble]; }; pkglite = derive2 { name="pkglite"; version="0.2.1"; sha256="0kc2h9d0kszvgc5bhzar4h4y604msmdmcc1agvn9irffm54x848d"; depends=[crayon magrittr remotes]; }; - pkgload = derive2 { name="pkgload"; version="1.3.1"; sha256="16k7n5hrwkzdwm54qyf5p6d1v5rf6vq688x48iylw6bygc6vgf66"; depends=[cli crayon desc fs glue rlang rprojroot 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.2.0"; sha256="17l9xpv7k3v4gy163cma3i1z87y10gxkw0a6w0b63djgjb3h0nhg"; depends=[BiocManager BiocVersion brew ComplexHeatmap GetoptLong GlobalOptions hash]; }; + pkgload = derive2 { name="pkgload"; version="1.3.2"; sha256="0bvbnj98b1yaiksdmfi017g2w3229a5pcsnpjamzrvpy5c1rml9m"; depends=[cli crayon desc fs glue rlang rprojroot withr]; }; + pkgndep = derive2 { name="pkgndep"; version="1.2.1"; sha256="1d2h1rgr803aw3n43iaacvqdv6b9ng97bwwsmrqc4rdyn0v532i7"; depends=[BiocManager BiocVersion brew ComplexHeatmap GetoptLong GlobalOptions hash]; }; pkgnet = derive2 { name="pkgnet"; version="0.4.2"; sha256="0y1b5psn680agsnyiy8yr5m5pzb1y6wsa7gms43nwgj6jjmmvgvv"; depends=[assertthat covr data_table DT futile_logger glue igraph knitr magrittr R6 rlang rmarkdown visNetwork]; }; pkgnews = derive2 { name="pkgnews"; version="0.0.2"; sha256="0kqyy1fchpcyclxh6gly23pkfcf5b3hpsq1bhj4ykzbl4bc002h2"; depends=[]; }; pkgsearch = derive2 { name="pkgsearch"; version="3.1.2"; sha256="0j0rckhv1lcwlc05ng637n1jv9yyxb6iws91i3mz9qnl5wis8061"; depends=[curl jsonlite parsedate prettyunits]; }; @@ -14078,9 +14160,11 @@ in with self; { plainview = derive2 { name="plainview"; version="0.2.0"; sha256="06aghs1i0nbyyx5ll8fwzlz6dqhvckr63xvx8xv52i8m7x6rml4y"; depends=[htmltools htmlwidgets lattice png raster viridisLite]; }; plan = derive2 { name="plan"; version="0.4-4"; sha256="0xpl1hrq0cs1bi8wn1bb1d4lmb6g1dfzp8wlwa9g2bc12yw5q8hg"; depends=[]; }; planets = derive2 { name="planets"; version="0.1.0"; sha256="01zh7lgaykr9p186yy0vksn2pmc69b3xxh78w7z6wclvqjb7zh1p"; depends=[]; }; + planningML = derive2 { name="planningML"; version="1.0.0"; sha256="1qndw6jxk2jgliw996h2qkqqdd22ycc8kvs8z0jmk43dmiyjqzfx"; depends=[caret dplyr lubridate Matrix MESS pROC tidyverse]; }; plantecophys = derive2 { name="plantecophys"; version="1.4-6"; sha256="1qf9a38n8nvvz8dvqra9mdsmkbkhxymjrin0wfis8g1ndf1f406c"; depends=[]; }; plantecowrap = derive2 { name="plantecowrap"; version="1.0.4"; sha256="0syxf63xy5whzw03ys5cxyw7689mr7ihgmqddv53jb8rlbwm84p8"; depends=[ggplot2 minpack_lm plantecophys tidyr]; }; plaqr = derive2 { name="plaqr"; version="2.0"; sha256="15pdb57123m3cahvcsyrrvxjwxvs2f389yxip91gjxn68jf6cx1l"; depends=[quantreg]; }; + plasma = derive2 { name="plasma"; version="0.9.21"; sha256="09in7kh2pfz0mkz0mic3nk4vxh7f9hmlv5xyv502d2q3cc5s26lm"; depends=[beanplot oompaBase pls plsRcox Polychrome survival viridisLite]; }; 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=[]; }; @@ -14098,7 +14182,7 @@ in with self; { 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.6-2"; sha256="0r0yhr00hfjh5nksp4pbkifjyf6jbxcq8hwjqlbdmvkz51fi4ayz"; depends=[bdsmatrix collapse Formula lattice lmtest MASS maxLik nlme Rdpack sandwich zoo]; }; pln = derive2 { name="pln"; version="0.2-2"; sha256="03jjmfr1dwz6p652y917g9rv2alyam9ws6xh9ig02d3w78b0rsv9"; depends=[]; }; - plnr = derive2 { name="plnr"; version="2022.6.8"; sha256="0nm6zzahl3chgj1sj07izdxb8gprjca7nr87wxcjkzh19xrix7dd"; depends=[data_table digest foreach fs glue purrr R6 usethis uuid]; }; + plnr = derive2 { name="plnr"; version="2022.11.23"; sha256="1qi24zpvclamxxfppgll7rcmq7fysxf8chk6wlkwkzmjl5c3cs4n"; depends=[data_table digest foreach fs glue purrr R6 usethis uuid]; }; plogr = derive2 { name="plogr"; version="0.2.0"; sha256="0a8dhzlna79ggyhfr0nncgh15a9n6r0dsz664pz0ah323wpblqqf"; depends=[]; }; plot_matrix = derive2 { name="plot.matrix"; version="1.6.2"; sha256="1fsgzjcllrdlf55ww7dhyx1iaa59y2a6f1b1591j8m8in1fh7n6n"; depends=[]; }; plot3D = derive2 { name="plot3D"; version="1.4"; sha256="1h59zlsyzbjylaziwavppl9bjmnba4iiq34772y3dys6fqclajnh"; depends=[misc3d]; }; @@ -14118,9 +14202,9 @@ in with self; { plotfunctions = derive2 { name="plotfunctions"; version="1.4"; sha256="0asmxw8283fpvl83h478j5nyg59xqifqaa8f2f6l199gvvswhhg2"; depends=[]; }; plothelper = derive2 { name="plothelper"; version="0.1.9"; sha256="1ibznjqs4gpbq1vx79gg0fkm842xfqgpmmgqji2m6s712j3bdn5k"; depends=[farver ggfittext ggplot2 gridExtra magick plyr scales]; }; plotluck = derive2 { name="plotluck"; version="1.1.1"; sha256="16wqj4xfa8b7kal6v8mp2zlhwf9l3y6y5n44qbpvy652gzb2rw2z"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; }; - plotly = derive2 { name="plotly"; version="4.10.0"; sha256="16iqj7sv49mva6siibsci7iijsbnk7pqvfns9al0k35w9mjmr6dx"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 htmltools htmlwidgets httr jsonlite lazyeval magrittr promises purrr RColorBrewer rlang scales tibble tidyr vctrs viridisLite]; }; + plotly = derive2 { name="plotly"; version="4.10.1"; sha256="0yin1kid3a69fcwrrajwzqbhx4xc81x8p8m0yfh1fkm2rfhj22dc"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 htmltools htmlwidgets httr jsonlite lazyeval magrittr promises purrr RColorBrewer rlang scales tibble tidyr vctrs viridisLite]; }; plotlyGeoAssets = derive2 { name="plotlyGeoAssets"; version="0.0.2"; sha256="1c6i4dz5qmym1pcddgffcqgb76jz84252xldprg2caylrqvzv6b7"; depends=[]; }; - plotmm = derive2 { name="plotmm"; version="0.1.0"; sha256="01mi9znl471myq1yhfr8kdxpy0l67wgb3fid8gf2rzj5ph72b8hp"; depends=[amerika dplyr ggplot2 patchwork wesanderson]; }; + plotmm = derive2 { name="plotmm"; version="0.1.1"; sha256="0ad8bkfbwrcv447wgygsh1akzc7v8mxgfw2ywb5024jy39zbj56b"; depends=[amerika ggplot2 wesanderson]; }; plotmo = derive2 { name="plotmo"; version="3.6.2"; sha256="0g1mznijbi1ggn4pk6sqxqjqlrznfcg57l6p2672vcaqqn73mqyd"; depends=[Formula plotrix TeachingDemos]; }; plotpc = derive2 { name="plotpc"; version="1.0.4"; sha256="1sf7n7mfyaijldm24bc8r8pfm8pp9cyaja7am14z2wpj2j9f9vyq"; depends=[]; }; plotprotein = derive2 { name="plotprotein"; version="1.0"; sha256="14kfb4xxpfp8klz31kb7cpc39636ax2cx2483vqqkciccb28f0ks"; depends=[ade4 plotrix plyr seqinr XML]; }; @@ -14131,10 +14215,10 @@ in with self; { plpoisson = derive2 { name="plpoisson"; version="0.3.0"; sha256="15g5z07m0rf4hm6nynrb3bmsiakg7j790lsy30ksxswxrzwb9a1k"; depends=[]; }; pls = derive2 { name="pls"; version="2.8-1"; sha256="137jg3x7aqwyki29i4kzp8d6imn17nq6wzzfjw5q19pixvmpybp2"; depends=[]; }; plsRbeta = derive2 { name="plsRbeta"; version="0.2.9"; sha256="1r2vnssavd9921ll7a023asbzvnjr8ax7ilb861f9rkx2fxl8z0j"; depends=[betareg boot Formula MASS mvtnorm plsRglm]; }; - plsRcox = derive2 { name="plsRcox"; version="1.7.6"; sha256="0dg4vpy15z4x61qyqc9nvqa1788g6phlrzjrk1xhns5x2h8cicma"; depends=[kernlab lars mixOmics pls plsRglm risksetROC rms survAUC survcomp survival]; }; + plsRcox = derive2 { name="plsRcox"; version="1.7.7"; sha256="1fkbynjlwi070yshnqcmw2f331yzr61f1mvm5dbw3iwg9ldhcbwr"; depends=[kernlab lars mixOmics pls plsRglm risksetROC rms survAUC survcomp survival]; }; plsRglm = derive2 { name="plsRglm"; version="1.5.0"; sha256="10zbl8y61jdsbhz8dqfd4r7dhzkkr0a02v94d3pnk2v89n5nf7ls"; depends=[bipartite boot car MASS mvtnorm]; }; plsVarSel = derive2 { name="plsVarSel"; version="0.9.9"; sha256="10hjyngz6yq957gk7b62158fd08ajfb0mps55y2216f7886x9ljb"; depends=[bdsmatrix genalg MASS MSQC mvtnorm pls praznik progress]; }; - plsdof = derive2 { name="plsdof"; version="0.3-0"; sha256="1axi8bailiq9mjs0dvasy895b7c62114hdsaygxwz4zymfa6a3ny"; depends=[MASS]; }; + plsdof = derive2 { name="plsdof"; version="0.3-2"; sha256="1bqk98f9zyi4hvna1sfx4fwiivndlwanjaphlqa03bg6bghcj60p"; depends=[MASS]; }; plsgenomics = derive2 { name="plsgenomics"; version="1.5-2"; sha256="1pvb50nv6jc99bm2hsxpzazg26y49yi24wwwim5xcjj6j1szbip4"; depends=[boot fields MASS plyr reshape2 RhpcBLASctl]; }; plsmod = derive2 { name="plsmod"; version="1.0.0"; sha256="1fyv2v3jmf1hdii9z477ijy5d9gvpc3jg9cyl9lbplgc18l2pd2b"; 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]; }; @@ -14148,7 +14232,7 @@ in with self; { pluralize = derive2 { name="pluralize"; version="0.2.0"; sha256="1s3jp41j8c03qb5zisj6m12ky7cz3n71d6p5apz0r0yn35inrhah"; depends=[V8]; }; pluscode = derive2 { name="pluscode"; version="0.1.0"; sha256="1j9yr5j6mb346a5dn7v9bsppgnxdj1ryimlla4a08rv7bjyq5i6q"; depends=[httr jsonlite]; }; plusser = derive2 { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[lubridate plyr RCurl RJSONIO]; }; - plyr = derive2 { name="plyr"; version="1.8.7"; sha256="0zz88q055c38b9xqzfg1mwm7ikxzlyx3pnk16sfa8dbh2pqxm7vx"; depends=[Rcpp]; }; + plyr = derive2 { name="plyr"; version="1.8.8"; sha256="030706kwgqa2s5jd93ck271iqb0pj3fshrj9frg4wgp1pfs12cm7"; depends=[Rcpp]; }; pmc = derive2 { name="pmc"; version="1.0.4"; sha256="0y2h6r8dx721n0wwbc3i5j50j694kxanc4vxwr07939145bvpfac"; depends=[dplyr geiger ggplot2 ouch tidyr]; }; 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]; }; @@ -14158,14 +14242,14 @@ in with self; { pmledecon = derive2 { name="pmledecon"; version="0.2.1"; sha256="10yry425y2ghcnp3mrjharf4blcqvwnxsm7kz90mzfq91qg4q5lv"; depends=[rmutil splitstackshape]; }; pmml = derive2 { name="pmml"; version="2.5.2"; sha256="1faad5yqyh6dx40056w74vlyw4wxjgh41jv8b2vf2gh26laf22kk"; depends=[stringr XML]; }; pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.3"; sha256="0315kb5x04pidpzr04yaxyynp0mz4ilzp7vkspq4agjkds5hyc88"; depends=[]; }; - pmparser = derive2 { name="pmparser"; version="1.0.10"; sha256="0p8fd4xrfvn27739m1rsal8sgddycbjzla5i2v0jkrkjr76sakl3"; depends=[curl data_table DBI foreach glue iterators jsonlite R_utils RCurl withr xml2]; }; + pmparser = derive2 { name="pmparser"; version="1.0.13"; sha256="1c58kdy25hjd0glw6hym082jbp8jjvxdn6j3kg859w4pf6kssm57"; depends=[curl data_table DBI foreach glue iterators jsonlite R_utils RCurl withr xml2]; }; pmr = derive2 { name="pmr"; version="1.2.5.1"; sha256="14m3y1sywnd77gyifz2nv5q7h85f81wl5c8glvc100zgljvbgwvc"; 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.3"; sha256="09hnkzxwbj025an5kn91sw1sanxlcnmsi9wz8545fkcna78384zk"; depends=[chron data_tree DiagrammeR dplyr ggdist gghalves ggplot2 ggrepel gridExtra magrittr MASS stringr tibble xml2]; }; pmxpartab = derive2 { name="pmxpartab"; version="0.5.0"; sha256="13r4xy0jvxdwjz3gic67fzgq87v18vs7df1ggd3hq89h6f28fxar"; depends=[data_table htmltools knitr table1]; }; - png = derive2 { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; }; + png = derive2 { name="png"; version="0.1-8"; sha256="077nca3x0l6mq2g6izknzcn994bqs3nfqk7wscrjbfk2dnxzldjs"; depends=[]; }; poLCA = derive2 { name="poLCA"; version="1.6.0.1"; sha256="05kbkyrds430v729hi56q48yfwfi5m1f371gpb4h417z5fj6137d"; 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]; }; @@ -14190,20 +14274,21 @@ in with self; { 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.2.0"; sha256="0ixw6b1zy4h51dzhmrfsghnqxm3mw221v5armsxnc88xpw2rac93"; depends=[BH grf Rcpp]; }; + policytree = derive2 { name="policytree"; version="1.2.1"; sha256="1a0rfpn7dd8qsgaz5gfxpip7i897j8lmb86sjmpdafdyw5p3fl8m"; 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.7.0"; sha256="0dvm76q101a9knh8kl5xfm7hpnmyggxkjzx3z749wmbc0p0h7jxl"; depends=[automagic digest dplyr DT htmltools httr jose jsonlite lubridate otp purrr rlang rmarkdown shiny shinycssloaders shinydashboard shinyFeedback shinyjs shinyWidgets stringr tibble tidyr uuid yaml]; }; polite = derive2 { name="polite"; version="0.1.2"; sha256="0ms4814aszfq5b8nlqsvnvnwpzpsqhsxr4z78hl6aknl0201lm94"; depends=[httr magrittr memoise ratelimitr robotstxt rvest usethis]; }; politeness = derive2 { name="politeness"; version="0.8.7"; sha256="05c606cra65cizxi266x2ka7bh911ipdy62sdbg47zi90nmcpnci"; depends=[data_table ggplot2 glmnet quanteda spacyr stringi stringr textir tm]; }; + polle = derive2 { name="polle"; version="1.0"; sha256="11585rm5pw41nbwsgm5zx0vlnrj25fjg44ps68jjyvdzs8191fhl"; depends=[data_table DynTxRegime future_apply lava policytree SuperLearner survival targeted]; }; 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.4"; sha256="1nvkskqyxng7r4c9z59s5mg9gk8rvd70bd5cfr3wnhps713sripi"; depends=[dplyr forcats labelled rlang stringr tidyr]; }; polmineR = derive2 { name="polmineR"; version="0.8.7"; sha256="0b4m7xywvk3g8x9m3xb3nivbh0x6hvan51j444i2q2la6myrnm62"; depends=[data_table DT fs jsonlite knitr lifecycle magrittr Matrix pbapply RcppCWB rlang slam stringi tm xml2]; }; - polspline = derive2 { name="polspline"; version="1.1.20"; sha256="1dd1jwiaglkkhajzvqfkd1x5r3wzjlk5ww0yxzmns0s1kr74i4k9"; depends=[]; }; - polyCub = derive2 { name="polyCub"; version="0.8.0"; sha256="1f63ikiz988hdihvgd5f2p897qfgv54ysgp2h8avmlc4cj6hgkgl"; depends=[sp]; }; + polspline = derive2 { name="polspline"; version="1.1.22"; sha256="0ys5sxr5q55ip49dsc3kbgcr3bn9dj5bblmshwm4jz8d0a7ikwmj"; depends=[]; }; + polyCub = derive2 { name="polyCub"; version="0.8.1"; sha256="09a4n69f9m5y57wkxlhwn5xfhzpqrcyzfc6n5zywn5jkj5h7wijl"; depends=[sp]; }; polyMatrix = derive2 { name="polyMatrix"; version="0.9.16"; sha256="13amrjl0nsyz6d9c9xxgnlkhdiicy8rx27ds5k47r8x48386vz14"; depends=[Matrix polynom]; }; - polyRAD = derive2 { name="polyRAD"; version="1.6"; sha256="1xvhjzryf35vrnf6iz82g14vbmbbm4g88il02ss5pmvsgxq70x5n"; depends=[fastmatch pcaMethods Rcpp stringi]; }; + polyRAD = derive2 { name="polyRAD"; version="2.0.0"; sha256="12qlws0d6s94rand1a7azd7yv22qzij1aqmhrvw4az0y7jy2wka4"; 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.2"; sha256="1rn1bryxxzsgi85kw4glmk10z61pqyxj79ngdl81b67vrw23fpxw"; depends=[]; }; @@ -14224,9 +14309,9 @@ in with self; { pomdp = derive2 { name="pomdp"; version="1.0.3"; sha256="1k0ysy0br5rff7jzz05gfwliqn668jd41cjp2mjs27qzgaazip7r"; depends=[igraph pomdpSolve]; }; pomdpSolve = derive2 { name="pomdpSolve"; version="1.0.1"; sha256="0fkh2xamhgrh743b06mi6m7fg3bw989hxmwkf00bq6y7dr9c168b"; depends=[]; }; pomodoro = derive2 { name="pomodoro"; version="3.8.0"; sha256="1y7a6097jlrrgqkxhb43n5nahf4m814inhmkm1495w0k5q1zmraf"; depends=[caret gbm ipred pROC randomForest tibble]; }; - pomp = derive2 { name="pomp"; version="4.3"; sha256="0581b1q2scmr57kr83kb3k1dp4bz3jny6h5v6lm7mxsychca4dl7"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; }; + pomp = derive2 { name="pomp"; version="4.4"; sha256="11c0dzs34ks1vp0gdbzg6ls5q4z3gyd9m2kbdi9nrspammg0h138"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; }; pompom = derive2 { name="pompom"; version="0.2.1"; sha256="09jy4lrb2p71yk604ndfhqfz6znlc3bq72k42f0d1i1a8g3by8h6"; depends=[ggplot2 lavaan qgraph reshape2]; }; - pompp = derive2 { name="pompp"; version="0.1.2"; sha256="05zy47zaifwj1qvvgxpvari26ac354axijqbx5522mbl27x3c6sf"; depends=[coda geoR Rcpp RcppEigen RcppProgress]; }; + pompp = derive2 { name="pompp"; version="0.1.3"; sha256="0svlzhsm1kfwgjpx2cas63jm8v5b9cxlksipv758vxlnc3jiarvk"; depends=[coda geoR Rcpp RcppEigen RcppProgress]; }; 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]; }; @@ -14255,7 +14340,7 @@ in with self; { populationPDXdesign = derive2 { name="populationPDXdesign"; version="1.0.3"; sha256="0p73ddv3j1s1vs4j3axnsf39n626qjv0w1qlq9p7km4s6729bhgv"; depends=[devtools ggplot2 plyr roxygen2 shiny shinycssloaders]; }; porridge = derive2 { name="porridge"; version="0.3.1"; sha256="0m0aa7cqfkd45csgs0lapf72adjmf0xaii1klnk3kd4kxbclx8a6"; depends=[MASS Matrix mvtnorm Rcpp RcppArmadillo]; }; port4me = derive2 { name="port4me"; version="0.5.0"; sha256="0fs279qmxn0hz6w3app8dfcdhshymqrkgj53il4dzlw27ascw105"; depends=[]; }; - portalr = derive2 { name="portalr"; version="0.3.10"; sha256="0bgk25j528p972hxcymvvk1x6dhir5gb9y15rlhwxax9bh52dgiq"; depends=[clipr clisymbols crayon dplyr forecast httr lubridate lunar magrittr rlang tidyr tidyselect zoo]; }; + portalr = derive2 { name="portalr"; version="0.3.11"; sha256="0li3simzryaakb96z6k64d2fzz1r5wpyzy9ib04xq8dvsfypb9fx"; depends=[clipr clisymbols crayon dplyr forecast httr lubridate lunar magrittr rlang tidyr tidyselect zoo]; }; portfolio = derive2 { name="portfolio"; version="0.5-2"; sha256="13w8gyaphg0qspjl6d0jh0jf3wvz4agy8vzkriba0k59qhdbi52f"; depends=[lattice nlme]; }; portfolio_optimization = derive2 { name="portfolio.optimization"; version="1.0-0"; sha256="1rdhwffsjc1pa1qq7rqy6dwk8yrcblkmijz94p2w7sf2v4jmwxxr"; depends=[magrittr MASS modopt_matlab xts]; }; portfolioBacktest = derive2 { name="portfolioBacktest"; version="0.4.1"; sha256="1qf7bbf3frivp0q55h3fj9ki2igaa6djpg3zv1x6hh53nl25dvbb"; depends=[digest evaluate ggplot2 pbapply PerformanceAnalytics quadprog quantmod R_utils rlang xts zoo]; }; @@ -14265,6 +14350,7 @@ in with self; { 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.3"; sha256="0kc8nbrqw5h14qw47rxl20yz9q0s8gk2g3lg7kcgsx7f1q514qsw"; depends=[rmarkdown rstudioapi]; }; + postdoc = derive2 { name="postdoc"; version="1.1.0"; sha256="02j7jsjmyd643bimhvvaaak7nx6w99shas8l588ny2abygxb915m"; depends=[jsonlite katex prismjs xml2]; }; posterdown = derive2 { name="posterdown"; version="1.0"; sha256="13plrrnylw3yldm0md1gr5drccfjk9f2wwlhz6lrmb3px7w5nqs0"; depends=[pagedown rmarkdown yaml]; }; posterior = derive2 { name="posterior"; version="1.3.1"; sha256="0yjdjdr4ifssnml1niqyxs6jsqpci8rx8va0pinyhjx2j017h03h"; depends=[abind checkmate distributional matrixStats pillar rlang tensorA tibble vctrs]; }; postinfectious = derive2 { name="postinfectious"; version="0.1.0"; sha256="1v327zxxiwc1cdksk6s39lkkgck5dxg169pp3jiqmm7xs35dcl6y"; depends=[]; }; @@ -14289,6 +14375,7 @@ in with self; { powerSurvEpi = derive2 { name="powerSurvEpi"; version="0.1.3"; sha256="1p1fw4jq4rxc273hmycxf4bkqm6zmfw0jdy2s65jy10q37r53ial"; depends=[pracma survival]; }; powerbiR = derive2 { name="powerbiR"; version="0.1.0"; sha256="0b7409j55m5nnp5nm9sgij635xpm39qkm3hajg3x0x8zxvfczfz6"; depends=[AzureAuth data_table httr jsonlite]; }; powerbydesign = derive2 { name="powerbydesign"; version="1.0.5"; sha256="006m127rc49bshgljd5d3ii6sfx24ndn2690ixj0vnqm2dp3zjnw"; depends=[gdata ggplot2 lme4 MASS plyr reshape2 stringr]; }; + powerjoin = derive2 { name="powerjoin"; version="0.1.0"; sha256="19b7y7aqf5159x2fi5nrx179nc673qqzkv9c8kgw85hmmjzjgnb3"; depends=[cli dplyr glue purrr rlang tibble tidyr tidyselect vctrs]; }; powerly = derive2 { name="powerly"; version="1.8.6"; sha256="0vc2wpx2b4i9vx9jvvlywq5w4dx22bn4r9fcwz123h1m09252ng8"; depends=[bootnet ggplot2 mvtnorm osqp patchwork progress qgraph quadprog R6 rlang splines2]; }; powerpkg = derive2 { name="powerpkg"; version="1.6"; sha256="18cq3zsdvzmqjp0niq0libjk4riarmiar3h6lifq54spqgrvvxh2"; depends=[]; }; powerplus = derive2 { name="powerplus"; version="3.1"; sha256="0ayp6x34hkzgris4j3zbbs0r23n81bhww3wgfyy630ri4sk6brrn"; depends=[complexplus expm MASS Matrix phonTools]; }; @@ -14304,13 +14391,13 @@ in with self; { ppmHR = derive2 { name="ppmHR"; version="1.0"; sha256="1fc9rrk3ir3dq5d518ih67dvknhz1ln6668wy2mzsdndaysgm12g"; depends=[nleqslv]; }; ppmSuite = derive2 { name="ppmSuite"; version="0.2.4"; sha256="0qpd5a35x7fbdjwfr0cnx00wf0hwzlah6z3giajgcv0d7wzrvczn"; depends=[]; }; ppmf = derive2 { name="ppmf"; version="0.1.3"; sha256="0xphk27frlcr87jwjbgwf77c8bhv0nswmffj9ny2vd1b176bi9xn"; depends=[censable dplyr magrittr readr rlang stringr tibble tidyr zip]; }; - ppmlasso = derive2 { name="ppmlasso"; version="1.2"; sha256="0pdafk8f8z92v4rs0n78sj9gy80l2nr9n91y2icbchgh8fa1hi1m"; depends=[data_table lattice plyr spatstat spatstat_core spatstat_geom]; }; + ppmlasso = derive2 { name="ppmlasso"; version="1.3"; sha256="1kqqb7wxqdmymfn4hkdmqakj3n64bbg2acf671asm2civ94rmc1m"; depends=[data_table lattice plyr spatstat spatstat_explore spatstat_geom spatstat_model]; }; pps = derive2 { name="pps"; version="1.0"; sha256="0k06rkzdx07qcndqym44q6xyawdd253i3kbyqlmlavadsizp657g"; depends=[]; }; ppsbm = derive2 { name="ppsbm"; version="0.2.2"; sha256="0y4whxv14jqx7mqxj7n427vpbxb5rkwj8xvx0mj4knnwy9v437z4"; depends=[clue gtools Rfast]; }; ppseq = derive2 { name="ppseq"; version="0.2.0"; sha256="0ir5jm3cgpgcngrq334f2s66lsvhd0vxsiz5glj371slc8jxkwj6"; depends=[dplyr furrr ggplot2 patchwork plotly purrr tibble tidyr]; }; ppsr = derive2 { name="ppsr"; version="0.0.2"; sha256="1dk62b08sxp87kll8wjfby3iq9l3akiprarh8agjdv6s43c9h2sg"; depends=[ggplot2 gridExtra parsnip rpart withr]; }; pqantimalarials = derive2 { name="pqantimalarials"; version="0.2"; sha256="0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1"; depends=[plyr RColorBrewer reshape2 shiny]; }; - pqrfe = derive2 { name="pqrfe"; version="1.0"; sha256="18jyvaxixi51x3ibw8p6bm9j3sawkkk8ddhzw5nygii6x8prkmni"; depends=[MASS Rcpp RcppArmadillo]; }; + pqrfe = derive2 { name="pqrfe"; version="1.1"; sha256="0apsrlgricjmv202yg1h3iz2715nmf05wcvyznnha0nil7cqg0qi"; depends=[MASS Rcpp RcppArmadillo]; }; prWarp = derive2 { name="prWarp"; version="1.0.0"; sha256="1rx9yby7xwa2bgqa6a1zllan6qfchgfrg2waadmwfmjhcp8qb1mj"; depends=[Morpho]; }; prabclus = derive2 { name="prabclus"; version="2.3-2"; sha256="0hg4d7y1w18jpgvw10z8833bbbcnlkwiasx0wh6iwa2pnnybq8gl"; depends=[MASS mclust]; }; pracma = derive2 { name="pracma"; version="2.4.2"; sha256="05lwx2yx7f45cr5amzbjv3b2p6ibspjxl0aglq2dga6rvxzk6l0x"; depends=[]; }; @@ -14329,12 +14416,12 @@ in with self; { precrec = derive2 { name="precrec"; version="0.12.9"; sha256="1dfz2rqx2ww2l5r40ahg0qdj3rjrwiwh427mw7j5ynhpcj21j2qm"; 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]; }; + predhy = derive2 { name="predhy"; version="1.2.1"; sha256="1m0c35r3h63vdimixskqviyqfblj8cxaf5b1085wb72fasanak5n"; depends=[BGLR doParallel foreach glmnet pls randomForest xgboost]; }; predict3d = derive2 { name="predict3d"; version="0.1.3.3"; sha256="1kb3jacpgzln1ddnkfzhvfpzzf9wig60lppca6iy0fvq5cm8ddr4"; depends=[dplyr ggiraphExtra ggplot2 magrittr modelr moonBook plyr prediction purrr reshape2 rgl rlang stringr TH_data tidyr]; }; predictMe = derive2 { name="predictMe"; version="0.1"; sha256="0n4sv9ahyvly17grlilybb7vwq9pzyn6mvhcn8z9cyswqa7svs49"; depends=[ggplot2 Rdpack reshape2]; }; prediction = derive2 { name="prediction"; version="0.3.14"; sha256="0awlq5lxfia6m2b91w73rksp93rbwv5gwqb36wbji4rgq41rzbrx"; depends=[data_table]; }; predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; }; - predictmeans = derive2 { name="predictmeans"; version="1.0.6"; sha256="1mg37vd5nlfvv3mx6hrdmxj0aavm9wy1j70117hp4sasvlvsccdi"; depends=[ggplot2 lme4 lmeInfo Matrix nlme pbkrtest plyr]; }; + predictmeans = derive2 { name="predictmeans"; version="1.0.8"; sha256="1w5kszqqqg4xx1zq6y4a93b00aa67riqsb1dq21xqpscvyiz5nv9"; depends=[car ggplot2 HRW lme4 lmeInfo lmerTest lmeSplines MASS Matrix nlme numDeriv pbkrtest plotly plyr splines2]; }; predictoR = derive2 { name="predictoR"; version="2.0.7"; sha256="01ixa8ahfdx2dnxsjzkrv09wzpis641d846b4pbhlykgdwz8mhqc"; depends=[colourpicker config DT echarts4r glmnet golem htmltools rlang rpart rpart_plot shiny shinyAce shinycustomloader shinydashboard shinydashboardPlus shinyjs traineR xgboost xtable]; }; predictrace = derive2 { name="predictrace"; version="2.0.0"; sha256="1bk1l9gai4hyck72h81znsm1dzqwm5wddbz0bm9g5igs6zkar2ka"; depends=[dplyr]; }; predieval = derive2 { name="predieval"; version="0.1.1"; sha256="096zfb94iixza0lfzr4p21gkcs9hl7h0d5jhbzdi3hhyz80zymrj"; depends=[ggplot2 Hmisc MASS Matching]; }; @@ -14367,7 +14454,7 @@ in with self; { prettyglm = derive2 { name="prettyglm"; version="0.1.0"; sha256="1qxfiynry2fhmdrqkn7hf2llx18gdi8an3crkx0s116yp3dlv5xl"; depends=[broom car dplyr forcats kableExtra knitr plotly stringr tibble tidycat tidyr tidyselect vip]; }; prettymapr = derive2 { name="prettymapr"; version="0.2.4"; sha256="1fg2j6qx828qrg46clrvln2004nlk22yx7wvhr8vig66nc1lm7bd"; depends=[digest httr plyr rjson]; }; prettyunits = derive2 { name="prettyunits"; version="1.1.1"; sha256="1ibmzgknw5896q2i6r59jz2izblxwgb29ivvjzx50pkd1jl9l6cs"; depends=[]; }; - prevR = derive2 { name="prevR"; version="4.0.0"; sha256="11biwj4qhynsqxgibgcgiprk5bs9ym9sja14lj6m8s43lyi6jyjb"; depends=[directlabels fields foreign ggplot2 gstat KernSmooth maptools rgdal sp]; }; + prevR = derive2 { name="prevR"; version="4.0.1"; sha256="0r70ns7qg72bva712pqw3djp0lzz8bpm00d9s3q9qm30lhgcl124"; depends=[directlabels fields foreign ggplot2 gstat KernSmooth maptools rgdal sp]; }; prevalence = derive2 { name="prevalence"; version="0.4.1"; sha256="0llxcz7bg62l6qq4xaf2xwmc2k0y2l3zw5nb6bq0a9qnp3anj8ah"; depends=[coda rjags]; }; prevederer = derive2 { name="prevederer"; version="0.0.1"; sha256="0vkx9nrlgp36xbl95lrb5sb5yivxlcw4yvbs8hgbm31kh0vbz32f"; depends=[httr]; }; previsionio = derive2 { name="previsionio"; version="11.7.0"; sha256="08hrklr3ngphdhp50lkz6ls9nn1bzdvs6xj583spsw4vm7j44yfr"; depends=[data_table futile_logger httr jsonlite magrittr Metrics plotly XML]; }; @@ -14393,6 +14480,7 @@ in with self; { prism = derive2 { name="prism"; version="0.2.0"; sha256="0gl6qmpgfdxn90aw10z4xj4ijcwj9mr0s9ahm28niinr9y89gzxk"; depends=[dplyr ggplot2 httr lubridate magrittr purrr raster readr stringr]; }; prismadiagramR = derive2 { name="prismadiagramR"; version="1.0.0"; sha256="13x3y4rv9b2d013jd6853zkq8rbxq88wlffmdnjs1rca0fnfrn4f"; depends=[DiagrammeR dplyr]; }; prismatic = derive2 { name="prismatic"; version="1.1.1"; sha256="013i0mq4n8s2zbzvfrz1vjcn2a6l98bamslkcv1a3cn70gpphja9"; depends=[farver]; }; + prismjs = derive2 { name="prismjs"; version="1.1.0"; sha256="0siga7l60d0axlnjwbl4smw28rggyxrjwzv8ypw9bhb6x1xnn8in"; depends=[V8 xml2]; }; prisonbrief = derive2 { name="prisonbrief"; version="0.1.2"; sha256="06550fnnffpcnv4q2nicrm7p573313lvnj6hkdrf7979ygrsmmfi"; depends=[dplyr httr magrittr passport rnaturalearth rnaturalearthdata rvest sf stringr tibble tidyr xml2]; }; prithulib = derive2 { name="prithulib"; version="1.0.2"; sha256="12ybksrvxzc5gjz8m38cs35b7r3kd8m0zqm2c67pqw38vq82sjxm"; depends=[]; }; prnsamplr = derive2 { name="prnsamplr"; version="0.2.1"; sha256="0q810rldj8li5pw5pka00rvkwwi2y7r8akfpqfg7c6mnyqlzlx67"; depends=[]; }; @@ -14420,23 +14508,23 @@ 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.9.3"; sha256="0p83gvm7xhnwfmrn2fr31rz84sllws92rpmhjvxfcc6ylsp0hj0n"; depends=[abind Matrix Rcpp RcppArmadillo RcppProgress splines2]; }; + profoc = derive2 { name="profoc"; version="0.9.4"; sha256="05dzsxf6kbx3jkw1f574brjlm1j4h1r72w8zgb2w182756qzbk3c"; 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]; }; progenyClust = derive2 { name="progenyClust"; version="1.2"; sha256="0azp5pvk316s8xbawcqwqfd80fxb4xn8hc6aq87xwksc6fhwp94l"; depends=[Hmisc]; }; progress = derive2 { name="progress"; version="1.2.2"; sha256="0dgzb362641aqm8xd88iqa8jmpdm43xs0aba0d5kk6fvapnxi95l"; depends=[crayon hms prettyunits R6]; }; progressr = derive2 { name="progressr"; version="0.11.0"; sha256="1nbc6vvsyqa1gvh1a1m4prnvng88wsa0r35i9fiwq84a6j18qrnq"; depends=[digest]; }; - proj4 = derive2 { name="proj4"; version="1.0-11"; sha256="07fil52jswbg2h807cd82m2wlm5j2fb891ifri9ms037099qdwf5"; depends=[]; }; + proj4 = derive2 { name="proj4"; version="1.0-12"; sha256="1y3n6zjc4s78pagq5f2x9sdfjg5x5nwnhq67jd06fndlsma8mssa"; 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.2.1"; sha256="1bbjrjaj6zzb1ph69x16i40fj2j6cg8vzmmw2rchsn0ygphaq9b8"; depends=[dplyr gamm4 ggplot2 lme4 loo magrittr mgcv mvtnorm Rcpp RcppArmadillo rlang rstantools]; }; + projpred = derive2 { name="projpred"; version="2.2.2"; sha256="0fycjmaqbcr3vp5708003flvi9ny4z04acgbcfly1ird0kcw9s3v"; depends=[dplyr gamm4 ggplot2 lme4 loo magrittr MASS mgcv mvtnorm Rcpp RcppArmadillo rlang rstantools]; }; prolific_api = derive2 { name="prolific.api"; version="0.5"; sha256="0lnxkap6x4x5wvayfx1lm4h646wb0wsffn7xysrcysfdsaxa817d"; depends=[data_table jsonlite]; }; prome = derive2 { name="prome"; version="1.5.6.70"; sha256="0hhrrw06jd3qsq9ch8k5cv4p510kp2xkyd8dh6l7zw056cnjmac0"; 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]; }; - promor = derive2 { name="promor"; version="0.1.0"; sha256="1p61z7rfyxykxxzb97byiw4pjgxiqw4yam4yx2ggn2rp0vlkac6y"; depends=[caret ggplot2 ggrepel gridExtra kernlab limma missForest pcaMethods pROC reshape2 statmod VIM viridis xgboost]; }; + promor = derive2 { name="promor"; version="0.1.1"; sha256="1wn87cijc04zycfvpvpjd6d816r3bpicw9wfv38nswvrhpdds9k2"; depends=[caret ggplot2 ggrepel gridExtra kernlab limma missForest pcaMethods pROC reshape2 statmod VIM viridis xgboost]; }; promote = derive2 { name="promote"; version="1.1.1"; sha256="1cdz4xqinyzpbbgkxxd4f86n1h8zj88vp5z6w01cxd5ykyjf5411"; depends=[httr jsonlite stringr]; }; promotionImpact = derive2 { name="promotionImpact"; version="0.1.5"; sha256="18iq2r5zirddlfx20alm6qnxf9qv3ii3c9bcm789q0q18d2hyj2q"; depends=[crayon dplyr ggplot2 ggpubr KernSmooth lmtest prophet Rcpp reshape2 scales stringr strucchange]; }; prompt = derive2 { name="prompt"; version="1.0.1"; sha256="19l2vrm7qcdrf2mliniazf3mc6sz3g9v5sysf9nd01p5harqrk8k"; depends=[cli]; }; @@ -14447,7 +14535,6 @@ in with self; { propagate = derive2 { name="propagate"; version="1.0-6"; sha256="17jinz1jramlsf87i7vyn2qp82rc1dacljfaxxplrk3crhw3bhs7"; depends=[ff MASS minpack_lm Rcpp tmvtnorm]; }; properties = derive2 { name="properties"; version="0.0-9"; sha256="1zd66cg31yd53rqsc0cwxhlpfn7kvc67qdh3vyj9qib8kwxaw1zl"; depends=[]; }; 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]; }; - propr = derive2 { name="propr"; version="4.2.6"; sha256="16ghgzpwz6q9zlaa0pc8wqv0wpz81c75n7zwjyr1lv9y19qwlkfg"; depends=[fastcluster ggplot2 igraph Rcpp]; }; prospectr = derive2 { name="prospectr"; version="0.2.6"; sha256="1p53hcgcs2p09zhc2n7byjzrgvcgz6w7q00mlsn4kmnz7l4p7rrm"; depends=[foreach iterators lifecycle mathjaxr Rcpp RcppArmadillo]; }; protViz = derive2 { name="protViz"; version="0.7.3"; sha256="0f6jwzcqi0w37hvg3i5dlk0c3anpkqh54ibf94vaf17r8sykr4nw"; depends=[Rcpp]; }; protag = derive2 { name="protag"; version="1.0.0"; sha256="1iaw2w1d7hdvlg5vplpqc49wq08dgmm0ifvp2v0ggqb8invvdnw8"; depends=[dplyr ggplot2 RColorBrewer]; }; @@ -14470,7 +14557,7 @@ in with self; { provTraceR = derive2 { name="provTraceR"; version="1.0"; sha256="19iillyh5zw64mmr6ik4ci1n2p651xqzxa4iq5bwa70imbzyy5ip"; depends=[provParseR]; }; provViz = derive2 { name="provViz"; version="1.0.9"; sha256="0hwd9x02xcldrmmnpknsycqlb78ngdsphs7n141rcxsv167gbmcq"; depends=[]; }; provenance = derive2 { name="provenance"; version="4.0"; sha256="0ds798jjb7hcc473ca51rylnl5zpcbv02z88rvj9zs8vj22kdy6j"; depends=[IsoplotR MASS]; }; - proverbs = derive2 { name="proverbs"; version="0.1.0"; sha256="1i3aqlk4xb6zrjb7izyz7m9ys950cc6msvac8ixx74a7s57j99p1"; depends=[cli crayon httr lubridate magrittr purrr]; }; + proverbs = derive2 { name="proverbs"; version="0.2.0"; sha256="1kfc8vghrzszgvjx5pq221cw20cn990h5s7l1di5m61wx29siakc"; depends=[cli crayon httr lubridate magrittr purrr]; }; proxirr = derive2 { name="proxirr"; version="0.2"; sha256="0ffnzmd9zy43vzp0mc0ncjwfj5d7p2gzwk8gcwhk1f9yvgiw4wc1"; depends=[]; }; proxy = derive2 { name="proxy"; version="0.4-27"; sha256="0gsng2aggnljl4z82la9hpnd26hngzhj8fizx4wx22npqjj93694"; depends=[]; }; proxyC = derive2 { name="proxyC"; version="0.3.3"; sha256="00p3604ny6qax5rr1865c27hfp90v2vga0xcrp3bb81xcfadl99y"; depends=[Matrix Rcpp RcppArmadillo RcppParallel]; }; @@ -14491,7 +14578,7 @@ in with self; { pseudo = derive2 { name="pseudo"; version="1.4.3"; sha256="0ccf3gz2g7g5y4acpj2qnb39hrghhdganizlddg6rx7al869fffs"; depends=[geepack KMsurv]; }; pseudorank = derive2 { name="pseudorank"; version="1.0.1"; sha256="1hjcvl38di1digkqg7nysd7bkljz1v7y54z2rz10fyk9lyp9mpmy"; depends=[doBy Rcpp]; }; pseval = derive2 { name="pseval"; version="1.3.1"; sha256="1jgnv1l9adhwrmkmp6wkzz7jf7w1hyqy47ajr29l21p4g037py45"; depends=[survival]; }; - psfmi = derive2 { name="psfmi"; version="1.0.0"; sha256="19hm8qswvrg1a1nsby3nfd6avgxl84q77xi2y2frnlh7j92wm63x"; depends=[car cvAUC dplyr ggplot2 lme4 magrittr mice miceadds mitml mitools norm pROC purrr ResourceSelection rms rsample stringr survival tibble tidyr]; }; + psfmi = derive2 { name="psfmi"; version="1.1.0"; sha256="1f5781j676cf0wvybyxh4rylzawfh949gndqfpcdl3kql1bd2215"; depends=[car cvAUC dplyr ggplot2 lme4 magrittr mice mitml mitools norm pROC purrr ResourceSelection rms rsample stringr survival tibble tidyr]; }; psgp = derive2 { name="psgp"; version="0.3-19"; sha256="0yaf69zk4zkpgx5zyksdxb2g4az0ci8v6r23phzcis9fd21y70ds"; depends=[automap doParallel foreach gstat intamap Rcpp RcppArmadillo rgdal sp]; }; psica = derive2 { name="psica"; version="1.0.2"; sha256="1cnrd1p8ikv0hl97jwypw8np1ypa0d8k2mizwd1clkv7inbb264g"; depends=[BayesTree gridBase party partykit randomForest Rdpack rpart]; }; psidR = derive2 { name="psidR"; version="2.1"; sha256="06rsi6ai58yggf73hjaidjhlgc09jjk76a4drvvgfs3v0qm296mm"; depends=[data_table foreign futile_logger openxlsx RCurl SAScii]; }; @@ -14499,7 +14586,7 @@ in with self; { pso = derive2 { name="pso"; version="1.0.4"; sha256="0dq02pv86iwxpvd8wfbryxfsxqrrw4991iim60nyh8mn02gflkmi"; depends=[]; }; psoptim = derive2 { name="psoptim"; version="1.0"; sha256="1yziabkd3h05cfl5jy5l8ji2y3w21acvxsq3inxyh0iwyr8qdkkl"; depends=[]; }; psp = derive2 { name="psp"; version="0.1"; sha256="0ls8nqfddl9yqsz6binjf5smg3vbs5r65dqv92zn6hmb51akf7q5"; depends=[]; }; - pspatreg = derive2 { name="pspatreg"; version="1.0.4"; sha256="1rnlcxb95yzcihjsah31g94fk57gmw5cyjf83mi67mrx037zzxsr"; depends=[AmesHousing dplyr fields ggplot2 MASS Matrix MBA minqa numDeriv plm Rdpack sf spatialreg spdep stringr]; }; + pspatreg = derive2 { name="pspatreg"; version="1.0.6"; sha256="1ml3vyz76lb2qgsqm5223pmx686l79hwplwj63fr7pm3vikdcsnm"; depends=[AmesHousing dplyr fields ggplot2 MASS Matrix MBA minqa numDeriv plm Rdpack sf spatialreg spdep stringr]; }; pspearman = derive2 { name="pspearman"; version="0.3-1"; sha256="09l3knwaj4xs9dfz1xcj4mbynd4w1vxcgmzfqxz97czzbf7ingwh"; depends=[]; }; pspline = derive2 { name="pspline"; version="1.0-19"; sha256="0h7y9l64knx291ms5mlc65dl3ljzgmrfzdqk1rd7iy8x7wcvymds"; depends=[]; }; pspline_inference = derive2 { name="pspline.inference"; version="1.0.4"; sha256="1ijz642igm27xg3928w9ffvykai26aar5awbcilrjbkm6fk7yd4w"; depends=[assertthat dplyr magrittr mgcv plotrix plyr reshape2 rlang]; }; @@ -14526,7 +14613,7 @@ in with self; { psymetadata = derive2 { name="psymetadata"; version="1.0.1"; sha256="1m1b1fhiv31hjc7iy20c065w25mgzmsbp0vlh2vlzrlqmfw0qpwv"; depends=[Rdpack]; }; psyntur = derive2 { name="psyntur"; version="0.1.0"; sha256="0dh7vdj3ynsxibcf0wmh5h4yknijg78azjzlma25glihpgd2nbbw"; depends=[dplyr effsize ez fastDummies formula_tools GGally ggplot2 ggthemes magrittr plyr psych purrr rlang tidyr tidyselect]; }; psyphy = derive2 { name="psyphy"; version="0.2-3"; sha256="1cf134l5j7ggclr08jb5vrj4jv4gq9s1b3njj0ic4263xg8wvv6n"; depends=[]; }; - psyverse = derive2 { name="psyverse"; version="0.1.0"; sha256="0q402z884fwnd812bs44xqbsank89risli13v3njhjc337lj29wx"; depends=[yaml yum]; }; + psyverse = derive2 { name="psyverse"; version="0.2.4"; sha256="10v1fwi5rcmsr5d4lylp7j23vc06mvkr3g4shvhw84yhba78g201"; depends=[yaml yum]; }; 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]; }; @@ -14547,13 +14634,12 @@ in with self; { pubtatordb = derive2 { name="pubtatordb"; version="0.1.4"; sha256="0i5azbf75bwxxzpsr5fc2hh22pbwix00hz9dcdpn5jgp2957f7wx"; depends=[assertthat DBI dplyr R_utils readr RSQLite]; }; pullword = derive2 { name="pullword"; version="0.3"; sha256="125d091ba9h8h61y0m1bnflklmz898sp9w6ibca50vwz3d2qy5rz"; depends=[RCurl]; }; puls = derive2 { name="puls"; version="0.1.2"; sha256="0cdgcm4fvakk2mdjmlsnin3d0bf56wrm23p9f4bhh5j1ib68lsh5"; depends=[cluster dplyr fda fda_usc ggplot2 monoClust purrr rlang tibble tidyr]; }; - pulsar = derive2 { name="pulsar"; version="0.3.8"; sha256="0lrhz22s4622pcf9qz040sacg2myg6l3qym695v8f0a0zvabnix8"; depends=[Matrix]; }; pulseTD = derive2 { name="pulseTD"; version="0.1.0"; sha256="0sdnswinpnm0vvplrh5gl9gx4p03dx175mqxzg5r52rkzd3rfbsr"; depends=[AnnotationDbi Biobase GenomicAlignments GenomicFeatures ggplot2 Rsamtools S4Vectors SummarizedExperiment]; }; pumilioR = derive2 { name="pumilioR"; version="1.3.1"; sha256="1791r5lkr6hafd2rz9f9nfy5vc03c4833f292khvd2cg43sb0bfc"; depends=[RCurl XML]; }; puniform = derive2 { name="puniform"; version="0.2.5"; sha256="1zw8qbqnyhyvzrw6izrqgnmbawcqg2jdhcb8lxs1rd8y7cn4v4wj"; depends=[ADGofTest metafor Rcpp RcppArmadillo]; }; pureseqtmr = derive2 { name="pureseqtmr"; version="1.2"; sha256="1c2pcci3s949hi8hh0h03mr3m6qw3kvihfglwavx578kjm2qw0xz"; depends=[ggplot2 plyr rappdirs stringr tibble]; }; purge = derive2 { name="purge"; version="0.2.1"; sha256="1faf8mkaxsnj63wnig5rs50hd3j6vzaj0xkdz8kn0j7y2vvshp9p"; depends=[]; }; - purgeR = derive2 { name="purgeR"; version="1.5"; sha256="1r93jy5m9x9qgbnnh1a342479gv7f4xxz8w7g0idqd83pzsfasn0"; depends=[doSNOW foreach progress Rcpp RcppProgress]; }; + purgeR = derive2 { name="purgeR"; version="1.7"; sha256="0jcvfrgm7b85xf1lqjnidxrp0dmnqk8pjg2sj581jmkimrpf6cad"; depends=[doSNOW foreach progress Rcpp RcppProgress]; }; purging = derive2 { name="purging"; version="1.0.0"; sha256="1b8f87jn6wyh4fp6b1660bd484wcf7xiajdg9dz2594aj1r94qsr"; depends=[MASS]; }; purrr = derive2 { name="purrr"; version="0.3.5"; sha256="1vzwajjw9h6jg5l82j7nkf3iraqmzwzh40s7q6wkq14awzbnqf52"; depends=[magrittr rlang]; }; purrrlyr = derive2 { name="purrrlyr"; version="0.0.8"; sha256="0ql08dka07wi1cxjcn12pxj00j0cm112074l7byj9vmi3rlqynh8"; depends=[dplyr magrittr purrr Rcpp]; }; @@ -14574,12 +14660,13 @@ in with self; { 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=[]; }; + pwrss = derive2 { name="pwrss"; version="0.1.0"; sha256="16dyfi1qn50grs7dad15qqqrq5cxzkvfxy1pzr27cnp5rxyp0g5m"; depends=[]; }; pwt = derive2 { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; }; pwt10 = derive2 { name="pwt10"; version="10.0-0"; sha256="0zzdd7z9i2dc2br4njfwz7147c907pf25aihh2i3lldkqzcbxkr7"; depends=[]; }; pwt8 = derive2 { name="pwt8"; version="8.1-1"; sha256="1iig0x90ilzh3hdki0h33qgrra8r94rw4bk1x8y7i6c1may8y0v6"; depends=[]; }; pwt9 = derive2 { name="pwt9"; version="9.1-0"; sha256="0m2df89lali9945avcv4gdjpxch9in7vdd042nx0q8nv0alb4ijd"; depends=[]; }; - pxR = derive2 { name="pxR"; version="0.42.4"; sha256="1r0ffr5wxf67i1jh67v06vcmifw4hhhasd4aivic94bkvq4sqmn5"; depends=[plyr reshape2 RJSONIO stringr]; }; - pxweb = derive2 { name="pxweb"; version="0.16.1"; sha256="0yjq8967c7b4qp2gw7r8mwyvh8jggqff4hf0bkvi3mix3claz3zj"; depends=[checkmate httr jsonlite]; }; + pxR = derive2 { name="pxR"; version="0.42.7"; sha256="05i1cg35hq0z37xnh2qfcp8mnrphadrg7av5d0mcgi9nx6c1w80j"; depends=[plyr reshape2 RJSONIO stringr]; }; + pxweb = derive2 { name="pxweb"; version="0.16.2"; sha256="08lwi9adf5wavpc2cbqgyyf3cygih79wkrzf2naydnlf8xn3jcm4"; depends=[checkmate httr jsonlite]; }; pyMTurkR = derive2 { name="pyMTurkR"; version="1.1.5"; sha256="1b1cbvjbnvw2h8l3lbm0ma80zgpm212wzfhyyr6dr115k237xy89"; depends=[curl reticulate XML]; }; pyinit = derive2 { name="pyinit"; version="1.1.3"; sha256="0cbwip549d17ysbk4lrvn6a25vfjjnimjsd5myvnbvg8c9nq5ryn"; depends=[robustbase]; }; pylintR = derive2 { name="pylintR"; version="0.1.0"; sha256="00k9p3igdxhyx353gq8j9mnhrs9fh0j4q2iqa2ljfjdsdw1r2asr"; depends=[fansi htmlwidgets rstudioapi]; }; @@ -14597,7 +14684,7 @@ in with self; { 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=[]; }; - qbr = derive2 { name="qbr"; version="1.1.0"; sha256="1n8arim3gmi2f6n75aqc2lzzvh6i87dv1wgs8c4jphd71fzqwqn4"; depends=[dplyr httr jsonlite magrittr purrr stringr tibble]; }; + qbr = derive2 { name="qbr"; version="1.2.0"; sha256="16nvf4qna4vbn2jcadl0klddgpgviqn8v0mv3mmc8namrvighxww"; depends=[dplyr httr jsonlite magrittr purrr stringr tibble tidyr]; }; qcQpcr = derive2 { name="qcQpcr"; version="1.5"; sha256="1298zla8z5w9z4idc07v3ca9rc1afx853y7iz3jmqnqnv8mr0s48"; depends=[ggplot2]; }; qcapower = derive2 { name="qcapower"; version="0.1.0"; sha256="14vszidjvyi8namwv5k0hpgdw1dpns5ilvxfwa920ivdg35709ki"; depends=[devtools ggforce ggplot2]; }; qcc = derive2 { name="qcc"; version="2.7"; sha256="0lc26w7p3d023lfr8v6v75m2vwqg9vi9pdipap19l4vbdq29l4zz"; depends=[MASS]; }; @@ -14613,10 +14700,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.9.0"; sha256="12jmx1r3dnifpp2kvzx2kkz7f6xqi4jg51bbhi29z5dj4dbjn8c2"; depends=[arm future future_apply generics ggplot2 gridExtra pscl survival tibble]; }; + qgcomp = derive2 { name="qgcomp"; version="2.10.1"; sha256="0cdrb794j9wkfs80r98jbi21g21l3fm754cy364a00zzqd1f5jq3"; depends=[arm future future_apply generics ggplot2 gridExtra pscl survival tibble]; }; qgcompint = derive2 { name="qgcompint"; version="0.7.0"; sha256="0v2b7rr6m5mx3wyclbryxlcdly1a2vj8z0ywsyq4vvj66g2aa0yk"; depends=[arm future future_apply ggplot2 gridExtra qgcomp survival]; }; qgg = derive2 { name="qgg"; version="1.1.1"; sha256="11ijkr67d2b2avd0slw6cfsdhq3v10xyc36b01fj1s1whpm8vrvw"; depends=[data_table MASS MCMCpack Rcpp RcppArmadillo statmod]; }; - 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]; }; + qgraph = derive2 { name="qgraph"; version="1.9.3"; sha256="14azjxlvb02wlbskbsv5x3a6gpfb8hfyijfpbay6fimnsaqnmbj6"; 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]; }; @@ -14638,7 +14725,7 @@ in with self; { qpcR = derive2 { name="qpcR"; version="1.4-1"; sha256="1r01q7jv3w59yx1gc0qw91rq7rvdhqsi8y57sqqkmwyqfw2x2vsv"; depends=[MASS Matrix minpack_lm rgl robustbase]; }; qpdf = derive2 { name="qpdf"; version="1.3.0"; sha256="0x2n9b4avnm0p1cz6i90a3p6qjpwr68g4v0xa8d1rr3gbgqfraf8"; 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.2.0"; sha256="0v83kjkq674ql55d9dfyw4bgybbqyvqivphn925a7wl9zqi1b3lh"; depends=[ggplot2]; }; + qqboxplot = derive2 { name="qqboxplot"; version="0.3.0"; sha256="1rsipw7cn2gqpqpa0ysj99ms5jpnbynjs4gkkmbr2w0c2466fhgx"; depends=[ggplot2]; }; qqconf = derive2 { name="qqconf"; version="1.3.0"; sha256="11sh0q5bwmqdygqd1gspx7xc5mysj18whz11afnz6s1m820snhhw"; depends=[MASS Rcpp 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]; }; @@ -14651,7 +14738,7 @@ in with self; { qrandom = derive2 { name="qrandom"; version="1.2.6"; sha256="00s2c3f9ji27drfyz674bszq1a7xxx8mx0m9g5vrzk9hbm1kcsfj"; depends=[curl jsonlite Rmpfr]; }; qrcm = derive2 { name="qrcm"; version="3.0"; sha256="0y1na936vk5qsir5plzjrbv39jpnq01qplza32z31x6y28is2fz9"; depends=[pch survival]; }; qrcmNP = derive2 { name="qrcmNP"; version="0.2.0"; sha256="0hxg9w4k4k14fan6hb476wnnnpf4y6xywc2vbjka7cmpl1ydw1p4"; depends=[qrcm survival]; }; - qrcode = derive2 { name="qrcode"; version="0.1.4"; sha256="1ajn7lmyaxyk1dgmhz5y8cl61g23g0cjva68ac604ffa14kfv76q"; depends=[assertthat R_utils stringr]; }; + qrcode = derive2 { name="qrcode"; version="0.2.0"; sha256="0472vfk3nlc0d99pc21909g554r9x9b8zhnlf9b995qz6jlmif2x"; depends=[assertthat knitr]; }; qrencoder = derive2 { name="qrencoder"; version="0.1.0"; sha256="1lg60lg2fiqdw0m228i8pln2p0kqp9f21qmrx6r6rwxifvwlfhv8"; depends=[base64enc png raster Rcpp]; }; qris = derive2 { name="qris"; version="1.0.0"; sha256="0rdfpxip37wxim9ini4vgjjpk5b9jqdlaygqkbid2jgjzzya98h0"; depends=[ggplot2 nleqslv quantreg Rcpp RcppArmadillo stringr survival]; }; qrjoint = derive2 { name="qrjoint"; version="2.0-6"; sha256="0vj2f3zjjvp9715jh1fapf2y9vna1vclmd2mg6i8dzf8iw3g2jqf"; depends=[coda kernlab Matrix quantreg]; }; @@ -14667,8 +14754,8 @@ in with self; { qst = derive2 { name="qst"; version="0.1.2"; sha256="0f5c4088y9c5fxyy2dyfkp049lnzvys3zyizazxsa82xwkwsbc8a"; depends=[DBI dbplyr dplyr magrittr RSQLite tibble]; }; qsub = derive2 { name="qsub"; version="1.1.3"; sha256="0ygys183pj420jr9bz13x009qis3qr1aqxgw3l2d4xx3xv90iy3g"; depends=[dplyr glue pbapply processx purrr random readr ssh stringr tidyr]; }; qte = derive2 { name="qte"; version="1.3.1"; sha256="1hz3rwsi3w2b1xjigf5s3866djcxdkjz7jwcz0rin22v5h6sql80"; depends=[BMisc data_table formula_tools ggplot2 Hmisc pbapply quantreg texreg]; }; - qtl = derive2 { name="qtl"; version="1.52"; sha256="0q49g3ar1451whsl6ig7kz4mg8s9zxlcvgkj4ivyw4995wbwc2ij"; depends=[]; }; - qtl2 = derive2 { name="qtl2"; version="0.28"; sha256="0ppc6dzlq77mppxc6bczai9gi40jrbxd1466y2cn2s8a4ah1jg9y"; depends=[data_table jsonlite Rcpp RcppEigen RSQLite yaml]; }; + qtl = derive2 { name="qtl"; version="1.54"; sha256="1rzkxkmcgd6drxbgqp6w6jab5bs7vla2x2ndv3l4nlbcwzi41jw0"; depends=[]; }; + qtl2 = derive2 { name="qtl2"; version="0.30"; sha256="0c9v5hwfmlchrdzdysvmi6dsxyclc15sqbp65l4x6zwpd0828h6c"; depends=[data_table jsonlite Rcpp RcppEigen RSQLite yaml]; }; qtl2convert = derive2 { name="qtl2convert"; version="0.28"; sha256="06703m9mkpc77agkmikr9bhr4ag1z161k8pq8l1i562mkd0qlgs8"; depends=[qtl qtl2 Rcpp]; }; qtl2fst = derive2 { name="qtl2fst"; version="0.26"; sha256="0wpqpmj752pwjgghv7b30r69nc950h5fnsszsj142p7vws7ss8j9"; depends=[fst qtl2]; }; qtl2ggplot = derive2 { name="qtl2ggplot"; version="1.2.1"; sha256="0xr1hhhwifpjbnrp6cwjijic0qwp2yiar7qvb9dl9rb2ww4r369b"; depends=[assertthat dplyr ggplot2 ggrepel purrr qtl2 RColorBrewer Rcpp rlang stringr tidyr]; }; @@ -14687,26 +14774,28 @@ in with self; { quadmesh = derive2 { name="quadmesh"; version="0.5.5"; sha256="0af795r29976ir0ma48chmlm17001xg5wd29waz356cfhinzs2nk"; depends=[geometry gridBase palr png raster reproj scales sp]; }; quadprog = derive2 { name="quadprog"; version="1.5-8"; sha256="1ka9g8zak8sg4y2xbz93dfrldznlk9qpd4pq9z21cdcdn3b8s4i2"; depends=[]; }; quadprogXT = derive2 { name="quadprogXT"; version="0.0.5"; sha256="1yna2kx9pr58vyy6f4mwx4a6avjz84wwhcary88v1k0ihhv9swcz"; depends=[quadprog]; }; + quadraticSD = derive2 { name="quadraticSD"; version="0.1.0"; sha256="07v71anh0kz898x6j677bxx5lyarc4r0z1j0vx501ffi38icc1f0"; depends=[ggplot2 shiny]; }; quadrupen = derive2 { name="quadrupen"; version="0.2-9"; sha256="1rvnl2qn9cw1wvxaklxd41p9vnnvkcypkiryfi5fi9mwx6lzz8an"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; }; - quadtree = derive2 { name="quadtree"; version="0.1.9"; sha256="1qmy4ndqjy237b5d6k3viir5barnzgq4873qz7fdr6igmz7wnpvk"; depends=[raster Rcpp]; }; + quadtree = derive2 { name="quadtree"; version="0.1.10"; sha256="07n5fllbgd9n36hra373fbvwav43w6wil5iabncah4x6a49a5aha"; 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]; }; + qualitycontrol = derive2 { name="qualitycontrol"; version="0.1.0"; sha256="134dksflv43bixqa5lhcjgwqnahzpb2fnzl4dhc81wdb9pcqsg7v"; depends=[dplyr janitor openxlsx readxl stringr]; }; qualmap = derive2 { name="qualmap"; version="0.2.1"; sha256="0r8v7r2mh1dsvr9lvdcmddp5agbx5djg7850zf6ixlv8zak6cxz5"; depends=[dplyr glue leaflet purrr rlang sf]; }; qualpalr = derive2 { name="qualpalr"; version="0.4.3"; sha256="1hlssqj2129796d00gnip3ih5b705qasw0hkj25xfz7xak0vdbkm"; depends=[assertthat randtoolbox Rcpp RcppArmadillo RcppParallel]; }; - qualtRics = derive2 { name="qualtRics"; version="3.1.6"; sha256="163m0lmrcnxhx3f73fdd0bw6h5z4pqn8bbvxhk95pm2yn7pnbx9y"; depends=[assertthat dplyr glue httr jsonlite lifecycle lubridate purrr readr rlang sjlabelled stringr tibble tidyr]; }; + qualtRics = derive2 { name="qualtRics"; version="3.1.7"; sha256="0jfzghqj8qz5wz13j4v0h58l7mflmz7jm324j2agr109q2kl2vma"; depends=[cli dplyr glue httr jsonlite lifecycle lubridate purrr readr rlang sjlabelled stringr tibble tidyr]; }; qualvar = derive2 { name="qualvar"; version="0.2.0"; sha256="1c7b7lcyq2l46sslk185r6xfh5fb35z9qihrhnh294sw1k52bffa"; depends=[]; }; qualypsoss = derive2 { name="qualypsoss"; version="1.1.1"; sha256="1kcdmbj0wyycp7i4d3hb1addnl1c7ndkc6qnbnds0vcfk1dfxd8h"; depends=[doParallel foreach ggthemes MASS mvtnorm QUALYPSO]; }; quantCurves = derive2 { name="quantCurves"; version="1.0.0"; sha256="0z00agd4q157cjkc4gwyfw3kka043wcf5j7yzn8cqm281fqh1jny"; depends=[KernSmooth locpol np quantreg quantregGrowth]; }; quantdates = derive2 { name="quantdates"; version="1.0"; sha256="1hyds8rwr1yg740aq4w5fqjrwdf3dl4phf8mj8qsgbb7i0wbbf3q"; depends=[lubridate]; }; quantdr = derive2 { name="quantdr"; version="1.2.2"; sha256="0w6jdd6i4wxbk4fp44rmy32mwq9ng63zwamq8zpa1hlfbm5qh4s2"; depends=[dr KernSmooth mvtnorm quantreg]; }; - quanteda = derive2 { name="quanteda"; version="3.2.3"; sha256="1blk9nhydvqyyz0kzhph7nh7ahcjzflmgyr4sv8fx5bpmn4hwjzk"; depends=[fastmatch magrittr Matrix Rcpp RcppArmadillo RcppParallel SnowballC stopwords stringi xml2 yaml]; }; + quanteda = derive2 { name="quanteda"; version="3.2.4"; sha256="1yg3lgckh6fncmw037p4gaa2bab59yh6izqix1cgyysjg4jpcw62"; depends=[fastmatch magrittr Matrix Rcpp RcppArmadillo RcppParallel SnowballC stopwords stringi xml2 yaml]; }; quanteda_textmodels = derive2 { name="quanteda.textmodels"; version="0.9.5-1"; sha256="0i61bnk6hvrxqsrvmcpnak2c2drxiymxa28751s3yicm10m32i61"; depends=[glmnet LiblineaR Matrix quanteda Rcpp RcppArmadillo RcppParallel RSpectra SparseM stringi]; }; quanteda_textplots = derive2 { name="quanteda.textplots"; version="0.94.2"; sha256="1favm1cpka1gkpnq2qwqynay15q6f29b66wmm60wsd7dhsxcyjb6"; depends=[extrafont ggplot2 ggrepel igraph Matrix network quanteda RColorBrewer Rcpp sna stringi]; }; quanteda_textstats = derive2 { name="quanteda.textstats"; version="0.96"; sha256="1sp0xd31z63ahqhv1vp0vj6sy4cal0rh7pga1rmc6nnc6dszgfis"; 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.2.1"; sha256="0gvr93d6jjixcrislym0mna2l3plqhl8adaqiagdvxg4y0adfmf0"; depends=[np quantreg SparseM]; }; - quantities = derive2 { name="quantities"; version="0.1.6"; sha256="0kz95q8npiir8nadvfnpnnm9z5jg9mqk7b1fp6l0bj8asmjyw1l3"; depends=[errors Rcpp units]; }; + quantities = derive2 { name="quantities"; version="0.2.0"; sha256="0lp6s9kwgs7vw36nq2qq40n68wqzycr94q0hc4rlgc4gvwwm1sj6"; 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.20"; sha256="154fqhw46kc7r08zsj5fsg97hg93phsli3z14xwmz22xb50xymzp"; depends=[curl TTR xts zoo]; }; quantoptr = derive2 { name="quantoptr"; version="0.1.3"; sha256="0f9vy9yhya4wpya8n345s6n7a5sb29chdkl5fz6dwa31lp1mvvj3"; depends=[quantreg Rdpack rgenoud stringr]; }; @@ -14720,10 +14809,10 @@ in with self; { quarrint = derive2 { name="quarrint"; version="1.0.0"; sha256="13fdmmrgn23xd9vpywmcl7pf729gmcxjfl1wxs30axsbp4h1s6rk"; depends=[neuralnet]; }; quarto = derive2 { name="quarto"; version="1.2"; sha256="186q07r2hwldhk6fvhamaqq21g5c74jp967rqan13l4diakgb739"; depends=[jsonlite later processx rmarkdown rsconnect rstudioapi yaml]; }; queryparser = derive2 { name="queryparser"; version="0.3.1"; sha256="1pz66f3wxvvv42l5hib7hbpy14s8a13gn0n57vf6v5zdnz423kdr"; depends=[]; }; - queryup = derive2 { name="queryup"; version="1.0.0"; sha256="0a7y1vagv635cf40w208z17b8r3rlj4zidfcx8r3lnasbama7jpl"; depends=[jsonlite RCurl]; }; + queryup = derive2 { name="queryup"; version="1.0.1"; sha256="0yr73g4a5aghdxn3qc9y1al8n9m499x5vppzx9adrnhl0y0nigsf"; depends=[jsonlite RCurl]; }; quest = derive2 { name="quest"; version="0.1.0"; sha256="15al3j850v7i59zr9yybxjrb3lnpd14369rp5vnpzwxy80jpy7d9"; depends=[car plyr psych psychTools str2str]; }; 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]; }; + queuecomputer = derive2 { name="queuecomputer"; version="1.2.0"; sha256="0qlcj4rqfkp8qanzwi1p2s7r89x5w6aa8zwkcl7rqapbd4nwayhc"; 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]; }; quickNmix = derive2 { name="quickNmix"; version="1.1.1"; sha256="01gnvnpfxry354qf772m187mfvjigqngjpi1k9y1g5nvlv7a4d62"; depends=[doParallel foreach optimParallel]; }; @@ -14742,6 +14831,7 @@ in with self; { quiltr = derive2 { name="quiltr"; version="0.1.0"; sha256="1my36y9kf52jm6w923qmffi3809d0xcc68sm5ngvfacszn665k23"; depends=[]; }; quincunx = derive2 { name="quincunx"; version="0.1.5"; sha256="1jny5q2sdndc26phqfr0vj3ry6pcdjcgdqqwqkhlf0x97vlicgb7"; depends=[concatenate dplyr glue httr lubridate magrittr memoise progress purrr rlang rvest stringr tibble tidyjson tidyr vroom writexl]; }; quint = derive2 { name="quint"; version="2.2.2"; sha256="1fmzdnikskq8f70h6bh5ig5s6d227bzd6q93n2c05ymj1m5s9ban"; depends=[Formula partykit rpart]; }; + quoradsR = derive2 { name="quoradsR"; version="0.1.0"; sha256="1gdb5zvi7hs2mpzv07w1mbm9w4ksidbz28mjb6w20bfpy6casfz5"; depends=[jsonlite]; }; quotedargs = derive2 { name="quotedargs"; version="0.1.3"; sha256="11cswg9bmddsl1axxcdz11flq46p1zkpv022526f2vgl4qsprwbm"; depends=[]; }; qut = derive2 { name="qut"; version="2.2"; sha256="1jsp3sv1631ar1sad8fy4l60ar2pbi20g50yz9mhs83427n3l63b"; depends=[flare glmnet lars Matrix]; }; qvcalc = derive2 { name="qvcalc"; version="1.0.2"; sha256="0banzv78kb53ybfbh1hmgx7kxvpbbdxzg4dsn7vrwhmxs72srkch"; depends=[]; }; @@ -14753,9 +14843,9 @@ in with self; { r2d2 = derive2 { name="r2d2"; version="1.0.1"; sha256="1956p9xr9as8v4673d6fsdyas3racfzh6a5pafqz56r8ai1ssbyq"; depends=[KernSmooth MASS sp]; }; r2d3 = derive2 { name="r2d3"; version="0.2.6"; sha256="15mphywsr0603ipbgzac65n1nj7m77fmw3ypc33p9ng4fllg035r"; depends=[htmltools htmlwidgets jsonlite rstudioapi]; }; r2dictionary = derive2 { name="r2dictionary"; version="0.1"; sha256="0assylz2ih96l4jily76hp524h5xbnc27ln8yjvk9c4q88yr8xfy"; depends=[rstudioapi stringr]; }; - r2dii_analysis = derive2 { name="r2dii.analysis"; version="0.2.0"; sha256="1bd1byr7n488d0ig393vdg7mdg902hmhwaim6hcx31brqzz19kam"; depends=[dplyr glue lifecycle magrittr r2dii_data rlang tidyr tidyselect zoo]; }; + r2dii_analysis = derive2 { name="r2dii.analysis"; version="0.2.1"; sha256="0408r5vlq5kgd0b653sywi62rkfw1sg3m4via072c5bdr207bj8d"; depends=[dplyr glue lifecycle magrittr r2dii_data rlang tidyr tidyselect zoo]; }; r2dii_data = derive2 { name="r2dii.data"; version="0.3.1"; sha256="00a1flpqak862yf0x98kap1jalz3485mwhps3ywi1i5b9g3g2x4q"; depends=[lifecycle]; }; - r2dii_match = derive2 { name="r2dii.match"; version="0.1.1"; sha256="030lvmi34fsbllwz0vhfxfmyar08x83hl7gkf6q6g5s54d1am1lr"; depends=[data_table dplyr glue lifecycle magrittr purrr r2dii_data rlang stringdist stringi tibble tidyr tidyselect]; }; + r2dii_match = derive2 { name="r2dii.match"; version="0.1.3"; sha256="19k6g7pa7jdsbpclkvppj3m08vji79jnijywzplwy01c84by5gf8"; depends=[data_table dplyr glue lifecycle magrittr purrr r2dii_data rlang stringdist stringi tibble tidyr tidyselect]; }; r2dii_plot = derive2 { name="r2dii.plot"; version="0.3.0"; sha256="0xfirb7xq199mxngjva535nqfdfl8ff26bmfdk141hg9fysfs00v"; depends=[dplyr forcats ggplot2 ggrepel glue lifecycle magrittr r2dii_data rlang scales stringr]; }; r2glmm = derive2 { name="r2glmm"; version="0.1.2"; sha256="0iim92blpa59vgz97c2pi05yhbjjmaffdbkbmk5kplfb2vmazgiy"; depends=[afex data_table dplyr ggplot2 gridExtra lmerTest MASS Matrix mgcv pbkrtest]; }; r2mlm = derive2 { name="r2mlm"; version="0.3.2"; sha256="04j8q1j5r2z6vjji3lgw6c6mn3xip339zwqbli0limx9lklcdjr6"; depends=[dplyr lme4 magrittr nlme rlang rockchalk stringr tidyselect]; }; @@ -14766,6 +14856,7 @@ in with self; { r2resize = derive2 { name="r2resize"; version="1.3"; sha256="14zk3vhisb3fy2khx7w98zl4jzq2pnyh9sdpjc5rbr3yqpmj6mi2"; depends=[DT shiny]; }; r2rtf = derive2 { name="r2rtf"; version="0.3.5"; sha256="1dhmkv2qv1rqkmd53ca2r85178p05jm5l8m01inyz96vqjdk1h4z"; depends=[]; }; r2shortcode = derive2 { name="r2shortcode"; version="0.1"; sha256="03djy8m146k31xgvwcbrd1nzwj4wdlvvwzgviv80kskgr6ld9jrj"; depends=[magrittr stringr]; }; + r2social = derive2 { name="r2social"; version="1.0"; sha256="1jmhq2qfh3wn47ysl8lairhj7zibiq0dw5nfx0ki1d3vi6f7bv5r"; depends=[htmltools shiny]; }; r2spss = derive2 { name="r2spss"; version="0.3.2"; sha256="1d0znbw0bmgl8k9xwz78lmidh8338n3vq4f9qyqmb87nvjmiilhl"; depends=[car ggplot2 scales]; }; r2sundials = derive2 { name="r2sundials"; version="5.0.0-10"; sha256="1hv5wq6lxrv57pszxky4xiwhjhjlzxa4fh0flrrmrrk89dygkx9v"; depends=[Rcpp RcppArmadillo rmumps]; }; r2symbols = derive2 { name="r2symbols"; version="1.2"; sha256="1vwg0i42gb768j30vhr8hvlb32df19lbjf5kyya15z1a0x6b4sz8"; depends=[htmltools jsonlite]; }; @@ -14786,6 +14877,7 @@ in with self; { rAverage = derive2 { name="rAverage"; version="0.5-8"; sha256="09yap3qv02k5nidi6a4png9xa5yy7cb8hg8s2dq99wnc88s42d26"; depends=[]; }; rBDAT = derive2 { name="rBDAT"; version="0.10.0"; sha256="1vndnip3rpvlgmnmi91r23nyr59v6dmm8m5i2yxi7pim1l35323r"; depends=[]; }; rBMF = derive2 { name="rBMF"; version="1.1"; sha256="16yg1k7vv88q421nk1a70626c7c54bwnb3x7kiyxv2c0ha00f3g8"; depends=[Matrix Rcpp]; }; + rBahadur = derive2 { name="rBahadur"; version="0.9.1"; sha256="1wfhn4k32jnvw5gxvc8izwfgi8xbg9v3wr7m7w08hyp4n8k6fnfz"; depends=[]; }; rBayesianOptimization = derive2 { name="rBayesianOptimization"; version="1.2.0"; sha256="0gwdzv4wl4n940ph23yhjh0s192k9visvivww5k1kmy2b1j88cva"; depends=[data_table foreach GPfit magrittr]; }; rBeta2009 = derive2 { name="rBeta2009"; version="1.0"; sha256="0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq"; depends=[]; }; rBiasCorrection = derive2 { name="rBiasCorrection"; version="0.3.4"; sha256="1ivxxw7jf1s95abjwc794mqklkvlgvgyyb6ii99x6mnga6flh11n"; depends=[data_table future future_apply ggplot2 magrittr nls2 polynom]; }; @@ -14808,7 +14900,7 @@ in with self; { rFSA = derive2 { name="rFSA"; version="0.9.6"; sha256="1fxd194iq8jnlsnj76mjq2f6db7ln641qwfsf5v63kx3qqhn8x5s"; depends=[hash rPref tibble tidyr]; }; 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]; }; - rGV = derive2 { name="rGV"; version="0.0.2"; sha256="079nrlyywzk3cgy6mkizyzd8z0w2a4ghjcp9jpv15zcznzdnaqzp"; depends=[chron]; }; + rGV = derive2 { name="rGV"; version="0.0.3"; sha256="0hqn1lh1bjjsdmj10drdflag5nrakh73b2m53iy4vhsr47gz07n9"; depends=[chron]; }; rGhanaCensus = derive2 { name="rGhanaCensus"; version="0.1.0"; sha256="1i8z2cfzk64yhvkia1khsmw666dflai1sj8bhd8n2d97a45nb230"; depends=[]; }; rGroovy = derive2 { name="rGroovy"; version="1.3"; sha256="172vm4diygzi4ipmw8bl03k0x3aps0h1vkvwvw539kamy7xb5w98"; depends=[rJava]; }; rIP = derive2 { name="rIP"; version="1.2.0"; sha256="1f3gbd3ij047n0rh4a7yy6wdjz3b89rki7zaz4y9zgw6bad6ylkl"; depends=[amerika dplyr httr iptools jsonlite]; }; @@ -14818,7 +14910,6 @@ in with self; { rJava = derive2 { name="rJava"; version="1.0-6"; sha256="1ijqhvnb8ab38cp9pwdf7zq7xqqlm6x94gkrab2dd98p6d4x1472"; depends=[]; }; rKOMICS = derive2 { name="rKOMICS"; version="1.1"; sha256="0zs7a75hgrj4ajbbxn0kmc2871rakyizhwdn7ryha8bgig4ld3cs"; depends=[ape circlize ComplexHeatmap dplyr factoextra FactoMineR ggplot2 ggpubr magrittr reshape2 stringr]; }; rKenyaForex = derive2 { name="rKenyaForex"; version="0.1.0"; sha256="1y5hdc1n8kan42vzg6kpfgz68s1bpd93pavcisxh03c76zkf9ap9"; depends=[]; }; - rKolada = derive2 { name="rKolada"; version="0.2.1"; sha256="1c1ci6dn3yqgp7qm1fih8dlq67dpbc1wlxhzcrzs0zzign47vgvd"; depends=[dplyr glue httr jsonlite magrittr purrr rlang stringr tibble tidyr urltools]; }; rLDCP = derive2 { name="rLDCP"; version="1.0.2"; sha256="0k7zc1xyqmcl7070hhpqw1d2k1ij6bd4wjym8cw263pds2n7nx21"; depends=[XML]; }; rLFT = derive2 { name="rLFT"; version="1.0.1"; sha256="0d86z5ckhkavgr2xi9pk7pw8ss3whrssa7na43kj0pirax9cys4z"; depends=[Rcpp sf]; }; rLTP = derive2 { name="rLTP"; version="0.1.4"; sha256="04w432m03xwh0szshsrfw5h7wy43q4lj8z0y07k8w6gsf27cy5bx"; depends=[RCurl]; }; @@ -14826,6 +14917,7 @@ in with self; { rLiDAR = derive2 { name="rLiDAR"; version="0.1.5"; sha256="0sw79zr7hdwprlwijlg6qmn7pmpcnhxfr7ycdz09058c0kd815h8"; depends=[bitops deldir geometry plyr raster rgeos rgl sp spatstat_geom]; }; rMEA = derive2 { name="rMEA"; version="1.2.2"; sha256="18manb926yd6a3b6im7g2vf1cbvvdkg15i6zl223npckhna2nbx0"; depends=[]; }; rMIDAS = derive2 { name="rMIDAS"; version="0.4.1"; sha256="0q40ksz09c8mv3kci35k561f92nz26vb5w4kh7xpkcmwig8bcqwx"; depends=[data_table mltools reticulate]; }; + rMOST = derive2 { name="rMOST"; version="0.0.2"; sha256="0dy0sls9sl4n1hsyw6rczcffl1p03nlxs1m1jhdk9a00wrwkzvky"; depends=[nloptr]; }; rMR = derive2 { name="rMR"; version="1.1.0"; sha256="0da1hclfnnlkp9by6zf2p079643p8nimplr9p3ipbjdy739j344z"; depends=[biglm]; }; rMVP = derive2 { name="rMVP"; version="1.0.6"; sha256="0c3bmn7k5hgw8mgplyhwf6dkgvrxd29yj829wy5j9z1p88gq6wrk"; depends=[BH bigmemory MASS Rcpp RcppArmadillo RcppEigen RcppProgress]; }; rMisbeta = derive2 { name="rMisbeta"; version="1.0"; sha256="1h4vilnndl0gnz9z0sgbywp4zy44718zpiqcqigbjbd4lymi0y61"; depends=[ROC]; }; @@ -14848,14 +14940,13 @@ in with self; { rSEA = derive2 { name="rSEA"; version="2.1.1"; sha256="18108ds65ykxygbw1s4i5rb1ngzwymv1x3dhcv1lcwkmqplnaar9"; depends=[ggplot2 hommel]; }; rSFA = derive2 { name="rSFA"; version="1.5"; sha256="17jabv64rgaxs5kx579vjrhcw2k08c6ah6a11cswl8v9h0vjjz8i"; 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.2.0"; sha256="1qwmjzp7iz7rhaa4kslcm133m5rwxk381r2yqqqccf0r9cah7klf"; depends=[Matrix]; }; + rSRD = derive2 { name="rSRD"; version="0.1.5"; sha256="1kmivz5qlfqq300lcg8qjl79dhcbdmq9xxx18bn57yks7g7ksk8s"; depends=[dplyr ggplot2 ggrepel janitor Rcpp rlang stringr tibble]; }; rSpectral = derive2 { name="rSpectral"; version="1.0.0.9"; sha256="1r1ygvgp2z82nsqx3q9ax4zf0ylgwqlv13sgbqacaxn07b7yx1xv"; depends=[graph igraph Rcpp RcppArmadillo Rdpack]; }; 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]; }; rTCRBCRr = derive2 { name="rTCRBCRr"; version="0.1.1"; sha256="0k4blxbnyzgfgcvn59zw8fnw6avhgbmbgkk6a1ycpz1jijy1sn2z"; depends=[magrittr readr tidyr tidyselect]; }; rTG = derive2 { name="rTG"; version="1.0.1"; sha256="1wsas7wvyzbiw31iv0qazjmnxj7al84y5kpvglf1f0dd444y4hc0"; depends=[brnn dplyr ggplot2 knitr magrittr mgcv]; }; - 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]; }; - rTRIPLEXCWFlux = derive2 { name="rTRIPLEXCWFlux"; version="0.1.0"; sha256="1fh4xnfg7b90gqc10g7dxffc9kan644684vmc5p4h27bs53b5b5p"; depends=[]; }; + rTRIPLEXCWFlux = derive2 { name="rTRIPLEXCWFlux"; version="0.2.0"; sha256="0gliwrbwynxm0ldnvpqs8yl6k63y54kr4ggx21zsvjbqbxs2q4v3"; depends=[]; }; rTRNG = derive2 { name="rTRNG"; version="4.23.1-2"; sha256="0rba3dxy97r75mxfn8rxrk2081my79la2m5m9h5ms2z5px07llqd"; depends=[Rcpp RcppParallel]; }; rTableICC = derive2 { name="rTableICC"; version="1.0.7"; sha256="1z896675kmm9p5dnmcnsz2205ynf05laqcxvlc9y0g5i0x8rf8v6"; depends=[aster partitions]; }; rTensor = derive2 { name="rTensor"; version="1.4.8"; sha256="1ks4rwaish24sg5gc2jkfdqfq6h8gh9f3wdxk3dxjgpwjqwijz8f"; depends=[]; }; @@ -14926,8 +15017,8 @@ in with self; { 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.1"; sha256="1r1b76g9qlss75qqyh05wic4k08xixgx6lgs7gc49an71h0mi5a7"; depends=[]; }; - randtoolbox = derive2 { name="randtoolbox"; version="2.0.2"; sha256="0mvafd2gm1jpg19gdn6bw8668pqghi0xmcb56rl4fwamg8jg09xn"; depends=[rngWELL]; }; - rangeBuilder = derive2 { name="rangeBuilder"; version="1.6"; sha256="1r39f2i2g7lf959b39nk355jm6iyjcqcp8lk47s6qp7wnnqh9h9p"; depends=[alphahull cleangeo data_table pbapply raster Rcpp rgeos sp stringdist stringi]; }; + randtoolbox = derive2 { name="randtoolbox"; version="2.0.3"; sha256="0i23wj9nmsfy3x2yzlfadzrvil2yhcrxs6qxrykrqs15r9jwx3hm"; depends=[rngWELL]; }; + rangeBuilder = derive2 { name="rangeBuilder"; version="2.0"; sha256="10sp40jkqv04980dqqshk1ixsl789sk3sdf8ygwfp95a44rx20v4"; depends=[alphahull pbapply Rcpp rnaturalearth sf stringi terra units]; }; rangeMapper = derive2 { name="rangeMapper"; version="2.0.3"; sha256="1wasvd3k2c6crl2q27d9q88x21pv66b6h9x3msfdcw0k0h719dzc"; depends=[data_table DBI exactextractr future future_apply glue magrittr progressr raster RSQLite sf]; }; rangeModelMetadata = derive2 { name="rangeModelMetadata"; version="0.1.4"; sha256="102z7ysbw0i1mbnwg0v3h0i094ksw91q84a53qyxndq4m6f557aj"; depends=[dplyr jsonlite MASS raster rgbif rgdal rgeos shiny sp spatstat spocc spThin]; }; rangemap = derive2 { name="rangemap"; version="0.1.18"; sha256="17ycliswmsrc1rvyxj2ik2rs7f061dvam6ck0pm6myj52m2xg781"; depends=[concaveman dplyr maps maptools raster rgdal rgeos rgl rnaturalearthdata scales sf sp spatial]; }; @@ -14940,11 +15031,11 @@ in with self; { rankhazard = derive2 { name="rankhazard"; version="1.1.0"; sha256="0kljn9b74alrd22b5pwfnamdbaqi2wa2z6yzpmgpfs3x0hv72fw7"; depends=[survival]; }; rankinPlot = derive2 { name="rankinPlot"; version="1.0.1"; sha256="0vn04ash9d7n3y8g1yrgmsj357qfskfh31l4fj5h745s1rqfm5i8"; depends=[ggplot2 scales]; }; rankrate = derive2 { name="rankrate"; version="1.0.0"; sha256="0i4sf9hhyxry07bc31c1ww7hqig1r2vgkds34q5csq7g3mic3shf"; depends=[gtools lpSolve nloptr]; }; - ranlip = derive2 { name="ranlip"; version="1.0.1"; sha256="04jh7m8gmz0b4h507amnj708sg5qf4fzawybss01681hsnb3swnz"; depends=[Rcpp]; }; rapbase = derive2 { name="rapbase"; version="1.23.0"; sha256="0n378cdvhfsl638k03rw844pr9298sbk84yn8hixk6f5igihbg40"; depends=[base64enc bookdown DBI digest dplyr DT jsonlite kableExtra knitr magrittr readr rlang RMariaDB rmarkdown rpivotTable sendmailR shiny shinyalert sship yaml]; }; rapiclient = derive2 { name="rapiclient"; version="0.1.3"; sha256="1pm4kdga2nz1cpmchdb0ad8gr3bqfm84b1kl32cyc0x3x5rr2syz"; depends=[httr jsonlite yaml]; }; rapidjsonr = derive2 { name="rapidjsonr"; version="1.2.0"; sha256="07zdirhbzmvq3cp4xn8ngk1lgxbbabzays315zxbs3sxrz6lzjb2"; depends=[]; }; rapidoc = derive2 { name="rapidoc"; version="8.4.3"; sha256="1i7f122iigbaah1c3g5vfmnypwilcgc1i3d0l3985s5fjj44dnhn"; depends=[jsonlite]; }; + rapidphylo = derive2 { name="rapidphylo"; version="0.1.0"; sha256="1mhfhvpm09r0jw6dvjszz139fw4m2fb3509xbw5dwpxnhjc2350n"; depends=[ape phangorn]; }; rapidraker = derive2 { name="rapidraker"; version="0.1.3"; sha256="1dhjsv22rdsv668d8dzdd6pm5xy549iiycv6isjmc5cwj3dp5fyz"; depends=[openNLPdata rJava slowraker]; }; rapidxmlr = derive2 { name="rapidxmlr"; version="0.1.0"; sha256="14pa08yp8xmbqk8wwinz1xsphx75xq6vg8zgzcxc5zgmcf0ja5if"; depends=[]; }; rappdirs = derive2 { name="rappdirs"; version="0.3.3"; sha256="1161i3jgjvzjv4p8qbz9r976fnggkcrw3mlj4yd1h2svnijrz5a9"; depends=[]; }; @@ -14958,13 +15049,14 @@ in with self; { rarms = derive2 { name="rarms"; version="1.0.0"; sha256="11wjxd3pxvjv1j2nz26l8f0kykk9w6lf08izhivfngp63dk2akns"; depends=[jsonlite]; }; rasclass = derive2 { name="rasclass"; version="0.2.2"; sha256="1lsmv8kh519mz3szb4k9s17fz1480cw0i4qk12givhhm2rpzjy50"; depends=[car e1071 nnet randomForest RSNNS]; }; rassta = derive2 { name="rassta"; version="1.0.5"; sha256="0yia0pwg29fd6hq0f96hdf6k70pj296805a4lgxn4qqwn3gw7006"; depends=[cluster data_table dplyr DT foreach GGally ggplot2 histogram KernSmooth kohonen plotly rlang scales shiny stringdist stringi terra]; }; - raster = derive2 { name="raster"; version="3.6-3"; sha256="1in3n0hqzcdhibjl3y82nwn6m6wcv4k3l6s2jw57jn32qgvy01lz"; depends=[Rcpp sp terra]; }; + raster = derive2 { name="raster"; version="3.6-11"; sha256="1arvmhf3ijzh3aanw8n6mdnwk4h26axsxpszvr5g43l7g5vfmggf"; 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]; }; - rasterVis = derive2 { name="rasterVis"; version="0.51.2"; sha256="0kgg6cm7xjqya2d46w0i1i1wjpkb8f99lyqy7rgwa7l9xmwzj5n1"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp terra viridisLite zoo]; }; + rasterList = derive2 { name="rasterList"; version="0.5.14"; sha256="1c2l3p1353nfpib5xcsyyipgcvidj1kl8q9p076hs7j7341xgrfg"; depends=[raster]; }; + rasterVis = derive2 { name="rasterVis"; version="0.51.4"; sha256="1z4vwjmx8n01jc2ypqs1pmx70rc3pjaz3ahk8j8zcif40v0qgy6i"; 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.2"; sha256="18ywr1xmhyybg1ip5vi9hz9ms5zxfm49z5qprc3wwvxvssva5zg3"; depends=[foreach progress proxy raster svMisc terra]; }; + rasterdiv = derive2 { name="rasterdiv"; version="0.3.1"; sha256="01fxi3i1p280n38aaffnnj68w2ri8s5qrapvc44viqv3133n837l"; depends=[foreach progress proxy raster svMisc terra]; }; rasterize = derive2 { name="rasterize"; version="0.1"; sha256="18nrhmq1qmi05rkyr86xsyc8nz0fbdpf2d45h62bbfzbfynqd4qy"; depends=[png]; }; rasterpdf = derive2 { name="rasterpdf"; version="0.1.1"; sha256="0zi54nifbb4dzb29i8rskynblw3z42vzaykwbq30ia5zs9q1bvm5"; depends=[png]; }; rasterpic = derive2 { name="rasterpic"; version="0.2.1"; sha256="00fjn9lyx81jncxml5pw0xfbmsi2kh3mvdrvz73jhqha52zxhpl6"; depends=[png sf terra]; }; @@ -15004,8 +15096,8 @@ in with self; { rbgm = derive2 { name="rbgm"; version="0.1.0"; sha256="0jw7p6l0il0fz5rq7ra731xzj06aqqvm9s1r0hwa4rd74lkg198n"; depends=[dplyr geosphere raster reproj rlang sfheaders sp]; }; rbhl = derive2 { name="rbhl"; version="0.9.2"; sha256="0rs1mmah4yyy5dgz1lvzslm4dk53x0wpiy3742z3hwr8p4agnkqi"; depends=[crul jsonlite plyr tibble xml2]; }; rbi = derive2 { name="rbi"; version="0.10.4"; sha256="0p0cvdzhb81drk5b9fb9jcnw5c02i7qfy7vwyyhk2b1vm9rkw681"; depends=[data_table ncdf4 processx reshape2]; }; - rbi_helpers = derive2 { name="rbi.helpers"; version="0.3.2"; sha256="1inbf3kpl4y46m7v36akrr24112y4sd3d8yqia16i32wxf53wql5"; depends=[data_table lubridate Matrix rbi reshape2]; }; - rbibutils = derive2 { name="rbibutils"; version="2.2.9"; sha256="11pzbqykmn7m9gp5jspfcj6vij865wqf9ry6m3jkihvfj7zhfb5j"; depends=[]; }; + rbi_helpers = derive2 { name="rbi.helpers"; version="0.3.3"; sha256="0jlzfnw3r138inap6dnq0a7cbirs5q18ypxgcb3zfqq5zxkdx276"; depends=[data_table lubridate Matrix rbi reshape2]; }; + rbibutils = derive2 { name="rbibutils"; version="2.2.11"; sha256="10g3fv8ninihjldhvh00yrp260dczhz3q519000jm3wp5w47b945"; depends=[]; }; rbin = derive2 { name="rbin"; version="0.2.0"; sha256="18g6s4m0yc1bzrymk8km553kcwi4vj16b6mxw2lmv48z7243iq87"; depends=[data_table ggplot2]; }; rbioacc = derive2 { name="rbioacc"; version="1.1-0"; sha256="0lmkfr0s90hi06llsa0v4jbcx0jd1dx3qq9h6kb67ws0q6h9y028"; depends=[BH GGally ggmcmc ggplot2 loo Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders stringr zoo]; }; rbioapi = derive2 { name="rbioapi"; version="0.7.7"; sha256="12lwm9x2z9bvnksp6qpqllz2mg45iia4cvv5pqr7rh7p9gwibqsm"; depends=[httr jsonlite]; }; @@ -15014,7 +15106,7 @@ in with self; { rbison = derive2 { name="rbison"; version="1.0.0"; sha256="0g586hsqci4amci10zjq6xpjvxfjr6rv5i63vp85v3z6bkwfamwr"; depends=[crul data_table dplyr ggplot2 jsonlite mapproj plyr sp tibble]; }; rbit = derive2 { name="rbit"; version="1.0.0"; sha256="09ywr711gv0vgfims2vfcxk3rnd0iadzlksil0q9159yarapfc59"; depends=[R6]; }; rblt = derive2 { name="rblt"; version="0.2.4.5"; sha256="1pfg8sgm532czz3lhpx7dmg5zik3bc0p4vdq9s0qk5zgq7nnm9sj"; depends=[data_table dygraphs hdf5r shiny xts]; }; - rbmi = derive2 { name="rbmi"; version="1.2.1"; sha256="1jxbjzf1acgpm8hg7y7rg2jsv94qv6wh4f51wwv3zw1rghfsfmn6"; depends=[assertthat BH Matrix mmrm pkgload R6 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; + rbmi = derive2 { name="rbmi"; version="1.2.3"; sha256="1l8jnp24a01s0acv529bmxdbxzalh1i9i8h35ikkagvrhbwss8sb"; depends=[assertthat BH Matrix mmrm pkgload R6 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; rbmn = derive2 { name="rbmn"; version="0.9-5"; sha256="087i0snzfk5ng944pvy3cqnbib270p0sdmmxk9lp4ab6hi0f7618"; 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]; }; @@ -15028,7 +15120,7 @@ in with self; { rcage = derive2 { name="rcage"; version="1.2"; sha256="1xa9hdzl3dkrhzjp3bng9pxip9c0crr6zh6iq5916h78nm5k7bir"; depends=[ClustGeo ff fields ggplot2 gridExtra LaplacesDemon MASS Matrix pracma raster rgeos rlang sf sp]; }; rcaiman = derive2 { name="rcaiman"; version="1.0.8"; sha256="1p1lvkp2a8y0cal543c8qn8aphvr8zz09393nxnag81fd0a9vwy6"; depends=[colorspace filenamer lidR magrittr pracma Rdpack spatial terra testthat]; }; rcanvec = derive2 { name="rcanvec"; version="0.2.1"; sha256="0gsk2cfiysxjw2lrnpl2l524lvhh9nhnyyh79n8p7vykyqj711yn"; depends=[rgdal sp]; }; - rcarbon = derive2 { name="rcarbon"; version="1.4.4"; sha256="0swc8mpmiycpmx4a8scsxbb509gih5s1ddhbgn6n46pqhszqs2lc"; depends=[doSNOW foreach iterators knitr snow sp spatstat spatstat_core spatstat_geom spatstat_linnet]; }; + rcarbon = derive2 { name="rcarbon"; version="1.5.0"; sha256="1d41fi2arsj8v5ccijqzyz55safcjirax9068rsjvr01zpxq6ag8"; depends=[doSNOW foreach iterators knitr sf snow spatstat spatstat_explore spatstat_geom spatstat_linnet spatstat_model]; }; rcartocolor = derive2 { name="rcartocolor"; version="2.0.0"; sha256="08ljaag2mnhz2671zvwji1sp003z94lz30vjidmybm9fp8piqw5g"; depends=[ggplot2 scales]; }; rcbalance = derive2 { name="rcbalance"; version="1.8.8"; sha256="1kxy3nv9f3qk5azp8d6khd7skk9m4704mdimgzabrndrlb5ihyw8"; depends=[MASS plyr rlemon]; }; rcbayes = derive2 { name="rcbayes"; version="0.2.0"; sha256="1qwbpx9snqgaz7gshvyhq9ylsf59grjhx56f7cnq25h2f76km9cc"; depends=[BH dplyr magrittr Rcpp RcppEigen RcppParallel Rdpack rlang rstan rstantools shiny shinythemes StanHeaders tibble tidybayes]; }; @@ -15039,8 +15131,9 @@ in with self; { rcdk = derive2 { name="rcdk"; version="3.7.0"; sha256="070xfs65xs0wjhm6ghhfb4sccjryaypyj07abdr9qb72s3567g18"; depends=[fingerprint iterators itertools png rcdklibs rJava]; }; rcdklibs = derive2 { name="rcdklibs"; version="2.8"; sha256="0j8r0aqvdmajglyc3zld1d2g2cggg6i3qms1ghalxxdgph555jzw"; depends=[rJava]; }; rchallenge = derive2 { name="rchallenge"; version="1.3.4"; sha256="0i402p6ccjn10ix5nln30pab5nd78hg5q4ivvgc4i99nx7aq0xpx"; depends=[knitr rmarkdown]; }; - rcheology = derive2 { name="rcheology"; version="4.2.1.0"; sha256="0i4yda90kjfpi9jwqwgrg36qq5h1vm1sb6aq9b61ab80vw7w0nng"; depends=[]; }; + rcheology = derive2 { name="rcheology"; version="4.2.2.0"; sha256="09s6b702kla15bkvbjr9b0a0l9cs9z83f73alspid9k1i42fc765"; depends=[]; }; rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; }; + rciplot = derive2 { name="rciplot"; version="0.1.0"; sha256="1c8r8v5r4agwn26iacrkm2whrrr25y5kyi5x130w42vyxrxjj07c"; depends=[dplyr ggplot2 tibble]; }; 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.6"; sha256="0sb28shhfkpflik78h31736li80gjfzim62911iy3vk9b0szd0vy"; depends=[shiny]; }; @@ -15049,13 +15142,13 @@ in with self; { rcolors = derive2 { name="rcolors"; version="0.1.0"; sha256="19lkwd1wdwq9if957qjgrz9mq6s8x49dig8snivhw9ksffcfy4xp"; depends=[magrittr]; }; rcompanion = derive2 { name="rcompanion"; version="2.4.18"; sha256="0fnfib2dcyyklk5npxchwawdmskcicy9zyg1dqw33vhxyc88lpwb"; depends=[boot coin DescTools lmtest multcompView nortest plyr]; }; rcompendium = derive2 { name="rcompendium"; version="1.0"; sha256="1j6hxf6hdvi90qhlzra0jkgyn7a3q4skj594b7lxg5mfkzs7zr2j"; depends=[clisymbols crayon devtools gert gh gtools renv rmarkdown rstudioapi stringr usethis xfun]; }; - rconfig = derive2 { name="rconfig"; version="0.1.3"; sha256="075rq5bkzdbyxvrs23glhhyl7g69pp2f9h4dkwxkickk893glzy5"; depends=[jsonlite yaml]; }; + rconfig = derive2 { name="rconfig"; version="0.1.5"; sha256="1h7g2b87ff3ga97pc3mrhh3dzxx5pq97wyadqfz46j3h79lhzvkc"; 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]; }; rcrimeanalysis = derive2 { name="rcrimeanalysis"; version="0.4.2"; sha256="1b41f636bkr0mr72klyad4fyx5zf129c9h1523rkfkyxrlf527yx"; depends=[dplyr forecast ggmap htmltools igraph KernSmooth leaflet leafsync lubridate pals raster Rcpp rgdal sp]; }; - rcrossref = derive2 { name="rcrossref"; version="1.1.0"; sha256="1n33skb3mwcn9xfd49p8m72z3kqz8n6dj48d286xdpd0zlcahqbh"; depends=[crul dplyr DT jsonlite miniUI plyr R6 shiny stringr tibble xml2]; }; + rcrossref = derive2 { name="rcrossref"; version="1.2.0"; sha256="0hqvhqmfmbhvxv555x3vjwz7rh4r2cw6wj8p3wq4hcf107r555c0"; depends=[crul dplyr DT jsonlite miniUI plyr R6 shiny stringr tibble xml2]; }; rcrypt = derive2 { name="rcrypt"; version="0.1.1"; sha256="002r5wr0bmqbj014iz8wacj883j6gqcxc786m6p9a7zdrjpx2pqi"; depends=[]; }; - rcssci = derive2 { name="rcssci"; version="0.1.0"; sha256="0pivvzf19ms242lpm8k217iv4apxx02m95zg0hz5j8kgip42r2xj"; depends=[Cairo dplyr ggplot2 pacman patchwork rms segmented survival survminer]; }; + rcssci = derive2 { name="rcssci"; version="0.2.0"; sha256="1kq94mxxadr08ybsql1mdw70g4sl9vb6jmv3rkypscpr6gb8gfxd"; depends=[Cairo dplyr ggplot2 pacman patchwork rms segmented survival survminer]; }; 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-8"; sha256="0fmb8gigihf82gdz4yijfchwcw6s1jz91kfpjp0y6cs412lmq4ga"; depends=[ggplot2 vegan]; }; @@ -15066,7 +15159,7 @@ in with self; { 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]; }; rdddr = derive2 { name="rdddr"; version="1.0.0"; sha256="0biq1nxfhkbmay70hfp5yg6zakzcdr7rp0x2zpmyq200cwyyr6lm"; depends=[broom dataverse DeclareDesign dplyr estimatr fabricatr generics ggplot2 prediction purrr randomizr readr rlang tibble tidyr]; }; - rddensity = derive2 { name="rddensity"; version="2.2"; sha256="00xmdy3885j3j5sh3civlgggscr946gh7ibd6namqhbzhsnpwrd3"; depends=[ggplot2 lpdensity]; }; + rddensity = derive2 { name="rddensity"; version="2.3"; sha256="160sxsxqq20s5k9c8vccws17v73ninlpjr9wws9y47204ihxx27r"; depends=[ggplot2 lpdensity]; }; rddi = derive2 { name="rddi"; version="0.1.1"; sha256="19izmky8rwz98i6w76mac9b1sppjdpa48jm33gy38zd3k6k2054j"; depends=[glue rlang xml2]; }; 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]; }; @@ -15085,7 +15178,7 @@ in with self; { rdomains = derive2 { name="rdomains"; version="0.2.1"; sha256="1gpgryfdv4dhv98nfnr15lqq9ndwi8q17rwm5z7j2klgi5d644ld"; depends=[aws_alexa curl devtools glmnet httr jsonlite Matrix R_utils urltools virustotal XML xml2]; }; rdoxygen = derive2 { name="rdoxygen"; version="1.0.0"; sha256="16907969w66xvy62k45rw10qfv4x8z6jkkc6i97vppkgnlvf4d4b"; depends=[devtools]; }; rdpower = derive2 { name="rdpower"; version="2.2"; sha256="0v598jqka5skffbzb4knfmm5hfbg6gmwjgbclv774wrxxn62sj4z"; depends=[rdrobust]; }; - rdrobust = derive2 { name="rdrobust"; version="2.1.0"; sha256="132nxql163r71xw63qbg6g90cigfjmg4svaln247jrlfbwwnvjiq"; depends=[ggplot2 MASS]; }; + rdrobust = derive2 { name="rdrobust"; version="2.1.1"; sha256="18345w89w3phkfp4s59k10iha2ywgnrgdm61f8a9ixvhd3vv2qr0"; depends=[ggplot2 MASS]; }; rdrop2 = derive2 { name="rdrop2"; version="0.8.2.1"; sha256="02rhcq1vn349ddjkqamxb0wjb3z3m4wzkvin1mprcz4fzrjxgbdr"; depends=[assertive digest dplyr httr jsonlite magrittr purrr]; }; rdryad = derive2 { name="rdryad"; version="1.0.0"; sha256="00f1qwsbwg5jggm5b83nhk1lxyw272rv2kg77bcwqvlf3074c3mz"; depends=[crul curl hoardr jsonlite mime tibble zip]; }; rdtLite = derive2 { name="rdtLite"; version="1.4"; sha256="0m2fxwz0h4rriw62g2hp20iw6ddbq5l8n80z9xgxk49n6pfm1ywj"; depends=[curl digest gtools jsonlite knitr provViz rlang rmarkdown sessioninfo stringi XML]; }; @@ -15094,7 +15187,7 @@ in with self; { re2 = derive2 { name="re2"; version="0.1.2"; sha256="13cxq6zw66b0wqwv19kkgn8z9kx1p9x1z1fv9cgn1iq7v1br8gm4"; depends=[Rcpp]; }; reReg = derive2 { name="reReg"; version="1.4.4"; sha256="10x4gr41brdnpk2swhh3nlhw1qwirxkphmj7dh5sbc63hnw48ih4"; 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.3.0"; sha256="0k9h1im0ncz0iv3l7d1y1gghx1i5r52k5cywszk00saz4fdd9r1q"; depends=[digest htmltools htmlwidgets jsonlite reactR]; }; + reactable = derive2 { name="reactable"; version="0.4.1"; sha256="1kcxxlrc6ww70anqrcnrvj7kn0i15cf2ylpaq6fh2kdkyy57d05k"; depends=[digest htmltools htmlwidgets jsonlite reactR]; }; reactablefmtr = derive2 { name="reactablefmtr"; version="2.0.0"; sha256="1r864j8ma1sas2fglw5hdkhf3lxrkri7mf2k5j8cpq7398kgzp94"; depends=[dplyr htmltools htmlwidgets magrittr purrr reactable sass shiny stringr tippy webshot]; }; reactlog = derive2 { name="reactlog"; version="1.1.1"; sha256="1njihrnq1x162nc2wk16kj1l0vpvk8xcdgjvj36arw4z8nv8wpah"; depends=[jsonlite]; }; read_dbc = derive2 { name="read.dbc"; version="1.0.5"; sha256="1vrvxkcrk3iw5am9rsadxzf0wsr7z2mdpa5wb0v9jbhda710b4yf"; depends=[foreign]; }; @@ -15105,7 +15198,7 @@ in with self; { readHAC = derive2 { name="readHAC"; version="1.0"; sha256="0z80ai6xfswwgdfh83l9sq279c97n0wz25bk2l7xfb6w0sndzq53"; depends=[]; }; readJDX = derive2 { name="readJDX"; version="0.6.1"; sha256="19aw7jafgg6d6q5xmsphpkyakad6m1x1062h3nxkmfma9xcy4ns4"; depends=[stringr]; }; readMLData = derive2 { name="readMLData"; version="0.9-7"; sha256="0l752j1jq37j9pdcsbmcb23b5l8fkfsbisfr3yjy3q4rxsphc7k6"; depends=[XML]; }; - readMzXmlData = derive2 { name="readMzXmlData"; version="2.8.1"; sha256="03lnhajj75i3imy95n2npr5qpm4birbli922kphj0w3458nq8g8w"; depends=[base64enc digest XML]; }; + readMzXmlData = derive2 { name="readMzXmlData"; version="2.8.2"; sha256="1kq1v9y013n12ic3dwxxnvncq635w71d6wkpcvcz6dw45bjkc68k"; depends=[base64enc digest XML]; }; readODS = derive2 { name="readODS"; version="1.7.0"; sha256="1hi217ab7hp15jsbzi5ak57cqf8jn2rv78bnn74q72gn9mrfra7n"; depends=[cellranger readr stringi xml2]; }; readOffice = derive2 { name="readOffice"; version="0.2.2"; sha256="0dg7fwxdl41nrjqnxvh9rpz0la99iid0wy51gncjwrh3s85fj2ks"; depends=[magrittr purrr rvest xml2]; }; readSX = derive2 { name="readSX"; version="0.8.3"; sha256="1j04hdn7aqzf0s5zdwzsqckqlnjzag0d83d5b3lq6dq9z3xgjc7d"; depends=[cli readxl rlang]; }; @@ -15130,20 +15223,20 @@ in with self; { readxl = derive2 { name="readxl"; version="1.4.1"; sha256="1ym11mldwj31lgk5av264v8b2zn7fmq5nd30rnm1pchgjizvpgpn"; depends=[cellranger cpp11 progress tibble]; }; readxlsb = derive2 { name="readxlsb"; version="0.1.4"; sha256="1qnfijspx8zwsmr1i6qb7vgaxazmvshq5mcxn79y0r2spszq419i"; depends=[cellranger Rcpp xml2]; }; realtest = derive2 { name="realtest"; version="0.2.1"; sha256="0868ng2vg91c3wsx6c13k7cii2519k1algs8a6pgf4r01jvja5pz"; depends=[]; }; - rearrr = derive2 { name="rearrr"; version="0.3.1"; sha256="1mp0r5rg6mn27pp6f2z5b0r8hsx9spdywxkcx7ba6bjmfqrhqsa5"; depends=[checkmate dplyr lifecycle plyr purrr R6 rlang tibble]; }; + rearrr = derive2 { name="rearrr"; version="0.3.2"; sha256="0maz430czq4dgs7x5yc7wf0kc4p66iaisbg0gj7gzahd5833fwfq"; 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.14.2"; sha256="06sizf7wf63hnc26sp4b4qjndg4bhyxicabrnh7vwp53x3x27pgg"; 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]; }; + rebus_datetimes = derive2 { name="rebus.datetimes"; version="0.0-2"; sha256="1hq5mr1v8ziikmkncb9ix11877rmzbjhz54nigwbkswbjwj7vhdf"; depends=[rebus_base]; }; rebus_numbers = derive2 { name="rebus.numbers"; version="0.0-1"; sha256="0drgszz0824j49c6jk9ry0cfjky7g843ldlxrx3g2vjp0v7hznj3"; depends=[rebus_base]; }; rebus_unicode = derive2 { name="rebus.unicode"; version="0.0-2"; sha256="185313wh4zpp6addfdr78pjhxzazlfwgsddwk02zrzblf4iwzjdm"; depends=[rebus_base]; }; recapr = derive2 { name="recapr"; version="0.4.4"; sha256="1grp8aczn3qjm8ihn2466v5yay60vwyf1x7jsmihgxlvgwki6dh7"; depends=[MASS]; }; receptiviti = derive2 { name="receptiviti"; version="0.1.2"; sha256="17i9amb20nrxy4lj8f98jfkkpg6hr8lw7j90ngidznyrprlwnwr7"; depends=[arrow curl digest dplyr future_apply jsonlite progressr]; }; recexcavAAR = derive2 { name="recexcavAAR"; version="0.3.0"; sha256="0b91jbgqzkgzvk658ckk639yyz1daa0xql3qgl0kzgqg68d53x20"; depends=[kriging Rcpp]; }; rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; }; - recipes = derive2 { name="recipes"; version="1.0.2"; sha256="03k7spw5vivj35lwqj8xj259smgc04qxkdimk5ck9yj656d5lyqs"; depends=[cli dplyr ellipsis generics glue gower hardhat ipred lifecycle lubridate magrittr Matrix purrr rlang tibble tidyr tidyselect timeDate vctrs withr]; }; + recipes = derive2 { name="recipes"; version="1.0.3"; sha256="0pi7j1jj5dmc5kzx6zkm691xya7dw4fn8c8nb2x3gs8mp14spzhg"; depends=[cli clock dplyr ellipsis generics glue gower hardhat ipred lifecycle lubridate magrittr Matrix purrr rlang tibble tidyr tidyselect timeDate vctrs withr]; }; reclin = derive2 { name="reclin"; version="0.1.2"; sha256="0bskmlysc12g5invscr0vvshy8bp1gxjx4wihwbbfzmnk2951qrc"; depends=[dplyr ldat lpSolve lvec Rcpp stringdist]; }; reclin2 = derive2 { name="reclin2"; version="0.2.0"; sha256="1139fx544hi1g1la81rwndbad5r2wi21g4yj2yh6l8w7m8xbn56z"; depends=[data_table lpSolve Rcpp stringdist]; }; recluster = derive2 { name="recluster"; version="2.9"; sha256="1nz5w4v5hhb3qjwxixc526gqsmr1imw582l9gj2acwar4z9mixjp"; depends=[ape cluster phangorn phytools picante plotrix vegan]; }; @@ -15169,6 +15262,7 @@ in with self; { reda = derive2 { name="reda"; version="0.5.4"; sha256="1lrfbcvxgbbpi7l3vls3rdj8y3w30gg5f1fjcfscmykvp0i01j3d"; depends=[ggplot2 Rcpp RcppArmadillo splines2]; }; 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]; }; + redditadsR = derive2 { name="redditadsR"; version="0.1.0"; sha256="00kn34d8277f8m4xigr28lpq4s55lvli4xw70g4cbsir7m6ibklv"; depends=[jsonlite]; }; redist = derive2 { name="redist"; version="4.0.1"; sha256="1xmkvj48aqm6shix00c21bvfni6fjs099g40siwyln4cgmqc57c9"; depends=[cli doParallel doRNG dplyr foreach ggplot2 patchwork Rcpp RcppArmadillo RcppThread redistmetrics rlang servr sf stringr sys tidyselect vctrs]; }; redistmetrics = derive2 { name="redistmetrics"; version="1.0.2"; sha256="1jq4qz43j7qjzx2pac3i1p2h331pgj8z9zfg4s1dhn56rwscn8f5"; depends=[cli doParallel dplyr foreach geos magrittr Rcpp RcppArmadillo rlang sf wk]; }; redland = derive2 { name="redland"; version="1.0.17-16"; sha256="1nzxyczsz274751z48glh8qzv1v9rdv3raq6whyp63nsi2xdri90"; depends=[roxygen2]; }; @@ -15208,7 +15302,7 @@ in with self; { rego = derive2 { name="rego"; version="1.5.2"; sha256="11c8hanfm8n9n8h7a2g3j9x2zy5njfwf19w7d0xydi9pklppy6gc"; depends=[Rcpp]; }; regplot = derive2 { name="regplot"; version="1.1"; sha256="048w0hnd2y8k27msjhw2g4ygck6i09698qk24sz7563z82gvj52w"; depends=[beanplot lme4 sm survival vioplot]; }; regport = derive2 { name="regport"; version="0.3.0"; sha256="0mbx1ja1mbhd0z7jcxjrs6b8ldp87ym21fyqigx3w295kh9zm0xx"; depends=[broom_helpers data_table dplyr forestploter glue parameters R6 rlang survival]; }; - regr_easy = derive2 { name="regr.easy"; version="1.0.1"; sha256="1mdp3c0hn0y71ygnpr7jg3rifm77a2x8kmza34gln7w808avdxvf"; depends=[ggplot2 stargazer]; }; + regr_easy = derive2 { name="regr.easy"; version="1.0.2"; sha256="18b4lznnyqyz4y5ig1dp21kmxqc488c199ss5j91i2v5d1qj2sk8"; depends=[ggplot2 stargazer]; }; regrap = derive2 { name="regrap"; version="1.0.1"; sha256="0yrxhlam7jmxwk1v53kllv6ja1m938symfvqp84xb278r3wb1wv7"; depends=[mvtnorm]; }; regress = derive2 { name="regress"; version="1.3-21"; sha256="0mkf1dyg0r09ifdvmc3g6b0q0h819j0kfh1cb33r1vsr8yfjvgbz"; depends=[]; }; regressoR = derive2 { name="regressoR"; version="2.0.1"; sha256="0h5f085vpmvjzrr3wiq7gvj0cma41szikmp8iaczhc04cdj6k18b"; depends=[DT e1071 echarts4r gbm glmnet golem htmltools kknn neuralnet pls randomForest rlang rpart rpart_plot shiny shinyAce shinycustomloader shinydashboard shinydashboardPlus shinyjs]; }; @@ -15218,7 +15312,6 @@ in with self; { regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; }; regtomean = derive2 { name="regtomean"; version="1.1"; sha256="0xw0pany9cwfxdn26ckk6fdjnqx1916288mhphsnvwns3383nq4k"; depends=[effsize formattable mefa plotrix plyr sjlabelled sjmisc sjPlot]; }; regtools = derive2 { name="regtools"; version="1.7.0"; sha256="00g50dcfy93rgy9a2l24rsjgwk1575gxhpg9dy5r9928nwwd6lx9"; depends=[car data_table FNN glmnet gtools MASS mvtnorm polyreg R_utils rje sandwich text2vec]; }; - 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]; }; @@ -15231,7 +15324,7 @@ in with self; { reldist = derive2 { name="reldist"; version="1.7-1"; sha256="17kbqqapqmckghv7jizibmicv3bzbycfr3mz4xg3yjp3c2bap4r6"; depends=[densEstBayes mgcv]; }; relen = derive2 { name="relen"; version="1.0.1"; sha256="0br7c3j30a1yc61pyinmk5lvk8zw9rivd0z2096g6crgmbzix8ml"; depends=[]; }; relevance = derive2 { name="relevance"; version="1.3"; sha256="185fb5vjq1l6q1yz4qyvm2qli1xpp3wc4d1s17y28daljmdijlw8"; depends=[]; }; - relevent = derive2 { name="relevent"; version="1.1"; sha256="10wy6qbg91bq8cs5fas50nnfw80rpsgr8bqpfbsxcmsh43ilpgg9"; depends=[coda sna trust]; }; + relevent = derive2 { name="relevent"; version="1.2"; sha256="1hv86wfp5x177z8ik4fi7x3hx49i66m6qv459dvij8jypf45rki0"; depends=[coda sna trust]; }; relgam = derive2 { name="relgam"; version="1.0"; sha256="0bfsk2pc3vdk8wgdfpz80x0f9p0z37sq114swqn6z11p298hwf2x"; depends=[foreach glmnet]; }; reliabilitydiag = derive2 { name="reliabilitydiag"; version="0.2.1"; sha256="1gi1ym48fl0n5migaav8sqz62xa567c68p5f3w9l1y3pqdqrw0qw"; depends=[bde dplyr ggExtra ggplot2 magrittr purrr rlang tibble tidyr vctrs]; }; relimp = derive2 { name="relimp"; version="1.0-5"; sha256="0ydn82g8xdqzhf34187080bbpcpw1zdjbj2i3dv1d6d35vvprb5c"; depends=[]; }; @@ -15239,17 +15332,17 @@ in with self; { relsurv = derive2 { name="relsurv"; version="2.2-8"; sha256="07wqihyzg6fsvb6n28w3xag66q3rxfv154kqpg2hxj348c58chgb"; 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]; }; - remaCor = derive2 { name="remaCor"; version="0.0.9"; sha256="1rddxwhwn5m34p1ga2i42sfv6m9lmj4ffsn3jv2f9g82nh6q6gv3"; depends=[clusterGeneration ggplot2 mvtnorm Rdpack reshape2 RUnit]; }; + remaCor = derive2 { name="remaCor"; version="0.0.11"; sha256="0hhk1zrjz6sxg219h9ca7jya0vc8dmrvwaddajkcdns6bv3rj1km"; depends=[clusterGeneration ggplot2 mvtnorm Rdpack reshape2 RUnit]; }; remap = derive2 { name="remap"; version="0.3.0"; sha256="020a7ii90j8wh6f98jmryky6b4xcv4vqd47kah4yqk42z22wixb7"; depends=[sf units]; }; rematch = derive2 { name="rematch"; version="1.0.1"; sha256="0y3mshvpvz9csmq8hk8jbabx4nxlv5sckvfzvm6920ndg34xw2d4"; depends=[]; }; rematch2 = derive2 { name="rematch2"; version="2.1.2"; sha256="1fzpz8vhghw8ygwg6rsvfy3783pqk7ch029i5851lwypkplvz77y"; depends=[tibble]; }; remedy = derive2 { name="remedy"; version="0.1.0"; sha256="1lsa5az9jwy4ngjmfzcb7qj4wm8phsgajlnp5kwa4nav0g1dhb4s"; depends=[knitr rematch2 rstudioapi]; }; remindR = derive2 { name="remindR"; version="0.0.1"; sha256="0b27v2qm3z8l9vcng8f0rkphjidxkw5n017ysflx180qjizqq632"; depends=[assertthat]; }; - remiod = derive2 { name="remiod"; version="1.0.1"; sha256="0pqfq5k546b435mglyzw5cc1vclsp8w1gxy0a3g3bjjxga3dkq17"; depends=[coda data_table doFuture foreach future ggplot2 JointAI mathjaxr Matrix mcmcse ordinal progressr rjags survival]; }; + remiod = derive2 { name="remiod"; version="1.0.2"; sha256="1darwljspxm6mkkp0d7xx375kvhlfwpzxc93yr2mb0mwi2877yi9"; depends=[coda data_table doFuture foreach future ggplot2 JointAI mathjaxr Matrix mcmcse ordinal progressr rjags survival]; }; remote = derive2 { name="remote"; version="1.2.1"; sha256="1ihzjxbvas7396cwsi9am4pl94naxa9dnhbnh8k0l5p4a50mk33w"; depends=[gridExtra latticeExtra mapdata raster Rcpp scales]; }; remoter = derive2 { name="remoter"; version="0.4-0"; sha256="1a7m63l8phv5jnazvdqdrqkaqjwqzaac5y4jm2jn0ypy4n8jvkfl"; depends=[argon2 getPass pbdZMQ png]; }; remotes = derive2 { name="remotes"; version="2.4.2"; sha256="05m5dgv0nba5vhjbdkd8z5lbhpfxgkw31j58am7vz1d44igqgvzj"; depends=[]; }; - rempsyc = derive2 { name="rempsyc"; version="0.0.9"; sha256="0hm0d2743x1g79n6cl3mhffhhxxq4ia8104frxpc6c3fxnr0fjj0"; depends=[boot car dplyr effectsize flextable ggplot2 ggrepel ggsignif lmtest qqplotr rlang]; }; + rempsyc = derive2 { name="rempsyc"; version="0.1.0"; sha256="1by47r69frid5skbm46msrpif22h7vsq6fjwqydp7cg7h901q3sz"; depends=[dplyr effectsize flextable insight performance rlang]; }; remss = derive2 { name="remss"; version="1.0.1"; sha256="15s3qvcfyp1880ddzpvgiw3q5av21052iy1vnpw0hib5pb7xfkfb"; depends=[survival]; }; renderthis = derive2 { name="renderthis"; version="0.2.0"; sha256="1hvqwq2w30j29pwjm498mza9zxg8ga5bizm795hmdbz1k30m4j3p"; depends=[cli digest fs jsonlite magick pagedown progress quarto rmarkdown withr xaringan zip]; }; renpow = derive2 { name="renpow"; version="0.1-1"; sha256="0kbfpzr17fvf5zzxpzdhvfmrqmlkba2w3rzxl5q5ac1w3h75gfhc"; depends=[]; }; @@ -15264,7 +15357,7 @@ in with self; { repfdr = derive2 { name="repfdr"; version="1.2.3"; sha256="0jpk44arg1jib0h2w90h851bs5cd1ss32fab9bfvf9iir2jk8985"; depends=[Rcpp]; }; replacer = derive2 { name="replacer"; version="1.0.2"; sha256="1vpa3v64nsxqalw9ca6zysfaqii797mm3qsn4cfdi7q72nl46pr1"; depends=[data_table]; }; replicateBE = derive2 { name="replicateBE"; version="1.1.3"; sha256="079fkrp9jhp3qr5a1wvz66ldqxbj2pqarmxq5f1adqnyym2aw684"; depends=[lmerTest nlme pbkrtest PowerTOST readxl]; }; - replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-3"; sha256="1h680xn403fm98ywyxqwhq7llsaghgd4ffjq7r5bdb1r9ahvxrv0"; depends=[spatstat spatstat_core spatstat_geom spatstat_utils]; }; + replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-4"; sha256="04rppb9fvympa5zgasjb8ybk8n3pb2nlvmwpdx3lsvfcpsmnibmg"; depends=[spatstat spatstat_explore 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]; }; @@ -15274,7 +15367,7 @@ in with self; { reportROC = derive2 { name="reportROC"; version="3.6"; sha256="1hfgyikd7l14yfr2cnabjbb67svydj1snfcagc4w4fxhdwqhd3f2"; depends=[pROC vcd]; }; reportReg = derive2 { name="reportReg"; version="0.3.0"; sha256="0qwrpn61x69hmgln5fpc58dqfa3pba0lgjjyj0f3fh96wc9jyhq1"; depends=[nlme]; }; reportRmd = derive2 { name="reportRmd"; version="0.0.1"; sha256="1vxjb4sq353nzv3q3cymp02g6y6z338xv29v0nf0j7v6kik0xzq0"; depends=[aod cmprsk geepack ggplot2 ggpubr gridExtra kableExtra knitr MASS pander plyr rlang scales survival]; }; - reporter = derive2 { name="reporter"; version="1.3.7"; sha256="0snxidccxc65x7bpj4hcidphpr74wpx9dybwr4k0bshgdgs1nq1k"; depends=[common crayon fmtr glue jpeg stringi withr zip]; }; + reporter = derive2 { name="reporter"; version="1.3.8"; sha256="1m7bjk58fj8gzckn803zz8yz5hjj4ccyz5l1dnd14ccp3r6im5lp"; depends=[common crayon fmtr glue jpeg stringi withr zip]; }; reportfactory = derive2 { name="reportfactory"; version="0.4.0"; sha256="0mkk9gyd3l6m33mkc6w3fmgrzc6na03kwxxwgn0zb83bjpmyyl1z"; depends=[callr fs knitr rmarkdown rprojroot rstudioapi yaml]; }; reportr = derive2 { name="reportr"; version="1.3.0"; sha256="0zynplxqvbmf23cm2rsz3wz2jx6mv55z94mn1k44ny3lx625cnpw"; depends=[ore]; }; reporttools = derive2 { name="reporttools"; version="1.1.3"; sha256="0sx89qb66lczmzcsybxac4razcncf2xcxr0vfkvb3f8jqc7xwcik"; depends=[xtable]; }; @@ -15283,15 +15376,14 @@ in with self; { represtools = derive2 { name="represtools"; version="0.1.3"; sha256="00hnvzkkcl9d3k115i5l9gs0wah5d11amn7q62m1j158lkqlcfza"; depends=[whisker]; }; reprex = derive2 { name="reprex"; version="2.0.2"; sha256="14khx09yzn97xhags48lvym1g37h1l2ymvw6r1jlldhjc7i1cnx8"; depends=[callr cli clipr fs glue knitr lifecycle rlang rmarkdown rstudioapi withr]; }; reproducer = derive2 { name="reproducer"; version="0.4.2"; sha256="0ip7zh8jnjdwl0lawh60v1rcl0dvrxb6dbrlldb6l1vzbn530him"; depends=[dplyr GetoptLong ggplot2 gridExtra httr jsonlite lme4 MASS metafor openxlsx readr reshape stringr tibble tidyr xtable]; }; - reproducible = derive2 { name="reproducible"; version="1.2.10"; sha256="0agphafd2khv2xk0fwqr2y3imn8fzwa3crpqbp4n3i9qkpmkmvpw"; depends=[data_table DBI digest fpCompare glue lobstr magrittr raster Require rlang RSQLite sp]; }; reproj = derive2 { name="reproj"; version="0.4.3"; sha256="0bcg5bz2sl4d31iwr55nwr85p1jna9fpbcli26lf04dwznwmx0rl"; depends=[crsmeta PROJ proj4]; }; repurrrsive = derive2 { name="repurrrsive"; version="1.0.0"; sha256="1nmy88h2bfv2bad282kbrmnkjx9d8klgzv4mm8nspm049s09ydmz"; depends=[tibble]; }; reqres = derive2 { name="reqres"; version="0.2.5"; sha256="1j8gxacbfnaqvrhjqy851yb8shc73issv08yca6mbnx6aq34wcrd"; depends=[assertthat brotli jsonlite R6 stringi urltools webutils xml2]; }; request = derive2 { name="request"; version="0.1.0"; sha256="1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh"; depends=[curl httr jsonlite lazyeval magrittr R6 whisker]; }; - requiRements = derive2 { name="requiRements"; version="0.0.1"; sha256="17afbpny5j2rssi173k7sxi9q2syskjh8h0h89z24dqsbh3947mz"; depends=[remotes]; }; + requiRements = derive2 { name="requiRements"; version="0.0.2"; sha256="1y98fdqrql1jg18jqwcxwn511jl5ccv3w12q36gc488m3ym1qcyc"; depends=[remotes]; }; requireR = derive2 { name="requireR"; version="1.0.0.1"; sha256="192l7i3q7s2a6n737an3fn258agjsdzh0q2w0vc8jbz7v4f3i92d"; depends=[]; }; rerandPower = derive2 { name="rerandPower"; version="0.0.1"; sha256="1vk0lrd7hc499prshj3dfyyn2iaz9z6916xsw31ax1l5mipys4mk"; depends=[Runuran]; }; - rerddap = derive2 { name="rerddap"; version="1.0.0"; sha256="13fl8d5x6gmnd1m2x3byikdyy8pv96nikh4nnbd6p8jamxcyjbrc"; depends=[crul data_table digest dplyr hoardr jsonlite ncdf4 tibble xml2]; }; + rerddap = derive2 { name="rerddap"; version="1.0.1"; sha256="1fw678w5jyxlkpxfg88w0lxfyvgqwj4qffqn0hi5wzzysz70y0x7"; depends=[crul data_table digest dplyr hoardr jsonlite ncdf4 tibble xml2]; }; rerddapXtracto = derive2 { name="rerddapXtracto"; version="1.1.3"; sha256="0c8cq7hrc10i758ywwf4brwdk1082biiwzl3h2lcn54fdmj7pkm9"; depends=[abind dplyr ggplot2 httr maps ncdf4 parsedate plotdap readr rerddap sf sp]; }; resample = derive2 { name="resample"; version="0.6"; sha256="0rajp5kmr8qgwzhy7wfmhm7fllk9ywm7hz44f5ws94lcn44q158v"; depends=[]; }; resampledata = derive2 { name="resampledata"; version="0.3.1"; sha256="1nxjqvxxvycccmh1n7lpc4k8zmwnciicfr5rzfid1icij5fzw3ak"; depends=[]; }; @@ -15299,19 +15391,20 @@ in with self; { rescue = derive2 { name="rescue"; version="1.0.3"; sha256="0wq4ka1a7yhbjwr99ngykhn2r3czn3rqi63r6jn46pz15vnicwad"; depends=[data_table dbscan igraph irlba Matrix reticulate]; }; resemble = derive2 { name="resemble"; version="2.2.1"; sha256="1r1wanqwb7i9dr1himdgp9sl5c0582rixlf240rczfr7c4skn5mp"; depends=[data_table foreach iterators lifecycle magrittr mathjaxr Rcpp RcppArmadillo]; }; reservoir = derive2 { name="reservoir"; version="1.1.5"; sha256="1qvjq8j2gxp6b8m3k3822f9na8a1kbwzzsmq70m763dcq293rgiz"; depends=[gtools]; }; + reservr = derive2 { name="reservr"; version="0.0.1"; sha256="1p6k561hj4127g1mi5xwic8zmnj3mvklpc4a38ki5cgvw84kb6xa"; depends=[assertthat BH generics glue keras matrixStats nloptr numDeriv purrr R6 Rcpp RcppArmadillo RcppParallel rlang]; }; resevol = derive2 { name="resevol"; version="0.3.0.1"; sha256="13whjldpidagyaqh2s7isvs8qms6zw82v067h4zyrzfzh6q3xsa8"; depends=[]; }; reshape = derive2 { name="reshape"; version="0.8.9"; sha256="0j203qmc076x5lp6q2xi4dq4xdb73jmsa42rpxp1c37knnrph4br"; depends=[plyr]; }; reshape2 = derive2 { name="reshape2"; version="1.4.4"; sha256="1n0jrajpvc8hjkh9z4g8bwq63qy5vy5cgl2pzjardyih4ngcz3fq"; depends=[plyr Rcpp stringr]; }; resourcer = derive2 { name="resourcer"; version="1.3.0"; sha256="1glsmv5r7fgyn8sz8mk1i4n160hj02hyksncj8hgml3k5iips10s"; depends=[httr R6]; }; - respR = derive2 { name="respR"; version="2.0.2"; sha256="0670hy7gg8bbjkjqcvchm83jr57725r8szix66mqggwx0xwjcxj0"; depends=[data_table dplyr glue lubridate magrittr marelac purrr readxl roll segmented stringr xml2]; }; + respR = derive2 { name="respR"; version="2.1.0"; sha256="0xq34bv6r88rr9b3gfwqj8d8m9jqz1ryv80r4anj212fbblbji58"; depends=[data_table dplyr glue 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.13.3"; sha256="0560y2pr69pm4m5dm2xhm549rspxwhryprxhfvhzv0zpn4df01di"; depends=[data_table rjson xml2]; }; restaurant = derive2 { name="restaurant"; version="0.1.0"; sha256="1dr9nw5xkll1wnra2xi8dg2yiv85nibdg1i9lsn44v7cgr9vb32j"; depends=[]; }; - restez = derive2 { name="restez"; version="2.1.2"; sha256="13h84qxfpmq6mfa2xkaimjisz71jy4fbap8y8zdla43zlyhnrvv6"; depends=[ape assertthat cli crayon curl DBI duckdb fs rentrez stringi]; }; + restez = derive2 { name="restez"; version="2.1.3"; sha256="1q008ykk75h19zqnkv339qx7zb7vmab8f9ywvr8qb7l1n3yxah76"; depends=[ape assertthat cli crayon curl DBI duckdb fs rentrez stringi]; }; restfulr = derive2 { name="restfulr"; version="0.0.15"; sha256="14p6h0gjknqy5z2fprxw7waf4p0cd2qmp18s7qig4ylqn8gqzzs0"; depends=[RCurl rjson S4Vectors XML yaml]; }; restimizeapi = derive2 { name="restimizeapi"; version="1.0.0"; sha256="1ss6fng5pmqg6cafc256g9ddz8f660c68ysxfan6mn4gdaigz7lb"; depends=[RCurl RJSONIO]; }; - restoptr = derive2 { name="restoptr"; version="1.0.2"; sha256="1dx1ksymil7mbdkargmhdnzp5x8hnjlxznxhxbqksz3iw6549503"; depends=[assertthat crayon magrittr rJava terra units]; }; + restoptr = derive2 { name="restoptr"; version="1.0.3"; sha256="0ksvzpikhbxjass2kbl70s5jjras2ylldnw3bgwz9499vbpn9raa"; depends=[assertthat crayon magrittr rJava terra units]; }; restorepoint = derive2 { name="restorepoint"; version="0.2"; sha256="0pjp5dvycvfg75hhj8lrr2lrjn6n6bqj0ziwyd87lyi15b9j8w4s"; depends=[]; }; restriktor = derive2 { name="restriktor"; version="0.3-500"; sha256="17a56mdxx1ss9pb628dz44y5q5vr2q3yg2lr6yj9nxz0k3pwqvv3"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; }; resumer = derive2 { name="resumer"; version="0.0.5"; sha256="0k3s2i102hvsag7jiahgfpjc09646xjpxcpv5x3d91ch3xipdc0b"; depends=[dplyr rmarkdown useful]; }; @@ -15325,7 +15418,7 @@ in with self; { retry = derive2 { name="retry"; version="0.1.0"; sha256="1yfcfvszfjnvvnjcywgchyiyj3jk9nmvk3h40g6bc24xapfkfl2p"; depends=[later rlang]; }; reutils = derive2 { name="reutils"; version="0.2.3"; sha256="09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7"; depends=[assertthat jsonlite RCurl tibble XML]; }; reval = derive2 { name="reval"; version="3.1-0"; sha256="1a2dmcfmnyzpfkyir3g1sz6s8dan2lzapq8v1dph5znmascv1180"; depends=[dplyr purrr rlang]; }; - revdbayes = derive2 { name="revdbayes"; version="1.4.9"; sha256="1m9xsqhgkx47wa4ya6f4yagyzjvrz3br9800h5zpaxj7smd86lbd"; depends=[bayesplot exdex Rcpp RcppArmadillo rust]; }; + revdbayes = derive2 { name="revdbayes"; version="1.5.0"; sha256="16dlsc5fqbsijnq3rlvvdd2bdyvx05fhzz7cbazfdxl3akpsc136"; depends=[bayesplot exdex Rcpp RcppArmadillo rust]; }; revealedPrefs = derive2 { name="revealedPrefs"; version="0.4.1"; sha256="1m8y1mj39bnf9q0n9mi0ashvb79lksx5dfkxb04qj2h5kkyxg49g"; depends=[pso Rcpp RcppArmadillo]; }; revealjs = derive2 { name="revealjs"; version="0.9"; sha256="0h4csxrcl1rzmj3g01nf0mr990zc8swrf4jvmxwqsyzx9v2cqbnc"; depends=[rmarkdown]; }; reveneraR = derive2 { name="reveneraR"; version="0.1.2"; sha256="0l5l9lqwisphjpf2ni0c0a3cg4xpkxy3sk4nvj93f6pra2fmg4rg"; depends=[dplyr httr jsonlite magrittr purrr tibble tidyr tidyselect]; }; @@ -15345,6 +15438,7 @@ in with self; { rfVarImpOOB = derive2 { name="rfVarImpOOB"; version="1.0.3"; sha256="1f0ljy51xqqrncdg4xpic6ir8zlgvp952pr0s217v7ybgdzs42v6"; depends=[dplyr ggplot2 ggpubr magrittr randomForest ranger titanic]; }; rfacebookstat = derive2 { name="rfacebookstat"; version="2.8.0"; sha256="08hffwvysvh13ayj2326nmybrz0x3xa5g7l66d40j3cwzd29hiaq"; depends=[dplyr httr jsonlite pbapply purrr stringr tidyr tidyselect]; }; rfacts = derive2 { name="rfacts"; version="0.2.1"; sha256="0h2ryyl5zc3pxi85y0qwadfz7sdzz0m6ilwzabw317sb0z5lms5b"; depends=[digest fs tibble xml2]; }; + rfars = derive2 { name="rfars"; version="0.2.0"; sha256="1shw96m11l9119ngrsc6p4l5i2f5vfd0snj75jjwpjl8gx4m58fv"; depends=[data_table downloader dplyr janitor lubridate magrittr readr rlang stringr tidyr tidyselect timetk]; }; rfieldclimate = derive2 { name="rfieldclimate"; version="0.1.0"; sha256="1s7awczna9dxdq97sr5fsbs4qv7rx4wi2z3inwdp33md1bvyq4i7"; depends=[digest dplyr httr jsonlite lubridate magrittr purrr tidyr]; }; rfigshare = derive2 { name="rfigshare"; version="0.3.8"; sha256="10shwl1y9220m7ld5w9fjsjzy5yg8myrz9cz97ps9z2bw7bvka5j"; depends=[ggplot2 httpuv httr RJSONIO XML yaml]; }; rfinterval = derive2 { name="rfinterval"; version="1.0.0"; sha256="1z7v0sbql6g2h3fr1268nj79rbx1d33hjfaraxhbikrjgb8mbp0w"; depends=[MASS ranger]; }; @@ -15354,7 +15448,7 @@ in with self; { rfishnet2 = derive2 { name="rfishnet2"; version="0.2.0"; sha256="0g90h4353kp7szv3971kb4l5x3x08qx4f9ln85n5g3b3zdg77dkz"; depends=[dplyr ggplot2 pracma rworldmap sf]; }; rflashtext = derive2 { name="rflashtext"; version="0.1.0"; sha256="0200a25gmb1ax96w2m8069s154prvahqb0vczw4ifhcb52i0fsxp"; depends=[R6]; }; rflexscan = derive2 { name="rflexscan"; version="1.0.0"; sha256="1azjdri1dnxqd128p3iya1x36bbhhrckmj08rp23jzfi5zd71c8s"; depends=[igraph Rcpp rgdal sp]; }; - rflsgen = derive2 { name="rflsgen"; version="1.2.0"; sha256="1ixpi6cr6nv6wkjr0ijv79ivzfyn66y2gylhpay6ndzki7ylh57k"; depends=[checkmate jsonlite rgdal rJava terra]; }; + rflsgen = derive2 { name="rflsgen"; version="1.2.1"; sha256="0cfvbzc9a09738ygrq5jsjniblb8slfvmnscgk7jx0dprgcxj7yn"; depends=[checkmate jsonlite rJava terra]; }; 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.3.2"; sha256="03rz1cas0anmfpnax66nr3bsiqgkq02wbvslvqc0q9ayl6p02avh"; depends=[httr]; }; rfordummies = derive2 { name="rfordummies"; version="0.1.6"; sha256="01xv6ds3h8gvi1wi5hgy3r1dhi0767mcgsnshvhva3bnvf1a8398"; depends=[]; }; @@ -15362,15 +15456,17 @@ in with self; { rfvimptest = derive2 { name="rfvimptest"; version="0.1.2"; sha256="0mfpwa0f3pjvjjs5q4g74ljkzs382dzr86aayqf2nnhsaz24aphq"; depends=[party permimp ranger]; }; rfviz = derive2 { name="rfviz"; version="1.0.1"; sha256="1pxr9bsqg27vgbngj89hhjq0gyzgdlg69rz6kzvvd8gclg42wisv"; depends=[loon randomForest]; }; rgabriel = derive2 { name="rgabriel"; version="0.9"; sha256="1za8njmasl7kmmiqgxhr8k2p1kygkadkqgim9wgyjkcnzljg46kb"; depends=[]; }; - rgbif = derive2 { name="rgbif"; version="3.7.3"; sha256="0d8cdqrr6idwhkqqqjylix66h7b4pfx53c2ywaj8adcsv0051dhz"; depends=[conditionz crul data_table ggplot2 jsonlite lazyeval magrittr oai R6 tibble whisker wk xml2]; }; - rgdal = derive2 { name="rgdal"; version="1.5-32"; sha256="1vbkyhw8nd7dw1r53qisphav31x6zvpbzilvnlvbjbj9hzhs90s5"; depends=[sp]; }; + rgbif = derive2 { name="rgbif"; version="3.7.4"; sha256="0q0y0jk4lx5s47a7fp2nifjp2nimrr8rjny451863vq6gij80zcz"; depends=[conditionz crul data_table ggplot2 jsonlite lazyeval magrittr oai R6 tibble whisker wk xml2]; }; + rgdal = derive2 { name="rgdal"; version="1.6-2"; sha256="0g83r9lzq79hs7mk31kqym1sjqnmk53j3nikrn2vk257v854pavy"; 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.5"; sha256="1yq0k935p23qgwaffda8zk5p5546z5i27kivyqf8hg461cn73b3x"; depends=[cli crayon jsonlite leafem leaflet magrittr processx R6 reticulate rstudioapi]; }; + rgeedim = derive2 { name="rgeedim"; version="0.1.0"; sha256="0s60rgm8j7s4vd8djfx0m4sqs9xwqqnk5lvrbgbr39g3y9ads41n"; depends=[jsonlite reticulate]; }; rgen = derive2 { name="rgen"; version="0.0.1"; sha256="0gl82v09q1ha58wd1014s46wzkx1yf348bc7jkl6s4qdc6c4vsb8"; depends=[]; }; rgenius = derive2 { name="rgenius"; version="0.1.0"; sha256="1gpglnhicyv16ym224wzaw52w9xr63slm75wvidl3z14izzyy7ga"; depends=[doParallel dplyr foreach httr purrr rvest stringr tibble]; }; rgenoud = derive2 { name="rgenoud"; version="5.9-0.3"; sha256="0pxmisc0vsdchqaaxqcblnhhviizgcwhvsbklr3rq7vrmn6hlmii"; depends=[]; }; rgeoda = derive2 { name="rgeoda"; version="0.0.9"; sha256="1yl2liin9fvcry2wi3223kq6xdxm6mkkkdjayp9gizllnhpf71z8"; depends=[BH digest Rcpp sf]; }; rgeolocate = derive2 { name="rgeolocate"; version="1.4.2"; sha256="08dps73sdlhsyzkykw3y9ckxazznymfsx63p9rcssghb2silw9xw"; depends=[httr Rcpp]; }; + rgeomstats = derive2 { name="rgeomstats"; version="0.0.1"; sha256="1fy5fvkifv80sf3x0d2y3vyv7adn0h57q1hvip1phcvxg8p5prff"; depends=[cli purrr R6 Rdpack reticulate rlang]; }; rgeopat2 = derive2 { name="rgeopat2"; version="0.3.9"; sha256="0l0sqkvjkzp4lmyk55l7zc02y04sa43cps47005gq8c38kyks45k"; depends=[readr sf stringr]; }; rgeoprofile = derive2 { name="rgeoprofile"; version="0.2.2"; sha256="1nk3qzwcvvq3n1da480zk047wl738fjyvarakm00wwrbnb3ax70j"; depends=[geosphere leaflet pals RANN raster sp spatstat_geom splancs]; }; rgeos = derive2 { name="rgeos"; version="0.5-9"; sha256="1m73y0nwrdwsjrl48c4fg1kdqnh79835brnmxv9ak01ndbzcp45b"; depends=[sp]; }; @@ -15395,9 +15491,9 @@ in with self; { 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]; }; - rheroicons = derive2 { name="rheroicons"; version="0.4.0"; sha256="152949yy5kna10f68g06dc7h0m9jql5n2rp5z6hmp8xg3508yz9x"; depends=[htmltools shiny stringr]; }; - rhierbaps = derive2 { name="rhierbaps"; version="1.1.3"; sha256="0i4sr2wwzzl8vki5zihnd8v4ia2kji09cmf4ld07b6k099g5xprr"; depends=[ape ggplot2 matrixStats patchwork purrr]; }; - rhino = derive2 { name="rhino"; version="1.1.1"; sha256="1d3krs76hcdlkbnwip5pq2i7wwf5wp9q4c9jkgsd9fgq85x7qqjs"; depends=[box cli config fs glue lintr logger purrr renv rstudioapi sass shiny styler testthat withr yaml]; }; + rheroicons = derive2 { name="rheroicons"; version="1.0.0"; sha256="02yknpdgfjjkkk9456pxfl9qhaphwrhbxw7fh04ki9a1rgalk0xw"; depends=[htmltools shiny stringr]; }; + rhierbaps = derive2 { name="rhierbaps"; version="1.1.4"; sha256="0717h3j9pamz0hkwcfadivhfh9n2bd9l55kvll1ipc4dz85cp324"; depends=[ape ggplot2 matrixStats patchwork purrr]; }; + rhino = derive2 { name="rhino"; version="1.2.1"; sha256="1qrm9apiy51khan8v63i60kwmd2axp8qg04mqc5cqinbvdd3qps5"; depends=[box cli config fs glue lintr logger purrr renv rstudioapi sass shiny styler testthat withr yaml]; }; rhli = derive2 { name="rhli"; version="0.0.2"; sha256="1mb6bizqkg7zd8nc5a81fw7d0y0vcv6zh6y28k9vikqmc5l1n21q"; depends=[]; }; rhmc = derive2 { name="rhmc"; version="1.0.0"; sha256="1m79f1hx404y0k8lk3n6jnzhr6wwrk83xiym68sq1zvj0wjqiqmw"; depends=[]; }; rhnerm = derive2 { name="rhnerm"; version="1.1"; sha256="1fkh2pr4kzvqvagdyjlyab7p591s913104gyq05q170gmvlpmiww"; depends=[]; }; @@ -15409,12 +15505,13 @@ in with self; { rhype = derive2 { name="rhype"; version="0.3.0"; sha256="16nzycgvp8xrjjly7j96kvy816xna5i5rdnd27gmyjmpf0dvp429"; depends=[Matrix R6 RSpectra]; }; ri2 = derive2 { name="ri2"; version="0.4.0"; sha256="0k85rmjl0inida4wx6d612vp35sr4cg2zsmrby8rl7p4gwrbix5v"; depends=[estimatr generics ggplot2 pbapply randomizr]; }; riAFTBART = derive2 { name="riAFTBART"; version="0.3.2"; sha256="0nj7xqvb711fi764dk7v60sr5s5955cglyf54zkdc6ax365xlnj0"; depends=[BART cowplot dbarts doParallel dplyr foreach ggplot2 magrittr MASS MCMCpack msm nnet randomForest RRF stringr survival tidyr twang]; }; + rib = derive2 { name="rib"; version="0.18.2"; sha256="1868rj0gd61d8jz58nzmjh3nss4bgl9hg49vg0pr1vyf83b154ap"; depends=[R6]; }; ribd = derive2 { name="ribd"; version="1.5.0"; sha256="11plql3fbvfw7ldrz3hs1x27j2l7pm2nd3alanr78yvilv0z16rf"; 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.3"; sha256="1y5v42hw6wqkllg0kahwj4akaf85svyl5r8g5jbq9dpr85dnyvgx"; depends=[assertthat backports cli curl data_table fansi fst jsonlite openssl prt readr rlang tibble vctrs]; }; + ricu = derive2 { name="ricu"; version="0.5.4"; sha256="062dzfygi3zc1bn40073hmd0bq4xisz3l8winrqk540sw08mv7mm"; depends=[assertthat backports cli curl data_table fansi fst jsonlite openssl prt readr rlang tibble vctrs]; }; ridge = derive2 { name="ridge"; version="3.3"; sha256="1xb03ir706k2c3y2kpa4dvnz5i0qhm2ghm7syng0kalpdz7swbaw"; depends=[]; }; ridigbio = derive2 { name="ridigbio"; version="0.3.6"; sha256="0q7m6918kh9drlsjns9xg6k13fdilxhm7f8d8d0lqcx1d8kds6f0"; depends=[httr jsonlite plyr]; }; ridittools = derive2 { name="ridittools"; version="0.1"; sha256="1m9xbwxb277l4cd85qxmpw66gyavpwamgwr8kyf8vqarzfbwiilr"; depends=[]; }; @@ -15427,19 +15524,18 @@ in with self; { rinat = derive2 { name="rinat"; version="0.1.9"; sha256="05vi5fggqkj64z0sndngjs7vdvxgy2j5xarccllkcrk9mbzyipvc"; depends=[curl ggplot2 httr jsonlite maps plyr sp]; }; ring = derive2 { name="ring"; version="1.0.3"; sha256="1ljmqq7mngxs59nri36w0cx6a6d85qsbk9v9698hfx9asicv398d"; depends=[R6]; }; ringostat = derive2 { name="ringostat"; version="0.1.5"; sha256="1g2425jig3zhrv0vmr5nb5fqj34vcpmvbly7gc94plsv7wvgxvv3"; depends=[cli httr2 readr stringr]; }; - rintcal = derive2 { name="rintcal"; version="0.5.0"; sha256="1vmy92932hapkkjprf785xqxas0dr55hyqpj0w4nvywln4mspdbr"; depends=[data_table]; }; + rintcal = derive2 { name="rintcal"; version="0.5.2"; sha256="0ka401xy6hpmaw2ap2aq29zh3ppqgql5kkhai0vlp74bxfilg8q3"; depends=[data_table jsonlite]; }; rintimg = derive2 { name="rintimg"; version="0.1.0"; sha256="0jzs4mdwpzbpl0wchyhl3cpywk25ayaxalr12p4cnjl7vnmdm7dp"; depends=[glue htmltools]; }; rintrojs = derive2 { name="rintrojs"; version="0.3.2"; sha256="19lpq421hrs1wc9bnimbwxx35p8bbzil3x1h9l28gjayn4djmjsh"; depends=[jsonlite shiny]; }; rio = derive2 { name="rio"; version="0.5.29"; sha256="04jlrhyl0791yxwcpp1s8p1hhkljnijlc5iaxpk56h41w63k39lz"; depends=[curl data_table foreign haven openxlsx readxl tibble]; }; - rioja = derive2 { name="rioja"; version="1.0-2"; sha256="19lw6rzcqkdrx8xw12kf096ky4wh4f5xbnksx2iawf4i630nix2l"; depends=[dplyr forcats mgcv sjmisc stringr vegan]; }; - riot = derive2 { name="riot"; version="1.0.0"; sha256="1iv83z21k2a8kclfma1cq4jns4zdpgjrzajcsfl105srvv55n0s2"; depends=[cli fs Rcpp readr rlang tibble]; }; + rioja = derive2 { name="rioja"; version="1.0-5"; sha256="1xggjapks2hipn946r65drq45xb7shhbac56r0njh0fm4wwmdzrj"; 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="1.0.1"; sha256="07rfqaf5dpj0wgbz65kdxzl762w8k5a2fsfmg1g895y2i5npq6mz"; depends=[boot dplyr ggplot2 ggpubr magrittr MASS purrr rlang tidyr tidyselect]; }; riskParityPortfolio = derive2 { name="riskParityPortfolio"; version="0.2.2"; sha256="1n2z1vhslrip209j79wm03wmwqdcnbm939sir2wfs5h2cfv126xk"; depends=[alabama Matrix nloptr quadprog Rcpp RcppEigen]; }; riskPredictClustData = derive2 { name="riskPredictClustData"; version="0.2.6"; sha256="0mvy9299pg374gvvqs9lmj2j0f3bzyy279kjpz7jq35hkgz5wif3"; depends=[gee Hmisc MASS mvtnorm]; }; riskR = derive2 { name="riskR"; version="1.1"; sha256="1qadfyb07idfw0bs006kb3917rzda83di6jmsr22941gv78z1wyv"; depends=[]; }; - riskRegression = derive2 { name="riskRegression"; version="2022.09.23"; sha256="1nz4p8v1qv2jjnyl58jqr61achcq8jcg8i81sgz2ai0r70ihlfbl"; depends=[cmprsk data_table doParallel foreach ggplot2 lattice lava mets mvtnorm plotrix prodlim Publish ranger Rcpp RcppArmadillo rms survival timereg]; }; + riskRegression = derive2 { name="riskRegression"; version="2022.11.28"; sha256="1qj8rpqz8i6c4bc3wcvlp28icrr2yaw38azp7d0h495k9klx87b0"; depends=[cmprsk data_table doParallel foreach ggplot2 lattice lava mets mvtnorm plotrix prodlim Publish ranger Rcpp RcppArmadillo rms survival timereg]; }; riskSimul = derive2 { name="riskSimul"; version="0.1.1"; sha256="1yb2ipcqipsl92ighcpahjryir86pi59b1d3qiph7yraxbcx2909"; depends=[Runuran]; }; riskclustr = derive2 { name="riskclustr"; version="0.4.0"; sha256="1b5pjnfz6n716fn1va4kl4y3jzf48sm0i2xaxw0225vmmvq06d9g"; depends=[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]; }; @@ -15457,13 +15553,14 @@ in with self; { rjazz = derive2 { name="rjazz"; version="0.1.7"; sha256="0wmqlpgcr98dvapfmdcph5mdv202rzzsvb06iy5sqvpizpg7pbsz"; depends=[RCurl]; }; rjdmarkdown = derive2 { name="rjdmarkdown"; version="0.2.0"; sha256="14ndhhxxx7jb9ljhfjxmdrl3kgb1zsrv00kznl2k50fwxx4z66f2"; depends=[kableExtra knitr magrittr RJDemetra]; }; rjdqa = derive2 { name="rjdqa"; version="0.1.1"; sha256="0d7jv3a2a7p7h6jnr5znln06x6m4mksb6cy44xdxir1pwcd1z6br"; depends=[plotrix RJDemetra XLConnect]; }; - rje = derive2 { name="rje"; version="1.11.0"; sha256="1nwd6ym353iw8am1qvcifivp7r892yb1cq9la8nh2hb19rqh8597"; depends=[knitr]; }; + rje = derive2 { name="rje"; version="1.12.1"; sha256="07a1wbn5ps9ygfi25fffgmrzw90izj4yk8gxb47r85x6lvqv1p0h"; depends=[]; }; rjmcmc = derive2 { name="rjmcmc"; version="0.4.5"; sha256="14rzvp6z5avlcnmlmvb6w4gvlh6v4ncbcai3v4c4svnjv555vz45"; depends=[coda madness mvtnorm]; }; rjqpd = derive2 { name="rjqpd"; version="0.2.3"; sha256="14vbp9s2859h4n3m3bq830nvxvk58h3mvvdnb27qsalbcfwd94v5"; depends=[]; }; rjson = derive2 { name="rjson"; version="0.2.21"; sha256="1qm27r1w677zg31gsiln60hcciszbymkw78cnaq7s36cbk9mcawq"; depends=[]; }; rjsoncons = derive2 { name="rjsoncons"; version="1.0.0"; sha256="1y6gf9w914wnygd41iwzy0vr16c4mwacx4pjqqncd3z9h120chpr"; depends=[cpp11 jsonlite]; }; rjstat = derive2 { name="rjstat"; version="0.4.2"; sha256="0j79svby5zzg63pks5667jvky0m5csyyrb863lpba4aprd80pig0"; depends=[checkmate jsonlite]; }; - rjwsacruncher = derive2 { name="rjwsacruncher"; version="0.1.2"; sha256="0kqr2pd3smqxx0h35k8mf7wamdqpqrncjhmvbiap8bwbkhm4sqhb"; depends=[XML]; }; + rjtools = derive2 { name="rjtools"; version="1.0.9"; sha256="0l6l77i584g11p9xgp6mhvlgas3wmxc34xd0vw9ws42v7k1fpv8x"; depends=[bookdown callr cli cranlogs distill fs glue hunspell purrr rlang stringr tinytex whisker xfun yaml yesno]; }; + rjwsacruncher = derive2 { name="rjwsacruncher"; version="0.1.3"; sha256="0g9wbcgj97pn2z6b9lbh10pr54c3qaam5cxghvn2ppzd8ccwkkbb"; depends=[XML]; }; rkafka = derive2 { name="rkafka"; version="1.4"; sha256="00m9zj2fnd32dhm7gn3fclpmp9r2y06sd8yckdbhlvd784b2d4c9"; depends=[rJava rkafkajars RUnit]; }; rkafkajars = derive2 { name="rkafkajars"; version="1.2"; sha256="1z1rn02ymzaq3v3pz206wlm78y591xa9780fwf77i4vfq2k9pxrz"; depends=[rJava RUnit]; }; rkeops = derive2 { name="rkeops"; version="1.4.2.2"; sha256="1b2sdbhx1ar1325mf1xgc561as9x8q8vjqslly9xms2h572c8yn3"; depends=[openssl Rcpp RcppEigen RhpcBLASctl stringr]; }; @@ -15493,7 +15590,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.17"; sha256="1gn413pgyfr45mmiv82gymz9r39d41h3ykmai93fihn4ir2nqmxa"; depends=[bslib evaluate htmltools jquerylib jsonlite knitr stringr tinytex xfun yaml]; }; + rmarkdown = derive2 { name="rmarkdown"; version="2.18"; sha256="08lgzb7n7lll1ff7flcyilnz9afj60npi882c035pyyy4vk7majg"; 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.5.2"; sha256="1q7qa7y6vv4194r9zfrw5arryw5ygbhcm294a90r9wwzpbk6sqhw"; depends=[psych RColorBrewer]; }; @@ -15505,7 +15602,7 @@ in with self; { rmdpartials = derive2 { name="rmdpartials"; version="0.5.8"; sha256="15dw0pk1hdif839k60swna4li04inf7fzsiq9bxbw2wk5pdkqirn"; depends=[digest knitr rlang]; }; rmdplugr = derive2 { name="rmdplugr"; version="0.4.1"; sha256="16wmrya8wdipqcrh34k4v4iq05aqd0jwf7rg6w1wsvx2i9211xg6"; depends=[bookdown rmarkdown]; }; rmdshower = derive2 { name="rmdshower"; version="2.1.1"; sha256="1sjpi5ils31adii51gaa8ly7x93l9ganp6in8rsln6si4jc2ppg9"; depends=[rmarkdown]; }; - rmdwc = derive2 { name="rmdwc"; version="0.2.1"; sha256="0zbwfi0rsx7mhk6s5798qg1zr7yv8hgw8qazznsd30diyprnyzbq"; depends=[knitr]; }; + rmdwc = derive2 { name="rmdwc"; version="0.3.0"; sha256="0s7k54ggf0zdkkjg8k5jz2kfjpw99i59k82xqgvj7qaxvakm7vss"; depends=[knitr rstudioapi]; }; rmeta = derive2 { name="rmeta"; version="3.0"; sha256="0vkbnxp579v8zmcv1isdbzj5swpr6fq17zwparxcvzswjc2x9ydr"; depends=[]; }; rmetalog = derive2 { name="rmetalog"; version="1.0.3"; sha256="1naqhv81gdcgl2vi2sa3nb006mn8dxc0rdc49v321a5b10bybzvr"; depends=[ggplot2 lpSolve]; }; 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]; }; @@ -15524,7 +15621,7 @@ in with self; { rmt = derive2 { name="rmt"; version="1.0"; sha256="165cqnwqr0dx7b8dgq7xlfk4j55p9l6dr5b2rzyvfy5l23k4kckn"; depends=[]; }; rmumps = derive2 { name="rmumps"; version="5.2.1-20"; sha256="17jm7b7rnq5x5jyyj5pc10zpkp55y9l9amm1rq7cd4qs53w01dka"; depends=[Rcpp]; }; rmutil = derive2 { name="rmutil"; version="1.1.10"; sha256="1yd5gkg4jg3rvqrfl8c5r07lcr37n1p9h1a7b6s45iswd77dg7w1"; depends=[]; }; - rmweather = derive2 { name="rmweather"; version="0.1.51"; sha256="0qd49lr12hc39dwg348b021aqxw57pfcb9xxhp51fvnw6gw6bgqd"; depends=[dplyr ggplot2 lubridate magrittr pdp purrr ranger stringr strucchange tibble viridis]; }; + rmweather = derive2 { name="rmweather"; version="0.2.4"; sha256="18ajzwm0jb6wklrxp8cmifym4wn22y2rw4llhjxrc98fkis3jgk3"; depends=[dplyr ggplot2 lubridate magrittr pdp purrr ranger stringr strucchange tibble tidyr viridis]; }; rmytarget = derive2 { name="rmytarget"; version="2.4.0"; sha256="1csl5b76r706gzvzhqgg4pdznbdl4i3b0srazwa7xdfc6zbrzljp"; depends=[dplyr httr lubridate purrr stringr tidyr]; }; rmzqc = derive2 { name="rmzqc"; version="0.1.0"; sha256="03a02d7a7jkvr72lgrbgmphsnlx65ym5gganm7y3lk43ap2zy55m"; depends=[jsonlite knitr ontologyIndex R6 R6P rmarkdown testthat]; }; rnassqs = derive2 { name="rnassqs"; version="0.6.1"; sha256="00daka4pgvmipqq3151jj35fsicpfc06mnim8mm5jx5cyqcvilf7"; depends=[httr jsonlite]; }; @@ -15535,19 +15632,18 @@ in with self; { rneos = derive2 { name="rneos"; version="0.4-0"; sha256="07b3vb0h36ilwb8iylgppl8wpi84f583frmscpj236s1aihqwrmx"; depends=[RCurl XML]; }; rnetcarto = derive2 { name="rnetcarto"; version="0.2.5"; sha256="169r1b2wvz13n7fcrvl80bidw6cwhng3d9vdji64g5wx1nv27arc"; depends=[]; }; rngSetSeed = derive2 { name="rngSetSeed"; version="0.3-2"; sha256="00mqjjkhbnvxqkf1kz16gipsf98q62vmhx9v8140qs7c4ljbhc3a"; depends=[]; }; - rngWELL = derive2 { name="rngWELL"; version="0.10-7"; sha256="0f1dxxaimfb0fww8ym9ciqf6q760ai46wxldl37m5mfpd57ca00c"; depends=[]; }; + rngWELL = derive2 { name="rngWELL"; version="0.10-8"; sha256="0ad1mz11l27h6apil2hd7gwz5zhi9jkjrk2jnhbkd8d0wz9g0sis"; depends=[]; }; rngtools = derive2 { name="rngtools"; version="1.5.2"; sha256="0kd7x214cqw7hzpmk1iqy1bn7j6x0ady0yz2hsdbclbq9k57d33z"; depends=[digest]; }; - rnmamod = derive2 { name="rnmamod"; version="0.2.0"; sha256="0dncj3dldb4d1j5m1dypk9lyg5jb2m2fi1k7p9sl52a6bfadcbb4"; depends=[coda dplyr fdrtool gemtc ggfittext ggplot2 ggpubr ggrepel knitr MASS mcmcplots netmeta pcnetmeta R2jags reshape2 scales writexl]; }; + rnmamod = derive2 { name="rnmamod"; version="0.3.0"; sha256="1cb6f5s0m7cciwyy8pd16qf4615k2vh58lgx5mdp9mpybwnvwapx"; depends=[dplyr fdrtool gemtc ggfittext ggplot2 ggpubr ggrepel knitr MASS mcmcplots netmeta pcnetmeta R2jags reshape2 scales writexl]; }; rnn = derive2 { name="rnn"; version="1.8.0"; sha256="1r8hwdc8i2rf4ma53n53hxcc637aizcqs6z6rjbhbvs56hgaxnz1"; depends=[attention 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.5"; sha256="02ka6ibdm9sbx3cffdh1lvr8555iqq3w74cs60djivp56gsvy009"; 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.1.0"; sha256="1x0kqk060kjw84jlrbcp1z6agc5d96xy0ydfbgvh60cg9v1q8kpr"; depends=[curl ggmap ggplot2 httr jsonlite lubridate sf tibble zoo]; }; roadoi = derive2 { name="roadoi"; version="0.7.2"; sha256="1q2mkd7r5aqvahx7rrzv58nd6d13gvlw7kjidqhm7z89na94pn8w"; depends=[dplyr httr jsonlite miniUI plyr purrr rlang shiny tibble tidyr]; }; - roads = derive2 { name="roads"; version="1.0.0"; sha256="02gkxvlngf23xv3sh578ynd5jzhlsslnllbvppyasbf4izisng16"; depends=[data_table dplyr igraph raster rlang sf sp SpaDES_tools stars tidyselect units]; }; roahd = derive2 { name="roahd"; version="1.4.3"; sha256="089klcgxry6b8z30h1ssy024lqxqm1bz6qs2kx95qjfl8xgwlwm0"; depends=[dplyr ggplot2 magrittr plotly robustbase scales]; }; robCompositions = derive2 { name="robCompositions"; version="2.3.1"; sha256="13m03r2mcs6srn3hk46lrjhyv5px9jyvqsqbxri1h79f31bji58b"; depends=[car cluster cvTools data_table e1071 fda fpc GGally ggfortify ggplot2 kernlab MASS mclust pls Rcpp RcppEigen reshape2 robustbase robustHD rrcov tidyr VIM zCompositions]; }; - robFitConGraph = derive2 { name="robFitConGraph"; version="0.1.0"; sha256="092nc0xnjs2zxd9ij0dl1xggb8mwl8nly284yjhhygmwlwsvhzxm"; depends=[MASS mvtnorm Rcpp]; }; + robFitConGraph = derive2 { name="robFitConGraph"; version="0.4.1"; sha256="0w5x4ndv5r8v7ji3dhmch0di4krphxrclyidfg5b3qbmn1hlhlih"; depends=[Rcpp RcppArmadillo]; }; robber = derive2 { name="robber"; version="0.2.2"; sha256="053yiwjlsg7z9p5l60wddm1wf5wni54a28yp6x4hbfkgaazvby02"; depends=[blockmodels ggplot2 GREMLINS igraph magrittr pammtools partitions purrr]; }; robcbi = derive2 { name="robcbi"; version="1.1-3"; sha256="0rj732qdd0wd9d9pxldnsw5rif5d7wz327iydvxcf5x8lgvk42jd"; depends=[robeth]; }; robcor = derive2 { name="robcor"; version="0.1-6.1"; sha256="0gmhklk8nayhfl2zfp7mhsawryyn950gdh5lgg3vq1nkl12sc8y7"; depends=[]; }; @@ -15555,7 +15651,7 @@ in with self; { roben = derive2 { name="roben"; version="0.1.0"; sha256="18k0h1y2xhvdssg28b9s4whn3kcbdgkz55dp1y3rrczw8xrm54mm"; depends=[glmnet Rcpp RcppArmadillo]; }; 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]; }; + robfilter = derive2 { name="robfilter"; version="4.1.3"; sha256="1r56p25c0624dxbd9lh8vbdqp69m0fzcfbzdx1kg4v0c25106ysw"; depends=[lattice MASS robustbase]; }; robflreg = derive2 { name="robflreg"; version="1.0"; sha256="0b0iwpn2rdwydwzabf2b5030fma78gjy9640ky0xhhpyfvm28z3z"; depends=[expm fda fda_usc goffda MASS mvtnorm pcaPP plot3D robustbase]; }; robin = derive2 { name="robin"; version="1.1.1"; sha256="1mvv2snvfizwxc743m8kxm3amwgb31079wjc6dlbgdah9f7fja7n"; depends=[DescTools fdatest ggplot2 gridExtra igraph Matrix networkD3 qpdf spam]; }; robis = derive2 { name="robis"; version="2.11.3"; sha256="04yz7i7mfc1jb2qbmm7yy0m6y7jnzck73m9d7hjjj6pc4ljf4cax"; depends=[curl data_table dplyr ggplot2 glue httpcache httr jsonlite leaflet mapedit memoise purrr rlang sf stringr tibble tidyr tidyselect xml2]; }; @@ -15572,6 +15668,7 @@ in with self; { robslopes = derive2 { name="robslopes"; version="1.1.2"; sha256="06j9n4p6pmiydhrm24skj7qlv5ia9f5qwbs8jss5cvmbjad7lqgq"; depends=[Rcpp RcppArmadillo]; }; robsurvey = derive2 { name="robsurvey"; version="0.5"; sha256="1h8gl14lzbp321rcw4f0snrnjgzcpcmlb5dh7cw9q29w2zkpznpz"; depends=[KernSmooth survey]; }; robumeta = derive2 { name="robumeta"; version="2.0"; sha256="1ynlfxlzh442jd1cf02j0f948m16d536a30gb4bf7208baqri1vg"; depends=[]; }; + robusTest = derive2 { name="robusTest"; version="1.0.0"; sha256="1r20n9zlfq4a2i2n8cnypi8i978d1xsv3jfcq6ka6rvzlzf7xmnj"; depends=[Rcpp]; }; robust = derive2 { name="robust"; version="0.7-1"; sha256="1pv5xvns3p8dpaadf6v0fqz099ml768ahgp271wpiclrcc6cgapg"; depends=[fit_models lattice MASS robustbase rrcov]; }; robust2sls = derive2 { name="robust2sls"; version="0.2.1"; sha256="1dcg8pmyyywspcdn95g41673wf89mmbggwn9gwsr9225w5jl26pl"; depends=[doRNG exactci foreach ivreg MASS mathjaxr pracma]; }; robustBLME = derive2 { name="robustBLME"; version="0.1.3"; sha256="18wx116l1riy4wn4083kxl637mkyyi9wbwnmvhkgqw3vb36s4vxd"; depends=[doParallel foreach iterators lme4 mvtnorm numDeriv Rcpp RcppArmadillo]; }; @@ -15584,7 +15681,7 @@ in with self; { robustbetareg = derive2 { name="robustbetareg"; version="0.3.0"; sha256="09f4binbi5gcf80fhpxzrmpm2k2xf6f7rcw9g2xzmni8b4cs2l6p"; depends=[BBmisc betareg crayon Formula MASS Matrix miscTools numDeriv pracma Rmpfr robustbase rstudioapi zoo]; }; robustcov = derive2 { name="robustcov"; version="0.1"; sha256="1bgvf9h727aqfb11q976y2ybp3mpghkyd29waypyfp95csp3cf26"; depends=[caret glasso Rcpp RcppArmadillo]; }; robustlm = derive2 { name="robustlm"; version="0.1.0"; sha256="17l2kr9dc3z02b2jswfxal13md4xfpz4sqjfg6kyg6ilab1cfd06"; depends=[MASS matrixStats]; }; - robustlmm = derive2 { name="robustlmm"; version="3.0-4"; sha256="1knyc8c9846hidq8s1zdzagmfvf1rfsx9avhkjdzxaf38n5ai092"; depends=[cubature fastGHQuad ggplot2 lattice lme4 Matrix nlme Rcpp RcppEigen rlang robustbase xtable]; }; + robustlmm = derive2 { name="robustlmm"; version="3.1-2"; sha256="0kvgqf89nf83yr3rcy5lrq7xyjpl157zf3hz7879qpg5swxr1cyz"; depends=[fastGHQuad lattice lme4 Matrix nlme Rcpp rlang robustbase xtable]; }; robustmeta = derive2 { name="robustmeta"; version="1.1-1"; sha256="0f7qj3c01wxhcx86hwjr2gik041vjvnzg444kyn72v7b7fr3nlyz"; depends=[metafor]; }; robustrank = derive2 { name="robustrank"; version="2019.9-10"; sha256="1xikknrmnh95wpvyljdl7v510ddi1g7a88aw3l630s789nq5i02h"; depends=[kyotil]; }; robustrao = derive2 { name="robustrao"; version="1.0-5"; sha256="1r8v9qjx70s8swh09imq9kzdxg0qhnmk00zrg939mig9b12mw1p6"; depends=[doParallel foreach gmp igraph iterpc quadprog]; }; @@ -15594,10 +15691,9 @@ in with self; { robvis = derive2 { name="robvis"; version="0.3.0"; sha256="0xzvx3230ydd082jmdlm70vyhjizknngfzhvcbqpdcm403klni5h"; depends=[ggplot2 scales tidyr]; }; rocNIT = derive2 { name="rocNIT"; version="1.0"; sha256="18vxyh1wcq6dv62xf2dyl4226cd00n4hlbaqnynl9j5gnrmmsvi1"; depends=[]; }; rocTree = derive2 { name="rocTree"; version="1.1.1"; sha256="1hd5v47gymffg5829swpd38xscm4vq75d46fibwkrr7jp9iy37ra"; depends=[data_tree DiagrammeR flexsurv ggplot2 MASS Rcpp RcppArmadillo survival]; }; - rocbc = derive2 { name="rocbc"; version="0.1.1"; sha256="1307jgkc7dcpvcqddhivx20i88669m0zri14s9anmhxvl3rg624g"; depends=[clinfun mvtnorm pracma splancs]; }; + rocbc = derive2 { name="rocbc"; version="0.2.0"; sha256="1zmnhih7d29bqly0jwdhsbk9z6dxvqm7r2ghzaf9w3xva8q0wapi"; depends=[clinfun mvtnorm pracma splancs]; }; 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.5"; sha256="1c6g563fmm1anwhfnfiirlinrdzkb6z1c1zn4hr4c331wkyvihcm"; depends=[data_tree DiagrammeR DiagrammeRsvg dplyr ggplot2 glue htmltools markdown purrr yaml yum]; }; rockchalk = derive2 { name="rockchalk"; version="1.8.157"; sha256="13g2rdnxazqfgy653d7vj6w79b2vgnd7bbz0sqn9k4qiig59jh41"; depends=[carData kutils lme4 MASS]; }; rocker = derive2 { name="rocker"; version="0.3.1"; sha256="15l6m8cmanw0av0c0wgn4m4ms6ablkj4hd0i9i9vq4003gafh9va"; depends=[DBI R6 sodium]; }; rockr = derive2 { name="rockr"; version="1.0.0"; sha256="190xaxcbb7miqw5mxyfqqlb2vzacifc8a7a3cqfdlpxra4d4jc25"; depends=[httr jsonlite mime progress]; }; @@ -15608,7 +15704,7 @@ in with self; { rodd = derive2 { name="rodd"; version="0.2-1"; sha256="01zrkw4lr21vxk2grfc37iyrcipfdcj5m0i7gnxsvs435y9fqagd"; depends=[Matrix matrixcalc numDeriv quadprog rootSolve]; }; rodeo = derive2 { name="rodeo"; version="0.7.7"; sha256="1cfsf6sld72bm1343p6fzpfwq7a976basf3fg5fqsj2rcx6b1q7b"; depends=[deSolve R6]; }; rofanova = derive2 { name="rofanova"; version="1.0.0"; sha256="0w8c5c5q0s2qv1b4nxgf8y1z3g0l9c6jr6i0280b5mp9in9wn8a6"; depends=[abind fda_usc Rcpp RcppArmadillo robustbase]; }; - roger = derive2 { name="roger"; version="1.2-0"; sha256="0a61qfizg1xl0vw8z6hr3kxwxd2fn2762p90cpqrpnx7hpnk9v6n"; depends=[]; }; + roger = derive2 { name="roger"; version="1.3-1"; sha256="0zx2jm6x9ks6ynacwm552aiwz5sqh9nj95k96d11r417w7vd82ya"; 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.4"; sha256="1q1xs43c860fqv5anfdv0zdb5s8n794yvhn1c7px1kdh2g0jbjp7"; depends=[checkmate Rcpp RcppArmadillo]; }; @@ -15618,7 +15714,7 @@ in with self; { rollmatch = derive2 { name="rollmatch"; version="2.0.2"; sha256="1bm1yc2z9byj4m9gz0il47y8drd3qzsb5lwb22a22axy306lqfqj"; depends=[dplyr magrittr]; }; roloc = derive2 { name="roloc"; version="0.1-1"; sha256="0xynj12gp010c23f6ll9p343vwgxwa22s771p1w2pi65cj2ixhas"; depends=[colorspace]; }; rolocISCCNBS = derive2 { name="rolocISCCNBS"; version="0.1"; sha256="100jh5m2c1zp5wg3wd4y2i47dzx1j0g6lfwyqmwk4bz99yzzz5am"; depends=[colorspace roloc]; }; - rolog = derive2 { name="rolog"; version="0.9.4"; sha256="05a8wf2nkw3nssys9xbf40ihgbw4x6vjmzp2dcfsqxhr0wjmd7km"; depends=[Rcpp]; }; + rolog = derive2 { name="rolog"; version="0.9.6"; sha256="1j7pw9f0g2c6fvv8f7fsddfrmhkrxw8xa4k3byfqb2vdbygqndb1"; depends=[Rcpp rswipl]; }; rolr = derive2 { name="rolr"; version="1.0.0"; sha256="04nm4q0mlr4w6jb0frykzlyknfn3gn02ysqr5ll5jch6wawichy2"; depends=[survival]; }; romic = derive2 { name="romic"; version="1.0.0"; sha256="08iqk71bn4yjxnbwj99jbrz3028jjs8f07ns9r9iaj6byyxv4vd1"; depends=[checkmate dplyr ggplot2 glue purrr readr reshape2 rlang shiny stringr tibble tidyr]; }; rootSolve = derive2 { name="rootSolve"; version="1.8.2.3"; sha256="182bb727sgqi5f3pzmw8jnn328wdjrgj9lfvg49gv8s22rjd3cxm"; depends=[]; }; @@ -15635,24 +15731,25 @@ in with self; { roptions = derive2 { name="roptions"; version="1.0.3"; sha256="1rcwzzyzaicvxh8zvqy9wgz5xsixgnizy9i4nh7l33zimm20lsdl"; depends=[ggplot2 plotly purrr]; }; rorcid = derive2 { name="rorcid"; version="0.7.0"; sha256="1d0s5w48ksyj152nc4xq5w0nsimab8jc5fgspdwnbas2g8a52igr"; depends=[crul data_table fauxpas httr jsonlite tibble xml2]; }; rorqual_morpho = derive2 { name="rorqual.morpho"; version="0.1.1"; sha256="1475yhb5qwj4zpsc4gqqpzs7qvyddxwc63i1f4rhnv6id2hi4msp"; depends=[dplyr magrittr]; }; + rosetta = derive2 { name="rosetta"; version="0.3.10"; sha256="0f7b60xj5kcb5dwjk194kr1hz3hbzzd61bqkg4wpjgwyiai75v8y"; depends=[car ggplot2 ggrepel gridExtra kableExtra knitr lavaan lme4 multcompView pander plyr psych pwr rmdpartials ufs viridis]; }; rosetteApi = derive2 { name="rosetteApi"; version="1.14.4"; sha256="166p3dvib0xpvhkb92b3imassv1b9mrblz2m05jai2nzlz0q7hzk"; depends=[httr jsonlite]; }; rosm = derive2 { name="rosm"; version="0.2.6"; sha256="11nl3602f3wfccwayjd0a3kqs2lyfb09clccvhvalsp0di7ndbhh"; depends=[abind curl jpeg plyr png prettymapr rgdal rjson sp]; }; rospca = derive2 { name="rospca"; version="1.0.4"; sha256="1pxm34xsc2610n0i6dwcm4rhn016yqb03f8vrm93r7285c04n4q7"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; }; - rotasym = derive2 { name="rotasym"; version="1.1.3"; sha256="1sknhvwmy1r0sa76lp8qv5h7lx05mvw04ip7cvxcamwg6l2bifis"; depends=[Rcpp RcppArmadillo]; }; + rotasym = derive2 { name="rotasym"; version="1.1.4"; sha256="08xprp6jmf91lvg3y6wh9mdrxpv0vv9aqynlch842294fy0wzgl1"; depends=[Rcpp RcppArmadillo]; }; rotationForest = derive2 { name="rotationForest"; version="0.1.3"; sha256="1z2wk3mcs5hrahsxralidbc0dd8gxdbwjpr2f71g4g3isfx1ic8d"; depends=[rpart]; }; rotations = derive2 { name="rotations"; version="1.6.4"; sha256="19d7filrgwm25cklbpjr082cn0h991xa5lvrijjl59whan4axjkg"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo]; }; rotl = derive2 { name="rotl"; version="3.0.14"; sha256="1kszmn0fnjfay7d53wmpn31nayahkhkccmakbl8mcv0f5h0yfalq"; depends=[ape curl httr jsonlite rentrez rlang rncl]; }; rotor = derive2 { name="rotor"; version="0.3.7"; sha256="02mzcwd94hykysz3cv0q3dlhbbd4k3rm1di7dcw6m4masgzy05zb"; depends=[dint R6]; }; - roughnet = derive2 { name="roughnet"; version="1.0.0"; sha256="063aibj0a906vmyk5qyah9z45dbvpxribvs856pgim0lr3y5fhzg"; depends=[graphlayouts htmlwidgets igraph jsonlite]; }; + roughnet = derive2 { name="roughnet"; version="1.0.1"; sha256="1brl1zwmmczbismgvbq2m1i1n1v85m410z2ap6r7jqxpfn111kis"; depends=[graphlayouts htmlwidgets igraph jsonlite]; }; roughsf = derive2 { name="roughsf"; version="1.0.0"; sha256="0am4yd168pss53p8869akx4bnw95d3k30fbv17pml8y9iriq6zs5"; depends=[htmlwidgets jsonlite sf]; }; round = derive2 { name="round"; version="0.20-0"; sha256="1c403i57fwfh3pz6ksg5ws2fydq8zf2fk4x6r9d0xqn0fs7px7j4"; depends=[]; }; roundhouse = derive2 { name="roundhouse"; version="0.0.2"; sha256="0xx2wai9pdq0g7x8xmwlf48wxv4v18c7ymzvzxpvw1gggppmbk69"; depends=[]; }; routr = derive2 { name="routr"; version="0.4.1"; sha256="0sqllafwxqlkf8bl5nc3fpf17aqg5nbimrmc8l3z95y3gwhnqhkb"; depends=[assertthat digest R6 reqres stringi uuid]; }; roxut = derive2 { name="roxut"; version="0.4.0"; sha256="1ciflhmavl24wk4kjbilmm70q6z8i02m36x4pyh4m3czhnpyyv03"; depends=[roxygen2]; }; - roxygen2 = derive2 { name="roxygen2"; version="7.2.1"; sha256="08fs5jw6npriqsr8pribs2yy1r8163xzcv4gmlgmcaywj4jk9w6j"; depends=[brew cli commonmark cpp11 desc digest knitr pkgload purrr R6 rlang stringi stringr withr xml2]; }; + roxygen2 = derive2 { name="roxygen2"; version="7.2.3"; sha256="1nhn0jhnxzlyqx0qnpd7k7q3azzngyn0j4zs8awmlmyjfywzli6q"; depends=[brew cli commonmark cpp11 desc knitr pkgload purrr R6 rlang stringi stringr withr xml2]; }; roxygen2md = derive2 { name="roxygen2md"; version="1.0.0"; sha256="1gvrfy0sk5qi8d93zxj5f7xgnnw0w38zyxdik4ckf0pkk0zdm27a"; depends=[desc devtools enc rex rlang tibble usethis withr]; }; roxytest = derive2 { name="roxytest"; version="0.0.1"; sha256="166m0pklgryh3vildg0bvzh9gs3p71sf61ivgkvkvyy9vhvnp3jf"; depends=[roxygen2]; }; - rpact = derive2 { name="rpact"; version="3.3.1"; sha256="152kmlw4q7jlhhp1xx3hamkyyflhsbxr1v3kb57x705v64h3qp54"; depends=[Rcpp]; }; + rpact = derive2 { name="rpact"; version="3.3.2"; sha256="1fpy36rr1zcbqxbnmzi154h9iws3xss14b3xrjzz6l1k7gralr65"; depends=[Rcpp]; }; rpanel = derive2 { name="rpanel"; version="1.1-5.1"; sha256="05cvazjwi66bm1fa3pfpl3p931i221y3y0am6iaf23gifsgl1ss2"; depends=[]; }; rpart = derive2 { name="rpart"; version="4.1.19"; sha256="0rcm4hk2k0ag9qmb0f933yqrq8jpnclwrzp6825swgsqnp83wwpy"; depends=[]; }; rpart_LAD = derive2 { name="rpart.LAD"; version="0.1.2"; sha256="1v1arv5b02n0jvyifb5km9w3z3wxg9x9g3g4xck4s319z5g6lp7n"; depends=[Rcpp rpart]; }; @@ -15688,7 +15785,7 @@ in with self; { 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.1"; sha256="0l5ndcpnd3ib83vwh5bs83nvjr4in3v2kbqq8q4y9x90nrxaz901"; depends=[arm coda magic MASS]; }; - rr2 = derive2 { name="rr2"; version="1.0.2"; sha256="099vjg91ni2bnxlra18pvgsvzrl28zrj639cdjrh3wkpqv99d04q"; depends=[ape lme4 Matrix nlme phylolm]; }; + rr2 = derive2 { name="rr2"; version="1.1.0"; sha256="1nbjai514zrv5j9w52x59inf9fqy0c7r1ijrr1d3xirkvk8c70mi"; depends=[ape lme4 Matrix nlme phylolm phyr]; }; rrBLUP = derive2 { name="rrBLUP"; version="4.6.1"; sha256="1ny48ra25rzx3k69pmzpd31ka2zhqyqiq1v7ann862j3ris0w8z9"; depends=[]; }; rrMixture = derive2 { name="rrMixture"; version="0.1-2"; sha256="0bh63v9zis8w3ylvbc99iy2hx0wn6302d49bhcw3wr7wmbzvdi8s"; depends=[gtools MASS Matrix matrixcalc Rcpp RcppArmadillo]; }; rrapply = derive2 { name="rrapply"; version="1.2.6"; sha256="05shia32hs6y739dfk35y671c8nrifhb415mn3sdg4v065j2k1jc"; depends=[]; }; @@ -15698,8 +15795,8 @@ in with self; { 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]; }; rrecsys = derive2 { name="rrecsys"; version="0.9.7.3.1"; sha256="1qnjriv1xq4gjjhzz8jxrbk88mw5xddl2l2i4bmfhnxhi51d2rk3"; depends=[ggplot2 knitr MASS Rcpp registry]; }; - rredlist = derive2 { name="rredlist"; version="0.7.0"; sha256="1w77cnfrybmqnadsmfkpjv5m49kkr7yc6kcqq165lmj3bijnprnj"; depends=[crul jsonlite]; }; - rrefine = derive2 { name="rrefine"; version="2.0.0"; sha256="1plv6ykhcpp8d111gkkh8zx9zjrkxqpvg6vcbcy2234yd6wd0wky"; depends=[httr jsonlite readr]; }; + rredlist = derive2 { name="rredlist"; version="0.7.1"; sha256="11dfad1r93b8q6jbn319lz9w7qbw7nqwxyck3fs1kp0il8vhr8cj"; depends=[crul jsonlite]; }; + rrefine = derive2 { name="rrefine"; version="2.1.0"; sha256="0zp0gs505rgrpnsfysk1fzm7x9jrvpigrqrpywfhjxfv8vb6hhyh"; depends=[httr jsonlite readr]; }; rreg = derive2 { name="rreg"; version="0.2.1"; sha256="05c2yj58zn43zkmqp4iyblsixsq76hsjkchffl5rkqynvgxi0qzi"; depends=[directlabels ggplot2]; }; rrepast = derive2 { name="rrepast"; version="0.8.0"; sha256="1x8xda9cndxri2hhd2ihxmjjy0x74r0dh3953dfh7gvj4slaf0rl"; depends=[digest doSNOW foreach ggplot2 gridExtra lhs rJava sensitivity xlsx]; }; rres = derive2 { name="rres"; version="1.1"; sha256="138m26ya119805b1akwski0hf1ypiqsqjlkrm9p0l2x22zrv1n60"; depends=[kernlab Rcpp]; }; @@ -15712,7 +15809,7 @@ in with self; { rrtable = derive2 { name="rrtable"; version="0.3.0"; sha256="1y1hfscnw466azxk1c2kpa486xn8561zl5inv7yk5q8926ls2zc3"; depends=[devEMF editData flextable ggplot2 ggpubr magrittr moonBook officer purrr readr rlang rmarkdown rvg shiny shinyWidgets stringr ztable]; }; rrum = derive2 { name="rrum"; version="0.2.0"; sha256="0w0f2n14if2b8x7n6v8y8q2vghd8j7xm1xhpxnvy3z50flinwgm7"; depends=[Rcpp RcppArmadillo rgen simcdm]; }; rsae = derive2 { name="rsae"; version="0.2"; sha256="0gi7igaymsikxx73dw3ak9pg2vhlvcz5xlbxz8clfxy1d66g58hd"; depends=[]; }; - rsample = derive2 { name="rsample"; version="1.1.0"; sha256="1iy61riwjch9z4m6k7whsrkl80sk9sww5lf1np4iq4vdfq6w01jb"; depends=[dplyr ellipsis furrr generics glue pillar purrr rlang slider tibble tidyr tidyselect vctrs]; }; + rsample = derive2 { name="rsample"; version="1.1.1"; sha256="1fmqfk1yihmh7lkszsf7pvn6zf67lpgff46hv2lpnfbssa3axllh"; depends=[dplyr furrr generics glue pillar purrr rlang slider tibble tidyr tidyselect vctrs]; }; 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.1"; sha256="10srbalj8i67z30amvf08zfa4hs6phvq17kfgys9ihwaknckcyx3"; depends=[crayon formatR highlight igraph tm]; }; @@ -15732,7 +15829,7 @@ in with self; { rsimsum = derive2 { name="rsimsum"; version="0.11.3"; sha256="1pncp138ch69pb21lks8ziwhn2vhb5y812g2i9zfpdmfnprhg2d6"; depends=[checkmate generics ggplot2 ggridges knitr lifecycle rlang scales]; }; rsinaica = derive2 { name="rsinaica"; version="0.6.1"; sha256="1ba19b2fgnnl50qp6hgjppgxbadghq68qap9f0m51k2k3ijgfiwn"; depends=[dplyr httr jsonlite lubridate stringr]; }; rskey = derive2 { name="rskey"; version="0.4.4"; sha256="1la3apypp1kk425r753vqwm3nk9zmynp9gix6db0ckkssw0fjxpw"; depends=[berryFunctions rstudioapi]; }; - rsleep = derive2 { name="rsleep"; version="1.0.4"; sha256="0rb9dpy1ks04mqb0aismkj0zg9sigyrbgb6j0rl9cw2npp0jz7vg"; depends=[edfReader ggplot2 jsonlite phonTools psd signal]; }; + rsleep = derive2 { name="rsleep"; version="1.0.5"; sha256="1lrjghj8i1q6b1hr97kfy35c75xzwlijcnzmp9wy129m9xygkk2r"; depends=[abind edfReader ggplot2 jsonlite phonTools psd signal]; }; 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]; }; @@ -15744,7 +15841,7 @@ in with self; { rsparkling = derive2 { name="rsparkling"; version="0.2.19"; sha256="1rb43lslhlg8jpniirzch8gnl86x6d3shcfp9fpxm0qd3fqrlm6z"; depends=[h2o sparklyr]; }; rsparse = derive2 { name="rsparse"; version="0.5.1"; sha256="15kdllm2lh6xdlv4j0ljyj5pczhx26s9d8cac7953zbb0sd45chz"; depends=[data_table float lgr Matrix MatrixExtra Rcpp RcppArmadillo RhpcBLASctl]; }; rspiro = derive2 { name="rspiro"; version="0.2"; sha256="1gjil39ib9p86a7r3i03h01x2dsc9y283rnp65xvavrzmmgz87b4"; depends=[]; }; - rspm = derive2 { name="rspm"; version="0.2.2"; sha256="04m1sr57lhd37y7svygdpx1r7fvnkimk1gkg2p1jk0pm97v2rdbr"; depends=[]; }; + rspm = derive2 { name="rspm"; version="0.2.3"; sha256="0qfyk4ars77d6a7llbyvyc6095zb4690salgym8kgqlq8dzag3k2"; depends=[]; }; rsppfp = derive2 { name="rsppfp"; version="1.0.4"; sha256="123yv54i58xj4wx9n08qp50mm4l271fm1zhzimrxx22wn2bg8zy5"; depends=[doParallel dplyr foreach igraph stringr tidyr]; }; rsprite2 = derive2 { name="rsprite2"; version="0.2.0"; sha256="1w043qjb959m5646fzpickzq2jxd1qc6mn3k9l0g76vmhzlqr0dy"; depends=[checkmate Rdpack]; }; rsq = derive2 { name="rsq"; version="2.5"; sha256="1r628srxhhf7b51lnj4qrzgbqajkm0ls47a9rzjkvmfq4ax5i73f"; depends=[Deriv lme4 MASS Matrix nlme]; }; @@ -15756,7 +15853,7 @@ in with self; { rstanarm = derive2 { name="rstanarm"; version="2.21.3"; sha256="19rj396q84maxnd9d2xcd5rblg3310xn7sqbd6k18kwf3dvd7wp9"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen RcppParallel rstan rstantools shinystan StanHeaders survival]; }; rstanemax = derive2 { name="rstanemax"; version="0.1.3"; sha256="0myxcqwpk4zq5y1ri14rbsbb19kr8g7fd3mfdsn8vh2yi5xlcqk1"; depends=[BH dplyr ggplot2 magrittr purrr Rcpp RcppEigen rstan rstantools StanHeaders tidyr]; }; rstantools = derive2 { name="rstantools"; version="2.2.0"; sha256="1dsfgi02hps878n3vimfdbzpm4gr5n3ccrmnc61ncrqcp6p0p0fb"; depends=[desc Rcpp RcppParallel]; }; - rstatix = derive2 { name="rstatix"; version="0.7.0"; sha256="0330y8iziffqg8j9j5h9zv4qcdyf8ybhmzxrr9fzq9nc6bf1gbm5"; depends=[broom car corrplot dplyr generics magrittr purrr rlang tibble tidyr tidyselect]; }; + rstatix = derive2 { name="rstatix"; version="0.7.1"; sha256="0c001w1mj8jw7gzmix90wzzb9kj45q173mzl7pmvykm77zpn61ak"; depends=[broom car corrplot dplyr generics magrittr purrr rlang tibble tidyr tidyselect]; }; rstatscn = derive2 { name="rstatscn"; version="1.1.3"; sha256="07w7ixq1faq7mif2ksxcgl8n6ali9h0wx0nb2yz4kbdgvz68r7b9"; depends=[httr jsonlite]; }; rstiefel = derive2 { name="rstiefel"; version="1.0.1"; sha256="063nj6k2qzc5wd1dk6m6ld16sk2vlfa8ic86gc4qkqsla8l82fgg"; depends=[]; }; rstoat = derive2 { name="rstoat"; version="1.0.2"; sha256="0npwv33a7axwhnfyz39nh0x5kk4q3chscings3msx532lzvif0cl"; depends=[curl httr jsonlite keyring]; }; @@ -15766,10 +15863,11 @@ in with self; { rstudioapi = derive2 { name="rstudioapi"; version="0.14"; sha256="1i5g9l2739mlaglzg98iifycx98jlzxj5933qfb8lwmdn63hk7a6"; depends=[]; }; rsubgroup = derive2 { name="rsubgroup"; version="1.1"; sha256="16glxyv6aja7j0vfjccfi8w84wzm2ajfl62l0g5vpl73j7cs6gnk"; depends=[foreign rJava]; }; rsurface = derive2 { name="rsurface"; version="1.1.0"; sha256="1pymbgvr72nqd66wap5wrcizzx2k9bfr6vkxv6dkvjmi8q7jl2gv"; depends=[plotly rsm]; }; - rsurveycto = derive2 { name="rsurveycto"; version="0.1.2"; sha256="1z51crs7xd0xfrpify3vrq0iwajh3ybg4wsyj602glaxjrj1yyrn"; depends=[checkmate cli curl data_table glue httr jsonlite rlang withr]; }; + rsurveycto = derive2 { name="rsurveycto"; version="0.1.4"; sha256="0716zzmfq3an83vij996cnbddmw28yvl1mmmha53f3xpvn109qyn"; depends=[checkmate cli curl data_table glue httr jsonlite rlang withr]; }; rsvd = derive2 { name="rsvd"; version="1.0.5"; sha256="07p2hjmpcwcsang8z9sjkpy94rydcin7m3hyvcgzgm5cd6w8c1p4"; depends=[Matrix]; }; rsvddpd = derive2 { name="rsvddpd"; version="1.0.0"; sha256="0p2cpv3ipkvl27zhncpcyxp6lqw54ncdnxyk659qc24l0fqbw7dc"; depends=[MASS matrixStats Rcpp RcppArmadillo]; }; - rsvg = derive2 { name="rsvg"; version="2.3.2"; sha256="1lx84x5dnxj1xdsidwfg9i6fkay7ldarwrbg0gl0f02wajf8ifsz"; depends=[]; }; + rsvg = derive2 { name="rsvg"; version="2.4.0"; sha256="1schf5gfqzvwmaigdsic5va9bbk9ycvcisiyll8xjjw116y9cxyb"; depends=[]; }; + rswipl = derive2 { name="rswipl"; version="8.5.20"; sha256="1qkaq2gnqq42h4f5rcmdmwlb4903fh5b73zrczf85xb4nrdq36sh"; depends=[Rcpp]; }; rsyncrosim = derive2 { name="rsyncrosim"; version="1.4.2"; sha256="15l1g71zq18b2j6dxwdbrcw8x2nkjgijr3zp906xx8g76p6n1hi6"; depends=[DBI gtools lifecycle raster RSQLite]; }; rsyntax = derive2 { name="rsyntax"; version="0.1.4"; sha256="0bmi0qc535scdzrdr9sxnigby5ynw9dk95f99p55plc506z3pfya"; depends=[base64enc data_table digest igraph magrittr png rlang stringi tidyselect tokenbrowser]; }; rsyslog = derive2 { name="rsyslog"; version="1.0.2"; sha256="0sc9jiscabr72fsx1wwjvq44casvhdsinj77wrcp017a4f9i0k5b"; depends=[]; }; @@ -15796,9 +15894,10 @@ in with self; { rtkore = derive2 { name="rtkore"; version="1.6.7"; sha256="0v3p2amkkz137v1vqd1xiv9i1jayd265mwyajjzw56ngm8qpr4jv"; depends=[inline Rcpp]; }; rtmpt = derive2 { name="rtmpt"; version="1.0-0"; sha256="0a8q02vhjhm8l8y58kyyjadwm34ddlm5ayhgqmngkhl9f628s1gm"; depends=[coda data_table loo Ryacas stringr truncnorm]; }; rtodoist = derive2 { name="rtodoist"; version="0.1.0"; sha256="12lh14ps4snlyykhc65nvn8ipic8is8ssmgcx73snmifhrzxgdyb"; depends=[digest dplyr getPass glue httr keyring magrittr purrr]; }; + rtoot = derive2 { name="rtoot"; version="0.2.0"; sha256="1ni9w17balj45p4h83imny4fcjbswspd5h8ii5vlk788jl4qbhmb"; depends=[clipr curl dplyr httr jsonlite tibble]; }; rtop = derive2 { name="rtop"; version="0.5-14"; sha256="1wwllckginnzisapbklpsizy47db24r83xahq4qsd8zhqvv9yj33"; depends=[gstat sp]; }; rtrek = derive2 { name="rtrek"; version="0.3.3"; sha256="1lnjwslx1l0vgysw3m1s83h246grplmv4mdk4m6ym83mrdmkzvhi"; depends=[downloader dplyr ggplot2 jpeg jsonlite magrittr memoise purrr rvest tibble tidyr xml2]; }; - rtrend = derive2 { name="rtrend"; version="0.1.3"; sha256="0figwgxbb1ir7qc4f0138xgj6lry1v6jpq03dyfnp5xsqq3z22yg"; depends=[boot fftwtools ggplot2 magrittr matrixStats plyr Rcpp RcppArmadillo terra]; }; + rtrend = derive2 { name="rtrend"; version="0.1.4"; sha256="1l5vlqjxsgin0pjr4gfdf1ba0zapzjs7c4j4mrjpb8p4hvk3wgzz"; depends=[boot fftwtools lubridate magrittr matrixStats plyr Rcpp RcppArmadillo terra]; }; rtrends = derive2 { name="rtrends"; version="0.1.0"; sha256="04xdggf36m294drb9z8khdjr6fgsg4bwkb4mmbbvqfzjpq4mq4y1"; depends=[dplyr lubridate tidyr]; }; rtrim = derive2 { name="rtrim"; version="2.1.1"; sha256="1l2ijkm4p3nd7n4q1b4y9pdyafgyf76zizpi7hhzw1rr9zkxhff2"; depends=[]; }; rtry = derive2 { name="rtry"; version="1.0.0"; sha256="1sac82z2jk5cp7cr3m6l07b6rk0ims0bsm3pvmk870v014brkim4"; depends=[curl data_table dplyr jsonlite tidyr]; }; @@ -15829,7 +15928,7 @@ in with self; { runstats = derive2 { name="runstats"; version="1.1.0"; sha256="0n9348af60j8a2mwgbafabspb4nm45ry92zlzmynja06zyx8lb2d"; depends=[fftwtools]; }; rusda = derive2 { name="rusda"; version="1.0.8"; sha256="0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338"; depends=[foreach httr plyr RCurl stringr taxize testthat XML]; }; rusk = derive2 { name="rusk"; version="0.1.1"; sha256="0a6vbcnfzlfq9fmibiy0cwcfix65qhxq4f7wc7d53riga82s00lk"; depends=[dplyr ggforce ggplot2 reshape2 shiny tidyr]; }; - rust = derive2 { name="rust"; version="1.3.13"; sha256="0j17jcg16vdqzga8szg3fhkir9ls7mbbf1zqfp4nymwy3mkmvhm5"; depends=[Rcpp RcppArmadillo]; }; + rust = derive2 { name="rust"; version="1.4.0"; sha256="0np7kzvdpih6d2da2glbwwbfrz2r5ys3jzcz829im82nh8l9h4aw"; depends=[Rcpp RcppArmadillo]; }; 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]; }; @@ -15840,13 +15939,13 @@ in with self; { rversions = derive2 { name="rversions"; version="2.1.2"; sha256="0q5ip3rkhcxz7472fbqddrw3a2wm31b18w7ax0pi6wc27qiihn6y"; depends=[curl xml2]; }; rvertnet = derive2 { name="rvertnet"; version="0.8.2"; sha256="09lja7dd1rdln7cpd4rn4l3fynm223as3k295dcwf4x26gna7s9d"; depends=[crul dplyr ggplot2 jsonlite maps tibble]; }; rvest = derive2 { name="rvest"; version="1.0.3"; sha256="07hws9infwchy19smrcd9m6c0jii0bdn335yxqk3ramgj5ryyrd4"; depends=[cli glue httr lifecycle magrittr rlang selectr tibble withr xml2]; }; - rvg = derive2 { name="rvg"; version="0.2.5"; sha256="1i0alsr9ahl54gwszvaqz5qgiqs85wwzs5d31z97x315sk3n994j"; depends=[gdtools officer Rcpp rlang xml2]; }; + rvg = derive2 { name="rvg"; version="0.3.0"; sha256="14kihypdp571f5l9711hacxrv5bjp2wwxly9q6k0z9g28nlqakvd"; depends=[gdtools officer Rcpp rlang xml2]; }; rviewgraph = derive2 { name="rviewgraph"; version="1.4.1"; sha256="0j6g9qwxf4bzv9lr7fkgmk60cqid8kmck1x9kjf8il89qahbvsfs"; depends=[rJava]; }; - rvinecopulib = derive2 { name="rvinecopulib"; version="0.6.2.1.2"; sha256="1bnrwxy05cvz1yjs7wpjbzmhl4b33x1y835irf7iczs4ckhk53lx"; depends=[assertthat BH kde1d lattice Rcpp RcppEigen RcppThread wdm]; }; + rvinecopulib = derive2 { name="rvinecopulib"; version="0.6.2.1.3"; sha256="0sn928ng4krllaskv900pxl9s13va79fyxr6n5l6i40qrlglmggr"; depends=[assertthat BH kde1d lattice Rcpp RcppEigen RcppThread wdm]; }; rvkstat = derive2 { name="rvkstat"; version="3.2.0"; sha256="0nk6bx04jnm55k5323w1n4zg7qgds6c53fvdz329kqfsrmpj4wgq"; depends=[dplyr httr jsonlite lgr stringr tidyr]; }; rvmethod = derive2 { name="rvmethod"; version="0.1.2"; sha256="1g2d5pvz5s1sj2kalxaz7nb8874m4113ly809zbimngi1lhg8zi1"; depends=[assertthat locfit]; }; rwa = derive2 { name="rwa"; version="0.0.3"; sha256="11irb6ayr1a1rbmhc9zqwyb1vjfc0fq7imji0lfa30zplwgf1mqh"; depends=[dplyr ggplot2 magrittr tidyr]; }; - rwalkr = derive2 { name="rwalkr"; version="0.5.6"; sha256="11jd3gq0cm2kk8qlk372sj1a30qf4mic25q6jzjn9r68a5syxvpx"; depends=[dplyr hms httr progress tidyr]; }; + rwalkr = derive2 { name="rwalkr"; version="0.5.7"; sha256="1k17wdf4hgk5rii5jh6r5gl17n82zzx1mjfj8bb3n56lf7yr2zhm"; depends=[dplyr hms httr progress tidyr]; }; rwarrior = derive2 { name="rwarrior"; version="0.4.1"; sha256="1s92qy57n92qwlf51hr6v5k2gip5f9jz9q4kpgb3vjql6nykrp4v"; depends=[checkmate cli dplyr glue R6 stringr tibble]; }; rwavelet = derive2 { name="rwavelet"; version="0.4.1"; sha256="092c1h1xyyi2fwg99dgbn1b22cgf8mliizjpc2z7dnravznprr94"; depends=[signal]; }; rwc = derive2 { name="rwc"; version="1.11"; sha256="1qhgkbkp4nz0wq5c4x8232xiszpiyzcdklfgvpnx4cbp3bbfdi4g"; depends=[MASS Matrix mvtnorm raster]; }; @@ -15861,10 +15960,10 @@ 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]; }; - rxode2 = derive2 { name="rxode2"; version="2.0.10"; sha256="143csj0kjss2mmmnnpnpbdfgbggjas2avd48ijdh97ckmva4wglk"; depends=[backports BH checkmate cli data_table ggplot2 inline lotri magrittr memoise PreciseSums qs Rcpp RcppArmadillo rex rxode2et rxode2ll rxode2parse rxode2random sys]; }; + rxode2 = derive2 { name="rxode2"; version="2.0.11"; sha256="1z038b2p0laxlapwv8mrm9p960yggw9dyqny7da39qzmgj6lqa3z"; depends=[backports BH checkmate cli data_table ggplot2 inline lotri magrittr memoise PreciseSums qs Rcpp RcppArmadillo rex rxode2et rxode2ll rxode2parse rxode2random sys]; }; rxode2et = derive2 { name="rxode2et"; version="2.0.9"; sha256="0ly6mz7xpfyl72vg7xihg874rsmgzn5xh4vf7c6bj660s2aqclnh"; depends=[checkmate cli crayon lotri magrittr Rcpp rxode2parse rxode2random]; }; rxode2ll = derive2 { name="rxode2ll"; version="2.0.9"; sha256="03jb4cka3a98glz2yg4767q68ldrlhcaczayzp58x8i1snbg6d12"; depends=[BH checkmate Rcpp RcppEigen StanHeaders]; }; - rxode2parse = derive2 { name="rxode2parse"; version="2.0.12"; sha256="1yir8wjwhm7xahc47lbdach0695d25yfvwg59qk1lh32qbdp885j"; depends=[BH checkmate crayon dparser knitr qs Rcpp RcppEigen StanHeaders]; }; + rxode2parse = derive2 { name="rxode2parse"; version="2.0.13"; sha256="0bgvf4a99nhw5wjqzivsk55nyq5k82ibqh3qfs1pa4x90w83vsaz"; depends=[BH checkmate crayon dparser knitr qs Rcpp RcppEigen StanHeaders]; }; rxode2random = derive2 { name="rxode2random"; version="2.0.9"; sha256="073s12jbjczj2vwn4spbgxric5vx1737qr4955iiv3b819lbvfsi"; depends=[BH checkmate Rcpp RcppArmadillo rxode2parse sitmo]; }; rxylib = derive2 { name="rxylib"; version="0.2.8"; sha256="1zyzhlckmcnnyhw5y1sga3nz9i9rr1zg2s0f23693d1h26nqia2h"; 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]; }; @@ -15873,7 +15972,7 @@ in with self; { rytstat = derive2 { name="rytstat"; version="0.3.0"; sha256="1shsc54ss9120ngl59pnd6kqclfh2ilva97xdsx58a9c2kry2dmm"; depends=[cli dplyr gargle httr pbapply rlang snakecase stringr tidyr withr]; }; rzentra = derive2 { name="rzentra"; version="0.1.0"; sha256="1knp1616ck64wgf3r80s1nywdnljc1r9fjvgg531j0fxir04aqkl"; depends=[data_table dplyr httr jsonlite lubridate magrittr purrr]; }; rzmq = derive2 { name="rzmq"; version="0.9.8"; sha256="0lqwxi9ckydvrmmkwy3mhqd28gyajijznbbb4j23mnmi0aspwnl1"; depends=[]; }; - s2 = derive2 { name="s2"; version="1.1.0"; sha256="05n459rp5b1wk826sq3c5d2z1xwgkpfp8m1jnfshvs4gadlfkap3"; depends=[Rcpp wk]; }; + s2 = derive2 { name="s2"; version="1.1.1"; sha256="07c9f8ghfjqdjcw50by3y4j8nbsmmcwd4a3vpcwsxr4mvybckq0w"; depends=[Rcpp wk]; }; s20x = derive2 { name="s20x"; version="3.1-31"; sha256="0gnp703blgawfymd6nxz98w8g7sabagrnk3qc3d3cxj887w83gih"; depends=[]; }; s2dv = derive2 { name="s2dv"; version="1.3.0"; sha256="0g60hby3rq4kpapiimjpyysfid9mr0fkvi4abmr5a5ch35fvazz7"; depends=[abind bigmemory ClimProjDiags easyNCDF easyVerification mapproj maps multiApply NbClust ncdf4 plyr SpecsVerification]; }; s2dverification = derive2 { name="s2dverification"; version="2.10.3"; sha256="10zqw7w8hm7cqbaxy6asflw0i8s5rmki2xhv3d51sm67vb7qn6f4"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; }; @@ -15887,6 +15986,7 @@ in with self; { sFFLHD = derive2 { name="sFFLHD"; version="0.1.2"; sha256="014gy3nj6gr740z4apw82jh4n7s57zmnr95bm3g9xxnwnb224npq"; depends=[conf_design DoE_base R6]; }; sGBJ = derive2 { name="sGBJ"; version="0.1.0"; sha256="145mxfpl8gpycz8fl1ddlxy61rwpcqlfdrva6yhwzv4awwsv1fvn"; depends=[GBJ survival]; }; sGMRFmix = derive2 { name="sGMRFmix"; version="0.3.0"; sha256="183i3159k2cxpanm09zcy2y1vvjd6185gjjf81c3284prw3aky2c"; depends=[ggplot2 glasso mvtnorm tidyr zoo]; }; + sMSROC = derive2 { name="sMSROC"; version="0.1.0"; sha256="16fllr09mjxqwjm4rq9bc89bl1hz1kq6bs6m75qwwwm73j0xk40h"; depends=[flextable foreach ggplot2 icenReg plotROC RISCA rms survival thregI]; }; sNPLS = derive2 { name="sNPLS"; version="1.0.27"; sha256="0h05crdmwmzax4pwmyxb2z1dagyqb3kybpxc064y1kl8m84kcyvv"; depends=[clickR future future_apply ggplot2 ggrepel ks MASS Matrix pbapply]; }; sRDA = derive2 { name="sRDA"; version="1.0.0"; sha256="0g11smn4adm3b79m9w7wzcragxggkf8rrrsgj2yzdhm1d7zzjwbk"; depends=[doParallel elasticnet foreach Matrix mvtnorm]; }; sRNAGenetic = derive2 { name="sRNAGenetic"; version="0.1.0"; sha256="1cvk40rkbxvr8jhwfqkgdfy150mi56y976pjp2w34rnghry6ql8z"; depends=[DESeq2 futile_logger ggplot2 ggsci plyr VennDiagram]; }; @@ -15925,14 +16025,14 @@ in with self; { safedata = derive2 { name="safedata"; version="1.1.2"; sha256="0fcrx4qd52q5kwsbhnmy1n777fgbyrnl8s0xgsrfv99ws3qknnli"; depends=[chron curl httr igraph jsonlite readxl sf]; }; 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]; }; + safestats = derive2 { name="safestats"; version="0.8.7"; sha256="1jxdnvmf6w8hgd5wcfjcmm796nchig1xizhngbzdgl85yi6nw1yy"; depends=[BiasedUrn boot dplyr hypergeo purrr rlang survival]; }; safetyCharts = derive2 { name="safetyCharts"; version="0.3.0"; sha256="1riyd2rb799rr0j95s3wd45rwq8syfm0xllpihycpak0f56vg1s8"; depends=[dplyr DT forcats ggplot2 htmlwidgets huxtable jsonlite pharmaRTF plotly purrr RColorBrewer rlang shiny stringr Tendril Tplyr]; }; safetyData = derive2 { name="safetyData"; version="1.0.0"; sha256="1spa1wh1z8cqsz8vrkj3abny0xs3qp8d80dla8d031d70hvfkdjc"; depends=[]; }; safetyGraphics = derive2 { name="safetyGraphics"; version="2.1.0"; sha256="0vsyx9d157syz9qp8cnqgf2jgf4jkwyyi3mkf88zg51xl93dx19l"; depends=[datamods dplyr DT htmlwidgets jsonlite magrittr purrr rclipboard rlang safetyCharts safetyData shiny shinyjs sortable stringr tidyr yaml]; }; sageR = derive2 { name="sageR"; version="0.6.0"; sha256="0l8r1y62bjkkjw359dx6h9zd4a9pg90mimihp39vv552jchh7x6y"; depends=[ggplot2]; }; sahpm = derive2 { name="sahpm"; version="1.0.1"; sha256="1grhfxpqx9dyvqd2v91im3jgki2k3abcaal2ix9pcdzz93fc9xlw"; depends=[mvtnorm]; }; 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=[]; }; + salso = derive2 { name="salso"; version="0.3.27"; sha256="10b8hbd3kjdbh38qfnd3pg16z9fzs726ahm6d6ypg4hfjigpzhfg"; 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]; }; samc = derive2 { name="samc"; version="2.0.1"; sha256="1b9k5r8hbn6h7i72gib5dkb783a9yqxjrf2mflzgjp88jp79f1cc"; depends=[gdistance Matrix raster Rcpp RcppEigen RcppThread]; }; @@ -15956,7 +16056,7 @@ in with self; { sand = derive2 { name="sand"; version="2.0.0"; sha256="0a8skj1wi1n9zlm7jb5cix1i4ssdzfpj4ym2854ala9jy6qj7g7n"; depends=[igraph igraphdata]; }; sandbox = derive2 { name="sandbox"; version="0.2.1"; sha256="0k86dgfjg7ib79cl6nwxv1g9i15pk501kd8ynlaj3mijpnhgvbal"; depends=[RLumModel]; }; sandwich = derive2 { name="sandwich"; version="3.0-2"; sha256="1d72vwxidsyac9mbyxrm06qds63rzcr82nn4c05466gbajsvcc3f"; depends=[zoo]; }; - sandwichr = derive2 { name="sandwichr"; version="1.0.1"; sha256="114k981kxkf3a8kvzaciimkksnh1g5cyj2ams278r09vi3ic59ia"; depends=[caret dplyr geodetector ggplot2 gridExtra lwgeom sf]; }; + sandwichr = derive2 { name="sandwichr"; version="1.0.2"; sha256="16j4g42m808fb6w8mpb10hac3b0nn5aq12hp9xfgdhx49iai71dr"; 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]; }; @@ -15965,7 +16065,7 @@ in with self; { sanon = derive2 { name="sanon"; version="1.6"; sha256="0h3l1dzgkddvb3vzg7pcgwrgidphy73jys2h49v84nbfvqr6l85z"; depends=[]; }; sansa = derive2 { name="sansa"; version="0.0.1"; sha256="1p5qv94f62dxzkbl1jn1fx3vksyhqqa3w2ipqwiflaxlk7q9k5pq"; depends=[data_table FNN ggplot2]; }; santaR = derive2 { name="santaR"; version="1.2.3"; sha256="0xyvfanqid5f114m7akhh0pi9mwy9bj8iqfzxpkkvj6ak1ib0i5y"; depends=[bslib doParallel DT foreach ggplot2 gridExtra iterators pcaMethods plyr reshape2 shiny]; }; - santoku = derive2 { name="santoku"; version="0.8.0"; sha256="0xqbc1qbjnpd39z3ahvmpdqw14f0ym0l62gjc8fg8qissiwv0r1q"; depends=[assertthat glue lifecycle Rcpp rlang vctrs]; }; + santoku = derive2 { name="santoku"; version="0.9.0"; sha256="08pl03b94i3p3zza071ai62zb21rxs18vb0dscfrnyy383pxh5cy"; depends=[assertthat glue lifecycle Rcpp rlang vctrs]; }; sanzo = derive2 { name="sanzo"; version="0.1.0"; sha256="1fqsx2mgjsy6vjvsp2avi2i5cw7cjs2p53l1z6hb3bzid3067s87"; depends=[]; }; saotd = derive2 { name="saotd"; version="0.3.0"; sha256="11ql731w3rc4spmd2ii52r49sxymxkf7wj2ngdvb8pcs4idar059"; depends=[dplyr ggplot2 ggraph igraph ldatuning lubridate magrittr reshape2 rtweet scales stringr tidyr tidytext topicmodels widyr]; }; sapevom = derive2 { name="sapevom"; version="0.2.0"; sha256="0vq4rx85pdjc0wjxjf7wj8j5qs3cb20hwhlc2ypbgrlw7zkcp1z4"; depends=[]; }; @@ -15975,14 +16075,15 @@ in with self; { sarima = derive2 { name="sarima"; version="0.9.1"; sha256="0gj3z7471153g1cyclmkh9lcc2zqpv2d4yzq6k6hi2pxmb5hihsq"; depends=[Formula lagged ltsa numDeriv PolynomF Rcpp RcppArmadillo Rdpack]; }; sarp_snowprofile = derive2 { name="sarp.snowprofile"; version="1.3.1"; sha256="1r20gmrzfgxhi9f4x9y5kclnyy6mr19jbga7fly1z501ch71n90i"; depends=[data_table xml2]; }; sarp_snowprofile_alignment = derive2 { name="sarp.snowprofile.alignment"; version="1.2.1"; sha256="11c9wq7rr05jq6v6rcg3wy3h7w44clbxx2mysrqj50w38ih3r29b"; depends=[data_table dtw sarp_snowprofile]; }; + sarp_snowprofile_pyface = derive2 { name="sarp.snowprofile.pyface"; version="0.1.3"; sha256="0nnl4bdvvbn6wf3zhv7n710y8fn07rnsb2f9j9lkr5g9a52356bf"; depends=[data_table reticulate sarp_snowprofile]; }; 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.13"; sha256="0dfpqmvqjr2f7amqmms4wliccdlk37c53khrkb6z9dvhh88i4gzv"; depends=[BH digest Matrix processx xml2]; }; sas7bdat = derive2 { name="sas7bdat"; version="0.6"; sha256="13ybq0r5bza6pcih9876pmccggn5bm7mzmn071qs46sbbpq40kyk"; depends=[]; }; - sasLM = derive2 { name="sasLM"; version="0.9.2"; sha256="17c9l4v7rkyf65awvkdijz4lk101mclns122w4li63w5nhxckpyl"; depends=[mvtnorm]; }; + sasLM = derive2 { name="sasLM"; version="0.9.3"; sha256="1v5n0vm68fq683myfd105av11h7fw732f0n66kjmgxfkkgx3nqxy"; 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.2"; sha256="0iln5ky6k1ix0gddlyw4rr2953kc499x66bcyi9yiyp91nfh82dl"; depends=[fs htmltools R6 rappdirs rlang]; }; - sassy = derive2 { name="sassy"; version="1.0.8"; sha256="0sswnif8jg4zlvs2r867pjz670q63p20w4mrxwr7x8f9m7ll7wv6"; depends=[common fmtr libr logr reporter]; }; + sass = derive2 { name="sass"; version="0.4.4"; sha256="0hk5svmpbhx9q3ni3qll2pa7q3pfc0zxv616kp62r6vakn1az16j"; depends=[fs htmltools R6 rappdirs rlang]; }; + sassy = derive2 { name="sassy"; version="1.1.0"; sha256="0iimj7wncdsx6h0fk4cg79dqbhyrlg76bl8jkz8rl2ac6ywdyz2p"; depends=[common 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.1.0"; sha256="17knbgy89ljp607mkhs62fx9p6b40iqqzgpxr9karlf07l48c0ya"; depends=[geosphere maps ncdf4 PBSmapping sp splancs]; }; @@ -16001,12 +16102,12 @@ in with self; { sbmSDP = derive2 { name="sbmSDP"; version="0.2"; sha256="1sl46lqi6w0s7ghv4bywhic56cm2vib3kawprga760m6igargx4y"; depends=[Rcpp RcppArmadillo]; }; sbo = derive2 { name="sbo"; version="0.5.0"; sha256="00pnvpcl6441gf8npf6b6cvzxh0kq4qbfxggjiqdny6lq2nl0d47"; depends=[dplyr Rcpp rlang testthat tidyr]; }; sboost = derive2 { name="sboost"; version="0.1.2"; sha256="1vh3hk15chkyrkpnj4i40542bck9ny45g424bncxdxl9fgxc4nhk"; depends=[dplyr Rcpp rlang]; }; - sbtools = derive2 { name="sbtools"; version="1.1.20"; sha256="0kzdi3lynzk2ws975rgc6ijddyp24b6xgsz1g7nrg32462k9m5qj"; depends=[cli curl httr jsonlite mime]; }; + sbtools = derive2 { name="sbtools"; version="1.1.21"; sha256="1b52lq2xdwaz37jnnwi7lp151448g2gr2nykm32bdwbrxm68smx1"; depends=[cli curl httr jsonlite keyring mime]; }; sbw = derive2 { name="sbw"; version="1.1.5"; sha256="10ks912f4xiy0i484vf24w5zz9n7kxlcy77ikz95p8vr5zlqkvgc"; depends=[MASS Matrix quadprog slam spatstat_geom]; }; - scAnnotate = derive2 { name="scAnnotate"; version="0.0.4"; sha256="0fz3bchszykqjb6dr3vybxzrwia5lm5rb87hi1f2ajz9z8i8vlyc"; depends=[glmnet harmony MTPS Seurat]; }; + scAnnotate = derive2 { name="scAnnotate"; version="0.1.1"; sha256="05akid10d1h8636v5pic4kxn0dby3a864yjwbd5rv6zc4wxq1znr"; depends=[glmnet harmony MTPS Seurat]; }; 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.4"; sha256="1w509y629xpqd748k7rghv8plav0jyyigfcf3n2c1m2a6qhh338x"; depends=[FNN purrr scDHA]; }; - scCATCH = derive2 { name="scCATCH"; version="3.2"; sha256="1nc9z7q5za5p8h9705zzpmji05y8xynm9mc6s9w8h3dd52gpmc4w"; depends=[crayon Matrix progress reshape2]; }; + scCATCH = derive2 { name="scCATCH"; version="3.2.1"; sha256="00z1lqs04i251gkp9c4iih9hspkgw7jafj66gb6rj1ql6kqhkny1"; depends=[crayon Matrix progress reshape2]; }; scDHA = derive2 { name="scDHA"; version="1.2.0"; sha256="16vhfa2ja3bnkq86ls62ylkwks78n36qmrxzazyqih1n2n0z3ckm"; depends=[cluster clusterCrit coro doParallel foreach igraph Matrix matrixStats Rcpp RcppAnnoy RcppArmadillo RcppParallel RhpcBLASctl torch uwot]; }; scDIFtest = derive2 { name="scDIFtest"; version="0.1.1"; sha256="1hq68g7zf7372cach2qfc7l1l8gh5aqkp66k0cxjnrhmvvb1qcax"; depends=[mirt sandwich strucchange zoo]; }; scDiffCom = derive2 { name="scDiffCom"; version="0.1.0"; sha256="1xgrsfrh06n8hzyqv3j99kjk6l85khg099vjdsf7kx9f5p92iixd"; depends=[data_table DelayedArray future future_apply magrittr Seurat]; }; @@ -16018,7 +16119,6 @@ in with self; { 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.3"; sha256="0wc7mif6q7li7qqsxc7s5s2jgg4ahwf348xzb5zpr2nhbcb5s4x6"; depends=[gamlss_dist Rcpp]; }; scOntoMatch = derive2 { name="scOntoMatch"; version="0.1.0"; sha256="16yw415jbzk28nq050b0xw0rhv35192vnm7ihhi1gpa69aqc0v9y"; depends=[ontologyIndex ontologyPlot purrr]; }; - scPOP = derive2 { name="scPOP"; version="0.1.0"; sha256="0bi9dmqj9cd8f09qmfl3d65922xn3j3jipxi6615jbk6bz67kkh9"; depends=[cluster Matrix RANN Rcpp RcppArmadillo]; }; scPloidy = derive2 { name="scPloidy"; version="0.3.0"; sha256="0wbrpr6zwmhihbqsa5f4mfv05vx7v53bhgr4cx88k0p5jgzb6fs5"; depends=[dplyr GenomicRanges magrittr matrixStats mixtools rlang Rsamtools]; }; scRNAstat = derive2 { name="scRNAstat"; version="0.1.1"; sha256="0yv5np7jafmygg77bwisrha5y2rdb1va906ngzs4zc8mvxr0dvlm"; depends=[clustree dplyr ggplot2 magrittr Matrix patchwork Seurat stringr]; }; scRNAtools = derive2 { name="scRNAtools"; version="1.0"; sha256="0x0lniqhq6q87y08kkkyvmk1g5b8i73hm3h86ba8rcv0v0n7ap9a"; depends=[ALL ConsensusClusterPlus corrplot edgeR foreach ggplot2 ggthemes Hmisc igraph lattice limma PerformanceAnalytics plyr reshape2 Rmisc Rtsne scatterplot3d survival TPEA]; }; @@ -16038,7 +16138,7 @@ in with self; { scam = derive2 { name="scam"; version="1.2-13"; sha256="0qp5g24zwb51x85z8g5x4n9wmqsf33hzwnahkj89rvl38lwq1z9k"; depends=[Matrix mgcv]; }; scan = derive2 { name="scan"; version="0.55"; sha256="0vzd50dghmdvzp9bklb6sz6cf13am98v25d5jbn32nsm2wm65myj"; depends=[car kableExtra knitr magrittr mblm meta nlme readxl yaml]; }; scanstatistics = derive2 { name="scanstatistics"; version="1.1.0"; sha256="1982xwnjs6xiqys385m5gn5a49xy2v3smd6ghw8814gx60bgw6w8"; depends=[dplyr ismev magrittr plyr Rcpp RcppArmadillo sets tibble tidyr]; }; - scapGNN = derive2 { name="scapGNN"; version="0.1.1"; sha256="1jhgjbxsaaxss5vca4znllf59rllbz0a5mhq4isj1asdjkv6zh0b"; depends=[ActivePathways AdaptGauss coop igraph mixtools reticulate]; }; + scapGNN = derive2 { name="scapGNN"; version="0.1.3"; sha256="15j0xqxyidlmgq0m66y59ppbi8vn1qxicrrm1dfybg2yn0vb0kcj"; depends=[ActivePathways AdaptGauss coop igraph mixtools reticulate]; }; scape = derive2 { name="scape"; version="2.3.3"; sha256="1jb5c335qsbrpsgngs8c1qlibyb7zvvx6mwydfhm1plx4pkcq0n1"; depends=[coda Hmisc lattice]; }; scapesClassification = derive2 { name="scapesClassification"; version="1.0.0"; sha256="0kwl9mbzcmn5qzqbzabf2igbhwbf5m1b1wa8rhm8mfv2qz7psyf2"; depends=[terra]; }; scar = derive2 { name="scar"; version="0.2-2"; sha256="0l2vm6aqi5lrc25akmn826v0zhygys9s167k9dphqn8l3yvlvqbj"; depends=[]; }; @@ -16054,15 +16154,16 @@ in with self; { sccore = derive2 { name="sccore"; version="1.0.2"; sha256="12gm7pb6xbvf9kdsgl7ldw1c54ga9fgk99ps2kx2cq91q9m0ld4r"; depends=[dplyr ggplot2 ggrepel igraph irlba magrittr Matrix pbmcapply pROC Rcpp RcppArmadillo RcppEigen RcppProgress rlang scales tibble uwot withr]; }; sccr = derive2 { name="sccr"; version="2.1"; sha256="0cjlzv92b5qrs43d3ry33zcggiqvsqaf8wq4k19ws9lvgh59b62v"; depends=[dplyr]; }; scdensity = derive2 { name="scdensity"; version="1.0.2"; sha256="173xm3bf8vxl30zk4n451al7m003byg9q4d1l1pfyfa4xnv8qdg9"; depends=[lpSolve quadprog]; }; - scdhlm = derive2 { name="scdhlm"; version="0.6.0"; sha256="1x0z1yl8fmnnpm9h1nwlczbk2vnmqpq5sg5l6yn2z35j4wn458qz"; depends=[lmeInfo nlme readxl]; }; + scdhlm = derive2 { name="scdhlm"; version="0.7.0"; sha256="1sf8pgj4zq45lpv37c6h3gpp8qbmszwzlcr41bjki75mqbariksd"; depends=[dplyr lmeInfo magrittr nlme readxl rlang tidyselect]; }; + scellpam = derive2 { name="scellpam"; version="1.4"; sha256="1hhl3mikxbzvvw2xb3vhjw7gly503g2mnjblr9z257dgc6zgxflg"; depends=[cluster memuse Rcpp]; }; scgwr = derive2 { name="scgwr"; version="0.1.2-21"; sha256="15pwasxkwirr2wwf8w02cy8zx0bqavzyfixjz3m37c1llrhddpka"; depends=[dplyr FNN optimParallel sp spData]; }; schemr = derive2 { name="schemr"; version="0.1.0"; sha256="0w29la0mh5bvij52r8jgfl47cgm0xc53702ms5r4jv0pdd49qlg8"; depends=[apcluster dplyr ggplot2 magrittr OpenImageR purrr stringr]; }; - schoRsch = derive2 { name="schoRsch"; version="1.9.1"; sha256="0f823z48s50jhcphqqivchrmkiwqg25nc01c17kjpzzryd2fi5zs"; depends=[]; }; + schoRsch = derive2 { name="schoRsch"; version="1.10"; sha256="0bf4lahfzi6dchqfnykh4saiagcka12h82d9mvd1ddv5phmbyi10"; depends=[]; }; schoenberg = derive2 { name="schoenberg"; version="2.0.2"; sha256="17pbw9266r9lv9blygmvq9285kcrcy07jaqrj3zfa2pg0zyvhjvm"; depends=[crayon]; }; scholar = derive2 { name="scholar"; version="0.2.4"; sha256="12r4j1s71szh77nsnqzsi0q5cvkp0cyr2fxzcagk02f42bnp5aww"; depends=[dplyr ggplot2 ggraph httr R_cache rlang rvest stringr tidygraph xml2]; }; schoolmath = derive2 { name="schoolmath"; version="0.4.1"; sha256="16vd1in016sqxllxmkvs0bav9drk6lynrcqf9d24y77yhm103q76"; depends=[]; }; schrute = derive2 { name="schrute"; version="1.0.1"; sha256="14mjz63g2z4m4rgh7yf05gz5cjcriqvwgrd0an9xzj9pk36arisb"; depends=[magrittr]; }; - schtools = derive2 { name="schtools"; version="0.3.0"; sha256="0l601blj6c91nj79xvq1xv2yl038xrln350mykxfd9lp74fl1x3f"; depends=[dplyr formatR glue rlang stringr tidyr]; }; + schtools = derive2 { name="schtools"; version="0.3.1"; sha256="0d41zb546kf0yz958v486vbwymx2vn2jgpbqqghqly8hb9bfkg77"; depends=[dplyr formatR glue rlang stringr tidyr]; }; schumaker = derive2 { name="schumaker"; version="1.2.1"; sha256="15i39lzkd1qggd35sp39vy922y3y1n9drjkidz7asniv1miali6j"; depends=[]; }; sciRmdTheme = derive2 { name="sciRmdTheme"; version="0.1"; sha256="17pyvi38qg9r2yshw02car7d08qda6mscxkhh5jdm4ncc91y9i17"; depends=[]; }; scico = derive2 { name="scico"; version="1.3.1"; sha256="1f2czfhzdpi5dqjbxvbrrcnxjpylc5zzghj70ihlh2agq3n9hw5g"; depends=[scales]; }; @@ -16071,19 +16172,21 @@ in with self; { scifigure = derive2 { name="scifigure"; version="0.2"; sha256="1zc88r1lnb0cws130hq4rjc34rrp6zkmi8yhkwsm3vkznbhi4iba"; depends=[]; }; sciplot = derive2 { name="sciplot"; version="1.2-0"; sha256="097zcgjsv54f6wd8fjwh2xb406j6yrw94v9pcxa0zln1q7fs93vk"; depends=[]; }; scipub = derive2 { name="scipub"; version="1.2.2"; sha256="1k06pmpwpmgiglqhh9ca67m74vb961dczc9394xnwfszq9g3gz1n"; depends=[dplyr forcats gghalves ggplot2 purrr stringr tibble tidyr tidyselect]; }; + scistreer = derive2 { name="scistreer"; version="1.0.1"; sha256="1p8nga48lr87rdrkqcc6y4zgr85dc4cwqplyvp5s2i58jz5n296b"; depends=[ape dplyr ggplot2 ggtree igraph parallelDist patchwork phangorn Rcpp RcppArmadillo RcppParallel reshape2 RhpcBLASctl stringr tidygraph]; }; sclr = derive2 { name="sclr"; version="0.3.1"; sha256="10pihx35889w509ijbyq5hzslk9n7kakjnfscg7p0dq198nbpyca"; depends=[broom dplyr purrr rlang tibble]; }; scoper = derive2 { name="scoper"; version="1.2.1"; sha256="1f9bdw7w7zgbjhxxxpld8jss7kbr4k9ksxwzr94wzvapgg06v10p"; depends=[alakazam data_table doParallel dplyr foreach ggplot2 Rcpp rlang scales shazam stringi tidyr]; }; scopr = derive2 { name="scopr"; version="0.3.4"; sha256="1zskhhbdgijkbh4jrvlfd46q4s8fyycqcgcx3lzyvi5xvv6h0sxg"; depends=[behavr curl data_table memoise readr RSQLite stringr]; }; score = derive2 { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; }; - scorecard = derive2 { name="scorecard"; version="0.3.9"; sha256="0ljbxf73ab65mzrn2c9g1l5qvw1hgybr8syr806xnmxxb1ar7nqm"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx stringi]; }; + scorecard = derive2 { name="scorecard"; version="0.4.0"; sha256="0s8z8aav71z70hfqqsg9fann4v3k508iij1l4wq8ng8jlpvjiswz"; depends=[cli data_table doParallel foreach ggplot2 gridExtra openxlsx stringi]; }; scorecardModelUtils = derive2 { name="scorecardModelUtils"; version="0.0.1.0"; sha256="09znaxrv14m58hsk5pac458xbpcsidc6ygcsw4q9j0p4yd80qbvl"; depends=[car e1071 gbm ggplot2 partykit randomForest reshape2 sqldf stringr]; }; scorepeak = derive2 { name="scorepeak"; version="0.1.2"; sha256="1g9n7kjqb9qk5b7hw8ysrc069w9dzc4z29ay6z1kbm0v4kkzp7bi"; depends=[checkmate Rcpp]; }; scoring = derive2 { name="scoring"; version="0.6"; sha256="114jlpbnm15fdan5lr40adxdzwajy3yhdw6dm4kvkvky6qhcx7q5"; depends=[]; }; scoringRules = derive2 { name="scoringRules"; version="1.0.2"; sha256="16b9ibjyp2513hmwz63qbcsaddsvp7j894q4bn33dqhn7zxzdfrk"; depends=[knitr MASS Rcpp RcppArmadillo]; }; scoringTools = derive2 { name="scoringTools"; version="0.1.2"; sha256="11bxmpqiqqkjyvmyxlnzz7j64jmy1pjw06128vvydmqhjxxyawjh"; depends=[discretization dplyr magrittr sqldf]; }; + scoringfunctions = derive2 { name="scoringfunctions"; version="0.0.5"; sha256="140fz1zlx8841xnx4m74lkl7x18ysksqyikjxl60vwmaidbcfhhv"; depends=[]; }; scoringutils = derive2 { name="scoringutils"; version="1.0.1"; sha256="1fbppgjiv0qcypcnnrmyrilga5hdlq2l2iy3fq7i73h2y6a8p5r9"; depends=[data_table ggdist ggplot2 rlang scoringRules]; }; scout = derive2 { name="scout"; version="1.0.4"; sha256="0vr497g7g1xhf75cwjbjsns2fvdzy86iibbf5w0g2xylw82s4lh2"; depends=[glasso]; }; - scpi = derive2 { name="scpi"; version="2.0.0"; sha256="0an7hyrmiwz040sqdwyzs1m654rxr2jv6dl8jqczxmal7ya7jxhf"; depends=[abind CVXR doRNG doSNOW dplyr ECOSolveR fastDummies foreach ggplot2 magrittr MASS Matrix purrr Qtools reshape2 rlang stringr tibble tidyr]; }; + scpi = derive2 { name="scpi"; version="2.0.1"; sha256="1msni5mfz8gkf9ff7c06w99p86l85v7in2kh73vnfzykw561x944"; depends=[abind CVXR doRNG doSNOW dplyr ECOSolveR fastDummies foreach ggplot2 magrittr MASS Matrix purrr Qtools reshape2 rlang stringr tibble tidyr]; }; scpoisson = derive2 { name="scpoisson"; version="0.0.1"; sha256="0v8is1y9mqbvcvhqay1a0ycbhfxwxqkxifmbxb0sjzxg02mla65x"; depends=[broom dplyr ggplot2 glmpca magrittr Matrix matrixStats purrr Rdpack Seurat SeuratObject tidyr WGCNA]; }; scqe = derive2 { name="scqe"; version="1.0.0"; sha256="1113zbc2jyq03fh8l1h6yidf25hh5dcqrk6wkk9flqwnbrvfkwrr"; depends=[AER ggplot2]; }; scquantum = derive2 { name="scquantum"; version="1.0.0"; sha256="0v263qxf3qp7hra3l8fyw8a625z9ym2h2zg5b9lsysdiznbi9bww"; depends=[]; }; @@ -16096,7 +16199,7 @@ in with self; { 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]; }; - scrutiny = derive2 { name="scrutiny"; version="0.2.2"; sha256="0wz9zjfww6lgabsp6m9fvjrnf351srhdxa5cmih5lj9vy296nmk5"; depends=[cli dplyr glue magrittr purrr rlang stringr tibble]; }; + scrutiny = derive2 { name="scrutiny"; version="0.2.3"; sha256="13b257sl375rp2nzp2h2p1zlw7xcvxk59blnyn7pf9snmkncsi7j"; depends=[cli dplyr glue magrittr purrr rlang stringr tibble]; }; scrypt = derive2 { name="scrypt"; version="0.1.4"; sha256="12q9d4m7flbvlgssvjh1ga4jswkmqjfshf6pna6qk6v087gmzdsj"; depends=[Rcpp]; }; scryr = derive2 { name="scryr"; version="1.0.0"; sha256="040x2qvgrr8j5k3y2g24kngjys271radqhh3jsqi07dhg9bybr5q"; depends=[dplyr httr purrr tibble]; }; scs = derive2 { name="scs"; version="3.0-1"; sha256="04srf33zw4dxv22b1h5qwjch5yg7hrvk4iq8yvxqnbr8qzp1x26n"; depends=[]; }; @@ -16108,7 +16211,7 @@ in with self; { sda = derive2 { name="sda"; version="1.3.8"; sha256="14cpl7zj9aamdwyc8c9s7hnf660srvjv66lpnsm837d4r7k19icv"; depends=[corpcor entropy fdrtool]; }; sdafilter = derive2 { name="sdafilter"; version="1.0.0"; sha256="0y692j25pln46dp6xvaq17fkym0461yqfa6rv5avfw2b240k8jiq"; depends=[glasso glmnet huge POET]; }; sdam = derive2 { name="sdam"; version="1.1.4"; sha256="0mqhg47z4knzcy1lxcd9fv8qk8ayszbl6sbxnmq5z0hx6wabkdf8"; depends=[grImport2 multiplex]; }; - sdamr = derive2 { name="sdamr"; version="0.1.0"; sha256="19mgdipp2fwv0c8g5fc02j4vdnc6v4x0204570swv8mkb2r2acqy"; depends=[car dplyr ggplot2]; }; + sdamr = derive2 { name="sdamr"; version="0.2.0"; sha256="1hcgdysa62mrzk2wmy366jpwab65m3qyi8bh7kzgifpwwxh5pv9k"; depends=[car dplyr ggplot2]; }; sdcHierarchies = derive2 { name="sdcHierarchies"; version="0.19.3"; sha256="1nnvn8mfmymfx7f7vi9hdqp03vdhvngmik1jd4magnc6ghrpcdai"; depends=[cli data_table jsonlite Rcpp rlang shiny shinyjs shinythemes shinyTree]; }; sdcLog = derive2 { name="sdcLog"; version="0.5.0"; sha256="0ssjgpfg3z8j9s47nmiw6a5jcsi4pppdxidvzm3sryjz4klallwg"; depends=[broom checkmate cli data_table mathjaxr]; }; sdcMicro = derive2 { name="sdcMicro"; version="5.7.4"; sha256="1jy9i0akyrzvbividfac0ppgfndf6n190lgylja26b8fdlrwhdvy"; depends=[car carData cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase shiny shinyBS VIM xtable]; }; @@ -16139,8 +16242,8 @@ in with self; { 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.5.7"; sha256="0vhsik8p8f3cvmlxq1ff3qh5jgzy5s0z6savrsmfb56vf3l5462p"; 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]; }; + secr = derive2 { name="secr"; version="4.5.8"; sha256="1kdl6lshd00zvfd77p66qqinb7qwxhaqkb38dpvpmr8xc75r82lg"; depends=[abind BH MASS mgcv nlme raster Rcpp RcppEigen RcppNumerical RcppParallel sf stringr terra]; }; + secrdesign = derive2 { name="secrdesign"; version="2.7.0"; sha256="0a0m78xf2avy4yx7zc8rmzjzai2pi4iy5bzh80yrc95s3m0nn24g"; depends=[BH kofnGA Rcpp RcppArmadillo secr sf]; }; secret = derive2 { name="secret"; version="1.1.0"; sha256="063gpyc2s2l6zw1j8b8ppzsv9kjsf0s77s5wcn7ipmwkj8qr2g4b"; depends=[assertthat curl jsonlite openssl rprojroot]; }; secrettext = derive2 { name="secrettext"; version="0.1.0"; sha256="129v524yyb464mcij7hvzv05cxliaz5nm7v30g9g9ppskcdqhsx2"; depends=[dplyr magrittr rlang stringr testthat tidyr]; }; secrlinear = derive2 { name="secrlinear"; version="1.1.4"; sha256="1qa0vapnhiblz57jrbj9zd1gdmxc1nzzq41b4464373pjfvm5wvj"; depends=[igraph maptools MASS rgdal secr sp]; }; @@ -16148,7 +16251,7 @@ in with self; { 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]; }; sedproxy = derive2 { name="sedproxy"; version="0.7.3"; sha256="176wyi8jvk15r4k7hdax2ad37rsbhr54jlsj0y7p8ayhk1vd89am"; depends=[dplyr ggplot2 mvtnorm readr rlang shiny tidyr]; }; - see = derive2 { name="see"; version="0.7.3"; sha256="0k7r8pqmngbv389y5hcri27ld9ygkhfhxj185vfkcnnj63m1ff2z"; depends=[bayestestR datawizard effectsize ggplot2 insight parameters]; }; + see = derive2 { name="see"; version="0.7.4"; sha256="0772ahq11zzrwx8wwd7krg0a3phx28fli6gcs78rrwl8l2cl8y42"; depends=[bayestestR correlation datawizard effectsize ggplot2 insight modelbased parameters performance]; }; 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.1"; sha256="01v8hwhw5pap69n11czn0ma22vakhi3kfbly0rzasw9fsvf66xhg"; depends=[CCA corpcor]; }; @@ -16166,7 +16269,7 @@ in with self; { segen = derive2 { name="segen"; version="1.1.0"; sha256="1l60rb1w0rfp1rv5favi4yxzyqs1nb1881mcz66xv789r3awhp11"; depends=[entropy fANCOVA fastDummies ggplot2 greybox imputeTS lubridate modeest moments narray philentropy purrr readr Rfast scales tictoc]; }; segmag = derive2 { name="segmag"; version="1.2.4"; sha256="1i717xg1z7s35pkwzywgjf9wx7zj9xksv0k87h7p1q62y073qbqm"; depends=[plyr Rcpp]; }; segmenTier = derive2 { name="segmenTier"; version="0.1.2"; sha256="01xbcddinjbkbqkwq2lnsxd3gw8fxys58p498dc2lw8psz3g2wgc"; depends=[Rcpp]; }; - segmented = derive2 { name="segmented"; version="1.6-0"; sha256="0sg59j59kz3zrwl3mi4ps1qw3hvwljygqa1d652vjdsx9w57zbvb"; depends=[MASS nlme]; }; + segmented = derive2 { name="segmented"; version="1.6-2"; sha256="0livckkhci3w1x9xai2m0a30fj06qsks2qds7y5jr9vwx03jqg21"; depends=[MASS nlme]; }; segmentr = derive2 { name="segmentr"; version="0.2.0"; sha256="0q5kxxiw0akpk7w2a2l9zp7v4pvqblzdvrld5fjyl5f6h8hsb40z"; depends=[foreach glue Rcpp]; }; segmetric = derive2 { name="segmetric"; version="0.2.0"; sha256="1nirb5gnbs3vw74fmpapng0bqqwrz5a6c59apkg8s8x0vqxwhfvx"; depends=[magrittr sf units]; }; segregation = derive2 { name="segregation"; version="0.6.0"; sha256="0yajbbrbrkk6blb6r5y5fwvfz0j8kbc8fr91kb4f53j1afcbbhbx"; depends=[data_table]; }; @@ -16182,7 +16285,7 @@ in with self; { selectiongain = derive2 { name="selectiongain"; version="2.0.710"; sha256="0gbfzm1kzlc2lf1jfd0gxv8nlnm5bw6w7b55m48338lxb4zyhjcc"; depends=[mvtnorm]; }; selectiveInference = derive2 { name="selectiveInference"; version="1.2.5"; sha256="07kzpvdmflca1sriqfzn20f84fx2b9kwwiqm91lqjpx854bsx5kh"; depends=[adaptMCMC glmnet intervals MASS Rcpp survival]; }; selectr = derive2 { name="selectr"; version="0.4-2"; sha256="09y1n3iy297g49xlpl7xrjpwgnm57pskx5991lyfcpizbz8ax22m"; depends=[R6 stringr]; }; - selectspm = derive2 { name="selectspm"; version="0.4"; sha256="0yw5xwhv8kw3sizhq0r3wak8a32chkjil3lmxac8c6g9k47q8yrq"; depends=[ecespa spatstat spatstat_core spatstat_geom spatstat_random]; }; + selectspm = derive2 { name="selectspm"; version="0.5"; sha256="1qa2qnv6zwbxdbz78lgrmix7s1w1s91d9118nl8cdmj59k64x9q6"; depends=[ecespa spatstat spatstat_explore spatstat_geom spatstat_model spatstat_random]; }; seleniumPipes = derive2 { name="seleniumPipes"; version="0.3.7"; sha256="1krpzh2gy3yl07c2n1d8q21xjc2qcv5ac1kv7212710bxkdyfad6"; depends=[httr jsonlite magrittr whisker xml2]; }; selfingTree = derive2 { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; }; sem = derive2 { name="sem"; version="3.1-15"; sha256="05hk72zxvyv6kkjhk5y6qw253c64108az7030z8j1sz8wq03n0md"; depends=[boot MASS mi]; }; @@ -16201,7 +16304,7 @@ in with self; { seminr = derive2 { name="seminr"; version="2.3.2"; sha256="1385wwh7b0fq4jqm6ragdywwafdidq4scbljzbdpvm3wis07abqv"; depends=[DiagrammeR DiagrammeRsvg glue knitr lavaan rmarkdown testthat webp]; }; semmcci = derive2 { name="semmcci"; version="1.0.3"; sha256="13p65d97j5b7nn9jrqx4bd2ih7ckrwq8nf2za7ci6lgjrlckx304"; depends=[lavaan]; }; semmcmc = derive2 { name="semmcmc"; version="0.0.6"; sha256="13asqiw3zazh9k3p39582a0bzm00gmagls2w76kvpygilj4r5391"; depends=[MASS msm]; }; - semnar = derive2 { name="semnar"; version="0.8.0"; sha256="0njd0l02lnjr59p2pj14ckfdhlg36xxjs7kqg67ap74hqv2v5pja"; depends=[jsonlite leaflet lubridate parsedate urlshorteneR]; }; + semnar = derive2 { name="semnar"; version="0.8.1"; sha256="18c509yh52sdmvm60p0kzyz86fmzi0by4gnb2jw8nppv8qlnz6zb"; depends=[jsonlite leaflet lubridate parsedate urlshorteneR]; }; semnova = derive2 { name="semnova"; version="0.1-6"; sha256="1vghf8gy0vahwn3nq752wm0rbj33jdy69yqjzin94sk8xa42d0wi"; depends=[lavaan MASS Matrix]; }; semptools = derive2 { name="semptools"; version="0.2.9.6"; sha256="18dvlms719wqnlcdd0qa81ij1a1m3bq94qxn5jf7s2gm9bmvxd5l"; depends=[dplyr lavaan rlang]; }; semsfa = derive2 { name="semsfa"; version="1.1"; sha256="1k6i1m4r9y7j85rlrsgfjm8w15ax4xgf70xyvqwsszmf9950ldxx"; depends=[doParallel foreach gamlss iterators mgcv moments np]; }; @@ -16209,9 +16312,9 @@ in with self; { semver = derive2 { name="semver"; version="0.2.0"; sha256="10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy"; depends=[assertthat Rcpp]; }; semverutils = derive2 { name="semverutils"; version="0.1.0"; sha256="0y3zh8n8bgs3ag8yy9cnp0i0xrn0iqflcbrya70glyb40148w9sw"; depends=[foreach R6]; }; sen2r = derive2 { name="sen2r"; version="1.5.3"; sha256="1gmrk8i6ri2k6w519259qwaa3k0jx73hm7s93dlaxvblkv3m9hzk"; depends=[data_table doParallel foreach geojsonio httr jsonlite raster RcppTOML rgdal sf stars XML]; }; - sendgridr = derive2 { name="sendgridr"; version="0.5.1"; sha256="11lhiif6k40dxg0nj7hs4bi64yj5fq12ns8h009vnisa5fl9hq9d"; depends=[base64enc cli emayili httr jsonlite keyring magrittr usethis]; }; + sendgridr = derive2 { name="sendgridr"; version="0.6.1"; sha256="1lw17lhd3iwkp5mcbpwvwhlzgwk1nbz7xxic8fid8i22z1js22gc"; depends=[base64enc cli emayili httr jsonlite keyring magrittr usethis]; }; sendigR = derive2 { name="sendigR"; version="1.0.0"; sha256="0zc9hbxfvgb9dgmyqj5dsm2pcfykx6sk3wjcbxmpk7shyb34b6yl"; depends=[cicerone data_table DescTools dplyr DT ggplot2 haven Hmisc htmltools magrittr parsedate plotly readxl reticulate RSQLite shiny shinydashboard sjlabelled stringr xfun]; }; - sendmailR = derive2 { name="sendmailR"; version="1.2-1.1"; sha256="1dgxl6wnadlw5b3m4has5zalpk3pd5j70hfps92b9lbx4i7xbmr0"; depends=[base64enc]; }; + sendmailR = derive2 { name="sendmailR"; version="1.3-1"; sha256="1vxs9pdz1qbm7gzzigmvn5ybglakj4fska8dfj94azdvpkijs6hx"; depends=[base64enc]; }; 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]; }; @@ -16224,27 +16327,28 @@ in with self; { sensitivitymv = derive2 { name="sensitivitymv"; version="1.4.3"; sha256="1ga8mf92niiv1z3g3kv5ha5xdd1089aaqp19dz68kv8a396vhy1j"; depends=[]; }; sensitivitymw = derive2 { name="sensitivitymw"; version="2.1"; sha256="1sjq8lxw9iy5s5a19xaxm05wnz9yg4llpbnljydini511pyshzzx"; depends=[]; }; sensmediation = derive2 { name="sensmediation"; version="0.3.0"; sha256="0pmhlc5aqz1vwl4fpn38nkqy63pbq6q62fk9xjja4khrq35zh9yb"; depends=[maxLik mvtnorm]; }; - sensobol = derive2 { name="sensobol"; version="1.1.1"; sha256="19jdjppp4hp917l6syd0964l7gvkh4p3rswznk0v17061l65kiz5"; depends=[boot data_table deSolve ggplot2 lhs magrittr matrixStats randtoolbox Rcpp RcppArmadillo Rdpack Rfast rlang scales stringr]; }; + sensobol = derive2 { name="sensobol"; version="1.1.3"; sha256="0i82zs7cxymic7b7g5q7glrbva25gd61fbhkw8qdp1incsmxxvhi"; depends=[boot data_table deSolve ggplot2 lhs magrittr matrixStats randtoolbox Rcpp RcppArmadillo Rdpack Rfast rlang scales stringr]; }; 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]; }; + sentencepiece = derive2 { name="sentencepiece"; version="0.2.3"; sha256="1cfk450asadp3bbv1px64kf62rdhfak2drnq4y913jjjq4radxwh"; depends=[Rcpp]; }; sentiment_ai = derive2 { name="sentiment.ai"; version="0.1.1"; sha256="1wz34m5imzfwzf1ywidgb1xscsvf9nhri3w3wa2d8r7bk0nvlfjs"; 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]; }; sentopics = derive2 { name="sentopics"; version="0.7.1"; sha256="0xbs2ha6xl37169a8qmbslia8blm87x981q8rcv8p8dvbazy7vbf"; depends=[data_table quanteda Rcpp RcppArmadillo RcppHungarian RcppProgress]; }; sentryR = derive2 { name="sentryR"; version="1.1.0"; sha256="0kz81dbxg4zyns829cjhjm2g88pxzaaxdk7c8qabvl0zgqys2chy"; depends=[httr jsonlite stringr tibble uuid]; }; separationplot = derive2 { name="separationplot"; version="1.3"; sha256="0ggyr4asp86hvdp4bwdkljz9b2gzdxm2y9nbz2srlgh3m4hlz2cs"; depends=[foreign Hmisc MASS RColorBrewer]; }; + sepkoski = derive2 { name="sepkoski"; version="0.0.1"; sha256="1jx1ilbz7md501035vklk5bsw8krg8dn18pwkqynsacqy8wjwl2s"; depends=[]; }; seqCBS = derive2 { name="seqCBS"; version="1.2.1"; sha256="176ggpdcgmpsjixmz0ldknyd0vw120kjyrid3bq2bn4cgkwzb74z"; depends=[clue]; }; seqDesign = derive2 { name="seqDesign"; version="1.2"; sha256="10p8ldj83mvhpcz1yas4xns5qh8zbs533na8nv87phngi8dsb76m"; depends=[survival]; }; - seqHMM = derive2 { name="seqHMM"; version="1.2.1-1"; sha256="1gxrv0mhja0mqvm69s4mrvb31wxlk60v47a8vvhcrpa8l0b2kb4j"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; }; + seqHMM = derive2 { name="seqHMM"; version="1.2.3"; sha256="0pyr2a54g5709z57cw1hm33q06i3h0yhdinkxqiqf2a3jm7ih975"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; }; seqICP = derive2 { name="seqICP"; version="1.1"; sha256="1dfhl7g47icjw38p9c0hyvnn3pwzw7pndywk22vgcyfhiz23xjcp"; depends=[dHSIC mgcv]; }; 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.3"; sha256="0vyrs4i3q3lyqx0b1as7h2rm3s5kbapq6jxzag8dwhf0ch7yz8gv"; depends=[assertthat cate clue irlba matchingR pdist sva]; }; seqhandbook = derive2 { name="seqhandbook"; version="0.1.0"; sha256="0zncpjabazci92wzw126i491669gidkyiw7zjp7iw23m6jaf71l4"; depends=[TraMineR]; }; - seqimpute = derive2 { name="seqimpute"; version="1.7"; sha256="05bxxin46zf843fz5l1zspmq8agfp6xdy57d4ybmkzgdnf47hrw8"; depends=[Amelia cluster dfidx doRNG doSNOW dplyr foreach mice mlr nnet plyr ranger rms stringr swfscMisc TraMineR]; }; - seqinr = derive2 { name="seqinr"; version="4.2-16"; sha256="0cj07b7km5mla63qhbkxg1mnqq6vh79lsyyfpnbm29gw68w2bwy4"; depends=[ade4 segmented]; }; + seqimpute = derive2 { name="seqimpute"; version="1.8"; sha256="1vivs790zbwm8c7fwifz0nj0n9wzjmr8whz0f4pwp44gvcickxwn"; depends=[Amelia cluster dfidx doRNG doSNOW dplyr foreach mice mlr nnet plyr ranger rms stringr swfscMisc TraMineR]; }; + seqinr = derive2 { name="seqinr"; version="4.2-23"; sha256="14zv47cdrx9rpyxzccyikp0zxvcqrviw7bid0qhiixvji4bp88dg"; depends=[ade4 segmented]; }; seqmagick = derive2 { name="seqmagick"; version="0.1.5"; sha256="0h1vdsx88k3mpajfv0cgswk2s1560zm6y776b4dqrdkvkcgdbb3g"; depends=[Biostrings magrittr]; }; - seqminer = derive2 { name="seqminer"; version="8.4"; sha256="1mbx1hw9dhgry7hhan43g6aiz2lyd5api7wxq3fwajyzjrc6p1g8"; depends=[]; }; + seqminer = derive2 { name="seqminer"; version="8.5"; sha256="1ki8b4bgb3ky9y3x2g56h7i94lk345awgwkg10lys022jxhm30d7"; depends=[]; }; seqmon = derive2 { name="seqmon"; version="2.4"; sha256="1aqrg9aqvsabg5mm9jfj5vaxxaapfs1qw3yyzbx7vsspcgjdhyca"; depends=[]; }; seqtest = derive2 { name="seqtest"; version="0.1-0"; sha256="1bdfww9szh7h278id5xpfc39mxkcix3yvsdwc68wx3q3x0wxhqhq"; depends=[]; }; sequences = derive2 { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; }; @@ -16257,7 +16361,7 @@ in with self; { serpstatr = derive2 { name="serpstatr"; version="0.2.0"; sha256="1l7hj4npnggmg6fsk5lydg6vrad791hvmv9rhx7yb0nsa1pzi155"; depends=[httr]; }; serrsBayes = derive2 { name="serrsBayes"; version="0.5-0"; sha256="1w8fs9k4zhy0hwkm30dvi360n28cl2gn9vdqaak64g0nlvb9jy1w"; depends=[Matrix Rcpp RcppEigen truncnorm]; }; servosphereR = derive2 { name="servosphereR"; version="0.1.1"; sha256="0m1fjd3f1s2ss54xmcrm3p0c33hhi2dj0vim790g4y0mw2aicc8l"; depends=[data_table dplyr magrittr purrr rlang]; }; - servr = derive2 { name="servr"; version="0.24"; sha256="11x0857m3xzdbzr4z0vx4fcdk36arfagyf2qgamvprich0qisknr"; depends=[httpuv jsonlite mime xfun]; }; + servr = derive2 { name="servr"; version="0.25"; sha256="0g77lpyfjaibcpqb3z723z1p82msjdnc74f2n5l740z91560vbp6"; depends=[httpuv jsonlite mime xfun]; }; sesem = derive2 { name="sesem"; version="1.0.2"; sha256="0b1xzv38wpkhhlq87xrvlh45b8ksbi8bg4ar5hrf8gxa19r9rmi5"; depends=[gplots lavaan mgcv]; }; sessioninfo = derive2 { name="sessioninfo"; version="1.2.2"; sha256="1jy7n37qnrb4fgzmn8s8yf7kv29yw27x8zklwf8qdb2kgj2q6qpm"; depends=[cli]; }; set = derive2 { name="set"; version="1.2"; sha256="0f36dp9k0nxp1amsd7ybwgbv0vxvgd1kns7cbfsbsh0kljxyplzp"; depends=[do]; }; @@ -16266,20 +16370,19 @@ in with self; { 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]; }; - sf = derive2 { name="sf"; version="1.0-8"; sha256="0cl7m47ar3iw95rpwpmjl23frdbscxa15q39mlzmwswxwy871p1x"; depends=[classInt DBI magrittr Rcpp s2 units]; }; + sf = derive2 { name="sf"; version="1.0-9"; sha256="0fq1v2ksnllyd5yx7ch8f298aqiys4v6xacswy0h4xb418dcgh45"; depends=[classInt DBI magrittr Rcpp s2 units]; }; sfaR = derive2 { name="sfaR"; version="0.1.1"; sha256="1j8ans7lhssq64crp2fwfbl6n09h7zl7y6s8zwkdmxgvydvh9n22"; 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]; }; sfarrow = derive2 { name="sfarrow"; version="0.4.1"; sha256="1hslyha1w5x1ncawbwbx792cqa3031v26g9lssmb0n1hihzvfp8g"; depends=[arrow dplyr jsonlite sf]; }; sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; }; 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]; }; - sfdep = derive2 { name="sfdep"; version="0.2.0"; sha256="04arbp8n1vpl5kksc0893vv8qh81m2mhb8fwk55r6y7zb6wpphwk"; depends=[cli rlang sf spdep]; }; sfheaders = derive2 { name="sfheaders"; version="0.4.0"; sha256="0ig02nszrs6fkjkrkqibp23n4a8qr4i09yz7l741yjd0308ddg46"; depends=[geometries Rcpp]; }; sfhotspot = derive2 { name="sfhotspot"; version="0.7.0"; sha256="1j3588zj5z9d82ci3vrwz22gaq47lrkkl5fqqys50i46z4jazcn9"; depends=[ggplot2 rlang sf SpatialKDE spdep tibble]; }; sfinx = derive2 { name="sfinx"; version="1.7.99"; sha256="14v47y00qwvc2s0vzjw19hwn85nzj8lna539c75qq6zkn6kir6va"; depends=[]; }; sfnetworks = derive2 { name="sfnetworks"; version="0.6.1"; sha256="1klfsp49q6ysbam8f8w3x60y2zml0hmlz1rbskw8s8gc1jaicjgq"; 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-13"; sha256="0622yf4fl1b1zm988dfwdrhq7pg0rllhm8wz1pqdmp72glsi05x8"; depends=[]; }; + sfsmisc = derive2 { name="sfsmisc"; version="1.1-14"; sha256="1vxkziprndrzc5sdz36i20qdqfcyw8m87vpxm3jccf6pqbc45adw"; depends=[]; }; sft = derive2 { name="sft"; version="2.2-1"; sha256="0fxz64ba58n6ghfqsgq64n1c7qkvi8c3lsa86732mil9w71yxw33"; depends=[fda SuppDists]; }; sftime = derive2 { name="sftime"; version="0.2-0"; sha256="1ymi60ag8kqb3293bdcvb83zwsgrz000ylifjvlpzzmh1xsisanq"; depends=[sf]; }; sftrack = derive2 { name="sftrack"; version="0.5.3"; sha256="1dj21n7iqv334va40p4v3rxh87qbpwgq0062f67kpa3jd16xzkmk"; depends=[sf]; }; @@ -16299,7 +16402,7 @@ in with self; { sgolay = derive2 { name="sgolay"; version="1.0.2"; sha256="04hbgwx92k4gncdgyglv7kdxc28qhs7ap868z2rvw89hd96ai6fx"; depends=[signal]; }; sgpv = derive2 { name="sgpv"; version="1.1.0"; sha256="0w0slnnw239a34c0h7xr76c4m0rfwl0hq61g9n12vzxd6lfh3gqz"; depends=[]; }; sgr = derive2 { name="sgr"; version="1.3.1"; sha256="0m7rl3yii6zz4p21aiaifj1ram6gi6x5kywpyx9yjan79180q8h7"; depends=[MASS]; }; - sgsR = derive2 { name="sgsR"; version="1.3.1"; sha256="0n02j918xy2a7nfslrgbnza0dlm4xcg3x6j9v4cbxkd4f7a5hw2p"; depends=[BalancedSampling clhs dplyr ggplot2 SamplingBigData sf spatstat_geom terra tidyr]; }; + sgsR = derive2 { name="sgsR"; version="1.3.2"; sha256="13k2h5mxnci977yx1fav9kknrqfbq4bnw2204bcpdkrp8nf0j0rh"; depends=[BalancedSampling clhs dplyr ggplot2 SamplingBigData sf spatstat_geom terra tidyr]; }; sgstar = derive2 { name="sgstar"; version="0.1.2"; sha256="0b3bw10lf5h4kgg3c0s3lxsafaffhn8gc9kxmg7bg35lbxv0r1vn"; depends=[dplyr ggplot2 tidyr]; }; sgt = derive2 { name="sgt"; version="2.0"; sha256="0qb3maj5idwafs40fpdfrwzkadnh5yg8fvfzfs51p9yy69kbmlkx"; depends=[numDeriv optimx]; }; shades = derive2 { name="shades"; version="1.4.0"; sha256="1zg95sjhrfvbdlfc387g9p0vnb8nb6agdk1mb3wq3kwkm2da0bqj"; depends=[]; }; @@ -16309,22 +16412,24 @@ in with self; { shallot = derive2 { name="shallot"; version="0.4.10"; sha256="05ciafpahcrsh9kwg1yqwbmanvkbv1i1cjjpvq3w4cdqkhn4fam7"; depends=[commonsMath rscala]; }; shape = derive2 { name="shape"; version="1.4.6"; sha256="0yqbrrx2ywmfl99s6d1n6jblc63k1mxbiqyv8y0kq8jws1g3w45r"; depends=[]; }; shapeNA = derive2 { name="shapeNA"; version="0.0.2"; sha256="1ivp8kvnacr2fx3rs7ckzdpinb6bifzzw7riskzj95lygjlkvabw"; depends=[]; }; + shapeR = derive2 { name="shapeR"; version="1.0-1"; sha256="02al1g9ycfb63mcx4s16abniggl825ihjanx6silbpv6dn6g1ms8"; depends=[jpeg MASS pixmap plotrix vegan wavethresh]; }; shapefiles = derive2 { name="shapefiles"; version="0.7.2"; sha256="03sdcxbah05x0j6cpygx3ivkzrdlz2c0frxi30cinb05q6a41yjb"; depends=[foreign]; }; 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]; }; - shapviz = derive2 { name="shapviz"; version="0.2.2"; sha256="0avsj51fm42xd9wnp8qlprgs9f7dzh7ni33r453igw9w06ff850s"; depends=[ggbeeswarm ggfittext gggenes ggplot2 ggrepel rlang xgboost]; }; - shar = derive2 { name="shar"; version="2.0.0"; sha256="1zg7hh72inqdz39ddrnsc5ddh5qk5qwr3prb17p9jfa80apyp5px"; depends=[classInt spatstat_core spatstat_geom spatstat_random terra]; }; - sharp = derive2 { name="sharp"; version="1.2.0"; sha256="113z21rxa57q527sbfivhdfdgdd0zdbrfcb8x6jpbzrz232n0lyr"; depends=[fake glassoFast glmnet huge igraph MASS mclust Rdpack withr]; }; + shapviz = derive2 { name="shapviz"; version="0.4.0"; sha256="0pprjqm33ydm0sshgxcafwd3g0lms24ix7nha1h7pkj6d1nimh40"; depends=[ggfittext gggenes ggplot2 ggrepel rlang xgboost]; }; + shar = derive2 { name="shar"; version="2.0.2"; sha256="0xny1nxmlc4cjn3g0sk2ykwr3ijksadrnmr272d73wypakjfs6is"; depends=[classInt spatstat_explore spatstat_geom spatstat_model spatstat_random terra]; }; + sharp = derive2 { name="sharp"; version="1.2.1"; sha256="0f7zavv0pk5nm81208cgxhmamp6vbpmwinv26mxwpaf7w9j5a2sk"; depends=[beepr fake glassoFast glmnet igraph mclust Rdpack withr]; }; sharpData = derive2 { name="sharpData"; version="1.4"; sha256="1pnza52wqczjds4vp2fy9ky41y7lyj9ywam11nsr0mpv63jglnc5"; depends=[KernSmooth quadprog]; }; sharpPen = derive2 { name="sharpPen"; version="1.8"; sha256="11pvah41gi3xhb1n30k8ql28m3f47nnsd37z3mcjs0pv1lbacps2"; depends=[glmnet KernSmooth MASS Matrix np]; }; sharpeRratio = derive2 { name="sharpeRratio"; version="1.4.3"; sha256="0ndqckz7pi099yynzfwzcbz9jcz93bb9jcd2a4px2sjbagfmx7ag"; depends=[ghyp Rcpp]; }; sharpr2 = derive2 { name="sharpr2"; version="1.1.1.0"; sha256="1r7anfr296l5sbhgry6rb15hlca6mpcm24qssdzz9bckavyfvqgi"; depends=[Matrix mvtnorm]; }; - sharpshootR = derive2 { name="sharpshootR"; version="1.11"; sha256="1z1w4ci76d3yasdxhsspn7ybypcigmvzcfm5m12nfjl3441zp9zh"; depends=[ape aqp circular cluster curl digest e1071 Hmisc lattice plyr RColorBrewer reshape2 scales soilDB sp stringi vegan]; }; + sharpshootR = derive2 { name="sharpshootR"; version="1.12"; sha256="1jilrpnqmmxmz4w7508s5gb8yyggprr3pxm1xh8xq8zgdwh75i3j"; depends=[ape aqp circular cluster curl digest e1071 Hmisc lattice plyr RColorBrewer reshape2 scales soilDB sp stringi vegan]; }; sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; }; shattering = derive2 { name="shattering"; version="1.0.7"; sha256="0dmb57pdgzwm001gfm1zm8ba7x71bp2vjk4ml0cy4r05hpdswfh3"; depends=[e1071 FNN NMF pdist pracma rmarkdown Ryacas slam]; }; shazam = derive2 { name="shazam"; version="1.1.2"; sha256="08zz5sr8vpnibpi6n3s16grcl0vhg2gw27p79h9mkqvz1d5hy7ql"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators KernSmooth lazyeval MASS progress rlang scales seqinr stringi tidyr tidyselect]; }; shelltrace = derive2 { name="shelltrace"; version="3.5.1"; sha256="1xgbavaa26185i6q3907ds3bzq4xrw027x1sw5vsybqrxdz04jiz"; depends=[bmp tiff xlsx]; }; + sherlock = derive2 { name="sherlock"; version="0.5.1"; sha256="0r6abbkh84ds189lmhn3n8r7lmfa5jz47zm0niz67liymahg8i3n"; depends=[cowplot dplyr forcats ggh4x ggplot2 magrittr openxlsx plotly readr rlang scales stringr]; }; shidashi = derive2 { name="shidashi"; version="0.1.4"; sha256="1pp0vbwb3j5dvwf6n6ny7hgwb1c90vz2inrg8s92332bn5d0jlmi"; depends=[digest fastmap formatR httr jsonlite shiny yaml]; }; shiftR = derive2 { name="shiftR"; version="1.5"; sha256="18y2qzqx8hd6yph1wnsq4ygm16pcdszynh174xsrxrhvx2h9mi4x"; depends=[]; }; shinipsum = derive2 { name="shinipsum"; version="0.1.0"; sha256="0d94189hmg0bl8x0s8fpba5gcvb95sr9k9lbp3kk8482fc5h147n"; depends=[attempt DT dygraphs ggplot2 magrittr plotly]; }; @@ -16345,13 +16450,14 @@ in with self; { shinyCohortBuilder = derive2 { name="shinyCohortBuilder"; version="0.1"; sha256="0hwfaw0j7c2m071q5s9ddmn73dqvm4m443pkr20y2i83872wcvxj"; depends=[bslib cohortBuilder dplyr ggiraph ggplot2 glue highr htmltools jsonlite magrittr purrr rlang shiny shinyGizmo shinyWidgets tibble tryCatchLog]; }; 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]; }; + shinyDatetimePickers = derive2 { name="shinyDatetimePickers"; version="1.0.0"; sha256="1a19jll6dips6gca363byyf97aidbishnb3jynylgm9ys8va6rap"; depends=[htmltools lubridate reactR 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.3"; sha256="11kjq0vw5c98lzrg80m9w917lkgw5im2h9wgk1b84vlaxrjy2wja"; depends=[fs htmltools jsonlite shiny tibble]; }; shinyGizmo = derive2 { name="shinyGizmo"; version="0.2"; sha256="0z4f2z6czijyjlysn2i1fx4bf8996pqv2ldabycak37hgqhb9bbc"; depends=[glue htmltools htmlwidgets magrittr purrr shiny shinyWidgets]; }; shinyGovstyle = derive2 { name="shinyGovstyle"; version="0.0.8"; sha256="1czyz51k0xm62b9bzcsygslm2nd3fnmll4wjxwimlngy00rnjnng"; depends=[htmltools jsonlite shiny shinyjs]; }; shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.2.0"; sha256="1n7c7dvvb9kqay2phcf0bkwi990x1cjl7js6pq05xx7rli5bc5h4"; depends=[dplyr heatmaply htmltools plotly readxl rmarkdown shiny xtable]; }; - shinyHugePlot = derive2 { name="shinyHugePlot"; version="0.2.0"; sha256="0bz4gf14xay7qc10x6zbgky9sviyic8r89igq25mvdnn47990ml6"; depends=[assertthat bit64 data_table dplyr htmltools jsonlite lazyeval nanotime plotly purrr R6 rlang shiny shinyjs stringr tibble tidyr tidyselect]; }; + shinyHugePlot = derive2 { name="shinyHugePlot"; version="0.2.2"; sha256="1d0rij3zi9bs5ziwfplq4k1689ibqwlr9zq3v0np2j2kkfbh63gf"; depends=[assertthat bit64 data_table dplyr htmltools jsonlite lazyeval nanotime plotly purrr R6 rlang shiny shinyjs stringr tibble tidyr tidyselect]; }; shinyIRT = derive2 { name="shinyIRT"; version="0.1"; sha256="01x7nhjs1dx2ldwznhbavc5vzqhgkn73xg395vlf2hgzbxa2ydvj"; depends=[irtoys magrittr mirt psych readxl shiny shinycssloaders shinydashboard]; }; shinyKGode = derive2 { name="shinyKGode"; version="1.0.5"; sha256="004zwz4kqfijzvvwkq8v1gi25w1wrdlg8230g93w36gbi6cl2vk1"; depends=[ggplot2 gridExtra KGode mvtnorm pracma pspline reshape2 shiny shinyjs XML]; }; shinyKnobs = derive2 { name="shinyKnobs"; version="0.1.3"; sha256="1rxlvq4vr87krf7d6mpx0y53hyz8q1jnx6nv7mlhc1ck13q6fgac"; depends=[htmltools shiny]; }; @@ -16359,7 +16465,7 @@ in with self; { 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.2.0"; sha256="1rvv5lcbb17i263xx1zn9524iwpmw56xwh0b2qii8096l20w6cnd"; depends=[shiny]; }; - shinyMobile = derive2 { name="shinyMobile"; version="0.9.1"; sha256="1v3qs6s3k7s1rnliv06ljx06cgkw154xbl0c1aiv9jjqq16rxh01"; depends=[htmltools httr jsonlite magrittr shiny]; }; + shinyMobile = derive2 { name="shinyMobile"; version="1.0.0"; sha256="0wwmcirnmdwz43900c8x93ycbrypx40xqvm2hpafmkzlljav47fb"; depends=[gplots 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]; }; shinyNORRRM = derive2 { name="shinyNORRRM"; version="0.8.6"; sha256="1cb6n3bwqfygqc0p25z62nmrrns6hm2by4chi45sl898is5hkhdn"; depends=[pracma shiny shinythemes shinyWidgets Ternary]; }; @@ -16369,14 +16475,14 @@ in with self; { shinyRadioMatrix = derive2 { name="shinyRadioMatrix"; version="0.2.1"; sha256="195b1990r3b91f4i4azai0i4lxjgw2ngbzdywiy35c1fnmiyy882"; depends=[shiny]; }; shinySIR = derive2 { name="shinySIR"; version="0.1.2"; sha256="1g2xcm0n7chswrnw9zq3wz6mimzzf6avhkp1rcd24ga809346jcd"; depends=[deSolve dplyr ggplot2 shiny tidyr]; }; shinySearchbar = derive2 { name="shinySearchbar"; version="1.0.0"; sha256="1v80380vym31aw0i1ghwlbdi2xkf3n59w2as62ywqi79025x3w6y"; depends=[jsonlite shiny]; }; - shinySelect = derive2 { name="shinySelect"; version="1.2.0"; sha256="0m43082nl81qm7cnm4wklm6g9y4wxpjg6k5pk9ac89zgmsbffjsj"; depends=[fontawesome htmltools reactR]; }; + shinySelect = derive2 { name="shinySelect"; version="1.3.0"; sha256="16fnqhw2kd7mamhc4qnravrybbi2fbxkdmdpk07ycnasn00fprp0"; depends=[fontawesome htmltools reactR]; }; shinyShortcut = derive2 { name="shinyShortcut"; version="0.1.0"; sha256="101wz9s4rk7fbaqgm0r2v3v8za20vdxwq4vhkz8xr7y5pr65sxiq"; depends=[]; }; - shinyStorePlus = derive2 { name="shinyStorePlus"; version="0.6"; sha256="1j9ilkgr7ar4hdv2lwsvai53s9l7p2scy32qjd0y7d8irayqwrmv"; depends=[htmltools jsonlite shiny]; }; + shinyStorePlus = derive2 { name="shinyStorePlus"; version="0.8"; sha256="0brvqv63wyalkzyacn51s2n4ny5m04y4vykl03v1hrxngg7rdrgs"; depends=[htmltools jsonlite shiny]; }; shinyTempSignal = derive2 { name="shinyTempSignal"; version="0.0.3"; sha256="0lw59hy3hc6h6262bsfk1yz3zqfjfzc8f6smyq0f7yk5vkkiw359"; depends=[ape Cairo config DescTools forecast ggplot2 ggprism ggpubr ggtree golem shiny shinydashboard shinyjs stringr treeio]; }; shinyTime = derive2 { name="shinyTime"; version="1.0.3"; sha256="04vpq9fpp1iwila9l33cljig3hfyw7lsg03fqny0q260ka8chhgz"; depends=[htmltools shiny]; }; shinyToastify = derive2 { name="shinyToastify"; version="2.0.0"; sha256="0ipqwgl89pjiycwg78p0db45lbzry989kn6aqjsf79lpvghnk5qs"; depends=[fontawesome htmltools reactR shiny]; }; shinyTree = derive2 { name="shinyTree"; version="0.2.7"; sha256="0jfx2capckv7hf2yx3fn8i4rcmhi222ah91jnmhg497x8wgz31s3"; depends=[htmlwidgets jsonlite promises shiny stringr]; }; - shinyWidgets = derive2 { name="shinyWidgets"; version="0.7.4"; sha256="09cjbiv8cp4ipl2q3l4cr2vbbf1shn3mx5d80ipgklihc92lnp03"; depends=[anytime bslib htmltools jsonlite rlang sass shiny]; }; + shinyWidgets = derive2 { name="shinyWidgets"; version="0.7.5"; sha256="1ls28r6dbvi4pml1mxakn327dzl0l71pkaw5rm9n80jd5npq9vmz"; depends=[anytime bslib htmltools jsonlite rlang sass shiny]; }; shinyXYpad = derive2 { name="shinyXYpad"; version="0.2.0"; sha256="08acqbh41379p2jh0wc30m4h7rlx81cf578qc604jxnsvilvjr9n"; depends=[shiny]; }; shinyaframe = derive2 { name="shinyaframe"; version="1.0.1"; sha256="1flhgsm4q7p5acb41v73pf8ni92y9dwdppxjb9czlz1sxwf03p1s"; depends=[htmltools htmlwidgets shiny]; }; shinyalert = derive2 { name="shinyalert"; version="3.0.0"; sha256="1gws8vshnqngm55rnw22qjlqsn9d240p734dnjvsv96d22b8bsnl"; depends=[htmltools knitr shiny uuid]; }; @@ -16390,7 +16496,7 @@ in with self; { shinydashboard = derive2 { name="shinydashboard"; version="0.7.2"; sha256="0hrqkwlpb8rnmp5j74p134g4c4cl16icmwc2ip6k1634fa2y8vm5"; depends=[htmltools promises shiny]; }; shinydashboardPlus = derive2 { name="shinydashboardPlus"; version="2.0.3"; sha256="10sdb1vddx2ij867pqijr63l4233hw1vnn7mzbs0z23g77x8ra29"; depends=[fresh htmltools lifecycle shiny shinydashboard waiter]; }; shinydisconnect = derive2 { name="shinydisconnect"; version="0.1.0"; sha256="14m83y1iv7qvs1hilc0d18q46qnsciflypgm4dsj7vlvh7ilpdvm"; depends=[checkmate glue htmltools shiny]; }; - shinydlplot = derive2 { name="shinydlplot"; version="0.1.3"; sha256="1mvhx8f5800d33vl9kgs5mib003aqshb8vgfy9h4qlgxyx35zssk"; depends=[htmltools htmlwidgets plotly shiny shinyBS shinyjs]; }; + shinydlplot = derive2 { name="shinydlplot"; version="0.1.4"; sha256="1gxr98p2zyvwa6q8a80bz4h1pkgbdn58cwqbd19dbn4liszfxsy8"; depends=[htmltools htmlwidgets plotly shiny shinyBS shinyjs]; }; shinydrive = derive2 { name="shinydrive"; version="0.1.3"; sha256="16yfc9grmjzkpl6xzqn5rpkqd2qnlj4qdgia8img794l6j0y8dgp"; depends=[DT htmltools knitr R_utils shiny yaml]; }; shinyfilter = derive2 { name="shinyfilter"; version="0.1.1"; sha256="00n1l2jzzviz0f2gialj4zc6xfymzqi99raqhmlm0x9fbj1syfga"; depends=[reactable shiny shinyBS shinyjs stringr]; }; shinyfullscreen = derive2 { name="shinyfullscreen"; version="1.1.0"; sha256="0wx3jhma27701k4cmmls46rfvnix5zylxf09wdn7h6v3zdwvicq8"; depends=[jsonlite shiny]; }; @@ -16399,7 +16505,7 @@ in with self; { shinyhttr = derive2 { name="shinyhttr"; version="1.1.0"; sha256="1snrl7bg1bc5jxqs1c5a2ir6qnf1nq576aigk19k0ms4gb9hh66m"; depends=[httr shinyWidgets]; }; shinyjqui = derive2 { name="shinyjqui"; version="0.4.1"; sha256="135gwz7syyb6pbn0lkvmq0v1c6r1zivavnqhi1rnzbbzlysi27v1"; depends=[htmltools htmlwidgets jsonlite rlang shiny]; }; shinyjs = derive2 { name="shinyjs"; version="2.1.0"; sha256="1id9gsrkr28xl80a8794in17rxmmz06zqvd5hlns7mqz3fzhrhky"; depends=[digest jsonlite shiny]; }; - shinylight = derive2 { name="shinylight"; version="1.0.0"; sha256="1z03gqq57j4j3g8k41zhfbfsvfxd7rfciw1mfh87wqsz621y00xm"; depends=[httpuv jsonlite later]; }; + shinylight = derive2 { name="shinylight"; version="1.1.2"; sha256="0y2gmi8y5b595dca1sch9mzhq2mbbj7mv879md0ajc16ycfi17rp"; depends=[httpuv jsonlite later]; }; shinyloadtest = derive2 { name="shinyloadtest"; version="1.1.0"; sha256="0684p9anbc3qdn4rqkxp33nm0d04zb264b3blwa23pa5akis2klq"; depends=[curl dplyr ggplot2 httpuv jsonlite magrittr R6 rlang scales stringr svglite vroom websocket xml2]; }; shinylogs = derive2 { name="shinylogs"; version="0.2.1"; sha256="1w19z0zw2k3ni7ckg04q7j0jx4k3cm490z0qccj1smq01wn3czjj"; depends=[anytime bit64 data_table digest htmltools jsonlite nanotime shiny]; }; shinymanager = derive2 { name="shinymanager"; version="1.0.410"; sha256="0nl672dgwj34wm4i3pxk28lv6qw9xsgg3hm0h78q3zdgk8a33kdn"; depends=[billboarder DBI DT htmltools openssl R_utils R6 RSQLite scrypt shiny]; }; @@ -16425,6 +16531,7 @@ in with self; { shinyvalidate = derive2 { name="shinyvalidate"; version="0.1.2"; sha256="0mps6a1rkadbxf11lcxx4njfwbgpzyx63wndhlwb0dzyz5d02la7"; depends=[glue htmltools rlang shiny]; }; 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]; }; + shopifyadsR = derive2 { name="shopifyadsR"; version="0.1.0"; sha256="0vd8md4w4v05l9d5v7kx21kw3rkbkx8iqf4da44x95kfnnxiqjcx"; depends=[jsonlite]; }; 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="2.3.0"; sha256="0vhgbj4q4fgz607yzw264s0r9kmmjxyah0siw2qf4pdimjvb9l7i"; depends=[ggplot2 LambertW minpack_lm purrr tidyr]; }; @@ -16434,7 +16541,7 @@ in with self; { showtextdb = derive2 { name="showtextdb"; version="3.0"; sha256="0hlnc3fhgrdkd46n7hb6id0gg1v0bf8s4679nrr7rchyp455szq2"; depends=[sysfonts]; }; shp2graph = derive2 { name="shp2graph"; version="0-5"; sha256="1l9mg98hkb0bvr5dzd2p26g8mw5hqjxrym2gmbm10kyapvccfk56"; depends=[igraph maptools sp]; }; shrink = derive2 { name="shrink"; version="1.2.2"; sha256="0d80a0qqrsb9ybzqvg3m6a9r16ky7hqchq0hjvj8ipk430mmxdjm"; depends=[MASS mfp rms survival]; }; - shrinkDSM = derive2 { name="shrinkDSM"; version="0.1.0"; sha256="01yvs1shsp7npfm9w1caprb1x8w42zlzswc2fk9y6q340i51kfzm"; depends=[coda Rcpp RcppArmadillo RcppProgress shrinkTVP stochvol]; }; + shrinkDSM = derive2 { name="shrinkDSM"; version="0.2.0"; sha256="0vl3cl9njl0irz9hsli7xkf49jawkywww91j5gxlmz5vdrxnwz9c"; depends=[coda Rcpp RcppArmadillo RcppProgress shrinkTVP stochvol]; }; shrinkTVP = derive2 { name="shrinkTVP"; version="2.0.6"; sha256="1p9s4n3dw95ghcma71ik5zidqk54cbsd30csnbqp2w377241lxd3"; depends=[coda GIGrvg Rcpp RcppArmadillo RcppProgress stochvol zoo]; }; shroomDK = derive2 { name="shroomDK"; version="0.1.1"; sha256="1w1zhrr2jygys2slnnlmdh7py6rfs485nhdr3h9r964daggxb42q"; depends=[httr jsonlite]; }; shuffle = derive2 { name="shuffle"; version="1.0.1"; sha256="0aqb11h340picx7z2jg3k46l3pr6fkknlpyzc0z89hhrc90pss48"; depends=[]; }; @@ -16453,7 +16560,7 @@ in with self; { sigInt = derive2 { name="sigInt"; version="0.2.0"; sha256="1y3qbfsynssam05q4947zqd0dkrpcnq5pla409i3xy511wv9702d"; depends=[Formula MASS maxLik pbivnorm randomForest stringr xtable]; }; sigclust = derive2 { name="sigclust"; version="1.1.0.1"; sha256="1q3jdalm7cbsl78gssl3jsifh56wyczrlx2ya4p74r4fb6sv9kga"; depends=[]; }; sigmajs = derive2 { name="sigmajs"; version="0.1.5"; sha256="1d26llpgnj687b8rwgbyhw88zakp334n4a9gabf72qwrg4awm1v5"; depends=[crosstalk dplyr htmltools htmlwidgets igraph jsonlite magrittr purrr scales shiny]; }; - sigminer = derive2 { name="sigminer"; version="2.1.8"; sha256="0scc56xdv1mqz7jskyd46apqpggl0bgm0xs03q65r7x3rylb3fm8"; depends=[cli cowplot data_table dplyr furrr future ggplot2 ggpubr maftools magrittr NMF purrr Rcpp rlang tidyr]; }; + sigminer = derive2 { name="sigminer"; version="2.1.9"; sha256="1pyvyn41xfvdsaij5qz70jr1b04s9kqzg8nx0ifqakdlpg82hbx9"; depends=[cli cowplot data_table dplyr furrr future ggplot2 ggpubr maftools magrittr NMF purrr Rcpp rlang tidyr]; }; sigmoid = derive2 { name="sigmoid"; version="1.4.0"; sha256="067ygikaaniikig1ypd6ry187981xar7i539917zf0avszshisxq"; depends=[]; }; signal = derive2 { name="signal"; version="0.7-7"; sha256="0qaf39vfmhn3d0bdjqd805ayfkaj48dkmf5dqd47bpk7dp21b837"; depends=[MASS]; }; signalHsmm = derive2 { name="signalHsmm"; version="1.5"; sha256="1d4v6cbvcbi8pb5zmn58s01h3jb0kv7yr7qvcnx4p2v82knvhik7"; depends=[Rcpp seqinr shiny]; }; @@ -16463,6 +16570,7 @@ in with self; { 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]; }; + siie = derive2 { name="siie"; version="0.3.0"; sha256="0xqhi8xbfccm09iwsnxva4idwk50hm4z8skyhbbj4727c71117h1"; depends=[data_table]; }; siland = derive2 { name="siland"; version="2.0.5"; sha256="1896zlfzps35mvhzbd4invpdp39cxhs13lklx56k35l4v2zvh24g"; depends=[fasterize ggforce ggplot2 lme4 raster reshape2 sf sp]; }; silicate = derive2 { name="silicate"; version="0.7.0"; sha256="1x8l6wvymx3scwzym9h6b5wgprjinzp6m2cs6r7xn9aqcr39499a"; depends=[crsmeta decido dplyr gibble gridBase magrittr purrr rlang tibble unjoin]; }; sim1000G = derive2 { name="sim1000G"; version="1.40"; sha256="1avq6xfc34izavvp9vb5ccc2b9nc4m7cwr06ygnsmpgwi5nswbb8"; depends=[hapsim MASS readr stringr]; }; @@ -16476,10 +16584,10 @@ in with self; { simITS = derive2 { name="simITS"; version="0.1.1"; sha256="0b62lvknfqli6ki4w360b1ih9nsm6pinaqskgra6vl2nzsim3sal"; depends=[dplyr rlang]; }; simMP = derive2 { name="simMP"; version="0.17.3"; sha256="1pzg79dd08ds3pfzxnk9h95gaibicv00mnm0jb4i8v5is4gzrdhr"; depends=[Biostrings BSgenome doParallel foreach GenomeInfoDb GenomicRanges IRanges XVector]; }; simMSM = derive2 { name="simMSM"; version="1.1.42"; sha256="0nxs3n64mh1sbnbmqbj7hm8d43z0cja8da9yhsygl60r1jyl98xd"; depends=[mvna survival]; }; - simMetric = derive2 { name="simMetric"; version="0.1.0"; sha256="070va0k6inhpvzvg6zakf1w92r0547c4xhlm9vx8k2rqz1snlsd4"; depends=[assertthat dplyr purrr]; }; + simMetric = derive2 { name="simMetric"; version="0.1.1"; sha256="09jpjlvmvb9z2v71n8cb14b0zfi78k609c7xvs78rghdiswqfv23"; depends=[assertthat dplyr]; }; simPATHy = derive2 { name="simPATHy"; version="0.6"; sha256="0xiqcrdnn7pcbhykkjabfym6hqq9hrnjigav8nshs143s9wflw1q"; depends=[ggm graph gRbase htmlwidgets igraph mvtnorm qpgraph R_utils shiny shinydashboard]; }; simPH = derive2 { name="simPH"; version="1.3.13"; sha256="086060f78f1dmpa6cyhx160blchckplw04gs6997f1hwzswci2l2"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; }; - simPop = derive2 { name="simPop"; version="2.1.1"; sha256="0klhn5w908dl4djnddja8lfrzsk92b244vv68afp502dak7g7f95"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach lattice MASS matrixStats nnet party ranger Rcpp RcppArmadillo vcd VIM wrswoR xgboost]; }; + simPop = derive2 { name="simPop"; version="2.1.2"; sha256="0x66i2k9s16lsjm79sjszkqa1j9nzwdnbb19lpgxbf1fcdwm5lrh"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach lattice MASS matrixStats nnet party ranger Rcpp RcppArmadillo vcd VIM wrswoR xgboost]; }; simTargetCov = derive2 { name="simTargetCov"; version="1.0.1"; sha256="0gdqqwg9i2hga6l4s5x7wbbsm20b3sgwrci1g6hc04x1h9aawiw2"; depends=[MASS]; }; simTool = derive2 { name="simTool"; version="1.1.7"; sha256="0q093dlfj23zq3w4schn1ycff79vgzr2s3wgbz2qz4s3b7fddk70"; depends=[dplyr purrr tibble tidyr vctrs]; }; simboot = derive2 { name="simboot"; version="0.2-6"; sha256="0bgibrqb9j62p1chldi1lvdsgc6sgsr7afyq4lvyrc2h861f3j9d"; depends=[boot mvtnorm]; }; @@ -16499,7 +16607,7 @@ in with self; { simglm = derive2 { name="simglm"; version="0.8.9"; sha256="0spvr8bmdqg97y1qklr8c6svgwsdwa5haar4sbsnvpnrq5fb2baw"; depends=[broom dplyr future_apply purrr rlang]; }; simgof = derive2 { name="simgof"; version="1.0.2"; sha256="05d7im59i193f266kqy4lr37dw3v20j9niizhj9w8z1qlfqfqsrk"; depends=[ddst]; }; simhelpers = derive2 { name="simhelpers"; version="0.1.2"; sha256="0ykv03nz7133af0yc7a3j67bpqjch4jkp8szlhy68pbwgin5zm1z"; depends=[dplyr furrr magrittr Rdpack rlang rstudioapi tibble tidyr]; }; - simlandr = derive2 { name="simlandr"; version="0.2.1"; sha256="0f2jrmkx5w76hvyhsz1i9762z8xqa7mlqnph21fb65218izqwg7n"; depends=[bigmemory digest dplyr forcats gganimate ggplot2 htmlwidgets ks lifecycle magrittr MASS plotly progress purrr rlang scales tibble]; }; + simlandr = derive2 { name="simlandr"; version="0.3.0"; sha256="04nl58qayvx1pkhscqy0664dvb6jg54amf43pff81gxsvk7gs20l"; depends=[bigmemory digest dplyr forcats gganimate ggplot2 htmlwidgets ks lifecycle magrittr MASS plotly progress purrr rlang tibble]; }; simmer = derive2 { name="simmer"; version="4.4.5"; sha256="1szyz6j7jd1i6yqw627828fk0ji3s58rqjrb38gy5h54skn7w167"; 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.17"; sha256="15bg7y21kgzvgzwzxpdwq9pay92ms2dkg9a1lpqlg5dx892rfr7n"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; }; @@ -16524,6 +16632,7 @@ in with self; { simplevis = derive2 { name="simplevis"; version="6.4.0"; sha256="1rf6bvdxsvp5ydvmrf2przrx851jr0yih45mbj189dykwvp377cm"; depends=[dplyr forcats ggplot2 htmlwidgets leafem leaflet leafpop lubridate magrittr plotly purrr rlang santoku 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]; }; + simplifyNet = derive2 { name="simplifyNet"; version="0.0.1"; sha256="04iv1alkd85lwwyf8k6iwsj9fbxl6smsjm2b34z91za70n0rsw5q"; depends=[dplyr igraph Matrix sanic]; }; 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.8"; sha256="02l7j2s74mjd4vgly4nnf2w7as9m3m6qifa292r29iaw12l0zj81"; depends=[glmnet gower MASS missForest norm randomForest rpart VIM]; }; simr = derive2 { name="simr"; version="1.0.6"; sha256="1q8ip54c5pc7pjf8127jpk56nr3f8rmwqdcrr84faj4lfbr27wqb"; depends=[binom car iterators lme4 lmerTest pbkrtest plotrix plyr RLRsim stringr]; }; @@ -16563,23 +16672,24 @@ in with self; { sistec = derive2 { name="sistec"; version="0.2.0"; sha256="0y43anin9vybiivf3jrxg19i9z4smmhhjvp52gci6icpn839kr8x"; depends=[dplyr openxlsx rlang shiny stringi stringr]; }; sistmr = derive2 { name="sistmr"; version="0.1.1"; sha256="08kajkb0ypbzcyxs9wv6mdz51r7zj01k2ahskidhlqww80rd407r"; depends=[BlandAltmanLeh dplyr ggbeeswarm ggplot2 ggrepel rlang scales]; }; sitar = derive2 { name="sitar"; version="1.3.0"; sha256="0lhwbbpq6anqrk3818xw3nrl63bj3vwgsmxad0dpl8y50rkcc4cs"; depends=[dplyr forcats ggplot2 glue magrittr nlme purrr rlang rsample tibble tidyr]; }; + sitepickR = derive2 { name="sitepickR"; version="0.0.1"; sha256="1cqvf4d2jpav53v7h7vzknm8cbr5kqk1djqkhmjrwv2zjnx3fg97"; depends=[data_table dplyr ggplot2 magrittr MatchIt reshape2 sampling scales stringr tidyr tidyselect]; }; siteymlgen = derive2 { name="siteymlgen"; version="1.0.0"; sha256="1176fnf39ars5cdjvy5w2k6b92qv51hy86s71sl8ghr0lwdq9f59"; depends=[data_table dplyr lubridate magrittr purrr rlist rmarkdown stringr yaml ymlthis]; }; sitmo = derive2 { name="sitmo"; version="2.0.2"; sha256="1hm89zi38ldgbskyx1cn7gm87yqy7zrxli8q05a36y1ndvazi3j4"; depends=[Rcpp]; }; sitools = derive2 { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; }; sitree = derive2 { name="sitree"; version="0.1-13"; sha256="0v0qbzdgh1lcg7m6b5vzfwy74hvj1b61c49lq8c4az740sf34sx6"; depends=[data_table ggplot2]; }; sitreeE = derive2 { name="sitreeE"; version="0.0-8"; sha256="0jwxca8y0nn1aqx4c6gikgf31nb4dll543m0akd4jmqx6fc450kd"; depends=[data_table sitree]; }; - sits = derive2 { name="sits"; version="1.1.0"; sha256="0nmkw2yhqgzp882mmk8dlic7i6g0bf0bc5n4zp8rl280gm1bm581"; depends=[data_table dplyr gdalUtilities ggplot2 lubridate magrittr purrr Rcpp RcppArmadillo rstac sf slider terra tibble tidyr torch yaml]; }; + sits = derive2 { name="sits"; version="1.2.0"; sha256="056wlrd5hfmmc6lslg6f7hwiwpl8xm2gagkf26fvsk1y0wfgs0ss"; depends=[data_table dplyr gdalUtilities lubridate magrittr purrr Rcpp RcppArmadillo rstac sf slider terra tibble tidyr torch yaml]; }; 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.11"; sha256="05iimcf1if1cx9bmsjb6f5gcq58hjiw10vx7kqd4nqnyhzcvy8yr"; depends=[bayestestR datawizard dplyr effectsize ggeffects ggplot2 insight knitr MASS parameters performance purrr rlang scales sjlabelled sjmisc sjstats tidyr]; }; + sjPlot = derive2 { name="sjPlot"; version="2.8.12"; sha256="0g6r4p1r70jjzw74177kxcx2br2n206jwlqazw0vxcsbffb8a411"; 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.3"; sha256="0jj0rah158sjqrcnji5qc5kghf8m74frky7mqpagcxd15fh5bvz3"; depends=[abind checkmate cli crayon ggplot2 ggtern 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.2.0"; sha256="1va86q5wddyvqgdpy8d0an2c7v1qbb4hpn0ai6y1v5v1ff87w73k"; depends=[datawizard 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]; }; + sjstats = derive2 { name="sjstats"; version="0.18.2"; sha256="0a1y6bqyvgs0avzasr8g6vwcxcnj4d9g0rfz2qiznwadpjzqw66h"; depends=[bayestestR broom datawizard dplyr effectsize emmeans insight lme4 magrittr MASS modelr parameters performance purrr rlang sjlabelled sjmisc tidyr]; }; sjtable2df = derive2 { name="sjtable2df"; version="0.0.2"; sha256="10h24yaikm8l3kkkj6yv430ybmgz0ydvxlv3smyyv5ww0c9qzmp1"; depends=[data_table kableExtra magrittr rlang rvest xml2]; }; skater = derive2 { name="skater"; version="0.1.1"; sha256="0cylcwxqc75a7fkyn7llwp0c7k35sfsbylxrjn0cpdnxbyf5xcx5"; depends=[corrr dplyr kinship2 magrittr purrr readr rlang tibble tidyr]; }; - 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]; }; + skedastic = derive2 { name="skedastic"; version="2.0.1"; sha256="0faj5lv6axpg8ra5pa49j9ha41cmxynhf6fc7dn5ym2g0f497k9l"; depends=[bazar broom caret CompQuadForm inflection MASS Matrix mgcv osqp pracma quadprog quadprogXT Rdpack Rfast ROI ROI_plugin_qpoases slam]; }; 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.19"; sha256="0dq5llbjnvpgzwwp14fqddmmrw6lsis23g21lx4glwmh23j4m1qp"; depends=[base64enc glue htmltools jsonlite magrittr purrr rlang rstudioapi shiny V8]; }; @@ -16597,6 +16707,7 @@ in with self; { skmeans = derive2 { name="skmeans"; version="0.2-14"; sha256="1kkp9zdwk1k3q50xp8g0jqgg3x1qzgigfkg37bpac7542276vsqq"; depends=[clue cluster slam]; }; sknifedatar = derive2 { name="sknifedatar"; version="0.1.2"; sha256="0zi9anrxg9zkgxlzlfyry5i5zlj3fs8580mp6xckkl096dry9ih0"; depends=[cli dplyr knitr magrittr modeltime parsnip purrr rlang rsample tibble tidyr tune]; }; skpr = derive2 { name="skpr"; version="1.1.6"; sha256="1fbdg44jrrjfm49c0k8s6xi556q2fzy2pmbfma1vmggnx6d917wi"; depends=[car doParallel doRNG foreach future gt iterators lazyeval lme4 lmerTest magrittr progress promises Rcpp RcppEigen rintrojs scales shiny shinyjs shinythemes survival viridis]; }; + skylight = derive2 { name="skylight"; version="1.1"; sha256="06snpj5jdr5wzv87587izvkxnxn24xl11jm7l2x2sj6s6rw16p9w"; depends=[]; }; skynet = derive2 { name="skynet"; version="1.4.3"; sha256="08a5p3rk0qhsxawdxj5sfw07rdk56x6viy37w1b0hxqaxxxv239i"; depends=[data_table dplyr geosphere ggplot2 ggrepel httr igraph leaflet maps RCurl stringr]; }; 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]; }; @@ -16611,9 +16722,9 @@ in with self; { sleev = derive2 { name="sleev"; version="1.0.2"; sha256="13ws39qy8h5g3fjsj056g7cnxgb7z97i2isagfyw9rykf4jkaqsv"; depends=[Rcpp RcppArmadillo RcppEigen]; }; slendr = derive2 { name="slendr"; version="0.4.0"; sha256="05r01fylzaz23akc874cfpzlfszdicsfssb2nrhn5pci753bschh"; depends=[ape dplyr gganimate ggplot2 ijtiff magrittr png purrr readr reticulate rnaturalearth sf shiny shinyWidgets stars tidyr]; }; 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]; }; + slgf = derive2 { name="slgf"; version="2.0.0"; sha256="07gkl35hq3w42kw103gn9f15s0z4n49nq39ip1nzm3s6d1ad6in6"; depends=[numDeriv Rdpack]; }; slickR = derive2 { name="slickR"; version="0.5.0"; sha256="1zxj6ivdhi9wvqcrl0p8clwk8nxqmg1bijqamp0lhq82dpyrdngp"; depends=[base64enc htmltools htmlwidgets lifecycle xml2]; }; - slider = derive2 { name="slider"; version="0.2.2"; sha256="1vxk2bc33svwcki2j8zr5jcxswh27i0fqgzjw2a5a1pp9dh3fmd3"; depends=[ellipsis glue rlang vctrs warp]; }; + slider = derive2 { name="slider"; version="0.3.0"; sha256="18gw0bxpbb00qcafmyv2avyj83s710hrj10x998ch9qbbyx1fsmw"; depends=[cli rlang vctrs warp]; }; slideview = derive2 { name="slideview"; version="0.2.0"; sha256="031ahdqswl14sw0nxmhaam37g14cifb83dyp2zjz1mh6qpkzl2gs"; depends=[htmltools htmlwidgets lattice raster viridisLite]; }; slim = derive2 { name="slim"; version="0.1.1"; sha256="0x9bk6w6lmw15s85gw9g8d1wlb57kkvnmx1wsyasn93x9llkjva1"; depends=[data_table MASS]; }; slimrec = derive2 { name="slimrec"; version="0.1.0"; sha256="1qzcvk7z8y11hwmybvppk1gf8di596zxy7qs22fclp6h6y18s377"; depends=[assertthat bigmemory glmnet Matrix pbapply]; }; @@ -16628,7 +16739,7 @@ in with self; { sm = derive2 { name="sm"; version="2.2-5.7.1"; sha256="0mql7rlm8wkdwmx1lv7pscdk9ibvsdpfdv8bpaz1hv2gn4pc637a"; depends=[]; }; smaa = derive2 { name="smaa"; version="0.3-1"; sha256="13qf495glfz6r75kfdplr1x6fqmys961pzbgv96lw62lby5d2qgp"; depends=[]; }; smacof = derive2 { name="smacof"; version="2.1-5"; sha256="1i9a3637m943sw6s0hx2b99kny0sv8niywqi9l12pjxx9flnj0zv"; depends=[candisc colorspace doParallel e1071 ellipse foreach Hmisc MASS nnls plotrix polynom weights wordcloud]; }; - smacpod = derive2 { name="smacpod"; version="2.4.1"; sha256="08khvvmskgdcdkyil6bvk47z347690407wfb4fpczwxhzkjx14f2"; depends=[abind pbapply plotrix smerc sp spatstat_core spatstat_geom spatstat_random]; }; + smacpod = derive2 { name="smacpod"; version="2.5"; sha256="0br9ahix3q2qv06aj8jr2828ysj0waik6za42ahd9b8hv7chrhad"; depends=[abind pbapply plotrix smerc sp spatstat_explore spatstat_geom spatstat_random]; }; smallarea = derive2 { name="smallarea"; version="0.1"; sha256="0jcv0xbh8v4g6zxxs4yyd0divwzk9d2w7g01r4s65khxvy3av7yx"; depends=[MASS]; }; smallstuff = derive2 { name="smallstuff"; version="1.0.1"; sha256="0zqwxmazk4nb8sgwwkymaap3l9pfzw3mqbmfzvj0wn7wzjsx10cx"; depends=[class data_table igraph matlib Matrix pryr ROCR]; }; smam = derive2 { name="smam"; version="0.6.0"; sha256="1vgsx1n9gkkjnv5lrrznpfqvh019qcjki6gy625k3ykqg5zg229v"; depends=[doParallel doSNOW EnvStats foreach Matrix nloptr numDeriv Rcpp RcppGSL RcppParallel]; }; @@ -16639,7 +16750,7 @@ 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.7.0"; sha256="10barbr4869ispdg8as6j8gfcc683dxv249vqlpk0p1cv3mvy6nj"; depends=[abind brglm2 checkmate MASS rlang survival VGAM]; }; + smcfcs = derive2 { name="smcfcs"; version="1.7.1"; sha256="1i57rgibm5fqdw8gk61f79mvz60ygzgbfsb2nyckfxiamy25nfq2"; depends=[abind brglm2 checkmate MASS rlang survival VGAM]; }; smcure = derive2 { name="smcure"; version="2.1"; sha256="0377dj6wvny2y44phsf7177ivn70a55v316skwf02n03ghqx73k9"; depends=[survival]; }; smd = derive2 { name="smd"; version="0.6.6"; sha256="1nvlka2prqh1hcj4ngpj2c2gmfryziijqwjyfy9fmq78skiq0jij"; depends=[MASS]; }; smdata = derive2 { name="smdata"; version="1.2"; sha256="1p26b46kg4hmhs2fl9h9vchar00llqv58ylx438bjgzz4f229qvr"; depends=[]; }; @@ -16650,7 +16761,7 @@ in with self; { smidm = derive2 { name="smidm"; version="1.0"; sha256="1a26y70mb5qzl1zjaicvnb8i7z3r94qqzda2cpac776h1w35zy51"; depends=[dplyr extraDistr]; }; smile = derive2 { name="smile"; version="1.0.4.1"; sha256="0781rzkqwpqnl22phxdcf533p55pshfp4v01k8d1bhd5yvr13y7k"; depends=[Matrix mvtnorm numDeriv Rcpp RcppArmadillo sf]; }; smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; }; - smlmkalman = derive2 { name="smlmkalman"; version="0.1.0"; sha256="1kxy2nfiz5d33cp2baxfxxqb64jfrkjyp6rhiablqw448y6xlszp"; depends=[pracma scales spdep truncnorm]; }; + smlmkalman = derive2 { name="smlmkalman"; version="0.1.1"; sha256="1ns717rq0vipplh3l2ypinrscv3bjv86j68aw53ygs6g59h0v2vp"; depends=[pracma scales spdep truncnorm]; }; smmR = derive2 { name="smmR"; version="1.0.3"; sha256="0b6w2k5j65jdngc871ch9ragr7qgwbkl4nhk3gqnbpvkr9m4x88f"; depends=[DiscreteWeibull Rcpp RcppArmadillo seqinr]; }; smnet = derive2 { name="smnet"; version="2.1.2"; sha256="17zv02f1g86s55g81anhqrxfgy2biamsw606byxwh9kdc5l4vfv6"; depends=[RSQLite spam SSN]; }; smog = derive2 { name="smog"; version="2.1.0"; sha256="1mnnvp6crjwwiym16q4hmn9zwna1gblwqjlan4x9zyvgp1j70k26"; depends=[doParallel dplyr foreach ggplot2 magrittr Rcpp RcppArmadillo Rdpack rmarkdown tidyr]; }; @@ -16677,7 +16788,7 @@ in with self; { smurf = derive2 { name="smurf"; version="1.1.3"; sha256="0n99dzsb17r0a6d8nkijfg6rdvvc2g4pard2dnmyjq0p69j3f3gb"; 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.1.0"; sha256="12s4g9rfrnijdil7bqw66ikj5k3w6bdnz6fsgqsp0bkfsap9nps9"; depends=[mnormt numDeriv quantreg]; }; - snSMART = derive2 { name="snSMART"; version="0.2.1"; sha256="0vm1lrdlk64s49wi3dnfhm0l46swd0ssq6c16fh0qvzb59rc584m"; depends=[bayestestR condMVNorm cubature EnvStats geepack HDInterval pracma rjags tidyr truncdist]; }; + snSMART = derive2 { name="snSMART"; version="0.2.2"; sha256="1s4g379x34gw9mvfp2jm8wsnjp0z29639w6s5vhxa4nnxax3j41y"; depends=[bayestestR condMVNorm cubature EnvStats geepack HDInterval pracma rjags tidyr truncdist]; }; sna = derive2 { name="sna"; version="2.7"; sha256="0ka319s1w857fj28ja1i1ljgv2h6ji4d69riqy9pwhvvghsa83s4"; depends=[network statnet_common]; }; snahelper = derive2 { name="snahelper"; version="1.4.1"; sha256="1krmaynhvbbdvyy55h2b1h9w9pw1gjkd2ha4prhcm836rmvyb6av"; depends=[colourpicker DT formatR ggplot2 ggraph graphlayouts igraph miniUI rstudioapi shiny]; }; snakecase = derive2 { name="snakecase"; version="0.11.0"; sha256="1ky1x2cp5rd0ffd9m1fji9sq4z4jsrpxzg30brw8bb4ihfjj114r"; depends=[stringi stringr]; }; @@ -16694,11 +16805,10 @@ in with self; { snowboot = derive2 { name="snowboot"; version="1.0.2"; sha256="0jj3p0g4rwml8vmlwj10rfisxfjlipcrpvq5z134z4j35jp6ggv3"; depends=[igraph Rcpp Rdpack]; }; snowfall = derive2 { name="snowfall"; version="1.84-6.2"; sha256="0frmasv04wd47h04zbwaryhiyxllarf3ggpa39p5qicjp6r7lilv"; depends=[snow]; }; snowflakes = derive2 { name="snowflakes"; version="1.0.0"; sha256="0adna9jfs0wv4dhyjczxhq7c0ldjfai07p1q9119avxyilv9x0vi"; depends=[]; }; - snpEnrichment = derive2 { name="snpEnrichment"; version="1.7.0"; sha256="1lja1n26nr8lgbca2kraryv933jwa2w3h41appzylflf0w3liz9y"; depends=[ggplot2 snpStats]; }; snpReady = derive2 { name="snpReady"; version="0.9.6"; sha256="1r96j8zh84dn7qh3zgl0p0v3a80hx2wd3c4jgjlr43hzl7yglpqr"; depends=[impute Matrix matrixcalc rgl stringr]; }; snplist = derive2 { name="snplist"; version="0.18.2"; sha256="1sa2s3br4agx920jpr250iih61p99v500nh0c1w99w0846g9908c"; depends=[biomaRt DBI R_utils Rcpp RSQLite]; }; snpsettest = derive2 { name="snpsettest"; version="0.1.1"; sha256="0vfm09bff7l7z36lzwp0ndnlb230f0kg6dlbjlpk028xd1iy4if1"; depends=[data_table gaston Rcpp RcppArmadillo]; }; - sns = derive2 { name="sns"; version="1.1.2"; sha256="132zd57xb2y0nshw4lakf49r2mvvkv7j32f7l7hqrh91mw7wyqpr"; depends=[coda mvtnorm numDeriv]; }; + sns = derive2 { name="sns"; version="1.2.2"; sha256="1zb0s89lp2049i7l919dpd7bd396y9s6v8913qz56fvsq95sbvcn"; 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]; }; socceR = derive2 { name="socceR"; version="0.1.1"; sha256="1vd0r3vixavg1br2q3kfn3nvl7dw854vkcfwcvyw411k84ivb13y"; depends=[Rcpp]; }; @@ -16714,8 +16824,8 @@ 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.7.5"; sha256="0giijrfqgqyiq14bfwckizhplqyigz2vca91z56c8mrgj8ly4fxa"; depends=[aqp curl data_table DBI]; }; - soilassessment = derive2 { name="soilassessment"; version="0.2.4"; sha256="0sm20rg1c61163q44kayarkczphwjb16cs2vri46v0ybi8pnvm50"; depends=[arm caret Cubist deSolve e1071 FuzzyAHP googledrive Hmisc kernlab nnet png qrnn quantregForest randomForest ranger raster rpart soiltexture sp]; }; + soilDB = derive2 { name="soilDB"; version="2.7.6"; sha256="1fw7wk9py5ifxrq2p08i9fdh5zass00b8gl6bw4lrpzpqdkzpfpk"; depends=[aqp curl data_table DBI]; }; + soilassessment = derive2 { name="soilassessment"; version="0.2.5"; sha256="1wpls6ipdripdd1fmfn3yil30ghcb1h6mrpax376gv48ndgf9q73"; depends=[arm caret Cubist deSolve e1071 FuzzyAHP googledrive Hmisc kernlab nnet png qrnn quantregForest randomForest ranger raster rpart soiltexture sp]; }; soilhypfit = derive2 { name="soilhypfit"; version="0.1-7"; sha256="1ssz9w9ibw8mban0fq50j4lgr8vmkrsn8v9cpkg0wl28z1hqbhz3"; depends=[mgcv nloptr quadprog Rmpfr snowfall SoilHyP]; }; soilphysics = derive2 { name="soilphysics"; version="5.0"; sha256="1ijnqlb52c3vm6ydiginp0f82vkip0kbsvbd9yac3scrc5g1b5z3"; depends=[boot fields MASS rhandsontable shiny shinydashboard]; }; soiltestcorr = derive2 { name="soiltestcorr"; version="2.1.2"; sha256="1yw3y655i9d7y18vcqyhh3yg3mc41bqb2ix9lbylzd83zp7g71c4"; depends=[AICcmodavg data_table dplyr ggplot2 ggpp minpack_lm modelr nlstools purrr rlang tidyr]; }; @@ -16752,31 +16862,31 @@ in with self; { soundClass = derive2 { name="soundClass"; version="0.0.9.2"; sha256="0z697asv2kzs93b45ndbkxfdzq3fmi1f6aprvpxps4x354gg2pi6"; depends=[DBI dbplyr dplyr generics htmltools keras magrittr RSQLite seewave shiny shinyBS shinyFiles shinyjs signal tuneR zoo]; }; soundcorrs = derive2 { name="soundcorrs"; version="0.4.0"; sha256="1azvsv3bghlab8q24wbb6xwd5a4cydx1cagvhk8h0h5ib9957zab"; depends=[]; }; soundecology = derive2 { name="soundecology"; version="1.3.3"; sha256="16h6gbdlyav7wbfisdv1f2zsqhr45liidgj7qqk8giwjxgan8q97"; depends=[ineq oce pracma seewave tuneR vegan]; }; - soundgen = derive2 { name="soundgen"; version="2.5.2"; sha256="1jbcn6rvch8w6myrmlbp19vlvpk9hnnqg06c2idlmxn52z5ga60g"; depends=[doParallel dtw foreach mvtnorm phonTools seewave shiny shinyBS shinyjs signal tuneR zoo]; }; + soundgen = derive2 { name="soundgen"; version="2.5.3"; sha256="0mbf9c640gqx7amc94z0dc0b8lky1b6db4w60lsk0lad11f5zl9m"; depends=[doParallel dtw foreach mvtnorm phonTools seewave shiny shinyBS shinyjs signal tuneR zoo]; }; 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]; }; - sp = derive2 { name="sp"; version="1.5-0"; sha256="077q1wh9ihhcn1338xspnd90hy16ljxsav1xcrxdxj4fyynhd6lk"; depends=[lattice]; }; + sp = derive2 { name="sp"; version="1.5-1"; sha256="1pr9yb2wqapyizdfpi7zqd4a5b40q58czbfj6svvp2fkh6sfmfb9"; depends=[lattice]; }; sp23design = derive2 { name="sp23design"; version="0.9-1"; sha256="1ivsds210rpxj52labc9mf2ncm3vji983w0kj757jl1b308ql30s"; depends=[mvtnorm survival]; }; spAddins = derive2 { name="spAddins"; version="0.2.0"; sha256="19wbcghcf0f9qvqy92jhsdcpmd9b4lkhxndvr71cyhzga539lh1n"; depends=[magrittr purrr rstudioapi stringr]; }; spBFA = derive2 { name="spBFA"; version="1.2"; sha256="00m1pww9a377fpharpqw3m30qx13l5xays6638h2jblrz8w71i8q"; depends=[msm mvtnorm pgdraw Rcpp RcppArmadillo]; }; spBayes = derive2 { name="spBayes"; version="0.4-6"; sha256="0530fhb832nr1vzhwml696cbvwpphjha35i20q0aixxqg8fd35jw"; depends=[coda Formula magic Matrix sp]; }; spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.6"; sha256="1i5b0k1h2fq44n1hpb4cs5j2rz0s1x94d36yglvd24i55mjjzfk4"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; }; spCP = derive2 { name="spCP"; version="1.3"; sha256="0rphd8zawr2r14dzwv77plk5xw020pkc26ir72qiqc1acin42xd1"; depends=[msm mvtnorm Rcpp RcppArmadillo]; }; - spData = derive2 { name="spData"; version="2.2.0"; sha256="07whxr039cxvk2nn65jada3i8vqqw34lgca9j17ah8chy9r0m73f"; depends=[sp]; }; + spData = derive2 { name="spData"; version="2.2.1"; sha256="1ddkk8c4dblv5p2rqvqx8b89k8pazvvq48rlw661vf2iwwvm8d2m"; depends=[sp]; }; spDates = derive2 { name="spDates"; version="1.1"; sha256="0k6383hgrs4751qnwx03s85a9a0ldpxm7xanrnmg13plc2713kvm"; depends=[data_table dplyr ggplot2 gstat magrittr raster rcarbon rlang smatr sp viridisLite]; }; - spFSR = derive2 { name="spFSR"; version="2.0.1"; sha256="0sqsa6spk9mz784abxazs9i3gv046za2la55xslrpn3b7d8wksl5"; depends=[future ggplot2 lgr mlr3 mlr3learners mlr3pipelines tictoc]; }; + spFSR = derive2 { name="spFSR"; version="2.0.3"; sha256="177yx24fgkdx8b82sd49cjp8dwghy85qbhns2a26ag05c1hcnwzp"; depends=[future ggplot2 lgr mlr3 mlr3learners mlr3pipelines ranger tictoc]; }; spFW = derive2 { name="spFW"; version="0.1.0"; sha256="1d00a01mnwc7lcnqgz2dfglhwqwhh9vm4yd904zq3s26zv4qapyf"; depends=[Rcpp RcppArmadillo]; }; spGARCH = derive2 { name="spGARCH"; version="0.2.2"; sha256="1wrmk2ybgysvibfy8vvp7pyqda5apqp0jxjfp3hlb416fza52966"; depends=[Matrix nleqslv Rcpp RcppEigen Rsolnp spdep truncnorm]; }; spMC = derive2 { name="spMC"; version="0.3.12"; sha256="1ybjpm6737yr0pyqhk4fz4288r5mgkmknzfcw8ffc680b8qnxknr"; depends=[]; }; spMaps = derive2 { name="spMaps"; version="0.4.0"; sha256="0n9693aam7gsclfhijq7cy61l0w4mm5vf3rjaz5w0jrz77lrkprh"; depends=[raster rgeos sp]; }; spNNGP = derive2 { name="spNNGP"; version="1.0.0"; sha256="0z09hxmm2pbxsbm3zqk839z2gb3g2n2hqkahcbvcgywrqn3v8cal"; depends=[coda Formula RANN]; }; - spNetwork = derive2 { name="spNetwork"; version="0.4.3.2"; sha256="1srf7s22izqhh09ri0vsnb39mc8isjxcbik71iwxilykds6bh34x"; depends=[abind BH cubature data_table dbscan dplyr future_apply ggplot2 igraph progressr Rcpp RcppArmadillo RcppProgress Rdpack sf spdep]; }; - spOccupancy = derive2 { name="spOccupancy"; version="0.4.0"; sha256="1k6qn5js38pvs8xzjqj7s3zyf3s3lrmqp666wi6wih79lpr5qaj4"; depends=[abind coda doParallel foreach lme4 RANN]; }; + spNetwork = derive2 { name="spNetwork"; version="0.4.3.6"; sha256="055h6xxs9kpl1yzcl5ha4pbgbzvp15vqr43xhbdic58flfgc13mr"; depends=[abind BH cubature data_table dbscan dplyr future_apply ggplot2 igraph progressr Rcpp RcppArmadillo RcppProgress Rdpack sf spdep]; }; + spOccupancy = derive2 { name="spOccupancy"; version="0.5.1"; sha256="0c4mm0qczr1pc0k6nb3ms2i1lsrm6qfjwyv2szdd6ci66ac01kc6"; depends=[abind coda doParallel foreach lme4 RANN]; }; spRingsteen = derive2 { name="spRingsteen"; version="0.1.0"; sha256="13mdbsbq51sp34xp04lgc4klwb3chnnkvh5r99qfapbbr0vra8vl"; depends=[devtools rlang]; }; - spTDyn = derive2 { name="spTDyn"; version="2.0.1"; sha256="1wprn2adw4l5pkwkfzdpcr07jxgycx9kaf8w8mfv27nka5hacgqx"; depends=[coda sp spacetime spTimer]; }; + spTDyn = derive2 { name="spTDyn"; version="2.0.2"; sha256="010x3rjncasly1scngwyiys7asmk4ay51bzhk0zfjazwfkmqd12r"; depends=[coda sp spacetime spTimer]; }; spThin = derive2 { name="spThin"; version="0.2.0"; sha256="0j10j1cbbwp3baqm3b59rxlnd643mkx1mirlxpnr1ad2g7xpm69f"; depends=[fields knitr spam]; }; spTimer = derive2 { name="spTimer"; version="3.3.2"; sha256="0dlsyj0mawpgxr1yn4ldqm3xh148c79lk55fq475zjzyiwz9ynfc"; depends=[coda extraDistr sp spacetime]; }; - spaMM = derive2 { name="spaMM"; version="4.0.0"; sha256="1cdba0g6brkl4gmlvb4n1bnh23xlbljk1f911f7wirvy0lzxvghm"; depends=[boot crayon geometry gmp MASS Matrix minqa nlme nloptr numDeriv pbapply proxy Rcpp RcppEigen ROI]; }; + spaMM = derive2 { name="spaMM"; version="4.1.20"; sha256="112jw1y95s704k230vnpa8lmzcallzvgrx4xkypdg0w8pp8ap7l3"; depends=[boot crayon geometry gmp MASS Matrix minqa nlme nloptr numDeriv pbapply proxy Rcpp RcppEigen ROI]; }; spaa = derive2 { name="spaa"; version="0.2.2"; sha256="163iipz1knxx1lzby9a3n1f014yqkf25z1wpwwy4gbx7sia499d5"; depends=[]; }; spaceNet = derive2 { name="spaceNet"; version="1.2"; sha256="1s2672icxs0qvdhl52xhllgvh1i9mjfrn5j3icyw6h61ljbnhy11"; depends=[MASS mclust permute RcppTN Rfast sna vegan]; }; spacefillr = derive2 { name="spacefillr"; version="0.3.2"; sha256="0raaw9ib8b2dzkh4w28wpxcgxs7ky328yaayb64lc39syf7g19dv"; depends=[Rcpp]; }; @@ -16790,22 +16900,22 @@ in with self; { spam64 = derive2 { name="spam64"; version="2.9-0"; sha256="1k2ah76l38xwzn7c541b7nip2yx8n8yh6p9j80rpkc3jdni2n9dq"; depends=[]; }; spamtree = derive2 { name="spamtree"; version="0.2.2"; sha256="1z1dyv6cvcdilqyfpzgl3zr0jmzjn2sznrvypvxx7c8i6qfq8nd0"; depends=[dplyr FNN magrittr Rcpp RcppArmadillo rlang tibble]; }; spanish = derive2 { name="spanish"; version="0.4.2"; sha256="15drc11lh0qxpww50p0smi8qxfbln82bx0yd74jqf71irhk5jxyp"; depends=[magrittr xml2]; }; - spant = derive2 { name="spant"; version="2.3.0"; sha256="1zp2wdqsc5plxwnzy8jidzmi18gvcwq87xnwzbxg60q794y09fql"; depends=[abind expm fields irlba jsonlite minpack_lm mmand nloptr numDeriv plyr pracma ptw RNifti RNiftyReg signal smoother stringr]; }; + spant = derive2 { name="spant"; version="2.5.0"; sha256="1f7xiy4c0b43qj8jf0a2s5fzp9l4qhnc5ysk8dq75hj7pabbhjbg"; depends=[abind expm fields irlba jsonlite minpack_lm mmand nloptr numDeriv plyr pracma ptw RNifti RNiftyReg signal smoother stringr]; }; sparcl = derive2 { name="sparcl"; version="1.0.4"; sha256="138krflvfdlx4hlh90mswds51i8aw2vv00gm5lgkfsvxj4w324jg"; depends=[]; }; spark_sas7bdat = derive2 { name="spark.sas7bdat"; version="1.4"; sha256="1s1hd6hvjxnfb3w10v93pggijmm2h4rcsf7ckl34j2sw9bvv7zka"; depends=[sparklyr]; }; sparkavro = derive2 { name="sparkavro"; version="0.3.0"; sha256="0g6ac9msfbx8f8j8rj0hvlxjsn317zyam207q7i8kf0hshs1r58f"; depends=[DBI dplyr sparklyr]; }; sparkbq = derive2 { name="sparkbq"; version="0.1.1"; sha256="0gccm8q5a45k9zm8f90r7fhcmriq8d038p022k7cikbr6rqsrmyh"; depends=[sparklyr]; }; sparkhail = derive2 { name="sparkhail"; version="0.1.1"; sha256="1a9p9i7fs6l9rx5ha6akjjl7qhfak01xsjg28ysv0imikmwp6hy7"; depends=[dplyr sparklyr sparklyr_nested]; }; sparkline = derive2 { name="sparkline"; version="2.0"; sha256="0lrr1lm7603di7x3mf53cp13d9ssjh9gmb43wa6z9yqapis2djm2"; depends=[htmltools htmlwidgets]; }; - sparklyr = derive2 { name="sparklyr"; version="1.7.8"; sha256="13a4cl0ybmx53azp4fvgrmdk25c6k6dradfick1sighsqrav3q7i"; depends=[assertthat base64enc config DBI dbplyr digest dplyr ellipsis forge generics globals glue httr jsonlite openssl purrr r2d3 rappdirs rlang rprojroot rstudioapi tibble tidyr tidyselect uuid vctrs withr xml2]; }; + sparklyr = derive2 { name="sparklyr"; version="1.7.9"; sha256="0l495jxhdbj4wjc0chp3j32gd3sab9sd9pcm3977zsjyfhcp5i3g"; depends=[assertthat base64enc config DBI dbplyr digest dplyr ellipsis forge generics globals glue httr jsonlite openssl purrr r2d3 rappdirs rlang rprojroot rstudioapi tibble tidyr tidyselect uuid vctrs withr xml2]; }; sparklyr_flint = derive2 { name="sparklyr.flint"; version="0.2.2"; sha256="0sszblvgxi8l8wlic5nrnm4pc9m0byyvayrja2476vnz0pqliv69"; depends=[dbplyr dplyr rlang sparklyr]; }; sparklyr_nested = derive2 { name="sparklyr.nested"; version="0.0.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.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-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]; }; + sparr = derive2 { name="sparr"; version="2.2-17"; sha256="0cdqhwx6qm9ngfc2lcafjqmrvqqi3kfrjl66n4dv65fpvprixmv3"; depends=[doParallel foreach misc3d spatstat spatstat_explore spatstat_geom spatstat_random spatstat_utils]; }; + sparrpowR = derive2 { name="sparrpowR"; version="0.2.6"; sha256="0hvayhf66m1ckqnhjr6b8szin76qifpysiiwnfnnff8ig3yphv7q"; 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]; }; @@ -16817,11 +16927,11 @@ in with self; { sparseLTSEigen = derive2 { name="sparseLTSEigen"; version="0.2.0.1"; sha256="08xhpm9hp9x9rmiys4fvh9y4z2xsdkzckzw3lq0vlzvjcaynvidq"; depends=[Rcpp RcppEigen robustHD]; }; sparseMVN = derive2 { name="sparseMVN"; version="0.2.2"; sha256="1vd97w4mrc6s9d95a43cpz90adhn2015as93j55hm5phpgj24v75"; depends=[Matrix]; }; sparseMatEst = derive2 { name="sparseMatEst"; version="1.0.0"; sha256="06y061zl6id7cfw3cqzvwykzlijmala8hj61i04mgc491ngybimv"; depends=[glasso]; }; - sparseR = derive2 { name="sparseR"; version="0.2.0"; sha256="0agvynyv89msghwvc2ap98pdsmg2bvwa6kwc74fmmgpnzlxcjysf"; depends=[dplyr magrittr ncvreg recipes rlang]; }; + sparseR = derive2 { name="sparseR"; version="0.2.1"; sha256="0b9k96p66j2vn9yvcjw652lh9l6j5dbswhqhq0i4ps06jm5ks5av"; depends=[dplyr magrittr ncvreg recipes rlang]; }; sparseSVM = derive2 { name="sparseSVM"; version="1.1-6"; sha256="0b0qiikjyyh9qfd4jl69zqnlp7adxq63mwsxvgwvyc0pv5ccg8i0"; depends=[]; }; sparsebnUtils = derive2 { name="sparsebnUtils"; version="0.0.8"; sha256="1x1phd33r3ci72sbm0pkmigwbi4x59pdz8n5919119mkxdf740vs"; depends=[Matrix nnet]; }; sparsediscrim = derive2 { name="sparsediscrim"; version="0.3.0"; sha256="1fzvki3az1y5bz6d7lygv3hjbzn17gq8g2s7xqmldlpq1v4dhjar"; depends=[bdsmatrix corpcor dplyr ggplot2 mvtnorm rlang]; }; - sparsegl = derive2 { name="sparsegl"; version="0.5.0"; sha256="0s30gh65w1vvl13qgxwy907cyqzkv4rcdzs1zik4hfnl323g5lmq"; depends=[assertthat dotCall64 ggplot2 magrittr Matrix rlang RSpectra tidyr]; }; + sparsegl = derive2 { name="sparsegl"; version="1.0.0"; sha256="1khf6r7fzddq2vxqvj70vsvjmk7ksivjz1vipwxnc6a3fr4lbg73"; depends=[cli dotCall64 ggplot2 magrittr Matrix rlang RSpectra tidyr]; }; sparseinv = derive2 { name="sparseinv"; version="0.1.3"; sha256="06inzix9m7b5g7c97lyvyl2g7fdr4iz60791hl2w9mah7nd6bfja"; depends=[Matrix Rcpp spam]; }; sparsenet = derive2 { name="sparsenet"; version="1.4"; sha256="1r7xmpn3r8dq1zm6ghygks3l014kqlrpfgsl8q23w7rly8ksw3m9"; depends=[Matrix shape]; }; sparsepca = derive2 { name="sparsepca"; version="0.1.2"; sha256="0wk2nm37p15gb8i4s45izzzdmwywr56kv4g0j3jd5s3slm224vv4"; depends=[rsvd]; }; @@ -16835,15 +16945,15 @@ in with self; { sparta = derive2 { name="sparta"; version="0.8.4"; sha256="109i8yhv8snhpccrhxy1k8xcy9jj8m3li2d7vaylvxbrlnc26d89"; depends=[Rcpp RcppArmadillo]; }; spass = derive2 { name="spass"; version="1.3"; sha256="1c148z0i3d185hnf54xmgppjrblv3b2s3sm0lmj78gvav04mj5s4"; depends=[geepack MASS multcomp mvtnorm Rcpp]; }; spatPomp = derive2 { name="spatPomp"; version="0.30.0.1"; sha256="1aswvp49vl62pfr6gxb7ji2bqzkv3bv8mi9iyz4xl6sz0rj2xwzv"; depends=[abind dplyr foreach ggplot2 magrittr pomp rlang stringr tidyr]; }; - spate = derive2 { name="spate"; version="1.7.3"; sha256="084iwp1wjrq06f3849iakzkik3gxms9lrq1l07kqyaz53di3dxjx"; depends=[mvtnorm truncnorm]; }; + spate = derive2 { name="spate"; version="1.7.4"; sha256="0fc09y54g1h9pmc0rfwbrlzsck27kxhsynzwyxydysmda133spdf"; depends=[mvtnorm truncnorm]; }; spatgeom = derive2 { name="spatgeom"; version="0.1.0"; sha256="1rvvnniryq9bb04v3i010p92v59zv3n47q1pn3bl9h92lgxlh18y"; depends=[cowplot dplyr ggplot2 lwgeom purrr scales sf]; }; 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-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]; }; + spatialEco = derive2 { name="spatialEco"; version="2.0-0"; sha256="1xjk2697mcih1swjplxb5fv9winlj362lffd5hd5sipcfpl888ws"; depends=[cluster EnvStats ks MASS mgcv RANN RCurl readr rms sf SpatialPack spatstat_explore spatstat_geom spdep terra yaImpute]; }; spatialRF = derive2 { name="spatialRF"; version="1.1.4"; sha256="1lbwk7ziv292kxkz6rpr44jij3q13ljmqaccq56x6c2l8wkxl583"; depends=[doParallel dplyr foreach ggplot2 huxtable magrittr patchwork ranger rlang tibble tidyr tidyselect viridis]; }; - spatialTIME = derive2 { name="spatialTIME"; version="1.2.1"; sha256="1raw6svphhwagyx6bkxbi83gvszkkb5pl5c76vhgsxp48hlzc5q2"; depends=[crayon dplyr furrr future ggplot2 gridExtra magrittr pheatmap plyr purrr RColorBrewer rlang scales spatstat_core spatstat_geom tidyr tidyselect viridis]; }; + spatialTIME = derive2 { name="spatialTIME"; version="1.2.2"; sha256="16mbmqycp70lgixp2ai9al2821v0vxvnc713nch5g4azrwzsaizi"; depends=[crayon dplyr furrr future ggplot2 gridExtra magrittr pheatmap plyr purrr RColorBrewer rlang scales spatstat_explore spatstat_geom tidyr tidyselect]; }; spatialfusion = derive2 { name="spatialfusion"; version="0.6-6"; sha256="14qccp9ca7b7v9w4fj04a99mx6qchfs8588fl16qfdmfbazwnfra"; depends=[deldir fields Rcpp rgeos rstan sp spam]; }; spatialprobit = derive2 { name="spatialprobit"; version="1.0"; sha256="1g65c081xmhfp45lidn57xwryk4pmzzixs3b2qzixzg4knks74dy"; depends=[Matrix mvtnorm spatialreg spdep tmvtnorm]; }; spatialreg = derive2 { name="spatialreg"; version="1.2-6"; sha256="07flzdw6pjhmx9skrjp9y05x9fayxk5ymcr50f1zxd8slcbl2f4v"; depends=[boot coda expm LearnBayes MASS Matrix nlme sf spData spdep]; }; @@ -16852,18 +16962,19 @@ in with self; { spatialwarnings = derive2 { name="spatialwarnings"; version="3.0.3"; sha256="03a0gb8v6028v6q5w3iap8fn9nkb2rpnabqgzmr2dyxnpfgr9dn3"; depends=[future future_apply ggplot2 gsl plyr Rcpp RcppArmadillo segmented]; }; spatialwidget = derive2 { name="spatialwidget"; version="0.2.3"; sha256="0j0v0cyqndlg9p7g03gp1br9b2i3p50abzpw67k3cawm96a87crj"; depends=[BH colourvalues geojsonsf geometries jsonify rapidjsonr Rcpp sfheaders]; }; spatsoc = derive2 { name="spatsoc"; version="0.1.16"; sha256="1pyw6606kwskgcfnzvgzvy8n4i9s3mmn1789d1lhk04h14r33fns"; depends=[adehabitatHR data_table igraph rgeos sp]; }; - spatstat = derive2 { name="spatstat"; version="2.3-4"; sha256="1nlrp7660y68axlm4pczc5rxbdhbbac1ylh69azr4swj1gbzi82f"; 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-4"; sha256="0fyi8y1z919nzn47kaviln7gflhcp5qdi3gfvf7nwkdix3pkk373"; depends=[abind goftest Matrix mgcv nlme rpart spatstat_data spatstat_geom spatstat_random spatstat_sparse spatstat_utils tensor]; }; + spatstat = derive2 { name="spatstat"; version="3.0-2"; sha256="1k8qs5hsy0n4rh7ccp6bdnqgbw3fvjdp55bc0zhjqwbbhq8c0ax0"; depends=[spatstat_data spatstat_explore spatstat_geom spatstat_linnet spatstat_model spatstat_random spatstat_utils]; }; + spatstat_Knet = derive2 { name="spatstat.Knet"; version="3.0-2"; sha256="1yvdasrxmsa2m9016kclb33kv5893fsz5rcr416yhpf6jixdsfh8"; depends=[Matrix spatstat spatstat_data spatstat_explore spatstat_geom spatstat_linnet spatstat_model spatstat_random spatstat_sparse spatstat_utils]; }; spatstat_data = derive2 { name="spatstat.data"; version="3.0-0"; sha256="0mvh33sk2sfhfk276j088adzldrg8p6pd5avl2j21428i250byfg"; depends=[Matrix spatstat_utils]; }; + spatstat_explore = derive2 { name="spatstat.explore"; version="3.0-5"; sha256="0qn8dmymbnh9vdw0hysijkk2nwz5q69i62smpp8f3wy3z898lhwz"; depends=[abind goftest Matrix nlme spatstat_data spatstat_geom spatstat_random spatstat_sparse spatstat_utils]; }; spatstat_geom = derive2 { name="spatstat.geom"; version="3.0-3"; sha256="111wj507i2mxi0ak8sj468w26pr2f7hgv3ssmbf0qjkp1v35cnvf"; 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-5"; sha256="0iq2xppfxp9aa3878z3l4q13qqzn3hg5v7cfv8z8m1mzmnw1r1y8"; depends=[spatstat spatstat_core spatstat_data spatstat_geom spatstat_random spatstat_sparse spatstat_utils tensor]; }; - spatstat_random = derive2 { name="spatstat.random"; version="2.2-0"; sha256="0kb01s8k67ydcfqcnz3i55vpiksihh4xsg0w2p2bclxxkpdvpw25"; depends=[spatstat_data spatstat_geom spatstat_utils]; }; + spatstat_gui = derive2 { name="spatstat.gui"; version="3.0-1"; sha256="1y6z3gdad0nhqg494b5pjq4h0mr3mcrhnnc0chy56lf8chb6p5jb"; depends=[rpanel spatstat spatstat_data spatstat_explore spatstat_geom spatstat_linnet spatstat_model spatstat_random spatstat_utils]; }; + spatstat_linnet = derive2 { name="spatstat.linnet"; version="3.0-3"; sha256="1y9crkj9sa1hnfsfkyyq8zv6fgafv07b8w0y01qps1rd6virnns0"; depends=[Matrix spatstat_data spatstat_explore spatstat_geom spatstat_model spatstat_random spatstat_sparse spatstat_utils]; }; + spatstat_local = derive2 { name="spatstat.local"; version="5.0-1"; sha256="02ip6d2mr07n3lv4i5xdmb1j55syk5hwjwr7j81ibxkp3gj8gm61"; depends=[spatstat spatstat_data spatstat_explore spatstat_geom spatstat_model spatstat_random spatstat_sparse spatstat_utils tensor]; }; + spatstat_model = derive2 { name="spatstat.model"; version="3.0-2"; sha256="0a6lf5y0k13h60s0lnwwfrmxswl7avcg4fhqmha1nmycidhga8z9"; depends=[abind goftest Matrix mgcv nlme rpart spatstat_data spatstat_explore spatstat_geom spatstat_random spatstat_sparse spatstat_utils tensor]; }; + spatstat_random = derive2 { name="spatstat.random"; version="3.0-1"; sha256="1dp58dxw7ln9bsls9ssbb917qakvgr9nf2jci6zq31rv0rf8934k"; depends=[spatstat_data spatstat_geom spatstat_utils]; }; spatstat_sparse = derive2 { name="spatstat.sparse"; version="3.0-0"; sha256="1lhsa1gjahz6sp1yrlch0d01rnayyw8hip382vghyxljfly0mglr"; depends=[abind Matrix spatstat_utils tensor]; }; spatstat_utils = derive2 { name="spatstat.utils"; version="3.0-1"; sha256="06mrw3nc2pqz4897i7wqy04mdfnn6drggv8mr92r3zb4cn0cg8fb"; depends=[]; }; - spatsurv = derive2 { name="spatsurv"; version="1.8"; sha256="1ybm4gs4q9zg0frva4hs5raqmbr6p8i9nr2zxi5vrxn8nq7iczmf"; depends=[fields iterators lubridate Matrix raster RColorBrewer rgeos sp spatstat spatstat_core spatstat_geom spatstat_random stringr survival]; }; + spatsurv = derive2 { name="spatsurv"; version="1.8-2"; sha256="0v6l1vxcvy6bdg6inszcz4rryb99v9ixxcmh4a3381s4md9h6z4v"; depends=[fields iterators lubridate Matrix raster RColorBrewer rgeos sp spatstat_explore spatstat_geom spatstat_random stringr survival]; }; spbabel = derive2 { name="spbabel"; version="0.5.5"; sha256="0yfkz28nfvl3rm0bxljb3y19zhnx7pabxy81d835pbfmjq5vvp51"; depends=[dplyr rlang sp tibble]; }; spc = derive2 { name="spc"; version="0.6.7"; sha256="02dw1hh3ksx119wf7qkg01m7h60pmsc3vkryw5fikyxyfz871ldl"; depends=[]; }; spc4sts = derive2 { name="spc4sts"; version="0.6.3"; sha256="0lvsixjgdfgnr7y7kk2227bcs8sqy2mrpw50dwwgdjvm5q0sr7l7"; depends=[gridExtra rpart]; }; @@ -16873,6 +16984,7 @@ in with self; { spcr = derive2 { name="spcr"; version="2.1.1"; sha256="09clpz0vqssagmfjcrs2qp5i61ppjr9nxn342l6gbdnbw91wc7f3"; depends=[]; }; spd = derive2 { name="spd"; version="2.0-1"; sha256="00zxh4ri47b61jkcjf5idl9hhlfld6rhczsnhmjsax59884f2i8m"; depends=[KernSmooth]; }; spdep = derive2 { name="spdep"; version="1.2-7"; sha256="1slykkgvn7blj59lbzj0g0r0dqlcbp0gwnw43sihlbdz4m45kb4x"; depends=[boot deldir e1071 s2 sf sp spData units]; }; + spdl = derive2 { name="spdl"; version="0.0.2"; sha256="18iw1sx2cig2qw85d0vwa8s531pxvqkv9v9fyx0n1afq80pa93d7"; depends=[RcppSpdlog]; }; 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]; }; @@ -16889,7 +17001,6 @@ in with self; { spectator = derive2 { name="spectator"; version="0.1.1"; sha256="0c3rk4nh3fdk49mazsbzqdq0wa0pznib567b0h915hv5i8kdsl5q"; 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=[]; }; spectralGraphTopology = derive2 { name="spectralGraphTopology"; version="0.2.3"; sha256="09nsszm2f6q8kz84kn7ihhb627q186jwpvr6fm633l8app4ilf2x"; depends=[MASS Matrix progress Rcpp RcppArmadillo RcppEigen rlist]; }; spectralR = derive2 { name="spectralR"; version="0.1.2"; sha256="0vjx0m7cibv0dk7p5la77caf66bj8k7djhw6i1nibghk7qf00lbk"; depends=[dplyr geojsonio ggplot2 reshape2 rgee rlang sf tibble tidyr]; }; @@ -16929,7 +17040,7 @@ in with self; { spinyReg = derive2 { name="spinyReg"; version="0.1-0"; sha256="0kbg7rncrrl5xdsaw9vj909x97mfp77mjnvghczplmnwmmanyn72"; depends=[]; }; spiralize = derive2 { name="spiralize"; version="1.0.6"; sha256="10zz0f3z033pqi9rm3kgac85i5h8ngg2cx4dlr8z5y8v08dpln6b"; depends=[circlize GetoptLong GlobalOptions lubridate]; }; spiritR = derive2 { name="spiritR"; version="0.1.1"; sha256="1fjr63rl9hwqxzgm4lkb9v74cxxpi4lrlcgjixdm7zgccm8ihdvh"; depends=[httr magrittr xml2]; }; - spiro = derive2 { name="spiro"; version="0.1.1"; sha256="0pr3ivlqsn8pjpb0vphffcf37xwm3c712rq19fq8b2j7xlbfkgnc"; depends=[cowplot digest ggplot2 knitr readxl signal xml2]; }; + spiro = derive2 { name="spiro"; version="0.1.2"; sha256="026l0hq7jxm9hnmwmjkyvs7601yz9ljcz45pily6jb2gjcg4z8w7"; depends=[cowplot digest ggplot2 knitr readxl signal xml2]; }; splancs = derive2 { name="splancs"; version="2.01-43"; sha256="0j641xipb3nzncxwgf1adrcc95jqinhx68fr55mcixk93xg5cldk"; depends=[sp]; }; splash = derive2 { name="splash"; version="1.0.2"; sha256="1iviwf7dxlrbfzjigl8wd8q3i0jkdnb7mr8zy6zg0w81p4416q42"; depends=[]; }; spldv = derive2 { name="spldv"; version="0.1.1"; sha256="0v721z8v0dhnkcbljw592hhlgg32a6sh9hz4lx9p2jpkx8mpz9bb"; depends=[car Formula MASS Matrix maxLik memisc numDeriv spatialreg sphet]; }; @@ -16952,7 +17063,7 @@ in with self; { splutil = derive2 { name="splutil"; version="2022.6.20"; sha256="02hic08ckjg7iyjcyjncrkvjnpbpxk0v8g1yxy2s1vaw0mmfj4cz"; depends=[data_table ggplot2 magrittr]; }; spm = derive2 { name="spm"; version="1.2.2"; sha256="0slpy3cmv5l2gbgvy3yfdhzm73427bl39shadpmf3jkkbflcczsn"; depends=[biomod2 gbm gstat psy randomForest ranger sp]; }; spm2 = derive2 { name="spm2"; version="1.1.2"; sha256="1cf5j5gi4h8v5sjlbj279h5la8nscn3n3p3prmci9258593xgkjq"; depends=[e1071 fields gbm glmnet gstat MASS nlme psy randomForest ranger sp spm]; }; - spmodel = derive2 { name="spmodel"; version="0.1.1"; sha256="00d84xzhmqljz3gxrxp3bg9fk2rn1wiyks6rr3mmcmjqds6c80ln"; depends=[generics Matrix sf tibble]; }; + spmodel = derive2 { name="spmodel"; version="0.2.0"; sha256="16cawihxf9kn4q4jrv3qqmddkin323wcsrl3zl7js65q4dqkk6ka"; depends=[generics Matrix sf tibble]; }; spmoran = derive2 { name="spmoran"; version="0.2.2.6"; sha256="0d97saji49k69fgkg0zk5pdrmy81kvij96nv1v5y8axf8in2znhb"; depends=[doParallel fields FNN foreach ggplot2 Matrix rARPACK RColorBrewer sp spdep vegan]; }; spnaf = derive2 { name="spnaf"; version="0.2.1"; sha256="1v19rhcy8na5iz0mqkadgmqyzq9maqnzb4s7l6blq6zz3krgaj0s"; depends=[dplyr magrittr rlang sf spdep tidyr]; }; spnet = derive2 { name="spnet"; version="0.9.1-0"; sha256="1fy0fpgz2k985brfqyza1l49y0w2j9z308n542pgmkzqsnsdscpw"; depends=[shape sp]; }; @@ -16964,14 +17075,12 @@ in with self; { spooky = derive2 { name="spooky"; version="1.4.0"; sha256="18qlm1dvspw2n7xanrxvflgvdppva3pxrs6m56cia2klv95rn1xn"; depends=[entropy fANCOVA fastDummies ggplot2 greybox imputeTS lubridate modeest moments philentropy purrr readr scales tictoc]; }; spork = derive2 { name="spork"; version="0.2.2"; sha256="09n159nkrgpwf6ck24axgsxh6dm1xays9pgx940pzmaq7vzb5ng4"; depends=[ggplot2 latexpdf png]; }; sport = derive2 { name="sport"; version="0.2.0"; sha256="1wb28iaa35naf5aczijb5g0l41yf098f7c20mjmkcd5w04l1mmks"; depends=[data_table ggplot2 Rcpp]; }; - sportyR = derive2 { name="sportyR"; version="2.0.1"; sha256="1pbfdyhp5i377g59bg74w026y4sxx12m5x53l1qk2bhvyiib4a12"; depends=[ggfittext ggplot2 glue]; }; + sportyR = derive2 { name="sportyR"; version="2.1.0"; sha256="0wbhj2r1b19x4qc1dfj1nk7wjrap0fzf1k7pmqq9xl3dyrgc8rch"; depends=[ggfittext ggplot2 glue]; }; spotGUI = derive2 { name="spotGUI"; version="0.2.3"; sha256="0hybpw0lgqrzrryfp08qvl42hrgdmx2hq7bavxjihm8mp0375dmz"; depends=[batchtools gridExtra httpuv plotly rclipboard rhandsontable shiny shinyBS shinydashboard shinyFiles shinyjs smoof SPOT XML]; }; spotidy = derive2 { name="spotidy"; version="0.1.0"; sha256="0hg8d3piiwp4q3257qsv5l41zc3c5a8mbq595ci63id8fc2q2pkd"; depends=[dplyr httr magrittr purrr]; }; - 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]; }; spqdep = derive2 { name="spqdep"; version="0.1.2"; sha256="0q2sp76kgrmw2w033m9i69vx0shziazr31akjmighcy1pdz3b695"; depends=[broom dplyr ggplot2 gridExtra gt gtools igraph lwgeom magrittr Matrix purrr rgeoda rsample sf sp spatialreg spdep tidyr]; }; - spray = derive2 { name="spray"; version="1.0-20"; sha256="0p8xwjwjrpfk5nwrap5vbnab4gpn6cjsgzkxbk70xdwbx3r1cv5z"; depends=[disordR magic mathjaxr partitions Rcpp]; }; + spray = derive2 { name="spray"; version="1.0-22"; sha256="1dzv0ciimiprxsmqb9b49sx4j3i6jakx4sw4bhhmfklsj0p018r2"; depends=[disordR magic mathjaxr partitions Rcpp]; }; spreadr = derive2 { name="spreadr"; version="0.2.0"; sha256="180dvr39i1glc0jllsnnglwrxh133q20v7px2fmdi7229pr175id"; depends=[assertthat extrafont ggplot2 igraph Matrix Rcpp]; }; spreval = derive2 { name="spreval"; version="1.1.0"; sha256="1zapfld0d6yyxqvijkb243zqin9xwqhmnznd2nnd4cp0rq3106zf"; depends=[interp timeDate]; }; sprex = derive2 { name="sprex"; version="1.4.1"; sha256="14idml4mipd4wyza7hqf49ww4dparmwaps35hxm8jg5h0w1pgh7j"; depends=[swfscMisc]; }; @@ -16979,8 +17088,7 @@ in with self; { springpheno = derive2 { name="springpheno"; version="0.5.0"; sha256="16pa56k1pbazv3vx5lhzc8n3pazrfh1q4bi7116bbvsdgpp9vs8g"; depends=[]; }; sprintr = derive2 { name="sprintr"; version="0.9.0"; sha256="0nnzjn7zrcgcmk3rs0hn56jcjrzrn5z0kc77bv4zzvbz5vr8gbwj"; depends=[glmnet Rcpp RcppArmadillo]; }; sprtt = derive2 { name="sprtt"; version="0.1.0"; sha256="1lj4qrn8ajl9lmx9qrcxrrd187khs3afvmf2hpwmakxfn6sajm0z"; depends=[]; }; - 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.2.0"; sha256="17ljrl3cn18isazi763iff5yxg916a5ck82mzc0clvxav1bcwyxr"; depends=[]; }; + sps = derive2 { name="sps"; version="0.3.0"; sha256="07y3hwkkzj8pd6by9wlipx1s7d2b4pj0kv3xv8g8ih4mriv33d8b"; depends=[]; }; spsComps = derive2 { name="spsComps"; version="0.3.2.1"; sha256="0b4bai6yk6spcansjfnxd5328jlf46cjqqjj3f5dd2kph2rx4kqw"; 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]; }; @@ -16988,10 +17096,10 @@ in with self; { spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; }; spsur = derive2 { name="spsur"; version="1.0.2.5"; sha256="0ar1b48r2hi50rvzkr432lpcc4c9r72hxkz74gip5gf12i7mx2ci"; depends=[Formula ggplot2 gmodels gridExtra MASS Matrix minqa numDeriv Rdpack rlang sparseMVN spatialreg spdep sphet]; }; spsurv = derive2 { name="spsurv"; version="1.0.0"; sha256="11jlbzvzxv3d1d0nwpbii46ddvphglrxv25rw7pvxbybcx2i7k6x"; depends=[BH coda loo MASS Rcpp RcppEigen rstan rstantools StanHeaders survival]; }; - spsurvey = derive2 { name="spsurvey"; version="5.3.0"; sha256="1wvl6lbww82c1z83928zgn5l1ciayppb6k84l2syxn6fs1xjadbc"; depends=[boot crossdes deldir lme4 MASS sampling sf survey units]; }; + spsurvey = derive2 { name="spsurvey"; version="5.4.0"; sha256="1sd7h342yih8hgiry0zip0nymgnak5d67320kimv6ajrx13v23z3"; 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]; }; + sptotal = derive2 { name="sptotal"; version="1.0.1"; sha256="09wkcc1lbc9d0m19ncqcb3xxgl30lyii6r5nqb9rbjqyf2jl2iak"; depends=[ggplot2 viridis]; }; spuRs = derive2 { name="spuRs"; version="2.0.2"; sha256="00c0hnyrcbkbj269czxbfgmgi88y0vxzm79sxclllkzr9rdd1p53"; depends=[lattice MASS]; }; spup = derive2 { name="spup"; version="1.3-2"; sha256="098zga5dm785v5k0s0ql6j17i6zbnka0yhfni4irlki3y1ndw78m"; depends=[gstat magrittr mvtnorm purrr raster sp whisker]; }; sqldf = derive2 { name="sqldf"; version="0.4-11"; sha256="0q12vsb53p2wchgp8wfz5bk08wfnm0jxjrakclj4jyy6x3a7ksff"; depends=[chron DBI gsubfn proto RSQLite]; }; @@ -17008,13 +17116,13 @@ in with self; { 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.2"; sha256="1wsfjnkszxvx4pjgpi2v14s94d7rpl13pallja6rfcmsgxp3kc2l"; depends=[caret dplyr gamlss gamlss_dist magrittr TeachingSampling]; }; - srm = derive2 { name="srm"; version="0.3-6"; sha256="0mc97pv1hsmia4v2wyb8yi37i3v1xypfv9xmhjb989xnnysf1lm3"; depends=[Rcpp RcppArmadillo]; }; + srm = derive2 { name="srm"; version="0.4-26"; sha256="1cw0a0n1chnri6jmcav04qa52s8jakviwjpq1yx1x5z2ya978r26"; 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.2"; sha256="1qysngpvpyncv5hhnvkicsj0laxc44ljbndp0ycgk53rj60mczfg"; 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]; }; + ssaBSS = derive2 { name="ssaBSS"; version="0.1.1"; sha256="1sfhrp5y4hhnc417jq2vyk935iyicl58jbw4nwrj3rayh0ng7dbp"; depends=[BSSprep ggplot2 ICtest JADE tsBSS xts zoo]; }; ssanv = derive2 { name="ssanv"; version="1.1"; sha256="17a4a5azxm5h2vxia16frcwdyd36phpfm7fi40q6mnnrwbpkzsjd"; depends=[]; }; ssc = derive2 { name="ssc"; version="2.1-0"; sha256="1lq71p8hbjfg4a52009810k5dmhak9ddk1dywvhy7v2gjmxqnadw"; depends=[proxy]; }; sscor = derive2 { name="sscor"; version="0.2"; sha256="1kcrr90cxg6k4qkc3pidhkwf4dsnlgbxczxigr2afwpd9cpf104c"; depends=[mvtnorm pcaPP robustbase]; }; @@ -17026,7 +17134,7 @@ in with self; { ssfit = derive2 { name="ssfit"; version="1.2"; sha256="1xq3gb76hs1mypjn6zyhwki5qkw3bnj51ljm10khky607mq5qz6q"; depends=[survey]; }; ssgraph = derive2 { name="ssgraph"; version="1.14"; sha256="06cqa9q311jy4iggwh7vksxxkzy2lvrppqx2apc7gwmrslw1qzgl"; depends=[BDgraph]; }; ssh = derive2 { name="ssh"; version="0.8.2"; sha256="14sasc28ipjdhb0k8ziby2v4n8gfmsp917y9725h6fsq0n01p002"; depends=[askpass credentials]; }; - sship = derive2 { name="sship"; version="0.8.0"; sha256="0khmi81pw5vqv42v9iynq7r9jwan8g2xzlapp26y9i3kyxfavg17"; depends=[httr jsonlite openssl RCurl yaml]; }; + sship = derive2 { name="sship"; version="0.9.0"; sha256="0h0cbbvqfmik2z0qp34gym81p01x01yndymczb8vpqnj0nfnmyhc"; 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.3"; sha256="1yirk6sl72d99sznvr5hm1sn4766sfrw66hhffb9g88b19lfpprd"; depends=[]; }; ssizeRNA = derive2 { name="ssizeRNA"; version="1.3.2"; sha256="1qw10yswzpg28fhvr6rsq0gh7xivfapw64gxc0hakb1nc31jf8ky"; depends=[Biobase edgeR limma MASS qvalue ssize_fdr]; }; @@ -17073,12 +17181,12 @@ in with self; { starma = derive2 { name="starma"; version="1.3"; sha256="07r0kyabhgbm2v39fcrw0qhxcxj9a9cb45g9chzcnn9qmvramcwx"; depends=[ggplot2 Rcpp RcppArmadillo scales]; }; starnet = derive2 { name="starnet"; version="0.0.6"; sha256="0gbg8svyj4nh846q7986ap7jjry599kb1348k9lifz19kvyr4rn4"; depends=[cornet glmnet Matrix survival]; }; starry = derive2 { name="starry"; version="0.1.1"; sha256="16qj20glr5xwh718r0mh0qgbqikwg3si78yxq61z16i3qfb0gdp6"; depends=[bslib dplyr ggplot2 magrittr shiny shinyjs shinyWidgets]; }; - stars = derive2 { name="stars"; version="0.5-6"; sha256="0qcli9bangpym4yp96yfibd5f4li5qw1622jnbvzfd9n8aakqhg0"; depends=[abind classInt lwgeom rlang sf units]; }; + stars = derive2 { name="stars"; version="0.6-0"; sha256="0zwbsqp8bihcq5sjdw05pvbh4l9s68p0qw3ffkk0jphsipvy9za9"; 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.1"; sha256="04z3xaijhgn5g10vvx19lya6v17ypcq00w4jlgkap3fafw61pqhn"; 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.2.0"; sha256="12kigspfpmzibnr7y8m906qj1hm596wx8asghi0fd4598nk1w0s3"; depends=[abind bigmemory ClimProjDiags easyNCDF future multiApply PCICt s2dv]; }; - starter = derive2 { name="starter"; version="0.1.11"; sha256="1jxwg09dl6mx4zxz8gx45kd0mfd87nhkai0p64z5wmvhds6syfbz"; depends=[cli dplyr gert glue here R_utils renv rlang rstudioapi]; }; + startR = derive2 { name="startR"; version="2.2.1"; sha256="1sjhyv4rnb42pa5p4lz9dn87jl5npdclllpypkxs1wbi5241ajcd"; depends=[abind bigmemory ClimProjDiags easyNCDF future multiApply PCICt s2dv]; }; + starter = derive2 { name="starter"; version="0.1.12"; sha256="1ydqz8m9zfis0gv9sx12gs4m9kz7xk9f2l55pzifwl0m61a04c65"; depends=[cli dplyr gert glue here R_utils renv rlang rstudioapi]; }; starticles = derive2 { name="starticles"; version="0.1.0"; sha256="11jmjsbzniyfnszfffhr78rqa588y77rlx2sbp92a3jpmcbx0h56"; depends=[bookdown knitr rmarkdown]; }; startup = derive2 { name="startup"; version="0.19.0"; sha256="00rqvk6acg28ls4p8gfdxvzmpmkgx6gk52vdjxh63l1a50xgymg6"; depends=[]; }; startupmsg = derive2 { name="startupmsg"; version="0.9.6"; sha256="0vkqxir4ady4dn9s70dfg1fxck2xg8vnmrmxjzvk01i6pc9zyq0x"; depends=[]; }; @@ -17101,8 +17209,8 @@ in with self; { statgenGxE = derive2 { name="statgenGxE"; version="1.0.5"; sha256="1kq5bin4k66d8l9l4z2b0gx6s8ick5fim0qcsjayvgip25gkxf5z"; depends=[emmeans ggplot2 gridExtra knitr lme4 statgenSTA xtable]; }; statgenHTP = derive2 { name="statgenHTP"; version="1.0.5"; sha256="1lclxc4al3h7z5cbjhmm6p1hr22gysz16hlvfams37czbc2prlha"; depends=[animation factoextra ggforce ggnewscale ggplot2 gridExtra locfit lubridate reshape2 scales SpATS]; }; statgenIBD = derive2 { name="statgenIBD"; version="1.0.5"; sha256="0jiw3rivlmgg883m8jsjzq6gckb2vim4fx1kr1rb3r76i8q2p1ql"; depends=[data_table ggplot2 Matrix Rcpp RcppArmadillo stringi]; }; - statgenMPP = derive2 { name="statgenMPP"; version="1.0.1.1"; sha256="1i7ybvpxs1n1abvk2in5ydhcr5dcvmwqik6w7hn6nw7ak4dg3jws"; depends=[data_table foreach ggplot2 gridExtra LMMsolver Matrix scales spam statgenGWAS statgenIBD stringi]; }; - statgenSTA = derive2 { name="statgenSTA"; version="1.0.9"; sha256="1j9z10zkjwmbg4wgr0bs34dh7qmdkjm2xa6hl4ka1rbj0sn435ld"; depends=[emmeans ggplot2 ggrepel gridExtra knitr lme4 mapproj maps qtl scales SpATS xtable]; }; + statgenMPP = derive2 { name="statgenMPP"; version="1.0.2"; sha256="1qpf9gic9671hr6zyj56sqwx9wl51qr6gj84rfssdla718h766im"; depends=[data_table foreach ggplot2 gridExtra LMMsolver Matrix scales spam statgenGWAS statgenIBD stringi]; }; + statgenSTA = derive2 { name="statgenSTA"; version="1.0.10"; sha256="0ki6k1j8fxfys787bmk6drl900c5qkqp2271l4zyh1nn2750z35s"; depends=[emmeans ggplot2 ggrepel gridExtra knitr lme4 mapproj maps qtl scales SpATS xtable]; }; static = derive2 { name="static"; version="0.1.0"; sha256="1n9ijilh81w2fz4cyd4abjj7qam8q7rirmp8lni5cxsb4il0qbfa"; depends=[]; }; 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]; }; @@ -17112,13 +17220,13 @@ in with self; { 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.7.0"; sha256="1cx1h1yzs8jjxk10y2h0wl69caspzgx5wdqp36dp4sxm0sk335xn"; depends=[coda]; }; statnetWeb = derive2 { name="statnetWeb"; version="0.5.6"; sha256="1haf2kr1mwvaz4hlwla2ysbcy3sbfcg3i4hyiy9y6lcffvy4w9w0"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; }; - 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]; }; + statnipokladna = derive2 { name="statnipokladna"; version="0.7.2"; sha256="1n7gvr57c27ilxrnpmr0bz6hc0d39lp6rnn4dkqdwdapzyhfymq4"; depends=[cli curl dplyr httr jsonlite lifecycle lubridate magrittr purrr readr rlang stringi stringr tibble tidyr xml2]; }; statprograms = derive2 { name="statprograms"; version="0.2.0"; sha256="0m7px7fmpz2zzlfdi7rbllcjvcjp8iy94f6fa1w4xinh7vz3y6vq"; depends=[]; }; statpsych = derive2 { name="statpsych"; version="1.2.0"; sha256="1vi2zja65ypny3p4wxb27aw9hl1mb7xbrdpl602bv1wxxbvw87ql"; depends=[mathjaxr mnonr Rdpack]; }; statquotes = derive2 { name="statquotes"; version="0.3.1"; sha256="08xvnqbh0ax261hhgq1pkmcpvdcy44nhhmsxaapy9q8ppfvn7vi1"; depends=[stringr tidytext wordcloud]; }; - stats19 = derive2 { name="stats19"; version="2.0.0"; sha256="0minav2ab9xa9xq5mardjcijaxhs3v1izxmy15v5zf04lhvz4f03"; depends=[readr sf]; }; + stats19 = derive2 { name="stats19"; version="2.0.1"; sha256="1qjf0q952qffphia6h7haff764k9iiwm9lyw9h5jcga03q733myb"; depends=[readr sf]; }; stats4teaching = derive2 { name="stats4teaching"; version="0.1.0"; sha256="1i2v97k6c75096hp23zpffmdbajdzzkqp508p9dvw841vpx2wxdn"; depends=[asbio car clusterGeneration knitr MASS MVN nortest psych pwr rstatix]; }; - statsExpressions = derive2 { name="statsExpressions"; version="1.3.4"; sha256="12ji5j8y62j44f4zzxhvxhzw3zr0dgdfnmi5y09k3j66mx8spv77"; depends=[BayesFactor correlation datawizard dplyr effectsize glue insight magrittr parameters performance rlang tibble tidyr WRS2 zeallot]; }; + statsExpressions = derive2 { name="statsExpressions"; version="1.3.5"; sha256="0phjaxyq04ysrchimq5q9i3zzy0qhrs5r08m2l14k35s2303s285"; 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.2.0"; sha256="03h0gq8ag51my5z8mw78rhbkksfpa7af8my6lb468wrcfv69k0gl"; depends=[curl dplyr httr jsonlite rlang]; }; @@ -17130,6 +17238,7 @@ in with self; { stdvectors = derive2 { name="stdvectors"; version="0.0.5"; sha256="0gxylknr146qyg9aj22md076cdhrsz75dg25a1hx8525cm71nwd6"; depends=[Rcpp]; }; steadyICA = derive2 { name="steadyICA"; version="1.0"; sha256="0mcalbsgajdpk45k9vpyavn079063hw4ihkw72n9wcy5nb0da14g"; depends=[clue combinat MASS Rcpp]; }; steepness = derive2 { name="steepness"; version="0.3-0"; sha256="1lv2n4s8dj7axsmwmpfp4aw6v530r7437f44533pbx6p4n71hpzl"; depends=[]; }; + stelfi = derive2 { name="stelfi"; version="0.0.1"; sha256="0rjkvrn3vwd4mzb2042syfhds4za4cqqlhjs6l95d09rn1q7nahx"; depends=[dplyr ggplot2 gridExtra Matrix RcppEigen sf TMB]; }; stellaR = derive2 { name="stellaR"; version="0.3-4"; sha256="0spn25fbsfswx2rshzk34pqkicynyl256a4f7xrh51bhyh9qff44"; depends=[]; }; stemmatology = derive2 { name="stemmatology"; version="0.3.2"; sha256="1l2y4jlszz1dnafdl2wqqfgdjis07i3gzfnp1v1af32pvjy4zqhw"; depends=[cluster igraph xml2]; }; stenR = derive2 { name="stenR"; version="0.6.9"; sha256="19vn7123wys1jqrm4y8f6b4kvwygi1ql6ady2d5jz93vf29ihdzj"; depends=[cli data_table dplyr moments R6 rlang]; }; @@ -17137,26 +17246,28 @@ 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-3"; sha256="1v1q4skd3k74nsdkv4ly5h1w10hlxpzcscswghan8r27k502vq12"; depends=[digest lowpassFilter R_cache Rcpp]; }; - stepSplitReg = derive2 { name="stepSplitReg"; version="1.0.2"; sha256="1fpnni4fz8hh9z0yld696wz2qpc2bwajp8pyfgjms9f2figx9prl"; depends=[nnls Rcpp RcppArmadillo SplitGLM]; }; + stepSplitReg = derive2 { name="stepSplitReg"; version="1.0.3"; sha256="04ks599bb3rbyc81kyakj6nmj7i8fvkb1pild0gd3i6j84j70071"; depends=[nnls Rcpp RcppArmadillo SplitGLM]; }; stepdownfdp = derive2 { name="stepdownfdp"; version="1.0.0"; sha256="1yqzxn4d52ih03f0mpvb9dw9pn9jfbgnyay1pfhh112zml5h6i3m"; depends=[pracma]; }; stepgbm = derive2 { name="stepgbm"; version="1.0.0"; sha256="1psjnxc7dadbm1405wm3vgsf9m2pn8bm82rn9md3cxhp33jqh1bx"; depends=[gbm spm steprf]; }; stepjglm = derive2 { name="stepjglm"; version="0.0.1"; sha256="0xsb0wg7ka4ska2jkzaic7kqdzj2fkhpf5sxr3a116f2najj9ax2"; depends=[rsq]; }; + stepmixr = derive2 { name="stepmixr"; version="0.1.0"; sha256="1psq9znrk3za9cgvhbnfh7jy77mwr2h03y5iqdk8za3n6dy0fdg0"; depends=[reticulate]; }; stepp = derive2 { name="stepp"; version="3.2.5"; sha256="0srjx950hy7v1xmhhnimvndpyz2wm8l03z67z0zxjg2w7wnqrqvs"; depends=[car rstudioapi scales survival]; }; steprf = derive2 { name="steprf"; version="1.0.2"; sha256="1wscxnglxi61agmfn1zmhh75c7h5394r8d8khr02p22a234npqqi"; depends=[psy randomForest spm spm2]; }; steps = derive2 { name="steps"; version="1.3.0"; sha256="0yvqz5jhzwqkm3gphb2mmlq1ip6sr8g6c09hirs827j12dj63ixf"; depends=[future future_apply memuse raster rasterVis Rcpp viridisLite]; }; - stevedata = derive2 { name="stevedata"; version="0.7.0"; sha256="1shi1abzf4vkz790f6b4720g28hh6kzsi40mdw7gp9xwr97a1dyz"; depends=[]; }; - stevedore = derive2 { name="stevedore"; version="0.9.4"; sha256="0qf7qid8sv3agzci7kvgh204h3p6bk60bh45zri987j2qqjjxiiy"; depends=[crayon curl jsonlite yaml]; }; + stevedata = derive2 { name="stevedata"; version="0.8.0"; sha256="0cf0mik421j607bc9ymyf89qd8fzaqibskhkfzqlv4qqj2xab4l5"; depends=[]; }; + stevedore = derive2 { name="stevedore"; version="0.9.5"; sha256="0xxslmll3xg2a71k3bgxfdkz0xcvlsy0cgm9l5din0ml55f3xz5n"; depends=[crayon curl jsonlite yaml]; }; stevemisc = derive2 { name="stevemisc"; version="1.4.1"; sha256="1d0avg7f1r95k6dvm1vhvji2gadqxkm77pbnljad2p4145sxc41x"; depends=[arm dplyr forcats ggplot2 httr labelled lme4 magrittr purrr rlang rmarkdown stringr tibble tidyr]; }; stevetemplates = derive2 { name="stevetemplates"; version="0.8.0"; sha256="0rm39jrzzi10ncl59xhixy0a9fiwqw5s10pxr90gckscxz1bjkwc"; depends=[rmarkdown]; }; stfit = derive2 { name="stfit"; version="0.99.9"; sha256="0668nnsgkdd2v7bx06wnq8sc0asbi19p4752jm0hj2jziiibk0kn"; depends=[abind doParallel fda foreach Matrix raster rasterVis RColorBrewer Rcpp]; }; sticky = derive2 { name="sticky"; version="0.5.6.1"; sha256="1szfpay9cpdwq6v5fmnjyr00r4zhz6zd2rrl3h88v9l5xpfafi4w"; depends=[]; }; + stickyr = derive2 { name="stickyr"; version="0.1.0"; sha256="0wqk4w732xb8dhbjfy1q613pia9rrmilsbpngacgw9sinsd1iq6m"; depends=[dplyr ellipsis generics pillar purrr rlang tibble tidyselect vctrs]; }; stilt = derive2 { name="stilt"; version="1.3.0"; sha256="0b1bs849hw2wcvaldybxk8h8wgwl6p7x4i7winncvngmhplgrvx4"; depends=[fields]; }; stima = derive2 { name="stima"; version="1.2.1"; sha256="091pjjr2pvd93l01szyj5gr9ixv1h90yd18h678nhpn0fncimszv"; depends=[rpart]; }; stinepack = derive2 { name="stinepack"; version="1.4"; sha256="0crl77gr4x2bz2zp0a0lqiw5iqlrcx7vj67igkbzg64d1fxai85d"; depends=[]; }; stlARIMA = derive2 { name="stlARIMA"; version="0.1.0"; sha256="1bh88dd9md8w8qhmha02v2b7cz0pfk6yrc5bhxj8xv9cwanl7g6r"; depends=[forecast]; }; stlELM = derive2 { name="stlELM"; version="0.1.1"; sha256="1q3lcfqq06jfky388v7iilnnqbr5f4gq451xkc2kl04yl0dwcv2h"; depends=[forecast nnfor]; }; stlTDNN = derive2 { name="stlTDNN"; version="0.1.0"; sha256="1j2f9kxlry15xp7bc03h5jr7v8gzq8frdxyzhq9s78m3d3dbixf4"; depends=[forecast nnfor]; }; - stlnpp = derive2 { name="stlnpp"; version="0.3.8"; sha256="1lx2fkqal2mf55xx0rwy9wf9fkr9n0vrp8fwic4grjcq0v5cf75k"; depends=[spatstat spatstat_core spatstat_geom spatstat_linnet spatstat_random]; }; + stlnpp = derive2 { name="stlnpp"; version="0.3.9"; sha256="0d8afddz7gwdmrciz8bvwfxil7bfpf9h81rcb52mmr7j9da36mp4"; depends=[spatstat spatstat_explore spatstat_geom spatstat_linnet spatstat_random]; }; stlplus = derive2 { name="stlplus"; version="0.5.1"; sha256="14728xsm982z9sg4rbqg307pbwqlsiyzj8z3sr9wr6fi0dayf6z5"; depends=[lattice Rcpp yaImpute]; }; stm = derive2 { name="stm"; version="1.3.6"; sha256="0qwq4nin2n9fjd06852r8k7arvcgh46kcfb3lm21swgx6j8bgrhb"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; }; stmCorrViz = derive2 { name="stmCorrViz"; version="1.3"; sha256="1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv"; depends=[jsonlite SnowballC stm tm]; }; @@ -17165,6 +17276,7 @@ in with self; { stminsights = derive2 { name="stminsights"; version="0.4.1"; sha256="1ll2chjz9r08lya2z7dnxjqdnwrvw7jn05mpvvxi1w8s2npsggib"; depends=[dplyr ggplot2 ggraph ggrepel huge igraph purrr readr scales shiny shinyBS shinydashboard shinyjs stm stringr tibble tidygraph]; }; stoRy = derive2 { name="stoRy"; version="0.2.0"; sha256="1mxnnmg6wqp40hyh2mjd39vpzks78rr59pdlyxljlpnlslgkf1md"; depends=[cli crayon dplyr fansi httr lifecycle purrr R6 rappdirs readr rlang stringr tibble tidyjson tidyr]; }; stocc = derive2 { name="stocc"; version="1.31"; sha256="0d0n9nrcva0vradippq30y6dc6klwd1mllnzpnzq9rczpz5cw7mw"; depends=[coda fields Matrix rARPACK truncnorm]; }; + stochLAB = derive2 { name="stochLAB"; version="1.1.1"; sha256="11vk5vd8y4md29cawf2x9m9zrmd0rl6vbfmhs4fzkcm4xsyp1brh"; depends=[cli dplyr glue logr magrittr msm pracma purrr rlang tibble tidyr]; }; stochQN = derive2 { name="stochQN"; version="0.1.2-1"; sha256="1lfzivl745dj94kap103arz0zy75wk69kc6v84xaaxk7ad3icnaj"; depends=[]; }; stochprofML = derive2 { name="stochprofML"; version="2.0.3"; sha256="0j6m2byh7w9kcbp3mfvmg6fm6z0dq8k4qabj1yfkl0d1y2ifd1zd"; depends=[MASS numDeriv]; }; stochvol = derive2 { name="stochvol"; version="3.2.0"; sha256="1ix8x3gmm5advdxk0rd0p26x3487qmw6pv4mi628vjqpmvnv42fr"; depends=[coda Rcpp RcppArmadillo]; }; @@ -17174,7 +17286,7 @@ in with self; { stockfish = derive2 { name="stockfish"; version="1.0.0"; sha256="1il3na3d96k34vj62pvxrs2ah3a9ly8ww3gi3nr0459piw4wd611"; 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-4"; sha256="06q35faqrcarx6n00i5s45ynpwi6n6xizyr8w9c436c4ahg0xvyh"; depends=[]; }; - stokes = derive2 { name="stokes"; version="1.1-3"; sha256="0d15x80vn6g0fwvphdqdl7fyldzw5pcrjlx5c93bdcx1kx2g7sqa"; depends=[disordR mathjaxr partitions permutations spray]; }; + stokes = derive2 { name="stokes"; version="1.1-6"; sha256="074kzvzgk83n2bzcvygxiy8cm5sxswkp593rjixa4kvaqc7g7w0y"; depends=[disordR mathjaxr partitions permutations spray]; }; stopdetection = derive2 { name="stopdetection"; version="0.1.1"; sha256="07l2rr047p0hpvgmr7c5x0by456n107r9d0qj4xrrigq5i6srrqk"; depends=[data_table geodist lubridate]; }; stoppingrule = derive2 { name="stoppingrule"; version="0.1.0"; sha256="045z4bfvqkf62bmm4zaifl34hbcd191jv77s8ddbv1a7nqc52ds1"; depends=[]; }; stopwords = derive2 { name="stopwords"; version="2.3"; sha256="1ci1cgxrcvlhhplximsfv0plvjdbcd5kv0nphxnpildsn5m1rv65"; depends=[ISOcodes]; }; @@ -17182,15 +17294,15 @@ in with self; { stortingscrape = derive2 { name="stortingscrape"; version="0.1.2"; sha256="0dy9cw20wxnghli8p1zf8dn2ms38p33521inr7x2vxnj80qpvkjk"; depends=[dplyr httr rvest stringr]; }; storywranglr = derive2 { name="storywranglr"; version="0.2.0"; sha256="07w3dwv2naqbbdzjcv58cisj7cv1rbhrk96a30q8ww11rf953rj4"; depends=[dplyr httr jsonlite tibble urltools]; }; stosim = derive2 { name="stosim"; version="0.0.14"; sha256="10k8j7manskjsrjc1l44yhy682b1qh0k2jx3cs5k69j2z42mnhmk"; depends=[Rcpp]; }; - stplanr = derive2 { name="stplanr"; version="1.0.1"; sha256="0x4v7c6cdg6hdw5f65jk6bb4cp85khhc1dgvwcxy1yjzjd4g7b3k"; depends=[curl data_table dplyr httr jsonlite lwgeom magrittr nabor od pbapply Rcpp rlang sf sfheaders]; }; + stplanr = derive2 { name="stplanr"; version="1.0.2"; sha256="0wp9vxv9z7qm6k5kmsilpdaabgmwx4r3hyr4bggjwrpcf0bd59x9"; depends=[curl data_table dplyr httr jsonlite lwgeom magrittr nabor od pbapply Rcpp rlang sf sfheaders]; }; stpm = derive2 { name="stpm"; version="1.7.12"; sha256="16kp69356bj1s26iwwysxdyr87kd3jqhj2gmmz4vc003ai63ga6y"; depends=[MASS nloptr Rcpp RcppArmadillo sas7bdat survival]; }; - stpp = derive2 { name="stpp"; version="2.0-6"; sha256="0ii799kqn8ydgi4bqs292fff7my5fdbrvwnizqphbk7k8xf4w5vx"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat_core spatstat_geom spatstat_random splancs]; }; + stpp = derive2 { name="stpp"; version="2.0-7"; sha256="1w9jn71ha817gldfhkmr2vfx3nkr78g1y662rfxg6flx2wyxs3kq"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat_explore spatstat_geom spatstat_random splancs]; }; stppSim = derive2 { name="stppSim"; version="1.2.7"; sha256="1hg53fxpp4k6vfafd1aasjf4z1vaik5y137i424jhbxf69aqgl2b"; depends=[chron cowplot data_table dplyr geosphere ggplot2 gstat ks leaflet lubridate magrittr raster rgdal sf SiMRiv sp sparr spatstat_geom splancs stringr terra tibble tidyr]; }; 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.6-0"; sha256="1c4p9gjjjjc7zjml7r7qhb040va8s4x16jqia3j1j5h56d6wlh7m"; depends=[ape geoscale pbapply]; }; strat = derive2 { name="strat"; version="0.1"; sha256="1axxrp750kjzcgxjdqfscjmryv1mkv4l23zk8k23z8l4ymhd2f5w"; depends=[Hmisc Rcpp RcppArmadillo]; }; - stratEst = derive2 { name="stratEst"; version="1.1.4"; sha256="1g764h17sh499p0a5ixs61q8l1hssvi7v4c34i90rdf81l72i0mg"; depends=[Rcpp RcppArmadillo]; }; + stratEst = derive2 { name="stratEst"; version="1.1.6"; sha256="0m41866xr21h4mih4z98y6pcrp2ws0mxxx157vdhbv7rhlh5djvp"; depends=[Rcpp RcppArmadillo]; }; stratallo = derive2 { name="stratallo"; version="2.1.0"; sha256="1j3ncm0plpgg3crbw69ksy7fy2db464dim1pmgslcmh0y5lvwy38"; depends=[checkmate lifecycle]; }; stratamatch = derive2 { name="stratamatch"; version="0.1.9"; sha256="1z395355kac0wd4f0m1ijh851m046ra8h1wam04if4qp00ychajp"; depends=[dplyr Hmisc magrittr rlang survival]; }; stratbr = derive2 { name="stratbr"; version="1.2"; sha256="15vkymmc61yz9szhfhc5663hfyqvh499ahwhr9mv1lhv5bikk0kb"; depends=[Rglpk snowfall stratification]; }; @@ -17212,11 +17324,11 @@ in with self; { strider = derive2 { name="strider"; version="1.3"; sha256="114j0qpdyg8rrhj68zq596pgc4h7ja39n0rfxf0x9qg7imhaj1h6"; depends=[BH Rcpp]; }; string2path = derive2 { name="string2path"; version="0.1.1"; sha256="1wlyrx7gbqjbzhd6xgmbhr3x09lk48yb110dmgxqh48gjky2ngvh"; depends=[cli tibble]; }; stringb = derive2 { name="stringb"; version="0.1.17"; sha256="0bfwwbg64nzxrx30cndqvdlhanjkx6875lg5dzm9cbwvwg2wbxcn"; depends=[backports]; }; - stringdist = derive2 { name="stringdist"; version="0.9.9"; sha256="0pkggr25azadczhnsxc9wh1753wigf3wijyvwfc2ip5a42c1f55x"; depends=[]; }; + stringdist = derive2 { name="stringdist"; version="0.9.10"; sha256="1s3cy2q6l4ppgslwfbfydi5f3kzshfhzkb25gz546n7jgw5jxm3g"; depends=[]; }; stringfish = derive2 { name="stringfish"; version="0.15.7"; sha256="0ddpsi7z0kzqgbq9y646pk9afclq0r7ak22zsdh0i93ni0x71c9l"; depends=[Rcpp RcppParallel]; }; stringformattr = derive2 { name="stringformattr"; version="0.1.2"; sha256="0x56k30clj5ajk0qg5sr8b9l0asz6ldivwr1ddy1vp1djliih1fx"; depends=[stringr]; }; stringi = derive2 { name="stringi"; version="1.7.8"; sha256="074b8wky3dhm4vcdqliwz6cqw20ah2x4dcasvnidilbfrnqii2ak"; depends=[]; }; - stringr = derive2 { name="stringr"; version="1.4.1"; sha256="1cfw1lv64lzg16zb04c0fcmd3gx8vq9x73hqikqhgqd3ra88w3gc"; depends=[glue magrittr stringi]; }; + stringr = derive2 { name="stringr"; version="1.5.0"; sha256="0fk34ql5ak57f06l10ai300kxay6r7kkkyfanh8r24qaf3bmkcaj"; depends=[cli glue lifecycle magrittr rlang stringi vctrs]; }; stringx = derive2 { name="stringx"; version="0.2.4"; sha256="1l87y6akq3a6fv1s7imn5g3rsmsbijqk6a3gcfws1i1g59ripznx"; depends=[stringi]; }; strip = derive2 { name="strip"; version="1.0.0"; sha256="1j3kq6w8k66z45rpd1cgxplpnldzbyqklgs4bnbv906pyd8wk9ak"; depends=[rlist]; }; stripless = derive2 { name="stripless"; version="1.0-3"; sha256="08mdp7kq6r5bk77j09477d1dnn7iwa346pr24b5bqsxwnbknyrsr"; depends=[lattice]; }; @@ -17228,7 +17340,7 @@ in with self; { stuart = derive2 { name="stuart"; version="0.10.1"; sha256="03rd3h2xs3n5xz9zbahi6mwap7yj22b7p71gp0dq04xszfi3jdkc"; depends=[]; }; studentlife = derive2 { name="studentlife"; version="1.1.0"; sha256="1xvlcwg7ckxsm5hb5ax8r3hzdqnx61ax59ini5xc5jrsmir13g67"; depends=[crayon dplyr ggplot2 jsonlite purrr R_utils readr skimr tibble tidyr visdat]; }; studyStrap = derive2 { name="studyStrap"; version="1.0.0"; sha256="0lvzqnq40j0xn74qrj0pqhr8zz34mbhfd7dg8bnadscsvj5ffm4c"; depends=[caret CCA dplyr MatrixCorrelation nnls pls tibble tidyverse]; }; - styler = derive2 { name="styler"; version="1.8.0"; sha256="1iw4nj68aj4psysrpyy7s6g3r3vhpfk8s05n6d20m2qmmk0p92sg"; depends=[cli magrittr purrr R_cache rlang rprojroot vctrs withr]; }; + styler = derive2 { name="styler"; version="1.8.1"; sha256="1sc1xr9pfrbd2yyzyyxpj8dd81djmsr00gxgr0mr18habyl5yl0m"; depends=[cli magrittr purrr R_cache rlang rprojroot vctrs withr]; }; stylest = derive2 { name="stylest"; version="0.2.0"; sha256="1c036zsn1gi5vhsz37p56wz1bcr3pwdp2k62j7ikmrrnkcv2w9kz"; depends=[corpus Matrix]; }; stylo = derive2 { name="stylo"; version="0.7.4"; sha256="0vjfpz4bpdrsax7a0gsj9cwddbsayb4n5fr5xskz63lfrjg2ppcb"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; }; suRtex = derive2 { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; }; @@ -17240,7 +17352,7 @@ in with self; { submax = derive2 { name="submax"; version="1.1.1"; sha256="0b9x55gqzw20smr3hx9izvyr0i8zv0h03hadn4c7ks7w8ga5i0kj"; depends=[mvtnorm sensitivityfull]; }; subniche = derive2 { name="subniche"; version="1.5"; sha256="1w5xsfqq1y9gy8wrxmfxk02jhzmyg2cdky7vm7qdcg9l63dhracj"; depends=[ade4 polyclip SIBER wordcloud]; }; subplex = derive2 { name="subplex"; version="1.8"; sha256="19g5bd39gmcn27xdsklkzxg99x1r5v5q8zcw1iwry31qj24ivhrv"; depends=[]; }; - subrank = derive2 { name="subrank"; version="0.9.9.1"; sha256="19lgw7248jq6b34i17c7vw208wsvmppni7njswd02i9xdgyjn95z"; depends=[]; }; + subrank = derive2 { name="subrank"; version="0.9.9.2"; sha256="19mxmapxjqv1k26bnis4zkrqpgvl8m0gdxqqzkdvgq89c6y9v3mj"; depends=[]; }; subsamp = derive2 { name="subsamp"; version="0.1.0"; sha256="1bfz2z2qy1war3id8qr1asygwvwxgf2hhlh075hr6bjdkxz0j0nd"; depends=[]; }; subscore = derive2 { name="subscore"; version="3.3"; sha256="01y7bp7nj0p47n69pxvj2gyrcvgj617ymhwhxlqp0jrkns1wqjy5"; depends=[boot cocor CTT irtoys ltm sirt]; }; subscreen = derive2 { name="subscreen"; version="3.0.7"; sha256="0vxwyx08bjha7vgv3lcgigar43f74fr3w7wna6z8viawh3bc7k96"; depends=[bsplus colourpicker data_table dplyr DT jsonlite plyr purrr ranger shiny shinyjs shinyWidgets]; }; @@ -17253,6 +17365,7 @@ in with self; { suddengains = derive2 { name="suddengains"; version="0.4.4"; sha256="160jna9imnpy91f6pa881w6wlrwy59db0nijrn1sf5ym1cmh5gz5"; depends=[dplyr forcats ggplot2 ggrepel magrittr naniar patchwork psych readr rlang scales stringr tibble tidyr]; }; sudoku = derive2 { name="sudoku"; version="2.8"; sha256="1z130cx30wdqch0a4f27aa9v3v29hx6d5zav308abx42s4ilysbs"; depends=[]; }; sudokuAlt = derive2 { name="sudokuAlt"; version="0.2-1"; sha256="1y3li64xqag2ia8dg7q49jmlb1awl92rz6xa9zsbf0s9jman9wj9"; depends=[magrittr]; }; + sugarbag = derive2 { name="sugarbag"; version="0.1.6"; sha256="0xgazjr55cdjcxngpfasq17pc72lkg2p9jfzfpmwkjrpvsqw8dff"; depends=[dplyr geosphere progress purrr rlang rmapshaper sf tibble tidyr]; }; sugrrants = derive2 { name="sugrrants"; version="0.2.8"; sha256="08cs74afpkvjh32hlrwbl8sdsi3p0ga4ziw32r9pihs28a060fam"; depends=[dplyr ggplot2 gtable lubridate rlang]; }; sumFREGAT = derive2 { name="sumFREGAT"; version="1.2.5"; sha256="10clll3c0ws2mccdp9grz3qw75kv7ydffak2vv9ijky8n1b39qa7"; depends=[GBJ Matrix seqminer]; }; sumR = derive2 { name="sumR"; version="0.4.10"; sha256="0gijisv3bslyhflik06nc54bbg7z84a1yc97cq3d41ad1q0ch7gk"; depends=[matrixStats]; }; @@ -17273,6 +17386,7 @@ in with self; { 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.6"; sha256="159a80v9a1z2xq0xriqaa5xb7r5slww899vhng5l73c14615jzqw"; depends=[assertthat BH data_table Metrics R6 Rcpp RcppArmadillo]; }; supernova = derive2 { name="supernova"; version="2.5.3"; sha256="1ci1zdvxpa33xbvkh0ly5x20w0h21j1x1d9iwgrn7kgccz56vrir"; depends=[backports cli ggplot2 lifecycle magrittr pillar purrr rlang stringr tibble vctrs]; }; superpc = derive2 { name="superpc"; version="1.12"; sha256="0n68qafsww00q0wx37ms3rimrlhbp085ywvv2k5vw951j4z8ivfb"; depends=[survival]; }; supervisedPRIM = derive2 { name="supervisedPRIM"; version="2.0.0"; sha256="1j5gsy119pvrhkkg048lyk6hjvn9x1bhmfy5g824gj3k1w5slrib"; depends=[prim]; }; @@ -17297,7 +17411,6 @@ in with self; { survELtest = derive2 { name="survELtest"; version="2.0.1"; sha256="03jnj88z45iw9v1628bz99608q2jwbqw6cfsvqal2jj4392fz428"; depends=[Iso nloptr plyr survival]; }; survHE = derive2 { name="survHE"; version="1.1.2"; sha256="17hdhwkzyrkk4ijyscnv9644iinxvc566n84zq2490hfvlsk6nql"; depends=[BH dplyr flexsurv ggplot2 Rcpp RcppEigen rms rstan StanHeaders tibble xlsx]; }; survIDINRI = derive2 { name="survIDINRI"; version="1.1-2"; sha256="1cl2dlxya3aqhmj7gwk5s5wfdrk5in8if04hm0bjg4ivcrw4m9r6"; depends=[survC1 survival]; }; - survJamda = derive2 { name="survJamda"; version="1.1.4"; sha256="14ly1g548ysm8jgsyrhj12zmd6i2lca7rsgby3jbwikyqyk1mx5q"; depends=[ecodist survcomp survival survivalROC survJamda_data]; }; survJamda_data = derive2 { name="survJamda.data"; version="1.0.2"; sha256="0a010v2ar48i5m0jiqjvdyqm93ckfgfmcmym9a02h0rclnizd75r"; depends=[]; }; survMisc = derive2 { name="survMisc"; version="0.5.6"; sha256="014cf7sfndmib9jmj0p3h67sr750k2pvw7m865zwdpvlqddi44fr"; depends=[data_table ggplot2 gridExtra km_ci KMsurv knitr survival xtable zoo]; }; survParamSim = derive2 { name="survParamSim"; version="0.1.6"; sha256="1dmxvdz1pp6k9rpln8w1pq1bkjmjx2jhym526c9bkl48xnla1nbw"; depends=[broom dplyr forcats ggplot2 lifecycle magrittr mvtnorm purrr rlang survival tibble tidyr]; }; @@ -17310,8 +17423,8 @@ in with self; { survSens = derive2 { name="survSens"; version="0.1.0"; sha256="1s4s5l31yps93s2zdxpidkdg8kmmwj6vb3zfndmnxvc07arwhvbv"; depends=[directlabels ggplot2 survival]; }; survSpearman = derive2 { name="survSpearman"; version="1.0.1"; sha256="1b6nj2ikf931926a47a441icbrfjcadwxxnkc35c9yz8nw1kn1ii"; depends=[]; }; surveil = derive2 { name="surveil"; version="0.2.1"; sha256="1b7nwp3rmvbnaw6l2pjhfia864cirpfhn2smib5c4zl2h9282rjk"; depends=[BH dplyr ggdist ggplot2 gridExtra Rcpp RcppEigen RcppParallel rlang rstan rstantools scales StanHeaders tidybayes tidyr]; }; - surveillance = derive2 { name="surveillance"; version="1.20.1"; sha256="0yz7jmavgybaxrhi6hczppk7j3im250994w59xn2nm5w2ll5i87z"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat_geom xtable]; }; - survex = derive2 { name="survex"; version="0.1.1"; sha256="1ppjdnlprf2kqhlsclmx1qvyps29v772nx47f49khasm9am9pk9b"; depends=[DALEX ggplot2 gridExtra ingredients pec survival]; }; + surveillance = derive2 { name="surveillance"; version="1.20.3"; sha256="0r6vx40kzw3fcw44vd5cj2bd1vcc0j1q9khmwrmp52riyc8xmzip"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat_geom xtable]; }; + survex = derive2 { name="survex"; version="0.2.2"; sha256="1ch3q44rwilbw52s50yfzi98q3s8r0a660z6v8w16i71s2yfb90g"; depends=[DALEX ggplot2 patchwork pec survival]; }; survexp_fr = derive2 { name="survexp.fr"; version="1.1"; sha256="0ci65w3w06kwab98q9gb7nb7smq9r25qfibkgfilsg1i5li6p9h5"; depends=[survival WriteXLS]; }; survey = derive2 { name="survey"; version="4.1-1"; sha256="0ljsszybzri531q6xab04r6zq11vchfs7y0snjzk57m3g0b9ms05"; depends=[lattice Matrix minqa mitools numDeriv survival]; }; surveyCV = derive2 { name="surveyCV"; version="0.2.0"; sha256="183ybmfin4xmpsmssw7hskj1rgwpabpa616bzxlir27kygyrswbz"; depends=[magrittr survey]; }; @@ -17324,10 +17437,9 @@ in with self; { survival_svb = derive2 { name="survival.svb"; version="0.0-2"; sha256="13lipzn1cnkd5dcg8n69cdghycifiin3jnjvgzsv0g60l1jk0lmp"; depends=[glmnet Rcpp RcppEigen survival]; }; survival666 = derive2 { name="survival666"; version="0.5"; sha256="11vs546lrbxnhpxjmwxhh2hnp6kwcf4hzgigi3x9525hr8n9cy01"; depends=[ggplot2 survival survminer]; }; survivalAnalysis = derive2 { name="survivalAnalysis"; version="0.3.0"; sha256="0s4cihmjhg94zcbvr7c1pxdjyc0rpbqlw1gni5xkdhqp4lnqmygf"; depends=[cowplot dplyr forcats ggplot2 gridExtra magrittr purrr rlang scales stringr survival survminer tibble tidyr tidytidbits]; }; - survivalMPL = derive2 { name="survivalMPL"; version="0.2-1"; sha256="1rskhawhpkzi3laq452kgr1740p6998z7c7p95f2023ymkdm4rxv"; depends=[MASS survival]; }; + survivalMPL = derive2 { name="survivalMPL"; version="0.2-3"; sha256="1dxn9s68f545chqg1kfdys0gr419w259b1156g92mql899fm77sq"; depends=[MASS survival]; }; survivalMPLdc = derive2 { name="survivalMPLdc"; version="0.1.1"; sha256="1wqlzpwm1p7nq19l3d7c93zv6fnn0b1w24kak9zwsgyhar3f5lv9"; depends=[copula matrixcalc splines2 survival]; }; - survivalREC = derive2 { name="survivalREC"; version="1.0"; sha256="1c4qvk2qd5ffn4kfkglwn3iyisnd2y0hzzn92c57vb94d4h057hx"; depends=[KernSmooth survival]; }; - survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; }; + survivalROC = derive2 { name="survivalROC"; version="1.0.3.1"; sha256="0p6irjs8a9xxgxwax0y9fzapcib237if3iy8g6lzv793mzmsyx41"; depends=[]; }; survivalmodels = derive2 { name="survivalmodels"; version="0.1.13"; sha256="0d5bfmvfwf3i1iim5cjrqq5vlja92znpzv1csrk488rb582zaza7"; depends=[Rcpp]; }; survivalsvm = derive2 { name="survivalsvm"; version="0.0.5"; sha256="1b4hrdrqq1z0kfn8vpdwg54388m25df2s6w9i574x3mkxkmkjkga"; depends=[Hmisc kernlab Matrix pracma quadprog survival]; }; survivoR = derive2 { name="survivoR"; version="2.0.1"; sha256="120li3dnbvsvbs54s7vmz9hhcszygz4d2famba3pv343v89l345b"; depends=[ggpath ggplot2 glue magrittr prismatic stringr tidyr]; }; @@ -17350,17 +17462,16 @@ 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.9"; sha256="1i9wnfrgr9x6qfqhl9bc4wiz4wxmzjfcmg7wvy3zjrfszmibaf78"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange vars zoo]; }; svd = derive2 { name="svd"; version="0.5.2"; sha256="0rz0alvj1aza7dncvc948s5kmjvggy8drr08hi5fz1q4s1znwn0g"; depends=[]; }; svenssonm = derive2 { name="svenssonm"; version="0.1.0"; sha256="0pvay9vfrcafaq270pq6glp2b74zdfgldksl13cwdb0wk7qx7731"; depends=[]; }; svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.4"; sha256="1iglgwbyxf5q4716h9ba2cfmxh1qq16zwy54krnawg4580v8ydh2"; depends=[htmlwidgets]; }; - svgViewR = derive2 { name="svgViewR"; version="1.4.1"; sha256="0xppvrfl7q3viahvwvmn498wli74ldwijapf6n432gvc4phmy7wi"; depends=[Rcpp rjson Rook]; }; + svgViewR = derive2 { name="svgViewR"; version="1.4.2"; sha256="0xlz86knvxxh96yr1z3px3lm0myaq6csqig11g8rrdg46lxnih3n"; depends=[Rcpp rjson]; }; 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]; }; svines = derive2 { name="svines"; version="0.1.4"; sha256="1piin3nn0z5k9gilcq4lcqj86dqlfm9xqp87cslwypkfkkhn2aia"; depends=[assertthat BH fGarch Rcpp RcppEigen RcppThread rvinecopulib univariateML wdm]; }; svmpath = derive2 { name="svmpath"; version="0.970"; sha256="19b5hfqqsh072l5mbkafm5pjd6qhyj20qd2vq6zl5jjmc45r72w1"; depends=[kernlab]; }; svplots = derive2 { name="svplots"; version="0.1.0"; sha256="0fa3mnsdaz85dy7rr6w454z516simj1zrf08sfbm05rp6jr3c7ws"; depends=[ggplot2]; }; - svrep = derive2 { name="svrep"; version="0.3.0"; sha256="104mwkappywssmcfygvxrcfsi4m7jhyak10z7c78if4f7v3h3mfa"; depends=[survey]; }; + svrep = derive2 { name="svrep"; version="0.4.0"; sha256="04mvhmkhavz1a96y5r8sr8fc8cyxi9hq0cbrsilfdpy096dkksgc"; depends=[mvtnorm survey]; }; svrpath = derive2 { name="svrpath"; version="0.1.2"; sha256="18h40555jmqpbsnhlwkvc5fl7d0r2bgscdv8amjvhjxmx9y952a2"; depends=[quadprog svmpath]; }; svs = derive2 { name="svs"; version="3.0.0"; sha256="1jn3dbaqpgydkwf9y7hq97nva26vvrpl9zmw2bw4ky1qgzgz1ypb"; depends=[gtools Matrix]; }; svyVGAM = derive2 { name="svyVGAM"; version="1.1"; sha256="0y5bwp961g9z4p18igbvbh2wrzpl3ivipi305qny7a4rlpbxcfph"; depends=[survey VGAM]; }; @@ -17374,7 +17485,7 @@ in with self; { swatches = derive2 { name="swatches"; version="0.5.0"; sha256="1kivscgka8gn44rjj0s5sjan1s04znnyn0nd37a74zaik0hm8zs0"; depends=[colorspace httr pack stringr xml2]; }; swdft = derive2 { name="swdft"; version="1.0.0"; sha256="0529rw8nsl48hwiy741alvrzg5d5q1nhnjshrsfwchm5kdv0igva"; depends=[]; }; swdpwr = derive2 { name="swdpwr"; version="1.7"; sha256="0mljayrs629d0pxbd9lzzplvs31i33fqb0bfb01ryvwyv0ckwjx9"; depends=[spatstat_random]; }; - sweater = derive2 { name="sweater"; version="0.1.6"; sha256="0ij9mryxl9cjl4yxycn8yxp1qvj5s897h3ay5zz6j4cnpm65s7hv"; depends=[cli combinat data_table LiblineaR proxy purrr quanteda Rcpp]; }; + sweater = derive2 { name="sweater"; version="0.1.7"; sha256="03fq3vbcvbv8fwdp6smxyzb5gj8qp03qf88l99f2na9bax302sr3"; depends=[cli combinat data_table LiblineaR proxy purrr quanteda Rcpp]; }; sweep = derive2 { name="sweep"; version="0.2.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]; }; @@ -17383,6 +17494,7 @@ in with self; { swfscMisc = derive2 { name="swfscMisc"; version="1.6"; sha256="1nsr4n4dqm2jhmf3z2yg9x63x394cank70i41zrp2m0sd9wqprgk"; depends=[dplyr ggplot2 ggrepel HDInterval 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]; }; + swipeR = derive2 { name="swipeR"; version="0.1.0"; sha256="15n4kgiq1v2kjdkcimi0cs1psj0224598px1yw2xhlsjvb6x6p1f"; depends=[htmltools htmlwidgets]; }; 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]; }; @@ -17392,10 +17504,7 @@ in with self; { 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]; }; - sybilcycleFreeFlux = derive2 { name="sybilcycleFreeFlux"; version="2.0.2"; sha256="0s8yqzn7llzby5v1p7is7qv0m8dzwf14r3m32slf898nxrs131xr"; depends=[MASS Matrix sybil]; }; - sylcount = derive2 { name="sylcount"; version="0.2-4"; sha256="1qwxag92bpyi5sjr4373divw5zfgzvj2ji99ilcssnqwi46c4w77"; depends=[]; }; + sylcount = derive2 { name="sylcount"; version="0.2-5"; sha256="0934vic6mdrgpralrfvlv7y83kc1h7df7jm37spapy370mzq50lp"; depends=[]; }; syllabifyr = derive2 { name="syllabifyr"; version="0.1.1"; sha256="1z61afxx2bm37hxvv1fl3x7ibhkp3h1ivl3k9prqzsaw4j592vfx"; depends=[dplyr purrr stringr tibble tidyr]; }; sylly = derive2 { name="sylly"; version="0.1-6"; sha256="0f03k9d15fkym14y94jb7rkh228blc76jlm7pk229b44hcbh3mmm"; depends=[]; }; sylly_en = derive2 { name="sylly.en"; version="0.1-3"; sha256="0jw48qin172vv7skcpvcpi9wzgav5l9afzb09hhgcxvivbz6dl93"; depends=[sylly]; }; @@ -17406,7 +17515,6 @@ in with self; { symengine = derive2 { name="symengine"; version="0.2.2"; sha256="1wjw6fbphkxrha859s27rvzjp0niysssicaamw9sm8895j8k5lfk"; depends=[Rcpp]; }; symmetry = derive2 { name="symmetry"; version="0.2.2"; sha256="1h0zmmmlxd9xjfmp1lxb7rgmn5xq5rlspqrjw4nbgzw0vmdlm5gn"; depends=[Rcpp RcppArmadillo Rdpack]; }; symmoments = derive2 { name="symmoments"; version="1.2.1"; sha256="0wl68nsvydfhlbyaj54alj31dphqigyp1s4h2xdapxj4zvwf2sws"; depends=[combinat cubature multipol mvtnorm]; }; - symphony = derive2 { name="symphony"; version="0.1.0"; sha256="0pwl9ahiv0xxc7j6448cja77fvcng28gdwhhr1z0qmhjsdcxadxq"; depends=[class data_table dplyr ggplot2 ggrastr ggrepel harmony irlba magrittr Matrix purrr RANN RColorBrewer Rcpp RcppArmadillo rlang tibble tidyr uwot]; }; syn = derive2 { name="syn"; version="0.1.0"; sha256="12apdjbsazwfxizsw4dj0y3vkdjmki8dzpyv3bi9gnhpysdd1jzx"; depends=[]; }; synchronicity = derive2 { name="synchronicity"; version="1.3.5"; sha256="1kgsk64aifjm3mfj102y3va7x1abypq2zi0cqbnjhl8fqyzp69hx"; depends=[BH bigmemory_sri Rcpp uuid]; }; synchrony = derive2 { name="synchrony"; version="0.3.8"; sha256="1zpxg4dkxnvafiyp0j00wig5ymj10bzfg2376x56rzpnabhg57hi"; depends=[]; }; @@ -17440,7 +17548,7 @@ in with self; { table1 = derive2 { name="table1"; version="1.4.2"; sha256="1cw85nj6w9fk66wjbyz08ya6g027cfj3brb0sx7ar0n7zyc8rhb4"; depends=[Formula htmltools knitr yaml]; }; table1xls = derive2 { name="table1xls"; version="0.4.0"; sha256="0ixbshbp9hkcg12hj32vgb5bp0pj4rbc3i6g1xdg2zhqp7zanics"; depends=[XLConnect]; }; tableExtra = derive2 { name="tableExtra"; version="1.0.1"; sha256="1rbcxd3rjhvcpayj6d7mh30vkbc7g4mv4qa7552xz3x1wny0n4mm"; depends=[gtable]; }; - tableHTML = derive2 { name="tableHTML"; version="2.1.0"; sha256="01bffjqi2qs66w67l5nc0imqdcaf4cky930srkd2wmvvawv85kwc"; depends=[htmltools jpeg magrittr png shiny webshot]; }; + tableHTML = derive2 { name="tableHTML"; version="2.1.1"; sha256="0xqvk4smc8z6l4vpg39y1rxkx22spx7nvdsvp6xq6x7pmbsl0m8m"; depends=[htmltools jpeg magrittr png shiny webshot]; }; tableMatrix = derive2 { name="tableMatrix"; version="0.82.0"; sha256="1sskijhbqakamrk2rv7v5zpjsdi8jw0jl2z96l0vhsvsiq0cz1c8"; depends=[data_table]; }; tablecompare = derive2 { name="tablecompare"; version="0.1.0"; sha256="0cf557yi0h2y4idk8qwv0gk468pn0fhyndiy2jx28gdsz33h5p3a"; depends=[data_table glue magrittr purrr rlang tidyselect]; }; tabledown = derive2 { name="tabledown"; version="0.0.3"; sha256="0pvd9i7ycsarsp7m9hdss86vx0mdrv57iqxk8nyqixfdvrwb48pv"; depends=[data_table dplyr ggplot2 lavaan magrittr mirt MOTE psych tibble tidyselect]; }; @@ -17452,10 +17560,11 @@ in with self; { tablesgg = derive2 { name="tablesgg"; version="0.8-1"; sha256="0vkl9386qnalr5d0libqs2ihszggs0qyx6ffyjn8j8ab3kczzxhr"; depends=[ggplot2 tables]; }; tablet = derive2 { name="tablet"; version="0.5.8"; sha256="0c5gjrvr6r4vqxh2dc7v2jads48wwijvbzadxa92qzfsmxw3p382"; depends=[dplyr DT fs kableExtra magrittr rlang spork tidyr]; }; tabnet = derive2 { name="tabnet"; version="0.3.0"; sha256="04m8bg1glnhxb2pjcxnwlcwzbxvk0bskz00dkd4lyvgsq74xwmvi"; depends=[coro glue hardhat magrittr progress rlang tibble torch vctrs]; }; + taboolaR = derive2 { name="taboolaR"; version="0.1.0"; sha256="1nv189d6sjjrhc1nr7xhdf22gfh1z93rlcgm2vk7kcs43avm8fwb"; depends=[jsonlite]; }; tabr = derive2 { name="tabr"; version="0.4.5"; sha256="1nkzbqy9nb6pd895glld009vmry5rnhd7h9q31s8xh97kwlwk9c2"; depends=[crayon dplyr ggplot2 magrittr purrr tibble tidyr]; }; tabshiftr = derive2 { name="tabshiftr"; version="0.4.0"; sha256="04y910lcsim551za639q80laalhncc4lxcz31y3plilnlavxjyb1"; 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.8.0"; sha256="0nqm1100xgnr74zifscqw1hfqi4lz73fsm5xm5kbmqlf94mvk45x"; depends=[arkhe boot ggplot2 kairos rlang]; }; + tabula = derive2 { name="tabula"; version="2.0.0"; sha256="13mg0cacwx606942n40icr83yzq3px50wqfpxync0zraf6kr4zpp"; depends=[arkhe ggplot2 rlang]; }; tabularMLC = derive2 { name="tabularMLC"; version="0.0.3"; sha256="1gppzbf780ci4vrvy7rd3xa0bvwxca5f05a9xk194xv913vyd440"; depends=[Rcpp RcppArmadillo]; }; tabularaster = derive2 { name="tabularaster"; version="0.7.1"; sha256="0b8jl3bf7q0302mlnqh720qs7rllkgyg127n1h25snb34k1wc3pm"; depends=[dplyr fasterize magrittr raster silicate spatstat_geom tibble]; }; tabularmaps = derive2 { name="tabularmaps"; version="0.1.0"; sha256="07i76n2fpl2ma6jl3zdbay0zmmaaxrxhv1368xm2d575br42nri4"; depends=[ggforce ggplot2 purrr rlang]; }; @@ -17471,14 +17580,13 @@ in with self; { 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.3.0"; sha256="0lbwqz6p7kmxadjymqpfmcvz4l6gzimbk94778w4vzh9iay7dqi7"; depends=[mapiso sf terra]; }; - tangram = derive2 { name="tangram"; version="0.8.1"; sha256="1vmh3wk4vk25x6i5z9wrxdlhald406a6rfw1pivv7xrw659kaznv"; depends=[base64enc digest htmltools knitr magrittr R6 stringi stringr]; }; tangram_pipe = derive2 { name="tangram.pipe"; version="1.1.2"; sha256="0v86xn5rvr6c74cqhiwfxgfb4mizqlf5bqc51870na28i2ariaap"; depends=[dplyr]; }; tapkee = derive2 { name="tapkee"; version="1.2"; sha256="1xgz2cv5jb1hdnl8y8zs4x6p1dk1vv8zbs4wfsj61gpfyf9gkh4f"; depends=[]; }; tapnet = derive2 { name="tapnet"; version="0.3"; sha256="1fjg98m19iwbzijs5b5l4ssrbx1shv1hmgn1166cbni9y76m44sh"; depends=[ape bipartite MPSEM phytools vegan]; }; - tarchetypes = derive2 { name="tarchetypes"; version="0.7.1"; sha256="1k654w5v8vc8sn0d8qj0xbdrzaqdnngff9an9mb9rjq3jyc2k2nn"; depends=[digest dplyr fs rlang targets tibble tidyselect vctrs withr]; }; - tardis = derive2 { name="tardis"; version="0.1.3"; sha256="0g4gam2gip6h7lim4pcamqf430m1pk4sy5spri3ysl0l8mdsxg60"; depends=[cpp11 dplyr magrittr purrr stringi stringr tidyr]; }; + tarchetypes = derive2 { name="tarchetypes"; version="0.7.3"; sha256="03v2w9jk9bryrlcmzpa1y72k0kp4v0fw8mc1w1gl1kggqbkd0936"; depends=[digest dplyr fs furrr rlang targets tibble tidyselect vctrs withr]; }; + tardis = derive2 { name="tardis"; version="0.1.4"; sha256="1hfqnszhly6cfi7aii3v9nnrj3md389bflvf3igixrn4wb7mfyi5"; depends=[cpp11 dplyr magrittr purrr rlang stringi stringr tidyr]; }; targeted = derive2 { name="targeted"; version="0.3"; sha256="0h05h8pgjjab5clv501m9b2fcycspj0dc7zs72lwp15al2rikmzg"; depends=[data_table digest futile_logger future_apply lava mets optimx progressr R6 Rcpp RcppArmadillo survival]; }; - targets = derive2 { name="targets"; version="0.13.5"; sha256="08sdbl6366nqalrzx8cc0kmgkjlq2sky25bq0bziyqsy9slxlld6"; depends=[base64url callr cli codetools data_table digest igraph knitr R6 rlang tibble tidyselect vctrs withr yaml]; }; + targets = derive2 { name="targets"; version="0.14.1"; sha256="1zf8dapdy1ds59282vy3b1s6q0ra6a8v1llp1g6xaijih4pcl3r8"; 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=[]; }; @@ -17494,7 +17602,7 @@ in with self; { taxonbridge = derive2 { name="taxonbridge"; version="1.2.2"; sha256="1ivks3bvwyn0ybvyz6dhsx7qxnlskf4icjkgsichdv4p24w5iwb9"; depends=[dplyr ggplot2 purrr rje stringr vroom withr]; }; taxonomizr = derive2 { name="taxonomizr"; version="0.9.3"; sha256="03rc47pf85sfxa3zdjfcixsagcjbknk9jcsi3a56lz1d0178gb9n"; depends=[curl data_table R_utils RSQLite]; }; tayloRswift = derive2 { name="tayloRswift"; version="0.1.0"; sha256="1gr179hzqxih49v214dqawfhsbsahhyj1lbj77vqv00zq1siigpl"; depends=[]; }; - taylor = derive2 { name="taylor"; version="1.0.0"; sha256="0w1r3vy6c03h14cxmxf938rmgmxnnhdfavivp6749xxd2qdca997"; depends=[crayon ggplot2 glue lifecycle rlang scales tibble vctrs]; }; + taylor = derive2 { name="taylor"; version="2.0.0"; sha256="1zmih8gkkcfpydxxc4dfg3ypqs4qwbanfhckmjl9s4wl99k8q9mi"; depends=[crayon ggplot2 glue lifecycle rlang scales tibble vctrs]; }; 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-5"; sha256="0qq6zjz37j31jrw0lxsf6vgxwhs8swkqg48jwc320vpz1qjqj7xv"; depends=[basefun coneproj mboost mlt sandwich variables]; }; @@ -17507,7 +17615,7 @@ 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.5-2"; sha256="12vg9q35srddjidrn3q955xybn6ldraya35s4955ypj61arp89j9"; depends=[]; }; - tcpl = derive2 { name="tcpl"; version="3.0.0"; sha256="1d6536wdqjy7j9v3zcg1piga6gnjkrjslrn2zw30nx195cwc8ysj"; depends=[data_table DBI dplyr ggplot2 gridExtra numDeriv plotly RColorBrewer RMariaDB sqldf stringr tcplfit2 tidyr]; }; + tcpl = derive2 { name="tcpl"; version="3.0.1"; sha256="1xsw532xdf4xksrggsszwbh7rj818hvi9xmndhdhdk6wq6bg7xh4"; depends=[data_table DBI dplyr ggplot2 gridExtra numDeriv plotly RColorBrewer RMariaDB sqldf stringr tcplfit2 tidyr]; }; tcplfit2 = derive2 { name="tcplfit2"; version="0.1.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.6"; sha256="1zycwnl7n03jw76n8qrk2zhgnakj6npid25pflj6dnmbjc47ih32"; depends=[RcppSimdJson]; }; @@ -17524,6 +17632,7 @@ in with self; { teamcolors = derive2 { name="teamcolors"; version="0.0.4"; sha256="0mqrjnkpxzv7armgbl9nwz42pjb9l94yml5lp41rhjj9414b2729"; depends=[dplyr ggplot2 tibble tidyr]; }; teamr = derive2 { name="teamr"; version="0.0.1"; sha256="01gngws8lf093598wlzrv4ls74avsli6ij33v1plqgc0znyaw4s2"; depends=[httr jsonlite R6]; }; teda = derive2 { name="teda"; version="0.1.1"; sha256="0yx469jbkw9cgx73zi5mkykrdn16kn01zh524x9411314aa32avx"; depends=[]; }; + tehtuner = derive2 { name="tehtuner"; version="0.1.1"; sha256="1dr3xrhwszv75w8iz7yy44a7kxac5n1dirjhjfqgvjz529m8ycqb"; depends=[earth glmnet party randomForestSRC Rdpack rpart stringr SuperLearner]; }; teigen = derive2 { name="teigen"; version="2.2.2"; sha256="1k5k3lj6av5pyx130w1j7avd0jdmm12ryc71mi5mq49sp95ndl4v"; depends=[]; }; 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]; }; @@ -17540,22 +17649,23 @@ in with self; { tensorA = derive2 { name="tensorA"; version="0.36.2"; sha256="19wwh654qlja4z1n7afjpzsrrm53p8ddysa2vra5mdnkddb4g2cf"; depends=[]; }; 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]; }; + tensorFun = derive2 { name="tensorFun"; version="0.1.1"; sha256="0ij3dshnj448scws6d2pdw2ik34hbhq9mksmllgy0g8l257a3x8d"; depends=[ClimProjDiags MASS psychTools]; }; tensorTS = derive2 { name="tensorTS"; version="1.0.0"; sha256="0nbks7djd4wggn33f39zc2zacz6z4dpvgk9fj9a90kcmyiw0rckl"; depends=[abind expm MASS Matrix pracma rTensor tensor]; }; tensorflow = derive2 { name="tensorflow"; version="2.9.0"; sha256="12c6ndxx4g6fqjakpzp9pgl29ghswhqyr6q9jahpk0cawizh2znj"; 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.1.0"; sha256="0l2a0j4bz4q101hqhcn2jnv5j4ny1cjcay2c8bcq58akifs3bzxb"; depends=[coda ergm MASS network networkDynamic nlme purrr robustbase statnet_common]; }; + tergm = derive2 { name="tergm"; version="4.1.1"; sha256="09axlhf5n2jwc84ih05ywz8addqfai7g1cdlzhsbmjnsn1d89kai"; depends=[coda ergm MASS network networkDynamic nlme purrr robustbase statnet_common]; }; tergmLite = derive2 { name="tergmLite"; version="2.6.1"; sha256="03dr3bfi5ywavfijkc6gmci8i1kmbsh26awhl7748mn9wcsgs2pc"; depends=[ergm network networkDynamic Rcpp statnet_common tergm tibble]; }; term = derive2 { name="term"; version="0.3.5"; sha256="1ig1hvyv18d1x19jmvkg66m6nn8kdlffj5hx70vzd4sxz68j2k0v"; depends=[chk extras lifecycle purrr rlang universals vctrs]; }; terminaldigits = derive2 { name="terminaldigits"; version="0.1.0"; sha256="0vj7pylr410wi59qj2313iximsyl0v9ffg7z9gcfg720g5zrvfkm"; depends=[discretefit Rcpp]; }; ternvis = derive2 { name="ternvis"; version="1.2"; sha256="057i6i3ygxrin0npc18gsg3dpdldzafyb5sr6lix5mhy6b09lkxf"; depends=[dichromat maps quadprog]; }; - terra = derive2 { name="terra"; version="1.6-17"; sha256="00mwigymvsqf7r3swbkdw8fwqzr05ddk84fhyhr16lfa4118z26v"; depends=[Rcpp]; }; + terra = derive2 { name="terra"; version="1.6-47"; sha256="13n6rxrrkn4wgcgq2kyyhn5nxw099hy9fbzxg78waxa6cxapwpmh"; depends=[Rcpp]; }; terrainmeshr = derive2 { name="terrainmeshr"; version="0.1.0"; sha256="1xab6wzq2izzdvsss1rlgp5m3cn45naxhymq6cglipj0fd792jbr"; depends=[Rcpp]; }; - terrainr = derive2 { name="terrainr"; version="0.7.1"; sha256="0marwkn3mzrrm8xghc3f2fnxgbcfvzq76lpac92gahhvfmxhjp39"; depends=[base64enc ggplot2 glue httr magick png raster rlang sf terra unifir units]; }; + terrainr = derive2 { name="terrainr"; version="0.7.2"; sha256="1w91vdn859m1rxg5av3gix5rff1wndrkkn13nvc1ygqgwd25hc76"; depends=[base64enc ggplot2 glue httr magick png raster rlang sf terra unifir units]; }; tessellation = derive2 { name="tessellation"; version="2.1.0"; sha256="0pbdf18pz1j18x7lsz306x87p0d339a0y1nacynsqly0706g1s3d"; depends=[cxhull english hash interp R6 randomcoloR rgl Rvcg scales sets]; }; - tesselle = derive2 { name="tesselle"; version="1.1.0"; sha256="11afr475gnaa0g2f0a2gx9zcsaqbfw5rfxy27f4pllccqapl6hys"; depends=[arkhe dimensio folio kairos khroma tabula]; }; + tesselle = derive2 { name="tesselle"; version="1.2.0"; sha256="1kbz26rinxwd8h3kazdalkb32l1hl623r9f3x072j857g2x9v5my"; depends=[arkhe dimensio folio kairos khroma tabula]; }; tesseract = derive2 { name="tesseract"; version="5.1.0"; sha256="1ynd665mbfklqahzkjfbl6ja1djybgcmc71dpg5dxxjc3ny7rbkd"; depends=[curl digest pdftools rappdirs Rcpp]; }; test2norm = derive2 { name="test2norm"; version="0.2.1"; sha256="1llzvdggjvc72qwkv9iiqxx7prj3hnr9bqpwsib4qmfpmmxsif37"; depends=[mfp]; }; testDriveR = derive2 { name="testDriveR"; version="0.5.2"; sha256="144bni3dg7bdmxnxyyal94j1nddqshgys9wfkdcc262n8y3v13i5"; depends=[]; }; @@ -17567,7 +17677,7 @@ 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.5"; sha256="1z5pyp4cmyn8ms243zav5wfbwbh45zzq432m1g1xyv904sa6pxd8"; depends=[brio callr cli desc digest ellipsis evaluate jsonlite lifecycle magrittr pkgload praise processx ps R6 rlang waldo withr]; }; + testthat = derive2 { name="testthat"; version="3.1.6"; sha256="1bndjkwv6f9x3a0wklwnf7bymn655yhw6cmazb285hbmci0qrjx7"; depends=[brio callr cli desc digest ellipsis evaluate jsonlite lifecycle magrittr pkgload praise processx ps R6 rlang waldo withr]; }; testthis = derive2 { name="testthis"; version="1.1.1"; sha256="0csragn695698dpkr9d3md0g81bzpy5mybd0jik669q9cs8sdzh2"; depends=[assertthat devtools fs magrittr pkgload rprojroot stringi testthat usethis]; }; testtwice = derive2 { name="testtwice"; version="1.0.3"; sha256="06fr13ww2wqk753p0cnl1ldn3nqrvdfnz0lgkpldcn0xwiwjh2x2"; depends=[mvtnorm]; }; tetraclasse = derive2 { name="tetraclasse"; version="0.1.21"; sha256="1cl2cah0xi6x3rvvdy56iszai6rkbxc1w3x13v0l1z1nryff7c6a"; depends=[dplyr FactoMineR ggplot2 ggrepel magrittr reshape2 tibble tidyr]; }; @@ -17580,7 +17690,7 @@ in with self; { text2map = derive2 { name="text2map"; version="0.1.6"; sha256="1lqhk5dz7g4mc63644hbb60hwgzsyl75i8ckz354hvagnd84xwg1"; depends=[ClusterR doParallel dplyr fastmatch foreach igraph kit magrittr Matrix qgraph rlang rsvd stringi stringr text2vec tibble]; }; text2sdg = derive2 { name="text2sdg"; version="0.1.6"; sha256="0rnb44d5v7b90p78bwcg5zqz1xrfpr34ad6pgc49ll0pb9q9ijss"; depends=[corpustools dplyr ggplot2 lifecycle 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.2"; sha256="1as58w1hb6h0hpncwcr2nx9a8bj5fy6bfllx2a8ck8hal764iach"; depends=[data_table digest lgr Matrix mlapi R6 Rcpp rsparse stringi]; }; + text2vec = derive2 { name="text2vec"; version="0.6.3"; sha256="1hi7ydb7xkgbff4lwnnz1biyl8m90w16hn3x5rrzvscvm53sj4y7"; depends=[data_table digest lgr Matrix mlapi R6 Rcpp rsparse stringi]; }; textTinyR = derive2 { name="textTinyR"; version="1.1.7"; sha256="17c3vciqx2i0h0jkqsiva8kp6pwcrscwgyxf804sjvdbym0pwc7d"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; }; textTools = derive2 { name="textTools"; version="0.1.0"; sha256="1d9j1bj17ki169h4lmlz2b2c2m60q6b95prjscz346lc4vw5160a"; depends=[data_table]; }; textcat = derive2 { name="textcat"; version="1.0-7"; sha256="1m31alkzy13acgf4ahnzpbyazflhpmry369vqdvn5f86wcsls833"; depends=[slam tau]; }; @@ -17617,6 +17727,7 @@ in with self; { tfprobability = derive2 { name="tfprobability"; version="0.15.1"; sha256="0as8lciyh463x91gv290zzp9sjsrrvgcwiliyi9y5dp0qbj4505x"; depends=[keras magrittr reticulate tensorflow]; }; tframe = derive2 { name="tframe"; version="2015.12-1.1"; sha256="1yff22jzh1mp73zbz2mav6z8m42lylfjhb8dgxj4337fv3if3i13"; depends=[]; }; tframePlus = derive2 { name="tframePlus"; version="2022.3-1"; sha256="1axrvfigdmwmas0q3qlmk4m7jybqcssjgmyww2knp8jw7kp212vy"; depends=[tframe timeSeries]; }; + tfrmt = derive2 { name="tfrmt"; version="0.0.1"; sha256="1b23ylm7ad4yhcxsm1qgv9lk8nf9bivws0h2z9cxpnrcjc309sw6"; depends=[dplyr forcats ggplot2 gt magrittr purrr rlang stringi stringr tibble tidyr tidyselect]; }; tfruns = derive2 { name="tfruns"; version="1.5.1"; sha256="1xk7dl51xd1h54798xwycvxmn77jv80in61hanm36zk0024wpxg8"; depends=[base64enc config jsonlite magrittr reticulate rlang rstudioapi tidyselect whisker yaml]; }; tfse = derive2 { name="tfse"; version="0.5.0"; sha256="05q75xsiy955xwgchagk7l7725y6mylp5lj5284xm7y2xh197zp3"; depends=[dapr magrittr]; }; tgamtheme = derive2 { name="tgamtheme"; version="0.1.0"; sha256="1igv6vl3vqqx8pbvj5qr21cjphpizq3b5sjss359bhw2gy747npl"; depends=[ggplot2]; }; @@ -17625,11 +17736,11 @@ in with self; { tglkmeans = derive2 { name="tglkmeans"; version="0.3.5"; sha256="0ldbq2pjmvw8m698s9zvvk38qiysz44r6s8v9bs8i7i7vjpwj62y"; depends=[doFuture dplyr future ggplot2 magrittr plyr purrr Rcpp tgstat tibble]; }; tgp = derive2 { name="tgp"; version="2.4-20"; sha256="00yw8l05b49qg79gydcv4f4snl92jm7fyy3i5y6vgxcj6jl101g9"; depends=[maptree]; }; tgram = derive2 { name="tgram"; version="0.2-3"; sha256="0vlnry8drq3fqfy8dk50pcwcx9dj657kx6s19fs2b6acigkr4g7w"; depends=[zoo]; }; - tgstat = derive2 { name="tgstat"; version="2.3.18"; sha256="0bxg4x0m6a7i8ahpwmh79g60605q0z5q60wbajdzc4zc96k7hp8k"; depends=[]; }; + tgstat = derive2 { name="tgstat"; version="2.3.19"; sha256="0nms7wzm2mn04q91709z7c1r16kxkw566zv2qglvns5dri905bs7"; depends=[]; }; tgver = derive2 { name="tgver"; version="0.3.0"; sha256="1kw622xcjhca7k178q3wpmjyidjifvql9xpg2ai8842qhgz14bm0"; depends=[callr geojsonsf plumber]; }; thaipdf = derive2 { name="thaipdf"; version="0.1.2"; sha256="03h03bmw6q60jc80z14k7hpli0knhfbmhns0inbz0nhvisfzmsbq"; depends=[cli fs rmarkdown]; }; thankr = derive2 { name="thankr"; version="1.0.0"; sha256="089ikp85d5ia6a1qzmw8dkgcmz628cibmwfzcpk7m3ii8acxq91w"; depends=[]; }; - theft = derive2 { name="theft"; version="0.3.9.6"; sha256="14bynxl3asxh73g42wg3hylzc7fjqxnz1q8ss9fy8j99y3s3hpph"; depends=[broom caret dplyr fabletools feasts ggplot2 janitor plotly purrr R_matlab Rcatch22 reshape2 reticulate rlang Rtsne scales tibble tidyr tsfeatures tsibble]; }; + theft = derive2 { name="theft"; version="0.4.1.1"; sha256="11gpg044ypfnwvrb7y0fgm1ammh8w03yik8xb26kjax5xa74pcvl"; depends=[broom caret dplyr fabletools feasts ggplot2 janitor plotly purrr R_matlab Rcatch22 reshape2 reticulate rlang Rtsne scales tibble tidyr tsfeatures tsibble]; }; theiaR = derive2 { name="theiaR"; version="0.4.0"; sha256="07m532r67cil2ya2w9lfhycrm8n0ga0r3x7jwbp5jbd83hw4l1p6"; depends=[askpass httr R6 raster XML]; }; thematic = derive2 { name="thematic"; version="0.1.2.1"; sha256="1hr9373256n1rya3l2z2sqwfifypsh6wrs2s27aqchh9sm0blkmy"; depends=[farver ggplot2 rappdirs rlang rstudioapi scales]; }; themis = derive2 { name="themis"; version="1.0.0"; sha256="0ink3ixal4942w1sbqjdhxpl7j0aqvksyiiz9ddd72wk30cvpwaw"; depends=[dplyr generics glue gower hardhat lifecycle purrr RANN recipes rlang ROSE tibble withr]; }; @@ -17639,7 +17750,7 @@ in with self; { thgenetics = derive2 { name="thgenetics"; version="0.4-2"; sha256="1314gry3xs9v4jy13g08q16qy4ax3s0bc7d74gi0wbpkgdrk3lql"; depends=[]; }; thief = derive2 { name="thief"; version="0.3"; sha256="12ymkkisg5p0g1gmvlczhp4dc7mirjg55fqqmz2d90673vlg6rfq"; depends=[forecast ggplot2 hts]; }; thinkr = derive2 { name="thinkr"; version="0.16"; sha256="104n4g70fk209b721qchrbv95dwxzq6vvhz36asdk40kzzacdzp2"; depends=[assertthat cli devtools dplyr ggplot2 lazyeval lubridate magrittr officer rvg stringi stringr tidyr withr]; }; - this_path = derive2 { name="this.path"; version="1.0.1"; sha256="0bvz5sl2im9720068bglclwahv75pns2qck6306hyfvrzzga2sal"; depends=[]; }; + this_path = derive2 { name="this.path"; version="1.1.0"; sha256="0mzb8scdv1f0ppc2hcpkbwn89iqrvf3asncch974q1zfy8q36xbj"; 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-2"; sha256="0428j1c1zfc42kydsbnvpznwprq62nwxh41i7pf4873g3canmjkx"; depends=[httr magrittr R6 rlang xml2]; }; @@ -17654,11 +17765,13 @@ in with self; { 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.8"; sha256="1spdbk5s0wlipfq8jc08p2mk5fq2ql9hm8iwwlfzdlhqbl3hxwxc"; depends=[fansi lifecycle magrittr pillar pkgconfig rlang vctrs]; }; tibbletime = derive2 { name="tibbletime"; version="0.1.7"; sha256="0l2aaqzf087phyxblkskqfpica12bfama6wyvxkdgbiwmzf6lbzc"; depends=[assertthat dplyr glue hms lifecycle lubridate pillar purrr Rcpp rlang tibble vctrs zoo]; }; + tibblify = derive2 { name="tibblify"; version="0.3.0"; sha256="1hir7rb0zn9cz2yjfrg17is0ryzzxfxsan0sij0c0dh9v171cp0w"; depends=[cli lifecycle purrr rlang tibble tidyselect vctrs withr]; }; tictactoe = derive2 { name="tictactoe"; version="0.2.2"; sha256="1fx8plj5zr04xwk5hfj3zqhcknidxlzya2q14cf0m3y33a86lx42"; depends=[hash]; }; tictoc = derive2 { name="tictoc"; version="1.1"; sha256="0ka7zd857xfqb5afn0psn0yzfv2qjb0ddxfyiq6aggbnla5qc3qj"; depends=[]; }; - tidyBdE = derive2 { name="tidyBdE"; version="0.3.0"; sha256="1h134amkmcz3k5yl73r818hp1z5fsmiiv6bkqcn3fpn4bi9rh58w"; depends=[dplyr ggplot2 readr scales tibble]; }; + tidyBdE = derive2 { name="tidyBdE"; version="0.3.1"; sha256="1c3c4yj95avjmnc11gn1dcbgmzz3kgmj5ahl4ip8vp3ap4ik3c89"; depends=[dplyr ggplot2 readr scales tibble tidyr]; }; tidyCDISC = derive2 { name="tidyCDISC"; version="0.1.0"; sha256="0x84vljzzahhc4a8r7cnahvh2vgbx1a68sr1vm48gckis271isj7"; depends=[cicerone config dplyr DT GGally ggcorrplot ggplot2 glue golem gt haven IDEAFilter plotly purrr rlang rmarkdown shiny shinyjs shinyWidgets sjlabelled stringr survival tidyr timevis tippy]; }; tidyCpp = derive2 { name="tidyCpp"; version="0.0.6"; sha256="1w6fr4q137ar6557a8x1jpmfmlsga59621jwq0sf37bnn535i4gw"; depends=[]; }; + tidyDisasters = derive2 { name="tidyDisasters"; version="0.1.1"; sha256="071hr4dmk5pq8m8b58b8zcz5kpgxnqw2l4rb2vkq1zhsrk9ynxmg"; depends=[]; }; tidyEmoji = derive2 { name="tidyEmoji"; version="0.1.0"; sha256="03amap4lik63nqdznncg8ymw74avmrhci36gy8ckwwskrn9gqw93"; depends=[dplyr emoji purrr stringr tibble tidyr]; }; tidyHeatmap = derive2 { name="tidyHeatmap"; version="1.8.1"; sha256="19gpp8p3ms60qzny26vx8h7x4zl495ynrfrvf1nndhm2njbx6i4m"; depends=[circlize ComplexHeatmap dendextend dplyr lifecycle magrittr patchwork purrr RColorBrewer rlang tibble tidyr viridis]; }; tidyLPA = derive2 { name="tidyLPA"; version="1.1.0"; sha256="1lyd8cx90j49bm65330i57jyimiid75c2pvnzk7dcp6mbmglvimz"; depends=[dplyr ggplot2 gtable mclust mix MplusAutomation tibble]; }; @@ -17670,8 +17783,9 @@ in with self; { 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.2.3"; sha256="1zrjbxkzn1swkpx00krjvdpihpkbax4mm9fw81p0bq90dsxmig13"; depends=[crayon dplyr httr jsonlite purrr rappdirs readr rlang rvest sf stringr tidyr tidyselect tigris units xml2]; }; + tidycensus = derive2 { name="tidycensus"; version="1.3"; sha256="0hh5inc1nlw4khckdvy1kb243z8rd8bhbkvxjmpqys657bw52v39"; depends=[crayon dplyr httr jsonlite purrr rappdirs readr rlang rvest sf stringr tidyr tidyselect tigris units xml2]; }; tidycharts = derive2 { name="tidycharts"; version="0.1.3"; sha256="1clpjyvqv6xhv7n64xh411x867fnn581qckzcwn18xbbbs56k6nn"; depends=[htmlwidgets knitr lubridate magick magrittr rlang rsvg stringr testthat]; }; + tidyclust = derive2 { name="tidyclust"; version="0.1.0"; sha256="1b6is25xsip3x6ps5x3n8g8jmy7brq0rjcf5w4rdlqcrn1f43v32"; depends=[cli dials dplyr flexclust foreach generics glue hardhat modelenv parsnip prettyunits Rfast rlang rsample tibble tidyr tune vctrs]; }; tidycmprsk = derive2 { name="tidycmprsk"; version="0.2.0"; sha256="1smcjicx7xz07iagzv2a87kc9q0j2sgpnakhv7dc18zw2ndpls1q"; depends=[broom cli cmprsk dplyr ggplot2 gtsummary hardhat purrr rlang stringr survival tibble tidyr]; }; tidycode = derive2 { name="tidycode"; version="0.1.1"; sha256="0ahjhn1ar93xnd1snxnivdl43d1b6ica0pc30rgh8jpha87zbsay"; depends=[glue matahari pryr purrr rlang tibble]; }; tidycomm = derive2 { name="tidycomm"; version="0.2.1"; sha256="1h1xixa7fbijp1iifpwl689b1pz1vvpy7v4sc9wnkqgw0q31b3iy"; depends=[broom dplyr forcats glue magrittr MBESS purrr rlang stringr tibble tidyr]; }; @@ -17681,6 +17795,7 @@ in with self; { tidydr = derive2 { name="tidydr"; version="0.0.4"; sha256="0ws4z5ldz7wyhxn7h5gf8j4p3srvr5dfr6xxrf1rymx1iz9pd6sv"; 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]; }; + tidyfit = derive2 { name="tidyfit"; version="0.6.0"; sha256="0jdjz20rw3r47w1h14zx5pfiynr0fnlqwbv1bkn42aqjzm6jdfgh"; depends=[broom crayon dials dplyr furrr magrittr MASS progressr purrr rlang rsample tibble tidyr yardstick]; }; tidyfst = derive2 { name="tidyfst"; version="1.7.5"; sha256="07sy6yyjpb0qkn8qhc4d228xxihjqrqw42g5afz5ai3h530qhj89"; 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]; }; @@ -17689,7 +17804,7 @@ in with self; { tidygeoRSS = derive2 { name="tidygeoRSS"; version="0.0.1"; sha256="0bppkwbxmm8ps1cnrhzxkzm2pbi3s5bfiwx8fcrp31x81jl61w1x"; depends=[anytime dplyr httr jsonlite magrittr purrr rlang sf strex stringr tidyRSS xml2]; }; tidygeocoder = derive2 { name="tidygeocoder"; version="1.0.5"; sha256="1ffj8ka5miv3jnds7fdrkcqdc3m2w1ab724z9m10biky213skqka"; depends=[dplyr httr jsonlite lifecycle progress tibble]; }; tidygraph = derive2 { name="tidygraph"; version="1.2.2"; sha256="0w34jfldjkynbkyinmi1vdrfjhjrs47hm599mbnx4sxmnpbclmfm"; depends=[cli cpp11 dplyr igraph magrittr pillar R6 rlang tibble tidyr]; }; - tidyhydat = derive2 { name="tidyhydat"; version="0.5.7"; sha256="00jrczg2355pvbrbf50pn8b1v89nc4ir78bjpbn91il45iq05yc0"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr rlang RSQLite tidyr]; }; + tidyhydat = derive2 { name="tidyhydat"; version="0.5.8"; sha256="1bk3a0cgb0311xbni52zrpb7fa4vgdi022g7rap2af961fcbl6bz"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr rlang RSQLite tidyr]; }; tidyjson = derive2 { name="tidyjson"; version="0.3.1"; sha256="1rx5ncp20j9mhcziyqb0vgfq9061qylgvfwz27dsyz58r8fygwnq"; depends=[assertthat dplyr jsonlite magrittr purrr rlang tibble tidyr]; }; tidylda = derive2 { name="tidylda"; version="0.0.2"; sha256="1zwy94gpr43dc6ld3rjmr5rkapmxji6kd3p363zl03wn5qf3wbws"; depends=[dplyr generics gtools Matrix mvrsquared Rcpp RcppArmadillo RcppProgress RcppThread rlang stringr tibble tidyr tidytext]; }; tidylo = derive2 { name="tidylo"; version="0.2.0"; sha256="07xnbycwrqg3cmbxx76drbjd0mx4s23vf3kihlc9rj4ajjx48z8r"; depends=[dplyr rlang]; }; @@ -17702,7 +17817,7 @@ in with self; { tidypmc = derive2 { name="tidypmc"; version="1.7"; sha256="1fijlvdiw4vwm34wizm4xlm0x10vvpkldzk7rrla44apq7y2w3yq"; depends=[dplyr readr stringr tibble tokenizers xml2]; }; tidyposterior = derive2 { name="tidyposterior"; version="1.0.0"; sha256="19cyyhh417i5xcchb8kq3iycaf4y7aznr7y9r004h2k2vk3svc86"; depends=[dplyr generics ggplot2 purrr rlang rsample rstanarm tibble tidyr tune vctrs workflowsets]; }; tidypredict = derive2 { name="tidypredict"; version="0.4.9"; sha256="0x0r36zvny4rqgndx7iqh39yhr53gl4d8wd8wpvdcgg35q6z02z2"; depends=[dplyr generics knitr purrr rlang stringr tibble tidyr]; }; - tidyquant = derive2 { name="tidyquant"; version="1.0.5"; sha256="04cxaa661qfr5qz7lv9gjxswm0wh2p70xrdn3rma6wp92r4837mm"; depends=[alphavantager curl dplyr ggplot2 httr jsonlite lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod readr riingo rlang stringr tibble tidyr tidyselect timeDate timetk TTR xts]; }; + tidyquant = derive2 { name="tidyquant"; version="1.0.6"; sha256="0p1c9wzg4i84ajxd3lq4j1pvp24ni1kg6jhvlrjnhczwzjs8xjvc"; depends=[alphavantager curl dplyr ggplot2 httr jsonlite lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod readr readxl riingo rlang 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.2.1"; sha256="1bv1rvnbbfdqf78qfbawq3yxjhjfdy0mgcla6b17bp336rnpcwb9"; depends=[cpp11 dplyr ellipsis glue lifecycle magrittr purrr rlang tibble tidyselect vctrs]; }; @@ -17717,8 +17832,8 @@ in with self; { 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.9.1"; sha256="0daw83qjv6qdb45f297fv9rzzx37nji0jdc5p51bwv8azz9bdy2z"; depends=[data_table glue magrittr pillar rlang tidyselect vctrs]; }; - tidytags = derive2 { name="tidytags"; version="1.0.3"; sha256="04vz4zxnhnr9as1lwwi7mka7asjk557271iibdf67j02lcxj7zp1"; depends=[dplyr googlesheets4 rlang rtweet stringr]; }; - tidyterra = derive2 { name="tidyterra"; version="0.3.0"; sha256="1sn6nw1lhvs98qca27m9cbvb90injkvaj6anvq8k2iz413awdw5c"; depends=[cli crayon data_table dplyr ggplot2 magrittr rlang scales sf terra tibble tidyr]; }; + tidytags = derive2 { name="tidytags"; version="1.1.0"; sha256="1416kkd9ibi4l5xc1wfx22lhb0w6fi3g8dq2lp746w6kqlqbiqpz"; depends=[dplyr googlesheets4 rlang rtweet stringr]; }; + tidyterra = derive2 { name="tidyterra"; version="0.3.1"; sha256="16zw7zw17a2qh777nhv8iyzq5g7hxp4hqh3cb9lhmrscdfg9r5qw"; depends=[cli crayon data_table dplyr ggplot2 magrittr rlang scales sf terra tibble tidyr]; }; tidytext = derive2 { name="tidytext"; version="0.3.4"; sha256="0mk75wdiy4mixj1xlksw9ns4ajlj8ak90sgchjcg1zb90qp7gg56"; depends=[dplyr generics hunspell janeaustenr lifecycle Matrix purrr rlang stringr tibble tokenizers vctrs]; }; tidytidbits = derive2 { name="tidytidbits"; version="0.3.2"; sha256="1zbm165bimjag7azhy77zlzqilygybqxz35q4r3d7hi7p6m96w78"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; }; tidytransit = derive2 { name="tidytransit"; version="1.4"; sha256="12rhl9mb2hqwwad9sxa7lxyq012qhs9ga7y8ggigdq6nihmlqnrj"; depends=[checkmate data_table digest dplyr geodist gtfsio hms httr rlang sf]; }; @@ -17727,7 +17842,7 @@ in with self; { 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.2"; sha256="0qfgq4p2aq95j39xd5kcing2cacy7rzy7f6zf0bnpsa95svziyrp"; 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.4.0"; sha256="1gcid4n21nkm7z6a91vnj08rzjhzvi9r4nvrgawad6s1grika8q9"; depends=[classInt data_table fastDummies ggplot2 magrittr mgcv quantreg rlang]; }; - tidywikidatar = derive2 { name="tidywikidatar"; version="0.5.4"; sha256="1cw71d8zs399xmdyi0xjb8h6r6wc55kp9zys1rffqr3nrxalmr0w"; depends=[DBI dplyr fs glue jsonlite magrittr pool progress purrr rlang RSQLite stringr tibble tidyr usethis vctrs WikidataQueryServiceR WikidataR WikipediR]; }; + tidywikidatar = derive2 { name="tidywikidatar"; version="0.5.5"; sha256="0fy1s36f6nsxxnyc5jb35r3mxzxhq5qcj71kv0d3avnfahhcjmgc"; depends=[DBI dplyr fs glue jsonlite magrittr pool progress purrr rlang RSQLite stringr tibble tidyr usethis vctrs WikidataQueryServiceR WikidataR WikipediR]; }; tidyxl = derive2 { name="tidyxl"; version="1.0.8"; sha256="05hkjwlv88ln0psqk5r8p2i4j6g3c3yfw2wmm73wcylcv33lh79h"; depends=[piton Rcpp]; }; tiff = derive2 { name="tiff"; version="0.1-11"; sha256="0xgc7vyndxxahfhc2qqzmwi56bnfyl0pn72l820jz5sd24aymhxq"; depends=[]; }; tigerhitteR = derive2 { name="tigerhitteR"; version="1.1.0"; sha256="0inyi12lf8bn7nbklf2rjixk6wrgrjcp8njv7knai4dgvv7v0rfa"; depends=[Hmisc magrittr openxlsx zoo]; }; @@ -17735,10 +17850,10 @@ in with self; { tigger = derive2 { name="tigger"; version="1.0.1"; sha256="130iwg2ds4j56a9ndg1p7qv4s6qbbahmm9fwmy6iak02ds1r0zyl"; depends=[alakazam doParallel dplyr foreach ggplot2 gridExtra gtools iterators lazyeval rlang stringi tidyr]; }; tightClust = derive2 { name="tightClust"; version="1.1"; sha256="0vqkp2g6z8y3b6dhzglmacjhf2qi1sg80kb941mwfafin2k40zbm"; depends=[]; }; tigreBrowserWriter = derive2 { name="tigreBrowserWriter"; version="0.1.5"; sha256="0izgx1khci6qc6pz85dxj75kzxvpr30l0vhcv9476jrcbwqs4k8m"; depends=[DBI RSQLite]; }; - tigris = derive2 { name="tigris"; version="1.6.1"; sha256="1cid3cpjlc56mskyx0phd7h969jihxbdkpmly08cq2qjyyiqszlj"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; }; + tigris = derive2 { name="tigris"; version="2.0"; sha256="0fbhq2jznwxnvqk2zndnp923az8kvbq667i15m5xx9lq42zfzwix"; depends=[dplyr httr magrittr rappdirs sf stringr uuid]; }; tiktokadsR = derive2 { name="tiktokadsR"; version="0.1.0"; sha256="17x6nxp88iji376qhvvkgxyfcbxz9bvfgv9kmhiznlhq64srdjfs"; depends=[jsonlite]; }; tikzDevice = derive2 { name="tikzDevice"; version="0.12.3.1"; sha256="040yz6wi05151m9nal97symv66a133kk0a8c1h6nz058zk081vav"; depends=[filehash png]; }; - tiledb = derive2 { name="tiledb"; version="0.16.0"; sha256="1025cvsxb128j5yky5pb57sjkixhy1j4gf5k1f6a8nj48ygqbf6p"; depends=[nanotime Rcpp]; }; + tiledb = derive2 { name="tiledb"; version="0.17.0"; sha256="0s7fs80x4alzl0z1ssxzcjm6ydy71qk4bpsrhqg8wi4kmxzfmqyr"; depends=[nanotime Rcpp RcppSpdlog spdl]; }; tilegramsR = derive2 { name="tilegramsR"; version="0.2.0"; sha256="11cnyvlghg8z7lr9ahzsjpyjrqnxqs77wdcydqvavrsqj745xvi2"; depends=[sf sp]; }; tilemaps = derive2 { name="tilemaps"; version="0.2.0"; sha256="06pwwlndb7nvw2b0h0fak3vnpbi11mxsby43qm9ng3k3sqwrqjz2"; depends=[clue ggplot2 igraph lwgeom sf smoothr]; }; tiler = derive2 { name="tiler"; version="0.2.5"; sha256="02sxc70s8v5b5lf1fpv1ig1hmpkamsmzbgpk6zds504gh9kz7qxy"; depends=[png raster rgdal sp]; }; @@ -17746,27 +17861,27 @@ in with self; { timbeR = derive2 { name="timbeR"; version="2.0.1"; sha256="01lpx4pk22k9j4sbbhr9z7r6spfdrfazpxsyp7cxndrswa8m83zq"; depends=[cowplot dplyr ggplot2 magrittr miniUI shiny tibble tidyr]; }; timbr = derive2 { name="timbr"; version="0.1.1"; sha256="154ybky7bq3y5d9945yk36lqkl2kf6yc2x8m6izc0jdnqhydlxlp"; depends=[dplyr memoise pillar purrr rlang tibble tidygraph vctrs]; }; time_slots = derive2 { name="time.slots"; version="0.2.0"; sha256="04qh8cgk3ixvvc67m2hal935m5kisq2n67cvjmsg1frz1bf2yvld"; depends=[dplyr ggfittext ggplot2 lubridate scales]; }; - timeDate = derive2 { name="timeDate"; version="4021.106"; sha256="1qhh1d85s8r4wkcf4fljfm67lnkj8flnx9iz4hdg305xdkng3b8l"; depends=[]; }; + timeDate = derive2 { name="timeDate"; version="4021.107"; sha256="1i54a425r5hi08yl9rb2qh1nynh29ppv9b4h46cxyzn1ybqlr9sg"; depends=[]; }; timeR = derive2 { name="timeR"; version="1.2.0"; sha256="0lkx2ilbzq29w1c9ssya4f0za0sj7y30y9ml4v3zc21c1la0b6vi"; depends=[lubridate R6]; }; timeROC = derive2 { name="timeROC"; version="0.4"; sha256="1qxijg7hazc8bifwj2254ig2p3cbrp9p0bsyhhh3aikf1rg113v1"; depends=[mvtnorm pec]; }; timeSeq = derive2 { name="timeSeq"; version="1.0.4"; sha256="0m59g12dmnwpmwjmyb9x6z53x3gjmxcaxqva2dlbazsqkbzgaayp"; depends=[gss lattice mgcv pheatmap reshape]; }; timeSeries = derive2 { name="timeSeries"; version="4021.105"; sha256="1k6vihbs20m7zjrxh13y9mmsvnia3844c7j13p0b7m5i9fb6rqxz"; depends=[timeDate]; }; - timechange = derive2 { name="timechange"; version="0.0.2"; sha256="15qyvhs96n2s5ply2dbs07i9mpvpvffd7ni5w668f10l3hixfhq8"; depends=[Rcpp]; }; + timechange = derive2 { name="timechange"; version="0.1.1"; sha256="0w3zbmzhg3zr5d9aa83kmr6gyhk75l7jysa7zs0pnz9x4ffr20w5"; depends=[cpp11]; }; timedelay = derive2 { name="timedelay"; version="1.0.11"; sha256="0hr5a2m621ybvl4qyx1xgwzviszj4ccvb149yclds9z87r5h2gm4"; depends=[MASS mvtnorm]; }; timedeppar = derive2 { name="timedeppar"; version="1.0.2"; sha256="0jazddjqrgipvpdxlqh8y3clhhad22syqw4hhaj19cdbxpvivgvw"; depends=[mvtnorm]; }; timelineS = derive2 { name="timelineS"; version="0.1.1"; sha256="076w8ckzzl59bc1gnwjgdwynnz86320hyfmzb0k26hl3k13jlmxs"; depends=[dplyr ggplot2 lubridate magrittr]; }; timeordered = derive2 { name="timeordered"; version="0.9.9"; sha256="0rfga5i6kckmlz2dzqb1pp634dl93wxp7v3kisxlbjl7mgnbck3k"; depends=[igraph plyr]; }; timeperiodsR = derive2 { name="timeperiodsR"; version="0.6.2"; sha256="09vwp04j7n176xs1lbdmbyi557byx6fdvqyjay1785hkb9ivws5q"; depends=[lubridate]; }; - timereg = derive2 { name="timereg"; version="2.0.3"; sha256="0v5hmnppnv9ih29q4zmh8s9qxkdwaqg97093fldsy3fxs7g50dxv"; depends=[lava numDeriv survival]; }; + timereg = derive2 { name="timereg"; version="2.0.4"; sha256="1960z7r41v1bp9k0i74kah5933sv6mxdmrbijzky6a3dlzmmsn11"; depends=[lava numDeriv survival]; }; timeseriesdb = derive2 { name="timeseriesdb"; version="1.0.0-1.1.2"; sha256="17j1nxpgbfbzmfc6zrgcw68ri9ncslic9qdkxkdpfr2gi1w61bpc"; depends=[data_table DBI jsonlite RPostgres xts]; }; - timetk = derive2 { name="timetk"; version="2.8.1"; sha256="1p893jwbyslzmmjk099w2ckqga3vhmvjrrkh6d6gfy6ngf90zh0f"; 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]; }; + timetk = derive2 { name="timetk"; version="2.8.2"; sha256="1zfqrk2qw4f13zxdl5qd8b6f3c59xvq5dprqd4r6nb7w6cqim4cc"; 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=[]; }; - timevis = derive2 { name="timevis"; version="2.0.0"; sha256="07padnd90s8s62sfcmg5l6b64md1cl4cfsxp5xm92nrlz82ksbbs"; depends=[htmltools htmlwidgets jsonlite lubridate magrittr rmarkdown shiny]; }; + timevis = derive2 { name="timevis"; version="2.1.0"; sha256="16b2iwf1lrw5b8am8c5xqkyg6inwac09qgbp0yigf3isd3qqs829"; depends=[htmltools htmlwidgets jsonlite magrittr rmarkdown shiny]; }; timsac = derive2 { name="timsac"; version="1.3.6"; sha256="186919qka9j3kfpdw2gbh16n48d6xgz9lfqgk4b17f1d7l72iplg"; depends=[]; }; timsr = derive2 { name="timsr"; version="0.0.3"; sha256="1n9xq01rfk5v0x0r8cr481s93nh99nf3kshb41d43r7zdw2dcwfi"; depends=[data_table opentimsr]; }; tinkr = derive2 { name="tinkr"; version="0.1.0"; sha256="161jm3hswzfwq31mzr11zzkfw6s488ax7n82g32zy8c6j6k71mr7"; depends=[commonmark glue magrittr purrr R6 stringr xml2 xslt yaml]; }; tinsel = derive2 { name="tinsel"; version="0.0.1"; sha256="0n1x0cf4x6cq1yks0444nxd9snga4m6inc5lfvb7k96fzjb3xgbp"; depends=[]; }; - tint = derive2 { name="tint"; version="0.1.3"; sha256="00830n5nl6p73v9w0yzsak56phz4w1fh5lhf1c42gg1i81x7swnx"; depends=[htmltools knitr rmarkdown]; }; + tint = derive2 { name="tint"; version="0.1.4"; sha256="1vkdgxxgcj3qk3858sp3zi7c2id3dq0zxz23xd4i8lgbqgvvh2s3"; depends=[htmltools knitr rmarkdown]; }; tinter = derive2 { name="tinter"; version="0.1.0"; sha256="02hfw2720qn70x0piahm8cy2ajsb5bqapr4vyvknm4v1yka1wmw3"; depends=[chk]; }; tinyProject = derive2 { name="tinyProject"; version="0.6.1"; sha256="0cflnfp5mib3j1y3n5yvi867h5a7z6xr6163gq9y9b6nrl2skxfk"; depends=[brew R_utils]; }; tinyarray = derive2 { name="tinyarray"; version="2.2.7"; sha256="0nhsmgg126x2rfk82d91c8rk74sg7qbshy10vcbqdgcmlz6466mh"; depends=[BiocManager clusterProfiler dplyr ggplot2 limma org_Hs_eg_db patchwork pheatmap stringr survival survminer tibble]; }; @@ -17776,12 +17891,13 @@ in with self; { tinytest = derive2 { name="tinytest"; version="1.3.1"; sha256="1mq31f7bzcz5bkgzl9khm1i80axfzra7gcjqxd2yqb4wrw1m3x4s"; depends=[]; }; tinytex = derive2 { name="tinytex"; version="0.42"; sha256="1c925r62h84mhwd7v5j35ckdldf6cwb3wzczdn5s72hig0cplpr0"; depends=[xfun]; }; tinytiger = derive2 { name="tinytiger"; version="0.0.4"; sha256="17j5lxlbg6jyw5zpbgaxjhnydiiyrl2d010s5wq8p7jx16sji0w1"; depends=[cli curl glue rlang sf]; }; + tip = derive2 { name="tip"; version="0.1.0"; sha256="11khhkszd5a81q0h6acx5rvp1k97qj1srcvz2jilwf3v6nrz7daz"; depends=[changepoint doParallel foreach GGally ggplot2 igraph LaplacesDemon mniw network rlang]; }; tipa = derive2 { name="tipa"; version="1.0.5"; sha256="1mdjpbdbgd5n22l7fc0bfansh536ib1bgjaxzrl8g534cjxdnhgl"; depends=[optimr]; }; tipitaka = derive2 { name="tipitaka"; version="0.1.2"; sha256="0xf64bpzwywwjm0135c7zjn4ha0h1zj36rj2d4h8dskiq9z90xqi"; depends=[cpp11 dplyr magrittr stringi stringr]; }; - tipmap = derive2 { name="tipmap"; version="0.3.7"; sha256="0w9isg53zvhd2g3icfrdavcq33cg4v9ynljyn5p73p4ifai7mgdz"; depends=[dplyr ggplot2 purrr RBesT]; }; + tipmap = derive2 { name="tipmap"; version="0.3.9"; sha256="186k7d4hvbk5yrz0h23s2k1nakd2fjsc38jj4c0w6f94ldnbp00k"; depends=[dplyr ggplot2 purrr RBesT]; }; tippy = derive2 { name="tippy"; version="0.1.0"; sha256="00c9v07ax7l0x5wpx3ca8hqvdqs3p62d58igp51rsbh9x1ylgjcn"; depends=[htmltools htmlwidgets jsonlite shiny]; }; tipr = derive2 { name="tipr"; version="1.0.1"; sha256="0lx6s0yiyl26gn49xlydyl49b7qb3rl94lahlcyhryayp8sns2ni"; depends=[glue purrr sensemakr tibble]; }; - tipsae = derive2 { name="tipsae"; version="0.0.7"; sha256="1mvik61p9031p4d409ff1ymz6bq1izhwnrid1f9snlrdm9n7inkk"; depends=[BH broom ggplot2 ggpubr nlme Rcpp RcppEigen RcppParallel Rdpack rstan shiny StanHeaders]; }; + tipsae = derive2 { name="tipsae"; version="0.0.9"; sha256="0mrv3jw219jra70jr5lj87jvsr6pphmr7nbcns41qiynnaddrfad"; depends=[BH broom ggplot2 ggpubr nlme Rcpp RcppEigen RcppParallel Rdpack rstan shiny sp StanHeaders]; }; tis = derive2 { name="tis"; version="1.39"; sha256="1sq3acz8mybsbxng5fga4ynqvh1ly9hs3ca727jiyx1gam712mis"; depends=[]; }; titanic = derive2 { name="titanic"; version="0.1.0"; sha256="0mdmh0ciwfig00847bmvp50cyvj8pra6q4i4vdg7md19z5rjlx3j"; depends=[]; }; titeIR = derive2 { name="titeIR"; version="0.1.0"; sha256="047vidn3zydbjijwgz6qm2d9j2ny8ng2sv5jzm8zb300y7k2426c"; depends=[Iso]; }; @@ -17834,20 +17950,20 @@ in with self; { tools4uplift = derive2 { name="tools4uplift"; version="1.0.0"; sha256="1izm9q2bj9l2nd9jn0fi3lf9hscfa0vmib58ypgpjsbsn0nd7p2h"; depends=[BiasedUrn dplyr glmnet latticeExtra lhs]; }; topdowntimeratio = derive2 { name="topdowntimeratio"; version="0.1.0"; sha256="0dbn9hs3fsmwkjipk5wyl5wj02hv56ipcr9pmj068c4y6rm3qiqv"; depends=[data_table geodist lubridate magrittr]; }; topicdoc = derive2 { name="topicdoc"; version="0.1.1"; sha256="195yly7r14cpavbbr02iq3lqfb0gcx5cngfigivnid1rk45wv7bz"; depends=[slam topicmodels]; }; - topicmodels = derive2 { name="topicmodels"; version="0.2-12"; sha256="1d6iizmn042b59q2y6qc82z19wq3xm0zvgkf8iqf8fdzh51kmn5g"; depends=[modeltools slam tm]; }; + topicmodels = derive2 { name="topicmodels"; version="0.2-13"; sha256="16mw0l7wm5idc831csxlk176c42a5xw8qm8xhbnmmdl2hjk0cqbx"; depends=[modeltools slam tm]; }; topicmodels_etm = derive2 { name="topicmodels.etm"; version="0.1.0"; sha256="06w2n1gswv268sgzm0nz14mmrahibnsgcxh7hcks3bmq9r8d9ba4"; depends=[Matrix torch]; }; - topmodel = derive2 { name="topmodel"; version="0.7.4"; sha256="18k0nz2i2jr0m2pmzy75d77drbk1smrw7kkni7j0k79m9izwsmkc"; depends=[]; }; + topmodel = derive2 { name="topmodel"; version="0.7.5"; sha256="1bhzjy2ja4953a5wx8s3cz3v0ip6lym193faqxxabxjklgbsp416"; depends=[]; }; topoDistance = derive2 { name="topoDistance"; version="1.0.2"; sha256="1n6108giihc4aa1871m558s2z96m766ysvhak5b6zg1bnvpdj0l8"; depends=[gdistance plotly raster RColorBrewer scales sp]; }; topologyGSA = derive2 { name="topologyGSA"; version="1.4.7"; sha256="073n8bkrapk6il3izqr3bmcdp7yc29yzpbyzh6fvy9rg0x4d3g0z"; depends=[fields graph gRbase qpgraph]; }; - topr = derive2 { name="topr"; version="1.1.0"; sha256="04vzis26zarxi3bqhvhiazn1if63k0rfc6b2znd555z3lq6hdd0q"; depends=[dplyr egg ggplot2 ggrepel gridExtra magrittr scales stringr tidyr toprdata]; }; + topr = derive2 { name="topr"; version="1.1.1"; sha256="1c5m4422rx3hv62s0v2b2n3scfd66vhpq5gpxh81wzn32p0wcvii"; depends=[dplyr egg ggplot2 ggrepel gridExtra magrittr scales stringr tidyr toprdata]; }; toprdata = derive2 { name="toprdata"; version="1.0.1"; sha256="0mn8j28b93blr2xfkbwha8mpmlhw6yy7yw84p3q80llapxqiy90a"; 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.9.0"; sha256="1iylnz0hsi00q7hngi2h24kg3nvjjg10z6iarqhp3wylsasgjs1f"; depends=[bit64 callr cli coro ellipsis magrittr R6 Rcpp rlang withr]; }; - torchdatasets = derive2 { name="torchdatasets"; version="0.1.0"; sha256="1iliz3iv143zmffd4jvvfxzsqn8bzp1sg5573rqjjbhnvy958mgg"; depends=[fs pins stringr torch torchvision withr zip]; }; + torchdatasets = derive2 { name="torchdatasets"; version="0.2.0"; sha256="0h558d5vzxibigb5hvvfllbaxfqkdjjrl51zzj89jwmmpkcjc8zd"; depends=[fs pins stringr torch torchvision withr zip]; }; torchopt = derive2 { name="torchopt"; version="0.1.2"; sha256="056j1fw759h81c0mlaadw5jb19ydpvjy85nhbjsn5k8a9azf4wki"; depends=[torch]; }; 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.2.0"; sha256="172kspvyv7fkd86cj16xdifzl8cln0fi227pvxsfqpr6d6rkzqg5"; depends=[glue Rcpp rlang torch]; }; + torchvisionlib = derive2 { name="torchvisionlib"; version="0.3.0"; sha256="01l04zabja3ancay7ynb5i7knqm1gd5101sx07fbid185w5j8yh4"; depends=[glue Rcpp rlang torch withr]; }; 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]; }; toscmask = derive2 { name="toscmask"; version="1.2.3"; sha256="1inryfbci03klv4rlkzf20f3a0sc187lxybd4yn1dimz6f5z71ni"; depends=[]; }; @@ -17856,7 +17972,7 @@ in with self; { totalcensus = derive2 { name="totalcensus"; version="0.6.6"; sha256="09c7hm9yys48p8pjp9kv3szbwrg9xb1xf47zya24yir0gxs7bfmi"; depends=[data_table magrittr purrr stringr]; }; touch = derive2 { name="touch"; version="0.1-6"; sha256="0w25zxxj5qaxkx64vz55qw4k4szx85ncbcam7q600ryy1kc5xxxv"; depends=[Rcpp]; }; touchard = derive2 { name="touchard"; version="2.0.1"; sha256="06491r4x3ycmv3ddbqwig334wj9qvm395xlaifx4hjjyyi65xb3q"; depends=[MASS nleqslv numDeriv plotrix]; }; - tourr = derive2 { name="tourr"; version="0.6.1"; sha256="1l39glvs8amd52ihnqa9nflh2mc0crb0jaqmpij2rxr3fnbc5mp8"; depends=[dplyr MASS tibble]; }; + tourr = derive2 { name="tourr"; version="0.6.2"; sha256="16cbybg9g0b8439scw5h3n1a0asnd5yvs91g6mcfipwfyzix045s"; 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.2.1"; sha256="0n6x87gyzxsib267h0gs5b4sdkwmgjpgqzipfhlrjsnxq55q6599"; depends=[BiocGenerics pryr rlang S4Vectors tidyr]; }; tpAUC = derive2 { name="tpAUC"; version="2.1.1"; sha256="0wix9qwcidj7xfqhh7bmrpnadd9qlkvg3515gaamdxkjbz2kyydc"; depends=[pROC]; }; @@ -17867,7 +17983,7 @@ in with self; { tracer = derive2 { name="tracer"; version="1.0.0"; sha256="1jdh4ljcz7d0w2y5miggqkvv397jdx7fn108hbjw93af2gnh698q"; depends=[clisymbols crayon prettycode]; }; tracerer = derive2 { name="tracerer"; version="2.2.2"; sha256="0932074lzkzprn8rr8f59ywhgn33fwvbnkxnxg97k29gapx49iyb"; depends=[jsonlite Rcpp testit]; }; tracheideR = derive2 { name="tracheideR"; version="0.1.1"; sha256="1x1jwzgs2aqb3k17mm9mhfhnbwcmilhkjaz9rl40rcg84xjqdrpl"; depends=[tgram]; }; - track2KBA = derive2 { name="track2KBA"; version="1.0.3"; sha256="09w5cnkqpl88kaq5303dlpiw2jha96nm457a62aszcdb871r470x"; depends=[adehabitatHR dplyr foreach geosphere ggplot2 lubridate magrittr maps maptools Matching move purrr raster rgdal rgeos rlang sf sp tidyr]; }; + track2KBA = derive2 { name="track2KBA"; version="1.0.4"; sha256="0g4i896yyv2kyjs5icavrx3h91wr9jnmgw8wykhvhakwpjr64cgf"; depends=[adehabitatHR dplyr foreach geosphere ggplot2 lubridate magrittr maps maptools Matching move purrr raster rgdal rgeos rlang sf sp tidyr]; }; trackdem = derive2 { name="trackdem"; version="0.6"; sha256="069nl1i73ayjnlsds4dnz6w4n765jijimgz20n9az7r0irvaddhi"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo shiny]; }; trackdf = derive2 { name="trackdf"; version="0.2.2"; sha256="110m7dmciyqbcb69sxi02h5djnf098wzfr84d6yppyc73a81989y"; depends=[data_table lubridate sp tibble]; }; trackdown = derive2 { name="trackdown"; version="1.1.1"; sha256="1l8mqdfpdf25vyibxqcqhyip6aqllb9riz2v6w4k1rfc8b9dl07f"; depends=[cli googledrive rmarkdown]; }; @@ -17886,25 +18002,25 @@ in with self; { 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.5"; sha256="1zy3hg1m1a5dpx494mlb72vfpng5892dcginv6rwxc2c1ggv6z86"; depends=[capushe MASS minpack_lm numDeriv Rcpp RcppArmadillo ucminf]; }; - trajectories = derive2 { name="trajectories"; version="0.2-4"; sha256="11h735zqlz8jg7syn46xg5kmv807px94la6gnml2jlcn2hld2a2l"; depends=[lattice sp spacetime zoo]; }; + trajectories = derive2 { name="trajectories"; version="0.2-5"; sha256="0wijsv6j0w0a0lz6y1iflznnr7aa2vbbwl5xzixjvq3ivwjdcgcl"; depends=[lattice sp spacetime zoo]; }; trajr = derive2 { name="trajr"; version="1.4.0"; sha256="092hx27b6d0vy1pvmga1z3b245aa9gn9aw3hszbhhkkic5zfpgbq"; depends=[plotrix signal]; }; - tram = derive2 { name="tram"; version="0.7-2"; sha256="0wnj5c93by6svbh8b749khcjn9ksygddmnhg1v4i743snm1gl9l9"; depends=[basefun Formula Matrix mlt multcomp sandwich survival variables]; }; + tram = derive2 { name="tram"; version="0.8-0"; sha256="00jqg9pfy14l18ydgds5mylchb0rnyn80wy7f9w9y9nms5ri579j"; depends=[basefun Formula Matrix mlt multcomp mvtnorm sandwich survival variables]; }; tramME = derive2 { name="tramME"; version="1.0.3"; sha256="1xsxn3y809wyyxvzdi9db9pkw1bnvypykmjjy3qwzxd9q3f9i48c"; depends=[alabama basefun coneproj lme4 MASS Matrix mgcv mlt nlme numDeriv RcppEigen TMB tram variables]; }; tramnet = derive2 { name="tramnet"; version="0.0-7"; sha256="0a7czkg69js07ryqwa2x0q83spcawm6jahq8fn8invnglk9iw8rs"; depends=[basefun CVXR lhs mlr mlrMBO mlt ParamHelpers sandwich smoof tram]; }; trampoline = derive2 { name="trampoline"; version="0.1.1"; sha256="05inq5j8gvnpww6z21dzc57vilsm4gx3m274fpsamp54q85mi68s"; depends=[coro fastmap rlang]; }; - tramvs = derive2 { name="tramvs"; version="0.0-2"; sha256="0rwfs5yjpz9k1qls5jsk0w8f0ck417m03r7wjcsrxjndqk7pnymi"; depends=[cotram tram variables]; }; + tramvs = derive2 { name="tramvs"; version="0.0-3"; sha256="1fn119wliap4947gma0d7lvqbbwqavyd449m38pzvf9425i7a5ns"; depends=[cotram tram variables]; }; tranSurv = derive2 { name="tranSurv"; version="1.2.2"; sha256="17rvzjcn76z5niw1jappiadbkf66a9x0m7p3251lgb7qrnvpx3gk"; depends=[rootSolve SQUAREM survival truncSP]; }; transPlotR = derive2 { name="transPlotR"; version="0.0.2"; sha256="0xk7lqv4nf6565msschz72mqfdmpvvfylv0acj9qlg6jsanfxii7"; depends=[cowplot dplyr geomtextpath ggarchery ggplot2 magrittr purrr tidyverse]; }; transcribeR = derive2 { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; }; - transfR = derive2 { name="transfR"; version="1.0.0"; sha256="1lmxdy5fj23sg9c27biyca8vzvs1x5cfhayyzicv4c7jjp09z5vd"; depends=[doParallel foreach Rdpack sf stars units]; }; + transfR = derive2 { name="transfR"; version="1.0.2"; sha256="1ricgs7297wdmrw2vp5r6hxd266cq14c3nz2rrcas0vphmw1f5hl"; depends=[doParallel foreach Rdpack sf stars units]; }; transforEmotion = derive2 { name="transforEmotion"; version="0.1.1"; sha256="0lnmgbsh26mazx0g1s0jxg3jk1a6vw3bsaw07viv9kx3rdf6wc46"; depends=[dplyr LSAfun osfr pbapply remotes reticulate]; }; + transform_hazards = derive2 { name="transform.hazards"; version="0.1.0"; sha256="1k9p40dp3s4ylrh91cj06k4ryazw6b870yj5vdsd30j95pwnf3wi"; depends=[]; }; transformmos = derive2 { name="transformmos"; version="0.1.0"; sha256="1hsp399cj6cnsysb4hm4ra075qm2fxkjhyq16m3nai51fvzkak0p"; depends=[]; }; transformr = derive2 { name="transformr"; version="0.1.4"; sha256="0h0zcsqyjxkc5g6zg79h7nq5z2rzfj93i1livwrkjj622y1br4y1"; depends=[cpp11 lpSolve rlang sf tweenr vctrs]; }; - 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]; }; transmem = derive2 { name="transmem"; version="0.1.1"; sha256="1a3c5ddmh9k4f80rbk363s7rkx30qhk9ssmf7xg7rr0lwxphahf3"; depends=[cmna ggformula ggplot2 plot3D]; }; transplantr = derive2 { name="transplantr"; version="0.2.0"; sha256="1kzi8rvswsmibxqnhqd1j42y848si6cxd8hpvwi55y8s4hcylw0y"; depends=[]; }; - transport = derive2 { name="transport"; version="0.12-4"; sha256="0wvrsrlzv56lgn60c5w6fjg1zg1yvnnmnw7rm55zdycrjrkar5al"; depends=[data_table Rcpp RcppEigen]; }; + transport = derive2 { name="transport"; version="0.13-0"; sha256="0msz7z4mcz4s8sffqxsxjv5pwg2cwsg55fg477pr4vp3jgfznpn5"; depends=[data_table Rcpp RcppEigen]; }; transx = derive2 { name="transx"; version="0.0.1"; sha256="1xx934w4fhk2nwm5h6lf4irj83wsfp8lbplzcha5rnc7aka8pn3v"; depends=[rlang]; }; trapezoid = derive2 { name="trapezoid"; version="2.0-2"; sha256="1pqb888w0q2zhcgjn0q4na2qwbxy4i8kfk6pp2id20gh8s96sm3f"; depends=[]; }; traudem = derive2 { name="traudem"; version="1.0.1"; sha256="0qxvh5zfj14yaywjzf83v01v6n064iq16ba8g72yh0pbb8i98w9i"; depends=[cli purrr rlang sys withr]; }; @@ -17914,6 +18030,7 @@ in with self; { tree_interpreter = derive2 { name="tree.interpreter"; version="0.1.1"; sha256="18p1x53q1hhhagglgsq2axnr9l5rpa08vxjayqqmb6rsjrkygn78"; depends=[Rcpp RcppArmadillo]; }; treeClust = derive2 { name="treeClust"; version="1.1-7"; sha256="1s7kh6q0bkixsygrip95zf1bi10ihddsa5lq9dfxd68yh8rsby6z"; depends=[cluster rpart]; }; treeDA = derive2 { name="treeDA"; version="0.0.5"; sha256="0rdqvjj16w7ykpxd6m800h4zv79y9c1phhkl14xy10gbi2cqh10g"; depends=[ape ggplot2 gtable Matrix mvtnorm phyloseq reshape2 sparseLDA]; }; + treePlotArea = derive2 { name="treePlotArea"; version="1.3.1"; sha256="1fkm6jac2j3r2s3whd3aql8czflpd99kmq5wa0nfb5qrynpvim7s"; depends=[sf]; }; treebalance = derive2 { name="treebalance"; version="1.1.0"; sha256="0wxsd9mx7bcz95vn4a9w1bzqvd8v1qk5qv00p3x58qks7nzxyzdv"; depends=[ape memoise]; }; treebase = derive2 { name="treebase"; version="0.1.4"; sha256="1bx31jahb0wy2g8wl1z71vy659lfi8fq1sbbaxvyixzcwymix1wq"; depends=[ape httr RCurl XML]; }; treeclim = derive2 { name="treeclim"; version="2.0.6.0"; sha256="0zdn766vxgycisjyjw7nh7hs817kqhdihyla3fhpzykw9pxnw0b2"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; }; @@ -17931,7 +18048,6 @@ 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.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]; }; @@ -17956,7 +18072,6 @@ in with self; { trimmer = derive2 { name="trimmer"; version="0.8.1"; sha256="0hn5pignj5clg7wb3xd0mh9jqc480wqxxymzaas68lxzi6p5mng9"; depends=[cli crayon data_table pryr]; }; trimr = derive2 { name="trimr"; version="1.1.1"; sha256="12z194g67b8g4vv1667hzhmns9mhw93icvdkxf2d45wfyjfdvsvv"; depends=[dplyr]; }; trinROC = derive2 { name="trinROC"; version="0.6"; sha256="0jpnr3l8f057k334sx803cc7kxgi8mxvxjgli88f8682ax9z47k3"; depends=[ggplot2 gridExtra rgl]; }; - trip = derive2 { name="trip"; version="1.8.5"; sha256="160dp9ji8j4w2fwh62l6cp485iy5n5is451rbgf28d5q0prd912c"; depends=[crsmeta dplyr geodist glue MASS raster reproj rlang sp spatstat_core spatstat_geom traipse viridis]; }; tripEstimation = derive2 { name="tripEstimation"; version="0.0-44"; sha256="1ylpyzlqr6l5haxq4icnlxw6vgvc2lsfz5sm2wqqm4m6h3p0i6s6"; depends=[lattice mgcv rgdal sp zoo]; }; tripack = derive2 { name="tripack"; version="1.3-9.1"; sha256="1ghza4by6shalsnqybn5qgv076dxh59b6vycg9v6ii216zbgi0kz"; depends=[]; }; triplot = derive2 { name="triplot"; version="1.3.0"; sha256="1apmdpxdnnmjyi7gcrjrqw44iqphr84nbgw0nfxcspzjgxhc81l1"; depends=[DALEX ggdendro ggplot2 glmnet patchwork]; }; @@ -17977,7 +18092,6 @@ in with self; { trust = derive2 { name="trust"; version="0.1-8"; sha256="1b6wsx4vybr5952ii3ska6jbcb3654iibz83n645khxfca5k8blm"; depends=[]; }; trustOptim = derive2 { name="trustOptim"; version="0.8.7.3"; sha256="11cx90zq9987i7kc86kxbip6c75bmw51shlwq2x9ywhybzk8vxl8"; depends=[Matrix Rcpp RcppEigen]; }; trustedtimestamping = derive2 { name="trustedtimestamping"; version="0.2.6"; sha256="1rx7ypy331mq5ni5hxhqcfnicvwdgg9j2pm3aj097a5hhigibdrq"; depends=[digest httr jsonlite]; }; - truthiness = derive2 { name="truthiness"; version="1.2.5"; sha256="0cssqlrilx2lglr2f53yysqgf604g4y326ijf8avlg6v5l6hlcr1"; depends=[dplyr DT emmeans ez forcats ggplot2 lme4 magrittr MASS ordinal purrr Rdpack readr rmarkdown tibble tidyr]; }; tryCatchLog = derive2 { name="tryCatchLog"; version="1.3.1"; sha256="0k40a48qzwmardjnkf0h5s5zryivzvdanz61kxdqdfqlil19ma0d"; depends=[]; }; ts_extend = derive2 { name="ts.extend"; version="0.1.1"; sha256="03b358nywx0zynb6006886mzvz1mbbaim6b5m641drklh6k0l6r1"; depends=[]; }; ts2net = derive2 { name="ts2net"; version="0.1.0"; sha256="0f45xnvg09qvcc202dfr9d1a29909gmz863pjyq78mhjj0glijqw"; depends=[dbscan dtw igraph infotheo minerva mmpp nonlinearTseries scales zoo]; }; @@ -17996,7 +18110,7 @@ in with self; { tsdf = derive2 { name="tsdf"; version="1.1-8"; sha256="00s0aiis88611xsq9px61f9gwprp803wcvi5milvc7qckrh1kw0z"; depends=[]; }; tsdisagg2 = derive2 { name="tsdisagg2"; version="0.1.0"; sha256="1vjypf9d4rdprpgxfsgpccn412kvar59v341ridq2hcdp7hfb70s"; depends=[]; }; tsensembler = derive2 { name="tsensembler"; version="0.1.0"; sha256="0amb3dn96hdgy5a0j6s43mf82cdjwbz8dhz3yrjlr07nknxzirzi"; depends=[Cubist doParallel earth foreach gbm glmnet kernlab monmlp pls ranger RcppRoll softImpute xgboost xts zoo]; }; - tsentiment = derive2 { name="tsentiment"; version="1.0.4"; sha256="173m4ry58rz5cgffrwzxd9wr22w2ziny82zzby958w6vpyysdsc0"; depends=[dplyr ggplot2 httr progress reshape2 stringi syuzhet tibble tidytext wordcloud wordcloud2]; }; + tsentiment = derive2 { name="tsentiment"; version="1.0.5"; sha256="1sa1xy1v7p166r3sc3mg66zzw72n8vsy8q636knhyl71zzbvacsw"; depends=[dplyr ggplot2 httr reshape2 stringi syuzhet tibble tidytext wordcloud]; }; tseries = derive2 { name="tseries"; version="0.10-52"; sha256="0icgmng0dzvfkkn6dam74wvlz8g0cy46wkw57f5lpd5kxpdwi6ck"; depends=[quadprog quantmod zoo]; }; tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13.1"; sha256="0qfrrzd0h8n9zp7wj5fl88wkiv22fs5zy8x509g316j0avm5zjr3"; depends=[deSolve]; }; tseriesEntropy = derive2 { name="tseriesEntropy"; version="0.6-0"; sha256="04clfkpkiy5p5nxcq59c7f4v1llj1d95lvck23h1px50lvb993fv"; depends=[cubature ks]; }; @@ -18004,7 +18118,6 @@ in with self; { tsfgrnn = derive2 { name="tsfgrnn"; version="1.0.2"; sha256="17m9k8nvfhpk11g7f64c32sb4r6vdcgci93apcr89y8dkbw4n5ga"; depends=[ggplot2 Rcpp]; }; tsfknn = derive2 { name="tsfknn"; version="0.5.0"; sha256="0rl3g0qs787cy67vq25aygb9mxhd63p66a1i4p2zi906cx4xj4b3"; depends=[ggplot2 Rcpp]; }; tsfngm = derive2 { name="tsfngm"; version="0.1.0"; sha256="1wx1imbvnc2bjvfal45zhgpz296fiydqffb0rk428xpjgp2dj6p7"; depends=[]; }; - 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.3"; sha256="0qb5ksj366l253rhkjpq7cpancplx2q81xn95b4ddwpnz3p16hhz"; depends=[anytime dplyr ellipsis generics lifecycle lubridate rlang tibble tidyselect vctrs]; }; tsibbledata = derive2 { name="tsibbledata"; version="0.4.1"; sha256="1wh0i5rm5cp4f9hqgxjlhbsj3ag6wgdq38fpzc0gdsl84m6xvwnh"; depends=[rappdirs tsibble vctrs]; }; @@ -18027,7 +18140,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.3-0"; sha256="116n07w944w9j4hzy0vg3hldlzdd4csprzqmbsry36cygvh8as2a"; depends=[Rcpp spatstat spatstat_core spatstat_geom spatstat_linnet spatstat_random]; }; + ttbary = derive2 { name="ttbary"; version="0.3-1"; sha256="0dp9jjl33p0r67nk7qxwjkniy7pxp8w7xbymm61hl29hqqbpmszh"; depends=[Rcpp spatstat spatstat_explore spatstat_geom spatstat_linnet spatstat_model 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]; }; @@ -18050,7 +18163,6 @@ in with self; { tuple = derive2 { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; }; turboEM = derive2 { name="turboEM"; version="2021.1"; sha256="17j308qla2680k0j8cf2c4v1jlsm21z93zglncmw3n0isa7cwjly"; depends=[doParallel foreach iterators numDeriv quantreg]; }; turner = derive2 { name="turner"; version="0.1.7"; sha256="1xckb750hbfmzhvabj0lzrsscib7g187b44ag831z58zvawwh772"; depends=[tester]; }; - tutorial = 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]; }; tvReg = derive2 { name="tvReg"; version="0.5.7"; sha256="0q34266qk621cna5sf87yyp2jf9s9zc945bm2qsl8mh2ag0wii86"; depends=[bvarsv MASS Matrix plm systemfit vars]; }; tvem = derive2 { name="tvem"; version="1.3.1"; sha256="1hrjl5kbp0wx7a4aa8bbvf5sdrxcvxsf3318ckgl85w923i8a44k"; depends=[mgcv]; }; @@ -18059,7 +18171,7 @@ in with self; { tvm = derive2 { name="tvm"; version="0.5.0"; sha256="1disznln4xgkr9q6sj978nadbwg43xv28fq3r3zyy6icg4x9h6gs"; depends=[ggplot2 reshape2 scales]; }; tvmComp = derive2 { name="tvmComp"; version="1.0.2"; sha256="1q5c3ahdjjz4h19pwq0dpasv87mzbyqs0hadlfx7mpmncdgyqcqq"; depends=[Rdpack]; }; tvmediation = derive2 { name="tvmediation"; version="1.1.0"; sha256="082lw56yhlb6nj7srdinim1hgvb8szzb3gp2y985115qgdypbv6n"; depends=[dplyr ggplot2 locpol]; }; - tvthemes = derive2 { name="tvthemes"; version="1.3.1"; sha256="0ig2pb0qdc9a0hm7j8860dj2ksqnsds2nslbpzf1ykqwfhnfgmsb"; depends=[extrafont ggplot2 magick scales]; }; + tvthemes = derive2 { name="tvthemes"; version="1.3.2"; sha256="15m1g191nw1bfz1jgcab316c8jzvam2zc5vnlz8k9b6lcqqnv3nl"; depends=[extrafont ggplot2 magick scales]; }; twang = derive2 { name="twang"; version="2.5"; sha256="1raczkxbkikwx9gi4p8nzgazqxa41ilpqvfjc07nwkvyqlkmadgw"; depends=[data_table gbm ggplot2 lattice latticeExtra MatrixModels survey xgboost xtable]; }; twangContinuous = derive2 { name="twangContinuous"; version="1.0.0"; sha256="0bn1i9nid97irn820591ml3556bbmg6pw2qhm9k9vqgnqmnhcfnq"; depends=[gbm lattice Rcpp survey xtable]; }; twangMediation = derive2 { name="twangMediation"; version="1.2"; sha256="12dj98sqggcqzlkcmn2fmxv81cankp5hmswz07rwb2sn6awlq9jg"; depends=[gbm lattice latticeExtra survey twang]; }; @@ -18075,7 +18187,7 @@ in with self; { twitteradsR = derive2 { name="twitteradsR"; version="0.1.0"; sha256="15r6l9rf05xdr1m9zkmsg1v9vrdsyz480jqkgvx7yn27546z5653"; depends=[jsonlite]; }; 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]; }; - twn = derive2 { name="twn"; version="0.2.2"; sha256="0s1yn5jvcb2vds6r3f3xsfnc01lzljljy606kf22lsfqcrrrk5vr"; depends=[crayon dplyr rlang stringr tibble]; }; + twn = derive2 { name="twn"; version="0.2.3"; sha256="1g73y0vkfhz2lvfcfxl3lrv6zj1gcymrxdihk7a2hpxnx1bfxjx1"; depends=[crayon dplyr rlang stringr tibble]; }; twopartm = derive2 { name="twopartm"; version="0.1.0"; sha256="0hncdfc9l1m31158kk5jdciqasv8nqr2q7cam38wi2wclqpk5r5v"; depends=[data_table MASS]; }; twosamples = derive2 { name="twosamples"; version="2.0.0"; sha256="1ap856n3gjjd5jr51gcgq70hrv1791fkhwz2x939wd89nr6xwzx7"; depends=[cpp11]; }; twosigma = derive2 { name="twosigma"; version="1.0.2"; sha256="0b73qcna55gmfxz1lzd987j28m7g8642s9wgzpndx3850q61yfli"; depends=[doParallel glmmTMB multcomp pbapply pscl]; }; @@ -18099,16 +18211,16 @@ in with self; { uaparserjs = derive2 { name="uaparserjs"; version="0.3.5"; sha256="0v24smgsz1p2wa23mc2llx7dycwmgf7zyxdhwxgwplabpmy3xzhl"; depends=[progress V8]; }; uavRmp = derive2 { name="uavRmp"; version="0.6.0"; sha256="0spa0cv33kdrxzmfn07qnj1j98gxnjmi3v4888xj5v3a1yaa08kw"; depends=[brew data_table exifr geosphere jsonlite link2GI log4r raster rgdal rgeos rlist sf sp zoo]; }; ubiquity = derive2 { name="ubiquity"; version="2.0.0"; sha256="1zjjwpl8zkpr4zvrhsbsj6vpiwy08vs2sw1rpx7aq940v37dvmbz"; depends=[deSolve digest doParallel dplyr flextable foreach ggplot2 knitr magrittr MASS onbrand optimx PKNCA pso readxl rhandsontable rmarkdown scales shiny stringr]; }; - ubms = derive2 { name="ubms"; version="1.1.0"; sha256="016rdjba3h2hm6ps4jrnqzy1hwm0nmn3yq922dbfw8396qvmr2zf"; depends=[BH ggplot2 gridExtra lme4 loo Matrix pbapply Rcpp RcppArmadillo RcppEigen RcppParallel RSpectra rstan rstantools StanHeaders unmarked]; }; - uchardet = derive2 { name="uchardet"; version="1.1.0"; sha256="1dnvi45npk7l7sqbv3c1mrg0m7vrrp7iya9kjndcg9x3h0iial9z"; depends=[]; }; + ubms = derive2 { name="ubms"; version="1.2.2"; sha256="0d83i27cc4wlw5pivmkf5msvxyj99yr0fb5fibxa3knfz8hwwaxw"; depends=[BH ggplot2 gridExtra lme4 loo Matrix pbapply Rcpp RcppArmadillo RcppEigen RcppParallel RSpectra rstan rstantools StanHeaders unmarked]; }; + uchardet = derive2 { name="uchardet"; version="1.1.1"; sha256="0m3xy807smqdxhkhd9cwrcf3ljlyvfmnkd7831qzpgcadam2jcdj"; depends=[]; }; ucie = derive2 { name="ucie"; version="1.0.2"; sha256="032anlli29a0iwzmn35afrcs4if5kipplpn8n4qpy1g14hc5zgvd"; depends=[colorspace dplyr geometry pracma ptinpoly remotes rgl]; }; uclust = derive2 { name="uclust"; version="1.0.0"; sha256="10i78fc81sy635mi8nn1gmryvcbqq7f99ws6byqlnhwyw79qmvb1"; depends=[dendextend robcor]; }; ucminf = derive2 { name="ucminf"; version="1.1-4.1"; sha256="1cknk42allcflgk16i4gwi4a389idrxqz6y2w8i7s9mdfgrvd981"; depends=[]; }; - udpipe = derive2 { name="udpipe"; version="0.8.9"; sha256="1pdxfr3523imyygm26zhisy3x0a8ay6wd4ndda93ic0lqxb5lapd"; depends=[data_table Matrix Rcpp]; }; + udpipe = derive2 { name="udpipe"; version="0.8.10"; sha256="0ipns4wzp7j0ms6i2mfkfkgqqd5cqbrv79valiz6r7ffx4yxys14"; depends=[data_table Matrix Rcpp]; }; udunits2 = derive2 { name="udunits2"; version="0.13.2.1"; sha256="00prsy8m41v1camcsz94d7gm8qab2mdnwl3x0dyhz4r49b02jm4z"; depends=[]; }; ufRisk = derive2 { name="ufRisk"; version="1.0.6"; sha256="190rjqhmm7r9yy4f5gyk2p8k250xnnkkssi3nfgv79w62z2hv2qh"; depends=[esemifar fracdiff rugarch smoots]; }; 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]; }; + ugatsdb = derive2 { name="ugatsdb"; version="0.2.3"; sha256="098dzh6slaxj22730nm9g6b5653600ms2ahxr87iblh5xq0dcidl"; depends=[collapse data_table DBI RMySQL writexl]; }; ugomquantreg = derive2 { name="ugomquantreg"; version="1.0.0"; sha256="1a5vc1qgy3kp1by5bp296w980lkxcghzzxibhap2jg06jnzjfcq8"; depends=[gamlss gamlss_dist pracma Rcpp]; }; ui = derive2 { name="ui"; version="0.1.1"; sha256="15hcdzaj75ip6j7yglx8rqhp4y3yf3aw5cpbjgk1mjr4cya7lvzi"; depends=[Matrix maxLik mvtnorm numDeriv]; }; uiucthemes = derive2 { name="uiucthemes"; version="0.3.1"; sha256="1faggg8hiqw4pblq5r3m9wi3x5m6kbjq0flf88mqa993v9rpdrf6"; depends=[rmarkdown xaringan]; }; @@ -18137,18 +18249,17 @@ in with self; { uniah = derive2 { name="uniah"; version="1.1"; sha256="0yjjn08aizqq6j5f9pnsjwdfqdmqrj1s8vjja97gzisfy1xscwfa"; depends=[ahaz Iso survival]; }; unifDAG = derive2 { name="unifDAG"; version="1.0.3"; sha256="052qjrnj04imhj6i62k8jdx9rs8r70n0qrmd2z45x4fimn5py6j5"; depends=[gmp graph]; }; unifed = derive2 { name="unifed"; version="1.1.6"; sha256="0wy2hasgkzw08l50qq30wb62i1q4skc3zccipv8pm911qlldk3sr"; depends=[]; }; - unifir = derive2 { name="unifir"; version="0.2.2"; sha256="0d9wb0af2sjipz47aqgy78f7ddbxs4qa7imwr2z46gigkfa8vb5s"; depends=[glue proceduralnames R6]; }; + unifir = derive2 { name="unifir"; version="0.2.3"; sha256="1l563qxym1srjj5xzcz8jks3577jpk33k1gb95lcyg7r9bh35j85"; depends=[glue proceduralnames R6]; }; uniformly = derive2 { name="uniformly"; version="0.2.0"; sha256="1xfwnklzmz72kp5qsb5zh3p6lwngpiaw5b4drjd41h9xvxdb3dyd"; depends=[pgnorm]; }; - unikn = derive2 { name="unikn"; version="0.6.0"; sha256="0qvqj80cqp90qvm2nacl49mnyi0ay91wngr4wk7xsrq67nv4vf22"; depends=[crayon ggplot2]; }; + unikn = derive2 { name="unikn"; version="0.7.0"; sha256="06y2jsx8hjbxdjm03w4ipjpxxp65fj10l2p3zjck82lyhw1llxxw"; depends=[crayon ggplot2]; }; unine = derive2 { name="unine"; version="0.2.0"; sha256="051dk8fss19h4d9815a7994krr1s3n5q0pxq9gir6zns0vvn05pw"; depends=[Rcpp]; }; uniqtag = derive2 { name="uniqtag"; version="1.0.1"; sha256="0vmd5w4p2qvpg6djddl92q9d3c6kiq0rjv6hq6j7x1b1zwqhgfi5"; depends=[]; }; unisensR = derive2 { name="unisensR"; version="0.3.3"; sha256="1pqfb8i3rj64l9hh1bn9mm78wlfqphgrlp7zrydznqy88f4jwgvy"; depends=[hexView vroom XML]; }; uniset = derive2 { name="uniset"; version="0.3.1"; sha256="1lpwsx1l6x186aj7wl5kvfmc5mp4g95p5h69alg8dn1sns84zqjs"; depends=[easycsv]; }; - uniswappeR = derive2 { name="uniswappeR"; version="0.6.0"; sha256="0n180v0kya6djkd3zngn4zvqzga3dhav41r94ckbzb1yww5ck1vd"; depends=[dplyr ggplot2 ghql httr jsonlite lubridate patchwork purrr reticulate rlang scales tibble tidyr]; }; unitedR = derive2 { name="unitedR"; version="0.4"; sha256="0h4i814awb8419693jz3x5cyhs2x6y5flmz339bg6ivmg13d9h3s"; depends=[plyr]; }; unitizer = derive2 { name="unitizer"; version="1.4.18"; sha256="1higz77mxyci56h3z5pizkbyqdbkf65lfxf8zm36gi1h04czxrnr"; depends=[crayon diffobj]; }; unitquantreg = derive2 { name="unitquantreg"; version="0.0.5"; sha256="1sb9gh0sdhs2bmybqkbnr82ymfiq1317iiihbgj56xxa4rwx13mg"; depends=[Formula MASS numDeriv optimx quantreg Rcpp]; }; - units = derive2 { name="units"; version="0.8-0"; sha256="06mjprqi06xprj6185k5cmrrdl025x0pd1r6a4x3s74ciq9zwilw"; depends=[Rcpp]; }; + units = derive2 { name="units"; version="0.8-1"; sha256="16ndhl4hkcll9r5vh8flp2bc3mavddfz8g6sqddj15scdcjbmqfk"; depends=[Rcpp]; }; unittest = derive2 { name="unittest"; version="1.5-3"; sha256="0lpihlga16qklha3i8j4yx9dkmvmsqp8iai0arza97cx63971xwx"; depends=[]; }; univOutl = derive2 { name="univOutl"; version="0.4"; sha256="1kp014bhs8v02fp7misrj4fpfp2na9lg45p5zqvlfaypnm5imsr9"; depends=[Hmisc robustbase]; }; unival = derive2 { name="unival"; version="1.1.0"; sha256="0j7fl77my2273k72s8k9v5pcb85swxfipjxmk4vw487i7aq8b1nq"; depends=[psych]; }; @@ -18164,7 +18275,7 @@ in with self; { unstruwwel = derive2 { name="unstruwwel"; version="0.2.0"; sha256="1s8vfmh1lafb244r0bwp4m0r9x5la95lglxqvhb4sq9wmah04ka7"; depends=[assertthat dplyr lubridate magrittr purrr R6 rlang stringr tibble tidyr]; }; unsystation = derive2 { name="unsystation"; version="0.2.0"; sha256="02da7wzzk5bwd475i67v5x04ay2bn5yd5xffl1asqcqxcc5sy0m8"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; }; untb = derive2 { name="untb"; version="1.7-4"; sha256="1i7m4vfslsix98dwx4jlrsldm7fhhfp25gr7aapcxqxms7ryaby6"; depends=[Brobdingnag partitions polynom]; }; - 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]; }; + unusualprofile = derive2 { name="unusualprofile"; version="0.1.1"; sha256="0p429w51jb3cz3gkxdzn55pya0xxwilrg4z7hkw0i6jijpwvisia"; depends=[dplyr ggnormalviolin ggplot2 magrittr purrr rlang tibble tidyr]; }; unvotes = derive2 { name="unvotes"; version="0.3.0"; sha256="1vfyvwqfbxp29x2a0sqng6l5pkp2hc3hadp95ysnpannnsd6x0jw"; depends=[]; }; updater = derive2 { name="updater"; version="0.1.1"; sha256="035js05xzs0i3xs6bizm5ixiiylzhdjkr8z0yijiqiqxw38w6h2l"; depends=[cli renv]; }; updog = derive2 { name="updog"; version="2.1.3"; sha256="1i7dc8msky5g658iwcvdvda2m0ya9cnbzm9d565l01lf184dfhhk"; depends=[assertthat doFuture doRNG foreach future ggplot2 ggthemes iterators Rcpp RcppArmadillo reshape2]; }; @@ -18178,7 +18289,7 @@ in with self; { urlshorteneR = derive2 { name="urlshorteneR"; version="1.5.7"; sha256="0zfvcwcy2ykvkbnqgxhzxf99shcby81cx8fjbmy6b07rj9407arj"; depends=[assertthat cli clipr httr jsonlite lubridate miniUI shiny stringr]; }; urltools = derive2 { name="urltools"; version="1.7.3"; sha256="04x3my655dd287cbsszbnf75q0swmjlxxrblcsay7a8n3df3a830"; depends=[Rcpp triebeard]; }; uroot = derive2 { name="uroot"; version="2.1-2"; sha256="0dsb1vdr2bwy64v889svhvkadg5jl9cl77mfiw79vl18b7ixjzxx"; depends=[]; }; - ursa = derive2 { name="ursa"; version="3.9.7"; sha256="0z8sld9x4xs7dfhv462v47732md37hvpxv6iq3lm0xzbqc3adxx7"; depends=[jpeg png rgdal]; }; + ursa = derive2 { name="ursa"; version="3.9.8"; sha256="0700kspd64mmk9nrfs49maxlj1x2hysfvkyhn275lp8498am7yka"; 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]; }; uscoauditlog = derive2 { name="uscoauditlog"; version="1.0.3"; sha256="156by8lans2jk8kjll88ljc6z5idgvqwkvrgdwjkr4l4xnsz0sif"; depends=[openxlsx readxl stringr]; }; @@ -18193,18 +18304,19 @@ in with self; { usethis = derive2 { name="usethis"; version="2.1.6"; sha256="0638dzl4nm4c36990sf2biy74hjr2fzlqzfb98fsqrbhaw3ngp1i"; depends=[cli clipr crayon curl desc fs gert gh glue jsonlite lifecycle purrr rappdirs rlang rprojroot rstudioapi whisker withr yaml]; }; usfertilizer = derive2 { name="usfertilizer"; version="0.1.5"; sha256="05zjn39hqjjzzp4v4b1zbqq59205s7k0kikms951h57kbyvjz6vk"; depends=[tidyverse]; }; ushr = derive2 { name="ushr"; version="0.2.3"; sha256="1ygyqgxw849165lpk81f114kgx9015b9a9dngavjy3ffqzrbb41k"; depends=[dplyr ggplot2 tidyr]; }; - usincometaxes = derive2 { name="usincometaxes"; version="0.5.3"; sha256="0m816hw9hczr32adq49dl5d78r4imc97mrbyh3npdpwpzyrakhay"; depends=[httr tibble tidyselect V8 vroom]; }; + usincometaxes = derive2 { name="usincometaxes"; version="0.5.4"; sha256="1ccga22afagdlyyw33p7rk8lr8l54li64vqav7yyqc7hz7r1mzbd"; depends=[httr tibble tidyselect V8 vroom]; }; uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; }; usl = derive2 { name="usl"; version="3.0.3"; sha256="0hql4bc40xa62r465lm4x14yf8dbhsl046i5k8xlq1qr93cw6pnx"; depends=[nlsr]; }; - usmap = derive2 { name="usmap"; version="0.6.0"; sha256="1jdn9rl6kkfmr9d6wrg1673nr7xh5h14ynv2mx64xcn581c9jzis"; depends=[usmapdata]; }; + usmap = derive2 { name="usmap"; version="0.6.1"; sha256="1q27xxvfrwin61jxba2k91brgcam7hqq5yv5hha4f8s7h3rqam6b"; depends=[rlang usmapdata]; }; usmapdata = derive2 { name="usmapdata"; version="0.1.0"; sha256="13a4bj6ixqzfwm60r2c3i9zy96mr2hk77n720zs5i0i16acfnxav"; depends=[]; }; - ustfd = derive2 { name="ustfd"; version="0.1.1"; sha256="0r8vdh1gak0vkqfm2cjcc43jf8jpin9kvv9rv2zfzsdkylkpcpxd"; depends=[dplyr httr lubridate purrr readr]; }; + ussherR = derive2 { name="ussherR"; version="1.10"; sha256="0awhric6xrhgv4wb9saq7jyikd3h74i6vlq3aqip4i1m9j3ym3k1"; depends=[]; }; + ustfd = derive2 { name="ustfd"; version="0.2.0"; sha256="1q2i1jlvgdyvx55r3h3f0g6zqyv197yyfkkiaixy4kzdzp9rxy9d"; depends=[dplyr httr lubridate purrr readr rlang tibble]; }; ustyc = derive2 { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; }; utc = derive2 { name="utc"; version="0.1.5"; sha256="1lhm5rhr78cxp3cz5n6j2zkhjphj7csk026xvvhkjqdi39rrq6i4"; depends=[]; }; utf8 = derive2 { name="utf8"; version="1.2.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.7"; sha256="1hclxfq7ccrhsirpnpl3kpybd2zn4dc4pk49adqfik5lg9xi8kxh"; depends=[lubridate purrr vctrs]; }; - utile_visuals = derive2 { name="utile.visuals"; version="0.3.1"; sha256="1j13pvzgi8rv38clxl421ji3c47vg8scragg246xpgmd24yk64a5"; depends=[dplyr ggplot2 gridExtra purrr]; }; + utile_tables = derive2 { name="utile.tables"; version="0.2.2"; sha256="139y2a60kxj9x4nx2rb3cd7q69if370vzyikbrnf36h8v62dcr3q"; depends=[dplyr purrr rlang tidyselect utile_tools]; }; + utile_tools = derive2 { name="utile.tools"; version="0.2.8"; sha256="1zlib1ydy8919xngp7rzz7shixwqpsk3ljgjyqzcxa5y1gyzb461"; depends=[lubridate purrr vctrs]; }; + utile_visuals = derive2 { name="utile.visuals"; version="0.3.2"; sha256="12crzqcap4s0ji9839ykmvp31b5p10c59z95wmklhcsnpc7n3k6w"; depends=[dplyr ggplot2 gridExtra purrr]; }; utilities = derive2 { name="utilities"; version="0.6.1"; sha256="0wcw9gcxd66vhr7vb24y94bgqckfkwvg1rcsxdqaz5r06qn2p9nf"; depends=[]; }; utility = derive2 { name="utility"; version="1.4.5"; sha256="0a11bxyg8la6yvxr04qbhay05jb2ihd7calc1zcisgj43kq6k7xd"; depends=[]; }; utilityFunctionTools = derive2 { name="utilityFunctionTools"; version="0.1.1"; sha256="1225nl83yka31j0adm1210kc89vs3hi9i2pqrykax109sgk0nw97"; depends=[spatstat_geom]; }; @@ -18217,6 +18329,7 @@ in with self; { uwot = derive2 { name="uwot"; version="0.1.14"; sha256="1q4z98w3pkc51vrcpmwaibnwmlm17zjcnh0qlx660wky5ccyh5l0"; depends=[dqrng FNN irlba Matrix Rcpp RcppAnnoy RcppProgress]; }; uxr = derive2 { name="uxr"; version="0.1.2"; sha256="0iasxwxfk52311mb3gikk3j2cs21wssg9yv06bv15dl7zm9sh14i"; depends=[dplyr scales]; }; vICC = derive2 { name="vICC"; version="1.0.0"; sha256="13lcs7wwj1xfbjf3q7r8ssf00jg5hr1vjp2pyw0r42iz7mx47xjv"; depends=[coda ggplot2 nlme Rdpack rjags]; }; + vMF = derive2 { name="vMF"; version="0.0.1"; sha256="1sygiqyzqikrpdiav0117hnv6zynq1d415v73ygjfj4c1v5l05h0"; depends=[BH Rcpp RcppArmadillo]; }; vacuum = derive2 { name="vacuum"; version="0.1.0"; sha256="0cmlvlz83gyga05g71hrnq4kpck9flq0qlhjviqqz9zrmljzin0x"; depends=[dplyr magrittr]; }; vader = derive2 { name="vader"; version="0.2.1"; sha256="1xjak5xlgpk0ds4l825kq90dg6kk5i5al5zmjqjqn8b7xdgix8mf"; depends=[tm]; }; vaersNDvax = derive2 { name="vaersNDvax"; version="1.0.4"; sha256="0hvw7vbxs87c9xkdv3617fkjwz2dbawscbd7dgaixhdhcr3k823a"; depends=[]; }; @@ -18247,6 +18360,7 @@ in with self; { vangogh = derive2 { name="vangogh"; version="0.1.1"; sha256="1ny4dgwkk54pgwgg3lwcv8vcdnizlajdck68ihpzh2s1yz4n38bm"; depends=[ggplot2]; }; vannstats = derive2 { name="vannstats"; version="1.2.7.14"; sha256="06y1h4w6zkvkdh81w5qaf15apk4w3sj86zj54l7fx4g6qddfnqsw"; depends=[car dplyr formula_tools gdata ggplot2 gplots MASS plm 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.9.2"; sha256="0g7jikkagqnqblyskfsd9wv2czx75v172z6rrdn2bf25m0hwcpw0"; depends=[jsonlite 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=[]; }; @@ -18280,8 +18394,8 @@ in with self; { vcmeta = derive2 { name="vcmeta"; version="1.1.0"; sha256="02zfrdrl5ilaa7is1j8189p4f7n8zdy2jyzzh864zm1a4dkii2rk"; depends=[ggplot2 mathjaxr Rdpack]; }; vcov = derive2 { name="vcov"; version="0.0.1"; sha256="1w89mr8dk6436bxap28rszajgm9k7sjfqsr1i4p68dlhw8zk4yq1"; depends=[]; }; vcpen = derive2 { name="vcpen"; version="1.9"; sha256="0gg5ln9r7i8rh91pf7789fic4aah22jc259qyg606bax2w57qmi5"; depends=[knitr Rcpp RcppArmadillo]; }; - vcr = derive2 { name="vcr"; version="1.0.2"; sha256="0d7g67adnjhhaikz61nc3ivl8pzyvsk8ah0a34d8wgxknfva29sb"; depends=[base64enc cpp11 crul httr R6 rprojroot urltools webmockr yaml]; }; - vctrs = derive2 { name="vctrs"; version="0.5.0"; sha256="11pnblg2fpa3lr5hbiyw6w7wvlkdvqw35wxrkffcxnlxqc9jwdvw"; depends=[cli glue lifecycle rlang]; }; + vcr = derive2 { name="vcr"; version="1.2.0"; sha256="12xiw53dba7dcsdfb8c2cg4v6i9jzhf42plw6hwfp9v65bmq3b83"; depends=[base64enc crul httr R6 rprojroot urltools webmockr yaml]; }; + vctrs = derive2 { name="vctrs"; version="0.5.1"; sha256="01yv85rjpn9cz4473m768awrcaif51ffjh29p097c7pj2zvq4ya9"; depends=[cli glue lifecycle rlang]; }; vcvComp = derive2 { name="vcvComp"; version="1.0.2"; sha256="0mip0v8gv358aadc3b4913dcz27kscx3dv15nwns20pan5jvyhv2"; depends=[]; }; vdar = derive2 { name="vdar"; version="0.1.3-2"; sha256="061ahwf8gyjqs5j9mkqnpn7899mivn4qbygnnzihmv065xj5vpd9"; depends=[compositions]; }; vdg = derive2 { name="vdg"; version="1.2.2"; sha256="0fdqmvzw6dd18w653kfvnw16489jpsyl1395xffhm8rz1dqkrhj1"; depends=[ggplot2 gridExtra proxy quantreg]; }; @@ -18297,7 +18411,7 @@ in with self; { vegawidget = derive2 { name="vegawidget"; version="0.4.2"; sha256="0rnr54h11gd2x2llypdvaai6v8z3nk5fbpb7zd0dcy7hh55ncfcs"; depends=[assertthat digest glue htmltools htmlwidgets jsonlite magrittr rlang]; }; vegclust = derive2 { name="vegclust"; version="2.0.2"; sha256="18v1iqgabhsdxi76kvy9wgp9h2i17aw4c43kcki7lzyqiyyql0nx"; depends=[vegan]; }; vegdata = derive2 { name="vegdata"; version="0.9.11.3"; sha256="0fqsgmn1dg91pnr1fm057va67a5qssagm75vf8i00bgva22m9j45"; depends=[curl DBI dbplyr dplyr foreign hoardr httr indicspecies magrittr plyr RCurl RSQLite stringr xml2]; }; - vegperiod = derive2 { name="vegperiod"; version="0.3.1"; sha256="178zp7hw7bicygzl4ql0a9llkmrk4kyszcvvl430pvsc5y6srg75"; depends=[]; }; + vegperiod = derive2 { name="vegperiod"; version="0.4.0"; sha256="0m10m85cf0qk2q2ln1qziqicv79rbjqqi9py18r412j7m43pn013"; 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.9"; sha256="06r9235p15qcy4h3i96p4p2qq0sznphs912wirqdiv52i5h1h384"; depends=[cptcity data_table dotCall64 fields sf units]; }; velociraptr = derive2 { name="velociraptr"; version="1.1.0"; sha256="0a67vmv05cxc9f27aqzr6nkgy2mj3fhykwj5nb23qwfqa669a5hi"; depends=[sf]; }; @@ -18310,6 +18424,7 @@ in with self; { verbalisr = derive2 { name="verbalisr"; version="0.4.0"; sha256="17zq2qc361kmd32pfzqgxpgw2z4z1iq831cq85fffdc3nvl3wwx4"; depends=[pedtools ribd]; }; verhoeff = derive2 { name="verhoeff"; version="0.4.0"; sha256="0kpxpl5s5342ajg22cwb7y9ks240drp37q1g67n19krdy6ih14kz"; depends=[]; }; verification = derive2 { name="verification"; version="1.42"; sha256="0pdqvg7cm9gam49lhc2xy42w788hh2zd06apydc95q2gj95xnaiw"; depends=[boot CircStats dtw fields MASS]; }; + vermeulen = derive2 { name="vermeulen"; version="0.1.1"; sha256="10jlgrwpgkfiwlyli6mpd0wavi71h39sj6mklnvfskhnblvqdrz8"; depends=[memoise]; }; versions = derive2 { name="versions"; version="0.3"; sha256="0zm49j785dgv7fyr1yl9q5f0dsk8hhpim5q5bpkgrkzv7pwjribd"; depends=[]; }; versionsort = derive2 { name="versionsort"; version="1.1.0"; sha256="00r0h2iqlfq0nidqbhx4fv29rlppfx43jv2n2zp38lpx5vbqjhnj"; depends=[]; }; vesselr = derive2 { name="vesselr"; version="0.2.1"; sha256="1wzprnpiv04gxhqgki36gp1a0xj9l3mchllphwkfsdja4axq3prk"; depends=[oro_nifti pbapply pbmcapply]; }; @@ -18326,16 +18441,16 @@ in with self; { video = derive2 { name="video"; version="0.1.0"; sha256="0ha1wy4vxxaj22qfviqv5w27g5yvf9jjmfy5zw40s78myjjgrqqy"; depends=[htmlwidgets jsonlite shiny]; }; vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; }; vietnameseConverter = derive2 { name="vietnameseConverter"; version="0.4.0"; sha256="1bnscv1yz4hr6cvpavdj2gjn6dqy96rbagxl9280a2xxav09mps3"; depends=[gsubfn sf utf8]; }; - viewpoly = derive2 { name="viewpoly"; version="0.3.1"; sha256="1vnh97iqq1k67lxlj4488ymwpd5p9pqvjawiqdi0qj9s2vz4j35d"; depends=[abind config curl dplyr DT ggplot2 ggpubr golem JBrowseR markdown plotly reshape2 shiny shinydashboard shinyjs shinythemes shinyWidgets tidyr vroom]; }; + viewpoly = derive2 { name="viewpoly"; version="0.3.2"; sha256="1say30d46vj67ng5mprhwl02jf9d0kv573j80r05z08szmcm4sxb"; depends=[abind config curl dplyr DT ggplot2 ggpubr golem JBrowseR markdown plotly reshape2 shiny shinydashboard shinyjs shinythemes shinyWidgets tidyr vroom]; }; viking = derive2 { name="viking"; version="1.0.0"; sha256="0ggnp96igmdzp8acyj57mkkd2xd3ixcnakpwp417yzsdqqlg20sf"; depends=[]; }; villager = derive2 { name="villager"; version="1.1.1"; sha256="0g72zpsqi39ax44n3s3x66b1fbgyx6w2wraf531jsy7vj95ivr2p"; depends=[R6 readr uuid]; }; - vimp = derive2 { name="vimp"; version="2.2.5"; sha256="13461pcvyc6rad1rf2ymmkyzcwjxw7g4fs8qd51baljhjnjmifv0"; depends=[boot data_table dplyr magrittr MASS rlang ROCR SuperLearner tibble]; }; + vimp = derive2 { name="vimp"; version="2.3.1"; sha256="1m88zjxv6zjbbln851kwj9wfam59q8z93s6dz6lmga530d7z4xja"; depends=[boot data_table dplyr magrittr MASS rlang ROCR SuperLearner tibble]; }; vimpclust = derive2 { name="vimpclust"; version="0.1.0"; sha256="0ly7piz7q88sh2g7zq5b2pqph9467b4fclgq9amm0m7xc8vrv4f9"; depends=[ggplot2 mclust PCAmixdata Polychrome rlang]; }; vindecodr = derive2 { name="vindecodr"; version="0.1.1"; sha256="0yvchdf90l8lkzyba5wrpma6vjcgf19li159s8s79y8sgp5pyx7p"; depends=[httr]; }; vinereg = derive2 { name="vinereg"; version="0.8.3"; sha256="0d1ibrhjsbjaaz2cd9lg76cjplkys716i689khzaiv4sgbjhwdh1"; depends=[assertthat BH kde1d Rcpp RcppEigen RcppThread rvinecopulib wdm]; }; vines = derive2 { name="vines"; version="1.1.5"; sha256="057d2fdh03cq9kh4vz94arqscahmz14xbr2g59l0vn205lnyilf1"; depends=[ADGofTest copula cubature TSP]; }; violinplotter = derive2 { name="violinplotter"; version="3.0.1"; sha256="1xy57mycdsr9qr48n1jrw0nzwz848r0xcns864d8gyc8zikp3x6a"; depends=[]; }; - vioplot = derive2 { name="vioplot"; version="0.3.7"; sha256="1dmdasp3jldc41233z6r08w3j76vyyp9m3jrj7n4ahk48yd5siq6"; depends=[sm zoo]; }; + vioplot = derive2 { name="vioplot"; version="0.4.0"; sha256="1db7g0378jbcd6ssb7afff4y4r0v472qnb625hfwixx4wf1v8aap"; depends=[sm zoo]; }; 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]; }; @@ -18357,7 +18472,7 @@ in with self; { visit = derive2 { name="visit"; version="2.1"; sha256="0kkspih7m18g5pqlwrxpgjdwqxpp23c3xyvcnvv247abl9aq81rd"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders]; }; visreg = derive2 { name="visreg"; version="2.7.0"; sha256="070yhyxxh3w16i54k790n47bgcjn4b10b6g1z553x6afjc3l3a6d"; depends=[lattice]; }; vistime = derive2 { name="vistime"; version="1.2.3"; sha256="18gqx71mpjsccfnab11j3g8wl11x2sk7bbjbcpi23qsk5d7sy112"; depends=[assertive_types ggplot2 ggrepel plotly RColorBrewer rlang]; }; - vistla = derive2 { name="vistla"; version="1.0.0"; sha256="1cbhx2kc5ha25hv0y3hq73iivvq8j96128c4r03hl9j853374wap"; depends=[]; }; + vistla = derive2 { name="vistla"; version="1.0.1"; sha256="1x5iighpdx1mf3gips1b5j39z2f52kjs2dd3b3l58v391j4q36sx"; depends=[]; }; vistributions = derive2 { name="vistributions"; version="0.1.2"; sha256="1nzkbyqks38n7gp55iqhrlxqyfwxk4fvqzi9vsb45h0m0hlmwhxr"; depends=[ggplot2 magrittr]; }; visualFields = derive2 { name="visualFields"; version="1.0.1"; sha256="1z62xappwjdv9f7ql5spydkb626rdj3hvpvzy3d71fwm0y3qwki3"; depends=[boot combinat deldir dplyr DT gtools Hmisc htmlTable oro_dicom plotrix polyclip pracma rlang shiny shinyjs XML]; }; visualize = derive2 { name="visualize"; version="4.4.0"; sha256="1k3jpvj1yysxc4g1a1w3m1y91104aqxqv8jh9qdd23gwy7a29525"; depends=[]; }; @@ -18384,7 +18499,7 @@ in with self; { volcano3D = derive2 { name="volcano3D"; version="2.0.8"; sha256="08qxp9bgm0dbndv1c91xpl0yajmyrxbpss0ga3c47ldyhc0iq7sd"; depends=[ggplot2 ggpubr htmlwidgets magrittr matrixTests plotly Rfast rlang]; }; volesti = derive2 { name="volesti"; version="1.1.2-3"; sha256="1qisar6q0fk4p327mai0zfj57dn0k4vkkamd2pkx1cx3wi0izq0h"; depends=[BH Rcpp RcppEigen]; }; volleystat = derive2 { name="volleystat"; version="0.2.0"; sha256="0n1r0bvvmba21cs3qgpnw9jxpgl2n82fhxa40sa1w2gav5rch5i6"; depends=[]; }; - voluModel = derive2 { name="voluModel"; version="0.1.6"; sha256="0v8b9icr4sbfrbcv7skrwvgz7z2mk9bf9n5sqyl7wycbbgjim6x5"; depends=[dismo dplyr fields ggplot2 ggtext latticeExtra rangeBuilder raster rgeos sp terra viridisLite]; }; + voluModel = derive2 { name="voluModel"; version="0.1.8"; sha256="1vaqwavjjs1ff32l5zxhczb72b5f7ls09v2s9z4vrnjajpf5av5g"; depends=[dismo dplyr fields ggplot2 ggtext latticeExtra rangeBuilder raster sf terra viridisLite]; }; voronoiTreemap = derive2 { name="voronoiTreemap"; version="0.2.0"; sha256="1wvnqdrvba4ss4f3k8gzb720irdq2brv2aaq16ywifv8fnjf02r3"; depends=[data_tree DT htmlwidgets rlang shiny shinyjs]; }; vortexRdata = derive2 { name="vortexRdata"; version="1.0.5"; sha256="0b47q3aslz4110a1bfaa103i098y2ngzrjh01rwasq3gd6xbif9n"; depends=[]; }; voson_tcn = derive2 { name="voson.tcn"; version="0.5.0"; sha256="1fylp5770by5ybpda6n8c3y8n7zsmc62f5q11k0ndh5kp7ka11cb"; depends=[dplyr httr jsonlite openssl progress rlang stringr tibble tidyr]; }; @@ -18406,11 +18521,11 @@ in with self; { vscc = derive2 { name="vscc"; version="0.4"; sha256="0ym9wy661d6m2a9drix5jb6r2sm6kqs314yc46qgq7qmdscdw52b"; 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]; }; + vsp = derive2 { name="vsp"; version="0.1.1"; sha256="0aa3vqzazh0x5irbmqh9ac1xiprwnbgbrjl9bybxzynl91hwg9yw"; 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.4"; sha256="1b26kqdvvp8d0467b3x7jhpk01lcf1jyfikc7lzn4qs60q0ndgwl"; depends=[haven kableExtra knitr rstudioapi sjlabelled]; }; + vtable = derive2 { name="vtable"; version="1.4.1"; sha256="1mvcmhy58kibwrjbqm07pynk1rin179nb94j1c6ym8sgq2by1h3g"; depends=[haven kableExtra knitr rstudioapi sjlabelled]; }; vtreat = derive2 { name="vtreat"; version="1.6.3"; sha256="181nsjl811m3k1123bvgnnwr253sc2mbj4ljzmawz9wl7dfbwfij"; depends=[digest wrapr]; }; - vtree = derive2 { name="vtree"; version="5.4.6"; sha256="03n79xn4wr4hqrj571781igd07dw0sxfi6cnvmhmshc0brzkz7s9"; depends=[DiagrammeR DiagrammeRsvg htmlwidgets rsvg shiny]; }; + vtree = derive2 { name="vtree"; version="5.6.5"; sha256="0qszya11qh2xzq1blbrcli3l8hhf0dannhh2hn3gi59c9dn3jr16"; depends=[DiagrammeR DiagrammeRsvg htmlwidgets rsvg shiny utf8]; }; vtype = derive2 { name="vtype"; version="0.8"; sha256="0j070bn86a6hlg99h2qaf0dlbnjjsmx1zdcmvl3acymr31bqyvrj"; depends=[randomForest]; }; vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; }; vueR = derive2 { name="vueR"; version="0.5.3"; sha256="0am4iwgadi9c9f7zm5zx3nrzyhy7w1qgp9rkyypzwb6bicjjb9cz"; depends=[htmltools htmlwidgets]; }; @@ -18430,13 +18545,13 @@ in with self; { waldo = derive2 { name="waldo"; version="0.4.0"; sha256="1aky28rn70l24s0sygl36267cf7hjzhchagsz26abfxwr7p8kvjp"; depends=[cli diffobj fansi glue rematch2 rlang tibble]; }; walker = derive2 { name="walker"; version="1.0.6-1"; sha256="0kmk8lxg3m3436bdghqizjgzln4lqrs3ks1mgfza63n59z5d20h8"; 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.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]; }; + wallace = derive2 { name="wallace"; version="2.0.0"; sha256="11yxiz1gf50jmridh04j0z768mv2cbwganpryrc980rc1anrbm27"; depends=[dplyr DT ecospat ENMeval glue knitcitations leafem leaflet leaflet_extras magrittr RColorBrewer rgdal rgeos rlang rmarkdown shiny shinyalert shinyjs shinyWidgets spocc spThin zip]; }; wally = derive2 { name="wally"; version="1.0.10"; sha256="1d03vxn6q7v0nsrkd7dxkkv3siysgicv6c13fkvwmypln9vsl6sl"; depends=[data_table prodlim riskRegression]; }; walmartAPI = derive2 { name="walmartAPI"; version="0.1.5"; sha256="1nng8izncj2nmmpywn1ggpzvjh8q7y3q6260qhy9kbmvrrl26spf"; depends=[dplyr glue httr magrittr purrr stringr tibble]; }; walrus = derive2 { name="walrus"; version="1.0.5"; sha256="0z674sg78rdv9rmqr7s4w9rw8diciifwr4bc2v57yfvp0n9gcys4"; depends=[ggplot2 jmvcore R6 WRS2]; }; wand = derive2 { name="wand"; version="0.5.0"; sha256="0y9xmh9a93lnadg83i223j2nf77jazz8m1ck1bmdf5jwj4vyzaqa"; depends=[]; }; warabandi = derive2 { name="warabandi"; version="0.1.0"; sha256="0b1g2fpshhkd15b6fz4v3qwf425p5ahbh57acclqq6znl1acl1hg"; depends=[flextable lubridate readtext]; }; - warbleR = derive2 { name="warbleR"; version="1.1.27"; sha256="1fd008v3di7z5ixljk5zwaw2wcc4zfqlnw9546894ybw5m9jsk26"; depends=[bioacoustics crayon dtw fftw knitr monitoR NatureSounds pbapply Rcpp RCurl rjson seewave stringi tuneR]; }; + warbleR = derive2 { name="warbleR"; version="1.1.28"; sha256="061scws8a3jkpnfkpcpwdcxnnqpszshj409qjgcdqrcl0s5d1jh0"; depends=[bioacoustics crayon dtw fftw knitr monitoR NatureSounds pbapply Rcpp RCurl rjson seewave 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=[]; }; @@ -18446,11 +18561,12 @@ in with self; { waterData = derive2 { name="waterData"; version="1.0.8"; sha256="0884agh876wf3qlbc75fbaa47x2iwvncz7r2l25qw34n8lxq1yr6"; depends=[dataRetrieval lattice latticeExtra lubridate xml2]; }; waterYearType = derive2 { name="waterYearType"; version="1.0.1"; sha256="09brbqcd41khycz9lhn84w68wpk8lsdnzb6lzc10gm5s5ambgj06"; depends=[]; }; waterfall = derive2 { name="waterfall"; version="1.0.2"; sha256="0jy6l9mx0dixwnkychdl18sf4xh73pm0qd1jyxp9rlnv1vcragjp"; depends=[lattice]; }; - waterfalls = derive2 { name="waterfalls"; version="0.1.2"; sha256="01gby1mlhrwcalizpywxcakkx2zifswb0188nrl6z9dkkd1866lm"; depends=[ggplot2]; }; + waterfalls = derive2 { name="waterfalls"; version="1.0.0"; sha256="1wj1wlih1fh3y3wj3czhz5fzik7i499l6pycj44rq8rpvi7bkj0d"; depends=[ggplot2]; }; waterquality = derive2 { name="waterquality"; version="0.3.0"; sha256="0aikgz4x2ny2q7mnxsyk5pl87yb9gq6pcvvnj1s32383683j5ys9"; depends=[caret dplyr magrittr pingr purrr raster rgdal vctrs]; }; watson = derive2 { name="watson"; version="0.1"; sha256="06wszdk9d8b07kp5s30q474nd3rz0za6k158g4dl9cpd3bbwzj72"; depends=[Rcpp RcppArmadillo Tinflex]; }; - 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]; }; + wav = derive2 { name="wav"; version="0.1.0"; sha256="1f5y53max7vliq4sq66hqjjns8s9lsx9pkdjk6rm929gk371x7by"; depends=[Rcpp]; }; + wavScalogram = derive2 { name="wavScalogram"; version="1.1.2"; sha256="08yxx0szgxa903majjjv4y7lkkc8kp3j0q0lq9sfjcqcjvk850gn"; depends=[abind colorRamps fields]; }; + waveband = derive2 { name="waveband"; version="4.7.2"; sha256="1aa1rdwpfj3fx3xc7i9h0la268yv7hsm1fxndq3rk5slzy12zq8z"; depends=[wavethresh]; }; waved = derive2 { name="waved"; version="1.2"; sha256="0zv4rgazk9s295pggzfa7sc062zv68dgds1ngxcz7vg1fx0qkgxg"; depends=[]; }; wavefunction = derive2 { name="wavefunction"; version="1.0.0"; sha256="1g0g9i0s93lcpcx7icqn15bvkmd79slkgimspvvwp2bxdsc5nnf2"; depends=[]; }; wavelets = derive2 { name="wavelets"; version="0.3-0.2"; sha256="07706rsjdmzj46ib2kfm5lfk4bnm2wfw7rby0ixs6x0myyzxdl92"; depends=[]; }; @@ -18458,7 +18574,7 @@ in with self; { waver = derive2 { name="waver"; version="0.2.1"; sha256="1kl14cd96fwrqvk35sqbgi8bf31gc2ccxxy5d1v46scwyqkb0g5l"; depends=[geosphere rgdal rgeos sp]; }; waves = derive2 { name="waves"; version="0.2.4"; sha256="128q1l0ishdgpa33zh77xpi79nvziix8swq1rwyawnznl9ybs29w"; depends=[caret dplyr ggplot2 lifecycle magrittr pls prospectr randomForest readr rlang scales spectacles stringr tibble tidyr tidyselect]; }; waveslim = derive2 { name="waveslim"; version="1.8.4"; sha256="1510xpkgrhdw394m5anxccdczjikcxazyd09ix2z73i15akyx3j0"; depends=[]; }; - wavethresh = derive2 { name="wavethresh"; version="4.7.0"; sha256="0b7mm8m6wrfj8x36x2igpwzmvmdjlmdk0j69wly6v5babmb2a1zm"; depends=[MASS]; }; + wavethresh = derive2 { name="wavethresh"; version="4.7.2"; sha256="0mmn8f5x8iw8vn0zsskzs3g41bm28prvzy9bmbng8va94g5795ws"; depends=[MASS]; }; waydown = derive2 { name="waydown"; version="1.1.0"; sha256="1yjx9cd8h8rsi44s7dcqrvfmsbjhw7vkg2z7bl4knsgbki0c978g"; depends=[Matrix numDeriv]; }; waywiser = derive2 { name="waywiser"; version="0.2.0"; sha256="1bx1hmln9z2yaa6r8q30wv3mm0908y0yqqcbyzzgpqpcijvgxxng"; depends=[fields glue hardhat Matrix purrr rlang rsample sf spdep tibble yardstick]; }; wbacon = derive2 { name="wbacon"; version="0.6"; sha256="0b91h71fs07knnqrbr167wdlb1iakafbadzr4zznndwplx3ygpbz"; depends=[hexbin]; }; @@ -18477,11 +18593,12 @@ in with self; { weakARMA = derive2 { name="weakARMA"; version="1.0.3"; sha256="16dzyw7jiyqv9hd94dff9lxhqv9rwib1xs1km0xfqcy6xa2jhw8w"; depends=[CompQuadForm MASS matrixStats vars]; }; wearables = derive2 { name="wearables"; version="0.8.1"; sha256="0fjf43cgna1mg4mgg98kqhhl88yfhrr57rln2z6xm6d6bj73q5zn"; depends=[dplyr futile_logger ggplot2 kernlab lubridate magrittr padr R_utils RHRV signal varian waveslim xts]; }; weathermetrics = derive2 { name="weathermetrics"; version="1.2.2"; sha256="1hjhgsy3v8328hv4czxxz7kp68sxc10sy10f3dv5j8f6pka6qlsp"; depends=[]; }; - webchem = derive2 { name="webchem"; version="1.1.3"; sha256="13dkf4py4nkf7fqnsb7jnjrrcasjj8rndvdkff0g48zfh0ypyaxf"; depends=[base64enc data_tree dplyr httr jsonlite purrr rlang rvest stringr tibble xml2]; }; + webSDM = derive2 { name="webSDM"; version="1.1-1"; sha256="0qxiqba10dbnc6ndv6w50ax6726shn8pc3yqjvbqi1bk7yg03plr"; depends=[abind bayesplot brms broom_mixed dismo dplyr GGally ggplot2 glmnet gridExtra igraph jtools Matrix rstanarm rstantools]; }; + webchem = derive2 { name="webchem"; version="1.2.0"; sha256="0mvd0hppdrqngg1j7x2sdh3nkdb3zmsdf1gwqvzm128v6clsi7ls"; depends=[base64enc data_tree dplyr httr jsonlite purrr rlang rvest stringr tibble xml2]; }; webdeveloper = derive2 { name="webdeveloper"; version="1.0.5"; sha256="1nw97df9q0dpzl82pdybw527hc407ch2xg8f0s2z4kf89yp6ckhg"; depends=[future html5 httpuv promises readr stringi]; }; webdriver = derive2 { name="webdriver"; version="1.0.6"; sha256="0k87any9rvv367p2zwy89r3rxszsq3w78pzdq36by4ijn659la2l"; depends=[base64enc callr curl debugme httr jsonlite R6 showimage withr]; }; webexercises = derive2 { name="webexercises"; version="1.0.0"; sha256="1z0dqiqk0v6h97qg89nwn9d57zn1png066va8dirk3mmk4jlfrqc"; depends=[jsonlite knitr rmarkdown yaml]; }; - webfakes = derive2 { name="webfakes"; version="1.1.5"; sha256="1bg8pkbcazzb0ng3i77mflsb09i5qgmrqr5jhz3iylvxrjrv1pxv"; depends=[]; }; + webfakes = derive2 { name="webfakes"; version="1.1.6"; sha256="0aqa315a8ymfjgg3n7nri7r135r60gwkz118r2jy2bigml31szd4"; depends=[]; }; webglobe = derive2 { name="webglobe"; version="1.0.3"; sha256="0gbg4pai4cn7hdc1943aqpx4bn3vgc82zp93a1wl6bmmajv1da4b"; depends=[geojsonio httpuv jsonlite]; }; webmockr = derive2 { name="webmockr"; version="0.8.2"; sha256="06lqv3v095i51xsac8bvkjgd58l6a5azamchiip8m2y7q0nm4iw9"; depends=[base64enc crul curl fauxpas jsonlite magrittr R6 urltools]; }; webmorphR = derive2 { name="webmorphR"; version="0.1.1"; sha256="1f3sjzck4ys1knn2jmk472yww65wblrdwdlvn1gz2a00nc738rn4"; depends=[dplyr geomorph ggplot2 httr jsonlite magick progress rsvg]; }; @@ -18497,7 +18614,7 @@ in with self; { wec = derive2 { name="wec"; version="0.4-1"; sha256="10lqh43536d44d6082rpp11q1323pmjbmgrgb8v9mrk9c1ysf50w"; depends=[dplyr]; }; weed = derive2 { name="weed"; version="1.1.1"; sha256="18kz10c580a25cxcghvp81irwqncvhjan3y5gnzy8gxm894q3p7m"; depends=[countrycode dplyr forcats geonames ggplot2 here magrittr purrr readxl rgeos sf stringr tibble tidyr tidytext]; }; wehoop = derive2 { name="wehoop"; version="1.5.0"; sha256="0zlmsjw01ca0q9l7myq0sg6qaknc1i91s8jmf5b7v0crnmivd6rd"; depends=[cli data_table dplyr glue janitor jsonlite magrittr progressr purrr Rcpp RcppParallel rlang rvest stringr tidyr usethis]; }; - weibullness = derive2 { name="weibullness"; version="1.19.8"; sha256="19s44mxxcnhngifxshsyjr3a9zvbwywmqgby5dxd73yid1p2k9mr"; depends=[]; }; + weibullness = derive2 { name="weibullness"; version="1.22.12"; sha256="1xksidplbdx7p5phi66dpyca4n701zhxmp6zp78d9z9lh8k67zwx"; 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.1"; sha256="0v2wxgvv8v5filiabcd19bmcprfv3l8gg79v6s3c5wmnzir617s5"; depends=[doParallel foreach quantreg stringr]; }; weightedCL = derive2 { name="weightedCL"; version="0.5"; sha256="0gb9p3qvbnqmccsfi3a0hx6i67n5z9fg3jgjrgg6qikgngbq3sld"; depends=[MASS matlab rootSolve sure]; }; @@ -18525,7 +18642,7 @@ in with self; { 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.2"; sha256="16xmbsjzzdf2s19ix655jqpy8v98c39lkllh390zsv9xb12rgryr"; 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=[]; }; + whisker = derive2 { name="whisker"; version="0.4.1"; sha256="1g7jy6dnc5igs7yqy1n7cmy0ia8dm2yi3qj1mil2y0q88m4m2ldz"; depends=[]; }; whitebox = derive2 { name="whitebox"; version="2.2.0"; sha256="0l17wik30fbrr2b1hraqs55y76vcc2v826giq92rzgdzh0v7di3n"; depends=[]; }; whitechapelR = derive2 { name="whitechapelR"; version="0.3.0"; sha256="0mnq5m59mw8w5g1p0h2xzlz738j397b3444km59bm5yln3j0nsbi"; depends=[igraph plyr]; }; whitening = derive2 { name="whitening"; version="1.4.0"; sha256="1gc5pf4b9s8w4jh1wygyb9a9w6hi4zfd7ivlwshhzrmb43x5srsp"; depends=[corpcor]; }; @@ -18552,23 +18669,23 @@ in with self; { 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]; }; - winch = derive2 { name="winch"; version="0.0.10"; sha256="1hv5b3cqvn4mgxfd62zwn56bwisqj13l5hmjfa1b0rjj82ck8591"; depends=[procmaps]; }; + winch = derive2 { name="winch"; version="0.0.11"; sha256="05yph3z34jsl8lgxd3wnq0in9l9ypl7qbiib1cngr1q0si2xvfp8"; depends=[procmaps]; }; windAC = derive2 { name="windAC"; version="1.2.9"; sha256="00jmgyzi3ars0pwxg5b1dy99pwwwiavzg672x4c46pr65k3iy957"; 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-5"; sha256="01hc0kcm7qfzk47rci6lfmrqs4zfj8z7abqydgi2ckq8n1k2pd0h"; depends=[lubridate]; }; wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; }; - wiqid = derive2 { name="wiqid"; version="0.3.1"; sha256="0ccx009r53yz52q3jjh6kify640qgc895y226p1gacnv9sdajssp"; depends=[coda HDInterval MASS mcmcOutput plotrix truncnorm]; }; + wiqid = derive2 { name="wiqid"; version="0.3.3"; sha256="1d5bckkr6cnixccxaa14n7vbsya5cc00y9mryy1j69shhsmxp5ks"; 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.5.0"; sha256="1h4bzj0am9lawbh1cam1jmgk1xjmn9da14r90w3q984hswz7nc9p"; depends=[]; }; - wk = derive2 { name="wk"; version="0.7.0"; sha256="1pm2293xqcgjckghbf6q9sk7jh74njiynq3wqq1dbwigiz9jfhz2"; depends=[]; }; + wk = derive2 { name="wk"; version="0.7.1"; sha256="116kvg2a9gga14agqvmvj2rbgfpdyasbkjnfjcsw9a9dk0n7g9g5"; 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]; }; wktmo = derive2 { name="wktmo"; version="1.0.5"; sha256="05pjyk0xsdazbi1x7xfmg097ybybd60zmzzm7sch1ikp05hzn0wb"; depends=[]; }; wkutils = derive2 { name="wkutils"; version="0.1.2"; sha256="1b2sbq31z9bfqm6jim56r92ilrxf9hvfd5h9xfw94ypykybvr38n"; depends=[Rcpp tibble vctrs wk]; }; wmm = derive2 { name="wmm"; version="1.1.1"; sha256="0qy4cp4d8nlcqlcs4mqjv1f1kf1yh9y2wvh1ak6f049qlj7yfwfb"; depends=[]; }; wmwpow = derive2 { name="wmwpow"; version="0.1.3"; sha256="03rd75r4wih1w7srhnwqxjkirisb43y1sd2f1wzixqj8lq0dmb25"; depends=[lamW MASS smoothmest]; }; - wnl = derive2 { name="wnl"; version="0.7.0"; sha256="06jw2crz4dfm9xpivapc8ipjjiziqn2ahgn0ssgzagkmv3idc7h1"; depends=[numDeriv]; }; + wnl = derive2 { name="wnl"; version="0.7.1"; sha256="0191z30rq92xy2lzg6mpk4yvj67frfmqzavy7xvmsv96n4pcwbay"; depends=[numDeriv]; }; wnominate = derive2 { name="wnominate"; version="1.3"; sha256="0k4w6qbmwqd720dsslmb3xl53lr0b16rr0w9frybfq4046g9i2c6"; depends=[pscl]; }; wodds = derive2 { name="wodds"; version="0.1.0"; sha256="00rk7wmz0rknh4v9p0r6syi1c5dch7wkq7cz9zg6n8d72sia4azv"; depends=[dplyr glue magrittr purrr tibble]; }; woe = derive2 { name="woe"; version="0.2"; sha256="15mvcmwnrqxpzn054lq85vyzq5rgxkiwbd40gnn4s3ny1xdrwgsm"; depends=[]; }; @@ -18592,10 +18709,10 @@ in with self; { wordspace = derive2 { name="wordspace"; version="0.2-8"; sha256="17fqd4zrsklv2ik3lg00x66yasfh1kyhs3k9ri6lrk56wwv6hzb2"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; }; workboots = derive2 { name="workboots"; version="0.2.0"; sha256="0n55iypiw59n1f09fbynsdznv5mz885rbz4gaqi48ig0hwz896b7"; depends=[assertthat dplyr generics lifecycle Metrics purrr rlang rsample tibble tidyr vip workflows]; }; workflowr = derive2 { name="workflowr"; version="1.7.0"; sha256="0j1ahxm7xjla1xa38dc8ykn1j5a4yw1p8ivjk3k3va25kam25cp3"; depends=[callr fs getPass git2r glue httpuv httr knitr rmarkdown rprojroot rstudioapi stringr whisker xfun yaml]; }; - workflows = derive2 { name="workflows"; version="1.1.0"; sha256="0l5v5qmgj1qv2bk50kv59k2nydh1r97hmqffyxkfpkh2121b2qaq"; depends=[cli generics glue hardhat lifecycle parsnip rlang tidyselect vctrs]; }; + workflows = derive2 { name="workflows"; version="1.1.2"; sha256="1wlgx7gl4h9szw9lr6ck9mnkrflah0wfbs56fialbl7wd5jv6hcg"; depends=[cli generics glue hardhat lifecycle modelenv parsnip rlang tidyselect vctrs]; }; workflowsets = derive2 { name="workflowsets"; version="1.0.0"; sha256="12wj0m6kqnjh8k5k14kqh40wf14gzyg5l3shhbpr2lvk87l9ssqq"; depends=[cli dplyr generics ggplot2 glue hardhat lifecycle parsnip pillar prettyunits purrr rlang rsample tibble tidyr tune vctrs withr workflows]; }; workloopR = derive2 { name="workloopR"; version="1.1.4"; sha256="1gynlvmqxyibql5j3db9dwvc0jsc9jqzpy3d3gp43d5lcl11mcmq"; depends=[pracma signal]; }; - worldfootballR = derive2 { name="worldfootballR"; version="0.6.1"; sha256="0w1r7d2xsz0gavzq9yh7gpvkyrx8y9v1ppxg5pj8cxly0w20ikfq"; depends=[cli curl dplyr glue httr janitor jsonlite lubridate magrittr progress purrr qdapRegex readr rlang rstudioapi rvest stringi stringr tibble tidyr tidyselect withr xml2]; }; + worldfootballR = derive2 { name="worldfootballR"; version="0.6.2"; sha256="1s11qa30x2an8ndjahnx3wxbwf51xdwfqs42qw14wh83m35q2zn2"; depends=[cli curl dplyr glue httr janitor jsonlite lubridate magrittr progress purrr qdapRegex readr rlang rstudioapi rvest stringi stringr tibble tidyr tidyselect withr xml2]; }; worldmet = derive2 { name="worldmet"; version="0.9.6"; sha256="1yb8x9iv8ndnqlpadg1x9sxd48maw9b4ih03rkr508xn98xksyhb"; 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]; }; @@ -18613,13 +18730,13 @@ in with self; { wql = derive2 { name="wql"; version="1.0.0"; sha256="1s702gvwx49wky2ylh8q5h1vmh6sls2pq69w6jcijh1qs587dngs"; depends=[ggplot2 reshape2 zoo]; }; wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; }; wrGraph = derive2 { name="wrGraph"; version="1.3.1"; sha256="128qhrv2zkl8hl906gf7snqkl4gic41brawcy3a6aq8c4j1dxjvm"; depends=[lattice RColorBrewer wrMisc]; }; - wrMisc = derive2 { name="wrMisc"; version="1.10.1"; sha256="11w98d4h748sc8nfn6xcmsh8nqdxwvq72ygwcid6ijfq8i3rr0zg"; depends=[MASS]; }; - wrProteo = derive2 { name="wrProteo"; version="1.6.0"; sha256="0iq75zdip51aw8y37ckah1mddm69cp0lds2cj0xaavrdbaarww49"; depends=[knitr limma wrMisc]; }; + wrMisc = derive2 { name="wrMisc"; version="1.10.2"; sha256="1mz2a7bmzblky9z1d32zxnbdjiap6v8jhiah38lln2s4vrbx67yd"; depends=[MASS]; }; + wrProteo = derive2 { name="wrProteo"; version="1.7.0.1"; sha256="17lsq5zn74n5a4diaylz7fqc867dl14b2r4rkjxwm36vhx736h19"; 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.8.0"; sha256="1dr70w2y556l664067crrl7ly68d1pb0chyz00cl1sfiyma7nj6x"; depends=[boot coin dplyr forcats ggplot2 glue kableExtra knitr lifecycle magrittr purrr rlang stringr tibble tidyr tidyverse]; }; wrapr = derive2 { name="wrapr"; version="2.0.9"; sha256="1swgf10vg9sh29mn4gsia1rjln47lrqsv765yl19hlpk85qwhsk4"; depends=[]; }; - wrassp = derive2 { name="wrassp"; version="1.0.1"; sha256="02f4r6ax91sxv05mjbz33g04i33gd3548zym5iszzx26mbr6rwkv"; depends=[tibble]; }; + wrassp = derive2 { name="wrassp"; version="1.0.2"; sha256="1zk2rwlm8baf5pyzlcdxbkp40bji3vb64ybiy9pk947gzhpzyz4i"; depends=[tibble]; }; write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; }; writexl = derive2 { name="writexl"; version="1.4.1"; sha256="1qhf7p14mijdyl5i40gfpzgvdflcs6s8xnwrabsnjxpa17xbamkn"; depends=[]; }; wrswoR = derive2 { name="wrswoR"; version="1.1.1"; sha256="1q0nc08q8f3kl9yvcivzylykk1ar5j5dw3ian2y9nrzgzri5l10i"; depends=[logging Rcpp]; }; @@ -18633,6 +18750,7 @@ in with self; { wtest = derive2 { name="wtest"; version="3.2"; sha256="063ax9mbb2dy33l1cl533mjzpvhf2akw3613pklfjg6bhprlniz7"; depends=[]; }; wux = derive2 { name="wux"; version="2.2-1"; sha256="0iw0kf0wfspnpc83v7gxhcakmp0z34cccnm0jn9c2za9ay9l2swv"; depends=[abind class corpcor fields gdata Hmisc ncdf4 reshape rgdal rgeos rworldmap sp stringr]; }; wv = derive2 { name="wv"; version="0.1.1"; sha256="06xf3c97pjhln1v31waj8rmp4r0y2kp6v2x10pbpvi8m0nf5zfs1"; depends=[coda Rcpp RcppArmadillo simts]; }; + wwntests = derive2 { name="wwntests"; version="1.0.2"; sha256="0lp5xipf1lq8mlpdamsvan82s3fr3g5xbxpdnqjc68abnify0r8s"; depends=[ftsa MASS rainbow sde]; }; wyz_code_metaTesting = derive2 { name="wyz.code.metaTesting"; version="1.1.21"; sha256="1033kz6zhbhd09dh40gp03dfy2kf9zskqh942i06jx1z2dvx3vvi"; depends=[crayon data_table tidyr wyz_code_offensiveProgramming]; }; wyz_code_offensiveProgramming = derive2 { name="wyz.code.offensiveProgramming"; version="1.1.23"; sha256="1cxzh5yp6y2r5n6qkhb4g4dkbyw7mdnsfh883bhksk527ra4qaln"; depends=[crayon data_table R6 stringr tidyr]; }; 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]; }; @@ -18648,15 +18766,15 @@ in with self; { xSub = derive2 { name="xSub"; version="3.0.2"; sha256="07mib63zbvffr4w8klpv017d13wvqy3mwrpssr0vydcj8475gjfx"; depends=[countrycode haven RCurl]; }; xVA = derive2 { name="xVA"; version="1.1"; sha256="06y9qhly14y5r8d1g85jdzz8x5lwzfjkiy5zak6146mknl4nzz11"; depends=[data_table SACCR Trading]; }; xadmix = derive2 { name="xadmix"; version="1.0.0"; sha256="0vrk40q9nn40aisvgj3pq9q6z5kb68j614wpg7bx98fx3gqnxzxv"; depends=[dplyr forcats ggplot2 magrittr rlang stringr tidyr viridis]; }; - xaringan = derive2 { name="xaringan"; version="0.26"; sha256="1p9y6pjdpk4s5xz3zvmdzx9x8wla668cr075yaxc482kl7snskr6"; depends=[htmltools knitr rmarkdown servr xfun]; }; + xaringan = derive2 { name="xaringan"; version="0.27"; sha256="1f1xam86sgrdh0h1kgpl6yvfrhw1r22wkjl18jwx2qnrfd3bxwcx"; depends=[htmltools knitr rmarkdown servr xfun]; }; xaringanExtra = derive2 { name="xaringanExtra"; version="0.7.0"; sha256="1snj4yf5mxn419d3qbm2pixj7gvhmf133sxvjbirjrr3ib6iyn84"; depends=[htmltools jsonlite knitr uuid]; }; xaringanthemer = derive2 { name="xaringanthemer"; version="0.4.2"; sha256="074lq9m61647ac7crjmpf8qjj4l60ps0ic4c4b83g47drar79v2z"; depends=[colorspace glue purrr whisker]; }; xbreed = derive2 { name="xbreed"; version="1.0.1.1"; sha256="032i04ginyf9dyabfkygnhrkq7lqdvvyw7s41vjimy2kvjrnkkkx"; depends=[BGLR]; }; xdcclarge = derive2 { name="xdcclarge"; version="0.1.0"; sha256="1j8wsidwmfjygqlwavxinv4bqc6rddy42jdmlknsjfrrs49yj8kn"; depends=[nlshrink Rcpp RcppArmadillo]; }; - xefun = derive2 { name="xefun"; version="0.1.1"; sha256="1zqsh9i1ss39i9sm89b209affr68a2fx5wmjqnq37bgxp4wxs5zx"; depends=[data_table]; }; + xefun = derive2 { name="xefun"; version="0.1.2"; sha256="1i5l82q5xlgdq682103k84x1w8ly7a1ak5gbvbvx9ikwr42jz7ll"; depends=[data_table]; }; 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.34"; sha256="0gc5lbk73bf0yhvc7wwz7hbq39hvphd8xdsgwi2c125rxcgnrrsh"; depends=[]; }; + xfun = derive2 { name="xfun"; version="0.35"; sha256="04x6y7f3f105fzxn2kzmvfz0zqf2v28g8aqnsln6q9n4lm74vz45"; depends=[]; }; xgb2sql = derive2 { name="xgb2sql"; version="0.1.2"; sha256="1gw5dw0ck5hip8mv347zaswrggk395bg2hgn02bvqs0d31jhmgvi"; depends=[data_table xgboost]; }; xgboost = derive2 { name="xgboost"; version="1.6.0.1"; sha256="1gafjv6vcpny03lqw8s68xszalsylniavaqwsbzh46vyk4h9mscs"; 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]; }; @@ -18678,11 +18796,11 @@ in with self; { xnet = derive2 { name="xnet"; version="0.1.11"; sha256="18lda1gv53awsbkk5p4bzrbilndgybdz8xc6lhl6wy647fw9q9hv"; depends=[]; }; 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.2"; sha256="0pbpv3k1h7xglyry1pxjqvkbp6vhk2yl4nlvd5xwz29vlnda7gd8"; depends=[checkmate clipr dplyr fansi lifecycle plyr rlang rstudioapi testthat tibble withr]; }; + xpectr = derive2 { name="xpectr"; version="0.4.3"; sha256="0qpv2r4dz5g37v2b6y5jscsxm1hdmimq8pm0dwwf8df0pp351r3b"; depends=[checkmate clipr dplyr fansi lifecycle plyr rlang rstudioapi testthat tibble withr]; }; xplain = derive2 { name="xplain"; version="0.2.2"; sha256="152a83ckmhns6yniy87mmjva5bkv5x3phv63l1kkcmrr9bclfgz0"; depends=[httr RCurl readr XML]; }; xplorerr = derive2 { name="xplorerr"; version="0.1.2"; sha256="0sca6nngjs6f51di4dgzx868p75bzas0msr0kgivavsv6rj5fz0r"; depends=[Rcpp shiny]; }; xportr = derive2 { name="xportr"; version="0.1.0"; sha256="0dcjlc27v6a45gj8qfh6i31d7386kbs9w05mj74zx1apwn1x6j5m"; depends=[cli dplyr glue haven janitor magrittr purrr readr rlang stringr tidyselect tm]; }; - xpose = derive2 { name="xpose"; version="0.4.13"; sha256="0sbr5br8jzszn6j7jccrdfn95svdlqxn8xqjp29zdxnp3zjlkkd5"; depends=[dplyr ggforce ggplot2 purrr readr rlang stringr tibble tidyr vpc]; }; + xpose = derive2 { name="xpose"; version="0.4.14"; sha256="0ppnhnyi3xh7bcss6i1fpwz1rli3m5v20w3ia7azga09xfqycnyk"; depends=[dplyr ggforce ggplot2 purrr readr rlang stringr tibble tidyr vpc]; }; xpose_nlmixr2 = derive2 { name="xpose.nlmixr2"; version="0.4.0"; sha256="0scq6brd7sn1ybmacxlpdlmkwxbn9sc2gpzw6438fwfjss6sza8s"; depends=[crayon dplyr ggplot2 magrittr nlmixr2est rlang stringr tibble tidyr vpc xpose]; }; xpose4 = derive2 { name="xpose4"; version="4.7.2"; sha256="149ridxvbbkyxlnyhvw31gh2574cdycrrn89qwzvi4b5wb0p7psi"; depends=[dplyr gam Hmisc lattice lazyeval readr survival tibble]; }; xptr = derive2 { name="xptr"; version="1.1.3"; sha256="0352vs8dz61hgpwnf3r9r9haz3adg2wk9qxzrv313p1fcyfjz91v"; depends=[]; }; @@ -18695,49 +18813,47 @@ in with self; { xtal = derive2 { name="xtal"; version="1.15"; sha256="1zq3vd5x3vw6acn47yd2x7kflr9sm3znmdkm68cs64ha54jbl3vs"; depends=[]; }; xtensor = derive2 { name="xtensor"; version="0.13.2-0"; sha256="0jwmcrhdnj02f4qbwyf4z4rpgyrw7wc3m9fwqp8l5f57g5ywkjgf"; depends=[Rcpp]; }; xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; }; - xtreg2way = derive2 { name="xtreg2way"; version="1.0.0"; sha256="0wllz0frakmadavgpqhd2b8fiw6wgwh5wzd270czc6cm5bq9gfng"; depends=[MASS Matrix pracma]; }; xts = derive2 { name="xts"; version="0.12.2"; sha256="0hx7vh8cm4c80rnhwqg78l5xb0snvf4adrkbb74z93vmxgm7qa4w"; depends=[zoo]; }; xutils = derive2 { name="xutils"; version="0.0.2"; sha256="1h07gs8pj7hn64r35ld1j1zakc243aiiwdrz92viqrg7z75czdzl"; depends=[Rcpp]; }; xwf = derive2 { name="xwf"; version="0.2-3"; sha256="1byj6vjk2abm9j919107xsa3nd40zbsvxaldvv4ml3c47k1fg3kc"; depends=[mgcv]; }; xxIRT = derive2 { name="xxIRT"; version="2.1.2"; sha256="0b8yv8ixmcjiv9hlvpfdknx815smy7df7f2ixifnvhxxafgf1fwq"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2]; }; yaConsensus = derive2 { name="yaConsensus"; version="1.0"; sha256="1srph1yc8lr00yvx6sjm0br9h2cq94xqb9yjxfb0bqvvmskp6s2s"; depends=[doParallel foreach pheatmap]; }; - yaImpute = derive2 { name="yaImpute"; version="1.0-32"; sha256="1zvkrmlj48ahg9jq0fkbn7j603fmmld57yc0gjfas2mqa7cfbvh8"; depends=[]; }; + yaImpute = derive2 { name="yaImpute"; version="1.0-33"; sha256="0b2i0aymwb150068ji27i574p8lf8566cy6amppgzj8vxdi54naq"; 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]; }; yahoofinancer = derive2 { name="yahoofinancer"; version="0.1.0"; sha256="1zr5hpafqzx6h9qfx7b1ji19kzkh19gz1h1x37rx1256anrc07zq"; depends=[httr jsonlite lubridate magrittr purrr R6 stringr]; }; yaml = derive2 { name="yaml"; version="2.3.6"; sha256="09msw6k0hsazjna53ya3c6p8alfajs7cw5k2rm62xvslcs6rvlax"; depends=[]; }; - yamlet = derive2 { name="yamlet"; version="0.9.8"; sha256="0sc6mkqdfzmv9y75b0kqxly3b6amhj899l0dqprlz1ncrx3d2bb3"; depends=[csv dplyr encode ggplot2 pillar rlang scales spork tidyr units vctrs xtable yaml]; }; - yamlme = derive2 { name="yamlme"; version="0.1.1"; sha256="1cknx8ndcb9rz1j7z27244vba8hxyh5sa9zwsv6rwk9g1c52vmyg"; depends=[]; }; + yamlet = derive2 { name="yamlet"; version="0.10.0"; sha256="1snsvfshj7xw4lpzk4jgfpzzcqgxmy80jppqig5k27kk3v7a53lf"; depends=[csv dplyr encode ggplot2 pillar rlang scales spork tidyr units vctrs xtable yaml]; }; + yamlme = derive2 { name="yamlme"; version="0.1.2"; sha256="1019nzchqif4r3c7ywq23bjx711g359q44s8jy0rxyv03rij6xh9"; depends=[rmarkdown yaml]; }; 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]; }; yardstick = derive2 { name="yardstick"; version="1.1.0"; sha256="0bcirq9mp7c6kwx563nnsd4lk33xk0rfaakj1xj5r8pzmrcgbikj"; depends=[dplyr generics hardhat rlang tidyselect vctrs]; }; yarr = derive2 { name="yarr"; version="0.1.2"; sha256="16q109jrydckz7s1rkmr2sh8q92cgr1c534fvpbh3h0bc3fvvf8g"; depends=[]; }; yarrr = derive2 { name="yarrr"; version="0.1.5"; sha256="1258bj7x4icaxfabnnd3fgwydnqbzxkih7zw0sdlwdax3q8fw5c5"; depends=[BayesFactor circlize jpeg]; }; yasp = derive2 { name="yasp"; version="0.2.0"; sha256="0fza8h9y1wmarsmjcvw4r970d6j4ii795pd2h4xh9nlsirv50adi"; depends=[]; }; - yatah = derive2 { name="yatah"; version="0.1.0"; sha256="0ayy0h399g3csn106vvq6j4h6w0sgzw33b7gj1hk05nc8hdzrmna"; depends=[ape purrr stringr]; }; + yatah = derive2 { name="yatah"; version="0.2.1"; sha256="0cckmslzm19kg7vkv28aq8h4yx8m2khqs9d6y98gwl64qrjiz42g"; depends=[ape purrr stringr]; }; ycevo = derive2 { name="ycevo"; version="0.1.2"; sha256="1s61rdsll7b9dyc1lamyp4mlsw7vyf9lshw2dg3x5i3xf5rmrrsd"; depends=[dplyr magrittr Matrix Rcpp RcppArmadillo rlang]; }; yesno = derive2 { name="yesno"; version="0.1.2"; sha256="1n9v8m1wkk9p2ahl7d1khbffxmshv68q1v44v04y4v1k6qjvm0i2"; depends=[]; }; - yfR = derive2 { name="yfR"; version="1.0.2"; sha256="11xm37i2fdvsk56q42kg1rdy82czfxl83p17c96bh63vhpj9iqp9"; depends=[cli curl dplyr furrr future humanize lubridate magrittr purrr quantmod readr rvest stringr tibble tidyr zoo]; }; + yfR = derive2 { name="yfR"; version="1.0.4"; sha256="1zqsa6d69klwz95q47fkr5vh6vzcx48ypfyhwbwz7r2krbma8lbh"; depends=[cli dplyr furrr future humanize lubridate magrittr pingr purrr quantmod readr rvest stringr tibble tidyr zoo]; }; yhat = derive2 { name="yhat"; version="2.0-3"; sha256="00cbzj2bvr2pfspycqyf7jrdqyfg63zx25b6r9k3khafvn0ch7h1"; depends=[boot miscTools plotrix yacca]; }; yhatr = derive2 { name="yhatr"; version="0.15.1"; sha256="18g2cr1kjxnfw6cwzl62ynppfv1zz732kbx18zq8918l85kx6wbw"; depends=[httr jsonlite stringr]; }; yll = derive2 { name="yll"; version="1.0.0"; sha256="0lf3cd6pfzki29nk2iy0vd6v4dw6zlsbrjh2839zq5vlpiimsvck"; depends=[]; }; ymd = derive2 { name="ymd"; version="0.0.1"; sha256="02cd7y28s406yzvax2d47xwrsqyd8mhhb879ywjqfj6lvwf3jvkd"; depends=[]; }; ymlthis = derive2 { name="ymlthis"; version="0.1.7"; sha256="127rh8mfff0ii6wcd7iaaz60vlkynjlrs188wwcap8l2qgv67idy"; depends=[crayon fs glue magrittr purrr rlang rmarkdown rstudioapi stringr usethis whoami withr yaml]; }; - ympes = derive2 { name="ympes"; version="0.2.0"; sha256="0mqk2w7dwjzaas2ajqd3qg22dz66w2s6wl9xzy140qmnv76vzpvh"; depends=[]; }; + ympes = derive2 { name="ympes"; version="0.2.1"; sha256="018wvzaxcr0npgjvdwmgjm8cdkd449lpcmppdwy461zdxs8p1wrl"; depends=[]; }; yorkr = derive2 { name="yorkr"; version="0.0.34"; sha256="06y410klfnq2n0lgilgdgmh2cjsz1vphy3wvmjgcpbld89yv0q7g"; 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]; }; ypr = derive2 { name="ypr"; version="0.6.0"; sha256="0hn4zbg270p8yg4wxcszwfc0vsf2mb21lkqi1745000rh5cbz8sa"; depends=[chk ggplot2 lifecycle purrr tibble tidyplus 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.15.15"; sha256="19cymdqd7bpnlhy61ch1bp4pd43kzrhrql1l7vsddkiq26xx1isr"; depends=[boot calculus coda cubature expm glassoFast mvtnorm Rcpp RcppArmadillo zoo]; }; + yuima = derive2 { name="yuima"; version="1.15.18"; sha256="0jvx8rfpq6xkzfqj2nb90sq8mn90vfj839f7n23n5r11sp4l7jaz"; depends=[boot calculus coda cubature expm glassoFast mvtnorm Rcpp RcppArmadillo zoo]; }; yuimaGUI = derive2 { name="yuimaGUI"; version="1.3.1"; sha256="1sl45kmqqq7hg3lkpn3cy70f409fwsgg76gjldx1l4cvmyzyf9hl"; depends=[DT ggplot2 ghyp plotly quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; }; yulab_utils = derive2 { name="yulab.utils"; version="0.0.5"; sha256="0sq5wc0mp84h6fs4wa2smvf7dcn0p0xarzb2ljvqc3p4vb2lvkbf"; depends=[]; }; yum = derive2 { name="yum"; version="0.1.0"; sha256="1k9q34n1pzv4c7hp7cd4yhm8v1qv41an8vfh65n4byvyzipxp85y"; depends=[yaml]; }; zCompositions = derive2 { name="zCompositions"; version="1.4.0-1"; sha256="1rrhja9iaq123r2gqw1bzrn1ri0s3z4wzq8p0sfcr1yb6pv13vik"; depends=[MASS NADA truncnorm]; }; 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="2.1.2"; sha256="0j5adicqvdbvqq70163ibv09qaxzhdrphh4xgjvipvw9akmmcy0j"; depends=[evmix nleqslv Rcpp Rdpack]; }; + zcurve = derive2 { name="zcurve"; version="2.2.0"; sha256="0hxjizans42y936pfmcwgkjc6kk9c61xz8b8lglpzzqz48fyvcaw"; depends=[evmix nleqslv Rcpp Rdpack]; }; zdeskR = derive2 { name="zdeskR"; version="0.2.0"; sha256="0kbdkxly20ai3nfwwqj04gncbg1g3sh9gy323hsif919wpid8qzg"; depends=[dplyr httr jsonlite magrittr plyr purrr tidyr]; }; zeallot = derive2 { name="zeallot"; version="0.1.0"; sha256="1sd1igcfnv27pa3bqxlbyxchi562h7grnjg1l7wxx3bwr49i57s3"; depends=[]; }; zebu = derive2 { name="zebu"; version="0.2.0.0"; sha256="0nd44j2zxsagg9sav3lm8gzbyq8cdk1kfgbn503hb3a58kcqyg0d"; depends=[data_table ggplot2 Rcpp reshape2]; }; @@ -18753,11 +18869,10 @@ in with self; { zic = derive2 { name="zic"; version="0.9.1"; sha256="1vd64ljigf6iwgzlgdxgj65nlwir176h7ddznddpaz2abh6n6zwp"; depends=[coda Rcpp RcppArmadillo]; }; zip = derive2 { name="zip"; version="2.2.2"; sha256="194f19649jqw8wa2bd1kj3873hqnqxsrbqdwnvlzngi8pcixwv71"; depends=[]; }; zipR = derive2 { name="zipR"; version="0.1.1"; sha256="1aaw3dslhsw3zgxvkc1v60vsk44x64i4qmjwx0gq4f7dad1rbiqp"; depends=[]; }; - zipangu = derive2 { name="zipangu"; version="0.3.1"; sha256="0cl9zzl203nc7yf2v7a1mz19aqs3wlxc3d8l3ajszxy5pxvgfxdm"; depends=[arabic2kansuji dplyr lifecycle lubridate magrittr memoise purrr rlang stringi stringr tibble]; }; + zipangu = derive2 { name="zipangu"; version="0.3.2"; sha256="0l5jhv0xl0rh7z546zn2p3gaci1v7d9d3ha6040kixclkmhb5dp6"; depends=[arabic2kansuji dplyr lifecycle lubridate magrittr memoise purrr rlang stringi stringr tibble]; }; zipcodeR = derive2 { name="zipcodeR"; version="0.3.5"; sha256="1fmjqfhxd0lgsn6l5jvi3qzhbq9865xcps3jm9iy72jx7jxr59lk"; depends=[curl DBI dplyr httr jsonlite raster rlang RSQLite stringr tidycensus tidyr]; }; zipfR = derive2 { name="zipfR"; version="0.6-70"; sha256="15ng7rj7qbgxajx8jb9kv04xmbidg9wwzxr2xaskmlaxrxlqac8c"; depends=[]; }; zipfextR = derive2 { name="zipfextR"; version="1.0.2"; sha256="03rlvvw7rfbhsbwd5njmgkkkrxq1lgjdydmpkn6h1hi97pc0gbhh"; depends=[copula tolerance VGAM]; }; - 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.2"; sha256="154qm0f2ds40gwxqv30nf2px26clkf2lw2y51ak12gxpj08b6mix"; depends=[]; }; @@ -18787,6 +18902,7 @@ in with self; { AMGET = derive2 { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy44fb2n5gpghwcrx80knnicy3dxq"; depends=[]; broken = true; }; AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; broken = true; }; AMORE = derive2 { name="AMORE"; version="0.2-16"; sha256="0vw6hhykg1r6xxja6d4zb2y00x7pfkmhcq9xkidz8p4arinb7xnl"; depends=[]; broken = true; }; + APAtree = derive2 { name="APAtree"; version="1.0.1"; sha256="0vhvx2xp62avyq405jqn4i3z8awlifcs1lb527brxxhybrhnk4rv"; depends=[BH FD lwgeom raster Rcpp sf units]; broken = true; }; APML = derive2 { name="APML"; version="0.0.5"; sha256="1md9vryq2qf4cx3jrgh7p2j87qc8iil1cszw0vay5ylzaw4bz1hl"; depends=[dplyr fastDummies ggplot2 h2o performanceEstimation pROC survival]; broken = true; }; APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; broken = true; }; ASPBay = derive2 { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp RcppArmadillo]; broken = true; }; @@ -18796,6 +18912,7 @@ in with self; { AUCRF = derive2 { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; broken = true; }; AWAPer = derive2 { name="AWAPer"; version="0.1.46"; sha256="02n662wvd8qwshfmj9qfff730qs6ls82hkdsphw05jj6llddi4k5"; depends=[chron Evapotranspiration maptools ncdf4 raster sp xts zoo]; broken = true; }; AdapEnetClass = derive2 { name="AdapEnetClass"; version="1.2"; sha256="01k3mj4g1ckbng7wkzzn9h0k9yf01cpnnkly0sjda574c5jhj0rc"; depends=[glmnet imputeYn lars quadprog]; broken = true; }; + AdaptFitOS = derive2 { name="AdaptFitOS"; version="0.69"; sha256="0mclsnsxjyg1q7p7654gjsczzdzpa6avx3b9jpmdb0n63zdgmwy3"; depends=[MASS mgcv nlme SemiPar]; broken = true; }; AdjBQR = derive2 { name="AdjBQR"; version="1.0"; sha256="14437pyz9v09ighwqvy1lcw0vfp2gaqzs9nzrb1gkfbb8ndzjw7k"; depends=[coda MHadaptive quantreg survival]; broken = true; }; AirSensor = derive2 { name="AirSensor"; version="1.0.8"; sha256="0wpfg3mry1vdyd9v1981hasizj1mn5wy60ig9swxlqdm7j11wxan"; depends=[countrycode cowplot dplyr dygraphs geodist geosphere GGally ggmap ggplot2 gridExtra httpcode httr jsonlite leaflet lubridate magrittr MazamaCoreUtils MazamaLocationUtils MazamaSpatialUtils openair PWFSLSmoke RColorBrewer readr rlang scales seismicRoll sp stringr tibble tidyr tidyselect worldmet xts zoo]; broken = true; }; AllPossibleSpellings = derive2 { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; broken = true; }; @@ -18818,21 +18935,21 @@ in with self; { BCellMA = derive2 { name="BCellMA"; version="0.3.4"; sha256="1njprs7ksv0w18ffs0agz0290aa2akw48225iaa3bjhbl08dpidl"; depends=[ggplot2 reshape2]; broken = true; }; BGSIMD = derive2 { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; broken = true; }; BIOM_utils = derive2 { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; broken = true; }; - BIS = derive2 { name="BIS"; version="0.2.1"; sha256="0mngmchgc46wc9a7ksyqrvj6k46nm4ih7x69k3xijfia9bgkym0v"; depends=[dplyr readr rvest tidyr xml2]; broken = true; }; BKPC = derive2 { name="BKPC"; version="1.0.1"; sha256="17gmhf6qq8jn2xzkqvjq60xzy0slz6kgfpd0d6hlpnf30ww7q923"; depends=[kernlab]; broken = true; }; BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; broken = true; }; BNN = derive2 { name="BNN"; version="1.0.2"; sha256="13h9xqfdqnc9d8brx1xlmvb4nrkpwncwjz98y7i3wijih85wkikd"; depends=[mvtnorm]; broken = true; }; + BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="1.3"; sha256="1dnylvag24zqp93acdbn0ilbdzbn250pjjp6hjdd9d1zvla2ck85"; depends=[gplots MASS matrixcalc mvtnorm plyr Rcpp RcppArmadillo truncnorm]; broken = true; }; BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; broken = true; }; + BPEC = derive2 { name="BPEC"; version="1.3.1"; sha256="0jvq56cq1wnhwd6wvg02hbx4b5vc2hz1lyxi63pl41rk0xva615a"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools sp]; broken = true; }; BPmodel = derive2 { name="BPmodel"; version="1.1.2"; sha256="1fmiz06ci3x4ljaap6famnz82mrf2rcdg4d282x6wghpy4yv4afa"; depends=[Deriv dplyr extraDistr gamlss gamlss_dist ggplot2 pracma]; broken = true; }; BSGS = derive2 { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; broken = true; }; - BSGW = derive2 { name="BSGW"; version="0.9.2"; sha256="1q6qvm9yxh35wywrzs3kr31jsa0bmbwrqh0r3qjc0dzi6q8n6pjy"; depends=[doParallel foreach MfUSampler survival]; broken = true; }; BaBooN = derive2 { name="BaBooN"; version="0.2-0"; sha256="145q2kabjks2ql3m48sfjis5y35l8rcqnr5s176viv9yhfafn351"; depends=[coda Hmisc MASS nnet Rcpp RcppArmadillo]; broken = true; }; + BaPreStoPro = derive2 { name="BaPreStoPro"; version="0.1"; sha256="0zyyyrr5h8dhjsmgaii8jmb8ignvixpc9nzbfishw9yymjswvm57"; depends=[]; broken = true; }; + BacArena = derive2 { name="BacArena"; version="1.8.2"; sha256="1fv3hmr8frqgdl22cvp5w5089ppmqzw42llw2ls054dvsdadlqm9"; depends=[deSolve ggplot2 glpkAPI igraph Matrix plyr R_matlab Rcpp RcppArmadillo RcppEigen ReacTran reshape2 stringr sybil]; broken = true; }; BayHaz = derive2 { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; broken = true; }; BaySIC = derive2 { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; broken = true; }; - BayesBEKK = derive2 { name="BayesBEKK"; version="0.1.0"; sha256="0fykcmf54820krwy7q573gmlcrx96i94knx7rgzc83i287lnpnfg"; depends=[coda MTS mvtnorm]; broken = true; }; BayesGESM = derive2 { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[Formula GIGrvg normalp]; broken = true; }; BayesNI = derive2 { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; broken = true; }; - BayesOrdDesign = derive2 { name="BayesOrdDesign"; version="0.1.1"; sha256="11l6aabnagdfsqgkx3h6h6jywp959h7882v2n81hz3mqdx825y0d"; depends=[coda DescTools fda ggplot2 gsDesign madness ordinal R2jags rjags rjmcmc schoolmath superdiag tidyverse]; broken = true; }; BayesSummaryStatLM = derive2 { name="BayesSummaryStatLM"; version="2.0"; sha256="1b4h6s3cb8904slyy2pq3dzy3941p87s32zacmpwrnp7yvwxzl3d"; depends=[bit ff mvnfast]; broken = true; }; BayesValidate = derive2 { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; broken = true; }; BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; broken = true; }; @@ -18842,7 +18959,10 @@ in with self; { BigDataStatMeth = derive2 { name="BigDataStatMeth"; version="0.99.32"; sha256="0iz6pzlhkziwdwv80sy9zcxfvkxxjhqmgn7lk7lv1mkhywqkd9jk"; depends=[beachmat BH data_table Rcpp RcppEigen RcppParallel RCurl rhdf5 Rhdf5lib RSpectra]; broken = true; }; BigTSP = derive2 { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[gbm glmnet randomForest tree]; broken = true; }; BinQuasi = derive2 { name="BinQuasi"; version="0.1-6"; sha256="0jf7zf3yqr2kgcm6h35234x2dqf65d2dzsh63b4q8m5l36r77k59"; depends=[BiocGenerics csaw edgeR GenomicAlignments GenomicRanges IRanges mgcv pracma quadprog RMySQL Rsamtools S4Vectors SummarizedExperiment]; broken = true; }; + BioFTF = derive2 { name="BioFTF"; version="1.2-0"; sha256="03r6fhpc4dqrcnbl73j9kav1l7rblgfldpbkl2p367vv20xggqih"; depends=[]; broken = true; }; BioMedR = derive2 { name="BioMedR"; version="1.2.1"; sha256="0l3nmnqv0gzkbby4fhajbba910zpnbyckvxwds353pn54g9pcry7"; depends=[Biostrings ChemmineR fmcsR GOSemSim MASS org_Hs_eg_db pls randomForest rcdk RCurl rjson]; broken = true; }; + Biolinv = derive2 { name="Biolinv"; version="0.1-3"; sha256="1c081rhbgl6n76p2knaiyvjx0l02slix92vgfl2spss5cb9qzkln"; depends=[classInt fields raster sp spatstat spatstat_core spatstat_geom]; broken = true; }; + Biopeak = derive2 { name="Biopeak"; version="1.0"; sha256="1l08m1jl8yygbdfzk8klpj1q2m7icvxi98vmk7akxs0sswjc6wd2"; depends=[cluster dbscan factoextra gplots RColorBrewer]; broken = true; }; BivarP = derive2 { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[copula dfoptim survival]; broken = true; }; BlockFeST = derive2 { name="BlockFeST"; version="2.0"; sha256="1fcl3yc1cf09znqbj787d3fd2kl5rp63la7pxawsgmap7nxwkp65"; depends=[BASIX]; broken = true; }; BlockMessage = derive2 { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; broken = true; }; @@ -18856,8 +18976,9 @@ in with self; { 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; }; CEC = derive2 { name="CEC"; version="0.10.3"; sha256="0yypiy5xxrlckly4qpnf1wxg4hwza4y4da6y0jz4ldz918vskaci"; depends=[]; broken = true; }; - CGNM = derive2 { name="CGNM"; version="0.4.0"; sha256="0z9y6z2lpzzq7jzknfc84npraimkvlfm0sr5k9h3h3qjdxwfy2wk"; depends=[ggplot2 MASS]; broken = true; }; + CFC = derive2 { name="CFC"; version="1.1.2"; sha256="0k0685cgsd0lm7id6h216r4x236xn3nqj4h906qn2i0kvwmx4nda"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; broken = true; }; CHCN = derive2 { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; broken = true; }; + CIFsmry = derive2 { name="CIFsmry"; version="1.0.1.1"; sha256="1m2m2zvg9ghy3bm2sll7jp4xm2vw58kc5xaxd2c9k82771m3a4j0"; depends=[]; broken = true; }; CISE = derive2 { name="CISE"; version="0.1.0"; sha256="10mbi4v8dfdc9ngnrrmxpng8fnig5m8nv7799jksbcf6pnj8yv51"; depends=[far gdata glmnet MASS Matrix rARPACK]; broken = true; }; CLSOCP = derive2 { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; broken = true; }; CMC = derive2 { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; broken = true; }; @@ -18894,6 +19015,7 @@ in with self; { CommunityCorrelogram = derive2 { name="CommunityCorrelogram"; version="1.0"; sha256="1wkrm5lil595sc4ih3qsf4sgvfipzlav0n7339ixqw9zxm2pg4nj"; depends=[vegan]; broken = true; }; CompLognormal = derive2 { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; broken = true; }; CompRandFld = derive2 { name="CompRandFld"; version="1.0.3-6"; sha256="1yr1d97l6yc07jwh30j26gda15pjfcwx2z3w55dh3nr15vds0qcp"; depends=[fields mapproj maps RandomFields scatterplot3d spam]; broken = true; }; + ComparisonCR = derive2 { name="ComparisonCR"; version="1.0.4"; sha256="10xw3ppkzpc3njc409ln7g6bg33csf2ilw3f11hn60ry5xbnn82y"; depends=[boot CIFsmry cmprsk]; broken = true; }; Compounding = derive2 { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; broken = true; }; CondReg = derive2 { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; broken = true; }; ConfoundedMeta = derive2 { name="ConfoundedMeta"; version="1.3.0"; sha256="17l6dfff2v0a4p022qclrmkzi78ga9adkgxgrgk9imz0n9m9424d"; depends=[ggplot2 metafor]; broken = true; }; @@ -18906,6 +19028,7 @@ in with self; { CoxPhLb = derive2 { name="CoxPhLb"; version="1.2.0"; sha256="0jlh2k5ygj896sfx7dcw5qlb80bl64rsvqfayv0c6a107bmrzsw4"; depends=[survival]; broken = true; }; CreditMetrics = derive2 { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; broken = true; }; CreditRisk = derive2 { name="CreditRisk"; version="0.1.3"; sha256="09ks8xlsrbp3an1drcwmmd6df4fsfz61z21ma2p62a1pk0bnc86c"; depends=[fOptions]; broken = true; }; + CropScapeR = derive2 { name="CropScapeR"; version="1.1.4"; sha256="0rs428sz2fd4ysz1k5i2zkjg4vga2rczlbdd042sdjq501nk2462"; depends=[data_table dplyr httr magrittr raster RJSONIO sf]; broken = true; }; CytobankAPIstats = derive2 { name="CytobankAPIstats"; version="2.0"; sha256="0xczcgaxd8dv6fd1j5c8y4il852lq8859d1y16sxs8a3gqn9fbz2"; depends=[CytobankAPI pheatmap shiny shinyFiles xlsx]; broken = true; }; CytobankBridgeR = derive2 { name="CytobankBridgeR"; version="1.0.0"; sha256="0m8gxbm3p9gvdszymqx10n5rzb406r4f70a0in798c56mp2rcsl4"; depends=[CytobankAPI]; broken = true; }; D3GB = derive2 { name="D3GB"; version="1.1"; sha256="1r4hxx2qdws7c7hsnswzfh6az8mn720sk8nygilljl2ghnwpq7pa"; depends=[DBI RSQLite]; broken = true; }; @@ -18935,11 +19058,12 @@ in with self; { DengueRT = derive2 { name="DengueRT"; version="1.0.1"; sha256="11qfg4l6y3j8qh4dcsz13xjjj1n0q71c9a3c180nm5lgqv0nwb81"; depends=[drc ggplot2 nlme]; broken = true; }; Density_T_HoldOut = derive2 { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; broken = true; }; DepCens = derive2 { name="DepCens"; version="0.2.1"; sha256="0dqn8y4ljviy7dqknn17hi3ax2576y9w3bgkfzdg04x9czbyg450"; depends=[dlm Formula matrixStats rootSolve survival]; broken = true; }; + DetSel = derive2 { name="DetSel"; version="1.0.4"; sha256="01mpjy1cmgbrchdjl0gmrq3zx3mlkznml1qcradj2v5mgz26ifrv"; depends=[ash]; broken = true; }; + DiffNet = derive2 { name="DiffNet"; version="1.0-0"; sha256="04dvf0qxnc6jizwfjxw731j7d2fxyapk06rmqvga6h3p075q0mqk"; depends=[data_table doParallel foreach gplots Hmisc igraph lsa Matrix qlcMatrix Rcpp RcppEigen]; broken = true; }; DiffusionRgqd = derive2 { name="DiffusionRgqd"; version="0.1.3"; sha256="1gf5jpvimfrc9ccva0jk85rl4zfkbijm2305ky1rxcgm4kgw4lax"; depends=[colorspace Rcpp RcppArmadillo rgl]; broken = true; }; DiffusionRimp = derive2 { name="DiffusionRimp"; version="0.1.2"; sha256="1h7145ldlgwrrwj4l1wxdp2rbg2pm4v3pngiq0saz0xi3vpcxwl6"; depends=[colorspace Rcpp RcppArmadillo rgl]; broken = true; }; DiffusionRjgqd = derive2 { name="DiffusionRjgqd"; version="0.1.1"; sha256="1yb1jaq324qm2x8cl3bs2dflnsx8yfygpw2m3kk5hzaai9gfkqjf"; depends=[colorspace Rcpp RcppArmadillo rgl]; broken = true; }; DiscriMiner = derive2 { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; broken = true; }; - DistatisR = derive2 { name="DistatisR"; version="1.0.1"; sha256="0myzfki8yrk0nhgdgsqs4wjbqhzmkdil1g005hc7p4lz3gi09bfx"; depends=[car prettyGraphs]; broken = true; }; DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; broken = true; }; DoE_multi_response = derive2 { name="DoE.multi.response"; version="0.1.0"; sha256="1289jlp10999kvyg5adw3dyc2mhh20i6biyqjbxd6g80a8dajknx"; depends=[DoE_wrapper]; broken = true; }; Dominance = derive2 { name="Dominance"; version="1.2.0"; sha256="1z2gcs7myf90986gzw9g3914ph5cyg6pq6k53h4z566x883q8maz"; depends=[chron igraph]; broken = true; }; @@ -18947,19 +19071,21 @@ in with self; { DrInsight = derive2 { name="DrInsight"; version="0.1.2"; sha256="1zz9i4aj0ijqfgp30wv0bvrgx2n003dysqg0pm13f7hni27819ff"; depends=[igraph qusage]; broken = true; }; DunnettTests = derive2 { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; broken = true; }; DySeq = derive2 { name="DySeq"; version="0.22"; sha256="1sx6mg0bcqb5ff6x305k43zx3fwd16rvxc7xb3ai5h3w7fs9zz7y"; depends=[boot MASS TraMineR]; broken = true; }; + DynComm = derive2 { name="DynComm"; version="2020.1.6"; sha256="09nhcp9rldwrybwhyg86mgpgwq4hzlpp4rm5a5gl33nnhvcdm0mx"; depends=[igraph Rcpp Rdpack]; broken = true; }; DynamicDistribution = derive2 { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; broken = true; }; EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; broken = true; }; EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; broken = true; }; EBglmnet = derive2 { name="EBglmnet"; version="4.1"; sha256="0wlscmimj74alcr8k5h1g3alvlpss4g2ah7zkpd42akam3zb4s5z"; depends=[]; broken = true; }; EDFIR = derive2 { name="EDFIR"; version="1.0"; sha256="0nv1badyg1dri6z91fvs68a72g22vdg0rpi3fkpxw527r11fvrrv"; depends=[geometry lpSolve MASS vertexenum]; broken = true; }; EILA = derive2 { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; broken = true; }; + EL = derive2 { name="EL"; version="1.1"; sha256="0a6zbsq37miy7mv1b2gn3nlddlxpl6v5338lqxa2hn8ykj4vbs63"; depends=[]; broken = true; }; EMC = derive2 { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[MASS mvtnorm]; broken = true; }; + EMVS = derive2 { name="EMVS"; version="1.2.1"; sha256="1aikms2i77hwv6hrk8kn9wrh1v5j5zm918cwdwm5s6cy8fcqf406"; depends=[Rcpp RcppArmadillo]; broken = true; }; EPP = derive2 { name="EPP"; version="0.3.6.1"; sha256="015hp5f3nrf0hqi11cgsi43a97h9cvny4d75hfjd10zf0fj261h9"; depends=[assertthat curl deldir dplyr flexclust httr leaflet leaflet_extras maptools nngeo osrm plyr rgdal rgeos sf sp]; broken = true; }; ES = derive2 { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; broken = true; }; ESEA = derive2 { name="ESEA"; version="1.0"; sha256="06r5lki32mxkznj6yxvlz0ikqcxm3jbaralv4qp9xrw6dy6yyg27"; depends=[igraph parmigene XML]; broken = true; }; EW = derive2 { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; broken = true; }; EasyHTMLReport = derive2 { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc ggplot2 knitr markdown reshape2 scales xtable]; broken = true; }; - EcoEnsemble = derive2 { name="EcoEnsemble"; version="1.0.0"; sha256="0nixw872ic7jmy2z4wasks3r6y01mx8k7zwfzi72s809jgx1njmi"; depends=[BH cowplot dplyr ggplot2 matrixcalc Rcpp RcppEigen RcppParallel reshape2 rstan rstantools StanHeaders tibble]; broken = true; }; EcoHydRology = derive2 { name="EcoHydRology"; version="0.4.12.1"; sha256="075kgy6cxppkclk6nj5xs1f5yv9w8cpr09xwhf2101a6wswknb88"; depends=[DEoptim operators topmodel XML]; broken = true; }; EffectsRelBaseline = derive2 { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; broken = true; }; ElectionsLATAM = derive2 { name="ElectionsLATAM"; version="0.1.1"; sha256="0xs3qff1ayq12cr7xszxvzmyihs4p9vsyrwcglll794vj096ylz4"; depends=[boot dplyr foreign lgr magrittr networkD3 R6 readr readxl testthat webshot]; broken = true; }; @@ -18971,17 +19097,16 @@ in with self; { Eunomia = derive2 { name="Eunomia"; version="1.0.1"; sha256="06a42qsf3nx1pbynikkdvmbhh1rmgnfmiggdn86b3a0ij6cq0p2r"; depends=[DatabaseConnector RSQLite SqlRender]; broken = true; }; EvoRAG = derive2 { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; broken = true; }; ExGaussEstim = derive2 { name="ExGaussEstim"; version="0.1"; sha256="167y82sqqwmjaxmxag01nvg27c3gb58x8zbjr8ng01ygjc5rpkcb"; depends=[fitdistrplus gamlss_dist HI invgamma nloptr pracma]; broken = true; }; - ExomeDepth = derive2 { name="ExomeDepth"; version="1.1.15"; sha256="1ljswn8bimzhl7dxy7nb2jmwq9v7vpp4y1jynp8djrjpdx9wnaqi"; depends=[aod Biostrings dplyr GenomicAlignments GenomicRanges IRanges magrittr Rsamtools VGAM]; broken = true; }; FAMILY = derive2 { name="FAMILY"; version="0.1.19"; sha256="1912l2zj2cmh8yx8lkg8fpgvfddn6wbi1vrr4yx04mh73gk1s5mk"; depends=[pheatmap pROC]; broken = true; }; FBN = derive2 { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; broken = true; }; FCGR = derive2 { name="FCGR"; version="1.0-0"; sha256="015nnnc9fasx0qjrc3lbxv14rqwyx36xzsw9076grwm5pqahrdsb"; depends=[kerdiest KernSmooth MASS mgcv nlme pspline sfsmisc]; broken = true; }; FDRreg = derive2 { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda mosaic Rcpp RcppArmadillo]; broken = true; }; FField = derive2 { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; broken = true; }; FMAdist = derive2 { name="FMAdist"; version="0.1.0"; sha256="0aa4sw93ia6cp386hrq6x448x4w0p6k198rjaqs474j25gqgxrv0"; depends=[EnvStats extraDistr fitdistrplus MASS quadprog STAR]; broken = true; }; + FORTLS = derive2 { name="FORTLS"; version="1.1.0"; sha256="08g674ig8fn2mlwqrhd5lkvy64n9jqvla7nflswpbp4vhjgcmy9k"; depends=[dbscan Distance htmlwidgets lidR moments plotly progress raster Rcpp RcppEigen RCSF scales sf sp tidyr VoxR vroom]; broken = true; }; FREG = derive2 { name="FREG"; version="1.1"; sha256="1f9ss0aj6w6n0x4np6wi3ynhhcibr5zk54gzbkgpk6q3y7pv0qs1"; depends=[fda]; broken = true; }; FacPad = derive2 { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; broken = true; }; FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; broken = true; }; - FamEvent = derive2 { name="FamEvent"; version="2.1"; sha256="1bwi91z8xyb3xj8fwbshgdq7l1pik2dsy6ljzwy1ymd0xz0q7f5a"; depends=[eha kinship2 MASS pracma survival truncnorm]; broken = true; }; Familias = derive2 { name="Familias"; version="2.4"; sha256="1k6ig2zfkr1a4s3s85ygixmmsrb5m8vqqab8l5ffkspgjvh4dfz2"; depends=[kinship2 paramlink Rsolnp]; broken = true; }; FastHCS = derive2 { name="FastHCS"; version="0.0.7"; sha256="0l3fi3siwg2jhsj0jbhgccx8pnwd8h8f4z37g1najb41hw8dwn8d"; depends=[matrixStats Rcpp RcppEigen]; broken = true; }; FastLZeroSpikeInference = derive2 { name="FastLZeroSpikeInference"; version="2018.12.10"; sha256="0ybpmns7bc1j5xzqjl7734grihmvvpa3h52gixv3h70l0r89d8ys"; depends=[]; broken = true; }; @@ -18993,6 +19118,7 @@ in with self; { FitARMA = derive2 { name="FitARMA"; version="1.6.1"; sha256="02di0pkz6hh92glpn3li6z9azkcqa64ja8zfpy0mkh1l97mw6jsv"; depends=[FitAR]; broken = true; }; FlywayNet = derive2 { name="FlywayNet"; version="0.1.0"; sha256="00sp3m3iv6qifrkk0rncmzidv15b5fj138g0mai95lp280b040va"; depends=[EasyABC igraph modeest Rcpp]; broken = true; }; ForImp = derive2 { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals mvtnorm sampling]; broken = true; }; + ForestGapR = derive2 { name="ForestGapR"; version="0.1.6"; sha256="1m3fn7gqwch14nilid9fmxwlm4x9qslr3czb44iwiff9i69csnvk"; depends=[igraph poweRlaw raster rgeos sp spatstat_core spatstat_geom VGAM viridis]; broken = true; }; ForwardSearch = derive2 { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; broken = true; }; FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; broken = true; }; FuzzyToolkitUoN = derive2 { name="FuzzyToolkitUoN"; version="1.0"; sha256="104s45mmlam67vwpshhpns2mgwvmhnbj8w1918jyk2r5mqibwz06"; depends=[]; broken = true; }; @@ -19014,20 +19140,21 @@ in with self; { GWG = derive2 { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; broken = true; }; GaDiFPT = derive2 { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; broken = true; }; GaSP = derive2 { name="GaSP"; version="1.0.1"; sha256="0l1a5w3wphm1748qmh3abv9yd1w92wg7irqpgdg6pc7598dvlkr9"; depends=[]; broken = true; }; - GauPro = derive2 { name="GauPro"; version="0.2.4"; sha256="1fll93r25293xdwv28g9my627f736kawr0ji1vxfc3q275zfy7lg"; depends=[lbfgs R6 Rcpp RcppArmadillo]; broken = true; }; GenForImp = derive2 { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; broken = true; }; GenHMM1d = derive2 { name="GenHMM1d"; version="0.1.0"; sha256="0liqfjx17xs8si15yrb4032ac33ibxn2xm010b244gfhl1wr2ar5"; depends=[actuar doParallel EnvStats extraDistr foreach ggplot2 matrixcalc reshape2 rmutil ssdtools VaRES VGAM]; broken = true; }; GenKern = derive2 { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; broken = true; }; - GenWin = derive2 { name="GenWin"; version="0.1"; sha256="0jm537i4jn3azdpvd50y9p0fssfx2ym2n36d3zgnfd32gqckz3s4"; depends=[pspline]; broken = true; }; GeneBook = derive2 { name="GeneBook"; version="1.0"; sha256="1cg8zyr7rbshj3shhzkrxs910dsz4brhh51jvn2qzipzd8dbvxiv"; depends=[dplyr repmis stringr svDialogs]; broken = true; }; GeneClusterNet = derive2 { name="GeneClusterNet"; version="1.0.1"; sha256="1xi4c041c4m39f9wb5fklgmhi6ng78iwzzqch5xk9hx5blq6zd4m"; depends=[G1DBN igraph MASS]; broken = true; }; + GenomicMating = derive2 { name="GenomicMating"; version="2.0"; sha256="02v1pkarmardf7g8hf2n4jj4cq4707g5lcc7gnwsiyyh7pknd1y6"; depends=[dplyr emoa kohonen LowRankQP magrittr plotly qtl Rcpp RcppArmadillo scatterplot3d SOMbrero]; broken = true; }; GenomicTools = derive2 { name="GenomicTools"; version="0.2.9.7"; sha256="196shxbrcgiwaa7aav2aipsbj1smrkbhinn44aw9qfvz2x9zdz0m"; depends=[circlize data_table GenomicTools_fileHandler gMWT Rcpp RcppArmadillo snpStats stringr]; broken = true; }; GeoDE = derive2 { name="GeoDE"; version="1.0"; sha256="0wawkzj0344pprm8g884d7by8v74iw96b109rgm7anal48fl30im"; depends=[MASS Matrix]; broken = true; }; GeoLight = derive2 { name="GeoLight"; version="2.0.0"; sha256="1i49hyj3f5rcw0s6j2csnfwc6mnp5zn44vxjnk05wdkpw6dpvx5i"; depends=[changepoint fields maps MASS]; broken = true; }; + GeoTcgaData = derive2 { name="GeoTcgaData"; version="1.1.1.992"; sha256="0xzz5sg9ywmpwym50hbvb1z7f8wwbbr4shiir8kj4mwf22snsk6d"; depends=[cqn data_table dplyr magrittr plyr topconfects]; broken = true; }; GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; broken = true; }; GibbsACOV = derive2 { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; broken = true; }; GlobalDeviance = derive2 { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; broken = true; }; - GroupSeq = derive2 { name="GroupSeq"; version="1.4.0"; sha256="0dgm53wagwfsmv308ipx7v29qh7p5xwvbnni5zrc3a575ch1b7hb"; depends=[container mvtnorm tcltk2]; broken = true; }; + GlobalFit = derive2 { name="GlobalFit"; version="1.2"; sha256="01s51nxcsl8xxn6khbv5jsvpwblwf0iamvr477a1rraqqqj94zx0"; depends=[sybil]; broken = true; }; + GmAMisc = derive2 { name="GmAMisc"; version="1.2.1"; sha256="0rvdphdgk1bdfamwf6spy5k9qa5ws92mvf3q3dlhn6qfazp7j4hr"; depends=[caTools classInt cluster coin corrplot DescTools dismo ggplot2 ggrepel gridExtra Hmisc InPosition kimisc lsr maptools plyr pROC raster RcmdrMisc rgdal rgeos sp spatstat_core spatstat_geom spatstat_random]; broken = true; }; GuessCompx = derive2 { name="GuessCompx"; version="1.0.3"; sha256="1xbkh1wh2z0n964w8lwi7q4rr7mls0awf5k7n5jjklhq4b6gswic"; depends=[boot dplyr ggplot2 lubridate reshape2]; broken = true; }; GxM = derive2 { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[minqa nlme Rcpp]; broken = true; }; HAPim = derive2 { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; broken = true; }; @@ -19061,7 +19188,7 @@ in with self; { ICAFF = derive2 { name="ICAFF"; version="1.0.1"; sha256="0zazx4nv81s75appg10aayks04mx6m5n9yf5hqrbxh3yj68vzxfy"; depends=[]; broken = true; }; ICBayes = derive2 { name="ICBayes"; version="1.2"; sha256="1hdh7g4nk6yy0xz9564vpvh1blrw30lvyw2wc5mmgn78kwjqla34"; depends=[coda HI survival]; broken = true; }; ICE = derive2 { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; broken = true; }; - ICSsmoothing = derive2 { name="ICSsmoothing"; version="1.2.5"; sha256="08m8p6y5zk54ha3wp5x9xbx6f2xkkqx232hsan1f1s8k9j3q5avd"; depends=[ggplot2 polynom]; broken = true; }; + IDSpatialStats = derive2 { name="IDSpatialStats"; version="0.3.12"; sha256="0gkicafnzq8aq9bmbbr9n868sh91dwkhs1dk4wry5vkbfaawfxis"; depends=[doParallel foreach igraph spatstat_core spatstat_geom]; broken = true; }; IGG = derive2 { name="IGG"; version="1.0"; sha256="1cibb9z18xc1zx1813lk14n6p5am84hm7w0hkrsif4j3p89lrwif"; depends=[GIGrvg glmnet MASS Matrix pscl]; broken = true; }; IGP = derive2 { name="IGP"; version="0.2.0"; sha256="1hsyl6cjm84w4f4v0gw4hi5y483r8v78xb3k3h1ixix9ymjqr8y5"; depends=[R6 reticulate]; broken = true; }; ILS = derive2 { name="ILS"; version="0.2"; sha256="0lj3ripkaq6jn00lpxjihjhm8g1gbkppmb1y9kkrymphg80k1by7"; depends=[depthTools fda_usc lattice MASS multcomp]; broken = true; }; @@ -19080,6 +19207,7 @@ in with self; { IgorR = derive2 { name="IgorR"; version="0.8.1"; sha256="1lkiz3gxj8i1xbr5jp69z21rpk7kz3a68h29inp1qa7zi7gikmgx"; depends=[bitops]; broken = true; }; Imap = derive2 { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; broken = true; }; InfDim = derive2 { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; broken = true; }; + InformationValue = derive2 { name="InformationValue"; version="1.2.3"; sha256="1b5g2wyp7x5cdhmf4325n3q7afa6i352lh80j28c8s4356pr3w9j"; depends=[data_table ggplot2]; broken = true; }; IntLik = derive2 { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; broken = true; }; Interact = derive2 { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; broken = true; }; InteractiveIGraph = derive2 { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; broken = true; }; @@ -19113,8 +19241,8 @@ in with self; { LPTime = derive2 { name="LPTime"; version="1.0-2"; sha256="08lb6884kj9pg12mzx67fdnqb86x5s6yzb72hh3nrz50awj1f8nn"; depends=[orthopolynom]; broken = true; }; LSC = derive2 { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[fields gam LICORS Matrix RColorBrewer]; broken = true; }; LadR = derive2 { name="LadR"; version="1.0.6"; sha256="14n58y1p14wwxwwrbdqv2kkplma8ficpqx8nd22qp931idijpsji"; depends=[L1pack]; broken = true; }; - LakeMetabolizer = derive2 { name="LakeMetabolizer"; version="1.5.0"; sha256="06mvdrdyl0rh9rwd0jxww0sycadcp7cj08hq35q6vyzq0jkxn2xf"; depends=[plyr rLakeAnalyzer]; broken = true; }; Lambda4 = derive2 { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; broken = true; }; + LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; broken = true; }; LindleyR = derive2 { name="LindleyR"; version="1.1.0"; sha256="163i604q683znp6q544hnv4vibygwvsxcfhh8m7iaqr42li3c0ak"; depends=[lamW]; broken = true; }; LocFDRPois = derive2 { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; broken = true; }; LogisticDx = derive2 { name="LogisticDx"; version="0.3"; sha256="1hry32grqwlarp0cplx8szf4pf7ml1nxd11ahffmr72ihcv5ckga"; depends=[aod data_table pROC RColorBrewer rms speedglm statmod]; broken = true; }; @@ -19133,6 +19261,7 @@ in with self; { MC2toPath = derive2 { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrml907v23mfxr62wwjdh7487ihjj59g434ry7wh"; depends=[RNetCDF]; broken = true; }; MCDM = derive2 { name="MCDM"; version="1.2"; sha256="0r27y9mqvfnv1m0yi2xdyjr4y1s43d5yav960kz2xa732hrrxw01"; depends=[RankAggreg]; broken = true; }; MCMChybridGP = derive2 { name="MCMChybridGP"; version="5.4"; sha256="19nbch76g7jf53nrb1lyzr3zd0z6rpz2k86mq1r9aidwwxh81g7p"; depends=[MASS]; broken = true; }; + MCTM = derive2 { name="MCTM"; version="1.0"; sha256="14xjfskyrqi0m58lkwjfjpss5j7wy3ajr148n526czrrpccg108j"; depends=[]; broken = true; }; MConjoint = derive2 { name="MConjoint"; version="0.1"; sha256="02yik28mhvd4rfqwrprdbdjx9c49ds55fh042bsjajs2ip467w5c"; depends=[]; broken = true; }; MF = derive2 { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; broken = true; }; MFHD = derive2 { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; broken = true; }; @@ -19152,9 +19281,11 @@ in with self; { 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; }; MODISSnow = derive2 { name="MODISSnow"; version="0.1.0.0"; sha256="1p0mil074gapw6v8paw9595rzp85hxrfsc65llh0ljalmacwgx04"; depends=[gdalUtils lubridate raster RCurl]; broken = true; }; + MOEADr = derive2 { name="MOEADr"; version="1.1.1"; sha256="0aqkqw5ph5rvsgpasc94i264lxapr37gpjhk4rkkynph2gnvq1zx"; depends=[assertthat FNN]; broken = true; }; MOrder = derive2 { name="MOrder"; version="0.1"; sha256="1vhy20xyvfc18f04hvlb1jm2n0caaz8ysy13w2rra5i4kjdvz52i"; depends=[]; broken = true; }; MPAgenomics = derive2 { name="MPAgenomics"; version="1.2.3"; sha256="0096jy94zpbbd2n862hc4m3i4s7vpl2q3vybx96hvv6qi1ny47cm"; depends=[changepoint glmnet HDPenReg R_utils spikeslab]; broken = true; }; MPINet = derive2 { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; broken = true; }; + MPR_genotyping = derive2 { name="MPR.genotyping"; version="0.8"; sha256="0lsrbks7nhfnrmk8kclh09rc132j3divjxrzjfrg8zijbzkfx1pn"; depends=[qtl]; broken = true; }; MPkn = derive2 { name="MPkn"; version="0.1.0"; sha256="0nvd6sv1wypcmphm0wcymbibcxrqzx3c9s9b191p1pmxyz607vxv"; depends=[]; broken = true; }; MRCV = derive2 { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; broken = true; }; MRH = derive2 { name="MRH"; version="2.2"; sha256="1icwlq8js58g9fkiq7fwjg8r97ca47xl3dscnhnga99gkgsfgjwl"; depends=[coda KMsurv survival]; broken = true; }; @@ -19163,6 +19294,7 @@ in with self; { MVB = derive2 { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; broken = true; }; MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; broken = true; }; MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; broken = true; }; + MagmaClustR = derive2 { name="MagmaClustR"; version="1.0.1"; sha256="0gf0xlsh5wkvbp331z7c55ypfkg9rmmakykbqliswiyrfgbczk9g"; depends=[broom dplyr ggplot2 magrittr mvtnorm Rcpp rlang tibble tidyr tidyselect]; broken = true; }; Mapinguari = derive2 { name="Mapinguari"; version="1.0.0"; sha256="1jfqinfr6wkpmkp4jm9ixgawcywm3n1ni03h6zngvx74saz7kd3g"; depends=[dplyr magrittr raster rgdal rlang stringr testthat]; broken = true; }; MaskJointDensity = derive2 { name="MaskJointDensity"; version="1.0"; sha256="0nxhsz57cw96in0sg5xg7sicv920kcnxr2rikn39y2qk4vrw6r78"; depends=[ks MASS np plyr]; broken = true; }; MatTransMix = derive2 { name="MatTransMix"; version="0.1.15"; sha256="1s2wmhiqn024x9l217xak3wp3dbd3mfrih70xc5mc1b4555f2fbm"; depends=[mvtnorm]; broken = true; }; @@ -19182,10 +19314,10 @@ in with self; { Meth27QC = derive2 { name="Meth27QC"; version="1.1"; sha256="0ad30svs2kjzmmyvcm0jmv64iyq7slp1x1xl35h2rv1b6zbd4658"; depends=[gplots]; broken = true; }; Methplot = derive2 { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; broken = true; }; MethylCapSig = derive2 { name="MethylCapSig"; version="1.0.1"; sha256="16ch9aldr6a9jn42h387n7qvnzs0yx28f2yj6xq0kp476q7rf4ql"; depends=[geepack]; broken = true; }; - MfUSampler = derive2 { name="MfUSampler"; version="1.0.6"; sha256="0lw60dnlkcs59wf5yzqj3yq8k529s5mrjj33nyvzqgqqmln9v1x8"; depends=[ars coda HI]; broken = true; }; MiST = derive2 { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; broken = true; }; 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]; broken = true; }; Miney = derive2 { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; broken = true; }; + MixMAP = derive2 { name="MixMAP"; version="1.3.4"; sha256="0gxghym5ghbyxf589hda2fhv5l3x5jvm6i40x5xdwx4hadcn8k9a"; depends=[lme4]; broken = true; }; ModelGood = derive2 { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; broken = true; }; ModelMap = derive2 { name="ModelMap"; version="3.4.0.2"; sha256="1vca7wri0djk4v0gjnivg4k8qplrq0qlhq7vy801w8ffdyg86qag"; depends=[corrplot fields HandTill2001 mgcv PresenceAbsence randomForest raster rgdal]; broken = true; }; MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; broken = true; }; @@ -19213,6 +19345,7 @@ in with self; { NTS = derive2 { name="NTS"; version="1.1.2"; sha256="02gh9yqflwgqws7a14wwb1y7qx0whw4ss1kkfgh9jp6bxc2dclnf"; depends=[dlm MASS MSwM Rdpack tensor]; broken = true; }; NetComp = derive2 { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvxhlr2c19fig4v4a5c6jhqyfdsd60fsv"; depends=[gdata]; broken = true; }; NetData = derive2 { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; broken = true; }; + NetLogoR = derive2 { name="NetLogoR"; version="0.3.11"; sha256="0pppcpij4wn1gig7lyh122x52dx8x1dy98v5cphmrap8mpj4x7h2"; depends=[abind CircStats data_table matrixStats quickPlot raster sf sp SpaDES_tools]; broken = true; }; NetworkReg = derive2 { name="NetworkReg"; version="1.0"; sha256="0ymbigvl1n5348g77jqs1bcda00kdqrm7zifc0ibh5mwsrx6cmds"; depends=[Matrix randnet RSpectra]; broken = true; }; NoiseFiltersR = derive2 { name="NoiseFiltersR"; version="0.1.0"; sha256="0y90si8f5hsi273g10hw700r72la30hwqlwg59gaq76wqlkm8j0p"; depends=[caret e1071 kknn MASS nnet randomForest rJava rpart RWeka]; broken = true; }; NominalLogisticBiplot = derive2 { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; broken = true; }; @@ -19238,6 +19371,7 @@ in with self; { OutlierDC = derive2 { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[Formula quantreg survival]; broken = true; }; OutlierDM = derive2 { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[MatrixModels outliers pcaPP quantreg]; broken = true; }; PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; broken = true; }; + PAMA = derive2 { name="PAMA"; version="1.2.0"; sha256="12fvkcdkn66gzr193fq9byf64qlq2x9dkjv9hpfw770l4yw496jn"; depends=[ExtMallows mc2d PerMallows rankdist Rcpp]; broken = true; }; PANDA = derive2 { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster GO_db]; broken = true; }; PCObw = derive2 { name="PCObw"; version="0.0.0"; sha256="1mz9fpd8k0fs14gvs9bhzrpydz200fsg52njaw2nr08184q78r4y"; depends=[Rcpp RcppEigen]; broken = true; }; PEMM = derive2 { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; broken = true; }; @@ -19257,6 +19391,7 @@ in with self; { PathSelectMP = derive2 { name="PathSelectMP"; version="1.1"; sha256="036b70bpylmibny6dny79f7gdzn78arqgl2hfs031vygw63yyh9b"; depends=[mice MplusAutomation]; broken = true; }; PatternClass = derive2 { name="PatternClass"; version="2.0.1"; sha256="1xwlk6shms38nqxad3d15254wgnkfzy7jyf5w9bbm96kg05mndbz"; depends=[landscapemetrics raster]; broken = true; }; PedCNV = derive2 { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[ggplot2 Rcpp RcppArmadillo]; broken = true; }; + PerMallows = derive2 { name="PerMallows"; version="1.13"; sha256="0ny2vc8f0npixaw1kp2d93xr4g46nsg8jjwvi6afv9xjvaz0i6wy"; depends=[Rcpp]; broken = true; }; PharmPow = derive2 { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; broken = true; }; PhyloMeasures = derive2 { name="PhyloMeasures"; version="2.1"; sha256="01axs78s10y1bkx8dbs9vvnphdzik7hpibkwyib1x9mznmyg90hr"; depends=[ape]; broken = true; }; PivotalR = derive2 { name="PivotalR"; version="0.1.18.5"; sha256="1xcr7769d9jixq0lbc89jqzzxnnzxb8gjlws2l6cjm40hcid2yc9"; depends=[Matrix semver]; broken = true; }; @@ -19264,6 +19399,7 @@ in with self; { PlotRegionHighlighter = derive2 { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; broken = true; }; PoissonSeq = derive2 { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; broken = true; }; PopGenKit = derive2 { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; broken = true; }; + PopGenome = derive2 { name="PopGenome"; version="2.7.5"; sha256="0xdwgih1n7bkykbzrnp293yzrlj80vr2v6rlsww61nxlhynbh9yn"; depends=[ff]; broken = true; }; PoweR = derive2 { name="PoweR"; version="1.0.7"; sha256="040wc7hxa8y6bm1rs7ip2skdxmmwksxkyb6xzqgdjp8m7a25fppb"; depends=[Rcpp RcppArmadillo]; broken = true; }; PredictiveRegression = derive2 { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; broken = true; }; PriorCD = derive2 { name="PriorCD"; version="0.1.0"; sha256="1mb50w2i8sfxjzqd5xnfysn3jnzkkyv6l8algxnp0xpyhcq41pfs"; depends=[dplyr igraph ROCR visNetwork]; broken = true; }; @@ -19274,6 +19410,7 @@ in with self; { PurBayes = derive2 { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; broken = true; }; QBAsyDist = derive2 { name="QBAsyDist"; version="0.1.2"; sha256="1yql29npaq9yz02bv3hqf5m2mhscjms7qqf4vlaxm8s665rxcxad"; depends=[ald Deriv GoFKernel locpol nloptr quantreg scdensity zipfR]; broken = true; }; QCAfalsePositive = derive2 { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; broken = true; }; + QPmin = derive2 { name="QPmin"; version="0.5-1"; sha256="1hfvbi2qfynnkg2pmr7qsw75bmijwglnxchbzxcbikm5yw3sd2mz"; depends=[Matrix]; broken = true; }; QuACN = derive2 { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat graph igraph RBGL]; broken = true; }; QualInt = derive2 { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; broken = true; }; QuantTools = derive2 { name="QuantTools"; version="0.5.7.1"; sha256="1nkf7ihzfwgz7svh1jybgcvqwbim2dqzi00l4m9pma463va4q19d"; depends=[data_table fasttime R6 Rcpp RCurl readxl]; broken = true; }; @@ -19294,6 +19431,7 @@ in with self; { RDFTensor = derive2 { name="RDFTensor"; version="1.3"; sha256="1kfhhn0lb1r61bkgxn7rv1smgk8b7vxbc8y97hdmg5argiywc65i"; depends=[doParallel foreach Matrix pracma]; broken = true; }; RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; broken = true; }; RDSTK = derive2 { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr RCurl rjson]; broken = true; }; + REREFACT = derive2 { name="REREFACT"; version="1.0"; sha256="0nggva4qfqlcs58df3sgiigw0z75l5kg8c1yh0k5qsvjnhiq19vn"; depends=[combinat gdata Matrix psych]; broken = true; }; REST = derive2 { name="REST"; version="1.0.1"; sha256="16v89z7p9qkg7bsypf9vkrnbmb2n7gw3fqnfzbyxwj496wzxdv1x"; depends=[Rcmdr]; broken = true; }; RFGLS = derive2 { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; broken = true; }; RFreak = derive2 { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; broken = true; }; @@ -19311,9 +19449,10 @@ in with self; { ROP = derive2 { name="ROP"; version="1.0"; sha256="12gh83r3hp1qdmw3p5rr1wfhsh90pirx67q456gl9ai6zgd8nkq8"; depends=[ROCR]; broken = true; }; RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; broken = true; }; RPS = derive2 { name="RPS"; version="1.0.1"; sha256="16n6wknw2m56kwi6rswgxjwjqblhaz5gyw94f96a7l6navqnvlp4"; depends=[ape geomorph Gmedian igraph MASS matlab]; broken = true; }; - RRreg = derive2 { name="RRreg"; version="0.7.3"; sha256="1nk2gg41bdhfnz7plkj4rnzl40sd6jd5z9843kxijp9ymagimwx4"; depends=[doParallel foreach lme4]; broken = true; }; RSCABS = derive2 { name="RSCABS"; version="0.9.5"; sha256="193wbf1v18xv098i6abpglb239788d9gjzqbn8p3aai0la6y1pk3"; depends=[gWidgets2 gWidgets2RGtk2 R2HTML RGtk2]; broken = true; }; RSPS = derive2 { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; broken = true; }; + RSeed = derive2 { name="RSeed"; version="0.1.60"; sha256="0rvb6w4z5c2wcdgx5w6vv7c8il8d0096pgv3fyvw21ag25z605jc"; depends=[graph RBGL sybil]; broken = true; }; + RSurvey = derive2 { name="RSurvey"; version="0.9.3"; sha256="0yk969jdvpgv01zbmk4zyxcmrbdizh37bddj1k128ndyf191z37x"; depends=[colorspace inlmisc MBA raster rgdal rgeos sp]; broken = true; }; RSwissMaps = derive2 { name="RSwissMaps"; version="0.1.0.1"; sha256="16sdd0115793yj74i9m64yfxxn3gkk4nvb0qk2w8j7jjbqhflis0"; depends=[downloader dplyr ggplot2]; broken = true; }; RTConnect = derive2 { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; broken = true; }; RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; broken = true; }; @@ -19327,8 +19466,8 @@ in with self; { Rambo = derive2 { name="Rambo"; version="1.1.1"; sha256="036rvjj6gcnf2gg5xl55n5p8j1pzifb9wmlpwnymz1csxgkl477i"; depends=[sna]; broken = true; }; RandomCoefficients = derive2 { name="RandomCoefficients"; version="0.0.2"; sha256="04l0aczrlbkjk0687w2gxs85ia71yy69mgankwkl37ksznh6y81m"; depends=[fourierin ks orthopolynom polynom RCEIM rdetools robustbase sfsmisc snowfall statmod tmvtnorm VGAM]; broken = true; }; RandomFields = derive2 { name="RandomFields"; version="3.3.14"; sha256="0c5r7l642cw56km56ijachnqhjh5k0izy03cl14rvbwkpywh09i4"; depends=[RandomFieldsUtils sp]; broken = true; }; + RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="1.2.5"; sha256="0bjfz3bla6pr7wq4mqqcd4gmxqdx32gci4f71arfski31yx8ihlc"; depends=[]; broken = true; }; Rbitcoin = derive2 { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; broken = true; }; - RcmdrPlugin_EACSPIR = derive2 { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; broken = true; }; RcmdrPlugin_FuzzyClust = derive2 { name="RcmdrPlugin.FuzzyClust"; version="1.1"; sha256="1lg6k3h4n45s6wjkl3ycwfngfr2i6mkhirifhbazsvv297bg0iba"; depends=[clue doParallel foreach ggplot2 iterators MASS Rcmdr reshape2 tcltk2 tkrplot]; broken = true; }; RcmdrPlugin_IPSUR = derive2 { name="RcmdrPlugin.IPSUR"; version="0.2-1.1"; sha256="0dbdsxdxhxm79cq7hi0rh8qphan73521lmivcnb4ca8g6ha2y32v"; depends=[Rcmdr]; broken = true; }; RcmdrPlugin_SLC = derive2 { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[Rcmdr SLC]; broken = true; }; @@ -19349,12 +19488,13 @@ in with self; { RegClust = derive2 { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; broken = true; }; RelValAnalysis = derive2 { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; broken = true; }; Reliability = derive2 { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; broken = true; }; + ReorderCluster = derive2 { name="ReorderCluster"; version="2.0"; sha256="0zq143xvv2br7016f9b1501ymcpkjqm3al1dn5qfm21axyi2p1iq"; depends=[gplots gtools Rcpp]; broken = true; }; RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; broken = true; }; - RevGadgets = derive2 { name="RevGadgets"; version="1.0.0"; sha256="0k17flvax4cq9cvl3fsyv5ya0bndikxbzdmk87v5xz3czf31kk81"; depends=[ape deeptime dplyr ggimage gginnards ggplot2 ggplotify ggpp ggthemes ggtree phytools png reshape tibble tidyr tidytree treeio]; broken = true; }; Rhpc = derive2 { name="Rhpc"; version="0.21-247"; sha256="0r4zikqzkcyyvywxq1s8jcq6h559mxilkmzpnl79781hh537jvii"; depends=[]; broken = true; }; RichR = derive2 { name="RichR"; version="1.0.0"; sha256="0z0ri90jqdmw0vwxd1b4wr9if5cgm1gqpf6g9p1fdvncf4sdi9by"; depends=[magrittr metap plyr reshape2]; broken = true; }; RidgeFusion = derive2 { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; broken = true; }; Ridit = derive2 { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; broken = true; }; + Rlda = derive2 { name="Rlda"; version="0.2.6"; sha256="0i8n01h9072q339p1kiqhcpwphw0d2x6bsszbhgfqc2b160dk2bl"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; broken = true; }; Rmagic = derive2 { name="Rmagic"; version="2.0.3"; sha256="0g2f887v820rjyjzcahfrnjvif8iwbhnfnjpd4ib3d9lps69agx1"; depends=[ggplot2 Matrix reticulate]; broken = true; }; RmixmodCombi = derive2 { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rcpp Rmixmod]; broken = true; }; RobRSVD = derive2 { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; broken = true; }; @@ -19364,16 +19504,18 @@ in with self; { RoughSetKnowledgeReduction = derive2 { name="RoughSetKnowledgeReduction"; version="0.1"; sha256="0zn6y2rp78vay9zwijpzhjpyq1gmcsa13m9fcsxkd1p2c8g5rbmf"; depends=[]; broken = true; }; Rphylip = derive2 { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; broken = true; }; Rpvt = derive2 { name="Rpvt"; version="0.1.1"; sha256="0ggd6ikp2s9z4086y8w3qzb9jcyyqpby41p3ayjwam94skh154mf"; depends=[Rcpp RcppArmadillo Rdpack]; broken = true; }; - RsSimulx = derive2 { name="RsSimulx"; version="2.0.0"; sha256="11ji1fvf6rclzh8yw1d7d4zkfzsyw4jsfwyhxlx9j0kqyr0jz5bc"; depends=[ggplot2 gridExtra]; broken = true; }; RtutoR = derive2 { name="RtutoR"; version="1.2"; sha256="19wmi30b5i6zj673d76gxl6j0k3ppfyl5fqrcs0dwmmadrrvbajq"; depends=[colourpicker devtools dplyr DT FSelector ggplot2 ggthemes officer plotly rlang rmarkdown shiny shinyBS shinydashboard shinyjs tidyr]; broken = true; }; Runiversal = derive2 { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; broken = true; }; + Rvoterdistance = derive2 { name="Rvoterdistance"; version="1.1"; sha256="16il36hkq1j6gyl5d8bx5khiiv6fy2m8vkhwiaaiqsliw2sspy4j"; depends=[Rcpp]; broken = true; }; Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1.1"; sha256="0kaxhaa65k1hkhl4kqfxyyk6v967xncrdr5hy8b808zlbqriankc"; depends=[]; broken = true; }; + RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-5"; sha256="01n74xnhz1fdvb63g0lxkzsdp1frspin4a764l358immjivdrx2v"; depends=[coda lattice MASS MCMCpack mvtnorm]; broken = true; }; RxODE = derive2 { name="RxODE"; version="1.1.5"; sha256="055g910dwn3v64mqqaidxhk4n6kwfyq3qpvp1grppzz50a0sz2zj"; depends=[assertthat backports BH checkmate cli dparser ggplot2 inline lotri magrittr memoise PreciseSums qs Rcpp RcppArmadillo RcppEigen rex sitmo StanHeaders sys]; broken = true; }; S2sls = derive2 { name="S2sls"; version="0.1"; sha256="0qq1rff2cdgrm5rj69jxgrl71i0wmzyn424fdvcg02zdv9ggqhd3"; depends=[spanel]; broken = true; }; SAMURAI = derive2 { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; broken = true; }; SASPECT = derive2 { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; broken = true; }; SASxport = derive2 { name="SASxport"; version="1.7.0"; sha256="1na94lxrn8kbhxpiflg14nkdx13rjq9bvvqbxyxh1mq0q7vz7a2l"; depends=[Hmisc stringi]; broken = true; }; SAVE = derive2 { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; broken = true; }; + SBRect = derive2 { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; broken = true; }; SBSA = derive2 { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp RcppArmadillo]; broken = true; }; SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; broken = true; }; SCPME = derive2 { name="SCPME"; version="1.0"; sha256="0yhsaaa349wbrswcvp7w8c52wzp7rs3528rs4wqa8b3r3fh983mh"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; broken = true; }; @@ -19415,20 +19557,27 @@ in with self; { SampleSizeMeans = derive2 { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; broken = true; }; SampleSizeProportions = derive2 { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; broken = true; }; ScoreGGUM = derive2 { name="ScoreGGUM"; version="1.0"; sha256="0f7sjfr3a8b8y1n9lrwyiyyljls3rbz84d9s93psi2fnmjj0kvgw"; depends=[]; broken = true; }; + SelvarMix = derive2 { name="SelvarMix"; version="1.2.1"; sha256="02d16ffw5syq0d3yiim9jgrjlz99n956zxp23idpsmq6lb2whq66"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; broken = true; }; ShinyImage = derive2 { name="ShinyImage"; version="0.1.0"; sha256="0nhsaq6i9lr8gqpdkahw3qr0c0cb0qwc0nqpk1ism21l6zg6ahc9"; depends=[EBImage R6 shiny shinyjs]; broken = true; }; SimEvolEnzCons = derive2 { name="SimEvolEnzCons"; version="2.0.0"; sha256="0h3j8lp1s3zqb9qgy16gd0rdlbr2g1jqrc4a19zhmix2kygs5012"; depends=[ade4 RColorBrewer rgl scatterplot3d]; broken = true; }; 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; }; SmithWilsonYieldCurve = derive2 { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; broken = true; }; + SoDA = derive2 { name="SoDA"; version="1.0-6.1"; sha256="0d3jb1dsg1q06c08ldmhj0q2sb1pc0g08rfal29ddng3b4qm1lhh"; depends=[]; broken = true; }; SocialNetworks = derive2 { name="SocialNetworks"; version="1.1"; sha256="0d868xka6d35i17r28cvm0ya971xk6y1kycsfff0279w27cjd9x0"; depends=[Rcpp]; broken = true; }; SoftRandomForest = derive2 { name="SoftRandomForest"; version="0.1.0"; sha256="1k439hcp53yg6f2x4bgafsri4jjgpva97dphzsdk5icfs5d38bh8"; depends=[boot]; broken = true; }; SolveRationalMatrixEquation = derive2 { name="SolveRationalMatrixEquation"; version="0.1.0"; sha256="1m0b4sb247k6mlagvs4nj42ga9p48g9736lmhar7v1c5qhi7pw3v"; depends=[]; broken = true; }; - SourceSet = derive2 { name="SourceSet"; version="0.1.3"; sha256="159kg4pna24yihkghxc2k5f56dqk8aypxcmj1whgnajmgab29ry1"; depends=[gRbase gtools igraph plyr progress reshape2 scales]; broken = true; }; + SpNetPrep = derive2 { name="SpNetPrep"; version="1.2"; sha256="1jhjyrb0k5z21vn9bc444rxax3lxsyzyhggrcy7zl9ps7p4ra990"; depends=[leaflet maptools prodlim raster rgdal shiny shinythemes sp spatstat spatstat_core spatstat_geom spatstat_linnet]; broken = true; }; + SpaDES = derive2 { name="SpaDES"; version="2.0.9"; sha256="11acb05b957qwbii701y1b4lvcnvmiixkrlmqkccc8n9icqq107n"; depends=[quickPlot reproducible SpaDES_core SpaDES_tools]; broken = true; }; + SpaDES_addins = derive2 { name="SpaDES.addins"; version="0.1.4"; sha256="0ly411y95rcm30slaj02vn7clmyq3dvinzg1x40vbsqzcjjg1h6l"; depends=[magrittr miniUI reproducible rstudioapi shiny SpaDES_core stringi]; broken = true; }; + SpaDES_core = derive2 { name="SpaDES.core"; version="1.1.0"; sha256="0rmdwyk4733skf3mgi879lcg5hjiv72mf96yby3a0x9v2lzlzbv7"; depends=[crayon data_table fastdigest igraph lobstr qs quickPlot raster reproducible Require whisker]; broken = true; }; + SpaDES_tools = derive2 { name="SpaDES.tools"; version="1.0.0"; sha256="1p1mj9gfgikqng5p9yj01ykxnrqvxcgd6ghi7amgqlkhv9mbjwhi"; depends=[backports checkmate CircStats data_table fastmatch fpCompare magrittr quickPlot raster Rcpp Require rgeos sp]; broken = true; }; SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0.1"; sha256="0w2jxaz2kxfksyss5vy6xy499p8jg8lpqlykwgm2srp1fd2l3rs9"; depends=[Rcpp RcppArmadillo]; broken = true; }; SpatialBall = derive2 { name="SpatialBall"; version="0.1.0"; sha256="09iy1smfqnb0rd2s9a1wqgscb1plwcwwph6a8215l4zrs6svszv2"; depends=[dplyr ggplot2 hexbin lubridate RColorBrewer]; broken = true; }; SpatialEpiApp = derive2 { name="SpatialEpiApp"; version="0.3"; sha256="0svnnzqshk08s58ishy8xhqch44mb5svgfphkvpgysdd68dgaysr"; depends=[dplyr dygraphs ggplot2 htmlwidgets knitr leaflet mapproj maptools RColorBrewer rgdal rgeos rmarkdown shiny shinyjs SpatialEpi spdep xts]; broken = true; }; SpatialFloor = derive2 { name="SpatialFloor"; version="1.1.0"; sha256="07mwgcvkkq478l6wxvrdjs9d578x0kgs5xy86lgy5my0xqfcv6y8"; depends=[blocksdesign fields reshape2 taRifx]; broken = true; }; SpiceFP = derive2 { name="SpiceFP"; version="0.1.1"; sha256="080640q212lf1jwcrab9dcj26gazmvvxhjg797s1s5pnmax57m6n"; depends=[doParallel foreach genlasso Matrix purrr stringr tidyr]; broken = true; }; + Spillover = derive2 { name="Spillover"; version="0.1.0.2"; sha256="0a9gvr2p4xdd47k8vfjyq952svfxvfvqzp6bkbsjj0mdjvjq3kaj"; depends=[dplyr fastSOM ggplot2 tidyr vars zoo]; broken = true; }; SportsAnalytics = derive2 { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; broken = true; }; StVAR = derive2 { name="StVAR"; version="1.1"; sha256="0wz5f5i9927fs1s8yczwqs022k912220m28l1sv5f0r081iv656i"; depends=[ADGofTest matlab MCMCpack numDeriv]; broken = true; }; StandardizeText = derive2 { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; broken = true; }; @@ -19441,13 +19590,14 @@ in with self; { SunterSampling = derive2 { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; broken = true; }; 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]; broken = true; }; SurfaceReconstruction = derive2 { name="SurfaceReconstruction"; version="0.1.0"; sha256="0xgzr0hl6imgyq0ljyqipjkdjbyc0pz35z1k20b5gbz0b6rfz4c9"; depends=[BH Rcpp RcppCGAL RcppEigen rgl Rvcg]; broken = true; }; - SurvCorr = derive2 { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[fields 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; }; SurviMChd = derive2 { name="SurviMChd"; version="0.1.1"; sha256="1sj3i950nmam3r70as85kdx6nd88iidb5jpiz2a5a39i5lb7mgf7"; depends=[dplyr ICBayes icenReg R2jags Rdpack readr rjags rlang survival tidyverse]; broken = true; }; + SurvivalPath = derive2 { name="SurvivalPath"; version="1.3.2"; sha256="17glrkz63ms76cmg7lfz0nay131ngwxigwfs0rzgfjna9gy06dgi"; depends=[dplyr ggplot2 ggtree Hmisc rms survival survivalROC survminer treeio]; broken = true; }; SyNet = derive2 { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; broken = true; }; + SynthCast = derive2 { name="SynthCast"; version="0.2.1"; sha256="0gln7x1vlfdnr0qaqgagr93r484hv3dp65n24b3wl3p02msz9bgn"; depends=[dplyr forcats Synth tidyr]; broken = true; }; TBSSurvival = derive2 { name="TBSSurvival"; version="1.3"; sha256="1r87qvnlvc18i12yi25lfpdb8b5p33fywi38hs2xp1y2vbvz5s9b"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; broken = true; }; - TCIU = derive2 { name="TCIU"; version="1.2.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]; broken = true; }; + TCIU = derive2 { name="TCIU"; version="1.2.1"; sha256="1jk62c5s1nqg3aah04f8i9s52d8hqw5s1ckxj52p5bgkx55q83kw"; depends=[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]; broken = true; }; TDAmapper = derive2 { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; broken = true; }; TDD = derive2 { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[pracma RSEIS signal]; broken = true; }; TDMR = derive2 { name="TDMR"; version="2.2"; sha256="19ljgj5iy41m7rrawzkxkln7acydssk8zm05k3sfb483s8zygwiq"; depends=[adabag SPOT testit twiddler]; broken = true; }; @@ -19475,10 +19625,14 @@ in with self; { TargomoR = derive2 { name="TargomoR"; version="0.2.0"; sha256="0dzlqv8v36cm5b9hc9am4351nigknq7vr0mki9kzk2979c18if6b"; depends=[geojsonsf httr jsonlite leaflet magrittr sf tibble xml2]; broken = true; }; TauP_R = derive2 { name="TauP.R"; version="1.5"; sha256="02vk9rj8yx4n2pihgk93bs2f9wkpkyfqm2kp7ixj4wpa29a0iq6v"; depends=[]; broken = true; }; Thinknum = derive2 { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; broken = true; }; + ThreeArmedTrials = derive2 { name="ThreeArmedTrials"; version="1.0-3"; sha256="06jhgl1fzvkvnhrjs4xcyw6yymwl499rw9xnfwpx44dzxi7nynxj"; depends=[MASS numDeriv]; broken = true; }; TickExec = derive2 { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; broken = true; }; TiddlyWikiR = derive2 { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; broken = true; }; + TileManager = derive2 { name="TileManager"; version="0.4.1"; sha256="0pcskdqxxm07j47bw1j4d3jqf64pk0jqwcp5379hnpi6kr7f5gvh"; depends=[APfun raster rgeos sp XML]; broken = true; }; TimeProjection = derive2 { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate Matrix timeDate]; broken = true; }; TimeWarp = derive2 { name="TimeWarp"; version="1.0.15"; sha256="1v6f6d1h9dc8npdy0ph5hhc4jjkzh8kac48lz4ahgngi9n0xwql9"; depends=[]; broken = true; }; + ToxicR = derive2 { name="ToxicR"; version="22.8.1.0.3"; sha256="0sc7i3jzqhjwhcz83p7vgjmlpz4f27k0phbi2q5c8gxcnkzbffwp"; depends=[coda doBy dplyr forcats ggplot2 ggridges multcomp Rcpp RcppEigen RcppGSL scales shiny tidyverse]; broken = true; }; + TrafficBDE = derive2 { name="TrafficBDE"; version="0.1.1"; sha256="03cr1cmiygi0kq37zs8dnp1rd670yzd4z1wgj31ahnld1siqb30g"; depends=[caret data_table DescriptiveStats_OBeu dplyr lubridate RCurl zoo]; broken = true; }; TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; broken = true; }; Tsphere = derive2 { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; broken = true; }; TwoCop = derive2 { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; broken = true; }; @@ -19530,6 +19684,7 @@ in with self; { agsemisc = derive2 { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; broken = true; }; akmeans = derive2 { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; broken = true; }; alignfigR = derive2 { name="alignfigR"; version="0.1.1"; sha256="0jsj0h7zpzj6ynfydl8qbggm03xx8db769rli7rcx9909xdxabk6"; depends=[ggplot2]; broken = true; }; + allhomes = derive2 { name="allhomes"; version="0.3.0"; sha256="1z39qd7hkl2xy0lhf8sgc4rjf4ihi3zbsadchc97h7p7cn9mjbpk"; depends=[dplyr htmltab httr jsonlite magrittr purrr readr rlang stringr tibble tidyr]; broken = true; }; amber = derive2 { name="amber"; version="1.0.3"; sha256="0kc7g5rb0wrs1id1k0qay56063gpffwvcll38983b1l3k215mxiv"; depends=[classInt doParallel foreach Hmisc latex2exp ncdf4 raster rgdal rgeos scico sp viridis xtable]; broken = true; }; ambiorix = derive2 { name="ambiorix"; version="2.1.0"; sha256="1831i5fv966cghp5xgq71wqzldlajyjj2p4nkhbw007w2dcn0y21"; depends=[assertthat cli fs glue httpuv jsonlite log promises websocket]; broken = true; }; aml = derive2 { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; broken = true; }; @@ -19540,6 +19695,7 @@ in with self; { andrews = derive2 { name="andrews"; version="1.0"; sha256="130i86qkdy1xpcf611jpzqgmd17iik7j7spdcfwzk48f31biyp8v"; depends=[]; broken = true; }; anominate = derive2 { name="anominate"; version="0.6"; sha256="01p2qkqf88bzhwywyass5r8dwg2ycflmkbzmsps7fzy0kv3xyb02"; depends=[coda MCMCpack pscl wnominate]; broken = true; }; aof = derive2 { name="aof"; version="0.1.2"; sha256="0552i5wvm04dq8a8y1x36sprc9cbx6k7c3bmsgqxm71dpsxajb0i"; depends=[bcpa]; broken = true; }; + aphylo = derive2 { name="aphylo"; version="0.2-1"; sha256="0kvxz5r1z63610k127ji7dangrq7pd0zfgf5yqsvn0v7j4c9c5v5"; depends=[ape coda fmcmc MASS Matrix Rcpp xml2]; 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; }; @@ -19560,6 +19716,7 @@ in with self; { automultinomial = derive2 { name="automultinomial"; version="2.0.0"; sha256="04rjg3xjlhnkchzvdxqm762z5abm81s5b9czgzmli30zh07bf3fd"; depends=[igraph Matrix numDeriv]; broken = true; }; b6e6rl = derive2 { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; broken = true; }; bPeaks = derive2 { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; broken = true; }; + bRacatus = derive2 { name="bRacatus"; version="1.0.9"; sha256="0rwa452izd453nllirdvngcrf1inpc7njfhdlpwjvgsx9k3ri908"; depends=[data_table geojsonio jsonlite maptools plotfunctions raster rgbif rgdal rgeos rworldmap sp]; broken = true; }; babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; broken = true; }; badgecreatr = derive2 { name="badgecreatr"; version="0.2.0"; sha256="0mdixklaxky5gs8zm99ky280vxxlbq1mxnaarq6x0d1cb71bzv4l"; depends=[git2r]; broken = true; }; baggedcv = derive2 { name="baggedcv"; version="1.0"; sha256="1rqs4sm6g1anck5s2dxlm1vcmylpphcbs2dpvf1sjki5lrzdq9z4"; depends=[doParallel foreach kedd mclust]; broken = true; }; @@ -19596,7 +19753,6 @@ in with self; { bivquant = derive2 { name="bivquant"; version="0.1"; sha256="05dn4qik2dvmgqc2613vddh312bqhza1vnf94an75888gxri5h03"; depends=[copula cubature lpSolve MASS mvtnorm regpro]; broken = true; }; blaster = derive2 { name="blaster"; version="1.0.4"; sha256="0y2vdksmy1xngqvf7wxy5yf58830sm0bi82vn02yba1x6345ghjr"; depends=[Rcpp]; broken = true; }; blin = derive2 { name="blin"; version="0.0.1"; sha256="1h94azm7gli9i4v3li5c1p36p3rkcj2p5j6rqzlzf0pcqs0bsc09"; depends=[abind glmnet MASS Matrix mvtnorm]; broken = true; }; - blindrecalc = derive2 { name="blindrecalc"; version="0.1.3"; sha256="1kaia4mpwjh9p0m9jc694i2gy1hfqa3k04w17cnmwsfppgwq11ls"; depends=[Rcpp]; broken = true; }; blockRAR = derive2 { name="blockRAR"; version="1.0.2"; sha256="1d9izlcgz85kcz1sh11mcxq96qh0cwv6638jha851h2f4lnc8aa4"; depends=[arm dplyr ldbounds magrittr tibble]; broken = true; }; blockTools = derive2 { name="blockTools"; version="0.6-3"; sha256="0023p0msfmp8swq4f5aff40m976np7y051x8hjizzw91hrfa4w2n"; depends=[MASS tibble]; broken = true; }; blockcluster = derive2 { name="blockcluster"; version="4.5.1"; sha256="1f152m3fv0aaw2csgqvf1y231f5rjhwrkn69yyx9yb3ff65z49d8"; depends=[Rcpp rtkore]; broken = true; }; @@ -19605,6 +19761,7 @@ in with self; { bmeta = derive2 { name="bmeta"; version="0.1.2"; sha256="19pm60xpmlanngq4nbibp0n5m98xw24b2xghz92ly31i3mkg2n68"; depends=[forestplot R2jags]; broken = true; }; bmk = derive2 { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda functional plyr]; broken = true; }; bmmix = derive2 { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; broken = true; }; + bmotif = derive2 { name="bmotif"; version="2.0.2"; sha256="1zy153z7kasfivj0mvrkyn96s0sgdp34w4pdjpcvfnym3lr02f0m"; depends=[gtools Rcpp reshape2 tensor]; broken = true; }; bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; broken = true; }; bnpmr = derive2 { name="bnpmr"; version="1.2"; sha256="0vpqhs1h2mphn9w5yngb7lxvmzrhn7mkj7ca6hykhhg48s2ra98g"; depends=[]; broken = true; }; boomer = derive2 { name="boomer"; version="0.1.1"; sha256="16gwdvcp8bz5bgmvxsvc9iyz2a6mpwf5vgilc1lhf9l4n0l1m685"; depends=[crayon pryr rlang rstudioapi styler withr]; broken = true; }; @@ -19619,6 +19776,7 @@ in with self; { broomExtra = derive2 { name="broomExtra"; version="4.3.2"; sha256="02ijhqgymm8nv40fy4j6psqkhak3dfwz8i5k0ay3g7aic49lzcbf"; depends=[broom broom_mixed dplyr magrittr parameters performance rlang]; broken = true; }; bsem = derive2 { name="bsem"; version="1.0.0"; sha256="1h4wsib6ppqj8nbvj4pzkm04bzrdkg9l7xfmzzmld9cswai4iw52"; depends=[BH coda DiagrammeR lattice magrittr Rcpp RcppEigen rstan rstantools shiny StanHeaders viridis visNetwork]; broken = true; }; bvenn = derive2 { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; broken = true; }; + cRegulome = derive2 { name="cRegulome"; version="0.3.2"; sha256="0cvxad73l85zsgqmis5p24v71kkzi784b8v5z07f0dh9yp41p96q"; depends=[DBI ggplot2 ggridges httr igraph R_utils RSQLite UpSetR VennDiagram]; broken = true; }; 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; }; capwire = derive2 { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; broken = true; }; @@ -19626,14 +19784,14 @@ in with self; { cartools = derive2 { name="cartools"; version="0.1.0"; sha256="0gc5502373f0c2m2rh6awvyfqrg1wx1f341dm2byk9znba887lgs"; depends=[animation devtools dplyr gapminder ggplot2 knitr rlist rmarkdown roxygen2 sde shiny tidyverse usethis]; broken = true; }; carx = derive2 { name="carx"; version="0.7.1"; sha256="1qyqsj6pfzzqyaj6076zvgcimhl4cll6sxfb6aigm02rwfkq5gvh"; depends=[matrixStats mvtnorm nlme tmvtnorm xts zoo]; broken = true; }; cascadess = derive2 { name="cascadess"; version="0.1.0"; sha256="105m5w8rb8bkzmlc5nwb4g0wl8jgvz63jxq665x4jfq0z78qiwgd"; depends=[crayon htmltools magrittr rlang]; broken = true; }; - caschrono = derive2 { name="caschrono"; version="2.2"; sha256="0lbf7j6p5gzm4kk8sgzcmxwwzg59wp6g6l38m04609lpcsvxkd52"; depends=[Hmisc zoo]; broken = true; }; casen = derive2 { name="casen"; version="0.2.0"; sha256="05pn8raqlqdvqx61p2z4kv0ds0444dqzy9l3dacigiq88rz7s8nb"; depends=[dplyr glue haven labelled magrittr purrr rlang srvyr survey tidyr]; broken = true; }; cat_dt = derive2 { name="cat.dt"; version="0.3.1"; sha256="0qr3azaxs339kfiiyzasc46xz4rb37prdwvdmv0c40cvba6zvapf"; depends=[ggplot2 Matrix Rglpk]; broken = true; }; catSplit = derive2 { name="catSplit"; version="0.1.0"; sha256="0nifbwczfs5g9xxlmqfwvcaxd940k5xmbdmamwlhvgif7myi6xr4"; depends=[caret data_table dplyr farff OpenML rpart stringr]; broken = true; }; catchr = derive2 { name="catchr"; version="0.2.31"; sha256="0mj3cgv2d217hcmyr8x0i83wysxhixgly5y1fs6jb1x09gs1cwnd"; depends=[purrr rlang]; broken = true; }; + catenary = derive2 { name="catenary"; version="1.1.2"; sha256="1n64kq3lkaf00a2mghs67hnxvi4dp6g12pwifyx0bd418wkw9wf3"; depends=[boot broom dplyr ggplot2 tidyverse]; broken = true; }; + catnet = derive2 { name="catnet"; version="1.15.7"; sha256="015qh9k0jj5plp777j3kl20601qiwadkaqrdb0483h3gwqwy828g"; depends=[]; broken = true; }; catspec = derive2 { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; broken = true; }; causalCmprsk = derive2 { name="causalCmprsk"; version="1.0.3"; sha256="0s1jshh30jmkk2cx29dfhibmfzbpaqk7i0f8wayb204r73a58f8a"; depends=[data_table doParallel foreach inline purrr survival]; broken = true; }; - caviarpd = derive2 { name="caviarpd"; version="0.2.28"; sha256="08j739b0dmq6s8gjhzrjrhf5ni4fyygamjsyylrdq6cj6xkgb2m0"; depends=[]; broken = true; }; cbar = derive2 { name="cbar"; version="0.1.3"; sha256="1jy52qnpjvszdd8xviv3vr00ds6bah73q0mhd4kixf68jafnxd35"; depends=[Boom bsts dplyr ggplot2 magrittr]; broken = true; }; cbird = derive2 { name="cbird"; version="1.0"; sha256="0kzylylk46swd7f0j6kjyrcs3plbx9799q9kb8hjxmgh0qcjk2p6"; depends=[]; broken = true; }; cblasr = derive2 { name="cblasr"; version="1.0.0"; sha256="1bz8d4124qpja4bvzn6k1swi89cfyrcpwg2nwyj4r8y0m1hbpc71"; depends=[Rcpp]; broken = true; }; @@ -19643,18 +19801,24 @@ in with self; { cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; broken = true; }; cec2013 = derive2 { name="cec2013"; version="0.1-5"; sha256="07i2vp1x3qaw5di5vr5z70d47hh9174pjckjlhgv0f2w97slwc1i"; depends=[]; broken = true; }; cecs = derive2 { name="cecs"; version="0.2.4"; sha256="1fm1yrb8kd7f97kgsp5wfp02fspzvndki2aqsfcwb0rlrlckflzf"; depends=[cec2013 stringr]; broken = true; }; + ced = derive2 { name="ced"; version="1.0.1"; sha256="0xrf3y1cr4dylhh2xr1gggnwdwn7riz37g6yw55hyryg03hxkms6"; depends=[Rcpp]; broken = true; }; cenROC = derive2 { name="cenROC"; version="1.2.0"; sha256="07ja3yyqmb9cs76if32aksgcwki3y6nh13lvn9j0bdgbgqx65f3r"; depends=[condSURV icenReg Rcpp RcppEigen survival]; broken = true; }; censNID = derive2 { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; broken = true; }; cernn = derive2 { name="cernn"; version="0.1"; sha256="0gz2x20pgsiq85hwkkpg4s1cdlw9plygx0446djc7qsymp469p2w"; depends=[]; broken = true; }; cgdsr = derive2 { name="cgdsr"; version="1.3.0"; sha256="07yc819hkabpzzh0g0cbqza6bcfy67b2marrzz1lj97f9iba78ja"; depends=[httr R_methodsS3 R_oo]; broken = true; }; + cgraph = derive2 { name="cgraph"; version="6.0.1"; sha256="0hmp07iz7ya3j8jaghm4pa0b84lsinc48rsibbh47sd3i6pkxfik"; depends=[]; broken = true; }; changedetection = derive2 { name="changedetection"; version="0.2.0"; sha256="0j8x7qyna7qgjhx56yxav1g3wj3r47zvx2hivybsjis2gqbl82hr"; depends=[glmnet L1pack Rdpack]; broken = true; }; changepoint_mv = derive2 { name="changepoint.mv"; version="1.0.2"; sha256="0bji0m4ks2lf9s1rnq58w97ywpgs3m9rpm5p5f70f0kn33yffrix"; depends=[assertive ggplot2 Rcpp Rdpack reshape2 tbart zoo]; broken = true; }; cheatR = derive2 { name="cheatR"; version="1.2.1"; sha256="0ph7bw2b3frmq6z7qb99pds8j81dbx0bxkbhb55mczqa7n0k50hy"; depends=[ngram purrr R_utils textreadr]; broken = true; }; cheb = derive2 { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; broken = true; }; chebpol = derive2 { name="chebpol"; version="2.1-2"; sha256="126cgqnl9jy332q0ywg9dr11d4q1aichwwakb1xcrxrqw2j26zzi"; depends=[geometry]; broken = true; }; + cheem = derive2 { name="cheem"; version="0.2.0"; sha256="0l8mbhl8jhwsikhy2nakdp21zz9k71fanhznjcqlpy7m7aqagp7i"; depends=[data_table DT ggplot2 magrittr plotly Rcpp shiny shinycssloaders shinythemes spinifex]; broken = true; }; + chessR = derive2 { name="chessR"; version="1.5.2"; sha256="1czv5y4ybbi15b87959vri25fy31yv2l2cdd5q6p9fw291kj1qnp"; depends=[curl dplyr httr jsonlite lubridate magrittr purrr rlang rvest stringr tidyr xml2]; broken = true; }; chi2x3way = derive2 { name="chi2x3way"; version="1.1"; sha256="13qc8sigiw4gcxk8y50q7yfgzbssjyl41fizzjqzcp3p14kpsmzw"; depends=[]; broken = true; }; + chickn = derive2 { name="chickn"; version="1.2.3"; sha256="1d3xl2pigan6vb29nk2ks04dsl5vy16cv9z7miskmhcqcx2wm1qb"; depends=[bigstatsr doParallel doRNG foreach MASS mvnfast nloptr pracma Rcpp RcppArmadillo RcppParallel Rdpack rmio zipfR]; broken = true; }; childhoodmortality = derive2 { name="childhoodmortality"; version="0.3.0"; sha256="1ixd10jyzgr1ssnjas35kngpsqyjzl73wwpvcspv06cn12sv2b8d"; depends=[dplyr matrixStats plyr]; broken = true; }; chorrrds = derive2 { name="chorrrds"; version="0.1.9.5"; sha256="045m3hqfk63zlb44s07wflaawzn030fg0nqck4w852m52a0r1z5v"; depends=[dplyr forcats magrittr purrr rlang rvest stringr xml2]; broken = true; }; + chromatographR = derive2 { name="chromatographR"; version="0.4.4"; sha256="15m74ijyh7dw4g2yigw4nf0gwbx7qlqb05pd2kzxbjckyhd449nb"; depends=[chromConverter dynamicTreeCut fastcluster lattice minpack_lm ptw pvclust scales smoother]; 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; }; citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; broken = true; }; @@ -19665,11 +19829,12 @@ in with self; { cleanr = derive2 { name="cleanr"; version="1.3.5"; sha256="0hi1ykg7z0mai5hs4vqri45llwnjnc5gfxrzfcv6yv2s4c2hwq2w"; depends=[checkmate fritools pkgload rprojroot]; broken = true; }; clere = derive2 { name="clere"; version="1.2.0"; sha256="0qc26ycycxphrbksk7jb1m6vh66a2zsnw8k4jnazs23sqdg24im9"; depends=[Rcpp RcppEigen]; broken = true; }; climate = derive2 { name="climate"; version="1.0.5"; sha256="17hfxav8j0zyyl1839sj7nysv08j5z7xwz3p42di16cyx57czm4w"; depends=[curl data_table httr XML]; broken = true; }; + climetrics = derive2 { name="climetrics"; version="1.0-5"; sha256="0jy6npilv21hm0cwv5dmxwbz1x5lw75a14n9nbp743864z6jrz30"; depends=[raster rts sp terra xts yaImpute zoo]; broken = true; }; clinUtiDNA = derive2 { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; broken = true; }; clpAPI = derive2 { name="clpAPI"; version="1.3.1"; sha256="0hjpdbmwaww5fznqkkg9jli5y8f8zyd7crn0imdb0xxypmnp7zgf"; depends=[]; broken = true; }; - clustAnalytics = derive2 { name="clustAnalytics"; version="0.5.0"; sha256="0c4cfxj5vb0l519b2llq9snzvqcilf48nlvm3zn2d7bpabwnfrs3"; depends=[boot dplyr fossil igraph kdtools mcclust mclust Rcpp Rdpack truncnorm]; broken = true; }; clusterGenomics = derive2 { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; broken = true; }; clustsig = derive2 { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; broken = true; }; + coala = derive2 { name="coala"; version="0.7.0"; sha256="00rwjdl3nscrl7ldb9j5l12xhjg1fi8li5l9xyx9gw28ixkznl6a"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; broken = true; }; codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; broken = true; }; coexist = derive2 { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; broken = true; }; collectArgs = derive2 { name="collectArgs"; version="0.4.0"; sha256="0fz5w1xsxiddzrwahrg50px4igyhd4plq655jaix6grancs7kvix"; depends=[magrittr]; broken = true; }; @@ -19680,11 +19845,13 @@ in with self; { compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; broken = true; }; compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; broken = true; }; 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; }; + conText = derive2 { name="conText"; version="1.1.0"; sha256="04zqahx01rqpa6wm4krnr7vfafcxgqblrd911qw7pfwvmjl2w92s"; depends=[dplyr fastDummies ggplot2 Matrix quanteda reshape2 stringr text2vec tidyr]; broken = true; }; concurve = derive2 { name="concurve"; version="2.7.7"; sha256="185jwz7a33sc9gbkfbcxwzgzd39xn5x72d0nk6p045mq3xssk3j9"; depends=[bcaboot boot colorspace dplyr flextable ggplot2 knitr metafor officer pbmcapply ProfileLikelihood scales survival survminer tibble tidyr]; broken = true; }; + condSURV = derive2 { name="condSURV"; version="2.0.2"; sha256="1zw79rll44dx5vysfixfp684gf8c3c37xazwgrfzjbq54i3jwmir"; depends=[doParallel doRNG foreach KernSmooth np survival]; broken = true; }; conics = derive2 { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; broken = true; }; connections = derive2 { name="connections"; version="0.1.1"; sha256="08fbyzyp26nh1a46p0zi3q0wzgl0cd9bjp4lhw2bwv1bv7yayamp"; depends=[DBI dbplyr dplyr pins rscontract uuid]; broken = true; }; constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; broken = true; }; - container = derive2 { name="container"; version="1.0.2"; sha256="0hrykh0q5f9j6ryikgr7zagavd8v62gvaiyglhrqxz18wqs30b3b"; depends=[data_table R6]; broken = true; }; + contact = derive2 { name="contact"; version="1.2.8"; sha256="1db3vgjlz0ivw3sx37mwy7ngjx0in3rxlm3i3akh4xzbfp9gjj87"; depends=[ape data_table doParallel foreach igraph lubridate raster rgdal rgeos sp]; broken = true; }; contextual = derive2 { name="contextual"; version="0.9.8.4"; sha256="0lww36nymg2cla83jdvl7a42cwn0il20apciz0ddplq8rw2i0a91"; depends=[data_table doParallel foreach Formula iterators itertools R_devices R6 rjson]; broken = true; }; conting = derive2 { name="conting"; version="1.7"; sha256="08f271j3gxcp4shda08kkv0v9ayaadvxgcglfsn6hjmw4hn298zg"; depends=[BMS coda gtools mvtnorm tseries]; broken = true; }; convergEU = derive2 { name="convergEU"; version="0.5.1"; sha256="1s42ki2shn3nd902gxbbmjch64iaq3iy3c592nq54w5jq5xd43f7"; depends=[broom caTools dplyr eurostat ggplot2 ggpubr purrr rlang rmarkdown stringr tibble tidyr]; broken = true; }; @@ -19702,6 +19869,7 @@ in with self; { cplexAPI = derive2 { name="cplexAPI"; version="1.4.0"; sha256="00h2zir1ffzjiglfyq8bsfmgq9z155jr0k0fxv8fsbfyw2x9dg10"; depends=[]; broken = true; }; cptec = derive2 { name="cptec"; version="0.1.1"; sha256="12y79r56zlm3d9z7886qc625x8c206vg3hmjxpvh3j2fapy287qc"; depends=[magrittr rvest xml2]; broken = true; }; crantastic = derive2 { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; broken = true; }; + crimelinkage = derive2 { name="crimelinkage"; version="0.0.4"; sha256="1zzk50kyccvnp51vzp28c9yi23hsp25arrgdn88lwfwa0m43rlar"; depends=[geosphere igraph]; broken = true; }; crn = derive2 { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; broken = true; }; crossReg = derive2 { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; broken = true; }; crossmatch = derive2 { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[nbpMatching survival]; broken = true; }; @@ -19711,6 +19879,7 @@ in with self; { csabounds = derive2 { name="csabounds"; version="1.0.0"; sha256="15l7i15w5jk4h3148dlk8v2i4awns5vxvv6m59qcv0hzns6jhx9j"; depends=[BMisc ggplot2 pbapply progress qte]; broken = true; }; csrplus = derive2 { name="csrplus"; version="1.03-0"; sha256="0kljndmiwblsvvdnxfywida9k0dmdwjq63d934l5yl6z7k4zd0xa"; depends=[sp]; broken = true; }; cstar = derive2 { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; broken = true; }; + cthist = derive2 { name="cthist"; version="1.2.1"; sha256="1v377i3d26m6arl04iqqvj2ghc0bhns8nrgvk677gkki34ndbcz5"; depends=[assertthat dplyr httr jsonlite magrittr polite RCurl readr rlang rvest selectr stringr tibble]; broken = true; }; cuml = derive2 { name="cuml"; version="0.2.1"; sha256="1dmk1gvvzkwfra63qslax9cgqjbsiqam5wcjl955wpb0wdqpa54k"; depends=[ellipsis hardhat magrittr parsnip Rcpp rlang]; broken = true; }; customsteps = derive2 { name="customsteps"; version="0.7.1.0"; sha256="1v6ks8j1mj623yai515xnrpx60hvilbrsn59r3zw30n68555cvw8"; depends=[dplyr generics magrittr purrr recipes rlang tibble tidyselect]; broken = true; }; cutoffR = derive2 { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; broken = true; }; @@ -19721,6 +19890,7 @@ in with self; { cwm = derive2 { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; broken = true; }; cyphid = derive2 { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; broken = true; }; cytoDiv = derive2 { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; broken = true; }; + daff = derive2 { name="daff"; version="0.3.5"; sha256="00zcdf215m7p3xm9yv571v09znhdqacxg69hb5b5j749mp4wdsyj"; depends=[jsonlite V8]; broken = true; }; darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; broken = true; }; dash = derive2 { name="dash"; version="0.9.4"; sha256="1ggdfzlf7ayv2nc6qpmyrg3cx31cikhnv7smwpx6xlmj2sc75war"; depends=[assertthat base64enc brotli crayon digest fiery glue htmltools jsonlite magrittr mime plotly R6 reqres rlang routr]; broken = true; }; dashboard = derive2 { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; broken = true; }; @@ -19730,9 +19900,9 @@ in with self; { 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; }; dbEmpLikeGOF = derive2 { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; broken = true; }; dbEmpLikeNorm = derive2 { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; broken = true; }; + dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; broken = true; }; dccvalidator = derive2 { name="dccvalidator"; version="0.3.0"; sha256="1l74pqvac0n7dyfzkz2m0m6j19c8icymbwcifp2g5qvrpznfhxjb"; depends=[config ggplot2 glue golem htmltools knitr markdown purrr reactable readr readxl reticulate rlang shiny shinyBS shinydashboard shinyjs skimr tibble visdat]; broken = true; }; dcminfo = derive2 { name="dcminfo"; version="0.1.7"; sha256="03r0ynzc5cck2rz20zbg5zx8v6s66ivizqav1pjkyvp6kxkmnf8q"; depends=[CDM]; broken = true; }; - 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; }; deGradInfer = derive2 { name="deGradInfer"; version="1.0.1"; sha256="0yczn63fhpirvz1g1kq9q0m04sisflxxgxy70c87jyvrw12nfwss"; depends=[deSolve gdata gptk]; broken = true; }; deamer = derive2 { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; broken = true; }; @@ -19754,6 +19924,7 @@ in with self; { diffman = derive2 { name="diffman"; version="0.1.1"; sha256="08b4kqxfg8pmyl2xg8flb581s9wnkdcy5rrmrxp8a89y265qmirx"; depends=[data_table dplyr igraph Matrix progress Rcpp sf tidyverse]; broken = true; }; dils = derive2 { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp]; broken = true; }; disastr_api = derive2 { name="disastr.api"; version="1.0.5"; sha256="1h5i6pwak16w0gdk8qjz4w9qpffjhzlsrvjkb4acrvgjgrsvz9kp"; depends=[httr jsonlite]; broken = true; }; + discgolf = derive2 { name="discgolf"; version="0.2.0"; sha256="07clh1awnibgrh7vl4a51r8dbya2rbmicm8v8x8mq8h8am2b3j0s"; depends=[crul jsonlite xml2]; broken = true; }; disco = derive2 { name="disco"; version="0.6"; sha256="1abvhf0yb4mw02j1krjb7q68jpwdnl2narcalf3vkjcbflcp76z3"; depends=[ggplot2 RColorBrewer tmod]; broken = true; }; discreteMTP = derive2 { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; broken = true; }; diseasemapping = derive2 { name="diseasemapping"; version="1.5.1"; sha256="0pqilkl56753j1fxy6mh7nx24n6qg2j5faxyxj6abcm6xrnkhmy9"; depends=[rgeos sp]; broken = true; }; @@ -19761,7 +19932,6 @@ in with self; { dissUtils = derive2 { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; broken = true; }; distr6 = derive2 { name="distr6"; version="1.6.9"; sha256="1vl8xg0r0g169xdx6prnfpfr1jnn8mc4daayrzpws4my2dc59dqh"; depends=[checkmate data_table ooplah param6 R6 Rcpp set6]; broken = true; }; distribglm = derive2 { name="distribglm"; version="0.4.1"; sha256="09gpkp7s8y2dcpjhqgi2nl6j8pmd500y89d8c8x8sxmh5mg8n5si"; depends=[readr]; broken = true; }; - dlm = derive2 { name="dlm"; version="1.1-5"; sha256="1aksm66sfa7ipl5xgs4j5giac7q2m744wjl40mva56xn6i674h4r"; depends=[]; broken = true; }; dmacs = derive2 { name="dmacs"; version="0.1.0"; sha256="1prw6h8sj6fcpajg6xwqhi8v5jfl74mbjdjrdy524miw56fh9h0r"; depends=[lavaan MplusAutomation]; broken = true; }; dmt = derive2 { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; broken = true; }; dna = derive2 { name="dna"; version="2.1-2"; sha256="0l7i9640yd25cbxd3vbmlsqgk3pi2f7v6g5q0lrgycxl7jla9v1k"; depends=[]; broken = true; }; @@ -19776,7 +19946,9 @@ in with self; { dplyr_teradata = derive2 { name="dplyr.teradata"; version="0.4.1"; sha256="0ygn8cq4dnmzzxfskcir7g0bksgby5sw2j135gvrk599z3v6avg1"; depends=[bit64 DBI dbplyr dplyr odbc]; broken = true; }; drmdel = derive2 { name="drmdel"; version="1.3.2"; sha256="1772fxm3qs01h14qklp2rawcdm0vmjmb2mi62v1zl1hbxisnfq4s"; depends=[]; broken = true; }; dropR = derive2 { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; broken = true; }; + dsample = derive2 { name="dsample"; version="0.91.2.2"; sha256="18c0zxaqwgbn9kmkwlnicwd74ljy2sxj0b9ksif13pdlj3zn57h1"; depends=[MASS]; broken = true; }; dtree = derive2 { name="dtree"; version="0.4.2"; sha256="1cpv0pyf515610djxzfw1c83p3alk5a93clg4x9gk7a7qy4cyhr1"; depends=[caret evtree party partykit rpart]; broken = true; }; + dual_spls = derive2 { name="dual.spls"; version="0.1.2"; sha256="0cy3l715bf8l6yx5sdqmz9v5an3jr0zqhc99hzqv8iyzrdrd8hwd"; depends=[pdist]; broken = true; }; dummies = derive2 { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; broken = true; }; dupiR = derive2 { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; broken = true; }; durmod = derive2 { name="durmod"; version="1.1-4"; sha256="0d721sbxjfh00gpxd4hj8iq04awfd0pcd6bw8cv7kny21l2f3w44"; depends=[data_table mvtnorm nloptr numDeriv Rcpp]; broken = true; }; @@ -19786,6 +19958,7 @@ in with self; { ebSNP = derive2 { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; broken = true; }; ebmstate = derive2 { name="ebmstate"; version="0.1.3"; sha256="04pg9yqbjrq10ai13c8zm8sy7spnf96ldbbql7qysjl91ljgrqz6"; depends=[HDInterval mstate Rcpp survival]; broken = true; }; ecap = derive2 { name="ecap"; version="0.1.2"; sha256="0d260y4phh1a7zlj2lgvdf7xd2z14l9djv7nrwa84pwqqyijc7rl"; depends=[ggplot2 quadprog]; broken = true; }; + ecb = derive2 { name="ecb"; version="0.4.0"; sha256="0hn1d1hxilwxxmxzzpdcj81d4vy8fbjk1z09kw7j0b2p04wrdlkc"; depends=[curl httr rsdmx xml2]; broken = true; }; ecce = derive2 { name="ecce"; version="1.0.9"; sha256="071ahimmwc1bgcwli4c40h7drdg5ldhh0w1ldzxkjc78qyw8s23d"; depends=[purrr RCurl rjson stringr]; broken = true; }; edbuildr = derive2 { name="edbuildr"; version="0.3.0"; sha256="19fsk8qkxyzncn614fy6hmmxpv1dikqghs101hbzd0g0a511xk8f"; depends=[dplyr magrittr openxlsx scales stringr tidyselect]; broken = true; }; edcc = derive2 { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; broken = true; }; @@ -19802,7 +19975,6 @@ in with self; { eigenprcomp = derive2 { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; broken = true; }; elasticIsing = derive2 { name="elasticIsing"; version="0.2"; sha256="1zjgvz7w5j06x2cd1fzjl85di95ah67m1lanw01kic2bvhfwfbn6"; depends=[cvTools glmnet magrittr qgraph reshape2]; broken = true; }; elec_strat = derive2 { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; broken = true; }; - elections_dtree = derive2 { name="elections.dtree"; version="1.0.0"; sha256="02maspca7cw606fqly92gpxjzl6pzjmicmqin06g8xbfk1l6ryjn"; depends=[R6 Rcpp RcppThread Rdpack testthat]; broken = true; }; emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; broken = true; }; emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; broken = true; }; empiricalFDR_DESeq2 = derive2 { name="empiricalFDR.DESeq2"; version="1.0.3"; sha256="0h2mcdw4v3ac6dn0s4z37l4sdzbi12sxrnn0f0gc9z207dyyf6w3"; depends=[DESeq2 GenomicRanges]; broken = true; }; @@ -19822,6 +19994,8 @@ in with self; { erboost = derive2 { name="erboost"; version="1.3"; sha256="09hlpn6mqsmxfrrf7j3iy8ibb2lc4aw7rxy21g3pgqdmd9sbprim"; depends=[lattice]; broken = true; }; ergm_multi = derive2 { name="ergm.multi"; version="0.1.1"; sha256="17zlry93pwjc5pqdg1840i67j3vzm2j3bvss4chpmz66v9jk3faj"; depends=[ergm glue Matrix network purrr Rdpack rlang rle statnet_common tibble]; broken = true; }; ergm_userterms = derive2 { name="ergm.userterms"; version="3.10.0"; sha256="1aqrgdayh73dkr71gf8vawlj6qgv66pxr4klxgqb6ffan66b5p8g"; depends=[ergm network statnet_common]; broken = true; }; + ergmclust = derive2 { name="ergmclust"; version="1.0.0"; sha256="18vx02vr2wi0gw09g4hxb8glf38y06v4a0c6q666qv8bgcb0pgkw"; depends=[igraph lda MASS quadprog Rcpp RcppArmadillo viridis]; broken = true; }; + ergmito = derive2 { name="ergmito"; version="0.3-0"; sha256="0ajfx8g31p0lf0ajrgssb9lkhs1bxkz19z3q99l500znlivc2fy2"; depends=[ergm MASS network Rcpp RcppArmadillo texreg]; broken = true; }; erpR = derive2 { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; broken = true; }; erratum = derive2 { name="erratum"; version="2.2.0"; sha256="0id03wm8knll548ydwv3cpn282xvw05vyaih8jy6nlmlis18wybf"; depends=[R6 rlang]; broken = true; }; errorizer = derive2 { name="errorizer"; version="0.2.1"; sha256="10p7ydm81x2gls0wn692llgj2rxhg4s96rv7gvihmgi5dflraypq"; depends=[]; broken = true; }; @@ -19830,12 +20004,14 @@ in with self; { 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; }; evdbayes = derive2 { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; broken = true; }; eventstudies = derive2 { name="eventstudies"; version="1.2.2"; sha256="01vpd0gnxaibxn3nq6618rxlwapm86idz86n0wj5kfz4a9kj7lsx"; depends=[boot sandwich testthat xts zoo]; broken = true; }; + evolqg = derive2 { name="evolqg"; version="0.2-9"; sha256="1y1pq2hdilqkj6hk02km9aaaynz1calcw00r5k1rxlc4wfq1wx70"; depends=[ape coda expm ggplot2 igraph Matrix MCMCpack mvtnorm plyr Rcpp RcppArmadillo reshape2 vegan]; broken = true; }; evt0 = derive2 { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; broken = true; }; exactLoglinTest = derive2 { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; broken = true; }; exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; broken = true; }; excerptr = derive2 { name="excerptr"; version="2.0.1"; sha256="0lmcxlpxvldxwqxrprqq39hk5f770ii1x38jm2jbs4n75smp4m21"; depends=[checkmate reticulate]; broken = true; }; exdqlm = derive2 { name="exdqlm"; version="0.1.2"; sha256="0wkiihdvgf7lyzv02l10spxcn127w1jblz6fbr7yf16mfq0m9mlk"; depends=[brms coda crch dlm FNN GeneralizedHyperbolic HyperbolicDist LaplacesDemon magic tictoc truncnorm]; broken = true; }; exoplanets = derive2 { name="exoplanets"; version="0.2.2"; sha256="0jzqzw0sn2cixxl6wdikz6cmm2qijxcjp81c98dfqamjcnbpqc1f"; depends=[cli httr memoise readr tibble]; broken = true; }; + exp2flux = derive2 { name="exp2flux"; version="0.1"; sha256="1b3ychb4wcf6dbccx2ddms5xygdgc296cnw4474fm81yrfjznplv"; depends=[gage igraph sybil]; broken = true; }; 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; }; expose = derive2 { name="expose"; version="0.0.3"; sha256="0dlxlxm3g9d8vmgp13i1825z1jzah94ih1vyif46s43xq0nf9anj"; depends=[e1071 foreach gam ggplot2 glmnet Matrix nnet polspline RColorBrewer Rcpp repmis SuperLearner xgboost]; broken = true; }; @@ -19854,6 +20030,7 @@ in with self; { fExoticOptions = derive2 { name="fExoticOptions"; version="3042.80"; sha256="1b3y7j5ywic6xhsj2afq6y5f5l0npgav854rb87938rjckz95d4h"; depends=[fBasics fOptions timeDate timeSeries]; broken = true; }; fExpressCertificates = derive2 { name="fExpressCertificates"; version="1.3"; sha256="0dcfwl0ib87p748hvwscm5ii9fhfarqfl3zqxa8kin2n0hrvkdb6"; depends=[fCertificates fExoticOptions fOptions Matrix mvtnorm tmvtnorm]; broken = true; }; fOptions = derive2 { name="fOptions"; version="3042.86"; sha256="1cqyggb1hb7z0gfgkziynz7nm85z0fn3bvz1iwpy49yy8ll7rfzr"; depends=[fBasics timeDate timeSeries]; broken = true; }; + fabisearch = derive2 { name="fabisearch"; version="0.0.4.4"; sha256="02xpndws34wh6kfk677kmpnhhxyxnwpg6asdfdn3wr44rcr7zk2v"; depends=[doParallel doRNG foreach NMF pkgmaker reshape2 rgl]; broken = true; }; facilitation = derive2 { name="facilitation"; version="0.5.2"; sha256="0gyqa3njyynvdhfziq33xqc7cjhszii67mk8809ncvh6abkdx1hw"; depends=[animation Matrix Rcpp]; broken = true; }; factorEx = derive2 { name="factorEx"; version="1.0.1"; sha256="03dgxxykxgq63cgan5gy5vz4hnwqmg48z2wdv8f69mk9452mg9m2"; depends=[arm doParallel estimatr foreach genlasso igraph mvtnorm pbapply pbmcapply prodlim sandwich stringr]; broken = true; }; factorMerger = derive2 { name="factorMerger"; version="0.4.0"; sha256="127k5h1gbbnjr6gxgck2n9glvvwkd69xq7n6gzmrq8gszk8v1x5m"; depends=[agricolae colorRamps dplyr forcats formula_tools ggplot2 ggpubr knitr magrittr MASS mvtnorm proxy reshape2 scales survival]; broken = true; }; @@ -19866,12 +20043,14 @@ in with self; { fam2r = derive2 { name="fam2r"; version="1.2"; sha256="0pq5cmzwk3s8cz5x8dsfb2d6qfpapkrwbzvkqmqkhcwhwryy40mm"; depends=[Familias paramlink]; broken = true; }; fasi = derive2 { name="fasi"; version="1.0.0"; sha256="1hfd6nl8zvn7sybji8s1pa2wl95l2vqa07rv96yn9rk07qvdc6dy"; depends=[fastAdaboost gam naivebayes]; broken = true; }; fastAdaboost = derive2 { name="fastAdaboost"; version="1.0.0"; sha256="1pv1y6znvc37pgwk99v4r0hljhipq8v6r3r5cb5vhgyl0bfi8g38"; depends=[Rcpp rpart]; broken = true; }; + fastCorrDiff = derive2 { name="fastCorrDiff"; version="0.5"; sha256="0fis04xfarvmhpdkh7524ffga8f8svpcn3837rqwy0g039dcfa64"; depends=[irlba Matrix plyr RSpectra]; broken = true; }; fastHICA = derive2 { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; broken = true; }; fasteraster = derive2 { name="fasteraster"; version="1.1.1"; sha256="1ycr2h046jds2758xvxn00rhglx3zarbzn3r38j66j5pnz2iiq4f"; depends=[Rcpp]; broken = true; }; fbRanks = derive2 { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; broken = true; }; fcd = derive2 { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; broken = true; }; fdakma = derive2 { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; broken = true; }; fdcov = derive2 { name="fdcov"; version="1.1.0"; sha256="0savsgcifcjjqrmbpn6m30gncq5iigqxpb19l710wlx8nm98svjh"; depends=[corrplot matlab]; broken = true; }; + fdistr = derive2 { name="fdistr"; version="0.1.0"; sha256="1i9nq4jmszbmwk4m6jfn7rifsn7aay40cj6kz23b9ihj3phqffi8"; depends=[dplyr ggplot2 magrittr usethis]; broken = true; }; fec16 = derive2 { name="fec16"; version="0.1.3"; sha256="0azvrg98li535mqa2awhmfisfyfr4d8dw0ynikxmp0z1w9l3dx1p"; depends=[dplyr readr vroom]; broken = true; }; feedeR = derive2 { name="feedeR"; version="0.0.10"; sha256="1p64c7ibwn6k5k3vsjxrcjr84czild7g8bqw0yv4axk52vk5jfkx"; depends=[digest dplyr lubridate readr stringr tibble xml2]; broken = true; }; fellov = derive2 { name="fellov"; version="0.1"; sha256="0z4b08ykajzwa5852dknqz5qqlmhklbwdq8x5zhyfmwba5zfbjav"; depends=[]; broken = true; }; @@ -19893,6 +20072,7 @@ in with self; { flow = derive2 { name="flow"; version="0.1.0"; sha256="1d5cj0qbmx6cwzik83vb0vijryq4b93y5wwgm8k92wg3lgknzdj6"; depends=[here htmlwidgets lifecycle nomnoml rstudioapi styler webshot]; broken = true; }; flower = derive2 { name="flower"; version="1.0"; sha256="1h2fvpjrvpbyrqb8hd51sslr1ibpwa7h9fiqy9anvf2yim5j11yq"; depends=[]; broken = true; }; flowfield = derive2 { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; broken = true; }; + foieGras = derive2 { name="foieGras"; version="0.7-6"; sha256="0g4c9id7q3jgjcgwmncp4bkw9njwb41cp6ycv7psiidkhmnzi03d"; depends=[assertthat CircStats dplyr furrr future ggplot2 lifecycle lubridate mvtnorm patchwork purrr RcppEigen sf stringr tibble tidyr TMB tmvtnorm trip]; broken = true; }; fontHind = derive2 { name="fontHind"; version="0.1.1"; sha256="0qz3bj8vdy6jayy84p3vyxfwqll4v4qlklwq9wl981ii2k7g0vxf"; depends=[extrafont ggplot2 hrbrthemes]; broken = true; }; fontMPlus = derive2 { name="fontMPlus"; version="0.1.1"; sha256="1hvviawbfs3m7mr46y2sjdxkksi10vpbnjic11rjaxqcy9a43f4y"; depends=[extrafont ggplot2 hrbrthemes]; broken = true; }; foodweb = derive2 { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; broken = true; }; @@ -19914,6 +20094,9 @@ in with self; { 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; }; futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; broken = true; }; fuzzyFDR = derive2 { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; broken = true; }; + fwildclusterboot = derive2 { name="fwildclusterboot"; version="0.12"; sha256="08rcyqh0nwpjjybks05klpb3ghry5n2652y5vxz7f5wdvlzjkhwz"; depends=[collapse dqrng dreamerr Formula generics gtools JuliaConnectoR MASS Matrix Rcpp RcppArmadillo RcppEigen summclust]; broken = true; }; + g2f = derive2 { name="g2f"; version="0.2"; sha256="1jsmiv6v8ilpxg1k1npcgqa467hpyw7mzh5m8dp7bxar4j5npsp4"; depends=[KEGGREST minval sybil]; broken = true; }; + gMWT = derive2 { name="gMWT"; version="1.2"; sha256="0gy8mm6ajbd2nl059nrb24wkh06qbbbg2h8m6fl58n5wgsjns1va"; depends=[clinfun Rcpp RcppArmadillo]; broken = true; }; gPdtest = derive2 { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; broken = true; }; gRapfa = derive2 { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; broken = true; }; gWidgets2RGtk2 = derive2 { name="gWidgets2RGtk2"; version="1.0-7"; sha256="14c933j0wj3lb5da75zxg3w3mfqh0nqk8rczbi4dnqd8sna6jks9"; depends=[gWidgets2 memoise RGtk2]; broken = true; }; @@ -19931,9 +20114,12 @@ in with self; { geneListPie = derive2 { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; broken = true; }; geneNetBP = derive2 { name="geneNetBP"; version="2.0.1"; sha256="0sp1chyln5k2zsq7cdhvrqxwr2nhrll1pdl1l5g6fd4gjl2m1nwk"; depends=[bnlearn ggm gRain graph igraph Rgraphviz scales]; broken = true; }; geneSignatureFinder = derive2 { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[class cluster survival]; broken = true; }; + genius = derive2 { name="genius"; version="2.2.3"; sha256="03j6yry39nn8bccrnwjx1y36rdw167gjlkzl56g5lqwbrgx26bqy"; depends=[dplyr magrittr purrr reshape2 rlang rvest stringr tibble tidyr tidytext]; broken = true; }; genotypeR = derive2 { name="genotypeR"; version="0.0.1.8"; sha256="1kwzjn6hrnfizs44cz4a8qa4mdhdzqssc4axx0s6vngmkmsrffig"; depends=[colorspace doBy plyr reshape2 zoo]; broken = true; }; geoGAM = derive2 { name="geoGAM"; version="0.1-2"; sha256="0q09pk2npn4hjymklwfrhz2ybmjpcb6kvqkpn9l3a6cdjgk6bkmj"; depends=[grpreg MASS mboost mgcv]; broken = true; }; geomedb = derive2 { name="geomedb"; version="2.0.1"; sha256="1l35c9x1mhqd7z5ragd7w3ay8v2fdnbmbfx9grwi622j8yz1fbmq"; depends=[ape httr jsonlite]; broken = true; }; + geometr = derive2 { name="geometr"; version="0.2.10"; sha256="00yhw6k9wj3q0mmhwrjvhybsz5fcx86ms5n1q2l492jljplp46cr"; depends=[checkmate crayon deldir dplyr purrr raster Rcpp rgdal rlang sf sp tibble]; broken = true; }; + geonet = derive2 { name="geonet"; version="0.7.3"; sha256="0kp0a1bd8yyvp8w044arawyfmxwmqln3dqk0jzvz1vhbhldgy27s"; depends=[dplyr ggplot2 igraph Matrix mgcv spatstat_core spatstat_geom spatstat_linnet]; broken = true; }; georob = derive2 { name="georob"; version="0.3-14"; sha256="1an5mxq49kv038dplm9h6ngvsz71lkvjm34i7jjsdpaz3cyflp7v"; depends=[abind constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; broken = true; }; geostatsp = derive2 { name="geostatsp"; version="1.8.6"; sha256="1ciyw84y5zbwsfqvl5dhq8swfpkqcmzhhvdm9hr5rhj3497sls9j"; depends=[abind Matrix numDeriv raster sp]; broken = true; }; geotech = derive2 { name="geotech"; version="1.0"; sha256="18s7w6h1svc4n1hcgj5njfkf3nflkc53cdwsq5112p3442rlz33f"; depends=[]; broken = true; }; @@ -19941,15 +20127,16 @@ in with self; { gerbil = derive2 { name="gerbil"; version="0.1.5"; sha256="1rvf7z7zj04p2faj41fxxjs20bd3ghr6fbzkkapcx48fr4j9skj2"; depends=[DescTools lattice MASS mvtnorm openxlsx pbapply truncnorm]; broken = true; }; gesca = derive2 { name="gesca"; version="1.0.4"; sha256="1ndn8wgp22pr017x6v7jw8jy4gd06x8110qa860hw8i6pn47wfwv"; depends=[]; broken = true; }; getMet = derive2 { name="getMet"; version="0.3.2"; sha256="0j1h1vy8rd7czpnb4msdb9k560pnh7kjkmpqqwzwin2ms1c0mggb"; depends=[EcoHydRology jsonlite]; broken = true; }; + getpublist = derive2 { name="getpublist"; version="0.1.0"; sha256="0p6l7qha6i7vhqvav74yxpa6qph35g41v00173mjjqsvyhd0qc5i"; depends=[dplyr magrittr rvest stringr tibble tidyr xml2]; broken = true; }; gfmR = derive2 { name="gfmR"; version="1.1-0"; sha256="0qzzbcra1fnbp0h31b1as20yhmqmi7p62xrhikj64an9avg9b277"; depends=[faraway nnet]; broken = true; }; - ggChernoff = derive2 { name="ggChernoff"; version="0.2.0"; sha256="09bh9isvx3hwwvg72fv6z3fvp8dimpbhvbp328z8amq8jjhph4vf"; depends=[ggplot2 scales]; broken = true; }; ggROC = derive2 { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; broken = true; }; - ggalignment = derive2 { name="ggalignment"; version="1.0.0"; sha256="07f1l7pav36i2z75bvwcwkamw5i36fh5klh5djglxnq1a3v8jm79"; depends=[dplyr ggimage ggplot2 magrittr rlang]; broken = true; }; ggbraid = derive2 { name="ggbraid"; version="0.2.2"; sha256="1y5yskhc63cprvdk1j7nhz8mz9i36qs8sqlr9h09yi172mp6ignn"; depends=[ggplot2]; broken = true; }; + ggconf = derive2 { name="ggconf"; version="0.1.3"; sha256="0g4xasqhdiqfqahakv6p5npl56f2iakx4bnc9v9zcjr077kdda4n"; depends=[ggplot2 rly]; broken = true; }; ggfacto = derive2 { name="ggfacto"; version="0.2.2"; sha256="0rxqkhmnzpljcdbg5wzmyq5fivd3d2h1903w8d1cblq7xw969xi0"; depends=[dplyr FactoMineR forcats ggiraph ggplot2 ggrepel gridExtra htmlwidgets kableExtra magrittr purrr rlang stringi stringr tabxplor tibble tidyr tidyselect vctrs widgetframe]; broken = true; }; ggguitar = derive2 { name="ggguitar"; version="0.1.1"; sha256="1lmfs54h91gzcxin37v4flkywbq3fs648mm1h9ak03xlj5nagzsi"; depends=[dplyr ggplot2 gridExtra lazyeval readr tibble]; broken = true; }; gglogo = derive2 { name="gglogo"; version="0.1.5"; sha256="08wg0svcksdzchp6bdllmsnklxia3d0ygqwzgmqb2sga8nbkf5hl"; depends=[dplyr ggplot2 jpeg knitr magrittr plyr purrr reshape2 rlang tidyr]; broken = true; }; ggloop = derive2 { name="ggloop"; version="0.1.0"; sha256="0jpbgb16jfsv557zvishln98y7nd6p1ryp6hxkrkmhp9p35vzvc0"; depends=[assertthat ggplot2 lazyeval magrittr plyr]; broken = true; }; + ggpacman = derive2 { name="ggpacman"; version="0.1.0"; sha256="1040d6aciyllrpszh7l7y55fw4dx8cya2yvj0x4i2fibvygz83p6"; depends=[dplyr gganimate ggforce ggplot2 magrittr purrr rlang tidyr]; broken = true; }; ghee = derive2 { name="ghee"; version="0.1.0"; sha256="0b3czx2ibi5p8xl7i36zxnab032vrkh5bv204r7wgg1xpx8pdlra"; depends=[gh jsonlite]; broken = true; }; gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; broken = true; }; glacierSMBM = derive2 { name="glacierSMBM"; version="0.1"; sha256="0117fzz2b1lccs0kkwz59w2yysi72j54yvz7373pz11w7rjds84f"; depends=[raster sp udunits2]; broken = true; }; @@ -19958,6 +20145,7 @@ in with self; { globalGSA = derive2 { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; broken = true; }; glrt = derive2 { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; broken = true; }; goldi = derive2 { name="goldi"; version="1.0.1"; sha256="191ac02bwrxr3khq6qirhxzfhv7pqfhqyg7jb473p5vwygpvc53l"; depends=[dplyr futile_logger magrittr Rcpp RcppArmadillo SnowballC tm]; broken = true; }; + gompertztrunc = derive2 { name="gompertztrunc"; version="0.1.0"; sha256="1qcx4s4lz2gsjr0nmwaih7pdh2anibrri7zfpsrl65lndkwy6hg4"; depends=[broom cowplot data_table dplyr flexsurv ggplot2 ggsci magrittr modelr rlang stringr tibble tidyr]; 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; }; gps = derive2 { name="gps"; version="1.0"; sha256="1yzmv0zpgnis3v2f7m9j02zxw31kgcw9fny3vrvk4637jzz2ij56"; depends=[Matrix]; broken = true; }; gptk = derive2 { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; broken = true; }; @@ -19972,7 +20160,6 @@ in with self; { gsrsb = derive2 { name="gsrsb"; version="1.1.1"; sha256="0yjxzc69ihsx5ni6jb4shsvl9vskqlls3gmpckmzx5nsh1l5s5vb"; depends=[ldbounds mvtnorm xtable]; broken = true; }; gtcorr = derive2 { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; broken = true; }; guf = derive2 { name="guf"; version="1.0.2"; sha256="1dfmja2da211pcid4hr7x9q0sgz37756rpykm1ax862avdl8hsmc"; depends=[]; broken = true; }; - guiplot = derive2 { name="guiplot"; version="0.2.1"; sha256="0jn5020f6s3zg7w79d5sjaqld2i6b882q2r0ybdsyny47jd8h7rn"; depends=[DT excelR ggplot2 magrittr R6 rlang shiny svglite]; broken = true; }; gutenbergr = derive2 { name="gutenbergr"; version="0.2.1"; sha256="0rsk583x4i1ac6rbxr5f5cmczr4525bkv20jw7777n8fwn91zvyr"; depends=[dplyr lazyeval purrr readr stringr urltools]; broken = true; }; gvcm_cat = derive2 { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[MASS Matrix mgcv]; broken = true; }; gwdegree = derive2 { name="gwdegree"; version="0.1.1"; sha256="0p06hjp7vay83kbpqsgfr1d8z3ayv483rxbv86fdka94gvi1sjyc"; depends=[dplyr ergm ggplot2 gtools magrittr network scales shiny shinydashboard sna tidyr]; broken = true; }; @@ -19986,17 +20173,21 @@ in with self; { hcp = derive2 { name="hcp"; version="0.1"; sha256="0hhcy70g13kclxv733kgiys7qn5bi28abpkli5n2vj0a58ac333m"; depends=[]; broken = true; }; hddtools = derive2 { name="hddtools"; version="0.9.4"; sha256="011yhs8c6riimz63pa2am56n5aip2yk5gryx2amvk29pzp1v6my9"; depends=[curl raster readxl rgdal sp tidyr XML zoo]; broken = true; }; hdlm = derive2 { name="hdlm"; version="1.3.1"; sha256="1zl6bksw0apkmn5shf8qjpxjyx6vb40dc4m4db76hhn5nhcp10ic"; depends=[foreach glmnet iterators MASS Matrix]; broken = true; }; + healthcareai = derive2 { name="healthcareai"; version="2.5.1"; sha256="0ah855wvb2v8b8zz5a64q8psjrkpgq9xzyrla3mdpm5xx2gh0z0p"; depends=[caret cowplot data_table dplyr e1071 generics ggplot2 glmnet lubridate MLmetrics purrr ranger recipes rlang ROCR stringr tibble tidyr xgboost]; broken = true; }; healthforum = derive2 { name="healthforum"; version="0.1.0"; sha256="13ih00amv9hrpngm6pxc8vzqzhx8c0yqgaprxdcp5li90lg5r3av"; depends=[magrittr purrr rvest stringr tokenizers xml2]; broken = true; }; heavy = derive2 { name="heavy"; version="0.38.196"; sha256="05k788ynw9fhhmjydzp8dbk1vhl44j2rz2shqwn02i40jmwdvwrk"; depends=[]; broken = true; }; hhcartr = derive2 { name="hhcartr"; version="1.0.0"; sha256="104xy3ihpi031pyzifnpc0jfq68gsbc12gzv6hp1vjrgy0nqw5l1"; depends=[bookdown captioner checkmate DiagrammeR DiagrammeRsvg ggplot2 hash Matrix rsvg]; broken = true; }; + hht = derive2 { name="hht"; version="2.1.5"; sha256="06znfxl5qh3wz1bn5qzl45nqgy94y6h0rcl2wzg94czv5d1a9ym0"; depends=[EMD fields spatstat_core spatstat_geom]; broken = true; }; hiPOD = derive2 { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; broken = true; }; hierband = derive2 { name="hierband"; version="1.0"; sha256="0d95hrgkd8b5sww3wsgs6v9zg9pm71ick8x8kj8d6vyib350h6yn"; depends=[]; broken = true; }; hierbase = derive2 { name="hierbase"; version="0.1.2"; sha256="1rsyjlwa8x5n83ymwv7qm373k3y7jfp64g717xd1jmn9vrmm052b"; depends=[glmnet hdi SIHR]; broken = true; }; hiertest = derive2 { name="hiertest"; version="1.1"; sha256="17maf1w4vkqknxff3f00fzv136j3dbbigyzl4vq4sln9j27w10r3"; depends=[]; broken = true; }; highD2pop = derive2 { name="highD2pop"; version="1.0"; sha256="1s4v6m2d3vzvxsgmjzczv1zj3kv3ygvv6gbkkbjwsdhkvc1rdmf0"; depends=[fastclime]; broken = true; }; hillmakeR = derive2 { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; broken = true; }; + hkevp = derive2 { name="hkevp"; version="1.1.4"; sha256="01m5yywi4vjnwhdayaqaqcp5lz70mllj5ifnwdb4c60wm9aby9pm"; depends=[Rcpp RcppArmadillo]; broken = true; }; hmgm = derive2 { name="hmgm"; version="1.0.3"; sha256="12gaz2pi9ny7y772yzrfvl02p3n89cq1l5dzmcksd172gv9ayyz1"; depends=[binaryLogic glmnet MASS Matrix nat Rcpp rgl]; broken = true; }; hmi = derive2 { name="hmi"; version="1.0.0"; sha256="0fjcw13mkxza6nkq3fhp188ga1sjspq1sc6wjm4hy13xh7vdjpqq"; depends=[boot broom_mixed coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm rlang tmvtnorm]; broken = true; }; + hmlasso = derive2 { name="hmlasso"; version="0.0.1"; sha256="0ydcyz9pw30ji8ghrvkgcbmp27d661vajl97b8cwis52605a3gfx"; depends=[BH MASS Matrix Rcpp RSpectra]; broken = true; }; hmma = derive2 { name="hmma"; version="1.1.0"; sha256="1qsvczqq44h46z0nfblv4rarbg64imz8m0jhxdhva27kbzdvqf97"; depends=[bnlearn graph MCMCpack mhsmm Rgraphviz]; broken = true; }; hockeyR = derive2 { name="hockeyR"; version="1.3.0"; sha256="0nb42c1fbmpmpmc9yjcdrypl5jvlqc2ibrzlvz7n51zwvx4v5gc0"; depends=[dplyr glue httr janitor jsonlite lubridate magrittr padr purrr rvest stringr tidyr tidyselect xgboost zoo]; broken = true; }; homtest = derive2 { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjllysw5fjy5kvvgbl6gvabjmcs66z27fp0"; depends=[]; broken = true; }; @@ -20005,6 +20196,7 @@ in with self; { hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; broken = true; }; hsm = derive2 { name="hsm"; version="0.2.0"; sha256="066shjikqrrkxpnra4zknax1a0sk5nx9ms1br58vwqqvqq479rym"; depends=[]; broken = true; }; hsmm = derive2 { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; broken = true; }; + htmltab = derive2 { name="htmltab"; version="0.8.2"; sha256="09hnf339f3hzll7a0shq615h9d6f6xqrcv0c9iid6575m5qsallf"; depends=[httr XML]; broken = true; }; htmltidy = derive2 { name="htmltidy"; version="0.5.0"; sha256="1djkjff3750fm1sp54kf9cjvsqz2x7ia1ns12h5vqqcvwzfd0701"; depends=[htmltools htmlwidgets Rcpp XML xml2]; broken = true; }; hydroApps = derive2 { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; broken = true; }; hydroscoper = derive2 { name="hydroscoper"; version="1.4.1"; sha256="0jhvjmhcprjdjg6a54ic2f4kxfanpgwzzrkyyiggmj5jjg9yfhfw"; depends=[jsonlite pingr readr stringi stringr tibble]; broken = true; }; @@ -20018,10 +20210,12 @@ in with self; { iRF = derive2 { name="iRF"; version="2.0.0"; sha256="1ll4lxg743p2zipxcq13yjsc7j7dk766dcyixwxilllbisg0dh8y"; depends=[AUC data_table doParallel dplyr foreach Matrix RColorBrewer Rcpp]; broken = true; }; ibeemd = derive2 { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[deldir fields rgeos sp spdep]; broken = true; }; ic50 = derive2 { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; broken = true; }; + icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; broken = true; }; idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; broken = true; }; identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; broken = true; }; ideq = derive2 { name="ideq"; version="0.1.4"; sha256="06xk9ghvh3fb79lbkmbqsk07xj06qaigiw41rzbi3bji3fjq1prw"; depends=[matrixcalc mvtnorm pdist Rcpp RcppArmadillo rgen]; broken = true; }; ifa = derive2 { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; broken = true; }; + iilasso = derive2 { name="iilasso"; version="0.0.2"; sha256="043m1n5840459zsknkb54801apb0a2cqfprncmj2wp235rbqj832"; depends=[BH Matrix Rcpp]; broken = true; }; ilc = derive2 { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast rainbow survival]; broken = true; }; imfr = derive2 { name="imfr"; version="0.1.9.1"; sha256="1l1lvzvz9hsqwk60k2w8ry8mvgzj7wrd6ycfhgwv39xid9vk70g7"; depends=[dplyr httr jsonlite]; broken = true; }; imputeMDR = derive2 { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; broken = true; }; @@ -20033,10 +20227,12 @@ in with self; { infra = derive2 { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; broken = true; }; infutil = derive2 { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; broken = true; }; inldata = derive2 { name="inldata"; version="1.0.3"; sha256="0iz3dlmaw6p81lj406nq4sg4qvl289mn95by10r3zrikf39l0jq2"; depends=[raster sp]; broken = true; }; + 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]; broken = true; }; insiderTrades = derive2 { name="insiderTrades"; version="0.0.1"; sha256="1hz2jmghfihbn1dbrr38zlwa0s44gm84pjhhk0yfrnljg9mqf4qy"; depends=[magrittr RCurl stringr]; broken = true; }; intdag = derive2 { name="intdag"; version="1.0.1"; sha256="0mb0a1ccc67clfa75b4hl901zdmx7fxw713c4ybx3i5wc2ldl8ph"; depends=[]; broken = true; }; interacCircos = derive2 { name="interacCircos"; version="1.0.0"; sha256="1waj0saavvaw2qzhbwcj1k0a2dnmq7zbkdnmb93xj6j1lhfjhbdy"; depends=[htmlwidgets jsonlite plyr RColorBrewer]; broken = true; }; interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; broken = true; }; + interpret = derive2 { name="interpret"; version="0.1.26"; sha256="0f7bhz5gj0f5dxjcc9xlrx4y474akn6q0d7z71yypyw6bawvqkbn"; depends=[]; broken = true; }; interventionalDBN = derive2 { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; broken = true; }; introgress = derive2 { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[genetics nnet RColorBrewer]; broken = true; }; intsurvbin = derive2 { name="intsurvbin"; version="0.0.4"; sha256="119zjn1agl2j4fj4yg1pq1sqskzw93xfzppmc5n1x8llmfbxkqsj"; depends=[mgcv MHadaptive msm mvtnorm tmvtnorm]; broken = true; }; @@ -20049,16 +20245,16 @@ in with self; { irtProb = derive2 { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; broken = true; }; irtplay = derive2 { name="irtplay"; version="1.6.4"; sha256="128xw3ylcirfls4fif8ilnphfhpz9pn7pmg4sl1qrwqdh0xksgk2"; depends=[dplyr ggplot2 gridExtra janitor Matrix purrr reshape2 rlang statmod tidyr]; broken = true; }; isaeditor = derive2 { name="isaeditor"; version="0.1.1"; sha256="10gm3mrpi52sj5mkmdgggx8a5yh6a506hawg7yg2518ym8552hsp"; depends=[colorDF crayon dplyr glue magrittr readr rlang tibble tidyr]; broken = true; }; - isopam = derive2 { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; 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; }; iteRates = derive2 { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; broken = true; }; ivfixed = derive2 { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; broken = true; }; ivpack = derive2 { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER lmtest sandwich]; broken = true; }; ivpanel = derive2 { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; broken = true; }; jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; broken = true; }; - jackstraw = derive2 { name="jackstraw"; version="1.3.1"; sha256="0l90ayysbmj6gzpzcglpwkpaga067imy6s7hqapmkwiy9kx8gaa1"; depends=[cluster ClusterR corpcor irlba lfa qvalue rsvd]; broken = true; }; james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; broken = true; }; jdx = derive2 { name="jdx"; version="0.1.4"; sha256="0jqf0nkdyv9g4rifzlkls0n64fdcma2yphwl478772jlgfmxm2jb"; depends=[rJava]; broken = true; }; + jgsbook = derive2 { name="jgsbook"; version="1.0.1"; sha256="0fkxbka4fcsa3bb0zh2fh58q44izsl1q0swa7ink2agl6yxxpmk3"; depends=[jsonlite statip]; broken = true; }; + jjAnno = derive2 { name="jjAnno"; version="0.0.3"; sha256="1xqkkqzdalpzc9d9kibc7b2lfmpzxn84f9y8pl1wjs7ins4dhsck"; depends=[dplyr ggiraphExtra ggplot2 magick magrittr]; 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; }; jointPm = derive2 { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; broken = true; }; jsr223 = derive2 { name="jsr223"; version="0.3.4"; sha256="0rir9v0qhnbl2rgkx1qz2ydj68ba9ccbdzsg6y1acczdhpl03j51"; depends=[curl jdx R6 rJava]; broken = true; }; @@ -20086,8 +20282,9 @@ in with self; { lbiassurv = derive2 { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; broken = true; }; leafletR = derive2 { name="leafletR"; version="0.4-0"; sha256="0j1i971dl3smq8rcsa5s4rfmmk936k2q6xa4hppfzwhrxs3xkkkx"; depends=[brew jsonlite]; broken = true; }; learnstats = derive2 { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; broken = true; }; - lfstat = derive2 { name="lfstat"; version="0.9.4"; sha256="0lm9fyw45kdkkjldkmagykn9p3l3jlw2ky3h00f7j6rqkizjm6r0"; depends=[dygraphs lattice latticeExtra lmom lmomRFA plyr xts zoo]; broken = true; }; + legco = derive2 { name="legco"; version="0.1.4"; sha256="0fd1d2zf510lyrwclsy57d8lgqprk6p8c6ghxglgm6gbx9d2yrgg"; depends=[dplyr httr jsonlite]; broken = true; }; libproj = derive2 { name="libproj"; version="8.1.0-1"; sha256="16mavs0kpbn1lskfgyzgw5ns270kdvvh2991c8w26cyl23zrcys6"; depends=[cpp11 rappdirs]; broken = true; }; + libsoc = derive2 { name="libsoc"; version="0.7.3"; sha256="0baglknb67gmzr4cimlvz44f11np8glcdjdgs3jy8qlz0c8pm95p"; depends=[]; broken = true; }; likeLTD = derive2 { name="likeLTD"; version="6.3.0"; sha256="1mjf4667xd9pf2684d7vqaj54l5s9pgljn4vkfp32wzbfknq6y8r"; depends=[DEoptim gdata ggplot2 gtools rtf]; broken = true; }; limitplot = derive2 { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; broken = true; }; linLIR = derive2 { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; broken = true; }; @@ -20102,7 +20299,6 @@ in with self; { lmeNBBayes = derive2 { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; broken = true; }; lmec = derive2 { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; broken = true; }; lmem_qtler = derive2 { name="lmem.qtler"; version="0.1.1"; sha256="0qbllj66y294n1m8dsyrnwyvzscbzg8mb2dmjyghcrfaz925vkin"; depends=[lattice lme4 pastecs qtl stringr]; broken = true; }; - lmomPi = derive2 { name="lmomPi"; version="0.5.0"; sha256="07ggfzgvhc6kkqs8bbs6z01rbhgb0ki2y4li6r0nkiby1wcpx0py"; depends=[lmom stringr]; broken = true; }; logcondens_mode = derive2 { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[distr logcondens]; broken = true; }; longclust = derive2 { name="longclust"; version="1.2.3"; sha256="1g45d5pak2vhbjrcmxxrk9jyrdxkqwy45phzpsw6b2bjyrgr4i7g"; depends=[]; broken = true; }; longitudinalcascade = derive2 { name="longitudinalcascade"; version="0.3.2.1"; sha256="03nqglxyz6qfalxdnyh2aarxv3agn0b3r4nhsji4v9703h4m1fvg"; depends=[dplyr ggplot2 lubridate rlang scales survival tidyr zoo]; broken = true; }; @@ -20114,6 +20310,7 @@ in with self; { lshorth = derive2 { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; broken = true; }; ltbayes = derive2 { name="ltbayes"; version="0.4"; sha256="0kv5k56hmc1m7bv5pmmmk46822szsgwqgpwydn0x56az7xn6hjk6"; depends=[mcmc MHadaptive numDeriv]; broken = true; }; ltsbase = derive2 { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; broken = true; }; + lxb = derive2 { name="lxb"; version="1.5"; sha256="16x1mvhxqhvibzmv6mlqcmkgic2sha1xagf7r2azmn4z8x1m9w6n"; depends=[]; broken = true; }; lymphclon = derive2 { name="lymphclon"; version="1.3.0"; sha256="1jns41sk2rx1j3mg06dzy434k30gpfhbkn6s47fmyv1y8701vfl0"; depends=[corpcor expm MASS]; broken = true; }; mGSZ = derive2 { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[Biobase GSA ismev limma MASS]; broken = true; }; mQTL = derive2 { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[MASS outliers qtl]; broken = true; }; @@ -20122,7 +20319,7 @@ in with self; { machina = derive2 { name="machina"; version="0.1.6"; sha256="009mzqb5jgnilj9b5ldmm5600008bljlqacm8jjxvqsfnfdfg8zv"; depends=[DT httr jsonlite lubridate rhandsontable xts]; broken = true; }; majesticR = derive2 { name="majesticR"; version="0.1.1"; sha256="0x23p4js9cfnj8c33cp0fql5pvs4fn4frbbzpq85mxjhiifkxxpf"; depends=[jsonlite urltools]; broken = true; }; mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; broken = true; }; - mapfit = derive2 { name="mapfit"; version="0.9.9"; sha256="027wi8ffbk4ks8h2i29i9gspxc74a8dr39bbk09sa5v4x22j62sz"; depends=[deformula Matrix]; broken = true; }; + maple = derive2 { name="maple"; version="0.99.5"; sha256="1cg7grvnrfzdqghlfv5bsii6ips3mykgaw85vx0z9jafhdfpd32f"; depends=[dbarts dplyr ggalluvial ggplot2 plotly rlang Seurat shiny spruce]; broken = true; }; marl = derive2 { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; broken = true; }; matR = derive2 { name="matR"; version="0.9.1"; sha256="1qw2vqmpq7gc3dmr9r000ccjj7xa0h82waxnvryz3l17ggryyjjm"; depends=[BIOM_utils MGRASTer]; broken = true; }; matie = derive2 { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[cba dfoptim gplots igraph mvtnorm seriation]; broken = true; }; @@ -20130,11 +20327,12 @@ in with self; { maxTPR = derive2 { name="maxTPR"; version="0.1.0"; sha256="13x5rz0mfha5pzahkk4x67ncz9v77sa690cyl6wigwsldsrvzr3h"; depends=[aucm Rsolnp]; broken = true; }; maxadjAUC = derive2 { name="maxadjAUC"; version="0.1.0"; sha256="04zdaqmavhhrj63s2k5pqncvlzbfnxan7r0fagfka9dypwwcl5qm"; depends=[aucm Hmisc Rsolnp survival]; broken = true; }; mcGlobaloptim = derive2 { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; broken = true; }; + mcbette = derive2 { name="mcbette"; version="1.15"; sha256="0wilbz4zwjnzxfa3nail10a8y1cjq1myb2lqyj01k8s5kpwb0isq"; depends=[babette beastier beautier curl devtools mauricer Rmpfr testit txtplot]; broken = true; }; mcc = derive2 { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; broken = true; }; mcgibbsit = derive2 { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh46966v01dh26fy79dfklk3zjf262zp3c62ld9yf"; depends=[coda]; broken = true; }; mcheatmaps = derive2 { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; broken = true; }; mcll = derive2 { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; broken = true; }; - mcmcabn = derive2 { name="mcmcabn"; version="0.4"; sha256="0ym7ngai8pv9xalh1s53p8f96s8xpc05zi6ryih2rjv449ib06kq"; depends=[abn coda cowplot ggplot2 ggpubr gRbase]; broken = true; }; + mclustAddons = derive2 { name="mclustAddons"; version="0.7"; sha256="122cl8f1x5s4bkbdajxh5j44i30fl0zasfi95szhzb1ddv7blm3l"; depends=[foreach iterators mclust Rcpp RcppArmadillo]; broken = true; }; mcsm = derive2 { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[coda MASS]; broken = true; }; mdsr = derive2 { name="mdsr"; version="0.2.6"; sha256="1j5sh26b11x77bhl004pid3m3p756ylsmps7zzkvb54q5i5gdv9r"; depends=[babynames DBI dbplyr downloader dplyr fs ggplot2 htmlwidgets kableExtra RMariaDB skimr stringr tibble webshot]; broken = true; }; meaRtools = derive2 { name="meaRtools"; version="1.0.4"; sha256="1nxyvdq4670696mhg0svxxlvk9hnr8szai8b18pw6754kmw1bjvn"; depends=[emdist ggplot2 gridExtra gtools lattice plyr Rcpp reshape2]; broken = true; }; @@ -20142,15 +20340,19 @@ in with self; { medmod = derive2 { name="medmod"; version="1.0.0"; sha256="1f7bzdcjnbz9izlfblxcaa85qxx8kzn62qgjd3qlb7jl7mdy5q54"; depends=[ggplot2 jmvcore lavaan R6]; broken = true; }; met = derive2 { name="met"; version="0.1.0"; sha256="0714103xzc4n178307czxmcv7ygjiigjr9b6xnj240ljp7qmln19"; depends=[DiPs]; broken = true; }; metScanR = derive2 { name="metScanR"; version="1.2.3"; sha256="1v7zrxj3wspx6f5n5s75skcygbf3r85rn4p0z9iwbrbrgxwi4qgs"; depends=[geosphere leaflet matlab plyr RCurl]; broken = true; }; + metabolighteR = derive2 { name="metabolighteR"; version="0.1.3"; sha256="0ip7cy40jndcwp8yc42pjzklv35dkxjd3pdlpwk0r0jngp7nbjim"; depends=[crayon dplyr httr magrittr purrr]; broken = true; }; metaplotr = derive2 { name="metaplotr"; version="0.0.3"; sha256="01iala6cxsxv30fnlh80md5mpy3ksd2piw90zcls8f68g1c6v1jy"; depends=[ggplot2 gridExtra]; broken = true; }; meteogRam = derive2 { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; broken = true; }; mfbvar = derive2 { name="mfbvar"; version="0.5.6"; sha256="1wv46h6cr0xnvr8dxymx362skf7nf77yw84y6g48rj9mbq8kkkcj"; depends=[dplyr ggplot2 GIGrvg lubridate magrittr Rcpp RcppArmadillo RcppParallel RcppProgress stochvol tibble zoo]; broken = true; }; + mgee2 = derive2 { name="mgee2"; version="0.2"; sha256="1bhjajcjvm8brc92v6ij378i0d3vniip77m4pz7n02sgswj0w61a"; depends=[ggplot2 MASS]; broken = true; }; mgpd = derive2 { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[corpcor evd fields numDeriv]; broken = true; }; miRada = derive2 { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; 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; }; + microdemic = derive2 { name="microdemic"; version="0.6.0"; sha256="1w4zh0vagnar95l5b8cgmcvp8q7vk2iba5g8d8g2ywynqiqcx5fc"; depends=[crul data_table httpcode jsonlite tibble]; broken = true; }; migrbc = derive2 { name="migrbc"; version="2.0.9"; sha256="1nbxdm70a9lvbp4sw78719hdpbqnziw1y7r4xk8i390q2c195am1"; depends=[dplyr futile_logger lubridate Rcpp stringr]; broken = true; }; minimist = derive2 { name="minimist"; version="0.1"; sha256="007y829d766b1v6wkrhk7pkg99r38bvmhc8bwvs8rs13dr7444ln"; depends=[V8]; broken = true; }; + minval = derive2 { name="minval"; version="0.8-2"; sha256="06anbb90c8wg0374ykmb6chcwrcdyi903jkbrmrv3kgx511l699z"; depends=[]; broken = true; }; minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; broken = true; }; mipred = derive2 { name="mipred"; version="0.0.1"; sha256="0kijn2xj0dh28rm2sjgd8j1a3c5avc3fjfvvcmzfasvxqdjflv6j"; depends=[mice]; broken = true; }; miraculix = derive2 { name="miraculix"; version="0.9.23"; sha256="0i08v5hq43296k3sa7akpq4h5dmvpkgn7cfpqwdyp0qaxkqk0k0s"; depends=[RandomFieldsUtils]; broken = true; }; @@ -20166,16 +20368,16 @@ in with self; { mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; broken = true; }; mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; broken = true; }; mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; broken = true; }; + mlim = derive2 { name="mlim"; version="0.2.0"; sha256="04ssk3syx3cb5rcmycqfdssxcnp5nlnmnc58mr9bis129shhmvdg"; depends=[curl h2o md_log memuse mice missRanger]; broken = true; }; + mlmts = derive2 { name="mlmts"; version="1.0.1"; sha256="1j6yq4aj2kpqli6xk09ki1vrx91r2n5jasqhx361qp5rn8cn66h7"; 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]; broken = true; }; mlr3proba = derive2 { name="mlr3proba"; version="0.4.9"; sha256="1qhxwx881b482wp85chw0s9390kwyhq32bjr4rlpscb53ppqx6v5"; depends=[checkmate data_table distr6 mlr3 mlr3misc paradox R6 Rcpp survival survivalmodels]; broken = true; }; - mlr3spatiotempcv = derive2 { name="mlr3spatiotempcv"; version="2.0.2"; sha256="0j77hq1197bans2i5rlyzx1fhyl8m2cpgiq2fh5vcvkq0rkaq2mp"; depends=[checkmate data_table ggplot2 mlr3 mlr3misc paradox R6]; broken = true; }; mmeta = derive2 { name="mmeta"; version="2.3"; sha256="0hyxpph2hfjwiy95r0n3h64aab5ziqp2a8gmmpp6nyc77h638czb"; depends=[aod]; broken = true; }; mmm2 = derive2 { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; 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; }; mobsim = derive2 { name="mobsim"; version="0.2.0"; sha256="0an8j5kj0cs1bjz9kwzwc54hm0zaiz5rsaw78ihldw0mx5n175gn"; depends=[Rcpp sads vegan]; broken = true; }; moc = derive2 { name="moc"; version="2.0"; sha256="0fgp8dg9qf7aw1qawmszlxs4bcccqmd87y4kkzdqggm807c2k5gh"; depends=[]; broken = true; }; - mockthat = derive2 { name="mockthat"; version="0.2.6"; sha256="12srlafk3ykzhrw65s1qzw3l566j285hi28rzrcpbgyr12720raa"; depends=[]; broken = true; }; modcmfitr = derive2 { name="modcmfitr"; version="0.1.0"; sha256="1d6fi7pc10w2a97h1prhkg5cvzmxjp11c5bwrz90zry0m8anwjyh"; depends=[gtools nloptr]; broken = true; }; + modelROC = derive2 { name="modelROC"; version="1.0"; sha256="0iyx7c98ym7dy6pfssj7474h9wjpzjwy0fyc5bnqyi1lmjgd508k"; depends=[do ggplot2 ROCit survivalROC tmcn]; broken = true; }; modelfree = derive2 { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; broken = true; }; modiscloud = derive2 { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; broken = true; }; moezipfR = derive2 { name="moezipfR"; version="1.0.2"; sha256="0sfl1c7cvm1milcglcvz9lyvgricsdm7shx0jxyn50y7xz0padww"; depends=[tolerance VGAM]; broken = true; }; @@ -20192,13 +20394,14 @@ in with self; { mpe = derive2 { name="mpe"; version="1.0"; sha256="17bgdbg1zrf78djd3mwycidwibxvsis7pwkrcynvghcc8l2zfci9"; depends=[mvtnorm]; broken = true; }; mppa = derive2 { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; broken = true; }; mptools = derive2 { name="mptools"; version="1.0.1"; sha256="1g4fbfwxv9hir0jn22nh9854blgkh0b5jan3lv0888izj4isa1hc"; depends=[animation lattice latticeExtra raster rasterVis sp viridis zoo]; broken = true; }; + mritc = derive2 { name="mritc"; version="0.5-2"; sha256="07b1b2k1ka43ikj2mhwnazw3ig7w10bf759fimxpksvk5k6wanx2"; depends=[lattice misc3d oro_nifti]; broken = true; }; msSurv = derive2 { name="msSurv"; version="1.2-2"; sha256="02qm3mq17d2yj5mbz6gapd3zfi1wmiad5hpyimcb39impk43n2hf"; depends=[class graph lattice]; broken = true; }; msap = derive2 { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; broken = true; }; mssqlR = derive2 { name="mssqlR"; version="1.0.0"; sha256="0qdnm7cx9cg14vfcnkmcjqr1jpxsw8xlrbnxldvzz44mzv2n878l"; depends=[magrittr RODBC]; broken = true; }; mtconnectR = derive2 { name="mtconnectR"; version="1.2.1"; sha256="0hl46h535mjqwgrhmxlixhfsych3blzcynffp55nr1ynrra4dn06"; depends=[data_table dplyr dtw ggplot2 lubridate magrittr plyr proxy stringr tidyr XML]; broken = true; }; mtk = derive2 { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[lhs rgl sensitivity stringr XML]; broken = true; }; muStat = derive2 { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; broken = true; }; - mudfold = derive2 { name="mudfold"; version="1.1.2"; sha256="1g66axwrrvlsb03yhwa16pvxbl2wvpm7fzzl6nlw0cxlh99w7r33"; depends=[boot broom dplyr ggplot2 glmnet mgcv reshape2 zoo]; broken = true; }; + mudens = derive2 { name="mudens"; version="1.3.2"; sha256="18kv8xfmmmk0dyw64lwrlrks0gana0s7gaff6nxs59ndgb1pj6yp"; depends=[Rcpp survival]; broken = true; }; multdyn = derive2 { name="multdyn"; version="1.6"; sha256="06yab2lmxp7lc7zjk8n194mn5vza0yjbp276iair3ry35my4h3v8"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; broken = true; }; multiPIM = derive2 { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; broken = true; }; multiband = derive2 { name="multiband"; version="0.1.0"; sha256="1f4gmy0yf9zid7kl05zncvvig6hs4nl1h9wkrkc24rxx9risw9k9"; depends=[]; broken = true; }; @@ -20222,11 +20425,12 @@ in with self; { mztwinreg = derive2 { name="mztwinreg"; version="1.0-1"; sha256="1rg6ikaqdrc7q44s3r3km8h45prnvcpzpxd7nxbmh209iz9j19ai"; depends=[mclogit rms]; broken = true; }; nCal = derive2 { name="nCal"; version="2021.9-12"; sha256="133dpy2rp8sabwdlk0wjxs9rzixzcja73im94qaw26z5xsnaydhf"; depends=[drc gdata gWidgets2 kyotil]; broken = true; }; nFCA = derive2 { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; broken = true; }; + nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; broken = true; }; ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; broken = true; }; ndvtest = derive2 { name="ndvtest"; version="1.0-0"; sha256="15jqh58n63g2vr919z10d5ryhvk7325bv4gmd2xgdpi76p2dbyg0"; depends=[CompQuadForm nonnest2 Rdpack sandwich]; broken = true; }; nearfar = derive2 { name="nearfar"; version="1.2"; sha256="116rq797a5fascirz8xg465fywjf40j1k5czryvqzpik0if0w00r"; depends=[car GenSA MASS nbpMatching]; broken = true; }; + needy = derive2 { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; broken = true; }; neotoma = derive2 { name="neotoma"; version="1.7.4"; sha256="1fknzp7qg5l5lkfvqfld0x67zj3xmi8vivsg70m47mbpcs92hmcf"; depends=[analogue dplyr httr jsonlite leaflet plyr reshape2 xml2]; broken = true; }; - netdiffuseR = derive2 { name="netdiffuseR"; version="1.22.4"; sha256="1fm6pg3cavyhsjracwgb386dxj83dcfmx8apdhr5mbavd2h7pw42"; depends=[boot igraph MASS MatchIt Matrix network networkDynamic Rcpp RcppArmadillo sna SparseM viridisLite]; broken = true; }; networkTomography = derive2 { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; broken = true; }; networkreporting = derive2 { name="networkreporting"; version="0.1.1"; sha256="1ssbz8lw4mlwcblwfbyffvayvb2gmihq4qlz5q9222fn4aa3raxd"; depends=[dplyr functional ggplot2 lazyeval plyr reshape2 stringr surveybootstrap]; broken = true; }; networksis = derive2 { name="networksis"; version="2.1-3"; sha256="1kvil3qs7xd94ak9jgvj1nss55gjg0y7d35zmass9h1hjkcrq7bg"; depends=[network]; broken = true; }; @@ -20253,8 +20457,9 @@ in with self; { nowcasting = derive2 { name="nowcasting"; version="1.1.4"; sha256="1nj34cbkv1xlhmcfhxs32shv00mz02rp95xj59qkq5by53sx8qwq"; depends=[corpcor DBI httr lubridate magic matlab Matrix RCurl RMySQL vars xts zoo]; broken = true; }; npbr = derive2 { name="npbr"; version="1.7"; sha256="02jqf2xahz757gb4hpizwpgsvvz2d23s3pl02958925pdvkv6bp5"; depends=[Benchmarking np quadprog Rglpk]; broken = true; }; npm = derive2 { name="npm"; version="1.0.0"; sha256="01v913ylsh895yxkkpyviplcxcc3c90znccvjp7wbflmxxnvrasd"; depends=[assertthat cli crayon erratum]; broken = true; }; + nprcgenekeepr = derive2 { name="nprcgenekeepr"; version="1.0.5"; sha256="1j6pfc694yf1m42a0fhlbh5wdbmgs61fswbw7083h69d2sr2zq05"; depends=[anytime futile_logger htmlTable lubridate Matrix plotrix readxl Rlabkey rlang shiny stringi WriteXLS]; broken = true; }; npst = derive2 { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; broken = true; }; - nse = derive2 { name="nse"; version="1.20"; sha256="037z164m78hdbwgnaa10jq50ngg3n9iigmyd1r5gz6hgvsr5sbnf"; depends=[coda mcmc mcmcse np Rcpp sandwich]; broken = true; }; + nsdr = derive2 { name="nsdr"; version="0.1.1"; sha256="1p73aj465lk52n3dikkqi54zm2f9v00ikpmry10p42qhfkgrw61l"; depends=[]; broken = true; }; nser = derive2 { name="nser"; version="1.4.3"; sha256="0q6gz79pwwsyz6rrjrhwr87mbzq2qv7bbc1dj7q4gfdviggkgar8"; depends=[curl dplyr googleVis httr jsonlite lubridate magrittr purrr readr RSelenium rvest stringr tidyverse]; broken = true; }; nsgp = derive2 { name="nsgp"; version="1.0.5"; sha256="0piajjz3r71dnjw7lwpjhbaygxcrbbxfvhf8p3n2izyr2pw5fml9"; depends=[MASS]; broken = true; }; ntwk = derive2 { name="ntwk"; version="1.0.0"; sha256="1c12c3pq992f02z3ikx17zv2djq9d9ly232ha0j5jswsksqzx024"; depends=[assertthat copCAR ghyp Matrix mvtnorm pracma zoo]; broken = true; }; @@ -20266,7 +20471,6 @@ in with self; { omd = derive2 { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; broken = true; }; oncomodel = derive2 { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; broken = true; }; onlineVAR = derive2 { name="onlineVAR"; version="0.1-1"; sha256="01z2d91mbdjvwwiqjq1dbqp50jbc9v6d7nw4gs7d1abhsqyiqa13"; depends=[lattice]; broken = true; }; - onls = derive2 { name="onls"; version="0.1-1"; sha256="0m7pnlzkqwzi6jncjzxzfvznipd4wg03zd9fc0ymwm9jvhm4p14g"; depends=[minpack_lm]; broken = true; }; opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; broken = true; }; optAUC = derive2 { name="optAUC"; version="1.0"; sha256="0j1llzqa3n7kqw3i5bb7284z0hi6s5jbjfl9zap0l7xf6hg4x1dn"; depends=[MASS]; broken = true; }; optCluster = derive2 { name="optCluster"; version="1.3.2"; sha256="11k6mbkwmvhmcvnc4hgl8aa3j7n7im5g3040dgppahzdndysgnw3"; depends=[cluster gplots kohonen MBCluster_Seq mclust RankAggreg]; broken = true; }; @@ -20278,6 +20482,7 @@ in with self; { osmar = derive2 { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[geosphere RCurl XML]; broken = true; }; osmgeosample = derive2 { name="osmgeosample"; version="0.1"; sha256="1vcdisf147mcdqkc35czcphjh6rhaix9vy6l5inknaarmmajri3x"; depends=[dplyr geoR mapview nngeo osmdata pdist processx qpdf Rcpp rgdal sf sp splancs tibble]; broken = true; }; osmose = derive2 { name="osmose"; version="3.3.4"; sha256="144mklbish59amzz7j95qmn98yqlz3bqzd2rp03wg9f5s69bxjj6"; depends=[fields knitr mgcv ncdf4 rlist rmarkdown stringr]; broken = true; }; + osmplotr = derive2 { name="osmplotr"; version="0.3.3"; sha256="0p94phv7jn0q9k25300zz59ldfphm9xgy6i7n3r8xj4zay0c7mf2"; depends=[e1071 ggm ggplot2 mapproj osmdata rgeos sp spatstat spatstat_core spatstat_geom]; broken = true; }; ospsuite_utils = derive2 { name="ospsuite.utils"; version="1.2.0"; sha256="16gcqnkqz0nz7mhgbnji3p1k2vv43jypx2xbcz4i4d8v1368akly"; depends=[R6]; broken = true; }; otvPlots = derive2 { name="otvPlots"; version="0.2.1"; sha256="0fjx0kl9y77mazwy7lg4mxc9sg8ysvvbl4h3k6bvfpnjm5x62hff"; depends=[data_table ggplot2 gridExtra Hmisc moments quantreg scales stringi]; broken = true; }; outsider = derive2 { name="outsider"; version="0.1.1"; sha256="082yygvjs31clz8b3p59gkc26249gqp8hl1071gm6zi4vi2ng43x"; depends=[crayon curl jsonlite outsider_base remotes tibble yaml]; broken = true; }; @@ -20295,10 +20500,12 @@ in with self; { pairedCI = derive2 { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; 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; }; + palaeoSig = derive2 { name="palaeoSig"; version="2.0-3"; sha256="1sn2nbiq037l81qvrqbg7gf1312g8vy574hsfng07qk1jpx7vwkk"; depends=[assertr dplyr forcats ggplot2 ggrepel magrittr MASS mgcv purrr rioja rlang TeachingDemos tibble tidyr vegan]; broken = true; }; paleoMAS = derive2 { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[lattice MASS vegan]; broken = true; }; panelAR = derive2 { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; broken = true; }; papayar = derive2 { name="papayar"; version="1.0"; sha256="11vkjhazfwfixsr6dba5jrcsr3r3mqgvj5s070b4gp70d6k1z8s5"; depends=[htmltools neurobase oro_nifti servr]; broken = true; }; param6 = derive2 { name="param6"; version="0.2.4"; sha256="0h4r2l670zvsbq0cakbm7f5yc0ghaf40kby80q3ql8lwgfnay1jd"; depends=[checkmate data_table dictionar6 R6 set6]; broken = true; }; + paramGUI = derive2 { name="paramGUI"; version="2.1.4"; sha256="0k2wkl99ji3w7xmd9k7zzvrr3dbf3237q7lxm527dnrq331pmxmi"; depends=[colorspace fields shiny shinydashboard TIMP]; broken = true; }; parboost = derive2 { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[caret doParallel glmnet iterators mboost party plyr]; broken = true; }; parcoords = derive2 { name="parcoords"; version="1.0.0"; sha256="15w0g789a2igagfrgv1978ib4ipxpfkid5jpj4q344mpdvgp6ip2"; depends=[crosstalk htmlwidgets]; broken = true; }; parfm = derive2 { name="parfm"; version="2.7.6"; sha256="1n548gaf62m56n8rlcz1mhpqxikd33vydjwl4wps441drp1dbvs0"; depends=[msm optimx sn survival]; broken = true; }; @@ -20308,6 +20515,7 @@ in with self; { partitionMap = derive2 { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; broken = true; }; parviol = derive2 { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; broken = true; }; pastis = derive2 { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[ape caper]; broken = true; }; + patPRO = derive2 { name="patPRO"; version="1.1.0"; sha256="1l6q6glklmfgivs4gw0v8q4qa57wr2bna477sn2v401hcwmgnfyn"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; broken = true; }; pathlibr = derive2 { name="pathlibr"; version="0.1.0"; sha256="0z8iz765fi1s2770p7dwwv2anihfw86kb5dwg081wb6474wiq6v8"; depends=[glue logging magrittr purrr R6 rlang]; broken = true; }; pauwels2014 = derive2 { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; broken = true; }; pbdBASE = derive2 { name="pbdBASE"; version="0.5-3"; sha256="1f90bk1mp1s03177b9g5w5ni77jzrzc1pl3bjx0w0fjbjs1myn79"; depends=[pbdMPI pbdSLAP]; broken = true; }; @@ -20316,6 +20524,7 @@ in with self; { pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; broken = true; }; pds3 = derive2 { name="pds3"; version="0.5.0"; sha256="1hipi4ygk30khrrslxq3m9qdichazhrl34k444shs7gi6wjx9ilr"; depends=[rly]; broken = true; }; peakPick = derive2 { name="peakPick"; version="0.11"; sha256="1zf7ff9arm4hkdxrfhb0p8p7npd51icy773g2raaqsfys825xwhm"; depends=[matrixStats]; broken = true; }; + pedigreeTools = derive2 { name="pedigreeTools"; version="0.1"; sha256="0kgbjyw9dlp4s91cyg5w0p2vn2h9pg9ixrhc5pwvkp3v1acd0xfm"; depends=[Matrix]; broken = true; }; penalizedclr = derive2 { name="penalizedclr"; version="0.1.0"; sha256="0ka27azfdj4wa1p628b99pkrfjy1x8yjyd3d5g2v8mbsfg3j3bwg"; depends=[clogitL1 penalized survival tidyverse]; broken = true; }; perARMA = derive2 { name="perARMA"; version="1.6"; sha256="0k70lcqhiiffrwzvh51asnhx68qxpnjnxadarvgpgbc7kfy7lv9x"; depends=[corpcor gnm matlab Matrix signal]; broken = true; }; permGPU = derive2 { name="permGPU"; version="0.15"; sha256="1bxydc5dw7ka45k6ban35d5xb1dw9yq9480qns8b39cc0x3acmhc"; depends=[Biobase foreach RUnit survival]; broken = true; }; @@ -20327,6 +20536,8 @@ in with self; { physx = derive2 { name="physx"; version="1.0"; sha256="1b6bx08jzfg4pxicawkn013bqrvqkp19pigxl3iwjrqclvi8mx73"; depends=[celestial cubature data_table docore MASS pracma Rcpp]; broken = true; }; phytotools = derive2 { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; broken = true; }; pinbasic = derive2 { name="pinbasic"; version="1.2.2"; sha256="0mcw68wrixz2jf62nfifdgg8bnp4h1p3byivz28wi61blj8iaa75"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; broken = true; }; + pirouette = derive2 { name="pirouette"; version="1.6.5"; sha256="0fw6hbpywmk1mqfxn480sh403afrmm8shlzcbwx32pjri9ajrx1q"; depends=[ape babette beastier beautier DDD forcats magrittr mauricer mcbette nodeSub phangorn phytools plyr pryr readr stringr TESS tibble tidyr tracerer xtable]; broken = true; }; + pkgmaker = derive2 { name="pkgmaker"; version="0.32.2"; sha256="14ggsd24n5g5rvn0wl4w90ipxzmywqikh28llj89q6kpxwnv4iff"; depends=[assertthat codetools digest registry stringr withr xtable]; broken = true; }; plRasch = derive2 { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; broken = true; }; planar = derive2 { name="planar"; version="1.6"; sha256="0x5xdb2afpc1w8s217hy765mz938kg5b5j7vzqzhlsh2dzdjccpj"; depends=[cubature dielectric ggplot2 plyr Rcpp RcppArmadillo reshape2 statmod]; broken = true; }; plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; broken = true; }; @@ -20348,7 +20559,6 @@ in with self; { portes = derive2 { name="portes"; version="5.0"; sha256="1iarvgz23979lipqyyvh8h0nd978p1nzbbjf020q11yqpl863502"; depends=[forecast]; broken = true; }; powerAnalysis = derive2 { name="powerAnalysis"; version="0.2.1"; sha256="0cma4v402n6wcb2gy9g1ymydzh8vimy9nfrrn8xhnjsf7x6jh215"; depends=[]; broken = true; }; powerHaDeX = derive2 { name="powerHaDeX"; version="1.0"; sha256="188a09jnn8xr5jx1n785gghpn3k8cqkhp76m47gixh5n9v15lzzg"; depends=[checkmate data_table expm ggplot2 glmnet lme4 lmerTest nlme plyr Rcpp signal]; broken = true; }; - powerjoin = derive2 { name="powerjoin"; version="0.0.1"; sha256="0hnk573jrpmr5k0yhfq74wksrz6ri5g21zf5853fslcxyjys1v8q"; depends=[cli dplyr generics glue lifecycle magrittr purrr rlang tibble tidyr tidyselect vctrs]; broken = true; }; prLogistic = derive2 { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot Hmisc lme4]; broken = true; }; pragma = derive2 { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; broken = true; }; praktikum = derive2 { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; broken = true; }; @@ -20362,6 +20572,7 @@ in with self; { prof_tree = derive2 { name="prof.tree"; version="0.1.0"; sha256="0mjvxaacrgkzl0f1wn3fpgah4jh720safni66ri0dnriwcxis6rz"; depends=[data_tree]; broken = true; }; prognosticROC = derive2 { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; broken = true; }; proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; broken = true; }; + propr = derive2 { name="propr"; version="4.2.6"; sha256="16ghgzpwz6q9zlaa0pc8wqv0wpz81c75n7zwjyr1lv9y19qwlkfg"; depends=[fastcluster ggplot2 igraph Rcpp]; broken = true; }; proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; broken = true; }; proteomics = derive2 { name="proteomics"; version="0.2"; sha256="01cd4sb79gcx8gbzl624scvjbwhgcsca1wdvvfkhsv7jfwdd2ry2"; depends=[foreach ggplot2 plyr reshape2]; broken = true; }; protoclass = derive2 { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; broken = true; }; @@ -20370,6 +20581,7 @@ in with self; { psymonitor = derive2 { name="psymonitor"; version="0.0.2"; sha256="09288w2bk5jhnbyj516jqn5qb33yqqg5kqbg6ylqk7anlq2yg2sl"; depends=[doParallel foreach magrittr]; broken = true; }; psyosphere = derive2 { name="psyosphere"; version="0.1.6"; sha256="1hcas3jk2n11lyw1ysmci0sysxf7qg9h2msqqg7q9nqp5gbf90np"; depends=[geosphere ggplot2 Hmisc lubridate plyr rgdal RgoogleMaps sp]; broken = true; }; pts2polys = derive2 { name="pts2polys"; version="0.1.3"; sha256="0rmgryv0vds20npvaqvvwrhrx0grfcz9qwdy2w3bx945r0chhw39"; depends=[Rcpp]; broken = true; }; + pulsar = derive2 { name="pulsar"; version="0.3.8"; sha256="0lrhz22s4622pcf9qz040sacg2myg6l3qym695v8f0a0zvabnix8"; depends=[Matrix]; broken = true; }; pvsR = derive2 { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[httr nnet XML]; broken = true; }; pycno = derive2 { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; broken = true; }; qLearn = derive2 { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; broken = true; }; @@ -20394,10 +20606,13 @@ in with self; { rHpcc = derive2 { name="rHpcc"; version="1.0"; sha256="0096z90mmf1j2xpb9034a5ph52m8z6n6xjh3km2vrhw63g3cpwap"; depends=[RCurl XML]; broken = true; }; rJython = derive2 { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; broken = true; }; rKIN = derive2 { name="rKIN"; version="0.1"; sha256="1j6fdi5h869q4d1hq6ha6qyhisa0zk2qmhjrc4ahl9991d680dyn"; depends=[ggplot2 maptools MASS rgeos sp]; broken = true; }; + rKolada = derive2 { name="rKolada"; version="0.2.1"; sha256="1c1ci6dn3yqgp7qm1fih8dlq67dpbc1wlxhzcrzs0zzign47vgvd"; depends=[dplyr glue httr jsonlite magrittr purrr rlang stringr tibble tidyr urltools]; broken = true; }; rModeling = derive2 { name="rModeling"; version="0.0.3"; sha256="0xrjxayp59f31wwcqqkzs5my2j2lpbv1f4pp709fmqxz02vbdzhv"; depends=[caret e1071 MASS]; broken = true; }; rNMF = derive2 { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; broken = true; }; rRofex = derive2 { name="rRofex"; version="2.0.6"; sha256="0yg3bxadgmn5d7bljzn9bjzy833lfi6bwz24z52f8qcbm1nqchgb"; depends=[dplyr glue httr jsonlite later lifecycle magrittr purrr rlang tibble tidyr websocket]; broken = true; }; + rSPARCS = derive2 { name="rSPARCS"; version="0.1.0"; sha256="0k46nhkdn68c7h7bbbdfwl02bldi1m3m62zbp20kh8np9bxy1rnk"; depends=[data_table geosphere plyr raster sp spatialEco tigris]; broken = true; }; rSQM = derive2 { name="rSQM"; version="1.3.14"; sha256="0m69n2pnfv2085dln6p149a5gw0gif9xk00xmad5s9j68hwjdmym"; depends=[dplyr EcoHydRology ggplot2 gsubfn mise ncdf4 qmap reshape2 stringr yaml zoo]; broken = true; }; + 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]; broken = true; }; rWBclimate = derive2 { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr jsonlite plyr reshape2 rgdal sp]; 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; }; radmixture = derive2 { name="radmixture"; version="0.0.1"; sha256="0rs60xjd43lg5c9972qhpg6bsqfg2578qvrz7gz3bdip10jb1ryj"; depends=[magrittr MCMCpack plyr quadprog]; broken = true; }; @@ -20405,9 +20620,9 @@ in with self; { randaes = derive2 { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; broken = true; }; randnet = derive2 { name="randnet"; version="0.5"; sha256="131bkfzxjd3x02dj6wc2ilwpgymmm18apd4v1dd70ib4sibvir16"; depends=[AUC entropy irlba Matrix nnls poweRlaw pracma RSpectra]; broken = true; }; randomsearch = derive2 { name="randomsearch"; version="0.2.0"; sha256="0ywr4ms66p5nmq8bzy04gbvmpp0nhfyf8rvynhr2c4alqva9x3yi"; depends=[checkmate fs parallelMap ParamHelpers smoof]; broken = true; }; + ranlip = derive2 { name="ranlip"; version="1.0.1"; sha256="04jh7m8gmz0b4h507amnj708sg5qf4fzawybss01681hsnb3swnz"; depends=[Rcpp]; broken = true; }; rareGE = derive2 { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; broken = true; }; rasciidoc = derive2 { name="rasciidoc"; version="4.0.2"; sha256="1k3bh1bbjrzhmz2dz98qw8ad46jk7dx7srigp22valk5jz4ni7s5"; depends=[checkmate document fritools gert highr knitr reticulate]; broken = true; }; - rasterList = derive2 { name="rasterList"; version="0.5.8"; sha256="0q7apglxzpah04463z07cpkzyd6l6dbbdhm601brzh6yk75z20vh"; depends=[raster]; broken = true; }; rasterly = derive2 { name="rasterly"; version="0.2.0"; sha256="1fv0ayh8r78qss7ikcwnj0i5x8iyz4c3icsfb554zji9bw30x7qr"; depends=[data_table ggplot2 magrittr plotly Rcpp rlang]; broken = true; }; rattle_data = derive2 { name="rattle.data"; version="1.0.2"; sha256="0cnmyzvy23jc4vz521c3jg0w4165waycvy5014l5773fy19zq75c"; depends=[]; broken = true; }; rawr = derive2 { name="rawr"; version="0.1.3"; sha256="0k0x1pmxs73j6dmjg33n4hhwjwzpnhzbmmmjza6kw7hj6lfmipx4"; depends=[clipr dplyr jsonlite rvest stringr xml2]; broken = true; }; @@ -20425,12 +20640,14 @@ in with self; { readthat = derive2 { name="readthat"; version="0.0.1"; sha256="04vnpvfa8in3gxi6nv3si59hr8hj17wq3a5n8rnpiaczg46qr1dr"; depends=[curl Rcpp]; broken = true; }; regexTestR = derive2 { name="regexTestR"; version="0.1.3"; sha256="0nnp2xlrrywpi1lmj8ymsjgiqvq8777hhdgcwjq549m7whfw6lsg"; depends=[config data_table DT golem htmltools pkgload processx purrr RColorBrewer rvest shiny shinyBS shinythemes stringr tidyr xml2]; broken = true; }; regpro = derive2 { name="regpro"; version="0.1.1"; sha256="02axbq63hsqwg3q2ixr0lpsdai9q6wj57s5k1343q9m0pw90vr73"; depends=[denpro]; broken = true; }; + regweight = derive2 { name="regweight"; version="1.0.2"; sha256="1ziqii9xlp86n6ga99glwnh2kf6pkm8m326yra40yf2w3h180pbm"; depends=[checkmate dplyr ggplot2 glue gt lpdensity rlang scales tidyr tidyselect]; broken = true; }; relMix = derive2 { name="relMix"; version="1.3.3"; sha256="03zzmsx2i7ib1mhdfk5igvr1winl9g2dfjqz2kzvcx3rl7l6hjym"; depends=[Familias gWidgets2 gWidgets2tcltk]; broken = true; }; rela = derive2 { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; broken = true; }; relaxo = derive2 { name="relaxo"; version="0.1-2"; sha256="1rzmq7q3j271s6qwwrmwidv0vxcjpgjhyiqgr6fkczkai2lbnd8x"; depends=[lars]; broken = true; }; reliaR = derive2 { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; broken = true; }; repoRter_nih = derive2 { name="repoRter.nih"; version="0.1.3"; sha256="02bb4vrn0zdc3hm7ba148p18fs5g5bsfjjwnzpp54ymghfw1mq5m"; depends=[assertthat crayon dplyr httr janitor jsonlite lubridate magrittr purrr tibble]; broken = true; }; represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; broken = true; }; + reproducible = derive2 { name="reproducible"; version="1.2.10"; sha256="0agphafd2khv2xk0fwqr2y3imn8fzwa3crpqbp4n3i9qkpmkmvpw"; depends=[data_table DBI digest fpCompare glue lobstr magrittr raster Require rlang RSQLite sp]; broken = true; }; restrictedMVN = derive2 { name="restrictedMVN"; version="1.0"; sha256="0qynkg244gzq0yjb0716w7g1sxdq66i11ss8jij86h2mz3ykj137"; depends=[MASS]; broken = true; }; retistruct = derive2 { name="retistruct"; version="0.6.3"; sha256="1zij37n2ja3yx6n1agdkb3lj42p01parcg6djv60bng9c2qq0wsl"; depends=[foreign geometry png R_matlab R6 rgl RImageJROI RTriangle sp ttutils]; broken = true; }; retractcheck = derive2 { name="retractcheck"; version="1.0.0"; sha256="1c4p8afh9g359s560sswcys3manc0lqvk0aqgvd09p4rpzls2dm7"; depends=[httr plyr textreadr]; broken = true; }; @@ -20441,6 +20658,7 @@ in with self; { rgr = derive2 { name="rgr"; version="1.1.15"; sha256="1mrnmbh2crhkwdi37q59hx76afvkhgzgaacg3688q7jp23d58z6x"; depends=[fastICA MASS]; broken = true; }; ri = derive2 { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; broken = true; }; rijkspalette = derive2 { name="rijkspalette"; version="1.0.2"; sha256="00726q8s36si08ghd9sgi7ikadcj11xqwhgv8f3cml6lvwz7ppzz"; depends=[crayon imager jsonlite]; broken = true; }; + riot = derive2 { name="riot"; version="1.0.0"; sha256="1iv83z21k2a8kclfma1cq4jns4zdpgjrzajcsfl105srvv55n0s2"; depends=[cli fs Rcpp readr rlang tibble]; broken = true; }; rivervis = derive2 { name="rivervis"; version="0.46.0"; sha256="19jsl5g46jcbc0kg47bsif1wrw9z9brgvwdcxqjc89shnx3hzzfv"; depends=[]; broken = true; }; rjpdmp = derive2 { name="rjpdmp"; version="2.0.0"; sha256="0r0r58zrwab4zxhgbfhh4qk6vbbza00m8h73mz70f5kqp786i9wy"; depends=[data_table Rcpp RcppArmadillo]; broken = true; }; rknn = derive2 { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjzb4jzghzd3whgjvm2rsmnabai95"; depends=[gmp]; broken = true; }; @@ -20449,10 +20667,11 @@ in with self; { rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; broken = true; }; rms_gof = derive2 { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; broken = true; }; rngwell19937 = derive2 { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; broken = true; }; + roads = derive2 { name="roads"; version="1.0.0"; sha256="02gkxvlngf23xv3sh578ynd5jzhlsslnllbvppyasbf4izisng16"; depends=[data_table dplyr igraph raster rlang sf sp SpaDES_tools stars tidyselect units]; broken = true; }; robustfa = derive2 { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; broken = true; }; robustgam = derive2 { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[mgcv Rcpp RcppArmadillo robustbase]; broken = true; }; + rock = derive2 { name="rock"; version="0.5.5"; sha256="1c6g563fmm1anwhfnfiirlinrdzkb6z1c1zn4hr4c331wkyvihcm"; depends=[data_tree DiagrammeR DiagrammeRsvg dplyr ggplot2 glue htmltools markdown purrr yaml yum]; broken = true; }; rorutadis = derive2 { name="rorutadis"; version="0.4.2"; sha256="13a7xj4qw1nd8xgrqhrki3php960lgy9gy38sg4kpvs4j2rwijzc"; depends=[ggplot2 gridExtra hitandrun Rglpk]; broken = true; }; - rosetta = derive2 { name="rosetta"; version="0.3.9"; sha256="104k6j7v41czd4g1qwifmig3zsjs3l4q5mvfab81przdb1m6k5kd"; depends=[car diptest ggplot2 ggrepel gridExtra kableExtra knitr lavaan lme4 multcompView pander plyr psych pwr rmdpartials ufs viridis]; broken = true; }; royston = derive2 { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; broken = true; }; rpart_utils = derive2 { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; broken = true; }; rpatrec = derive2 { name="rpatrec"; version="1.0.1"; sha256="0zj461frf6n5s97zq7r52q0blsn2xq2759impgz6v4pr87gmq0si"; depends=[np]; broken = true; }; @@ -20478,6 +20697,7 @@ in with self; { sampSurf = derive2 { name="sampSurf"; version="0.7-6"; sha256="1f2ndfrxz0v0di9sb17rxs3iik2qw2nj1dn7apl55b2d07nsmpk3"; depends=[boot lattice latticeExtra raster rasterVis sp]; broken = true; }; sapa = derive2 { name="sapa"; version="2.0-3"; sha256="0kj681rd4c2lvqr926lb6f4qwp281x5274dg6vbk8pf5y7s0qlpc"; depends=[ifultools splus2R]; broken = true; }; saves = derive2 { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; broken = true; }; + scPOP = derive2 { name="scPOP"; version="0.1.0"; sha256="0bi9dmqj9cd8f09qmfl3d65922xn3j3jipxi6615jbk6bz67kkh9"; depends=[cluster Matrix RANN Rcpp RcppArmadillo]; broken = true; }; scenario = derive2 { name="scenario"; version="1.0"; sha256="0v1b00kiny21yx4qkk2x51cy1zqibdnd68z76qia7h5py28yhxsi"; depends=[]; broken = true; }; scpm = derive2 { name="scpm"; version="2.0.0"; sha256="1ib46m3i50annp90n2ih4qdxabxik4ngg9j0a5hgspsvk1i4hrvp"; depends=[interp lattice MASS Matrix mvtnorm RandomFields rgl]; broken = true; }; scrapeR = derive2 { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[RCurl XML]; broken = true; }; @@ -20502,7 +20722,7 @@ in with self; { set6 = derive2 { name="set6"; version="0.2.4"; sha256="06swz60p73a7m7rvsv1545hsr2chkk2w2hmnfwkwfz4hrbdxm709"; depends=[checkmate ooplah R6 Rcpp]; broken = true; }; severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; broken = true; }; sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; broken = true; }; - shapeR = derive2 { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg MASS pixmap vegan wavethresh]; broken = true; }; + sfdep = derive2 { name="sfdep"; version="0.2.0"; sha256="04arbp8n1vpl5kksc0893vv8qh81m2mhb8fwk55r6y7zb6wpphwk"; depends=[cli rlang sf spdep]; broken = true; }; shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; broken = true; }; shinyrecap = derive2 { name="shinyrecap"; version="0.1.0"; sha256="1mic7azxz2in67g3a2ir550w8psh6kc75p6hja6m62a0yy7j2n92"; depends=[CARE1 coda conting dga future ggplot2 ipc LCMCR promises Rcapture reshape shiny shinycssloaders testthat]; broken = true; }; shinyypr = derive2 { name="shinyypr"; version="0.0.2"; sha256="1k6jsw6gnpwk90hkpa9grki0b68cab57vbd0h6ldjqr11giwcz8z"; depends=[bsplus chk dplyr DT ggplot2 lifecycle magrittr purrr readr shiny shinyjs waiter ypr]; broken = true; }; @@ -20523,6 +20743,7 @@ in with self; { smds = derive2 { name="smds"; version="1.0"; sha256="0aqf3wfn6mlsl8a32gaf9qdpyxwsx19g6mma8qzgaysdmk6vhbpd"; depends=[MASS]; broken = true; }; snappier = derive2 { name="snappier"; version="0.2.0"; sha256="0pnrmgv42kmw84ajh24as9fqyczcwsnbi8dyq20q4ndynlkrj5rb"; depends=[]; broken = true; }; snp_plotter = derive2 { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; broken = true; }; + snpEnrichment = derive2 { name="snpEnrichment"; version="1.7.0"; sha256="1lja1n26nr8lgbca2kraryv933jwa2w3h41appzylflf0w3liz9y"; depends=[ggplot2 snpStats]; broken = true; }; snpStatsWriter = derive2 { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace snpStats]; broken = true; }; snpar = derive2 { name="snpar"; version="1.0"; sha256="0c9myg748jm7khqs8yhg2glxgar1wcf6gyg0xwbmw0qc41myzfnq"; depends=[]; 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; }; @@ -20538,10 +20759,12 @@ in with self; { sparseSEM = derive2 { name="sparseSEM"; version="2.5"; sha256="0ig8apsi94kvbcq3i8nzmywbdizlss7c6r9bppcyl9lxgikc3cds"; depends=[]; broken = true; }; sparsebn = derive2 { name="sparsebn"; version="0.1.2"; sha256="1b1601n3nmxck6a27xqxpsa79p4xnz7yyzdfqiddn9zd2b4v9wc5"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; broken = true; }; spatialnbda = derive2 { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; broken = true; }; + spatstat_core = derive2 { name="spatstat.core"; version="2.4-4"; sha256="0fyi8y1z919nzn47kaviln7gflhcp5qdi3gfvf7nwkdix3pkk373"; depends=[abind goftest Matrix mgcv nlme rpart spatstat_data spatstat_geom spatstat_random spatstat_sparse spatstat_utils tensor]; broken = true; }; spe = derive2 { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; broken = true; }; speccalt = derive2 { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; broken = true; }; specmine = derive2 { name="specmine"; version="3.1.6"; sha256="0ik3nsb9mrja6709fwsf97f9qbf7lmmyc2zqrm7398h3mibf64l7"; depends=[baseline caret compare e1071 ellipse genefilter GGally ggplot2 impute imputeTS MASS Metrics mrbin narray pcaPP plotly pls RColorBrewer readJDX speaq specmine_datasets]; broken = true; }; specmine_datasets = derive2 { name="specmine.datasets"; version="0.0.2"; sha256="0amqb4qy5ac1jc4g95sf4678ll3xhscyrcxq6pgh8imfyk1ifrmx"; depends=[xcms]; broken = true; }; + 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]; broken = true; }; sped = derive2 { name="sped"; version="0.2-1"; sha256="05igpk8szdcs6kjhpmd9dmjvqdg199pz3hi0rwkhdjglxivvjzjn"; depends=[pooh]; broken = true; }; spfrontier = derive2 { name="spfrontier"; version="0.2.5"; sha256="1vnvwcjbhvbmyn5rp4760amzy8k3y156q629fjymw9rw6zy45pbf"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; broken = true; }; spftir = derive2 { name="spftir"; version="0.1.0"; sha256="07vw8igy698jx671cj6hmf6ll9xvaq81fb6la7j95pqbd6jl284z"; depends=[pracma]; broken = true; }; @@ -20550,9 +20773,12 @@ in with self; { splashr = derive2 { name="splashr"; version="0.6.0"; sha256="0l57w5gwr0p2049z1201nlqsy23h37gsybd1lj3vycxz43ir7213"; depends=[curl dplyr formatR HARtools httr jsonlite lubridate magick openssl purrr scales stevedore stringi xml2]; broken = true; }; spm12r = derive2 { name="spm12r"; version="2.8.3"; sha256="04bv4x7p2vv9n8zi5axpkcj13h6q08lc6qyd1czvxrpdmzsp40yb"; depends=[git2r matlabr neurobase oro_nifti R_utils]; broken = true; }; sporm = derive2 { name="sporm"; version="1.1.1"; sha256="1bj795kmzjjcwvnrwg7dfz4jbfj488iydm0s79wrsgdq4chrrgyb"; depends=[]; broken = true; }; + 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]; broken = true; }; spots = derive2 { name="spots"; version="0.1.0"; sha256="0q5jfb99hrlz5c1jnn4a96pg07bccbw0khfq8mvaq4r3vdykzmqy"; depends=[Matrix RSpectra]; broken = true; }; + spp = derive2 { name="spp"; version="1.16.0"; sha256="08zxxgyp0h6733b08jmml7k4rhfd3mi5dda3jrzid0s184y0z29w"; depends=[BH caTools Rcpp Rsamtools]; broken = true; }; sprm = derive2 { name="sprm"; version="1.2.2"; sha256="0iyijkjnyz4yx2cmazlnhkk0f5ls0c2q2aikwlzl13w6zbj040a8"; depends=[cvTools ggplot2 pcaPP reshape2 robustbase]; broken = true; }; sprsmdl = derive2 { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; broken = true; }; + spruce = derive2 { name="spruce"; version="0.99.1"; sha256="1kklv4d2ycjcxv183cpqa6qn46zn8nww1z8xn4sy7ipz394i10cf"; depends=[BayesLogit dplyr ggplot2 igraph MCMCpack mvtnorm patchwork Rcpp RcppArmadillo rlang Seurat tidyr tidyselect truncnorm]; broken = true; }; spsann = derive2 { name="spsann"; version="2.2.0"; sha256="00nlrwk50ch128brzvfxld0pcpq1syks9rvwdrcf1i2pcxnva7d0"; depends=[pedometrics Rcpp sp SpatialTools]; broken = true; }; sqlutils = derive2 { name="sqlutils"; version="1.2"; sha256="0dq4idg8i4hv9xg8jllllizqf3s75pdfm1wgncdjj52xhxh169pf"; depends=[DBI roxygen2 stringr]; broken = true; }; sqp = derive2 { name="sqp"; version="0.5"; sha256="0l01zwcryv5bmzmd98gj0m5ip8nvr8lziq1awvfif1bzwvvd2kzx"; depends=[Matrix Rcpp RcppArmadillo RcppEigen Rdpack]; broken = true; }; @@ -20572,25 +20798,30 @@ in with self; { stubthat = derive2 { name="stubthat"; version="1.2.1"; sha256="130naxzvswcyadwcgldvwnxxdxbfwx5vljac7901vn3ahjp75d8z"; depends=[testthat]; broken = true; }; sublime = derive2 { name="sublime"; version="1.3"; sha256="0455fppc68azxknxjvxci4kjpcj6c1jkp9adbxqrn3qnnywaj5v2"; depends=[AnalyzeFMRI downloader oro_nifti]; broken = true; }; subtype = derive2 { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; broken = true; }; - sugarbag = derive2 { name="sugarbag"; version="0.1.3"; sha256="05j2b9vbhpkfr3xkam9wgm0w4k8blnm1ssf9cd6l5f1y2rrqizsv"; depends=[dplyr geosphere lwgeom progress purrr rlang rmapshaper sf tibble tidyr utf8]; broken = true; }; superMDS = derive2 { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01ygisn6ihnapg9k5lr6nbkr96d3blpikk04"; depends=[]; broken = true; }; - superml = derive2 { name="superml"; version="0.5.5"; sha256="13g39ny3k7rwvx681v3bgdqb5s2cz9isphv36bmx7gv43mingadi"; depends=[assertthat BH data_table Metrics R6 Rcpp RcppArmadillo]; broken = true; }; support = derive2 { name="support"; version="0.1.5"; sha256="0gs6mva1lwanq4rm8l70sid28if2l0k249ydirqkz72lz12hg1br"; depends=[BH MHadaptive nloptr randtoolbox Rcpp RcppArmadillo]; broken = true; }; supportInt = derive2 { name="supportInt"; version="1.1"; sha256="14fh75sds05c06xkcfbijd8my3sa9kpnczzh96xx0gwj1193yya9"; depends=[ProfileLikelihood]; broken = true; }; supreme = derive2 { name="supreme"; version="1.1.0"; sha256="0y5kd911f7h754ppdpw94qw3r8vzz3yhyj5b99h3h96iifydlik6"; depends=[nomnoml shiny yaml]; broken = true; }; surrosurv = derive2 { name="surrosurv"; version="1.1.25"; sha256="05s1skjp1vzwai2nfw65ff4q2qhbj596lhfvzd1gdrbs39r90hxh"; depends=[copula eha lme4 MASS Matrix msm mvmeta optextras optimx parfm SurvCorr survival]; broken = true; }; + survJamda = derive2 { name="survJamda"; version="1.1.4"; sha256="14ly1g548ysm8jgsyrhj12zmd6i2lca7rsgby3jbwikyqyk1mx5q"; depends=[ecodist survcomp survival survivalROC survJamda_data]; broken = true; }; survMS = derive2 { name="survMS"; version="0.0.1"; sha256="0313pwf0l6wq9l4qjj1al9ybzm79kdxwzdrw6k0af706rxfzzha0"; depends=[ggplot2]; broken = true; }; survRatio = derive2 { name="survRatio"; version="0.1"; sha256="1xrqin3q3b7r8ga4i71ci97rsm4lj5ffd0720n7s563jkpnpyb9l"; depends=[ggplot2 ggpubr gridExtra survival]; broken = true; }; surveybootstrap = derive2 { name="surveybootstrap"; version="0.0.1"; sha256="13rp6gj1dgdzcjbi2403pldygp1dyqx8zj0r1nvyghpi06x5gpb7"; depends=[dplyr functional plyr Rcpp RcppArmadillo stringr]; broken = true; }; surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; broken = true; }; surveysd = derive2 { name="surveysd"; version="1.3.0"; sha256="0d5xjdlccqaa1h437rz5zq6a829rpz426m55jgprhfpcps1wfhbk"; depends=[data_table ggplot2 laeken Rcpp]; broken = true; }; + survivalREC = derive2 { name="survivalREC"; version="1.0"; sha256="1c4qvk2qd5ffn4kfkglwn3iyisnd2y0hzzn92c57vb94d4h057hx"; depends=[KernSmooth survival]; broken = true; }; survxai = derive2 { name="survxai"; version="0.2.2"; sha256="09ig561754kjzpay2hy3n62zlk0bgwkjy8vnslrr428r8m1lj0qr"; depends=[breakDown ggplot2 pec prodlim scales survival survminer]; broken = true; }; + svars = derive2 { name="svars"; version="1.3.9"; sha256="1i9wnfrgr9x6qfqhl9bc4wiz4wxmzjfcmg7wvy3zjrfszmibaf78"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange vars zoo]; broken = true; }; svdvisual = derive2 { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; broken = true; }; svmplus = derive2 { name="svmplus"; version="1.0.1"; sha256="08cfywrbaxyacqd3l75lysb23ahqbs80959iqkjbb125aafmhvni"; depends=[MASS Matrix quadprog]; 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; }; switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; broken = true; }; + sybil = derive2 { name="sybil"; version="2.2.0"; sha256="05ccq2m4z6akslymdm2vd3x99pi9z0ha1xcnhwvwcvibhqn9hmd5"; depends=[lattice Matrix]; broken = true; }; + sybilDynFBA = derive2 { name="sybilDynFBA"; version="1.0.2"; sha256="0351qlvyynygjf43q93gkqzzaff3v6gynvbks1ix1mank3afn226"; depends=[sybil]; broken = true; }; sybilccFBA = derive2 { name="sybilccFBA"; version="3.0.1"; sha256="1y94d6ajf0l492nrd8wsz3b6x724zcyhipasgyx65nx3sgha6yp8"; depends=[Matrix sybil]; broken = true; }; + sybilcycleFreeFlux = derive2 { name="sybilcycleFreeFlux"; version="2.0.2"; sha256="0s8yqzn7llzby5v1p7is7qv0m8dzwf14r3m32slf898nxrs131xr"; depends=[MASS Matrix sybil]; broken = true; }; symbols = derive2 { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; broken = true; }; + symphony = derive2 { name="symphony"; version="0.1.0"; sha256="0pwl9ahiv0xxc7j6448cja77fvcng28gdwhhr1z0qmhjsdcxadxq"; depends=[class data_table dplyr ggplot2 ggrastr ggrepel harmony irlba magrittr Matrix purrr RANN RColorBrewer Rcpp RcppArmadillo rlang tibble tidyr uwot]; broken = true; }; synRNASeqNet = derive2 { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[GenKern igraph KernSmooth parmigene]; broken = true; }; synfd = derive2 { name="synfd"; version="0.1.3"; sha256="1h8vfrfw00449vjbj6z4y7m5p7rxzvqjcykyxw5sb473f63gr5px"; depends=[L1pack Rdpack]; broken = true; }; systemicrisk = derive2 { name="systemicrisk"; version="0.4.2"; sha256="021ypw9fag5kmk2q041pj2jfzgfg640yda7wvh0yzdmg73p6fvsw"; depends=[lpSolve Rcpp]; broken = true; }; @@ -20600,6 +20831,7 @@ in with self; { tabulizerjars = derive2 { name="tabulizerjars"; version="1.0.1"; sha256="005n2gyzzmq8h0mpj8xs6ri6llzwag7nqzpm4vnzp81vwy8kmf92"; depends=[rJava]; broken = true; }; tabxplor = derive2 { name="tabxplor"; version="1.1.0"; sha256="03m4v9zpqy62kjrbjp6asc9k90fy00gl0si34nmdaqdvj1pr2s0f"; depends=[cli crayon data_table DescTools dplyr forcats kableExtra magrittr pillar purrr rlang stringi stringr tibble tidyr tidyselect vctrs]; broken = true; }; tangles = derive2 { name="tangles"; version="0.8.1"; sha256="06a5hn5hkvgr6pcjz3n0vi1zwmv00wypi5f62agqh8mas80v44vh"; depends=[digest raster sp]; broken = true; }; + tangram = derive2 { name="tangram"; version="0.8.1"; sha256="1vmh3wk4vk25x6i5z9wrxdlhald406a6rfw1pivv7xrw659kaznv"; depends=[base64enc digest htmltools knitr magrittr R6 stringi stringr]; broken = true; }; taxotools = derive2 { name="taxotools"; version="0.0.129"; sha256="07i09vx5gwgy2sv4rgklbjsx38yd4pn5xshd8xgipk5yrvvxygd9"; depends=[plyr rmarkdown sqldf stringdist stringi stringr taxize wikitaxa]; broken = true; }; tbart = derive2 { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; broken = true; }; tcensReg = derive2 { name="tcensReg"; version="0.1.7"; sha256="07wwn65c4q2ngafxhdd9vl0y1wambfy158mf38skxm295yidd05n"; depends=[maxLik Rdpack]; broken = true; }; @@ -20611,7 +20843,6 @@ in with self; { threeboost = derive2 { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; broken = true; }; thsls = derive2 { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; broken = true; }; thunder = derive2 { name="thunder"; version="0.3.0"; sha256="0lzaab5acgy4s7qkq10l0yfdgrsya74757a025j205jin4m49hai"; depends=[aiRthermo climate dplyr Rcpp]; broken = true; }; - tibblify = derive2 { name="tibblify"; version="0.1.0"; sha256="0mdi9x36nrlcbchl7b2rlf4j1k0y6c7657aznm7xa0396ciij5fk"; depends=[crayon purrr rlang tibble vctrs]; broken = true; }; tidyMicro = derive2 { name="tidyMicro"; version="1.47"; sha256="02pc6rh0l7xdrqhihi53zp17x0walc0mpm70spm7yrwzkbc486lv"; depends=[ade4 broom car cowplot dplyr Evomorph factoextra ggplot2 ggrepel gridExtra latex2exp lme4 lsr magrittr MASS Matrix plotly plyr png purrr rlang scales scatterplot3d shapes stringr ThreeWay tibble tidyr tidyverse vegan VGAM]; broken = true; }; tidylab = derive2 { name="tidylab"; version="4.1.1"; sha256="052wgx4dfbr806b9r0cfblkwaf1qnrlf5ngm1c029ggss3br7ki4"; depends=[cli crayon decorators dplyr microservices purrr rstudioapi tibble usethat]; broken = true; }; tidyndr = derive2 { name="tidyndr"; version="0.2.1"; sha256="0scjqnyl78aqqc03adlv3v0i67k3pi2a6m0cg6cxypaxhzzb2xg0"; depends=[dplyr forcats janitor lubridate magrittr purrr rlang stringr tibble tidyr tidyselect vroom]; broken = true; }; @@ -20627,7 +20858,7 @@ in with self; { tlsh = derive2 { name="tlsh"; version="0.1.0"; sha256="0106y17cr3hq09ahy3rxhxqzgc0655w2jr0s3iyr8zvxsdv5ahb5"; depends=[bit64 blink igraph plyr]; broken = true; }; tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; broken = true; }; tmle_npvi = derive2 { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[geometry MASS Matrix R_methodsS3 R_oo R_utils]; broken = true; }; - toRvik = derive2 { name="toRvik"; version="1.1.0"; sha256="1x5xz6wngn6svkf9awzlr71lsp9mk9w640fx5y12aqjrrw9q2x7v"; depends=[cli crayon data_table dplyr glue httr janitor jsonlite lubridate magrittr purrr readr rlang rvest stringr tidyr withr]; broken = true; }; + toRvik = derive2 { name="toRvik"; version="1.1.1"; sha256="09b4c5j3wsiawx5pc1n6ga4qs1s0ybavh1drz6s2ikrpdvb62724"; depends=[cli crayon data_table dplyr glue httr janitor jsonlite lubridate magrittr purrr readr rlang rvest stringr tidyr withr]; broken = true; }; tobit1 = derive2 { name="tobit1"; version="0.1-3"; sha256="08rq1h3psxjzzfna6krji4ixrbd43v77qb9k00v1rysarlqyg0k1"; depends=[Formula generics margins numDeriv prediction Rdpack tibble]; broken = true; }; torchaudio = derive2 { name="torchaudio"; version="0.2.0"; sha256="1bzx428lzjdwb9ds2pcq7nlalg75s7bvmiimjw3k8lvbq50yjlyh"; depends=[fs glue rappdirs Rcpp rlang torch withr]; broken = true; }; tosls = derive2 { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; broken = true; }; @@ -20636,20 +20867,25 @@ in with self; { trackr = derive2 { name="trackr"; version="0.10.7"; sha256="0h7ihymdvfvnnyxfxjwshslrxngh3i2ksqvhxynrp46m20mwjavd"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools lattice miniUI RJSONIO rlang rmarkdown roprov rsolr shiny]; broken = true; }; translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; broken = true; }; translateR = derive2 { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; broken = true; }; - treePlotArea = derive2 { name="treePlotArea"; version="1.3.0"; sha256="0y433q57xw1dxlxxqkyrfjdcgymcccakp1as82y949zxl3jbra4r"; depends=[fritools sf]; broken = true; }; + translation_ko = derive2 { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; broken = true; }; treelet = derive2 { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; broken = true; }; treeman = derive2 { name="treeman"; version="1.1.4"; sha256="1rlq8sklvpj6an8x9wvs3501y6dpl2vhl5zfmz0yvmif04msf49v"; depends=[ape bigmemory plyr RJSONIO stringr]; broken = true; }; treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; broken = true; }; + 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]; broken = true; }; triggerstrategy = derive2 { name="triggerstrategy"; version="1.1.0"; sha256="1gly2brw0glcnx8is4mrlrbxgnma57vpfid5lkpz2wdakwn7y2by"; depends=[GA gsrsb ldbounds mvtnorm nleqslv]; broken = true; }; trimTrees = derive2 { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[mlbench randomForest]; broken = true; }; trioGxE = derive2 { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[gtools mgcv msm]; broken = true; }; + trip = derive2 { name="trip"; version="1.8.5"; sha256="160dp9ji8j4w2fwh62l6cp485iy5n5is451rbgf28d5q0prd912c"; depends=[crsmeta dplyr geodist glue MASS raster reproj rlang sp spatstat_core spatstat_geom traipse viridis]; broken = true; }; tropicalSparse = derive2 { name="tropicalSparse"; version="0.1.0"; sha256="1ay6i3pzz5lpvznxqln31mijp86p6z0df7rvp0gm4lxvn294m7f8"; depends=[]; broken = true; }; trueskill = derive2 { name="trueskill"; version="0.1"; sha256="0mqvm64fcsxjlh789lqdk6l28q31yhh6jjirwjlgbpxxb90c5107"; depends=[]; broken = true; }; truncgof = derive2 { name="truncgof"; version="0.6-0"; sha256="0b499i9zjwvva5jfl9fj02jjrgy8myxqfjwa0cjg0jrpgxczgwg8"; depends=[MASS]; broken = true; }; + truthiness = derive2 { name="truthiness"; version="1.2.5"; sha256="0cssqlrilx2lglr2f53yysqgf604g4y326ijf8avlg6v5l6hlcr1"; depends=[dplyr DT emmeans ez forcats ggplot2 lme4 magrittr MASS ordinal purrr Rdpack readr rmarkdown tibble tidyr]; broken = true; }; tsc = derive2 { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw6f14zvcsjhrmmdfd4bmwh36y"; depends=[]; broken = true; }; + tsgui = derive2 { name="tsgui"; version="0.2.1"; sha256="0crm2ripxpjaz1cqz9lkj3y9xj4ia0hlq4lvz1rff0wq6d5w79dn"; depends=[RandomFieldsUtils tcltk2 tkrplot]; broken = true; }; ttwa = derive2 { name="ttwa"; version="0.8.5.1"; sha256="1lhypcwssq0dspizvln3w4dg16ad6mz8cj4w34c5vsrayqid7fyn"; depends=[data_table]; broken = true; }; tumblR = derive2 { name="tumblR"; version="1.2"; sha256="1qili2c9wb6hpjjf7m0gyvdymzls5w4pghjkyi3sbp0q7ayhbh12"; depends=[httr RCurl RJSONIO stringr]; broken = true; }; turfR = derive2 { name="turfR"; version="0.8-7"; sha256="007jmkppfv1x4zzvvd65fhg5k15ybjhsya2zfjgwm77wm34y81ca"; depends=[dplyr]; broken = true; }; + tutorial = derive2 { name="tutorial"; version="0.4.3"; sha256="0sxdlpw0w4azlaxdlk36ycrric6pbj2zi4nyv26pgsp0cr1hrx6r"; depends=[base64enc knitr markdown rjson]; broken = true; }; tvd = derive2 { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp]; broken = true; }; twiddler = derive2 { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; broken = true; }; uFTIR = derive2 { name="uFTIR"; version="0.1.4"; sha256="1blgwn6i0dadmr7vml6rbniv103mgr9hgx2dwgcxbagfyv00ah24"; depends=[raster Rcpp RcppArmadillo sp]; broken = true; }; @@ -20658,12 +20894,12 @@ in with self; { unbalanced = derive2 { name="unbalanced"; version="2.0"; sha256="18hy9nnq42s1viij0a5i9wzrrfmmbf7y3yzjzymz2wnrx4f2pqwv"; depends=[doParallel FNN foreach mlr RANN]; broken = true; }; unfoldr = derive2 { name="unfoldr"; version="0.7.1"; sha256="1khas7d04g4y2kwldnsja5xk1n5mys2s66pln3l0gqlsbk67na12"; depends=[]; broken = true; }; uniftest = derive2 { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; broken = true; }; + uniswappeR = derive2 { name="uniswappeR"; version="0.6.0"; sha256="0n180v0kya6djkd3zngn4zvqzga3dhav41r94ckbzb1yww5ck1vd"; depends=[dplyr ggplot2 ghql httr jsonlite lubridate patchwork purrr reticulate rlang scales tibble tidyr]; broken = true; }; uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; broken = true; }; uplifteval = derive2 { name="uplifteval"; version="0.1.0"; sha256="1gnn40c47rpx40j210bz6fb48d70p6spv3drr8hd5b3vzfz6686c"; depends=[dplyr ggplot2 gridExtra whisker]; broken = true; }; usethat = derive2 { name="usethat"; version="0.3.0"; sha256="0i6nw3vgll6i31l95iflhq88ssw86pmz46jgw8g6k6f58rgnykmc"; depends=[microservices purrr usethis withr]; broken = true; }; usethis2 = derive2 { name="usethis2"; version="0.2.0"; sha256="0ljvfgwg73y71yvyz2pp4c1rzgiqk1x7kmgswxa1ay05zwdgyi0x"; depends=[microservices purrr usethis withr]; broken = true; }; valuer = derive2 { name="valuer"; version="1.1.2"; sha256="0mbwzsvy34ppngyxdzpd9w1r4f00cik4maqab9kpiflrrv9xdp78"; depends=[ggplot2 orthopolynom R6 Rcpp RcppEigen timeDate yuima]; broken = true; }; - vapour = derive2 { name="vapour"; version="0.8.5"; sha256="14sxn4vdig31vflrbyzpkqfwdcf9xj468wxd7yicvca0ibmr80yf"; depends=[Rcpp]; broken = true; }; vbdm = derive2 { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; broken = true; }; vbsr = derive2 { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; broken = true; }; vcrpart = derive2 { name="vcrpart"; version="1.0-4"; sha256="1mg87jpdih33lalxhfcxbri439d4cgi7hqdrnvijr7qabjmnc7p4"; depends=[formula_tools nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; broken = true; }; @@ -20693,13 +20929,13 @@ in with self; { wordbankr = derive2 { name="wordbankr"; version="1.0.0"; sha256="1jcls9pw0qwf14d9f1kwyd77yrwmcx7k4hzs1h2dli29mvi6hcxg"; depends=[assertthat DBI dbplyr dplyr glue jsonlite lifecycle purrr quantregGrowth rlang RMySQL robustbase stringr tidyr]; broken = true; }; wordmatch = derive2 { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; broken = true; }; wvtool = derive2 { name="wvtool"; version="1.0"; sha256="0x9awj6g5lzqp2lhwgh9ib7jmfdzyhwazrjvw1vwacqqfhbz8qxv"; depends=[]; broken = true; }; - wwntests = derive2 { name="wwntests"; version="1.0.1"; sha256="1algk2f55dg526zjw2ycfx2dq13m3lvfs75444iyp8fvq7j3wbcs"; depends=[ftsa MASS rainbow sde]; 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; }; xmeta = derive2 { name="xmeta"; version="1.3-0"; sha256="1yyqxrdfn23sqfa9765vj5fcwz2v46jvaa9wjkv1w4mvb2k2si4k"; depends=[aod glmmML MASS metafor mvmeta numDeriv plotrix]; broken = true; }; xpose_nlmixr = derive2 { name="xpose.nlmixr"; version="0.3.0"; sha256="1qxcq18mp5zxc7karixjfi93zm5mvpfnvp8sd8x0ibdbq8vk20my"; depends=[crayon dplyr ggplot2 magrittr nlme nlmixr rlang stringr tibble tidyr vpc xpose]; broken = true; }; xspliner = derive2 { name="xspliner"; version="0.0.4"; sha256="1j3wlw39r3ahhdfq3rks1zhnlmz14f4wk7bl7gf94yffasqg6k2r"; depends=[dplyr ggplot2 magrittr mgcv pdp pROC purrr tidyr]; broken = true; }; + xtreg2way = derive2 { name="xtreg2way"; version="1.0.0"; sha256="0wllz0frakmadavgpqhd2b8fiw6wgwh5wzd270czc6cm5bq9gfng"; depends=[MASS Matrix pracma]; broken = true; }; xtune = derive2 { name="xtune"; version="0.1.0"; sha256="0bpf1cx7v7q0a1jip04xd0bjg9ilagrf7wg7a9y0m6wgw7s2b9jn"; depends=[glmnet selectiveInference]; broken = true; }; xyz = derive2 { name="xyz"; version="0.2"; sha256="13w4sb4pvgciwr8wsz785dafj2k2kpx7znz46r5d32wx88vkycp4"; depends=[Rcpp]; broken = true; }; yakmoR = derive2 { name="yakmoR"; version="0.1.1"; sha256="09aklz79s0911p2wnpd7gc6vrbr9lmiskhkahsc63pdigggmq9f7"; depends=[BBmisc checkmate Rcpp]; broken = true; }; @@ -20709,4 +20945,6 @@ in with self; { yowie = derive2 { name="yowie"; version="0.1.0"; sha256="1sm3dg4sirvlb17ciwldvnc1zzfgwxm38x1k2n99nwa6sygn1nrw"; depends=[tsibble]; broken = true; }; yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; 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; }; + zbank = derive2 { name="zbank"; version="0.1.0"; sha256="0vzvlri3sncvbz2cdg8wzlpskm1lq9ji0jrfy5cx4ib19m6gxhpc"; depends=[crul jsonlite tibble]; broken = true; }; + ziphsmm = derive2 { name="ziphsmm"; version="2.0.6"; sha256="0lm6m2g9jd1v7gxv4viych8c59phbvz1yly1ydgajl8q251d8n87"; depends=[pracma Rcpp RcppArmadillo]; broken = true; }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 7571c81ac32c..a01c053f2ee6 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -321,13 +321,14 @@ let Biostrings = [ pkgs.zlib ]; bnpmr = [ pkgs.gsl ]; cairoDevice = [ pkgs.gtk2.dev ]; - Cairo = with pkgs; [ libtiff libjpeg cairo.dev xlibsWrapper fontconfig.lib ]; + Cairo = with pkgs; [ libtiff libjpeg cairo.dev xorg.libXt.dev fontconfig.lib ]; Cardinal = [ pkgs.which ]; chebpol = [ pkgs.fftw.dev ]; ChemmineOB = with pkgs; [ openbabel pkg-config ]; + classInt = lib.optional stdenv.isDarwin [ pkgs.libiconv ]; curl = [ pkgs.curl.dev ]; data_table = [ pkgs.zlib.dev ] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; - devEMF = with pkgs; [ xorg.libXft.dev xlibsWrapper ]; + devEMF = with pkgs; [ xorg.libXft.dev ]; diversitree = with pkgs; [ gsl fftw ]; exactextractr = [ pkgs.geos ]; EMCluster = [ pkgs.lapack ]; @@ -346,7 +347,7 @@ let haven = with pkgs; [ libiconv zlib.dev ]; h5vc = [ pkgs.zlib.dev ]; HiCseg = [ pkgs.gsl ]; - imager = [ pkgs.xlibsWrapper ]; + imager = [ pkgs.xorg.libX11.dev ]; iBMQ = [ pkgs.gsl ]; igraph = with pkgs; [ gmp libxml2.dev ]; JavaGD = [ pkgs.jdk ]; @@ -511,14 +512,14 @@ let nat = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ]; - bigmemory = [ pkgs.libuuid.dev ]; + bigmemory = lib.optionals stdenv.isLinux [ pkgs.libuuid.dev ]; clustermq = [ pkgs.pkg-config ]; RMark = [ pkgs.which ]; RPushbullet = [ pkgs.which ]; RcppEigen = [ pkgs.libiconv ]; RCurl = [ pkgs.curl.dev ]; R2SWF = [ pkgs.pkg-config ]; - rgl = with pkgs; [ libGLU libGLU.dev libGL xlibsWrapper ]; + rgl = with pkgs; [ libGLU libGLU.dev libGL xorg.libX11.dev freetype.dev libpng.dev ]; RGtk2 = [ pkgs.pkg-config ]; RProtoBuf = [ pkgs.pkg-config ]; Rpoppler = [ pkgs.pkg-config ]; diff --git a/pkgs/development/rocm-modules/update-script/default.nix b/pkgs/development/rocm-modules/update-script/default.nix new file mode 100644 index 000000000000..6188587de31a --- /dev/null +++ b/pkgs/development/rocm-modules/update-script/default.nix @@ -0,0 +1,32 @@ +{ lib +, writeScript +}: + +{ name ? "" +, owner ? "" +, repo ? "" +, page ? "releases?per_page=1" +, filter ? ".[0].tag_name | split(\"-\") | .[1]" +}: + +let + pname = + if lib.hasPrefix "rocm-llvm-" name + then "llvmPackages_rocm.${lib.removePrefix "rocm-llvm-" name}" + else name; + + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + -sL "https://api.github.com/repos/${owner}/${repo}/${page}" | jq '${filter}' --raw-output)" + + IFS='.' read -a version_arr <<< "$version" + + if [ "''${#version_arr[*]}" == 2 ]; then + version="''${version}.0" + fi + + update-source-version ${pname} "$version" --ignore-same-hash + ''; +in [ updateScript ] diff --git a/pkgs/development/ruby-modules/bundler-update-script/default.nix b/pkgs/development/ruby-modules/bundler-update-script/default.nix index 50d0364aa067..fce983a0e8ef 100644 --- a/pkgs/development/ruby-modules/bundler-update-script/default.nix +++ b/pkgs/development/ruby-modules/bundler-update-script/default.nix @@ -13,7 +13,7 @@ let attrPath=$1 toplevel=$(git rev-parse --show-toplevel) - position=$(nix eval -f "$toplevel" --raw "$attrPath.meta.position") + position=$(nix --extra-experimental-features nix-command eval -f "$toplevel" --raw "$attrPath.meta.position") gemdir=$(dirname "$position") cd "$gemdir" diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 5ba3503d9861..0483feccb6ef 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -1,31 +1,40 @@ -{ lib, buildRubyGem, ruby, writeScript }: +{ lib, buildRubyGem, ruby, writeScript, testers, bundler }: buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.3.25"; - source.sha256 = "sha256-/YHsRjXEGJtm/QeJU31cs4s4ELcHZfbh6C3aFbl1ka0="; + version = "2.4.6"; + source.sha256 = "sha256-MI/g13w5NMoHQ78AJ11BlKhulroUI6xNPqQ19iH51P8="; dontPatchShebangs = true; - passthru.updateScript = writeScript "gem-update-script" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl common-updater-scripts jq - - set -eu -o pipefail - - latest_version=$(curl -s https://rubygems.org/api/v1/gems/${gemName}.json | jq --raw-output .version) - update-source-version ${gemName} "$latest_version" - ''; - postFixup = '' sed -i -e "s/activate_bin_path/bin_path/g" $out/bin/bundle ''; + passthru = { + updateScript = writeScript "gem-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts jq + + set -eu -o pipefail + + latest_version=$(curl -s https://rubygems.org/api/v1/gems/${gemName}.json | jq --raw-output .version) + update-source-version ${gemName} "$latest_version" + ''; + tests.version = testers.testVersion { + package = bundler; + command = "bundler -v"; + version = version; + }; + }; + meta = with lib; { description = "Manage your Ruby application's gem dependencies"; homepage = "https://bundler.io"; + changelog = "https://github.com/rubygems/rubygems/blob/bundler-v${version}/bundler/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [anthonyroussel]; + maintainers = with maintainers; [ anthonyroussel ]; + mainProgram = "bundler"; }; } diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 2885eeb04119..9f2e8dbfcd11 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -14,7 +14,7 @@ # gems that don't behave correctly, fixes are already provided in the form of # derivations. # -# This seperates "what to build" (the exact gem versions) from "how to build" +# This separates "what to build" (the exact gem versions) from "how to build" # (to make gems behave if necessary). { lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which @@ -26,7 +26,7 @@ , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk , bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie -, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb +, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb, libyaml }@args: let @@ -384,6 +384,9 @@ in --replace "location = Libv8::Location::Vendor.new" \ "location = Libv8::Location::System.new" ''; + meta.broken = true; # At 2023-01-20, errors as: + # "Failed to build gem native extension." + # Requires Python 2. Project is abandoned. }; execjs = attrs: { @@ -541,6 +544,10 @@ in ]; }; + psych = attrs: { + buildInputs = [ libyaml ]; + }; + puma = attrs: { buildInputs = [ openssl ]; }; diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 32bf8ed82079..dbb9e4f451cc 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { inherit ruby; inherit dontBuild; inherit dontStrip; - inherit type; + gemType = type; nativeBuildInputs = [ ruby makeWrapper @@ -143,7 +143,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { buildPhase = attrs.buildPhase or '' runHook preBuild - if [[ "$type" == "gem" ]]; then + if [[ "$gemType" == "gem" ]]; then if [[ -z "$gemspec" ]]; then gemspec="$(find . -name '*.gemspec')" echo "found the following gemspecs:" @@ -158,7 +158,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { gempkg=$(echo "$output" | grep -oP 'File: \K(.*)') echo "gem package built: $gempkg" - elif [[ "$type" == "git" ]]; then + elif [[ "$gemType" == "git" ]]; then git init # remove variations to improve the likelihood of a bit-reproducible output rm -rf .git/logs/ .git/hooks/ .git/index .git/FETCH_HEAD .git/ORIG_HEAD .git/refs/remotes/origin/HEAD .git/config diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile index f11828cb835e..479981419801 100644 --- a/pkgs/development/ruby-modules/with-packages/Gemfile +++ b/pkgs/development/ruby-modules/with-packages/Gemfile @@ -78,6 +78,7 @@ gem 'idn-ruby' gem 'jbuilder' gem 'jekyll' gem 'jekyll-favicon' +gem 'jekyll-webmention_io' gem 'jmespath' gem 'jwt' gem 'kramdown-rfc2629' diff --git a/pkgs/development/skaware-packages/default.nix b/pkgs/development/skaware-packages/default.nix new file mode 100644 index 000000000000..02dc064ecb72 --- /dev/null +++ b/pkgs/development/skaware-packages/default.nix @@ -0,0 +1,33 @@ +{ lib, pkgs }: + +lib.makeScope pkgs.newScope (self: + let + inherit (self) callPackage; + in { + buildManPages = callPackage ./build-skaware-man-pages.nix { }; + buildPackage = callPackage ./build-skaware-package.nix { }; + cleanPackaging = callPackage ./clean-packaging.nix { }; + + execline = callPackage ./execline { }; + execline-man-pages = callPackage ./execline-man-pages { }; + + mdevd = callPackage ./mdevd { }; + nsss = callPackage ./nsss { }; + sdnotify-wrapper = callPackage ./sdnotify-wrapper { }; + utmps = callPackage ./utmps { }; + + skalibs = callPackage ./skalibs { }; + skalibs_2_10 = callPackage ./skalibs/2_10.nix { }; + + s6 = callPackage ./s6 { }; + s6-dns = callPackage ./s6-dns { }; + s6-linux-init = callPackage ./s6-linux-init { }; + s6-linux-utils = callPackage ./s6-linux-utils { }; + s6-networking = callPackage ./s6-networking { }; + s6-portable-utils = callPackage ./s6-portable-utils { }; + s6-rc = callPackage ./s6-rc { }; + + s6-man-pages = callPackage ./s6-man-pages { }; + s6-networking-man-pages = callPackage ./s6-networking-man-pages { }; + s6-portable-utils-man-pages = callPackage ./s6-portable-utils-man-pages { }; +}) diff --git a/pkgs/development/skaware-packages/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix index 953a08105167..204e305041af 100644 --- a/pkgs/development/skaware-packages/execline/default.nix +++ b/pkgs/development/skaware-packages/execline/default.nix @@ -2,7 +2,7 @@ with skawarePackages; let - version = "2.9.0.1"; + version = "2.9.1.0"; # Maintainer of manpages uses following versioning scheme: for every # upstream $version he tags manpages release as ${version}.1, and, @@ -11,15 +11,15 @@ let manpages = fetchFromGitHub { owner = "flexibeast"; repo = "execline-man-pages"; - rev = "v2.9.0.0.1"; - sha256 = "sha256-hT0YsuYJ3XSMYwtlwDR8PGlD8ng8XPky93rCprruHu8="; + rev = "v2.9.1.0.1"; + sha256 = "nZzzQFMUPmIgPS3aAIgcORr/TSpaLf8UtzBUFD7blt8="; }; in buildPackage { inherit version; pname = "execline"; - sha256 = "sha256-ASYPyvgP+8oqlKpV6kdN+545swM7VciviBJnkYeVMfY="; + sha256 = "tdaOAh+gxGeQidJlEQpsgfTswUEGe/aG3MtL/QYcBAQ="; description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; diff --git a/pkgs/development/skaware-packages/mdevd/default.nix b/pkgs/development/skaware-packages/mdevd/default.nix index 2a55676fc767..0c471087750d 100644 --- a/pkgs/development/skaware-packages/mdevd/default.nix +++ b/pkgs/development/skaware-packages/mdevd/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "mdevd"; - version = "0.1.5.2"; - sha256 = "sha256-RgNys9O6yfNXQVbtfkhhj59KNhy1LESUrZBjJIq0pP8="; + version = "0.1.6.1"; + sha256 = "XAHk55QW22zZk++KkBRii48fC2xkMnWYhIhRL6pUBLE="; description = "mdev-compatible Linux hotplug manager daemon"; platforms = lib.platforms.linux; @@ -21,6 +21,7 @@ buildPackage { postInstall = '' # remove all mdevd executables from build directory rm $(find -type f -mindepth 1 -maxdepth 1 -executable) + rm libmdevd.* mv doc $doc/share/doc/mdevd/html mv examples $doc/share/doc/mdevd/examples diff --git a/pkgs/development/skaware-packages/nsss/default.nix b/pkgs/development/skaware-packages/nsss/default.nix index e6db2aee60c5..95d83ce7424d 100644 --- a/pkgs/development/skaware-packages/nsss/default.nix +++ b/pkgs/development/skaware-packages/nsss/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "nsss"; - version = "0.2.0.1"; - sha256 = "0nqjnfqvzzn4i45h849b3n8qwcrzd5wlrwlvkmjdga5k4yk4x63x"; + version = "0.2.0.2"; + sha256 = "e6XqmitSjoNhJ1DkiRzZulbVxE9TCrxCRTqLk5Cmwuw="; description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions."; diff --git a/pkgs/development/skaware-packages/s6-dns/default.nix b/pkgs/development/skaware-packages/s6-dns/default.nix index 3c1e984f86c5..a4f018621f11 100644 --- a/pkgs/development/skaware-packages/s6-dns/default.nix +++ b/pkgs/development/skaware-packages/s6-dns/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-dns"; - version = "2.3.5.4"; - sha256 = "sha256-dq8iJHLEdU+DzcWa01QlXOGx5vaDOgWTKEY/jlH020M="; + version = "2.3.5.5"; + sha256 = "VpebXVElw4BxqAtePfDUprKnxSu4Y6JBC249eX/+Hug="; description = "A suite of DNS client programs and libraries for Unix systems"; diff --git a/pkgs/development/skaware-packages/s6-linux-init/default.nix b/pkgs/development/skaware-packages/s6-linux-init/default.nix index 27773a90e283..81243b092cfd 100644 --- a/pkgs/development/skaware-packages/s6-linux-init/default.nix +++ b/pkgs/development/skaware-packages/s6-linux-init/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-linux-init"; - version = "1.0.8.0"; - sha256 = "sha256-kgVaeWTPZmBAZq2WSiwjku58XmSCG+AxRsE0Hg2MPcY="; + version = "1.0.8.1"; + sha256 = "KdBjEZRQGQJEju0MRoQNYNgOs7uXr8MwtNEVYUSPx8w="; description = "A set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel"; platforms = lib.platforms.linux; diff --git a/pkgs/development/skaware-packages/s6-linux-utils/default.nix b/pkgs/development/skaware-packages/s6-linux-utils/default.nix index 98199516a04e..afca1f30de46 100644 --- a/pkgs/development/skaware-packages/s6-linux-utils/default.nix +++ b/pkgs/development/skaware-packages/s6-linux-utils/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-linux-utils"; - version = "2.6.0.0"; - sha256 = "sha256-bHEyc0oMgocALuaRDEafF1qX12aoAjwMM6+LqSZD7Vk="; + version = "2.6.0.1"; + sha256 = "/YUZIdSrthHrry0Nby2VNAlS5+fc1b/FQRUSCuDeGeQ="; description = "A set of minimalistic Linux-specific system utilities"; platforms = lib.platforms.linux; diff --git a/pkgs/development/skaware-packages/s6-man-pages/default.nix b/pkgs/development/skaware-packages/s6-man-pages/default.nix index 44430eacbe08..16837746e2fa 100644 --- a/pkgs/development/skaware-packages/s6-man-pages/default.nix +++ b/pkgs/development/skaware-packages/s6-man-pages/default.nix @@ -2,8 +2,8 @@ buildManPages { pname = "s6-man-pages"; - version = "2.11.1.1.1"; - sha256 = "sha256-W1+f65+Su1ZjCtzstn/fqWyU9IlQMThd/1lOg1cbCaE="; + version = "2.11.2.0.1"; + sha256 = "LHpQgM+uMDdGYfdaMlhP1bA7Y4UgydUJaDJr7fZlq5Y="; description = "Port of the documentation for the s6 supervision suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; } diff --git a/pkgs/development/skaware-packages/s6-networking-man-pages/default.nix b/pkgs/development/skaware-packages/s6-networking-man-pages/default.nix index 99dc9b891f57..9b36093c6e55 100644 --- a/pkgs/development/skaware-packages/s6-networking-man-pages/default.nix +++ b/pkgs/development/skaware-packages/s6-networking-man-pages/default.nix @@ -2,8 +2,8 @@ buildManPages { pname = "s6-networking-man-pages"; - version = "2.5.1.1.1"; - sha256 = "sha256-RGXOSCsl1zfiXf5pIgsex/6LWtKh7ne0R7rqHvnQB8E="; + version = "2.5.1.2.1"; + sha256 = "ffTfHqINi0vXGVHbk926U48fxZInrn4AMlSqODOWevo="; description = "Port of the documentation for the s6-networking suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; } diff --git a/pkgs/development/skaware-packages/s6-networking/default.nix b/pkgs/development/skaware-packages/s6-networking/default.nix index 6eae406fa22a..687a8f180c77 100644 --- a/pkgs/development/skaware-packages/s6-networking/default.nix +++ b/pkgs/development/skaware-packages/s6-networking/default.nix @@ -19,8 +19,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport}; buildPackage { pname = "s6-networking"; - version = "2.5.1.1"; - sha256 = "sha256-esedTePZwTUy5ESrdJfE4ErQ+nIp1QKYTZ3H1IqmRBg="; + version = "2.5.1.2"; + sha256 = "0HLetnpMpNfFEmQMXzOnZse4VDZJSXJ9NgBzjGdp8UY="; description = "A suite of small networking utilities for Unix systems"; diff --git a/pkgs/development/skaware-packages/s6-portable-utils-man-pages/default.nix b/pkgs/development/skaware-packages/s6-portable-utils-man-pages/default.nix index 6380071d7629..d391add7166b 100644 --- a/pkgs/development/skaware-packages/s6-portable-utils-man-pages/default.nix +++ b/pkgs/development/skaware-packages/s6-portable-utils-man-pages/default.nix @@ -2,8 +2,8 @@ buildManPages { pname = "s6-portable-utils-man-pages"; - version = "2.2.5.0.1"; - sha256 = "sha256-pIh+PKqKJTkaHyYrbWEEzdGDSzEO9E+ekTovu4SVSs4="; + version = "2.2.5.1.1"; + sha256 = "5up4IfsoHJGYwnDJVnnPWU9sSWS6qq+/6ICtHYjI6pg="; description = "Port of the documentation for the s6-portable-utils suite to mdoc"; maintainers = [ lib.maintainers.somasis ]; } diff --git a/pkgs/development/skaware-packages/s6-portable-utils/default.nix b/pkgs/development/skaware-packages/s6-portable-utils/default.nix index 490a38e1031b..9b73c1ac9bc0 100644 --- a/pkgs/development/skaware-packages/s6-portable-utils/default.nix +++ b/pkgs/development/skaware-packages/s6-portable-utils/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-portable-utils"; - version = "2.2.5.0"; - sha256 = "sha256-67OfiTT9NvJdMTUuYbvZTcArHp8EQRhQ0v2WWL2RbjY="; + version = "2.2.5.1"; + sha256 = "RXMd0uZ0QNEk55sIRDGh66jC0SN/Fyi2l35TOv93ra4="; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; diff --git a/pkgs/development/skaware-packages/s6-rc/default.nix b/pkgs/development/skaware-packages/s6-rc/default.nix index 0f2662fd7240..881d4748fd42 100644 --- a/pkgs/development/skaware-packages/s6-rc/default.nix +++ b/pkgs/development/skaware-packages/s6-rc/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-rc"; - version = "0.5.3.2"; - sha256 = "sha256-TySklmpKo1PSvRqK/Km4jHt70pxGs6Gn9TBWhrnW4Dg="; + version = "0.5.3.3"; + sha256 = "M5jxDAYy45vWnkirVtVv3mtIx/AgDq0Dom+ygwkIZSo="; description = "A service manager for s6-based systems"; platforms = lib.platforms.unix; diff --git a/pkgs/development/skaware-packages/s6/default.nix b/pkgs/development/skaware-packages/s6/default.nix index 1c3795a3f6af..9116ec67b77d 100644 --- a/pkgs/development/skaware-packages/s6/default.nix +++ b/pkgs/development/skaware-packages/s6/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6"; - version = "2.11.1.2"; - sha256 = "sha256-bBR0vj6Inaw5LO4wer4BXNS+DIXHJchOp/GE8ONFA6I="; + version = "2.11.2.0"; + sha256 = "n7Q2kOYBjZRzO03BjMaSbwJFRQik3YYGDJtLnSDcgDc="; description = "skarnet.org's small & secure supervision software suite"; @@ -34,6 +34,7 @@ buildPackage { # remove all s6 executables from build directory rm $(find -type f -mindepth 1 -maxdepth 1 -executable) rm libs6.* + rm ./libs6auto.a.xyzzy rm ./libs6lockd.a.xyzzy mv doc $doc/share/doc/s6/html diff --git a/pkgs/development/skaware-packages/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix index 19c8ea98ec91..2094d84beb6b 100644 --- a/pkgs/development/skaware-packages/skalibs/default.nix +++ b/pkgs/development/skaware-packages/skalibs/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.12.0.1"; - sha256 = "sha256-PiKPcvGNiMF/bE4KZogdbTd5Qnt+foifMUK28m2jAoU="; + version = "2.13.0.0"; + sha256 = "uHW/PfPw9QCYTMr+RampWt1+QCaznujaYg8JYGvnT8w="; description = "A set of general-purpose C programming libraries"; diff --git a/pkgs/development/skaware-packages/utmps/default.nix b/pkgs/development/skaware-packages/utmps/default.nix index a7063f198c50..7e0958593937 100644 --- a/pkgs/development/skaware-packages/utmps/default.nix +++ b/pkgs/development/skaware-packages/utmps/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "utmps"; - version = "0.1.2.0"; - sha256 = "sha256-kCXZYbgnGg7MjutXhhJra3mTdq+m8r0lwPhy/STxEjw="; + version = "0.1.2.1"; + sha256 = "BCPfx0vxOQ5G4uDCECIbsgX8247yMn5x7QhQd3xdyb0="; description = "A secure utmpx and wtmp implementation"; diff --git a/pkgs/development/tools/abuild/default.nix b/pkgs/development/tools/abuild/default.nix index a597213b866c..c0839f622dba 100644 --- a/pkgs/development/tools/abuild/default.nix +++ b/pkgs/development/tools/abuild/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "abuild"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = pname; rev = version; - sha256 = "1zs8slaqiv8q8bim8mwfy08ymar78rqpkgqksw8y1lsjrj49fqy4"; + sha256 = "sha256-pCimOI3pxlpd+yqKIRq6frbaX0s9bjZZf/eaDA4fd2M="; }; buildInputs = [ diff --git a/pkgs/development/tools/agda-pkg/default.nix b/pkgs/development/tools/agda-pkg/default.nix index 7c4ddb8a6883..498b38ec7aff 100644 --- a/pkgs/development/tools/agda-pkg/default.nix +++ b/pkgs/development/tools/agda-pkg/default.nix @@ -1,4 +1,6 @@ -{ lib, python3Packages }: +{ lib +, python3Packages +}: with python3Packages; @@ -22,7 +24,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ click - GitPython + gitpython pony whoosh natsort diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index 3b4103626b8b..819cb38fef08 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.40.4"; + version = "1.41.0"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - hash = "sha256-MipTBepFLcP3TJQtCLi/33D6HCJu4oX48tGnSGG5qho="; + hash = "sha256-31C1iNiYokClAZlk9KOVE12lFdOKJBSOwQK+zOp082k="; }; - vendorSha256 = "sha256-+hZpCIDASPerI7Wetpx+ah2H5ODjoeyoqUi+uFwR/9A="; + vendorHash = "sha256-i3bXf/EsPAJOg2aWh4mANtNeRXnie4jtuLCd/01DB/0="; ldflags = [ "-s" "-w" "-X=main.airVersion=${version}" ]; diff --git a/pkgs/development/tools/algolia-cli/default.nix b/pkgs/development/tools/algolia-cli/default.nix new file mode 100644 index 000000000000..4556b4360d7d --- /dev/null +++ b/pkgs/development/tools/algolia-cli/default.nix @@ -0,0 +1,35 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "algolia-cli"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "algolia"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-rmxLbxotATyURRcG9ryWCDHkH7a/bop/BCDQAoQjXSo="; + }; + + vendorHash = "sha256-iG8g7mBbIulKSxc1a3/fOBOCWoFYaB5FLwJPNKJRZDg="; + + nativeBuildInputs = [ installShellFiles ]; + + subPackages = [ "cmd/algolia" ]; + + ldflags = [ "-s" "-w" "-X github.com/algolia/cli/pkg/version.Version=${version}" ]; + + postInstall = '' + installShellCompletion --cmd algolia \ + --bash <($out/bin/algolia completion bash) \ + --fish <($out/bin/algolia completion fish) \ + --zsh <($out/bin/algolia completion zsh) + ''; + + meta = with lib; { + description = "Algolia’s official CLI devtool"; + homepage = "https://algolia.com/doc/tools/cli/"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index c9e362ecfefc..5d69cef598d0 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "4.6.2"; + version = "5.0.13"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-D2Ivem7xg4KrAHYxs4Cx7Ekgyc5u2KrjX4miYz11wuI="; + sha256 = "sha256-kjAC21gZ3VKM+WFKV3tOPzIaG3t9rUSo2M3CEsA1q+I="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index 4239f5c0056a..303275e3b9c5 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "ameba"; - version = "1.0.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - hash = "sha256-dvhGk6IbSV3pxtoIV7+0+qf47hz2TooPhsSwFd2+xkw="; + hash = "sha256-9dMzT/SnO16jfUfYYiT4MOGnlgrw0jWTNL37u1Y5oBI="; }; format = "make"; diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 7d9dbe6f393d..39f69f402b94 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, fetchurl, jre, writeScript, common-updater-scripts, git, nixfmt , nix, coreutils, gnused, disableRemoteLogging ? true }: -with lib; - let repo = "git@github.com:lihaoyi/Ammonite.git"; @@ -22,7 +20,7 @@ let installPhase = '' install -Dm755 $src $out/bin/amm sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm - '' + optionalString (disableRemoteLogging) '' + '' + lib.optionalString (disableRemoteLogging) '' sed -i "0,/ammonite.Main/{s|ammonite.Main'|ammonite.Main' --no-remote-logging|}" $out/bin/amm sed -i '1i #!/bin/sh' $out/bin/amm ''; @@ -66,7 +64,7 @@ let runHook postInstallCheck ''; - meta = { + meta = with lib; { description = "Improved Scala REPL"; longDescription = '' The Ammonite-REPL is an improved Scala REPL, re-implemented from first principles. diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index ac255df01d35..0217b37fa116 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.22"; + version = "1.6.23"; subPackages = [ "cmd/actionlint" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - sha256 = "sha256-Gkhk6lI10pUuZN09BDhNWfTjVdc7kN6KQjgc3gFrobk="; + sha256 = "sha256-0S7sTiTr22FlHHCT3Yw7UccrvgKvUVcPzR8QBUQiOh4="; }; - vendorSha256 = "sha256-vWU3tEC+ZlrrTnX3fbuEuZRoSg1KtfpgpXmK4+HWrNY="; + vendorHash = "sha256-3H7reGAJ2RY7WAHOJW92Bl5WW3VSVP8Qg4DVlGZPU+E="; nativeBuildInputs = [ makeWrapper ronn installShellFiles ]; diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix index 2d8348bfc9bc..e826fd9d2cd5 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.9.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "m4b"; repo = pname; rev = "v${version}"; - hash = "sha256-M3BYj1SKQKjEqP9cxaVlh7UeleDbcx6JN+UI6Ez+QJ8="; + hash = "sha256-Uzkz4KEFOf4XdcfkjQm8OQRenUX9jDxTJaRivfIy0ak="; }; - cargoHash = "sha256-botAoLNg/qTh+cjPXcjo/Ol2Vktj/c5130k5falEuLY="; + cargoHash = "sha256-NbZ9E3vUiDDKyEHZfgS8ErxXhQSTTsoPA/g+kGxCbXc="; meta = with lib; { description = "Greps through binaries from various OSs and architectures, and colors them"; diff --git a/pkgs/development/tools/analysis/brakeman/Gemfile.lock b/pkgs/development/tools/analysis/brakeman/Gemfile.lock index 9a4aa06c1e55..a2f6e818f0f2 100644 --- a/pkgs/development/tools/analysis/brakeman/Gemfile.lock +++ b/pkgs/development/tools/analysis/brakeman/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - brakeman (5.3.1) + brakeman (5.4.0) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES brakeman BUNDLED WITH - 2.3.20 + 2.3.25 diff --git a/pkgs/development/tools/analysis/brakeman/gemset.nix b/pkgs/development/tools/analysis/brakeman/gemset.nix index 523721979860..5798e37538a5 100644 --- a/pkgs/development/tools/analysis/brakeman/gemset.nix +++ b/pkgs/development/tools/analysis/brakeman/gemset.nix @@ -4,9 +4,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zr2p0w4ckv65cv3vdwnk9f3yydmjdmw75x7dskx1gqr9j9q3306"; + sha256 = "0lcxxlrzgpi9z2mr2v19xda6fdysmn5psa9bsp2rksa915v91fds"; type = "gem"; }; - version = "5.3.1"; + version = "5.4.0"; }; } diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 17e8458e7dcf..499a42429230 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.23.1"; + version = "0.25.0"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - sha256 = "sha256-UDUbndsuXZDu7j+JhkS6kkFP6ju88+hXffy42XQY8gQ="; + sha256 = "sha256-9duL16AuwG3lBMq1hUAXbNrvoBF6SASCiakmT42LQ/E="; }; nativeBuildInputs = [ @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - cargoSha256 = "sha256-iLqxixUEZhz3Kv7D84RqVyvtoZx69dhdLKTnVnsO0k0="; + cargoHash = "sha256-MXnE3Fq/jzWHvmO2i8cWixRKRuwVbUU/OmBj1SUkEiY="; #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 dc7cccd9dc1d..49c8fb140e59 100644 --- a/pkgs/development/tools/analysis/cccc/default.nix +++ b/pkgs/development/tools/analysis/cccc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { on various metrics of the code. Metrics supported include lines of code, McCabe's complexity and metrics proposed by Chidamber&Kemerer and Henry&Kafura. ''; - homepage = "http://cccc.sourceforge.net/"; + homepage = "https://cccc.sourceforge.net/"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.linquize ]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 105080ce2230..e9ce87dc084b 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -70,7 +70,7 @@ buildPythonApplication rec { dockerfile-parse dpath flake8 - GitPython + gitpython jmespath jsonpath-ng jsonschema @@ -89,7 +89,7 @@ buildPythonApplication rec { update_checker ]; - checkInputs = with py.pkgs; [ + nativeCheckInputs = with py.pkgs; [ aioresponses mock pytest-asyncio diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 4575b06c572b..cd2843b48cb4 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 = "10.4"; + version = "10.7.0"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-x/13rqb3NOP4ML2HoddkmRrEwBAsG97Z2iLLoJCu2PQ="; + sha256 = "sha256-JJGAnja/ONuUUTbLlmk/BrGa0NwJH+EfFn1yL5SvrEw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index ff564916dd3a..d88a4a8a92eb 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { respect to a specified configuration. Dead code removal is an application of this sort. ''; - homepage = "http://coan2.sourceforge.net/"; + homepage = "https://coan2.sourceforge.net/"; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 27f758f39b5a..0a9cefb57b06 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.11.0"; + version = "2.12.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-nY31/coUnBNkKg10SOd64sBBkV44g+eIXyKIrPq1IWU="; + sha256 = "sha256-rJdB1G2/Fbs5zwfXF/Q79k1IztkOJrL7b0sjH5kcEMs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 73b1385a00de..51fd3aefa87e 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.9.2"; + version = "2.10"; src = fetchFromGitHub { owner = "danmar"; repo = "cppcheck"; rev = version; - hash = "sha256-76JMC9kjeQO4ZuRQ4Kv7J141xy0M7kDTWWjQtJ/d5r0="; + hash = "sha256-Ss35foFlh4sw6TxMp++0b9E5KDUjBpDPuWIHsak8OGY="; }; buildInputs = [ pcre diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix index 2f665b8395ba..7be303a52a48 100644 --- a/pkgs/development/tools/analysis/cpplint/default.nix +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { patchShebangs cpplint_unittest.py ''; - checkInputs = with python3Packages; [ pytest pytest-runner ]; + nativeCheckInputs = with python3Packages; [ pytest pytest-runner ]; checkPhase = '' ./cpplint_unittest.py ''; diff --git a/pkgs/development/tools/analysis/cvehound/default.nix b/pkgs/development/tools/analysis/cvehound/default.nix index 12d36dc6089e..d6b08fb06153 100644 --- a/pkgs/development/tools/analysis/cvehound/default.nix +++ b/pkgs/development/tools/analysis/cvehound/default.nix @@ -26,8 +26,8 @@ python3.pkgs.buildPythonApplication rec { sympy ]; - checkInputs = with python3.pkgs; [ - GitPython + nativeCheckInputs = with python3.pkgs; [ + gitpython psutil pytestCheckHook ]; diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix index fdd4d84673b5..fec39c962a66 100644 --- a/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "dotenv-linter"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "dotenv-linter"; repo = "dotenv-linter"; rev = "v${version}"; - sha256 = "sha256-YWL1aPcMdU4lo7h/T2sdl2H6qnx3lfMtV39Ak4yP88w="; + sha256 = "sha256-HCP1OUWm/17e73TbinmDxYUi18/KXxppstyUSixjlSo="; }; - cargoSha256 = "sha256-q59hpnXc00OzrJk1KOWbIPQYfIE+7ku9XtTDXHgwQBg="; + cargoSha256 = "sha256-4r4NTq2rLnpmm/nwxJ9RoN2+JrUI6XKGfYFI78NY710="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix index c8db40c7b61c..a1804eafd8cf 100644 --- a/pkgs/development/tools/analysis/emma/default.nix +++ b/pkgs/development/tools/analysis/emma/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://emma.sourceforge.net/"; + homepage = "https://emma.sourceforge.net/"; description = "A code coverage tool for Java"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix index 4061090b1828..d340cb7562bf 100644 --- a/pkgs/development/tools/analysis/evmdis/default.nix +++ b/pkgs/development/tools/analysis/evmdis/default.nix @@ -1,17 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage { - pname = "evmdis-unstable"; - version = "2018-03-23"; - goPackagePath = "github.com/Arachnid/evmdis"; +buildGoModule { + pname = "evmdis"; + version = "unstable-2022-05-09"; src = fetchFromGitHub { owner = "Arachnid"; repo = "evmdis"; - rev = "0d1406905c5fda6224651fa53260a21c907eb986"; - sha256 = "09y4j7ipgv8yd99g3xk3f079w8fqfj7kl1y7ry81ainysn0qlqrg"; + rev = "7fad4fbee443262839ce9f88111b417801163086"; + hash = "sha256-jfbjXoGT8RtwLlqX13kcKdiFlhrVwA7Ems6abGJVRbA="; }; + vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + preBuild = '' + # Add go modules support + cp ${./go.mod} go.mod + ''; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { homepage = "https://github.com/Arachnid/evmdis"; description = "Ethereum EVM disassembler"; diff --git a/pkgs/development/tools/analysis/evmdis/go.mod b/pkgs/development/tools/analysis/evmdis/go.mod new file mode 100644 index 000000000000..d71cfe70845d --- /dev/null +++ b/pkgs/development/tools/analysis/evmdis/go.mod @@ -0,0 +1,3 @@ +module github.com/Arachnid/evmdis + +go 1.18 diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index e758aa40d2f1..63301622c1fb 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A static analysis tool to find bugs in Java programs automatically"; - homepage = "http://findbugs.sourceforge.net/"; + homepage = "https://findbugs.sourceforge.net/"; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; sourceProvenance = with sourceTypes; [ binaryBytecode ]; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index a7cc801c70cd..7a4ed91b9530 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -18,7 +18,10 @@ stdenv.mkDerivation rec { install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow ''; - buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2 dtoa fileutils core_kernel sedlex ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec visitors wtf8 ]) + strictDeps = true; + + nativeBuildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild ]; + buildInputs = with ocamlPackages; [ ocaml-migrate-parsetree-2 dtoa fileutils core_kernel sedlex ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec visitors wtf8 ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; meta = with lib; { diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 869222e560b8..761662053c1d 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -8,6 +8,7 @@ let mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib"; runtimeDeps = with ocamlPackages; [ apron.dev + bigarray-compat biniou camlzip easy-format @@ -43,13 +44,14 @@ stdenv.mkDerivation rec { }; preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; - postConfigure = "patchShebangs src/plugins/value/gen-api.sh"; - nativeBuildInputs = [ autoconf wrapGAppsHook ]; + strictDeps = true; + + nativeBuildInputs = [ autoconf wrapGAppsHook ] ++ (with ocamlPackages; [ ocaml findlib ]); buildInputs = with ocamlPackages; [ - ncurses ocaml findlib ltl2ba ocamlgraph yojson menhirLib camlzip + ncurses ltl2ba ocamlgraph yojson menhirLib camlzip lablgtk3 lablgtk3-sourceview3 coq graphviz zarith apron why3 mlgmpidl doxygen ppx_deriving ppx_import gdk-pixbuf diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index 5fede1aee5c5..449d5b6b5ed3 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -9,6 +9,7 @@ , kio , kitemmodels , kitemviews +, kparts , kwindowsystem , libelf , qtbase @@ -21,13 +22,13 @@ mkDerivation rec { pname = "hotspot"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "KDAB"; repo = "hotspot"; rev = "v${version}"; - sha256 = "1f68bssh3p387hkavfjkqcf7qf7w5caznmjfjldicxphap4riqr5"; + hash = "sha256-7GuIe8F3QqosW/XaN3KC1WeWcI7woUiEc9Nw0b+fSk0="; fetchSubmodules = true; }; @@ -36,12 +37,13 @@ mkDerivation rec { extra-cmake-modules ]; buildInputs = [ - elfutils + (elfutils.override { enableDebuginfod = true; }) # perfparser needs to find debuginfod.h kconfigwidgets ki18n kio kitemmodels kitemviews + kparts kwindowsystem libelf qtbase @@ -60,11 +62,6 @@ mkDerivation rec { mkdir -p 3rdparty/{perfparser,PrefixTickLabels}/.git ''; - cmakeFlags = [ - "-DRUSTC_DEMANGLE_INCLUDE_DIR=${rustc-demangle}/include" - "-DRUSTC_DEMANGLE_LIBRARY=${rustc-demangle}/lib/librustc_demangle.so" - ]; - meta = { description = "A GUI for Linux perf"; longDescription = '' diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index ccda1b7baba5..3eae91e939d3 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -10,8 +10,12 @@ stdenv.mkDerivation rec { url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz"; }; - nativeBuildInputs = with llvmPackages; [ cmake llvm.dev llvm python3]; - buildInputs = with llvmPackages; [ libclang clang-unwrapped ]; + postPatch = '' + patchShebangs . + ''; + + nativeBuildInputs = with llvmPackages; [ cmake llvm.dev llvm python3 ]; + buildInputs = with llvmPackages; [ libclang clang-unwrapped python3 ]; cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ]; diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index dc941f12291d..349b44730b8a 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { HTML output. ''; - homepage = "http://ltp.sourceforge.net/coverage/lcov.php"; + homepage = "https://ltp.sourceforge.net/coverage/lcov.php"; license = lib.licenses.gpl2Plus; maintainers = with maintainers; [ dezgeg ]; diff --git a/pkgs/development/tools/analysis/nix-linter/default.nix b/pkgs/development/tools/analysis/nix-linter/default.nix index cd3374262370..aa60f5aa757d 100644 --- a/pkgs/development/tools/analysis/nix-linter/default.nix +++ b/pkgs/development/tools/analysis/nix-linter/default.nix @@ -40,4 +40,8 @@ mkDerivation rec { homepage = "https://github.com/Synthetica9/nix-linter"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.marsam ]; + + # doesn't build on ghc92 + hydraPlatforms = lib.platforms.none; + broken = true; } diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/development/tools/analysis/oclgrind/default.nix index 9e8d1da4d36a..c28c8b0ead1a 100644 --- a/pkgs/development/tools/analysis/oclgrind/default.nix +++ b/pkgs/development/tools/analysis/oclgrind/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; buildInputs = [ llvmPackages.llvm llvmPackages.clang-unwrapped readline ]; cmakeFlags = [ diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index 953e371d1822..4e01fba57798 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -36,7 +36,6 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - broken = stdenv.isDarwin; description = "A libre cross-platform disassembler"; longDescription = '' Panopticon is a cross platform disassembler for reverse @@ -47,5 +46,7 @@ rustPlatform.buildRustPackage rec { ''; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ leenaars ]; + # never built on aarch64-linux since first introduction in nixpkgs + broken = stdenv.isDarwin || (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 4695854dbfad..fdc20a3eefb8 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.49.0"; + version = "6.53.0"; src = fetchurl { url = "https://github.com/pmd/pmd/releases/download/pmd_releases/${version}/pmd-bin-${version}.zip"; - hash = "sha256-dEKfQIdWkx6XAKnEBHaVI0l729Xj2RnjoHl59t0Kal0="; + hash = "sha256-pHEGBIvC4XAuzWZpws7ldRGabfKhAqZnaahqVdNpUJE="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index cd03eb0bab80..14474f995509 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , buildPackages , pkg-config , meson @@ -30,38 +31,39 @@ let # FIXME: Compare revision with - # https://github.com/radareorg/radare2/blob/master/libr/asm/arch/arm/v35arm64/Makefile#L26-L27 + # https://github.com/radareorg/radare2/blob/master/libr/arch/p/arm/v35/Makefile#L26-L27 arm64 = fetchFromGitHub { owner = "radareorg"; repo = "vector35-arch-arm64"; - rev = "c9e7242972837ac11fc94db05fabcb801a8269c9"; - hash = "sha256-HFQj23GlLAyyzMGnPq40XaPv5qPDHdDlQOo0Hprc9Cs="; + rev = "55d73c6bbb94448a5c615933179e73ac618cf876"; + hash = "sha256-pZxxp5xDg8mgkGEx7LaBSoKxNPyggFYA4um9YaO20LU="; }; armv7 = fetchFromGitHub { owner = "radareorg"; repo = "vector35-arch-armv7"; - rev = "dde39f69ffea19fc37e681874b12cb4707bc4f30"; - - hash = "sha256-bnWQc0dScM9rhIdzf+iVXvMqYWq/bguEAUQPaZRgdlU="; + rev = "f270a6cc99644cb8e76055b6fa632b25abd26024"; + hash = "sha256-YhfgJ7M8ys53jh1clOzj0I2yfJshXQm5zP0L9kMYsmk="; }; in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.7.8"; + version = "5.8.2"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - hash = "sha256-+/9SeILuDCUaYwPhhN6z3vQFicd1Bh8N/yicZTybR5o="; + hash = "sha256-jwr3QPgJ6vKSk8yGxndQ69AickP8PorNDuGyJzHMpV4="; }; preBuild = '' - cp -r ${arm64} ../libr/asm/arch/arm/v35arm64/arch-arm64 - chmod -R +w ../libr/asm/arch/arm/v35arm64/arch-arm64 + pushd ../libr/arch/p/arm/v35 + cp -r ${arm64} arch-arm64 + chmod -R +w arch-arm64 - cp -r ${armv7} ../libr/asm/arch/arm/v35arm64/arch-armv7 - chmod -R +w ../libr/asm/arch/arm/v35arm64/arch-armv7 + cp -r ${armv7} arch-armv7 + chmod -R +w arch-armv7 + popd ''; postFixup = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index 6c37a5dca422..f5936704e304 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.3.1"; + version = "4.3.2"; pname = "randoop"; src = fetchurl { url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "sha256-GWg3W/jjDKH6BcvjGt215J03NiDVWihU/m+2kejPVPA="; + sha256 = "sha256-lcYI0Yns/R5VeOUG68Xe8h1BO8wlKvL1CZIqzWkgsqo="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index ff7462091069..2100b72c9878 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "smatch"; - version = "1.72"; + version = "1.73"; src = fetchFromGitHub { owner = "error27"; repo = "smatch"; rev = version; - sha256 = "sha256-XVW4sAgIxaJjAk75bp/O286uddIfgfKtIA2LniUGWBM="; + sha256 = "sha256-Pv3bd2cjnQKnhH7TrkYWfDEeaq6u/q/iK1ZErzn6bME="; }; nativeBuildInputs = [ pkg-config ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A semantic analysis tool for C"; - homepage = "http://smatch.sourceforge.net/"; + homepage = "https://sparse.docs.kernel.org/"; maintainers = with maintainers; [ marsam ]; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 62026d527810..6cf84434cdec 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/spin --prefix PATH : ${binPath} + + mkdir -p $out/share/spin + cp $src/optional_gui/ispin.tcl $out/share/spin + makeWrapper $out/share/spin/ispin.tcl $out/bin/ispin \ + --prefix PATH : $out/bin:${binPath} ''; meta = with lib; { diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix index ef4e31e9481f..390b25b642c2 100644 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -1,24 +1,25 @@ { lib , rustPlatform -, fetchFromGitHub +, fetchCrate }: rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.5.1"; + version = "0.6.1"; - src = fetchFromGitHub { - owner = "dalance"; - repo = "svlint"; - rev = "v${version}"; - sha256 = "sha256-BgkzbKRcZkot3qkwPqSE9QkH3A3HNDuLjpFzKsU+Wb0="; + src = fetchCrate { + inherit pname version; + sha256 = "sha256-rPgURBjhfCRO7XFtr24Y7Dvcm/VEv7frq8p6wvtgjdY="; }; - cargoSha256 = "sha256-HeFh8H7IN3m4HiEH1QbCBROslzVCzYxGIaeyM4K7gcs="; + cargoSha256 = "sha256-IFoK52Qmw34oghAwlGtGFLl9MWXtJkMcx86jIqiwjuQ="; + + cargoBuildFlags = [ "--bin" "svlint" ]; meta = with lib; { description = "SystemVerilog linter"; homepage = "https://github.com/dalance/svlint"; + changelog = "https://github.com/dalance/svlint/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ trepetti ]; }; diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix index a3c28a0a9bc0..61efa78eaef4 100644 --- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix +++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tflint-ruleset-aws"; - version = "0.17.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-2Qr+tG1cmDF9MdsLMOnIdSGWMVAYYVgobE/SuJZRqJg="; + hash = "sha256-uHl13TNn+ero9NiL2Fnly+4H7f9eti4UoEXHKJ+DHKo="; }; - vendorHash = "sha256-P3yqDqVoC6XCX5OJ8kTvIk6Qq8X02Be51TajIkZxdbI="; + vendorHash = "sha256-mQzCqLJ3Y9l+BbfurtD/f/PRuXX+zYMeg8bPIjj05Nk="; # upstream Makefile also does a go test $(go list ./... | grep -v integration) preCheck = '' diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 4531a1661afe..bb3d37f4f876 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.43.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a5rTG+4qObdmInVZH8QkMdWmRrDA9ZUl2NL5p53D2MY="; + sha256 = "sha256-O758CU70NqRFlbtiy5cmfIHiHdQLxH88BHNZLQVvZ+M="; }; - vendorSha256 = "sha256-hdevIQ0Ugn7+MtvNbF+HjJAMyBtGYuJPCFFcxS8p35E="; + vendorSha256 = "sha256-4ODf6Er7V5KsVUdWjqjv+dfH84PPR+5T29V1AJluoJA="; doCheck = false; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index e602339303f7..3bec558803b4 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "valgrind"; - version = "3.19.0"; + version = "3.20.0"; src = fetchurl { url = "https://sourceware.org/pub/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-3V40SG8aSD/3vnMAzBa01rJGkJh4d8MnjXl1NNZzjwI="; + sha256 = "sha256-hTbAMdvgeNNC8SH6iBqezSBctaeOY5AFrVcAEb2588Y="; }; patches = [ @@ -50,7 +50,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; separateDebugInfo = stdenv.isLinux; - preConfigure = lib.optionalString stdenv.isDarwin ( + preConfigure = lib.optionalString stdenv.isFreeBSD '' + substituteInPlace configure --replace '`uname -r`' \ + ${toString stdenv.hostPlatform.parsed.kernel.version}.0 + '' + lib.optionalString stdenv.isDarwin ( let OSRELEASE = '' $(awk -F '"' '/#define OSRELEASE/{ print $2 }' \ <${xnu}/Library/Frameworks/Kernel.framework/Headers/libkern/version.h)''; @@ -75,7 +78,7 @@ stdenv.mkDerivation rec { ''); configureFlags = - lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit" + lib.optional stdenv.hostPlatform.isx86_64 "--enable-only64bit" ++ lib.optional stdenv.hostPlatform.isDarwin "--with-xcodedir=${xnu}/include"; doCheck = true; @@ -119,13 +122,9 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.unix; - badPlatforms = [ - "armv5tel-linux" "armv6l-linux" "armv6m-linux" - "sparc-linux" "sparc64-linux" - "riscv32-linux" "riscv64-linux" - "alpha-linux" - ]; + platforms = with lib.platforms; lib.intersectLists + (x86 ++ power ++ s390x ++ armv7 ++ aarch64 ++ mips) + (darwin ++ freebsd ++ illumos ++ linux); broken = stdenv.isDarwin || stdenv.hostPlatform.isStatic; # https://hydra.nixos.org/build/128521440/nixlog/2 }; } diff --git a/pkgs/development/tools/ansi/default.nix b/pkgs/development/tools/ansi/default.nix new file mode 100644 index 000000000000..305b29aef6f9 --- /dev/null +++ b/pkgs/development/tools/ansi/default.nix @@ -0,0 +1,25 @@ +{ fetchCrate, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "ansi-escape-sequences-cli"; + version = "0.1.4"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-KGPlNXkF16VdoOb3tg3nsQRdtgU83z7ibPy965bvvDk="; + }; + + cargoSha256 = "sha256-Q46VKBrOsjqUeSruuK/Bur2L69JAGr3c+ianfPlfzi0="; + + meta = with lib; { + description = "Quickly get ANSI escape sequences"; + longDescription = '' + CLI utility called "ansi" to quickly get ANSI escape sequences. Supports + the colors and styles, such as bold or italic."; + ''; + homepage = "https://github.com/phip1611/ansi-escape-sequences-cli"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ phip1611 ]; + mainProgram = "ansi"; + }; +} diff --git a/pkgs/development/tools/apkid/default.nix b/pkgs/development/tools/apkid/default.nix index f5e05fe96bb4..06d798e481da 100644 --- a/pkgs/development/tools/apkid/default.nix +++ b/pkgs/development/tools/apkid/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { yara-python ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 2538bf76afe6..5ea63e2837aa 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.1"; + version = "2.7.0"; 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-vCuah6xahpBbbKNDwhoNs7w3vdURVLyc32VSPZWJXTQ="; + sha256 = "sha256-wRtetRjZrCqxjpWcvgh0mQeQcrBNVnzcrlzrRH+afn0="; }; dontUnpack = true; diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index fc8f3a9bd528..82571293abc6 100644 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "appthreat-depscan"; - version = "3.0.3"; + version = "3.5.3"; src = fetchFromGitHub { owner = "AppThreat"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-JxaimM9sL6khTGJoSUFO2Dzlki6uoyqXEJznk6UHK/0="; + hash = "sha256-D/i1KGKPuhayKU8jaXhWnVgpU5Z/SG12AW8R7bgSQh8="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { rich ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix index 9d873b8461f1..f8e1a36a993e 100644 --- a/pkgs/development/tools/ashpd-demo/default.nix +++ b/pkgs/development/tools/ashpd-demo/default.nix @@ -64,10 +64,12 @@ stdenv.mkDerivation rec { libshumate ]; + # FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream + # https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55 + NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ]; + passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix index 953a5469ec51..61b5d624c8ff 100644 --- a/pkgs/development/tools/asmfmt/default.nix +++ b/pkgs/development/tools/asmfmt/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-YxIVqPGsqxvOY0Qz4Jw5FuO9IbplCICjChosnHrSCgc="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; # This package comes with its own version of goimports, gofmt and goreturns # but these binaries are outdated and are offered by other packages. diff --git a/pkgs/development/tools/async-profiler/default.nix b/pkgs/development/tools/async-profiler/default.nix index cdb1f86f8c9c..57bb70c1dff1 100644 --- a/pkgs/development/tools/async-profiler/default.nix +++ b/pkgs/development/tools/async-profiler/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "async-profiler"; - version = "2.8.3"; + version = "2.9"; src = fetchFromGitHub { owner = "jvm-profiling-tools"; repo = "async-profiler"; rev = "v${version}"; - sha256 = "sha256-25C3V3BVQ4YnuccW9o4LeS51V9542Jk3QYfoWNIbiBQ="; + sha256 = "sha256-ngLUg6Fq6Ay06klGa/y8lod8W6rYMqhMhXFn5OBCSpk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/ats-acc/default.nix b/pkgs/development/tools/ats-acc/default.nix index 73e475da3942..5a3cd9c64010 100644 --- a/pkgs/development/tools/ats-acc/default.nix +++ b/pkgs/development/tools/ats-acc/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-Wp39488YNL40GKp4KaJwhi75PsYP+gMtrZqAvs4Q/sw="; }; + postPatch = '' + substituteInPlace Makefile \ + --replace "mv acc \''$(PATSHOME)/bin/" "install -Dm755 acc ${placeholder "out"}/bin/" + ''; + nativeBuildInputs = [ ats2 ]; meta = with lib; { diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index c4572f9e1bf9..1a7e13e0ec3d 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.16.0"; + version = "10.17.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-FLrYovepVOE1NUB46Kc8z/l5o6IMFbJyY3smxPyuIsI="; + sha256 = "sha256-a25MA/fDjCvsKzEh34IM34TyXECJ0j07H9jr6JX1uc0="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-OlsNFhduilo8fJs/mynrAiwuXcfCZERdaJk3VcAUCJw="; + vendorHash = "sha256-Cb4RVY+E8QcvxSworBujsvqSSGxFGfW0W7nFjmpfLQ8="; doCheck = false; diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/development/tools/azure-functions-core-tools/default.nix index d4cebd5551e9..5165c4509e50 100644 --- a/pkgs/development/tools/azure-functions-core-tools/default.nix +++ b/pkgs/development/tools/azure-functions-core-tools/default.nix @@ -1,86 +1,98 @@ -{ stdenv -, lib -, config -, fetchurl -, unzip -, makeWrapper -, icu -, libunwind -, curl -, zlib -, libuuid -, dotnetbuildhelpers -, dotnetCorePackages -, openssl -}: - -stdenv.mkDerivation rec { - pname = "azure-functions-core-tools"; - version = "4.0.4785"; - - src = - if stdenv.isLinux then - fetchurl { - url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.linux-x64.${version}.zip"; - sha256 = "sha256-SWvbPEslwhYNd2fTQJWy1+823o1vJR/roPstgelSfnQ="; - } - else - fetchurl { - url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.osx-x64.${version}.zip"; - sha256 = "sha256-m06XeUHVDCxo7sfK4eF1oM6IuaVET9jr/xSO9qzpxSU="; - } - ; - - nativeBuildInputs = [ - unzip - makeWrapper - dotnetbuildhelpers - icu - libunwind - curl - zlib - dotnetCorePackages.sdk_3_1 - ]; - - libPath = lib.makeLibraryPath [ - libunwind - libuuid - stdenv.cc.cc - curl - zlib - icu - openssl - ]; - - unpackPhase = '' - unzip $src - ''; - - installPhase = '' - mkdir -p $out/bin - cp -prd . $out/bin/azure-functions-core-tools - chmod +x $out/bin/azure-functions-core-tools/{func,gozip} - '' + lib.optionalString stdenv.isLinux '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}" "$out/bin/azure-functions-core-tools/func" - find $out/bin/azure-functions-core-tools -type f -name "*.so" -exec patchelf --set-rpath "${libPath}" {} \; - wrapProgram "$out/bin/azure-functions-core-tools/func" --prefix LD_LIBRARY_PATH : ${libPath} - '' + '' - ln -s $out/bin/{azure-functions-core-tools,}/func - ln -s $out/bin/{azure-functions-core-tools,}/gozip - ''; - dontStrip = true; # Causes rpath patching to break if not set - - meta = with lib; { - homepage = "https://github.com/Azure/azure-functions-core-tools"; - description = "Command line tools for Azure Functions"; - sourceProvenance = with sourceTypes; [ - binaryBytecode - binaryNativeCode - ]; - license = licenses.mit; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; +{ + stdenv, + lib, + config, + fetchurl, + unzip, + makeWrapper, + icu, + libunwind, + curl, + zlib, + libuuid, + dotnetbuildhelpers, + dotnetCorePackages, + openssl, +}: let + platforms = { + "aarch64-darwin" = { + platformStr = "osx-arm64"; + hash = "sha512-MDuyFxtjlojXyrOdgJxVY3IDMLnrDvA4rO7ujOlE5KH082GXfonNOFZSpa64M8jMPJhJ4sopHKgZVvKKygzjPg=="; + }; + "x86_64-darwin" = { + platformStr = "osx-x64"; + hash = "sha512-fD48QFYIzq3/EvZR3o3VFCxIz3VZGSDJUo/ZwfZnFu7xt/xkQSBL+2zXOh9XZaBg42Xq3x9eFZQ00V8AbqJdKA=="; + }; + "x86_64-linux" = { + platformStr = "linux-x64"; + hash = "sha512-PhgS2ivRn8Yhlr7+gbQd+rGSMDLGsxURh8lOE30Xk7zEubukjekxDsaPqM1tOS95k7TWM9xXyVVfmsJplrl+nw=="; + }; }; -} + + platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; +in + stdenv.mkDerivation rec { + pname = "azure-functions-core-tools"; + version = "4.0.4915"; + + src = fetchurl { + url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.${platformInfo.platformStr}.${version}.zip"; + inherit (platformInfo) hash; + }; + + nativeBuildInputs = [ + unzip + makeWrapper + dotnetbuildhelpers + icu + libunwind + curl + zlib + dotnetCorePackages.sdk_6_0 + ]; + + libPath = lib.makeLibraryPath [ + libunwind + libuuid + stdenv.cc.cc + curl + zlib + icu + openssl + ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = + '' + mkdir -p $out/bin + cp -prd . $out/bin/azure-functions-core-tools + chmod +x $out/bin/azure-functions-core-tools/{func,gozip} + '' + + lib.optionalString stdenv.isLinux '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" "$out/bin/azure-functions-core-tools/func" + find $out/bin/azure-functions-core-tools -type f -name "*.so" -exec patchelf --set-rpath "${libPath}" {} \; + wrapProgram "$out/bin/azure-functions-core-tools/func" --prefix LD_LIBRARY_PATH : ${libPath} + '' + + '' + ln -s $out/bin/{azure-functions-core-tools,}/func + ln -s $out/bin/{azure-functions-core-tools,}/gozip + ''; + dontStrip = true; # Causes rpath patching to break if not set + + meta = with lib; { + homepage = "https://github.com/Azure/azure-functions-core-tools"; + description = "Command line tools for Azure Functions"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; + license = licenses.mit; + maintainers = with maintainers; []; + platforms = ["x86_64-linux" "aarch64-darwin" "x86_64-darwin"]; + }; + } diff --git a/pkgs/development/tools/azure-static-sites-client/default.nix b/pkgs/development/tools/azure-static-sites-client/default.nix new file mode 100644 index 000000000000..60d151147251 --- /dev/null +++ b/pkgs/development/tools/azure-static-sites-client/default.nix @@ -0,0 +1,97 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, curl +, icu70 +, libkrb5 +, lttng-ust +, openssl_1_1 +, zlib +, azure-static-sites-client + # "latest", "stable" or "backup" +, versionFlavor ? "stable" +}: +let + versions = lib.importJSON ./versions.json; + flavor = with lib; head (filter (x: x.version == versionFlavor) versions); + fetchBinary = runtimeId: fetchurl { + url = flavor.files.${runtimeId}.url; + sha256 = flavor.files.${runtimeId}.sha; + }; + sources = { + "x86_64-linux" = fetchBinary "linux-x64"; + "x86_64-darwin" = fetchBinary "macOS"; + }; +in +stdenv.mkDerivation { + pname = "StaticSitesClient-${versionFlavor}"; + version = flavor.buildId; + + src = sources.${stdenv.targetPlatform.system} or (throw "Unsupported platform"); + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + curl + icu70 + openssl_1_1 + libkrb5 + lttng-ust + stdenv.cc.cc.lib + zlib + ]; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -m755 "$src" -D "$out/bin/StaticSitesClient" + + for icu_lib in 'icui18n' 'icuuc' 'icudata'; do + patchelf --add-needed "lib''${icu_lib}.so.${with lib; head (splitVersion (getVersion icu70.name))}" "$out/bin/StaticSitesClient" + done + + patchelf --add-needed 'libgssapi_krb5.so' \ + --add-needed 'liblttng-ust.so' \ + --add-needed 'libssl.so.1.1' \ + "$out/bin/StaticSitesClient" + + runHook postInstall + ''; + + # Stripping kills the binary + dontStrip = true; + + # Just make sure the binary executes sucessfully + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/StaticSitesClient version + + runHook postInstallCheck + ''; + + passthru = { + # Create tests for all flavors + tests = with lib; genAttrs (map (x: x.version) versions) (versionFlavor: + azure-static-sites-client.override { inherit versionFlavor; } + ); + updateScript = ./update.sh; + }; + + meta = with lib; { + description = "Azure static sites client"; + homepage = "https://github.com/Azure/static-web-apps-cli"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + mainProgram = "StaticSitesClient"; + maintainers = with maintainers; [ veehaitch ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/azure-static-sites-client/update.sh b/pkgs/development/tools/azure-static-sites-client/update.sh new file mode 100755 index 000000000000..156771e7f12b --- /dev/null +++ b/pkgs/development/tools/azure-static-sites-client/update.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl + +set -euo pipefail + +dirname="$(dirname "$0")" + +curl -O --silent --output-dir "$dirname" 'https://swalocaldeploy.azureedge.net/downloads/versions.json' +echo "" >> "$dirname/versions.json" diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/development/tools/azure-static-sites-client/versions.json new file mode 100644 index 000000000000..bd08b32de197 --- /dev/null +++ b/pkgs/development/tools/azure-static-sites-client/versions.json @@ -0,0 +1,59 @@ +[ + { + "version": "latest", + "buildId": "1.0.022152", + "publishDate": "2023-01-24T18:38:40.5584174Z", + "files": { + "linux-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022152/linux/StaticSitesClient", + "sha": "40e1639efc239151b3021a262ee85a747403fbf1c9ffce3de1aa0cbf273a3069" + }, + "win-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022152/windows/StaticSitesClient.exe", + "sha": "e3287b8b63b00faa501573cd205ce8f7bb9743f7107f3e4f01639d0b297f21fc" + }, + "osx-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022152/macOS/StaticSitesClient", + "sha": "396f5fefe087399c78521b2f5456c79e58c771ca64785e4be055a149738a2e6a" + } + } + }, + { + "version": "stable", + "buildId": "1.0.021731", + "publishDate": "2022-12-14T02:22:20.0230853Z", + "files": { + "linux-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/linux/StaticSitesClient", + "sha": "d2f88cf8b855169534c7e330dd95385b993b1c0f83331306e685faa8468a82b5" + }, + "win-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/windows/StaticSitesClient.exe", + "sha": "525d13ebffd79ea9663a15a4bd2e6d49bca72d20aa44838aa4b83133943d450c" + }, + "osx-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/macOS/StaticSitesClient", + "sha": "5de3ac4b205d3871e7a8ff3b5869f2a57002277ac7fa6317032239d114e25ab8" + } + } + }, + { + "version": "backup", + "buildId": "1.0.021671", + "publishDate": "2022-12-08T00:34:47.6310685Z", + "files": { + "linux-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021671/linux/StaticSitesClient", + "sha": "306c2d24cbc6461cdf1fe29e9206ccb9d452ba3514ee9d67a1d7e0f8edbc036f" + }, + "win-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021671/windows/StaticSitesClient.exe", + "sha": "ee868ca5e73a6ad8758698c168bb01d07b66288d353813fefe41d441f82b9f1f" + }, + "osx-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021671/macOS/StaticSitesClient", + "sha": "5ef513530a45d4b8e135e272f7e7112e900fbb8c8137c19e645a694e71b98c74" + } + } + } +] diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/development/tools/b4/default.nix index 130d7f1d23af..8ef941653e41 100644 --- a/pkgs/development/tools/b4/default.nix +++ b/pkgs/development/tools/b4/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "b4"; - version = "0.10.1"; + version = "0.12.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "zESWjmKz4DaiGg1VmbDlouTNm71YqIr1y9MCev72tEQ="; + sha256 = "sha256-BFvuxwcHG2KCv5LAeus50IDJ2mBCyixg3ETq9UzPmSA="; }; # tests make dns requests and fails diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 78224176e5a0..a38acbd53c94 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { tabulate ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ backoff more-itertools pytestCheckHook diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index 162bfa9b65ae..bb020ec09f62 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -1,24 +1,32 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, CoreServices +}: rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "2.2.5"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-KoAaECfZ8DwGN/U1HCp/4NUvTvFYiN+li3I5gNYM/oU="; + rev = "refs/tags/v${version}"; + hash = "sha256-k87EgsH7EdnqYBoXHpPu7hB/goEXuZsz8mNsrvM+Hgw="; }; - cargoSha256 = "sha256-ifUbUeqWm/gwOqzxY8lpGvW1ArZmGAy8XxAkvEfpLVQ="; + cargoHash = "sha256-ujc3tH9I2WqwxmqBaUdE8lJQtj7XS56IVaxfZWhmvF8="; - buildInputs = lib.optional stdenv.isDarwin CoreServices; + buildInputs = lib.optional stdenv.isDarwin [ + CoreServices + ]; meta = with lib; { description = "Background rust code checker"; homepage = "https://github.com/Canop/bacon"; + changelog = "https://github.com/Canop/bacon/blob/v${version}/CHANGELOG.md"; license = licenses.agpl3Only; - maintainers = [ maintainers.FlorianFranzen ]; + maintainers = with maintainers; [ FlorianFranzen ]; }; } diff --git a/pkgs/development/tools/bashate/default.nix b/pkgs/development/tools/bashate/default.nix index d768ff481a42..31714db5c893 100644 --- a/pkgs/development/tools/bashate/default.nix +++ b/pkgs/development/tools/bashate/default.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ fixtures mock pytestCheckHook diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 816326489d8c..38ea03d9f95b 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -10,6 +10,7 @@ let patches = [ ./use-go-in-path.patch + ./fix-rules-go-3408.patch ]; # Patch the protoc alias so that it always builds from source. @@ -29,13 +30,13 @@ let in buildBazelPackage rec { pname = "bazel-watcher"; - version = "0.17.0"; + version = "0.21.2"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - sha256 = "sha256-aK18Q2nYxYajk9f/EEmtV7YJ8cYqbamR7vh3BTgu53Q="; + sha256 = "sha256-wigrE9u1VuFnqLWyVJK3M7xsjyme2dDG6YTcD9whKnw="; }; nativeBuildInputs = [ go git python3 ]; @@ -44,7 +45,7 @@ buildBazelPackage rec { bazel = bazel_5; bazelFlags = [ "--override_repository=rules_proto=${rulesProto}" ]; bazelBuildFlags = lib.optionals stdenv.cc.isClang [ "--cxxopt=-x" "--cxxopt=c++" "--host_cxxopt=-x" "--host_cxxopt=c++" ]; - bazelTarget = "//ibazel"; + bazelTarget = "//cmd/ibazel"; fetchConfigured = false; # we want to fetch all dependencies, regardless of the current system fetchAttrs = { @@ -81,7 +82,7 @@ buildBazelPackage rec { rm -rf $bazelOut/external/com_google_protobuf ''; - sha256 = "sha256-R+Hc9ldYcKgAXETKr2+Hk7IrjJ93WkrjyJ1SQRoM9V4="; + sha256 = "sha256-le8IepS+IGVX45Gj1aicPjYOkuUA+VVUy/PEeKLNYss="; }; buildAttrs = { @@ -90,12 +91,12 @@ buildBazelPackage rec { preBuild = '' patchShebangs . - substituteInPlace ibazel/BUILD --replace '{STABLE_GIT_VERSION}' ${version} + substituteInPlace cmd/ibazel/BUILD.bazel --replace '{STABLE_GIT_VERSION}' ${version} echo ${bazel_5.version} > .bazelversion ''; installPhase = '' - install -Dm755 bazel-bin/ibazel/ibazel_/ibazel $out/bin/ibazel + install -Dm755 bazel-bin/cmd/ibazel/ibazel_/ibazel $out/bin/ibazel ''; }; diff --git a/pkgs/development/tools/bazel-watcher/fix-rules-go-3408.patch b/pkgs/development/tools/bazel-watcher/fix-rules-go-3408.patch new file mode 100644 index 000000000000..b28090f7ba7c --- /dev/null +++ b/pkgs/development/tools/bazel-watcher/fix-rules-go-3408.patch @@ -0,0 +1,18 @@ +diff --git a/WORKSPACE b/WORKSPACE +index 555ab93..9f3b8a0 100644 +--- a/WORKSPACE ++++ b/WORKSPACE +@@ -46,10 +46,11 @@ rules_proto_toolchains() + # gazelle:repository go_repository name=com_github_bazelbuild_rules_go importpath=github.com/bazelbuild/rules_go + http_archive( + name = "io_bazel_rules_go", +- sha256 = "56d8c5a5c91e1af73eca71a6fab2ced959b67c86d12ba37feedb0a2dfea441a6", ++ sha256 = "7fd912837cc971b708037ab1d0d721b892c62dadbfdcfae5066e8e90d25876e9", ++ strip_prefix = "rules_go-8d309d5af15814b4096d80b60f80fa86128c43f2", + urls = [ +- "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.37.0/rules_go-v0.37.0.zip", +- "https://github.com/bazelbuild/rules_go/releases/download/v0.37.0/rules_go-v0.37.0.zip", ++ "https://mirror.bazel.build/github.com/bazelbuild/rules_go/archive/8d309d5af15814b4096d80b60f80fa86128c43f2.zip", ++ "https://github.com/bazelbuild/rules_go/archive/8d309d5af15814b4096d80b60f80fa86128c43f2.zip", + ], + ) diff --git a/pkgs/development/tools/bazel-watcher/use-go-in-path.patch b/pkgs/development/tools/bazel-watcher/use-go-in-path.patch index d9d90c9127f0..5ce4f81ff3ae 100644 --- a/pkgs/development/tools/bazel-watcher/use-go-in-path.patch +++ b/pkgs/development/tools/bazel-watcher/use-go-in-path.patch @@ -6,8 +6,8 @@ index 51273b6..fcf9ffb 100644 go_rules_dependencies() --go_register_toolchains(version = "1.17.6") +-go_register_toolchains(version = "1.19.4") +go_register_toolchains(go_version = "host") - load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") + load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") diff --git a/pkgs/development/tools/bbin/default.nix b/pkgs/development/tools/bbin/default.nix new file mode 100644 index 000000000000..606633fd3a1a --- /dev/null +++ b/pkgs/development/tools/bbin/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, makeWrapper +, babashka +, graalvm17-ce +}: + +stdenvNoCC.mkDerivation rec { + pname = "bbin"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "babashka"; + repo = "bbin"; + rev = "v${version}"; + sha256 = "sha256-5hohAr6a8C9jPwhQi3E66onSa6+P9plS939fQM/fl9Q="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -D bbin $out/bin/bbin + mkdir -p $out/share + cp -r docs $out/share/docs + wrapProgram $out/bin/bbin \ + --prefix PATH : "${lib.makeBinPath [ babashka graalvm17-ce ]}" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/babashka/bbin"; + description = "Install any Babashka script or project with one command"; + license = licenses.mit; + inherit (babashka.meta) platforms; + maintainers = with maintainers; [ sohalt ]; + }; +} diff --git a/pkgs/development/tools/beautysh/default.nix b/pkgs/development/tools/beautysh/default.nix index f01857fc6086..e592133e59be 100644 --- a/pkgs/development/tools/beautysh/default.nix +++ b/pkgs/development/tools/beautysh/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { types-setuptools ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/development/tools/benthos/default.nix index c3f7e75d4d6a..13e2effec5af 100644 --- a/pkgs/development/tools/benthos/default.nix +++ b/pkgs/development/tools/benthos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "benthos"; - version = "4.9.0"; + version = "4.11.0"; src = fetchFromGitHub { owner = "benthosdev"; repo = "benthos"; rev = "v${version}"; - sha256 = "sha256-gFtlu+Jg5XC9OlUArTCHPFN4iTF7kdyrcRcymRwSHsw="; + sha256 = "sha256-1pzyrXJgVN8kO3BHr/7LMpDvtnLcdioaxoRgKv/46v4="; }; - vendorSha256 = "sha256-sRhiTati1EsU+gBv29OkBAxqot+Bjp1BemYR1qbqN1w="; + vendorSha256 = "sha256-SfgdSPJ8Blra+KVWtKSjWfXmAm02tULwuYHNPbyJVpI="; doCheck = false; diff --git a/pkgs/development/tools/bingo/default.nix b/pkgs/development/tools/bingo/default.nix index 0c0d90bb9fc9..f95810fb7718 100644 --- a/pkgs/development/tools/bingo/default.nix +++ b/pkgs/development/tools/bingo/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "bwplotka"; repo = "bingo"; rev = "v${version}"; - sha256 = "sha256-s+vdtMzeHUtUlmMlvgnK83RYoMqS3GqrTnu7LssIK6A="; + hash = "sha256-s+vdtMzeHUtUlmMlvgnK83RYoMqS3GqrTnu7LssIK6A="; }; - vendorSha256 = "sha256-28p1g+p+guJ0x4/5QDGsGN6gDnZkE4AKF/2cFgNjPDM="; + vendorHash = "sha256-28p1g+p+guJ0x4/5QDGsGN6gDnZkE4AKF/2cFgNjPDM="; postPatch = '' rm get_e2e_test.go get_e2e_utils_test.go diff --git a/pkgs/development/tools/biodiff/default.nix b/pkgs/development/tools/biodiff/default.nix index 839f7b1b6ccc..610b991ec52a 100644 --- a/pkgs/development/tools/biodiff/default.nix +++ b/pkgs/development/tools/biodiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "biodiff"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "8051Enthusiast"; repo = "biodiff"; rev = "v${version}"; - sha256 = "sha256-ZIZ6XpRuqhacpvi1kf7zvMszzbF8IvWrMlxAZnJJSxE="; + sha256 = "sha256-anGiqTiZVm6q8BII1Ahg2ph7OwX5isCa16orEcf4aFE="; }; - cargoSha256 = "sha256-/LrrHK9j6xg3J56ubM9RdkJeMn4nvpddUGMtHu2s6OE="; + cargoSha256 = "sha256-uyATu6M04IRFtzFb2ox0xUYFXjkW+t+71Iy58TuqCko="; meta = with lib; { description = "Hex diff viewer using alignment algorithms from biology"; diff --git a/pkgs/development/tools/buf/buf-tests-dont-use-file-transport.patch b/pkgs/development/tools/buf/buf-tests-dont-use-file-transport.patch deleted file mode 100644 index a26f41d71974..000000000000 --- a/pkgs/development/tools/buf/buf-tests-dont-use-file-transport.patch +++ /dev/null @@ -1,51 +0,0 @@ -commit e9219b88de5ed37af337ee2d2e71e7ec7c0aad1b -Author: Robbert van Ginkel -Date: Thu Oct 20 16:43:28 2022 -0400 - - Fix git unit test by using fake git server rather than file:// (#1518) - - More recent versions of git fix a CVE by disabling some usage of the - `file://` transport, see - https://github.blog/2022-10-18-git-security-vulnerabilities-announced/#cve-2022-39253. - We were using this transport in tests. - - Instead, use https://git-scm.com/docs/git-http-backend to serve up this - repository locally so we don't have to use the file protocol. This - should be a more accurate tests, since we mostly expect submodules to - come from servers. - -diff --git a/private/pkg/git/git_test.go b/private/pkg/git/git_test.go -index 7b77b6cd..7132054e 100644 ---- a/private/pkg/git/git_test.go -+++ b/private/pkg/git/git_test.go -@@ -17,6 +17,8 @@ package git - import ( - "context" - "errors" -+ "net/http/cgi" -+ "net/http/httptest" - "os" - "os/exec" - "path/filepath" -@@ -213,6 +215,21 @@ func createGitDirs( - runCommand(ctx, t, container, runner, "git", "-C", submodulePath, "add", "test.proto") - runCommand(ctx, t, container, runner, "git", "-C", submodulePath, "commit", "-m", "commit 0") - -+ gitExecPath, err := command.RunStdout(ctx, container, runner, "git", "--exec-path") -+ require.NoError(t, err) -+ t.Log(filepath.Join(string(gitExecPath), "git-http-backend")) -+ // https://git-scm.com/docs/git-http-backend#_description -+ f, err := os.Create(filepath.Join(submodulePath, ".git", "git-daemon-export-ok")) -+ require.NoError(t, err) -+ require.NoError(t, f.Close()) -+ server := httptest.NewServer(&cgi.Handler{ -+ Path: filepath.Join(strings.TrimSpace(string(gitExecPath)), "git-http-backend"), -+ Dir: submodulePath, -+ Env: []string{"GIT_PROJECT_ROOT=" + submodulePath}, -+ }) -+ t.Cleanup(server.Close) -+ submodulePath = server.URL -+ - originPath := filepath.Join(tmpDir, "origin") - require.NoError(t, os.MkdirAll(originPath, 0777)) - runCommand(ctx, t, container, runner, "git", "-C", originPath, "init") diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 5acd05013faf..79c7962865e1 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -1,7 +1,6 @@ { lib , buildGoModule , fetchFromGitHub -, fetchpatch , protobuf , git , testers @@ -11,42 +10,29 @@ buildGoModule rec { pname = "buf"; - version = "1.9.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KnG1FUdC8xpW/wI4E8+RzO0StKF+N7Wx1jTWNm4302M="; + hash = "sha256-FEc83SVFCsGDrCg7IYmn8iZ6NozYFsIUJ3QORBYUdMI="; }; - vendorSha256 = "sha256-e/hkJoQ1GkSl4mhhgYVB4POult87DzWOXRLGyDVP+M0="; + vendorHash = "sha256-Zmias6mJWYh+PCyBdnRlNyKIoFqEYJZNF19i559SGTI="; patches = [ # Skip a test that requires networking to be available to work. ./skip_test_requiring_network.patch # Skip TestWorkspaceGit which requires .git and commits. ./skip_test_requiring_dotgit.patch - # Remove reliance of tests on file protocol which is disabled in git by default now - # Rebased upstream change https://github.com/bufbuild/buf/commit/bcaa77f8bbb8f6c198154c7c8d53596da4506dab - ./buf-tests-dont-use-file-transport.patch - # Make TestCyclicImport tests deterministic (see https://github.com/bufbuild/buf/pull/1551) - (fetchpatch { - url = "https://github.com/bufbuild/buf/commit/75b5ef4c84f5953002dff95a1c66cb82b0e3b06f.patch"; - sha256 = "sha256-pKF3VXkzttsTTT2r/Z37ug9nnu8gRdkfmv/aTOhAJpw="; - }) - # Make TestDuplicateSyntheticOneofs check deterministic (see https://github.com/bufbuild/buf/pull/1579) - (fetchpatch { - url = "https://github.com/bufbuild/buf/commit/9e72aa314e6f02b36793caa5f6068394cbdcb98c.patch"; - sha256 = "sha256-6NEF3sP1EQ6cQxkH2xRyHxAD0OrXBlQQa05rLK998wo="; - }) ]; nativeBuildInputs = [ installShellFiles ]; ldflags = [ "-s" "-w" ]; - checkInputs = [ + nativeCheckInputs = [ git # Required for TestGitCloner protobuf # Required for buftesting.GetProtocFilePaths ]; diff --git a/pkgs/development/tools/build-managers/apache-maven/builder.sh b/pkgs/development/tools/build-managers/apache-maven/builder.sh index dcc38b9ec74a..96fe8ebfac29 100644 --- a/pkgs/development/tools/build-managers/apache-maven/builder.sh +++ b/pkgs/development/tools/build-managers/apache-maven/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup unpackPhase 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 74c9de9f11f3..44da96d5b4b1 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.9"; + version = "2.4.0"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z6DCe2rkWnTaxvfhLd+ZGxLw2ldjaSPkPz/zHKzI1fs="; + sha256 = "sha256-aC1I+33jEmgjtidA5CQXpwePsavwlx97abpsc68RkBI="; }; - vendorSha256 = "sha256-BThOF6Kodmq0PqofiS24GffmTFRangrf6Q1SJ7mDVvY="; + vendorHash = "sha256-4vNRtFqtzoDHjDQwPe1/sJNzcCU+b7XHgQ5YqEzNhjI="; doCheck = false; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix deleted file mode 100644 index 9703590bd4a7..000000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ /dev/null @@ -1,634 +0,0 @@ -{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles -, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs -# this package (through the fixpoint glass) -, bazel_self -, lr, xe, zip, unzip, bash, writeCBin, coreutils -, which, gawk, gnused, gnutar, gnugrep, gzip, findutils -# updater -, python27, python3, writeScript -# Apple dependencies -, cctools, libcxx, CoreFoundation, CoreServices, Foundation -# Allow to independently override the jdks used to build and run respectively -, buildJdk, runJdk -, buildJdkName -, runtimeShell -# Downstream packages for tests -, bazel-watcher -# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). -# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). -, enableNixHacks ? false -, gcc-unwrapped -, autoPatchelfHook -, file -, substituteAll -, writeTextFile -}: - -let - version = "3.7.2"; - - src = fetchurl { - url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1cfrbs23lg0jnl22ddylx3clcjw7bdpbix7r5lqibab346s5n9fy"; - }; - - # Update with `eval $(nix-build -A bazel.updater)`, - # then add new dependencies from the dict in ./src-deps.json as required. - srcDeps = lib.attrsets.attrValues srcDepsSet; - srcDepsSet = - let - srcs = lib.importJSON ./src-deps.json; - toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { - urls = d.urls; - sha256 = d.sha256; - }); - in builtins.listToAttrs (map toFetchurl [ - srcs.desugar_jdk_libs - srcs.io_bazel_skydoc - srcs.bazel_skylib - srcs.io_bazel_rules_sass - srcs.platforms - # `bazel query` wants all of these to be available regardless of platform. - srcs."java_tools_javac11_darwin-v10.0.zip" - srcs."java_tools_javac11_linux-v10.0.zip" - srcs."java_tools_javac11_windows-v10.0.zip" - srcs."coverage_output_generator-v2.5.zip" - srcs.build_bazel_rules_nodejs - srcs."android_tools_pkg-0.19.0rc3.tar.gz" - srcs."bazel-toolchains-3.1.0.tar.gz" - srcs."com_github_grpc_grpc" - srcs.upb - srcs.rules_pkg - srcs.rules_cc - srcs.rules_java - srcs.rules_proto - srcs.com_google_protobuf - ]); - - distDir = runCommand "bazel-deps" {} '' - mkdir -p $out - for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done - ''; - - defaultShellPath = lib.makeBinPath - # Keep this list conservative. For more exotic tools, prefer to use - # @rules_nixpkgs to pull in tools from the nix repository. Example: - # - # WORKSPACE: - # - # nixpkgs_git_repository( - # name = "nixpkgs", - # revision = "def5124ec8367efdba95a99523dd06d918cb0ae8", - # ) - # - # # This defines an external Bazel workspace. - # nixpkgs_package( - # name = "bison", - # repositories = { "nixpkgs": "@nixpkgs//:default.nix" }, - # ) - # - # some/BUILD.bazel: - # - # genrule( - # ... - # cmd = "$(location @bison//:bin/bison) -other -args", - # tools = [ - # ... - # "@bison//:bin/bison", - # ], - # ) - # - [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip ]; - - # Java toolchain used for the build and tests - javaToolchain = "@bazel_tools//tools/jdk:toolchain_${buildJdkName}"; - - platforms = lib.platforms.linux ++ lib.platforms.darwin; - - # This repository is fetched by bazel at runtime - # however it contains prebuilt java binaries, with wrong interpreter - # and libraries path. - # We prefetch it, patch it, and override it in a global bazelrc. - system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; - - # on aarch64 Darwin, `uname -m` returns "arm64" - arch = with stdenv.hostPlatform; if isDarwin && isAarch64 then "arm64" else parsed.cpu.name; - - remote_java_tools = stdenv.mkDerivation { - name = "remote_java_tools_${system}"; - - src = srcDepsSet."java_tools_javac11_${system}-v10.0.zip"; - - nativeBuildInputs = [ unzip ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; - buildInputs = [ gcc-unwrapped ]; - - sourceRoot = "."; - - buildPhase = '' - mkdir $out; - ''; - - installPhase = '' - cp -Ra * $out/ - touch $out/WORKSPACE - ''; - }; - - bazelRC = writeTextFile { - name = "bazel-rc"; - text = '' - startup --server_javabase=${runJdk} - - # Can't use 'common'; https://github.com/bazelbuild/bazel/issues/3054 - # Most commands inherit from 'build' anyway. - build --distdir=${distDir} - fetch --distdir=${distDir} - query --distdir=${distDir} - - build --override_repository=${remote_java_tools.name}=${remote_java_tools} - fetch --override_repository=${remote_java_tools.name}=${remote_java_tools} - query --override_repository=${remote_java_tools.name}=${remote_java_tools} - - # Provide a default java toolchain, this will be the same as ${runJdk} - build --host_javabase='@local_jdk//:jdk' - - # load default location for the system wide configuration - try-import /etc/bazel.bazelrc - ''; - }; - -in -stdenv.mkDerivation rec { - pname = "bazel"; - inherit version; - - meta = with lib; { - homepage = "https://github.com/bazelbuild/bazel/"; - description = "Build tool that builds code quickly and reliably"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # source bundles dependencies as jars - ]; - license = licenses.asl20; - maintainers = lib.teams.bazel.members; - inherit platforms; - }; - - inherit src; - sourceRoot = "."; - - patches = [ - # On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' - # This is breaking the build of any C target. This patch removes the last - # argument if it's found to be an empty string. - ../trim-last-argument-to-gcc-if-empty.patch - - # On Darwin, using clang 6 to build fails because of a linker error (see #105573), - # but using clang 7 fails because libarclite_macosx.a cannot be found when linking - # the xcode_locator tool. - # This patch removes using the -fobjc-arc compiler option and makes the code - # compile without automatic reference counting. Caveat: this leaks memory, but - # we accept this fact because xcode_locator is only a short-lived process used during the build. - ./no-arc.patch - - ./gcc11.patch - - # --experimental_strict_action_env (which may one day become the default - # see bazelbuild/bazel#2574) hardcodes the default - # action environment to a non hermetic value (e.g. "/usr/local/bin"). - # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. - # So we are replacing this bazel paths by defaultShellPath, - # improving hermeticity and making it work in nixos. - (substituteAll { - src = ../strict_action_env.patch; - strictActionEnvPatch = defaultShellPath; - }) - - # bazel reads its system bazelrc in /etc - # override this path to a builtin one - (substituteAll { - src = ../bazel_rc.patch; - bazelSystemBazelRCPath = bazelRC; - }) - - # disable suspend detection during a build inside Nix as this is - # not available inside the darwin sandbox - ../bazel_darwin_sandbox.patch - ] ++ lib.optional enableNixHacks ../nix-hacks.patch; - - - # Additional tests that check bazel’s functionality. Execute - # - # nix-build . -A bazel.tests - # - # in the nixpkgs checkout root to exercise them locally. - passthru.tests = - let - runLocal = name: attrs: script: - let - attrs' = removeAttrs attrs [ "buildInputs" ]; - buildInputs = [ python3 ] ++ (attrs.buildInputs or []); - in - runCommandCC name ({ - inherit buildInputs; - preferLocalBuild = true; - meta.platforms = platforms; - } // attrs') script; - - # bazel wants to extract itself into $install_dir/install every time it runs, - # so let’s do that only once. - extracted = bazelPkg: - let install_dir = - # `install_base` field printed by `bazel info`, minus the hash. - # yes, this path is kinda magic. Sorry. - "$HOME/.cache/bazel/_bazel_nixbld"; - in runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } '' - export HOME=$(mktemp -d) - touch WORKSPACE # yeah, everything sucks - install_base="$(${bazelPkg}/bin/bazel info | grep install_base)" - # assert it’s actually below install_dir - [[ "$install_base" =~ ${install_dir} ]] \ - || (echo "oh no! $install_base but we are \ - trying to copy ${install_dir} to $out instead!"; exit 1) - cp -R ${install_dir} $out - ''; - - bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }: - let - be = extracted bazelPkg; - in runLocal name { inherit buildInputs; } ( - # skip extraction caching on Darwin, because nobody knows how Darwin works - (lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - # set up home with pre-unpacked bazel - export HOME=$(mktemp -d) - mkdir -p ${be.install_dir} - cp -R ${be}/install ${be.install_dir} - - # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6 - # Bazel checks whether the mtime of the install dir files - # is >9 years in the future, otherwise it extracts itself again. - # see PosixFileMTime::IsUntampered in src/main/cpp/util - # What the hell bazel. - ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {} - '') - + - '' - # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 - # about why to create a subdir for the workspace. - cp -r ${workspaceDir} wd && chmod u+w wd && cd wd - - ${bazelScript} - - touch $out - ''); - - bazelWithNixHacks = bazel_self.override { enableNixHacks = true; }; - - bazel-examples = fetchFromGitHub { - owner = "bazelbuild"; - repo = "examples"; - rev = "5d8c8961a2516ebf875787df35e98cadd08d43dc"; - sha256 = "03c1bwlq5bs3hg96v4g4pg2vqwhqq6w538h66rcpw02f83yy7fs8"; - }; - - in (if !stdenv.hostPlatform.isDarwin then { - # `extracted` doesn’t work on darwin - shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; - } else {}) // { - bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; }; - cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; - pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; - - bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - - cppWithNixHacks = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - - # downstream packages using buildBazelPackage - # fixed-output hashes of the fetch phase need to be spot-checked manually - downstream = recurseIntoAttrs ({ - inherit bazel-watcher; - }); - }; - - # update the list of workspace dependencies - passthru.updater = writeScript "update-bazel-deps.sh" '' - #!${runtimeShell} - cat ${runCommand "bazel-deps.json" {} '' - ${unzip}/bin/unzip ${src} WORKSPACE - ${python3}/bin/python3 ${../update-srcDeps.py} ./WORKSPACE > $out - ''} > ${builtins.toString ./src-deps.json} - ''; - - # Necessary for the tests to pass on Darwin with sandbox enabled. - # Bazel starts a local server and needs to bind a local address. - __darwinAllowLocalNetworking = true; - - # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. - customBash = writeCBin "bash" '' - #include - #include - #include - #include - - extern char **environ; - - int main(int argc, char *argv[]) { - char *path = getenv("PATH"); - char *pathToAppend = "${defaultShellPath}"; - char *newPath; - if (path != NULL) { - int length = strlen(path) + 1 + strlen(pathToAppend) + 1; - newPath = malloc(length * sizeof(char)); - snprintf(newPath, length, "%s:%s", path, pathToAppend); - } else { - newPath = pathToAppend; - } - setenv("PATH", newPath, 1); - execve("${bash}/bin/bash", argv, environ); - return 0; - } - ''; - - postPatch = let - - darwinPatches = '' - bazelLinkFlags () { - eval set -- "$NIX_LDFLAGS" - local flag - for flag in "$@"; do - printf ' -Wl,%s' "$flag" - done - } - - # Disable Bazel's Xcode toolchain detection which would configure compilers - # and linkers from Xcode instead of from PATH - export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 - - # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails - export GCOV=${coreutils}/bin/false - - # Framework search paths aren't added by bintools hook - # https://github.com/NixOS/nixpkgs/pull/41914 - export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" - - # libcxx includes aren't added by libcxx hook - # https://github.com/NixOS/nixpkgs/pull/41589 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1" - - # don't use system installed Xcode to run clang, use Nix clang instead - sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ - scripts/bootstrap/compile.sh \ - src/tools/xcode/realpath/BUILD \ - src/tools/xcode/stdredirect/BUILD \ - tools/osx/BUILD - - substituteInPlace scripts/bootstrap/compile.sh --replace ' -mmacosx-version-min=10.9' "" - - # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead - sed -i -e "/#include /i #include " src/main/cpp/blaze_util_darwin.cc - - # clang installed from Xcode has a compatibility wrapper that forwards - # invocations of gcc to clang, but vanilla clang doesn't - sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl - - sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl - wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) - for wrapper in "''${wrappers[@]}"; do - sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper - done - ''; - - genericPatches = '' - # Substitute j2objc and objc wrapper's python shebang to plain python path. - # These scripts explicitly depend on Python 2.7, hence we use python27. - # See also `postFixup` where python27 is added to $out/nix-support - substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" - substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" - substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" - - # md5sum is part of coreutils - sed -i 's|/sbin/md5|md5sum|g' \ - src/BUILD third_party/ijar/test/testenv.sh tools/objc/libtool.sh - - # replace initial value of pythonShebang variable in BazelPythonSemantics.java - substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \ - --replace '"#!/usr/bin/env " + pythonExecutableName' "\"#!${python3}/bin/python\"" - - # substituteInPlace is rather slow, so prefilter the files with grep - grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do - # If you add more replacements here, you must change the grep above! - # Only files containing /bin are taken into account. - # We default to python3 where possible. See also `postFixup` where - # python3 is added to $out/nix-support - substituteInPlace "$path" \ - --replace /bin/bash ${customBash}/bin/bash \ - --replace "/usr/bin/env bash" ${customBash}/bin/bash \ - --replace "/usr/bin/env python" ${python3}/bin/python \ - --replace /usr/bin/env ${coreutils}/bin/env \ - --replace /bin/true ${coreutils}/bin/true - done - - # bazel test runner include references to /bin/bash - substituteInPlace tools/build_rules/test_rules.bzl \ - --replace /bin/bash ${customBash}/bin/bash - - for i in $(find tools/cpp/ -type f) - do - substituteInPlace $i \ - --replace /bin/bash ${customBash}/bin/bash - done - - # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. - substituteInPlace scripts/bootstrap/compile.sh \ - --replace /bin/bash ${customBash}/bin/bash - - # add nix environment vars to .bazelrc - cat >> .bazelrc <> runfiles.bash.tmp - cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp - mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash - - patchShebangs . - ''; - in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches - + genericPatches; - - buildInputs = [ - buildJdk - python3 - ]; - - # when a command can’t be found in a bazel build, you might also - # need to add it to `defaultShellPath`. - nativeBuildInputs = [ - installShellFiles - zip - python3 - unzip - makeWrapper - which - customBash - ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ]; - - # Bazel makes extensive use of symlinks in the WORKSPACE. - # This causes problems with infinite symlinks if the build output is in the same location as the - # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a - # subdirectory. - # Failing to do this causes "infinite symlink expansion detected" - preBuildPhases = ["preBuildPhase"]; - preBuildPhase = '' - mkdir bazel_src - shopt -s dotglob extglob - mv !(bazel_src) bazel_src - ''; - - buildPhase = '' - # Increasing memory during compilation might be necessary. - # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" - ./bazel_src/compile.sh - ./bazel_src/scripts/generate_bash_completion.sh \ - --bazel=./bazel_src/output/bazel \ - --output=./bazel_src/output/bazel-complete.bash \ - --prepend=./bazel_src/scripts/bazel-complete-header.bash \ - --prepend=./bazel_src/scripts/bazel-complete-template.bash - - # need to change directory for bazel to find the workspace - cd ./bazel_src - # build execlog tooling - export HOME=$(mktemp -d) - ./output/bazel build src/tools/execlog:parser_deploy.jar - cd - - ''; - - installPhase = '' - mkdir -p $out/bin - - # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel - # if it can’t find something in tools, it calls $out/bin/bazel-{version}-{os_arch} - # The binary _must_ exist with this naming if your project contains a .bazelversion - # file. - cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel - - mkdir $out/share - cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar - mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} - cat < $out/bin/bazel-execlog - #!${runtimeShell} -e - ${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@ - EOF - chmod +x $out/bin/bazel-execlog - - # shell completion files - installShellCompletion --bash \ - --name bazel.bash \ - ./bazel_src/output/bazel-complete.bash - installShellCompletion --zsh \ - --name _bazel \ - ./bazel_src/scripts/zsh_completion/_bazel - installShellCompletion --fish \ - --name bazel.fish \ - ./bazel_src/scripts/fish/completions/bazel.fish - ''; - - doInstallCheck = true; - installCheckPhase = '' - export TEST_TMPDIR=$(pwd) - - hello_test () { - $out/bin/bazel test \ - --test_output=errors \ - --java_toolchain='${javaToolchain}' \ - examples/cpp:hello-success_test \ - examples/java-native/src/test/java/com/example/myproject:hello - } - - cd ./bazel_src - - # test whether $WORKSPACE_ROOT/tools/bazel works - - mkdir -p tools - cat > tools/bazel <<"EOF" - #!${runtimeShell} -e - exit 1 - EOF - chmod +x tools/bazel - - # first call should fail if tools/bazel is used - ! hello_test - - cat > tools/bazel <<"EOF" - #!${runtimeShell} -e - exec "$BAZEL_REAL" "$@" - EOF - - # second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch} - hello_test - ''; - - # Save paths to hardcoded dependencies so Nix can detect them. - postFixup = '' - mkdir -p $out/nix-support - echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends - # The templates get tar’d up into a .jar, - # so nix can’t detect python is needed in the runtime closure - # Some of the scripts explicitly depend on Python 2.7. Otherwise, we - # default to using python3. Therefore, both python27 and python3 are - # 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 - ''; - - dontStrip = true; - dontPatchELF = true; -} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/gcc11.patch b/pkgs/development/tools/build-managers/bazel/bazel_3/gcc11.patch deleted file mode 100644 index 450bcd114776..000000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/gcc11.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/third_party/ijar/mapped_file_unix.cc b/third_party/ijar/mapped_file_unix.cc -index 6e3a908..030e9ca 100644 ---- a/third_party/ijar/mapped_file_unix.cc -+++ b/third_party/ijar/mapped_file_unix.cc -@@ -19,6 +19,7 @@ - #include - - #include -+#include - - #include "third_party/ijar/mapped_file.h" - -diff --git a/third_party/ijar/zlib_client.h b/third_party/ijar/zlib_client.h -index ed66163..c4b051e 100644 ---- a/third_party/ijar/zlib_client.h -+++ b/third_party/ijar/zlib_client.h -@@ -16,6 +16,7 @@ - #define THIRD_PARTY_IJAR_ZLIB_CLIENT_H_ - - #include -+#include - - #include "third_party/ijar/common.h" - diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/no-arc.patch b/pkgs/development/tools/build-managers/bazel/bazel_3/no-arc.patch deleted file mode 100644 index 012e613c2f19..000000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/no-arc.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/tools/osx/xcode_locator.m 2020-12-10 13:27:29.000000000 +0100 -+++ b/tools/osx/xcode_locator.m 2021-02-01 09:09:32.159557051 +0100 -@@ -21,10 +21,6 @@ - // 6,6.4,6.4.1 = 6.4.1 - // 6.3,6.3.0 = 6.3 - --#if !defined(__has_feature) || !__has_feature(objc_arc) --#error "This file requires ARC support." --#endif -- - #import - #import - ---- a/tools/osx/xcode_configure.bzl 1980-01-01 01:00:00.000000000 +0100 -+++ b/tools/osx/xcode_configure.bzl 2021-02-01 09:36:57.773418444 +0100 -@@ -123,7 +123,6 @@ - "macosx", - "clang", - "-mmacosx-version-min=10.9", -- "-fobjc-arc", - "-framework", - "CoreServices", - "-framework", ---- a/tools/osx/BUILD 2021-02-01 11:01:02.191659553 +0100 -+++ b/tools/osx/BUILD 2021-02-01 11:04:29.735071019 +0100 -@@ -27,7 +27,7 @@ - ]) - - DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """ -- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \ -+ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \ - -framework Foundation -o $@ $< - """ - diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json deleted file mode 100644 index 96553d9d8859..000000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json +++ /dev/null @@ -1,861 +0,0 @@ -{ - "1.25.0.zip": { - "name": "1.25.0.zip", - "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip", - "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip" - ] - }, - "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": { - "name": "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", - "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", - "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" - ] - }, - "2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz": { - "name": "2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz", - "sha256": "c00ceec469dbcf7929972e3c79f20c14033824538038a554952f5c31d8832f96", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz" - ] - }, - "46993efdd33b73649796c5fc5c9efb193ae19d51.zip": { - "name": "46993efdd33b73649796c5fc5c9efb193ae19d51.zip", - "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip", - "https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip" - ] - }, - "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { - "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" - ] - }, - "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz": { - "name": "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz", - "sha256": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz", - "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz" - ] - }, - "9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz": { - "name": "9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz", - "sha256": "61d0417abd60e65ed589c9deee7c124fe76a4106831f6ad39464e1525cef1454", - "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz", - "https://github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz" - ] - }, - "android_tools_for_testing": { - "name": "android_tools_for_testing", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", - "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" - }, - "android_tools_pkg-0.19.0rc3.tar.gz": { - "name": "android_tools_pkg-0.19.0rc3.tar.gz", - "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", - "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" - ] - }, - "b1c40e1de81913a3c40e5948f78719c28152486d.zip": { - "name": "b1c40e1de81913a3c40e5948f78719c28152486d.zip", - "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", - "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" - ] - }, - "bazel-toolchains-3.1.0.tar.gz": { - "name": "bazel-toolchains-3.1.0.tar.gz", - "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz" - ] - }, - "bazel_j2objc": { - "name": "bazel_j2objc", - "sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b", - "strip_prefix": "j2objc-2.5", - "urls": [ - "https://mirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip", - "https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip" - ] - }, - "bazel_skylib": { - "name": "bazel_skylib", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "c00ceec469dbcf7929972e3c79f20c14033824538038a554952f5c31d8832f96", - "strip_prefix": "bazel-skylib-2d4c9528e0f453b5950eeaeac11d8d09f5a504d4", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz" - ] - }, - "bazel_toolchains": { - "name": "bazel_toolchains", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2", - "strip_prefix": "bazel-toolchains-3.1.0", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz" - ] - }, - "bazel_website": { - "build_file_content": "\nexports_files([\"_sass/style.scss\"])\n", - "name": "bazel_website", - "sha256": "a5f531dd1d62e6947dcfc279656ffc2fdf6f447c163914c5eabf7961b4cb6eb4", - "strip_prefix": "bazel-website-c174fa288aa079b68416d2ce2cc97268fa172f42", - "urls": [ - "https://github.com/bazelbuild/bazel-website/archive/c174fa288aa079b68416d2ce2cc97268fa172f42.tar.gz" - ] - }, - "build_bazel_rules_nodejs": { - "name": "build_bazel_rules_nodejs", - "sha256": "b6670f9f43faa66e3009488bbd909bc7bc46a5a9661a33f6bc578068d1837f37", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz", - "https://github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz" - ] - }, - "com_github_grpc_grpc": { - "name": "com_github_grpc_grpc", - "patch_args": [ - "-p1" - ], - "patches": [ - "//third_party/grpc:grpc_1.26.0.patch" - ], - "sha256": "2fcb7f1ab160d6fd3aaade64520be3e5446fc4c6fa7ba6581afdc4e26094bd81", - "strip_prefix": "grpc-1.26.0", - "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.26.0.tar.gz", - "https://github.com/grpc/grpc/archive/v1.26.0.tar.gz" - ] - }, - "com_google_googletest": { - "name": "com_google_googletest", - "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb", - "strip_prefix": "googletest-release-1.10.0", - "urls": [ - "https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz", - "https://github.com/google/googletest/archive/release-1.10.0.tar.gz" - ] - }, - "com_google_protobuf": { - "name": "com_google_protobuf", - "patch_args": [ - "-p1" - ], - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "patches": [ - "//third_party/protobuf:3.13.0.patch" - ], - "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a", - "strip_prefix": "protobuf-3.13.0", - "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz" - ] - }, - "coverage_output_generator-v2.5.zip": { - "name": "coverage_output_generator-v2.5.zip", - "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", - "urls": [ - "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" - ] - }, - "desugar_jdk_libs": { - "name": "desugar_jdk_libs", - "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", - "strip_prefix": "desugar_jdk_libs-e0b0291b2c51fbe5a7cfa14473a1ae850f94f021", - "urls": [ - "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" - ] - }, - "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": { - "name": "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", - "urls": [ - "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" - ] - }, - "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": { - "name": "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", - "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", - "urls": [ - "https://mirror.bazel.build/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", - "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" - ] - }, - "io_bazel_rules_sass": { - "name": "io_bazel_rules_sass", - "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647", - "strip_prefix": "rules_sass-1.25.0", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip", - "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip" - ] - }, - "io_bazel_skydoc": { - "name": "io_bazel_skydoc", - "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", - "strip_prefix": "stardoc-1ef781ced3b1443dca3ed05dec1989eca1a4e1cd", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", - "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" - ] - }, - "java_tools_javac11_darwin-v10.0.zip": { - "name": "java_tools_javac11_darwin-v10.0.zip", - "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip" - ] - }, - "java_tools_javac11_linux-v10.0.zip": { - "name": "java_tools_javac11_linux-v10.0.zip", - "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip" - ] - }, - "java_tools_javac11_windows-v10.0.zip": { - "name": "java_tools_javac11_windows-v10.0.zip", - "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip" - ] - }, - "java_tools_langtools_javac11": { - "name": "java_tools_langtools_javac11", - "sha256": "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip" - ] - }, - "openjdk11_darwin_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk11_darwin_archive", - "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" - ] - }, - "openjdk11_linux_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk11_linux_archive", - "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" - ] - }, - "openjdk11_windows_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk11_windows_archive", - "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" - ] - }, - "openjdk14_darwin_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk14_darwin_archive", - "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" - ] - }, - "openjdk14_linux_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk14_linux_archive", - "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" - ] - }, - "openjdk14_windows_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk14_windows_archive", - "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" - ] - }, - "openjdk_linux": { - "downloaded_file_path": "zulu-linux.tar.gz", - "name": "openjdk_linux", - "sha256": "65bfe4e0ffa74a680ee4410db46b17e30cd9397b664a92a886599fe1f3530969", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-linux_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689070.tar.gz" - ] - }, - "openjdk_linux_aarch64": { - "downloaded_file_path": "zulu-linux-aarch64.tar.gz", - "name": "openjdk_linux_aarch64", - "sha256": "6b245793087300db3ee82ab0d165614f193a73a60f2f011e347756c1e6ca5bac", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz" - ] - }, - "openjdk_linux_aarch64_minimal": { - "downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz", - "name": "openjdk_linux_aarch64_minimal", - "sha256": "06f6520a877704c77614bcfc4f846cc7cbcbf5eaad149bf7f19f4f16e285c9de", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz" - ] - }, - "openjdk_linux_aarch64_vanilla": { - "downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz", - "name": "openjdk_linux_aarch64_vanilla", - "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" - ] - }, - "openjdk_linux_minimal": { - "downloaded_file_path": "zulu-linux-minimal.tar.gz", - "name": "openjdk_linux_minimal", - "sha256": "91f7d52f695c681d4e21499b4319d548aadef249a6b3053e306308992e1e29ae", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689068.tar.gz" - ] - }, - "openjdk_linux_ppc64le_vanilla": { - "downloaded_file_path": "adoptopenjdk-ppc64le-vanilla.tar.gz", - "name": "openjdk_linux_ppc64le_vanilla", - "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", - "urls": [ - "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", - "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" - ] - }, - "openjdk_linux_s390x_vanilla": { - "downloaded_file_path": "adoptopenjdk-s390x-vanilla.tar.gz", - "name": "openjdk_linux_s390x_vanilla", - "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", - "urls": [ - "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", - "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" - ] - }, - "openjdk_linux_vanilla": { - "downloaded_file_path": "zulu-linux-vanilla.tar.gz", - "name": "openjdk_linux_vanilla", - "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" - ] - }, - "openjdk_macos": { - "downloaded_file_path": "zulu-macos.tar.gz", - "name": "openjdk_macos", - "sha256": "8e283cfd23c7555be8e17295ed76eb8f00324c88ab904b8de37bbe08f90e569b", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689066.tar.gz" - ] - }, - "openjdk_macos_minimal": { - "downloaded_file_path": "zulu-macos-minimal.tar.gz", - "name": "openjdk_macos_minimal", - "sha256": "1bacb1c07035d4066d79f0b65b4ea0ebd1954f3662bdfe3618da382ac8fd23a6", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689063.tar.gz" - ] - }, - "openjdk_macos_vanilla": { - "downloaded_file_path": "zulu-macos-vanilla.tar.gz", - "name": "openjdk_macos_vanilla", - "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" - ] - }, - "openjdk_win": { - "downloaded_file_path": "zulu-win.zip", - "name": "openjdk_win", - "sha256": "8e1604b3a27dcf639bc6d1a73103f1211848139e4cceb081d0a74a99e1e6f995", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip" - ] - }, - "openjdk_win_minimal": { - "downloaded_file_path": "zulu-win-minimal.zip", - "name": "openjdk_win_minimal", - "sha256": "b90a713c9c2d9ea23cad44d2c2dfcc9af22faba9bde55dedc1c3bb9f556ac1ae", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip" - ] - }, - "openjdk_win_vanilla": { - "downloaded_file_path": "zulu-win-vanilla.zip", - "name": "openjdk_win_vanilla", - "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" - ] - }, - "platforms": { - "name": "platforms", - "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", - "strip_prefix": "platforms-46993efdd33b73649796c5fc5c9efb193ae19d51", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip", - "https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip" - ] - }, - "remote_coverage_tools_for_testing": { - "name": "remote_coverage_tools_for_testing", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", - "urls": [ - "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" - ] - }, - "remote_java_tools_darwin_for_testing": { - "name": "remote_java_tools_darwin_for_testing", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_darwin-v10.0.zip" - ] - }, - "remote_java_tools_javac11_test_darwin": { - "name": "remote_java_tools_javac11_test_darwin", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip" - ] - }, - "remote_java_tools_javac11_test_linux": { - "name": "remote_java_tools_javac11_test_linux", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip" - ] - }, - "remote_java_tools_javac11_test_windows": { - "name": "remote_java_tools_javac11_test_windows", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip" - ] - }, - "remote_java_tools_linux_for_testing": { - "name": "remote_java_tools_linux_for_testing", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_linux-v10.0.zip" - ] - }, - "remote_java_tools_windows_for_testing": { - "name": "remote_java_tools_windows_for_testing", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_windows-v10.0.zip" - ] - }, - "remotejdk11_linux_aarch64_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_linux_aarch64_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", - "strip_prefix": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" - ] - }, - "remotejdk11_linux_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_linux_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" - ] - }, - "remotejdk11_linux_ppc64le_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_linux_ppc64le_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", - "strip_prefix": "jdk-11.0.7+10", - "urls": [ - "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", - "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" - ] - }, - "remotejdk11_linux_s390x_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_linux_s390x_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", - "strip_prefix": "jdk-11.0.7+10", - "urls": [ - "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", - "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" - ] - }, - "remotejdk11_macos_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_macos_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" - ] - }, - "remotejdk11_win_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_win_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" - ] - }, - "remotejdk14_linux_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk14_linux_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" - ] - }, - "remotejdk14_macos_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk14_macos_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" - ] - }, - "remotejdk14_win_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk14_win_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" - ] - }, - "rules_cc": { - "name": "rules_cc", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", - "strip_prefix": "rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", - "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" - ] - }, - "rules_java": { - "name": "rules_java", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", - "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" - ] - }, - "rules_nodejs-1.3.0.tar.gz": { - "name": "rules_nodejs-1.3.0.tar.gz", - "sha256": "b6670f9f43faa66e3009488bbd909bc7bc46a5a9661a33f6bc578068d1837f37", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz", - "https://github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz" - ] - }, - "rules_pkg": { - "name": "rules_pkg", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz", - "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz" - ] - }, - "rules_pkg-0.2.4.tar.gz": { - "name": "rules_pkg-0.2.4.tar.gz", - "sha256": "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz", - "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz" - ] - }, - "rules_proto": { - "name": "rules_proto", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208", - "strip_prefix": "rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz", - "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz" - ] - }, - "upb": { - "name": "upb", - "patch_args": [ - "-p1" - ], - "patches": [ - "//third_party/grpc:upb_gcc10_fix.patch" - ], - "sha256": "61d0417abd60e65ed589c9deee7c124fe76a4106831f6ad39464e1525cef1454", - "strip_prefix": "upb-9effcbcb27f0a665f9f345030188c0b291e32482", - "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz", - "https://github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz" - ] - }, - "v1.26.0.tar.gz": { - "name": "v1.26.0.tar.gz", - "sha256": "2fcb7f1ab160d6fd3aaade64520be3e5446fc4c6fa7ba6581afdc4e26094bd81", - "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.26.0.tar.gz", - "https://github.com/grpc/grpc/archive/v1.26.0.tar.gz" - ] - }, - "v3.13.0.tar.gz": { - "name": "v3.13.0.tar.gz", - "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a", - "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz" - ] - }, - "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": { - "name": "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz", - "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" - ] - }, - "zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz": { - "name": "zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz", - "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" - ] - }, - "zulu11.37.17-ca-jdk11.0.6-win_x64.zip": { - "name": "zulu11.37.17-ca-jdk11.0.6-win_x64.zip", - "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" - ] - }, - "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": { - "name": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz", - "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" - ] - } -} 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 99897364e6af..ce370dd414d8 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -2,12 +2,10 @@ , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self -# needed only for the updater -, bazel_3 , lr, xe, zip, unzip, bash, writeCBin, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils # updater -, python27, python3, writeScript +, python3, writeScript # Apple dependencies , cctools, libcxx, CoreFoundation, CoreServices, Foundation # Allow to independently override the jdks used to build and run respectively @@ -102,10 +100,6 @@ let # "@bison//:bin/bison", # ], # ) - # - # Some of the scripts explicitly depend on Python 2.7. Otherwise, we - # default to using python3. Therefore, both python27 and python3 are - # runtime dependencies. [ bash coreutils @@ -116,7 +110,6 @@ let gnused gnutar gzip - python27 python3 unzip which @@ -369,7 +362,7 @@ stdenv.mkDerivation rec { #!${runtimeShell} (cd "${src_for_updater}" && BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ - "${bazel_3}"/bin/bazel \ + "${bazel_self}"/bin/bazel \ query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \ --loading_phase_threads=1 \ --output build) \ @@ -432,11 +425,9 @@ stdenv.mkDerivation rec { genericPatches = '' # Substitute j2objc and objc wrapper's python shebang to plain python path. - # These scripts explicitly depend on Python 2.7, hence we use python27. - # See also `postFixup` where python27 is added to $out/nix-support - substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" - substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" - substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" + substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}" + substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}" + substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}" # md5sum is part of coreutils sed -i 's|/sbin/md5|md5sum|g' \ @@ -450,8 +441,6 @@ stdenv.mkDerivation rec { grep -rlZ /bin/ src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do # If you add more replacements here, you must change the grep above! # Only files containing /bin are taken into account. - # We default to python3 where possible. See also `postFixup` where - # python3 is added to $out/nix-support substituteInPlace "$path" \ --replace /bin/bash ${bash}/bin/bash \ --replace "/usr/bin/env bash" ${bash}/bin/bash \ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 491a02d74d0d..29874a82ad25 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -2,12 +2,10 @@ , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self -# needed only for the updater -, bazel_4 , lr, xe, zip, unzip, bash, writeCBin, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils # updater -, python27, python3, writeScript +, python3, writeScript # Apple dependencies , cctools, libcxx, sigtool, CoreFoundation, CoreServices, Foundation # Allow to independently override the jdks used to build and run respectively @@ -26,12 +24,12 @@ }: let - version = "5.2.0"; + version = "5.4.0"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "sha256-ggqU27FAce1tjCZs8MCA7LJlpe6mUwdXlInEZiwtWCo="; + hash = "sha256-ocYtm8tOAxBt3wt72WGWuiRuHJt6k12vjZvtqLvcuKE="; }; # Update with `eval $(nix-build -A bazel_5.updater)`, @@ -100,10 +98,6 @@ let # "@bison//:bin/bison", # ], # ) - # - # Some of the scripts explicitly depend on Python 2.7. Otherwise, we - # default to using python3. Therefore, both python27 and python3 are - # runtime dependencies. [ bash coreutils @@ -114,7 +108,6 @@ let gnused gnutar gzip - python27 python3 unzip which @@ -331,7 +324,7 @@ stdenv.mkDerivation rec { #!${runtimeShell} (cd "${src_for_updater}" && BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ - "${bazel_4}"/bin/bazel \ + "${bazel_self}"/bin/bazel \ query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \ --loading_phase_threads=1 \ --output build) \ @@ -393,11 +386,9 @@ stdenv.mkDerivation rec { genericPatches = '' # Substitute j2objc and objc wrapper's python shebang to plain python path. - # These scripts explicitly depend on Python 2.7, hence we use python27. - # See also `postFixup` where python27 is added to $out/nix-support - substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" - substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" - substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" + substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}" + substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}" + substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}" # md5sum is part of coreutils sed -i 's|/sbin/md5|md5sum|g' \ @@ -414,8 +405,6 @@ stdenv.mkDerivation rec { grep -rlZ /bin/ src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do # If you add more replacements here, you must change the grep above! # Only files containing /bin are taken into account. - # We default to python3 where possible. See also `postFixup` where - # python3 is added to $out/nix-support substituteInPlace "$path" \ --replace /bin/bash ${bash}/bin/bash \ --replace "/usr/bin/env bash" ${bash}/bin/bash \ @@ -426,7 +415,7 @@ stdenv.mkDerivation rec { grep -rlZ /bin/ tools/python | while IFS="" read -r -d "" path; do substituteInPlace "$path" \ - --replace "/usr/bin/env python2" ${python27}/bin/python \ + --replace "/usr/bin/env python2" ${python3.interpreter} \ --replace "/usr/bin/env python3" ${python3}/bin/python \ --replace /usr/bin/env ${coreutils}/bin/env done diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json index 9ca98f1132ab..fc6895e047ec 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json @@ -1129,18 +1129,18 @@ "generator_function": "dist_http_archive", "generator_name": "platforms", "name": "platforms", - "sha256": "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d", + "sha256": "379113459b0feaf6bfbb584a91874c065078aa673222846ac765f86661c27407", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz" ] }, - "platforms-0.0.4.tar.gz": { - "name": "platforms-0.0.4.tar.gz", - "sha256": "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d", + "platforms-0.0.5.tar.gz": { + "name": "platforms-0.0.5.tar.gz", + "sha256": "379113459b0feaf6bfbb584a91874c065078aa673222846ac765f86661c27407", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz" ] }, "remote_coverage_tools": { diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index b8e00bb95aed..63d500e8247e 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -2,12 +2,10 @@ , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self -# needed only for the updater -, bazel_4 , lr, xe, zip, unzip, bash, writeCBin, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils # updater -, python27, python3, writeScript +, python3, writeScript # Apple dependencies , cctools, libcxx, CoreFoundation, CoreServices, Foundation # Allow to independently override the jdks used to build and run respectively @@ -26,22 +24,22 @@ }: let - version = "6.0.0-pre.20220720.3"; + version = "6.0.0"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - hash = "sha256-i8d4yLSq8fL+YT11wYmBvLDLSprq1gVfyjsKBYci1bk="; + hash = "sha256-e8DFFFwZpW2CoI/OaQjF4aDnXk+/s7bxK03q5/SzjLw="; }; - # Update with `eval $(nix-build -A bazel_5.updater)`, + # Update with `eval $(nix-build -A bazel_6.updater)`, # then add new dependencies from the dict in ./src-deps.json as required. srcDeps = lib.attrsets.attrValues srcDepsSet; srcDepsSet = let srcs = lib.importJSON ./src-deps.json; toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { - urls = d.urls; + urls = d.urls or [d.url]; sha256 = d.sha256; }); in builtins.listToAttrs (map toFetchurl [ @@ -54,8 +52,8 @@ let srcs.remote_java_tools_for_testing srcs."coverage_output_generator-v2.6.zip" srcs.build_bazel_rules_nodejs - srcs."android_tools_pkg-0.26.0.tar.gz" - srcs."zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz" + srcs.android_tools_for_testing + srcs.openjdk_linux_vanilla srcs.bazel_toolchains srcs.com_github_grpc_grpc srcs.upb @@ -69,6 +67,9 @@ let srcs.com_google_absl srcs.com_googlesource_code_re2 srcs.com_github_cares_cares + srcs.com_envoyproxy_protoc_gen_validate + srcs.com_google_googleapis + srcs.bazel_gazelle ]); distDir = runCommand "bazel-deps" {} '' @@ -103,10 +104,6 @@ let # "@bison//:bin/bison", # ], # ) - # - # Some of the scripts explicitly depend on Python 2.7. Otherwise, we - # default to using python3. Therefore, both python27 and python3 are - # runtime dependencies. [ bash coreutils @@ -117,7 +114,6 @@ let gnused gnutar gzip - python27 python3 unzip which @@ -338,7 +334,7 @@ stdenv.mkDerivation rec { #!${runtimeShell} (cd "${src_for_updater}" && BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ - "${bazel_4}"/bin/bazel \ + "${bazel_self}"/bin/bazel \ query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \ --loading_phase_threads=1 \ --output build) \ @@ -391,7 +387,7 @@ stdenv.mkDerivation rec { sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl sed -i -e 's;"/usr/bin/libtool";_find_generic(repository_ctx, "libtool", "LIBTOOL", overriden_tools);g' tools/cpp/unix_cc_configure.bzl - wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) + wrappers=( tools/cpp/osx_cc_wrapper.sh.tpl ) for wrapper in "''${wrappers[@]}"; do sed -i -e "s,/usr/bin/gcc,${stdenv.cc}/bin/clang,g" $wrapper sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper @@ -414,8 +410,6 @@ stdenv.mkDerivation rec { grep -rlZ /bin/ src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do # If you add more replacements here, you must change the grep above! # Only files containing /bin are taken into account. - # We default to python3 where possible. See also `postFixup` where - # python3 is added to $out/nix-support substituteInPlace "$path" \ --replace /bin/bash ${bash}/bin/bash \ --replace "/usr/bin/env bash" ${bash}/bin/bash \ @@ -426,7 +420,7 @@ stdenv.mkDerivation rec { grep -rlZ /bin/ tools/python | while IFS="" read -r -d "" path; do substituteInPlace "$path" \ - --replace "/usr/bin/env python2" ${python27}/bin/python \ + --replace "/usr/bin/env python2" ${python3.interpreter} \ --replace "/usr/bin/env python3" ${python3}/bin/python \ --replace /usr/bin/env ${coreutils}/bin/env done diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json index 032ec1f80a88..ae10299be916 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json @@ -23,12 +23,20 @@ "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz" ] }, - "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz": { - "name": "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", - "sha256": "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4", + "2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz": { + "name": "2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz", + "sha256": "5bb6b0253ccf64b53d6c7249625a7e3f6c3bc6402abd52d3778bfa48258703a0", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", - "https://github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz" + "https://mirror.bazel.build/github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz", + "https://github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz" + ] + }, + "4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz": { + "name": "4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz", + "sha256": "1e490b98005664d149b379a9529a6aa05932b8a11b76b4cd86f3d22d76346f47", + "urls": [ + "https://mirror.bazel.build/github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz", + "https://github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz" ] }, "5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip": { @@ -39,6 +47,14 @@ "https://github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip" ] }, + "6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz": { + "name": "6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz", + "sha256": "ec76c5e79db59762776bece58b69507d095856c37b81fd35bfb0958e74b61d93", + "urls": [ + "https://mirror.bazel.build/github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz", + "https://github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz" + ] + }, "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", @@ -55,6 +71,14 @@ "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz" ] }, + "a5477045acaa34586420942098f5fecd3570f577.tar.gz": { + "name": "a5477045acaa34586420942098f5fecd3570f577.tar.gz", + "sha256": "cf7f71eaff90b24c1a28b49645a9ff03a9a6c1e7134291ce70901cb63e7364b5", + "urls": [ + "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz", + "https://github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz" + ] + }, "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz": { "name": "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e", @@ -78,22 +102,22 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "a86d205da8bd08515d18bb4b98e4b66b8805e57008ec55118ff5ce038c57a5f1", - "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.26.0.tar.gz" + "sha256": "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz" }, - "android_tools_pkg-0.26.0.tar.gz": { - "name": "android_tools_pkg-0.26.0.tar.gz", - "sha256": "a86d205da8bd08515d18bb4b98e4b66b8805e57008ec55118ff5ce038c57a5f1", + "android_tools_pkg-0.27.0.tar.gz": { + "name": "android_tools_pkg-0.27.0.tar.gz", + "sha256": "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d", "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.26.0.tar.gz" + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz" ] }, - "b1c40e1de81913a3c40e5948f78719c28152486d.zip": { - "name": "b1c40e1de81913a3c40e5948f78719c28152486d.zip", - "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", + "bazel-gazelle-v0.24.0.tar.gz": { + "name": "bazel-gazelle-v0.24.0.tar.gz", + "sha256": "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", - "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz" ] }, "bazel-skylib-1.0.3.tar.gz": { @@ -116,14 +140,13 @@ ] }, "bazel_gazelle": { - "generator_function": "grpc_deps", + "generator_function": "dist_http_archive", "generator_name": "bazel_gazelle", "name": "bazel_gazelle", - "sha256": "d987004a72697334a095bbaa18d615804a28280201a50ed6c234c40ccc41e493", - "strip_prefix": "bazel-gazelle-0.19.1", + "sha256": "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/bazel-gazelle/archive/v0.19.1.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/archive/v0.19.1.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz" ] }, "bazel_skylib": { @@ -148,11 +171,11 @@ "generator_function": "grpc_deps", "generator_name": "bazel_toolchains", "name": "bazel_toolchains", - "sha256": "0b36eef8a66f39c8dbae88e522d5bbbef49d5e66e834a982402c79962281be10", - "strip_prefix": "bazel-toolchains-1.0.1", + "sha256": "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024", + "strip_prefix": "bazel-toolchains-4.1.0", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/1.0.1.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/releases/download/1.0.1/bazel-toolchains-1.0.1.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/4.1.0.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz" ] }, "bazelci_rules": { @@ -186,32 +209,31 @@ "generator_function": "grpc_deps", "generator_name": "boringssl", "name": "boringssl", - "sha256": "6f640262999cd1fb33cf705922e453e835d2d20f3f06fe0d77f6426c19257308", - "strip_prefix": "boringssl-fc44652a42b396e1645d5e72aba053349992136a", + "sha256": "534fa658bd845fd974b50b10f444d392dfd0d93768c4a51b61263fd37d851c40", + "strip_prefix": "boringssl-b9232f9e27e5668bc0414879dcdedb2a59ea75f2", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/fc44652a42b396e1645d5e72aba053349992136a.tar.gz", - "https://github.com/google/boringssl/archive/fc44652a42b396e1645d5e72aba053349992136a.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/b9232f9e27e5668bc0414879dcdedb2a59ea75f2.tar.gz", + "https://github.com/google/boringssl/archive/b9232f9e27e5668bc0414879dcdedb2a59ea75f2.tar.gz" ] }, "build_bazel_apple_support": { "generator_function": "grpc_deps", "generator_name": "build_bazel_apple_support", "name": "build_bazel_apple_support", - "sha256": "122ebf7fe7d1c8e938af6aeaee0efe788a3a2449ece5a8d6a428cb18d6f88033", + "sha256": "76df040ade90836ff5543888d64616e7ba6c3a7b33b916aa3a4b68f342d1b447", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz", - "https://github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/apple_support/releases/download/0.11.0/apple_support.0.11.0.tar.gz", + "https://github.com/bazelbuild/apple_support/releases/download/0.11.0/apple_support.0.11.0.tar.gz" ] }, "build_bazel_rules_apple": { "generator_function": "grpc_deps", "generator_name": "build_bazel_rules_apple", "name": "build_bazel_rules_apple", - "sha256": "bdc8e66e70b8a75da23b79f1f8c6207356df07d041d96d2189add7ee0780cf4e", - "strip_prefix": "rules_apple-b869b0d3868d78a1d4ffd866ccb304fb68aa12c3", + "sha256": "0052d452af7742c8f3a4e0929763388a66403de363775db7e90adecb2ba4944b", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz", - "https://github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_apple/releases/download/0.31.3/rules_apple.0.31.3.tar.gz", + "https://github.com/bazelbuild/rules_apple/releases/download/0.31.3/rules_apple.0.31.3.tar.gz" ] }, "build_bazel_rules_nodejs": { @@ -224,15 +246,29 @@ "https://github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-5.5.0.tar.gz" ] }, + "cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz": { + "name": "cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz", + "sha256": "5bc8365613fe2f8ce6cc33959b7667b13b7fe56cb9d16ba740c06e1a7c4242fc", + "urls": [ + "https://mirror.bazel.build/github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz", + "https://github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz" + ] + }, "com_envoyproxy_protoc_gen_validate": { - "generator_function": "grpc_deps", + "generator_function": "dist_http_archive", "generator_name": "com_envoyproxy_protoc_gen_validate", "name": "com_envoyproxy_protoc_gen_validate", - "sha256": "dd4962e4a9e8388a4fbc5c33e64d73bdb222f103e4bad40ca5535f81c2c606c2", - "strip_prefix": "protoc-gen-validate-59da36e59fef2267fc2b1849a05159e3ecdf24f3", + "patch_args": [ + "-p1" + ], + "patches": [ + "//third_party/protoc_gen_validate:protoc_gen_validate.patch" + ], + "sha256": "1e490b98005664d149b379a9529a6aa05932b8a11b76b4cd86f3d22d76346f47", + "strip_prefix": "protoc-gen-validate-4694024279bdac52b77e22dc87808bd0fd732b69", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/protoc-gen-validate/archive/59da36e59fef2267fc2b1849a05159e3ecdf24f3.tar.gz", - "https://github.com/envoyproxy/protoc-gen-validate/archive/59da36e59fef2267fc2b1849a05159e3ecdf24f3.tar.gz" + "https://mirror.bazel.build/github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz", + "https://github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz" ] }, "com_github_cares_cares": { @@ -240,22 +276,39 @@ "generator_function": "grpc_deps", "generator_name": "com_github_cares_cares", "name": "com_github_cares_cares", - "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", - "strip_prefix": "c-ares-e982924acee7f7313b4baa4ee5ec000c5e373c30", + "sha256": "ec76c5e79db59762776bece58b69507d095856c37b81fd35bfb0958e74b61d93", + "strip_prefix": "c-ares-6654436a307a5a686b008c1d4c93b0085da6e6d8", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", - "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz", + "https://github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz" + ] + }, + "com_github_cncf_udpa": { + "generator_function": "dist_http_archive", + "generator_name": "com_github_cncf_udpa", + "name": "com_github_cncf_udpa", + "patch_args": [ + "-p1" + ], + "patches": [ + "//third_party/cncf_udpa:cncf_udpa_0.0.1.patch" + ], + "sha256": "5bc8365613fe2f8ce6cc33959b7667b13b7fe56cb9d16ba740c06e1a7c4242fc", + "strip_prefix": "xds-cb28da3451f158a947dfc45090fe92b07b243bc1", + "urls": [ + "https://mirror.bazel.build/github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz", + "https://github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz" ] }, "com_github_google_benchmark": { "generator_function": "grpc_deps", "generator_name": "com_github_google_benchmark", "name": "com_github_google_benchmark", - "sha256": "daa4a97e0547d76de300e325a49177b199f3689ce5a35e25d47696f7cb050f86", - "strip_prefix": "benchmark-73d4d5e8d6d449fc8663765a42aa8aeeee844489", + "sha256": "0b921a3bc39e35f4275c8dcc658af2391c150fb966102341287b0401ff2e6f21", + "strip_prefix": "benchmark-0baacde3618ca617da95375e0af13ce1baadea47", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/73d4d5e8d6d449fc8663765a42aa8aeeee844489.tar.gz", - "https://github.com/google/benchmark/archive/73d4d5e8d6d449fc8663765a42aa8aeeee844489.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/0baacde3618ca617da95375e0af13ce1baadea47.tar.gz", + "https://github.com/google/benchmark/archive/0baacde3618ca617da95375e0af13ce1baadea47.tar.gz" ] }, "com_github_grpc_grpc": { @@ -266,14 +319,26 @@ "-p1" ], "patches": [ - "//third_party/grpc:grpc_1.41.0.patch", - "//third_party/grpc:grpc_1.41.0.win_arm64.patch" + "//third_party/grpc:grpc_1.47.0.patch", + "//third_party/grpc:grpc_1.47.0.win_arm64.patch" ], - "sha256": "e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656", - "strip_prefix": "grpc-1.41.0", + "sha256": "271bdc890bf329a8de5b65819f0f9590a5381402429bca37625b63546ed19e54", + "strip_prefix": "grpc-1.47.0", "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.41.0.tar.gz", - "https://github.com/grpc/grpc/archive/v1.41.0.tar.gz" + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.47.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.47.0.tar.gz" + ] + }, + "com_github_libuv_libuv": { + "build_file": "@com_github_grpc_grpc//third_party:libuv.BUILD", + "generator_function": "grpc_deps", + "generator_name": "com_github_libuv_libuv", + "name": "com_github_libuv_libuv", + "sha256": "5ca4e9091f3231d8ad8801862dc4e851c23af89c69141d27723157776f7291e7", + "strip_prefix": "libuv-02a9e1be252b623ee032a3137c0b0c94afbe6809", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/libuv/libuv/archive/02a9e1be252b623ee032a3137c0b0c94afbe6809.tar.gz", + "https://github.com/libuv/libuv/archive/02a9e1be252b623ee032a3137c0b0c94afbe6809.tar.gz" ] }, "com_google_absl": { @@ -288,23 +353,23 @@ ] }, "com_google_googleapis": { - "generator_function": "grpc_deps", + "generator_function": "dist_http_archive", "generator_name": "com_google_googleapis", "name": "com_google_googleapis", "sha256": "5bb6b0253ccf64b53d6c7249625a7e3f6c3bc6402abd52d3778bfa48258703a0", "strip_prefix": "googleapis-2f9af297c84c55c8b871ba4495e01ade42476c92", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz", + "https://mirror.bazel.build/github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz", "https://github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz" ] }, "com_google_googletest": { "name": "com_google_googletest", - "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb", - "strip_prefix": "googletest-release-1.10.0", + "sha256": "81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2", + "strip_prefix": "googletest-release-1.12.1", "urls": [ - "https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz", - "https://github.com/google/googletest/archive/release-1.10.0.tar.gz" + "https://mirror.bazel.build/github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz", + "https://github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz" ] }, "com_google_protobuf": { @@ -323,13 +388,13 @@ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], "patches": [ - "//third_party/protobuf:3.19.2.patch" + "//third_party/protobuf:3.19.6.patch" ], - "sha256": "4dd35e788944b7686aac898f77df4e9a54da0ca694b8801bd6b2a9ffc1b3085e", - "strip_prefix": "protobuf-3.19.2", + "sha256": "9a301cf94a8ddcb380b901e7aac852780b826595075577bb967004050c835056", + "strip_prefix": "protobuf-3.19.6", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz" + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz" ] }, "com_google_testparameterinjector": { @@ -346,11 +411,11 @@ "generator_function": "grpc_deps", "generator_name": "com_googlesource_code_re2", "name": "com_googlesource_code_re2", - "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e", - "strip_prefix": "re2-aecba11114cf1fac5497aeb844b6966106de3eb6", + "sha256": "319a58a58d8af295db97dfeecc4e250179c5966beaa2d842a82f0a013b6a239b", + "strip_prefix": "re2-8e08f47b11b413302749c0d8b17a1c94777495d5", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", - "https://github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/re2/archive/8e08f47b11b413302749c0d8b17a1c94777495d5.tar.gz", + "https://github.com/google/re2/archive/8e08f47b11b413302749c0d8b17a1c94777495d5.tar.gz" ] }, "coverage_output_generator-v2.6.zip": { @@ -365,10 +430,10 @@ "generator_function": "grpc_deps", "generator_name": "cython", "name": "cython", - "sha256": "e2e38e1f0572ca54d6085df3dec8b607d20e81515fb80215aed19c81e8fe2079", - "strip_prefix": "cython-0.29.21", + "sha256": "bb72b2f0ef029472759c711f0a4bded6e15e3f9bda3797550cef3c1d87d02283", + "strip_prefix": "cython-0.29.26", "urls": [ - "https://github.com/cython/cython/archive/0.29.21.tar.gz" + "https://github.com/cython/cython/archive/0.29.26.tar.gz" ] }, "desugar_jdk_libs": { @@ -382,14 +447,6 @@ "https://github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip" ] }, - "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": { - "name": "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", - "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", - "urls": [ - "https://mirror.bazel.build/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", - "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" - ] - }, "enum34": { "build_file": "@com_github_grpc_grpc//third_party:enum34.BUILD", "generator_function": "grpc_deps", @@ -405,11 +462,11 @@ "generator_function": "grpc_deps", "generator_name": "envoy_api", "name": "envoy_api", - "sha256": "330f2f9c938fc038b7ab438919b692d30cdfba3cf596e7824410f88da16c30b5", - "strip_prefix": "data-plane-api-2f0d081fab0b0823f088c6e368f40e1992f46fcd", + "sha256": "c5807010b67033330915ca5a20483e30538ae5e689aa14b3631d6284beca4630", + "strip_prefix": "data-plane-api-9c42588c956220b48eb3099d186487c2f04d32ec", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/2f0d081fab0b0823f088c6e368f40e1992f46fcd.tar.gz", - "https://github.com/envoyproxy/data-plane-api/archive/2f0d081fab0b0823f088c6e368f40e1992f46fcd.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/9c42588c956220b48eb3099d186487c2f04d32ec.tar.gz", + "https://github.com/envoyproxy/data-plane-api/archive/9c42588c956220b48eb3099d186487c2f04d32ec.tar.gz" ] }, "futures": { @@ -427,18 +484,24 @@ "generator_function": "grpc_deps", "generator_name": "io_bazel_rules_go", "name": "io_bazel_rules_go", - "sha256": "dbf5a9ef855684f84cac2e7ae7886c5a001d4f66ae23f6904da0faaaef0d61fc", + "sha256": "69de5c704a05ff37862f7e0f5534d4f479418afc21806c887db544a316f3cb6b", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.24.11/rules_go-v0.24.11.tar.gz", - "https://github.com/bazelbuild/rules_go/releases/download/v0.24.11/rules_go-v0.24.11.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz", + "https://github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz" ] }, "io_bazel_rules_python": { "generator_function": "grpc_deps", "generator_name": "io_bazel_rules_python", "name": "io_bazel_rules_python", - "sha256": "aa96a691d3a8177f3215b14b0edc9641787abaaa30363a080165d06ab65e1161", - "url": "https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz" + "patch_args": [ + "-p1" + ], + "patches": [ + "@com_github_grpc_grpc//third_party:rules_python.patch" + ], + "sha256": "954aa89b491be4a083304a2cb838019c8b8c3720a7abb9c4cb81ac7a24230cea", + "url": "https://github.com/bazelbuild/rules_python/releases/download/0.4.0/rules_python-0.4.0.tar.gz" }, "io_bazel_rules_sass": { "generator_function": "dist_http_archive", @@ -473,36 +536,36 @@ "https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz" ] }, - "java_tools-v11.8.zip": { - "name": "java_tools-v11.8.zip", - "sha256": "8fb4d3138bd92a9d3324dae29c9f70d91ca2db18cd0bf1997446eed4657d19b3", + "java_tools-v11.9.zip": { + "name": "java_tools-v11.9.zip", + "sha256": "5cd59ea6bf938a1efc1e11ea562d37b39c82f76781211b7cd941a2346ea8484d", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools-v11.9.zip" ] }, - "java_tools_darwin-v11.8.zip": { - "name": "java_tools_darwin-v11.8.zip", - "sha256": "0dcf4500cc4a1de8e563c1d48a079a7a0cf77cc246e39fd37fcc78ddf409ed26", + "java_tools_darwin-v11.9.zip": { + "name": "java_tools_darwin-v11.9.zip", + "sha256": "b9e962c6a836ba1d7573f2473fab3a897c6370d4c2724bde4017b40932ff4fe4", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_darwin-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_darwin-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_darwin-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_darwin-v11.9.zip" ] }, - "java_tools_linux-v11.8.zip": { - "name": "java_tools_linux-v11.8.zip", - "sha256": "41502b293eea292b0577b46e8d7738bfe88180562acbf99ed620b5387a60efee", + "java_tools_linux-v11.9.zip": { + "name": "java_tools_linux-v11.9.zip", + "sha256": "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_linux-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_linux-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_linux-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_linux-v11.9.zip" ] }, - "java_tools_windows-v11.8.zip": { - "name": "java_tools_windows-v11.8.zip", - "sha256": "056ed8ba64920409eab63e3c4888c1970a523d2c03965784fc3243e37195318b", + "java_tools_windows-v11.9.zip": { + "name": "java_tools_windows-v11.9.zip", + "sha256": "677ab910046205020fd715489147c2bcfad8a35d9f5d94fdc998d217545bd87a", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_windows-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_windows-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_windows-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_windows-v11.9.zip" ] }, "microsoft-jdk-11.0.13.8.1-windows-aarch64.zip": { @@ -512,6 +575,126 @@ "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip" ] }, + "nuget_python_i686_3.10.0": { + "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python310.dll\",\n interface_library = \"libs/python310.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", + "generator_function": "grpc_extra_deps", + "generator_name": "nuget_python_i686_3.10.0", + "name": "nuget_python_i686_3.10.0", + "patch_cmds": [ + "cp -r include/* ." + ], + "sha256": "e115e102eb90ce160ab0ef7506b750a8d7ecc385bde0a496f02a54337a8bc333", + "strip_prefix": "tools", + "type": "zip", + "urls": [ + "https://www.nuget.org/api/v2/package/pythonx86/3.10.0" + ] + }, + "nuget_python_i686_3.7.0": { + "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python37.dll\",\n interface_library = \"libs/python37.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", + "generator_function": "grpc_extra_deps", + "generator_name": "nuget_python_i686_3.7.0", + "name": "nuget_python_i686_3.7.0", + "patch_cmds": [ + "cp -r include/* ." + ], + "sha256": "a8bb49fa1ca62ad55430fcafaca1b58015e22943e66b1a87d5e7cef2556c6a54", + "strip_prefix": "tools", + "type": "zip", + "urls": [ + "https://www.nuget.org/api/v2/package/pythonx86/3.7.0" + ] + }, + "nuget_python_i686_3.8.0": { + "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python38.dll\",\n interface_library = \"libs/python38.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", + "generator_function": "grpc_extra_deps", + "generator_name": "nuget_python_i686_3.8.0", + "name": "nuget_python_i686_3.8.0", + "patch_cmds": [ + "cp -r include/* ." + ], + "sha256": "87a6481f5eef30b42ac12c93f06f73bd0b8692f26313b76a6615d1641c4e7bca", + "strip_prefix": "tools", + "type": "zip", + "urls": [ + "https://www.nuget.org/api/v2/package/pythonx86/3.8.0" + ] + }, + "nuget_python_i686_3.9.0": { + "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python39.dll\",\n interface_library = \"libs/python39.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", + "generator_function": "grpc_extra_deps", + "generator_name": "nuget_python_i686_3.9.0", + "name": "nuget_python_i686_3.9.0", + "patch_cmds": [ + "cp -r include/* ." + ], + "sha256": "229abecbe49dc08fe5709e0b31e70edfb3b88f23335ebfc2904c44f940fd59b6", + "strip_prefix": "tools", + "type": "zip", + "urls": [ + "https://www.nuget.org/api/v2/package/pythonx86/3.9.0" + ] + }, + "nuget_python_x86-64_3.10.0": { + "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python310.dll\",\n interface_library = \"libs/python310.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", + "generator_function": "grpc_extra_deps", + "generator_name": "nuget_python_x86-64_3.10.0", + "name": "nuget_python_x86-64_3.10.0", + "patch_cmds": [ + "cp -r include/* ." + ], + "sha256": "4474c83c25625d93e772e926f95f4cd398a0abbb52793625fa30f39af3d2cc00", + "strip_prefix": "tools", + "type": "zip", + "urls": [ + "https://www.nuget.org/api/v2/package/python/3.10.0" + ] + }, + "nuget_python_x86-64_3.7.0": { + "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python37.dll\",\n interface_library = \"libs/python37.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", + "generator_function": "grpc_extra_deps", + "generator_name": "nuget_python_x86-64_3.7.0", + "name": "nuget_python_x86-64_3.7.0", + "patch_cmds": [ + "cp -r include/* ." + ], + "sha256": "66eb796a5bdb1e6787b8f655a1237a6b6964af2115b7627cf4f0032cf068b4b2", + "strip_prefix": "tools", + "type": "zip", + "urls": [ + "https://www.nuget.org/api/v2/package/python/3.7.0" + ] + }, + "nuget_python_x86-64_3.8.0": { + "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python38.dll\",\n interface_library = \"libs/python38.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", + "generator_function": "grpc_extra_deps", + "generator_name": "nuget_python_x86-64_3.8.0", + "name": "nuget_python_x86-64_3.8.0", + "patch_cmds": [ + "cp -r include/* ." + ], + "sha256": "96c61321ce90dd053c8a04f305a5f6cc6d91350b862db34440e4a4f069b708a0", + "strip_prefix": "tools", + "type": "zip", + "urls": [ + "https://www.nuget.org/api/v2/package/python/3.8.0" + ] + }, + "nuget_python_x86-64_3.9.0": { + "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python39.dll\",\n interface_library = \"libs/python39.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", + "generator_function": "grpc_extra_deps", + "generator_name": "nuget_python_x86-64_3.9.0", + "name": "nuget_python_x86-64_3.9.0", + "patch_cmds": [ + "cp -r include/* ." + ], + "sha256": "6af58a733e7dfbfcdd50d55788134393d6ffe7ab8270effbf724bdb786558832", + "strip_prefix": "tools", + "type": "zip", + "urls": [ + "https://www.nuget.org/api/v2/package/python/3.9.0" + ] + }, "opencensus_proto": { "generator_function": "grpc_deps", "generator_name": "opencensus_proto", @@ -897,6 +1080,19 @@ "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz" ] }, + "python-3.7.0": { + "build_file_content": "\ncc_library(\n name = \"python_headers\",\n hdrs = glob([\"**/Include/**/*.h\"]),\n strip_include_prefix = \"Python-3.7.0/Include\",\n visibility = [\"//visibility:public\"],\n)\n", + "generator_function": "grpc_extra_deps", + "generator_name": "python-3.7.0", + "name": "python-3.7.0", + "patch_cmds": [ + "echo '#define SIZEOF_WCHAR_T 4' > Python-3.7.0/Include/pyconfig.h" + ], + "sha256": "85bb9feb6863e04fb1700b018d9d42d1caac178559ffa453d7e6a436e259fd0d", + "urls": [ + "https://www.python.org/ftp/python/3.7.0/Python-3.7.0.tgz" + ] + }, "r8-3.3.28.jar": { "name": "r8-3.3.28.jar", "sha256": "8626ca32fb47aba7fddd2c897615e2e8ffcdb4d4b213572a2aefb3f838f01972", @@ -933,10 +1129,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "0dcf4500cc4a1de8e563c1d48a079a7a0cf77cc246e39fd37fcc78ddf409ed26", + "sha256": "b9e962c6a836ba1d7573f2473fab3a897c6370d4c2724bde4017b40932ff4fe4", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_darwin-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_darwin-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_darwin-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_darwin-v11.9.zip" ] }, "remote_java_tools_for_testing": { @@ -951,10 +1147,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "8fb4d3138bd92a9d3324dae29c9f70d91ca2db18cd0bf1997446eed4657d19b3", + "sha256": "5cd59ea6bf938a1efc1e11ea562d37b39c82f76781211b7cd941a2346ea8484d", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools-v11.9.zip" ] }, "remote_java_tools_linux": { @@ -979,10 +1175,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "41502b293eea292b0577b46e8d7738bfe88180562acbf99ed620b5387a60efee", + "sha256": "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_linux-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_linux-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_linux-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_linux-v11.9.zip" ] }, "remote_java_tools_test": { @@ -997,10 +1193,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "8fb4d3138bd92a9d3324dae29c9f70d91ca2db18cd0bf1997446eed4657d19b3", + "sha256": "5cd59ea6bf938a1efc1e11ea562d37b39c82f76781211b7cd941a2346ea8484d", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools-v11.9.zip" ] }, "remote_java_tools_test_darwin": { @@ -1015,10 +1211,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "0dcf4500cc4a1de8e563c1d48a079a7a0cf77cc246e39fd37fcc78ddf409ed26", + "sha256": "b9e962c6a836ba1d7573f2473fab3a897c6370d4c2724bde4017b40932ff4fe4", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_darwin-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_darwin-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_darwin-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_darwin-v11.9.zip" ] }, "remote_java_tools_test_linux": { @@ -1033,10 +1229,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "41502b293eea292b0577b46e8d7738bfe88180562acbf99ed620b5387a60efee", + "sha256": "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_linux-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_linux-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_linux-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_linux-v11.9.zip" ] }, "remote_java_tools_test_windows": { @@ -1051,10 +1247,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "056ed8ba64920409eab63e3c4888c1970a523d2c03965784fc3243e37195318b", + "sha256": "677ab910046205020fd715489147c2bcfad8a35d9f5d94fdc998d217545bd87a", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_windows-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_windows-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_windows-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_windows-v11.9.zip" ] }, "remote_java_tools_windows": { @@ -1079,10 +1275,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "056ed8ba64920409eab63e3c4888c1970a523d2c03965784fc3243e37195318b", + "sha256": "677ab910046205020fd715489147c2bcfad8a35d9f5d94fdc998d217545bd87a", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_windows-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_windows-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_windows-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_windows-v11.9.zip" ] }, "remotejdk11_linux": { @@ -1617,11 +1813,16 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", - "strip_prefix": "rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d", + "sha256": "58bff40957ace85c2de21ebfc72e53ed3a0d33af8cc20abd0ceec55c63be7de2", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", - "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" + "https://github.com/bazelbuild/rules_cc/releases/download/0.0.2/rules_cc-0.0.2.tar.gz" + ] + }, + "rules_cc-0.0.2.tar.gz": { + "name": "rules_cc-0.0.2.tar.gz", + "sha256": "58bff40957ace85c2de21ebfc72e53ed3a0d33af8cc20abd0ceec55c63be7de2", + "urls": [ + "https://github.com/bazelbuild/rules_cc/releases/download/0.0.2/rules_cc-0.0.2.tar.gz" ] }, "rules_java": { @@ -1745,38 +1946,38 @@ ] }, "upb": { - "generator_function": "grpc_deps", + "generator_function": "dist_http_archive", "generator_name": "upb", "name": "upb", - "sha256": "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4", - "strip_prefix": "upb-2de300726a1ba2de9a468468dc5ff9ed17a3215f", + "sha256": "cf7f71eaff90b24c1a28b49645a9ff03a9a6c1e7134291ce70901cb63e7364b5", + "strip_prefix": "upb-a5477045acaa34586420942098f5fecd3570f577", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", - "https://github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz" + "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz", + "https://github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz" ] }, - "v1.41.0.tar.gz": { - "name": "v1.41.0.tar.gz", - "sha256": "e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656", + "v1.47.0.tar.gz": { + "name": "v1.47.0.tar.gz", + "sha256": "271bdc890bf329a8de5b65819f0f9590a5381402429bca37625b63546ed19e54", "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.41.0.tar.gz", - "https://github.com/grpc/grpc/archive/v1.41.0.tar.gz" + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.47.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.47.0.tar.gz" ] }, - "v1.5.0-4.zip": { - "name": "v1.5.0-4.zip", - "sha256": "d320d59b89a163c5efccbe4915ae6a49883ce653cdc670643dfa21c6063108e4", + "v1.5.2-3.zip": { + "name": "v1.5.2-3.zip", + "sha256": "366009a43cfada35015e4cc40a7efc4b7f017c6b8df5cac3f87d2478027b2056", "urls": [ - "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/v1.5.0-4.zip", - "https://github.com/luben/zstd-jni/archive/v1.5.0-4.zip" + "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/refs/tags/v1.5.2-3.zip", + "https://github.com/luben/zstd-jni/archive/refs/tags/v1.5.2-3.zip" ] }, - "v3.19.2.tar.gz": { - "name": "v3.19.2.tar.gz", - "sha256": "4dd35e788944b7686aac898f77df4e9a54da0ca694b8801bd6b2a9ffc1b3085e", + "v3.19.6.tar.gz": { + "name": "v3.19.6.tar.gz", + "sha256": "9a301cf94a8ddcb380b901e7aac852780b826595075577bb967004050c835056", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz" + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz" ] }, "zlib": { @@ -1784,11 +1985,11 @@ "generator_function": "grpc_deps", "generator_name": "zlib", "name": "zlib", - "sha256": "6d4d6640ca3121620995ee255945161821218752b551a1a180f4215f7d124d45", - "strip_prefix": "zlib-cacf7f1d4e3d44d871b605da3b647f07d718623f", + "sha256": "ef47b0fbe646d69a2fc5ba012cb278de8e8946a8e9649f83a807cc05559f0eff", + "strip_prefix": "zlib-21767c654d31d2dccdde4330529775c6c5fd5389", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz", - "https://github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/21767c654d31d2dccdde4330529775c6c5fd5389.tar.gz", + "https://github.com/madler/zlib/archive/21767c654d31d2dccdde4330529775c6c5fd5389.tar.gz" ] }, "zstd-jni": { @@ -1810,11 +2011,11 @@ "patches": [ "//third_party:zstd-jni/Native.java.patch" ], - "sha256": "d320d59b89a163c5efccbe4915ae6a49883ce653cdc670643dfa21c6063108e4", - "strip_prefix": "zstd-jni-1.5.0-4", + "sha256": "366009a43cfada35015e4cc40a7efc4b7f017c6b8df5cac3f87d2478027b2056", + "strip_prefix": "zstd-jni-1.5.2-3", "urls": [ - "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/v1.5.0-4.zip", - "https://github.com/luben/zstd-jni/archive/v1.5.0-4.zip" + "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/refs/tags/v1.5.2-3.zip", + "https://github.com/luben/zstd-jni/archive/refs/tags/v1.5.2-3.zip" ] }, "zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz": { @@ -1865,6 +2066,22 @@ "https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip" ] }, + "zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz": { + "name": "zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz", + "sha256": "2b8066bbdbc5cff422bb6b6db1b8f8d362b576340cce8492f1255502af632b06", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz" + ] + }, + "zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz": { + "name": "zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz", + "sha256": "a1d5f78172f32f819d08e9043b0f82fa7af738b37c55c6ca8d6092c61d204d53", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz" + ] + }, "zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip": { "name": "zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip", "sha256": "9b52b259516e4140ee56b91f77750667bffbc543e78ad8c39082449d4c377b54", diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index e7255d6e756b..b371a1f11159 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "3.0.20"; + version = "3.0.21"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "sha256-8hA0Y/AGczFwggxkTG7PQKOVnr2Oizx4OH38nS5jCU0="; + sha256 = "sha256-wT3s8CjgFPKrJiMWHWsvmUQwpuuS4figJZUXJn3RclU="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index bdc2fcce3ca4..795737c54932 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.5.4"; + version = "1.5.6"; platform = if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux" @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { bloop-binary = fetchurl rec { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; sha256 = - if stdenv.isLinux && stdenv.isx86_64 then "sha256-q8K5dzzLhQ8T6VzhoJ5iGk0yz9pOPrP/V4eiTwyzlgo=" - else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-7zTKOAnlQWk9BbdBZLBfSLyBhFqhkscbcHN1zVTjDjQ=" + if stdenv.isLinux && stdenv.isx86_64 then "sha256-s/N0+5GQ1MzIxecn7QeJTZ8E+TCF+smL2nObGRkGMys=" + else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-xOAuMLVzhYsUd3HyWeAESEjhBG3FUeTiqyi91t0rSgQ=" 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 e7c38c1b0234..fbe933f6b6d4 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -3,18 +3,18 @@ , fetchurl , fetchpatch , getopt -, tzdata , ksh +, tzdata , pkgsMusl # for passthru.tests }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (self: { pname = "bmake"; - version = "20220726"; + version = "20230126"; src = fetchurl { - url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - hash = "sha256-G/N3B4lyJyHcp7C/+K/EqVINog8CGbt7xSNQrwEz8KA="; + url = "http://www.crufty.net/ftp/pub/sjg/${self.pname}-${self.version}.tar.gz"; + hash = "sha256-hk9yGFgs95Dsc7ILcQVCXLn/ozUiJUF3LwMTMGtqC8Q="; }; # Make tests work with musl @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { (fetchpatch { name = "separate-tests.patch"; url = "https://raw.githubusercontent.com/alpinelinux/aports/2a36f7b79df44136c4d2b8e9512f908af65adfee/community/bmake/separate-tests.patch"; - sha256 = "00s76jwyr83c6rkvq67b1lxs8jhm0gj2rjgy77xazqr5400slj9a"; + hash = "sha256-KkmqASAl46/6Of7JLOQDFUqkOw3rGLxnNmyg7Lk0RwM="; }) # add a shebang to bmake's install(1) replacement (fetchpatch { name = "install-sh.patch"; url = "https://raw.githubusercontent.com/alpinelinux/aports/34cd8c45397c63c041cf3cbe1ba5232fd9331196/community/bmake/install-sh.patch"; - sha256 = "0z8icd6akb96r4cksqnhynkn591vbxlmrrs4w6wil3r6ggk6mwa6"; + hash = "sha256-RvFq5nsmDxq54UTnXGlfO6Rip/XQYj0ZySatqUxjEX0="; }) ]; @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ tzdata ] ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [ ksh diff --git a/pkgs/development/tools/build-managers/bob/default.nix b/pkgs/development/tools/build-managers/bob/default.nix index a647621d77d3..9775665869fd 100644 --- a/pkgs/development/tools/build-managers/bob/default.nix +++ b/pkgs/development/tools/build-managers/bob/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bob"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "benchkram"; repo = pname; rev = version; - hash = "sha256-37VhzYxVrt+w1XTDXzKAkJT43TQSyCmX9SAoNnk+o3w="; + hash = "sha256-OuIE3saJxk8IBLPbAxdQ2uJ9oXJ3xBOaeZraw9csy1U="; }; ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; diff --git a/pkgs/development/tools/build-managers/boot/builder.sh b/pkgs/development/tools/build-managers/boot/builder.sh index c1481dc6a144..e007cbac9582 100644 --- a/pkgs/development/tools/build-managers/boot/builder.sh +++ b/pkgs/development/tools/build-managers/boot/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup boot_bin=$out/bin/boot diff --git a/pkgs/development/tools/build-managers/build2/bpkg.nix b/pkgs/development/tools/build-managers/build2/bpkg.nix index 628c9304c1de..cb0bcd703455 100644 --- a/pkgs/development/tools/build-managers/build2/bpkg.nix +++ b/pkgs/development/tools/build-managers/build2/bpkg.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libodb libodb-sqlite ]; - checkInputs = [ + nativeCheckInputs = [ git openssl ]; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 7f0d94a9f30e..0a1e191ba360 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,37 +1,40 @@ { lib , stdenv +, fetchurl , buildPackages , bzip2 , curlMinimal , expat -, fetchurl , libarchive , libuv , ncurses , openssl , pkg-config -, qtbase +, ps , rhash , sphinx , texinfo -, wrapQtAppsHook , xz , zlib -, SystemConfiguration -, ps , isBootstrap ? false , useOpenSSL ? !isBootstrap , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) , uiToolkits ? [] # can contain "ncurses" and/or "qt5" , buildDocs ? !(isBootstrap || (uiToolkits == [])) +, darwin +, libsForQt5 }: let + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + inherit (libsForQt5) qtbase wrapQtAppsHook; cursesUI = lib.elem "ncurses" uiToolkits; qt5UI = lib.elem "qt5" uiToolkits; in # Accepts only "ncurses" and "qt5" as possible uiToolkits assert lib.subtractLists [ "ncurses" "qt5" ] uiToolkits == []; +# Minimal, bootstrap cmake does not have toolkits +assert isBootstrap -> (uiToolkits == []); stdenv.mkDerivation rec { pname = "cmake" + lib.optionalString isBootstrap "-boot" diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index a72106ace3c4..2b7ccc4a6c05 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -25,21 +25,21 @@ let newPython = python3.override { version = "1.5.0"; src = oldAttrs.src.override { inherit version; - sha256 = "14nz51cqlnxmgfqqilxyvjwwa5xfivdvlm0d0b1qzgcgwdm7an0f"; + hash = "sha256-Dlh1auOPvY/DAg1UutuOrhfFudy+04ixe7Vbilko35I="; }; }); }; }; in newPython.pkgs.buildPythonApplication rec { - version = "1.49.0"; + version = "1.53.0"; pname = "conan"; src = fetchFromGitHub { owner = "conan-io"; repo = "conan"; rev = version; - hash = "sha256-BJGstNAnAZtpwagsCY+4quTd0/79zL+v4ifKikS3vaw="; + hash = "sha256-2DNDNdZO1D30egOiYa3qw8F2xsUTBOm/CHv07v5OrC8="; }; propagatedBuildInputs = with newPython.pkgs; [ @@ -64,7 +64,7 @@ in newPython.pkgs.buildPythonApplication rec { urllib3 ] ++ lib.optionals stdenv.isDarwin [ idna cryptography pyopenssl ]; - checkInputs = [ + nativeCheckInputs = [ pkg-config git ] ++ (with newPython.pkgs; [ diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index 7a6b78ec084b..add4fd0d3573 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -14,11 +14,11 @@ in stdenv.mkDerivation rec { pname = "gnumake"; - version = "4.3"; + version = "4.4"; src = fetchurl { url = "mirror://gnu/make/make-${version}.tar.gz"; - sha256 = "06cfqzpqsvdnsxbysl5p2fgdgxgl9y4p7scpnrfa8z2zgkjdspz0"; + sha256 = "sha256-WB9NToctp0s5Qch0IViYp9NYAvA3Mr3M7h1KeXkQXRg="; }; # to update apply these patches with `git am *.patch` to https://git.savannah.gnu.org/git/make.git diff --git a/pkgs/development/tools/build-managers/goredo/default.nix b/pkgs/development/tools/build-managers/goredo/default.nix index 473cbb8202bd..54c5fed72dbf 100644 --- a/pkgs/development/tools/build-managers/goredo/default.nix +++ b/pkgs/development/tools/build-managers/goredo/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { nativeBuildInputs = [ zstd ]; - checkInputs = lib.optionals doCheck [ python3 perl ]; + nativeCheckInputs = lib.optionals doCheck [ python3 perl ]; SHARNESS_TEST_SRCDIR = sharness + "/share/sharness"; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 0ad6d5a2acfe..d8a797dc9189 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -127,32 +127,16 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_7 = gen { - version = "7.5"; - nativeVersion = "0.22-milestone-23"; - sha256 = "1hjifd98dif0qy6vkqp56v9z7id5cf2bfkdd71ld8nsqqlig51yb"; + version = "7.6"; + nativeVersion = "0.22-milestone-24"; + sha256 = "0jwycvzv8a5v2bhg5d8zccr2csr3sf9y5mrr9d2ap44p09a8r9kv"; defaultJava = jdk17; }; gradle_6 = gen { - version = "6.9.2"; + version = "6.9.3"; nativeVersion = "0.22-milestone-20"; - sha256 = "13qyk3f6namw27ynh6nxljxpk9r3l12vxl3f0qpglprdf3c6ydcb"; + sha256 = "0p83zgszmrwa26a4q8nvzva2af5lfzy6xvcs57y9588smsw51wyw"; defaultJava = jdk11; }; - - # NOTE: No GitHub Release for the following versions. `update.sh` will not work. - - gradle_5 = gen { - version = "5.6.4"; - nativeVersion = "0.18"; - sha256 = "03d86bbqd19h9xlanffcjcy3vg1k5905vzhf9mal9g21603nfc0z"; - defaultJava = jdk11; - }; - - gradle_4 = gen { - version = "4.10.3"; - nativeVersion = "0.14"; - sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6"; - defaultJava = jdk8; - }; } diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 191a77d1d2c3..168b4688343c 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,16 +3,17 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.9.10"; + version = "2.10.0"; src = fetchurl { - url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "0ckzivinbgg6gw1nss544hy160yixvd3k6pqyyxqanyzsq9lvf6v"; + url = "https://codeberg.org/leiningen/leiningen/raw/tag/${version}/bin/lein-pkg"; + hash = "sha256-sXV86UHky/Fcv2Sbe09BM2XmEtqJLSKEHsFyg5G7Zq8="; }; + # Check https://codeberg.org/leiningen/leiningen/releases to get the URL for the new version jarsrc = fetchurl { - url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.jar"; - sha256 = "1ja9q8lav83h5qhayjgc39f6yyvk1n5f6gfwznn561xm007m6a52"; + url = "https://codeberg.org/attachments/43cebda5-a7c2-405b-b641-5143a00051b5"; + hash = "sha256-0nKZutNAdawoZNC9BVn4NcbixHbAsKKDvL21dP2tuzQ="; }; JARNAME = "${pname}-${version}-standalone.jar"; @@ -26,12 +27,18 @@ stdenv.mkDerivation rec { # never be picked up by set-java-classpath.sh installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share cp -v $src $out/bin/lein cp -v $jarsrc $out/share/$JARNAME + + runHook postInstall ''; fixupPhase = '' + runHook preFixup + chmod +x $out/bin/lein patchShebangs $out/bin/lein substituteInPlace $out/bin/lein \ @@ -40,6 +47,8 @@ stdenv.mkDerivation rec { --prefix PATH ":" "${lib.makeBinPath [ rlwrap coreutils ]}" \ --set LEIN_GPG ${gnupg}/bin/gpg \ --set JAVA_CMD ${jdk}/bin/java + + runHook postFixup ''; meta = { @@ -47,8 +56,8 @@ stdenv.mkDerivation rec { description = "Project automation for Clojure"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.epl10; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = with lib.maintainers; [ thiagokokada ]; + platforms = jdk.meta.platforms; + maintainers = with lib.maintainers; [ ]; mainProgram = "lein"; }; } diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 9fef483ff0e1..5591b1634236 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -9,11 +9,11 @@ python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "0.63.1"; + version = "0.64.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "Bv4TKXIT1v8BIcXVqrJaVu+Tj/7FdBTtYIb9onLLZek="; + sha256 = "sha256-Oo4DDCM094IIX4FicGLMbUpnce3zHgVf/jdPnmsImrk="; }; patches = [ @@ -52,15 +52,6 @@ python3.pkgs.buildPythonApplication rec { # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774 ./boost-Do-not-add-system-paths-on-nix.patch - # Prevent Meson from passing -O0 in buildtype=plain. - # Nixpkgs enables fortifications which do not work without optimizations. - # https://github.com/mesonbuild/meson/pull/10593 - (fetchpatch { - url = "https://github.com/mesonbuild/meson/commit/f9bfeb2add70973113ab4a98454a5c5d7e3a26ae.patch"; - revert = true; - sha256 = "VKXUwdS+zMp1y+5GrV2inESUpUUp+OL3aI4wOXHxOeo="; - }) - # Fix passing multiple --define-variable arguments to pkg-config. # https://github.com/mesonbuild/meson/pull/10670 (fetchpatch { @@ -78,7 +69,7 @@ python3.pkgs.buildPythonApplication rec { # require a typical building environment (including C compiler and stuff). # Just for the sake of documentation, the next lines are maintained here. doCheck = false; - checkInputs = [ ninja pkg-config ]; + nativeCheckInputs = [ ninja pkg-config ]; checkPhase = '' python ./run_project_tests.py ''; diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 3a61faa42c15..6ede440cc611 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.9"; + version = "0.10.11"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - hash = "sha256-XDy07dFzylRl825QYqRt5eydVPR4jEevC2VrqxgTFt0="; + hash = "sha256-B47C7sqOqiHa/2kC5lk/J1pXK61l1M5umVKaCfVO7cc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix index f5b75f8e6696..afb07553eb00 100644 --- a/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/pkgs/development/tools/build-managers/msbuild/default.nix @@ -2,7 +2,7 @@ let - dotnet-sdk = dotnetCorePackages.sdk_5_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0; xplat = fetchurl { url = "https://github.com/mono/msbuild/releases/download/v16.9.0/mono_msbuild_6.12.0.137.zip"; diff --git a/pkgs/development/tools/build-managers/muon/default.nix b/pkgs/development/tools/build-managers/muon/default.nix index b94a376ebb34..69320cc217e7 100644 --- a/pkgs/development/tools/build-managers/muon/default.nix +++ b/pkgs/development/tools/build-managers/muon/default.nix @@ -81,14 +81,13 @@ stdenv.mkDerivation (finalAttrs: { ''; buildPhase = let - muonFeatureFlag = feature: flag: - "-D${feature}=${if flag then "enabled" else "disabled"}"; - muonConditionFlag = condition: flag: - "-D${condition}=${lib.boolToString flag}"; + muonBool = lib.mesonBool; + muonEnable = lib.mesonEnable; + cmdlineForMuon = lib.concatStringsSep " " [ - (muonConditionFlag "static" stdenv.targetPlatform.isStatic) - (muonFeatureFlag "docs" buildDocs) - (muonFeatureFlag "samurai" embedSamurai) + (muonBool "static" stdenv.targetPlatform.isStatic) + (muonEnable "docs" buildDocs) + (muonEnable "samurai" embedSamurai) ]; cmdlineForSamu = "-j$NIX_BUILD_CORES"; in '' diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 9bc6a58b253d..5689279b86a4 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "qbs"; - version = "1.23.1"; + version = "1.24.0"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "sha256-ZAMWPvTzramhIuafYw+lV7Tm3fQKm+nbRdAFdjYDMhs="; + sha256 = "sha256-D2Nqou4wUIsePKr+ReAyFO/22vQlwcs4Li+3+6btR6Y="; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 56859969708e..8a0ff951b9da 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -94,7 +94,11 @@ let fi ''; }; - rebar3WithPlugins = { plugins ? [ ], globalPlugins ? [ ] }: + + # Alias rebar3 so we can use it as default parameter below + _rebar3 = rebar3; + + rebar3WithPlugins = { plugins ? [ ], globalPlugins ? [ ], rebar3 ? _rebar3 }: let pluginLibDirs = map (p: "${p}/lib/erlang/lib") (lib.unique (plugins ++ globalPlugins)); globalPluginNames = lib.unique (map (p: p.packageName) globalPlugins); diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix index e8ea9a91f45e..22841cb20d17 100644 --- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix +++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, python3, fetchFromGitHub, which, coreutils -, perl, installShellFiles +, perl, installShellFiles, gnumake42 , doCheck ? true }: stdenv.mkDerivation rec { @@ -53,6 +53,7 @@ (with python3.pkgs; [ beautifulsoup4 markdown ]) which installShellFiles + gnumake42 # fails with make 4.4 ]; postInstall = '' diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix index 5357dc805e87..f2589c1e75c6 100644 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ b/pkgs/development/tools/build-managers/remake/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # make check fails, see https://github.com/rocky/remake/issues/117 meta = { - homepage = "http://bashdb.sourceforge.net/remake/"; + homepage = "https://bashdb.sourceforge.net/remake/"; license = lib.licenses.gpl3Plus; description = "GNU Make with comprehensible tracing and a debugger"; platforms = with lib.platforms; linux ++ darwin; diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 0c61324beebd..aa49b956edc8 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -1,30 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, writeScript, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocm-cmake"; - version = "5.3.1"; + version = "5.4.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-cmake"; - rev = "rocm-${version}"; - hash = "sha256-AOn3SLprHdeo2FwojQdhRAttUHuaWkO6WlymK8Q8lbc="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-JarQqiiZ36WV1d6vyQD546GN1EtoKLcdvcZsG3QWD2Y="; }; nativeBuildInputs = [ cmake ]; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocm-cmake/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" - update-source-version rocm-cmake "$version" - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "CMake modules for common build tasks for the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"; license = licenses.mit; - maintainers = with maintainers; [ Flakebi ]; + maintainers = teams.rocm.members; platforms = platforms.unix; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; -} +}) diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index c3042ef2c178..81f6c8dcff67 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 = "14623b935766e11a0a3f6ab1f686bb1c5d244b21"; - version = "2022-10-17"; + rev = "32c96866364964b3e2f7272e0f9ef3e1a76ea7d7"; + version = "2023-01-05"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "nwhNevyLOzkYdpm1AK5I4ByJ7VdnlgwcSjXV11pzZkw="; + sha256 = "AgwqWmNkUkyQDu6R8LO86/JYJJHI6ZjEhPglt/jWBRY="; }; dontBuild = true; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 16528cbfc2fd..5d7175fe9e80 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.7.3"; + version = "1.8.2"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "sha256-J4bDI5bLiH9Gz8OlU5eHJRPsdahJ6uqfTwFGkoycsGA="; + sha256 = "sha256-H2U0TaB029Zt/vqTwO/40xnXcuXK1H/L62rheLvfRoY="; }; postPatch = '' diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index 92ea26b83375..9381922a5fb5 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -10,7 +10,6 @@ , jre }: -assert lib.versionAtLeast jre.version "17.0.0"; let pname = "scala-cli"; sources = builtins.fromJSON (builtins.readFile ./sources.json); @@ -22,7 +21,11 @@ stdenv.mkDerivation { inherit pname version; nativeBuildInputs = [ installShellFiles makeWrapper ] ++ lib.optional stdenv.isLinux autoPatchelfHook; - buildInputs = [ coreutils zlib stdenv.cc.cc ]; + buildInputs = + assert lib.assertMsg (lib.versionAtLeast jre.version "17.0.0") '' + scala-cli requires Java 17 or newer, but ${jre.name} is ${jre.version} + ''; + [ coreutils zlib stdenv.cc.cc ]; src = let asset = assets."${stdenv.hostPlatform.system}" or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); @@ -41,7 +44,8 @@ stdenv.mkDerivation { runHook preInstall install -Dm755 scala-cli $out/bin/.scala-cli-wrapped makeWrapper $out/bin/.scala-cli-wrapped $out/bin/scala-cli \ - --set JAVA_HOME ${jre.home} + --set JAVA_HOME ${jre.home} \ + --argv0 "$out/bin/scala-cli" runHook postInstall ''; diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index e3df6799330d..85a3563f020c 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,17 +1,21 @@ { - "version": "0.1.16", + "version": "0.1.20", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "1ryjsf126dsqkpnkc2dmr3p373sb518q2ply0y1ifrx3rhqj0viq" + "sha256": "0gb6xmv5qm77nfn49p7r180hz91a3kpilw27s9all8zcmca2xhml" + }, + "aarch64-linux": { + "asset": "scala-cli-aarch64-pc-linux.gz", + "sha256": "1ax9yqzp4l7aa74x3lgr75h58pl3w92921fjsg8yw3imi2j57h09" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1vfx9ccl08mykr579nq9kwbv88d6gaq1vd9xscwyq5rps6lxrz92" + "sha256": "1i5g8afgcg701g7n22sgbs2639mlwgjmr5jhmw7bz6wvj8h5nz1z" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "1p2lk2hkj149r27p4kwxvwlvjvzv9l0zncqfs3wa972jyn4hhr9g" + "sha256": "0a53kxhl9n6p9mblk4r0zy8aklhpsvkg0g42il8hqvf72y0kl4ks" } } } diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index da11bdb28aa1..b0d6085250d2 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -5,14 +5,10 @@ let python = python3; }; in { - scons_3_0_1 = (mkScons { - version = "3.0.1"; - sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; - }).override { python = python2; }; scons_3_1_2 = (mkScons { version = "3.1.2"; sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; - }).override { python = python2; }; + }); scons_latest = mkScons { version = "4.1.0"; sha256 = "11axk03142ziax6i3wwy9qpqp7r3i7h5jg9y2xzph9i15rv8vlkj"; diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 0763f2e9359c..902508129cb2 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fuse3, macfuse-stubs, pkg-config, pcre }: +{ lib, stdenv, fetchFromGitHub, fuse3, macfuse-stubs, pkg-config, sqlite, pcre }: let fuse = if stdenv.isDarwin then macfuse-stubs else fuse3; @@ -15,13 +15,24 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fuse pcre ]; + buildInputs = [ fuse pcre sqlite ]; patches = [ ./fusermount-setuid.patch ]; configurePhase = '' substituteInPlace src/tup/link.sh --replace '`git describe' '`echo ${version}' - substituteInPlace Tuprules.tup --replace 'pcre-config' 'pkg-config libpcre' + + for f in Tupfile Tuprules.tup src/tup/server/Tupfile build.sh; do + substituteInPlace "$f" \ + --replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config" \ + --replace "pcre-config" "${stdenv.cc.targetPrefix}pkg-config libpcre" + done + + cat << EOF > tup.config + CONFIG_CC=${stdenv.cc.targetPrefix}cc + CONFIG_AR=${stdenv.cc.targetPrefix}ar + CONFIG_TUP_USE_SYSTEM_SQLITE=y + EOF ''; # Regular tup builds require fusermount to have suid, which nix cannot @@ -55,7 +66,7 @@ in stdenv.mkDerivation rec { algorithms to avoid doing unnecessary work. This means you can stay focused on your project rather than on your build system. ''; - homepage = "http://gittup.org/tup/"; + homepage = "https://gittup.org/tup/"; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/build-managers/wafHook/default.nix b/pkgs/development/tools/build-managers/wafHook/default.nix index 2131caede3c8..f0f3a683aab0 100644 --- a/pkgs/development/tools/build-managers/wafHook/default.nix +++ b/pkgs/development/tools/build-managers/wafHook/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, pkgs, makeSetupHook, waf }: makeSetupHook { + name = "waf-hook"; substitutions = { inherit waf; crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 69377b212928..747abef1e982 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.28.0"; + version = "1.28.2"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-Q8IqyI6okTaXKDoYvaTcIv+wy4aiHXOjFkKBxTn4wwk="; + sha256 = "sha256-1WB+lm2k7q4xViCUBhvCSuMCIlCMlAJ9etRajwGyOQs="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix index aa14a01b8644..575ee45d7d81 100644 --- a/pkgs/development/tools/buildah/wrapper.nix +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -1,6 +1,7 @@ { buildah-unwrapped , runCommand , makeWrapper +, symlinkJoin , lib , stdenv , extraPackages ? [] @@ -11,6 +12,8 @@ , fuse-overlayfs # CoW for images, much faster than default vfs , util-linux # nsenter , iptables +, aardvark-dns +, netavark }: let @@ -25,6 +28,17 @@ let iptables ] ++ extraPackages); + helpersBin = symlinkJoin { + name = "${buildah-unwrapped.pname}-helper-binary-wrapper-${buildah-unwrapped.version}"; + + # this only works for some binaries, others may need to be be added to `binPath` or in the modules + paths = [ + ] ++ lib.optionals stdenv.isLinux [ + aardvark-dns + netavark + ]; + }; + in runCommand buildah-unwrapped.name { name = "${buildah-unwrapped.pname}-wrapper-${buildah-unwrapped.version}"; inherit (buildah-unwrapped) pname version; @@ -48,5 +62,6 @@ in runCommand buildah-unwrapped.name { mkdir -p $out/bin ln -s ${buildah-unwrapped}/share $out/share makeWrapper ${buildah-unwrapped}/bin/buildah $out/bin/buildah \ + --set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \ --prefix PATH : ${binPath} '' diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 0353fb10ae1e..11c0d85ee474 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "buildkit"; - version = "0.10.6"; + version = "0.11.2"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "sha256-bTzpiTqdAfo31sFRBCp0EzYMVjc6jt4aPK0VLsB9j0g="; + hash = "sha256-P1hu60vjJJASWxgc9LOwdy7psqgIHi8Z/D5c++TProY="; }; - vendorSha256 = null; + vendorHash = null; subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index db5898a6059e..c8a74bd03085 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.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b1lqgY6pu4yt3yY2UupG7PQUkgotK0VDffCW/0thxoo="; + sha256 = "sha256-FKnOqK3qmzWEmf+92up8ApeotyQyZpbmLDY72U3+mY8="; }; - vendorSha256 = "sha256-JqSk4w0chtWNYDQXo8oh5spAxor2kixo3fZcpV4LJ+8="; + vendorSha256 = "sha256-dYa6OuC2ingAh2VOzyGR4lK1GbTJ/l9iKXYWqRJmByc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix index 6e683e09391a..aa67ba4393a9 100644 --- a/pkgs/development/tools/bundletool/default.nix +++ b/pkgs/development/tools/bundletool/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "bundletool"; - version = "1.13.1"; + version = "1.14.0"; src = fetchurl { url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; - sha256 = "sha256-owXj7FSR98IPuaWkUGpv4e6c4c6XIYFsxZZH0OWYcu8="; + sha256 = "sha256-50Dn04VixejYfMgXVIstuU5CgC6aB3T99nTnWP95aU0="; }; dontUnpack = true; diff --git a/pkgs/development/tools/bunyan-rs/default.nix b/pkgs/development/tools/bunyan-rs/default.nix index 77191efbe4fa..28f53a148e22 100644 --- a/pkgs/development/tools/bunyan-rs/default.nix +++ b/pkgs/development/tools/bunyan-rs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "bunyan-rs"; - version = "0.1.7"; + version = "0.1.9"; src = fetchFromGitHub { owner = "LukeMathWalker"; repo = "bunyan"; rev = "v${version}"; - sha256 = "sha256-NGM8ryOy5bxF53Ak2/UDCf47MBlx/t6wcPlt+K8qvkg="; + sha256 = "sha256-dqhZIwxWBMXS2RgE8YynYrESVyAOIJ9ujAKcp2tDhvA="; }; - cargoSha256 = "sha256-kzzOEHil7mW+fsstgr4/N4i8c9rzx4TzqGfYDgkzjh0="; + cargoSha256 = "sha256-sQ6f8BHGsPFPchFDjNlZimnu9i99SGYf5bYfM1/2Gac="; meta = with lib; { description = "A CLI to pretty print logs in bunyan format (Rust port of the original JavaScript bunyan CLI)"; diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/development/tools/butane/default.nix index 115a745cf221..22ce9a40f913 100644 --- a/pkgs/development/tools/butane/default.nix +++ b/pkgs/development/tools/butane/default.nix @@ -1,16 +1,14 @@ { lib, fetchFromGitHub, buildGoModule }: -with lib; - buildGoModule rec { pname = "butane"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "coreos"; repo = "butane"; rev = "v${version}"; - sha256 = "sha256-PjuQ5eEW/CdghkVHozxrG9WPNKJZwUcf7/ZRIcUAtJY="; + sha256 = "sha256-tLUC/1yD3vgId98UWiZOlud38uO+CUzp0uuYKkAXJEs="; }; vendorSha256 = null; @@ -27,7 +25,7 @@ buildGoModule rec { mv $out/bin/{internal,butane} ''; - meta = { + meta = with lib; { description = "Translates human-readable Butane configs into machine-readable Ignition configs"; license = licenses.asl20; homepage = "https://github.com/coreos/butane"; diff --git a/pkgs/development/tools/cambalache/default.nix b/pkgs/development/tools/cambalache/default.nix index 0fc470ca9a2c..e2e7157425b6 100644 --- a/pkgs/development/tools/cambalache/default.nix +++ b/pkgs/development/tools/cambalache/default.nix @@ -83,9 +83,7 @@ python3.pkgs.buildPythonApplication rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index f5f016f0d2de..8b1685b17173 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -2,25 +2,28 @@ , stdenv , fetchFromGitHub , cmake -, libclang , libffi , libxml2 -, llvm -, sphinx , zlib , withManual ? true , withHTML ? true +, llvmPackages +, python3 }: +let + inherit (llvmPackages) libclang llvm; + inherit (python3.pkgs) sphinx; +in stdenv.mkDerivation (finalAttrs: { pname = "castxml"; - version = "0.4.7"; + version = "0.5.1"; src = fetchFromGitHub { owner = "CastXML"; repo = "CastXML"; rev = "v${finalAttrs.version}"; - hash = "sha256-h2sLwhlz8AHyBK6Bbci17dvLkQ/9WEClz4lwM3GVVK8="; + hash = "sha256-XZIVOrTY6Ib5Cu1WtTJm5Bqoas1NbNWbvJPWkpFqH2c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix index 0f5fccd797a8..d108422919f9 100644 --- a/pkgs/development/tools/changie/default.nix +++ b/pkgs/development/tools/changie/default.nix @@ -2,18 +2,16 @@ buildGoModule rec { pname = "changie"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "miniscruff"; repo = pname; - sha256 = "sha256-8wcnbmS3T/rPKEN3zpo9ysaEIjgbPN50Jp9URpkRaUI="; + sha256 = "sha256-hnRK9pj5NruSRvo2oetyRMVwhO7T/wSEZjcbYHb7ZUY="; }; - vendorSha256 = "sha256-Ddw4YnOFURZxwqRBX9e1YGMO9E3hUNAoLTVcSJuaCU0="; - - patches = [ ./skip-flaky-test.patch ]; + vendorSha256 = "sha256-0/3Ou8z6yLWhc81hdN2gkaFLLlKQWUGcIdvRHVLTrjQ="; ldflags = [ "-s" "-w" "-X=main.version=${version}" ]; @@ -22,7 +20,6 @@ buildGoModule rec { changelog = "https://github.com/miniscruff/changie/blob/v${version}/CHANGELOG.md"; description = "Automated changelog tool for preparing releases with lots of customization options"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/changie/skip-flaky-test.patch b/pkgs/development/tools/changie/skip-flaky-test.patch deleted file mode 100644 index 48c038ecf624..000000000000 --- a/pkgs/development/tools/changie/skip-flaky-test.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/core/change_test.go -+++ b/core/change_test.go -@@ -353,6 +353,7 @@ var _ = Describe("Change ask prompts", func() { - }) - - It("gets error for invalid body", func() { -+ Skip("") - var min int64 = 5 - submitFailed := false - config := Config{ diff --git a/pkgs/development/tools/check-jsonschema/default.nix b/pkgs/development/tools/check-jsonschema/default.nix index dd49074300af..7c25ddd34cdd 100644 --- a/pkgs/development/tools/check-jsonschema/default.nix +++ b/pkgs/development/tools/check-jsonschema/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist responses diff --git a/pkgs/development/tools/checkmate/default.nix b/pkgs/development/tools/checkmate/default.nix index 3cefae1bfffc..b14079c749dd 100644 --- a/pkgs/development/tools/checkmate/default.nix +++ b/pkgs/development/tools/checkmate/default.nix @@ -5,22 +5,23 @@ buildGoModule rec { pname = "checkmate"; - version = "0.8.2"; + version = "0.8.4"; src = fetchFromGitHub { owner = "adedayo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-v9xVJFX3YJQU9z9L7dhy0S1FvpWoDad36Lq3w4VW0xA="; + hash = "sha256-tgiZDTPIAYirPX6nGPEAt6BoYEC8uUJwT6zuHJqPF1w="; }; - vendorSha256 = "sha256-8/EGoY3+th34gAACDoEHgwhUFmyyKecnQP/WTe56iCQ="; + vendorHash = "sha256-eL1fLJwzVpU9NqaAl5R/fbaqI3AnEkl6EuPkMTuY86w="; subPackages = [ "." ]; meta = with lib; { description = "Pluggable code security analysis tool"; homepage = "https://github.com/adedayo/checkmate"; + changelog = "https://github.com/adedayo/checkmate/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/development/tools/circup/default.nix index ccb7ef454aa3..90c2ea916c59 100644 --- a/pkgs/development/tools/circup/default.nix +++ b/pkgs/development/tools/circup/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "circup"; - version = "1.1.3"; + version = "1.1.4"; format = "setuptools"; src = fetchFromGitHub { owner = "adafruit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-BCAsCwQCKMtmjISMVKDblRdev87K4EfX5D2Ot0L5PoQ="; + hash = "sha256-nXDje+MJR6olG3G7RO3esf6UAKynMvCP8YetIhnqoeE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { update_checker ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; @@ -46,6 +46,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "CircuitPython library updater"; homepage = "https://github.com/adafruit/circup"; + changelog = "https://github.com/adafruit/circup/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/tools/clickable/default.nix b/pkgs/development/tools/clickable/default.nix index 6d3bc8663674..093e015d36e2 100644 --- a/pkgs/development/tools/clickable/default.nix +++ b/pkgs/development/tools/clickable/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { argcomplete ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Test require network connection diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index ea3d7669544d..741983b7e6f4 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.11.02"; + version = "2023.01.20"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-FLnij5ff7+tP+SoBnB2zVEpuWRG2MYp9avTrh2q6g4k="; + sha256 = "sha256-QS4/kGR3QqwUk0U68AdKvip9YJndltx7YBo9IhZ9syY="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/cloudsmith-cli/default.nix b/pkgs/development/tools/cloudsmith-cli/default.nix index 46e2a7801f69..f08d020f4191 100644 --- a/pkgs/development/tools/cloudsmith-cli/default.nix +++ b/pkgs/development/tools/cloudsmith-cli/default.nix @@ -1,17 +1,16 @@ -{ python3 -, lib +{ lib +, python3 }: python3.pkgs.buildPythonApplication rec { pname = "cloudsmith-cli"; - version = "0.32.0"; - + version = "0.35.2"; format = "wheel"; src = python3.pkgs.fetchPypi { pname = "cloudsmith_cli"; inherit format version; - sha256 = "ZETVtRlzd9KUOeDyAH0MnnIy1WtGLVBm+bActUM4zBw="; + hash = "sha256-+M4CPveS9dltMI291Atm84T/cf4dPOO3wPvPI15E73Y="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -33,11 +32,16 @@ python3.pkgs.buildPythonApplication rec { # Wheels have no tests doCheck = false; - meta = { + pythonImportsCheck = [ + "cloudsmith_cli" + ]; + + meta = with lib; { homepage = "https://help.cloudsmith.io/docs/cli/"; description = "Cloudsmith Command Line Interface"; - maintainers = with lib.maintainers; [ jtojnar ]; - license = lib.licenses.asl20; - platforms = with lib.platforms; unix; + changelog = "https://github.com/cloudsmith-io/cloudsmith-cli/blob/v${version}/CHANGELOG.md"; + maintainers = with maintainers; [ jtojnar ]; + license = licenses.asl20; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index 52fdf0c1e400..e4217f06e22a 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cocogitto"; - version = "5.2.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "oknozor"; repo = pname; rev = version; - sha256 = "sha256-ZjDZMI84z8riRtidZVeCktwJUMkZU28E23MveJSD7xY="; + sha256 = "sha256-Z0snC5NomUWzxI2qcRMxdZbC1aOQ8P2Ll9EdVfhP7ZU="; }; - cargoSha256 = "sha256-oaWWAVTKxrshfvqE+HMQ1WeeEz8lOE7qc6RrgSjDtdU="; + cargoHash = "sha256-P/xwE3oLVsIoxPmG+S0htSHhZxCj79z2ARGe2WzWCEo="; # Test depend on git configuration that would likly exist in a normal user enviroment # and might be failing to create the test repository it works in. diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index 080e73ab2687..9fd3a86f597d 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -5,19 +5,19 @@ }: buildGoModule rec { pname = "coder"; - version = "0.12.5"; + version = "0.15.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-tPpWj2MV2LLIOGq+RTpHpLozgqv7gBgYD3jjehRXOvk="; + hash = "sha256-d3Cg7G1rjxEqKMsIqxZ6ZZDEMIoisDtjZMmyixZRpF4="; }; # integration tests require network access doCheck = false; - vendorHash = "sha256-3SStGCDpo+AS4PM9mbXM0EjsJ/3CVFQyb/NRK9RSZ3A="; + vendorHash = "sha256-F9r99WhL1Uv5NNVlQYpQc282BAl8bUhJI5mZZYwyEEg="; nativeBuildInputs = [ installShellFiles ]; @@ -29,9 +29,9 @@ buildGoModule rec { ''; meta = with lib; { - description = "Remote development environments on your infrastructure provisioned with Terraform"; + description = "Provision software development environments via Terraform on Linux, macOS, Windows, X86, ARM, and of course, Kubernetes"; homepage = "https://coder.com"; license = licenses.agpl3; - maintainers = with maintainers; [ urandom ]; + maintainers = with maintainers; [ ghuntley urandom ]; }; } diff --git a/pkgs/development/tools/codespell/default.nix b/pkgs/development/tools/codespell/default.nix index 87fab56778ca..8315aa20aa19 100644 --- a/pkgs/development/tools/codespell/default.nix +++ b/pkgs/development/tools/codespell/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { setuptools-scm ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ aspell-python chardet pytestCheckHook diff --git a/pkgs/development/tools/comby/default.nix b/pkgs/development/tools/comby/default.nix index d97287ab579b..ac2d36c92391 100644 --- a/pkgs/development/tools/comby/default.nix +++ b/pkgs/development/tools/comby/default.nix @@ -15,8 +15,8 @@ let ocamlPackages.buildDunePackage rec { inherit pname preBuild; version = "1.8.1"; - useDune2 = true; - minimumOcamlVersion = "4.08.1"; + duneVersion = "3"; + minimalOcamlVersion = "4.08.1"; doCheck = true; src = fetchFromGitHub { @@ -28,12 +28,7 @@ let patches = [ ./comby.patch ]; - nativeBuildInputs = [ - ocamlPackages.ppx_deriving - ocamlPackages.ppx_deriving_yojson - ocamlPackages.ppx_sexp_conv - ocamlPackages.ppx_sexp_message - ] ++ extraNativeInputs; + nativeBuildInputs = extraNativeInputs; buildInputs = [ ocamlPackages.core @@ -42,9 +37,13 @@ let ocamlPackages.mparser ocamlPackages.mparser-pcre ocamlPackages.angstrom + ocamlPackages.ppx_deriving + ocamlPackages.ppx_deriving_yojson + ocamlPackages.ppx_sexp_conv + ocamlPackages.ppx_sexp_message ] ++ extraBuildInputs; - checkInputs = [ cacert ]; + nativeCheckInputs = [ cacert ]; meta = { description = "Tool for searching and changing code structure"; @@ -87,6 +86,9 @@ mkCombyPackage { ocamlPackages.lwt_react ocamlPackages.tar-unix ocamlPackages.tls + ocamlPackages.ppx_jane + ocamlPackages.ppx_expect + ocamlPackages.dune-configurator combyKernel combySemantic ] ++ (if !stdenv.isAarch32 && !stdenv.isAarch64 then @@ -97,9 +99,6 @@ mkCombyPackage { extraNativeInputs = [ autoconf pkg-config - ocamlPackages.ppx_jane - ocamlPackages.ppx_expect - ocamlPackages.dune-configurator ]; } diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 49b8434dbe71..9da227601024 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -1,16 +1,20 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: buildGoModule rec { pname = "conftest"; - version = "0.35.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; - rev = "v${version}"; - sha256 = "sha256-rcc4Ziktoq1ZNWdCNxoNtthLzKoMYFOH/dBg2KNQVGY="; + rev = "refs/tags/v${version}"; + hash = "sha256-kbWRjOXfDTVI07KuMQHcyxjenc7fW4oWRgyThzO0Pac="; }; - vendorSha256 = "sha256-jYBNDUUuTLQTCRWGAgjsvRN13RW97qt+5KREg7YBJnw="; + vendorHash = "sha256-8ZGZzb7Ikfk9DZQ6zyB+4JJuqyo4nlBDhGWUb8MtSys="; ldflags = [ "-s" @@ -18,7 +22,9 @@ buildGoModule rec { "-X github.com/open-policy-agent/conftest/internal/commands.version=${version}" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; preCheck = '' export HOME="$(mktemp -d)" @@ -41,6 +47,7 @@ buildGoModule rec { description = "Write tests against structured configuration data"; downloadPage = "https://github.com/open-policy-agent/conftest"; homepage = "https://www.conftest.dev"; + changelog = "https://github.com/open-policy-agent/conftest/releases/tag/v${version}"; license = licenses.asl20; longDescription = '' Conftest helps you write tests against structured configuration data. diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index a18bfbd22b63..7542ba0f94ff 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,16 +3,16 @@ nixosTests }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.40.0"; + version = "3.43.1"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-pd5B7RW13SWtOAwJGxhJBAhihCFkL3TokhWqcy7hVFk="; + sha256 = "sha256-gTtWfqz1XVvDPULHY4hKdhJlwEWY84VYUPloAX/9afY="; }; - vendorSha256 = "sha256-+LTjtJFHdYv0zeX8RpK0tuLWRpz5jXBwA7ZOvmA6YV0="; + vendorHash = "sha256-srzTHUqXxyZY2hFCx3FhhuixclXHskYrQ586W1dB334="; postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 605099c219c0..2a7111b352ec 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -1,26 +1,35 @@ { lib , fetchFromGitHub , buildGoModule +, installShellFiles }: buildGoModule rec { pname = "cirrus-cli"; - version = "0.91.0"; + version = "0.94.4"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nJd7azn42IqIx8CXL7RHJFAZUaN0uq4FumHL3uGIx9U="; + sha256 = "sha256-PnO9M3CQQnZotzCuE2rlGsoBzNO0PdsoMLlY3tNyEyk="; }; - vendorSha256 = "sha256-Llq6siZn34sHsZFneT+MLXf2W9cXqi4DZwrH1R5laOY="; + vendorSha256 = "sha256-gotc9M2UkRJtE4LZPCpqDTXQ/cnN4tk+3HG243tFoss="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" "-X github.com/cirruslabs/cirrus-cli/internal/version.Commit=v${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion --cmd cirrus \ + --bash <($out/bin/cirrus completion bash) \ + --zsh <($out/bin/cirrus completion zsh) \ + --fish <($out/bin/cirrus completion fish) + ''; + # tests fail on read-only filesystem doCheck = false; diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index 78c93efc2b9f..9e5dc5628ba7 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -1,23 +1,29 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, dagger }: buildGoModule rec { pname = "dagger"; - version = "0.2.36"; + version = "0.3.10"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - sha256 = "sha256-U+MdX/7RIrhnPjUjzYAQEVeHQUpgMtKanvjPLBjCNSY="; + hash = "sha256-/JbKnDjC3C0mF4WHOmmvblrr/e1MhOws3Q/oXZCgdEM="; }; - vendorSha256 = "sha256-ArdqEHECnGTMs3sJrPIAfmTT0D2V8SHyTYXmDODVtuo="; + vendorHash = "sha256-wufztmiOwgY0Q6x9oMrJo28JGx8iprC1gr9zZjSWwuw="; + proxyVendor = true; subPackages = [ "cmd/dagger" ]; - ldflags = [ "-s" "-w" "-X go.dagger.io/dagger/version.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/dagger/dagger/internal/engine.Version=${version}" ]; + + passthru.tests.version = testers.testVersion { + package = dagger; + command = "dagger version"; + }; meta = with lib; { description = "A portable devkit for CICD pipelines"; diff --git a/pkgs/development/tools/continuous-integration/drone-cli/0001-use-builtin-go-syscerts.patch b/pkgs/development/tools/continuous-integration/drone-cli/0001-use-builtin-go-syscerts.patch new file mode 100644 index 000000000000..6dfb50271a49 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/drone-cli/0001-use-builtin-go-syscerts.patch @@ -0,0 +1,39 @@ +From 93f4f92b017935a35988e7210036db8020753f9e Mon Sep 17 00:00:00 2001 +From: Jake Hillion +Date: Sun, 21 Feb 2021 21:26:39 +0000 +Subject: [PATCH] removed dependency for systemcertpool + +--- + drone/internal/util.go | 7 +++++-- + go.mod | 1 - + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drone/internal/util.go b/drone/internal/util.go +index 46c8ec6f..25d4def7 100644 +--- a/drone/internal/util.go ++++ b/drone/internal/util.go +@@ -2,11 +2,11 @@ package internal + + import ( + "crypto/tls" ++ "crypto/x509" + "fmt" + "net/http" + "strings" + +- "github.com/jackspirou/syscerts" + "github.com/urfave/cli" + "golang.org/x/net/proxy" + "golang.org/x/oauth2" +@@ -35,7 +35,10 @@ func NewClient(c *cli.Context) (drone.Client, error) { + } + + // attempt to find system CA certs +- certs := syscerts.SystemRootsPool() ++ certs, err := x509.SystemCertPool() ++ if err != nil { ++ return nil, err ++ } + tlsConfig := &tls.Config{ + RootCAs: certs, + InsecureSkipVerify: skip, 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 deleted file mode 100644 index e9bd040f6781..000000000000 --- a/pkgs/development/tools/continuous-integration/drone-cli/0001-use-different-upstream-for-gomod.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 6d0c414fe3bc..ccbadee62028 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib +, fetchFromGitHub +, buildGoModule +}: buildGoModule rec { - version = "1.6.0"; + version = "1.7.0"; pname = "drone-cli"; revision = "v${version}"; - vendorSha256 = "sha256-0vHOPuSn7eczlUeCTz+SOMuDdRQTzw/TnH1rt/ltWOQ="; - - doCheck = false; - - patches = [ ./0001-use-different-upstream-for-gomod.patch ]; - - ldflags = [ - "-X main.version=${version}" - ]; - src = fetchFromGitHub { owner = "harness"; repo = "drone-cli"; rev = revision; - sha256 = "sha256-TVOj1C5X3fTRZF29hId13LjkkwaAFntlozpmYVUfVJI="; + hash = "sha256-PZ0M79duSctPepD5O+NdJZKhkyR21g/4P6loJtoWZiU="; }; + vendorSha256 = "sha256-JC7OR4ySDsVWmrBBTjpwZrkJlM8RJehbsvXW/VtA4VA="; + + # patch taken from https://patch-diff.githubusercontent.com/raw/harness/drone-cli/pull/179.patch + # but with go.mod changes removed due to conflict + patches = [ ./0001-use-builtin-go-syscerts.patch ]; + + ldflags = [ + "-X main.version=${version}" + ]; + + doCheck = false; + meta = with lib; { mainProgram = "drone"; maintainers = with maintainers; [ techknowlogick ]; 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 bff410bdc922..784486f49ce4 100644 --- a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "drone-runner-docker"; - version = "1.8.1"; + version = "1.8.3"; src = fetchFromGitHub { owner = "drone-runners"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-3SbvnW+mCwaBCF77rAnDMqZRHX9wDCjXvFGq9w0E5Qw="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ZoQeCuT5FRhxp/ikB0gkp3QVOQ6OS7ukkz4QanWT9G0="; }; - vendorSha256 = "sha256-E18ykjQc1eoHpviYok+NiLaeH01UMQmigl9JDwtR+zo="; + vendorHash = "sha256-KcNp3VdJ201oxzF0bLXY4xWHqHNz54ZrVSI96cfhU+k="; meta = with lib; { - maintainers = with maintainers; [ endocrimes ]; + maintainers = with maintainers; [ endocrimes indeednotjames ]; license = licenses.unfreeRedistributable; homepage = "https://github.com/drone-runners/drone-runner-docker"; description = "Drone pipeline runner that executes builds inside Docker containers"; diff --git a/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix new file mode 100644 index 000000000000..1d15cdc60479 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "drone-runner-ssh"; + version = "unstable-2022-12-22"; + + src = fetchFromGitHub { + owner = "drone-runners"; + repo = pname; + rev = "ee70745c60e070a7fac57d9cecc41252e7a3ff55"; + sha256 = "sha256-YUyhEA1kYIFLN+BI2A8PFeSgifoVNmNPKtdS58MwwVU="; + }; + + vendorHash = "sha256-Vj6ZmNwegKBVJPh6MsjtLMmX9WR76msuR2DPM8Qyhe0="; + + meta = with lib; { + description = "Experimental Drone runner that executes a pipeline on a remote machine"; + homepage = "https://github.com/drone-runners/drone-runner-ssh"; + license = licenses.unfreeRedistributable; + maintainers = teams.c3d2.members; + }; +} diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index b120df52f590..136e7c9baf84 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -6,24 +6,25 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "harness"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-2Yu0EFMuAlG6/3YuDKQpiZU5/fBexWJtsrU1MNABSyA="; + sha256 = "sha256-bNvXAcFMPK8C/QN7VTdnicewRfaEtyJ45MhQSTNYp3U="; }; - vendorSha256 = "sha256-ijUHMAcSDnZnhlzaYeD411L3ybRc08ac9jbvDDc2D4M="; + vendorSha256 = "sha256-9EKXMy9g3kTpHer27ouuFDjh7zSEeBcpI8nH1VkMA9M="; tags = lib.optionals (!enableUnfree) [ "oss" "nolimit" ]; doCheck = false; meta = with lib; { + description = "Continuous Integration platform built on container technology"; + homepage = "https://github.com/harness/drone"; 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 c0211bd17fe7..20ba407e3d03 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.8.3"; + version = "7.9.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-7r9/r6gj8u3r4R5UQIxpnmJ33SGfEAuOcqRLK11khfc="; + sha256 = "sha256-YatN0VG3oEUK+vzJzthRnX+EkvUgKq2uIunAoPMoRag="; }; - vendorSha256 = "sha256-tEh1D/eczqLzuVQUcHE4+7Q74jM/yomdPDt6+TVJeew="; + vendorSha256 = "sha256-nX0r/7V+rgJb3/9O91QskYzBpWXIca7m3Do1QtGuHgg="; subPackages = [ "fly" ]; diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 84c9c9268496..143362d98a4c 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -7,6 +7,7 @@ , fetchFromGitHub , fetchurl , git +, glibc , icu , libkrb5 , lib @@ -27,10 +28,6 @@ let inherit sha256; }; - sdkSource = linkFarmFromDrvs "nuget-sdk-packages" ( - dotnetSdk.passthru.packages { inherit fetchNuGet; } - ); - nugetSource = linkFarmFromDrvs "nuget-packages" ( import ./deps.nix { inherit fetchNuGet; } ); @@ -48,15 +45,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.299.1"; - - inherit sdkSource; + version = "2.301.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-o6N7GDfSEWX6QaEga5hQpbpDcBh7Alcy9mK3QlODTbs="; + hash = "sha256-GIWuN3/CnA0uZfpo1Gty+5tL2eDXmFyzYFHrRozHwk0="; }; nativeBuildInputs = [ @@ -123,7 +118,7 @@ stdenv.mkDerivation rec { # Restore the dependencies dotnet restore src/ActionsRunner.sln \ --runtime "${runtimeId}" \ - --source "${sdkSource}" \ + --source "${dotnetSdk.packages}" \ --source "${nugetSource}" runHook postConfigure @@ -213,7 +208,7 @@ stdenv.mkDerivation rec { "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchCancellation" "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchRunNewJob" ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; checkPhase = '' runHook preCheck @@ -259,7 +254,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/run.sh --replace '"$DIR"/bin' '"$DIR"/lib' substituteInPlace $out/lib/config.sh --replace './bin' $out'/lib' \ --replace 'source ./env.sh' $out/bin/env.sh - + '' + lib.optionalString stdenv.isLinux '' + # Make binary paths absolute + substituteInPlace $out/lib/config.sh \ + --replace 'ldd' '${glibc.bin}/bin/ldd' \ + --replace '/sbin/ldconfig' '${glibc.bin}/bin/ldconfig' + '' + '' # Remove uneeded copy for run-helper template substituteInPlace $out/lib/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' ' substituteInPlace $out/lib/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/' @@ -319,7 +319,7 @@ stdenv.mkDerivation rec { # Script to create deps.nix file for dotnet dependencies. Run it with # $(nix-build -A github-runner.passthru.createDepsFile)/bin/create-deps-file # - # Default output path is /tmp/${pname}-deps.nix, but can be overriden with cli argument. + # Default output path is /tmp/${pname}-deps.nix, but can be overridden with cli argument. # # Inspired by passthru.fetch-deps in pkgs/build-support/build-dotnet-module/default.nix passthru.createDepsFile = writeShellApplication { @@ -333,6 +333,7 @@ stdenv.mkDerivation rec { printf "\n* Setup workdir\n" workdir="$(mktemp -d /tmp/${pname}.XXX)" + HOME="$workdir"/.fake-home cp -rT "${src}" "$workdir" chmod -R +w "$workdir" trap 'rm -rf "$workdir"' EXIT @@ -347,7 +348,7 @@ stdenv.mkDerivation rec { '') (lib.attrValues runtimeIds)} printf "\n* Make %s file\n" "$(basename "$deps_file")" - nuget-to-nix "$workdir/nuget_pkgs" "${sdkSource}" > "$deps_file" + nuget-to-nix "$workdir/nuget_pkgs" "${dotnetSdk.packages}" > "$deps_file" printf "\n* Dependency file writen to %s" "$deps_file" ''; }; diff --git a/pkgs/development/tools/continuous-integration/github-runner/patches/use-get-directory-for-diag.patch b/pkgs/development/tools/continuous-integration/github-runner/patches/use-get-directory-for-diag.patch index ff91bcff158c..2581cb7bb921 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/patches/use-get-directory-for-diag.patch +++ b/pkgs/development/tools/continuous-integration/github-runner/patches/use-get-directory-for-diag.patch @@ -1,17 +1,17 @@ diff --git a/src/Runner.Common/HostContext.cs b/src/Runner.Common/HostContext.cs -index d4ea48c..15c1800 100644 +index 9e43464..a953694 100644 --- a/src/Runner.Common/HostContext.cs +++ b/src/Runner.Common/HostContext.cs -@@ -109,7 +109,7 @@ namespace GitHub.Runner.Common +@@ -119,7 +119,7 @@ namespace GitHub.Runner.Common } // this should give us _diag folder under runner root directory - string diagLogDirectory = Path.Combine(new DirectoryInfo(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location)).Parent.FullName, Constants.Path.DiagDirectory); + string diagLogDirectory = GetDirectory(WellKnownDirectory.Diag); - _traceManager = new TraceManager(new HostTraceListener(diagLogDirectory, hostType, logPageSize, logRetentionDays), this.SecretMasker); + _traceManager = new TraceManager(new HostTraceListener(diagLogDirectory, hostType, logPageSize, logRetentionDays), stdoutTraceListener, this.SecretMasker); } else -@@ -272,7 +272,10 @@ namespace GitHub.Runner.Common +@@ -297,7 +297,10 @@ namespace GitHub.Runner.Common throw new NotSupportedException($"Unexpected well known directory: '{directory}'"); } diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 2ab40ae599fa..14984ba9519e 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "15.5.1"; + version = "15.8.0"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorSha256 = "sha256-IcsYH1V3b5IUY2JqOADJrc4lkng1GS7lndfHObRQbxU="; + vendorSha256 = "sha256-YHBp6Grm+atGne/5Ia/1H2xQRODmfWsMGCqHAIE9P4k="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-ZvQaA4DSuEIdHEoRKJg5tOnBQgf26paTAiWy6RLRG3o="; + sha256 = "sha256-U7yVlnEzwqcgTX8WjXe2i4SQ0KyW7PgSM3UyuGkjm9g="; }; patches = [ @@ -46,6 +46,7 @@ buildGoModule rec { rm executors/docker/terminal_test.go rm executors/docker/docker_test.go rm helpers/docker/auth/auth_test.go + rm executors/docker/services_test.go ''; postInstall = '' 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 index 5bffd0f4f75e..6f27ef71c957 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch @@ -1,25 +1,23 @@ diff --git a/shells/bash_test.go b/shells/bash_test.go -index b8a48f85e..0e3173fc3 100644 +index 9ed9e65ff..02b6e6d5f 100644 --- a/shells/bash_test.go +++ b/shells/bash_test.go -@@ -4,12 +4,9 @@ - package shells +@@ -4,11 +4,9 @@ package shells import ( + "path" - "runtime" "testing" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -- "gitlab.com/gitlab-org/gitlab-runner/common" + "gitlab.com/gitlab-org/gitlab-runner/common" ) - func TestBash_CommandShellEscapesLegacy(t *testing.T) { -@@ -84,62 +81,3 @@ func TestBash_CheckForErrors(t *testing.T) { - }) +@@ -90,65 +88,6 @@ func TestBash_CheckForErrors(t *testing.T) { } } -- + -func TestBash_GetConfiguration(t *testing.T) { - tests := map[string]struct { - info common.ShellScriptInfo @@ -78,3 +76,7 @@ index b8a48f85e..0e3173fc3 100644 - }) - } -} +- + func Test_BashWriter_isTmpFile(t *testing.T) { + tmpDir := "/foo/bar" + bw := BashWriter{TemporaryPath: tmpDir} diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 2cc9e26d052e..3e909be05915 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.361.4"; + version = "2.375.2"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-s4/iGK+1RHsMmm+jCNerdirFpY3YmqaLc1BnrWw3wXs="; + hash = "sha256-5XJSX3+kOwguIolvclcCl9iNrsTzarTyX9rcqIX5VJI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix index aa83dfb16166..b5eda9efb917 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, callPackage, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, callPackage, fetchFromGitHub }: let common = callPackage ./common.nix { }; in @@ -7,16 +7,6 @@ buildGoModule { inherit (common) version src ldflags postBuild; vendorSha256 = null; - patches = [ - # Fixes https://github.com/NixOS/nixpkgs/issues/184875, until a new version - # is released. - (fetchpatch { - name = "display-system-ca-error-only-if-there-is-an-error.patch"; - url = "https://github.com/woodpecker-ci/woodpecker/commit/1fb800329488de74c9db7cfc5dc43fb5a4efbad8.patch"; - sha256 = "sha256-wKI/7PhbxsAD/qrl4nnkHyyQhQcvGlySysnxytGJzfU="; - }) - ]; - subPackages = "cmd/cli"; CGO_ENABLED = 0; diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index d6b337f4892a..e94e83b7e6b9 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub }: let - version = "0.15.5"; - srcSha256 = "yaA2PKw4xuqd8vGXh/GhcJJHw4mJ1z97tWJTREE14ow="; - yarnSha256 = "1jpb4gblmknl81f6iclqg8ba82ca931q38xpm0kzki8y5ayk9n67"; + version = "0.15.6"; + srcSha256 = "sha256-8XXeGEw7+NGULsD5/g1j9+P2h82oRpEuMJT6sMp+z38="; + yarnSha256 = "sha256-PY0BIBbjyi2DG+n5x/IPc0AwrFSwII4huMDU+FeZ/Sc="; in { inherit version yarnSha256; diff --git a/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json b/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json index eb29431a0566..3caa2f3cbf7f 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json +++ b/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json @@ -18,7 +18,6 @@ }, "dependencies": { "@kyvg/vue3-notification": "2.3.4", - "@meforma/vue-toaster": "1.2.2", "ansi-to-html": "0.7.2", "dayjs": "1.10.7", "floating-vue": "2.0.0-beta.5", @@ -54,7 +53,7 @@ "typescript": "4.4.4", "unplugin-icons": "0.12.17", "unplugin-vue-components": "0.17.0", - "vite": "2.6.13", + "vite": "2.9.13", "vite-plugin-windicss": "1.4.12", "vite-svg-loader": "3.0.0", "vue-tsc": "0.28.10", diff --git a/pkgs/development/tools/convco/default.nix b/pkgs/development/tools/convco/default.nix index a8854da13094..c3b0af4e8226 100644 --- a/pkgs/development/tools/convco/default.nix +++ b/pkgs/development/tools/convco/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.3.12"; + version = "0.3.15"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FGNMpBd2tgkJBbvgjgOYlLkAa8NqFUwa7rPp9jaWcio="; + sha256 = "sha256-a/C93Uuf++FIBqZSA0LaUQX4ZQoUMD2lHnV5MRlCw4g="; }; - cargoSha256 = "sha256-trlMO9+zf1+1cZu2jAzflB737ZT1lO/s1ekE5mGVo5Y="; + cargoHash = "sha256-JQvLezX8L2yEDyiVxH93Uk1V5qFjwXNVQWEI9ur9YOQ="; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/tools/cpm/default.nix b/pkgs/development/tools/cpm-cmake/default.nix similarity index 60% rename from pkgs/development/tools/cpm/default.nix rename to pkgs/development/tools/cpm-cmake/default.nix index 1d5bdc3b694f..f4f814f2d9f0 100644 --- a/pkgs/development/tools/cpm/default.nix +++ b/pkgs/development/tools/cpm-cmake/default.nix @@ -1,25 +1,28 @@ { lib , stdenvNoCC -, fetchurl +, fetchFromGitHub }: -stdenvNoCC.mkDerivation rec { - pname = "cpm"; - version = "0.36.0"; +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "cpm-cmake"; + version = "0.37.0"; - src = fetchurl { - url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v${version}/CPM.cmake"; - sha256 = "sha256-F5YA1Z8OdSihipjo7QhqIZMKBcvm9WyfJ5l4WZwW9Cc="; + src = fetchFromGitHub { + owner = "cpm-cmake"; + repo = "cpm.cmake"; + rev = "v${finalAttrs.version}"; + hash = "sha256-zZUk0brG9dAfQRN1LzKRo5/ZAG35TblY0nZvVhy6azE="; }; - dontUnpack = true; dontConfigure = true; dontBuild = true; installPhase = '' runHook preInstall - install -Dm644 $src $out/share/cpm/CPM.cmake + mkdir -p $out/share/{,doc/}cpm + install -Dm644 cmake/CPM.cmake $out/share/cpm/CPM.cmake + install -Dm644 README.md CONTRIBUTING.md $out/share/doc/cpm/ runHook postInstall ''; @@ -37,4 +40,4 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ ken-matsui ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/tools/csvq/default.nix b/pkgs/development/tools/csvq/default.nix new file mode 100644 index 000000000000..badc9aba08b3 --- /dev/null +++ b/pkgs/development/tools/csvq/default.nix @@ -0,0 +1,23 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "csvq"; + version = "1.17.11"; + + src = fetchFromGitHub { + owner = "mithrandie"; + repo = "csvq"; + rev = "v${version}"; + sha256 = "sha256-jhj03xpWBcLVCCk1S9nsi8O6x1/IVwNT3voGfWBg2iw="; + }; + + vendorSha256 = "sha256-C+KQHSp4aho+DPlkaYegjYSaoSHaLiQOa1WJXIn9FdQ="; + + meta = with lib; { + description = "SQL-like query language for CSV"; + homepage = "https://mithrandie.github.io/csvq/"; + changelog = "https://github.com/mithrandie/csvq/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ tomodachi94 ]; + }; +} diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index bf49c850881b..1759596e8f71 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.12"; + version = "0.8.16"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h0JR641+VBiTJY8INXhxwvsyZGLH4YRdkddwo2IUDQk="; + hash = "sha256-JCBlP8ESCiqr4pk8QyG5CVs+3qSlnvw0jYS5R0Civk0="; }; - vendorSha256 = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s="; + vendorHash = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index d159a329e539..5ef396d38397 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "cue-lang"; repo = "cue"; rev = "v${version}"; - sha256 = "sha256-v9MYrijnbtJpTgRZ4hmkaekisOyujldGewCRNbkVzWw="; + hash = "sha256-v9MYrijnbtJpTgRZ4hmkaekisOyujldGewCRNbkVzWw="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -f cmd/cue/cmd/script_test.go ''; - vendorSha256 = "sha256-jTfV8DJlr5LxS3HjOEBkVzBvZKiySrmINumXSUIq2mI="; + vendorHash = "sha256-jTfV8DJlr5LxS3HjOEBkVzBvZKiySrmINumXSUIq2mI="; excludedPackages = [ "internal/ci/updatetxtar" "internal/cmd/embedpkg" "internal/cmd/qgo" "pkg/gen" ]; diff --git a/pkgs/development/tools/cue/validator.nix b/pkgs/development/tools/cue/validator.nix new file mode 100644 index 000000000000..cddc3fe342b7 --- /dev/null +++ b/pkgs/development/tools/cue/validator.nix @@ -0,0 +1,17 @@ +{ cue, writeShellScript, lib }: +# `document` must be a fragment of definition or structure that the input data will be matched against. +# `document` must exist in the Cue schema file provided (`cueSchemaFile`). +# The result is a script that can be used to validate the input data (JSON/YAML and more can be supported depending on Cue) +# against the fragment described by `document` or the whole definition. +# The script will be strict and enforce concrete values, i.e. partial documents are not supported. +cueSchemaFile: { document ? null }: + writeShellScript "validate-using-cue" + ''${cue}/bin/cue \ + --all-errors \ + --strict \ + vet \ + --concrete \ + "$1" \ + ${cueSchemaFile} \ + ${lib.optionalString (document != null) "-d \"${document}\""} + '' diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/development/tools/dapr/cli/default.nix index 6b5924f85027..084b14b017f0 100644 --- a/pkgs/development/tools/dapr/cli/default.nix +++ b/pkgs/development/tools/dapr/cli/default.nix @@ -19,6 +19,13 @@ buildGoModule rec { export HOME=$(mktemp -d) ''; + ldflags = [ + "-X main.version=${version}" + "-X main.apiVersion=1.0" + "-X github.com/dapr/cli/pkg/standalone.gitcommit=${src.rev}" + "-X github.com/dapr/cli/pkg/standalone.gitversion=${version}" + ]; + postInstall = '' mv $out/bin/cli $out/bin/dapr @@ -31,7 +38,7 @@ buildGoModule rec { description = "A CLI for managing Dapr, the distributed application runtime"; homepage = "https://dapr.io"; license = licenses.mit; - maintainers = with maintainers; [ lucperkins ]; + maintainers = with maintainers; [ joshvanl lucperkins ]; mainProgram = "dapr"; }; } diff --git a/pkgs/development/tools/database/apgdiff/default.nix b/pkgs/development/tools/database/apgdiff/default.nix index 016259f0bbb4..d96e3dbd99d0 100644 --- a/pkgs/development/tools/database/apgdiff/default.nix +++ b/pkgs/development/tools/database/apgdiff/default.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://apgdiff.com"; license = licenses.mit; inherit (jre.meta) platforms; - sourceProvenance = sourceTypes.binaryBytecode; + sourceProvenance = [ sourceTypes.binaryBytecode ]; maintainers = [ maintainers.misterio77 ]; }; }) diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 4db8dbe263ff..81c53082b7ec 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Vc9zPERRF6AWSOGSiOe6n33Ioc3uOtHQEehfMhPkSFk="; + sha256 = "sha256-RaThNBTRBECSeSeJOQ2UsrkBHjSjrS91vIRF/4MGek4="; }; - vendorSha256 = "sha256-kbIztD0g+92gxxBYhWILudgFRFCshagmAUs8bY/Z8yg="; + vendorSha256 = "sha256-sSN+HAUC9rJc9XMTG8H+Zg7mzZSVxn6Z7dixJ10mOuM="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 5acfd6ea9987..baa7ebf56203 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.15.0"; + version = "1.16.2"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "sha256-eBes5BqoR7K6ntCKjWECwWuoTwAodNtLqcTei5WocLU="; + sha256 = "sha256-5hjAP2+0hbYcA9G7YJyRqqp1ZC8LzFDomjeFjl4z4FY="; }; - vendorSha256 = "sha256-U9VTS0rmLHxweFiIcFyoybHMBihy5ezloDC2iLc4IMc="; + vendorHash = "sha256-7fC1jJMY/XK+GX5t2/o/k+EjFxAlRAmiemMcWaZhL9o="; doCheck = false; diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix index a1c35c88ee80..34264dad65f6 100644 --- a/pkgs/development/tools/database/litecli/default.nix +++ b/pkgs/development/tools/database/litecli/default.nix @@ -21,13 +21,17 @@ python3Packages.buildPythonApplication rec { sqlparse ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook mock ]; pythonImportsCheck = [ "litecli" ]; + disabledTests = [ + "test_auto_escaped_col_names" + ]; + meta = with lib; { description = "Command-line interface for SQLite"; longDescription = '' diff --git a/pkgs/development/tools/database/litefs/default.nix b/pkgs/development/tools/database/litefs/default.nix index 4589ab21ef80..481ee47c7246 100644 --- a/pkgs/development/tools/database/litefs/default.nix +++ b/pkgs/development/tools/database/litefs/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "litefs"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "superfly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Gh1GcIsRNfAwQ2HJq82IlyUHPyaDpA3CpBe4glBbU/I="; + sha256 = "sha256-fNZ0PtgMgCGB1b1HLJsmbm/I8wa3auHimL1ktf6wA9M="; }; - vendorSha256 = "sha256-dXCyBY4k9Gxsy/7UwkWFTxihZnFkZGrZKgw9pHD8jco="; + vendorSha256 = "sha256-w77JQNk1QZFJVrn9yuvKOemggV9e0FuqhVWK3d4umuY="; subPackages = [ "cmd/litefs" ]; diff --git a/pkgs/development/tools/database/pg_activity/default.nix b/pkgs/development/tools/database/pg_activity/default.nix index 399c8801f772..c3ec5f9d5802 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 = "3.0.1"; + version = "3.0.3"; disabled = python3Packages.pythonOlder "3.6"; src = fetchFromGitHub { owner = "dalibo"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-YsHY2Hvr1aDKA+YOftc7iUi1qXDv6HW+jQtTQgQ5+M4="; + sha256 = "sha256-djpBdhCgtlm6+DiZVKSKh0nu30YVm/qZHlBHPtdObfU="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/development/tools/database/pgweb/default.nix b/pkgs/development/tools/database/pgweb/default.nix index 665ce591cdd6..7cdf913736a6 100644 --- a/pkgs/development/tools/database/pgweb/default.nix +++ b/pkgs/development/tools/database/pgweb/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgweb"; - version = "0.11.12"; + version = "0.13.1"; src = fetchFromGitHub { owner = "sosedoff"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5BFTvfTXsz5ZerSoAudavT/C+SA/xkmVBtAOhAixcAE="; + sha256 = "sha256-+sU+kNTOv78g4mvynXoIyNtmeIDxzfAs4Kr/Lx9zfiU="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -f pkg/client/{client,dump}_test.go ''; - vendorSha256 = "sha256-pXV1BodOEZs5sv7UE/C58SAyIUZW5Cp2gJD7g8EuWog="; + vendorSha256 = "sha256-W+Vybea4oppD4BHRqcyouQL79cF+y+sONY9MRggti20="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 8f0598db815e..e42c42e14960 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -2,6 +2,7 @@ , lib , Security , openssl +, git , pkg-config , protobuf , rustPlatform @@ -13,21 +14,21 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "4.6.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-tgU/QI6YwWeFPXh6VVPV3iLUGVwoxdG7YQwHBVobXH8="; + sha256 = "sha256-Nxpv3ibhHTFiO0hqSrT1hqTK9Vb0P8Svu5riufCChwI="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-LeE9biQDQ+aj0kKBrkIy3aGt5rgOu6O7w7xI/CjBUMA="; + cargoSha256 = "sha256-PiDW7+LrCDfRpQirJlgaYDnGenowbsCmwQz1mbgA08E="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config git ]; buildInputs = [ openssl diff --git a/pkgs/development/tools/database/sqlcl/default.nix b/pkgs/development/tools/database/sqlcl/default.nix new file mode 100644 index 000000000000..ccf3bd4a23d3 --- /dev/null +++ b/pkgs/development/tools/database/sqlcl/default.nix @@ -0,0 +1,70 @@ +{ lib, stdenv, makeWrapper, requireFile, unzip, jdk }: + +let + version = "22.4.0.342.1212"; + fileVersion = "1032835-01"; +in + stdenv.mkDerivation { + + inherit version; + pname = "sqlcl"; + + src = requireFile rec { + url = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/download/"; + name = "V${fileVersion}.zip"; + message = '' + This Nix expression requires that ${name} already be part of the store. To + obtain it you need to + + - navigate to ${url} + - make sure that it says "Version ${version}" above the list of downloads + - if it does not, click on the "Previous Version" link below the + download and repeat until the version is correct. This is necessary + because as the time of this writing there exists no permanent link + for the current version yet. + Also consider updating this package yourself (you probably just need + to change the `version` variable and update the sha256 to the one of + the new file) or opening an issue at the nixpkgs repo. + - click "Download" + - sign in or create an oracle account if neccessary + - on the next page, click the "${name}" link + + and then add the file to the Nix store using either: + + nix-store --add-fixed sha256 ${name} + + or + + nix-prefetch-url --type sha256 file:///path/to/${name} + ''; + sha256 = "0i4xsj502s465fgmlcqn80r8rqzr11mv74x9fzrlbqmkkh5c782k"; + }; + + nativeBuildInputs = [ makeWrapper unzip ]; + + unpackCmd = "unzip $curSrc"; + + installPhase = '' + mkdir -p $out/libexec + mv * $out/libexec/ + + makeWrapper $out/libexec/bin/sql $out/bin/sqlcl \ + --set JAVA_HOME ${jdk.home} \ + --chdir "$out/libexec/bin" + ''; + + meta = with lib; { + description = "Oracle's Oracle DB CLI client"; + longDescription = '' + Oracle SQL Developer Command Line (SQLcl) is a free command line + interface for Oracle Database. It allows you to interactively or batch + execute SQL and PL/SQL. SQLcl provides in-line editing, statement + completion, and command recall for a feature-rich experience, all while + also supporting your previously written SQL*Plus scripts. + ''; + homepage = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ misterio77 ]; + }; +} diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 340c471c2727..256178e7a9d9 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "1.4.2"; + version = "1.4.5"; + format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-B1tqL8bc+mWEjQrS4lQM55/ahOeUyuE8VBtk6QMj6Mk="; + hash = "sha256-Kc0doBR2iOy54arxOYXH5eHlcM7pXFVUqedopsZH8rE="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -31,23 +32,22 @@ python3.pkgs.buildPythonApplication rec { toml tqdm typing-extensions - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses ] ++ lib.optionals (pythonOlder "3.8") [ backports.cached-property importlib_metadata ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ hypothesis pytestCheckHook ]; disabledTestPaths = [ # Don't run the plugin related tests - "test/core/plugin_test.py" - "plugins/sqlfluff-templater-dbt" "plugins/sqlfluff-plugin-example/test/rules/rule_test_cases_test.py" + "plugins/sqlfluff-templater-dbt" + "test/core/plugin_test.py" + "test/diff_quality_plugin_test.py" ]; disabledTests = [ @@ -64,6 +64,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "SQL linter and auto-formatter"; homepage = "https://www.sqlfluff.com/"; + changelog = "https://github.com/sqlfluff/sqlfluff/blob/${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index dd503834dd95..1a931b2b10c3 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.4.0"; + version = "4.5.1"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "sha256-uMOVhLqjZB21SAvNXT6VhdmFyCFhBYHID9lXeDABvnk="; + sha256 = "sha256-LKX8yNSLs60546ZcvLlQF3e++VxHmPsczui4cfrpia0="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix index faf820c1bde2..020c99380b6a 100644 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "timescaledb-tune"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vbFfqGWYpw0ppon/0oQMRixQStk+YSi/QFMi0AQoUpQ="; + sha256 = "sha256-MQi8A7eWOShP/VhxuX4Uhz1ueLtKvOi1x4E7aFXEsQo="; }; - vendorSha256 = "sha256-n2jrg9FiR/gSrbds/QVV8Duf7BTEs36yYi4F3Ve+d0E="; + vendorSha256 = "sha256-yXWeINubvfZ2S+3gVFsrzeVO3XXIiZ14qfK+9Bj3SV4="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/database/trino-cli/default.nix b/pkgs/development/tools/database/trino-cli/default.nix index d68786a9ee68..42064b38916a 100644 --- a/pkgs/development/tools/database/trino-cli/default.nix +++ b/pkgs/development/tools/database/trino-cli/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec { pname = "trino-cli"; - version = "392"; + version = "403"; jarfilename = "${pname}-${version}-executable.jar"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/trino/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-yqTKXmcRgsSSr4KAZ2NV7FrCGIxCU/V14XFEZmUTj1s="; + sha256 = "sha256-Yo7WQoY99gbXflcms0v3r9w+GXSNOP+CdKDnUZXEs8Q="; }; dontUnpack = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -D "$src" "$out/share/java/${jarfilename}" - makeWrapper ${jre}/bin/java $out/bin/trino \ + makeWrapper ${jre_headless}/bin/java $out/bin/trino \ --add-flags "-jar $out/share/java/${jarfilename}" runHook postInstall diff --git a/pkgs/development/tools/database/vitess/default.nix b/pkgs/development/tools/database/vitess/default.nix new file mode 100644 index 000000000000..211b20871eab --- /dev/null +++ b/pkgs/development/tools/database/vitess/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub, sqlite }: + +buildGoModule rec { + pname = "vitess"; + version = "15.0.2"; + + src = fetchFromGitHub { + owner = "vitessio"; + repo = pname; + rev = "v${version}"; + hash = "sha256-NkJqJYmUf92QiPazxRWNsxZh0Pvc73l35hP1gmk4Fv0="; + }; + + vendorHash = "sha256-+yCznSxv0EWoKiQIgFEQ/iUxrlQ5A1HYNkoMiRDG3ik="; + + buildInputs = [ sqlite ]; + + subPackages = [ "go/cmd/..." ]; + + # integration tests require access to syslog and root + doCheck = false; + + meta = with lib; { + homepage = "https://vitess.io/"; + changelog = "https://github.com/vitessio/vitess/releases/tag/v${version}"; + description = "A database clustering system for horizontal scaling of MySQL"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index 38d06f6461ca..13fc840b0c41 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "datree"; - version = "1.8.0"; + version = "1.8.21"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; - rev = version; - hash = "sha256-dMKRfNGv5BImSjm7zf2bLJw+wWEdVl52IMzCrzJhSHA="; + rev = "refs/tags/${version}"; + hash = "sha256-OURnQo38ofiDRu01GeEFTNiTYUeiDLMr1j28HzHVxds="; }; - vendorHash = "sha256-m3O5AoAHSM6rSnmL5N7V37XU38FADb0Edt/EZvvb2u4="; + vendorHash = "sha256-mkVguYzjNGgFUdATjGfenCx3h97LS3SEOkYo3CuP9fA="; nativeBuildInputs = [ installShellFiles ]; @@ -51,6 +51,7 @@ buildGoModule rec { objects. ''; homepage = "https://datree.io/"; + changelog = "https://github.com/datreeio/datree/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ azahi jceb ]; }; diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index 0cefbfc9281f..0f8f5828ac0d 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.9.0"; + version = "0.13.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-8sqOhhuneLFxhmZjoMYYfWw9wv55zWzw3QQEZW+hxBU="; + sha256 = "sha256-56VznyGZtSYKyjQRej1QduG/99OYObYNmplsGSckgKg="; }; - vendorSha256 = "sha256-mq82KNa01gHvW+RUREra+ysaJ1YWIwX0v/uYMxmFN4M="; + vendorHash = "sha256-3y5ppTtvGqwWhgnVBpP4gf26DHKPnSNYK4jfhBiYDwY="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/deadnix/default.nix b/pkgs/development/tools/deadnix/default.nix index 471f29b2f034..00d51cb94fd5 100644 --- a/pkgs/development/tools/deadnix/default.nix +++ b/pkgs/development/tools/deadnix/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "deadnix"; - version = "0.1.8"; + version = "1.0.0"; src = fetchFromGitHub { owner = "astro"; repo = "deadnix"; rev = "v${version}"; - sha256 = "sha256-4IK+vv3R3UzF5anH1swypPIzXXZmTCJ2kS2eGUcYvLk="; + sha256 = "sha256-T8VwxHdy5KI2Kob5wYWGQOGYYJeSfWVPygIOe0PYUMY="; }; - cargoSha256 = "sha256-GmvSrU7wDOKc22GU43oFJoYCYiVKQ5Oe6qrLQXLtcyM="; + cargoSha256 = "sha256-0pe1zOHoNoAhCb0t8BnL7XewyoqOzVL5w3MTY8pUkUY="; meta = with lib; { description = "Find and remove unused code in .nix source files"; diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index a66f32f6db0c..4ee3c14dacde 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "delve"; - version = "1.9.1"; + version = "1.20.1"; src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "sha256-Ga+1xz7gsLoHA0G4UOiJf331hrBVoeB93Pjd0PyATB4="; + sha256 = "sha256-X1vds6+brQ5pl7MG2/n0CqCoS0nbjnQUcIgJqji/u60="; }; vendorSha256 = null; @@ -46,5 +46,6 @@ buildGoModule rec { homepage = "https://github.com/go-delve/delve"; maintainers = with maintainers; [ SuperSandro2000 vdemeester ]; license = licenses.mit; + mainProgram = "dlv"; }; } diff --git a/pkgs/development/tools/detekt/default.nix b/pkgs/development/tools/detekt/default.nix new file mode 100644 index 000000000000..0c67c5dd66a9 --- /dev/null +++ b/pkgs/development/tools/detekt/default.nix @@ -0,0 +1,38 @@ +{ detekt, lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }: +stdenv.mkDerivation rec { + pname = "detekt"; + version = "1.22.0"; + + jarfilename = "${pname}-${version}-executable.jar"; + + src = fetchurl { + url = "https://github.com/detekt/detekt/releases/download/v${version}/detekt-cli-${version}-all.jar"; + sha256 = "sha256-NCOMBcAtk7cOlP3H8Bz/hfR/305j/DfaoFrwc504b/4="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -D "$src" "$out/share/java/${jarfilename}" + + makeWrapper ${jre_headless}/bin/java $out/bin/detekt \ + --add-flags "-jar $out/share/java/${jarfilename}" + + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { package = detekt; }; + + meta = with lib; { + description = "Static code analysis for Kotlin"; + homepage = "https://detekt.dev/"; + license = licenses.asl20; + platforms = jre_headless.meta.platforms; + maintainers = with maintainers; [ mdr ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + }; +} diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index d9c202b6ffd2..08f7cce9022b 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,25 +5,25 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.1.0"; + version = "0.2.4"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-TxHfgi3/Q4aa5of29OGTs1Qy5PPIK4Gcwd11KJ70NIc="; + hash = "sha256-b3vBwWya5xj/y5/32KIHtvPRT6JdMpO/IKO4sVAg4AA="; }; ldflags = [ "-s" "-w" - "-X go.jetpack.io/devbox/build.Version=${version}" + "-X go.jetpack.io/devbox/internal/build.Version=${version}" ]; # integration tests want file system access doCheck = false; - vendorHash = "sha256-XeoQI5Rel0qP9cjguPqne7pfNdQJKN+uHRZGnrIGtHk="; + vendorHash = "sha256-3u3qg8BojCVp0gx8ZKRv2WS5K307CnTlFjvTgrlfw8w="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/devd/default.nix b/pkgs/development/tools/devd/default.nix index 0789850a4945..05ed14dfcd6e 100644 --- a/pkgs/development/tools/devd/default.nix +++ b/pkgs/development/tools/devd/default.nix @@ -1,16 +1,30 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, fetchpatch, lib }: -buildGoPackage rec { +buildGoModule rec { pname = "devd"; - version = "0.9"; + version = "unstable-2020-04-27"; + src = fetchFromGitHub { owner = "cortesi"; repo = "devd"; - rev = "v${version}"; - sha256 = "1b02fj821k68q7xl48wc194iinqw9jiavzfl136hlzvg4m07p1wf"; + rev = "c1a3bfba27d8e028de90fb24452374412a4cffb3"; + hash = "sha256-k0zj7fiYbaHnNUUI7ruD0vXiT4c1bxPuR4I0dRouCbU="; }; - goPackagePath = "github.com/cortesi/devd"; + + vendorHash = "sha256-o7MbN/6n7fkp/yqYyQbfWBUqI09/JYh5jtV31gjNf6w="; + + patches = [ + # Update x/sys to support go 1.17. + (fetchpatch { + url = "https://github.com/cortesi/devd/commit/5f4720bf41399736b4e7e1a493da6c87a583d0b2.patch"; + hash = "sha256-WDN08XNsDPuZwBCE8iDXgGAWFwx2UTwqRkhzKMtPKR8="; + }) + ]; + subPackages = [ "cmd/devd" ]; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "A local webserver for developers"; homepage = "https://github.com/cortesi/devd"; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 863336257251..27af4acb352b 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -13,7 +13,6 @@ , pluggy , py , pytestCheckHook -, pytest-flake8 , setuptools , sphinx , tox @@ -30,6 +29,11 @@ buildPythonApplication rec { hash = "sha256-Ni6ybpUTankkkYYcwnKNFKYwmp1MTxOnucPm/TneWOw="; }; + postPatch = '' + substituteInPlace tox.ini \ + --replace "--flake8" "" + ''; + buildInputs = [ glibcLocales ]; @@ -44,13 +48,12 @@ buildPythonApplication rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ devpi-server git mercurial mock pytestCheckHook - pytest-flake8 sphinx tox webtest diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 9d3d1b71aa9d..d9de1b09c214 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -11,8 +11,8 @@ , passlib , platformdirs , pluggy +, py , pyramid -, pytest-flake8 , pytestCheckHook , repoze_lru , setuptools @@ -25,6 +25,7 @@ buildPythonApplication rec { pname = "devpi-server"; version = "6.7.0"; + format = "setuptools"; disabled = isPy27; @@ -37,6 +38,11 @@ buildPythonApplication rec { sourceRoot = "source/server"; + postPatch = '' + substituteInPlace tox.ini \ + --replace "--flake8" "" + ''; + propagatedBuildInputs = [ aiohttp appdirs @@ -55,10 +61,10 @@ buildPythonApplication rec { waitress ] ++ passlib.optional-dependencies.argon2; - checkInputs = [ + nativeCheckInputs = [ beautifulsoup4 nginx - pytest-flake8 + py pytestCheckHook webtest ]; diff --git a/pkgs/development/tools/distgen/default.nix b/pkgs/development/tools/distgen/default.nix index dbf00ea8e05e..d1e506ea9789 100644 --- a/pkgs/development/tools/distgen/default.nix +++ b/pkgs/development/tools/distgen/default.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "08f9rw5irgv0gw7jizk5f9csn0yhrdnb84k40px1zbypsylvr5c5"; }; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest mock ]; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index f4daa199e209..3c87fe5d0148 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.87.0"; + version = "1.91.0"; vendorSha256 = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-y5RHICd82FLWDkygCcmrnPwISEv/WuRwQiXXqS6cSKg="; + sha256 = "sha256-hX9doUNxqkJujts9yYNvGSTq3nkaan1HqTHZBcO1hCs="; }; meta = with lib; { diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/development/tools/documentation/gi-docgen/default.nix index 4b627782d8b5..512f7aeb7bd5 100644 --- a/pkgs/development/tools/documentation/gi-docgen/default.nix +++ b/pkgs/development/tools/documentation/gi-docgen/default.nix @@ -1,34 +1,22 @@ { lib -, fetchFromGitLab -, fetchpatch +, fetchurl , meson , ninja , python3 +, gnome }: python3.pkgs.buildPythonApplication rec { pname = "gi-docgen"; - version = "2022.1"; + version = "2022.2"; format = "other"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = pname; - rev = version; - sha256 = "35pL/2TQRVgPfAcfOGCLlSP1LIh4r95mFC+UoXQEEHo="; + src = fetchurl { + url = "mirror://gnome/sources/gi-docgen/${lib.versions.major version}/gi-docgen-${version}.tar.xz"; + sha256 = "JlQ5ENdqedYvZnEihWkqO2KnXzHQfLvupG7sfjTmOlQ="; }; - patches = [ - # Fix gnome-builder build - # https://gitlab.gnome.org/GNOME/gi-docgen/-/merge_requests/161 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gi-docgen/-/commit/0524047ada3e6a5572c43dd36201ebe589d08095.patch"; - sha256 = "1P+i7v1sMULOd0w8K363Mssj+tBJ2wiSmE7DlztvCbw="; - }) - ]; - depsBuildBuild = [ python3 ]; @@ -55,6 +43,12 @@ python3.pkgs.buildPythonApplication rec { --replace "${python3}" "" ''; + passthru = { + updateScript = gnome.updateScript { + packageName = "gi-docgen"; + }; + }; + meta = with lib; { description = "Documentation generator for GObject-based libraries"; homepage = "https://gitlab.gnome.org/GNOME/gi-docgen"; diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix index e9bf37345133..85f19d899ed6 100644 --- a/pkgs/development/tools/documentation/mdsh/default.nix +++ b/pkgs/development/tools/documentation/mdsh/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdsh"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "zimbatm"; repo = "mdsh"; rev = "v${version}"; - sha256 = "1ki6w3qf8ipcf7ch5120mj16vs7yan8k9zjd25v8x6vbsd1iccgy"; + hash = "sha256-Y8ss/aw01zpgM6Z6fCGshP21kcdSOTVG/VqL8H3tlls="; }; - cargoSha256 = "0x5fd47rjmzzmwgj14gbj0rbxwbphd7f63mis4ivwlwc9ikjxdxb"; + cargoSha256 = "sha256-8o4gN6mqUU+o80IqlAYAD5qpZBSQ/FY5HoNbpwzTm0A="; meta = with lib; { description = "Markdown shell pre-processor"; diff --git a/pkgs/development/tools/dot-http/default.nix b/pkgs/development/tools/dot-http/default.nix deleted file mode 100644 index d5a507d4ebba..000000000000 --- a/pkgs/development/tools/dot-http/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }: - -rustPlatform.buildRustPackage rec { - pname = "dot-http"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "bayne"; - repo = pname; - rev = "v${version}"; - sha256 = "1s2q4kdldhb5gd14g2h6vzrbjgbbbs9zp2dgmna0rhk1h4qv0mml"; - }; - - cargoSha256 = "013jyp2bgmssj1c18lm8jkb6q6jlhdrqzmyri6k5lgmfmb9dvkii"; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - libiconv Security - ]; - - meta = with lib; { - description = "Text-based scriptable HTTP client"; - homepage = "https://github.com/bayne/dot-http"; - license = licenses.asl20; - maintainers = with maintainers; [ mredaelli ]; - }; -} diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index 1ff2577b5d9f..cfbf2752c03a 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.33.0"; + version = "0.34.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-7UgE8/FPEG3VUtQLdlvfaFx9N6iIci5eu+Z2HBo+7c0="; + sha256 = "sha256-JCCmGlvL2OLkeq25lCzVRXvmVCAvkwO4yD81gbKmSsw="; }; - cargoSha256 = "sha256-/7YUbbuoN/qUIHk95ndaKjHZdJOPNTqZqOBvM2dHvoc="; + cargoHash = "sha256-5biUsZTLoYcEqOPJnzR8YpdN7U1ztXjprRhHTUxKCl4="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index 5faf403e71a6..f1d841828b3f 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchFromGitHub, fetchpatch, ldc, curl}: +{ stdenv, lib, fetchFromGitHub, fetchpatch, ldc, curl, gnumake42 }: stdenv.mkDerivation rec { pname = "dtools"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ ldc ]; + nativeBuildInputs = [ ldc gnumake42 ]; # fails with make 4.4 buildInputs = [ curl ]; makeCmd = '' diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix index 19e16bd0da73..2f26262143d1 100644 --- a/pkgs/development/tools/dump_syms/default.nix +++ b/pkgs/development/tools/dump_syms/default.nix @@ -16,7 +16,7 @@ let pname = "dump_syms"; - version = "2.1.0"; + version = "2.1.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage { owner = "mozilla"; repo = pname; rev = "v${version}"; - hash = "sha256-Q4opIGG1kOORECNB6al0oT4tjBe++ND6Eb4E86ED2+o="; + hash = "sha256-XK//loEbKqE7DMxC9uzr+916i9E9wGHKl2MRtt1rNEg="; }; - cargoSha256 = "sha256-j3bZaHFJEn/LW032CaRBaLN3Pb5GiQv1MReD0LFI8y8="; + cargoSha256 = "sha256-2We/JKU1U5q5jzl9rVoDmuGYIPbo5ylMl2O4s3PClVE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/eclint/default.nix b/pkgs/development/tools/eclint/default.nix index b3ababc56d57..86ee5a6f384a 100644 --- a/pkgs/development/tools/eclint/default.nix +++ b/pkgs/development/tools/eclint/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eclint"; - version = "0.3.6"; + version = "0.3.8"; src = fetchFromGitLab { owner = "greut"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+ZbBmdCl1v4msFFA2kzL/IQTQtR39O5XYgCj7w+QGzE="; + sha256 = "sha256-wAT+lc8cFf9zOZ72EwIeE2z5mCjGN8vpRoS1k15X738="; }; - vendorSha256 = "sha256-CdvxY3uX6i3Xtg50jqlNr+VXpeOeg8M27huasbzA96M="; + vendorHash = "sha256-6aIE6MyNDOLRxn+CYSCVNj4Q50HywSh/Q0WxnxCEtg8="; ldflags = [ "-X main.version=${version}" ]; diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index f433c54ad524..4a8f8bf2ac93 100644 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -18,13 +18,12 @@ , zlib }: -with lib; let pVersion = "1.13.0.20220615"; - pVersionTriple = splitVersion pVersion; - majorVersion = elemAt pVersionTriple 0; - minorVersion = elemAt pVersionTriple 1; - patchVersion = elemAt pVersionTriple 2; + pVersionTriple = lib.splitVersion pVersion; + majorVersion = lib.elemAt pVersionTriple 0; + minorVersion = lib.elemAt pVersionTriple 1; + patchVersion = lib.elemAt pVersionTriple 2; baseVersion = "${majorVersion}.${minorVersion}.${patchVersion}"; jdk = jdk11; in diff --git a/pkgs/development/tools/electron-fiddle/default.nix b/pkgs/development/tools/electron-fiddle/default.nix new file mode 100644 index 000000000000..5bfdb06600d0 --- /dev/null +++ b/pkgs/development/tools/electron-fiddle/default.nix @@ -0,0 +1,163 @@ +{ buildFHSUserEnv +, electron_20 +, fetchFromGitHub +, fetchYarnDeps +, fixup_yarn_lock +, git +, lib +, makeDesktopItem +, nodejs-16_x +, stdenvNoCC +, util-linux +, zip +}: + +let + pname = "electron-fiddle"; + version = "0.31.0"; + electron = electron_20; + nodejs = nodejs-16_x; + + src = fetchFromGitHub { + owner = "electron"; + repo = "fiddle"; + rev = "v${version}"; + hash = "sha256-GueLG+RYFHi3PVVxBTtpTHhfjygcQ6ZCbrp5n5I1gBM="; + }; + + inherit (nodejs.pkgs) yarn; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-WVH1A0wtQl5nR1hvaL6mzm/7XBvo311FPKmsxB82e4U="; + }; + + electronDummyMirror = "https://electron.invalid/"; + electronDummyDir = "nix"; + electronDummyFilename = + builtins.baseNameOf (builtins.head (electron.src.urls)); + electronDummyHash = + builtins.hashString "sha256" "${electronDummyMirror}${electronDummyDir}"; + + unwrapped = stdenvNoCC.mkDerivation { + pname = "${pname}-unwrapped"; + inherit version src; + + nativeBuildInputs = [ fixup_yarn_lock git nodejs util-linux yarn zip ]; + + configurePhase = '' + export HOME=$TMPDIR + fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror ${offlineCache} + yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules + + mkdir -p ~/.cache/electron/${electronDummyHash} + cp -ra '${electron}/lib/electron' "$TMPDIR/electron" + chmod -R u+w "$TMPDIR/electron" + (cd "$TMPDIR/electron" && zip -0Xr ~/.cache/electron/${electronDummyHash}/${electronDummyFilename} .) + ''; + + buildPhase = '' + ELECTRON_CUSTOM_VERSION='${electron.version}' \ + ELECTRON_MIRROR='${electronDummyMirror}' \ + ELECTRON_CUSTOM_DIR='${electronDummyDir}' \ + ELECTRON_CUSTOM_FILENAME='${electronDummyFilename}' \ + yarn --offline run package + ''; + + installPhase = '' + mkdir -p "$out/lib/electron-fiddle/resources" + cp "out/Electron Fiddle-"*/resources/app.asar "$out/lib/electron-fiddle/resources/" + mkdir -p "$out/share/icons/hicolor/scalable/apps" + cp assets/icons/fiddle.svg "$out/share/icons/hicolor/scalable/apps/electron-fiddle.svg" + ''; + }; + + desktopItem = makeDesktopItem { + name = "electron-fiddle"; + desktopName = "Electron Fiddle"; + comment = "The easiest way to get started with Electron"; + genericName = "Electron Fiddle"; + exec = "electron-fiddle %U"; + icon = "electron-fiddle"; + startupNotify = true; + categories = [ "GNOME" "GTK" "Utility" ]; + mimeTypes = [ "x-scheme-handler/electron-fiddle" ]; + }; + +in +buildFHSUserEnv { + name = "electron-fiddle"; + runScript = "${electron}/bin/electron ${unwrapped}/lib/electron-fiddle/resources/app.asar"; + extraInstallCommands = '' + mkdir -p "$out/share/icons/hicolor/scalable/apps" + ln -s "${unwrapped}/share/icons/hicolor/scalable/apps/electron-fiddle.svg" "$out/share/icons/hicolor/scalable/apps/" + mkdir -p "$out/share/applications" + cp "${desktopItem}/share/applications"/*.desktop "$out/share/applications/" + ''; + targetPkgs = pkgs: + with pkgs; + map lib.getLib [ + # for electron-fiddle itself + udev + + # for running Electron 22.0.0 inside + alsa-lib + atk + cairo + cups + dbus + expat + glib + gtk3 + libdrm + libnotify + libxkbcommon + mesa + nspr + nss + pango + xorg.libX11 + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxcb + + # for running Electron before 18.3.5/19.0.5/20.0.0 inside + gdk-pixbuf + + # for running Electron before 16.0.0 inside + xorg.libxshmfence + + # for running Electron before 11.0.0 inside + xorg.libXcursor + xorg.libXi + xorg.libXrender + xorg.libXtst + + # for running Electron before 10.0.0 inside + xorg.libXScrnSaver + + # for running Electron before 8.0.0 inside + libuuid + + # for running Electron before 4.0.0 inside + fontconfig + + # for running Electron before 3.0.0 inside + gnome2.GConf + + # Electron 2.0.8 is the earliest working version, due to + # https://github.com/electron/electron/issues/13972 + ]; + + meta = with lib; { + description = "The easiest way to get started with Electron"; + homepage = "https://www.electronjs.org/fiddle"; + license = licenses.mit; + maintainers = with maintainers; [ andersk ]; + platforms = electron.meta.platforms; + }; +} diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index e905d899452a..717f66b4ccf6 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -16,6 +16,7 @@ , libappindicator-gtk3 , libxshmfence , libglvnd +, wayland }@args: let @@ -23,7 +24,7 @@ let in rec { - electron = electron_21; + electron = electron_22; electron_9 = mkElectron "9.4.4" { x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450"; @@ -132,21 +133,30 @@ rec { headers = "09dbx4qh0rgp5mdm6srz6fgx12zq6b9jqq1k6l3gzyvwigi3wny1"; }; - electron_20 = mkElectron "20.1.3" { - armv7l-linux = "99710a57c55d95b540f4c3568da2a7caccb7f91da23b530c8c40db5ac861ab24"; - aarch64-linux = "8f39562f20210d7cdedbb063683d632df442c8553f62104c7d676121f3d9a357"; - x86_64-linux = "219fb6f01305669f78cf1881d257e3cc48e5563330338516f8b6592d85fdb4a3"; - x86_64-darwin = "134714291dcbecbf10cbc27c490a6501e2810bd4147a74f3b2671503445f2ce8"; - aarch64-darwin = "a09f83442f1e9f4b1edc07445a1dca73d9597529b23d62731eaa3fa0488f4ab0"; - headers = "11cv0p52864k4knwlwakiq8v6rxdv3iz6kvwhn0w8mpap2h5pzii"; + electron_20 = mkElectron "20.3.11" { + armv7l-linux = "709b9eb958e9488f6375811041179556b9cd0b8fc1eab6b899ef4a89423f98b2"; + aarch64-linux = "0f488ac9eeda2baa4c4e571fd75ac8e055dac9dcdf83051164232b1005a29224"; + x86_64-linux = "7899bf391ae35e10d78a5da622e506dd4ae859cd8c18953cd2dc54f1a5e5225e"; + x86_64-darwin = "751204887aa553c2a7811d3cb04d71e85359ccce2cf21d38e43eda24575ef4db"; + aarch64-darwin = "8ea1a446b41413b97d83d2955a4800c5f7c9061662f78c3e8d96827741f8e211"; + headers = "06s4z2hs9sbri4jsjrgybq0sn7rrx7zf3iwfg8da1wb6ahwqcd7w"; }; - electron_21 = mkElectron "21.2.1" { - armv7l-linux = "1f68ffacbcd0086c5bcbc726e3a0bd707b03acdf5c82d5cc44666b6e9a0d8a78"; - aarch64-linux = "78c1c6ecf5959e67fa6c67d82dc7deb170bc10d34d45265d6e972dd5b996bcb9"; - x86_64-linux = "d8aa2ea7b1a1421ca245ced1a9bdd77408bf7aee6f75c19d5e0e73dc120442b7"; - x86_64-darwin = "f20c0be6cb51bad1bb591ec1116be622e631cbc89876b2258c55579bbe52de30"; - aarch64-darwin = "2ac1bde2bbb4a265422e00eb5e1d81302b0c349b2db6e7bf1ee6f236a68b3d53"; - headers = "1c1g6jc0p678d5sr2w4irhfkj02vm4kb92b7cvimz8an0jwy58x7"; + electron_21 = mkElectron "21.4.0" { + armv7l-linux = "20ed4fab8b2046e10c999592ea06cd6ef13bc5826bcd7e8874c6e5e3b3cdb5b7"; + aarch64-linux = "5841060f67c23371f2739e043b51f56d04125fe781cc50e298590247477eacf2"; + x86_64-linux = "1c0da48b2b9d1fb320577429298397d67d94fbf5864d6a4f3c6eeadee3114f2e"; + x86_64-darwin = "3eea42022d21b6bb0416da8da787740b908febd2552e74cbac63bf403df0745a"; + aarch64-darwin = "aee691fd7da0343e09c4574d09e0d9962d2d1071f845ae57acf1fd9c76adbd3c"; + headers = "0zvwd3gz5y3yq5jgkswnarv75j05lfaz58w37fidq5aib1hi50hn"; + }; + + electron_22 = mkElectron "22.1.0" { + armv7l-linux = "9bad02cd8e8604400eb90d9bd8fa58b6e400321cea8db7e774908611f4fca2a2"; + aarch64-linux = "1d3e0011761f5ba05faf994a7f78cf518e49e0fef7e4528853e1bff9378d02cf"; + x86_64-linux = "543e5fa7f2b602c3cd7e62a358441faf6f490e738de9b0bd796ad65d6bbd35ee"; + x86_64-darwin = "969cad3fad6a03cbbc1658722cbf87547a8465c90dd4287fd5c03bd15bbf8a5b"; + aarch64-darwin = "4ebf838308e93ad9956f3ce3a14b8d41607ffec5cd2054818d0c91b79df101a2"; + headers = "1vydsk4fxk5hlpcs0r1s21gdr1kvxip8qc88ncs5w7ybqg31hzsh"; }; } diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 8c64b86b43a1..eee953862890 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -16,6 +16,7 @@ , libappindicator-gtk3 , libxshmfence , libglvnd +, wayland }: version: hashes: @@ -31,7 +32,7 @@ let ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ] ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - knownVulnerabilities = optional (versionOlder version "18.0.0") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "20.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { @@ -64,7 +65,7 @@ let }; electronLibPath = with lib; makeLibraryPath ( - [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ] + [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 wayland ] ++ optionals (versionAtLeast version "9.0.0") [ libdrm mesa ] ++ optionals (versionOlder version "10.0.0") [ libXScrnSaver ] ++ optionals (versionAtLeast version "11.0.0") [ libxkbcommon ] diff --git a/pkgs/development/tools/eliot-tree/default.nix b/pkgs/development/tools/eliot-tree/default.nix index adcedfe643c5..7188835e27d0 100644 --- a/pkgs/development/tools/eliot-tree/default.nix +++ b/pkgs/development/tools/eliot-tree/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "18gvijsm0vh3x83mv8dd80c3mpm80r7i111qsg4y7rj4i590phma"; }; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ testtools pytest ]; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index bafcca27474e..34a7a166efd6 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "esbuild"; - version = "0.15.14"; + version = "0.17.5"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-RcXVynR/dHI0Wn9gTQsYVjxqzAfeiI52Ph+hfpM9RhU="; + hash = "sha256-QLV6+1se3F7naG3jgXtSfmoTR0d7cFByRznzf+xjDpk="; }; - vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; subPackages = [ "cmd/esbuild" ]; @@ -20,6 +20,7 @@ buildGoModule rec { meta = with lib; { description = "An extremely fast JavaScript bundler"; homepage = "https://esbuild.github.io"; + changelog = "https://github.com/evanw/esbuild/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ lucus16 marsam ]; }; diff --git a/pkgs/development/tools/esbuild/netlify.nix b/pkgs/development/tools/esbuild/netlify.nix index 6520c53dd1f4..ddf5b301d345 100644 --- a/pkgs/development/tools/esbuild/netlify.nix +++ b/pkgs/development/tools/esbuild/netlify.nix @@ -7,28 +7,16 @@ buildGoModule rec { pname = "esbuild"; - version = "0.13.6"; + version = "0.14.39"; src = fetchFromGitHub { owner = "netlify"; repo = "esbuild"; - rev = "v${version}"; - sha256 = "0asjmqfzdrpfx2hd5hkac1swp52qknyqavsm59j8xr4c1ixhc6n9"; + rev = "5faa7ad54c99a953d05c06819298d2b6f8c82d80"; + sha256 = "pYiwGjgFMclPYTW0Qml7Pr/knT1gywUAGANra5aojYM="; }; - vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; - - patches = [ - # Both upstream patches update the same dependency "x/sys". It's required for darwin compatibility. - (fetchpatch { - url = "https://github.com/evanw/esbuild/commit/2567e099fcc6959e630f100b2c737ca80e88ba82.patch"; - hash = "sha256-KdX/Ru9TBX0mSDaS1ijxgzDI+2AoCvt6Wilhpca3VC0="; - }) - (fetchpatch { - url = "https://github.com/evanw/esbuild/commit/fd13718c6195afb9e63682476a774fa6d4483be0.patch"; - hash = "sha256-va/bXRBQf9qgE9LZXcKKAa0ZpMt/QG7BFClJ8bPWG1Y="; - }) - ]; + vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; passthru = { tests = { diff --git a/pkgs/development/tools/explain/default.nix b/pkgs/development/tools/explain/default.nix index f4fe53e1ce11..9b6e5fd763de 100644 --- a/pkgs/development/tools/explain/default.nix +++ b/pkgs/development/tools/explain/default.nix @@ -42,5 +42,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl3Plus; maintainers = with maintainers; [ McSinyx ]; platforms = platforms.unix; + # never built on aarch64-linux since first introduction in nixpkgs + broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/pkgs/development/tools/extism-cli/default.nix b/pkgs/development/tools/extism-cli/default.nix new file mode 100644 index 000000000000..dc96452a4175 --- /dev/null +++ b/pkgs/development/tools/extism-cli/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenvNoCC, fetchFromGitHub, python3, makeBinaryWrapper }: + +stdenvNoCC.mkDerivation rec { + pname = "extism-cli"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "extism"; + repo = "cli"; + rev = "97935786166e82154266b82410028482800e6061"; + sha256 = "sha256-LRzXuZQt5h3exw43UXUwLVIhveYVFw/SQ2YtHI9ZnWc="; + }; + + buildInputs = [ python3 ]; + nativeBuildInputs = [ makeBinaryWrapper ]; + + installPhase = '' + runHook preInstall + + install -D -m 755 ./extism_cli/__init__.py "$out/bin/extism" + + # The extism cli tries by default to install a library and header into /usr/local which does not work on NixOS. + # Pass a reasonable writable directory which can still be overwritten with another --prefix argument. + wrapProgram "$out/bin/extism" \ + --add-flags '--prefix $HOME/.local' + + runHook postInstall + ''; + + meta = with lib; { + description = "The extism CLI is used to manage Extism installations"; + homepage = "https://github.com/extism/cli"; + license = licenses.bsd3; + maintainers = with maintainers; [ borlaag ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/fastddsgen/default.nix b/pkgs/development/tools/fastddsgen/default.nix index 611b6c9933f4..cbe00b1ad51f 100644 --- a/pkgs/development/tools/fastddsgen/default.nix +++ b/pkgs/development/tools/fastddsgen/default.nix @@ -1,21 +1,21 @@ -{ lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle, openjdk11, git, perl, cmake }: +{ lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle, openjdk17, git, perl, cmake }: let pname = "fastddsgen"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-DDS-Gen"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-P0Fj8znhky8mTebnoNyojKDdnDowQaGXpX5L0CHcEeU="; + hash = "sha256-lxMv1hXjHFslJts63/FJPjj0mAKTluY/pNTvf15Oo9o="; }; # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { pname = "${pname}-deps"; inherit src version; - nativeBuildInputs = [ gradle openjdk11 perl ]; + nativeBuildInputs = [ gradle openjdk17 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d); @@ -39,7 +39,7 @@ in stdenv.mkDerivation { inherit pname src version; - nativeBuildInputs = [ gradle openjdk11 ]; + nativeBuildInputs = [ gradle openjdk17 ]; # use our offline deps postPatch = '' @@ -72,7 +72,7 @@ stdenv.mkDerivation { # Override the default start script to use absolute java path cat <$out/bin/fastddsgen #!${runtimeShell} - exec ${openjdk11}/bin/java -jar "$out/share/fastddsgen/java/fastddsgen.jar" "\$@" + exec ${openjdk17}/bin/java -jar "$out/share/fastddsgen/java/fastddsgen.jar" "\$@" EOF chmod a+x "$out/bin/fastddsgen" @@ -92,6 +92,6 @@ stdenv.mkDerivation { used to publish or subscribe. ''; maintainers = with maintainers; [ wentasah ]; - platforms = openjdk11.meta.platforms; + platforms = openjdk17.meta.platforms; }; } diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 69c4e9907804..07448b21bb80 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -1,12 +1,12 @@ -{ fetchFromGitLab +{ lib +, fetchFromGitLab , python -, lib , apksigner }: python.pkgs.buildPythonApplication rec { - version = "2.1.1"; pname = "fdroidserver"; + version = "2.1.1"; src = fetchFromGitLab { owner = "fdroid"; @@ -16,24 +16,28 @@ python.pkgs.buildPythonApplication rec { }; postPatch = '' - substituteInPlace fdroidserver/common.py --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'" + substituteInPlace fdroidserver/common.py \ + --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'" ''; preConfigure = '' ${python.interpreter} setup.py compile_catalog ''; + postInstall = '' patchShebangs gradlew-fdroid install -m 0755 gradlew-fdroid $out/bin ''; - buildInputs = [ python.pkgs.babel ]; + buildInputs = with python.pkgs; [ + babel + ]; propagatedBuildInputs = with python.pkgs; [ androguard clint defusedxml - GitPython + gitpython libcloud mwclient paramiko @@ -59,7 +63,7 @@ python.pkgs.buildPythonApplication rec { homepage = "https://f-droid.org"; description = "Server and tools for F-Droid, the Free Software repository system for Android"; license = licenses.agpl3; - maintainers = [ lib.maintainers.obfusk ]; + maintainers = with maintainers; [ obfusk ]; }; } diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index bc13fa471114..f11dd3994acd 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -46,13 +46,13 @@ let installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; in stdenv.mkDerivation rec { pname = "flatpak-builder"; - version = "1.2.2"; + version = "1.2.3"; outputs = [ "out" "doc" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-if2mjlN8Hp3gI1JpC9icMhenKRZFWNNfNbCPea2E4D4="; + sha256 = "sha256-4leCWkf3o+ceMPsPgPLZrG5IAfdG9VLfrw5WTj7jUcg="; }; patches = [ @@ -80,7 +80,9 @@ in stdenv.mkDerivation rec { # this on our patch for Flatpak 0.99. (substituteAll { src = ./fix-test-paths.patch; - inherit glibcLocales python2; + inherit glibcLocales; + # FIXME use python3 for tests that rely on python2 + # inherit python2; }) ]; @@ -137,7 +139,7 @@ in stdenv.mkDerivation rec { installedTestsDependencies = [ gnupg ostree - python2 + # FIXME python2 gnumake ]; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 7bbbfb4535d5..2921a7b39445 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.7.0"; + version = "9.12.0"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-HXLwC5T+hPbUTf4grKjCnhIMpqsFAz5yK6kH4XicLG8="; + sha256 = "sha256-8Zx+0lWaPAgPhxcvb84FzT2z58yAwDDLHegtXpRTr5M="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix index b6d1688e5e68..6509f371e4fc 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.32.0"; + version = "1.33.1"; src = fetchFromGitHub { owner = "Schniz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ttprb8w4EWq2F8TbeUt+rCc0paxLXkEzISnAskIstmo="; + sha256 = "sha256-dwnPFbgfrc+1qF3u5Nm1KQu84UWK6H6VerSUaQacbRs="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ]; - cargoSha256 = "sha256-6nw7q/XQ3EOaXmyiqJJjLSX4W9Mn9W5nfl8shUttBx0="; + cargoSha256 = "sha256-T88C5oYyVfepUw0cdNRhEwrvEI0t1gw/5qZL1E46pkY="; doCheck = false; diff --git a/pkgs/development/tools/fq/default.nix b/pkgs/development/tools/fq/default.nix index 8c76493430cc..3a66004bc3ad 100644 --- a/pkgs/development/tools/fq/default.nix +++ b/pkgs/development/tools/fq/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "fq"; - version = "0.0.10"; + version = "0.3.0"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - sha256 = "sha256-0/5MjnBP7Aeczky5VQ1N1siX4/Qw4rjlrWp8+kKaiFo="; + sha256 = "sha256-tMlHhfPocm+n2aHG/XXbhElwPau8IHxEm6IrYaszcNQ="; }; - vendorSha256 = "sha256-GwHQvL1XxQLkW8jvsKXIpQI5zdlZurQ4PqNFahBpYDc="; + vendorSha256 = "sha256-kfJfEvMHaPyDK9qkZVP07NByALxVwPcAKs9Kab6v4NE="; ldflags = [ "-s" diff --git a/pkgs/development/tools/frink/default.nix b/pkgs/development/tools/frink/default.nix new file mode 100644 index 000000000000..803fb63c5e6c --- /dev/null +++ b/pkgs/development/tools/frink/default.nix @@ -0,0 +1,54 @@ +{ fetchurl +, frink +, jdk +, lib +, rlwrap +, stdenv +, testers +}: +stdenv.mkDerivation rec { + pname = "frink"; + version = "2023-01-31"; + + src = fetchurl { + # Upstream does not provide versioned download links + url = "https://web.archive.org/web/20230202134810/https://frinklang.org/frinkjar/frink.jar"; + sha256 = "sha256-xs1FQvFPgeAxscAiwBBP8N8aYe0OlsYbH/vbzzCbYZc="; + }; + + dontUnpack = true; + + buildInputs = [ jdk rlwrap ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/lib + + cp ${src} $out/lib/frink.jar + + cat > "$out/bin/frink" << EOF + #!${stdenv.shell} + exec ${rlwrap}/bin/rlwrap ${jdk}/bin/java -classpath "$out/lib/frink.jar" frink.gui.FrinkStarter "\$@" + EOF + + chmod a+x "$out/bin/frink" + + runHook postInstall + ''; + + meta = with lib; { + description = "A practical calculating tool and programming language"; + homepage = "https://frinklang.org/"; + license = licenses.unfree; + sourceProvenance = [ sourceTypes.binaryBytecode ]; + maintainers = [ maintainers.stefanfehrenbach ]; + }; + + passthru.tests = { + callFrinkVersion = testers.testVersion { + package = frink; + command = "frink -e 'FrinkVersion[]'"; + }; + }; +} diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 3d2f3b867ca2..5a68519f660e 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.16.2"; + version = "3.16.14"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zZ4CueyDugaOY62KCyTcbF2QVvp0N8pI/ChmQSscn1w="; + sha256 = "sha256-6U4mYS5ukcOaxGeIiI2UFYlz0PpjKdtQH9cOshYRUg0="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-0pPSEYPGluuRsDuTa2wmDPY6PqG3+YeJG6mphf8X96M="; + vendorHash = "sha256-CbneZtwGab5dlGASZqa69Y70fXgt4PJzAODPJlcpJoA="; meta = with lib; { description = "Thrift improved"; diff --git a/pkgs/development/tools/garble/default.nix b/pkgs/development/tools/garble/default.nix index 0d01de127edf..d42a53beee9c 100644 --- a/pkgs/development/tools/garble/default.nix +++ b/pkgs/development/tools/garble/default.nix @@ -6,19 +6,19 @@ }: buildGoModule rec { pname = "garble"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "burrowers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T6iUhfBcHlz9oUuovwU4ljHh4y6PRd3sRhwG6RwuspM="; + sha256 = "sha256-f7coWG1CS4UL8GGqwADx5CvIk2sPONPlWW+JgRhFsb8="; }; - vendorSha256 = "sha256-lGU9jbeOM8tSYZGIqQhH5I2RlBGnqrA6JUQpuHrLwKU="; + vendorSha256 = "sha256-SOdIlu0QrQokl9j9Ff594+1K6twU1mCuECFQaVKaPV4="; # Used for some of the tests. - checkInputs = [git]; + nativeCheckInputs = [git]; preBuild = lib.optionalString (!stdenv.isx86_64) '' # The test assumex amd64 assembly diff --git a/pkgs/development/tools/gci/default.nix b/pkgs/development/tools/gci/default.nix new file mode 100644 index 000000000000..170b9c41dc9f --- /dev/null +++ b/pkgs/development/tools/gci/default.nix @@ -0,0 +1,25 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "gci"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "daixiang0"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-qWEEcIbTgYmGVnnTW+hM8e8nw5VLWN1TwzdUIZrxF3s="; + }; + + vendorSha256 = "sha256-dlt+i/pEP3RzW4JwndKTU7my2Nn7/2rLFlk8n1sFR60="; + + meta = with lib; { + description = "Controls golang package import order and makes it always deterministic"; + homepage = "https://github.com/daixiang0/gci"; + license = licenses.bsd3; + maintainers = with maintainers; [krostar]; + }; +} diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index 203178eed8d8..1171700ff99e 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { - version = "0.31.0"; + version = "0.32.0"; pname = "geckodriver"; src = fetchFromGitHub { owner = "mozilla"; repo = "geckodriver"; rev = "refs/tags/v${version}"; - sha256 = "sha256-sUu1D3HAxUTQFas4ylQ9LYC0dcKPyljoU+keENg17os="; + sha256 = "sha256-gYDfCPA2zsscZ4r4FcNgCvIMMm13/HACTvNoiK/c+LA="; }; - cargoSha256 = "sha256-alwsxC1xDAAhqMTkgmUO4iDDUAK0lisXn3Yxgo7ZBhg="; + cargoSha256 = "sha256-FlttmNHh0UVQ6xbo1eID+Ys34xp6zvKab4eoKIGujCU="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index 78631a64ee5e..d8a31630f2a8 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.5.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-jZadmIefrK3kSStbG1Q3+R08/lEaBE/yWNSpPFSLW6I="; + sha256 = "sha256-KqDGnEvPGIRz41IMaHhmDWTMvTRVhGHwGDd8IpzxVDE="; }; - vendorSha256 = "sha256-ZLDk61J7ci+OR1z3ddAfxeeDmRyTrVMHatc5thuCrl4="; + vendorHash = "sha256-jqDZmlCEgU4Nqc2vNH6NGdM74mywdVIj5v96tmRCvjQ="; # integration tests expect more file changes # types tests are missing CodeLocation diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index d2d7e523a94f..c09ec90207bb 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { sha256 = "sha256-CoreqnMRuPuv+Ci1uyF3HJCJFwK2jwB79okynv6AHTA="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; - checkInputs = with llvmPackages; [ + nativeCheckInputs = with llvmPackages; [ clang llvm ] ++ lib.optionals stdenv.isDarwin [ getconf ]; diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index 3f83e1fcb02f..fcebe93aaa2d 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -45,9 +45,11 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Live GLSL coding renderer"; - homepage = "http://patriciogonzalezvivo.com/2015/glslViewer/"; + homepage = "https://patriciogonzalezvivo.com/2015/glslViewer/"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.hodapp ]; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix index 5531823b8f5b..51f6eae6f341 100644 --- a/pkgs/development/tools/gnome-desktop-testing/default.nix +++ b/pkgs/development/tools/gnome-desktop-testing/default.nix @@ -33,9 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = nix-update-script { - attrPath = "gnome-desktop-testing"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/development/tools/go-bindata-assetfs/default.nix index 5131436e0248..dff78895fa57 100644 --- a/pkgs/development/tools/go-bindata-assetfs/default.nix +++ b/pkgs/development/tools/go-bindata-assetfs/default.nix @@ -1,18 +1,20 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "go-bindata-assetfs"; - version = "20160814-${rev}"; - rev = "e1a2a7e"; - goPackagePath = "github.com/elazarl/go-bindata-assetfs"; + version = "unstable-2022-04-12"; src = fetchFromGitHub { - inherit rev; owner = "elazarl"; repo = "go-bindata-assetfs"; - sha256 = "0b6q8h9fwpgpkvml1j87wq9174g7px1dmskhm884drpvswda2djk"; + rev = "de3be3ce9537d87338bf26ac211d02d4fa568bb8"; + hash = "sha256-yQgIaTl06nmIu8BfmQzrvEnlPQ2GQ/2nnvTmYXCL1oI="; }; + vendorHash = null; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "Serve embedded files from jteeuwen/go-bindata"; license = licenses.bsd2; diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index 2f40aed044bf..293f5c078ef9 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -1,20 +1,30 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "go-bindata"; version = "3.24.0"; - goPackagePath = "github.com/kevinburke/go-bindata"; - src = fetchFromGitHub { owner = "kevinburke"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dEfD5oV2nXLVg+a7PlB6LqhEBosG7eTptqKKDWcQAss="; + hash = "sha256-dEfD5oV2nXLVg+a7PlB6LqhEBosG7eTptqKKDWcQAss="; }; + vendorHash = null; + + patches = [ + # Add go modules support + (fetchpatch { + url = "https://github.com/kevinburke/go-bindata/commit/b5c6f880d411b9c24a8ae1c8b608ab80cb9aacb4.patch"; + hash = "sha256-dzzp5p+jdg09oo6jeSlms+MMMDWUXpsescj132MT6D8="; + }) + ]; + subPackages = [ "go-bindata" ]; + ldflags = [ "-s" "-w" ]; + meta = with lib; { homepage = "https://github.com/kevinburke/go-bindata"; changelog = "https://github.com/kevinburke/go-bindata/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index a1b406ff8666..9a8f20529537 100644 --- a/pkgs/development/tools/go-mockery/default.nix +++ b/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.14.1"; + version = "2.16.0"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-FgDjuiBFzOaT8GlJYI7xNfxC9uhyZtBAIBFXZgW0BDU="; + sha256 = "sha256-fd+ZR74tApbZEXfMqpUAMk22h9rMRmtByGSd8JcTtK0="; }; preCheck = '' @@ -22,7 +22,7 @@ buildGoModule rec { CGO_ENABLED = false; - vendorSha256 = "sha256-+40n7OoP8TLyjj4ehBHOD6/SqzJMCHsISE0FrXUL3Q8="; + vendorSha256 = "sha256-SRTxe3y+wQgxsj7ruquMG16dUEAa92rnTXceysWm+F8="; meta = with lib; { homepage = "https://github.com/vektra/mockery"; diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/development/tools/go-motion/default.nix index d06f6e5acd17..d7e686235af4 100644 --- a/pkgs/development/tools/go-motion/default.nix +++ b/pkgs/development/tools/go-motion/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-bD6Mm9/LOzguoK/xMpVEeT7G8j1shCsMv14wFostlW4="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/development/tools/go-swag/default.nix index aed802868a41..026433cabcb2 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.8.7"; + version = "1.8.10"; src = fetchFromGitHub { owner = "swaggo"; repo = "swag"; rev = "v${version}"; - sha256 = "sha256-HQ3VsYnPZGGZkeu8sc1sfKfRdOUWmdb98OQaIB62Yk4="; + sha256 = "sha256-PDK1TI99/8hAuyK4NOb357WZG0JBno8er8HMfus5V7Q="; }; - vendorSha256 = "sha256-iu4rSgB7Gu5n1Sgu0jU9QwdwvuZ5rAqysvKuBnJd2jQ="; + vendorHash = "sha256-iu4rSgB7Gu5n1Sgu0jU9QwdwvuZ5rAqysvKuBnJd2jQ="; subPackages = [ "cmd/swag" ]; diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix index e800a7328484..bd4411ad768c 100644 --- a/pkgs/development/tools/go-swagger/default.nix +++ b/pkgs/development/tools/go-swagger/default.nix @@ -1,27 +1,36 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "go-swagger"; - version = "0.30.3"; + version = "0.30.4"; src = fetchFromGitHub { owner = "go-swagger"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-QJ1C7JiLNwx7Up0cwRxtGUI2WA7gIaVZKsO+25joQ4E="; + rev = "refs/tags/v${version}"; + hash = "sha256-5jnSuJqy5oaRxmZh2rr1hoBJPS4S9s0FhMZ4AY61w1I="; }; - vendorSha256 = "sha256-F20/EQjlrwYzejLPcnuzb7K9RmbbrqU+MwzBO1MvhL4="; + vendorHash = "sha256-EVsJP04yBiquux5LRR23bGRzrLiXBO9VA8UGlZEpgi8="; doCheck = false; subPackages = [ "cmd/swagger" ]; - ldflags = [ "-s" "-w" "-X github.com/go-swagger/go-swagger/cmd/swagger/commands.Version=${version}" "-X github.com/go-swagger/go-swagger/cmd/swagger/commands.Commit=${src.rev}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/go-swagger/go-swagger/cmd/swagger/commands.Version=${version}" + "-X github.com/go-swagger/go-swagger/cmd/swagger/commands.Commit=${src.rev}" + ]; meta = with lib; { description = "Golang implementation of Swagger 2.0, representation of your RESTful API"; homepage = "https://github.com/go-swagger/go-swagger"; + changelog = "https://github.com/go-swagger/go-swagger/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ kalbasit ]; mainProgram = "swagger"; diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index c428c8160ecc..466f0ff2a0b9 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.18.0"; + version = "3.20.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-b5YNiMnk1tBk7kO4YWAU8cyg5oHhKu95ogTtZ3N/6IY="; + sha256 = "sha256-pKvotNUpZl51r+9+YFEQGXVsUBfxsmTZLnRIdrl7UGQ="; }; - vendorSha256 = "sha256-+DmnYd415FWgbY+gkDVWjnvbjTppfFV5NMpIE3Mm124="; + vendorHash = "sha256-AZtkWJ/U1dH9J+wowlcg25qBVyRRo6LCzc6IBYKBkVA="; doCheck = false; diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index bbbdbe5bab75..eac91732be11 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "goa"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - sha256 = "sha256-Z/J1L6fYuim6LkVh+LDrr3FLTZO7uQwHXRg0YTofkWA="; + sha256 = "sha256-KgCF44kpr8dAHzLgoRKXfd9warQUiFggGZ/Dy/49j1Q="; }; - vendorSha256 = "sha256-r/1huS/6qqS6TuqPQkwqKuYwye5DYQWYfBS1IcXWRgk="; + vendorHash = "sha256-d76aeiSkW0sZeFylWIkCoquWzX78s2iaDeX3VE8cYfI="; subPackages = [ "cmd/goa" ]; diff --git a/pkgs/development/tools/goconst/default.nix b/pkgs/development/tools/goconst/default.nix index 27e43fec9998..002f13c77e3a 100644 --- a/pkgs/development/tools/goconst/default.nix +++ b/pkgs/development/tools/goconst/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "sha256-chBWxOy9V4pO3hMaeCoKwnQxIEYiSejUOD3QDBCpaoE="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/gocyclo/default.nix b/pkgs/development/tools/gocyclo/default.nix index bef3d3e7507b..b8e0bb1c4f56 100644 --- a/pkgs/development/tools/gocyclo/default.nix +++ b/pkgs/development/tools/gocyclo/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-1IwtGUqshpLDyxH5NNkGUads1TKLs48eslNnFylGUPA="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; meta = with lib; { description = "Calculate cyclomatic complexities of functions in Go source code"; diff --git a/pkgs/development/tools/goda/default.nix b/pkgs/development/tools/goda/default.nix index 3af0ef315240..0564cfa31577 100644 --- a/pkgs/development/tools/goda/default.nix +++ b/pkgs/development/tools/goda/default.nix @@ -2,20 +2,18 @@ buildGoModule rec { pname = "goda"; - version = "0.5.3"; + version = "0.5.5"; src = fetchFromGitHub { owner = "loov"; repo = "goda"; rev = "v${version}"; - sha256 = "sha256-qBuhwIQvfUZMyzCJ/7Kedc+InrGwpcLhDLvX9i0ws2A="; + sha256 = "sha256-yKhgk/DRcifh+exxTZFti1Aac/sgpvUsNKdioLAzmX0="; }; vendorSha256 = "sha256-BYYuB4ZlCWD8NILkf4qrgM4q72ZTy7Ze3ICUXdoI5Ms="; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://github.com/loov/goda"; diff --git a/pkgs/development/tools/godot/3/dont_clobber_environment.patch b/pkgs/development/tools/godot/3/dont_clobber_environment.patch index 74e1241513ba..cfd3113a6aae 100644 --- a/pkgs/development/tools/godot/3/dont_clobber_environment.patch +++ b/pkgs/development/tools/godot/3/dont_clobber_environment.patch @@ -1,19 +1,23 @@ -diff --git a/SConstruct b/SConstruct -index d138c7b250..c925bf908e 100644 +scons does not use os environment by default: + https://scons.org/doc/2.1.0/HTML/scons-user/x1750.html + +nixpkgs' cc-wrapper on the other hand relies on various NIX_* variables +to be passed through like NIX_CFLAGS_COMPILE_BEFORE. --- a/SConstruct +++ b/SConstruct -@@ -65,10 +65,10 @@ elif platform_arg == "javascript": - # want to have to pull in manually. - # Then we prepend PATH to make it take precedence, while preserving SCons' own entries. - env_base = Environment(tools=custom_tools) +@@ -67,14 +67,7 @@ elif platform_arg == "javascript": + elif os.name == "nt" and methods.get_cmdline_bool("use_mingw", False): + custom_tools = ["mingw"] + +-# We let SCons build its default ENV as it includes OS-specific things which we don't +-# want to have to pull in manually. +-# Then we prepend PATH to make it take precedence, while preserving SCons' own entries. +-env_base = Environment(tools=custom_tools) -env_base.PrependENVPath("PATH", os.getenv("PATH")) -env_base.PrependENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH")) -if "TERM" in os.environ: # Used for colored output. - env_base["ENV"]["TERM"] = os.environ["TERM"] -+for k in ("TERM", "PATH", "PKG_CONFIG_PATH"): -+ if (k in os.environ): -+ env_base["ENV"][k] = os.environ[k] -+ - ++env_base = Environment(ENV = os.environ, tools=custom_tools) + env_base.disabled_modules = [] env_base.use_ptrcall = False diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index 177e2448cc31..5732b8f44f62 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -1,38 +1,49 @@ { stdenv , lib , fetchFromGitHub -, installShellFiles -, autoPatchelfHook , pkg-config +, autoPatchelfHook +, installShellFiles , scons , vulkan-loader +, libGL , libX11 , libXcursor , libXinerama -, libXi -, libXrandr , libXext +, libXrandr +, libXrender +, libXi , libXfixes -, libGLU -, freetype +, libxkbcommon , alsa-lib , libpulseaudio , dbus , speechd , fontconfig , udev -, withPulseaudio ? false +, withPlatform ? "linuxbsd" +, withTarget ? "editor" +, withPrecision ? "single" +, withPulseaudio ? true , withDbus ? true -, withSpeechd ? false +, withSpeechd ? true , withFontconfig ? true , withUdev ? true , withTouch ? true }: +assert lib.asserts.assertOneOf "withPrecision" withPrecision [ "single" "double" ]; + let - # Options from godot/platform/linuxbsd/detect.py options = { - pulseaudio = withPulseaudio; + # Options from 'godot/SConstruct' + platform = withPlatform; + target = withTarget; + precision = withPrecision; # Floating-point precision level + + # Options from 'godot/platform/linuxbsd/detect.py' + pulseaudio = withPulseaudio; # Use PulseAudio dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support fontconfig = withFontconfig; # Use fontconfig for system fonts support @@ -42,13 +53,13 @@ let in stdenv.mkDerivation rec { pname = "godot"; - version = "4.0-beta3"; + version = "4.0-beta16"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; - rev = "01ae26d31befb6679ecd92cd3c73aa5a76162e95"; - sha256 = "sha256-Q+zMviGevezjcQKJPOm7zAu4liJ5z8Rl73TYmjRR3MY="; + rev = "518b9e5801a19229805fe837d7d0cf92920ad413"; + sha256 = "sha256-45x4moHOn/PWRazuJ/CBb3WYaPZqv4Sn8ZIugUSaVjY="; }; nativeBuildInputs = [ @@ -59,39 +70,34 @@ stdenv.mkDerivation rec { buildInputs = [ scons - libGLU - libX11 - libXcursor - libXinerama - libXi - libXrandr - libXext - libXfixes - ] - ++ runtimeDependencies - # Necessary to make godot see fontconfig.lib and dbus.lib - ++ lib.optional withFontconfig fontconfig - ++ lib.optional withDbus dbus; + ]; runtimeDependencies = [ vulkan-loader + libGL + libX11 + libXcursor + libXinerama + libXext + libXrandr + libXrender + libXi + libXfixes + libxkbcommon alsa-lib ] ++ lib.optional withPulseaudio libpulseaudio + ++ lib.optional withDbus dbus ++ lib.optional withDbus dbus.lib ++ lib.optional withSpeechd speechd + ++ lib.optional withFontconfig fontconfig ++ lib.optional withFontconfig fontconfig.lib ++ lib.optional withUdev udev; - patches = [ - # Godot expects to find xfixes inside xi, but nix's pkg-config only - # gives the libs for the requested package (ignoring the propagated-build-inputs) - ./xfixes.patch - ]; - enableParallelBuilding = true; - sconsFlags = "platform=linuxbsd target=editor production=true"; + # Options from 'godot/SConstruct' and 'godot/platform/linuxbsd/detect.py' + sconsFlags = [ "production=true" ]; preConfigure = '' sconsFlags+=" ${ lib.concatStringsSep " " diff --git a/pkgs/development/tools/godot/4/xfixes.patch b/pkgs/development/tools/godot/4/xfixes.patch deleted file mode 100644 index b3d0b7aa3cc5..000000000000 --- a/pkgs/development/tools/godot/4/xfixes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py -index ac69f3806b..14acbf5c58 100644 ---- a/platform/linuxbsd/detect.py -+++ b/platform/linuxbsd/detect.py -@@ -191,6 +191,7 @@ def configure(env: "Environment"): - env.ParseConfig("pkg-config xrandr --cflags --libs") - env.ParseConfig("pkg-config xrender --cflags --libs") - env.ParseConfig("pkg-config xi --cflags --libs") -+ env.ParseConfig("pkg-config xfixes --cflags --libs") - - if env["touch"]: - env.Append(CPPDEFINES=["TOUCH_ENABLED"]) diff --git a/pkgs/development/tools/gojq/default.nix b/pkgs/development/tools/gojq/default.nix index 5c85a5c17418..e1690aea4d1f 100644 --- a/pkgs/development/tools/gojq/default.nix +++ b/pkgs/development/tools/gojq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gojq"; - version = "0.12.9"; + version = "0.12.11"; src = fetchFromGitHub { owner = "itchyny"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AII3mC+JWOP0x4zf8FQdRhOmckPgY7BDRoKICCFkn9Q="; + hash = "sha256-xJx3ge+8cIGL1j5vnU4JhCcwmXIRhJ66PYnEG223Fbc="; }; - vendorSha256 = "sha256-RtackQ4uJo1j2jePu9xd0idQBKbwBh4L2spiS2mRynw="; + vendorHash = "sha256-BnDtHqqU/kFJyeG1g4UZ51eSnUlbQ6eRKTFoz6kxl0s="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 913cde8ca493..ccd230cc5f5c 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.50.1"; + version = "1.51.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-7HoneQtKxjQVvaTdkjPeu+vJWVOZG3AOiRD87/Ntgn8="; + hash = "sha256-mmnzbgnu/S9DhFY5JQSs8U5tvsGqIcDaX5Y7dhCgr68="; }; - vendorSha256 = "sha256-6ttRd2E8Zsf/2StNYt6JSC64A57QIv6EbwAwJfhTDaY="; + vendorHash = "sha256-QoUxZBl0wOpbD2xPCQAeTNiLxdtXZ3+KWB/TLSt53v4="; doCheck = false; diff --git a/pkgs/development/tools/golines/default.nix b/pkgs/development/tools/golines/default.nix new file mode 100644 index 000000000000..30a948f8bbc4 --- /dev/null +++ b/pkgs/development/tools/golines/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "golines"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "segmentio"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-2K9KAg8iSubiTbujyFGN3yggrL+EDyeUCs9OOta/19A="; + }; + + vendorSha256 = "sha256-rxYuzn4ezAxaeDhxd8qdOzt+CKYIh03A9zKNdzILq18="; + + meta = with lib; { + description = "A golang formatter that fixes long lines"; + homepage = "https://github.com/segmentio/golines"; + license = licenses.mit; + maintainers = with maintainers; [ meain ]; + }; +} diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/development/tools/gore/default.nix index a8e393a050e7..87b86b9b0231 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.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "motemen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZNv3sqwOEtxjvyqC9oR8xYwo8sywU2MF8ngBw407/ko="; + sha256 = "sha256-Z2WOgkgi/JK/s0961FvgboJwYtxbFdRSzzPiE74SVaY="; }; - vendorSha256 = "sha256-HrdNWsUVz5G5tG/ZFz2z1Vt4kM12I088/6OIkRFyDl8="; + vendorHash = "sha256-1ftO+Bjc+vqB/azn4K6iRNrCLrz+QjpPzNfja3yvOrs="; doCheck = false; diff --git a/pkgs/development/tools/goresym/default.nix b/pkgs/development/tools/goresym/default.nix index ac804f6d11c5..f2cf1f8a48ff 100644 --- a/pkgs/development/tools/goresym/default.nix +++ b/pkgs/development/tools/goresym/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "goresym"; - version = "1.5"; + version = "2.1"; src = fetchFromGitHub { owner = "mandiant"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j548FzbxrtJz2N5y9ItO6F+52vQ+2RVCFPUW1cqeJUA="; + sha256 = "sha256-v7rZBVpQMuEoIK9JIXCJnSjMDe3wrtJvL766MN6VmFo="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-dnQ/tP4RS6WkACobfW7jTTJSHbLrdlZDy1fmO65743Q="; + vendorSha256 = "sha256-ElV5edbe1LQWbA1NKv52/rLZJeOLBahE4YBKg9OA7YY="; doCheck = true; diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix index c4c0b7cbb06f..9fa71187aa31 100644 --- a/pkgs/development/tools/gotags/default.nix +++ b/pkgs/development/tools/gotags/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "gotags"; version = "1.4.1"; @@ -8,10 +8,20 @@ buildGoPackage rec { owner = "jstemmer"; repo = pname; rev = "4c0c4330071a994fbdfdff68f412d768fbcca313"; - sha256 = "sha256-cHTgt+zW6S6NDWBE6NxSXNPdn84CLD8WmqBe+uXN8sA="; + hash = "sha256-cHTgt+zW6S6NDWBE6NxSXNPdn84CLD8WmqBe+uXN8sA="; }; - goPackagePath = "github.com/jstemmer/gotags"; + vendorHash = null; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/jstemmer/gotags/commit/9146999bce9a88e15b5f123d1aa1613926dd9a9c.patch"; + hash = "sha256-6v/Ws15y50S6iCI1c0kEw5WHSg+1WqVT4mwdQKoi5G8="; + }) + ]; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "ctags-compatible tag generator for Go"; diff --git a/pkgs/development/tools/gotestfmt/default.nix b/pkgs/development/tools/gotestfmt/default.nix new file mode 100644 index 000000000000..9c7819653169 --- /dev/null +++ b/pkgs/development/tools/gotestfmt/default.nix @@ -0,0 +1,23 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "gotestfmt"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "gotesttools"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Rb/nIsHISzvqd+jJU4TNrHbailvgGEq4y0JuM9IdA3w="; + }; + + vendorHash = null; + + meta = with lib; { + description = "Go test output for humans"; + homepage = "https://github.com/gotesttools/gotestfmt"; + changelog = "https://github.com/GoTestTools/gotestfmt/releases/tag/v${version}"; + license = licenses.unlicense; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index 09c6e4b77ae4..7ee87aa3f10c 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -1,26 +1,34 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib +, fetchFromGitHub +, buildGoModule +}: buildGoModule rec { pname = "gotestsum"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; - rev = "v${version}"; - sha256 = "sha256-BpT5FxqDOLnlWtOHMqwruR/CkD46xEgU7D8sAzsVO14="; + rev = "refs/tags/v${version}"; + hash = "sha256-22srQmvbVu8eWVAbLDZG93yod/bJS6hfoc/YwFs64pY="; }; - vendorSha256 = "sha256-zUqa6xlDV12ZV4N6+EZ7fLPsL8U+GB7boQ0qG9egvm0="; + vendorHash = "sha256-zUqa6xlDV12ZV4N6+EZ7fLPsL8U+GB7boQ0qG9egvm0="; doCheck = false; - ldflags = [ "-s" "-w" "-X gotest.tools/gotestsum/cmd.version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X gotest.tools/gotestsum/cmd.version=${version}" + ]; subPackages = [ "." ]; meta = with lib; { homepage = "https://github.com/gotestyourself/gotestsum"; + changelog = "https://github.com/gotestyourself/gotestsum/releases/tag/v${version}"; description = "A human friendly `go test` runner"; platforms = platforms.linux ++ platforms.darwin; license = licenses.asl20; diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/development/tools/grpc-gateway/default.nix index 3870e87dcb45..54e6ccd471dc 100644 --- a/pkgs/development/tools/grpc-gateway/default.nix +++ b/pkgs/development/tools/grpc-gateway/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-gateway"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; rev = "v${version}"; - sha256 = "sha256-lnNdsDCpeSHtl2lC1IhUw11t3cnGF+37qSM7HDvKLls="; + sha256 = "sha256-NOcV3XrSFeb/LYzeZQ0M1l1l4TkC+fVqAXCDUTaMN3c="; }; - vendorSha256 = "sha256-dGdnDuRbwg8fU7uB5GaHEWa/zI3w06onqjturvooJQA="; + vendorSha256 = "sha256-zYKRWJ09SnE0Y9iahTyODas/04an8x9w+rsY0x4/NRM="; meta = with lib; { description = diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index e7ba49fa68dc..48a473be169b 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,6 +1,6 @@ { lib , stdenv -, supportedGhcVersions ? [ "90" ] +, supportedGhcVersions ? [ "92" ] , dynamic ? true , haskellPackages , haskell @@ -40,23 +40,21 @@ let "ln -s ${ tunedHls (getPackages version) }/bin/haskell-language-server $out/bin/${x}") (targets version); - pkg = tunedHls haskellPackages; -in stdenv.mkDerivation { +in assert supportedGhcVersions != []; stdenv.mkDerivation { pname = "haskell-language-server"; version = haskellPackages.haskell-language-server.version; buildCommand = '' mkdir -p $out/bin - ln -s ${pkg}/bin/haskell-language-server $out/bin/haskell-language-server - ln -s ${pkg}/bin/haskell-language-server-wrapper $out/bin/haskell-language-server-wrapper + ln -s ${tunedHls (getPackages (builtins.head supportedGhcVersions))}/bin/haskell-language-server-wrapper $out/bin/haskell-language-server-wrapper ${concatMapStringsSep "\n" makeSymlinks supportedGhcVersions} ''; meta = haskellPackages.haskell-language-server.meta // { maintainers = [ lib.maintainers.maralorn ]; longDescription = '' - This package provides haskell-language-server, haskell-language-server-wrapper, ${ + This package provides the executables ${ concatMapStringsSep ", " (x: concatStringsSep ", " (targets x)) supportedGhcVersions - }. + } and haskell-language-server-wrapper. You can choose for which ghc versions to install hls with pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92" ]; }. ''; }; diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix index 0b0a9778c361..b563fa4b7a75 100644 --- a/pkgs/development/tools/haskell/lambdabot/default.nix +++ b/pkgs/development/tools/haskell/lambdabot/default.nix @@ -20,8 +20,8 @@ let allPkgs = pkgs: mueval.defaultPkgs pkgs ++ [ pkgs.lambdabot-trusted ] ++ pac ++ lib.optional withDjinn haskellPackages.djinn ++ lib.optional (aspell != null) aspell ); - modulesStr = lib.replaceChars ["\n"] [" "] modules; - configStr = lib.replaceChars ["\n"] [" "] configuration; + modulesStr = lib.replaceStrings ["\n"] [" "] modules; + configStr = lib.replaceStrings ["\n"] [" "] configuration; in haskellLib.overrideCabal (self: { patches = (self.patches or []) ++ [ ./custom-config.patch ]; diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index 4f51c8238ce0..bde2dce30eeb 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -19,6 +19,7 @@ , parser-combinators , retry , lib +, quickcheck-instances , text , unix , unordered-containers @@ -28,13 +29,13 @@ }: mkDerivation rec { pname = "vaultenv"; - version = "0.14.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "channable"; repo = "vaultenv"; rev = "v${version}"; - sha256 = "sha256-sH4iaKQXgwI/WISXzMR7xqh9Dyx61U/gjYn7exgUetI="; + sha256 = "sha256-yoYkAypH+HQSVTvd/qKNFkL5krbB5mZw3ec9ojvy+Pw="; }; buildTools = [ hpack ]; @@ -86,6 +87,7 @@ mkDerivation rec { optparse-applicative parser-combinators retry + quickcheck-instances text unix unordered-containers diff --git a/pkgs/development/tools/hatch/default.nix b/pkgs/development/tools/hatch/default.nix index 952a8ecb16cb..f7604220f3aa 100644 --- a/pkgs/development/tools/hatch/default.nix +++ b/pkgs/development/tools/hatch/default.nix @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { virtualenv ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ git pytestCheckHook pytest-mock @@ -63,6 +63,9 @@ python3.pkgs.buildPythonApplication rec { "test_editable_pth" # AssertionError: assert len(extract_installed_requirements(output.splitlines())) > 0 "test_creation_allow_system_packages" + ] ++ lib.optionals stdenv.isDarwin [ + # https://github.com/NixOS/nixpkgs/issues/209358 + "test_scripts_no_environment" ]; meta = with lib; { diff --git a/pkgs/development/tools/hclfmt/default.nix b/pkgs/development/tools/hclfmt/default.nix index dc31aa23ac24..b21b1be54d8e 100644 --- a/pkgs/development/tools/hclfmt/default.nix +++ b/pkgs/development/tools/hclfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hclfmt"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; rev = "v${version}"; - hash = "sha256-bGxgL/Vajy2AtYtSE5/RoURvHHyajpXpR8m7DUeqsks="; + hash = "sha256-dsso9KQMZhFgnN6CxoQbXRnjbfaKeLRA8ZEYc9NYEe0="; }; - vendorSha256 = "sha256-QZzDFVAmmjkm7n/KpMxDMAjShKiVVGZbZB1W3/TeVjs="; + vendorHash = "sha256-QZzDFVAmmjkm7n/KpMxDMAjShKiVVGZbZB1W3/TeVjs="; # The code repository includes other tools which are not useful. Only build # hclfmt. diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index a8ef9a160969..758a4c1fbaa6 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hcloud"; - version = "1.30.4"; + version = "1.31.1"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-282DJegj4lf7oynkdjNC6/PVvQaFbIqOJViua83KTdg="; + sha256 = "sha256-GyUobaU8ZJG/LrMM2LevBBhZN70grx6iJIMRxBRMqBg="; }; - vendorSha256 = "sha256-Y2HlY8u2ZFtkAyYG7jqm+DMOFsWSQ6TxI7dm2woGA/Y="; + vendorSha256 = "sha256-sSsu8p9dHLzJRWSLQHQNMmoziOrlDL4BoLIcBo2REbQ="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 7880ef5ae67e..683e701b07d5 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.60.2"; + version = "7.66.4"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "sha256-HKVfUT59TBrY9Sk/CxhD3ujT+Q3iEcBI50Bbu1MWOxY="; + sha256 = "sha256-AAiC88RBqR5RXeIj39in7hlvI3JNQB6KUwGmt9jo93A="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/hjson-go/default.nix b/pkgs/development/tools/hjson-go/default.nix index 7b8509173220..bab12da8eb6a 100644 --- a/pkgs/development/tools/hjson-go/default.nix +++ b/pkgs/development/tools/hjson-go/default.nix @@ -1,23 +1,30 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "hjson-go"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "hjson"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bw8dQKwHqEzBpDT+59XjzhxDrA3R0OiEUyIWMULuAQI="; + hash = "sha256-WR6wLa/Za5MgcH1enHG/74uq/7PdaY/OzvJdgMgDFIk="; }; vendorSha256 = null; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + ]; meta = with lib; { description = "Utility to convert JSON to and from HJSON"; homepage = "https://hjson.github.io/"; + changelog = "https://github.com/hjson/hjson-go/releases/tag/v${version}"; maintainers = with maintainers; [ ehmry ]; license = licenses.mit; mainProgram = "hjson-cli"; diff --git a/pkgs/development/tools/hostess/default.nix b/pkgs/development/tools/hostess/default.nix index 47eab1abd8ef..0d32f835f87f 100644 --- a/pkgs/development/tools/hostess/default.nix +++ b/pkgs/development/tools/hostess/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = null; meta = with lib; { description = "An idempotent command-line utility for managing your /etc/hosts* file."; diff --git a/pkgs/development/tools/hred/default.nix b/pkgs/development/tools/hred/default.nix new file mode 100644 index 000000000000..5e9b7f9122b9 --- /dev/null +++ b/pkgs/development/tools/hred/default.nix @@ -0,0 +1,32 @@ +{ lib, buildNpmPackage, fetchFromGitHub, runCommand, hred, jq }: + +buildNpmPackage rec { + pname = "hred"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "danburzo"; + repo = "hred"; + rev = "v${version}"; + hash = "sha256-rnobJG9Z1lXEeFm+c0f9OsbiTzxeP3+zut5LYpGzWfc="; + }; + + npmDepsHash = "sha256-POxlGWK0TJMwNWDpiK5+OXLGtAx4lFJO3imoe/h+7Sc="; + + dontNpmBuild = true; + + passthru.tests = { + simple = runCommand "${pname}-test" {} '' + set -e -o pipefail + echo 'bar' | ${hred}/bin/hred 'i#foo { @id => id, @.textContent => text }' -c | ${jq}/bin/jq -c > $out + [ "$(cat $out)" = '{"id":"foo","text":"bar"}' ] + ''; + }; + + meta = { + description = "A command-line tool to extract data from HTML"; + license = lib.licenses.mit; + homepage = "https://github.com/danburzo/hred"; + maintainers = with lib.maintainers; [ tejing ]; + }; +} diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index 6695716aa67f..584b8856e89f 100644 --- a/pkgs/development/tools/iaca/2.1.nix +++ b/pkgs/development/tools/iaca/2.1.nix @@ -1,5 +1,4 @@ { lib, stdenv, makeWrapper, requireFile, gcc, unzip }: -with lib; # v2.1: last version with NHM/WSM arch support stdenv.mkDerivation rec { @@ -17,17 +16,17 @@ stdenv.mkDerivation rec { cp bin/iaca $out/bin/ cp lib/* $out/lib ''; - preFixup = let libPath = makeLibraryPath [ stdenv.cc.cc.lib gcc ]; in '' + preFixup = let libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib gcc ]; in '' patchelf \ --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \ --set-rpath $out/lib:"${libPath}" \ $out/bin/iaca ''; postFixup = "wrapProgram $out/bin/iaca --set LD_LIBRARY_PATH $out/lib"; - meta = { + meta = with lib; { description = "Intel Architecture Code Analyzer"; homepage = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kazcw ]; diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix index b5ad92cc0821..1c0a4f5460fd 100644 --- a/pkgs/development/tools/iaca/3.0.nix +++ b/pkgs/development/tools/iaca/3.0.nix @@ -1,5 +1,4 @@ { lib, stdenv, requireFile, unzip }: -with lib; stdenv.mkDerivation rec { pname = "iaca"; @@ -15,10 +14,10 @@ stdenv.mkDerivation rec { cp iaca $out/bin patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $out/bin/iaca ''; - meta = { + meta = with lib; { description = "Intel Architecture Code Analyzer"; homepage = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kazcw ]; diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix index 095055cbedce..50a496d93824 100644 --- a/pkgs/development/tools/icr/default.nix +++ b/pkgs/development/tools/icr/default.nix @@ -33,7 +33,7 @@ crystal.buildCrystalPackage rec { postFixup = '' wrapProgram $out/bin/icr \ - --prefix PATH : ${lib.makeBinPath [ crystal shards makeWrapper which ]} + --prefix PATH : ${lib.makeBinPath [ crystal shards which ]} ''; meta = with lib; { diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix index 16e392b6bbc4..c472d9b0b0fe 100644 --- a/pkgs/development/tools/ineffassign/default.nix +++ b/pkgs/development/tools/ineffassign/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { allowGoReference = true; - checkInputs = [ go ]; + nativeCheckInputs = [ go ]; meta = with lib; { description = "Detect ineffectual assignments in Go code"; diff --git a/pkgs/development/tools/inferno/default.nix b/pkgs/development/tools/inferno/default.nix index 834a32d65b5b..bbc7fbde5541 100644 --- a/pkgs/development/tools/inferno/default.nix +++ b/pkgs/development/tools/inferno/default.nix @@ -1,26 +1,23 @@ -{ fetchCrate, lib, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "inferno"; - version = "0.11.7"; + version = "0.11.14"; - # github version doesn't have a Cargo.lock - src = fetchCrate { - inherit pname version; - sha256 = "sha256-HZBCLgWC9yEo3lY7If18SILKZV3rwHv7FBVdumiTbJg="; + src = fetchFromGitHub { + owner = "jonhoo"; + repo = pname; + rev = "v${version}"; + hash = "sha256-0H+h4BM4x3vlI6EMeXNzcCQpW2S4czJR2GaviZ0nhEM="; + fetchSubmodules = true; }; - cargoSha256 = "sha256-upO+G9569NXFuc2vpxR6E4nxJqCjg+RMlxV7oKb7v1E="; + cargoHash = "sha256-5VQNgZUgakQUczKs7T+c305c3I1DDSaVMO3tFXqIdIc="; - # these tests depend on a patched version of flamegraph which is included in - # the github repository as a submodule, but absent from the crates version + # skip flaky tests checkFlags = [ - "--skip=collapse::dtrace::tests::test_collapse_multi_dtrace" - "--skip=collapse::dtrace::tests::test_collapse_multi_dtrace_simple" - "--skip=collapse::perf::tests::test_collapse_multi_perf" - "--skip=collapse::perf::tests::test_collapse_multi_perf_simple" - "--skip=collapse::perf::tests::test_multiple_skip_after" - "--skip=collapse::perf::tests::test_one_skip_after" + "--skip=flamegraph_base_symbol" + "--skip=flamegraph_multiple_base_symbol" ]; meta = with lib; { diff --git a/pkgs/development/tools/java/sawjap/default.nix b/pkgs/development/tools/java/sawjap/default.nix index b4c682bbd220..0686d4fb2ed4 100644 --- a/pkgs/development/tools/java/sawjap/default.nix +++ b/pkgs/development/tools/java/sawjap/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation { prePatch = "cd test"; - buildInputs = [ ocaml findlib sawja ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ sawja ]; buildPhase = '' runHook preBuild diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index e2697e2fced1..2a1197cae0c8 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.97.0"; + version = "0.102.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-36yDwNHnDY/wA/juD2e8hf3Xm22aWcNy3SqAhN8FCo8="; + sha256 = "sha256-5T0MQ1b1kA7MVm2drNbUdK6CitTjT76ORPN/BJmsmsM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/jet/default.nix b/pkgs/development/tools/jet/default.nix index aa5a40403c0c..bf34d472be80 100644 --- a/pkgs/development/tools/jet/default.nix +++ b/pkgs/development/tools/jet/default.nix @@ -2,32 +2,22 @@ buildGraalvmNativeImage rec { pname = "jet"; - version = "0.1.0"; + version = "0.4.23"; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-RCEIIZfPmOLW3akjEgaEas4xOtYxL6lQsxDv2szB8K4"; - }; - - reflectionJson = fetchurl { - url = "https://raw.githubusercontent.com/borkdude/${pname}/v${version}/reflection.json"; - sha256 = "sha256-mOUiKEM5tYhtpBpm7KtslyPYFsJ+Wr+4ul6Zi4aS09Q="; + sha256 = "sha256-ijqMyzmF1C3+5oT3ho1MSkoGuFJGvjhh7WWF/JDV/j8="; }; extraNativeImageBuildArgs = [ "-H:+ReportExceptionStackTraces" - "-J-Dclojure.spec.skip-macros=true" - "-J-Dclojure.compiler.direct-linking=true" - "-H:IncludeResources=JET_VERSION" - "-H:ReflectionConfigurationFiles=${reflectionJson}" - "--initialize-at-build-time" "-H:Log=registerResource:" "--no-fallback" "--no-server" ]; meta = with lib; { - description = "CLI to transform between JSON, EDN and Transit, powered with a minimal query language"; + description = "CLI to transform between JSON, EDN, YAML and Transit, powered with a minimal query language"; homepage = "https://github.com/borkdude/jet"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; diff --git a/pkgs/development/tools/jfmt/default.nix b/pkgs/development/tools/jfmt/default.nix index cf1292b4b121..45a18edfffbe 100644 --- a/pkgs/development/tools/jfmt/default.nix +++ b/pkgs/development/tools/jfmt/default.nix @@ -2,20 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "jfmt"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "scruffystuffs"; repo = "${pname}.rs"; - rev = version; - sha256 = "07qb0sjwww6d2n7fw8w4razq1mkn4psrs9wqi1ccndrya1y39d8b"; + rev = "v${version}"; + hash = "sha256-X3wk669G07BTPAT5xGbAfIu2Qk90aaJIi1CLmOnSG80="; }; - cargoSha256 = "19kg2n53y9nazwpp8gcvdprxry2llf2k7g4q4zalyxkhpf7k6irb"; + cargoHash = "sha256-u/v3P7iPdBJU/0wlSNBq/cjnM3XOnoVfUjrrmo4sTAA="; meta = with lib; { description = "CLI utility to format json files"; homepage = "https://github.com/scruffystuffs/jfmt.rs"; + changelog = "https://github.com/scruffystuffs/jfmt.rs/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = [ maintainers.psibi ]; }; diff --git a/pkgs/development/tools/jira-cli-go/default.nix b/pkgs/development/tools/jira-cli-go/default.nix index fe5d8cf9ea11..31d6d281ba5f 100644 --- a/pkgs/development/tools/jira-cli-go/default.nix +++ b/pkgs/development/tools/jira-cli-go/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, less, more, installShellFiles, testers, jira-cli-go }: +{ lib, buildGoModule, fetchFromGitHub, less, more, installShellFiles, testers, jira-cli-go, nix-update-script }: buildGoModule rec { pname = "jira-cli-go"; - version = "1.1.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "ankitpokhrel"; repo = "jira-cli"; rev = "v${version}"; - sha256 = "sha256-UpDaKg6TA1qCkbzF7BARtj+tAyuCCGAyqOdItZU64Ls="; + hash = "sha256-T7EAlHHjoACJOra47zp5tXrkYWQ8o9Qame6QmiTrIXY="; }; - vendorSha256 = "sha256-SpUggA9u8OGV2zF3EQ0CB8M6jpiVQi957UGaN+foEuk="; + vendorSha256 = "sha256-b/z2oSWY33XSxpHi+Tit2ThnNrdk5QNI4oZWPMBKmd0="; ldflags = [ "-s" "-w" @@ -20,12 +20,15 @@ buildGoModule rec { "-X github.com/ankitpokhrel/jira-cli/internal/version.Version=${version}" ]; - checkInputs = [ less more ]; # Tests expect a pager in $PATH + nativeCheckInputs = [ less more ]; # Tests expect a pager in $PATH - passthru.tests.version = testers.testVersion { - package = jira-cli-go; - command = "jira version"; - inherit version; + passthru = { + tests.version = testers.testVersion { + package = jira-cli-go; + command = "jira version"; + inherit version; + }; + updateScript = nix-update-script { }; }; nativeBuildInputs = [ installShellFiles ]; @@ -41,6 +44,7 @@ buildGoModule rec { meta = with lib; { description = "Feature-rich interactive Jira command line"; homepage = "https://github.com/ankitpokhrel/jira-cli"; + changelog = "https://github.com/ankitpokhrel/jira-cli/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ bryanasdev000 anthonyroussel ]; }; diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix index 9145f4a42cdb..d8a639ec5b96 100644 --- a/pkgs/development/tools/jira_cli/default.nix +++ b/pkgs/development/tools/jira_cli/default.nix @@ -16,7 +16,7 @@ in # Tests rely on VCR cassettes being written during tests. R/O nix store prevents this. doCheck = false; - checkInputs = with python3Packages; [ vcrpy mock hiro ]; + nativeCheckInputs = with python3Packages; [ vcrpy mock hiro ]; buildInputs = [ libffi openssl ]; propagatedBuildInputs = with python3Packages; [ requests six suds-jurko termcolor keyring diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 5671f5dbe641..6b41cc9862b9 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, fetchpatch -, fetchFromGitHub +, fetchurl , autoreconfHook , onigurumaSupport ? true , oniguruma @@ -11,19 +10,14 @@ stdenv.mkDerivation rec { pname = "jq"; version = "1.6"; - src = fetchFromGitHub { - owner = "stedolan"; - repo = "jq"; - rev = "${pname}-${version}"; - hash = "sha256-CIE8vumQPGK+TFAncmpBijANpFALLTadOvkob0gVzro"; + # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages + src = fetchurl { + url = "https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; + sha256 = "sha256-XejI4pqqP7nMa0e7JymfJxNU67clFOOsytx9OLW7qnI="; }; patches = [ - (fetchpatch { - name = "fix-tests-when-building-without-regex-supports.patch"; - url = "https://github.com/stedolan/jq/pull/2292/commits/f6a69a6e52b68a92b816a28eb20719a3d0cb51ae.patch"; - sha256 = "pTM5FZ6hFs5Rdx+W2dICSS2lcoLY1Q//Lan3Hu8Gr58="; - }) + ./fix-tests-when-building-without-regex-supports.patch ]; outputs = [ "bin" "doc" "man" "dev" "lib" "out" ]; @@ -69,7 +63,7 @@ stdenv.mkDerivation rec { description = "A lightweight and flexible command-line JSON processor"; homepage = "https://stedolan.github.io/jq/"; license = licenses.mit; - maintainers = with maintainers; [ raskin globin ]; + maintainers = with maintainers; [ raskin globin artturin ]; platforms = platforms.unix; downloadPage = "https://stedolan.github.io/jq/download/"; }; diff --git a/pkgs/development/tools/jq/fix-tests-when-building-without-regex-supports.patch b/pkgs/development/tools/jq/fix-tests-when-building-without-regex-supports.patch new file mode 100644 index 000000000000..ac7614ed80b2 --- /dev/null +++ b/pkgs/development/tools/jq/fix-tests-when-building-without-regex-supports.patch @@ -0,0 +1,38 @@ +From f6a69a6e52b68a92b816a28eb20719a3d0cb51ae Mon Sep 17 00:00:00 2001 +From: Dmitry Bogatov +Date: Sat, 27 Mar 2021 00:00:00 +0000 +Subject: [PATCH] Disable some tests when building without regex support + +--- + Makefile.am | 5 ++++- + configure.ac | 1 + + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index f5c1db594..f3f44bb9e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -130,7 +130,10 @@ endif + + ### Tests (make check) + +-TESTS = tests/optionaltest tests/mantest tests/jqtest tests/onigtest tests/shtest tests/utf8test tests/base64test ++TESTS = tests/optionaltest tests/jqtest tests/shtest tests/utf8test tests/base64test ++if WITH_ONIGURUMA ++TESTS += tests/mantest tests/onigtest ++endif + TESTS_ENVIRONMENT = NO_VALGRIND=$(NO_VALGRIND) + + # This is a magic make variable that causes it to treat tests/man.test as a +diff --git a/configure.ac b/configure.ac +index 0441d4a2c..987d94e0a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -278,6 +278,7 @@ AC_SUBST(onig_CFLAGS) + AC_SUBST(onig_LDFLAGS) + + AM_CONDITIONAL([BUILD_ONIGURUMA], [test "x$build_oniguruma" = xyes]) ++AM_CONDITIONAL([WITH_ONIGURUMA], [test "x$with_oniguruma" = xyes]) + AC_SUBST([BUNDLER], ["$bundle_cmd"]) + + AC_CONFIG_MACRO_DIR([config/m4]) diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index f513a589767f..1a1c3e7a9961 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 = "5.1.2"; + version = "5.1.6"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Vv22BDFecGEketJb0qQ4+FxSB2BLb9LcnEAqm/BKRxM="; + sha256 = "sha256-ybcX2dm+gnvhWAcraCq22uGqe8NdqNd8QMNKVkqgNqY="; }; - cargoSha256 = "sha256-DRrewxKOR0LjpgoN7TWXHWxJxcZ/psjI/lSnyzBXRXM="; + cargoHash = "sha256-GzRxXBDMALaXLhpklVoSn+8uCgws5AjkC+fynym0iYo="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/development/tools/jqp/default.nix b/pkgs/development/tools/jqp/default.nix index 519bef162ac2..8491900b2c16 100644 --- a/pkgs/development/tools/jqp/default.nix +++ b/pkgs/development/tools/jqp/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jqp"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "noahgorstein"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f1HSwo0TwNpw02bNT1dzfovXcRQuP/IxAmomBgKuQxQ="; + sha256 = "sha256-qN248U4Fx4IAjJegCUj98PzrypMp9PQEr2RUaKX3yE4="; }; - vendorSha256 = "sha256-cx5esdxAJInxXHXx0xeKQNGTDBjKD3GhnY0Fu/Tzy9U="; + vendorHash = "sha256-qZTqqSANg0FpupWXTrHuYmnaTE387FhC40ZrZ9tlfew="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index a03586c48166..fd97cc2634fd 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -10,22 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.8.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; - rev = version; - hash = "sha256-mzVwdvMYpThSPGvM3hpuKzeHZW5HOwkEfONIN/aziXY="; + rev = "refs/tags/${version}"; + hash = "sha256-5JI3QaUuWvwI3pClZXMPU8v1lcPZ5YioMPGKl/lIjQ0="; }; - cargoSha256 = "sha256-dDaXmJ4wFJaE59qR5Bxvoz/Jrwt6hhWhJI8wLRXCLcU="; + cargoHash = "sha256-91C/5m2avsW7GKQDg/Ez9fzzFhe8ih1De1RbV/MBJbM="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - checkInputs = [ coreutils bash ]; - preCheck = '' # USER must not be empty export USER=just-user @@ -64,6 +62,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/casey/just/blob/${version}/CHANGELOG.md"; description = "A handy way to save and run project-specific commands"; license = licenses.cc0; - maintainers = with maintainers; [ xrelkd jk ]; + maintainers = with maintainers; [ xrelkd jk adamcstephens ]; }; } diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index 62f9be12575a..82255b249ec7 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.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kMWheOf6lR2Fdb77NvjQYB/PHILs6ZIfQORh72ojc8c="; + sha256 = "sha256-DlB1oTE5RkxSyNupZ2U+dmr7qNPq8xJU3R0pAjm5EFQ="; }; subPackages = [ "./" ]; diff --git a/pkgs/development/tools/kafkactl/default.nix b/pkgs/development/tools/kafkactl/default.nix index c3af6e9c1a4b..d18b32c6f440 100644 --- a/pkgs/development/tools/kafkactl/default.nix +++ b/pkgs/development/tools/kafkactl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kafkactl"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "deviceinsight"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lwyM2l4eBCtkyAtG51cEy29Jw/vakjrfYVBSZ9pIBFs="; + sha256 = "sha256-ZEXW9nqkR0yuVIY9qr1RyKVE7tSlP59Xb4JZfdAK2To="; }; - vendorSha256 = "sha256-ba7amhYuCB3k1esu1qYBCgUZMjlq5iac498TMqeGuz0="; + vendorHash = "sha256-e7SJjDWcHPgupZujeRD3Zg6vFAudDC3V60R2B61fjGU="; doCheck = false; meta = with lib; { diff --git a/pkgs/development/tools/karate/default.nix b/pkgs/development/tools/karate/default.nix index cda508c9df36..a374a4590fa5 100644 --- a/pkgs/development/tools/karate/default.nix +++ b/pkgs/development/tools/karate/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "karate"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "https://github.com/karatelabs/karate/releases/download/v${version}/karate-${version}.jar"; - sha256 = "sha256-uQHE8Mf70t7gtALdxO1tltUkwEKx0emWWliZEzwGW+Q="; + sha256 = "sha256-d0MIiMxENBPFM0Kv8vhtn/je1i650Z7+6PoV6ZZCsFY="; }; dontUnpack = true; diff --git a/pkgs/development/tools/kdash/default.nix b/pkgs/development/tools/kdash/default.nix index 37e33508906a..ac230c1d4a2a 100644 --- a/pkgs/development/tools/kdash/default.nix +++ b/pkgs/development/tools/kdash/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "kdash"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "kdash-rs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hh/Q3wUsA6HM0PwMlSfWx9LX+h/Y9w/fXm4HMYXexZU="; + sha256 = "sha256-dXkYHRB0VZ3FGe1Zu78ZzocaVV4zSGzxRMC0WOHiZrE="; }; nativeBuildInputs = [ perl python3 pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl xorg.xcbutil ] ++ lib.optional stdenv.isDarwin AppKit; - cargoSha256 = "sha256-02AfMbR8TsIqEhkXAnslnxgO/XkyEuCW1IyBtrk1dDA="; + cargoSha256 = "sha256-LWGoWFPZsTYa1hQnv1eNNmCKZsiLredvD6+kWanVEK0="; meta = with lib; { description = "A simple and fast dashboard for Kubernetes"; diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 15cf9c30322d..8c40281cbde9 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -1,7 +1,5 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: -with lib; - buildGoModule rec { pname = "kind"; version = "0.17.0"; @@ -36,11 +34,11 @@ buildGoModule rec { done ''; - meta = { + meta = with lib; { description = "Kubernetes IN Docker - local clusters for testing Kubernetes"; homepage = "https://github.com/kubernetes-sigs/kind"; maintainers = with maintainers; [ offline rawkode ]; - license = lib.licenses.asl20; + license = licenses.asl20; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix index 490ea3241049..ab77a3d0606d 100644 --- a/pkgs/development/tools/ko/default.nix +++ b/pkgs/development/tools/ko/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X github.com/google/ko/pkg/commands.Version=${version}" ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; preCheck = '' # Feed in all the tests for testing # This is because subPackages above limits what is built to just what we diff --git a/pkgs/development/tools/krankerl/default.nix b/pkgs/development/tools/krankerl/default.nix index d78fef8463d8..6951b358b6b0 100644 --- a/pkgs/development/tools/krankerl/default.nix +++ b/pkgs/development/tools/krankerl/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "krankerl"; - version = "0.13.3"; + version = "0.14.0"; src = fetchFromGitHub { owner = "ChristophWurst"; repo = "krankerl"; rev = "v${version}"; - sha256 = "sha256-/zRO+CVYQgx9/j14zgNm/ABzLprt0OYne+O6hOEjSEw="; + sha256 = "sha256-fFtjQFkNB5vn9nlFJI6nRdqxB9PmOGl3ySZ5LG2tgPg="; }; - cargoSha256 = "sha256-LWQRFgDxl2yxP+v1TUENaTGrA/udh84AJvWIkfTJezM="; + cargoSha256 = "sha256-0V2ftZmuKXRhOFWCroYOxQqW3NFh9Uuwcg0CM1sFlcQ="; nativeBuildInputs = [ pkg-config @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { sqlite ]; - checkInputs = [ + nativeCheckInputs = [ file ]; diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 9246fb9b8a08..dbc794e02084 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.47.1"; + version = "0.48.2"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "sha256-ozOtAXI2mlzZc66oPgLotpjAai2qxvMpJdoDBJqj3Oc="; + sha256 = "0hh3zm21a976px3lhf2przczspiyk88k68fmnwsknn281y9pyr70"; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://ktlint.github.io/"; license = licenses.mit; platforms = jre_headless.meta.platforms; + changelog = "https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md"; maintainers = with maintainers; [ tadfisher SubhrajyotiSen ]; }; } diff --git a/pkgs/development/tools/kube-linter/default.nix b/pkgs/development/tools/kube-linter/default.nix index b96e618da23b..6261cdc1b501 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.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "stackrox"; repo = pname; rev = version; - sha256 = "sha256-YEcEXXtCuK4Yg9EsaDFOfM+ri6iGoU7d0O6SlYYKG+U="; + sha256 = "sha256-/iwNyThgdXAXu1ulf68+X7nA9wE9jEqN7F5wuT5GMwk="; }; - vendorSha256 = "sha256-UVa+0mrQ2pW/4Zmegon/IOrH4SiWhrdCc3/fs3pxGq8="; + vendorHash = "sha256-jWXR7tHYT15h7QSxinYyPaBs5utUmdeWWm+GPpfwiA4="; ldflags = [ "-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}" diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index dfdfebcf3eab..7298cfb312eb 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -19,6 +19,12 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + postInstall = '' installShellCompletion completion/* ''; diff --git a/pkgs/development/tools/kubernetes-code-generator/default.nix b/pkgs/development/tools/kubernetes-code-generator/default.nix new file mode 100644 index 000000000000..69ffeaf8db31 --- /dev/null +++ b/pkgs/development/tools/kubernetes-code-generator/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "code-generator"; + version = "0.25.4"; + + src = fetchFromGitHub { + owner = "kubernetes"; + repo = pname; + rev = "v${version}"; + hash = "sha256-GKF6DXvyZujInOZbV0ePUu71BEl1s/chNTN1PucdIYw="; + }; + + vendorHash = "sha256-zjgTtGen6a8TPi/DrwheTS1VQ+hd+KI7UHoyMZ4W4+k="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + homepage = "https://github.com/kubernetes/code-generator"; + changelog = "https://github.com/kubernetes/code-generator/releases/tag/v${version}"; + description = "Kubernetes code generation"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/development/tools/kubernetes-controller-tools/default.nix b/pkgs/development/tools/kubernetes-controller-tools/default.nix index 6c1f1b7cfbee..57723da45eb3 100644 --- a/pkgs/development/tools/kubernetes-controller-tools/default.nix +++ b/pkgs/development/tools/kubernetes-controller-tools/default.nix @@ -2,16 +2,24 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.10.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-244o+QZ0BGVe8t8AWf1wU6VHgYyzkATpr5ZTbZezk10="; + sha256 = "sha256-mtAP8qRfSdt2koKs6LSI9iiXsyK92q1yWOC9zV8utFg="; }; - vendorSha256 = "sha256-sVdSKu6TDGIDV2o+kuCvGCItbFe9MwlM2Qjiz8n2rZU="; + patches = [ ./version.patch ]; + + vendorSha256 = "sha256-9IGdsAqvi01Jf0FpxfL+O+LrDchh4dGgJX4JJIvL3vE="; + + ldflags = [ + "-s" + "-w" + "-X sigs.k8s.io/controller-tools/pkg/version.version=v${version}" + ]; doCheck = false; diff --git a/pkgs/development/tools/kubernetes-controller-tools/version.patch b/pkgs/development/tools/kubernetes-controller-tools/version.patch new file mode 100644 index 000000000000..b86c3d69c3a9 --- /dev/null +++ b/pkgs/development/tools/kubernetes-controller-tools/version.patch @@ -0,0 +1,23 @@ +diff --git a/pkg/version/version.go b/pkg/version/version.go +index 09c8efcf..b9ec798a 100644 +--- a/pkg/version/version.go ++++ b/pkg/version/version.go +@@ -20,14 +20,12 @@ import ( + "runtime/debug" + ) + ++var version string ++ + // Version returns the version of the main module + func Version() string { +- info, ok := debug.ReadBuildInfo() +- if !ok || info == nil || info.Main.Version == "" { +- // binary has not been built with module support or doesn't contain a version. +- return "(unknown)" +- } +- return info.Main.Version ++ _ = debug.ReadBuildInfo ++ return version + } + + // Print prints the main module version on stdout. diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index b2e69d7fc351..4d363d4e75f4 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "sha256-tZ4qa48I/J62bqc9eoSSpTrJjU+LpweF/kI1TMiFrEY="; + sha256 = "sha256-foY1fcIn+jywABwEVBWctx4zwLg7k2zxkpL8UAhx6kA="; }; - cargoSha256 = "sha256-WpX1wkMPtUwT6KOi0Bij1tzGlDhti828wBSfzpXuZaY="; + cargoHash = "sha256-WHaORWwR7PeKacaCtXjTYMTCyZ4ZFWo1smVx5ig+Z9U="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index 4b5e6d8bb388..28c80444650d 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.2"; + version = "4.0.0"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6mLfMbYbdsjWHpfUHP3Q5nsqdMXo/82+A9PV8xWZBM0="; + sha256 = "sha256-8CZcPZLainc7iRZ5Ul27QxW3oK7sikCjzCBEkfCeNUc="; }; - vendorSha256 = "sha256-aRS+MwME72qIMyhnnIRqmrx5hcQ1V0pLIBJqSoR+Fkk="; + vendorHash = "sha256-GBjMN6pyB+48e5LNqLBbh6a5fC9P0T53CZUPGNcbBDc="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/pkgs/development/tools/language-servers/ansible-language-server/default.nix b/pkgs/development/tools/language-servers/ansible-language-server/default.nix new file mode 100644 index 000000000000..5b0ba5bfca20 --- /dev/null +++ b/pkgs/development/tools/language-servers/ansible-language-server/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, nix-update-script +}: + +buildNpmPackage rec { + pname = "ansible-language-server"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "ansible"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-IBySScjfF2bIbiOv09uLMt9QH07zegm/W1vmGhdWxGY="; + }; + + npmDepsHash = "sha256-rJ1O2OsrJhTIfywK9/MRubwwcCmMbu61T4zyayg+mAU="; + npmBuildScript = "compile"; + + # We remove/ignore the prepare and prepack scripts because they run the + # build script, and therefore are redundant. + # + # Additionally, the prepack script runs npm ci in addition to the + # build script. Directly before npm pack is run, we make npm unaware + # of the dependency cache, causing the npm ci invocation to fail, + # wiping out node_modules, which causes a mysterious error stating that tsc isn't installed. + postPatch = '' + sed -i '/"prepare"/d' package.json + sed -i '/"prepack"/d' package.json + ''; + + npmPackFlags = [ "--ignore-scripts" ]; + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + changelog = "https://github.com/ansible/ansible-language-server/releases/tag/v${version}"; + description = "Ansible Language Server"; + homepage = "https://github.com/ansible/ansible-language-server"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/tools/beancount-language-server/default.nix b/pkgs/development/tools/language-servers/beancount-language-server/default.nix similarity index 100% rename from pkgs/development/tools/beancount-language-server/default.nix rename to pkgs/development/tools/language-servers/beancount-language-server/default.nix diff --git a/pkgs/development/tools/buf-language-server/default.nix b/pkgs/development/tools/language-servers/buf-language-server/default.nix similarity index 100% rename from pkgs/development/tools/buf-language-server/default.nix rename to pkgs/development/tools/language-servers/buf-language-server/default.nix diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/language-servers/ccls/default.nix similarity index 100% rename from pkgs/development/tools/misc/ccls/default.nix rename to pkgs/development/tools/language-servers/ccls/default.nix diff --git a/pkgs/development/tools/misc/ccls/wrapper b/pkgs/development/tools/language-servers/ccls/wrapper similarity index 100% rename from pkgs/development/tools/misc/ccls/wrapper rename to pkgs/development/tools/language-servers/ccls/wrapper diff --git a/pkgs/development/tools/language-servers/fortls/default.nix b/pkgs/development/tools/language-servers/fortls/default.nix new file mode 100644 index 000000000000..9aed276a63fa --- /dev/null +++ b/pkgs/development/tools/language-servers/fortls/default.nix @@ -0,0 +1,35 @@ +{ buildPythonApplication +, lib +, fetchFromGitHub +, setuptools-scm +, json5 +, packaging +}: + +buildPythonApplication rec { + pname = "fortls"; + version = "2.13.0"; + + src = fetchFromGitHub { + owner = "fortran-lang"; + repo = pname; + rev = "v${version}"; + hash = "sha256-kFk2Dlnb0FXM3Ysvsy+g2AAMgpWmwzxuyJPovDm/FJU="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ json5 packaging ]; + + preBuild = "export SETUPTOOLS_SCM_PRETEND_VERSION=${version}"; + + doCheck = true; + checkPhase = "$out/bin/fortls --help 1>/dev/null"; + + meta = with lib; { + description = "Fortran Language Server "; + homepage = "https://github.com/fortran-lang/fortls"; + license = [ licenses.mit ]; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/development/tools/fortran-language-server/default.nix b/pkgs/development/tools/language-servers/fortran-language-server/default.nix similarity index 100% rename from pkgs/development/tools/fortran-language-server/default.nix rename to pkgs/development/tools/language-servers/fortran-language-server/default.nix diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/language-servers/gopls/default.nix similarity index 79% rename from pkgs/development/tools/gopls/default.nix rename to pkgs/development/tools/language-servers/gopls/default.nix index 9a44432837ea..ca0a0b5638fe 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/language-servers/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - sha256 = "sha256-9WDqd8Xgiov/OFAFl5yZmon4o3grbOxzZs3wnNu7pbg="; + sha256 = "sha256-49TDAxFx4kSwCn1YGQgMn3xLG3RHCCttMzqUfm4OPtE="; }; modRoot = "gopls"; - vendorSha256 = "sha256-EZ/XPta2vQfemywoC2kbTamJ43K4tr4I7mwVzrTbRkA="; + vendorSha256 = "sha256-1/stMvxsCs2OPMN7KGbZ61s2qGT5Yg7kHVHsWi6ekcY="; doCheck = false; diff --git a/pkgs/development/tools/jdt-language-server/default.nix b/pkgs/development/tools/language-servers/jdt-language-server/default.nix similarity index 96% rename from pkgs/development/tools/jdt-language-server/default.nix rename to pkgs/development/tools/language-servers/jdt-language-server/default.nix index 1af69700152d..1b194814a270 100644 --- a/pkgs/development/tools/jdt-language-server/default.nix +++ b/pkgs/development/tools/language-servers/jdt-language-server/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "jdt-language-server"; - version = "1.17.0"; - timestamp = "202210271413"; + version = "1.19.0"; + timestamp = "202301171536"; src = fetchurl { url = "https://download.eclipse.org/jdtls/milestones/${version}/jdt-language-server-${version}-${timestamp}.tar.gz"; - sha256 = "sha256-3NVzL3o/8LXR94/3Yma42XHfwNEFEVrmUijkeMs/vL0="; + sha256 = "sha256-9rreuMw2pODzOVX5PBmUZoV5ixUDilQyTsrnyCQ+IHs="; }; sourceRoot = "."; diff --git a/pkgs/development/tools/jsonnet-language-server/default.nix b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix similarity index 51% rename from pkgs/development/tools/jsonnet-language-server/default.nix rename to pkgs/development/tools/language-servers/jsonnet-language-server/default.nix index 82be702f991b..f35900ec41ad 100644 --- a/pkgs/development/tools/jsonnet-language-server/default.nix +++ b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix @@ -1,25 +1,32 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "jsonnet-language-server"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "grafana"; repo = "jsonnet-language-server"; - rev = "v${version}"; - sha256 = "sha256-RpjLIz5lfdWULTDTMDVYvTTSaQWvYbvpxvs4L5UldjM="; + rev = "refs/tags/v${version}"; + hash = "sha256-oPItt1v4wK0W0lSots3hoq5A1ooCRwzJV8cNYV+SBb4="; }; - vendorSha256 = "sha256-imFr4N/YmpwjVZSCBHG7cyJt4RKTn+T7VPdL8R/ba5o="; + vendorHash = "sha256-ZyTo79M5nqtqrtTOGanzgHcnSvqCKACacNBWzhYG5nY="; ldflags = [ - "-s -w -X 'main.version=${version}'" + "-s" + "-w" + "-X 'main.version=${version}'" ]; meta = with lib; { - homepage = "https://github.com/grafana/jsonnet-language-server"; description = "Language Server Protocol server for Jsonnet"; + homepage = "https://github.com/grafana/jsonnet-language-server"; + changelog = "https://github.com/grafana/jsonnet-language-server/releases/tag/v${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ hardselius ]; }; diff --git a/pkgs/development/tools/kotlin-language-server/default.nix b/pkgs/development/tools/language-servers/kotlin-language-server/default.nix similarity index 77% rename from pkgs/development/tools/kotlin-language-server/default.nix rename to pkgs/development/tools/language-servers/kotlin-language-server/default.nix index 6f3ea5cb46be..b3b1085273d1 100644 --- a/pkgs/development/tools/kotlin-language-server/default.nix +++ b/pkgs/development/tools/language-servers/kotlin-language-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, openjdk11, gradle, makeWrapper, maven }: +{ lib, stdenv, fetchzip, openjdk, gradle, makeWrapper, maven }: stdenv.mkDerivation rec { pname = "kotlin-language-server"; @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ gradle makeWrapper ]; - buildInputs = [ openjdk11 gradle ]; + buildInputs = [ openjdk gradle ]; postFixup = '' - wrapProgram "$out/bin/kotlin-language-server" --set JAVA_HOME ${openjdk11} --prefix PATH : ${lib.strings.makeBinPath [ openjdk11 maven ] } + wrapProgram "$out/bin/kotlin-language-server" --set JAVA_HOME ${openjdk} --prefix PATH : ${lib.strings.makeBinPath [ openjdk maven ] } ''; meta = { @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { using the Language Server Protocol Topics''; maintainers = with lib.maintainers; [ vtuan10 ]; homepage = "https://github.com/fwcd/kotlin-language-server"; + changelog = "https://github.com/fwcd/kotlin-language-server/blob/${version}/CHANGELOG.md"; license = lib.licenses.mit; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/language-servers/metals/default.nix similarity index 92% rename from pkgs/development/tools/metals/default.nix rename to pkgs/development/tools/language-servers/metals/default.nix index 5b275f82346b..18856838c581 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/language-servers/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.11.9"; + version = "0.11.10"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-CJ34OZOAM0Le9U0KSe0nKINnxA3iUgqUMtS06YnjvVo="; + outputHash = "sha256-CNLBDsyiEOmMGA9r8eU+3z75VYps21kHnLpB1LYC7W4="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix similarity index 67% rename from pkgs/development/tools/millet/default.nix rename to pkgs/development/tools/language-servers/millet/default.nix index ccc895b89569..036c5057d899 100644 --- a/pkgs/development/tools/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,24 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.6.0"; + version = "0.7.6"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-tP1ccUtHfj+JPUYGo+QFYjbz56uNl3p53QNeE/xaCt4="; + hash = "sha256-7Mv1+c8X+rZQyw3y+eGvSyqVqiSPdTj1WxoUv1mynSs="; }; - cargoHash = "sha256-umOlvHDA8AtoAeB1i8nNgbjvzTmzwZfdjF+TCTKzqAU="; + cargoHash = "sha256-0fJIp2zlZkeidTFg6jQs6S2mVHJL8flqiZtTvM0F9OQ="; postPatch = '' rm .cargo/config.toml ''; - cargoBuildFlags = [ "--package" "lang-srv" ]; + cargoBuildFlags = [ "--package" "millet-ls" ]; - cargoTestFlags = [ "--package" "lang-srv" ]; + cargoTestFlags = [ "--package" "millet-ls" ]; meta = with lib; { description = "A language server for Standard ML"; @@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/azdavis/millet/raw/v${version}/docs/changelog.md"; license = [ licenses.mit /* or */ licenses.asl20 ]; maintainers = with maintainers; [ marsam ]; - mainProgram = "lang-srv"; + mainProgram = "millet-ls"; }; } diff --git a/pkgs/development/tools/nil/default.nix b/pkgs/development/tools/language-servers/nil/default.nix similarity index 53% rename from pkgs/development/tools/nil/default.nix rename to pkgs/development/tools/language-servers/nil/default.nix index 60232a41e908..ee26e81e8891 100644 --- a/pkgs/development/tools/nil/default.nix +++ b/pkgs/development/tools/language-servers/nil/default.nix @@ -2,31 +2,34 @@ rustPlatform.buildRustPackage rec { pname = "nil"; - version = "2022-11-15"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "oxalica"; repo = pname; rev = version; - hash = "sha256-KzQmGCEaOACOqaE1LsVZsqn18XpjlUbGWztDEI+o++w="; + hash = "sha256-d53add4Cuh0ik8YYncdoqqR6irQbnh/X4vg12TQ/FEQ="; }; - cargoHash = "sha256-t5HfL7DKMcWJGod6x30NoHYYlAza++fEdEVvfvFWems="; + cargoHash = "sha256-k4hw+kH447uqsCASuaZxRx2xmMkmn9LM5sHYL2AJN9k="; - CFG_DATE = version; - CFG_REV = "release"; + CFG_RELEASE = version; nativeBuildInputs = [ (lib.getBin nix) ]; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + # might be related to https://github.com/NixOS/nix/issues/5884 + preBuild = '' + export NIX_STATE_DIR=$(mktemp -d) + ''; + + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Yet another language server for Nix"; homepage = "https://github.com/oxalica/nil"; + changelog = "https://github.com/oxalica/nil/releases/tag/${version}"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ figsoda oxalica ]; }; diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/pkgs/development/tools/language-servers/rnix-lsp/default.nix similarity index 53% rename from pkgs/development/tools/rnix-lsp/default.nix rename to pkgs/development/tools/language-servers/rnix-lsp/default.nix index a587f87b3da7..c7ab04d7cdcf 100644 --- a/pkgs/development/tools/rnix-lsp/default.nix +++ b/pkgs/development/tools/language-servers/rnix-lsp/default.nix @@ -2,22 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "rnix-lsp"; - version = "0.2.5"; + version = "unstable-2022-11-27"; src = fetchFromGitHub { owner = "nix-community"; repo = "rnix-lsp"; - rev = "v${version}"; - sha256 = "sha256-WXpj2fgduYlF4t0QEvdfV1Eft8/nFXWF2zyEBKMUEIk="; + rev = "95d40673fe43642e2e1144341e86d0036abd95d9"; + sha256 = "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ="; }; - cargoSha256 = "sha256-LfbmOhZJVthsLm8lnzHvEt7Vy27y4w4wpPfrf/s3s84="; + cargoSha256 = "sha256-RKHBp+/bEH9FEPLcf1MKmTugk1A8rQU447mNm9Le3DE="; - checkInputs = lib.optional (!stdenv.isDarwin) nix; + nativeCheckInputs = lib.optional (!stdenv.isDarwin) nix; meta = with lib; { description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; license = licenses.mit; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix similarity index 96% rename from pkgs/development/tools/sumneko-lua-language-server/default.nix rename to pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix index d2baf6c0ba15..24b360a78180 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "3.6.3"; + version = "3.6.7"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-E9Wpdf9V6MltdFncVuDhwxtsLS8mese35HLi7kV1eXI="; + sha256 = "sha256-x7/yO1rJ+VBG4EFpISYblRECLW2lsLz5wcqLR14UV/g="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/misc/svls/default.nix b/pkgs/development/tools/language-servers/svls/default.nix similarity index 72% rename from pkgs/development/tools/misc/svls/default.nix rename to pkgs/development/tools/language-servers/svls/default.nix index e5a26b75aa03..5b5b87b0392f 100644 --- a/pkgs/development/tools/misc/svls/default.nix +++ b/pkgs/development/tools/language-servers/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-SeVLQ05vPywSOnOEhJhQXYhdptmIhvYbbf9SX5eVzik="; + sha256 = "sha256-1qYTYAXNMM3umRFpWoij8VU3rhBI4QWePa5Uaz2Y4Ik="; }; - cargoSha256 = "sha256-jp84LqFuK6Du2mWmgvadD7p8n/zcLKAKBOMQiERTKBI="; + cargoSha256 = "sha256-il7n8uxeXPKCBpRv3rqZZzqWjfpy558YNKBs9qOJ2oI="; meta = with lib; { description = "SystemVerilog language server"; diff --git a/pkgs/development/tools/vala-language-server/default.nix b/pkgs/development/tools/language-servers/vala-language-server/default.nix similarity index 94% rename from pkgs/development/tools/vala-language-server/default.nix rename to pkgs/development/tools/language-servers/vala-language-server/default.nix index 52e33fee6b60..6c7ebabe6332 100644 --- a/pkgs/development/tools/vala-language-server/default.nix +++ b/pkgs/development/tools/language-servers/vala-language-server/default.nix @@ -36,9 +36,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/verible/default.nix b/pkgs/development/tools/language-servers/verible/default.nix similarity index 100% rename from pkgs/development/tools/verible/default.nix rename to pkgs/development/tools/language-servers/verible/default.nix diff --git a/pkgs/development/tools/verible/remove-unused-deps.patch b/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch similarity index 100% rename from pkgs/development/tools/verible/remove-unused-deps.patch rename to pkgs/development/tools/language-servers/verible/remove-unused-deps.patch diff --git a/pkgs/development/tools/ldid/default.nix b/pkgs/development/tools/ldid/default.nix new file mode 100644 index 000000000000..6b3b2b9470ac --- /dev/null +++ b/pkgs/development/tools/ldid/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, callPackage +, fetchgit +, libplist +, libxml2 +, openssl_1_1 +, CoreFoundation +, Security +}: + +stdenv.mkDerivation rec { + pname = "ldid"; + version = "2.1.5"; + + src = fetchgit { + url = "git://git.saurik.com/ldid.git"; + rev = "v${version}"; + sha256 = "sha256-RM5pU3mrgyvwNfWKNvCT3UYVGKtVhD7ifgp8fq9xXiM="; + }; + + strictDeps = true; + + buildInputs = [ + libplist + libxml2 + openssl_1_1 + ] ++ lib.optionals stdenv.isDarwin [ + CoreFoundation + Security + ]; + + NIX_LDFLAGS = [ + "-lcrypto" + "-lplist-2.0" + "-lxml2" + ] ++ lib.optionals stdenv.isDarwin [ + "-framework CoreFoundation" + "-framework Security" + ]; + + buildPhase = '' + runHook preBuild + + cc -c -o lookup2.o lookup2.c -I. + c++ -std=c++11 -o ldid lookup2.o ldid.cpp -I. ${toString NIX_LDFLAGS} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 {,$out/bin/}ldid + ln -s $out/bin/ldid $out/bin/ldid2 + + runHook postInstall + ''; + + meta = with lib; { + description = "Link Identity Editor"; + homepage = "https://cydia.saurik.com/info/ldid/"; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + license = licenses.agpl3Only; + }; +} diff --git a/pkgs/development/tools/legitify/default.nix b/pkgs/development/tools/legitify/default.nix index ab808fcc61c6..8a6e9387fed3 100644 --- a/pkgs/development/tools/legitify/default.nix +++ b/pkgs/development/tools/legitify/default.nix @@ -25,6 +25,7 @@ buildGoModule rec { meta = with lib; { description = "Tool to detect and remediate misconfigurations and security risks of GitHub assets"; homepage = "https://github.com/Legit-Labs/legitify"; + changelog = "https://github.com/Legit-Labs/legitify/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index 6c09b5392e21..6066286fc91b 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib python3 libxcrypt ]; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; doCheck = true; meta = with lib; { diff --git a/pkgs/development/tools/lightningcss/default.nix b/pkgs/development/tools/lightningcss/default.nix index 4713211454be..c2bb6828bc2a 100644 --- a/pkgs/development/tools/lightningcss/default.nix +++ b/pkgs/development/tools/lightningcss/default.nix @@ -1,32 +1,42 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub -, stdenv }: rustPlatform.buildRustPackage rec { pname = "lightningcss"; - version = "1.16.1"; + version = "1.18.0"; src = fetchFromGitHub { owner = "parcel-bundler"; repo = "lightningcss"; - rev = "v${version}"; - sha256 = "sha256-Mr3sqPrP9fIuQrE+XtDe5lu8dGwYNtKElfxFvLIllb4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-JULVX5gyMJhnBwGQxmMObtUaenu37rIE5yDbA5fHsCY="; }; - cargoSha256 = "sha256-mF7bUcy5np/odQvhz0PEsWWgWRL2k8X0VaO9y1pDtzE="; + cargoHash = "sha256-PQbN0qsCf4eia5sD71ltP7Y955smZPwkof+uEQATvNQ="; - buildFeatures = [ "cli" ]; + buildFeatures = [ + "cli" + ]; - cargoBuildFlags = [ "--lib" "--bin=lightningcss" ]; + cargoBuildFlags = [ + "--lib" + "--bin=lightningcss" + ]; - cargoTestFlags = [ "--lib" ]; + cargoTestFlags = [ + "--lib" + ]; meta = with lib; { description = "Extremely fast CSS parser, transformer, and minifier written in Rust"; homepage = "https://lightningcss.dev/"; + changelog = "https://github.com/parcel-bundler/lightningcss/releases/tag/v${version}"; license = licenses.mpl20; maintainers = with maintainers; [ toastal ]; + # never built on aarch64-linux since first introduction in nixpkgs + broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/pkgs/development/tools/literate-programming/eweb/default.nix b/pkgs/development/tools/literate-programming/eweb/default.nix index caacc04903e6..7ad966c6b69f 100644 --- a/pkgs/development/tools/literate-programming/eweb/default.nix +++ b/pkgs/development/tools/literate-programming/eweb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://eweb.sourceforge.net/"; + homepage = "https://eweb.sourceforge.net/"; description = "An Asciidoc-based literate programming tool, written in Python"; platforms = platforms.linux; license = licenses.gpl3Plus; diff --git a/pkgs/development/tools/ls-lint/default.nix b/pkgs/development/tools/ls-lint/default.nix new file mode 100644 index 000000000000..e42f7f50122a --- /dev/null +++ b/pkgs/development/tools/ls-lint/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ls-lint"; + version = "1.11.2"; + + src = fetchFromGitHub { + owner = "loeffel-io"; + repo = "ls-lint"; + rev = "v${version}"; + sha256 = "sha256-mt1SvRHtAA0lChZ//8XIQGDPg1l1EOMkPIAe8YKhMSs="; + }; + + vendorSha256 = "sha256-OEwN9kj1npI+H7DY+e3tl5TIY/qr4y2CgAV5fwNA9l4="; + + meta = with lib; { + description = "An extremely fast file and directory name linter"; + homepage = "https://ls-lint.org/"; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/development/tools/luaformatter/default.nix b/pkgs/development/tools/luaformatter/default.nix index 00d96a687a63..207ef4d9fe12 100644 --- a/pkgs/development/tools/luaformatter/default.nix +++ b/pkgs/development/tools/luaformatter/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4, libargs, catch2, cmake, libyamlcpp }: +{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4_9, libargs, catch2, cmake, yaml-cpp }: + +let + antlr4 = antlr4_9; +in stdenv.mkDerivation rec { pname = "luaformatter"; @@ -15,13 +19,13 @@ stdenv.mkDerivation rec { (substituteAll { src = ./fix-lib-paths.patch; antlr4RuntimeCpp = antlr4.runtime.cpp.dev; - inherit libargs catch2 libyamlcpp; + inherit libargs catch2 yaml-cpp; }) ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ antlr4.runtime.cpp libyamlcpp ]; + buildInputs = [ antlr4.runtime.cpp yaml-cpp ]; meta = with lib; { description = "Code formatter for Lua"; diff --git a/pkgs/development/tools/luaformatter/fix-lib-paths.patch b/pkgs/development/tools/luaformatter/fix-lib-paths.patch index fce2347d8e0e..610a313ca27c 100644 --- a/pkgs/development/tools/luaformatter/fix-lib-paths.patch +++ b/pkgs/development/tools/luaformatter/fix-lib-paths.patch @@ -12,7 +12,7 @@ index 4a21b94..0ac7911 100644 - ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src + @libargs@/include + @catch2@/include -+ @libyamlcpp@/include ++ @yaml-cpp@/include + @antlr4RuntimeCpp@/include/antlr4-runtime ${PROJECT_SOURCE_DIR}/src/ ) diff --git a/pkgs/development/tools/maligned/default.nix b/pkgs/development/tools/maligned/default.nix index f39b83489f99..8df4d79b5920 100644 --- a/pkgs/development/tools/maligned/default.nix +++ b/pkgs/development/tools/maligned/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { allowGoReference = true; - checkInputs = [ go ]; + nativeCheckInputs = [ go ]; meta = with lib; { description = "Tool to detect Go structs that would take less memory if their fields were sorted"; diff --git a/pkgs/development/tools/mani/default.nix b/pkgs/development/tools/mani/default.nix index e9261c062589..66fbb4dc7311 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.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "alajmo"; repo = "mani"; rev = "v${version}"; - sha256 = "sha256-2WuUQt9q19JYlfAyoGFRVpiLmsMbN45cYdF16j+jhhk="; + sha256 = "sha256-PuoGuweuDcSM1qfjXABSdoqbMLc5a+lYGFr0kZZkgVE="; }; - vendorSha256 = "sha256-9DP6SRcvHtZhkk2XoYesC1mhfq06KsLs0X02AG9vwJ8="; + vendorHash = "sha256-9DP6SRcvHtZhkk2XoYesC1mhfq06KsLs0X02AG9vwJ8="; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/development/tools/manifest-tool/default.nix b/pkgs/development/tools/manifest-tool/default.nix new file mode 100644 index 000000000000..6282619535b9 --- /dev/null +++ b/pkgs/development/tools/manifest-tool/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +, stdenv +, testers +, manifest-tool +}: + +buildGoModule rec { + pname = "manifest-tool"; + version = "2.0.6"; + gitCommit = "2ed9312726765567a84f2acc44a0c8a6e50f4b7a"; + modRoot = "v2"; + + src = fetchFromGitHub { + owner = "estesp"; + repo = "manifest-tool"; + rev = "v${version}"; + sha256 = "sha256-oopk++IdNF6msxOszT0fKxQABgWKbaQZ2aNH9chqWU0="; + leaveDotGit = true; + postFetch = '' + git -C $out rev-parse HEAD > $out/.git-revision + rm -rf $out/.git + ''; + }; + + vendorHash = null; + + nativeBuildInputs = [ git ]; + + preConfigure = '' + ldflags="-X main.gitCommit=$(cat .git-revision)" + ''; + + CGO_ENABLED = if stdenv.hostPlatform.isStatic then "0" else "1"; + GO_EXTLINK_ENABLED = if stdenv.hostPlatform.isStatic then "0" else "1"; + ldflags = lib.optionals stdenv.hostPlatform.isStatic [ "-w" "-extldflags" "-static" ]; + tags = lib.optionals stdenv.hostPlatform.isStatic [ "netgo" ]; + + passthru.tests.version = testers.testVersion { + package = manifest-tool; + }; + + meta = with lib; { + description = "Command line tool to create and query container image manifest list/indexes"; + homepage = "https://github.com/estesp/manifest-tool"; + license = licenses.asl20; + maintainers = with maintainers; [ tricktron ]; + }; +} diff --git a/pkgs/development/tools/marksman/default.nix b/pkgs/development/tools/marksman/default.nix new file mode 100644 index 000000000000..d31268f9cedd --- /dev/null +++ b/pkgs/development/tools/marksman/default.nix @@ -0,0 +1,58 @@ +{ lib +, fetchFromGitHub +, buildDotnetModule +, dotnetCorePackages +, marksman +, testers +}: + +buildDotnetModule rec { + pname = "marksman"; + version = "2023-01-29"; + + src = fetchFromGitHub { + owner = "artempyanykh"; + repo = "marksman"; + rev = version; + sha256 = "sha256-UPPO4ueu7gMR7a573M2/xT3N0QgRSNBshJAqoyXEZpc="; + }; + + projectFile = "Marksman/Marksman.fsproj"; + dotnetBuildFlags = "-p:VersionString=${version}"; + + doCheck = true; + testProjectFile = "Tests/Tests.fsproj"; + + nugetDeps = ./deps.nix; + + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; + + postInstall = '' + install -m 644 -D -t "$out/share/doc/${pname}" LICENSE + ''; + + passthru = { + updateScript = ./update.sh; + tests.version = testers.testVersion { + package = marksman; + command = "marksman --version"; + }; + }; + + meta = with lib; { + description = "Language Server for Markdown"; + longDescription = '' + Marksman is a program that integrates with your editor + to assist you in writing and maintaining your Markdown documents. + Using LSP protocol it provides completion, goto definition, + find references, rename refactoring, diagnostics, and more. + In addition to regular Markdown, it also supports wiki-link-style + references that enable Zettelkasten-like note taking. + ''; + homepage = "https://github.com/artempyanykh/marksman"; + license = licenses.mit; + maintainers = with maintainers; [ stasjok ]; + platforms = dotnet-sdk.meta.platforms; + }; +} diff --git a/pkgs/development/tools/marksman/deps.nix b/pkgs/development/tools/marksman/deps.nix new file mode 100644 index 000000000000..4789ffad94d9 --- /dev/null +++ b/pkgs/development/tools/marksman/deps.nix @@ -0,0 +1,208 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "coverlet.collector"; version = "3.1.2"; sha256 = "0gsk2q93qw7pqxwd4pdyq5364wz0lvldcqqnf4amz13jaq86idmz"; }) + (fetchNuGet { pname = "FSharp.Core"; version = "6.0.0"; sha256 = "1hjhvr39c1vpgrdmf8xln5q86424fqkvy9nirkr29vl2461d2039"; }) + (fetchNuGet { pname = "FSharp.Core"; version = "6.0.5"; sha256 = "07929km96znf6xnqzmxdk3h48kz2rg9msf4c5xxmnjqr0ikfb8c6"; }) + (fetchNuGet { pname = "FSharp.SystemCommandLine"; version = "0.13.0-beta4"; sha256 = "10h58gqfdg2hdy9laf6ry8djfysrdmwlj9n0d7ydwyszb6zgnd20"; }) + (fetchNuGet { pname = "FSharpPlus"; version = "1.2.4"; sha256 = "08yg36hgmglll053kkqkkadcfcrdd37qqwqwfwzyrmyqp1mw4mj2"; }) + (fetchNuGet { pname = "Glob"; version = "1.1.9"; sha256 = "1q72haq20bf414xwdabsx30lp5c55fjh7hav6r9sp2cqhmva0y53"; }) + (fetchNuGet { pname = "Markdig"; version = "0.30.2"; sha256 = "0m4vjg3kzvknk376yfzazr6i6qkb833s63857a5xcym0l04chlha"; }) + (fetchNuGet { pname = "MessagePack"; version = "2.3.85"; sha256 = "0n7kv4i6knhv1dd35cv45sfpidsiy9albfdmbrdschykd1mzxmiy"; }) + (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.3.85"; sha256 = "0axjgy9r533bw00lflnc6acjyza76mf2x1nn6fw7qacvak9rqxm3"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.2.0"; sha256 = "018yl113i037m5qhm3z6csb0c4l8kj412dxw2dagdbj07qbxwikj"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.2.0"; sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11"; }) + (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 = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) + (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.TestPlatform.ObjectModel"; version = "17.2.0"; sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.2.0"; sha256 = "1238hx3hdg22s123cxygdfm89h54abw1jv6az6hl8h76ip39ybdp"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.0.64"; sha256 = "1c5qng81nin399rqfpgxvlsik4qi8an7ryki7ybrplywl16c0c56"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.0.64"; sha256 = "17xi4xca6iby66yw86qlbmy7i8z0l6mahr5s4krhapqkhwq7lhwg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "16.10.26"; sha256 = "111wyls8c85djafkdgy004n1gz26qwprg835prm8bdlhjjpn3hgf"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "16.10.35"; sha256 = "1ba7valnmhim3g2sw635f3zw5i26m84jzls131y5xjfw5pyh2dhx"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.8.54"; sha256 = "0b0c85xf0ws2j5jbph0xfz7093yp93c5z25ykfjbr0mhvd8144gx"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.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.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "Serilog"; version = "2.11.0"; sha256 = "1nvd3hm615xlcdmw1i7llkd3xvwvpv66c4y4s28npv47v3yci3lh"; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.0.1"; sha256 = "080vh9kcyn9lx4j7p34146kp9byvhqlaz5jn9wzx70ql9cwd0hlz"; }) + (fetchNuGet { pname = "Snapper"; version = "2.3.2"; sha256 = "1nbsb47v7hacn7x5km1hq5n6igh4j7wb86ai2gbfmi0r9shd225a"; }) + (fetchNuGet { pname = "StreamJsonRpc"; version = "2.10.44"; sha256 = "0jmj8hhd1ff2a00rpzkriq37kz49xb3wrkygb35ysqvm8fw69rdc"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) + (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (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.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) + (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.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (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.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.1"; sha256 = "0b6zvhhfdxx0wx3bzyvxbq0mk8l5lbjak5124sn0gkif5jb388w4"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (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"; }) + (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"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (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"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) + (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"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) + (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.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (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"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "6.0.0"; sha256 = "1b4vyjdir9kdkiv2fqqm4f76h0df68k8gcd7jb2b38zgr2vpnk3c"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { pname = "Tomlyn"; version = "0.16.0"; sha256 = "1zbxd27ycn7ria1r4hz5039d0890hrnavzmhag6qxi7a25ljy0w6"; }) + (fetchNuGet { pname = "xunit"; version = "2.4.2"; sha256 = "0barl6x1qwx9srjxnanw9z0jik7lv1fp6cvmgqhk10aiv57dgqxm"; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "1.0.0"; sha256 = "0p4f24c462z49gvbh3k4z5ksa8ffa6p8abdgysqbbladl96im4c5"; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.4.2"; sha256 = "0ifdry9qq3yaw2lfxdll30ljx1jkyhwwy3ydw6gd97y3kifr3k60"; }) + (fetchNuGet { pname = "xunit.core"; version = "2.4.2"; sha256 = "1ir029igwm6b571lcm6585v5yxagy66rwrg26v4a1fnjq9dnh4cd"; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.2"; sha256 = "1h0a62xddsd82lljfjldn1nqy17imga905jb7j0ddr10wi8cqm62"; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.2"; sha256 = "0r9gczqz4bc59cwl6d6wali6pvlw210i97chc1nlwn2qh383m54p"; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.5"; sha256 = "0y8w33ci80z8k580pp24mfnaw1r8ji0w3az543xxcz6aagax9zhs"; }) +] diff --git a/pkgs/development/tools/marksman/update.sh b/pkgs/development/tools/marksman/update.sh new file mode 100755 index 000000000000..0f4a416e7df9 --- /dev/null +++ b/pkgs/development/tools/marksman/update.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts +#shellcheck shell=bash + +set -eu -o pipefail + +version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + https://api.github.com/repos/artempyanykh/marksman/releases/latest | jq -e -r .tag_name) +old_version=$(nix-instantiate --eval -A marksman.version | jq -e -r) + +if [[ $version == "$old_version" ]]; then + echo "New version same as old version, nothing to do." >&2 + exit 0 +fi + +update-source-version marksman "$version" + +$(nix-build -A marksman.fetch-deps --no-out-link) "$(dirname -- "${BASH_SOURCE[0]}")/deps.nix" diff --git a/pkgs/development/tools/mask/default.nix b/pkgs/development/tools/mask/default.nix index 343d41be6f10..0856a8373881 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.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "jacobdeichert"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mlARZ05xppPvr6Z5uoveYt3Y3LtdMkbFqxW1EkX+ud0="; + sha256 = "sha256-mPnykI3scTBzGjDa8nawWYRvZBkq74/t5WMbMbs3zVE="; }; - cargoSha256 = "sha256-EulRz/IjLLvNT9YxyNjJynFEGyQ/Q2Out984xS9Wp5o="; + cargoSha256 = "sha256-h58MA3F4UA4gp64UPnK6Tvlvr4PFvrVKmjp48lZjH68="; # tests require mask to be installed doCheck = false; @@ -19,6 +19,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A CLI task runner defined by a simple markdown file"; homepage = "https://github.com/jacobdeichert/mask"; + changelog = "https://github.com/jacobdeichert/mask/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/development/tools/mbed-cli/default.nix b/pkgs/development/tools/mbed-cli/default.nix index 12e7d1915477..cf6e65c46c79 100644 --- a/pkgs/development/tools/mbed-cli/default.nix +++ b/pkgs/development/tools/mbed-cli/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "1228plh55id03qywsw0ai88ypdpbh9iz18jfcyhn21pci7mj77fv"; }; - checkInputs = [ + nativeCheckInputs = [ git mercurial pytest diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix index 74f65ef6303b..e5510aa5f80b 100644 --- a/pkgs/development/tools/memray/default.nix +++ b/pkgs/development/tools/memray/default.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "memray"; - version = "1.4.1"; + version = "1.6.0"; format = "setuptools"; src = fetchFromGitHub { owner = "bloomberg"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Lq2qDTGkyG3qZaxF3umUHBWf0Dgy1ds6bTUe4y3u7Qc="; + hash = "sha256-iIbx8vK4xAFfTVO4oJ5ELNKn19Tw6LPgwEi6eFOA5yo="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { rich ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ ipython pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index e373ecd9ef26..f6d5103745b7 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -1,24 +1,31 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: buildGoModule rec { pname = "metal-cli"; - version = "0.11.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tbnG/MF83cAnsG2LOqdQSGF2XT+UWSzIpxVbkolzEQQ="; + hash = "sha256-v+8zfNV93nrRSwfn1u7SNYv7WYY74R8nPJFmreDb7i4="; }; - vendorSha256 = "sha256-drsNZXLNUWICLI8D+IvJE4X8GmWrP9U3dmpf9HnKCWw="; + vendorHash = "sha256-drsNZXLNUWICLI8D+IvJE4X8GmWrP9U3dmpf9HnKCWw="; ldflags = [ - "-s" "-w" + "-s" + "-w" "-X github.com/equinix/metal-cli/cmd.Version=${version}" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; postInstall = '' installShellCompletion --cmd metal \ @@ -30,6 +37,7 @@ buildGoModule rec { doCheck = false; doInstallCheck = true; + installCheckPhase = '' $out/bin/metal --version | grep ${version} ''; @@ -37,6 +45,7 @@ buildGoModule rec { meta = with lib; { description = "Official Equinix Metal CLI"; homepage = "https://github.com/equinix/metal-cli/"; + changelog = "https://github.com/equinix/metal-cli/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne nshalman ]; mainProgram = "metal"; diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 0e809bb32f76..a7c8c1f8db30 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "3.7.4"; + version = "3.8.3"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-VUavNwj5MCMZFV9WASF3olOdZb4JNBYbcQdgUfvPS8k="; + sha256 = "sha256-IrgypySq5RUi9X3pVC0t+Ezw7aNu8mIKZYY4CEaKhU4="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index dd0c96a46abf..1c6fa49d7c1a 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -1,21 +1,28 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib +, fetchFromGitHub +, buildGoModule +}: buildGoModule rec { pname = "act"; - version = "0.2.33"; + version = "0.2.41"; src = fetchFromGitHub { owner = "nektos"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-FNOZA4sb0IlKkLiE+uPOE5KJXlU7XbtHlmPJUMJbGNE="; + rev = "refs/tags/v${version}"; + hash = "sha256-nfMLw3fjEex1XV+Vhi84xR+ghBLrmKDtuFIIeNhP/yQ="; }; - vendorSha256 = "sha256-9ziHGZWHeYk0sxOxIFCnrLd1iqT9orgwE7eixvSMhlc="; + vendorHash = "sha256-qXjDeR0VZyyhASpt6zv6OyltEZDoguILhhD1ejpd0F4="; doCheck = false; - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; meta = with lib; { description = "Run your GitHub Actions locally"; diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 4ce8c1edffd4..66e972826cb9 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; - homepage = "http://astyle.sourceforge.net/"; + homepage = "https://astyle.sourceforge.net/"; license = licenses.lgpl3; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index 318daf9e599d..9b5ca5de570f 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "autoconf-archive"; - version = "2022.02.11"; + version = "2022.09.03"; src = fetchurl { url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; - sha256 = "sha256-eKYbYR4u61WongOY4M44e8r1f+LdU8b+QnEw93etHow="; + sha256 = "sha256-4HRU8A2MrnkHvtQtB0d5iSeAmUdoTZTDcgek1joy9CM="; }; strictDeps = true; diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 4f9a92d362bc..161dca6f1805 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -22,9 +22,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl autoconf ]; buildInputs = [ autoconf ]; - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; doCheck = false; # takes _a lot_ of time, fails 11 of 782 tests # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix index 470827c2b45e..f0df759ee2cf 100644 --- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.15.x.nix @@ -16,9 +16,6 @@ stdenv.mkDerivation rec { patches = [ ./help2man-SOURCE_DATE_EPOCH-support.patch ]; - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths doInstallCheck = false; # runs the same thing, fails the same tests diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 65d6185f50c0..0d9572c6f314 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -15,9 +15,6 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths doInstallCheck = false; # runs the same thing, fails the same tests diff --git a/pkgs/development/tools/misc/automake/builder.sh b/pkgs/development/tools/misc/automake/builder.sh index e54a2acca67e..0cb1d5d61e33 100644 --- a/pkgs/development/tools/misc/automake/builder.sh +++ b/pkgs/development/tools/misc/automake/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup # Wrap the given `aclocal' program, appending extra `-I' flags diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/development/tools/misc/bashdb/default.nix index c7d261e6f5ac..2babde7afa6b 100644 --- a/pkgs/development/tools/misc/bashdb/default.nix +++ b/pkgs/development/tools/misc/bashdb/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Bash script debugger"; - homepage = "http://bashdb.sourceforge.net/"; + homepage = "https://bashdb.sourceforge.net/"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/binutils/2.38/default.nix b/pkgs/development/tools/misc/binutils/2.38/default.nix index 820f667bf9d0..9fb0a35dbf46 100644 --- a/pkgs/development/tools/misc/binutils/2.38/default.nix +++ b/pkgs/development/tools/misc/binutils/2.38/default.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation { # Turn on --enable-new-dtags by default to make the linker set # RUNPATH instead of RPATH on binaries. This is important because - # RUNPATH can be overriden using LD_LIBRARY_PATH at runtime. + # RUNPATH can be overridden using LD_LIBRARY_PATH at runtime. "--enable-new-dtags" # force target prefix. Some versions of binutils will make it empty if diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 85d52030eafb..39e852a60bbb 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,5 +1,5 @@ let - execFormatIsELF = platform: platform.parsed.kernel.execFormat.name == "elf"; + withGold = platform: platform.parsed.kernel.execFormat.name == "elf" && !platform.isRiscV; in { stdenv @@ -15,10 +15,9 @@ in , noSysDirs , perl , substitute -, texinfo , zlib -, enableGold ? execFormatIsELF stdenv.targetPlatform +, enableGold ? withGold stdenv.targetPlatform , enableShared ? !stdenv.hostPlatform.isStatic # WARN: Enabling all targets increases output size to a multiple. , withAllTargets ? false @@ -26,7 +25,7 @@ in # WARN: configure silently disables ld.gold if it's unsupported, so we need to # make sure that intent matches result ourselves. -assert enableGold -> execFormatIsELF stdenv.targetPlatform; +assert enableGold -> withGold stdenv.targetPlatform; let @@ -52,7 +51,7 @@ let targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = targetPrefix + "binutils"; inherit version; @@ -110,10 +109,12 @@ stdenv.mkDerivation { strictDeps = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; + # texinfo was removed here in https://github.com/NixOS/nixpkgs/pull/210132 + # to reduce rebuilds during stdenv bootstrap. Please don't add it back without + # checking the impact there first. nativeBuildInputs = [ bison perl - texinfo ] ++ lib.optionals targetPlatform.isiOS [ autoreconfHook ] ++ lib.optionals buildPlatform.isDarwin [ autoconf269 automake gettext libtool ] @@ -144,6 +145,20 @@ stdenv.mkDerivation { for i in binutils/Makefile.in gas/Makefile.in ld/Makefile.in gold/Makefile.in; do sed -i "$i" -e 's|ln |ln -s |' done + + # autoreconfHook is not included for all targets. + # Call it here explicitly as well. + ${finalAttrs.postAutoreconf} + ''; + + postAutoreconf = '' + # As we regenerated configure build system tries hard to use + # texinfo to regenerate manuals. Let's avoid the dependency + # on texinfo in bootstrap path and keep manuals unmodified. + touch gas/doc/.dirstamp + touch gas/doc/asconfig.texi + touch gas/doc/as.1 + touch gas/doc/as.info ''; # As binutils takes part in the stdenv building, we don't want references @@ -167,7 +182,7 @@ stdenv.mkDerivation { # Turn on --enable-new-dtags by default to make the linker set # RUNPATH instead of RPATH on binaries. This is important because - # RUNPATH can be overriden using LD_LIBRARY_PATH at runtime. + # RUNPATH can be overridden using LD_LIBRARY_PATH at runtime. "--enable-new-dtags" # force target prefix. Some versions of binutils will make it empty if @@ -226,4 +241,4 @@ stdenv.mkDerivation { # collision due to the ld/as wrappers/symlinks in the latter. priority = 10; }; -} +}) diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index bbf01b293c00..6bd622a6e749 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.10.0"; + version = "2.13.2"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "kyYmPU/y7pR2kx5ymDMuJvinTo5hpKs0Jy3LZPjDJyw="; + sha256 = "1/O1n0nO+adY7KNVnz6xkESyODiLw61x68xE84EKW+I="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "swaZmlEoKSmH95pqAYW3ygOzQKkedWhc7FOMy3RnJFs="; + sha256 = "fy3i++HpGuKH9ijPY61O66PhFyORIpjkZV++75H5738="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "QjrLn+gxoJovMlLsIe24BNKVaFK3vgFk9BwRHSl/y3M="; + sha256 = "zO3KWbrudhCGpbdCUBRWQkK/snvDdUOxKF9ukZC+vno="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "pBzSswicNK8z/asmGhj+IhBSS0mPJSf91XBX75AGAtY="; + sha256 = "Sqn5tFpvlF9LbUyC1i38BsyM9B+MOmykt+5COMhuO1A="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "ekeA/+N59mgDtkchEP1p4jz74goaPySmvZ6urCLcUNw="; + sha256 = "9vrrBiz744s1W5FV7QO8QKL7pfK6OGPinnSOJSvMIOk="; }; }; diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 29c91a2a1505..dd1aeab81d16 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -12,59 +12,48 @@ let phpMajor = lib.versions.majorMinor php.version; - soFile = { - "7.4" = "blackfire-20190902"; - "8.0" = "blackfire-20200930"; - "8.1" = "blackfire-20210902"; - }.${phpMajor} or (throw "Unsupported PHP version."); - version = "1.78.1"; + version = "1.86.3"; hashes = { "x86_64-linux" = { system = "amd64"; - sha256 = "Q9VuZewJ/KX2ZL77d3YLsE80B0y3RYg/hE2H14s9An4="; + sha256 = { + "8.0" = "Vl16ssG+47CvGNTQBR6aNkEzoSor7B8F71TSN3x2bm0="; + "8.1" = "27yLfDJYTQ3Izr8M6XFEsEWb7WDmuKjKCdSCPfL9HUw="; + "8.2" = "tnxlB+Tq8qeRoHjBNl/CMI0UZb02ayssiRJSMZaTwWI="; + }; }; "i686-linux" = { system = "i386"; - sha256 = "YBt6OAeUsQZUyf7P6jIvknq2K0fGWl0xmJkEXFBlTyE="; + sha256 = { + "8.0" = "NF5R470FC/nrAvk57Y3wStT4EQrWCvntniD9rD1Fv/Y="; + "8.1" = "aAl+oX0QfL6wStUrrhB44JHqAvA4ZLbc3dQyRHJbcNU="; + "8.2" = "SWAC9XlJs1vNWnDWeuXHPOMQoA5kCqiSrWxNpRcXHns="; + }; }; "aarch64-linux" = { system = "arm64"; - sha256 = "NTM3xdu+60EBz7pbRyTvhrvvZWVn4tl+LgnkHG1IpYM="; + sha256 = { + "8.0" = "jrTCMkJWzPzzJU7eET+VCwKaiRPqcQKPPIJZrLAuJ6s="; + "8.1" = "WjomQa3+27mW8tR5u++LyVDtyNa7Bj8uS3FHsmdsafo="; + "8.2" = "3SGtZkKosxKsJ/qTlP7BFpnroOTRaWFsvDHq1fK1UBE="; + }; }; "aarch64-darwin" = { system = "arm64"; sha256 = { - "7.4" = { - normal = "4raEYMELZjWfC82348l94G9MTHX2jnF+ZvF4AAxN9JA="; - zts = "HWrcLRZeyFtfJId42iHDN2ci0kTfRoXC/pEv2tObNT8="; - }; - "8.0" = { - normal = "kRTULbqlaK3bXRC8WQ1npeZHqWnuobN7eO20oYD5OIE="; - zts = "vWmSXueMIdi+hwmmhCQcltywphLjsNQoCW7eN2KDRvc="; - }; - "8.1" = { - normal = "JSM/HC2ZYaSBl+cSUtaKQBYPziKk013mwyW9S4DoXFA="; - zts = "9OMm9rEs0o+daxhZdSps4NWQJegLU09zd3SLclGDOns="; - }; + "8.0" = "MDPgDfIOfjr/VMGrxj7159xJl6P3jPYgoNOkISZBmX4="; + "8.1" = "zV5gjpA9tNGo/p/Is8n8WfGyIdb/IQDbfH1KuD8S4s8="; + "8.2" = "+zwX3r9X/avQvcmNtt5RT3smY+4yfXFo8XPCiV9xWT4="; }; }; "x86_64-darwin" = { system = "amd64"; sha256 = { - "7.4" = { - normal = "rWaf0Vjkrj78q+64Zy7gJ94Lfwd8waMaOWqoPqRJLRw="; - zts = "zU4cPAWc4k1OEho0fZKutcJ06LstSZhA4U18zx9nfi0="; - }; - "8.0" = { - normal = "huGvDPaAmfy8YM6Bg3Y0Ys6JhfIdddOXl1DnnRQsvoE="; - zts = "V4QWMdMhbjQtb2M7g+oHvqy+Mv0Y9j9MwyqeuMZfYkg="; - }; - "8.1" = { - normal = "pnxegrKPe8WoYAcrnBJanoYT1rg8nO8kQ7SJXQJfymg="; - zts = "m0grZ4Xl6Sm5ZPvmS6mcJGcQOA2ECPJKvzmccqPlyBE="; - }; + "8.0" = "wEsbQrowYgOlbWUkv+yPtPliC9b/iIUXBsvrCXCL6aM="; + "8.1" = "zl7OX3LlBLxn0oLYlNbVavxL4rho4LS3EZmAB2x6zZs="; + "8.2" = "fYGIDxNeBx+HyPx9lhfNZgKUeMJwZ4KvUcJ4jtwH5nQ="; }; }; }; @@ -73,57 +62,40 @@ let { system, phpMajor, - ztsSupport, }: let isLinux = builtins.match ".+-linux" system != null; in - assert !isLinux -> (phpMajor != null && ztsSupport != null); + assert !isLinux -> (phpMajor != null); fetchurl { url = - if isLinux - then "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_${hashes.${system}.system}.deb" - else "https://packages.blackfire.io/homebrew/blackfire-php_${version}-darwin_${hashes.${system}.system}-php${builtins.replaceStrings ["."] [""] phpMajor}${lib.optionalString ztsSupport "-zts"}.tar.gz"; - sha256 = - if isLinux - then hashes.${system}.sha256 - else hashes.${system}.sha256.${phpMajor}.${if ztsSupport then "zts" else "normal"}; + "https://packages.blackfire.io/binaries/blackfire-php/${version}/blackfire-php-${if isLinux then "linux" else "darwin"}_${hashes.${system}.system}-php-${builtins.replaceStrings [ "." ] [ "" ] phpMajor}.so"; + sha256 = hashes.${system}.sha256.${phpMajor}; }; self = stdenv.mkDerivation rec { pname = "php-blackfire"; + extensionName = "blackfire"; inherit version; src = makeSource { system = stdenv.hostPlatform.system; inherit phpMajor; - inherit (php) ztsSupport; + inherit (php); }; nativeBuildInputs = lib.optionals stdenv.isLinux [ - dpkg autoPatchelfHook ]; - setSourceRoot = if stdenv.isDarwin then "sourceRoot=`pwd`" else null; + setSourceRoot = "sourceRoot=`pwd`"; - unpackPhase = if stdenv.isLinux then '' - runHook preUnpack - dpkg-deb -x $src pkg - sourceRoot=pkg - - runHook postUnpack - '' else null; + dontUnpack = true; installPhase = '' runHook preInstall - if ${ lib.boolToString stdenv.isLinux } - then - install -D usr/lib/blackfire-php/*/${soFile}${lib.optionalString php.ztsSupport "-zts"}.so $out/lib/php/extensions/blackfire.so - else - install -D blackfire.so $out/lib/php/extensions/blackfire.so - fi + install -D ${src} $out/lib/php/extensions/blackfire.so runHook postInstall ''; @@ -167,11 +139,6 @@ self = stdenv.mkDerivation rec { if builtins.length rest == 0 then null else builtins.head rest; - ztsSupport = - if builtins.length rest == 0 - then null - else - builtins.head (builtins.tail rest) == "zts"; }; createUpdateable = diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index eaccf4badf2a..cad25a942d69 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.7.3"; + version = "4.7.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-i5VOKBNAzu65Ha3Lj3Hh6k+EMGPRAo5/qnwnJipDnMI="; + sha256 = "sha256-mt5udwSdzGaspfpAdUavQ55dBeJdhbZjcQpd9xNOQms="; }; outputs = [ "out" "man" ]; @@ -47,7 +47,7 @@ let ccache = stdenv.mkDerivation rec { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ # test/run requires the compgen function which is available in # bashInteractive, but not bash. bashInteractive @@ -110,9 +110,7 @@ let ccache = stdenv.mkDerivation rec { }; }; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Compiler cache for fast recompilation of C/C++ code"; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index b4bb1bc2d705..6fcdb5b753aa 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.22426"; + version = "0.1.23272"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zGMaFRa0gR7Meyhm1lEn6klCB6T3iNFqAinLiIKstt4="; + sha256 = "sha256-Yj7bIVVCG2q6Q2ij+rH3AAC4xW7Drz+pmdIM2ToPJX4="; }; - vendorSha256 = "sha256-+gDRe62EJdTeZJAbEPmjo+7A3TTiwggW/w4WRj5ZxwM="; + vendorHash = "sha256-qnn55C9ZK80gd/ZOtPvAGNJs0d96KqwruU4bZD6TQzY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index f55857a4ef01..8c4c58c052b0 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -10,18 +10,18 @@ stdenv.mkDerivation rec { pname = "cli11"; - version = "2.3.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "CLIUtils"; repo = "CLI11"; rev = "v${version}"; - sha256 = "sha256-J/hOgCDQPI0n2BGJK0+HIwlfNDVaZcxCC45uFAR7JUc="; + sha256 = "sha256-x3/kBlf5LdzkTO4NYOKanZBfcU4oK+fJw9L7cf88LsY="; }; nativeBuildInputs = [ cmake ]; - checkInputs = [ boost python3 catch2 ]; + nativeCheckInputs = [ boost python3 catch2 ]; doCheck = true; diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 5d6d4c1583c4..ddc8f596c72b 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,18 +2,18 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2022.11.03-00.14.57"; + version = "2023.01.26-11.08.16"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-NtvW0KT6d0k2oN//7xaTnBIoLKkc7zQFj3VdoFdgBWI="; + sha256 = "sha256-1dbeS9yF+qjmwDyfELQhlEyAI5B8092Lg0SwqvqXPgc="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "49e0a848dc32216a60f48eca68ff476cb69b999f6a79fb7310bf9fb2ffcaf4b6"; + sha256 = "7fe2f384233d5101483803f72d995b75cf3587eae10dc954989018c2accf711b"; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/misc/cmake-language-server/default.nix b/pkgs/development/tools/misc/cmake-language-server/default.nix index 168c40911e68..e245128aa28c 100644 --- a/pkgs/development/tools/misc/cmake-language-server/default.nix +++ b/pkgs/development/tools/misc/cmake-language-server/default.nix @@ -1,33 +1,35 @@ { lib , buildPythonApplication , fetchFromGitHub -, poetry , cmake-format , pygls , cmake +, pdm-pep517 , pytest-datadir , pytestCheckHook }: buildPythonApplication rec { pname = "cmake-language-server"; - version = "0.1.6"; + version = "unstable-2023-01-08"; format = "pyproject"; src = fetchFromGitHub { owner = "regen100"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-B7dhCQo3g2E8+fzyl1RhaYQE6TFoqoLtp9Z7sZcv5xk="; + rev = "60c376a5fda29835060687569cb212350a292116"; + hash = "sha256-vNG43sZy2wMetY5mbgxIoei5jCCj1f8vWiovWtwzbPc="; }; + PDM_PEP517_SCM_VERSION = "2023.1"; + patches = [ # Test timeouts occasionally cause the build to fail ./disable-test-timeouts.patch ]; nativeBuildInputs = [ - poetry + pdm-pep517 ]; propagatedBuildInputs = [ @@ -35,7 +37,7 @@ buildPythonApplication rec { pygls ]; - checkInputs = [ + nativeCheckInputs = [ cmake cmake-format pytest-datadir @@ -43,7 +45,10 @@ buildPythonApplication rec { ]; dontUseCmakeConfigure = true; - pythonImportsCheck = [ "cmake_language_server" ]; + + pythonImportsCheck = [ + "cmake_language_server" + ]; meta = with lib; { description = "CMake LSP Implementation"; diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix index 0229aba0f38b..f204b28ee1df 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -19,12 +19,12 @@ let stdenvNoCC.mkDerivation rec { pname = "coreboot-toolchain-${arch}"; - version = "4.16"; + version = "4.19"; src = fetchgit { url = "https://review.coreboot.org/coreboot"; rev = version; - sha256 = "sha256-PCum+IvJ136eZQLovUi9u4xTLLs17MkMP5Oc0/2mMY4="; + sha256 = "sha256-pGS+bfX2k/ot7sHL9aiaQpA0wtbHHZEObJ/h2JGF5/4="; fetchSubmodules = false; leaveDotGit = true; postFetch = '' @@ -70,7 +70,7 @@ let ); in -lib.listToAttrs (map (arch: lib.nameValuePair arch (common arch {})) [ +lib.listToAttrs (map (arch: lib.nameValuePair arch (common arch { })) [ "i386" "x64" "arm" diff --git a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix index 64ee3da1ad92..f8b6bd0ea68e 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix @@ -7,10 +7,10 @@ }; } { - name = "mpfr-4.1.0.tar.xz"; + name = "mpfr-4.1.1.tar.xz"; archive = fetchurl { - sha256 = "0zwaanakrqjf84lfr5hfsdr7hncwv9wj0mchlr7cmxigfgqs760c"; - url = "mirror://gnu/mpfr/mpfr-4.1.0.tar.xz"; + sha256 = "0gf3ibi7kzz39zj72qc9r607clyhm80gs8wbp71zzfkxasyrblgz"; + url = "mirror://gnu/mpfr/mpfr-4.1.1.tar.xz"; }; } { @@ -35,10 +35,10 @@ }; } { - name = "acpica-unix2-20211217.tar.gz"; + name = "R10_20_22.tar.gz"; archive = fetchurl { - sha256 = "0521hmaw2zhi0mpgnaf2i83dykfgql4bx98cg7xqy8wmj649z194"; - url = "https://acpica.org/sites/acpica/files/acpica-unix2-20211217.tar.gz"; + sha256 = "11iv3jrz27g7bv7ffyxsrgm4cq60cld2gkkl008p3lcwfyqpx88s"; + url = "https://github.com/acpica/acpica/archive/refs/tags//R10_20_22.tar.gz"; }; } { diff --git a/pkgs/development/tools/misc/coreboot-toolchain/update.sh b/pkgs/development/tools/misc/coreboot-toolchain/update.sh index 3acf22e2cd7d..fc758e4ab021 100755 --- a/pkgs/development/tools/misc/coreboot-toolchain/update.sh +++ b/pkgs/development/tools/misc/coreboot-toolchain/update.sh @@ -1,24 +1,26 @@ #!/usr/bin/env nix-shell #!nix-shell --pure -i bash -p nix cacert git getopt +# shellcheck shell=bash + if [ ! -d .git ]; then - echo "This script needs to be run from the root directory of nixpkgs. Exiting." - exit 1 + echo "This script needs to be run from the root directory of nixpkgs. Exiting." + exit 1 fi pkg_dir="$(dirname "$0")" src="$(nix-build . --no-out-link -A coreboot-toolchain.i386.src)" -urls=$($src/util/crossgcc/buildgcc -u) +urls=$("${src}/util/crossgcc/buildgcc" -u) tmp=$(mktemp) -echo '{ fetchurl }: [' > $tmp +echo '{ fetchurl }: [' >"$tmp" for url in $urls; do - name="$(basename $url)" - hash="$(nix-prefetch-url "$url")" + name="$(basename "$url")" + hash="$(nix-prefetch-url "$url")" - cat << EOF >> $tmp + cat <>"$tmp" { name = "$name"; archive = fetchurl { @@ -29,8 +31,8 @@ for url in $urls; do EOF done -echo ']' >> $tmp +echo ']' >>"$tmp" -sed -ie 's/https\:\/\/ftpmirror\.gnu\.org/mirror\:\/\/gnu/g' $tmp +sed -ie 's/https\:\/\/ftpmirror\.gnu\.org/mirror\:\/\/gnu/g' "$tmp" -mv $tmp $pkg_dir/sources.nix +mv "$tmp" "${pkg_dir}/sources.nix" diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index c79a2d252012..432f689d64dd 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { license = "BSD-style"; - homepage = "http://cscope.sourceforge.net/"; + homepage = "https://cscope.sourceforge.net/"; maintainers = with lib.maintainers; [viric]; diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix index dc6ee4815238..b33d6cafbe4a 100644 --- a/pkgs/development/tools/misc/ctags/default.nix +++ b/pkgs/development/tools/misc/ctags/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { alternatively, the index entry created for that object). Many programming languages are supported. ''; - homepage = "http://ctags.sourceforge.net/"; + homepage = "https://ctags.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index ae0846f479ca..59f00a9b0223 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -16,14 +16,14 @@ buildPythonApplication rec { pname = "cvise"; - version = "2.6.0"; + version = "2.7.0"; format = "other"; src = fetchFromGitHub { owner = "marxin"; repo = "cvise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-yREdWrGiH8Bb2bIxvlg4okGbkIM5XqC039Fj0rrsJos="; + sha256 = "sha256-j4s1xH0vO+/NNafQf1Jei7fgebSQ53WJKA+kYxuG2zQ="; }; patches = [ @@ -65,7 +65,7 @@ buildPythonApplication rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook unifdef ]; diff --git a/pkgs/development/tools/misc/debugedit/default.nix b/pkgs/development/tools/misc/debugedit/default.nix index afac7168c5b3..8da0effe7be5 100644 --- a/pkgs/development/tools/misc/debugedit/default.nix +++ b/pkgs/development/tools/misc/debugedit/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config help2man ]; buildInputs = [ elfutils ]; - checkInputs = [ util-linux ]; # Tests use `rev` + nativeCheckInputs = [ util-linux ]; # Tests use `rev` src = fetchgit { url = "git://sourceware.org/git/debugedit.git"; diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 45edeb89a9c7..6c2799cfadf7 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; configureScript = "../configure"; - doCheck = true; + doCheck = !(with stdenv; isDarwin && isAarch64); # Note: The test-suite *requires* /dev/pts among the `build-chroot-dirs' of # the build daemon when building in a chroot. See diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix index 8ff854d31965..b34c460fa16c 100644 --- a/pkgs/development/tools/misc/devspace/default.nix +++ b/pkgs/development/tools/misc/devspace/default.nix @@ -1,18 +1,17 @@ -{ - lib, - buildGoModule, - fetchFromGitHub +{ lib +, buildGoModule +, fetchFromGitHub }: buildGoModule rec { pname = "devspace"; - version = "6.1.1"; + version = "6.2.5"; src = fetchFromGitHub { owner = "loft-sh"; repo = "devspace"; rev = "v${version}"; - sha256 = "sha256-2LSRmTWbG7sxV5e6N44HAPdqIL/O2UxcnuHXmbTooWs="; + sha256 = "sha256-IdJlYCoI8wTl1kIY5M5Lfn+Y9WjSZkLuWI5pFsfAO0I="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix index 2b9d543fb791..0ce3bb52cd4f 100644 --- a/pkgs/development/tools/misc/dfu-util/default.nix +++ b/pkgs/development/tools/misc/dfu-util/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 ]; src = fetchurl { - url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; + url = "https://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; sha256 = "sha256-tLU7ohqC7349TEffKVKt9fpJT0mbawtXxYxdBK6P8Z4="; }; diff --git a/pkgs/development/tools/misc/dura/default.nix b/pkgs/development/tools/misc/dura/default.nix index ab88298f45a3..eba3f16c3659 100644 --- a/pkgs/development/tools/misc/dura/default.nix +++ b/pkgs/development/tools/misc/dura/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - description = "A background process that saves uncommited changes on git"; + description = "A background process that saves uncommitted changes on git"; longDescription = '' Dura is a background process that watches your Git repositories and commits your uncommitted changes without impacting HEAD, the current diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index 3accb063cc7d..1649031a7e7d 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, editorconfig-checker }: buildGoModule rec { pname = "editorconfig-checker"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = version; - sha256 = "sha256-S/iIanLToWN4OsItvSLGSEhgoYRJgUt0w3QFp1+scfY="; + hash = "sha256-8qGRcyDayXx3OflhE9Kw2AXM702/2pYB3JgfpQ0UYR8="; }; - vendorSha256 = "sha256-ktyUuWW0xlhRLkertrc4/ZYCyDh/tfYBuHqIrdTkotQ="; + vendorHash = "sha256-S93ZvC92V9nrBicEv1yQ3DEuf1FmxtvFoKPR15e8VmA="; doCheck = false; @@ -23,6 +23,10 @@ buildGoModule rec { installManPage docs/editorconfig-checker.1 ''; + passthru.tests.version = testers.testVersion { + package = editorconfig-checker; + }; + meta = with lib; { description = "A tool to verify that your files are in harmony with your .editorconfig"; homepage = "https://editorconfig-checker.github.io/"; diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 87271cf50ffa..2b71fa711670 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -37,10 +37,27 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0="; }) + (fetchpatch { + name = "use-curlopt_protocols_str-for-new-libcurl.patch"; + url = "https://sourceware.org/git/?p=elfutils.git;a=patch;h=6560fb26a62ef135a804357ef4f15a47de3e49b3;hp=a5b07cdf9c491fb7a4a16598c482c68b718f59b9"; + excludes = [ "debuginfod/ChangeLog" ]; # Doesn't apply + sha256 = "sha256-yjeliqojRGvfwbXynmxFGyKqAY7AEr0mbSGQEliYhZ4="; + }) + (fetchpatch { + name = "fix-usage-of-deprecated-curlinfo.patch"; + url = "https://sourceware.org/git/?p=elfutils.git;a=patch;h=d2bf497b12fbd49b4996ccf0744303ffd67735b1;hp=6ecd16410ce1fe5cb0ac5b7c3342c5cc330e3a04"; + excludes = [ "debuginfod/ChangeLog" ]; # Doesn't apply + sha256 = "sha256-zMx/TazM7vXJre2XagIWvwRS8cd8pbzMTmAbpbqZmx0="; + }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ]; postPatch = '' patchShebangs tests/*.sh + '' + lib.optionalString stdenv.hostPlatform.isRiscV '' + # disable failing test: + # + # > dwfl_thread_getframes: No DWARF information found + sed -i s/run-backtrace-dwarf.sh//g tests/Makefile.in ''; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 4486636a9f50..667acd91f349 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, targetPackages # Build time -, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages +, fetchurl, fetchpatch, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time , ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu, sourceHighlight @@ -47,6 +47,12 @@ stdenv.mkDerivation rec { patches = [ ./debug-info-from-env.patch + # backport readline=8.2 support + (fetchpatch { + name = "readline-8.2.patch"; + url = "https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=1add37b567a7dee39d99f37b37802034c3fce9c4"; + hash = "sha256-KmQXylPAWNGXF8wtXCCArhUzHi+GUY8ii2Xpx8R08jE="; + }) ] ++ lib.optionals stdenv.isDarwin [ ./darwin-target-match.patch # Does not nave to be conditional. We apply it conditionally @@ -141,7 +147,8 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; - platforms = with platforms; linux ++ cygwin ++ darwin; + # GDB upstream does not support ARM darwin + platforms = with platforms; linux ++ cygwin ++ ["x86_64-darwin"]; maintainers = with maintainers; [ pierron globin lsix ]; }; } diff --git a/pkgs/development/tools/misc/gef/default.nix b/pkgs/development/tools/misc/gef/default.nix index cfc6f1b5de6f..b814cd2b2351 100644 --- a/pkgs/development/tools/misc/gef/default.nix +++ b/pkgs/development/tools/misc/gef/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { ]} ''; - checkInputs = [ + nativeCheckInputs = [ gdb file ps diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix index 11e7547afc4c..155324aa49cb 100644 --- a/pkgs/development/tools/misc/go-license-detector/default.nix +++ b/pkgs/development/tools/misc/go-license-detector/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-a9yCnGg+4f+UoHbGG8a47z2duBD3qXcAzPKnE4PQsvM="; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; meta = with lib; { description = "Reliable project licenses detector"; diff --git a/pkgs/development/tools/misc/grpc-client-cli/default.nix b/pkgs/development/tools/misc/grpc-client-cli/default.nix index 15d9dc6fdcaa..b569b9ff9f6c 100644 --- a/pkgs/development/tools/misc/grpc-client-cli/default.nix +++ b/pkgs/development/tools/misc/grpc-client-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-client-cli"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "vadimi"; repo = "grpc-client-cli"; rev = "v${version}"; - sha256 = "sha256-MZEsThE0cajIJXvsuefNjQMAmnATNCWYBVVJQnd+q6c="; + sha256 = "sha256-tvpLsiZvGneabAoTewIEnCh+0lzbr7DNepjXGg7azLc="; }; - vendorSha256 = "sha256-4rU2r0hOR+XCZubLZCNnqoJ1br/WNtb70HN5urat5jQ="; + vendorSha256 = "sha256-NFVDDOejclWA2WQr7CHX1CUNu+Lh5jukroSrkxby8Ag="; meta = with lib; { description = "generic gRPC command line client"; diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix index ff5fe7bcba40..c977ca3070e4 100644 --- a/pkgs/development/tools/misc/gtkperf/default.nix +++ b/pkgs/development/tools/misc/gtkperf/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Application designed to test GTK performance"; - homepage = "http://gtkperf.sourceforge.net/"; + homepage = "https://gtkperf.sourceforge.net/"; license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/tools/misc/highlight-assertions/default.nix b/pkgs/development/tools/misc/highlight-assertions/default.nix new file mode 100644 index 000000000000..c16bf863349a --- /dev/null +++ b/pkgs/development/tools/misc/highlight-assertions/default.nix @@ -0,0 +1,25 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "highlight-assertions"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "thehamsta"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-OVf8s7zuGj5//zWJIVBfHBoA6zD+l8lqVQGn2vHsvSQ="; + }; + + cargoSha256 = "sha256-cS4IbFuxZCKDIAcgiKzBF/qQ6mXZb9omvMeGcU+yWpk="; + + # requires nightly features + RUSTC_BOOTSTRAP = 1; + + meta = with lib; { + description = "A tool for unit testing tree sitter highlights for nvim-treesitter"; + homepage = "https://github.com/thehamsta/highlight-assertions"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index fdae764dc458..4c141f5a87bc 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -46,7 +46,6 @@ , cacert , glibcLocales , fetchFromGitHub -, fetchpatch , nixosTests }: @@ -127,44 +126,35 @@ let in stdenv.mkDerivation rec { pname = "hydra"; - version = "2022-10-22"; + version = "2022-12-23"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "312cb42275e593eea5c44d8430ab09375fdb2fdb"; - sha256 = "sha256-ablHzPwN2Pvju0kyo8N5Wavqkl60gKHCPLnruwqvwTg="; + rev = "f48f00ee6d5727ae3e488cbf9ce157460853fea8"; + sha256 = "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4="; }; - patches = [ - # https://github.com/NixOS/hydra/pull/1215: scmdiff: Hardcode --git-dir - (fetchpatch { - url = "https://github.com/NixOS/hydra/commit/b6ea85a601ddac9cb0716d8cb4d446439fa0778f.patch"; - sha256 = "sha256-QHjwLYQucdkBs6OsFI8kWo5ugkPXXlTgdbGFxKBHAHo="; - }) + buildInputs = [ + libpqxx + top-git + mercurial + darcs + subversion + breezy + openssl + bzip2 + libxslt + nix + perlDeps + perl + pixz + boost + postgresql + nlohmann_json + prometheus-cpp ]; - buildInputs = - [ - libpqxx - top-git - mercurial - darcs - subversion - breezy - openssl - bzip2 - libxslt - nix - perlDeps - perl - pixz - boost - postgresql - nlohmann_json - prometheus-cpp - ]; - hydraPath = lib.makeBinPath ( [ subversion @@ -196,7 +186,7 @@ stdenv.mkDerivation rec { nukeReferences ]; - checkInputs = [ + nativeCheckInputs = [ cacert foreman glibcLocales diff --git a/pkgs/development/tools/misc/igprof/default.nix b/pkgs/development/tools/misc/igprof/default.nix index 91d78d0f5fdc..a4e170f31b2a 100644 --- a/pkgs/development/tools/misc/igprof/default.nix +++ b/pkgs/development/tools/misc/igprof/default.nix @@ -1,14 +1,14 @@ {lib, stdenv, fetchFromGitHub, libunwind, cmake, pcre, gdb}: stdenv.mkDerivation rec { - version = "5.9.16"; + version = "5.9.18"; pname = "igprof"; src = fetchFromGitHub { owner = "igprof"; repo = "igprof"; rev = "v${version}"; - sha256 = "0rx3mv8zdh9bmcpfbzkib3d52skzfr8600gh5gv21wcsh50jnifx"; + sha256 = "sha256-UTrAaH8C79km78Z/7NxvQ6dnl4u4Ki80nORf4bsoSNw="; }; postPatch = '' diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index 8c5671605d55..d4e049f1d4e9 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -14,9 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix index 2c189cbf5a61..d4950caaa9d8 100644 --- a/pkgs/development/tools/misc/itstool/default.nix +++ b/pkgs/development/tools/misc/itstool/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://itstool.org/"; + homepage = "https://itstool.org/"; description = "XML to PO and back again"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; diff --git a/pkgs/development/tools/misc/jiq/default.nix b/pkgs/development/tools/misc/jiq/default.nix index 61477a4c7de0..9889ca67c5a2 100644 --- a/pkgs/development/tools/misc/jiq/default.nix +++ b/pkgs/development/tools/misc/jiq/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - checkInputs = [ jq ]; + nativeCheckInputs = [ jq ]; postInstall = '' wrapProgram $out/bin/jiq \ @@ -26,6 +26,6 @@ buildGoModule rec { homepage = "https://github.com/fiatjaf/jiq"; license = licenses.mit; description = "jid on jq - interactive JSON query tool using jq expressions"; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index 3798da7af7b2..fa58d1fbbf42 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -9,11 +9,10 @@ , which }: -with lib; let nodejs = nodejs-16_x; inherit (builtins) elemAt; - info = splitString "-" stdenv.hostPlatform.system; + info = lib.splitString "-" stdenv.hostPlatform.system; arch = elemAt info 0; plat = elemAt info 1; shas = @@ -50,7 +49,7 @@ in stdenv.mkDerivation rec { sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana ''; - meta = { + meta = with lib; { description = "Visualize logs and time-stamped data"; homepage = "http://www.elasticsearch.org/overview/kibana"; license = licenses.elastic; diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 8625a421af64..a2c58010eff7 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoconf, automake, m4, perl, help2man +{ lib, stdenv, fetchurl, fetchpatch, m4 , runtimeShell , file }: @@ -23,28 +23,22 @@ stdenv.mkDerivation rec { # https://lists.gnu.org/archive/html/autotools-announce/2022-03/msg00000.html FILECMD = "${file}/bin/file"; - # Normally we'd use autoreconfHook, but that includes libtoolize. - postPatch = '' - aclocal -I m4 - automake - autoconf - - pushd libltdl - aclocal -I ../m4 - automake - autoconf - popd - '' + + postPatch = # libtool commit da2e352735722917bf0786284411262195a6a3f6 changed # the shebang from `/bin/sh` (which is a special sandbox exception) # to `/usr/bin/env sh`, meaning that we now need to patch shebangs # in libtoolize.in: '' substituteInPlace libtoolize.in --replace '#! /usr/bin/env sh' '#!${runtimeShell}' + # avoid help2man run after 'libtoolize.in' update + touch doc/libtoolize.1 ''; strictDeps = true; - nativeBuildInputs = [ autoconf automake help2man m4 perl ]; + # As libtool is an early bootstrap dependency try hard not to + # add autoconf and automake or help2man dependencies here. That way we can + # avoid pulling in perl and get away with just an `m4` depend. + nativeBuildInputs = [ m4 file ]; propagatedBuildInputs = [ m4 file ]; # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the diff --git a/pkgs/development/tools/misc/libtree/default.nix b/pkgs/development/tools/misc/libtree/default.nix index 219ce239f488..624d33561e6a 100644 --- a/pkgs/development/tools/misc/libtree/default.nix +++ b/pkgs/development/tools/misc/libtree/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # note: "make check" returns exit code 0 even when the tests fail. # This has been reported upstream: # https://github.com/haampie/libtree/issues/77 - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; checkTarget = [ "check" ]; doCheck = true; diff --git a/pkgs/development/tools/misc/libwhich/default.nix b/pkgs/development/tools/misc/libwhich/default.nix index aeda5271142a..aee79b826444 100644 --- a/pkgs/development/tools/misc/libwhich/default.nix +++ b/pkgs/development/tools/misc/libwhich/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libwhich"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "vtjnash"; repo = pname; rev = "v${version}"; - sha256 = "0s0pqai61jszmi495k621rdlf288ij67adkz72hwqqarqp54idhb"; + sha256 = "sha256-JNIWdI12sL3TZqVA3GeH0KbgqFDbMsEdecea3392Goc="; }; installPhase = '' diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index 13944ad0222b..be07f7e9c246 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { "-X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.Version=${version}" ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; passthru.tests.version = testers.testVersion { package = linuxkit; diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix index aa991e8ea978..5a255df46806 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 = "14.0.0"; + version = "15.0.6"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "45e08ce87b0ea56ab632aa02fa857418a5dd241a711c7c756878b73a130c3efe"; + hash = "sha256-S06OQfDmDyutls21HxyQ016ku3FTTsDOP8Di67d9f+k="; }; passthru = { @@ -14,6 +14,9 @@ python3.pkgs.buildPythonApplication rec { }; # Non-standard test suite. Needs custom checkPhase. + # Needs LLVM's `FileCheck` and `not`: `$out/bin/lit tests` + # There should be `llvmPackages.lit` since older LLVM versions may + # have the possibility of not correctly interfacing with newer lit versions doCheck = false; meta = { diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix index 32a14404c606..899ee219c4d7 100644 --- a/pkgs/development/tools/misc/loccount/default.nix +++ b/pkgs/development/tools/misc/loccount/default.nix @@ -1,18 +1,29 @@ -{ lib, buildGoPackage, fetchFromGitLab }: -buildGoPackage rec { +{ lib, buildGoModule, fetchFromGitLab, python3 }: +buildGoModule rec { pname = "loccount"; - version = "1.2"; - - goPackagePath = "gitlab.com/esr/loccount"; - excludedPackages = "tests"; + version = "2.14"; src = fetchFromGitLab { owner = "esr"; repo = "loccount"; rev = version; - sha256 = "18z7ai7wy2k9yd3w65d37apfqs3h9bc2c15y7v1bydppi44zfsdk"; + hash = "sha256-9tzDNwWM4uzxC+xqM603l8EIqYrGUUvZgSe6r1EyHi8="; }; + vendorHash = null; + + excludedPackages = "tests"; + + nativeBuildInputs = [ python3 ]; + + ldflags = [ "-s" "-w" ]; + + preBuild = '' + patchShebangs --build tablegen.py + + go generate + ''; + meta = with lib; { description = "Re-implementation of sloccount in Go"; longDescription = '' @@ -26,10 +37,9 @@ buildGoPackage rec { an exception; loccount corrects buggy counting of single-quote multiline literals in sloccount 2.26. ''; - homepage="https://gitlab.com/esr/loccount"; - downloadPage="https://gitlab.com/esr/loccount/tree/master"; + homepage = "https://gitlab.com/esr/loccount"; + downloadPage = "https://gitlab.com/esr/loccount/tree/master"; license = licenses.bsd2; maintainers = with maintainers; [ calvertvl ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index ac80fc471e06..017367e90ba6 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -6,13 +6,13 @@ in stdenv.mkDerivation rec { pname = "lsof"; - version = "4.96.4"; + version = "4.96.5"; src = fetchFromGitHub { owner = "lsof-org"; repo = "lsof"; rev = version; - sha256 = "sha256-S+8KizjayqeiWsMySWjRoZQf7ODCjdMq5ULoetOdYiA="; + hash = "sha256-3ZEGCKc7inbqcE4LuhfKON3C8LebVOlZPEhOHVgx8Lo="; }; patches = [ diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index 79b6cf2a8b5f..9114e7cf4cef 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; # Some patches impact ./configure. buildInputs = [ elfutils ]; - checkInputs = [ dejagnu ]; + nativeCheckInputs = [ dejagnu ]; # Import Fedora's (very) large patch series: bug fixes, architecture support, # etc. RH/Fedora are currently working with upstream to merge all these diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index fdb0bfde7d40..01d62cac0e9e 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.8"; + version = "2.13.9"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-selZV5smB5CTCyDzx6p877ikDg3oDUp3fCv3jGs1PcE="; + sha256 = "sha256-jZTclbYIz3AhawEgOj+CQrl6Iy2y4jQhovQ3CNoI8zc="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index da61e1f8a41d..581b4eaeb892 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -104,9 +104,7 @@ stdenv.mkDerivation (self: { ]; passthru = { - updateScript = nix-update-script { - attrPath = self.pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/development/tools/misc/n98-magerun/default.nix b/pkgs/development/tools/misc/n98-magerun/default.nix new file mode 100644 index 000000000000..062cb39d62d4 --- /dev/null +++ b/pkgs/development/tools/misc/n98-magerun/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, makeWrapper, unzip, lib, php80 }: + +let + pname = "n98-magerun"; + version = "2.3.0"; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "netz98"; + repo = "n98-magerun1-dist"; + rev = version; + sha256 = "sha256-T7wQmEEYMG0J6+9nRt+tiMuihjnjjQ7UWy1C0vKoQY4="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src/n98-magerun $out/libexec/n98-magerun/n98-magerun-${version}.phar + makeWrapper ${php80}/bin/php $out/bin/n98-magerun \ + --add-flags "$out/libexec/n98-magerun/n98-magerun-${version}.phar" \ + --prefix PATH : ${lib.makeBinPath [ unzip ]} + runHook postInstall + ''; + + meta = with lib; { + description = "The swiss army knife for Magento1/OpenMage developers"; + license = licenses.mit; + homepage = "https://magerun.net/"; + changelog = "https://magerun.net/category/magerun/"; + maintainers = teams.php.members; + }; +} diff --git a/pkgs/development/tools/misc/n98-magerun2/default.nix b/pkgs/development/tools/misc/n98-magerun2/default.nix new file mode 100644 index 000000000000..d9c138281ed4 --- /dev/null +++ b/pkgs/development/tools/misc/n98-magerun2/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, makeWrapper, unzip, lib, php }: + +let + pname = "n98-magerun2"; + version = "6.1.1"; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "netz98"; + repo = "n98-magerun2-dist"; + rev = version; + sha256 = "sha256-D2U1kLG6sOpBHDzNQ/LbiFUknvFhK+rkOPgWvW0pNmY="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src/n98-magerun2 $out/libexec/n98-magerun2/n98-magerun2-${version}.phar + makeWrapper ${php}/bin/php $out/bin/n98-magerun2 \ + --add-flags "$out/libexec/n98-magerun2/n98-magerun2-${version}.phar" \ + --prefix PATH : ${lib.makeBinPath [ unzip ]} + runHook postInstall + ''; + + meta = with lib; { + description = "The swiss army knife for Magento2 developers"; + license = licenses.mit; + homepage = "https://magerun.net/"; + changelog = "https://magerun.net/category/magerun/"; + maintainers = teams.php.members; + }; +} diff --git a/pkgs/development/tools/misc/netcoredbg/default.nix b/pkgs/development/tools/misc/netcoredbg/default.nix index d736e4a1d29e..6ea15d74d8cf 100644 --- a/pkgs/development/tools/misc/netcoredbg/default.nix +++ b/pkgs/development/tools/misc/netcoredbg/default.nix @@ -64,6 +64,10 @@ stdenvNoCC.mkDerivation { ln -s $out/share/netcoredbg/netcoredbg $out/bin/netcoredbg ''; + passthru = { + inherit (managed) fetch-deps; + }; + meta = with lib; { description = "Managed code debugger with MI interface for CoreCLR"; homepage = "https://github.com/Samsung/netcoredbg"; diff --git a/pkgs/development/tools/misc/netcoredbg/deps.nix b/pkgs/development/tools/misc/netcoredbg/deps.nix index 8285009fc20f..8d311ab7f8bd 100644 --- a/pkgs/development/tools/misc/netcoredbg/deps.nix +++ b/pkgs/development/tools/misc/netcoredbg/deps.nix @@ -1,3 +1,6 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "1.1.0"; sha256 = "08r667hj2259wbim1p3al5qxkshydykmb7nd9ygbjlg4mmydkapc"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "2.3.0"; sha256 = "1p29v4499qpyh7k7fv1li2y3c688zg95ic8gq9if1nqmjciz5w7p"; }) @@ -8,6 +11,22 @@ (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) (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"; }) @@ -24,6 +43,11 @@ (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 = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) @@ -45,6 +69,7 @@ (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) diff --git a/pkgs/development/tools/misc/nimlsp/default.nix b/pkgs/development/tools/misc/nimlsp/default.nix index af4ed6977b19..9c6505b3abd5 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.4.1"; + version = "0.4.4"; nimBinOnly = true; src = fetchFromGitHub { owner = "PMunch"; repo = "nimlsp"; rev = "v${version}"; - sha256 = "sha256-LAtUGhYEcOwvZzexQ2y3/HPgOge2EsScCbujJ/hz5Ec="; + sha256 = "sha256-Z67iKlL+dnRbxdFt/n/fsUcb2wpZwzPpL/G29jfCaMY="; }; - buildInputs = with nimPackages; [ jsonschema ]; + buildInputs = with nimPackages; [ jsonschema asynctools ]; nimFlags = [ "--threads:on" diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/development/tools/misc/nrfutil/default.nix index 5c88bd130599..37197727974e 100644 --- a/pkgs/development/tools/misc/nrfutil/default.nix +++ b/pkgs/development/tools/misc/nrfutil/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ behave nose ]; diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index 2106a649775c..6dd504a3cf9e 100644 --- a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "nxpmicro-mfgtools"; - version = "1.4.243"; + version = "1.5.11"; src = fetchFromGitHub { owner = "NXPmicro"; repo = "mfgtools"; rev = "uuu_${version}"; - hash = "sha256-gyy9D6y1y+9GlT3wfW+huoWaZP1e8YzZnc7EbJftppI="; + hash = "sha256-RD0haw0C89uvTlLHtvlv1VwU4Jw2U19Caiq+BSfB4hU="; }; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; diff --git a/pkgs/development/tools/misc/om4/default.nix b/pkgs/development/tools/misc/om4/default.nix index 30f1bb273fd3..4425ae52fb5f 100644 --- a/pkgs/development/tools/misc/om4/default.nix +++ b/pkgs/development/tools/misc/om4/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd2 bsd3 isc publicDomain ]; mainProgram = "m4"; platforms = platforms.unix; - maintainers = [ maintainers.ninjin ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index ab4db7a8cc8c..ec9fb436f764 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/"; - description = "Pahole and other DWARF utils"; + description = "Shows, manipulates, and pretty-prints debugging information in DWARF, CTF, and BTF formats"; license = licenses.gpl2Only; platforms = platforms.linux; diff --git a/pkgs/development/tools/misc/patchelf/setup-hook.sh b/pkgs/development/tools/misc/patchelf/setup-hook.sh index 576b9ca2103e..8f010a3f4d0b 100644 --- a/pkgs/development/tools/misc/patchelf/setup-hook.sh +++ b/pkgs/development/tools/misc/patchelf/setup-hook.sh @@ -8,7 +8,7 @@ patchELF() { local dir="$1" [ -e "$dir" ] || return 0 - header "shrinking RPATHs of ELF executables and libraries in $dir" + echo "shrinking RPATHs of ELF executables and libraries in $dir" local i while IFS= read -r -d $'\0' i; do @@ -17,6 +17,4 @@ patchELF() { echo "shrinking $i" patchelf --shrink-rpath "$i" || true done < <(find "$dir" -type f -print0) - - stopNest } diff --git a/pkgs/development/tools/misc/patsh/default.nix b/pkgs/development/tools/misc/patsh/default.nix new file mode 100644 index 000000000000..ba3b232a417b --- /dev/null +++ b/pkgs/development/tools/misc/patsh/default.nix @@ -0,0 +1,51 @@ +{ lib +, runCommand +, rustPlatform +, fetchFromGitHub +, stdenv +, coreutils +}: + +let + # copied from flake.nix + # tests require extra setup with nix + custom = runCommand "custom" { } '' + mkdir -p $out/bin + touch $out/bin/{'foo$','foo"`'} + chmod +x $out/bin/{'foo$','foo"`'} + ''; +in + +rustPlatform.buildRustPackage rec { + pname = "patsh"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-7HXJspebluQeejKYmVA7sy/F3dtU1gc4eAbKiPexMMA="; + }; + + cargoSha256 = "sha256-R6ScpLYbEJAu7+CyJsMdljtXq7wsMojHK5O1lH+E/E8="; + + nativeCheckInputs = [ custom ]; + + # see comment on `custom` + postPatch = '' + for file in tests/fixtures/*-expected.sh; do + substituteInPlace $file \ + --subst-var-by cc ${stdenv.cc} \ + --subst-var-by coreutils ${coreutils} \ + --subst-var-by custom ${custom} + done + ''; + + meta = with lib; { + description = "A command-line tool for patching shell scripts inspired by resholve"; + homepage = "https://github.com/nix-community/patsh"; + changelog = "https://github.com/nix-community/patsh/blob/v${version}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index f2721ab952c6..d4feca6dfe6e 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl, libiconv, vanilla ? false }: -with lib; - stdenv.mkDerivation rec { pname = "pkg-config"; version = "0.29.2"; @@ -17,20 +15,20 @@ stdenv.mkDerivation rec { # Process Requires.private properly, see # http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/28 - patches = optional (!vanilla) ./requires-private.patch - ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch; + patches = lib.optional (!vanilla) ./requires-private.patch + ++ lib.optional stdenv.isCygwin ./2.36.3-not-win32.patch; # These three tests fail due to a (desired) behavior change from our ./requires-private.patch postPatch = if vanilla then null else '' rm -f check/check-requires-private check/check-gtk check/missing ''; - buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; + buildInputs = [ libiconv ]; configureFlags = [ "--with-internal-glib" ] - ++ optionals (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ] + ++ lib.optionals (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ] # Can't run these tests while cross-compiling - ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "glib_cv_stack_grows=no" "glib_cv_uscore=no" "ac_cv_func_posix_getpwuid_r=yes" @@ -42,7 +40,7 @@ stdenv.mkDerivation rec { postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file - meta = { + meta = with lib; { description = "A tool that allows packages to find out information about other packages"; homepage = "http://pkg-config.freedesktop.org/wiki/"; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix index 7e7b60de295f..b80def838887 100644 --- a/pkgs/development/tools/misc/pkgconf/default.nix +++ b/pkgs/development/tools/misc/pkgconf/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "pkgconf"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-X7NVtIfVT7bTQeTxjU4vfoE6ZiLPA6noev+mpAVlaZ0="; + hash = "sha256-2szxu+WjDRSbVWx9L//+r9dte1FOJJJxq91QFTPB2K4="; }; outputs = [ "out" "lib" "dev" "man" "doc" ]; diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index bb0269d0cc3b..8fefb65e79be 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -1,21 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, Foundation, readline }: - -with lib; +{ lib, stdenv, fetchFromGitHub, libuuid, cacert, Foundation, readline }: stdenv.mkDerivation rec { pname = "premake5"; - version = "5.0.0-alpha12"; + version = "5.0.0-beta2"; src = fetchFromGitHub { owner = "premake"; repo = "premake-core"; rev = "v${version}"; - sha256 = "1h3hr96pdz94njn4bg02ldcz0k5j1x017d8svc7fdyvl2b77nqzf"; + sha256 = "sha256-2R5gq4jaQsp8Ny1oGuIYkef0kn2UG9jMf20vq0714oY="; }; - buildInputs = optionals stdenv.isDarwin [ Foundation readline ]; + buildInputs = [ libuuid ] ++ lib.optionals stdenv.isDarwin [ Foundation readline ]; - patchPhase = optional stdenv.isDarwin '' + patches = [ ./no-curl-ca.patch ]; + patchPhase = '' + substituteInPlace contrib/curl/premake5.lua \ + --replace "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'" + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace premake5.lua \ --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 ''; @@ -38,6 +40,7 @@ stdenv.mkDerivation rec { homepage = "https://premake.github.io"; description = "A simple build configuration and project generation tool using lua"; license = lib.licenses.bsd3; - platforms = platforms.darwin ++ platforms.linux; + platforms = lib.platforms.darwin ++ lib.platforms.linux; + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/tools/misc/premake/no-curl-ca.patch b/pkgs/development/tools/misc/premake/no-curl-ca.patch new file mode 100644 index 000000000000..a1c9c1cfa18e --- /dev/null +++ b/pkgs/development/tools/misc/premake/no-curl-ca.patch @@ -0,0 +1,36 @@ +From a26e36d55cd2447488e01b2ff4ac65e2596862cd Mon Sep 17 00:00:00 2001 +From: Ellie Hermaszewska +Date: Mon, 3 Oct 2022 16:50:33 +0800 +Subject: [PATCH] Do not set CURL_CA_BUNDLE + +--- + contrib/curl/premake5.lua | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/contrib/curl/premake5.lua b/contrib/curl/premake5.lua +index 474f5cfa..553bbd02 100644 +--- a/contrib/curl/premake5.lua ++++ b/contrib/curl/premake5.lua +@@ -32,19 +32,6 @@ project "curl-lib" + + -- find the location of the ca bundle + local ca = nil +- for _, f in ipairs { +- "/etc/ssl/certs/ca-certificates.crt", +- "/etc/pki/tls/certs/ca-bundle.crt", +- "/usr/share/ssl/certs/ca-bundle.crt", +- "/usr/local/share/certs/ca-root.crt", +- "/usr/local/share/certs/ca-root-nss.crt", +- "/etc/certs/ca-certificates.crt", +- "/etc/ssl/cert.pem" } do +- if os.isfile(f) then +- ca = f +- break +- end +- end + if ca then + defines { 'CURL_CA_BUNDLE="' .. ca .. '"' } + end +-- +2.37.2 + diff --git a/pkgs/development/tools/misc/ptags/default.nix b/pkgs/development/tools/misc/ptags/default.nix index b8be0ee3dc6d..6f554e6d352b 100644 --- a/pkgs/development/tools/misc/ptags/default.nix +++ b/pkgs/development/tools/misc/ptags/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ptags"; - version = "0.3.2"; + version = "0.3.4"; src = fetchFromGitHub { owner = "dalance"; repo = "ptags"; rev = "v${version}"; - sha256 = "1xr1szh4dfrcmi6s6dj791k1ix2zbv75rqkqbyb1lmh5548kywkg"; + sha256 = "sha256-hFHzNdTX3nw2OwRxk9lKrt/YpaBXwi5aE/Qn3W9PRf4="; }; - cargoSha256 = "1pz5hvn1iq26i8c2cmqavhnri8h0sn40khrxvcdkj9q47nsj5wcx"; + cargoSha256 = "sha256-cFezB7uwUznC/8NXJNrBqP0lf0sXAQBoGksXFOGrUIg="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix index 347b6812a027..d80fa230c8a4 100644 --- a/pkgs/development/tools/misc/pwndbg/default.nix +++ b/pkgs/development/tools/misc/pwndbg/default.nix @@ -8,38 +8,45 @@ let pythonPath = with python3.pkgs; makePythonPath [ + capstone future - isort psutil + pwntools pycparser pyelftools - python-ptrace - ropgadget - six - unicorn pygments + unicorn + rpyc ]; + binPath = lib.makeBinPath ([ + python3.pkgs.pwntools # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/wrappers/checksec.py#L8 + ] ++ lib.optionals stdenv.isLinux [ + python3.pkgs.ropper # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/ropper.py#L30 + python3.pkgs.ropgadget # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/rop.py#L32 + ]); in stdenv.mkDerivation rec { pname = "pwndbg"; - version = "2022.08.30"; + version = "2022.12.19"; format = "other"; src = fetchFromGitHub { owner = "pwndbg"; repo = "pwndbg"; rev = version; - sha256 = "sha256-rMdpNJonzbHyTXbnr6MtlVUmfAfLiCHaVSzuQRhtVpE="; + sha256 = "sha256-pyY2bMasd6GaJZZjLF48SvkKUBw3XfVa0g3Q0LiEi4k="; + fetchSubmodules = true; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/share/pwndbg - cp -r *.py pwndbg $out/share/pwndbg + cp -r *.py pwndbg gdb-pt-dump $out/share/pwndbg chmod +x $out/share/pwndbg/gdbinit.py makeWrapper ${gdb}/bin/gdb $out/bin/pwndbg \ --add-flags "-q -x $out/share/pwndbg/gdbinit.py" \ + --prefix PATH : ${binPath} \ --set NIX_PYTHONPATH ${pythonPath} ''; @@ -48,6 +55,8 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/pwndbg/pwndbg"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ mic92 patryk4815 ]; + # not supported on aarch64-darwin see: https://inbox.sourceware.org/gdb/3185c3b8-8a91-4beb-a5d5-9db6afb93713@Spark/ + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/tools/misc/pwninit/default.nix b/pkgs/development/tools/misc/pwninit/default.nix index 7d3808f554c0..dcea47449cab 100644 --- a/pkgs/development/tools/misc/pwninit/default.nix +++ b/pkgs/development/tools/misc/pwninit/default.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "pwninit"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "io12"; repo = "pwninit"; rev = version; - sha256 = "sha256-XKDYJH2SG3TkwL+FN6rXDap8la07icR0GPFiYcnOHeI="; + sha256 = "sha256-Tskbwavr+MFa8wmwaFGe7o4/6ZpZqczzwOnqFR66mmM="; }; buildInputs = [ openssl xz ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; doCheck = false; # there are no tests to run - cargoSha256 = "sha256-2HCHiU309hbdwohUKVT3TEfGvOfxQWtEGj7FIS8OS7s="; + cargoSha256 = "sha256-LPypmFeF9NZOX1ogpIqc++Pun7pInKzpxYiGUvSUcso="; meta = { description = "Automate starting binary exploit challenges"; diff --git a/pkgs/development/tools/misc/python-launcher/default.nix b/pkgs/development/tools/misc/python-launcher/default.nix new file mode 100644 index 000000000000..c1d07cf0c761 --- /dev/null +++ b/pkgs/development/tools/misc/python-launcher/default.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchFromGitHub, python3 }: + +rustPlatform.buildRustPackage rec { + pname = "python-launcher"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "brettcannon"; + repo = pname; + rev = "v${version}"; + sha256 = "1r2pmli4jsdjag9zsgd9q1qlj3hxxjj2bni6yybjh1a10fcqxzzv"; + }; + + cargoSha256 = "sha256-2lgWybEPi6HEUMYuGDRWMjWoc94CrFHPP5IeKUjj0q4="; + + nativeCheckInputs = [ python3 ]; + + useNextest = true; + + meta = with lib; { + description = "An implementation of the `py` command for Unix-based platforms"; + homepage = "https://github.com/brettcannon/python-launcher"; + changelog = "https://github.com/brettcannon/python-launcher/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "py"; + }; +} diff --git a/pkgs/development/tools/misc/qtspim/default.nix b/pkgs/development/tools/misc/qtspim/default.nix index 7329ad509671..1ef63f1a431d 100644 --- a/pkgs/development/tools/misc/qtspim/default.nix +++ b/pkgs/development/tools/misc/qtspim/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "New user interface for spim, a MIPS simulator"; - homepage = "http://spimsimulator.sourceforge.net/"; + homepage = "https://spimsimulator.sourceforge.net/"; license = licenses.bsdOriginal; maintainers = with maintainers; [ emilytrau ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/misc/rdc/default.nix b/pkgs/development/tools/misc/rdc/default.nix new file mode 100644 index 000000000000..f26dca64f5bb --- /dev/null +++ b/pkgs/development/tools/misc/rdc/default.nix @@ -0,0 +1,124 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-smi +, rocm-runtime +, libcap +, grpc +, protobuf +, openssl +, doxygen +, graphviz +, texlive +, gtest +, buildDocs ? true +, buildTests ? false +}: + +let + latex = lib.optionalAttrs buildDocs texlive.combine { + inherit (texlive) scheme-small + latexmk + varwidth + multirow + hanging + adjustbox + collectbox + stackengine + enumitem + alphalph + wasysym + sectsty + tocloft + newunicodechar + etoc + helvetic + wasy + courier; + }; +in stdenv.mkDerivation (finalAttrs: { + pname = "rdc"; + version = "5.4.2"; + + outputs = [ + "out" + ] ++ lib.optionals buildDocs [ + "doc" + ] ++ lib.optionals buildTests [ + "test" + ]; + + src = fetchFromGitHub { + owner = "RadeonOpenCompute"; + repo = "rdc"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-dYacqkRp+zVejo/4dME1K6EN8t/1EBtIynEQ+AQ4JZo="; + }; + + nativeBuildInputs = [ + cmake + protobuf + ] ++ lib.optionals buildDocs [ + doxygen + graphviz + latex + ]; + + buildInputs = [ + rocm-smi + rocm-runtime + libcap + grpc + openssl + ] ++ lib.optionals buildTests [ + gtest + ]; + + cmakeFlags = [ + "-DCMAKE_VERBOSE_MAKEFILE=OFF" + "-DRDC_INSTALL_PREFIX=${placeholder "out"}" + "-DBUILD_ROCRTEST=ON" + "-DRSMI_INC_DIR=${rocm-smi}/include" + "-DRSMI_LIB_DIR=${rocm-smi}/lib" + "-DGRPC_ROOT=${grpc}" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBEXECDIR=libexec" + "-DCMAKE_INSTALL_DOCDIR=doc" + ] ++ lib.optionals buildTests [ + "-DBUILD_TESTS=ON" + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "file(STRINGS /etc/os-release LINUX_DISTRO LIMIT_COUNT 1 REGEX \"NAME=\")" "set(LINUX_DISTRO \"NixOS\")" + ''; + + postInstall = '' + find $out/bin -executable -type f -exec \ + patchelf {} --shrink-rpath --allowed-rpath-prefixes /nix/store \; + '' + lib.optionalString buildTests '' + mkdir -p $test + mv $out/bin/rdctst_tests $test/bin + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Simplifies administration and addresses infrastructure challenges in cluster and datacenter environments"; + homepage = "https://github.com/RadeonOpenCompute/rdc"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor rocm-smi.version; + }; +}) diff --git a/pkgs/development/tools/misc/replacement/default.nix b/pkgs/development/tools/misc/replacement/default.nix index cbdd8e37c5cd..75c5363ff672 100644 --- a/pkgs/development/tools/misc/replacement/default.nix +++ b/pkgs/development/tools/misc/replacement/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { ruamel-yaml ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook sh ]; diff --git a/pkgs/development/tools/misc/riff/default.nix b/pkgs/development/tools/misc/riff/default.nix new file mode 100644 index 000000000000..94096a2bc5e2 --- /dev/null +++ b/pkgs/development/tools/misc/riff/default.nix @@ -0,0 +1,46 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, makeWrapper +, pkg-config +, openssl +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "riff"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "DeterminateSystems"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ThHkEvu+lWojHmEgcrwdZDPROfxznB7vv78msyZf90A="; + }; + + cargoHash = "sha256-knA08KqjtI2FZUbllfVETxDqi/r4Gf3VuLE17JujTzc="; + + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + postInstall = '' + wrapProgram $out/bin/riff --set-default RIFF_DISABLE_TELEMETRY true + ''; + + meta = with lib; { + description = "A tool that automatically provides external dependencies for software projects"; + homepage = "https://riff.sh"; + changelog = "https://github.com/DeterminateSystems/riff/releases/tag/v${version}"; + license = licenses.mpl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/misc/rocgdb/default.nix b/pkgs/development/tools/misc/rocgdb/default.nix new file mode 100644 index 000000000000..6ad3e301822d --- /dev/null +++ b/pkgs/development/tools/misc/rocgdb/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, pkg-config +, texinfo +, bison +, flex +, zlib +, elfutils +, gmp +, ncurses +, expat +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rocgdb"; + version = "5.4.2"; + + src = fetchFromGitHub { + owner = "ROCm-Developer-Tools"; + repo = "ROCgdb"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-DORPvfon32+rIk+YcO9LlUefNvvC7trmiTswg9MMuIs="; + }; + + nativeBuildInputs = [ + pkg-config + texinfo # For makeinfo + bison + flex + ]; + + buildInputs = [ + zlib + elfutils + gmp + ncurses + expat + ]; + + # `-Wno-format-nonliteral` doesn't work + NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "ROCm source-level debugger for Linux, based on GDB"; + homepage = "https://github.com/ROCm-Developer-Tools/ROCgdb"; + license = with licenses; [ gpl2 gpl3 bsd3 ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/development/tools/misc/rsass/default.nix b/pkgs/development/tools/misc/rsass/default.nix index 8ce2e3c58137..dd681f4685e6 100644 --- a/pkgs/development/tools/misc/rsass/default.nix +++ b/pkgs/development/tools/misc/rsass/default.nix @@ -2,16 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "rsass"; - version = "0.26.0"; + version = "0.27.0"; src = fetchCrate { - inherit pname version; - sha256 = "sha256-Ksub+VYTbaWbFpHJFrMr6Dnx6LOnEOUlI2qHhCfbS40="; + pname = "rsass-cli"; + inherit version; + sha256 = "sha256-IaXfxccRRY868waEPI7qbWp1SSAhJlRqgeEiRNddC/c="; }; - cargoSha256 = "sha256-ugG4ivQ2NzLJeZss7h9TME2Aipurl1LZBgxt1cYaK2E="; - - buildFeatures = [ "commandline" ]; + cargoSha256 = "sha256-2owdX9ePHcAXpE43Svan252lAa5ICk0/DrDeADegZ6U="; meta = with lib; { description = "Sass reimplemented in rust with nom"; diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index 2a75c9855e58..1c049eac7aa3 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 }: let name = "saleae-logic-2"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; - sha256 = "sha256-A0Gd/CDd1COWbBXa87eW+A8AKyQzubJ3qSpj/JnWeZk="; + hash = "sha256-xF87Q1K25/9pUYt660RY2RCIC6u2m2ArBQb2nWhiKvw="; }; desktopItem = makeDesktopItem { inherit name; diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 9879768086ac..2ad51f093fcd 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }: rustPlatform.buildRustPackage rec { - version = "0.3.1"; + version = "0.3.3"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = "v${version}"; - sha256 = "sha256-SjGtFkFyHJRnFg3QwXksrV+T08oku80vcivLzFWt94g="; + sha256 = "sha256-XzAU8Rs0/Q1KvE2tF0zzv9d2/a07BzZQbVzOdrPlbSk="; }; - cargoSha256 = "sha256-cd/4otvrneOqntBzNZP1/RY0jg/NYeugiblr1tatITI="; + cargoSha256 = "sha256-r5rIuulcPB5Y4AkbUPswf3W4DZ9Pc8auzmDDvSOOZEA="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Ccache with Cloud Storage"; homepage = "https://github.com/mozilla/sccache"; - maintainers = with maintainers; [ doronbehar ]; + changelog = "https://github.com/mozilla/sccache/releases/tag/v${version}"; + maintainers = with maintainers; [ doronbehar figsoda ]; license = licenses.asl20; }; } diff --git a/pkgs/development/tools/misc/seer/default.nix b/pkgs/development/tools/misc/seer/default.nix index db88c615e6ee..e44d8a9ce118 100644 --- a/pkgs/development/tools/misc/seer/default.nix +++ b/pkgs/development/tools/misc/seer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "seer"; - version = "1.11"; + version = "1.14"; src = fetchFromGitHub { owner = "epasveer"; repo = "seer"; rev = "v${version}"; - sha256 = "sha256-HIRNCcE1EhxsiJ5/MQZgR7IXaeM4rWoepPhALXoW7Hw="; + sha256 = "sha256-IxFG+OhRhPRPSyGFJh559Tz2E7aMOtpphm9GbYS0dRA="; }; preConfigure = '' diff --git a/pkgs/development/tools/misc/segger-ozone/default.nix b/pkgs/development/tools/misc/segger-ozone/default.nix index 7f68d3e7fc66..e5d3ec0ff3f3 100644 --- a/pkgs/development/tools/misc/segger-ozone/default.nix +++ b/pkgs/development/tools/misc/segger-ozone/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { version = "3.22a"; src = fetchurl { - url = "https://www.segger.com/downloads/jlink/Ozone_Linux_V${(lib.replaceChars ["."] [""] version)}_x86_64.tgz"; + url = "https://www.segger.com/downloads/jlink/Ozone_Linux_V${(lib.replaceStrings ["."] [""] version)}_x86_64.tgz"; sha256 = "0v1r8qvp1w2f3yip9fys004pa0smlmq69p7w77lfvghs1rmg1649"; }; diff --git a/pkgs/development/tools/misc/semver-tool/default.nix b/pkgs/development/tools/misc/semver-tool/default.nix index 434fba18c592..a26c99171662 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.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "fsaintjacques"; repo = pname; rev = version; - sha256 = "sha256-LqZTHFiis4BYL1bnJoeuW56wf8+o38Ygs++CV9CKNhM="; + sha256 = "sha256-BnHuiCxE0VjzMWFTEMunQ9mkebQKIKbbMxZVfBUO57Y="; }; dontBuild = true; # otherwise we try to 'make' which fails. diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix index 23fc5cc25e37..befeafa87a92 100644 --- a/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/pkgs/development/tools/misc/slint-lsp/default.nix @@ -25,14 +25,14 @@ let in rustPlatform.buildRustPackage rec { pname = "slint-lsp"; - version = "0.3.0"; + version = "0.3.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-dZYkiYrotW8td5dxnPSvDzkWf+xV4ceISVLRZx2goXo="; + sha256 = "sha256-M4rd7179hpQW8jqjCY9ce64AhE6YWOC32tJg3v+00bo="; }; - cargoSha256 = "sha256-9zbA9JXfLdosCU6gVsrsAyiyX8Qh6x5wMw1W4QKqbp4="; + cargoHash = "sha256-3HcgnC2PQUyINm2gjxzqbCicvcGvpYtQn1p3qnqBzjc="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix index d986ef052433..1d542383bfb0 100644 --- a/pkgs/development/tools/misc/srecord/default.nix +++ b/pkgs/development/tools/misc/srecord/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Collection of powerful tools for manipulating EPROM load files"; - homepage = "http://srecord.sourceforge.net/"; + homepage = "https://srecord.sourceforge.net/"; license = licenses.gpl3Plus; maintainers = [ maintainers.bjornfor ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/tools/misc/strace-analyzer/default.nix b/pkgs/development/tools/misc/strace-analyzer/default.nix new file mode 100644 index 000000000000..9694fcd52765 --- /dev/null +++ b/pkgs/development/tools/misc/strace-analyzer/default.nix @@ -0,0 +1,28 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, strace +}: + +rustPlatform.buildRustPackage rec { + pname = "strace-analyzer"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "wookietreiber"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-ICUXedWg7ZT2Uzk7ZLpFqoEXiG4AzvkwCndR2aHKjVI="; + }; + + cargoSha256 = "sha256-p/HYG/KaHtvgvAd+eg1fKmDnLoWCL+XiT66jRBU2xRE="; + + nativeCheckInputs = [ strace ]; + + meta = with lib; { + description = "Analyzes strace output"; + homepage = "https://github.com/wookietreiber/strace-analyzer"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 351762233db5..538437b2a6cf 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 = "6.0"; + version = "6.1"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ktcgpmaFXp8cahFRL9bplnSoK7/hRCVXgV8s6OEpMzg="; + sha256 = "sha256-JXnpzsN9u3hvbqC+vRX0DdVh7yveKiouzc5ZY7AYWf0="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index 1068b3e2ad9d..ac03372d9761 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - homepage = "http://swig.org/"; + homepage = "https://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 109243b54ba1..f50c02d3e0cd 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An interface compiler that connects C/C++ code to higher-level languages"; - homepage = "http://swig.org/"; + homepage = "https://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/misc/swig/4.nix b/pkgs/development/tools/misc/swig/4.nix index 56106143027f..6b6d1bc02db9 100644 --- a/pkgs/development/tools/misc/swig/4.nix +++ b/pkgs/development/tools/misc/swig/4.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - homepage = "http://swig.org/"; + homepage = "https://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index 3c1a5b82dc2a..41f33f4db67f 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - homepage = "http://swig.org/"; + homepage = "https://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 7570dd586f0a..175f2b016e33 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.29.3"; + version = "0.30.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CYbeRhwoffyELM0REZL14m4tTe/66GDToqNKcEfmums="; + sha256 = "sha256-enPnj4/p83hQkVv821MGyGipgEmVo12IZzy/3y8UprQ="; }; - vendorSha256 = "sha256-wbB3/RfzL05SaLv49gs7WKrjV//dM3SjpbMNGI1yH4I="; + vendorSha256 = "sha256-U3zslBDVz5nvhNgcn5L84hSUolf7XFCuh7zMZxyW/gQ="; ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 036e992e9731..38a44e8c9cbd 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { installFlags = [ "TEXMF=$(out)/texmf-dist" ]; installTargets = [ "install" "install-tex" ]; - checkInputs = [ procps ]; + nativeCheckInputs = [ procps ]; doCheck = interactive && !stdenv.isDarwin diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index d33ac023fcd3..cfcbe1b2b94c 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "4.3.1"; + version = "5.2.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - sha256 = "sha256-gtPnuKmKfUBZDM6DATJB5NxndOwvG5JpBRO4cEU6lIU="; + sha256 = "sha256-OHfJJ3Oth6mu3UQkZeTcbxaivduIuZzmrMmkWQ8FB/4="; }; - cargoSha256 = "sha256-nu2KltPgexBTxG13kUgHgMrxefPD+Gaj5qBIWWFPdFs="; + cargoSha256 = "sha256-Vqm8KBNABYuRsn3HviRw93BQqPUj9EHD9L+ddUb1X+M="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -41,14 +41,12 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v4.3.1/.github/workflows/publish.yml#L126-L130 + # https://github.com/latex-lsp/texlab/blob/v5.2.0/.github/workflows/publish.yml#L127-L131 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "An implementation of the Language Server Protocol for LaTeX"; diff --git a/pkgs/development/tools/misc/topiary/default.nix b/pkgs/development/tools/misc/topiary/default.nix new file mode 100644 index 000000000000..06f75284b5cf --- /dev/null +++ b/pkgs/development/tools/misc/topiary/default.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "topiary"; + version = "unstable-2023-01-10"; + + src = fetchFromGitHub { + owner = "tweag"; + repo = pname; + rev = "c36d4a2253f337e1a28d497826a84754b8d833f6"; + sha256 = "sha256-0uqDuEpL9JCXzD7sQ3PDv4N1KtCSkoMoD5i402uIfas="; + }; + + cargoSha256 = "sha256-PvMjLC133rlsPrgyESuVHIf2TPCtgGQQULCQvBTIJ20="; + + postInstall = '' + install -Dm444 languages/* -t $out/share/languages + ''; + + TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/languages"; + + meta = with lib; { + description = "A uniform formatter for simple languages, as part of the Tree-sitter ecosystem"; + homepage = "https://github.com/tweag/topiary"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 422fe28787fe..f1a66f547850 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "uncrustify"; - version = "0.75.1"; + version = "0.76.0"; src = fetchFromGitHub { owner = "uncrustify"; repo = "uncrustify"; rev = "uncrustify-${version}"; - sha256 = "sha256-wLzj/KcqXlcTsOJo7T166jLcWi1KNLmgblIqqkj7/9c="; + sha256 = "sha256-th3lp4WqqruHx2/ym3I041y2wLbYM1b+V6yXNOWuUvM="; }; nativeBuildInputs = [ cmake python3 ]; meta = with lib; { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; - homepage = "http://uncrustify.sourceforge.net/"; + homepage = "https://uncrustify.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 02d5a4e549da..30c0800f2c5f 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "universal-ctags"; - version = "5.9.20221106.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; - rev = "p${finalAttrs.version}"; - hash = "sha256-6piWdofvlX+ysXmRPnQc7PlZuHSyVqdVxOztY2+Pcss="; + rev = "v${finalAttrs.version}"; + hash = "sha256-XlqBndo8g011SDGp3zM7S+AQ0aCp6rpQlqJF6e5Dd6w="; }; depsBuildBuild = [ @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.unix; + platforms = platforms.all; mainProgram = "ctags"; priority = 1; # over the emacs implementation }; diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix index d448251bf13d..08f5b85bc5ed 100644 --- a/pkgs/development/tools/misc/whatstyle/default.nix +++ b/pkgs/development/tools/misc/whatstyle/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { substituteInPlace ${pname}.py --replace 0.1.6 ${version} ''; - checkInputs = [ clang-unwrapped /* clang-format */ ]; + nativeCheckInputs = [ clang-unwrapped /* clang-format */ ]; doCheck = false; # 3 or 4 failures depending on version, haven't investigated. diff --git a/pkgs/development/tools/misc/xspim/default.nix b/pkgs/development/tools/misc/xspim/default.nix index 808e9f92da71..ccef80747a40 100644 --- a/pkgs/development/tools/misc/xspim/default.nix +++ b/pkgs/development/tools/misc/xspim/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A MIPS32 simulator"; - homepage = "http://spimsimulator.sourceforge.net/"; + homepage = "https://spimsimulator.sourceforge.net/"; license = licenses.bsdOriginal; maintainers = with maintainers; [ emilytrau ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 73aff70db333..bb55ba807964 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -12,27 +12,38 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "1.7.1"; + version = "1.10.1"; src = fetchFromGitHub { owner = "rui314"; repo = pname; - rev = "v${version}"; - hash = "sha256-sC8rJOyQB8mDCCmfpk2lVDPTWxBj7tZxVXQw8agl7t0="; + rev = "refs/tags/v${version}"; + hash = "sha256-5zE5a+BYzQjgVb0Ti7bSQrGzTyysOTTR0NMOO5IKG68="; }; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ + cmake + ninja + ]; - buildInputs = [ openssl zlib ] - ++ lib.optionals (!stdenv.isDarwin) [ mimalloc ]; + buildInputs = [ + openssl + zlib + ] ++ lib.optionals (!stdenv.isDarwin) [ + mimalloc + ]; postPatch = '' sed -i CMakeLists.txt -e '/.*set(DEST\ .*/d' ''; - cmakeFlags = [ "-DMOLD_USE_SYSTEM_MIMALLOC:BOOL=ON" ]; + cmakeFlags = [ + "-DMOLD_USE_SYSTEM_MIMALLOC:BOOL=ON" + ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-faligned-allocation" ]; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ + "-faligned-allocation" + ]; passthru.tests.version = testers.testVersion { package = mold; }; @@ -45,6 +56,7 @@ stdenv.mkDerivation rec { rapid debug-edit-rebuild cycles. ''; homepage = "https://github.com/rui314/mold"; + changelog = "https://github.com/rui314/mold/releases/tag/v${version}"; license = licenses.agpl3Plus; maintainers = with maintainers; [ azahi nitsky ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/mongosh/gen/composition.nix b/pkgs/development/tools/mongosh/composition.nix similarity index 89% rename from pkgs/development/tools/mongosh/gen/composition.nix rename to pkgs/development/tools/mongosh/composition.nix index 6740fed1bf8f..dac56f12aa2a 100644 --- a/pkgs/development/tools/mongosh/gen/composition.nix +++ b/pkgs/development/tools/mongosh/composition.nix @@ -5,7 +5,7 @@ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: let - nodeEnv = import ../../../node-packages/node-env.nix { + nodeEnv = import ../../node-packages/node-env.nix { 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/development/tools/mongosh/default.nix b/pkgs/development/tools/mongosh/default.nix index d251a3c3805f..c71c7dcb72ce 100644 --- a/pkgs/development/tools/mongosh/default.nix +++ b/pkgs/development/tools/mongosh/default.nix @@ -1,7 +1,7 @@ { pkgs, stdenv, lib, testers, mongosh }: let - nodePackages = import ./gen/composition.nix { + nodePackages = import ./composition.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; }; diff --git a/pkgs/development/tools/mongosh/generate.sh b/pkgs/development/tools/mongosh/generate.sh index e58c9a93f370..ef120ee9e921 100755 --- a/pkgs/development/tools/mongosh/generate.sh +++ b/pkgs/development/tools/mongosh/generate.sh @@ -1,21 +1,13 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p node2nix -MONGOSH_ROOT="$( - cd "$(dirname "$0")" - pwd -)" -pushd $MONGOSH_ROOT 1>/dev/null - -rm -rf gen && mkdir -p gen +cd "$(dirname "$0")" node2nix \ --no-copy-node-env \ --node-env ../../node-packages/node-env.nix \ --input packages.json \ - --output gen/packages.nix \ - --composition gen/composition.nix \ + --output packages.nix \ + --composition composition.nix \ --strip-optional-dependencies \ --nodejs-16 - -popd 1>/dev/null diff --git a/pkgs/development/tools/mongosh/gen/packages.nix b/pkgs/development/tools/mongosh/packages.nix similarity index 78% rename from pkgs/development/tools/mongosh/gen/packages.nix rename to pkgs/development/tools/mongosh/packages.nix index 04dd83757a1d..4bc8ab90a933 100644 --- a/pkgs/development/tools/mongosh/gen/packages.nix +++ b/pkgs/development/tools/mongosh/packages.nix @@ -22,13 +22,13 @@ let sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.19.3" = { + "@babel/compat-data-7.20.10" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.19.3"; + version = "7.20.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.3.tgz"; - sha512 = "prBHMK4JYYK+wDjJF1q99KK4JLL+egWS4nmNqdlMUgCExMZ+iZW0hGhyC3VEbsPjvaN0TBhW//VIFwBrk8sEiw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.10.tgz"; + sha512 = "sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg=="; }; }; "@babel/core-7.16.12" = { @@ -40,31 +40,31 @@ let sha512 = "dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg=="; }; }; - "@babel/core-7.19.3" = { + "@babel/core-7.20.12" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.19.3"; + version = "7.20.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz"; - sha512 = "WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz"; + sha512 = "XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg=="; }; }; - "@babel/generator-7.19.3" = { + "@babel/generator-7.20.7" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.19.3"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.19.3.tgz"; - sha512 = "fqVZnmp1ncvZU757UzDheKZpfPgatqY59XtW2/j/18H7u76akb8xqvjw82f+i2UKd/ksYsSick/BCLQUUtJ/qQ=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz"; + sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw=="; }; }; - "@babel/helper-compilation-targets-7.19.3" = { + "@babel/helper-compilation-targets-7.20.7" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.19.3"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz"; - sha512 = "65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz"; + sha512 = "4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ=="; }; }; "@babel/helper-environment-visitor-7.18.9" = { @@ -103,31 +103,31 @@ let sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.19.0" = { + "@babel/helper-module-transforms-7.20.11" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.19.0"; + version = "7.20.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz"; - sha512 = "3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz"; + sha512 = "uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg=="; }; }; - "@babel/helper-plugin-utils-7.19.0" = { + "@babel/helper-plugin-utils-7.20.2" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.19.0"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz"; - sha512 = "40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz"; + sha512 = "8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ=="; }; }; - "@babel/helper-simple-access-7.18.6" = { + "@babel/helper-simple-access-7.20.2" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.18.6"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz"; - sha512 = "iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz"; + sha512 = "+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA=="; }; }; "@babel/helper-split-export-declaration-7.18.6" = { @@ -139,13 +139,13 @@ let sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; }; }; - "@babel/helper-string-parser-7.18.10" = { + "@babel/helper-string-parser-7.19.4" = { name = "_at_babel_slash_helper-string-parser"; packageName = "@babel/helper-string-parser"; - version = "7.18.10"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz"; - sha512 = "XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="; + url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz"; + sha512 = "nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="; }; }; "@babel/helper-validator-identifier-7.19.1" = { @@ -166,13 +166,13 @@ let sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; }; }; - "@babel/helpers-7.19.0" = { + "@babel/helpers-7.20.7" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.19.0"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz"; - sha512 = "DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz"; + sha512 = "PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA=="; }; }; "@babel/highlight-7.18.6" = { @@ -184,31 +184,31 @@ let sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.19.3" = { + "@babel/parser-7.20.7" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.19.3"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.19.3.tgz"; - sha512 = "pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz"; + sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; }; }; - "@babel/plugin-transform-destructuring-7.18.13" = { + "@babel/plugin-transform-destructuring-7.20.7" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.18.13"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz"; - sha512 = "TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz"; + sha512 = "Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA=="; }; }; - "@babel/plugin-transform-parameters-7.18.8" = { + "@babel/plugin-transform-parameters-7.20.7" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.18.8"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz"; - sha512 = "ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz"; + sha512 = "WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA=="; }; }; "@babel/plugin-transform-shorthand-properties-7.18.6" = { @@ -220,31 +220,31 @@ let sha512 = "eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw=="; }; }; - "@babel/template-7.18.10" = { + "@babel/template-7.20.7" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.18.10"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz"; - sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz"; + sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; }; - "@babel/traverse-7.19.3" = { + "@babel/traverse-7.20.12" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.19.3"; + version = "7.20.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.3.tgz"; - sha512 = "qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz"; + sha512 = "MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ=="; }; }; - "@babel/types-7.19.3" = { + "@babel/types-7.20.7" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.19.3"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.19.3.tgz"; - sha512 = "hGCaQzIY22DJlDh9CH7NOxgKkFjBk0Cw9xDO1Xmh2151ti7wiGfQ3LauXzL4HP1fmFlTX6XjpRETTpUcv7wQLw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz"; + sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg=="; }; }; "@hapi/hoek-9.3.0" = { @@ -310,13 +310,13 @@ let sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; }; }; - "@jridgewell/trace-mapping-0.3.15" = { + "@jridgewell/trace-mapping-0.3.17" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.15"; + version = "0.3.17"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz"; - sha512 = "oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g=="; + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz"; + sha512 = "MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g=="; }; }; "@mongodb-js/devtools-connect-1.4.3" = { @@ -328,148 +328,157 @@ let sha512 = "Y7j5XZo+bmphN/IERA9p++91ZYEXPagONUVP7seQ04ha2jHwB6lr6WudPWcRw7NkzPj/PuEjA50lJXtt2ilA3Q=="; }; }; - "@mongosh/arg-parser-1.6.0" = { + "@mongodb-js/mongodb-constants-0.1.5" = { + name = "_at_mongodb-js_slash_mongodb-constants"; + packageName = "@mongodb-js/mongodb-constants"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@mongodb-js/mongodb-constants/-/mongodb-constants-0.1.5.tgz"; + sha512 = "YMc7Hymiyo/H/jXPb576u5DmJFoWCnFc89mi30UqYE2YLZR7yg3zEFJxv6XAlemtznenmoqVEZ4YYAxcojw0KA=="; + }; + }; + "@mongosh/arg-parser-1.6.2" = { name = "_at_mongosh_slash_arg-parser"; packageName = "@mongosh/arg-parser"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-1.6.0.tgz"; - sha512 = "9f31TdgjR9hhIhgntkde8rK8SMccWjiKYj6uRwlUgvJniZYEDg3Jg7/wqif53W33bc6rV70p2hiRhRMkZZhHYg=="; + url = "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-1.6.2.tgz"; + sha512 = "RDY2IxARZ80TpPjKRQEvrhvJLpLZyeOm/zfPifGIRMlVXtwm/8AB1AyReGdsmbmpVAQt6PXkF6eiap1EmPBfNg=="; }; }; - "@mongosh/async-rewriter2-1.6.0" = { + "@mongosh/async-rewriter2-1.6.2" = { name = "_at_mongosh_slash_async-rewriter2"; packageName = "@mongosh/async-rewriter2"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.6.0.tgz"; - sha512 = "F/5RJDynNzWCQNG/AmgzNC6euz4A2ZkHUmzELox5Fhr3KfB53daJ+R0itevhR9AIwSi6fqrKqEPToMAsc4l1UQ=="; + url = "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.6.2.tgz"; + sha512 = "Jb4PUz7lFz0dOFLmlNwCiQX5X83A2ntnxk33GFikdmiW8L6S99AyuD63y3qyAkiSXgHErwBXDXYB8k3DJoTizw=="; }; }; - "@mongosh/autocomplete-1.6.0" = { + "@mongosh/autocomplete-1.6.2" = { name = "_at_mongosh_slash_autocomplete"; packageName = "@mongosh/autocomplete"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.6.0.tgz"; - sha512 = "kMSnwoJz2Kn6sxRRa+cNfw+rTuLOcSD+bW29/cs0CtZaKHnT5ODH8QIecpWyMWzDQ4CFYo5vDgqOaS0ZyiWz3g=="; + url = "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.6.2.tgz"; + sha512 = "EHk4DGN2DyrVOj5vEZ7xoYWr2V/bQMSDFnk2c6809wRhN+mHlKVwvaqTk/xRAJXHGwW+shWx2lZ3BJVQqoVbvA=="; }; }; - "@mongosh/cli-repl-1.6.0" = { + "@mongosh/cli-repl-1.6.2" = { name = "_at_mongosh_slash_cli-repl"; packageName = "@mongosh/cli-repl"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-1.6.0.tgz"; - sha512 = "O2T1uKzWVSPJyrYJboqMPG4Obb6ZpFxWp2DMq9UynuXT9x2DnNc0Z55CHX0WHSlVHJAxcee1EKF3BMgTDSRk5Q=="; + url = "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-1.6.2.tgz"; + sha512 = "I3WU32+gNRQ7AWYt1SsS87N8rSzLYww4VOCklJ15jers3x9sv4DvoZMbCh7Z47dG5tNB+XS8/C/obmMD0T8zyA=="; }; }; - "@mongosh/editor-1.6.0" = { + "@mongosh/editor-1.6.2" = { name = "_at_mongosh_slash_editor"; packageName = "@mongosh/editor"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/editor/-/editor-1.6.0.tgz"; - sha512 = "2olIwsXo+UHbKBDSNsjnDKs6RVc3V6D2kSdT5BMseRSzcqaWH6yMW4EWtuo22Sn2uWxpyWfn4xHpQ1lTjb+U8w=="; + url = "https://registry.npmjs.org/@mongosh/editor/-/editor-1.6.2.tgz"; + sha512 = "bTC73BBe4Qo0WhyRYqWtuSWAbicsxAfqUavKYKZ0ogcPCASJXYUyQQu9Af4qW4MbOB8yq7dymHc/z6Yw1rYvJA=="; }; }; - "@mongosh/errors-1.6.0" = { + "@mongosh/errors-1.6.2" = { name = "_at_mongosh_slash_errors"; packageName = "@mongosh/errors"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/errors/-/errors-1.6.0.tgz"; - sha512 = "6VLsCNFhGyGiEWgPNfUTUc1tFBHTAVDHlsbcZrxSLAhimkJf1jOy1A9i/vH+PNnNWJ50MMakM6kwlMltWmH91Q=="; + url = "https://registry.npmjs.org/@mongosh/errors/-/errors-1.6.2.tgz"; + sha512 = "BpLk4d67Meb0JtEWWs+4JR3iUpsHnJ3qLHFsvnEn5xQraYmWcbbw+gsSdJh26crMTmPjAdKJENCWGL+vPenZXg=="; }; }; - "@mongosh/history-1.6.0" = { + "@mongosh/history-1.6.2" = { name = "_at_mongosh_slash_history"; packageName = "@mongosh/history"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/history/-/history-1.6.0.tgz"; - sha512 = "chR+rsAOxidVrbm+cGgR1FuNAZRy5sl+Ft4T2/fmGFTCQzhGpjvNoZ95EsR0AA1VTr9SknDymjvzmi9jJPtWGA=="; + url = "https://registry.npmjs.org/@mongosh/history/-/history-1.6.2.tgz"; + sha512 = "cNhus7wIKz4/Rxds96+/3IpM5jymppoHGU5KRE73xFECcPYqsKaOnILrFOG+QiRCUV5mfESM/gfrmhDGmZyu+Q=="; }; }; - "@mongosh/i18n-1.6.0" = { + "@mongosh/i18n-1.6.2" = { name = "_at_mongosh_slash_i18n"; packageName = "@mongosh/i18n"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.6.0.tgz"; - sha512 = "9Uhz/dTKfzF83vZO3gxx+xR+M1xVfcL39+H+D7t3wwVOUsU5OJ6YbhZIt+Wmnund+L9941Cb1HfeeGBLDZKukA=="; + url = "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.6.2.tgz"; + sha512 = "N5hRG/Y4ipQC6z6SnqoHCPlvQ/8qwRg8SiaHXfaJl+ruME+BCInmpg9c+0fRa+gIFiB98w7A4QUjfiMkZ9Bmsw=="; }; }; - "@mongosh/js-multiline-to-singleline-1.6.0" = { + "@mongosh/js-multiline-to-singleline-1.6.2" = { name = "_at_mongosh_slash_js-multiline-to-singleline"; packageName = "@mongosh/js-multiline-to-singleline"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-1.6.0.tgz"; - sha512 = "u+e+sGDYHA73vFXLVPdzvf8Pb86unxp1oTF9mKuOfIhM0kSFEcUv6BbSrrtl9tmreekQsOrEwT7jRecqboD8sA=="; + url = "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-1.6.2.tgz"; + sha512 = "bsO3u+JJeNGve9V+Dj6jqCOG5lg74B3bh8s/0tCO9pkC7osI2e/5ufPutQaIBe3m8s9M4AJFgYJk6kOc3dL2eQ=="; }; }; - "@mongosh/logging-1.6.0" = { + "@mongosh/logging-1.6.2" = { name = "_at_mongosh_slash_logging"; packageName = "@mongosh/logging"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/logging/-/logging-1.6.0.tgz"; - sha512 = "VsWBuNJPih3j1GJjwYuOpNsBbyrU9GhLt3QL0Rj+OboG3oiS5sRq6fsk7IwcD5jk29Jk79E96zk1DG6oNkUq6w=="; + url = "https://registry.npmjs.org/@mongosh/logging/-/logging-1.6.2.tgz"; + sha512 = "TBIUBH5yxlssqXLTQh5AkuPcQEHwuys4DIOUCI73obCm/4xHH26+qAm+hjoI9OXW41cmoihxmOmv6jQnlE7tFA=="; }; }; - "@mongosh/service-provider-core-1.6.0" = { + "@mongosh/service-provider-core-1.6.2" = { name = "_at_mongosh_slash_service-provider-core"; packageName = "@mongosh/service-provider-core"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.6.0.tgz"; - sha512 = "tq0BEvIPub7syCcjjVVV77ABXjfoyddcT4tsQ7YKCsQQctMGvDw82sQtheBF3ie/d1UHEBVA7Drp6l6VA1r0GQ=="; + url = "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.6.2.tgz"; + sha512 = "BSnfvSDI3MxSIQZKFk/ifVj7vkwG3LIy21m/4w8EhomWoCjKrwH1sFjfbv6iCIaBl6SxJNoq11J2m+d9mPbwNQ=="; }; }; - "@mongosh/service-provider-server-1.6.0" = { + "@mongosh/service-provider-server-1.6.2" = { name = "_at_mongosh_slash_service-provider-server"; packageName = "@mongosh/service-provider-server"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-1.6.0.tgz"; - sha512 = "80m9eutNZZwh2bZhOLz0FFrrjwp91xS+lE9M+bYREBOIPfOlnUDxkCFpxCeyZNZzi3kiu+nSVC7rcLS6AlDI2w=="; + url = "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-1.6.2.tgz"; + sha512 = "onvooY8RiW/r4FOnY4PcAq/Z/yWx5IlFtnGCq2AS1DB4boEvlsoBEqpcpwKtJWZW7+jW9tYVWgAiXWefl/Ss8w=="; }; }; - "@mongosh/shell-api-1.6.0" = { + "@mongosh/shell-api-1.6.2" = { name = "_at_mongosh_slash_shell-api"; packageName = "@mongosh/shell-api"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.6.0.tgz"; - sha512 = "oVi2tFQMl3uDQukKhDFAjCCq3JLyS0a7FBcd4brZaDRouiBLa+cufehz3f4D89pvFlIZx/20tQfASA28HYYHnw=="; + url = "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.6.2.tgz"; + sha512 = "lWcTf8qZXQPQI2swZYig3wP9/49A8JNIuRRY/ZC1CAF4XUsDYCijqVkPc0HKGux2K8r1uuIqxh/Ke0HzuN4awQ=="; }; }; - "@mongosh/shell-evaluator-1.6.0" = { + "@mongosh/shell-evaluator-1.6.2" = { name = "_at_mongosh_slash_shell-evaluator"; packageName = "@mongosh/shell-evaluator"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.6.0.tgz"; - sha512 = "Ac9AZ7c08DAjawB6B2akiYYzNd4hZkJxNSphb+JNK1rVzGYMv+j2/SZzAOU59pKAlZnLpj/593Q0/7TwQu6t8A=="; + url = "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.6.2.tgz"; + sha512 = "AfWrXwi2KlZhwkkS817XIiW4aAJuQmiN+vnHyMRgztRfwxp7jEdXrNyactEOSLYmPrgVAMuToXowelkrRy5KHQ=="; }; }; - "@mongosh/snippet-manager-1.6.0" = { + "@mongosh/snippet-manager-1.6.2" = { name = "_at_mongosh_slash_snippet-manager"; packageName = "@mongosh/snippet-manager"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-1.6.0.tgz"; - sha512 = "JJ7Q3rCmMIQLwi5T3nhRD8JdSIFma38o2kIDFrIM8EpxPR36xxuojNoxmiqj8Hqsz5vkKeGKWevg/rNjU+0Log=="; + url = "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-1.6.2.tgz"; + sha512 = "DjQopKCmUBnLin+SDOAzUJxsgstZfVlic26GgwwSKp8+6LyqtUa/K+/kha6Rlq2i9fpwsSdb3YBXjks6MzSDjw=="; }; }; - "@mongosh/types-1.6.0" = { + "@mongosh/types-1.6.2" = { name = "_at_mongosh_slash_types"; packageName = "@mongosh/types"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/types/-/types-1.6.0.tgz"; - sha512 = "rKVvrAncZng9C3pE69OMKzAyat7i60/b8tR3ou4zk/w5xg1WV/lEIWksAACu9RBKPItKRlOVkfc6YRF+7z+4dw=="; + url = "https://registry.npmjs.org/@mongosh/types/-/types-1.6.2.tgz"; + sha512 = "REWGm6AlBqxklUIB8LbZ1+lPVSqdVfkr6mwPjj0PZHo4yrYNPMV4KJ9rQzaKd3alx+oRDyakOKek2b7RbhRzOw=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -490,13 +499,13 @@ let sha512 = "7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw=="; }; }; - "@sideway/formula-3.0.0" = { + "@sideway/formula-3.0.1" = { name = "_at_sideway_slash_formula"; packageName = "@sideway/formula"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz"; - sha512 = "vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg=="; + url = "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz"; + sha512 = "/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg=="; }; }; "@sideway/pinpoint-2.0.0" = { @@ -508,13 +517,13 @@ let sha512 = "RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="; }; }; - "@types/babel__core-7.1.19" = { + "@types/babel__core-7.1.20" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; - version = "7.1.19"; + version = "7.1.20"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz"; - sha512 = "WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw=="; + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.20.tgz"; + sha512 = "PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ=="; }; }; "@types/babel__generator-7.6.4" = { @@ -535,31 +544,31 @@ let sha512 = "azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g=="; }; }; - "@types/babel__traverse-7.18.2" = { + "@types/babel__traverse-7.18.3" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.18.2"; + version = "7.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.2.tgz"; - sha512 = "FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg=="; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz"; + sha512 = "1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w=="; }; }; - "@types/chai-4.3.3" = { + "@types/chai-4.3.4" = { name = "_at_types_slash_chai"; packageName = "@types/chai"; - version = "4.3.3"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/chai/-/chai-4.3.3.tgz"; - sha512 = "hC7OMnszpxhZPduX+m+nrx+uFoLkWOMiR4oa/AZF3MuSETYTZmFfJAHqZEM8MVlvfG7BEUcgvtwoCTxBp6hm3g=="; + url = "https://registry.npmjs.org/@types/chai/-/chai-4.3.4.tgz"; + sha512 = "KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw=="; }; }; - "@types/node-18.7.23" = { + "@types/node-18.11.18" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.7.23"; + version = "18.11.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.7.23.tgz"; - sha512 = "DWNcCHolDq0ZKGizjx2DZjR/PqsYwAcYUJmfMWqtVU2MBMG5Mo+xFZrhGId5r/O5HOuMPyQEcM6KUBp5lBZZBg=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz"; + sha512 = "DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA=="; }; }; "@types/sinon-10.0.13" = { @@ -571,13 +580,13 @@ let sha512 = "UVjDqJblVNQYvVNUsj0PuYYw0ELRmgt1Nt5Vk0pT5f16ROGfcKJY8o1HVuMOJOpD727RrGB9EGvoaTQE5tgxZQ=="; }; }; - "@types/sinon-chai-3.2.8" = { + "@types/sinon-chai-3.2.9" = { name = "_at_types_slash_sinon-chai"; packageName = "@types/sinon-chai"; - version = "3.2.8"; + version = "3.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sinon-chai/-/sinon-chai-3.2.8.tgz"; - sha512 = "d4ImIQbT/rKMG8+AXpmcan5T2/PNeSjrYhvkwet6z0p8kzYtfgA32xzOBlbU0yqJfq+/0Ml805iFoODO0LP5/g=="; + url = "https://registry.npmjs.org/@types/sinon-chai/-/sinon-chai-3.2.9.tgz"; + sha512 = "/19t63pFYU0ikrdbXKBWj9PCdnKyTd0Qkz0X91Ta081cYsq90OxYdcWwK/dwEoDa6dtXgj2HJfmzgq+QZTHdmQ=="; }; }; "@types/sinonjs__fake-timers-8.1.2" = { @@ -616,22 +625,22 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; - "acorn-7.4.1" = { + "acorn-8.8.1" = { name = "acorn"; packageName = "acorn"; - version = "7.4.1"; + version = "8.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"; - sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz"; + sha512 = "7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="; }; }; - "acorn-class-fields-0.3.7" = { + "acorn-class-fields-1.0.0" = { name = "acorn-class-fields"; packageName = "acorn-class-fields"; - version = "0.3.7"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-class-fields/-/acorn-class-fields-0.3.7.tgz"; - sha512 = "jdUWSFce0fuADUljmExz4TWpPkxmRW/ZCPRqeeUzbGf0vFUcpQYbyq52l75qGd0oSwwtAepeL6hgb/naRgvcKQ=="; + url = "https://registry.npmjs.org/acorn-class-fields/-/acorn-class-fields-1.0.0.tgz"; + sha512 = "l+1FokF34AeCXGBHkrXFmml9nOIRI+2yBnBpO5MaVAaTIJ96irWLtcCxX+7hAp6USHFCe+iyyBB4ZhxV807wmA=="; }; }; "acorn-numeric-separator-0.3.6" = { @@ -643,31 +652,31 @@ let sha512 = "jUr5esgChu4k7VzesH/Nww3EysuyGJJcTEEiXqILUFKpO96PNyEXmK21M6nE0TSqGA1PeEg1MzgqJaoFsn9JMw=="; }; }; - "acorn-private-class-elements-0.2.7" = { + "acorn-private-class-elements-1.0.0" = { name = "acorn-private-class-elements"; packageName = "acorn-private-class-elements"; - version = "0.2.7"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-private-class-elements/-/acorn-private-class-elements-0.2.7.tgz"; - sha512 = "+GZH2wOKNZOBI4OOPmzpo4cs6mW297sn6fgIk1dUI08jGjhAaEwvC39mN2gJAg2lmAQJ1rBkFqKWonL3Zz6PVA=="; + url = "https://registry.npmjs.org/acorn-private-class-elements/-/acorn-private-class-elements-1.0.0.tgz"; + sha512 = "zYNcZtxKgVCg1brS39BEou86mIao1EV7eeREG+6WMwKbuYTeivRRs6S2XdWnboRde6G9wKh2w+WBydEyJsJ6mg=="; }; }; - "acorn-private-methods-0.3.3" = { + "acorn-private-methods-1.0.0" = { name = "acorn-private-methods"; packageName = "acorn-private-methods"; - version = "0.3.3"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-private-methods/-/acorn-private-methods-0.3.3.tgz"; - sha512 = "46oeEol3YFvLSah5m9hGMlNpxDBCEkdceJgf01AjqKYTK9r6HexKs2rgSbLK81pYjZZMonhftuUReGMlbbv05w=="; + url = "https://registry.npmjs.org/acorn-private-methods/-/acorn-private-methods-1.0.0.tgz"; + sha512 = "Jou2L3nfwfPpFdmmHObI3yUpVPM1bPohTUAZCyVDw5Efyn9LSS6E36neRLCRfIr8QjskAfdxRdABOrvP4c/gwQ=="; }; }; - "acorn-static-class-features-0.2.4" = { + "acorn-static-class-features-1.0.0" = { name = "acorn-static-class-features"; packageName = "acorn-static-class-features"; - version = "0.2.4"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-static-class-features/-/acorn-static-class-features-0.2.4.tgz"; - sha512 = "5X4mpYq5J3pdndLmIB0+WtFd/mKWnNYpuTlTzj32wUu/PMmEGOiayQ5UrqgwdBNiaZBtDDh5kddpP7Yg2QaQYA=="; + url = "https://registry.npmjs.org/acorn-static-class-features/-/acorn-static-class-features-1.0.0.tgz"; + sha512 = "XZJECjbmMOKvMHiNzbiPXuXpLAJfN3dAKtfIYbk1eHiWdsutlek+gS7ND4B8yJ3oqvHo1NxfafnezVmq7NXK0A=="; }; }; "analytics-node-5.2.0" = { @@ -751,13 +760,13 @@ let sha512 = "HR27ScUv/j6vHSKU0AN+y3pGA3iqXzD09qqJl6JjVqSJRk7QiKPJt+W4tFhozMbiTsOh/QrIkeRi+Okd97VkRA=="; }; }; - "aws4-1.11.0" = { + "aws4-1.12.0" = { name = "aws4"; packageName = "aws4"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; - sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz"; + sha512 = "NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="; }; }; "axios-0.21.4" = { @@ -814,13 +823,13 @@ let sha512 = "CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw=="; }; }; - "bson-4.7.0" = { + "bson-4.7.1" = { name = "bson"; packageName = "bson"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-4.7.0.tgz"; - sha512 = "VrlEE4vuiO1WTpfof4VmaVolCVYkYTgB9iWgYNOrVlnifpME/06fhFRmONgBhClD5pFC1t9ZWqFUQEQAzY43bA=="; + url = "https://registry.npmjs.org/bson/-/bson-4.7.1.tgz"; + sha512 = "XkuFtlCzi0WSy8D6PMhvrQ/q8VlZHN/2bJ/shJglwuA6TPD2ZP/hHLB7iDxOEWVINHN/UVTxP4pqZqOKMXPIXg=="; }; }; "buffer-5.7.1" = { @@ -832,13 +841,13 @@ let sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; }; }; - "caniuse-lite-1.0.30001412" = { + "caniuse-lite-1.0.30001442" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001412"; + version = "1.0.30001442"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001412.tgz"; - sha512 = "+TeEIee1gS5bYOiuf+PS/kp2mrXic37Hl66VY6EAfxasIk5fELTktK2oOezYed12H8w7jt3s512PpulQidPjwA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz"; + sha512 = "239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow=="; }; }; "chalk-2.4.2" = { @@ -949,13 +958,13 @@ let sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; }; }; - "convert-source-map-1.8.0" = { + "convert-source-map-1.9.0" = { name = "convert-source-map"; packageName = "convert-source-map"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz"; - sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz"; + sha512 = "ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="; }; }; "cross-spawn-7.0.3" = { @@ -985,15 +994,6 @@ let sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; }; - "denque-2.1.0" = { - name = "denque"; - packageName = "denque"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz"; - sha512 = "HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw=="; - }; - }; "editorconfig-0.15.3" = { name = "editorconfig"; packageName = "editorconfig"; @@ -1003,13 +1003,13 @@ let sha512 = "M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g=="; }; }; - "electron-to-chromium-1.4.267" = { + "electron-to-chromium-1.4.284" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.267"; + version = "1.4.284"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.267.tgz"; - sha512 = "ik4QnU3vFRsVgwt0vsn7og28++2cGnsdgqYagaE3ur1f3wj5AzmWu+1k3//SOc6CwkP2xfu46PNfVP6X+SRepg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz"; + sha512 = "M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="; }; }; "emphasize-3.0.0" = { @@ -1021,6 +1021,15 @@ let sha512 = "xhtAWvxdkxsQbcCLGVjlfB7cQ4bWSPYXeaGDwK5Bl7n2y/9R+MVK5UNBTmZ9N8m/YShsiyGgQBgFGcjOWCWXHQ=="; }; }; + "encoding-0.1.13" = { + name = "encoding"; + packageName = "encoding"; + version = "0.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"; + sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; + }; + }; "escalade-3.1.1" = { name = "escalade"; packageName = "escalade"; @@ -1165,6 +1174,15 @@ let sha512 = "9riBbIorIgSvsLQHL/rKEK6vJBexhgSRZC/tkieuei7a1U+CHgrXJVqW+RPswgEyuPbxcGCpx0QXO3iJuKRrrw=="; }; }; + "iconv-lite-0.6.3" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; + }; + }; "ieee754-1.2.1" = { name = "ieee754"; packageName = "ieee754"; @@ -1219,13 +1237,13 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-recoverable-error-1.0.2" = { + "is-recoverable-error-1.0.3" = { name = "is-recoverable-error"; packageName = "is-recoverable-error"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-recoverable-error/-/is-recoverable-error-1.0.2.tgz"; - sha512 = "b/xWWfNO7o+EIVEVy1hYOYP1t1Jbyr5LyVf/Ao6gqeMMLNV8wz8qCDWCXqxaQjbHkg22lSclqE6qhjn4cJVeTA=="; + url = "https://registry.npmjs.org/is-recoverable-error/-/is-recoverable-error-1.0.3.tgz"; + sha512 = "T06goBQXH5WCzWtzuU+kYhT3Ui0d3wgk8n4GR/3n9UjgO6cuphhel+W02ps/Z2PYZB8C+l//XAJk9tR5Txo6/w=="; }; }; "is-retry-allowed-1.2.0" = { @@ -1246,13 +1264,13 @@ let sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; }; }; - "joi-17.6.1" = { + "joi-17.7.0" = { name = "joi"; packageName = "joi"; - version = "17.6.1"; + version = "17.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-17.6.1.tgz"; - sha512 = "Hl7/iBklIX345OCM1TiFSCZRVaAOLDGlWCp0Df2vWYgBgjkezaR7Kvm3joBciBHQjZj5sxXs859r6eqsRSlG8w=="; + url = "https://registry.npmjs.org/joi/-/joi-17.7.0.tgz"; + sha512 = "1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg=="; }; }; "join-component-1.1.0" = { @@ -1264,13 +1282,13 @@ let sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; }; }; - "js-beautify-1.14.6" = { + "js-beautify-1.14.7" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.14.6"; + version = "1.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.6.tgz"; - sha512 = "GfofQY5zDp+cuHc+gsEXKPpNw2KbPddreEo35O6jT6i0RVK6LhsoYBhq5TvK4/n74wnA0QbK8gGd+jUZwTMKJw=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.7.tgz"; + sha512 = "5SOX1KXPFKx+5f6ZrPsIPEY7NwKeQz47n3jm2i+XeHx9MoRsfQenlOP13FQhWvg8JRS0+XLO6XYUQ2GX+q+T9A=="; }; }; "js-tokens-4.0.0" = { @@ -1300,13 +1318,13 @@ let sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; - "json5-2.2.1" = { + "json5-2.2.3" = { name = "json5"; packageName = "json5"; - version = "2.2.1"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; + url = "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"; + sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; }; "lodash-4.17.21" = { @@ -1345,6 +1363,15 @@ let sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; + "lru-cache-5.1.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; + }; + }; "lru-cache-6.0.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -1372,22 +1399,31 @@ let sha512 = "ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg=="; }; }; - "minimatch-5.1.0" = { + "minimatch-5.1.2" = { name = "minimatch"; packageName = "minimatch"; - version = "5.1.0"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz"; - sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.2.tgz"; + sha512 = "bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg=="; }; }; - "minipass-3.3.5" = { + "minipass-3.3.6" = { name = "minipass"; packageName = "minipass"; - version = "3.3.5"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.3.5.tgz"; - sha512 = "rQ/p+KfKBkeNwo04U15i+hOwoVBVmekmm/HcfTkTN2t9pbQKCMm4eN5gFeqgrrSp/kH/7BYYhTIHOxGqzbBPaA=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz"; + sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; + }; + }; + "minipass-4.0.0" = { + name = "minipass"; + packageName = "minipass"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz"; + sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw=="; }; }; "minizlib-2.1.2" = { @@ -1408,40 +1444,31 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "mongodb-4.10.0" = { + "mongodb-4.13.0" = { name = "mongodb"; packageName = "mongodb"; - version = "4.10.0"; + version = "4.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-4.10.0.tgz"; - sha512 = "My2QxLTw0Cc1O9gih0mz4mqo145Jq4rLAQx0Glk/Ha9iYBzYpt4I2QFNRIh35uNFNfe8KFQcdwY1/HKxXBkinw=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.13.0.tgz"; + sha512 = "+taZ/bV8d1pYuHL4U+gSwkhmDrwkWbH1l4aah4YpmpscMwgFBkufIKxgP/G7m87/NUuQzc2Z75ZTI7ZOyqZLbw=="; }; }; - "mongodb-ace-autocompleter-0.11.1" = { - name = "mongodb-ace-autocompleter"; - packageName = "mongodb-ace-autocompleter"; - version = "0.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mongodb-ace-autocompleter/-/mongodb-ace-autocompleter-0.11.1.tgz"; - sha512 = "owAU1JRy05XiwUj2+WG3jHPEz8UAjpciW0Hl+mwrYvZJJZG898XUlKqL5Cryh3WogSyxlhEW2SWT4zHKN7AAcg=="; - }; - }; - "mongodb-build-info-1.4.0" = { + "mongodb-build-info-1.5.0" = { name = "mongodb-build-info"; packageName = "mongodb-build-info"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb-build-info/-/mongodb-build-info-1.4.0.tgz"; - sha512 = "X6bKL2kz2DY2cQp/QKJW3Qfb9YgtHZ4+5W48UAIsuIf0OtS5O4pU6/Mh6MCaVt/4VGejERZFuRXnrufMUFKC7w=="; + url = "https://registry.npmjs.org/mongodb-build-info/-/mongodb-build-info-1.5.0.tgz"; + sha512 = "D+cXTPet0X7fcMuXBR+Trzqjl9DX7lX7L36v527+5T8mp/wTUP9r/rA/PrmHrQLa9jGknxEbAZOHpC+g/lJ/UQ=="; }; }; - "mongodb-connection-string-url-2.5.3" = { + "mongodb-connection-string-url-2.6.0" = { name = "mongodb-connection-string-url"; packageName = "mongodb-connection-string-url"; - version = "2.5.3"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.3.tgz"; - sha512 = "f+/WsED+xF4B74l3k9V/XkTVj5/fxFH2o5ToKXd8Iyi5UhM+sO9u0Ape17Mvl/GkZaFtM0HQnzAG5OTmhKw+tQ=="; + url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz"; + sha512 = "WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ=="; }; }; "mongodb-log-writer-1.1.4" = { @@ -1480,42 +1507,6 @@ let sha512 = "71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ=="; }; }; - "nanoassert-1.1.0" = { - name = "nanoassert"; - packageName = "nanoassert"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz"; - sha512 = "C40jQ3NzfkP53NsO8kEOFd79p4b9kDXQMwgiY1z8ZwrDZgUyom0AHwGegF4Dm99L+YoYhuaB0ceerUcXmqr1rQ=="; - }; - }; - "nanobus-4.5.0" = { - name = "nanobus"; - packageName = "nanobus"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nanobus/-/nanobus-4.5.0.tgz"; - sha512 = "7sBZo9wthqNJ7QXnfVXZL7fkKJLN55GLOdX+RyZT34UOvxxnFtJe/c7K0ZRLAKOvaY1xJThFFn0Usw2H9R6Frg=="; - }; - }; - "nanoscheduler-1.0.3" = { - name = "nanoscheduler"; - packageName = "nanoscheduler"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoscheduler/-/nanoscheduler-1.0.3.tgz"; - sha512 = "jBbrF3qdU9321r8n9X7yu18DjP31Do2ItJm3mWrt90wJTrnDO+HXpoV7ftaUglAtjgj9s+OaCxGufbvx6pvbEQ=="; - }; - }; - "nanotiming-7.3.1" = { - name = "nanotiming"; - packageName = "nanotiming"; - version = "7.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nanotiming/-/nanotiming-7.3.1.tgz"; - sha512 = "l3lC7v/PfOuRWQa8vV29Jo6TG10wHtnthLElFXs4Te4Aas57Fo4n1Q8LH9n+NDh9riOzTVvb2QNBhTS4JUKNjw=="; - }; - }; "node-fetch-2.6.7" = { name = "node-fetch"; packageName = "node-fetch"; @@ -1525,13 +1516,13 @@ let sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; }; - "node-releases-2.0.6" = { + "node-releases-2.0.8" = { name = "node-releases"; packageName = "node-releases"; - version = "2.0.6"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz"; - sha512 = "PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz"; + sha512 = "dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="; }; }; "nopt-6.0.0" = { @@ -1615,15 +1606,6 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; - "remove-array-items-1.1.1" = { - name = "remove-array-items"; - packageName = "remove-array-items"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/remove-array-items/-/remove-array-items-1.1.1.tgz"; - sha512 = "MXW/jtHyl5F1PZI7NbpS8SOtympdLuF20aoWJT5lELR1p/HJDd5nqW8Eu9uLh/hCRY3FgvrIT5AwDCgBODklcA=="; - }; - }; "remove-trailing-slash-0.1.1" = { name = "remove-trailing-slash"; packageName = "remove-trailing-slash"; @@ -1633,13 +1615,13 @@ let sha512 = "o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA=="; }; }; - "safe-buffer-5.1.2" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.2"; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; "saslprep-git+https://github.com/mongodb-js/saslprep#v1.0.4" = { @@ -1670,13 +1652,13 @@ let sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.3.7" = { + "semver-7.3.8" = { name = "semver"; packageName = "semver"; - version = "7.3.7"; + version = "7.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; - sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"; + sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; }; }; "shebang-command-2.0.0" = { @@ -1715,13 +1697,13 @@ let sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; }; }; - "socks-2.7.0" = { + "socks-2.7.1" = { name = "socks"; packageName = "socks"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.7.0.tgz"; - sha512 = "scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA=="; + url = "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz"; + sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; }; }; "source-map-0.5.7" = { @@ -1778,13 +1760,13 @@ let sha512 = "/6CCJOKB5Fpi0x7/DCbV7uiFPgwGCeJsAaSondXS2DjLBv7ER2worVGvQWJqPM0kgOKO6auaCcSWpJKnrDmXjw=="; }; }; - "tar-6.1.11" = { + "tar-6.1.13" = { name = "tar"; packageName = "tar"; - version = "6.1.11"; + version = "6.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz"; - sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; + url = "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz"; + sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; }; }; "text-table-0.2.0" = { @@ -1823,13 +1805,13 @@ let sha512 = "l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA=="; }; }; - "update-browserslist-db-1.0.9" = { + "update-browserslist-db-1.0.10" = { name = "update-browserslist-db"; packageName = "update-browserslist-db"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz"; - sha512 = "/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg=="; + url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz"; + sha512 = "OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ=="; }; }; "uuid-8.3.2" = { @@ -1904,6 +1886,15 @@ let sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; }; }; + "yallist-3.1.1" = { + name = "yallist"; + packageName = "yallist"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + }; + }; "yallist-4.0.0" = { name = "yallist"; packageName = "yallist"; @@ -1928,105 +1919,108 @@ in mongosh = nodeEnv.buildNodePackage { name = "mongosh"; packageName = "mongosh"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/mongosh/-/mongosh-1.6.0.tgz"; - sha512 = "SZ/FYATnLuxzdLb2iTRNnE228WP0Lykmjs4yPUOZ/QWNMVYssYPOin9BS3Uznd1++miur5/+AqCvjQXKkOhH+Q=="; + url = "https://registry.npmjs.org/mongosh/-/mongosh-1.6.2.tgz"; + sha512 = "KaY93VYRJS7vh6P8aIlXZnbeU6M6h4CD60SKdEVlbUdn7X9klBE2q8SozfS9J1wbadwobZ2ClzWmVOFZWGeLyw=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.3" - (sources."@babel/core-7.19.3" // { + sources."@babel/compat-data-7.20.10" + (sources."@babel/core-7.20.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.19.3" // { + (sources."@babel/generator-7.20.7" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; }) - (sources."@babel/helper-compilation-targets-7.19.3" // { + (sources."@babel/helper-compilation-targets-7.20.7" // { dependencies = [ + sources."lru-cache-5.1.1" sources."semver-6.3.0" + sources."yallist-3.1.1" ]; }) sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.19.0" - sources."@babel/helper-plugin-utils-7.19.0" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-module-transforms-7.20.11" + sources."@babel/helper-plugin-utils-7.20.2" + sources."@babel/helper-simple-access-7.20.2" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.19.0" + sources."@babel/helpers-7.20.7" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" - sources."@babel/plugin-transform-destructuring-7.18.13" - sources."@babel/plugin-transform-parameters-7.18.8" + sources."@babel/parser-7.20.7" + sources."@babel/plugin-transform-destructuring-7.20.7" + sources."@babel/plugin-transform-parameters-7.20.7" sources."@babel/plugin-transform-shorthand-properties-7.18.6" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.19.3" - sources."@babel/types-7.19.3" + sources."@babel/template-7.20.7" + sources."@babel/traverse-7.20.12" + sources."@babel/types-7.20.7" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.17" sources."@mongodb-js/devtools-connect-1.4.3" - sources."@mongosh/arg-parser-1.6.0" - (sources."@mongosh/async-rewriter2-1.6.0" // { + sources."@mongodb-js/mongodb-constants-0.1.5" + sources."@mongosh/arg-parser-1.6.2" + (sources."@mongosh/async-rewriter2-1.6.2" // { dependencies = [ sources."@babel/core-7.16.12" sources."semver-6.3.0" ]; }) - sources."@mongosh/autocomplete-1.6.0" - sources."@mongosh/cli-repl-1.6.0" - sources."@mongosh/editor-1.6.0" - sources."@mongosh/errors-1.6.0" - sources."@mongosh/history-1.6.0" - sources."@mongosh/i18n-1.6.0" - sources."@mongosh/js-multiline-to-singleline-1.6.0" - sources."@mongosh/logging-1.6.0" - sources."@mongosh/service-provider-core-1.6.0" - sources."@mongosh/service-provider-server-1.6.0" - sources."@mongosh/shell-api-1.6.0" - sources."@mongosh/shell-evaluator-1.6.0" - (sources."@mongosh/snippet-manager-1.6.0" // { + sources."@mongosh/autocomplete-1.6.2" + sources."@mongosh/cli-repl-1.6.2" + sources."@mongosh/editor-1.6.2" + sources."@mongosh/errors-1.6.2" + sources."@mongosh/history-1.6.2" + sources."@mongosh/i18n-1.6.2" + sources."@mongosh/js-multiline-to-singleline-1.6.2" + sources."@mongosh/logging-1.6.2" + sources."@mongosh/service-provider-core-1.6.2" + sources."@mongosh/service-provider-server-1.6.2" + sources."@mongosh/shell-api-1.6.2" + sources."@mongosh/shell-evaluator-1.6.2" + (sources."@mongosh/snippet-manager-1.6.2" // { dependencies = [ sources."escape-string-regexp-4.0.0" ]; }) - sources."@mongosh/types-1.6.0" + sources."@mongosh/types-1.6.2" sources."@segment/loosely-validate-event-2.0.0" sources."@sideway/address-4.1.4" - sources."@sideway/formula-3.0.0" + sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" - sources."@types/babel__core-7.1.19" + sources."@types/babel__core-7.1.20" sources."@types/babel__generator-7.6.4" sources."@types/babel__template-7.4.1" - sources."@types/babel__traverse-7.18.2" - sources."@types/chai-4.3.3" - sources."@types/node-18.7.23" + sources."@types/babel__traverse-7.18.3" + sources."@types/chai-4.3.4" + sources."@types/node-18.11.18" sources."@types/sinon-10.0.13" - sources."@types/sinon-chai-3.2.8" + sources."@types/sinon-chai-3.2.9" sources."@types/sinonjs__fake-timers-8.1.2" sources."@types/webidl-conversions-7.0.0" sources."@types/whatwg-url-8.2.2" sources."abbrev-1.1.1" - sources."acorn-7.4.1" - sources."acorn-class-fields-0.3.7" + sources."acorn-8.8.1" + sources."acorn-class-fields-1.0.0" sources."acorn-numeric-separator-0.3.6" - sources."acorn-private-class-elements-0.2.7" - sources."acorn-private-methods-0.3.3" - sources."acorn-static-class-features-0.2.4" + sources."acorn-private-class-elements-1.0.0" + sources."acorn-private-methods-1.0.0" + sources."acorn-static-class-features-1.0.0" sources."analytics-node-5.2.0" sources."ansi-escape-sequences-5.1.2" sources."ansi-regex-5.0.1" @@ -2035,16 +2029,16 @@ in sources."array-back-4.0.2" sources."askcharacter-1.0.0" sources."askpassword-1.2.4" - sources."aws4-1.11.0" + sources."aws4-1.12.0" sources."axios-0.21.4" sources."axios-retry-3.2.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."brace-expansion-2.0.1" sources."browserslist-4.21.4" - sources."bson-4.7.0" + sources."bson-4.7.1" sources."buffer-5.7.1" - sources."caniuse-lite-1.0.30001412" + sources."caniuse-lite-1.0.30001442" sources."chalk-2.4.2" sources."charenc-0.0.2" sources."chownr-2.0.0" @@ -2053,17 +2047,16 @@ in sources."commander-2.20.3" sources."component-type-1.2.1" sources."config-chain-1.1.13" - sources."convert-source-map-1.8.0" + sources."convert-source-map-1.9.0" sources."cross-spawn-7.0.3" sources."crypt-0.0.2" sources."debug-4.3.4" - sources."denque-2.1.0" (sources."editorconfig-0.15.3" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."electron-to-chromium-1.4.267" + sources."electron-to-chromium-1.4.284" (sources."emphasize-3.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -2074,12 +2067,18 @@ in sources."supports-color-7.2.0" ]; }) + sources."encoding-0.1.13" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."fault-1.0.4" sources."follow-redirects-1.15.2" sources."format-0.2.2" - sources."fs-minipass-2.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."fs.realpath-1.0.0" sources."gensync-1.0.0-beta.2" sources."glob-8.0.3" @@ -2088,44 +2087,45 @@ in sources."has-flag-3.0.0" sources."highlight.js-9.12.0" sources."hijack-stream-1.0.0" + sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."ip-2.0.0" sources."is-buffer-1.1.6" - sources."is-recoverable-error-1.0.2" + sources."is-recoverable-error-1.0.3" sources."is-retry-allowed-1.2.0" sources."isexe-2.0.0" - sources."joi-17.6.1" + sources."joi-17.7.0" sources."join-component-1.1.0" - sources."js-beautify-1.14.6" + sources."js-beautify-1.14.7" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsesc-2.5.2" - sources."json5-2.2.1" + sources."json5-2.2.3" sources."lodash-4.17.21" sources."lodash.isstring-4.0.1" sources."lowlight-1.9.2" sources."lru-cache-4.1.5" sources."md5-2.3.0" sources."memory-pager-1.5.0" - sources."minimatch-5.1.0" - (sources."minipass-3.3.5" // { + sources."minimatch-5.1.2" + (sources."minipass-4.0.0" // { dependencies = [ sources."yallist-4.0.0" ]; }) (sources."minizlib-2.1.2" // { dependencies = [ + sources."minipass-3.3.6" sources."yallist-4.0.0" ]; }) sources."mkdirp-1.0.4" - sources."mongodb-4.10.0" - sources."mongodb-ace-autocompleter-0.11.1" - sources."mongodb-build-info-1.4.0" - (sources."mongodb-connection-string-url-2.5.3" // { + sources."mongodb-4.13.0" + sources."mongodb-build-info-1.5.0" + (sources."mongodb-connection-string-url-2.6.0" // { dependencies = [ sources."tr46-3.0.0" sources."webidl-conversions-7.0.0" @@ -2136,12 +2136,8 @@ in sources."mongodb-redact-0.2.2" sources."ms-2.1.2" sources."mustache-4.2.0" - sources."nanoassert-1.1.0" - sources."nanobus-4.5.0" - sources."nanoscheduler-1.0.3" - sources."nanotiming-7.3.1" sources."node-fetch-2.6.7" - sources."node-releases-2.0.6" + sources."node-releases-2.0.8" sources."nopt-6.0.0" sources."numeral-2.0.6" sources."once-1.4.0" @@ -2160,11 +2156,10 @@ in sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."punycode-2.1.1" - sources."remove-array-items-1.1.1" sources."remove-trailing-slash-0.1.1" - sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."saslprep-git+https://github.com/mongodb-js/saslprep#v1.0.4" - (sources."semver-7.3.7" // { + (sources."semver-7.3.8" // { dependencies = [ sources."lru-cache-6.0.0" sources."yallist-4.0.0" @@ -2174,13 +2169,13 @@ in sources."shebang-regex-3.0.0" sources."sigmund-1.0.1" sources."smart-buffer-4.2.0" - sources."socks-2.7.0" + sources."socks-2.7.1" sources."source-map-0.5.7" sources."sparse-bitfield-3.0.3" sources."strip-ansi-6.0.1" sources."supports-color-5.5.0" sources."system-ca-1.0.2" - (sources."tar-6.1.11" // { + (sources."tar-6.1.13" // { dependencies = [ sources."yallist-4.0.0" ]; @@ -2188,7 +2183,7 @@ in sources."text-table-0.2.0" sources."to-fast-properties-2.0.0" sources."tr46-0.0.3" - sources."update-browserslist-db-1.0.9" + sources."update-browserslist-db-1.0.10" sources."uuid-8.3.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" diff --git a/pkgs/development/tools/moq/default.nix b/pkgs/development/tools/moq/default.nix index 40f004d6e5bf..b7b7ffcfd840 100644 --- a/pkgs/development/tools/moq/default.nix +++ b/pkgs/development/tools/moq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "moq"; - version = "0.2.7"; + version = "0.3.0"; src = fetchFromGitHub { owner = "matryer"; repo = "moq"; rev = "v${version}"; - sha256 = "sha256-me/KD8bgzA+VU7WrfKlk8HZTInJqhijLAVTiZcJRzms="; + sha256 = "sha256-RdFffcj17CZdI6kL+d5fp8B8gX493k8h0EzDq8BN+SY="; }; - vendorSha256 = "sha256-XTe52pytjZYJALBOcnytA8z/d3UHSKcU1lJmJm8Iawo="; + vendorSha256 = "sha256-lfs61YK5HmUd3/qA4o9MiWeTFhu4MTAkNH+f0iGlRe0="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/mysql-shell/default.nix b/pkgs/development/tools/mysql-shell/default.nix index 26dd21ef0dd4..c16cab26b7bc 100644 --- a/pkgs/development/tools/mysql-shell/default.nix +++ b/pkgs/development/tools/mysql-shell/default.nix @@ -39,16 +39,16 @@ let in stdenv.mkDerivation rec { pname = "mysql-shell"; - version = "8.0.31"; + version = "8.0.32"; srcs = [ (fetchurl { url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz"; - sha256 = "sha256-VA9dqvPmw2WXP3hAJS2xRTvxBM8D/IPsWYIaYwRZI/s="; + hash = "sha256-GUkeZ856/olOssiqkb3qc8ddnianVGXwrcW6hrIG3wE="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz"; - sha256 = "sha256-Z7uMunWyjpXH95SFY/AfuEUo/LsaNduoOdTORP4Bm6o="; + hash = "sha256-Hw2SojeJgkRxbdWB95k1bgc8LaY8Oy5KAeEDLL7VDig="; }) ]; diff --git a/pkgs/development/tools/nagelfar/default.nix b/pkgs/development/tools/nagelfar/default.nix new file mode 100644 index 000000000000..e770d162dc47 --- /dev/null +++ b/pkgs/development/tools/nagelfar/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchzip, tcl, tcllib, tk, }: + +tcl.mkTclDerivation { + pname = "nagelfar"; + version = "1.3.3"; + + src = fetchzip { + url = "https://sourceforge.net/projects/nagelfar/files/Rel_133/nagelfar133.tar.gz"; + sha256 = "sha256-bdH53LSOKMwq53obVQitl7bpaSpwvMce8oJgg/GKrg0="; + }; + + buildInputs = [ + tcl + tcllib + tk + ]; + + installPhase = '' + install -Dm 755 $src/nagelfar.tcl $out/bin/nagelfar + ''; + + meta = with lib; { + homepage = "https://nagelfar.sourceforge.net/"; + description = "A static syntax checker (linter) for Tcl"; + longDescription = '' + Provides static syntax checking, code coverage instrumentation, + and is very extendable through its syntax database and plugins. + ''; + mainProgram = "nagelfar"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.nat-418 ]; + }; +} diff --git a/pkgs/development/tools/nap/default.nix b/pkgs/development/tools/nap/default.nix new file mode 100644 index 000000000000..3d925b33801c --- /dev/null +++ b/pkgs/development/tools/nap/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub, callPackage }: + +buildGoModule rec { + pname = "nap"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "maaslalani"; + repo = pname; + rev = "v${version}"; + sha256 = "0b3sz8zp1nwcjl02b3lli5yjc7vfay1ig6fs8bgxwz22imfx076p"; + }; + + vendorSha256 = "sha256-puCqql77kvdWTcwp8z6LExBt/HbNRNe0f+wtM0kLoWM="; + + excludedPackages = ".nap"; + + meta = { + description = "Code snippets in your terminal 🛌"; + homepage = "https://github.com/maaslalani/nap"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ phdcybersec maaslalani ]; + }; +} diff --git a/pkgs/development/tools/nasmfmt/default.nix b/pkgs/development/tools/nasmfmt/default.nix index fb727e0f51c9..413d7df67885 100644 --- a/pkgs/development/tools/nasmfmt/default.nix +++ b/pkgs/development/tools/nasmfmt/default.nix @@ -1,22 +1,27 @@ -{ lib, buildGoPackage, fetchFromGitHub, go }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "nasmfmt"; - version = "unstable-2021-04-24"; + version = "unstable-2022-09-15"; src = fetchFromGitHub { owner = "yamnikov-oleg"; repo = "nasmfmt"; - rev = "efba220c5252eb717f080d266dcc8304efdeab40"; - sha256 = "sha256-snhXF+IP0qzl43rKQ0Ugfo1zv3RyNfjxnMpjZEBgPQg="; + rev = "127dbe8e72376c67d7dff89010ccfb49fc7b533e"; + hash = "sha256-1c7ZOdoM0/Us7cnTT3sds2P5pcCedrCfl0GqQBnf9Rk="; }; - goPackagePath = "github.com/yamnikov-oleg/nasmfmt"; + vendorHash = null; + + preBuild = '' + cp ${./go.mod} go.mod + ''; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Formatter for NASM source files"; homepage = "https://github.com/yamnikov-oleg/nasmfmt"; - platforms = go.meta.platforms; license = licenses.mit; maintainers = with maintainers; [ ckie ]; }; diff --git a/pkgs/development/tools/nasmfmt/go.mod b/pkgs/development/tools/nasmfmt/go.mod new file mode 100644 index 000000000000..0dfb1521c9e5 --- /dev/null +++ b/pkgs/development/tools/nasmfmt/go.mod @@ -0,0 +1,3 @@ +module github.com/yamnikov-oleg/nasmfmt + +go 1.18 diff --git a/pkgs/development/tools/nc4nix/default.nix b/pkgs/development/tools/nc4nix/default.nix index ae91e40d5860..dcec26ab5fc3 100644 --- a/pkgs/development/tools/nc4nix/default.nix +++ b/pkgs/development/tools/nc4nix/default.nix @@ -1,22 +1,37 @@ { lib , buildGoModule -, fetchFromGitLab +, fetchFromGitHub , nix , makeWrapper +, fetchpatch }: buildGoModule rec { pname = "nc4nix"; - version = "unstable-2022-11-13"; + version = "unstable-2022-12-07"; - src = fetchFromGitLab { - domain = "git.project-insanity.org"; - owner = "onny"; + src = fetchFromGitHub { + owner = "helsinki-systems"; repo = "nc4nix"; - rev = "857e789287692e42f3fcaae039d6f323b383543b"; - sha256 = "sha256-ekuvqTyoaYiNju4yiQLPmxaXaGD4T3Wv9A8CHY1MZOI="; + rev = "c556a596b1d40ff69b71adab257ec5ae51ba4df1"; + sha256 = "sha256-EIPCMiVTf0ryXRMRGhepORaOlimt3/funvUdORRbVa8="; }; + patches = [ + # Switch hash calculation method + (fetchpatch { + url = "https://github.com/helsinki-systems/nc4nix/commit/88c182fbdddef148e086fa86438dcd72208efd75.patch"; + sha256 = "sha256-zAF0+t9wHrKhhyD0+/d58BiaavLHfxO8X5J6vNlEWx0="; + name = "switch_hash_calculation_method.patch"; + }) + # Add package selection command line argument + (fetchpatch { + url = "https://github.com/helsinki-systems/nc4nix/pull/2/commits/449eec89538df4e92106d06046831202eb84a1db.patch"; + sha256 = "sha256-qAAbR1G748+2vwwfAhpe8luVEIKNGifqXqTV9QqaUFc="; + name = "add_package_selection_command_line_arg.patch"; + }) + ]; + vendorSha256 = "sha256-uhINWxFny/OY7M2vV3ehFzP90J6Z8cn5IZHWOuEg91M="; nativeBuildInputs = [ @@ -31,8 +46,8 @@ buildGoModule rec { meta = with lib; { description = "Packaging helper for Nextcloud apps"; - homepage = "https://git.project-insanity.org/onny/nc4nix"; - license = licenses.unfree; + homepage = "https://github.com/helsinki-systems/nc4nix"; + license = licenses.mit; maintainers = with maintainers; [ onny ]; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/neil/default.nix b/pkgs/development/tools/neil/default.nix index 289e90aec31d..e4af4f24e19a 100644 --- a/pkgs/development/tools/neil/default.nix +++ b/pkgs/development/tools/neil/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "neil"; - version = "0.1.45"; + version = "0.1.47"; src = fetchFromGitHub { owner = "babashka"; repo = "neil"; rev = "v${version}"; - sha256 = "sha256-QEeJWR4aBx1DsXjlTanhDSQn91I9JzEitU+Az+wTVFY="; + sha256 = "sha256-fsFIBT1voh6QcGRoGYx10JoKqZuV3xcA+eOo03DYz1s="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/norminette/default.nix b/pkgs/development/tools/norminette/default.nix new file mode 100644 index 000000000000..73fb70127896 --- /dev/null +++ b/pkgs/development/tools/norminette/default.nix @@ -0,0 +1,31 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + pname = "norminette"; + version = "3.3.51"; + + src = fetchFromGitHub { + owner = "42School"; + repo = pname; + rev = version; + hash = "sha256-JpWziUKZPOD+AwiYeHR7e0B9l3XKNNp+XQkZEvynKGY="; + }; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + ]; + + preCheck = '' + export PYTHONPATH=norminette:$PYTHONPATH + ''; + + meta = with lib; { + description = "Open source norminette to apply 42's norme to C files"; + homepage = "https://github.com/42School/norminette"; + license = licenses.mit; + maintainers = with maintainers; [ wegank ]; + }; +} diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix index 48651435d371..b9fb3aa711c2 100644 --- a/pkgs/development/tools/nsis/default.nix +++ b/pkgs/development/tools/nsis/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { chmod -R u+w $out/share/nsis ''; - nativeBuildInputs = [ sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ sconsPackages.scons_latest ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; CPPPATH = symlinkJoin { @@ -71,5 +71,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ pombeirp ]; mainProgram = "makensis"; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 471932ff83f7..dd25dd864cee 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -56,7 +56,9 @@ stdenv.mkDerivation rec { inherit (param) sha256; }; - buildInputs = [ which ocaml ocamlbuild ]; + strictDeps = true; + + nativeBuildInputs = [ which ocaml ocamlbuild ]; # build fails otherwise enableParallelBuilding = false; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 65debca11c23..9d81c46e20c9 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w"; }; - buildInputs = [ ocaml perl ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml perl ]; prefixKey = "-prefix "; diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index 753ef0a836b9..87db3baf0b0e 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -52,7 +52,9 @@ stdenv.mkDerivation { sha256 = "1xqldjz9risndnabvadw41fdbi5sa2hl4fnqls7j9xfbby1izbg8"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; inherit meta; diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index 20aec3d171ff..7bc1f80c699f 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -11,6 +11,7 @@ let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ]; in buildDunePackage rec { pname = "dune-release"; version = "1.6.2"; + duneVersion = "3"; minimalOCamlVersion = "4.06"; @@ -19,9 +20,10 @@ in buildDunePackage rec { sha256 = "sha256-oJ5SL7qNM5izoEpr+nTjbT+YmmNIoy7QgSNse3wNIA4="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] ++ runtimeInputs; buildInputs = [ curly fmt cmdliner re opam-format opam-state opam-core rresult logs odoc bos yojson astring fpath ]; + nativeCheckInputs = [ odoc ]; checkInputs = [ alcotest ] ++ runtimeInputs; doCheck = true; diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index bdcf05d97001..7c305012c57e 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.6.0"; + version = "3.6.2"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "sha256-CKDGyVIWBOYM82r7oDbs8bEH31Hu0Uovt+72z90r8ng="; + sha256 = "sha256-ttSrhI77BKoqMl0AFdMu1EFO1xMOx6oS+YFY7/RFzzw="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 51df81cea5ef..f48ce5abf3f4 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -44,6 +44,15 @@ stdenv.mkDerivation rec { mkdir -p $OCAMLFIND_DESTDIR fi } + detectOcamlConflicts () { + local conflict + conflict="$(ocamlfind list |& grep "has multiple definitions" || true)" + if [[ -n "$conflict" ]]; then + echo "Conflicting ocaml packages detected"; + echo "$conflict" + exit 1 + fi + } # run for every buildInput addEnvHooks "$targetOffset" addOCamlPath @@ -51,6 +60,10 @@ stdenv.mkDerivation rec { preInstallHooks+=(createOcamlDestDir) # run even in nix-shell, and even without buildInputs addEnvHooks "$hostOffset" exportOcamlDestDir + # runs after all calls to addOCamlPath + if [[ -z "''${dontDetectOcamlConflicts-}" ]]; then + postHooks+=("detectOcamlConflicts") + fi ''; meta = { diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix deleted file mode 100644 index d72a653182d3..000000000000 --- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ buildDunePackage, fetchFromGitHub, js_of_ocaml-compiler -, camlp4, ocsigen_deriving -}: - -buildDunePackage rec { - version = "3.2.1"; - pname = "js_of_ocaml-camlp4"; - - useDune2 = false; - - src = fetchFromGitHub { - owner = "ocsigen"; - repo = "js_of_ocaml"; - rev = version; - sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik"; - }; - - buildInputs = [ camlp4 ocsigen_deriving ]; - - meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; -} diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 64313112f43b..5faccab938ee 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -1,23 +1,23 @@ { lib, fetchurl, buildDunePackage -, cmdliner, yojson, ppxlib +, cmdliner, yojson, ppxlib, findlib , menhir, menhirLib }: buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "4.0.0"; - useDune2 = true; + version = "4.1.0"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; - sha256 = "sha256:0pj9jjrmi0xxrzmygv4b5whsibw1jxy3wgibmws85x5jwlczh0nz"; + sha256 = "sha256-kXk/KaWvPeq6P301zqsR5znP4KXMMFVvYgFGGm1CNu8="; }; nativeBuildInputs = [ menhir ]; buildInputs = [ cmdliner ppxlib ]; configurePlatforms = []; - propagatedBuildInputs = [ menhirLib yojson ]; + propagatedBuildInputs = [ menhirLib yojson findlib ]; meta = { description = "Compiler from OCaml bytecode to Javascript"; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 679fd9ab9de8..9a86e52c65a4 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -5,7 +5,8 @@ buildDunePackage { pname = "js_of_ocaml"; - inherit (js_of_ocaml-compiler) version src useDune2; + inherit (js_of_ocaml-compiler) version src; + duneVersion = "3"; buildInputs = [ ppxlib ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index 8cdb7224d891..741dd1f6acd3 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -5,7 +5,8 @@ buildDunePackage { pname = "js_of_ocaml-lwt"; - inherit (js_of_ocaml-compiler) version src useDune2; + inherit (js_of_ocaml-compiler) version src; + duneVersion = "3"; buildInputs = [ js_of_ocaml-ppx ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix index 535fe6dae79c..8c473d90996e 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix @@ -6,7 +6,8 @@ buildDunePackage { pname = "js_of_ocaml-ppx"; - inherit (js_of_ocaml-compiler) version src useDune2; + inherit (js_of_ocaml-compiler) version src; + duneVersion = "3"; buildInputs = [ js_of_ocaml ]; propagatedBuildInputs = [ ppxlib ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix index 5256cd4037fc..0bb0674d322e 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -5,7 +5,8 @@ buildDunePackage { pname = "js_of_ocaml-ppx_deriving_json"; - inherit (js_of_ocaml-compiler) version src useDune2; + inherit (js_of_ocaml-compiler) version src; + duneVersion = "3"; propagatedBuildInputs = [ js_of_ocaml ppxlib ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix b/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix new file mode 100644 index 000000000000..d7d1f6fbcfe9 --- /dev/null +++ b/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix @@ -0,0 +1,12 @@ +{ lib, buildDunePackage, js_of_ocaml-compiler, ppxlib }: + +buildDunePackage { + duneVersion = "3"; + pname = "js_of_ocaml-toplevel"; + inherit (js_of_ocaml-compiler) src version; + buildInputs = [ ppxlib ]; + propagatedBuildInputs = [ js_of_ocaml-compiler ]; + meta = js_of_ocaml-compiler.meta // { + mainProgram = "jsoo_mktop"; + }; +} diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix index e371c9f10bf0..30d5af3d4b08 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -6,7 +6,8 @@ buildDunePackage { pname = "js_of_ocaml-tyxml"; - inherit (js_of_ocaml-compiler) version src useDune2; + inherit (js_of_ocaml-compiler) version src; + duneVersion = "3"; buildInputs = [ js_of_ocaml-ppx ]; diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index e917a5a76da6..296675664547 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -2,7 +2,7 @@ , substituteAll , fetchurl , ocaml -, dune_2 +, dune_3 , buildDunePackage , yojson , csexp @@ -15,16 +15,17 @@ }: let - merlinVersion = "4.6"; + merlinVersion = "4.7"; hashes = { - "4.6-412" = "sha256-isiurLeWminJQQR4oHpJPCzVk6cEmtQdX4+n3Pdka5c="; - "4.6-413" = "sha256-8903H4TE6F/v2Kw1XpcpdXEiLIdb9llYgt42zSR9kO4="; - "4.6-414" = "sha256-AuvXCjx32JQBY9vkxAd0pEjtFF6oTgrT1f9TJEEDk84="; + "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; + "4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU="; + "4.7-414" = "sha256-bIZ4kwmnit/ujM2//jZA59rweo7Y0QfDb+BpoTxswHs="; + "4.7-500" = "sha256-elYb/0vVvohi9yYFe/54brb6Qh6fyiN1kYPRq5fP1zE="; }; - ocamlVersionShorthand = lib.concatStrings - (lib.take 2 (lib.splitVersion ocaml.version)); + ocamlVersionShorthand = lib.substring 0 3 + (lib.concatStrings (lib.splitVersion ocaml.version)); version = "${merlinVersion}-${ocamlVersionShorthand}"; in @@ -36,6 +37,7 @@ else buildDunePackage { pname = "merlin"; inherit version; + duneVersion = "3"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-${version}.tbz"; @@ -46,7 +48,7 @@ buildDunePackage { (substituteAll { src = ./fix-paths.patch; dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; - dune = "${dune_2}/bin/dune"; + dune = "${dune_3}/bin/dune"; }) ]; @@ -59,14 +61,14 @@ buildDunePackage { buildInputs = [ dot-merlin-reader yojson - (if lib.versionAtLeast version "4.6-414" + (if lib.versionAtLeast version "4.7-414" then merlin-lib else csexp) menhirSdk menhirLib ]; - doCheck = true; + doCheck = false; checkPhase = '' runHook preCheck patchShebangs tests/merlin-wrapper diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix index e3fef3f4cc40..90c0aee0ff3f 100644 --- a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix +++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -7,7 +7,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.06"; - buildInputs = if lib.versionAtLeast version "4.6-414" + buildInputs = if lib.versionAtLeast version "4.7-414" then [ merlin-lib ] else [ yojson csexp ]; diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix index a37a8c8b3927..938fa24374af 100644 --- a/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/pkgs/development/tools/ocaml/obelisk/default.nix @@ -3,7 +3,7 @@ ocamlPackages.buildDunePackage rec { pname = "obelisk"; version = "0.6.0"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "Lelio-Brun"; repo = pname; diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix index 8a4dce342231..4a0a87577cbf 100644 --- a/pkgs/development/tools/ocaml/obuild/default.nix +++ b/pkgs/development/tools/ocaml/obuild/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-dqWP9rwWmr7i3O29v/kipJL01B3qQozaToOFCdfTWZU="; }; - buildInputs = [ ocaml ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml ]; buildPhase = '' patchShebangs ./bootstrap diff --git a/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix b/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix index 0aa456ee6cec..11564d4e985c 100644 --- a/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, ocaml , buildDunePackage , fix , menhirLib @@ -7,12 +8,15 @@ , gitUpdater }: +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "ocaml-recovery-parser is not available for OCaml ${ocaml.version}" + buildDunePackage rec { pname = "ocaml-recovery-parser"; version = "0.2.4"; minimalOCamlVersion = "4.08"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "serokell"; diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index f5853057d8e0..095af7769140 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -11,7 +11,8 @@ with ocamlPackages; buildDunePackage rec { sha256 = "sha256-ZXnPnPvJmHshkTwYWeBojrgJYAF/R6vUo0XkvVMFSeQ="; }; - buildInputs = [ ncurses ocp-build lablgtk3-sourceview3 ocp-index ]; + nativeBuildInputs = [ ocp-build ]; + buildInputs = [ ncurses lablgtk3-sourceview3 ocp-index ]; configurePhase = '' export TERM=xterm diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix index b40c8b42546b..0ac69f86c90d 100644 --- a/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; configurePhase = '' substituteInPlace src/ocamlify.ml --replace 'OCamlifyConfig.version' '"0.0.2"' diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index cf24a132210b..5b4f7e8e4407 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation { sha256 = "0cgp9qqrq7ayyhddrmqmq1affvfqcn722qiakjq4dkywvp67h4aa"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + strictDeps = !doCheck; + + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; configurePhase = "ocaml setup.ml -configure --prefix $out" + lib.optionalString doCheck " --enable-tests"; @@ -22,7 +24,7 @@ stdenv.mkDerivation { installPhase = "ocaml setup.ml -install"; inherit doCheck; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; checkPhase = "ocaml setup.ml -test"; diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix index 48b7d840a4f2..8277f4adb06d 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/default.nix +++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256:10xz8jknlmcgnf233nahd04q98ijnxpijhpvb8hl7sv94dgkvpql"; }; - propagatedBuildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; patches = [ ./Makefile.patch ]; diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index feb787d24d5d..de26536eb1c5 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -19,7 +19,10 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ ocaml findlib cmdliner_1_0 re ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ cmdliner_1_0 re ]; propagatedBuildInputs = [ ncurses ]; preInstall = "mkdir -p $out/bin"; diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index 29673d99dd0b..aae650fbdc25 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { buildInputs = [ cmdliner ]; meta = with lib; { - homepage = "http://typerex.ocamlpro.com/ocp-indent.html"; + homepage = "https://www.typerex.org/ocp-indent.html"; description = "A customizable tool to indent OCaml code"; license = licenses.gpl3; maintainers = [ maintainers.jirkamarsik ]; diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index 54e1ee55a7bf..fcb43938112d 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { pname = "ocsigen-i18n"; version = "3.7.0"; - buildInputs = with ocamlPackages; [ ocaml findlib ppx_tools ]; + strictDeps = true; + + nativeBuildInputs = with ocamlPackages; [ ocaml findlib ]; + buildInputs = with ocamlPackages; [ ppx_tools ]; dontStrip = true; diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix deleted file mode 100644 index 090794b33116..000000000000 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ /dev/null @@ -1,44 +0,0 @@ -{lib, stdenv, fetchurl, makeWrapper, ocaml, ncurses}: -let - pname = "omake"; - version = "0.9.8.6-0.rc1"; - webpage = "http://omake.metaprl.org"; -in - -if lib.versionAtLeast ocaml.version "4.06" -then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation { - - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://src.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz"; - sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13"; - }; - patchFlags = [ "-p0" ]; - patches = [ ./warn.patch ]; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ocaml ncurses ]; - - dontInstall = true; - buildPhase = '' - make bootstrap - make PREFIX=$out all - make PREFIX=$out install - ''; -# prefixKey = "-prefix "; -# -# configureFlags = if transitional then "--transitional" else "--strict"; -# -# buildFlags = [ "world.opt" ]; - - meta = { - description = "Omake build system"; - homepage = webpage; - license = "GPL"; - platforms = ocaml.meta.platforms or []; - }; -} diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index bcfd86a2d4de..b7d670ce4a7e 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -3,14 +3,17 @@ stdenv.mkDerivation rec { pname = "omake"; - version = "0.10.3"; + version = "0.10.5"; src = fetchurl { url = "http://download.camlcity.org/download/${pname}-${version}.tar.gz"; - sha256 = "07bdg1h5i7qnlv9xq81ad5hfypl10hxm771h4rjyl5cn8plhfcgz"; + sha256 = "sha256-VOFq2KLBbmZCRgHzfpD7p0iyF8yU1tTbyvTiOcpm98Q="; }; - buildInputs = [ ocaml ncurses ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml ]; + buildInputs = [ ncurses ]; meta = { description = "A build system designed for scalability and portability"; diff --git a/pkgs/development/tools/ocaml/omake/warn.patch b/pkgs/development/tools/ocaml/omake/warn.patch deleted file mode 100644 index 4459e89d7f9c..000000000000 --- a/pkgs/development/tools/ocaml/omake/warn.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -p1 -aur ../omake-0.9.8.6.ori/lib/build/OCaml.om ./lib/build/OCaml.om ---- ../omake-0.9.8.6.ori/lib/build/OCaml.om 2008-03-05 01:07:25.000000000 +0000 -+++ ./lib/build/OCaml.om 2013-06-01 15:52:37.000000000 +0000 -@@ -178,3 +178,3 @@ declare OCAMLDEPFLAGS - public.OCAMLPPFLAGS = --public.OCAMLFLAGS = -warn-error A -+public.OCAMLFLAGS = - public.OCAMLCFLAGS = -g -Seulement dans ./lib/build: OCaml.om~ -Seulement dans .: warn.patch diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix index 60804684ccbc..23a73002e6fe 100644 --- a/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -47,8 +47,10 @@ in stdenv.mkDerivation { pname = "opam"; version = "1.2.2"; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ curl ncurses ocaml ]; + strictDeps = true; + + nativeBuildInputs = [ makeWrapper unzip curl ocaml ]; + buildInputs = [ ncurses ]; src = srcs.opam; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 2108ba284040..1db7ea151fab 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, makeWrapper, getconf, - ocaml, unzip, ncurses, curl, bubblewrap + ocaml, unzip, ncurses, curl, bubblewrap, Foundation }: assert lib.versionAtLeast ocaml.version "4.02.3"; @@ -10,6 +10,10 @@ let url = "https://github.com/0install/0install/releases/download/v2.17/0install-v2.17.tbz"; sha256 = "08q95mzmf9pyyqs68ff52422f834hi313cxmypwrxmxsabcfa10p"; }; + "base64" = fetchurl { + url = "https://github.com/mirage/ocaml-base64/releases/download/v3.5.0/base64-v3.5.0.tbz"; + sha256 = "19735bvb3k263hzcvdhn4d5lfv2qscc9ib4q85wgxsvq0p0fk7aq"; + }; "cmdliner" = fetchurl { url = "http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.4.tbz"; sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw"; @@ -19,20 +23,20 @@ let sha256 = "0lxy4xkkkwgs1cj6d9lyzsqi9f6fc9r6cir5imi7yjqrpd86s1by"; }; "cudf" = fetchurl { - url = "https://github.com/ocaml/opam-source-archives/raw/main/cudf-0.9.tar.gz"; - sha256 = "0771lwljqwwn3cryl0plny5a5dyyrj4z6bw66ha5n8yfbpcy8clr"; + url = "https://gitlab.com/irill/cudf/-/archive/v0.10/cudf-v0.10.tar.gz"; + sha256 = "0l7vzvlrk4x4vw1lkd1wzarxz3h82r3835singcay8m8zj8777bv"; }; "dose3" = fetchurl { - url = "https://gitlab.com/irill/dose3/-/archive/5.0.1/dose3-5.0.1.tar.gz"; - sha256 = "1mh6fv8qbf8xx4h2dc0dpv2lzygvikzjhw1idrknibbwsjw3jg9c"; + url = "https://gitlab.com/irill/dose3/-/archive/7.0.0/dose3-7.0.0.tar.gz"; + sha256 = "0ab0llqdmy82ljh8xdf57y00c9jvf1vnxiq9hczli0r6vc263nq2"; }; "dune-local" = fetchurl { - url = "https://github.com/ocaml/dune/releases/download/2.9.1/dune-2.9.1.tbz"; - sha256 = "09lzq04b642iy0ljp59p32lgk3q8iphjh8fkdp69q29l5frgwx5k"; + url = "https://github.com/ocaml/dune/releases/download/3.5.0/dune-3.5.0.tbz"; + sha256 = "041n16sn41wwj6fgi7l10hvbl5x5swygqv33d4csx7rm0iklrgbp"; }; "extlib" = fetchurl { - url = "https://ygrek.org/p/release/ocaml-extlib/extlib-1.7.7.tar.gz"; - sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1"; + url = "https://github.com/ygrek/ocaml-extlib/releases/download/1.7.9/extlib-1.7.9.tar.gz"; + sha256 = "1jydzw2n84cfiz9y6lk4gih4wbr8jybanmiryfs01svd07g4vpjq"; }; "mccs" = fetchurl { url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+13.tar.gz"; @@ -67,21 +71,26 @@ let sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.1.3.zip"; - sha256 = "08n72n5wc476p28ypxjs8fmlvcb42129fcva753gqm0xicqh24xf"; + url = "https://github.com/ocaml/opam/archive/2.1.4.zip"; + sha256 = "0zp8sb75pw1kyqlm7bsiagfwq46mv41mxh5q2prn2cwg6xri2wrg"; }; }; in stdenv.mkDerivation { pname = "opam"; - version = "2.1.3"; + version = "2.1.4"; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap; + strictDeps = true; + + nativeBuildInputs = [ makeWrapper unzip ocaml curl ]; + buildInputs = [ ncurses getconf ] + ++ lib.optionals stdenv.isLinux [ bubblewrap ] + ++ lib.optionals stdenv.isDarwin [ Foundation ]; src = srcs.opam; postUnpack = '' ln -sv ${srcs."0install-solver"} $sourceRoot/src_ext/0install-solver.tbz + ln -sv ${srcs."base64"} $sourceRoot/src_ext/base64.tbz ln -sv ${srcs."cmdliner"} $sourceRoot/src_ext/cmdliner.tbz ln -sv ${srcs."cppo"} $sourceRoot/src_ext/cppo.tar.gz ln -sv ${srcs."cudf"} $sourceRoot/src_ext/cudf.tar.gz @@ -129,8 +138,10 @@ in stdenv.mkDerivation { meta = with lib; { description = "A package manager for OCaml"; homepage = "https://opam.ocaml.org/"; + changelog = "https://github.com/ocaml/opam/raw/${version}/CHANGES"; maintainers = [ maintainers.henrytill maintainers.marsam ]; + license = licenses.lgpl21Only; platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.1.3 -p opam-shebangs.patch +# Generated by: ./opam.nix.pl -v 2.1.4 -p opam-shebangs.patch diff --git a/pkgs/development/tools/ocaml/opam/installer.nix b/pkgs/development/tools/ocaml/opam/installer.nix index 4501ddd63f04..9b3b7a5617ba 100644 --- a/pkgs/development/tools/ocaml/opam/installer.nix +++ b/pkgs/development/tools/ocaml/opam/installer.nix @@ -3,7 +3,7 @@ ocamlPackages.buildDunePackage { pname = "opam-installer"; - useDune2 = true; + duneVersion = "3"; inherit (opam) version src; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index 2e816da8cc4d..8b573039d7d8 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -26,7 +26,7 @@ my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^ "ocaml" \{>= "(.*)"}$/m print <<"EOF"; { stdenv, lib, fetchurl, makeWrapper, getconf, - ocaml, unzip, ncurses, curl, bubblewrap + ocaml, unzip, ncurses, curl, bubblewrap, Foundation }: assert lib.versionAtLeast ocaml.version "$OCAML_MIN_VERSION"; @@ -68,8 +68,12 @@ in stdenv.mkDerivation { pname = "opam"; version = "$OPAM_RELEASE"; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap; + strictDeps = true; + + nativeBuildInputs = [ makeWrapper unzip ocaml curl ]; + buildInputs = [ ncurses getconf ] + ++ lib.optionals stdenv.isLinux [ bubblewrap ] + ++ lib.optionals stdenv.isDarwin [ Foundation ]; src = srcs.opam; @@ -124,7 +128,9 @@ print <<'EOF'; meta = with lib; { description = "A package manager for OCaml"; homepage = "https://opam.ocaml.org/"; + changelog = "https://github.com/ocaml/opam/raw/${version}/CHANGES"; maintainers = [ maintainers.henrytill maintainers.marsam ]; + license = licenses.lgpl21Only; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/ocaml/opam2json/default.nix b/pkgs/development/tools/ocaml/opam2json/default.nix index 198a5f575eb4..a3ca535d3f86 100644 --- a/pkgs/development/tools/ocaml/opam2json/default.nix +++ b/pkgs/development/tools/ocaml/opam2json/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, opam-installer, ocamlPackages }: stdenv.mkDerivation rec { pname = "opam2json"; - version = "0.2"; + version = "0.4"; src = fetchFromGitHub { owner = "tweag"; repo = pname; rev = "v${version}"; - sha256 = "fe8bm/V/4r2iNxgbitT2sXBqDHQ0GBSnSUSBg/1aXoI="; + sha256 = "sha256-5pXfbUfpVABtKbii6aaI2EdAZTjHJ2QntEf0QD2O5AM="; }; buildInputs = with ocamlPackages; [ yojson opam-file-format cmdliner ]; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 5d500339ff67..0afaff264947 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -11,7 +11,7 @@ let version = "2.10.0"; sha256 = "sha256-R10WovnqYcYCrDJnPuIQx2zHaPchSYfXDAaVMsJ4LQA="; duneVersion = "3"; - propagatedBuildInputs = [ lambda-term zed logs ]; + propagatedBuildInputs = [ findlib lambda-term zed logs ]; } else { diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix index c9728f9cbbf6..faa7b3eae900 100644 --- a/pkgs/development/tools/ofono-phonesim/default.nix +++ b/pkgs/development/tools/ofono-phonesim/default.nix @@ -11,7 +11,7 @@ mkDerivation { version = "unstable-2019-11-18"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/network/ofono/phonesim.git"; + url = "https://git.kernel.org/pub/scm/network/ofono/phonesim.git"; rev = "adf231a84cd3708b825dc82c56e841dd7e3b4541"; sha256 = "1840914sz46l8h2jwa0lymw6dvgj72wq9bhp3k4v4rk6masbf6hp"; }; diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 7493176e3ac6..b4843ddc1030 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -1,27 +1,42 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: buildGoModule rec { pname = "oh-my-posh"; - version = "12.16.0"; + version = "13.8.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-YrrOwTLVgxoriVgVDmn99ORSh04os0q/QnfBXtTtl5g="; + rev = "refs/tags/v${version}"; + hash = "sha256-mplWF/lmgRfYd1Gg2loZI5NIfmTHR8quG1/KcZj5W54="; }; - vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU="; + vendorHash = "sha256-WiH4qu8DODEhAkxUm6VDcBwFyQO7kNjaiaWPDHCHj9E="; sourceRoot = "source/src"; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; - ldflags = [ "-s" "-w" "-X" "main.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + ]; - tags = [ "netgo" "osusergo" "static_build" ]; + tags = [ + "netgo" + "osusergo" + "static_build" + ]; postInstall = '' + mv $out/bin/{src,oh-my-posh} mkdir -p $out/share/oh-my-posh cp -r ${src}/themes $out/share/oh-my-posh/ installShellCompletion --cmd oh-my-posh \ @@ -33,7 +48,8 @@ buildGoModule rec { meta = with lib; { description = "A prompt theme engine for any shell"; homepage = "https://ohmyposh.dev"; + changelog = "https://github.com/JanDeDobbeleer/oh-my-posh/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ lucperkins ]; + maintainers = with maintainers; [ lucperkins urandom ]; }; } diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index e4cfa4338277..7a50b2df240c 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.9.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-bcuGxz5Cn67SzGq+0fFR9ERnW829H4nKV2M+3/xu7s4="; + hash = "sha256-0pnPffvKcBpBir0l6rpp7iVbF9XlMTCG2mifzYkEQ7s="; }; - vendorHash = "sha256-/oR8R0/GC6cgCqXinCRH5x93qgRPeQmxHgZZGshrDr4="; + vendorHash = "sha256-Yi+4fGCHLH/kA4DuPI2uQ/27xhMd4cPFkTWlI6Bc13A="; postPatch = '' # Disable some tests that need file system & network access. diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 88e7fa690db6..046956057017 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -13,13 +13,13 @@ let in let finalPackage = buildDotnetModule rec { pname = "omnisharp-roslyn"; - version = "1.39.2"; + version = "1.39.4"; src = fetchFromGitHub { owner = "OmniSharp"; repo = pname; rev = "v${version}"; - sha256 = "/MxBdMjPpq3Gwhi/93+JCAI+BuiiWu0n9QThQi+s/kE="; + sha256 = "rX0FeURw6WMbcJOomqHFcZ9tpKO1td60/HbbVClV324="; }; projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj"; @@ -30,7 +30,7 @@ let finalPackage = buildDotnetModule rec { ]; dotnetInstallFlags = [ "--framework net6.0" ]; - dotnetBuildFlags = [ "--framework net6.0" ]; + dotnetBuildFlags = [ "--framework net6.0" "--no-self-contained" ]; dotnetFlags = [ # These flags are set by the cake build. "-property:PackageVersion=${version}" diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/development/tools/omnisharp-roslyn/deps.nix index ca9228eddb5d..e19073c93356 100644 --- a/pkgs/development/tools/omnisharp-roslyn/deps.nix +++ b/pkgs/development/tools/omnisharp-roslyn/deps.nix @@ -4,13 +4,13 @@ { fetchNuGet }: [ (fetchNuGet { pname = "Cake.Scripting.Abstractions"; version = "0.9.0"; sha256 = "15nqr100crclha0lzgil25j1wn45517gb34059qypj05j8psfmjx"; }) (fetchNuGet { pname = "Cake.Scripting.Transport"; version = "0.9.0"; sha256 = "1gpbvframx4dx4mzfh44cib6dfd26q7878vf073m9gv3y43sws7b"; }) - (fetchNuGet { pname = "Dotnet.Script.DependencyModel"; version = "1.3.1"; sha256 = "0bi9rg6c77qav8mb0rbvs5pczf9f0ii8i11c9vyib53bv6fiifxp"; }) - (fetchNuGet { pname = "Dotnet.Script.DependencyModel.NuGet"; version = "1.3.1"; sha256 = "1v2xd0f2xrkgdznnjad5vhjan51k9qwi4piyg5vdz9mvywail51q"; }) + (fetchNuGet { pname = "Dotnet.Script.DependencyModel"; version = "1.4.0"; sha256 = "08269f79r3a7iwf3i661k6vzi9xk21f0z21997dpyl2qhl5igndg"; }) + (fetchNuGet { pname = "Dotnet.Script.DependencyModel.NuGet"; version = "1.4.0"; sha256 = "0mhbxvcf9p48zzc3f2x25ihh1lxzzn63mwld5lkny5m1bx1fp198"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "7.2.1.6856"; sha256 = "19z68rgzl93lh1h8anbgzw119mhvcgr9nh5q2nxk6qihl2mx97ba"; }) (fetchNuGet { pname = "McMaster.Extensions.CommandLineUtils"; version = "3.1.0"; sha256 = "075n1mfsxwz514r94l8i3ax0wp43c3xb4f9w25a96h6xxnj0k2hd"; }) (fetchNuGet { pname = "MediatR"; version = "8.1.0"; sha256 = "0cqx7yfh998xhsfk5pr6229lcjcs1jxxyqz7dwskc9jddl6a2akp"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "17.3.1"; sha256 = "1hwjihnjcycnzqksa6pcljj515nprpqjqbqy3shykd86micyhhxr"; }) (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.3.1"; sha256 = "0v27f8nv0q6q3n5h4sdf3hm2j9b1dmjx5hpxv9s16gb4ayiaq8y9"; }) @@ -20,61 +20,47 @@ (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.3.1"; sha256 = "0yib6x7hankpr9knfxascybhydkq6zwc3ahg8f2hzph9pcf9krjz"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.AnalyzerUtilities"; version = "3.3.0"; sha256 = "0b2xy6m3l1y6j2xc97cg5llia169jv4nszrrrqclh505gpw6qccz"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.4.0-3.22429.3"; sha256 = "1f8jjy4v0f5banvg3d0qwv43w86ja1hz3rq452kg44ikrsnhzvcw"; 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.4.0-3.22429.3/microsoft.codeanalysis.common.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.4.0-3.22429.3"; sha256 = "1y5llwvgzzi294dh501h064l4c2niin4k0hkq1vr5hlyzcbzgdxg"; 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.4.0-3.22429.3/microsoft.codeanalysis.csharp.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Features"; version = "4.4.0-3.22429.3"; sha256 = "0swcsc4g6k1dfw8gmdk6dq35yrrw2idqzfxjqvx8hns453z33x73"; 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.4.0-3.22429.3/microsoft.codeanalysis.csharp.features.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.4.0-3.22429.3"; sha256 = "0sbwidq35lakh0y58ci67kpqayiyc69ag850fmrnjg7zwgcjc8p8"; 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.4.0-3.22429.3/microsoft.codeanalysis.csharp.scripting.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.4.0-3.22429.3"; sha256 = "0k4kzg4b3wirp1n6ic995g35h70iwpcwr18c9z1246i0kc0nll2q"; 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.4.0-3.22429.3/microsoft.codeanalysis.csharp.workspaces.4.4.0-3.22429.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0-2.22527.10"; sha256 = "0xvlmg1n5aj7ifb1kd6jg1sk6251rz8xi877v8jz4qx178vqcx8s"; 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.5.0-2.22527.10/microsoft.codeanalysis.common.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0-2.22527.10"; sha256 = "15vsv35zzgjysyr5hsrykc9qx8l062i4fyqg6hay7acqfx5kp539"; 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.5.0-2.22527.10/microsoft.codeanalysis.csharp.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Features"; version = "4.5.0-2.22527.10"; sha256 = "0bq3512kkhwq5p81svy7s850apdq0qmydjxqmms6f70sspyxh38b"; 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.5.0-2.22527.10/microsoft.codeanalysis.csharp.features.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.5.0-2.22527.10"; sha256 = "0lr2y28amwg5p0bb9gyh1yybci9swjwm0pp85nlr8zj8a8d1633w"; 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.5.0-2.22527.10/microsoft.codeanalysis.csharp.scripting.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.5.0-2.22527.10"; sha256 = "0xwclnvvlq36955vlih56a28fp79c6927rmhlqkdhqs3lsdz9l23"; 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.5.0-2.22527.10/microsoft.codeanalysis.csharp.workspaces.4.5.0-2.22527.10.nupkg"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Elfie"; version = "1.0.0"; sha256 = "1y5r6pm9rp70xyiaj357l3gdl4i4r8xxvqllgdyrwn9gx2aqzzqk"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp"; version = "4.4.0-3.22429.3"; sha256 = "1vi1dfwm4qq5vv10iaza174ikj3jqywv68hbjlm5g92iyw5v2j19"; 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.4.0-3.22429.3/microsoft.codeanalysis.externalaccess.omnisharp.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"; version = "4.4.0-3.22429.3"; sha256 = "1p49rjcgwb3hsh78h3n5ifi4iaywbkx6jdi4n8xpm8nyicjy524c"; 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.4.0-3.22429.3/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Features"; version = "4.4.0-3.22429.3"; sha256 = "19dfwpz35cvgvg9cgmfbf5c63msp1800kgk3v1ssphzfpmc35ws1"; 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.4.0-3.22429.3/microsoft.codeanalysis.features.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.4.0-3.22429.3"; sha256 = "1g0ly8qfz3j26il3pz5xh7kg13a41kbw2rm81srlamgv9djgxa8l"; 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.4.0-3.22429.3/microsoft.codeanalysis.scripting.common.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.4.0-3.22429.3"; sha256 = "080r4cwckhmvs9zjwi225q3gssi7f1h4ic93yakmk89mph0wjkaq"; 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.4.0-3.22429.3/microsoft.codeanalysis.workspaces.common.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp"; version = "4.5.0-2.22527.10"; sha256 = "0lg4bgm4awidj41p8gdjy6j4a2dq5hwvq7rw37sv9af93ri16pfh"; 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.5.0-2.22527.10/microsoft.codeanalysis.externalaccess.omnisharp.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"; version = "4.5.0-2.22527.10"; sha256 = "1ffcwf7pwcx4s63k6dhbgyj2anrw3n49cyj1845983vm918p9ymw"; 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.5.0-2.22527.10/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Features"; version = "4.5.0-2.22527.10"; sha256 = "1n06zkwpyc6jxsy3mlr23ad42yga40fbsyfnxdi632p4iav294w0"; 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.5.0-2.22527.10/microsoft.codeanalysis.features.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.5.0-2.22527.10"; sha256 = "1xlm9n7kgin9cfr2xybjxgiwwbnfifyx0r4mm1gfdhgfjbykbqhf"; 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.5.0-2.22527.10/microsoft.codeanalysis.scripting.common.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0-2.22527.10"; sha256 = "00swl909fqjp6vd41jc7f9kd7n5fzzqvpf1jicrbyr2nmh3mk0xk"; 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.5.0-2.22527.10/microsoft.codeanalysis.workspaces.common.4.5.0-2.22527.10.nupkg"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "1.4.0"; sha256 = "0li9shnm941jza40kqfkbbys77mrr55nvi9h3maq9fipq4qwx92d"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "6.0.0"; sha256 = "0qn30d3pg4rx1x2k525jj4x5g1fxm2v5m0ksz2dmk1gmqalpask8"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "6.0.0"; sha256 = "0dq1x7962zsp926rj76i4akk4hsy7r5ldys8r4xsd78rq5f67rhq"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "6.0.0"; sha256 = "1hb4qrq9xdxzh2px515pv1vkz1jigwaxw1hfg9w8s6pgl8z04l4c"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "6.0.0"; sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "6.0.0"; sha256 = "1c6l5szma1pdn61ncq1kaqibg0dz65hbma2xl626a8d1m6awn353"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; sha256 = "0plx785hk61arjxf0m3ywy9hl5nii25raj4523n3ql7mmv6hxqr1"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "6.0.0"; sha256 = "1383b0r33dzz0hrch9cqzzxr9vxr21qq0a5vnrpkfq71m2fky31d"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "2.0.0"; sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) (fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.0"; sha256 = "17d02106ksijzcnh03h8qaijs77xsba5l50chng6gb8nwi7wrbd5"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.1"; sha256 = "0c8yicvhmwgm3z076hy3zgkqznhmrm8qygiscawlc9k01l5ilkrs"; }) - (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 = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; }) (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.NETFramework.ReferenceAssemblies"; version = "1.0.0"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.0"; sha256 = "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"; }) @@ -85,46 +71,44 @@ (fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.3.0"; sha256 = "0n0iahawk4cjc7pkddjyaqnb10fn5qcjy59645ni0wy8q3myiskh"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.SDK.EmbedInteropTypes"; version = "15.0.12"; sha256 = "083pva0a0xxvqqrjv75if25wr3rq034wgjhbax74zhzdb665nzsw"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "1.14.114"; sha256 = "062mqkmjf4k6zm3wi9ih0lzypfsnv82lgh88r35fj66akihn86gv"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "16.7.56"; sha256 = "04v9df0k7bsc0rzgkw4mnvi43pdrh42vk6xdcwn9m6im33m0nnz2"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.5.31"; sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.4.27"; sha256 = "17f9bj01qxdd7mjxslgxkhky6xmg7agpimkf071k451csj5k2vkd"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.4.27"; sha256 = "1js19g9i2vz012l1ma2wx23awyxh2jqng1qs652l9jwj6gmp71v8"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.0.64"; sha256 = "1qm2dc9v1glpgy2blbcmsljwrsx55k82rjw4hiqh031h8idwryrl"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.6.0"; sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.6.81"; sha256 = "06wihcaga8537ibh0mkj28m720m6vzkqk562zkynhca85nd236yi"; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.8.57"; sha256 = "05p1vqs09xj6pa3nv08xymzz8sg5sg59598bn1rmfmbpqp3glvax"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) - (fetchNuGet { pname = "NuGet.Common"; version = "5.2.0"; sha256 = "14y7axpmdl9fg8jfc42gxpcq9wj8k3vzc07npmgjnzqlp5xjyyac"; }) + (fetchNuGet { pname = "NuGet.Common"; version = "6.2.0"; sha256 = "1xvjlly8x3gs26sbcil8vn3xf8wfb7lkmb36sics46b7a6fmkdhn"; }) (fetchNuGet { pname = "NuGet.Common"; version = "6.4.0-preview.1.53"; sha256 = "1p3f3p9md7d880hbp50msp54qkhwknxkz62sm79ndgldnclwrr3i"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.4.0-preview.1.53/nuget.common.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.Configuration"; version = "5.2.0"; sha256 = "0b4dkym3vnj7qldnqqq6h6ry0gkql5c2ps5wy72b8s4fc3dmnvf1"; }) + (fetchNuGet { pname = "NuGet.Configuration"; version = "6.2.0"; sha256 = "07hmnm1v5qbqpa2m77gikm0pds8c7blnc98il17alswc5hhmblm8"; }) (fetchNuGet { pname = "NuGet.Configuration"; version = "6.4.0-preview.1.53"; sha256 = "0zlkzgwqspja7j1j7jb5h3wdzvg42zp11ysgl93s96yxjr92ivx5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.4.0-preview.1.53/nuget.configuration.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "5.2.0"; sha256 = "156yjfsk9pzqviiwy69lxfqf61yyj4hn4vdgfcbqvw4d567i150r"; }) + (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.2.0"; sha256 = "0b00072yx20qnr9riq3b72ia1129llhw9a2fw6yv7ak77a70c3pq"; }) (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.4.0-preview.1.53"; sha256 = "05gmy611x4vppw2xjkbnnvf97nj3lrjkg5q1ilp625hf5hrmmx68"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.4.0-preview.1.53/nuget.dependencyresolver.core.6.4.0-preview.1.53.nupkg"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.2.0"; sha256 = "1fh4rp26m77jq5dyln68wz9qm217la9vv21amis2qvcy6gknk2wp"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.2.0"; sha256 = "0swbxdzvrd6jnpnr5kss6v5f7grhgzl1z5nk6b00z2x8pbrjfr42"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.4.0-preview.1.53"; sha256 = "0sp7phay7764wfwz9p4yl17zcxi8h9xpzv5x5kpqq9dmv79mx7ld"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.4.0-preview.1.53/nuget.frameworks.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.LibraryModel"; version = "5.2.0"; sha256 = "0vxd0y7rzzxvmxji9bzp95p2rx48303r3nqrlhmhhfc4z5fxjlqk"; }) + (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.2.0"; sha256 = "02l13hkpc6p86ibni8gzk65gdv85fmm1wqn39j86s68p5wf8l892"; }) (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.4.0-preview.1.53"; sha256 = "1syji2ml2mpsalyd4b7i3vni2d65mjmdy5csky7226m8nwxsaf9m"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.4.0-preview.1.53/nuget.librarymodel.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.Packaging"; version = "5.2.0"; sha256 = "14frrbdkka9jd6g52bv4lbqnpckw09yynr08f9kfgbc3j8pklqqb"; }) + (fetchNuGet { pname = "NuGet.Packaging"; version = "6.2.0"; sha256 = "05xkba6bckq1vpni9j7ng20zy0l7srk8lyx4mxy9cf1z14ca30bl"; }) (fetchNuGet { pname = "NuGet.Packaging"; version = "6.4.0-preview.1.53"; sha256 = "1rxbjc2430ry7aqyb9k9bk8qg6l3max84rg81445y0s3f23cbmpp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.4.0-preview.1.53/nuget.packaging.6.4.0-preview.1.53.nupkg"; }) (fetchNuGet { pname = "NuGet.Packaging.Core"; version = "6.4.0-preview.1.53"; sha256 = "08fkl1kp4sizncd0mgsgyas0qzq2wdxby7m3r9q3c8isk7m44lw7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging.core/6.4.0-preview.1.53/nuget.packaging.core.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.ProjectModel"; version = "5.2.0"; sha256 = "1j23jk2zql52v2nqgi0k6d7z63pjjzrvw8y1s38zpf0sn7lzdr0h"; }) + (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.2.0"; sha256 = "1fsr9dzxibllhzd80dap593snms7jp7mzsihq7mh55vbj3n6qss8"; }) (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.4.0-preview.1.53"; sha256 = "08y3gwlw26jbx5chmmgrbvpad42zf5f668cd2vh1xj9i0li9df9g"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.4.0-preview.1.53/nuget.projectmodel.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.Protocol"; version = "5.2.0"; sha256 = "1vlrrlcy7p2sf23wqax8mfhplnzppd73xqlr2g83ya056w0yf2rd"; }) + (fetchNuGet { pname = "NuGet.Protocol"; version = "6.2.0"; sha256 = "1fai84b45sv2h4wm6jqghf16x8hc6ksdsq4llay9qh1mak0zfg33"; }) (fetchNuGet { pname = "NuGet.Protocol"; version = "6.4.0-preview.1.53"; sha256 = "064l1cfx2483lvy9w5khigp07bp7y42rnrz8i85jalkrc4p3jvmr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.4.0-preview.1.53/nuget.protocol.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.Versioning"; version = "5.2.0"; sha256 = "08ay8bhddj9yiq6h9lk814l65fpx5gh1iprkl7pcp78g57a6k45k"; }) + (fetchNuGet { pname = "NuGet.Versioning"; version = "6.2.0"; sha256 = "0qpsf9wywwi49d0p9gvb0h6m6ja17lg8wyiyk1gg502cb73b90zn"; }) (fetchNuGet { pname = "NuGet.Versioning"; version = "6.4.0-preview.1.53"; sha256 = "1mvc81qy3s5iwqikyw5hypfkrf9ji5br91dybavznhhls9j96999"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.4.0-preview.1.53/nuget.versioning.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.0"; sha256 = "0m9lw21iz90ayl35f24ir3vbiydf4sjqw590qqgwknykpzsi1ai2"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.0"; sha256 = "17akjdh9dnyxr01lnlsa41ca52psqnny8j3wxz904zs15pz932ln"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.0"; sha256 = "06d4wakdaj42c9qnlhdyqrjnm97azp4hrvfg70f96ldl765y9vrf"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.0"; sha256 = "0k1z3zchl1d82fj0ha63i54g5j046iaz8vb3cyxpjb6kp7zah28v"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.0"; sha256 = "0s3h9v5p043ip27g9jcvd0np9q3hn2pfv6gn539m45yb5d74a6i5"; }) + (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.7"; sha256 = "02fsw54jmh037a5q518nrsd9657kdy111m31q13ll759a601bai7"; }) + (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.7"; sha256 = "15wy1ql68bdbz507488ivdlc4wsd3f73cbwqwc8yci1mwpfcwryd"; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.7"; sha256 = "0c2mh69cx4lzf0s146i9ci43inb9mns4rcy08qdzki56irb0y3yh"; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.7"; sha256 = "004jacz3w9rqvccfa1f88vzkz68agx786bncg43bc6mzg8j7mcvr"; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.7"; sha256 = "05a5vh32vq6jipzvwwjzjf40l2ar2qxp6v9sxpfjnxdvm1bxyxmf"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) @@ -166,21 +150,19 @@ (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.0.7"; sha256 = "083saqlwx1hbhy0rv7vi973aw7jv8q53fcxlrprx1wgxdwnbi5ni"; }) - (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.0.7"; sha256 = "0b25qz3h1aarza2b74alsl9v6czns3y61i8p10yqgd9djk1b1byj"; }) - (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.0.7"; sha256 = "0wkrzcpc9vcd27gwj6w537i1i5i3h5zsips8b9v9ngk003n50mia"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.0.7"; sha256 = "1kmyf4v4157n2194j17ijf62xnqiapxhg4aka851zx0hzlxm7ygp"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.0.7"; sha256 = "1davv3fqd05353d7dl7wm2sg58fyy59b29pk58w1vf7m33580grj"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.1.0"; sha256 = "008bnj279y7gxcai69r4bqgxpxwsdb8jvai4kxkd97arlcr1cpjv"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.0"; sha256 = "0kq5x9k5kl6lh7jp1hgjn08wl37zribrykfimhln6mkqbp1myncp"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.0"; sha256 = "1ibkkz5dsac64nf7alsdsr8r1jm8j87vv6chsi3azkf5zv0rphsy"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.1.0"; sha256 = "12a6s3knynfrzf9vxxy6hwg4hvxncc0ad59g3bigqx86p8xfb4nq"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.0"; sha256 = "1g7gi1kdil8iv67g42xbmfhr1l0pkz645gqnd8lfv3q24449shan"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; sha256 = "1i55cxp8ycc03dmxx4n22qi6jkwfl23cgffb95izq7bjar8avxxq"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) @@ -195,35 +177,25 @@ (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) (fetchNuGet { pname = "System.Data.DataSetExtensions"; version = "4.5.0"; sha256 = "0gk9diqx388qjmbhljsx64b5i0p9cwcaibd4h7f8x901pz84x6ma"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (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.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) - (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (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.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; }) (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (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.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "4.7.3"; sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "5.0.1"; sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v"; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) @@ -233,56 +205,40 @@ (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) (fetchNuGet { pname = "System.Reactive"; version = "4.4.1"; sha256 = "0gx8jh3hny2y5kijz5k9pxiqw481d013787c04zlhps21ygklw4a"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { pname = "System.Reflection.DispatchProxy"; version = "4.5.1"; sha256 = "0cdnl4i9mfk7kx2ylglayqwqw7kl5k1xr8siaxch45hfyc2cpds8"; }) - (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.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"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (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.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.0"; sha256 = "1x0b289r9yjzdqypi2x3dc8sa66s3b6bpc7l2f8hxrzl6czdg4al"; }) (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; sha256 = "1ijfiqpi3flp5g9amridhjjmzz6md1c6pnxx5h7pdbiqqx9rwrpk"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) (fetchNuGet { pname = "System.Resources.Extensions"; version = "6.0.0"; sha256 = "1h73gps9ffw77vys4zwgm78fgackqw6a7rjrg75mmx79vdw1shgw"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (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"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.WindowsRuntime"; version = "4.3.0"; sha256 = "0bpsy91yqm2ryp5y9li8p6yh4yrxcvg9zvm569ifw25rpy67bgp9"; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.6.0"; sha256 = "1wl1dyghi0qhpap1vgfhg2ybdyyhy9vc2a7dpm1xb30vfgmlkjmf"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) @@ -296,7 +252,6 @@ (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "5.0.0"; sha256 = "0hb2mndac3xrw3786bsjxjfh19bwnr991qib54k6wsqjhjyyvbwj"; }) (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.1"; sha256 = "0wswhbvm3gh06azg9k1zfvmhicpzlh7v71qzd4x5zwizq4khv7iq"; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.3.0"; sha256 = "1kg264xmqabyz8gfg8ymp6qp6aw43vawfp0znf0909d7b5jd3dq9"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) @@ -307,32 +262,22 @@ (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.6.0"; sha256 = "1jmfzfz1n8hp63s5lja5xxpzkinbp6g59l3km9h8avjiisdrg5wm"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "6.0.0"; sha256 = "1b4vyjdir9kdkiv2fqqm4f76h0df68k8gcd7jb2b38zgr2vpnk3c"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) ] diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/development/tools/opcr-policy/default.nix index c14cabbfa32b..f3e8c942bf24 100644 --- a/pkgs/development/tools/opcr-policy/default.nix +++ b/pkgs/development/tools/opcr-policy/default.nix @@ -5,18 +5,22 @@ buildGoModule rec { pname = "opcr-policy"; - version = "0.1.42"; + version = "0.1.47"; src = fetchFromGitHub { owner = "opcr-io"; repo = "policy"; rev = "v${version}"; - sha256 = "sha256-taC/VZBalJMFi8kVw7R03ibmHTwbKTxj3mcYbXms26M="; + sha256 = "sha256-HjoVD3GLNg1jdCPMwEUJR/0BLJexbVxacVfmIm/P4SI="; }; - vendorSha256 = "sha256-r2eKRJC8/fDY38u924ViLCf7kT54Tc+zIBD2YV9Qn6c="; + vendorHash = "sha256-/wTLnJ3l22owDL5dFR9H/QN3UItxP7QQgU/NcmzBL6U="; ldflags = [ "-s" "-w" "-X github.com/opcr-io/policy/pkg/version.ver=${version}" ]; + subPackages = [ "cmd/policy" ]; + # disable go workspaces + GOWORK = "off"; + doCheck = false; doInstallCheck = true; diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index b7f94177c586..530d349303c7 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -11,15 +11,15 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.45.0"; + version = "0.48.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-7w5HOZr1cei7AvMdHdVzjB3ZQGWCOgm/g9UhuO3vSJI="; + hash = "sha256-//xwk5T477Ae61MqZCrj8VcG23mqrP04/VVuUwtxyio="; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; @@ -42,7 +42,7 @@ buildGoModule rec { getGoDirs() { go list ./... | grep -v -e e2e ${lib.optionalString stdenv.isDarwin "-e wasm"} } - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # remove tests that have "too many open files"/"no space left on device" issues on darwin in hydra rm server/server_test.go ''; diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index 26387f2affae..3b38cc97e6b8 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -1,27 +1,42 @@ -{ buildGoModule, go, lib, fetchFromGitHub, makeWrapper }: +{ lib +, buildGoModule +, go +, fetchFromGitHub +, makeWrapper +}: buildGoModule rec { pname = "operator-sdk"; - version = "1.25.2"; + version = "1.26.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-ZGcXb4RP+4ae0aAcLNL9JKLUqyoO5qCShDDbbxoge1w="; + rev = "refs/tags/v${version}"; + hash = "sha256-hIJTdTZ24+VwF1M/RvKcnQRzZga0nsjlTTUFYxZn0lo="; }; - vendorSha256 = "sha256-1Vz+SIrNULajDqzZt53+o9wv1zLPBvKrO28BTqS4VbM="; + vendorHash = "sha256-1Vz+SIrNULajDqzZt53+o9wv1zLPBvKrO28BTqS4VbM="; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + go + ]; doCheck = false; - subPackages = [ "cmd/operator-sdk" ]; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ go ]; + subPackages = [ + "cmd/ansible-operator" + "cmd/helm-operator" + "cmd/operator-sdk" + ]; # operator-sdk uses the go compiler at runtime allowGoReference = true; + postFixup = '' wrapProgram $out/bin/operator-sdk --prefix PATH : ${lib.makeBinPath [ go ]} ''; @@ -29,6 +44,7 @@ buildGoModule rec { meta = with lib; { description = "SDK for building Kubernetes applications. Provides high level APIs, useful abstractions, and project scaffolding"; homepage = "https://github.com/operator-framework/operator-sdk"; + changelog = "https://github.com/operator-framework/operator-sdk/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ arnarg ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/oq/default.nix b/pkgs/development/tools/oq/default.nix index 298a68d3a429..3c2a0223dd41 100644 --- a/pkgs/development/tools/oq/default.nix +++ b/pkgs/development/tools/oq/default.nix @@ -19,7 +19,7 @@ crystal.buildCrystalPackage rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libxml2 ]; - checkInputs = [ jq ]; + nativeCheckInputs = [ jq ]; format = "shards"; diff --git a/pkgs/development/tools/oras/default.nix b/pkgs/development/tools/oras/default.nix index b0adcadd8440..183e26d70494 100644 --- a/pkgs/development/tools/oras/default.nix +++ b/pkgs/development/tools/oras/default.nix @@ -1,25 +1,37 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, testers, oras }: buildGoModule rec { pname = "oras"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "oras-project"; repo = "oras"; rev = "v${version}"; - sha256 = "sha256-8QmMC4eB7WNxfEsVRUzv/gb7QmNBvcgDEENa1XxpCug="; + hash = "sha256-7fmrWkJ2f9LPaBB0vqLqPCCLpkdsS1gVfJ1xn6K/M3E="; }; - vendorSha256 = "sha256-THqrGnJnNDL6BJpRxeNLPjWB+SEUMUhiVOcJZDTM6n8="; + + vendorHash = "sha256-BLjGu1xk5OCNILc2es5Q0fEIqoexq/lHnJtHz72w6iI="; + + nativeBuildInputs = [ installShellFiles ]; + + excludedPackages = [ "./test/e2e" ]; 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" + "-X oras.land/oras/internal/version.Version=${version}" + "-X oras.land/oras/internal/version.BuildMetadata=" + "-X oras.land/oras/internal/version.GitTreeState=clean" ]; + postInstall = '' + installShellCompletion --cmd oras \ + --bash <($out/bin/oras completion bash) \ + --fish <($out/bin/oras completion fish) \ + --zsh <($out/bin/oras completion zsh) + ''; + doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck @@ -30,6 +42,11 @@ buildGoModule rec { runHook postInstallCheck ''; + passthru.tests.version = testers.testVersion { + package = oras; + command = "oras version"; + }; + meta = with lib; { homepage = "https://oras.land/"; changelog = "https://github.com/oras-project/oras/releases/tag/v${version}"; diff --git a/pkgs/development/tools/package-project-cmake/default.nix b/pkgs/development/tools/package-project-cmake/default.nix new file mode 100644 index 000000000000..3636f4e0412c --- /dev/null +++ b/pkgs/development/tools/package-project-cmake/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "package-project-cmake"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "TheLartians"; + repo = "PackageProject.cmake"; + rev = "v${finalAttrs.version}"; + hash = "sha256-tDjWknwqN8NLx6GX16WOn0JUDAyaGU9HA7fTsHNLx9s="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{,doc/}package-project-cmake + install -Dm644 CMakeLists.txt $out/share/package-project-cmake/ + install -Dm644 README.md $out/share/doc/package-project-cmake/ + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/TheLartians/PackageProject.cmake"; + description = "A CMake script for packaging C/C++ projects"; + longDescription = '' + Help other developers use your project. A CMake script for packaging + C/C++ projects for simple project installation while employing + best-practices for maximum compatibility. Creating installable + CMake scripts always requires a large amount of boilerplate code + to get things working. This small script should simplify the CMake + packaging process into a single, easy-to-use command. + ''; + license = licenses.mit; + maintainers = with maintainers; [ ken-matsui ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/development/tools/packcc/default.nix b/pkgs/development/tools/packcc/default.nix index 77ad73158049..b16b0491c9b6 100644 --- a/pkgs/development/tools/packcc/default.nix +++ b/pkgs/development/tools/packcc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ bats uncrustify ]; + nativeCheckInputs = [ bats uncrustify ]; preCheck = '' patchShebangs ../../tests diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 1d3cdf62c081..3204058326a3 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.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-m8PKigVm46PN55hchc5a1OUUuhxoGn3e2sMRqqvkPgs="; + sha256 = "sha256-jdJD7AW4IrzVl4BPdsFFrRSdCWX9l4nFM+DWIuxLiJ8="; }; - vendorSha256 = "sha256-hSZCYSV7nMGd5KQsV+Z4ig7vk4j8cZnOvsg0DqPiEvg="; + vendorSha256 = "sha256-ufvWgusTMbM88F3BkJ61KM2wRSdqPOlMKqDSYf7tZQA="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index 3fc1b2cd8661..b7437d70bf80 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, jdk, python2 }: +{ lib, stdenv, fetchurl, jdk }: stdenv.mkDerivation rec { pname = "antlr"; @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { }; patches = [ ./2.7.7-fixes.patch ]; buildInputs = [ jdk ]; - nativeBuildInputs = [ python2 ]; meta = with lib; { description = "Powerful parser generator"; diff --git a/pkgs/development/tools/parsing/antlr/builder.sh b/pkgs/development/tools/parsing/antlr/builder.sh index b8e7791b6fc9..55259b932124 100644 --- a/pkgs/development/tools/parsing/antlr/builder.sh +++ b/pkgs/development/tools/parsing/antlr/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup tar zxvf $src diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index d3a3cd702319..fe30f1b3b190 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "byacc"; - version = "20221106"; + version = "20221229"; src = fetchurl { urls = let @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" ]; - hash = "sha256-qJm+Inu8rJz3cA99u1qElGiPH58GF7UQdi2urOR7nRI="; + hash = "sha256-ExbG95D6+maIQn8f+RJnth2LeHO0Q8Yg7vaabv8FA7w="; }; configureFlags = [ diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix index a80e75559df3..c13abf071c56 100644 --- a/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { branch = "2.5.35"; - homepage = "http://flex.sourceforge.net/"; + homepage = "https://flex.sourceforge.net/"; description = "A fast lexical analyser generator"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/development/tools/parsing/jikespg/default.nix index 8179855e6ebc..e9bd83416933 100644 --- a/pkgs/development/tools/parsing/jikespg/default.nix +++ b/pkgs/development/tools/parsing/jikespg/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://jikes.sourceforge.net/"; + homepage = "https://jikes.sourceforge.net/"; description = "The Jikes Parser Generator"; platforms = platforms.all; license = licenses.ipl10; diff --git a/pkgs/development/tools/parsing/nex/default.nix b/pkgs/development/tools/parsing/nex/default.nix new file mode 100644 index 000000000000..287098ed8d36 --- /dev/null +++ b/pkgs/development/tools/parsing/nex/default.nix @@ -0,0 +1,27 @@ +{ buildGoPackage +, fetchFromGitHub +, lib +}: +# upstream is pretty stale, but it still works, so until they merge module +# support we have to use gopath: see blynn/nex#57 +buildGoPackage rec { + pname = "nex"; + version = "unstable-2021-03-30"; + + src = fetchFromGitHub { + owner = "blynn"; + repo = pname; + rev = "1a3320dab988372f8910ccc838a6a7a45c8980ff"; + hash = "sha256-DtJkV380T2B5j0+u7lYZfbC0ej0udF4GW2lbRmmbjAM="; + }; + + goPackagePath = "github.com/blynn/nex"; + subPackages = [ "." ]; + + meta = with lib; { + description = "Lexer for Go"; + homepage = "https://github.com/blynn/nex"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 02be14908e43..09a955f965d9 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -35,9 +35,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; tests = { inherit ninja php spamassassin; }; diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index dcc8be0640f4..13ba669bb4f2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -23,7 +23,6 @@ , extraGrammars ? { } }: -# TODO: move to carnix or https://github.com/kolloch/crate2nix let # to update: # 1) change all these hashes @@ -52,14 +51,17 @@ let '' + (lib.concatStrings (lib.mapAttrsToList (name: grammar: "ln -s ${if grammar ? src then grammar.src else fetchGrammar grammar} $out/${name}\n") (import ./grammars { inherit lib; })))); + + buildGrammar = callPackage ./grammar.nix { }; + builtGrammars = let - change = name: grammar: - callPackage ./grammar.nix { } { - language = if grammar ? language then grammar.language else name; + build = name: grammar: + buildGrammar { + language = grammar.language or name; inherit version; - source = if grammar ? src then grammar.src else fetchGrammar grammar; - location = if grammar ? location then grammar.location else null; + src = grammar.src or fetchGrammar grammar; + location = grammar.location or null; }; grammars' = import ./grammars { inherit lib; } // extraGrammars; grammars = grammars' // @@ -71,7 +73,7 @@ let { tree-sitter-markdown = grammars'.tree-sitter-markdown // { location = "tree-sitter-markdown"; }; } // { tree-sitter-markdown-inline = grammars'.tree-sitter-markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; }; in - lib.mapAttrs change (grammars); + lib.mapAttrs build (grammars); # Usage: # pkgs.tree-sitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ]) @@ -143,7 +145,7 @@ rustPlatform.buildRustPackage { updater = { inherit update-all-grammars; }; - inherit grammars builtGrammars withPlugins allGrammars; + inherit grammars buildGrammar builtGrammars withPlugins allGrammars; tests = { # make sure all grammars build diff --git a/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/pkgs/development/tools/parsing/tree-sitter/grammar.nix index e819a55eef37..c2c3ce4a8961 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammar.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammar.nix @@ -9,10 +9,8 @@ { # language name language - # version of tree-sitter , version - # source for the language grammar -, source +, src , location ? null , generate ? false , ... @@ -21,7 +19,7 @@ stdenv.mkDerivation ({ pname = "${language}-grammar"; - src = source; + inherit src version; nativeBuildInputs = lib.optionals generate [ nodejs tree-sitter ]; @@ -46,6 +44,7 @@ stdenv.mkDerivation ({ $CC -fPIC -c src/scanner.c -o scanner.o $CFLAGS fi $CC -fPIC -c src/parser.c -o parser.o $CFLAGS + rm -rf parser $CXX -shared -o parser *.o runHook postBuild ''; @@ -59,4 +58,4 @@ stdenv.mkDerivation ({ fi runHook postInstall ''; -} // removeAttrs args [ "language" "source" "location" "generate" ]) +} // removeAttrs args [ "language" "location" "generate" ]) diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 92a755e4da6c..5283c7c6c3d9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -375,19 +375,7 @@ let knownTreeSitterOrgGrammarRepos); in - mergeAttrsUnique otherGrammars treeSitterOrgaGrammars; - - # TODO: move to lib - mergeAttrsUnique = left: right: - let intersect = lib.intersectLists (lib.attrNames left) (lib.attrNames right); in - assert - lib.assertMsg (intersect == [ ]) - (lib.concatStringsSep "\n" [ - "mergeAttrsUnique: keys in attrset overlapping:" - "left: ${lib.generators.toPretty {} (lib.getAttrs intersect left)}" - "right: ${lib.generators.toPretty {} (lib.getAttrs intersect right)}" - ]); - left // right; + lib.attrsets.unionOfDisjoint otherGrammars treeSitterOrgaGrammars; diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix index 2fbde805905b..9e792a49733b 100644 --- a/pkgs/development/tools/pgformatter/default.nix +++ b/pkgs/development/tools/pgformatter/default.nix @@ -2,13 +2,13 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "5.3"; + version = "5.4"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - sha256 = "sha256-W6xIUQhCUuPo2oIArqlM8RX2hlrPts12rTQQo+/74iM="; + sha256 = "sha256-z90V4aKp5gIZMWQha3gHpTMtpYVsGhFtPWHiJuFt3qA="; }; outputs = [ "out" ]; diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index 05e5d9179394..7d6e986ff138 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -25,14 +25,14 @@ with py.pkgs; buildPythonApplication rec { pname = "pip-audit"; - version = "2.4.5"; + version = "2.4.12"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; - rev = "v${version}"; - hash = "sha256-S3v2utDLZOY7RXOnMQV8Zo7h6vMPyiwlws/EftXFpTM="; + rev = "refs/tags/v${version}"; + hash = "sha256-bpAs7xXWvBVGzbX6Fij71BnEMpqYjSSCtWjuA/EFms8="; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ buildPythonApplication rec { rich ]; - checkInputs = [ + nativeCheckInputs = [ pretend pytestCheckHook ]; @@ -84,6 +84,7 @@ buildPythonApplication rec { meta = with lib; { description = "Tool for scanning Python environments for known vulnerabilities"; homepage = "https://github.com/trailofbits/pip-audit"; + changelog = "https://github.com/pypa/pip-audit/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index ae314347ff4f..2d19f0fca3c3 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2022.11.11"; + version = "2022.11.25"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5p9kR36DWV87iR4eWLGxNV1MWTQy5jsHjcG+m9k8UGY="; + sha256 = "sha256-ElnWxwU7EIbZqqvIGp/rc5vS0X6BuyAgSJoy7BQYYu4="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/poac/default.nix b/pkgs/development/tools/poac/default.nix new file mode 100644 index 000000000000..ffe1eaf6a483 --- /dev/null +++ b/pkgs/development/tools/poac/default.nix @@ -0,0 +1,106 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, cpm-cmake +, git +, git2-cpp +, cacert +, boost179 +, fmt_8 +, icu +, libarchive +, libgit2 +, lz4 +, mitama-cpp-result +, ninja +, openssl_3 +, package-project-cmake +, spdlog +}: + +let + glob = fetchFromGitHub { + owner = "p-ranav"; + repo = "glob"; + rev = "v0.0.1"; + sha256 = "sha256-2y+a7YFBiYX8wbwCCWw1Cm+SFoXGB3ZxLPi/QdZhcdw="; + }; + + structopt = fetchFromGitHub { + owner = "p-ranav"; + repo = "structopt"; + rev = "e9722d3c2b52cf751ebc1911b93d9649c4e365cc"; + sha256 = "sha256-jIfKUyY2QQ2/donywwlz65PY8u7xODGoG6SlNtUhwkg="; + }; + + toml11 = fetchFromGitHub { + owner = "ToruNiina"; + repo = "toml11"; + rev = "9086b1114f39a8fb10d08ca704771c2f9f247d02"; + sha256 = "sha256-fHUElHO4ckNQq7Q88GdbHGxfaAvWoWtGB0eD9y2MnLo="; + }; +in +stdenv.mkDerivation rec { + pname = "poac"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "poacpm"; + repo = pname; + rev = version; + sha256 = "sha256-JgGa7lomDvZG5HLxGJMALcezjnZprexJDTxyTUjLetg="; + }; + + preConfigure = '' + mkdir -p ${placeholder "out"}/share/cpm + cp ${cpm-cmake}/share/cpm/CPM.cmake ${placeholder "out"}/share/cpm/CPM_0.35.1.cmake + ''; + + cmakeFlags = [ + "-DPOAC_BUILD_TESTING=OFF" + "-DCPM_SOURCE_CACHE=${placeholder "out"}/share" + "-DFETCHCONTENT_SOURCE_DIR_FMT=${fmt_8}" + "-DFETCHCONTENT_SOURCE_DIR_GIT2-CPP=${git2-cpp.src}" + "-DFETCHCONTENT_SOURCE_DIR_GLOB=${glob}" + "-DFETCHCONTENT_SOURCE_DIR_PACKAGEPROJECT.CMAKE=${package-project-cmake.src}" + "-DFETCHCONTENT_SOURCE_DIR_MITAMA-CPP-RESULT=${mitama-cpp-result.src}" + "-DFETCHCONTENT_SOURCE_DIR_NINJA=${ninja.src}" + "-DFETCHCONTENT_SOURCE_DIR_STRUCTOPT=${structopt}" + "-DFETCHCONTENT_SOURCE_DIR_TOML11=${toml11}" + ]; + + nativeBuildInputs = [ cmake git cacert ]; + buildInputs = [ + (boost179.override { + enableShared = stdenv.isDarwin; + enableStatic = !stdenv.isDarwin; + }) + fmt_8 + git2-cpp + glob + package-project-cmake + mitama-cpp-result + ninja + structopt + toml11 + icu + libarchive + libgit2 + lz4 + openssl_3 + spdlog + ]; + + meta = with lib; { + homepage = "https://poac.pm"; + description = "Package Manager for C++"; + license = licenses.asl20; + maintainers = with maintainers; [ ken-matsui ]; + platforms = platforms.unix; + # https://github.com/NixOS/nixpkgs/pull/189712#issuecomment-1237791234 + broken = (stdenv.isLinux && stdenv.isAarch64) + # error: excess elements in scalar initializer on std::aligned_alloc + || (stdenv.isDarwin && stdenv.isx86_64); + }; +} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 153d9beb159e..80002ecdf784 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -1,11 +1,10 @@ { pkgs ? import { } , lib ? pkgs.lib -, poetry ? null , poetryLib ? import ./lib.nix { inherit lib pkgs; stdenv = pkgs.stdenv; } }: let # Poetry2nix version - version = "1.36.0"; + version = "1.39.1"; inherit (poetryLib) isCompatible readTOML normalizePackageName normalizePackageSet; @@ -72,7 +71,7 @@ let ) ); nativeBuildInputs = mkInput "nativeBuildInputs" [ ]; - checkInputs = mkInput "checkInputs" ( + nativeCheckInputs = mkInput "nativeCheckInputs" ( getDeps (pyProject.tool.poetry."dev-dependencies" or { }) # =poetry-1.2.0 dependency groups ++ lib.flatten (map (g: getDeps (pyProject.tool.poetry.group.${g}.dependencies or { })) checkGroups) @@ -143,7 +142,7 @@ lib.makeScope pkgs.newScope (self: { }; getFunctorFn = fn: if builtins.typeOf fn == "set" then fn.__functor else fn; - poetryPkg = poetry.override { inherit python; }; + poetryPkg = pkgs.callPackage ./pkgs/poetry { inherit python; }; scripts = pyProject.tool.poetry.scripts or { }; hasScripts = scripts != { }; @@ -221,6 +220,16 @@ lib.makeScope pkgs.newScope (self: { getFunctorFn ( [ + # Remove Python packages aliases with non-normalized names to avoid issues with infinite recursion (issue #750). + (self: super: lib.attrsets.mapAttrs + ( + name: value: + if lib.isDerivation value && self.hasPythonModule value && (normalizePackageName name) != name + then null + else value + ) + super) + ( self: super: { @@ -239,7 +248,7 @@ lib.makeScope pkgs.newScope (self: { } ) - # Fix infinite recursion in a lot of packages because of checkInputs + # Fix infinite recursion in a lot of packages because of nativeCheckInputs (self: super: lib.mapAttrs (name: value: ( if lib.isDerivation value && lib.hasAttr "overridePythonAttrs" value @@ -472,7 +481,7 @@ lib.makeScope pkgs.newScope (self: { /* The default list of poetry2nix override overlays - Can be overriden by calling defaultPoetryOverrides.overrideOverlay which takes an overlay function + Can be overridden by calling defaultPoetryOverrides.overrideOverlay which takes an overlay function */ defaultPoetryOverrides = self.mkDefaultPoetryOverrides (import ./overrides { inherit pkgs lib poetryLib; }); diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 9f7936d9f829..0541ef525f96 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -41,6 +41,7 @@ pythonPackages.callPackage in builtins.filter (f: matchesVersion f.file && hasSupportedExtension f.file && isCompatibleEgg f.file) files; toPath = s: pwd + "/${s}"; + isLocked = lib.length fileCandidates > 0; isSource = source != null; isGit = isSource && source.type == "git"; isUrl = isSource && source.type == "url"; @@ -107,7 +108,7 @@ pythonPackages.callPackage nativeBuildInputs = [ hooks.poetry2nixFixupHook ] - ++ lib.optional (!isSource && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook + ++ lib.optional (isLocked && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook ++ lib.optionals (format == "wheel") [ hooks.wheelUnpackHook pythonPackages.pipInstallHook @@ -120,7 +121,7 @@ pythonPackages.callPackage ]; buildInputs = ( - lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg + lib.optional (isLocked) (getManyLinuxDeps fileInfo.name).pkg ++ lib.optional isDirectory buildSystemPkgs ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) pythonPackages.setuptools ); @@ -164,6 +165,7 @@ pythonPackages.callPackage ( builtins.fetchGit ({ inherit (source) url; + submodules = true; rev = source.resolved_reference or source.reference; ref = sourceSpec.branch or (if sourceSpec ? tag then "refs/tags/${sourceSpec.tag}" else "HEAD"); } // ( diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json index e5d5c946a403..dc5c5c5b50d9 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json @@ -167,6 +167,9 @@ "aio-georss-gdacs": [ "setuptools" ], + "aio-pika": [ + "setuptools" + ], "aioairq": [ "setuptools" ], @@ -444,6 +447,9 @@ "poetry-core", "setuptools" ], + "aiormq": [ + "setuptools" + ], "aiorpcx": [ "setuptools" ], @@ -900,6 +906,9 @@ "arpeggio": [ "setuptools" ], + "arpy": [ + "setuptools" + ], "arrayqueues": [ "setuptools" ], @@ -1031,6 +1040,9 @@ "astunparse": [ "setuptools" ], + "async-cache": [ + "setuptools" + ], "async-dns": [ "poetry-core", "setuptools" @@ -1192,6 +1204,9 @@ "autobahn": [ "setuptools" ], + "autoflake": [ + "hatchling" + ], "autograd": [ "setuptools" ], @@ -1250,6 +1265,27 @@ "poetry-core", "setuptools" ], + "aws-cdk-asset-awscli-v1": [ + "setuptools" + ], + "aws-cdk-asset-kubectl-v20": [ + "setuptools" + ], + "aws-cdk-asset-node-proxy-agent": [ + "setuptools" + ], + "aws-cdk-asset-node-proxy-agent-v5": [ + "setuptools" + ], + "aws-cdk-aws-batch-alpha": [ + "setuptools" + ], + "aws-cdk-aws-lambda-python-alpha": [ + "setuptools" + ], + "aws-cdk-lib": [ + "setuptools" + ], "aws-error-utils": [ "poetry" ], @@ -1268,6 +1304,9 @@ "awscli-cwlogs": [ "setuptools" ], + "awscli-local": [ + "setuptools" + ], "awscrt": [ "setuptools" ], @@ -2003,6 +2042,9 @@ "setuptools", "setuptools-scm" ], + "blue": [ + "setuptools" + ], "bluemaestro-ble": [ "poetry-core", "setuptools" @@ -2081,7 +2123,8 @@ "setuptools" ], "botocore-stubs": [ - "poetry-core" + "poetry-core", + "setuptools" ], "bottle": [ "setuptools" @@ -2778,6 +2821,9 @@ "cmdline": [ "setuptools" ], + "cmdstanpy": [ + "setuptools" + ], "cmigemo": [ "setuptools" ], @@ -2840,6 +2886,10 @@ "setuptools" ], "colorama": [ + { + "buildSystem": "hatchling", + "from": "0.4.6" + }, "setuptools" ], "colorcet": [ @@ -2888,6 +2938,9 @@ "cometblue-lite": [ "setuptools" ], + "comm": [ + "hatchling" + ], "commandparse": [ "setuptools" ], @@ -2917,6 +2970,9 @@ "conda": [ "setuptools" ], + "config-formatter": [ + "setuptools" + ], "configargparse": [ "setuptools" ], @@ -2936,6 +2992,10 @@ "configshell": [ "setuptools" ], + "configupdater": [ + "setuptools", + "setuptools-scm" + ], "confluent-kafka": [ "setuptools" ], @@ -2965,6 +3025,9 @@ "construct": [ "setuptools" ], + "constructs": [ + "setuptools" + ], "consul": [ "setuptools" ], @@ -3082,6 +3145,9 @@ "credstash": [ "setuptools" ], + "crispy-bootstrap5": [ + "setuptools" + ], "criticality-score": [ "setuptools" ], @@ -3401,11 +3467,15 @@ "dbutils": [ "setuptools" ], + "ddsketch": [ + "setuptools" + ], "ddt": [ "setuptools" ], "ddtrace": [ - "cython" + "cython", + "setuptools" ], "deal": [ "flit-core", @@ -3670,6 +3740,9 @@ "django-4": [ "setuptools" ], + "django-admin-sortable2": [ + "setuptools" + ], "django-allauth": [ "setuptools" ], @@ -3704,6 +3777,9 @@ "django-cockroachdb": [ "setuptools" ], + "django-colorfield": [ + "setuptools" + ], "django-colorful": [ "setuptools" ], @@ -3723,6 +3799,12 @@ "django-cors-headers": [ "setuptools" ], + "django-countries": [ + "setuptools" + ], + "django-crispy-forms": [ + "setuptools" + ], "django-cryptography": [ "setuptools" ], @@ -3751,6 +3833,9 @@ "django-filter": [ "setuptools" ], + "django-floppyforms": [ + "setuptools" + ], "django-formtools": [ "setuptools", "setuptools-scm" @@ -3776,6 +3861,9 @@ "django-hijack": [ "setuptools" ], + "django-htmx": [ + "setuptools" + ], "django-ipware": [ "setuptools" ], @@ -3801,12 +3889,18 @@ "django-modelcluster": [ "setuptools" ], + "django-modeltranslation": [ + "setuptools" + ], "django-mptt": [ "setuptools" ], "django-multiselectfield": [ "setuptools" ], + "django-nested-admin": [ + "setuptools" + ], "django-nose": [ "setuptools" ], @@ -3906,6 +4000,9 @@ "django-treebeard": [ "setuptools" ], + "django-types": [ + "poetry-core" + ], "django-versatileimagefield": [ "setuptools" ], @@ -3941,6 +4038,12 @@ "setuptools", "setuptools-scm" ], + "djangorestframework-stubs": [ + "setuptools" + ], + "djangorestframework-types": [ + "poetry" + ], "djmail": [ "setuptools" ], @@ -4439,6 +4542,9 @@ "env-canada": [ "setuptools" ], + "envier": [ + "setuptools" + ], "environmental-override": [ "setuptools" ], @@ -4566,7 +4672,9 @@ ], "exceptiongroup": [ "flit-core", + "flit-scm", "flitBuildHook", + "flit-scm", "setuptools" ], "exchangelib": [ @@ -4640,6 +4748,9 @@ "fabric": [ "setuptools" ], + "fabric2": [ + "setuptools" + ], "fabulous": [ "setuptools" ], @@ -4794,6 +4905,7 @@ "setuptools" ], "fido2": [ + "poetry-core", "setuptools" ], "fields": [ @@ -4816,6 +4928,9 @@ "setuptools", "setuptools-scm" ], + "filemagic": [ + "setuptools" + ], "filetype": [ "setuptools" ], @@ -5563,6 +5678,12 @@ "github3-py": [ "setuptools" ], + "gitlint": [ + "setuptools" + ], + "gitlint-core": [ + "setuptools" + ], "gitpython": [ "setuptools" ], @@ -6368,7 +6489,18 @@ "setuptools" ], "httpx": [ - "setuptools" + { + "buildSystem": "hatch-fancy-pypi-readme", + "from": "0.23.1" + }, + { + "buildSystem": "hatchling", + "from": "0.23.1" + }, + { + "buildSystem": "setuptools", + "until": "0.23.1" + } ], "httpx-auth": [ "setuptools" @@ -7081,6 +7213,9 @@ "pbr", "setuptools" ], + "jsii": [ + "setuptools" + ], "jsmin": [ "setuptools" ], @@ -7252,7 +7387,14 @@ "setuptools" ], "jupyter-server": [ - "setuptools" + { + "buildSystem": "setuptools", + "until": "1.21.0" + }, + { + "buildSystem": "jupyter-packaging", + "from": "1.21.0" + } ], "jupyter-server-mathjax": [ "jupyter-packaging", @@ -7320,6 +7462,9 @@ "poetry-core", "setuptools" ], + "justpy": [ + "flit-core" + ], "jwcrypto": [ "setuptools" ], @@ -7416,6 +7561,9 @@ "setuptools", "setuptools-scm" ], + "keyring-pass": [ + "poetry-core" + ], "keyrings-alt": [ "setuptools", "setuptools-scm" @@ -7506,6 +7654,9 @@ "poetry-core", "setuptools" ], + "language-formatters-pre-commit-hooks": [ + "setuptools" + ], "lark": [ "setuptools" ], @@ -7613,6 +7764,9 @@ "libasyncns": [ "setuptools" ], + "libclang": [ + "setuptools" + ], "libcloud": [ "setuptools" ], @@ -7793,6 +7947,9 @@ "lmdb": [ "setuptools" ], + "lmfit": [ + "setuptools" + ], "lml": [ "setuptools" ], @@ -7901,6 +8058,9 @@ "luhn": [ "setuptools" ], + "lunarcalendar": [ + "setuptools" + ], "lupa": [ "cython", "setuptools" @@ -7993,15 +8153,15 @@ "malduck": [ "setuptools" ], + "manage-fastapi": [ + "poetry" + ], "managesieve": [ "setuptools" ], "manhole": [ "setuptools" ], - "manage-fastapi": [ - "poetry" - ], "manimpango": [ "cython", "setuptools" @@ -8287,6 +8447,9 @@ "migen": [ "setuptools" ], + "migra": [ + "poetry-core" + ], "mike": [ "setuptools" ], @@ -8353,6 +8516,9 @@ "mitogen": [ "setuptools" ], + "mixer": [ + "setuptools" + ], "mizani": [ "setuptools" ], @@ -8400,6 +8566,10 @@ "setuptools" ], "mkdocs-material-extensions": [ + { + "buildSystem": "hatchling", + "from": "1.1" + }, "setuptools" ], "mkdocs-minify": [ @@ -8638,9 +8808,15 @@ "multi-key-dict": [ "setuptools" ], + "multiaddr": [ + "setuptools" + ], "multidict": [ "setuptools" ], + "multihash": [ + "setuptools" + ], "multimethod": [ "setuptools" ], @@ -8720,6 +8896,9 @@ "mypy": [ "setuptools" ], + "mypy-boto3-batch": [ + "setuptools" + ], "mypy-boto3-builder": [ "poetry-core", "setuptools" @@ -8730,9 +8909,36 @@ "mypy-boto3-cognito-idp": [ "setuptools" ], + "mypy-boto3-dynamodb": [ + "setuptools" + ], + "mypy-boto3-events": [ + "setuptools" + ], + "mypy-boto3-lambda": [ + "setuptools" + ], "mypy-boto3-s3": [ "setuptools" ], + "mypy-boto3-s3control": [ + "setuptools" + ], + "mypy-boto3-sns": [ + "setuptools" + ], + "mypy-boto3-sqs": [ + "setuptools" + ], + "mypy-boto3-ssm": [ + "setuptools" + ], + "mypy-boto3-stepfunctions": [ + "setuptools" + ], + "mypy-boto3-sts": [ + "setuptools" + ], "mypy-extensions": [ "setuptools" ], @@ -8834,7 +9040,11 @@ "setuptools" ], "nbclient": [ - "setuptools" + "setuptools", + { + "buildSystem": "hatchling", + "from": "0.7.1" + } ], "nbconflux": [ "setuptools" @@ -8999,6 +9209,9 @@ "nibabel": [ "setuptools" ], + "nicegui": [ + "poetry-core" + ], "niko-home-control": [ "setuptools" ], @@ -9116,7 +9329,14 @@ ], "notebook-shim": [ "jupyter-packaging", - "setuptools" + { + "buildSystem": "setuptools", + "until": "0.2.0" + }, + { + "buildSystem": "hatchling", + "from": "0.2.0" + } ], "notedown": [ "setuptools" @@ -9362,6 +9582,9 @@ "openapi-core": [ "setuptools" ], + "openapi-python-client": [ + "poetry-core" + ], "openapi-schema-validator": [ "poetry-core", "setuptools" @@ -9672,7 +9895,8 @@ "setuptools" ], "packaging": [ - "setuptools" + "setuptools", + "flit-core" ], "packbits": [ "setuptools" @@ -10301,6 +10525,9 @@ "plyvel": [ "setuptools" ], + "pmdarima": [ + "setuptools" + ], "pmsensor": [ "setuptools" ], @@ -11153,10 +11380,10 @@ "pydenticon": [ "setuptools" ], - "pydeps": [ + "pydeprecate": [ "setuptools" ], - "pydeprecate": [ + "pydeps": [ "setuptools" ], "pydes": [ @@ -11198,6 +11425,9 @@ "pydot": [ "setuptools" ], + "pydpkg": [ + "poetry" + ], "pydrive2": [ "setuptools" ], @@ -11873,7 +12103,8 @@ "setuptools" ], "pymssql": [ - "cython" + "cython", + "setuptools" ], "pymsteams": [ "setuptools" @@ -12251,6 +12482,9 @@ "pyramid-multiauth": [ "setuptools" ], + "pyramid-openapi3": [ + "poetry" + ], "pyreadability": [ "setuptools" ], @@ -12603,6 +12837,9 @@ "pyssim": [ "setuptools" ], + "pystac": [ + "setuptools" + ], "pystache": [ "setuptools" ], @@ -12764,6 +13001,9 @@ "setuptools", "setuptools-scm" ], + "pytest-docker": [ + "setuptools" + ], "pytest-doctestplus": [ "setuptools", "setuptools-scm" @@ -13285,6 +13525,9 @@ "python-mnist": [ "setuptools" ], + "python-monkey-business": [ + "setuptools" + ], "python-mpv-jsonipc": [ "setuptools" ], @@ -13469,6 +13712,9 @@ "python-uinput": [ "setuptools" ], + "python-ulid": [ + "setuptools" + ], "python-unshare": [ "setuptools" ], @@ -13566,6 +13812,9 @@ "pytomorrowio": [ "setuptools" ], + "pytoolconfig": [ + "pdm-pep517" + ], "pytools": [ "setuptools" ], @@ -14009,7 +14258,9 @@ "setuptools" ], "rapidfuzz": [ - "setuptools" + "setuptools", + "packaging", + "scikit-build" ], "rapidfuzz-capi": [ "setuptools" @@ -14675,6 +14926,9 @@ "schema-salad": [ "setuptools" ], + "schemainspect": [ + "setuptools" + ], "schiene": [ "setuptools" ], @@ -14701,7 +14955,8 @@ "setuptools-scm" ], "scikit-image": [ - "cython" + "cython", + "setuptools" ], "scikit-learn": [ "cython", @@ -14976,6 +15231,9 @@ "shamir-mnemonic": [ "setuptools" ], + "shap": [ + "setuptools" + ], "shapely": [ "cython", "setuptools" @@ -14989,6 +15247,9 @@ "sharkiqpy": [ "setuptools" ], + "shellcheck-py": [ + "setuptools" + ], "shellescape": [ "setuptools" ], @@ -15199,6 +15460,9 @@ "slugid": [ "setuptools" ], + "slumber": [ + "setuptools" + ], "sly": [ "setuptools" ], @@ -15640,6 +15904,9 @@ "sqlalchemy-utils": [ "setuptools" ], + "sqlbag": [ + "setuptools" + ], "sqlglot": [ "setuptools" ], @@ -15718,7 +15985,8 @@ "setuptools" ], "starlette": [ - "setuptools" + "setuptools", + "hatchling" ], "starline": [ "setuptools" @@ -15740,6 +16008,9 @@ "statsd": [ "setuptools" ], + "statsforecast": [ + "setuptools" + ], "statsmodels": [ "cython", "setuptools" @@ -15802,6 +16073,9 @@ "streamlabswater": [ "setuptools" ], + "streamlink": [ + "setuptools" + ], "streamz": [ "setuptools" ], @@ -15828,7 +16102,10 @@ ], "structlog": [ "flitBuildHook", - "setuptools" + "setuptools", + "hatchling", + "hatch-fancy-pypi-readme", + "hatch-vcs" ], "structlog-sentry": [ "poetry-core" @@ -16037,6 +16314,9 @@ "taxi": [ "setuptools" ], + "tbats": [ + "setuptools" + ], "tblib": [ "setuptools" ], @@ -16503,6 +16783,9 @@ "tornado": [ "setuptools" ], + "tornado-utils": [ + "setuptools" + ], "torpy": [ "setuptools" ], @@ -16617,6 +16900,9 @@ "trimesh": [ "setuptools" ], + "trino": [ + "setuptools" + ], "trio": [ "setuptools" ], @@ -16626,6 +16912,13 @@ "trio-websocket": [ "setuptools" ], + "troposphere": [ + "setuptools" + ], + "trove-classifiers": [ + "setuptools", + "calver" + ], "trueskill": [ "setuptools" ], @@ -16663,6 +16956,9 @@ "flitBuildHook", "setuptools" ], + "tusker": [ + "poetry" + ], "tuya-iot-py-sdk": [ "setuptools" ], @@ -16777,9 +17073,33 @@ "flit-core", "setuptools" ], + "types-aioboto3": [ + "setuptools" + ], + "types-aiobotocore": [ + "setuptools" + ], + "types-aiobotocore-cloudformation": [ + "setuptools" + ], + "types-aiobotocore-ec2": [ + "setuptools" + ], + "types-aiobotocore-elbv2": [ + "setuptools" + ], + "types-aiobotocore-resourcegroupstaggingapi": [ + "setuptools" + ], + "types-aiobotocore-ssm": [ + "setuptools" + ], "types-awscrt": [ "poetry-core" ], + "types-cachetools": [ + "setuptools" + ], "types-colorama": [ "setuptools" ], @@ -16813,9 +17133,18 @@ "types-jsonschema": [ "setuptools" ], + "types-markdown": [ + "setuptools" + ], + "types-pkg-resources": [ + "setuptools" + ], "types-protobuf": [ "setuptools" ], + "types-python-dateutil": [ + "setuptools" + ], "types-pytz": [ "setuptools" ], @@ -16834,6 +17163,9 @@ "types-setuptools": [ "setuptools" ], + "types-six": [ + "setuptools" + ], "types-tabulate": [ "setuptools" ], @@ -17948,6 +18280,9 @@ "yubico-client": [ "setuptools" ], + "yubikey-manager": [ + "poetry-core" + ], "yutto": [ "poetry-core", "setuptools" diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index 90533ef84978..36a66d091aeb 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -59,9 +59,6 @@ let in lib.composeManyExtensions [ - # normalize all the names - (self: super: poetryLib.normalizePackageSet super) - # NixOps (self: super: lib.mapAttrs (_: v: addBuildSystem { inherit self; drv = v; attr = "poetry"; }) (lib.filterAttrs (n: _: lib.strings.hasPrefix "nixops" n) super) @@ -203,6 +200,7 @@ lib.composeManyExtensions [ let getCargoHash = version: { "4.0.0" = "sha256-HvfRLyUhlXVuvxWrtSDKx3rMKJbjvuiMcDY6g+pYFS0="; + "4.0.1" = "sha256-lDWX69YENZFMu7pyBmavUZaalGvFqbHSHfkwkzmDQaY="; }.${version} or ( lib.warn "Unknown bcrypt version: '${version}'. Please update getCargoHash." lib.fakeHash ); @@ -309,6 +307,18 @@ lib.composeManyExtensions [ ) ); + cmdstanpy = super.cmdstanpy.overridePythonAttrs ( + old: { + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.cmdstan ]; + patchPhase = '' + substituteInPlace cmdstanpy/model.py \ + --replace 'cmd = [make]' \ + 'cmd = ["${pkgs.cmdstan}/bin/stan"]' + ''; + CMDSTAN = "${pkgs.cmdstan}"; + } + ); + contourpy = super.contourpy.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ self.pybind11 ]; @@ -370,6 +380,8 @@ lib.composeManyExtensions [ "37.0.2" = "sha256-qvrxvneoBXjP96AnUPyrtfmCnZo+IriHR5HbtWQ5Gk8="; "37.0.4" = "sha256-f8r6QclTwkgK20CNe9i65ZOqvSUeDc4Emv6BFBhh1hI"; "38.0.1" = "sha256-o8l13fnfEUvUdDasq3LxSPArozRHKVsZfQg9DNR6M6Q="; + "38.0.3" = "sha256-lzHLW1N4hZj+nn08NZiPVM/X+SEcIsuZDjEOy0OOkSc="; + "38.0.4" = "sha256-BN0kOblUwgHj5QBf52RY2Jx0nBn03lwoN1O5PEohbwY="; }.${version} or ( lib.warn "Unknown cryptography version: '${version}'. Please update getCargoHash." lib.fakeHash ); @@ -378,14 +390,14 @@ lib.composeManyExtensions [ scrypto = if isWheel then ( - super.cryptography.override { preferWheel = true; } + super.cryptography.overridePythonAttrs { preferWheel = true; } ) else super.cryptography; in scrypto.overridePythonAttrs ( old: { nativeBuildInputs = (old.nativeBuildInputs or [ ]) - ++ lib.optional (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] + ++ lib.optionals (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] ++ lib.optional (!self.isPyPy) pyBuildPackages.cffi ++ lib.optional (lib.versionAtLeast old.version "3.5" && !isWheel) (with pkgs.rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]); @@ -420,6 +432,10 @@ lib.composeManyExtensions [ ''; }); + darts = super.darts.override { + preferWheel = true; + }; + datadog-lambda = super.datadog-lambda.overridePythonAttrs (old: { postPatch = '' substituteInPlace setup.py --replace "setuptools==" "setuptools>=" @@ -620,6 +636,7 @@ lib.composeManyExtensions [ fiona = super.fiona.overridePythonAttrs ( old: { + format = "setuptools"; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.gdal ]; nativeBuildInputs = [ pkgs.gdal # for gdal-config @@ -1061,9 +1078,9 @@ lib.composeManyExtensions [ buildInputs = old.buildInputs or [ ] ++ [ pkgs.which - ] ++ lib.optional enableGhostscript [ + ] ++ lib.optionals enableGhostscript [ pkgs.ghostscript - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; @@ -1080,7 +1097,7 @@ lib.composeManyExtensions [ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config - ] ++ lib.optional (lib.versionAtLeast super.matplotlib.version "3.5.0") [ + ] ++ lib.optionals (lib.versionAtLeast super.matplotlib.version "3.5.0") [ self.setuptools-scm self.setuptools-scm-git-archive ]; @@ -1201,7 +1218,9 @@ lib.composeManyExtensions [ buildInputs = (old.buildInputs or [ ]) ++ [ self.types-typed-ast self.types-setuptools - ]; + ] + ++ lib.optional (lib.strings.versionAtLeast old.version "0.990") self.types-psutil + ; # Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled # version is also the default in the wheels on Pypi that include binaries. # is64bit: unfortunately the build would exhaust all possible memory on i686-linux. @@ -1303,18 +1322,55 @@ lib.composeManyExtensions [ ); open3d = super.open3d.overridePythonAttrs (old: { + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.ipywidgets ]; buildInputs = (old.buildInputs or [ ]) ++ [ - pkgs.udev pkgs.libusb1 + ] ++ lib.optionals stdenv.isLinux [ + pkgs.udev + ] ++ lib.optionals (lib.versionAtLeast super.open3d.version "0.16.0") [ + pkgs.mesa + ( + pkgs.symlinkJoin { + name = "llvm-with-ubuntu-compatible-symlink"; + paths = [ + pkgs.llvm_10.lib + (pkgs.runCommand "llvm-ubuntu-compatible-symlink" { } + '' + mkdir -p "$out/lib/"; + ln -s "${pkgs.llvm_10.lib}/lib/libLLVM-10.so" "$out/lib/libLLVM-10.so.1" + '' + ) + ]; + }) ]; + + # Patch the dylib in the binary distribution to point to the nix build of libomp + preFixup = lib.optionalString (stdenv.isDarwin && lib.versionAtLeast super.open3d.version "0.16.0") '' + install_name_tool -change /opt/homebrew/opt/libomp/lib/libomp.dylib ${pkgs.llvmPackages.openmp}/lib/libomp.dylib $out/lib/python*/site-packages/open3d/cpu/pybind.cpython-*-darwin.so + ''; + # TODO(Sem Mulder): Add overridable flags for CUDA/PyTorch/Tensorflow support. autoPatchelfIgnoreMissingDeps = true; }); + # Overrides for building packages based on OpenCV + # These flags are inspired by the opencv 4.x package in nixpkgs _opencv-python-override = old: { + # Disable OpenCL on macOS + # Can't use cmakeFlags because cmake is called by setup.py + CMAKE_ARGS = lib.optionalString stdenv.isDarwin "-DWITH_OPENCL=OFF"; + nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs; - buildInputs = [ self.scikit-build ] ++ (old.buildInputs or [ ]); + buildInputs = [ + self.scikit-build + ] ++ lib.optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ + AVFoundation + Cocoa + CoreMedia + MediaToolbox + VideoDecodeAcceleration + ]) ++ (old.buildInputs or [ ]); dontUseCmakeConfigure = true; }; @@ -1322,13 +1378,7 @@ lib.composeManyExtensions [ opencv-python-headless = super.opencv-python.overridePythonAttrs self._opencv-python-override; - opencv-contrib-python = super.opencv-contrib-python.overridePythonAttrs ( - old: { - nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs; - buildInputs = [ self.scikit-build ] ++ (old.buildInputs or [ ]); - dontUseCmakeConfigure = true; - } - ); + opencv-contrib-python = super.opencv-contrib-python.overridePythonAttrs self._opencv-python-override; openexr = super.openexr.overridePythonAttrs ( old: { @@ -1357,6 +1407,8 @@ lib.composeManyExtensions [ "3.7.2" = "sha256-2U37IhftNYjH7sV7Nh51YpR/WjmPmmzX/aGuHsFgwf4="; "3.7.9" = "sha256-QHzAhjHgm4XLxY2zUdnIsd/WWMI7dJLQQAvTXC+2asQ="; "3.8.0" = "sha256-8k0DetamwLqkdcg8V/D2J5ja6IJSLi50CE+ZjFa7Hdc="; + "3.8.1" = "sha256-QXguyDxQHW9Fd3Nhmi5JzSxZQuk3HGPhhh/RGuOTZNY="; + "3.8.3" = "sha256-oSZO4cN1sJKd0T7pYrKG63is8AZMKaLRZqj5UCVY/14="; }.${version} or ( lib.warn "Unknown orjson version: '${version}'. Please update getCargoHash." lib.fakeHash ); @@ -1508,6 +1560,12 @@ lib.composeManyExtensions [ propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; }); + prophet = super.prophet.overridePythonAttrs (old: { + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.cmdstan self.cmdstanpy ]; + PROPHET_REPACKAGE_CMDSTAN = "false"; + CMDSTAN = "${pkgs.cmdstan}"; + }); + psycopg2 = super.psycopg2.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) @@ -1611,7 +1669,6 @@ lib.composeManyExtensions [ propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.cairo - pkgs.xlibsWrapper ]; mesonFlags = [ "-Dpython=${if self.isPy3k then "python3" else "python"}" ]; @@ -1727,11 +1784,18 @@ lib.composeManyExtensions [ pymssql = super.pymssql.overridePythonAttrs (old: { buildInputs = (old.buildInputs or [ ]) - ++ [ pkgs.openssl ]; + ++ [ pkgs.openssl pkgs.libkrb5 ]; propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.freetds ]; }); + pyopencl = super.pyopencl.overridePythonAttrs ( + old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.numpy ]; + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.ocl-icd pkgs.opencl-headers ]; + } + ); + pyopenssl = super.pyopenssl.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ]; @@ -1754,6 +1818,34 @@ lib.composeManyExtensions [ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.swig ]; }); + pyscard = super.pyscard.overridePythonAttrs (old: + # see https://github.com/NixOS/nixpkgs/blob/93568862a610dc1469dc40b15c1096a9357698ac/pkgs/development/python-modules/pyscard/default.nix + let + inherit (pkgs) PCSC pcsclite; + withApplePCSC = stdenv.isDarwin; + in + { + postPatch = + if withApplePCSC then '' + substituteInPlace smartcard/scard/winscarddll.c \ + --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \ + "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" + '' else '' + substituteInPlace smartcard/scard/winscarddll.c \ + --replace "libpcsclite.so.1" \ + "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" + ''; + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ ( + if withApplePCSC then [ PCSC ] else [ pcsclite ] + ); + NIX_CFLAGS_COMPILE = lib.optionalString (! withApplePCSC) + "-I ${lib.getDev pcsclite}/include/PCSC"; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ + pkgs.swig + ]; + } + ); + pytaglib = super.pytaglib.overridePythonAttrs (old: { buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.taglib ]; }); @@ -1782,6 +1874,16 @@ lib.composeManyExtensions [ } ); + pytorch-lightning = super.pytorch-lightning.override { + unpackPhase = '' + # $src remains a gzipped tarball otherwise. + mkdir -p tmp + tar xvf $src --directory=tmp + mv tmp/pytorch-lightning*/* . + rm -rf tmp + ''; + }; + pyqt5 = let qt5 = selectQt5 super.pyqt5.version; @@ -2030,8 +2132,8 @@ lib.composeManyExtensions [ if old.format != "wheel" then { nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gfortran ] ++ - lib.optional (lib.versionAtLeast super.scipy.version "1.7.0") [ self.pythran ] ++ - lib.optional (lib.versionAtLeast super.scipy.version "1.9.0") [ self.meson-python pkg-config ]; + lib.optionals (lib.versionAtLeast super.scipy.version "1.7.0") [ self.pythran ] ++ + lib.optionals (lib.versionAtLeast super.scipy.version "1.9.0") [ self.meson-python pkg-config ]; propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.pybind11 ]; setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; enableParallelBuilding = true; @@ -2181,6 +2283,12 @@ lib.composeManyExtensions [ } ); + tensorflow-macos = super.tensorflow-macos.overridePythonAttrs ( + old: { + postInstall = self.tensorflow.postInstall; + } + ); + tensorpack = super.tensorpack.overridePythonAttrs ( old: { postPatch = '' @@ -2311,6 +2419,8 @@ lib.composeManyExtensions [ let # Watchfiles does not include Cargo.lock in tarball released on PyPi for versions up to 0.17.0 getRepoHash = version: { + "0.18.1" = "sha256-XEhu6M1hFi3/gAKZcei7KJSrIhhlZhlvZvbfyA6VLR4="; + "0.18.0" = "sha256-biGGn0YAUbSO1hCJ4kU0ZWlqlXl/HRrBS3iIA3myRI8="; "0.17.0" = "1swpf265h9qq30cx55iy6jjirba3wml16wzb68k527ynrxr7hvqx"; "0.16.1" = "1ss6gzcr6js2d2sddgz1p52gyiwpqmgrxm8r6wim7gnm4wvhav8a"; "0.15.0" = "14k3avrj7v794kk4mk2xggn40a4s0zg8iq8wmyyyrf7va6hz29hf"; @@ -2330,6 +2440,13 @@ lib.composeManyExtensions [ rev = "v${old.version}"; inherit sha256; }; + patchPhase = builtins.concatStringsSep "\n" [ + (old.patchPhase or "") + '' + substituteInPlace "Cargo.lock" --replace 'version = "0.0.0"' 'version = "${old.version}"' + substituteInPlace "Cargo.toml" --replace 'version = "0.0.0"' 'version = "${old.version}"' + '' + ]; cargoDeps = pkgs.rustPlatform.importCargoLock { lockFile = "${src.out}/Cargo.lock"; }; @@ -2609,6 +2726,10 @@ lib.composeManyExtensions [ 'if True:' ''; }); + + mkdocs = super.mkdocs.overridePythonAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ self.babel ]; + }); } ) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix index 85cd8f0788f7..d175bfe01f30 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix @@ -34,8 +34,8 @@ poetry2nix.mkPoetryApplication { mkdir -p "$out/share/bash-completion/completions" "$out/bin/poetry" completions bash > "$out/share/bash-completion/completions/poetry" - mkdir -p "$out/share/zsh/vendor-completions" - "$out/bin/poetry" completions zsh > "$out/share/zsh/vendor-completions/_poetry" + mkdir -p "$out/share/zsh/site-functions" + "$out/bin/poetry" completions zsh > "$out/share/zsh/site-functions/_poetry" mkdir -p "$out/share/fish/vendor_completions.d" "$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish" ''; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock index b9c945446373..cdd646eb9fdf 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock @@ -10,10 +10,10 @@ python-versions = ">=3.5" dev = ["cloudpickle", "coverage[toml] (>=5.0.2)", "furo", "hypothesis", "mypy (>=0.900,!=0.940)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "sphinx", "sphinx-notfound-page", "zope.interface"] docs = ["furo", "sphinx", "sphinx-notfound-page", "zope.interface"] tests = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "zope.interface"] -tests_no_zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins"] +tests-no-zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins"] [[package]] -name = "backports.cached-property" +name = "backports-cached-property" version = "1.0.2" description = "cached_property() - computed once per instance, cached as attribute" category = "main" @@ -21,7 +21,7 @@ optional = false python-versions = ">=3.6.0" [[package]] -name = "CacheControl" +name = "cachecontrol" version = "0.12.11" description = "httplib2 caching for requests" category = "main" @@ -41,7 +41,7 @@ redis = ["redis (>=2.10.5)"] name = "cachy" version = "0.3.0" description = "Cachy provides a simple yet effective caching library." -category = "main" +category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" @@ -52,7 +52,7 @@ redis = ["redis (>=3.3.6,<4.0.0)"] [[package]] name = "certifi" -version = "2022.9.24" +version = "2022.12.7" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false @@ -86,27 +86,27 @@ optional = false python-versions = ">=3.6.0" [package.extras] -unicode_backport = ["unicodedata2"] +unicode-backport = ["unicodedata2"] [[package]] name = "cleo" -version = "1.0.0a5" +version = "2.0.1" description = "Cleo allows you to create beautiful and testable command-line interfaces." category = "main" optional = false python-versions = ">=3.7,<4.0" [package.dependencies] -crashtest = ">=0.3.1,<0.4.0" -pylev = ">=1.3.0,<2.0.0" +crashtest = ">=0.4.1,<0.5.0" +rapidfuzz = ">=2.2.0,<3.0.0" [[package]] name = "colorama" -version = "0.4.5" +version = "0.4.6" description = "Cross-platform colored terminal text." category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" [[package]] name = "coverage" @@ -124,15 +124,15 @@ toml = ["tomli"] [[package]] name = "crashtest" -version = "0.3.1" +version = "0.4.1" description = "Manage Python errors with ease" category = "main" optional = false -python-versions = ">=3.6,<4.0" +python-versions = ">=3.7,<4.0" [[package]] name = "cryptography" -version = "38.0.1" +version = "38.0.4" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." category = "main" optional = false @@ -173,7 +173,7 @@ python-versions = "*" [[package]] name = "dulwich" -version = "0.20.46" +version = "0.20.50" description = "Python Git Library" category = "main" optional = false @@ -188,6 +188,17 @@ https = ["urllib3 (>=1.24.1)"] paramiko = ["paramiko"] pgp = ["gpg"] +[[package]] +name = "exceptiongroup" +version = "1.0.4" +description = "Backport of PEP 654 (exception groups)" +category = "dev" +optional = false +python-versions = ">=3.7" + +[package.extras] +test = ["pytest (>=6)"] + [[package]] name = "execnet" version = "1.9.0" @@ -201,15 +212,15 @@ testing = ["pre-commit"] [[package]] name = "filelock" -version = "3.8.0" +version = "3.8.2" description = "A platform independent file lock." category = "main" optional = false python-versions = ">=3.7" [package.extras] -docs = ["furo (>=2022.6.21)", "sphinx (>=5.1.1)", "sphinx-autodoc-typehints (>=1.19.1)"] -testing = ["covdefaults (>=2.2)", "coverage (>=6.4.2)", "pytest (>=7.1.2)", "pytest-cov (>=3)", "pytest-timeout (>=2.1)"] +docs = ["furo (>=2022.9.29)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"] +testing = ["covdefaults (>=2.2.2)", "coverage (>=6.5)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-timeout (>=2.1)"] [[package]] name = "flatdict" @@ -247,7 +258,7 @@ python-versions = ">=3" [[package]] name = "identify" -version = "2.5.6" +version = "2.5.9" description = "File identification library for Python" category = "dev" optional = false @@ -283,7 +294,7 @@ testing = ["flake8 (<5)", "flufl.flake8", "importlib-resources (>=1.3)", "packag [[package]] name = "importlib-resources" -version = "5.10.0" +version = "5.10.1" description = "Read resources from Python packages" category = "main" optional = false @@ -305,7 +316,7 @@ optional = false python-versions = "*" [[package]] -name = "jaraco.classes" +name = "jaraco-classes" version = "3.2.3" description = "Utility functions for Python class constructs" category = "main" @@ -333,7 +344,7 @@ trio = ["async_generator", "trio"] [[package]] name = "jsonschema" -version = "4.16.0" +version = "4.17.3" description = "An implementation of JSON Schema validation for Python" category = "main" optional = false @@ -353,21 +364,21 @@ format-nongpl = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339- [[package]] name = "keyring" -version = "23.9.3" +version = "23.11.0" description = "Store and access your passwords safely." category = "main" optional = false python-versions = ">=3.7" [package.dependencies] -importlib-metadata = {version = ">=3.6", markers = "python_version < \"3.10\""} +importlib-metadata = {version = ">=4.11.4", markers = "python_version < \"3.12\""} "jaraco.classes" = "*" jeepney = {version = ">=0.4.2", markers = "sys_platform == \"linux\""} pywin32-ctypes = {version = "<0.1.0 || >0.1.0,<0.1.1 || >0.1.1", markers = "sys_platform == \"win32\""} SecretStorage = {version = ">=3.2", markers = "sys_platform == \"linux\""} [package.extras] -docs = ["jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx"] +docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)"] testing = ["flake8 (<5)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] [[package]] @@ -380,11 +391,11 @@ python-versions = "*" [[package]] name = "more-itertools" -version = "8.14.0" +version = "9.0.0" description = "More routines for operating on iterables, beyond itertools" category = "main" optional = false -python-versions = ">=3.5" +python-versions = ">=3.7" [[package]] name = "msgpack" @@ -396,7 +407,7 @@ python-versions = "*" [[package]] name = "mypy" -version = "0.982" +version = "0.991" description = "Optional static typing for Python" category = "dev" optional = false @@ -410,6 +421,7 @@ typing-extensions = ">=3.10" [package.extras] dmypy = ["psutil (>=4.0)"] +install-types = ["pip"] python2 = ["typed-ast (>=1.4.0,<2)"] reports = ["lxml"] @@ -445,14 +457,11 @@ dev = ["black", "mypy", "pytest"] [[package]] name = "packaging" -version = "21.3" +version = "22.0" description = "Core utilities for Python packages" category = "main" optional = false -python-versions = ">=3.6" - -[package.dependencies] -pyparsing = ">=2.0.2,<3.0.5 || >3.0.5" +python-versions = ">=3.7" [[package]] name = "pexpect" @@ -467,17 +476,17 @@ ptyprocess = ">=0.5" [[package]] name = "pkginfo" -version = "1.8.3" +version = "1.9.2" description = "Query metadatdata from sdists / bdists / installed packages." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.6" [package.extras] -testing = ["coverage", "nose"] +testing = ["pytest", "pytest-cov"] [[package]] -name = "pkgutil_resolve_name" +name = "pkgutil-resolve-name" version = "1.3.10" description = "Resolve a name to an object." category = "main" @@ -486,15 +495,15 @@ python-versions = ">=3.6" [[package]] name = "platformdirs" -version = "2.5.2" -description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." +version = "2.6.0" +description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." category = "main" optional = false python-versions = ">=3.7" [package.extras] -docs = ["furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx (>=4)", "sphinx-autodoc-typehints (>=1.12)"] -test = ["appdirs (==1.4.4)", "pytest (>=6)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)"] +docs = ["furo (>=2022.9.29)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.4)"] +test = ["appdirs (==1.4.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"] [[package]] name = "pluggy" @@ -513,7 +522,7 @@ testing = ["pytest", "pytest-benchmark"] [[package]] name = "poetry-core" -version = "1.3.2" +version = "1.4.0" description = "Poetry PEP 517 Build Backend" category = "main" optional = false @@ -524,15 +533,15 @@ importlib-metadata = {version = ">=1.7.0", markers = "python_version < \"3.8\""} [[package]] name = "poetry-plugin-export" -version = "1.1.2" +version = "1.2.0" description = "Poetry plugin to export the dependencies to various formats" category = "main" optional = false python-versions = ">=3.7,<4.0" [package.dependencies] -poetry = ">=1.2.0,<2.0.0" -poetry-core = ">=1.1.0,<2.0.0" +poetry = ">=1.2.2,<2.0.0" +poetry-core = ">=1.3.0,<2.0.0" [[package]] name = "pre-commit" @@ -553,7 +562,7 @@ virtualenv = ">=20.0.8" [[package]] name = "psutil" -version = "5.9.2" +version = "5.9.4" description = "Cross-platform lib for process and system monitoring in Python." category = "dev" optional = false @@ -586,28 +595,9 @@ category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -[[package]] -name = "pylev" -version = "1.4.0" -description = "A pure Python Levenshtein implementation that's not freaking GPL'd." -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "pyparsing" -version = "3.0.9" -description = "pyparsing module - Classes and methods to define and execute parsing grammars" -category = "main" -optional = false -python-versions = ">=3.6.8" - -[package.extras] -diagrams = ["jinja2", "railroad-diagrams"] - [[package]] name = "pyrsistent" -version = "0.18.1" +version = "0.19.2" description = "Persistent/Functional/Immutable data structures" category = "main" optional = false @@ -615,7 +605,7 @@ python-versions = ">=3.7" [[package]] name = "pytest" -version = "7.1.3" +version = "7.2.0" description = "pytest: simple powerful testing with Python" category = "dev" optional = false @@ -624,12 +614,12 @@ python-versions = ">=3.7" [package.dependencies] attrs = ">=19.2.0" colorama = {version = "*", markers = "sys_platform == \"win32\""} +exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} iniconfig = "*" packaging = "*" pluggy = ">=0.12,<2.0" -py = ">=1.8.2" -tomli = ">=1.0.0" +tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""} [package.extras] testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "xmlschema"] @@ -726,13 +716,24 @@ optional = false python-versions = "*" [[package]] -name = "PyYAML" +name = "pyyaml" version = "6.0" description = "YAML parser and emitter for Python" category = "dev" optional = false python-versions = ">=3.6" +[[package]] +name = "rapidfuzz" +version = "2.13.4" +description = "rapid fuzzy string matching" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.extras] +full = ["numpy"] + [[package]] name = "requests" version = "2.28.1" @@ -749,21 +750,21 @@ urllib3 = ">=1.21.1,<1.27" [package.extras] socks = ["PySocks (>=1.5.6,!=1.5.7)"] -use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"] +use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] [[package]] name = "requests-toolbelt" -version = "0.9.1" +version = "0.10.1" description = "A utility belt for advanced users of python-requests" category = "main" optional = false -python-versions = "*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [package.dependencies] requests = ">=2.0.1,<3.0.0" [[package]] -name = "SecretStorage" +name = "secretstorage" version = "3.3.3" description = "Python bindings to FreeDesktop.org Secret Service API" category = "main" @@ -776,7 +777,7 @@ jeepney = ">=0.6" [[package]] name = "setuptools" -version = "65.4.1" +version = "65.6.3" description = "Easily download, build, install, upgrade, and uninstall Python packages" category = "dev" optional = false @@ -784,7 +785,7 @@ python-versions = ">=3.7" [package.extras] docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"] -testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "mock", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] +testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"] [[package]] @@ -815,40 +816,25 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" name = "tomli" version = "2.0.1" description = "A lil' TOML parser" -category = "dev" +category = "main" optional = false python-versions = ">=3.7" [[package]] name = "tomlkit" -version = "0.11.5" +version = "0.11.6" description = "Style preserving TOML library" category = "main" optional = false -python-versions = ">=3.6,<4.0" +python-versions = ">=3.6" [[package]] -name = "tox" -version = "3.26.0" -description = "tox is a generic virtualenv management and test command line tool" -category = "dev" +name = "trove-classifiers" +version = "2022.12.1" +description = "Canonical source for classifiers on PyPI (pypi.org)." +category = "main" optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" - -[package.dependencies] -colorama = {version = ">=0.4.1", markers = "platform_system == \"Windows\""} -filelock = ">=3.0.0" -importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} -packaging = ">=14" -pluggy = ">=0.12.0" -py = ">=1.4.17" -six = ">=1.14.0" -tomli = {version = ">=2.0.1", markers = "python_version >= \"3.7\" and python_version < \"3.11\""} -virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,<20.0.3 || >20.0.3,<20.0.4 || >20.0.4,<20.0.5 || >20.0.5,<20.0.6 || >20.0.6,<20.0.7 || >20.0.7" - -[package.extras] -docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"] -testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pathlib2 (>=2.3.3)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)"] +python-versions = "*" [[package]] name = "typed-ast" @@ -860,7 +846,7 @@ python-versions = ">=3.6" [[package]] name = "types-html5lib" -version = "1.1.11" +version = "1.1.11.10" description = "Typing stubs for html5lib" category = "dev" optional = false @@ -868,7 +854,7 @@ python-versions = "*" [[package]] name = "types-jsonschema" -version = "4.16.1" +version = "4.17.0.2" description = "Typing stubs for jsonschema" category = "dev" optional = false @@ -876,7 +862,7 @@ python-versions = "*" [[package]] name = "types-requests" -version = "2.28.11.2" +version = "2.28.11.5" description = "Typing stubs for requests" category = "dev" optional = false @@ -887,7 +873,7 @@ types-urllib3 = "<1.27" [[package]] name = "types-urllib3" -version = "1.26.25" +version = "1.26.25.4" description = "Typing stubs for urllib3" category = "dev" optional = false @@ -903,11 +889,11 @@ python-versions = ">=3.7" [[package]] name = "urllib3" -version = "1.26.12" +version = "1.26.13" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [package.extras] brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"] @@ -925,13 +911,30 @@ python-versions = ">=3.6" [package.dependencies] distlib = ">=0.3.5,<1" filelock = ">=3.4.1,<4" -importlib-metadata = {version = ">=4.8.3", markers = "python_version < \"3.8\""} platformdirs = ">=2.4,<3" [package.extras] docs = ["proselint (>=0.13)", "sphinx (>=5.1.1)", "sphinx-argparse (>=0.3.1)", "sphinx-rtd-theme (>=1)", "towncrier (>=21.9)"] testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=21.3)", "pytest (>=7.0.1)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.6.1)", "pytest-randomly (>=3.10.3)", "pytest-timeout (>=2.1)"] +[[package]] +name = "virtualenv" +version = "20.17.1" +description = "Virtual Python Environment builder" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +distlib = ">=0.3.6,<1" +filelock = ">=3.4.1,<4" +importlib-metadata = {version = ">=4.8.3", markers = "python_version < \"3.8\""} +platformdirs = ">=2.4,<3" + +[package.extras] +docs = ["proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-argparse (>=0.3.2)", "sphinx-rtd-theme (>=1)", "towncrier (>=22.8)"] +testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=21.3)", "pytest (>=7.0.1)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.6.1)", "pytest-randomly (>=3.10.3)", "pytest-timeout (>=2.1)"] + [[package]] name = "webencodings" version = "0.5.1" @@ -942,7 +945,7 @@ python-versions = "*" [[package]] name = "xattr" -version = "0.9.9" +version = "0.10.1" description = "Python wrapper for extended filesystem attributes" category = "main" optional = false @@ -953,7 +956,7 @@ cffi = ">=1.0" [[package]] name = "zipp" -version = "3.9.0" +version = "3.11.0" description = "Backport of pathlib-compatible object wrapper for zip files" category = "main" optional = false @@ -966,18 +969,18 @@ testing = ["flake8 (<5)", "func-timeout", "jaraco.functools", "jaraco.itertools" [metadata] lock-version = "1.1" python-versions = "^3.7" -content-hash = "575823805204f4c6f50f64bd729029fdb9111fb5c1326a6ddef9a1b7f8aea5d0" +content-hash = "c1c21f02e493ffbfd622bec8546c83edad08325b957851dd3f9a287867ce24a4" [metadata.files] attrs = [ {file = "attrs-22.1.0-py2.py3-none-any.whl", hash = "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"}, {file = "attrs-22.1.0.tar.gz", hash = "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6"}, ] -"backports.cached-property" = [ +backports-cached-property = [ {file = "backports.cached-property-1.0.2.tar.gz", hash = "sha256:9306f9eed6ec55fd156ace6bc1094e2c86fae5fb2bf07b6a9c00745c656e75dd"}, {file = "backports.cached_property-1.0.2-py3-none-any.whl", hash = "sha256:baeb28e1cd619a3c9ab8941431fe34e8490861fb998c6c4590693d50171db0cc"}, ] -CacheControl = [ +cachecontrol = [ {file = "CacheControl-0.12.11-py2.py3-none-any.whl", hash = "sha256:2c75d6a8938cb1933c75c50184549ad42728a27e9f6b92fd677c3151aa72555b"}, {file = "CacheControl-0.12.11.tar.gz", hash = "sha256:a5b9fcc986b184db101aa280b42ecdcdfc524892596f606858e0b7a8b4d9e144"}, ] @@ -986,8 +989,8 @@ cachy = [ {file = "cachy-0.3.0.tar.gz", hash = "sha256:186581f4ceb42a0bbe040c407da73c14092379b1e4c0e327fdb72ae4a9b269b1"}, ] certifi = [ - {file = "certifi-2022.9.24-py3-none-any.whl", hash = "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"}, - {file = "certifi-2022.9.24.tar.gz", hash = "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14"}, + {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"}, + {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"}, ] cffi = [ {file = "cffi-1.15.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2"}, @@ -1064,12 +1067,12 @@ charset-normalizer = [ {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"}, ] cleo = [ - {file = "cleo-1.0.0a5-py3-none-any.whl", hash = "sha256:ff53056589300976e960f75afb792dfbfc9c78dcbb5a448e207a17b643826360"}, - {file = "cleo-1.0.0a5.tar.gz", hash = "sha256:097c9d0e0332fd53cc89fc11eb0a6ba0309e6a3933c08f7b38558555486925d3"}, + {file = "cleo-2.0.1-py3-none-any.whl", hash = "sha256:6eb133670a3ed1f3b052d53789017b6e50fca66d1287e6e6696285f4cb8ea448"}, + {file = "cleo-2.0.1.tar.gz", hash = "sha256:eb4b2e1f3063c11085cebe489a6e9124163c226575a3c3be69b2e51af4a15ec5"}, ] colorama = [ - {file = "colorama-0.4.5-py2.py3-none-any.whl", hash = "sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da"}, - {file = "colorama-0.4.5.tar.gz", hash = "sha256:e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4"}, + {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, + {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, ] coverage = [ {file = "coverage-6.5.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ef8674b0ee8cc11e2d574e3e2998aea5df5ab242e012286824ea3c6970580e53"}, @@ -1124,36 +1127,36 @@ coverage = [ {file = "coverage-6.5.0.tar.gz", hash = "sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84"}, ] crashtest = [ - {file = "crashtest-0.3.1-py3-none-any.whl", hash = "sha256:300f4b0825f57688b47b6d70c6a31de33512eb2fa1ac614f780939aa0cf91680"}, - {file = "crashtest-0.3.1.tar.gz", hash = "sha256:42ca7b6ce88b6c7433e2ce47ea884e91ec93104a4b754998be498a8e6c3d37dd"}, + {file = "crashtest-0.4.1-py3-none-any.whl", hash = "sha256:8d23eac5fa660409f57472e3851dab7ac18aba459a8d19cbbba86d3d5aecd2a5"}, + {file = "crashtest-0.4.1.tar.gz", hash = "sha256:80d7b1f316ebfbd429f648076d6275c877ba30ba48979de4191714a75266f0ce"}, ] cryptography = [ - {file = "cryptography-38.0.1-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:10d1f29d6292fc95acb597bacefd5b9e812099d75a6469004fd38ba5471a977f"}, - {file = "cryptography-38.0.1-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:3fc26e22840b77326a764ceb5f02ca2d342305fba08f002a8c1f139540cdfaad"}, - {file = "cryptography-38.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:3b72c360427889b40f36dc214630e688c2fe03e16c162ef0aa41da7ab1455153"}, - {file = "cryptography-38.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:194044c6b89a2f9f169df475cc167f6157eb9151cc69af8a2a163481d45cc407"}, - {file = "cryptography-38.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca9f6784ea96b55ff41708b92c3f6aeaebde4c560308e5fbbd3173fbc466e94e"}, - {file = "cryptography-38.0.1-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:16fa61e7481f4b77ef53991075de29fc5bacb582a1244046d2e8b4bb72ef66d0"}, - {file = "cryptography-38.0.1-cp36-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:d4ef6cc305394ed669d4d9eebf10d3a101059bdcf2669c366ec1d14e4fb227bd"}, - {file = "cryptography-38.0.1-cp36-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:3261725c0ef84e7592597606f6583385fed2a5ec3909f43bc475ade9729a41d6"}, - {file = "cryptography-38.0.1-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:0297ffc478bdd237f5ca3a7dc96fc0d315670bfa099c04dc3a4a2172008a405a"}, - {file = "cryptography-38.0.1-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:89ed49784ba88c221756ff4d4755dbc03b3c8d2c5103f6d6b4f83a0fb1e85294"}, - {file = "cryptography-38.0.1-cp36-abi3-win32.whl", hash = "sha256:ac7e48f7e7261207d750fa7e55eac2d45f720027d5703cd9007e9b37bbb59ac0"}, - {file = "cryptography-38.0.1-cp36-abi3-win_amd64.whl", hash = "sha256:ad7353f6ddf285aeadfaf79e5a6829110106ff8189391704c1d8801aa0bae45a"}, - {file = "cryptography-38.0.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:896dd3a66959d3a5ddcfc140a53391f69ff1e8f25d93f0e2e7830c6de90ceb9d"}, - {file = "cryptography-38.0.1-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:d3971e2749a723e9084dd507584e2a2761f78ad2c638aa31e80bc7a15c9db4f9"}, - {file = "cryptography-38.0.1-pp37-pypy37_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:79473cf8a5cbc471979bd9378c9f425384980fcf2ab6534b18ed7d0d9843987d"}, - {file = "cryptography-38.0.1-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:d9e69ae01f99abe6ad646947bba8941e896cb3aa805be2597a0400e0764b5818"}, - {file = "cryptography-38.0.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5067ee7f2bce36b11d0e334abcd1ccf8c541fc0bbdaf57cdd511fdee53e879b6"}, - {file = "cryptography-38.0.1-pp38-pypy38_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:3e3a2599e640927089f932295a9a247fc40a5bdf69b0484532f530471a382750"}, - {file = "cryptography-38.0.1-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:c2e5856248a416767322c8668ef1845ad46ee62629266f84a8f007a317141013"}, - {file = "cryptography-38.0.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:64760ba5331e3f1794d0bcaabc0d0c39e8c60bf67d09c93dc0e54189dfd7cfe5"}, - {file = "cryptography-38.0.1-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:b6c9b706316d7b5a137c35e14f4103e2115b088c412140fdbd5f87c73284df61"}, - {file = "cryptography-38.0.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b0163a849b6f315bf52815e238bc2b2346604413fa7c1601eea84bcddb5fb9ac"}, - {file = "cryptography-38.0.1-pp39-pypy39_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:d1a5bd52d684e49a36582193e0b89ff267704cd4025abefb9e26803adeb3e5fb"}, - {file = "cryptography-38.0.1-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:765fa194a0f3372d83005ab83ab35d7c5526c4e22951e46059b8ac678b44fa5a"}, - {file = "cryptography-38.0.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:52e7bee800ec869b4031093875279f1ff2ed12c1e2f74923e8f49c916afd1d3b"}, - {file = "cryptography-38.0.1.tar.gz", hash = "sha256:1db3d807a14931fa317f96435695d9ec386be7b84b618cc61cfa5d08b0ae33d7"}, + {file = "cryptography-38.0.4-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:2fa36a7b2cc0998a3a4d5af26ccb6273f3df133d61da2ba13b3286261e7efb70"}, + {file = "cryptography-38.0.4-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:1f13ddda26a04c06eb57119caf27a524ccae20533729f4b1e4a69b54e07035eb"}, + {file = "cryptography-38.0.4-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:2ec2a8714dd005949d4019195d72abed84198d877112abb5a27740e217e0ea8d"}, + {file = "cryptography-38.0.4-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50a1494ed0c3f5b4d07650a68cd6ca62efe8b596ce743a5c94403e6f11bf06c1"}, + {file = "cryptography-38.0.4-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a10498349d4c8eab7357a8f9aa3463791292845b79597ad1b98a543686fb1ec8"}, + {file = "cryptography-38.0.4-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:10652dd7282de17990b88679cb82f832752c4e8237f0c714be518044269415db"}, + {file = "cryptography-38.0.4-cp36-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:bfe6472507986613dc6cc00b3d492b2f7564b02b3b3682d25ca7f40fa3fd321b"}, + {file = "cryptography-38.0.4-cp36-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:ce127dd0a6a0811c251a6cddd014d292728484e530d80e872ad9806cfb1c5b3c"}, + {file = "cryptography-38.0.4-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:53049f3379ef05182864d13bb9686657659407148f901f3f1eee57a733fb4b00"}, + {file = "cryptography-38.0.4-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:8a4b2bdb68a447fadebfd7d24855758fe2d6fecc7fed0b78d190b1af39a8e3b0"}, + {file = "cryptography-38.0.4-cp36-abi3-win32.whl", hash = "sha256:1d7e632804a248103b60b16fb145e8df0bc60eed790ece0d12efe8cd3f3e7744"}, + {file = "cryptography-38.0.4-cp36-abi3-win_amd64.whl", hash = "sha256:8e45653fb97eb2f20b8c96f9cd2b3a0654d742b47d638cf2897afbd97f80fa6d"}, + {file = "cryptography-38.0.4-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca57eb3ddaccd1112c18fc80abe41db443cc2e9dcb1917078e02dfa010a4f353"}, + {file = "cryptography-38.0.4-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:c9e0d79ee4c56d841bd4ac6e7697c8ff3c8d6da67379057f29e66acffcd1e9a7"}, + {file = "cryptography-38.0.4-pp37-pypy37_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:0e70da4bdff7601b0ef48e6348339e490ebfb0cbe638e083c9c41fb49f00c8bd"}, + {file = "cryptography-38.0.4-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:998cd19189d8a747b226d24c0207fdaa1e6658a1d3f2494541cb9dfbf7dcb6d2"}, + {file = "cryptography-38.0.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:67461b5ebca2e4c2ab991733f8ab637a7265bb582f07c7c88914b5afb88cb95b"}, + {file = "cryptography-38.0.4-pp38-pypy38_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:4eb85075437f0b1fd8cd66c688469a0c4119e0ba855e3fef86691971b887caf6"}, + {file = "cryptography-38.0.4-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:3178d46f363d4549b9a76264f41c6948752183b3f587666aff0555ac50fd7876"}, + {file = "cryptography-38.0.4-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:6391e59ebe7c62d9902c24a4d8bcbc79a68e7c4ab65863536127c8a9cd94043b"}, + {file = "cryptography-38.0.4-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:78e47e28ddc4ace41dd38c42e6feecfdadf9c3be2af389abbfeef1ff06822285"}, + {file = "cryptography-38.0.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2fb481682873035600b5502f0015b664abc26466153fab5c6bc92c1ea69d478b"}, + {file = "cryptography-38.0.4-pp39-pypy39_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:4367da5705922cf7070462e964f66e4ac24162e22ab0a2e9d31f1b270dd78083"}, + {file = "cryptography-38.0.4-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:b4cad0cea995af760f82820ab4ca54e5471fc782f70a007f31531957f43e9dee"}, + {file = "cryptography-38.0.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:80ca53981ceeb3241998443c4964a387771588c4e4a5d92735a493af868294f9"}, + {file = "cryptography-38.0.4.tar.gz", hash = "sha256:175c1a818b87c9ac80bb7377f5520b7f31b3ef2a0004e2420319beadedb67290"}, ] deepdiff = [ {file = "deepdiff-5.8.1-py3-none-any.whl", hash = "sha256:e9aea49733f34fab9a0897038d8f26f9d94a97db1790f1b814cced89e9e0d2b7"}, @@ -1164,45 +1167,81 @@ distlib = [ {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"}, ] dulwich = [ - {file = "dulwich-0.20.46-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:6676196e9cf377cde62aa2f5d741e93207437343e0c62368bd0d784c322a3c49"}, - {file = "dulwich-0.20.46-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0a1ca555a3eafe7388d6cb81bb08f34608a1592500f0bd4c26734c91d208a546"}, - {file = "dulwich-0.20.46-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:769442c9657b10fc35ac625beeaf440540c9288c96fcfaba3e58adf745c5cafd"}, - {file = "dulwich-0.20.46-cp310-cp310-win32.whl", hash = "sha256:de22a54f68c6c4e97f9b924abd46da4618536d7934b9849066be9fc5cd31205d"}, - {file = "dulwich-0.20.46-cp310-cp310-win_amd64.whl", hash = "sha256:42fa5a68908556eb6c40f231a67caf6a4660588aad707a9d6b334fa1d8f04bf7"}, - {file = "dulwich-0.20.46-cp311-cp311-macosx_10_15_x86_64.whl", hash = "sha256:3e16376031466848e44aabf3489fafb054482143744b21167dbd168731041c74"}, - {file = "dulwich-0.20.46-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:153c7512587384a290c60fef330f1ab397a59559e19e8b02a0169ff21b4c69fb"}, - {file = "dulwich-0.20.46-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a5b68bd815cd2769c75e5a78708eb0440612df19b370a977aa9e01a056baa9ed"}, - {file = "dulwich-0.20.46-cp311-cp311-win32.whl", hash = "sha256:b1339bca70764eb8e780d80c72e7c1cb4651201dc9e43ec5d616bf51eb3bb3a6"}, - {file = "dulwich-0.20.46-cp311-cp311-win_amd64.whl", hash = "sha256:1162fdafb2abdfe66649617061f3853cb26384fade1f6884f6fe6e9c570a7552"}, - {file = "dulwich-0.20.46-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:6826512f778eaa47e2e8c0a46cdc555958f9f5286771490b8642b4b508ea5d25"}, - {file = "dulwich-0.20.46-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:100d39bc18196a07c521fd5f60f78f397493303daa0b8690216864bbc621cd5d"}, - {file = "dulwich-0.20.46-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c4cd2cd7baa81246bdc8c5272d4e9224e2255da7a0618a220aab5e07b9888e9b"}, - {file = "dulwich-0.20.46-cp36-cp36m-win32.whl", hash = "sha256:6eed5a3194d64112605fc0f638f4fa91771495e8674fa3e6d6b33bf150d297d5"}, - {file = "dulwich-0.20.46-cp36-cp36m-win_amd64.whl", hash = "sha256:9ca4d73987f5b0e2e843497876f9bb39a47384a2e50597a85542285f5c890293"}, - {file = "dulwich-0.20.46-cp37-cp37m-macosx_10_15_x86_64.whl", hash = "sha256:b9f49de83911eed7adbe83136229837ef9d102e42dbe6aacb1a18be45c997ace"}, - {file = "dulwich-0.20.46-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d38be7d3a78d608ecab3348f7920d6b9002e7972dd245206dc8075cfdb91621d"}, - {file = "dulwich-0.20.46-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f4b7a7feb966a4669c254b18385fe0b3c639f3b1f5ddef0d9e083364cc762847"}, - {file = "dulwich-0.20.46-cp37-cp37m-win32.whl", hash = "sha256:f9552ac246bceab1c5cdd1ec3cfe9446fe76b9853eaf59d3244df03eb27fd3fe"}, - {file = "dulwich-0.20.46-cp37-cp37m-win_amd64.whl", hash = "sha256:90a075aeb0fdbad7e18b9db3af161e3d635e2b7697b7a4b467e6844a13b0b210"}, - {file = "dulwich-0.20.46-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:8d6fee82cedb2362942d9ef94061901f7e07d7d8674e4c7b6fceeef7822ae275"}, - {file = "dulwich-0.20.46-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:669c6b3d82996518a7fec4604771bd285e23f0860f41f565fef5987265d431d9"}, - {file = "dulwich-0.20.46-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd3eac228117487a959ac8f49ea2787eac34acc69999fe7adae70b23e3c3571c"}, - {file = "dulwich-0.20.46-cp38-cp38-win32.whl", hash = "sha256:92024f572d32680e021219f77015c8b443c38022e502b7f51ad7cf51a6285a36"}, - {file = "dulwich-0.20.46-cp38-cp38-win_amd64.whl", hash = "sha256:d928de1eba0326a2a8a52ed94c9bf7c315ff4db606a1aa3ae688d39574f93267"}, - {file = "dulwich-0.20.46-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:a5d1b7a3a7d84a5dedbb90092e00097357106b9642ac08a96c2ae89ccd8afd9a"}, - {file = "dulwich-0.20.46-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b739d759c10e2af7c964dcc97fd4e5dc49e8567d080eed8906fc422c79b7fdcf"}, - {file = "dulwich-0.20.46-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9fc7a4f633f5468453d5dd84a753cd99d4433f0397437229a0a8b10347935591"}, - {file = "dulwich-0.20.46-cp39-cp39-win32.whl", hash = "sha256:525115c4d1fbf60a5fe98f340b4ca597ba47b2c75d9c5ec750dd0e9115ef8ec6"}, - {file = "dulwich-0.20.46-cp39-cp39-win_amd64.whl", hash = "sha256:73e2585a9fcf1f8cdad8597a0c384c0b365b2e8346463130c96d9ea1478587ae"}, - {file = "dulwich-0.20.46.tar.gz", hash = "sha256:4f0e88ffff5db1523d93d92f1525fe5fa161318ffbaad502c1b9b3be7a067172"}, + {file = "dulwich-0.20.50-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:97f02f8d500d4af08dc022d697c56e8539171acc3f575c2fe9acf3b078e5c8c9"}, + {file = "dulwich-0.20.50-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7301773e5cc16d521bc6490e73772a86a4d1d0263de506f08b54678cc4e2f061"}, + {file = "dulwich-0.20.50-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:b70106580ed11f45f4c32d2831d0c9c9f359bc2415fff4a6be443e3a36811398"}, + {file = "dulwich-0.20.50-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f9c4f2455f966cad94648278fa9972e4695b35d04f82792fa58e1ea15dd83f0"}, + {file = "dulwich-0.20.50-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9163fbb021a8ad9c35a0814a5eedf45a8eb3a0b764b865d7016d901fc5a947fc"}, + {file = "dulwich-0.20.50-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:322ff8ff6aa4d6d36294cd36de1c84767eb1903c7db3e7b4475ad091febf5363"}, + {file = "dulwich-0.20.50-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:5d3290a45651c8e534f8e83ae2e30322aefdd162f0f338bae2e79a6ee5a87513"}, + {file = "dulwich-0.20.50-cp310-cp310-win32.whl", hash = "sha256:80ab07131a6e68594441f5c4767e9e44e87fceafc3e347e541c928a18c679bd8"}, + {file = "dulwich-0.20.50-cp310-cp310-win_amd64.whl", hash = "sha256:eefe786a6010f8546baac4912113eeed4e397ddb8c433a345b548a04d4176496"}, + {file = "dulwich-0.20.50-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:df3562dde3079d57287c233d45b790bc967c5aae975c9a7b07ca30e60e055512"}, + {file = "dulwich-0.20.50-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e1ae18d5805f0c0c5dac65795f8d48660437166b12ee2c0ffea95bfdbf9c1051"}, + {file = "dulwich-0.20.50-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d2f7df39bd1378d3b0bfb3e7fc930fd0191924af1f0ef587bcd9946afe076c06"}, + {file = "dulwich-0.20.50-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:731e7f319b34251fadeb362ada1d52cc932369d9cdfa25c0e41150cda28773d0"}, + {file = "dulwich-0.20.50-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b4d11d44176e5d2fa8271fc86ad1e0a8731b9ad8f77df64c12846b30e16135eb"}, + {file = "dulwich-0.20.50-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7aaabb8e4beadd53f75f853a981caaadef3ef130e5645c902705704eaf136daa"}, + {file = "dulwich-0.20.50-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:c3dc9f97ec8d3db08d9723b9fd06f3e52c15b84c800d153cfb59b0a3dc8b8d40"}, + {file = "dulwich-0.20.50-cp311-cp311-win32.whl", hash = "sha256:3b1964fa80cafd5a1fd71615b0313daf6f3295c6ab05656ea0c1d2423539904a"}, + {file = "dulwich-0.20.50-cp311-cp311-win_amd64.whl", hash = "sha256:a24a3893108f3b97beb958670d5f3f2a3bec73a1fe18637a572a85abd949a1c4"}, + {file = "dulwich-0.20.50-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6d409a282f8848fd6c8d7c7545ad2f75c16de5d5977de202642f1d50fdaac554"}, + {file = "dulwich-0.20.50-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5411d0f1092152e1c0bb916ae490fe181953ae1b8d13f4e68661253e10b78dbb"}, + {file = "dulwich-0.20.50-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6343569f998ce429e2a5d813c56768ac51b496522401db950f0aa44240bfa901"}, + {file = "dulwich-0.20.50-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:a405cd236766060894411614a272cfb86fe86cde5ca73ef264fc4fa5a715fff4"}, + {file = "dulwich-0.20.50-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:ee0f9b02019c0ea84cdd31c00a0c283669b771c85612997a911715cf84e33d99"}, + {file = "dulwich-0.20.50-cp36-cp36m-win32.whl", hash = "sha256:2644466270267270f2157ea6f1c0aa224f6f3bf06a307fc39954e6b4b3d82bae"}, + {file = "dulwich-0.20.50-cp36-cp36m-win_amd64.whl", hash = "sha256:d4629635a97e3af1b5da48071e00c8e70fad85f3266fadabe1f5a8f49172c507"}, + {file = "dulwich-0.20.50-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0e4862f318d99cc8a500e3622a89613a88c07d957a0f628cdc2ed86addff790f"}, + {file = "dulwich-0.20.50-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c96e3fb9d48c0454dc242c7accc7819780c9a7f29e441a9eff12361ed0fa35f9"}, + {file = "dulwich-0.20.50-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8cc6092a4f0bbbff2e553e87a9c6325955b64ea43fca21297c8182e19ae8a43c"}, + {file = "dulwich-0.20.50-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:519b627d49d273e2fd01c79d09e578675ca6cd05193c1787e9ef165c9a1d66ea"}, + {file = "dulwich-0.20.50-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:6a75cab01b909c4c683c2083e060e378bc01701b7366b5a7d9846ef6d3b9e3d5"}, + {file = "dulwich-0.20.50-cp37-cp37m-win32.whl", hash = "sha256:ea8ffe26d91dbcd5580dbd5a07270a12ea57b091604d77184da0a0d9fad50ed3"}, + {file = "dulwich-0.20.50-cp37-cp37m-win_amd64.whl", hash = "sha256:8f3af857f94021cae1322d86925bfc0dd31e501e885ab5db275473bfac0bb39d"}, + {file = "dulwich-0.20.50-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:3fb35cedb1243bc420d885ef5b4afd642c6ac8f07ddfc7fdbca1becf9948bf7e"}, + {file = "dulwich-0.20.50-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4bb23a9cec63e16c0e432335f068169b73dd44fa9318dd7cd7a4ca83607ff367"}, + {file = "dulwich-0.20.50-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:5267619b34ddaf8d9a6b841492cd17a971fd25bf9a5657f2de928385c3a08b94"}, + {file = "dulwich-0.20.50-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9091f1d53a3c0747cbf0bd127c64e7f09b770264d8fb53e284383fcdf69154e7"}, + {file = "dulwich-0.20.50-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a6ec7c8fea2b44187a3b545e6c11ab9947ffb122647b07abcdb7cc3aaa770c0e"}, + {file = "dulwich-0.20.50-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:11b180b80363b4fc70664197028181a17ae4c52df9965a29b62a6c52e40c2dbe"}, + {file = "dulwich-0.20.50-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c83e7840d9d0a94d7033bc109efe0c22dfcdcd816bcd4469085e42809e3bf5ba"}, + {file = "dulwich-0.20.50-cp38-cp38-win32.whl", hash = "sha256:c075f69c2de19d9fd97e3b70832d2b42c6a4a5d909b3ffd1963b67d86029f95f"}, + {file = "dulwich-0.20.50-cp38-cp38-win_amd64.whl", hash = "sha256:06775c5713cfeda778c7c67d4422b5e7554d3a7f644f1dde646cdf486a30285a"}, + {file = "dulwich-0.20.50-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:49f66f1c057c18d7d60363f461f4ab8329320fbe1f02a7a33c255864a7d3c942"}, + {file = "dulwich-0.20.50-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4e541cd690a5e3d55082ed51732d755917e933cddeb4b0204f2a5ec5d5d7b60b"}, + {file = "dulwich-0.20.50-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:80e8750ee2fa0ab2784a095956077758e5f6107de27f637c4b9d18406652c22c"}, + {file = "dulwich-0.20.50-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fbb6368f18451dc44c95c55e1a609d1a01d3821f7ed480b22b2aea1baca0f4a7"}, + {file = "dulwich-0.20.50-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3ee45001411b638641819b7b3b33f31f13467c84066e432256580fcab7d8815"}, + {file = "dulwich-0.20.50-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4842e22ed863a776b36ef8ffe9ed7b772eb452b42c8d02975c29d27e3bc50ab4"}, + {file = "dulwich-0.20.50-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:790e4a641284a7fb4d56ebdaf8b324a5826fbbb9c54307c06f586f9f6a5e56db"}, + {file = "dulwich-0.20.50-cp39-cp39-win32.whl", hash = "sha256:f08406b6b789dea5c95ba1130a0801d8748a67f18be940fe7486a8b481fde875"}, + {file = "dulwich-0.20.50-cp39-cp39-win_amd64.whl", hash = "sha256:78c388ad421199000fb7b5ed5f0c7b509b3e31bd7cad303786a4d0bf89b82f60"}, + {file = "dulwich-0.20.50-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:cb194c53109131bcbcd1ca430fcd437cdaf2d33e204e45fbe121c47eaa43e9af"}, + {file = "dulwich-0.20.50-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c7542a72c5640dd0620862d6df8688f02a6c336359b5af9b3fcfe11b7fa6652f"}, + {file = "dulwich-0.20.50-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4aa1d0861517ebbbe0e0084cc9ab4f7ab720624a3eda2bd10e45f774ab858db8"}, + {file = "dulwich-0.20.50-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:583c6bbc27f13fe2e41a19f6987a42681c6e4f6959beae0a6e5bb033b8b081a8"}, + {file = "dulwich-0.20.50-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:0c61c193d02c0e1e0d758cdd57ae76685c368d09a01f00d704ba88bd96767cfe"}, + {file = "dulwich-0.20.50-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c2edbff3053251985f10702adfafbee118298d383ef5b5b432a5f22d1f1915df"}, + {file = "dulwich-0.20.50-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a344230cadfc5d315752add6ce9d4cfcfc6c85e36bbf57fce9444bcc7c6ea8fb"}, + {file = "dulwich-0.20.50-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:57bff9bde0b6b05b00c6acbb1a94357caddb2908ed7026a48c715ff50d220335"}, + {file = "dulwich-0.20.50-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:e29a3c2037761fa816aa556e78364dfc8e3f44b873db2d17aed96f9b06ac83a3"}, + {file = "dulwich-0.20.50-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2aa2a4a84029625bf9c63771f8a628db1f3be2d2ea3cb8b17942cd4317797152"}, + {file = "dulwich-0.20.50-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd9fa00971ecf059bb358085a942ecac5be4ff71acdf299f44c8cbc45c18659f"}, + {file = "dulwich-0.20.50-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:af4adac92fb95671ea3a24f2f8e5e5e8f638711ce9c33a3ca6cd68bf1ff7d99f"}, + {file = "dulwich-0.20.50.tar.gz", hash = "sha256:50a941796b2c675be39be728d540c16b5b7ce77eb9e1b3f855650ece6832d2be"}, +] +exceptiongroup = [ + {file = "exceptiongroup-1.0.4-py3-none-any.whl", hash = "sha256:542adf9dea4055530d6e1279602fa5cb11dab2395fa650b8674eaec35fc4a828"}, + {file = "exceptiongroup-1.0.4.tar.gz", hash = "sha256:bd14967b79cd9bdb54d97323216f8fdf533e278df937aa2a90089e7d6e06e5ec"}, ] execnet = [ {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"}, {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"}, ] filelock = [ - {file = "filelock-3.8.0-py3-none-any.whl", hash = "sha256:617eb4e5eedc82fc5f47b6d61e4d11cb837c56cb4544e39081099fa17ad109d4"}, - {file = "filelock-3.8.0.tar.gz", hash = "sha256:55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc"}, + {file = "filelock-3.8.2-py3-none-any.whl", hash = "sha256:8df285554452285f79c035efb0c861eb33a4bcfa5b7a137016e32e6a90f9792c"}, + {file = "filelock-3.8.2.tar.gz", hash = "sha256:7565f628ea56bfcd8e54e42bdc55da899c85c1abfe1b5bcfd147e9188cebb3b2"}, ] flatdict = [ {file = "flatdict-4.0.1.tar.gz", hash = "sha256:cd32f08fd31ed21eb09ebc76f06b6bd12046a24f77beb1fd0281917e47f26742"}, @@ -1215,8 +1254,8 @@ httpretty = [ {file = "httpretty-1.1.4.tar.gz", hash = "sha256:20de0e5dd5a18292d36d928cc3d6e52f8b2ac73daec40d41eb62dee154933b68"}, ] identify = [ - {file = "identify-2.5.6-py2.py3-none-any.whl", hash = "sha256:b276db7ec52d7e89f5bc4653380e33054ddc803d25875952ad90b0f012cbcdaa"}, - {file = "identify-2.5.6.tar.gz", hash = "sha256:6c32dbd747aa4ceee1df33f25fed0b0f6e0d65721b15bd151307ff7056d50245"}, + {file = "identify-2.5.9-py2.py3-none-any.whl", hash = "sha256:a390fb696e164dbddb047a0db26e57972ae52fbd037ae68797e5ae2f4492485d"}, + {file = "identify-2.5.9.tar.gz", hash = "sha256:906036344ca769539610436e40a684e170c3648b552194980bb7b617a8daeb9f"}, ] idna = [ {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"}, @@ -1227,14 +1266,14 @@ importlib-metadata = [ {file = "importlib_metadata-4.13.0.tar.gz", hash = "sha256:dd0173e8f150d6815e098fd354f6414b0f079af4644ddfe90c71e2fc6174346d"}, ] importlib-resources = [ - {file = "importlib_resources-5.10.0-py3-none-any.whl", hash = "sha256:ee17ec648f85480d523596ce49eae8ead87d5631ae1551f913c0100b5edd3437"}, - {file = "importlib_resources-5.10.0.tar.gz", hash = "sha256:c01b1b94210d9849f286b86bb51bcea7cd56dde0600d8db721d7b81330711668"}, + {file = "importlib_resources-5.10.1-py3-none-any.whl", hash = "sha256:c09b067d82e72c66f4f8eb12332f5efbebc9b007c0b6c40818108c9870adc363"}, + {file = "importlib_resources-5.10.1.tar.gz", hash = "sha256:32bb095bda29741f6ef0e5278c42df98d135391bee5f932841efc0041f748dc3"}, ] iniconfig = [ {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"}, ] -"jaraco.classes" = [ +jaraco-classes = [ {file = "jaraco.classes-3.2.3-py3-none-any.whl", hash = "sha256:2353de3288bc6b82120752201c6b1c1a14b058267fa424ed5ce5984e3b922158"}, {file = "jaraco.classes-3.2.3.tar.gz", hash = "sha256:89559fa5c1d3c34eff6f631ad80bb21f378dbcbb35dd161fd2c6b93f5be2f98a"}, ] @@ -1243,20 +1282,20 @@ jeepney = [ {file = "jeepney-0.8.0.tar.gz", hash = "sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806"}, ] jsonschema = [ - {file = "jsonschema-4.16.0-py3-none-any.whl", hash = "sha256:9e74b8f9738d6a946d70705dc692b74b5429cd0960d58e79ffecfc43b2221eb9"}, - {file = "jsonschema-4.16.0.tar.gz", hash = "sha256:165059f076eff6971bae5b742fc029a7b4ef3f9bcf04c14e4776a7605de14b23"}, + {file = "jsonschema-4.17.3-py3-none-any.whl", hash = "sha256:a870ad254da1a8ca84b6a2905cac29d265f805acc57af304784962a2aa6508f6"}, + {file = "jsonschema-4.17.3.tar.gz", hash = "sha256:0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d"}, ] keyring = [ - {file = "keyring-23.9.3-py3-none-any.whl", hash = "sha256:69732a15cb1433bdfbc3b980a8a36a04878a6cfd7cb99f497b573f31618001c0"}, - {file = "keyring-23.9.3.tar.gz", hash = "sha256:69b01dd83c42f590250fe7a1f503fc229b14de83857314b1933a3ddbf595c4a5"}, + {file = "keyring-23.11.0-py3-none-any.whl", hash = "sha256:3dd30011d555f1345dec2c262f0153f2f0ca6bca041fb1dc4588349bb4c0ac1e"}, + {file = "keyring-23.11.0.tar.gz", hash = "sha256:ad192263e2cdd5f12875dedc2da13534359a7e760e77f8d04b50968a821c2361"}, ] lockfile = [ {file = "lockfile-0.12.2-py2.py3-none-any.whl", hash = "sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa"}, {file = "lockfile-0.12.2.tar.gz", hash = "sha256:6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"}, ] more-itertools = [ - {file = "more-itertools-8.14.0.tar.gz", hash = "sha256:c09443cd3d5438b8dafccd867a6bc1cb0894389e90cb53d227456b0b0bccb750"}, - {file = "more_itertools-8.14.0-py3-none-any.whl", hash = "sha256:1bc4f91ee5b1b31ac7ceacc17c09befe6a40a503907baf9c839c229b5095cfd2"}, + {file = "more-itertools-9.0.0.tar.gz", hash = "sha256:5a6257e40878ef0520b1803990e3e22303a41b5714006c32a3fd8304b26ea1ab"}, + {file = "more_itertools-9.0.0-py3-none-any.whl", hash = "sha256:250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41"}, ] msgpack = [ {file = "msgpack-1.0.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:4ab251d229d10498e9a2f3b1e68ef64cb393394ec477e3370c457f9430ce9250"}, @@ -1313,30 +1352,36 @@ msgpack = [ {file = "msgpack-1.0.4.tar.gz", hash = "sha256:f5d869c18f030202eb412f08b28d2afeea553d6613aee89e200d7aca7ef01f5f"}, ] mypy = [ - {file = "mypy-0.982-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:5085e6f442003fa915aeb0a46d4da58128da69325d8213b4b35cc7054090aed5"}, - {file = "mypy-0.982-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:41fd1cf9bc0e1c19b9af13a6580ccb66c381a5ee2cf63ee5ebab747a4badeba3"}, - {file = "mypy-0.982-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:f793e3dd95e166b66d50e7b63e69e58e88643d80a3dcc3bcd81368e0478b089c"}, - {file = "mypy-0.982-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:86ebe67adf4d021b28c3f547da6aa2cce660b57f0432617af2cca932d4d378a6"}, - {file = "mypy-0.982-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:175f292f649a3af7082fe36620369ffc4661a71005aa9f8297ea473df5772046"}, - {file = "mypy-0.982-cp310-cp310-win_amd64.whl", hash = "sha256:8ee8c2472e96beb1045e9081de8e92f295b89ac10c4109afdf3a23ad6e644f3e"}, - {file = "mypy-0.982-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:58f27ebafe726a8e5ccb58d896451dd9a662a511a3188ff6a8a6a919142ecc20"}, - {file = "mypy-0.982-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d6af646bd46f10d53834a8e8983e130e47d8ab2d4b7a97363e35b24e1d588947"}, - {file = "mypy-0.982-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e7aeaa763c7ab86d5b66ff27f68493d672e44c8099af636d433a7f3fa5596d40"}, - {file = "mypy-0.982-cp37-cp37m-win_amd64.whl", hash = "sha256:724d36be56444f569c20a629d1d4ee0cb0ad666078d59bb84f8f887952511ca1"}, - {file = "mypy-0.982-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:14d53cdd4cf93765aa747a7399f0961a365bcddf7855d9cef6306fa41de01c24"}, - {file = "mypy-0.982-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:26ae64555d480ad4b32a267d10cab7aec92ff44de35a7cd95b2b7cb8e64ebe3e"}, - {file = "mypy-0.982-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:6389af3e204975d6658de4fb8ac16f58c14e1bacc6142fee86d1b5b26aa52bda"}, - {file = "mypy-0.982-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7b35ce03a289480d6544aac85fa3674f493f323d80ea7226410ed065cd46f206"}, - {file = "mypy-0.982-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c6e564f035d25c99fd2b863e13049744d96bd1947e3d3d2f16f5828864506763"}, - {file = "mypy-0.982-cp38-cp38-win_amd64.whl", hash = "sha256:cebca7fd333f90b61b3ef7f217ff75ce2e287482206ef4a8b18f32b49927b1a2"}, - {file = "mypy-0.982-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:a705a93670c8b74769496280d2fe6cd59961506c64f329bb179970ff1d24f9f8"}, - {file = "mypy-0.982-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:75838c649290d83a2b83a88288c1eb60fe7a05b36d46cbea9d22efc790002146"}, - {file = "mypy-0.982-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:91781eff1f3f2607519c8b0e8518aad8498af1419e8442d5d0afb108059881fc"}, - {file = "mypy-0.982-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eaa97b9ddd1dd9901a22a879491dbb951b5dec75c3b90032e2baa7336777363b"}, - {file = "mypy-0.982-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a692a8e7d07abe5f4b2dd32d731812a0175626a90a223d4b58f10f458747dd8a"}, - {file = "mypy-0.982-cp39-cp39-win_amd64.whl", hash = "sha256:eb7a068e503be3543c4bd329c994103874fa543c1727ba5288393c21d912d795"}, - {file = "mypy-0.982-py3-none-any.whl", hash = "sha256:1021c241e8b6e1ca5a47e4d52601274ac078a89845cfde66c6d5f769819ffa1d"}, - {file = "mypy-0.982.tar.gz", hash = "sha256:85f7a343542dc8b1ed0a888cdd34dca56462654ef23aa673907305b260b3d746"}, + {file = "mypy-0.991-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:7d17e0a9707d0772f4a7b878f04b4fd11f6f5bcb9b3813975a9b13c9332153ab"}, + {file = "mypy-0.991-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0714258640194d75677e86c786e80ccf294972cc76885d3ebbb560f11db0003d"}, + {file = "mypy-0.991-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0c8f3be99e8a8bd403caa8c03be619544bc2c77a7093685dcf308c6b109426c6"}, + {file = "mypy-0.991-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc9ec663ed6c8f15f4ae9d3c04c989b744436c16d26580eaa760ae9dd5d662eb"}, + {file = "mypy-0.991-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4307270436fd7694b41f913eb09210faff27ea4979ecbcd849e57d2da2f65305"}, + {file = "mypy-0.991-cp310-cp310-win_amd64.whl", hash = "sha256:901c2c269c616e6cb0998b33d4adbb4a6af0ac4ce5cd078afd7bc95830e62c1c"}, + {file = "mypy-0.991-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:d13674f3fb73805ba0c45eb6c0c3053d218aa1f7abead6e446d474529aafc372"}, + {file = "mypy-0.991-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1c8cd4fb70e8584ca1ed5805cbc7c017a3d1a29fb450621089ffed3e99d1857f"}, + {file = "mypy-0.991-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:209ee89fbb0deed518605edddd234af80506aec932ad28d73c08f1400ef80a33"}, + {file = "mypy-0.991-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37bd02ebf9d10e05b00d71302d2c2e6ca333e6c2a8584a98c00e038db8121f05"}, + {file = "mypy-0.991-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:26efb2fcc6b67e4d5a55561f39176821d2adf88f2745ddc72751b7890f3194ad"}, + {file = "mypy-0.991-cp311-cp311-win_amd64.whl", hash = "sha256:3a700330b567114b673cf8ee7388e949f843b356a73b5ab22dd7cff4742a5297"}, + {file = "mypy-0.991-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:1f7d1a520373e2272b10796c3ff721ea1a0712288cafaa95931e66aa15798813"}, + {file = "mypy-0.991-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:641411733b127c3e0dab94c45af15fea99e4468f99ac88b39efb1ad677da5711"}, + {file = "mypy-0.991-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:3d80e36b7d7a9259b740be6d8d906221789b0d836201af4234093cae89ced0cd"}, + {file = "mypy-0.991-cp37-cp37m-win_amd64.whl", hash = "sha256:e62ebaad93be3ad1a828a11e90f0e76f15449371ffeecca4a0a0b9adc99abcef"}, + {file = "mypy-0.991-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:b86ce2c1866a748c0f6faca5232059f881cda6dda2a893b9a8373353cfe3715a"}, + {file = "mypy-0.991-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ac6e503823143464538efda0e8e356d871557ef60ccd38f8824a4257acc18d93"}, + {file = "mypy-0.991-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0cca5adf694af539aeaa6ac633a7afe9bbd760df9d31be55ab780b77ab5ae8bf"}, + {file = "mypy-0.991-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a12c56bf73cdab116df96e4ff39610b92a348cc99a1307e1da3c3768bbb5b135"}, + {file = "mypy-0.991-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:652b651d42f155033a1967739788c436491b577b6a44e4c39fb340d0ee7f0d70"}, + {file = "mypy-0.991-cp38-cp38-win_amd64.whl", hash = "sha256:4175593dc25d9da12f7de8de873a33f9b2b8bdb4e827a7cae952e5b1a342e243"}, + {file = "mypy-0.991-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:98e781cd35c0acf33eb0295e8b9c55cdbef64fcb35f6d3aa2186f289bed6e80d"}, + {file = "mypy-0.991-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6d7464bac72a85cb3491c7e92b5b62f3dcccb8af26826257760a552a5e244aa5"}, + {file = "mypy-0.991-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c9166b3f81a10cdf9b49f2d594b21b31adadb3d5e9db9b834866c3258b695be3"}, + {file = "mypy-0.991-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8472f736a5bfb159a5e36740847808f6f5b659960115ff29c7cecec1741c648"}, + {file = "mypy-0.991-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5e80e758243b97b618cdf22004beb09e8a2de1af481382e4d84bc52152d1c476"}, + {file = "mypy-0.991-cp39-cp39-win_amd64.whl", hash = "sha256:74e259b5c19f70d35fcc1ad3d56499065c601dfe94ff67ae48b85596b9ec1461"}, + {file = "mypy-0.991-py3-none-any.whl", hash = "sha256:de32edc9b0a7e67c2775e574cb061a537660e51210fbf6006b0b36ea695ae9bb"}, + {file = "mypy-0.991.tar.gz", hash = "sha256:3c0165ba8f354a6d9881809ef29f1a9318a236a6d81c690094c5df32107bde06"}, ] mypy-extensions = [ {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, @@ -1351,74 +1396,56 @@ ordered-set = [ {file = "ordered_set-4.1.0-py3-none-any.whl", hash = "sha256:046e1132c71fcf3330438a539928932caf51ddbc582496833e23de611de14562"}, ] packaging = [ - {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"}, - {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"}, + {file = "packaging-22.0-py3-none-any.whl", hash = "sha256:957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3"}, + {file = "packaging-22.0.tar.gz", hash = "sha256:2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3"}, ] pexpect = [ {file = "pexpect-4.8.0-py2.py3-none-any.whl", hash = "sha256:0b48a55dcb3c05f3329815901ea4fc1537514d6ba867a152b581d69ae3710937"}, {file = "pexpect-4.8.0.tar.gz", hash = "sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"}, ] pkginfo = [ - {file = "pkginfo-1.8.3-py2.py3-none-any.whl", hash = "sha256:848865108ec99d4901b2f7e84058b6e7660aae8ae10164e015a6dcf5b242a594"}, - {file = "pkginfo-1.8.3.tar.gz", hash = "sha256:a84da4318dd86f870a9447a8c98340aa06216bfc6f2b7bdc4b8766984ae1867c"}, + {file = "pkginfo-1.9.2-py3-none-any.whl", hash = "sha256:d580059503f2f4549ad6e4c106d7437356dbd430e2c7df99ee1efe03d75f691e"}, + {file = "pkginfo-1.9.2.tar.gz", hash = "sha256:ac03e37e4d601aaee40f8087f63fc4a2a6c9814dda2c8fa6aab1b1829653bdfa"}, ] -pkgutil_resolve_name = [ +pkgutil-resolve-name = [ {file = "pkgutil_resolve_name-1.3.10-py3-none-any.whl", hash = "sha256:ca27cc078d25c5ad71a9de0a7a330146c4e014c2462d9af19c6b828280649c5e"}, {file = "pkgutil_resolve_name-1.3.10.tar.gz", hash = "sha256:357d6c9e6a755653cfd78893817c0853af365dd51ec97f3d358a819373bbd174"}, ] platformdirs = [ - {file = "platformdirs-2.5.2-py3-none-any.whl", hash = "sha256:027d8e83a2d7de06bbac4e5ef7e023c02b863d7ea5d079477e722bb41ab25788"}, - {file = "platformdirs-2.5.2.tar.gz", hash = "sha256:58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19"}, + {file = "platformdirs-2.6.0-py3-none-any.whl", hash = "sha256:1a89a12377800c81983db6be069ec068eee989748799b946cce2a6e80dcc54ca"}, + {file = "platformdirs-2.6.0.tar.gz", hash = "sha256:b46ffafa316e6b83b47489d240ce17173f123a9b9c83282141c3daf26ad9ac2e"}, ] pluggy = [ {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, ] poetry-core = [ - {file = "poetry-core-1.3.2.tar.gz", hash = "sha256:0ab006a40cb38d6a38b97264f6835da2f08a96912f2728ce668e9ac6a34f686f"}, - {file = "poetry_core-1.3.2-py3-none-any.whl", hash = "sha256:ea0f5a90b339cde132b4e43cff78a1b440cd928db864bb67cfc97fdfcefe7218"}, + {file = "poetry_core-1.4.0-py3-none-any.whl", hash = "sha256:5559ab80384ac021db329ef317086417e140ee1176bcfcb3a3838b544e213c8e"}, + {file = "poetry_core-1.4.0.tar.gz", hash = "sha256:514bd33c30e0bf56b0ed44ee15e120d7e47b61ad908b2b1011da68c48a84ada9"}, ] poetry-plugin-export = [ - {file = "poetry-plugin-export-1.1.2.tar.gz", hash = "sha256:5e92525dd63f38ce74a51ed68ea91d753523f21ce5f9ef8d3b793e2a4b2222ef"}, - {file = "poetry_plugin_export-1.1.2-py3-none-any.whl", hash = "sha256:946e3313b3d00c18fb9a50522e9d5e6a7e111beaba8d6ae33297662fc2070ac1"}, + {file = "poetry_plugin_export-1.2.0-py3-none-any.whl", hash = "sha256:109fb43ebfd0e79d8be2e7f9d43ba2ae357c4975a18dfc0cfdd9597dd086790e"}, + {file = "poetry_plugin_export-1.2.0.tar.gz", hash = "sha256:9a1dd42765408931d7831738749022651d43a2968b67c988db1b7a567dfe41ef"}, ] pre-commit = [ {file = "pre_commit-2.20.0-py2.py3-none-any.whl", hash = "sha256:51a5ba7c480ae8072ecdb6933df22d2f812dc897d5fe848778116129a681aac7"}, {file = "pre_commit-2.20.0.tar.gz", hash = "sha256:a978dac7bc9ec0bcee55c18a277d553b0f419d259dadb4b9418ff2d00eb43959"}, ] psutil = [ - {file = "psutil-5.9.2-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:8f024fbb26c8daf5d70287bb3edfafa22283c255287cf523c5d81721e8e5d82c"}, - {file = "psutil-5.9.2-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:b2f248ffc346f4f4f0d747ee1947963613216b06688be0be2e393986fe20dbbb"}, - {file = "psutil-5.9.2-cp27-cp27m-win32.whl", hash = "sha256:b1928b9bf478d31fdffdb57101d18f9b70ed4e9b0e41af751851813547b2a9ab"}, - {file = "psutil-5.9.2-cp27-cp27m-win_amd64.whl", hash = "sha256:404f4816c16a2fcc4eaa36d7eb49a66df2d083e829d3e39ee8759a411dbc9ecf"}, - {file = "psutil-5.9.2-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:94e621c6a4ddb2573d4d30cba074f6d1aa0186645917df42c811c473dd22b339"}, - {file = "psutil-5.9.2-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:256098b4f6ffea6441eb54ab3eb64db9ecef18f6a80d7ba91549195d55420f84"}, - {file = "psutil-5.9.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:614337922702e9be37a39954d67fdb9e855981624d8011a9927b8f2d3c9625d9"}, - {file = "psutil-5.9.2-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:39ec06dc6c934fb53df10c1672e299145ce609ff0611b569e75a88f313634969"}, - {file = "psutil-5.9.2-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e3ac2c0375ef498e74b9b4ec56df3c88be43fe56cac465627572dbfb21c4be34"}, - {file = "psutil-5.9.2-cp310-cp310-win32.whl", hash = "sha256:e4c4a7636ffc47b7141864f1c5e7d649f42c54e49da2dd3cceb1c5f5d29bfc85"}, - {file = "psutil-5.9.2-cp310-cp310-win_amd64.whl", hash = "sha256:f4cb67215c10d4657e320037109939b1c1d2fd70ca3d76301992f89fe2edb1f1"}, - {file = "psutil-5.9.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:dc9bda7d5ced744622f157cc8d8bdd51735dafcecff807e928ff26bdb0ff097d"}, - {file = "psutil-5.9.2-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d75291912b945a7351d45df682f9644540d564d62115d4a20d45fa17dc2d48f8"}, - {file = "psutil-5.9.2-cp36-cp36m-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b4018d5f9b6651f9896c7a7c2c9f4652e4eea53f10751c4e7d08a9093ab587ec"}, - {file = "psutil-5.9.2-cp36-cp36m-win32.whl", hash = "sha256:f40ba362fefc11d6bea4403f070078d60053ed422255bd838cd86a40674364c9"}, - {file = "psutil-5.9.2-cp36-cp36m-win_amd64.whl", hash = "sha256:9770c1d25aee91417eba7869139d629d6328a9422ce1cdd112bd56377ca98444"}, - {file = "psutil-5.9.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:42638876b7f5ef43cef8dcf640d3401b27a51ee3fa137cb2aa2e72e188414c32"}, - {file = "psutil-5.9.2-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:91aa0dac0c64688667b4285fa29354acfb3e834e1fd98b535b9986c883c2ce1d"}, - {file = "psutil-5.9.2-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4fb54941aac044a61db9d8eb56fc5bee207db3bc58645d657249030e15ba3727"}, - {file = "psutil-5.9.2-cp37-cp37m-win32.whl", hash = "sha256:7cbb795dcd8ed8fd238bc9e9f64ab188f3f4096d2e811b5a82da53d164b84c3f"}, - {file = "psutil-5.9.2-cp37-cp37m-win_amd64.whl", hash = "sha256:5d39e3a2d5c40efa977c9a8dd4f679763c43c6c255b1340a56489955dbca767c"}, - {file = "psutil-5.9.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:fd331866628d18223a4265371fd255774affd86244fc307ef66eaf00de0633d5"}, - {file = "psutil-5.9.2-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b315febaebae813326296872fdb4be92ad3ce10d1d742a6b0c49fb619481ed0b"}, - {file = "psutil-5.9.2-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f7929a516125f62399d6e8e026129c8835f6c5a3aab88c3fff1a05ee8feb840d"}, - {file = "psutil-5.9.2-cp38-cp38-win32.whl", hash = "sha256:561dec454853846d1dd0247b44c2e66a0a0c490f937086930ec4b8f83bf44f06"}, - {file = "psutil-5.9.2-cp38-cp38-win_amd64.whl", hash = "sha256:67b33f27fc0427483b61563a16c90d9f3b547eeb7af0ef1b9fe024cdc9b3a6ea"}, - {file = "psutil-5.9.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b3591616fa07b15050b2f87e1cdefd06a554382e72866fcc0ab2be9d116486c8"}, - {file = "psutil-5.9.2-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:14b29f581b5edab1f133563272a6011925401804d52d603c5c606936b49c8b97"}, - {file = "psutil-5.9.2-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4642fd93785a29353d6917a23e2ac6177308ef5e8be5cc17008d885cb9f70f12"}, - {file = "psutil-5.9.2-cp39-cp39-win32.whl", hash = "sha256:ed29ea0b9a372c5188cdb2ad39f937900a10fb5478dc077283bf86eeac678ef1"}, - {file = "psutil-5.9.2-cp39-cp39-win_amd64.whl", hash = "sha256:68b35cbff92d1f7103d8f1db77c977e72f49fcefae3d3d2b91c76b0e7aef48b8"}, - {file = "psutil-5.9.2.tar.gz", hash = "sha256:feb861a10b6c3bb00701063b37e4afc754f8217f0f09c42280586bd6ac712b5c"}, + {file = "psutil-5.9.4-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c1ca331af862803a42677c120aff8a814a804e09832f166f226bfd22b56feee8"}, + {file = "psutil-5.9.4-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:68908971daf802203f3d37e78d3f8831b6d1014864d7a85937941bb35f09aefe"}, + {file = "psutil-5.9.4-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:3ff89f9b835100a825b14c2808a106b6fdcc4b15483141482a12c725e7f78549"}, + {file = "psutil-5.9.4-cp27-cp27m-win32.whl", hash = "sha256:852dd5d9f8a47169fe62fd4a971aa07859476c2ba22c2254d4a1baa4e10b95ad"}, + {file = "psutil-5.9.4-cp27-cp27m-win_amd64.whl", hash = "sha256:9120cd39dca5c5e1c54b59a41d205023d436799b1c8c4d3ff71af18535728e94"}, + {file = "psutil-5.9.4-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:6b92c532979bafc2df23ddc785ed116fced1f492ad90a6830cf24f4d1ea27d24"}, + {file = "psutil-5.9.4-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:efeae04f9516907be44904cc7ce08defb6b665128992a56957abc9b61dca94b7"}, + {file = "psutil-5.9.4-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:54d5b184728298f2ca8567bf83c422b706200bcbbfafdc06718264f9393cfeb7"}, + {file = "psutil-5.9.4-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:16653106f3b59386ffe10e0bad3bb6299e169d5327d3f187614b1cb8f24cf2e1"}, + {file = "psutil-5.9.4-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:54c0d3d8e0078b7666984e11b12b88af2db11d11249a8ac8920dd5ef68a66e08"}, + {file = "psutil-5.9.4-cp36-abi3-win32.whl", hash = "sha256:149555f59a69b33f056ba1c4eb22bb7bf24332ce631c44a319cec09f876aaeff"}, + {file = "psutil-5.9.4-cp36-abi3-win_amd64.whl", hash = "sha256:fd8522436a6ada7b4aad6638662966de0d61d241cb821239b2ae7013d41a43d4"}, + {file = "psutil-5.9.4-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:6001c809253a29599bc0dfd5179d9f8a5779f9dffea1da0f13c53ee568115e1e"}, + {file = "psutil-5.9.4.tar.gz", hash = "sha256:3d7f9739eb435d4b1338944abe23f49584bde5395f27487d2ee25ad9a8774a62"}, ] ptyprocess = [ {file = "ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35"}, @@ -1432,40 +1459,33 @@ pycparser = [ {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, ] -pylev = [ - {file = "pylev-1.4.0-py2.py3-none-any.whl", hash = "sha256:7b2e2aa7b00e05bb3f7650eb506fc89f474f70493271a35c242d9a92188ad3dd"}, - {file = "pylev-1.4.0.tar.gz", hash = "sha256:9e77e941042ad3a4cc305dcdf2b2dec1aec2fbe3dd9015d2698ad02b173006d1"}, -] -pyparsing = [ - {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"}, - {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"}, -] pyrsistent = [ - {file = "pyrsistent-0.18.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:df46c854f490f81210870e509818b729db4488e1f30f2a1ce1698b2295a878d1"}, - {file = "pyrsistent-0.18.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d45866ececf4a5fff8742c25722da6d4c9e180daa7b405dc0a2a2790d668c26"}, - {file = "pyrsistent-0.18.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4ed6784ceac462a7d6fcb7e9b663e93b9a6fb373b7f43594f9ff68875788e01e"}, - {file = "pyrsistent-0.18.1-cp310-cp310-win32.whl", hash = "sha256:e4f3149fd5eb9b285d6bfb54d2e5173f6a116fe19172686797c056672689daf6"}, - {file = "pyrsistent-0.18.1-cp310-cp310-win_amd64.whl", hash = "sha256:636ce2dc235046ccd3d8c56a7ad54e99d5c1cd0ef07d9ae847306c91d11b5fec"}, - {file = "pyrsistent-0.18.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:e92a52c166426efbe0d1ec1332ee9119b6d32fc1f0bbfd55d5c1088070e7fc1b"}, - {file = "pyrsistent-0.18.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d7a096646eab884bf8bed965bad63ea327e0d0c38989fc83c5ea7b8a87037bfc"}, - {file = "pyrsistent-0.18.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cdfd2c361b8a8e5d9499b9082b501c452ade8bbf42aef97ea04854f4a3f43b22"}, - {file = "pyrsistent-0.18.1-cp37-cp37m-win32.whl", hash = "sha256:7ec335fc998faa4febe75cc5268a9eac0478b3f681602c1f27befaf2a1abe1d8"}, - {file = "pyrsistent-0.18.1-cp37-cp37m-win_amd64.whl", hash = "sha256:6455fc599df93d1f60e1c5c4fe471499f08d190d57eca040c0ea182301321286"}, - {file = "pyrsistent-0.18.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:fd8da6d0124efa2f67d86fa70c851022f87c98e205f0594e1fae044e7119a5a6"}, - {file = "pyrsistent-0.18.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7bfe2388663fd18bd8ce7db2c91c7400bf3e1a9e8bd7d63bf7e77d39051b85ec"}, - {file = "pyrsistent-0.18.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0e3e1fcc45199df76053026a51cc59ab2ea3fc7c094c6627e93b7b44cdae2c8c"}, - {file = "pyrsistent-0.18.1-cp38-cp38-win32.whl", hash = "sha256:b568f35ad53a7b07ed9b1b2bae09eb15cdd671a5ba5d2c66caee40dbf91c68ca"}, - {file = "pyrsistent-0.18.1-cp38-cp38-win_amd64.whl", hash = "sha256:d1b96547410f76078eaf66d282ddca2e4baae8964364abb4f4dcdde855cd123a"}, - {file = "pyrsistent-0.18.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:f87cc2863ef33c709e237d4b5f4502a62a00fab450c9e020892e8e2ede5847f5"}, - {file = "pyrsistent-0.18.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6bc66318fb7ee012071b2792024564973ecc80e9522842eb4e17743604b5e045"}, - {file = "pyrsistent-0.18.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:914474c9f1d93080338ace89cb2acee74f4f666fb0424896fcfb8d86058bf17c"}, - {file = "pyrsistent-0.18.1-cp39-cp39-win32.whl", hash = "sha256:1b34eedd6812bf4d33814fca1b66005805d3640ce53140ab8bbb1e2651b0d9bc"}, - {file = "pyrsistent-0.18.1-cp39-cp39-win_amd64.whl", hash = "sha256:e24a828f57e0c337c8d8bb9f6b12f09dfdf0273da25fda9e314f0b684b415a07"}, - {file = "pyrsistent-0.18.1.tar.gz", hash = "sha256:d4d61f8b993a7255ba714df3aca52700f8125289f84f704cf80916517c46eb96"}, + {file = "pyrsistent-0.19.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d6982b5a0237e1b7d876b60265564648a69b14017f3b5f908c5be2de3f9abb7a"}, + {file = "pyrsistent-0.19.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:187d5730b0507d9285a96fca9716310d572e5464cadd19f22b63a6976254d77a"}, + {file = "pyrsistent-0.19.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:055ab45d5911d7cae397dc418808d8802fb95262751872c841c170b0dbf51eed"}, + {file = "pyrsistent-0.19.2-cp310-cp310-win32.whl", hash = "sha256:456cb30ca8bff00596519f2c53e42c245c09e1a4543945703acd4312949bfd41"}, + {file = "pyrsistent-0.19.2-cp310-cp310-win_amd64.whl", hash = "sha256:b39725209e06759217d1ac5fcdb510e98670af9e37223985f330b611f62e7425"}, + {file = "pyrsistent-0.19.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2aede922a488861de0ad00c7630a6e2d57e8023e4be72d9d7147a9fcd2d30712"}, + {file = "pyrsistent-0.19.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:879b4c2f4d41585c42df4d7654ddffff1239dc4065bc88b745f0341828b83e78"}, + {file = "pyrsistent-0.19.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c43bec251bbd10e3cb58ced80609c5c1eb238da9ca78b964aea410fb820d00d6"}, + {file = "pyrsistent-0.19.2-cp37-cp37m-win32.whl", hash = "sha256:d690b18ac4b3e3cab73b0b7aa7dbe65978a172ff94970ff98d82f2031f8971c2"}, + {file = "pyrsistent-0.19.2-cp37-cp37m-win_amd64.whl", hash = "sha256:3ba4134a3ff0fc7ad225b6b457d1309f4698108fb6b35532d015dca8f5abed73"}, + {file = "pyrsistent-0.19.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:a178209e2df710e3f142cbd05313ba0c5ebed0a55d78d9945ac7a4e09d923308"}, + {file = "pyrsistent-0.19.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e371b844cec09d8dc424d940e54bba8f67a03ebea20ff7b7b0d56f526c71d584"}, + {file = "pyrsistent-0.19.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:111156137b2e71f3a9936baf27cb322e8024dac3dc54ec7fb9f0bcf3249e68bb"}, + {file = "pyrsistent-0.19.2-cp38-cp38-win32.whl", hash = "sha256:e5d8f84d81e3729c3b506657dddfe46e8ba9c330bf1858ee33108f8bb2adb38a"}, + {file = "pyrsistent-0.19.2-cp38-cp38-win_amd64.whl", hash = "sha256:9cd3e9978d12b5d99cbdc727a3022da0430ad007dacf33d0bf554b96427f33ab"}, + {file = "pyrsistent-0.19.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:f1258f4e6c42ad0b20f9cfcc3ada5bd6b83374516cd01c0960e3cb75fdca6770"}, + {file = "pyrsistent-0.19.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:21455e2b16000440e896ab99e8304617151981ed40c29e9507ef1c2e4314ee95"}, + {file = "pyrsistent-0.19.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bfd880614c6237243ff53a0539f1cb26987a6dc8ac6e66e0c5a40617296a045e"}, + {file = "pyrsistent-0.19.2-cp39-cp39-win32.whl", hash = "sha256:71d332b0320642b3261e9fee47ab9e65872c2bd90260e5d225dabeed93cbd42b"}, + {file = "pyrsistent-0.19.2-cp39-cp39-win_amd64.whl", hash = "sha256:dec3eac7549869365fe263831f576c8457f6c833937c68542d08fde73457d291"}, + {file = "pyrsistent-0.19.2-py3-none-any.whl", hash = "sha256:ea6b79a02a28550c98b6ca9c35b9f492beaa54d7c5c9e9949555893c8a9234d0"}, + {file = "pyrsistent-0.19.2.tar.gz", hash = "sha256:bfa0351be89c9fcbcb8c9879b826f4353be10f58f8a677efab0c017bf7137ec2"}, ] pytest = [ - {file = "pytest-7.1.3-py3-none-any.whl", hash = "sha256:1377bda3466d70b55e3f5cecfa55bb7cfcf219c7964629b967c37cf0bda818b7"}, - {file = "pytest-7.1.3.tar.gz", hash = "sha256:4f365fec2dff9c1162f834d9f18af1ba13062db0c708bf7b946f8a5c76180c39"}, + {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"}, + {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"}, ] pytest-cov = [ {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"}, @@ -1495,7 +1515,7 @@ pywin32-ctypes = [ {file = "pywin32-ctypes-0.2.0.tar.gz", hash = "sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942"}, {file = "pywin32_ctypes-0.2.0-py2.py3-none-any.whl", hash = "sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98"}, ] -PyYAML = [ +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"}, @@ -1537,21 +1557,112 @@ PyYAML = [ {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, ] +rapidfuzz = [ + {file = "rapidfuzz-2.13.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:33c540b6c0e34df13c5bd722ffc7738527642e1cee282cf6e4c8fd78d70346ba"}, + {file = "rapidfuzz-2.13.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:67cc400e23aca3976068ad7fa4539a2c0236bbfd269ba56a927ff0f28cdf06ef"}, + {file = "rapidfuzz-2.13.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d8ce8b3fc3da7e77bda3b9195861c81909ab960f04e5828ba575f4f584f91bdc"}, + {file = "rapidfuzz-2.13.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:91b7c0c9a8aa18eedab6df8fa028f82e73fb5b7e46b3a9935e625ea85859148c"}, + {file = "rapidfuzz-2.13.4-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e8926535c3b3dae1418e8bd4dbff7e8dd3cdec1327192f467bc76528c3c35f83"}, + {file = "rapidfuzz-2.13.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:db5b3eaa21e0b1a7c8e2dc9bb07bc0d5bb4f89b3881a29f31cba22c863ff50a5"}, + {file = "rapidfuzz-2.13.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:643e76cb678547ce9e9d58192907d62c99dfa312a817aaf12aefbefebf73848c"}, + {file = "rapidfuzz-2.13.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b84132b46afff57bf2ba7f4e0b6ac72514272fbc203e55ebe44d7838c06e0bb4"}, + {file = "rapidfuzz-2.13.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5c23533e846cf2ea5790bc14db422dec4a388002d259878ddc4dc58fabc7add1"}, + {file = "rapidfuzz-2.13.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:4eea58700abe0d9319b13a6799c8e6df62f00ba7e47052e71487d43a9b205285"}, + {file = "rapidfuzz-2.13.4-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:e61496e8e92dc267eb5331a16f129aca856a80c2dcb4130e454aa0bce0458a88"}, + {file = "rapidfuzz-2.13.4-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:ac30634247af8384acffe920b2f6db972d1a36d41bf48349189e550752d72e79"}, + {file = "rapidfuzz-2.13.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:be2f459f2c2427d0d7decf90c773a660ead34e3a9828fd80c6c8f8f32c0db5e3"}, + {file = "rapidfuzz-2.13.4-cp310-cp310-win32.whl", hash = "sha256:c833780b8674d831400b656ea1d2744369e11002c2be2e9f4d2a4a7629d00cb8"}, + {file = "rapidfuzz-2.13.4-cp310-cp310-win_amd64.whl", hash = "sha256:3b0ac50b17c2655e5816353130e1ff399ffc6426641dcd8e795a16e579ef57b2"}, + {file = "rapidfuzz-2.13.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:dbd0bae2bf74fc8c76ed3c41ca5565bacf737ca92fb8ce3e2c0a4cc4aa9e58c1"}, + {file = "rapidfuzz-2.13.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:7b7662463cf82072f8cf76fb313798c2cd3211df4e5fbb9d27a4317fc9783644"}, + {file = "rapidfuzz-2.13.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:22304c2ff91f94840c3a32e83076964b080786f4ba92cb7b99dcbc21e8f226b1"}, + {file = "rapidfuzz-2.13.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:817c20012d7a4a332ba17dd3720a4fd3b47271b5da05ab7ef58cfa5973ef4a27"}, + {file = "rapidfuzz-2.13.4-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8ef9a9e9f73d088bec7f184f77e58c8da3fb08ade150c74425936fbaf67f6646"}, + {file = "rapidfuzz-2.13.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6568e16362b9d6df3f9897cbf5f027711d4d9ff62a2675bdf18de9c2eb5ffe33"}, + {file = "rapidfuzz-2.13.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e0525371ffe671c5c44e87473a5c14e9de16cdcb8a7d9b101642ceb0b40042c0"}, + {file = "rapidfuzz-2.13.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:74146b009f8ca4077cf528130c7e2d89bfc6260afca55d731b1991d8b089f71d"}, + {file = "rapidfuzz-2.13.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:f4e3d7aa89951a23d0c8b81c145cc6956a6a1a4b81d865eb7922c123ae6d44de"}, + {file = "rapidfuzz-2.13.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:895bd6805eec4f8479e509904334a85dd0cf6c8e3159119c5e20e69dcfa6ff59"}, + {file = "rapidfuzz-2.13.4-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:4ce3671c326d8bd5e33089fd5f62ce5b04fe25752250e655e0fb6685464fd3f1"}, + {file = "rapidfuzz-2.13.4-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:1ee9ebf72535233bfe909c75c1edda1ff029e6f7cb046fc36d9ceff6767f180a"}, + {file = "rapidfuzz-2.13.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:fcc43cc8a4ba7f103d4e5325cf867a9110aea40cea20957ca994c74d875b9a3f"}, + {file = "rapidfuzz-2.13.4-cp311-cp311-win32.whl", hash = "sha256:ff65e787f12562a06bf3d0676064ff8653ce44f3502a76407bef202392b52a4b"}, + {file = "rapidfuzz-2.13.4-cp311-cp311-win_amd64.whl", hash = "sha256:6365aa163db96d20c7374e03ec62fc6b5c7c9dd25777c24d944a98281b83b831"}, + {file = "rapidfuzz-2.13.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:41fbee702a1f0646f92e7cd9344c65894eadbceb9db9e82b763293dc078fc8f4"}, + {file = "rapidfuzz-2.13.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26aafff28c2638ec68fd9ce5103ad2482ef5ea8dfaff20c8417a083c7b73a481"}, + {file = "rapidfuzz-2.13.4-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6983a382d050c85809ac2fbbbce56ddae67a08b4f0cc85a86ae159826b576287"}, + {file = "rapidfuzz-2.13.4-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e7828589704648e8caf43982ef5f4580b8af4cf6bde987c8ab2997f7337c9357"}, + {file = "rapidfuzz-2.13.4-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d07a5a54e8346d6e8b91fd7183a936cadfb82888bb4bc46287e6252f699a82ce"}, + {file = "rapidfuzz-2.13.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4773f5b2ea6b50ba2ddc91e01c6c1df86be4c2944d97075cf8362ed0049f3cde"}, + {file = "rapidfuzz-2.13.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c9c8cd0866110c7dd9207ef3e9205f2945c9211e3171865e5b95b38712b9fc11"}, + {file = "rapidfuzz-2.13.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:a78d70de1fa2412c3317ddd2dd545d060bd51641c02740e43f5711f22b5fe334"}, + {file = "rapidfuzz-2.13.4-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:f4bbcbfd6088d2e38045163751bbf3557f634eb8bb5f71f03320a12c4cb0a254"}, + {file = "rapidfuzz-2.13.4-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:36a1c1d734b49f407ba7eb8929c37db458e9ab1afa752204474bd18eecc419ce"}, + {file = "rapidfuzz-2.13.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:6a344abd3b1f4f318e6f550069ac079af373a433221aaa18f10b5db76c8b89e3"}, + {file = "rapidfuzz-2.13.4-cp37-cp37m-win32.whl", hash = "sha256:832479db73ed1936e09a4731f93f3588c719718759f4375c0b352088c55d5095"}, + {file = "rapidfuzz-2.13.4-cp37-cp37m-win_amd64.whl", hash = "sha256:6943c5c4ca584e95ffbbcf3bbd08f16e90c945ce79acfdd0dfe977f516b20c21"}, + {file = "rapidfuzz-2.13.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:d994ea8b0c09922449f26190c8ff98dd065555bbe06ba8e6ea19081f33b45b13"}, + {file = "rapidfuzz-2.13.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:5a2faa716c5cbc66606164c0ed328f377999b0f223ee8ac8fb45eff3ebffd23f"}, + {file = "rapidfuzz-2.13.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:249f6e5a57b6e810afd32e3836e2035a7d3a8ee4e04c1a0e6cc97cc215893fcb"}, + {file = "rapidfuzz-2.13.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f21819f131678fd89d501adc1a8727c88e193b6be5fb98e7e11059ee5f2705d9"}, + {file = "rapidfuzz-2.13.4-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:92e4e21cb8f435c37c6996ab4af655741867068d9dc8dbf56f30857a481aa282"}, + {file = "rapidfuzz-2.13.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2e7adcc2e3929213f7337b41aff71d40ab674b9bbab1d70d21f0d4975cfe09e2"}, + {file = "rapidfuzz-2.13.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b216fdfabe152faf23549934ed8276da64e066294069c083bfa239723cae43be"}, + {file = "rapidfuzz-2.13.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:993342be2be3d7cb0511720bc2753dfcb47c41014967d6c8e067cd61cd70bf32"}, + {file = "rapidfuzz-2.13.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:57808f19a5a75efa2034c7f89fdd96795f1e9a120fa84221095b3a9edf3a401b"}, + {file = "rapidfuzz-2.13.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:93b66fa0f6299ea51bbf3cef926bb7e040d625a0b000b9cc9bc0d65f0b92db16"}, + {file = "rapidfuzz-2.13.4-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:3e3ba0056fdee693694b916f7f2de903127a56ae020a6d58b7a7ddc38ccd81e3"}, + {file = "rapidfuzz-2.13.4-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:cd8ca0e4e84d161330c3375cb2e7e29dbd451f7291873553822bb9f1453aed33"}, + {file = "rapidfuzz-2.13.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6fab75f3e910ca7758ec0bf0c865cf42aa9550925ab1fb9a4fc8e48b94c1c81c"}, + {file = "rapidfuzz-2.13.4-cp38-cp38-win32.whl", hash = "sha256:8949404ebbc3ed8afd064b5109efea5fe20fffe81a0b8f9d221d860947830826"}, + {file = "rapidfuzz-2.13.4-cp38-cp38-win_amd64.whl", hash = "sha256:b3d41b5eeb88e79c429a6fe13fc4b587b3876e16fc574715798a84865e72f6b5"}, + {file = "rapidfuzz-2.13.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c0810d0c123fc876b3c7a88060b2a2f5d23bb35020f9466169a721561e8b8205"}, + {file = "rapidfuzz-2.13.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7ba39bfba079a16f30008f0b01bb1cbe30550f291ccfbf9472f2bd9e8bc4ef3b"}, + {file = "rapidfuzz-2.13.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fa94f6de41047e23b1fd0a6fbcc441c9e91ede15385614d4880b91a6c4319315"}, + {file = "rapidfuzz-2.13.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3a2c3ae0dcb5c668be3a513c1783860db4a8b09a443cf087064a2fbdc21d0f84"}, + {file = "rapidfuzz-2.13.4-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c07555830f7b432432ca56c3f465803f8c63e4d094e5ce792374e7de2c85dde5"}, + {file = "rapidfuzz-2.13.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a1cb2940c39af58be27e74029cb169c722fe60e8a30004039ed2fe8d57205c22"}, + {file = "rapidfuzz-2.13.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b30ad0e91d7635b0ea7236b13739c9b55af82b567432833d8ebab85aedb758eb"}, + {file = "rapidfuzz-2.13.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:915e2b8ea1a1552cf9abe32b6b7d7f1f52b2c17aab3939b953920a6026a419e2"}, + {file = "rapidfuzz-2.13.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:17e2c4d2965032eb918e5b0185d1b1822edfa5e1d7d2f327677dc02d1982e904"}, + {file = "rapidfuzz-2.13.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:884840da5b5e43aea5a741c5b920826b07bc0896c8e569a1563e1824d77f408f"}, + {file = "rapidfuzz-2.13.4-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:f1f23a042b0a45b0a365597e20a22b6875a8bd968ab200b32cafeebab9194fd2"}, + {file = "rapidfuzz-2.13.4-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:e4ebc235090cb63fb864f063c3c5230d69f40ab3642e85f1ea8bb7307483d729"}, + {file = "rapidfuzz-2.13.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:2df2d6207fb354f751c644aecef12ea2b881a280d2998afc3aac5876aa17538e"}, + {file = "rapidfuzz-2.13.4-cp39-cp39-win32.whl", hash = "sha256:6d2e89c7449d75bec2fd8ac9ef60e5e00e86b520df9c40c64bd47c21a4b00251"}, + {file = "rapidfuzz-2.13.4-cp39-cp39-win_amd64.whl", hash = "sha256:cca3a522385917eb46e846c16fcc3e0807f53035e93b879f8a59fe80a604eda3"}, + {file = "rapidfuzz-2.13.4-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:8f831f031e7b07e75099030e9a56bff6a6e18ae7e9a3b8b6834715d1384353f0"}, + {file = "rapidfuzz-2.13.4-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2763eea723c63f0b7c7c497f54cd25ab589872127cdbb4c9da749b3d5e355764"}, + {file = "rapidfuzz-2.13.4-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7349cbe1de1b3f902a6cdb0a834a5f6c7f17e081e56b7549db621634a8d72325"}, + {file = "rapidfuzz-2.13.4-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c44102cfea3f1f94d4b5e7d4104fa8bafb7df7359ab701b96717019493f582ea"}, + {file = "rapidfuzz-2.13.4-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:5e105c9173fd5678068e271eb2e824d60fe9d75d0ba2f2bb921abdc4b1fcc790"}, + {file = "rapidfuzz-2.13.4-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:25e4af378b80bbf9e5f8ad2ee3132d9a2f16beb46bdfc98ddffb06268a56dade"}, + {file = "rapidfuzz-2.13.4-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f01d95700f00bc88ac84b2b933416a7ba188dc2b0280c87614012698e78ad39"}, + {file = "rapidfuzz-2.13.4-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2046376a36b6ea4729097cb91522a6fef0271a4cd1be205724202ac78f013b94"}, + {file = "rapidfuzz-2.13.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7cee538458e921a4a94ef03f04ac7a618ec552e66d198b4e470e1f7b79c28f67"}, + {file = "rapidfuzz-2.13.4-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:fd9a1dd6a0bc099ab614c6d644173d4ded27f43a483f483a3a6d98c8afdbf3e6"}, + {file = "rapidfuzz-2.13.4-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:db94901bcb9e0c437827f25c9dd400032ed107e05115b5df430573bcd4a84874"}, + {file = "rapidfuzz-2.13.4-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7583f40fdae8f4710adfaa5adff6d0daae3eff6b244bd68adcf72a11450336f8"}, + {file = "rapidfuzz-2.13.4-pp39-pypy39_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b202979cbe08444f134547cecbbefb40b5dd078f2f747f9303d80ba9f5687564"}, + {file = "rapidfuzz-2.13.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f739326df930dfd76105ec6a8facdf88439786dc307d9f8c8ccd48a4df04cc9"}, + {file = "rapidfuzz-2.13.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:a32d8fd485b27486cce562732986acbd5c770be88b79e3a2a6d57ae20f491919"}, + {file = "rapidfuzz-2.13.4.tar.gz", hash = "sha256:85f5e8667b8e6cb7687c86374c60b133abdc76b2af24455172388c5d7ab2787b"}, +] requests = [ {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"}, {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"}, ] requests-toolbelt = [ - {file = "requests-toolbelt-0.9.1.tar.gz", hash = "sha256:968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"}, - {file = "requests_toolbelt-0.9.1-py2.py3-none-any.whl", hash = "sha256:380606e1d10dc85c3bd47bf5a6095f815ec007be7a8b69c878507068df059e6f"}, + {file = "requests-toolbelt-0.10.1.tar.gz", hash = "sha256:62e09f7ff5ccbda92772a29f394a49c3ad6cb181d568b1337626b2abb628a63d"}, + {file = "requests_toolbelt-0.10.1-py2.py3-none-any.whl", hash = "sha256:18565aa58116d9951ac39baa288d3adb5b3ff975c4f25eee78555d89e8f247f7"}, ] -SecretStorage = [ +secretstorage = [ {file = "SecretStorage-3.3.3-py3-none-any.whl", hash = "sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99"}, {file = "SecretStorage-3.3.3.tar.gz", hash = "sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77"}, ] setuptools = [ - {file = "setuptools-65.4.1-py3-none-any.whl", hash = "sha256:1b6bdc6161661409c5f21508763dc63ab20a9ac2f8ba20029aaaa7fdb9118012"}, - {file = "setuptools-65.4.1.tar.gz", hash = "sha256:3050e338e5871e70c72983072fe34f6032ae1cdeeeb67338199c2f74e083a80e"}, + {file = "setuptools-65.6.3-py3-none-any.whl", hash = "sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54"}, + {file = "setuptools-65.6.3.tar.gz", hash = "sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75"}, ] shellingham = [ {file = "shellingham-1.5.0-py2.py3-none-any.whl", hash = "sha256:a8f02ba61b69baaa13facdba62908ca8690a94b8119b69f5ec5873ea85f7391b"}, @@ -1570,12 +1681,12 @@ tomli = [ {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, ] tomlkit = [ - {file = "tomlkit-0.11.5-py3-none-any.whl", hash = "sha256:f2ef9da9cef846ee027947dc99a45d6b68a63b0ebc21944649505bf2e8bc5fe7"}, - {file = "tomlkit-0.11.5.tar.gz", hash = "sha256:571854ebbb5eac89abcb4a2e47d7ea27b89bf29e09c35395da6f03dd4ae23d1c"}, + {file = "tomlkit-0.11.6-py3-none-any.whl", hash = "sha256:07de26b0d8cfc18f871aec595fda24d95b08fef89d147caa861939f37230bf4b"}, + {file = "tomlkit-0.11.6.tar.gz", hash = "sha256:71b952e5721688937fb02cf9d354dbcf0785066149d2855e44531ebdd2b65d73"}, ] -tox = [ - {file = "tox-3.26.0-py2.py3-none-any.whl", hash = "sha256:bf037662d7c740d15c9924ba23bb3e587df20598697bb985ac2b49bdc2d847f6"}, - {file = "tox-3.26.0.tar.gz", hash = "sha256:44f3c347c68c2c68799d7d44f1808f9d396fc8a1a500cbc624253375c7ae107e"}, +trove-classifiers = [ + {file = "trove-classifiers-2022.12.1.tar.gz", hash = "sha256:8eccd9c075038ef2ec73276e2422d0dbf4d632f9133f029632d0df35374caf77"}, + {file = "trove_classifiers-2022.12.1-py3-none-any.whl", hash = "sha256:20ce6feeadd5793718b2106f0c832f821f29838aec792143e620b0a0a0a810b8"}, ] typed-ast = [ {file = "typed_ast-1.5.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:669dd0c4167f6f2cd9f57041e03c3c2ebf9063d0757dc89f79ba1daa2bfca9d4"}, @@ -1604,95 +1715,114 @@ typed-ast = [ {file = "typed_ast-1.5.4.tar.gz", hash = "sha256:39e21ceb7388e4bb37f4c679d72707ed46c2fbf2a5609b8b8ebc4b067d977df2"}, ] types-html5lib = [ - {file = "types-html5lib-1.1.11.tar.gz", hash = "sha256:2b67bbaf3125b840720dc5890f243c3661583a503f0ed33166acf31c67e53717"}, - {file = "types_html5lib-1.1.11-py3-none-any.whl", hash = "sha256:dda54159be6ef58a67bf10bdd6fe5b4559e55e1df6bb18c47915281a8be0e5fd"}, + {file = "types-html5lib-1.1.11.10.tar.gz", hash = "sha256:90eeffad04010bf67bcccf77b9cc6cf4783eec13cbd22ebbaaf20f24d5f2ca11"}, + {file = "types_html5lib-1.1.11.10-py3-none-any.whl", hash = "sha256:18c34ce51eac062321b224365b3aee5b5cdc1613872ed8469c9c0c4ccd3e02e9"}, ] types-jsonschema = [ - {file = "types-jsonschema-4.16.1.tar.gz", hash = "sha256:95e31d2b90da218faf3d8fa34fa33ae55fc52c79b2cb7308755cc2d7d71b1096"}, - {file = "types_jsonschema-4.16.1-py3-none-any.whl", hash = "sha256:21ca9a227185b83655c71755b5834c36d66ca43f9de77c018d61c4f917f851ab"}, + {file = "types-jsonschema-4.17.0.2.tar.gz", hash = "sha256:8b9e1140d4d780f0f19b5cab1b8a3732e8dd5e49dbc1f174cc0b499125ca6f6c"}, + {file = "types_jsonschema-4.17.0.2-py3-none-any.whl", hash = "sha256:8fd2f9aea4da54f9a811baa6963aac10fd680c18baa6237392c079b97d152738"}, ] types-requests = [ - {file = "types-requests-2.28.11.2.tar.gz", hash = "sha256:fdcd7bd148139fb8eef72cf4a41ac7273872cad9e6ada14b11ff5dfdeee60ed3"}, - {file = "types_requests-2.28.11.2-py3-none-any.whl", hash = "sha256:14941f8023a80b16441b3b46caffcbfce5265fd14555844d6029697824b5a2ef"}, + {file = "types-requests-2.28.11.5.tar.gz", hash = "sha256:a7df37cc6fb6187a84097da951f8e21d335448aa2501a6b0a39cbd1d7ca9ee2a"}, + {file = "types_requests-2.28.11.5-py3-none-any.whl", hash = "sha256:091d4a5a33c1b4f20d8b1b952aa8fa27a6e767c44c3cf65e56580df0b05fd8a9"}, ] types-urllib3 = [ - {file = "types-urllib3-1.26.25.tar.gz", hash = "sha256:5aef0e663724eef924afa8b320b62ffef2c1736c1fa6caecfc9bc6c8ae2c3def"}, - {file = "types_urllib3-1.26.25-py3-none-any.whl", hash = "sha256:c1d78cef7bd581e162e46c20a57b2e1aa6ebecdcf01fd0713bb90978ff3e3427"}, + {file = "types-urllib3-1.26.25.4.tar.gz", hash = "sha256:eec5556428eec862b1ac578fb69aab3877995a99ffec9e5a12cf7fbd0cc9daee"}, + {file = "types_urllib3-1.26.25.4-py3-none-any.whl", hash = "sha256:ed6b9e8a8be488796f72306889a06a3fc3cb1aa99af02ab8afb50144d7317e49"}, ] typing-extensions = [ {file = "typing_extensions-4.4.0-py3-none-any.whl", hash = "sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e"}, {file = "typing_extensions-4.4.0.tar.gz", hash = "sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa"}, ] urllib3 = [ - {file = "urllib3-1.26.12-py2.py3-none-any.whl", hash = "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"}, - {file = "urllib3-1.26.12.tar.gz", hash = "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e"}, + {file = "urllib3-1.26.13-py2.py3-none-any.whl", hash = "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc"}, + {file = "urllib3-1.26.13.tar.gz", hash = "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"}, ] virtualenv = [ {file = "virtualenv-20.16.5-py3-none-any.whl", hash = "sha256:d07dfc5df5e4e0dbc92862350ad87a36ed505b978f6c39609dc489eadd5b0d27"}, {file = "virtualenv-20.16.5.tar.gz", hash = "sha256:227ea1b9994fdc5ea31977ba3383ef296d7472ea85be9d6732e42a91c04e80da"}, + {file = "virtualenv-20.17.1-py3-none-any.whl", hash = "sha256:ce3b1684d6e1a20a3e5ed36795a97dfc6af29bc3970ca8dab93e11ac6094b3c4"}, + {file = "virtualenv-20.17.1.tar.gz", hash = "sha256:f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058"}, ] webencodings = [ {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"}, {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"}, ] xattr = [ - {file = "xattr-0.9.9-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:58a9fb4fd19b467e88f4b75b5243706caa57e312d3aee757b53b57c7fd0f4ba9"}, - {file = "xattr-0.9.9-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:e71efca59705c7abde5b7f76323ebe00ed2977f10cba4204b9421dada036b5ca"}, - {file = "xattr-0.9.9-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:1aad96b6603961c3d1ca1aaa8369b1a8d684a7b37357b2428087c286bf0e561c"}, - {file = "xattr-0.9.9-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:46cb74f98d31d9d70f975ec3e6554360a9bdcbb4b9fb50a69fabe54f9f928c97"}, - {file = "xattr-0.9.9-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:80c2db56058a687d7439be041f916cbeb2943fbe2623e53d5da721a4552d8991"}, - {file = "xattr-0.9.9-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:c360d1cc42e885b64d84f64de3c501dd7bce576248327ef583b4625ee63aa023"}, - {file = "xattr-0.9.9-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:debd87afe6bdf88c3689bde52eecf2b166388b13ef7388259d23223374db417d"}, - {file = "xattr-0.9.9-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:4280c9f33a8678828f1bbc3d3dc8b823b5e4a113ee5ecb0fb98bff60cc2b9ad1"}, - {file = "xattr-0.9.9-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:e0916ec1656d2071cd3139d1f52426825985d8ed076f981ef7f0bc13dfa8e96c"}, - {file = "xattr-0.9.9-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a517916fbf2f58a3222bb2048fe1eeff4e23e07a4ce6228a27de004c80bf53ab"}, - {file = "xattr-0.9.9-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e886c882b3b28c7a684c3e3daf46347da5428a46b88bc6d62c4867d574b90c54"}, - {file = "xattr-0.9.9-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:373e3d1fd9258438fc38d1438142d3659f36743f374a20457346ef26741ed441"}, - {file = "xattr-0.9.9-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1a7beeb54ca140273b2f6320bb98b701ec30628af2ebe4eb30f7051419eb4ef3"}, - {file = "xattr-0.9.9-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ef3ca29cdaae9c47c625d84bb6c9046f7275cccde0ea805caa23ca58d3671f3f"}, - {file = "xattr-0.9.9-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5c381d890931cd18b137ce3fb5c5f08b672c3c61e2e47b1a7442ee46e827abfe"}, - {file = "xattr-0.9.9-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:59c5783ccf57cf2700ce57d51a92134900ed26f6ab20d209f383fb898903fea6"}, - {file = "xattr-0.9.9-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:966b885b69d95362e2a12d39f84889cf857090e57263b5ac33409498aa00c160"}, - {file = "xattr-0.9.9-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efaaf0cb1ea8e9febb7baad301ae8cc9ad7a96fdfc5c6399d165e7a19e3e61ce"}, - {file = "xattr-0.9.9-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f19fa75ed1e9db86354efab29869cb2be6976d456bd7c89e67b118d5384a1d98"}, - {file = "xattr-0.9.9-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7ca28ad06828244b315214ee35388f57e81e90aac2ceac3f32e42ae394e31b9c"}, - {file = "xattr-0.9.9-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:532c7f1656dd2fe937116b9e210229f716d7fc7ac142f9cdace7da92266d32e8"}, - {file = "xattr-0.9.9-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:11c28033c17e98c67e0def9d6ebd415ad3c006a7bc3fee6bad79c5e52d0dff49"}, - {file = "xattr-0.9.9-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:473cabb30e544ea08c8c01c1ef18053147cdc8552d443ac97815e46fbb13c7d4"}, - {file = "xattr-0.9.9-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:c4a308522b444d090fbd66a385c9519b6b977818226921b0d2fc403667c93564"}, - {file = "xattr-0.9.9-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:82493434488aca72d88b5129dac8f212e7b8bdca7ceffe7bb977c850f2452e4e"}, - {file = "xattr-0.9.9-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:e41d289706c7e8940f4d08e865da6a8ae988123e40a44f9a97ddc09e67795d7d"}, - {file = "xattr-0.9.9-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ef08698e360cf43688dca3db3421b156b29948a714d5d089348073f463c11646"}, - {file = "xattr-0.9.9-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4eb10ac16ca8d534c0395425d52121e0c1981f808e1b3f577f6a5ec33d3853e4"}, - {file = "xattr-0.9.9-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5605fec07b0e964bd980cc70ec335b9eb1b7ac7c6f314c7c2d8f54b09104fe4c"}, - {file = "xattr-0.9.9-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:974e7d577ddb15e4552fb0ec10a4cfe09bdf6267365aa2b8394bb04637785aad"}, - {file = "xattr-0.9.9-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:ad6777de922c638bfa87a0d7faebc5722ddef04a1210b2a8909289b58b769af0"}, - {file = "xattr-0.9.9-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:3887e70873ebf0efbde32f9929ec1c7e45ec0013561743e2cc0406a91e51113b"}, - {file = "xattr-0.9.9-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:83caa8e93a45a0f25f91b92d9b45f490c87bff74f02555df6312efeba0dacc31"}, - {file = "xattr-0.9.9-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e33ec0a1d913d946d1ab7509f37ee37306c45af735347f13b963df34ffe6e029"}, - {file = "xattr-0.9.9-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:263c58dca83372260c5c195e0b59959e38e1f107f0b7350de82e3db38479036c"}, - {file = "xattr-0.9.9-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:125dfb9905428162349d3b8b825d9a18280893f0cb0db2a2467d5ef253fa6ce2"}, - {file = "xattr-0.9.9-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e243524e0dde16d7a2e1b52512ad2c6964df2143dd1c79b820dcb4c6c0822c20"}, - {file = "xattr-0.9.9-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:01ec07d24a14406bdc6a123041c63a88e1c4a3f820e4a7d30f7609d57311b499"}, - {file = "xattr-0.9.9-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:85c1df5f1d209345ea96de137419e886a27bb55076b3ae01faacf35aafcf3a61"}, - {file = "xattr-0.9.9-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ca74d3eff92d6dc16e271fbad9cbab547fb9a0c983189c4031c3ff3d150dd871"}, - {file = "xattr-0.9.9-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:7d17505e49ac70c0e71939c5aac96417a863583fb30a2d6304d5ac881230548f"}, - {file = "xattr-0.9.9-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:1ae47a6398d3c04623fa386a4aa2f66e5cd3cdb1a7e69d1bfaeb8c73983bf271"}, - {file = "xattr-0.9.9-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:809e2537d0aff9fca97dacf3245cbbaf711bbced5d1b0235a8d1906b04e26114"}, - {file = "xattr-0.9.9-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:de3af84364f06d67b3662ccf7c1a73e1d389d8d274394e952651e7bf1bbd2718"}, - {file = "xattr-0.9.9-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3b62cdad232d2d2dedd39b543701db8e3883444ec0d57ce3fab8f75e5f8b0301"}, - {file = "xattr-0.9.9-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6b11d2eda397d47f7075743409683c233519ca52aa1dac109b413a4d8c15b740"}, - {file = "xattr-0.9.9-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:661c0a939aefdf071887121f534bb10588d69c7b2dfca5c486af2fc81a0786e8"}, - {file = "xattr-0.9.9-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:5db7c2db320a8d5264d437d71f1eb7270a7e4a6545296e7766161d17752590b7"}, - {file = "xattr-0.9.9-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:83203e60cbaca9536d297e5039b285a600ff84e6e9e8536fe2d521825eeeb437"}, - {file = "xattr-0.9.9-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:42bfb4e4da06477e739770ac6942edbdc71e9fc3b497b67db5fba712fa8109c2"}, - {file = "xattr-0.9.9-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:67047d04d1c56ad4f0f5886085e91b0077238ab3faaec6492c3c21920c6566eb"}, - {file = "xattr-0.9.9-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:885782bc82ded1a3f684d54a1af259ae9fcc347fa54b5a05b8aad82b8a42044c"}, - {file = "xattr-0.9.9-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5bc84ccec618b5aa089e7cee8b07fcc92d4069aac4053da604c8143a0d6b1381"}, - {file = "xattr-0.9.9-pp37-pypy37_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:baeff3e5dda8ea7e9424cfaee51829f46afe3836c30d02f343f9049c685681ca"}, - {file = "xattr-0.9.9.tar.gz", hash = "sha256:09cb7e1efb3aa1b4991d6be4eb25b73dc518b4fe894f0915f5b0dcede972f346"}, + {file = "xattr-0.10.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:16a660a883e703b311d1bbbcafc74fa877585ec081cd96e8dd9302c028408ab1"}, + {file = "xattr-0.10.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:1e2973e72faa87ca29d61c23b58c3c89fe102d1b68e091848b0e21a104123503"}, + {file = "xattr-0.10.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:13279fe8f7982e3cdb0e088d5cb340ce9cbe5ef92504b1fd80a0d3591d662f68"}, + {file = "xattr-0.10.1-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:1dc9b9f580ef4b8ac5e2c04c16b4d5086a611889ac14ecb2e7e87170623a0b75"}, + {file = "xattr-0.10.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:485539262c2b1f5acd6b6ea56e0da2bc281a51f74335c351ea609c23d82c9a79"}, + {file = "xattr-0.10.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:295b3ab335fcd06ca0a9114439b34120968732e3f5e9d16f456d5ec4fa47a0a2"}, + {file = "xattr-0.10.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:a126eb38e14a2f273d584a692fe36cff760395bf7fc061ef059224efdb4eb62c"}, + {file = "xattr-0.10.1-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:b0e919c24f5b74428afa91507b15e7d2ef63aba98e704ad13d33bed1288dca81"}, + {file = "xattr-0.10.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:e31d062cfe1aaeab6ba3db6bd255f012d105271018e647645941d6609376af18"}, + {file = "xattr-0.10.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:209fb84c09b41c2e4cf16dd2f481bb4a6e2e81f659a47a60091b9bcb2e388840"}, + {file = "xattr-0.10.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c4120090dac33eddffc27e487f9c8f16b29ff3f3f8bcb2251b2c6c3f974ca1e1"}, + {file = "xattr-0.10.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3e739d624491267ec5bb740f4eada93491de429d38d2fcdfb97b25efe1288eca"}, + {file = "xattr-0.10.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2677d40b95636f3482bdaf64ed9138fb4d8376fb7933f434614744780e46e42d"}, + {file = "xattr-0.10.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:40039f1532c4456fd0f4c54e9d4e01eb8201248c321c6c6856262d87e9a99593"}, + {file = "xattr-0.10.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:148466e5bb168aba98f80850cf976e931469a3c6eb11e9880d9f6f8b1e66bd06"}, + {file = "xattr-0.10.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0aedf55b116beb6427e6f7958ccd80a8cbc80e82f87a4cd975ccb61a8d27b2ee"}, + {file = "xattr-0.10.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:c3024a9ff157247c8190dd0eb54db4a64277f21361b2f756319d9d3cf20e475f"}, + {file = "xattr-0.10.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f1be6e733e9698f645dbb98565bb8df9b75e80e15a21eb52787d7d96800e823b"}, + {file = "xattr-0.10.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:7880c8a54c18bc091a4ce0adc5c6d81da1c748aec2fe7ac586d204d6ec7eca5b"}, + {file = "xattr-0.10.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:89c93b42c3ba8aedbc29da759f152731196c2492a2154371c0aae3ef8ba8301b"}, + {file = "xattr-0.10.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:6b905e808df61b677eb972f915f8a751960284358b520d0601c8cbc476ba2df6"}, + {file = "xattr-0.10.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d1ef954d0655f93a34d07d0cc7e02765ec779ff0b59dc898ee08c6326ad614d5"}, + {file = "xattr-0.10.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:199b20301b6acc9022661412346714ce764d322068ef387c4de38062474db76c"}, + {file = "xattr-0.10.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ec0956a8ab0f0d3f9011ba480f1e1271b703d11542375ef73eb8695a6bd4b78b"}, + {file = "xattr-0.10.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ffcb57ca1be338d69edad93cf59aac7c6bb4dbb92fd7bf8d456c69ea42f7e6d2"}, + {file = "xattr-0.10.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1f0563196ee54756fe2047627d316977dc77d11acd7a07970336e1a711e934db"}, + {file = "xattr-0.10.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:fc354f086f926a1c7f04886f97880fed1a26d20e3bc338d0d965fd161dbdb8ab"}, + {file = "xattr-0.10.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:c0cd2d02ef2fb45ecf2b0da066a58472d54682c6d4f0452dfe7ae2f3a76a42ea"}, + {file = "xattr-0.10.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:49626096ddd72dcc1654aadd84b103577d8424f26524a48d199847b5d55612d0"}, + {file = "xattr-0.10.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ceaa26bef8fcb17eb59d92a7481c2d15d20211e217772fb43c08c859b01afc6a"}, + {file = "xattr-0.10.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e8c014c371391f28f8cd27d73ea59f42b30772cd640b5a2538ad4f440fd9190b"}, + {file = "xattr-0.10.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:46c32cd605673606b9388a313b0050ee7877a0640d7561eea243ace4fa2cc5a6"}, + {file = "xattr-0.10.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:772b22c4ff791fe5816a7c2a1c9fcba83f9ab9bea138eb44d4d70f34676232b4"}, + {file = "xattr-0.10.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:183ad611a2d70b5a3f5f7aadef0fcef604ea33dcf508228765fd4ddac2c7321d"}, + {file = "xattr-0.10.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8068df3ebdfa9411e58d5ae4a05d807ec5994645bb01af66ec9f6da718b65c5b"}, + {file = "xattr-0.10.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5bc40570155beb85e963ae45300a530223d9822edfdf09991b880e69625ba38a"}, + {file = "xattr-0.10.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:436e1aaf23c07e15bed63115f1712d2097e207214fc6bcde147c1efede37e2c5"}, + {file = "xattr-0.10.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7298455ccf3a922d403339781b10299b858bb5ec76435445f2da46fb768e31a5"}, + {file = "xattr-0.10.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:986c2305c6c1a08f78611eb38ef9f1f47682774ce954efb5a4f3715e8da00d5f"}, + {file = "xattr-0.10.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:5dc6099e76e33fa3082a905fe59df766b196534c705cf7a2e3ad9bed2b8a180e"}, + {file = "xattr-0.10.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:042ad818cda6013162c0bfd3816f6b74b7700e73c908cde6768da824686885f8"}, + {file = "xattr-0.10.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:9d4c306828a45b41b76ca17adc26ac3dc00a80e01a5ba85d71df2a3e948828f2"}, + {file = "xattr-0.10.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a606280b0c9071ef52572434ecd3648407b20df3d27af02c6592e84486b05894"}, + {file = "xattr-0.10.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:5b49d591cf34cda2079fd7a5cb2a7a1519f54dc2e62abe3e0720036f6ed41a85"}, + {file = "xattr-0.10.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6b8705ac6791426559c1a5c2b88bb2f0e83dc5616a09b4500899bfff6a929302"}, + {file = "xattr-0.10.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a5ea974930e876bc5c146f54ac0f85bb39b7b5de2b6fc63f90364712ae368ebe"}, + {file = "xattr-0.10.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f55a2dd73a12a1ae5113c5d9cd4b4ab6bf7950f4d76d0a1a0c0c4264d50da61d"}, + {file = "xattr-0.10.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:475c38da0d3614cc5564467c4efece1e38bd0705a4dbecf8deeb0564a86fb010"}, + {file = "xattr-0.10.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:925284a4a28e369459b2b7481ea22840eed3e0573a4a4c06b6b0614ecd27d0a7"}, + {file = "xattr-0.10.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:aa32f1b45fed9122bed911de0fcc654da349e1f04fa4a9c8ef9b53e1cc98b91e"}, + {file = "xattr-0.10.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c5d3d0e728bace64b74c475eb4da6148cd172b2d23021a1dcd055d92f17619ac"}, + {file = "xattr-0.10.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8faaacf311e2b5cc67c030c999167a78a9906073e6abf08eaa8cf05b0416515c"}, + {file = "xattr-0.10.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:cc6b8d5ca452674e1a96e246a3d2db5f477aecbc7c945c73f890f56323e75203"}, + {file = "xattr-0.10.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3725746a6502f40f72ef27e0c7bfc31052a239503ff3eefa807d6b02a249be22"}, + {file = "xattr-0.10.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:789bd406d1aad6735e97b20c6d6a1701e1c0661136be9be862e6a04564da771f"}, + {file = "xattr-0.10.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a9a7a807ab538210ff8532220d8fc5e2d51c212681f63dbd4e7ede32543b070f"}, + {file = "xattr-0.10.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:3e5825b5fc99ecdd493b0cc09ec35391e7a451394fdf623a88b24726011c950d"}, + {file = "xattr-0.10.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:80638d1ce7189dc52f26c234cee3522f060fadab6a8bc3562fe0ddcbe11ba5a4"}, + {file = "xattr-0.10.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3ff0dbe4a6ce2ce065c6de08f415bcb270ecfd7bf1655a633ddeac695ce8b250"}, + {file = "xattr-0.10.1-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:5267e5f9435c840d2674194150b511bef929fa7d3bc942a4a75b9eddef18d8d8"}, + {file = "xattr-0.10.1-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b27dfc13b193cb290d5d9e62f806bb9a99b00cd73bb6370d556116ad7bb5dc12"}, + {file = "xattr-0.10.1-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:636ebdde0277bce4d12d2ef2550885804834418fee0eb456b69be928e604ecc4"}, + {file = "xattr-0.10.1-pp37-pypy37_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d60c27922ec80310b45574351f71e0dd3a139c5295e8f8b19d19c0010196544f"}, + {file = "xattr-0.10.1-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:b34df5aad035d0343bd740a95ca30db99b776e2630dca9cc1ba8e682c9cc25ea"}, + {file = "xattr-0.10.1-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f24a7c04ff666d0fe905dfee0a84bc899d624aeb6dccd1ea86b5c347f15c20c1"}, + {file = "xattr-0.10.1-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a3878e1aff8eca64badad8f6d896cb98c52984b1e9cd9668a3ab70294d1ef92d"}, + {file = "xattr-0.10.1-pp38-pypy38_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4abef557028c551d59cf2fb3bf63f2a0c89f00d77e54c1c15282ecdd56943496"}, + {file = "xattr-0.10.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:0e14bd5965d3db173d6983abdc1241c22219385c22df8b0eb8f1846c15ce1fee"}, + {file = "xattr-0.10.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7f9be588a4b6043b03777d50654c6079af3da60cc37527dbb80d36ec98842b1e"}, + {file = "xattr-0.10.1-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bc4ae264aa679aacf964abf3ea88e147eb4a22aea6af8c6d03ebdebd64cfd6"}, + {file = "xattr-0.10.1-pp39-pypy39_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:827b5a97673b9997067fde383a7f7dc67342403093b94ea3c24ae0f4f1fec649"}, + {file = "xattr-0.10.1.tar.gz", hash = "sha256:c12e7d81ffaa0605b3ac8c22c2994a8e18a9cf1c59287a1b7722a2289c952ec5"}, ] zipp = [ - {file = "zipp-3.9.0-py3-none-any.whl", hash = "sha256:972cfa31bc2fedd3fa838a51e9bc7e64b7fb725a8c00e7431554311f180e9980"}, - {file = "zipp-3.9.0.tar.gz", hash = "sha256:3a7af91c3db40ec72dd9d154ae18e008c69efe8ca88dde4f9a731bb82fe2f9eb"}, + {file = "zipp-3.11.0-py3-none-any.whl", hash = "sha256:83a28fcb75844b5c0cdaf5aa4003c2d728c77e05f5aeabe8e95e56727005fbaa"}, + {file = "zipp-3.11.0.tar.gz", hash = "sha256:a7a22e05929290a67401440b39690ae6563279bced5f314609d9d03798f56766"}, ] diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml index 0ffdda1918c5..59b21880ee12 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "poetry" -version = "1.2.2" +version = "1.3.0" description = "Python dependency management and packaging made easy." authors = [ "Sébastien Eustace ", @@ -37,6 +37,9 @@ classifiers = [ "Topic :: Software Development :: Libraries :: Python Modules" ] +[tool.poetry.urls] +Changelog = "https://python-poetry.org/history/" + [tool.poetry.build] generate-setup-file = false @@ -44,39 +47,46 @@ generate-setup-file = false [tool.poetry.dependencies] python = "^3.7" -poetry-core = "1.3.2" -poetry-plugin-export = "^1.1.2" +poetry-core = "1.4.0" +poetry-plugin-export = "^1.2.0" "backports.cached-property" = { version = "^1.0.2", python = "<3.8" } cachecontrol = { version = "^0.12.9", extras = ["filecache"] } -cachy = "^0.3.0" -cleo = "^1.0.0a5" -crashtest = "^0.3.0" +cleo = "^2.0.0" +crashtest = "^0.4.1" +dulwich = "^0.20.46" +filelock = "^3.8.0" html5lib = "^1.0" importlib-metadata = { version = "^4.4", python = "<3.10" } jsonschema = "^4.10.0" -# keyring uses calver, so version is unclamped -keyring = ">=21.2.0" +keyring = "^23.9.0" # packaging uses calver, so version is unclamped packaging = ">=20.4" pexpect = "^4.7.0" pkginfo = "^1.5" platformdirs = "^2.5.2" requests = "^2.18" -requests-toolbelt = "^0.9.1" +requests-toolbelt = ">=0.9.1,<0.11.0" shellingham = "^1.5" +tomli = { version = "^2.0.1", python = "<3.11" } # exclude 0.11.2 and 0.11.3 due to https://github.com/sdispater/tomlkit/issues/225 tomlkit = ">=0.11.1,<1.0.0,!=0.11.2,!=0.11.3" +# trove-classifiers uses calver, so version is unclamped +trove-classifiers = ">=2022.5.19" # exclude 20.4.5 - 20.4.6 due to https://github.com/pypa/pip/issues/9953 -virtualenv = ">=20.4.3,!=20.4.5,!=20.4.6" -xattr = { version = "^0.9.7", markers = "sys_platform == 'darwin'" } +virtualenv = [ + { version = "^20.4.3,!=20.4.5,!=20.4.6", markers = "sys_platform != 'win32' or python_version != '3.9'" }, + # see https://github.com/python-poetry/poetry/pull/6950 for details + { version = "^20.4.3,!=20.4.5,!=20.4.6,<20.16.6", markers = "sys_platform == 'win32' and python_version == '3.9'" }, +] +xattr = { version = "^0.10.0", markers = "sys_platform == 'darwin'" } urllib3 = "^1.26.0" -dulwich = "^0.20.46" [tool.poetry.group.dev.dependencies] -tox = "^3.18" pre-commit = "^2.6" [tool.poetry.group.test.dependencies] +# Cachy frozen to test backwards compatibility for `poetry.utils.cache`. +cachy = "0.3.0" deepdiff = "^5.0" flatdict = "^4.0.1" httpretty = "^1.0" @@ -88,7 +98,7 @@ pytest-xdist = { version = "^2.5", extras = ["psutil"] } zipp = { version = "^3.4", python = "<3.8" } [tool.poetry.group.typing.dependencies] -mypy = ">=0.971" +mypy = ">=0.990" types-html5lib = ">=1.1.9" types-jsonschema = ">=4.9.0" types-requests = ">=2.28.8" @@ -163,9 +173,7 @@ warn_unused_ignores = false [[tool.mypy.overrides]] module = [ 'cachecontrol.*', - 'cachy.*', - 'cleo.*', - 'crashtest.*', + 'lockfile.*', 'pexpect.*', 'pkginfo.*', 'requests_toolbelt.*', diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json index 2827e33dce98..049ba40b4780 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json @@ -1,8 +1,8 @@ { "owner": "python-poetry", "repo": "poetry", - "rev": "1.2.2", - "sha256": "04cdrq9mjdnp28jx63vjlwj72wrad7941hp3k7263qskzlp27ql6", + "rev": "1.3.0", + "sha256": "16ng59ykm7zkjizmwb482y0hawpjjr5mvl0ahjd790xzxcc2bbbv", "fetchSubmodules": true } diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index cadf9b9eeb16..84f1670e6dff 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -42,7 +42,7 @@ in runCommand "systemtap-${kernel.version}-${version}" { homepage = "https://sourceware.org/systemtap/"; description = "Provides a scripting language for instrumentation on a live kernel plus user-space"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + platforms = lib.systems.inspect.patterns.isGnu; }; } '' mkdir -p $out/bin diff --git a/pkgs/development/tools/prospector/default.nix b/pkgs/development/tools/prospector/default.nix index d2855861dc8f..e53760f54afa 100644 --- a/pkgs/development/tools/prospector/default.nix +++ b/pkgs/development/tools/prospector/default.nix @@ -7,29 +7,34 @@ let setoptconf-tmp = python3.pkgs.callPackage ./setoptconf.nix { }; in -with python3.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "prospector"; - version = "1.7.7"; + version = "1.8.4"; format = "pyproject"; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "PyCQA"; repo = pname; - rev = version; - hash = "sha256-sbPZmVeJtNphtjuZEfKcUgty9bJ3E/2Ya9RuX3u/XEs="; + rev = "refs/tags/v${version}"; + hash = "sha256-g7tyn6pj5I/+b28wIitqDapR5ffk1xDEAtcYs2TpIUk="; }; - nativeBuildInputs = [ - poetry-core + pythonRelaxDeps = [ + "pyflakes" + "pep8-naming" + "flake8" ]; - propagatedBuildInputs = [ + nativeBuildInputs = with python3.pkgs; [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ bandit dodgy + flake8 + gitpython mccabe mypy pep8-naming @@ -50,25 +55,24 @@ buildPythonApplication rec { vulture ]; - checkInputs = [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'requirements-detector = "^0.7"' 'requirements-detector = "*"' \ - --replace 'pep8-naming = ">=0.3.3,<=0.10.0"' 'pep8-naming = "*"' \ - --replace 'mccabe = "^0.6.0"' 'mccabe = "*"' \ - --replace 'pycodestyle = ">=2.6.0,<2.9.0"' 'pycodestyle = "*"' - ''; - pythonImportsCheck = [ "prospector" ]; + disabledTestPaths = [ + # distutils.errors.DistutilsArgError: no commands supplied + "tests/tools/pyroma/test_pyroma_tool.py" + ]; + + meta = with lib; { description = "Tool to analyse Python code and output information about errors, potential problems, convention violations and complexity"; homepage = "https://github.com/PyCQA/prospector"; + changelog = "https://github.com/PyCQA/prospector/blob/v${version}/CHANGELOG.rst"; license = licenses.gpl2Plus; maintainers = with maintainers; [ kamadorueda ]; }; diff --git a/pkgs/development/tools/protoc-gen-connect-go/default.nix b/pkgs/development/tools/protoc-gen-connect-go/default.nix index f95af13c2652..5941b2cc51e1 100644 --- a/pkgs/development/tools/protoc-gen-connect-go/default.nix +++ b/pkgs/development/tools/protoc-gen-connect-go/default.nix @@ -1,23 +1,29 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "protoc-gen-connect-go"; - version = "1.1.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "connect-go"; - rev = "v${version}"; - sha256 = "sha256-v+WBO7gcoInI9MgEDxuz1kBSz0w5+RGpaXrqACE9WRA="; + rev = "refs/tags/v${version}"; + hash = "sha256-lk7PcSsqm2oLYerhXGxcyqkw5VJ46JIASU87ppybd78="; }; - vendorSha256 = "sha256-Bh2JCWTaML/QU/sLBsxLKMzzH++K22BTGusfcVW2GBw="; + vendorHash = "sha256-Bh2JCWTaML/QU/sLBsxLKMzzH++K22BTGusfcVW2GBw="; - subPackages = [ "cmd/protoc-gen-connect-go" ]; + subPackages = [ + "cmd/protoc-gen-connect-go" + ]; meta = with lib; { - description = "Simple, reliable, interoperable. A better gRPC."; + description = "library for building browser and gRPC-compatible HTTP APIs"; homepage = "https://github.com/bufbuild/connect-go"; + changelog = "https://github.com/bufbuild/connect-go/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ kilimnik ]; }; diff --git a/pkgs/development/tools/protoc-gen-go-vtproto/default.nix b/pkgs/development/tools/protoc-gen-go-vtproto/default.nix index ee1793f01cab..3adab620534b 100644 --- a/pkgs/development/tools/protoc-gen-go-vtproto/default.nix +++ b/pkgs/development/tools/protoc-gen-go-vtproto/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "protoc-gen-go-vtproto"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "vtprotobuf"; rev = "v${version}"; - sha256 = "sha256-fOF7n1WeQ3s1S+o5NbAoTUnqqk5IHtKvXCb2o8LmI5U="; + sha256 = "sha256-WtiXoQWjjFf+TP2zpAXNH05XdcrLSpw3S0TG4lkzp2E="; }; - vendorSha256 = "sha256-JpSVO8h7+StLG9/dJQkmrIlh9zIHABoqP1hq+X5ajVs="; + vendorHash = "sha256-JpSVO8h7+StLG9/dJQkmrIlh9zIHABoqP1hq+X5ajVs="; excludedPackages = [ "conformance" ]; diff --git a/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/pkgs/development/tools/protoc-gen-grpc-web/default.nix index 279f8101f78f..0b7eca7e1deb 100644 --- a/pkgs/development/tools/protoc-gen-grpc-web/default.nix +++ b/pkgs/development/tools/protoc-gen-grpc-web/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; doCheck = true; - checkInputs = [ protobuf ]; + nativeCheckInputs = [ protobuf ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/pkgs/development/tools/protoc-gen-twirp_php/default.nix index a54c860f2957..1fb1dbfbf791 100644 --- a/pkgs/development/tools/protoc-gen-twirp_php/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp_php/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-twirp_php"; - version = "0.8.1"; + version = "0.9.1"; # fetchFromGitHub currently not possible, because go.mod and go.sum are export-ignored src = fetchgit { url = "https://github.com/twirphp/twirp.git"; rev = "v${version}"; - sha256 = "sha256-5PACgKqc8rWqaA6Syj5NyxHm3827yd67tm0mwVSMnWQ="; + sha256 = "sha256-6tA+iNcs6s4vviWSJ5gCL9hPyCa7OvYXRCCokAAO0T8="; }; - vendorSha256 = "sha256-qQFlBviRISEnPBt0q5391RqUrPTI/QDxg3MNfwWE8MI="; + vendorSha256 = "sha256-Kz9tMM4XSMOUmlHb/BE5/C/ZohdE505DTeDj9lGki/I="; subPackages = [ "protoc-gen-twirp_php" ]; diff --git a/pkgs/development/tools/protoc-gen-validate/default.nix b/pkgs/development/tools/protoc-gen-validate/default.nix index b06f345d71f3..13b61e1d694d 100644 --- a/pkgs/development/tools/protoc-gen-validate/default.nix +++ b/pkgs/development/tools/protoc-gen-validate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-validate"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = "protoc-gen-validate"; rev = "v${version}"; - sha256 = "sha256-k8FUdQDgtR6g/LRCT45RYVUImEKCneQh9BG6P4y1SME="; + sha256 = "sha256-5Vr7qE6AFesvBkOpgStxI26m8rbQ8pXOXvNxbcX/ilc="; }; - vendorSha256 = "sha256-ZchgruaQOokgCh+6qkVr/d+PVflh/lKd10Ty+bMBEH0="; + vendorSha256 = "sha256-D8ITrzEwas/UElfsXBG2BfHGFcFsxzWFar2ehgLwy5U="; excludedPackages = [ "tests" ]; diff --git a/pkgs/development/tools/protoscope/default.nix b/pkgs/development/tools/protoscope/default.nix index 12c120196f23..70eeab5f1575 100644 --- a/pkgs/development/tools/protoscope/default.nix +++ b/pkgs/development/tools/protoscope/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoscope"; - version = "unstable-2022-10-04"; + version = "unstable-2022-11-09"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protoscope"; - rev = "8b1d63939ee1a5d922b38f3976e1e58cae525163"; - sha256 = "sha256-/vt02rvKVsryJZ+Bw4QLaGzDErGI04/4NUbSBkbbN3Y="; + rev = "8e7a6aafa2c9958527b1e0747e66e1bfff045819"; + hash = "sha256-+VIy+CD6bKJzwtpHXRr9MqmsPE2MJ1dRdtvSMUkCh5I="; }; - vendorSha256 = "sha256-mK8eGo6oembs4nofvROn4g0+oO5E5/zQrmPKMe3xXik="; + vendorHash = "sha256-mK8eGo6oembs4nofvROn4g0+oO5E5/zQrmPKMe3xXik="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index d60aa24f9c0a..6c6e88fc153d 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.124.0"; + version = "0.128.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-bNMUUohiMa/fSP1HjrB0UR3kWh+HNqqqpLcraw6UNjs="; + sha256 = "sha256-2EIaK7UyJH9YEKlOGnnKrq3ucVgEjbF2jVui0bASNcA="; }; - vendorSha256 = "sha256-cd4oAS81zUMImCkFsTIcgYJDB2pvMWYRnTPFkznSr+I="; + vendorHash = "sha256-uQ8/cNNFelG8zzrcEs9fEs8KkY6/odwOGmwMmyxUKS4="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/pulumictl/default.nix b/pkgs/development/tools/pulumictl/default.nix index e62442c05f0d..948115c332ed 100644 --- a/pkgs/development/tools/pulumictl/default.nix +++ b/pkgs/development/tools/pulumictl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pulumictl"; - version = "0.0.32"; + version = "0.0.41"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumictl"; rev = "v${version}"; - sha256 = "sha256-CZ0DnQUnyj8aoesFymc+Uhv+3vdQhdxb2YHElAyqGWE="; + sha256 = "sha256-6QBE6+wJ9MQXey9nXaJn69uVUhIVlWMdH9ROiMi7bZk="; }; - vendorSha256 = "sha256-xalfnLc6bPBvm2B42+FzpgrOH541HMWmNHChveI792s="; + vendorHash = "sha256-WzfTS68YIpoZYbm6i0USxXyEyR4px+hrNRbsCTXdJsk="; ldflags = [ "-s" "-w" "-X=github.com/pulumi/pulumictl/pkg/version.Version=${src.rev}" diff --git a/pkgs/development/tools/pur/default.nix b/pkgs/development/tools/pur/default.nix index d065b7b1351f..710dc9e71413 100644 --- a/pkgs/development/tools/pur/default.nix +++ b/pkgs/development/tools/pur/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { python3.pkgs.click ]; - checkInputs = [ + nativeCheckInputs = [ python3.pkgs.pytestCheckHook ]; diff --git a/pkgs/development/tools/purescript/spago/default.nix b/pkgs/development/tools/purescript/spago/default.nix index 51516ed5b256..8006147e2dd1 100644 --- a/pkgs/development/tools/purescript/spago/default.nix +++ b/pkgs/development/tools/purescript/spago/default.nix @@ -1,5 +1,4 @@ { haskell -, haskellPackages , lib # The following are only needed for the passthru.tests: @@ -12,14 +11,16 @@ let spago = - haskell.lib.compose.justStaticExecutables - (haskell.lib.compose.overrideCabal (oldAttrs: { - maintainers = (oldAttrs.maintainers or []) ++ [ - lib.maintainers.cdepillabout - ]; - changelog = - "https://github.com/purescript/spago/releases/tag/${oldAttrs.version}"; - }) haskellPackages.spago); + lib.pipe + haskell.packages.ghc90.spago + [ haskell.lib.compose.justStaticExecutables + (haskell.lib.compose.overrideCabal (oldAttrs: { + maintainers = (oldAttrs.maintainers or []) ++ [ lib.maintainers.cdepillabout ]; + changelog = "https://github.com/purescript/spago/releases/tag/${oldAttrs.version}"; + })) + haskell.lib.compose.unmarkBroken + haskell.lib.compose.doDistribute + ]; in spago.overrideAttrs (oldAttrs: { @@ -58,4 +59,3 @@ spago.overrideAttrs (oldAttrs: { ''; }; }) - diff --git a/pkgs/development/tools/pxview/default.nix b/pkgs/development/tools/pxview/default.nix index 20049215a70d..84bf11c44830 100644 --- a/pkgs/development/tools/pxview/default.nix +++ b/pkgs/development/tools/pxview/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Program to convert Paradox databases"; - homepage = "http://pxlib.sourceforge.net/pxview/"; + homepage = "https://pxlib.sourceforge.net/pxview/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.winpat ]; diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix index 0ade6d722d12..cc6212a5242e 100644 --- a/pkgs/development/tools/py-spy/default.nix +++ b/pkgs/development/tools/py-spy/default.nix @@ -1,16 +1,25 @@ -{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkg-config, libunwind, python3 }: +{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkg-config, libunwind, python3, runCommand, darwin }: rustPlatform.buildRustPackage rec { pname = "py-spy"; - version = "0.3.12"; + version = "0.3.14"; src = fetchFromGitHub { owner = "benfred"; repo = "py-spy"; rev = "v${version}"; - sha256 = "sha256-k58PPJAF9MsKRlscFSqdtTY5/rriaF0mXjgkADT+F4s="; + sha256 = "sha256-NciyzKiDKIMeuHhTjzmHIc3dYW4AniuCNjZugm4hMss="; }; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; + + buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # Pull a header that contains a definition of proc_pid_rusage(). + (runCommand "${pname}_headers" { } '' + install -Dm444 ${lib.getDev darwin.apple_sdk.sdk}/include/libproc.h $out/include/libproc.h + '') + ]; + NIX_CFLAGS_COMPILE = "-L${libunwind}/lib"; # error: linker `arm-linux-gnueabihf-gcc` not found @@ -18,9 +27,9 @@ rustPlatform.buildRustPackage rec { export RUSTFLAGS="-Clinker=$CC" ''; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; - cargoSha256 = "sha256-DC+EfJ671/bvFoHHjpJlFCO/phdndNcldnP3DsIKqAg="; + cargoSha256 = "sha256-nm+44YWSJOOg9a9d8b3APXW50ThV3iA2C/QsJMttscE="; meta = with lib; { description = "Sampling profiler for Python programs"; diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index cc1baad2bb0e..5072bb88f4b6 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -3,8 +3,6 @@ , withDocumentation ? false, withClangPlugins ? true }: -with lib; - let # Fetch clang from qt vendor, this contains submodules like this: # clang<-clang-tools-extra<-clazy. @@ -31,7 +29,7 @@ mkDerivation rec { }; buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative elfutils.dev ] ++ - optionals withClangPlugins [ llvmPackages_8.libclang + lib.optionals withClangPlugins [ llvmPackages_8.libclang clang_qt_vendor llvmPackages_8.llvm ]; @@ -47,9 +45,9 @@ mkDerivation rec { doCheck = true; - buildFlags = optional withDocumentation "docs"; + buildFlags = lib.optional withDocumentation "docs"; - installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs"; + installFlags = [ "INSTALL_ROOT=$(out)" ] ++ lib.optional withDocumentation "install_docs"; qtWrapperArgs = [ "--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin" ]; @@ -58,7 +56,7 @@ mkDerivation rec { --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' substituteInPlace src/libs/libs.pro \ --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' - '' + optionalString withClangPlugins '' + '' + lib.optionalString withClangPlugins '' # Fix paths for llvm/clang includes directories. substituteInPlace src/shared/clang/clang_defines.pri \ --replace '$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include)' '${clang_qt_vendor}/lib/clang/8.0.0/include' \ @@ -72,8 +70,8 @@ mkDerivation rec { --replace 'LLVM_CXXFLAGS ~= s,-gsplit-dwarf,' '${lib.concatStringsSep "\n" ["LLVM_CXXFLAGS ~= s,-gsplit-dwarf," " LLVM_CXXFLAGS += -fno-rtti"]}' ''; - preBuild = optionalString withDocumentation '' - ln -s ${getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share + preBuild = lib.optionalString withDocumentation '' + ln -s ${lib.getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share ''; postInstall = '' @@ -92,7 +90,7 @@ mkDerivation rec { ''; homepage = "https://wiki.qt.io/Category:Tools::QtCreator"; license = "LGPL"; - maintainers = [ maintainers.akaWolf ]; + maintainers = [ lib.maintainers.akaWolf ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/pkgs/development/tools/quick-lint-js/default.nix b/pkgs/development/tools/quick-lint-js/default.nix index 80adc6f30a75..aa3dd1ee8688 100644 --- a/pkgs/development/tools/quick-lint-js/default.nix +++ b/pkgs/development/tools/quick-lint-js/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "quick-lint-js"; - version = "2.9.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "quick-lint"; repo = "quick-lint-js"; rev = version; - sha256 = "sha256-hWwEaUf+TntRfxI3HjJV+hJ+dV6TRncxSCbaxE1sIjs="; + sha256 = "sha256-hpDVR58Qez+TcAO77GXvjuH7NfBxdRvIi8WsBIuz3nI="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index 31510c45d7f1..43eb79c0e1a4 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "railway"; - version = "2.0.13"; + version = "2.1.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-NYYzMwwRm49YPcXUeriYIXjjK4ZJbbtF9Otr3MWXsiY="; + sha256 = "sha256-JpIy8u6L7yOZgTFxFft+vhcat3uPT9EvOXAQOmrpvpc="; }; ldflags = [ "-s" "-w" ]; - vendorSha256 = "sha256-nLuomuAScodgLUKzMTiygtFBnNHrqAojOySZgKLVGJY="; + vendorHash = "sha256-nLuomuAScodgLUKzMTiygtFBnNHrqAojOySZgKLVGJY="; postInstall = '' mv $out/bin/cli $out/bin/railway diff --git a/pkgs/development/tools/rakkess/default.nix b/pkgs/development/tools/rakkess/default.nix index 1f85917bff5b..a340a042cc2b 100644 --- a/pkgs/development/tools/rakkess/default.nix +++ b/pkgs/development/tools/rakkess/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "rakkess"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "corneliusweig"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qDcSIpIS09OU2tYoBGq7BCXFkf9QWj07RvNKMjghrFU="; + sha256 = "sha256-igovWWk8GfNmOS/NbZWfv9kox6QLNIbM09jdvA/lL3A="; }; - vendorSha256 = "sha256-1/8it/djhDjbWqe36VefnRu9XuwAa/qKpZT6d2LGpJ0="; + vendorSha256 = "sha256-lVxJ4wFBhHc8JVpkmqphLYPE9Z8Cr6o+aAHvC1naqyE="; ldflags = [ "-s" "-w" "-X github.com/corneliusweig/rakkess/internal/version.version=v${version}" ]; diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index 967c5541991c..6909c59a92b3 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -1,5 +1,31 @@ -{ lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome, atk, at-spi2-atk, at-spi2-core -, gtk3, glib, freetype, dbus, nss, nspr, alsa-lib, cups, expat, udev, makeDesktopItem +{ lib +, stdenv +, fetchurl +, unzip +, cairo +, xorg +, gdk-pixbuf +, fontconfig +, pango +, gnome +, atk +, at-spi2-atk +, at-spi2-core +, gtk3 +, glib +, freetype +, dbus +, nss +, nspr +, alsa-lib +, cups +, expat +, udev +, makeDesktopItem +, libdrm +, libxkbcommon +, mesa +, makeWrapper }: let @@ -22,6 +48,9 @@ let udev at-spi2-atk at-spi2-core + libdrm + libxkbcommon + mesa xorg.libX11 xorg.libXcursor @@ -36,7 +65,8 @@ let xorg.libXrender xorg.libXScrnSaver ]; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "react-native-debugger"; version = "0.13.0"; src = fetchurl { @@ -44,7 +74,7 @@ in stdenv.mkDerivation rec { sha256 = "sha256-/uVXMVrVS7n4/mqz6IlKkk63hy67fn9KRjZ1wP5MHB0="; }; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; buildCommand = '' shopt -s extglob mkdir -p $out @@ -59,6 +89,9 @@ in stdenv.mkDerivation rec { --set-rpath ${rpath}:$out/lib \ $out/share/react-native-debugger + wrapProgram $out/share/react-native-debugger \ + --add-flags --no-sandbox + ln -s $out/share/react-native-debugger $out/bin/react-native-debugger install -Dm644 "${desktopItem}/share/applications/"* \ diff --git a/pkgs/development/tools/refinery-cli/default.nix b/pkgs/development/tools/refinery-cli/default.nix index 7ba4811433dd..42088011c969 100644 --- a/pkgs/development/tools/refinery-cli/default.nix +++ b/pkgs/development/tools/refinery-cli/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "refinery-cli"; - version = "0.8.6"; + version = "0.8.7"; src = fetchCrate { pname = "refinery_cli"; inherit version; - sha256 = "sha256-vT/iM+o9ZrotiBz6mq9IVVJAkK97QUlOiZp6tg3O8pI="; + sha256 = "sha256-M4Kq1Sy5kJayESv0hHIktCf1bQgNOEFQcjg4RCqFCK4="; }; - cargoSha256 = "sha256-DMQr0Qtr2c3BHWqTb+IW2cV1fwWIFMY5koR2GPceYHQ="; + cargoSha256 = "sha256-LObxOh2lOtSTm4gITTbQ2S9rMlyUOAAvMJmtvZy5bJs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/refurb/default.nix b/pkgs/development/tools/refurb/default.nix new file mode 100644 index 000000000000..d0b0000e59a4 --- /dev/null +++ b/pkgs/development/tools/refurb/default.nix @@ -0,0 +1,58 @@ +{ lib +, fetchFromGitHub +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "refurb"; + version = "1.10.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "dosisod"; + repo = "refurb"; + rev = "refs/tags/v${version}"; + hash = "sha256-wb9E1BX9gjejZ5nTudzEPP+suX2eG4MPT07651+OY88="; + }; + + nativeBuildInputs = with python3Packages; [ + poetry-core + ]; + + propagatedBuildInputs = with python3Packages; [ + mypy + mypy-extensions + tomli + typing-extensions + ]; + + nativeCheckInputs = with python3Packages; [ + attrs + click + colorama + iniconfig + mccabe + packaging + pathspec + platformdirs + pluggy + py + pyparsing + pytestCheckHook + ]; + + postPatch = '' + sed -i "/^addopts/d" pyproject.toml + ''; + + pythonImportsCheck = [ + "refurb" + ]; + + meta = with lib; { + description = "A tool for refurbishing and modernizing Python codebases"; + homepage = "https://github.com/dosisod/refurb"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ knl ]; + }; +} diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/development/tools/regclient/default.nix index fc98bff40f98..f03b522e70a2 100644 --- a/pkgs/development/tools/regclient/default.nix +++ b/pkgs/development/tools/regclient/default.nix @@ -33,7 +33,6 @@ buildGoModule rec { ); meta = with lib; { - broken = stdenv.isDarwin; description = "Docker and OCI Registry Client in Go and tooling using those libraries"; homepage = "https://github.com/regclient/regclient"; license = licenses.asl20; diff --git a/pkgs/development/tools/relic/default.nix b/pkgs/development/tools/relic/default.nix index 6fb5507b87d6..6652e5547f12 100644 --- a/pkgs/development/tools/relic/default.nix +++ b/pkgs/development/tools/relic/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "relic"; - version = "7.5.3"; + version = "7.5.4"; src = fetchFromGitHub { owner = "sassoftware"; repo = pname; rev = "v${version}"; - sha256 = "sha256-urueDWvHhDsIiLIAatAforBM//UEJz8wUHEVyhwV7JY="; + sha256 = "sha256-rm52XrN0554copqIllfaNC9EIZ+6rxVeZWTWR2y9X14="; }; - vendorSha256 = "sha256-wlylASK2RES0nbf6UZHJBrYQaz9jrq5j7/KF1wYOqE0="; + vendorHash = "sha256-389ki4hsx7l2gHSiOHledo/ZP+I3NAkk1K8anq2kfEE="; meta = with lib; { homepage = "https://github.com/sassoftware/relic"; diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/development/tools/renderdoc/default.nix similarity index 90% rename from pkgs/applications/graphics/renderdoc/default.nix rename to pkgs/development/tools/renderdoc/default.nix index 3068ecd4c5cf..d568743ec678 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/development/tools/renderdoc/default.nix @@ -32,19 +32,20 @@ let in mkDerivation rec { pname = "renderdoc"; - version = "1.22"; + version = "1.25"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "sha256-eqMIOb9XAgXtoCJABvZkkS/rhHK7jNqabIFwdCgcSJU="; + sha256 = "sha256-0+9fxNj0TZUQwOh9kww00/k/J8ciuWfYQS4e1aCcd7Y="; }; buildInputs = [ qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3 - ] # ++ (with python3Packages; [pyside2 pyside2-tools shiboken2]) - # TODO: figure out how to make cmake recognise pyside2 + ] ++ (with python3Packages; [ + pyside2 pyside2-tools shiboken2 + ]) ++ lib.optional waylandSupport wayland; nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ]; @@ -81,9 +82,7 @@ mkDerivation rec { addOpenGLRunpath $out/lib/librenderdoc.so ''; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "A single-frame graphics debugger"; diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix index ca01f6ebfa27..d0cb440ec400 100644 --- a/pkgs/development/tools/reno/default.nix +++ b/pkgs/development/tools/reno/default.nix @@ -21,7 +21,7 @@ with python3Packages; buildPythonApplication rec { setuptools # required for finding pkg_resources at runtime ]; - checkInputs = [ + nativeCheckInputs = [ # Python packages pytestCheckHook docutils diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index 6a92bd2fba28..d69773636650 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nexus"; - version = "3.37.3-02"; + version = "3.45.0-01"; src = fetchurl { url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; - sha256 = "sha256-wdtDGQjFp2tEAVxVXW70UXq/CoaET6/+4PXWxiNZMS0="; + hash = "sha256-ISTORslFPgFt0kEKK17fpBXi3yAMwgm6qDnk33V2wa0="; }; preferLocalBuild = true; diff --git a/pkgs/development/tools/reshape/Cargo.lock b/pkgs/development/tools/reshape/Cargo.lock new file mode 100644 index 000000000000..1fd0e6d02840 --- /dev/null +++ b/pkgs/development/tools/reshape/Cargo.lock @@ -0,0 +1,1080 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "any_ascii" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70033777eb8b5124a81a1889416543dddef2de240019b674c81285a2635a7e1e" + +[[package]] +name = "anyhow" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +dependencies = [ + "backtrace", +] + +[[package]] +name = "async-trait" +version = "0.1.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff18d764974428cf3a9328e23fc5c986f5fbed46e6cd4cdf42544df5d297ec1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" + +[[package]] +name = "cc" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "3.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +dependencies = [ + "atty", + "bitflags", + "clap_derive", + "clap_lex", + "indexmap", + "once_cell", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap_derive" +version = "3.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "colored" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +dependencies = [ + "atty", + "lazy_static", + "winapi", +] + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dotenv" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" + +[[package]] +name = "erased-serde" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ca605381c017ec7a5fef5e548f1cfaa419ed0f6df6367339300db74c92aa7d" +dependencies = [ + "serde", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "futures-channel" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" + +[[package]] +name = "futures-macro" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" + +[[package]] +name = "futures-task" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" + +[[package]] +name = "futures-util" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +dependencies = [ + "futures-core", + "futures-macro", + "futures-sink", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "ghost" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41973d4c45f7a35af8753ba3457cc99d406d863941fd7f52663cff54a5ab99b3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "gimli" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec" + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "inventory" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84344c6e0b90a9e2b6f3f9abe5cc74402684e348df7b32adca28747e0cef091a" +dependencies = [ + "ctor", + "ghost", +] + +[[package]] +name = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lexical-sort" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c09e4591611e231daf4d4c685a66cb0410cc1e502027a20ae55f2bb9e997207a" +dependencies = [ + "any_ascii", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys", +] + +[[package]] +name = "object" +version = "0.30.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "phf" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_shared" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "postgres" +version = "0.19.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960c214283ef8f0027974c03e9014517ced5db12f021a9abb66185a5751fab0a" +dependencies = [ + "bytes", + "fallible-iterator", + "futures-util", + "log", + "tokio", + "tokio-postgres", +] + +[[package]] +name = "postgres-protocol" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "878c6cbf956e03af9aa8204b407b9cbf47c072164800aa918c516cd4b056c50c" +dependencies = [ + "base64", + "byteorder", + "bytes", + "fallible-iterator", + "hmac", + "md-5", + "memchr", + "rand", + "sha2", + "stringprep", +] + +[[package]] +name = "postgres-types" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73d946ec7d256b04dfadc4e6a3292324e6f417124750fc5c0950f981b703a0f1" +dependencies = [ + "bytes", + "fallible-iterator", + "postgres-protocol", + "serde", + "serde_json", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "reshape" +version = "0.6.1" +dependencies = [ + "anyhow", + "clap", + "colored", + "dotenv", + "lexical-sort", + "postgres", + "rand", + "serde", + "serde_json", + "toml", + "typetag", + "version", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "stringprep" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio", + "pin-project-lite", + "socket2", + "windows-sys", +] + +[[package]] +name = "tokio-postgres" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29a12c1b3e0704ae7dfc25562629798b29c72e6b1d0a681b6f29ab4ae5e7f7bf" +dependencies = [ + "async-trait", + "byteorder", + "bytes", + "fallible-iterator", + "futures-channel", + "futures-util", + "log", + "parking_lot", + "percent-encoding", + "phf", + "pin-project-lite", + "postgres-protocol", + "postgres-types", + "socket2", + "tokio", + "tokio-util", +] + +[[package]] +name = "tokio-util" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "typetag" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4080564c5b2241b5bff53ab610082234e0c57b0417f4bd10596f183001505b8a" +dependencies = [ + "erased-serde", + "inventory", + "once_cell", + "serde", + "typetag-impl", +] + +[[package]] +name = "typetag-impl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e60147782cc30833c05fba3bab1d9b5771b2685a2557672ac96fa5d154099c0e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "version" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a449064fee414fcc201356a3e6c1510f6c8829ed28bb06b91c54ebe208ce065" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" diff --git a/pkgs/development/tools/reshape/default.nix b/pkgs/development/tools/reshape/default.nix new file mode 100644 index 000000000000..45e76ccaf6e5 --- /dev/null +++ b/pkgs/development/tools/reshape/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, fetchpatch +, git +, postgresqlTestHook +, postgresql +}: + +rustPlatform.buildRustPackage rec { + pname = "reshape"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "fabianlindfors"; + repo = pname; + rev = "v${version}"; + hash = "sha256-iX8qhDk0PP0AB3bJ6ck8AZ9SCErFH416ggAkgK8O900="; + }; + + nativeCheckInputs = [ + postgresqlTestHook + postgresql + ]; + + dontUseCargoParallelTests = true; + + postgresqlTestSetupPost = '' + export POSTGRES_CONNECTION_STRING="user=$PGUSER dbname=$PGDATABASE host=$PGHOST" + ''; + + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + + # upstream doesn't ship a Cargo.lock, is generated by the update script + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + cargoLock.lockFile = ./Cargo.lock; + + cargoHash = "sha256-UL/vP8055JRbbf5bqf0V3wGh+iF9ztVhyoMrtNs/c+4="; + + meta = with lib; { + description = "An easy-to-use, zero-downtime schema migration tool for Postgres"; + homepage = "https://github.com/fabianlindfors/reshape"; + license = licenses.mit; + maintainers = with maintainers; [ ilyakooo0 ]; + }; +} diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/development/tools/revive/default.nix index 8179f117fd43..9b75282fbf08 100644 --- a/pkgs/development/tools/revive/default.nix +++ b/pkgs/development/tools/revive/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "revive"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "mgechev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tD6Z7W/sPwHKqvCXjXLlxkGj3FZ4+QCv9vn7KdCmSv4="; + sha256 = "sha256-pWX3dZqZ9UZ/k8c1K0xAgonsxZVrutWJ1PROQusO9vQ="; # 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; @@ -18,7 +18,7 @@ buildGoModule rec { rm -rf $out/.git ''; }; - vendorSha256 = "sha256-sa4OkTSRyoPFXTGmjpiqBug+EKgxkcJrNxQwbTRfN2A="; + vendorHash = "sha256-IfayKnHCe1HHSi7YPNz8Wlz1TSAiVGs0rxpY9HYG3s8="; ldflags = [ "-s" @@ -35,7 +35,7 @@ buildGoModule rec { # The following tests fail when built by nix: # - # $ nix log /nix/store/build-revive.1.2.4.drv | grep FAIL + # $ nix log /nix/store/build-revive.1.2.5.drv | grep FAIL # # --- FAIL: TestAll (0.01s) # --- FAIL: TestTimeEqual (0.00s) diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix index ab2accb3012e..2e5400c1cdce 100644 --- a/pkgs/development/tools/rgp/default.nix +++ b/pkgs/development/tools/rgp/default.nix @@ -19,15 +19,15 @@ }: let - buildNum = "2022-08-01-115"; + buildNum = "2022-12-12-1037"; in stdenv.mkDerivation rec { pname = "rgp"; - version = "1.13.1"; + version = "1.14"; src = fetchurl { url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; - hash = "sha256-e88vk+ZtDPB/1HrDKXbzkDaMESNE+qIW7ERwrqe+ZN8="; + hash = "sha256-T13SOy+77lLxmlcczXEFZAnyx9Lm52G/WiCcC1Py4HA="; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix index 26393000cdd5..f8468d1f175b 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.10"; + version = "0.3.11"; src = fetchFromGitHub { owner = "kyoh86"; repo = "richgo"; rev = "v${version}"; - sha256 = "sha256-USHg1KXl0MOWifiVu+KdjvrbDlAh6T/ReKFKeIpVK0A="; + sha256 = "sha256-a8CxJKk9fKGYTDtY/mU/3gcdIeejg20sL8Tm4ozgDl4="; }; - vendorSha256 = "sha256-O63QEo0/+m9cYktMg4+RloLuUfAlCG0eGkxpHPFg/Cw="; + vendorSha256 = "sha256-j2RZOt5IRb2oEQ6sFu+nXpVkDsnppA6h9YT4F7AiCoY="; meta = with lib; { description = "Enrich `go test` outputs with text decorations"; diff --git a/pkgs/development/tools/riot-redis/default.nix b/pkgs/development/tools/riot-redis/default.nix index 945da3b0e310..55ac4e8399f8 100644 --- a/pkgs/development/tools/riot-redis/default.nix +++ b/pkgs/development/tools/riot-redis/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "riot-redis"; - version = "2.18.5"; + version = "2.19.0"; src = fetchzip { url = "https://github.com/redis-developer/riot/releases/download/v${version}/riot-redis-${version}.zip"; - sha256 = "sha256-XMcWNsQpFG1ovIIXGMURV5IVrL3+Aq2qls+r4IZbBl8="; + sha256 = "sha256-q2ZqFVdjg5HSH4kiwoC1W+a8VgHNxBgNeMaw5n97isc="; }; buildInputs = [ jre_headless ]; diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index d89c90aa88d2..21e77ce5f487 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -1,55 +1,63 @@ -{ stdenv, lib, fetchFromGitHub, writeScript, fetchpatch, cmake, rocm-runtime, python3, rocm-cmake, busybox, gnugrep +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-cmake +, rocm-runtime +, busybox +, python3 +, gnugrep # rocminfo requires that the calling user have a password and be in # the video group. If we let rocm_agent_enumerator rely upon # rocminfo's output, then it, too, has those requirements. Instead, # we can specify the GPU targets for this system (e.g. "gfx803" for # Polaris) such that no system call is needed for downstream # compilers to determine the desired target. -, defaultTargets ? []}: -stdenv.mkDerivation rec { - version = "5.3.1"; +, defaultTargets ? [] +}: + +stdenv.mkDerivation (finalAttrs: { + version = "5.4.2"; pname = "rocminfo"; + src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocminfo"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; sha256 = "sha256-4wZTm5AZgG8xEd6uYqxWq4bWZgcSYZ2WYA1z4RAPF8U="; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; - buildInputs = [ rocm-cmake rocm-runtime ]; - cmakeFlags = [ - "-DROCM_DIR=${rocm-runtime}" - "-DROCRTST_BLD_TYPE=Release" + nativeBuildInputs = [ + cmake + rocm-cmake ]; + buildInputs = [ rocm-runtime ]; + propagatedBuildInputs = [ python3 ]; + cmakeFlags = [ "-DROCRTST_BLD_TYPE=Release" ]; + prePatch = '' - sed 's,#!/usr/bin/env python3,#!${python3}/bin/python,' -i rocm_agent_enumerator + patchShebangs rocm_agent_enumerator sed 's,lsmod | grep ,${busybox}/bin/lsmod | ${gnugrep}/bin/grep ,' -i rocminfo.cc ''; - installPhase = '' - mkdir -p $out/bin - cp rocminfo $out/bin - cp rocm_agent_enumerator $out/bin - '' + lib.optionalString (defaultTargets != []) '' + postInstall = lib.optionalString (defaultTargets != [ ]) '' echo '${lib.concatStringsSep "\n" defaultTargets}' > $out/bin/target.lst ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocminfo/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" - update-source-version rocminfo "$version" - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { description = "ROCm Application for Reporting System Info"; homepage = "https://github.com/RadeonOpenCompute/rocminfo"; license = licenses.ncsa; - maintainers = with maintainers; [ lovesegfault Flakebi ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = stdenv.isAarch64; + broken = stdenv.isAarch64 || versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; -} +}) diff --git a/pkgs/development/tools/rojo/default.nix b/pkgs/development/tools/rojo/default.nix index 3a2645e788ef..c15cb643c6ee 100644 --- a/pkgs/development/tools/rojo/default.nix +++ b/pkgs/development/tools/rojo/default.nix @@ -4,8 +4,12 @@ , rustPlatform , pkg-config , openssl +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) CoreServices; +in rustPlatform.buildRustPackage rec { pname = "rojo"; version = "7.2.1"; @@ -26,8 +30,13 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices ]; + # tests flaky on darwin on hydra + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "Project management tool for Roblox"; longDescription = '' diff --git a/pkgs/development/tools/roswell/default.nix b/pkgs/development/tools/roswell/default.nix index 50f074a266d5..2d1b2ffa0810 100644 --- a/pkgs/development/tools/roswell/default.nix +++ b/pkgs/development/tools/roswell/default.nix @@ -1,14 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, curl, autoconf, automake, makeWrapper, sbcl }: +{ lib +, stdenv +, fetchFromGitHub +, curl +, autoconf +, automake +, makeWrapper +, sbcl +}: stdenv.mkDerivation rec { pname = "roswell"; - version = "21.10.14.111"; + version = "22.12.14.113"; src = fetchFromGitHub { owner = "roswell"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K4RDNTY8g6MNjjiwXMmYaZm0fChJ1C1eTpc0h7ja1ds="; + hash = "sha256-tNOkZcdjwvrsleWMtcQ76KMBnssnuYQU3gqXnBVPN6w="; }; patches = [ @@ -31,16 +39,24 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ sbcl ]} --argv0 ros ''; - nativeBuildInputs = [ autoconf automake makeWrapper ]; + nativeBuildInputs = [ + autoconf + automake + makeWrapper + ]; - buildInputs = [ sbcl curl ]; + buildInputs = [ + sbcl + curl + ]; meta = with lib; { - description = "Roswell is a Lisp implementation installer/manager, launcher, and much more"; + description = "Lisp implementation installer/manager and launcher"; license = licenses.mit; maintainers = with maintainers; [ hiro98 ]; platforms = platforms.unix; homepage = "https://github.com/roswell/roswell"; + changelog = "https://github.com/roswell/roswell/blob/v${version}/ChangeLog"; mainProgram = "ros"; }; } diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index dcf13834a51f..ba799c7267ba 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -1,29 +1,42 @@ { lib , rustPlatform , fetchFromGitHub +, installShellFiles , stdenv -, CoreServices -, Security +, darwin }: rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.132"; + version = "0.0.241"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0UcZBGD1l2hP8VH0tdNKY/SiXVTPLL0/eZpOwYnUgPs="; + sha256 = "sha256-yrwrkU19LBM3gac70Y1UamZTdamuJdrMX4U88zGgJJs="; }; - cargoSha256 = "sha256-DlSSzFf2AludfAKrXSsI/V0K2ZjCy/ehZd3ULe3fjK4="; + cargoSha256 = "sha256-RzGYh0zspP+sG7k+XwDy9kaTIGIEoOEV3ZoqVf0X0GA="; + + nativeBuildInputs = [ + installShellFiles + ]; buildInputs = lib.optionals stdenv.isDarwin [ - CoreServices - Security + darwin.apple_sdk.frameworks.CoreServices ]; + # building tests fails with `undefined symbols` + doCheck = false; + + postInstall = '' + installShellCompletion --cmd ruff \ + --bash <($out/bin/ruff generate-shell-completion bash) \ + --fish <($out/bin/ruff generate-shell-completion fish) \ + --zsh <($out/bin/ruff generate-shell-completion zsh) + ''; + meta = with lib; { description = "An extremely fast Python linter"; homepage = "https://github.com/charliermarsh/ruff"; diff --git a/pkgs/development/tools/run/default.nix b/pkgs/development/tools/run/default.nix index 89ccdaf7ec79..c6ee65d79cd1 100644 --- a/pkgs/development/tools/run/default.nix +++ b/pkgs/development/tools/run/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "run"; - version = "0.9.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "TekWizely"; repo = "run"; rev = "v${version}"; - sha256 = "sha256-ClSB+v153Tj1cKLSmT9Z0IEyc+OABPeG519PzT03pX0="; + sha256 = "sha256-EIzIkew1JXPeUN3guLEjAwR0kBDrMkQtSUiBJd+Ww7E="; }; - vendorSha256 = "sha256-4n8RRnDNu1Khv3V5eUB/eaFFJGVD/GdqMOywksc2LPw="; + vendorHash = "sha256-BAyhuE9hGGDfDGmXQ7dseUvHlK5vC87uLT78lHSvLeg="; doCheck = false; diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 444db1173225..cc2cb444a5d7 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -17,19 +17,19 @@ let passthru.tests = { simple-c = runCommandCC "simple-c-bindgen-tests" { } '' echo '#include ' > a.c - ${self}/bin/bindgen a.c --whitelist-function atoi | tee output + ${self}/bin/bindgen a.c --allowlist-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 + ${self}/bin/bindgen a.cpp --allowlist-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 + ${self}/bin/bindgen a.c --allowlist-function compress | tee output grep compress output touch $out ''; diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index 3a4cd640d958..f9e8038b6b32 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -7,15 +7,15 @@ let rustfmt-nightly = rustfmt.override { asNightly = true; }; in rustPlatform.buildRustPackage rec { pname = "rust-bindgen-unwrapped"; - version = "0.61.0"; + version = "0.63.0"; src = fetchCrate { pname = "bindgen-cli"; inherit version; - sha256 = "sha256-sKcKIAkUC2GfAZ4tJBNweXhoFzqO95iCpHgekpOyHzc="; + sha256 = "sha256-qynsHbcljbJyi4wq9AxEE7KIclnDqNTMFAW366JhBSo="; }; - cargoSha256 = "sha256-P246tw5Kznpxav0LashIkLlmQGVB+aKbFUQQdmcASPw="; + cargoSha256 = "sha256-nOPJo6vWMAcG9VG03uceYyLiJfomFERViDCZ0vFnenY="; buildInputs = [ clang.cc.lib ]; @@ -24,7 +24,7 @@ in rustPlatform.buildRustPackage rec { ''; doCheck = true; - checkInputs = [ clang ]; + nativeCheckInputs = [ clang ]; RUSTFMT = "${rustfmt-nightly}/bin/rustfmt"; diff --git a/pkgs/development/tools/rust/cargo-about/default.nix b/pkgs/development/tools/rust/cargo-about/default.nix index 4229f762bbcf..b3b49da4a48a 100644 --- a/pkgs/development/tools/rust/cargo-about/default.nix +++ b/pkgs/development/tools/rust/cargo-about/default.nix @@ -9,24 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.5.1"; + version = "0.5.4"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-T8Hhody0jMmZb6/xMkSvKCv4STZPbcrf/UB3APspYDM="; + sha256 = "sha256-zr9Y07VoW8XQELzw7C1QT8Ared8ntH9yjncZqZJ1uj4="; }; - cargoPatches = [ - # update mimalloc to fix build with older apple sdks - ./update-mimalloc.patch - - # enable pkg-config feature of zstd - ./zstd-pkg-config.patch - ]; - - cargoSha256 = "sha256-2Reqj+WP6OoaB/3Z5llZP4c5ToVmMNX0Fe0IqDwcg2E="; + cargoSha256 = "sha256-L01NvZbJggOMcoBLXZw8peiCQxA1DPqnrZVx2pMb40o="; nativeBuildInputs = [ pkg-config ]; @@ -34,6 +26,8 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; + ZSTD_SYS_USE_PKG_CONFIG = true; + meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; homepage = "https://github.com/EmbarkStudios/cargo-about"; diff --git a/pkgs/development/tools/rust/cargo-about/update-mimalloc.patch b/pkgs/development/tools/rust/cargo-about/update-mimalloc.patch deleted file mode 100644 index 2d467fb811c2..000000000000 --- a/pkgs/development/tools/rust/cargo-about/update-mimalloc.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -829,9 +829,9 @@ checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" - - [[package]] - name = "libmimalloc-sys" --version = "0.1.24" -+version = "0.1.26" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7705fc40f6ed493f73584abbb324e74f96b358ff60dfe5659a0f8fc12c590a69" -+checksum = "8fc093ab289b0bfda3aa1bdfab9c9542be29c7ef385cfcbe77f8c9813588eb48" - dependencies = [ - "cc", - ] -@@ -884,9 +884,9 @@ dependencies = [ - - [[package]] - name = "mimalloc" --version = "0.1.28" -+version = "0.1.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b0dfa131390c2f6bdb3242f65ff271fcdaca5ff7b6c08f28398be7f2280e3926" -+checksum = "76ce6a4b40d3bff9eb3ce9881ca0737a85072f9f975886082640cd46a75cdb35" - dependencies = [ - "libmimalloc-sys", - ] diff --git a/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch b/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch deleted file mode 100644 index e084538ca924..000000000000 --- a/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -183,6 +183,7 @@ dependencies = [ - "toml_edit", - "twox-hash", - "url", -+ "zstd", - ] - - [[package]] -@@ -1039,6 +1040,12 @@ version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -+[[package]] -+name = "pkg-config" -+version = "0.3.22" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" -+ - [[package]] - name = "ppv-lite86" - version = "0.2.15" -@@ -1902,4 +1909,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7" - dependencies = [ - "cc", - "libc", -+ "pkg-config", - ] -diff --git a/Cargo.toml b/Cargo.toml -index bf2a896..35cbf7c 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -80,3 +80,5 @@ toml_edit = "0.9" - twox-hash = "1.6" - # Url parsing - url = "2.2" -+ -+zstd = { version = "*", features = ["pkg-config"] } diff --git a/pkgs/development/tools/rust/cargo-apk/default.nix b/pkgs/development/tools/rust/cargo-apk/default.nix new file mode 100644 index 000000000000..6bb05552e079 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-apk/default.nix @@ -0,0 +1,24 @@ +{ lib +, stdenv +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-apk"; + version = "0.9.6"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-1vCrM+0SNefd7FrRXnSjLhM3/MSVJfcL4k1qAstX+/A="; + }; + + cargoSha256 = "sha256-rGn3MKbqIRWayarsgedIOhuTTl8lyRsRxn7BN5Id97w="; + + meta = with lib; { + description = "Tool for creating Android packages"; + homepage = "https://github.com/rust-windowing/android-ndk-rs"; + license = with licenses;[ mit asl20 ]; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-auditable/default.nix b/pkgs/development/tools/rust/cargo-auditable/default.nix deleted file mode 100644 index 6eec582e212b..000000000000 --- a/pkgs/development/tools/rust/cargo-auditable/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-auditable"; - version = "0.5.4"; - - src = fetchFromGitHub { - owner = "rust-secure-code"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-udn/Z+raf/fkJ5M/FSH9Au+J9ASu0rz6ZJSl8P+jLT4="; - }; - - cargoSha256 = "sha256-k3wWdlLYGZZ44IHatXWq8TK2xCia3YES2jX286QkNH0="; - - meta = with lib; { - description = "A tool to make production Rust binaries auditable"; - homepage = "https://github.com/rust-secure-code/cargo-auditable"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix b/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix index 6aea40cf0e73..563a8cceccd2 100644 --- a/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix +++ b/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , rustPlatform , pkg-config , openssl @@ -12,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bisect-rustc"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "rust-lang"; repo = pname; rev = "v${version}"; - hash = "sha256-dJpdAg+A7TYm6bGq73aA15hIymbJ56ScyygQLiEboak="; + hash = "sha256-E9birF4HmyDZKmwuTb5K4AMmvZQFTmnhFGSxD5bS2qQ="; }; patches = @@ -37,7 +38,13 @@ rustPlatform.buildRustPackage rec { --subst-var libPath ''; in - lib.optionals stdenv.isLinux [ patchelfPatch ]; + lib.optionals stdenv.isLinux [ patchelfPatch ] ++ [ + (fetchpatch { + name = "fix-cli-date-bounds-checking.patch"; + url = "https://github.com/rust-lang/cargo-bisect-rustc/commit/baffa98e1a1ae53f6f3605303e0d765015d9d3ae.patch"; + hash = "sha256-IQlwQvaPUzPK5T4Mbsrdt7Ea3elaPCw2pBCCdBhjtzM="; + }) + ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ @@ -46,16 +53,15 @@ rustPlatform.buildRustPackage rec { Security ]; - cargoHash = "sha256-Y/CQcIgdG8dCvPF5bmJDySmgzRi6lFU/aJxkyUjYlAM="; + cargoHash = "sha256-7tqo8cxAzoDfTU372uW1qUhm+qqyRhz8bQ7oMiRU528="; checkFlags = [ - "--skip cli_tests" # https://github.com/rust-lang/cargo-bisect-rustc/issues/226 "--skip test_github" # requires internet ]; meta = with lib; { description = "Bisects rustc, either nightlies or CI artifacts"; - homepage = "https://github.com/rust-lang/${pname}"; + homepage = "https://github.com/rust-lang/cargo-bisect-rustc"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ davidtwco ]; }; diff --git a/pkgs/development/tools/rust/cargo-bolero/Cargo.lock b/pkgs/development/tools/rust/cargo-bolero/Cargo.lock deleted file mode 100644 index a16bfbe9c23d..000000000000 --- a/pkgs/development/tools/rust/cargo-bolero/Cargo.lock +++ /dev/null @@ -1,751 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anyhow" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "bit-set" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bolero" -version = "0.6.2" -dependencies = [ - "bolero-afl", - "bolero-engine", - "bolero-generator", - "bolero-honggfuzz", - "bolero-libfuzzer", - "cfg-if 1.0.0", - "libtest-mimic", - "rand", -] - -[[package]] -name = "bolero-afl" -version = "0.6.2" -dependencies = [ - "bolero-engine", - "cc", -] - -[[package]] -name = "bolero-engine" -version = "0.6.2" -dependencies = [ - "anyhow", - "backtrace", - "bolero-generator", - "lazy_static", - "pretty-hex", - "rand", -] - -[[package]] -name = "bolero-generator" -version = "0.6.2" -dependencies = [ - "bolero-generator-derive", - "byteorder", - "either", - "rand", - "rand_core", -] - -[[package]] -name = "bolero-generator-derive" -version = "0.6.2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "bolero-honggfuzz" -version = "0.6.2" -dependencies = [ - "bolero-engine", -] - -[[package]] -name = "bolero-libfuzzer" -version = "0.6.2" -dependencies = [ - "bolero-engine", - "cc", -] - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "cargo-bolero" -version = "0.6.2" -dependencies = [ - "anyhow", - "bit-set", - "bolero", - "bolero-afl", - "bolero-honggfuzz", - "humantime", - "rustc_version", - "serde", - "serde_json", - "structopt", - "tempfile", -] - -[[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 = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.8", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch", - "crossbeam-utils 0.8.8", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" -dependencies = [ - "autocfg", - "cfg-if 1.0.0", - "crossbeam-utils 0.8.8", - "lazy_static", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" -dependencies = [ - "cfg-if 1.0.0", - "lazy_static", -] - -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - -[[package]] -name = "fastrand" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" -dependencies = [ - "instant", -] - -[[package]] -name = "getrandom" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[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 = "itoa" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" - -[[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.125" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" - -[[package]] -name = "libtest-mimic" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a7b8ac1f53f7be8d895ce6f7f534e49581c85c499b47429634b2cb2995e2ae" -dependencies = [ - "crossbeam-channel 0.4.4", - "rayon", - "structopt", - "termcolor", -] - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" -dependencies = [ - "adler", -] - -[[package]] -name = "num_cpus" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "object" -version = "0.28.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" -dependencies = [ - "memchr", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" - -[[package]] -name = "pretty-hex" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quote" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rayon" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221" -dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4" -dependencies = [ - "crossbeam-channel 0.5.4", - "crossbeam-deque", - "crossbeam-utils 0.8.8", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" -dependencies = [ - "bitflags", -] - -[[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 = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "ryu" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "semver" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd" - -[[package]] -name = "serde" -version = "1.0.137" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.137" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "structopt" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -dependencies = [ - "clap", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "syn" -version = "1.0.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04066589568b72ec65f42d65a1a52436e954b168773148893c020269563decf2" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -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 = "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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -[[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" diff --git a/pkgs/development/tools/rust/cargo-bolero/default.nix b/pkgs/development/tools/rust/cargo-bolero/default.nix index 5940459a5ebf..37f22bb925ce 100644 --- a/pkgs/development/tools/rust/cargo-bolero/default.nix +++ b/pkgs/development/tools/rust/cargo-bolero/default.nix @@ -1,25 +1,22 @@ -{ lib, fetchFromGitHub, rustPlatform, stdenv, libbfd, libopcodes, libunwind }: +{ lib, rustPlatform, fetchCrate, libbfd, libopcodes, libunwind }: rustPlatform.buildRustPackage rec { pname = "cargo-bolero"; - version = "0.6.2"; + version = "0.8.0"; - src = fetchFromGitHub { - owner = "camshaft"; - repo = "bolero"; - rev = "${pname}-v${version}"; - sha256 = "1p8g8av0l1qsmq09m0nwyyryk1v5bbah5izl4hf80ivi41mywkyi"; + src = fetchCrate { + inherit pname version; + sha256 = "sha256-j6fWCIXfVS5b3NZizhg9pI+kJkWlR1eGUSW9hJO1/mQ="; }; - cargoLock.lockFile = ./Cargo.lock; - postPatch = "cp ${./Cargo.lock} Cargo.lock"; + cargoSha256 = "sha256-ycvGw99CcE29axG9UWD0lkQp5kxD6Eguco5Fh9Vfj6E="; buildInputs = [ libbfd libopcodes libunwind ]; meta = with lib; { description = "Fuzzing and property testing front-end framework for Rust"; - homepage = "https://github.com/camshaft/cargo-bolero"; + homepage = "https://github.com/camshaft/bolero"; license = with licenses; [ mit ]; - maintainers = [ maintainers.ekleog ]; + maintainers = with maintainers; [ ekleog ]; }; } diff --git a/pkgs/development/tools/rust/cargo-careful/default.nix b/pkgs/development/tools/rust/cargo-careful/default.nix new file mode 100644 index 000000000000..ae3e0f163153 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-careful/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-careful"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "RalfJung"; + repo = "cargo-careful"; + rev = "v${version}"; + hash = "sha256-kKF/Fp6RCF9PUdgqeo2e4vLVhl8+5M4oa0Q18ZdXJRc="; + }; + + cargoHash = "sha256-rhTi4rHfU+ZgNAMXSX7r5k3NfMUPNjHIUDs6FzeqcWk="; + + meta = with lib; { + description = "A tool to execute Rust code carefully, with extra checking along the way"; + homepage = "https://github.com/RalfJung/cargo-careful"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-chef/default.nix b/pkgs/development/tools/rust/cargo-chef/default.nix new file mode 100644 index 000000000000..7ad698530ec4 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-chef/default.nix @@ -0,0 +1,20 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-chef"; + version = "0.1.51"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-K9oryItevSABbklaX5KKvKHuebFX8B0AgnizlpDhM5o="; + }; + + cargoHash = "sha256-KRhgYN8YMfotjkWAYP9RITbH9hudkakpWk53YZe9+Ks="; + + meta = with lib; { + description = "A cargo-subcommand to speed up Rust Docker builds using Docker layer caching"; + homepage = "https://github.com/LukeMathWalker/cargo-chef"; + license = licenses.mit; + maintainers = with maintainers; [ kkharji ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 5a47ce48268e..55658c55448b 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration Security CoreFoundation libiconv curl ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; meta = with lib; { description = "A cryptographically verifiable code review system for the cargo (Rust) package manager"; diff --git a/pkgs/development/tools/rust/cargo-cross/default.nix b/pkgs/development/tools/rust/cargo-cross/default.nix index 7428e84faef9..5e1b4c2a148b 100644 --- a/pkgs/development/tools/rust/cargo-cross/default.nix +++ b/pkgs/development/tools/rust/cargo-cross/default.nix @@ -27,9 +27,7 @@ rustPlatform.buildRustPackage rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix new file mode 100644 index 000000000000..e004ea9a6e62 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, Security +, SystemConfiguration +, CoreFoundation +, curl +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-cyclonedx"; + version = "0.3.7"; + + src = fetchFromGitHub { + owner = "CycloneDX"; + repo = "cyclonedx-rust-cargo"; + rev = "${pname}-${version}"; + hash = "sha256-xr3YNjQp+XhIWIqJ1rPUyM9mbtWGExlFEj28/SB8vfE="; + }; + + cargoHash = "sha256-NsBY+wb4IAlKOMh5BMvT734z//Wp/s0zimm04v8pqyc="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + SystemConfiguration + CoreFoundation + curl + ]; + + meta = with lib; { + description = "Creates CycloneDX Software Bill of Materials (SBOM) from Rust (Cargo) projects"; + longDescription = '' + The CycloneDX module for Rust (Cargo) creates a valid CycloneDX Software + Bill-of-Material (SBOM) containing an aggregate of all project + dependencies. CycloneDX is a lightweight SBOM specification that is + easily created, human and machine readable, and simple to parse. + ''; + homepage = "https://github.com/CycloneDX/cyclonedx-rust-cargo"; + license = licenses.asl20; + maintainers = with maintainers; [ nikstur ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/development/tools/rust/cargo-deb/default.nix index 2eb2ddd2d984..0472dd8dfa69 100644 --- a/pkgs/development/tools/rust/cargo-deb/default.nix +++ b/pkgs/development/tools/rust/cargo-deb/default.nix @@ -1,49 +1,41 @@ -{ stdenv -, lib -, fetchFromGitHub +{ lib , rustPlatform -, rust -, libiconv -, Security +, fetchFromGitHub +, makeWrapper +, dpkg }: rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "1.30.0"; + version = "1.42.0"; src = fetchFromGitHub { - owner = "mmstick"; + owner = "kornelski"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rAmG6Aj0D9dHVueh1BN1Chhit+XFhqGib1WTvMDy0LI="; + hash = "sha256-5IWx9tScm64Rwi6RMsbXl1Eajtc/c5PWaZEDrgibTAY="; }; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + cargoHash = "sha256-nwCfUxIrr4DxKqePu/vwxfLld08+GGXZwQWz6Gltmao="; - cargoSha256 = "sha256-MEpyEdjLWNZvqE7gJLvQ169tgmJRzec4vqQI9fF3xr8="; + nativeBuildInputs = [ + makeWrapper + ]; - preCheck = '' - substituteInPlace tests/command.rs \ - --replace 'target/debug' "target/${rust.toRustTarget stdenv.buildPlatform}/release" + # This is an FHS specific assert depending on glibc location + checkFlags = [ + "--skip=dependencies::resolve_test" + ]; - # This is an FHS specific assert depending on glibc location - substituteInPlace src/dependencies.rs \ - --replace 'assert!(deps.iter().any(|d| d.starts_with("libc")));' '// no libc assert here' + postInstall = '' + wrapProgram $out/bin/cargo-deb \ + --prefix PATH : ${lib.makeBinPath [ dpkg ]} ''; meta = with lib; { - description = "Generate Debian packages from information in Cargo.toml"; - homepage = "https://github.com/mmstick/cargo-deb"; + description = "A cargo subcommand that generates Debian packages from information in Cargo.toml"; + homepage = "https://github.com/kornelski/cargo-deb"; license = licenses.mit; - # test failures: - # control::tests::generate_scripts_generates_maintainer_scripts_for_unit - # dh_installsystemd::tests::find_units_in_empty_dir_finds_nothing - # dh_lib::tests::apply_with_no_matching_files - # dh_lib::tests::debhelper_script_subst_with_generated_file_only - # dh_lib::tests::debhelper_script_subst_with_no_matching_files - # dh_lib::tests::pkgfile_finds_most_specific_match_without_pkg_file - # dh_lib::tests::pkgfile_finds_most_specific_match_without_unit_file - broken = (stdenv.isDarwin && stdenv.isx86_64); maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 3d4b82b8edee..531772889558 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.13.5"; + version = "0.13.7"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-fwuAUsqVEL9MCjNoUBPQI78u+c289cbNCB4Kh8VM/vo="; + sha256 = "sha256-E9tFzac6WkEGfsXj1nykQAR20+5Pi5xMd82MeDed9qg="; }; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-hnD/xZtQRVABTtdxqNcJYIsGuklNT8dxr5wpAlP/Qqs="; + cargoSha256 = "sha256-E3Gg7PwBNVkvX2vqtbCxz0kbe1ZWrcAWxj6OJtENBe0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-depgraph/default.nix b/pkgs/development/tools/rust/cargo-depgraph/default.nix index d80c2903ad84..3928952ba452 100644 --- a/pkgs/development/tools/rust/cargo-depgraph/default.nix +++ b/pkgs/development/tools/rust/cargo-depgraph/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-depgraph"; - version = "1.3.0"; + version = "1.4.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-mlbS9EI/ltxnWfpci9hK9QwYpA/nII+wc2IRSHrmNGI="; + sha256 = "sha256-D8g6xsmYvN1IWUFpkpo4/OKT70WqCCkRqcGFBOE8uXA="; }; - cargoSha256 = "sha256-9CKFZmkFiip6iQVkBmy/XoMEoyMhlKNRyI8oDHaAILc="; + cargoSha256 = "sha256-qpd/uvnQzrPc+dbBloxyYNCEjaRWlTicgNC8Z9Z0t88="; meta = with lib; { description = "Create dependency graphs for cargo projects using `cargo metadata` and graphviz"; diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index 11886b06d257..12d034023021 100644 --- a/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.11.6"; + version = "0.11.8"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-EGClr2HQ11bX6WTvu9ZxPo4hA0Q5Sl9t0Gw8/SltxDI="; + hash = "sha256-v6EhYfdub4zuWX5oPzNWpqEgv0qoZujt00SCP+RoKfU="; }; - cargoSha256 = "sha256-Ph6W2RyNjVfnkon4YyAi4VvQWt/McKelUzlRD15Yysk="; + cargoSha256 = "sha256-R7FFWVOpzQ/u/KVnJQuYwLmmqei2ZymP610XrA5HZr0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix index 03eecf8a31ba..94ee2371ce9f 100644 --- a/pkgs/development/tools/rust/cargo-embed/default.nix +++ b/pkgs/development/tools/rust/cargo-embed/default.nix @@ -1,28 +1,27 @@ { lib , stdenv , rustPlatform -, fetchFromGitHub +, fetchCrate , libusb1 , libftdi1 , pkg-config -, rustfmt +, DarwinTools , AppKit }: rustPlatform.buildRustPackage rec { pname = "cargo-embed"; - version = "0.13.0"; + version = "0.16.0"; - src = fetchFromGitHub { - owner = "probe-rs"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-UlQ7KJmzPWu0vVsYPIkYeqkFFhxe7mEMfUVN7iMaUw0="; + src = fetchCrate { + inherit pname version; + sha256 = "sha256-YAeE3pDw5xqSn4rAv3lxJtKQHki1bf97CJHBEK8JoiA="; }; - cargoSha256 = "sha256-RkYX5z764Kkr0xK7yYQ0lCw0/7KpmdJmKWqLzwkj4hs="; + cargoSha256 = "sha256-p6d8vdiAVkufTQv3FliKCBgF5ZXM24UnG96EzlpyfZE="; + + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - nativeBuildInputs = [ pkg-config rustfmt ]; buildInputs = [ libusb1 libftdi1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; buildFeatures = [ "ftdi" ]; @@ -30,7 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A cargo extension for working with microcontrollers"; homepage = "https://probe.rs/"; - changelog = "https://github.com/probe-rs/cargo-embed/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/cargo-embed/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ fooker newam ]; }; diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 07fb95f8729c..3798c766d200 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,30 +1,26 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub -, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.35"; + version = "1.0.39"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-hJb4FLL3+AMNLL05eQc7Mkhp0KEGxmHg8/ETDoZiLV4="; + sha256 = "sha256-wJyCRg6qvkjjaFuFK6hTqt3u7ugFKAc9K4M/BojND6o="; }; - cargoSha256 = "sha256-wKVlmO2/ugAb7vUSIGMz0WGnjEVEsm459DV9FaM28Mk="; - - buildInputs = lib.optional stdenv.isDarwin libiconv; + cargoHash = "sha256-n4fraxlMtkVNNmteVBoS6BlS0qE6bpFL/fKRp2pjxIs="; meta = with lib; { - description = - "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; + description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; homepage = "https://github.com/dtolnay/cargo-expand"; + changelog = "https://github.com/dtolnay/cargo-expand/releases/tag/${version}"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ xrelkd ]; + maintainers = with maintainers; [ figsoda xrelkd ]; }; } diff --git a/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/pkgs/development/tools/rust/cargo-flamegraph/default.nix index e3bbb29164f1..1932590162b8 100644 --- a/pkgs/development/tools/rust/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/rust/cargo-flamegraph/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-flamegraph"; - version = "0.5.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "flamegraph-rs"; repo = "flamegraph"; rev = "v${version}"; - sha256 = "sha256-Q930PIGncUX2Wz3hA1OQu0TEPMfOu2jMpBPbaAVlUMU="; + sha256 = "sha256-LYoyMEALxeUQQI2pBL1u0Q9rrwyy6N6Dg5bNxhJiVrM="; }; - cargoSha256 = "sha256-ENL1FeIn9HESyp1VhePr4q7BLCc0SS8NAuHKv1crJE8="; + cargoSha256 = "sha256-t8+bjTRQMuXTYhgW1NuC3MXsRh2SMeycyyq4x1nb9MU="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ @@ -27,13 +27,11 @@ rustPlatform.buildRustPackage rec { --set-default PERF ${perf}/bin/perf ''; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Easy flamegraphs for Rust projects and everything else, without Perl or pipes <3"; - homepage = "https://github.com/ferrous-systems/flamegraph"; + homepage = "https://github.com/flamegraph-rs/flamegraph"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ killercup ]; }; diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix index 537392a65bbe..3fd76ed2bc86 100644 --- a/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/pkgs/development/tools/rust/cargo-flash/default.nix @@ -1,33 +1,31 @@ { lib , stdenv , rustPlatform -, fetchFromGitHub +, fetchCrate , libusb1 , pkg-config -, rustfmt +, DarwinTools , AppKit }: rustPlatform.buildRustPackage rec { pname = "cargo-flash"; - version = "0.13.0"; + version = "0.16.0"; - src = fetchFromGitHub { - owner = "probe-rs"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-O6T1Wul0nJaTVp9MEOj9FT+FUt4oYfqR5pGFaAxuK30="; + src = fetchCrate { + inherit pname version; + sha256 = "sha256-Zwb9jUZwkvuBzvACMwKwpAHEMkjLVDkXfDLo4ntG3+k="; }; - cargoSha256 = "sha256-E2gBkr50hjkzY+ZVgMm7tpdwr9yuyFh65Ht6FAPvxYg="; + cargoSha256 = "sha256-giGSTMtGTIw4ZZglHqbW2sGKO/D/3TVQR5olTgitBjE="; - nativeBuildInputs = [ pkg-config rustfmt ]; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; meta = with lib; { description = "A cargo extension for working with microcontrollers"; homepage = "https://probe.rs/"; - changelog = "https://github.com/probe-rs/cargo-flash/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/cargo-flash/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ fooker newam ]; }; diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index a0e458bbd6e8..03fbd4dd31e2 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-geiger"; - version = "0.11.4"; + version = "0.11.5"; src = fetchFromGitHub { owner = "rust-secure-code"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-GxlUhfzGIKHSTNcSme/mQums6yI4ev8V0L1bXAWt8pw="; + sha256 = "sha256-PrrhxY+Hk1XfdV0u4GgIsbo8oNOFnqbCeivY2Ix6g+k="; }; - cargoSha256 = "sha256-nCMUnhxNAMdk3Mi6eebrViQ1G5jcc3jk+CPRTUvcWRc="; + cargoHash = "sha256-D3upXhKFkuZfEVOPJ9mCwoZkbkX9s2MltyTkKcBvb6I="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv curl ]; diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 8690b1b41ef2..da90015752a0 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -5,29 +5,33 @@ , libgit2 , openssl , stdenv -, Security +, darwin +, git }: rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.17.3"; + version = "0.17.6"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-7F6Pqq/iFmI3JzDKoMmSyVm6BUr+Ev9GPidOofcLNV4="; + sha256 = "sha256-SDcJmEh4DBxe6icKom559B8tkvl0dbXUeACwH69PZRM="; }; # patch Cargo.toml to not vendor libgit2 and openssl cargoPatches = [ ./no-vendor.patch ]; - cargoSha256 = "sha256-kC8BGobS1iMq+vIwE24Lip+HGdVnA/NjHFAb6cqOz44="; + cargoSha256 = "sha256-wbovccAWeAPa8xbVhM2TGiLcqQYGBvGnS5/05672QKU="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgit2 openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + nativeCheckInputs = [ git ]; preCheck = '' export HOME=$(mktemp -d) USER=nixbld diff --git a/pkgs/development/tools/rust/cargo-generate/no-vendor.patch b/pkgs/development/tools/rust/cargo-generate/no-vendor.patch index b7788d3d656c..c8233cd5dd3d 100644 --- a/pkgs/development/tools/rust/cargo-generate/no-vendor.patch +++ b/pkgs/development/tools/rust/cargo-generate/no-vendor.patch @@ -4,8 +4,8 @@ [dependencies] clap = { version = "4.0", features = ["derive", "std", "help"], default-features = false } --git2 = { version = "0.15", features = ["ssh", "https", "vendored-libgit2", "vendored-openssl"], default-features = false } -+git2 = { version = "0.15", features = ["ssh", "https"], default-features = false } +-git2 = { version = "0.16", features = ["ssh", "https", "vendored-libgit2", "vendored-openssl"], default-features = false } ++git2 = { version = "0.16", features = ["ssh", "https"], default-features = false } console = "0.15" dialoguer = "0.10" dirs = "4.0" diff --git a/pkgs/development/tools/rust/cargo-guppy/default.nix b/pkgs/development/tools/rust/cargo-guppy/default.nix index 7074dd4e93ca..2ea51ee354ef 100644 --- a/pkgs/development/tools/rust/cargo-guppy/default.nix +++ b/pkgs/development/tools/rust/cargo-guppy/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-guppy"; - version = "unstable-2022-11-07"; + version = "unstable-2023-01-19"; src = fetchFromGitHub { owner = "guppy-rs"; repo = "guppy"; - rev = "40d66ee25a12657c36b9cef67293fc4c296a144f"; - sha256 = "sha256-f+xUifb7TlaXONNQfFZpnuYDTxgkelL+Knc+X8vc3Gg="; + rev = "0f2e0627d430fa6488980f2808c472ae406d3603"; + sha256 = "sha256-7ADq5yDVpYn91K/rbXWxp0+34twQ8LArD+vVd48tee4="; }; - cargoSha256 = "sha256-qRFJJX/5hgveGAQtW0HJYAPZjHRlTHalvqSRdEjtYiU="; + cargoSha256 = "sha256-oVG3x0yGTqNKMaqkOJhfhqRWNwAkUgfkGr7Vxr+nY4I="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index fc34656edcd8..61bc71374870 100644 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.5.22"; + version = "0.5.27"; src = fetchCrate { inherit pname version; - sha256 = "sha256-TuHCKitlCCV//VBi514IMdcscsBc4yibfdsCO/nmisU="; + sha256 = "sha256-oiCZiwJr1BqMCWCNUOTQT3XPX0QZRr0wLewf8OU6lHA="; }; - cargoSha256 = "sha256-2tF6553SGbBrGkTznk3zWMweQjks+Z699HE1l0DVYec="; + cargoSha256 = "sha256-g5O51V4BPNqzsQo1prLIpamqwcOy+SJat2Rb5UDHRLc="; # some necessary files are absent in the crate version doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-hakari/default.nix b/pkgs/development/tools/rust/cargo-hakari/default.nix index c2b2712ce498..ef44a352497b 100644 --- a/pkgs/development/tools/rust/cargo-hakari/default.nix +++ b/pkgs/development/tools/rust/cargo-hakari/default.nix @@ -1,15 +1,20 @@ -{ lib, rustPlatform, fetchCrate }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-hakari"; - version = "0.9.16"; + version = "0.9.23"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-V4rCtqt3HmvAtanithYAJv9FMt/g2R5JCJUwKITnoV4="; + src = fetchFromGitHub { + owner = "guppy-rs"; + repo = "guppy"; + rev = "cargo-hakari-${version}"; + sha256 = "sha256-Ewki2Ux233WEW7x3jgpdeMH6xoMYJQ9X3vP8CqY+0hc="; }; - cargoHash = "sha256-IGxKIgV7UtPrNAFEzKNJfPiSZ8lW2S2M7AJ7sigCWzQ="; + cargoHash = "sha256-IpTWyp0o6OKS8h0U8ybC2Io3Tbs592UBzAWmd8zEm2I="; + + cargoBuildFlags = [ "-p" "cargo-hakari" ]; + cargoTestFlags = [ "-p" "cargo-hakari" ]; meta = with lib; { description = "Manage workspace-hack packages to speed up builds in large workspaces."; diff --git a/pkgs/development/tools/rust/cargo-lambda/default.nix b/pkgs/development/tools/rust/cargo-lambda/default.nix index e4ae0ad4ca77..8a9c426a9df3 100644 --- a/pkgs/development/tools/rust/cargo-lambda/default.nix +++ b/pkgs/development/tools/rust/cargo-lambda/default.nix @@ -1,32 +1,45 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, makeWrapper, cargo-watch, zig, Security }: +{ lib +, rustPlatform +, fetchFromGitHub +, makeWrapper +, stdenv +, Security +, cargo-watch +, zig +}: rustPlatform.buildRustPackage rec { pname = "cargo-lambda"; - version = "0.11.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-dEJOoV91DIQL7KPbLQrgCKdCF7ZMSZMHVLq6l1sg4F0="; + sha256 = "sha256-JwrTwCn4qXcjXjy4cPYM3WCblJS0J5Xxnc6WESMwCpU="; }; - cargoSha256 = "sha256-qW4a4VPpPSdt0Z4nRA4/fHpW0cfDxOPQyEAdJidt+0o="; + cargoSha256 = "sha256-p3q5S6IFQQgNp/MHGSUE1DVLFyMLWDTv/dxrUACKSWo="; + + nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - nativeBuildInputs = [ makeWrapper ]; + checkFlags = [ + # Disabled because it accesses the network. + "--skip=test_download_example" + ]; + + # remove date from version output to make reproducible + postPatch = '' + rm crates/cargo-lambda-cli/build.rs + ''; postInstall = '' wrapProgram $out/bin/cargo-lambda --prefix PATH : ${lib.makeBinPath [ cargo-watch zig ]} ''; - checkFlags = [ - # Disabled because it accesses the network. - "--skip test_download_example" - # Disabled because it makes assumptions about the file system. - "--skip test_target_dir_from_env" - ]; + CARGO_LAMBDA_BUILD_INFO = "(nixpkgs)"; meta = with lib; { description = "A Cargo subcommand to help you work with AWS Lambda"; diff --git a/pkgs/development/tools/rust/cargo-limit/default.nix b/pkgs/development/tools/rust/cargo-limit/default.nix index da5f019d660a..37ecf5642688 100644 --- a/pkgs/development/tools/rust/cargo-limit/default.nix +++ b/pkgs/development/tools/rust/cargo-limit/default.nix @@ -8,23 +8,21 @@ rustPlatform.buildRustPackage rec { pname = "cargo-limit"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "alopatindev"; repo = "cargo-limit"; rev = version; - sha256 = "sha256-GRitz9LOdZhbakbLZI2BUfZjqXLrsMK2MQJgixiEHaA="; + sha256 = "sha256-joWDB9fhCsYVZFZdr+Gfm4JaRlm5kj+CHp34Sx5iQYk="; }; - cargoSha256 = "sha256-uiANH9HOvy41FiABTTx2D9Rz1z/F7eITc5aiofaMSfI="; + cargoSha256 = "sha256-dwqbG0UFeUQHa0K98ebHfjbcQuQOhK2s6ZxAT6r0cik="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index bf55e638bdef..28be262ca70d 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-cov"; - version = "0.5.0"; + version = "0.5.9"; src = fetchzip { url = "https://crates.io/api/v1/crates/${pname}/${version}/download#${pname}-${version}.tar.gz"; - sha256 = "sha256-ifnwiOuFnpryYxLgescpxN8CzgFzSZlY+RlbyW7ND6g="; + sha256 = "sha256-GEnEcVYejDMnnJtGTbbMHOC85hYjGFEOIF9/Jdm3288="; }; - cargoSha256 = "sha256-11xNgiOw0qysTWpoKAXQ5gx1uJSAsp+aDDir0zpkpeQ="; + cargoSha256 = "sha256-Yk43FM6YswlM/XYJD+XiunFsOY4+n/xVmnIIEo1ogKY="; # skip tests which require llvm-tools-preview checkFlags = [ diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index 0829168dc2c0..6b34c2c337e2 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.20"; + version = "0.4.23"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-+0yMA7ccj9OsEG3aUgxG/RMBAFXHf/sMDHf8c/w5O1g="; + sha256 = "sha256-u3MvDiagCGD7WjagbVF+TtZ0ATe8WBT3xeyduxrXPi4="; }; - cargoSha256 = "sha256-UWE2spvdD5dmS9RgqMlRQGWr1weU8eMr8gGWAHIyx3s="; + cargoSha256 = "sha256-9oBnETZqJV35FEw6NImy6cqfVOVE5EHPNVGajE2UT10="; 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-lock/default.nix b/pkgs/development/tools/rust/cargo-lock/default.nix index 608faf92a5a8..b5347f46379f 100644 --- a/pkgs/development/tools/rust/cargo-lock/default.nix +++ b/pkgs/development/tools/rust/cargo-lock/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-lock"; - version = "8.0.2"; + version = "8.0.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-I64LXY8e8ztICS6AKfrNr/7Ntap7ESjindNWEeny6ZA="; + sha256 = "sha256-Xh39gaiTC3g1FHVWqUr8PR/MzeoRaGlCmGZZZnHB4Kc="; }; - cargoSha256 = "sha256-Yy7KQvPeyw5YSzUmoxUJAueVzkfQqDPE1j2+L+KifpU="; + cargoSha256 = "sha256-gf9KDzGKjZt4p5ldZShH4lOwrieJeI2WJQ8hU4hhGJE="; buildFeatures = [ "cli" ]; diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 945d89e09636..a56cca2ca0b5 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.36.3"; + version = "0.36.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-9P5LoS8wdzJA8vGj9dRxKJYBXaSSzxplpvRc2aqRWlY="; + sha256 = "sha256-motvwMacwqD6MMWxehCV/Eb+8EN9XthcEr0e5DFlvOg="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-NgjBGoJTJNF4HwhDtBDWxcLHfpM6Jk4D9cbKLvojnaI="; + cargoHash = "sha256-/hgCYgWx7hDAUTrDT9ndlk7t/bGXTtDS9Eth3OWkbKM="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index b6a6c2f53539..576c9eacd74d 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -1,27 +1,26 @@ -{ lib, rustPlatform, fetchCrate, stdenv, CoreFoundation, CoreServices }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.5.14"; + version = "0.7.5"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-urbyWNbmj2qEO4JJ/waRXGRJ9L5KgwsRB5Wh9yib8zc="; + src = fetchFromGitHub { + owner = "regexident"; + repo = pname; + rev = version; + sha256 = "sha256-G9ResHOBEqnKsMXVbr8q1rvywFI8LJcb8gR7hMTI0p4="; }; - cargoSha256 = "sha256-3OxO+j5UuPEg9xNmN+kIqpdq6fVnFpgx5xCaMNue52g="; + cargoSha256 = "sha256-p6mq+P9ntlhjMPHpcwXV9XBlAX6R63Iqastl9ZHI8Vs="; buildInputs = lib.optionals stdenv.isDarwin [ - CoreFoundation - CoreServices + darwin.apple_sdk.frameworks.CoreServices ]; - # the crate version doesn't include all the files required to run tests - doCheck = false; - meta = with lib; { description = "A cargo plugin for showing a tree-like overview of a crate's modules"; homepage = "https://github.com/regexident/cargo-modules"; + changelog = "https://github.com/regexident/cargo-modules/blob/${version}/CHANGELOG.md"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ figsoda rvarago ]; }; diff --git a/pkgs/development/tools/rust/cargo-mommy/default.nix b/pkgs/development/tools/rust/cargo-mommy/default.nix new file mode 100644 index 000000000000..b05282f4f779 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-mommy/default.nix @@ -0,0 +1,20 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-mommy"; + version = "0.1.1"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-p1SAYUQu1HpYJ6TbLJ3lfA9VlKHvB7z5yiFXmTQOCXA="; + }; + + cargoSha256 = "sha256-5RidY+6EF23UNzz1suSdA4LL59FalipaJ+ISSsmiCXM="; + + meta = with lib; { + description = "Cargo wrapper that encourages you after running commands"; + homepage = "https://github.com/Gankra/cargo-mommy"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ GoldsteinE ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index e3694b310837..55d57f1bfcb6 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -25,9 +25,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-/Bspy94uIP/e4uJY8qo+UPK1tnPjglxiMWeYWx2qoHk="; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; # Integration tests fail diff --git a/pkgs/development/tools/rust/cargo-ndk/default.nix b/pkgs/development/tools/rust/cargo-ndk/default.nix new file mode 100644 index 000000000000..03117e9c1f41 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-ndk/default.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-ndk"; + version = "2.12.6"; + + src = fetchFromGitHub { + owner = "bbqsrc"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-VGdFIMyZhb7SDWAXgs7kFlblYCO4rLf+3/N7Mashc4o="; + }; + + cargoHash = "sha256-pv6t9oKj5tdQjpvBgj/Y11uKJIaIWcaA9ib/Id/s+qs="; + + meta = with lib; { + description = "Cargo extension for building Android NDK projects"; + homepage = "https://github.com/bbqsrc/cargo-ndk"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ mglolenstine ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index b1ed4322a2aa..4d8e76b59e9a 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.43"; + version = "0.9.49"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - sha256 = "sha256-7Ujm5xqgyw4/P/XBZKh9yE9sWz9n+WmZbGdmif9oK+w="; + sha256 = "sha256-QonjtUw9CAEcGkjyq5Iv5CTo4gGUuFXSS2QVi/Ub2j4="; }; - cargoSha256 = "sha256-S46W+6+FyjI8BrdedDCzHHK+j3EyofQ9u8Ut1yr1/TI="; + cargoSha256 = "sha256-+L6+hRCnYqWmO5G1nctT0Ly74DhvUYhMvQroSDFMREg="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/rust/cargo-outdated/default.nix b/pkgs/development/tools/rust/cargo-outdated/default.nix index 8103229bb66a..6ed10aee16ec 100644 --- a/pkgs/development/tools/rust/cargo-outdated/default.nix +++ b/pkgs/development/tools/rust/cargo-outdated/default.nix @@ -5,25 +5,27 @@ , openssl , stdenv , curl +, CoreFoundation , Security , SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.11.1"; + version = "0.11.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-vEgYmtRAashBRsGDExewqaGsVYF7EJ4ky+cE/PMFW38="; + sha256 = "sha256-SkFMdE7VAZrT7e5SMrfW8bBA6zPqQV7LhSy3OmshUAs="; }; - cargoSha256 = "sha256-xstcKIXQDk4ngwWSzMueO47U2oFRHAqvvjRnDXFsPE8="; + cargoHash = "sha256-ZcG/4vyrcJNAMiZdR3MFyqX5Udn8wGAfiGT5uP1BSMo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl + CoreFoundation Security SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-pgx/default.nix b/pkgs/development/tools/rust/cargo-pgx/default.nix index a12c4091075f..004b6ed27543 100644 --- a/pkgs/development/tools/rust/cargo-pgx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgx/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-pgx"; - version = "0.5.6"; + version = "0.6.1"; src = fetchCrate { inherit version pname; - sha256 = "sha256-CbQWgt/M/QVKpuOzY04OEZNX4DauYPMz2404WQlAvTw="; + sha256 = "sha256-O4eHVbJBudybsPab+zr2eXnfheREMqLAHAKm2GDbfrs="; }; - cargoSha256 = "sha256-sqAOhSZXzqxOVkEbqpd+9MoXqEFlkFufQ8O1zAXPnLQ="; + cargoSha256 = "sha256-MucGrA3qXgJOcT2LMNmoNOhQi8QA3LuqgZEHKycLCCo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index 64418df60c75..5d1b99f02d8a 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -4,22 +4,24 @@ , pkg-config , openssl , stdenv +, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.23.0"; + version = "0.27.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-yllfkhf0Xy8D6tL08QYPnz7Cj/JOvMG7E53elRx11EE="; + sha256 = "sha256-mG+OjoOlpmmCpsAIs3m3FIRO36CrmWWgki9LgoXxiKo="; }; - cargoSha256 = "sha256-UwrhgMmZ9PnIsxsWxQskaMHl03g54VeoZRo9ZPkSM28="; + cargoSha256 = "sha256-zfqqreNQhxetldE801e6/5KYFKsywXJVt7oIkm8ldS8="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; # Tests fail doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix index 8182609f8bf3..9653d4c556e9 100644 --- a/pkgs/development/tools/rust/cargo-release/default.nix +++ b/pkgs/development/tools/rust/cargo-release/default.nix @@ -1,35 +1,47 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub -, Security -, curl -, openssl , pkg-config +, openssl +, stdenv +, curl +, darwin +, git }: rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.23.1"; + version = "0.24.4"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; - rev = "v${version}"; - sha256 = "sha256-C5m1mRpkMCeR4TCbaFvH+5Jyko9RGP9OMi+HJx5AIZg="; + rev = "refs/tags/v${version}"; + hash = "sha256-6vl8aVZc1pLRXNWbwCWOg/W40TXe29CtXZy2uOLc5BQ="; }; - cargoSha256 = "sha256-Nuc/kJdAOX1SDynZQNTvq7QJq1kYD/6TuEYonUhPVuU="; + cargoHash = "sha256-xz6xjYHBltMo2abQxVTA9mAI4htqqxUc5s5ksKbmrno="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security curl ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + curl + darwin.apple_sdk.frameworks.Security + ]; + + nativeCheckInputs = [ + git + ]; meta = with lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate''; - homepage = "https://github.com/sunng87/cargo-release"; + homepage = "https://github.com/crate-ci/cargo-release"; + changelog = "https://github.com/crate-ci/cargo-release/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ gerschtli ]; + maintainers = with maintainers; [ figsoda gerschtli ]; }; } diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 19c487368e78..359f5dbe64d2 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -5,38 +5,42 @@ , libgit2 , openssl , stdenv -, Security +, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.12.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "obi1kenobi"; - repo = "cargo-semver-check"; + repo = pname; rev = "v${version}"; - sha256 = "sha256-gB8W/u/Yb/rMMB+654N3Mj4QbTMWGK6cgQKM0lld/10="; + sha256 = "sha256-zObflf9BKq24km54LW7It4Lvff0OKYNDb02uatdX7g4="; }; - cargoSha256 = "sha256-ML4cTNtCvaLFkt1QdA34QvAGhrFTO90xw7fsUD2weqQ="; + cargoSha256 = "sha256-itL6WpM4OLn4mzdB0ytM2J7F1fRDrXwCaI/8WdLo6y0="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [ - Security + darwin.apple_sdk.frameworks.Security ]; checkFlags = [ # requires nightly version of cargo-rustdoc - "--skip=adapter::tests" + "--skip=dump::tests" "--skip=query::tests" + "--skip=verify_binary_contains_lints" ]; + # use system openssl + OPENSSL_NO_VENDOR = true; + meta = with lib; { description = "A tool to scan your Rust crate for semver violations"; - homepage = "https://github.com/obi1kenobi/cargo-semver-check"; - license = licenses.asl20; + homepage = "https://github.com/obi1kenobi/cargo-semver-checks"; + license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index 243c23ee52d3..ae03097c8f85 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -32,9 +32,7 @@ rustPlatform.buildRustPackage rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; tests = lib.optionalAttrs stdenv.hostPlatform.isx86_64 { test-basic-x86_64 = callPackage ./test-basic-x86_64.nix { }; }; diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix index 585833ef4696..13023a83efb7 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.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "drahnr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8HZBenv2bL6D8TXzjklEFUAnqk7LkYXjtEwxpTbbzr4="; + sha256 = "sha256-XFbpRESpx3ALpWcS29yFXv8vjizc1srHazvDy0jxF94="; }; - cargoSha256 = "sha256-zCk+b7jcR7yDpBUVfKXIozQkcsB+73HosdCmZW9abkA="; + cargoSha256 = "sha256-2DoBvkriSUtgxzZgwt3leEVaqqzfpRNC0YB5sekhje4="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 8c5a00f9ca61..55b63dadad97 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -1,21 +1,21 @@ -{ lib, rustPlatform, fetchCrate, stdenv, DiskArbitration, Foundation, IOKit }: +{ lib, rustPlatform, fetchCrate, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.17"; + version = "1.0.22"; src = fetchCrate { inherit pname version; - sha256 = "sha256-vtVE7BITzYP9vhSj7HfDm0Mar2bRPmeW1/mE977vvrA="; + sha256 = "sha256-h3w9xxzExDojJw2OIPMT9lQ/lzYQNf9WJVHBP+tOnPw="; }; - cargoSha256 = "sha256-VHlnRk5EXZjf+EW/clDOFA+ohh9SqJiRvq1xQcP0Wrk="; + cargoSha256 = "sha256-EPYfmRms00AE4NkmOJBnIKYOCFbjd2qwRi6/i09hQ6U="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration Foundation IOKit - ]; + ]); meta = with lib; { description = "Graph the number of crates that depend on your crate over time"; diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index 1112ae8cb036..64bf3fccbc4f 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , pkg-config @@ -7,26 +8,31 @@ , cairo , gtk3 , webkitgtk +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) CoreServices Security; +in rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.0.5"; + version = "1.2.4"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-mp9U46H03NTMumUkx5kjsh9LnbPBrvlhh3yCH6FYdbE="; + rev = "tauri-v${version}"; + sha256 = "sha256-BzstYoRZuZTNAkVGqPGYrd/AiWEhoH6t/XezDaFdmVo="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "source/tooling/cli"; - cargoSha256 = "sha256-iFXuVrxE/QmM+TAZmN8Ivt6Le19NWYIfVn1PNPvmhZo="; + cargoHash = "sha256-t5MlJpQOA5T/EwbPoSD95kATGReiZTmq+JkbDVbRj+0="; - buildInputs = [ glibc libsoup cairo gtk3 webkitgtk ]; + buildInputs = lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ] + ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-temp/default.nix b/pkgs/development/tools/rust/cargo-temp/default.nix index 4956ce52333d..c94c1eb56a09 100644 --- a/pkgs/development/tools/rust/cargo-temp/default.nix +++ b/pkgs/development/tools/rust/cargo-temp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-temp"; - version = "0.2.13"; + version = "0.2.15"; src = fetchFromGitHub { owner = "yozhgoor"; repo = pname; rev = "v${version}"; - sha256 = "0g9ddzvgrb45ddflbcwpq320zwj4qrxfs07dydy6r86whdn1mlc0"; + sha256 = "sha256-Z6qmtZfnpEZ1/XkmAijDo4nRfZOPW9hEIFTycdOYILk="; }; - cargoSha256 = "sha256-5E1Fkipqb2nONQNAuj9xKn8k2PhH9IZ48UosNlPpP6c="; + cargoSha256 = "sha256-EDdOnkOk5VIrzjJSTojdjmGAEDPMqW4PPE0JP+GUYnE="; meta = with lib; { description = "A CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies"; diff --git a/pkgs/development/tools/rust/cargo-update/default.nix b/pkgs/development/tools/rust/cargo-update/default.nix index 30aa56aa29f2..61dc0d655fbb 100644 --- a/pkgs/development/tools/rust/cargo-update/default.nix +++ b/pkgs/development/tools/rust/cargo-update/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "11.1.0"; + version = "11.1.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-WQUWAE8PR3FxTmWxoXmi6nsiyfbmLaIzOBJhC/8QYQw="; + sha256 = "sha256-ml+LqfnDld+I3G6+LaPJOeZa+swCtuu0ndW0yJraSxs="; }; - cargoSha256 = "sha256-GirS6Tu5gkNPVGAKzfFkyi3tTlu3RRzp/PWHhPbmKdI="; + cargoSha256 = "sha256-0exatgmksg07KQO/3s9BD4uIZRHwjytQPtaRv+JydPc="; nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ]; diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/development/tools/rust/cargo-valgrind/default.nix index b21db0d6205f..af7abb9a1abf 100644 --- a/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -20,9 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-csSUe2qUIN2xKOMHWyM56FZyCwKPdfAI0NrFiDOtRiE="; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 5cc3fa39eade..c06420d25304 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -1,19 +1,19 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, Foundation, rust, libiconv }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, Cocoa, CoreServices, Foundation, rust, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "8.1.2"; + version = "8.3.0"; src = fetchFromGitHub { - owner = "passcod"; + owner = "watchexec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zhOYKvsCK5am4Ystt3+cPAQM77IlIBJysAEix5cXKbI="; + hash = "sha256-2keI5hTWglqh+mLeGzRCxpfnUt6kur0I9fefYwZr5l4="; }; - cargoSha256 = "sha256-OAOzrGS8n0jfUiQyIAHWLJMEkRINyasgkIjiLw977LE="; + cargoHash = "sha256-kR12j0Z7nXfwh9nPT35/LpkK56a8D1gvVkl9/2s6rIQ="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ Cocoa CoreServices Foundation libiconv ]; # `test with_cargo` tries to call cargo-watch as a cargo subcommand # (calling cargo-watch with command `cargo watch`) diff --git a/pkgs/development/tools/rust/cargo-wipe/default.nix b/pkgs/development/tools/rust/cargo-wipe/default.nix index 9b7b4ef08fb5..c14f842a7398 100644 --- a/pkgs/development/tools/rust/cargo-wipe/default.nix +++ b/pkgs/development/tools/rust/cargo-wipe/default.nix @@ -18,9 +18,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-/cne7uTGyxgTRONWMEE5dPbPDnCxf+ZnYzYXRAeHJyQ="; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 258d1d39459c..79822a7735e5 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9MmIu7oNdLLOl4zsx/A1v0dEc54bN+J6T2GcLFOvMpQ="; + sha256 = "sha256-4Sp3PVhUvXn7FzPHHyyRBUHY5TQYEPLFdoI4ARQ4V0k="; }; - cargoSha256 = "sha256-3UNjJRpNrDdrU63R7z+6TJR7lq8waPceDscx2yo+QeE="; + cargoSha256 = "sha256-QplcedhsqFiAwcqBrEe2ns4DdZ+R/IuoKtkx8eGk19g="; nativeBuildInputs = [ makeWrapper ]; @@ -23,6 +23,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A tool to compile Cargo projects with zig as the linker"; homepage = "https://github.com/messense/cargo-zigbuild"; + changelog = "https://github.com/messense/cargo-zigbuild/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/development/tools/rust/cargo2junit/default.nix b/pkgs/development/tools/rust/cargo2junit/default.nix new file mode 100644 index 000000000000..17427e336c0b --- /dev/null +++ b/pkgs/development/tools/rust/cargo2junit/default.nix @@ -0,0 +1,20 @@ +{ fetchCrate, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "cargo2junit"; + version = "0.1.12"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-wF1vDUVEume6aWzI5smTNlwc9WyZeTtUX416tYYrZPU="; + }; + + cargoSha256 = "sha256-GUCHWV+uPHZwhU4UhdXE2GHpeVnqbUTpfivA9Nh9MoY="; + + meta = with lib; { + description = "Converts cargo's json output (from stdin) to JUnit XML (to stdout)."; + homepage = "https://github.com/johnterickson/cargo2junit"; + license = licenses.mit; + maintainers = with maintainers; [ alekseysidorov ]; + }; +} diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 69307e809156..372f36879702 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.isDarwin Security; - checkInputs = [ + nativeCheckInputs = [ python3Packages.cython ]; diff --git a/pkgs/development/tools/rust/devserver/default.nix b/pkgs/development/tools/rust/devserver/default.nix deleted file mode 100644 index 305a01b69991..000000000000 --- a/pkgs/development/tools/rust/devserver/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, stdenv -, fetchCrate -, rustPlatform -, openssl -, pkg-config -, CoreServices -}: - -rustPlatform.buildRustPackage rec { - pname = "devserver"; - version = "0.4.0"; - - src = fetchCrate { - inherit pname version; - sha256 = "sha256-UcrLzsALwl0zqNRMS1kTTXsR6wN8XDd5Iq+yrudh6M4="; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin CoreServices; - - cargoSha256 = "sha256-XlrQ6CvjeWnzvfaeNbe8FtMXMVSQNLxDVIEjyHm57Js="; - - meta = with lib; { - description = "An extremely tiny tool to serve a static folder locally"; - homepage = "https://github.com/kettle11/devserver"; - license = licenses.zlib; - maintainers = with maintainers; [ nickhu ]; - }; -} diff --git a/pkgs/development/tools/rust/duckscript/default.nix b/pkgs/development/tools/rust/duckscript/default.nix index 43f49a28d2e2..b005ae9192e8 100644 --- a/pkgs/development/tools/rust/duckscript/default.nix +++ b/pkgs/development/tools/rust/duckscript/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "duckscript_cli"; - version = "0.8.16"; + version = "0.8.17"; src = fetchCrate { inherit pname version; - sha256 = "sha256-H9lZIIJrE6onqGHw0l8Y58IW9EAcQ7eCHxgqqeSLgGY="; + sha256 = "sha256-fEAm7HhRGYZpGL9I8h3wX8AnPs00pG/ui7Rm+PaXJpA="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-DQw3DDOUo4ogf6PIY7/1U0uiyX8dpXE5D2P8QDdie9M="; + cargoHash = "sha256-kll2q5HhcpizBDbWipj30F8WEQnjG1fndxCHoXBbik8="; meta = with lib; { description = "Simple, extendable and embeddable scripting language."; diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index b276a618110f..384030c903d9 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.13.0"; + version = "0.14.5"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-uKpYI+Oc49xgoIZCh72baBMZLcpMXk7g2Jb1DQxW9lk="; + hash = "sha256-3TEEmraQ9KGx29ok7IUdVzTW0ilaAci1dOZUlKvQYJE="; }; - cargoHash = "sha256-levBWghFIXOXe+NGXvwBqQpPmWeUK53ruSyLik1urSU="; + cargoHash = "sha256-/biWBTNIysg6HDozyF8UdKoxlgkHl9tnyean8+333hI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/panamax/default.nix b/pkgs/development/tools/rust/panamax/default.nix index 0d040afd421d..6dd1d5e32bd8 100644 --- a/pkgs/development/tools/rust/panamax/default.nix +++ b/pkgs/development/tools/rust/panamax/default.nix @@ -1,19 +1,34 @@ -{ lib, rustPlatform, fetchCrate, pkg-config, openssl, stdenv, Security }: +{ lib +, rustPlatform +, fetchCrate +, pkg-config +, libgit2 +, openssl +, zlib +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "panamax"; - version = "1.0.3"; + version = "1.0.6"; src = fetchCrate { inherit pname version; - sha256 = "sha256-w4waFdzd/Ps0whOp39QLBE/YF2eyc4t2Ili7FskUt1M="; + sha256 = "sha256-/JW2QB5PtwKo0TLU/QmkgsE6/ne+51EVmWyGn7Lljdw="; }; - cargoSha256 = "sha256-52snmkTFHI26xJo9qJkmqh1M5lLzhDxw8WT6uFd57aw="; + cargoSha256 = "sha256-aKdDismdPcExqznS6S2LvAij6gv9/Hw2FBvkhr9rJGo="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ + libgit2 + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; meta = with lib; { description = "Mirror rustup and crates.io repositories for offline Rust and cargo usage"; diff --git a/pkgs/development/tools/rust/probe-rs-cli/default.nix b/pkgs/development/tools/rust/probe-rs-cli/default.nix index 0cce6354fb99..d4140bc0b523 100644 --- a/pkgs/development/tools/rust/probe-rs-cli/default.nix +++ b/pkgs/development/tools/rust/probe-rs-cli/default.nix @@ -1,18 +1,28 @@ -{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, libusb1, AppKit }: +{ lib +, stdenv +, rustPlatform +, fetchCrate +, pkg-config +, libusb1 +, openssl +, DarwinTools +, AppKit +}: rustPlatform.buildRustPackage rec { pname = "probe-rs-cli"; - version = "0.13.0"; + version = "0.16.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-3aKRUABJ1LkRGzwDSwQZeNXKGeRmTlbHKSGewfKn+2Q="; + sha256 = "sha256-YNOD0hDDQ6M496m9lps28UX41pMO1r/CE30rcS53h48="; }; - cargoSha256 = "sha256-bOfdpRVm9zqpFF/YmD06u4OKdyqXwfCSTNlTIZZygeg="; + cargoSha256 = "sha256-/1bnDtfNxnOI4Inmnd+r2epT236ghQsiNuoAuROEfPM="; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + + buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; meta = with lib; { description = "CLI tool for on-chip debugging and flashing of ARM chips"; diff --git a/pkgs/development/tools/rust/probe-run/default.nix b/pkgs/development/tools/rust/probe-run/default.nix index 59d9f7c6d595..0033a1c5f03a 100644 --- a/pkgs/development/tools/rust/probe-run/default.nix +++ b/pkgs/development/tools/rust/probe-run/default.nix @@ -3,6 +3,7 @@ , rustPlatform , fetchCrate , pkg-config +, DarwinTools , libusb1 , libiconv , AppKit @@ -11,17 +12,19 @@ rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.3.5"; + version = "0.3.6"; src = fetchCrate { inherit pname version; - sha256 = "sha256-C9JxQVsS1Bv9euQ7l+p5aehiGLKdrUMcno9z8UoZKR4="; + sha256 = "sha256-HYFVdj1kASu+VKnDJA35zblPsgUeYC9YVlS84Hkx1Sk="; }; - cargoSha256 = "sha256-kmdRwAq6EOniGHC7JhB6Iov1E4hbQbxHlOcc6gUDOhY="; + cargoSha256 = "sha256-nhs9qNFd1GK70sL5sPPeMazuPUP67epHayXnw3aXTfk="; nativeBuildInputs = [ pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + DarwinTools ]; buildInputs = [ diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix deleted file mode 100644 index 3fd4f7683845..000000000000 --- a/pkgs/development/tools/rust/racer/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, rustPlatform, fetchCrate, makeWrapper, stdenv, Security }: - -rustPlatform.buildRustPackage rec { - pname = "racer"; - version = "2.2.1"; - - src = fetchCrate { - inherit pname version; - sha256 = "sha256-uAVtJwOyhe1lPz+MUUFCgHJPVGuIk/lNUkQWiNdOZ5Y="; - }; - - cargoSha256 = "sha256-U2mI1y6t8CwxW/iPcPzxAafu61GNm/XLCKVGuyybV/4="; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optional stdenv.isDarwin Security; - - # a nightly compiler is required unless we use this cheat code. - RUSTC_BOOTSTRAP = 1; - - RUST_SRC_PATH = rustPlatform.rustLibSrc; - postInstall = '' - wrapProgram $out/bin/racer --set-default RUST_SRC_PATH ${rustPlatform.rustLibSrc} - ''; - - checkFlags = [ - "--skip nameres::test_do_file_search_std" - "--skip util::test_get_rust_src_path_rustup_ok" - "--skip util::test_get_rust_src_path_not_rust_source_tree" - "--skip extern --skip completes_pub_fn --skip find_crate_doc" - "--skip follows_use_local_package --skip follows_use_for_reexport" - "--skip follows_rand_crate --skip get_completion_in_example_dir" - "--skip test_resolve_global_path_in_modules" - ]; - - # [2022-04-06] Its test suite contains two function calls with the - # wrong number of arguments, breaking its build. - doCheck = false; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/racer --version - ''; - - meta = with lib; { - description = "A utility intended to provide Rust code completion for editors and IDEs"; - homepage = "https://github.com/racer-rust/racer"; - license = licenses.mit; - maintainers = with maintainers; [ jagajaga ]; - }; -} diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index f9ec10f34301..a90ac2780e8a 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -12,16 +12,18 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-10-31"; - cargoSha256 = "sha256-yehukhYwNhFqHUYmIe0P/LPgRHvyj1/DFCl2yzBkB8Q="; + version = "2023-01-23"; + cargoSha256 = "sha256-NSdHvWN5BIEXZMFiweKYbJayxDqlFmqJp+sIzeORhSU="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-D0YwkSqwtD08twtCtN5q0a8S0Y26kgDWg1ruRNEQEOw="; + sha256 = "sha256-Uq6jngJnf2UqKrOzqMXtq5IVxkU3eNCkmORPdccLxp0="; }; + auditable = true; # TODO: remove when this is the default + cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; cargoTestFlags = [ "--package" "rust-analyzer" "--package" "proc-macro-srv-cli" ]; diff --git a/pkgs/development/tools/rust/rust-script/default.nix b/pkgs/development/tools/rust/rust-script/default.nix index a1edc1356799..c5f1aee1ce1b 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.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "fornwall"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-5T5DivfT7/MkBJo5YgLAVnfct84nBhw/OXWQ/4TMm2A="; + rev = version; + sha256 = "sha256-R9L53ThJKf68M4idNiWfO6fUDJNqiyrzCmdbEvo8OMM="; }; - cargoSha256 = "sha256-mDH3R9gn64DXVoe3Vkl2Kwhr7OTOUWKBLW5Y+Uo4aXM="; + cargoSha256 = "sha256-hi0jtI6KtvBjyhhOEEE1x2l7DSIAC4tkRIF9SLFwFQI="; # tests require network access doCheck = false; diff --git a/pkgs/development/tools/rust/rustfilt/default.nix b/pkgs/development/tools/rust/rustfilt/default.nix new file mode 100644 index 000000000000..353cdcdbfdc6 --- /dev/null +++ b/pkgs/development/tools/rust/rustfilt/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "rustfilt"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "luser"; + repo = pname; + rev = version; + hash = "sha256-zb1tkeWmeMq7aM8hWssS/UpvGzGbfsaVYCOKBnAKwiQ="; + }; + + cargoSha256 = "sha256-rs2EWcvTxLVeJ0t+jLM75s+K72t+hqKzwy3oAdCZ8BE="; + + meta = with lib; { + description = "Demangle Rust symbol names using rustc-demangle"; + homepage = "https://github.com/luser/rustfilt"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ wykurz ]; + mainProgram = "rustfilt"; + }; +} diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index df451e863481..7883e8841b0a 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -1,4 +1,17 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security, libiconv, testers, sqlx-cli }: +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +, fetchpatch +, pkg-config +, openssl +, SystemConfiguration +, CoreFoundation +, Security +, libiconv +, testers +, sqlx-cli +}: rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; @@ -11,6 +24,15 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-pQlrKjhOJfjNEmLxqnFmmBY1naheZUsaq2tGdLKGxjg="; }; + patches = [ + # https://github.com/launchbadge/sqlx/pull/2228 + (fetchpatch { + name = "fix-rust-1.65-compile.patch"; + url = "https://github.com/launchbadge/sqlx/commit/2fdf85b212332647dc4ac47e087df946151feedf.patch"; + hash = "sha256-5BCuIwmECe9qQrdYll7T+UOGwuTBolWEhKNE7GcZqJw="; + }) + ]; + cargoSha256 = "sha256-AbA8L7rkyZfKW0vvjyrcW5eU6jGD+zAqIcEUOJmeqJs="; doCheck = false; diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index e05057a629a6..516fab607ccd 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.27.2"; + version = "0.28.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-6HcJ9NPUPcVLZT8zpYxIPJ4UkqwaqPNWva8/wnaUrt8="; + sha256 = "sha256-/Pt0eKS6Rfrh18nb1lR/T+T+b73rmX4jmGIjbXJtcMA="; }; - cargoSha256 = "sha256-fsLRpRvdiZyOsxnfAc5xt63rLW5lwwQt+lxmZT7XIAc="; + cargoSha256 = "sha256-Vum7Ltq9h6BMXvIESO9jC2B775BZlCWmatazk1bavQs="; meta = with lib; { description = "Generate Rust register maps (`struct`s) from SVD files"; diff --git a/pkgs/development/tools/rust/typeshare/default.nix b/pkgs/development/tools/rust/typeshare/default.nix new file mode 100644 index 000000000000..6e96bf72bbad --- /dev/null +++ b/pkgs/development/tools/rust/typeshare/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "typeshare"; + version = "1.0.1"; + + src = fetchCrate { + inherit version; + pname = "typeshare-cli"; + sha256 = "sha256-SbTI7170Oc1e09dv4TvUwByG3qkyAL5YXZ96NzI0FSI="; + }; + + cargoSha256 = "sha256-5EhXw2WcRJqCbdMvOtich9EYQqi0uwCH1a1XXIo8aAo="; + + buildFeatures = [ "go" ]; + + meta = with lib; { + description = "Command Line Tool for generating language files with typeshare"; + homepage = "https://github.com/1password/typeshare"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index ab75664f5a4b..69a532ccb5c0 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -1,7 +1,5 @@ { stdenv, lib, fetchurl, zlib, unzip }: -with lib; - stdenv.mkDerivation rec { pname = "sauce-connect"; version = "4.5.4"; @@ -24,7 +22,7 @@ stdenv.mkDerivation rec { patchPhase = lib.optionalString stdenv.isLinux '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/lib:${makeLibraryPath [zlib]}" \ + --set-rpath "$out/lib:${lib.makeLibraryPath [zlib]}" \ bin/sc ''; @@ -35,7 +33,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = { + meta = with lib; { description = "A secure tunneling app for executing tests securely when testing behind firewalls"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix index 06fe1af307c4..b6e61b41f939 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.45"; + version = "1.0.46"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ziCDuGpvBPKC3p+kuPi5+Hjfkld/Kh0ZqnLKwdMrXNM="; + sha256 = "sha256-+Z12atz6fSM5FJFOqUhjalxkP/1Kkm3xWgwUVlB9JvM="; }; - vendorSha256 = "sha256-43hcIIGqBscMjQzaIGdMqV5lq3od4Ls4TJdTeFGtu5Y="; + vendorSha256 = "sha256-sgCUho8KFt0iFEuupQdMV6IZTVCsTXsNqv2ab5jp0mI="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/selene/default.nix b/pkgs/development/tools/selene/default.nix index 27f61f4e7021..238bf9938425 100644 --- a/pkgs/development/tools/selene/default.nix +++ b/pkgs/development/tools/selene/default.nix @@ -5,26 +5,31 @@ , pkg-config , openssl , stdenv -, Security +, darwin }: rustPlatform.buildRustPackage rec { pname = "selene"; - version = "0.22.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "kampfkarren"; repo = pname; rev = version; - sha256 = "sha256-6DbWz4u4mbW/aSDpaLxP4bG14gHxMGc4A8zMTVH/vj0="; + sha256 = "sha256-tw9OLdXhqxgqROub0P/+nd4LQGNw3QDxlCyyf8ogRQM="; }; - cargoSha256 = "sha256-6dYXGxDNiLzpyZCmF2OJl2HAFyzJeAeQpEfaIZBBJD8="; + cargoSha256 = "sha256-5/xAX8BhB81cB7x2Pe/MKCV0Fi76ZcO6XHFQxTVIuLA="; - nativeBuildInputs = lib.optional robloxSupport pkg-config; + nativeBuildInputs = lib.optionals robloxSupport [ + pkg-config + ]; - buildInputs = lib.optional robloxSupport openssl - ++ lib.optional (robloxSupport && stdenv.isDarwin) Security; + buildInputs = lib.optionals robloxSupport [ + openssl + ] ++ lib.optionals (robloxSupport && stdenv.isDarwin) [ + darwin.apple_sdk.frameworks.Security + ]; buildNoDefaultFeatures = !robloxSupport; diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix index ac684f081f4a..dcea17d807d9 100644 --- a/pkgs/development/tools/selenium/htmlunit-driver/default.nix +++ b/pkgs/development/tools/selenium/htmlunit-driver/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl }: -with lib; - stdenv.mkDerivation rec { pname = "htmlunit-driver-standalone"; version = "2.27"; @@ -15,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = "install -D $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar"; - meta = { + meta = with lib; { homepage = "https://github.com/SeleniumHQ/htmlunit-driver"; description = "A WebDriver server for running Selenium tests on the HtmlUnit headless browser"; maintainers = with maintainers; [ coconnor offline ]; diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index d18ca0012d80..66a9b97d0db9 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, jdk, selenium-server-standalone }: -with lib; let pname = "selendroid-standalone"; pluginName = "selendroid-grid-plugin-${version}"; @@ -39,7 +38,7 @@ stdenv.mkDerivation { --add-flags "-capabilityMatcher io.selendroid.grid.SelendroidCapabilityMatcher" ''; - meta = { + meta = with lib; { homepage = "http://selendroid.io/"; description = "Test automation for native or hybrid Android apps and the mobile web"; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 56ff4f3ad3e5..b1cc26bec519 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper, jre , htmlunit-driver, chromedriver, chromeSupport ? true }: -with lib; - let minorVersion = "3.141"; patchVersion = "59"; @@ -26,11 +24,11 @@ in stdenv.mkDerivation rec { cp $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar makeWrapper ${jre}/bin/java $out/bin/selenium-server \ --add-flags "-cp $out/share/lib/${pname}-${version}/${pname}-${version}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \ - ${optionalString chromeSupport "--add-flags -Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \ + ${lib.optionalString chromeSupport "--add-flags -Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \ --add-flags "org.openqa.grid.selenium.GridLauncherV3" ''; - meta = { + meta = with lib; { homepage = "http://www.seleniumhq.org/"; description = "Selenium Server for remote WebDriver"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 7fcb9fc6f2fe..0bab699b3cf2 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 = "2.9.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-PhcCYdc865682UZMSjwj0WWh+6pJeEaYyjX+v1XZqVk="; + sha256 = "sha256-08H/aNYUsTORCwTm9pwWiLQjAcWSiZrjg5q6OkkllWg="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-WQYiYxbSr4fOlaI5LaBllk21I7U9sL2Xq7hMBIGCL7M="; + cargoSha256 = "sha256-GEZZXRPfpIhr73SpyP9iLSjRe67wllSpp5oh6N0S9ok="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/pkgs/development/tools/shellcheck/default.nix b/pkgs/development/tools/shellcheck/default.nix index e85b596607b1..59b744e21df1 100644 --- a/pkgs/development/tools/shellcheck/default.nix +++ b/pkgs/development/tools/shellcheck/default.nix @@ -37,10 +37,15 @@ let install -Dm644 shellcheck.1 $man/share/man/man1/shellcheck.1 mkdir $out ''; + + passthru = ShellCheck.passthru or {} // { + # pandoc takes long to build and documentation isn't needed for in nixpkgs usage + unwrapped = ShellCheck; + }; }; in overrideMeta shellcheck (old: { - maintainers = with lib.maintainers; [ Profpatsch ]; + maintainers = with lib.maintainers; [ Profpatsch zowoq ]; outputsToInstall = [ "bin" "man" "doc" ]; }) diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 8aa9ccd5388a..11b146e55c5e 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -1,9 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, libelf, which, pkg-config, freeglut +{ lib, stdenv, makeSetupHook, fetchFromGitHub, libelf, which, pkg-config, freeglut , avrgcc, avrlibc , libGLU, libGL , GLUT }: -stdenv.mkDerivation rec { +let + setupHookDarwin = makeSetupHook { + name = "darwin-avr-gcc-hook"; + substitutions = { + darwinSuffixSalt = stdenv.cc.suffixSalt; + avrSuffixSalt = avrgcc.suffixSalt; + }; + } ./setup-hook-darwin.sh; +in stdenv.mkDerivation rec { pname = "simavr"; version = "1.7"; @@ -22,9 +30,8 @@ stdenv.mkDerivation rec { "AVR=avr-" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; - - nativeBuildInputs = [ which pkg-config avrgcc ]; + nativeBuildInputs = [ which pkg-config avrgcc ] + ++ lib.optional stdenv.isDarwin setupHookDarwin; buildInputs = [ libelf freeglut libGLU libGL ] ++ lib.optional stdenv.isDarwin GLUT; @@ -35,7 +42,6 @@ stdenv.mkDerivation rec { checkTarget = "-C tests run_tests"; meta = with lib; { - broken = stdenv.isDarwin; description = "A lean and mean Atmel AVR simulator"; homepage = "https://github.com/buserror/simavr"; license = licenses.gpl3; diff --git a/pkgs/development/tools/simavr/setup-hook-darwin.sh b/pkgs/development/tools/simavr/setup-hook-darwin.sh new file mode 100644 index 000000000000..3861e45973ac --- /dev/null +++ b/pkgs/development/tools/simavr/setup-hook-darwin.sh @@ -0,0 +1,34 @@ + +fixupCFlagsForDarwin() { + # Because it’s getting called from a Darwin stdenv, avr-gcc will pick up on + # Darwin-specific flags, and it will barf and die on -iframework in + # particular. Strip them out, so simavr can compile its test firmware. + cflagsFilter='s|-F[^ ]*||g;s|-iframework [^ ]*||g;s|-isystem [^ ]*||g;s| *| |g' + + # The `CoreFoundation` reference is added by `linkSystemCoreFoundationFramework` in the + # Apple SDK’s setup hook. Remove that because avr-gcc will fail due to file not found. + ldFlagsFilter='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 derivation will provide them. + export NIX_CFLAGS_COMPILE_@darwinSuffixSalt@=${NIX_CFLAGS_COMPILE-} + export NIX_LDFLAGS_@darwinSuffixSalt@=${NIX_LDFLAGS-} + + echo removing @darwinSuffixSalt@-specific flags from NIX_CFLAGS_COMPILE for @avrSuffixSalt@ + export NIX_CFLAGS_COMPILE_@avrSuffixSalt@+="$(sed "$cflagsFilter" <<< "$NIX_CFLAGS_COMPILE")" + echo removing @darwinSuffixSalt@-specific flags from NIX_LDFLAGS for @avrSuffixSalt@ + export NIX_LDFLAGS_@avrSuffixSalt@+="$(sed "$ldFlagsFilter;$cflagsFilter" <<< "$NIX_LDFLAGS")" + + # 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) +} + +if [ -z "${dontFixupCFlagsForDarwin-}" ]; then + postUnpackHooks+=(runFixupCFlagsForDarwinLast) +fi diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 73763ce654d4..f512e48e9109 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.0.2"; + version = "2.0.4"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "sha256-ldyGKey/s6FJLmxV25Q+blNjOOsASGqUsnqiXJme3+g="; + sha256 = "sha256-TFI715knhQ3QyWF1EwIxZfZQW16uDWAqa6LVNfqC8Ws="; }; vendorSha256 = "sha256-yy1BVorjLEcZR6PqupBiZx2plwPJ6xlxripbyB6RLek="; diff --git a/pkgs/development/tools/skjold/default.nix b/pkgs/development/tools/skjold/default.nix index 173de27d945e..a8334a0a5ed0 100644 --- a/pkgs/development/tools/skjold/default.nix +++ b/pkgs/development/tools/skjold/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { toml ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-mock pytest-watch pytestCheckHook diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 6d08ec9163fa..08bcde3ae510 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -11,22 +11,23 @@ , makeWrapper , fuse-overlayfs , dockerTools +, runCommand }: buildGoModule rec { pname = "skopeo"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-Q6gdkaIYTDUqDbjmE9TcRtQcHjpOJ3bXLJtN8NPp9KA="; + hash = "sha256-P556Is03BeC0Tf+kNv+Luy0KASgTXsyZ/MrPaPFUHE8="; }; outputs = [ "out" "man" ]; - vendorSha256 = null; + vendorHash = null; doCheck = false; @@ -46,6 +47,7 @@ buildGoModule rec { runHook preInstall PREFIX=$out make install-binary install-completions PREFIX=$man make install-docs + install ${passthru.policy}/default-policy.json -Dt $out/etc/containers '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/skopeo \ --prefix PATH : ${lib.makeBinPath [ fuse-overlayfs ]} @@ -53,8 +55,13 @@ buildGoModule rec { runHook postInstall ''; - passthru.tests = { - inherit (dockerTools.examples) testNixFromDockerHub; + passthru = { + policy = runCommand "policy" { } '' + install ${src}/default-policy.json -Dt $out + ''; + tests = { + inherit (dockerTools.examples) testNixFromDockerHub; + }; }; meta = with lib; { diff --git a/pkgs/development/tools/smlfmt/default.nix b/pkgs/development/tools/smlfmt/default.nix new file mode 100644 index 000000000000..1475de94193d --- /dev/null +++ b/pkgs/development/tools/smlfmt/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, mlton }: + +stdenv.mkDerivation rec { + pname = "smlfmt"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "shwestrick"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7CTfMiEvuOena5SOE0qKpFPq6ARxmkE6d+loznZNbC0="; + }; + + nativeBuildInputs = [ mlton ]; + + installPhase = '' + runHook preInstall + install -Dm755 -t $out/bin smlfmt + runHook postInstall + ''; + + meta = { + description = "A custom parser/auto-formatter for Standard ML"; + longDescription = '' + A custom parser and code formatter for Standard ML, with helpful error messages. + + Supports SML source files (.sml, .sig, .fun, etc.) as well as MLBasis + compilation files (.mlb) using MLton conventions, including MLBasis path + maps. + ''; + + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ munksgaard ]; + platforms = mlton.meta.platforms; + homepage = "https://github.com/shwestrick/smlfmt"; + }; +} diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 3a64646ded63..6f95ded63e15 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.3.231.0"; + version = "1.3.236.0"; src = (assert version == spirv-headers.version; fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "sdk-${version}"; - hash = "sha256-sqjQoz9v9alSPc0ujEcWZxDAWh2S6oAPP1+JZmNCpA0="; + hash = "sha256-BV7V/jS782zdvtuw/wNY5fyAdx8Z2niWSocNaW0Atho="; } ); @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit (src.meta) homepage; description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules"; + homepage = "https://github.com/KhronosGroup/SPIRV-Tools"; license = licenses.asl20; platforms = platforms.unix; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index 4e96594fcb3c..e13549009792 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -1,24 +1,29 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, sq }: + buildGoModule rec { pname = "sq"; - version = "0.15.11"; + version = "0.20.0"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sYaQb7MFeTgJ/WPuCuMYjLcgmO/FhMGgOvY1HfGh2ag="; + sha256 = "sha256-mJp4lb4pzjdjodHk2zLAEePn+oIPI/vTtU0YOIbmWDY="; }; - nativeBuildInputs = [ installShellFiles ]; + vendorSha256 = "sha256-8kk+KCanbnsizGRjF3qcxCBxC7Sx0zfptQFTETZp89E="; - vendorSha256 = "sha256-P1NxcjRA0g9NK2EaEG5E9G2TywTp5uvHesQE7+EG4ag="; + proxyVendor = true; + + nativeBuildInputs = [ installShellFiles ]; # Some tests violates sandbox constraints. doCheck = false; ldflags = [ - "-s" "-w" "-X github.com/neilotoole/sq/cli/buildinfo.Version=${version}" + "-s" + "-w" + "-X=github.com/neilotoole/sq/cli/buildinfo.Version=${version}" ]; postInstall = '' diff --git a/pkgs/development/tools/sshs/default.nix b/pkgs/development/tools/sshs/default.nix index c3fa7ce5cbdd..804a6a09642f 100644 --- a/pkgs/development/tools/sshs/default.nix +++ b/pkgs/development/tools/sshs/default.nix @@ -19,9 +19,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X github.com/quantumsheep/sshs/cmd.Version=${version}" ]; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Terminal user interface for SSH"; diff --git a/pkgs/development/tools/steamos-devkit/default.nix b/pkgs/development/tools/steamos-devkit/default.nix new file mode 100644 index 000000000000..8451f7f9898e --- /dev/null +++ b/pkgs/development/tools/steamos-devkit/default.nix @@ -0,0 +1,135 @@ +{ lib +, fetchFromGitHub +, fetchFromGitLab +, writeScript +, python3 +, copyDesktopItems +, makeDesktopItem +, pkg-config +, SDL2 +}: +let + # steamos-devkit requires a build of the unreleased pyimgui 2.0 branch, move to pythonPackages when 2.0 is released. + pyimgui = python3.pkgs.buildPythonPackage { + pname = "pyimgui"; + version = "unstable-2022-03-06"; + + src = fetchFromGitHub { + owner = "pyimgui"; + repo = "pyimgui"; + rev = "1f095af5886f424ee12f26fa93b108b6420fafa4"; # dev/version-2.0 branch + fetchSubmodules = true; + sha256 = "sha256-k070ue132m8H1Zm8bo7J7spCS5dSTGOj689ci7vJ+aw="; + }; + + nativeBuildInputs = with python3.pkgs; [ + cython + pkg-config + SDL2 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + pyopengl + pysdl2 + ]; + + # Requires OpenGL acceleration + doCheck = false; + pythonImportsCheck = [ "imgui" ]; + }; + steamos-devkit-script = '' + #!${python3.interpreter} + import os + + # Change the cwd to avoid imgui using cwd which often is ~ to store the state, use the same location as the settings + path = os.path.expanduser(os.path.join("~", ".devkit-client-gui")) + os.makedirs(path, exist_ok=True) + os.chdir(path) + + # Workaround to get pysdl to work on wayland, remove when https://gitlab.steamos.cloud/devkit/steamos-devkit/-/issues/1 is solved. + if os.environ.get("XDG_SESSION_TYPE") == "wayland": + os.environ["SDL_VIDEODRIVER"] = "wayland" + + import devkit_client.gui2 + devkit_client.gui2.main() + ''; +in +python3.pkgs.buildPythonPackage rec { + pname = "steamos-devkit"; + version = "0.20221101"; + + src = fetchFromGitLab { + domain = "gitlab.steamos.cloud"; + owner = "devkit"; + repo = "steamos-devkit"; + rev = "v${version}"; + sha256 = "sha256-VKnfcMF3WxkvqxlhJF+5j4Hso/TZpSS4dMOmSrWagRU="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + appdirs + bcrypt + cffi + cryptography + idna + ifaddr + netifaces + numpy + paramiko + pycparser + pyimgui + pynacl + pysdl2 + signalslot + six + ]; + + nativeBuildInputs = [ + copyDesktopItems + ]; + + postUnpack = '' + # Find the absolute source root to link correctly to the previous root + prevRoot=$(realpath $sourceRoot) + + # Update the source root to the devkit_client package + sourceRoot="$sourceRoot/client" + + # Link the setup script into the new source root + ln -s $prevRoot/setup/shiv-linux-setup.py $sourceRoot/setup.py + ''; + + postInstall = '' + mkdir -p $out/bin + + # These are various assets like scripts that steamos-devkit will copy to the remote device + cp -R ./devkit-utils $out/${python3.sitePackages}/devkit-utils + + # writeScript + symlink will be ignored by wrapPythonPrograms + # Copying it is undesirable too, just write it directly to a script instead + cat << EOF > $out/bin/steamos-devkit + ${steamos-devkit-script} + EOF + chmod +x $out/bin/steamos-devkit + ''; + + # There are no checks for steamos-devkit + doCheck = false; + pythonImportsCheck = [ "devkit_client" ]; + + desktopItems = [ + (makeDesktopItem { + name = "SteamOS-Devkit"; + exec = "steamos-devkit"; + desktopName = "SteamOS Devkit Client"; + }) + ]; + + meta = with lib; { + description = "SteamOS Devkit Client"; + homepage = "https://gitlab.steamos.cloud/devkit/steamos-devkit"; + license = licenses.mit; + maintainers = with maintainers; [ myaats ]; + }; +} diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 871fbb64b7fd..19187643d187 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.15.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cMT6+U9tfucPE5IkHjsWlzcD+nLQC24fqTyOhsTwFqk="; + sha256 = "sha256-DDK/ANBR0wH87/9wnZYwyYMbCl/N/m4KUvQJ/dB8las="; }; - cargoSha256 = "sha256-H8oD769xdsXIJWqfFCL76MIKrKkHUSTzzciuHJBdjyI="; + cargoSha256 = "sha256-xgOPjdy+uoUOdtYXq/lXR872QdzA1/r8Shi0q1E+e9Q="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' diff --git a/pkgs/development/tools/summon/default.nix b/pkgs/development/tools/summon/default.nix index 2ed17061c219..ab618253e7b1 100644 --- a/pkgs/development/tools/summon/default.nix +++ b/pkgs/development/tools/summon/default.nix @@ -1,7 +1,5 @@ { buildGoModule, fetchFromGitHub, lib, patchResolver ? true }: -with lib; - buildGoModule rec { pname = "summon"; version = "0.8.2"; @@ -19,7 +17,7 @@ buildGoModule rec { # Patches provider resolver to support resolving unqualified names # from $PATH, e.g. `summon -p gopass` instead of `summon -p $(which gopass)` - patches = optionals patchResolver [ ./resolve-paths.patch ]; + patches = lib.optionals patchResolver [ ./resolve-paths.patch ]; postInstall = '' mv $out/bin/cmd $out/bin/summon diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix new file mode 100644 index 000000000000..800d610a6d77 --- /dev/null +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, nix-update-script +}: + +buildGoModule rec { + pname = "supabase-cli"; + version = "1.29.3"; + + src = fetchFromGitHub { + owner = "supabase"; + repo = "cli"; + rev = "v${version}"; + sha256 = "sha256-VA2OU2lnrbqNrQgyxYz2fh+jrJkHWTIOVrdYBwaK2kI="; + }; + + vendorSha256 = "sha256-pzbwHnUCZkHmj+ZKJJ3zGG1pVHYlvoMMF3jx9FYg01U="; + + ldflags = [ "-s" "-w" "-X" "github.com/supabase/cli/cmd.version=${version}" ]; + + doCheck = false; # tests are trying to connect to localhost + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + rm $out/bin/{codegen,docgen,listdep} + mv $out/bin/{cli,supabase} + + installShellCompletion --cmd supabase \ + --bash <($out/bin/supabase completion bash) \ + --fish <($out/bin/supabase completion fish) \ + --zsh <($out/bin/supabase completion zsh) + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "A CLI for interacting with supabase"; + homepage = "https://github.com/supabase/cli"; + license = licenses.mit; + maintainers = with maintainers; [ gerschtli ]; + mainProgram = "supabase"; + }; +} diff --git a/pkgs/development/tools/swiftpm2nix/default.nix b/pkgs/development/tools/swiftpm2nix/default.nix new file mode 100644 index 000000000000..25d6b06ef98b --- /dev/null +++ b/pkgs/development/tools/swiftpm2nix/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, callPackage, makeWrapper, jq, nix-prefetch-git }: + +stdenv.mkDerivation { + name = "swiftpm2nix"; + + nativeBuildInputs = [ makeWrapper ]; + + dontUnpack = true; + + installPhase = '' + install -vD ${./swiftpm2nix.sh} $out/bin/swiftpm2nix + wrapProgram $out/bin/$name \ + --prefix PATH : ${lib.makeBinPath [ jq nix-prefetch-git ]} \ + ''; + + preferLocalBuild = true; + + passthru = callPackage ./support.nix { }; + + meta = { + description = "Generate a Nix expression to fetch swiftpm dependencies"; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/swiftpm2nix/support.nix b/pkgs/development/tools/swiftpm2nix/support.nix new file mode 100644 index 000000000000..94076517ebfc --- /dev/null +++ b/pkgs/development/tools/swiftpm2nix/support.nix @@ -0,0 +1,56 @@ +{ lib, fetchgit, formats }: +with lib; +let + json = formats.json { }; +in rec { + + # Derive a pin file from workspace state. + mkPinFile = workspaceState: + assert workspaceState.version == 5; + json.generate "Package.resolved" { + version = 1; + object.pins = map (dep: { + package = dep.packageRef.name; + repositoryURL = dep.packageRef.location; + state = dep.state.checkoutState; + }) workspaceState.object.dependencies; + }; + + # Make packaging helpers from swiftpm2nix generated output. + helpers = generated: let + inherit (import generated) workspaceStateFile hashes; + workspaceState = builtins.fromJSON (builtins.readFile workspaceStateFile); + pinFile = mkPinFile workspaceState; + in rec { + + # Create fetch expressions for dependencies. + sources = listToAttrs ( + map (dep: nameValuePair dep.subpath (fetchgit { + url = dep.packageRef.location; + rev = dep.state.checkoutState.revision; + sha256 = hashes.${dep.subpath}; + })) workspaceState.object.dependencies + ); + + # Configure phase snippet for use in packaging. + configure = '' + mkdir -p .build/checkouts + ln -sf ${pinFile} ./Package.resolved + install -m 0600 ${workspaceStateFile} ./.build/workspace-state.json + '' + + concatStrings (mapAttrsToList (name: src: '' + ln -s '${src}' '.build/checkouts/${name}' + '') sources) + + '' + # Helper that makes a swiftpm dependency mutable by copying the source. + swiftpmMakeMutable() { + local orig="$(readlink .build/checkouts/$1)" + rm .build/checkouts/$1 + cp -r "$orig" .build/checkouts/$1 + chmod -R u+w .build/checkouts/$1 + } + ''; + + }; + +} diff --git a/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh b/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh new file mode 100755 index 000000000000..72051b4e448d --- /dev/null +++ b/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +# Generates a Nix expression to fetch swiftpm dependencies, and a +# configurePhase snippet to prepare a working directory for swift-build. + +set -eu -o pipefail +shopt -s lastpipe + +stateFile=".build/workspace-state.json" +if [[ ! -f "$stateFile" ]]; then + echo >&2 "Missing $stateFile. Run 'swift package resolve' first." + exit 1 +fi + +if [[ "$(jq .version $stateFile)" != "5" ]]; then + echo >&2 "Unsupported $stateFile version" + exit 1 +fi + +# Iterate dependencies and prefetch. +hashes="" +jq -r '.object.dependencies[] | "\(.subpath) \(.packageRef.location) \(.state.checkoutState.revision)"' $stateFile \ +| while read -r name url rev; do + echo >&2 "-- Fetching $name" + sha256="$(nix-prefetch-git $url $rev | jq -r .sha256)" + hashes+=" + \"$name\" = \"$sha256\";" + echo >&2 +done +hashes+=$'\n'" " + +# Generate output. +mkdir -p nix +# Copy the workspace state, but clear 'artifacts'. +jq '.object.artifacts = []' < $stateFile > nix/workspace-state.json +# Build an expression for fetching sources, and preparing the working directory. +cat > nix/default.nix << EOF +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = {$hashes}; +} +EOF +echo >&2 "-- Generated ./nix" diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index 0812e35a04e3..8de028a4add9 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,22 +2,30 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.4.19"; - vendorSha256 = "sha256-P5KEliTqj9kGYffhl014QK6qPY9gLG+bViOz4dtsQwA="; + version = "5.4.21"; + vendorHash = "sha256-P5KEliTqj9kGYffhl014QK6qPY9gLG+bViOz4dtsQwA="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-GAsyI8I+tHFMV/LqwPx2ph+w3zaqKSn9vieVQcuO+y0="; + sha256 = "sha256-lNEd5mj5K8MhlLkrRiFnEqVLnS+4mx7FNAtYuF5jdC0="; }; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + postInstall = '' mv $out/bin/symfony-cli $out/bin/symfony ''; # Tests requires network access - doCheck = false; + checkPhase = '' + $GOPATH/bin/symfony-cli + ''; meta = with lib; { description = "Symfony CLI"; diff --git a/pkgs/development/tools/tabnine/sources.json b/pkgs/development/tools/tabnine/sources.json index e6587ea6bcb1..14ee825c72c0 100644 --- a/pkgs/development/tools/tabnine/sources.json +++ b/pkgs/development/tools/tabnine/sources.json @@ -1,17 +1,17 @@ { - "version": "4.4.169", + "version": "4.4.186", "platforms": { "x86_64-linux": { "name": "x86_64-unknown-linux-musl", - "hash": "sha256-gLhFSsOcMElm6a4oHM0yLL6ZGtSk+YvAsUTU/UgGwWg=" + "hash": "sha256-J/VzIxCxttKB4ggLLxyK596k0U1mh6jqaBrzTRxL32Q=" }, "aarch64-darwin": { "name": "aarch64-apple-darwin", - "hash": "sha256-nEUPSj1BFkZ1VyeA7X3Y0zt6eeD4AKAIcJ51QF24JVA=" + "hash": "sha256-quIINq0ocD5k/KyB/N3yBTqyW3GSljAuoaPp4JNYvMw=" }, "x86_64-darwin": { "name": "x86_64-apple-darwin", - "hash": "sha256-GePhGKPvvhYmOSN5NEaqcsFvyuSJi8eTfYTOtufmDiI=" + "hash": "sha256-lYmKgRi43MDyy7jZn8J/PFHgBE9UdjF1bqx2wrMJ4uU=" } } } diff --git a/pkgs/development/tools/tapview/default.nix b/pkgs/development/tools/tapview/default.nix index 966df4bed65e..19c1113c5cd4 100644 --- a/pkgs/development/tools/tapview/default.nix +++ b/pkgs/development/tools/tapview/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-inrxICNglZU/tup+YnHaDiVss32K2OXht/7f8lOZI4g="; }; - # Remove unecessary `echo` checks: `/bin/echo` fails, and `echo -n` works as expected. + # Remove unnecessary `echo` checks: `/bin/echo` fails, and `echo -n` works as expected. patches = [ ./dont_check_echo.patch ]; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/tools/tarmac/default.nix b/pkgs/development/tools/tarmac/default.nix new file mode 100644 index 000000000000..15e5ecfe10a8 --- /dev/null +++ b/pkgs/development/tools/tarmac/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl_1_1 +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "tarmac"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "Roblox"; + repo = "tarmac"; + rev = "v${version}"; + sha256 = "sha256-O6qrAzGiAxiE56kpuvH/jDKHRXxHZ2SlDL5nwOOd4EU="; + }; + + cargoSha256 = "sha256-QnpowYv/TBXjPHK8z6KAzN3gSsfNOf9POybqsyugeWc="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl_1_1 + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; + + meta = with lib; { + description = "Resource compiler and asset manager for Roblox"; + longDescription = '' + Tarmac is a resource compiler and asset manager for Roblox projects. + It helps enable hermetic place builds when used with tools like Rojo. + ''; + homepage = "https://github.com/Roblox/tarmac"; + downloadPage = "https://github.com/Roblox/tarmac/releases/tag/v${version}"; + changelog = "https://github.com/Roblox/tarmac/raw/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ wackbyte ]; + }; +} diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index 2e54aeb3046d..428bb2f417b6 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -1,23 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, AppKit, Security }: +{ lib, rustPlatform, fetchCrate, installShellFiles, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "the-way"; - version = "0.17.1"; + version = "0.19.1"; - src = fetchFromGitHub { - owner = "out-of-cheese-error"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Imo1CUk2H4/K9w/FnIBEkKFXd7OIAuApejcNY+rs7JU="; + src = fetchCrate { + inherit pname version; + sha256 = "sha256-d4ws5EsYVaxjfDbzoMO3kcJsrk/Htw3Ath3z3UGW7rk="; }; + cargoSha256 = "sha256-6zphQRhh32iophXSuzbQC5BOuKM92sLS5vXndwF+spg="; + nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ AppKit Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + ]; - cargoSha256 = "sha256-3ZiNRXrb3gpXXOxztf0eimJE16PpQTD/OWFmeTDIr2w="; - checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=copy" ]; - dontUseCargoParallelTests = true; + useNextest = true; postInstall = '' $out/bin/the-way config default tmp.toml @@ -30,7 +30,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Terminal code snippets manager"; homepage = "https://github.com/out-of-cheese-error/the-way"; + changelog = "https://github.com/out-of-cheese-error/the-way/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ numkem ]; + maintainers = with maintainers; [ figsoda numkem ]; }; } diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index c21fc474fe29..9a9acec17294 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, sconsPackages, lua }: +{ lib, stdenv, fetchFromGitHub, cmake, lua }: stdenv.mkDerivation rec { version = "1.0.93"; @@ -11,16 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0zd55bc8smmgk9j4cf0jpibb03lgsvl0knpwhplxbv93mcdnw7s0"; }; - nativeBuildInputs = [ sconsPackages.scons_3_0_1 ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ lua ]; patches = [ ./environ-and-linux-is-kinda-posix.patch ./headers.patch ]; - preConfigure = '' - substituteInPlace config_posix.py \ - --replace /usr/local $out - ''; - meta = with lib; { description = "A tool to integrate C/Cpp code with Lua"; homepage = "http://www.codenix.com/~tolua/"; diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index 074dfd142c17..210700fb8c30 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -6,13 +6,13 @@ let disableLTO = stdenv.cc.isClang && stdenv.isDarwin; # workaround issue #19098 in stdenv.mkDerivation rec { pname = "tracy"; - version = "0.8.2.1"; + version = "0.9"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "sha256-SVzNy0JP/JrUYgelypBn8SPO+Ksm1rq2yGnxk1hCLkQ="; + sha256 = "sha256-cdVkY1dSag37JdbsoJp2/0QHO5G+zsftqwBVqRpMiew="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/treefmt/default.nix b/pkgs/development/tools/treefmt/default.nix index 2ffbd4a1bed6..221c9847cba8 100644 --- a/pkgs/development/tools/treefmt/default.nix +++ b/pkgs/development/tools/treefmt/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "treefmt"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - hash = "sha256-+EcqrmjZR8pkBiIXpdJ/KfmTm719lgz7oC9tH7OhJKY="; + hash = "sha256-v+hXWyrY0GfSgXeqgYLgoOmeiHsZyhRO9Fmj5rPiNJ8="; }; - cargoSha256 = "sha256-DXsKUeSmNUIKPsvrLxkg+Kp78rEfjmJQYf2pj1LWW38="; + cargoSha256 = "sha256-/WyaZxRFYJmz/qRp2s2v8swdwAtuNR7KXND20IzQoy8="; meta = { description = "one CLI to format the code tree"; diff --git a/pkgs/development/tools/trunk-io/default.nix b/pkgs/development/tools/trunk-io/default.nix index 293a73ceff5a..778412e98160 100644 --- a/pkgs/development/tools/trunk-io/default.nix +++ b/pkgs/development/tools/trunk-io/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "trunk-io"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { url = "https://trunk.io/releases/launcher/${version}/trunk"; - sha256 = "sha256-+A9FUqcxF/zji2QGD50avYSAib4sq8u6R50YzRailMc="; + hash = "sha256-arWege61fb7NiYSIL3ZaDQr75QEbDDJ7rVgdRUKqP4A="; }; dontUnpack = true; diff --git a/pkgs/development/tools/ttfb/default.nix b/pkgs/development/tools/ttfb/default.nix new file mode 100644 index 000000000000..a3b8898eacf4 --- /dev/null +++ b/pkgs/development/tools/ttfb/default.nix @@ -0,0 +1,45 @@ +{ darwin +, fetchCrate +, lib +, openssl +, pkg-config +, rustPlatform +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "ttfb"; + version = "1.6.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-o7kzQ8jtAqDwTUPtjeNqgotxREeWl7jQG+EDrYWJL/Q="; + }; + + cargoSha256 = "sha256-ayyYrrFDVOYVjVo5TLaRn2mvmywe5BjQ7kRVV2r0iK8="; + + # The bin feature activates all dependencies of the binary. Otherwise, + # only the library is build. + buildFeatures = [ "bin" ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "CLI-Tool to measure the TTFB (time to first byte) of HTTP(S) requests"; + longDescription = '' + This crate measures the times of DNS lookup, TCP connect, TLS handshake, and HTTP's TTFB + for a given IP or domain. + ''; + homepage = "https://github.com/phip1611/ttfb"; + changelog = "https://github.com/phip1611/ttfb/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ phip1611 ]; + }; +} + diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix new file mode 100644 index 000000000000..983e91e62e66 --- /dev/null +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenvNoCC, nodejs, fetchzip, testers }: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "twilio-cli"; + version = "5.3.3"; + + src = fetchzip { + url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; + sha256 = "sha256-4ZgPytpv2yxKXADGR4I5+U0YjsvGEvcaF0cGrCJ21aI="; + }; + + buildInputs = [ nodejs ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/libexec/twilio-cli + cp -R . $out/libexec/twilio-cli + ln -s $out/libexec/twilio-cli/bin/run $out/bin/twilio + + runHook postInstall + ''; + + passthru.tests = testers.testVersion { + package = finalAttrs.finalPackage; + command = "twilio version"; + }; + + meta = with lib; { + description = "Unleash the power of Twilio from your command prompt"; + homepage = "https://github.com/twilio/twilio-cli"; + changelog = "https://github.com/twilio/twilio-cli/blob/${version}/CHANGES.md"; + license = licenses.mit; + maintainers = with maintainers; [ marsam ]; + platforms = nodejs.meta.platforms; + mainProgram = "twilio"; + }; +}) diff --git a/pkgs/development/tools/txtpbfmt/default.nix b/pkgs/development/tools/txtpbfmt/default.nix index 3f1c9eab0475..a4e26cfb4cb6 100644 --- a/pkgs/development/tools/txtpbfmt/default.nix +++ b/pkgs/development/tools/txtpbfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "txtpbfmt"; - version = "unstable-2022-06-08"; + version = "unstable-2023-01-18"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "txtpbfmt"; - rev = "fc78c767cd6a4e6e3953f5d72f1e0e4c5811990b"; - sha256 = "sha256-5Pj2REFrzWCzrqdplNlyfX+sJqPjXEld6MFNy0S3MFM="; + rev = "fcc1fa29197ce17bc56812f84f5ff311f767fcd1"; + hash = "sha256-U+Kk2tQw+rJX7Xa8b5Hd7x0xY/6PN6TTYsLJkpB1Osg="; }; - vendorSha256 = "sha256-shjcQ3DJQYeAW0bX3OuF/esgIvrQ4yuLEa677iFV82g="; + vendorHash = "sha256-shjcQ3DJQYeAW0bX3OuF/esgIvrQ4yuLEa677iFV82g="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 5c2550e89093..87ec2964a00b 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.11.1"; + version = "1.13.9"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-jQmihZl1mKBHg7HLKAbe9uuL1QM+cF0beFj8htz0IOU="; + hash = "sha256-dAe19D9q5JXeWCnsfbz0NnAtnAQj0dyIy6cdyjqVxEg="; }; - cargoHash = "sha256-bO9QMMJY+gQyV811qXdwiH1oxW+5Q+dZqG/oT35Eze4="; + cargoHash = "sha256-gc3tDTsmgvMfLbWh5XALEpZuK6e8FXsomfq4U/xTPXM="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index 84506906b6c6..6488ff63d665 100644 --- a/pkgs/development/tools/uftrace/default.nix +++ b/pkgs/development/tools/uftrace/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uftrace"; - version = "0.12"; + version = "0.13"; src = fetchFromGitHub { owner = "namhyung"; repo = "uftrace"; rev = "v${version}"; - sha256 = "sha256-YjeZGjSctnhbHqWikdVhiEl0hr/qrA4S4JbCJscXe7A="; + sha256 = "sha256-czVKliF9qvA9TG4KJKs2X0VDfJi4vHwbVeuLZViwpdg="; }; postUnpack = '' diff --git a/pkgs/development/tools/uniffi-bindgen/default.nix b/pkgs/development/tools/uniffi-bindgen/default.nix index 4e9d738ca30a..194cb4ac173b 100644 --- a/pkgs/development/tools/uniffi-bindgen/default.nix +++ b/pkgs/development/tools/uniffi-bindgen/default.nix @@ -6,18 +6,19 @@ , yapf , rubocop , rustfmt +, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "uniffi-bindgen"; - version = "0.20.0"; + version = "0.22.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-E0OMMg9GuZCwPuJKzMpN0PNxZicGW1blD322Jl01qQE="; + sha256 = "sha256-cUJsfAlzdoGMeFcdXwdPU0JcruneY60pssJPkJtb5gs="; }; - cargoSha256 = "sha256-REY88irDm45JOBwdb79JVrIyfuOB6HcAgIzYO65O0uE="; + cargoSha256 = "sha256-k5uIR5rO4T1Xsu50vdLxCgSsVkNcxXHT4MitnMZkY6g="; nativeBuildInputs = [ makeWrapper ]; @@ -31,6 +32,8 @@ rustPlatform.buildRustPackage rec { --suffix PATH : ${lib.strings.makeBinPath [ ktlint yapf rubocop rustfmt ] } ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Toolkit for building cross-platform software components in Rust"; homepage = "https://mozilla.github.io/uniffi-rs/"; diff --git a/pkgs/development/tools/upbound/default.nix b/pkgs/development/tools/upbound/default.nix index e1ff9841353d..59f0c9d247cf 100644 --- a/pkgs/development/tools/upbound/default.nix +++ b/pkgs/development/tools/upbound/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "upbound"; - version = "0.12.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = pname; repo = "up"; rev = "v${version}"; - sha256 = "sha256-tbYUxqDtMIlHJ+bIE9PDDhPTSQKaZYObuRFSyRkh8+Y="; + sha256 = "sha256-0nCGBHyaAgSKn+gkiORe3PCuJFiPEN9yRO3vn0tyji8="; }; - vendorSha256 = "sha256-EeGNH/ka9Mt0vVtZfizXdTqf1f3H1aM5GITUyp+2FxM="; + vendorSha256 = "sha256-eueYdAlcH1hqE6EKrwpOrchVYhZg76Fgn9oh8sbNuxU="; subPackages = [ "cmd/docker-credential-up" "cmd/up" ]; diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix index 13c8ff8d0df1..23c3b4a5c098 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.32.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-VuOf+8PgscoHNVPO8gDoFGGPSBxO5BNLpmUJnYL898s="; + sha256 = "sha256-IgPUqIR9xuLEglVqVHz2KvqqCHpCPYv8TX+Z6q5xCNA="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index 5d48a7a3babe..f10c38539a22 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails. disabled = ! pythonAtLeast "3.5"; - checkInputs = [ pytest pytest-cov ]; + nativeCheckInputs = [ pytest pytest-cov ]; propagatedBuildInputs = [ ansicolor chardet pyyaml setuptools ]; # Unpin test dependency versions. This is fixed in master but not yet released. diff --git a/pkgs/development/tools/vsce/default.nix b/pkgs/development/tools/vsce/default.nix new file mode 100644 index 000000000000..89959b544ed8 --- /dev/null +++ b/pkgs/development/tools/vsce/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, buildNpmPackage +, fetchFromGitHub +, pkg-config +, libsecret +, python3 +, testers +, vsce +}: + +buildNpmPackage rec { + pname = "vsce"; + version = "2.15.0"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "vscode-vsce"; + rev = "v${version}"; + hash = "sha256-WDKOHQV6J22l0ELmXwl5BC5x7MsI6TAMeU3oBFpwqx4="; + }; + + npmDepsHash = "sha256-i2LpQ/4MwkUGTUhih0ybLv5np45j7m4kCx9IOBIgtXo="; + + postPatch = '' + substituteInPlace package.json --replace '"version": "0.0.0"' '"version": "${version}"' + ''; + + nativeBuildInputs = [ pkg-config python3 ]; + + buildInputs = [ libsecret ]; + + makeCacheWritable = true; + npmFlags = [ "--legacy-peer-deps" ]; + + passthru.tests.version = testers.testVersion { + package = vsce; + }; + + meta = with lib; { + homepage = "https://github.com/microsoft/vscode-vsce"; + description = "Visual Studio Code Extension Manager"; + maintainers = with maintainers; [ aaronjheng ]; + license = licenses.mit; + }; +} + diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 4f6a766e5e96..17e898301956 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -22,7 +22,7 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.231.0"; + version = "1.3.236.0"; # If we were to use "dev" here instead of headers, the setupHook would be # placed in that output instead of "out". @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "sdk-${version}"; - hash = "sha256-5bzUauu8081zyRaWmRUtOxHjUU4gc1GWoJtU783Msh0="; + hash = "sha256-+VbiXtxzYaF5o+wIrJ+09LmgBdaLv/0VJGFDnBkrXms="; }); # Include absolute paths to layer libraries in their associated diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index 31fc7270c231..673c3dbbdad5 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.31"; + version = "1.0.32"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "sha256-EChOQTWGt/LUfwCxmMmYC+zHjW9hVvghhOGr4DfpNtQ="; + sha256 = "sha256-kLPs/9tQtvUEOGsLtnK0uqJnCWTHR6JU7BCwtFEmIlQ="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index 714354b0597a..0b6dc6ab05f1 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "wails"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g5tZUVOZ2ywD2vS9B3y3GHaoABr2rSIZGUOsdUJOL8Q="; + sha256 = "sha256-WKA21bU7H9V/X3oPGTgf8ysXX91/tjfEqEzkBMgtMRM="; } + "/v2"; - vendorSha256 = "sha256-jRW8SROt0CON17xZ+I3WiQow7yC1ly7pPHgbpEr1kW8="; + vendorSha256 = "sha256-MPdAl8fwIoO+0IDTWVDktQND/BM/v7sms13l9PNjKDY="; proxyVendor = true; diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index adc088baf217..ec336d422ab1 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.83"; + version = "0.2.84"; src = fetchCrate { inherit pname version; - sha256 = "sha256-+PWxeRL5MkIfJtfN3/DjaDlqRgBgWZMa6dBt1Q+lpd0="; + sha256 = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk="; }; - cargoSha256 = "sha256-GwLeA6xLt7I+NzRaqjwVpt1pzRex1/snq30DPv4FR+g="; + cargoSha256 = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - checkInputs = [ nodejs ]; + nativeCheckInputs = [ nodejs ]; # other tests require it to be ran in the wasm-bindgen monorepo cargoTestFlags = [ "--test=interface-types" ]; diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix index 58b4b89ad9aa..6f5d9162c5b7 100644 --- a/pkgs/development/tools/wasmedge/default.nix +++ b/pkgs/development/tools/wasmedge/default.nix @@ -26,7 +26,7 @@ llvmPackages.stdenv.mkDerivation rec { nativeBuildInputs = [ cmake llvmPackages.lld ]; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" diff --git a/pkgs/development/tools/winhelpcgi/default.nix b/pkgs/development/tools/winhelpcgi/default.nix new file mode 100644 index 000000000000..cd7bfe344357 --- /dev/null +++ b/pkgs/development/tools/winhelpcgi/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, libwmf, libpng, pkg-config, lib }: stdenv.mkDerivation { + name = "winhelpcgi-1.0-rc3"; + + src = fetchurl { + url = "http://www.herdsoft.com/ftp/winhelpcgi_1.0-1.tar.gz"; + sha256 = "sha256-9HIs50ZGoTfGixD9c/DQs0KJMQtmfsDVB8qRMnQtXNw="; + + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libwmf libpng ]; + + meta = { + description = "CGI module for Linux, Solaris, MacOS X and AIX to read Windows Help Files"; + + homepage = "http://www.herdsoft.com/linux/produkte/winhelpcgi.html"; + + license = lib.licenses.gpl2Only; + + maintainers = [ lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/development/tools/wlcs/default.nix b/pkgs/development/tools/wlcs/default.nix new file mode 100644 index 000000000000..7a5470a33423 --- /dev/null +++ b/pkgs/development/tools/wlcs/default.nix @@ -0,0 +1,72 @@ +{ stdenv +, lib +, gitUpdater +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, boost +, gtest +, wayland +}: + +stdenv.mkDerivation rec { + pname = "wlcs"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "MirServer"; + repo = "wlcs"; + rev = "v${version}"; + hash = "sha256-QxmWxu+w77/WE5pGXMWXm+NP95QmYo2O8ltZYrgCIWw="; + }; + + patches = [ + # Improves pkg-config paths even more + # Remove when https://github.com/MirServer/wlcs/pull/260 merged & in a release + (fetchpatch { + name = "0001-wlcs-pkgsconfig-Use-better-path-concatenations.patch"; + url = "https://github.com/MirServer/wlcs/pull/260/commits/20f28d82fa4dfa6a6e27212dbd6b0f2e8a833c69.patch"; + hash = "sha256-m8zPD27JbX/vN2YQgNhcRsh/O+qLfvoeky5E5ZEeD1I="; + }) + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + boost + gtest + wayland + ]; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + + meta = with lib; { + description = "Wayland Conformance Test Suite"; + longDescription = '' + wlcs aspires to be a protocol-conformance-verifying test suite usable by Wayland + compositor implementors. + + It is growing out of porting the existing Weston test suite to be run in Mir's + test suite, but it is designed to be usable by any compositor. + + wlcs relies on compositors providing an integration module, providing wlcs with + API hooks to start a compositor, connect a client, move a window, and so on. + This makes both writing and debugging tests easier - the tests are (generally) + in the same address space as the compositor, so there is a consistent global + clock available, it's easier to poke around in compositor internals, and + standard debugging tools can follow control flow from the test client to the + compositor and back again. + ''; + homepage = "https://github.com/MirServer/wlcs"; + changelog = "https://github.com/MirServer/wlcs/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/wp4nix/default.nix b/pkgs/development/tools/wp4nix/default.nix index a97ae7737064..8460cb7d94e2 100644 --- a/pkgs/development/tools/wp4nix/default.nix +++ b/pkgs/development/tools/wp4nix/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "sha256-WJteeFUMr684yZEtUP13MqRjJ1UAeo48AzOPdLEE65w="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/tools/wxformbuilder/default.nix b/pkgs/development/tools/wxformbuilder/default.nix index b8db2d4aac43..9e4d2caabc30 100644 --- a/pkgs/development/tools/wxformbuilder/default.nix +++ b/pkgs/development/tools/wxformbuilder/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation { homepage = "https://github.com/wxFormBuilder/wxFormBuilder"; license = licenses.gpl2Only; maintainers = with maintainers; [ matthuszagh wegank ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/xcbuild/sdks.nix b/pkgs/development/tools/xcbuild/sdks.nix index 5ff3ca6808dc..e1b8254d7fd8 100644 --- a/pkgs/development/tools/xcbuild/sdks.nix +++ b/pkgs/development/tools/xcbuild/sdks.nix @@ -2,7 +2,7 @@ , writeText, version, xcodePlatform }: let - inherit (lib.generators) toPlist; + inherit (lib.generators) toPlist toJSON; SDKSettings = { CanonicalName = sdkName; @@ -22,6 +22,7 @@ in runCommand "SDKs" {} '' sdk=$out/${sdkName}.sdk install -D ${writeText "SDKSettings.plist" (toPlist {} SDKSettings)} $sdk/SDKSettings.plist + install -D ${writeText "SDKSettings.json" (toJSON {} SDKSettings)} $sdk/SDKSettings.json install -D ${writeText "SystemVersion.plist" (toPlist {} SystemVersion)} $sdk/System/Library/CoreServices/SystemVersion.plist ln -s $sdk $sdk/usr diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 2dbea4e3833a..35eddd40f859 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -77,7 +77,7 @@ while [ $# -gt 0 ]; do --toolchain | -toolchain) shift ;; --find | -find | -f) shift - command -v $1 ;; + command -v $1 || exit 1 ;; --log | -log) ;; # noop --verbose | -verbose) ;; # noop --no-cache | -no-cache) ;; # noop diff --git a/pkgs/development/tools/yamlpath/default.nix b/pkgs/development/tools/yamlpath/default.nix index 55e86e42da4a..2a2abf9cf018 100644 --- a/pkgs/development/tools/yamlpath/default.nix +++ b/pkgs/development/tools/yamlpath/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "yamlpath"; - version = "3.6.9"; + version = "3.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "wwkimball"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-0r1jlDWlYPIjUEudHbwt324rt0H8K3PUb7RILoxNNnw="; + sha256 = "sha256-07WP3VoWtcUwqkJOC9FcYxV0832DH6KPcGIDAn1QEYc="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { ruamel-yaml ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ hiera-eyaml mock pytest-console-scripts diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index b3bc6bc62b95..f642b22ef279 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -1,30 +1,40 @@ -{ lib, stdenv, nodejs, fetchzip, testers, yarn }: +{ lib, fetchFromGitHub, fetchzip, nodejs, stdenvNoCC, testers }: -stdenv.mkDerivation rec { +let + completion = fetchFromGitHub { + owner = "dsifford"; + repo = "yarn-completion"; + rev = "v0.17.0"; + hash = "sha256-z7KPXeYPPRuaEPxgY6YqsLt9n8cSsW3n2FhOzVde1HU="; + }; +in +stdenvNoCC.mkDerivation (finalAttrs: { pname = "yarn"; version = "1.22.19"; src = fetchzip { - url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; + url = "https://github.com/yarnpkg/yarn/releases/download/v${finalAttrs.version}/yarn-v${finalAttrs.version}.tar.gz"; sha256 = "sha256-12wUuWH+kkqxAgVYkyhIYVtexjv8DFP9kLpFLWg+h0o="; }; buildInputs = [ nodejs ]; installPhase = '' - mkdir -p $out/{bin,libexec/yarn/} + mkdir -p $out/{bin,libexec/yarn/,share/bash-completion/completions/} cp -R . $out/libexec/yarn ln -s $out/libexec/yarn/bin/yarn.js $out/bin/yarn ln -s $out/libexec/yarn/bin/yarn.js $out/bin/yarnpkg + ln -s ${completion}/yarn-completion.bash $out/share/bash-completion/completions/yarn.bash ''; - passthru.tests = testers.testVersion { package = yarn; }; + passthru.tests = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { - homepage = "https://yarnpkg.com/"; description = "Fast, reliable, and secure dependency management for javascript"; + homepage = "https://classic.yarnpkg.com/"; + changelog = "https://github.com/yarnpkg/yarn/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.bsd2; - maintainers = with maintainers; [ offline screendriver ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ offline screendriver marsam ]; + platforms = nodejs.meta.platforms; }; -} +}) diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/.prettierignore b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/.prettierignore new file mode 100644 index 000000000000..3c3629e647f5 --- /dev/null +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/.prettierignore @@ -0,0 +1 @@ +node_modules diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js index d2152f9c5e49..4e15cfc218f2 100755 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js @@ -1,14 +1,14 @@ #!/usr/bin/env node -const fs = require('fs') -const lockfile = require('@yarnpkg/lockfile') -const { docopt } = require('docopt') -const deepEqual = require('deep-equal') -const R = require('ramda') +const fs = require("fs"); +const lockfile = require("@yarnpkg/lockfile"); +const { docopt } = require("docopt"); +const deepEqual = require("deep-equal"); +const R = require("ramda"); -const fixPkgAddMissingSha1 = require('../lib/fixPkgAddMissingSha1') -const mapObjIndexedReturnArray = require('../lib/mapObjIndexedReturnArray') -const generateNix = require('../lib/generateNix') +const fixPkgAddMissingSha1 = require("../lib/fixPkgAddMissingSha1"); +const mapObjIndexedReturnArray = require("../lib/mapObjIndexedReturnArray"); +const generateNix = require("../lib/generateNix"); const USAGE = ` Usage: yarn2nix [options] @@ -19,11 +19,11 @@ Options: --no-patch Don't patch the lockfile if hashes are missing --lockfile=FILE Specify path to the lockfile [default: ./yarn.lock]. --builtin-fetchgit Use builtin fetchGit for git dependencies to support on-the-fly generation of yarn.nix without an internet connection -` +`; -const options = docopt(USAGE) +const options = docopt(USAGE); -const data = fs.readFileSync(options['--lockfile'], 'utf8') +const data = fs.readFileSync(options["--lockfile"], "utf8"); // json example: @@ -45,10 +45,10 @@ const data = fs.readFileSync(options['--lockfile'], 'utf8') // } // } -const json = lockfile.parse(data) +const json = lockfile.parse(data); -if (json.type !== 'success') { - throw new Error('yarn.lock parse error') +if (json.type !== "success") { + throw new Error("yarn.lock parse error"); } // Check for missing hashes in the yarn.lock and patch if necessary @@ -56,35 +56,35 @@ if (json.type !== 'success') { let pkgs = R.pipe( mapObjIndexedReturnArray((value, key) => ({ ...value, - nameWithVersion: key, + nameWithVersion: key })), - R.uniqBy(R.prop('resolved')), -)(json.object) + R.uniqBy(R.prop("resolved")) +)(json.object); -;(async () => { - if (!options['--no-patch']) { - pkgs = await Promise.all(R.map(fixPkgAddMissingSha1, pkgs)) +(async () => { + if (!options["--no-patch"]) { + pkgs = await Promise.all(R.map(fixPkgAddMissingSha1, pkgs)); } - const origJson = lockfile.parse(data) + const origJson = lockfile.parse(data); if (!deepEqual(origJson, json)) { - console.error('found changes in the lockfile', options['--lockfile']) + console.error("found changes in the lockfile", options["--lockfile"]); - if (options['--no-patch']) { - console.error('...aborting') - process.exit(1) + if (options["--no-patch"]) { + console.error("...aborting"); + process.exit(1); } - fs.writeFileSync(options['--lockfile'], lockfile.stringify(json.object)) + fs.writeFileSync(options["--lockfile"], lockfile.stringify(json.object)); } - if (!options['--no-nix']) { + if (!options["--no-nix"]) { // print to stdout - console.log(generateNix(pkgs, options['--builtin-fetchgit'])) + console.log(generateNix(pkgs, options["--builtin-fetchgit"])); } })().catch(error => { - console.error(error) + console.error(error); - process.exit(1) -}) + process.exit(1); +}); diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 76d1df8be645..3af3e43fe21d 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -2,7 +2,7 @@ , nodejs ? pkgs.nodejs , yarn ? pkgs.yarn , allowAliases ? pkgs.config.allowAliases -}: +}@inputs: let inherit (pkgs) stdenv lib fetchurl linkFarm callPackage git rsync makeWrapper runCommandLocal; @@ -70,6 +70,8 @@ in rec { offlineCache ? importOfflineCache yarnNix, yarnFlags ? [ ], ignoreScripts ? true, + nodejs ? inputs.nodejs, + yarn ? inputs.yarn.override { nodejs = nodejs; }, pkgConfig ? {}, preBuild ? "", postBuild ? "", @@ -169,6 +171,8 @@ in rec { src, packageJSON ? src + "/package.json", yarnLock ? src + "/yarn.lock", + nodejs ? inputs.nodejs, + yarn ? inputs.yarn.override { nodejs = nodejs; }, packageOverrides ? {}, ... }@attrs: @@ -226,7 +230,7 @@ in rec { inherit name; value = mkYarnPackage ( builtins.removeAttrs attrs ["packageOverrides"] - // { inherit src packageJSON yarnLock packageResolutions workspaceDependencies; } + // { inherit src packageJSON yarnLock nodejs yarn packageResolutions workspaceDependencies; } // lib.attrByPath [name] {} packageOverrides ); }) @@ -241,6 +245,8 @@ in rec { yarnLock ? src + "/yarn.lock", yarnNix ? mkYarnNix { inherit yarnLock; }, offlineCache ? importOfflineCache yarnNix, + nodejs ? inputs.nodejs, + yarn ? inputs.yarn.override { nodejs = nodejs; }, yarnFlags ? [ ], yarnPreBuild ? "", yarnPostBuild ? "", @@ -268,7 +274,7 @@ in rec { preBuild = yarnPreBuild; postBuild = yarnPostBuild; workspaceDependencies = workspaceDependenciesTransitive; - inherit packageJSON pname version yarnLock offlineCache yarnFlags pkgConfig packageResolutions; + inherit packageJSON pname version yarnLock offlineCache nodejs yarn yarnFlags pkgConfig packageResolutions; }; publishBinsFor_ = unlessNull publishBinsFor [pname]; @@ -303,7 +309,7 @@ in rec { workspaceDependenciesTransitive; in stdenv.mkDerivation (builtins.removeAttrs attrs ["yarnNix" "pkgConfig" "workspaceDependencies" "packageResolutions"] // { - inherit src pname; + inherit src version pname; name = baseName; @@ -376,11 +382,10 @@ in rec { meta = { inherit (nodejs.meta) platforms; - description = packageJSON.description or ""; - homepage = packageJSON.homepage or ""; - version = packageJSON.version or ""; - license = if packageJSON ? license then getLicenseFromSpdxId packageJSON.license else ""; - } // (attrs.meta or {}); + } // lib.optionalAttrs (package ? description) { inherit (package) description; } + // lib.optionalAttrs (package ? homepage) { inherit (package) homepage; } + // lib.optionalAttrs (package ? license) { license = getLicenseFromSpdxId package.license; } + // (attrs.meta or {}); }); yarn2nix = mkYarnPackage { diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_bin.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_bin.js index 6f0b5c93fa0c..a605147ab865 100755 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_bin.js +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_bin.js @@ -4,50 +4,50 @@ * node fixup_bin.js [, ... ] */ -const fs = require('fs') -const path = require('path') +const fs = require("fs"); +const path = require("path"); -const derivationBinPath = process.argv[2] -const nodeModules = process.argv[3] -const packagesToPublishBin = process.argv.slice(4) +const derivationBinPath = process.argv[2]; +const nodeModules = process.argv[3]; +const packagesToPublishBin = process.argv.slice(4); function processPackage(name) { - console.log('fixup_bin: Processing ', name) + console.log("fixup_bin: Processing ", name); - const packagePath = `${nodeModules}/${name}` - const packageJsonPath = `${packagePath}/package.json` - const packageJson = JSON.parse(fs.readFileSync(packageJsonPath)) + const packagePath = `${nodeModules}/${name}`; + const packageJsonPath = `${packagePath}/package.json`; + const packageJson = JSON.parse(fs.readFileSync(packageJsonPath)); if (!packageJson.bin) { - console.log('fixup_bin: No binaries provided') - return + console.log("fixup_bin: No binaries provided"); + return; } // There are two alternative syntaxes for `bin` // a) just a plain string, in which case the name of the package is the name of the binary. // b) an object, where key is the name of the eventual binary, and the value the path to that binary. - if (typeof packageJson.bin === 'string') { - const binName = packageJson.bin - packageJson.bin = {} - packageJson.bin[packageJson.name] = binName + if (typeof packageJson.bin === "string") { + const binName = packageJson.bin; + packageJson.bin = {}; + packageJson.bin[packageJson.name] = binName; } // eslint-disable-next-line no-restricted-syntax, guard-for-in for (const binName in packageJson.bin) { - const binPath = packageJson.bin[binName] - const normalizedBinName = binName.replace('@', '').replace('/', '-') + const binPath = packageJson.bin[binName]; + const normalizedBinName = binName.replace("@", "").replace("/", "-"); - const targetPath = path.normalize(`${packagePath}/${binPath}`) - const createdPath = `${derivationBinPath}/${normalizedBinName}` + const targetPath = path.normalize(`${packagePath}/${binPath}`); + const createdPath = `${derivationBinPath}/${normalizedBinName}`; console.log( - `fixup_bin: creating link ${createdPath} that points to ${targetPath}`, - ) + `fixup_bin: creating link ${createdPath} that points to ${targetPath}` + ); - fs.symlinkSync(targetPath, createdPath) + fs.symlinkSync(targetPath, createdPath); } } packagesToPublishBin.forEach(pkg => { - processPackage(pkg) -}) + processPackage(pkg); +}); diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js index 3c067fc99aaa..319d02623459 100755 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js @@ -4,46 +4,46 @@ * node fixup_yarn_lock.js yarn.lock */ -const fs = require('fs') -const readline = require('readline') +const fs = require("fs"); +const readline = require("readline"); -const urlToName = require('../lib/urlToName') +const urlToName = require("../lib/urlToName"); -const yarnLockPath = process.argv[2] +const yarnLockPath = process.argv[2]; const readFile = readline.createInterface({ - input: fs.createReadStream(yarnLockPath, { encoding: 'utf8' }), + input: fs.createReadStream(yarnLockPath, { encoding: "utf8" }), // Note: we use the crlfDelay option to recognize all instances of CR LF // ('\r\n') in input.txt as a single line break. crlfDelay: Infinity, - terminal: false, // input and output should be treated like a TTY -}) + terminal: false // input and output should be treated like a TTY +}); -const result = [] +const result = []; readFile - .on('line', line => { - const arr = line.match(/^ {2}resolved "([^#]+)(#[^"]+)?"$/) + .on("line", line => { + const arr = line.match(/^ {2}resolved "([^#]+)(#[^"]+)?"$/); if (arr !== null) { - const [_, url, shaOrRev] = arr + const [_, url, shaOrRev] = arr; - const fileName = urlToName(url) + const fileName = urlToName(url); - result.push(` resolved "${fileName}${shaOrRev ?? ''}"`) + result.push(` resolved "${fileName}${shaOrRev ?? ""}"`); } else { - result.push(line) + result.push(line); } }) - .on('close', () => { - fs.writeFile(yarnLockPath, result.join('\n'), 'utf8', err => { + .on("close", () => { + fs.writeFile(yarnLockPath, result.join("\n"), "utf8", err => { if (err) { console.error( - 'fixup_yarn_lock: fatal error when trying to write to yarn.lock', - err, - ) + "fixup_yarn_lock: fatal error when trying to write to yarn.lock", + err + ); } - }) - }) + }); + }); diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/fixPkgAddMissingSha1.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/fixPkgAddMissingSha1.js index 40467a68992b..3a5867a3d22c 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/fixPkgAddMissingSha1.js +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/fixPkgAddMissingSha1.js @@ -1,5 +1,5 @@ -const https = require('https') -const crypto = require('crypto') +const https = require("https"); +const crypto = require("crypto"); // TODO: // make test case where getSha1 function is used, i.e. the case when resolved is without sha1? @@ -8,29 +8,29 @@ const crypto = require('crypto') function getSha1(url) { return new Promise((resolve, reject) => { https.get(url, res => { - const { statusCode } = res - const hash = crypto.createHash('sha1') + const { statusCode } = res; + const hash = crypto.createHash("sha1"); if (statusCode !== 200) { - const err = new Error(`Request Failed.\nStatus Code: ${statusCode}`) + const err = new Error(`Request Failed.\nStatus Code: ${statusCode}`); // consume response data to free up memory - res.resume() + res.resume(); - reject(err) + reject(err); } - res.on('data', chunk => { - hash.update(chunk) - }) + res.on("data", chunk => { + hash.update(chunk); + }); - res.on('end', () => { - resolve(hash.digest('hex')) - }) + res.on("end", () => { + resolve(hash.digest("hex")); + }); - res.on('error', reject) - }) - }) + res.on("error", reject); + }); + }); } // Object -> Object @@ -39,28 +39,26 @@ async function fixPkgAddMissingSha1(pkg) { if (!pkg.resolved) { console.error( - `yarn2nix: can't find "resolved" field for package ${ - pkg.nameWithVersion - }, you probably required it using "file:...", this feature is not supported, ignoring`, - ) - return pkg + `yarn2nix: can't find "resolved" field for package ${pkg.nameWithVersion}, you probably required it using "file:...", this feature is not supported, ignoring` + ); + return pkg; } - const [url, sha1] = pkg.resolved.split('#', 2) + const [url, sha1] = pkg.resolved.split("#", 2); - if (sha1 || url.startsWith('https://codeload.github.com')) { - return pkg + if (sha1 || url.startsWith("https://codeload.github.com")) { + return pkg; } // if there is no sha1 in resolved url // (this could happen if yarn.lock was generated by older version of yarn) // - request it from registry by https and add it to pkg - const newSha1 = await getSha1(url) + const newSha1 = await getSha1(url); return { ...pkg, - resolved: `${url}#${newSha1}`, - } + resolved: `${url}#${newSha1}` + }; } -module.exports = fixPkgAddMissingSha1 +module.exports = fixPkgAddMissingSha1; diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js index e2bae7d3d6e3..238fb744ab19 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js @@ -1,7 +1,8 @@ -const R = require('ramda') +const R = require("ramda"); +const ssri = require("ssri"); -const urlToName = require('./urlToName') -const { execFileSync } = require('child_process') +const urlToName = require("./urlToName"); +const { execFileSync } = require("child_process"); // fetchgit transforms // @@ -33,77 +34,115 @@ const { execFileSync } = require('child_process') function prefetchgit(url, rev) { return JSON.parse( - execFileSync("nix-prefetch-git", ["--rev", rev, url, "--fetch-submodules"], { - stdio: [ "ignore", "pipe", "ignore" ], - timeout: 60000, - }) - ).sha256 + execFileSync( + "nix-prefetch-git", + ["--rev", rev, url, "--fetch-submodules"], + { + stdio: ["ignore", "pipe", "ignore"], + timeout: 60000 + } + ) + ).sha256; } function fetchgit(fileName, url, rev, branch, builtinFetchGit) { + const repo = builtinFetchGit + ? `builtins.fetchGit ({ + url = "${url}"; + ref = "${branch}"; + rev = "${rev}"; + } // (if builtins.compareVersions "2.4pre" builtins.nixVersion < 0 then { + # workaround for https://github.com/NixOS/nix/issues/5128 + allRefs = true; + } else {}))` + : `fetchgit { + url = "${url}"; + rev = "${rev}"; + sha256 = "${prefetchgit(url, rev)}"; + }`; + return ` { name = "${fileName}"; path = - let${builtinFetchGit ? ` - repo = builtins.fetchGit ({ - url = "${url}"; - ref = "${branch}"; - rev = "${rev}"; - } // (if builtins.compareVersions "2.4pre" builtins.nixVersion < 0 then { - # workaround for https://github.com/NixOS/nix/issues/5128 - allRefs = true; - } else {})); - ` : ` - repo = fetchgit { - url = "${url}"; - rev = "${rev}"; - sha256 = "${prefetchgit(url, rev)}"; - }; - `}in - runCommand "${fileName}" { buildInputs = [gnutar]; } '' - # Set u+w because tar-fs can't unpack archives with read-only dirs - # https://github.com/mafintosh/tar-fs/issues/79 - tar cf $out --mode u+w -C \${repo} . - ''; - }` + let repo = ${repo}; + in runCommand "${fileName}" { buildInputs = [gnutar]; } '' + # Set u+w because tar-fs can't unpack archives with read-only dirs + # https://github.com/mafintosh/tar-fs/issues/79 + tar cf $out --mode u+w -C \${repo} . + ''; + }`; +} + +/** + * Parse an integrity hash out of an SSRI string. + * + * Provides a default and uses the "best" supported algorithm if there are multiple. + */ +function parseIntegrity(maybeIntegrity, fallbackHash) { + if (!maybeIntegrity && fallbackHash) { + return { algo: "sha1", hash: fallbackHash }; + } + + const integrities = ssri.parse(maybeIntegrity); + for (const key in integrities) { + if (!/^sha(1|256|512)$/.test(key)) { + delete integrities[key]; + } + } + + algo = integrities.pickAlgorithm(); + hash = integrities[algo][0].digest; + return { algo, hash }; } function fetchLockedDep(builtinFetchGit) { - return function (pkg) { - const { integrity, nameWithVersion, resolved } = pkg + return function(pkg) { + const { integrity, nameWithVersion, resolved } = pkg; if (!resolved) { console.error( - `yarn2nix: can't find "resolved" field for package ${nameWithVersion}, you probably required it using "file:...", this feature is not supported, ignoring`, - ) - return '' + `yarn2nix: can't find "resolved" field for package ${nameWithVersion}, you probably required it using "file:...", this feature is not supported, ignoring` + ); + return ""; } - const [url, sha1OrRev] = resolved.split('#') + const [url, sha1OrRev] = resolved.split("#"); - const fileName = urlToName(url) + const fileName = urlToName(url); - if (resolved.startsWith('https://codeload.github.com/')) { - const s = resolved.split('/') - const githubUrl = `https://github.com/${s[3]}/${s[4]}.git` - const githubRev = s[6] + if (resolved.startsWith("https://codeload.github.com/")) { + const s = resolved.split("/"); + const githubUrl = `https://github.com/${s[3]}/${s[4]}.git`; + const githubRev = s[6]; - const [_, branch] = nameWithVersion.split('#') + const [_, branch] = nameWithVersion.split("#"); - return fetchgit(fileName, githubUrl, githubRev, branch || 'master', builtinFetchGit) + return fetchgit( + fileName, + githubUrl, + githubRev, + branch || "master", + builtinFetchGit + ); } - if (url.startsWith('git+') || url.startsWith("git:")) { - const rev = sha1OrRev + if (url.startsWith("git+") || url.startsWith("git:")) { + const rev = sha1OrRev; - const [_, branch] = nameWithVersion.split('#') + const [_, branch] = nameWithVersion.split("#"); - const urlForGit = url.replace(/^git\+/, '') + const urlForGit = url.replace(/^git\+/, ""); - return fetchgit(fileName, urlForGit, rev, branch || 'master', builtinFetchGit) + return fetchgit( + fileName, + urlForGit, + rev, + branch || "master", + builtinFetchGit + ); } - const [algo, hash] = integrity ? integrity.split('-') : ['sha1', sha1OrRev] + const { algo, hash } = parseIntegrity(integrity, sha1OrRev); return ` { name = "${fileName}"; @@ -112,26 +151,29 @@ function fetchLockedDep(builtinFetchGit) { url = "${url}"; ${algo} = "${hash}"; }; - }` - } + }`; + }; } const HEAD = ` { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ -`.trim() +`.trim(); // Object -> String function generateNix(pkgs, builtinFetchGit) { - const nameWithVersionAndPackageNix = R.map(fetchLockedDep(builtinFetchGit), pkgs) + const nameWithVersionAndPackageNix = R.map( + fetchLockedDep(builtinFetchGit), + pkgs + ); const packagesDefinition = R.join( - '\n', - R.values(nameWithVersionAndPackageNix), - ) + "\n", + R.values(nameWithVersionAndPackageNix) + ); - return R.join('\n', [HEAD, packagesDefinition, ' ];', '}']) + return R.join("\n", [HEAD, packagesDefinition, " ];", "}"]); } -module.exports = generateNix +module.exports = generateNix; diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/mapObjIndexedReturnArray.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/mapObjIndexedReturnArray.js index 83c6634f7c84..eb4d25e65cc8 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/mapObjIndexedReturnArray.js +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/mapObjIndexedReturnArray.js @@ -1,6 +1,6 @@ -const _curry2 = require('ramda/src/internal/_curry2') -const _map = require('ramda/src/internal/_map') -const keys = require('ramda/src/keys') +const _curry2 = require("ramda/src/internal/_curry2"); +const _map = require("ramda/src/internal/_map"); +const keys = require("ramda/src/keys"); // mapObjIndexed: ((v, k, {k: v}) → v') → {k: v} → {k: v'} // mapObjIndexedReturnArray: ((v, k, {k: v}) → v') → {k: v} → [v'] @@ -15,7 +15,7 @@ const keys = require('ramda/src/keys') */ const mapObjIndexedReturnArray = _curry2((fn, obj) => - _map(key => fn(obj[key], key, obj), keys(obj)), -) + _map(key => fn(obj[key], key, obj), keys(obj)) +); -module.exports = mapObjIndexedReturnArray +module.exports = mapObjIndexedReturnArray; diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js index d3c7288a50a4..2228e4eb487a 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js @@ -1,4 +1,4 @@ -const path = require('path') +const path = require("path"); // String -> String @@ -10,20 +10,19 @@ const path = require('path') // - https://codeload.github.com/Gargron/emoji-mart/tar.gz/934f314fd8322276765066e8a2a6be5bac61b1cf function urlToName(url) { - // Yarn generates `codeload.github.com` tarball URLs, where the final // path component (file name) is the git hash. See #111. // See also https://github.com/yarnpkg/yarn/blob/989a7406/src/resolvers/exotics/github-resolver.js#L24-L26 let isCodeloadGitTarballUrl = - url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/') + url.startsWith("https://codeload.github.com/") && url.includes("/tar.gz/"); - if (url.startsWith('git+') || isCodeloadGitTarballUrl) { - return path.basename(url) + if (url.startsWith("git+") || isCodeloadGitTarballUrl) { + return path.basename(url); } return url - .replace(/https:\/\/(.)*(.com)\//g, '') // prevents having long directory names - .replace(/[@/%:-]/g, '_') // replace @ and : and - and % characters with underscore + .replace(/https:\/\/(.)*(.com)\//g, "") // prevents having long directory names + .replace(/[@/%:-]/g, "_"); // replace @ and : and - and % characters with underscore } -module.exports = urlToName +module.exports = urlToName; diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/package.json b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/package.json index 5b85a68ca5c7..da62eadd2e58 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/package.json +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/package.json @@ -14,14 +14,15 @@ "bin": { "yarn2nix": "bin/yarn2nix.js" }, - "engines" : { - "node" : ">=8.0.0" + "engines": { + "node": ">=8.0.0" }, "dependencies": { "@yarnpkg/lockfile": "^1.1.0", "deep-equal": "^1.0.1", "docopt": "^0.6.2", - "ramda": "^0.26.1" + "ramda": "^0.26.1", + "ssri": "^10.0.0" }, "devDependencies": { "babel-eslint": "^10.0.1", diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock index 6e22aa4fe4f1..5140ca98044f 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock @@ -2228,6 +2228,13 @@ minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minipass@^3.1.1: + version "3.3.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae" + integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw== + dependencies: + yallist "^4.0.0" + mixin-deep@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" @@ -3136,6 +3143,13 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= +ssri@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.0.tgz#1e34554cbbc4728f5290674264e21b64aaf27ca7" + integrity sha512-64ghGOpqW0k+jh7m5jndBGdVEoPikWwGQmBNN5ks6jyUSMymzHDTlnNHOvzp+6MmHOljr2MokUzvRksnTwG0Iw== + dependencies: + minipass "^3.1.1" + staged-git-files@1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.1.2.tgz#4326d33886dc9ecfa29a6193bf511ba90a46454b" @@ -3545,6 +3559,11 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= +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@^8.0.0: version "8.1.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950" diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix index 98c19af79fb5..a6d7f79a7bee 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix @@ -6,7 +6,7 @@ path = fetchurl { name = "_babel_code_frame___code_frame_7.8.3.tgz"; url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz"; - sha1 = "33e25903d7481181534e12ec0a25f16b6fcf419e"; + sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; }; } { @@ -14,7 +14,7 @@ path = fetchurl { name = "_babel_generator___generator_7.9.6.tgz"; url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz"; - sha1 = "5408c82ac5de98cda0d77d8124e99fa1f2170a43"; + sha512 = "+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ=="; }; } { @@ -22,7 +22,7 @@ path = fetchurl { name = "_babel_helper_function_name___helper_function_name_7.9.5.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz"; - sha1 = "2b53820d35275120e1874a82e5aabe1376920a5c"; + sha512 = "JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw=="; }; } { @@ -30,7 +30,7 @@ path = fetchurl { name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz"; - sha1 = "b894b947bd004381ce63ea1db9f08547e920abd5"; + sha512 = "FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA=="; }; } { @@ -38,7 +38,7 @@ path = fetchurl { name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz"; - sha1 = "31a9f30070f91368a7182cf05f831781065fc7a9"; + sha512 = "3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA=="; }; } { @@ -46,7 +46,7 @@ path = fetchurl { name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.5.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz"; - sha1 = "90977a8e6fbf6b431a7dc31752eee233bf052d80"; + sha512 = "/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g=="; }; } { @@ -54,7 +54,7 @@ path = fetchurl { name = "_babel_highlight___highlight_7.9.0.tgz"; url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz"; - sha1 = "4e9b45ccb82b79607271b2979ad82c7b68163079"; + sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ=="; }; } { @@ -62,7 +62,7 @@ path = fetchurl { name = "_babel_parser___parser_7.9.6.tgz"; url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz"; - sha1 = "3b1bbb30dabe600cd72db58720998376ff653bc7"; + sha512 = "AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q=="; }; } { @@ -70,7 +70,7 @@ path = fetchurl { name = "_babel_runtime_corejs3___runtime_corejs3_7.9.6.tgz"; url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz"; - sha1 = "67aded13fffbbc2cb93247388cf84d77a4be9a71"; + sha512 = "6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA=="; }; } { @@ -78,7 +78,7 @@ path = fetchurl { name = "_babel_runtime___runtime_7.9.6.tgz"; url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz"; - sha1 = "a9102eb5cadedf3f31d08a9ecf294af7827ea29f"; + sha512 = "64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ=="; }; } { @@ -86,7 +86,7 @@ path = fetchurl { name = "_babel_template___template_7.8.6.tgz"; url = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz"; - sha1 = "86b22af15f828dfb086474f964dcc3e39c43ce2b"; + sha512 = "zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg=="; }; } { @@ -94,7 +94,7 @@ path = fetchurl { name = "_babel_traverse___traverse_7.9.6.tgz"; url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz"; - sha1 = "5540d7577697bf619cc57b92aa0f1c231a94f442"; + sha512 = "b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg=="; }; } { @@ -102,7 +102,7 @@ path = fetchurl { name = "_babel_types___types_7.9.6.tgz"; url = "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz"; - sha1 = "2c5502b427251e9de1bd2dff95add646d95cc9f7"; + sha512 = "qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA=="; }; } { @@ -110,7 +110,7 @@ path = fetchurl { name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.0.tgz"; url = "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz"; - sha1 = "ecdf48d532c58ea477acfcab80348424f8d0662f"; + sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; } { @@ -118,7 +118,7 @@ path = fetchurl { name = "_yarnpkg_lockfile___lockfile_1.1.0.tgz"; url = "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz"; - sha1 = "e77a97fbd345b76d83245edcd17d393b1b41fb31"; + sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; } { @@ -126,7 +126,7 @@ path = fetchurl { name = "abbrev___abbrev_1.1.1.tgz"; url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; - sha1 = "f8f2c887ad10bf67f634f005b6987fed3179aac8"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; } { @@ -134,7 +134,7 @@ 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"; + sha1 = "r9+UiPsezvyDSPb7IvRk4ypYs2s="; }; } { @@ -142,7 +142,7 @@ path = fetchurl { name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; - sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe"; + sha512 = "HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ=="; }; } { @@ -150,7 +150,7 @@ path = fetchurl { name = "acorn___acorn_3.3.0.tgz"; url = "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz"; - sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + sha1 = "ReN/s56No/JbruP/U2niu18iAXo="; }; } { @@ -158,7 +158,7 @@ path = fetchurl { name = "acorn___acorn_5.7.4.tgz"; url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz"; - sha1 = "3e8d8a9947d0599a1796d10225d7432f4a4acf5e"; + sha512 = "1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="; }; } { @@ -166,7 +166,7 @@ path = fetchurl { name = "acorn___acorn_6.4.1.tgz"; url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz"; - sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474"; + sha512 = "ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="; }; } { @@ -174,7 +174,7 @@ path = fetchurl { name = "ajv_keywords___ajv_keywords_2.1.1.tgz"; url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz"; - sha1 = "617997fc5f60576894c435f940d819e135b80762"; + sha1 = "YXmX/F9gV2iUxDX5QNgZ4TW4B2I="; }; } { @@ -182,7 +182,7 @@ path = fetchurl { name = "ajv___ajv_5.5.2.tgz"; url = "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz"; - sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; + sha1 = "c7Xuyj+rZT49P5Qis0GtQiBdyWU="; }; } { @@ -190,7 +190,7 @@ path = fetchurl { name = "ajv___ajv_6.12.2.tgz"; url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz"; - sha1 = "c629c5eced17baf314437918d2da88c99d5958cd"; + sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ=="; }; } { @@ -198,7 +198,7 @@ path = fetchurl { name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; - sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"; + sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; }; } { @@ -206,7 +206,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"; + sha1 = "w7M6te42DYbg5ijwRorn7yfWVN8="; }; } { @@ -214,7 +214,7 @@ 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 = "7QMXwyIGT3lGbAKWa922Bas32Zg="; }; } { @@ -222,7 +222,7 @@ 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"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; }; } { @@ -230,7 +230,7 @@ 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"; + sha1 = "tDLdM1i2NM914eRmQ2gkBTPB3b4="; }; } { @@ -238,7 +238,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=="; }; } { @@ -246,7 +246,7 @@ path = fetchurl { name = "any_observable___any_observable_0.3.0.tgz"; url = "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz"; - sha1 = "af933475e5806a67d0d7df090dd5e8bef65d119b"; + sha512 = "/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog=="; }; } { @@ -254,7 +254,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=="; }; } { @@ -262,7 +262,7 @@ path = fetchurl { name = "aria_query___aria_query_3.0.0.tgz"; url = "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz"; - sha1 = "65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc"; + sha1 = "ZbP8wcoRVajJrmTW7uKX8V1RM8w="; }; } { @@ -270,7 +270,7 @@ 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"; + sha1 = "1kYQdP6/7HHn4VI1dhoyml3HxSA="; }; } { @@ -278,7 +278,7 @@ 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"; + sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; }; } { @@ -286,7 +286,7 @@ 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"; + sha1 = "45sJrqne+Gao8gbiiK9jkZuuOcQ="; }; } { @@ -294,7 +294,7 @@ path = fetchurl { name = "array_includes___array_includes_3.1.1.tgz"; url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz"; - sha1 = "cdd67e6852bdf9c1215460786732255ed2459348"; + sha512 = "c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ=="; }; } { @@ -302,7 +302,7 @@ 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"; + sha1 = "mjRBDk9OPaI96jdb5b5w8kd47Dk="; }; } { @@ -310,7 +310,7 @@ 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"; + sha1 = "r2rId6Jcx/dOBYiUdThY39sk/bY="; }; } { @@ -318,7 +318,7 @@ 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"; + sha1 = "qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="; }; } { @@ -326,7 +326,7 @@ path = fetchurl { name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz"; - sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b"; + sha512 = "gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ=="; }; } { @@ -334,7 +334,7 @@ path = fetchurl { name = "arrify___arrify_1.0.1.tgz"; url = "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz"; - sha1 = "898508da2226f380df904728456849c1501a4b0d"; + sha1 = "iYUI2iIm84DfkEcoRWhJwVAaSw0="; }; } { @@ -342,7 +342,7 @@ 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"; + sha1 = "WWZ/QfrdTyDMvCu5a41Pf3jsA2c="; }; } { @@ -350,7 +350,7 @@ 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"; + sha1 = "9wtzXGvKGlycItmCw+Oef+ujva0="; }; } { @@ -358,7 +358,7 @@ path = fetchurl { name = "astral_regex___astral_regex_1.0.0.tgz"; url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz"; - sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"; + sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; }; } { @@ -366,7 +366,7 @@ path = fetchurl { name = "atob___atob_2.1.2.tgz"; url = "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz"; - sha1 = "6d9517eb9e030d2436666651e86bd9f6f13533c9"; + sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; } { @@ -374,7 +374,7 @@ path = fetchurl { name = "axobject_query___axobject_query_2.1.2.tgz"; url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz"; - sha1 = "2bdffc0371e643e5f03ba99065d5179b9ca79799"; + sha512 = "ICt34ZmrVt8UQnvPl6TVyDTkmhXmAyAT4Jh5ugfGUX4MOrZ+U/ZY6/sdylRw3qGNr9Ub5AJsaHeDMzNLehRdOQ=="; }; } { @@ -382,7 +382,7 @@ path = fetchurl { name = "babel_code_frame___babel_code_frame_6.26.0.tgz"; url = "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; - sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"; + sha1 = "Y/1D99weO7fONZR9uP42mj9Yx0s="; }; } { @@ -390,7 +390,7 @@ 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"; + sha512 = "ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg=="; }; } { @@ -398,7 +398,7 @@ 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"; + sha1 = "llxwWGaOgrVde/4E/yM3vItWR/4="; }; } { @@ -406,7 +406,7 @@ 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"; + sha1 = "ibTRmasr7kneFk6gK4nORi1xt2c="; }; } { @@ -414,7 +414,7 @@ path = fetchurl { name = "base___base_0.11.2.tgz"; url = "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz"; - sha1 = "7bde5ced145b6d551a90db87f83c558b4eb48a8f"; + sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; }; } { @@ -422,7 +422,7 @@ path = fetchurl { name = "boolify___boolify_1.0.1.tgz"; url = "https://registry.yarnpkg.com/boolify/-/boolify-1.0.1.tgz"; - sha1 = "b5c09e17cacd113d11b7bb3ed384cc012994d86b"; + sha1 = "tcCeF8rNET0Rt7s+04TMASmU2Gs="; }; } { @@ -430,7 +430,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=="; }; } { @@ -438,7 +438,7 @@ path = fetchurl { name = "braces___braces_2.3.2.tgz"; url = "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz"; - sha1 = "5979fd3f14cd531565e5fa2df1abfff1dfaee729"; + sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; }; } { @@ -446,7 +446,7 @@ 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"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; }; } { @@ -454,7 +454,7 @@ 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"; + sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; }; } { @@ -462,7 +462,7 @@ 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"; + sha1 = "hH4PzgoiN1CpoCfFSzNzGtMVQTQ="; }; } { @@ -470,7 +470,7 @@ 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"; + sha1 = "lAhe9jWB7NPaqSREqP6U6CV3dR8="; }; } { @@ -478,7 +478,7 @@ 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"; + sha1 = "Ro+DBE42mrIBD6xfBs7uFbsssfQ="; }; } { @@ -486,7 +486,7 @@ path = fetchurl { name = "callsites___callsites_0.2.0.tgz"; url = "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz"; - sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; + sha1 = "r6uWJikQp/M8GaV3WCXGnzTjUMo="; }; } { @@ -494,7 +494,7 @@ path = fetchurl { name = "callsites___callsites_2.0.0.tgz"; url = "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz"; - sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; + sha1 = "BuuE8A7qQT2oav/vrL/7Ngk7PFA="; }; } { @@ -502,7 +502,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=="; }; } { @@ -510,7 +510,7 @@ path = fetchurl { name = "camelcase_keys___camelcase_keys_4.2.0.tgz"; url = "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz"; - sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; + sha1 = "oqpfsa9oh1glnDLBQUJteJI7m3c="; }; } { @@ -518,7 +518,7 @@ path = fetchurl { name = "camelcase___camelcase_4.1.0.tgz"; url = "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + sha1 = "1UVjW+HjPFQmScaRc+Xeas+uNN0="; }; } { @@ -526,7 +526,7 @@ path = fetchurl { name = "chalk___chalk_2.3.0.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz"; - sha1 = "b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"; + sha512 = "Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q=="; }; } { @@ -534,7 +534,7 @@ path = fetchurl { name = "chalk___chalk_1.1.3.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + sha1 = "qBFcVeSnAv5NFQq9OHKCKn4J/Jg="; }; } { @@ -542,7 +542,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=="; }; } { @@ -550,7 +550,7 @@ path = fetchurl { name = "chardet___chardet_0.4.2.tgz"; url = "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz"; - sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"; + sha1 = "tUc7M9yXxCTl2Y3IfVXU2KKci/I="; }; } { @@ -558,7 +558,7 @@ path = fetchurl { name = "chardet___chardet_0.7.0.tgz"; url = "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz"; - sha1 = "90094849f0937f2eedc2425d0d28a9e5f0cbad9e"; + sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; }; } { @@ -566,7 +566,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=="; }; } { @@ -574,7 +574,7 @@ 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"; + sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="; }; } { @@ -582,7 +582,7 @@ 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"; + sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; }; } { @@ -590,7 +590,7 @@ path = fetchurl { name = "cli_cursor___cli_cursor_2.1.0.tgz"; url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + sha1 = "s12sN2R5+sw+lHR9QdDQ9SOP/LU="; }; } { @@ -598,7 +598,7 @@ path = fetchurl { name = "cli_truncate___cli_truncate_0.2.1.tgz"; url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz"; - sha1 = "9f15cfbb0705005369216c626ac7d05ab90dd574"; + sha1 = "nxXPuwcFAFNpIWxiasfQWrkN1XQ="; }; } { @@ -606,7 +606,7 @@ 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"; + sha512 = "GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="; }; } { @@ -614,7 +614,7 @@ path = fetchurl { name = "cliui___cliui_3.2.0.tgz"; url = "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz"; - sha1 = "120601537a916d29940f934da3b48d585a39213d"; + sha1 = "EgYBU3qRbSmUD5NNo7SNWFo5IT0="; }; } { @@ -622,7 +622,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="; }; } { @@ -630,7 +630,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="; }; } { @@ -638,7 +638,7 @@ 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"; + sha1 = "S8A3PBZLwykbTTaMgpzxqApZ3KA="; }; } { @@ -646,7 +646,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=="; }; } { @@ -654,7 +654,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="; }; } { @@ -662,7 +662,7 @@ path = fetchurl { name = "commander___commander_2.20.3.tgz"; url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; - sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; }; } { @@ -670,7 +670,7 @@ path = fetchurl { name = "common_tags___common_tags_1.8.0.tgz"; url = "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz"; - sha1 = "8e3153e542d4a39e9b10554434afaaf98956a937"; + sha512 = "6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="; }; } { @@ -678,7 +678,7 @@ 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"; + sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; }; } { @@ -686,7 +686,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="; }; } { @@ -694,7 +694,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=="; }; } { @@ -702,7 +702,7 @@ path = fetchurl { name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz"; url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz"; - sha1 = "72bc13b483c0276801681871d4898516f8f54fdd"; + sha512 = "KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw=="; }; } { @@ -710,7 +710,7 @@ path = fetchurl { name = "contains_path___contains_path_0.1.0.tgz"; url = "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz"; - sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a"; + sha1 = "/ozxhP9mcLa67wGp1IYaXL7EEgo="; }; } { @@ -718,7 +718,7 @@ 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"; + sha1 = "Z29us8OZl8LuGsOpJP1hJHSPV40="; }; } { @@ -726,7 +726,7 @@ 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"; + sha512 = "lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA=="; }; } { @@ -734,7 +734,7 @@ 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"; + sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; }; } { @@ -742,7 +742,7 @@ 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="; }; } { @@ -750,7 +750,7 @@ path = fetchurl { name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; - sha1 = "040f726809c591e77a17c0a3626ca45b4f168b1a"; + sha512 = "H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA=="; }; } { @@ -758,7 +758,7 @@ path = fetchurl { name = "cross_spawn___cross_spawn_5.1.0.tgz"; url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; + sha1 = "6L0O/uWPz/b4+UUQoKVUu/ojVEk="; }; } { @@ -766,7 +766,7 @@ 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"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; } { @@ -774,7 +774,7 @@ 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"; + sha512 = "JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug=="; }; } { @@ -782,7 +782,7 @@ path = fetchurl { name = "date_fns___date_fns_1.30.1.tgz"; url = "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz"; - sha1 = "2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"; + sha512 = "hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="; }; } { @@ -790,7 +790,7 @@ 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=="; }; } { @@ -798,7 +798,7 @@ path = fetchurl { name = "debug___debug_3.2.6.tgz"; url = "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz"; - sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b"; + sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; }; } { @@ -806,7 +806,7 @@ path = fetchurl { name = "debug___debug_4.1.1.tgz"; url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; - sha1 = "3b72260255109c6b589cee050f1d516139664791"; + sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; } { @@ -814,7 +814,7 @@ path = fetchurl { name = "decamelize___decamelize_1.2.0.tgz"; url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + sha1 = "9lNNFRSCabIDUue+4m9QH5oZEpA="; }; } { @@ -822,7 +822,7 @@ 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"; + sha1 = "6zkTMzRYd1y4TNGh+uBiEGu4dUU="; }; } { @@ -830,7 +830,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="; }; } { @@ -838,7 +838,7 @@ 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"; + sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; }; } { @@ -846,7 +846,7 @@ 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"; + sha1 = "s2nW+128E+7PUk+RsHD+7cNXzzQ="; }; } { @@ -854,7 +854,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=="; }; } { @@ -862,7 +862,7 @@ 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"; + sha1 = "w1se+RjsPJkPmlvFe+BKrOxcgRY="; }; } { @@ -870,7 +870,7 @@ 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"; + sha1 = "dp66rz9KY6rTr56NMEybvnm/sOY="; }; } { @@ -878,7 +878,7 @@ 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"; + sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; }; } { @@ -886,7 +886,7 @@ path = fetchurl { name = "del___del_3.0.0.tgz"; url = "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz"; - sha1 = "53ecf699ffcbcb39637691ab13baf160819766e5"; + sha1 = "U+z2mf/LyzljdpGrE7rxYIGXZuU="; }; } { @@ -894,7 +894,7 @@ path = fetchurl { name = "dlv___dlv_1.1.3.tgz"; url = "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz"; - sha1 = "5c198a8a11453596e751494d49874bc7732f2e79"; + sha512 = "+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="; }; } { @@ -902,7 +902,7 @@ path = fetchurl { name = "docopt___docopt_0.6.2.tgz"; url = "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz"; - sha1 = "b28e9e2220da5ec49f7ea5bb24a47787405eeb11"; + sha1 = "so6eIiDaXsSffqW7JKR3h0Be6xE="; }; } { @@ -910,7 +910,7 @@ path = fetchurl { name = "doctrine___doctrine_1.5.0.tgz"; url = "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz"; - sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa"; + sha1 = "N53Ocw9hZvds76TmcHoVmwLFpvo="; }; } { @@ -918,7 +918,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=="; }; } { @@ -926,7 +926,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=="; }; } { @@ -934,7 +934,7 @@ path = fetchurl { name = "elegant_spinner___elegant_spinner_1.0.1.tgz"; url = "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz"; - sha1 = "db043521c95d7e303fd8f345bedc3349cfb0729e"; + sha1 = "2wQ1IcldfjA/2PNFvtwzSc+wcp4="; }; } { @@ -942,7 +942,7 @@ 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 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; }; } { @@ -950,7 +950,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=="; }; } { @@ -958,7 +958,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=="; }; } { @@ -966,7 +966,7 @@ path = fetchurl { name = "es_abstract___es_abstract_1.17.5.tgz"; url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz"; - sha1 = "d8c9d1d66c8981fb9200e2251d799eee92774ae9"; + sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="; }; } { @@ -974,7 +974,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=="; }; } { @@ -982,7 +982,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="; }; } { @@ -990,7 +990,7 @@ path = fetchurl { name = "eslint_config_airbnb_base___eslint_config_airbnb_base_13.2.0.tgz"; url = "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.2.0.tgz"; - sha1 = "f6ea81459ff4dec2dda200c35f1d8f7419d57943"; + sha512 = "1mg/7eoB4AUeB0X1c/ho4vb2gYkNH8Trr/EgCT/aGmKhhG+F6vF5s8+iRBlWAzFIAphxIdp3YfEKgEl0f9Xg+w=="; }; } { @@ -998,7 +998,7 @@ path = fetchurl { name = "eslint_config_airbnb___eslint_config_airbnb_17.1.1.tgz"; url = "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-17.1.1.tgz"; - sha1 = "2272e0b86bb1e2b138cdf88d07a3b6f4cda3d626"; + sha512 = "xCu//8a/aWqagKljt+1/qAM62BYZeNq04HmdevG5yUGWpja0I/xhqd6GdLRch5oetEGFiJAnvtGuTEAese53Qg=="; }; } { @@ -1006,7 +1006,7 @@ path = fetchurl { name = "eslint_config_prettier___eslint_config_prettier_3.6.0.tgz"; url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.6.0.tgz"; - sha1 = "8ca3ffac4bd6eeef623a0651f9d754900e3ec217"; + sha512 = "ixJ4U3uTLXwJts4rmSVW/lMXjlGwCijhBJHk8iVqKKSifeI0qgFEfWl8L63isfc8Od7EiBALF6BX3jKLluf/jQ=="; }; } { @@ -1014,7 +1014,7 @@ path = fetchurl { name = "eslint_config_standard___eslint_config_standard_12.0.0.tgz"; url = "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz"; - sha1 = "638b4c65db0bd5a41319f96bba1f15ddad2107d9"; + sha512 = "COUz8FnXhqFitYj4DTqHzidjIL/t4mumGZto5c7DrBpvWoie+Sn3P4sLEzUGeYhRElWuFEf8K1S1EfvD1vixCQ=="; }; } { @@ -1022,7 +1022,7 @@ path = fetchurl { name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz"; url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz"; - sha1 = "dbaa52b6b2816b50bc6711af75422de808e98404"; + sha512 = "b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg=="; }; } { @@ -1030,7 +1030,7 @@ path = fetchurl { name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; - sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6"; + sha512 = "6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA=="; }; } { @@ -1038,7 +1038,7 @@ path = fetchurl { name = "eslint_plugin_es___eslint_plugin_es_1.4.1.tgz"; url = "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.1.tgz"; - sha1 = "12acae0f4953e76ba444bfd1b2271081ac620998"; + sha512 = "5fa/gR2yR3NxQf+UXkeLeP8FBBl6tSgdrAz1+cF84v1FMM4twGwQoqTnn+QxFLcPOrF4pdKEJKDB/q9GoyJrCA=="; }; } { @@ -1046,7 +1046,7 @@ path = fetchurl { name = "eslint_plugin_import___eslint_plugin_import_2.20.2.tgz"; url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz"; - sha1 = "91fc3807ce08be4837141272c8b99073906e588d"; + sha512 = "FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg=="; }; } { @@ -1054,7 +1054,7 @@ path = fetchurl { name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.2.3.tgz"; url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz"; - sha1 = "b872a09d5de51af70a97db1eea7dc933043708aa"; + sha512 = "CawzfGt9w83tyuVekn0GDPU9ytYtxyxyFZ3aSWROmnRRFQFT2BiPJd7jvRdzNDi6oLWaS2asMeYSNMjWTV4eNg=="; }; } { @@ -1062,7 +1062,7 @@ path = fetchurl { name = "eslint_plugin_node___eslint_plugin_node_8.0.1.tgz"; url = "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-8.0.1.tgz"; - sha1 = "55ae3560022863d141fa7a11799532340a685964"; + sha512 = "ZjOjbjEi6jd82rIpFSgagv4CHWzG9xsQAVp1ZPlhRnnYxcTgENUVBvhYmkQ7GvT1QFijUSo69RaiOJKhMu6i8w=="; }; } { @@ -1070,7 +1070,7 @@ path = fetchurl { name = "eslint_plugin_promise___eslint_plugin_promise_4.2.1.tgz"; url = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz"; - sha1 = "845fd8b2260ad8f82564c1222fce44ad71d9418a"; + sha512 = "VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw=="; }; } { @@ -1078,7 +1078,7 @@ path = fetchurl { name = "eslint_plugin_react___eslint_plugin_react_7.20.0.tgz"; url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz"; - sha1 = "f98712f0a5e57dfd3e5542ef0604b8739cd47be3"; + sha512 = "rqe1abd0vxMjmbPngo4NaYxTcR3Y4Hrmc/jg4T+sYz63yqlmJRknpEQfmWY+eDWPuMmix6iUIK+mv0zExjeLgA=="; }; } { @@ -1086,7 +1086,7 @@ path = fetchurl { name = "eslint_plugin_standard___eslint_plugin_standard_4.0.1.tgz"; url = "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz"; - sha1 = "ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4"; + sha512 = "v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ=="; }; } { @@ -1094,7 +1094,7 @@ path = fetchurl { name = "eslint_scope___eslint_scope_3.7.3.tgz"; url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.3.tgz"; - sha1 = "bb507200d3d17f60247636160b4826284b108535"; + sha512 = "W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA=="; }; } { @@ -1102,7 +1102,7 @@ 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"; + sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg=="; }; } { @@ -1110,7 +1110,7 @@ path = fetchurl { name = "eslint_utils___eslint_utils_1.4.3.tgz"; url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz"; - sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f"; + sha512 = "fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q=="; }; } { @@ -1118,7 +1118,7 @@ path = fetchurl { name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; - sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2"; + sha512 = "8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="; }; } { @@ -1126,7 +1126,7 @@ path = fetchurl { name = "eslint___eslint_4.19.1.tgz"; url = "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz"; - sha1 = "32d1d653e1d90408854bfb296f076ec7e186a300"; + sha512 = "bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ=="; }; } { @@ -1134,7 +1134,7 @@ path = fetchurl { name = "eslint___eslint_5.16.0.tgz"; url = "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz"; - sha1 = "a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"; + sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg=="; }; } { @@ -1142,7 +1142,7 @@ path = fetchurl { name = "espree___espree_3.5.4.tgz"; url = "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz"; - sha1 = "b0f447187c8a8bed944b815a660bddf5deb5d1a7"; + sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A=="; }; } { @@ -1150,7 +1150,7 @@ path = fetchurl { name = "espree___espree_5.0.1.tgz"; url = "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz"; - sha1 = "5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"; + sha512 = "qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A=="; }; } { @@ -1158,7 +1158,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=="; }; } { @@ -1166,7 +1166,7 @@ path = fetchurl { name = "esquery___esquery_1.3.1.tgz"; url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; - sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; + sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="; }; } { @@ -1174,7 +1174,7 @@ path = fetchurl { name = "esrecurse___esrecurse_4.2.1.tgz"; url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz"; - sha1 = "007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"; + sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; }; } { @@ -1182,7 +1182,7 @@ 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=="; }; } { @@ -1190,7 +1190,7 @@ path = fetchurl { name = "estraverse___estraverse_5.1.0.tgz"; url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz"; - sha1 = "374309d39fd935ae500e7b92e8a6b4c720e59642"; + sha512 = "FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw=="; }; } { @@ -1198,7 +1198,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=="; }; } { @@ -1206,7 +1206,7 @@ path = fetchurl { name = "execa___execa_0.7.0.tgz"; url = "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz"; - sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + sha1 = "lEvs00zEHuMqY6n68nrVpl/Fl3c="; }; } { @@ -1214,7 +1214,7 @@ path = fetchurl { name = "execa___execa_1.0.0.tgz"; url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; - sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; } { @@ -1222,7 +1222,7 @@ 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"; + sha1 = "t3c14xXOMPa27/D4OwQVGiJEliI="; }; } { @@ -1230,7 +1230,7 @@ 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"; + sha1 = "Ua99YUrZqfYQ6huvu5idaxxWiQ8="; }; } { @@ -1238,7 +1238,7 @@ 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"; + sha1 = "Jqcarwc7OfshJxcnRhMcJwQCjbg="; }; } { @@ -1246,7 +1246,7 @@ path = fetchurl { name = "external_editor___external_editor_2.2.0.tgz"; url = "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz"; - sha1 = "045511cfd8d133f3846673d1047c154e214ad3d5"; + sha512 = "bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A=="; }; } { @@ -1254,7 +1254,7 @@ path = fetchurl { name = "external_editor___external_editor_3.1.0.tgz"; url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz"; - sha1 = "cb03f740befae03ea4d283caed2741a83f335495"; + sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; }; } { @@ -1262,7 +1262,7 @@ path = fetchurl { name = "extglob___extglob_2.0.4.tgz"; url = "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz"; - sha1 = "ad00fe4dc612a9232e8718711dc5cb5ab0285543"; + sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; }; } { @@ -1270,7 +1270,7 @@ path = fetchurl { name = "fast_deep_equal___fast_deep_equal_1.1.0.tgz"; url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; - sha1 = "c053477817c86b51daa853c81e059b733d023614"; + sha1 = "wFNHeBfIa1HaqFPIHgWbcz0CNhQ="; }; } { @@ -1278,7 +1278,7 @@ path = fetchurl { name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; - sha1 = "545145077c501491e33b15ec408c294376e94ae4"; + sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="; }; } { @@ -1286,7 +1286,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=="; }; } { @@ -1294,7 +1294,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="; }; } { @@ -1302,7 +1302,7 @@ path = fetchurl { name = "figures___figures_1.7.0.tgz"; url = "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz"; - sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; + sha1 = "y+Hjr/zxzUS4DK3+0o3Hk6lwHS4="; }; } { @@ -1310,7 +1310,7 @@ path = fetchurl { name = "figures___figures_2.0.0.tgz"; url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; - sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + sha1 = "OrGi0qYsi/tDGgyUy3l6L84nyWI="; }; } { @@ -1318,7 +1318,7 @@ path = fetchurl { name = "file_entry_cache___file_entry_cache_2.0.0.tgz"; url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz"; - sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; + sha1 = "w5KZDD5oR4PYOLjISkXYoEhFg2E="; }; } { @@ -1326,7 +1326,7 @@ path = fetchurl { name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; - sha1 = "ca0f6efa6dd3d561333fb14515065c2fafdf439c"; + sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="; }; } { @@ -1334,7 +1334,7 @@ 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"; + sha1 = "1USBHUKPmOsGpj3EAtJAPDKMOPc="; }; } { @@ -1342,7 +1342,7 @@ 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"; + sha1 = "RdG35QbHF93UgndaK3eSCjwMV6c="; }; } { @@ -1350,7 +1350,7 @@ 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"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; }; } { @@ -1358,7 +1358,7 @@ 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"; + sha512 = "VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg=="; }; } { @@ -1366,7 +1366,7 @@ path = fetchurl { name = "flat_cache___flat_cache_2.0.1.tgz"; url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz"; - sha1 = "5d296d6f04bda44a4630a301413bdbc2ec085ec0"; + sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA=="; }; } { @@ -1374,7 +1374,7 @@ path = fetchurl { name = "flatted___flatted_2.0.2.tgz"; url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz"; - sha1 = "4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"; + sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; }; } { @@ -1382,7 +1382,7 @@ path = fetchurl { name = "fn_name___fn_name_2.0.1.tgz"; url = "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz"; - sha1 = "5214d7537a4d06a4a301c0cc262feb84188002e7"; + sha1 = "UhTXU3pNBqSjAcDMJi/rhBiAAuc="; }; } { @@ -1390,7 +1390,7 @@ 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"; + sha1 = "gQaNKVqBQuwKxybG4iAMMPttXoA="; }; } { @@ -1398,7 +1398,7 @@ 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"; + sha1 = "QpD60n8T6Jvn8zeZxrxaCr//DRk="; }; } { @@ -1406,7 +1406,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="; }; } { @@ -1414,7 +1414,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=="; }; } { @@ -1422,7 +1422,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="; }; } { @@ -1430,7 +1430,7 @@ path = fetchurl { name = "g_status___g_status_2.0.2.tgz"; url = "https://registry.yarnpkg.com/g-status/-/g-status-2.0.2.tgz"; - sha1 = "270fd32119e8fc9496f066fe5fe88e0a6bc78b97"; + sha512 = "kQoE9qH+T1AHKgSSD0Hkv98bobE90ILQcXAF4wvGgsr7uFqNvwmh8j+Lq3l0RVt3E3HjSbv2B9biEGcEtpHLCA=="; }; } { @@ -1438,7 +1438,7 @@ path = fetchurl { name = "get_caller_file___get_caller_file_1.0.3.tgz"; url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz"; - sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"; + sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; }; } { @@ -1446,7 +1446,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=="; }; } { @@ -1454,7 +1454,7 @@ path = fetchurl { name = "get_stdin___get_stdin_5.0.1.tgz"; url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz"; - sha1 = "122e161591e21ff4c52530305693f20e6393a398"; + sha1 = "Ei4WFZHiH/TFJTAwVpPyDmOTo5g="; }; } { @@ -1462,7 +1462,7 @@ path = fetchurl { name = "get_stdin___get_stdin_6.0.0.tgz"; url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz"; - sha1 = "9e09bf712b360ab9225e812048f71fde9c89657b"; + sha512 = "jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g=="; }; } { @@ -1470,7 +1470,7 @@ path = fetchurl { name = "get_stream___get_stream_3.0.0.tgz"; url = "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz"; - sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + sha1 = "jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="; }; } { @@ -1478,7 +1478,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=="; }; } { @@ -1486,7 +1486,7 @@ 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"; + sha1 = "3BXKHGcjh8p2vTesCjlbogQqLCg="; }; } { @@ -1494,7 +1494,7 @@ path = fetchurl { name = "glob___glob_7.1.6.tgz"; url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; - sha1 = "141f33b81a7c2492e125594307480c46679278a6"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; } { @@ -1502,7 +1502,7 @@ path = fetchurl { name = "glob___glob_7.0.6.tgz"; url = "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz"; - sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; + sha1 = "IRuvr0nlJbjNkyYNFKsTYVKz9Xo="; }; } { @@ -1510,7 +1510,7 @@ 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=="; }; } { @@ -1518,7 +1518,7 @@ path = fetchurl { name = "globby___globby_6.1.0.tgz"; url = "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz"; - sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; + sha1 = "9abXDoOV4hyFj7BInWTfAkJNUGw="; }; } { @@ -1526,7 +1526,7 @@ 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"; + sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; }; } { @@ -1534,7 +1534,7 @@ 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"; + sha1 = "NPUEnOHs3ysGSa8+8k5F7TVBbZE="; }; } { @@ -1542,7 +1542,7 @@ path = fetchurl { name = "has_flag___has_flag_2.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz"; - sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; + sha1 = "6CB68cx7MNRGzHC3NLXovhj4jVE="; }; } { @@ -1550,7 +1550,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="; }; } { @@ -1558,7 +1558,7 @@ 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"; + sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; }; } { @@ -1566,7 +1566,7 @@ 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"; + sha1 = "ex9YutpiyoJ+wKIHgCVlSEWZXh8="; }; } { @@ -1574,7 +1574,7 @@ 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"; + sha1 = "GLKB2lhbHFxR3vJMkw7SmgvmsXc="; }; } { @@ -1582,7 +1582,7 @@ 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"; + sha1 = "bWHeldkd/Km5oCCJrThL/49it3E="; }; } { @@ -1590,7 +1590,7 @@ 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"; + sha1 = "lbC2P+whRmGab+V/51Yo1aOe/k8="; }; } { @@ -1598,7 +1598,7 @@ 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=="; }; } { @@ -1606,7 +1606,7 @@ path = fetchurl { name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; - sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488"; + sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="; }; } { @@ -1614,7 +1614,7 @@ path = fetchurl { name = "husky___husky_1.3.1.tgz"; url = "https://registry.yarnpkg.com/husky/-/husky-1.3.1.tgz"; - sha1 = "26823e399300388ca2afff11cfa8a86b0033fae0"; + sha512 = "86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg=="; }; } { @@ -1622,7 +1622,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=="; }; } { @@ -1630,7 +1630,7 @@ path = fetchurl { name = "ignore___ignore_3.3.10.tgz"; url = "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz"; - sha1 = "0a97fb876986e8081c631160f8f9f389157f0043"; + sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; }; } { @@ -1638,7 +1638,7 @@ 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=="; }; } { @@ -1646,7 +1646,7 @@ path = fetchurl { name = "ignore___ignore_5.1.4.tgz"; url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz"; - sha1 = "84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"; + sha512 = "MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A=="; }; } { @@ -1654,7 +1654,7 @@ 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"; + sha1 = "2BNVwVYS04bGH53dOSLUMEgipUY="; }; } { @@ -1662,7 +1662,7 @@ 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"; + sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; }; } { @@ -1670,7 +1670,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="; }; } { @@ -1678,7 +1678,7 @@ path = fetchurl { name = "indent_string___indent_string_3.2.0.tgz"; url = "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz"; - sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; + sha1 = "Sl/W0nzDMvN+VBmlBNu4NxBckok="; }; } { @@ -1686,7 +1686,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="; }; } { @@ -1694,7 +1694,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=="; }; } { @@ -1702,7 +1702,7 @@ path = fetchurl { name = "inquirer___inquirer_3.3.0.tgz"; url = "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz"; - sha1 = "9dd2f2ad765dcab1ff0443b491442a20ba227dc9"; + sha512 = "h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ=="; }; } { @@ -1710,7 +1710,7 @@ path = fetchurl { name = "inquirer___inquirer_6.5.2.tgz"; url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz"; - sha1 = "ad50942375d036d327ff528c08bd5fab089928ca"; + sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ=="; }; } { @@ -1718,7 +1718,7 @@ path = fetchurl { name = "internal_slot___internal_slot_1.0.2.tgz"; url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz"; - sha1 = "9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"; + sha512 = "2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g=="; }; } { @@ -1726,7 +1726,7 @@ path = fetchurl { name = "invert_kv___invert_kv_1.0.0.tgz"; url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz"; - sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + sha1 = "EEqOSqym09jNFXqO+L+rLXo//bY="; }; } { @@ -1734,7 +1734,7 @@ 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"; + sha1 = "qeEss66Nh2cn7u84Q/igiXtcmNY="; }; } { @@ -1742,7 +1742,7 @@ 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"; + sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; } { @@ -1750,7 +1750,7 @@ 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"; + sha512 = "xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="; }; } { @@ -1758,7 +1758,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="; }; } { @@ -1766,7 +1766,7 @@ 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"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; } { @@ -1774,7 +1774,7 @@ path = fetchurl { name = "is_callable___is_callable_1.1.5.tgz"; url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz"; - sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab"; + sha512 = "ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="; }; } { @@ -1782,7 +1782,7 @@ 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=="; }; } { @@ -1790,7 +1790,7 @@ 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"; + sha1 = "C17mSDiOLIYCgueT8YVv7D8wG1Y="; }; } { @@ -1798,7 +1798,7 @@ 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"; + sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; }; } { @@ -1806,7 +1806,7 @@ 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"; + sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; }; } { @@ -1814,7 +1814,7 @@ 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"; + sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; }; } { @@ -1822,7 +1822,7 @@ 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"; + sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; }; } { @@ -1830,7 +1830,7 @@ 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"; + sha1 = "YTObbyR1/Hcv2cnYP1yFddwVSuE="; }; } { @@ -1838,7 +1838,7 @@ 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"; + sha1 = "YrEQ4omkcUGOPsNqYX1HLjAd/Ik="; }; } { @@ -1846,7 +1846,7 @@ 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"; + sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; }; } { @@ -1854,7 +1854,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="; }; } { @@ -1862,7 +1862,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"; + sha1 = "754xOG8DGn8NZDr4L95QxFfvAMs="; }; } { @@ -1870,7 +1870,7 @@ 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 = "o7MKXE8ZkYMWeqq5O+764937ZU8="; }; } { @@ -1878,7 +1878,7 @@ 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"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; }; } { @@ -1886,7 +1886,7 @@ 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"; + sha1 = "JP1iAaR4LPUFYcgQJ2r8fRLXEZU="; }; } { @@ -1894,7 +1894,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="; }; } { @@ -1902,7 +1902,7 @@ path = fetchurl { name = "is_observable___is_observable_1.1.0.tgz"; url = "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz"; - sha1 = "b3e986c8f44de950867cab5403f5a3465005975e"; + sha512 = "NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA=="; }; } { @@ -1910,7 +1910,7 @@ path = fetchurl { name = "is_path_cwd___is_path_cwd_1.0.0.tgz"; url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz"; - sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; + sha1 = "0iXsIxMuie3Tj9p2dHLmLmXxEG0="; }; } { @@ -1918,7 +1918,7 @@ path = fetchurl { name = "is_path_in_cwd___is_path_in_cwd_1.0.1.tgz"; url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz"; - sha1 = "5ac48b345ef675339bd6c7a48a912110b241cf52"; + sha512 = "FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ=="; }; } { @@ -1926,7 +1926,7 @@ path = fetchurl { name = "is_path_inside___is_path_inside_1.0.1.tgz"; url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz"; - sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; + sha1 = "jvW33lBDej/cprToZe96pVy0gDY="; }; } { @@ -1934,7 +1934,7 @@ 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"; + sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; } { @@ -1942,7 +1942,7 @@ path = fetchurl { name = "is_promise___is_promise_2.2.2.tgz"; url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz"; - sha1 = "39ab959ccbf9a774cf079f7b40c7a26f763135f1"; + sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; }; } { @@ -1950,7 +1950,7 @@ path = fetchurl { name = "is_regex___is_regex_1.0.5.tgz"; url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz"; - sha1 = "39d589a358bf18967f726967120b8fc1aed74eae"; + sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ=="; }; } { @@ -1958,7 +1958,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="; }; } { @@ -1966,7 +1966,7 @@ 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"; + sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="; }; } { @@ -1974,7 +1974,7 @@ 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"; + sha1 = "EtSj3U5o4Lec6428hBc66A2RykQ="; }; } { @@ -1982,7 +1982,7 @@ 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"; + sha512 = "buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="; }; } { @@ -1990,7 +1990,7 @@ 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"; + sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; }; } { @@ -1998,7 +1998,7 @@ 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"; + sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; }; } { @@ -2006,7 +2006,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="; }; } { @@ -2014,7 +2014,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="; }; } { @@ -2022,7 +2022,7 @@ path = fetchurl { name = "isobject___isobject_2.1.0.tgz"; url = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz"; - sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + sha1 = "8GVWEJaj8dou9GJy+BXIQNh+DIk="; }; } { @@ -2030,7 +2030,7 @@ path = fetchurl { name = "isobject___isobject_3.0.1.tgz"; url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; - sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + sha1 = "TkMekrEalzFjaqH5yNHMvP2reN8="; }; } { @@ -2038,7 +2038,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=="; }; } { @@ -2046,7 +2046,7 @@ path = fetchurl { name = "js_tokens___js_tokens_3.0.2.tgz"; url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz"; - sha1 = "9866df395102130e38f7f996bceb65443209c25b"; + sha1 = "mGbfOVECEw449/mWvOtlRDIJwls="; }; } { @@ -2054,7 +2054,7 @@ path = fetchurl { name = "js_yaml___js_yaml_3.13.1.tgz"; url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz"; - sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; }; } { @@ -2062,7 +2062,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=="; }; } { @@ -2070,7 +2070,7 @@ 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"; + sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; }; } { @@ -2078,7 +2078,7 @@ path = fetchurl { name = "json_schema_traverse___json_schema_traverse_0.3.1.tgz"; url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + sha1 = "NJptRMU6Ud6JtAgFxdXlm0F9M0A="; }; } { @@ -2086,7 +2086,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=="; }; } { @@ -2094,7 +2094,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="; }; } { @@ -2102,7 +2102,7 @@ path = fetchurl { name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz"; - sha1 = "8a9364e402448a3ce7f14d357738310d9248054f"; + sha512 = "EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA=="; }; } { @@ -2110,7 +2110,7 @@ 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"; + sha1 = "MeohpzS6ubuw8yRm2JOupR5KPGQ="; }; } { @@ -2118,7 +2118,7 @@ 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"; + sha1 = "IIE989cSkosgc3hpGkUGb65y3Vc="; }; } { @@ -2126,7 +2126,7 @@ 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"; + sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; }; } { @@ -2134,7 +2134,7 @@ 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"; + sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; }; } { @@ -2142,7 +2142,7 @@ path = fetchurl { name = "lcid___lcid_1.0.0.tgz"; url = "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz"; - sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + sha1 = "MIrMr6C8SDo4Z7S28rlQYlHRuDU="; }; } { @@ -2150,7 +2150,7 @@ 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="; }; } { @@ -2158,7 +2158,7 @@ path = fetchurl { name = "lint_staged___lint_staged_8.2.1.tgz"; url = "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.2.1.tgz"; - sha1 = "752fcf222d9d28f323a3b80f1e668f3654ff221f"; + sha512 = "n0tDGR/rTCgQNwXnUf/eWIpPNddGWxC32ANTNYsj2k02iZb7Cz5ox2tytwBu+2r0zDXMEMKw7Y9OD/qsav561A=="; }; } { @@ -2166,7 +2166,7 @@ path = fetchurl { name = "listr_silent_renderer___listr_silent_renderer_1.1.1.tgz"; url = "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz"; - sha1 = "924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"; + sha1 = "kktaN1cVN3C/Go4/v3S4u/P5JC4="; }; } { @@ -2174,7 +2174,7 @@ path = fetchurl { name = "listr_update_renderer___listr_update_renderer_0.5.0.tgz"; url = "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz"; - sha1 = "4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2"; + sha512 = "tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA=="; }; } { @@ -2182,7 +2182,7 @@ path = fetchurl { name = "listr_verbose_renderer___listr_verbose_renderer_0.5.0.tgz"; url = "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz"; - sha1 = "f1132167535ea4c1261102b9f28dac7cba1e03db"; + sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; } { @@ -2190,7 +2190,7 @@ path = fetchurl { name = "listr___listr_0.14.3.tgz"; url = "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz"; - sha1 = "2fea909604e434be464c50bddba0d496928fa586"; + sha512 = "RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA=="; }; } { @@ -2198,7 +2198,7 @@ path = fetchurl { name = "load_json_file___load_json_file_2.0.0.tgz"; url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz"; - sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + sha1 = "eUfkIUmvgNaWy/eXvKq8/h/inKg="; }; } { @@ -2206,7 +2206,7 @@ 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"; + sha1 = "K1aLJl7slExtnA3pw9u7ygNUzY4="; }; } { @@ -2214,7 +2214,7 @@ 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"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; }; } { @@ -2222,7 +2222,7 @@ 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"; + sha1 = "vMbEmkKihA7Zl/Mj6tpezRguC/4="; }; } { @@ -2230,7 +2230,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=="; }; } { @@ -2238,7 +2238,7 @@ path = fetchurl { name = "lodash.unescape___lodash.unescape_4.0.1.tgz"; url = "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz"; - sha1 = "bf2249886ce514cda112fae9218cdc065211fc9c"; + sha1 = "vyJJiGzlFM2hEvrpIYzcBlIR/Jw="; }; } { @@ -2246,7 +2246,7 @@ path = fetchurl { name = "lodash___lodash_4.17.15.tgz"; url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; - sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; + sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; }; } { @@ -2254,7 +2254,7 @@ path = fetchurl { name = "log_symbols___log_symbols_1.0.2.tgz"; url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz"; - sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; + sha1 = "N2/3tY6jCGoPCfrMdGF+ylAeGhg="; }; } { @@ -2262,7 +2262,7 @@ path = fetchurl { name = "log_symbols___log_symbols_2.2.0.tgz"; url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz"; - sha1 = "5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"; + sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; }; } { @@ -2270,7 +2270,7 @@ path = fetchurl { name = "log_update___log_update_2.3.0.tgz"; url = "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz"; - sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; + sha1 = "iDKP19HOeTiykoN0bwsbwSayRwg="; }; } { @@ -2278,7 +2278,7 @@ path = fetchurl { name = "loglevel_colored_level_prefix___loglevel_colored_level_prefix_1.0.0.tgz"; url = "https://registry.yarnpkg.com/loglevel-colored-level-prefix/-/loglevel-colored-level-prefix-1.0.0.tgz"; - sha1 = "6a40218fdc7ae15fc76c3d0f3e676c465388603e"; + sha1 = "akAhj9x64V/HbD0PPmdsRlOIYD4="; }; } { @@ -2286,7 +2286,7 @@ path = fetchurl { name = "loglevel___loglevel_1.6.8.tgz"; url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz"; - sha1 = "8a25fb75d092230ecd4457270d80b54e28011171"; + sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA=="; }; } { @@ -2294,7 +2294,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=="; }; } { @@ -2302,7 +2302,7 @@ path = fetchurl { name = "lru_cache___lru_cache_4.1.5.tgz"; url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz"; - sha1 = "8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"; + sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; } { @@ -2310,7 +2310,7 @@ path = fetchurl { name = "make_plural___make_plural_4.3.0.tgz"; url = "https://registry.yarnpkg.com/make-plural/-/make-plural-4.3.0.tgz"; - sha1 = "f23de08efdb0cac2e0c9ba9f315b0dff6b4c2735"; + sha512 = "xTYd4JVHpSCW+aqDof6w/MebaMVNTVYBZhbB/vi513xXdiPT92JMVCo0Jq8W2UZnzYRFeVbQiQ+I25l13JuKvA=="; }; } { @@ -2318,7 +2318,7 @@ 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"; + sha1 = "wyq9C9ZSXZsFFkW7TyasXcmKDb8="; }; } { @@ -2326,7 +2326,7 @@ path = fetchurl { name = "map_obj___map_obj_2.0.0.tgz"; url = "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz"; - sha1 = "a65cd29087a92598b8791257a523e021222ac1f9"; + sha1 = "plzSkIepJZi4eRJXpSPgISIqwfk="; }; } { @@ -2334,7 +2334,7 @@ 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"; + sha1 = "7Nyo8TFE5mDxtb1B8S80edmN+48="; }; } { @@ -2342,7 +2342,7 @@ path = fetchurl { name = "matcher___matcher_1.1.1.tgz"; url = "https://registry.yarnpkg.com/matcher/-/matcher-1.1.1.tgz"; - sha1 = "51d8301e138f840982b338b116bb0c09af62c1c2"; + sha512 = "+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg=="; }; } { @@ -2350,7 +2350,7 @@ path = fetchurl { name = "mem___mem_1.1.0.tgz"; url = "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz"; - sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; + sha1 = "Xt1StIXKHZAP5kiVUFOZoN+kX3Y="; }; } { @@ -2358,7 +2358,7 @@ path = fetchurl { name = "messageformat_parser___messageformat_parser_1.1.0.tgz"; url = "https://registry.yarnpkg.com/messageformat-parser/-/messageformat-parser-1.1.0.tgz"; - sha1 = "13ba2250a76bbde8e0fca0dbb3475f95c594a90a"; + sha512 = "Hwem6G3MsKDLS1FtBRGIs8T50P1Q00r3srS6QJePCFbad9fq0nYxwf3rnU2BreApRGhmpKMV7oZI06Sy1c9TPA=="; }; } { @@ -2366,7 +2366,7 @@ path = fetchurl { name = "messageformat___messageformat_1.1.1.tgz"; url = "https://registry.yarnpkg.com/messageformat/-/messageformat-1.1.1.tgz"; - sha1 = "ceaa2e6c86929d4807058275a7372b1bd963bdf6"; + sha512 = "Q0uXcDtF5pEZsVSyhzDOGgZZK6ykN79VY9CwU3Nv0gsqx62BjdJW0MT+63UkHQ4exe3HE33ZlxR2/YwoJarRTg=="; }; } { @@ -2374,7 +2374,7 @@ path = fetchurl { name = "micromatch___micromatch_3.1.10.tgz"; url = "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz"; - sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23"; + sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; } { @@ -2382,7 +2382,7 @@ path = fetchurl { name = "mimic_fn___mimic_fn_1.2.0.tgz"; url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha1 = "820c86a39334640e99516928bd03fca88057d022"; + sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; }; } { @@ -2390,7 +2390,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=="; }; } { @@ -2398,7 +2398,15 @@ 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=="; + }; + } + { + name = "minipass___minipass_3.3.4.tgz"; + path = fetchurl { + name = "minipass___minipass_3.3.4.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz"; + sha512 = "I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw=="; }; } { @@ -2406,7 +2414,7 @@ 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"; + sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; }; } { @@ -2414,7 +2422,7 @@ path = fetchurl { name = "mkdirp___mkdirp_0.5.5.tgz"; url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; - sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; } { @@ -2422,7 +2430,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="; }; } { @@ -2430,7 +2438,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=="; }; } { @@ -2438,7 +2446,7 @@ path = fetchurl { name = "mute_stream___mute_stream_0.0.7.tgz"; url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz"; - sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + sha1 = "MHXOk7whuPq0PhvE2n6BFe0ee6s="; }; } { @@ -2446,7 +2454,7 @@ path = fetchurl { name = "nanomatch___nanomatch_1.2.13.tgz"; url = "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz"; - sha1 = "b87a8aa4fc0de8fe6be88895b38983ff265bd119"; + sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; } { @@ -2454,7 +2462,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="; }; } { @@ -2462,7 +2470,7 @@ 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"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; }; } { @@ -2470,7 +2478,7 @@ path = fetchurl { name = "nopt___nopt_3.0.6.tgz"; url = "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz"; - sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; + sha1 = "xkZdvwirzU2zWTF/eaxopkayj/k="; }; } { @@ -2478,7 +2486,7 @@ 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"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; } { @@ -2486,7 +2494,7 @@ path = fetchurl { name = "npm_path___npm_path_2.0.4.tgz"; url = "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz"; - sha1 = "c641347a5ff9d6a09e4d9bce5580c4f505278e64"; + sha512 = "IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw=="; }; } { @@ -2494,7 +2502,7 @@ 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"; + sha1 = "NakjLfo11wZ7TLLd8jV7GHFTbF8="; }; } { @@ -2502,7 +2510,7 @@ path = fetchurl { name = "npm_which___npm_which_3.0.1.tgz"; url = "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz"; - sha1 = "9225f26ec3a285c209cae67c3b11a6b4ab7140aa"; + sha1 = "kiXybsOihcIJyuZ8OxGmtKtxQKo="; }; } { @@ -2510,7 +2518,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="; }; } { @@ -2518,7 +2526,7 @@ 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="; }; } { @@ -2526,7 +2534,7 @@ 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"; + sha1 = "fn2Fi3gb18mRpBupde04EnVOmYw="; }; } { @@ -2534,7 +2542,7 @@ path = fetchurl { name = "object_inspect___object_inspect_1.7.0.tgz"; url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz"; - sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"; + sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="; }; } { @@ -2542,7 +2550,7 @@ path = fetchurl { name = "object_is___object_is_1.1.2.tgz"; url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz"; - sha1 = "c5d2e87ff9e119f78b7a088441519e2eec1573b6"; + sha512 = "5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ=="; }; } { @@ -2550,7 +2558,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=="; }; } { @@ -2558,7 +2566,7 @@ 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"; + sha1 = "95xEk68MU3e1n+OdOV5BBC3QRbs="; }; } { @@ -2566,7 +2574,7 @@ path = fetchurl { name = "object.assign___object.assign_4.1.0.tgz"; url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz"; - sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da"; + sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; }; } { @@ -2574,7 +2582,7 @@ path = fetchurl { name = "object.entries___object.entries_1.1.1.tgz"; url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz"; - sha1 = "ee1cf04153de02bb093fec33683900f57ce5399b"; + sha512 = "ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ=="; }; } { @@ -2582,7 +2590,7 @@ path = fetchurl { name = "object.fromentries___object.fromentries_2.0.2.tgz"; url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz"; - sha1 = "4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"; + sha512 = "r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ=="; }; } { @@ -2590,7 +2598,7 @@ 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"; + sha1 = "h6EKxMFpS9Lhy/U1kaZhQftd10c="; }; } { @@ -2598,7 +2606,7 @@ path = fetchurl { name = "object.values___object.values_1.1.1.tgz"; url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; - sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; + sha512 = "WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA=="; }; } { @@ -2606,7 +2614,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="; }; } { @@ -2614,7 +2622,7 @@ path = fetchurl { name = "onetime___onetime_2.0.1.tgz"; url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + sha1 = "BnQoIw/WdEOyeUsiu6UotoZ5YtQ="; }; } { @@ -2622,7 +2630,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=="; }; } { @@ -2630,7 +2638,7 @@ path = fetchurl { name = "os_locale___os_locale_2.1.0.tgz"; url = "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz"; - sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2"; + sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA=="; }; } { @@ -2638,7 +2646,7 @@ path = fetchurl { name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + sha1 = "u+Z0BseaqFxc/sdm/lc0VV36EnQ="; }; } { @@ -2646,7 +2654,7 @@ 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"; + sha1 = "P7z7FbiZpEEjs0ttzBi3JDNqLK4="; }; } { @@ -2654,7 +2662,7 @@ 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"; + sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; }; } { @@ -2662,7 +2670,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=="; }; } { @@ -2670,7 +2678,7 @@ 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"; + sha1 = "IKAQOyIqcMj9OcwuWAaA893l7EM="; }; } { @@ -2678,7 +2686,7 @@ 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"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; }; } { @@ -2686,7 +2694,7 @@ path = fetchurl { name = "p_map___p_map_1.2.0.tgz"; url = "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz"; - sha1 = "e4e94f311eabbc8633a1e79908165fca26241b6b"; + sha512 = "r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA=="; }; } { @@ -2694,7 +2702,7 @@ 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"; + sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; }; } { @@ -2702,7 +2710,7 @@ 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"; + sha1 = "y8ec26+P1CKOE/Yh8rGiN8GyB7M="; }; } { @@ -2710,7 +2718,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=="; }; } { @@ -2718,7 +2726,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=="; }; } { @@ -2726,7 +2734,7 @@ path = fetchurl { name = "parse_json___parse_json_2.2.0.tgz"; url = "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + sha1 = "9ID0BDTvgHQfhGkJn43qGPVaTck="; }; } { @@ -2734,7 +2742,7 @@ 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"; + sha1 = "vjX1Qlvh9/bHRxhPmKeIy5lHfuA="; }; } { @@ -2742,7 +2750,7 @@ path = fetchurl { name = "pascalcase___pascalcase_0.1.1.tgz"; url = "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz"; - sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + sha1 = "s2PlXoAGym/iF4TS2yK9FdeRfxQ="; }; } { @@ -2750,7 +2758,7 @@ 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"; + sha1 = "zg6+ql94yxiSXqfYENe1mwEP1RU="; }; } { @@ -2758,7 +2766,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="; }; } { @@ -2766,7 +2774,7 @@ 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"; + sha1 = "NlQX3t5EQw0cEa9hAn+s8HS9/FM="; }; } { @@ -2774,7 +2782,7 @@ 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"; + sha1 = "QRyttXTFoUDTpLGRDUDYDMn0C0A="; }; } { @@ -2782,7 +2790,7 @@ 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"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; }; } { @@ -2790,7 +2798,7 @@ path = fetchurl { name = "path_type___path_type_2.0.0.tgz"; url = "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz"; - sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + sha1 = "8BLMuEFbcJb8LaoQVMPXI4lZTHM="; }; } { @@ -2798,7 +2806,7 @@ path = fetchurl { name = "pify___pify_2.3.0.tgz"; url = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + sha1 = "7RQaasBDqEnqWISY59yosVMw6Qw="; }; } { @@ -2806,7 +2814,7 @@ 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="; }; } { @@ -2814,7 +2822,7 @@ 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"; + sha1 = "ITXW36ejWMBprJsXh3YogihFD/o="; }; } { @@ -2822,7 +2830,7 @@ path = fetchurl { name = "pinkie___pinkie_2.0.4.tgz"; url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + sha1 = "clVrgM+g1IqXToDnckjoDtT3+HA="; }; } { @@ -2830,7 +2838,7 @@ 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"; + sha1 = "9tXREJ4Z1j7fQo4L1X4Sd3YVM0s="; }; } { @@ -2838,7 +2846,7 @@ 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"; + sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="; }; } { @@ -2846,7 +2854,7 @@ 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=="; }; } { @@ -2854,7 +2862,7 @@ path = fetchurl { name = "pluralize___pluralize_7.0.0.tgz"; url = "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz"; - sha1 = "298b89df8b93b0221dbf421ad2b1b1ea23fc6777"; + sha512 = "ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow=="; }; } { @@ -2862,7 +2870,7 @@ 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"; + sha1 = "AerA/jta9xoqbAL+q7jB/vfgDqs="; }; } { @@ -2870,7 +2878,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="; }; } { @@ -2878,7 +2886,7 @@ path = fetchurl { name = "prettier_eslint_cli___prettier_eslint_cli_4.7.1.tgz"; url = "https://registry.yarnpkg.com/prettier-eslint-cli/-/prettier-eslint-cli-4.7.1.tgz"; - sha1 = "3d103c494baa4e80b99ad53e2b9db7620101859f"; + sha512 = "hQbsGaEVz97oBBcKdsJ46khv0kOGkMyWrXzcFOXW6X8UuetZ/j0yDJkNJgUTVc6PVFbbzBXk+qgd5vos9qzXPQ=="; }; } { @@ -2886,7 +2894,7 @@ path = fetchurl { name = "prettier_eslint___prettier_eslint_8.8.2.tgz"; url = "https://registry.yarnpkg.com/prettier-eslint/-/prettier-eslint-8.8.2.tgz"; - sha1 = "fcb29a48ab4524e234680797fe70e9d136ccaf0b"; + sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; } { @@ -2894,7 +2902,7 @@ path = fetchurl { name = "prettier___prettier_1.19.1.tgz"; url = "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz"; - sha1 = "f7d7f5ff8a9cd872a7be4ca142095956a60797cb"; + sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="; }; } { @@ -2902,7 +2910,7 @@ path = fetchurl { name = "pretty_format___pretty_format_23.6.0.tgz"; url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz"; - sha1 = "5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760"; + sha512 = "zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw=="; }; } { @@ -2910,7 +2918,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=="; }; } { @@ -2918,7 +2926,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=="; }; } { @@ -2926,7 +2934,7 @@ 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"; + sha512 = "8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ=="; }; } { @@ -2934,7 +2942,7 @@ path = fetchurl { name = "property_expr___property_expr_1.5.1.tgz"; url = "https://registry.yarnpkg.com/property-expr/-/property-expr-1.5.1.tgz"; - sha1 = "22e8706894a0c8e28d58735804f6ba3a3673314f"; + sha512 = "CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g=="; }; } { @@ -2942,7 +2950,7 @@ path = fetchurl { name = "pseudomap___pseudomap_1.0.2.tgz"; url = "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz"; - sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + sha1 = "8FKijacOYYkX7wqKw0wa5aaChrM="; }; } { @@ -2950,7 +2958,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=="; }; } { @@ -2958,7 +2966,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=="; }; } { @@ -2966,7 +2974,7 @@ path = fetchurl { name = "quick_lru___quick_lru_1.1.0.tgz"; url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz"; - sha1 = "4360b17c61136ad38078397ff11416e186dcfbb8"; + sha1 = "Q2CxfGETatOAeDl/8RQW4Ybc+7g="; }; } { @@ -2974,7 +2982,7 @@ path = fetchurl { name = "ramda___ramda_0.26.1.tgz"; url = "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz"; - sha1 = "8d41351eb8111c55353617fc3bbffad8e4d35d06"; + sha512 = "hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ=="; }; } { @@ -2982,7 +2990,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=="; }; } { @@ -2990,7 +2998,7 @@ path = fetchurl { name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; - sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + sha1 = "a3KoBImE4MQeeVEP1en6mbO1Sb4="; }; } { @@ -2998,7 +3006,7 @@ path = fetchurl { name = "read_pkg___read_pkg_2.0.0.tgz"; url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz"; - sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + sha1 = "jvHAYjxqbbDcZxPEv6xGMysjaPg="; }; } { @@ -3006,7 +3014,7 @@ path = fetchurl { name = "read_pkg___read_pkg_4.0.1.tgz"; url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz"; - sha1 = "963625378f3e1c4d48c85872b5a6ec7d5d093237"; + sha1 = "ljYlN48+HE1IyFhytabsfV0JMjc="; }; } { @@ -3014,7 +3022,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=="; }; } { @@ -3022,7 +3030,7 @@ 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"; + sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; } { @@ -3030,7 +3038,7 @@ path = fetchurl { name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; - sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; + sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="; }; } { @@ -3038,7 +3046,7 @@ 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"; + sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; } { @@ -3046,7 +3054,7 @@ 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"; + sha512 = "2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ=="; }; } { @@ -3054,7 +3062,7 @@ path = fetchurl { name = "regexpp___regexpp_1.1.0.tgz"; url = "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz"; - sha1 = "0e3516dd0b7904f413d2d4193dce4618c3a689ab"; + sha512 = "LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw=="; }; } { @@ -3062,7 +3070,7 @@ path = fetchurl { name = "regexpp___regexpp_2.0.1.tgz"; url = "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz"; - sha1 = "8d19d31cf632482b589049f8281f93dbcba4d07f"; + sha512 = "lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="; }; } { @@ -3070,7 +3078,7 @@ 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"; + sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; }; } { @@ -3078,7 +3086,7 @@ 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"; + sha1 = "jcrkcOHIirwtYA//Sndihtp15jc="; }; } { @@ -3086,7 +3094,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="; }; } { @@ -3094,7 +3102,7 @@ path = fetchurl { name = "require_main_filename___require_main_filename_1.0.1.tgz"; url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + sha1 = "l/cXtp1IeE9fUmpsWqj/3aBVpNE="; }; } { @@ -3102,7 +3110,7 @@ path = fetchurl { name = "require_relative___require_relative_0.8.7.tgz"; url = "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz"; - sha1 = "7999539fc9e047a37928fa196f8e1563dabd36de"; + sha1 = "eZlTn8ngR6N5KPoZb44VY9q9Nt4="; }; } { @@ -3110,7 +3118,7 @@ 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"; + sha1 = "Tg1W1slmL9MeQwEcS5WqSZVUIdM="; }; } { @@ -3118,7 +3126,7 @@ path = fetchurl { name = "reserved_words___reserved_words_0.1.2.tgz"; url = "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz"; - sha1 = "00a0940f98cd501aeaaac316411d9adc52b31ab1"; + sha1 = "AKCUD5jNUBrqqsMWQR2a3FKzGrE="; }; } { @@ -3126,7 +3134,7 @@ 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"; + sha1 = "Jsv+k10a7uq7Kbw/5a6wHpPUQiY="; }; } { @@ -3134,7 +3142,7 @@ 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"; + sha1 = "six699nWiBvItuZTM17rywoYh0g="; }; } { @@ -3142,7 +3150,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=="; }; } { @@ -3150,7 +3158,7 @@ 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"; + sha1 = "LGN/53yJOv0qZj/iGqkIAGjiBSo="; }; } { @@ -3158,7 +3166,7 @@ path = fetchurl { name = "resolve___resolve_1.17.0.tgz"; url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz"; - sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444"; + sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; }; } { @@ -3166,7 +3174,7 @@ path = fetchurl { name = "restore_cursor___restore_cursor_2.0.0.tgz"; url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + sha1 = "n37ih/gv0ybU/RYpI9YhKe7g368="; }; } { @@ -3174,7 +3182,7 @@ path = fetchurl { name = "ret___ret_0.1.15.tgz"; url = "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz"; - sha1 = "b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"; + sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; } { @@ -3182,7 +3190,7 @@ path = fetchurl { name = "rimraf___rimraf_2.6.3.tgz"; url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz"; - sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"; + sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; }; } { @@ -3190,7 +3198,7 @@ path = fetchurl { name = "rimraf___rimraf_2.7.1.tgz"; url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; - sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; }; } { @@ -3198,7 +3206,7 @@ path = fetchurl { name = "run_async___run_async_2.4.1.tgz"; url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; - sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; + sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; }; } { @@ -3206,7 +3214,7 @@ path = fetchurl { name = "run_node___run_node_1.0.0.tgz"; url = "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz"; - sha1 = "46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"; + sha512 = "kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A=="; }; } { @@ -3214,7 +3222,7 @@ path = fetchurl { name = "rx_lite_aggregates___rx_lite_aggregates_4.0.8.tgz"; url = "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz"; - sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; + sha1 = "dTuHqJoRyVRnxKwWJsTvxOBcZ74="; }; } { @@ -3222,7 +3230,7 @@ path = fetchurl { name = "rx_lite___rx_lite_4.0.8.tgz"; url = "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz"; - sha1 = "0b1e11af8bc44836f04a6407e92da42467b79444"; + sha1 = "Cx4Rr4vESDbwSmQH6S2kJGe3lEQ="; }; } { @@ -3230,7 +3238,7 @@ path = fetchurl { name = "rxjs___rxjs_5.5.12.tgz"; url = "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.12.tgz"; - sha1 = "6fa61b8a77c3d793dbaf270bee2f43f652d741cc"; + sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw=="; }; } { @@ -3238,7 +3246,7 @@ path = fetchurl { name = "rxjs___rxjs_6.5.5.tgz"; url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz"; - sha1 = "c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"; + sha512 = "WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ=="; }; } { @@ -3246,7 +3254,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=="; }; } { @@ -3254,7 +3262,7 @@ 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"; + sha1 = "QKNmnzsHfR6UPURinhV91IAjvy4="; }; } { @@ -3262,7 +3270,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=="; }; } { @@ -3270,7 +3278,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="; }; } { @@ -3278,7 +3286,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=="; }; } { @@ -3286,7 +3294,7 @@ path = fetchurl { name = "semver___semver_5.5.0.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz"; - sha1 = "dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"; + sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="; }; } { @@ -3294,7 +3302,7 @@ 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="; }; } { @@ -3302,7 +3310,7 @@ 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"; + sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; }; } { @@ -3310,7 +3318,7 @@ 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"; + sha1 = "RKrGW2lbAzmJaMOfNj/uXer98eo="; }; } { @@ -3318,7 +3326,7 @@ 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"; + sha1 = "2kL0l0DAtC2yypcoVxyxkMmO/qM="; }; } { @@ -3326,7 +3334,7 @@ path = fetchurl { name = "side_channel___side_channel_1.0.2.tgz"; url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz"; - sha1 = "df5d1abadb4e4bf4af1cd8852bf132d2f7876947"; + sha512 = "7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA=="; }; } { @@ -3334,7 +3342,7 @@ 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"; + sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; }; } { @@ -3342,7 +3350,7 @@ path = fetchurl { name = "simple_git___simple_git_1.132.0.tgz"; url = "https://registry.yarnpkg.com/simple-git/-/simple-git-1.132.0.tgz"; - sha1 = "53ac4c5ec9e74e37c2fd461e23309f22fcdf09b1"; + sha512 = "xauHm1YqCTom1sC9eOjfq3/9RKiUA9iPnxBbrY2DdL8l4ADMu0jjM5l5lphQP5YWNqAL2aXC/OeuQ76vHtW5fg=="; }; } { @@ -3350,7 +3358,7 @@ path = fetchurl { name = "slash___slash_2.0.0.tgz"; url = "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz"; - sha1 = "de552851a1759df3a8f206535442f5ec4ddeab44"; + sha512 = "ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="; }; } { @@ -3358,7 +3366,7 @@ 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"; + sha1 = "7b+JA/ZvfOL46v1s7tZeJkyDGzU="; }; } { @@ -3366,7 +3374,7 @@ 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"; + sha512 = "POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg=="; }; } { @@ -3374,7 +3382,7 @@ path = fetchurl { name = "slice_ansi___slice_ansi_2.1.0.tgz"; url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz"; - sha1 = "cacd7693461a637a5788d92a7dd4fba068e81636"; + sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; }; } { @@ -3382,7 +3390,7 @@ 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"; + sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; }; } { @@ -3390,7 +3398,7 @@ 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"; + sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; }; } { @@ -3398,7 +3406,7 @@ path = fetchurl { name = "snapdragon___snapdragon_0.8.2.tgz"; url = "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz"; - sha1 = "64922e7c565b0e14204ba1aa7d6964278d25182d"; + sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; }; } { @@ -3406,7 +3414,7 @@ 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"; + sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; } { @@ -3414,7 +3422,7 @@ 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"; + sha1 = "PpNdfd1zYxuXZZlW1VEo6HtQhKM="; }; } { @@ -3422,7 +3430,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="; }; } { @@ -3430,7 +3438,7 @@ path = fetchurl { name = "spdx_correct___spdx_correct_3.1.0.tgz"; url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz"; - sha1 = "fb83e504445268f154b074e218c87c003cd31df4"; + sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; }; } { @@ -3438,7 +3446,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=="; }; } { @@ -3446,7 +3454,7 @@ 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=="; }; } { @@ -3454,7 +3462,7 @@ path = fetchurl { name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha1 = "3694b5804567a458d3c8045842a6358632f62654"; + sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; }; } { @@ -3462,7 +3470,7 @@ 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"; + sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; }; } { @@ -3470,7 +3478,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 = "ssri___ssri_10.0.0.tgz"; + path = fetchurl { + name = "ssri___ssri_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-10.0.0.tgz"; + sha512 = "64ghGOpqW0k+jh7m5jndBGdVEoPikWwGQmBNN5ks6jyUSMymzHDTlnNHOvzp+6MmHOljr2MokUzvRksnTwG0Iw=="; }; } { @@ -3478,7 +3494,7 @@ path = fetchurl { name = "staged_git_files___staged_git_files_1.1.2.tgz"; url = "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.1.2.tgz"; - sha1 = "4326d33886dc9ecfa29a6193bf511ba90a46454b"; + sha512 = "0Eyrk6uXW6tg9PYkhi/V/J4zHp33aNyi2hOCmhFLqLTIhbgqWn5jlSzI+IU0VqrZq6+DbHcabQl/WP6P3BG0QA=="; }; } { @@ -3486,7 +3502,7 @@ 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"; + sha1 = "YICcOcv/VTNyJv1eC1IPNB8ftcY="; }; } { @@ -3494,7 +3510,7 @@ path = fetchurl { name = "string_argv___string_argv_0.0.2.tgz"; url = "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz"; - sha1 = "dac30408690c21f3c3630a3ff3a05877bdcbd736"; + sha1 = "2sMECGkMIfPDYwo/86BYd73L1zY="; }; } { @@ -3502,7 +3518,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"; + sha1 = "EYvfW4zcUaKn5w0hHgfisLmxB9M="; }; } { @@ -3510,7 +3526,7 @@ 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"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; }; } { @@ -3518,7 +3534,7 @@ 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"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; } { @@ -3526,7 +3542,7 @@ path = fetchurl { name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz"; - sha1 = "48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"; + sha512 = "N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg=="; }; } { @@ -3534,7 +3550,7 @@ 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"; + sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; }; } { @@ -3542,7 +3558,7 @@ path = fetchurl { name = "string.prototype.trimleft___string.prototype.trimleft_2.1.2.tgz"; url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; - sha1 = "4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"; + sha512 = "gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw=="; }; } { @@ -3550,7 +3566,7 @@ path = fetchurl { name = "string.prototype.trimright___string.prototype.trimright_2.1.2.tgz"; url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; - sha1 = "c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"; + sha512 = "ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg=="; }; } { @@ -3558,7 +3574,7 @@ 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"; + sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; }; } { @@ -3566,7 +3582,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=="; }; } { @@ -3574,7 +3590,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=="; }; } { @@ -3582,7 +3598,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"; + sha1 = "ajhfuIU9lS1f8F0Oiq+UJ43GPc8="; }; } { @@ -3590,7 +3606,7 @@ 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 = "qEeQIusaw2iocTibY1JixQXuNo8="; }; } { @@ -3598,7 +3614,7 @@ 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"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; } { @@ -3606,7 +3622,7 @@ 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"; + sha1 = "IzTBjpx1n3vdVv3vfprj1YjmjtM="; }; } { @@ -3614,7 +3630,7 @@ 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"; + sha1 = "u0P/VZim6wXYm1n80SnJgzE2Br8="; }; } { @@ -3622,7 +3638,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="; }; } { @@ -3630,7 +3646,7 @@ 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"; + sha1 = "U10EXOa2Nj+kARcIRimZXp3zJMc="; }; } { @@ -3638,7 +3654,7 @@ path = fetchurl { name = "supports_color___supports_color_4.5.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz"; - sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; + sha1 = "vnoN5ITexcXN34s9WRJQRJEvY1s="; }; } { @@ -3646,7 +3662,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=="; }; } { @@ -3654,7 +3670,7 @@ path = fetchurl { name = "symbol_observable___symbol_observable_1.0.1.tgz"; url = "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz"; - sha1 = "8340fc4702c3122df5d22288f88283f513d3fdd4"; + sha1 = "g0D8RwLDEi310iKI+IKD9RPT/dQ="; }; } { @@ -3662,7 +3678,7 @@ path = fetchurl { name = "symbol_observable___symbol_observable_1.2.0.tgz"; url = "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz"; - sha1 = "c22688aed4eab3cdc2dfeacbb561660560a00804"; + sha512 = "e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="; }; } { @@ -3670,7 +3686,7 @@ path = fetchurl { name = "synchronous_promise___synchronous_promise_2.0.12.tgz"; url = "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.12.tgz"; - sha1 = "219934f23c19c9aa716276cf2e1f8d4e5b04d07f"; + sha512 = "rIDJiHmIK02tXU+eW1v6a7rNIIiMLm5JUF5Uj2fT6oLSulg7WNDVoqvkYqkFoJzf4v2gmTLppvzegdo9R+7h1Q=="; }; } { @@ -3678,7 +3694,7 @@ path = fetchurl { name = "table___table_4.0.2.tgz"; url = "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz"; - sha1 = "a33447375391e766ad34d3486e6e2aedc84d2e36"; + sha512 = "UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA=="; }; } { @@ -3686,7 +3702,7 @@ path = fetchurl { name = "table___table_5.4.6.tgz"; url = "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz"; - sha1 = "1292d19500ce3f86053b05f0e8e7e4a3bb21079e"; + sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; }; } { @@ -3694,7 +3710,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="; }; } { @@ -3702,7 +3718,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="; }; } { @@ -3710,7 +3726,7 @@ path = fetchurl { name = "tmp___tmp_0.0.33.tgz"; url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz"; - sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9"; + sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; }; } { @@ -3718,7 +3734,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="; }; } { @@ -3726,7 +3742,7 @@ 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"; + sha1 = "KXWIt7Dn4KwI4E5nL4XB9JmeF68="; }; } { @@ -3734,7 +3750,7 @@ 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"; + sha1 = "fIDBe53+vlmeJzZ+DU3VWQFB2zg="; }; } { @@ -3742,7 +3758,7 @@ 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"; + sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; }; } { @@ -3750,7 +3766,7 @@ path = fetchurl { name = "toposort___toposort_2.0.2.tgz"; url = "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz"; - sha1 = "ae21768175d1559d48bef35420b2f4962f09c330"; + sha1 = "riF2gXXRVZ1IvvNUILL0li8JwzA="; }; } { @@ -3758,7 +3774,7 @@ path = fetchurl { name = "tslib___tslib_1.13.0.tgz"; url = "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz"; - sha1 = "c881e13cc7015894ed914862d276436fa9a47043"; + sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="; }; } { @@ -3766,7 +3782,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="; }; } { @@ -3774,7 +3790,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="; }; } { @@ -3782,7 +3798,7 @@ path = fetchurl { name = "typescript_eslint_parser___typescript_eslint_parser_16.0.1.tgz"; url = "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-16.0.1.tgz"; - sha1 = "b40681c7043b222b9772748b700a000b241c031b"; + sha512 = "IKawLTu4A2xN3aN/cPLxvZ0bhxZHILGDKTZWvWNJ3sLNhJ3PjfMEDQmR2VMpdRPrmWOadgWXRwjLBzSA8AGsaQ=="; }; } { @@ -3790,7 +3806,7 @@ path = fetchurl { name = "typescript___typescript_2.9.2.tgz"; url = "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz"; - sha1 = "1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"; + sha512 = "Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w=="; }; } { @@ -3798,7 +3814,7 @@ 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"; + sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="; }; } { @@ -3806,7 +3822,7 @@ 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"; + sha1 = "g3aHP30jNRef+x5vw6jtDfyKtVk="; }; } { @@ -3814,7 +3830,7 @@ path = fetchurl { name = "uri_js___uri_js_4.2.2.tgz"; url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz"; - sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; }; } { @@ -3822,7 +3838,7 @@ path = fetchurl { name = "urix___urix_0.1.0.tgz"; url = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz"; - sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + sha1 = "2pN/emLiH+wf0Y1Js1wpNQZ6bHI="; }; } { @@ -3830,7 +3846,7 @@ path = fetchurl { name = "use___use_3.1.1.tgz"; url = "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz"; - sha1 = "d50c8cac79a19fbc20f2911f56eb973f4e10070f"; + sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; }; } { @@ -3838,7 +3854,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="; }; } { @@ -3846,7 +3862,7 @@ 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"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; }; } { @@ -3854,7 +3870,7 @@ path = fetchurl { name = "vue_eslint_parser___vue_eslint_parser_2.0.3.tgz"; url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz"; - sha1 = "c268c96c6d94cfe3d938a5f7593959b0ca3360d1"; + sha512 = "ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw=="; }; } { @@ -3862,7 +3878,7 @@ 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"; + sha1 = "2e8H3Od7mQK4o6j6SzHD4/fm6Ho="; }; } { @@ -3870,7 +3886,7 @@ path = fetchurl { name = "which___which_1.3.1.tgz"; url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; - sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; } { @@ -3878,7 +3894,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=="; }; } { @@ -3886,7 +3902,7 @@ path = fetchurl { name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + sha1 = "2Pw9KE3QV5T+hJc8rs3Rz4JP3YU="; }; } { @@ -3894,7 +3910,7 @@ path = fetchurl { name = "wrap_ansi___wrap_ansi_3.0.1.tgz"; url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz"; - sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; + sha1 = "KIoE2H7aXChuBg3+jxNc6NAH+Lo="; }; } { @@ -3902,7 +3918,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="; }; } { @@ -3910,7 +3926,7 @@ path = fetchurl { name = "write___write_1.0.3.tgz"; url = "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz"; - sha1 = "0800e14523b923a387e415123c865616aae0f5c3"; + sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="; }; } { @@ -3918,7 +3934,7 @@ path = fetchurl { name = "write___write_0.2.1.tgz"; url = "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz"; - sha1 = "5fc03828e264cea3fe91455476f7a3c566cb0757"; + sha1 = "X8A4KOJkzqP+kUVUdvejxWbLB1c="; }; } { @@ -3926,7 +3942,7 @@ path = fetchurl { name = "xregexp___xregexp_4.3.0.tgz"; url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz"; - sha1 = "7e92e73d9174a99a59743f67a4ce879a04b5ae50"; + sha512 = "7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g=="; }; } { @@ -3934,7 +3950,7 @@ path = fetchurl { name = "y18n___y18n_3.2.1.tgz"; url = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz"; - sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + sha1 = "bRX7qITAhnnA136I53WegR4H+kE="; }; } { @@ -3942,7 +3958,15 @@ path = fetchurl { name = "yallist___yallist_2.1.2.tgz"; url = "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz"; - sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + sha1 = "HBH5IY8HYImkfdUS+TxmmaaoHVI="; + }; + } + { + 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=="; }; } { @@ -3950,7 +3974,7 @@ path = fetchurl { name = "yargs_parser___yargs_parser_8.1.0.tgz"; url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz"; - sha1 = "f1376a33b6629a5d063782944da732631e966950"; + sha512 = "yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ=="; }; } { @@ -3958,7 +3982,7 @@ path = fetchurl { name = "yargs___yargs_10.0.3.tgz"; url = "https://registry.yarnpkg.com/yargs/-/yargs-10.0.3.tgz"; - sha1 = "6542debd9080ad517ec5048fb454efe9e4d4aaae"; + sha512 = "DqBpQ8NAUX4GyPP/ijDGHsJya4tYqLQrjPr95HNsr1YwL3+daCfvBwg7+gIC6IdJhR2kATh3hb61vjzMWEtjdw=="; }; } { @@ -3966,7 +3990,7 @@ path = fetchurl { name = "yup___yup_0.27.0.tgz"; url = "https://registry.yarnpkg.com/yup/-/yup-0.27.0.tgz"; - sha1 = "f8cb198c8e7dd2124beddc2457571329096b06e7"; + sha512 = "v1yFnE4+u9za42gG/b/081E7uNW9mUj3qtkmelLbW5YPROZzSH/KUUyJu9Wt8vxFJcT9otL/eZopS0YK1L5yPQ=="; }; } ]; diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 6b38664b4b81..98deb602199f 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.30.4"; + version = "4.30.8"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-8tCxmcg2FW8OyYQmsoEkhtLJn0V/1u5uw+Er7kWlqcM="; + sha256 = "sha256-x0vdPi8/Iciy+22SPBpktgkQCMxd5PT674OsWaLi+Q0="; }; - vendorSha256 = "sha256-L3l6wH4bR1/R6MtQTHYsyRE5E/EPnpNwa310zUONo+s="; + vendorHash = "sha256-VEVy8iVnUUpjTmCj7uIMcz0jaG9XGuxA3U02QfIwsYs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index a26e71522e5f..8e33b84b364e 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.44.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-mhfRrmZkeQWbYlgDEsjiUSOALXc6tI8eK81rjLYSXwk="; + sha256 = "sha256-3uyMwW8v2rPguXbPKy8IyQxroNaNS6rrXEcgRP91fdU="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/development/tools/zed/default.nix index 1eafbaab016c..5441946052b3 100644 --- a/pkgs/development/tools/zed/default.nix +++ b/pkgs/development/tools/zed/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zed"; - version = "1.2.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "brimdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BK4LB37jr/9O0sjYgFtnEkbFqTsp/1+hcmCNMFDPiPM="; + sha256 = "sha256-er3BPQ10ERCIBn0xx0jjyMBybnUBMyX76tqYEYe2WYQ="; }; - vendorSha256 = "sha256-oAkQRUaEP/RNjpDH4U8XFVokf7KiLk0OWMX+U7qny70="; + vendorHash = "sha256-3PyyR9d5m33ohbcstREvTOtWwMIrbFNvFyBY1F+6R+4="; subPackages = [ "cmd/zed" "cmd/zq" ]; diff --git a/pkgs/development/tools/zprint/default.nix b/pkgs/development/tools/zprint/default.nix index c401ecf0bb52..f93098aebfe2 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.4"; + version = "1.2.5"; src = fetchurl { url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}"; - sha256 = "sha256-PgmaKxTOZPgHhEfFA5FdHrKHHpfieoK2QZBYR3f0J8s="; + sha256 = "sha256-PWdR5jqyzvTk9HoxqDldwtZNik34dmebBtZZ5vtva4A="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/zq/default.nix b/pkgs/development/tools/zq/default.nix index 956ce70b41b0..c62de54360fc 100644 --- a/pkgs/development/tools/zq/default.nix +++ b/pkgs/development/tools/zq/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "zq"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "brimdata"; repo = "zed"; rev = "v${version}"; - hash = "sha256-BK4LB37jr/9O0sjYgFtnEkbFqTsp/1+hcmCNMFDPiPM="; + hash = "sha256-ias2HKwZo5Q/0M4YZI4wLgzMVWmannruXlhp8IsOuyU="; }; - vendorSha256 = "sha256-oAkQRUaEP/RNjpDH4U8XFVokf7KiLk0OWMX+U7qny70="; + vendorHash = "sha256-h5NYx6xhIh4i/tS5cGHXBomnVZCUn8jJuzL6k1+IdKk="; subPackages = [ "cmd/zq" ]; diff --git a/pkgs/development/tools/zsv/default.nix b/pkgs/development/tools/zsv/default.nix index 7a02b42f8f8f..639b9bcb4b26 100644 --- a/pkgs/development/tools/zsv/default.nix +++ b/pkgs/development/tools/zsv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsv"; - version = "unstable-2022-11-12"; + version = "0.3.5-alpha"; src = fetchFromGitHub { owner = "liquidaty"; repo = "zsv"; - rev = "058a990e2086e639d1e11ed8b2ae81b03e4bfcac"; - sha256 = "sha256-V1wkwNSpMsSpaL/j4z4TN59W1+Xn6MYMEWBdwdtTz+s="; + rev = "v${version}"; + hash = "sha256-HW/w2bJVnTELh36rUfGIzAsc6e+PTBGsAdHDz7gFAdI="; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 55b5f0dda210..817e32e4921c 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.2.2"; + version = "0.4.0"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - sha256 = "IIy5ZEx/+StAhtRcGqM3uvvEqu4wGzGUls0K/ot4jRI="; + sha256 = "T+vxwYM0zc1HsPiBncZolIquglKThsx2RDOS3/jPn4s="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - sha256 = "5cScLXujNm14+SCr8OcO93RDL3EfAjsuAzfcwj+EMKs="; + sha256 = "AEo4xXnePlQYTXepwSDUaG8NczPdTCbPGPzxgH+/HHo="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - sha256 = "3PdLVz4qTJQHmM9laL413xnZaSuD6xlaSy8cuJ9M8us="; + sha256 = "w66xgmVepmC543apTTGLfeV3FMsLiiUpfqzzRhpaNy8="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - sha256 = "eVEopSvyjzY8J3q52wowTlSVHZ4s1lIc8/yU6Ya+0QU="; + sha256 = "LMutdGNiGp4aLmeqMLk8Pc0xIjqgWPO6GSli1EfTgkY="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 9f81fe32fc55..4e1563f7716a 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.28.1"; + version = "1.30.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pphXLH81xous4C/mTkay9mfk3PgIT7HcY+br9uckJlQ="; + sha256 = "sha256-WpS1pqy6o8FUWMdJpzG5T8xoCkQZ/SbWI4k9vellVb8="; }; - cargoSha256 = "sha256-DEWLIGskfvuEZhLvtdPprlmncZRcJBBBjYRuk4oFVkk="; + cargoSha256 = "sha256-RVoXHrEWMwuC+nD6ypiZzGsYEr/BFReE67z7gqqDOzA="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds @@ -85,6 +85,7 @@ rustPlatform.buildRustPackage rec { ''; passthru.updateScript = ./update/update.ts; + passthru.tests = callPackage ./tests { }; meta = with lib; { homepage = "https://deno.land/"; diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 32e2edccce1a..52b3e12f0286 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.55.0"; + version = "0.60.1"; shas = { - x86_64-linux = "sha256-HztOb1r/9tWh0w4zQveBLOh3d6OfnSwQZkIx6drXJ7M="; - aarch64-linux = "sha256-rP0K875V4f4yHe7unUCpMCQbi7Fips6474gFZph73Ys="; - x86_64-darwin = "sha256-iiYttjs9h84YqZG8prxudTTi588BuoqA3zc2LkEks5E="; - aarch64-darwin = "sha256-RBA3fl3YdCqxb00xgl6KTYdbvl75U5Kgrux5N+dZg/g="; + x86_64-linux = "sha256-P8H+XJqrt9jdKM885L1epMldp+stwmEw+0Gtd2x3r4g="; + aarch64-linux = "sha256-frHpBP2pL3o4efFLHP2r3zsWJrNT93yYu2Qkxv+7m8Y="; + x86_64-darwin = "sha256-taewoYBkyikqWueLSD9dW1EDjzkV68Xplid1UaLZgRM="; + aarch64-darwin = "sha256-s2YEVbuYpiT/qrmE37aXk13MetrnJo6l+s1Q2y6b5kU="; }; } diff --git a/pkgs/development/web/deno/tests/basic.ts b/pkgs/development/web/deno/tests/basic.ts new file mode 100644 index 000000000000..5959aa217b3c --- /dev/null +++ b/pkgs/development/web/deno/tests/basic.ts @@ -0,0 +1 @@ +console.log(1 + 1) diff --git a/pkgs/development/web/deno/tests/default.nix b/pkgs/development/web/deno/tests/default.nix new file mode 100644 index 000000000000..b6787c913b12 --- /dev/null +++ b/pkgs/development/web/deno/tests/default.nix @@ -0,0 +1,68 @@ +{ deno, runCommand, lib, testers }: +let + testDenoRun = + name: + { args ? "" + , dir ? ./. + "/${name}" + , file ? "index.ts" + , expected ? "" + , expectFailure ? false + }: + let + command = "deno run ${args} ${dir}/${file}"; + in + runCommand "deno-test-${name}" { nativeBuildInputs = [ deno ]; meta.timeout = 60; } '' + HOME=$(mktemp -d) + if output=$(${command} 2>&1); then + if [[ $output =~ '${expected}' ]]; then + echo "Test '${name}' passed" + touch $out + else + echo -n ${lib.escapeShellArg command} >&2 + echo " output did not match what was expected." >&2 + echo "The expected was:" >&2 + echo '${expected}' >&2 + echo "The output was:" >&2 + echo "$output" >&2 + exit 1 + fi + else + if [[ "${toString expectFailure}" == "1" ]]; then + echo "Test '${name}' failed as expected" + touch $out + exit 0 + fi + echo -n ${lib.escapeShellArg command} >&2 + echo " returned a non-zero exit code." >&2 + echo "$output" >&2 + exit 1 + fi + ''; +in +(lib.mapAttrs testDenoRun { + basic = { + dir = ./.; + file = "basic.ts"; + expected = "2"; + }; + import-json = { + expected = "hello from JSON"; + }; + import-ts = { + expected = "hello from ts"; + }; + read-file = { + args = "--allow-read"; + expected = "hello from a file"; + }; + fail-read-file = { + expectFailure = true; + dir = ./read-file; + }; +}) // +{ + version = testers.testVersion { + package = deno; + command = "deno --version"; + }; +} diff --git a/pkgs/development/web/deno/tests/import-json/data.json b/pkgs/development/web/deno/tests/import-json/data.json new file mode 100644 index 000000000000..7f0de9ebe0b9 --- /dev/null +++ b/pkgs/development/web/deno/tests/import-json/data.json @@ -0,0 +1 @@ +{ "msg": "hello from JSON" } diff --git a/pkgs/development/web/deno/tests/import-json/index.ts b/pkgs/development/web/deno/tests/import-json/index.ts new file mode 100644 index 000000000000..525f25f74da2 --- /dev/null +++ b/pkgs/development/web/deno/tests/import-json/index.ts @@ -0,0 +1,2 @@ +import file from "./data.json" assert { type: "json" }; +console.log(file.msg); diff --git a/pkgs/development/web/deno/tests/import-ts/index.ts b/pkgs/development/web/deno/tests/import-ts/index.ts new file mode 100644 index 000000000000..34fec283a169 --- /dev/null +++ b/pkgs/development/web/deno/tests/import-ts/index.ts @@ -0,0 +1,3 @@ +import { sayHello } from "./lib.ts" + +sayHello("ts") diff --git a/pkgs/development/web/deno/tests/import-ts/lib.ts b/pkgs/development/web/deno/tests/import-ts/lib.ts new file mode 100644 index 000000000000..3b5e05aaaaf3 --- /dev/null +++ b/pkgs/development/web/deno/tests/import-ts/lib.ts @@ -0,0 +1,3 @@ +export function sayHello(thing: string) { + console.log(`hello from ${thing}`); +} diff --git a/pkgs/development/web/deno/tests/read-file/data.txt b/pkgs/development/web/deno/tests/read-file/data.txt new file mode 100644 index 000000000000..7eee1b0c107c --- /dev/null +++ b/pkgs/development/web/deno/tests/read-file/data.txt @@ -0,0 +1 @@ +hello from a file diff --git a/pkgs/development/web/deno/tests/read-file/index.ts b/pkgs/development/web/deno/tests/read-file/index.ts new file mode 100644 index 000000000000..be792a3d6628 --- /dev/null +++ b/pkgs/development/web/deno/tests/read-file/index.ts @@ -0,0 +1,5 @@ +// trim 'file://' prefix +const thisDir = Deno.mainModule.substring(7, Deno.mainModule.length); +const getParent = (path: string) => path.substring(0, path.lastIndexOf("/")) +const text = await Deno.readTextFile(getParent(thisDir) + "/data.txt"); +console.log(text); diff --git a/pkgs/development/web/deno/update/librusty_v8.ts b/pkgs/development/web/deno/update/librusty_v8.ts index 7ee4c855741f..d9d57d2908db 100644 --- a/pkgs/development/web/deno/update/librusty_v8.ts +++ b/pkgs/development/web/deno/update/librusty_v8.ts @@ -1,10 +1,8 @@ import * as toml from "https://deno.land/std@0.148.0/encoding/toml.ts"; import { - genValueRegExp, getExistingVersion, logger, run, - versionRegExp, write, } from "./common.ts"; @@ -25,9 +23,9 @@ const getLibrustyV8Version = async ( repo: string, version: string, ) => - fetch(`https://github.com/${owner}/${repo}/raw/${version}/core/Cargo.toml`) + fetch(`https://github.com/${owner}/${repo}/raw/${version}/Cargo.toml`) .then((res) => res.text()) - .then((txt) => toml.parse(txt).dependencies.v8.version); + .then((txt) => toml.parse(txt).workspace.dependencies.v8.version); const fetchArchShaTasks = (version: string, arches: Architecture[]) => arches.map( diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 615e93d75f96..e12230f4531b 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.433"; + version = "0.0.451"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-1dGsCUMa4FFS88sEH8WJdm6KB40lYe5MnjklAwAtyzs="; + sha256 = "sha256-Tm05vO1mdeTGLpz++rahUubb69ajw04eK57VKZFUoDo="; }; - vendorSha256 = "sha256-8Vf9JRahGkp8/5D5oDt0fnbeeLAD0q656XWdUDtceq8="; + vendorHash = "sha256-oJa+HUuv8RG4ldAe/cS8iR6QcWdPl8BgHE4sRASauRM="; subPackages = [ "." ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index ca7753aa56e1..8c6c2c73c2ca 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -15,12 +15,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2022.6.0"; + version = "2022.7.5"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-ARGIcNHnqQEyp1JVNV59FvvYv9JTSS55R+lTHl0IrWk="; + sha256 = "sha256-BJAiDv+Zg+wU6ovAkuMVTGN9WElOlC96m/GEYrg6exE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix index 8845924d886a..84bfc654c773 100644 --- a/pkgs/development/web/kcgi/default.nix +++ b/pkgs/development/web/kcgi/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "kcgi"; version = "0.10.8"; - underscoreVersion = lib.replaceChars ["."] ["_"] version; + underscoreVersion = lib.replaceStrings ["."] ["_"] version; src = fetchFromGitHub { owner = "kristapsdz"; diff --git a/pkgs/development/web/netlify-cli/composition.nix b/pkgs/development/web/netlify-cli/composition.nix index f929727d59d6..ca76a98f5a65 100644 --- a/pkgs/development/web/netlify-cli/composition.nix +++ b/pkgs/development/web/netlify-cli/composition.nix @@ -1,12 +1,12 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_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/development/web/netlify-cli/default.nix b/pkgs/development/web/netlify-cli/default.nix index 6c3e8dd4e86e..5f702b4b080a 100644 --- a/pkgs/development/web/netlify-cli/default.nix +++ b/pkgs/development/web/netlify-cli/default.nix @@ -1,12 +1,15 @@ { callPackage, fetchFromGitHub, lib, pkgs }: let nodePackages = import ./composition.nix { inherit pkgs; }; + sourceInfo = (lib.importJSON ./netlify-cli.json); in nodePackages.package.override { preRebuild = '' export ESBUILD_BINARY_PATH="${pkgs.esbuild_netlify}/bin/esbuild" ''; - src = fetchFromGitHub (lib.importJSON ./netlify-cli.json); + src = fetchFromGitHub { + inherit (sourceInfo) owner repo rev sha256; + }; bypassCache = true; reconstructLock = true; passthru.tests.test = callPackage ./test.nix { }; diff --git a/pkgs/development/web/netlify-cli/generate.sh b/pkgs/development/web/netlify-cli/generate.sh index 5d12fde8689e..20264f1b3e24 100755 --- a/pkgs/development/web/netlify-cli/generate.sh +++ b/pkgs/development/web/netlify-cli/generate.sh @@ -2,7 +2,7 @@ set -eu -o pipefail cd "$( dirname "${BASH_SOURCE[0]}" )" rm -f ./node-env.nix -src="$(nix-build --expr '(import ../../../.. {}).fetchFromGitHub (lib.importJSON ./netlify-cli.json)')" +src="$(nix-build --expr 'let pkgs = import ../../../.. {}; meta = (pkgs.lib.importJSON ./netlify-cli.json); in pkgs.fetchFromGitHub { inherit (meta) owner repo rev sha256; }')" echo $src node2nix \ --input $src/package.json \ @@ -10,5 +10,5 @@ node2nix \ --output node-packages.nix \ --composition composition.nix \ --node-env node-env.nix \ - --nodejs-14 \ + --nodejs-16 \ ; diff --git a/pkgs/development/web/netlify-cli/netlify-cli.json b/pkgs/development/web/netlify-cli/netlify-cli.json index efd5fb1396bd..bffa1f03d033 100644 --- a/pkgs/development/web/netlify-cli/netlify-cli.json +++ b/pkgs/development/web/netlify-cli/netlify-cli.json @@ -1,7 +1,9 @@ { "owner": "netlify", "repo": "cli", - "rev": "a50e410fddda92d3f3f256321eddefb8cb8ba6e1", - "sha256": "sisX58I5UxxEPGCh5JGtQHw72A4+pLuENpBB9WKRTZc=", - "fetchSubmodules": false + "rev": "6c7e8c9a4db4e2e408f65e6098a194497944e306", + "sha256": "YMnQrurZDJtfeHBCIzy6vToGHnqtdRGvWFPX5RcWyPg=", + "fetchSubmodules": false, + "leaveDotGit": false, + "deepClone": false } diff --git a/pkgs/development/web/netlify-cli/node-env.nix b/pkgs/development/web/netlify-cli/node-env.nix index 21089c4d5459..5dad9ec63d47 100644 --- a/pkgs/development/web/netlify-cli/node-env.nix +++ b/pkgs/development/web/netlify-cli/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.packageName}" ]; 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 .."} @@ -154,7 +165,11 @@ let if(process.argv[2] == "development") { replaceDependencies(packageObj.devDependencies); } + else { + packageObj.devDependencies = {}; + } replaceDependencies(packageObj.optionalDependencies); + replaceDependencies(packageObj.peerDependencies); /* Write the fixed package.json file */ fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); @@ -246,8 +261,8 @@ let 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); + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); + process.exit(1); } if(packageLock.dependencies !== undefined) { @@ -259,7 +274,7 @@ let # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes reconstructPackageLock = writeTextFile { - name = "addintegrityfields.js"; + name = "reconstructpackagelock.js"; text = '' var fs = require('fs'); var path = require('path'); @@ -269,25 +284,43 @@ let var lockObj = { name: packageObj.name, version: packageObj.version, - lockfileVersion: 1, + lockfileVersion: 2, requires: true, + packages: { + "": { + name: packageObj.name, + version: packageObj.version, + license: packageObj.license, + bin: packageObj.bin, + dependencies: packageObj.dependencies, + engines: packageObj.engines, + optionalDependencies: packageObj.optionalDependencies + } + }, dependencies: {} }; - function augmentPackageJSON(filePath, dependencies) { + function augmentPackageJSON(filePath, packages, dependencies) { var packageJSON = path.join(filePath, "package.json"); if(fs.existsSync(packageJSON)) { var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + packages[filePath] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: packageObj.dependencies, + engines: packageObj.engines, + optionalDependencies: packageObj.optionalDependencies + }; dependencies[packageObj.name] = { version: packageObj.version, integrity: "sha1-000000000000000000000000000=", dependencies: {} }; - processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies); } } - function processDependencies(dir, dependencies) { + function processDependencies(dir, packages, dependencies) { if(fs.existsSync(dir)) { var files = fs.readdirSync(dir); @@ -303,23 +336,84 @@ let pkgFiles.forEach(function(entry) { if(stats.isDirectory()) { var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, dependencies); + augmentPackageJSON(pkgFilePath, packages, dependencies); } }); } else { - augmentPackageJSON(filePath, dependencies); + augmentPackageJSON(filePath, packages, dependencies); } } }); } } - processDependencies("node_modules", lockObj.dependencies); + processDependencies("node_modules", lockObj.packages, lockObj.dependencies); fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); ''; }; + # Script that links bins defined in package.json to the node_modules bin directory + # NPM does not do this for top-level packages itself anymore as of v7 + linkBinsScript = writeTextFile { + name = "linkbins.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep); + + if(packageObj.bin !== undefined) { + fs.mkdirSync(path.join(nodeModules, ".bin")) + + if(typeof packageObj.bin == "object") { + Object.keys(packageObj.bin).forEach(function(exe) { + if(fs.existsSync(packageObj.bin[exe])) { + console.log("linking bin '" + exe + "'"); + fs.symlinkSync( + path.join("..", packageObj.name, packageObj.bin[exe]), + path.join(nodeModules, ".bin", exe) + ); + } + else { + console.log("skipping non-existent bin '" + exe + "'"); + } + }) + } + else { + if(fs.existsSync(packageObj.bin)) { + console.log("linking bin '" + packageObj.bin + "'"); + fs.symlinkSync( + path.join("..", packageObj.name, packageObj.bin), + path.join(nodeModules, ".bin", packageObj.name.split("/").pop()) + ); + } + else { + console.log("skipping non-existent bin '" + packageObj.bin + "'"); + } + } + } + else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) { + fs.mkdirSync(path.join(nodeModules, ".bin")) + + fs.readdirSync(packageObj.directories.bin).forEach(function(exe) { + if(fs.existsSync(path.join(packageObj.directories.bin, exe))) { + console.log("linking bin '" + exe + "'"); + fs.symlinkSync( + path.join("..", packageObj.name, packageObj.directories.bin, exe), + path.join(nodeModules, ".bin", exe) + ); + } + else { + console.log("skipping non-existent bin '" + exe + "'"); + } + }) + } + ''; + }; + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: let forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; @@ -366,20 +460,25 @@ let npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild + runHook postRebuild + 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 + npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install fi + + # Link executables defined in package.json + node ${linkBinsScript} ''; # Builds and composes an NPM package including all its dependencies buildNodePackage = { name , packageName - , version + , version ? null , dependencies ? [] , buildInputs ? [] , production ? true @@ -398,7 +497,7 @@ let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ - name = "${name}-${version}"; + name = "${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool @@ -415,6 +514,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 @@ -428,6 +529,14 @@ let if [ -d "$out/lib/node_modules/.bin" ] then ln -s $out/lib/node_modules/.bin $out/bin + + # Patch the shebang lines of all the executables + ls $out/bin/* | while read i + do + file="$(readlink -f "$i")" + chmod u+rwx "$file" + patchShebangs "$file" + done fi # Create symlinks to the deployed manual page folders, if applicable @@ -458,7 +567,7 @@ let buildNodeDependencies = { name , packageName - , version + , version ? null , src , dependencies ? [] , buildInputs ? [] @@ -476,7 +585,7 @@ let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; in stdenv.mkDerivation ({ - name = "node-dependencies-${name}-${version}"; + name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux @@ -492,6 +601,8 @@ let passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + mkdir -p $out/${packageName} cd $out/${packageName} @@ -504,6 +615,7 @@ let if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . + chmod 644 package-lock.json fi ''} @@ -526,7 +638,7 @@ let buildNodeShell = { name , packageName - , version + , version ? null , src , dependencies ? [] , buildInputs ? [] @@ -542,9 +654,10 @@ let let nodeDependencies = buildNodeDependencies args; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; in - stdenv.mkDerivation { - name = "node-shell-${name}-${version}"; + stdenv.mkDerivation ({ + name = "node-shell-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' @@ -563,7 +676,7 @@ let export NODE_PATH=${nodeDependencies}/lib/node_modules export PATH="${nodeDependencies}/bin:$PATH" ''; - }; + } // extraArgs); in { buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; diff --git a/pkgs/development/web/netlify-cli/node-packages.nix b/pkgs/development/web/netlify-cli/node-packages.nix index a844defc6892..dd6461526c0f 100644 --- a/pkgs/development/web/netlify-cli/node-packages.nix +++ b/pkgs/development/web/netlify-cli/node-packages.nix @@ -1,907 +1,70 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { - "@babel/code-frame-7.15.8" = { + "@babel/code-frame-7.18.6" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.15.8"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz"; - sha512 = "2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"; + sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.15.0" = { - name = "_at_babel_slash_compat-data"; - packageName = "@babel/compat-data"; - version = "7.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz"; - sha512 = "0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA=="; - }; - }; - "@babel/core-7.15.8" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.15.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.15.8.tgz"; - sha512 = "3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og=="; - }; - }; - "@babel/generator-7.15.8" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.15.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz"; - sha512 = "ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g=="; - }; - }; - "@babel/helper-annotate-as-pure-7.15.4" = { - name = "_at_babel_slash_helper-annotate-as-pure"; - packageName = "@babel/helper-annotate-as-pure"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz"; - sha512 = "QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA=="; - }; - }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" = { - name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; - packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz"; - sha512 = "P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q=="; - }; - }; - "@babel/helper-compilation-targets-7.15.4" = { - name = "_at_babel_slash_helper-compilation-targets"; - packageName = "@babel/helper-compilation-targets"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz"; - sha512 = "rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ=="; - }; - }; - "@babel/helper-create-class-features-plugin-7.15.4" = { - name = "_at_babel_slash_helper-create-class-features-plugin"; - packageName = "@babel/helper-create-class-features-plugin"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz"; - sha512 = "7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw=="; - }; - }; - "@babel/helper-create-regexp-features-plugin-7.14.5" = { - name = "_at_babel_slash_helper-create-regexp-features-plugin"; - packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz"; - sha512 = "TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A=="; - }; - }; - "@babel/helper-define-polyfill-provider-0.2.3" = { - name = "_at_babel_slash_helper-define-polyfill-provider"; - packageName = "@babel/helper-define-polyfill-provider"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz"; - sha512 = "RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew=="; - }; - }; - "@babel/helper-explode-assignable-expression-7.15.4" = { - name = "_at_babel_slash_helper-explode-assignable-expression"; - packageName = "@babel/helper-explode-assignable-expression"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz"; - sha512 = "J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g=="; - }; - }; - "@babel/helper-function-name-7.15.4" = { - name = "_at_babel_slash_helper-function-name"; - packageName = "@babel/helper-function-name"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz"; - sha512 = "Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw=="; - }; - }; - "@babel/helper-get-function-arity-7.15.4" = { - name = "_at_babel_slash_helper-get-function-arity"; - packageName = "@babel/helper-get-function-arity"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz"; - sha512 = "1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA=="; - }; - }; - "@babel/helper-hoist-variables-7.15.4" = { - name = "_at_babel_slash_helper-hoist-variables"; - packageName = "@babel/helper-hoist-variables"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz"; - sha512 = "VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA=="; - }; - }; - "@babel/helper-member-expression-to-functions-7.15.4" = { - name = "_at_babel_slash_helper-member-expression-to-functions"; - packageName = "@babel/helper-member-expression-to-functions"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz"; - sha512 = "cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA=="; - }; - }; - "@babel/helper-module-imports-7.15.4" = { - name = "_at_babel_slash_helper-module-imports"; - packageName = "@babel/helper-module-imports"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz"; - sha512 = "jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA=="; - }; - }; - "@babel/helper-module-transforms-7.15.8" = { - name = "_at_babel_slash_helper-module-transforms"; - packageName = "@babel/helper-module-transforms"; - version = "7.15.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz"; - sha512 = "DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg=="; - }; - }; - "@babel/helper-optimise-call-expression-7.15.4" = { - name = "_at_babel_slash_helper-optimise-call-expression"; - packageName = "@babel/helper-optimise-call-expression"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz"; - sha512 = "E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw=="; - }; - }; - "@babel/helper-plugin-utils-7.14.5" = { - name = "_at_babel_slash_helper-plugin-utils"; - packageName = "@babel/helper-plugin-utils"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz"; - sha512 = "/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="; - }; - }; - "@babel/helper-remap-async-to-generator-7.15.4" = { - name = "_at_babel_slash_helper-remap-async-to-generator"; - packageName = "@babel/helper-remap-async-to-generator"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz"; - sha512 = "v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ=="; - }; - }; - "@babel/helper-replace-supers-7.15.4" = { - name = "_at_babel_slash_helper-replace-supers"; - packageName = "@babel/helper-replace-supers"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz"; - sha512 = "/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw=="; - }; - }; - "@babel/helper-simple-access-7.15.4" = { - name = "_at_babel_slash_helper-simple-access"; - packageName = "@babel/helper-simple-access"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz"; - sha512 = "UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg=="; - }; - }; - "@babel/helper-skip-transparent-expression-wrappers-7.15.4" = { - name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; - packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz"; - sha512 = "BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A=="; - }; - }; - "@babel/helper-split-export-declaration-7.15.4" = { - name = "_at_babel_slash_helper-split-export-declaration"; - packageName = "@babel/helper-split-export-declaration"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz"; - sha512 = "HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw=="; - }; - }; - "@babel/helper-validator-identifier-7.15.7" = { + "@babel/helper-validator-identifier-7.18.6" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.15.7"; + version = "7.18.6"; 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.18.6.tgz"; + sha512 = "MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="; }; }; - "@babel/helper-validator-option-7.14.5" = { - name = "_at_babel_slash_helper-validator-option"; - packageName = "@babel/helper-validator-option"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; - sha512 = "OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="; - }; - }; - "@babel/helper-wrap-function-7.15.4" = { - name = "_at_babel_slash_helper-wrap-function"; - packageName = "@babel/helper-wrap-function"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz"; - sha512 = "Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw=="; - }; - }; - "@babel/helpers-7.15.4" = { - name = "_at_babel_slash_helpers"; - packageName = "@babel/helpers"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz"; - sha512 = "V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ=="; - }; - }; - "@babel/highlight-7.14.5" = { + "@babel/highlight-7.18.6" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.14.5"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz"; - sha512 = "qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"; + sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.15.8" = { + "@babel/parser-7.16.8" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.15.8"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz"; - sha512 = "BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.8.tgz"; + sha512 = "i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" = { - name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.15.4"; + "@babel/parser-7.18.11" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.18.11"; 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.15.4.tgz"; - sha512 = "eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz"; + sha512 = "9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.15.8" = { - name = "_at_babel_slash_plugin-proposal-async-generator-functions"; - packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.15.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.8.tgz"; - sha512 = "2Z5F2R2ibINTc63mY7FLqGfEbmofrHU9FitJW1Q7aPaKFhiPvSq6QEt/BoWN5oME3GVyjcRuNNSRbb9LC0CSWA=="; - }; - }; - "@babel/plugin-proposal-class-properties-7.14.5" = { - name = "_at_babel_slash_plugin-proposal-class-properties"; - packageName = "@babel/plugin-proposal-class-properties"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz"; - sha512 = "q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg=="; - }; - }; - "@babel/plugin-proposal-class-static-block-7.15.4" = { - name = "_at_babel_slash_plugin-proposal-class-static-block"; - packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz"; - sha512 = "M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA=="; - }; - }; - "@babel/plugin-proposal-dynamic-import-7.14.5" = { - name = "_at_babel_slash_plugin-proposal-dynamic-import"; - packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz"; - sha512 = "ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g=="; - }; - }; - "@babel/plugin-proposal-export-namespace-from-7.14.5" = { - name = "_at_babel_slash_plugin-proposal-export-namespace-from"; - packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz"; - sha512 = "g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA=="; - }; - }; - "@babel/plugin-proposal-json-strings-7.14.5" = { - name = "_at_babel_slash_plugin-proposal-json-strings"; - packageName = "@babel/plugin-proposal-json-strings"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz"; - sha512 = "NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ=="; - }; - }; - "@babel/plugin-proposal-logical-assignment-operators-7.14.5" = { - name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; - packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz"; - sha512 = "YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw=="; - }; - }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" = { - name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; - packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz"; - sha512 = "gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg=="; - }; - }; - "@babel/plugin-proposal-numeric-separator-7.14.5" = { - name = "_at_babel_slash_plugin-proposal-numeric-separator"; - packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz"; - sha512 = "yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg=="; - }; - }; - "@babel/plugin-proposal-object-rest-spread-7.15.6" = { - name = "_at_babel_slash_plugin-proposal-object-rest-spread"; - packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.15.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz"; - sha512 = "qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg=="; - }; - }; - "@babel/plugin-proposal-optional-catch-binding-7.14.5" = { - name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; - packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz"; - sha512 = "3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ=="; - }; - }; - "@babel/plugin-proposal-optional-chaining-7.14.5" = { - name = "_at_babel_slash_plugin-proposal-optional-chaining"; - packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz"; - sha512 = "ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ=="; - }; - }; - "@babel/plugin-proposal-private-methods-7.14.5" = { - name = "_at_babel_slash_plugin-proposal-private-methods"; - packageName = "@babel/plugin-proposal-private-methods"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz"; - sha512 = "838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g=="; - }; - }; - "@babel/plugin-proposal-private-property-in-object-7.15.4" = { - name = "_at_babel_slash_plugin-proposal-private-property-in-object"; - packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz"; - sha512 = "X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA=="; - }; - }; - "@babel/plugin-proposal-unicode-property-regex-7.14.5" = { - name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; - packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz"; - sha512 = "6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q=="; - }; - }; - "@babel/plugin-syntax-async-generators-7.8.4" = { - name = "_at_babel_slash_plugin-syntax-async-generators"; - packageName = "@babel/plugin-syntax-async-generators"; - version = "7.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; - sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; - }; - }; - "@babel/plugin-syntax-class-properties-7.12.13" = { - name = "_at_babel_slash_plugin-syntax-class-properties"; - packageName = "@babel/plugin-syntax-class-properties"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; - sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; - }; - }; - "@babel/plugin-syntax-class-static-block-7.14.5" = { - name = "_at_babel_slash_plugin-syntax-class-static-block"; - packageName = "@babel/plugin-syntax-class-static-block"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"; - sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; - }; - }; - "@babel/plugin-syntax-dynamic-import-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-dynamic-import"; - packageName = "@babel/plugin-syntax-dynamic-import"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; - sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; - }; - }; - "@babel/plugin-syntax-export-namespace-from-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-export-namespace-from"; - packageName = "@babel/plugin-syntax-export-namespace-from"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; - sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; - }; - }; - "@babel/plugin-syntax-json-strings-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-json-strings"; - packageName = "@babel/plugin-syntax-json-strings"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; - sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; - }; - }; - "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { - name = "_at_babel_slash_plugin-syntax-logical-assignment-operators"; - packageName = "@babel/plugin-syntax-logical-assignment-operators"; - version = "7.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; - sha512 = "d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig=="; - }; - }; - "@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-nullish-coalescing-operator"; - packageName = "@babel/plugin-syntax-nullish-coalescing-operator"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; - sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; - }; - }; - "@babel/plugin-syntax-numeric-separator-7.10.4" = { - name = "_at_babel_slash_plugin-syntax-numeric-separator"; - packageName = "@babel/plugin-syntax-numeric-separator"; - version = "7.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; - sha512 = "9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug=="; - }; - }; - "@babel/plugin-syntax-object-rest-spread-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-object-rest-spread"; - packageName = "@babel/plugin-syntax-object-rest-spread"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; - sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="; - }; - }; - "@babel/plugin-syntax-optional-catch-binding-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-optional-catch-binding"; - packageName = "@babel/plugin-syntax-optional-catch-binding"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; - sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="; - }; - }; - "@babel/plugin-syntax-optional-chaining-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-optional-chaining"; - packageName = "@babel/plugin-syntax-optional-chaining"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; - sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; - }; - }; - "@babel/plugin-syntax-private-property-in-object-7.14.5" = { - name = "_at_babel_slash_plugin-syntax-private-property-in-object"; - packageName = "@babel/plugin-syntax-private-property-in-object"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"; - sha512 = "0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg=="; - }; - }; - "@babel/plugin-syntax-top-level-await-7.14.5" = { - name = "_at_babel_slash_plugin-syntax-top-level-await"; - packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"; - sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; - }; - }; - "@babel/plugin-transform-arrow-functions-7.14.5" = { - name = "_at_babel_slash_plugin-transform-arrow-functions"; - packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz"; - sha512 = "KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A=="; - }; - }; - "@babel/plugin-transform-async-to-generator-7.14.5" = { - name = "_at_babel_slash_plugin-transform-async-to-generator"; - packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz"; - sha512 = "szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA=="; - }; - }; - "@babel/plugin-transform-block-scoped-functions-7.14.5" = { - name = "_at_babel_slash_plugin-transform-block-scoped-functions"; - packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz"; - sha512 = "dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ=="; - }; - }; - "@babel/plugin-transform-block-scoping-7.15.3" = { - name = "_at_babel_slash_plugin-transform-block-scoping"; - packageName = "@babel/plugin-transform-block-scoping"; - version = "7.15.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz"; - sha512 = "nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q=="; - }; - }; - "@babel/plugin-transform-classes-7.15.4" = { - name = "_at_babel_slash_plugin-transform-classes"; - packageName = "@babel/plugin-transform-classes"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz"; - sha512 = "Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg=="; - }; - }; - "@babel/plugin-transform-computed-properties-7.14.5" = { - name = "_at_babel_slash_plugin-transform-computed-properties"; - packageName = "@babel/plugin-transform-computed-properties"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz"; - sha512 = "pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg=="; - }; - }; - "@babel/plugin-transform-destructuring-7.14.7" = { - name = "_at_babel_slash_plugin-transform-destructuring"; - packageName = "@babel/plugin-transform-destructuring"; - version = "7.14.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz"; - sha512 = "0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw=="; - }; - }; - "@babel/plugin-transform-dotall-regex-7.14.5" = { - name = "_at_babel_slash_plugin-transform-dotall-regex"; - packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz"; - sha512 = "loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw=="; - }; - }; - "@babel/plugin-transform-duplicate-keys-7.14.5" = { - name = "_at_babel_slash_plugin-transform-duplicate-keys"; - packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz"; - sha512 = "iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A=="; - }; - }; - "@babel/plugin-transform-exponentiation-operator-7.14.5" = { - name = "_at_babel_slash_plugin-transform-exponentiation-operator"; - packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz"; - sha512 = "jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA=="; - }; - }; - "@babel/plugin-transform-for-of-7.15.4" = { - name = "_at_babel_slash_plugin-transform-for-of"; - packageName = "@babel/plugin-transform-for-of"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz"; - sha512 = "DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA=="; - }; - }; - "@babel/plugin-transform-function-name-7.14.5" = { - name = "_at_babel_slash_plugin-transform-function-name"; - packageName = "@babel/plugin-transform-function-name"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz"; - sha512 = "vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ=="; - }; - }; - "@babel/plugin-transform-literals-7.14.5" = { - name = "_at_babel_slash_plugin-transform-literals"; - packageName = "@babel/plugin-transform-literals"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz"; - sha512 = "ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A=="; - }; - }; - "@babel/plugin-transform-member-expression-literals-7.14.5" = { - name = "_at_babel_slash_plugin-transform-member-expression-literals"; - packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz"; - sha512 = "WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q=="; - }; - }; - "@babel/plugin-transform-modules-amd-7.14.5" = { - name = "_at_babel_slash_plugin-transform-modules-amd"; - packageName = "@babel/plugin-transform-modules-amd"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz"; - sha512 = "3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g=="; - }; - }; - "@babel/plugin-transform-modules-commonjs-7.15.4" = { - name = "_at_babel_slash_plugin-transform-modules-commonjs"; - packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz"; - sha512 = "qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA=="; - }; - }; - "@babel/plugin-transform-modules-systemjs-7.15.4" = { - name = "_at_babel_slash_plugin-transform-modules-systemjs"; - packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz"; - sha512 = "fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw=="; - }; - }; - "@babel/plugin-transform-modules-umd-7.14.5" = { - name = "_at_babel_slash_plugin-transform-modules-umd"; - packageName = "@babel/plugin-transform-modules-umd"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz"; - sha512 = "RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA=="; - }; - }; - "@babel/plugin-transform-named-capturing-groups-regex-7.14.9" = { - name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; - packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.14.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz"; - sha512 = "l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA=="; - }; - }; - "@babel/plugin-transform-new-target-7.14.5" = { - name = "_at_babel_slash_plugin-transform-new-target"; - packageName = "@babel/plugin-transform-new-target"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz"; - sha512 = "Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ=="; - }; - }; - "@babel/plugin-transform-object-super-7.14.5" = { - name = "_at_babel_slash_plugin-transform-object-super"; - packageName = "@babel/plugin-transform-object-super"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz"; - sha512 = "MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg=="; - }; - }; - "@babel/plugin-transform-parameters-7.15.4" = { - name = "_at_babel_slash_plugin-transform-parameters"; - packageName = "@babel/plugin-transform-parameters"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz"; - sha512 = "9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ=="; - }; - }; - "@babel/plugin-transform-property-literals-7.14.5" = { - name = "_at_babel_slash_plugin-transform-property-literals"; - packageName = "@babel/plugin-transform-property-literals"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz"; - sha512 = "r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw=="; - }; - }; - "@babel/plugin-transform-regenerator-7.14.5" = { - name = "_at_babel_slash_plugin-transform-regenerator"; - packageName = "@babel/plugin-transform-regenerator"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz"; - sha512 = "NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg=="; - }; - }; - "@babel/plugin-transform-reserved-words-7.14.5" = { - name = "_at_babel_slash_plugin-transform-reserved-words"; - packageName = "@babel/plugin-transform-reserved-words"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz"; - sha512 = "cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg=="; - }; - }; - "@babel/plugin-transform-shorthand-properties-7.14.5" = { - name = "_at_babel_slash_plugin-transform-shorthand-properties"; - packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz"; - sha512 = "xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g=="; - }; - }; - "@babel/plugin-transform-spread-7.15.8" = { - name = "_at_babel_slash_plugin-transform-spread"; - packageName = "@babel/plugin-transform-spread"; - version = "7.15.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.15.8.tgz"; - sha512 = "/daZ8s2tNaRekl9YJa9X4bzjpeRZLt122cpgFnQPLGUe61PH8zMEBmYqKkW5xF5JUEh5buEGXJoQpqBmIbpmEQ=="; - }; - }; - "@babel/plugin-transform-sticky-regex-7.14.5" = { - name = "_at_babel_slash_plugin-transform-sticky-regex"; - packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz"; - sha512 = "Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A=="; - }; - }; - "@babel/plugin-transform-template-literals-7.14.5" = { - name = "_at_babel_slash_plugin-transform-template-literals"; - packageName = "@babel/plugin-transform-template-literals"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz"; - sha512 = "22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg=="; - }; - }; - "@babel/plugin-transform-typeof-symbol-7.14.5" = { - name = "_at_babel_slash_plugin-transform-typeof-symbol"; - packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz"; - sha512 = "lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw=="; - }; - }; - "@babel/plugin-transform-unicode-escapes-7.14.5" = { - name = "_at_babel_slash_plugin-transform-unicode-escapes"; - packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz"; - sha512 = "crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA=="; - }; - }; - "@babel/plugin-transform-unicode-regex-7.14.5" = { - name = "_at_babel_slash_plugin-transform-unicode-regex"; - packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz"; - sha512 = "UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw=="; - }; - }; - "@babel/preset-env-7.15.8" = { - name = "_at_babel_slash_preset-env"; - packageName = "@babel/preset-env"; - version = "7.15.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.8.tgz"; - sha512 = "rCC0wH8husJgY4FPbHsiYyiLxSY8oMDJH7Rl6RQMknbN9oDDHhM9RDFvnGM2MgkbUJzSQB4gtuwygY5mCqGSsA=="; - }; - }; - "@babel/preset-modules-0.1.4" = { - name = "_at_babel_slash_preset-modules"; - packageName = "@babel/preset-modules"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz"; - sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="; - }; - }; - "@babel/runtime-7.15.4" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz"; - sha512 = "99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw=="; - }; - }; - "@babel/template-7.15.4" = { - name = "_at_babel_slash_template"; - packageName = "@babel/template"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz"; - sha512 = "UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg=="; - }; - }; - "@babel/traverse-7.15.4" = { - name = "_at_babel_slash_traverse"; - packageName = "@babel/traverse"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz"; - sha512 = "W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA=="; - }; - }; - "@babel/types-7.15.6" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.15.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz"; - sha512 = "BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig=="; - }; - }; - "@bugsnag/browser-7.11.0" = { + "@bugsnag/browser-7.16.2" = { name = "_at_bugsnag_slash_browser"; packageName = "@bugsnag/browser"; - version = "7.11.0"; + version = "7.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.11.0.tgz"; - sha512 = "iOKXJcZzdl9XsjJnL62S+T4OQZJ21mUMCXXOiMRlLnDCrw30BwD4BoAZ5s3oQ0VE0azrv/CUsXQzU63NUcsb+Q=="; + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.16.2.tgz"; + sha512 = "iBbAmjTDe0I6WPTHi3wIcmKu3ykydtT6fc8atJA65rzgDLMlTM1Wnwz4Ny1cn0bVouLGa48BRiOJ27Rwy7QRYA=="; }; }; - "@bugsnag/core-7.11.0" = { + "@bugsnag/core-7.16.1" = { name = "_at_bugsnag_slash_core"; packageName = "@bugsnag/core"; - version = "7.11.0"; + version = "7.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.11.0.tgz"; - sha512 = "xCaaONqQEAewifrvHC8v+yqN+Is4WNUcmK+sdeLcSb+ghLQ52y3BQ9nEDYzQxGuJRpv1zW3edCVIB4RN5eunSQ=="; + url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.16.1.tgz"; + sha512 = "zuBnL7B329VldItRqhXYrp1hjmjZnltJwNXMysi9WtY4t29WKk5LVwgWb1mPM9clJ0FoObZ7kvvQMUTKh3ezFQ=="; }; }; "@bugsnag/cuid-3.0.0" = { @@ -913,22 +76,22 @@ let sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; }; }; - "@bugsnag/js-7.11.0" = { + "@bugsnag/js-7.16.2" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.11.0"; + version = "7.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.11.0.tgz"; - sha512 = "2KQZdiBUQRayrTweMrH8LuT+YFcZSYxPVb+RaAx5J1z3vWWFar7Lw3II34zA4e+zs/7wMSTKll5p+O7Wuz60/A=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.16.2.tgz"; + sha512 = "AzV0PtG3SZt+HnA2JmRJeI60aDNZsIJbEEAZIWZeATvWBt5RdVdsWKllM1SkTvURfxfdAVd4Xry3BgVrh8nEbg=="; }; }; - "@bugsnag/node-7.11.0" = { + "@bugsnag/node-7.16.2" = { name = "_at_bugsnag_slash_node"; packageName = "@bugsnag/node"; - version = "7.11.0"; + version = "7.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.11.0.tgz"; - sha512 = "hwIG7LTE2lwaIjAes1JxYbjSoih9Eu07MSf+QJoMILY6tJoHMgxJ6v0/8AfldJeEAb753qBtlQLO8Rtr2LKHBA=="; + url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.16.2.tgz"; + sha512 = "V5pND701cIYGzjjTwt0tuvAU1YyPB9h7vo5F/DzrDHRPmCINA/oVbc0Twco87knc2VPe8ntGFqTicTY65iOWzg=="; }; }; "@bugsnag/safe-json-stringify-6.0.0" = { @@ -940,6 +103,24 @@ let sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; }; }; + "@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=="; + }; + }; + "@cspotcode/source-map-support-0.8.1" = { + name = "_at_cspotcode_slash_source-map-support"; + packageName = "@cspotcode/source-map-support"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz"; + sha512 = "IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="; + }; + }; "@dabh/diagnostics-2.0.2" = { name = "_at_dabh_slash_diagnostics"; packageName = "@dabh/diagnostics"; @@ -949,6 +130,15 @@ let sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; }; }; + "@import-maps/resolve-1.0.1" = { + name = "_at_import-maps_slash_resolve"; + packageName = "@import-maps/resolve"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@import-maps/resolve/-/resolve-1.0.1.tgz"; + sha512 = "tWZNBIS1CoekcwlMuyG2mr0a1Wo5lb5lEHwwWvZo+5GLgr3e9LLDTtmgtCWEwBpXMkxn9D+2W9j2FY6eZQq0tA=="; + }; + }; "@jest/types-25.5.0" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; @@ -958,22 +148,49 @@ let sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw=="; }; }; - "@jest/types-26.6.2" = { + "@jest/types-27.5.1" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "26.6.2"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz"; - sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ=="; + url = "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz"; + sha512 = "Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw=="; }; }; - "@mapbox/node-pre-gyp-1.0.5" = { + "@jridgewell/resolve-uri-3.0.4" = { + name = "_at_jridgewell_slash_resolve-uri"; + packageName = "@jridgewell/resolve-uri"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz"; + sha512 = "cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg=="; + }; + }; + "@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.9" = { + name = "_at_jridgewell_slash_trace-mapping"; + packageName = "@jridgewell/trace-mapping"; + version = "0.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz"; + sha512 = "3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="; + }; + }; + "@mapbox/node-pre-gyp-1.0.10" = { name = "_at_mapbox_slash_node-pre-gyp"; packageName = "@mapbox/node-pre-gyp"; - version = "1.0.5"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.5.tgz"; - sha512 = "4srsKPXWlIxp5Vbqz5uLfBN+du2fJChBoYn/f2h991WLdk7jUvcSk/McVLSv/X+xQIPI8eGD5GjrnygdyHnhPA=="; + url = "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz"; + sha512 = "4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -985,67 +202,274 @@ let sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; }; }; - "@netlify/build-18.17.1" = { + "@netlify/binary-info-1.0.0" = { + name = "_at_netlify_slash_binary-info"; + packageName = "@netlify/binary-info"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/binary-info/-/binary-info-1.0.0.tgz"; + sha512 = "4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="; + }; + }; + "@netlify/build-28.2.0" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "18.17.1"; + version = "28.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-18.17.1.tgz"; - sha512 = "sq50eK73y914/irbg1W4jSwxzSY7piQY26dOM5X5YfYq4zZsMj5+W4c2IaEWe9hLR2lfXq7L7QF7ftk6zMZsWA=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-28.2.0.tgz"; + sha512 = "K2OKtnnYPhGqZr2FVPWWXI3CUVO+ok2K/1rVG2O74CUdr2s3M7b6XZF1qwosjToztq5u/iz7eupRNfoogKMQGQ=="; }; }; - "@netlify/cache-utils-2.0.4" = { + "@netlify/cache-utils-5.0.2" = { name = "_at_netlify_slash_cache-utils"; packageName = "@netlify/cache-utils"; - version = "2.0.4"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-2.0.4.tgz"; - sha512 = "P6tomPTt5tdyFrrYbBWHIGBHTwiuewrElxVRMnYW1W4GfTP4Me4+iV5lOyU/Yw9OuTPg7dPzah2J0GA6cA1YCw=="; + url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-5.0.2.tgz"; + sha512 = "LuX+rmVah13OeQtZEd5TlDgYnnm0nL/dqjn1Q1CatryQumPM3L6QtDCYASbUXPzqZviWswy8nYEgQ3yHg0X2kw=="; }; }; - "@netlify/config-15.7.1" = { + "@netlify/config-20.0.1" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "15.7.1"; + version = "20.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-15.7.1.tgz"; - sha512 = "UmDbvqWGvmhhmfQLC5Usj4UxAhDmTIUUPZUYH41eYl/p60fB3L1gUVNLyBZ55q/tqAkGvrIAhgP4pzocfghC5A=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-20.0.1.tgz"; + sha512 = "5DSNWBTWVAEJDJlpLu0wmgAdxaHQBEDZpgoIIBi7DIqNWoiCydEpzgw3mINn0Wy6UrRKjXoFrGNJg2j9fFwr1w=="; }; }; - "@netlify/esbuild-0.13.6" = { + "@netlify/edge-bundler-4.2.0" = { + name = "_at_netlify_slash_edge-bundler"; + packageName = "@netlify/edge-bundler"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-4.2.0.tgz"; + sha512 = "7eqFxoj1uBhxObWCphTomQe2PvjOI9yE9UOe2OS66f7Uk+nzEn2Cv8/9Ck+iOfsNJskRAcJA6TuK5OgIg0+BPQ=="; + }; + }; + "@netlify/edge-bundler-4.3.2" = { + name = "_at_netlify_slash_edge-bundler"; + packageName = "@netlify/edge-bundler"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-4.3.2.tgz"; + sha512 = "wHAeLe6IAxf0DB3eqW3YWcjJoIGsOT5j/GlnIGtWCSEwl0TkwUTolThcY2FWLZyPJNv0jD+4XeLy/05Yw8FNCg=="; + }; + }; + "@netlify/esbuild-0.14.39" = { name = "_at_netlify_slash_esbuild"; packageName = "@netlify/esbuild"; - version = "0.13.6"; + version = "0.14.39"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/esbuild/-/esbuild-0.13.6.tgz"; - sha512 = "tiKmDcHM2riSVN79c0mJY/67EBDafXQAMitHuLiCDAMdtz3kfv+NqdVG5krgf5lWR8Uf8AeZrUW5Q9RP25REvw=="; + url = "https://registry.npmjs.org/@netlify/esbuild/-/esbuild-0.14.39.tgz"; + sha512 = "C3xpwdT2xw6SnSb+hLQoxjtikAKiz6BjQjzlIaysHDpGbmIcmUHZ/X+dyLtCqAvf15WNK5GSBZYOlpgcOE0WZA=="; }; }; - "@netlify/framework-info-5.11.0" = { + "@netlify/esbuild-android-64-0.14.39" = { + name = "_at_netlify_slash_esbuild-android-64"; + packageName = "@netlify/esbuild-android-64"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-android-64/-/esbuild-android-64-0.14.39.tgz"; + sha512 = "azq+lsvjRsKLap8ubIwSJXGyknUACqYu5h98Fvyoh40Qk4QXIVKl16JIJ4s+B7jy2k9qblEc5c4nxdDA3aGbVA=="; + }; + }; + "@netlify/esbuild-android-arm64-0.14.39" = { + name = "_at_netlify_slash_esbuild-android-arm64"; + packageName = "@netlify/esbuild-android-arm64"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-android-arm64/-/esbuild-android-arm64-0.14.39.tgz"; + sha512 = "WhIP7ePq4qMC1sxoaeB9SsJqSW6uzW7XDj/IuWl1l9r94nwxywU1sYdVLaF2mZr15njviazYjVr8x1d+ipwL3w=="; + }; + }; + "@netlify/esbuild-darwin-64-0.14.39" = { + name = "_at_netlify_slash_esbuild-darwin-64"; + packageName = "@netlify/esbuild-darwin-64"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-darwin-64/-/esbuild-darwin-64-0.14.39.tgz"; + sha512 = "eF4GvLYiDxtcyjFT55+h+8c8A2HltjeMezCqkt3AQSgOdu1nhlvwbBhIdg2dyM6gKEaEm5hBtTbicEDSwsLodA=="; + }; + }; + "@netlify/esbuild-darwin-arm64-0.14.39" = { + name = "_at_netlify_slash_esbuild-darwin-arm64"; + packageName = "@netlify/esbuild-darwin-arm64"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.39.tgz"; + sha512 = "b7rtnX/VtYwNbUCxs3eulrCWJ+u2YvqDcXiIV1ka+od+N0fTx+4RrVkVp1lha9L0wEJYK9J7UWZOMLMyd1ynRg=="; + }; + }; + "@netlify/esbuild-freebsd-64-0.14.39" = { + name = "_at_netlify_slash_esbuild-freebsd-64"; + packageName = "@netlify/esbuild-freebsd-64"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.39.tgz"; + sha512 = "XtusxDJt2hUKUdggbTFolMx0kJL2zEa4STI7YwpB+ukEWoW5rODZjiLZbqqYLcjDH8k4YwHaMxs103L8eButEQ=="; + }; + }; + "@netlify/esbuild-freebsd-arm64-0.14.39" = { + name = "_at_netlify_slash_esbuild-freebsd-arm64"; + packageName = "@netlify/esbuild-freebsd-arm64"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.39.tgz"; + sha512 = "A9XZKai+k6kfndCtN6Dh2usT28V0+OGxzFdZsANONPQiEUTrGZCgwcHWiVlVn7SeAwPR1tKZreTnvrfj8cj7hA=="; + }; + }; + "@netlify/esbuild-linux-32-0.14.39" = { + name = "_at_netlify_slash_esbuild-linux-32"; + packageName = "@netlify/esbuild-linux-32"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-linux-32/-/esbuild-linux-32-0.14.39.tgz"; + sha512 = "ZQnqk/82YRvINY+aF+LlGfRZ19c5mH0jaxsO046GpIOPx6PcXHG8JJ2lg+vLJVe4zFPohxzabcYpwFuT4cg/GA=="; + }; + }; + "@netlify/esbuild-linux-64-0.14.39" = { + name = "_at_netlify_slash_esbuild-linux-64"; + packageName = "@netlify/esbuild-linux-64"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-linux-64/-/esbuild-linux-64-0.14.39.tgz"; + sha512 = "IQtswVw7GAKNX/3yV390wSfSXvMWy0d5cw8csAffwBk9gupftY2lzepK4Cn6uD/aqLt3Iku33FbHop/2nPGfQA=="; + }; + }; + "@netlify/esbuild-linux-arm-0.14.39" = { + name = "_at_netlify_slash_esbuild-linux-arm"; + packageName = "@netlify/esbuild-linux-arm"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-linux-arm/-/esbuild-linux-arm-0.14.39.tgz"; + sha512 = "QdOzQniOed0Bz1cTC9TMMwvtAqKayYv66H4edJlbvElC81yJZF/c9XhmYWJ6P5g4nkChZubQ5RcQwTLmrFGexg=="; + }; + }; + "@netlify/esbuild-linux-arm64-0.14.39" = { + name = "_at_netlify_slash_esbuild-linux-arm64"; + packageName = "@netlify/esbuild-linux-arm64"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.39.tgz"; + sha512 = "4Jie4QV6pWWuGN7TAshNMGbdTA9+VbRkv3rPIxhgK5gBfmsAV1yRKsumE4Y77J0AZNRiOriyoec4zc1qkmI3zg=="; + }; + }; + "@netlify/esbuild-linux-mips64le-0.14.39" = { + name = "_at_netlify_slash_esbuild-linux-mips64le"; + packageName = "@netlify/esbuild-linux-mips64le"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.39.tgz"; + sha512 = "Htozxr95tw4tSd86YNbCLs1eoYQzNu/cHpzFIkuJoztZueUhl8XpRvBdob7n3kEjW1gitLWAIn8XUwSt+aJ1Tg=="; + }; + }; + "@netlify/esbuild-linux-ppc64le-0.14.39" = { + name = "_at_netlify_slash_esbuild-linux-ppc64le"; + packageName = "@netlify/esbuild-linux-ppc64le"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.39.tgz"; + sha512 = "tFy0ufWIdjeuk1rPHee00TZlhr9OSF00Ufb4ROFyt2ArKuMSkWRJuDgx6MtZcAnCIN4cybo/xWl3MKTM+scnww=="; + }; + }; + "@netlify/esbuild-linux-riscv64-0.14.39" = { + name = "_at_netlify_slash_esbuild-linux-riscv64"; + packageName = "@netlify/esbuild-linux-riscv64"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.39.tgz"; + sha512 = "ZzfKvwIxL7wQnYbVFpyNW0wotnLoKageUEM57RbjekesJoNQnqUR6Usm+LDZoB8iRsI58VX1IxnstP0cX8vOHw=="; + }; + }; + "@netlify/esbuild-linux-s390x-0.14.39" = { + name = "_at_netlify_slash_esbuild-linux-s390x"; + packageName = "@netlify/esbuild-linux-s390x"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.39.tgz"; + sha512 = "yjC0mFwnuMRoh0WcF0h71MF71ytZBFEQQTRdgiGT0+gbC4UApBqnTkJdLx32RscBKi9skbMChiJ748hDJou6FA=="; + }; + }; + "@netlify/esbuild-netbsd-64-0.14.39" = { + name = "_at_netlify_slash_esbuild-netbsd-64"; + packageName = "@netlify/esbuild-netbsd-64"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.39.tgz"; + sha512 = "mIq4znOoz3YfTVdv3sIWfR4Zx5JgMnT4srlhC5KYVHibhxvyDdin5txldYXmR4Zv4dZd6DSuWFsn441aUegHeA=="; + }; + }; + "@netlify/esbuild-openbsd-64-0.14.39" = { + name = "_at_netlify_slash_esbuild-openbsd-64"; + packageName = "@netlify/esbuild-openbsd-64"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.39.tgz"; + sha512 = "+t6QdzJCngH19hV7ClpFAeFDI2ko/HNcFbiNwaXTMVLB3hWi1sJtn+fzZck5HfzN4qsajAVqZq4nwX69SSt25A=="; + }; + }; + "@netlify/esbuild-sunos-64-0.14.39" = { + name = "_at_netlify_slash_esbuild-sunos-64"; + packageName = "@netlify/esbuild-sunos-64"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-sunos-64/-/esbuild-sunos-64-0.14.39.tgz"; + sha512 = "HLfXG6i2p3wyyyWHeeP4ShGDJ1zRMnf9YLJLe2ezv2KqvcKw/Un/m/FBuDW1p13oSUO7ShISMzgc1dw1GGBEOQ=="; + }; + }; + "@netlify/esbuild-windows-32-0.14.39" = { + name = "_at_netlify_slash_esbuild-windows-32"; + packageName = "@netlify/esbuild-windows-32"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-windows-32/-/esbuild-windows-32-0.14.39.tgz"; + sha512 = "ZpSQcKbVSCU3ln7mHpsL/5dWsUqCNdTnC5YAArnaOwdrlIunrsbo5j4MOZRRcGExb2uvTc/rb+D3mlGb8j1rkA=="; + }; + }; + "@netlify/esbuild-windows-64-0.14.39" = { + name = "_at_netlify_slash_esbuild-windows-64"; + packageName = "@netlify/esbuild-windows-64"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-windows-64/-/esbuild-windows-64-0.14.39.tgz"; + sha512 = "I3gCdO8+6IDhT4Y1ZmV4o2Gg0oELv7N4kCcE4kqclz10fWHNjf19HQNHyBJe0AWnFV5ZfT154VVD31dqgwpgFw=="; + }; + }; + "@netlify/esbuild-windows-arm64-0.14.39" = { + name = "_at_netlify_slash_esbuild-windows-arm64"; + packageName = "@netlify/esbuild-windows-arm64"; + version = "0.14.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.39.tgz"; + sha512 = "WX52W8U1lsfWcz6NWoSpDs57lgiiMHN23seq8G2bvxzGS/tvYD3dxVLLW5UPoKSnFDyVQT7b6Zkt6AkBten1yQ=="; + }; + }; + "@netlify/framework-info-9.5.1" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "5.11.0"; + version = "9.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.11.0.tgz"; - sha512 = "B6MW05c8vUuakO8x/ucp99ocpdYeikusCzPANqD0O1JamdLyDsDbhL7Z3j0QUhZjpY+bm+4g91Gaq7ynpX0ICg=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-9.5.1.tgz"; + sha512 = "UqwJM7Z2SnZMnX85GkfE6lHfG9ZGoWwh8ejyBr84arjXg21xcOUl3Gy0txuON2R9dR4YseuPWKoHJqfqObbplQ=="; }; }; - "@netlify/functions-utils-2.0.2" = { + "@netlify/functions-utils-5.0.4" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "2.0.2"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-2.0.2.tgz"; - sha512 = "mQI0NX0QPNVcYb2TQF5cpxO350BR9309r7vSOSvfn0DHkPWUea1kl3iiLXi1mm/dUC6pd3p5ctc0UboW0u+iVQ=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-5.0.4.tgz"; + sha512 = "FCxQIWGvB/PBLYfWDPUUoHEwbYpXcR7oBY0y7uXkbwCkMeb0iFq0ADFA140NwYLsFAZSa7PRL2U7HA6GPHsOGw=="; }; }; - "@netlify/git-utils-2.0.2" = { + "@netlify/git-utils-5.0.2" = { name = "_at_netlify_slash_git-utils"; packageName = "@netlify/git-utils"; - version = "2.0.2"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-2.0.2.tgz"; - sha512 = "gk1ak1AAktsjHQDY1Sg0qp8H+3dcmdB7jEmr0MD8V7X4u/CByPx8fBC0ZpksZ+HhkAdw/thRL4Qir+zhh4QtWA=="; + url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-5.0.2.tgz"; + sha512 = "ri3KweO9gNXFAYJLiZNOQsffdNWFA1JjwSf2QSMScQMvAtWRNfZ6Xps890VRsjnUoSMQysSopB+bMVYOxD/pAw=="; }; }; "@netlify/local-functions-proxy-1.1.1" = { @@ -1165,94 +589,49 @@ let sha512 = "VCBXBJWBujVxyo5f+3r8ovLc9I7wJqpmgDn3ixs1fvdrER5Ac+SzYwYH4mUug9HI08mzTSAKZErzKeuadSez3w=="; }; }; - "@netlify/open-api-2.5.0" = { + "@netlify/open-api-2.12.0" = { name = "_at_netlify_slash_open-api"; packageName = "@netlify/open-api"; - version = "2.5.0"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-2.5.0.tgz"; - sha512 = "KiXfYPO/X24p7EYQjcjBTizoyfY3U8zPv68Rte0EtayW2ZSqIslLLpNNd2gteqdh0Q83mzSiESdhlQHd0Ckjjg=="; + url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-2.12.0.tgz"; + sha512 = "1n9VvO/9qM7cRB5f7NgSNqeUrovM7j9WVAY7ZQ4LtQuXSquFmO9Fku7WrV3zAUC6v2Y62fxGyJ0fRllYz5uXLw=="; }; }; - "@netlify/plugin-edge-handlers-1.11.22" = { - name = "_at_netlify_slash_plugin-edge-handlers"; - packageName = "@netlify/plugin-edge-handlers"; - version = "1.11.22"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.22.tgz"; - sha512 = "tFb7J6+YEtZP0OYpS/b9Rjp1lm02XfhAQR6KRHAaeRlHp98/zgd0hhubfwXUCppP2BLfn+imkeVS0FnANh5B3g=="; - }; - }; - "@netlify/plugins-list-4.0.1" = { + "@netlify/plugins-list-6.55.0" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "4.0.1"; + version = "6.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-4.0.1.tgz"; - sha512 = "5SNHrs6dfW8YlyTmJvLGTIZsdxtADuYRMn8mlRapBLLDazd99yDokzMfC8oigACyu553ghn/dtetPHHxsdGuXQ=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.55.0.tgz"; + sha512 = "fAOZS/7HZs9gyiNcOW6xa6Ki8V/2BJelJ3d65JwrUUpPr8lfHIjZ8kKVBf8GOiOAMRYzqxa80VRKAayxHhzyMQ=="; }; }; - "@netlify/routing-local-proxy-0.34.1" = { - name = "_at_netlify_slash_routing-local-proxy"; - packageName = "@netlify/routing-local-proxy"; - version = "0.34.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.34.1.tgz"; - sha512 = "FuzgxdxC7wJXUT08qPTtHiKwjFDHh3ViCDZwxwjm8CjOKYz+9NjhmIffkbEFl6R+uH6IV/3R6gVDL5Fb5hwRbQ=="; - }; - }; - "@netlify/routing-local-proxy-darwin-arm64-0.34.1" = { - name = "_at_netlify_slash_routing-local-proxy-darwin-arm64"; - packageName = "@netlify/routing-local-proxy-darwin-arm64"; - version = "0.34.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/routing-local-proxy-darwin-arm64/-/routing-local-proxy-darwin-arm64-0.34.1.tgz"; - sha512 = "QswoXdmvmwx76bNdA0TcwfbK1NUIo5BjcS4bpE96wtUPr3SNn4pSoOip9/Tae2JbLGl7efdEkgBE1J6rMiu/kA=="; - }; - }; - "@netlify/routing-local-proxy-darwin-x64-0.34.1" = { - name = "_at_netlify_slash_routing-local-proxy-darwin-x64"; - packageName = "@netlify/routing-local-proxy-darwin-x64"; - version = "0.34.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/routing-local-proxy-darwin-x64/-/routing-local-proxy-darwin-x64-0.34.1.tgz"; - sha512 = "x5mukoDWGl+jpVsyNZjRBrP1m93AFrVI/afodQbu45nyW78fpNALhqJPGoI2ixe/Z5HKaYl+ItvI+J4wAVFseQ=="; - }; - }; - "@netlify/routing-local-proxy-linux-x64-0.34.1" = { - name = "_at_netlify_slash_routing-local-proxy-linux-x64"; - packageName = "@netlify/routing-local-proxy-linux-x64"; - version = "0.34.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/routing-local-proxy-linux-x64/-/routing-local-proxy-linux-x64-0.34.1.tgz"; - sha512 = "dquodOP1VC2RtJcr2bp/DzTq0JXtk2cZDtJmaasMxxbxZmwL9R+63ypWsgdvGTSdZDKkwzzHAg3a7qGHVIl4ow=="; - }; - }; - "@netlify/routing-local-proxy-win32-x64-0.34.1" = { - name = "_at_netlify_slash_routing-local-proxy-win32-x64"; - packageName = "@netlify/routing-local-proxy-win32-x64"; - version = "0.34.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/routing-local-proxy-win32-x64/-/routing-local-proxy-win32-x64-0.34.1.tgz"; - sha512 = "Dy1OPqlHXCDIJoEor709Ysx76UiAgrse1GF5wdieTVtWnQ7culo8+LVCwubwQezVCCbdjTke9LfMWbP91zBojg=="; - }; - }; - "@netlify/run-utils-2.0.1" = { + "@netlify/run-utils-5.0.2" = { name = "_at_netlify_slash_run-utils"; packageName = "@netlify/run-utils"; - version = "2.0.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-2.0.1.tgz"; - sha512 = "F1YcF2kje0Ttj+t5Cn5d6ojGQcKj4i/GMWgQuoZGVjQ31ToNcDXIbBm5SBKIkMMpNejtR1wF+1a0Q+aBPWiZVQ=="; + url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-5.0.2.tgz"; + sha512 = "otfFwuZEd6pm/i3wv5UMIB6t6UNY7NEWkgF3fgO6nx9uWLq9oRqzVYrff5pYSNm8YgdEBDxx8eHvv5mGMyXz2A=="; }; }; - "@netlify/zip-it-and-ship-it-4.25.0" = { + "@netlify/zip-it-and-ship-it-7.1.2" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.25.0"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.25.0.tgz"; - sha512 = "4KhFSO7QWyNXVlQzFVCAmTEgdOnPnQGbkaX+Wo/5NS1boH6IvbKAzZKFqrP8fE2Vl4wIWrt9srPpQA3HpyO3NQ=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-7.1.2.tgz"; + sha512 = "WGCt5KDk5Zr+A0fhPGEgAAW2aNiGyLcZohBq4nu/4BoFtHkk+8vCZOH1lMytZiIFu0eAq00j2q4kdzyLFV0Wuw=="; + }; + }; + "@netlify/zip-it-and-ship-it-8.1.0" = { + name = "_at_netlify_slash_zip-it-and-ship-it"; + packageName = "@netlify/zip-it-and-ship-it"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-8.1.0.tgz"; + sha512 = "PTIGSIUB6YYjGalYL/lNzayKeU5zC8rxyXt+dZWmd3Ha9qv+v+fdcfH4WHe47SIYtQgO/F81qsL0/JetghOfTA=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -1291,148 +670,67 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@oclif/color-0.1.2" = { - name = "_at_oclif_slash_color"; - packageName = "@oclif/color"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/color/-/color-0.1.2.tgz"; - sha512 = "M9o+DOrb8l603qvgz1FogJBUGLqcMFL1aFg2ZEL0FbXJofiNTLOWIeB4faeZTLwE6dt0xH9GpCVpzksMMzGbmA=="; - }; - }; - "@oclif/command-1.8.0" = { - name = "_at_oclif_slash_command"; - packageName = "@oclif/command"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.0.tgz"; - sha512 = "5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw=="; - }; - }; - "@oclif/config-1.17.0" = { - name = "_at_oclif_slash_config"; - packageName = "@oclif/config"; - version = "1.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.17.0.tgz"; - sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; - }; - }; - "@oclif/errors-1.3.5" = { - name = "_at_oclif_slash_errors"; - packageName = "@oclif/errors"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/errors/-/errors-1.3.5.tgz"; - sha512 = "OivucXPH/eLLlOT7FkCMoZXiaVYf8I/w1eTAM1+gKzfhALwWTusxEx7wBmW0uzvkSg/9ovWLycPaBgJbM3LOCQ=="; - }; - }; - "@oclif/linewrap-1.0.0" = { - name = "_at_oclif_slash_linewrap"; - packageName = "@oclif/linewrap"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/linewrap/-/linewrap-1.0.0.tgz"; - sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; - }; - }; - "@oclif/parser-3.8.5" = { - name = "_at_oclif_slash_parser"; - packageName = "@oclif/parser"; - version = "3.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.5.tgz"; - sha512 = "yojzeEfmSxjjkAvMRj0KzspXlMjCfBzNRPkWw8ZwOSoNWoJn+OCS/m/S+yfV6BvAM4u2lTzX9Y5rCbrFIgkJLg=="; - }; - }; - "@oclif/plugin-help-3.2.3" = { - name = "_at_oclif_slash_plugin-help"; - packageName = "@oclif/plugin-help"; - version = "3.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.3.tgz"; - sha512 = "l2Pd0lbOMq4u/7xsl9hqISFqyR9gWEz/8+05xmrXFr67jXyS6EUCQB+mFBa0wepltrmJu0sAFg9AvA2mLaMMqQ=="; - }; - }; - "@oclif/plugin-not-found-1.2.4" = { - name = "_at_oclif_slash_plugin-not-found"; - packageName = "@oclif/plugin-not-found"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-not-found/-/plugin-not-found-1.2.4.tgz"; - sha512 = "G440PCuMi/OT8b71aWkR+kCWikngGtyRjOR24sPMDbpUFV4+B3r51fz1fcqeUiiEOYqUpr0Uy/sneUe1O/NfBg=="; - }; - }; - "@oclif/plugin-plugins-1.10.1" = { - name = "_at_oclif_slash_plugin-plugins"; - packageName = "@oclif/plugin-plugins"; - version = "1.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.10.1.tgz"; - sha512 = "JDUA3NtOa4OlH8ofUBXQMTFlpEkSmeE9BxoQTD6+BeUvMgqFuZThENucRvCD00sywhCmDngmIYN59gKcXpGJeQ=="; - }; - }; - "@oclif/screen-1.0.4" = { - name = "_at_oclif_slash_screen"; - packageName = "@oclif/screen"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/screen/-/screen-1.0.4.tgz"; - sha512 = "60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw=="; - }; - }; - "@octokit/auth-token-2.5.0" = { + "@octokit/auth-token-3.0.1" = { name = "_at_octokit_slash_auth-token"; packageName = "@octokit/auth-token"; - version = "2.5.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz"; - sha512 = "r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g=="; + url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.1.tgz"; + sha512 = "/USkK4cioY209wXRpund6HZzHo9GmjakpV9ycOkpMcMxMk7QVcVFVyCMtzvXYiHsB2crgDgrtNYSELYFBXhhaA=="; }; }; - "@octokit/core-3.5.1" = { + "@octokit/core-4.1.0" = { name = "_at_octokit_slash_core"; packageName = "@octokit/core"; - version = "3.5.1"; + version = "4.1.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-4.1.0.tgz"; + sha512 = "Czz/59VefU+kKDy+ZfDwtOIYIkFjExOKf+HA92aiTZJ6EfWpFzYQWw0l54ji8bVmyhc+mGaLUbSUmXazG7z5OQ=="; }; }; - "@octokit/endpoint-6.0.12" = { + "@octokit/endpoint-7.0.2" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "6.0.12"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz"; - sha512 = "lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.2.tgz"; + sha512 = "8/AUACfE9vpRpehE6ZLfEtzkibe5nfsSwFZVMsG8qabqRt1M81qZYUFRZa1B8w8lP6cdfDJfRq9HWS+MbmR7tw=="; }; }; - "@octokit/graphql-4.8.0" = { + "@octokit/graphql-5.0.1" = { name = "_at_octokit_slash_graphql"; packageName = "@octokit/graphql"; - version = "4.8.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz"; - sha512 = "0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg=="; + url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.1.tgz"; + sha512 = "sxmnewSwAixkP1TrLdE6yRG53eEhHhDTYUykUwdV9x8f91WcbhunIHk9x1PZLALdBZKRPUO2HRcm4kezZ79HoA=="; }; }; - "@octokit/openapi-types-11.2.0" = { + "@octokit/openapi-types-13.13.1" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "11.2.0"; + version = "13.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz"; - sha512 = "PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-13.13.1.tgz"; + sha512 = "4EuKSk3N95UBWFau3Bz9b3pheQ8jQYbKmBL5+GSuY8YDPDwu03J4BjI+66yNi8aaX/3h1qDpb0mbBkLdr+cfGQ=="; }; }; - "@octokit/plugin-paginate-rest-2.17.0" = { + "@octokit/openapi-types-14.0.0" = { + name = "_at_octokit_slash_openapi-types"; + packageName = "@octokit/openapi-types"; + version = "14.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-14.0.0.tgz"; + sha512 = "HNWisMYlR8VCnNurDU6os2ikx0s0VyEjDYHNS/h4cgb8DeOxQ0n72HyinUtdDVxJhFy3FWLGl0DJhfEWk3P5Iw=="; + }; + }; + "@octokit/plugin-paginate-rest-5.0.1" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; - version = "2.17.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz"; - sha512 = "tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw=="; + url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-5.0.1.tgz"; + sha512 = "7A+rEkS70pH36Z6JivSlR7Zqepz3KVucEFVDnSrgHXzG7WLAzYwcHZbKdfTXHwuTHbkT1vKvz7dHl1+HNf6Qyw=="; }; }; "@octokit/plugin-request-log-1.0.4" = { @@ -1444,103 +742,76 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.13.0" = { + "@octokit/plugin-rest-endpoint-methods-6.7.0" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.13.0"; + version = "6.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz"; - sha512 = "uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-6.7.0.tgz"; + sha512 = "orxQ0fAHA7IpYhG2flD2AygztPlGYNAdlzYz8yrD8NDgelPfOYoRPROfEyIe035PlxvbYrgkfUZIhSBKju/Cvw=="; }; }; - "@octokit/request-5.6.2" = { + "@octokit/request-6.2.1" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.6.2"; + version = "6.2.1"; 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-6.2.1.tgz"; + sha512 = "gYKRCia3cpajRzDSU+3pt1q2OcuC6PK8PmFIyxZDWCzRXRSIBH8jXjFJ8ZceoygBIm0KsEUg4x1+XcYBz7dHPQ=="; }; }; - "@octokit/request-error-2.1.0" = { + "@octokit/request-error-3.0.1" = { name = "_at_octokit_slash_request-error"; packageName = "@octokit/request-error"; - version = "2.1.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz"; - sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.1.tgz"; + sha512 = "ym4Bp0HTP7F3VFssV88WD1ZyCIRoE8H35pXSKwLeMizcdZAYc/t6N9X9Yr9n6t3aG9IH75XDnZ6UeZph0vHMWQ=="; }; }; - "@octokit/rest-18.12.0" = { + "@octokit/rest-19.0.5" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.12.0"; + version = "19.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz"; - sha512 = "gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-19.0.5.tgz"; + sha512 = "+4qdrUFq2lk7Va+Qff3ofREQWGBeoTKNqlJO+FGjFP35ZahP+nBenhZiGdu8USSgmq4Ky3IJ/i4u0xbLqHaeow=="; }; }; - "@octokit/types-6.34.0" = { + "@octokit/types-7.5.1" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.34.0"; + version = "7.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz"; - sha512 = "s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-7.5.1.tgz"; + sha512 = "Zk4OUMLCSpXNI8KZZn47lVLJSsgMyCimsWWQI5hyjZg7hdYm0kjotaIkbG0Pp8SfU2CofMBzonboTqvzn3FrJA=="; }; }; - "@rollup/plugin-babel-5.3.0" = { - name = "_at_rollup_slash_plugin-babel"; - packageName = "@rollup/plugin-babel"; - version = "5.3.0"; + "@octokit/types-8.0.0" = { + name = "_at_octokit_slash_types"; + packageName = "@octokit/types"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.0.tgz"; - sha512 = "9uIC8HZOnVLrLHxayq/PTzw+uS25E14KPUBh5ktF+18Mjo5yK0ToMMx6epY0uEgkjwJw0aBW4x2horYXh8juWw=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-8.0.0.tgz"; + sha512 = "65/TPpOJP1i3K4lBJMnWqPUJ6zuOtzhtagDvydAWbEXpbFYA0oMKKyLb95NFZZP0lSh/4b6K+DQlzvYQJQQePg=="; }; }; - "@rollup/plugin-commonjs-18.1.0" = { - name = "_at_rollup_slash_plugin-commonjs"; - packageName = "@rollup/plugin-commonjs"; - version = "18.1.0"; + "@pnpm/network.ca-file-1.0.1" = { + name = "_at_pnpm_slash_network.ca-file"; + packageName = "@pnpm/network.ca-file"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-18.1.0.tgz"; - sha512 = "h3e6T9rUxVMAQswpDIobfUHn/doMzM9sgkMrsMWCFLmB84PSoC8mV8tOloAJjSRwdqhXBqstlX2BwBpHJvbhxg=="; + url = "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.1.tgz"; + sha512 = "gkINruT2KUhZLTaiHxwCOh1O4NVnFT0wLjWFBHmTz9vpKag/C/noIMJXBxFe4F0mYpUVX2puLwAieLYFg2NvoA=="; }; }; - "@rollup/plugin-inject-4.0.2" = { - name = "_at_rollup_slash_plugin-inject"; - packageName = "@rollup/plugin-inject"; - version = "4.0.2"; + "@pnpm/npm-conf-1.0.5" = { + name = "_at_pnpm_slash_npm-conf"; + packageName = "@pnpm/npm-conf"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-inject/-/plugin-inject-4.0.2.tgz"; - sha512 = "TSLMA8waJ7Dmgmoc8JfPnwUwVZgLjjIAM6MqeIFqPO2ODK36JqE0Cf2F54UTgCUuW8da93Mvoj75a6KAVWgylw=="; - }; - }; - "@rollup/plugin-json-4.1.0" = { - name = "_at_rollup_slash_plugin-json"; - packageName = "@rollup/plugin-json"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz"; - sha512 = "yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw=="; - }; - }; - "@rollup/plugin-node-resolve-11.2.1" = { - name = "_at_rollup_slash_plugin-node-resolve"; - packageName = "@rollup/plugin-node-resolve"; - version = "11.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz"; - sha512 = "yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg=="; - }; - }; - "@rollup/pluginutils-3.1.0" = { - name = "_at_rollup_slash_pluginutils"; - packageName = "@rollup/pluginutils"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz"; - sha512 = "GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg=="; + url = "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-1.0.5.tgz"; + sha512 = "hD8ml183638O3R6/Txrh0L8VzGOrFXgRtRDG4qQC4tONdZ5Z1M+tlUUDUvrjYdmK6G+JTBTeaCLMna11cXzi8A=="; }; }; "@samverschueren/stream-to-observable-0.3.1" = { @@ -1579,22 +850,31 @@ let sha512 = "/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg=="; }; }; - "@sindresorhus/slugify-1.1.2" = { - name = "_at_sindresorhus_slash_slugify"; - packageName = "@sindresorhus/slugify"; - version = "1.1.2"; + "@sindresorhus/is-5.3.0" = { + name = "_at_sindresorhus_slash_is"; + packageName = "@sindresorhus/is"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/slugify/-/slugify-1.1.2.tgz"; - sha512 = "V9nR/W0Xd9TSGXpZ4iFUcFGhuOJtZX82Fzxj1YISlbSgKvIiNa7eLEZrT0vAraPOt++KHauIVNYgGRgjc13dXA=="; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-5.3.0.tgz"; + sha512 = "CX6t4SYQ37lzxicAqsBtxA3OseeoVrh9cSJ5PFYam0GksYlupRfy1A+Q4aYD3zvcfECLc0zO2u+ZnR2UYKvCrw=="; }; }; - "@sindresorhus/transliterate-0.1.2" = { + "@sindresorhus/slugify-2.1.1" = { + name = "_at_sindresorhus_slash_slugify"; + packageName = "@sindresorhus/slugify"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/slugify/-/slugify-2.1.1.tgz"; + sha512 = "XokPHZ+q6FtQGEi1hnfvARVJJVPEhwHQTPHPPuNHaN6zcHjzYNynhhHMopa1wNPqLAFOwpsbintunEqWecXJMg=="; + }; + }; + "@sindresorhus/transliterate-1.5.0" = { name = "_at_sindresorhus_slash_transliterate"; packageName = "@sindresorhus/transliterate"; - version = "0.1.2"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/transliterate/-/transliterate-0.1.2.tgz"; - sha512 = "5/kmIOY9FF32nicXH+5yLNTX4NJ4atl7jRgqAJuIn/iyDFXBktOKDxCvyGE/EzmF4ngSUvjXxQUQlQiZ5lfw+w=="; + url = "https://registry.npmjs.org/@sindresorhus/transliterate/-/transliterate-1.5.0.tgz"; + sha512 = "/sfSkoNelLq5riqNRp5uBjHIKBi1MWZk9ubRT1WiBQuTfmDf7BeQkph2DJzRB83QagMPHk2VDjuvpy0VuwyzdA=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -1615,6 +895,60 @@ let sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; }; + "@szmarczak/http-timer-5.0.1" = { + name = "_at_szmarczak_slash_http-timer"; + packageName = "@szmarczak/http-timer"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz"; + sha512 = "+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw=="; + }; + }; + "@tsconfig/node10-1.0.8" = { + name = "_at_tsconfig_slash_node10"; + packageName = "@tsconfig/node10"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz"; + sha512 = "6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg=="; + }; + }; + "@tsconfig/node12-1.0.9" = { + name = "_at_tsconfig_slash_node12"; + packageName = "@tsconfig/node12"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz"; + sha512 = "/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw=="; + }; + }; + "@tsconfig/node14-1.0.1" = { + name = "_at_tsconfig_slash_node14"; + packageName = "@tsconfig/node14"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz"; + sha512 = "509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg=="; + }; + }; + "@tsconfig/node16-1.0.2" = { + name = "_at_tsconfig_slash_node16"; + packageName = "@tsconfig/node16"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz"; + sha512 = "eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA=="; + }; + }; + "@types/body-parser-1.19.2" = { + name = "_at_types_slash_body-parser"; + packageName = "@types/body-parser"; + version = "1.19.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz"; + sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; + }; + }; "@types/cacheable-request-6.0.2" = { name = "_at_types_slash_cacheable-request"; packageName = "@types/cacheable-request"; @@ -1624,6 +958,15 @@ let sha512 = "B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA=="; }; }; + "@types/connect-3.4.35" = { + name = "_at_types_slash_connect"; + packageName = "@types/connect"; + version = "3.4.35"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz"; + sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; + }; + }; "@types/decompress-4.2.4" = { name = "_at_types_slash_decompress"; packageName = "@types/decompress"; @@ -1642,22 +985,31 @@ let sha512 = "t5DjMD6Y1DxjXtEHl7Kt+nQn9rOmVLYD8p4Swrcc5QpgyqyqR2gXTIK6RwwMnNeFJ+ZIiIW789fQKzCrK7AOFA=="; }; }; - "@types/estree-0.0.39" = { - name = "_at_types_slash_estree"; - packageName = "@types/estree"; - version = "0.0.39"; + "@types/express-4.17.13" = { + name = "_at_types_slash_express"; + packageName = "@types/express"; + version = "4.17.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz"; - sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz"; + sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; - "@types/glob-7.1.4" = { + "@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.28"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz"; + sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig=="; + }; + }; + "@types/glob-7.2.0" = { name = "_at_types_slash_glob"; packageName = "@types/glob"; - version = "7.1.4"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz"; - sha512 = "w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA=="; + url = "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz"; + sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; }; }; "@types/got-8.3.6" = { @@ -1678,22 +1030,22 @@ let sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; }; }; - "@types/http-proxy-1.17.7" = { + "@types/http-proxy-1.17.8" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.7"; + version = "1.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.7.tgz"; - sha512 = "9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.8.tgz"; + sha512 = "5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA=="; }; }; - "@types/istanbul-lib-coverage-2.0.3" = { + "@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" = { @@ -1732,6 +1084,15 @@ let sha512 = "FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg=="; }; }; + "@types/mime-1.3.2" = { + name = "_at_types_slash_mime"; + packageName = "@types/mime"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz"; + sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; + }; + }; "@types/minimatch-3.0.5" = { name = "_at_types_slash_minimatch"; packageName = "@types/minimatch"; @@ -1741,13 +1102,13 @@ let sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; }; - "@types/node-14.17.21" = { + "@types/node-16.11.22" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.17.21"; + version = "16.11.22"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.17.21.tgz"; - sha512 = "zv8ukKci1mrILYiQOwGSV4FpkZhyxQtuFWGya2GujWg+zVAeRQ4qbaMmWp9vb9889CFA8JECH7lkwCL6Ygg8kA=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.22.tgz"; + sha512 = "DYNtJWauMQ9RNpesl4aVothr97/tIJM8HbyOXJ0AYT1Z2bEjLHyfjOBPAQQVMLf8h3kSShYfNk8Wnto8B2zHUA=="; }; }; "@types/node-fetch-2.5.12" = { @@ -1768,13 +1129,22 @@ let sha512 = "Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="; }; }; - "@types/resolve-1.17.1" = { - name = "_at_types_slash_resolve"; - packageName = "@types/resolve"; - version = "1.17.1"; + "@types/qs-6.9.7" = { + name = "_at_types_slash_qs"; + packageName = "@types/qs"; + version = "6.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz"; - sha512 = "yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw=="; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz"; + sha512 = "FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="; + }; + }; + "@types/range-parser-1.2.4" = { + name = "_at_types_slash_range-parser"; + packageName = "@types/range-parser"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz"; + sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; "@types/responselike-1.0.0" = { @@ -1786,13 +1156,31 @@ let sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; }; }; - "@types/semver-7.3.8" = { + "@types/retry-0.12.1" = { + name = "_at_types_slash_retry"; + packageName = "@types/retry"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz"; + sha512 = "xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g=="; + }; + }; + "@types/semver-7.3.9" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; - version = "7.3.8"; + version = "7.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/semver/-/semver-7.3.8.tgz"; - sha512 = "D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now=="; + url = "https://registry.npmjs.org/@types/semver/-/semver-7.3.9.tgz"; + sha512 = "L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ=="; + }; + }; + "@types/serve-static-1.13.10" = { + name = "_at_types_slash_serve-static"; + packageName = "@types/serve-static"; + version = "1.13.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz"; + sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ=="; }; }; "@types/yargs-15.0.14" = { @@ -1804,6 +1192,15 @@ let sha512 = "yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ=="; }; }; + "@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-20.2.1" = { name = "_at_types_slash_yargs-parser"; packageName = "@types/yargs-parser"; @@ -1813,49 +1210,40 @@ let sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; }; }; - "@typescript-eslint/types-4.33.0" = { + "@typescript-eslint/types-5.18.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.33.0"; + version = "5.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz"; - sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.18.0.tgz"; + sha512 = "bhV1+XjM+9bHMTmXi46p1Led5NP6iqQcsOxgx7fvk6gGiV48c6IynY0apQb7693twJDsXiVzNXTflhplmaiJaw=="; }; }; - "@typescript-eslint/typescript-estree-4.33.0" = { + "@typescript-eslint/typescript-estree-5.18.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.33.0"; + version = "5.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz"; - sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.18.0.tgz"; + sha512 = "wa+2VAhOPpZs1bVij9e5gyVu60ReMi/KuOx4LKjGx2Y3XTNUDJgQ+5f77D49pHtqef/klglf+mibuHs9TrPxdQ=="; }; }; - "@typescript-eslint/visitor-keys-4.33.0" = { + "@typescript-eslint/visitor-keys-5.18.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.33.0"; + version = "5.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz"; - sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.18.0.tgz"; + sha512 = "Hf+t+dJsjAKpKSkg3EHvbtEpFFb/1CiOHnvI8bjHgOD4/wAw3gKrA0i94LrbekypiZVanJu3McWJg7rWDMzRTg=="; }; }; - "@ungap/from-entries-0.2.1" = { - name = "_at_ungap_slash_from-entries"; - packageName = "@ungap/from-entries"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ungap/from-entries/-/from-entries-0.2.1.tgz"; - sha512 = "CAqefTFAfnUPwYqsWHXpOxHaq1Zo5UQ3m9Zm2p09LggGe57rqHoBn3c++xcoomzXKynAUuiBMDUCQvKMnXjUpA=="; - }; - }; - "@vercel/nft-0.15.1" = { + "@vercel/nft-0.22.1" = { name = "_at_vercel_slash_nft"; packageName = "@vercel/nft"; - version = "0.15.1"; + version = "0.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.15.1.tgz"; - sha512 = "ehD1bgCG9sZliAHku2fc1L+jKLad4wS+9HHWiIs4HT4SysA/JFSXRrfWuA+INumzuaFqrOKs3vQeLVhZ4o8lTw=="; + url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.22.1.tgz"; + sha512 = "lYYZIoxRurqDOSoVIdBicGnpUIpfyaS5qVjdPq+EfI285WqtZK3NK/dyCkiyBul+X2U2OEhRyeMdXPCHGJbohw=="; }; }; "abbrev-1.1.1" = { @@ -1867,49 +1255,31 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; - "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-8.5.0" = { + "acorn-8.8.0" = { name = "acorn"; packageName = "acorn"; - version = "8.5.0"; + version = "8.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz"; - sha512 = "yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz"; + sha512 = "QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="; }; }; - "acorn-class-fields-1.0.0" = { - name = "acorn-class-fields"; - packageName = "acorn-class-fields"; - version = "1.0.0"; + "acorn-walk-8.2.0" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-class-fields/-/acorn-class-fields-1.0.0.tgz"; - sha512 = "l+1FokF34AeCXGBHkrXFmml9nOIRI+2yBnBpO5MaVAaTIJ96irWLtcCxX+7hAp6USHFCe+iyyBB4ZhxV807wmA=="; - }; - }; - "acorn-private-class-elements-1.0.0" = { - name = "acorn-private-class-elements"; - packageName = "acorn-private-class-elements"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-private-class-elements/-/acorn-private-class-elements-1.0.0.tgz"; - sha512 = "zYNcZtxKgVCg1brS39BEou86mIao1EV7eeREG+6WMwKbuYTeivRRs6S2XdWnboRde6G9wKh2w+WBydEyJsJ6mg=="; - }; - }; - "acorn-static-class-features-1.0.0" = { - name = "acorn-static-class-features"; - packageName = "acorn-static-class-features"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-static-class-features/-/acorn-static-class-features-1.0.0.tgz"; - sha512 = "XZJECjbmMOKvMHiNzbiPXuXpLAJfN3dAKtfIYbk1eHiWdsutlek+gS7ND4B8yJ3oqvHo1NxfafnezVmq7NXK0A=="; + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"; + sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; }; }; "agent-base-6.0.2" = { @@ -1930,13 +1300,31 @@ let sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; }; }; - "ajv-8.6.3" = { + "aggregate-error-4.0.1" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-4.0.1.tgz"; + sha512 = "0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w=="; + }; + }; + "ajv-8.11.2" = { name = "ajv"; packageName = "ajv"; - version = "8.6.3"; + version = "8.11.2"; 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.11.2.tgz"; + sha512 = "E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg=="; + }; + }; + "ajv-errors-3.0.0" = { + name = "ajv-errors"; + packageName = "ajv-errors"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-errors/-/ajv-errors-3.0.0.tgz"; + sha512 = "V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ=="; }; }; "all-node-versions-8.0.0" = { @@ -1975,13 +1363,22 @@ let sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; }; }; + "ansi-escapes-5.0.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz"; + sha512 = "5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA=="; + }; + }; "ansi-regex-0.2.1" = { name = "ansi-regex"; packageName = "ansi-regex"; version = "0.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"; - sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9"; + sha512 = "sGwIGMjhYdW26/IhwK2gkWWI8DRCVO6uj3hYgHT+zD+QL1pa37tM3ujhyfcJIYSbsxp7Gxhy7zrRW/1AHm4BmA=="; }; }; "ansi-regex-2.1.1" = { @@ -1990,25 +1387,25 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + sha512 = "TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="; }; }; - "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" = { @@ -2020,13 +1417,22 @@ let sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; }; + "ansi-regex-6.0.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz"; + sha512 = "n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="; + }; + }; "ansi-styles-1.1.0" = { name = "ansi-styles"; packageName = "ansi-styles"; version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"; - sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de"; + sha512 = "f2PKUkN5QngiSemowa6Mrk9MPCdtFiOSmibjZ+j1qhLGHHYsqZwmBMRF3IRMVXo8sybDqx2fJl2d/8OphBoWkA=="; }; }; "ansi-styles-2.2.1" = { @@ -2035,7 +1441,7 @@ let version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + sha512 = "kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA=="; }; }; "ansi-styles-3.2.1" = { @@ -2065,13 +1471,31 @@ let sha512 = "Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="; }; }; - "ansicolors-0.3.2" = { - name = "ansicolors"; - packageName = "ansicolors"; - version = "0.3.2"; + "ansi-styles-6.1.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; - sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz"; + sha512 = "VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ=="; + }; + }; + "ansi-styles-6.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz"; + sha512 = "bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="; + }; + }; + "ansi-to-html-0.7.2" = { + name = "ansi-to-html"; + packageName = "ansi-to-html"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.7.2.tgz"; + sha512 = "v6MqmEpNlxF+POuyhKkidusCHWWkaLcGRURzivcU3I9tv7k4JVhFcnukrM5Rlk2rUywdZuzYAZ+kbZqWCnfN3g=="; }; }; "any-observable-0.3.0" = { @@ -2092,13 +1516,13 @@ let sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; }; }; - "aproba-1.2.0" = { + "aproba-2.0.0" = { name = "aproba"; packageName = "aproba"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + url = "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz"; + sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; }; }; "archive-type-4.0.0" = { @@ -2128,22 +1552,22 @@ let sha512 = "bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw=="; }; }; - "are-we-there-yet-1.1.7" = { + "are-we-there-yet-2.0.0" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; - version = "1.1.7"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; - sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz"; + sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw=="; }; }; - "argparse-1.0.10" = { - name = "argparse"; - packageName = "argparse"; - version = "1.0.10"; + "arg-4.1.3" = { + name = "arg"; + packageName = "arg"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; - sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + url = "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz"; + sha512 = "58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="; }; }; "argparse-2.0.1" = { @@ -2182,15 +1606,6 @@ let sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; }; }; - "array-flat-polyfill-1.0.1" = { - name = "array-flat-polyfill"; - packageName = "array-flat-polyfill"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flat-polyfill/-/array-flat-polyfill-1.0.1.tgz"; - sha512 = "hfJmKupmQN0lwi0xG6FQ5U8Rd97RnIERplymOv/qpq8AoNKPPAnxJadjFA23FNWm88wykh9HmpLJUUwUtNU/iw=="; - }; - }; "array-flatten-1.1.1" = { name = "array-flatten"; packageName = "array-flatten"; @@ -2206,7 +1621,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"; - sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; + sha512 = "Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng=="; }; }; "array-union-2.1.0" = { @@ -2263,13 +1678,13 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; - "ast-module-types-2.7.1" = { + "ast-module-types-3.0.0" = { name = "ast-module-types"; packageName = "ast-module-types"; - version = "2.7.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ast-module-types/-/ast-module-types-2.7.1.tgz"; - sha512 = "Rnnx/4Dus6fn7fTqdeLEAn5vUll5w7/vts0RN608yFa6si/rDOUonlIIiwugHBFWjylHjxm9owoSZn71KwG4gw=="; + url = "https://registry.npmjs.org/ast-module-types/-/ast-module-types-3.0.0.tgz"; + sha512 = "CMxMCOCS+4D+DkOQfuZf+vLrSEmY/7xtORwdxs4wtcC1wVgvk2MqFFTwQCFhvWsI4KPU9lcWXPI8DgRiz+xetQ=="; }; }; "async-1.5.2" = { @@ -2278,16 +1693,25 @@ let version = "1.5.2"; src = fetchurl { url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; - sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + sha512 = "nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w=="; }; }; - "async-3.2.1" = { + "async-3.2.4" = { name = "async"; packageName = "async"; - version = "3.2.1"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.1.tgz"; - sha512 = "XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg=="; + url = "https://registry.npmjs.org/async/-/async-3.2.4.tgz"; + sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; + }; + }; + "async-sema-3.1.1" = { + name = "async-sema"; + packageName = "async-sema"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async-sema/-/async-sema-3.1.1.tgz"; + sha512 = "tLRNUXati5MFePdAk8dw7Qt7DpxPB60ofAgn8WRhW6a2rcimZnYBP9oxHiv0OHy+Wz7kPMG+t4LGdt31+4EmGg=="; }; }; "asynckit-0.4.0" = { @@ -2299,15 +1723,6 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "at-least-node-1.0.0" = { - name = "at-least-node"; - packageName = "at-least-node"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"; - sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; - }; - }; "atob-2.1.2" = { name = "atob"; packageName = "atob"; @@ -2317,42 +1732,6 @@ let sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; }; - "babel-plugin-dynamic-import-node-2.3.3" = { - name = "babel-plugin-dynamic-import-node"; - packageName = "babel-plugin-dynamic-import-node"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; - sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; - }; - }; - "babel-plugin-polyfill-corejs2-0.2.2" = { - name = "babel-plugin-polyfill-corejs2"; - packageName = "babel-plugin-polyfill-corejs2"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz"; - sha512 = "kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ=="; - }; - }; - "babel-plugin-polyfill-corejs3-0.2.5" = { - name = "babel-plugin-polyfill-corejs3"; - packageName = "babel-plugin-polyfill-corejs3"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz"; - sha512 = "ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw=="; - }; - }; - "babel-plugin-polyfill-regenerator-0.2.2" = { - name = "babel-plugin-polyfill-regenerator"; - packageName = "babel-plugin-polyfill-regenerator"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz"; - sha512 = "Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg=="; - }; - }; "backoff-2.5.0" = { name = "backoff"; packageName = "backoff"; @@ -2398,13 +1777,13 @@ let sha512 = "3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ=="; }; }; - "better-opn-2.1.1" = { + "better-opn-3.0.2" = { name = "better-opn"; packageName = "better-opn"; - version = "2.1.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/better-opn/-/better-opn-2.1.1.tgz"; - sha512 = "kIPXZS5qwyKiX/HcRvDYfmBQUa8XP17I0mYZZ0y4UhpYOSvtsLHDYqmomS+Mj20aDvD3knEiQ0ecQy2nhio3yA=="; + url = "https://registry.npmjs.org/better-opn/-/better-opn-3.0.2.tgz"; + sha512 = "aVNobHnJqLiUelTaHat9DZ1qM2w0C0Eym4LPI/3JxOnSokGVdsl1T1kN7TFvsEAD8G47A6VKQ0TVHqbBnYMJlQ=="; }; }; "binary-extensions-2.2.0" = { @@ -2452,13 +1831,13 @@ let sha512 = "DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w=="; }; }; - "body-parser-1.19.0" = { + "body-parser-1.20.1" = { name = "body-parser"; packageName = "body-parser"; - version = "1.19.0"; + version = "1.20.1"; 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.20.1.tgz"; + sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="; }; }; "boxen-5.1.2" = { @@ -2470,6 +1849,15 @@ let sha512 = "9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ=="; }; }; + "boxen-7.0.0" = { + name = "boxen"; + packageName = "boxen"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-7.0.0.tgz"; + sha512 = "j//dBVuyacJbvW+tvZ9HuH03fZ46QcaKvvhZickZqtB271DxJ7SNRSNxrV/dZX0085m7hISRZWbzWlJvx/rHSg=="; + }; + }; "brace-expansion-1.1.11" = { name = "brace-expansion"; packageName = "brace-expansion"; @@ -2479,6 +1867,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-2.3.2" = { name = "braces"; packageName = "braces"; @@ -2497,15 +1894,6 @@ let sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; - "browserslist-4.17.3" = { - name = "browserslist"; - packageName = "browserslist"; - version = "4.17.3"; - src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.17.3.tgz"; - sha512 = "59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ=="; - }; - }; "buffer-5.7.1" = { name = "buffer"; packageName = "buffer"; @@ -2542,13 +1930,13 @@ let sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; }; }; - "buffer-es6-4.9.3" = { - name = "buffer-es6"; - packageName = "buffer-es6"; - version = "4.9.3"; + "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-es6/-/buffer-es6-4.9.3.tgz"; - sha1 = "f26347b82df76fd37e18bcb5288c4970cfd5c404"; + url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"; + sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"; }; }; "buffer-fill-1.0.0" = { @@ -2578,13 +1966,13 @@ let sha512 = "lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA=="; }; }; - "builtins-1.0.3" = { + "builtins-5.0.0" = { name = "builtins"; packageName = "builtins"; - version = "1.0.3"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz"; - sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; + url = "https://registry.npmjs.org/builtins/-/builtins-5.0.0.tgz"; + sha512 = "aizhtbxgT1Udg0Fj6GssXshAVK+nxbtCV+1OtTrMNy67jffDFBY6CUBAkhO4owbleAx6fdbnWdpsmmcXydbzNw=="; }; }; "byline-5.0.0" = { @@ -2596,13 +1984,13 @@ let sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; }; }; - "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=="; }; }; "cache-base-1.0.1" = { @@ -2623,13 +2011,31 @@ let sha512 = "EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg=="; }; }; + "cacheable-lookup-7.0.0" = { + name = "cacheable-lookup"; + packageName = "cacheable-lookup"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz"; + sha512 = "+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w=="; + }; + }; + "cacheable-request-10.2.1" = { + name = "cacheable-request"; + packageName = "cacheable-request"; + version = "10.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.1.tgz"; + sha512 = "3tLJyBjGuXw1s5gpKFSG3iS4kaKT4id04dZi98wzHQp/8cqZNweBnrF9J+rrlvrf4M53OdtDGNctNHFias8BEA=="; + }; + }; "cacheable-request-2.1.4" = { name = "cacheable-request"; packageName = "cacheable-request"; version = "2.1.4"; src = fetchurl { url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz"; - sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d"; + sha512 = "vag0O2LKZ/najSoUwDbVlnlCFvhBE/7mGTY2B5FgCBDcRD+oVV1HYTOwM6JZfMg/hIcM6IwnTZ1uQQL5/X3xIQ=="; }; }; "cacheable-request-6.1.0" = { @@ -2695,31 +2101,22 @@ let sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; - "camelcase-6.2.0" = { + "camelcase-6.3.0" = { name = "camelcase"; packageName = "camelcase"; - version = "6.2.0"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz"; - sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"; + sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; }; - "caniuse-lite-1.0.30001265" = { - name = "caniuse-lite"; - packageName = "caniuse-lite"; - version = "1.0.30001265"; + "camelcase-7.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001265.tgz"; - sha512 = "YzBnspggWV5hep1m9Z6sZVLOt7vrju8xWooFAgN6BA5qvy98qPAPb7vNUzypFaoh2pb3vlfzbDO8tB57UPGbtw=="; - }; - }; - "cardinal-2.1.1" = { - name = "cardinal"; - packageName = "cardinal"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz"; - sha1 = "7cc1055d822d212954d07b085dea251cc7bc5505"; + url = "https://registry.npmjs.org/camelcase/-/camelcase-7.0.0.tgz"; + sha512 = "JToIvOmz6nhGsUhAYScbo2d6Py5wojjNfoxoc2mEVLUdJ70gJK2gnd+ABY1Tc3sVMyK7QDPtN0T/XdlCQWITyQ=="; }; }; "chalk-0.5.1" = { @@ -2728,7 +2125,7 @@ let version = "0.5.1"; src = fetchurl { url = "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"; - sha1 = "663b3a648b68b55d04690d49167aa837858f2174"; + sha512 = "bIKA54hP8iZhyDT81TOsJiQvR1gW+ZYSXFaZUAvoD4wCHdbHY2actmpTE4x344ZlFqHbvoxKOaESULTZN2gstg=="; }; }; "chalk-1.1.3" = { @@ -2737,7 +2134,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + sha512 = "U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A=="; }; }; "chalk-2.4.2" = { @@ -2767,6 +2164,24 @@ let sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; }; + "chalk-5.0.1" = { + name = "chalk"; + packageName = "chalk"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz"; + sha512 = "Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w=="; + }; + }; + "chalk-5.1.2" = { + name = "chalk"; + packageName = "chalk"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-5.1.2.tgz"; + sha512 = "E5CkT4jWURs1Vy5qGJye+XwCkNj7Od3Af7CP6SujMetSMkLs8Do2RWJK5yx1wamHV/op8Rz+9rltjaTQWDnEFQ=="; + }; + }; "chardet-0.7.0" = { name = "chardet"; packageName = "chardet"; @@ -2776,22 +2191,13 @@ let sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; }; }; - "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=="; - }; - }; - "chownr-1.1.4" = { - name = "chownr"; - packageName = "chownr"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; - sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"; + sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; }; }; "chownr-2.0.0" = { @@ -2812,13 +2218,13 @@ let sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; }; - "ci-info-3.2.0" = { + "ci-info-3.5.0" = { name = "ci-info"; packageName = "ci-info"; - version = "3.2.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz"; - sha512 = "dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A=="; + url = "https://registry.npmjs.org/ci-info/-/ci-info-3.5.0.tgz"; + sha512 = "yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw=="; }; }; "class-utils-0.3.6" = { @@ -2848,13 +2254,13 @@ let sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; }; }; - "clean-stack-3.0.1" = { + "clean-stack-4.2.0" = { name = "clean-stack"; packageName = "clean-stack"; - version = "3.0.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/clean-stack/-/clean-stack-3.0.1.tgz"; - sha512 = "lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg=="; + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-4.2.0.tgz"; + sha512 = "LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg=="; }; }; "cli-boxes-2.2.1" = { @@ -2866,13 +2272,22 @@ let sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; }; }; + "cli-boxes-3.0.0" = { + name = "cli-boxes"; + packageName = "cli-boxes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz"; + sha512 = "/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g=="; + }; + }; "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"; + sha512 = "8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw=="; }; }; "cli-cursor-3.1.0" = { @@ -2884,13 +2299,22 @@ let sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; }; }; - "cli-progress-3.9.1" = { + "cli-cursor-4.0.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz"; + sha512 = "VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg=="; + }; + }; + "cli-progress-3.10.0" = { name = "cli-progress"; packageName = "cli-progress"; - version = "3.9.1"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.9.1.tgz"; - sha512 = "AXxiCe2a0Lm0VN+9L0jzmfQSkcZm5EYspfqXKaSIQKqIk+0hnkZ3/v1E9B39mkD6vYhKih3c/RPsJBSwq9O99Q=="; + url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.10.0.tgz"; + sha512 = "kLORQrhYCAtUPLZxqsAt2YJGOvRdt34+O6jl5cQGb7iF3dM55FQZlTR+rQyIK9JUcO9bBMwZsTlND+3dmFU2Cw=="; }; }; "cli-spinners-2.6.1" = { @@ -2908,25 +2332,7 @@ let version = "0.2.1"; src = fetchurl { url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz"; - sha1 = "9f15cfbb0705005369216c626ac7d05ab90dd574"; - }; - }; - "cli-ux-4.9.3" = { - name = "cli-ux"; - packageName = "cli-ux"; - version = "4.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-ux/-/cli-ux-4.9.3.tgz"; - sha512 = "/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA=="; - }; - }; - "cli-ux-5.6.3" = { - name = "cli-ux"; - packageName = "cli-ux"; - version = "5.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.6.3.tgz"; - sha512 = "/oDU4v8BiDjX2OKcSunGH0iGDiEtj2rZaGyqNuv9IT4CgcSMyVWAMfn0+rEHaOc4n9ka78B0wo1+N1QX89f7mw=="; + sha512 = "f4r4yJnbT++qUPI9NR4XLDLq41gQ+uqnPItWG0F5ZkehuNiTTa3EY0S4AqTSUOeJ7/zU41oWPQSNkW5BqPL9bg=="; }; }; "cli-width-2.2.1" = { @@ -2938,22 +2344,13 @@ let sha512 = "GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="; }; }; - "cliui-6.0.0" = { + "cliui-8.0.1" = { name = "cliui"; packageName = "cliui"; - version = "6.0.0"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"; - sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; - }; - }; - "cliui-7.0.4" = { - name = "cliui"; - packageName = "cliui"; - version = "7.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"; - sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; + url = "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz"; + sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="; }; }; "clone-1.0.4" = { @@ -2992,13 +2389,13 @@ let sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; }; }; - "color-3.0.0" = { + "color-3.2.1" = { name = "color"; packageName = "color"; - version = "3.0.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-3.0.0.tgz"; - sha512 = "jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w=="; + url = "https://registry.npmjs.org/color/-/color-3.2.1.tgz"; + sha512 = "aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA=="; }; }; "color-convert-1.9.3" = { @@ -3025,7 +2422,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; }; }; "color-name-1.1.4" = { @@ -3037,13 +2434,22 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "color-string-1.6.0" = { + "color-string-1.9.0" = { name = "color-string"; packageName = "color-string"; - version = "1.6.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz"; - sha512 = "c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA=="; + url = "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz"; + sha512 = "9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ=="; + }; + }; + "color-support-1.1.3" = { + name = "color-support"; + packageName = "color-support"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"; + sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; }; }; "colors-1.4.0" = { @@ -3055,13 +2461,22 @@ let sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; }; }; - "colorspace-1.1.2" = { + "colors-option-3.0.0" = { + name = "colors-option"; + packageName = "colors-option"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/colors-option/-/colors-option-3.0.0.tgz"; + sha512 = "DP3FpjsiDDvnQC1OJBsdOJZPuy7r0o6sepY2T5M3L/d2nrE23O/ErFkEqyY3ngVL1ZhTj/H0pCMNObZGkEOaaQ=="; + }; + }; + "colorspace-1.1.4" = { name = "colorspace"; packageName = "colorspace"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz"; - sha512 = "vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ=="; + url = "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz"; + sha512 = "BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w=="; }; }; "combined-stream-1.0.8" = { @@ -3082,22 +2497,13 @@ let sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; }; }; - "commander-3.0.2" = { + "commander-9.4.1" = { name = "commander"; packageName = "commander"; - version = "3.0.2"; + version = "9.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz"; - sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow=="; - }; - }; - "commander-7.2.0" = { - name = "commander"; - packageName = "commander"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"; - sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; + url = "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz"; + sha512 = "5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw=="; }; }; "common-path-prefix-3.0.0" = { @@ -3109,15 +2515,6 @@ let sha512 = "QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w=="; }; }; - "commondir-1.0.1" = { - name = "commondir"; - packageName = "commondir"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"; - sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; - }; - }; "component-emitter-1.3.0" = { name = "component-emitter"; packageName = "component-emitter"; @@ -3154,6 +2551,15 @@ let sha512 = "OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw=="; }; }; + "config-chain-1.1.13" = { + name = "config-chain"; + packageName = "config-chain"; + version = "1.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz"; + sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; + }; + }; "configstore-5.0.1" = { name = "configstore"; packageName = "configstore"; @@ -3163,22 +2569,31 @@ let sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; }; }; + "configstore-6.0.0" = { + name = "configstore"; + packageName = "configstore"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-6.0.0.tgz"; + sha512 = "cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA=="; + }; + }; "console-control-strings-1.1.0" = { name = "console-control-strings"; packageName = "console-control-strings"; version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="; }; }; - "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" = { @@ -3190,31 +2605,13 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; - "convert-source-map-1.8.0" = { - name = "convert-source-map"; - packageName = "convert-source-map"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz"; - sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; - }; - }; - "cookie-0.4.0" = { + "cookie-0.5.0" = { name = "cookie"; packageName = "cookie"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; - sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; - }; - }; - "cookie-0.4.1" = { - name = "cookie"; - packageName = "cookie"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz"; - sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; + url = "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"; + sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="; }; }; "cookie-signature-1.0.6" = { @@ -3244,22 +2641,22 @@ let sha512 = "xkXSJhvKz4MfLbVkZ7GyCaFo4ciB3uKI/HHzkGwj1eyTH5+7RTFxW5CE0irWAZgV5oFcO9hd6+NVXAtY9hlo7Q=="; }; }; - "core-js-compat-3.18.2" = { - name = "core-js-compat"; - packageName = "core-js-compat"; - version = "3.18.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.18.2.tgz"; - sha512 = "25VJYCJtGjZwLguj7d66oiHfmnVw3TMOZ0zV8DyMJp/aeQ3OjR519iOOeck08HMyVVRAqXxafc2Hl+5QstJrsQ=="; - }; - }; - "core-util-is-1.0.3" = { + "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; - version = "1.0.3"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; - sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "cp-file-10.0.0" = { + name = "cp-file"; + packageName = "cp-file"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cp-file/-/cp-file-10.0.0.tgz"; + sha512 = "vy2Vi1r2epK5WqxOLnskeKeZkdZvTKfFZQCplE3XWsP+SUJyd5XAUFC9lFgTjjXJF2GMne/UML14iEmkAaDfFg=="; }; }; "cp-file-7.0.0" = { @@ -3289,13 +2686,13 @@ let sha512 = "dmC4mUesv0OYH2kNFEidtf/skUwv4zePmGeepjyyJ0qTo5+8KhA1o99oIAwVVLzQMAeDJml74d6wPPKb6EZUTg=="; }; }; - "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-4.0.2" = { @@ -3307,13 +2704,22 @@ let sha512 = "DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w=="; }; }; - "cross-spawn-6.0.5" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "6.0.5"; + "create-require-1.1.1" = { + name = "create-require"; + packageName = "create-require"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; + url = "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz"; + sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="; + }; + }; + "cron-parser-4.6.0" = { + name = "cron-parser"; + packageName = "cron-parser"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.6.0.tgz"; + sha512 = "guZNLMGUgg6z4+eGhmHGw7ft+v6OQeuHzd1gcLxCo9Yg/qoxmG3nindp2/uwGCLizEisf2H0ptqeVXeoCpP6FA=="; }; }; "cross-spawn-7.0.3" = { @@ -3334,6 +2740,15 @@ let sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; }; }; + "crypto-random-string-4.0.0" = { + name = "crypto-random-string"; + packageName = "crypto-random-string"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz"; + sha512 = "x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA=="; + }; + }; "cyclist-1.0.1" = { name = "cyclist"; packageName = "cyclist"; @@ -3343,6 +2758,15 @@ let sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9"; }; }; + "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=="; + }; + }; "date-fns-1.30.1" = { name = "date-fns"; packageName = "date-fns"; @@ -3370,40 +2794,22 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; - "debug-3.2.7" = { + "debug-4.3.4" = { name = "debug"; packageName = "debug"; - version = "3.2.7"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; - sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; }; - "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=="; - }; - }; - "decache-4.6.0" = { + "decache-4.6.1" = { name = "decache"; packageName = "decache"; - version = "4.6.0"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/decache/-/decache-4.6.0.tgz"; - sha512 = "PppOuLiz+DFeaUvFXEYZjLxAkKiMYH/do/b/MxpDe/8AgKBi5GhZxridoVIbBq72GDbL36e4p0Ce2jTGUwwU+w=="; - }; - }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + url = "https://registry.npmjs.org/decache/-/decache-4.6.1.tgz"; + sha512 = "ohApBM8u9ygepJCjgBrEZSSxPjc0T/PJkD+uNyxXPkqudyUpdXpwJYp0VISm2WrPVzASU6DZyIi6BWdyw7uJ2Q=="; }; }; "decode-uri-component-0.2.0" = { @@ -3430,7 +2836,7 @@ let version = "3.3.0"; src = fetchurl { url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"; - sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + sha512 = "BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA=="; }; }; "decompress-response-5.0.0" = { @@ -3442,6 +2848,15 @@ let sha512 = "TLZWWybuxWgoW7Lykv+gq9xvzOsUjQ9tF09Tj6NSTYGMTCHNXzrPnD6Hi+TgZq19PyTAGH4Ll/NIM/eTGglnMw=="; }; }; + "decompress-response-6.0.0" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz"; + sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; + }; + }; "decompress-tar-4.1.1" = { name = "decompress-tar"; packageName = "decompress-tar"; @@ -3532,13 +2947,13 @@ let sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; }; }; - "define-properties-1.1.3" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.1.3"; + "define-lazy-prop-2.0.0" = { + name = "define-lazy-prop"; + packageName = "define-lazy-prop"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + url = "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"; + sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; }; }; "define-property-0.2.5" = { @@ -3547,7 +2962,7 @@ let version = "0.2.5"; src = fetchurl { url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; - sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + sha512 = "Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA=="; }; }; "define-property-1.0.0" = { @@ -3556,7 +2971,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; - sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + sha512 = "cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA=="; }; }; "define-property-2.0.2" = { @@ -3568,22 +2983,22 @@ let sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; }; }; - "del-5.1.0" = { + "del-6.1.1" = { name = "del"; packageName = "del"; - version = "5.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/del/-/del-5.1.0.tgz"; - sha512 = "wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA=="; + url = "https://registry.npmjs.org/del/-/del-6.1.1.tgz"; + sha512 = "ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg=="; }; }; - "del-6.0.0" = { + "del-7.0.0" = { name = "del"; packageName = "del"; - version = "6.0.0"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/del/-/del-6.0.0.tgz"; - sha512 = "1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ=="; + url = "https://registry.npmjs.org/del/-/del-7.0.0.tgz"; + sha512 = "tQbV/4u5WVB8HMJr08pgw0b6nG4RGt/tj+7Numvq+zqcvUFeMaIWWOUFltiU+6go8BSO2/ogsB4EasDaj0y68Q=="; }; }; "delayed-stream-1.0.0" = { @@ -3601,7 +3016,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; }; }; "depd-1.1.2" = { @@ -3610,7 +3025,16 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; - sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + sha512 = "7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="; + }; + }; + "depd-2.0.0" = { + name = "depd"; + packageName = "depd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; }; }; "deprecation-2.3.1" = { @@ -3622,49 +3046,49 @@ let sha512 = "xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="; }; }; - "destroy-1.0.4" = { + "destroy-1.2.0" = { name = "destroy"; packageName = "destroy"; - version = "1.0.4"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; + url = "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"; + sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="; }; }; - "detect-libc-1.0.3" = { + "detect-libc-2.0.1" = { name = "detect-libc"; packageName = "detect-libc"; - version = "1.0.3"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz"; + sha512 = "463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="; }; }; - "detective-amd-3.1.0" = { + "detective-amd-4.0.1" = { name = "detective-amd"; packageName = "detective-amd"; - version = "3.1.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/detective-amd/-/detective-amd-3.1.0.tgz"; - sha512 = "G7wGWT6f0VErjUkE2utCm7IUshT7nBh7aBBH2VBOiY9Dqy2DMens5iiOvYCuhstoIxRKLrnOvVAz4/EyPIAjnw=="; + url = "https://registry.npmjs.org/detective-amd/-/detective-amd-4.0.1.tgz"; + sha512 = "bDo22IYbJ8yzALB0Ow5CQLtyhU1BpDksLB9dsWHI9Eh0N3OQR6aQqhjPsNDd69ncYwRfL1sTo7OA9T3VRVSe2Q=="; }; }; - "detective-cjs-3.1.1" = { + "detective-cjs-4.0.0" = { name = "detective-cjs"; packageName = "detective-cjs"; - version = "3.1.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective-cjs/-/detective-cjs-3.1.1.tgz"; - sha512 = "JQtNTBgFY6h8uT6pgph5QpV3IyxDv+z3qPk/FZRDT9TlFfm5dnRtpH39WtQEr1khqsUxVqXzKjZHpdoQvQbllg=="; + url = "https://registry.npmjs.org/detective-cjs/-/detective-cjs-4.0.0.tgz"; + sha512 = "VsD6Yo1+1xgxJWoeDRyut7eqZ8EWaJI70C5eanSAPcBHzenHZx0uhjxaaEfIm0cHII7dBiwU98Orh44bwXN2jg=="; }; }; - "detective-es6-2.2.0" = { + "detective-es6-3.0.0" = { name = "detective-es6"; packageName = "detective-es6"; - version = "2.2.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective-es6/-/detective-es6-2.2.0.tgz"; - sha512 = "fSpNY0SLER7/sVgQZ1NxJPwmc9uCTzNgdkQDhAaj8NPYwr7Qji9QBcmbNvtMCnuuOGMuKn3O7jv0An+/WRWJZQ=="; + url = "https://registry.npmjs.org/detective-es6/-/detective-es6-3.0.0.tgz"; + sha512 = "Uv2b5Uih7vorYlqGzCX+nTPUb4CMzUAn3VPHTV5p5lBkAN4cAApLGgUz4mZE2sXlBfv4/LMmeP7qzxHV/ZcfWA=="; }; }; "detective-less-1.0.2" = { @@ -3676,49 +3100,58 @@ let sha512 = "Rps1xDkEEBSq3kLdsdnHZL1x2S4NGDcbrjmd4q+PykK5aJwDdP5MBgrJw1Xo+kyUHuv3JEzPqxr+Dj9ryeDRTA=="; }; }; - "detective-postcss-4.0.0" = { + "detective-postcss-6.1.0" = { name = "detective-postcss"; packageName = "detective-postcss"; - version = "4.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective-postcss/-/detective-postcss-4.0.0.tgz"; - sha512 = "Fwc/g9VcrowODIAeKRWZfVA/EufxYL7XfuqJQFroBKGikKX83d2G7NFw6kDlSYGG3LNQIyVa+eWv1mqre+v4+A=="; + url = "https://registry.npmjs.org/detective-postcss/-/detective-postcss-6.1.0.tgz"; + sha512 = "ZFZnEmUrL2XHAC0j/4D1fdwZbo/anAcK84soJh7qc7xfx2Kc8gFO5Bk5I9jU7NLC/OAF1Yho1GLxEDnmQnRH2A=="; }; }; - "detective-sass-3.0.1" = { + "detective-sass-4.0.1" = { name = "detective-sass"; packageName = "detective-sass"; - version = "3.0.1"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/detective-sass/-/detective-sass-3.0.1.tgz"; - sha512 = "oSbrBozRjJ+QFF4WJFbjPQKeakoaY1GiR380NPqwdbWYd5wfl5cLWv0l6LsJVqrgWfFN1bjFqSeo32Nxza8Lbw=="; + url = "https://registry.npmjs.org/detective-sass/-/detective-sass-4.0.1.tgz"; + sha512 = "80zfpxux1krOrkxCHbtwvIs2gNHUBScnSqlGl0FvUuHVz8HD6vD2ov66OroMctyvzhM67fxhuEeVjIk18s6yTQ=="; }; }; - "detective-scss-2.0.1" = { + "detective-scss-3.0.0" = { name = "detective-scss"; packageName = "detective-scss"; - version = "2.0.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective-scss/-/detective-scss-2.0.1.tgz"; - sha512 = "VveyXW4WQE04s05KlJ8K0bG34jtHQVgTc9InspqoQxvnelj/rdgSAy7i2DXAazyQNFKlWSWbS+Ro2DWKFOKTPQ=="; + url = "https://registry.npmjs.org/detective-scss/-/detective-scss-3.0.0.tgz"; + sha512 = "37MB/mhJyS45ngqfzd6eTbuLMoDgdZnH03ZOMW2m9WqJ/Rlbuc8kZAr0Ypovaf1DJiTRzy5mmxzOTja85jbzlA=="; }; }; - "detective-stylus-1.0.0" = { + "detective-stylus-2.0.1" = { name = "detective-stylus"; packageName = "detective-stylus"; - version = "1.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/detective-stylus/-/detective-stylus-1.0.0.tgz"; - sha1 = "50aee7db8babb990381f010c63fabba5b58e54cd"; + url = "https://registry.npmjs.org/detective-stylus/-/detective-stylus-2.0.1.tgz"; + sha512 = "/Tvs1pWLg8eYwwV6kZQY5IslGaYqc/GACxjcaGudiNtN5nKCH6o2WnJK3j0gA3huCnoQcbv8X7oz/c1lnvE3zQ=="; }; }; - "detective-typescript-7.0.0" = { + "detective-typescript-9.0.0" = { name = "detective-typescript"; packageName = "detective-typescript"; - version = "7.0.0"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective-typescript/-/detective-typescript-7.0.0.tgz"; - sha512 = "y/Ev98AleGvl43YKTNcA2Q+lyFmsmCfTTNWy4cjEJxoLkbobcXtRS0Kvx06daCgr2GdtlwLfNzL553BkktfJoA=="; + url = "https://registry.npmjs.org/detective-typescript/-/detective-typescript-9.0.0.tgz"; + sha512 = "lR78AugfUSBojwlSRZBeEqQ1l8LI7rbxOl1qTUnGLcjZQDjZmrZCb7R46rK8U8B5WzFvJrxa7fEBA8FoD/n5fA=="; + }; + }; + "diff-4.0.2" = { + name = "diff"; + packageName = "diff"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"; + sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; }; }; "dir-glob-2.2.2" = { @@ -3757,13 +3190,22 @@ let sha512 = "tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA=="; }; }; - "dotenv-10.0.0" = { + "dot-prop-7.2.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-7.2.0.tgz"; + sha512 = "Ol/IPXUARn9CSbkrdV4VJo7uCy1I3VuSiWCaFSg+8BdUOzF9n3jefIpcgAydvUZbTdEBZs2vEiTiS9m61ssiDA=="; + }; + }; + "dotenv-16.0.3" = { name = "dotenv"; packageName = "dotenv"; - version = "10.0.0"; + version = "16.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz"; - sha512 = "rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q=="; + url = "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz"; + sha512 = "7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ=="; }; }; "download-8.0.0" = { @@ -3784,6 +3226,24 @@ let sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; }; + "eastasianwidth-0.2.0" = { + name = "eastasianwidth"; + packageName = "eastasianwidth"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz"; + sha512 = "I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="; + }; + }; + "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=="; + }; + }; "ee-first-1.1.1" = { name = "ee-first"; packageName = "ee-first"; @@ -3793,15 +3253,6 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.3.866" = { - name = "electron-to-chromium"; - packageName = "electron-to-chromium"; - version = "1.3.866"; - src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.866.tgz"; - sha512 = "iYze6TpDXWxk+sfcpUUdTs6Pv/3kG45Pnjer2DxEeFw0N08bZeNLuz97s2lMgy8yObon48o0WHY2Bkg3xuAPOA=="; - }; - }; "elegant-spinner-1.0.1" = { name = "elegant-spinner"; packageName = "elegant-spinner"; @@ -3811,15 +3262,6 @@ let sha1 = "db043521c95d7e303fd8f345bedc3349cfb0729e"; }; }; - "elf-cam-0.1.1" = { - name = "elf-cam"; - packageName = "elf-cam"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/elf-cam/-/elf-cam-0.1.1.tgz"; - sha512 = "tKSFTWOp5OwJSp6MKyQDX7umYDkvUuI8rxHXw8BuUQ63d9Trj9xLeo6SHyoTGSoZNNZVitFa+RuHHXuoAzN3Rw=="; - }; - }; "emoji-regex-8.0.0" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -3829,6 +3271,15 @@ let sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; }; + "emoji-regex-9.2.2" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "9.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz"; + sha512 = "L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="; + }; + }; "enabled-2.0.0" = { name = "enabled"; packageName = "enabled"; @@ -3856,6 +3307,15 @@ let sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; + "entities-2.2.0" = { + name = "entities"; + packageName = "entities"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; + sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; + }; + }; "env-paths-2.2.1" = { name = "env-paths"; packageName = "env-paths"; @@ -3865,6 +3325,15 @@ let sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; }; }; + "env-paths-3.0.0" = { + name = "env-paths"; + packageName = "env-paths"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz"; + sha512 = "dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A=="; + }; + }; "envinfo-7.8.1" = { name = "envinfo"; packageName = "envinfo"; @@ -3883,22 +3352,31 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "error-stack-parser-2.0.6" = { + "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=="; }; }; - "es-module-lexer-0.9.3" = { + "es-module-lexer-1.0.3" = { name = "es-module-lexer"; packageName = "es-module-lexer"; - version = "0.9.3"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz"; - sha512 = "1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="; + url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.0.3.tgz"; + sha512 = "iC67eXHToclrlVhQfpRawDiF8D8sQxNxmbqw5oebegOaJkyx/w9C/k57/5e6yJR2zIByRt9OXdqX50DV2t6ZKw=="; + }; + }; + "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=="; }; }; "escalade-3.1.1" = { @@ -3919,6 +3397,15 @@ let sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; }; }; + "escape-goat-4.0.0" = { + name = "escape-goat"; + packageName = "escape-goat"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz"; + sha512 = "2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg=="; + }; + }; "escape-html-1.0.3" = { name = "escape-html"; packageName = "escape-html"; @@ -3934,25 +3421,16 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; }; }; - "escape-string-regexp-2.0.0" = { + "escape-string-regexp-5.0.0" = { name = "escape-string-regexp"; packageName = "escape-string-regexp"; - version = "2.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; - sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; - }; - }; - "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=="; + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz"; + sha512 = "/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw=="; }; }; "escodegen-2.0.0" = { @@ -3964,13 +3442,13 @@ let sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; }; }; - "eslint-visitor-keys-2.1.0" = { + "eslint-visitor-keys-3.3.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; - version = "2.1.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; - sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"; + sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; }; }; "esprima-4.0.1" = { @@ -3982,13 +3460,13 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; - "estraverse-5.2.0" = { + "estraverse-5.3.0" = { name = "estraverse"; packageName = "estraverse"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz"; - sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"; + sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; }; }; "estree-walker-0.6.1" = { @@ -4000,15 +3478,6 @@ let sha512 = "SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w=="; }; }; - "estree-walker-1.0.1" = { - name = "estree-walker"; - packageName = "estree-walker"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz"; - sha512 = "1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="; - }; - }; "estree-walker-2.0.2" = { name = "estree-walker"; packageName = "estree-walker"; @@ -4045,15 +3514,6 @@ let sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; }; }; - "execa-4.1.0" = { - name = "execa"; - packageName = "execa"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz"; - sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="; - }; - }; "execa-5.1.1" = { name = "execa"; packageName = "execa"; @@ -4063,6 +3523,15 @@ let sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; }; }; + "execa-6.1.0" = { + name = "execa"; + packageName = "execa"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz"; + sha512 = "QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA=="; + }; + }; "exit-on-epipe-1.0.1" = { name = "exit-on-epipe"; packageName = "exit-on-epipe"; @@ -4081,13 +3550,13 @@ let sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; }; }; - "express-4.17.1" = { + "express-4.18.2" = { name = "express"; packageName = "express"; - version = "4.17.1"; + version = "4.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; - sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; + url = "https://registry.npmjs.org/express/-/express-4.18.2.tgz"; + sha512 = "5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="; }; }; "express-logging-1.1.1" = { @@ -4123,7 +3592,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; - sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + sha512 = "zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug=="; }; }; "extend-shallow-3.0.2" = { @@ -4132,7 +3601,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; - sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + sha512 = "BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q=="; }; }; "external-editor-3.1.0" = { @@ -4153,24 +3622,6 @@ let sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; }; }; - "extract-stack-1.0.0" = { - name = "extract-stack"; - packageName = "extract-stack"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extract-stack/-/extract-stack-1.0.0.tgz"; - sha1 = "b97acaf9441eea2332529624b732fc5a1c8165fa"; - }; - }; - "extract-stack-2.0.0" = { - name = "extract-stack"; - packageName = "extract-stack"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extract-stack/-/extract-stack-2.0.0.tgz"; - sha512 = "AEo4zm+TenK7zQorGK1f9mJ8L14hnTDi2ZQPR+Mub1NX8zimka1mXpV5LpH8x9HoUmFSHZCfLHqWvp0Y4FxxzQ=="; - }; - }; "fast-deep-equal-3.1.3" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; @@ -4189,13 +3640,13 @@ let sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; }; }; - "fast-equals-2.0.3" = { + "fast-equals-3.0.3" = { name = "fast-equals"; packageName = "fast-equals"; - version = "2.0.3"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-equals/-/fast-equals-2.0.3.tgz"; - sha512 = "0EMw4TTUxsMDpDkCg0rXor2gsg+npVrMIHbEhvD0HZyIhUX6AktC/yasm+qKwfyswd06Qy95ZKk8p2crTo0iPA=="; + url = "https://registry.npmjs.org/fast-equals/-/fast-equals-3.0.3.tgz"; + sha512 = "NCe8qxnZFARSHGztGMZOO/PC1qa5MIFB5Hp66WdzbCRAz8U8US3bx1UTgLS49efBQPcUtO9gf5oVEY8o7y/7Kg=="; }; }; "fast-glob-2.2.7" = { @@ -4207,13 +3658,13 @@ let sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; }; }; - "fast-glob-3.2.7" = { + "fast-glob-3.2.12" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.7"; + version = "3.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz"; - sha512 = "rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz"; + sha512 = "DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w=="; }; }; "fast-levenshtein-2.0.6" = { @@ -4261,6 +3712,15 @@ let sha512 = "MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q=="; }; }; + "fetch-blob-3.1.4" = { + name = "fetch-blob"; + packageName = "fetch-blob"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.1.4.tgz"; + sha512 = "Eq5Xv5+VlSrYWEqKrusxY1C3Hm/hjeAsCGVG3ft7pZahlUAChpGZT/Ms1WmSLnEAisEXszjzu/s+ce6HZB2VHA=="; + }; + }; "fetch-node-website-5.0.3" = { name = "fetch-node-website"; packageName = "fetch-node-website"; @@ -4276,7 +3736,7 @@ let version = "1.7.0"; src = fetchurl { url = "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz"; - sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; + sha512 = "UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ=="; }; }; "figures-2.0.0" = { @@ -4285,7 +3745,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; - sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + sha512 = "Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA=="; }; }; "figures-3.2.0" = { @@ -4297,6 +3757,15 @@ let sha512 = "yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg=="; }; }; + "figures-4.0.1" = { + name = "figures"; + packageName = "figures"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-4.0.1.tgz"; + sha512 = "rElJwkA/xS04Vfg+CaZodpso7VqBknOYbzi6I76hI4X80RUjkSxO2oAyPmGbuXUppywjqndOrQDl817hDnI++w=="; + }; + }; "file-size-0.0.5" = { name = "file-size"; packageName = "file-size"; @@ -4321,7 +3790,7 @@ let version = "3.9.0"; src = fetchurl { url = "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"; - sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; + sha512 = "RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA=="; }; }; "file-type-4.4.0" = { @@ -4330,7 +3799,7 @@ let version = "4.4.0"; src = fetchurl { url = "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz"; - sha1 = "1b600e5fca1fbdc6e80c0a70c71c8dba5f7906c5"; + sha512 = "f2UbFQEk7LXgWpi5ntcO86OeA/cC80fuDDDaX/fZ2ZGel+AF7leRQqBBW1eJNiiQkrZlAoM6P+VYP5P6bOlDEQ=="; }; }; "file-type-5.2.0" = { @@ -4339,7 +3808,7 @@ let version = "5.2.0"; src = fetchurl { url = "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz"; - sha1 = "2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"; + sha512 = "Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ=="; }; }; "file-type-6.2.0" = { @@ -4384,7 +3853,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; - sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + sha512 = "VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ=="; }; }; "fill-range-7.0.1" = { @@ -4405,13 +3874,31 @@ let sha512 = "lO3ttPjHZRfjMcxWKb1j1eDhTFsu4meeR3lnMcnBFhk6RuLhvEiuALu2TlfL310ph4lCYYwgF/ElIjdP739tdg=="; }; }; - "finalhandler-1.1.2" = { + "filter-obj-3.0.0" = { + name = "filter-obj"; + packageName = "filter-obj"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filter-obj/-/filter-obj-3.0.0.tgz"; + sha512 = "oQZM+QmVni8MsYzcq9lgTHD/qeLqaG8XaOPOW7dzuSafVxSUlH1+1ZDefj2OD9f2XsmG5lFl2Euc9NI4jgwFWg=="; + }; + }; + "filter-obj-5.1.0" = { + name = "filter-obj"; + packageName = "filter-obj"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filter-obj/-/filter-obj-5.1.0.tgz"; + sha512 = "qWeTREPoT7I0bifpPUXtxkZJ1XJzxWtfoWWkdVGqa+eCr3SHW/Ocp89o8vLvbUuQnadybJpjOKu4V+RwO6sGng=="; + }; + }; + "finalhandler-1.2.0" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; - sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"; + sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; }; }; "find-up-4.1.0" = { @@ -4432,13 +3919,13 @@ let sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; }; }; - "flatten-1.0.3" = { - name = "flatten"; - packageName = "flatten"; - version = "1.0.3"; + "find-up-6.3.0" = { + name = "find-up"; + packageName = "find-up"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz"; - sha512 = "dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg=="; + url = "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz"; + sha512 = "v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw=="; }; }; "flush-write-stream-2.0.0" = { @@ -4468,13 +3955,13 @@ let sha512 = "VjAQdSLsl6AkpZNyrQJfO7BXLo4chnStqb055bumZMbRUPpVuPN3a4ktsnRCmrFZjtMlYLkyXiR5rAs4WOpC4Q=="; }; }; - "follow-redirects-1.14.4" = { + "follow-redirects-1.15.1" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.4"; + version = "1.15.1"; 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.15.1.tgz"; + sha512 = "yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="; }; }; "for-in-1.0.2" = { @@ -4495,6 +3982,24 @@ let sha512 = "RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg=="; }; }; + "form-data-encoder-2.1.3" = { + name = "form-data-encoder"; + packageName = "form-data-encoder"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.3.tgz"; + sha512 = "KqU0nnPMgIJcCOFTNJFEA8epcseEaoox4XZffTgy8jlI6pL/5EFyR54NRG7CnCJN0biY7q52DO3MH6/sJ/TKlQ=="; + }; + }; + "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=="; + }; + }; "forwarded-0.2.0" = { name = "forwarded"; packageName = "forwarded"; @@ -4549,40 +4054,13 @@ let sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; }; }; - "fs-extra-7.0.1" = { + "fs-extra-10.1.0" = { name = "fs-extra"; packageName = "fs-extra"; - version = "7.0.1"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz"; - sha512 = "YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw=="; - }; - }; - "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-extra-9.1.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "9.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz"; - sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; - }; - }; - "fs-minipass-1.2.7" = { - name = "fs-minipass"; - packageName = "fs-minipass"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"; - sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz"; + sha512 = "oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="; }; }; "fs-minipass-2.1.0" = { @@ -4630,31 +4108,22 @@ let sha1 = "4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"; }; }; - "gauge-2.7.4" = { + "gauge-3.0.2" = { name = "gauge"; packageName = "gauge"; - version = "2.7.4"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + url = "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz"; + sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q=="; }; }; - "gensync-1.0.0-beta.2" = { - name = "gensync"; - packageName = "gensync"; - version = "1.0.0-beta.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"; - sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; - }; - }; - "get-amd-module-type-3.0.0" = { + "get-amd-module-type-4.0.0" = { name = "get-amd-module-type"; packageName = "get-amd-module-type"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-amd-module-type/-/get-amd-module-type-3.0.0.tgz"; - sha512 = "99Q7COuACPfVt18zH9N4VAMyb81S6TUgJm2NgV6ERtkh9VIkAaByZkW530wl3lLN5KTtSrK9jVLxYsoP5hQKsw=="; + url = "https://registry.npmjs.org/get-amd-module-type/-/get-amd-module-type-4.0.0.tgz"; + sha512 = "GbBawUCuA2tY8ztiMiVo3e3P95gc2TVrfYFfpUHdHQA8WyxMCckK29bQsVKhYX8SUf+w6JLhL2LG8tSC0ANt9Q=="; }; }; "get-caller-file-2.0.5" = { @@ -4684,13 +4153,22 @@ let sha512 = "g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ=="; }; }; + "get-port-6.1.2" = { + name = "get-port"; + packageName = "get-port"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-port/-/get-port-6.1.2.tgz"; + sha512 = "BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw=="; + }; + }; "get-stream-2.3.1" = { name = "get-stream"; packageName = "get-stream"; version = "2.3.1"; src = fetchurl { url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; - sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + sha512 = "AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA=="; }; }; "get-stream-3.0.0" = { @@ -4699,7 +4177,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; - sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + sha512 = "GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ=="; }; }; "get-stream-4.1.0" = { @@ -4738,13 +4216,13 @@ let sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; }; }; - "gh-release-fetch-2.0.4" = { + "gh-release-fetch-3.0.2" = { name = "gh-release-fetch"; packageName = "gh-release-fetch"; - version = "2.0.4"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-2.0.4.tgz"; - sha512 = "PALrCv6MuxEKsj5Oz9G81iU6pxvoxgpSnwbtIqAkQ6m6fioFicNznZUl/aOW92rK2k8cuaM48Rd59G7eV2QsTA=="; + url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-3.0.2.tgz"; + sha512 = "xcX1uaOVDvsm+io4bvJfBFpQCLfoI3DsFay2GBMUtEnNInbNFFZqxTh7X0WIorCDtOmtos5atp2BGHAGEzmlAg=="; }; }; "git-repo-info-2.1.1" = { @@ -4765,13 +4243,22 @@ let sha512 = "qoerOEliJn3z+Zyn1HW2F6eoYJqKwS6MgC9cztTLUB/xLWX8gD/6T60pKn4+t/d6tP7JlybI7Z3z+I572CR/Vg=="; }; }; - "glob-7.2.0" = { + "glob-7.2.3" = { name = "glob"; packageName = "glob"; - version = "7.2.0"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"; - sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; + url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"; + sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; + }; + }; + "glob-8.0.3" = { + name = "glob"; + packageName = "glob"; + version = "8.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz"; + sha512 = "ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ=="; }; }; "glob-parent-3.1.0" = { @@ -4780,7 +4267,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; - sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + sha512 = "E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA=="; }; }; "glob-parent-5.1.2" = { @@ -4798,7 +4285,16 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz"; - sha1 = "8c5a1494d2066c570cc3bfe4496175acc4d502ab"; + sha512 = "Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig=="; + }; + }; + "glob-to-regexp-0.4.1" = { + name = "glob-to-regexp"; + packageName = "glob-to-regexp"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; + sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; }; }; "global-cache-dir-2.0.0" = { @@ -4819,31 +4315,22 @@ let sha512 = "v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA=="; }; }; - "globals-11.12.0" = { - name = "globals"; - packageName = "globals"; - version = "11.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; - sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; - }; - }; - "globby-10.0.2" = { + "globby-11.1.0" = { name = "globby"; packageName = "globby"; - version = "10.0.2"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz"; - sha512 = "7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg=="; + url = "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"; + sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; - "globby-11.0.4" = { + "globby-13.1.2" = { name = "globby"; packageName = "globby"; - version = "11.0.4"; + version = "13.1.2"; 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-13.1.2.tgz"; + sha512 = "LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ=="; }; }; "globby-9.2.0" = { @@ -4873,6 +4360,15 @@ let sha512 = "aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg=="; }; }; + "got-12.5.2" = { + name = "got"; + packageName = "got"; + version = "12.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-12.5.2.tgz"; + sha512 = "guHGMSEcsA5m1oPRweXUJnug0vuvlkX9wx5hzOka+ZBrBUOJHU0Z1JcNu3QE5IPGnA5aXUsQHdWOD4eJg9/v3A=="; + }; + }; "got-8.3.2" = { name = "got"; packageName = "got"; @@ -4891,13 +4387,22 @@ let sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; }; }; - "graceful-fs-4.2.8" = { + "graceful-fs-4.2.10" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.8"; + version = "4.2.10"; 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.10.tgz"; + sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; + }; + }; + "graphql-16.5.0" = { + name = "graphql"; + packageName = "graphql"; + version = "16.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql/-/graphql-16.5.0.tgz"; + sha512 = "qbHgh8Ix+j/qY+a/ZcJnFQ+j8ezakqPiHwPiZhV/3PgGlgf96QMBB5/f2rkiC9sgLoy/xvT6TSiaf2nTHJh5iA=="; }; }; "has-1.0.3" = { @@ -4915,7 +4420,7 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz"; - sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e"; + sha512 = "1YsTg1fk2/6JToQhtZkArMkurq8UoWU1Qe0aR3VUHjgij4nOylSWLWAtBXoZ4/dXOmugfLGm1c+QhuD0JyedFA=="; }; }; "has-ansi-2.0.0" = { @@ -4924,16 +4429,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - }; - "has-flag-2.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; - sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; + sha512 = "C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg=="; }; }; "has-flag-3.0.0" = { @@ -4942,7 +4438,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; }; }; "has-flag-4.0.0" = { @@ -4972,13 +4468,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" = { @@ -4996,7 +4492,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; }; }; "has-value-0.3.1" = { @@ -5005,7 +4501,7 @@ let version = "0.3.1"; src = fetchurl { url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; - sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + sha512 = "gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q=="; }; }; "has-value-1.0.0" = { @@ -5014,7 +4510,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; - sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + sha512 = "IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw=="; }; }; "has-values-0.1.4" = { @@ -5023,7 +4519,7 @@ let version = "0.1.4"; src = fetchurl { url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; - sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + sha512 = "J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ=="; }; }; "has-values-1.0.0" = { @@ -5032,7 +4528,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; - sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + sha512 = "ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ=="; }; }; "has-yarn-2.1.0" = { @@ -5044,6 +4540,15 @@ let sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; }; }; + "has-yarn-3.0.0" = { + name = "has-yarn"; + packageName = "has-yarn"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-yarn/-/has-yarn-3.0.0.tgz"; + sha512 = "IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA=="; + }; + }; "hasbin-1.2.3" = { name = "hasbin"; packageName = "hasbin"; @@ -5071,6 +4576,15 @@ let sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="; }; }; + "hosted-git-info-4.1.0" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz"; + sha512 = "kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="; + }; + }; "http-cache-semantics-3.8.1" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; @@ -5089,40 +4603,22 @@ let sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; }; }; - "http-call-5.3.0" = { - name = "http-call"; - packageName = "http-call"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-call/-/http-call-5.3.0.tgz"; - sha512 = "ahwimsC23ICE4kPl9xTBjKB4inbRaeLyZeRunC/1Jy/Z6X8tv22MEAjK+KBOMSVLaqXPTTmd8638waVIKLGx2w=="; - }; - }; - "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-errors-1.7.3" = { + "http-errors-2.0.0" = { name = "http-errors"; packageName = "http-errors"; - version = "1.7.3"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"; - sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; - }; - }; - "http-errors-1.8.0" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.0.tgz"; - sha512 = "4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A=="; + url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"; + sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; }; }; "http-proxy-1.18.1" = { @@ -5134,31 +4630,31 @@ let sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; }; }; - "http-proxy-middleware-1.3.1" = { + "http-proxy-middleware-2.0.6" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; - version = "1.3.1"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz"; - sha512 = "13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg=="; + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz"; + sha512 = "ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw=="; }; }; - "https-proxy-agent-5.0.0" = { + "http2-wrapper-2.1.11" = { + name = "http2-wrapper"; + packageName = "http2-wrapper"; + version = "2.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.1.11.tgz"; + sha512 = "aNAk5JzLturWEUiuhAN73Jcbq96R7rTitAoXV54FYMatvihnpD2+6PUgU4ce3D/m5VDbw+F5CsyKSF176ptitQ=="; + }; + }; + "https-proxy-agent-5.0.1" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; - }; - }; - "human-signals-1.1.1" = { - name = "human-signals"; - packageName = "human-signals"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz"; - sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; + sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; }; "human-signals-2.1.0" = { @@ -5170,13 +4666,13 @@ let sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; }; }; - "hyperlinker-1.0.0" = { - name = "hyperlinker"; - packageName = "hyperlinker"; - version = "1.0.0"; + "human-signals-3.0.1" = { + name = "human-signals"; + packageName = "human-signals"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/hyperlinker/-/hyperlinker-1.0.0.tgz"; - sha512 = "Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ=="; + url = "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz"; + sha512 = "rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ=="; }; }; "iconv-lite-0.4.24" = { @@ -5206,22 +4702,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=="; - }; - }; - "ignore-walk-3.0.4" = { - name = "ignore-walk"; - packageName = "ignore-walk"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz"; - sha512 = "PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"; + sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; }; }; "import-lazy-2.1.0" = { @@ -5233,6 +4720,15 @@ let sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; }; }; + "import-lazy-4.0.0" = { + name = "import-lazy"; + packageName = "import-lazy"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz"; + sha512 = "rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw=="; + }; + }; "imurmurhash-0.1.4" = { name = "imurmurhash"; packageName = "imurmurhash"; @@ -5248,7 +4744,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz"; - sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; + sha512 = "BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ=="; }; }; "indent-string-4.0.0" = { @@ -5260,13 +4756,13 @@ let sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; }; }; - "indexes-of-1.0.1" = { - name = "indexes-of"; - packageName = "indexes-of"; - version = "1.0.1"; + "indent-string-5.0.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz"; - sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607"; + url = "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz"; + sha512 = "m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg=="; }; }; "inflight-1.0.6" = { @@ -5278,15 +4774,6 @@ let 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"; @@ -5356,7 +4843,7 @@ let version = "0.1.6"; src = fetchurl { url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; - sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + sha512 = "e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A=="; }; }; "is-accessor-descriptor-1.0.0" = { @@ -5374,7 +4861,7 @@ let version = "0.2.1"; src = fetchurl { url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="; }; }; "is-arrayish-0.3.2" = { @@ -5422,13 +4909,22 @@ let sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; }; }; - "is-core-module-2.7.0" = { + "is-ci-3.0.1" = { + name = "is-ci"; + packageName = "is-ci"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz"; + sha512 = "ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ=="; + }; + }; + "is-core-module-2.9.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.7.0"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.7.0.tgz"; - sha512 = "ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz"; + sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A=="; }; }; "is-data-descriptor-0.1.4" = { @@ -5437,7 +4933,7 @@ let version = "0.1.4"; src = fetchurl { url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; - sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + sha512 = "+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg=="; }; }; "is-data-descriptor-1.0.0" = { @@ -5482,7 +4978,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; - sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + sha512 = "5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="; }; }; "is-extendable-1.0.1" = { @@ -5509,7 +5005,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + sha512 = "1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw=="; }; }; "is-fullwidth-code-point-2.0.0" = { @@ -5518,7 +5014,7 @@ let 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"; + sha512 = "VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="; }; }; "is-fullwidth-code-point-3.0.0" = { @@ -5530,13 +5026,22 @@ let sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; }; + "is-fullwidth-code-point-4.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz"; + sha512 = "O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ=="; + }; + }; "is-glob-3.1.0" = { name = "is-glob"; packageName = "is-glob"; version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; - sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + sha512 = "UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw=="; }; }; "is-glob-4.0.3" = { @@ -5566,15 +5071,6 @@ let sha512 = "2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="; }; }; - "is-module-1.0.0" = { - name = "is-module"; - packageName = "is-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz"; - sha1 = "3258fb69f78c14d5b815d664336b4cffb6441591"; - }; - }; "is-natural-number-4.0.1" = { name = "is-natural-number"; packageName = "is-natural-number"; @@ -5593,13 +5089,22 @@ let sha512 = "WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA=="; }; }; + "is-npm-6.0.0" = { + name = "is-npm"; + packageName = "is-npm"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-npm/-/is-npm-6.0.0.tgz"; + sha512 = "JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ=="; + }; + }; "is-number-3.0.0" = { name = "is-number"; packageName = "is-number"; version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; - sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + sha512 = "4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg=="; }; }; "is-number-7.0.0" = { @@ -5647,6 +5152,15 @@ let sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="; }; }; + "is-path-cwd-3.0.0" = { + name = "is-path-cwd"; + packageName = "is-path-cwd"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-3.0.0.tgz"; + sha512 = "kyiNFFLU0Ampr6SDZitD/DwUo4Zs1nSdnygUBqsu3LooL00Qvb5j+UnvApUn/TTj1J3OuE6BTdQ5rudKmU2ZaA=="; + }; + }; "is-path-inside-3.0.3" = { name = "is-path-inside"; packageName = "is-path-inside"; @@ -5656,13 +5170,22 @@ let sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; }; }; + "is-path-inside-4.0.0" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz"; + sha512 = "lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA=="; + }; + }; "is-plain-obj-1.1.0" = { name = "is-plain-obj"; packageName = "is-plain-obj"; version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; - sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + sha512 = "yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg=="; }; }; "is-plain-obj-2.1.0" = { @@ -5683,6 +5206,15 @@ let sha512 = "gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="; }; }; + "is-plain-obj-4.1.0" = { + name = "is-plain-obj"; + packageName = "is-plain-obj"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz"; + sha512 = "+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg=="; + }; + }; "is-plain-object-2.0.4" = { name = "is-plain-object"; packageName = "is-plain-object"; @@ -5710,15 +5242,6 @@ let sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; }; }; - "is-reference-1.2.1" = { - name = "is-reference"; - packageName = "is-reference"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz"; - sha512 = "U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ=="; - }; - }; "is-retry-allowed-1.2.0" = { name = "is-retry-allowed"; packageName = "is-retry-allowed"; @@ -5734,7 +5257,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + sha512 = "uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="; }; }; "is-stream-2.0.1" = { @@ -5746,6 +5269,15 @@ let sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; }; }; + "is-stream-3.0.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz"; + sha512 = "LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA=="; + }; + }; "is-typedarray-1.0.0" = { name = "is-typedarray"; packageName = "is-typedarray"; @@ -5764,6 +5296,24 @@ let sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; }; }; + "is-unicode-supported-1.2.0" = { + name = "is-unicode-supported"; + packageName = "is-unicode-supported"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz"; + sha512 = "wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ=="; + }; + }; + "is-unicode-supported-1.3.0" = { + name = "is-unicode-supported"; + packageName = "is-unicode-supported"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz"; + sha512 = "43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ=="; + }; + }; "is-url-1.2.4" = { name = "is-url"; packageName = "is-url"; @@ -5773,6 +5323,15 @@ let sha512 = "ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="; }; }; + "is-url-superb-4.0.0" = { + name = "is-url-superb"; + packageName = "is-url-superb"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-url-superb/-/is-url-superb-4.0.0.tgz"; + sha512 = "GI+WjezhPPcbM+tqE9LnmsY5qqjwHzTvjJ36wxYX5ujNXefSUJ/T17r5bqDV8yLhcgB59KTPNOc9O9cmHTPWsA=="; + }; + }; "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; @@ -5788,7 +5347,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz"; - sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; + sha512 = "gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw=="; }; }; "is-wsl-2.2.0" = { @@ -5809,13 +5368,22 @@ let sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; }; }; + "is-yarn-global-0.4.0" = { + name = "is-yarn-global"; + packageName = "is-yarn-global"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.4.0.tgz"; + sha512 = "HneQBCrXGBy15QnaDfcn6OLoU8AQPAa0Qn0IeJR/QCo4E8dNZaGGwxpCwWyEBQC5QvFonP8d6t60iGpAHVAfNA=="; + }; + }; "isarray-1.0.0" = { name = "isarray"; packageName = "isarray"; version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; }; "iserror-0.0.2" = { @@ -5842,7 +5410,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; - sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + sha512 = "+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA=="; }; }; "isobject-3.0.1" = { @@ -5851,7 +5419,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; - sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + sha512 = "WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="; }; }; "isurl-1.0.0" = { @@ -5872,13 +5440,13 @@ let sha512 = "DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig=="; }; }; - "jest-get-type-26.3.0" = { + "jest-get-type-27.5.1" = { name = "jest-get-type"; packageName = "jest-get-type"; - version = "26.3.0"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz"; - sha512 = "TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="; + url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz"; + sha512 = "2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="; }; }; "jest-validate-25.5.0" = { @@ -5890,22 +5458,13 @@ let sha512 = "okUFKqhZIpo3jDdtUXUZ2LxGUZJIlfdYBvZb1aczzxrlyMlqdnnws9MOxezoLGhSaFc2XYaHNReNQfj5zPIWyQ=="; }; }; - "jest-validate-26.6.2" = { + "jest-validate-27.5.1" = { name = "jest-validate"; packageName = "jest-validate"; - version = "26.6.2"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz"; - sha512 = "NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ=="; - }; - }; - "jest-worker-26.6.2" = { - name = "jest-worker"; - packageName = "jest-worker"; - version = "26.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz"; - sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz"; + sha512 = "thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ=="; }; }; "js-string-escape-1.0.1" = { @@ -5926,15 +5485,6 @@ let sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; - "js-yaml-3.14.1" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"; - sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; - }; - }; "js-yaml-4.1.0" = { name = "js-yaml"; packageName = "js-yaml"; @@ -5944,31 +5494,13 @@ let sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; }; }; - "jsesc-0.5.0" = { - name = "jsesc"; - packageName = "jsesc"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"; - sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; - }; - }; - "jsesc-2.5.2" = { - name = "jsesc"; - packageName = "jsesc"; - version = "2.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; - sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; - }; - }; "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"; + sha512 = "CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ=="; }; }; "json-buffer-3.0.1" = { @@ -5980,15 +5512,6 @@ let sha512 = "4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="; }; }; - "json-parse-better-errors-1.0.2" = { - name = "json-parse-better-errors"; - packageName = "json-parse-better-errors"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; - sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; - }; - }; "json-parse-even-better-errors-2.3.1" = { name = "json-parse-even-better-errors"; packageName = "json-parse-even-better-errors"; @@ -6007,24 +5530,6 @@ let sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; }; }; - "json5-2.2.0" = { - name = "json5"; - packageName = "json5"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz"; - sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; - }; - }; - "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"; @@ -6034,6 +5539,15 @@ let sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; }; }; + "jsonwebtoken-8.5.1" = { + name = "jsonwebtoken"; + packageName = "jsonwebtoken"; + version = "8.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz"; + sha512 = "XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w=="; + }; + }; "junk-3.1.0" = { name = "junk"; packageName = "junk"; @@ -6043,6 +5557,33 @@ 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=="; + }; + }; + "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=="; + }; + }; "jwt-decode-3.1.2" = { name = "jwt-decode"; packageName = "jwt-decode"; @@ -6052,13 +5593,13 @@ let sha512 = "UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="; }; }; - "keep-func-props-3.0.1" = { + "keep-func-props-4.0.1" = { name = "keep-func-props"; packageName = "keep-func-props"; - version = "3.0.1"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/keep-func-props/-/keep-func-props-3.0.1.tgz"; - sha512 = "5AsrYCiCHIUxuw/G2r7xcoTW/NTf5IFwAe1fkwf2ifM/KZzEojaTylh1Pppu60oEixww1rfcWJaRGLi3eAJsrQ=="; + url = "https://registry.npmjs.org/keep-func-props/-/keep-func-props-4.0.1.tgz"; + sha512 = "87ftOIICfdww3SxR5P1veq3ThBNyRPG0JGL//oaR08v0k2yTicEIHd7s0GqSJfQvlb+ybC3GiDepOweo0LDhvw=="; }; }; "keyv-3.0.0" = { @@ -6079,13 +5620,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.0.3" = { + "keyv-4.5.0" = { name = "keyv"; packageName = "keyv"; - version = "4.0.3"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz"; - sha512 = "zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.5.0.tgz"; + sha512 = "2YvuMsA+jnFGtBareKqgANOEKe1mk3HKiXu2fRmAfyxG0MJAywNhi5ttWA3PMjl4NmpyjZNbFifR2vNjW1znfA=="; }; }; "kind-of-3.2.2" = { @@ -6094,7 +5635,7 @@ let version = "3.2.2"; src = fetchurl { url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; - sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + sha512 = "NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="; }; }; "kind-of-4.0.0" = { @@ -6103,7 +5644,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; - sha1 = "20813df3d712928b207378691a45066fae72dd57"; + sha512 = "24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw=="; }; }; "kind-of-5.1.0" = { @@ -6133,13 +5674,13 @@ let sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; }; }; - "lambda-local-2.0.0" = { + "lambda-local-2.0.3" = { name = "lambda-local"; packageName = "lambda-local"; - version = "2.0.0"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/lambda-local/-/lambda-local-2.0.0.tgz"; - sha512 = "5Z7ZEhqVYJSm3djoq7QLDkEk7Ao+jNYbARo3nk3wtjKpgCnEbzOuraxDPDWg7OlZ4JKcsRDP+wNLeORMdbF2ow=="; + url = "https://registry.npmjs.org/lambda-local/-/lambda-local-2.0.3.tgz"; + sha512 = "Vs55gujwdjhPL2VpXEXAWWwxiOYdnVPDsMgwOr9BqC0O1EoSXs1S8TKBmD/ySEnPVRiQfFlABcQgcykF1mkE8Q=="; }; }; "latest-version-5.1.0" = { @@ -6151,13 +5692,22 @@ let sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; }; }; - "lazystream-1.0.0" = { + "latest-version-7.0.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-7.0.0.tgz"; + sha512 = "KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg=="; + }; + }; + "lazystream-1.0.1" = { name = "lazystream"; packageName = "lazystream"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz"; - sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; + url = "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz"; + sha512 = "b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw=="; }; }; "leven-3.1.0" = { @@ -6175,16 +5725,16 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; - sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="; }; }; - "lines-and-columns-1.1.6" = { + "lines-and-columns-1.2.4" = { name = "lines-and-columns"; packageName = "lines-and-columns"; - version = "1.1.6"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; - sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; + sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; }; }; "listr-0.14.3" = { @@ -6223,15 +5773,6 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; - "load-json-file-5.3.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz"; - sha512 = "cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw=="; - }; - }; "locate-path-5.0.0" = { name = "locate-path"; packageName = "locate-path"; @@ -6250,6 +5791,15 @@ let sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; }; }; + "locate-path-7.1.1" = { + name = "locate-path"; + packageName = "locate-path"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-7.1.1.tgz"; + sha512 = "vJXaRMJgRVD3+cUZs3Mncj2mxpt5mP0EmNOsxRSZRMlbqjvxzDEOIUWXGmavo0ZC9+tNZCBLQ66reA11nbpHZg=="; + }; + }; "lodash-4.17.21" = { name = "lodash"; packageName = "lodash"; @@ -6259,31 +5809,13 @@ let sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; }; - "lodash._reinterpolate-3.0.0" = { - name = "lodash._reinterpolate"; - packageName = "lodash._reinterpolate"; - version = "3.0.0"; + "lodash-es-4.17.21" = { + name = "lodash-es"; + packageName = "lodash-es"; + version = "4.17.21"; src = fetchurl { - url = "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"; - sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; - }; - }; - "lodash.camelcase-4.3.0" = { - name = "lodash.camelcase"; - packageName = "lodash.camelcase"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; - sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; - }; - }; - "lodash.debounce-4.0.8" = { - name = "lodash.debounce"; - packageName = "lodash.debounce"; - version = "4.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + url = "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz"; + sha512 = "mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="; }; }; "lodash.deburr-4.1.0" = { @@ -6322,6 +5854,24 @@ let sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; }; }; + "lodash.includes-4.3.0" = { + name = "lodash.includes"; + packageName = "lodash.includes"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz"; + sha1 = "60bb98a87cb923c68ca1e51325483314849f553f"; + }; + }; + "lodash.isboolean-3.0.3" = { + name = "lodash.isboolean"; + packageName = "lodash.isboolean"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz"; + sha1 = "6c2e171db2a257cd96802fd43b01b20d5f5870f6"; + }; + }; "lodash.isempty-4.4.0" = { name = "lodash.isempty"; packageName = "lodash.isempty"; @@ -6331,6 +5881,24 @@ let sha1 = "6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"; }; }; + "lodash.isinteger-4.0.4" = { + name = "lodash.isinteger"; + packageName = "lodash.isinteger"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz"; + sha1 = "619c0af3d03f8b04c31f5882840b77b11cd68343"; + }; + }; + "lodash.isnumber-3.0.3" = { + name = "lodash.isnumber"; + packageName = "lodash.isnumber"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz"; + sha1 = "3ce76810c5928d03352301ac287317f11c0b1ffc"; + }; + }; "lodash.isplainobject-4.0.6" = { name = "lodash.isplainobject"; packageName = "lodash.isplainobject"; @@ -6340,22 +5908,22 @@ let sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; }; }; - "lodash.template-4.5.0" = { - name = "lodash.template"; - packageName = "lodash.template"; - version = "4.5.0"; + "lodash.isstring-4.0.1" = { + name = "lodash.isstring"; + packageName = "lodash.isstring"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz"; - sha512 = "84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A=="; + url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; + sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; }; }; - "lodash.templatesettings-4.2.0" = { - name = "lodash.templatesettings"; - packageName = "lodash.templatesettings"; - version = "4.2.0"; + "lodash.once-4.1.1" = { + name = "lodash.once"; + packageName = "lodash.once"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz"; - sha512 = "stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ=="; + url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"; + sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac"; }; }; "lodash.transform-4.6.0" = { @@ -6376,13 +5944,13 @@ let sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; }; }; - "log-process-errors-6.3.0" = { + "log-process-errors-8.0.0" = { name = "log-process-errors"; packageName = "log-process-errors"; - version = "6.3.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/log-process-errors/-/log-process-errors-6.3.0.tgz"; - sha512 = "dHwGgWFuz9LUDoLIG7E0SlDurosfZEpgNLJMPzNL9GPdyh4Wdm5RJlQbuqy3Pj2wOcbDzykeTCBEqyrwriqPnA=="; + url = "https://registry.npmjs.org/log-process-errors/-/log-process-errors-8.0.0.tgz"; + sha512 = "+SNGqNC1gCMJfhwYzAHr/YgNT/ZJc+V2nCkvtPnjrENMeCe+B/jgShBW0lmWoh6uVV2edFAPc/IUOkDdsjTbTg=="; }; }; "log-symbols-1.0.2" = { @@ -6391,7 +5959,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"; - sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; + sha512 = "mmPrW0Fh2fxOzdBbFv4g1m6pR72haFLPJ2G5SJEELf1y+iaQrDG6cWCPjy54RHYbZAt7X+ls690Kw62AdWXBzQ=="; }; }; "log-symbols-4.1.0" = { @@ -6409,16 +5977,25 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz"; - sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; + sha512 = "vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg=="; }; }; - "logform-2.3.0" = { + "log-update-5.0.1" = { + name = "log-update"; + packageName = "log-update"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-5.0.1.tgz"; + sha512 = "5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw=="; + }; + }; + "logform-2.4.0" = { name = "logform"; packageName = "logform"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.3.0.tgz"; - sha512 = "graeoWUH2knKbGthMtuG1EfaSPMZFZBIrhuJHhkS5ZseFBrc7DupCzihOQAzsK/qIKPQaPJ/lFQFctILUY5ARQ=="; + url = "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz"; + sha512 = "CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw=="; }; }; "lowercase-keys-1.0.0" = { @@ -6427,7 +6004,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; - sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; + sha512 = "RPlX0+PHuvxVDZ7xX+EBVAp4RsVxP/TdDSN2mJYdiq1Lc4Hz7EUSjUI7RZrKKlmrIzVhf6Jo2stj7++gVarS0A=="; }; }; "lowercase-keys-1.0.1" = { @@ -6448,6 +6025,15 @@ let sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; }; }; + "lowercase-keys-3.0.0" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz"; + sha512 = "ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ=="; + }; + }; "lru-cache-6.0.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -6457,22 +6043,22 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; - "macos-release-2.5.0" = { - name = "macos-release"; - packageName = "macos-release"; - version = "2.5.0"; + "luxon-3.0.1" = { + name = "luxon"; + packageName = "luxon"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/macos-release/-/macos-release-2.5.0.tgz"; - sha512 = "EIgv+QZ9r+814gjJj0Bt5vSLJLzswGmSUbUpbi9AIr/fsN2IWFBl2NucV9PAiek+U1STK468tEkxmVYUtuAN3g=="; + url = "https://registry.npmjs.org/luxon/-/luxon-3.0.1.tgz"; + sha512 = "hF3kv0e5gwHQZKz4wtm4c+inDtyc7elkanAsBq+fundaCdUBNJB1dHEGUZIM6SfSBUlbVFduPwEtNjFK8wLtcw=="; }; }; - "magic-string-0.25.7" = { - name = "magic-string"; - packageName = "magic-string"; - version = "0.25.7"; + "macos-release-3.0.1" = { + name = "macos-release"; + packageName = "macos-release"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz"; - sha512 = "4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA=="; + url = "https://registry.npmjs.org/macos-release/-/macos-release-3.0.1.tgz"; + sha512 = "3l6OrhdDg2H2SigtuN3jBh+5dRJRWxNKuJTPBbGeNJTsmt/pj9PO25wYaNb05NuNmAsl435j4rDP6rgNXz7s7g=="; }; }; "make-dir-1.3.0" = { @@ -6502,6 +6088,15 @@ let sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; }; + "make-error-1.3.6" = { + name = "make-error"; + packageName = "make-error"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"; + sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; + }; + }; "map-cache-0.2.2" = { name = "map-cache"; packageName = "map-cache"; @@ -6511,13 +6106,13 @@ let sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; }; }; - "map-obj-4.3.0" = { + "map-obj-5.0.2" = { name = "map-obj"; packageName = "map-obj"; - version = "4.3.0"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz"; - sha512 = "hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ=="; + url = "https://registry.npmjs.org/map-obj/-/map-obj-5.0.2.tgz"; + sha512 = "K6K2NgKnTXimT3779/4KxSvobxOtMmx1LBZ3NwRxT/MDIR3Br/fQ4Q+WCX5QxjyUR8zg5+RV9Tbf2c5pAWTD2A=="; }; }; "map-visit-1.0.0" = { @@ -6565,13 +6160,13 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; - "memoize-one-5.2.1" = { + "memoize-one-6.0.0" = { name = "memoize-one"; packageName = "memoize-one"; - version = "5.2.1"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz"; - sha512 = "zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="; + url = "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz"; + sha512 = "rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="; }; }; "merge-descriptors-1.0.1" = { @@ -6628,13 +6223,13 @@ let sha512 = "y0y6CUB9RLVsy3kfgayU28746QrNMpSm9O/AYGNsBgOkJr/X/Jk0VLGoO8Ude7Bpa8adywzF+MzXNZRFRsNPhg=="; }; }; - "micro-memoize-4.0.9" = { + "micro-memoize-4.0.11" = { name = "micro-memoize"; packageName = "micro-memoize"; - version = "4.0.9"; + version = "4.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/micro-memoize/-/micro-memoize-4.0.9.tgz"; - sha512 = "Z2uZi/IUMGQDCXASdujXRqrXXEwSY0XffUrAOllhqzQI3wpUyZbiZTiE2JuYC0HSG2G7DbCS5jZmsEKEGZuemg=="; + url = "https://registry.npmjs.org/micro-memoize/-/micro-memoize-4.0.11.tgz"; + sha512 = "CjxsaYe4j43df32DtzzNCwanPqZjZDwuQAZilsCYpa2ZVtSPDjHXbTlR4gsEZRyO9/twHs0b7HLjvy/sowl7sA=="; }; }; "micromatch-3.1.10" = { @@ -6646,13 +6241,13 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; - "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=="; }; }; "mime-1.6.0" = { @@ -6664,22 +6259,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.50.0" = { + "mime-db-1.51.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.50.0"; + version = "1.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz"; - sha512 = "9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"; + sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; }; - "mime-types-2.1.33" = { + "mime-types-2.1.34" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.33"; + version = "2.1.34"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz"; - sha512 = "plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"; + sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; }; }; "mimic-fn-1.2.0" = { @@ -6700,13 +6295,13 @@ let sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; }; - "mimic-fn-3.1.0" = { + "mimic-fn-4.0.0" = { name = "mimic-fn"; packageName = "mimic-fn"; - version = "3.1.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz"; - sha512 = "Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ=="; + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz"; + sha512 = "vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw=="; }; }; "mimic-response-1.0.1" = { @@ -6727,49 +6322,58 @@ let sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; }; }; - "minimatch-3.0.4" = { + "mimic-response-3.1.0" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz"; + sha512 = "z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="; + }; + }; + "mimic-response-4.0.0" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz"; + sha512 = "e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg=="; + }; + }; + "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-5.1.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz"; + sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="; + }; + }; + "minimist-1.2.7" = { name = "minimist"; packageName = "minimist"; - version = "1.2.5"; + version = "1.2.7"; 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.7.tgz"; + sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; }; }; - "minipass-2.9.0" = { + "minipass-3.3.4" = { name = "minipass"; packageName = "minipass"; - version = "2.9.0"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz"; - sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; - }; - }; - "minipass-3.1.5" = { - name = "minipass"; - packageName = "minipass"; - version = "3.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz"; - sha512 = "+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw=="; - }; - }; - "minizlib-1.3.3" = { - name = "minizlib"; - packageName = "minizlib"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz"; - sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz"; + sha512 = "I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw=="; }; }; "minizlib-2.1.2" = { @@ -6790,13 +6394,13 @@ let sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; }; }; - "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" = { @@ -6808,31 +6412,31 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "module-definition-3.3.1" = { + "module-definition-4.0.0" = { name = "module-definition"; packageName = "module-definition"; - version = "3.3.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/module-definition/-/module-definition-3.3.1.tgz"; - sha512 = "kLidGPwQ2yq484nSD+D3JoJp4Etc0Ox9P0L34Pu/cU4X4HcG7k7p62XI5BBuvURWMRX3RPyuhOcBHbKus+UH4A=="; + url = "https://registry.npmjs.org/module-definition/-/module-definition-4.0.0.tgz"; + sha512 = "wntiAHV4lDn24BQn2kX6LKq0y85phHLHiv3aOPDF+lIs06kVjEMTe/ZTdrbVLnQV5FQsjik21taknvMhKY1Cug=="; }; }; - "moize-6.1.0" = { + "moize-6.1.3" = { name = "moize"; packageName = "moize"; - version = "6.1.0"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/moize/-/moize-6.1.0.tgz"; - sha512 = "WrMcM+C2Jy+qyOC/UMhA3BCHGowxV34dhDZnDNfxsREW/8N+33SFjmc23Q61Xv1WUthUA1vYopTitP1sZ5jkeg=="; + url = "https://registry.npmjs.org/moize/-/moize-6.1.3.tgz"; + sha512 = "Cn+1T5Ypieeo46fn8X98V2gHj2VSRohVPjvT8BRvNANJJC3UOeege/G84xA/3S9c5qA4p9jOdSB1jfhumwe8qw=="; }; }; - "move-file-2.1.0" = { + "move-file-3.0.0" = { name = "move-file"; packageName = "move-file"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/move-file/-/move-file-2.1.0.tgz"; - sha512 = "i9qLW6gqboJ5Ht8bauZi7KlTnQ3QFpBCvMvFfEcHADKgHGeJ9BZMO7SFCTwHPV9Qa0du9DYY1Yx3oqlGt30nXA=="; + url = "https://registry.npmjs.org/move-file/-/move-file-3.0.0.tgz"; + sha512 = "v6u4XjX3MFW6Jo1V/YfbhC7eiGSgvYPJ/NM+aGtTtB9/Y6IYj7YViaHu6dkgDsZFB7MbnAoSI5+Z26XZXnP0vg=="; }; }; "ms-2.0.0" = { @@ -6841,16 +6445,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - 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=="; + sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; }; }; "ms-2.1.2" = { @@ -6871,13 +6466,13 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "multiparty-4.2.2" = { + "multiparty-4.2.3" = { name = "multiparty"; packageName = "multiparty"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/multiparty/-/multiparty-4.2.2.tgz"; - sha512 = "NtZLjlvsjcoGrzojtwQwn/Tm90aWJ6XXtPppYF4WmOk/6ncdwMMKggFY2NlRRN9yiCEIVxpOfPWahVEG2HAG8Q=="; + url = "https://registry.npmjs.org/multiparty/-/multiparty-4.2.3.tgz"; + sha512 = "Ak6EUJZuhGS8hJ3c2fY6UW5MbkGUPMBEGd13djUzoY/BHqV/gTuFWtC6IuVA7A2+v3yjBS6c4or50xhzTQZImQ=="; }; }; "mute-stream-0.0.7" = { @@ -6889,13 +6484,13 @@ let sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; }; }; - "nanoid-3.1.29" = { + "nanoid-3.3.4" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.29"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.29.tgz"; - sha512 = "dW2pUSGZ8ZnCFIlBIA31SV8huOGCHb6OwzVCc7A69rb/a+SgPBwfmLvK5TKQ3INPbRkcI8a/Owo0XbiTNH19wg=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"; + sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="; }; }; "nanomatch-1.2.13" = { @@ -6907,130 +6502,130 @@ let sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; }; - "natural-orderby-2.0.3" = { - name = "natural-orderby"; - packageName = "natural-orderby"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/natural-orderby/-/natural-orderby-2.0.3.tgz"; - sha512 = "p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q=="; - }; - }; - "needle-2.9.1" = { - name = "needle"; - packageName = "needle"; - version = "2.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz"; - 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=="; }; }; - "nested-error-stacks-2.1.0" = { + "nested-error-stacks-2.1.1" = { name = "nested-error-stacks"; packageName = "nested-error-stacks"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz"; - sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; + url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.1.tgz"; + sha512 = "9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw=="; }; }; - "netlify-8.0.1" = { + "netlify-13.0.2" = { name = "netlify"; packageName = "netlify"; - version = "8.0.1"; + version = "13.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-8.0.1.tgz"; - sha512 = "bAUay/JDmUdmFSfW6BQuUGHuj498ALr/aS4Se3Juhgv1N0q1Whrp1uwGlkIgatrlP0lLL/zkTWc6hxmG1TqQcQ=="; + url = "https://registry.npmjs.org/netlify/-/netlify-13.0.2.tgz"; + sha512 = "n3Wap1GA2r5UQ4a5nZkcF/lEJXYbLcsqkXA5rYbeygWb7PCYFxb55OI/7EBvIHFTBjtF8OXBOCP3XomuHlqQWw=="; }; }; - "netlify-headers-parser-4.0.1" = { + "netlify-headers-parser-7.0.2" = { name = "netlify-headers-parser"; packageName = "netlify-headers-parser"; - version = "4.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-headers-parser/-/netlify-headers-parser-4.0.1.tgz"; - sha512 = "Wq1ZKXLv8xnTmzWhjbkFnzIAAmas7GhtrFJXCeMfEoeGthuSekcEz+IMfpSDjhL/X3Ls5YIk9SuNUf/5/+TlEQ=="; + url = "https://registry.npmjs.org/netlify-headers-parser/-/netlify-headers-parser-7.0.2.tgz"; + sha512 = "A4OvRo29SYCxjEXiFJKylURD6rhqc3Abs1HcZ5P/2j0aT8ayEZN0qX5VHadew/wzzYzq2ooyxQatE3tTGZrp2Q=="; }; }; - "netlify-redirect-parser-11.0.2" = { + "netlify-onegraph-internal-0.10.1" = { + name = "netlify-onegraph-internal"; + packageName = "netlify-onegraph-internal"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.10.1.tgz"; + sha512 = "lGHBUfILWoMO2iJN3zmqd/S+pbgYyQI4WgWDiMrEPkDQPF6wO1JUmhcMOGiZfsmaX/leD9S+CKDKX7iDc440Hw=="; + }; + }; + "netlify-redirect-parser-14.0.2" = { name = "netlify-redirect-parser"; packageName = "netlify-redirect-parser"; - version = "11.0.2"; + version = "14.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-11.0.2.tgz"; - sha512 = "ngGSxRUv8dsao586J0MsfQFpi66TnIlYND1KRl1vCgjuuMBzvO9WbV8maqJA9d0G6f9NVKb+LqufmOQj4AkkFw=="; + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-14.0.2.tgz"; + sha512 = "mi1/NaCr0IBq8MiXbOFjkb4zmQCQp33OLDETn4OtXcpFn9EGiT//KlKu4kTCwzcw5K4i0/7t81Z1EC+8ToFMYg=="; }; }; - "netlify-redirector-0.2.1" = { + "netlify-redirector-0.3.1" = { name = "netlify-redirector"; packageName = "netlify-redirector"; - version = "0.2.1"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-redirector/-/netlify-redirector-0.2.1.tgz"; - sha512 = "17vDR9p1Loanp+vd57y+b6WlKb5X+qb0LZ44oTYsKJbdonz4Md+Ybv1lzH1w1aKm5YWWXHR8LMpWyY9bjlAJKw=="; + url = "https://registry.npmjs.org/netlify-redirector/-/netlify-redirector-0.3.1.tgz"; + sha512 = "+8x07Ukx8vgKkGqTDq1GrkuCRR0DqheZ9fF5PXk6VbIChp9Qi8+psmwBV3hjocoyUvUGH7CIHLUk05aVwLN3wA=="; }; }; - "nice-try-1.0.5" = { - name = "nice-try"; - packageName = "nice-try"; - version = "1.0.5"; + "node-domexception-1.0.0" = { + name = "node-domexception"; + packageName = "node-domexception"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; - sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; + url = "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz"; + sha512 = "/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="; }; }; - "node-fetch-2.6.5" = { + "node-fetch-2.6.7" = { name = "node-fetch"; packageName = "node-fetch"; - version = "2.6.5"; + version = "2.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz"; - sha512 = "mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz"; + sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; }; - "node-gyp-build-4.3.0" = { + "node-fetch-3.3.0" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.0.tgz"; + sha512 = "BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA=="; + }; + }; + "node-gyp-build-4.5.0" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.3.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz"; - sha512 = "iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz"; + sha512 = "2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg=="; }; }; - "node-pre-gyp-0.13.0" = { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.13.0.tgz"; - sha512 = "Md1D3xnEne8b/HGVQkZZwV27WUi1ZRuZBij24TNaZwUPU3ZAFtvT6xxJGaUVillfmMKnn5oD1HoGsp2Ftik7SQ=="; - }; - }; - "node-releases-1.1.77" = { - name = "node-releases"; - packageName = "node-releases"; - version = "1.1.77"; - src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz"; - sha512 = "rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="; - }; - }; - "node-source-walk-4.2.0" = { + "node-source-walk-4.3.0" = { name = "node-source-walk"; packageName = "node-source-walk"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-source-walk/-/node-source-walk-4.2.0.tgz"; - sha512 = "hPs/QMe6zS94f5+jG3kk9E7TNm4P2SulrKiLWMzKszBfNZvL/V6wseHlTd7IvfW0NZWqPtK3+9yYNr+3USGteA=="; + url = "https://registry.npmjs.org/node-source-walk/-/node-source-walk-4.3.0.tgz"; + sha512 = "8Q1hXew6ETzqKRAs3jjLioSxNfT1cx74ooiF8RlAONwVMcfq+UdzLC2eB5qcPldUxaE5w3ytLkrmV1TGddhZTA=="; + }; + }; + "node-source-walk-5.0.0" = { + name = "node-source-walk"; + packageName = "node-source-walk"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-source-walk/-/node-source-walk-5.0.0.tgz"; + sha512 = "58APXoMXpmmU+oVBJFajhTCoD8d/OGtngnVAWzIo2A8yn0IXwBzvIVIsTzoie/SrA37u+1hnpNz2HMWx/VIqlw=="; + }; + }; + "node-stream-zip-1.15.0" = { + name = "node-stream-zip"; + packageName = "node-stream-zip"; + version = "1.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.15.0.tgz"; + sha512 = "LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw=="; }; }; "node-version-alias-1.0.1" = { @@ -7051,15 +6646,6 @@ let sha1 = "4b636015e9882b54783c02b412f699d8c5cd0a5b"; }; }; - "nopt-4.0.3" = { - name = "nopt"; - packageName = "nopt"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz"; - sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg=="; - }; - }; "nopt-5.0.0" = { name = "nopt"; packageName = "nopt"; @@ -7087,13 +6673,22 @@ let sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; + "normalize-package-data-3.0.3" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz"; + sha512 = "p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA=="; + }; + }; "normalize-path-2.1.1" = { name = "normalize-path"; packageName = "normalize-path"; version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; - sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + sha512 = "3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w=="; }; }; "normalize-path-3.0.0" = { @@ -7132,13 +6727,13 @@ let sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; }; }; - "npm-bundled-1.1.2" = { - name = "npm-bundled"; - packageName = "npm-bundled"; - version = "1.1.2"; + "normalize-url-7.2.0" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz"; - sha512 = "x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ=="; + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-7.2.0.tgz"; + sha512 = "uhXOdZry0L6M2UIo9BTt7FdpBDiAGN/7oItedQwPKh8jh31ZlvC8U9Xl/EJ3aijDHaywXTW3QbZ6LuCocur1YA=="; }; }; "npm-normalize-package-bin-1.0.1" = { @@ -7150,15 +6745,6 @@ let sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="; }; }; - "npm-packlist-1.4.8" = { - name = "npm-packlist"; - packageName = "npm-packlist"; - version = "1.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz"; - sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A=="; - }; - }; "npm-run-path-4.0.1" = { name = "npm-run-path"; packageName = "npm-run-path"; @@ -7168,13 +6754,22 @@ let sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; }; }; - "npmlog-4.1.2" = { + "npm-run-path-5.1.0" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz"; + sha512 = "sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q=="; + }; + }; + "npmlog-5.0.1" = { name = "npmlog"; packageName = "npmlog"; - version = "4.1.2"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + url = "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz"; + sha512 = "AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw=="; }; }; "number-is-nan-1.0.1" = { @@ -7204,31 +6799,13 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "object-inspect-1.11.0" = { + "object-inspect-1.12.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz"; - sha512 = "jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="; - }; - }; - "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-treeify-1.1.33" = { - name = "object-treeify"; - packageName = "object-treeify"; - version = "1.1.33"; - src = fetchurl { - url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.33.tgz"; - sha512 = "EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz"; + sha512 = "Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="; }; }; "object-visit-1.0.1" = { @@ -7240,15 +6817,6 @@ let sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; }; }; - "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=="; - }; - }; "object.pick-1.3.0" = { name = "object.pick"; packageName = "object.pick"; @@ -7258,15 +6826,6 @@ let sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; }; }; - "oclif-plugin-completion-0.6.0" = { - name = "oclif-plugin-completion"; - packageName = "oclif-plugin-completion"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oclif-plugin-completion/-/oclif-plugin-completion-0.6.0.tgz"; - sha512 = "0HGaSR/E/seIhSzFxLkh0QqckuNSre4iGqSElZRUv1hVHH2YgrZ7xtQL9McwL8o1fh6HqkzykjUx0Iy2haVIUg=="; - }; - }; "omit.js-2.0.2" = { name = "omit.js"; packageName = "omit.js"; @@ -7276,13 +6835,13 @@ let sha512 = "hJmu9D+bNB40YpL9jYebQl4lsTW6yEHRTroJzNLqQJYHm7c+NQnJGfZmIWh8S3q3KoaxV1aLhV6B3+0N0/kyJg=="; }; }; - "on-finished-2.3.0" = { + "on-finished-2.4.1" = { name = "on-finished"; packageName = "on-finished"; - version = "2.3.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"; + sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="; }; }; "on-headers-1.0.2" = { @@ -7318,7 +6877,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + sha512 = "oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ=="; }; }; "onetime-5.1.2" = { @@ -7330,13 +6889,22 @@ let sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; - "open-7.4.2" = { + "onetime-6.0.0" = { + name = "onetime"; + packageName = "onetime"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz"; + sha512 = "1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ=="; + }; + }; + "open-8.4.0" = { name = "open"; packageName = "open"; - version = "7.4.2"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-7.4.2.tgz"; - sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; + url = "https://registry.npmjs.org/open/-/open-8.4.0.tgz"; + sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; }; }; "opn-5.5.0" = { @@ -7366,22 +6934,13 @@ let sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; }; }; - "os-homedir-1.0.2" = { - name = "os-homedir"; - packageName = "os-homedir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - }; - "os-name-4.0.1" = { + "os-name-5.0.1" = { name = "os-name"; packageName = "os-name"; - version = "4.0.1"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz"; - sha512 = "xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw=="; + url = "https://registry.npmjs.org/os-name/-/os-name-5.0.1.tgz"; + sha512 = "0EQpaHUHq7olp2/YFUr+0vZi9tMpDTblHGz+Ch5RntKxiRXOAY0JOz1UlxhSjMSksHvkm13eD6elJj3M8Ht/kw=="; }; }; "os-tmpdir-1.0.2" = { @@ -7393,15 +6952,6 @@ let sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; }; - "osenv-0.1.5" = { - name = "osenv"; - packageName = "osenv"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; - sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; - }; - }; "p-all-2.1.0" = { name = "p-all"; packageName = "p-all"; @@ -7438,6 +6988,15 @@ let sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; }; }; + "p-cancelable-3.0.0" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz"; + sha512 = "mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw=="; + }; + }; "p-event-2.3.1" = { name = "p-event"; packageName = "p-event"; @@ -7456,6 +7015,15 @@ let sha512 = "KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ=="; }; }; + "p-event-5.0.1" = { + name = "p-event"; + packageName = "p-event"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-event/-/p-event-5.0.1.tgz"; + sha512 = "dd589iCQ7m1L0bmC5NLlVYfy3TbBEsMUfWx9PyAgPeIcFZ/E2yaTZ4Rz4MiBmmJShviiftHVXOqfnfzJ6kyMrQ=="; + }; + }; "p-every-2.0.0" = { name = "p-every"; packageName = "p-every"; @@ -7474,6 +7042,15 @@ let sha512 = "ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw=="; }; }; + "p-filter-3.0.0" = { + name = "p-filter"; + packageName = "p-filter"; + version = "3.0.0"; + src = fetchurl { + 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" = { name = "p-finally"; packageName = "p-finally"; @@ -7510,6 +7087,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-4.1.0" = { name = "p-locate"; packageName = "p-locate"; @@ -7528,6 +7114,15 @@ let sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; }; }; + "p-locate-6.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz"; + sha512 = "wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw=="; + }; + }; "p-map-2.1.0" = { name = "p-map"; packageName = "p-map"; @@ -7555,13 +7150,31 @@ let sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; }; }; - "p-reduce-2.1.0" = { + "p-map-5.5.0" = { + name = "p-map"; + packageName = "p-map"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-5.5.0.tgz"; + sha512 = "VFqfGDHlx87K66yZrNdI4YGtD70IRyd+zSvgks6mzHPRNkoKy+9EKP4SFC77/vTTQYmRmti7dvqC+m5jBrBAcg=="; + }; + }; + "p-reduce-3.0.0" = { name = "p-reduce"; packageName = "p-reduce"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz"; - sha512 = "2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw=="; + url = "https://registry.npmjs.org/p-reduce/-/p-reduce-3.0.0.tgz"; + sha512 = "xsrIUgI0Kn6iyDYm9StOpOeK29XM1aboGji26+QEortiFST1hGZaUQOLhtEbqHErPpGW/aSz6allwK2qcptp0Q=="; + }; + }; + "p-retry-5.1.1" = { + name = "p-retry"; + packageName = "p-retry"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-retry/-/p-retry-5.1.1.tgz"; + sha512 = "i69WkEU5ZAL8mrmdmVviWwU+DN+IUF8f4sSJThoJ3z5A7Nn5iuO5ROX3Boye0u+uYQLOSfgFl7SuFZCjlAVbQA=="; }; }; "p-timeout-2.0.1" = { @@ -7582,6 +7195,15 @@ let sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; }; }; + "p-timeout-5.1.0" = { + name = "p-timeout"; + packageName = "p-timeout"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz"; + sha512 = "auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew=="; + }; + }; "p-try-2.2.0" = { name = "p-try"; packageName = "p-try"; @@ -7600,6 +7222,15 @@ let sha512 = "wpgERjNkLrBiFmkMEjuZJEWKKDrNfHCKA1OhyN1wg1FrLkULbviEy6py1AyJUgZ72YWFbZ38FIpnqvVqAlDUwA=="; }; }; + "p-wait-for-4.1.0" = { + name = "p-wait-for"; + packageName = "p-wait-for"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-wait-for/-/p-wait-for-4.1.0.tgz"; + sha512 = "i8nE5q++9h8oaQHWltS1Tnnv4IoMDOlqN7C0KFG2OdbK0iFJIt6CROZ8wfBM+K4Pxqfnq4C4lkkpXqTEpB5DZw=="; + }; + }; "package-json-6.5.0" = { name = "package-json"; packageName = "package-json"; @@ -7609,6 +7240,15 @@ let sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; }; }; + "package-json-8.1.0" = { + name = "package-json"; + packageName = "package-json"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-8.1.0.tgz"; + sha512 = "hySwcV8RAWeAfPsXb9/HGSPn8lwDnv6fabH+obUZKX169QknRkRhPxd1yMubpKDskLFATkl3jHpNtVtDPFA0Wg=="; + }; + }; "parallel-transform-1.2.0" = { name = "parallel-transform"; packageName = "parallel-transform"; @@ -7627,22 +7267,13 @@ let sha512 = "kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw=="; }; }; - "parse-gitignore-1.0.1" = { + "parse-gitignore-2.0.0" = { name = "parse-gitignore"; packageName = "parse-gitignore"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-gitignore/-/parse-gitignore-1.0.1.tgz"; - sha512 = "UGyowyjtx26n65kdAMWhm6/3uy5uSrpcuH7tt+QEVudiBoVS+eqHxD5kbi9oWVRwj7sCzXqwuM+rUGw7earl6A=="; - }; - }; - "parse-json-4.0.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"; - sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + url = "https://registry.npmjs.org/parse-gitignore/-/parse-gitignore-2.0.0.tgz"; + sha512 = "RmVuCHWsfu0QPNW+mraxh/xjQVw/lhUCUru8Zni3Ctq3AoMhpDTq0OVdKS6iesd6Kqb7viCV3isAL43dciOSog=="; }; }; "parse-json-5.2.0" = { @@ -7681,15 +7312,6 @@ let sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; }; }; - "password-prompt-1.1.2" = { - name = "password-prompt"; - packageName = "password-prompt"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.2.tgz"; - sha512 = "bpuBhROdrhuN3E7G/koAju0WjVw9/uQOG5Co5mokNj0MiOSBVZS1JTwM4zl55hu0WFmIEFvO9cU9sJQiBIYeIA=="; - }; - }; "path-dirname-1.0.2" = { name = "path-dirname"; packageName = "path-dirname"; @@ -7708,6 +7330,15 @@ let sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; }; }; + "path-exists-5.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz"; + sha512 = "RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ=="; + }; + }; "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; @@ -7717,15 +7348,6 @@ let sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; - "path-key-2.0.1" = { - name = "path-key"; - packageName = "path-key"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; - sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; - }; - }; "path-key-3.1.1" = { name = "path-key"; packageName = "path-key"; @@ -7735,6 +7357,15 @@ let sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; }; + "path-key-4.0.0" = { + name = "path-key"; + packageName = "path-key"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz"; + sha512 = "haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ=="; + }; + }; "path-parse-1.0.7" = { name = "path-parse"; packageName = "path-parse"; @@ -7750,7 +7381,7 @@ let version = "0.1.7"; src = fetchurl { url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + sha512 = "5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="; }; }; "path-type-3.0.0" = { @@ -7771,6 +7402,15 @@ let sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; + "path-type-5.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz"; + sha512 = "5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg=="; + }; + }; "pend-1.2.0" = { name = "pend"; packageName = "pend"; @@ -7780,22 +7420,22 @@ let sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; }; }; - "picocolors-0.2.1" = { + "picocolors-1.0.0" = { name = "picocolors"; packageName = "picocolors"; - version = "0.2.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz"; - sha512 = "cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="; + url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"; + 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-2.3.0" = { @@ -7804,7 +7444,7 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + sha512 = "udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="; }; }; "pify-3.0.0" = { @@ -7813,7 +7453,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; - sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + sha512 = "C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="; }; }; "pify-4.0.1" = { @@ -7843,13 +7483,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pkg-dir-5.0.0" = { + "pkg-dir-6.0.1" = { name = "pkg-dir"; packageName = "pkg-dir"; - version = "5.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz"; - sha512 = "NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA=="; + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-6.0.1.tgz"; + sha512 = "C9R+PTCKGA32HG0n5I4JMYkdLL58ZpayVuncQHQrGeKa8o26A4o2x0u6BKekHG+Au0jv5ZW7Xfq1Cj6lm9Ag4w=="; }; }; "posix-character-classes-0.1.1" = { @@ -7861,31 +7501,31 @@ let sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; }; }; - "postcss-8.3.9" = { + "postcss-8.4.14" = { name = "postcss"; packageName = "postcss"; - version = "8.3.9"; + version = "8.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.9.tgz"; - sha512 = "f/ZFyAKh9Dnqytx5X62jgjhhzttjZS7hMsohcI7HEI5tjELX/HxCy3EFhsRxyzGvrzFF+82XPvCS8T9TFleVJw=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz"; + sha512 = "E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig=="; }; }; - "postcss-values-parser-2.0.1" = { + "postcss-values-parser-6.0.2" = { name = "postcss-values-parser"; packageName = "postcss-values-parser"; - version = "2.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz"; - sha512 = "2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg=="; + url = "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-6.0.2.tgz"; + sha512 = "YLJpK0N1brcNJrs9WatuJFtHaV9q5aAOj+S4DI5S7jgHlRfm0PIbDCAFRYMQD5SHq7Fy6xsDhyutgS0QOAs0qw=="; }; }; - "precinct-8.1.0" = { + "precinct-9.0.1" = { name = "precinct"; packageName = "precinct"; - version = "8.1.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/precinct/-/precinct-8.1.0.tgz"; - sha512 = "oeZBR9IdER42Ef6Rz11z1oOUqicsI5J1Qffj6tYghKLhxN2UnHy7uE1axxNr0VZRevPK2HWkROk36uXrbJwHFA=="; + url = "https://registry.npmjs.org/precinct/-/precinct-9.0.1.tgz"; + sha512 = "hVNS6JvfvlZ64B3ezKeGAcVhIuOvuAiSVzagHX/+KjVPkYWoCNkfyMgCl1bjDtAFQSlzi95NcS9ykUWrl1L1vA=="; }; }; "precond-0.2.3" = { @@ -7903,7 +7543,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; }; }; "prepend-http-2.0.0" = { @@ -7924,13 +7564,13 @@ let sha512 = "kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ=="; }; }; - "pretty-format-26.6.2" = { + "pretty-format-27.5.1" = { name = "pretty-format"; packageName = "pretty-format"; - version = "26.6.2"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz"; - sha512 = "7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg=="; + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz"; + sha512 = "Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ=="; }; }; "pretty-ms-7.0.1" = { @@ -7942,31 +7582,31 @@ let sha512 = "973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q=="; }; }; - "prettyjson-1.2.1" = { + "prettyjson-1.2.5" = { name = "prettyjson"; packageName = "prettyjson"; - version = "1.2.1"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.1.tgz"; - sha1 = "fcffab41d19cab4dfae5e575e64246619b12d289"; + url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.5.tgz"; + sha512 = "rksPWtoZb2ZpT5OVgtmy0KHVM+Dca3iVwWY9ifwhcexfjebtgjg3wmrUt9PvJ59XIYBcknQeYHD8IAnVlh9lAw=="; }; }; - "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=="; }; }; - "process-es6-0.11.6" = { - name = "process-es6"; - packageName = "process-es6"; - version = "0.11.6"; + "process-0.11.10" = { + name = "process"; + packageName = "process"; + version = "0.11.10"; src = fetchurl { - url = "https://registry.npmjs.org/process-es6/-/process-es6-0.11.6.tgz"; - sha1 = "c6bb389f9a951f82bd4eb169600105bd2ff9c778"; + url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; }; }; "process-nextick-args-2.0.1" = { @@ -7978,6 +7618,15 @@ let sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; + "proto-list-1.2.4" = { + name = "proto-list"; + packageName = "proto-list"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; + sha512 = "vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="; + }; + }; "proxy-addr-2.0.7" = { name = "proxy-addr"; packageName = "proxy-addr"; @@ -7987,13 +7636,13 @@ let sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; }; }; - "ps-list-7.2.0" = { + "ps-list-8.1.0" = { name = "ps-list"; packageName = "ps-list"; - version = "7.2.0"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ps-list/-/ps-list-7.2.0.tgz"; - sha512 = "v4Bl6I3f2kJfr5o80ShABNHAokIgY+wFDTQfE+X3zWYgSGQOCBeYptLZUpoOALBqO5EawmDN/tjTldJesd0ujQ=="; + url = "https://registry.npmjs.org/ps-list/-/ps-list-8.1.0.tgz"; + sha512 = "NoGBqJe7Ou3kfQxEvDzDyKGAyEgwIuD3YrfXinjcCmBRv0hTld0Xb71hrXvtsNPj7HSFATfemvzB8PPJtq6Yag=="; }; }; "pump-1.0.3" = { @@ -8014,6 +7663,15 @@ let sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; }; }; + "punycode-1.3.2" = { + name = "punycode"; + packageName = "punycode"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + sha512 = "RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="; + }; + }; "punycode-2.1.1" = { name = "punycode"; packageName = "punycode"; @@ -8032,22 +7690,31 @@ let sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; }; - "qs-6.10.1" = { - name = "qs"; - packageName = "qs"; - version = "6.10.1"; + "pupa-3.1.0" = { + name = "pupa"; + packageName = "pupa"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz"; - sha512 = "M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg=="; + url = "https://registry.npmjs.org/pupa/-/pupa-3.1.0.tgz"; + sha512 = "FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug=="; }; }; - "qs-6.7.0" = { + "qs-6.10.3" = { name = "qs"; packageName = "qs"; - version = "6.7.0"; + version = "6.10.3"; 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.10.3.tgz"; + sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ=="; + }; + }; + "qs-6.11.0" = { + name = "qs"; + packageName = "qs"; + version = "6.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"; + sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; }; }; "query-string-5.1.1" = { @@ -8059,6 +7726,15 @@ let sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; }; }; + "querystring-0.2.0" = { + name = "querystring"; + packageName = "querystring"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; + }; + }; "queue-microtask-1.2.3" = { name = "queue-microtask"; packageName = "queue-microtask"; @@ -8068,6 +7744,24 @@ let sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; }; + "quick-lru-5.1.1" = { + name = "quick-lru"; + packageName = "quick-lru"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz"; + sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; + }; + }; + "quote-unquote-1.0.0" = { + name = "quote-unquote"; + packageName = "quote-unquote"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/quote-unquote/-/quote-unquote-1.0.0.tgz"; + sha1 = "67a9a77148effeaf81a4d428404a710baaac8a0b"; + }; + }; "random-bytes-1.0.0" = { name = "random-bytes"; packageName = "random-bytes"; @@ -8077,15 +7771,6 @@ let sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; }; }; - "randombytes-2.1.0" = { - name = "randombytes"; - packageName = "randombytes"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; - sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; - }; - }; "range-parser-1.2.1" = { name = "range-parser"; packageName = "range-parser"; @@ -8095,22 +7780,13 @@ let sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; - "raw-body-2.4.0" = { + "raw-body-2.5.1" = { name = "raw-body"; packageName = "raw-body"; - version = "2.4.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; - sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; - }; - }; - "raw-body-2.4.1" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz"; - sha512 = "9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA=="; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; + sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; }; }; "rc-1.2.8" = { @@ -8158,6 +7834,15 @@ let sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; }; }; + "read-pkg-7.1.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-7.1.0.tgz"; + sha512 = "5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg=="; + }; + }; "read-pkg-up-7.0.1" = { name = "read-pkg-up"; packageName = "read-pkg-up"; @@ -8167,6 +7852,15 @@ let sha512 = "zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg=="; }; }; + "read-pkg-up-9.1.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "9.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-9.1.0.tgz"; + sha512 = "vaMRR1AC1nrd5CQM0PhlRsO5oc2AAigqr7cCrZ/MW/Rsaflz4RlgzkpL4qoU/z1F6wrbd85iFv1OQj/y5RdGvg=="; + }; + }; "readable-stream-2.3.7" = { name = "readable-stream"; packageName = "readable-stream"; @@ -8212,51 +7906,6 @@ let sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; - "redeyed-2.1.1" = { - name = "redeyed"; - packageName = "redeyed"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz"; - sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; - }; - }; - "regenerate-1.4.2" = { - name = "regenerate"; - packageName = "regenerate"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"; - sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; - }; - }; - "regenerate-unicode-properties-9.0.0" = { - name = "regenerate-unicode-properties"; - packageName = "regenerate-unicode-properties"; - version = "9.0.0"; - 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.13.9" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.13.9"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; - sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; - }; - }; - "regenerator-transform-0.14.5" = { - name = "regenerator-transform"; - packageName = "regenerator-transform"; - version = "0.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; - sha512 = "eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw=="; - }; - }; "regex-not-1.0.2" = { name = "regex-not"; packageName = "regex-not"; @@ -8266,15 +7915,6 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexpu-core-4.8.0" = { - name = "regexpu-core"; - packageName = "regexpu-core"; - version = "4.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.8.0.tgz"; - sha512 = "1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg=="; - }; - }; "registry-auth-token-4.2.1" = { name = "registry-auth-token"; packageName = "registry-auth-token"; @@ -8284,6 +7924,15 @@ let sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw=="; }; }; + "registry-auth-token-5.0.1" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.1.tgz"; + sha512 = "UfxVOj8seK1yaIOiieV4FIP01vfBDLsY0H9sQzi9EbbUdJiuuBjJgLa1DpImXMNPnVkBD4eVxTEXcrZA6kfpJA=="; + }; + }; "registry-url-5.1.0" = { name = "registry-url"; packageName = "registry-url"; @@ -8293,22 +7942,13 @@ let sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; }; }; - "regjsgen-0.5.2" = { - name = "regjsgen"; - packageName = "regjsgen"; - version = "0.5.2"; + "registry-url-6.0.1" = { + name = "registry-url"; + packageName = "registry-url"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz"; - sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; - }; - }; - "regjsparser-0.7.0" = { - name = "regjsparser"; - packageName = "regjsparser"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.7.0.tgz"; - sha512 = "A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ=="; + url = "https://registry.npmjs.org/registry-url/-/registry-url-6.0.1.tgz"; + sha512 = "+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q=="; }; }; "remove-trailing-separator-1.1.0" = { @@ -8356,15 +7996,6 @@ let sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; }; }; - "require-main-filename-2.0.0" = { - name = "require-main-filename"; - packageName = "require-main-filename"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; - sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; - }; - }; "require-package-name-2.0.1" = { name = "require-package-name"; packageName = "require-package-name"; @@ -8383,22 +8014,31 @@ let sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; - "resolve-1.20.0" = { + "resolve-1.22.1" = { name = "resolve"; packageName = "resolve"; - version = "1.20.0"; + version = "1.22.1"; 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.1.tgz"; + sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; }; }; - "resolve-2.0.0-next.3" = { + "resolve-2.0.0-next.4" = { name = "resolve"; packageName = "resolve"; - version = "2.0.0-next.3"; + version = "2.0.0-next.4"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz"; - sha512 = "W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q=="; + url = "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz"; + sha512 = "iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ=="; + }; + }; + "resolve-alpn-1.2.1" = { + name = "resolve-alpn"; + packageName = "resolve-alpn"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz"; + sha512 = "0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="; }; }; "resolve-from-5.0.0" = { @@ -8425,16 +8065,25 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz"; - sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + sha512 = "/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ=="; }; }; - "responselike-2.0.0" = { + "responselike-2.0.1" = { name = "responselike"; packageName = "responselike"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz"; - sha512 = "xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw=="; + url = "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz"; + sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw=="; + }; + }; + "responselike-3.0.0" = { + name = "responselike"; + packageName = "responselike"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz"; + sha512 = "40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg=="; }; }; "restore-cursor-2.0.0" = { @@ -8443,7 +8092,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + sha512 = "6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q=="; }; }; "restore-cursor-3.1.0" = { @@ -8455,6 +8104,15 @@ let sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; }; }; + "restore-cursor-4.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz"; + sha512 = "I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg=="; + }; + }; "ret-0.1.15" = { name = "ret"; packageName = "ret"; @@ -8464,6 +8122,15 @@ let sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; + "retry-0.13.1" = { + name = "retry"; + packageName = "retry"; + version = "0.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz"; + sha512 = "XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="; + }; + }; "reusify-1.0.4" = { name = "reusify"; packageName = "reusify"; @@ -8482,15 +8149,6 @@ let sha512 = "V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="; }; }; - "rimraf-2.7.1" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; - sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; - }; - }; "rimraf-3.0.2" = { name = "rimraf"; packageName = "rimraf"; @@ -8500,42 +8158,6 @@ let sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; }; - "rollup-2.58.0" = { - name = "rollup"; - packageName = "rollup"; - version = "2.58.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.58.0.tgz"; - sha512 = "NOXpusKnaRpbS7ZVSzcEXqxcLDOagN6iFS8p45RkoiMqPHDLwJm758UF05KlMoCRbLBTZsPOIa887gZJ1AiXvw=="; - }; - }; - "rollup-plugin-inject-3.0.2" = { - name = "rollup-plugin-inject"; - packageName = "rollup-plugin-inject"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-inject/-/rollup-plugin-inject-3.0.2.tgz"; - sha512 = "ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w=="; - }; - }; - "rollup-plugin-node-polyfills-0.2.1" = { - name = "rollup-plugin-node-polyfills"; - packageName = "rollup-plugin-node-polyfills"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-node-polyfills/-/rollup-plugin-node-polyfills-0.2.1.tgz"; - sha512 = "4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA=="; - }; - }; - "rollup-plugin-terser-7.0.2" = { - name = "rollup-plugin-terser"; - packageName = "rollup-plugin-terser"; - version = "7.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz"; - sha512 = "w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ=="; - }; - }; "rollup-pluginutils-2.8.2" = { name = "rollup-pluginutils"; packageName = "rollup-pluginutils"; @@ -8563,6 +8185,15 @@ let sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; }; }; + "rusha-0.8.14" = { + name = "rusha"; + packageName = "rusha"; + version = "0.8.14"; + src = fetchurl { + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.14.tgz"; + sha512 = "cLgakCUf6PedEu15t8kbsjnwIFFR2D4RfL+W3iWFJ4iac7z4B0ZI8fxy4R3J956kAI68HclCFGL8MPoUVC3qVA=="; + }; + }; "rxjs-6.6.7" = { name = "rxjs"; packageName = "rxjs"; @@ -8605,16 +8236,16 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; - sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + sha512 = "aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg=="; }; }; - "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" = { @@ -8626,15 +8257,6 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sax-1.2.4" = { - name = "sax"; - packageName = "sax"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; - sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; - }; - }; "seek-bzip-1.0.6" = { name = "seek-bzip"; packageName = "seek-bzip"; @@ -8662,22 +8284,13 @@ let sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.0.0" = { + "semver-7.3.8" = { name = "semver"; packageName = "semver"; - version = "7.0.0"; + version = "7.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"; - sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; - }; - }; - "semver-7.3.5" = { - name = "semver"; - packageName = "semver"; - version = "7.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; - sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"; + sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; }; }; "semver-diff-3.1.1" = { @@ -8689,31 +8302,31 @@ let sha512 = "GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="; }; }; - "send-0.17.1" = { - name = "send"; - packageName = "send"; - version = "0.17.1"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; - sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; - }; - }; - "serialize-javascript-4.0.0" = { - name = "serialize-javascript"; - packageName = "serialize-javascript"; + "semver-diff-4.0.0" = { + name = "semver-diff"; + packageName = "semver-diff"; version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz"; - sha512 = "GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw=="; + url = "https://registry.npmjs.org/semver-diff/-/semver-diff-4.0.0.tgz"; + sha512 = "0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA=="; }; }; - "serve-static-1.14.1" = { + "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=="; + }; + }; + "serve-static-1.15.0" = { name = "serve-static"; packageName = "serve-static"; - version = "1.14.1"; + version = "1.15.0"; 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.15.0.tgz"; + sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; }; }; "set-blocking-2.0.0" = { @@ -8722,7 +8335,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; "set-value-2.0.1" = { @@ -8734,15 +8347,6 @@ let sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; }; }; - "setprototypeof-1.1.1" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; - }; - }; "setprototypeof-1.2.0" = { name = "setprototypeof"; packageName = "setprototypeof"; @@ -8752,15 +8356,6 @@ let sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; }; }; - "shebang-command-1.2.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; - }; - }; "shebang-command-2.0.0" = { name = "shebang-command"; packageName = "shebang-command"; @@ -8770,15 +8365,6 @@ let sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; }; }; - "shebang-regex-1.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; - }; - }; "shebang-regex-3.0.0" = { name = "shebang-regex"; packageName = "shebang-regex"; @@ -8797,13 +8383,13 @@ let sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; }; }; - "signal-exit-3.0.5" = { + "signal-exit-3.0.7" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.5"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz"; - sha512 = "KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ=="; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; "simple-swizzle-0.2.2" = { @@ -8833,13 +8419,31 @@ let sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; }; }; + "slash-4.0.0" = { + name = "slash"; + packageName = "slash"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz"; + sha512 = "3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="; + }; + }; "slice-ansi-0.0.4" = { name = "slice-ansi"; packageName = "slice-ansi"; version = "0.0.4"; src = fetchurl { url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz"; - sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; + sha512 = "up04hB2hR92PgjpyU3y/eg91yIBILyjVY26NvvciY3EVVPjybkMszMpXQ9QAkcS3I5rtJBDLoTxxg+qvW8c7rw=="; + }; + }; + "slice-ansi-5.0.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz"; + sha512 = "FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ=="; }; }; "snapdragon-0.8.2" = { @@ -8875,7 +8479,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz"; - sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; + sha512 = "vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg=="; }; }; "sort-keys-2.0.0" = { @@ -8884,7 +8488,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"; - sha1 = "658535584861ec97d730d6cf41822e1f56684128"; + sha512 = "/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg=="; }; }; "sort-keys-length-1.0.1" = { @@ -8902,7 +8506,7 @@ let version = "0.5.7"; src = fetchurl { url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; - sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + sha512 = "LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="; }; }; "source-map-0.6.1" = { @@ -8914,22 +8518,13 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "source-map-0.7.3" = { - name = "source-map"; - packageName = "source-map"; - version = "0.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"; - sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; - }; - }; - "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-resolve-0.5.3" = { @@ -8941,13 +8536,13 @@ let sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; }; - "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=="; }; }; "source-map-url-0.4.1" = { @@ -8959,15 +8554,6 @@ let sha512 = "cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="; }; }; - "sourcemap-codec-1.4.8" = { - name = "sourcemap-codec"; - packageName = "sourcemap-codec"; - version = "1.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"; - sha512 = "9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="; - }; - }; "spdx-correct-3.1.1" = { name = "spdx-correct"; packageName = "spdx-correct"; @@ -8995,13 +8581,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.10" = { + "spdx-license-ids-3.0.11" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.10"; + version = "3.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz"; - sha512 = "oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"; + sha512 = "Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g=="; }; }; "split-string-3.1.0" = { @@ -9019,16 +8605,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/split2/-/split2-1.1.1.tgz"; - sha1 = "162d9b18865f02ab2f2ad9585522db9b54c481f9"; - }; - }; - "sprintf-js-1.0.3" = { - name = "sprintf-js"; - packageName = "sprintf-js"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + sha512 = "cfurE2q8LamExY+lJ9Ex3ZfBwqAPduzOKVscPDXNCLLMvyaeD3DTz1yk7fVIs6Chco+12XeD0BB6HEoYzPYbXA=="; }; }; "stack-generator-2.0.5" = { @@ -9049,13 +8626,13 @@ let sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; }; }; - "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=="; }; }; "static-extend-0.1.2" = { @@ -9091,7 +8668,16 @@ let version = "1.5.0"; src = fetchurl { url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; - sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + sha512 = "OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="; + }; + }; + "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=="; }; }; "strict-uri-encode-1.1.0" = { @@ -9103,13 +8689,22 @@ let sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; }; }; + "string-similarity-4.0.4" = { + name = "string-similarity"; + packageName = "string-similarity"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/string-similarity/-/string-similarity-4.0.4.tgz"; + sha512 = "/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ=="; + }; + }; "string-width-1.0.2" = { name = "string-width"; packageName = "string-width"; version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + sha512 = "0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw=="; }; }; "string-width-2.1.1" = { @@ -9130,6 +8725,15 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; + "string-width-5.1.2" = { + name = "string-width"; + packageName = "string-width"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz"; + sha512 = "HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="; + }; + }; "string_decoder-1.1.1" = { name = "string_decoder"; packageName = "string_decoder"; @@ -9139,22 +8743,13 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; - "string_decoder-1.3.0" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; - sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; - }; - }; "strip-ansi-0.3.0" = { name = "strip-ansi"; packageName = "strip-ansi"; version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz"; - sha1 = "25f48ea22ca79187f3174a4db8759347bb126220"; + sha512 = "DerhZL7j6i6/nEnVG0qViKXI0OKouvvpsAiaj7c+LfqZZZxdwZtv8+UiA/w4VUJpT8UzX0pR1dcHOii1GbmruQ=="; }; }; "strip-ansi-3.0.1" = { @@ -9163,7 +8758,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="; }; }; "strip-ansi-4.0.0" = { @@ -9172,7 +8767,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + sha512 = "4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow=="; }; }; "strip-ansi-5.2.0" = { @@ -9193,6 +8788,15 @@ let sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; }; + "strip-ansi-7.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz"; + sha512 = "cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw=="; + }; + }; "strip-ansi-control-characters-2.0.0" = { name = "strip-ansi-control-characters"; packageName = "strip-ansi-control-characters"; @@ -9202,15 +8806,6 @@ let sha512 = "Q0/k5orrVGeaOlIOUn1gybGU0IcAbgHQT1faLo5hik4DqClKVSaka5xOhNNoRgtfztHVxCYxi7j71mrWom0bIw=="; }; }; - "strip-bom-3.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; - sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; - }; - }; "strip-dirs-2.1.0" = { name = "strip-dirs"; packageName = "strip-dirs"; @@ -9229,13 +8824,22 @@ let sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; }; }; + "strip-final-newline-3.0.0" = { + name = "strip-final-newline"; + packageName = "strip-final-newline"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz"; + sha512 = "dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw=="; + }; + }; "strip-json-comments-2.0.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + sha512 = "4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="; }; }; "strip-outer-1.0.1" = { @@ -9253,7 +8857,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"; - sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a"; + sha512 = "tdCZ28MnM7k7cJDJc7Eq80A9CsRFAAOZUy41npOZCs++qSjfIy7o5Rh46CBk+Dk5FbKJ33X3Tqg4YrV07N5RaA=="; }; }; "supports-color-2.0.0" = { @@ -9262,7 +8866,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + sha512 = "KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g=="; }; }; "supports-color-5.5.0" = { @@ -9283,22 +8887,13 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; - "supports-color-8.1.1" = { + "supports-color-9.2.2" = { name = "supports-color"; packageName = "supports-color"; - version = "8.1.1"; + version = "9.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"; - sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; - }; - }; - "supports-hyperlinks-1.0.1" = { - name = "supports-hyperlinks"; - packageName = "supports-hyperlinks"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-1.0.1.tgz"; - sha512 = "HHi5kVSefKaJkGYXbDuKbUGRVxqnWGn3J2e39CYcNJEfWciGq2zYtOhXLTlvrOZW1QU7VX67w7fMmWafHX9Pfw=="; + url = "https://registry.npmjs.org/supports-color/-/supports-color-9.2.2.tgz"; + sha512 = "XC6g/Kgux+rJXmwokjm9ECpD6k/smUoS5LKlUCcsYr4IY3rW0XyAympon2RmxGrlnZURMpg5T18gWDP9CsHXFA=="; }; }; "supports-hyperlinks-2.2.0" = { @@ -9310,6 +8905,15 @@ let sha512 = "6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ=="; }; }; + "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-observable-1.2.0" = { name = "symbol-observable"; packageName = "symbol-observable"; @@ -9319,13 +8923,13 @@ let sha512 = "e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="; }; }; - "tar-4.4.19" = { - name = "tar"; - packageName = "tar"; - version = "4.4.19"; + "tabtab-3.0.2" = { + name = "tabtab"; + packageName = "tabtab"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz"; - sha512 = "a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA=="; + url = "https://registry.npmjs.org/tabtab/-/tabtab-3.0.2.tgz"; + sha512 = "jANKmUe0sIQc/zTALTBy186PoM/k6aPrh3A7p6AaAfF6WPSbTx1JYeGIGH162btpH+mmVEXln+UxwViZHO2Jhg=="; }; }; "tar-6.1.11" = { @@ -9373,13 +8977,13 @@ let sha512 = "biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w=="; }; }; - "terser-5.9.0" = { - name = "terser"; - packageName = "terser"; - version = "5.9.0"; + "terminal-link-2.1.1" = { + name = "terminal-link"; + packageName = "terminal-link"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz"; - sha512 = "h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ=="; + url = "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz"; + sha512 = "un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ=="; }; }; "text-hex-1.0.0" = { @@ -9463,13 +9067,13 @@ let sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; }; }; - "tmp-promise-3.0.2" = { + "tmp-promise-3.0.3" = { name = "tmp-promise"; packageName = "tmp-promise"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.2.tgz"; - sha512 = "OyCLAKU1HzBjL6Ev3gxUeraJNlbNingmi8IrHHEsYH8LTmEuhvYfqvhn2F/je+mjf4N58UmZ96OMEy1JanSCpA=="; + url = "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz"; + sha512 = "RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ=="; }; }; "to-buffer-1.1.1" = { @@ -9481,15 +9085,6 @@ let sha512 = "lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="; }; }; - "to-fast-properties-2.0.0" = { - name = "to-fast-properties"; - packageName = "to-fast-properties"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; - }; - }; "to-object-path-0.3.0" = { name = "to-object-path"; packageName = "to-object-path"; @@ -9532,7 +9127,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; - sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + sha512 = "ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg=="; }; }; "to-regex-range-5.0.1" = { @@ -9544,13 +9139,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=="; }; }; "toml-3.0.0" = { @@ -9577,16 +9172,7 @@ let version = "0.0.3"; src = fetchurl { url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; - sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; - }; - }; - "treeify-1.1.0" = { - name = "treeify"; - packageName = "treeify"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/treeify/-/treeify-1.1.0.tgz"; - sha512 = "1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A=="; + sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="; }; }; "trim-repeated-1.0.0" = { @@ -9607,6 +9193,15 @@ let sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; }; + "ts-node-10.8.1" = { + name = "ts-node"; + packageName = "ts-node"; + version = "10.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-node/-/ts-node-10.8.1.tgz"; + sha512 = "Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g=="; + }; + }; "tslib-1.14.1" = { name = "tslib"; packageName = "tslib"; @@ -9616,15 +9211,6 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.3.1" = { - name = "tslib"; - packageName = "tslib"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"; - sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; - }; - }; "tsutils-3.21.0" = { name = "tsutils"; packageName = "tsutils"; @@ -9634,22 +9220,13 @@ let sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA=="; }; }; - "tunnel-agent-0.6.0" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; - }; - }; "type-check-0.3.2" = { name = "type-check"; packageName = "type-check"; version = "0.3.2"; src = fetchurl { url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; - sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="; }; }; "type-fest-0.10.0" = { @@ -9688,15 +9265,6 @@ let sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="; }; }; - "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=="; - }; - }; "type-fest-0.6.0" = { name = "type-fest"; packageName = "type-fest"; @@ -9715,6 +9283,24 @@ let sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; }; }; + "type-fest-1.4.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz"; + sha512 = "yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA=="; + }; + }; + "type-fest-2.19.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "2.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz"; + sha512 = "RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="; + }; + }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -9733,22 +9319,13 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; - "typescript-3.9.10" = { + "typescript-4.8.4" = { name = "typescript"; packageName = "typescript"; - version = "3.9.10"; + version = "4.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz"; - sha512 = "w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q=="; - }; - }; - "typescript-4.4.3" = { - name = "typescript"; - packageName = "typescript"; - version = "4.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz"; - sha512 = "4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz"; + sha512 = "QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ=="; }; }; "uid-safe-2.1.5" = { @@ -9769,42 +9346,6 @@ let sha512 = "mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg=="; }; }; - "unicode-canonical-property-names-ecmascript-2.0.0" = { - name = "unicode-canonical-property-names-ecmascript"; - packageName = "unicode-canonical-property-names-ecmascript"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"; - sha512 = "yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="; - }; - }; - "unicode-match-property-ecmascript-2.0.0" = { - name = "unicode-match-property-ecmascript"; - packageName = "unicode-match-property-ecmascript"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"; - sha512 = "5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q=="; - }; - }; - "unicode-match-property-value-ecmascript-2.0.0" = { - name = "unicode-match-property-value-ecmascript"; - packageName = "unicode-match-property-value-ecmascript"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz"; - sha512 = "7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="; - }; - }; - "unicode-property-aliases-ecmascript-2.0.0" = { - name = "unicode-property-aliases-ecmascript"; - packageName = "unicode-property-aliases-ecmascript"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz"; - sha512 = "5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="; - }; - }; "union-value-1.0.1" = { name = "union-value"; packageName = "union-value"; @@ -9814,15 +9355,6 @@ let sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="; }; }; - "uniq-1.0.1" = { - name = "uniq"; - packageName = "uniq"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"; - sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; - }; - }; "unique-string-2.0.0" = { name = "unique-string"; packageName = "unique-string"; @@ -9832,6 +9364,15 @@ let sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; }; }; + "unique-string-3.0.0" = { + name = "unique-string"; + packageName = "unique-string"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz"; + sha512 = "VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ=="; + }; + }; "universal-user-agent-6.0.0" = { name = "universal-user-agent"; packageName = "universal-user-agent"; @@ -9841,15 +9382,6 @@ let sha512 = "isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="; }; }; - "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"; @@ -9886,6 +9418,15 @@ let sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; }; }; + "untildify-3.0.3" = { + name = "untildify"; + packageName = "untildify"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz"; + sha512 = "iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA=="; + }; + }; "update-notifier-5.1.0" = { name = "update-notifier"; packageName = "update-notifier"; @@ -9895,6 +9436,15 @@ let sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="; }; }; + "update-notifier-6.0.2" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-6.0.2.tgz"; + sha512 = "EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og=="; + }; + }; "uri-js-4.4.1" = { name = "uri-js"; packageName = "uri-js"; @@ -9913,6 +9463,15 @@ let sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; }; }; + "url-0.11.0" = { + name = "url"; + packageName = "url"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + }; + }; "url-parse-lax-3.0.0" = { name = "url-parse-lax"; packageName = "url-parse-lax"; @@ -9967,6 +9526,24 @@ let sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; }; }; + "uuid-9.0.0" = { + name = "uuid"; + packageName = "uuid"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz"; + sha512 = "MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="; + }; + }; + "v8-compile-cache-lib-3.0.1" = { + name = "v8-compile-cache-lib"; + packageName = "v8-compile-cache-lib"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz"; + sha512 = "wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg=="; + }; + }; "validate-npm-package-license-3.0.4" = { name = "validate-npm-package-license"; packageName = "validate-npm-package-license"; @@ -9976,13 +9553,13 @@ let sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; }; }; - "validate-npm-package-name-3.0.0" = { + "validate-npm-package-name-4.0.0" = { name = "validate-npm-package-name"; packageName = "validate-npm-package-name"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"; - sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; + url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz"; + sha512 = "mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q=="; }; }; "vary-1.1.2" = { @@ -9994,13 +9571,13 @@ let sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; }; }; - "wait-port-0.2.9" = { + "wait-port-1.0.4" = { name = "wait-port"; packageName = "wait-port"; - version = "0.2.9"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/wait-port/-/wait-port-0.2.9.tgz"; - sha512 = "hQ/cVKsNqGZ/UbZB/oakOGFqic00YAMM5/PEj3Bt4vKarv2jWIWzDbqlwT94qMs/exAQAsvMOq99sZblV92zxQ=="; + url = "https://registry.npmjs.org/wait-port/-/wait-port-1.0.4.tgz"; + sha512 = "w8Ftna3h6XSFWWc2JC5gZEgp64nz8bnaTp5cvzbJSZ53j+omktWTDdwXxEF0jM8YveviLgFWvNGrSvRHnkyHyw=="; }; }; "wcwidth-1.0.1" = { @@ -10012,13 +9589,22 @@ let sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; }; }; + "web-streams-polyfill-3.2.0" = { + name = "web-streams-polyfill"; + packageName = "web-streams-polyfill"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.0.tgz"; + sha512 = "EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA=="; + }; + }; "webidl-conversions-3.0.1" = { name = "webidl-conversions"; packageName = "webidl-conversions"; version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; + sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="; }; }; "well-known-symbols-2.0.0" = { @@ -10036,16 +9622,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha1 = "966454e8765462e37644d3626f6742ce8b70965d"; - }; - }; - "which-1.3.1" = { - name = "which"; - packageName = "which"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; - sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; + sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="; }; }; "which-2.0.2" = { @@ -10057,22 +9634,13 @@ let sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; - "which-module-2.0.0" = { - name = "which-module"; - packageName = "which-module"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; - sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; - }; - }; - "wide-align-1.1.3" = { + "wide-align-1.1.5" = { name = "wide-align"; packageName = "wide-align"; - version = "1.1.3"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; - sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz"; + sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; }; }; "widest-line-3.1.0" = { @@ -10084,31 +9652,40 @@ let sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; }; }; - "windows-release-4.0.0" = { + "widest-line-4.0.1" = { + name = "widest-line"; + packageName = "widest-line"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-4.0.1.tgz"; + sha512 = "o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig=="; + }; + }; + "windows-release-5.0.1" = { name = "windows-release"; packageName = "windows-release"; - version = "4.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz"; - sha512 = "OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg=="; + url = "https://registry.npmjs.org/windows-release/-/windows-release-5.0.1.tgz"; + sha512 = "y1xFdFvdMiDXI3xiOhMbJwt1Y7dUxidha0CWPs1NgjZIjZANTcX7+7bMqNjuezhzb8s5JGEiBAbQjQQYYy7ulw=="; }; }; - "winston-3.3.3" = { + "winston-3.8.2" = { name = "winston"; packageName = "winston"; - version = "3.3.3"; + version = "3.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz"; - sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw=="; + url = "https://registry.npmjs.org/winston/-/winston-3.8.2.tgz"; + sha512 = "MsE1gRx1m5jdTTO9Ld/vND4krP2To+lgDoMEHGGa4HIlAUyXJtfc7CxQcGXVyz2IBpw5hbFkj2b/AtUdQwyRew=="; }; }; - "winston-transport-4.4.0" = { + "winston-transport-4.5.0" = { name = "winston-transport"; packageName = "winston-transport"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz"; - sha512 = "Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw=="; + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz"; + sha512 = "YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q=="; }; }; "word-wrap-1.2.3" = { @@ -10126,25 +9703,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz"; - sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; - }; - }; - "wrap-ansi-4.0.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz"; - sha512 = "uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg=="; - }; - }; - "wrap-ansi-6.2.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; - sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; + sha512 = "iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ=="; }; }; "wrap-ansi-7.0.0" = { @@ -10156,6 +9715,15 @@ let sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; }; }; + "wrap-ansi-8.0.1" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.0.1.tgz"; + sha512 = "QFF+ufAqhoYHvoHdajT/Po7KoXVBPXS2bgjIam5isfWJPfIOnQZ50JtUiVvCv/sjgacf3yRrt2ZKUZ/V4itN4g=="; + }; + }; "wrappy-1.0.2" = { name = "wrappy"; packageName = "wrappy"; @@ -10174,6 +9742,15 @@ let sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; }; }; + "write-file-atomic-4.0.2" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz"; + sha512 = "7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg=="; + }; + }; "xdg-basedir-4.0.0" = { name = "xdg-basedir"; packageName = "xdg-basedir"; @@ -10183,6 +9760,15 @@ let sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; }; }; + "xdg-basedir-5.1.0" = { + name = "xdg-basedir"; + packageName = "xdg-basedir"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz"; + sha512 = "GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ=="; + }; + }; "xtend-4.0.2" = { name = "xtend"; packageName = "xtend"; @@ -10192,15 +9778,6 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "y18n-4.0.3" = { - name = "y18n"; - packageName = "y18n"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz"; - sha512 = "JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="; - }; - }; "y18n-5.0.8" = { name = "y18n"; packageName = "y18n"; @@ -10210,15 +9787,6 @@ let sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; }; }; - "yallist-3.1.1" = { - name = "yallist"; - packageName = "yallist"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; - }; - }; "yallist-4.0.0" = { name = "yallist"; packageName = "yallist"; @@ -10228,49 +9796,22 @@ let sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; }; - "yargs-15.4.1" = { + "yargs-17.6.0" = { name = "yargs"; packageName = "yargs"; - version = "15.4.1"; + version = "17.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"; - sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="; + url = "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz"; + sha512 = "8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g=="; }; }; - "yargs-16.2.0" = { - name = "yargs"; - packageName = "yargs"; - version = "16.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"; - sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; - }; - }; - "yargs-parser-18.1.3" = { + "yargs-parser-21.1.1" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "18.1.3"; + version = "21.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"; - sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; - }; - }; - "yargs-parser-20.2.9" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "20.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"; - sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; - }; - }; - "yarn-1.22.15" = { - name = "yarn"; - packageName = "yarn"; - version = "1.22.15"; - src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.22.15.tgz"; - sha512 = "AzoEDxj256BOS/jqDXA3pjyhmi4FRBBUMgYoTHI4EIt2EhREkvH0soPVEtnD+DQIJfU5R9bKhcZ1H9l8zPWeoA=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"; + sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="; }; }; "yauzl-2.10.0" = { @@ -10282,6 +9823,15 @@ let sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; }; }; + "yn-3.1.1" = { + name = "yn"; + packageName = "yn"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz"; + sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="; + }; + }; "yocto-queue-0.1.0" = { name = "yocto-queue"; packageName = "yocto-queue"; @@ -10291,6 +9841,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=="; + }; + }; "zip-stream-4.1.0" = { name = "zip-stream"; packageName = "zip-stream"; @@ -10304,50 +9863,12 @@ let args = { name = "netlify-cli"; packageName = "netlify-cli"; - version = "6.13.2"; - src = ../../../../../../../../nix/store/x033jsifzs5dmw4sl3rnzd26qvbc87mj-source; + version = "12.2.4"; + src = ../../../../../../../../nix/store/fbwf1yrji8xanx72mybln17l8cnlwva4-source; dependencies = [ - sources."@babel/code-frame-7.15.8" - sources."@babel/compat-data-7.15.0" - (sources."@babel/core-7.15.8" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/generator-7.15.8" - sources."@babel/helper-annotate-as-pure-7.15.4" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" - (sources."@babel/helper-compilation-targets-7.15.4" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/helper-create-class-features-plugin-7.15.4" - sources."@babel/helper-create-regexp-features-plugin-7.14.5" - (sources."@babel/helper-define-polyfill-provider-0.2.3" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/helper-explode-assignable-expression-7.15.4" - sources."@babel/helper-function-name-7.15.4" - sources."@babel/helper-get-function-arity-7.15.4" - sources."@babel/helper-hoist-variables-7.15.4" - sources."@babel/helper-member-expression-to-functions-7.15.4" - sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.8" - sources."@babel/helper-optimise-call-expression-7.15.4" - sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-remap-async-to-generator-7.15.4" - sources."@babel/helper-replace-supers-7.15.4" - sources."@babel/helper-simple-access-7.15.4" - sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" - sources."@babel/helper-split-export-declaration-7.15.4" - sources."@babel/helper-validator-identifier-7.15.7" - sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.15.4" - sources."@babel/helpers-7.15.4" - (sources."@babel/highlight-7.14.5" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -10356,155 +9877,293 @@ let sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.15.8" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" - sources."@babel/plugin-proposal-async-generator-functions-7.15.8" - sources."@babel/plugin-proposal-class-properties-7.14.5" - sources."@babel/plugin-proposal-class-static-block-7.15.4" - sources."@babel/plugin-proposal-dynamic-import-7.14.5" - sources."@babel/plugin-proposal-export-namespace-from-7.14.5" - sources."@babel/plugin-proposal-json-strings-7.14.5" - sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" - sources."@babel/plugin-proposal-numeric-separator-7.14.5" - sources."@babel/plugin-proposal-object-rest-spread-7.15.6" - sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" - sources."@babel/plugin-proposal-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-private-methods-7.14.5" - sources."@babel/plugin-proposal-private-property-in-object-7.15.4" - sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" - sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-dynamic-import-7.8.3" - 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" - sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" - 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-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.14.5" - sources."@babel/plugin-transform-async-to-generator-7.14.5" - sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.15.3" - sources."@babel/plugin-transform-classes-7.15.4" - sources."@babel/plugin-transform-computed-properties-7.14.5" - sources."@babel/plugin-transform-destructuring-7.14.7" - sources."@babel/plugin-transform-dotall-regex-7.14.5" - sources."@babel/plugin-transform-duplicate-keys-7.14.5" - sources."@babel/plugin-transform-exponentiation-operator-7.14.5" - sources."@babel/plugin-transform-for-of-7.15.4" - sources."@babel/plugin-transform-function-name-7.14.5" - sources."@babel/plugin-transform-literals-7.14.5" - sources."@babel/plugin-transform-member-expression-literals-7.14.5" - sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.15.4" - sources."@babel/plugin-transform-modules-systemjs-7.15.4" - sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" - sources."@babel/plugin-transform-new-target-7.14.5" - sources."@babel/plugin-transform-object-super-7.14.5" - sources."@babel/plugin-transform-parameters-7.15.4" - sources."@babel/plugin-transform-property-literals-7.14.5" - sources."@babel/plugin-transform-regenerator-7.14.5" - sources."@babel/plugin-transform-reserved-words-7.14.5" - sources."@babel/plugin-transform-shorthand-properties-7.14.5" - sources."@babel/plugin-transform-spread-7.15.8" - sources."@babel/plugin-transform-sticky-regex-7.14.5" - sources."@babel/plugin-transform-template-literals-7.14.5" - sources."@babel/plugin-transform-typeof-symbol-7.14.5" - sources."@babel/plugin-transform-unicode-escapes-7.14.5" - sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.15.8" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.15.4" - sources."@babel/template-7.15.4" - sources."@babel/traverse-7.15.4" - sources."@babel/types-7.15.6" - sources."@bugsnag/browser-7.11.0" - sources."@bugsnag/core-7.11.0" + sources."@babel/parser-7.18.11" + sources."@bugsnag/browser-7.16.2" + sources."@bugsnag/core-7.16.1" sources."@bugsnag/cuid-3.0.0" - sources."@bugsnag/js-7.11.0" - sources."@bugsnag/node-7.11.0" + sources."@bugsnag/js-7.16.2" + sources."@bugsnag/node-7.16.2" sources."@bugsnag/safe-json-stringify-6.0.0" + sources."@colors/colors-1.5.0" + (sources."@cspotcode/source-map-support-0.8.1" // { + dependencies = [ + sources."@jridgewell/trace-mapping-0.3.9" + ]; + }) sources."@dabh/diagnostics-2.0.2" - sources."@jest/types-26.6.2" - sources."@mapbox/node-pre-gyp-1.0.5" + sources."@import-maps/resolve-1.0.1" + (sources."@jest/types-27.5.1" // { + dependencies = [ + sources."@types/yargs-16.0.4" + ]; + }) + sources."@jridgewell/resolve-uri-3.0.4" + sources."@jridgewell/sourcemap-codec-1.4.11" + sources."@mapbox/node-pre-gyp-1.0.10" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-18.17.1" // { + sources."@netlify/binary-info-1.0.0" + (sources."@netlify/build-28.2.0" // { dependencies = [ + sources."@babel/parser-7.16.8" + (sources."@netlify/edge-bundler-4.2.0" // { + dependencies = [ + sources."del-7.0.0" + sources."find-up-6.3.0" + sources."is-path-inside-4.0.0" + sources."p-map-5.5.0" + sources."uuid-9.0.0" + ]; + }) + (sources."@netlify/zip-it-and-ship-it-7.1.2" // { + dependencies = [ + sources."execa-5.1.1" + sources."filter-obj-2.0.2" + sources."locate-path-6.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."path-exists-4.0.0" + sources."yocto-queue-0.1.0" + ]; + }) sources."@sindresorhus/is-2.1.1" + sources."aggregate-error-4.0.1" + sources."ajv-8.11.2" + sources."ajv-errors-3.0.0" + sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" + sources."brace-expansion-2.0.1" sources."cacheable-lookup-2.0.1" - sources."camelcase-5.3.1" - sources."cliui-6.0.0" + sources."chalk-5.1.2" + sources."ci-info-2.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" + (sources."cp-file-9.1.0" // { + dependencies = [ + sources."p-event-4.2.0" + sources."p-timeout-3.2.0" + ]; + }) sources."decompress-response-5.0.0" - (sources."find-up-4.1.0" // { + sources."emoji-regex-9.2.2" + sources."env-paths-3.0.0" + sources."escape-string-regexp-5.0.0" + (sources."execa-6.1.0" // { dependencies = [ - sources."locate-path-5.0.0" - sources."p-locate-4.1.0" + sources."human-signals-3.0.1" + sources."is-stream-3.0.0" + sources."npm-run-path-5.1.0" + sources."onetime-6.0.0" + sources."strip-final-newline-3.0.0" ]; }) - sources."get-stream-5.2.0" - sources."got-10.7.0" + sources."figures-4.0.1" + sources."filter-obj-3.0.0" + sources."get-port-6.1.2" + sources."glob-8.0.3" + sources."glob-to-regexp-0.4.1" + sources."globby-13.1.2" + (sources."got-10.7.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."p-event-4.2.0" + sources."p-timeout-3.2.0" + ]; + }) + sources."indent-string-5.0.0" + sources."is-ci-2.0.0" + sources."is-path-cwd-3.0.0" + sources."is-plain-obj-4.1.0" + sources."is-unicode-supported-1.3.0" + sources."json-schema-traverse-1.0.0" + sources."locate-path-7.1.1" + sources."map-obj-5.0.2" sources."mimic-response-2.1.0" - sources."p-limit-2.3.0" - sources."resolve-2.0.0-next.3" + sources."minimatch-5.1.0" + sources."node-fetch-3.3.0" + sources."p-event-5.0.1" + (sources."p-filter-3.0.0" // { + dependencies = [ + sources."p-map-5.5.0" + ]; + }) + sources."p-limit-4.0.0" + sources."p-locate-6.0.0" + sources."p-timeout-5.1.0" + sources."p-wait-for-4.1.0" + sources."path-exists-5.0.0" + sources."path-key-4.0.0" + sources."path-type-5.0.0" + (sources."pkg-dir-6.0.1" // { + dependencies = [ + sources."find-up-6.3.0" + ]; + }) + (sources."read-pkg-7.1.0" // { + dependencies = [ + sources."type-fest-2.19.0" + ]; + }) + (sources."read-pkg-up-9.1.0" // { + dependencies = [ + sources."find-up-6.3.0" + sources."type-fest-2.19.0" + ]; + }) + sources."slash-4.0.0" + sources."string-width-5.1.2" + sources."strip-ansi-7.0.1" sources."type-fest-0.10.0" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.3" - sources."yargs-15.4.1" - sources."yargs-parser-18.1.3" + (sources."update-notifier-5.1.0" // { + dependencies = [ + sources."chalk-4.1.2" + sources."supports-color-7.2.0" + ]; + }) + sources."uuid-8.3.2" + sources."yocto-queue-1.0.0" ]; }) - (sources."@netlify/cache-utils-2.0.4" // { + (sources."@netlify/cache-utils-5.0.2" // { dependencies = [ - (sources."del-5.1.0" // { - dependencies = [ - sources."globby-10.0.2" - ]; - }) - sources."p-map-3.0.0" + sources."globby-13.1.2" + sources."junk-4.0.0" + sources."locate-path-7.1.1" + sources."p-limit-4.0.0" + sources."p-locate-6.0.0" + sources."path-exists-5.0.0" + sources."slash-4.0.0" + sources."yocto-queue-1.0.0" ]; }) - (sources."@netlify/config-15.7.1" // { + (sources."@netlify/config-20.0.1" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."camelcase-5.3.1" - sources."cliui-6.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."dot-prop-5.3.0" - (sources."locate-path-5.0.0" // { + sources."chalk-5.1.2" + sources."dot-prop-7.2.0" + sources."escape-string-regexp-5.0.0" + sources."execa-6.1.0" + sources."figures-4.0.1" + sources."filter-obj-3.0.0" + sources."find-up-6.3.0" + sources."human-signals-3.0.1" + sources."indent-string-5.0.0" + sources."is-plain-obj-4.1.0" + sources."is-stream-3.0.0" + sources."is-unicode-supported-1.3.0" + sources."locate-path-7.1.1" + sources."map-obj-5.0.2" + sources."npm-run-path-5.1.0" + sources."onetime-6.0.0" + sources."p-limit-4.0.0" + sources."p-locate-6.0.0" + sources."path-exists-5.0.0" + sources."path-key-4.0.0" + sources."path-type-5.0.0" + sources."strip-final-newline-3.0.0" + sources."type-fest-2.19.0" + sources."yocto-queue-1.0.0" + ]; + }) + (sources."@netlify/edge-bundler-4.3.2" // { + dependencies = [ + sources."aggregate-error-4.0.1" + sources."del-7.0.0" + sources."env-paths-3.0.0" + sources."execa-6.1.0" + sources."find-up-6.3.0" + sources."get-port-6.1.2" + sources."glob-to-regexp-0.4.1" + sources."globby-13.1.2" + sources."human-signals-3.0.1" + sources."indent-string-5.0.0" + sources."is-path-cwd-3.0.0" + sources."is-path-inside-4.0.0" + sources."is-stream-3.0.0" + sources."locate-path-7.1.1" + sources."node-fetch-3.3.0" + sources."npm-run-path-5.1.0" + sources."onetime-6.0.0" + sources."p-limit-4.0.0" + sources."p-locate-6.0.0" + sources."p-map-5.5.0" + sources."p-timeout-5.1.0" + sources."p-wait-for-4.1.0" + sources."path-exists-5.0.0" + sources."path-key-4.0.0" + sources."slash-4.0.0" + sources."strip-final-newline-3.0.0" + sources."yocto-queue-1.0.0" + ]; + }) + sources."@netlify/esbuild-0.14.39" + sources."@netlify/esbuild-android-64-0.14.39" + sources."@netlify/esbuild-android-arm64-0.14.39" + sources."@netlify/esbuild-darwin-64-0.14.39" + sources."@netlify/esbuild-darwin-arm64-0.14.39" + sources."@netlify/esbuild-freebsd-64-0.14.39" + sources."@netlify/esbuild-freebsd-arm64-0.14.39" + sources."@netlify/esbuild-linux-32-0.14.39" + sources."@netlify/esbuild-linux-64-0.14.39" + sources."@netlify/esbuild-linux-arm-0.14.39" + sources."@netlify/esbuild-linux-arm64-0.14.39" + sources."@netlify/esbuild-linux-mips64le-0.14.39" + sources."@netlify/esbuild-linux-ppc64le-0.14.39" + sources."@netlify/esbuild-linux-riscv64-0.14.39" + sources."@netlify/esbuild-linux-s390x-0.14.39" + sources."@netlify/esbuild-netbsd-64-0.14.39" + sources."@netlify/esbuild-openbsd-64-0.14.39" + sources."@netlify/esbuild-sunos-64-0.14.39" + sources."@netlify/esbuild-windows-32-0.14.39" + sources."@netlify/esbuild-windows-64-0.14.39" + sources."@netlify/esbuild-windows-arm64-0.14.39" + (sources."@netlify/framework-info-9.5.1" // { + dependencies = [ + sources."aggregate-error-4.0.1" + sources."ajv-8.11.2" + sources."filter-obj-3.0.0" + sources."find-up-6.3.0" + sources."indent-string-5.0.0" + sources."is-plain-obj-4.1.0" + sources."json-schema-traverse-1.0.0" + sources."locate-path-7.1.1" + sources."p-filter-3.0.0" + sources."p-limit-4.0.0" + sources."p-locate-6.0.0" + sources."p-map-5.5.0" + sources."path-exists-5.0.0" + sources."read-pkg-7.1.0" + sources."read-pkg-up-9.1.0" + sources."type-fest-2.19.0" + sources."yocto-queue-1.0.0" + ]; + }) + (sources."@netlify/functions-utils-5.0.4" // { + dependencies = [ + sources."@babel/parser-7.16.8" + (sources."@netlify/zip-it-and-ship-it-7.1.2" // { dependencies = [ - sources."p-locate-4.1.0" + sources."path-exists-4.0.0" ]; }) - sources."p-limit-2.3.0" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.3" - (sources."yargs-15.4.1" // { - dependencies = [ - sources."find-up-4.1.0" - ]; - }) - sources."yargs-parser-18.1.3" + sources."brace-expansion-2.0.1" + sources."cp-file-9.1.0" + sources."glob-8.0.3" + sources."minimatch-5.1.0" + sources."path-exists-5.0.0" + ]; + }) + (sources."@netlify/git-utils-5.0.2" // { + dependencies = [ + sources."execa-6.1.0" + sources."human-signals-3.0.1" + sources."is-stream-3.0.0" + sources."map-obj-5.0.2" + sources."npm-run-path-5.1.0" + sources."onetime-6.0.0" + sources."path-exists-5.0.0" + sources."path-key-4.0.0" + sources."strip-final-newline-3.0.0" ]; }) - sources."@netlify/esbuild-0.13.6" - sources."@netlify/framework-info-5.11.0" - sources."@netlify/functions-utils-2.0.2" - sources."@netlify/git-utils-2.0.2" sources."@netlify/local-functions-proxy-1.1.1" sources."@netlify/local-functions-proxy-darwin-arm64-1.1.1" sources."@netlify/local-functions-proxy-darwin-x64-1.1.1" @@ -10518,192 +10177,143 @@ let sources."@netlify/local-functions-proxy-openbsd-x64-1.1.1" sources."@netlify/local-functions-proxy-win32-ia32-1.1.1" sources."@netlify/local-functions-proxy-win32-x64-1.1.1" - sources."@netlify/open-api-2.5.0" - sources."@netlify/plugin-edge-handlers-1.11.22" - sources."@netlify/plugins-list-4.0.1" - sources."@netlify/routing-local-proxy-0.34.1" - sources."@netlify/routing-local-proxy-darwin-arm64-0.34.1" - sources."@netlify/routing-local-proxy-darwin-x64-0.34.1" - sources."@netlify/routing-local-proxy-linux-x64-0.34.1" - sources."@netlify/routing-local-proxy-win32-x64-0.34.1" - sources."@netlify/run-utils-2.0.1" - (sources."@netlify/zip-it-and-ship-it-4.25.0" // { + sources."@netlify/open-api-2.12.0" + sources."@netlify/plugins-list-6.55.0" + (sources."@netlify/run-utils-5.0.2" // { dependencies = [ - sources."resolve-2.0.0-next.3" - sources."yargs-16.2.0" + sources."execa-6.1.0" + sources."human-signals-3.0.1" + sources."is-stream-3.0.0" + sources."npm-run-path-5.1.0" + sources."onetime-6.0.0" + sources."path-key-4.0.0" + sources."strip-final-newline-3.0.0" + ]; + }) + (sources."@netlify/zip-it-and-ship-it-8.1.0" // { + dependencies = [ + sources."@babel/parser-7.16.8" + sources."aggregate-error-4.0.1" + sources."brace-expansion-2.0.1" + (sources."del-7.0.0" // { + dependencies = [ + sources."is-path-inside-4.0.0" + sources."p-map-5.5.0" + ]; + }) + sources."filter-obj-5.1.0" + sources."find-up-6.3.0" + sources."glob-8.0.3" + sources."globby-13.1.2" + sources."indent-string-5.0.0" + sources."is-path-cwd-3.0.0" + sources."locate-path-7.1.1" + sources."minimatch-5.1.0" + sources."p-limit-4.0.0" + sources."p-locate-6.0.0" + sources."path-exists-5.0.0" + sources."slash-4.0.0" + sources."yocto-queue-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."@oclif/color-0.1.2" // { + sources."@octokit/auth-token-3.0.1" + (sources."@octokit/core-4.1.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."ansi-styles-3.2.1" - (sources."chalk-3.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."supports-color-7.2.0" - ]; - }) - sources."color-name-1.1.4" - sources."strip-ansi-5.2.0" - (sources."supports-color-5.5.0" // { - dependencies = [ - sources."has-flag-3.0.0" - ]; - }) - sources."tslib-1.14.1" + sources."@octokit/openapi-types-14.0.0" + sources."@octokit/types-8.0.0" ]; }) - sources."@oclif/command-1.8.0" - sources."@oclif/config-1.17.0" - (sources."@oclif/errors-1.3.5" // { + sources."@octokit/endpoint-7.0.2" + sources."@octokit/graphql-5.0.1" + sources."@octokit/openapi-types-13.13.1" + (sources."@octokit/plugin-paginate-rest-5.0.1" // { dependencies = [ - sources."fs-extra-8.1.0" - sources."jsonfile-4.0.0" - sources."universalify-0.1.2" + sources."@octokit/openapi-types-14.0.0" + sources."@octokit/types-8.0.0" ]; }) - sources."@oclif/linewrap-1.0.0" - (sources."@oclif/parser-3.8.5" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - sources."tslib-1.14.1" - ]; - }) - (sources."@oclif/plugin-help-3.2.3" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."is-fullwidth-code-point-2.0.0" - (sources."wrap-ansi-4.0.0" // { - dependencies = [ - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) - ]; - }) - (sources."@oclif/plugin-not-found-1.2.4" // { - dependencies = [ - sources."ansi-escapes-3.2.0" - sources."ansi-regex-4.1.0" - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."clean-stack-2.2.0" - sources."cli-ux-4.9.3" - sources."escape-string-regexp-1.0.5" - sources."extract-stack-1.0.0" - sources."fs-extra-7.0.1" - sources."has-flag-3.0.0" - sources."indent-string-3.2.0" - sources."is-wsl-1.1.0" - sources."jsonfile-4.0.0" - sources."semver-5.7.1" - sources."strip-ansi-5.2.0" - sources."supports-color-5.5.0" - (sources."supports-hyperlinks-1.0.1" // { - dependencies = [ - sources."has-flag-2.0.0" - ]; - }) - sources."tslib-1.14.1" - sources."universalify-0.1.2" - ]; - }) - (sources."@oclif/plugin-plugins-1.10.1" // { - dependencies = [ - sources."fs-extra-9.1.0" - ]; - }) - sources."@oclif/screen-1.0.4" - sources."@octokit/auth-token-2.5.0" - sources."@octokit/core-3.5.1" - 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-error-2.1.0" - sources."@octokit/rest-18.12.0" - sources."@octokit/types-6.34.0" - sources."@rollup/plugin-babel-5.3.0" - sources."@rollup/plugin-commonjs-18.1.0" - (sources."@rollup/plugin-inject-4.0.2" // { + (sources."@octokit/plugin-rest-endpoint-methods-6.7.0" // { dependencies = [ - sources."estree-walker-1.0.1" - ]; - }) - sources."@rollup/plugin-json-4.1.0" - sources."@rollup/plugin-node-resolve-11.2.1" - (sources."@rollup/pluginutils-3.1.0" // { - dependencies = [ - sources."estree-walker-1.0.1" + sources."@octokit/openapi-types-14.0.0" + sources."@octokit/types-8.0.0" ]; }) + sources."@octokit/request-6.2.1" + sources."@octokit/request-error-3.0.1" + sources."@octokit/rest-19.0.5" + sources."@octokit/types-7.5.1" + sources."@pnpm/network.ca-file-1.0.1" + sources."@pnpm/npm-conf-1.0.5" sources."@samverschueren/stream-to-observable-0.3.1" - sources."@sindresorhus/slugify-1.1.2" - (sources."@sindresorhus/transliterate-0.1.2" // { + (sources."@sindresorhus/slugify-2.1.1" // { dependencies = [ - sources."escape-string-regexp-2.0.0" + sources."escape-string-regexp-5.0.0" + ]; + }) + (sources."@sindresorhus/transliterate-1.5.0" // { + dependencies = [ + sources."escape-string-regexp-5.0.0" ]; }) sources."@szmarczak/http-timer-4.0.6" + 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.2" sources."@types/cacheable-request-6.0.2" + sources."@types/connect-3.4.35" sources."@types/decompress-4.2.4" sources."@types/download-8.0.1" - sources."@types/estree-0.0.39" - sources."@types/glob-7.1.4" + sources."@types/express-4.17.13" + sources."@types/express-serve-static-core-4.17.28" + sources."@types/glob-7.2.0" sources."@types/got-8.3.6" sources."@types/http-cache-semantics-4.0.1" - sources."@types/http-proxy-1.17.7" - sources."@types/istanbul-lib-coverage-2.0.3" + sources."@types/http-proxy-1.17.8" + 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/keyv-3.1.3" + sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-14.17.21" + sources."@types/node-16.11.22" (sources."@types/node-fetch-2.5.12" // { dependencies = [ sources."form-data-3.0.1" ]; }) sources."@types/normalize-package-data-2.4.1" - sources."@types/resolve-1.17.1" + sources."@types/qs-6.9.7" + sources."@types/range-parser-1.2.4" sources."@types/responselike-1.0.0" - sources."@types/semver-7.3.8" + sources."@types/retry-0.12.1" + sources."@types/semver-7.3.9" + sources."@types/serve-static-1.13.10" sources."@types/yargs-15.0.14" sources."@types/yargs-parser-20.2.1" - 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/from-entries-0.2.1" - (sources."@vercel/nft-0.15.1" // { + sources."@typescript-eslint/types-5.18.0" + sources."@typescript-eslint/typescript-estree-5.18.0" + (sources."@typescript-eslint/visitor-keys-5.18.0" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."eslint-visitor-keys-3.3.0" ]; }) + sources."@vercel/nft-0.22.1" sources."abbrev-1.1.1" - sources."accepts-1.3.7" - sources."acorn-8.5.0" - sources."acorn-class-fields-1.0.0" - sources."acorn-private-class-elements-1.0.0" - sources."acorn-static-class-features-1.0.0" + sources."accepts-1.3.8" + sources."acorn-8.8.0" + sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" (sources."aggregate-error-3.1.0" // { dependencies = [ sources."clean-stack-2.2.0" ]; }) - sources."ajv-8.6.3" (sources."all-node-versions-8.0.0" // { dependencies = [ sources."@jest/types-25.5.0" @@ -10719,16 +10329,21 @@ let sources."pretty-format-25.5.0" sources."react-is-16.13.1" sources."supports-color-7.2.0" + sources."write-file-atomic-3.0.3" ]; }) sources."ansi-align-3.0.1" - sources."ansi-escapes-4.3.2" + sources."ansi-escapes-5.0.0" sources."ansi-regex-5.0.1" sources."ansi-styles-5.2.0" - sources."ansicolors-0.3.2" + (sources."ansi-to-html-0.7.2" // { + dependencies = [ + sources."entities-2.2.0" + ]; + }) sources."any-observable-0.3.0" sources."anymatch-3.1.2" - sources."aproba-1.2.0" + sources."aproba-2.0.0" (sources."archive-type-4.0.0" // { dependencies = [ sources."file-type-4.4.0" @@ -10738,40 +10353,25 @@ let (sources."archiver-utils-2.1.0" // { dependencies = [ sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - (sources."are-we-there-yet-1.1.7" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" ]; }) + sources."are-we-there-yet-2.0.0" + sources."arg-4.1.3" 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-flat-polyfill-1.0.1" 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."arrify-2.0.1" sources."ascii-table-0.0.9" sources."assign-symbols-1.0.0" - sources."ast-module-types-2.7.1" - sources."async-3.2.1" + sources."ast-module-types-3.0.0" + sources."async-3.2.4" + sources."async-sema-3.1.1" sources."asynckit-0.4.0" - sources."at-least-node-1.0.0" sources."atob-2.1.2" - sources."babel-plugin-dynamic-import-node-2.3.3" - (sources."babel-plugin-polyfill-corejs2-0.2.2" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."babel-plugin-polyfill-corejs3-0.2.5" - sources."babel-plugin-polyfill-regenerator-0.2.2" sources."backoff-2.5.0" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -10781,18 +10381,11 @@ let }) sources."base64-js-1.5.1" sources."before-after-hook-2.2.2" - sources."better-opn-2.1.1" + sources."better-opn-3.0.2" sources."binary-extensions-2.2.0" sources."bindings-1.5.0" sources."bl-4.1.0" sources."blueimp-md5-2.19.0" - (sources."body-parser-1.19.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."raw-body-2.4.0" - ]; - }) (sources."boxen-5.1.2" // { dependencies = [ sources."type-fest-0.20.2" @@ -10800,18 +10393,17 @@ let }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.17.3" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" - sources."buffer-es6-4.9.3" + sources."buffer-equal-constant-time-1.0.1" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" sources."builtin-modules-3.2.0" - sources."builtins-1.0.3" + sources."builtins-5.0.0" sources."byline-5.0.0" - sources."bytes-3.1.0" + sources."bytes-3.1.2" sources."cache-base-1.0.1" (sources."cacheable-request-7.0.2" // { dependencies = [ @@ -10822,9 +10414,7 @@ let sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" - sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001265" - sources."cardinal-2.1.1" + sources."camelcase-6.3.0" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -10834,9 +10424,9 @@ let ]; }) sources."chardet-0.7.0" - sources."chokidar-3.5.2" - sources."chownr-1.1.4" - sources."ci-info-3.2.0" + sources."chokidar-3.5.3" + sources."chownr-2.0.0" + sources."ci-info-3.5.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -10855,53 +10445,60 @@ let ]; }) sources."clean-deep-3.4.0" - sources."clean-stack-3.0.1" - sources."cli-boxes-2.2.1" - sources."cli-cursor-3.1.0" - sources."cli-progress-3.9.1" - sources."cli-spinners-2.6.1" - (sources."cli-ux-5.6.3" // { + (sources."clean-stack-4.2.0" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."argparse-1.0.10" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."fs-extra-8.1.0" - sources."js-yaml-3.14.1" - sources."jsonfile-4.0.0" - sources."universalify-0.1.2" + sources."escape-string-regexp-5.0.0" ]; }) + sources."cli-boxes-2.2.1" + sources."cli-cursor-2.1.0" + sources."cli-progress-3.10.0" + sources."cli-spinners-2.6.1" sources."cli-width-2.2.1" - sources."cliui-7.0.4" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" - sources."color-3.0.0" + sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.6.0" + sources."color-string-1.9.0" + sources."color-support-1.1.3" sources."colors-1.4.0" - sources."colorspace-1.1.2" + (sources."colors-option-3.0.0" // { + dependencies = [ + sources."chalk-5.0.1" + sources."filter-obj-3.0.0" + sources."is-plain-obj-4.1.0" + ]; + }) + sources."colorspace-1.1.4" sources."combined-stream-1.0.8" - sources."commander-7.2.0" + sources."commander-9.4.1" sources."common-path-prefix-3.0.0" - sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."compress-commons-4.1.1" sources."concat-map-0.0.1" sources."concordance-5.0.4" + (sources."config-chain-1.1.13" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) (sources."configstore-5.0.1" // { dependencies = [ sources."dot-prop-5.3.0" + sources."write-file-atomic-3.0.3" ]; }) sources."console-control-strings-1.1.0" - sources."content-disposition-0.5.3" + (sources."content-disposition-0.5.4" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) sources."content-type-1.0.4" - sources."convert-source-map-1.8.0" - sources."cookie-0.4.1" + sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" (sources."copy-template-dir-1.4.0" // { @@ -10923,25 +10520,24 @@ let ]; }) sources."micromatch-3.1.10" - sources."mkdirp-0.5.5" sources."pump-1.0.3" sources."readable-stream-2.3.7" sources."readdirp-2.2.1" - sources."string_decoder-1.1.1" sources."to-regex-range-2.1.1" ]; }) - (sources."core-js-compat-3.18.2" // { + sources."core-util-is-1.0.2" + (sources."cp-file-10.0.0" // { dependencies = [ - sources."semver-7.0.0" + sources."p-event-5.0.1" + sources."p-timeout-5.1.0" ]; }) - sources."core-util-is-1.0.3" - sources."cp-file-9.1.0" (sources."cpy-8.1.2" // { dependencies = [ sources."@nodelib/fs.stat-1.1.3" sources."array-union-1.0.2" + sources."arrify-2.0.1" (sources."braces-2.3.2" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -10979,20 +10575,22 @@ let sources."to-regex-range-2.1.1" ]; }) - sources."crc-32-1.2.0" + sources."crc-32-1.2.1" sources."crc32-stream-4.0.2" + sources."create-require-1.1.1" + sources."cron-parser-4.6.0" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."cyclist-1.0.1" + sources."data-uri-to-buffer-4.0.0" sources."date-fns-1.30.1" sources."date-time-3.1.0" - (sources."debug-4.3.2" // { + (sources."debug-4.3.4" // { dependencies = [ sources."ms-2.1.2" ]; }) - sources."decache-4.6.0" - sources."decamelize-1.2.0" + sources."decache-4.6.1" sources."decode-uri-component-0.2.0" (sources."decompress-4.2.1" // { dependencies = [ @@ -11004,13 +10602,17 @@ let sources."pify-2.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."is-stream-1.1.0" sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" sources."tar-stream-1.6.2" ]; }) @@ -11038,38 +10640,57 @@ let sources."deepmerge-4.2.2" sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" - sources."define-properties-1.1.3" + sources."define-lazy-prop-2.0.0" sources."define-property-2.0.2" - sources."del-6.0.0" + sources."del-6.1.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" sources."deprecation-2.3.1" - sources."destroy-1.0.4" - sources."detect-libc-1.0.3" - sources."detective-amd-3.1.0" - sources."detective-cjs-3.1.1" - sources."detective-es6-2.2.0" - sources."detective-less-1.0.2" - sources."detective-postcss-4.0.0" - sources."detective-sass-3.0.1" - sources."detective-scss-2.0.1" - sources."detective-stylus-1.0.0" - (sources."detective-typescript-7.0.0" // { + sources."destroy-1.2.0" + sources."detect-libc-2.0.1" + (sources."detective-amd-4.0.1" // { dependencies = [ - sources."typescript-3.9.10" + sources."node-source-walk-5.0.0" + ]; + }) + (sources."detective-cjs-4.0.0" // { + dependencies = [ + sources."node-source-walk-5.0.0" + ]; + }) + (sources."detective-es6-3.0.0" // { + dependencies = [ + sources."node-source-walk-5.0.0" + ]; + }) + sources."detective-less-1.0.2" + sources."detective-postcss-6.1.0" + (sources."detective-sass-4.0.1" // { + dependencies = [ + sources."node-source-walk-5.0.0" + ]; + }) + (sources."detective-scss-3.0.0" // { + dependencies = [ + sources."node-source-walk-5.0.0" + ]; + }) + sources."detective-stylus-2.0.1" + (sources."detective-typescript-9.0.0" // { + dependencies = [ + sources."node-source-walk-5.0.0" ]; }) sources."dir-glob-3.0.1" sources."dot-prop-6.0.1" - sources."dotenv-10.0.0" + sources."dotenv-16.0.3" (sources."download-8.0.0" // { dependencies = [ sources."@sindresorhus/is-0.7.0" (sources."cacheable-request-2.1.4" // { dependencies = [ sources."get-stream-3.0.0" - sources."lowercase-keys-1.0.0" ]; }) sources."decompress-response-3.3.0" @@ -11084,7 +10705,7 @@ let sources."is-plain-obj-1.1.0" sources."json-buffer-3.0.0" sources."keyv-3.0.0" - sources."lowercase-keys-1.0.1" + sources."lowercase-keys-1.0.0" sources."make-dir-2.1.0" sources."normalize-url-2.0.1" sources."p-cancelable-0.4.1" @@ -11096,10 +10717,10 @@ let ]; }) sources."duplexer3-0.1.4" + sources."eastasianwidth-0.2.0" + sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.866" sources."elegant-spinner-1.0.1" - sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" sources."encodeurl-1.0.2" @@ -11107,12 +10728,12 @@ let sources."env-paths-2.2.1" sources."envinfo-7.8.1" sources."error-ex-1.3.2" - sources."error-stack-parser-2.0.6" - sources."es-module-lexer-0.9.3" + sources."error-stack-parser-2.0.7" + sources."es-module-lexer-1.0.3" + sources."es6-promisify-6.1.1" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" - sources."escape-string-regexp-4.0.0" (sources."escodegen-2.0.0" // { dependencies = [ sources."levn-0.3.0" @@ -11122,9 +10743,8 @@ let sources."type-check-0.3.2" ]; }) - sources."eslint-visitor-keys-2.1.0" sources."esprima-4.0.1" - sources."estraverse-5.2.0" + sources."estraverse-5.3.0" sources."estree-walker-2.0.2" sources."esutils-2.0.3" sources."etag-1.8.1" @@ -11152,12 +10772,15 @@ let sources."ms-2.0.0" ]; }) - (sources."express-4.17.1" // { + (sources."express-4.18.2" // { dependencies = [ - sources."cookie-0.4.0" + sources."body-parser-1.20.1" sources."debug-2.6.9" + sources."depd-2.0.0" + sources."http-errors-2.0.0" sources."ms-2.0.0" - sources."statuses-1.5.0" + sources."qs-6.11.0" + sources."safe-buffer-5.2.1" ]; }) sources."express-logging-1.1.1" @@ -11172,16 +10795,16 @@ let sources."is-extendable-0.1.1" ]; }) - sources."extract-stack-2.0.0" sources."fast-deep-equal-3.1.3" sources."fast-diff-1.2.0" - sources."fast-equals-2.0.3" - sources."fast-glob-3.2.7" + sources."fast-equals-3.0.3" + sources."fast-glob-3.2.12" sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.1.1" sources."fastq-1.13.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.1" + sources."fetch-blob-3.1.4" (sources."fetch-node-website-5.0.3" // { dependencies = [ (sources."@jest/types-25.5.0" // { @@ -11224,66 +10847,62 @@ let sources."filenamify-3.0.0" sources."fill-range-7.0.1" sources."filter-obj-2.0.2" - (sources."finalhandler-1.1.2" // { + (sources."finalhandler-1.2.0" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" - sources."statuses-1.5.0" ]; }) sources."find-up-5.0.0" - sources."flatten-1.0.3" sources."flush-write-stream-2.0.0" sources."fn.name-1.1.0" sources."folder-walker-3.2.0" - sources."follow-redirects-1.14.4" + sources."follow-redirects-1.15.1" sources."for-in-1.0.2" + sources."form-data-encoder-2.1.3" + sources."formdata-polyfill-4.0.10" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" (sources."from2-2.3.0" // { dependencies = [ sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" ]; }) sources."from2-array-0.0.4" sources."fs-constants-1.0.0" + sources."fs-extra-10.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."fuzzy-0.1.3" - (sources."gauge-2.7.4" // { + sources."gauge-3.0.2" + (sources."get-amd-module-type-4.0.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."node-source-walk-5.0.0" ]; }) - sources."gensync-1.0.0-beta.2" - sources."get-amd-module-type-3.0.0" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-port-5.1.1" sources."get-stream-6.0.1" sources."get-value-2.0.6" - sources."gh-release-fetch-2.0.4" + sources."gh-release-fetch-3.0.2" sources."git-repo-info-2.1.1" (sources."gitconfiglocal-2.1.0" // { dependencies = [ sources."ini-1.3.8" ]; }) - sources."glob-7.2.0" + sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" sources."global-cache-dir-2.0.0" - sources."globals-11.12.0" - sources."globby-11.0.4" + sources."globby-11.1.0" sources."gonzales-pe-4.3.0" - sources."graceful-fs-4.2.8" + sources."graceful-fs-4.2.10" + sources."graphql-16.5.0" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { dependencies = [ @@ -11297,7 +10916,7 @@ let ]; }) 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-unicode-2.0.1" sources."has-value-1.0.0" @@ -11322,51 +10941,39 @@ let sources."type-fest-0.8.1" ]; }) + sources."hosted-git-info-4.1.0" sources."http-cache-semantics-4.1.0" - (sources."http-call-5.3.0" // { + (sources."http-errors-1.8.1" // { dependencies = [ - sources."parse-json-4.0.0" - ]; - }) - (sources."http-errors-1.7.2" // { - dependencies = [ - sources."inherits-2.0.3" sources."statuses-1.5.0" ]; }) sources."http-proxy-1.18.1" - sources."http-proxy-middleware-1.3.1" - sources."https-proxy-agent-5.0.0" + sources."http-proxy-middleware-2.0.6" + sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" - sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-5.1.8" - sources."ignore-walk-3.0.4" + sources."ignore-5.2.0" sources."import-lazy-2.1.0" 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-2.0.0" (sources."inquirer-6.5.2" // { 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."chalk-2.4.2" - sources."cli-cursor-2.1.0" sources."escape-string-regexp-1.0.5" sources."figures-2.0.0" sources."has-flag-3.0.0" sources."is-fullwidth-code-point-2.0.0" - sources."mimic-fn-1.2.0" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.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" ]; }) @@ -11374,7 +10981,12 @@ let sources."supports-color-5.5.0" ]; }) - sources."inquirer-autocomplete-prompt-1.4.0" + (sources."inquirer-autocomplete-prompt-1.4.0" // { + dependencies = [ + sources."ansi-escapes-4.3.2" + sources."type-fest-0.21.3" + ]; + }) sources."into-stream-3.1.0" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" @@ -11382,7 +10994,8 @@ let sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" sources."is-builtin-module-3.1.0" - sources."is-core-module-2.7.0" + sources."is-ci-3.0.1" + sources."is-core-module-2.9.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" @@ -11392,7 +11005,7 @@ let ]; }) sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-4.0.0" sources."is-glob-4.0.3" (sources."is-installed-globally-0.4.0" // { dependencies = [ @@ -11400,7 +11013,6 @@ let ]; }) sources."is-interactive-1.0.0" - sources."is-module-1.0.0" sources."is-natural-number-4.0.1" sources."is-npm-5.0.0" sources."is-number-7.0.0" @@ -11411,12 +11023,12 @@ let sources."is-path-inside-3.0.3" sources."is-plain-obj-3.0.0" sources."is-plain-object-5.0.0" - sources."is-reference-1.2.1" sources."is-retry-allowed-1.2.0" sources."is-stream-2.0.1" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-url-1.2.4" + sources."is-url-superb-4.0.0" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."is-yarn-global-0.3.0" @@ -11425,39 +11037,36 @@ let sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isurl-1.0.0" - sources."jest-get-type-26.3.0" - sources."jest-validate-26.6.2" - (sources."jest-worker-26.6.2" // { - dependencies = [ - sources."supports-color-7.2.0" - ]; - }) + sources."jest-get-type-27.5.1" + sources."jest-validate-27.5.1" sources."js-string-escape-1.0.1" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" - 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-traverse-1.0.0" - sources."json5-2.2.0" sources."jsonfile-6.1.0" + (sources."jsonwebtoken-8.5.1" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."junk-3.1.0" + sources."jwa-1.4.1" + sources."jws-3.2.2" sources."jwt-decode-3.1.2" - sources."keep-func-props-3.0.1" - sources."keyv-4.0.3" + sources."keep-func-props-4.0.1" + sources."keyv-4.5.0" sources."kind-of-6.0.3" sources."kuler-2.0.0" - sources."lambda-local-2.0.0" + sources."lambda-local-2.0.3" sources."latest-version-5.1.0" - (sources."lazystream-1.0.0" // { + (sources."lazystream-1.0.1" // { dependencies = [ sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" ]; }) sources."leven-3.1.0" - sources."lines-and-columns-1.1.6" + sources."lines-and-columns-1.2.4" (sources."listr-0.14.3" // { dependencies = [ sources."is-promise-2.2.2" @@ -11468,6 +11077,7 @@ let sources."listr-silent-renderer-1.1.1" (sources."listr-update-renderer-0.5.0" // { dependencies = [ + sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."chalk-1.1.3" @@ -11477,75 +11087,82 @@ let sources."indent-string-3.2.0" sources."is-fullwidth-code-point-1.0.0" sources."log-symbols-1.0.2" + sources."log-update-2.3.0" sources."slice-ansi-0.0.4" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" + (sources."wrap-ansi-3.0.1" // { + dependencies = [ + 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" + ]; + }) ]; }) (sources."listr-verbose-renderer-0.5.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" - sources."cli-cursor-2.1.0" sources."escape-string-regexp-1.0.5" sources."figures-2.0.0" sources."has-flag-3.0.0" - sources."mimic-fn-1.2.0" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" sources."supports-color-5.5.0" ]; }) - (sources."load-json-file-5.3.0" // { - dependencies = [ - sources."parse-json-4.0.0" - sources."type-fest-0.3.1" - ]; - }) sources."locate-path-6.0.0" sources."lodash-4.17.21" - sources."lodash._reinterpolate-3.0.0" - sources."lodash.camelcase-4.3.0" - sources."lodash.debounce-4.0.8" + sources."lodash-es-4.17.21" sources."lodash.deburr-4.1.0" sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.0" + sources."lodash.includes-4.3.0" + sources."lodash.isboolean-3.0.3" sources."lodash.isempty-4.4.0" + sources."lodash.isinteger-4.0.4" + sources."lodash.isnumber-3.0.3" sources."lodash.isplainobject-4.0.6" - sources."lodash.template-4.5.0" - sources."lodash.templatesettings-4.2.0" + sources."lodash.isstring-4.0.1" + sources."lodash.once-4.1.1" sources."lodash.transform-4.6.0" sources."lodash.union-4.6.0" - sources."log-process-errors-6.3.0" - sources."log-symbols-4.1.0" - (sources."log-update-2.3.0" // { + (sources."log-process-errors-8.0.0" // { dependencies = [ - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" - sources."cli-cursor-2.1.0" - sources."is-fullwidth-code-point-2.0.0" - sources."mimic-fn-1.2.0" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - sources."wrap-ansi-3.0.1" + sources."escape-string-regexp-5.0.0" + sources."figures-4.0.1" + sources."filter-obj-3.0.0" + sources."is-unicode-supported-1.2.0" + sources."map-obj-5.0.2" ]; }) - sources."logform-2.3.0" + sources."log-symbols-4.1.0" + (sources."log-update-5.0.1" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."ansi-styles-6.1.0" + sources."cli-cursor-4.0.0" + sources."emoji-regex-9.2.2" + sources."restore-cursor-4.0.0" + sources."string-width-5.1.2" + sources."strip-ansi-7.0.1" + sources."wrap-ansi-8.0.1" + ]; + }) + sources."logform-2.4.0" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" - sources."macos-release-2.5.0" - sources."magic-string-0.25.7" + sources."luxon-3.0.1" + sources."macos-release-3.0.1" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; }) + sources."make-error-1.3.6" sources."map-cache-0.2.2" - sources."map-obj-4.3.0" sources."map-visit-1.0.0" sources."maxstache-1.0.7" (sources."maxstache-stream-1.0.4" // { @@ -11553,13 +11170,12 @@ let sources."pump-1.0.3" sources."readable-stream-2.3.7" sources."split2-1.1.1" - sources."string_decoder-1.1.1" sources."through2-2.0.5" ]; }) sources."md5-hex-3.0.1" sources."media-typer-0.3.0" - sources."memoize-one-5.2.1" + sources."memoize-one-6.0.0" sources."merge-descriptors-1.0.1" (sources."merge-options-3.0.4" // { dependencies = [ @@ -11570,69 +11186,74 @@ let sources."merge2-1.4.1" sources."methods-1.1.2" sources."micro-api-client-3.3.0" - sources."micro-memoize-4.0.9" - sources."micromatch-4.0.4" + sources."micro-memoize-4.0.11" + sources."micromatch-4.0.5" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" - sources."mimic-fn-3.1.0" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" + sources."mimic-fn-4.0.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."minipass-3.1.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.7" + sources."minipass-3.3.4" sources."minizlib-2.1.2" sources."mixin-deep-1.3.2" - sources."mkdirp-1.0.4" - sources."module-definition-3.3.1" - sources."moize-6.1.0" - sources."move-file-2.1.0" + sources."mkdirp-0.5.6" + (sources."module-definition-4.0.0" // { + dependencies = [ + sources."node-source-walk-5.0.0" + ]; + }) + sources."moize-6.1.3" + (sources."move-file-3.0.0" // { + dependencies = [ + sources."path-exists-5.0.0" + ]; + }) sources."ms-2.1.3" - (sources."multiparty-4.2.2" // { + (sources."multiparty-4.2.3" // { dependencies = [ - sources."http-errors-1.8.0" sources."safe-buffer-5.2.1" - sources."setprototypeof-1.2.0" - sources."statuses-1.5.0" ]; }) sources."mute-stream-0.0.7" - sources."nanoid-3.1.29" + sources."nanoid-3.3.4" sources."nanomatch-1.2.13" - sources."natural-orderby-2.0.3" - (sources."needle-2.9.1" // { + sources."negotiator-0.6.3" + sources."nested-error-stacks-2.1.1" + (sources."netlify-13.0.2" // { dependencies = [ - sources."debug-3.2.7" + sources."node-fetch-3.3.0" + sources."p-timeout-5.1.0" + sources."p-wait-for-4.1.0" ]; }) - sources."negotiator-0.6.2" - sources."nested-error-stacks-2.1.0" - (sources."netlify-8.0.1" // { + (sources."netlify-headers-parser-7.0.2" // { dependencies = [ - sources."qs-6.10.1" + sources."escape-string-regexp-5.0.0" + sources."is-plain-obj-4.1.0" + sources."map-obj-5.0.2" + sources."path-exists-5.0.0" ]; }) - sources."netlify-headers-parser-4.0.1" - sources."netlify-redirect-parser-11.0.2" - sources."netlify-redirector-0.2.1" - sources."nice-try-1.0.5" - sources."node-fetch-2.6.5" - sources."node-gyp-build-4.3.0" - (sources."node-pre-gyp-0.13.0" // { + (sources."netlify-onegraph-internal-0.10.1" // { dependencies = [ - sources."fs-minipass-1.2.7" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" - sources."nopt-4.0.3" - sources."rimraf-2.7.1" - sources."safe-buffer-5.2.1" - sources."semver-5.7.1" - sources."tar-4.4.19" - sources."yallist-3.1.1" + sources."uuid-8.3.2" ]; }) - sources."node-releases-1.1.77" - sources."node-source-walk-4.2.0" + (sources."netlify-redirect-parser-14.0.2" // { + dependencies = [ + sources."filter-obj-3.0.0" + sources."is-plain-obj-4.1.0" + sources."path-exists-5.0.0" + ]; + }) + sources."netlify-redirector-0.3.1" + sources."node-domexception-1.0.0" + sources."node-fetch-2.6.7" + sources."node-gyp-build-4.5.0" + sources."node-source-walk-4.3.0" + sources."node-stream-zip-1.15.0" (sources."node-version-alias-1.0.1" // { dependencies = [ sources."@jest/types-25.5.0" @@ -11667,13 +11288,12 @@ let sources."supports-color-7.2.0" ]; }) + sources."normalize-package-data-3.0.3" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" - sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" - sources."npm-packlist-1.4.8" sources."npm-run-path-4.0.1" - sources."npmlog-4.1.2" + sources."npmlog-5.0.1" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -11689,15 +11309,11 @@ let sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.11.0" - sources."object-keys-1.1.1" - sources."object-treeify-1.1.33" + sources."object-inspect-1.12.0" sources."object-visit-1.0.1" - sources."object.assign-4.1.2" sources."object.pick-1.3.0" - sources."oclif-plugin-completion-0.6.0" sources."omit.js-2.0.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."one-time-1.0.0" @@ -11706,17 +11322,20 @@ let sources."mimic-fn-2.1.0" ]; }) - sources."open-7.4.2" + sources."open-8.4.0" (sources."opn-5.5.0" // { dependencies = [ sources."is-wsl-1.1.0" ]; }) - sources."ora-5.4.1" - sources."os-homedir-1.0.2" - sources."os-name-4.0.1" + (sources."ora-5.4.1" // { + dependencies = [ + sources."cli-cursor-3.1.0" + sources."restore-cursor-3.1.0" + ]; + }) + sources."os-name-5.0.1" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" (sources."p-all-2.1.0" // { dependencies = [ sources."p-map-2.1.0" @@ -11743,8 +11362,8 @@ let sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."p-map-4.0.0" - sources."p-reduce-2.1.0" - sources."p-try-2.2.0" + sources."p-reduce-3.0.0" + sources."p-retry-5.1.1" (sources."p-wait-for-3.2.0" // { dependencies = [ sources."p-timeout-3.2.0" @@ -11783,26 +11402,14 @@ let (sources."parallel-transform-1.2.0" // { dependencies = [ sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" ]; }) sources."parse-github-url-1.0.2" - sources."parse-gitignore-1.0.1" + sources."parse-gitignore-2.0.0" sources."parse-json-5.2.0" sources."parse-ms-2.1.0" sources."parseurl-1.3.3" sources."pascalcase-0.1.1" - (sources."password-prompt-1.1.2" // { - dependencies = [ - sources."ansi-escapes-3.2.0" - sources."cross-spawn-6.0.5" - 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."path-dirname-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -11811,49 +11418,49 @@ let sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."pend-1.2.0" - sources."picocolors-0.2.1" - sources."picomatch-2.3.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-5.0.0" sources."posix-character-classes-0.1.1" - sources."postcss-8.3.9" - sources."postcss-values-parser-2.0.1" - (sources."precinct-8.1.0" // { + sources."postcss-8.4.14" + (sources."postcss-values-parser-6.0.2" // { dependencies = [ - sources."commander-2.20.3" + sources."color-name-1.1.4" + ]; + }) + (sources."precinct-9.0.1" // { + dependencies = [ + sources."node-source-walk-5.0.0" ]; }) sources."precond-0.2.3" sources."prepend-http-2.0.0" - (sources."pretty-format-26.6.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."pretty-format-27.5.1" sources."pretty-ms-7.0.1" - sources."prettyjson-1.2.1" - sources."printj-1.1.2" - sources."process-es6-0.11.6" + sources."prettyjson-1.2.5" + sources."printj-1.3.1" + sources."process-0.11.10" sources."process-nextick-args-2.0.1" + sources."proto-list-1.2.4" sources."proxy-addr-2.0.7" - sources."ps-list-7.2.0" + sources."ps-list-8.1.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."pupa-2.1.1" - sources."qs-6.7.0" + sources."qs-6.10.3" sources."query-string-5.1.1" + sources."querystring-0.2.0" sources."queue-microtask-1.2.3" + sources."quick-lru-5.1.1" + sources."quote-unquote-1.0.0" sources."random-bytes-1.0.0" - sources."randombytes-2.1.0" sources."range-parser-1.2.1" - (sources."raw-body-2.4.1" // { + (sources."raw-body-2.5.1" // { dependencies = [ - sources."http-errors-1.7.3" - sources."statuses-1.5.0" + sources."depd-2.0.0" + sources."http-errors-2.0.0" ]; }) (sources."rc-1.2.8" // { @@ -11864,74 +11471,58 @@ let }) sources."react-is-17.0.2" sources."read-package-json-fast-2.0.3" - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."hosted-git-info-2.8.9" - sources."normalize-package-data-2.5.0" - sources."semver-5.7.1" - sources."type-fest-0.6.0" - ]; - }) (sources."read-pkg-up-7.0.1" // { dependencies = [ sources."find-up-4.1.0" + sources."hosted-git-info-2.8.9" sources."locate-path-5.0.0" + sources."normalize-package-data-2.5.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" + sources."p-try-2.2.0" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."type-fest-0.6.0" + ]; + }) + sources."resolve-1.22.1" + sources."semver-5.7.1" sources."type-fest-0.8.1" ]; }) sources."readable-stream-3.6.0" sources."readdir-glob-1.1.1" sources."readdirp-3.6.0" - sources."redeyed-2.1.1" - sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-9.0.0" - sources."regenerator-runtime-0.13.9" - sources."regenerator-transform-0.14.5" (sources."regex-not-1.0.2" // { dependencies = [ sources."safe-regex-1.1.0" ]; }) - sources."regexpu-core-4.8.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - sources."regjsgen-0.5.2" - (sources."regjsparser-0.7.0" // { - dependencies = [ - sources."jsesc-0.5.0" - ]; - }) sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."require-main-filename-2.0.0" sources."require-package-name-2.0.1" sources."requires-port-1.0.0" - sources."resolve-1.20.0" + sources."resolve-2.0.0-next.4" + sources."resolve-alpn-1.2.1" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" - sources."responselike-2.0.0" - sources."restore-cursor-3.1.0" + sources."responselike-2.0.1" + (sources."restore-cursor-2.0.0" // { + dependencies = [ + sources."mimic-fn-1.2.0" + sources."onetime-2.0.1" + ]; + }) sources."ret-0.1.15" + sources."retry-0.13.1" sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-3.0.2" - sources."rollup-2.58.0" - (sources."rollup-plugin-inject-3.0.2" // { - dependencies = [ - sources."estree-walker-0.6.1" - ]; - }) - sources."rollup-plugin-node-polyfills-0.2.1" - (sources."rollup-plugin-terser-7.0.2" // { - dependencies = [ - sources."serialize-javascript-4.0.0" - ]; - }) (sources."rollup-pluginutils-2.8.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -11939,39 +11530,35 @@ let }) sources."run-async-2.4.1" sources."run-parallel-1.2.0" - (sources."rxjs-6.6.7" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) + sources."rusha-0.8.14" + sources."rxjs-6.6.7" sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" - 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."seek-bzip-1.0.6" // { dependencies = [ sources."commander-2.20.3" ]; }) - sources."semver-7.3.5" + sources."semver-7.3.8" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."send-0.17.1" // { + (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { dependencies = [ sources."ms-2.0.0" ]; }) - sources."ms-2.1.1" - sources."statuses-1.5.0" + sources."depd-2.0.0" + sources."http-errors-2.0.0" ]; }) - sources."serve-static-1.14.1" + sources."serve-static-1.15.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -11980,17 +11567,22 @@ let sources."is-plain-object-2.0.4" ]; }) - sources."setprototypeof-1.1.1" + sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.5" + 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-5.0.0" // { + dependencies = [ + sources."ansi-styles-6.1.0" + ]; + }) (sources."snapdragon-0.8.2" // { dependencies = [ sources."debug-2.6.9" @@ -12029,24 +11621,22 @@ let }) sources."sort-keys-length-1.0.1" sources."source-map-0.5.7" - sources."source-map-js-0.6.2" + sources."source-map-js-1.0.2" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.20" // { + (sources."source-map-support-0.5.21" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."source-map-url-0.4.1" - sources."sourcemap-codec-1.4.8" 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.10" + sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" - sources."sprintf-js-1.0.3" sources."stack-generator-2.0.5" sources."stack-trace-0.0.10" - sources."stackframe-1.2.0" + sources."stackframe-1.2.1" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -12077,16 +11667,17 @@ let ]; }) sources."statsd-client-0.4.7" + sources."statuses-2.0.1" sources."strict-uri-encode-1.1.0" - sources."string-width-4.2.3" - (sources."string_decoder-1.3.0" // { + sources."string-similarity-4.0.4" + (sources."string-width-4.2.3" // { dependencies = [ - sources."safe-buffer-5.2.1" + sources."is-fullwidth-code-point-3.0.0" ]; }) + sources."string_decoder-1.1.1" sources."strip-ansi-6.0.1" sources."strip-ansi-control-characters-2.0.0" - sources."strip-bom-3.0.0" sources."strip-dirs-2.1.0" sources."strip-final-newline-2.0.0" (sources."strip-outer-1.0.1" // { @@ -12094,16 +11685,18 @@ let sources."escape-string-regexp-1.0.5" ]; }) - sources."supports-color-8.1.1" + sources."supports-color-9.2.2" (sources."supports-hyperlinks-2.2.0" // { dependencies = [ sources."supports-color-7.2.0" ]; }) + sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-observable-1.2.0" + sources."tabtab-3.0.2" (sources."tar-6.1.11" // { dependencies = [ - sources."chownr-2.0.0" + sources."mkdirp-1.0.4" ]; }) sources."tar-stream-2.2.0" @@ -12113,10 +11706,10 @@ let sources."type-fest-0.16.0" ]; }) - (sources."terser-5.9.0" // { + (sources."terminal-link-2.1.1" // { dependencies = [ - sources."commander-2.20.3" - sources."source-map-0.7.3" + sources."ansi-escapes-4.3.2" + sources."type-fest-0.21.3" ]; }) sources."text-hex-1.0.0" @@ -12124,27 +11717,24 @@ let (sources."through2-filter-3.0.0" // { dependencies = [ sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" sources."through2-2.0.5" ]; }) (sources."through2-map-3.0.0" // { dependencies = [ sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" sources."through2-2.0.5" ]; }) sources."time-zone-1.0.0" sources."timed-out-4.0.1" sources."tmp-0.0.33" - (sources."tmp-promise-3.0.2" // { + (sources."tmp-promise-3.0.3" // { dependencies = [ sources."tmp-0.2.1" ]; }) sources."to-buffer-1.1.1" - sources."to-fast-properties-2.0.0" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -12157,40 +11747,34 @@ let ]; }) sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."toml-3.0.0" sources."tomlify-j0.4-3.0.0" sources."tr46-0.0.3" - sources."treeify-1.1.0" (sources."trim-repeated-1.0.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" ]; }) sources."triple-beam-1.3.0" - sources."tslib-2.3.1" - (sources."tsutils-3.21.0" // { + (sources."ts-node-10.8.1" // { dependencies = [ - sources."tslib-1.14.1" + sources."diff-4.0.2" ]; }) - sources."tunnel-agent-0.6.0" - sources."type-fest-0.21.3" + sources."tslib-1.14.1" + sources."tsutils-3.21.0" + sources."type-fest-1.4.0" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.4.3" + sources."typescript-4.8.4" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.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" - sources."unicode-property-aliases-ecmascript-2.0.0" (sources."union-value-1.0.1" // { dependencies = [ sources."is-extendable-0.1.1" ]; }) - sources."uniq-1.0.1" sources."unique-string-2.0.0" sources."universal-user-agent-6.0.0" sources."universalify-2.0.0" @@ -12210,62 +11794,86 @@ let sources."has-values-0.1.4" ]; }) - (sources."update-notifier-5.1.0" // { + sources."untildify-3.0.3" + (sources."update-notifier-6.0.2" // { dependencies = [ - sources."ci-info-2.0.0" - sources."is-ci-2.0.0" + sources."@sindresorhus/is-5.3.0" + sources."@szmarczak/http-timer-5.0.1" + sources."ansi-regex-6.0.1" + sources."ansi-styles-6.2.1" + sources."boxen-7.0.0" + sources."cacheable-lookup-7.0.0" + sources."cacheable-request-10.2.1" + sources."camelcase-7.0.0" + sources."chalk-5.1.2" + sources."cli-boxes-3.0.0" + sources."configstore-6.0.0" + (sources."crypto-random-string-4.0.0" // { + dependencies = [ + sources."type-fest-1.4.0" + ]; + }) + sources."emoji-regex-9.2.2" + sources."escape-goat-4.0.0" + sources."got-12.5.2" + sources."has-yarn-3.0.0" + sources."http2-wrapper-2.1.11" + sources."import-lazy-4.0.0" + sources."is-npm-6.0.0" + sources."is-yarn-global-0.4.0" + sources."latest-version-7.0.0" + sources."lowercase-keys-3.0.0" + sources."mimic-response-4.0.0" + sources."normalize-url-7.2.0" + sources."p-cancelable-3.0.0" + sources."package-json-8.1.0" + sources."pupa-3.1.0" + sources."registry-auth-token-5.0.1" + sources."registry-url-6.0.1" + sources."responselike-3.0.0" + sources."semver-diff-4.0.0" + sources."string-width-5.1.2" + sources."strip-ansi-7.0.1" + sources."type-fest-2.19.0" + sources."unique-string-3.0.0" + sources."widest-line-4.0.1" + sources."wrap-ansi-8.0.1" + sources."write-file-atomic-3.0.3" + sources."xdg-basedir-5.1.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-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-8.3.2" + sources."uuid-9.0.0" + sources."v8-compile-cache-lib-3.0.1" sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-3.0.0" + sources."validate-npm-package-name-4.0.0" sources."vary-1.1.2" - (sources."wait-port-0.2.9" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."commander-3.0.2" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) + sources."wait-port-1.0.4" sources."wcwidth-1.0.1" - sources."webidl-conversions-3.0.1" + sources."web-streams-polyfill-3.2.0" sources."well-known-symbols-2.0.0" - sources."whatwg-url-5.0.0" + (sources."whatwg-url-5.0.0" // { + dependencies = [ + sources."webidl-conversions-3.0.1" + ]; + }) sources."which-2.0.2" - sources."which-module-2.0.0" - (sources."wide-align-1.1.3" // { - 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."wide-align-1.1.5" sources."widest-line-3.1.0" - (sources."windows-release-4.0.0" // { - dependencies = [ - sources."execa-4.1.0" - sources."get-stream-5.2.0" - sources."human-signals-1.1.1" - ]; - }) - sources."winston-3.3.3" - (sources."winston-transport-4.4.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) + sources."windows-release-5.0.1" + sources."winston-3.8.2" + sources."winston-transport-4.5.0" sources."word-wrap-1.2.3" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -12275,14 +11883,19 @@ let ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" + sources."write-file-atomic-4.0.2" sources."xdg-basedir-4.0.0" sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-parser-20.2.9" - sources."yarn-1.22.15" + (sources."yargs-17.6.0" // { + dependencies = [ + sources."cliui-8.0.1" + sources."yargs-parser-21.1.1" + ]; + }) sources."yauzl-2.10.0" + sources."yn-3.1.1" sources."yocto-queue-0.1.0" sources."zip-stream-4.1.0" ]; diff --git a/pkgs/development/web/netlify-cli/test.nix b/pkgs/development/web/netlify-cli/test.nix index 22e97e332189..d25c6c48936b 100644 --- a/pkgs/development/web/netlify-cli/test.nix +++ b/pkgs/development/web/netlify-cli/test.nix @@ -1,13 +1,18 @@ { curl, + darwin, + lib, netlify-cli, runCommand, + stdenv, }: runCommand "netlify-cli-test" { nativeBuildInputs = [ netlify-cli curl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.ps ]; meta.timeout = 600; } '' diff --git a/pkgs/development/web/newman/node-composition.nix b/pkgs/development/web/newman/node-composition.nix index f929727d59d6..08f947ea46bc 100644 --- a/pkgs/development/web/newman/node-composition.nix +++ b/pkgs/development/web/newman/node-composition.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {pkgs ? import { inherit system; @@ -6,7 +6,7 @@ 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/development/web/newman/node-env.nix b/pkgs/development/web/newman/node-env.nix index c2b723195b77..5dad9ec63d47 100644 --- a/pkgs/development/web/newman/node-env.nix +++ b/pkgs/development/web/newman/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.packageName}" ]; 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 .."} @@ -154,7 +165,11 @@ let if(process.argv[2] == "development") { replaceDependencies(packageObj.devDependencies); } + else { + packageObj.devDependencies = {}; + } replaceDependencies(packageObj.optionalDependencies); + replaceDependencies(packageObj.peerDependencies); /* Write the fixed package.json file */ fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); @@ -246,8 +261,8 @@ let 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); + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); + process.exit(1); } if(packageLock.dependencies !== undefined) { @@ -259,7 +274,7 @@ let # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes reconstructPackageLock = writeTextFile { - name = "addintegrityfields.js"; + name = "reconstructpackagelock.js"; text = '' var fs = require('fs'); var path = require('path'); @@ -269,25 +284,43 @@ let var lockObj = { name: packageObj.name, version: packageObj.version, - lockfileVersion: 1, + lockfileVersion: 2, requires: true, + packages: { + "": { + name: packageObj.name, + version: packageObj.version, + license: packageObj.license, + bin: packageObj.bin, + dependencies: packageObj.dependencies, + engines: packageObj.engines, + optionalDependencies: packageObj.optionalDependencies + } + }, dependencies: {} }; - function augmentPackageJSON(filePath, dependencies) { + function augmentPackageJSON(filePath, packages, dependencies) { var packageJSON = path.join(filePath, "package.json"); if(fs.existsSync(packageJSON)) { var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + packages[filePath] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: packageObj.dependencies, + engines: packageObj.engines, + optionalDependencies: packageObj.optionalDependencies + }; dependencies[packageObj.name] = { version: packageObj.version, integrity: "sha1-000000000000000000000000000=", dependencies: {} }; - processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies); } } - function processDependencies(dir, dependencies) { + function processDependencies(dir, packages, dependencies) { if(fs.existsSync(dir)) { var files = fs.readdirSync(dir); @@ -303,23 +336,84 @@ let pkgFiles.forEach(function(entry) { if(stats.isDirectory()) { var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, dependencies); + augmentPackageJSON(pkgFilePath, packages, dependencies); } }); } else { - augmentPackageJSON(filePath, dependencies); + augmentPackageJSON(filePath, packages, dependencies); } } }); } } - processDependencies("node_modules", lockObj.dependencies); + processDependencies("node_modules", lockObj.packages, lockObj.dependencies); fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); ''; }; + # Script that links bins defined in package.json to the node_modules bin directory + # NPM does not do this for top-level packages itself anymore as of v7 + linkBinsScript = writeTextFile { + name = "linkbins.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep); + + if(packageObj.bin !== undefined) { + fs.mkdirSync(path.join(nodeModules, ".bin")) + + if(typeof packageObj.bin == "object") { + Object.keys(packageObj.bin).forEach(function(exe) { + if(fs.existsSync(packageObj.bin[exe])) { + console.log("linking bin '" + exe + "'"); + fs.symlinkSync( + path.join("..", packageObj.name, packageObj.bin[exe]), + path.join(nodeModules, ".bin", exe) + ); + } + else { + console.log("skipping non-existent bin '" + exe + "'"); + } + }) + } + else { + if(fs.existsSync(packageObj.bin)) { + console.log("linking bin '" + packageObj.bin + "'"); + fs.symlinkSync( + path.join("..", packageObj.name, packageObj.bin), + path.join(nodeModules, ".bin", packageObj.name.split("/").pop()) + ); + } + else { + console.log("skipping non-existent bin '" + packageObj.bin + "'"); + } + } + } + else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) { + fs.mkdirSync(path.join(nodeModules, ".bin")) + + fs.readdirSync(packageObj.directories.bin).forEach(function(exe) { + if(fs.existsSync(path.join(packageObj.directories.bin, exe))) { + console.log("linking bin '" + exe + "'"); + fs.symlinkSync( + path.join("..", packageObj.name, packageObj.directories.bin, exe), + path.join(nodeModules, ".bin", exe) + ); + } + else { + console.log("skipping non-existent bin '" + exe + "'"); + } + }) + } + ''; + }; + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: let forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; @@ -366,20 +460,25 @@ let npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild + runHook postRebuild + 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 + npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install fi + + # Link executables defined in package.json + node ${linkBinsScript} ''; # Builds and composes an NPM package including all its dependencies buildNodePackage = { name , packageName - , version + , version ? null , dependencies ? [] , buildInputs ? [] , production ? true @@ -391,13 +490,14 @@ let , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" + , meta ? {} , ... }@args: let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ - name = "node_${name}-${version}"; + name = "${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool @@ -414,6 +514,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 @@ -427,6 +529,14 @@ let if [ -d "$out/lib/node_modules/.bin" ] then ln -s $out/lib/node_modules/.bin $out/bin + + # Patch the shebang lines of all the executables + ls $out/bin/* | while read i + do + file="$(readlink -f "$i")" + chmod u+rwx "$file" + patchShebangs "$file" + done fi # Create symlinks to the deployed manual page folders, if applicable @@ -446,13 +556,18 @@ let # 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 + , version ? null , src , dependencies ? [] , buildInputs ? [] @@ -470,7 +585,7 @@ let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; in stdenv.mkDerivation ({ - name = "node-dependencies-${name}-${version}"; + name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux @@ -486,6 +601,8 @@ let passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + mkdir -p $out/${packageName} cd $out/${packageName} @@ -498,6 +615,7 @@ let if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . + chmod 644 package-lock.json fi ''} @@ -520,7 +638,7 @@ let buildNodeShell = { name , packageName - , version + , version ? null , src , dependencies ? [] , buildInputs ? [] @@ -536,9 +654,10 @@ let let nodeDependencies = buildNodeDependencies args; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; in - stdenv.mkDerivation { - name = "node-shell-${name}-${version}"; + stdenv.mkDerivation ({ + name = "node-shell-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' @@ -557,7 +676,7 @@ let export NODE_PATH=${nodeDependencies}/lib/node_modules export PATH="${nodeDependencies}/bin:$PATH" ''; - }; + } // extraArgs); in { buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; diff --git a/pkgs/development/web/newman/node-packages.nix b/pkgs/development/web/newman/node-packages.nix index 1a34612401b1..ba6442cec0b7 100644 --- a/pkgs/development/web/newman/node-packages.nix +++ b/pkgs/development/web/newman/node-packages.nix @@ -1,9 +1,18 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { + "@ampproject/remapping-2.2.0" = { + name = "_at_ampproject_slash_remapping"; + packageName = "@ampproject/remapping"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz"; + sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; + }; + }; "@babel/code-frame-7.12.11" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; @@ -13,175 +22,229 @@ let sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; }; }; - "@babel/core-7.12.10" = { + "@babel/code-frame-7.18.6" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"; + sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; + }; + }; + "@babel/compat-data-7.20.5" = { + name = "_at_babel_slash_compat-data"; + packageName = "@babel/compat-data"; + version = "7.20.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz"; + sha512 = "KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g=="; + }; + }; + "@babel/core-7.20.5" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.12.10"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz"; - sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.20.5.tgz"; + sha512 = "UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ=="; }; }; - "@babel/generator-7.12.11" = { + "@babel/generator-7.20.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.12.11"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz"; - sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.5.tgz"; + sha512 = "jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA=="; }; }; - "@babel/helper-function-name-7.12.11" = { + "@babel/helper-compilation-targets-7.20.0" = { + name = "_at_babel_slash_helper-compilation-targets"; + packageName = "@babel/helper-compilation-targets"; + version = "7.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz"; + sha512 = "0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ=="; + }; + }; + "@babel/helper-environment-visitor-7.18.9" = { + name = "_at_babel_slash_helper-environment-visitor"; + packageName = "@babel/helper-environment-visitor"; + version = "7.18.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"; + sha512 = "3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="; + }; + }; + "@babel/helper-function-name-7.19.0" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.12.11"; + version = "7.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz"; - sha512 = "AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz"; + sha512 = "WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w=="; }; }; - "@babel/helper-get-function-arity-7.12.10" = { - name = "_at_babel_slash_helper-get-function-arity"; - packageName = "@babel/helper-get-function-arity"; - version = "7.12.10"; + "@babel/helper-hoist-variables-7.18.6" = { + name = "_at_babel_slash_helper-hoist-variables"; + packageName = "@babel/helper-hoist-variables"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz"; - sha512 = "mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"; + sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; }; }; - "@babel/helper-member-expression-to-functions-7.12.7" = { - name = "_at_babel_slash_helper-member-expression-to-functions"; - packageName = "@babel/helper-member-expression-to-functions"; - version = "7.12.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz"; - sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw=="; - }; - }; - "@babel/helper-module-imports-7.12.5" = { + "@babel/helper-module-imports-7.18.6" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.12.5"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz"; - sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"; + sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.12.1" = { + "@babel/helper-module-transforms-7.20.2" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.12.1"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz"; - sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz"; + sha512 = "zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA=="; }; }; - "@babel/helper-optimise-call-expression-7.12.10" = { - name = "_at_babel_slash_helper-optimise-call-expression"; - packageName = "@babel/helper-optimise-call-expression"; - version = "7.12.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz"; - sha512 = "4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ=="; - }; - }; - "@babel/helper-replace-supers-7.12.11" = { - name = "_at_babel_slash_helper-replace-supers"; - packageName = "@babel/helper-replace-supers"; - version = "7.12.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz"; - sha512 = "q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA=="; - }; - }; - "@babel/helper-simple-access-7.12.1" = { + "@babel/helper-simple-access-7.20.2" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.12.1"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz"; - sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz"; + sha512 = "+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA=="; }; }; - "@babel/helper-split-export-declaration-7.12.11" = { + "@babel/helper-split-export-declaration-7.18.6" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.12.11"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz"; - sha512 = "LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"; + sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; }; }; - "@babel/helper-validator-identifier-7.12.11" = { + "@babel/helper-string-parser-7.19.4" = { + name = "_at_babel_slash_helper-string-parser"; + packageName = "@babel/helper-string-parser"; + version = "7.19.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz"; + sha512 = "nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="; + }; + }; + "@babel/helper-validator-identifier-7.19.1" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.12.11"; + version = "7.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; - sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"; + sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; }; }; - "@babel/helpers-7.12.5" = { + "@babel/helper-validator-option-7.18.6" = { + name = "_at_babel_slash_helper-validator-option"; + packageName = "@babel/helper-validator-option"; + version = "7.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"; + sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; + }; + }; + "@babel/helpers-7.20.6" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.12.5"; + version = "7.20.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz"; - sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.6.tgz"; + sha512 = "Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w=="; }; }; - "@babel/highlight-7.10.4" = { + "@babel/highlight-7.18.6" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.10.4"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz"; - sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"; + sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.12.11" = { + "@babel/parser-7.20.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.12.11"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz"; - sha512 = "N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz"; + sha512 = "r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA=="; }; }; - "@babel/template-7.12.7" = { + "@babel/template-7.18.10" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.12.7"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz"; - sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz"; + sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; }; }; - "@babel/traverse-7.12.12" = { + "@babel/traverse-7.20.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.12.12"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz"; - sha512 = "s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.5.tgz"; + sha512 = "WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ=="; }; }; - "@babel/types-7.12.12" = { + "@babel/types-7.20.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.12.12"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz"; - sha512 = "lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.20.5.tgz"; + sha512 = "c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg=="; }; }; - "@eslint/eslintrc-0.3.0" = { + "@es-joy/jsdoccomment-0.10.8" = { + name = "_at_es-joy_slash_jsdoccomment"; + packageName = "@es-joy/jsdoccomment"; + version = "0.10.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.10.8.tgz"; + sha512 = "3P1JiGL4xaR9PoTKUHa2N/LKwa2/eUdRqGwijMWWgBqbFEqJUVpmaOi2TcjcemrsRMgFLBzQCK4ToPhrSVDiFQ=="; + }; + }; + "@eslint/eslintrc-0.4.3" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "0.3.0"; + version = "0.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz"; - sha512 = "1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"; + sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; + }; + }; + "@humanwhocodes/config-array-0.5.0" = { + name = "_at_humanwhocodes_slash_config-array"; + packageName = "@humanwhocodes/config-array"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz"; + sha512 = "FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg=="; + }; + }; + "@humanwhocodes/object-schema-1.2.1" = { + name = "_at_humanwhocodes_slash_object-schema"; + packageName = "@humanwhocodes/object-schema"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; + sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; }; }; "@istanbuljs/load-nyc-config-1.1.0" = { @@ -193,13 +256,76 @@ let sha512 = "VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ=="; }; }; - "@istanbuljs/schema-0.1.2" = { + "@istanbuljs/schema-0.1.3" = { name = "_at_istanbuljs_slash_schema"; packageName = "@istanbuljs/schema"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz"; - sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw=="; + url = "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz"; + sha512 = "ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="; + }; + }; + "@jridgewell/gen-mapping-0.1.1" = { + name = "_at_jridgewell_slash_gen-mapping"; + packageName = "@jridgewell/gen-mapping"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"; + sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; + }; + }; + "@jridgewell/gen-mapping-0.3.2" = { + name = "_at_jridgewell_slash_gen-mapping"; + packageName = "@jridgewell/gen-mapping"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"; + sha512 = "mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="; + }; + }; + "@jridgewell/resolve-uri-3.1.0" = { + name = "_at_jridgewell_slash_resolve-uri"; + packageName = "@jridgewell/resolve-uri"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"; + sha512 = "F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="; + }; + }; + "@jridgewell/set-array-1.1.2" = { + name = "_at_jridgewell_slash_set-array"; + packageName = "@jridgewell/set-array"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"; + sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; + }; + }; + "@jridgewell/sourcemap-codec-1.4.14" = { + name = "_at_jridgewell_slash_sourcemap-codec"; + packageName = "@jridgewell/sourcemap-codec"; + version = "1.4.14"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"; + sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; + }; + }; + "@jridgewell/trace-mapping-0.3.17" = { + name = "_at_jridgewell_slash_trace-mapping"; + packageName = "@jridgewell/trace-mapping"; + version = "0.3.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz"; + sha512 = "MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g=="; + }; + }; + "@jsdoc/salty-0.2.1" = { + name = "_at_jsdoc_slash_salty"; + packageName = "@jsdoc/salty"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.1.tgz"; + sha512 = "JXwylDNSHa549N9uceDYu8D4GMXwSo3H8CCPYEQqxhhHpxD28+lRl2b3bS/caaPj5w1YD3SWtrficJNTnUjGpg=="; }; }; "@postman/form-data-3.1.1" = { @@ -220,40 +346,85 @@ let sha512 = "k57fzmAZ2PJGxfOA4SGR05ejorHbVAa/84Hxh/2nAztjNXc4ZjOm9NUIk6/Z6LCrBvJZqjRZbN8e/nROVUPVdg=="; }; }; - "@sinonjs/commons-1.8.2" = { + "@sinonjs/commons-1.8.6" = { name = "_at_sinonjs_slash_commons"; packageName = "@sinonjs/commons"; - version = "1.8.2"; + version = "1.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz"; - sha512 = "sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw=="; + url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz"; + sha512 = "Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ=="; }; }; - "@sinonjs/fake-timers-6.0.1" = { + "@sinonjs/commons-2.0.0" = { + name = "_at_sinonjs_slash_commons"; + packageName = "@sinonjs/commons"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz"; + sha512 = "uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg=="; + }; + }; + "@sinonjs/fake-timers-7.1.2" = { name = "_at_sinonjs_slash_fake-timers"; packageName = "@sinonjs/fake-timers"; - version = "6.0.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz"; - sha512 = "MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA=="; + url = "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz"; + sha512 = "iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg=="; }; }; - "@sinonjs/samsam-5.3.1" = { + "@sinonjs/fake-timers-9.1.2" = { + name = "_at_sinonjs_slash_fake-timers"; + packageName = "@sinonjs/fake-timers"; + version = "9.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz"; + sha512 = "BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw=="; + }; + }; + "@sinonjs/samsam-6.1.3" = { name = "_at_sinonjs_slash_samsam"; packageName = "@sinonjs/samsam"; - version = "5.3.1"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.1.tgz"; - sha512 = "1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg=="; + url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.1.3.tgz"; + sha512 = "nhOb2dWPeb1sd3IQXL/dVPnKHDOAFfvichtBf4xV00/rU1QbPCQqKMbvIheIjqwVjh7qIgf2AHTHi391yMOMpQ=="; }; }; - "@sinonjs/text-encoding-0.7.1" = { + "@sinonjs/text-encoding-0.7.2" = { name = "_at_sinonjs_slash_text-encoding"; packageName = "@sinonjs/text-encoding"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz"; - sha512 = "+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ=="; + url = "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz"; + sha512 = "sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ=="; + }; + }; + "@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/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/markdown-it/-/markdown-it-12.2.3.tgz"; + sha512 = "GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ=="; + }; + }; + "@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=="; }; }; "@ungap/promise-all-settled-1.1.2" = { @@ -271,7 +442,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz"; - sha1 = "c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"; + sha512 = "mn0KSip7N4e0UDPZHnqDsHECo5uGQrixQKnAskOM1BIB8hd7QKbd6il8IPRPudPHOeHiECoCFqhyMaRO9+nWyA=="; }; }; "acorn-7.4.1" = { @@ -283,13 +454,13 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-jsx-5.3.1" = { + "acorn-jsx-5.3.2" = { name = "acorn-jsx"; packageName = "acorn-jsx"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; - sha512 = "K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng=="; + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; + sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; }; }; "aggregate-error-3.1.0" = { @@ -310,13 +481,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "ajv-7.0.4" = { + "ajv-8.11.2" = { name = "ajv"; packageName = "ajv"; - version = "7.0.4"; + version = "8.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-7.0.4.tgz"; - sha512 = "xzzzaqgEQfmuhbhAoqjJ8T/1okb6gAzXn/eQRNpAN1AEUoHJTNF9xCDRTtf/s3SKldtZfa+RJeTs+BQq+eZ/sw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz"; + sha512 = "E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg=="; }; }; "ansi-colors-4.1.1" = { @@ -328,6 +499,15 @@ let sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; }; }; + "ansi-colors-4.1.3" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz"; + sha512 = "/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw=="; + }; + }; "ansi-escape-sequences-4.1.0" = { name = "ansi-escape-sequences"; packageName = "ansi-escape-sequences"; @@ -337,49 +517,13 @@ let sha512 = "dzW9kHxH011uBsidTXd14JXgzye/YLb2LzeKZ4bsgl/Knwx8AtbSFkkGxagdNOoh0DlqHCmfiEjWKBaqjOanVw=="; }; }; - "ansi-regex-2.1.1" = { + "ansi-regex-5.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "2.1.1"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; - }; - }; - "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-regex-5.0.0" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; - }; - }; - "ansi-styles-2.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; }; "ansi-styles-3.2.1" = { @@ -400,13 +544,13 @@ let sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; - "anymatch-3.1.1" = { + "anymatch-3.1.3" = { name = "anymatch"; packageName = "anymatch"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"; - sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="; + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz"; + sha512 = "KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="; }; }; "append-transform-2.0.0" = { @@ -424,7 +568,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"; - sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; + sha512 = "Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw=="; }; }; "argparse-1.0.10" = { @@ -436,13 +580,22 @@ let sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; }; }; + "argparse-2.0.1" = { + name = "argparse"; + packageName = "argparse"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"; + sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; + }; + }; "array-back-1.0.4" = { name = "array-back"; packageName = "array-back"; version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz"; - sha1 = "644ba7f095f7ffcf7c43b5f0dc39d3c1f03c063b"; + sha512 = "1WxbZvrmyhkNoeYcizokbmh5oiOCIfyvGtcqbK3Ls1v1fKcquzxnQSceOx6tzq7jmai2kFLWIpGND2cLhH6TPw=="; }; }; "array-back-2.0.0" = { @@ -463,13 +616,13 @@ let sha512 = "TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q=="; }; }; - "array-back-4.0.1" = { + "array-back-4.0.2" = { name = "array-back"; packageName = "array-back"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/array-back/-/array-back-4.0.1.tgz"; - sha512 = "Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg=="; + url = "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz"; + sha512 = "NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg=="; }; }; "array-back-5.0.0" = { @@ -481,22 +634,22 @@ let sha512 = "kgVWwJReZWmVuWOQKEOohXKJX+nD02JAZ54D1RRWlv8L0NebauKAaFxACKzB74RTclt1+WNz5KHaLRDAPZbDEw=="; }; }; - "array-uniq-1.0.3" = { - name = "array-uniq"; - packageName = "array-uniq"; - version = "1.0.3"; + "array-back-6.2.2" = { + name = "array-back"; + packageName = "array-back"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; - sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + url = "https://registry.npmjs.org/array-back/-/array-back-6.2.2.tgz"; + sha512 = "gUAZ7HPyb4SJczXAMUXMGAvI976JoK3qEx9v1FTmeYuJj0IBiaKttG1ydtGKdkfqWkIkouke7nG8ufGy77+Cvw=="; }; }; - "asn1-0.2.4" = { + "asn1-0.2.6" = { name = "asn1"; packageName = "asn1"; - version = "0.2.4"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; - sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz"; + sha512 = "ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ=="; }; }; "assert-plus-1.0.0" = { @@ -505,7 +658,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="; }; }; "assertion-error-1.1.0" = { @@ -526,40 +679,31 @@ let sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; }; }; - "async-1.0.0" = { + "async-1.4.2" = { name = "async"; packageName = "async"; - version = "1.0.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz"; - sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; + url = "https://registry.npmjs.org/async/-/async-1.4.2.tgz"; + sha512 = "O4fvy4JjdS0Q8MYH4jOODxJdXGbZ61eqfXdmfFDloHSnWoggxkn/+xWbh2eQbmQ6pJNliaravcTK1iQMpW9k4Q=="; }; }; - "async-1.5.2" = { + "async-2.6.4" = { name = "async"; packageName = "async"; - version = "1.5.2"; + version = "2.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; - sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + url = "https://registry.npmjs.org/async/-/async-2.6.4.tgz"; + sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; }; }; - "async-2.6.3" = { + "async-3.2.3" = { name = "async"; packageName = "async"; - version = "2.6.3"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz"; - sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; - }; - }; - "async-3.2.0" = { - name = "async"; - packageName = "async"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz"; - sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; + url = "https://registry.npmjs.org/async/-/async-3.2.3.tgz"; + sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="; }; }; "asynckit-0.4.0" = { @@ -568,7 +712,7 @@ let version = "0.4.0"; src = fetchurl { url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + sha512 = "Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="; }; }; "aws-sign2-0.7.0" = { @@ -577,7 +721,7 @@ let version = "0.7.0"; src = fetchurl { url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + sha512 = "08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="; }; }; "aws4-1.11.0" = { @@ -589,13 +733,13 @@ let sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; }; - "balanced-match-1.0.0" = { + "balanced-match-1.0.2" = { name = "balanced-match"; packageName = "balanced-match"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; }; "base64-js-1.5.1" = { @@ -613,7 +757,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; - sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + sha512 = "qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w=="; }; }; "binary-extensions-2.2.0" = { @@ -640,7 +784,7 @@ let version = "2.11.0"; src = fetchurl { url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz"; - sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1"; + sha512 = "UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ=="; }; }; "bluebird-3.7.2" = { @@ -670,13 +814,13 @@ let sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; - "brotli-1.3.2" = { + "brotli-1.3.3" = { name = "brotli"; packageName = "brotli"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/brotli/-/brotli-1.3.2.tgz"; - sha1 = "525a9cad4fcba96475d7d388f6aecb13eed52f46"; + url = "https://registry.npmjs.org/brotli/-/brotli-1.3.3.tgz"; + sha512 = "oTKjJdShmDuGW94SyyaoQvAjf30dZaHnjJ8uAF+u2/vGJkJbJPJAT1gDiOJP5v1Zb6f9KEyW/1HpuaWIXtGHPg=="; }; }; "browser-stdout-1.3.1" = { @@ -688,6 +832,15 @@ let sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; }; }; + "browserslist-4.21.4" = { + name = "browserslist"; + packageName = "browserslist"; + version = "4.21.4"; + src = fetchurl { + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz"; + sha512 = "CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw=="; + }; + }; "buffer-alloc-1.2.0" = { name = "buffer-alloc"; packageName = "buffer-alloc"; @@ -712,16 +865,16 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz"; - sha1 = "f8f78b76789888ef39f205cd637f68e702122b2c"; + sha512 = "T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ=="; }; }; - "buffer-from-1.1.1" = { + "buffer-from-1.1.2" = { name = "buffer-from"; packageName = "buffer-from"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; }; }; "cache-point-2.0.0" = { @@ -760,13 +913,22 @@ let sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; - "camelcase-6.2.0" = { + "camelcase-6.3.0" = { name = "camelcase"; packageName = "camelcase"; - version = "6.2.0"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz"; - sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"; + sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; + }; + }; + "caniuse-lite-1.0.30001436" = { + name = "caniuse-lite"; + packageName = "caniuse-lite"; + version = "1.0.30001436"; + src = fetchurl { + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001436.tgz"; + sha512 = "ZmWkKsnC2ifEPoWUvSAIGyOYwT+keAaaWPHiQ9DfMqS1t6tfuyFYoWR78TeZtznkEQ64+vGXH9cZrElwR2Mrxg=="; }; }; "caseless-0.12.0" = { @@ -775,34 +937,25 @@ let version = "0.12.0"; src = fetchurl { url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; + sha512 = "4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="; }; }; - "catharsis-0.8.11" = { + "catharsis-0.9.0" = { name = "catharsis"; packageName = "catharsis"; - version = "0.8.11"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/catharsis/-/catharsis-0.8.11.tgz"; - sha512 = "a+xUyMV7hD1BrDQA/3iPV7oc+6W26BgVJO05PGEoatMyIuPScQKsde6i3YorWX1qs+AZjnJ18NqdKoCtKiNh1g=="; + url = "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz"; + sha512 = "prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A=="; }; }; - "chai-4.2.0" = { + "chai-4.3.7" = { name = "chai"; packageName = "chai"; - version = "4.2.0"; + version = "4.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz"; - sha512 = "XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw=="; - }; - }; - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + url = "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz"; + sha512 = "HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A=="; }; }; "chalk-2.4.2" = { @@ -814,22 +967,22 @@ let sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; - "chalk-4.1.0" = { + "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; - version = "4.1.0"; + version = "4.1.2"; 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.2.tgz"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; }; - "chardet-1.3.0" = { + "chardet-1.4.0" = { name = "chardet"; packageName = "chardet"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/chardet/-/chardet-1.3.0.tgz"; - sha512 = "cyTQGGptIjIT+CMGT5J/0l9c6Fb+565GCFjjeUTKxUO7w3oR+FcNCMEKTn5xtVKaLFmladN7QF68IiQsv5Fbdw=="; + url = "https://registry.npmjs.org/chardet/-/chardet-1.4.0.tgz"; + sha512 = "NpwMDdSIprbYx1CLnfbxEIarI0Z+s9MssEgggMNheGM+WD68yOhV7IEA/3r6tr0yTRgQD0HuZJDw32s99i6L+A=="; }; }; "charset-1.0.1" = { @@ -847,16 +1000,16 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz"; - sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82"; + sha512 = "BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA=="; }; }; - "chokidar-3.4.3" = { + "chokidar-3.5.3" = { name = "chokidar"; packageName = "chokidar"; - version = "3.4.3"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz"; - sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"; + sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; }; }; "chownr-1.1.4" = { @@ -877,31 +1030,22 @@ let sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; }; }; - "cli-progress-3.8.2" = { + "cli-progress-3.10.0" = { name = "cli-progress"; packageName = "cli-progress"; - version = "3.8.2"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.8.2.tgz"; - sha512 = "qRwBxLldMSfxB+YGFgNRaj5vyyHe1yMpVeDL79c+7puGujdKJHQHydgqXDcrkvQgJ5U/d3lpf6vffSoVVUftVQ=="; + url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.10.0.tgz"; + sha512 = "kLORQrhYCAtUPLZxqsAt2YJGOvRdt34+O6jl5cQGb7iF3dM55FQZlTR+rQyIK9JUcO9bBMwZsTlND+3dmFU2Cw=="; }; }; - "cli-table3-0.6.0" = { + "cli-table3-0.6.1" = { name = "cli-table3"; packageName = "cli-table3"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.0.tgz"; - sha512 = "gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ=="; - }; - }; - "cliui-5.0.0" = { - name = "cliui"; - packageName = "cliui"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; - sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; + url = "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.1.tgz"; + sha512 = "w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA=="; }; }; "cliui-6.0.0" = { @@ -913,6 +1057,15 @@ let sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; }; }; + "cliui-7.0.4" = { + name = "cliui"; + packageName = "cliui"; + version = "7.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"; + sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; + }; + }; "collect-all-1.0.4" = { name = "collect-all"; packageName = "collect-all"; @@ -946,7 +1099,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; }; }; "color-name-1.1.4" = { @@ -964,7 +1117,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; - sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + sha512 = "pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw=="; }; }; "colors-1.4.0" = { @@ -985,13 +1138,13 @@ let sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; - "command-line-args-5.1.1" = { + "command-line-args-5.2.1" = { name = "command-line-args"; packageName = "command-line-args"; - version = "5.1.1"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz"; - sha512 = "hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg=="; + url = "https://registry.npmjs.org/command-line-args/-/command-line-args-5.2.1.tgz"; + sha512 = "H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg=="; }; }; "command-line-tool-0.8.0" = { @@ -1027,43 +1180,43 @@ let version = "2.9.0"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + sha512 = "bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A=="; }; }; - "commander-6.2.0" = { + "commander-7.2.0" = { name = "commander"; packageName = "commander"; - version = "6.2.0"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz"; - sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q=="; + url = "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"; + sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; }; }; - "commander-6.2.1" = { + "commander-8.3.0" = { name = "commander"; packageName = "commander"; - version = "6.2.1"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz"; - sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="; + url = "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz"; + sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; }; }; - "comment-parser-0.7.6" = { + "comment-parser-1.2.4" = { name = "comment-parser"; packageName = "comment-parser"; - version = "0.7.6"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/comment-parser/-/comment-parser-0.7.6.tgz"; - sha512 = "GKNxVA7/iuTnAqGADlTWX4tkhzxZKXp5fLJqKTlQLHkE65XDUKutZ3BHaJC5IGcper2tT3QRD1xr4o3jNpgXXg=="; + url = "https://registry.npmjs.org/comment-parser/-/comment-parser-1.2.4.tgz"; + sha512 = "pm0b+qv+CkWNriSTMsfnjChF9kH0kxz55y44Wo5le9qLxMj5xDQAaEd9ZN1ovSuk9CsrncWaFwgpOMg7ClJwkw=="; }; }; - "common-sequence-2.0.0" = { + "common-sequence-2.0.2" = { name = "common-sequence"; packageName = "common-sequence"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/common-sequence/-/common-sequence-2.0.0.tgz"; - sha512 = "f0QqPLpRTgMQn/pQIynf+SdE73Lw5Q1jn4hjirHLgH/NJ71TiHjXusV16BmOyuK5rRQ1W2f++II+TFZbQOh4hA=="; + url = "https://registry.npmjs.org/common-sequence/-/common-sequence-2.0.2.tgz"; + sha512 = "jAg09gkdkrDO9EWTdXfv80WWH3yeZl5oT69fGfedBNS9pXUKYInVJ1bJ+/ht2+Moeei48TmSbQDYMc8EOx9G0g=="; }; }; "commondir-1.0.1" = { @@ -1072,7 +1225,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"; - sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; + sha512 = "W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="; }; }; "concat-map-0.0.1" = { @@ -1081,7 +1234,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; }; }; "concat-stream-1.6.2" = { @@ -1099,16 +1252,16 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/config-master/-/config-master-3.1.0.tgz"; - sha1 = "667663590505a283bf26a484d68489d74c5485da"; + sha512 = "n7LBL1zBzYdTpF1mx5DNcZnZn05CWIdsdvtPL4MosvqbBUK3Rq6VWEtGUuF3Y0s9/CIhMejezqlSkP6TnCJ/9g=="; }; }; - "convert-source-map-1.7.0" = { + "convert-source-map-1.9.0" = { name = "convert-source-map"; packageName = "convert-source-map"; - version = "1.7.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz"; - sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA=="; + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz"; + sha512 = "ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="; }; }; "core-util-is-1.0.2" = { @@ -1117,7 +1270,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="; }; }; "cross-spawn-7.0.3" = { @@ -1129,13 +1282,13 @@ let sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; }; - "csv-parse-4.14.2" = { + "csv-parse-4.16.3" = { name = "csv-parse"; packageName = "csv-parse"; - version = "4.14.2"; + version = "4.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.14.2.tgz"; - sha512 = "YE2xlTKtM035/94llhgsp9qFQxGi47EkQJ1pZ+mLT/98GpIsbjkMGAb7Rmu9hNxVfYFOLf10hP+rPVqnoccLgw=="; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.16.3.tgz"; + sha512 = "cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg=="; }; }; "cycle-1.0.3" = { @@ -1144,7 +1297,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; - sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + sha512 = "TVF6svNzeQCOpjCqsy0/CSy8VgObG3wXusJ73xW2GbG5rGx7lC8zxDSURicsXI2UsGdi2L0QNRCi745/wUDvsA=="; }; }; "dashdash-1.14.1" = { @@ -1153,7 +1306,7 @@ let version = "1.14.1"; src = fetchurl { url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; }; }; "date-format-0.0.2" = { @@ -1162,16 +1315,7 @@ let version = "0.0.2"; src = fetchurl { url = "https://registry.npmjs.org/date-format/-/date-format-0.0.2.tgz"; - sha1 = "fafd448f72115ef1e2b739155ae92f2be6c28dd1"; - }; - }; - "dbug-0.4.2" = { - name = "dbug"; - packageName = "dbug"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dbug/-/dbug-0.4.2.tgz"; - sha1 = "32b4b3105e8861043a6f9ac755d80e542d365b31"; + sha512 = "M4obuJx8jU5T91lcbwi0+QPNVaWOY1DQYz5xUuKYWO93osVzB2ZPqyDUc5T+mDjbA1X8VOb4JDZ+8r2MrSOp7Q=="; }; }; "debug-3.2.7" = { @@ -1183,22 +1327,22 @@ let sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; }; - "debug-4.2.0" = { + "debug-4.3.3" = { name = "debug"; packageName = "debug"; - version = "4.2.0"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"; - sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz"; + sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; }; }; - "debug-4.3.2" = { + "debug-4.3.4" = { name = "debug"; packageName = "debug"; - version = "4.3.2"; + version = "4.3.4"; 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.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; }; "decamelize-1.2.0" = { @@ -1207,7 +1351,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="; }; }; "decamelize-4.0.0" = { @@ -1219,13 +1363,13 @@ let sha512 = "9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ=="; }; }; - "deep-eql-3.0.1" = { + "deep-eql-4.1.3" = { name = "deep-eql"; packageName = "deep-eql"; - version = "3.0.1"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz"; - sha512 = "+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw=="; + url = "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz"; + sha512 = "WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw=="; }; }; "deep-extend-0.6.0" = { @@ -1237,22 +1381,22 @@ let sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; - "deep-is-0.1.3" = { + "deep-is-0.1.4" = { name = "deep-is"; packageName = "deep-is"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"; + sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; }; }; - "default-require-extensions-3.0.0" = { + "default-require-extensions-3.0.1" = { name = "default-require-extensions"; packageName = "default-require-extensions"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz"; - sha512 = "ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg=="; + url = "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz"; + sha512 = "eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw=="; }; }; "delayed-stream-1.0.0" = { @@ -1261,25 +1405,25 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; }; }; - "diff-4.0.2" = { + "diff-5.0.0" = { name = "diff"; packageName = "diff"; - version = "4.0.2"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"; - sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; + url = "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz"; + sha512 = "/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="; }; }; - "dmd-5.0.2" = { + "dmd-6.2.0" = { name = "dmd"; packageName = "dmd"; - version = "5.0.2"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dmd/-/dmd-5.0.2.tgz"; - sha512 = "npXsE2+/onRPk/LCrUmx7PcUSqcSVnbrDDMi2nBSawNZ8QXlHE/8xaEZ6pNqPD1lQZv8LGr1xEIpyxP336xyfw=="; + url = "https://registry.npmjs.org/dmd/-/dmd-6.2.0.tgz"; + sha512 = "uXWxLF1H7TkUAuoHK59/h/ts5cKavm2LnhrIgJWisip4BVzPoXavlwyoprFFn2CzcahKYgvkfaebS6oxzgflkg=="; }; }; "docker-modem-1.0.9" = { @@ -1318,58 +1462,13 @@ let sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; }; }; - "dom-serializer-0.2.2" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz"; - sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; - }; - }; - "domelementtype-1.3.1" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz"; - sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; - }; - }; - "domelementtype-2.1.0" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz"; - sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w=="; - }; - }; - "domhandler-2.4.2" = { - name = "domhandler"; - packageName = "domhandler"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz"; - sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; - }; - }; - "domutils-1.7.0" = { - name = "domutils"; - packageName = "domutils"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"; - sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; - }; - }; "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + sha512 = "eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw=="; }; }; "editorconfig-0.15.3" = { @@ -1381,13 +1480,13 @@ let sha512 = "M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g=="; }; }; - "emoji-regex-7.0.3" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "7.0.3"; + "electron-to-chromium-1.4.284" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.4.284"; src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; - sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz"; + sha512 = "M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="; }; }; "emoji-regex-8.0.0" = { @@ -1417,31 +1516,13 @@ let sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; }; }; - "entities-1.1.2" = { + "entities-2.1.0" = { name = "entities"; packageName = "entities"; - version = "1.1.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz"; - sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; - }; - }; - "entities-2.0.3" = { - name = "entities"; - packageName = "entities"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz"; - sha512 = "MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ=="; - }; - }; - "entities-2.2.0" = { - name = "entities"; - packageName = "entities"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; - sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; + url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz"; + sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; }; }; "es6-error-4.1.1" = { @@ -1453,13 +1534,13 @@ let sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="; }; }; - "escape-html-1.0.3" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.3"; + "escalade-3.1.1" = { + name = "escalade"; + packageName = "escalade"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; }; "escape-string-regexp-1.0.5" = { @@ -1468,7 +1549,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; }; }; "escape-string-regexp-2.0.0" = { @@ -1489,49 +1570,49 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-7.19.0" = { + "eslint-7.32.0" = { name = "eslint"; packageName = "eslint"; - version = "7.19.0"; + version = "7.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.19.0.tgz"; - sha512 = "CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz"; + sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; }; - "eslint-plugin-jsdoc-30.7.13" = { + "eslint-plugin-jsdoc-36.1.1" = { name = "eslint-plugin-jsdoc"; packageName = "eslint-plugin-jsdoc"; - version = "30.7.13"; + version = "36.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.13.tgz"; - sha512 = "YM4WIsmurrp0rHX6XiXQppqKB8Ne5ATiZLJe2+/fkp9l9ExXFr43BbAbjZaVrpCT+tuPYOZ8k1MICARHnURUNQ=="; + url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.1.1.tgz"; + sha512 = "nuLDvH1EJaKx0PCa9oeQIxH6pACIhZd1gkalTUxZbaxxwokjs7TplqY0Q8Ew3CoZaf5aowm0g/Z3JGHCatt+gQ=="; }; }; - "eslint-plugin-lodash-7.1.0" = { + "eslint-plugin-lodash-7.4.0" = { name = "eslint-plugin-lodash"; packageName = "eslint-plugin-lodash"; - version = "7.1.0"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-lodash/-/eslint-plugin-lodash-7.1.0.tgz"; - sha512 = "BRkEI/+ZjmeDCM1DfzR+NVwYkC/+ChJhaOSm3Xm7rer/fs89TKU6AMtkQiDdqQel1wZ4IJM+B6hlep9xwVKaMQ=="; + url = "https://registry.npmjs.org/eslint-plugin-lodash/-/eslint-plugin-lodash-7.4.0.tgz"; + sha512 = "Tl83UwVXqe1OVeBRKUeWcfg6/pCW1GTRObbdnbEJgYwjxp5Q92MEWQaH9+dmzbRt6kvYU1Mp893E79nJiCSM8A=="; }; }; - "eslint-plugin-mocha-8.0.0" = { + "eslint-plugin-mocha-10.1.0" = { name = "eslint-plugin-mocha"; packageName = "eslint-plugin-mocha"; - version = "8.0.0"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-8.0.0.tgz"; - sha512 = "n67etbWDz6NQM+HnTwZHyBwz/bLlYPOxUbw7bPuCyFujv7ZpaT/Vn6KTAbT02gf7nRljtYIjWcTxK/n8a57rQQ=="; + url = "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.1.0.tgz"; + sha512 = "xLqqWUF17llsogVOC+8C6/jvQ+4IoOREbN7ZCHuOHuD6cT5cDD4h7f2LgsZuzMAiwswWE21tO7ExaknHVDrSkw=="; }; }; - "eslint-plugin-security-1.4.0" = { + "eslint-plugin-security-1.5.0" = { name = "eslint-plugin-security"; packageName = "eslint-plugin-security"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-security/-/eslint-plugin-security-1.4.0.tgz"; - sha512 = "xlS7P2PLMXeqfhyf3NpqbvbnW04kN8M9NtmhpR3XGyOvt/vNKS7XPXT5EDbwKW9vCjWH4PpfQvgD/+JgN0VJKA=="; + url = "https://registry.npmjs.org/eslint-plugin-security/-/eslint-plugin-security-1.5.0.tgz"; + sha512 = "hAFVwLZ/UeXrlyVD2TDarv/x00CoFVpaY0IUZhKjPjiFxqkuQVixsK4f2rxngeQOqSxi6OUjzJM/jMwKEVjJ8g=="; }; }; "eslint-scope-5.1.1" = { @@ -1552,6 +1633,15 @@ let sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; }; }; + "eslint-utils-3.0.0" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"; + sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; + }; + }; "eslint-visitor-keys-1.3.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -1561,13 +1651,13 @@ let sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; }; }; - "eslint-visitor-keys-2.0.0" = { + "eslint-visitor-keys-2.1.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; - sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="; + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; }; }; "espree-7.3.1" = { @@ -1588,13 +1678,13 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; - "esquery-1.3.1" = { + "esquery-1.4.0" = { name = "esquery"; packageName = "esquery"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz"; - sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="; + url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"; + sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; }; }; "esrecurse-4.3.0" = { @@ -1615,13 +1705,13 @@ let sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; }; - "estraverse-5.2.0" = { + "estraverse-5.3.0" = { name = "estraverse"; packageName = "estraverse"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz"; - sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"; + sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; }; }; "esutils-2.0.3" = { @@ -1657,7 +1747,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + sha512 = "11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="; }; }; "eyes-0.1.8" = { @@ -1666,16 +1756,16 @@ let version = "0.1.8"; src = fetchurl { url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + sha512 = "GipyPsXO1anza0AOZdy69Im7hGFCNB7Y/NGjDlZGJ3GJJLtwNSb2vrzYrTYJRrRloVx7pl+bhUaTB8yiccPvFQ=="; }; }; - "faker-5.1.0" = { + "faker-5.5.3" = { name = "faker"; packageName = "faker"; - version = "5.1.0"; + version = "5.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/faker/-/faker-5.1.0.tgz"; - sha512 = "RrWKFSSA/aNLP0g3o2WW1Zez7/MnMr7xkiZmoCfAGZmdkDQZ6l2KtuXHN5XjdvpRjDl8+3vf+Rrtl06Z352+Mw=="; + url = "https://registry.npmjs.org/faker/-/faker-5.5.3.tgz"; + sha512 = "wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g=="; }; }; "fast-deep-equal-3.1.3" = { @@ -1702,25 +1792,25 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; }; }; - "file-entry-cache-6.0.0" = { + "file-entry-cache-6.0.1" = { name = "file-entry-cache"; packageName = "file-entry-cache"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz"; - sha512 = "fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA=="; + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; }; }; - "file-set-4.0.1" = { + "file-set-4.0.2" = { name = "file-set"; packageName = "file-set"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/file-set/-/file-set-4.0.1.tgz"; - sha512 = "tRzX4kGPmxS2HDK2q2L4qcPopTl/gcyahve2/O8l8hHNJgJ7m+r/ZncCJ1MmFWEMp1yHxJGIU9gAcsWu5jPMpg=="; + url = "https://registry.npmjs.org/file-set/-/file-set-4.0.2.tgz"; + sha512 = "fuxEgzk4L8waGXaAkd8cMr73Pm0FxOVkn8hztzUW7BAHhOGH90viQNXbiOsnecCWmfInqU6YmAMwxRMdKETceQ=="; }; }; "file-type-3.9.0" = { @@ -1729,16 +1819,16 @@ let version = "3.9.0"; src = fetchurl { url = "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"; - sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; + sha512 = "RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA=="; }; }; - "filesize-6.1.0" = { + "filesize-8.0.7" = { name = "filesize"; packageName = "filesize"; - version = "6.1.0"; + version = "8.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz"; - sha512 = "LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg=="; + url = "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz"; + sha512 = "pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ=="; }; }; "fill-range-7.0.1" = { @@ -1750,13 +1840,13 @@ let sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; - "find-cache-dir-3.3.1" = { + "find-cache-dir-3.3.2" = { name = "find-cache-dir"; packageName = "find-cache-dir"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; - sha512 = "t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ=="; + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz"; + sha512 = "wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig=="; }; }; "find-replace-3.0.0" = { @@ -1768,15 +1858,6 @@ let sha512 = "6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ=="; }; }; - "find-up-3.0.0" = { - name = "find-up"; - packageName = "find-up"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; - sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; - }; - }; "find-up-4.1.0" = { name = "find-up"; packageName = "find-up"; @@ -1813,13 +1894,13 @@ let sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; }; }; - "flatted-3.1.0" = { + "flatted-3.1.1" = { name = "flatted"; packageName = "flatted"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz"; - sha512 = "tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz"; + sha512 = "zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA=="; }; }; "foreground-child-2.0.0" = { @@ -1837,7 +1918,7 @@ let version = "0.6.1"; src = fetchurl { url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + sha512 = "j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="; }; }; "fromentries-1.3.2" = { @@ -1864,7 +1945,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fs-then-native/-/fs-then-native-2.0.0.tgz"; - sha1 = "19a124d94d90c22c8e045f2e8dd6ebea36d48c67"; + sha512 = "X712jAOaWXkemQCAmWeg5rOT2i+KOpWz1Z/txk/cW0qlOu2oQ9H61vc5w3X/iyuUEfq/OyaFJ78/cZAQD1/bgA=="; }; }; "fs.realpath-1.0.0" = { @@ -1873,16 +1954,16 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; }; }; - "fsevents-2.1.3" = { + "fsevents-2.3.2" = { name = "fsevents"; packageName = "fsevents"; - version = "2.1.3"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; - sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"; + sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; }; }; "function-bind-1.1.1" = { @@ -1900,7 +1981,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + sha512 = "dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="; }; }; "gensync-1.0.0-beta.2" = { @@ -1927,7 +2008,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz"; - sha1 = "ead774abee72e20409433a066366023dd6887a41"; + sha512 = "Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig=="; }; }; "get-package-type-0.1.0" = { @@ -1945,25 +2026,34 @@ let version = "0.1.7"; src = fetchurl { url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + sha512 = "0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng=="; }; }; - "glob-7.1.6" = { + "glob-7.2.0" = { name = "glob"; packageName = "glob"; - version = "7.1.6"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + url = "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"; + sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; }; - "glob-parent-5.1.1" = { + "glob-7.2.3" = { + name = "glob"; + packageName = "glob"; + version = "7.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"; + sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; + }; + }; + "glob-parent-5.1.2" = { name = "glob-parent"; packageName = "glob-parent"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; - sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; + sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; }; }; "globals-11.12.0" = { @@ -1975,22 +2065,22 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-12.4.0" = { + "globals-13.18.0" = { name = "globals"; packageName = "globals"; - version = "12.4.0"; + version = "13.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"; - sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; + url = "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz"; + sha512 = "/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A=="; }; }; - "graceful-fs-4.2.4" = { + "graceful-fs-4.2.10" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.4"; + version = "4.2.10"; 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.10.tgz"; + sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; }; }; "graceful-readlink-1.0.1" = { @@ -1999,7 +2089,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + sha512 = "8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w=="; }; }; "growl-1.10.5" = { @@ -2011,13 +2101,13 @@ let sha512 = "qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA=="; }; }; - "handlebars-4.7.6" = { + "handlebars-4.7.7" = { name = "handlebars"; packageName = "handlebars"; - version = "4.7.6"; + version = "4.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz"; - sha512 = "1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA=="; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz"; + sha512 = "aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA=="; }; }; "har-schema-2.0.0" = { @@ -2026,7 +2116,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + sha512 = "Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="; }; }; "har-validator-5.1.5" = { @@ -2047,22 +2137,13 @@ let sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - }; "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"; + sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; }; }; "has-flag-4.0.0" = { @@ -2101,58 +2182,49 @@ let sha512 = "H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="; }; }; - "htmlparser2-3.10.1" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "3.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz"; - sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="; - }; - }; "http-reasons-0.1.0" = { name = "http-reasons"; packageName = "http-reasons"; version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/http-reasons/-/http-reasons-0.1.0.tgz"; - sha1 = "a953ca670078669dde142ce899401b9d6e85d3b4"; + sha512 = "P6kYh0lKZ+y29T2Gqz+RlC9WBLhKe8kDmcJ+A+611jFfxdPsbMRQ5aNmFRM3lENqFkK+HTTL+tlQviAiv0AbLQ=="; }; }; - "http-signature-1.3.5" = { + "http-signature-1.3.6" = { name = "http-signature"; packageName = "http-signature"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.5.tgz"; - sha512 = "NwoTQYSJoFt34jSBbwzDHDofoA61NGXzu6wXh95o1Ry62EnmKjXb/nR/RknLeZ3G/uGwrlKNY2z7uPt+Cdl7Tw=="; + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz"; + sha512 = "3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw=="; }; }; - "httpntlm-1.7.6" = { + "httpntlm-1.7.7" = { name = "httpntlm"; packageName = "httpntlm"; - version = "1.7.6"; + version = "1.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/httpntlm/-/httpntlm-1.7.6.tgz"; - sha1 = "6991e8352836007d67101b83db8ed0f915f906d0"; + url = "https://registry.npmjs.org/httpntlm/-/httpntlm-1.7.7.tgz"; + sha512 = "Pv2Rvrz8H0qv1Dne5mAdZ9JegG1uc6Vu5lwLflIY6s8RKHdZQbW39L4dYswSgqMDT0pkJILUTKjeyU0VPNRZjA=="; }; }; - "httpreq-0.4.24" = { + "httpreq-0.5.2" = { name = "httpreq"; packageName = "httpreq"; - version = "0.4.24"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/httpreq/-/httpreq-0.4.24.tgz"; - sha1 = "4335ffd82cd969668a39465c929ac61d6393627f"; + url = "https://registry.npmjs.org/httpreq/-/httpreq-0.5.2.tgz"; + sha512 = "2Jm+x9WkExDOeFRrdBCBSpLPT5SokTcRHkunV3pjKmX/cx6av8zQ0WtHUMDrYb6O4hBFzNU6sxJEypvRUVYKnw=="; }; }; - "iconv-lite-0.6.2" = { + "iconv-lite-0.6.3" = { name = "iconv-lite"; packageName = "iconv-lite"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz"; - sha512 = "2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ=="; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; }; }; "ignore-4.0.6" = { @@ -2179,7 +2251,7 @@ let version = "0.1.4"; src = fetchurl { url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; }; }; "indent-string-4.0.0" = { @@ -2197,7 +2269,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; }; }; "inherits-2.0.4" = { @@ -2209,15 +2281,6 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; - "intel-1.2.0" = { - name = "intel"; - packageName = "intel"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/intel/-/intel-1.2.0.tgz"; - sha1 = "11d1147eb6b3f4582bdf5337b37d541584e9e41e"; - }; - }; "interpret-1.4.0" = { name = "interpret"; packageName = "interpret"; @@ -2233,7 +2296,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz"; - sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; + sha512 = "58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw=="; }; }; "is-binary-path-2.1.0" = { @@ -2245,13 +2308,13 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; - "is-core-module-2.2.0" = { + "is-core-module-2.11.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.2.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz"; - sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz"; + sha512 = "RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw=="; }; }; "is-extglob-2.1.1" = { @@ -2260,16 +2323,7 @@ let 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"; + sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; }; }; "is-fullwidth-code-point-3.0.0" = { @@ -2281,13 +2335,13 @@ let sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; }; - "is-glob-4.0.1" = { + "is-glob-4.0.3" = { name = "is-glob"; packageName = "is-glob"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; - sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"; + sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; }; }; "is-number-7.0.0" = { @@ -2308,13 +2362,13 @@ let sha512 = "YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="; }; }; - "is-stream-2.0.0" = { + "is-stream-2.0.1" = { name = "is-stream"; packageName = "is-stream"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; - sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"; + sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; }; }; "is-typedarray-1.0.0" = { @@ -2323,7 +2377,16 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="; + }; + }; + "is-unicode-supported-0.1.0" = { + name = "is-unicode-supported"; + packageName = "is-unicode-supported"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; + sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; }; }; "is-windows-1.0.2" = { @@ -2341,7 +2404,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + sha512 = "D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="; }; }; "isarray-1.0.0" = { @@ -2350,7 +2413,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; }; "isexe-2.0.0" = { @@ -2359,7 +2422,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; }; }; "isstream-0.1.2" = { @@ -2368,16 +2431,16 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + sha512 = "Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="; }; }; - "istanbul-lib-coverage-3.0.0" = { + "istanbul-lib-coverage-3.2.0" = { name = "istanbul-lib-coverage"; packageName = "istanbul-lib-coverage"; - version = "3.0.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz"; - sha512 = "UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg=="; + url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz"; + sha512 = "eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="; }; }; "istanbul-lib-hook-3.0.0" = { @@ -2398,13 +2461,13 @@ let sha512 = "BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ=="; }; }; - "istanbul-lib-processinfo-2.0.2" = { + "istanbul-lib-processinfo-2.0.3" = { name = "istanbul-lib-processinfo"; packageName = "istanbul-lib-processinfo"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz"; - sha512 = "kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw=="; + url = "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz"; + sha512 = "NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg=="; }; }; "istanbul-lib-report-3.0.0" = { @@ -2416,22 +2479,22 @@ let sha512 = "wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw=="; }; }; - "istanbul-lib-source-maps-4.0.0" = { + "istanbul-lib-source-maps-4.0.1" = { name = "istanbul-lib-source-maps"; packageName = "istanbul-lib-source-maps"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz"; - sha512 = "c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg=="; + url = "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz"; + sha512 = "n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw=="; }; }; - "istanbul-reports-3.0.2" = { + "istanbul-reports-3.1.5" = { name = "istanbul-reports"; packageName = "istanbul-reports"; - version = "3.0.2"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz"; - sha512 = "9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw=="; + url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz"; + sha512 = "nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w=="; }; }; "js-sha512-0.8.0" = { @@ -2461,15 +2524,6 @@ let sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; }; }; - "js-yaml-3.14.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz"; - sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A=="; - }; - }; "js-yaml-3.14.1" = { name = "js-yaml"; packageName = "js-yaml"; @@ -2479,13 +2533,22 @@ let sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; }; }; - "js2xmlparser-4.0.1" = { + "js-yaml-4.1.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"; + sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; + }; + }; + "js2xmlparser-4.0.2" = { name = "js2xmlparser"; packageName = "js2xmlparser"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.1.tgz"; - sha512 = "KrPTolcw6RocpYjdC7pL7v62e55q7qOMHvLX1UCLc5AAS8qeJ6nukarEJAF2KL2PZxlbGueEbINqZR2bDe/gUw=="; + url = "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz"; + sha512 = "6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA=="; }; }; "jsbn-0.1.1" = { @@ -2494,52 +2557,70 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + sha512 = "UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="; }; }; - "jsdoc-3.6.6" = { + "jsdoc-3.6.11" = { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.6"; + version = "3.6.11"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.6.tgz"; - sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.11.tgz"; + sha512 = "8UCU0TYeIYD9KeLzEcAu2q8N/mx9O3phAGl32nmHlE0LpaJL71mMkP4d+QE5zWfNt50qheHtOZ0qoxVrsX5TUg=="; }; }; - "jsdoc-api-6.0.0" = { + "jsdoc-4.0.0" = { + name = "jsdoc"; + packageName = "jsdoc"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.0.tgz"; + sha512 = "tzTgkklbWKrlaQL2+e3NNgLcZu3NaK2vsHRx7tyHQ+H5jcB9Gx0txSd2eJWlMC/xU1+7LQu4s58Ry0RkuaEQVg=="; + }; + }; + "jsdoc-api-7.2.0" = { name = "jsdoc-api"; packageName = "jsdoc-api"; - version = "6.0.0"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc-api/-/jsdoc-api-6.0.0.tgz"; - sha512 = "zvfB63nAc9e+Rv2kKmJfE6tmo4x8KFho5vKr6VfYTlCCgqtrfPv0McCdqT4betUT9rWtw0zGkNUVkVqeQipY6Q=="; + url = "https://registry.npmjs.org/jsdoc-api/-/jsdoc-api-7.2.0.tgz"; + sha512 = "93YDnlm/OYTlLOFeNs4qAv0RBCJ0kGj67xQaWy8wrbk97Rw1EySitoOTHsTHXPEs3uyx2IStPKGrbE7LTnZXbA=="; }; }; - "jsdoc-parse-5.0.0" = { + "jsdoc-parse-6.2.0" = { name = "jsdoc-parse"; packageName = "jsdoc-parse"; - version = "5.0.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc-parse/-/jsdoc-parse-5.0.0.tgz"; - sha512 = "Khw8c3glrTeA3/PfUJUBvhrMhWpSClORBUvL4pvq2wFcqvUVmA96wxnMkCno2GfZY4pnd8BStK5WGKGyn4Vckg=="; + url = "https://registry.npmjs.org/jsdoc-parse/-/jsdoc-parse-6.2.0.tgz"; + sha512 = "Afu1fQBEb7QHt6QWX/6eUWvYHJofB90Fjx7FuJYF7mnG9z5BkAIpms1wsnvYLytfmqpEENHs/fax9p8gvMj7dw=="; }; }; - "jsdoc-to-markdown-6.0.1" = { + "jsdoc-to-markdown-7.1.1" = { name = "jsdoc-to-markdown"; packageName = "jsdoc-to-markdown"; - version = "6.0.1"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc-to-markdown/-/jsdoc-to-markdown-6.0.1.tgz"; - sha512 = "hUI2PAR5n/KlmQU3mAWO9i3D7jVbhyvUHfQ6oYVBt+wnnsyxpsAuhCODY1ryLOb2U9OPJd4GIK9mL2hqy7fHDg=="; + url = "https://registry.npmjs.org/jsdoc-to-markdown/-/jsdoc-to-markdown-7.1.1.tgz"; + sha512 = "CI86d63xAVNO+ENumWwmJ034lYe5iGU5GwjtTA11EuphP9tpnoi4hrKgR/J8uME0D+o4KUpVfwX1fjZhc8dEtg=="; }; }; - "jsdoctypeparser-9.0.0" = { - name = "jsdoctypeparser"; - packageName = "jsdoctypeparser"; - version = "9.0.0"; + "jsdoc-type-pratt-parser-1.1.1" = { + name = "jsdoc-type-pratt-parser"; + packageName = "jsdoc-type-pratt-parser"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz"; - sha512 = "jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw=="; + url = "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.1.1.tgz"; + sha512 = "uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g=="; + }; + }; + "jsdoc-type-pratt-parser-1.2.0" = { + name = "jsdoc-type-pratt-parser"; + packageName = "jsdoc-type-pratt-parser"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.2.0.tgz"; + sha512 = "4STjeF14jp4bqha44nKMY1OUI6d2/g6uclHWUCZ7B4DoLzaB5bmpTkQrpqU+vSVzMD0LsKAOskcnI3I3VfIpmg=="; }; }; "jsesc-2.5.2" = { @@ -2551,13 +2632,13 @@ let sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; - "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" = { @@ -2584,7 +2665,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; }; }; "json-stringify-safe-5.0.1" = { @@ -2593,16 +2674,16 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; }; - "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=="; }; }; "jsonparse-1.3.1" = { @@ -2611,16 +2692,16 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"; - sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; + sha512 = "POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg=="; }; }; - "jsprim-1.4.1" = { + "jsprim-2.0.2" = { name = "jsprim"; packageName = "jsprim"; - version = "1.4.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz"; + sha512 = "gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ=="; }; }; "junit-report-builder-2.1.0" = { @@ -2632,13 +2713,13 @@ let sha512 = "Ioj5I4w18ZcHFaaisqCKdh1z+ipzN7sA2JB+h+WOlGcOMWm0FFN1dfxkgc2I4EXfhSP/mOfM3W43uFzEdz4sTw=="; }; }; - "just-extend-4.1.1" = { + "just-extend-4.2.1" = { name = "just-extend"; packageName = "just-extend"; - version = "4.1.1"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz"; - sha512 = "aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA=="; + url = "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz"; + sha512 = "g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg=="; }; }; "klaw-3.0.0" = { @@ -2659,13 +2740,13 @@ let sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; }; - "linkify-it-2.2.0" = { + "linkify-it-3.0.3" = { name = "linkify-it"; packageName = "linkify-it"; - version = "2.2.0"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz"; - sha512 = "GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw=="; + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz"; + sha512 = "ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ=="; }; }; "liquid-json-0.3.1" = { @@ -2674,16 +2755,7 @@ let version = "0.3.1"; src = fetchurl { url = "https://registry.npmjs.org/liquid-json/-/liquid-json-0.3.1.tgz"; - sha1 = "9155a18136d8a6b2615e5f16f9a2448ab6b50eea"; - }; - }; - "locate-path-3.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; - sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; + sha512 = "wUayTU8MS827Dam6MxgD72Ui+KOSF+u/eIqpatOtjnvgJ0+mnDq33uC2M7J0tPK+upe/DpUAuK4JUU89iBoNKQ=="; }; }; "locate-path-5.0.0" = { @@ -2710,25 +2782,16 @@ let version = "2.4.2"; src = fetchurl { url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; - sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; + sha512 = "Kak1hi6/hYHGVPmdyiZijoQyz5x2iGVzs6w9GYB/HiXEtylY7tIoYEROMjvM1d9nXJqPOrG2MNPMn01bJ+S0Rw=="; }; }; - "lodash-3.10.1" = { + "lodash-4.17.21" = { name = "lodash"; packageName = "lodash"; - version = "3.10.1"; + version = "4.17.21"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; - sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; - }; - }; - "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=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; }; "lodash.camelcase-4.3.0" = { @@ -2737,25 +2800,7 @@ let version = "4.3.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; - sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; - }; - }; - "lodash.clonedeep-4.5.0" = { - name = "lodash.clonedeep"; - packageName = "lodash.clonedeep"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; - sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; - }; - }; - "lodash.escaperegexp-4.1.2" = { - name = "lodash.escaperegexp"; - packageName = "lodash.escaperegexp"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz"; - sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; + sha512 = "TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="; }; }; "lodash.flattendeep-4.4.0" = { @@ -2764,7 +2809,7 @@ let version = "4.4.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; - sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; + sha512 = "uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ=="; }; }; "lodash.get-4.4.2" = { @@ -2773,34 +2818,16 @@ let version = "4.4.2"; src = fetchurl { url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; - sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + sha512 = "z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="; }; }; - "lodash.isplainobject-4.0.6" = { - name = "lodash.isplainobject"; - packageName = "lodash.isplainobject"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; - sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; - }; - }; - "lodash.isstring-4.0.1" = { - name = "lodash.isstring"; - packageName = "lodash.isstring"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; - sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; - }; - }; - "lodash.mergewith-4.6.2" = { - name = "lodash.mergewith"; - packageName = "lodash.mergewith"; + "lodash.merge-4.6.2" = { + name = "lodash.merge"; + packageName = "lodash.merge"; version = "4.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz"; - sha512 = "GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ=="; + url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; }; "lodash.omit-4.5.0" = { @@ -2809,7 +2836,7 @@ let version = "4.5.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz"; - sha1 = "6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"; + sha512 = "XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg=="; }; }; "lodash.padend-4.6.1" = { @@ -2818,7 +2845,7 @@ let version = "4.6.1"; src = fetchurl { url = "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz"; - sha1 = "53ccba047d06e158d311f45da625f4e49e6f166e"; + sha512 = "sOQs2aqGpbl27tmCS1QNZA09Uqp01ZzWfDUoD+xzTii0E7dSQfRKcRetFwa+uXaxaqL+TKm7CgD2JdKP7aZBSw=="; }; }; "lodash.pick-4.4.0" = { @@ -2827,25 +2854,34 @@ let version = "4.4.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"; - sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; + sha512 = "hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q=="; }; }; - "lodash.set-4.3.2" = { - name = "lodash.set"; - packageName = "lodash.set"; - version = "4.3.2"; + "lodash.truncate-4.4.2" = { + name = "lodash.truncate"; + packageName = "lodash.truncate"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz"; - sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; + url = "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha512 = "jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw=="; }; }; - "log-symbols-4.0.0" = { + "log-symbols-4.1.0" = { name = "log-symbols"; packageName = "log-symbols"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz"; - sha512 = "FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA=="; + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz"; + sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; + }; + }; + "loupe-2.3.6" = { + name = "loupe"; + packageName = "loupe"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz"; + sha512 = "RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA=="; }; }; "lru-cache-4.1.5" = { @@ -2884,40 +2920,31 @@ let sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; }; - "markdown-it-10.0.0" = { + "markdown-it-12.3.2" = { name = "markdown-it"; packageName = "markdown-it"; - version = "10.0.0"; + version = "12.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz"; - sha512 = "YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg=="; + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz"; + sha512 = "TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg=="; }; }; - "markdown-it-anchor-5.3.0" = { + "markdown-it-anchor-8.6.5" = { name = "markdown-it-anchor"; packageName = "markdown-it-anchor"; - version = "5.3.0"; + version = "8.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.3.0.tgz"; - sha512 = "/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA=="; + url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.5.tgz"; + sha512 = "PI1qEHHkTNWT+X6Ip9w+paonfIQ+QZP9sCeMYi47oqhH+EsW8CrJ8J7CzV19QVOj6il8ATGbK2nTECj22ZHGvQ=="; }; }; - "marked-0.8.2" = { + "marked-4.2.4" = { name = "marked"; packageName = "marked"; - version = "0.8.2"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.8.2.tgz"; - sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; - }; - }; - "marked-1.2.7" = { - name = "marked"; - packageName = "marked"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-1.2.7.tgz"; - sha512 = "No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA=="; + url = "https://registry.npmjs.org/marked/-/marked-4.2.4.tgz"; + sha512 = "Wcc9ikX7Q5E4BYDPvh1C6QNSxrjC9tBgz+A/vAhp59KXUgachw++uMvMKiSW8oA85nopmPZcEvBoex/YLMsiyA=="; }; }; "mdurl-1.0.1" = { @@ -2926,61 +2953,70 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"; - sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; + sha512 = "/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="; }; }; - "mime-db-1.45.0" = { + "mime-db-1.51.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.45.0"; + version = "1.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz"; - sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"; + sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; }; - "mime-format-2.0.0" = { + "mime-format-2.0.1" = { name = "mime-format"; packageName = "mime-format"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mime-format/-/mime-format-2.0.0.tgz"; - sha1 = "e29f8891e284d78270246f0050d6834bdbbe1332"; + url = "https://registry.npmjs.org/mime-format/-/mime-format-2.0.1.tgz"; + sha512 = "XxU3ngPbEnrYnNbIX+lYSaYg0M01v6p2ntd2YaFksTu0vayaw5OJvbdRyWs07EYRlLED5qadUZ+xo+XhOvFhwg=="; }; }; - "mime-types-2.1.28" = { + "mime-types-2.1.34" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.28"; + version = "2.1.34"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz"; - sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"; + sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; }; }; - "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.7" = { name = "minimist"; packageName = "minimist"; - version = "1.2.5"; + version = "1.2.7"; 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.7.tgz"; + sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; }; }; - "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" = { @@ -2992,22 +3028,22 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "mkdirp2-1.0.4" = { + "mkdirp2-1.0.5" = { name = "mkdirp2"; packageName = "mkdirp2"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp2/-/mkdirp2-1.0.4.tgz"; - sha512 = "Q2PKB4ZR4UPtjLl76JfzlgSCUZhSV1AXQgAZa1qt5RiaALFjP/CDrGvFBrOz7Ck6McPcwMAxTsJvWOUjOU8XMw=="; + url = "https://registry.npmjs.org/mkdirp2/-/mkdirp2-1.0.5.tgz"; + sha512 = "xOE9xbICroUDmG1ye2h4bZ8WBie9EGmACaco8K8cx6RlkJJrxGIqjGqztAI+NMhexXBcdGbSEzI6N3EJPevxZw=="; }; }; - "mocha-8.2.1" = { + "mocha-9.2.2" = { name = "mocha"; packageName = "mocha"; - version = "8.2.1"; + version = "9.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz"; - sha512 = "cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz"; + sha512 = "L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g=="; }; }; "ms-2.1.2" = { @@ -3028,13 +3064,13 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "nanoid-3.1.12" = { + "nanoid-3.3.1" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.12"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz"; - sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz"; + sha512 = "n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="; }; }; "natural-compare-1.4.0" = { @@ -3043,7 +3079,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; - sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; }; }; "neo-async-2.6.2" = { @@ -3055,22 +3091,22 @@ let sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; }; }; - "nise-4.0.4" = { + "nise-5.1.3" = { name = "nise"; packageName = "nise"; - version = "4.0.4"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/nise/-/nise-4.0.4.tgz"; - sha512 = "bTTRUNlemx6deJa+ZyoCUTRvH3liK5+N6VQZ4NIw90AgDXY6iPnsqplNFf6STcj+ePk0H/xqxnP75Lr0J0Fq3A=="; + url = "https://registry.npmjs.org/nise/-/nise-5.1.3.tgz"; + sha512 = "U597iWTTBBYIV72986jyU382/MMZ70ApWcRmkoF1AZ75bpqOtI3Gugv/6+0jLgoDOabmcSwYBkSSAWIp1eA5cg=="; }; }; - "nock-13.0.7" = { + "nock-13.2.9" = { name = "nock"; packageName = "nock"; - version = "13.0.7"; + version = "13.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/nock/-/nock-13.0.7.tgz"; - sha512 = "WBz73VYIjdbO6BwmXODRQLtn7B5tldA9pNpWJe5QTtTEscQlY5KXU4srnGzBOK2fWakkXj69gfTnXGzmrsaRWw=="; + url = "https://registry.npmjs.org/nock/-/nock-13.2.9.tgz"; + sha512 = "1+XfJNYF1cjGB+TKMWi29eZ0b82QOvQs2YoLNzbpWGqFMtRQHTa57osqdGj4FrFPgkO4D4AZinzUJR9VvW3QUA=="; }; }; "node-oauth1-1.3.0" = { @@ -3091,6 +3127,15 @@ let sha512 = "RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ=="; }; }; + "node-releases-2.0.6" = { + name = "node-releases"; + packageName = "node-releases"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz"; + sha512 = "PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="; + }; + }; "normalize-path-3.0.0" = { name = "normalize-path"; packageName = "normalize-path"; @@ -3100,15 +3145,6 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; - }; - }; "nyc-15.1.0" = { name = "nyc"; packageName = "nyc"; @@ -3127,15 +3163,6 @@ let sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; - }; - }; "object-get-2.1.1" = { name = "object-get"; packageName = "object-get"; @@ -3154,13 +3181,13 @@ let sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="; }; }; - "object-to-spawn-args-2.0.0" = { + "object-to-spawn-args-2.0.1" = { name = "object-to-spawn-args"; packageName = "object-to-spawn-args"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/object-to-spawn-args/-/object-to-spawn-args-2.0.0.tgz"; - sha512 = "ZMT4owlXg3JGegecLlAgAA/6BsdKHn63R3ayXcAa3zFkF7oUBHcSb0oxszeutYe0FO2c1lT5pwCuidLkC4Gx3g=="; + url = "https://registry.npmjs.org/object-to-spawn-args/-/object-to-spawn-args-2.0.1.tgz"; + sha512 = "6FuKFQ39cOID+BMZ3QaphcC8Y4cw6LXBLyIgPU+OhIYwviJamPAn+4mITapnSBQrejB+NNp+FMskhD8Cq+Ys3w=="; }; }; "once-1.4.0" = { @@ -3169,7 +3196,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; }; }; "optionator-0.9.1" = { @@ -3199,15 +3226,6 @@ let sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; }; }; - "p-locate-3.0.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; - sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; - }; - }; "p-locate-4.1.0" = { name = "p-locate"; packageName = "p-locate"; @@ -3253,13 +3271,13 @@ let sha512 = "whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ=="; }; }; - "packity-0.3.2" = { + "packity-0.3.4" = { name = "packity"; packageName = "packity"; - version = "0.3.2"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/packity/-/packity-0.3.2.tgz"; - sha1 = "20566861a3ef24428e6d505fc542df452e7e9303"; + url = "https://registry.npmjs.org/packity/-/packity-0.3.4.tgz"; + sha512 = "DMl5Ny5yGtR2ZzsL8vDUSIdNL0L2kzOYV6y7T2l7ooMuIVCFqdBt8343AQhEeV7JBmvQsxvu8sXUmx1aFoOZQw=="; }; }; "parent-module-1.0.1" = { @@ -3289,15 +3307,6 @@ let sha512 = "kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA=="; }; }; - "path-exists-3.0.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; - sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; - }; - }; "path-exists-4.0.0" = { name = "path-exists"; packageName = "path-exists"; @@ -3313,7 +3322,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; }; "path-key-3.1.1" = { @@ -3325,13 +3334,13 @@ let sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; }; - "path-parse-1.0.6" = { + "path-parse-1.0.7" = { name = "path-parse"; packageName = "path-parse"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; }; "path-to-regexp-1.8.0" = { @@ -3358,16 +3367,25 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; }; }; - "picomatch-2.2.2" = { + "picocolors-1.0.0" = { + name = "picocolors"; + packageName = "picocolors"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"; + sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; + }; + }; + "picomatch-2.3.1" = { name = "picomatch"; packageName = "picomatch"; - version = "2.2.2"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; - sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"; + sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; "pify-3.0.0" = { @@ -3376,7 +3394,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; - sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + sha512 = "C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="; }; }; "pkg-dir-4.2.0" = { @@ -3388,31 +3406,22 @@ let sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; }; }; - "postcss-7.0.35" = { - name = "postcss"; - packageName = "postcss"; - version = "7.0.35"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz"; - sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; - }; - }; - "postman-collection-3.6.9" = { + "postman-collection-4.1.1" = { name = "postman-collection"; packageName = "postman-collection"; - version = "3.6.9"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/postman-collection/-/postman-collection-3.6.9.tgz"; - sha512 = "R3A4tM/Ll6ekkfsXqqefR2r/jSyubXc9Pa/DQSbocEUKzdT3QMMb0QR5SHNjDuR1qE+bywC5dyD2FO2+DFXJ6w=="; + url = "https://registry.npmjs.org/postman-collection/-/postman-collection-4.1.1.tgz"; + sha512 = "ODpJtlf8r99DMcTU7gFmi/yvQYckFzcuE6zL/fWnyrFT34ugdCBFlX+DN7M+AnP6lmR822fv5s60H4DnL4+fAg=="; }; }; - "postman-collection-transformer-4.0.0" = { + "postman-collection-transformer-4.1.6" = { name = "postman-collection-transformer"; packageName = "postman-collection-transformer"; - version = "4.0.0"; + version = "4.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/postman-collection-transformer/-/postman-collection-transformer-4.0.0.tgz"; - sha512 = "AGNGiSvMR7uJpuf2PpYbteYTsE/xsutyuUTaIRCcBhw8h0PS4vyQHua15uNB+PRaNsV8wKFm30T6z23yUg0rKg=="; + url = "https://registry.npmjs.org/postman-collection-transformer/-/postman-collection-transformer-4.1.6.tgz"; + sha512 = "xvdQb6sZoWcG9xZXUPSuxocjcd6WCZlINlGGiuHdSfxhgiwQhj9qhF0JRFbagZ8xB0+pYUairD5MiCENc6DEVA=="; }; }; "postman-jsdoc-theme-0.0.3" = { @@ -3421,43 +3430,43 @@ let version = "0.0.3"; src = fetchurl { url = "https://registry.npmjs.org/postman-jsdoc-theme/-/postman-jsdoc-theme-0.0.3.tgz"; - sha1 = "60e4fbf3b2175f772520b3c978c07a8bd32b5829"; + sha512 = "UBiDlVw56c++OYaisumfu6jwJY26ioUuiZtOowC763BiaVt+SazQIDdUr6TeBkaDG2HrvTfgypY43khweERwSg=="; }; }; - "postman-request-2.88.1-postman.28" = { + "postman-request-2.88.1-postman.31" = { name = "postman-request"; packageName = "postman-request"; - version = "2.88.1-postman.28"; + version = "2.88.1-postman.31"; src = fetchurl { - url = "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.28.tgz"; - sha512 = "QjhC9tIuHZTlYJafzCz7u+Nq57NgtOhJmt94RjcNyzpIts1QbihmAgYm0OhNoqcOIU91sNi2aYw2PCyAJR3kcQ=="; + url = "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.31.tgz"; + sha512 = "OJbYqP7ItxQ84yHyuNpDywCZB0HYbpHJisMQ9lb1cSL3N5H3Td6a2+3l/a74UMd3u82BiGC5yQyYmdOIETP/nQ=="; }; }; - "postman-runtime-7.26.10" = { + "postman-runtime-7.29.0" = { name = "postman-runtime"; packageName = "postman-runtime"; - version = "7.26.10"; + version = "7.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/postman-runtime/-/postman-runtime-7.26.10.tgz"; - sha512 = "rYrSF/G0FoWHvOfbEuKVAgKYU8Nl6ow4+iYfdpRfJuTNcrHmfsdumzzdRJ8n0ZY0awAyrrtcAUr/NvSfdof3qA=="; + url = "https://registry.npmjs.org/postman-runtime/-/postman-runtime-7.29.0.tgz"; + sha512 = "eXxHREE/fUpohkGPRgBY1YccSGx9cyW3mtGiPyIE4zD5fYzasgBHqW6kbEND3Xrd3yf/uht/YI1H8O7J1+A1+w=="; }; }; - "postman-sandbox-4.0.1" = { + "postman-sandbox-4.0.6" = { name = "postman-sandbox"; packageName = "postman-sandbox"; - version = "4.0.1"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/postman-sandbox/-/postman-sandbox-4.0.1.tgz"; - sha512 = "m0Jw95y5kzSdCY3yWf/hZlkqYxRyBG5sxqiI2D/48nKiHnYLkyMSHErRDJbMj7K4tjXBXn+BKWpWnRsf+iBdlw=="; + url = "https://registry.npmjs.org/postman-sandbox/-/postman-sandbox-4.0.6.tgz"; + sha512 = "PPRanSNEE4zy3kO7CeSBHmAfJnGdD9ecHY/Mjh26CQuZZarGkNO8c0U/n+xX3+5M1BRNc82UYq6YCtdsSDqcng=="; }; }; - "postman-url-encoder-3.0.1" = { + "postman-url-encoder-3.0.5" = { name = "postman-url-encoder"; packageName = "postman-url-encoder"; - version = "3.0.1"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/postman-url-encoder/-/postman-url-encoder-3.0.1.tgz"; - sha512 = "dMPqXnkDlstM2Eya+Gw4MIGWEan8TzldDcUKZIhZUsJ/G5JjubfQPhFhVWKzuATDMvwvrWbSjF+8VmAvbu6giw=="; + url = "https://registry.npmjs.org/postman-url-encoder/-/postman-url-encoder-3.0.5.tgz"; + sha512 = "jOrdVvzUXBC7C+9gkIkpDJ3HIxOHTIqjpQ4C1EMt1ZGeMvSEpbFCKq23DEfgsj46vMnDgyQf+1ZLp2Wm+bKSsA=="; }; }; "prelude-ls-1.2.1" = { @@ -3520,16 +3529,16 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="; }; }; - "psl-1.8.0" = { + "psl-1.9.0" = { name = "psl"; packageName = "psl"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; - sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; + url = "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"; + sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; }; }; "pump-1.0.3" = { @@ -3556,25 +3565,25 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/q/-/q-1.0.1.tgz"; - sha1 = "11872aeedee89268110b10a718448ffb10112a14"; + sha512 = "18MnBaCeBX9sLRUdtxz/6onlb7wLzFxCylklyO8n27y5JxJYaGLPu4ccyc5zih58SpEzY8QmfwaWqguqXU6Y+A=="; }; }; - "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=="; }; }; - "ramda-0.27.1" = { - name = "ramda"; - packageName = "ramda"; - version = "0.27.1"; + "rambda-7.4.0" = { + name = "rambda"; + packageName = "rambda"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ramda/-/ramda-0.27.1.tgz"; - sha512 = "PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw=="; + url = "https://registry.npmjs.org/rambda/-/rambda-7.4.0.tgz"; + sha512 = "A9hihu7dUTLOUCM+I8E61V4kRXnN4DwYeK0DwCBydC1MqNI1PidyAtbtpsJlBBzK4icSctEcCQ1bGcLpBuETUQ=="; }; }; "randombytes-2.1.0" = { @@ -3592,7 +3601,7 @@ let version = "1.0.34"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"; - sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; + sha512 = "ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg=="; }; }; "readable-stream-2.3.7" = { @@ -3604,31 +3613,22 @@ let sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; - "readable-stream-3.6.0" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; - }; - }; "readdir-0.0.13" = { name = "readdir"; packageName = "readdir"; version = "0.0.13"; src = fetchurl { url = "https://registry.npmjs.org/readdir/-/readdir-0.0.13.tgz"; - sha1 = "4dd002d3f30dc11afe3bb177ad8e99094f7f62dd"; + sha512 = "5bdsemn0z0E9u/ONNfnKBgjH4X6Y9HhW+0i46uVIwxE9YtUOZVrLAK4rXw/wlV+Epzewxy2jXcKmECwAcIRyBQ=="; }; }; - "readdirp-3.5.0" = { + "readdirp-3.6.0" = { name = "readdirp"; packageName = "readdirp"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz"; - sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"; + sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; "rechoir-0.6.2" = { @@ -3637,16 +3637,16 @@ let version = "0.6.2"; src = fetchurl { url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; - sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; + sha512 = "HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw=="; }; }; - "recursive-readdir-2.2.2" = { + "recursive-readdir-2.2.3" = { name = "recursive-readdir"; packageName = "recursive-readdir"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; - sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; + url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz"; + sha512 = "8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA=="; }; }; "reduce-extract-1.0.0" = { @@ -3655,7 +3655,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/reduce-extract/-/reduce-extract-1.0.0.tgz"; - sha1 = "67f2385beda65061b5f5f4312662e8b080ca1525"; + sha512 = "QF8vjWx3wnRSL5uFMyCjDeDc5EBMiryoT9tz94VvgjKfzecHAVnqmXAwQDcr7X4JmLc2cjkjFGCVzhMqDjgR9g=="; }; }; "reduce-flatten-1.0.1" = { @@ -3664,16 +3664,16 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz"; - sha1 = "258c78efd153ddf93cb561237f61184f3696e327"; + sha512 = "j5WfFJfc9CoXv/WbwVLHq74i/hdTUpy+iNC534LxczMRP67vJeK3V9JOdnL0N1cIRbn9mYhE2yVjvvKXDxvNXQ=="; }; }; - "reduce-flatten-3.0.0" = { + "reduce-flatten-3.0.1" = { name = "reduce-flatten"; packageName = "reduce-flatten"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-3.0.0.tgz"; - sha512 = "eczl8wAYBxJ6Egl6I1ECIF+8z6sHu+KE7BzaEDZTpPXKXfy9SUDQlVYwkRcNTjJLC3Iakxbhss50KuT/R6SYfg=="; + url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-3.0.1.tgz"; + sha512 = "bYo+97BmUUOzg09XwfkwALt4PQH1M5L0wzKerBt6WLm3Fhdd43mMS89HiT1B9pJIqko/6lWx3OnV4J9f2Kqp5Q=="; }; }; "reduce-unique-2.0.1" = { @@ -3691,25 +3691,34 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/reduce-without/-/reduce-without-1.0.1.tgz"; - sha1 = "68ad0ead11855c9a37d4e8256c15bbf87972fc8c"; + sha512 = "zQv5y/cf85sxvdrKPlfcRzlDn/OqKFThNimYmsS3flmkioKvkUGn2Qg9cJVoQiEvdxFGLE0MQER/9fZ9sUqdxg=="; }; }; - "regexpp-3.1.0" = { + "regexp-tree-0.1.24" = { + name = "regexp-tree"; + packageName = "regexp-tree"; + version = "0.1.24"; + src = fetchurl { + url = "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.24.tgz"; + sha512 = "s2aEVuLhvnVJW6s/iPgEGK6R+/xngd2jNQ+xy4bXNDKxZKJH6jpPHY6kVeVv1IeLCHgswRj+Kl3ELaDjG6V1iw=="; + }; + }; + "regexpp-3.2.0" = { name = "regexpp"; packageName = "regexpp"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz"; - sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="; + url = "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"; + sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; }; - "regextras-0.7.1" = { + "regextras-0.8.0" = { name = "regextras"; packageName = "regextras"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz"; - sha512 = "9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w=="; + url = "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz"; + sha512 = "k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ=="; }; }; "release-zalgo-1.0.0" = { @@ -3718,7 +3727,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz"; - sha1 = "09700b7e5074329739330e535c5a90fb67851730"; + sha512 = "gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA=="; }; }; "require-directory-2.1.1" = { @@ -3727,7 +3736,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; }; }; "require-from-string-2.0.2" = { @@ -3748,22 +3757,22 @@ let sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; - "requizzle-0.2.3" = { + "requizzle-0.2.4" = { name = "requizzle"; packageName = "requizzle"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/requizzle/-/requizzle-0.2.3.tgz"; - sha512 = "YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ=="; + url = "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz"; + sha512 = "JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw=="; }; }; - "resolve-1.19.0" = { + "resolve-1.22.1" = { name = "resolve"; packageName = "resolve"; - version = "1.19.0"; + version = "1.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz"; - sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"; + sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; }; }; "resolve-from-4.0.0" = { @@ -3784,15 +3793,6 @@ let sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="; }; }; - "ret-0.1.15" = { - name = "ret"; - packageName = "ret"; - version = "0.1.15"; - src = fetchurl { - url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; - sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; - }; - }; "rimraf-3.0.2" = { name = "rimraf"; packageName = "rimraf"; @@ -3820,13 +3820,13 @@ let sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; - "safe-regex-1.1.0" = { + "safe-regex-2.1.1" = { name = "safe-regex"; packageName = "safe-regex"; - version = "1.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; - sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + url = "https://registry.npmjs.org/safe-regex/-/safe-regex-2.1.1.tgz"; + sha512 = "rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A=="; }; }; "safer-buffer-2.1.2" = { @@ -3838,15 +3838,6 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sanitize-html-1.20.1" = { - name = "sanitize-html"; - packageName = "sanitize-html"; - version = "1.20.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.20.1.tgz"; - sha512 = "txnH8TQjaQvg2Q0HY06G6CDJLVYCpbnxrdO0WN8gjCKaU5J0KbyGYhZxx5QJg3WLZ1lB7XU9kDkfrCXUozqptA=="; - }; - }; "sax-1.2.4" = { name = "sax"; packageName = "sax"; @@ -3874,13 +3865,13 @@ let sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.3.4" = { + "semver-7.3.5" = { name = "semver"; packageName = "semver"; - version = "7.3.4"; + version = "7.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz"; - sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; }; "serialised-error-1.1.3" = { @@ -3892,13 +3883,13 @@ let sha512 = "vybp3GItaR1ZtO2nxZZo8eOo7fnVaNtP3XE2vJKgzkKR2bagCkdJ1EpYYhEMd3qu/80DwQk9KjsNSxE3fXWq0g=="; }; }; - "serialize-javascript-5.0.1" = { + "serialize-javascript-6.0.0" = { name = "serialize-javascript"; packageName = "serialize-javascript"; - version = "5.0.1"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; - sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; + sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; }; }; "server-destroy-1.0.1" = { @@ -3907,7 +3898,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz"; - sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; + sha512 = "rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ=="; }; }; "set-blocking-2.0.0" = { @@ -3916,7 +3907,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; "shebang-command-2.0.0" = { @@ -3937,13 +3928,13 @@ let sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; - "shelljs-0.8.4" = { + "shelljs-0.8.5" = { name = "shelljs"; packageName = "shelljs"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz"; - sha512 = "7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ=="; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz"; + sha512 = "TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow=="; }; }; "sigmund-1.0.1" = { @@ -3952,25 +3943,25 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; - sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; + sha512 = "fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g=="; }; }; - "signal-exit-3.0.3" = { + "signal-exit-3.0.7" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.3"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; - sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; - "sinon-9.2.4" = { + "sinon-13.0.2" = { name = "sinon"; packageName = "sinon"; - version = "9.2.4"; + version = "13.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz"; - sha512 = "zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg=="; + url = "https://registry.npmjs.org/sinon/-/sinon-13.0.2.tgz"; + sha512 = "KvOrztAVqzSJWMDoxM4vM+GPys1df2VBoXm+YciyB/OLMamfS3VXh3oGh5WtrAGSzrgczNWFFY22oKb7Fi5eeA=="; }; }; "slice-ansi-4.0.0" = { @@ -3982,22 +3973,13 @@ let sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="; }; }; - "sort-array-4.1.3" = { + "sort-array-4.1.5" = { name = "sort-array"; packageName = "sort-array"; - version = "4.1.3"; + version = "4.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/sort-array/-/sort-array-4.1.3.tgz"; - sha512 = "6auiM0DNob/zF+7Ae/SM4BFL5D7DPK/HVcllhVu5V+FgoCPs0A6b6ZwJDuvJpXQgFpxqLZUOD2kdxqO4Z59dkg=="; - }; - }; - "source-map-0.5.7" = { - name = "source-map"; - packageName = "source-map"; - version = "0.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; - sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + url = "https://registry.npmjs.org/sort-array/-/sort-array-4.1.5.tgz"; + sha512 = "Ya4peoS1fgFN42RN1REk2FgdNOeLIEMKFGJvs7VTP3OklF8+kl2SkpVliZ4tk/PurWsrWRsdNdU+tgyOBkB9sA=="; }; }; "source-map-0.6.1" = { @@ -4036,13 +4018,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.7" = { + "spdx-license-ids-3.0.12" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.7"; + version = "3.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; - sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz"; + sha512 = "rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA=="; }; }; "split-ca-1.0.1" = { @@ -4051,7 +4033,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/split-ca/-/split-ca-1.0.1.tgz"; - sha1 = "6c83aff3692fa61256e0cd197e05e9de157691a6"; + sha512 = "Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ=="; }; }; "sprintf-js-1.0.3" = { @@ -4060,34 +4042,16 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; }; }; - "srcset-1.0.0" = { - name = "srcset"; - packageName = "srcset"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/srcset/-/srcset-1.0.0.tgz"; - sha1 = "a5669de12b42f3b1d5e83ed03c71046fc48f41ef"; - }; - }; - "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=="; - }; - }; - "stack-trace-0.0.10" = { - name = "stack-trace"; - packageName = "stack-trace"; - version = "0.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"; - sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz"; + sha512 = "/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="; }; }; "stack-trace-0.0.9" = { @@ -4096,7 +4060,7 @@ let version = "0.0.9"; src = fetchurl { url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; - sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; + sha512 = "vjUc6sfgtgY0dxCdnc40mK6Oftjo9+2K8H/NG81TMhgL392FtiPA9tn9RLyTxXmTLPJPjF3VyzFp6bsWFLisMQ=="; }; }; "stream-connect-1.0.2" = { @@ -4105,7 +4069,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/stream-connect/-/stream-connect-1.0.2.tgz"; - sha1 = "18bc81f2edb35b8b5d9a8009200a985314428a97"; + sha512 = "68Kl+79cE0RGKemKkhxTSg8+6AGrqBt+cbZAXevg2iJ6Y3zX4JhA/sZeGzLpxW9cXhmqAcE7KnJCisUmIUfnFQ=="; }; }; "stream-length-1.0.2" = { @@ -4114,7 +4078,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/stream-length/-/stream-length-1.0.2.tgz"; - sha1 = "8277f3cbee49a4daabcfdb4e2f4a9b5e9f2c9f00"; + sha512 = "aI+qKFiwoDV4rsXiS7WRoCt+v2RX1nUj17+KJC5r2gfh5xoSJIfP6Y3Do/HtvesFcTSWthIuJ3l1cvKQY/+nZg=="; }; }; "stream-via-1.0.4" = { @@ -4126,40 +4090,13 @@ let sha512 = "DBp0lSvX5G9KGRDTkR/R+a29H+Wk2xItOF+MpZLLNDWbEV9tGPnqLPxHEYjmiz8xGtJHRIqmI+hCjmNzqoA4nQ=="; }; }; - "strftime-0.10.0" = { - name = "strftime"; - packageName = "strftime"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strftime/-/strftime-0.10.0.tgz"; - sha1 = "b3f0fa419295202a5a289f6d6be9f4909a617193"; - }; - }; - "string-width-2.1.1" = { + "string-width-4.2.3" = { name = "string-width"; packageName = "string-width"; - version = "2.1.1"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; - }; - }; - "string-width-3.1.0" = { - name = "string-width"; - packageName = "string-width"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; - sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; - }; - }; - "string-width-4.2.0" = { - name = "string-width"; - packageName = "string-width"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz"; - sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; "string_decoder-0.10.31" = { @@ -4168,7 +4105,7 @@ let version = "0.10.31"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + sha512 = "ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="; }; }; "string_decoder-1.1.1" = { @@ -4180,49 +4117,13 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; - "string_decoder-1.3.0" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; - sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; - }; - }; - "strip-ansi-3.0.1" = { + "strip-ansi-6.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; - version = "3.0.1"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - }; - "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-ansi-6.0.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; - sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; }; "strip-bom-4.0.0" = { @@ -4243,15 +4144,6 @@ let sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; }; }; - "supports-color-2.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - }; "supports-color-5.5.0" = { name = "supports-color"; packageName = "supports-color"; @@ -4261,15 +4153,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"; @@ -4279,22 +4162,31 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; - "symbol-0.3.1" = { - name = "symbol"; - packageName = "symbol"; - version = "0.3.1"; + "supports-color-8.1.1" = { + name = "supports-color"; + packageName = "supports-color"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/symbol/-/symbol-0.3.1.tgz"; - sha1 = "b6f9a900d496a57f02408f22198c109dda063041"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"; + sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; }; }; - "table-6.0.7" = { + "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=="; + }; + }; + "table-6.8.1" = { name = "table"; packageName = "table"; - version = "6.0.7"; + version = "6.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.0.7.tgz"; - sha512 = "rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g=="; + url = "https://registry.npmjs.org/table/-/table-6.8.1.tgz"; + sha512 = "Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA=="; }; }; "table-layout-0.4.5" = { @@ -4312,7 +4204,7 @@ let version = "2.6.2"; src = fetchurl { url = "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz"; - sha1 = "7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268"; + sha512 = "y3JaeRSplks6NYQuCOj3ZFMO3j60rTwbuKCvZxsAraGYH2epusatvZ0baZYA01WsGqJBq/Dl6vOrMUJqyMj8kA=="; }; }; "tar-fs-1.16.3" = { @@ -4348,7 +4240,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/temp-path/-/temp-path-1.0.0.tgz"; - sha1 = "24b1543973ab442896d9ad367dd9cbdbfafe918b"; + sha512 = "TvmyH7kC6ZVTYkqCODjJIbgvu0FKiwQpZ4D1aknE7xpcDf/qEOB8KZEK5ef2pfbVoiBhNWs3yx4y+ESMtNYmlg=="; }; }; "test-exclude-6.0.0" = { @@ -4366,7 +4258,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/test-value/-/test-value-1.1.0.tgz"; - sha1 = "a09136f72ec043d27c893707c2b159bfad7de93f"; + sha512 = "wrsbRo7qP+2Je8x8DsK8ovCGyxe3sYfQwOraIY/09A2gFXU9DYKiTF14W4ki/01AEh56kMzAmlj9CaHGDDUBJA=="; }; }; "test-value-2.1.0" = { @@ -4375,7 +4267,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz"; - sha1 = "11da6ff670f3471a73b625ca4f3fdcf7bb748291"; + sha512 = "+1epbAxtKeXttkGFMTX9H42oqzOTufR1ceCF+GYA5aOmvaPq9wd4PUS8329fn2RRLGNeUkgRLnVpycjx8DsO2w=="; }; }; "test-value-3.0.0" = { @@ -4393,7 +4285,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; - sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; }; }; "through-2.3.8" = { @@ -4402,7 +4294,7 @@ let version = "2.3.8"; src = fetchurl { url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="; }; }; "to-buffer-1.1.1" = { @@ -4420,7 +4312,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="; }; }; "to-regex-range-5.0.1" = { @@ -4456,7 +4348,7 @@ let version = "0.14.5"; src = fetchurl { url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; }; }; "type-check-0.4.0" = { @@ -4477,6 +4369,15 @@ let sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; }; + "type-fest-0.20.2" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.20.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"; + sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; + }; + }; "type-fest-0.8.1" = { name = "type-fest"; packageName = "type-fest"; @@ -4492,7 +4393,7 @@ let version = "0.0.6"; src = fetchurl { url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; }; }; "typedarray-to-buffer-3.1.5" = { @@ -4510,7 +4411,7 @@ let version = "2.6.1"; src = fetchurl { url = "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz"; - sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d"; + sha512 = "ofhi8kjIje6npGozTip9Fr8iecmYfEbS06i0JnIg+rh51KakryWF4+jX8lLKZVhy6N+ID45WYSFCxPOdTWCzNg=="; }; }; "typical-4.0.0" = { @@ -4540,31 +4441,40 @@ let sha512 = "8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="; }; }; - "uglify-js-3.12.6" = { + "uglify-js-3.17.4" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.12.6"; + version = "3.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.6.tgz"; - sha512 = "aqWHe3DfQmZUDGWBbabZ2eQnJlQd1fKlMUu7gV+MiTuDzdgDw31bI3wA2jLLsV/hNcDP26IfyEgSVoft5+0SVw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz"; + sha512 = "T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g=="; }; }; - "underscore-1.10.2" = { + "underscore-1.12.1" = { name = "underscore"; packageName = "underscore"; - version = "1.10.2"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz"; - sha512 = "N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg=="; + url = "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz"; + sha512 = "hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="; }; }; - "underscore-1.7.0" = { + "underscore-1.13.6" = { name = "underscore"; packageName = "underscore"; - version = "1.7.0"; + version = "1.13.6"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; - sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; + url = "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz"; + sha512 = "+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="; + }; + }; + "update-browserslist-db-1.0.10" = { + name = "update-browserslist-db"; + packageName = "update-browserslist-db"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz"; + sha512 = "OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ=="; }; }; "uri-js-4.4.1" = { @@ -4576,22 +4486,13 @@ let sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; }; - "utcstring-0.1.0" = { - name = "utcstring"; - packageName = "utcstring"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/utcstring/-/utcstring-0.1.0.tgz"; - sha1 = "430fd510ab7fc95b5d5910c902d79880c208436b"; - }; - }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; }; }; "uuid-3.4.0" = { @@ -4603,22 +4504,31 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; - "uvm-2.0.1" = { - name = "uvm"; - packageName = "uvm"; - version = "2.0.1"; + "uuid-8.3.2" = { + name = "uuid"; + packageName = "uuid"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/uvm/-/uvm-2.0.1.tgz"; - sha512 = "bZAckfNKnr95YkTCVZWyzK+7w1c8sYJuTresCBqhiizByVRtfPqhGJpTwFUSaS2YkaVfsMoN5xZcOCNxTx9uCA=="; + url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; + sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; }; }; - "v8-compile-cache-2.2.0" = { + "uvm-2.0.2" = { + name = "uvm"; + packageName = "uvm"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uvm/-/uvm-2.0.2.tgz"; + sha512 = "Ra+aPiS5GXAbwXmyNExqdS42sTqmmx4XWEDF8uJlsTfOkKf9Rd9xNgav1Yckv4HfVEZg4iOFODWHFYuJ+9Fzfg=="; + }; + }; + "v8-compile-cache-2.3.0" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; - sha512 = "gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q=="; + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; }; }; "verror-1.10.0" = { @@ -4627,7 +4537,7 @@ let version = "1.10.0"; src = fetchurl { url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; "walk-back-2.0.1" = { @@ -4636,16 +4546,16 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/walk-back/-/walk-back-2.0.1.tgz"; - sha1 = "554e2a9d874fac47a8cb006bf44c2f0c4998a0a4"; + sha512 = "Nb6GvBR8UWX1D+Le+xUq0+Q1kFmRBIWVrfLnQAOmcpEzA9oAxwJ9gIr36t9TWYfzvWRvuMtjHiVsJYEkXWaTAQ=="; }; }; - "walk-back-4.0.0" = { + "walk-back-5.1.0" = { name = "walk-back"; packageName = "walk-back"; - version = "4.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/walk-back/-/walk-back-4.0.0.tgz"; - sha512 = "kudCA8PXVQfrqv2mFTG72vDBRi8BKWxGgFLwPpzHcpZnSwZk93WMwUDVcLHWNsnm+Y0AC4Vb6MUNRgaHfyV2DQ=="; + url = "https://registry.npmjs.org/walk-back/-/walk-back-5.1.0.tgz"; + sha512 = "Uhxps5yZcVNbLEAnb+xaEEMdgTXl9qAQDzKYejG2AZ7qPwRQ81lozY9ECDbjLPNWm7YsO1IK5rsP1KoQzXAcGA=="; }; }; "which-2.0.2" = { @@ -4663,25 +4573,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; - sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + sha512 = "B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="; }; }; - "wide-align-1.1.3" = { - name = "wide-align"; - packageName = "wide-align"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; - sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; - }; - }; - "winston-2.4.5" = { + "winston-2.4.7" = { name = "winston"; packageName = "winston"; - version = "2.4.5"; + version = "2.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.4.5.tgz"; - sha512 = "TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A=="; + url = "https://registry.npmjs.org/winston/-/winston-2.4.7.tgz"; + sha512 = "vLB4BqzCKDnnZH9PHGoS2ycawueX4HLqENXQitvFHczhgW2vFpSOn31LZtVr1KU8YTw7DS4tM+cqyovxo8taVg=="; }; }; "word-wrap-1.2.3" = { @@ -4699,7 +4600,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + sha512 = "gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q=="; }; }; "wordwrapjs-3.0.0" = { @@ -4711,22 +4612,13 @@ let sha512 = "mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw=="; }; }; - "workerpool-6.0.2" = { + "workerpool-6.2.0" = { name = "workerpool"; packageName = "workerpool"; - version = "6.0.2"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz"; - sha512 = "DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q=="; - }; - }; - "wrap-ansi-5.1.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; - sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz"; + sha512 = "Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A=="; }; }; "wrap-ansi-6.2.0" = { @@ -4738,13 +4630,22 @@ let sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; }; }; + "wrap-ansi-7.0.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; + }; + }; "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"; + sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; }; "write-file-atomic-3.0.3" = { @@ -4792,13 +4693,13 @@ let sha512 = "yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="; }; }; - "xmlcreate-2.0.3" = { + "xmlcreate-2.0.4" = { name = "xmlcreate"; packageName = "xmlcreate"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.3.tgz"; - sha512 = "HgS+X6zAztGa9zIK3Y3LXuJes33Lz9x+YyTxgrkIdabu2vqcGOWwdfCpf1hWLRrd553wd4QCDf6BBO6FfdsRiQ=="; + url = "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz"; + sha512 = "nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg=="; }; }; "xtend-4.0.2" = { @@ -4810,13 +4711,22 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "y18n-4.0.1" = { + "y18n-4.0.3" = { name = "y18n"; packageName = "y18n"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz"; - sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ=="; + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz"; + sha512 = "JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="; + }; + }; + "y18n-5.0.8" = { + name = "y18n"; + packageName = "y18n"; + version = "5.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"; + sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; }; }; "yallist-2.1.2" = { @@ -4825,7 +4735,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; - sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; }; }; "yallist-4.0.0" = { @@ -4837,15 +4747,6 @@ let sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; }; - "yargs-13.3.2" = { - name = "yargs"; - packageName = "yargs"; - version = "13.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz"; - sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; - }; - }; "yargs-15.4.1" = { name = "yargs"; packageName = "yargs"; @@ -4855,13 +4756,13 @@ let sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="; }; }; - "yargs-parser-13.1.2" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "13.1.2"; + "yargs-16.2.0" = { + name = "yargs"; + packageName = "yargs"; + version = "16.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz"; - sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; + url = "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"; + sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; }; "yargs-parser-18.1.3" = { @@ -4873,6 +4774,15 @@ let sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; + "yargs-parser-20.2.4" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "20.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz"; + sha512 = "WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA=="; + }; + }; "yargs-unparser-2.0.0" = { name = "yargs-unparser"; packageName = "yargs-unparser"; @@ -4897,125 +4807,158 @@ in newman = nodeEnv.buildNodePackage { name = "newman"; packageName = "newman"; - version = "5.2.2"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/newman/-/newman-5.2.2.tgz"; - sha512 = "aRkh8eeRkKBlwxwBSdYQFZVLvSNMfRDmwPUfddlYR6PwZVKwukmoJmo9QTkRmo6vehgMmt2RTVkfwIIp73X1gg=="; + url = "https://registry.npmjs.org/newman/-/newman-5.3.2.tgz"; + sha512 = "cWy8pV0iwvMOZLTw3hkAHcwo2ZA0GKkXm8oUMn1Ltii3ZI2nKpnrg9QGdIT0hGHChRkX6prY5e3Aar7uykMGNg=="; }; dependencies = [ + sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.12.11" - (sources."@babel/core-7.12.10" // { + sources."@babel/compat-data-7.20.5" + (sources."@babel/core-7.20.5" // { dependencies = [ - sources."debug-4.3.2" + sources."@babel/code-frame-7.18.6" + sources."debug-4.3.4" sources."ms-2.1.2" - sources."semver-5.7.1" - sources."source-map-0.5.7" + sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.12.11" // { + (sources."@babel/generator-7.20.5" // { dependencies = [ - sources."source-map-0.5.7" + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" - sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.5" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/template-7.12.7" - (sources."@babel/traverse-7.12.12" // { + (sources."@babel/helper-compilation-targets-7.20.0" // { dependencies = [ - sources."debug-4.3.2" + sources."semver-6.3.0" + ]; + }) + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-function-name-7.19.0" + sources."@babel/helper-hoist-variables-7.18.6" + sources."@babel/helper-module-imports-7.18.6" + sources."@babel/helper-module-transforms-7.20.2" + sources."@babel/helper-simple-access-7.20.2" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-string-parser-7.19.4" + sources."@babel/helper-validator-identifier-7.19.1" + sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helpers-7.20.6" + (sources."@babel/highlight-7.18.6" // { + dependencies = [ + sources."chalk-2.4.2" + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."@babel/parser-7.20.5" + (sources."@babel/template-7.18.10" // { + dependencies = [ + sources."@babel/code-frame-7.18.6" + ]; + }) + (sources."@babel/traverse-7.20.5" // { + dependencies = [ + sources."@babel/code-frame-7.18.6" + sources."debug-4.3.4" sources."globals-11.12.0" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.12.12" - (sources."@eslint/eslintrc-0.3.0" // { + sources."@babel/types-7.20.5" + (sources."@es-joy/jsdoccomment-0.10.8" // { dependencies = [ - sources."debug-4.3.2" + sources."jsdoc-type-pratt-parser-1.1.1" + ]; + }) + (sources."@eslint/eslintrc-0.4.3" // { + dependencies = [ + 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.4" + sources."ms-2.1.2" + ]; + }) + sources."@humanwhocodes/object-schema-1.2.1" (sources."@istanbuljs/load-nyc-config-1.1.0" // { dependencies = [ + sources."camelcase-5.3.1" sources."find-up-4.1.0" + sources."js-yaml-3.14.1" sources."locate-path-5.0.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" + sources."resolve-from-5.0.0" ]; }) - sources."@istanbuljs/schema-0.1.2" + sources."@istanbuljs/schema-0.1.3" + sources."@jridgewell/gen-mapping-0.1.1" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/set-array-1.1.2" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.17" + sources."@jsdoc/salty-0.2.1" sources."@postman/form-data-3.1.1" sources."@postman/tunnel-agent-0.6.3" - sources."@sinonjs/commons-1.8.2" - sources."@sinonjs/fake-timers-6.0.1" - sources."@sinonjs/samsam-5.3.1" - sources."@sinonjs/text-encoding-0.7.1" + sources."@sinonjs/commons-1.8.6" + sources."@sinonjs/fake-timers-9.1.2" + sources."@sinonjs/samsam-6.1.3" + sources."@sinonjs/text-encoding-0.7.2" + sources."@types/linkify-it-3.0.2" + sources."@types/markdown-it-12.2.3" + sources."@types/mdurl-1.0.2" sources."@ungap/promise-all-settled-1.1.2" sources."JSONStream-1.3.2" sources."acorn-7.4.1" - sources."acorn-jsx-5.3.1" + sources."acorn-jsx-5.3.2" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" - sources."ansi-colors-4.1.1" + sources."ansi-colors-4.1.3" (sources."ansi-escape-sequences-4.1.0" // { dependencies = [ sources."array-back-3.1.0" ]; }) - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" - sources."anymatch-3.1.1" + sources."anymatch-3.1.3" sources."append-transform-2.0.0" sources."archy-1.0.0" sources."argparse-1.0.10" - sources."array-back-4.0.1" - sources."array-uniq-1.0.3" - sources."asn1-0.2.4" + sources."array-back-6.2.2" + sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."assertion-error-1.1.0" sources."astral-regex-2.0.0" - sources."async-3.2.0" + sources."async-3.2.3" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."balanced-match-1.0.0" + sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.2.0" - (sources."bl-1.2.3" // { - 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."bl-1.2.3" sources."bluebird-2.11.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."brotli-1.3.2" + sources."brotli-1.3.3" sources."browser-stdout-1.3.1" + sources."browserslist-4.21.4" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.1" - sources."cache-point-2.0.0" + sources."buffer-from-1.1.2" + (sources."cache-point-2.0.0" // { + dependencies = [ + sources."array-back-4.0.2" + ]; + }) (sources."caching-transform-4.0.0" // { dependencies = [ sources."make-dir-3.1.0" @@ -5023,34 +4966,35 @@ in ]; }) sources."callsites-3.1.0" - sources."camelcase-5.3.1" + sources."camelcase-6.3.0" + sources."caniuse-lite-1.0.30001436" sources."caseless-0.12.0" - sources."catharsis-0.8.11" - sources."chai-4.2.0" - sources."chalk-2.4.2" - sources."chardet-1.3.0" - sources."charset-1.0.1" - sources."check-error-1.0.2" - sources."chokidar-3.4.3" - sources."chownr-1.1.4" - sources."clean-stack-2.2.0" - sources."cli-progress-3.8.2" - sources."cli-table3-0.6.0" - (sources."cliui-5.0.0" // { + sources."catharsis-0.9.0" + sources."chai-4.3.7" + (sources."chalk-4.1.2" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + 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."chardet-1.4.0" + sources."charset-1.0.1" + sources."check-error-1.0.2" + sources."chokidar-3.5.3" + sources."chownr-1.1.4" + sources."clean-stack-2.2.0" + sources."cli-progress-3.10.0" + sources."cli-table3-0.6.1" + sources."cliui-7.0.4" sources."collect-all-1.0.4" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.4.0" sources."combined-stream-1.0.8" - (sources."command-line-args-5.1.1" // { + (sources."command-line-args-5.2.1" // { dependencies = [ sources."array-back-3.1.0" sources."typical-4.0.0" @@ -5066,46 +5010,35 @@ in sources."array-back-2.0.0" ]; }) - sources."commander-6.2.1" - sources."comment-parser-0.7.6" - sources."common-sequence-2.0.0" + sources."commander-7.2.0" + sources."comment-parser-1.2.4" + sources."common-sequence-2.0.2" sources."commondir-1.0.1" sources."concat-map-0.0.1" - (sources."concat-stream-1.6.2" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."concat-stream-1.6.2" (sources."config-master-3.1.0" // { dependencies = [ sources."walk-back-2.0.1" ]; }) - (sources."convert-source-map-1.7.0" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."convert-source-map-1.9.0" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" - sources."csv-parse-4.14.2" + sources."csv-parse-4.16.3" sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."date-format-0.0.2" - sources."dbug-0.4.2" sources."debug-3.2.7" - sources."decamelize-1.2.0" - sources."deep-eql-3.0.1" + sources."decamelize-4.0.0" + sources."deep-eql-4.1.3" sources."deep-extend-0.6.0" - sources."deep-is-0.1.3" - sources."default-require-extensions-3.0.0" + sources."deep-is-0.1.4" + sources."default-require-extensions-3.0.1" sources."delayed-stream-1.0.0" - sources."diff-4.0.2" - (sources."dmd-5.0.2" // { + sources."diff-5.0.0" + (sources."dmd-6.2.0" // { dependencies = [ - sources."reduce-flatten-3.0.0" + sources."reduce-flatten-3.0.1" ]; }) (sources."docker-modem-1.0.9" // { @@ -5124,15 +5057,6 @@ in }) sources."dockerode-2.5.8" sources."doctrine-3.0.0" - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.1.0" - sources."entities-2.2.0" - ]; - }) - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.7.0" sources."ecc-jsbn-0.1.2" (sources."editorconfig-0.15.3" // { dependencies = [ @@ -5142,55 +5066,55 @@ in sources."yallist-2.1.2" ]; }) + sources."electron-to-chromium-1.4.284" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" - sources."entities-1.1.2" + sources."entities-2.1.0" sources."es6-error-4.1.1" - sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" - (sources."eslint-7.19.0" // { + sources."escalade-3.1.1" + sources."escape-string-regexp-4.0.0" + (sources."eslint-7.32.0" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."debug-4.3.2" - sources."has-flag-4.0.0" - sources."ms-2.1.2" - sources."supports-color-7.2.0" - ]; - }) - (sources."eslint-plugin-jsdoc-30.7.13" // { - dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.4" + sources."js-yaml-3.14.1" sources."ms-2.1.2" ]; }) - sources."eslint-plugin-lodash-7.1.0" - sources."eslint-plugin-mocha-8.0.0" - sources."eslint-plugin-security-1.4.0" + (sources."eslint-plugin-jsdoc-36.1.1" // { + dependencies = [ + sources."debug-4.3.4" + sources."ms-2.1.2" + ]; + }) + sources."eslint-plugin-lodash-7.4.0" + (sources."eslint-plugin-mocha-10.1.0" // { + dependencies = [ + sources."eslint-utils-3.0.0" + ]; + }) + sources."eslint-plugin-security-1.5.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" ]; }) - sources."eslint-visitor-keys-2.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.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ - sources."estraverse-5.2.0" + sources."estraverse-5.3.0" ]; }) (sources."esrecurse-4.3.0" // { dependencies = [ - sources."estraverse-5.2.0" + sources."estraverse-5.3.0" ]; }) sources."estraverse-4.3.0" @@ -5199,16 +5123,20 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."eyes-0.1.8" - sources."faker-5.1.0" + sources."faker-5.5.3" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."file-entry-cache-6.0.0" - sources."file-set-4.0.1" + sources."file-entry-cache-6.0.1" + (sources."file-set-4.0.2" // { + dependencies = [ + sources."array-back-5.0.0" + ]; + }) sources."file-type-3.9.0" - sources."filesize-6.1.0" + sources."filesize-8.0.7" sources."fill-range-7.0.1" - (sources."find-cache-dir-3.3.1" // { + (sources."find-cache-dir-3.3.2" // { dependencies = [ sources."make-dir-3.1.0" sources."semver-6.3.0" @@ -5222,14 +5150,14 @@ in sources."find-up-5.0.0" sources."flat-5.0.2" sources."flat-cache-3.0.4" - sources."flatted-3.1.0" + sources."flatted-3.1.1" sources."foreground-child-2.0.0" sources."forever-agent-0.6.1" sources."fromentries-1.3.2" sources."fs-constants-1.0.0" sources."fs-then-native-2.0.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."gensync-1.0.0-beta.2" @@ -5237,78 +5165,59 @@ in sources."get-func-name-2.0.0" sources."get-package-type-0.1.0" sources."getpass-0.1.7" - sources."glob-7.1.6" - sources."glob-parent-5.1.1" - sources."globals-12.4.0" - sources."graceful-fs-4.2.4" + sources."glob-7.2.3" + sources."glob-parent-5.1.2" + sources."globals-13.18.0" + sources."graceful-fs-4.2.10" sources."graceful-readlink-1.0.1" sources."growl-1.10.5" - sources."handlebars-4.7.6" + sources."handlebars-4.7.7" 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-flag-3.0.0" + (sources."hasha-5.2.2" // { dependencies = [ - sources."ansi-regex-2.1.1" + sources."type-fest-0.8.1" ]; }) - sources."has-flag-3.0.0" - sources."hasha-5.2.2" sources."he-1.2.0" sources."html-escaper-2.0.2" - sources."htmlparser2-3.10.1" sources."http-reasons-0.1.0" - sources."http-signature-1.3.5" - sources."httpntlm-1.7.6" - sources."httpreq-0.4.24" - sources."iconv-lite-0.6.2" + sources."http-signature-1.3.6" + sources."httpntlm-1.7.7" + sources."httpreq-0.5.2" + sources."iconv-lite-0.6.3" sources."ignore-4.0.6" - (sources."import-fresh-3.3.0" // { - dependencies = [ - sources."resolve-from-4.0.0" - ]; - }) + sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."intel-1.2.0" // { - 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."interpret-1.4.0" sources."ip-regex-2.1.0" sources."is-binary-path-2.1.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.11.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.1" + sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."is-plain-obj-2.1.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" - sources."istanbul-lib-coverage-3.0.0" + sources."istanbul-lib-coverage-3.2.0" sources."istanbul-lib-hook-3.0.0" (sources."istanbul-lib-instrument-4.0.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."istanbul-lib-processinfo-2.0.2" // { - dependencies = [ - sources."make-dir-3.1.0" - sources."semver-6.3.0" - ]; - }) + sources."istanbul-lib-processinfo-2.0.3" (sources."istanbul-lib-report-3.0.0" // { dependencies = [ sources."has-flag-4.0.0" @@ -5317,136 +5226,154 @@ in sources."supports-color-7.2.0" ]; }) - (sources."istanbul-lib-source-maps-4.0.0" // { + (sources."istanbul-lib-source-maps-4.0.1" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."istanbul-reports-3.0.2" + sources."istanbul-reports-3.1.5" sources."js-sha512-0.8.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."js2xmlparser-4.0.1" + (sources."js-yaml-4.1.0" // { + dependencies = [ + sources."argparse-2.0.1" + ]; + }) + sources."js2xmlparser-4.0.2" sources."jsbn-0.1.1" - (sources."jsdoc-3.6.6" // { + (sources."jsdoc-3.6.11" // { dependencies = [ sources."bluebird-3.7.2" sources."escape-string-regexp-2.0.0" - sources."marked-0.8.2" - sources."underscore-1.10.2" + sources."underscore-1.13.6" ]; }) - sources."jsdoc-api-6.0.0" - sources."jsdoc-parse-5.0.0" - sources."jsdoc-to-markdown-6.0.1" - sources."jsdoctypeparser-9.0.0" + (sources."jsdoc-api-7.2.0" // { + dependencies = [ + sources."bluebird-3.7.2" + sources."escape-string-regexp-2.0.0" + sources."jsdoc-4.0.0" + sources."underscore-1.13.6" + ]; + }) + sources."jsdoc-parse-6.2.0" + sources."jsdoc-to-markdown-7.1.1" + sources."jsdoc-type-pratt-parser-1.2.0" sources."jsesc-2.5.2" - 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."json5-2.2.1" sources."jsonparse-1.3.1" - sources."jsprim-1.4.1" + sources."jsprim-2.0.2" (sources."junit-report-builder-2.1.0" // { dependencies = [ sources."xmlbuilder-10.1.1" ]; }) - sources."just-extend-4.1.1" + sources."just-extend-4.2.1" sources."klaw-3.0.0" sources."levn-0.4.1" - sources."linkify-it-2.2.0" + sources."linkify-it-3.0.3" sources."liquid-json-0.3.1" sources."locate-path-6.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" - sources."lodash.clonedeep-4.5.0" - sources."lodash.escaperegexp-4.1.2" sources."lodash.flattendeep-4.4.0" sources."lodash.get-4.4.2" - sources."lodash.isplainobject-4.0.6" - sources."lodash.isstring-4.0.1" - sources."lodash.mergewith-4.6.2" + sources."lodash.merge-4.6.2" sources."lodash.omit-4.5.0" sources."lodash.padend-4.6.1" sources."lodash.pick-4.4.0" - sources."lodash.set-4.3.2" - (sources."log-symbols-4.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.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."lodash.truncate-4.4.2" + sources."log-symbols-4.1.0" + sources."loupe-2.3.6" sources."lru-cache-6.0.0" sources."make-dir-1.3.0" - (sources."markdown-it-10.0.0" // { + (sources."markdown-it-12.3.2" // { dependencies = [ - sources."entities-2.0.3" + sources."argparse-2.0.1" ]; }) - sources."markdown-it-anchor-5.3.0" - sources."marked-1.2.7" + sources."markdown-it-anchor-8.6.5" + sources."marked-4.2.4" sources."mdurl-1.0.1" - sources."mime-db-1.45.0" - sources."mime-format-2.0.0" - sources."mime-types-2.1.28" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."mime-db-1.51.0" + sources."mime-format-2.0.1" + sources."mime-types-2.1.34" + sources."minimatch-3.1.2" + sources."minimist-1.2.7" sources."mkdirp-1.0.4" - sources."mkdirp2-1.0.4" - (sources."mocha-8.2.1" // { + sources."mkdirp2-1.0.5" + (sources."mocha-9.2.2" // { dependencies = [ - sources."debug-4.2.0" - sources."escape-string-regexp-4.0.0" + sources."ansi-colors-4.1.1" + (sources."debug-4.3.3" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) + (sources."glob-7.2.0" // { + dependencies = [ + sources."minimatch-3.1.2" + ]; + }) sources."has-flag-4.0.0" - sources."js-yaml-3.14.0" - sources."ms-2.1.2" - sources."supports-color-7.2.0" + sources."minimatch-4.2.1" + sources."supports-color-8.1.1" ]; }) sources."ms-2.1.3" - sources."nanoid-3.1.12" + sources."nanoid-3.3.1" sources."natural-compare-1.4.0" sources."neo-async-2.6.2" - sources."nise-4.0.4" - (sources."nock-13.0.7" // { + (sources."nise-5.1.3" // { dependencies = [ - sources."debug-4.3.2" + sources."@sinonjs/commons-2.0.0" + (sources."@sinonjs/fake-timers-7.1.2" // { + dependencies = [ + sources."@sinonjs/commons-1.8.6" + ]; + }) + ]; + }) + (sources."nock-13.2.9" // { + dependencies = [ + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."node-oauth1-1.3.0" sources."node-preload-0.2.1" + sources."node-releases-2.0.6" sources."normalize-path-3.0.0" - sources."number-is-nan-1.0.1" (sources."nyc-15.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" + sources."camelcase-5.3.1" sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."decamelize-1.2.0" sources."find-up-4.1.0" sources."locate-path-5.0.0" sources."make-dir-3.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" + sources."resolve-from-5.0.0" sources."semver-6.3.0" sources."wrap-ansi-6.2.0" + sources."y18n-4.0.3" sources."yargs-15.4.1" sources."yargs-parser-18.1.3" ]; }) sources."oauth-sign-0.9.0" - sources."object-assign-4.1.1" sources."object-get-2.1.1" sources."object-hash-1.3.1" - sources."object-to-spawn-args-2.0.0" + sources."object-to-spawn-args-2.0.1" sources."once-1.4.0" sources."optionator-0.9.1" sources."p-limit-3.1.0" @@ -5454,11 +5381,10 @@ in sources."p-map-3.0.0" sources."p-try-2.2.0" sources."package-hash-4.0.0" - (sources."packity-0.3.2" // { + (sources."packity-0.3.4" // { dependencies = [ - sources."async-1.5.2" + sources."async-1.4.2" sources."commander-2.20.3" - sources."lodash-3.10.1" sources."semver-5.7.1" ]; }) @@ -5468,7 +5394,7 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" (sources."path-to-regexp-1.8.0" // { dependencies = [ sources."isarray-0.0.1" @@ -5476,7 +5402,8 @@ in }) sources."pathval-1.1.1" sources."performance-now-2.1.0" - sources."picomatch-2.2.2" + sources."picocolors-1.0.0" + sources."picomatch-2.3.1" sources."pify-3.0.0" (sources."pkg-dir-4.2.0" // { dependencies = [ @@ -5486,30 +5413,22 @@ in sources."p-locate-4.1.0" ]; }) - (sources."postcss-7.0.35" // { + sources."postman-collection-4.1.1" + (sources."postman-collection-transformer-4.1.6" // { dependencies = [ - sources."supports-color-6.1.0" - ]; - }) - sources."postman-collection-3.6.9" - (sources."postman-collection-transformer-4.0.0" // { - dependencies = [ - sources."commander-6.2.0" + sources."commander-8.3.0" ]; }) sources."postman-jsdoc-theme-0.0.3" - (sources."postman-request-2.88.1-postman.28" // { + (sources."postman-request-2.88.1-postman.31" // { dependencies = [ sources."tough-cookie-2.5.0" + sources."uuid-3.4.0" ]; }) - (sources."postman-runtime-7.26.10" // { - dependencies = [ - sources."async-2.6.3" - ]; - }) - sources."postman-sandbox-4.0.1" - sources."postman-url-encoder-3.0.1" + sources."postman-runtime-7.29.0" + sources."postman-sandbox-4.0.6" + sources."postman-url-encoder-3.0.5" sources."prelude-ls-1.2.1" sources."pretty-ms-7.0.1" sources."process-nextick-args-2.0.1" @@ -5517,18 +5436,22 @@ in sources."progress-2.0.3" sources."propagate-2.0.1" sources."pseudomap-1.0.2" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pump-1.0.3" sources."punycode-2.1.1" sources."q-1.0.1" - sources."qs-6.5.2" - sources."ramda-0.27.1" + sources."qs-6.5.3" + sources."rambda-7.4.0" sources."randombytes-2.1.0" - sources."readable-stream-3.6.0" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."readdir-0.0.13" - sources."readdirp-3.5.0" + sources."readdirp-3.6.0" sources."rechoir-0.6.2" - sources."recursive-readdir-2.2.2" + sources."recursive-readdir-2.2.3" (sources."reduce-extract-1.0.0" // { dependencies = [ sources."array-back-1.0.4" @@ -5543,37 +5466,36 @@ in sources."test-value-2.1.0" ]; }) - sources."regexpp-3.1.0" - sources."regextras-0.7.1" + sources."regexp-tree-0.1.24" + sources."regexpp-3.2.0" + sources."regextras-0.8.0" sources."release-zalgo-1.0.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" - sources."requizzle-0.2.3" - sources."resolve-1.19.0" - sources."resolve-from-5.0.0" - sources."ret-0.1.15" + sources."requizzle-0.2.4" + sources."resolve-1.22.1" + sources."resolve-from-4.0.0" sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" - sources."safe-regex-1.1.0" + sources."safe-regex-2.1.1" sources."safer-buffer-2.1.2" - sources."sanitize-html-1.20.1" sources."sax-1.2.4" - sources."semver-7.3.4" + sources."semver-7.3.5" (sources."serialised-error-1.1.3" // { dependencies = [ - sources."stack-trace-0.0.9" + sources."uuid-3.4.0" ]; }) - sources."serialize-javascript-5.0.1" + sources."serialize-javascript-6.0.0" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."shelljs-0.8.4" + sources."shelljs-0.8.5" sources."sigmund-1.0.1" - sources."signal-exit-3.0.3" - (sources."sinon-9.2.4" // { + sources."signal-exit-3.0.7" + (sources."sinon-13.0.2" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.2.0" @@ -5586,7 +5508,7 @@ in sources."color-name-1.1.4" ]; }) - (sources."sort-array-4.1.3" // { + (sources."sort-array-4.1.5" // { dependencies = [ sources."array-back-5.0.0" sources."typical-6.0.1" @@ -5601,12 +5523,11 @@ in }) sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.7" + sources."spdx-license-ids-3.0.12" sources."split-ca-1.0.1" sources."sprintf-js-1.0.3" - sources."srcset-1.0.0" - sources."sshpk-1.16.1" - sources."stack-trace-0.0.10" + sources."sshpk-1.17.0" + sources."stack-trace-0.0.9" (sources."stream-connect-1.0.2" // { dependencies = [ sources."array-back-1.0.4" @@ -5614,17 +5535,20 @@ in }) sources."stream-length-1.0.2" sources."stream-via-1.0.4" - sources."strftime-0.10.0" - sources."string-width-4.2.0" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."strip-ansi-6.0.1" sources."strip-bom-4.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - sources."symbol-0.3.1" - (sources."table-6.0.7" // { + sources."supports-preserve-symlinks-flag-1.0.0" + (sources."table-6.8.1" // { dependencies = [ - sources."ajv-7.0.4" + sources."ajv-8.11.2" sources."json-schema-traverse-1.0.0" ]; }) @@ -5636,16 +5560,10 @@ in sources."taffydb-2.6.2" (sources."tar-fs-1.16.3" // { dependencies = [ - sources."mkdirp-0.5.5" - ]; - }) - (sources."tar-stream-1.6.2" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" + sources."mkdirp-0.5.6" ]; }) + sources."tar-stream-1.6.2" sources."teleport-javascript-1.0.0" sources."temp-path-1.0.0" sources."test-exclude-6.0.0" @@ -5663,48 +5581,38 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.4.0" sources."type-detect-4.0.8" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."typical-2.6.1" sources."uc.micro-1.0.6" - sources."uglify-js-3.12.6" - sources."underscore-1.7.0" + sources."uglify-js-3.17.4" + sources."underscore-1.12.1" + sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" - sources."utcstring-0.1.0" sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" - sources."uvm-2.0.1" - sources."v8-compile-cache-2.2.0" + sources."uuid-8.3.2" + sources."uvm-2.0.2" + sources."v8-compile-cache-2.3.0" sources."verror-1.10.0" - sources."walk-back-4.0.0" + sources."walk-back-5.1.0" sources."which-2.0.2" sources."which-module-2.0.0" - (sources."wide-align-1.1.3" // { + (sources."winston-2.4.7" // { 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."winston-2.4.5" // { - dependencies = [ - sources."async-1.0.0" + sources."async-2.6.4" sources."colors-1.0.3" ]; }) sources."word-wrap-1.2.3" sources."wordwrap-1.0.0" sources."wordwrapjs-3.0.0" - sources."workerpool-6.0.2" - (sources."wrap-ansi-5.1.0" // { + sources."workerpool-6.2.0" + (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" ]; }) sources."wrappy-1.0.2" @@ -5715,31 +5623,13 @@ in ]; }) sources."xmlbuilder-15.1.1" - sources."xmlcreate-2.0.3" + sources."xmlcreate-2.0.4" sources."xtend-4.0.2" - sources."y18n-4.0.1" + sources."y18n-5.0.8" sources."yallist-4.0.0" - (sources."yargs-13.3.2" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."find-up-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) - sources."yargs-parser-13.1.2" - (sources."yargs-unparser-2.0.0" // { - dependencies = [ - sources."camelcase-6.2.0" - sources."decamelize-4.0.0" - ]; - }) + sources."yargs-16.2.0" + sources."yargs-parser-20.2.4" + sources."yargs-unparser-2.0.0" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 27bc3edb276f..18edea1ab65b 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -9,25 +9,23 @@ , procps, icu }: -with lib; - { enableNpm ? true, version, sha256, patches ? [] } @args: let inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; - majorVersion = versions.major version; - minorVersion = versions.minor version; + majorVersion = lib.versions.major version; + minorVersion = lib.versions.minor version; pname = if enableNpm then "nodejs" else "nodejs-slim"; - useSharedHttpParser = !stdenv.isDarwin && versionOlder "${majorVersion}.${minorVersion}" "11.4"; + useSharedHttpParser = !stdenv.isDarwin && lib.versionOlder "${majorVersion}.${minorVersion}" "11.4"; - sharedLibDeps = { inherit openssl zlib libuv; } // (optionalAttrs useSharedHttpParser { inherit http-parser; }); + sharedLibDeps = { inherit openssl zlib libuv; } // (lib.optionalAttrs useSharedHttpParser { inherit http-parser; }); - sharedConfigureFlags = concatMap (name: [ + sharedConfigureFlags = lib.concatMap (name: [ "--shared-${name}" - "--shared-${name}-libpath=${getLib sharedLibDeps.${name}}/lib" + "--shared-${name}-libpath=${lib.getLib sharedLibDeps.${name}}/lib" /** Closure notes: we explicitly avoid specifying --shared-*-includes, * as that would put the paths into bin/nodejs. * Including pkg-config in build inputs would also have the same effect! @@ -38,10 +36,10 @@ let copyLibHeaders = map - (name: "${getDev sharedLibDeps.${name}}/include/*") + (name: "${lib.getDev sharedLibDeps.${name}}/include/*") (builtins.attrNames sharedLibDeps); - extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ]; + extraConfigFlags = lib.optionals (!enableNpm) [ "--without-npm" ]; self = stdenv.mkDerivation { inherit pname version; @@ -54,11 +52,11 @@ let CXX_host = "c++"; depsBuildBuild = [ buildPackages.stdenv.cc openssl libuv zlib ]; - buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ] ++ [ zlib libuv openssl http-parser icu ]; nativeBuildInputs = [ which pkg-config python ] - ++ optionals stdenv.isDarwin [ xcbuild ]; + ++ lib.optionals stdenv.isDarwin [ xcbuild ]; outputs = [ "out" "libv8" ]; setOutputFlags = false; @@ -67,9 +65,9 @@ let configureFlags = let isCross = stdenv.hostPlatform != stdenv.buildPlatform; inherit (stdenv.hostPlatform) gcc isAarch32; - in sharedConfigureFlags ++ optionals (versionOlder version "19") [ + in sharedConfigureFlags ++ lib.optionals (lib.versionOlder version "19") [ "--without-dtrace" - ] ++ (optionals isCross [ + ] ++ (lib.optionals isCross [ "--cross-compiling" "--without-intl" "--without-snapshot" @@ -86,9 +84,9 @@ let else if platform.isS390 && platform.is64bit then "s390x" else if platform.isRiscV && platform.is64bit then "riscv64" else throw "unsupported cpu ${stdenv.hostPlatform.uname.processor}"}" - ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" gcc) [ + ]) ++ (lib.optionals (isCross && isAarch32 && lib.hasAttr "fpu" gcc) [ "--with-arm-fpu=${gcc.fpu}" - ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" gcc) [ + ]) ++ (lib.optionals (isCross && isAarch32 && lib.hasAttr "float-abi" gcc) [ "--with-arm-float-abi=${gcc.float-abi}" ]) ++ extraConfigFlags; @@ -122,18 +120,18 @@ let substituteInPlace $a \ --replace "/usr/bin/env" "${coreutils}/bin/env" done - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' sed -i -e "s|tr1/type_traits|type_traits|g" \ -e "s|std::tr1|std|" src/util.h ''; - checkInputs = [ procps ]; + nativeCheckInputs = [ procps ]; doCheck = false; # fails 4 out of 1453 tests postInstall = '' PATH=$out/bin:$PATH patchShebangs $out - ${optionalString (enableNpm && stdenv.hostPlatform == stdenv.buildPlatform) '' + ${lib.optionalString (enableNpm && stdenv.hostPlatform == stdenv.buildPlatform) '' mkdir -p $out/share/bash-completion/completions/ HOME=$TMPDIR $out/bin/npm completion > $out/share/bash-completion/completions/npm for dir in "$out/lib/node_modules/npm/man/"*; do @@ -145,7 +143,7 @@ let ''} # install the missing headers for node-gyp - cp -r ${concatStringsSep " " copyLibHeaders} $out/include/node + cp -r ${lib.concatStringsSep " " copyLibHeaders} $out/include/node # assemble a static v8 library and put it in the 'libv8' output mkdir -p $libv8/lib @@ -183,7 +181,7 @@ let inherit majorVersion; }; - meta = { + meta = with lib; { description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = "https://nodejs.org"; changelog = "https://github.com/nodejs/node/releases/tag/v${version}"; diff --git a/pkgs/development/web/nodejs/npm-patches.nix b/pkgs/development/web/nodejs/npm-patches.nix new file mode 100644 index 000000000000..28432f806dc6 --- /dev/null +++ b/pkgs/development/web/nodejs/npm-patches.nix @@ -0,0 +1,23 @@ +{ fetchpatch }: + +[ + # Makes `npm pack` obey `--foreground-scripts` + (fetchpatch { + name = "libnpmpack-obey-foreground-scripts.patch"; + url = "https://github.com/npm/cli/commit/e4e8ae20aef9e27e57282e87e8757d5b364abb39.patch"; + hash = "sha256-NQ8CZBfRqAOMe0Ysg3cq1FiferWKTzXC1QXgzX+f8OU="; + stripLen = 2; + extraPrefix = "deps/npm/node_modules/"; + includes = [ "deps/npm/node_modules/libnpmpack/lib/index.js" ]; + }) + + # Makes `npm pack` obey `--ignore-scripts` + (fetchpatch { + name = "libnpmpack-obey-ignore-scripts.patch"; + url = "https://github.com/npm/cli/commit/a990c3c9a0e67f0a8b6454213675e159fe49432d.patch"; + hash = "sha256-eA5YST9RxMMjk5FCwEbl1HQUpXZuwWZkx5WC4yJium8="; + stripLen = 2; + extraPrefix = "deps/npm/node_modules/"; + includes = [ "deps/npm/node_modules/libnpmpack/lib/index.js" ]; + }) +] diff --git a/pkgs/development/web/nodejs/revert-arm64-pointer-auth.patch b/pkgs/development/web/nodejs/revert-arm64-pointer-auth.patch new file mode 100644 index 000000000000..f5827983d7f2 --- /dev/null +++ b/pkgs/development/web/nodejs/revert-arm64-pointer-auth.patch @@ -0,0 +1,13 @@ +Fixes cross compilation to aarch64-linux by reverting +https://github.com/nodejs/node/pull/43200 + +--- old/configure.py ++++ new/configure.py +@@ -1236,7 +1236,6 @@ + + # Enable branch protection for arm64 + if target_arch == 'arm64': +- o['cflags']+=['-msign-return-address=all'] + o['variables']['arm_fpu'] = options.arm_fpu or 'neon' + + if options.node_snapshot_main is not None: diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 86358be5bcf0..4563dd7a045a 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.21.1"; - sha256 = "sha256-PbldbKcolXvwkLYwGnqdLYBxSyoG2Jih22XG5Csdp6w="; + version = "14.21.2"; + sha256 = "00zzl43iis8mr8x48hww5ncj8mj5dmpn05rq7ihpffkp2q7rmw6q"; 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 a35c347c3d14..c8241ababc0d 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -5,13 +5,15 @@ let inherit openssl; python = python3; }; + + npmPatches = callPackage ./npm-patches.nix { }; in buildNodejs { inherit enableNpm; - version = "16.18.1"; - sha256 = "sha256-H4BRqI+G9CBk9EFf56mA5ZsKUC7Mje9YP2MDvE1EUjg="; + version = "16.19.0"; + sha256 = "01k72p0hp4lhlpz1syd9cbkm2gpfww0hn10xdpmzd4i3x8dfq7sg"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch - ]; + ] ++ npmPatches; } diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 29f133a81105..fa6dcbf28a77 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -1,24 +1,17 @@ -{ callPackage, openssl, fetchpatch, python3, enableNpm ? true }: +{ callPackage, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { inherit openssl; python = python3; }; + in buildNodejs { inherit enableNpm; - version = "18.12.1"; - sha256 = "sha256-T6QGRRvFJlmikOUs/bIWKnYL1UnaS4u+vmop8pbZON8="; + version = "18.14.0"; + sha256 = "sha256-Qu+d0xmT1cjoKwqwlpE1CT5qKW76J7G+mvwErADwJno="; patches = [ - (fetchpatch { - # Fixes cross compilation to aarch64-linux by reverting https://github.com/nodejs/node/pull/43200 - name = "revert-arm64-pointer-auth.patch"; - url = "https://github.com/nodejs/node/pull/43200/commits/d42c42cc8ac652ab387aa93205aed6ece8a5040a.patch"; - sha256 = "sha256-ipGzg4lEoftTJbt6sW+0QJO/AZqHvUkFKe0qlum+iLY="; - revert = true; - }) - ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch ]; diff --git a/pkgs/development/web/nodejs/v19.nix b/pkgs/development/web/nodejs/v19.nix index 0e30ec899bd0..85739c36c132 100644 --- a/pkgs/development/web/nodejs/v19.nix +++ b/pkgs/development/web/nodejs/v19.nix @@ -5,20 +5,14 @@ let inherit openssl; python = python3; }; + in buildNodejs { inherit enableNpm; - version = "19.1.0"; - sha256 = "sha256-Tqm6H5koFfuCOwIqYrYfU2Eh+XD+iMY5XH469OnPRqA="; + version = "19.6.0"; + sha256 = "sha256-UZxtVCqfmW8AwaPTsuXPUrfbmY2V9s7VqJPRagPeM+o="; patches = [ - (fetchpatch { - # Fixes cross compilation to aarch64-linux by reverting https://github.com/nodejs/node/pull/43200 - name = "revert-arm64-pointer-auth.patch"; - url = "https://github.com/nodejs/node/pull/43200/commits/d42c42cc8ac652ab387aa93205aed6ece8a5040a.patch"; - sha256 = "sha256-ipGzg4lEoftTJbt6sW+0QJO/AZqHvUkFKe0qlum+iLY="; - revert = true; - }) - + ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch ]; diff --git a/pkgs/development/web/shopify-cli/Gemfile.lock b/pkgs/development/web/shopify-cli/Gemfile.lock index a137dbdfaa8e..79a4220d4ac2 100644 --- a/pkgs/development/web/shopify-cli/Gemfile.lock +++ b/pkgs/development/web/shopify-cli/Gemfile.lock @@ -2,30 +2,30 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.2) - bugsnag (6.24.2) + bugsnag (6.25.1) concurrent-ruby (~> 1.0) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) ffi (1.15.5) - liquid (5.2.0) + liquid (5.4.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.1) + nokogiri (1.14.0) mini_portile2 (~> 2.8.0) racc (~> 1.4) - parser (3.1.1.0) + parser (3.2.0.0) ast (~> 2.4.1) - racc (1.6.0) - rb-fsevent (0.11.1) + racc (1.6.2) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - shopify-cli (2.14.0) + shopify-cli (2.34.0) bugsnag (~> 6.22) listen (~> 3.7.0) - theme-check (~> 1.10.1) - theme-check (1.10.2) - liquid (>= 5.1.0) + theme-check (~> 1.14.0) + theme-check (1.14.0) + liquid (>= 5.4.0) nokogiri (>= 1.12) parser (~> 3) @@ -36,4 +36,4 @@ DEPENDENCIES shopify-cli BUNDLED WITH - 2.2.33 + 2.4.3 diff --git a/pkgs/development/web/shopify-cli/default.nix b/pkgs/development/web/shopify-cli/default.nix index e6f164f2bca2..ae6e6b82df9b 100644 --- a/pkgs/development/web/shopify-cli/default.nix +++ b/pkgs/development/web/shopify-cli/default.nix @@ -4,6 +4,7 @@ let rubyEnv = bundlerEnv { name = "shopify-cli"; gemdir = ./.; + ruby = ruby; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/web/shopify-cli/gemset.nix b/pkgs/development/web/shopify-cli/gemset.nix index 1c6d7e891980..3bc3e2edef4b 100644 --- a/pkgs/development/web/shopify-cli/gemset.nix +++ b/pkgs/development/web/shopify-cli/gemset.nix @@ -15,20 +15,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vlsqawqy8jn6cy03zcqw944p323zmr2lgadbw00m5r4lqc3bll4"; + sha256 = "108q00vcx3vkr85mpayns3ini6ids807bmhl8nfham9900ric27y"; type = "gem"; }; - version = "6.24.2"; + version = "6.25.1"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; type = "gem"; }; - version = "1.1.9"; + version = "1.1.10"; }; ffi = { groups = ["default"]; @@ -45,10 +45,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16aqzbvhvm254hbl274l4883h38j8wlwkcarmg09c7wzgpi0jnl1"; + sha256 = "0h0d0ghdf01lkv4x0mzp6zdkrnj7gsfq3widkhyni26bf6648qp3"; type = "gem"; }; - version = "5.2.0"; + version = "5.4.0"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -77,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + sha256 = "1fqld4wnamj7awdr1lwdifpylqdrrg5adm8xj2jl9sc5ms3nxjjm"; type = "gem"; }; - version = "1.13.3"; + version = "1.14.0"; }; parser = { dependencies = ["ast"]; @@ -88,30 +88,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c"; + sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623"; type = "gem"; }; - version = "3.1.1.0"; + version = "3.2.0.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.2"; }; rb-fsevent = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06c50pvxib7wqnv6q0f3n7gzfcrp5chi3sa48hxpkfxc3hhy11fm"; + sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; type = "gem"; }; - version = "0.11.1"; + version = "0.11.2"; }; rb-inotify = { dependencies = ["ffi"]; @@ -130,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fjqahhvmvqvmpfwa337ran9hhn9wk0ylm502qvcy5i4xy5hvd2r"; + sha256 = "0zzg2vv58s7ylbk35vfb3gj9q6wr59m18gb8sw9f2rnsgsmkivbr"; type = "gem"; }; - version = "2.14.0"; + version = "2.34.0"; }; theme-check = { dependencies = ["liquid" "nokogiri" "parser"]; @@ -141,9 +141,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0314f49fg354wgqavvipfaf6a03090kqrgv48qvkb0ikhvqawpdr"; + sha256 = "1w5mmxnyc0h612c04x6h3xb8jjcq5l6mh2vql4138h2r2z98vdwq"; type = "gem"; }; - version = "1.10.2"; + version = "1.14.0"; }; } diff --git a/pkgs/development/web/shopify-themekit/default.nix b/pkgs/development/web/shopify-themekit/default.nix index 3d7fbbda4b18..7c9007ef8e83 100644 --- a/pkgs/development/web/shopify-themekit/default.nix +++ b/pkgs/development/web/shopify-themekit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "shopify-themekit"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Shopify"; repo = "themekit"; rev = "v${version}"; - sha256 = "sha256-7uUKyaLzeiioW0TsEu82lJU0DoM1suwVcmacY1X0SEM="; + sha256 = "sha256-HtgA+R6THZ49WYtGlHS1EzekjuuGgPe657Y6ewraD4o="; }; vendorSha256 = "sha256-8QpkYj0fQb4plzvk6yCrZho8rq9VBiLft/EO3cczciI="; diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index 0d263cf5101c..373806af02f3 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bootstrap"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip"; - sha256 = "sha256-3zAnCKd+btQFd9aSwfESNz7HNapm2bgQOkf5m1zyMf8="; + sha256 = "sha256-j6IBaj3uHiBL0WI+BQ3PR36dKME7uYofWPV+D9QM3Tg="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/development/web/xmlindent/default.nix index f6df21d57660..0edbf41e2af2 100644 --- a/pkgs/development/web/xmlindent/default.nix +++ b/pkgs/development/web/xmlindent/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "XML stream reformatter"; - homepage = "http://xmlindent.sourceforge.net/"; + homepage = "https://xmlindent.sourceforge.net/"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/games/BeatSaberModManager/add-runtime-identifier.patch b/pkgs/games/BeatSaberModManager/add-runtime-identifier.patch new file mode 100644 index 000000000000..a7d17b59a35b --- /dev/null +++ b/pkgs/games/BeatSaberModManager/add-runtime-identifier.patch @@ -0,0 +1,12 @@ +--- a/BeatSaberModManager/BeatSaberModManager.csproj ++++ b/BeatSaberModManager/BeatSaberModManager.csproj +@@ -14,6 +14,7 @@ + true + true + Resources/Icons/Icon.ico ++ @runtimeIdentifier@ + + + + +Diff finished. Tue Oct 18 23:16:23 2022 diff --git a/pkgs/games/BeatSaberModManager/default.nix b/pkgs/games/BeatSaberModManager/default.nix new file mode 100644 index 000000000000..614733e549a8 --- /dev/null +++ b/pkgs/games/BeatSaberModManager/default.nix @@ -0,0 +1,73 @@ +{ + lib, + dotnet-sdk, + stdenv, + substituteAll, + + buildDotnetModule, + fetchFromGitHub, + + dotnetCorePackages, + + libX11, + libICE, + libSM, + fontconfig, +}: + +buildDotnetModule rec { + pname = "BeatSaberModManager"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "affederaffe"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XeyOWg4Wa4hiorLPnbnBrLSjnxheAGGMPTqBleulDGw="; + fetchSubmodules = true; # It vendors BSIPA-Linux + }; + + # This _must_ be specified in the project file and it can only be one so + # obviously you wouldn't specify it as an upstream project. Typical M$. + # https://github.com/NixOS/nixpkgs/pull/196648#discussion_r998709996 + # https://github.com/affederaffe/BeatSaberModManager/issues/5 + patches = [ + (substituteAll { + src = ./add-runtime-identifier.patch; + runtimeIdentifier = dotnetCorePackages.systemToDotnetRid stdenv.targetPlatform.system; + }) + ]; + + dotnet-sdk = dotnetCorePackages.sdk_7_0; + dotnet-runtime = dotnetCorePackages.runtime_7_0; + + nugetDeps = ./deps.nix; + + runtimeDeps = [ + libX11 + libICE + libSM + fontconfig + ]; + + meta = with lib; { + description = "Yet another mod installer for Beat Saber, heavily inspired by ModAssistant"; + homepage = "https://github.com/affederaffe/BeatSaberModManager"; + longDescription = '' + BeatSaberModManager is yet another mod installer for Beat Saber, heavily inspired by ModAssistant + It strives to look more visually appealing and support both Windows and Linux, while still being as feature-rich as ModAssistant. + + Features + + - Windows and Linux support + - Dependency resolution + - Installed mod detection + - Mod uninstallation + - Theming support + - OneClick™ support for BeatSaver, ModelSaber and Playlists + ''; + license = licenses.mit; + maintainers = with maintainers; [ atemu ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/games/BeatSaberModManager/deps.nix b/pkgs/games/BeatSaberModManager/deps.nix new file mode 100644 index 000000000000..1542b120c9af --- /dev/null +++ b/pkgs/games/BeatSaberModManager/deps.nix @@ -0,0 +1,121 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Avalonia"; version = "11.0.0-preview4"; sha256 = "0s2ijp8fbny04c62gy8acg4n769hzj1pl9jml35bqrzk4m29jxs2"; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0-preview4"; sha256 = "0dbbigfg5qqqgi16fglsqphg63ihl3hhpfw9f85ypvb5dfjimnq0"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.0-preview4"; sha256 = "10c1w7slmlkn1sjyk2y8awzlkd9rr35zpvwnvsv0i235zbqc3a07"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.0-preview4"; sha256 = "1ccnfi429hah9qsl6qimkhlz6j29zjjpm77di14wnlr8x3nh19z0"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.0-preview4"; sha256 = "1x8d46p9wxwrfhn4xcgx64x5y9dw08a7v54w8ms9ba58zr01bm74"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.0-preview4"; sha256 = "1ivrh736xxn3j1b64ni0wy7ydp22sbl2yv5kdircxknhb7bhpigd"; }) + (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "11.0.0-preview4"; sha256 = "16p0va19f83ccq493vxa8rvdgy71jsgijymb078bagk5nsm2alzs"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.0-preview4"; sha256 = "0ia7zx7chgchh4piqp400cdpj14jndh313yh2z9nspqxq30xll46"; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.0-preview4"; sha256 = "0qrv6ff3lgsqa57q5nrsmfzfp3w2x6d536xi3hq18616zjv7k1x4"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0-preview4"; sha256 = "1g8j7ll3q9k7v0j54j42dy1mkzkgs9rlyia0gjg3b7z5ilk0rbiz"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0-preview4"; sha256 = "011flxwy9rnjlvwb1nvn9qlj0nfsr3f4gmvlzkg7abhwh7hzv3vi"; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.0-preview4"; sha256 = "07lkj6z4fy41i6fbnrzkb22z63czspcnfp5lz25qkvys37vkmhdm"; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.0-preview4"; sha256 = "02cn71h91fxvw9knni2dxlhpf9ihdkq3r0mylvr8z7r493saiqkm"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.0-preview4"; sha256 = "1fqj7jv22ki9pim55hav8qfr01vhjkzdp5rdi1p22xxmgrxws5ws"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.0-preview4"; sha256 = "0lmw94qp4y05xzxx6flzgsv4cw6mckcn8ig6mm8hdqpqqsiihc1n"; }) + (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; sha256 = "1m9qx8g6na5ka6kd9vhg8gjmxrnkzb6v5cl5yqp1kdjsw4rcwy6x"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.108"; sha256 = "0xs4px4fy5b6glc77rqswzpi5ddhxvbar1md6q9wla7hckabnq0z"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.1-preview.108"; sha256 = "16wvgvyra2g1b38rxxgkk85wbz89hspixs54zfcm4racgmj1mrj4"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.1-preview.108"; sha256 = "16v7lrwwif2f5zfkx08n6y6w3m56mh4hy757biv0w9yffaf200js"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.1-preview.108"; sha256 = "15kqb353snwpavz3jja63mq8xjqsrw1f902scm8wxmsqrm5q6x55"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) + (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.12"; sha256 = "0x8x922jhdn4zzbqqhlnzg5cmg69myn9zibk363py3yamkywcami"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.12"; sha256 = "1zi1x4w51fawi8083s48mxrlpqzkc48qsvrq2h7xx58x48ml465s"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.12"; sha256 = "1wwciddbnykamlwl9i88l9081q27l0i17jmvymsxddbi0v9rr3sb"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.12"; sha256 = "0axj326a79h8762ahrxgpnzczivfvdjn2xa2np2djc7ybn6j3491"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.12"; sha256 = "0dfivz2wq18gsdn8b9d0v6q0lf2mvayl85nad7cvysfc93aw05jg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.12"; sha256 = "00s1flhzvxsdhgn469vc1q63qkcv05g5zqx10p1gsnzxjpdx01in"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.12"; sha256 = "1j615cjwkyjkvvc03pvwmfgqbh1z9aq08bvw0bnjkhs1qs6dz7x0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.12"; sha256 = "1w7kfgld8wcbqqyb1cpbnd6b08f83jfny2q70vb1qdqfn5bgcb1h"; }) + (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.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) + (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; sha256 = "1lxkc8yk9glj0w9n5vry2dnwwvh8152ad2c5bivk8aciq64zidyn"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.0.11"; sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.0.11"; sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.1.0"; sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.1.0"; sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.0.1"; sha256 = "05k34ijz9g9csh0vbbv3g3lrxl163izwcfncmbcl7k073h32rzkr"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.1.0"; sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.0.1"; sha256 = "1kswgqhy34qvc49i981fk711s7knd6z13bp0rin8ms6axkh98nas"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.0.11"; sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.0.11"; sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.0.1"; sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; }) + (fetchNuGet { pname = "Serilog"; version = "2.10.0"; sha256 = "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.1-dev-00947"; sha256 = "153vi3xjy65ixfr8nfs59n0bmgj0jxfyydmhjs8h3apr9f29lbh4"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1"; sha256 = "0jpn0x1rfj3dzjfg972icml5swvzvr368nip269qq0a2z4xy0lhx"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1"; sha256 = "19f8f0m3d6xds2dggazafdk4i3injaxpx7ahg73nq8zj03qbg7fp"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1"; sha256 = "1img6chwxprz6bqjyi43walgb3xccnzgfxs29xwcvkkmc8w6pvdp"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1"; sha256 = "0bvpwfdji8wb5f16hfzc62k265p21r172dqpibdx1gjd6w6phxrs"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1"; sha256 = "1x0ds2nnbqn44kfrfbvj055nihhmzlqm5fhdka3mgbj821fpy629"; }) + (fetchNuGet { pname = "Splat"; version = "14.4.1"; sha256 = "03ycyjn2ii44npi015p4rk344xnjgdzz02cf63cmhx2ab8hv6p4b"; }) + (fetchNuGet { pname = "StrongInject"; version = "1.4.5-ci-20220524-023137"; sha256 = "1ksiv5rs22j193sxwjvdc4vhblikka9z8hhs705f4mi1r4q0x1ha"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.0.1"; sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) + (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.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) + (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.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) + (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"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) + (fetchNuGet { pname = "ThisAssembly.AssemblyInfo"; version = "1.0.10"; sha256 = "1hvq0c9d6zmn1q6lyvz4hcaiypf1d65akhx70mv2plysbgvrcm95"; }) + (fetchNuGet { pname = "ThisAssembly.Prerequisites"; version = "1.0.10"; sha256 = "112grp0xxkzfkhyxb1hbh4qs2d9qrkasv42himdkqjk0i0fg1ag0"; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; }) + (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.5.1"; sha256 = "11sld5a9z2rdglkykvylghka7y37ny18naywpgpxp485m9bc63wc"; }) +] diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix index 4fc37b0ca25c..227de62b4734 100644 --- a/pkgs/games/airshipper/default.nix +++ b/pkgs/games/airshipper/default.nix @@ -12,30 +12,58 @@ , libXrandr , libXi , libXcursor +, udev +, alsa-lib +, stdenv +, libxcb , pkg-config , makeWrapper +, writeShellScript +, patchelf }: - -rustPlatform.buildRustPackage rec { +let + version = "0.10.0"; + # Patch for airshipper to install veloren + patch = let + runtimeLibs = [ + udev + alsa-lib + stdenv.cc.cc.lib + libxkbcommon + libxcb + libX11 + libXcursor + libXrandr + libXi + vulkan-loader + libGL + ]; + in + writeShellScript "patch" '' + echo "making binaries executable" + chmod +x {veloren-voxygen,veloren-server-cli} + echo "patching dynamic linkers" + ${patchelf}/bin/patchelf \ + --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ + veloren-server-cli + ${patchelf}/bin/patchelf \ + --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ + --set-rpath "${lib.makeLibraryPath runtimeLibs}" \ + veloren-voxygen + ''; +in +rustPlatform.buildRustPackage { pname = "airshipper"; - version = "0.7.0"; + inherit version; src = fetchFromGitLab { owner = "Veloren"; repo = "airshipper"; rev = "v${version}"; - sha256 = "sha256-nOE9ZNHxLEAnMkuBSpxmeq3DxkRIlcoase6AxU+eFug="; + sha256 = "sha256-5zP1Ye1fJNQp8eWKwdxLqBr4qzBfWEEBsJ9s7+8idL4="; }; - 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="; + cargoSha256 = "sha256-oksJYuuHdfP5mMQ+zYHH5SgD6YUK+zE3+AY90ZzHRUU="; buildInputs = [ openssl @@ -49,9 +77,11 @@ rustPlatform.buildRustPackage rec { ]; nativeBuildInputs = [ pkg-config makeWrapper ]; + RUSTC_BOOTSTRAP = 1; # We need rust unstable features + postInstall = '' 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" + install -Dm444 "client/assets/net.veloren.airshipper.png" "$out/share/icons/net.veloren.airshipper.png" ''; postFixup = @@ -70,6 +100,7 @@ rustPlatform.buildRustPackage rec { in '' patchelf --set-rpath "${libPath}" "$out/bin/airshipper" + wrapProgram "$out/bin/airshipper" --set VELOREN_PATCHER "${patch}" ''; doCheck = false; diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 82064325ab5f..9523a228f878 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -3,22 +3,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.54"; + version = "2.1.56"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-NFhgVd4ctEsh7iaSZ9v0OMszd81H41eq+y+FRIhcCtE="; + sha256 = "sha256-bois8+W/Jvte0HqC6Vi8WcXzrc8y8fKoW3ttbPb/v14="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-kus59Z9Oe4sbAlF4szeg751hlSEUR0ijKz4rjfHEWgA="; + sha256 = "sha256-xd96wG+dElf6kSJ3jtdwfDhxJIv2r/o/JF2RcIwaZkg="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-ROIpGB3W21ttWj+cRkf0rpLFrO4LR6+ZyGRsalz5J+E="; + sha256 = "sha256-dYYgKEN6ytZ1CIH2+hK7H7xs3ISMbZGDv3w+Ie+ISlw="; }; }; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 71575c35fd37..28bf794a8a97 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -104,7 +104,7 @@ buildPythonApplication rec { ++ lib.optionals stdenv.isDarwin [ CoreAudio ] ; - checkInputs = [ pytest glibcLocales nose ]; + nativeCheckInputs = [ pytest glibcLocales nose ]; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; buildInputs = [ lame mpv-unwrapped libpulseaudio ]; diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index f351040ff883..94a16f60140d 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -1,27 +1,69 @@ -{ fetchurl, lib, stdenv, SDL, SDL_image, SDL_mixer, SDL_sound, libsigcxx, physfs -, boost, expat, freetype, libjpeg, wxGTK32, lua, perl, pkg-config, zlib, zip, bzip2 -, libpng, libtiff, fluidsynth, libmikmod, libvorbis, flac, libogg }: +{ fetchFromGitHub +, lib +, stdenv +, SDL +, SDL_image +, SDL_mixer +, SDL_sound +, libsigcxx +, physfs +, boost +, expat +, freetype +, libjpeg +, wxGTK32 +, lua +, perl +, pkg-config +, zlib +, zip +, bzip2 +, libpng +, libtiff +, fluidsynth +, libmikmod +, libvorbis +, flac +, libogg +}: stdenv.mkDerivation rec { pname = "asc"; - version = "2.6.0.0"; + version = "2.6.3.0"; - src = fetchurl { - url = "mirror://sourceforge/asc-hq/asc-${version}.tar.bz2"; - sha256 = "1fybasb6srqfg6pqbvh0s0vvzjq9r0n6aq0z44hs7n68kmaam775"; + src = fetchFromGitHub { + owner = "ValHaris"; + repo = "asc-hq"; + rev = "fa3bca082a5cea2b35812349f99b877f0113aef0"; + sha256 = "atamYCN2mOqxV6auToTeWdpKuFfC+GLfLdRsfT0ouwQ="; }; - configureFlags = [ "--disable-paragui" "--disable-paraguitest" ]; - - NIX_CFLAGS_COMPILE = "-fpermissive -Wno-error=narrowing -std=c++11"; # I'm too lazy to catch all gcc47-related problems - hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ - SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat - freetype libjpeg wxGTK32 lua perl zlib zip bzip2 libpng - libtiff fluidsynth libmikmod flac libvorbis libogg + SDL + SDL_image + SDL_mixer + SDL_sound + physfs + boost + expat + freetype + libjpeg + wxGTK32 + lua + perl + zlib + zip + bzip2 + libpng + libtiff + fluidsynth + libmikmod + flac + libvorbis + libogg + libsigcxx ]; meta = with lib; { diff --git a/pkgs/games/blobby/blobby.sh b/pkgs/games/blobby/blobby.sh index 4c4b32b12433..3171c5a80b1b 100644 --- a/pkgs/games/blobby/blobby.sh +++ b/pkgs/games/blobby/blobby.sh @@ -7,4 +7,4 @@ test -d ~/.blobby || { ( cd ~/.blobby; for i in *.zip; do @unzip@/bin/unzip "$i"; done ) } -@out@/bin/blobby.bin +exec @out@/bin/blobby.bin "$@" diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index 9dad0b84d1e3..68e18dfe26dd 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL2, SDL2_image, libGLU, libGL, cmake, physfs, boost, zip, zlib, pkg-config }: +{ lib, stdenv, fetchurl, SDL2, SDL2_image, libGLU, libGL, cmake, physfs, boost, zip, zlib, unzip, pkg-config }: stdenv.mkDerivation rec { pname = "blobby-volley"; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { sed -e '1i#include ' -i src/NetworkMessage.cpp ''; + inherit unzip; + postInstall = '' cp ../data/Icon.bmp "$out/share/blobby/" mv "$out/bin"/blobby{,.bin} @@ -28,7 +30,8 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ raskin ]; - homepage = "http://blobby.sourceforge.net/"; + homepage = "https://blobbyvolley.de/"; downloadPage = "https://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/"; + mainProgram = "blobby"; }; } diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix index 202bab0df667..cec88ab51bdc 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/games/btanks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, sconsPackages, pkg-config, SDL, libGL, zlib, smpeg +{ lib, stdenv, fetchurl, fetchpatch, scons, pkg-config, SDL, libGL, zlib, smpeg , SDL_image, libvorbis, expat, zip, lua }: stdenv.mkDerivation rec { @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0ha35kxc8xlbg74wsrbapfgxvcrwy6psjkqi7c6adxs55dmcxliz"; + hash = "sha256-P9LOaitF96YMOxFPqa/xPLPdn7tqZc3JeYt2xPosQ0E="; }; - nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkg-config ]; + nativeBuildInputs = [ scons pkg-config ]; buildInputs = [ SDL libGL zlib smpeg SDL_image libvorbis expat zip lua ]; @@ -20,17 +20,25 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/lua52.patch?h=btanks"; - sha256 = "0ip563kz6lhwiims5djrxq3mvb7jx9yzkpsqxxhbi9n6qzz7y2az"; name = "lua52.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/lua52.patch?h=btanks&id=cd0e016963238f16209baa2da658aa3fad36e33d"; + hash = "sha256-Xwl//sfGprhg71jf+X3q8qxdB+5ZtqJrjBxS8+cw5UY="; }) (fetchpatch { - url = "https://salsa.debian.org/games-team/btanks/raw/master/debian/patches/gcc-4.7.patch"; - sha256 = "1dxlk1xh69gj10sqcsyckiakb8an3h41206wby4z44mpmvxc7pi4"; + url = "https://salsa.debian.org/games-team/btanks/-/raw/debian/0.9.8083-9/debian/patches/gcc-4.7.patch"; + hash = "sha256-JN7D+q63EvKJX9wAEQgcVqE1VZzMa4Y1CPIlA3uYtLc="; }) (fetchpatch { - url = "https://salsa.debian.org/games-team/btanks/raw/master/debian/patches/pow10f.patch"; - sha256 = "1h45790v2dpdbccfn6lwfgl8782q54i14cz9gpipkaghcka4y0g9"; + url = "https://salsa.debian.org/games-team/btanks/-/raw/debian/0.9.8083-9/debian/patches/pow10f.patch"; + hash = "sha256-6QFP1GTwqXnjfekzEiIpWKCD6HOcGusYW+02sUE6hcA="; + }) + (fetchpatch { + url = "https://salsa.debian.org/games-team/btanks/-/raw/debian/0.9.8083-9/debian/patches/python3.patch"; + hash = "sha256-JpK409Myi8mxQaunmLFKKh1NKvKLXpNHHsDvRee8OoQ="; + }) + (fetchpatch { + url = "https://salsa.debian.org/games-team/btanks/-/raw/debian/0.9.8083-9/debian/patches/scons.patch"; + hash = "sha256-JCvBY2fOV8Sc/mpvEsJQv1wKcS1dHqYxvRk6I9p7ZKc="; }) ]; diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix index 75bcad2f0db1..9bceef012907 100644 --- a/pkgs/games/bugdom/default.nix +++ b/pkgs/games/bugdom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bugdom"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "jorio"; repo = pname; rev = version; - sha256 = "sha256-pgms2mipW1zol35LVCuU5+7mN7CBiVGFvu1CJ3CrGU0="; + hash = "sha256-oe7xxvoL82YF+EoIJDK6AfN3PmpqeGRlIsbaGx8xGeM="; fetchSubmodules = true; }; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { # Passing this in cmakeFlags doesn't work because the path is hard-coded for Darwin substituteInPlace cmake/FindSDL2.cmake \ --replace 'set(SDL2_LIBRARIES' 'set(SDL2_LIBRARIES "${SDL2}/lib/libSDL2.dylib") #' + # Expects plutil, which we don't have + sed -i '/plutil/d' CMakeLists.txt ''; buildInputs = [ @@ -43,7 +45,7 @@ stdenv.mkDerivation rec { '' + (if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/{bin,Applications} mv {,$out/Applications/}Bugdom.app - ln -s $out/{Applications/Bugdom.app/Contents/MacOS,bin}/Bugdom + makeWrapper $out/{Applications/Bugdom.app/Contents/MacOS,bin}/Bugdom '' else '' mkdir -p $out/share/bugdom mv Data $out/share/bugdom diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index db144a147f6d..7f43e8949b70 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bzflag"; - version = "2.4.24"; + version = "2.4.26"; src = fetchurl { url = "https://download.bzflag.org/${pname}/source/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-X4Exvrf8i6UeMjoG7NfY6rkVN8NCzoehE+XrbqmM48Q="; + sha256 = "sha256-AYMEBf8mrR3FlafgaVyCTCeG5niGjZ/4Iq6xSsdIEBQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/games/cbonsai/default.nix b/pkgs/games/cbonsai/default.nix index 30abbba93f28..2dc131aba6db 100644 --- a/pkgs/games/cbonsai/default.nix +++ b/pkgs/games/cbonsai/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installFlags = [ "PREFIX=$(out)" ]; - passthru.updateScript = nix-update-script { attrPath = pname; }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Grow bonsai trees in your terminal"; diff --git a/pkgs/games/cdogs-sdl/default.nix b/pkgs/games/cdogs-sdl/default.nix index 3a7f4ff63eba..23eb6e96dcb8 100644 --- a/pkgs/games/cdogs-sdl/default.nix +++ b/pkgs/games/cdogs-sdl/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cdogs"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { repo = "cdogs-sdl"; owner = "cxong"; rev = version; - sha256 = "sha256-fKqipk1kiPC6HrkNzxHK2aYe5WDZ3hEbPCwsqK5uQ2s="; + sha256 = "sha256-jEK84iFodd0skRnHG3R0+MvBUXLd3o+YOLnBjZdsDms="; }; postPatch = '' diff --git a/pkgs/games/chessdb/default.nix b/pkgs/games/chessdb/default.nix index 6de8726722ec..4b96662d84d7 100644 --- a/pkgs/games/chessdb/default.nix +++ b/pkgs/games/chessdb/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://chessdb.sourceforge.net/"; + homepage = "https://chessdb.sourceforge.net/"; description = "A free chess database"; platforms = lib.platforms.linux; }; diff --git a/pkgs/games/classicube/default.nix b/pkgs/games/classicube/default.nix index 05a5fa11931a..ec2490196abb 100644 --- a/pkgs/games/classicube/default.nix +++ b/pkgs/games/classicube/default.nix @@ -3,7 +3,10 @@ , fetchFromGitHub , dos2unix , makeWrapper -, SDL2 +, makeDesktopItem +, copyDesktopItems +, libX11 +, libXi , libGL , curl , openal @@ -12,16 +15,28 @@ stdenv.mkDerivation rec { pname = "ClassiCube"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "UnknownShadow200"; repo = "ClassiCube"; rev = version; - sha256 = "sha256-m7pg9OL2RuCVKgFD3hMtIeY0XdJ1YviXBFVJH8/T5gI="; + sha256 = "sha256-anBi9hPwX1AAIc8dXsKyX4u7UbkKqC1P+7f7wdKWAig="; }; - nativeBuildInputs = [ dos2unix makeWrapper ]; + nativeBuildInputs = [ dos2unix makeWrapper copyDesktopItems ]; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = pname; + genericName = "Sandbox Block Game"; + exec = "ClassiCube"; + icon = "CCicon"; + comment = "Minecraft Classic inspired sandbox game"; + categories = [ "Game" ]; + }) + ]; prePatch = '' # The ClassiCube sources have DOS-style newlines @@ -32,12 +47,8 @@ stdenv.mkDerivation rec { patches = [ # Fix hardcoded font paths ./font-location.patch - # ClassiCube doesn't compile with its X11 backend - # because of issues with libXi. - ./use-sdl.patch # For some reason, the Makefile doesn't link # with libcurl and openal when ClassiCube requires them. - # Also links with SDL2 instead of libX11 and libXi. ./fix-linking.patch ]; @@ -57,13 +68,15 @@ stdenv.mkDerivation rec { --replace 'JOBS=1' "JOBS=$NIX_BUILD_CORES" ''; - buildInputs = [ SDL2 libGL curl openal liberation_ttf ]; + buildInputs = [ libX11 libXi libGL curl openal liberation_ttf ]; preBuild = "cd src"; postBuild = "cd -"; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" cp 'src/ClassiCube' "$out/bin" # ClassiCube puts downloaded resources @@ -75,6 +88,11 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/ClassiCube" \ --run 'mkdir -p "$HOME/.local/share/ClassiCube"' \ --run 'cd "$HOME/.local/share/ClassiCube"' + + mkdir -p "$out/share/icons/hicolor/256x256/apps" + cp misc/CCicon.png "$out/share/icons/hicolor/256x256/apps" + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/games/classicube/fix-linking.patch b/pkgs/games/classicube/fix-linking.patch index 987c882367ee..197a3ab694e0 100644 --- a/pkgs/games/classicube/fix-linking.patch +++ b/pkgs/games/classicube/fix-linking.patch @@ -7,7 +7,7 @@ index 83188ce..3439cdb 100644 ifeq ($(PLAT),linux) -LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl -+LIBS=-lSDL2 -lpthread -lGL -lm -ldl -lcurl -lopenal ++LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl -lcurl -lopenal endif ifeq ($(PLAT),sunos) diff --git a/pkgs/games/classicube/use-sdl.patch b/pkgs/games/classicube/use-sdl.patch deleted file mode 100644 index 3456ef8b6469..000000000000 --- a/pkgs/games/classicube/use-sdl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Core.h b/src/Core.h -index e94a39e..96527d0 100644 ---- a/src/Core.h -+++ b/src/Core.h -@@ -170,7 +170,7 @@ Thus it is **NOT SAFE** to allocate a string on the stack. */ - #define CC_BUILD_LINUX - #define CC_BUILD_POSIX - #define CC_BUILD_GL --#define CC_BUILD_X11 -+#define CC_BUILD_SDL - #define CC_BUILD_CURL - #define CC_BUILD_OPENAL - #if defined CC_BUILD_RPI diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index 7454242c72b5..e3385eaca537 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.11.1"; + version = "5.12.0"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-2Sjl9XO01ko0BwbFQSFv9mNoetyMa8Dxx17y0JmlLS0="; + sha256 = "sha256-ep48Lgxw0yKd7+Cx6wMEnOqu/1vjdCM36+TKv1sb1Tk="; }; postPatch = '' diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index ae6ade155f25..a141591211c0 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "cutemaze"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://gottcode.org/cutemaze/${pname}-${version}-src.tar.bz2"; - sha256 = "6944931cd39e9ef202c11483b7b2b7409a068c52fa5fd4419ff938b1158c72ab"; + url = "https://gottcode.org/cutemaze/${pname}-${version}.tar.bz2"; + hash = "sha256-hjDlY18O+VDJR68vwrIZwsQAa40xU+V3bCAA4GFHJEQ="; }; nativeBuildInputs = [ @@ -36,8 +36,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://gottcode.org/cutemaze/"; + changelog = "https://github.com/gottcode/cutemaze/blob/v${version}/ChangeLog"; description = "Simple, top-down game in which mazes are randomly generated"; + homepage = "https://gottcode.org/cutemaze/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda ]; platforms = platforms.unix; diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index eed383a3ab1e..1aaa752fbd6e 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -1,9 +1,11 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , ninja , pkg-config +, rustPlatform , curl , freetype , libGLU @@ -22,6 +24,7 @@ , vulkan-loader , glslang , spirv-tools +, gtest , Carbon , Cocoa , OpenGL @@ -30,16 +33,33 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "16.4"; + version = "16.7.2"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - sha256 = "sha256-8t4UKytYmkELEMQ06jIj7C9cdOc5L22AnigwkGBzx20="; + hash = "sha256-dK46ubcq/sYSXLeZwAeomj9+jpSNpgHsTmXKdrllLTc="; }; - nativeBuildInputs = [ cmake ninja pkg-config ]; + cargoDeps = rustPlatform.fetchCargoTarball { + name = "${pname}-${version}"; + inherit src; + hash = "sha256-jLR/XriiKXmpHGBHtPa1vpE5ms3Dw1wrNt/4KARyM74="; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + rustPlatform.rust.rustc + rustPlatform.rust.cargo + rustPlatform.cargoSetupHook + ]; + + nativeCheckInputs = [ + gtest + ]; buildInputs = [ curl @@ -62,10 +82,13 @@ stdenv.mkDerivation rec { spirv-tools ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa OpenGL Security ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - "-DAUTOUPDATE=OFF" - "-GNinja" + patches = [ + (fetchpatch { + # error: use of undeclared identifier 'pthread_attr_set_qos_class_np' + # https://github.com/ddnet/ddnet/pull/5913 + url = "https://github.com/ddnet/ddnet/pull/5913/commits/ccc6cd59de58905dce3a3bd5d8461a03b1adb249.patch"; + hash = "sha256-CkHckE+bOMKDcoijNYDo+zEQ9Eq9ePDV18LybzCMPYs="; + }) ]; postPatch = '' @@ -73,6 +96,13 @@ stdenv.mkDerivation rec { --replace /usr/ $out/ ''; + cmakeFlags = [ + "-DAUTOUPDATE=OFF" + ]; + + doCheck = true; + checkTarget = "run_tests"; + meta = with lib; { description = "A Teeworlds modification with a unique cooperative gameplay."; longDescription = '' @@ -84,9 +114,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://ddnet.org"; license = licenses.asl20; - maintainers = with maintainers; [ sirseruju lom ]; + maintainers = with maintainers; [ sirseruju lom ncfavier ]; mainProgram = "DDNet"; - # error: use of undeclared identifier 'pthread_attr_set_qos_class_np' - broken = stdenv.isDarwin; }; } diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index c7943b24c95e..94838596a129 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -42,8 +42,8 @@ let owner = "diasurgical"; repo = "libzt"; fetchSubmodules = true; - rev = "a34ba7f1cc2e41b05badd25d1b01fdc5fd2f4e02"; - sha256 = "sha256-tyIPt+7OTi5W+5X/ixQP1puOKdhrqRZtpwXlWFBFpc8="; + rev = "37a2efb0b925df632299ef07dc78c0af5f6b4756"; + sha256 = "sha256-+o4ZTVqh4MDZES9m7mkfkMRlRDMBytDBuA0QIlnp73U="; }; # missing pkg-config and/or cmake file @@ -55,22 +55,15 @@ in stdenv.mkDerivation rec { pname = "devilutionx"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "diasurgical"; repo = "devilutionX"; rev = version; - sha256 = "sha256-uuIPTdgGpHA8j1M8b+kfnBuiJ5mdS9rckvEfn2h7lmo="; + sha256 = "sha256-l0BhL+DXtkG2PdFqmkL0KJv41zl3N/AcuLmzw2j3jXY="; }; - patches = [ - (fetchpatch { - url = "https://github.com/diasurgical/devilutionX/commit/03b22352fc9e1ecb88b20a053c90c04a50717267.patch"; - sha256 = "sha256-5aAwi1NV8P+nLLbEEnlwLGNQCQBb0nQkIVe5tR5Shsw="; - }) - ]; - postPatch = '' substituteInPlace Source/init.cpp --replace "/usr/share/diasurgical/devilutionx/" "${placeholder "out"}/share/diasurgical/devilutionx/" diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix index 919d22b41dae..30fc870b25db 100644 --- a/pkgs/games/domination/default.nix +++ b/pkgs/games/domination/default.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation { pname = "domination"; - version = "1.2.5"; + version = "1.2.7"; # The .zip releases do not contain the build.xml file src = fetchsvn { @@ -34,8 +34,8 @@ in stdenv.mkDerivation { # There are no tags in the repository. # Look for commits like "new version x.y.z info on website" # or "website update for x.y.z". - rev = "2212"; - sha256 = "sha256-XuPMxGDap8x7I+U7+1C+DlkQkoV/u2FCwYyTZFWmYHM="; + rev = "2261"; + sha256 = "sha256-xvlPC7M6DaF3g2O3vQDmcdp7914qOaiikY02RTgAVkM="; }; nativeBuildInputs = [ @@ -88,8 +88,8 @@ in stdenv.mkDerivation { }; meta = with lib; { - homepage = "http://domination.sourceforge.net/"; - downloadPage = "http://domination.sourceforge.net/download.shtml"; + homepage = "https://domination.sourceforge.net/"; + downloadPage = "https://domination.sourceforge.net/download.shtml"; description = "A game that is a bit like the board game Risk or RisiKo"; longDescription = '' Domination is a game that is a bit like the well known board game of Risk diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 382537282748..dd8e6b5503da 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -69,7 +69,7 @@ let dfhack = callPackage ./dfhack { inherit (perlPackages) XMLLibXML XMLLibXSLT; - inherit dfVersion twbt; + inherit dfVersion; stdenv = gccStdenv; }; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 49e8fabd45e4..914ccbb6ab33 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -2,6 +2,7 @@ , buildEnv , lib , fetchFromGitHub +, fetchpatch , cmake , writeScriptBin , perl @@ -13,8 +14,6 @@ , allegro5 , libGLU , libGL -, enableTWBT ? true -, twbt , SDL , dfVersion }: @@ -23,24 +22,6 @@ with lib; let dfhack-releases = { - "0.43.05" = { - dfHackRelease = "0.43.05-r3.1"; - sha256 = "1ds366i0qcfbn62w9qv98lsqcrm38npzgvcr35hf6ihqa6nc6xrl"; - xmlRev = "860a9041a75305609643d465123a4b598140dd7f"; - prerelease = false; - }; - "0.44.05" = { - dfHackRelease = "0.44.05-r2"; - sha256 = "1cwifdhi48a976xc472nf6q2k0ibwqffil5a4llcymcxdbgxdcc9"; - xmlRev = "2794f8a6d7405d4858bac486a0bb17b94740c142"; - prerelease = false; - }; - "0.44.09" = { - dfHackRelease = "0.44.09-r1"; - sha256 = "1nkfaa43pisbyik5inj5q2hja2vza5lwidg5z02jyh136jm64hwk"; - xmlRev = "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5"; - prerelease = false; - }; "0.44.10" = { dfHackRelease = "0.44.10-r2"; sha256 = "19bxsghxzw3bilhr8sm4axz7p7z8lrvbdsd1vdjf5zbg04rs866i"; @@ -66,22 +47,24 @@ let prerelease = true; }; "0.47.04" = { - dfHackRelease = "0.47.04-r2"; - sha256 = "18ppn1dqaxi6ahjzsvb9kw70rvca106a1hibhzc4rxmraypnqb89"; - xmlRev = "036b662a1bbc96b4911f3cbe74dfa1243b6459bc"; + dfHackRelease = "0.47.04-r5"; + sha256 = "sha256-0s+/LKbqsS/mrxKPDeniqykE5+Gy3ZzCa8yEDzMyssY="; + xmlRev = "be0444cc165a1abff053d5893dc1f780f06526b7"; prerelease = false; }; "0.47.05" = { - dfHackRelease = "0.47.05-r1"; - sha256 = "sha256-B0iv7fpIcnaO8sx9wPqI7/WuyLK15p8UYlYIcF5F5bw="; - xmlRev = "11c379ffd31255f2a1415d98106114a46245e1c3"; + dfHackRelease = "0.47.05-r7"; + sha256 = "sha256-vBKUTSjfCnalkBzfjaIKcxUuqsGGOTtoJC1RHJIDlNc="; + xmlRev = "f5019a5c6f19ef05a28bd974c3e8668b78e6e2a4"; prerelease = false; }; }; release = - if hasAttr dfVersion dfhack-releases + if lib.isAttrs dfVersion + then dfVersion + else if hasAttr dfVersion dfhack-releases then getAttr dfVersion dfhack-releases else throw "[DFHack] Unsupported Dwarf Fortress version: ${dfVersion}"; @@ -115,9 +98,9 @@ let exit 1 fi ''; - - dfhack = stdenv.mkDerivation { - pname = "dfhack-base"; +in + stdenv.mkDerivation { + pname = "dfhack"; inherit version; # Beware of submodules @@ -129,10 +112,20 @@ let fetchSubmodules = true; }; - patches = [ ./fix-stonesense.patch ]; + patches = lib.optional (lib.versionOlder version "0.44.12-r3") (fetchpatch { + name = "fix-stonesense.patch"; + url = "https://github.com/DFHack/stonesense/commit/f5be6fe5fb192f01ae4551ed9217e97fd7f6a0ae.patch"; + extraPrefix = "plugins/stonesense/"; + stripLen = 1; + hash = "sha256-wje6Mkct29eyMOcJnbdefwBOLJko/s4JcJe52ojuW+8="; + }) ++ lib.optional (lib.versionOlder version "0.47.04-r1") (fetchpatch { + name = "fix-protobuf.patch"; + url = "https://github.com/DFHack/dfhack/commit/7bdf958518d2892ee89a7173224a069c4a2190d8.patch"; + hash = "sha256-p+mKhmYbnhWKNiGPMjbYO505Gcg634n0nudqH0NX3KY="; + }); # gcc 11 fix - NIX_CFLAGS_COMPILE = "-fpermissive"; + CXXFLAGS = lib.optionalString (lib.versionOlder version "0.47.05-r3") "-fpermissive"; # As of # https://github.com/DFHack/dfhack/commit/56e43a0dde023c5a4595a22b29d800153b31e3c4, @@ -166,21 +159,13 @@ let ln -s ${ruby}/lib/libruby-*.so $out/hack/libruby.so ''; - }; -in + passthru = { inherit dfVersion; }; -buildEnv { - name = "dfhack-${version}"; - - passthru = { inherit version dfVersion; }; - - paths = [ dfhack ] ++ lib.optionals enableTWBT [ twbt.lib ]; - - meta = with lib; { - description = "Memory hacking library for Dwarf Fortress and a set of tools that use it"; - homepage = "https://github.com/DFHack/dfhack/"; - license = licenses.zlib; - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ robbinch a1russell abbradar numinit ]; - }; -} + meta = with lib; { + description = "Memory hacking library for Dwarf Fortress and a set of tools that use it"; + homepage = "https://github.com/DFHack/dfhack/"; + license = licenses.zlib; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = with maintainers; [ robbinch a1russell abbradar numinit ncfavier ]; + }; + } diff --git a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch deleted file mode 100644 index da860cd55624..000000000000 --- a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f5be6fe5fb192f01ae4551ed9217e97fd7f6a0ae Mon Sep 17 00:00:00 2001 -From: Herwig Hochleitner -Date: Sun, 1 Oct 2017 18:01:43 +0200 -Subject: [PATCH] include - -this fixes `GLhandleARB` not being defined ---- - plugins/stonesense/common.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/plugins/stonesense/common.h b/plugins/stonesense/common.h -index eb36691..ef45389 100644 ---- a/plugins/stonesense/common.h -+++ b/plugins/stonesense/common.h -@@ -31,6 +31,8 @@ using namespace df::enums; - #include - #include - -+#include -+ - // allegro leaks X headers, undef some of it here: - #undef TileShape - #undef None \ No newline at end of file diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 42f2c6ed127b..7ce837b7b0b5 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -104,6 +104,6 @@ stdenv.mkDerivation { homepage = "https://www.bay12games.com/dwarves/"; license = licenses.unfreeRedistributable; platforms = attrNames platforms; - maintainers = with maintainers; [ a1russell robbinch roconnor abbradar numinit shazow ]; + maintainers = with maintainers; [ a1russell robbinch roconnor abbradar numinit shazow ncfavier ]; }; } diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index b34dbd3c74b8..17037dbdb278 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -19,7 +19,7 @@ , theme ? themes.phoebus # General config options: , enableIntro ? true -, enableTruetype ? true +, enableTruetype ? null # defaults to 24, see init.txt , enableFPS ? false , enableTextMode ? false , enableSound ? true diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index 7d2816d97a4a..311a36da2bf1 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -9,21 +9,6 @@ with lib; let twbt-releases = { - "0.43.05" = { - twbtRelease = "6.22"; - sha256 = "0di5d38f6jj9smsz0wjcs1zav4zba6hrk8cbn59kwpb1wamsh5c7"; - prerelease = false; - }; - "0.44.05" = { - twbtRelease = "6.35"; - sha256 = "0qjkgl7dsqzsd7pdq8a5bihhi1wplfkv1id7sj6dp3swjpsfxp8g"; - prerelease = false; - }; - "0.44.09" = { - twbtRelease = "6.41"; - sha256 = "0nsq15z05pbhqjvw2xqs1a9b1n2ma0aalhc3vh3mi4cd4k7lxh44"; - prerelease = false; - }; "0.44.10" = { twbtRelease = "6.49"; sha256 = "1qjkc7k33qhxj2g18njzasccjqsis5y8zrw5vl90h4rs3i8ld9xz"; @@ -46,14 +31,14 @@ let }; "0.47.04" = { twbtRelease = "6.xx"; - dfhackRelease = "0.47.04-r2"; - sha256 = "092dgp8fh1j4nqr9wbzn89ib1nhscclr8m91lfxsvg0mgn7j8xlv"; + dfhackRelease = "0.47.04-r5"; + sha256 = "sha256-+C3g4KJShCb2VXGQ4mtkDOufXZQ1P+ebDTmUzL3tNyU="; prerelease = true; }; "0.47.05" = { twbtRelease = "6.xx"; - dfhackRelease = "0.47.05-r1"; - sha256 = "1nqhaf7271bm9rq9dmilhhk9q7v3841d0rv4y3fid40vfi4gpi3p"; + dfhackRelease = "0.47.05-r7"; + sha256 = "sha256-4xMKuSP5J6pMK+hwjTAcTI0gsLJfw+Xt+vh9CopR4tk="; prerelease = true; }; }; diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 0c1fbc6ca4de..a4433821d20d 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -4,6 +4,7 @@ , substituteAll , runCommand , coreutils +, gawk , dwarf-fortress , dwarf-therapist , enableDFHack ? false @@ -16,18 +17,22 @@ , twbt , themes ? { } , theme ? null +, extraPackages ? [ ] # General config options: , enableIntro ? true -, enableTruetype ? true +, enableTruetype ? null # defaults to 24, see init.txt , enableFPS ? false , enableTextMode ? false , enableSound ? true +# An attribute set of settings to override in data/init/*.txt. +# For example, `init.FOO = true;` is translated to `[FOO:YES]` in init.txt +, settings ? { } +# TODO world-gen.txt, interface.txt require special logic }: let dfhack_ = dfhack.override { inherit enableStoneSense; - inherit enableTWBT; }; ptheme = @@ -35,27 +40,69 @@ let then builtins.getAttr theme themes else theme; - unBool = b: if b then "YES" else "NO"; + baseEnv = buildEnv { + name = "dwarf-fortress-base-env-${dwarf-fortress.dfVersion}"; - # These are in inverse order for first packages to override the next ones. - themePkg = lib.optional (theme != null) ptheme; - pkgs = lib.optional enableDFHack dfhack_ - ++ lib.optional enableSoundSense soundSense - ++ lib.optional enableTWBT twbt.art - ++ [ dwarf-fortress ]; + # These are in inverse order for first packages to override the next ones. + paths = extraPackages + ++ lib.optional (theme != null) ptheme + ++ lib.optional enableDFHack dfhack_ + ++ lib.optional enableSoundSense soundSense + ++ lib.optionals enableTWBT [ twbt.lib twbt.art ] + ++ [ dwarf-fortress ]; - fixup = lib.singleton (runCommand "fixup" { } ('' + ignoreCollisions = true; + }; + + settings_ = lib.recursiveUpdate { + init = { + PRINT_MODE = + if enableTextMode then "TEXT" + else if enableTWBT then "TWBT" + else if stdenv.hostPlatform.isDarwin then "STANDARD" # https://www.bay12games.com/dwarves/mantisbt/view.php?id=11680 + else null; + INTRO = enableIntro; + TRUETYPE = enableTruetype; + FPS = enableFPS; + SOUND = enableSound; + }; + } settings; + + forEach = attrs: f: lib.concatStrings (lib.mapAttrsToList f attrs); + + toTxt = v: + if lib.isBool v then if v then "YES" else "NO" + else if lib.isInt v then toString v + else if lib.isString v then v + else throw "dwarf-fortress: unsupported configuration value ${toString v}"; + + config = runCommand "dwarf-fortress-config" { + nativeBuildInputs = [ gawk ]; + } ('' mkdir -p $out/data/init - '' + (if (theme != null) then '' - cp ${lib.head themePkg}/data/init/init.txt $out/data/init/init.txt - '' else '' - cp ${dwarf-fortress}/data/init/init.txt $out/data/init/init.txt - '') + lib.optionalString enableDFHack '' + + edit_setting() { + v=''${v//'&'/'\&'} + if ! gawk -i inplace -v RS='\r?\n' ' + { n += sub("\\[" ENVIRON["k"] ":[^]]*\\]", "[" ENVIRON["k"] ":" ENVIRON["v"] "]"); print } + END { exit(!n) } + ' "$out/$file"; then + echo "error: no setting named '$k' in $file" >&2 + exit 1 + fi + } + '' + forEach settings_ (file: kv: '' + file=data/init/${lib.escapeShellArg file}.txt + cp ${baseEnv}/"$file" "$out/$file" + '' + forEach kv (k: v: lib.optionalString (v != null) '' + export k=${lib.escapeShellArg k} v=${lib.escapeShellArg (toTxt v)} + edit_setting + '')) + lib.optionalString enableDFHack '' mkdir -p $out/hack # Patch the MD5 - orig_md5=$(cat "${dwarf-fortress}/hash.md5.orig") - patched_md5=$(cat "${dwarf-fortress}/hash.md5") + orig_md5=$(< "${dwarf-fortress}/hash.md5.orig") + patched_md5=$(< "${dwarf-fortress}/hash.md5") input_file="${dfhack_}/hack/symbols.xml" output_file="$out/hack/symbols.xml" @@ -66,31 +113,21 @@ let echo " Replace: $patched_md5" substitute "$input_file" "$output_file" --replace "$orig_md5" "$patched_md5" - '' + lib.optionalString enableTWBT '' - substituteInPlace $out/data/init/init.txt \ - --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]' - '' + - lib.optionalString enableTextMode '' - substituteInPlace $out/data/init/init.txt \ - --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TEXT]' - '' + '' - substituteInPlace $out/data/init/init.txt \ - --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \ - --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \ - --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]' \ - --replace '[SOUND:YES]' '[SOUND:${unBool enableSound}]' - '')); + ''); + # This is a separate environment because the config files to modify may come + # from any of the paths in baseEnv. env = buildEnv { name = "dwarf-fortress-env-${dwarf-fortress.dfVersion}"; - - paths = fixup ++ themePkg ++ pkgs; - pathsToLink = [ "/" "/hack" "/hack/scripts" ]; - + paths = [ config baseEnv ]; ignoreCollisions = true; }; in +lib.throwIf (enableTWBT && !enableDFHack) "dwarf-fortress: TWBT requires DFHack to be enabled" +lib.throwIf (enableStoneSense && !enableDFHack) "dwarf-fortress: StoneSense requires DFHack to be enabled" +lib.throwIf (enableTextMode && enableTWBT) "dwarf-fortress: text mode and TWBT are mutually exclusive" + stdenv.mkDerivation { pname = "dwarf-fortress"; version = dwarf-fortress.dfVersion; @@ -114,7 +151,10 @@ stdenv.mkDerivation { runDFHack = ./dfhack.in; runSoundSense = ./soundSense.in; - passthru = { inherit dwarf-fortress dwarf-therapist; }; + passthru = { + inherit dwarf-fortress dwarf-therapist twbt env; + dfhack = dfhack_; + }; buildCommand = '' mkdir -p $out/bin diff --git a/pkgs/games/dwarf-fortress/wrapper/dfhack.in b/pkgs/games/dwarf-fortress/wrapper/dfhack.in old mode 100644 new mode 100755 index 026b33ab87bf..0f74674baf29 --- a/pkgs/games/dwarf-fortress/wrapper/dfhack.in +++ b/pkgs/games/dwarf-fortress/wrapper/dfhack.in @@ -2,8 +2,8 @@ source @dfInit@ -for i in dfhack.init-example dfhack-config/default hack/* stonesense/*; do - update_path "$i" +for i in *.init *.init-example dfhack-config/default dfhack-config/init hack/* stonesense/*; do + if [ -e "$i" ]; then update_path "$i"; fi done cd "$DF_DIR" diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix index f8ca3b40f532..40b06d88269b 100644 --- a/pkgs/games/ecwolf/default.nix +++ b/pkgs/games/ecwolf/default.nix @@ -1,16 +1,32 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, copyDesktopItems, cmake, pkg-config, zlib, bzip2, libjpeg, SDL, SDL_mixer, gtk2 }: +{ stdenv +, lib +, fetchFromBitbucket +, makeDesktopItem +, copyDesktopItems +, cmake +, pkg-config +, zlib +, bzip2 +, libjpeg +, SDL2 +, SDL2_net +, SDL2_mixer +, gtk3 +}: stdenv.mkDerivation rec { pname = "ecwolf"; - version = "1.3.3"; + version = "1.4.0"; - src = fetchurl { - url = "https://maniacsvault.net/ecwolf/files/ecwolf/1.x/${pname}-${version}-src.tar.xz"; - sha256 = "1sbdv672dz47la5a5qwmdi1v258k9kc5dkx7cdj2b6gk8nbm2srl"; + src = fetchFromBitbucket { + owner = pname; + repo = pname; + rev = version; + sha256 = "n1G1zvfE1l42fbJ7ZaMdV0QXn45PjMpaaZTDQAOBtYk="; }; nativeBuildInputs = [ cmake copyDesktopItems pkg-config ]; - buildInputs = [ zlib bzip2 libjpeg SDL SDL_mixer gtk2 ]; + buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk3 ]; desktopItems = [ (makeDesktopItem { @@ -50,5 +66,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; platforms = platforms.all; + # On Darwin, the linker fails to find a bunch of symbols. + broken = stdenv.isDarwin; }; } diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index d5656d0d5c3b..a25c6fa9050f 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { pname = "eduke32"; - version = "20221026"; - rev = "10165"; - revExtra = "a9c797dcb"; + version = "20221225"; + rev = "10166"; + revExtra = "122aee012"; src = fetchurl { url = "https://dukeworld.com/eduke32/synthesis/${version}-${rev}-${revExtra}/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; - sha256 = "sha256-8xvIe+kVOu2VIZACHis04tvyrl1IRrt0tY8D04n6ZjU="; + sha256 = "sha256-3pBYZJqoH7XBkJ537wPwBSmNaZprvOlVtAKTo8EOT3Q="; }; buildInputs = [ @@ -48,7 +48,12 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkg-config ] ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = '' + substituteInPlace source/imgui/src/imgui_impl_sdl.cpp \ + --replace '#include ' '#include ' \ + --replace '#include ' '#include ' \ + --replace '#include ' '#include ' + '' + lib.optionalString stdenv.isLinux '' substituteInPlace source/build/src/glbuild.cpp \ --replace libGLU.so ${libGLU}/lib/libGLU.so @@ -56,11 +61,6 @@ in stdenv.mkDerivation rec { substituteInPlace source/glad/src/$f \ --replace libGL.so ${libGL}/lib/libGL.so done - - substituteInPlace source/imgui/src/imgui_impl_sdl.cpp \ - --replace '#include ' '#include ' \ - --replace '#include ' '#include ' \ - --replace '#include ' '#include ' ''; makeFlags = [ diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 32678ecdf093..995d69d0a911 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = { description = "3D dungeon crawling adventure"; - homepage = "http://egoboo.sourceforge.net/"; + homepage = "https://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/eidolon/cargo-lock.patch b/pkgs/games/eidolon/cargo-lock.patch index 5aa09c526830..0aec3de6385d 100644 --- a/pkgs/games/eidolon/cargo-lock.patch +++ b/pkgs/games/eidolon/cargo-lock.patch @@ -1,19 +1,2726 @@ diff --git a/Cargo.lock b/Cargo.lock -index 8abf781..62511ef 100644 +index 8abf781..6d6189f 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -1,3 +1,5 @@ +@@ -1,1500 +1,1984 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. ++version = 3 ++ [[package]] - name = "adler32" - version = "1.0.3" -@@ -229,7 +231,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +-name = "adler32" +-version = "1.0.3" ++name = "addr2line" ++version = "0.19.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" ++dependencies = [ ++ "gimli", ++] ++ ++[[package]] ++name = "adler" ++version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + + [[package]] + name = "aho-corasick" +-version = "0.6.8" ++version = "0.6.10" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" + dependencies = [ +- "memchr 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr", + ] + + [[package]] +-name = "ansi_term" +-version = "0.11.0" ++name = "aho-corasick" ++version = "0.7.20" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" + dependencies = [ +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr", + ] + + [[package]] +-name = "argon2rs" +-version = "0.2.5" ++name = "ansi_term" ++version = "0.12.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" + dependencies = [ +- "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", +- "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.9", + ] + ++[[package]] ++name = "arrayref" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" ++ + [[package]] + name = "arrayvec" +-version = "0.4.7" ++version = "0.5.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", +-] ++checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + + [[package]] + name = "atty" +-version = "0.2.11" ++version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" + dependencies = [ +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi 0.1.19", ++ "libc", ++ "winapi 0.3.9", + ] + + [[package]] +-name = "backtrace" +-version = "0.3.9" ++name = "autocfg" ++version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" + dependencies = [ +- "backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.1.0", + ] + + [[package]] +-name = "backtrace-sys" +-version = "0.1.24" ++name = "autocfg" ++version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.67" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" + dependencies = [ +- "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "addr2line", ++ "cc", ++ "cfg-if 1.0.0", ++ "libc", ++ "miniz_oxide", ++ "object", ++ "rustc-demangle", + ] + + [[package]] + name = "base64" +-version = "0.9.3" ++version = "0.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" + dependencies = [ +- "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", + ] + + [[package]] +-name = "bitflags" +-version = "1.0.4" ++name = "base64" ++version = "0.13.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + + [[package]] +-name = "blake2-rfc" +-version = "0.2.18" ++name = "bitflags" ++version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +-] ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] +-name = "build_const" +-version = "0.2.1" ++name = "blake2b_simd" ++version = "0.5.11" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" ++dependencies = [ ++ "arrayref", ++ "arrayvec", ++ "constant_time_eq", ++] + + [[package]] + name = "butlerd" + version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "095899eb6b69e0a1c98215e51a44c67b8e3c902ebb9440afaafe2eb45e650a09" + dependencies = [ +- "hyper 0.12.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "regex 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "reqwest 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_json 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper", ++ "rand 0.5.6", ++ "regex 1.7.1", ++ "reqwest", ++ "serde", ++ "serde_derive", ++ "serde_json", + ] + + [[package]] + name = "byteorder" +-version = "1.2.6" ++version = "1.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + + [[package]] + name = "bytes" +-version = "0.4.10" ++version = "0.4.12" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" + dependencies = [ +- "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", ++ "either", ++ "iovec", + ] + + [[package]] + name = "cc" +-version = "1.0.25" ++version = "1.0.78" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" + + [[package]] + name = "cfg-if" +-version = "0.1.5" ++version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "clap" +-version = "2.32.0" ++version = "2.34.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" + dependencies = [ +- "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", + ] + + [[package]] + name = "cloudabi" + version = "0.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" + dependencies = [ +- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", + ] + + [[package]] + name = "constant_time_eq" +-version = "0.1.3" ++version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + + [[package]] +-name = "core-foundation" +-version = "0.5.1" ++name = "cookie" ++version = "0.12.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" + dependencies = [ +- "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time", ++ "url 1.7.2", + ] + + [[package]] +-name = "core-foundation-sys" +-version = "0.5.1" ++name = "cookie_store" ++version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c" + dependencies = [ +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cookie", ++ "failure", ++ "idna 0.1.5", ++ "log", ++ "publicsuffix", ++ "serde", ++ "serde_json", ++ "time", ++ "try_from", ++ "url 1.7.2", + ] + + [[package]] +-name = "crc" +-version = "1.8.1" ++name = "core-foundation" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" ++ ++[[package]] ++name = "crc32fast" ++version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" + dependencies = [ +- "build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 1.0.0", + ] + + [[package]] + name = "crossbeam-deque" +-version = "0.6.1" ++version = "0.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" + dependencies = [ +- "crossbeam-epoch 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-epoch", ++ "crossbeam-utils 0.7.2", ++ "maybe-uninit", + ] + + [[package]] + name = "crossbeam-epoch" +-version = "0.5.2" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" ++dependencies = [ ++ "autocfg 1.1.0", ++ "cfg-if 0.1.10", ++ "crossbeam-utils 0.7.2", ++ "lazy_static", ++ "maybe-uninit", ++ "memoffset", ++ "scopeguard", ++] ++ ++[[package]] ++name = "crossbeam-queue" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "crossbeam-utils 0.7.2", ++ "maybe-uninit", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" + dependencies = [ +- "arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.1.0", ++ "cfg-if 0.1.10", ++ "lazy_static", + ] + + [[package]] + name = "crossbeam-utils" +-version = "0.5.0" ++version = "0.8.14" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" ++dependencies = [ ++ "cfg-if 1.0.0", ++] + + [[package]] + name = "dirs" +-version = "1.0.4" ++version = "1.0.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" + dependencies = [ +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_users 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "redox_users", ++ "winapi 0.3.9", + ] + + [[package]] + name = "dtoa" +-version = "0.4.3" ++version = "0.4.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" [[package]] name = "eidolon" -version = "1.4.5" +version = "1.4.6" dependencies = [ - "butlerd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "butlerd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_json 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", +- "structopt 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "butlerd", ++ "dirs", ++ "human-panic", ++ "regex 0.2.11", ++ "serde", ++ "serde_derive", ++ "serde_json", ++ "structopt", + ] + ++[[package]] ++name = "either" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" ++ + [[package]] + name = "encoding_rs" +-version = "0.8.7" ++version = "0.8.31" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" + dependencies = [ +- "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 1.0.0", + ] + + [[package]] + name = "failure" +-version = "0.1.3" ++version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" + dependencies = [ +- "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace", ++ "failure_derive", + ] + + [[package]] + name = "failure_derive" +-version = "0.1.3" ++version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" + dependencies = [ +- "proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 0.15.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.49", ++ "quote 1.0.23", ++ "syn 1.0.107", ++ "synstructure", ++] ++ ++[[package]] ++name = "fastrand" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" ++dependencies = [ ++ "instant", ++] ++ ++[[package]] ++name = "flate2" ++version = "1.0.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" ++dependencies = [ ++ "crc32fast", ++ "miniz_oxide", + ] + + [[package]] + name = "fnv" +-version = "1.0.6" ++version = "1.0.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + + [[package]] + name = "foreign-types" + version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" + dependencies = [ +- "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "foreign-types-shared", + ] + + [[package]] + name = "foreign-types-shared" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++ ++[[package]] ++name = "form_urlencoded" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" ++dependencies = [ ++ "percent-encoding 2.2.0", ++] ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + + [[package]] + name = "fuchsia-zircon" + version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" + dependencies = [ +- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "fuchsia-zircon-sys", + ] + + [[package]] + name = "fuchsia-zircon-sys" + version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + + [[package]] + name = "futures" +-version = "0.1.24" ++version = "0.1.31" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" + + [[package]] + name = "futures-cpupool" + version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" + dependencies = [ +- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures", ++ "num_cpus", + ] + ++[[package]] ++name = "getrandom" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "wasi 0.9.0+wasi-snapshot-preview1", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "wasi 0.11.0+wasi-snapshot-preview1", ++] ++ ++[[package]] ++name = "gimli" ++version = "0.27.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" ++ + [[package]] + name = "h2" +-version = "0.1.12" ++version = "0.1.26" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" + dependencies = [ +- "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "http 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "indexmap 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "string 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", ++ "bytes", ++ "fnv", ++ "futures", ++ "http", ++ "indexmap", ++ "log", ++ "slab", ++ "string", ++ "tokio-io", ++] ++ ++[[package]] ++name = "hashbrown" ++version = "0.12.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" ++ ++[[package]] ++name = "heck" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" ++dependencies = [ ++ "unicode-segmentation", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" ++dependencies = [ ++ "libc", + ] + + [[package]] + name = "http" +-version = "0.1.13" ++version = "0.1.21" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" + dependencies = [ +- "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes", ++ "fnv", ++ "itoa 0.4.8", ++] ++ ++[[package]] ++name = "http-body" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" ++dependencies = [ ++ "bytes", ++ "futures", ++ "http", ++ "tokio-buf", + ] + + [[package]] + name = "httparse" +-version = "1.3.3" ++version = "1.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + + [[package]] + name = "human-panic" +-version = "1.0.1" ++version = "1.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "39f357a500abcbd7c5f967c1d45c8838585b36743823b9d43488f24850534e36" + dependencies = [ +- "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", +- "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace", ++ "os_type", ++ "serde", ++ "serde_derive", ++ "termcolor", ++ "toml", ++ "uuid 0.8.2", + ] + + [[package]] + name = "hyper" +-version = "0.12.11" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "h2 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "http 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", +- "time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-reactor 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-tcp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-timer 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "want 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++version = "0.12.36" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52" ++dependencies = [ ++ "bytes", ++ "futures", ++ "futures-cpupool", ++ "h2", ++ "http", ++ "http-body", ++ "httparse", ++ "iovec", ++ "itoa 0.4.8", ++ "log", ++ "net2", ++ "rustc_version", ++ "time", ++ "tokio", ++ "tokio-buf", ++ "tokio-executor", ++ "tokio-io", ++ "tokio-reactor", ++ "tokio-tcp", ++ "tokio-threadpool", ++ "tokio-timer", ++ "want", + ] + + [[package]] + name = "hyper-tls" +-version = "0.3.0" ++version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" + dependencies = [ +- "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "hyper 0.12.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "native-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes", ++ "futures", ++ "hyper", ++ "native-tls", ++ "tokio-io", + ] + + [[package]] + name = "idna" + version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" ++dependencies = [ ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", ++] ++ ++[[package]] ++name = "idna" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" ++dependencies = [ ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", ++] ++ ++[[package]] ++name = "idna" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" + dependencies = [ +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-bidi", ++ "unicode-normalization", + ] + + [[package]] + name = "indexmap" +-version = "1.0.1" ++version = "1.9.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" ++dependencies = [ ++ "autocfg 1.1.0", ++ "hashbrown", ++] ++ ++[[package]] ++name = "instant" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" ++dependencies = [ ++ "cfg-if 1.0.0", ++] + + [[package]] + name = "iovec" +-version = "0.1.2" ++version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" + dependencies = [ +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", + ] + + [[package]] + name = "itoa" +-version = "0.4.2" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" ++ ++[[package]] ++name = "itoa" ++version = "1.0.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + + [[package]] + name = "kernel32-sys" + version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" + dependencies = [ +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8", ++ "winapi-build", + ] + + [[package]] + name = "lazy_static" +-version = "1.0.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +- +-[[package]] +-name = "lazycell" +-version = "1.2.0" ++version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.43" ++version = "0.2.139" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + + [[package]] +-name = "libflate" +-version = "0.1.18" ++name = "lock_api" ++version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" + dependencies = [ +- "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard", + ] + + [[package]] + name = "log" +-version = "0.4.5" ++version = "0.4.17" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" + dependencies = [ +- "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 1.0.0", + ] + + [[package]] + name = "matches" +-version = "0.1.8" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" ++ ++[[package]] ++name = "maybe-uninit" ++version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + + [[package]] + name = "memchr" +-version = "2.1.0" ++version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +-] ++checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + + [[package]] + name = "memoffset" +-version = "0.2.1" ++version = "0.5.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" ++dependencies = [ ++ "autocfg 1.1.0", ++] + + [[package]] + name = "mime" +-version = "0.3.9" ++version = "0.3.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "unicase 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +-] ++checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + + [[package]] + name = "mime_guess" +-version = "2.0.0-alpha.6" ++version = "2.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" + dependencies = [ +- "mime 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "phf 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)", +- "phf_codegen 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime", ++ "unicase", + ] + + [[package]] +-name = "mio" +-version = "0.6.16" ++name = "miniz_oxide" ++version = "0.6.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" + dependencies = [ +- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazycell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", +- "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "adler", + ] + + [[package]] +-name = "mio-uds" +-version = "0.6.7" ++name = "mio" ++version = "0.6.23" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" + dependencies = [ +- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10", ++ "fuchsia-zircon", ++ "fuchsia-zircon-sys", ++ "iovec", ++ "kernel32-sys", ++ "libc", ++ "log", ++ "miow", ++ "net2", ++ "slab", ++ "winapi 0.2.8", + ] + + [[package]] + name = "miow" +-version = "0.2.1" ++version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" + dependencies = [ +- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys", ++ "net2", ++ "winapi 0.2.8", ++ "ws2_32-sys", + ] + + [[package]] + name = "native-tls" +-version = "0.2.1" ++version = "0.2.11" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" + dependencies = [ +- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl 0.10.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.36 (registry+https://github.com/rust-lang/crates.io-index)", +- "schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", +- "security-framework 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "security-framework-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "tempfile 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", ++ "libc", ++ "log", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile", + ] + + [[package]] + name = "net2" +-version = "0.2.33" ++version = "0.2.38" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" + dependencies = [ +- "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10", ++ "libc", ++ "winapi 0.3.9", + ] + + [[package]] +-name = "nodrop" +-version = "0.1.12" ++name = "num_cpus" ++version = "1.15.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" ++dependencies = [ ++ "hermit-abi 0.2.6", ++ "libc", ++] + + [[package]] +-name = "num_cpus" +-version = "1.8.0" ++name = "object" ++version = "0.30.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2b8c786513eb403643f2a88c244c2aaa270ef2153f55094587d0c48a3cf22a83" + dependencies = [ +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr", + ] + ++[[package]] ++name = "once_cell" ++version = "1.17.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" ++ + [[package]] + name = "openssl" +-version = "0.10.12" ++version = "0.10.45" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" + dependencies = [ +- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.36 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "cfg-if 1.0.0", ++ "foreign-types", ++ "libc", ++ "once_cell", ++ "openssl-macros", ++ "openssl-sys", ++] ++ ++[[package]] ++name = "openssl-macros" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" ++dependencies = [ ++ "proc-macro2 1.0.49", ++ "quote 1.0.23", ++ "syn 1.0.107", + ] + + [[package]] + name = "openssl-probe" +-version = "0.1.2" ++version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + + [[package]] + name = "openssl-sys" +-version = "0.9.36" ++version = "0.9.80" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" + dependencies = [ +- "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +- "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.1.0", ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", + ] + + [[package]] + name = "os_type" +-version = "2.2.0" ++version = "2.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e24d44c0eea30167516ed8f6daca4b5e3eebcde1bde1e4e6e08b809fb02c7ba5" ++dependencies = [ ++ "regex 1.7.1", ++] ++ ++[[package]] ++name = "parking_lot" ++version = "0.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" + dependencies = [ +- "regex 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lock_api", ++ "parking_lot_core", ++ "rustc_version", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bda66b810a62be75176a80873726630147a5ca780cd33921e0b5709033e66b0a" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "cloudabi", ++ "libc", ++ "redox_syscall 0.1.57", ++ "rustc_version", ++ "smallvec", ++ "winapi 0.3.9", + ] + + [[package]] + name = "percent-encoding" + version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" ++ ++[[package]] ++name = "percent-encoding" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + + [[package]] +-name = "phf" +-version = "0.7.23" ++name = "proc-macro2" ++version = "0.4.30" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" + dependencies = [ +- "phf_shared 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0", + ] + + [[package]] +-name = "phf_codegen" +-version = "0.7.23" ++name = "proc-macro2" ++version = "1.0.49" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" + dependencies = [ +- "phf_generator 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)", +- "phf_shared 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-ident", + ] + + [[package]] +-name = "phf_generator" +-version = "0.7.23" ++name = "publicsuffix" ++version = "1.5.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" + dependencies = [ +- "phf_shared 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "idna 0.2.3", ++ "url 2.3.1", + ] + + [[package]] +-name = "phf_shared" +-version = "0.7.23" ++name = "quote" ++version = "0.6.13" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" + dependencies = [ +- "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30", + ] + + [[package]] +-name = "pkg-config" +-version = "0.3.14" ++name = "quote" ++version = "1.0.23" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" ++dependencies = [ ++ "proc-macro2 1.0.49", ++] + + [[package]] +-name = "proc-macro2" +-version = "0.4.9" ++name = "rand" ++version = "0.5.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" + dependencies = [ +- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cloudabi", ++ "fuchsia-cprng", ++ "libc", ++ "rand_core 0.3.1", ++ "winapi 0.3.9", + ] + + [[package]] +-name = "quote" ++name = "rand" + version = "0.6.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" + dependencies = [ +- "proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "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 0.3.9", + ] + + [[package]] +-name = "rand" +-version = "0.4.3" ++name = "rand_chacha" ++version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" + dependencies = [ +- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.8", ++ "rand_core 0.3.1", + ] + + [[package]] +-name = "rand" +-version = "0.5.5" ++name = "rand_core" ++version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" + dependencies = [ +- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2", + ] + + [[package]] + name = "rand_core" +-version = "0.2.1" ++version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + + [[package]] +-name = "redox_syscall" +-version = "0.1.40" ++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 = "redox_termios" ++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 0.3.9", ++] ++ ++[[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 0.3.9", ++] ++ ++[[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.1.57" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" ++ ++[[package]] ++name = "redox_syscall" ++version = "0.2.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" + dependencies = [ +- "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", + ] + + [[package]] + name = "redox_users" +-version = "0.2.0" ++version = "0.3.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" + dependencies = [ +- "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom 0.1.16", ++ "redox_syscall 0.1.57", ++ "rust-argon2", + ] + + [[package]] + name = "regex" +-version = "0.2.5" ++version = "0.2.11" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" + dependencies = [ +- "aho-corasick 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "memchr 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "utf8-ranges 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick 0.6.10", ++ "memchr", ++ "regex-syntax 0.5.6", ++ "thread_local", ++ "utf8-ranges", + ] + + [[package]] + name = "regex" +-version = "1.0.5" ++version = "1.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" + dependencies = [ +- "aho-corasick 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "memchr 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "regex-syntax 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "utf8-ranges 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick 0.7.20", ++ "memchr", ++ "regex-syntax 0.6.28", + ] + + [[package]] + name = "regex-syntax" +-version = "0.4.2" ++version = "0.5.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" ++dependencies = [ ++ "ucd-util", ++] + + [[package]] + name = "regex-syntax" +-version = "0.6.2" ++version = "0.6.28" + source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +-] ++checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + + [[package]] + name = "remove_dir_all" +-version = "0.5.1" ++version = "0.5.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" + dependencies = [ +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.9", + ] + + [[package]] + name = "reqwest" +-version = "0.9.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "encoding_rs 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "http 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "hyper 0.12.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "hyper-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libflate 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "mime 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "native-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_json 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_urlencoded 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++version = "0.9.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab" ++dependencies = [ ++ "base64 0.10.1", ++ "bytes", ++ "cookie", ++ "cookie_store", ++ "encoding_rs", ++ "flate2", ++ "futures", ++ "http", ++ "hyper", ++ "hyper-tls", ++ "log", ++ "mime", ++ "mime_guess", ++ "native-tls", ++ "serde", ++ "serde_json", ++ "serde_urlencoded", ++ "time", ++ "tokio", ++ "tokio-executor", ++ "tokio-io", ++ "tokio-threadpool", ++ "tokio-timer", ++ "url 1.7.2", ++ "uuid 0.7.4", ++ "winreg", ++] ++ ++[[package]] ++name = "rust-argon2" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" ++dependencies = [ ++ "base64 0.13.1", ++ "blake2b_simd", ++ "constant_time_eq", ++ "crossbeam-utils 0.8.14", + ] + + [[package]] + name = "rustc-demangle" +-version = "0.1.9" ++version = "0.1.21" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + + [[package]] +-name = "ryu" +-version = "0.2.6" ++name = "rustc_version" ++version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++dependencies = [ ++ "semver", ++] + + [[package]] +-name = "safemem" +-version = "0.3.0" ++name = "ryu" ++version = "1.0.12" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + + [[package]] + name = "schannel" +-version = "0.1.14" ++version = "0.1.21" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" + dependencies = [ +- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "windows-sys", + ] + +-[[package]] +-name = "scoped_threadpool" +-version = "0.1.9" +-source = "registry+https://github.com/rust-lang/crates.io-index" +- + [[package]] + name = "scopeguard" +-version = "0.3.3" ++version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + + [[package]] + name = "security-framework" +-version = "0.2.1" ++version = "2.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" + dependencies = [ +- "core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "security-framework-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "core-foundation", ++ "core-foundation-sys", ++ "libc", ++ "security-framework-sys", + ] + + [[package]] + name = "security-framework-sys" +-version = "0.2.1" ++version = "2.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" + dependencies = [ +- "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys", ++ "libc", + ] + ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++dependencies = [ ++ "semver-parser", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++ + [[package]] + name = "serde" +-version = "1.0.79" ++version = "1.0.152" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" ++dependencies = [ ++ "serde_derive", ++] + + [[package]] + name = "serde_derive" +-version = "1.0.79" ++version = "1.0.152" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" + dependencies = [ +- "proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 0.15.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.49", ++ "quote 1.0.23", ++ "syn 1.0.107", + ] + + [[package]] + name = "serde_json" +-version = "1.0.27" ++version = "1.0.91" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" + dependencies = [ +- "itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "ryu 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itoa 1.0.5", ++ "ryu", ++ "serde", + ] + + [[package]] + name = "serde_urlencoded" +-version = "0.5.3" ++version = "0.5.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" + dependencies = [ +- "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", +- "url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dtoa", ++ "itoa 0.4.8", ++ "serde", ++ "url 1.7.2", + ] + + [[package]] +-name = "siphasher" +-version = "0.2.3" ++name = "slab" ++version = "0.4.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" ++dependencies = [ ++ "autocfg 1.1.0", ++] + + [[package]] +-name = "slab" +-version = "0.4.1" ++name = "smallvec" ++version = "0.6.14" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" ++dependencies = [ ++ "maybe-uninit", ++] + + [[package]] + name = "string" +-version = "0.1.1" ++version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" ++dependencies = [ ++ "bytes", ++] + + [[package]] + name = "strsim" +-version = "0.7.0" ++version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + + [[package]] + name = "structopt" +-version = "0.2.10" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" + dependencies = [ +- "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "structopt-derive 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap", ++ "structopt-derive", + ] + + [[package]] + name = "structopt-derive" +-version = "0.2.10" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" + dependencies = [ +- "proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 0.14.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "heck", ++ "proc-macro2 0.4.30", ++ "quote 0.6.13", ++ "syn 0.15.44", + ] + + [[package]] + name = "syn" +-version = "0.14.7" ++version = "0.15.44" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" + dependencies = [ +- "proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30", ++ "quote 0.6.13", ++ "unicode-xid 0.1.0", + ] + + [[package]] + name = "syn" +-version = "0.15.6" ++version = "1.0.107" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" + dependencies = [ +- "proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.49", ++ "quote 1.0.23", ++ "unicode-ident", + ] + + [[package]] + name = "synstructure" +-version = "0.10.1" ++version = "0.12.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" + dependencies = [ +- "proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 0.15.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.49", ++ "quote 1.0.23", ++ "syn 1.0.107", ++ "unicode-xid 0.2.4", + ] + + [[package]] +-name = "tempdir" +-version = "0.3.7" ++name = "tempfile" ++version = "3.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" + dependencies = [ +- "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 1.0.0", ++ "fastrand", ++ "libc", ++ "redox_syscall 0.2.16", ++ "remove_dir_all", ++ "winapi 0.3.9", + ] + + [[package]] +-name = "tempfile" +-version = "3.0.4" ++name = "termcolor" ++version = "1.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" + dependencies = [ +- "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", +- "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util", + ] + + [[package]] +-name = "termcolor" +-version = "0.3.6" ++name = "textwrap" ++version = "0.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" + dependencies = [ +- "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width", + ] + + [[package]] +-name = "termion" +-version = "1.5.1" ++name = "thread_local" ++version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" + dependencies = [ +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", + ] + + [[package]] +-name = "textwrap" +-version = "0.10.0" ++name = "time" ++version = "0.1.45" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" + dependencies = [ +- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "wasi 0.10.0+wasi-snapshot-preview1", ++ "winapi 0.3.9", + ] + + [[package]] +-name = "thread_local" +-version = "0.3.6" ++name = "tinyvec" ++version = "1.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" + dependencies = [ +- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tinyvec_macros", + ] + + [[package]] +-name = "time" +-version = "0.1.40" ++name = "tinyvec_macros" ++version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", +-] ++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + + [[package]] + name = "tokio" +-version = "0.1.11" ++version = "0.1.22" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" + dependencies = [ +- "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-current-thread 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-fs 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-reactor 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-tcp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-timer 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-udp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-uds 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes", ++ "futures", ++ "mio", ++ "num_cpus", ++ "tokio-current-thread", ++ "tokio-executor", ++ "tokio-io", ++ "tokio-reactor", ++ "tokio-tcp", ++ "tokio-threadpool", ++ "tokio-timer", + ] + + [[package]] +-name = "tokio-codec" ++name = "tokio-buf" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" + dependencies = [ +- "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes", ++ "either", ++ "futures", + ] + + [[package]] + name = "tokio-current-thread" +-version = "0.1.3" ++version = "0.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" + dependencies = [ +- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures", ++ "tokio-executor", + ] + + [[package]] + name = "tokio-executor" +-version = "0.1.5" ++version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" + dependencies = [ +- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.2", ++ "futures", + ] + + [[package]] +-name = "tokio-fs" +-version = "0.1.3" ++name = "tokio-io" ++version = "0.1.13" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" + dependencies = [ +- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes", ++ "futures", ++ "log", + ] + + [[package]] +-name = "tokio-io" +-version = "0.1.9" ++name = "tokio-reactor" ++version = "0.1.12" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" + dependencies = [ +- "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.2", ++ "futures", ++ "lazy_static", ++ "log", ++ "mio", ++ "num_cpus", ++ "parking_lot", ++ "slab", ++ "tokio-executor", ++ "tokio-io", ++ "tokio-sync", + ] + + [[package]] +-name = "tokio-reactor" +-version = "0.1.3" ++name = "tokio-sync" ++version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" + dependencies = [ +- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", +- "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fnv", ++ "futures", + ] + + [[package]] + name = "tokio-tcp" +-version = "0.1.2" ++version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" + dependencies = [ +- "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-reactor 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes", ++ "futures", ++ "iovec", ++ "mio", ++ "tokio-io", ++ "tokio-reactor", + ] + + [[package]] + name = "tokio-threadpool" +-version = "0.1.7" ++version = "0.1.18" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" + dependencies = [ +- "crossbeam-deque 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-deque", ++ "crossbeam-queue", ++ "crossbeam-utils 0.7.2", ++ "futures", ++ "lazy_static", ++ "log", ++ "num_cpus", ++ "slab", ++ "tokio-executor", + ] + + [[package]] + name = "tokio-timer" +-version = "0.2.7" ++version = "0.2.13" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" + dependencies = [ +- "crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.2", ++ "futures", ++ "slab", ++ "tokio-executor", + ] + + [[package]] +-name = "tokio-udp" +-version = "0.1.2" ++name = "toml" ++version = "0.5.10" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" + dependencies = [ +- "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-reactor 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde", + ] + + [[package]] +-name = "tokio-uds" +-version = "0.2.2" ++name = "try-lock" ++version = "0.2.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", +- "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-reactor 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +-] ++checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + + [[package]] +-name = "toml" +-version = "0.4.10" ++name = "try_from" ++version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" + dependencies = [ +- "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10", + ] + +-[[package]] +-name = "try-lock" +-version = "0.2.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +- + [[package]] + name = "ucd-util" +-version = "0.1.1" ++version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "65bfcbf611b122f2c10eb1bb6172fbc4c2e25df9970330e4d75ce2b5201c9bfc" + + [[package]] + name = "unicase" +-version = "1.4.2" ++version = "2.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" + dependencies = [ +- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check", + ] + + [[package]] +-name = "unicase" +-version = "2.1.0" ++name = "unicode-bidi" ++version = "0.3.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +-] ++checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + + [[package]] +-name = "unicode-bidi" +-version = "0.3.4" ++name = "unicode-ident" ++version = "1.0.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" + dependencies = [ +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tinyvec", + ] + + [[package]] +-name = "unicode-normalization" +-version = "0.1.7" ++name = "unicode-segmentation" ++version = "1.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" + + [[package]] + name = "unicode-width" +-version = "0.1.5" ++version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + + [[package]] + name = "unicode-xid" + version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + + [[package]] + name = "url" +-version = "1.7.1" ++version = "1.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" ++dependencies = [ ++ "idna 0.1.5", ++ "matches", ++ "percent-encoding 1.0.1", ++] ++ ++[[package]] ++name = "url" ++version = "2.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" + dependencies = [ +- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "form_urlencoded", ++ "idna 0.3.0", ++ "percent-encoding 2.2.0", + ] + + [[package]] + name = "utf8-ranges" +-version = "1.0.1" ++version = "1.0.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" + + [[package]] + name = "uuid" +-version = "0.6.5" ++version = "0.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" + dependencies = [ +- "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5", + ] + + [[package]] + name = "uuid" +-version = "0.7.1" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" + dependencies = [ +- "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom 0.2.8", + ] + + [[package]] + name = "vcpkg" +-version = "0.2.6" ++version = "0.2.15" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + + [[package]] + name = "vec_map" +-version = "0.8.1" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + + [[package]] + name = "version_check" +-version = "0.1.5" ++version = "0.9.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + + [[package]] + name = "want" +-version = "0.0.6" ++version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" + dependencies = [ +- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures", ++ "log", ++ "try-lock", + ] + ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "wasi" ++version = "0.10.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" ++ ++[[package]] ++name = "wasi" ++version = "0.11.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" ++ + [[package]] + name = "winapi" + version = "0.2.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + + [[package]] + name = "winapi" +-version = "0.3.5" ++version = "0.3.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" + dependencies = [ +- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", + ] + + [[package]] + name = "winapi-build" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + + [[package]] + name = "winapi-i686-pc-windows-gnu" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++dependencies = [ ++ "winapi 0.3.9", ++] + + [[package]] + name = "winapi-x86_64-pc-windows-gnu" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "windows-sys" ++version = "0.42.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" ++dependencies = [ ++ "windows_aarch64_gnullvm", ++ "windows_aarch64_msvc", ++ "windows_i686_gnu", ++ "windows_i686_msvc", ++ "windows_x86_64_gnu", ++ "windows_x86_64_gnullvm", ++ "windows_x86_64_msvc", ++] ++ ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.42.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" ++ ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.42.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" ++ ++[[package]] ++name = "windows_i686_gnu" ++version = "0.42.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" ++ ++[[package]] ++name = "windows_i686_msvc" ++version = "0.42.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + + [[package]] +-name = "wincolor" +-version = "0.1.6" ++name = "windows_x86_64_gnu" ++version = "0.42.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" ++ ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.42.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" ++ ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.42.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" ++ ++[[package]] ++name = "winreg" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" + dependencies = [ +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.9", + ] + + [[package]] + name = "ws2_32-sys" + version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" + dependencies = [ +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +-] +- +-[metadata] +-"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" +-"checksum aho-corasick 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "68f56c7353e5a9547cbd76ed90f7bb5ffc3ba09d4ea9bd1d8c06c8b1142eeb5a" +-"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +-"checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392" +-"checksum arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef" +-"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" +-"checksum backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a" +-"checksum backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "c66d56ac8dabd07f6aacdaf633f4b8262f5b3601a810a0dcddffd5c22c69daa0" +-"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" +-"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" +-"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" +-"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39" +-"checksum butlerd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "095899eb6b69e0a1c98215e51a44c67b8e3c902ebb9440afaafe2eb45e650a09" +-"checksum byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "90492c5858dd7d2e78691cfb89f90d273a2800fc11d98f60786e5d87e2f83781" +-"checksum bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0ce55bd354b095246fc34caf4e9e242f5297a7fd938b090cadfea6eee614aa62" +-"checksum cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16" +-"checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3" +-"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e" +-"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +-"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" +-"checksum core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "286e0b41c3a20da26536c6000a280585d519fd07b3956b43aed8a79e9edce980" +-"checksum core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa" +-"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" +-"checksum crossbeam-deque 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3486aefc4c0487b9cb52372c97df0a48b8c249514af1ee99703bf70d2f2ceda1" +-"checksum crossbeam-epoch 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30fecfcac6abfef8771151f8be4abc9e4edc112c2bcb233314cafde2680536e9" +-"checksum crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "677d453a17e8bd2b913fa38e8b9cf04bcdbb5be790aa294f2389661d72036015" +-"checksum dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "88972de891f6118092b643d85a0b28e0678e0f948d7f879aa32f2d5aafe97d2a" +-"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd" +-"checksum encoding_rs 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "21a550ec129ca2f8593227888625c7c5331c6ad878e2cee6b7ac25e1c7d05746" +-"checksum failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6dd377bcc1b1b7ce911967e3ec24fa19c3224394ec05b54aa7b083d498341ac7" +-"checksum failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "64c2d913fe8ed3b6c6518eedf4538255b989945c14c2a7d5cbff62a5e2120596" +-"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" +-"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +-"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +-"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +-"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +-"checksum futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "0c84b40c7e2de99ffd70602db314a7a8c26b2b3d830e6f7f7a142a8860ab3ca4" +-"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" +-"checksum h2 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "a27e7ed946e8335bdf9a191bc1b9b14a03ba822d013d2f58437f4fabcbd7fc2c" +-"checksum http 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "24f58e8c2d8e886055c3ead7b28793e1455270b5fb39650984c224bc538ba581" +-"checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83" +-"checksum human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21638c5955a6daf3ecc42cae702335fc37a72a4abcc6959ce457b31a7d43bbdd" +-"checksum hyper 0.12.11 (registry+https://github.com/rust-lang/crates.io-index)" = "78d50abbd1790e0f4c74cb1d4a2211b439bac661d54107ad5564c55e77906762" +-"checksum hyper-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "caaee4dea92794a9e697038bd401e264307d1f22c883dbcb6f6618ba0d3b3bd3" +-"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +-"checksum indexmap 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08173ba1e906efb6538785a8844dd496f5d34f0a2d88038e95195172fc667220" +-"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08" +-"checksum itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5adb58558dcd1d786b5f0bd15f3226ee23486e24b7b58304b60f64dc68e62606" +-"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +-"checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d" +-"checksum lazycell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddba4c30a78328befecec92fc94970e53b3ae385827d28620f0f5bb2493081e0" +-"checksum libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d" +-"checksum libflate 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "21138fc6669f438ed7ae3559d5789a5f0ba32f28c1f0608d1e452b0bb06ee936" +-"checksum log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fcce5fa49cc693c312001daf1d13411c4a5283796bac1084299ea3e567113f" +-"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +-"checksum memchr 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4b3629fe9fdbff6daa6c33b90f7c08355c1aca05a3d01fa8063b822fcf185f3b" +-"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3" +-"checksum mime 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "4b082692d3f6cf41b453af73839ce3dfc212c4411cbb2441dff80a716e38bd79" +-"checksum mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30de2e4613efcba1ec63d8133f344076952090c122992a903359be5a4f99c3ed" +-"checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432" +-"checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" +-"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" +-"checksum native-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8b0a7bd714e83db15676d31caf968ad7318e9cc35f93c85a90231c8f22867549" +-"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" +-"checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2" +-"checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30" +-"checksum openssl 0.10.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5e2e79eede055813a3ac52fb3915caf8e1c9da2dec1587871aec9f6f7b48508d" +-"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +-"checksum openssl-sys 0.9.36 (registry+https://github.com/rust-lang/crates.io-index)" = "409d77eeb492a1aebd6eb322b2ee72ff7c7496b4434d98b3bf8be038755de65e" +-"checksum os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7edc011af0ae98b7f88cf7e4a83b70a54a75d2b8cb013d6efd02e5956207e9eb" +-"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" +-"checksum phf 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)" = "cec29da322b242f4c3098852c77a0ca261c9c01b806cae85a5572a1eb94db9a6" +-"checksum phf_codegen 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)" = "7d187f00cd98d5afbcd8898f6cf181743a449162aeb329dcd2f3849009e605ad" +-"checksum phf_generator 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)" = "03dc191feb9b08b0dc1330d6549b795b9d81aec19efe6b4a45aec8d4caee0c4b" +-"checksum phf_shared 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)" = "b539898d22d4273ded07f64a05737649dc69095d92cb87c7097ec68e3f150b93" +-"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" +-"checksum proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "cccdc7557a98fe98453030f077df7f3a042052fae465bb61d2c2c41435cfd9b6" +-"checksum quote 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3372dc35766b36a99ce2352bd1b6ea0137c38d215cc0c8780bf6de6df7842ba9" +-"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd" +-"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c" +-"checksum rand_core 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "edecf0f94da5551fc9b492093e30b041a891657db7940ee221f9d2f66e82eef2" +-"checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1" +-"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" +-"checksum redox_users 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "214a97e49be64fd2c86f568dd0cb2c757d2cc53de95b273b6ad0a1c908482f26" +-"checksum regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "744554e01ccbd98fff8c457c3b092cd67af62a555a43bfe97ae8a0451f7799fa" +-"checksum regex 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2069749032ea3ec200ca51e4a31df41759190a88edca0d2d86ee8bedf7073341" +-"checksum regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e" +-"checksum regex-syntax 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "747ba3b235651f6e2f67dfa8bcdcd073ddb7c243cb21c442fc12395dfcac212d" +-"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" +-"checksum reqwest 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1d68c7bf0b1dc3860b80c6d31d05808bf54cdc1bfc70a4680893791becd083ae" +-"checksum rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395" +-"checksum ryu 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7153dd96dade874ab973e098cb62fcdbb89a03682e46b144fd09550998d4a4a7" +-"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9" +-"checksum schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "0e1a231dc10abf6749cfa5d7767f25888d484201accbd919b66ab5413c502d56" +-"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" +-"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" +-"checksum security-framework 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "697d3f3c23a618272ead9e1fb259c1411102b31c6af8b93f1d64cca9c3b0e8e0" +-"checksum security-framework-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab01dfbe5756785b5b4d46e0289e5a18071dfa9a7c2b24213ea00b9ef9b665bf" +-"checksum serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)" = "84257ccd054dc351472528c8587b4de2dbf0dc0fe2e634030c1a90bfdacebaa9" +-"checksum serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)" = "31569d901045afbff7a9479f793177fe9259819aff10ab4f89ef69bbc5f567fe" +-"checksum serde_json 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)" = "59790990c5115d16027f00913e2e66de23a51f70422e549d2ad68c8c5f268f1c" +-"checksum serde_urlencoded 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "aaed41d9fb1e2f587201b863356590c90c1157495d811430a0c0325fe8169650" +-"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" +-"checksum slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5f9776d6b986f77b35c6cf846c11ad986ff128fe0b2b63a3628e3755e8d3102d" +-"checksum string 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00caf261d6f90f588f8450b8e1230fa0d5be49ee6140fdfbcb55335aff350970" +-"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" +-"checksum structopt 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8e9ad6a11096cbecdcca0cc6aa403fdfdbaeda2fb3323a39c98e6a166a1e45a" +-"checksum structopt-derive 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4cbce8ccdc62166bd594c14396a3242bf94c337a51dbfa9be1076dd74b3db2af" +-"checksum syn 0.14.7 (registry+https://github.com/rust-lang/crates.io-index)" = "e2e13df71f29f9440b50261a5882c86eac334f1badb3134ec26f0de2f1418e44" +-"checksum syn 0.15.6 (registry+https://github.com/rust-lang/crates.io-index)" = "854b08a640fc8f54728fb95321e3ec485b365a97fe47609797c671addd1dde69" +-"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" +-"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" +-"checksum tempfile 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "55c1195ef8513f3273d55ff59fe5da6940287a0d7a98331254397f464833675b" +-"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" +-"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" +-"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6" +-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +-"checksum time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "d825be0eb33fda1a7e68012d51e9c7f451dc1a69391e7fdc197060bb8c56667b" +-"checksum tokio 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "6e93c78d23cc61aa245a8acd2c4a79c4d7fa7fb5c3ca90d5737029f043a84895" +-"checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f" +-"checksum tokio-current-thread 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f90fcd90952f0a496d438a976afba8e5c205fb12123f813d8ab3aa1c8436638c" +-"checksum tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c117b6cf86bb730aab4834f10df96e4dd586eff2c3c27d3781348da49e255bde" +-"checksum tokio-fs 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5cbe4ca6e71cb0b62a66e4e6f53a8c06a6eefe46cc5f665ad6f274c9906f135" +-"checksum tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "8b8a85fffbec3c5ab1ab62324570230dcd37ee5996a7859da5caf7b9d45e3e8c" +-"checksum tokio-reactor 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8703a5762ff6913510dc64272c714c4389ffd8c4b3cf602879b8bd14ff06b604" +-"checksum tokio-tcp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7ad235e9dadd126b2d47f6736f65aa1fdcd6420e66ca63f44177bc78df89f912" +-"checksum tokio-threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bbd8a8b911301c60cbfaa2a6588fb210e5c1038375b8bdecc47aa09a94c3c05f" +-"checksum tokio-timer 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3a52f00c97fedb6d535d27f65cccb7181c8dd4c6edc3eda9ea93f6d45d05168e" +-"checksum tokio-udp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "da941144b816d0dcda4db3a1ba87596e4df5e860a72b70783fe435891f80601c" +-"checksum tokio-uds 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "22e3aa6d1fcc19e635418dc0a30ab5bd65d347973d6f43f1a37bf8d9d1335fc9" +-"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" +-"checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" +-"checksum ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d" +-"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" +-"checksum unicase 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "284b6d3db520d67fbe88fd778c21510d1b0ba4a551e5d0fbb023d33405f6de8a" +-"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +-"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25" +-"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" +-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +-"checksum url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a321979c09843d272956e73700d12c4e7d3d92b2ee112b31548aef0d4efc5a6" +-"checksum utf8-ranges 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd70f467df6810094968e2fce0ee1bd0e87157aceb026a8c083bcf5e25b9efe4" +-"checksum uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e1436e58182935dcd9ce0add9ea0b558e8a87befe01c1a301e6020aeb0876363" +-"checksum uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dab5c5526c5caa3d106653401a267fed923e7046f35895ffcb5ca42db64942e6" +-"checksum vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "def296d3eb3b12371b2c7d0e83bfe1403e4db2d7a0bba324a12b21c4ee13143d" +-"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" +-"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" +-"checksum want 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "797464475f30ddb8830cc529aaaae648d581f99e2036a928877dfde027ddf6b3" +-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +-"checksum winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "773ef9dcc5f24b7d850d0ff101e542ff24c3b090a9768e03ff889fdef41f00fd" +-"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" +-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +-"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" +-"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" ++ "winapi 0.2.8", ++ "winapi-build", ++] diff --git a/pkgs/games/eidolon/default.nix b/pkgs/games/eidolon/default.nix index a224ba112e03..197683de8b57 100644 --- a/pkgs/games/eidolon/default.nix +++ b/pkgs/games/eidolon/default.nix @@ -1,4 +1,10 @@ -{ lib, fetchFromSourcehut, rustPlatform, pkg-config, openssl }: +{ + lib, + fetchFromSourcehut, + rustPlatform, + pkg-config, + openssl, +}: rustPlatform.buildRustPackage rec { pname = "eidolon"; @@ -8,15 +14,20 @@ rustPlatform.buildRustPackage rec { owner = "~nicohman"; repo = pname; rev = version; - sha256 = "1yn3k569pxzw43mmsk97088xpkdc714rks3ncchbb6ccx25kgxrr"; + sha256 = "sha256-Ofc3i+iMmbUgY3bomUk4rM3bEQInTV3rIPz3m0yZw/o="; }; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "01mnfn6j4sj9iqw5anpx8lqm9jmk7wdrx3h2hcvqcmkyrk1nggx0"; + cargoSha256 = "sha256-1d+Wgx6tBS1Rb8WpVrD/ja0zXdoE2Q9ZlUS/3p8OYWM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; + OPENSSL_NO_VENDOR = 1; + OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; + OPENSSL_INCLUDE_DIR = "${openssl.dev}/include"; + OPENSSL_DIR="${lib.getDev openssl}"; + meta = with lib; { description = "A single TUI-based registry for drm-free, wine and steam games on linux, accessed through a rofi launch menu"; homepage = "https://github.com/nicohman/eidolon"; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 17f9947b4982..a65ce6bac0db 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -3,6 +3,8 @@ , libSM, libICE, libXext, factorio-utils , releaseType , mods ? [] +, mods-dat ? null +, versionsJson ? ./versions.json , username ? "", token ? "" # get/reset token at https://factorio.com/profile , experimental ? false # true means to always use the latest branch }: @@ -60,7 +62,7 @@ let # NB `experimental` directs us to take the latest build, regardless of its branch; # hence the (stable, experimental) pairs may sometimes refer to the same distributable. - versions = importJSON ./versions.json; + versions = importJSON versionsJson; binDists = makeBinDists versions; actual = binDists.${stdenv.hostPlatform.system}.${releaseType}.${branch} or (throw "Factorio ${releaseType}-${branch} binaries for ${stdenv.hostPlatform.system} are not available for download."); @@ -129,7 +131,7 @@ let fi ''; - modDir = factorio-utils.mkModDirDrv mods; + modDir = factorio-utils.mkModDirDrv mods mods-dat; base = with actual; { pname = "factorio-${releaseType}"; diff --git a/pkgs/games/factorio/utils.nix b/pkgs/games/factorio/utils.nix index be5b7fd5eccc..d2b52ae48366 100644 --- a/pkgs/games/factorio/utils.nix +++ b/pkgs/games/factorio/utils.nix @@ -3,7 +3,7 @@ { lib, stdenv }: with lib; { - mkModDirDrv = mods: # a list of mod derivations + mkModDirDrv = mods: modsDatFile: # a list of mod derivations let recursiveDeps = modDrv: [modDrv] ++ map recursiveDeps modDrv.deps; modDrvs = unique (flatten (map recursiveDeps mods)); @@ -18,7 +18,9 @@ with lib; # NB: there will only ever be a single zip file in each mod derivation's output dir ln -s $modDrv/*.zip $out done - ''; + '' + (lib.optionalString (modsDatFile != null) '' + cp ${modsDatFile} $out/mod-settings.dat + ''); }; modDrv = { allRecommendedMods, allOptionalMods }: diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 92cdd1b4bd46..2dceedf776ba 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,30 +2,30 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.70.tar.xz", + "name": "factorio_alpha_x64-1.1.76.tar.xz", "needsAuth": true, - "sha256": "1d0ahy34xmj9k79kd8imnzi576ivhcvf0qqvl6r9qdc8cmbmip18", + "sha256": "1kz93imyddivpp8zslggldm8zyb9j0zdj67pgkxazn8fd9avrq1p", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.70/alpha/linux64", - "version": "1.1.70" + "url": "https://factorio.com/get-download/1.1.76/alpha/linux64", + "version": "1.1.76" }, "stable": { - "name": "factorio_alpha_x64-1.1.70.tar.xz", + "name": "factorio_alpha_x64-1.1.74.tar.xz", "needsAuth": true, - "sha256": "1d0ahy34xmj9k79kd8imnzi576ivhcvf0qqvl6r9qdc8cmbmip18", + "sha256": "0ygnqlw92gz2s2c4pdhb11lvh86d7byhw5l3qw1fjsx0xv3qnxrs", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.70/alpha/linux64", - "version": "1.1.70" + "url": "https://factorio.com/get-download/1.1.74/alpha/linux64", + "version": "1.1.74" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.69.tar.xz", + "name": "factorio_demo_x64-1.1.76.tar.xz", "needsAuth": false, - "sha256": "08nakf6f31dra3rzv2l57pnww04i4ppil6c3vvvhjcv8j35b5k29", + "sha256": "0f3m0p5baakc6cv9fr3rwyq39bydraji9wh3ivblg1mj6dwpqnlj", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.69/demo/linux64", - "version": "1.1.69" + "url": "https://factorio.com/get-download/1.1.76/demo/linux64", + "version": "1.1.76" }, "stable": { "name": "factorio_demo_x64-1.1.69.tar.xz", @@ -38,20 +38,20 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.70.tar.xz", + "name": "factorio_headless_x64-1.1.76.tar.xz", "needsAuth": false, - "sha256": "05bkawn394jb5d9if8xbf2xff3gnmd591axy41h7x1yg8sz94zw4", + "sha256": "19xx6sv382ijwv8nbqw3c3izckvqkpsf949bn4g09qmg7b663g94", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.70/headless/linux64", - "version": "1.1.70" + "url": "https://factorio.com/get-download/1.1.76/headless/linux64", + "version": "1.1.76" }, "stable": { - "name": "factorio_headless_x64-1.1.70.tar.xz", + "name": "factorio_headless_x64-1.1.74.tar.xz", "needsAuth": false, - "sha256": "05bkawn394jb5d9if8xbf2xff3gnmd591axy41h7x1yg8sz94zw4", + "sha256": "1lqxprmai3vrm3hf9zdj9c9c6w05086nzn0vy88zy7xm2dgw7ylv", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.70/headless/linux64", - "version": "1.1.70" + "url": "https://factorio.com/get-download/1.1.74/headless/linux64", + "version": "1.1.74" } } } diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix index 096374749a94..51c2bf0c1984 100644 --- a/pkgs/games/ferium/default.nix +++ b/pkgs/games/ferium/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "ferium"; - version = "4.2.2"; + version = "4.3.4"; src = fetchFromGitHub { owner = "gorilla-devs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CtqnPHTFkfHE8IolqSlGt8n1fsLXCKMiBt8fQzLBPYk="; + sha256 = "sha256-nUyIMTVRaJHVYeIp037uoZQhh04GmmW5ZjPiwAurB9A="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-EYfqdGpaAWDmvqov/k81kE9frHYNKOTHakCrHN7zpU4="; + cargoHash = "sha256-pjUFMvIBl5uJahJBEoSVe6msVRWGlxazcwwxPEU0S3g="; # Disable the GUI file picker so that GTK/XDG dependencies aren't used buildNoDefaultFeatures = true; diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 7d3123b3eb93..e1b15b6248f4 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "0.9.21"; + version = "1.0.0"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-b4OAuwMgVgZUdLWJp6Rv/+1X+rPcG7piIBk8SlEXoUY="; + sha256 = "sha256-86+4rFSvJ3xIVx+qDXZ65TSqIrPkbyoLNo1A+mFPdy8="; }; buildInputs = [ gettext glibcLocalesUtf8 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 e610f2427a2e..787795828f4f 100644 --- a/pkgs/games/fish-fillets-ng/default.nix +++ b/pkgs/games/fish-fillets-ng/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; - homepage = "http://fillets.sourceforge.net/"; + homepage = "https://fillets.sourceforge.net/"; }; } diff --git a/pkgs/games/fltrator/default.nix b/pkgs/games/fltrator/default.nix index 9df7d9cccfd8..b1a2bb6b8c0d 100644 --- a/pkgs/games/fltrator/default.nix +++ b/pkgs/games/fltrator/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "A simple retro style arcade side-scroller game"; longDescription = '' FLTrator is a simple retro style arcade side-scroller game in which you steer a spaceship through a landscape with hostile rockets and other obstacles. It has ten different levels and a level editor to create new levels or modify the existing.''; # from https://libregamewiki.org/FLTrator - homepage = "http://fltrator.sourceforge.net/"; + homepage = "https://fltrator.sourceforge.net/"; platforms = platforms.linux; maintainers = [ maintainers.marius851000 ]; license = licenses.gpl3; diff --git a/pkgs/games/freesweep/default.nix b/pkgs/games/freesweep/default.nix index 7fe48d1baf00..feba049a5cf0 100644 --- a/pkgs/games/freesweep/default.nix +++ b/pkgs/games/freesweep/default.nix @@ -1,5 +1,5 @@ -{ fetchFromGitHub, fetchpatch, ncurses, lib, stdenv, - updateAutotoolsGnuConfigScriptsHook }: +{ fetchFromGitHub, fetchpatch, ncurses, lib, stdenv +, updateAutotoolsGnuConfigScriptsHook, installShellFiles }: stdenv.mkDerivation rec { pname = "freesweep"; @@ -12,12 +12,10 @@ stdenv.mkDerivation rec { hash = "sha256-iuu81yHbNrjdPsimBrPK58PJ0d8i3ySM7rFUG/d8NJM"; }; - nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook installShellFiles ]; buildInputs = [ ncurses ]; - preConfigure = '' - configureFlags="$configureFlags --with-prefsdir=$out/share" - ''; + configureFlags = [ "--with-prefsdir=$out/share" ]; enableParallelBuilding = true; @@ -25,7 +23,7 @@ stdenv.mkDerivation rec { runHook preInstall install -D -m 0555 freesweep $out/bin/freesweep install -D -m 0444 sweeprc $out/share/sweeprc - install -D -m 0444 freesweep.6 $out/share/man/man6/freesweep.6 + installManPage freesweep.6 runHook postInstall ''; diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix index 9f9e85905a0a..9d89a6d0b7b3 100644 --- a/pkgs/games/garden-of-coloured-lights/default.nix +++ b/pkgs/games/garden-of-coloured-lights/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Old-school vertical shoot-em-up / bullet hell"; - homepage = "http://garden.sourceforge.net/drupal/"; + homepage = "https://garden.sourceforge.net/drupal/"; maintainers = with maintainers; [ Profpatsch ]; license = licenses.gpl3; }; diff --git a/pkgs/games/gav/default.nix b/pkgs/games/gav/default.nix index e94b73d763c5..dc2868ba21b5 100644 --- a/pkgs/games/gav/default.nix +++ b/pkgs/games/gav/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Remake of AV Arcade Volleyball"; - homepage = "http://gav.sourceforge.net/"; + homepage = "https://gav.sourceforge.net/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index 99ee63ed057f..af41da4a3e4f 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -1,42 +1,46 @@ -{ mkDerivation +{ stdenv , cmake , fetchurl , gettext , gst_all_1 , lib , ninja +, wrapQtAppsHook , qmlbox2d , qtbase +, qtcharts , qtdeclarative , qtgraphicaleffects , qtmultimedia -, qtquickcontrols +, qtquickcontrols2 , qtsensors , qttools , qtxmlpatterns }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "gcompris"; - version = "2.4"; + version = "3.1"; src = fetchurl { url = "https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-${version}.tar.xz"; - sha256 = "sha256-/QZub48rarVHcD0PgOPc6NTlOKrsEzVK/qjHb5CjWS0="; + hash = "sha256-wABGojMfiMgjUT5gVDfB5JmXK1SPkrIkqLT/403zUFI="; }; cmakeFlags = [ "-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.1" ]; - nativeBuildInputs = [ cmake gettext ninja qttools ]; + nativeBuildInputs = [ cmake gettext ninja qttools wrapQtAppsHook ]; buildInputs = [ qmlbox2d + qtbase + qtcharts qtdeclarative qtgraphicaleffects qtmultimedia - qtquickcontrols + qtquickcontrols2 qtsensors qtxmlpatterns ] ++ (with gst_all_1; [ diff --git a/pkgs/games/gl-gsync-demo/default.nix b/pkgs/games/gl-gsync-demo/default.nix index a4b30c572a00..968d4d5e4a3d 100644 --- a/pkgs/games/gl-gsync-demo/default.nix +++ b/pkgs/games/gl-gsync-demo/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ atemu ]; description = "A very basic OpenGL demo for testing NVIDIA's G-SYNC technology on Linux"; longDescription = '' - The demo simply draws a vertical bar moving accross the screen at constant speed, but deliberately rendered at a variable frame rate. + The demo simply draws a vertical bar moving across the screen at constant speed, but deliberately rendered at a variable frame rate. The min and max frame rates can be manually changed at runtime, by step of 10 fps and with a min of 10 fps. diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index 9150541afd08..226e04aa1b73 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -24,6 +24,22 @@ stdenv.mkDerivation rec { url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw"; sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k"; }) + (fetchpatch { + url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/10_pthread_underlinkage.patch"; + sha256 = "sha256-L9POADlkgQbUQEUmx4s3dxXG9tS0w2IefpRGuQNRMI0="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/link-boost-system.patch"; + sha256 = "sha256-ne6F2ZowB+TUmg3ePuUoPNxXI0ZJC6HEol3oQQHJTy4="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/scons.patch"; + sha256 = "sha256-Gah7SoVcd/Aljs0Nqo3YF0lZImUWtrGM4HbbQ4yrhHU="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/boost-1.69.patch"; + sha256 = "sha256-D7agFR4uyIHxQz690Q8EHPF+rTEoiGUpgkm7r5cL5SI="; + }) ]; postPatch = '' @@ -32,7 +48,7 @@ stdenv.mkDerivation rec { sed -i -e "s@env = Environment()@env = Environment( ENV = os.environ )@" SConstruct ''; - nativeBuildInputs = [ sconsPackages.scons_3_0_1 ]; + nativeBuildInputs = [ sconsPackages.scons_latest ]; buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ]; postConfigure = '' diff --git a/pkgs/games/gogdl/default.nix b/pkgs/games/gogdl/default.nix index 944902bcadc3..24a9667e6799 100644 --- a/pkgs/games/gogdl/default.nix +++ b/pkgs/games/gogdl/default.nix @@ -1,4 +1,5 @@ { lib +, gitUpdater , buildPythonApplication , fetchFromGitHub , pythonOlder @@ -33,4 +34,8 @@ buildPythonApplication rec { license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ aidalgol ]; }; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; } diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix index c7b37b31c355..d2c25e031d2e 100644 --- a/pkgs/games/gogui/default.nix +++ b/pkgs/games/gogui/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { meta = { maintainers = [ lib.maintainers.cleverca22 ]; description = "A graphical user interface to programs that play the board game Go and support the Go Text Protocol such as GNU Go"; - homepage = "http://gogui.sourceforge.net/"; + homepage = "https://gogui.sourceforge.net/"; platforms = lib.platforms.unix; license = lib.licenses.gpl3; }; diff --git a/pkgs/games/grapejuice/default.nix b/pkgs/games/grapejuice/default.nix index f58596fccc12..a8f306977104 100644 --- a/pkgs/games/grapejuice/default.nix +++ b/pkgs/games/grapejuice/default.nix @@ -14,17 +14,18 @@ , winetricks , wine , glxinfo +, xrandr }: python3Packages.buildPythonApplication rec { pname = "grapejuice"; - version = "6.2.2"; + version = "7.2.1"; src = fetchFromGitLab { owner = "BrinkerVII"; repo = "grapejuice"; rev = "v${version}"; - sha256 = "sha256-wwM3q8Z4bYZod7/KcGc/PXlyLQxLRPkF1TdtFcg8mNE="; + sha256 = "sha256-bx0jqG03GSHj1lO9NRh8DJRUyJBbyVUKCy/2pZ3OWas="; }; nativeBuildInputs = [ @@ -50,13 +51,14 @@ python3Packages.buildPythonApplication rec { requests unidecode click + pydantic ]; dontWrapGApps = true; makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" - "--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs wine winetricks pciutils glxinfo ]}" + "--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs wine winetricks pciutils glxinfo xrandr ]}" # make xdg-open overrideable at runtime "--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}" ]; @@ -82,8 +84,8 @@ python3Packages.buildPythonApplication rec { substituteInPlace src/grapejuice_common/paths.py \ --replace 'return local_share() / "locale"' 'return Path("${placeholder "out"}/share/locale")' - substituteInPlace src/grapejuice_common/features/settings.py \ - --replace 'k_default_wine_home: "",' 'k_default_wine_home: "${wine}",' + substituteInPlace src/grapejuice_common/models/settings_model.py \ + --replace 'default_wine_home: Optional[str] = ""' 'default_wine_home: Optional[str] = "${wine}"' ''; postInstall = '' diff --git a/pkgs/games/gtetrinet/default.nix b/pkgs/games/gtetrinet/default.nix index d34b3775bd1b..af16d5e9f748 100644 --- a/pkgs/games/gtetrinet/default.nix +++ b/pkgs/games/gtetrinet/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { GTetrinet is a client program for Tetrinet, a multiplayer tetris game that is played over the internet. ''; - homepage = "http://gtetrinet.sourceforge.net/"; + homepage = "https://gtetrinet.sourceforge.net/"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.chris-martin ]; diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 3eb69fa3c112..aaa800269a75 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,107 +1,102 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, openal, fluidsynth -, soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, libvpx, mpg123 -, game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem, gtk3 }: +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, SDL2 +, bzip2 +, cmake +, fluidsynth +, game-music-emu +, gtk3 +, libGL +, libjpeg +, libsndfile +, libvpx +, mpg123 +, ninja +, openal +, pkg-config +, vulkan-loader +, zlib +, zmusic +}: -let - zmusic = stdenv.mkDerivation rec { - pname = "zmusic"; - version = "1.1.3"; +stdenv.mkDerivation rec { + pname = "gzdoom"; + version = "4.10.0"; - src = fetchFromGitHub { - owner = "ZDoom"; - repo = "ZMusic"; - rev = version; - hash = "sha256-wrNWfTIbNU/S2qFObUSkb6qyaceh+Y7Loxqudl86+W4="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ fluidsynth ]; - - cmakeFlags = [ "-DDYN_FLUIDSYNTH=OFF" ]; - - preConfigure = '' - sed -i \ - -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \ - -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \ - source/mididevices/music_fluidsynth_mididevice.cpp - ''; + src = fetchFromGitHub { + owner = "ZDoom"; + repo = "gzdoom"; + rev = "g${version}"; + fetchSubmodules = true; + hash = "sha256-F3p2X/hjPV9fuaA7T2bQTP6SlKcfc8GniJgv8BcopGw="; }; - gzdoom = stdenv.mkDerivation rec { - pname = "gzdoom"; - version = "4.8.2"; + outputs = [ "out" "doc" ]; - src = fetchFromGitHub { - owner = "ZDoom"; - repo = "gzdoom"; - rev = "g${version}"; - hash = "sha256-aT7DUZih3EDqncaXYIPIyGsz4fI267N29PmN3qyVjyo="; - fetchSubmodules = true; - }; + nativeBuildInputs = [ + cmake + copyDesktopItems + makeWrapper + ninja + pkg-config + ]; - nativeBuildInputs = [ cmake makeWrapper pkg-config copyDesktopItems ]; - buildInputs = [ - SDL2 - bzip2 - fluidsynth - game-music-emu - gtk3 - libGL - libjpeg - libsndfile - libvpx - mpg123 - openal - zlib - zmusic - ]; + buildInputs = [ + SDL2 + bzip2 + fluidsynth + game-music-emu + gtk3 + libGL + libjpeg + libsndfile + libvpx + mpg123 + openal + vulkan-loader + zlib + zmusic + ]; - patches = [ - (fetchpatch { # TODO: Delete me when upgrading to 4.9 - url = "https://github.com/ZDoom/gzdoom/commit/aae85a1b9169953d8dcc5f138a477d5c7d75addb.patch"; - sha256 = "upuLDgVMaGaFSVaDV9Hj13DR5LUma51xv+Mfsz9m9a0="; - }) - ]; + postPatch = '' + substituteInPlace tools/updaterevision/UpdateRevision.cmake \ + --replace "ret_var(Tag)" "ret_var(\"${src.rev}\")" \ + --replace "ret_var(Timestamp)" "ret_var(\"1970-00-00 00:00:00 +0000\")" \ + --replace "ret_var(Hash)" "ret_var(\"${src.rev}\")" + ''; - NIX_CFLAGS_LINK = "-lopenal -lfluidsynth"; + cmakeFlags = [ + "-DDYN_GTK=OFF" + "-DDYN_OPENAL=OFF" + ]; - cmakeFlags = [ "-DDYN_GTK=OFF" ]; + desktopItems = [ + (makeDesktopItem { + name = "gzdoom"; + exec = "gzdoom"; + desktopName = "GZDoom"; + categories = [ "Game" ]; + }) + ]; - desktopItems = [ - (makeDesktopItem { - name = "gzdoom"; - exec = "gzdoom"; - desktopName = "GZDoom"; - categories = [ "Game" ]; - }) - ]; + postInstall = '' + mv $out/bin/gzdoom $out/share/games/doom/gzdoom + makeWrapper $out/share/games/doom/gzdoom $out/bin/gzdoom + ''; - installPhase = '' - runHook preInstall - - install -Dm755 gzdoom "$out/lib/gzdoom/gzdoom" - for i in *.pk3; do - install -Dm644 "$i" "$out/lib/gzdoom/$i" - done - for i in fm_banks/*; do - install -Dm644 "$i" "$out/lib/gzdoom/$i" - done - for i in soundfonts/*; do - install -Dm644 "$i" "$out/lib/gzdoom/$i" - done - mkdir $out/bin - makeWrapper $out/lib/gzdoom/gzdoom $out/bin/gzdoom - - runHook postInstall + meta = with lib; { + homepage = "https://github.com/ZDoom/gzdoom"; + description = "Modder-friendly OpenGL and Vulkan source port based on the DOOM engine"; + longDescription = '' + GZDoom is a feature centric port for all DOOM engine games, based on + ZDoom, adding an OpenGL renderer and powerful scripting capabilities. ''; - - meta = with lib; { - homepage = "https://github.com/ZDoom/gzdoom"; - description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features"; - license = licenses.gpl3Plus; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ azahi lassulus ]; - }; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ azahi lassulus ]; }; -in gzdoom +} diff --git a/pkgs/games/harmonist/default.nix b/pkgs/games/harmonist/default.nix index ae7d6644ce75..9b132d4a862b 100644 --- a/pkgs/games/harmonist/default.nix +++ b/pkgs/games/harmonist/default.nix @@ -1,20 +1,17 @@ -{lib, fetchurl, buildGoPackage}: - -buildGoPackage rec { +{lib, fetchurl, buildGoModule}: +buildGoModule rec { pname = "harmonist"; version = "0.4.1"; - goPackagePath = "git.tuxfamily.org/harmonist/harmonist.git"; - src = fetchurl { url = "https://download.tuxfamily.org/harmonist/releases/${pname}-${version}.tar.gz"; - sha256 = "19abqmzz9nnlnizkskvlkcpahk8lzrl57mgg6dfxn25l55vfznws"; + hash = "sha256-mtvvdim0CNtdM+/VU2j+FE2oLpt0Tz1/tNTa9H/FS6U="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-SrvJXTyLtPZ2PyhSZz/gJvuso9r7e5NbGe7EJRf2XlI="; - postInstall = "mv $out/bin/harmonist.git $out/bin/harmonist"; + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "A stealth coffee-break roguelike game"; @@ -29,6 +26,6 @@ buildGoPackage rec { homepage = "https://harmonist.tuxfamily.org/"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; []; + maintainers = with maintainers; [ aaronjheng ]; }; } diff --git a/pkgs/games/harmonist/deps.nix b/pkgs/games/harmonist/deps.nix deleted file mode 100644 index 8823ada42d43..000000000000 --- a/pkgs/games/harmonist/deps.nix +++ /dev/null @@ -1,92 +0,0 @@ -[ - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "59616a248b91ae20bf3eb93636a24c87d9ce6cea"; - sha256 = "0jh9552ppqvkdfni7x623n0x5mbiaqqhjhmr0zkh28x56k4ysii4"; - }; - } - { - goPackagePath = "github.com/anaseto/gruid"; - fetch = { - type = "git"; - url = "https://github.com/anaseto/gruid"; - rev = "976b3db42d20169cf44eca1406b3cff104a80979"; - sha256 = "0rvsavkvg2hziwdh8sjk3n5v92m5mfjb8v9m7ch22maxfwq5kv6y"; - }; - } - { - goPackagePath = "github.com/anaseto/gruid-tcell"; - fetch = { - type = "git"; - url = "https://github.com/anaseto/gruid-tcell"; - rev = "4878126bb96fa0e529ec22c700d03b030e5c3bf7"; - sha256 = "0spm9gqsdan1mvbpypywid00vvl92rii8akhmjdm8l1r9qk7a3i4"; - }; - } - { - goPackagePath = "github.com/gdamore/tcell"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/tcell"; - rev = "f4d402906fa3d330545365abbf970c048e677b35"; - sha256 = "1wcbm5vxrh5s8g4mas32y3n0pjvfmngmc2yrxg1yn4333mh9mgf3"; - }; - } - { - goPackagePath = "github.com/lucasb-eyer/go-colorful"; - fetch = { - type = "git"; - url = "https://github.com/lucasb-eyer/go-colorful"; - rev = "4d8f45c41ac988423342507a1fb6050239b5a742"; - sha256 = "1p2rl5353fi4p3l0bz3dg0lifhxqj8hjyh1b6z1cn286qxwnnnm8"; - }; - } - { - goPackagePath = "github.com/gdamore/encoding"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/encoding"; - rev = "6289cdc94c00ac4aa177771c5fce7af2f96b626d"; - sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; - }; - } - { - goPackagePath = "github.com/rivo/uniseg"; - fetch = { - type = "git"; - url = "https://github.com/rivo/uniseg"; - rev = "75711fccf6a3e85bc74c241e2dddd06a9bc9e53d"; - sha256 = "0j7h22vfmjj562vr8gpsyrkrwp1pq9ayh5fylv24skxb467g9f0q"; - }; - } - { - goPackagePath = "golang.org/x/term/"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/term"; - rev = "6a3ed077a48de71621ad530f9078fffa0bc0ce32"; - sha256 = "0xni8n3q2r9f6fk223b2c1702fvqmgz7vk6738asri3fwby583q5"; - }; - } - { - goPackagePath = "golang.org/x/text/"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "e3aa4adf54f644ca0cb35f1f1fb19b239c40ef04"; - sha256 = "03q5kjmp4sfp5yzwb76lyf8cs9qca26vlwry5qgqf8w03rq700hf"; - }; - } - { - goPackagePath = "golang.org/x/sys/"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "88b6017d06564827ae436c619d52116f470a3611"; - sha256 = "14n7b6833lhxjzsgvi14c6c8nfiqqb4r71wvv4z5ksyssi95i3r7"; - }; - } -] diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index ebf56a21daad..c8c0e730f10e 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -1,6 +1,7 @@ { lib , mkYarnPackage , fetchFromGitHub +, gitUpdater , makeWrapper , electron , gogdl @@ -9,13 +10,13 @@ mkYarnPackage rec { pname = "heroic-unwrapped"; - version = "2.4.3"; + version = "2.5.2"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; rev = "v${version}"; - sha256 = "sha256-x9zIM2kKi+JgIGIidQYjyjqVGweFJ8DE7IX9gYULQuQ="; + sha256 = "sha256-vyZH/uOE7Oph8TuBFM2cUFwM4ed8Ri3fKRUrl9A6zHc="; }; packageJSON = ./package.json; @@ -29,10 +30,11 @@ mkYarnPackage rec { DISABLE_ESLINT_PLUGIN = "true"; postBuild = let - yarnCmd = "yarn --production --offline --frozen-lockfile --ignore-engines --ignore-scripts --lockfile ${yarnLock}"; + yarnCmd = "yarn --offline --frozen-lockfile --ignore-engines --ignore-scripts --lockfile ${yarnLock}"; in '' - ${yarnCmd} build-electron - ${yarnCmd} build + rm deps/heroic/node_modules + ln -s ../../node_modules deps/heroic/ + ${yarnCmd} vite build ''; # Disable bundling into a tar archive. @@ -44,8 +46,8 @@ mkYarnPackage rec { deps = "$out/libexec/heroic/deps/heroic"; in '' rm -rf "${deps}/public/bin" "${deps}/build/bin" - mkdir -p "${deps}/public/bin/linux" - ln -s "${gogdl}/bin/gogdl" "${legendary-gl}/bin/legendary" "${deps}/public/bin/linux" + mkdir -p "${deps}/build/bin/linux" + ln -s "${gogdl}/bin/gogdl" "${legendary-gl}/bin/legendary" "${deps}/build/bin/linux" makeWrapper "${electron}/bin/electron" "$out/bin/heroic" \ --inherit-argv0 \ @@ -59,6 +61,10 @@ mkYarnPackage rec { ln -s "${deps}/flatpak/com.heroicgameslauncher.hgl.png" "$out/share/icons/hicolor/512x512/apps" ''; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = with lib; { description = "A Native GOG and Epic Games Launcher for Linux, Windows and Mac"; homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher"; diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix index 75012f405f81..d3625ad129b6 100644 --- a/pkgs/games/heroic/fhsenv.nix +++ b/pkgs/games/heroic/fhsenv.nix @@ -12,6 +12,7 @@ buildFHSUserEnv { targetPkgs = pkgs: with pkgs; [ heroic-unwrapped + gamemode curl gawk gnome.zenity @@ -49,21 +50,27 @@ buildFHSUserEnv { ]; in pkgs: with pkgs; [ alsa-lib + alsa-plugins bash + cabextract cairo coreutils cups dbus + freealut freetype fribidi giflib glib gnutls + gst_all_1.gst-plugins-base gtk3 lcms2 libevdev + libgcrypt libGLU libglvnd + libgpg-error libjpeg libkrb5 libmpeg2 @@ -83,16 +90,19 @@ buildFHSUserEnv { libxkbcommon libxml2 mpg123 + ncurses ocl-icd openldap pipewire samba4 sane-backends SDL2 + sqlite udev udev unixODBC util-linux + v4l-utils vulkan-loader wayland zlib diff --git a/pkgs/games/heroic/package.json b/pkgs/games/heroic/package.json index 57954308eeea..77b1702d8793 100644 --- a/pkgs/games/heroic/package.json +++ b/pkgs/games/heroic/package.json @@ -1,8 +1,8 @@ { "name": "heroic", - "version": "2.4.0", + "version": "2.5.2", "private": true, - "main": "public/main.js", + "main": "build/electron/main.js", "homepage": "./", "license": "GPL-3.0-only", "description": "An Open Source Launcher for GOG and Epic Games", @@ -30,9 +30,6 @@ "build/icon-dark.png", "build/icon-light.png" ], - "directories": { - "buildResources": "public" - }, "protocols": [ { "name": "heroic", @@ -42,7 +39,7 @@ } ], "win": { - "artifactName": "Heroic_Setup_${version}.${ext}", + "artifactName": "${productName}-${version}-Setup.${ext}", "icon": "build/win_icon.ico", "asarUnpack": [ "build/bin/win32/legendary.exe", @@ -52,6 +49,9 @@ "build/bin/win32/*" ] }, + "portable": { + "artifactName": "${productName}-${version}-Portable.${ext}" + }, "mac": { "target": "dmg", "category": "public.app-category.games", @@ -103,21 +103,18 @@ "deb": { "packageCategory": "games", "depends": [ - "gawk", "curl" ] }, "pacman": { "packageCategory": "games", "depends": [ - "gawk", "curl" ] }, "rpm": { "packageCategory": "games", "depends": [ - "gawk", "curl" ] } @@ -132,9 +129,10 @@ "@fortawesome/free-regular-svg-icons": "^6.1.1", "@fortawesome/free-solid-svg-icons": "^6.1.1", "@fortawesome/react-fontawesome": "^0.1.18", - "@mui/icons-material": "^5.6.2", - "@mui/material": "^5.6.2", + "@mui/icons-material": "^5.10.9", + "@mui/material": "^5.10.12", "@node-steam/vdf": "^2.2.0", + "@shockpkg/icon-encoder": "^2.1.3", "axios": "^0.26.1", "check-disk-space": "^3.3.1", "classnames": "^2.3.1", @@ -148,44 +146,40 @@ "fuse.js": "^6.6.2", "graceful-fs": "^4.2.10", "heroic-wine-downloader": "^1.2.3", + "howlongtobeat": "^1.7.0", "i18next": "^21.6.16", "i18next-fs-backend": "^1.1.4", "i18next-http-backend": "^1.4.0", "ini": "^3.0.0", "plist": "^3.0.5", - "react": "17", - "react-dom": "17", + "react": "^18.2.0", + "react-dom": "^18.2.0", "react-i18next": "^11.16.7", + "react-markdown": "^8.0.3", "react-router-dom": "^6.3.0", - "react-scripts": "^5.0.1", + "recharts": "^2.1.14", "shlex": "^2.1.2", + "short-uuid": "^4.2.0", "simple-keyboard": "^3.4.136", "source-map-support": "^0.5.21", "steam-shortcut-editor": "^3.1.1", - "systeminformation": "^5.12.3", + "systeminformation": "^5.15.0", "tslib": "^2.4.0" }, "scripts": { - "start": "DISABLE_ESLINT_PLUGIN=true nf start -p 3000 && electron-start", - "electron-start": "ELECTRON_IS_DEV=1 node public/start-react", - "electron": "yarn build-electron && electron . --trace-warnings", - "react-start": "HOST=localhost BROWSER=none react-scripts start", - "react-start:win": "react-scripts start", - "build": "react-scripts build", - "test": "jest --noStackTrace", + "start": "vite", + "codecheck": "tsc --noEmit", + "test": "jest", "test-watch": "jest --watch --maxWorkers=25%", "test:ci": "jest --runInBand --silent", - "eject": "react-scripts eject", - "release:linux": "GH_TOKEN='${{ secrets.WORKFLOW_TOKEN }}' yarn build-electron && yarn build && electron-builder -c.extraMetadata.main=build/main.js -p always --linux deb AppImage rpm pacman tar.xz", - "release:mac": "GH_TOKEN='${{ secrets.WORKFLOW_TOKEN }}' yarn build-electron && yarn build && electron-builder -c.extraMetadata.main=build/main.js -p always --mac", - "release:win": "yarn build-electron && yarn build && electron-builder -c.extraMetadata.main=build/main.js -p always --win nsis portable", - "dist:linux": "GH_TOKEN='${{ secrets.WORKFLOW_TOKEN }}' yarn build-electron && yarn build && electron-builder -c.extraMetadata.main=build/main.js --linux", - "dist:mac": "GH_TOKEN='${{ secrets.WORKFLOW_TOKEN }}' yarn build-electron && yarn build && electron-builder -c.extraMetadata.main=build/main.js --mac", - "dist:win": "yarn build-electron && yarn build && electron-builder -c.extraMetadata.main=build/main.js --win", - "lint": "eslint -c .eslintrc --ext .tsx,ts ./src && eslint -c .eslintrc --ext .ts ./electron", - "lint-fix": "eslint --fix -c .eslintrc --ext .tsx,ts ./src && eslint --fix -c .eslintrc --ext .ts ./electron", - "build-electron": "tsc --project electron/tsconfig.json", - "watch-electron": "tsc --watch --project electron/tsconfig.json", + "release:linux": "vite build && electron-builder -p always --linux deb AppImage rpm pacman tar.xz", + "release:mac": "vite build && electron-builder -p always --mac", + "release:win": "vite build && electron-builder -p always --win nsis portable", + "dist:linux": "vite build && electron-builder --linux", + "dist:mac": "vite build && electron-builder --mac", + "dist:win": "vite build && electron-builder --win", + "lint": "eslint --cache -c .eslintrc --ext .tsx,ts ./src", + "lint-fix": "eslint --fix -c .eslintrc --ext .tsx,ts ./src", "dist-flatpak": "cd flatpak && flatpak-builder build local.heroic.yml --install --force-clean --user", "flatpak-test": "yarn dist:linux appimage && cd flatpak && flatpak-builder build local.heroic.yml --install --force-clean --user", "i18n": "i18next", @@ -210,35 +204,31 @@ "@types/jest": "^27.4.1", "@types/node": "^17.0.25", "@types/plist": "^3.0.2", - "@types/react": "^18.0.6", - "@types/react-dom": "^18.0.2", + "@types/react": "^18.0.24", + "@types/react-dom": "^18.0.8", "@types/react-router-dom": "^5.3.3", "@types/tmp": "^0.2.3", "@typescript-eslint/eslint-plugin": "^5.20.0", "@typescript-eslint/parser": "^5.20.0", - "electron": "^20.0.1", + "@vitejs/plugin-react": "^2.2.0", + "electron": "^21.2.1", "electron-builder": "^23.1.0", "electron-devtools-installer": "^3.2.0", "eslint": "^8.13.0", "eslint-config-prettier": "^8.5.0", + "eslint-plugin-import": "^2.26.0", "eslint-plugin-react": "^7.29.4", - "foreman": "^3.0.1", "husky": "^7.0.4", "i18next-parser": "^6.3.0", + "jest": "^28.1.3", "prettier": "^2.6.2", "pretty-quick": "^3.1.3", + "sass": "^1.55.0", "tmp": "^0.2.1", - "ts-jest": "^27.1.4", - "typescript": "^4.6.3" - }, - "browserslist": { - "production": [ - ">0.2%", - "not dead", - "not op_mini all" - ], - "development": [ - "last 1 chrome version" - ] + "ts-jest": "^28.0.7", + "typescript": "^4.8.4", + "vite": "^3.2.2", + "vite-plugin-electron": "^0.10.2", + "vite-plugin-svgr": "^2.2.2" } } diff --git a/pkgs/games/heroic/yarn.lock b/pkgs/games/heroic/yarn.lock index 6837fa506398..6c4d3f59b766 100644 --- a/pkgs/games/heroic/yarn.lock +++ b/pkgs/games/heroic/yarn.lock @@ -20,63 +20,75 @@ "@jridgewell/gen-mapping" "^0.1.0" "@jridgewell/trace-mapping" "^0.3.9" -"@apideck/better-ajv-errors@^0.3.1": - version "0.3.6" - resolved "https://registry.yarnpkg.com/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz#957d4c28e886a64a8141f7522783be65733ff097" - integrity sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA== - dependencies: - json-schema "^0.4.0" - jsonpointer "^5.0.0" - leven "^3.1.0" - -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.8.3": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== dependencies: "@babel/highlight" "^7.18.6" -"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8": - version "7.18.8" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.8.tgz#2483f565faca607b8535590e84e7de323f27764d" - integrity sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ== +"@babel/compat-data@^7.19.3": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.4.tgz#95c86de137bf0317f3a570e1b6e996b427299747" + integrity sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw== -"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.7.2", "@babel/core@^7.8.0": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.10.tgz#39ad504991d77f1f3da91be0b8b949a5bc466fb8" - integrity sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw== +"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.18.5": + version "7.19.3" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.3.tgz#2519f62a51458f43b682d61583c3810e7dcee64c" + integrity sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ== dependencies: "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.18.10" - "@babel/helper-compilation-targets" "^7.18.9" - "@babel/helper-module-transforms" "^7.18.9" - "@babel/helpers" "^7.18.9" - "@babel/parser" "^7.18.10" + "@babel/generator" "^7.19.3" + "@babel/helper-compilation-targets" "^7.19.3" + "@babel/helper-module-transforms" "^7.19.0" + "@babel/helpers" "^7.19.0" + "@babel/parser" "^7.19.3" "@babel/template" "^7.18.10" - "@babel/traverse" "^7.18.10" - "@babel/types" "^7.18.10" + "@babel/traverse" "^7.19.3" + "@babel/types" "^7.19.3" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.1" semver "^6.3.0" -"@babel/eslint-parser@^7.16.3": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.18.9.tgz#255a63796819a97b7578751bb08ab9f2a375a031" - integrity sha512-KzSGpMBggz4fKbRbWLNyPVTuQr6cmCcBhOyXTw/fieOVaw5oYAwcAj4a7UKcDYCPxQq+CG1NCDZH9e2JTXquiQ== +"@babel/core@^7.19.6": + version "7.19.6" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.6.tgz#7122ae4f5c5a37c0946c066149abd8e75f81540f" + integrity sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg== dependencies: - eslint-scope "^5.1.1" - eslint-visitor-keys "^2.1.0" + "@ampproject/remapping" "^2.1.0" + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.19.6" + "@babel/helper-compilation-targets" "^7.19.3" + "@babel/helper-module-transforms" "^7.19.6" + "@babel/helpers" "^7.19.4" + "@babel/parser" "^7.19.6" + "@babel/template" "^7.18.10" + "@babel/traverse" "^7.19.6" + "@babel/types" "^7.19.4" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.2.1" semver "^6.3.0" -"@babel/generator@^7.18.10", "@babel/generator@^7.7.2": - version "7.18.12" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.12.tgz#fa58daa303757bd6f5e4bbca91b342040463d9f4" - integrity sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg== +"@babel/generator@^7.19.3", "@babel/generator@^7.19.4", "@babel/generator@^7.7.2": + version "7.19.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.5.tgz#da3f4b301c8086717eee9cab14da91b1fa5dcca7" + integrity sha512-DxbNz9Lz4aMZ99qPpO1raTbcrI1ZeYh+9NR9qhfkQIbFtVEqotHojEBxHzmxhVONkGt6VyrqVQcgpefMy9pqcg== dependencies: - "@babel/types" "^7.18.10" + "@babel/types" "^7.19.4" + "@jridgewell/gen-mapping" "^0.3.2" + jsesc "^2.5.1" + +"@babel/generator@^7.19.6", "@babel/generator@^7.20.1": + version "7.20.1" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.1.tgz#ef32ecd426222624cbd94871a7024639cf61a9fa" + integrity sha512-u1dMdBUmA7Z0rBB97xh8pIhviK7oItYOkjbsCxTWMknyvbQRBwX7/gn4JXurRdirWMFh+ZtYARqkA6ydogVZpg== + dependencies: + "@babel/types" "^7.20.0" "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" @@ -87,76 +99,28 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb" - integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw== +"@babel/helper-compilation-targets@^7.19.3": + version "7.19.3" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz#a10a04588125675d7c7ae299af86fa1b2ee038ca" + integrity sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg== dependencies: - "@babel/helper-explode-assignable-expression" "^7.18.6" - "@babel/types" "^7.18.9" - -"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz#69e64f57b524cde3e5ff6cc5a9f4a387ee5563bf" - integrity sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg== - dependencies: - "@babel/compat-data" "^7.18.8" + "@babel/compat-data" "^7.19.3" "@babel/helper-validator-option" "^7.18.6" - browserslist "^4.20.2" + browserslist "^4.21.3" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz#d802ee16a64a9e824fcbf0a2ffc92f19d58550ce" - integrity sha512-WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.18.9" - "@babel/helper-member-expression-to-functions" "^7.18.9" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-replace-supers" "^7.18.9" - "@babel/helper-split-export-declaration" "^7.18.6" - -"@babel/helper-create-regexp-features-plugin@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz#3e35f4e04acbbf25f1b3534a657610a000543d3c" - integrity sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - regexpu-core "^5.1.0" - -"@babel/helper-define-polyfill-provider@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz#bd10d0aca18e8ce012755395b05a79f45eca5073" - integrity sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg== - dependencies: - "@babel/helper-compilation-targets" "^7.17.7" - "@babel/helper-plugin-utils" "^7.16.7" - debug "^4.1.1" - lodash.debounce "^4.0.8" - resolve "^1.14.2" - semver "^6.1.2" - "@babel/helper-environment-visitor@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== -"@babel/helper-explode-assignable-expression@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096" - integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg== +"@babel/helper-function-name@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" + integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-function-name@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz#940e6084a55dee867d33b4e487da2676365e86b0" - integrity sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A== - dependencies: - "@babel/template" "^7.18.6" - "@babel/types" "^7.18.9" + "@babel/template" "^7.18.10" + "@babel/types" "^7.19.0" "@babel/helper-hoist-variables@^7.18.6": version "7.18.6" @@ -165,80 +129,52 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-member-expression-to-functions@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815" - integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg== - dependencies: - "@babel/types" "^7.18.9" - -"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6": +"@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== dependencies: "@babel/types" "^7.18.6" -"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz#5a1079c005135ed627442df31a42887e80fcb712" - integrity sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g== +"@babel/helper-module-transforms@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz#309b230f04e22c58c6a2c0c0c7e50b216d350c30" + integrity sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ== dependencies: "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-module-imports" "^7.18.6" "@babel/helper-simple-access" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6" "@babel/helper-validator-identifier" "^7.18.6" - "@babel/template" "^7.18.6" - "@babel/traverse" "^7.18.9" - "@babel/types" "^7.18.9" + "@babel/template" "^7.18.10" + "@babel/traverse" "^7.19.0" + "@babel/types" "^7.19.0" -"@babel/helper-optimise-call-expression@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe" - integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA== - dependencies: - "@babel/types" "^7.18.6" - -"@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.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz#4b8aea3b069d8cb8a72cdfe28ddf5ceca695ef2f" - integrity sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w== - -"@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519" - integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-wrap-function" "^7.18.9" - "@babel/types" "^7.18.9" - -"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz#1092e002feca980fbbb0bd4d51b74a65c6a500e6" - integrity sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ== +"@babel/helper-module-transforms@^7.19.6": + version "7.19.6" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz#6c52cc3ac63b70952d33ee987cbee1c9368b533f" + integrity sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw== dependencies: "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-member-expression-to-functions" "^7.18.9" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/traverse" "^7.18.9" - "@babel/types" "^7.18.9" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-simple-access" "^7.19.4" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/helper-validator-identifier" "^7.19.1" + "@babel/template" "^7.18.10" + "@babel/traverse" "^7.19.6" + "@babel/types" "^7.19.4" -"@babel/helper-simple-access@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea" - integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g== - dependencies: - "@babel/types" "^7.18.6" +"@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.18.6", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.8.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf" + integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw== -"@babel/helper-skip-transparent-expression-wrappers@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818" - integrity sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw== +"@babel/helper-simple-access@^7.18.6", "@babel/helper-simple-access@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz#be553f4951ac6352df2567f7daa19a0ee15668e7" + integrity sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg== dependencies: - "@babel/types" "^7.18.9" + "@babel/types" "^7.19.4" "@babel/helper-split-export-declaration@^7.18.6": version "7.18.6" @@ -247,39 +183,38 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-string-parser@^7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56" - integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw== +"@babel/helper-string-parser@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" + integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== -"@babel/helper-validator-identifier@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076" - integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g== +"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": + version "7.19.1" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" + integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== "@babel/helper-validator-option@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== -"@babel/helper-wrap-function@^7.18.9": - version "7.18.11" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz#bff23ace436e3f6aefb61f85ffae2291c80ed1fb" - integrity sha512-oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w== +"@babel/helpers@^7.19.0": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.4.tgz#42154945f87b8148df7203a25c31ba9a73be46c5" + integrity sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw== dependencies: - "@babel/helper-function-name" "^7.18.9" "@babel/template" "^7.18.10" - "@babel/traverse" "^7.18.11" - "@babel/types" "^7.18.10" + "@babel/traverse" "^7.19.4" + "@babel/types" "^7.19.4" -"@babel/helpers@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.9.tgz#4bef3b893f253a1eced04516824ede94dcfe7ff9" - integrity sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ== +"@babel/helpers@^7.19.4": + version "7.20.1" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.1.tgz#2ab7a0fcb0a03b5bf76629196ed63c2d7311f4c9" + integrity sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg== dependencies: - "@babel/template" "^7.18.6" - "@babel/traverse" "^7.18.9" - "@babel/types" "^7.18.9" + "@babel/template" "^7.18.10" + "@babel/traverse" "^7.20.1" + "@babel/types" "^7.20.0" "@babel/highlight@^7.18.6": version "7.18.6" @@ -290,166 +225,15 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.11": - version "7.18.11" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.11.tgz#68bb07ab3d380affa9a3f96728df07969645d2d9" - integrity sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.19.3", "@babel/parser@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.4.tgz#03c4339d2b8971eb3beca5252bafd9b9f79db3dc" + integrity sha512-qpVT7gtuOLjWeDTKLkJ6sryqLliBaFpAtGeqw5cs5giLldvh+Ch0plqnUMKoVAUS6ZEueQQiZV+p5pxtPitEsA== -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2" - integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz#a11af19aa373d68d561f08e0a57242350ed0ec50" - integrity sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" - "@babel/plugin-proposal-optional-chaining" "^7.18.9" - -"@babel/plugin-proposal-async-generator-functions@^7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz#85ea478c98b0095c3e4102bff3b67d306ed24952" - integrity sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew== - dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/helper-remap-async-to-generator" "^7.18.9" - "@babel/plugin-syntax-async-generators" "^7.8.4" - -"@babel/plugin-proposal-class-properties@^7.16.0", "@babel/plugin-proposal-class-properties@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3" - integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-proposal-class-static-block@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz#8aa81d403ab72d3962fc06c26e222dacfc9b9020" - integrity sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - -"@babel/plugin-proposal-decorators@^7.16.4": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.10.tgz#788650d01e518a8a722eb8b3055dd9d73ecb7a35" - integrity sha512-wdGTwWF5QtpTY/gbBtQLAiCnoxfD4qMbN87NYZle1dOZ9Os8Y6zXcKrIaOU8W+TIvFUWVGG9tUgNww3CjXRVVw== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.18.9" - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/helper-replace-supers" "^7.18.9" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/plugin-syntax-decorators" "^7.18.6" - -"@babel/plugin-proposal-dynamic-import@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94" - integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - -"@babel/plugin-proposal-export-namespace-from@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203" - integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - -"@babel/plugin-proposal-json-strings@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b" - integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-json-strings" "^7.8.3" - -"@babel/plugin-proposal-logical-assignment-operators@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz#8148cbb350483bf6220af06fa6db3690e14b2e23" - integrity sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - -"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1" - integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - -"@babel/plugin-proposal-numeric-separator@^7.16.0", "@babel/plugin-proposal-numeric-separator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75" - integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - -"@babel/plugin-proposal-object-rest-spread@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz#f9434f6beb2c8cae9dfcf97d2a5941bbbf9ad4e7" - integrity sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q== - dependencies: - "@babel/compat-data" "^7.18.8" - "@babel/helper-compilation-targets" "^7.18.9" - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.18.8" - -"@babel/plugin-proposal-optional-catch-binding@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb" - integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - -"@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz#e8e8fe0723f2563960e4bf5e9690933691915993" - integrity sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - -"@babel/plugin-proposal-private-methods@^7.16.0", "@babel/plugin-proposal-private-methods@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea" - integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-proposal-private-property-in-object@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz#a64137b232f0aca3733a67eb1a144c192389c503" - integrity sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-create-class-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - -"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e" - integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" +"@babel/parser@^7.19.6", "@babel/parser@^7.20.1": + version "7.20.1" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.1.tgz#3e045a92f7b4623cafc2425eddcb8cf2e54f9cc5" + integrity sha512-hp0AYxaZJhxULfM1zyp7Wgr+pSUKBcP3M+PHnSzWGdXOzg/kHWIgiUWARvubhUKGOEw3xqY4x+lyZ9ytBVcELw== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -465,55 +249,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-class-properties@^7.12.13", "@babel/plugin-syntax-class-properties@^7.8.3": +"@babel/plugin-syntax-class-properties@^7.8.3": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-syntax-class-static-block@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" - integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-syntax-decorators@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.18.6.tgz#2e45af22835d0b0f8665da2bfd4463649ce5dbc1" - integrity sha512-fqyLgjcxf/1yhyZ6A+yo1u9gJ7eleFQod2lkaUsF9DQ7sbbY3Ligym3L0+I2c0WmqNKDpoD9UTb1AKP3qRMOAQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-syntax-dynamic-import@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" - integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-export-namespace-from@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" - integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - -"@babel/plugin-syntax-flow@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz#774d825256f2379d06139be0c723c4dd444f3ca1" - integrity sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-syntax-import-assertions@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz#cd6190500a4fa2fe31990a963ffab4b63e4505e4" - integrity sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-import-meta@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" @@ -535,7 +277,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": +"@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== @@ -549,7 +291,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.3": +"@babel/plugin-syntax-numeric-separator@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== @@ -577,235 +319,20 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-private-property-in-object@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" - integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3": +"@babel/plugin-syntax-top-level-await@^7.8.3": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.18.6", "@babel/plugin-syntax-typescript@^7.7.2": +"@babel/plugin-syntax-typescript@^7.7.2": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz#1c09cd25795c7c2b8a4ba9ae49394576d4133285" integrity sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA== dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-arrow-functions@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe" - integrity sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-async-to-generator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz#ccda3d1ab9d5ced5265fdb13f1882d5476c71615" - integrity sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag== - dependencies: - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-remap-async-to-generator" "^7.18.6" - -"@babel/plugin-transform-block-scoped-functions@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8" - integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-block-scoping@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz#f9b7e018ac3f373c81452d6ada8bd5a18928926d" - integrity sha512-5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-classes@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz#90818efc5b9746879b869d5ce83eb2aa48bbc3da" - integrity sha512-EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.18.9" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/helper-replace-supers" "^7.18.9" - "@babel/helper-split-export-declaration" "^7.18.6" - globals "^11.1.0" - -"@babel/plugin-transform-computed-properties@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz#2357a8224d402dad623caf6259b611e56aec746e" - integrity sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-destructuring@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz#68906549c021cb231bee1db21d3b5b095f8ee292" - integrity sha512-p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8" - integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-duplicate-keys@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e" - integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-exponentiation-operator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd" - integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw== - dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-flow-strip-types@^7.16.0": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.18.9.tgz#5b4cc521426263b5ce08893a2db41097ceba35bf" - integrity sha512-+G6rp2zRuOAInY5wcggsx4+QVao1qPM0osC9fTUVlAV3zOrzTCnrMAFVnR6+a3T8wz1wFIH7KhYMcMB3u1n80A== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/plugin-syntax-flow" "^7.18.6" - -"@babel/plugin-transform-for-of@^7.18.8": - version "7.18.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1" - integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-function-name@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0" - integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ== - dependencies: - "@babel/helper-compilation-targets" "^7.18.9" - "@babel/helper-function-name" "^7.18.9" - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-literals@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc" - integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-member-expression-literals@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e" - integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-modules-amd@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz#8c91f8c5115d2202f277549848874027d7172d21" - integrity sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg== - dependencies: - "@babel/helper-module-transforms" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-commonjs@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz#afd243afba166cca69892e24a8fd8c9f2ca87883" - integrity sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q== - dependencies: - "@babel/helper-module-transforms" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-simple-access" "^7.18.6" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-systemjs@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz#545df284a7ac6a05125e3e405e536c5853099a06" - integrity sha512-zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A== - dependencies: - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-module-transforms" "^7.18.9" - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/helper-validator-identifier" "^7.18.6" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-umd@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9" - integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ== - dependencies: - "@babel/helper-module-transforms" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-named-capturing-groups-regex@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz#c89bfbc7cc6805d692f3a49bc5fc1b630007246d" - integrity sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-new-target@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8" - integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-object-super@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c" - integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-replace-supers" "^7.18.6" - -"@babel/plugin-transform-parameters@^7.18.8": - version "7.18.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz#ee9f1a0ce6d78af58d0956a9378ea3427cccb48a" - integrity sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-property-literals@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3" - integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-react-constant-elements@^7.12.1": - version "7.18.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.18.12.tgz#edf3bec47eb98f14e84fa0af137fcc6aad8e0443" - integrity sha512-Q99U9/ttiu+LMnRU8psd23HhvwXmKWDQIpocm0JKaICcZHnw+mdQbHm6xnSy7dOl8I5PELakYtNBubNQlBXbZw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-react-display-name@^7.16.0", "@babel/plugin-transform-react-display-name@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz#8b1125f919ef36ebdfff061d664e266c666b9415" - integrity sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-transform-react-jsx-development@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz#dbe5c972811e49c7405b630e4d0d2e1380c0ddc5" @@ -813,241 +340,47 @@ dependencies: "@babel/plugin-transform-react-jsx" "^7.18.6" -"@babel/plugin-transform-react-jsx@^7.18.6": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.18.10.tgz#ea47b2c4197102c196cbd10db9b3bb20daa820f1" - integrity sha512-gCy7Iikrpu3IZjYZolFE4M1Sm+nrh1/6za2Ewj77Z+XirT4TsbJcvOFOyF+fRPwU6AKKK136CZxx6L8AbSFG6A== +"@babel/plugin-transform-react-jsx-self@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.18.6.tgz#3849401bab7ae8ffa1e3e5687c94a753fc75bda7" + integrity sha512-A0LQGx4+4Jv7u/tWzoJF7alZwnBDQd6cGLh9P+Ttk4dpiL+J5p7NSNv/9tlEFFJDq3kjxOavWmbm6t0Gk+A3Ig== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + +"@babel/plugin-transform-react-jsx-source@^7.19.6": + version "7.19.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.19.6.tgz#88578ae8331e5887e8ce28e4c9dc83fb29da0b86" + integrity sha512-RpAi004QyMNisst/pvSanoRdJ4q+jMCWyk9zdw/CyLB9j8RXEahodR6l2GyttDRyEVWZtbN+TpLiHJ3t34LbsQ== + dependencies: + "@babel/helper-plugin-utils" "^7.19.0" + +"@babel/plugin-transform-react-jsx@^7.18.6", "@babel/plugin-transform-react-jsx@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz#b3cbb7c3a00b92ec8ae1027910e331ba5c500eb9" + integrity sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.19.0" "@babel/plugin-syntax-jsx" "^7.18.6" - "@babel/types" "^7.18.10" - -"@babel/plugin-transform-react-pure-annotations@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz#561af267f19f3e5d59291f9950fd7b9663d0d844" - integrity sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-regenerator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz#585c66cb84d4b4bf72519a34cfce761b8676ca73" - integrity sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - regenerator-transform "^0.15.0" - -"@babel/plugin-transform-reserved-words@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a" - integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-runtime@^7.16.4": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.10.tgz#37d14d1fa810a368fd635d4d1476c0154144a96f" - integrity sha512-q5mMeYAdfEbpBAgzl7tBre/la3LeCxmDO1+wMXRdPWbcoMjR3GiXlCLk7JBZVVye0bqTGNMbt0yYVXX1B1jEWQ== - dependencies: - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.9" - babel-plugin-polyfill-corejs2 "^0.3.2" - babel-plugin-polyfill-corejs3 "^0.5.3" - babel-plugin-polyfill-regenerator "^0.4.0" - semver "^6.3.0" - -"@babel/plugin-transform-shorthand-properties@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9" - integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-spread@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz#6ea7a6297740f381c540ac56caf75b05b74fb664" - integrity sha512-39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" - -"@babel/plugin-transform-sticky-regex@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc" - integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-template-literals@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e" - integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-typeof-symbol@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0" - integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-typescript@^7.18.6": - version "7.18.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.12.tgz#712e9a71b9e00fde9f8c0238e0cceee86ab2f8fd" - integrity sha512-2vjjam0cum0miPkenUbQswKowuxs/NjMwIKEq0zwegRxXk12C9YOF9STXnaUptITOtOJHKHpzvvWYOjbm6tc0w== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.18.9" - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/plugin-syntax-typescript" "^7.18.6" - -"@babel/plugin-transform-unicode-escapes@^7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246" - integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-unicode-regex@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca" - integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.16.4": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.10.tgz#83b8dfe70d7eea1aae5a10635ab0a5fe60dfc0f4" - integrity sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA== - dependencies: - "@babel/compat-data" "^7.18.8" - "@babel/helper-compilation-targets" "^7.18.9" - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/helper-validator-option" "^7.18.6" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9" - "@babel/plugin-proposal-async-generator-functions" "^7.18.10" - "@babel/plugin-proposal-class-properties" "^7.18.6" - "@babel/plugin-proposal-class-static-block" "^7.18.6" - "@babel/plugin-proposal-dynamic-import" "^7.18.6" - "@babel/plugin-proposal-export-namespace-from" "^7.18.9" - "@babel/plugin-proposal-json-strings" "^7.18.6" - "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6" - "@babel/plugin-proposal-numeric-separator" "^7.18.6" - "@babel/plugin-proposal-object-rest-spread" "^7.18.9" - "@babel/plugin-proposal-optional-catch-binding" "^7.18.6" - "@babel/plugin-proposal-optional-chaining" "^7.18.9" - "@babel/plugin-proposal-private-methods" "^7.18.6" - "@babel/plugin-proposal-private-property-in-object" "^7.18.6" - "@babel/plugin-proposal-unicode-property-regex" "^7.18.6" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-class-properties" "^7.12.13" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-import-assertions" "^7.18.6" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-transform-arrow-functions" "^7.18.6" - "@babel/plugin-transform-async-to-generator" "^7.18.6" - "@babel/plugin-transform-block-scoped-functions" "^7.18.6" - "@babel/plugin-transform-block-scoping" "^7.18.9" - "@babel/plugin-transform-classes" "^7.18.9" - "@babel/plugin-transform-computed-properties" "^7.18.9" - "@babel/plugin-transform-destructuring" "^7.18.9" - "@babel/plugin-transform-dotall-regex" "^7.18.6" - "@babel/plugin-transform-duplicate-keys" "^7.18.9" - "@babel/plugin-transform-exponentiation-operator" "^7.18.6" - "@babel/plugin-transform-for-of" "^7.18.8" - "@babel/plugin-transform-function-name" "^7.18.9" - "@babel/plugin-transform-literals" "^7.18.9" - "@babel/plugin-transform-member-expression-literals" "^7.18.6" - "@babel/plugin-transform-modules-amd" "^7.18.6" - "@babel/plugin-transform-modules-commonjs" "^7.18.6" - "@babel/plugin-transform-modules-systemjs" "^7.18.9" - "@babel/plugin-transform-modules-umd" "^7.18.6" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.18.6" - "@babel/plugin-transform-new-target" "^7.18.6" - "@babel/plugin-transform-object-super" "^7.18.6" - "@babel/plugin-transform-parameters" "^7.18.8" - "@babel/plugin-transform-property-literals" "^7.18.6" - "@babel/plugin-transform-regenerator" "^7.18.6" - "@babel/plugin-transform-reserved-words" "^7.18.6" - "@babel/plugin-transform-shorthand-properties" "^7.18.6" - "@babel/plugin-transform-spread" "^7.18.9" - "@babel/plugin-transform-sticky-regex" "^7.18.6" - "@babel/plugin-transform-template-literals" "^7.18.9" - "@babel/plugin-transform-typeof-symbol" "^7.18.9" - "@babel/plugin-transform-unicode-escapes" "^7.18.10" - "@babel/plugin-transform-unicode-regex" "^7.18.6" - "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.18.10" - babel-plugin-polyfill-corejs2 "^0.3.2" - babel-plugin-polyfill-corejs3 "^0.5.3" - babel-plugin-polyfill-regenerator "^0.4.0" - core-js-compat "^3.22.1" - semver "^6.3.0" - -"@babel/preset-modules@^0.1.5": - version "0.1.5" - resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" - integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" - "@babel/plugin-transform-dotall-regex" "^7.4.4" - "@babel/types" "^7.4.4" - esutils "^2.0.2" - -"@babel/preset-react@^7.12.5", "@babel/preset-react@^7.16.0": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.18.6.tgz#979f76d6277048dc19094c217b507f3ad517dd2d" - integrity sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-validator-option" "^7.18.6" - "@babel/plugin-transform-react-display-name" "^7.18.6" - "@babel/plugin-transform-react-jsx" "^7.18.6" - "@babel/plugin-transform-react-jsx-development" "^7.18.6" - "@babel/plugin-transform-react-pure-annotations" "^7.18.6" - -"@babel/preset-typescript@^7.16.0": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz#ce64be3e63eddc44240c6358daefac17b3186399" - integrity sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-validator-option" "^7.18.6" - "@babel/plugin-transform-typescript" "^7.18.6" + "@babel/types" "^7.19.0" "@babel/runtime-corejs3@^7.10.2": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.18.9.tgz#7bacecd1cb2dd694eacd32a91fcf7021c20770ae" - integrity sha512-qZEWeccZCrHA2Au4/X05QW5CMdm4VjUDCrGq5gf1ZDcM4hRqreKrtwAn7yci9zfgAS9apvnsFXiGBHBAxZdK9A== + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.19.4.tgz#870dbfd9685b3dad5aeb2d00841bb8b6192e3095" + integrity sha512-HzjQ8+dzdx7dmZy4DQ8KV8aHi/74AjEbBGTFutBmg/pd3dY5/q1sfuOGPTFGEytlQhWoeVXqcK5BwMgIkRkNDQ== dependencies: - core-js-pure "^3.20.2" + core-js-pure "^3.25.1" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.9.tgz#b4fcfce55db3d2e5e080d2490f608a3b9f407f4a" - integrity sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw== +"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.2", "@babel/runtime@^7.18.3", "@babel/runtime@^7.19.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.4.tgz#a42f814502ee467d55b38dd1c256f53a7b885c78" + integrity sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA== dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.18.10", "@babel/template@^7.18.6", "@babel/template@^7.3.3": +"@babel/template@^7.18.10", "@babel/template@^7.3.3": version "7.18.10" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71" integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA== @@ -1056,29 +389,54 @@ "@babel/parser" "^7.18.10" "@babel/types" "^7.18.10" -"@babel/traverse@^7.18.10", "@babel/traverse@^7.18.11", "@babel/traverse@^7.18.9", "@babel/traverse@^7.7.2": - version "7.18.11" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.11.tgz#3d51f2afbd83ecf9912bcbb5c4d94e3d2ddaa16f" - integrity sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ== +"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.3", "@babel/traverse@^7.19.4", "@babel/traverse@^7.7.2": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.4.tgz#f117820e18b1e59448a6c1fa9d0ff08f7ac459a8" + integrity sha512-w3K1i+V5u2aJUOXBFFC5pveFLmtq1s3qcdDNC2qRI6WPBQIDaKFqXxDEqDO/h1dQ3HjsZoZMyIy6jGLq0xtw+g== dependencies: "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.18.10" + "@babel/generator" "^7.19.4" "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" "@babel/helper-hoist-variables" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.18.11" - "@babel/types" "^7.18.10" + "@babel/parser" "^7.19.4" + "@babel/types" "^7.19.4" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.6", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.10.tgz#4908e81b6b339ca7c6b7a555a5fc29446f26dde6" - integrity sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ== +"@babel/traverse@^7.19.6", "@babel/traverse@^7.20.1": + version "7.20.1" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.1.tgz#9b15ccbf882f6d107eeeecf263fbcdd208777ec8" + integrity sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA== dependencies: - "@babel/helper-string-parser" "^7.18.10" - "@babel/helper-validator-identifier" "^7.18.6" + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.20.1" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/parser" "^7.20.1" + "@babel/types" "^7.20.0" + debug "^4.1.0" + globals "^11.1.0" + +"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.4", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.19.3", "@babel/types@^7.19.4", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.4.tgz#0dd5c91c573a202d600490a35b33246fed8a41c7" + integrity sha512-M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw== + dependencies: + "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-validator-identifier" "^7.19.1" + to-fast-properties "^2.0.0" + +"@babel/types@^7.20.0": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.0.tgz#52c94cf8a7e24e89d2a194c25c35b17a64871479" + integrity sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg== + dependencies: + "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -1086,103 +444,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@csstools/normalize.css@*": - version "12.0.0" - resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-12.0.0.tgz#a9583a75c3f150667771f30b60d9f059473e62c4" - integrity sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg== - -"@csstools/postcss-cascade-layers@^1.0.4": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.0.5.tgz#f16f2c4396ace855541e1aa693f5f27ec972e6ad" - integrity sha512-Id/9wBT7FkgFzdEpiEWrsVd4ltDxN0rI0QS0SChbeQiSuux3z21SJCRLu6h2cvCEUmaRi+VD0mHFj+GJD4GFnw== - dependencies: - "@csstools/selector-specificity" "^2.0.2" - postcss-selector-parser "^6.0.10" - -"@csstools/postcss-color-function@^1.1.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz#2bd36ab34f82d0497cfacdc9b18d34b5e6f64b6b" - integrity sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw== - dependencies: - "@csstools/postcss-progressive-custom-properties" "^1.1.0" - postcss-value-parser "^4.2.0" - -"@csstools/postcss-font-format-keywords@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz#677b34e9e88ae997a67283311657973150e8b16a" - integrity sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg== - dependencies: - postcss-value-parser "^4.2.0" - -"@csstools/postcss-hwb-function@^1.0.1": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz#ab54a9fce0ac102c754854769962f2422ae8aa8b" - integrity sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w== - dependencies: - postcss-value-parser "^4.2.0" - -"@csstools/postcss-ic-unit@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz#28237d812a124d1a16a5acc5c3832b040b303e58" - integrity sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw== - dependencies: - "@csstools/postcss-progressive-custom-properties" "^1.1.0" - postcss-value-parser "^4.2.0" - -"@csstools/postcss-is-pseudo-class@^2.0.6": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz#846ae6c0d5a1eaa878fce352c544f9c295509cd1" - integrity sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA== - dependencies: - "@csstools/selector-specificity" "^2.0.0" - postcss-selector-parser "^6.0.10" - -"@csstools/postcss-normalize-display-values@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz#15da54a36e867b3ac5163ee12c1d7f82d4d612c3" - integrity sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw== - dependencies: - postcss-value-parser "^4.2.0" - -"@csstools/postcss-oklab-function@^1.1.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz#88cee0fbc8d6df27079ebd2fa016ee261eecf844" - integrity sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA== - dependencies: - "@csstools/postcss-progressive-custom-properties" "^1.1.0" - postcss-value-parser "^4.2.0" - -"@csstools/postcss-progressive-custom-properties@^1.1.0", "@csstools/postcss-progressive-custom-properties@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz#542292558384361776b45c85226b9a3a34f276fa" - integrity sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA== - dependencies: - postcss-value-parser "^4.2.0" - -"@csstools/postcss-stepped-value-functions@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz#f8772c3681cc2befed695e2b0b1d68e22f08c4f4" - integrity sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ== - dependencies: - postcss-value-parser "^4.2.0" - -"@csstools/postcss-trigonometric-functions@^1.0.1": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz#94d3e4774c36d35dcdc88ce091336cb770d32756" - integrity sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og== - dependencies: - postcss-value-parser "^4.2.0" - -"@csstools/postcss-unset-value@^1.0.1": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz#c99bb70e2cdc7312948d1eb41df2412330b81f77" - integrity sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g== - -"@csstools/selector-specificity@^2.0.0", "@csstools/selector-specificity@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz#1bfafe4b7ed0f3e4105837e056e0a89b108ebe36" - integrity sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg== - "@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" @@ -1221,9 +482,9 @@ plist "^3.0.4" "@emotion/babel-plugin@^11.10.0": - version "11.10.0" - resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.10.0.tgz#ae545b8faa6b42d3a50ec86b70b758296f3c4467" - integrity sha512-xVnpDAAbtxL1dsuSelU5A7BnY/lftws0wUexNJZTPsvX/1tM4GZJbclgODhvW4E+NH7E5VFcH0bBn30NvniPJA== + version "11.10.2" + resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.10.2.tgz#879db80ba622b3f6076917a1e6f648b1c7d008c7" + integrity sha512-xNQ57njWTFVfPAc3cjfuaPdsgLp5QOSuRsj9MA6ndEhH/AzuZM86qIQzt6rq+aGBwj3n5/TkLmU5lhAfdRmogA== dependencies: "@babel/helper-module-imports" "^7.16.7" "@babel/plugin-syntax-jsx" "^7.17.12" @@ -1238,10 +499,10 @@ source-map "^0.5.7" stylis "4.0.13" -"@emotion/cache@^11.10.0", "@emotion/cache@^11.9.3": - version "11.10.1" - resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.10.1.tgz#75a157c2a6bb9220450f73ebef1df2e1467dc65d" - integrity sha512-uZTj3Yz5D69GE25iFZcIQtibnVCFsc/6+XIozyL3ycgWvEdif2uEw9wlUt6umjLr4Keg9K6xRPHmD8LGi+6p1A== +"@emotion/cache@^11.10.0", "@emotion/cache@^11.10.3": + version "11.10.3" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.10.3.tgz#c4f67904fad10c945fea5165c3a5a0583c164b87" + integrity sha512-Psmp/7ovAa8appWh3g51goxu/z3iVms7JXOreq136D8Bbn6dYraPnmL6mdM8GThEx9vwSn92Fz+mGSjBzN8UPQ== dependencies: "@emotion/memoize" "^0.8.0" "@emotion/sheet" "^1.2.0" @@ -1254,7 +515,7 @@ resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.0.tgz#c5153d50401ee3c027a57a177bc269b16d889cb7" integrity sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ== -"@emotion/is-prop-valid@^1.1.3", "@emotion/is-prop-valid@^1.2.0": +"@emotion/is-prop-valid@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.2.0.tgz#7f2d35c97891669f7e276eb71c83376a5dc44c83" integrity sha512-3aDpDprjM0AwaxGE09bOPkNxHpBd+kA6jty3RnaEXdweX1DF1U3VQpPYb0g1IStAuK7SVQ1cy+bNBBKp4W3Fjg== @@ -1267,14 +528,15 @@ integrity sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA== "@emotion/react@^11.9.0": - version "11.10.0" - resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.10.0.tgz#53c577f063f26493f68a05188fb87528d912ff2e" - integrity sha512-K6z9zlHxxBXwN8TcpwBKcEsBsOw4JWCCmR+BeeOWgqp8GIU1yA2Odd41bwdAAr0ssbQrbJbVnndvv7oiv1bZeQ== + version "11.10.4" + resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.10.4.tgz#9dc6bccbda5d70ff68fdb204746c0e8b13a79199" + integrity sha512-j0AkMpr6BL8gldJZ6XQsQ8DnS9TxEQu1R+OGmDZiWjBAJtCcbt0tS3I/YffoqHXxH6MjgI7KdMbYKw3MEiU9eA== dependencies: "@babel/runtime" "^7.18.3" "@emotion/babel-plugin" "^11.10.0" "@emotion/cache" "^11.10.0" "@emotion/serialize" "^1.1.0" + "@emotion/use-insertion-effect-with-fallbacks" "^1.0.0" "@emotion/utils" "^1.2.0" "@emotion/weak-memoize" "^0.3.0" hoist-non-react-statics "^3.3.1" @@ -1296,14 +558,15 @@ integrity sha512-OiTkRgpxescko+M51tZsMq7Puu/KP55wMT8BgpcXVG2hqXc0Vo0mfymJ/Uj24Hp0i083ji/o0aLddh08UEjq8w== "@emotion/styled@^11.8.1": - version "11.10.0" - resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.10.0.tgz#c19484dab4206ae46727c07efb4316423dd21312" - integrity sha512-V9oaEH6V4KePeQpgUE83i8ht+4Ri3E8Djp/ZPJ4DQlqWhSKITvgzlR3/YQE2hdfP4Jw3qVRkANJz01LLqK9/TA== + version "11.10.4" + resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.10.4.tgz#e93f84a4d54003c2acbde178c3f97b421fce1cd4" + integrity sha512-pRl4R8Ez3UXvOPfc2bzIoV8u9P97UedgHS4FPX594ntwEuAMA114wlaHvOK24HB48uqfXiGlYIZYCxVJ1R1ttQ== dependencies: "@babel/runtime" "^7.18.3" "@emotion/babel-plugin" "^11.10.0" "@emotion/is-prop-valid" "^1.2.0" "@emotion/serialize" "^1.1.0" + "@emotion/use-insertion-effect-with-fallbacks" "^1.0.0" "@emotion/utils" "^1.2.0" "@emotion/unitless@^0.8.0": @@ -1311,6 +574,11 @@ resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.8.0.tgz#a4a36e9cbdc6903737cd20d38033241e1b8833db" integrity sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw== +"@emotion/use-insertion-effect-with-fallbacks@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz#ffadaec35dbb7885bd54de3fa267ab2f860294df" + integrity sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A== + "@emotion/utils@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.2.0.tgz#9716eaccbc6b5ded2ea5a90d65562609aab0f561" @@ -1321,14 +589,24 @@ resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz#ea89004119dc42db2e1dba0f97d553f7372f6fcb" integrity sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg== -"@eslint/eslintrc@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f" - integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw== +"@esbuild/android-arm@0.15.10": + version "0.15.10" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.10.tgz#a5f9432eb221afc243c321058ef25fe899886892" + integrity sha512-FNONeQPy/ox+5NBkcSbYJxoXj9GWu8gVGJTVmUyoOCKQFDTrHVKgNSzChdNt0I8Aj/iKcsDf2r9BFwv+FSNUXg== + +"@esbuild/linux-loong64@0.15.10": + version "0.15.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.10.tgz#78a42897c2cf8db9fd5f1811f7590393b77774c7" + integrity sha512-w0Ou3Z83LOYEkwaui2M8VwIp+nLi/NA60lBLMvaJ+vXVMcsARYdEzLNE7RSm4+lSg4zq4d7fAVuzk7PNQ5JFgg== + +"@eslint/eslintrc@^1.3.3": + version "1.3.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95" + integrity sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg== dependencies: ajv "^6.12.4" debug "^4.3.2" - espree "^9.3.2" + espree "^9.4.0" globals "^13.15.0" ignore "^5.2.0" import-fresh "^3.2.1" @@ -1336,48 +614,53 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" +"@fiahfy/packbits@0.0.6": + version "0.0.6" + resolved "https://registry.yarnpkg.com/@fiahfy/packbits/-/packbits-0.0.6.tgz#d93146683fa59f476c6ccb988eb1cf9d7c16e489" + integrity sha512-XuhF/edg+iIvXjkCWgfj6fWtRi/KrEPg2ILXj1l86EN4EssuOiPcLKgkMDr9cL8jTGtVd/MKUWW6Y0/ZVf1PGA== + "@fontsource/cabin@^4.5.5": - version "4.5.7" - resolved "https://registry.yarnpkg.com/@fontsource/cabin/-/cabin-4.5.7.tgz#bcf1ef81ecf589f71accad9c412f55d8c047af0b" - integrity sha512-UXqN46WKawd9uCuMqSdt6UJXo32gqeJUiuIvZLUfCe6reXBmnkyoG+V62UVEf/Dmw9TII6DNwJujpa0rgiAHjQ== + version "4.5.8" + resolved "https://registry.yarnpkg.com/@fontsource/cabin/-/cabin-4.5.8.tgz#73f98cbe3bef45d8b00467fecb0df253b3d46ad1" + integrity sha512-IdNdnl/oSC27EQQ3xJcpg1kWuSk9yAKDp2A7hDfn3xccKfWYGk9vtr85Dinv/W9KO5Kx0hWT4NT4jub2p8Mr8A== "@fontsource/rubik@^4.5.6": version "4.5.11" resolved "https://registry.yarnpkg.com/@fontsource/rubik/-/rubik-4.5.11.tgz#e2d06b840ba5c2111b269bea2842f570848af070" integrity sha512-m0/4GKOqJjF9cB4wuLgDhRdRVt35WzqI5n7SgddRjRD+yzsO0eEq/ak0ezgfbR3+f91ydDCek1+RuOVB8dNYwg== -"@fortawesome/fontawesome-common-types@6.1.2": - version "6.1.2" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.2.tgz#c1095b1bbabf19f37f9ff0719db38d92a410bcfe" - integrity sha512-wBaAPGz1Awxg05e0PBRkDRuTsy4B3dpBm+zreTTyd9TH4uUM27cAL4xWyWR0rLJCrRwzVsQ4hF3FvM6rqydKPA== +"@fortawesome/fontawesome-common-types@6.2.0": + version "6.2.0" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz#76467a94aa888aeb22aafa43eb6ff889df3a5a7f" + integrity sha512-rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg== "@fortawesome/fontawesome-svg-core@^6.1.1": - version "6.1.2" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.1.2.tgz#11e2e8583a7dea75d734e4d0e53d91c63fae7511" - integrity sha512-853G/Htp0BOdXnPoeCPTjFrVwyrJHpe8MhjB/DYE9XjwhnNDfuBCd3aKc2YUYbEfHEcBws4UAA0kA9dymZKGjA== + version "6.2.0" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.0.tgz#11856eaf4dd1d865c442ddea1eed8ee855186ba2" + integrity sha512-Cf2mAAeMWFMzpLC7Y9H1I4o3wEU+XovVJhTiNG8ZNgSQj53yl7OCJaS80K4YjrABWZzbAHVaoHE1dVJ27AAYXw== dependencies: - "@fortawesome/fontawesome-common-types" "6.1.2" + "@fortawesome/fontawesome-common-types" "6.2.0" "@fortawesome/free-brands-svg-icons@^6.1.1": - version "6.1.2" - resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.1.2.tgz#14160348b8ad5986b3805797dc4377a96e0014d9" - integrity sha512-b2eMfXQBsSxh52pcPtYchURQs6BWNh3zVTG8XH8Lv6V4kDhEg7D0kHN+K1SZniDiPb/e5tBlaygsinMUvetITA== + version "6.2.0" + resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.0.tgz#ce072179677f9b5d6767f918cfbf296f357cc1d0" + integrity sha512-fm1y4NyZ2qKYNmYhdMz9VAWRw1Et7PMHNunSw3W0SVAwKwv6o0qiJworLH3Y9SnmhHzAymXJwCX1op22FFvGiA== dependencies: - "@fortawesome/fontawesome-common-types" "6.1.2" + "@fortawesome/fontawesome-common-types" "6.2.0" "@fortawesome/free-regular-svg-icons@^6.1.1": - version "6.1.2" - resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.1.2.tgz#9f04009098addcc11d0d185126f058ed042c3099" - integrity sha512-xR4hA+tAwsaTHGfb+25H1gVU/aJ0Rzu+xIUfnyrhaL13yNQ7TWiI2RvzniAaB+VGHDU2a+Pk96Ve+pkN3/+TTQ== + version "6.2.0" + resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.0.tgz#947e1f03be17da3a60bfeb2666b5348b19448ce2" + integrity sha512-M1dG+PAmkYMTL9BSUHFXY5oaHwBYfHCPhbJ8qj8JELsc9XCrUJ6eEHWip4q0tE+h9C0DVyFkwIM9t7QYyCpprQ== dependencies: - "@fortawesome/fontawesome-common-types" "6.1.2" + "@fortawesome/fontawesome-common-types" "6.2.0" "@fortawesome/free-solid-svg-icons@^6.1.1": - version "6.1.2" - resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.2.tgz#491d668b8a6603698d0ce1ac620f66fd22b74c84" - integrity sha512-lTgZz+cMpzjkHmCwOG3E1ilUZrnINYdqMmrkv30EC3XbRsGlbIOL8H9LaNp5SV4g0pNJDfQ4EdTWWaMvdwyLiQ== + version "6.2.0" + resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.0.tgz#8dcde48109354fd7a5ece8ea48d678bb91d4b5f0" + integrity sha512-UjCILHIQ4I8cN46EiQn0CZL/h8AwCGgR//1c4R96Q5viSRwuKVo0NdQEc4bm+69ZwC0dUvjbDqAHF1RR5FA3XA== dependencies: - "@fortawesome/fontawesome-common-types" "6.1.2" + "@fortawesome/fontawesome-common-types" "6.2.0" "@fortawesome/react-fontawesome@^0.1.18": version "0.1.19" @@ -1386,19 +669,19 @@ dependencies: prop-types "^15.8.1" -"@humanwhocodes/config-array@^0.10.4": - version "0.10.4" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.4.tgz#01e7366e57d2ad104feea63e72248f22015c520c" - integrity sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw== +"@humanwhocodes/config-array@^0.10.5": + version "0.10.7" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.7.tgz#6d53769fd0c222767e6452e8ebda825c22e9f0dc" + integrity sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w== dependencies: "@humanwhocodes/object-schema" "^1.2.1" debug "^4.1.1" minimatch "^3.0.4" -"@humanwhocodes/gitignore-to-minimatch@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d" - integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA== +"@humanwhocodes/module-importer@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" + integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== "@humanwhocodes/object-schema@^1.2.1": version "1.2.1" @@ -1421,18 +704,6 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@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.5.1" - "@types/node" "*" - chalk "^4.0.0" - jest-message-util "^27.5.1" - jest-util "^27.5.1" - slash "^3.0.0" - "@jest/console@^28.1.3": version "28.1.3" resolved "https://registry.yarnpkg.com/@jest/console/-/console-28.1.3.tgz#2030606ec03a18c31803b8a36382762e447655df" @@ -1445,101 +716,124 @@ jest-util "^28.1.3" slash "^3.0.0" -"@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== +"@jest/core@^28.1.3": + version "28.1.3" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-28.1.3.tgz#0ebf2bd39840f1233cd5f2d1e6fc8b71bd5a1ac7" + integrity sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA== dependencies: - "@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" + "@jest/console" "^28.1.3" + "@jest/reporters" "^28.1.3" + "@jest/test-result" "^28.1.3" + "@jest/transform" "^28.1.3" + "@jest/types" "^28.1.3" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - emittery "^0.8.1" + ci-info "^3.2.0" exit "^0.1.2" 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" + jest-changed-files "^28.1.3" + jest-config "^28.1.3" + jest-haste-map "^28.1.3" + jest-message-util "^28.1.3" + jest-regex-util "^28.0.2" + jest-resolve "^28.1.3" + jest-resolve-dependencies "^28.1.3" + jest-runner "^28.1.3" + jest-runtime "^28.1.3" + jest-snapshot "^28.1.3" + jest-util "^28.1.3" + jest-validate "^28.1.3" + jest-watcher "^28.1.3" micromatch "^4.0.4" + pretty-format "^28.1.3" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" -"@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== +"@jest/environment@^28.1.3": + version "28.1.3" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-28.1.3.tgz#abed43a6b040a4c24fdcb69eab1f97589b2d663e" + integrity sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA== dependencies: - "@jest/fake-timers" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/fake-timers" "^28.1.3" + "@jest/types" "^28.1.3" "@types/node" "*" - jest-mock "^27.5.1" + jest-mock "^28.1.3" -"@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== +"@jest/expect-utils@^28.1.3": + version "28.1.3" + resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-28.1.3.tgz#58561ce5db7cd253a7edddbc051fb39dda50f525" + integrity sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA== dependencies: - "@jest/types" "^27.5.1" - "@sinonjs/fake-timers" "^8.0.1" + jest-get-type "^28.0.2" + +"@jest/expect-utils@^29.1.2": + version "29.1.2" + resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.1.2.tgz#66dbb514d38f7d21456bc774419c9ae5cca3f88d" + integrity sha512-4a48bhKfGj/KAH39u0ppzNTABXQ8QPccWAFUFobWBaEMSMp+sB31Z2fK/l47c4a/Mu1po2ffmfAIPxXbVTXdtg== + dependencies: + jest-get-type "^29.0.0" + +"@jest/expect@^28.1.3": + version "28.1.3" + resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-28.1.3.tgz#9ac57e1d4491baca550f6bdbd232487177ad6a72" + integrity sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw== + dependencies: + expect "^28.1.3" + jest-snapshot "^28.1.3" + +"@jest/fake-timers@^28.1.3": + version "28.1.3" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-28.1.3.tgz#230255b3ad0a3d4978f1d06f70685baea91c640e" + integrity sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw== + dependencies: + "@jest/types" "^28.1.3" + "@sinonjs/fake-timers" "^9.1.2" "@types/node" "*" - jest-message-util "^27.5.1" - jest-mock "^27.5.1" - jest-util "^27.5.1" + jest-message-util "^28.1.3" + jest-mock "^28.1.3" + jest-util "^28.1.3" -"@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== +"@jest/globals@^28.1.3": + version "28.1.3" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-28.1.3.tgz#a601d78ddc5fdef542728309894895b4a42dc333" + integrity sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA== dependencies: - "@jest/environment" "^27.5.1" - "@jest/types" "^27.5.1" - expect "^27.5.1" + "@jest/environment" "^28.1.3" + "@jest/expect" "^28.1.3" + "@jest/types" "^28.1.3" -"@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== +"@jest/reporters@^28.1.3": + version "28.1.3" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-28.1.3.tgz#9adf6d265edafc5fc4a434cfb31e2df5a67a369a" + integrity sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/transform" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/console" "^28.1.3" + "@jest/test-result" "^28.1.3" + "@jest/transform" "^28.1.3" + "@jest/types" "^28.1.3" + "@jridgewell/trace-mapping" "^0.3.13" "@types/node" "*" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" - glob "^7.1.2" + glob "^7.1.3" graceful-fs "^4.2.9" istanbul-lib-coverage "^3.0.0" istanbul-lib-instrument "^5.1.0" istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" 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" + jest-message-util "^28.1.3" + jest-util "^28.1.3" + jest-worker "^28.1.3" slash "^3.0.0" - source-map "^0.6.0" string-length "^4.0.1" + strip-ansi "^6.0.0" terminal-link "^2.0.0" - v8-to-istanbul "^8.1.0" + v8-to-istanbul "^9.0.1" "@jest/schemas@^28.1.3": version "28.1.3" @@ -1548,24 +842,21 @@ dependencies: "@sinclair/typebox" "^0.24.1" -"@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== +"@jest/schemas@^29.0.0": + version "29.0.0" + resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz#5f47f5994dd4ef067fb7b4188ceac45f77fe952a" + integrity sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA== dependencies: + "@sinclair/typebox" "^0.24.1" + +"@jest/source-map@^28.1.2": + version "28.1.2" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-28.1.2.tgz#7fe832b172b497d6663cdff6c13b0a920e139e24" + integrity sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww== + dependencies: + "@jridgewell/trace-mapping" "^0.3.13" callsites "^3.0.0" graceful-fs "^4.2.9" - source-map "^0.6.0" - -"@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.5.1" - "@jest/types" "^27.5.1" - "@types/istanbul-lib-coverage" "^2.0.0" - collect-v8-coverage "^1.0.0" "@jest/test-result@^28.1.3": version "28.1.3" @@ -1577,36 +868,36 @@ "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@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== +"@jest/test-sequencer@^28.1.3": + version "28.1.3" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz#9d0c283d906ac599c74bde464bc0d7e6a82886c3" + integrity sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw== dependencies: - "@jest/test-result" "^27.5.1" + "@jest/test-result" "^28.1.3" graceful-fs "^4.2.9" - jest-haste-map "^27.5.1" - jest-runtime "^27.5.1" + jest-haste-map "^28.1.3" + slash "^3.0.0" -"@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== +"@jest/transform@^28.1.3": + version "28.1.3" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-28.1.3.tgz#59d8098e50ab07950e0f2fc0fc7ec462371281b0" + integrity sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA== dependencies: - "@babel/core" "^7.1.0" - "@jest/types" "^27.5.1" + "@babel/core" "^7.11.6" + "@jest/types" "^28.1.3" + "@jridgewell/trace-mapping" "^0.3.13" 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.9" - jest-haste-map "^27.5.1" - jest-regex-util "^27.5.1" - jest-util "^27.5.1" + jest-haste-map "^28.1.3" + jest-regex-util "^28.0.2" + jest-util "^28.1.3" micromatch "^4.0.4" pirates "^4.0.4" slash "^3.0.0" - source-map "^0.6.1" - write-file-atomic "^3.0.0" + write-file-atomic "^4.0.1" "@jest/types@^26.6.2": version "26.6.2" @@ -1619,17 +910,6 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" -"@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" - "@types/node" "*" - "@types/yargs" "^16.0.0" - chalk "^4.0.0" - "@jest/types@^28.1.3": version "28.1.3" resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.1.3.tgz#b05de80996ff12512bc5ceb1d208285a7d11748b" @@ -1642,6 +922,18 @@ "@types/yargs" "^17.0.8" chalk "^4.0.0" +"@jest/types@^29.1.2": + version "29.1.2" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.1.2.tgz#7442d32b16bcd7592d9614173078b8c334ec730a" + integrity sha512-DcXGtoTykQB5jiwCmVr8H4vdg2OJhQex3qPkG+ISyDO7xQXbt/4R6dowcRyPemRnkH7JoHvZuxPBdlq+9JxFCg== + dependencies: + "@jest/schemas" "^29.0.0" + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^17.0.8" + chalk "^4.0.0" + "@jridgewell/gen-mapping@^0.1.0": version "0.1.1" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" @@ -1650,7 +942,7 @@ "@jridgewell/set-array" "^1.0.0" "@jridgewell/sourcemap-codec" "^1.4.10" -"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": +"@jridgewell/gen-mapping@^0.3.2": version "0.3.2" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== @@ -1659,7 +951,7 @@ "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/resolve-uri@^3.0.3": +"@jridgewell/resolve-uri@3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== @@ -1669,31 +961,18 @@ resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== -"@jridgewell/source-map@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" - integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== - dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/sourcemap-codec@^1.4.10": +"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": version "1.4.14" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== -"@jridgewell/trace-mapping@^0.3.7", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.14" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed" - integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ== +"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.9": + version "0.3.16" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.16.tgz#a7982f16c18cae02be36274365433e5b49d7b23f" + integrity sha512-LCQ+NeThyJ4k1W2d+vIKdxuSt9R3pQSZ4P92m7EakaYuXcVWbHuT5bjNcqLd4Rdgi6xYWYDvBJZJLZSLanjDcA== dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" - -"@leichtgewicht/ip-codec@^2.0.1": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" - integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== + "@jridgewell/resolve-uri" "3.1.0" + "@jridgewell/sourcemap-codec" "1.4.14" "@malept/cross-spawn-promise@^1.1.0": version "1.1.1" @@ -1712,88 +991,94 @@ lodash "^4.17.15" tmp-promise "^3.0.2" -"@mui/base@5.0.0-alpha.92": - version "5.0.0-alpha.92" - resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.92.tgz#5c2ca31801fe21a8fec9bfda2cf5f44b1e3c7284" - integrity sha512-ZgnSLrTXL4iUdLQhjp01dAOTQPQlnwrqjZRwDT3E6LZXEYn6cMv1MY6LZkWcF/zxrUnyasnsyMAgZ5d8AXS7bA== +"@mui/base@5.0.0-alpha.104": + version "5.0.0-alpha.104" + resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.104.tgz#1792e962dd782f1fa434f4aa7bab5410ed946644" + integrity sha512-tQPxZTzfYMwxYfKhEwufbTfdLpNjFdW7bXq6dK0j8651AAyZL4M8wynWUQ98hH1362R26mZFhVxHB2UD9t7VuA== dependencies: - "@babel/runtime" "^7.17.2" - "@emotion/is-prop-valid" "^1.1.3" - "@mui/types" "^7.1.5" - "@mui/utils" "^5.9.3" - "@popperjs/core" "^2.11.5" + "@babel/runtime" "^7.19.0" + "@emotion/is-prop-valid" "^1.2.0" + "@mui/types" "^7.2.0" + "@mui/utils" "^5.10.9" + "@popperjs/core" "^2.11.6" clsx "^1.2.1" prop-types "^15.8.1" react-is "^18.2.0" -"@mui/icons-material@^5.6.2": - version "5.8.4" - resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.8.4.tgz#3f2907c9f8f5ce4d754cb8fb4b68b5a1abf4d095" - integrity sha512-9Z/vyj2szvEhGWDvb+gG875bOGm8b8rlHBKOD1+nA3PcgC3fV6W1AU6pfOorPeBfH2X4mb9Boe97vHvaSndQvA== - dependencies: - "@babel/runtime" "^7.17.2" +"@mui/core-downloads-tracker@^5.10.12": + version "5.10.12" + resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.12.tgz#ff36abc5f4aac3c762d116e12ab51c2688d93da1" + integrity sha512-cR8lOS606G++iVHR8I6ySgMAEiPoA3DxO/nLeqiv7w7d1707kvKoV4/7SWjh4ui+kHb052xlf/G196q2EKx31w== -"@mui/material@^5.6.2": - version "5.10.0" - resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.10.0.tgz#35f6484b7dec40a38874fa948a44a073f4d3a4c7" - integrity sha512-MSEzkE2vhpM37m8Gh3+TcZCWL70p+MxzNvS8FHugBB6YZpafhBFmFKX7/pYJ2kVD87PpUhNR4szWub7/ohE02Q== +"@mui/icons-material@^5.10.9": + version "5.10.9" + resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.10.9.tgz#f9522c49797caf30146acc576e37ecb4f95bbc38" + integrity sha512-sqClXdEM39WKQJOQ0ZCPTptaZgqwibhj2EFV9N0v7BU1PO8y4OcX/a2wIQHn4fNuDjIZktJIBrmU23h7aqlGgg== dependencies: - "@babel/runtime" "^7.17.2" - "@mui/base" "5.0.0-alpha.92" - "@mui/system" "^5.10.0" - "@mui/types" "^7.1.5" - "@mui/utils" "^5.9.3" + "@babel/runtime" "^7.19.0" + +"@mui/material@^5.10.12": + version "5.10.12" + resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.10.12.tgz#1e97bb4bdfdfde136c1acbfb6ab16991de1e8677" + integrity sha512-rG9ZTkG9qUwujyAY1I+uQAa9pkGdsWY3KN+wvS/6H6ZbYIA06QRwmig6ySC6LbeB3WL/I/1ngwJqWX7nfINSbA== + dependencies: + "@babel/runtime" "^7.19.0" + "@mui/base" "5.0.0-alpha.104" + "@mui/core-downloads-tracker" "^5.10.12" + "@mui/system" "^5.10.12" + "@mui/types" "^7.2.0" + "@mui/utils" "^5.10.9" "@types/react-transition-group" "^4.4.5" clsx "^1.2.1" - csstype "^3.1.0" + csstype "^3.1.1" prop-types "^15.8.1" react-is "^18.2.0" react-transition-group "^4.4.5" -"@mui/private-theming@^5.9.3": - version "5.9.3" - resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.9.3.tgz#8ea06dbe0522b0cf4ba5ee19b1a4d7f74539ae1c" - integrity sha512-Ys3WO39WqoGciGX9k5AIi/k2zJhlydv4FzlEEwtw9OqdMaV0ydK/TdZekKzjP9sTI/JcdAP3H5DWtUaPLQJjWg== +"@mui/private-theming@^5.10.9": + version "5.10.9" + resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.10.9.tgz#c427bfa736455703975cdb108dbde6a174ba7971" + integrity sha512-BN7/CnsVPVyBaQpDTij4uV2xGYHHHhOgpdxeYLlIu+TqnsVM7wUeF+37kXvHovxM6xmL5qoaVUD98gDC0IZnHg== dependencies: - "@babel/runtime" "^7.17.2" - "@mui/utils" "^5.9.3" + "@babel/runtime" "^7.19.0" + "@mui/utils" "^5.10.9" prop-types "^15.8.1" -"@mui/styled-engine@^5.10.0": - version "5.10.0" - resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.10.0.tgz#5c904c1f021a8ee1b3e3b8a3d05c9f4ea68c43a0" - integrity sha512-V0MmOx7KBDomDYg2/dRItVsvrpHpd51uZZiNqeuXiZruUJ1vPwtxztpvtSjX/xKvIxN7C0mxf8jmuwVUn6uaEA== +"@mui/styled-engine@^5.10.8": + version "5.10.8" + resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.10.8.tgz#2db411e4278f06f70ccb6b5cd56ace67109513f6" + integrity sha512-w+y8WI18EJV6zM/q41ug19cE70JTeO6sWFsQ7tgePQFpy6ToCVPh0YLrtqxUZXSoMStW5FMw0t9fHTFAqPbngw== dependencies: - "@babel/runtime" "^7.17.2" - "@emotion/cache" "^11.9.3" - csstype "^3.1.0" + "@babel/runtime" "^7.19.0" + "@emotion/cache" "^11.10.3" + csstype "^3.1.1" prop-types "^15.8.1" -"@mui/system@^5.10.0": - version "5.10.0" - resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.10.0.tgz#48daf4aa8e61424c232378acb27a735abfb1fcc1" - integrity sha512-HNu3LdA+37cWqgJBEhOF4F5LX4WVmvg6SoHRfajRO0neKXLdooibMP3W1bhSd27QcPxyMUmvY9/Dlp9znDeCRw== +"@mui/system@^5.10.12": + version "5.10.12" + resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.10.12.tgz#fd97a6fd75995038c1c34e9c5b6eb4ff9b9eee56" + integrity sha512-9DcN3hF2KTTTpZ0K5Tn20B+Tz7tIqDmJLk1M6P0CYoAGUN/xrcF/6dn1zZ829rxE5tmauoDUekTfomrvPsvlSQ== dependencies: - "@babel/runtime" "^7.17.2" - "@mui/private-theming" "^5.9.3" - "@mui/styled-engine" "^5.10.0" - "@mui/types" "^7.1.5" - "@mui/utils" "^5.9.3" + "@babel/runtime" "^7.19.0" + "@mui/private-theming" "^5.10.9" + "@mui/styled-engine" "^5.10.8" + "@mui/types" "^7.2.0" + "@mui/utils" "^5.10.9" clsx "^1.2.1" - csstype "^3.1.0" + csstype "^3.1.1" prop-types "^15.8.1" -"@mui/types@^7.1.5": - version "7.1.5" - resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.5.tgz#5e5cc49d719bc86522983359bc1f90eddcff0624" - integrity sha512-HnRXrxgHJYJcT8ZDdDCQIlqk0s0skOKD7eWs9mJgBUu70hyW4iA6Kiv3yspJR474RFH8hysKR65VVSzUSzkuwA== +"@mui/types@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.0.tgz#91380c2d42420f51f404120f7a9270eadd6f5c23" + integrity sha512-lGXtFKe5lp3UxTBGqKI1l7G8sE2xBik8qCfrLHD5olwP/YU0/ReWoWT7Lp1//ri32dK39oPMrJN8TgbkCSbsNA== -"@mui/utils@^5.9.3": - version "5.9.3" - resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.9.3.tgz#a11e0824f00b7ea40257b390060ce167fe861d02" - integrity sha512-l0N5bcrenE9hnwZ/jPecpIRqsDFHkPXoFUcmkgysaJwVZzJ3yQkGXB47eqmXX5yyGrSc6HksbbqXEaUya+siew== +"@mui/utils@^5.10.9": + version "5.10.9" + resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.10.9.tgz#9dc455f9230f43eeb81d96a9a4bdb3855bb9ea39" + integrity sha512-2tdHWrq3+WCy+G6TIIaFx3cg7PorXZ71P375ExuX61od1NOAJP1mK90VxQ8N4aqnj2vmO3AQDkV4oV2Ktvt4bA== dependencies: - "@babel/runtime" "^7.17.2" + "@babel/runtime" "^7.19.0" "@types/prop-types" "^15.7.5" "@types/react-is" "^16.7.1 || ^17.0.0" prop-types "^15.8.1" @@ -1825,72 +1110,36 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@pmmmwh/react-refresh-webpack-plugin@^0.5.3": - version "0.5.7" - resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.7.tgz#58f8217ba70069cc6a73f5d7e05e85b458c150e2" - integrity sha512-bcKCAzF0DV2IIROp9ZHkRJa6O4jy7NlnHdWL3GmcUxYWNjLXkK5kfELELwEfSP5hXPfVL/qOGMAROuMQb9GG8Q== - dependencies: - ansi-html-community "^0.0.8" - common-path-prefix "^3.0.0" - core-js-pure "^3.8.1" - error-stack-parser "^2.0.6" - find-up "^5.0.0" - html-entities "^2.1.0" - loader-utils "^2.0.0" - schema-utils "^3.0.0" - source-map "^0.7.3" - -"@popperjs/core@^2.11.5": +"@popperjs/core@^2.11.6": version "2.11.6" resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45" integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw== -"@rollup/plugin-babel@^5.2.0": - version "5.3.1" - resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz#04bc0608f4aa4b2e4b1aebf284344d0f68fda283" - integrity sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q== - dependencies: - "@babel/helper-module-imports" "^7.10.4" - "@rollup/pluginutils" "^3.1.0" +"@remix-run/router@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.0.2.tgz#1c17eadb2fa77f80a796ad5ea9bf108e6993ef06" + integrity sha512-GRSOFhJzjGN+d4sKHTMSvNeUPoZiDHWmRnXfzaxrqe7dE/Nzlc8BiMSJdLDESZlndM7jIUrZ/F4yWqVYlI0rwQ== -"@rollup/plugin-node-resolve@^11.2.1": - version "11.2.1" - resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz#82aa59397a29cd4e13248b106e6a4a1880362a60" - integrity sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg== +"@rollup/pluginutils@^5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.0.tgz#a9b1a3769a15ba501eff8c9bd8d2cd0767d6a690" + integrity sha512-LJAlpJhSH4cAoNrh5G4mQ7VJJgmGVN1A91Skwpd6uMT4CGmDbrZ59RQWwNB08WkLtKOzTHFj6pKgVn18zlDFrQ== dependencies: - "@rollup/pluginutils" "^3.1.0" - "@types/resolve" "1.17.1" - builtin-modules "^3.1.0" - deepmerge "^4.2.2" - is-module "^1.0.0" - resolve "^1.19.0" + estree-walker "^2.0.2" + picomatch "^2.3.1" -"@rollup/plugin-replace@^2.4.1": - version "2.4.2" - resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz#a2d539314fbc77c244858faa523012825068510a" - integrity sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg== +"@shockpkg/icon-encoder@^2.1.3": + version "2.1.3" + resolved "https://registry.yarnpkg.com/@shockpkg/icon-encoder/-/icon-encoder-2.1.3.tgz#afcbde9e43f236867a38dee5550f2ed644af4724" + integrity sha512-JFyoQerf51EB6+UyqnyxE2yhKGw/WIo1W6wZE/S7+OBMno+r7zFP+OPZgUewSCZMwHFHhXZ9fX8OyNGomp2fZg== dependencies: - "@rollup/pluginutils" "^3.1.0" - magic-string "^0.25.7" - -"@rollup/pluginutils@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b" - integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg== - dependencies: - "@types/estree" "0.0.39" - estree-walker "^1.0.1" - picomatch "^2.2.2" - -"@rushstack/eslint-patch@^1.1.0": - version "1.1.4" - resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.1.4.tgz#0c8b74c50f29ee44f423f7416829c0bf8bb5eb27" - integrity sha512-LwzQKA4vzIct1zNZzBmRKI9QuNpLgTQMEjsQLf3BXuGYb3QPTP4Yjf6mkdX+X1mYttZ808QpOwAzZjv28kq7DA== + "@fiahfy/packbits" "0.0.6" + upng-js "^2.1.0" "@sinclair/typebox@^0.24.1": - version "0.24.27" - resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.27.tgz#d55643516a1546174e10da681a8aaa81e757452d" - integrity sha512-K7C7IlQ3zLePEZleUN21ceBA2aLcMnLHTLph8QWk1JK37L90obdpY+QGY8bXMKxf1ht1Z0MNewvXxWv0oGDYFg== + version "0.24.46" + resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.46.tgz#57501b58023776dbbae9e25619146286440be34c" + integrity sha512-ng4ut1z2MCBhK/NwDVwIQp3pAUOCs/KNaW3cBxdFB2xTDrOuo1xuNmpr/9HHFhxqIvHrs1NTH3KJg6q+JSy1Kw== "@sindresorhus/is@^0.14.0": version "0.14.0" @@ -1904,125 +1153,94 @@ dependencies: type-detect "4.0.8" -"@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== +"@sinonjs/fake-timers@^9.1.2": + version "9.1.2" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c" + integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw== dependencies: "@sinonjs/commons" "^1.7.0" -"@surma/rollup-plugin-off-main-thread@^2.2.3": - version "2.2.3" - resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz#ee34985952ca21558ab0d952f00298ad2190c053" - integrity sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ== +"@svgr/babel-plugin-add-jsx-attribute@^6.3.1": + version "6.5.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.5.0.tgz#21788f7e982aacafc805ed30a14048a1406fbabc" + integrity sha512-Cp1JR1IPrQNvPRbkfcPmax52iunBC+eQDyBce8feOIIbVH6ZpVhErYoJtPWRBj2rKi4Wi9HvCm1+L1UD6QlBmg== + +"@svgr/babel-plugin-remove-jsx-attribute@^6.3.1": + version "6.5.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-6.5.0.tgz#652bfd4ed0a0699843585cda96faeb09d6e1306e" + integrity sha512-8zYdkym7qNyfXpWvu4yq46k41pyNM9SOstoWhKlm+IfdCE1DdnRKeMUPsWIEO/DEkaWxJ8T9esNdG3QwQ93jBA== + +"@svgr/babel-plugin-remove-jsx-empty-expression@^6.3.1": + version "6.5.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-6.5.0.tgz#4b78994ab7d39032c729903fc2dd5c0fa4565cb8" + integrity sha512-NFdxMq3xA42Kb1UbzCVxplUc0iqSyM9X8kopImvFnB+uSDdzIHOdbs1op8ofAvVRtbg4oZiyRl3fTYeKcOe9Iw== + +"@svgr/babel-plugin-replace-jsx-attribute-value@^6.3.1": + version "6.5.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.5.0.tgz#ca57c0a62a9c22ff11cdb475dc9a2b35586335d1" + integrity sha512-XWm64/rSPUCQ+MFyA9lhMO+w8bOZvkTvovRIU1lpIy63ysPaVAFtxjQiZj+S7QaLaLGUXkSkf8WZsaN+QPo/gA== + +"@svgr/babel-plugin-svg-dynamic-title@^6.3.1": + version "6.5.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.5.0.tgz#57c0e0409757373d641f115d33cf2559b47bff77" + integrity sha512-JIF2D2ltiWFGlTw2fJ9jJg1fNT9rWjOD2Cf0/xzeW6Z2LIRQTHcRHxpZq359+SRWtEPsCXEWV2Xmd+DMBj6dBw== + +"@svgr/babel-plugin-svg-em-dimensions@^6.3.1": + version "6.5.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.5.0.tgz#dbca40a18c308f135b4b672ea8e410855e8e3352" + integrity sha512-uuo0FfLP4Nu2zncOcoUFDzZdXWma2bxkTGk0etRThs4/PghvPIGaW8cPhCg6yJ8zpaauWcKV0wZtzKlJRCtVzg== + +"@svgr/babel-plugin-transform-react-native-svg@^6.3.1": + version "6.5.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.5.0.tgz#a5453127365b925a7f766615ef6f5cfd01018f98" + integrity sha512-VMRWyOmrV+DaEFPgP3hZMsFgs2g87ojs3txw0Rx8iz6Nf/E3UoHUwTqpkSCWd3Hsnc9gMOY9+wl6+/Ycleh1sw== + +"@svgr/babel-plugin-transform-svg-component@^6.3.1": + version "6.5.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.5.0.tgz#ec116e9223a02c6dcd9f8cb2bdbf174a3c2ef2f5" + integrity sha512-b67Ul3SelaqvGEEG/1B3VJ03KUtGFgRQjRLCCjdttMQLcYa9l/izQFEclNFx53pNqhijUMNKHPhGMY/CWGVKig== + +"@svgr/babel-preset@^6.4.0": + version "6.4.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-6.4.0.tgz#b85bd1c64d03fcb3f930169541de4cf9ff4eaed9" + integrity sha512-Ytuh7N282fv2Cy1JePf6HZ29/G5Hb8mQAjx4iykPjvfFl9NK6o5lZavmewgjOGT8kNPtwgvheuOQn4CifHRUhQ== dependencies: - ejs "^3.1.6" - json5 "^2.2.0" - magic-string "^0.25.0" - string.prototype.matchall "^4.0.6" + "@svgr/babel-plugin-add-jsx-attribute" "^6.3.1" + "@svgr/babel-plugin-remove-jsx-attribute" "^6.3.1" + "@svgr/babel-plugin-remove-jsx-empty-expression" "^6.3.1" + "@svgr/babel-plugin-replace-jsx-attribute-value" "^6.3.1" + "@svgr/babel-plugin-svg-dynamic-title" "^6.3.1" + "@svgr/babel-plugin-svg-em-dimensions" "^6.3.1" + "@svgr/babel-plugin-transform-react-native-svg" "^6.3.1" + "@svgr/babel-plugin-transform-svg-component" "^6.3.1" -"@svgr/babel-plugin-add-jsx-attribute@^5.4.0": - version "5.4.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz#81ef61947bb268eb9d50523446f9c638fb355906" - integrity sha512-ZFf2gs/8/6B8PnSofI0inYXr2SDNTDScPXhN7k5EqD4aZ3gi6u+rbmZHVB8IM3wDyx8ntKACZbtXSm7oZGRqVg== - -"@svgr/babel-plugin-remove-jsx-attribute@^5.4.0": - version "5.4.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz#6b2c770c95c874654fd5e1d5ef475b78a0a962ef" - integrity sha512-yaS4o2PgUtwLFGTKbsiAy6D0o3ugcUhWK0Z45umJ66EPWunAz9fuFw2gJuje6wqQvQWOTJvIahUwndOXb7QCPg== - -"@svgr/babel-plugin-remove-jsx-empty-expression@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz#25621a8915ed7ad70da6cea3d0a6dbc2ea933efd" - integrity sha512-LA72+88A11ND/yFIMzyuLRSMJ+tRKeYKeQ+mR3DcAZ5I4h5CPWN9AHyUzJbWSYp/u2u0xhmgOe0+E41+GjEueA== - -"@svgr/babel-plugin-replace-jsx-attribute-value@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz#0b221fc57f9fcd10e91fe219e2cd0dd03145a897" - integrity sha512-PoiE6ZD2Eiy5mK+fjHqwGOS+IXX0wq/YDtNyIgOrc6ejFnxN4b13pRpiIPbtPwHEc+NT2KCjteAcq33/F1Y9KQ== - -"@svgr/babel-plugin-svg-dynamic-title@^5.4.0": - version "5.4.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz#139b546dd0c3186b6e5db4fefc26cb0baea729d7" - integrity sha512-zSOZH8PdZOpuG1ZVx/cLVePB2ibo3WPpqo7gFIjLV9a0QsuQAzJiwwqmuEdTaW2pegyBE17Uu15mOgOcgabQZg== - -"@svgr/babel-plugin-svg-em-dimensions@^5.4.0": - version "5.4.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz#6543f69526632a133ce5cabab965deeaea2234a0" - integrity sha512-cPzDbDA5oT/sPXDCUYoVXEmm3VIoAWAPT6mSPTJNbQaBNUuEKVKyGH93oDY4e42PYHRW67N5alJx/eEol20abw== - -"@svgr/babel-plugin-transform-react-native-svg@^5.4.0": - version "5.4.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz#00bf9a7a73f1cad3948cdab1f8dfb774750f8c80" - integrity sha512-3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q== - -"@svgr/babel-plugin-transform-svg-component@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz#583a5e2a193e214da2f3afeb0b9e8d3250126b4a" - integrity sha512-q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ== - -"@svgr/babel-preset@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-5.5.0.tgz#8af54f3e0a8add7b1e2b0fcd5a882c55393df327" - integrity sha512-4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig== +"@svgr/core@^6.4.0": + version "6.4.0" + resolved "https://registry.yarnpkg.com/@svgr/core/-/core-6.4.0.tgz#95878c7b23962febc14735885bdb9f35ee2735e5" + integrity sha512-wU9uyF6BUnwAqG7fDOowmDQzmbvovj1uq/iETfMK9xwQNaT+e7yN7SmDDcETXC72dnOrMcRuEWw0JEvpJha+yg== dependencies: - "@svgr/babel-plugin-add-jsx-attribute" "^5.4.0" - "@svgr/babel-plugin-remove-jsx-attribute" "^5.4.0" - "@svgr/babel-plugin-remove-jsx-empty-expression" "^5.0.1" - "@svgr/babel-plugin-replace-jsx-attribute-value" "^5.0.1" - "@svgr/babel-plugin-svg-dynamic-title" "^5.4.0" - "@svgr/babel-plugin-svg-em-dimensions" "^5.4.0" - "@svgr/babel-plugin-transform-react-native-svg" "^5.4.0" - "@svgr/babel-plugin-transform-svg-component" "^5.5.0" - -"@svgr/core@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/core/-/core-5.5.0.tgz#82e826b8715d71083120fe8f2492ec7d7874a579" - integrity sha512-q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ== - dependencies: - "@svgr/plugin-jsx" "^5.5.0" + "@svgr/babel-preset" "^6.4.0" + "@svgr/plugin-jsx" "^6.4.0" camelcase "^6.2.0" - cosmiconfig "^7.0.0" + cosmiconfig "^7.0.1" -"@svgr/hast-util-to-babel-ast@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz#5ee52a9c2533f73e63f8f22b779f93cd432a5461" - integrity sha512-cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ== +"@svgr/hast-util-to-babel-ast@^6.4.0": + version "6.4.0" + resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.4.0.tgz#864032f02fdc7fc9c7cd62480417cc54341cb9bd" + integrity sha512-PjcU8jCneKXJnrREycsgfgQ/bzR1ogSKC5MBeUu2wmEoJIjzXX7X14DDktUjU9bkBy26yMDiVHn46Nl82P3WEg== dependencies: - "@babel/types" "^7.12.6" + "@babel/types" "^7.18.4" + entities "^4.3.0" -"@svgr/plugin-jsx@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz#1aa8cd798a1db7173ac043466d7b52236b369000" - integrity sha512-V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA== +"@svgr/plugin-jsx@^6.4.0": + version "6.4.0" + resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-6.4.0.tgz#f756b7d71fd535801e042cd5d5038eebd318582d" + integrity sha512-gu6E7v8qRAtCxbymI1et3G7athogvKvzsJkSWiHVZsuVZbyx5O2b7+DIkKvAGh2RvEzgSvfGf8QD1BaHal2vBw== dependencies: - "@babel/core" "^7.12.3" - "@svgr/babel-preset" "^5.5.0" - "@svgr/hast-util-to-babel-ast" "^5.5.0" - svg-parser "^2.0.2" - -"@svgr/plugin-svgo@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz#02da55d85320549324e201c7b2e53bf431fcc246" - integrity sha512-r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ== - dependencies: - cosmiconfig "^7.0.0" - deepmerge "^4.2.2" - svgo "^1.2.2" - -"@svgr/webpack@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-5.5.0.tgz#aae858ee579f5fa8ce6c3166ef56c6a1b381b640" - integrity sha512-DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g== - dependencies: - "@babel/core" "^7.12.3" - "@babel/plugin-transform-react-constant-elements" "^7.12.1" - "@babel/preset-env" "^7.12.1" - "@babel/preset-react" "^7.12.5" - "@svgr/core" "^5.5.0" - "@svgr/plugin-jsx" "^5.5.0" - "@svgr/plugin-svgo" "^5.5.0" - loader-utils "^2.0.0" + "@babel/core" "^7.18.5" + "@svgr/babel-preset" "^6.4.0" + "@svgr/hast-util-to-babel-ast" "^6.4.0" + svg-parser "^2.0.4" "@szmarczak/http-timer@^1.1.2": version "1.1.2" @@ -2046,9 +1264,9 @@ pretty-format "^26.6.2" "@testing-library/dom@^8.5.0": - version "8.17.1" - resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.17.1.tgz#2d7af4ff6dad8d837630fecd08835aee08320ad7" - integrity sha512-KnH2MnJUzmFNPW6RIKfd+zf2Wue8mEKX0M3cpX6aKl5ZXrJM1/c/Pc8c2xDNYQCnJO48Sm5ITbMXgqTr3h4jxQ== + version "8.19.0" + resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.19.0.tgz#bd3f83c217ebac16694329e413d9ad5fdcfd785f" + integrity sha512-6YWYPPpxG3e/xOo6HIWwB/58HukkwIVTOaZ0VwdMVjhRUX/01E4FtQbck9GazOOj7MXHc5RBzMrU86iBJHbI+A== dependencies: "@babel/code-frame" "^7.10.4" "@babel/runtime" "^7.12.5" @@ -2075,9 +1293,9 @@ redent "^3.0.0" "@testing-library/react@^13.1.1": - version "13.3.0" - resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-13.3.0.tgz#bf298bfbc5589326bbcc8052b211f3bb097a97c5" - integrity sha512-DB79aA426+deFgGSjnf5grczDPiL4taK3hFaa+M5q7q20Kcve9eQottOG5kZ74KEr55v0tU2CQormSSDK87zYQ== + version "13.4.0" + resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-13.4.0.tgz#6a31e3bf5951615593ad984e96b9e5e2d9380966" + integrity sha512-sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw== dependencies: "@babel/runtime" "^7.12.5" "@testing-library/dom" "^8.5.0" @@ -2088,27 +1306,17 @@ resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.4.3.tgz#af975e367743fa91989cd666666aec31a8f50591" integrity sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q== -"@tootallnate/once@1": - version "1.1.2" - 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== -"@trysound/sax@0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" - integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== - "@types/aria-query@^4.2.0": version "4.2.2" resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.2.tgz#ed4e0ad92306a704f9fb132a0cfcf77486dbe2bc" integrity sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig== -"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14": +"@types/babel__core@^7.1.14": 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== @@ -2134,28 +1342,13 @@ "@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.18.0" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.0.tgz#8134fd78cb39567465be65b9fdc16d378095f41f" - integrity sha512-v4Vwdko+pgymgS+A2UIaJru93zQd85vIGWObM5ekZNdXCKtDYqATlEYnWgfo86Q6I1Lh0oXnksDnMU1cwmlPDw== +"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.2.tgz#235bf339d17185bdec25e024ca19cce257cc7309" + integrity sha512-FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg== dependencies: "@babel/types" "^7.3.0" -"@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/bonjour@^3.5.9": - version "3.5.10" - resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275" - integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw== - dependencies: - "@types/node" "*" - "@types/classnames@^2.3.1": version "2.3.1" resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.3.1.tgz#3c2467aa0f1a93f1f021e3b9bcf938bd5dfdc0dd" @@ -2163,78 +1356,49 @@ dependencies: classnames "*" -"@types/connect-history-api-fallback@^1.3.5": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" - integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw== - dependencies: - "@types/express-serve-static-core" "*" - "@types/node" "*" +"@types/d3-color@^2": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-2.0.3.tgz#8bc4589073c80e33d126345542f588056511fe82" + integrity sha512-+0EtEjBfKEDtH9Rk3u3kLOUXM5F+iZK+WvASPb0MhIZl8J8NUvGeZRwKCXl+P3HkYx5TdU4YtcibpqHkSR9n7w== -"@types/connect@*": - version "3.4.35" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" - integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== +"@types/d3-interpolate@^2.0.0": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@types/d3-interpolate/-/d3-interpolate-2.0.2.tgz#78eddf7278b19e48e8652603045528d46897aba0" + integrity sha512-lElyqlUfIPyWG/cD475vl6msPL4aMU7eJvx1//Q177L8mdXoVPFl1djIESF2FKnc0NyaHvQlJpWwKJYwAhUoCw== dependencies: - "@types/node" "*" + "@types/d3-color" "^2" -"@types/debug@^4.1.6": +"@types/d3-path@^2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-2.0.2.tgz#6052f38f6186319769dfabab61b5514b0e02c75c" + integrity sha512-3YHpvDw9LzONaJzejXLOwZ3LqwwkoXb9LI2YN7Hbd6pkGo5nIlJ09ul4bQhBN4hQZJKmUpX8HkVqbzgUKY48cg== + +"@types/d3-scale@^3.0.0": + version "3.3.2" + resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-3.3.2.tgz#18c94e90f4f1c6b1ee14a70f14bfca2bd1c61d06" + integrity sha512-gGqr7x1ost9px3FvIfUMi5XA/F/yAf4UkUDtdQhpH92XCT0Oa7zkkRzY61gPVJq+DxpHn/btouw5ohWkbBsCzQ== + dependencies: + "@types/d3-time" "^2" + +"@types/d3-shape@^2.0.0": + version "2.1.3" + resolved "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-2.1.3.tgz#35d397b9e687abaa0de82343b250b9897b8cacf3" + integrity sha512-HAhCel3wP93kh4/rq+7atLdybcESZ5bRHDEZUojClyZWsRuEMo3A52NGYJSh48SxfxEU6RZIVbZL2YFZ2OAlzQ== + dependencies: + "@types/d3-path" "^2" + +"@types/d3-time@^2": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-2.1.1.tgz#743fdc821c81f86537cbfece07093ac39b4bc342" + integrity sha512-9MVYlmIgmRR31C5b4FVSWtuMmBHh2mOWQYfl7XAYOa8dsnb7iEmUmRSWSFgXFtkjxO65d7hTUHQC+RhR/9IWFg== + +"@types/debug@^4.0.0", "@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/eslint-scope@^3.7.3": - version "3.7.4" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16" - integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA== - dependencies: - "@types/eslint" "*" - "@types/estree" "*" - -"@types/eslint@*", "@types/eslint@^7.29.0 || ^8.4.1": - version "8.4.5" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.5.tgz#acdfb7dd36b91cc5d812d7c093811a8f3d9b31e4" - integrity sha512-dhsC09y1gpJWnK+Ff4SGvCuSnk9DaU0BJZSzOwa6GVSg65XtTugLBITDAAzRU5duGBoXBHpdR/9jHGxJjNflJQ== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" - integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== - -"@types/estree@0.0.39": - version "0.0.39" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" - integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== - -"@types/estree@^0.0.51": - version "0.0.51" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" - integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== - -"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": - version "4.17.30" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz#0f2f99617fa8f9696170c46152ccf7500b34ac04" - integrity sha512-gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ== - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - -"@types/express@*", "@types/express@^4.17.13": - 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/fs-extra@^9.0.11": version "9.0.13" resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" @@ -2250,30 +1414,25 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/graceful-fs@^4.1.2", "@types/graceful-fs@^4.1.5": +"@types/graceful-fs@^4.1.3", "@types/graceful-fs@^4.1.5": version "4.1.5" resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== dependencies: "@types/node" "*" +"@types/hast@^2.0.0": + version "2.3.4" + resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.4.tgz#8aa5ef92c117d20d974a82bdfb6a648b08c0bafc" + integrity sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g== + dependencies: + "@types/unist" "*" + "@types/history@^4.7.11": version "4.7.11" resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.11.tgz#56588b17ae8f50c53983a524fc3cc47437969d64" integrity sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA== -"@types/html-minifier-terser@^6.0.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35" - integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg== - -"@types/http-proxy@^1.17.8": - version "1.17.9" - resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a" - integrity sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw== - dependencies: - "@types/node" "*" - "@types/i18next-fs-backend@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@types/i18next-fs-backend/-/i18next-fs-backend-1.1.2.tgz#4f3116769229371fcdf64bbdb6841ea745e392f9" @@ -2306,12 +1465,12 @@ "@types/istanbul-lib-report" "*" "@types/jest@*": - version "28.1.6" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-28.1.6.tgz#d6a9cdd38967d2d746861fb5be6b120e38284dd4" - integrity sha512-0RbGAFMfcBJKOmqRazM8L98uokwuwD5F8rHrv/ZMbrZBwVOWZUyPG6VFNscjYr/vjM3Vu4fRrCPbOs42AfemaQ== + version "29.1.2" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.1.2.tgz#7ad8077043ab5f6c108c8111bcc1d224e5600a87" + integrity sha512-y+nlX0h87U0R+wsGn6EBuoRWYyv3KFtwRNP3QWp9+k2tJ2/bqcGS3UxD7jgT+tiwJWWq3UsyV4Y+T6rsMT4XMg== dependencies: - jest-matcher-utils "^28.0.0" - pretty-format "^28.0.0" + expect "^29.0.0" + pretty-format "^29.0.0" "@types/jest@^27.4.1": version "27.5.2" @@ -2321,7 +1480,7 @@ jest-matcher-utils "^27.0.0" pretty-format "^27.0.0" -"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": +"@types/json-schema@^7.0.9": version "7.0.11" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== @@ -2331,12 +1490,19 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== -"@types/mime@*": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" - integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== +"@types/mdast@^3.0.0": + version "3.0.10" + resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af" + integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA== + dependencies: + "@types/unist" "*" -"@types/minimatch@*", "@types/minimatch@^3.0.3": +"@types/minimatch@*": + version "5.1.2" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" + integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== + +"@types/minimatch@^3.0.3": version "3.0.5" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== @@ -2347,14 +1513,14 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "18.7.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.1.tgz#352bee64f93117d867d05f7406642a52685cbca6" - integrity sha512-GKX1Qnqxo4S+Z/+Z8KKPLpH282LD7jLHWJcVryOflnsnH+BtSDfieR6ObwBMwpnNws0bUK8GI7z0unQf9bARNQ== + version "18.8.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.8.5.tgz#6a31f820c1077c3f8ce44f9e203e68a176e8f59e" + integrity sha512-Bq7G3AErwe5A/Zki5fdD3O6+0zDChhg671NfPjtIcbtzDNZTv4NPKMRFr7gtYPG7y+B8uTiNK4Ngd9T0FTar6Q== "@types/node@^16.11.26": - version "16.11.47" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.47.tgz#efa9e3e0f72e7aa6a138055dace7437a83d9f91c" - integrity sha512-fpP+jk2zJ4VW66+wAMFoBJlx1bxmBKx4DUFf68UHgdGCOuyUTDlLWqsaNPJh7xhNDykyJ9eIzAygilP/4WoN8g== + version "16.11.65" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.65.tgz#59500b86af757d6fcabd3dec32fecb6e357d7a45" + integrity sha512-Vfz7wGMOr4jbQGiQHVJm8VjeQwM9Ya7mHe9LtQ264/Epf5n1KiZShOFqk++nBzw6a/ubgYdB9Od7P+MH/LjoWw== "@types/node@^17.0.25": version "17.0.45" @@ -2375,37 +1541,29 @@ xmlbuilder ">=11.0.1" "@types/prettier@^2.1.5": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.0.tgz#ea03e9f0376a4446f44797ca19d9c46c36e352dc" - integrity sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A== + version "2.7.1" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.1.tgz#dfd20e2dc35f027cdd6c1908e80a5ddc7499670e" + integrity sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow== -"@types/prop-types@*", "@types/prop-types@^15.7.5": +"@types/prop-types@*", "@types/prop-types@^15.0.0", "@types/prop-types@^15.7.5": version "15.7.5" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== -"@types/q@^1.5.1": - version "1.5.5" - resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" - integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ== - -"@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/react-dom@^18.0.0", "@types/react-dom@^18.0.2": +"@types/react-dom@^18.0.0": version "18.0.6" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.6.tgz#36652900024842b74607a17786b6662dd1e103a1" integrity sha512-/5OFZgfIPSwy+YuIBP/FgJnQnsxhZhjjrnxudMddeblOouIodEQ75X14Rr4wGSG/bknL+Omy9iWlLo1u/9GzAA== dependencies: "@types/react" "*" +"@types/react-dom@^18.0.8": + version "18.0.8" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.8.tgz#d2606d855186cd42cc1b11e63a71c39525441685" + integrity sha512-C3GYO0HLaOkk9dDAz3Dl4sbe4AKUGTCfFIZsz3n/82dPNN8Du533HzKatDxeUYWu24wJgMP1xICqkWk1YOLOIw== + dependencies: + "@types/react" "*" + "@types/react-is@^16.7.1 || ^17.0.0": version "17.0.3" resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz#2d855ba575f2fc8d17ef9861f084acc4b90a137a" @@ -2423,9 +1581,9 @@ "@types/react-router" "*" "@types/react-router@*": - version "5.1.18" - resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.18.tgz#c8851884b60bc23733500d86c1266e1cfbbd9ef3" - integrity sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g== + version "5.1.19" + resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.19.tgz#9b404246fba7f91474d7008a3d48c17b6e075ad6" + integrity sha512-Fv/5kb2STAEMT3wHzdKQK2z8xKq38EDIGVrutYLmQVVLe+4orDFquU52hQrULnEHinMKv9FSA6lf9+uNT1ITtA== dependencies: "@types/history" "^4.7.11" "@types/react" "*" @@ -2437,26 +1595,23 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.0.6": - version "18.0.17" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.17.tgz#4583d9c322d67efe4b39a935d223edcc7050ccf4" - integrity sha512-38ETy4tL+rn4uQQi7mB81G7V1g0u2ryquNmsVIOKUAEIDK+3CUjZ6rSRpdvS99dNBnkLFL83qfmtLacGOTIhwQ== +"@types/react@*": + version "18.0.21" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.21.tgz#b8209e9626bb00a34c76f55482697edd2b43cc67" + integrity sha512-7QUCOxvFgnD5Jk8ZKlUAhVcRj7GuJRjnjjiY/IUBWKgOlnvDvTMLD4RTF7NPyVmbRhNrbomZiOepg7M/2Kj1mA== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" csstype "^3.0.2" -"@types/resolve@1.17.1": - version "1.17.1" - resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6" - integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw== +"@types/react@^18.0.24": + version "18.0.24" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.24.tgz#2f79ed5b27f08d05107aab45c17919754cc44c20" + integrity sha512-wRJWT6ouziGUy+9uX0aW4YOJxAY0bG6/AOk5AW5QSvZqI7dk6VBIbXvcVgIw/W5Jrl24f77df98GEKTJGOLx7Q== dependencies: - "@types/node" "*" - -"@types/retry@0.12.0": - version "0.12.0" - resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" - integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" "@types/scheduler@*": version "0.16.2" @@ -2464,31 +1619,9 @@ integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== "@types/semver@^7.3.6": - version "7.3.11" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.11.tgz#7a84d3228f34e68d14955fc406f8e66fdbe9e65e" - integrity sha512-R9HhjC4aKx3jL0FLwU7x6qMTysTvLh7jesRslXmxgCOXZwyh5dsnmrPQQToMyess8D4U+8G9x9mBFZoC/1o/Tw== - -"@types/serve-index@^1.9.1": - version "1.9.1" - resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" - integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg== - dependencies: - "@types/express" "*" - -"@types/serve-static@*", "@types/serve-static@^1.13.10": - version "1.15.0" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.0.tgz#c7930ff61afb334e121a9da780aac0d9b8f34155" - integrity sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg== - dependencies: - "@types/mime" "*" - "@types/node" "*" - -"@types/sockjs@^0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f" - integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw== - dependencies: - "@types/node" "*" + version "7.3.12" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.12.tgz#920447fdd78d76b19de0438b7f60df3c4a80bf1c" + integrity sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A== "@types/stack-utils@^2.0.0": version "2.0.1" @@ -2512,23 +1645,16 @@ resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.2.3.tgz#908bfb113419fd6a42273674c00994d40902c165" integrity sha512-dDZH/tXzwjutnuk4UacGgFRwV+JSLaXL1ikvidfJprkb7L9Nx1njcRHHmi3Dsvt7pgqqTEeucQuOrWHPFgzVHA== -"@types/trusted-types@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.2.tgz#fc25ad9943bcac11cceb8168db4f275e0e72e756" - integrity sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg== +"@types/unist@*", "@types/unist@^2.0.0": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" + integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ== "@types/verror@^1.10.3": version "1.10.6" resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz#3e600c62d210c5826460858f84bcbb65805460bb" integrity sha512-NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ== -"@types/ws@^8.5.1": - version "8.5.3" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d" - integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w== - dependencies: - "@types/node" "*" - "@types/yargs-parser@*": version "21.0.0" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" @@ -2541,17 +1667,10 @@ dependencies: "@types/yargs-parser" "*" -"@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", "@types/yargs@^17.0.8": - version "17.0.11" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.11.tgz#5e10ca33e219807c0eee0f08b5efcba9b6a42c06" - integrity sha512-aB4y9UDUXTSMxmM4MH+YnuR0g5Cph3FLQBoWoMB21DSvFVAxRVEHEMx3TLh+zUZYMCQtKiqazz0Q4Rre31f/OA== + version "17.0.13" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz#34cced675ca1b1d51fcf4d34c3c6f0fa142a5c76" + integrity sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg== dependencies: "@types/yargs-parser" "*" @@ -2562,292 +1681,110 @@ dependencies: "@types/node" "*" -"@typescript-eslint/eslint-plugin@^5.20.0", "@typescript-eslint/eslint-plugin@^5.5.0": - version "5.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.0.tgz#059798888720ec52ffa96c5f868e31a8f70fa3ec" - integrity sha512-jHvZNSW2WZ31OPJ3enhLrEKvAZNyAFWZ6rx9tUwaessTc4sx9KmgMNhVcqVAl1ETnT5rU5fpXTLmY9YvC1DCNg== +"@typescript-eslint/eslint-plugin@^5.20.0": + version "5.40.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.40.0.tgz#0159bb71410eec563968288a17bd4478cdb685bd" + integrity sha512-FIBZgS3DVJgqPwJzvZTuH4HNsZhHMa9SjxTKAZTlMsPw/UzpEjcf9f4dfgDJEHjK+HboUJo123Eshl6niwEm/Q== dependencies: - "@typescript-eslint/scope-manager" "5.33.0" - "@typescript-eslint/type-utils" "5.33.0" - "@typescript-eslint/utils" "5.33.0" + "@typescript-eslint/scope-manager" "5.40.0" + "@typescript-eslint/type-utils" "5.40.0" + "@typescript-eslint/utils" "5.40.0" debug "^4.3.4" - functional-red-black-tree "^1.0.1" ignore "^5.2.0" regexpp "^3.2.0" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/experimental-utils@^5.0.0": - version "5.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.33.0.tgz#94ca44da43731f2c62d91eb0c75917588bc483a2" - integrity sha512-NvRsNe+T90QrSVlgdV9/U8/chfqGmShvKUE7hWZTAUUCF6hZty/R+eMPVGldKcUDq7uRQaK6+V8gv5OwVDqC+g== +"@typescript-eslint/parser@^5.20.0": + version "5.40.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.40.0.tgz#432bddc1fe9154945660f67c1ba6d44de5014840" + integrity sha512-Ah5gqyX2ySkiuYeOIDg7ap51/b63QgWZA7w6AHtFrag7aH0lRQPbLzUjk0c9o5/KZ6JRkTTDKShL4AUrQa6/hw== dependencies: - "@typescript-eslint/utils" "5.33.0" - -"@typescript-eslint/parser@^5.20.0", "@typescript-eslint/parser@^5.5.0": - version "5.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.33.0.tgz#26ec3235b74f0667414613727cb98f9b69dc5383" - integrity sha512-cgM5cJrWmrDV2KpvlcSkelTBASAs1mgqq+IUGKJvFxWrapHpaRy5EXPQz9YaKF3nZ8KY18ILTiVpUtbIac86/w== - dependencies: - "@typescript-eslint/scope-manager" "5.33.0" - "@typescript-eslint/types" "5.33.0" - "@typescript-eslint/typescript-estree" "5.33.0" + "@typescript-eslint/scope-manager" "5.40.0" + "@typescript-eslint/types" "5.40.0" + "@typescript-eslint/typescript-estree" "5.40.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.33.0": - version "5.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.33.0.tgz#509d7fa540a2c58f66bdcfcf278a3fa79002e18d" - integrity sha512-/Jta8yMNpXYpRDl8EwF/M8It2A9sFJTubDo0ATZefGXmOqlaBffEw0ZbkbQ7TNDK6q55NPHFshGBPAZvZkE8Pw== +"@typescript-eslint/scope-manager@5.40.0": + version "5.40.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.40.0.tgz#d6ea782c8e3a2371ba3ea31458dcbdc934668fc4" + integrity sha512-d3nPmjUeZtEWRvyReMI4I1MwPGC63E8pDoHy0BnrYjnJgilBD3hv7XOiETKLY/zTwI7kCnBDf2vWTRUVpYw0Uw== dependencies: - "@typescript-eslint/types" "5.33.0" - "@typescript-eslint/visitor-keys" "5.33.0" + "@typescript-eslint/types" "5.40.0" + "@typescript-eslint/visitor-keys" "5.40.0" -"@typescript-eslint/type-utils@5.33.0": - version "5.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.33.0.tgz#92ad1fba973c078d23767ce2d8d5a601baaa9338" - integrity sha512-2zB8uEn7hEH2pBeyk3NpzX1p3lF9dKrEbnXq1F7YkpZ6hlyqb2yZujqgRGqXgRBTHWIUG3NGx/WeZk224UKlIA== +"@typescript-eslint/type-utils@5.40.0": + version "5.40.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.40.0.tgz#4964099d0158355e72d67a370249d7fc03331126" + integrity sha512-nfuSdKEZY2TpnPz5covjJqav+g5qeBqwSHKBvz7Vm1SAfy93SwKk/JeSTymruDGItTwNijSsno5LhOHRS1pcfw== dependencies: - "@typescript-eslint/utils" "5.33.0" + "@typescript-eslint/typescript-estree" "5.40.0" + "@typescript-eslint/utils" "5.40.0" debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/types@5.33.0": - version "5.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.33.0.tgz#d41c584831805554b063791338b0220b613a275b" - integrity sha512-nIMt96JngB4MYFYXpZ/3ZNU4GWPNdBbcB5w2rDOCpXOVUkhtNlG2mmm8uXhubhidRZdwMaMBap7Uk8SZMU/ppw== +"@typescript-eslint/types@5.40.0": + version "5.40.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.40.0.tgz#8de07e118a10b8f63c99e174a3860f75608c822e" + integrity sha512-V1KdQRTXsYpf1Y1fXCeZ+uhjW48Niiw0VGt4V8yzuaDTU8Z1Xl7yQDyQNqyAFcVhpYXIVCEuxSIWTsLDpHgTbw== -"@typescript-eslint/typescript-estree@5.33.0": - version "5.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.0.tgz#02d9c9ade6f4897c09e3508c27de53ad6bfa54cf" - integrity sha512-tqq3MRLlggkJKJUrzM6wltk8NckKyyorCSGMq4eVkyL5sDYzJJcMgZATqmF8fLdsWrW7OjjIZ1m9v81vKcaqwQ== +"@typescript-eslint/typescript-estree@5.40.0": + version "5.40.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.0.tgz#e305e6a5d65226efa5471ee0f12e0ffaab6d3075" + integrity sha512-b0GYlDj8TLTOqwX7EGbw2gL5EXS2CPEWhF9nGJiGmEcmlpNBjyHsTwbqpyIEPVpl6br4UcBOYlcI2FJVtJkYhg== dependencies: - "@typescript-eslint/types" "5.33.0" - "@typescript-eslint/visitor-keys" "5.33.0" + "@typescript-eslint/types" "5.40.0" + "@typescript-eslint/visitor-keys" "5.40.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.33.0", "@typescript-eslint/utils@^5.13.0": - version "5.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.33.0.tgz#46797461ce3146e21c095d79518cc0f8ec574038" - integrity sha512-JxOAnXt9oZjXLIiXb5ZIcZXiwVHCkqZgof0O8KPgz7C7y0HS42gi75PdPlqh1Tf109M0fyUw45Ao6JLo7S5AHw== +"@typescript-eslint/utils@5.40.0": + version "5.40.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.40.0.tgz#647f56a875fd09d33c6abd70913c3dd50759b772" + integrity sha512-MO0y3T5BQ5+tkkuYZJBjePewsY+cQnfkYeRqS6tPh28niiIwPnQ1t59CSRcs1ZwJJNOdWw7rv9pF8aP58IMihA== dependencies: "@types/json-schema" "^7.0.9" - "@typescript-eslint/scope-manager" "5.33.0" - "@typescript-eslint/types" "5.33.0" - "@typescript-eslint/typescript-estree" "5.33.0" + "@typescript-eslint/scope-manager" "5.40.0" + "@typescript-eslint/types" "5.40.0" + "@typescript-eslint/typescript-estree" "5.40.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" + semver "^7.3.7" -"@typescript-eslint/visitor-keys@5.33.0": - version "5.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.0.tgz#fbcbb074e460c11046e067bc3384b5d66b555484" - integrity sha512-/XsqCzD4t+Y9p5wd9HZiptuGKBlaZO5showwqODii5C0nZawxWLF+Q6k5wYHBrQv96h6GYKyqqMHCSTqta8Kiw== +"@typescript-eslint/visitor-keys@5.40.0": + version "5.40.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.40.0.tgz#dd2d38097f68e0d2e1e06cb9f73c0173aca54b68" + integrity sha512-ijJ+6yig+x9XplEpG2K6FUdJeQGGj/15U3S56W9IqXKJqleuD7zJ2AX/miLezwxpd7ZxDAqO87zWufKg+RPZyQ== dependencies: - "@typescript-eslint/types" "5.33.0" + "@typescript-eslint/types" "5.40.0" eslint-visitor-keys "^3.3.0" -"@webassemblyjs/ast@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" - integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== +"@vitejs/plugin-react@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-2.2.0.tgz#1b9f63b8b6bc3f56258d20cd19b33f5cc761ce6e" + integrity sha512-FFpefhvExd1toVRlokZgxgy2JtnBOdp4ZDsq7ldCWaqGSGn9UhWMAVm/1lxPL14JfNS5yGz+s9yFrQY6shoStA== dependencies: - "@webassemblyjs/helper-numbers" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - -"@webassemblyjs/floating-point-hex-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" - integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== - -"@webassemblyjs/helper-api-error@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" - integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== - -"@webassemblyjs/helper-buffer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" - integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== - -"@webassemblyjs/helper-numbers@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" - integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== - dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@xtuc/long" "4.2.2" - -"@webassemblyjs/helper-wasm-bytecode@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" - integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== - -"@webassemblyjs/helper-wasm-section@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" - integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - -"@webassemblyjs/ieee754@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" - integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== - dependencies: - "@xtuc/ieee754" "^1.2.0" - -"@webassemblyjs/leb128@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" - integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== - dependencies: - "@xtuc/long" "4.2.2" - -"@webassemblyjs/utf8@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" - integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== - -"@webassemblyjs/wasm-edit@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" - integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/helper-wasm-section" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-opt" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - "@webassemblyjs/wast-printer" "1.11.1" - -"@webassemblyjs/wasm-gen@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" - integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wasm-opt@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" - integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - -"@webassemblyjs/wasm-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" - integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wast-printer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" - integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@xtuc/long" "4.2.2" - -"@xtuc/ieee754@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" - integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== - -"@xtuc/long@4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" - integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== - -abab@^2.0.3, abab@^2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" - integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== - -accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: - version "1.3.8" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" - integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== - dependencies: - mime-types "~2.1.34" - negotiator "0.6.3" - -acorn-globals@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" - integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg== - dependencies: - acorn "^7.1.1" - acorn-walk "^7.1.1" - -acorn-import-assertions@^1.7.6: - version "1.8.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" - integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== + "@babel/core" "^7.19.6" + "@babel/plugin-transform-react-jsx" "^7.19.0" + "@babel/plugin-transform-react-jsx-development" "^7.18.6" + "@babel/plugin-transform-react-jsx-self" "^7.18.6" + "@babel/plugin-transform-react-jsx-source" "^7.19.6" + magic-string "^0.26.7" + react-refresh "^0.14.0" acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn-node@^1.8.2: - version "1.8.2" - resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" - integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A== - dependencies: - acorn "^7.0.0" - acorn-walk "^7.0.0" - xtend "^4.0.2" - -acorn-walk@^7.0.0, 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.0.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, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0: +acorn@^8.8.0: version "8.8.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== -address@^1.0.1, address@^1.1.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/address/-/address-1.2.0.tgz#d352a62c92fee90f89a693eccd2a8b2139ab02d9" - integrity sha512-tNEZYz5G/zYunxFm7sfhAxkXEuLj3K6BKwv6ZURlsF6yiUQ65z0Q2wZW9L5cPUl9ocofGvXOdFYbFHp0+6MOig== - -adjust-sourcemap-loader@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz#fc4a0fd080f7d10471f30a7320f25560ade28c99" - integrity sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A== - dependencies: - loader-utils "^2.0.0" - regex-parser "^2.2.11" - agent-base@6: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -2862,19 +1799,12 @@ ajv-formats@^2.1.1: dependencies: ajv "^8.0.0" -ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: +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-keywords@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" - integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== - dependencies: - fast-deep-equal "^3.1.3" - -ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: +ajv@^6.10.0, ajv@^6.12.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== @@ -2884,7 +1814,7 @@ ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.0, ajv@^8.6.0, ajv@^8.6.3, ajv@^8.8.0: +ajv@^8.0.0, ajv@^8.6.3: version "8.11.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== @@ -2894,35 +1824,18 @@ ajv@^8.0.0, ajv@^8.6.0, ajv@^8.6.3, ajv@^8.8.0: require-from-string "^2.0.2" 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-escapes@^4.2.1, ansi-escapes@^4.3.1: +ansi-escapes@^4.2.1: 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-html-community@^0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" - integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== - ansi-regex@^5.0.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-regex@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" - integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== - ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -2942,6 +1855,11 @@ ansi-styles@^5.0.0: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== +any-base@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/any-base/-/any-base-1.1.0.tgz#ae101a62bc08a597b4c9ab5b7089d456630549fe" + integrity sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg== + anymatch@^3.0.3, anymatch@~3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" @@ -2955,10 +1873,10 @@ app-builder-bin@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.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.3.3.tgz#78b9dbb0bd8a69842461edd77a3226d0547c5939" - integrity sha512-m0+M53+HYMzqKxwNQZT143K7WwXEGUy9LY31l8dJphXx2P/FQod615mVbxHyqbDCG4J5bHdWm21qZ0e2DVY6CQ== +app-builder-lib@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz#03cade02838c077db99d86212d61c5fc1d6da1a8" + integrity sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" @@ -2966,13 +1884,13 @@ app-builder-lib@23.3.3: "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + builder-util "23.6.0" + builder-util-runtime "9.1.1" chromium-pickle-js "^0.2.0" debug "^4.3.4" ejs "^3.1.7" electron-osx-sign "^0.6.0" - electron-publish "23.3.3" + electron-publish "23.6.0" form-data "^4.0.0" fs-extra "^10.1.0" hosted-git-info "^4.1.0" @@ -2994,11 +1912,6 @@ append-buffer@^1.0.2: dependencies: buffer-equal "^1.0.0" -arg@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c" - integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg== - argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -3020,25 +1933,15 @@ aria-query@^4.2.2: "@babel/runtime-corejs3" "^7.10.2" aria-query@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.0.0.tgz#210c21aaf469613ee8c9a62c7f86525e058db52c" - integrity sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg== + version "5.0.2" + resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.0.2.tgz#0b8a744295271861e1d933f8feca13f9b70cfdc1" + integrity sha512-eigU3vhqSO+Z8BKDnVLN/ompjhf3pYzecKXz8+whRy+9gZu8n1TCGfwzQUUPnqdHl9ax1Hr9031orZ+UOEYr7Q== array-differ@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b" integrity sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg== -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== - -array-flatten@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" - integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== - array-includes@^3.1.4, array-includes@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.5.tgz#2c320010db8d31031fd2a5f6b3bbd4b1aad31bdb" @@ -3075,27 +1978,11 @@ array.prototype.flatmap@^1.3.0: es-abstract "^1.19.2" es-shim-unscopables "^1.0.0" -array.prototype.reduce@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz#8167e80089f78bff70a99e20bd4201d4663b0a6f" - integrity sha512-WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.2" - es-array-method-boxes-properly "^1.0.0" - is-string "^1.0.7" - arrify@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa" integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug== -asap@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" - integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== - asar@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/asar/-/asar-3.2.0.tgz#e6edb5edd6f627ebef04db62f771c61bea9c1221" @@ -3113,11 +2000,6 @@ assert-plus@^1.0.0: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== -ast-types-flow@^0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad" - integrity sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag== - astral-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" @@ -3148,22 +2030,12 @@ atomically@^1.7.0: resolved "https://registry.yarnpkg.com/atomically/-/atomically-1.7.0.tgz#c07a0458432ea6dbc9a3506fffa424b48bccaafe" integrity sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w== -autoprefixer@^10.4.7: - version "10.4.8" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.8.tgz#92c7a0199e1cfb2ad5d9427bd585a3d75895b9e5" - integrity sha512-75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw== +axios@^0.22: + version "0.22.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.22.0.tgz#bf702c41fb50fbca4539589d839a077117b79b25" + integrity sha512-Z0U3uhqQeg1oNcihswf4ZD57O3NrR1+ZXhxaROaWpDmsDTx7T2HNBV2ulBtie2hwJptu8UvgnJoK+BIqdzh/1w== dependencies: - browserslist "^4.21.3" - caniuse-lite "^1.0.30001373" - fraction.js "^4.2.0" - normalize-range "^0.1.2" - picocolors "^1.0.0" - postcss-value-parser "^4.2.0" - -axe-core@^4.4.3: - version "4.4.3" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.3.tgz#11c74d23d5013c0fa5d183796729bc3482bd2f6f" - integrity sha512-32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w== + follow-redirects "^1.14.4" axios@^0.24.0: version "0.24.0" @@ -3179,42 +2051,19 @@ axios@^0.26.1: dependencies: follow-redirects "^1.14.8" -axobject-query@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be" - integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA== - -babel-jest@^27.4.2, 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== +babel-jest@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.3.tgz#c1187258197c099072156a0a121c11ee1e3917d5" + integrity sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q== dependencies: - "@jest/transform" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/transform" "^28.1.3" "@types/babel__core" "^7.1.14" babel-plugin-istanbul "^6.1.1" - babel-preset-jest "^27.5.1" + babel-preset-jest "^28.1.3" chalk "^4.0.0" graceful-fs "^4.2.9" slash "^3.0.0" -babel-loader@^8.2.3: - version "8.2.5" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e" - integrity sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ== - dependencies: - find-cache-dir "^3.3.1" - loader-utils "^2.0.0" - make-dir "^3.1.0" - schema-utils "^2.6.5" - -babel-plugin-dynamic-import-node@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" - integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ== - dependencies: - object.assign "^4.1.0" - 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" @@ -3226,14 +2075,14 @@ babel-plugin-istanbul@^6.1.1: istanbul-lib-instrument "^5.0.4" test-exclude "^6.0.0" -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== +babel-plugin-jest-hoist@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz#1952c4d0ea50f2d6d794353762278d1d8cca3fbe" + integrity sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" - "@types/babel__core" "^7.0.0" + "@types/babel__core" "^7.1.14" "@types/babel__traverse" "^7.0.6" babel-plugin-macros@^3.1.0: @@ -3245,40 +2094,6 @@ babel-plugin-macros@^3.1.0: cosmiconfig "^7.0.0" resolve "^1.19.0" -babel-plugin-named-asset-import@^0.3.8: - version "0.3.8" - resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz#6b7fa43c59229685368683c28bc9734f24524cc2" - integrity sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q== - -babel-plugin-polyfill-corejs2@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz#e4c31d4c89b56f3cf85b92558954c66b54bd972d" - integrity sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q== - dependencies: - "@babel/compat-data" "^7.17.7" - "@babel/helper-define-polyfill-provider" "^0.3.2" - semver "^6.1.1" - -babel-plugin-polyfill-corejs3@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz#d7e09c9a899079d71a8b670c6181af56ec19c5c7" - integrity sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.2" - core-js-compat "^3.21.0" - -babel-plugin-polyfill-regenerator@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz#8f51809b6d5883e07e71548d75966ff7635527fe" - integrity sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.2" - -babel-plugin-transform-react-remove-prop-types@^0.4.24: - version "0.4.24" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a" - integrity sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA== - babel-preset-current-node-syntax@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" @@ -3297,35 +2112,18 @@ 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.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== +babel-preset-jest@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz#5dfc20b99abed5db994406c2b9ab94c73aaa419d" + integrity sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A== dependencies: - babel-plugin-jest-hoist "^27.5.1" + babel-plugin-jest-hoist "^28.1.3" babel-preset-current-node-syntax "^1.0.0" -babel-preset-react-app@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz#ed6005a20a24f2c88521809fa9aea99903751584" - integrity sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg== - dependencies: - "@babel/core" "^7.16.0" - "@babel/plugin-proposal-class-properties" "^7.16.0" - "@babel/plugin-proposal-decorators" "^7.16.4" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.0" - "@babel/plugin-proposal-numeric-separator" "^7.16.0" - "@babel/plugin-proposal-optional-chaining" "^7.16.0" - "@babel/plugin-proposal-private-methods" "^7.16.0" - "@babel/plugin-transform-flow-strip-types" "^7.16.0" - "@babel/plugin-transform-react-display-name" "^7.16.0" - "@babel/plugin-transform-runtime" "^7.16.4" - "@babel/preset-env" "^7.16.4" - "@babel/preset-react" "^7.16.0" - "@babel/preset-typescript" "^7.16.0" - "@babel/runtime" "^7.16.3" - babel-plugin-macros "^3.1.0" - babel-plugin-transform-react-remove-prop-types "^0.4.24" +bail@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/bail/-/bail-2.0.2.tgz#d26f5cd8fe5d6f832a31517b9f7c356040ba6d5d" + integrity sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw== balanced-match@^1.0.0: version "1.0.2" @@ -3337,26 +2135,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== -batch@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" - integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw== - -bfj@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/bfj/-/bfj-7.0.2.tgz#1988ce76f3add9ac2913fd8ba47aad9e651bfbb2" - integrity sha512-+e/UqUzwmzJamNF50tBV6tZPTORow7gQ96iFow+8b562OdMpEK0BcJEq2OSPEDmAbSMBQ7PKZ87ubFkgxpYWgw== - dependencies: - bluebird "^3.5.5" - check-types "^11.1.1" - hoopy "^0.1.4" - tryer "^1.0.1" - -big.js@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" - integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== - binary-extensions@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" @@ -3381,35 +2159,7 @@ bluebird@^3.5.0, bluebird@^3.5.5: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== -body-parser@1.20.0: - version "1.20.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5" - integrity sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg== - dependencies: - bytes "3.1.2" - content-type "~1.0.4" - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - http-errors "2.0.0" - iconv-lite "0.4.24" - on-finished "2.4.1" - qs "6.10.3" - raw-body "2.5.1" - type-is "~1.6.18" - unpipe "1.0.0" - -bonjour-service@^1.0.11: - version "1.0.13" - resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.13.tgz#4ac003dc1626023252d58adf2946f57e5da450c1" - integrity sha512-LWKRU/7EqDUC9CTAQtuZl5HzBALoCYwtLhffW3et7vZMwv3bWLpJf8bRYlMD5OCcDpTfnPgNCV4yo9ZIaJGMiA== - dependencies: - array-flatten "^2.1.2" - dns-equal "^1.0.0" - fast-deep-equal "^3.1.3" - multicast-dns "^7.2.5" - -boolbase@^1.0.0, boolbase@~1.0.0: +boolbase@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== @@ -3419,20 +2169,6 @@ boolean@^3.0.1: 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" @@ -3487,20 +2223,15 @@ broccoli-plugin@^4.0.7: rimraf "^3.0.2" symlink-or-copy "^1.3.1" -browser-process-hrtime@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" - integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== - -browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.18.1, browserslist@^4.20.2, browserslist@^4.20.3, browserslist@^4.21.0, browserslist@^4.21.3: - version "4.21.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a" - integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ== +browserslist@^4.21.3: + version "4.21.4" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" + integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== dependencies: - caniuse-lite "^1.0.30001370" - electron-to-chromium "^1.4.202" + caniuse-lite "^1.0.30001400" + electron-to-chromium "^1.4.251" node-releases "^2.0.6" - update-browserslist-db "^1.0.5" + update-browserslist-db "^1.0.9" bs-logger@0.x: version "0.2.6" @@ -3534,11 +2265,16 @@ buffer-crc32@~0.2.3: resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== -buffer-equal@1.0.0, buffer-equal@^1.0.0: +buffer-equal@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" integrity sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ== +buffer-equal@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90" + integrity sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg== + buffer-fill@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" @@ -3557,25 +2293,25 @@ buffer@^5.1.0, buffer@^5.6.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@9.0.3: - version "9.0.3" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.3.tgz#6c62c493ba2b73c2af92432db4013b5a327f02b2" - integrity sha512-SfG2wnyjpUbbdtpnqDpWwklujofC6GarGpvdWrEkg9p5AD/xJmTF2buTNaqs3qtsNBEVQDDjZz9xc2GGpVyMfA== +builder-util-runtime@9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60" + integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw== dependencies: debug "^4.3.4" sax "^1.2.4" -builder-util@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.3.3.tgz#449ee57ec1ffc7e59f7a3a8a1a33d25cf5e39e43" - integrity sha512-MJZlUiq2PY5hjYv9+XNaoYdsITqvLgRDoHSFg/4nzpInbNxNjLQOolL04Zsyp+hgfcbFvMC4h0KkR1CMPHLWbA== +builder-util@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz#1880ec6da7da3fd6fa19b8bd71df7f39e8d17dd9" + integrity sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ== 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.3" + builder-util-runtime "9.1.1" chalk "^4.1.1" cross-spawn "^7.0.3" debug "^4.3.4" @@ -3588,21 +2324,6 @@ builder-util@23.3.3: stat-mode "^1.0.0" temp-file "^3.4.0" -builtin-modules@^3.1.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6" - integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw== - -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw== - -bytes@3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" - integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== - cacheable-request@^6.0.0: version "6.1.0" resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" @@ -3629,50 +2350,22 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -camel-case@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" - integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw== - dependencies: - pascal-case "^3.1.2" - tslib "^2.0.3" - -camelcase-css@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" - integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA== - 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== -camelcase@^6.2.0, camelcase@^6.2.1: +camelcase@^6.2.0: version "6.3.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-api@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" - integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw== - dependencies: - browserslist "^4.0.0" - caniuse-lite "^1.0.0" - lodash.memoize "^4.1.2" - lodash.uniq "^4.5.0" +caniuse-lite@^1.0.30001400: + version "1.0.30001419" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001419.tgz#3542722d57d567c8210d5e4d0f9f17336b776457" + integrity sha512-aFO1r+g6R7TW+PNQxKzjITwLOyDhVRLjW0LcwS/HCZGUUKTGNp9+IwLC4xyDSZBygVL/mxaFR3HIV6wEKQuSzw== -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001370, caniuse-lite@^1.0.30001373: - version "1.0.30001375" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001375.tgz#8e73bc3d1a4c800beb39f3163bf0190d7e5d7672" - integrity sha512-kWIMkNzLYxSvnjy0hL8w1NOaWNr2rn39RTAVyIwcw8juu60bZDWiF1/loOYANzjtJmy6qPgNmn38ro5Pygagdw== - -case-sensitive-paths-webpack-plugin@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4" - integrity sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw== - -chalk@^2.0.0, chalk@^2.4.1: +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== @@ -3689,7 +2382,7 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: +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== @@ -3702,21 +2395,16 @@ char-regex@^1.0.2: resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== -char-regex@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-2.0.1.tgz#6dafdb25f9d3349914079f010ba8d0e6ff9cd01e" - integrity sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw== +character-entities@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.2.tgz#2d09c2e72cd9523076ccb21157dff66ad43fcc22" + integrity sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ== check-disk-space@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/check-disk-space/-/check-disk-space-3.3.1.tgz#10c4c8706fdd16d3e5c3572a16aa95efd0b4d40b" integrity sha512-iOrT8yCZjSnyNZ43476FE2rnssvgw5hnuwOM0hm8Nj1qa0v4ieUUEbCyxxsEliaoDUb/75yCOL71zkDiDBLbMQ== -check-types@^11.1.1: - version "11.1.2" - resolved "https://registry.yarnpkg.com/check-types/-/check-types-11.1.2.tgz#86a7c12bf5539f6324eb0e70ca8896c0e38f3e2f" - integrity sha512-tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ== - cheerio-select@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-2.1.0.tgz#4d8673286b8126ca2a8e42740d5e3c4884ae21b4" @@ -3729,7 +2417,7 @@ cheerio-select@^2.1.0: domhandler "^5.0.3" domutils "^3.0.1" -cheerio@^1.0.0-rc.2: +cheerio@^1.0.0-rc.12, cheerio@^1.0.0-rc.2: version "1.0.0-rc.12" resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.12.tgz#788bf7466506b1c6bf5fae51d24a2c4d62e47683" integrity sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q== @@ -3742,7 +2430,7 @@ cheerio@^1.0.0-rc.2: parse5 "^7.0.0" parse5-htmlparser2-tree-adapter "^7.0.0" -chokidar@^3.4.2, chokidar@^3.5.3: +"chokidar@>=3.0.0 <4.0.0": version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -3762,47 +2450,25 @@ chownr@^2.0.0: resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== -chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== - 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 sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== -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.2" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.2.tgz#6d2967ffa407466481c6c90b6e16b3098f080128" - integrity sha512-xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg== + version "3.5.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz#bfac2a29263de4c829d806b1ab478e35091e171f" + integrity sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw== cjs-module-lexer@^1.0.0: 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== -classnames@*, classnames@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" - integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== - -clean-css@^5.2.2: - version "5.3.1" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.1.tgz#d0610b0b90d125196a2894d35366f734e5d7aa32" - integrity sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg== - dependencies: - source-map "~0.6.0" - -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== +classnames@*, classnames@^2.2.5, classnames@^2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924" + integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw== cli-truncate@^2.1.0: version "2.1.0" @@ -3812,13 +2478,13 @@ cli-truncate@^2.1.0: 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== +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== dependencies: string-width "^4.2.0" - strip-ansi "^6.0.0" + strip-ansi "^6.0.1" wrap-ansi "^7.0.0" clone-buffer@^1.0.0: @@ -3838,7 +2504,7 @@ clone-stats@^1.0.0: resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" integrity sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag== -clone@^2.1.1: +clone@^2.1.1, clone@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== @@ -3862,15 +2528,6 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== -coa@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" - integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA== - dependencies: - "@types/q" "^1.5.1" - chalk "^2.4.1" - q "^1.1.2" - collect-v8-coverage@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" @@ -3895,21 +2552,11 @@ color-name@1.1.3: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== -color-name@^1.1.4, color-name@~1.1.4: +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== -colord@^2.9.1: - version "2.9.3" - resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43" - integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw== - -colorette@^2.0.10: - version "2.0.19" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" - integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== - colors@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" @@ -3927,6 +2574,11 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" +comma-separated-tokens@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz#4e89c9458acb61bc8fef19f4529973b2392839ee" + integrity sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg== + commander@2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" @@ -3934,71 +2586,21 @@ commander@2.9.0: dependencies: graceful-readlink ">= 1.0.0" -commander@^2.15.1, commander@^2.20.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - 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== -commander@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== - -commander@^8.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" - integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== - -commander@~9.3.0: - version "9.3.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-9.3.0.tgz#f619114a5a2d2054e0d9ff1b31d5ccf89255e26b" - integrity sha512-hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw== - -common-path-prefix@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0" - integrity sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w== - -common-tags@^1.8.0: - version "1.8.2" - resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6" - integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA== - -commondir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== +commander@~9.4.1: + version "9.4.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd" + integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw== compare-version@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" integrity sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A== -compressible@~2.0.16: - version "2.0.18" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" - integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== - dependencies: - mime-db ">= 1.43.0 < 2" - -compression@^1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" - integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== - dependencies: - accepts "~1.3.5" - bytes "3.0.0" - compressible "~2.0.16" - debug "2.6.9" - on-headers "~1.0.2" - safe-buffer "5.1.2" - vary "~1.1.2" - concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -4038,74 +2640,15 @@ config-chain@^1.1.11: 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" - -confusing-browser-globals@^1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81" - integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA== - -connect-history-api-fallback@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8" - integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA== - -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== - convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" - integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== - dependencies: - safe-buffer "~5.1.1" + version "1.9.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" + integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== - -cookie@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" - integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== - -core-js-compat@^3.21.0, core-js-compat@^3.22.1: - version "3.24.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.24.1.tgz#d1af84a17e18dfdd401ee39da9996f9a7ba887de" - integrity sha512-XhdNAGeRnTpp8xbD+sR/HFDK9CbeeeqXT6TuofXh3urqEevzkWmLRgrVoykodsw8okqo2pu1BOmuCKrHx63zdw== - dependencies: - browserslist "^4.21.3" - semver "7.0.0" - -core-js-pure@^3.20.2, core-js-pure@^3.8.1: - version "3.24.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.24.1.tgz#8839dde5da545521bf282feb7dc6d0b425f39fd3" - integrity sha512-r1nJk41QLLPyozHUUPmILCEMtMw24NG4oWK6RbsDdjzQgg9ZvrUsPBj1MnG0wXXp1DCDU6j+wUvEmBSrtRbLXg== - -core-js@^3.19.2: - version "3.24.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.24.1.tgz#cf7724d41724154010a6576b7b57d94c5d66e64f" - integrity sha512-0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg== +core-js-pure@^3.25.1: + version "3.25.5" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.25.5.tgz#79716ba54240c6aa9ceba6eee08cf79471ba184d" + integrity sha512-oml3M22pHM+igfWHDfdLVq2ShWmjM2V4L+dQEBs0DWVIqEm9WHCwGAlZ6BmyBQGy5sFrJmcx+856D9lVKyGWYg== core-util-is@1.0.2: version "1.0.2" @@ -4117,18 +2660,7 @@ core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== -cosmiconfig@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" - integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg== - dependencies: - "@types/parse-json" "^4.0.0" - import-fresh "^3.1.0" - parse-json "^5.0.0" - path-type "^4.0.0" - yaml "^1.7.2" - -cosmiconfig@^7.0.0: +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== @@ -4167,87 +2699,6 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: 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== - -css-blank-pseudo@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz#36523b01c12a25d812df343a32c322d2a2324561" - integrity sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ== - dependencies: - postcss-selector-parser "^6.0.9" - -css-declaration-sorter@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz#72ebd995c8f4532ff0036631f7365cce9759df14" - integrity sha512-OGT677UGHJTAVMRhPO+HJ4oKln3wkBTwtDFH0ojbqm+MJm6xuDMHp2nkhh/ThaBqq20IbraBQSWKfSLNHQO9Og== - -css-has-pseudo@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz#57f6be91ca242d5c9020ee3e51bbb5b89fc7af73" - integrity sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw== - dependencies: - postcss-selector-parser "^6.0.9" - -css-loader@^6.5.1: - version "6.7.1" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.1.tgz#e98106f154f6e1baf3fc3bc455cb9981c1d5fd2e" - integrity sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw== - dependencies: - icss-utils "^5.1.0" - postcss "^8.4.7" - postcss-modules-extract-imports "^3.0.0" - postcss-modules-local-by-default "^4.0.0" - postcss-modules-scope "^3.0.0" - postcss-modules-values "^4.0.0" - postcss-value-parser "^4.2.0" - semver "^7.3.5" - -css-minimizer-webpack-plugin@^3.2.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz#ab78f781ced9181992fe7b6e4f3422e76429878f" - integrity sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q== - dependencies: - cssnano "^5.0.6" - jest-worker "^27.0.2" - postcss "^8.3.5" - schema-utils "^4.0.0" - serialize-javascript "^6.0.0" - source-map "^0.6.1" - -css-prefers-color-scheme@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz#ca8a22e5992c10a5b9d315155e7caee625903349" - integrity sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA== - -css-select-base-adapter@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" - integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w== - -css-select@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" - integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ== - dependencies: - boolbase "^1.0.0" - css-what "^3.2.1" - domutils "^1.7.0" - nth-check "^1.0.2" - -css-select@^4.1.3: - version "4.3.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b" - integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ== - dependencies: - boolbase "^1.0.0" - css-what "^6.0.1" - domhandler "^4.3.1" - domutils "^2.8.0" - nth-check "^2.0.1" - css-select@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6" @@ -4259,28 +2710,12 @@ css-select@^5.1.0: domutils "^3.0.1" nth-check "^2.0.1" -css-tree@1.0.0-alpha.37: - version "1.0.0-alpha.37" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" - integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg== - dependencies: - mdn-data "2.0.4" - source-map "^0.6.1" +css-unit-converter@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.2.tgz#4c77f5a1954e6dbff60695ecb214e3270436ab21" + integrity sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA== -css-tree@^1.1.2, css-tree@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" - integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== - dependencies: - mdn-data "2.0.14" - source-map "^0.6.1" - -css-what@^3.2.1: - version "3.4.2" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" - integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== - -css-what@^6.0.1, css-what@^6.1.0: +css-what@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== @@ -4290,107 +2725,71 @@ css.escape@^1.5.1: resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb" integrity sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg== -cssdb@^6.6.3: - version "6.6.3" - resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-6.6.3.tgz#1f331a2fab30c18d9f087301e6122a878bb1e505" - integrity sha512-7GDvDSmE+20+WcSMhP17Q1EVWUrLlbxxpMDqG731n8P99JhnQZHR9YvtjPvEHfjFUjvQJvdpKCjlKOX+xe4UVA== +csstype@^3.0.2, csstype@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9" + integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw== -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== - -cssnano-preset-default@^5.2.12: - version "5.2.12" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.12.tgz#ebe6596ec7030e62c3eb2b3c09f533c0644a9a97" - integrity sha512-OyCBTZi+PXgylz9HAA5kHyoYhfGcYdwFmyaJzWnzxuGRtnMw/kR6ilW9XzlzlRAtB6PLT/r+prYgkef7hngFew== +d3-array@2, d3-array@^2.3.0: + version "2.12.1" + resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.12.1.tgz#e20b41aafcdffdf5d50928004ececf815a465e81" + integrity sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ== dependencies: - css-declaration-sorter "^6.3.0" - cssnano-utils "^3.1.0" - postcss-calc "^8.2.3" - postcss-colormin "^5.3.0" - postcss-convert-values "^5.1.2" - postcss-discard-comments "^5.1.2" - postcss-discard-duplicates "^5.1.0" - postcss-discard-empty "^5.1.1" - postcss-discard-overridden "^5.1.0" - postcss-merge-longhand "^5.1.6" - postcss-merge-rules "^5.1.2" - postcss-minify-font-values "^5.1.0" - postcss-minify-gradients "^5.1.1" - postcss-minify-params "^5.1.3" - postcss-minify-selectors "^5.2.1" - postcss-normalize-charset "^5.1.0" - postcss-normalize-display-values "^5.1.0" - postcss-normalize-positions "^5.1.1" - postcss-normalize-repeat-style "^5.1.1" - postcss-normalize-string "^5.1.0" - postcss-normalize-timing-functions "^5.1.0" - postcss-normalize-unicode "^5.1.0" - postcss-normalize-url "^5.1.0" - postcss-normalize-whitespace "^5.1.1" - postcss-ordered-values "^5.1.3" - postcss-reduce-initial "^5.1.0" - postcss-reduce-transforms "^5.1.0" - postcss-svgo "^5.1.0" - postcss-unique-selectors "^5.1.1" + internmap "^1.0.0" -cssnano-utils@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861" - integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA== - -cssnano@^5.0.6: - version "5.1.12" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.12.tgz#bcd0b64d6be8692de79332c501daa7ece969816c" - integrity sha512-TgvArbEZu0lk/dvg2ja+B7kYoD7BBCmn3+k58xD0qjrGHsFzXY/wKTo9M5egcUCabPol05e/PVoIu79s2JN4WQ== - dependencies: - cssnano-preset-default "^5.2.12" - lilconfig "^2.0.3" - yaml "^1.10.2" - -csso@^4.0.2, csso@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" - integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== - dependencies: - css-tree "^1.1.2" - -cssom@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" - integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== - -cssom@~0.3.6: - version "0.3.8" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" - integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== - -cssstyle@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" - integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== - dependencies: - cssom "~0.3.6" - -csstype@^3.0.2, csstype@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2" - integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA== - -damerau-levenshtein@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7" - integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA== - -data-urls@^2.0.0: +"d3-color@1 - 2": version "2.0.0" - resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" - integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== + resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-2.0.0.tgz#8d625cab42ed9b8f601a1760a389f7ea9189d62e" + integrity sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ== + +"d3-format@1 - 2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-2.0.0.tgz#a10bcc0f986c372b729ba447382413aabf5b0767" + integrity sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA== + +"d3-interpolate@1.2.0 - 2", d3-interpolate@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-2.0.1.tgz#98be499cfb8a3b94d4ff616900501a64abc91163" + integrity sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ== dependencies: - abab "^2.0.3" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.0.0" + d3-color "1 - 2" + +"d3-path@1 - 2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-2.0.0.tgz#55d86ac131a0548adae241eebfb56b4582dd09d8" + integrity sha512-ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA== + +d3-scale@^3.0.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-3.3.0.tgz#28c600b29f47e5b9cd2df9749c206727966203f3" + integrity sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ== + dependencies: + d3-array "^2.3.0" + d3-format "1 - 2" + d3-interpolate "1.2.0 - 2" + d3-time "^2.1.1" + d3-time-format "2 - 3" + +d3-shape@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-2.1.0.tgz#3b6a82ccafbc45de55b57fcf956c584ded3b666f" + integrity sha512-PnjUqfM2PpskbSLTJvAzp2Wv4CZsnAgTfcVRTwW03QR3MkXF8Uo7B1y/lWkAsmbKwuecto++4NlsYcvYpXpTHA== + dependencies: + d3-path "1 - 2" + +"d3-time-format@2 - 3": + version "3.0.0" + resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-3.0.0.tgz#df8056c83659e01f20ac5da5fdeae7c08d5f1bb6" + integrity sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag== + dependencies: + d3-time "1 - 2" + +"d3-time@1 - 2", d3-time@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-2.1.1.tgz#e9d8a8a88691f4548e68ca085e5ff956724a6682" + integrity sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ== + dependencies: + d3-array "2" de-indent@^1.0.2: version "1.0.2" @@ -4404,20 +2803,20 @@ debounce-fn@^4.0.0: dependencies: mimic-fn "^3.0.0" -debug@2.6.9, debug@^2.2.0, debug@^2.6.0, 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, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: +debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: 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.2.0, 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@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" @@ -4425,10 +2824,17 @@ debug@^3.2.7: dependencies: ms "^2.1.1" -decimal.js@^10.2.1: - version "10.3.1" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" - integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== +decimal.js-light@^2.4.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/decimal.js-light/-/decimal.js-light-2.5.1.tgz#134fd32508f19e208f4fb2f8dac0d2626a867934" + integrity sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg== + +decode-named-character-reference@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz#daabac9690874c394c81e4162a0304b35d824f0e" + integrity sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg== + dependencies: + character-entities "^2.0.0" decompress-response@^3.3.0: version "3.3.0" @@ -4442,12 +2848,7 @@ dedent@^0.7.0: resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA== -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: +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== @@ -4457,23 +2858,11 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -default-gateway@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" - integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg== - dependencies: - execa "^5.0.0" - 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-lazy-prop@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" - integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== - define-properties@^1.1.3, define-properties@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" @@ -4482,30 +2871,20 @@ define-properties@^1.1.3, define-properties@^1.1.4: has-property-descriptors "^1.0.0" object-keys "^1.1.1" -defined@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" - integrity sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ== - delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== -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== +dequal@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be" + integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA== -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== - -destroy@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" - integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== +detect-indent@~6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd" + integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA== detect-newline@^3.0.0: version "3.1.0" @@ -4517,28 +2896,6 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -detect-port-alt@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275" - integrity sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q== - dependencies: - address "^1.0.1" - debug "^2.6.0" - -detective@^5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.1.tgz#6af01eeda11015acb0e73f933242b70f24f91034" - integrity sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw== - dependencies: - acorn-node "^1.8.2" - defined "^1.0.0" - minimist "^1.2.6" - -didyoumean@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" - integrity sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw== - diff-sequences@^27.5.1: version "27.5.1" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327" @@ -4549,6 +2906,16 @@ diff-sequences@^28.1.1: resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-28.1.1.tgz#9989dc731266dc2903457a70e996f3a041913ac6" integrity sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw== +diff-sequences@^29.0.0: + version "29.0.0" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.0.0.tgz#bae49972ef3933556bcb0800b72e8579d19d9e4f" + integrity sha512-7Qe/zd1wxSDL4D/X/FPjOMB+ZMDt71W94KYaq05I2l0oQqgXgs7s4ftYYmV38gBSrPz2vcygxfs1xn0FT+rKNA== + +diff@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40" + integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw== + dir-compare@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631" @@ -4582,19 +2949,14 @@ discord-rich-presence-typescript@^0.0.8: optionalDependencies: register-scheme "github:devsnek/node-register-scheme" -dlv@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" - integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA== - -dmg-builder@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.3.3.tgz#b37547f8403c3e9f7c60265a93d902f5b0c395ea" - integrity sha512-ECwAjt+ZWyOvddrkDx1xRD6IVUCZb5SV6vSMHZd+Va3G2sUXHrnglR1cGDKRF4oYRQm8SYVrpLZKbi8npyDcAQ== +dmg-builder@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948" + integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA== dependencies: - app-builder-lib "23.3.3" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + app-builder-lib "23.6.0" + builder-util "23.6.0" + builder-util-runtime "9.1.1" fs-extra "^10.0.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" @@ -4615,17 +2977,10 @@ dmg-license@^1.0.11: smart-buffer "^4.0.2" verror "^1.10.0" -dns-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" - integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg== - -dns-packet@^5.2.2: - version "5.4.0" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.4.0.tgz#1f88477cf9f27e78a213fb6d118ae38e759a879b" - integrity sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g== - dependencies: - "@leichtgewicht/ip-codec" "^2.0.1" +docopt@~0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz#b28e9e2220da5ec49f7ea5bb24a47787405eeb11" + integrity sha512-NqTbaYeE4gA/wU1hdKFdU+AFahpDOpgGLzHP42k6H6DKExJd0A55KEVWYhL9FEmHmgeLvEU2vuKXDuU+4yToOw== doctrine@^2.1.0: version "2.1.0" @@ -4646,12 +3001,12 @@ dom-accessibility-api@^0.5.6, dom-accessibility-api@^0.5.9: resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.14.tgz#56082f71b1dc7aac69d83c4285eef39c15d93f56" integrity sha512-NMt+m9zFMPZe0JcY9gN224Qvk6qLIdqex29clBvc/y75ZBX9YA9wNK3frsYvu2DI1xcCIwxwnX+TlsJ2DSOADg== -dom-converter@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" - integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA== +dom-helpers@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8" + integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA== dependencies: - utila "~0.4" + "@babel/runtime" "^7.1.2" dom-helpers@^5.0.1: version "5.2.1" @@ -4661,23 +3016,6 @@ dom-helpers@^5.0.1: "@babel/runtime" "^7.8.7" csstype "^3.0.2" -dom-serializer@0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" - integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== - dependencies: - domelementtype "^2.0.1" - entities "^2.0.0" - -dom-serializer@^1.0.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30" - integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag== - dependencies: - domelementtype "^2.0.1" - domhandler "^4.2.0" - entities "^2.0.0" - dom-serializer@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" @@ -4687,30 +3025,11 @@ dom-serializer@^2.0.0: domhandler "^5.0.2" entities "^4.2.0" -domelementtype@1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" - integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== - -domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0: +domelementtype@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== -domexception@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" - integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== - dependencies: - webidl-conversions "^5.0.0" - -domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" - integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== - dependencies: - domelementtype "^2.2.0" - domhandler@^5.0.1, domhandler@^5.0.2, domhandler@^5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" @@ -4718,23 +3037,6 @@ domhandler@^5.0.1, domhandler@^5.0.2, domhandler@^5.0.3: dependencies: domelementtype "^2.3.0" -domutils@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" - integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== - dependencies: - dom-serializer "0" - domelementtype "1" - -domutils@^2.5.2, 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" - domutils@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c" @@ -4744,20 +3046,14 @@ domutils@^3.0.1: domelementtype "^2.3.0" domhandler "^5.0.1" -dot-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" - integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== +dot-json@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/dot-json/-/dot-json-1.2.2.tgz#7d35abece4aa22aa75a761388953f98495401bcc" + integrity sha512-AKL+GsO4wSEU4LU+fAk/PqN4nQ6PB1vT3HpMiZous9xCzK5S0kh4DzfUY0EfU67jsIXLlu0ty71659N9Nmg+Tw== dependencies: - no-case "^3.0.4" - tslib "^2.0.3" - -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" + detect-indent "~6.0.0" + docopt "~0.6.2" + underscore-keypath "~0.0.22" dot-prop@^6.0.1: version "6.0.1" @@ -4771,11 +3067,6 @@ dotenv-expand@^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@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" - integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== - dotenv@^9.0.2: version "9.0.2" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" @@ -4786,11 +3077,6 @@ duplexer3@^0.1.4: resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e" integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA== -duplexer@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" - integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== - duplexify@^3.6.0: version "3.7.1" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" @@ -4801,12 +3087,7 @@ duplexify@^3.6.0: readable-stream "^2.0.0" stream-shift "^1.0.0" -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== - -ejs@^3.1.6, ejs@^3.1.7: +ejs@^3.1.7: version "3.1.8" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ== @@ -4814,22 +3095,22 @@ ejs@^3.1.6, ejs@^3.1.7: jake "^10.8.5" electron-builder@^23.1.0: - version "23.3.3" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.3.3.tgz#88d4e584a99b9e36ca4e8432b1163a1ef877355f" - integrity sha512-mFYYdhoFPKevP6y5uaaF3dusmB2OtQ/HnwwpyOePeU7QDS0SEIAUokQsHUanAiJAZcBqtY7iyLBgX18QybdFFw== + version "23.6.0" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz#c79050cbdce90ed96c5feb67c34e9e0a21b5331b" + integrity sha512-y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw== dependencies: "@types/yargs" "^17.0.1" - app-builder-lib "23.3.3" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + app-builder-lib "23.6.0" + builder-util "23.6.0" + builder-util-runtime "9.1.1" chalk "^4.1.1" - dmg-builder "23.3.3" + dmg-builder "23.6.0" 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" + simple-update-notifier "^1.0.7" + yargs "^17.5.1" electron-devtools-installer@^3.2.0: version "3.2.0" @@ -4853,14 +3134,14 @@ electron-osx-sign@^0.6.0: minimist "^1.2.0" plist "^3.0.1" -electron-publish@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.3.3.tgz#c4125fbb00620acb854f6e994fd3ab3115662ddd" - integrity sha512-1dX17eE5xVXedTxjC+gjsP74oC0+sIHgqysp0ryTlF9+yfQUyXjBk6kcK+zhtBA2SsHMSglDtM+JPxDD/WpPTQ== +electron-publish@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz#ac9b469e0b07752eb89357dd660e5fb10b3d1ce9" + integrity sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + builder-util "23.6.0" + builder-util-runtime "9.1.1" chalk "^4.1.1" fs-extra "^10.0.0" lazy-val "^1.0.5" @@ -4874,18 +3155,18 @@ electron-store@^8.0.1: conf "^10.2.0" type-fest "^2.17.0" -electron-to-chromium@^1.4.202: - version "1.4.215" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.215.tgz#553372e74bde3164290d61f6792f93e443b16733" - integrity sha512-vqZxT8C5mlDZ//hQFhneHmOLnj1LhbzxV0+I1yqHV8SB1Oo4Y5Ne9+qQhwHl7O1s9s9cRuo2l5CoLEHdhMTwZg== +electron-to-chromium@^1.4.251: + version "1.4.281" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.281.tgz#8e3c7b6ae65d91aa3e8aa84faa6353e3dc758971" + integrity sha512-yer0w5wCYdFoZytfmbNhwiGI/3cW06+RV7E23ln4490DVMxs7PvYpbsrSmAiBn/V6gode8wvJlST2YfWgvzWIg== electron-updater@^5.0.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-5.2.1.tgz#297795e6e8ad9179c7ae2738a7b67cf0a5022be1" - integrity sha512-OQZVIvqcK8j03HjT07uVPgvguP/r8RY2wZcwCM26+fcDOjtrm01Dfz3G8Eru+69znbrR+F9pDzr98ewMavBrWQ== + version "5.3.0" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-5.3.0.tgz#3ba0d20407911a2edc5a68bee45c5aa2023e9ff8" + integrity sha512-iKEr7yQBcvnQUPnSDYGSWC9t0eF2YbZWeYYYZzYxdl+HiRejXFENjYMnYjoOm2zxyD6Cr2JTHZhp9pqxiXuCOw== dependencies: "@types/semver" "^7.3.6" - builder-util-runtime "9.0.3" + builder-util-runtime "9.1.1" fs-extra "^10.0.0" js-yaml "^4.1.0" lazy-val "^1.0.5" @@ -4894,10 +3175,10 @@ electron-updater@^5.0.1: semver "^7.3.5" typed-emitter "^2.1.0" -electron@^20.0.1: - version "20.0.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-20.0.2.tgz#5a610b07192a03979f83a35b9b9d1568a7f08c93" - integrity sha512-Op4nxSyXH0tXjhvWC+WDn9EI0gep5etPccainxu1A4wes+ZFQBMCBXxibotanJfG+WNW4RaOv88NArwHIsSmPw== +electron@^21.2.1: + version "21.2.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-21.2.1.tgz#a6bbf4fee7ed985c739cc0d87fbef0ea4559da57" + integrity sha512-RLuFstGpHk1wtCRm9Kd+mhLjHZ5+m83+GQ/CsVl06OT7ikCT68yXMEgPmSkgmN5WjzlorsK6H5hIk9Sf6P/7Lg== dependencies: "@electron/get" "^1.14.1" "@types/node" "^16.11.26" @@ -4908,27 +3189,12 @@ emittery@^0.10.2: resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933" integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw== -emittery@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860" - integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg== - 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== -emoji-regex@^9.2.2: - version "9.2.2" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" - integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== - -emojis-list@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" - integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== - -encodeurl@^1.0.2, encodeurl@~1.0.2: +encodeurl@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== @@ -4940,28 +3206,15 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: dependencies: once "^1.4.0" -enhanced-resolve@^5.10.0: - version "5.10.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6" - integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ== - dependencies: - graceful-fs "^4.2.4" - tapable "^2.2.0" - ensure-posix-path@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz#3c62bdb19fa4681544289edb2b382adc029179ce" integrity sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw== -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@^4.2.0, entities@^4.3.0: - version "4.3.1" - resolved "https://registry.yarnpkg.com/entities/-/entities-4.3.1.tgz#c34062a94c865c322f9d67b4384e4169bcede6a4" - integrity sha512-o4q/dYJlmyjP2zfnaWDUC6A3BQFmVTX+tZPezK7k0GLSU9QYCauscf5Y+qcEPzKL+EixVouYDgLQK5H9GrLpkg== +entities@^4.2.0, entities@^4.3.0, entities@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" + integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== env-paths@^2.2.0, env-paths@^2.2.1: version "2.2.1" @@ -4980,52 +3233,36 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -error-stack-parser@^2.0.6: - version "2.1.4" - resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286" - integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ== - dependencies: - stackframe "^1.3.4" - -es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5, es-abstract@^1.20.1: - version "1.20.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814" - integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA== +es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5: + version "1.20.4" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz#1d103f9f8d78d4cf0713edcd6d0ed1a46eed5861" + integrity sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" function-bind "^1.1.1" function.prototype.name "^1.1.5" - get-intrinsic "^1.1.1" + get-intrinsic "^1.1.3" get-symbol-description "^1.0.0" has "^1.0.3" has-property-descriptors "^1.0.0" has-symbols "^1.0.3" internal-slot "^1.0.3" - is-callable "^1.2.4" + is-callable "^1.2.7" is-negative-zero "^2.0.2" is-regex "^1.1.4" is-shared-array-buffer "^1.0.2" is-string "^1.0.7" is-weakref "^1.0.2" - object-inspect "^1.12.0" + object-inspect "^1.12.2" object-keys "^1.1.1" - object.assign "^4.1.2" + object.assign "^4.1.4" regexp.prototype.flags "^1.4.3" + safe-regex-test "^1.0.0" string.prototype.trimend "^1.0.5" string.prototype.trimstart "^1.0.5" unbox-primitive "^1.0.2" -es-array-method-boxes-properly@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" - integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== - -es-module-lexer@^0.9.0: - version "0.9.3" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" - integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== - es-shim-unscopables@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" @@ -5047,21 +3284,139 @@ es6-error@^4.1.1: resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== +esbuild-android-64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.10.tgz#8a59a84acbf2eca96996cadc35642cf055c494f0" + integrity sha512-UI7krF8OYO1N7JYTgLT9ML5j4+45ra3amLZKx7LO3lmLt1Ibn8t3aZbX5Pu4BjWiqDuJ3m/hsvhPhK/5Y/YpnA== + +esbuild-android-arm64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.10.tgz#f453851dc1d8c5409a38cf7613a33852faf4915d" + integrity sha512-EOt55D6xBk5O05AK8brXUbZmoFj4chM8u3riGflLa6ziEoVvNjRdD7Cnp82NHQGfSHgYR06XsPI8/sMuA/cUwg== + +esbuild-darwin-64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.10.tgz#778bd29c8186ff47b176c8af58c08cf0fb8e6b86" + integrity sha512-hbDJugTicqIm+WKZgp208d7FcXcaK8j2c0l+fqSJ3d2AzQAfjEYDRM3Z2oMeqSJ9uFxyj/muSACLdix7oTstRA== + +esbuild-darwin-arm64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.10.tgz#b30bbefb46dc3c5d4708b0435e52f6456578d6df" + integrity sha512-M1t5+Kj4IgSbYmunf2BB6EKLkWUq+XlqaFRiGOk8bmBapu9bCDrxjf4kUnWn59Dka3I27EiuHBKd1rSO4osLFQ== + +esbuild-freebsd-64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.10.tgz#ab301c5f6ded5110dbdd611140bef1a7c2e99236" + integrity sha512-KMBFMa7C8oc97nqDdoZwtDBX7gfpolkk6Bcmj6YFMrtCMVgoU/x2DI1p74DmYl7CSS6Ppa3xgemrLrr5IjIn0w== + +esbuild-freebsd-arm64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.10.tgz#a5b09b867a6ff49110f52343b6f12265db63d43f" + integrity sha512-m2KNbuCX13yQqLlbSojFMHpewbn8wW5uDS6DxRpmaZKzyq8Dbsku6hHvh2U+BcLwWY4mpgXzFUoENEf7IcioGg== + +esbuild-linux-32@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.10.tgz#5282fe9915641caf9c8070e4ba2c3e16d358f837" + integrity sha512-guXrwSYFAvNkuQ39FNeV4sNkNms1bLlA5vF1H0cazZBOLdLFIny6BhT+TUbK/hdByMQhtWQ5jI9VAmPKbVPu1w== + +esbuild-linux-64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.10.tgz#f3726e85a00149580cb19f8abfabcbb96f5d52bb" + integrity sha512-jd8XfaSJeucMpD63YNMO1JCrdJhckHWcMv6O233bL4l6ogQKQOxBYSRP/XLWP+6kVTu0obXovuckJDcA0DKtQA== + +esbuild-linux-arm64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.10.tgz#2f0056e9d5286edb0185b56655caa8c574d8dbe7" + integrity sha512-GByBi4fgkvZFTHFDYNftu1DQ1GzR23jws0oWyCfhnI7eMOe+wgwWrc78dbNk709Ivdr/evefm2PJiUBMiusS1A== + +esbuild-linux-arm@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.10.tgz#40a9270da3c8ffa32cf72e24a79883e323dff08d" + integrity sha512-6N8vThLL/Lysy9y4Ex8XoLQAlbZKUyExCWyayGi2KgTBelKpPgj6RZnUaKri0dHNPGgReJriKVU6+KDGQwn10A== + +esbuild-linux-mips64le@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.10.tgz#90ce1c4ee0202edb4ac69807dea77f7e5804abc4" + integrity sha512-BxP+LbaGVGIdQNJUNF7qpYjEGWb0YyHVSKqYKrn+pTwH/SiHUxFyJYSP3pqkku61olQiSBnSmWZ+YUpj78Tw7Q== + +esbuild-linux-ppc64le@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.10.tgz#782837ae7bd5b279178106c9dd801755a21fabdf" + integrity sha512-LoSQCd6498PmninNgqd/BR7z3Bsk/mabImBWuQ4wQgmQEeanzWd5BQU2aNi9mBURCLgyheuZS6Xhrw5luw3OkQ== + +esbuild-linux-riscv64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.10.tgz#d7420d806ece5174f24f4634303146f915ab4207" + integrity sha512-Lrl9Cr2YROvPV4wmZ1/g48httE8z/5SCiXIyebiB5N8VT7pX3t6meI7TQVHw/wQpqP/AF4SksDuFImPTM7Z32Q== + +esbuild-linux-s390x@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.10.tgz#21fdf0cb3494a7fb520a71934e4dffce67fe47be" + integrity sha512-ReP+6q3eLVVP2lpRrvl5EodKX7EZ1bS1/z5j6hsluAlZP5aHhk6ghT6Cq3IANvvDdscMMCB4QEbI+AjtvoOFpA== + +esbuild-netbsd-64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.10.tgz#6c06b3107e3df53de381e6299184d4597db0440f" + integrity sha512-iGDYtJCMCqldMskQ4eIV+QSS/CuT7xyy9i2/FjpKvxAuCzrESZXiA1L64YNj6/afuzfBe9i8m/uDkFHy257hTw== + +esbuild-openbsd-64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.10.tgz#4daef5f5d8e74bbda53b65160029445d582570cf" + integrity sha512-ftMMIwHWrnrYnvuJQRJs/Smlcb28F9ICGde/P3FUTCgDDM0N7WA0o9uOR38f5Xe2/OhNCgkjNeb7QeaE3cyWkQ== + +esbuild-sunos-64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.10.tgz#5fe7bef267a02f322fd249a8214d0274937388a7" + integrity sha512-mf7hBL9Uo2gcy2r3rUFMjVpTaGpFJJE5QTDDqUFf1632FxteYANffDZmKbqX0PfeQ2XjUDE604IcE7OJeoHiyg== + +esbuild-windows-32@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.10.tgz#48e3dde25ab0135579a288b30ab6ddef6d1f0b28" + integrity sha512-ttFVo+Cg8b5+qHmZHbEc8Vl17kCleHhLzgT8X04y8zudEApo0PxPg9Mz8Z2cKH1bCYlve1XL8LkyXGFjtUYeGg== + +esbuild-windows-64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.10.tgz#387a9515bef3fee502d277a5d0a2db49a4ecda05" + integrity sha512-2H0gdsyHi5x+8lbng3hLbxDWR7mKHWh5BXZGKVG830KUmXOOWFE2YKJ4tHRkejRduOGDrBvHBriYsGtmTv3ntA== + +esbuild-windows-arm64@0.15.10: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.10.tgz#5a6fcf2fa49e895949bf5495cf088ab1b43ae879" + integrity sha512-S+th4F+F8VLsHLR0zrUcG+Et4hx0RKgK1eyHc08kztmLOES8BWwMiaGdoW9hiXuzznXQ0I/Fg904MNbr11Nktw== + +esbuild@^0.15.9: + version "0.15.10" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.10.tgz#85c2f8446e9b1fe04fae68daceacba033eedbd42" + integrity sha512-N7wBhfJ/E5fzn/SpNgX+oW2RLRjwaL8Y0ezqNqhjD6w0H2p0rDuEz2FKZqpqLnO8DCaWumKe8dsC/ljvVSSxng== + optionalDependencies: + "@esbuild/android-arm" "0.15.10" + "@esbuild/linux-loong64" "0.15.10" + esbuild-android-64 "0.15.10" + esbuild-android-arm64 "0.15.10" + esbuild-darwin-64 "0.15.10" + esbuild-darwin-arm64 "0.15.10" + esbuild-freebsd-64 "0.15.10" + esbuild-freebsd-arm64 "0.15.10" + esbuild-linux-32 "0.15.10" + esbuild-linux-64 "0.15.10" + esbuild-linux-arm "0.15.10" + esbuild-linux-arm64 "0.15.10" + esbuild-linux-mips64le "0.15.10" + esbuild-linux-ppc64le "0.15.10" + esbuild-linux-riscv64 "0.15.10" + esbuild-linux-s390x "0.15.10" + esbuild-netbsd-64 "0.15.10" + esbuild-openbsd-64 "0.15.10" + esbuild-sunos-64 "0.15.10" + esbuild-windows-32 "0.15.10" + esbuild-windows-64 "0.15.10" + esbuild-windows-arm64 "0.15.10" + 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-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== - 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" @@ -5077,43 +3432,11 @@ escape-string-regexp@^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.5.0: version "8.5.0" resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1" integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q== -eslint-config-react-app@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz#73ba3929978001c5c86274c017ea57eb5fa644b4" - integrity sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA== - dependencies: - "@babel/core" "^7.16.0" - "@babel/eslint-parser" "^7.16.3" - "@rushstack/eslint-patch" "^1.1.0" - "@typescript-eslint/eslint-plugin" "^5.5.0" - "@typescript-eslint/parser" "^5.5.0" - babel-preset-react-app "^10.0.1" - confusing-browser-globals "^1.0.11" - eslint-plugin-flowtype "^8.0.3" - eslint-plugin-import "^2.25.3" - eslint-plugin-jest "^25.3.0" - eslint-plugin-jsx-a11y "^6.5.1" - eslint-plugin-react "^7.27.1" - eslint-plugin-react-hooks "^4.3.0" - eslint-plugin-testing-library "^5.0.1" - eslint-import-resolver-node@^0.3.6: version "0.3.6" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" @@ -5123,22 +3446,13 @@ eslint-import-resolver-node@^0.3.6: resolve "^1.20.0" eslint-module-utils@^2.7.3: - version "2.7.3" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee" - integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ== + version "2.7.4" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974" + integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA== dependencies: debug "^3.2.7" - find-up "^2.1.0" -eslint-plugin-flowtype@^8.0.3: - version "8.0.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz#e1557e37118f24734aa3122e7536a038d34a4912" - integrity sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ== - dependencies: - lodash "^4.17.21" - string-natural-compare "^3.0.1" - -eslint-plugin-import@^2.25.3: +eslint-plugin-import@^2.26.0: version "2.26.0" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b" integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA== @@ -5157,41 +3471,10 @@ eslint-plugin-import@^2.25.3: resolve "^1.22.0" tsconfig-paths "^3.14.1" -eslint-plugin-jest@^25.3.0: - version "25.7.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz#ff4ac97520b53a96187bad9c9814e7d00de09a6a" - integrity sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ== - dependencies: - "@typescript-eslint/experimental-utils" "^5.0.0" - -eslint-plugin-jsx-a11y@^6.5.1: - version "6.6.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz#93736fc91b83fdc38cc8d115deedfc3091aef1ff" - integrity sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q== - dependencies: - "@babel/runtime" "^7.18.9" - aria-query "^4.2.2" - array-includes "^3.1.5" - ast-types-flow "^0.0.7" - axe-core "^4.4.3" - axobject-query "^2.2.0" - damerau-levenshtein "^1.0.8" - emoji-regex "^9.2.2" - has "^1.0.3" - jsx-ast-utils "^3.3.2" - language-tags "^1.0.5" - minimatch "^3.1.2" - semver "^6.3.0" - -eslint-plugin-react-hooks@^4.3.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3" - integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g== - -eslint-plugin-react@^7.27.1, eslint-plugin-react@^7.29.4: - version "7.30.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.30.1.tgz#2be4ab23ce09b5949c6631413ba64b2810fd3e22" - integrity sha512-NbEvI9jtqO46yJA3wcRF9Mo0lF9T/jhdHqhCHXiXtD+Zcb98812wvokjWpU7Q4QH5edo6dmqrukxVvWWXHlsUg== +eslint-plugin-react@^7.29.4: + version "7.31.10" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.10.tgz#6782c2c7fe91c09e715d536067644bbb9491419a" + integrity sha512-e4N/nc6AAlg4UKW/mXeYWd3R++qUano5/o+t+wnWxIf+bLsOaH3a4q74kX3nDjYym3VBN4HyO9nEn1GcAqgQOA== dependencies: array-includes "^3.1.5" array.prototype.flatmap "^1.3.0" @@ -5208,14 +3491,7 @@ eslint-plugin-react@^7.27.1, eslint-plugin-react@^7.29.4: semver "^6.3.0" string.prototype.matchall "^4.0.7" -eslint-plugin-testing-library@^5.0.1: - version "5.6.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.6.0.tgz#91e810ecb838f86decc9b5202876c87e42d73ea7" - integrity sha512-y63TRzPhGCMNsnUwMGJU1MFWc/3GvYw+nzobp9QiyNTTKsgAt5RKAOT1I34+XqVBpX1lC8bScoOjCkP7iRv0Mw== - dependencies: - "@typescript-eslint/utils" "^5.13.0" - -eslint-scope@5.1.1, eslint-scope@^5.1.1: +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== @@ -5238,7 +3514,7 @@ eslint-utils@^3.0.0: dependencies: eslint-visitor-keys "^2.0.0" -eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.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== @@ -5248,25 +3524,14 @@ eslint-visitor-keys@^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-webpack-plugin@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz#1978cdb9edc461e4b0195a20da950cf57988347c" - integrity sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w== +eslint@^8.13.0: + version "8.25.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.25.0.tgz#00eb962f50962165d0c4ee3327708315eaa8058b" + integrity sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A== dependencies: - "@types/eslint" "^7.29.0 || ^8.4.1" - jest-worker "^28.0.2" - micromatch "^4.0.5" - normalize-path "^3.0.0" - schema-utils "^4.0.0" - -eslint@^8.13.0, eslint@^8.3.0: - version "8.21.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.21.0.tgz#1940a68d7e0573cef6f50037addee295ff9be9ef" - integrity sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA== - dependencies: - "@eslint/eslintrc" "^1.3.0" - "@humanwhocodes/config-array" "^0.10.4" - "@humanwhocodes/gitignore-to-minimatch" "^1.0.2" + "@eslint/eslintrc" "^1.3.3" + "@humanwhocodes/config-array" "^0.10.5" + "@humanwhocodes/module-importer" "^1.0.1" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -5276,13 +3541,12 @@ eslint@^8.13.0, eslint@^8.3.0: eslint-scope "^7.1.1" eslint-utils "^3.0.0" eslint-visitor-keys "^3.3.0" - espree "^9.3.3" + espree "^9.4.0" esquery "^1.4.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" file-entry-cache "^6.0.1" find-up "^5.0.0" - functional-red-black-tree "^1.0.1" glob-parent "^6.0.1" globals "^13.15.0" globby "^11.1.0" @@ -5291,6 +3555,7 @@ eslint@^8.13.0, eslint@^8.3.0: import-fresh "^3.0.0" imurmurhash "^0.1.4" is-glob "^4.0.0" + js-sdsl "^4.1.4" js-yaml "^4.1.0" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" @@ -5302,18 +3567,17 @@ eslint@^8.13.0, eslint@^8.3.0: strip-ansi "^6.0.1" strip-json-comments "^3.1.0" text-table "^0.2.0" - v8-compile-cache "^2.0.3" -espree@^9.3.2, espree@^9.3.3: - version "9.3.3" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.3.tgz#2dd37c4162bb05f433ad3c1a52ddf8a49dc08e9d" - integrity sha512-ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng== +espree@^9.4.0: + version "9.4.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a" + integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw== dependencies: acorn "^8.8.0" acorn-jsx "^5.3.2" eslint-visitor-keys "^3.3.0" -esprima@^4.0.0, esprima@^4.0.1: +esprima@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== @@ -5342,31 +3606,21 @@ estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== -estree-walker@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" - integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== +estree-walker@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" + integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== 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 sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== - -eventemitter3@^4.0.0: +eventemitter3@^4.0.1: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== -events@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" - integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== - execa@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" @@ -5402,52 +3656,27 @@ exit@^0.1.2: resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ== -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== +expect@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/expect/-/expect-28.1.3.tgz#90a7c1a124f1824133dd4533cce2d2bdcb6603ec" + integrity sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g== dependencies: - "@jest/types" "^27.5.1" - jest-get-type "^27.5.1" - jest-matcher-utils "^27.5.1" - jest-message-util "^27.5.1" + "@jest/expect-utils" "^28.1.3" + jest-get-type "^28.0.2" + jest-matcher-utils "^28.1.3" + jest-message-util "^28.1.3" + jest-util "^28.1.3" -express@^4.17.3: - version "4.18.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf" - integrity sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q== +expect@^29.0.0: + version "29.1.2" + resolved "https://registry.yarnpkg.com/expect/-/expect-29.1.2.tgz#82f8f28d7d408c7c68da3a386a490ee683e1eced" + integrity sha512-AuAGn1uxva5YBbBlXb+2JPxJRuemZsmlGcapPXWNSBNsQtAULfjioREGBWuI0EOvYUKjDnrCy8PW5Zlr1md5mw== dependencies: - accepts "~1.3.8" - array-flatten "1.1.1" - body-parser "1.20.0" - content-disposition "0.5.4" - content-type "~1.0.4" - cookie "0.5.0" - cookie-signature "1.0.6" - debug "2.6.9" - depd "2.0.0" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "1.2.0" - fresh "0.5.2" - http-errors "2.0.0" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "2.4.1" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.7" - qs "6.10.3" - range-parser "~1.2.1" - safe-buffer "5.2.1" - send "0.18.0" - serve-static "1.15.0" - setprototypeof "1.2.0" - statuses "2.0.1" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" + "@jest/expect-utils" "^29.1.2" + jest-get-type "^29.0.0" + jest-matcher-utils "^29.1.2" + jest-message-util "^29.1.2" + jest-util "^29.1.2" extend@^3.0.0: version "3.0.2" @@ -5475,10 +3704,20 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^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-glob@^3.2.11, 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== +fast-equals@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-2.0.4.tgz#3add9410585e2d7364c2deeb6a707beadb24b927" + integrity sha512-caj/ZmjHljPrZtbzJ3kfH5ia/k4mTJe/qSiXAGzxZWRZgsgDV0cvNaQULqUX8t0/JVlzzEdYOwCN5DmzTxoD4w== + +fast-fifo@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.1.0.tgz#17d1a3646880b9891dfa0c54e69c5fef33cad779" + integrity sha512-Kl29QoNbNvn4nhDsLYjyIAaIqaJB6rBx5p3sL9VjaefJ+eMFBWVZiaoguaoZfzEKr5RhAti0UgM8703akGPJ6g== + +fast-glob@^3.2.9: + version "3.2.12" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" + integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -5486,12 +3725,12 @@ fast-glob@^3.2.11, fast-glob@^3.2.9: merge2 "^1.3.0" micromatch "^4.0.4" -fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: +fast-json-stable-stringify@2.x, 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: +fast-levenshtein@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== @@ -5503,17 +3742,10 @@ fastq@^1.6.0: dependencies: reusify "^1.0.4" -faye-websocket@^0.11.3: - version "0.11.4" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" - integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== - dependencies: - websocket-driver ">=0.5.1" - fb-watchman@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" - integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c" + integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA== dependencies: bser "2.1.1" @@ -5531,14 +3763,6 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" -file-loader@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" - integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw== - dependencies: - loader-utils "^2.0.0" - schema-utils "^3.0.0" - file-uri-to-path@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" @@ -5551,7 +3775,7 @@ filelist@^1.0.1: dependencies: minimatch "^5.0.1" -filesize@^8.0.6, filesize@^8.0.7: +filesize@^8.0.7: version "8.0.7" resolved "https://registry.yarnpkg.com/filesize/-/filesize-8.0.7.tgz#695e70d80f4e47012c132d57a059e80c6b580bd8" integrity sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ== @@ -5563,40 +3787,11 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -finalhandler@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" - integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "2.4.1" - parseurl "~1.3.3" - statuses "2.0.1" - unpipe "~1.0.0" - -find-cache-dir@^3.3.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" - integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== - dependencies: - commondir "^1.0.1" - make-dir "^3.0.2" - pkg-dir "^4.1.0" - find-root@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== -find-up@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - integrity sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ== - dependencies: - locate-path "^2.0.0" - find-up@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" @@ -5629,9 +3824,9 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.1.0: - version "3.2.6" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.6.tgz#022e9218c637f9f3fc9c35ab9c9193f05add60b2" - integrity sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ== + version "3.2.7" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" + integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== flush-write-stream@^1.0.2: version "1.1.1" @@ -5641,54 +3836,16 @@ flush-write-stream@^1.0.2: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@^1.0.0, follow-redirects@^1.14.4, follow-redirects@^1.14.8: - version "1.15.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" - integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== +follow-redirects@^1.14.4, follow-redirects@^1.14.8: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== font-list@^1.4.5: version "1.4.5" resolved "https://registry.yarnpkg.com/font-list/-/font-list-1.4.5.tgz#50a621ef35e3e6195a9787fee9a9b574c460600d" integrity sha512-mLi7Sb4iitgk3mJsTZZDbixssHLoJB4/onWGlQOvTSPW8YPBDQNaMTGOdZ92axQI4UNWwPxV5FmCBOEo1Us7lg== -foreman@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/foreman/-/foreman-3.0.1.tgz#805f28afc5a4bbaf08dbb1f5018c557dcbb8a410" - integrity sha512-ek/qoM0vVKpxzkBUQN9k4Fs7l0XsHv4bqxuEW6oqIS4s0ouYKsQ19YjBzUJKTFRumFiSpUv7jySkrI6lfbhjlw== - dependencies: - commander "^2.15.1" - http-proxy "^1.17.0" - mustache "^2.2.1" - shell-quote "^1.6.1" - -fork-ts-checker-webpack-plugin@^6.5.0: - version "6.5.2" - resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.2.tgz#4f67183f2f9eb8ba7df7177ce3cf3e75cdafb340" - integrity sha512-m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA== - dependencies: - "@babel/code-frame" "^7.8.3" - "@types/json-schema" "^7.0.5" - chalk "^4.1.0" - chokidar "^3.4.2" - cosmiconfig "^6.0.0" - deepmerge "^4.2.2" - fs-extra "^9.0.0" - glob "^7.1.6" - memfs "^3.1.2" - minimatch "^3.0.4" - schema-utils "2.7.0" - semver "^7.3.2" - tapable "^1.0.0" - -form-data@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" - integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - form-data@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" @@ -5698,21 +3855,6 @@ form-data@^4.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" -forwarded@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" - integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== - -fraction.js@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" - integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA== - -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== - fs-extra@^10.0.0, fs-extra@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" @@ -5767,11 +3909,6 @@ fs-mkdirp-stream@^1.0.0: graceful-fs "^4.1.11" through2 "^2.0.3" -fs-monkey@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" - integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== - fs-tree-diff@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz#343e4745ab435ec39ebac5f9059ad919cd034afa" @@ -5808,11 +3945,6 @@ function.prototype.name@^1.1.5: es-abstract "^1.19.0" functions-have-names "^1.2.2" -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 sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g== - functions-have-names@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" @@ -5833,20 +3965,15 @@ get-caller-file@^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.2" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598" - integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA== +get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" + integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== dependencies: function-bind "^1.1.1" has "^1.0.3" has-symbols "^1.0.3" -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-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -5894,7 +4021,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" -glob-parent@^6.0.1, glob-parent@^6.0.2: +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== @@ -5917,12 +4044,7 @@ glob-stream@^6.1.0: to-absolute-glob "^2.0.0" unique-stream "^2.0.2" -glob-to-regexp@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" - integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== - -glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -5946,29 +4068,6 @@ global-agent@^3.0.0: 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-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" - 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" @@ -5998,7 +4097,7 @@ globalthis@^1.0.1: dependencies: define-properties "^1.1.3" -globby@^11.0.4, globby@^11.1.0: +globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -6027,7 +4126,7 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.8, graceful-fs@^4.2.9: +graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.8, graceful-fs@^4.2.9: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== @@ -6049,23 +4148,6 @@ gulp-sort@^2.0.0: dependencies: through2 "^2.0.1" -gzip-size@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462" - integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q== - dependencies: - duplexer "^0.1.2" - -handle-thing@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" - integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== - -harmony-reflect@^1.4.6: - version "1.6.2" - resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710" - integrity sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g== - has-bigints@^1.0.1, has-bigints@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" @@ -6088,7 +4170,7 @@ has-property-descriptors@^1.0.0: dependencies: get-intrinsic "^1.1.1" -has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3: +has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== @@ -6100,11 +4182,6 @@ has-tostringtag@^1.0.0: dependencies: has-symbols "^1.0.2" -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== - has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -6112,6 +4189,11 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" +hast-util-whitespace@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-2.0.0.tgz#4fc1086467cc1ef5ba20673cb6b03cec3a970f1c" + integrity sha512-Pkw+xBHuV6xFeJprJe2BBEoDV+AvQySaz3pPDRUs5PNZEMQjpXJJueqrpcHIXxnWTcAGi/UOCgVShlkY6kLoqg== + he@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" @@ -6141,13 +4223,6 @@ heroic-wine-downloader@^1.2.3: axios "^0.24.0" graceful-fs "^4.2.8" -history@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b" - integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ== - dependencies: - "@babel/runtime" "^7.7.6" - hoist-non-react-statics@^3.3.1: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" @@ -6155,11 +4230,6 @@ hoist-non-react-statics@^3.3.1: dependencies: react-is "^16.7.0" -hoopy@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d" - integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ== - hosted-git-info@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" @@ -6167,46 +4237,21 @@ hosted-git-info@^4.1.0: dependencies: lru-cache "^6.0.0" -hpack.js@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" - integrity sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ== +howlongtobeat@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/howlongtobeat/-/howlongtobeat-1.7.0.tgz#1f83b428511abbd0eb129c8be33a5ce51326e7bc" + integrity sha512-vISJpc8x0FRLnzbSzI3Lg8ReGu7h51FqyjGvaa+u8ZCIOPAt+m8e+ODHSll1SZE0MNYJKc1K1R0cp2r7zLBQtg== dependencies: - inherits "^2.0.1" - obuf "^1.0.0" - readable-stream "^2.0.1" - wbuf "^1.1.0" - -html-encoding-sniffer@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" - integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== - dependencies: - whatwg-encoding "^1.0.5" - -html-entities@^2.1.0, html-entities@^2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46" - integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA== + axios "^0.22" + cheerio "^1.0.0-rc.12" + fast-levenshtein "^2.0.6" + user-agents "^1.0.580" html-escaper@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -html-minifier-terser@^6.0.2: - version "6.1.0" - resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab" - integrity sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw== - dependencies: - camel-case "^4.1.2" - clean-css "^5.2.2" - commander "^8.3.0" - he "^1.2.0" - param-case "^3.0.4" - relateurl "^0.2.7" - terser "^5.10.0" - html-parse-stringify@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz#dfc1017347ce9f77c8141a507f233040c59c55d2" @@ -6214,27 +4259,6 @@ html-parse-stringify@^3.0.1: dependencies: void-elements "3.1.0" -html-webpack-plugin@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50" - integrity sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw== - dependencies: - "@types/html-minifier-terser" "^6.0.0" - html-minifier-terser "^6.0.2" - lodash "^4.17.21" - pretty-error "^4.0.0" - tapable "^2.0.0" - -htmlparser2@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" - integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A== - dependencies: - domelementtype "^2.0.1" - domhandler "^4.0.0" - domutils "^2.5.2" - entities "^2.0.0" - htmlparser2@^8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010" @@ -6250,46 +4274,6 @@ http-cache-semantics@^4.0.0: resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== -http-deceiver@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" - integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw== - -http-errors@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" - integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== - dependencies: - depd "2.0.0" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses "2.0.1" - toidentifier "1.0.1" - -http-errors@~1.6.2: - version "1.6.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" - integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" - -http-parser-js@>=0.5.1: - version "0.5.8" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3" - integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q== - -http-proxy-agent@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" - integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== - dependencies: - "@tootallnate/once" "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" @@ -6299,26 +4283,6 @@ http-proxy-agent@^5.0.0: agent-base "6" debug "4" -http-proxy-middleware@^2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f" - integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw== - dependencies: - "@types/http-proxy" "^1.17.8" - http-proxy "^1.18.1" - is-glob "^4.0.1" - is-plain-obj "^3.0.0" - micromatch "^4.0.2" - -http-proxy@^1.17.0, http-proxy@^1.18.1: - version "1.18.1" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" - integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== - dependencies: - eventemitter3 "^4.0.0" - follow-redirects "^1.0.0" - requires-port "^1.0.0" - https-proxy-agent@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" @@ -6348,22 +4312,22 @@ i18next-fs-backend@^1.1.4: integrity sha512-raTel3EfshiUXxR0gvmIoqp75jhkj8+7R1LjB006VZKPTFBbXyx6TlUVhb8Z9+7ahgpFbcQg1QWVOdf/iNzI5A== i18next-http-backend@^1.4.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-1.4.1.tgz#d8d308e7d8c5b89988446d0b83f469361e051bc0" - integrity sha512-s4Q9hK2jS29iyhniMP82z+yYY8riGTrWbnyvsSzi5TaF7Le4E7b5deTmtuaRuab9fdDcYXtcwdBgawZG+JCEjA== + version "1.4.4" + resolved "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-1.4.4.tgz#9f372f704975a5e96ce74e4247698bcbd00d148f" + integrity sha512-M4gLPe6JKZ2p1UmE6t4rzWV/sAxgrLThW7ztXAsTpFwFqXoyzhTzX8eYxVv9KjpCQh4K9nwxnEjEi+74C4Thbg== dependencies: cross-fetch "3.1.5" i18next-parser@^6.3.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/i18next-parser/-/i18next-parser-6.5.0.tgz#32ea97b5bac60106d7a42bc7d5b06c66a20f648a" - integrity sha512-sD+6QRn3pnZCLBdncOy2YZ1RTeGSJV1UxdCzgBJEllszkGfnlYCMkevQr99RK7ph4cQyjoXr2HgVqwM3dtYZiQ== + version "6.6.0" + resolved "https://registry.yarnpkg.com/i18next-parser/-/i18next-parser-6.6.0.tgz#bb47e1a85369ff6fe8144b7bb03fe505374ecac2" + integrity sha512-yA3W6PL+7epCyUFTpUDdztKArfpeGMWRUOnB/4FZRodfXkjCIBcBg728h6b/lrBTbva4OlFjVgv1kCXbvZVRWQ== dependencies: "@babel/runtime" "^7.15.4" broccoli-plugin "^4.0.7" cheerio "^1.0.0-rc.2" colors "1.4.0" - commander "~9.3.0" + commander "~9.4.1" concat-stream "~2.0.0" eol "^0.9.1" fs-extra "^10.0.0" @@ -6374,14 +4338,14 @@ i18next-parser@^6.3.0: sort-keys "^5.0.0" through2 "~4.0.2" typescript "^4.2.4" - vinyl "~2.2.1" + vinyl "~3.0.0" vinyl-fs "^3.0.2" vue-template-compiler "^2.6.11" i18next@^21.0.1, i18next@^21.2.0, i18next@^21.6.16: - version "21.9.0" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.9.0.tgz#b63ebb0d4e1b23709951ca4774dc19d2ffac9553" - integrity sha512-B+6/yd7rCpJidyPuBaEApUECx7G8Ai6+tqYhrChsY4MmQqJhG7qJ4eT6Lm1OnRhieVelEtfxh4aAQktdNVZtDA== + version "21.10.0" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.10.0.tgz#85429af55fdca4858345d0e16b584ec29520197d" + integrity sha512-YeuIBmFsGjUfO3qBmMOc0rQaun4mIpGKET5WDwvu8lU7gvwpcariZLNtL0Fzj+zazcHUrlXHiptcFhBMFaxzfg== dependencies: "@babel/runtime" "^7.17.2" @@ -6393,37 +4357,13 @@ iconv-corefoundation@^1.1.7: cli-truncate "^2.1.0" node-addon-api "^1.6.3" -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" - -iconv-lite@^0.6.2, iconv-lite@^0.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" -icss-utils@^5.0.0, icss-utils@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" - integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== - -idb@^7.0.1: - version "7.0.2" - resolved "https://registry.yarnpkg.com/idb/-/idb-7.0.2.tgz#7a067e20dd16539938e456814b7d714ba8db3892" - integrity sha512-jjKrT1EnyZewQ/gCBb/eyiYrhGzws2FeY92Yx8qT9S9GeQAmo4JFVIiWRIfKW/6Ob9A+UDAOW9j9jn58fy2HIg== - -identity-obj-proxy@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz#94d2bda96084453ef36fbc5aaec37e0f79f1fc14" - integrity sha512-00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA== - dependencies: - harmony-reflect "^1.4.6" - ieee754@^1.1.13: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" @@ -6439,12 +4379,12 @@ immediate@~3.0.5: resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ== -immer@^9.0.7: - version "9.0.15" - resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.15.tgz#0b9169e5b1d22137aba7d43f8a81a495dd1b62dc" - integrity sha512-2eB/sswms9AEUSkOm4SbV5Y7Vmt/bKRwByd52jfLkW4OLYeaTP3EEiJ9agqU0O/tq6Dk62Zfj+TJSqfm1rLVGQ== +immutable@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef" + integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ== -import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: +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== @@ -6452,11 +4392,6 @@ import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: parent-module "^1.0.0" resolve-from "^4.0.0" -import-lazy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A== - import-local@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" @@ -6483,30 +4418,25 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: +inherits@2, inherits@^2.0.1, 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== -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== - -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.5, ini@~1.3.0: +ini@^1.3.4: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== ini@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.0.tgz#2f6de95006923aa75feed8894f5686165adc08f1" - integrity sha512-TxYQaeNW/N8ymDvwAxPyRbhMBtnEwuvaTYpOQkFx1nSeusgezHniEc/l35Vo4iCq/mMiTJbpD7oYxN98hFlfmw== + version "3.0.1" + resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.1.tgz#c76ec81007875bc44d544ff7a11a55d12294102d" + integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ== + +inline-style-parser@0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1" + integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q== internal-slot@^1.0.3: version "1.0.3" @@ -6517,15 +4447,10 @@ internal-slot@^1.0.3: has "^1.0.3" side-channel "^1.0.4" -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== - -ipaddr.js@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" - integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== +internmap@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/internmap/-/internmap-1.0.1.tgz#0017cc8a3b99605f0302f2b198d272e015e5df95" + integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw== is-absolute@^1.0.0: version "1.0.0" @@ -6567,17 +4492,15 @@ is-buffer@^1.1.5: 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.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-buffer@^2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" + integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== -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-callable@^1.1.4, is-callable@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" + integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== is-ci@^3.0.0: version "3.0.1" @@ -6600,11 +4523,6 @@ is-date-object@^1.0.1: dependencies: has-tostringtag "^1.0.0" -is-docker@^2.0.0, is-docker@^2.1.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" - integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== - is-extglob@^2.1.0, is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -6634,19 +4552,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" -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-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" - integrity sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g== - is-negated-glob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2" @@ -6657,11 +4562,6 @@ is-negative-zero@^2.0.2: resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== -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-number-object@^1.0.4: version "1.0.7" resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" @@ -6674,36 +4574,16 @@ is-number@^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 sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg== - 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@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" - integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA== - is-plain-obj@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.1.0.tgz#d65025edec3657ce032fd7db63c97883eaed71f0" integrity sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg== -is-potential-custom-element-name@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" - integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== - is-regex@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" @@ -6712,11 +4592,6 @@ is-regex@^1.1.4: 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 sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA== - is-relative@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" @@ -6724,11 +4599,6 @@ is-relative@^1.0.0: dependencies: is-unc-path "^1.0.0" -is-root@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" - integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg== - is-shared-array-buffer@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" @@ -6755,11 +4625,6 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" -is-typedarray@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== - is-unc-path@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" @@ -6789,18 +4654,6 @@ is-windows@^1.0.1: resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== -is-wsl@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" - integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== - dependencies: - is-docker "^2.0.0" - -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" @@ -6829,9 +4682,9 @@ istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz#31d18bdd127f825dd02ea7bfdfd906f8ab840e9f" - integrity sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A== + version "5.2.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d" + integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg== dependencies: "@babel/core" "^7.12.3" "@babel/parser" "^7.14.7" @@ -6875,85 +4728,82 @@ jake@^10.8.5: filelist "^1.0.1" minimatch "^3.0.4" -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== +jest-changed-files@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-28.1.3.tgz#d9aeee6792be3686c47cb988a8eaf82ff4238831" + integrity sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA== dependencies: - "@jest/types" "^27.5.1" execa "^5.0.0" - throat "^6.0.1" + p-limit "^3.1.0" -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== +jest-circus@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-28.1.3.tgz#d14bd11cf8ee1a03d69902dc47b6bd4634ee00e4" + integrity sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow== dependencies: - "@jest/environment" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/environment" "^28.1.3" + "@jest/expect" "^28.1.3" + "@jest/test-result" "^28.1.3" + "@jest/types" "^28.1.3" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" - expect "^27.5.1" is-generator-fn "^2.0.0" - 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" + jest-each "^28.1.3" + jest-matcher-utils "^28.1.3" + jest-message-util "^28.1.3" + jest-runtime "^28.1.3" + jest-snapshot "^28.1.3" + jest-util "^28.1.3" + p-limit "^3.1.0" + pretty-format "^28.1.3" slash "^3.0.0" stack-utils "^2.0.3" - throat "^6.0.1" -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== +jest-cli@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-28.1.3.tgz#558b33c577d06de55087b8448d373b9f654e46b2" + integrity sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ== dependencies: - "@jest/core" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/core" "^28.1.3" + "@jest/test-result" "^28.1.3" + "@jest/types" "^28.1.3" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.9" import-local "^3.0.2" - jest-config "^27.5.1" - jest-util "^27.5.1" - jest-validate "^27.5.1" + jest-config "^28.1.3" + jest-util "^28.1.3" + jest-validate "^28.1.3" prompts "^2.0.1" - yargs "^16.2.0" + yargs "^17.3.1" -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== +jest-config@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-28.1.3.tgz#e315e1f73df3cac31447eed8b8740a477392ec60" + integrity sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ== dependencies: - "@babel/core" "^7.8.0" - "@jest/test-sequencer" "^27.5.1" - "@jest/types" "^27.5.1" - babel-jest "^27.5.1" + "@babel/core" "^7.11.6" + "@jest/test-sequencer" "^28.1.3" + "@jest/types" "^28.1.3" + babel-jest "^28.1.3" chalk "^4.0.0" ci-info "^3.2.0" deepmerge "^4.2.2" - glob "^7.1.1" + glob "^7.1.3" 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" + jest-circus "^28.1.3" + jest-environment-node "^28.1.3" + jest-get-type "^28.0.2" + jest-regex-util "^28.0.2" + jest-resolve "^28.1.3" + jest-runner "^28.1.3" + jest-util "^28.1.3" + jest-validate "^28.1.3" micromatch "^4.0.4" parse-json "^5.2.0" - pretty-format "^27.5.1" + pretty-format "^28.1.3" slash "^3.0.0" strip-json-comments "^3.1.1" @@ -6977,48 +4827,45 @@ jest-diff@^28.1.3: jest-get-type "^28.0.2" pretty-format "^28.1.3" -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== +jest-diff@^29.1.2: + version "29.1.2" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.1.2.tgz#bb7aaf5353227d6f4f96c5e7e8713ce576a607dc" + integrity sha512-4GQts0aUopVvecIT4IwD/7xsBaMhKTYoM4/njE/aVw9wpw+pIUVp8Vab/KnSzSilr84GnLBkaP3JLDnQYCKqVQ== + dependencies: + chalk "^4.0.0" + diff-sequences "^29.0.0" + jest-get-type "^29.0.0" + pretty-format "^29.1.2" + +jest-docblock@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-28.1.1.tgz#6f515c3bf841516d82ecd57a62eed9204c2f42a8" + integrity sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA== dependencies: detect-newline "^3.0.0" -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== +jest-each@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-28.1.3.tgz#bdd1516edbe2b1f3569cfdad9acd543040028f81" + integrity sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g== dependencies: - "@jest/types" "^27.5.1" + "@jest/types" "^28.1.3" chalk "^4.0.0" - jest-get-type "^27.5.1" - jest-util "^27.5.1" - pretty-format "^27.5.1" + jest-get-type "^28.0.2" + jest-util "^28.1.3" + pretty-format "^28.1.3" -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== +jest-environment-node@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-28.1.3.tgz#7e74fe40eb645b9d56c0c4b70ca4357faa349be5" + integrity sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A== dependencies: - "@jest/environment" "^27.5.1" - "@jest/fake-timers" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/environment" "^28.1.3" + "@jest/fake-timers" "^28.1.3" + "@jest/types" "^28.1.3" "@types/node" "*" - jest-mock "^27.5.1" - jest-util "^27.5.1" - jsdom "^16.6.0" - -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.5.1" - "@jest/fake-timers" "^27.5.1" - "@jest/types" "^27.5.1" - "@types/node" "*" - jest-mock "^27.5.1" - jest-util "^27.5.1" + jest-mock "^28.1.3" + jest-util "^28.1.3" jest-get-type@^27.5.1: version "27.5.1" @@ -7030,58 +4877,39 @@ jest-get-type@^28.0.2: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-28.0.2.tgz#34622e628e4fdcd793d46db8a242227901fcf203" integrity sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA== -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== +jest-get-type@^29.0.0: + version "29.0.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.0.0.tgz#843f6c50a1b778f7325df1129a0fd7aa713aef80" + integrity sha512-83X19z/HuLKYXYHskZlBAShO7UfLFXu/vWajw9ZNJASN32li8yHMaVGAQqxFW1RCFOkB7cubaL6FaJVQqqJLSw== + +jest-haste-map@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-28.1.3.tgz#abd5451129a38d9841049644f34b034308944e2b" + integrity sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA== dependencies: - "@jest/types" "^27.5.1" - "@types/graceful-fs" "^4.1.2" + "@jest/types" "^28.1.3" + "@types/graceful-fs" "^4.1.3" "@types/node" "*" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.9" - jest-regex-util "^27.5.1" - jest-serializer "^27.5.1" - jest-util "^27.5.1" - jest-worker "^27.5.1" + jest-regex-util "^28.0.2" + jest-util "^28.1.3" + jest-worker "^28.1.3" micromatch "^4.0.4" - walker "^1.0.7" + walker "^1.0.8" optionalDependencies: fsevents "^2.3.2" -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== +jest-leak-detector@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz#a6685d9b074be99e3adee816ce84fd30795e654d" + integrity sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA== dependencies: - "@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.5.1" - is-generator-fn "^2.0.0" - 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-get-type "^28.0.2" + pretty-format "^28.1.3" -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.5.1" - pretty-format "^27.5.1" - -jest-matcher-utils@^27.0.0, jest-matcher-utils@^27.5.1: +jest-matcher-utils@^27.0.0: 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== @@ -7091,7 +4919,7 @@ jest-matcher-utils@^27.0.0, jest-matcher-utils@^27.5.1: jest-get-type "^27.5.1" pretty-format "^27.5.1" -jest-matcher-utils@^28.0.0: +jest-matcher-utils@^28.1.3: version "28.1.3" resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz#5a77f1c129dd5ba3b4d7fc20728806c78893146e" integrity sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw== @@ -7101,20 +4929,15 @@ jest-matcher-utils@^28.0.0: jest-get-type "^28.0.2" pretty-format "^28.1.3" -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== +jest-matcher-utils@^29.1.2: + version "29.1.2" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.1.2.tgz#e68c4bcc0266e70aa1a5c13fb7b8cd4695e318a1" + integrity sha512-MV5XrD3qYSW2zZSHRRceFzqJ39B2z11Qv0KPyZYxnzDHFeYZGJlgGi0SW+IXSJfOewgJp/Km/7lpcFT+cgZypw== dependencies: - "@babel/code-frame" "^7.12.13" - "@jest/types" "^27.5.1" - "@types/stack-utils" "^2.0.0" chalk "^4.0.0" - graceful-fs "^4.2.9" - micromatch "^4.0.4" - pretty-format "^27.5.1" - slash "^3.0.0" - stack-utils "^2.0.3" + jest-diff "^29.1.2" + jest-get-type "^29.0.0" + pretty-format "^29.1.2" jest-message-util@^28.1.3: version "28.1.3" @@ -7131,12 +4954,27 @@ jest-message-util@^28.1.3: slash "^3.0.0" stack-utils "^2.0.3" -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== +jest-message-util@^29.1.2: + version "29.1.2" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.1.2.tgz#c21a33c25f9dc1ebfcd0f921d89438847a09a501" + integrity sha512-9oJ2Os+Qh6IlxLpmvshVbGUiSkZVc2FK+uGOm6tghafnB2RyjKAxMZhtxThRMxfX1J1SOMhTn9oK3/MutRWQJQ== dependencies: - "@jest/types" "^27.5.1" + "@babel/code-frame" "^7.12.13" + "@jest/types" "^29.1.2" + "@types/stack-utils" "^2.0.0" + chalk "^4.0.0" + graceful-fs "^4.2.9" + micromatch "^4.0.4" + pretty-format "^29.1.2" + slash "^3.0.0" + stack-utils "^2.0.3" + +jest-mock@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-28.1.3.tgz#d4e9b1fc838bea595c77ab73672ebf513ab249da" + integrity sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA== + dependencies: + "@jest/types" "^28.1.3" "@types/node" "*" jest-pnp-resolver@^1.2.2: @@ -7144,145 +4982,119 @@ 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.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-regex-util@^28.0.0: +jest-regex-util@^28.0.2: version "28.0.2" resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-28.0.2.tgz#afdc377a3b25fb6e80825adcf76c854e5bf47ead" integrity sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw== -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== +jest-resolve-dependencies@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz#8c65d7583460df7275c6ea2791901fa975c1fe66" + integrity sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA== dependencies: - "@jest/types" "^27.5.1" - jest-regex-util "^27.5.1" - jest-snapshot "^27.5.1" + jest-regex-util "^28.0.2" + jest-snapshot "^28.1.3" -jest-resolve@^27.4.2, 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== +jest-resolve@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-28.1.3.tgz#cfb36100341ddbb061ec781426b3c31eb51aa0a8" + integrity sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ== dependencies: - "@jest/types" "^27.5.1" chalk "^4.0.0" graceful-fs "^4.2.9" - jest-haste-map "^27.5.1" + jest-haste-map "^28.1.3" jest-pnp-resolver "^1.2.2" - jest-util "^27.5.1" - jest-validate "^27.5.1" + jest-util "^28.1.3" + jest-validate "^28.1.3" resolve "^1.20.0" resolve.exports "^1.1.0" slash "^3.0.0" -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== +jest-runner@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-28.1.3.tgz#5eee25febd730b4713a2cdfd76bdd5557840f9a1" + integrity sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA== dependencies: - "@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" + "@jest/console" "^28.1.3" + "@jest/environment" "^28.1.3" + "@jest/test-result" "^28.1.3" + "@jest/transform" "^28.1.3" + "@jest/types" "^28.1.3" "@types/node" "*" chalk "^4.0.0" - emittery "^0.8.1" + emittery "^0.10.2" 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-docblock "^28.1.1" + jest-environment-node "^28.1.3" + jest-haste-map "^28.1.3" + jest-leak-detector "^28.1.3" + jest-message-util "^28.1.3" + jest-resolve "^28.1.3" + jest-runtime "^28.1.3" + jest-util "^28.1.3" + jest-watcher "^28.1.3" + jest-worker "^28.1.3" + p-limit "^3.1.0" + source-map-support "0.5.13" -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== +jest-runtime@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-28.1.3.tgz#a57643458235aa53e8ec7821949e728960d0605f" + integrity sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw== dependencies: - "@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" + "@jest/environment" "^28.1.3" + "@jest/fake-timers" "^28.1.3" + "@jest/globals" "^28.1.3" + "@jest/source-map" "^28.1.2" + "@jest/test-result" "^28.1.3" + "@jest/transform" "^28.1.3" + "@jest/types" "^28.1.3" chalk "^4.0.0" cjs-module-lexer "^1.0.0" collect-v8-coverage "^1.0.0" execa "^5.0.0" glob "^7.1.3" graceful-fs "^4.2.9" - jest-haste-map "^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" + jest-haste-map "^28.1.3" + jest-message-util "^28.1.3" + jest-mock "^28.1.3" + jest-regex-util "^28.0.2" + jest-resolve "^28.1.3" + jest-snapshot "^28.1.3" + jest-util "^28.1.3" slash "^3.0.0" strip-bom "^4.0.0" -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== +jest-snapshot@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-28.1.3.tgz#17467b3ab8ddb81e2f605db05583d69388fc0668" + integrity sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg== dependencies: - "@types/node" "*" - graceful-fs "^4.2.9" - -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/core" "^7.11.6" "@babel/generator" "^7.7.2" "@babel/plugin-syntax-typescript" "^7.7.2" "@babel/traverse" "^7.7.2" - "@babel/types" "^7.0.0" - "@jest/transform" "^27.5.1" - "@jest/types" "^27.5.1" - "@types/babel__traverse" "^7.0.4" + "@babel/types" "^7.3.3" + "@jest/expect-utils" "^28.1.3" + "@jest/transform" "^28.1.3" + "@jest/types" "^28.1.3" + "@types/babel__traverse" "^7.0.6" "@types/prettier" "^2.1.5" babel-preset-current-node-syntax "^1.0.0" chalk "^4.0.0" - expect "^27.5.1" + expect "^28.1.3" 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" + jest-diff "^28.1.3" + jest-get-type "^28.0.2" + jest-haste-map "^28.1.3" + jest-matcher-utils "^28.1.3" + jest-message-util "^28.1.3" + jest-util "^28.1.3" natural-compare "^1.4.0" - pretty-format "^27.5.1" - semver "^7.3.2" + pretty-format "^28.1.3" + semver "^7.3.5" -jest-util@^27.0.0, 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.5.1" - "@types/node" "*" - chalk "^4.0.0" - ci-info "^3.2.0" - graceful-fs "^4.2.9" - picomatch "^2.2.3" - -jest-util@^28.1.3: +jest-util@^28.0.0, jest-util@^28.1.3: version "28.1.3" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.1.3.tgz#f4f932aa0074f0679943220ff9cbba7e497028b0" integrity sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ== @@ -7294,45 +5106,31 @@ jest-util@^28.1.3: graceful-fs "^4.2.9" picomatch "^2.2.3" -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== +jest-util@^29.1.2: + version "29.1.2" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.1.2.tgz#ac5798e93cb6a6703084e194cfa0898d66126df1" + integrity sha512-vPCk9F353i0Ymx3WQq3+a4lZ07NXu9Ca8wya6o4Fe4/aO1e1awMMprZ3woPFpKwghEOW+UXgd15vVotuNN9ONQ== dependencies: - "@jest/types" "^27.5.1" + "@jest/types" "^29.1.2" + "@types/node" "*" + chalk "^4.0.0" + ci-info "^3.2.0" + graceful-fs "^4.2.9" + picomatch "^2.2.3" + +jest-validate@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-28.1.3.tgz#e322267fd5e7c64cea4629612c357bbda96229df" + integrity sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA== + dependencies: + "@jest/types" "^28.1.3" camelcase "^6.2.0" chalk "^4.0.0" - jest-get-type "^27.5.1" + jest-get-type "^28.0.2" leven "^3.1.0" - pretty-format "^27.5.1" + pretty-format "^28.1.3" -jest-watch-typeahead@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz#b4a6826dfb9c9420da2f7bc900de59dad11266a9" - integrity sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw== - dependencies: - ansi-escapes "^4.3.1" - chalk "^4.0.0" - jest-regex-util "^28.0.0" - jest-watcher "^28.0.0" - slash "^4.0.0" - string-length "^5.0.1" - strip-ansi "^7.0.1" - -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.5.1" - "@jest/types" "^27.5.1" - "@types/node" "*" - ansi-escapes "^4.2.1" - chalk "^4.0.0" - jest-util "^27.5.1" - string-length "^4.0.1" - -jest-watcher@^28.0.0: +jest-watcher@^28.1.3: version "28.1.3" resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-28.1.3.tgz#c6023a59ba2255e3b4c57179fc94164b3e73abd4" integrity sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g== @@ -7346,25 +5144,7 @@ jest-watcher@^28.0.0: jest-util "^28.1.3" string-length "^4.0.1" -jest-worker@^26.2.1: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" - integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^7.0.0" - -jest-worker@^27.0.2, jest-worker@^27.4.5, 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-worker@^28.0.2: +jest-worker@^28.1.3: version "28.1.3" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.3.tgz#7e3c4ce3fa23d1bb6accb169e7f396f98ed4bb98" integrity sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g== @@ -7373,14 +5153,20 @@ jest-worker@^28.0.2: merge-stream "^2.0.0" supports-color "^8.0.0" -jest@^27.4.3: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz#dadf33ba70a779be7a6fc33015843b51494f63fc" - integrity sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ== +jest@^28.1.3: + version "28.1.3" + resolved "https://registry.yarnpkg.com/jest/-/jest-28.1.3.tgz#e9c6a7eecdebe3548ca2b18894a50f45b36dfc6b" + integrity sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA== dependencies: - "@jest/core" "^27.5.1" + "@jest/core" "^28.1.3" + "@jest/types" "^28.1.3" import-local "^3.0.2" - jest-cli "^27.5.1" + jest-cli "^28.1.3" + +js-sdsl@^4.1.4: + version "4.1.5" + resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.5.tgz#1ff1645e6b4d1b028cd3f862db88c9d887f26e2a" + integrity sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q== "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" @@ -7402,55 +5188,17 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -jsdom@^16.6.0: - 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" - acorn-globals "^6.0.0" - cssom "^0.4.4" - cssstyle "^2.3.0" - data-urls "^2.0.0" - decimal.js "^10.2.1" - domexception "^2.0.1" - escodegen "^2.0.0" - form-data "^3.0.0" - html-encoding-sniffer "^2.0.1" - http-proxy-agent "^4.0.1" - https-proxy-agent "^5.0.0" - is-potential-custom-element-name "^1.0.1" - nwsapi "^2.2.0" - parse5 "6.0.1" - saxes "^5.0.1" - symbol-tree "^3.2.4" - tough-cookie "^4.0.0" - w3c-hr-time "^1.0.2" - w3c-xmlserializer "^2.0.0" - webidl-conversions "^6.1.0" - whatwg-encoding "^1.0.5" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.5.0" - ws "^7.4.6" - xml-name-validator "^3.0.0" - jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA== - json-buffer@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ== -json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: +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== @@ -7470,11 +5218,6 @@ json-schema-typed@^7.0.3: resolved "https://registry.yarnpkg.com/json-schema-typed/-/json-schema-typed-7.0.3.tgz#23ff481b8b4eebcd2ca123b4fa0409e66469a2d9" integrity sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A== -json-schema@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5" - integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA== - 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" @@ -7485,11 +5228,6 @@ json-stringify-safe@^5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== -json5@2.x, json5@^2.1.2, json5@^2.2.0, json5@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== - json5@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" @@ -7497,6 +5235,11 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" +json5@^2.2.0, json5@^2.2.1: + 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" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -7513,12 +5256,7 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -jsonpointer@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.1.tgz#2110e0af0900fd37467b5907ecd13a7884a1b559" - integrity sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ== - -"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.2: +"jsx-ast-utils@^2.4.1 || ^3.0.0": version "3.3.3" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz#76b3e6e6cece5c69d49a5792c3d01bd1a0cdc7ea" integrity sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw== @@ -7543,39 +5281,15 @@ keyv@^3.0.0: dependencies: json-buffer "3.0.0" -kind-of@^6.0.2: - 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== - kleur@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -klona@^2.0.4, klona@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" - integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ== - -language-subtag-registry@~0.3.2: - version "0.3.22" - resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz#2e1500861b2e457eba7e7ae86877cbd08fa1fd1d" - integrity sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w== - -language-tags@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.5.tgz#d321dbc4da30ba8bf3024e040fa5c14661f9193a" - integrity sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ== - dependencies: - language-subtag-registry "~0.3.2" - -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" +kleur@^4.0.3: + version "4.1.5" + resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780" + integrity sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ== lazy-val@^1.0.4, lazy-val@^1.0.5: version "1.0.5" @@ -7609,14 +5323,6 @@ levn@^0.4.1: 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 sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA== - dependencies: - prelude-ls "~1.1.2" - type-check "~0.3.2" - lie@~3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a" @@ -7624,43 +5330,11 @@ lie@~3.3.0: dependencies: immediate "~3.0.5" -lilconfig@^2.0.3, lilconfig@^2.0.5, lilconfig@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.6.tgz#32a384558bd58af3d4c6e077dd1ad1d397bc69d4" - integrity sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg== - 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== -loader-runner@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" - integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== - -loader-utils@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" - integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^2.1.2" - -loader-utils@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.0.tgz#bcecc51a7898bee7473d4bc6b845b23af8304d4f" - integrity sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ== - -locate-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" - integrity sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA== - dependencies: - p-locate "^2.0.0" - path-exists "^3.0.0" - locate-path@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" @@ -7683,10 +5357,10 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" -lodash.debounce@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== +lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ== lodash.escaperegexp@^4.1.2: version "4.1.2" @@ -7698,7 +5372,7 @@ lodash.isequal@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ== -lodash.memoize@4.x, lodash.memoize@^4.1.2: +lodash.memoize@4.x: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag== @@ -7708,17 +5382,7 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash.sortby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" - integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA== - -lodash.uniq@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== - -lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0: +lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -7730,13 +5394,6 @@ loose-envify@^1.1.0, loose-envify@^1.4.0: dependencies: js-tokens "^3.0.0 || ^4.0.0" -lower-case@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" - integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== - dependencies: - tslib "^2.0.3" - 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" @@ -7759,14 +5416,14 @@ lz-string@^1.4.4: resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26" integrity sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ== -magic-string@^0.25.0, magic-string@^0.25.7: - version "0.25.9" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c" - integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ== +magic-string@^0.26.7: + version "0.26.7" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.7.tgz#caf7daf61b34e9982f8228c4527474dac8981d6f" + integrity sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow== dependencies: sourcemap-codec "^1.4.8" -make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.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== @@ -7800,32 +5457,52 @@ matcher@^3.0.0: dependencies: escape-string-regexp "^4.0.0" -mdn-data@2.0.14: - version "2.0.14" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" - integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== - -mdn-data@2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" - integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA== - -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== - -memfs@^3.1.2, memfs@^3.4.3: - version "3.4.7" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.7.tgz#e5252ad2242a724f938cb937e3c4f7ceb1f70e5a" - integrity sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw== +mdast-util-definitions@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-5.1.1.tgz#2c1d684b28e53f84938bb06317944bee8efa79db" + integrity sha512-rQ+Gv7mHttxHOBx2dkF4HWTg+EE+UR78ptQWDylzPKaQuVGdG4HIoY3SrS/pCp80nZ04greFvXbVFHT+uf0JVQ== dependencies: - fs-monkey "^1.0.3" + "@types/mdast" "^3.0.0" + "@types/unist" "^2.0.0" + unist-util-visit "^4.0.0" -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== +mdast-util-from-markdown@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-1.2.0.tgz#84df2924ccc6c995dec1e2368b2b208ad0a76268" + integrity sha512-iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q== + dependencies: + "@types/mdast" "^3.0.0" + "@types/unist" "^2.0.0" + decode-named-character-reference "^1.0.0" + mdast-util-to-string "^3.1.0" + micromark "^3.0.0" + micromark-util-decode-numeric-character-reference "^1.0.0" + micromark-util-decode-string "^1.0.0" + micromark-util-normalize-identifier "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + unist-util-stringify-position "^3.0.0" + uvu "^0.5.0" + +mdast-util-to-hast@^12.1.0: + version "12.2.4" + resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-12.2.4.tgz#34c1ef2b6cf01c27b3e3504e2c977c76f722e7e1" + integrity sha512-a21xoxSef1l8VhHxS1Dnyioz6grrJkoaCUgGzMD/7dWHvboYX3VW53esRUfB5tgTyz4Yos1n25SPcj35dJqmAg== + dependencies: + "@types/hast" "^2.0.0" + "@types/mdast" "^3.0.0" + mdast-util-definitions "^5.0.0" + micromark-util-sanitize-uri "^1.1.0" + trim-lines "^3.0.0" + unist-builder "^3.0.0" + unist-util-generated "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" + +mdast-util-to-string@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz#56c506d065fbf769515235e577b5a261552d56e9" + integrity sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA== merge-stream@^2.0.0: version "2.0.0" @@ -7837,12 +5514,202 @@ merge2@^1.3.0, merge2@^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 sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== +micromark-core-commonmark@^1.0.1: + version "1.0.6" + resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-1.0.6.tgz#edff4c72e5993d93724a3c206970f5a15b0585ad" + integrity sha512-K+PkJTxqjFfSNkfAhp4GB+cZPfQd6dxtTXnf+RjZOV7T4EEXnvgzOcnp+eSTmpGk9d1S9sL6/lqrgSNn/s0HZA== + dependencies: + decode-named-character-reference "^1.0.0" + micromark-factory-destination "^1.0.0" + micromark-factory-label "^1.0.0" + micromark-factory-space "^1.0.0" + micromark-factory-title "^1.0.0" + micromark-factory-whitespace "^1.0.0" + micromark-util-character "^1.0.0" + micromark-util-chunked "^1.0.0" + micromark-util-classify-character "^1.0.0" + micromark-util-html-tag-name "^1.0.0" + micromark-util-normalize-identifier "^1.0.0" + micromark-util-resolve-all "^1.0.0" + micromark-util-subtokenize "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.1" + uvu "^0.5.0" -micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5: +micromark-factory-destination@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-1.0.0.tgz#fef1cb59ad4997c496f887b6977aa3034a5a277e" + integrity sha512-eUBA7Rs1/xtTVun9TmV3gjfPz2wEwgK5R5xcbIM5ZYAtvGF6JkyaDsj0agx8urXnO31tEO6Ug83iVH3tdedLnw== + dependencies: + micromark-util-character "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + +micromark-factory-label@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-1.0.2.tgz#6be2551fa8d13542fcbbac478258fb7a20047137" + integrity sha512-CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg== + dependencies: + micromark-util-character "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + uvu "^0.5.0" + +micromark-factory-space@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-1.0.0.tgz#cebff49968f2b9616c0fcb239e96685cb9497633" + integrity sha512-qUmqs4kj9a5yBnk3JMLyjtWYN6Mzfcx8uJfi5XAveBniDevmZasdGBba5b4QsvRcAkmvGo5ACmSUmyGiKTLZew== + dependencies: + micromark-util-character "^1.0.0" + micromark-util-types "^1.0.0" + +micromark-factory-title@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-1.0.2.tgz#7e09287c3748ff1693930f176e1c4a328382494f" + integrity sha512-zily+Nr4yFqgMGRKLpTVsNl5L4PMu485fGFDOQJQBl2NFpjGte1e86zC0da93wf97jrc4+2G2GQudFMHn3IX+A== + dependencies: + micromark-factory-space "^1.0.0" + micromark-util-character "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + uvu "^0.5.0" + +micromark-factory-whitespace@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-1.0.0.tgz#e991e043ad376c1ba52f4e49858ce0794678621c" + integrity sha512-Qx7uEyahU1lt1RnsECBiuEbfr9INjQTGa6Err+gF3g0Tx4YEviPbqqGKNv/NrBaE7dVHdn1bVZKM/n5I/Bak7A== + dependencies: + micromark-factory-space "^1.0.0" + micromark-util-character "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + +micromark-util-character@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-1.1.0.tgz#d97c54d5742a0d9611a68ca0cd4124331f264d86" + integrity sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg== + dependencies: + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + +micromark-util-chunked@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-1.0.0.tgz#5b40d83f3d53b84c4c6bce30ed4257e9a4c79d06" + integrity sha512-5e8xTis5tEZKgesfbQMKRCyzvffRRUX+lK/y+DvsMFdabAicPkkZV6gO+FEWi9RfuKKoxxPwNL+dFF0SMImc1g== + dependencies: + micromark-util-symbol "^1.0.0" + +micromark-util-classify-character@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-1.0.0.tgz#cbd7b447cb79ee6997dd274a46fc4eb806460a20" + integrity sha512-F8oW2KKrQRb3vS5ud5HIqBVkCqQi224Nm55o5wYLzY/9PwHGXC01tr3d7+TqHHz6zrKQ72Okwtvm/xQm6OVNZA== + dependencies: + micromark-util-character "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + +micromark-util-combine-extensions@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.0.0.tgz#91418e1e74fb893e3628b8d496085639124ff3d5" + integrity sha512-J8H058vFBdo/6+AsjHp2NF7AJ02SZtWaVUjsayNFeAiydTxUwViQPxN0Hf8dp4FmCQi0UUFovFsEyRSUmFH3MA== + dependencies: + micromark-util-chunked "^1.0.0" + micromark-util-types "^1.0.0" + +micromark-util-decode-numeric-character-reference@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.0.0.tgz#dcc85f13b5bd93ff8d2868c3dba28039d490b946" + integrity sha512-OzO9AI5VUtrTD7KSdagf4MWgHMtET17Ua1fIpXTpuhclCqD8egFWo85GxSGvxgkGS74bEahvtM0WP0HjvV0e4w== + dependencies: + micromark-util-symbol "^1.0.0" + +micromark-util-decode-string@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/micromark-util-decode-string/-/micromark-util-decode-string-1.0.2.tgz#942252ab7a76dec2dbf089cc32505ee2bc3acf02" + integrity sha512-DLT5Ho02qr6QWVNYbRZ3RYOSSWWFuH3tJexd3dgN1odEuPNxCngTCXJum7+ViRAd9BbdxCvMToPOD/IvVhzG6Q== + dependencies: + decode-named-character-reference "^1.0.0" + micromark-util-character "^1.0.0" + micromark-util-decode-numeric-character-reference "^1.0.0" + micromark-util-symbol "^1.0.0" + +micromark-util-encode@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-1.0.1.tgz#2c1c22d3800870ad770ece5686ebca5920353383" + integrity sha512-U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA== + +micromark-util-html-tag-name@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.1.0.tgz#eb227118befd51f48858e879b7a419fc0df20497" + integrity sha512-BKlClMmYROy9UiV03SwNmckkjn8QHVaWkqoAqzivabvdGcwNGMMMH/5szAnywmsTBUzDsU57/mFi0sp4BQO6dA== + +micromark-util-normalize-identifier@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.0.0.tgz#4a3539cb8db954bbec5203952bfe8cedadae7828" + integrity sha512-yg+zrL14bBTFrQ7n35CmByWUTFsgst5JhA4gJYoty4Dqzj4Z4Fr/DHekSS5aLfH9bdlfnSvKAWsAgJhIbogyBg== + dependencies: + micromark-util-symbol "^1.0.0" + +micromark-util-resolve-all@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-1.0.0.tgz#a7c363f49a0162e931960c44f3127ab58f031d88" + integrity sha512-CB/AGk98u50k42kvgaMM94wzBqozSzDDaonKU7P7jwQIuH2RU0TeBqGYJz2WY1UdihhjweivStrJ2JdkdEmcfw== + dependencies: + micromark-util-types "^1.0.0" + +micromark-util-sanitize-uri@^1.0.0, micromark-util-sanitize-uri@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.1.0.tgz#f12e07a85106b902645e0364feb07cf253a85aee" + integrity sha512-RoxtuSCX6sUNtxhbmsEFQfWzs8VN7cTctmBPvYivo98xb/kDEoTCtJQX5wyzIYEmk/lvNFTat4hL8oW0KndFpg== + dependencies: + micromark-util-character "^1.0.0" + micromark-util-encode "^1.0.0" + micromark-util-symbol "^1.0.0" + +micromark-util-subtokenize@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-1.0.2.tgz#ff6f1af6ac836f8bfdbf9b02f40431760ad89105" + integrity sha512-d90uqCnXp/cy4G881Ub4psE57Sf8YD0pim9QdjCRNjfas2M1u6Lbt+XZK9gnHL2XFhnozZiEdCa9CNfXSfQ6xA== + dependencies: + micromark-util-chunked "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + uvu "^0.5.0" + +micromark-util-symbol@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-1.0.1.tgz#b90344db62042ce454f351cf0bebcc0a6da4920e" + integrity sha512-oKDEMK2u5qqAptasDAwWDXq0tG9AssVwAx3E9bBF3t/shRIGsWIRG+cGafs2p/SnDSOecnt6hZPCE2o6lHfFmQ== + +micromark-util-types@^1.0.0, micromark-util-types@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-1.0.2.tgz#f4220fdb319205812f99c40f8c87a9be83eded20" + integrity sha512-DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w== + +micromark@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/micromark/-/micromark-3.1.0.tgz#eeba0fe0ac1c9aaef675157b52c166f125e89f62" + integrity sha512-6Mj0yHLdUZjHnOPgr5xfWIMqMWS12zDN6iws9SLuSz76W8jTtAv24MN4/CL7gJrl5vtxGInkkqDv/JIoRsQOvA== + dependencies: + "@types/debug" "^4.0.0" + debug "^4.0.0" + decode-named-character-reference "^1.0.0" + micromark-core-commonmark "^1.0.1" + micromark-factory-space "^1.0.0" + micromark-util-character "^1.0.0" + micromark-util-chunked "^1.0.0" + micromark-util-combine-extensions "^1.0.0" + micromark-util-decode-numeric-character-reference "^1.0.0" + micromark-util-encode "^1.0.0" + micromark-util-normalize-identifier "^1.0.0" + micromark-util-resolve-all "^1.0.0" + micromark-util-sanitize-uri "^1.0.0" + micromark-util-subtokenize "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.1" + uvu "^0.5.0" + +micromatch@^4.0.4: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== @@ -7850,23 +5717,18 @@ micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5: braces "^3.0.2" picomatch "^2.3.1" -mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": +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, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34: +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@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== - mime@^2.5.2: version "2.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" @@ -7892,18 +5754,6 @@ min-indent@^1.0.0: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -mini-css-extract-plugin@^2.4.5: - version "2.6.1" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz#9a1251d15f2035c342d99a468ab9da7a0451b71e" - integrity sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg== - dependencies: - schema-utils "^4.0.0" - -minimalistic-assert@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" - integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== - minimatch@3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -7926,9 +5776,9 @@ minimatch@^5.0.1: brace-expansion "^2.0.1" 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== + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== minipass@^3.0.0: version "3.3.4" @@ -7945,7 +5795,7 @@ minizlib@^2.1.1: minipass "^3.0.0" yallist "^4.0.0" -mkdirp@^0.5.1, mkdirp@~0.5.1: +mkdirp@^0.5.1: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== @@ -7962,7 +5812,7 @@ mktemp@~0.4.0: resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b" integrity sha512-IXnMcJ6ZyTuhRmJSjzvHSRhlVPiN9Jwc6e59V0bEJ0ba6OBeX2L0E+mRN1QseeOF4mM+F1Rit6Nh7o+rl2Yn/A== -mri@^1.1.5: +mri@^1.1.0, mri@^1.1.5: version "1.2.0" resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b" integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA== @@ -7977,19 +5827,11 @@ ms@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: +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== -multicast-dns@^7.2.5: - version "7.2.5" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced" - integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg== - dependencies: - dns-packet "^5.2.2" - thunky "^1.0.2" - multimatch@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-4.0.0.tgz#8c3c0f6e3e8449ada0af3dd29efb491a375191b3" @@ -8001,11 +5843,6 @@ multimatch@^4.0.0: arrify "^2.0.1" minimatch "^3.0.4" -mustache@^2.2.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5" - integrity sha512-KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ== - nanoid@^3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" @@ -8016,24 +5853,6 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== -negotiator@0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" - integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== - -neo-async@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - -no-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" - integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== - dependencies: - lower-case "^2.0.2" - tslib "^2.0.3" - node-addon-api@^1.3.0, 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" @@ -8046,11 +5865,6 @@ node-fetch@2.6.7, node-fetch@^2.6.1: dependencies: whatwg-url "^5.0.0" -node-forge@^1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" - integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== - node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" @@ -8073,21 +5887,11 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -normalize-range@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" - integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA== - 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== -normalize-url@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" - integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== - now-and-later@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c" @@ -8110,13 +5914,6 @@ npm-run-path@^4.0.0, npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" -nth-check@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" - integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== - dependencies: - boolbase "~1.0.0" - nth-check@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d" @@ -8124,22 +5921,12 @@ nth-check@^2.0.1: dependencies: boolbase "^1.0.0" -nwsapi@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.1.tgz#10a9f268fbf4c461249ebcfe38e359aa36e2577c" - integrity sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg== - 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 sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== -object-hash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9" - integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw== - -object-inspect@^1.12.0, object-inspect@^1.9.0: +object-inspect@^1.12.2, object-inspect@^1.9.0: version "1.12.2" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== @@ -8156,10 +5943,10 @@ object-sizeof@^1.2.0: dependencies: buffer "^5.6.0" -object.assign@^4.0.4, object.assign@^4.1.0, object.assign@^4.1.2, object.assign@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.3.tgz#d36b7700ddf0019abb6b1df1bb13f6445f79051f" - integrity sha512-ZFJnX3zltyjcYJL0RoCJuzb+11zWGyaDbjgxZbdV7rFEcHQuYxrZqhow67aA7xpes6LhojyFDaBKAFfogQrikA== +object.assign@^4.0.4, object.assign@^4.1.3, object.assign@^4.1.4: + version "4.1.4" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" + integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== dependencies: call-bind "^1.0.2" define-properties "^1.1.4" @@ -8184,16 +5971,6 @@ object.fromentries@^2.0.5: define-properties "^1.1.3" es-abstract "^1.19.1" -object.getownpropertydescriptors@^2.1.0: - version "2.1.4" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz#7965e6437a57278b587383831a9b829455a4bc37" - integrity sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ== - dependencies: - array.prototype.reduce "^1.0.4" - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.1" - object.hasown@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.1.tgz#ad1eecc60d03f49460600430d97f23882cf592a3" @@ -8202,7 +5979,7 @@ object.hasown@^1.1.1: define-properties "^1.1.4" es-abstract "^1.19.5" -object.values@^1.1.0, object.values@^1.1.5: +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== @@ -8211,23 +5988,6 @@ object.values@^1.1.0, object.values@^1.1.5: define-properties "^1.1.3" es-abstract "^1.19.1" -obuf@^1.0.0, obuf@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" - integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== - -on-finished@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" - integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== - 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.3.2, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -8242,27 +6002,6 @@ onetime@^5.1.0, onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" -open@^8.0.9, open@^8.4.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" - integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== - dependencies: - define-lazy-prop "^2.0.0" - is-docker "^2.1.1" - is-wsl "^2.2.0" - -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" @@ -8287,13 +6026,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-limit@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" - integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== - dependencies: - p-try "^1.0.0" - p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" @@ -8301,20 +6033,13 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-limit@^3.0.2: +p-limit@^3.0.2, p-limit@^3.1.0: 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@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" - integrity sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg== - dependencies: - p-limit "^1.1.0" - p-locate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" @@ -8336,47 +6061,16 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" -p-retry@^4.5.0: - version "4.6.2" - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16" - integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ== - dependencies: - "@types/retry" "0.12.0" - retry "^0.13.1" - -p-try@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" - integrity sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww== - 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== -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" - -pako@~1.0.2: +pako@^1.0.5, pako@~1.0.2: version "1.0.11" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== -param-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" - integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== - dependencies: - dot-case "^3.0.4" - tslib "^2.0.3" - parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -8402,30 +6096,12 @@ parse5-htmlparser2-tree-adapter@^7.0.0: domhandler "^5.0.2" parse5 "^7.0.0" -parse5@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" - integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== - parse5@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.0.0.tgz#51f74a5257f5fcc536389e8c2d0b3802e1bfa91a" - integrity sha512-y/t8IXSPWTuRZqXc0ajH/UwDj4mnqLEbSttNbThcFhGrZuOyoyvNBO85PBp2jQa55wY9d07PBNjsK8ZP3K5U6g== + version "7.1.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.1.tgz#4649f940ccfb95d8754f37f73078ea20afe0c746" + integrity sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg== dependencies: - entities "^4.3.0" - -parseurl@~1.3.2, 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== - -pascal-case@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" - integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== - dependencies: - no-case "^3.0.4" - tslib "^2.0.3" + entities "^4.4.0" path-dirname@^1.0.0: version "1.0.2" @@ -8462,11 +6138,6 @@ path-posix@^1.0.0: resolved "https://registry.yarnpkg.com/path-posix/-/path-posix-1.0.0.tgz#06b26113f56beab042545a23bfa88003ccac260f" integrity sha512-1gJ0WpNIiYcQydgg3Ed8KzvIqTsDpNwq+cjBCssvBtuTWjEqY1AW+i+OepiEMqDCzyro9B2sLAe4RBPajMYFiA== -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 sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== - path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -8477,31 +6148,16 @@ pend@~1.2.0: resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== - -picocolors@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" - integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA== - 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.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.1: +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== -pify@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" - integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog== - pify@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" @@ -8512,7 +6168,7 @@ pirates@^4.0.4: resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== -pkg-dir@^4.1.0, pkg-dir@^4.2.0: +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== @@ -8534,551 +6190,15 @@ plist@^3.0.1, plist@^3.0.4, plist@^3.0.5: base64-js "^1.5.1" xmlbuilder "^15.1.1" -postcss-attribute-case-insensitive@^5.0.1: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz#03d761b24afc04c09e757e92ff53716ae8ea2741" - integrity sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ== - dependencies: - postcss-selector-parser "^6.0.10" - -postcss-browser-comments@^4: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz#bcfc86134df5807f5d3c0eefa191d42136b5e72a" - integrity sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg== - -postcss-calc@^8.2.3: - version "8.2.4" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5" - integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q== - dependencies: - postcss-selector-parser "^6.0.9" - postcss-value-parser "^4.2.0" - -postcss-clamp@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/postcss-clamp/-/postcss-clamp-4.1.0.tgz#7263e95abadd8c2ba1bd911b0b5a5c9c93e02363" - integrity sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-color-functional-notation@^4.2.3: - version "4.2.4" - resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz#21a909e8d7454d3612d1659e471ce4696f28caec" - integrity sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-color-hex-alpha@^8.0.4: - version "8.0.4" - resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz#c66e2980f2fbc1a63f5b079663340ce8b55f25a5" - integrity sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-color-rebeccapurple@^7.1.0: - version "7.1.1" - resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz#63fdab91d878ebc4dd4b7c02619a0c3d6a56ced0" - integrity sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-colormin@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.0.tgz#3cee9e5ca62b2c27e84fce63affc0cfb5901956a" - integrity sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg== - dependencies: - browserslist "^4.16.6" - caniuse-api "^3.0.0" - colord "^2.9.1" - postcss-value-parser "^4.2.0" - -postcss-convert-values@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.2.tgz#31586df4e184c2e8890e8b34a0b9355313f503ab" - integrity sha512-c6Hzc4GAv95B7suy4udszX9Zy4ETyMCgFPUDtWjdFTKH1SE9eFY/jEpHSwTH1QPuwxHpWslhckUQWbNRM4ho5g== - dependencies: - browserslist "^4.20.3" - postcss-value-parser "^4.2.0" - -postcss-custom-media@^8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz#c8f9637edf45fef761b014c024cee013f80529ea" - integrity sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-custom-properties@^12.1.8: - version "12.1.8" - resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-12.1.8.tgz#aa003e1885c5bd28e2e32496cd597e389ca889e4" - integrity sha512-8rbj8kVu00RQh2fQF81oBqtduiANu4MIxhyf0HbbStgPtnFlWn0yiaYTpLHrPnJbffVY1s9apWsIoVZcc68FxA== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-custom-selectors@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz#1ab4684d65f30fed175520f82d223db0337239d9" - integrity sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg== - dependencies: - postcss-selector-parser "^6.0.4" - -postcss-dir-pseudo-class@^6.0.4: - version "6.0.5" - resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz#2bf31de5de76added44e0a25ecf60ae9f7c7c26c" - integrity sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA== - dependencies: - postcss-selector-parser "^6.0.10" - -postcss-discard-comments@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz#8df5e81d2925af2780075840c1526f0660e53696" - integrity sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ== - -postcss-discard-duplicates@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848" - integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw== - -postcss-discard-empty@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c" - integrity sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A== - -postcss-discard-overridden@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e" - integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw== - -postcss-double-position-gradients@^3.1.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz#b96318fdb477be95997e86edd29c6e3557a49b91" - integrity sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ== - dependencies: - "@csstools/postcss-progressive-custom-properties" "^1.1.0" - postcss-value-parser "^4.2.0" - -postcss-env-function@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-4.0.6.tgz#7b2d24c812f540ed6eda4c81f6090416722a8e7a" - integrity sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-flexbugs-fixes@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz#2028e145313074fc9abe276cb7ca14e5401eb49d" - integrity sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ== - -postcss-focus-visible@^6.0.4: - version "6.0.4" - resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz#50c9ea9afa0ee657fb75635fabad25e18d76bf9e" - integrity sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw== - dependencies: - postcss-selector-parser "^6.0.9" - -postcss-focus-within@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz#5b1d2ec603195f3344b716c0b75f61e44e8d2e20" - integrity sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ== - dependencies: - postcss-selector-parser "^6.0.9" - -postcss-font-variant@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz#efd59b4b7ea8bb06127f2d031bfbb7f24d32fa66" - integrity sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA== - -postcss-gap-properties@^3.0.3: - version "3.0.5" - resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz#f7e3cddcf73ee19e94ccf7cb77773f9560aa2fff" - integrity sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg== - -postcss-image-set-function@^4.0.6: - version "4.0.7" - resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz#08353bd756f1cbfb3b6e93182c7829879114481f" - integrity sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-import@^14.1.0: - version "14.1.0" - resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.1.0.tgz#a7333ffe32f0b8795303ee9e40215dac922781f0" - integrity sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw== - dependencies: - postcss-value-parser "^4.0.0" - read-cache "^1.0.0" - resolve "^1.1.7" - -postcss-initial@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-4.0.1.tgz#529f735f72c5724a0fb30527df6fb7ac54d7de42" - integrity sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ== - -postcss-js@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.0.tgz#31db79889531b80dc7bc9b0ad283e418dce0ac00" - integrity sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ== - dependencies: - camelcase-css "^2.0.1" - -postcss-lab-function@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz#6fe4c015102ff7cd27d1bd5385582f67ebdbdc98" - integrity sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w== - dependencies: - "@csstools/postcss-progressive-custom-properties" "^1.1.0" - postcss-value-parser "^4.2.0" - -postcss-load-config@^3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855" - integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg== - dependencies: - lilconfig "^2.0.5" - yaml "^1.10.2" - -postcss-loader@^6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.1.tgz#0895f7346b1702103d30fdc66e4d494a93c008ef" - integrity sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q== - dependencies: - cosmiconfig "^7.0.0" - klona "^2.0.5" - semver "^7.3.5" - -postcss-logical@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-5.0.4.tgz#ec75b1ee54421acc04d5921576b7d8db6b0e6f73" - integrity sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g== - -postcss-media-minmax@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz#7140bddec173e2d6d657edbd8554a55794e2a5b5" - integrity sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ== - -postcss-merge-longhand@^5.1.6: - version "5.1.6" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.6.tgz#f378a8a7e55766b7b644f48e5d8c789ed7ed51ce" - integrity sha512-6C/UGF/3T5OE2CEbOuX7iNO63dnvqhGZeUnKkDeifebY0XqkkvrctYSZurpNE902LDf2yKwwPFgotnfSoPhQiw== - dependencies: - postcss-value-parser "^4.2.0" - stylehacks "^5.1.0" - -postcss-merge-rules@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.2.tgz#7049a14d4211045412116d79b751def4484473a5" - integrity sha512-zKMUlnw+zYCWoPN6yhPjtcEdlJaMUZ0WyVcxTAmw3lkkN/NDMRkOkiuctQEoWAOvH7twaxUUdvBWl0d4+hifRQ== - dependencies: - browserslist "^4.16.6" - caniuse-api "^3.0.0" - cssnano-utils "^3.1.0" - postcss-selector-parser "^6.0.5" - -postcss-minify-font-values@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b" - integrity sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-minify-gradients@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz#f1fe1b4f498134a5068240c2f25d46fcd236ba2c" - integrity sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw== - dependencies: - colord "^2.9.1" - cssnano-utils "^3.1.0" - postcss-value-parser "^4.2.0" - -postcss-minify-params@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.3.tgz#ac41a6465be2db735099bbd1798d85079a6dc1f9" - integrity sha512-bkzpWcjykkqIujNL+EVEPOlLYi/eZ050oImVtHU7b4lFS82jPnsCb44gvC6pxaNt38Els3jWYDHTjHKf0koTgg== - dependencies: - browserslist "^4.16.6" - cssnano-utils "^3.1.0" - postcss-value-parser "^4.2.0" - -postcss-minify-selectors@^5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz#d4e7e6b46147b8117ea9325a915a801d5fe656c6" - integrity sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg== - dependencies: - postcss-selector-parser "^6.0.5" - -postcss-modules-extract-imports@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" - integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== - -postcss-modules-local-by-default@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" - integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== - dependencies: - icss-utils "^5.0.0" - postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.1.0" - -postcss-modules-scope@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" - integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== - dependencies: - postcss-selector-parser "^6.0.4" - -postcss-modules-values@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" - integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== - dependencies: - icss-utils "^5.0.0" - -postcss-nested@5.0.6: - version "5.0.6" - resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" - integrity sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA== - dependencies: - postcss-selector-parser "^6.0.6" - -postcss-nesting@^10.1.9: - version "10.1.10" - resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.1.10.tgz#9c396df3d8232cbedfa95baaac6b765b8fd2a817" - integrity sha512-lqd7LXCq0gWc0wKXtoKDru5wEUNjm3OryLVNRZ8OnW8km6fSNUuFrjEhU3nklxXE2jvd4qrox566acgh+xQt8w== - dependencies: - "@csstools/selector-specificity" "^2.0.0" - postcss-selector-parser "^6.0.10" - -postcss-normalize-charset@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed" - integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg== - -postcss-normalize-display-values@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8" - integrity sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-positions@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz#ef97279d894087b59325b45c47f1e863daefbb92" - integrity sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-repeat-style@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz#e9eb96805204f4766df66fd09ed2e13545420fb2" - integrity sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-string@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228" - integrity sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-timing-functions@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb" - integrity sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-unicode@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz#3d23aede35e160089a285e27bf715de11dc9db75" - integrity sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ== - dependencies: - browserslist "^4.16.6" - postcss-value-parser "^4.2.0" - -postcss-normalize-url@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc" - integrity sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew== - dependencies: - normalize-url "^6.0.1" - postcss-value-parser "^4.2.0" - -postcss-normalize-whitespace@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa" - integrity sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize/-/postcss-normalize-10.0.1.tgz#464692676b52792a06b06880a176279216540dd7" - integrity sha512-+5w18/rDev5mqERcG3W5GZNMJa1eoYYNGo8gB7tEwaos0ajk3ZXAI4mHGcNT47NE+ZnZD1pEpUOFLvltIwmeJA== - dependencies: - "@csstools/normalize.css" "*" - postcss-browser-comments "^4" - sanitize.css "*" - -postcss-opacity-percentage@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.2.tgz#bd698bb3670a0a27f6d657cc16744b3ebf3b1145" - integrity sha512-lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w== - -postcss-ordered-values@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz#b6fd2bd10f937b23d86bc829c69e7732ce76ea38" - integrity sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ== - dependencies: - cssnano-utils "^3.1.0" - postcss-value-parser "^4.2.0" - -postcss-overflow-shorthand@^3.0.3: - version "3.0.4" - resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz#7ed6486fec44b76f0eab15aa4866cda5d55d893e" - integrity sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-page-break@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-3.0.4.tgz#7fbf741c233621622b68d435babfb70dd8c1ee5f" - integrity sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ== - -postcss-place@^7.0.4: - version "7.0.5" - resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-7.0.5.tgz#95dbf85fd9656a3a6e60e832b5809914236986c4" - integrity sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-preset-env@^7.0.1: - version "7.7.2" - resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-7.7.2.tgz#769f7f21779b4688c9a6082ae1572416cab415cf" - integrity sha512-1q0ih7EDsZmCb/FMDRvosna7Gsbdx8CvYO5hYT120hcp2ZAuOHpSzibujZ4JpIUcAC02PG6b+eftxqjTFh5BNA== - dependencies: - "@csstools/postcss-cascade-layers" "^1.0.4" - "@csstools/postcss-color-function" "^1.1.0" - "@csstools/postcss-font-format-keywords" "^1.0.0" - "@csstools/postcss-hwb-function" "^1.0.1" - "@csstools/postcss-ic-unit" "^1.0.0" - "@csstools/postcss-is-pseudo-class" "^2.0.6" - "@csstools/postcss-normalize-display-values" "^1.0.0" - "@csstools/postcss-oklab-function" "^1.1.0" - "@csstools/postcss-progressive-custom-properties" "^1.3.0" - "@csstools/postcss-stepped-value-functions" "^1.0.0" - "@csstools/postcss-trigonometric-functions" "^1.0.1" - "@csstools/postcss-unset-value" "^1.0.1" - autoprefixer "^10.4.7" - browserslist "^4.21.0" - css-blank-pseudo "^3.0.3" - css-has-pseudo "^3.0.4" - css-prefers-color-scheme "^6.0.3" - cssdb "^6.6.3" - postcss-attribute-case-insensitive "^5.0.1" - postcss-clamp "^4.1.0" - postcss-color-functional-notation "^4.2.3" - postcss-color-hex-alpha "^8.0.4" - postcss-color-rebeccapurple "^7.1.0" - postcss-custom-media "^8.0.2" - postcss-custom-properties "^12.1.8" - postcss-custom-selectors "^6.0.3" - postcss-dir-pseudo-class "^6.0.4" - postcss-double-position-gradients "^3.1.1" - postcss-env-function "^4.0.6" - postcss-focus-visible "^6.0.4" - postcss-focus-within "^5.0.4" - postcss-font-variant "^5.0.0" - postcss-gap-properties "^3.0.3" - postcss-image-set-function "^4.0.6" - postcss-initial "^4.0.1" - postcss-lab-function "^4.2.0" - postcss-logical "^5.0.4" - postcss-media-minmax "^5.0.0" - postcss-nesting "^10.1.9" - postcss-opacity-percentage "^1.1.2" - postcss-overflow-shorthand "^3.0.3" - postcss-page-break "^3.0.4" - postcss-place "^7.0.4" - postcss-pseudo-class-any-link "^7.1.5" - postcss-replace-overflow-wrap "^4.0.0" - postcss-selector-not "^6.0.0" - postcss-value-parser "^4.2.0" - -postcss-pseudo-class-any-link@^7.1.5: - version "7.1.6" - resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz#2693b221902da772c278def85a4d9a64b6e617ab" - integrity sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w== - dependencies: - postcss-selector-parser "^6.0.10" - -postcss-reduce-initial@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz#fc31659ea6e85c492fb2a7b545370c215822c5d6" - integrity sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw== - dependencies: - browserslist "^4.16.6" - caniuse-api "^3.0.0" - -postcss-reduce-transforms@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9" - integrity sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-replace-overflow-wrap@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz#d2df6bed10b477bf9c52fab28c568b4b29ca4319" - integrity sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw== - -postcss-selector-not@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz#8f0a709bf7d4b45222793fc34409be407537556d" - integrity sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ== - dependencies: - postcss-selector-parser "^6.0.10" - -postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.9: - version "6.0.10" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d" - integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - -postcss-svgo@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d" - integrity sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA== - dependencies: - postcss-value-parser "^4.2.0" - svgo "^2.7.0" - -postcss-unique-selectors@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6" - integrity sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA== - dependencies: - postcss-selector-parser "^6.0.5" - -postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.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@^7.0.35: - version "7.0.39" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309" - integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA== - dependencies: - picocolors "^0.2.1" - source-map "^0.6.1" - -postcss@^8.3.5, postcss@^8.4.14, postcss@^8.4.4, postcss@^8.4.7: - version "8.4.16" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c" - integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ== +postcss-value-parser@^3.3.0: + version "3.3.1" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" + integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== + +postcss@^8.4.18: + version "8.4.18" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.18.tgz#6d50046ea7d3d66a85e0e782074e7203bc7fbca2" + integrity sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA== dependencies: nanoid "^3.3.4" picocolors "^1.0.0" @@ -9089,11 +6209,6 @@ prelude-ls@^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 sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== - prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" @@ -9104,19 +6219,6 @@ prettier@^2.6.2: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== -pretty-bytes@^5.3.0, pretty-bytes@^5.4.1: - version "5.6.0" - resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb" - integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg== - -pretty-error@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6" - integrity sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw== - dependencies: - lodash "^4.17.20" - renderkid "^3.0.0" - pretty-format@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" @@ -9136,7 +6238,7 @@ pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.5.1: ansi-styles "^5.0.0" react-is "^17.0.1" -pretty-format@^28.0.0, pretty-format@^28.1.3: +pretty-format@^28.1.3: version "28.1.3" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-28.1.3.tgz#c9fba8cedf99ce50963a11b27d982a9ae90970d5" integrity sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q== @@ -9146,6 +6248,15 @@ pretty-format@^28.0.0, pretty-format@^28.1.3: ansi-styles "^5.0.0" react-is "^18.0.0" +pretty-format@^29.0.0, pretty-format@^29.1.2: + version "29.1.2" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.1.2.tgz#b1f6b75be7d699be1a051f5da36e8ae9e76a8e6a" + integrity sha512-CGJ6VVGXVRP2o2Dorl4mAwwvDWT25luIsYhkyVQW32E4nL+TgW939J7LlKT/npq5Cpq6j3s+sy+13yk7xYpBmg== + dependencies: + "@jest/schemas" "^29.0.0" + ansi-styles "^5.0.0" + react-is "^18.0.0" + pretty-quick@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-3.1.3.tgz#15281108c0ddf446675157ca40240099157b638e" @@ -9173,14 +6284,7 @@ promise-map-series@^0.3.0: resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.3.0.tgz#41873ca3652bb7a042b387d538552da9b576f8a1" integrity sha512-3npG2NGhTc8BWBolLLf8l/92OxMGaRLbqvIh9wjCHhDXNvk4zsxaTaCpiCunW09qWPrN2zeNSNwRLVBrQQtutA== -promise@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e" - integrity sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q== - dependencies: - asap "~2.0.6" - -prompts@^2.0.1, prompts@^2.4.2: +prompts@^2.0.1: version "2.4.2" resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q== @@ -9188,7 +6292,7 @@ prompts@^2.0.1, prompts@^2.4.2: kleur "^3.0.3" sisteransi "^1.0.5" -prop-types@^15.6.2, prop-types@^15.8.1: +prop-types@^15.0.0, prop-types@^15.6.2, prop-types@^15.8.1: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== @@ -9197,24 +6301,16 @@ prop-types@^15.6.2, prop-types@^15.8.1: object-assign "^4.1.1" react-is "^16.13.1" +property-information@^6.0.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.2.0.tgz#b74f522c31c097b5149e3c3cb8d7f3defd986a1d" + integrity sha512-kma4U7AFCTwpqq5twzC1YVIDXSqg6qQK6JN0smOw8fgRy1OkMi0CYSzFmsy6dnqSenamAtj0CyXMUJ1Mf6oROg== + proto-list@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA== -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" - -psl@^1.1.33: - version "1.9.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" - integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== - pump@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" @@ -9240,39 +6336,20 @@ pumpify@^1.3.5: inherits "^2.0.3" pump "^2.0.0" -punycode@^2.1.0, punycode@^2.1.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.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" - -q@^1.1.2: - version "1.5.1" - resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" - integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== - -qs@6.10.3: - version "6.10.3" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e" - integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ== - dependencies: - side-channel "^1.0.4" - 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@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" - integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== +queue-tick@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/queue-tick/-/queue-tick-1.0.1.tgz#f6f07ac82c1fd60f82e098b417a80e52f1f4c142" + integrity sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag== quick-temp@^0.1.8: version "0.1.8" @@ -9283,110 +6360,23 @@ quick-temp@^0.1.8: rimraf "^2.5.4" underscore.string "~3.3.4" -raf@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39" - integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA== - dependencies: - performance-now "^2.1.0" - -randombytes@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" - integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== - dependencies: - safe-buffer "^5.1.0" - -range-parser@^1.2.1, 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.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" - integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== - dependencies: - bytes "3.1.2" - http-errors "2.0.0" - iconv-lite "0.4.24" - unpipe "1.0.0" - -rc@1.2.8, 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" - -react-app-polyfill@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-3.0.0.tgz#95221e0a9bd259e5ca6b177c7bb1cb6768f68fd7" - integrity sha512-sZ41cxiU5llIB003yxxQBYrARBqe0repqPTTYBTmMqTz9szeBbE37BehCE891NZsmdZqqP+xWKdT3eo3vOzN8w== - dependencies: - core-js "^3.19.2" - object-assign "^4.1.1" - promise "^8.1.0" - raf "^3.4.1" - regenerator-runtime "^0.13.9" - whatwg-fetch "^3.6.2" - -react-dev-utils@^12.0.1: - version "12.0.1" - resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.1.tgz#ba92edb4a1f379bd46ccd6bcd4e7bc398df33e73" - integrity sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ== - dependencies: - "@babel/code-frame" "^7.16.0" - address "^1.1.2" - browserslist "^4.18.1" - chalk "^4.1.2" - cross-spawn "^7.0.3" - detect-port-alt "^1.1.6" - escape-string-regexp "^4.0.0" - filesize "^8.0.6" - find-up "^5.0.0" - fork-ts-checker-webpack-plugin "^6.5.0" - global-modules "^2.0.0" - globby "^11.0.4" - gzip-size "^6.0.0" - immer "^9.0.7" - is-root "^2.1.0" - loader-utils "^3.2.0" - open "^8.4.0" - pkg-up "^3.1.0" - prompts "^2.4.2" - react-error-overlay "^6.0.11" - recursive-readdir "^2.2.2" - shell-quote "^1.7.3" - strip-ansi "^6.0.1" - text-table "^0.2.0" - -react-dom@17: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" - integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== +react-dom@^18.2.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d" + integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" - scheduler "^0.20.2" - -react-error-overlay@^6.0.11: - version "6.0.11" - resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb" - integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg== + scheduler "^0.23.0" react-i18next@^11.16.7: - version "11.18.3" - resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.3.tgz#50211810bcc9fdea2d70c8aefdfff5f1eb39a923" - integrity sha512-EttTX31HbqzZymUM3SIrMPuvamfSXFZVsDHm/ZAqoDfTLjhzlwyxqfbDNxcKNAGOi2mjZaXfR7hSNMlvLNpB/g== + version "11.18.6" + resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.6.tgz#e159c2960c718c1314f1e8fcaa282d1c8b167887" + integrity sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA== dependencies: "@babel/runtime" "^7.14.5" html-parse-stringify "^3.0.1" -react-is@^16.13.1, react-is@^16.7.0: +react-is@^16.10.2, react-is@^16.13.1, react-is@^16.7.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -9401,80 +6391,76 @@ react-is@^18.0.0, react-is@^18.2.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== -react-refresh@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046" - integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A== +react-lifecycles-compat@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" + integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== + +react-markdown@^8.0.3: + version "8.0.3" + resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-8.0.3.tgz#e8aba0d2f5a1b2124d476ee1fff9448a2f57e4b3" + integrity sha512-We36SfqaKoVNpN1QqsZwWSv/OZt5J15LNgTLWynwAN5b265hrQrsjMtlRNwUvS+YyR3yDM8HpTNc4pK9H/Gc0A== + dependencies: + "@types/hast" "^2.0.0" + "@types/prop-types" "^15.0.0" + "@types/unist" "^2.0.0" + comma-separated-tokens "^2.0.0" + hast-util-whitespace "^2.0.0" + prop-types "^15.0.0" + property-information "^6.0.0" + react-is "^18.0.0" + remark-parse "^10.0.0" + remark-rehype "^10.0.0" + space-separated-tokens "^2.0.0" + style-to-object "^0.3.0" + unified "^10.0.0" + unist-util-visit "^4.0.0" + vfile "^5.0.0" + +react-refresh@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e" + integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ== + +react-resize-detector@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-7.1.2.tgz#8ef975dd8c3d56f9a5160ac382ef7136dcd2d86c" + integrity sha512-zXnPJ2m8+6oq9Nn8zsep/orts9vQv3elrpA+R8XTcW7DVVUJ9vwDwMXaBtykAYjMnkCIaOoK9vObyR7ZgFNlOw== + dependencies: + lodash "^4.17.21" react-router-dom@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz#a0216da813454e521905b5fa55e0e5176123f43d" - integrity sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw== + version "6.4.2" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.4.2.tgz#115b37d501d6d8ac870683694978c51c43e6c0d2" + integrity sha512-yM1kjoTkpfjgczPrcyWrp+OuQMyB1WleICiiGfstnQYo/S8hPEEnVjr/RdmlH6yKK4Tnj1UGXFSa7uwAtmDoLQ== dependencies: - history "^5.2.0" - react-router "6.3.0" + "@remix-run/router" "1.0.2" + react-router "6.4.2" -react-router@6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557" - integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ== +react-router@6.4.2: + version "6.4.2" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.4.2.tgz#300628ee9ed81b8ef1597b5cb98b474efe9779b8" + integrity sha512-Rb0BAX9KHhVzT1OKhMvCDMw776aTYM0DtkxqUBP8dNBom3mPXlfNs76JNGK8wKJ1IZEY1+WGj+cvZxHVk/GiKw== dependencies: - history "^5.2.0" + "@remix-run/router" "1.0.2" -react-scripts@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-5.0.1.tgz#6285dbd65a8ba6e49ca8d651ce30645a6d980003" - integrity sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ== +react-smooth@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/react-smooth/-/react-smooth-2.0.1.tgz#74c7309916d6ccca182c4b30c8992f179e6c5a05" + integrity sha512-Own9TA0GPPf3as4vSwFhDouVfXP15ie/wIHklhyKBH5AN6NFtdk0UpHBnonV11BtqDkAWlt40MOUc+5srmW7NA== dependencies: - "@babel/core" "^7.16.0" - "@pmmmwh/react-refresh-webpack-plugin" "^0.5.3" - "@svgr/webpack" "^5.5.0" - babel-jest "^27.4.2" - babel-loader "^8.2.3" - babel-plugin-named-asset-import "^0.3.8" - babel-preset-react-app "^10.0.1" - bfj "^7.0.2" - browserslist "^4.18.1" - camelcase "^6.2.1" - case-sensitive-paths-webpack-plugin "^2.4.0" - css-loader "^6.5.1" - css-minimizer-webpack-plugin "^3.2.0" - dotenv "^10.0.0" - dotenv-expand "^5.1.0" - eslint "^8.3.0" - eslint-config-react-app "^7.0.1" - eslint-webpack-plugin "^3.1.1" - file-loader "^6.2.0" - fs-extra "^10.0.0" - html-webpack-plugin "^5.5.0" - identity-obj-proxy "^3.0.0" - jest "^27.4.3" - jest-resolve "^27.4.2" - jest-watch-typeahead "^1.0.0" - mini-css-extract-plugin "^2.4.5" - postcss "^8.4.4" - postcss-flexbugs-fixes "^5.0.2" - postcss-loader "^6.2.1" - postcss-normalize "^10.0.1" - postcss-preset-env "^7.0.1" - prompts "^2.4.2" - react-app-polyfill "^3.0.0" - react-dev-utils "^12.0.1" - react-refresh "^0.11.0" - resolve "^1.20.0" - resolve-url-loader "^4.0.0" - sass-loader "^12.3.0" - semver "^7.3.5" - source-map-loader "^3.0.0" - style-loader "^3.3.1" - tailwindcss "^3.0.2" - terser-webpack-plugin "^5.2.5" - webpack "^5.64.4" - webpack-dev-server "^4.6.0" - webpack-manifest-plugin "^4.0.2" - workbox-webpack-plugin "^6.4.1" - optionalDependencies: - fsevents "^2.3.2" + fast-equals "^2.0.0" + react-transition-group "2.9.0" + +react-transition-group@2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d" + integrity sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg== + dependencies: + dom-helpers "^3.4.0" + loose-envify "^1.4.0" + prop-types "^15.6.2" + react-lifecycles-compat "^3.0.4" react-transition-group@^4.4.5: version "4.4.5" @@ -9486,20 +6472,12 @@ react-transition-group@^4.4.5: loose-envify "^1.4.0" prop-types "^15.6.2" -react@17: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" - integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== +react@^18.2.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5" + integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" - -read-cache@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" - integrity sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA== - dependencies: - pify "^2.3.0" read-config-file@6.2.0: version "6.2.0" @@ -9512,7 +6490,7 @@ read-config-file@6.2.0: json5 "^2.2.0" lazy-val "^1.0.4" -readable-stream@3, readable-stream@^3.0.2, readable-stream@^3.0.6: +readable-stream@3, readable-stream@^3.0.2: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -9541,12 +6519,32 @@ readdirp@~3.6.0: dependencies: picomatch "^2.2.1" -recursive-readdir@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f" - integrity sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg== +recharts-scale@^0.4.4: + version "0.4.5" + resolved "https://registry.yarnpkg.com/recharts-scale/-/recharts-scale-0.4.5.tgz#0969271f14e732e642fcc5bd4ab270d6e87dd1d9" + integrity sha512-kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w== dependencies: - minimatch "3.0.4" + decimal.js-light "^2.4.1" + +recharts@^2.1.14: + version "2.1.15" + resolved "https://registry.yarnpkg.com/recharts/-/recharts-2.1.15.tgz#896ad292ae10ad9eb528b30ad919a99d7da8948e" + integrity sha512-16VMAvrsdqkEe7sT9uyJ1F+OZzrC6+5eW+pVSU04SVO6O5Nr5lY78h/uKMjsZJTN0nfOfgV7YfHZcivtqgPU9g== + dependencies: + "@types/d3-interpolate" "^2.0.0" + "@types/d3-scale" "^3.0.0" + "@types/d3-shape" "^2.0.0" + classnames "^2.2.5" + d3-interpolate "^2.0.0" + d3-scale "^3.0.0" + d3-shape "^2.0.0" + eventemitter3 "^4.0.1" + lodash "^4.17.19" + react-is "^16.10.2" + react-resize-detector "^7.1.2" + react-smooth "^2.0.1" + recharts-scale "^0.4.4" + reduce-css-calc "^2.1.8" redent@^3.0.0: version "3.0.0" @@ -9556,34 +6554,18 @@ redent@^3.0.0: indent-string "^4.0.0" strip-indent "^3.0.0" -regenerate-unicode-properties@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56" - integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw== +reduce-css-calc@^2.1.8: + version "2.1.8" + resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz#7ef8761a28d614980dc0c982f772c93f7a99de03" + integrity sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg== dependencies: - regenerate "^1.4.2" + css-unit-converter "^1.1.1" + postcss-value-parser "^3.3.0" -regenerate@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" - integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== - -regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.9: - version "0.13.9" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" - integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== - -regenerator-transform@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537" - integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg== - dependencies: - "@babel/runtime" "^7.8.4" - -regex-parser@^2.2.11: - version "2.2.11" - resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58" - integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q== +regenerator-runtime@^0.13.4: + version "0.13.10" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz#ed07b19616bcbec5da6274ebc75ae95634bfc2ee" + integrity sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw== regexp.prototype.flags@^1.4.1, regexp.prototype.flags@^1.4.3: version "1.4.3" @@ -9599,18 +6581,6 @@ regexpp@^3.2.0: resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== -regexpu-core@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.1.0.tgz#2f8504c3fd0ebe11215783a41541e21c79942c6d" - integrity sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA== - dependencies: - regenerate "^1.4.2" - regenerate-unicode-properties "^10.0.1" - regjsgen "^0.6.0" - regjsparser "^0.8.2" - unicode-match-property-ecmascript "^2.0.0" - unicode-match-property-value-ecmascript "^2.0.0" - "register-scheme@github:devsnek/node-register-scheme": version "0.0.2" resolved "https://codeload.github.com/devsnek/node-register-scheme/tar.gz/e7cc9a63a1f512565da44cb57316d9fb10750e17" @@ -9618,36 +6588,24 @@ regexpu-core@^5.1.0: bindings "^1.3.0" node-addon-api "^1.3.0" -registry-auth-token@^4.0.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz#f02d49c3668884612ca031419491a13539e21fac" - integrity sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg== +remark-parse@^10.0.0: + version "10.0.1" + resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-10.0.1.tgz#6f60ae53edbf0cf38ea223fe643db64d112e0775" + integrity sha512-1fUyHr2jLsVOkhbvPRBJ5zTKZZyD6yZzYaWCS6BPBdQ8vEMBCH+9zNCDA6tET/zHCi/jLqjCWtlJZUPk+DbnFw== dependencies: - rc "1.2.8" + "@types/mdast" "^3.0.0" + mdast-util-from-markdown "^1.0.0" + unified "^10.0.0" -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== +remark-rehype@^10.0.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-10.1.0.tgz#32dc99d2034c27ecaf2e0150d22a6dcccd9a6279" + integrity sha512-EFmR5zppdBp0WQeDVZ/b66CWJipB2q2VLNFMabzDSGR66Z2fQii83G5gTBbgGEnEEA0QRussvrFHxk1HWGJskw== dependencies: - rc "^1.2.8" - -regjsgen@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d" - integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA== - -regjsparser@^0.8.2: - version "0.8.4" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f" - integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA== - dependencies: - jsesc "~0.5.0" - -relateurl@^0.2.7: - version "0.2.7" - resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" - integrity sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog== + "@types/hast" "^2.0.0" + "@types/mdast" "^3.0.0" + mdast-util-to-hast "^12.1.0" + unified "^10.0.0" remove-bom-buffer@^3.0.0: version "3.0.0" @@ -9666,27 +6624,21 @@ remove-bom-stream@^1.2.0: safe-buffer "^5.1.0" through2 "^2.0.3" -remove-trailing-separator@^1.0.1: +remove-trailing-separator@^1.0.1, remove-trailing-separator@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw== -renderkid@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-3.0.0.tgz#5fd823e4d6951d37358ecc9a58b1f06836b6268a" - integrity sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg== - dependencies: - css-select "^4.1.3" - dom-converter "^0.2.0" - htmlparser2 "^6.1.0" - lodash "^4.17.21" - strip-ansi "^6.0.1" - replace-ext@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a" integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw== +replace-ext@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-2.0.0.tgz#9471c213d22e1bcc26717cd6e50881d88f812b06" + integrity sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug== + require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -9697,11 +6649,6 @@ require-from-string@^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== -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== - resolve-cwd@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" @@ -9726,23 +6673,12 @@ resolve-options@^1.1.0: dependencies: value-or-function "^3.0.0" -resolve-url-loader@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz#d50d4ddc746bb10468443167acf800dcd6c3ad57" - integrity sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA== - dependencies: - adjust-sourcemap-loader "^4.0.0" - convert-source-map "^1.7.0" - loader-utils "^2.0.0" - postcss "^7.0.35" - source-map "0.6.1" - 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.1.7, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1: +resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1: version "1.22.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== @@ -9767,11 +6703,6 @@ responselike@^1.0.2: dependencies: lowercase-keys "^1.0.0" -retry@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" - integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== - reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" @@ -9803,20 +6734,10 @@ roarr@^2.15.3: semver-compare "^1.0.0" sprintf-js "^1.1.2" -rollup-plugin-terser@^7.0.0: - version "7.0.2" - resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d" - integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ== - dependencies: - "@babel/code-frame" "^7.10.4" - jest-worker "^26.2.1" - serialize-javascript "^4.0.0" - terser "^5.0.0" - -rollup@^2.43.1: - version "2.77.3" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.3.tgz#8f00418d3a2740036e15deb653bed1a90ee0cc12" - integrity sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g== +rollup@^2.79.1: + version "2.79.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" + integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw== optionalDependencies: fsevents "~2.3.2" @@ -9838,23 +6759,39 @@ run-parallel@^1.1.9: queue-microtask "^1.2.2" rxjs@^7.5.2: - version "7.5.6" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.6.tgz#0446577557862afd6903517ce7cae79ecb9662bc" - integrity sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw== + version "7.5.7" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.7.tgz#2ec0d57fdc89ece220d2e702730ae8f1e49def39" + integrity sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA== 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== +sade@^1.7.3: + version "1.8.1" + resolved "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz#0a78e81d658d394887be57d2a409bf703a3b2701" + integrity sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A== + dependencies: + mri "^1.1.0" -safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0: +safe-buffer@^5.1.0, 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": +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-regex-test@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295" + integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.3" + is-regex "^1.1.4" + +"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== @@ -9866,135 +6803,48 @@ sanitize-filename@^1.6.3: dependencies: truncate-utf8-bytes "^1.0.0" -sanitize.css@*: - version "13.0.0" - resolved "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-13.0.0.tgz#2675553974b27964c75562ade3bd85d79879f173" - integrity sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA== - -sass-loader@^12.3.0: - version "12.6.0" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.6.0.tgz#5148362c8e2cdd4b950f3c63ac5d16dbfed37bcb" - integrity sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA== +sass@^1.55.0: + version "1.55.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.55.0.tgz#0c4d3c293cfe8f8a2e8d3b666e1cf1bff8065d1c" + integrity sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A== dependencies: - klona "^2.0.4" - neo-async "^2.6.2" + chokidar ">=3.0.0 <4.0.0" + immutable "^4.0.0" + source-map-js ">=0.6.2 <2.0.0" -sax@^1.2.4, sax@~1.2.4: +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== -saxes@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" - integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== - dependencies: - xmlchars "^2.2.0" - -scheduler@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" - integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== +scheduler@^0.23.0: + version "0.23.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe" + integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" - -schema-utils@2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" - integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A== - dependencies: - "@types/json-schema" "^7.0.4" - ajv "^6.12.2" - ajv-keywords "^3.4.1" - -schema-utils@^2.6.5: - version "2.7.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" - integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== - dependencies: - "@types/json-schema" "^7.0.5" - ajv "^6.12.4" - ajv-keywords "^3.5.2" - -schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" - integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== - dependencies: - "@types/json-schema" "^7.0.8" - ajv "^6.12.5" - ajv-keywords "^3.5.2" - -schema-utils@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" - integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== - dependencies: - "@types/json-schema" "^7.0.9" - ajv "^8.8.0" - ajv-formats "^2.1.1" - ajv-keywords "^5.0.0" - -select-hose@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" - integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg== - -selfsigned@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.1.tgz#8b2df7fa56bf014d19b6007655fff209c0ef0a56" - integrity sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ== - dependencies: - node-forge "^1" semver-compare@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== -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@7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" - integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== - -semver@7.x, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== +semver@7.x, semver@^7.2.1, semver@^7.3.2, semver@^7.3.5, semver@^7.3.7: + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== dependencies: lru-cache "^6.0.0" -semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, 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== -send@0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" - integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== - dependencies: - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "2.0.0" - mime "1.6.0" - ms "2.1.3" - on-finished "2.4.1" - range-parser "~1.2.1" - statuses "2.0.1" +semver@~7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== serialize-error@^7.0.1: version "7.0.1" @@ -10003,58 +6853,11 @@ serialize-error@^7.0.1: dependencies: type-fest "^0.13.1" -serialize-javascript@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" - integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw== - dependencies: - randombytes "^2.1.0" - -serialize-javascript@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" - integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== - dependencies: - randombytes "^2.1.0" - -serve-index@^1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" - integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw== - dependencies: - accepts "~1.3.4" - batch "0.6.1" - debug "2.6.9" - escape-html "~1.0.3" - http-errors "~1.6.2" - mime-types "~2.1.17" - parseurl "~1.3.2" - -serve-static@1.15.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" - integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.18.0" - setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA== -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== - -setprototypeof@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" - integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== - shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" @@ -10067,16 +6870,19 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shell-quote@^1.6.1, shell-quote@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" - integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw== - shlex@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/shlex/-/shlex-2.1.2.tgz#5b5384d603885281c1dee05d56975865edddcba0" integrity sha512-Nz6gtibMVgYeMEhUjp2KuwAgqaJA1K155dU/HuDaEJUGgnmYfVtVZah+uerVWdH8UGnyahhDCgABbYTbs254+w== +short-uuid@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/short-uuid/-/short-uuid-4.2.0.tgz#3706d9e7287ac589dc5ffe324d3e34817a07540b" + integrity sha512-r3cxuPPZSuF0QkKsK9bBR7u+7cwuCRzWzgjPh07F5N2iIUNgblnMHepBY16xgj5t1lG9iOP9k/TEafY1qhRzaw== + dependencies: + any-base "^1.1.0" + uuid "^8.3.2" + side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" @@ -10086,15 +6892,22 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.2, signal-exit@^3.0.3: +signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: 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== simple-keyboard@^3.4.136: - version "3.4.139" - resolved "https://registry.yarnpkg.com/simple-keyboard/-/simple-keyboard-3.4.139.tgz#bf849a5acb6613063bed76e0c54f30b0141017f3" - integrity sha512-cGo6idOvPrG1d33HqgwV6tXGXnhpNN82nYwEPHvDOkcK5T6qKXlnwWurveXlMVi9W5zUMcCVuWl4csmps5mp7w== + version "3.4.173" + resolved "https://registry.yarnpkg.com/simple-keyboard/-/simple-keyboard-3.4.173.tgz#af8fc092a3766129f0a6decfae6a837898e938c9" + integrity sha512-TSJfTg44NUZwUbMoqn32vKRQC5e5hzOY6UCZXou9jCSKgAF3PFibe/2zat16saFDzpndJdYXNMa8Kx07k5Ht4A== + +simple-update-notifier@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz#7edf75c5bdd04f88828d632f762b2bc32996a9cc" + integrity sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew== + dependencies: + semver "~7.0.0" sisteransi@^1.0.5: version "1.0.5" @@ -10106,11 +6919,6 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== -slash@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" - integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== - slice-ansi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" @@ -10125,15 +6933,6 @@ smart-buffer@^4.0.2: resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== -sockjs@^0.3.24: - version "0.3.24" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" - integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ== - dependencies: - faye-websocket "^0.11.3" - uuid "^8.3.2" - websocket-driver "^0.7.4" - sort-keys@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-5.0.0.tgz#5d775f8ae93ecc29bc7312bbf3acac4e36e3c446" @@ -10141,26 +6940,20 @@ sort-keys@^5.0.0: dependencies: is-plain-obj "^4.0.0" -source-list-map@^2.0.0, source-list-map@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" - integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== - -source-map-js@^1.0.1, source-map-js@^1.0.2: +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== -source-map-loader@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-3.0.1.tgz#9ae5edc7c2d42570934be4c95d1ccc6352eba52d" - integrity sha512-Vp1UsfyPvgujKQzi4pyDiTOnE3E4H+yHvkVRN3c/9PJmQS4CQJExvcDvaX/D+RV+xQben9HJ56jMJS3CgUeWyA== +source-map-support@0.5.13: + version "0.5.13" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" + integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== dependencies: - abab "^2.0.5" - iconv-lite "^0.6.3" - source-map-js "^1.0.1" + buffer-from "^1.0.0" + source-map "^0.6.0" -source-map-support@^0.5.19, source-map-support@^0.5.21, source-map-support@^0.5.6, source-map-support@~0.5.20: +source-map-support@^0.5.19, source-map-support@^0.5.21: 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== @@ -10168,55 +6961,25 @@ source-map-support@^0.5.19, source-map-support@^0.5.21, source-map-support@^0.5. buffer-from "^1.0.0" source-map "^0.6.0" -source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.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== - source-map@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== -source-map@^0.7.3: - version "0.7.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" - integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== - -source-map@^0.8.0-beta.0: - version "0.8.0-beta.0" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11" - integrity sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA== - dependencies: - whatwg-url "^7.0.0" +source-map@^0.6.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== sourcemap-codec@^1.4.8: version "1.4.8" resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== -spdy-transport@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" - integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw== - dependencies: - debug "^4.1.0" - detect-node "^2.0.4" - hpack.js "^2.1.6" - obuf "^1.1.2" - readable-stream "^3.0.6" - wbuf "^1.7.3" - -spdy@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" - integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== - dependencies: - debug "^4.1.0" - handle-thing "^2.0.0" - http-deceiver "^1.2.7" - select-hose "^2.0.0" - spdy-transport "^3.0.0" +space-separated-tokens@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz#1ecd9d2350a3844572c3f4a312bceb018348859f" + integrity sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q== sprintf-js@^1.1.1, sprintf-js@^1.1.2: version "1.1.2" @@ -10228,11 +6991,6 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== -stable@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" - integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== - stack-utils@^2.0.3: version "2.0.5" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5" @@ -10240,26 +6998,11 @@ stack-utils@^2.0.3: dependencies: escape-string-regexp "^2.0.0" -stackframe@^1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310" - integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw== - 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== -statuses@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" - integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== - -"statuses@>= 1.4.0 < 2": - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== - steam-shortcut-editor@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/steam-shortcut-editor/-/steam-shortcut-editor-3.1.3.tgz#7544a8de8a4c211ad4ed7f4b544dd32a79814fac" @@ -10273,6 +7016,14 @@ stream-shift@^1.0.0: resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== +streamx@^2.12.5: + version "2.12.5" + resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.12.5.tgz#485d6b6bf74df6f94bc1cc262e67392ed6862dc0" + integrity sha512-Y+nkFw57Z5JHT3zLlqFm3GccOy2FeYdUrrqita6Dd8kr/8enPn9GKa8IYf3/DmEKfZl/E2sWoSKUnd4qhonrgg== + dependencies: + fast-fifo "^1.0.0" + queue-tick "^1.0.0" + string-length@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" @@ -10281,20 +7032,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -string-length@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-5.0.1.tgz#3d647f497b6e8e8d41e422f7e0b23bc536c8381e" - integrity sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow== - dependencies: - char-regex "^2.0.0" - strip-ansi "^7.0.1" - -string-natural-compare@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4" - integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw== - -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: +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== @@ -10303,7 +7041,7 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2 is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string.prototype.matchall@^4.0.6, string.prototype.matchall@^4.0.7: +string.prototype.matchall@^4.0.7: version "4.0.7" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz#8e6ecb0d8a1fb1fda470d81acecb2dba057a481d" integrity sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg== @@ -10349,15 +7087,6 @@ string_decoder@~1.1.1: 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@^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" @@ -10365,13 +7094,6 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-ansi@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" - integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== - dependencies: - ansi-regex "^6.0.1" - strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" @@ -10382,11 +7104,6 @@ strip-bom@^4.0.0: resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== -strip-comments@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b" - integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw== - 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" @@ -10404,23 +7121,12 @@ strip-json-comments@^3.1.0, strip-json-comments@^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 sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== - -style-loader@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575" - integrity sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ== - -stylehacks@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.0.tgz#a40066490ca0caca04e96c6b02153ddc39913520" - integrity sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q== +style-to-object@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" + integrity sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA== dependencies: - browserslist "^4.16.6" - postcss-selector-parser "^6.0.4" + inline-style-parser "0.1.1" stylis@4.0.13: version "4.0.13" @@ -10456,9 +7162,9 @@ supports-color@^8.0.0: has-flag "^4.0.0" supports-hyperlinks@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" - integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== + version "2.3.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624" + integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA== dependencies: has-flag "^4.0.0" supports-color "^7.0.0" @@ -10468,95 +7174,20 @@ supports-preserve-symlinks-flag@^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== -svg-parser@^2.0.2: +svg-parser@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ== -svgo@^1.2.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" - integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw== - dependencies: - chalk "^2.4.1" - coa "^2.0.2" - css-select "^2.0.0" - css-select-base-adapter "^0.1.1" - css-tree "1.0.0-alpha.37" - csso "^4.0.2" - js-yaml "^3.13.1" - mkdirp "~0.5.1" - object.values "^1.1.0" - sax "~1.2.4" - stable "^0.1.8" - unquote "~1.1.1" - util.promisify "~1.0.0" - -svgo@^2.7.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" - integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== - dependencies: - "@trysound/sax" "0.2.0" - commander "^7.2.0" - css-select "^4.1.3" - css-tree "^1.1.3" - csso "^4.2.0" - picocolors "^1.0.0" - stable "^0.1.8" - -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== - symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0, symlink-or-copy@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.3.1.tgz#9506dd64d8e98fa21dcbf4018d1eab23e77f71fe" integrity sha512-0K91MEXFpBUaywiwSSkmKjnGcasG/rVBXFLJz5DrgGabpYD6N+3yZrfD6uUIfpuTu65DZLHi7N8CizHc07BPZA== -systeminformation@^5.12.3: - version "5.12.4" - resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.12.4.tgz#2afb07d1f5ea0549f69877f5553fda2a19f1ea89" - integrity sha512-wmzAUdjk7IqqdjmtCT8STaZrfXb9aZmcgqjRo8oLTF6CYs7KaRStex92i5cUziaDQ+04v5xK8iqlHcrKFVZAJQ== - -tailwindcss@^3.0.2: - version "3.1.8" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.1.8.tgz#4f8520550d67a835d32f2f4021580f9fddb7b741" - integrity sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g== - dependencies: - arg "^5.0.2" - chokidar "^3.5.3" - color-name "^1.1.4" - detective "^5.2.1" - didyoumean "^1.2.2" - dlv "^1.1.3" - fast-glob "^3.2.11" - glob-parent "^6.0.2" - is-glob "^4.0.3" - lilconfig "^2.0.6" - normalize-path "^3.0.0" - object-hash "^3.0.0" - picocolors "^1.0.0" - postcss "^8.4.14" - postcss-import "^14.1.0" - postcss-js "^4.0.0" - postcss-load-config "^3.1.4" - postcss-nested "5.0.6" - postcss-selector-parser "^6.0.10" - postcss-value-parser "^4.2.0" - quick-lru "^5.1.1" - resolve "^1.22.1" - -tapable@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" - integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== - -tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" - integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== +systeminformation@^5.15.0: + version "5.15.0" + resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.15.0.tgz#c76bff9165a47b8c9aa9fcd256aa3b99533090fe" + integrity sha512-E/Tzrtjch9KSnA1kY6urRm/yAB7rwdXnYOIDDssCU8O90qqyD8k0zbNlk1dRJ4BoTv89VDnoiaUteuV+xxa3pQ== tar@^6.1.11: version "6.1.11" @@ -10570,10 +7201,12 @@ tar@^6.1.11: mkdirp "^1.0.3" yallist "^4.0.0" -temp-dir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e" - integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg== +teex@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/teex/-/teex-1.0.1.tgz#b8fa7245ef8e8effa8078281946c85ab780a0b12" + integrity sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg== + dependencies: + streamx "^2.12.5" temp-file@^3.4.0: version "3.4.0" @@ -10583,16 +7216,6 @@ temp-file@^3.4.0: async-exit-hook "^2.0.1" fs-extra "^10.0.0" -tempy@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tempy/-/tempy-0.6.0.tgz#65e2c35abc06f1124a97f387b08303442bde59f3" - integrity sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw== - dependencies: - is-stream "^2.0.0" - temp-dir "^2.0.0" - type-fest "^0.16.0" - unique-string "^2.0.0" - terminal-link@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" @@ -10601,27 +7224,6 @@ terminal-link@^2.0.0: ansi-escapes "^4.2.1" supports-hyperlinks "^2.0.0" -terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.5: - version "5.3.3" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz#8033db876dd5875487213e87c627bca323e5ed90" - integrity sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ== - dependencies: - "@jridgewell/trace-mapping" "^0.3.7" - jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.0" - terser "^5.7.2" - -terser@^5.0.0, terser@^5.10.0, terser@^5.7.2: - version "5.14.2" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10" - integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA== - dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" - commander "^2.20.0" - source-map-support "~0.5.20" - test-exclude@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" @@ -10636,11 +7238,6 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== -throat@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375" - integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== - through2-filter@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254" @@ -10664,11 +7261,6 @@ through2@~4.0.2: dependencies: readable-stream "3" -thunky@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" - integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== - tmp-promise@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7" @@ -10720,39 +7312,21 @@ to-through@^2.0.0: dependencies: through2 "^2.0.3" -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== - -tough-cookie@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" - integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== - dependencies: - psl "^1.1.33" - punycode "^2.1.1" - universalify "^0.1.2" - -tr46@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" - integrity sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA== - dependencies: - punycode "^2.1.0" - -tr46@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" - integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw== - dependencies: - punycode "^2.1.1" - tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== +trim-lines@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz#d802e332a07df861c48802c04321017b1bd87338" + integrity sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg== + +trough@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/trough/-/trough-2.1.0.tgz#0f7b511a4fde65a46f18477ab38849b22c554876" + integrity sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g== + 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" @@ -10760,24 +7334,19 @@ truncate-utf8-bytes@^1.0.0: dependencies: utf8-byte-length "^1.0.1" -tryer@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" - integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== - -ts-jest@^27.1.4: - version "27.1.5" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-27.1.5.tgz#0ddf1b163fbaae3d5b7504a1e65c914a95cff297" - integrity sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA== +ts-jest@^28.0.7: + version "28.0.8" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-28.0.8.tgz#cd204b8e7a2f78da32cf6c95c9a6165c5b99cc73" + integrity sha512-5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg== dependencies: bs-logger "0.x" fast-json-stable-stringify "2.x" - jest-util "^27.0.0" - json5 "2.x" + jest-util "^28.0.0" + json5 "^2.2.1" lodash.memoize "4.x" make-error "1.x" semver "7.x" - yargs-parser "20.x" + yargs-parser "^21.0.1" tsconfig-paths@^3.14.1: version "3.14.1" @@ -10794,7 +7363,7 @@ tslib@^1.8.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0: +tslib@^2.1.0, tslib@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== @@ -10818,13 +7387,6 @@ type-check@^0.4.0, type-check@~0.4.0: 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 sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg== - dependencies: - prelude-ls "~1.1.2" - type-detect@4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" @@ -10835,11 +7397,6 @@ type-fest@^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.16.0: - version "0.16.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.16.0.tgz#3240b891a78b0deae910dbeb86553e552a148860" - integrity sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg== - type-fest@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" @@ -10851,17 +7408,9 @@ type-fest@^0.21.3: integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== type-fest@^2.17.0: - version "2.18.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.18.0.tgz#fdef3a74e0a9e68ebe46054836650fb91ac3881e" - integrity sha512-pRS+/yrW5TjPPHNOvxhbNZexr2bS63WjrMU8a+VzEBhUi9Tz1pZeD+vQz3ut0svZ46P+SRqMEPnJmk2XnvNzTw== - -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" + version "2.19.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b" + integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA== typed-emitter@^2.1.0: version "2.1.0" @@ -10870,22 +7419,15 @@ typed-emitter@^2.1.0: optionalDependencies: rxjs "^7.5.2" -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 sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript@^4.2.4, typescript@^4.6.3: - version "4.7.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" - integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== +typescript@^4.2.4, typescript@^4.8.4: + version "4.8.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6" + integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== unbox-primitive@^1.0.2: version "1.0.2" @@ -10902,6 +7444,13 @@ unc-path-regex@^0.1.2: resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg== +underscore-keypath@~0.0.22: + version "0.0.22" + resolved "https://registry.yarnpkg.com/underscore-keypath/-/underscore-keypath-0.0.22.tgz#48a528392bb6efc424be1caa56da4b5faccf264d" + integrity sha512-fU7aYj1J2LQd+jqdQ67AlCOZKK3Pl+VErS8fGYcgZG75XB9/bY+RLM+F2xEcKHhHNtLvqqFyXAoZQlLYfec3Xg== + dependencies: + underscore "*" + underscore.string@~3.3.4: version "3.3.6" resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.6.tgz#ad8cf23d7423cb3b53b898476117588f4e2f9159" @@ -10910,28 +7459,23 @@ underscore.string@~3.3.4: sprintf-js "^1.1.1" util-deprecate "^1.0.2" -unicode-canonical-property-names-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" - integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ== +underscore@*: + version "1.13.6" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441" + integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A== -unicode-match-property-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" - integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q== +unified@^10.0.0: + version "10.1.2" + resolved "https://registry.yarnpkg.com/unified/-/unified-10.1.2.tgz#b1d64e55dafe1f0b98bb6c719881103ecf6c86df" + integrity sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q== dependencies: - unicode-canonical-property-names-ecmascript "^2.0.0" - unicode-property-aliases-ecmascript "^2.0.0" - -unicode-match-property-value-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" - integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw== - -unicode-property-aliases-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" - integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ== + "@types/unist" "^2.0.0" + bail "^2.0.0" + extend "^3.0.0" + is-buffer "^2.0.0" + is-plain-obj "^4.0.0" + trough "^2.0.0" + vfile "^5.0.0" unique-stream@^2.0.2: version "2.3.1" @@ -10941,14 +7485,55 @@ unique-stream@^2.0.2: json-stable-stringify-without-jsonify "^1.0.1" through2-filter "^3.0.0" -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== +unist-builder@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-3.0.0.tgz#728baca4767c0e784e1e64bb44b5a5a753021a04" + integrity sha512-GFxmfEAa0vi9i5sd0R2kcrI9ks0r82NasRq5QHh2ysGngrc6GiqD5CDf1FjPenY4vApmFASBIIlk/jj5J5YbmQ== dependencies: - crypto-random-string "^2.0.0" + "@types/unist" "^2.0.0" -universalify@^0.1.0, universalify@^0.1.2: +unist-util-generated@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-2.0.0.tgz#86fafb77eb6ce9bfa6b663c3f5ad4f8e56a60113" + integrity sha512-TiWE6DVtVe7Ye2QxOVW9kqybs6cZexNwTwSMVgkfjEReqy/xwGpAXb99OxktoWwmL+Z+Epb0Dn8/GNDYP1wnUw== + +unist-util-is@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-5.1.1.tgz#e8aece0b102fa9bc097b0fef8f870c496d4a6236" + integrity sha512-F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ== + +unist-util-position@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-4.0.3.tgz#5290547b014f6222dff95c48d5c3c13a88fadd07" + integrity sha512-p/5EMGIa1qwbXjA+QgcBXaPWjSnZfQ2Sc3yBEEfgPwsEmJd8Qh+DSk3LGnmOM4S1bY2C0AjmMnB8RuEYxpPwXQ== + dependencies: + "@types/unist" "^2.0.0" + +unist-util-stringify-position@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz#5c6aa07c90b1deffd9153be170dce628a869a447" + integrity sha512-7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg== + dependencies: + "@types/unist" "^2.0.0" + +unist-util-visit-parents@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-5.1.1.tgz#868f353e6fce6bf8fa875b251b0f4fec3be709bb" + integrity sha512-gks4baapT/kNRaWxuGkl5BIhoanZo7sC/cUT/JToSRNL1dYoXRFl75d++NkjYk4TAu2uv2Px+l8guMajogeuiw== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^5.0.0" + +unist-util-visit@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.1.1.tgz#1c4842d70bd3df6cc545276f5164f933390a9aad" + integrity sha512-n9KN3WV9k4h1DxYR1LoajgN93wpEi/7ZplVe02IoB4gH5ctI1AaF2670BLHQYbwj+pY83gFtyeySFiyMHJklrg== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^5.0.0" + unist-util-visit-parents "^5.1.1" + +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== @@ -10958,16 +7543,6 @@ universalify@^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 sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== - -unquote@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" - integrity sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg== - unzip-crx-3@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/unzip-crx-3/-/unzip-crx-3-0.2.0.tgz#d5324147b104a8aed9ae8639c95521f6f7cda292" @@ -10977,38 +7552,20 @@ unzip-crx-3@^0.2.0: mkdirp "^0.5.1" yaku "^0.16.6" -upath@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" - integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== - -update-browserslist-db@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz#be06a5eedd62f107b7c19eb5bcefb194411abf38" - integrity sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q== +update-browserslist-db@^1.0.9: + version "1.0.10" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" + integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== dependencies: escalade "^3.1.1" picocolors "^1.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== +upng-js@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/upng-js/-/upng-js-2.1.0.tgz#7176e73973db361ca95d0fa14f958385db6b9dd2" + integrity sha512-d3xzZzpMP64YkjP5pr8gNyvBt7dLk/uGI67EctzDuVp4lCZyVMo0aJO6l/VDlgbInJYDY6cnClLoBp29eKWI6g== 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" + pako "^1.0.5" uri-js@^4.2.2: version "4.4.1" @@ -11024,6 +7581,14 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" +user-agents@^1.0.580: + version "1.0.1204" + resolved "https://registry.yarnpkg.com/user-agents/-/user-agents-1.0.1204.tgz#fae75805505b0405dad1a32663cb39ac911d3154" + integrity sha512-o7DEC4gacRNjaCqQstwGiRWGkUNaiLTfPDeAE4EFXZ7S43HCMAUuzVy4zhkook+qQ2cE1DLitshmP5ErnC+gZw== + dependencies: + dot-json "^1.2.2" + lodash.clonedeep "^4.5.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" @@ -11034,55 +7599,35 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== -util.promisify@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" - integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.2" - has-symbols "^1.0.1" - object.getownpropertydescriptors "^2.1.0" - -utila@~0.4: - version "0.4.0" - resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" - integrity sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA== - -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== - uuid@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -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== - -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== +uvu@^0.5.0: + version "0.5.6" + resolved "https://registry.yarnpkg.com/uvu/-/uvu-0.5.6.tgz#2754ca20bcb0bb59b64e9985e84d2e81058502df" + integrity sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA== dependencies: + dequal "^2.0.0" + diff "^5.0.0" + kleur "^4.0.3" + sade "^1.7.3" + +v8-to-istanbul@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4" + integrity sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w== + dependencies: + "@jridgewell/trace-mapping" "^0.3.12" "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" - source-map "^0.7.3" value-or-function@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813" integrity sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg== -vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== - verror@^1.10.0: version "1.10.1" resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb" @@ -11092,6 +7637,24 @@ verror@^1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" +vfile-message@^3.0.0: + version "3.1.3" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.1.3.tgz#1360c27a99234bebf7bddbbbca67807115e6b0dd" + integrity sha512-0yaU+rj2gKAyEk12ffdSbBfjnnj+b1zqTBv3OQCTn8yEB02bsPizwdBPrLJjHnK+cU9EMMcUnNv938XcZIkmdA== + dependencies: + "@types/unist" "^2.0.0" + unist-util-stringify-position "^3.0.0" + +vfile@^5.0.0: + version "5.3.6" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-5.3.6.tgz#61b2e70690cc835a5d0d0fd135beae74e5a39546" + integrity sha512-ADBsmerdGBs2WYckrLBEmuETSPyTD4TuLxTrw0DvjirxW1ra4ZwkbzG8ndsv3Q57smvHxo677MHaQrY9yxH8cA== + dependencies: + "@types/unist" "^2.0.0" + is-buffer "^2.0.0" + unist-util-stringify-position "^3.0.0" + vfile-message "^3.0.0" + vinyl-fs@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7" @@ -11128,7 +7691,7 @@ vinyl-sourcemap@^1.1.0: remove-bom-buffer "^3.0.0" vinyl "^2.0.0" -vinyl@^2.0.0, vinyl@~2.2.1: +vinyl@^2.0.0: version "2.2.1" resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974" integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw== @@ -11140,33 +7703,55 @@ vinyl@^2.0.0, vinyl@~2.2.1: remove-trailing-separator "^1.0.1" replace-ext "^1.0.0" +vinyl@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-3.0.0.tgz#11e14732bf56e2faa98ffde5157fe6c13259ff30" + integrity sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g== + dependencies: + clone "^2.1.2" + clone-stats "^1.0.0" + remove-trailing-separator "^1.1.0" + replace-ext "^2.0.0" + teex "^1.0.1" + +vite-plugin-electron@^0.10.2: + version "0.10.2" + resolved "https://registry.yarnpkg.com/vite-plugin-electron/-/vite-plugin-electron-0.10.2.tgz#931887f51bedf42c9b5203a73e5da3a72bedbe7a" + integrity sha512-sPGHDvIsMqmk/C2ZJue2JoZkO9L1cEum3J4hUUkeUPNHh0fg4EOfQiDoY//h2Cd8aCpoUiRpa1vHEYmypjBkgg== + +vite-plugin-svgr@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/vite-plugin-svgr/-/vite-plugin-svgr-2.2.2.tgz#c5c9cb573bf455bb079550531847ddc5d2e122af" + integrity sha512-u8Ac27uZmDHTVGawpAhvLMJMuzbGeZGhe61TGeHoRQLxVhmQfIYCefa0iLbjC0ui1zFo6XZnS8EkzPITCYp85g== + dependencies: + "@rollup/pluginutils" "^5.0.0" + "@svgr/core" "^6.4.0" + +vite@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/vite/-/vite-3.2.2.tgz#280762bfaf47bcea1d12698427331c0009ac7c1f" + integrity sha512-pLrhatFFOWO9kS19bQ658CnRYzv0WLbsPih6R+iFeEEhDOuYgYCX2rztUViMz/uy/V8cLCJvLFeiOK7RJEzHcw== + dependencies: + esbuild "^0.15.9" + postcss "^8.4.18" + resolve "^1.22.1" + rollup "^2.79.1" + optionalDependencies: + fsevents "~2.3.2" + void-elements@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09" integrity sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w== vue-template-compiler@^2.6.11: - version "2.7.8" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.8.tgz#eadd54ed8fbff55b7deb07093a976c07f451a1dc" - integrity sha512-eQqdcUpJKJpBRPDdxCNsqUoT0edNvdt1jFjtVnVS/LPPmr0BU2jWzXlrf6BVMeODtdLewB3j8j3WjNiB+V+giw== + version "2.7.12" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.12.tgz#762476971b13eb5ea5c786886be28395f345c1e1" + integrity sha512-6rhJAuo2vRzJMs8X/pd9yqtsJmnPEnv4E0cb9KCu0sfGhoDt8roCCa/6qbrvpc1b38zYgdmY/xrk4qfNWZIjwA== dependencies: de-indent "^1.0.2" he "^1.2.0" -w3c-hr-time@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" - integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== - dependencies: - browser-process-hrtime "^1.0.0" - -w3c-xmlserializer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" - integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== - dependencies: - xml-name-validator "^3.0.0" - walk-sync@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.2.0.tgz#80786b0657fcc8c0e1c0b1a042a09eae2966387a" @@ -11177,184 +7762,18 @@ walk-sync@^2.2.0: matcher-collection "^2.0.0" minimatch "^3.0.4" -walker@^1.0.7: +walker@^1.0.8: 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.12" -watchpack@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" - integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== - dependencies: - glob-to-regexp "^0.4.1" - graceful-fs "^4.1.2" - -wbuf@^1.1.0, wbuf@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" - integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== - dependencies: - minimalistic-assert "^1.0.0" - webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== -webidl-conversions@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" - integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== - -webidl-conversions@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" - integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== - -webidl-conversions@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" - integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== - -webpack-dev-middleware@^5.3.1: - version "5.3.3" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f" - integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA== - dependencies: - colorette "^2.0.10" - memfs "^3.4.3" - mime-types "^2.1.31" - range-parser "^1.2.1" - schema-utils "^4.0.0" - -webpack-dev-server@^4.6.0: - version "4.10.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.10.0.tgz#de270d0009eba050546912be90116e7fd740a9ca" - integrity sha512-7dezwAs+k6yXVFZ+MaL8VnE+APobiO3zvpp3rBHe/HmWQ+avwh0Q3d0xxacOiBybZZ3syTZw9HXzpa3YNbAZDQ== - dependencies: - "@types/bonjour" "^3.5.9" - "@types/connect-history-api-fallback" "^1.3.5" - "@types/express" "^4.17.13" - "@types/serve-index" "^1.9.1" - "@types/serve-static" "^1.13.10" - "@types/sockjs" "^0.3.33" - "@types/ws" "^8.5.1" - ansi-html-community "^0.0.8" - bonjour-service "^1.0.11" - chokidar "^3.5.3" - colorette "^2.0.10" - compression "^1.7.4" - connect-history-api-fallback "^2.0.0" - default-gateway "^6.0.3" - express "^4.17.3" - graceful-fs "^4.2.6" - html-entities "^2.3.2" - http-proxy-middleware "^2.0.3" - ipaddr.js "^2.0.1" - open "^8.0.9" - p-retry "^4.5.0" - rimraf "^3.0.2" - schema-utils "^4.0.0" - selfsigned "^2.0.1" - serve-index "^1.9.1" - sockjs "^0.3.24" - spdy "^4.0.2" - webpack-dev-middleware "^5.3.1" - ws "^8.4.2" - -webpack-manifest-plugin@^4.0.2: - version "4.1.1" - resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz#10f8dbf4714ff93a215d5a45bcc416d80506f94f" - integrity sha512-YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow== - dependencies: - tapable "^2.0.0" - webpack-sources "^2.2.0" - -webpack-sources@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" - integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== - dependencies: - source-list-map "^2.0.0" - source-map "~0.6.1" - -webpack-sources@^2.2.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.1.tgz#570de0af163949fe272233c2cefe1b56f74511fd" - integrity sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA== - dependencies: - source-list-map "^2.0.1" - source-map "^0.6.1" - -webpack-sources@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" - integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== - -webpack@^5.64.4: - version "5.74.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980" - integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA== - dependencies: - "@types/eslint-scope" "^3.7.3" - "@types/estree" "^0.0.51" - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/wasm-edit" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - acorn "^8.7.1" - acorn-import-assertions "^1.7.6" - browserslist "^4.14.5" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.10.0" - es-module-lexer "^0.9.0" - eslint-scope "5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.9" - json-parse-even-better-errors "^2.3.1" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.1.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.1.3" - watchpack "^2.4.0" - webpack-sources "^3.2.3" - -websocket-driver@>=0.5.1, websocket-driver@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" - integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== - dependencies: - http-parser-js ">=0.5.1" - safe-buffer ">=5.1.0" - websocket-extensions ">=0.1.1" - -websocket-extensions@>=0.1.1: - version "0.1.4" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" - integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== - -whatwg-encoding@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" - integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== - dependencies: - iconv-lite "0.4.24" - -whatwg-fetch@^3.6.2: - version "3.6.2" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c" - integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== - -whatwg-mimetype@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" - integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== - whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" @@ -11363,24 +7782,6 @@ whatwg-url@^5.0.0: tr46 "~0.0.3" webidl-conversions "^3.0.0" -whatwg-url@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06" - integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg== - dependencies: - lodash.sortby "^4.7.0" - tr46 "^1.0.1" - webidl-conversions "^4.0.2" - -whatwg-url@^8.0.0, whatwg-url@^8.5.0: - version "8.7.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" - integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== - dependencies: - lodash "^4.7.0" - tr46 "^2.1.0" - webidl-conversions "^6.1.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" @@ -11392,13 +7793,6 @@ which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" -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" - which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" @@ -11406,187 +7800,11 @@ which@^2.0.1: 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" - -word-wrap@^1.2.3, 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== -workbox-background-sync@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.5.4.tgz#3141afba3cc8aa2ae14c24d0f6811374ba8ff6a9" - integrity sha512-0r4INQZMyPky/lj4Ou98qxcThrETucOde+7mRGJl13MPJugQNKeZQOdIJe/1AchOP23cTqHcN/YVpD6r8E6I8g== - dependencies: - idb "^7.0.1" - workbox-core "6.5.4" - -workbox-broadcast-update@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.5.4.tgz#8441cff5417cd41f384ba7633ca960a7ffe40f66" - integrity sha512-I/lBERoH1u3zyBosnpPEtcAVe5lwykx9Yg1k6f8/BGEPGaMMgZrwVrqL1uA9QZ1NGGFoyE6t9i7lBjOlDhFEEw== - dependencies: - workbox-core "6.5.4" - -workbox-build@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.5.4.tgz#7d06d31eb28a878817e1c991c05c5b93409f0389" - integrity sha512-kgRevLXEYvUW9WS4XoziYqZ8Q9j/2ziJYEtTrjdz5/L/cTUa2XfyMP2i7c3p34lgqJ03+mTiz13SdFef2POwbA== - dependencies: - "@apideck/better-ajv-errors" "^0.3.1" - "@babel/core" "^7.11.1" - "@babel/preset-env" "^7.11.0" - "@babel/runtime" "^7.11.2" - "@rollup/plugin-babel" "^5.2.0" - "@rollup/plugin-node-resolve" "^11.2.1" - "@rollup/plugin-replace" "^2.4.1" - "@surma/rollup-plugin-off-main-thread" "^2.2.3" - ajv "^8.6.0" - common-tags "^1.8.0" - fast-json-stable-stringify "^2.1.0" - fs-extra "^9.0.1" - glob "^7.1.6" - lodash "^4.17.20" - pretty-bytes "^5.3.0" - rollup "^2.43.1" - rollup-plugin-terser "^7.0.0" - source-map "^0.8.0-beta.0" - stringify-object "^3.3.0" - strip-comments "^2.0.1" - tempy "^0.6.0" - upath "^1.2.0" - workbox-background-sync "6.5.4" - workbox-broadcast-update "6.5.4" - workbox-cacheable-response "6.5.4" - workbox-core "6.5.4" - workbox-expiration "6.5.4" - workbox-google-analytics "6.5.4" - workbox-navigation-preload "6.5.4" - workbox-precaching "6.5.4" - workbox-range-requests "6.5.4" - workbox-recipes "6.5.4" - workbox-routing "6.5.4" - workbox-strategies "6.5.4" - workbox-streams "6.5.4" - workbox-sw "6.5.4" - workbox-window "6.5.4" - -workbox-cacheable-response@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.5.4.tgz#a5c6ec0c6e2b6f037379198d4ef07d098f7cf137" - integrity sha512-DCR9uD0Fqj8oB2TSWQEm1hbFs/85hXXoayVwFKLVuIuxwJaihBsLsp4y7J9bvZbqtPJ1KlCkmYVGQKrBU4KAug== - dependencies: - workbox-core "6.5.4" - -workbox-core@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz#df48bf44cd58bb1d1726c49b883fb1dffa24c9ba" - integrity sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q== - -workbox-expiration@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.4.tgz#501056f81e87e1d296c76570bb483ce5e29b4539" - integrity sha512-jUP5qPOpH1nXtjGGh1fRBa1wJL2QlIb5mGpct3NzepjGG2uFFBn4iiEBiI9GUmfAFR2ApuRhDydjcRmYXddiEQ== - dependencies: - idb "^7.0.1" - workbox-core "6.5.4" - -workbox-google-analytics@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.5.4.tgz#c74327f80dfa4c1954cbba93cd7ea640fe7ece7d" - integrity sha512-8AU1WuaXsD49249Wq0B2zn4a/vvFfHkpcFfqAFHNHwln3jK9QUYmzdkKXGIZl9wyKNP+RRX30vcgcyWMcZ9VAg== - dependencies: - workbox-background-sync "6.5.4" - workbox-core "6.5.4" - workbox-routing "6.5.4" - workbox-strategies "6.5.4" - -workbox-navigation-preload@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.4.tgz#ede56dd5f6fc9e860a7e45b2c1a8f87c1c793212" - integrity sha512-IIwf80eO3cr8h6XSQJF+Hxj26rg2RPFVUmJLUlM0+A2GzB4HFbQyKkrgD5y2d84g2IbJzP4B4j5dPBRzamHrng== - dependencies: - workbox-core "6.5.4" - -workbox-precaching@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.4.tgz#740e3561df92c6726ab5f7471e6aac89582cab72" - integrity sha512-hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg== - dependencies: - workbox-core "6.5.4" - workbox-routing "6.5.4" - workbox-strategies "6.5.4" - -workbox-range-requests@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.4.tgz#86b3d482e090433dab38d36ae031b2bb0bd74399" - integrity sha512-Je2qR1NXCFC8xVJ/Lux6saH6IrQGhMpDrPXWZWWS8n/RD+WZfKa6dSZwU+/QksfEadJEr/NfY+aP/CXFFK5JFg== - dependencies: - workbox-core "6.5.4" - -workbox-recipes@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.5.4.tgz#cca809ee63b98b158b2702dcfb741b5cc3e24acb" - integrity sha512-QZNO8Ez708NNwzLNEXTG4QYSKQ1ochzEtRLGaq+mr2PyoEIC1xFW7MrWxrONUxBFOByksds9Z4//lKAX8tHyUA== - dependencies: - workbox-cacheable-response "6.5.4" - workbox-core "6.5.4" - workbox-expiration "6.5.4" - workbox-precaching "6.5.4" - workbox-routing "6.5.4" - workbox-strategies "6.5.4" - -workbox-routing@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da" - integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg== - dependencies: - workbox-core "6.5.4" - -workbox-strategies@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.4.tgz#4edda035b3c010fc7f6152918370699334cd204d" - integrity sha512-DEtsxhx0LIYWkJBTQolRxG4EI0setTJkqR4m7r4YpBdxtWJH1Mbg01Cj8ZjNOO8etqfA3IZaOPHUxCs8cBsKLw== - dependencies: - workbox-core "6.5.4" - -workbox-streams@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.5.4.tgz#1cb3c168a6101df7b5269d0353c19e36668d7d69" - integrity sha512-FXKVh87d2RFXkliAIheBojBELIPnWbQdyDvsH3t74Cwhg0fDheL1T8BqSM86hZvC0ZESLsznSYWw+Va+KVbUzg== - dependencies: - workbox-core "6.5.4" - workbox-routing "6.5.4" - -workbox-sw@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.5.4.tgz#d93e9c67924dd153a61367a4656ff4d2ae2ed736" - integrity sha512-vo2RQo7DILVRoH5LjGqw3nphavEjK4Qk+FenXeUsknKn14eCNedHOXWbmnvP4ipKhlE35pvJ4yl4YYf6YsJArA== - -workbox-webpack-plugin@^6.4.1: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.4.tgz#baf2d3f4b8f435f3469887cf4fba2b7fac3d0fd7" - integrity sha512-LmWm/zoaahe0EGmMTrSLUi+BjyR3cdGEfU3fS6PN1zKFYbqAKuQ+Oy/27e4VSXsyIwAw8+QDfk1XHNGtZu9nQg== - dependencies: - fast-json-stable-stringify "^2.1.0" - pretty-bytes "^5.4.1" - upath "^1.2.0" - webpack-sources "^1.4.3" - workbox-build "6.5.4" - -workbox-window@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.5.4.tgz#d991bc0a94dff3c2dbb6b84558cff155ca878e91" - integrity sha512-HnLZJDwYBE+hpG25AQBO8RUWBJRaCsI9ksQJEp3aCOFCaG5kqaToAYXFRAHxzRluM2cQbGzdQF5rjKPWPA1fug== - dependencies: - "@types/trusted-types" "^2.0.2" - workbox-core "6.5.4" - wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" @@ -11601,47 +7819,25 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -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== +write-file-atomic@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd" + integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg== dependencies: imurmurhash "^0.1.4" - is-typedarray "^1.0.0" - signal-exit "^3.0.2" - typedarray-to-buffer "^3.1.5" + signal-exit "^3.0.7" -ws@^7.3.1, ws@^7.4.6: +ws@^7.3.1: version "7.5.9" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== -ws@^8.4.2: - version "8.8.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0" - integrity sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA== - -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== - -xml-name-validator@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" - integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== - xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: version "15.1.1" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== -xmlchars@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" - integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== - -xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: +xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== @@ -11661,40 +7857,22 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: +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.x, 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-parser@^21.0.0: +yargs-parser@^21.0.0, yargs-parser@^21.0.1: version "21.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -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== +yargs@^17.3.1, yargs@^17.5.1: + version "17.6.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz#e134900fc1f218bc230192bdec06a0a5f973e46c" + integrity sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g== 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" - -yargs@^17.0.1: - version "17.5.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e" - integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA== - dependencies: - cliui "^7.0.2" + cliui "^8.0.1" escalade "^3.1.1" get-caller-file "^2.0.5" require-directory "^2.1.1" diff --git a/pkgs/games/heroic/yarn.nix b/pkgs/games/heroic/yarn.nix index 2366572f3db1..d8851bfbfdf0 100644 --- a/pkgs/games/heroic/yarn.nix +++ b/pkgs/games/heroic/yarn.nix @@ -25,14 +25,6 @@ sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; }; } - { - name = "_apideck_better_ajv_errors___better_ajv_errors_0.3.6.tgz"; - path = fetchurl { - name = "_apideck_better_ajv_errors___better_ajv_errors_0.3.6.tgz"; - url = "https://registry.yarnpkg.com/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz"; - sha512 = "P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA=="; - }; - } { name = "_babel_code_frame___code_frame_7.18.6.tgz"; path = fetchurl { @@ -42,35 +34,43 @@ }; } { - name = "_babel_compat_data___compat_data_7.18.8.tgz"; + name = "_babel_compat_data___compat_data_7.19.4.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.18.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.8.tgz"; - sha512 = "HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ=="; + name = "_babel_compat_data___compat_data_7.19.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.4.tgz"; + sha512 = "CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw=="; }; } { - name = "_babel_core___core_7.18.10.tgz"; + name = "_babel_core___core_7.19.3.tgz"; path = fetchurl { - name = "_babel_core___core_7.18.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.18.10.tgz"; - sha512 = "JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw=="; + name = "_babel_core___core_7.19.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.19.3.tgz"; + sha512 = "WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ=="; }; } { - name = "_babel_eslint_parser___eslint_parser_7.18.9.tgz"; + name = "_babel_core___core_7.19.6.tgz"; path = fetchurl { - name = "_babel_eslint_parser___eslint_parser_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.18.9.tgz"; - sha512 = "KzSGpMBggz4fKbRbWLNyPVTuQr6cmCcBhOyXTw/fieOVaw5oYAwcAj4a7UKcDYCPxQq+CG1NCDZH9e2JTXquiQ=="; + name = "_babel_core___core_7.19.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.19.6.tgz"; + sha512 = "D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg=="; }; } { - name = "_babel_generator___generator_7.18.12.tgz"; + name = "_babel_generator___generator_7.19.5.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.18.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.12.tgz"; - sha512 = "dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg=="; + name = "_babel_generator___generator_7.19.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.5.tgz"; + sha512 = "DxbNz9Lz4aMZ99qPpO1raTbcrI1ZeYh+9NR9qhfkQIbFtVEqotHojEBxHzmxhVONkGt6VyrqVQcgpefMy9pqcg=="; + }; + } + { + name = "_babel_generator___generator_7.20.1.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.20.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.1.tgz"; + sha512 = "u1dMdBUmA7Z0rBB97xh8pIhviK7oItYOkjbsCxTWMknyvbQRBwX7/gn4JXurRdirWMFh+ZtYARqkA6ydogVZpg=="; }; } { @@ -82,43 +82,11 @@ }; } { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.18.9.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.19.3.tgz"; path = fetchurl { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz"; - sha512 = "yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw=="; - }; - } - { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.18.9.tgz"; - path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz"; - sha512 = "tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg=="; - }; - } - { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.18.9.tgz"; - path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz"; - sha512 = "WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw=="; - }; - } - { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.18.6.tgz"; - path = fetchurl { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz"; - sha512 = "7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A=="; - }; - } - { - name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.3.2.tgz"; - path = fetchurl { - name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz"; - sha512 = "r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg=="; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.19.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz"; + sha512 = "65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg=="; }; } { @@ -130,19 +98,11 @@ }; } { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.18.6.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.19.0.tgz"; path = fetchurl { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz"; - sha512 = "eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg=="; - }; - } - { - name = "_babel_helper_function_name___helper_function_name_7.18.9.tgz"; - path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz"; - sha512 = "fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A=="; + name = "_babel_helper_function_name___helper_function_name_7.19.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz"; + sha512 = "WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w=="; }; } { @@ -153,14 +113,6 @@ sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; }; } - { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.18.9.tgz"; - path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz"; - sha512 = "RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg=="; - }; - } { name = "_babel_helper_module_imports___helper_module_imports_7.18.6.tgz"; path = fetchurl { @@ -170,59 +122,35 @@ }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.18.9.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.19.0.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz"; - sha512 = "KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g=="; + name = "_babel_helper_module_transforms___helper_module_transforms_7.19.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz"; + sha512 = "3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ=="; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.18.6.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.19.6.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz"; - sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="; + name = "_babel_helper_module_transforms___helper_module_transforms_7.19.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz"; + sha512 = "fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw=="; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.18.9.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.19.0.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz"; - sha512 = "aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w=="; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.19.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz"; + sha512 = "40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="; }; } { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.18.9.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.19.4.tgz"; path = fetchurl { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz"; - sha512 = "dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA=="; - }; - } - { - name = "_babel_helper_replace_supers___helper_replace_supers_7.18.9.tgz"; - path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz"; - sha512 = "dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ=="; - }; - } - { - name = "_babel_helper_simple_access___helper_simple_access_7.18.6.tgz"; - path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz"; - sha512 = "iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g=="; - }; - } - { - name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.18.9.tgz"; - path = fetchurl { - name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz"; - sha512 = "imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw=="; + name = "_babel_helper_simple_access___helper_simple_access_7.19.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz"; + sha512 = "f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg=="; }; } { @@ -234,19 +162,19 @@ }; } { - name = "_babel_helper_string_parser___helper_string_parser_7.18.10.tgz"; + name = "_babel_helper_string_parser___helper_string_parser_7.19.4.tgz"; path = fetchurl { - name = "_babel_helper_string_parser___helper_string_parser_7.18.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz"; - sha512 = "XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="; + name = "_babel_helper_string_parser___helper_string_parser_7.19.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz"; + sha512 = "nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.18.6.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz"; - sha512 = "MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"; + sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; }; } { @@ -258,19 +186,19 @@ }; } { - name = "_babel_helper_wrap_function___helper_wrap_function_7.18.11.tgz"; + name = "_babel_helpers___helpers_7.19.4.tgz"; path = fetchurl { - name = "_babel_helper_wrap_function___helper_wrap_function_7.18.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz"; - sha512 = "oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w=="; + name = "_babel_helpers___helpers_7.19.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.4.tgz"; + sha512 = "G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw=="; }; } { - name = "_babel_helpers___helpers_7.18.9.tgz"; + name = "_babel_helpers___helpers_7.20.1.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.9.tgz"; - sha512 = "Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ=="; + name = "_babel_helpers___helpers_7.20.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.1.tgz"; + sha512 = "J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg=="; }; } { @@ -282,155 +210,19 @@ }; } { - name = "_babel_parser___parser_7.18.11.tgz"; + name = "_babel_parser___parser_7.19.4.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.18.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.11.tgz"; - sha512 = "9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ=="; + name = "_babel_parser___parser_7.19.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.4.tgz"; + sha512 = "qpVT7gtuOLjWeDTKLkJ6sryqLliBaFpAtGeqw5cs5giLldvh+Ch0plqnUMKoVAUS6ZEueQQiZV+p5pxtPitEsA=="; }; } { - name = "_babel_plugin_bugfix_safari_id_destructuring_collision_in_function_expression___plugin_bugfix_safari_id_destructuring_collision_in_function_expression_7.18.6.tgz"; + name = "_babel_parser___parser_7.20.1.tgz"; path = fetchurl { - name = "_babel_plugin_bugfix_safari_id_destructuring_collision_in_function_expression___plugin_bugfix_safari_id_destructuring_collision_in_function_expression_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz"; - sha512 = "Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ=="; - }; - } - { - name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz"; - sha512 = "AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg=="; - }; - } - { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.18.10.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.18.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz"; - sha512 = "1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew=="; - }; - } - { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz"; - sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; - }; - } - { - name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz"; - sha512 = "+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw=="; - }; - } - { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.18.10.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.18.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.10.tgz"; - sha512 = "wdGTwWF5QtpTY/gbBtQLAiCnoxfD4qMbN87NYZle1dOZ9Os8Y6zXcKrIaOU8W+TIvFUWVGG9tUgNww3CjXRVVw=="; - }; - } - { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz"; - sha512 = "1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw=="; - }; - } - { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz"; - sha512 = "k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA=="; - }; - } - { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz"; - sha512 = "lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ=="; - }; - } - { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz"; - sha512 = "128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q=="; - }; - } - { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz"; - sha512 = "wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA=="; - }; - } - { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz"; - sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q=="; - }; - } - { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz"; - sha512 = "kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q=="; - }; - } - { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz"; - sha512 = "Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw=="; - }; - } - { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz"; - sha512 = "v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w=="; - }; - } - { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz"; - sha512 = "nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA=="; - }; - } - { - name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz"; - sha512 = "9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw=="; - }; - } - { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz"; - sha512 = "2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w=="; + name = "_babel_parser___parser_7.20.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.1.tgz"; + sha512 = "hp0AYxaZJhxULfM1zyp7Wgr+pSUKBcP3M+PHnSzWGdXOzg/kHWIgiUWARvubhUKGOEw3xqY4x+lyZ9ytBVcELw=="; }; } { @@ -457,54 +249,6 @@ sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; }; } - { - name = "_babel_plugin_syntax_class_static_block___plugin_syntax_class_static_block_7.14.5.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_class_static_block___plugin_syntax_class_static_block_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"; - sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; - }; - } - { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.18.6.tgz"; - sha512 = "fqyLgjcxf/1yhyZ6A+yo1u9gJ7eleFQod2lkaUsF9DQ7sbbY3Ligym3L0+I2c0WmqNKDpoD9UTb1AKP3qRMOAQ=="; - }; - } - { - 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"; - sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; - }; - } - { - 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"; - sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; - }; - } - { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz"; - sha512 = "LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A=="; - }; - } - { - name = "_babel_plugin_syntax_import_assertions___plugin_syntax_import_assertions_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_import_assertions___plugin_syntax_import_assertions_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz"; - sha512 = "/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ=="; - }; - } { name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz"; path = fetchurl { @@ -577,14 +321,6 @@ sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; }; } - { - name = "_babel_plugin_syntax_private_property_in_object___plugin_syntax_private_property_in_object_7.14.5.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_private_property_in_object___plugin_syntax_private_property_in_object_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"; - sha512 = "0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg=="; - }; - } { name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.14.5.tgz"; path = fetchurl { @@ -601,214 +337,6 @@ sha512 = "mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA=="; }; } - { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz"; - sha512 = "9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ=="; - }; - } - { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz"; - sha512 = "ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag=="; - }; - } - { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz"; - sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; - }; - } - { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz"; - sha512 = "5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw=="; - }; - } - { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz"; - sha512 = "EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g=="; - }; - } - { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz"; - sha512 = "+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw=="; - }; - } - { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz"; - sha512 = "p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA=="; - }; - } - { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz"; - sha512 = "6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg=="; - }; - } - { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz"; - sha512 = "d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw=="; - }; - } - { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz"; - sha512 = "wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw=="; - }; - } - { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.18.9.tgz"; - sha512 = "+G6rp2zRuOAInY5wcggsx4+QVao1qPM0osC9fTUVlAV3zOrzTCnrMAFVnR6+a3T8wz1wFIH7KhYMcMB3u1n80A=="; - }; - } - { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.18.8.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.18.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz"; - sha512 = "yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ=="; - }; - } - { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz"; - sha512 = "WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ=="; - }; - } - { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz"; - sha512 = "IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg=="; - }; - } - { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz"; - sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA=="; - }; - } - { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz"; - sha512 = "Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg=="; - }; - } - { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz"; - sha512 = "Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q=="; - }; - } - { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz"; - sha512 = "zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A=="; - }; - } - { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz"; - sha512 = "dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ=="; - }; - } - { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz"; - sha512 = "UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg=="; - }; - } - { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz"; - sha512 = "DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw=="; - }; - } - { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz"; - sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="; - }; - } - { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.18.8.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.18.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz"; - sha512 = "ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg=="; - }; - } - { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz"; - sha512 = "cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg=="; - }; - } - { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.18.12.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.18.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.18.12.tgz"; - sha512 = "Q99U9/ttiu+LMnRU8psd23HhvwXmKWDQIpocm0JKaICcZHnw+mdQbHm6xnSy7dOl8I5PELakYtNBubNQlBXbZw=="; - }; - } - { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz"; - sha512 = "TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA=="; - }; - } { name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.18.6.tgz"; path = fetchurl { @@ -818,155 +346,43 @@ }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.18.10.tgz"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.18.6.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.18.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.18.10.tgz"; - sha512 = "gCy7Iikrpu3IZjYZolFE4M1Sm+nrh1/6za2Ewj77Z+XirT4TsbJcvOFOyF+fRPwU6AKKK136CZxx6L8AbSFG6A=="; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.18.6.tgz"; + sha512 = "A0LQGx4+4Jv7u/tWzoJF7alZwnBDQd6cGLh9P+Ttk4dpiL+J5p7NSNv/9tlEFFJDq3kjxOavWmbm6t0Gk+A3Ig=="; }; } { - name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.18.6.tgz"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.19.6.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz"; - sha512 = "I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ=="; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.19.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.19.6.tgz"; + sha512 = "RpAi004QyMNisst/pvSanoRdJ4q+jMCWyk9zdw/CyLB9j8RXEahodR6l2GyttDRyEVWZtbN+TpLiHJ3t34LbsQ=="; }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.18.6.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.19.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz"; - sha512 = "poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ=="; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.19.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz"; + sha512 = "UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg=="; }; } { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.18.6.tgz"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.19.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz"; - sha512 = "oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA=="; + name = "_babel_runtime_corejs3___runtime_corejs3_7.19.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.19.4.tgz"; + sha512 = "HzjQ8+dzdx7dmZy4DQ8KV8aHi/74AjEbBGTFutBmg/pd3dY5/q1sfuOGPTFGEytlQhWoeVXqcK5BwMgIkRkNDQ=="; }; } { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.18.10.tgz"; + name = "_babel_runtime___runtime_7.19.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.18.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.10.tgz"; - sha512 = "q5mMeYAdfEbpBAgzl7tBre/la3LeCxmDO1+wMXRdPWbcoMjR3GiXlCLk7JBZVVye0bqTGNMbt0yYVXX1B1jEWQ=="; - }; - } - { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz"; - sha512 = "eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw=="; - }; - } - { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz"; - sha512 = "39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA=="; - }; - } - { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz"; - sha512 = "kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q=="; - }; - } - { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz"; - sha512 = "S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA=="; - }; - } - { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz"; - sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw=="; - }; - } - { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.18.12.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.18.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.12.tgz"; - sha512 = "2vjjam0cum0miPkenUbQswKowuxs/NjMwIKEq0zwegRxXk12C9YOF9STXnaUptITOtOJHKHpzvvWYOjbm6tc0w=="; - }; - } - { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.18.10.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.18.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz"; - sha512 = "kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ=="; - }; - } - { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz"; - sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA=="; - }; - } - { - name = "_babel_preset_env___preset_env_7.18.10.tgz"; - path = fetchurl { - name = "_babel_preset_env___preset_env_7.18.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.10.tgz"; - sha512 = "wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA=="; - }; - } - { - name = "_babel_preset_modules___preset_modules_0.1.5.tgz"; - path = fetchurl { - name = "_babel_preset_modules___preset_modules_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz"; - sha512 = "A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA=="; - }; - } - { - name = "_babel_preset_react___preset_react_7.18.6.tgz"; - path = fetchurl { - name = "_babel_preset_react___preset_react_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.18.6.tgz"; - sha512 = "zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg=="; - }; - } - { - name = "_babel_preset_typescript___preset_typescript_7.18.6.tgz"; - path = fetchurl { - name = "_babel_preset_typescript___preset_typescript_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz"; - sha512 = "s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ=="; - }; - } - { - name = "_babel_runtime_corejs3___runtime_corejs3_7.18.9.tgz"; - path = fetchurl { - name = "_babel_runtime_corejs3___runtime_corejs3_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.18.9.tgz"; - sha512 = "qZEWeccZCrHA2Au4/X05QW5CMdm4VjUDCrGq5gf1ZDcM4hRqreKrtwAn7yci9zfgAS9apvnsFXiGBHBAxZdK9A=="; - }; - } - { - name = "_babel_runtime___runtime_7.18.9.tgz"; - path = fetchurl { - name = "_babel_runtime___runtime_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.9.tgz"; - sha512 = "lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw=="; + name = "_babel_runtime___runtime_7.19.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.4.tgz"; + sha512 = "EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA=="; }; } { @@ -978,19 +394,35 @@ }; } { - name = "_babel_traverse___traverse_7.18.11.tgz"; + name = "_babel_traverse___traverse_7.19.4.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.18.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.11.tgz"; - sha512 = "TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ=="; + name = "_babel_traverse___traverse_7.19.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.4.tgz"; + sha512 = "w3K1i+V5u2aJUOXBFFC5pveFLmtq1s3qcdDNC2qRI6WPBQIDaKFqXxDEqDO/h1dQ3HjsZoZMyIy6jGLq0xtw+g=="; }; } { - name = "_babel_types___types_7.18.10.tgz"; + name = "_babel_traverse___traverse_7.20.1.tgz"; path = fetchurl { - name = "_babel_types___types_7.18.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.18.10.tgz"; - sha512 = "MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ=="; + name = "_babel_traverse___traverse_7.20.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.1.tgz"; + sha512 = "d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA=="; + }; + } + { + name = "_babel_types___types_7.19.4.tgz"; + path = fetchurl { + name = "_babel_types___types_7.19.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.19.4.tgz"; + sha512 = "M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw=="; + }; + } + { + name = "_babel_types___types_7.20.0.tgz"; + path = fetchurl { + name = "_babel_types___types_7.20.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.20.0.tgz"; + sha512 = "Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg=="; }; } { @@ -1001,118 +433,6 @@ sha512 = "0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="; }; } - { - name = "_csstools_normalize.css___normalize.css_12.0.0.tgz"; - path = fetchurl { - name = "_csstools_normalize.css___normalize.css_12.0.0.tgz"; - url = "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-12.0.0.tgz"; - sha512 = "M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg=="; - }; - } - { - name = "_csstools_postcss_cascade_layers___postcss_cascade_layers_1.0.5.tgz"; - path = fetchurl { - name = "_csstools_postcss_cascade_layers___postcss_cascade_layers_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.0.5.tgz"; - sha512 = "Id/9wBT7FkgFzdEpiEWrsVd4ltDxN0rI0QS0SChbeQiSuux3z21SJCRLu6h2cvCEUmaRi+VD0mHFj+GJD4GFnw=="; - }; - } - { - name = "_csstools_postcss_color_function___postcss_color_function_1.1.1.tgz"; - path = fetchurl { - name = "_csstools_postcss_color_function___postcss_color_function_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz"; - sha512 = "Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw=="; - }; - } - { - name = "_csstools_postcss_font_format_keywords___postcss_font_format_keywords_1.0.1.tgz"; - path = fetchurl { - name = "_csstools_postcss_font_format_keywords___postcss_font_format_keywords_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz"; - sha512 = "ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg=="; - }; - } - { - name = "_csstools_postcss_hwb_function___postcss_hwb_function_1.0.2.tgz"; - path = fetchurl { - name = "_csstools_postcss_hwb_function___postcss_hwb_function_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz"; - sha512 = "YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w=="; - }; - } - { - name = "_csstools_postcss_ic_unit___postcss_ic_unit_1.0.1.tgz"; - path = fetchurl { - name = "_csstools_postcss_ic_unit___postcss_ic_unit_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz"; - sha512 = "Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw=="; - }; - } - { - name = "_csstools_postcss_is_pseudo_class___postcss_is_pseudo_class_2.0.7.tgz"; - path = fetchurl { - name = "_csstools_postcss_is_pseudo_class___postcss_is_pseudo_class_2.0.7.tgz"; - url = "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz"; - sha512 = "7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA=="; - }; - } - { - name = "_csstools_postcss_normalize_display_values___postcss_normalize_display_values_1.0.1.tgz"; - path = fetchurl { - name = "_csstools_postcss_normalize_display_values___postcss_normalize_display_values_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz"; - sha512 = "jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw=="; - }; - } - { - name = "_csstools_postcss_oklab_function___postcss_oklab_function_1.1.1.tgz"; - path = fetchurl { - name = "_csstools_postcss_oklab_function___postcss_oklab_function_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz"; - sha512 = "nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA=="; - }; - } - { - name = "_csstools_postcss_progressive_custom_properties___postcss_progressive_custom_properties_1.3.0.tgz"; - path = fetchurl { - name = "_csstools_postcss_progressive_custom_properties___postcss_progressive_custom_properties_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz"; - sha512 = "ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA=="; - }; - } - { - name = "_csstools_postcss_stepped_value_functions___postcss_stepped_value_functions_1.0.1.tgz"; - path = fetchurl { - name = "_csstools_postcss_stepped_value_functions___postcss_stepped_value_functions_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz"; - sha512 = "dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ=="; - }; - } - { - name = "_csstools_postcss_trigonometric_functions___postcss_trigonometric_functions_1.0.2.tgz"; - path = fetchurl { - name = "_csstools_postcss_trigonometric_functions___postcss_trigonometric_functions_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz"; - sha512 = "woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og=="; - }; - } - { - name = "_csstools_postcss_unset_value___postcss_unset_value_1.0.2.tgz"; - path = fetchurl { - name = "_csstools_postcss_unset_value___postcss_unset_value_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz"; - sha512 = "c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g=="; - }; - } - { - name = "_csstools_selector_specificity___selector_specificity_2.0.2.tgz"; - path = fetchurl { - name = "_csstools_selector_specificity___selector_specificity_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz"; - sha512 = "IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg=="; - }; - } { name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; path = fetchurl { @@ -1138,19 +458,19 @@ }; } { - name = "_emotion_babel_plugin___babel_plugin_11.10.0.tgz"; + name = "_emotion_babel_plugin___babel_plugin_11.10.2.tgz"; path = fetchurl { - name = "_emotion_babel_plugin___babel_plugin_11.10.0.tgz"; - url = "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.10.0.tgz"; - sha512 = "xVnpDAAbtxL1dsuSelU5A7BnY/lftws0wUexNJZTPsvX/1tM4GZJbclgODhvW4E+NH7E5VFcH0bBn30NvniPJA=="; + name = "_emotion_babel_plugin___babel_plugin_11.10.2.tgz"; + url = "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.10.2.tgz"; + sha512 = "xNQ57njWTFVfPAc3cjfuaPdsgLp5QOSuRsj9MA6ndEhH/AzuZM86qIQzt6rq+aGBwj3n5/TkLmU5lhAfdRmogA=="; }; } { - name = "_emotion_cache___cache_11.10.1.tgz"; + name = "_emotion_cache___cache_11.10.3.tgz"; path = fetchurl { - name = "_emotion_cache___cache_11.10.1.tgz"; - url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.10.1.tgz"; - sha512 = "uZTj3Yz5D69GE25iFZcIQtibnVCFsc/6+XIozyL3ycgWvEdif2uEw9wlUt6umjLr4Keg9K6xRPHmD8LGi+6p1A=="; + name = "_emotion_cache___cache_11.10.3.tgz"; + url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.10.3.tgz"; + sha512 = "Psmp/7ovAa8appWh3g51goxu/z3iVms7JXOreq136D8Bbn6dYraPnmL6mdM8GThEx9vwSn92Fz+mGSjBzN8UPQ=="; }; } { @@ -1178,11 +498,11 @@ }; } { - name = "_emotion_react___react_11.10.0.tgz"; + name = "_emotion_react___react_11.10.4.tgz"; path = fetchurl { - name = "_emotion_react___react_11.10.0.tgz"; - url = "https://registry.yarnpkg.com/@emotion/react/-/react-11.10.0.tgz"; - sha512 = "K6z9zlHxxBXwN8TcpwBKcEsBsOw4JWCCmR+BeeOWgqp8GIU1yA2Odd41bwdAAr0ssbQrbJbVnndvv7oiv1bZeQ=="; + name = "_emotion_react___react_11.10.4.tgz"; + url = "https://registry.yarnpkg.com/@emotion/react/-/react-11.10.4.tgz"; + sha512 = "j0AkMpr6BL8gldJZ6XQsQ8DnS9TxEQu1R+OGmDZiWjBAJtCcbt0tS3I/YffoqHXxH6MjgI7KdMbYKw3MEiU9eA=="; }; } { @@ -1202,11 +522,11 @@ }; } { - name = "_emotion_styled___styled_11.10.0.tgz"; + name = "_emotion_styled___styled_11.10.4.tgz"; path = fetchurl { - name = "_emotion_styled___styled_11.10.0.tgz"; - url = "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.10.0.tgz"; - sha512 = "V9oaEH6V4KePeQpgUE83i8ht+4Ri3E8Djp/ZPJ4DQlqWhSKITvgzlR3/YQE2hdfP4Jw3qVRkANJz01LLqK9/TA=="; + name = "_emotion_styled___styled_11.10.4.tgz"; + url = "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.10.4.tgz"; + sha512 = "pRl4R8Ez3UXvOPfc2bzIoV8u9P97UedgHS4FPX594ntwEuAMA114wlaHvOK24HB48uqfXiGlYIZYCxVJ1R1ttQ=="; }; } { @@ -1217,6 +537,14 @@ sha512 = "VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw=="; }; } + { + name = "_emotion_use_insertion_effect_with_fallbacks___use_insertion_effect_with_fallbacks_1.0.0.tgz"; + path = fetchurl { + name = "_emotion_use_insertion_effect_with_fallbacks___use_insertion_effect_with_fallbacks_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz"; + sha512 = "1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A=="; + }; + } { name = "_emotion_utils___utils_1.2.0.tgz"; path = fetchurl { @@ -1234,19 +562,43 @@ }; } { - name = "_eslint_eslintrc___eslintrc_1.3.0.tgz"; + name = "_esbuild_android_arm___android_arm_0.15.10.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz"; - sha512 = "UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw=="; + name = "_esbuild_android_arm___android_arm_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.10.tgz"; + sha512 = "FNONeQPy/ox+5NBkcSbYJxoXj9GWu8gVGJTVmUyoOCKQFDTrHVKgNSzChdNt0I8Aj/iKcsDf2r9BFwv+FSNUXg=="; }; } { - name = "_fontsource_cabin___cabin_4.5.7.tgz"; + name = "_esbuild_linux_loong64___linux_loong64_0.15.10.tgz"; path = fetchurl { - name = "_fontsource_cabin___cabin_4.5.7.tgz"; - url = "https://registry.yarnpkg.com/@fontsource/cabin/-/cabin-4.5.7.tgz"; - sha512 = "UXqN46WKawd9uCuMqSdt6UJXo32gqeJUiuIvZLUfCe6reXBmnkyoG+V62UVEf/Dmw9TII6DNwJujpa0rgiAHjQ=="; + name = "_esbuild_linux_loong64___linux_loong64_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.10.tgz"; + sha512 = "w0Ou3Z83LOYEkwaui2M8VwIp+nLi/NA60lBLMvaJ+vXVMcsARYdEzLNE7RSm4+lSg4zq4d7fAVuzk7PNQ5JFgg=="; + }; + } + { + name = "_eslint_eslintrc___eslintrc_1.3.3.tgz"; + path = fetchurl { + name = "_eslint_eslintrc___eslintrc_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz"; + sha512 = "uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg=="; + }; + } + { + name = "_fiahfy_packbits___packbits_0.0.6.tgz"; + path = fetchurl { + name = "_fiahfy_packbits___packbits_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/@fiahfy/packbits/-/packbits-0.0.6.tgz"; + sha512 = "XuhF/edg+iIvXjkCWgfj6fWtRi/KrEPg2ILXj1l86EN4EssuOiPcLKgkMDr9cL8jTGtVd/MKUWW6Y0/ZVf1PGA=="; + }; + } + { + name = "_fontsource_cabin___cabin_4.5.8.tgz"; + path = fetchurl { + name = "_fontsource_cabin___cabin_4.5.8.tgz"; + url = "https://registry.yarnpkg.com/@fontsource/cabin/-/cabin-4.5.8.tgz"; + sha512 = "IdNdnl/oSC27EQQ3xJcpg1kWuSk9yAKDp2A7hDfn3xccKfWYGk9vtr85Dinv/W9KO5Kx0hWT4NT4jub2p8Mr8A=="; }; } { @@ -1258,43 +610,43 @@ }; } { - name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_6.1.2.tgz"; + name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_6.2.0.tgz"; path = fetchurl { - name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.2.tgz"; - sha512 = "wBaAPGz1Awxg05e0PBRkDRuTsy4B3dpBm+zreTTyd9TH4uUM27cAL4xWyWR0rLJCrRwzVsQ4hF3FvM6rqydKPA=="; + name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz"; + sha512 = "rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg=="; }; } { - name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_6.1.2.tgz"; + name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_6.2.0.tgz"; path = fetchurl { - name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.1.2.tgz"; - sha512 = "853G/Htp0BOdXnPoeCPTjFrVwyrJHpe8MhjB/DYE9XjwhnNDfuBCd3aKc2YUYbEfHEcBws4UAA0kA9dymZKGjA=="; + name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.0.tgz"; + sha512 = "Cf2mAAeMWFMzpLC7Y9H1I4o3wEU+XovVJhTiNG8ZNgSQj53yl7OCJaS80K4YjrABWZzbAHVaoHE1dVJ27AAYXw=="; }; } { - name = "_fortawesome_free_brands_svg_icons___free_brands_svg_icons_6.1.2.tgz"; + name = "_fortawesome_free_brands_svg_icons___free_brands_svg_icons_6.2.0.tgz"; path = fetchurl { - name = "_fortawesome_free_brands_svg_icons___free_brands_svg_icons_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.1.2.tgz"; - sha512 = "b2eMfXQBsSxh52pcPtYchURQs6BWNh3zVTG8XH8Lv6V4kDhEg7D0kHN+K1SZniDiPb/e5tBlaygsinMUvetITA=="; + name = "_fortawesome_free_brands_svg_icons___free_brands_svg_icons_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.0.tgz"; + sha512 = "fm1y4NyZ2qKYNmYhdMz9VAWRw1Et7PMHNunSw3W0SVAwKwv6o0qiJworLH3Y9SnmhHzAymXJwCX1op22FFvGiA=="; }; } { - name = "_fortawesome_free_regular_svg_icons___free_regular_svg_icons_6.1.2.tgz"; + name = "_fortawesome_free_regular_svg_icons___free_regular_svg_icons_6.2.0.tgz"; path = fetchurl { - name = "_fortawesome_free_regular_svg_icons___free_regular_svg_icons_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.1.2.tgz"; - sha512 = "xR4hA+tAwsaTHGfb+25H1gVU/aJ0Rzu+xIUfnyrhaL13yNQ7TWiI2RvzniAaB+VGHDU2a+Pk96Ve+pkN3/+TTQ=="; + name = "_fortawesome_free_regular_svg_icons___free_regular_svg_icons_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.0.tgz"; + sha512 = "M1dG+PAmkYMTL9BSUHFXY5oaHwBYfHCPhbJ8qj8JELsc9XCrUJ6eEHWip4q0tE+h9C0DVyFkwIM9t7QYyCpprQ=="; }; } { - name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_6.1.2.tgz"; + name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_6.2.0.tgz"; path = fetchurl { - name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.2.tgz"; - sha512 = "lTgZz+cMpzjkHmCwOG3E1ilUZrnINYdqMmrkv30EC3XbRsGlbIOL8H9LaNp5SV4g0pNJDfQ4EdTWWaMvdwyLiQ=="; + name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.0.tgz"; + sha512 = "UjCILHIQ4I8cN46EiQn0CZL/h8AwCGgR//1c4R96Q5viSRwuKVo0NdQEc4bm+69ZwC0dUvjbDqAHF1RR5FA3XA=="; }; } { @@ -1306,19 +658,19 @@ }; } { - name = "_humanwhocodes_config_array___config_array_0.10.4.tgz"; + name = "_humanwhocodes_config_array___config_array_0.10.7.tgz"; path = fetchurl { - name = "_humanwhocodes_config_array___config_array_0.10.4.tgz"; - url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.4.tgz"; - sha512 = "mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw=="; + name = "_humanwhocodes_config_array___config_array_0.10.7.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.7.tgz"; + sha512 = "MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w=="; }; } { - name = "_humanwhocodes_gitignore_to_minimatch___gitignore_to_minimatch_1.0.2.tgz"; + name = "_humanwhocodes_module_importer___module_importer_1.0.1.tgz"; path = fetchurl { - name = "_humanwhocodes_gitignore_to_minimatch___gitignore_to_minimatch_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz"; - sha512 = "rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA=="; + name = "_humanwhocodes_module_importer___module_importer_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz"; + sha512 = "bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="; }; } { @@ -1345,14 +697,6 @@ sha512 = "ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="; }; } - { - name = "_jest_console___console_27.5.1.tgz"; - path = fetchurl { - 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_console___console_28.1.3.tgz"; path = fetchurl { @@ -1362,43 +706,67 @@ }; } { - name = "_jest_core___core_27.5.1.tgz"; + name = "_jest_core___core_28.1.3.tgz"; path = fetchurl { - 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_core___core_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/core/-/core-28.1.3.tgz"; + sha512 = "CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA=="; }; } { - name = "_jest_environment___environment_27.5.1.tgz"; + name = "_jest_environment___environment_28.1.3.tgz"; path = fetchurl { - 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_environment___environment_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/environment/-/environment-28.1.3.tgz"; + sha512 = "1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA=="; }; } { - name = "_jest_fake_timers___fake_timers_27.5.1.tgz"; + name = "_jest_expect_utils___expect_utils_28.1.3.tgz"; path = fetchurl { - 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_expect_utils___expect_utils_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-28.1.3.tgz"; + sha512 = "wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA=="; }; } { - name = "_jest_globals___globals_27.5.1.tgz"; + name = "_jest_expect_utils___expect_utils_29.1.2.tgz"; path = fetchurl { - 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_expect_utils___expect_utils_29.1.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.1.2.tgz"; + sha512 = "4a48bhKfGj/KAH39u0ppzNTABXQ8QPccWAFUFobWBaEMSMp+sB31Z2fK/l47c4a/Mu1po2ffmfAIPxXbVTXdtg=="; }; } { - name = "_jest_reporters___reporters_27.5.1.tgz"; + name = "_jest_expect___expect_28.1.3.tgz"; path = fetchurl { - 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_expect___expect_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/expect/-/expect-28.1.3.tgz"; + sha512 = "lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw=="; + }; + } + { + name = "_jest_fake_timers___fake_timers_28.1.3.tgz"; + path = fetchurl { + name = "_jest_fake_timers___fake_timers_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-28.1.3.tgz"; + sha512 = "D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw=="; + }; + } + { + name = "_jest_globals___globals_28.1.3.tgz"; + path = fetchurl { + name = "_jest_globals___globals_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/globals/-/globals-28.1.3.tgz"; + sha512 = "XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA=="; + }; + } + { + name = "_jest_reporters___reporters_28.1.3.tgz"; + path = fetchurl { + name = "_jest_reporters___reporters_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-28.1.3.tgz"; + sha512 = "JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg=="; }; } { @@ -1410,19 +778,19 @@ }; } { - name = "_jest_source_map___source_map_27.5.1.tgz"; + name = "_jest_schemas___schemas_29.0.0.tgz"; path = fetchurl { - 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_schemas___schemas_29.0.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz"; + sha512 = "3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA=="; }; } { - name = "_jest_test_result___test_result_27.5.1.tgz"; + name = "_jest_source_map___source_map_28.1.2.tgz"; path = fetchurl { - 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_source_map___source_map_28.1.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-28.1.2.tgz"; + sha512 = "cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww=="; }; } { @@ -1434,19 +802,19 @@ }; } { - name = "_jest_test_sequencer___test_sequencer_27.5.1.tgz"; + name = "_jest_test_sequencer___test_sequencer_28.1.3.tgz"; path = fetchurl { - 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_test_sequencer___test_sequencer_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz"; + sha512 = "NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw=="; }; } { - name = "_jest_transform___transform_27.5.1.tgz"; + name = "_jest_transform___transform_28.1.3.tgz"; path = fetchurl { - 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_transform___transform_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/transform/-/transform-28.1.3.tgz"; + sha512 = "u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA=="; }; } { @@ -1457,14 +825,6 @@ sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ=="; }; } - { - name = "_jest_types___types_27.5.1.tgz"; - path = fetchurl { - 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 = "_jest_types___types_28.1.3.tgz"; path = fetchurl { @@ -1473,6 +833,14 @@ sha512 = "RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ=="; }; } + { + name = "_jest_types___types_29.1.2.tgz"; + path = fetchurl { + name = "_jest_types___types_29.1.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-29.1.2.tgz"; + sha512 = "DcXGtoTykQB5jiwCmVr8H4vdg2OJhQex3qPkG+ISyDO7xQXbt/4R6dowcRyPemRnkH7JoHvZuxPBdlq+9JxFCg=="; + }; + } { name = "_jridgewell_gen_mapping___gen_mapping_0.1.1.tgz"; path = fetchurl { @@ -1505,14 +873,6 @@ sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; }; } - { - name = "_jridgewell_source_map___source_map_0.3.2.tgz"; - path = fetchurl { - name = "_jridgewell_source_map___source_map_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz"; - sha512 = "m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw=="; - }; - } { name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.14.tgz"; path = fetchurl { @@ -1522,19 +882,11 @@ }; } { - name = "_jridgewell_trace_mapping___trace_mapping_0.3.14.tgz"; + name = "_jridgewell_trace_mapping___trace_mapping_0.3.16.tgz"; path = fetchurl { - name = "_jridgewell_trace_mapping___trace_mapping_0.3.14.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz"; - sha512 = "bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ=="; - }; - } - { - name = "_leichtgewicht_ip_codec___ip_codec_2.0.4.tgz"; - path = fetchurl { - name = "_leichtgewicht_ip_codec___ip_codec_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz"; - sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="; + name = "_jridgewell_trace_mapping___trace_mapping_0.3.16.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.16.tgz"; + sha512 = "LCQ+NeThyJ4k1W2d+vIKdxuSt9R3pQSZ4P92m7EakaYuXcVWbHuT5bjNcqLd4Rdgi6xYWYDvBJZJLZSLanjDcA=="; }; } { @@ -1554,67 +906,75 @@ }; } { - name = "_mui_base___base_5.0.0_alpha.92.tgz"; + name = "_mui_base___base_5.0.0_alpha.104.tgz"; path = fetchurl { - name = "_mui_base___base_5.0.0_alpha.92.tgz"; - url = "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.92.tgz"; - sha512 = "ZgnSLrTXL4iUdLQhjp01dAOTQPQlnwrqjZRwDT3E6LZXEYn6cMv1MY6LZkWcF/zxrUnyasnsyMAgZ5d8AXS7bA=="; + name = "_mui_base___base_5.0.0_alpha.104.tgz"; + url = "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.104.tgz"; + sha512 = "tQPxZTzfYMwxYfKhEwufbTfdLpNjFdW7bXq6dK0j8651AAyZL4M8wynWUQ98hH1362R26mZFhVxHB2UD9t7VuA=="; }; } { - name = "_mui_icons_material___icons_material_5.8.4.tgz"; + name = "_mui_core_downloads_tracker___core_downloads_tracker_5.10.12.tgz"; path = fetchurl { - name = "_mui_icons_material___icons_material_5.8.4.tgz"; - url = "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.8.4.tgz"; - sha512 = "9Z/vyj2szvEhGWDvb+gG875bOGm8b8rlHBKOD1+nA3PcgC3fV6W1AU6pfOorPeBfH2X4mb9Boe97vHvaSndQvA=="; + name = "_mui_core_downloads_tracker___core_downloads_tracker_5.10.12.tgz"; + url = "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.12.tgz"; + sha512 = "cR8lOS606G++iVHR8I6ySgMAEiPoA3DxO/nLeqiv7w7d1707kvKoV4/7SWjh4ui+kHb052xlf/G196q2EKx31w=="; }; } { - name = "_mui_material___material_5.10.0.tgz"; + name = "_mui_icons_material___icons_material_5.10.9.tgz"; path = fetchurl { - name = "_mui_material___material_5.10.0.tgz"; - url = "https://registry.yarnpkg.com/@mui/material/-/material-5.10.0.tgz"; - sha512 = "MSEzkE2vhpM37m8Gh3+TcZCWL70p+MxzNvS8FHugBB6YZpafhBFmFKX7/pYJ2kVD87PpUhNR4szWub7/ohE02Q=="; + name = "_mui_icons_material___icons_material_5.10.9.tgz"; + url = "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.10.9.tgz"; + sha512 = "sqClXdEM39WKQJOQ0ZCPTptaZgqwibhj2EFV9N0v7BU1PO8y4OcX/a2wIQHn4fNuDjIZktJIBrmU23h7aqlGgg=="; }; } { - name = "_mui_private_theming___private_theming_5.9.3.tgz"; + name = "_mui_material___material_5.10.12.tgz"; path = fetchurl { - name = "_mui_private_theming___private_theming_5.9.3.tgz"; - url = "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.9.3.tgz"; - sha512 = "Ys3WO39WqoGciGX9k5AIi/k2zJhlydv4FzlEEwtw9OqdMaV0ydK/TdZekKzjP9sTI/JcdAP3H5DWtUaPLQJjWg=="; + name = "_mui_material___material_5.10.12.tgz"; + url = "https://registry.yarnpkg.com/@mui/material/-/material-5.10.12.tgz"; + sha512 = "rG9ZTkG9qUwujyAY1I+uQAa9pkGdsWY3KN+wvS/6H6ZbYIA06QRwmig6ySC6LbeB3WL/I/1ngwJqWX7nfINSbA=="; }; } { - name = "_mui_styled_engine___styled_engine_5.10.0.tgz"; + name = "_mui_private_theming___private_theming_5.10.9.tgz"; path = fetchurl { - name = "_mui_styled_engine___styled_engine_5.10.0.tgz"; - url = "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.10.0.tgz"; - sha512 = "V0MmOx7KBDomDYg2/dRItVsvrpHpd51uZZiNqeuXiZruUJ1vPwtxztpvtSjX/xKvIxN7C0mxf8jmuwVUn6uaEA=="; + name = "_mui_private_theming___private_theming_5.10.9.tgz"; + url = "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.10.9.tgz"; + sha512 = "BN7/CnsVPVyBaQpDTij4uV2xGYHHHhOgpdxeYLlIu+TqnsVM7wUeF+37kXvHovxM6xmL5qoaVUD98gDC0IZnHg=="; }; } { - name = "_mui_system___system_5.10.0.tgz"; + name = "_mui_styled_engine___styled_engine_5.10.8.tgz"; path = fetchurl { - name = "_mui_system___system_5.10.0.tgz"; - url = "https://registry.yarnpkg.com/@mui/system/-/system-5.10.0.tgz"; - sha512 = "HNu3LdA+37cWqgJBEhOF4F5LX4WVmvg6SoHRfajRO0neKXLdooibMP3W1bhSd27QcPxyMUmvY9/Dlp9znDeCRw=="; + name = "_mui_styled_engine___styled_engine_5.10.8.tgz"; + url = "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.10.8.tgz"; + sha512 = "w+y8WI18EJV6zM/q41ug19cE70JTeO6sWFsQ7tgePQFpy6ToCVPh0YLrtqxUZXSoMStW5FMw0t9fHTFAqPbngw=="; }; } { - name = "_mui_types___types_7.1.5.tgz"; + name = "_mui_system___system_5.10.12.tgz"; path = fetchurl { - name = "_mui_types___types_7.1.5.tgz"; - url = "https://registry.yarnpkg.com/@mui/types/-/types-7.1.5.tgz"; - sha512 = "HnRXrxgHJYJcT8ZDdDCQIlqk0s0skOKD7eWs9mJgBUu70hyW4iA6Kiv3yspJR474RFH8hysKR65VVSzUSzkuwA=="; + name = "_mui_system___system_5.10.12.tgz"; + url = "https://registry.yarnpkg.com/@mui/system/-/system-5.10.12.tgz"; + sha512 = "9DcN3hF2KTTTpZ0K5Tn20B+Tz7tIqDmJLk1M6P0CYoAGUN/xrcF/6dn1zZ829rxE5tmauoDUekTfomrvPsvlSQ=="; }; } { - name = "_mui_utils___utils_5.9.3.tgz"; + name = "_mui_types___types_7.2.0.tgz"; path = fetchurl { - name = "_mui_utils___utils_5.9.3.tgz"; - url = "https://registry.yarnpkg.com/@mui/utils/-/utils-5.9.3.tgz"; - sha512 = "l0N5bcrenE9hnwZ/jPecpIRqsDFHkPXoFUcmkgysaJwVZzJ3yQkGXB47eqmXX5yyGrSc6HksbbqXEaUya+siew=="; + name = "_mui_types___types_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@mui/types/-/types-7.2.0.tgz"; + sha512 = "lGXtFKe5lp3UxTBGqKI1l7G8sE2xBik8qCfrLHD5olwP/YU0/ReWoWT7Lp1//ri32dK39oPMrJN8TgbkCSbsNA=="; + }; + } + { + name = "_mui_utils___utils_5.10.9.tgz"; + path = fetchurl { + name = "_mui_utils___utils_5.10.9.tgz"; + url = "https://registry.yarnpkg.com/@mui/utils/-/utils-5.10.9.tgz"; + sha512 = "2tdHWrq3+WCy+G6TIIaFx3cg7PorXZ71P375ExuX61od1NOAJP1mK90VxQ8N4aqnj2vmO3AQDkV4oV2Ktvt4bA=="; }; } { @@ -1649,14 +1009,6 @@ sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; } - { - name = "_pmmmwh_react_refresh_webpack_plugin___react_refresh_webpack_plugin_0.5.7.tgz"; - path = fetchurl { - name = "_pmmmwh_react_refresh_webpack_plugin___react_refresh_webpack_plugin_0.5.7.tgz"; - url = "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.7.tgz"; - sha512 = "bcKCAzF0DV2IIROp9ZHkRJa6O4jy7NlnHdWL3GmcUxYWNjLXkK5kfELELwEfSP5hXPfVL/qOGMAROuMQb9GG8Q=="; - }; - } { name = "_popperjs_core___core_2.11.6.tgz"; path = fetchurl { @@ -1666,51 +1018,35 @@ }; } { - name = "_rollup_plugin_babel___plugin_babel_5.3.1.tgz"; + name = "_remix_run_router___router_1.0.2.tgz"; path = fetchurl { - name = "_rollup_plugin_babel___plugin_babel_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz"; - sha512 = "WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q=="; + name = "_remix_run_router___router_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/@remix-run/router/-/router-1.0.2.tgz"; + sha512 = "GRSOFhJzjGN+d4sKHTMSvNeUPoZiDHWmRnXfzaxrqe7dE/Nzlc8BiMSJdLDESZlndM7jIUrZ/F4yWqVYlI0rwQ=="; }; } { - name = "_rollup_plugin_node_resolve___plugin_node_resolve_11.2.1.tgz"; + name = "_rollup_pluginutils___pluginutils_5.0.0.tgz"; path = fetchurl { - name = "_rollup_plugin_node_resolve___plugin_node_resolve_11.2.1.tgz"; - url = "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz"; - sha512 = "yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg=="; + name = "_rollup_pluginutils___pluginutils_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.0.tgz"; + sha512 = "LJAlpJhSH4cAoNrh5G4mQ7VJJgmGVN1A91Skwpd6uMT4CGmDbrZ59RQWwNB08WkLtKOzTHFj6pKgVn18zlDFrQ=="; }; } { - name = "_rollup_plugin_replace___plugin_replace_2.4.2.tgz"; + name = "_shockpkg_icon_encoder___icon_encoder_2.1.3.tgz"; path = fetchurl { - name = "_rollup_plugin_replace___plugin_replace_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz"; - sha512 = "IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg=="; + name = "_shockpkg_icon_encoder___icon_encoder_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/@shockpkg/icon-encoder/-/icon-encoder-2.1.3.tgz"; + sha512 = "JFyoQerf51EB6+UyqnyxE2yhKGw/WIo1W6wZE/S7+OBMno+r7zFP+OPZgUewSCZMwHFHhXZ9fX8OyNGomp2fZg=="; }; } { - name = "_rollup_pluginutils___pluginutils_3.1.0.tgz"; + name = "_sinclair_typebox___typebox_0.24.46.tgz"; path = fetchurl { - name = "_rollup_pluginutils___pluginutils_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz"; - sha512 = "GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg=="; - }; - } - { - name = "_rushstack_eslint_patch___eslint_patch_1.1.4.tgz"; - path = fetchurl { - name = "_rushstack_eslint_patch___eslint_patch_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.1.4.tgz"; - sha512 = "LwzQKA4vzIct1zNZzBmRKI9QuNpLgTQMEjsQLf3BXuGYb3QPTP4Yjf6mkdX+X1mYttZ808QpOwAzZjv28kq7DA=="; - }; - } - { - name = "_sinclair_typebox___typebox_0.24.27.tgz"; - path = fetchurl { - name = "_sinclair_typebox___typebox_0.24.27.tgz"; - url = "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.27.tgz"; - sha512 = "K7C7IlQ3zLePEZleUN21ceBA2aLcMnLHTLph8QWk1JK37L90obdpY+QGY8bXMKxf1ht1Z0MNewvXxWv0oGDYFg=="; + name = "_sinclair_typebox___typebox_0.24.46.tgz"; + url = "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.46.tgz"; + sha512 = "ng4ut1z2MCBhK/NwDVwIQp3pAUOCs/KNaW3cBxdFB2xTDrOuo1xuNmpr/9HHFhxqIvHrs1NTH3KJg6q+JSy1Kw=="; }; } { @@ -1730,131 +1066,107 @@ }; } { - name = "_sinonjs_fake_timers___fake_timers_8.1.0.tgz"; + name = "_sinonjs_fake_timers___fake_timers_9.1.2.tgz"; path = fetchurl { - 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=="; + name = "_sinonjs_fake_timers___fake_timers_9.1.2.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz"; + sha512 = "BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw=="; }; } { - name = "_surma_rollup_plugin_off_main_thread___rollup_plugin_off_main_thread_2.2.3.tgz"; + name = "_svgr_babel_plugin_add_jsx_attribute___babel_plugin_add_jsx_attribute_6.5.0.tgz"; path = fetchurl { - name = "_surma_rollup_plugin_off_main_thread___rollup_plugin_off_main_thread_2.2.3.tgz"; - url = "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz"; - sha512 = "lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ=="; + name = "_svgr_babel_plugin_add_jsx_attribute___babel_plugin_add_jsx_attribute_6.5.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.5.0.tgz"; + sha512 = "Cp1JR1IPrQNvPRbkfcPmax52iunBC+eQDyBce8feOIIbVH6ZpVhErYoJtPWRBj2rKi4Wi9HvCm1+L1UD6QlBmg=="; }; } { - name = "_svgr_babel_plugin_add_jsx_attribute___babel_plugin_add_jsx_attribute_5.4.0.tgz"; + name = "_svgr_babel_plugin_remove_jsx_attribute___babel_plugin_remove_jsx_attribute_6.5.0.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_add_jsx_attribute___babel_plugin_add_jsx_attribute_5.4.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz"; - sha512 = "ZFf2gs/8/6B8PnSofI0inYXr2SDNTDScPXhN7k5EqD4aZ3gi6u+rbmZHVB8IM3wDyx8ntKACZbtXSm7oZGRqVg=="; + name = "_svgr_babel_plugin_remove_jsx_attribute___babel_plugin_remove_jsx_attribute_6.5.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-6.5.0.tgz"; + sha512 = "8zYdkym7qNyfXpWvu4yq46k41pyNM9SOstoWhKlm+IfdCE1DdnRKeMUPsWIEO/DEkaWxJ8T9esNdG3QwQ93jBA=="; }; } { - name = "_svgr_babel_plugin_remove_jsx_attribute___babel_plugin_remove_jsx_attribute_5.4.0.tgz"; + name = "_svgr_babel_plugin_remove_jsx_empty_expression___babel_plugin_remove_jsx_empty_expression_6.5.0.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_remove_jsx_attribute___babel_plugin_remove_jsx_attribute_5.4.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz"; - sha512 = "yaS4o2PgUtwLFGTKbsiAy6D0o3ugcUhWK0Z45umJ66EPWunAz9fuFw2gJuje6wqQvQWOTJvIahUwndOXb7QCPg=="; + name = "_svgr_babel_plugin_remove_jsx_empty_expression___babel_plugin_remove_jsx_empty_expression_6.5.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-6.5.0.tgz"; + sha512 = "NFdxMq3xA42Kb1UbzCVxplUc0iqSyM9X8kopImvFnB+uSDdzIHOdbs1op8ofAvVRtbg4oZiyRl3fTYeKcOe9Iw=="; }; } { - name = "_svgr_babel_plugin_remove_jsx_empty_expression___babel_plugin_remove_jsx_empty_expression_5.0.1.tgz"; + name = "_svgr_babel_plugin_replace_jsx_attribute_value___babel_plugin_replace_jsx_attribute_value_6.5.0.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_remove_jsx_empty_expression___babel_plugin_remove_jsx_empty_expression_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz"; - sha512 = "LA72+88A11ND/yFIMzyuLRSMJ+tRKeYKeQ+mR3DcAZ5I4h5CPWN9AHyUzJbWSYp/u2u0xhmgOe0+E41+GjEueA=="; + name = "_svgr_babel_plugin_replace_jsx_attribute_value___babel_plugin_replace_jsx_attribute_value_6.5.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.5.0.tgz"; + sha512 = "XWm64/rSPUCQ+MFyA9lhMO+w8bOZvkTvovRIU1lpIy63ysPaVAFtxjQiZj+S7QaLaLGUXkSkf8WZsaN+QPo/gA=="; }; } { - name = "_svgr_babel_plugin_replace_jsx_attribute_value___babel_plugin_replace_jsx_attribute_value_5.0.1.tgz"; + name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_6.5.0.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_replace_jsx_attribute_value___babel_plugin_replace_jsx_attribute_value_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz"; - sha512 = "PoiE6ZD2Eiy5mK+fjHqwGOS+IXX0wq/YDtNyIgOrc6ejFnxN4b13pRpiIPbtPwHEc+NT2KCjteAcq33/F1Y9KQ=="; + name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_6.5.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.5.0.tgz"; + sha512 = "JIF2D2ltiWFGlTw2fJ9jJg1fNT9rWjOD2Cf0/xzeW6Z2LIRQTHcRHxpZq359+SRWtEPsCXEWV2Xmd+DMBj6dBw=="; }; } { - name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_5.4.0.tgz"; + name = "_svgr_babel_plugin_svg_em_dimensions___babel_plugin_svg_em_dimensions_6.5.0.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_5.4.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz"; - sha512 = "zSOZH8PdZOpuG1ZVx/cLVePB2ibo3WPpqo7gFIjLV9a0QsuQAzJiwwqmuEdTaW2pegyBE17Uu15mOgOcgabQZg=="; + name = "_svgr_babel_plugin_svg_em_dimensions___babel_plugin_svg_em_dimensions_6.5.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.5.0.tgz"; + sha512 = "uuo0FfLP4Nu2zncOcoUFDzZdXWma2bxkTGk0etRThs4/PghvPIGaW8cPhCg6yJ8zpaauWcKV0wZtzKlJRCtVzg=="; }; } { - name = "_svgr_babel_plugin_svg_em_dimensions___babel_plugin_svg_em_dimensions_5.4.0.tgz"; + name = "_svgr_babel_plugin_transform_react_native_svg___babel_plugin_transform_react_native_svg_6.5.0.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_svg_em_dimensions___babel_plugin_svg_em_dimensions_5.4.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz"; - sha512 = "cPzDbDA5oT/sPXDCUYoVXEmm3VIoAWAPT6mSPTJNbQaBNUuEKVKyGH93oDY4e42PYHRW67N5alJx/eEol20abw=="; + name = "_svgr_babel_plugin_transform_react_native_svg___babel_plugin_transform_react_native_svg_6.5.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.5.0.tgz"; + sha512 = "VMRWyOmrV+DaEFPgP3hZMsFgs2g87ojs3txw0Rx8iz6Nf/E3UoHUwTqpkSCWd3Hsnc9gMOY9+wl6+/Ycleh1sw=="; }; } { - name = "_svgr_babel_plugin_transform_react_native_svg___babel_plugin_transform_react_native_svg_5.4.0.tgz"; + name = "_svgr_babel_plugin_transform_svg_component___babel_plugin_transform_svg_component_6.5.0.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_transform_react_native_svg___babel_plugin_transform_react_native_svg_5.4.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz"; - sha512 = "3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q=="; + name = "_svgr_babel_plugin_transform_svg_component___babel_plugin_transform_svg_component_6.5.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.5.0.tgz"; + sha512 = "b67Ul3SelaqvGEEG/1B3VJ03KUtGFgRQjRLCCjdttMQLcYa9l/izQFEclNFx53pNqhijUMNKHPhGMY/CWGVKig=="; }; } { - name = "_svgr_babel_plugin_transform_svg_component___babel_plugin_transform_svg_component_5.5.0.tgz"; + name = "_svgr_babel_preset___babel_preset_6.4.0.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_transform_svg_component___babel_plugin_transform_svg_component_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz"; - sha512 = "q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ=="; + name = "_svgr_babel_preset___babel_preset_6.4.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-6.4.0.tgz"; + sha512 = "Ytuh7N282fv2Cy1JePf6HZ29/G5Hb8mQAjx4iykPjvfFl9NK6o5lZavmewgjOGT8kNPtwgvheuOQn4CifHRUhQ=="; }; } { - name = "_svgr_babel_preset___babel_preset_5.5.0.tgz"; + name = "_svgr_core___core_6.4.0.tgz"; path = fetchurl { - name = "_svgr_babel_preset___babel_preset_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-5.5.0.tgz"; - sha512 = "4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig=="; + name = "_svgr_core___core_6.4.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/core/-/core-6.4.0.tgz"; + sha512 = "wU9uyF6BUnwAqG7fDOowmDQzmbvovj1uq/iETfMK9xwQNaT+e7yN7SmDDcETXC72dnOrMcRuEWw0JEvpJha+yg=="; }; } { - name = "_svgr_core___core_5.5.0.tgz"; + name = "_svgr_hast_util_to_babel_ast___hast_util_to_babel_ast_6.4.0.tgz"; path = fetchurl { - name = "_svgr_core___core_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/core/-/core-5.5.0.tgz"; - sha512 = "q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ=="; + name = "_svgr_hast_util_to_babel_ast___hast_util_to_babel_ast_6.4.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.4.0.tgz"; + sha512 = "PjcU8jCneKXJnrREycsgfgQ/bzR1ogSKC5MBeUu2wmEoJIjzXX7X14DDktUjU9bkBy26yMDiVHn46Nl82P3WEg=="; }; } { - name = "_svgr_hast_util_to_babel_ast___hast_util_to_babel_ast_5.5.0.tgz"; + name = "_svgr_plugin_jsx___plugin_jsx_6.4.0.tgz"; path = fetchurl { - name = "_svgr_hast_util_to_babel_ast___hast_util_to_babel_ast_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz"; - sha512 = "cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ=="; - }; - } - { - name = "_svgr_plugin_jsx___plugin_jsx_5.5.0.tgz"; - path = fetchurl { - name = "_svgr_plugin_jsx___plugin_jsx_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz"; - sha512 = "V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA=="; - }; - } - { - name = "_svgr_plugin_svgo___plugin_svgo_5.5.0.tgz"; - path = fetchurl { - name = "_svgr_plugin_svgo___plugin_svgo_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz"; - sha512 = "r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ=="; - }; - } - { - name = "_svgr_webpack___webpack_5.5.0.tgz"; - path = fetchurl { - name = "_svgr_webpack___webpack_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-5.5.0.tgz"; - sha512 = "DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g=="; + name = "_svgr_plugin_jsx___plugin_jsx_6.4.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-6.4.0.tgz"; + sha512 = "gu6E7v8qRAtCxbymI1et3G7athogvKvzsJkSWiHVZsuVZbyx5O2b7+DIkKvAGh2RvEzgSvfGf8QD1BaHal2vBw=="; }; } { @@ -1874,11 +1186,11 @@ }; } { - name = "_testing_library_dom___dom_8.17.1.tgz"; + name = "_testing_library_dom___dom_8.19.0.tgz"; path = fetchurl { - name = "_testing_library_dom___dom_8.17.1.tgz"; - url = "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.17.1.tgz"; - sha512 = "KnH2MnJUzmFNPW6RIKfd+zf2Wue8mEKX0M3cpX6aKl5ZXrJM1/c/Pc8c2xDNYQCnJO48Sm5ITbMXgqTr3h4jxQ=="; + name = "_testing_library_dom___dom_8.19.0.tgz"; + url = "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.19.0.tgz"; + sha512 = "6YWYPPpxG3e/xOo6HIWwB/58HukkwIVTOaZ0VwdMVjhRUX/01E4FtQbck9GazOOj7MXHc5RBzMrU86iBJHbI+A=="; }; } { @@ -1890,11 +1202,11 @@ }; } { - name = "_testing_library_react___react_13.3.0.tgz"; + name = "_testing_library_react___react_13.4.0.tgz"; path = fetchurl { - name = "_testing_library_react___react_13.3.0.tgz"; - url = "https://registry.yarnpkg.com/@testing-library/react/-/react-13.3.0.tgz"; - sha512 = "DB79aA426+deFgGSjnf5grczDPiL4taK3hFaa+M5q7q20Kcve9eQottOG5kZ74KEr55v0tU2CQormSSDK87zYQ=="; + name = "_testing_library_react___react_13.4.0.tgz"; + url = "https://registry.yarnpkg.com/@testing-library/react/-/react-13.4.0.tgz"; + sha512 = "sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw=="; }; } { @@ -1905,14 +1217,6 @@ sha512 = "kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q=="; }; } - { - name = "_tootallnate_once___once_1.1.2.tgz"; - path = fetchurl { - name = "_tootallnate_once___once_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz"; - sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; - }; - } { name = "_tootallnate_once___once_2.0.0.tgz"; path = fetchurl { @@ -1921,14 +1225,6 @@ sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; }; } - { - name = "_trysound_sax___sax_0.2.0.tgz"; - path = fetchurl { - name = "_trysound_sax___sax_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz"; - sha512 = "L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="; - }; - } { name = "_types_aria_query___aria_query_4.2.2.tgz"; path = fetchurl { @@ -1962,27 +1258,11 @@ }; } { - name = "_types_babel__traverse___babel__traverse_7.18.0.tgz"; + name = "_types_babel__traverse___babel__traverse_7.18.2.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.18.0.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.0.tgz"; - sha512 = "v4Vwdko+pgymgS+A2UIaJru93zQd85vIGWObM5ekZNdXCKtDYqATlEYnWgfo86Q6I1Lh0oXnksDnMU1cwmlPDw=="; - }; - } - { - name = "_types_body_parser___body_parser_1.19.2.tgz"; - path = fetchurl { - 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=="; - }; - } - { - name = "_types_bonjour___bonjour_3.5.10.tgz"; - path = fetchurl { - name = "_types_bonjour___bonjour_3.5.10.tgz"; - url = "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz"; - sha512 = "p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw=="; + name = "_types_babel__traverse___babel__traverse_7.18.2.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.2.tgz"; + sha512 = "FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg=="; }; } { @@ -1994,19 +1274,51 @@ }; } { - name = "_types_connect_history_api_fallback___connect_history_api_fallback_1.3.5.tgz"; + name = "_types_d3_color___d3_color_2.0.3.tgz"; path = fetchurl { - name = "_types_connect_history_api_fallback___connect_history_api_fallback_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz"; - sha512 = "h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw=="; + name = "_types_d3_color___d3_color_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-2.0.3.tgz"; + sha512 = "+0EtEjBfKEDtH9Rk3u3kLOUXM5F+iZK+WvASPb0MhIZl8J8NUvGeZRwKCXl+P3HkYx5TdU4YtcibpqHkSR9n7w=="; }; } { - name = "_types_connect___connect_3.4.35.tgz"; + name = "_types_d3_interpolate___d3_interpolate_2.0.2.tgz"; path = fetchurl { - name = "_types_connect___connect_3.4.35.tgz"; - url = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz"; - sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; + name = "_types_d3_interpolate___d3_interpolate_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/d3-interpolate/-/d3-interpolate-2.0.2.tgz"; + sha512 = "lElyqlUfIPyWG/cD475vl6msPL4aMU7eJvx1//Q177L8mdXoVPFl1djIESF2FKnc0NyaHvQlJpWwKJYwAhUoCw=="; + }; + } + { + name = "_types_d3_path___d3_path_2.0.2.tgz"; + path = fetchurl { + name = "_types_d3_path___d3_path_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-2.0.2.tgz"; + sha512 = "3YHpvDw9LzONaJzejXLOwZ3LqwwkoXb9LI2YN7Hbd6pkGo5nIlJ09ul4bQhBN4hQZJKmUpX8HkVqbzgUKY48cg=="; + }; + } + { + name = "_types_d3_scale___d3_scale_3.3.2.tgz"; + path = fetchurl { + name = "_types_d3_scale___d3_scale_3.3.2.tgz"; + url = "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-3.3.2.tgz"; + sha512 = "gGqr7x1ost9px3FvIfUMi5XA/F/yAf4UkUDtdQhpH92XCT0Oa7zkkRzY61gPVJq+DxpHn/btouw5ohWkbBsCzQ=="; + }; + } + { + name = "_types_d3_shape___d3_shape_2.1.3.tgz"; + path = fetchurl { + name = "_types_d3_shape___d3_shape_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-2.1.3.tgz"; + sha512 = "HAhCel3wP93kh4/rq+7atLdybcESZ5bRHDEZUojClyZWsRuEMo3A52NGYJSh48SxfxEU6RZIVbZL2YFZ2OAlzQ=="; + }; + } + { + name = "_types_d3_time___d3_time_2.1.1.tgz"; + path = fetchurl { + name = "_types_d3_time___d3_time_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-2.1.1.tgz"; + sha512 = "9MVYlmIgmRR31C5b4FVSWtuMmBHh2mOWQYfl7XAYOa8dsnb7iEmUmRSWSFgXFtkjxO65d7hTUHQC+RhR/9IWFg=="; }; } { @@ -2017,62 +1329,6 @@ sha512 = "9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg=="; }; } - { - name = "_types_eslint_scope___eslint_scope_3.7.4.tgz"; - path = fetchurl { - name = "_types_eslint_scope___eslint_scope_3.7.4.tgz"; - url = "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz"; - sha512 = "9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA=="; - }; - } - { - name = "_types_eslint___eslint_8.4.5.tgz"; - path = fetchurl { - name = "_types_eslint___eslint_8.4.5.tgz"; - url = "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.5.tgz"; - sha512 = "dhsC09y1gpJWnK+Ff4SGvCuSnk9DaU0BJZSzOwa6GVSg65XtTugLBITDAAzRU5duGBoXBHpdR/9jHGxJjNflJQ=="; - }; - } - { - name = "_types_estree___estree_1.0.0.tgz"; - path = fetchurl { - name = "_types_estree___estree_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz"; - sha512 = "WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ=="; - }; - } - { - name = "_types_estree___estree_0.0.39.tgz"; - path = fetchurl { - name = "_types_estree___estree_0.0.39.tgz"; - url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz"; - sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; - }; - } - { - name = "_types_estree___estree_0.0.51.tgz"; - path = fetchurl { - name = "_types_estree___estree_0.0.51.tgz"; - url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz"; - sha512 = "CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="; - }; - } - { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.30.tgz"; - path = fetchurl { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.30.tgz"; - url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz"; - sha512 = "gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ=="; - }; - } - { - name = "_types_express___express_4.17.13.tgz"; - path = fetchurl { - name = "_types_express___express_4.17.13.tgz"; - url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz"; - sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; - }; - } { name = "_types_fs_extra___fs_extra_9.0.13.tgz"; path = fetchurl { @@ -2097,6 +1353,14 @@ sha512 = "anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw=="; }; } + { + name = "_types_hast___hast_2.3.4.tgz"; + path = fetchurl { + name = "_types_hast___hast_2.3.4.tgz"; + url = "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.4.tgz"; + sha512 = "wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g=="; + }; + } { name = "_types_history___history_4.7.11.tgz"; path = fetchurl { @@ -2105,22 +1369,6 @@ sha512 = "qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA=="; }; } - { - name = "_types_html_minifier_terser___html_minifier_terser_6.1.0.tgz"; - path = fetchurl { - name = "_types_html_minifier_terser___html_minifier_terser_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz"; - sha512 = "oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="; - }; - } - { - name = "_types_http_proxy___http_proxy_1.17.9.tgz"; - path = fetchurl { - name = "_types_http_proxy___http_proxy_1.17.9.tgz"; - url = "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz"; - sha512 = "QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw=="; - }; - } { name = "_types_i18next_fs_backend___i18next_fs_backend_1.1.2.tgz"; path = fetchurl { @@ -2162,11 +1410,11 @@ }; } { - name = "_types_jest___jest_28.1.6.tgz"; + name = "_types_jest___jest_29.1.2.tgz"; path = fetchurl { - name = "_types_jest___jest_28.1.6.tgz"; - url = "https://registry.yarnpkg.com/@types/jest/-/jest-28.1.6.tgz"; - sha512 = "0RbGAFMfcBJKOmqRazM8L98uokwuwD5F8rHrv/ZMbrZBwVOWZUyPG6VFNscjYr/vjM3Vu4fRrCPbOs42AfemaQ=="; + name = "_types_jest___jest_29.1.2.tgz"; + url = "https://registry.yarnpkg.com/@types/jest/-/jest-29.1.2.tgz"; + sha512 = "y+nlX0h87U0R+wsGn6EBuoRWYyv3KFtwRNP3QWp9+k2tJ2/bqcGS3UxD7jgT+tiwJWWq3UsyV4Y+T6rsMT4XMg=="; }; } { @@ -2194,11 +1442,19 @@ }; } { - name = "_types_mime___mime_3.0.1.tgz"; + name = "_types_mdast___mdast_3.0.10.tgz"; path = fetchurl { - name = "_types_mime___mime_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz"; - sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; + name = "_types_mdast___mdast_3.0.10.tgz"; + url = "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz"; + sha512 = "W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA=="; + }; + } + { + name = "_types_minimatch___minimatch_5.1.2.tgz"; + path = fetchurl { + name = "_types_minimatch___minimatch_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz"; + sha512 = "K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="; }; } { @@ -2218,19 +1474,19 @@ }; } { - name = "_types_node___node_18.7.1.tgz"; + name = "_types_node___node_18.8.5.tgz"; path = fetchurl { - name = "_types_node___node_18.7.1.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.7.1.tgz"; - sha512 = "GKX1Qnqxo4S+Z/+Z8KKPLpH282LD7jLHWJcVryOflnsnH+BtSDfieR6ObwBMwpnNws0bUK8GI7z0unQf9bARNQ=="; + name = "_types_node___node_18.8.5.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-18.8.5.tgz"; + sha512 = "Bq7G3AErwe5A/Zki5fdD3O6+0zDChhg671NfPjtIcbtzDNZTv4NPKMRFr7gtYPG7y+B8uTiNK4Ngd9T0FTar6Q=="; }; } { - name = "_types_node___node_16.11.47.tgz"; + name = "_types_node___node_16.11.65.tgz"; path = fetchurl { - name = "_types_node___node_16.11.47.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.47.tgz"; - sha512 = "fpP+jk2zJ4VW66+wAMFoBJlx1bxmBKx4DUFf68UHgdGCOuyUTDlLWqsaNPJh7xhNDykyJ9eIzAygilP/4WoN8g=="; + name = "_types_node___node_16.11.65.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.65.tgz"; + sha512 = "Vfz7wGMOr4jbQGiQHVJm8VjeQwM9Ya7mHe9LtQ264/Epf5n1KiZShOFqk++nBzw6a/ubgYdB9Od7P+MH/LjoWw=="; }; } { @@ -2258,11 +1514,11 @@ }; } { - name = "_types_prettier___prettier_2.7.0.tgz"; + name = "_types_prettier___prettier_2.7.1.tgz"; path = fetchurl { - name = "_types_prettier___prettier_2.7.0.tgz"; - url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.0.tgz"; - sha512 = "RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A=="; + name = "_types_prettier___prettier_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.1.tgz"; + sha512 = "ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow=="; }; } { @@ -2273,30 +1529,6 @@ sha512 = "JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="; }; } - { - name = "_types_q___q_1.5.5.tgz"; - path = fetchurl { - name = "_types_q___q_1.5.5.tgz"; - url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz"; - sha512 = "L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="; - }; - } - { - name = "_types_qs___qs_6.9.7.tgz"; - path = fetchurl { - name = "_types_qs___qs_6.9.7.tgz"; - url = "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz"; - sha512 = "FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="; - }; - } - { - name = "_types_range_parser___range_parser_1.2.4.tgz"; - 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"; - sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; - }; - } { name = "_types_react_dom___react_dom_18.0.6.tgz"; path = fetchurl { @@ -2305,6 +1537,14 @@ sha512 = "/5OFZgfIPSwy+YuIBP/FgJnQnsxhZhjjrnxudMddeblOouIodEQ75X14Rr4wGSG/bknL+Omy9iWlLo1u/9GzAA=="; }; } + { + name = "_types_react_dom___react_dom_18.0.8.tgz"; + path = fetchurl { + name = "_types_react_dom___react_dom_18.0.8.tgz"; + url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.8.tgz"; + sha512 = "C3GYO0HLaOkk9dDAz3Dl4sbe4AKUGTCfFIZsz3n/82dPNN8Du533HzKatDxeUYWu24wJgMP1xICqkWk1YOLOIw=="; + }; + } { name = "_types_react_is___react_is_17.0.3.tgz"; path = fetchurl { @@ -2322,11 +1562,11 @@ }; } { - name = "_types_react_router___react_router_5.1.18.tgz"; + name = "_types_react_router___react_router_5.1.19.tgz"; path = fetchurl { - name = "_types_react_router___react_router_5.1.18.tgz"; - url = "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.18.tgz"; - sha512 = "YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g=="; + name = "_types_react_router___react_router_5.1.19.tgz"; + url = "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.19.tgz"; + sha512 = "Fv/5kb2STAEMT3wHzdKQK2z8xKq38EDIGVrutYLmQVVLe+4orDFquU52hQrULnEHinMKv9FSA6lf9+uNT1ITtA=="; }; } { @@ -2338,27 +1578,19 @@ }; } { - name = "_types_react___react_18.0.17.tgz"; + name = "_types_react___react_18.0.21.tgz"; path = fetchurl { - name = "_types_react___react_18.0.17.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-18.0.17.tgz"; - sha512 = "38ETy4tL+rn4uQQi7mB81G7V1g0u2ryquNmsVIOKUAEIDK+3CUjZ6rSRpdvS99dNBnkLFL83qfmtLacGOTIhwQ=="; + name = "_types_react___react_18.0.21.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-18.0.21.tgz"; + sha512 = "7QUCOxvFgnD5Jk8ZKlUAhVcRj7GuJRjnjjiY/IUBWKgOlnvDvTMLD4RTF7NPyVmbRhNrbomZiOepg7M/2Kj1mA=="; }; } { - name = "_types_resolve___resolve_1.17.1.tgz"; + name = "_types_react___react_18.0.24.tgz"; path = fetchurl { - name = "_types_resolve___resolve_1.17.1.tgz"; - url = "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz"; - sha512 = "yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw=="; - }; - } - { - name = "_types_retry___retry_0.12.0.tgz"; - path = fetchurl { - name = "_types_retry___retry_0.12.0.tgz"; - url = "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz"; - sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; + name = "_types_react___react_18.0.24.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-18.0.24.tgz"; + sha512 = "wRJWT6ouziGUy+9uX0aW4YOJxAY0bG6/AOk5AW5QSvZqI7dk6VBIbXvcVgIw/W5Jrl24f77df98GEKTJGOLx7Q=="; }; } { @@ -2370,35 +1602,11 @@ }; } { - name = "_types_semver___semver_7.3.11.tgz"; + name = "_types_semver___semver_7.3.12.tgz"; path = fetchurl { - name = "_types_semver___semver_7.3.11.tgz"; - url = "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.11.tgz"; - sha512 = "R9HhjC4aKx3jL0FLwU7x6qMTysTvLh7jesRslXmxgCOXZwyh5dsnmrPQQToMyess8D4U+8G9x9mBFZoC/1o/Tw=="; - }; - } - { - name = "_types_serve_index___serve_index_1.9.1.tgz"; - path = fetchurl { - name = "_types_serve_index___serve_index_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz"; - sha512 = "d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg=="; - }; - } - { - name = "_types_serve_static___serve_static_1.15.0.tgz"; - path = fetchurl { - name = "_types_serve_static___serve_static_1.15.0.tgz"; - url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg=="; - }; - } - { - name = "_types_sockjs___sockjs_0.3.33.tgz"; - path = fetchurl { - name = "_types_sockjs___sockjs_0.3.33.tgz"; - url = "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz"; - sha512 = "f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw=="; + name = "_types_semver___semver_7.3.12.tgz"; + url = "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.12.tgz"; + sha512 = "WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A=="; }; } { @@ -2434,11 +1642,11 @@ }; } { - name = "_types_trusted_types___trusted_types_2.0.2.tgz"; + name = "_types_unist___unist_2.0.6.tgz"; path = fetchurl { - name = "_types_trusted_types___trusted_types_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.2.tgz"; - sha512 = "F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg=="; + name = "_types_unist___unist_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz"; + sha512 = "PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ=="; }; } { @@ -2449,14 +1657,6 @@ sha512 = "NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ=="; }; } - { - name = "_types_ws___ws_8.5.3.tgz"; - path = fetchurl { - name = "_types_ws___ws_8.5.3.tgz"; - url = "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz"; - sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w=="; - }; - } { name = "_types_yargs_parser___yargs_parser_21.0.0.tgz"; path = fetchurl { @@ -2474,19 +1674,11 @@ }; } { - name = "_types_yargs___yargs_16.0.4.tgz"; + name = "_types_yargs___yargs_17.0.13.tgz"; path = fetchurl { - 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.11.tgz"; - path = fetchurl { - name = "_types_yargs___yargs_17.0.11.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.11.tgz"; - sha512 = "aB4y9UDUXTSMxmM4MH+YnuR0g5Cph3FLQBoWoMB21DSvFVAxRVEHEMx3TLh+zUZYMCQtKiqazz0Q4Rre31f/OA=="; + name = "_types_yargs___yargs_17.0.13.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz"; + sha512 = "9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg=="; }; } { @@ -2498,243 +1690,75 @@ }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.33.0.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.40.0.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.33.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.0.tgz"; - sha512 = "jHvZNSW2WZ31OPJ3enhLrEKvAZNyAFWZ6rx9tUwaessTc4sx9KmgMNhVcqVAl1ETnT5rU5fpXTLmY9YvC1DCNg=="; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.40.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.40.0.tgz"; + sha512 = "FIBZgS3DVJgqPwJzvZTuH4HNsZhHMa9SjxTKAZTlMsPw/UzpEjcf9f4dfgDJEHjK+HboUJo123Eshl6niwEm/Q=="; }; } { - name = "_typescript_eslint_experimental_utils___experimental_utils_5.33.0.tgz"; + name = "_typescript_eslint_parser___parser_5.40.0.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_5.33.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.33.0.tgz"; - sha512 = "NvRsNe+T90QrSVlgdV9/U8/chfqGmShvKUE7hWZTAUUCF6hZty/R+eMPVGldKcUDq7uRQaK6+V8gv5OwVDqC+g=="; + name = "_typescript_eslint_parser___parser_5.40.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.40.0.tgz"; + sha512 = "Ah5gqyX2ySkiuYeOIDg7ap51/b63QgWZA7w6AHtFrag7aH0lRQPbLzUjk0c9o5/KZ6JRkTTDKShL4AUrQa6/hw=="; }; } { - name = "_typescript_eslint_parser___parser_5.33.0.tgz"; + name = "_typescript_eslint_scope_manager___scope_manager_5.40.0.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_5.33.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.33.0.tgz"; - sha512 = "cgM5cJrWmrDV2KpvlcSkelTBASAs1mgqq+IUGKJvFxWrapHpaRy5EXPQz9YaKF3nZ8KY18ILTiVpUtbIac86/w=="; + name = "_typescript_eslint_scope_manager___scope_manager_5.40.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.40.0.tgz"; + sha512 = "d3nPmjUeZtEWRvyReMI4I1MwPGC63E8pDoHy0BnrYjnJgilBD3hv7XOiETKLY/zTwI7kCnBDf2vWTRUVpYw0Uw=="; }; } { - name = "_typescript_eslint_scope_manager___scope_manager_5.33.0.tgz"; + name = "_typescript_eslint_type_utils___type_utils_5.40.0.tgz"; path = fetchurl { - name = "_typescript_eslint_scope_manager___scope_manager_5.33.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.33.0.tgz"; - sha512 = "/Jta8yMNpXYpRDl8EwF/M8It2A9sFJTubDo0ATZefGXmOqlaBffEw0ZbkbQ7TNDK6q55NPHFshGBPAZvZkE8Pw=="; + name = "_typescript_eslint_type_utils___type_utils_5.40.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.40.0.tgz"; + sha512 = "nfuSdKEZY2TpnPz5covjJqav+g5qeBqwSHKBvz7Vm1SAfy93SwKk/JeSTymruDGItTwNijSsno5LhOHRS1pcfw=="; }; } { - name = "_typescript_eslint_type_utils___type_utils_5.33.0.tgz"; + name = "_typescript_eslint_types___types_5.40.0.tgz"; path = fetchurl { - name = "_typescript_eslint_type_utils___type_utils_5.33.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.33.0.tgz"; - sha512 = "2zB8uEn7hEH2pBeyk3NpzX1p3lF9dKrEbnXq1F7YkpZ6hlyqb2yZujqgRGqXgRBTHWIUG3NGx/WeZk224UKlIA=="; + name = "_typescript_eslint_types___types_5.40.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.40.0.tgz"; + sha512 = "V1KdQRTXsYpf1Y1fXCeZ+uhjW48Niiw0VGt4V8yzuaDTU8Z1Xl7yQDyQNqyAFcVhpYXIVCEuxSIWTsLDpHgTbw=="; }; } { - name = "_typescript_eslint_types___types_5.33.0.tgz"; + name = "_typescript_eslint_typescript_estree___typescript_estree_5.40.0.tgz"; path = fetchurl { - name = "_typescript_eslint_types___types_5.33.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.33.0.tgz"; - sha512 = "nIMt96JngB4MYFYXpZ/3ZNU4GWPNdBbcB5w2rDOCpXOVUkhtNlG2mmm8uXhubhidRZdwMaMBap7Uk8SZMU/ppw=="; + name = "_typescript_eslint_typescript_estree___typescript_estree_5.40.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.0.tgz"; + sha512 = "b0GYlDj8TLTOqwX7EGbw2gL5EXS2CPEWhF9nGJiGmEcmlpNBjyHsTwbqpyIEPVpl6br4UcBOYlcI2FJVtJkYhg=="; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_5.33.0.tgz"; + name = "_typescript_eslint_utils___utils_5.40.0.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_5.33.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.0.tgz"; - sha512 = "tqq3MRLlggkJKJUrzM6wltk8NckKyyorCSGMq4eVkyL5sDYzJJcMgZATqmF8fLdsWrW7OjjIZ1m9v81vKcaqwQ=="; + name = "_typescript_eslint_utils___utils_5.40.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.40.0.tgz"; + sha512 = "MO0y3T5BQ5+tkkuYZJBjePewsY+cQnfkYeRqS6tPh28niiIwPnQ1t59CSRcs1ZwJJNOdWw7rv9pF8aP58IMihA=="; }; } { - name = "_typescript_eslint_utils___utils_5.33.0.tgz"; + name = "_typescript_eslint_visitor_keys___visitor_keys_5.40.0.tgz"; path = fetchurl { - name = "_typescript_eslint_utils___utils_5.33.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.33.0.tgz"; - sha512 = "JxOAnXt9oZjXLIiXb5ZIcZXiwVHCkqZgof0O8KPgz7C7y0HS42gi75PdPlqh1Tf109M0fyUw45Ao6JLo7S5AHw=="; + name = "_typescript_eslint_visitor_keys___visitor_keys_5.40.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.40.0.tgz"; + sha512 = "ijJ+6yig+x9XplEpG2K6FUdJeQGGj/15U3S56W9IqXKJqleuD7zJ2AX/miLezwxpd7ZxDAqO87zWufKg+RPZyQ=="; }; } { - name = "_typescript_eslint_visitor_keys___visitor_keys_5.33.0.tgz"; + name = "_vitejs_plugin_react___plugin_react_2.2.0.tgz"; path = fetchurl { - name = "_typescript_eslint_visitor_keys___visitor_keys_5.33.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.0.tgz"; - sha512 = "/XsqCzD4t+Y9p5wd9HZiptuGKBlaZO5showwqODii5C0nZawxWLF+Q6k5wYHBrQv96h6GYKyqqMHCSTqta8Kiw=="; - }; - } - { - name = "_webassemblyjs_ast___ast_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_ast___ast_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz"; - sha512 = "ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw=="; - }; - } - { - name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz"; - sha512 = "iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="; - }; - } - { - name = "_webassemblyjs_helper_api_error___helper_api_error_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_api_error___helper_api_error_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz"; - sha512 = "RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="; - }; - } - { - name = "_webassemblyjs_helper_buffer___helper_buffer_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_buffer___helper_buffer_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz"; - sha512 = "gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="; - }; - } - { - name = "_webassemblyjs_helper_numbers___helper_numbers_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_numbers___helper_numbers_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz"; - sha512 = "vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ=="; - }; - } - { - name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz"; - sha512 = "PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="; - }; - } - { - name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz"; - sha512 = "10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg=="; - }; - } - { - name = "_webassemblyjs_ieee754___ieee754_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_ieee754___ieee754_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz"; - sha512 = "hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ=="; - }; - } - { - name = "_webassemblyjs_leb128___leb128_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_leb128___leb128_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz"; - sha512 = "BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw=="; - }; - } - { - name = "_webassemblyjs_utf8___utf8_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_utf8___utf8_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz"; - sha512 = "9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="; - }; - } - { - name = "_webassemblyjs_wasm_edit___wasm_edit_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_wasm_edit___wasm_edit_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz"; - sha512 = "g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA=="; - }; - } - { - name = "_webassemblyjs_wasm_gen___wasm_gen_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_wasm_gen___wasm_gen_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz"; - sha512 = "F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA=="; - }; - } - { - name = "_webassemblyjs_wasm_opt___wasm_opt_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_wasm_opt___wasm_opt_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz"; - sha512 = "VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw=="; - }; - } - { - name = "_webassemblyjs_wasm_parser___wasm_parser_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_wasm_parser___wasm_parser_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz"; - sha512 = "rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA=="; - }; - } - { - name = "_webassemblyjs_wast_printer___wast_printer_1.11.1.tgz"; - path = fetchurl { - name = "_webassemblyjs_wast_printer___wast_printer_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz"; - sha512 = "IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg=="; - }; - } - { - 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"; - sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; - }; - } - { - 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"; - sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; - }; - } - { - name = "abab___abab_2.0.6.tgz"; - path = fetchurl { - name = "abab___abab_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz"; - sha512 = "j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="; - }; - } - { - name = "accepts___accepts_1.3.8.tgz"; - path = fetchurl { - name = "accepts___accepts_1.3.8.tgz"; - url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz"; - sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; - }; - } - { - 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"; - sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg=="; - }; - } - { - name = "acorn_import_assertions___acorn_import_assertions_1.8.0.tgz"; - path = fetchurl { - name = "acorn_import_assertions___acorn_import_assertions_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz"; - sha512 = "m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw=="; + name = "_vitejs_plugin_react___plugin_react_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-2.2.0.tgz"; + sha512 = "FFpefhvExd1toVRlokZgxgy2JtnBOdp4ZDsq7ldCWaqGSGn9UhWMAVm/1lxPL14JfNS5yGz+s9yFrQY6shoStA=="; }; } { @@ -2745,30 +1769,6 @@ sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; }; } - { - name = "acorn_node___acorn_node_1.8.2.tgz"; - path = fetchurl { - name = "acorn_node___acorn_node_1.8.2.tgz"; - url = "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz"; - sha512 = "8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A=="; - }; - } - { - 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"; - sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; - }; - } - { - 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"; - sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; - }; - } { name = "acorn___acorn_8.8.0.tgz"; path = fetchurl { @@ -2777,22 +1777,6 @@ sha512 = "QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="; }; } - { - name = "address___address_1.2.0.tgz"; - path = fetchurl { - name = "address___address_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/address/-/address-1.2.0.tgz"; - sha512 = "tNEZYz5G/zYunxFm7sfhAxkXEuLj3K6BKwv6ZURlsF6yiUQ65z0Q2wZW9L5cPUl9ocofGvXOdFYbFHp0+6MOig=="; - }; - } - { - name = "adjust_sourcemap_loader___adjust_sourcemap_loader_4.0.0.tgz"; - path = fetchurl { - name = "adjust_sourcemap_loader___adjust_sourcemap_loader_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz"; - sha512 = "OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A=="; - }; - } { name = "agent_base___agent_base_6.0.2.tgz"; path = fetchurl { @@ -2817,14 +1801,6 @@ sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; }; } - { - name = "ajv_keywords___ajv_keywords_5.1.0.tgz"; - path = fetchurl { - name = "ajv_keywords___ajv_keywords_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz"; - sha512 = "YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="; - }; - } { name = "ajv___ajv_6.12.6.tgz"; path = fetchurl { @@ -2841,14 +1817,6 @@ sha512 = "wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="; }; } - { - 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_escapes___ansi_escapes_4.3.2.tgz"; path = fetchurl { @@ -2857,14 +1825,6 @@ sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; }; } - { - name = "ansi_html_community___ansi_html_community_0.0.8.tgz"; - path = fetchurl { - name = "ansi_html_community___ansi_html_community_0.0.8.tgz"; - url = "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz"; - sha512 = "1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw=="; - }; - } { name = "ansi_regex___ansi_regex_5.0.1.tgz"; path = fetchurl { @@ -2873,14 +1833,6 @@ sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; } - { - name = "ansi_regex___ansi_regex_6.0.1.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz"; - sha512 = "n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="; - }; - } { name = "ansi_styles___ansi_styles_3.2.1.tgz"; path = fetchurl { @@ -2905,6 +1857,14 @@ sha512 = "Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="; }; } + { + name = "any_base___any_base_1.1.0.tgz"; + path = fetchurl { + name = "any_base___any_base_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/any-base/-/any-base-1.1.0.tgz"; + sha512 = "uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg=="; + }; + } { name = "anymatch___anymatch_3.1.2.tgz"; path = fetchurl { @@ -2922,11 +1882,11 @@ }; } { - name = "app_builder_lib___app_builder_lib_23.3.3.tgz"; + name = "app_builder_lib___app_builder_lib_23.6.0.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.3.3.tgz"; - sha512 = "m0+M53+HYMzqKxwNQZT143K7WwXEGUy9LY31l8dJphXx2P/FQod615mVbxHyqbDCG4J5bHdWm21qZ0e2DVY6CQ=="; + name = "app_builder_lib___app_builder_lib_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz"; + sha512 = "dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA=="; }; } { @@ -2937,14 +1897,6 @@ sha512 = "WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA=="; }; } - { - name = "arg___arg_5.0.2.tgz"; - path = fetchurl { - name = "arg___arg_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz"; - sha512 = "PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="; - }; - } { name = "argparse___argparse_1.0.10.tgz"; path = fetchurl { @@ -2970,11 +1922,11 @@ }; } { - name = "aria_query___aria_query_5.0.0.tgz"; + name = "aria_query___aria_query_5.0.2.tgz"; path = fetchurl { - name = "aria_query___aria_query_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/aria-query/-/aria-query-5.0.0.tgz"; - sha512 = "V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg=="; + name = "aria_query___aria_query_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/aria-query/-/aria-query-5.0.2.tgz"; + sha512 = "eigU3vhqSO+Z8BKDnVLN/ompjhf3pYzecKXz8+whRy+9gZu8n1TCGfwzQUUPnqdHl9ax1Hr9031orZ+UOEYr7Q=="; }; } { @@ -2985,22 +1937,6 @@ sha512 = "THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg=="; }; } - { - 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"; - sha512 = "PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="; - }; - } - { - 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"; - sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; - }; - } { name = "array_includes___array_includes_3.1.5.tgz"; path = fetchurl { @@ -3033,14 +1969,6 @@ sha512 = "PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg=="; }; } - { - name = "array.prototype.reduce___array.prototype.reduce_1.0.4.tgz"; - path = fetchurl { - name = "array.prototype.reduce___array.prototype.reduce_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz"; - sha512 = "WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw=="; - }; - } { name = "arrify___arrify_2.0.1.tgz"; path = fetchurl { @@ -3049,14 +1977,6 @@ sha512 = "3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="; }; } - { - name = "asap___asap_2.0.6.tgz"; - path = fetchurl { - name = "asap___asap_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz"; - sha512 = "BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="; - }; - } { name = "asar___asar_3.2.0.tgz"; path = fetchurl { @@ -3073,14 +1993,6 @@ sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="; }; } - { - 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"; - sha512 = "eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag=="; - }; - } { name = "astral_regex___astral_regex_2.0.0.tgz"; path = fetchurl { @@ -3130,19 +2042,11 @@ }; } { - name = "autoprefixer___autoprefixer_10.4.8.tgz"; + name = "axios___axios_0.22.0.tgz"; path = fetchurl { - name = "autoprefixer___autoprefixer_10.4.8.tgz"; - url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.8.tgz"; - sha512 = "75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw=="; - }; - } - { - name = "axe_core___axe_core_4.4.3.tgz"; - path = fetchurl { - name = "axe_core___axe_core_4.4.3.tgz"; - url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.3.tgz"; - sha512 = "32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w=="; + name = "axios___axios_0.22.0.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.22.0.tgz"; + sha512 = "Z0U3uhqQeg1oNcihswf4ZD57O3NrR1+ZXhxaROaWpDmsDTx7T2HNBV2ulBtie2hwJptu8UvgnJoK+BIqdzh/1w=="; }; } { @@ -3162,35 +2066,11 @@ }; } { - name = "axobject_query___axobject_query_2.2.0.tgz"; + name = "babel_jest___babel_jest_28.1.3.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"; - sha512 = "Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA=="; - }; - } - { - name = "babel_jest___babel_jest_27.5.1.tgz"; - path = fetchurl { - 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_loader___babel_loader_8.2.5.tgz"; - path = fetchurl { - name = "babel_loader___babel_loader_8.2.5.tgz"; - url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz"; - sha512 = "OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ=="; - }; - } - { - 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"; - sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; + name = "babel_jest___babel_jest_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.3.tgz"; + sha512 = "epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q=="; }; } { @@ -3202,11 +2082,11 @@ }; } { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.5.1.tgz"; + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_28.1.3.tgz"; path = fetchurl { - 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=="; + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz"; + sha512 = "Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q=="; }; } { @@ -3217,46 +2097,6 @@ sha512 = "Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg=="; }; } - { - name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.8.tgz"; - path = fetchurl { - name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.8.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz"; - sha512 = "WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q=="; - }; - } - { - name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.3.2.tgz"; - path = fetchurl { - name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz"; - sha512 = "LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q=="; - }; - } - { - name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.5.3.tgz"; - path = fetchurl { - name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.5.3.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz"; - sha512 = "zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw=="; - }; - } - { - name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.4.0.tgz"; - path = fetchurl { - name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz"; - sha512 = "RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw=="; - }; - } - { - 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"; - sha512 = "eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA=="; - }; - } { name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.1.tgz"; path = fetchurl { @@ -3266,19 +2106,19 @@ }; } { - name = "babel_preset_jest___babel_preset_jest_27.5.1.tgz"; + name = "babel_preset_jest___babel_preset_jest_28.1.3.tgz"; path = fetchurl { - 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=="; + name = "babel_preset_jest___babel_preset_jest_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz"; + sha512 = "L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A=="; }; } { - name = "babel_preset_react_app___babel_preset_react_app_10.0.1.tgz"; + name = "bail___bail_2.0.2.tgz"; path = fetchurl { - name = "babel_preset_react_app___babel_preset_react_app_10.0.1.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz"; - sha512 = "b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg=="; + name = "bail___bail_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/bail/-/bail-2.0.2.tgz"; + sha512 = "0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw=="; }; } { @@ -3297,30 +2137,6 @@ sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; } - { - 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"; - sha512 = "x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="; - }; - } - { - name = "bfj___bfj_7.0.2.tgz"; - path = fetchurl { - name = "bfj___bfj_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/bfj/-/bfj-7.0.2.tgz"; - sha512 = "+e/UqUzwmzJamNF50tBV6tZPTORow7gQ96iFow+8b562OdMpEK0BcJEq2OSPEDmAbSMBQ7PKZ87ubFkgxpYWgw=="; - }; - } - { - 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"; - sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; - }; - } { name = "binary_extensions___binary_extensions_2.2.0.tgz"; path = fetchurl { @@ -3353,22 +2169,6 @@ sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; } - { - name = "body_parser___body_parser_1.20.0.tgz"; - path = fetchurl { - name = "body_parser___body_parser_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz"; - sha512 = "DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg=="; - }; - } - { - name = "bonjour_service___bonjour_service_1.0.13.tgz"; - path = fetchurl { - name = "bonjour_service___bonjour_service_1.0.13.tgz"; - url = "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.13.tgz"; - sha512 = "LWKRU/7EqDUC9CTAQtuZl5HzBALoCYwtLhffW3et7vZMwv3bWLpJf8bRYlMD5OCcDpTfnPgNCV4yo9ZIaJGMiA=="; - }; - } { name = "boolbase___boolbase_1.0.0.tgz"; path = fetchurl { @@ -3385,14 +2185,6 @@ 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 { @@ -3450,19 +2242,11 @@ }; } { - name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + name = "browserslist___browserslist_4.21.4.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"; - sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="; - }; - } - { - name = "browserslist___browserslist_4.21.3.tgz"; - path = fetchurl { - name = "browserslist___browserslist_4.21.3.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz"; - sha512 = "898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ=="; + name = "browserslist___browserslist_4.21.4.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz"; + sha512 = "CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw=="; }; } { @@ -3513,6 +2297,14 @@ sha512 = "tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ=="; }; } + { + name = "buffer_equal___buffer_equal_1.0.1.tgz"; + path = fetchurl { + name = "buffer_equal___buffer_equal_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz"; + sha512 = "QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg=="; + }; + } { name = "buffer_fill___buffer_fill_1.0.0.tgz"; path = fetchurl { @@ -3538,43 +2330,19 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_9.0.3.tgz"; + name = "builder_util_runtime___builder_util_runtime_9.1.1.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_9.0.3.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.3.tgz"; - sha512 = "SfG2wnyjpUbbdtpnqDpWwklujofC6GarGpvdWrEkg9p5AD/xJmTF2buTNaqs3qtsNBEVQDDjZz9xc2GGpVyMfA=="; + name = "builder_util_runtime___builder_util_runtime_9.1.1.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz"; + sha512 = "azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw=="; }; } { - name = "builder_util___builder_util_23.3.3.tgz"; + name = "builder_util___builder_util_23.6.0.tgz"; path = fetchurl { - name = "builder_util___builder_util_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-23.3.3.tgz"; - sha512 = "MJZlUiq2PY5hjYv9+XNaoYdsITqvLgRDoHSFg/4nzpInbNxNjLQOolL04Zsyp+hgfcbFvMC4h0KkR1CMPHLWbA=="; - }; - } - { - name = "builtin_modules___builtin_modules_3.3.0.tgz"; - path = fetchurl { - name = "builtin_modules___builtin_modules_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz"; - sha512 = "zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw=="; - }; - } - { - 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"; - sha512 = "pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="; - }; - } - { - name = "bytes___bytes_3.1.2.tgz"; - path = fetchurl { - name = "bytes___bytes_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz"; - sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; + name = "builder_util___builder_util_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz"; + sha512 = "QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ=="; }; } { @@ -3601,22 +2369,6 @@ sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; }; } - { - name = "camel_case___camel_case_4.1.2.tgz"; - path = fetchurl { - name = "camel_case___camel_case_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz"; - sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; - }; - } - { - name = "camelcase_css___camelcase_css_2.0.1.tgz"; - path = fetchurl { - name = "camelcase_css___camelcase_css_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz"; - sha512 = "QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA=="; - }; - } { name = "camelcase___camelcase_5.3.1.tgz"; path = fetchurl { @@ -3634,27 +2386,11 @@ }; } { - name = "caniuse_api___caniuse_api_3.0.0.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001419.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"; - sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; - }; - } - { - name = "caniuse_lite___caniuse_lite_1.0.30001375.tgz"; - path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001375.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001375.tgz"; - sha512 = "kWIMkNzLYxSvnjy0hL8w1NOaWNr2rn39RTAVyIwcw8juu60bZDWiF1/loOYANzjtJmy6qPgNmn38ro5Pygagdw=="; - }; - } - { - name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.4.0.tgz"; - path = fetchurl { - name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz"; - sha512 = "roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw=="; + name = "caniuse_lite___caniuse_lite_1.0.30001419.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001419.tgz"; + sha512 = "aFO1r+g6R7TW+PNQxKzjITwLOyDhVRLjW0LcwS/HCZGUUKTGNp9+IwLC4xyDSZBygVL/mxaFR3HIV6wEKQuSzw=="; }; } { @@ -3690,11 +2426,11 @@ }; } { - name = "char_regex___char_regex_2.0.1.tgz"; + name = "character_entities___character_entities_2.0.2.tgz"; path = fetchurl { - name = "char_regex___char_regex_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/char-regex/-/char-regex-2.0.1.tgz"; - sha512 = "oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw=="; + name = "character_entities___character_entities_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.2.tgz"; + sha512 = "shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ=="; }; } { @@ -3705,14 +2441,6 @@ sha512 = "iOrT8yCZjSnyNZ43476FE2rnssvgw5hnuwOM0hm8Nj1qa0v4ieUUEbCyxxsEliaoDUb/75yCOL71zkDiDBLbMQ=="; }; } - { - name = "check_types___check_types_11.1.2.tgz"; - path = fetchurl { - name = "check_types___check_types_11.1.2.tgz"; - url = "https://registry.yarnpkg.com/check-types/-/check-types-11.1.2.tgz"; - sha512 = "tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ=="; - }; - } { name = "cheerio_select___cheerio_select_2.1.0.tgz"; path = fetchurl { @@ -3745,14 +2473,6 @@ sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; }; } - { - name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; - path = fetchurl { - name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; - sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="; - }; - } { name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; path = fetchurl { @@ -3762,19 +2482,11 @@ }; } { - name = "ci_info___ci_info_2.0.0.tgz"; + name = "ci_info___ci_info_3.5.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.2.tgz"; - path = fetchurl { - name = "ci_info___ci_info_3.3.2.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.2.tgz"; - sha512 = "xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg=="; + name = "ci_info___ci_info_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz"; + sha512 = "yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw=="; }; } { @@ -3786,27 +2498,11 @@ }; } { - name = "classnames___classnames_2.3.1.tgz"; + name = "classnames___classnames_2.3.2.tgz"; path = fetchurl { - name = "classnames___classnames_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz"; - sha512 = "OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="; - }; - } - { - name = "clean_css___clean_css_5.3.1.tgz"; - path = fetchurl { - name = "clean_css___clean_css_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.1.tgz"; - sha512 = "lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg=="; - }; - } - { - 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 = "classnames___classnames_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz"; + sha512 = "CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="; }; } { @@ -3818,11 +2514,11 @@ }; } { - name = "cliui___cliui_7.0.4.tgz"; + name = "cliui___cliui_8.0.1.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 = "cliui___cliui_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz"; + sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="; }; } { @@ -3881,14 +2577,6 @@ sha512 = "QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="; }; } - { - 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"; - sha512 = "q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA=="; - }; - } { name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; path = fetchurl { @@ -3929,22 +2617,6 @@ sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; } - { - name = "colord___colord_2.9.3.tgz"; - path = fetchurl { - name = "colord___colord_2.9.3.tgz"; - url = "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz"; - sha512 = "jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="; - }; - } - { - name = "colorette___colorette_2.0.19.tgz"; - path = fetchurl { - name = "colorette___colorette_2.0.19.tgz"; - url = "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz"; - sha512 = "3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="; - }; - } { name = "colors___colors_1.0.3.tgz"; path = fetchurl { @@ -3969,6 +2641,14 @@ sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; } + { + name = "comma_separated_tokens___comma_separated_tokens_2.0.3.tgz"; + path = fetchurl { + name = "comma_separated_tokens___comma_separated_tokens_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz"; + sha512 = "Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg=="; + }; + } { name = "commander___commander_2.9.0.tgz"; path = fetchurl { @@ -3977,14 +2657,6 @@ sha512 = "bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A=="; }; } - { - 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"; - sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; - }; - } { name = "commander___commander_5.1.0.tgz"; path = fetchurl { @@ -3994,51 +2666,11 @@ }; } { - name = "commander___commander_7.2.0.tgz"; + name = "commander___commander_9.4.1.tgz"; path = fetchurl { - name = "commander___commander_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz"; - sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; - }; - } - { - name = "commander___commander_8.3.0.tgz"; - path = fetchurl { - name = "commander___commander_8.3.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz"; - sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; - }; - } - { - name = "commander___commander_9.3.0.tgz"; - path = fetchurl { - name = "commander___commander_9.3.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-9.3.0.tgz"; - sha512 = "hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw=="; - }; - } - { - name = "common_path_prefix___common_path_prefix_3.0.0.tgz"; - path = fetchurl { - name = "common_path_prefix___common_path_prefix_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz"; - sha512 = "QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w=="; - }; - } - { - name = "common_tags___common_tags_1.8.2.tgz"; - path = fetchurl { - name = "common_tags___common_tags_1.8.2.tgz"; - url = "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz"; - sha512 = "gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA=="; - }; - } - { - 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"; - sha512 = "W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="; + name = "commander___commander_9.4.1.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz"; + sha512 = "5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw=="; }; } { @@ -4049,22 +2681,6 @@ sha512 = "pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A=="; }; } - { - 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"; - sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="; - }; - } - { - 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"; - sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; - }; - } { name = "concat_map___concat_map_0.0.1.tgz"; path = fetchurl { @@ -4098,91 +2714,19 @@ }; } { - name = "configstore___configstore_5.0.1.tgz"; + name = "convert_source_map___convert_source_map_1.9.0.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 = "convert_source_map___convert_source_map_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz"; + sha512 = "ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="; }; } { - name = "confusing_browser_globals___confusing_browser_globals_1.0.11.tgz"; + name = "core_js_pure___core_js_pure_3.25.5.tgz"; path = fetchurl { - name = "confusing_browser_globals___confusing_browser_globals_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz"; - sha512 = "JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA=="; - }; - } - { - name = "connect_history_api_fallback___connect_history_api_fallback_2.0.0.tgz"; - path = fetchurl { - name = "connect_history_api_fallback___connect_history_api_fallback_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz"; - sha512 = "U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA=="; - }; - } - { - name = "content_disposition___content_disposition_0.5.4.tgz"; - path = fetchurl { - 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=="; - }; - } - { - 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"; - sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; - }; - } - { - name = "convert_source_map___convert_source_map_1.8.0.tgz"; - 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"; - sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; - }; - } - { - 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"; - sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; - }; - } - { - name = "cookie___cookie_0.5.0.tgz"; - path = fetchurl { - name = "cookie___cookie_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz"; - sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="; - }; - } - { - name = "core_js_compat___core_js_compat_3.24.1.tgz"; - path = fetchurl { - name = "core_js_compat___core_js_compat_3.24.1.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.24.1.tgz"; - sha512 = "XhdNAGeRnTpp8xbD+sR/HFDK9CbeeeqXT6TuofXh3urqEevzkWmLRgrVoykodsw8okqo2pu1BOmuCKrHx63zdw=="; - }; - } - { - name = "core_js_pure___core_js_pure_3.24.1.tgz"; - path = fetchurl { - name = "core_js_pure___core_js_pure_3.24.1.tgz"; - url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.24.1.tgz"; - sha512 = "r1nJk41QLLPyozHUUPmILCEMtMw24NG4oWK6RbsDdjzQgg9ZvrUsPBj1MnG0wXXp1DCDU6j+wUvEmBSrtRbLXg=="; - }; - } - { - name = "core_js___core_js_3.24.1.tgz"; - path = fetchurl { - name = "core_js___core_js_3.24.1.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.24.1.tgz"; - sha512 = "0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg=="; + name = "core_js_pure___core_js_pure_3.25.5.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.25.5.tgz"; + sha512 = "oml3M22pHM+igfWHDfdLVq2ShWmjM2V4L+dQEBs0DWVIqEm9WHCwGAlZ6BmyBQGy5sFrJmcx+856D9lVKyGWYg=="; }; } { @@ -4201,14 +2745,6 @@ sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; }; } - { - 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"; - sha512 = "xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg=="; - }; - } { name = "cosmiconfig___cosmiconfig_7.0.1.tgz"; path = fetchurl { @@ -4249,86 +2785,6 @@ 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 = "css_blank_pseudo___css_blank_pseudo_3.0.3.tgz"; - path = fetchurl { - name = "css_blank_pseudo___css_blank_pseudo_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz"; - sha512 = "VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ=="; - }; - } - { - name = "css_declaration_sorter___css_declaration_sorter_6.3.0.tgz"; - path = fetchurl { - name = "css_declaration_sorter___css_declaration_sorter_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz"; - sha512 = "OGT677UGHJTAVMRhPO+HJ4oKln3wkBTwtDFH0ojbqm+MJm6xuDMHp2nkhh/ThaBqq20IbraBQSWKfSLNHQO9Og=="; - }; - } - { - name = "css_has_pseudo___css_has_pseudo_3.0.4.tgz"; - path = fetchurl { - name = "css_has_pseudo___css_has_pseudo_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz"; - sha512 = "Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw=="; - }; - } - { - name = "css_loader___css_loader_6.7.1.tgz"; - path = fetchurl { - name = "css_loader___css_loader_6.7.1.tgz"; - url = "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.1.tgz"; - sha512 = "yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw=="; - }; - } - { - name = "css_minimizer_webpack_plugin___css_minimizer_webpack_plugin_3.4.1.tgz"; - path = fetchurl { - name = "css_minimizer_webpack_plugin___css_minimizer_webpack_plugin_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz"; - sha512 = "1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q=="; - }; - } - { - name = "css_prefers_color_scheme___css_prefers_color_scheme_6.0.3.tgz"; - path = fetchurl { - name = "css_prefers_color_scheme___css_prefers_color_scheme_6.0.3.tgz"; - url = "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz"; - sha512 = "4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA=="; - }; - } - { - 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"; - sha512 = "jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="; - }; - } - { - 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"; - sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="; - }; - } - { - name = "css_select___css_select_4.3.0.tgz"; - path = fetchurl { - name = "css_select___css_select_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz"; - sha512 = "wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ=="; - }; - } { name = "css_select___css_select_5.1.0.tgz"; path = fetchurl { @@ -4338,27 +2794,11 @@ }; } { - name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; + name = "css_unit_converter___css_unit_converter_1.1.2.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"; - sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; - }; - } - { - name = "css_tree___css_tree_1.1.3.tgz"; - path = fetchurl { - name = "css_tree___css_tree_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz"; - sha512 = "tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q=="; - }; - } - { - name = "css_what___css_what_3.4.2.tgz"; - path = fetchurl { - name = "css_what___css_what_3.4.2.tgz"; - url = "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz"; - sha512 = "ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="; + name = "css_unit_converter___css_unit_converter_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.2.tgz"; + sha512 = "IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA=="; }; } { @@ -4378,99 +2818,83 @@ }; } { - name = "cssdb___cssdb_6.6.3.tgz"; + name = "csstype___csstype_3.1.1.tgz"; path = fetchurl { - name = "cssdb___cssdb_6.6.3.tgz"; - url = "https://registry.yarnpkg.com/cssdb/-/cssdb-6.6.3.tgz"; - sha512 = "7GDvDSmE+20+WcSMhP17Q1EVWUrLlbxxpMDqG731n8P99JhnQZHR9YvtjPvEHfjFUjvQJvdpKCjlKOX+xe4UVA=="; + name = "csstype___csstype_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz"; + sha512 = "DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="; }; } { - name = "cssesc___cssesc_3.0.0.tgz"; + name = "d3_array___d3_array_2.12.1.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 = "d3_array___d3_array_2.12.1.tgz"; + url = "https://registry.yarnpkg.com/d3-array/-/d3-array-2.12.1.tgz"; + sha512 = "B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ=="; }; } { - name = "cssnano_preset_default___cssnano_preset_default_5.2.12.tgz"; + name = "d3_color___d3_color_2.0.0.tgz"; path = fetchurl { - name = "cssnano_preset_default___cssnano_preset_default_5.2.12.tgz"; - url = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.12.tgz"; - sha512 = "OyCBTZi+PXgylz9HAA5kHyoYhfGcYdwFmyaJzWnzxuGRtnMw/kR6ilW9XzlzlRAtB6PLT/r+prYgkef7hngFew=="; + name = "d3_color___d3_color_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/d3-color/-/d3-color-2.0.0.tgz"; + sha512 = "SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ=="; }; } { - name = "cssnano_utils___cssnano_utils_3.1.0.tgz"; + name = "d3_format___d3_format_2.0.0.tgz"; path = fetchurl { - name = "cssnano_utils___cssnano_utils_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz"; - sha512 = "JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA=="; + name = "d3_format___d3_format_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/d3-format/-/d3-format-2.0.0.tgz"; + sha512 = "Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA=="; }; } { - name = "cssnano___cssnano_5.1.12.tgz"; + name = "d3_interpolate___d3_interpolate_2.0.1.tgz"; path = fetchurl { - name = "cssnano___cssnano_5.1.12.tgz"; - url = "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.12.tgz"; - sha512 = "TgvArbEZu0lk/dvg2ja+B7kYoD7BBCmn3+k58xD0qjrGHsFzXY/wKTo9M5egcUCabPol05e/PVoIu79s2JN4WQ=="; + name = "d3_interpolate___d3_interpolate_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-2.0.1.tgz"; + sha512 = "c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ=="; }; } { - name = "csso___csso_4.2.0.tgz"; + name = "d3_path___d3_path_2.0.0.tgz"; path = fetchurl { - name = "csso___csso_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz"; - sha512 = "wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA=="; + name = "d3_path___d3_path_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/d3-path/-/d3-path-2.0.0.tgz"; + sha512 = "ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA=="; }; } { - name = "cssom___cssom_0.4.4.tgz"; + name = "d3_scale___d3_scale_3.3.0.tgz"; path = fetchurl { - name = "cssom___cssom_0.4.4.tgz"; - url = "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz"; - sha512 = "p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="; + name = "d3_scale___d3_scale_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/d3-scale/-/d3-scale-3.3.0.tgz"; + sha512 = "1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ=="; }; } { - name = "cssom___cssom_0.3.8.tgz"; + name = "d3_shape___d3_shape_2.1.0.tgz"; path = fetchurl { - name = "cssom___cssom_0.3.8.tgz"; - url = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz"; - sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="; + name = "d3_shape___d3_shape_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/d3-shape/-/d3-shape-2.1.0.tgz"; + sha512 = "PnjUqfM2PpskbSLTJvAzp2Wv4CZsnAgTfcVRTwW03QR3MkXF8Uo7B1y/lWkAsmbKwuecto++4NlsYcvYpXpTHA=="; }; } { - name = "cssstyle___cssstyle_2.3.0.tgz"; + name = "d3_time_format___d3_time_format_3.0.0.tgz"; path = fetchurl { - name = "cssstyle___cssstyle_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz"; - sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; + name = "d3_time_format___d3_time_format_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-3.0.0.tgz"; + sha512 = "UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag=="; }; } { - name = "csstype___csstype_3.1.0.tgz"; + name = "d3_time___d3_time_2.1.1.tgz"; path = fetchurl { - name = "csstype___csstype_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz"; - sha512 = "uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA=="; - }; - } - { - name = "damerau_levenshtein___damerau_levenshtein_1.0.8.tgz"; - path = fetchurl { - name = "damerau_levenshtein___damerau_levenshtein_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz"; - sha512 = "sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA=="; - }; - } - { - 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"; - sha512 = "X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ=="; + name = "d3_time___d3_time_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/d3-time/-/d3-time-2.1.1.tgz"; + sha512 = "/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ=="; }; } { @@ -4489,14 +2913,6 @@ sha512 = "8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ=="; }; } - { - 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 = "debug___debug_4.3.4.tgz"; path = fetchurl { @@ -4505,6 +2921,14 @@ 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 = "debug___debug_3.2.7.tgz"; path = fetchurl { @@ -4514,11 +2938,19 @@ }; } { - name = "decimal.js___decimal.js_10.3.1.tgz"; + name = "decimal.js_light___decimal.js_light_2.5.1.tgz"; path = fetchurl { - name = "decimal.js___decimal.js_10.3.1.tgz"; - url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz"; - sha512 = "V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="; + name = "decimal.js_light___decimal.js_light_2.5.1.tgz"; + url = "https://registry.yarnpkg.com/decimal.js-light/-/decimal.js-light-2.5.1.tgz"; + sha512 = "qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg=="; + }; + } + { + name = "decode_named_character_reference___decode_named_character_reference_1.0.2.tgz"; + path = fetchurl { + name = "decode_named_character_reference___decode_named_character_reference_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz"; + sha512 = "O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg=="; }; } { @@ -4537,14 +2969,6 @@ sha512 = "Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="; }; } - { - 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 = "deep_is___deep_is_0.1.4.tgz"; path = fetchurl { @@ -4561,14 +2985,6 @@ sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; }; } - { - name = "default_gateway___default_gateway_6.0.3.tgz"; - path = fetchurl { - name = "default_gateway___default_gateway_6.0.3.tgz"; - url = "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz"; - sha512 = "fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg=="; - }; - } { name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; path = fetchurl { @@ -4577,14 +2993,6 @@ sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; }; } - { - name = "define_lazy_prop___define_lazy_prop_2.0.0.tgz"; - path = fetchurl { - name = "define_lazy_prop___define_lazy_prop_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"; - sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; - }; - } { name = "define_properties___define_properties_1.1.4.tgz"; path = fetchurl { @@ -4593,14 +3001,6 @@ sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; }; } - { - name = "defined___defined_1.0.0.tgz"; - path = fetchurl { - name = "defined___defined_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz"; - sha512 = "Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ=="; - }; - } { name = "delayed_stream___delayed_stream_1.0.0.tgz"; path = fetchurl { @@ -4610,27 +3010,19 @@ }; } { - name = "depd___depd_2.0.0.tgz"; + name = "dequal___dequal_2.0.3.tgz"; path = fetchurl { - name = "depd___depd_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz"; - sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; + name = "dequal___dequal_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz"; + sha512 = "0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA=="; }; } { - name = "depd___depd_1.1.2.tgz"; + name = "detect_indent___detect_indent_6.0.0.tgz"; path = fetchurl { - name = "depd___depd_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; - sha512 = "7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="; - }; - } - { - name = "destroy___destroy_1.2.0.tgz"; - path = fetchurl { - name = "destroy___destroy_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz"; - sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="; + name = "detect_indent___detect_indent_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz"; + sha512 = "oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA=="; }; } { @@ -4649,30 +3041,6 @@ sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; }; } - { - name = "detect_port_alt___detect_port_alt_1.1.6.tgz"; - path = fetchurl { - name = "detect_port_alt___detect_port_alt_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz"; - sha512 = "5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q=="; - }; - } - { - name = "detective___detective_5.2.1.tgz"; - path = fetchurl { - name = "detective___detective_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/detective/-/detective-5.2.1.tgz"; - sha512 = "v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw=="; - }; - } - { - name = "didyoumean___didyoumean_1.2.2.tgz"; - path = fetchurl { - name = "didyoumean___didyoumean_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz"; - sha512 = "gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="; - }; - } { name = "diff_sequences___diff_sequences_27.5.1.tgz"; path = fetchurl { @@ -4689,6 +3057,22 @@ sha512 = "FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw=="; }; } + { + name = "diff_sequences___diff_sequences_29.0.0.tgz"; + path = fetchurl { + name = "diff_sequences___diff_sequences_29.0.0.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.0.0.tgz"; + sha512 = "7Qe/zd1wxSDL4D/X/FPjOMB+ZMDt71W94KYaq05I2l0oQqgXgs7s4ftYYmV38gBSrPz2vcygxfs1xn0FT+rKNA=="; + }; + } + { + name = "diff___diff_5.1.0.tgz"; + path = fetchurl { + name = "diff___diff_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz"; + sha512 = "D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw=="; + }; + } { name = "dir_compare___dir_compare_2.4.0.tgz"; path = fetchurl { @@ -4730,19 +3114,11 @@ ''; } { - name = "dlv___dlv_1.1.3.tgz"; + name = "dmg_builder___dmg_builder_23.6.0.tgz"; path = fetchurl { - name = "dlv___dlv_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz"; - sha512 = "+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="; - }; - } - { - name = "dmg_builder___dmg_builder_23.3.3.tgz"; - path = fetchurl { - name = "dmg_builder___dmg_builder_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.3.3.tgz"; - sha512 = "ECwAjt+ZWyOvddrkDx1xRD6IVUCZb5SV6vSMHZd+Va3G2sUXHrnglR1cGDKRF4oYRQm8SYVrpLZKbi8npyDcAQ=="; + name = "dmg_builder___dmg_builder_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz"; + sha512 = "jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA=="; }; } { @@ -4754,19 +3130,11 @@ }; } { - name = "dns_equal___dns_equal_1.0.0.tgz"; + name = "docopt___docopt_0.6.2.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"; - sha512 = "z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="; - }; - } - { - name = "dns_packet___dns_packet_5.4.0.tgz"; - path = fetchurl { - name = "dns_packet___dns_packet_5.4.0.tgz"; - url = "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.4.0.tgz"; - sha512 = "EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g=="; + name = "docopt___docopt_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz"; + sha512 = "NqTbaYeE4gA/wU1hdKFdU+AFahpDOpgGLzHP42k6H6DKExJd0A55KEVWYhL9FEmHmgeLvEU2vuKXDuU+4yToOw=="; }; } { @@ -4794,11 +3162,11 @@ }; } { - name = "dom_converter___dom_converter_0.2.0.tgz"; + name = "dom_helpers___dom_helpers_3.4.0.tgz"; path = fetchurl { - name = "dom_converter___dom_converter_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz"; - sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA=="; + name = "dom_helpers___dom_helpers_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz"; + sha512 = "LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA=="; }; } { @@ -4809,22 +3177,6 @@ sha512 = "nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA=="; }; } - { - 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"; - sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; - }; - } - { - name = "dom_serializer___dom_serializer_1.4.1.tgz"; - path = fetchurl { - name = "dom_serializer___dom_serializer_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz"; - sha512 = "VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag=="; - }; - } { name = "dom_serializer___dom_serializer_2.0.0.tgz"; path = fetchurl { @@ -4833,14 +3185,6 @@ sha512 = "wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg=="; }; } - { - 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"; - sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; - }; - } { name = "domelementtype___domelementtype_2.3.0.tgz"; path = fetchurl { @@ -4849,22 +3193,6 @@ sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="; }; } - { - 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"; - sha512 = "yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg=="; - }; - } - { - name = "domhandler___domhandler_4.3.1.tgz"; - path = fetchurl { - name = "domhandler___domhandler_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz"; - sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ=="; - }; - } { name = "domhandler___domhandler_5.0.3.tgz"; path = fetchurl { @@ -4873,22 +3201,6 @@ sha512 = "cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w=="; }; } - { - 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"; - sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; - }; - } - { - 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 = "domutils___domutils_3.0.1.tgz"; path = fetchurl { @@ -4898,19 +3210,11 @@ }; } { - name = "dot_case___dot_case_3.0.4.tgz"; + name = "dot_json___dot_json_1.2.2.tgz"; path = fetchurl { - name = "dot_case___dot_case_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz"; - sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="; - }; - } - { - 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 = "dot_json___dot_json_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/dot-json/-/dot-json-1.2.2.tgz"; + sha512 = "AKL+GsO4wSEU4LU+fAk/PqN4nQ6PB1vT3HpMiZous9xCzK5S0kh4DzfUY0EfU67jsIXLlu0ty71659N9Nmg+Tw=="; }; } { @@ -4929,14 +3233,6 @@ sha512 = "YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="; }; } - { - name = "dotenv___dotenv_10.0.0.tgz"; - path = fetchurl { - name = "dotenv___dotenv_10.0.0.tgz"; - url = "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz"; - sha512 = "rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q=="; - }; - } { name = "dotenv___dotenv_9.0.2.tgz"; path = fetchurl { @@ -4953,14 +3249,6 @@ sha512 = "1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA=="; }; } - { - 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"; - sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; - }; - } { name = "duplexify___duplexify_3.7.1.tgz"; path = fetchurl { @@ -4969,14 +3257,6 @@ sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; }; } - { - 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"; - sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; - }; - } { name = "ejs___ejs_3.1.8.tgz"; path = fetchurl { @@ -4986,11 +3266,11 @@ }; } { - name = "electron_builder___electron_builder_23.3.3.tgz"; + name = "electron_builder___electron_builder_23.6.0.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.3.3.tgz"; - sha512 = "mFYYdhoFPKevP6y5uaaF3dusmB2OtQ/HnwwpyOePeU7QDS0SEIAUokQsHUanAiJAZcBqtY7iyLBgX18QybdFFw=="; + name = "electron_builder___electron_builder_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz"; + sha512 = "y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw=="; }; } { @@ -5010,11 +3290,11 @@ }; } { - name = "electron_publish___electron_publish_23.3.3.tgz"; + name = "electron_publish___electron_publish_23.6.0.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.3.3.tgz"; - sha512 = "1dX17eE5xVXedTxjC+gjsP74oC0+sIHgqysp0ryTlF9+yfQUyXjBk6kcK+zhtBA2SsHMSglDtM+JPxDD/WpPTQ=="; + name = "electron_publish___electron_publish_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz"; + sha512 = "jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg=="; }; } { @@ -5026,27 +3306,27 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.4.215.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.4.281.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.4.215.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.215.tgz"; - sha512 = "vqZxT8C5mlDZ//hQFhneHmOLnj1LhbzxV0+I1yqHV8SB1Oo4Y5Ne9+qQhwHl7O1s9s9cRuo2l5CoLEHdhMTwZg=="; + name = "electron_to_chromium___electron_to_chromium_1.4.281.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.281.tgz"; + sha512 = "yer0w5wCYdFoZytfmbNhwiGI/3cW06+RV7E23ln4490DVMxs7PvYpbsrSmAiBn/V6gode8wvJlST2YfWgvzWIg=="; }; } { - name = "electron_updater___electron_updater_5.2.1.tgz"; + name = "electron_updater___electron_updater_5.3.0.tgz"; path = fetchurl { - name = "electron_updater___electron_updater_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/electron-updater/-/electron-updater-5.2.1.tgz"; - sha512 = "OQZVIvqcK8j03HjT07uVPgvguP/r8RY2wZcwCM26+fcDOjtrm01Dfz3G8Eru+69znbrR+F9pDzr98ewMavBrWQ=="; + name = "electron_updater___electron_updater_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/electron-updater/-/electron-updater-5.3.0.tgz"; + sha512 = "iKEr7yQBcvnQUPnSDYGSWC9t0eF2YbZWeYYYZzYxdl+HiRejXFENjYMnYjoOm2zxyD6Cr2JTHZhp9pqxiXuCOw=="; }; } { - name = "electron___electron_20.0.2.tgz"; + name = "electron___electron_21.2.1.tgz"; path = fetchurl { - name = "electron___electron_20.0.2.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-20.0.2.tgz"; - sha512 = "Op4nxSyXH0tXjhvWC+WDn9EI0gep5etPccainxu1A4wes+ZFQBMCBXxibotanJfG+WNW4RaOv88NArwHIsSmPw=="; + name = "electron___electron_21.2.1.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-21.2.1.tgz"; + sha512 = "RLuFstGpHk1wtCRm9Kd+mhLjHZ5+m83+GQ/CsVl06OT7ikCT68yXMEgPmSkgmN5WjzlorsK6H5hIk9Sf6P/7Lg=="; }; } { @@ -5057,14 +3337,6 @@ sha512 = "aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw=="; }; } - { - name = "emittery___emittery_0.8.1.tgz"; - path = fetchurl { - name = "emittery___emittery_0.8.1.tgz"; - url = "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz"; - sha512 = "uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg=="; - }; - } { name = "emoji_regex___emoji_regex_8.0.0.tgz"; path = fetchurl { @@ -5073,22 +3345,6 @@ sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; } - { - name = "emoji_regex___emoji_regex_9.2.2.tgz"; - path = fetchurl { - name = "emoji_regex___emoji_regex_9.2.2.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz"; - sha512 = "L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="; - }; - } - { - 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"; - sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; - }; - } { name = "encodeurl___encodeurl_1.0.2.tgz"; path = fetchurl { @@ -5105,14 +3361,6 @@ sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; } - { - name = "enhanced_resolve___enhanced_resolve_5.10.0.tgz"; - path = fetchurl { - name = "enhanced_resolve___enhanced_resolve_5.10.0.tgz"; - url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz"; - sha512 = "T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ=="; - }; - } { name = "ensure_posix_path___ensure_posix_path_1.1.1.tgz"; path = fetchurl { @@ -5122,19 +3370,11 @@ }; } { - name = "entities___entities_2.2.0.tgz"; + name = "entities___entities_4.4.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_4.3.1.tgz"; - path = fetchurl { - name = "entities___entities_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-4.3.1.tgz"; - sha512 = "o4q/dYJlmyjP2zfnaWDUC6A3BQFmVTX+tZPezK7k0GLSU9QYCauscf5Y+qcEPzKL+EixVouYDgLQK5H9GrLpkg=="; + name = "entities___entities_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz"; + sha512 = "oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA=="; }; } { @@ -5162,35 +3402,11 @@ }; } { - name = "error_stack_parser___error_stack_parser_2.1.4.tgz"; + name = "es_abstract___es_abstract_1.20.4.tgz"; path = fetchurl { - name = "error_stack_parser___error_stack_parser_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz"; - sha512 = "Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ=="; - }; - } - { - name = "es_abstract___es_abstract_1.20.1.tgz"; - path = fetchurl { - name = "es_abstract___es_abstract_1.20.1.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz"; - sha512 = "WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA=="; - }; - } - { - name = "es_array_method_boxes_properly___es_array_method_boxes_properly_1.0.0.tgz"; - path = fetchurl { - name = "es_array_method_boxes_properly___es_array_method_boxes_properly_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz"; - sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; - }; - } - { - name = "es_module_lexer___es_module_lexer_0.9.3.tgz"; - path = fetchurl { - name = "es_module_lexer___es_module_lexer_0.9.3.tgz"; - url = "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz"; - sha512 = "1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="; + name = "es_abstract___es_abstract_1.20.4.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz"; + sha512 = "0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA=="; }; } { @@ -5217,6 +3433,174 @@ sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="; }; } + { + name = "esbuild_android_64___esbuild_android_64_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_android_64___esbuild_android_64_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.10.tgz"; + sha512 = "UI7krF8OYO1N7JYTgLT9ML5j4+45ra3amLZKx7LO3lmLt1Ibn8t3aZbX5Pu4BjWiqDuJ3m/hsvhPhK/5Y/YpnA=="; + }; + } + { + name = "esbuild_android_arm64___esbuild_android_arm64_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_android_arm64___esbuild_android_arm64_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.10.tgz"; + sha512 = "EOt55D6xBk5O05AK8brXUbZmoFj4chM8u3riGflLa6ziEoVvNjRdD7Cnp82NHQGfSHgYR06XsPI8/sMuA/cUwg=="; + }; + } + { + name = "esbuild_darwin_64___esbuild_darwin_64_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_darwin_64___esbuild_darwin_64_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.10.tgz"; + sha512 = "hbDJugTicqIm+WKZgp208d7FcXcaK8j2c0l+fqSJ3d2AzQAfjEYDRM3Z2oMeqSJ9uFxyj/muSACLdix7oTstRA=="; + }; + } + { + name = "esbuild_darwin_arm64___esbuild_darwin_arm64_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_darwin_arm64___esbuild_darwin_arm64_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.10.tgz"; + sha512 = "M1t5+Kj4IgSbYmunf2BB6EKLkWUq+XlqaFRiGOk8bmBapu9bCDrxjf4kUnWn59Dka3I27EiuHBKd1rSO4osLFQ=="; + }; + } + { + name = "esbuild_freebsd_64___esbuild_freebsd_64_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_freebsd_64___esbuild_freebsd_64_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.10.tgz"; + sha512 = "KMBFMa7C8oc97nqDdoZwtDBX7gfpolkk6Bcmj6YFMrtCMVgoU/x2DI1p74DmYl7CSS6Ppa3xgemrLrr5IjIn0w=="; + }; + } + { + name = "esbuild_freebsd_arm64___esbuild_freebsd_arm64_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_freebsd_arm64___esbuild_freebsd_arm64_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.10.tgz"; + sha512 = "m2KNbuCX13yQqLlbSojFMHpewbn8wW5uDS6DxRpmaZKzyq8Dbsku6hHvh2U+BcLwWY4mpgXzFUoENEf7IcioGg=="; + }; + } + { + name = "esbuild_linux_32___esbuild_linux_32_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_linux_32___esbuild_linux_32_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.10.tgz"; + sha512 = "guXrwSYFAvNkuQ39FNeV4sNkNms1bLlA5vF1H0cazZBOLdLFIny6BhT+TUbK/hdByMQhtWQ5jI9VAmPKbVPu1w=="; + }; + } + { + name = "esbuild_linux_64___esbuild_linux_64_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_linux_64___esbuild_linux_64_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.10.tgz"; + sha512 = "jd8XfaSJeucMpD63YNMO1JCrdJhckHWcMv6O233bL4l6ogQKQOxBYSRP/XLWP+6kVTu0obXovuckJDcA0DKtQA=="; + }; + } + { + name = "esbuild_linux_arm64___esbuild_linux_arm64_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_linux_arm64___esbuild_linux_arm64_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.10.tgz"; + sha512 = "GByBi4fgkvZFTHFDYNftu1DQ1GzR23jws0oWyCfhnI7eMOe+wgwWrc78dbNk709Ivdr/evefm2PJiUBMiusS1A=="; + }; + } + { + name = "esbuild_linux_arm___esbuild_linux_arm_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_linux_arm___esbuild_linux_arm_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.10.tgz"; + sha512 = "6N8vThLL/Lysy9y4Ex8XoLQAlbZKUyExCWyayGi2KgTBelKpPgj6RZnUaKri0dHNPGgReJriKVU6+KDGQwn10A=="; + }; + } + { + name = "esbuild_linux_mips64le___esbuild_linux_mips64le_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_linux_mips64le___esbuild_linux_mips64le_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.10.tgz"; + sha512 = "BxP+LbaGVGIdQNJUNF7qpYjEGWb0YyHVSKqYKrn+pTwH/SiHUxFyJYSP3pqkku61olQiSBnSmWZ+YUpj78Tw7Q=="; + }; + } + { + name = "esbuild_linux_ppc64le___esbuild_linux_ppc64le_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_linux_ppc64le___esbuild_linux_ppc64le_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.10.tgz"; + sha512 = "LoSQCd6498PmninNgqd/BR7z3Bsk/mabImBWuQ4wQgmQEeanzWd5BQU2aNi9mBURCLgyheuZS6Xhrw5luw3OkQ=="; + }; + } + { + name = "esbuild_linux_riscv64___esbuild_linux_riscv64_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_linux_riscv64___esbuild_linux_riscv64_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.10.tgz"; + sha512 = "Lrl9Cr2YROvPV4wmZ1/g48httE8z/5SCiXIyebiB5N8VT7pX3t6meI7TQVHw/wQpqP/AF4SksDuFImPTM7Z32Q=="; + }; + } + { + name = "esbuild_linux_s390x___esbuild_linux_s390x_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_linux_s390x___esbuild_linux_s390x_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.10.tgz"; + sha512 = "ReP+6q3eLVVP2lpRrvl5EodKX7EZ1bS1/z5j6hsluAlZP5aHhk6ghT6Cq3IANvvDdscMMCB4QEbI+AjtvoOFpA=="; + }; + } + { + name = "esbuild_netbsd_64___esbuild_netbsd_64_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_netbsd_64___esbuild_netbsd_64_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.10.tgz"; + sha512 = "iGDYtJCMCqldMskQ4eIV+QSS/CuT7xyy9i2/FjpKvxAuCzrESZXiA1L64YNj6/afuzfBe9i8m/uDkFHy257hTw=="; + }; + } + { + name = "esbuild_openbsd_64___esbuild_openbsd_64_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_openbsd_64___esbuild_openbsd_64_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.10.tgz"; + sha512 = "ftMMIwHWrnrYnvuJQRJs/Smlcb28F9ICGde/P3FUTCgDDM0N7WA0o9uOR38f5Xe2/OhNCgkjNeb7QeaE3cyWkQ=="; + }; + } + { + name = "esbuild_sunos_64___esbuild_sunos_64_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_sunos_64___esbuild_sunos_64_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.10.tgz"; + sha512 = "mf7hBL9Uo2gcy2r3rUFMjVpTaGpFJJE5QTDDqUFf1632FxteYANffDZmKbqX0PfeQ2XjUDE604IcE7OJeoHiyg=="; + }; + } + { + name = "esbuild_windows_32___esbuild_windows_32_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_windows_32___esbuild_windows_32_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.10.tgz"; + sha512 = "ttFVo+Cg8b5+qHmZHbEc8Vl17kCleHhLzgT8X04y8zudEApo0PxPg9Mz8Z2cKH1bCYlve1XL8LkyXGFjtUYeGg=="; + }; + } + { + name = "esbuild_windows_64___esbuild_windows_64_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_windows_64___esbuild_windows_64_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.10.tgz"; + sha512 = "2H0gdsyHi5x+8lbng3hLbxDWR7mKHWh5BXZGKVG830KUmXOOWFE2YKJ4tHRkejRduOGDrBvHBriYsGtmTv3ntA=="; + }; + } + { + name = "esbuild_windows_arm64___esbuild_windows_arm64_0.15.10.tgz"; + path = fetchurl { + name = "esbuild_windows_arm64___esbuild_windows_arm64_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.10.tgz"; + sha512 = "S+th4F+F8VLsHLR0zrUcG+Et4hx0RKgK1eyHc08kztmLOES8BWwMiaGdoW9hiXuzznXQ0I/Fg904MNbr11Nktw=="; + }; + } + { + name = "esbuild___esbuild_0.15.10.tgz"; + path = fetchurl { + name = "esbuild___esbuild_0.15.10.tgz"; + url = "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.10.tgz"; + sha512 = "N7wBhfJ/E5fzn/SpNgX+oW2RLRjwaL8Y0ezqNqhjD6w0H2p0rDuEz2FKZqpqLnO8DCaWumKe8dsC/ljvVSSxng=="; + }; + } { name = "escalade___escalade_3.1.1.tgz"; path = fetchurl { @@ -5225,22 +3609,6 @@ 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_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"; - sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="; - }; - } { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; path = fetchurl { @@ -5265,14 +3633,6 @@ sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; } - { - name = "escodegen___escodegen_2.0.0.tgz"; - path = fetchurl { - name = "escodegen___escodegen_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz"; - sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; - }; - } { name = "eslint_config_prettier___eslint_config_prettier_8.5.0.tgz"; path = fetchurl { @@ -5281,14 +3641,6 @@ sha512 = "obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q=="; }; } - { - name = "eslint_config_react_app___eslint_config_react_app_7.0.1.tgz"; - path = fetchurl { - name = "eslint_config_react_app___eslint_config_react_app_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz"; - sha512 = "K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA=="; - }; - } { name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.6.tgz"; path = fetchurl { @@ -5298,19 +3650,11 @@ }; } { - name = "eslint_module_utils___eslint_module_utils_2.7.3.tgz"; + name = "eslint_module_utils___eslint_module_utils_2.7.4.tgz"; path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.7.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz"; - sha512 = "088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ=="; - }; - } - { - name = "eslint_plugin_flowtype___eslint_plugin_flowtype_8.0.3.tgz"; - path = fetchurl { - name = "eslint_plugin_flowtype___eslint_plugin_flowtype_8.0.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz"; - sha512 = "dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ=="; + name = "eslint_module_utils___eslint_module_utils_2.7.4.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz"; + sha512 = "j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA=="; }; } { @@ -5322,43 +3666,11 @@ }; } { - name = "eslint_plugin_jest___eslint_plugin_jest_25.7.0.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.31.10.tgz"; path = fetchurl { - name = "eslint_plugin_jest___eslint_plugin_jest_25.7.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz"; - sha512 = "PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ=="; - }; - } - { - name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.6.1.tgz"; - path = fetchurl { - name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.6.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz"; - sha512 = "sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q=="; - }; - } - { - name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.6.0.tgz"; - path = fetchurl { - name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz"; - sha512 = "oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g=="; - }; - } - { - name = "eslint_plugin_react___eslint_plugin_react_7.30.1.tgz"; - path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.30.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.30.1.tgz"; - sha512 = "NbEvI9jtqO46yJA3wcRF9Mo0lF9T/jhdHqhCHXiXtD+Zcb98812wvokjWpU7Q4QH5edo6dmqrukxVvWWXHlsUg=="; - }; - } - { - name = "eslint_plugin_testing_library___eslint_plugin_testing_library_5.6.0.tgz"; - path = fetchurl { - name = "eslint_plugin_testing_library___eslint_plugin_testing_library_5.6.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.6.0.tgz"; - sha512 = "y63TRzPhGCMNsnUwMGJU1MFWc/3GvYw+nzobp9QiyNTTKsgAt5RKAOT1I34+XqVBpX1lC8bScoOjCkP7iRv0Mw=="; + name = "eslint_plugin_react___eslint_plugin_react_7.31.10.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.10.tgz"; + sha512 = "e4N/nc6AAlg4UKW/mXeYWd3R++qUano5/o+t+wnWxIf+bLsOaH3a4q74kX3nDjYym3VBN4HyO9nEn1GcAqgQOA=="; }; } { @@ -5402,27 +3714,19 @@ }; } { - name = "eslint_webpack_plugin___eslint_webpack_plugin_3.2.0.tgz"; + name = "eslint___eslint_8.25.0.tgz"; path = fetchurl { - name = "eslint_webpack_plugin___eslint_webpack_plugin_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz"; - sha512 = "avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w=="; + name = "eslint___eslint_8.25.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-8.25.0.tgz"; + sha512 = "DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A=="; }; } { - name = "eslint___eslint_8.21.0.tgz"; + name = "espree___espree_9.4.0.tgz"; path = fetchurl { - name = "eslint___eslint_8.21.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-8.21.0.tgz"; - sha512 = "/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA=="; - }; - } - { - name = "espree___espree_9.3.3.tgz"; - path = fetchurl { - name = "espree___espree_9.3.3.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-9.3.3.tgz"; - sha512 = "ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng=="; + name = "espree___espree_9.4.0.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz"; + sha512 = "DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw=="; }; } { @@ -5466,11 +3770,11 @@ }; } { - name = "estree_walker___estree_walker_1.0.1.tgz"; + name = "estree_walker___estree_walker_2.0.2.tgz"; path = fetchurl { - name = "estree_walker___estree_walker_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz"; - sha512 = "1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="; + name = "estree_walker___estree_walker_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz"; + sha512 = "Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="; }; } { @@ -5481,14 +3785,6 @@ sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; }; } - { - 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"; - sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; - }; - } { name = "eventemitter3___eventemitter3_4.0.7.tgz"; path = fetchurl { @@ -5497,14 +3793,6 @@ sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; }; } - { - name = "events___events_3.3.0.tgz"; - path = fetchurl { - name = "events___events_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz"; - sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; - }; - } { name = "execa___execa_4.1.0.tgz"; path = fetchurl { @@ -5530,19 +3818,19 @@ }; } { - name = "expect___expect_27.5.1.tgz"; + name = "expect___expect_28.1.3.tgz"; path = fetchurl { - name = "expect___expect_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/expect/-/expect-27.5.1.tgz"; - sha512 = "E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw=="; + name = "expect___expect_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/expect/-/expect-28.1.3.tgz"; + sha512 = "eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g=="; }; } { - name = "express___express_4.18.1.tgz"; + name = "expect___expect_29.1.2.tgz"; path = fetchurl { - name = "express___express_4.18.1.tgz"; - url = "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz"; - sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q=="; + name = "expect___expect_29.1.2.tgz"; + url = "https://registry.yarnpkg.com/expect/-/expect-29.1.2.tgz"; + sha512 = "AuAGn1uxva5YBbBlXb+2JPxJRuemZsmlGcapPXWNSBNsQtAULfjioREGBWuI0EOvYUKjDnrCy8PW5Zlr1md5mw=="; }; } { @@ -5578,11 +3866,27 @@ }; } { - name = "fast_glob___fast_glob_3.2.11.tgz"; + name = "fast_equals___fast_equals_2.0.4.tgz"; path = fetchurl { - 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=="; + name = "fast_equals___fast_equals_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/fast-equals/-/fast-equals-2.0.4.tgz"; + sha512 = "caj/ZmjHljPrZtbzJ3kfH5ia/k4mTJe/qSiXAGzxZWRZgsgDV0cvNaQULqUX8t0/JVlzzEdYOwCN5DmzTxoD4w=="; + }; + } + { + name = "fast_fifo___fast_fifo_1.1.0.tgz"; + path = fetchurl { + name = "fast_fifo___fast_fifo_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.1.0.tgz"; + sha512 = "Kl29QoNbNvn4nhDsLYjyIAaIqaJB6rBx5p3sL9VjaefJ+eMFBWVZiaoguaoZfzEKr5RhAti0UgM8703akGPJ6g=="; + }; + } + { + name = "fast_glob___fast_glob_3.2.12.tgz"; + path = fetchurl { + name = "fast_glob___fast_glob_3.2.12.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz"; + sha512 = "DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w=="; }; } { @@ -5610,19 +3914,11 @@ }; } { - name = "faye_websocket___faye_websocket_0.11.4.tgz"; + name = "fb_watchman___fb_watchman_2.0.2.tgz"; path = fetchurl { - name = "faye_websocket___faye_websocket_0.11.4.tgz"; - url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz"; - sha512 = "CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g=="; - }; - } - { - 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"; - sha512 = "DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg=="; + name = "fb_watchman___fb_watchman_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz"; + sha512 = "p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA=="; }; } { @@ -5641,14 +3937,6 @@ sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; }; } - { - 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"; - sha512 = "qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw=="; - }; - } { name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; path = fetchurl { @@ -5681,22 +3969,6 @@ sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; } - { - name = "finalhandler___finalhandler_1.2.0.tgz"; - path = fetchurl { - name = "finalhandler___finalhandler_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz"; - sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; - }; - } - { - name = "find_cache_dir___find_cache_dir_3.3.2.tgz"; - path = fetchurl { - name = "find_cache_dir___find_cache_dir_3.3.2.tgz"; - url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz"; - sha512 = "wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig=="; - }; - } { name = "find_root___find_root_1.1.0.tgz"; path = fetchurl { @@ -5705,14 +3977,6 @@ sha512 = "NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="; }; } - { - 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"; - sha512 = "NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ=="; - }; - } { name = "find_up___find_up_3.0.0.tgz"; path = fetchurl { @@ -5746,11 +4010,11 @@ }; } { - name = "flatted___flatted_3.2.6.tgz"; + name = "flatted___flatted_3.2.7.tgz"; path = fetchurl { - name = "flatted___flatted_3.2.6.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.6.tgz"; - sha512 = "0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ=="; + name = "flatted___flatted_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz"; + sha512 = "5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="; }; } { @@ -5762,11 +4026,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.15.1.tgz"; + name = "follow_redirects___follow_redirects_1.15.2.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.15.1.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz"; - sha512 = "yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="; + name = "follow_redirects___follow_redirects_1.15.2.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz"; + sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; }; } { @@ -5777,30 +4041,6 @@ sha512 = "mLi7Sb4iitgk3mJsTZZDbixssHLoJB4/onWGlQOvTSPW8YPBDQNaMTGOdZ92axQI4UNWwPxV5FmCBOEo1Us7lg=="; }; } - { - name = "foreman___foreman_3.0.1.tgz"; - path = fetchurl { - name = "foreman___foreman_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/foreman/-/foreman-3.0.1.tgz"; - sha512 = "ek/qoM0vVKpxzkBUQN9k4Fs7l0XsHv4bqxuEW6oqIS4s0ouYKsQ19YjBzUJKTFRumFiSpUv7jySkrI6lfbhjlw=="; - }; - } - { - name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_6.5.2.tgz"; - path = fetchurl { - name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.2.tgz"; - sha512 = "m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA=="; - }; - } - { - name = "form_data___form_data_3.0.1.tgz"; - path = fetchurl { - name = "form_data___form_data_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz"; - sha512 = "RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg=="; - }; - } { name = "form_data___form_data_4.0.0.tgz"; path = fetchurl { @@ -5809,30 +4049,6 @@ sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; }; } - { - name = "forwarded___forwarded_0.2.0.tgz"; - path = fetchurl { - name = "forwarded___forwarded_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz"; - sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; - }; - } - { - name = "fraction.js___fraction.js_4.2.0.tgz"; - path = fetchurl { - name = "fraction.js___fraction.js_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz"; - sha512 = "MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA=="; - }; - } - { - 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"; - sha512 = "zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="; - }; - } { name = "fs_extra___fs_extra_10.1.0.tgz"; path = fetchurl { @@ -5881,14 +4097,6 @@ sha512 = "+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ=="; }; } - { - name = "fs_monkey___fs_monkey_1.0.3.tgz"; - path = fetchurl { - name = "fs_monkey___fs_monkey_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz"; - sha512 = "cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q=="; - }; - } { name = "fs_tree_diff___fs_tree_diff_2.0.1.tgz"; path = fetchurl { @@ -5929,14 +4137,6 @@ sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="; }; } - { - 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"; - sha512 = "dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="; - }; - } { name = "functions_have_names___functions_have_names_1.2.3.tgz"; path = fetchurl { @@ -5970,19 +4170,11 @@ }; } { - name = "get_intrinsic___get_intrinsic_1.1.2.tgz"; + name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz"; - sha512 = "Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA=="; - }; - } - { - name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; - 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"; - sha512 = "I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="; + name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; + sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; }; } { @@ -6057,14 +4249,6 @@ sha512 = "uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw=="; }; } - { - name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; - path = fetchurl { - name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; - sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; - }; - } { name = "glob___glob_7.2.3.tgz"; path = fetchurl { @@ -6081,30 +4265,6 @@ 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_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 = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; path = fetchurl { @@ -6185,30 +4345,6 @@ sha512 = "MyTel3FXOdh1qhw1yKhpimQrAmur9q1X0ZigLmCOxouQD+BD3za9/89O+HfbgBQvvh4igEbp0/PUWO+VqGYG1g=="; }; } - { - 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"; - sha512 = "ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q=="; - }; - } - { - 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"; - sha512 = "9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="; - }; - } - { - name = "harmony_reflect___harmony_reflect_1.6.2.tgz"; - path = fetchurl { - name = "harmony_reflect___harmony_reflect_1.6.2.tgz"; - url = "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz"; - sha512 = "HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g=="; - }; - } { name = "has_bigints___has_bigints_1.0.2.tgz"; path = fetchurl { @@ -6257,14 +4393,6 @@ sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; }; } - { - 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 = "has___has_1.0.3.tgz"; path = fetchurl { @@ -6273,6 +4401,14 @@ sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; } + { + name = "hast_util_whitespace___hast_util_whitespace_2.0.0.tgz"; + path = fetchurl { + name = "hast_util_whitespace___hast_util_whitespace_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-2.0.0.tgz"; + sha512 = "Pkw+xBHuV6xFeJprJe2BBEoDV+AvQySaz3pPDRUs5PNZEMQjpXJJueqrpcHIXxnWTcAGi/UOCgVShlkY6kLoqg=="; + }; + } { name = "he___he_1.2.0.tgz"; path = fetchurl { @@ -6305,14 +4441,6 @@ sha512 = "njiJ+/hg1PhwGVwTtlm++6qQHVI6rWQtGSi/BA4gLkctt/rb7uYHnX8tkTq6EisXaWVeF5rXNInojH9047PPxw=="; }; } - { - name = "history___history_5.3.0.tgz"; - path = fetchurl { - name = "history___history_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz"; - sha512 = "ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ=="; - }; - } { name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; path = fetchurl { @@ -6321,14 +4449,6 @@ sha512 = "/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw=="; }; } - { - name = "hoopy___hoopy_0.1.4.tgz"; - path = fetchurl { - name = "hoopy___hoopy_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz"; - sha512 = "HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ=="; - }; - } { name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; path = fetchurl { @@ -6338,27 +4458,11 @@ }; } { - name = "hpack.js___hpack.js_2.1.6.tgz"; + name = "howlongtobeat___howlongtobeat_1.7.0.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"; - sha512 = "zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ=="; - }; - } - { - 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"; - sha512 = "D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ=="; - }; - } - { - name = "html_entities___html_entities_2.3.3.tgz"; - path = fetchurl { - name = "html_entities___html_entities_2.3.3.tgz"; - url = "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz"; - sha512 = "DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA=="; + name = "howlongtobeat___howlongtobeat_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/howlongtobeat/-/howlongtobeat-1.7.0.tgz"; + sha512 = "vISJpc8x0FRLnzbSzI3Lg8ReGu7h51FqyjGvaa+u8ZCIOPAt+m8e+ODHSll1SZE0MNYJKc1K1R0cp2r7zLBQtg=="; }; } { @@ -6369,14 +4473,6 @@ sha512 = "H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="; }; } - { - name = "html_minifier_terser___html_minifier_terser_6.1.0.tgz"; - path = fetchurl { - name = "html_minifier_terser___html_minifier_terser_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz"; - sha512 = "YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw=="; - }; - } { name = "html_parse_stringify___html_parse_stringify_3.0.1.tgz"; path = fetchurl { @@ -6385,22 +4481,6 @@ sha512 = "KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg=="; }; } - { - name = "html_webpack_plugin___html_webpack_plugin_5.5.0.tgz"; - path = fetchurl { - name = "html_webpack_plugin___html_webpack_plugin_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz"; - sha512 = "sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw=="; - }; - } - { - name = "htmlparser2___htmlparser2_6.1.0.tgz"; - path = fetchurl { - name = "htmlparser2___htmlparser2_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz"; - sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; - }; - } { name = "htmlparser2___htmlparser2_8.0.1.tgz"; path = fetchurl { @@ -6417,46 +4497,6 @@ sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; }; } - { - 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"; - sha512 = "LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="; - }; - } - { - name = "http_errors___http_errors_2.0.0.tgz"; - path = fetchurl { - name = "http_errors___http_errors_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz"; - sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; - }; - } - { - 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"; - sha512 = "lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A=="; - }; - } - { - name = "http_parser_js___http_parser_js_0.5.8.tgz"; - path = fetchurl { - name = "http_parser_js___http_parser_js_0.5.8.tgz"; - url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz"; - sha512 = "SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="; - }; - } - { - name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; - 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"; - sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; - }; - } { name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; path = fetchurl { @@ -6465,22 +4505,6 @@ sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; }; } - { - name = "http_proxy_middleware___http_proxy_middleware_2.0.6.tgz"; - path = fetchurl { - name = "http_proxy_middleware___http_proxy_middleware_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz"; - sha512 = "ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw=="; - }; - } - { - 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"; - sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; - }; - } { name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; path = fetchurl { @@ -6522,27 +4546,27 @@ }; } { - name = "i18next_http_backend___i18next_http_backend_1.4.1.tgz"; + name = "i18next_http_backend___i18next_http_backend_1.4.4.tgz"; path = fetchurl { - name = "i18next_http_backend___i18next_http_backend_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-1.4.1.tgz"; - sha512 = "s4Q9hK2jS29iyhniMP82z+yYY8riGTrWbnyvsSzi5TaF7Le4E7b5deTmtuaRuab9fdDcYXtcwdBgawZG+JCEjA=="; + name = "i18next_http_backend___i18next_http_backend_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-1.4.4.tgz"; + sha512 = "M4gLPe6JKZ2p1UmE6t4rzWV/sAxgrLThW7ztXAsTpFwFqXoyzhTzX8eYxVv9KjpCQh4K9nwxnEjEi+74C4Thbg=="; }; } { - name = "i18next_parser___i18next_parser_6.5.0.tgz"; + name = "i18next_parser___i18next_parser_6.6.0.tgz"; path = fetchurl { - name = "i18next_parser___i18next_parser_6.5.0.tgz"; - url = "https://registry.yarnpkg.com/i18next-parser/-/i18next-parser-6.5.0.tgz"; - sha512 = "sD+6QRn3pnZCLBdncOy2YZ1RTeGSJV1UxdCzgBJEllszkGfnlYCMkevQr99RK7ph4cQyjoXr2HgVqwM3dtYZiQ=="; + name = "i18next_parser___i18next_parser_6.6.0.tgz"; + url = "https://registry.yarnpkg.com/i18next-parser/-/i18next-parser-6.6.0.tgz"; + sha512 = "yA3W6PL+7epCyUFTpUDdztKArfpeGMWRUOnB/4FZRodfXkjCIBcBg728h6b/lrBTbva4OlFjVgv1kCXbvZVRWQ=="; }; } { - name = "i18next___i18next_21.9.0.tgz"; + name = "i18next___i18next_21.10.0.tgz"; path = fetchurl { - name = "i18next___i18next_21.9.0.tgz"; - url = "https://registry.yarnpkg.com/i18next/-/i18next-21.9.0.tgz"; - sha512 = "B+6/yd7rCpJidyPuBaEApUECx7G8Ai6+tqYhrChsY4MmQqJhG7qJ4eT6Lm1OnRhieVelEtfxh4aAQktdNVZtDA=="; + name = "i18next___i18next_21.10.0.tgz"; + url = "https://registry.yarnpkg.com/i18next/-/i18next-21.10.0.tgz"; + sha512 = "YeuIBmFsGjUfO3qBmMOc0rQaun4mIpGKET5WDwvu8lU7gvwpcariZLNtL0Fzj+zazcHUrlXHiptcFhBMFaxzfg=="; }; } { @@ -6553,14 +4577,6 @@ sha512 = "T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ=="; }; } - { - 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"; - sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; - }; - } { name = "iconv_lite___iconv_lite_0.6.3.tgz"; path = fetchurl { @@ -6569,30 +4585,6 @@ sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; }; } - { - 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"; - sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="; - }; - } - { - name = "idb___idb_7.0.2.tgz"; - path = fetchurl { - name = "idb___idb_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/idb/-/idb-7.0.2.tgz"; - sha512 = "jjKrT1EnyZewQ/gCBb/eyiYrhGzws2FeY92Yx8qT9S9GeQAmo4JFVIiWRIfKW/6Ob9A+UDAOW9j9jn58fy2HIg=="; - }; - } - { - name = "identity_obj_proxy___identity_obj_proxy_3.0.0.tgz"; - path = fetchurl { - name = "identity_obj_proxy___identity_obj_proxy_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz"; - sha512 = "00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA=="; - }; - } { name = "ieee754___ieee754_1.2.1.tgz"; path = fetchurl { @@ -6618,11 +4610,11 @@ }; } { - name = "immer___immer_9.0.15.tgz"; + name = "immutable___immutable_4.1.0.tgz"; path = fetchurl { - name = "immer___immer_9.0.15.tgz"; - url = "https://registry.yarnpkg.com/immer/-/immer-9.0.15.tgz"; - sha512 = "2eB/sswms9AEUSkOm4SbV5Y7Vmt/bKRwByd52jfLkW4OLYeaTP3EEiJ9agqU0O/tq6Dk62Zfj+TJSqfm1rLVGQ=="; + name = "immutable___immutable_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz"; + sha512 = "oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ=="; }; } { @@ -6633,14 +4625,6 @@ sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; }; } - { - 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"; - sha512 = "m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A=="; - }; - } { name = "import_local___import_local_3.1.0.tgz"; path = fetchurl { @@ -6681,22 +4665,6 @@ sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; } - { - 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"; - sha512 = "x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="; - }; - } - { - 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 { @@ -6706,11 +4674,19 @@ }; } { - name = "ini___ini_3.0.0.tgz"; + name = "ini___ini_3.0.1.tgz"; path = fetchurl { - name = "ini___ini_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-3.0.0.tgz"; - sha512 = "TxYQaeNW/N8ymDvwAxPyRbhMBtnEwuvaTYpOQkFx1nSeusgezHniEc/l35Vo4iCq/mMiTJbpD7oYxN98hFlfmw=="; + name = "ini___ini_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-3.0.1.tgz"; + sha512 = "it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ=="; + }; + } + { + name = "inline_style_parser___inline_style_parser_0.1.1.tgz"; + path = fetchurl { + name = "inline_style_parser___inline_style_parser_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz"; + sha512 = "7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q=="; }; } { @@ -6722,19 +4698,11 @@ }; } { - name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + name = "internmap___internmap_1.0.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"; - sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; - }; - } - { - name = "ipaddr.js___ipaddr.js_2.0.1.tgz"; - path = fetchurl { - name = "ipaddr.js___ipaddr.js_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz"; - sha512 = "1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng=="; + name = "internmap___internmap_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/internmap/-/internmap-1.0.1.tgz"; + sha512 = "lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw=="; }; } { @@ -6786,19 +4754,19 @@ }; } { - name = "is_callable___is_callable_1.2.4.tgz"; + name = "is_buffer___is_buffer_2.0.5.tgz"; path = fetchurl { - name = "is_callable___is_callable_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz"; - sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; + name = "is_buffer___is_buffer_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz"; + sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="; }; } { - name = "is_ci___is_ci_2.0.0.tgz"; + name = "is_callable___is_callable_1.2.7.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_callable___is_callable_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz"; + sha512 = "1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="; }; } { @@ -6825,14 +4793,6 @@ sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; }; } - { - name = "is_docker___is_docker_2.2.1.tgz"; - path = fetchurl { - name = "is_docker___is_docker_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz"; - sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; - }; - } { name = "is_extglob___is_extglob_2.1.1.tgz"; path = fetchurl { @@ -6873,22 +4833,6 @@ sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; }; } - { - 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_module___is_module_1.0.0.tgz"; - path = fetchurl { - name = "is_module___is_module_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz"; - sha512 = "51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g=="; - }; - } { name = "is_negated_glob___is_negated_glob_1.0.0.tgz"; path = fetchurl { @@ -6905,14 +4849,6 @@ sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; }; } - { - 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_number_object___is_number_object_1.0.7.tgz"; path = fetchurl { @@ -6929,14 +4865,6 @@ sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; } - { - name = "is_obj___is_obj_1.0.1.tgz"; - path = fetchurl { - name = "is_obj___is_obj_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz"; - sha512 = "l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg=="; - }; - } { name = "is_obj___is_obj_2.0.0.tgz"; path = fetchurl { @@ -6945,22 +4873,6 @@ 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_3.0.0.tgz"; - path = fetchurl { - name = "is_plain_obj___is_plain_obj_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz"; - sha512 = "gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="; - }; - } { name = "is_plain_obj___is_plain_obj_4.1.0.tgz"; path = fetchurl { @@ -6969,14 +4881,6 @@ sha512 = "+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg=="; }; } - { - name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; - 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"; - sha512 = "bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="; - }; - } { name = "is_regex___is_regex_1.1.4.tgz"; path = fetchurl { @@ -6985,14 +4889,6 @@ sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; }; } - { - name = "is_regexp___is_regexp_1.0.0.tgz"; - path = fetchurl { - name = "is_regexp___is_regexp_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz"; - sha512 = "7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA=="; - }; - } { name = "is_relative___is_relative_1.0.0.tgz"; path = fetchurl { @@ -7001,14 +4897,6 @@ sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; }; } - { - name = "is_root___is_root_2.1.0.tgz"; - path = fetchurl { - name = "is_root___is_root_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz"; - sha512 = "AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg=="; - }; - } { name = "is_shared_array_buffer___is_shared_array_buffer_1.0.2.tgz"; path = fetchurl { @@ -7041,14 +4929,6 @@ sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; } - { - 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"; - sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="; - }; - } { name = "is_unc_path___is_unc_path_1.0.0.tgz"; path = fetchurl { @@ -7089,22 +4969,6 @@ sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; }; } - { - 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"; - sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; - }; - } - { - 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 { @@ -7146,11 +5010,11 @@ }; } { - name = "istanbul_lib_instrument___istanbul_lib_instrument_5.2.0.tgz"; + name = "istanbul_lib_instrument___istanbul_lib_instrument_5.2.1.tgz"; path = fetchurl { - name = "istanbul_lib_instrument___istanbul_lib_instrument_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz"; - sha512 = "6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A=="; + name = "istanbul_lib_instrument___istanbul_lib_instrument_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz"; + sha512 = "pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg=="; }; } { @@ -7186,35 +5050,35 @@ }; } { - name = "jest_changed_files___jest_changed_files_27.5.1.tgz"; + name = "jest_changed_files___jest_changed_files_28.1.3.tgz"; path = fetchurl { - 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_changed_files___jest_changed_files_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-28.1.3.tgz"; + sha512 = "esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA=="; }; } { - name = "jest_circus___jest_circus_27.5.1.tgz"; + name = "jest_circus___jest_circus_28.1.3.tgz"; path = fetchurl { - 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_circus___jest_circus_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-28.1.3.tgz"; + sha512 = "cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow=="; }; } { - name = "jest_cli___jest_cli_27.5.1.tgz"; + name = "jest_cli___jest_cli_28.1.3.tgz"; path = fetchurl { - 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_cli___jest_cli_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-28.1.3.tgz"; + sha512 = "roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ=="; }; } { - name = "jest_config___jest_config_27.5.1.tgz"; + name = "jest_config___jest_config_28.1.3.tgz"; path = fetchurl { - 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_config___jest_config_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/jest-config/-/jest-config-28.1.3.tgz"; + sha512 = "MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ=="; }; } { @@ -7234,35 +5098,35 @@ }; } { - name = "jest_docblock___jest_docblock_27.5.1.tgz"; + name = "jest_diff___jest_diff_29.1.2.tgz"; path = fetchurl { - 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_diff___jest_diff_29.1.2.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.1.2.tgz"; + sha512 = "4GQts0aUopVvecIT4IwD/7xsBaMhKTYoM4/njE/aVw9wpw+pIUVp8Vab/KnSzSilr84GnLBkaP3JLDnQYCKqVQ=="; }; } { - name = "jest_each___jest_each_27.5.1.tgz"; + name = "jest_docblock___jest_docblock_28.1.1.tgz"; path = fetchurl { - 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_docblock___jest_docblock_28.1.1.tgz"; + url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-28.1.1.tgz"; + sha512 = "3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA=="; }; } { - name = "jest_environment_jsdom___jest_environment_jsdom_27.5.1.tgz"; + name = "jest_each___jest_each_28.1.3.tgz"; path = fetchurl { - 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_each___jest_each_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/jest-each/-/jest-each-28.1.3.tgz"; + sha512 = "arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g=="; }; } { - name = "jest_environment_node___jest_environment_node_27.5.1.tgz"; + name = "jest_environment_node___jest_environment_node_28.1.3.tgz"; path = fetchurl { - 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_environment_node___jest_environment_node_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-28.1.3.tgz"; + sha512 = "ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A=="; }; } { @@ -7282,27 +5146,27 @@ }; } { - name = "jest_haste_map___jest_haste_map_27.5.1.tgz"; + name = "jest_get_type___jest_get_type_29.0.0.tgz"; path = fetchurl { - 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_get_type___jest_get_type_29.0.0.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.0.0.tgz"; + sha512 = "83X19z/HuLKYXYHskZlBAShO7UfLFXu/vWajw9ZNJASN32li8yHMaVGAQqxFW1RCFOkB7cubaL6FaJVQqqJLSw=="; }; } { - name = "jest_jasmine2___jest_jasmine2_27.5.1.tgz"; + name = "jest_haste_map___jest_haste_map_28.1.3.tgz"; path = fetchurl { - 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_haste_map___jest_haste_map_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-28.1.3.tgz"; + sha512 = "3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA=="; }; } { - name = "jest_leak_detector___jest_leak_detector_27.5.1.tgz"; + name = "jest_leak_detector___jest_leak_detector_28.1.3.tgz"; path = fetchurl { - 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_leak_detector___jest_leak_detector_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz"; + sha512 = "WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA=="; }; } { @@ -7322,11 +5186,11 @@ }; } { - name = "jest_message_util___jest_message_util_27.5.1.tgz"; + name = "jest_matcher_utils___jest_matcher_utils_29.1.2.tgz"; path = fetchurl { - 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_matcher_utils___jest_matcher_utils_29.1.2.tgz"; + url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.1.2.tgz"; + sha512 = "MV5XrD3qYSW2zZSHRRceFzqJ39B2z11Qv0KPyZYxnzDHFeYZGJlgGi0SW+IXSJfOewgJp/Km/7lpcFT+cgZypw=="; }; } { @@ -7338,11 +5202,19 @@ }; } { - name = "jest_mock___jest_mock_27.5.1.tgz"; + name = "jest_message_util___jest_message_util_29.1.2.tgz"; path = fetchurl { - 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=="; + name = "jest_message_util___jest_message_util_29.1.2.tgz"; + url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.1.2.tgz"; + sha512 = "9oJ2Os+Qh6IlxLpmvshVbGUiSkZVc2FK+uGOm6tghafnB2RyjKAxMZhtxThRMxfX1J1SOMhTn9oK3/MutRWQJQ=="; + }; + } + { + name = "jest_mock___jest_mock_28.1.3.tgz"; + path = fetchurl { + name = "jest_mock___jest_mock_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-28.1.3.tgz"; + sha512 = "o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA=="; }; } { @@ -7353,14 +5225,6 @@ sha512 = "olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w=="; }; } - { - name = "jest_regex_util___jest_regex_util_27.5.1.tgz"; - path = fetchurl { - 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_regex_util___jest_regex_util_28.0.2.tgz"; path = fetchurl { @@ -7370,59 +5234,43 @@ }; } { - name = "jest_resolve_dependencies___jest_resolve_dependencies_27.5.1.tgz"; + name = "jest_resolve_dependencies___jest_resolve_dependencies_28.1.3.tgz"; path = fetchurl { - 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_dependencies___jest_resolve_dependencies_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz"; + sha512 = "qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA=="; }; } { - name = "jest_resolve___jest_resolve_27.5.1.tgz"; + name = "jest_resolve___jest_resolve_28.1.3.tgz"; path = fetchurl { - 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_resolve___jest_resolve_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-28.1.3.tgz"; + sha512 = "Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ=="; }; } { - name = "jest_runner___jest_runner_27.5.1.tgz"; + name = "jest_runner___jest_runner_28.1.3.tgz"; path = fetchurl { - 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_runner___jest_runner_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-28.1.3.tgz"; + sha512 = "GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA=="; }; } { - name = "jest_runtime___jest_runtime_27.5.1.tgz"; + name = "jest_runtime___jest_runtime_28.1.3.tgz"; path = fetchurl { - 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_runtime___jest_runtime_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-28.1.3.tgz"; + sha512 = "NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw=="; }; } { - name = "jest_serializer___jest_serializer_27.5.1.tgz"; + name = "jest_snapshot___jest_snapshot_28.1.3.tgz"; path = fetchurl { - 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.5.1.tgz"; - path = fetchurl { - 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.5.1.tgz"; - path = fetchurl { - 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_snapshot___jest_snapshot_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-28.1.3.tgz"; + sha512 = "4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg=="; }; } { @@ -7434,27 +5282,19 @@ }; } { - name = "jest_validate___jest_validate_27.5.1.tgz"; + name = "jest_util___jest_util_29.1.2.tgz"; path = fetchurl { - 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_util___jest_util_29.1.2.tgz"; + url = "https://registry.yarnpkg.com/jest-util/-/jest-util-29.1.2.tgz"; + sha512 = "vPCk9F353i0Ymx3WQq3+a4lZ07NXu9Ca8wya6o4Fe4/aO1e1awMMprZ3woPFpKwghEOW+UXgd15vVotuNN9ONQ=="; }; } { - name = "jest_watch_typeahead___jest_watch_typeahead_1.1.0.tgz"; + name = "jest_validate___jest_validate_28.1.3.tgz"; path = fetchurl { - name = "jest_watch_typeahead___jest_watch_typeahead_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz"; - sha512 = "Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw=="; - }; - } - { - name = "jest_watcher___jest_watcher_27.5.1.tgz"; - path = fetchurl { - 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_validate___jest_validate_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-28.1.3.tgz"; + sha512 = "SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA=="; }; } { @@ -7465,22 +5305,6 @@ sha512 = "t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g=="; }; } - { - 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"; - sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; - }; - } - { - name = "jest_worker___jest_worker_27.5.1.tgz"; - path = fetchurl { - 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_worker___jest_worker_28.1.3.tgz"; path = fetchurl { @@ -7490,11 +5314,19 @@ }; } { - name = "jest___jest_27.5.1.tgz"; + name = "jest___jest_28.1.3.tgz"; path = fetchurl { - name = "jest___jest_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz"; - sha512 = "Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ=="; + name = "jest___jest_28.1.3.tgz"; + url = "https://registry.yarnpkg.com/jest/-/jest-28.1.3.tgz"; + sha512 = "N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA=="; + }; + } + { + name = "js_sdsl___js_sdsl_4.1.5.tgz"; + path = fetchurl { + name = "js_sdsl___js_sdsl_4.1.5.tgz"; + url = "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.5.tgz"; + sha512 = "08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q=="; }; } { @@ -7521,14 +5353,6 @@ sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; }; } - { - name = "jsdom___jsdom_16.7.0.tgz"; - path = fetchurl { - 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=="; - }; - } { name = "jsesc___jsesc_2.5.2.tgz"; path = fetchurl { @@ -7537,14 +5361,6 @@ sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; } - { - 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"; - sha512 = "uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="; - }; - } { name = "json_buffer___json_buffer_3.0.0.tgz"; path = fetchurl { @@ -7585,14 +5401,6 @@ sha512 = "7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A=="; }; } - { - name = "json_schema___json_schema_0.4.0.tgz"; - path = fetchurl { - name = "json_schema___json_schema_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz"; - sha512 = "es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="; - }; - } { name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; path = fetchurl { @@ -7609,14 +5417,6 @@ sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; } - { - name = "json5___json5_2.2.1.tgz"; - path = fetchurl { - name = "json5___json5_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; - }; - } { name = "json5___json5_1.0.1.tgz"; path = fetchurl { @@ -7625,6 +5425,14 @@ sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; }; } + { + name = "json5___json5_2.2.1.tgz"; + path = fetchurl { + name = "json5___json5_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz"; + sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; + }; + } { name = "jsonfile___jsonfile_4.0.0.tgz"; path = fetchurl { @@ -7641,14 +5449,6 @@ sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; }; } - { - name = "jsonpointer___jsonpointer_5.0.1.tgz"; - path = fetchurl { - name = "jsonpointer___jsonpointer_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.1.tgz"; - sha512 = "p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ=="; - }; - } { name = "jsx_ast_utils___jsx_ast_utils_3.3.3.tgz"; path = fetchurl { @@ -7673,14 +5473,6 @@ sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; } - { - 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 = "kleur___kleur_3.0.3.tgz"; path = fetchurl { @@ -7690,35 +5482,11 @@ }; } { - name = "klona___klona_2.0.5.tgz"; + name = "kleur___kleur_4.1.5.tgz"; path = fetchurl { - name = "klona___klona_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz"; - sha512 = "pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ=="; - }; - } - { - name = "language_subtag_registry___language_subtag_registry_0.3.22.tgz"; - path = fetchurl { - name = "language_subtag_registry___language_subtag_registry_0.3.22.tgz"; - url = "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz"; - sha512 = "tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w=="; - }; - } - { - 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"; - sha512 = "qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ=="; - }; - } - { - 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 = "kleur___kleur_4.1.5.tgz"; + url = "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz"; + sha512 = "o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ=="; }; } { @@ -7761,14 +5529,6 @@ sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; } - { - 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"; - sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="; - }; - } { name = "lie___lie_3.3.0.tgz"; path = fetchurl { @@ -7777,14 +5537,6 @@ sha512 = "UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ=="; }; } - { - name = "lilconfig___lilconfig_2.0.6.tgz"; - path = fetchurl { - name = "lilconfig___lilconfig_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.6.tgz"; - sha512 = "9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg=="; - }; - } { name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; path = fetchurl { @@ -7793,38 +5545,6 @@ sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; }; } - { - name = "loader_runner___loader_runner_4.3.0.tgz"; - path = fetchurl { - name = "loader_runner___loader_runner_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz"; - sha512 = "3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="; - }; - } - { - name = "loader_utils___loader_utils_2.0.2.tgz"; - path = fetchurl { - name = "loader_utils___loader_utils_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz"; - sha512 = "TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A=="; - }; - } - { - name = "loader_utils___loader_utils_3.2.0.tgz"; - path = fetchurl { - name = "loader_utils___loader_utils_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.0.tgz"; - sha512 = "HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ=="; - }; - } - { - 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"; - sha512 = "NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA=="; - }; - } { name = "locate_path___locate_path_3.0.0.tgz"; path = fetchurl { @@ -7850,11 +5570,11 @@ }; } { - name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.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"; - sha512 = "FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="; + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha512 = "H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="; }; } { @@ -7889,22 +5609,6 @@ sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; } - { - 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"; - sha512 = "HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="; - }; - } - { - 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"; - sha512 = "xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="; - }; - } { name = "lodash___lodash_4.17.21.tgz"; path = fetchurl { @@ -7921,14 +5625,6 @@ sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; }; } - { - name = "lower_case___lower_case_2.0.2.tgz"; - path = fetchurl { - name = "lower_case___lower_case_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz"; - sha512 = "7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="; - }; - } { name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; path = fetchurl { @@ -7962,11 +5658,11 @@ }; } { - name = "magic_string___magic_string_0.25.9.tgz"; + name = "magic_string___magic_string_0.26.7.tgz"; path = fetchurl { - name = "magic_string___magic_string_0.25.9.tgz"; - url = "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz"; - sha512 = "RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="; + name = "magic_string___magic_string_0.26.7.tgz"; + url = "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.7.tgz"; + sha512 = "hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow=="; }; } { @@ -8010,43 +5706,35 @@ }; } { - name = "mdn_data___mdn_data_2.0.14.tgz"; + name = "mdast_util_definitions___mdast_util_definitions_5.1.1.tgz"; path = fetchurl { - name = "mdn_data___mdn_data_2.0.14.tgz"; - url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz"; - sha512 = "dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="; + name = "mdast_util_definitions___mdast_util_definitions_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-5.1.1.tgz"; + sha512 = "rQ+Gv7mHttxHOBx2dkF4HWTg+EE+UR78ptQWDylzPKaQuVGdG4HIoY3SrS/pCp80nZ04greFvXbVFHT+uf0JVQ=="; }; } { - name = "mdn_data___mdn_data_2.0.4.tgz"; + name = "mdast_util_from_markdown___mdast_util_from_markdown_1.2.0.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"; - sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="; + name = "mdast_util_from_markdown___mdast_util_from_markdown_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-1.2.0.tgz"; + sha512 = "iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q=="; }; } { - name = "media_typer___media_typer_0.3.0.tgz"; + name = "mdast_util_to_hast___mdast_util_to_hast_12.2.4.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"; - sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; + name = "mdast_util_to_hast___mdast_util_to_hast_12.2.4.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-12.2.4.tgz"; + sha512 = "a21xoxSef1l8VhHxS1Dnyioz6grrJkoaCUgGzMD/7dWHvboYX3VW53esRUfB5tgTyz4Yos1n25SPcj35dJqmAg=="; }; } { - name = "memfs___memfs_3.4.7.tgz"; + name = "mdast_util_to_string___mdast_util_to_string_3.1.0.tgz"; path = fetchurl { - name = "memfs___memfs_3.4.7.tgz"; - url = "https://registry.yarnpkg.com/memfs/-/memfs-3.4.7.tgz"; - sha512 = "ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw=="; - }; - } - { - 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"; - sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; + name = "mdast_util_to_string___mdast_util_to_string_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz"; + sha512 = "n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA=="; }; } { @@ -8066,11 +5754,171 @@ }; } { - name = "methods___methods_1.1.2.tgz"; + name = "micromark_core_commonmark___micromark_core_commonmark_1.0.6.tgz"; path = fetchurl { - name = "methods___methods_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz"; - sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="; + name = "micromark_core_commonmark___micromark_core_commonmark_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-1.0.6.tgz"; + sha512 = "K+PkJTxqjFfSNkfAhp4GB+cZPfQd6dxtTXnf+RjZOV7T4EEXnvgzOcnp+eSTmpGk9d1S9sL6/lqrgSNn/s0HZA=="; + }; + } + { + name = "micromark_factory_destination___micromark_factory_destination_1.0.0.tgz"; + path = fetchurl { + name = "micromark_factory_destination___micromark_factory_destination_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-1.0.0.tgz"; + sha512 = "eUBA7Rs1/xtTVun9TmV3gjfPz2wEwgK5R5xcbIM5ZYAtvGF6JkyaDsj0agx8urXnO31tEO6Ug83iVH3tdedLnw=="; + }; + } + { + name = "micromark_factory_label___micromark_factory_label_1.0.2.tgz"; + path = fetchurl { + name = "micromark_factory_label___micromark_factory_label_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-1.0.2.tgz"; + sha512 = "CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg=="; + }; + } + { + name = "micromark_factory_space___micromark_factory_space_1.0.0.tgz"; + path = fetchurl { + name = "micromark_factory_space___micromark_factory_space_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-1.0.0.tgz"; + sha512 = "qUmqs4kj9a5yBnk3JMLyjtWYN6Mzfcx8uJfi5XAveBniDevmZasdGBba5b4QsvRcAkmvGo5ACmSUmyGiKTLZew=="; + }; + } + { + name = "micromark_factory_title___micromark_factory_title_1.0.2.tgz"; + path = fetchurl { + name = "micromark_factory_title___micromark_factory_title_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-1.0.2.tgz"; + sha512 = "zily+Nr4yFqgMGRKLpTVsNl5L4PMu485fGFDOQJQBl2NFpjGte1e86zC0da93wf97jrc4+2G2GQudFMHn3IX+A=="; + }; + } + { + name = "micromark_factory_whitespace___micromark_factory_whitespace_1.0.0.tgz"; + path = fetchurl { + name = "micromark_factory_whitespace___micromark_factory_whitespace_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-1.0.0.tgz"; + sha512 = "Qx7uEyahU1lt1RnsECBiuEbfr9INjQTGa6Err+gF3g0Tx4YEviPbqqGKNv/NrBaE7dVHdn1bVZKM/n5I/Bak7A=="; + }; + } + { + name = "micromark_util_character___micromark_util_character_1.1.0.tgz"; + path = fetchurl { + name = "micromark_util_character___micromark_util_character_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-1.1.0.tgz"; + sha512 = "agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg=="; + }; + } + { + name = "micromark_util_chunked___micromark_util_chunked_1.0.0.tgz"; + path = fetchurl { + name = "micromark_util_chunked___micromark_util_chunked_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-1.0.0.tgz"; + sha512 = "5e8xTis5tEZKgesfbQMKRCyzvffRRUX+lK/y+DvsMFdabAicPkkZV6gO+FEWi9RfuKKoxxPwNL+dFF0SMImc1g=="; + }; + } + { + name = "micromark_util_classify_character___micromark_util_classify_character_1.0.0.tgz"; + path = fetchurl { + name = "micromark_util_classify_character___micromark_util_classify_character_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-1.0.0.tgz"; + sha512 = "F8oW2KKrQRb3vS5ud5HIqBVkCqQi224Nm55o5wYLzY/9PwHGXC01tr3d7+TqHHz6zrKQ72Okwtvm/xQm6OVNZA=="; + }; + } + { + name = "micromark_util_combine_extensions___micromark_util_combine_extensions_1.0.0.tgz"; + path = fetchurl { + name = "micromark_util_combine_extensions___micromark_util_combine_extensions_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.0.0.tgz"; + sha512 = "J8H058vFBdo/6+AsjHp2NF7AJ02SZtWaVUjsayNFeAiydTxUwViQPxN0Hf8dp4FmCQi0UUFovFsEyRSUmFH3MA=="; + }; + } + { + name = "micromark_util_decode_numeric_character_reference___micromark_util_decode_numeric_character_reference_1.0.0.tgz"; + path = fetchurl { + name = "micromark_util_decode_numeric_character_reference___micromark_util_decode_numeric_character_reference_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.0.0.tgz"; + sha512 = "OzO9AI5VUtrTD7KSdagf4MWgHMtET17Ua1fIpXTpuhclCqD8egFWo85GxSGvxgkGS74bEahvtM0WP0HjvV0e4w=="; + }; + } + { + name = "micromark_util_decode_string___micromark_util_decode_string_1.0.2.tgz"; + path = fetchurl { + name = "micromark_util_decode_string___micromark_util_decode_string_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-decode-string/-/micromark-util-decode-string-1.0.2.tgz"; + sha512 = "DLT5Ho02qr6QWVNYbRZ3RYOSSWWFuH3tJexd3dgN1odEuPNxCngTCXJum7+ViRAd9BbdxCvMToPOD/IvVhzG6Q=="; + }; + } + { + name = "micromark_util_encode___micromark_util_encode_1.0.1.tgz"; + path = fetchurl { + name = "micromark_util_encode___micromark_util_encode_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-1.0.1.tgz"; + sha512 = "U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA=="; + }; + } + { + name = "micromark_util_html_tag_name___micromark_util_html_tag_name_1.1.0.tgz"; + path = fetchurl { + name = "micromark_util_html_tag_name___micromark_util_html_tag_name_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.1.0.tgz"; + sha512 = "BKlClMmYROy9UiV03SwNmckkjn8QHVaWkqoAqzivabvdGcwNGMMMH/5szAnywmsTBUzDsU57/mFi0sp4BQO6dA=="; + }; + } + { + name = "micromark_util_normalize_identifier___micromark_util_normalize_identifier_1.0.0.tgz"; + path = fetchurl { + name = "micromark_util_normalize_identifier___micromark_util_normalize_identifier_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.0.0.tgz"; + sha512 = "yg+zrL14bBTFrQ7n35CmByWUTFsgst5JhA4gJYoty4Dqzj4Z4Fr/DHekSS5aLfH9bdlfnSvKAWsAgJhIbogyBg=="; + }; + } + { + name = "micromark_util_resolve_all___micromark_util_resolve_all_1.0.0.tgz"; + path = fetchurl { + name = "micromark_util_resolve_all___micromark_util_resolve_all_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-1.0.0.tgz"; + sha512 = "CB/AGk98u50k42kvgaMM94wzBqozSzDDaonKU7P7jwQIuH2RU0TeBqGYJz2WY1UdihhjweivStrJ2JdkdEmcfw=="; + }; + } + { + name = "micromark_util_sanitize_uri___micromark_util_sanitize_uri_1.1.0.tgz"; + path = fetchurl { + name = "micromark_util_sanitize_uri___micromark_util_sanitize_uri_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.1.0.tgz"; + sha512 = "RoxtuSCX6sUNtxhbmsEFQfWzs8VN7cTctmBPvYivo98xb/kDEoTCtJQX5wyzIYEmk/lvNFTat4hL8oW0KndFpg=="; + }; + } + { + name = "micromark_util_subtokenize___micromark_util_subtokenize_1.0.2.tgz"; + path = fetchurl { + name = "micromark_util_subtokenize___micromark_util_subtokenize_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-1.0.2.tgz"; + sha512 = "d90uqCnXp/cy4G881Ub4psE57Sf8YD0pim9QdjCRNjfas2M1u6Lbt+XZK9gnHL2XFhnozZiEdCa9CNfXSfQ6xA=="; + }; + } + { + name = "micromark_util_symbol___micromark_util_symbol_1.0.1.tgz"; + path = fetchurl { + name = "micromark_util_symbol___micromark_util_symbol_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-1.0.1.tgz"; + sha512 = "oKDEMK2u5qqAptasDAwWDXq0tG9AssVwAx3E9bBF3t/shRIGsWIRG+cGafs2p/SnDSOecnt6hZPCE2o6lHfFmQ=="; + }; + } + { + name = "micromark_util_types___micromark_util_types_1.0.2.tgz"; + path = fetchurl { + name = "micromark_util_types___micromark_util_types_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-1.0.2.tgz"; + sha512 = "DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w=="; + }; + } + { + name = "micromark___micromark_3.1.0.tgz"; + path = fetchurl { + name = "micromark___micromark_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/micromark/-/micromark-3.1.0.tgz"; + sha512 = "6Mj0yHLdUZjHnOPgr5xfWIMqMWS12zDN6iws9SLuSz76W8jTtAv24MN4/CL7gJrl5vtxGInkkqDv/JIoRsQOvA=="; }; } { @@ -8097,14 +5945,6 @@ sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; }; } - { - 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"; - sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; - }; - } { name = "mime___mime_2.6.0.tgz"; path = fetchurl { @@ -8145,22 +5985,6 @@ sha512 = "I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="; }; } - { - name = "mini_css_extract_plugin___mini_css_extract_plugin_2.6.1.tgz"; - path = fetchurl { - name = "mini_css_extract_plugin___mini_css_extract_plugin_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz"; - sha512 = "wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg=="; - }; - } - { - 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"; - sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; - }; - } { name = "minimatch___minimatch_3.0.4.tgz"; path = fetchurl { @@ -8186,11 +6010,11 @@ }; } { - name = "minimist___minimist_1.2.6.tgz"; + name = "minimist___minimist_1.2.7.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.6.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz"; - sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; + name = "minimist___minimist_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz"; + sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; }; } { @@ -8265,14 +6089,6 @@ sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; } - { - name = "multicast_dns___multicast_dns_7.2.5.tgz"; - path = fetchurl { - name = "multicast_dns___multicast_dns_7.2.5.tgz"; - url = "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz"; - sha512 = "2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg=="; - }; - } { name = "multimatch___multimatch_4.0.0.tgz"; path = fetchurl { @@ -8281,14 +6097,6 @@ sha512 = "lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ=="; }; } - { - name = "mustache___mustache_2.3.2.tgz"; - path = fetchurl { - name = "mustache___mustache_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz"; - sha512 = "KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ=="; - }; - } { name = "nanoid___nanoid_3.3.4.tgz"; path = fetchurl { @@ -8305,30 +6113,6 @@ sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; }; } - { - name = "negotiator___negotiator_0.6.3.tgz"; - path = fetchurl { - name = "negotiator___negotiator_0.6.3.tgz"; - url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz"; - sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; - }; - } - { - 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"; - sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; - }; - } - { - name = "no_case___no_case_3.0.4.tgz"; - path = fetchurl { - name = "no_case___no_case_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz"; - sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; - }; - } { name = "node_addon_api___node_addon_api_1.7.2.tgz"; path = fetchurl { @@ -8345,14 +6129,6 @@ sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; } - { - name = "node_forge___node_forge_1.3.1.tgz"; - path = fetchurl { - name = "node_forge___node_forge_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz"; - sha512 = "dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="; - }; - } { name = "node_int64___node_int64_0.4.0.tgz"; path = fetchurl { @@ -8385,14 +6161,6 @@ sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; } - { - 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"; - sha512 = "bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="; - }; - } { name = "normalize_url___normalize_url_4.5.1.tgz"; path = fetchurl { @@ -8401,14 +6169,6 @@ sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; }; } - { - name = "normalize_url___normalize_url_6.1.0.tgz"; - path = fetchurl { - name = "normalize_url___normalize_url_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz"; - sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; - }; - } { name = "now_and_later___now_and_later_2.0.1.tgz"; path = fetchurl { @@ -8433,14 +6193,6 @@ sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; }; } - { - 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"; - sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; - }; - } { name = "nth_check___nth_check_2.1.1.tgz"; path = fetchurl { @@ -8449,14 +6201,6 @@ sha512 = "lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="; }; } - { - name = "nwsapi___nwsapi_2.2.1.tgz"; - path = fetchurl { - name = "nwsapi___nwsapi_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.1.tgz"; - sha512 = "JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg=="; - }; - } { name = "object_assign___object_assign_4.1.1.tgz"; path = fetchurl { @@ -8465,14 +6209,6 @@ sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; }; } - { - name = "object_hash___object_hash_3.0.0.tgz"; - path = fetchurl { - name = "object_hash___object_hash_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz"; - sha512 = "RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="; - }; - } { name = "object_inspect___object_inspect_1.12.2.tgz"; path = fetchurl { @@ -8498,11 +6234,11 @@ }; } { - name = "object.assign___object.assign_4.1.3.tgz"; + name = "object.assign___object.assign_4.1.4.tgz"; path = fetchurl { - name = "object.assign___object.assign_4.1.3.tgz"; - url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.3.tgz"; - sha512 = "ZFJnX3zltyjcYJL0RoCJuzb+11zWGyaDbjgxZbdV7rFEcHQuYxrZqhow67aA7xpes6LhojyFDaBKAFfogQrikA=="; + name = "object.assign___object.assign_4.1.4.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz"; + sha512 = "1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="; }; } { @@ -8521,14 +6257,6 @@ sha512 = "CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw=="; }; } - { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.4.tgz"; - path = fetchurl { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz"; - sha512 = "sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ=="; - }; - } { name = "object.hasown___object.hasown_1.1.1.tgz"; path = fetchurl { @@ -8545,30 +6273,6 @@ sha512 = "QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg=="; }; } - { - 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"; - sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="; - }; - } - { - name = "on_finished___on_finished_2.4.1.tgz"; - path = fetchurl { - name = "on_finished___on_finished_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz"; - sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="; - }; - } - { - 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"; - sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; - }; - } { name = "once___once_1.4.0.tgz"; path = fetchurl { @@ -8585,22 +6289,6 @@ sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; } - { - name = "open___open_8.4.0.tgz"; - path = fetchurl { - name = "open___open_8.4.0.tgz"; - url = "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz"; - sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; - }; - } - { - 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"; - sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; - }; - } { name = "optionator___optionator_0.9.1.tgz"; path = fetchurl { @@ -8625,14 +6313,6 @@ sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; } - { - 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"; - sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; - }; - } { name = "p_limit___p_limit_2.3.0.tgz"; path = fetchurl { @@ -8649,14 +6329,6 @@ sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; }; } - { - 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"; - sha512 = "nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg=="; - }; - } { name = "p_locate___p_locate_3.0.0.tgz"; path = fetchurl { @@ -8681,22 +6353,6 @@ sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; }; } - { - name = "p_retry___p_retry_4.6.2.tgz"; - path = fetchurl { - name = "p_retry___p_retry_4.6.2.tgz"; - url = "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz"; - sha512 = "312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ=="; - }; - } - { - 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"; - sha512 = "U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww=="; - }; - } { name = "p_try___p_try_2.2.0.tgz"; path = fetchurl { @@ -8705,14 +6361,6 @@ sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; } - { - 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 = "pako___pako_1.0.11.tgz"; path = fetchurl { @@ -8721,14 +6369,6 @@ sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; }; } - { - name = "param_case___param_case_3.0.4.tgz"; - path = fetchurl { - name = "param_case___param_case_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz"; - sha512 = "RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A=="; - }; - } { name = "parent_module___parent_module_1.0.1.tgz"; path = fetchurl { @@ -8754,35 +6394,11 @@ }; } { - name = "parse5___parse5_6.0.1.tgz"; + name = "parse5___parse5_7.1.1.tgz"; path = fetchurl { - name = "parse5___parse5_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz"; - sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; - }; - } - { - name = "parse5___parse5_7.0.0.tgz"; - path = fetchurl { - name = "parse5___parse5_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-7.0.0.tgz"; - sha512 = "y/t8IXSPWTuRZqXc0ajH/UwDj4mnqLEbSttNbThcFhGrZuOyoyvNBO85PBp2jQa55wY9d07PBNjsK8ZP3K5U6g=="; - }; - } - { - 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"; - sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; - }; - } - { - name = "pascal_case___pascal_case_3.1.2.tgz"; - path = fetchurl { - name = "pascal_case___pascal_case_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz"; - sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g=="; + name = "parse5___parse5_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-7.1.1.tgz"; + sha512 = "kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg=="; }; } { @@ -8841,14 +6457,6 @@ sha512 = "1gJ0WpNIiYcQydgg3Ed8KzvIqTsDpNwq+cjBCssvBtuTWjEqY1AW+i+OepiEMqDCzyro9B2sLAe4RBPajMYFiA=="; }; } - { - 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"; - sha512 = "5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="; - }; - } { name = "path_type___path_type_4.0.0.tgz"; path = fetchurl { @@ -8865,22 +6473,6 @@ sha512 = "F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="; }; } - { - 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"; - sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; - }; - } - { - name = "picocolors___picocolors_0.2.1.tgz"; - path = fetchurl { - name = "picocolors___picocolors_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz"; - sha512 = "cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="; - }; - } { name = "picocolors___picocolors_1.0.0.tgz"; path = fetchurl { @@ -8897,14 +6489,6 @@ sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; } - { - 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"; - sha512 = "udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="; - }; - } { name = "pify___pify_3.0.0.tgz"; path = fetchurl { @@ -8946,579 +6530,19 @@ }; } { - name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_5.0.2.tgz"; + name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz"; path = fetchurl { - name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz"; - sha512 = "XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ=="; + 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"; + sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; }; } { - name = "postcss_browser_comments___postcss_browser_comments_4.0.0.tgz"; + name = "postcss___postcss_8.4.18.tgz"; path = fetchurl { - name = "postcss_browser_comments___postcss_browser_comments_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz"; - sha512 = "X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg=="; - }; - } - { - name = "postcss_calc___postcss_calc_8.2.4.tgz"; - path = fetchurl { - name = "postcss_calc___postcss_calc_8.2.4.tgz"; - url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz"; - sha512 = "SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q=="; - }; - } - { - name = "postcss_clamp___postcss_clamp_4.1.0.tgz"; - path = fetchurl { - name = "postcss_clamp___postcss_clamp_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-clamp/-/postcss-clamp-4.1.0.tgz"; - sha512 = "ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow=="; - }; - } - { - name = "postcss_color_functional_notation___postcss_color_functional_notation_4.2.4.tgz"; - path = fetchurl { - name = "postcss_color_functional_notation___postcss_color_functional_notation_4.2.4.tgz"; - url = "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz"; - sha512 = "2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg=="; - }; - } - { - name = "postcss_color_hex_alpha___postcss_color_hex_alpha_8.0.4.tgz"; - path = fetchurl { - name = "postcss_color_hex_alpha___postcss_color_hex_alpha_8.0.4.tgz"; - url = "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz"; - sha512 = "nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ=="; - }; - } - { - name = "postcss_color_rebeccapurple___postcss_color_rebeccapurple_7.1.1.tgz"; - path = fetchurl { - name = "postcss_color_rebeccapurple___postcss_color_rebeccapurple_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz"; - sha512 = "pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg=="; - }; - } - { - name = "postcss_colormin___postcss_colormin_5.3.0.tgz"; - path = fetchurl { - name = "postcss_colormin___postcss_colormin_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.0.tgz"; - sha512 = "WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg=="; - }; - } - { - name = "postcss_convert_values___postcss_convert_values_5.1.2.tgz"; - path = fetchurl { - name = "postcss_convert_values___postcss_convert_values_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.2.tgz"; - sha512 = "c6Hzc4GAv95B7suy4udszX9Zy4ETyMCgFPUDtWjdFTKH1SE9eFY/jEpHSwTH1QPuwxHpWslhckUQWbNRM4ho5g=="; - }; - } - { - name = "postcss_custom_media___postcss_custom_media_8.0.2.tgz"; - path = fetchurl { - name = "postcss_custom_media___postcss_custom_media_8.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz"; - sha512 = "7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg=="; - }; - } - { - name = "postcss_custom_properties___postcss_custom_properties_12.1.8.tgz"; - path = fetchurl { - name = "postcss_custom_properties___postcss_custom_properties_12.1.8.tgz"; - url = "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-12.1.8.tgz"; - sha512 = "8rbj8kVu00RQh2fQF81oBqtduiANu4MIxhyf0HbbStgPtnFlWn0yiaYTpLHrPnJbffVY1s9apWsIoVZcc68FxA=="; - }; - } - { - name = "postcss_custom_selectors___postcss_custom_selectors_6.0.3.tgz"; - path = fetchurl { - name = "postcss_custom_selectors___postcss_custom_selectors_6.0.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz"; - sha512 = "fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg=="; - }; - } - { - name = "postcss_dir_pseudo_class___postcss_dir_pseudo_class_6.0.5.tgz"; - path = fetchurl { - name = "postcss_dir_pseudo_class___postcss_dir_pseudo_class_6.0.5.tgz"; - url = "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz"; - sha512 = "eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA=="; - }; - } - { - name = "postcss_discard_comments___postcss_discard_comments_5.1.2.tgz"; - path = fetchurl { - name = "postcss_discard_comments___postcss_discard_comments_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz"; - sha512 = "+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ=="; - }; - } - { - name = "postcss_discard_duplicates___postcss_discard_duplicates_5.1.0.tgz"; - path = fetchurl { - name = "postcss_discard_duplicates___postcss_discard_duplicates_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz"; - sha512 = "zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw=="; - }; - } - { - name = "postcss_discard_empty___postcss_discard_empty_5.1.1.tgz"; - path = fetchurl { - name = "postcss_discard_empty___postcss_discard_empty_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz"; - sha512 = "zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A=="; - }; - } - { - name = "postcss_discard_overridden___postcss_discard_overridden_5.1.0.tgz"; - path = fetchurl { - name = "postcss_discard_overridden___postcss_discard_overridden_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz"; - sha512 = "21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw=="; - }; - } - { - name = "postcss_double_position_gradients___postcss_double_position_gradients_3.1.2.tgz"; - path = fetchurl { - name = "postcss_double_position_gradients___postcss_double_position_gradients_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz"; - sha512 = "GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ=="; - }; - } - { - name = "postcss_env_function___postcss_env_function_4.0.6.tgz"; - path = fetchurl { - name = "postcss_env_function___postcss_env_function_4.0.6.tgz"; - url = "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-4.0.6.tgz"; - sha512 = "kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA=="; - }; - } - { - name = "postcss_flexbugs_fixes___postcss_flexbugs_fixes_5.0.2.tgz"; - path = fetchurl { - name = "postcss_flexbugs_fixes___postcss_flexbugs_fixes_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz"; - sha512 = "18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ=="; - }; - } - { - name = "postcss_focus_visible___postcss_focus_visible_6.0.4.tgz"; - path = fetchurl { - name = "postcss_focus_visible___postcss_focus_visible_6.0.4.tgz"; - url = "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz"; - sha512 = "QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw=="; - }; - } - { - name = "postcss_focus_within___postcss_focus_within_5.0.4.tgz"; - path = fetchurl { - name = "postcss_focus_within___postcss_focus_within_5.0.4.tgz"; - url = "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz"; - sha512 = "vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ=="; - }; - } - { - name = "postcss_font_variant___postcss_font_variant_5.0.0.tgz"; - path = fetchurl { - name = "postcss_font_variant___postcss_font_variant_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz"; - sha512 = "1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA=="; - }; - } - { - name = "postcss_gap_properties___postcss_gap_properties_3.0.5.tgz"; - path = fetchurl { - name = "postcss_gap_properties___postcss_gap_properties_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz"; - sha512 = "IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg=="; - }; - } - { - name = "postcss_image_set_function___postcss_image_set_function_4.0.7.tgz"; - path = fetchurl { - name = "postcss_image_set_function___postcss_image_set_function_4.0.7.tgz"; - url = "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz"; - sha512 = "9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw=="; - }; - } - { - name = "postcss_import___postcss_import_14.1.0.tgz"; - path = fetchurl { - name = "postcss_import___postcss_import_14.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.1.0.tgz"; - sha512 = "flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw=="; - }; - } - { - name = "postcss_initial___postcss_initial_4.0.1.tgz"; - path = fetchurl { - name = "postcss_initial___postcss_initial_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-4.0.1.tgz"; - sha512 = "0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ=="; - }; - } - { - name = "postcss_js___postcss_js_4.0.0.tgz"; - path = fetchurl { - name = "postcss_js___postcss_js_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.0.tgz"; - sha512 = "77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ=="; - }; - } - { - name = "postcss_lab_function___postcss_lab_function_4.2.1.tgz"; - path = fetchurl { - name = "postcss_lab_function___postcss_lab_function_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz"; - sha512 = "xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w=="; - }; - } - { - name = "postcss_load_config___postcss_load_config_3.1.4.tgz"; - path = fetchurl { - name = "postcss_load_config___postcss_load_config_3.1.4.tgz"; - url = "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz"; - sha512 = "6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg=="; - }; - } - { - name = "postcss_loader___postcss_loader_6.2.1.tgz"; - path = fetchurl { - name = "postcss_loader___postcss_loader_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.1.tgz"; - sha512 = "WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q=="; - }; - } - { - name = "postcss_logical___postcss_logical_5.0.4.tgz"; - path = fetchurl { - name = "postcss_logical___postcss_logical_5.0.4.tgz"; - url = "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-5.0.4.tgz"; - sha512 = "RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g=="; - }; - } - { - name = "postcss_media_minmax___postcss_media_minmax_5.0.0.tgz"; - path = fetchurl { - name = "postcss_media_minmax___postcss_media_minmax_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz"; - sha512 = "yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ=="; - }; - } - { - name = "postcss_merge_longhand___postcss_merge_longhand_5.1.6.tgz"; - path = fetchurl { - name = "postcss_merge_longhand___postcss_merge_longhand_5.1.6.tgz"; - url = "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.6.tgz"; - sha512 = "6C/UGF/3T5OE2CEbOuX7iNO63dnvqhGZeUnKkDeifebY0XqkkvrctYSZurpNE902LDf2yKwwPFgotnfSoPhQiw=="; - }; - } - { - name = "postcss_merge_rules___postcss_merge_rules_5.1.2.tgz"; - path = fetchurl { - name = "postcss_merge_rules___postcss_merge_rules_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.2.tgz"; - sha512 = "zKMUlnw+zYCWoPN6yhPjtcEdlJaMUZ0WyVcxTAmw3lkkN/NDMRkOkiuctQEoWAOvH7twaxUUdvBWl0d4+hifRQ=="; - }; - } - { - name = "postcss_minify_font_values___postcss_minify_font_values_5.1.0.tgz"; - path = fetchurl { - name = "postcss_minify_font_values___postcss_minify_font_values_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz"; - sha512 = "el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA=="; - }; - } - { - name = "postcss_minify_gradients___postcss_minify_gradients_5.1.1.tgz"; - path = fetchurl { - name = "postcss_minify_gradients___postcss_minify_gradients_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz"; - sha512 = "VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw=="; - }; - } - { - name = "postcss_minify_params___postcss_minify_params_5.1.3.tgz"; - path = fetchurl { - name = "postcss_minify_params___postcss_minify_params_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.3.tgz"; - sha512 = "bkzpWcjykkqIujNL+EVEPOlLYi/eZ050oImVtHU7b4lFS82jPnsCb44gvC6pxaNt38Els3jWYDHTjHKf0koTgg=="; - }; - } - { - name = "postcss_minify_selectors___postcss_minify_selectors_5.2.1.tgz"; - path = fetchurl { - name = "postcss_minify_selectors___postcss_minify_selectors_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz"; - sha512 = "nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg=="; - }; - } - { - 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"; - sha512 = "bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw=="; - }; - } - { - 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"; - sha512 = "sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ=="; - }; - } - { - 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"; - sha512 = "hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg=="; - }; - } - { - 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"; - sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ=="; - }; - } - { - name = "postcss_nested___postcss_nested_5.0.6.tgz"; - path = fetchurl { - name = "postcss_nested___postcss_nested_5.0.6.tgz"; - url = "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-5.0.6.tgz"; - sha512 = "rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA=="; - }; - } - { - name = "postcss_nesting___postcss_nesting_10.1.10.tgz"; - path = fetchurl { - name = "postcss_nesting___postcss_nesting_10.1.10.tgz"; - url = "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.1.10.tgz"; - sha512 = "lqd7LXCq0gWc0wKXtoKDru5wEUNjm3OryLVNRZ8OnW8km6fSNUuFrjEhU3nklxXE2jvd4qrox566acgh+xQt8w=="; - }; - } - { - name = "postcss_normalize_charset___postcss_normalize_charset_5.1.0.tgz"; - path = fetchurl { - name = "postcss_normalize_charset___postcss_normalize_charset_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz"; - sha512 = "mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg=="; - }; - } - { - name = "postcss_normalize_display_values___postcss_normalize_display_values_5.1.0.tgz"; - path = fetchurl { - name = "postcss_normalize_display_values___postcss_normalize_display_values_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz"; - sha512 = "WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA=="; - }; - } - { - name = "postcss_normalize_positions___postcss_normalize_positions_5.1.1.tgz"; - path = fetchurl { - name = "postcss_normalize_positions___postcss_normalize_positions_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz"; - sha512 = "6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg=="; - }; - } - { - name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_5.1.1.tgz"; - path = fetchurl { - name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz"; - sha512 = "mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g=="; - }; - } - { - name = "postcss_normalize_string___postcss_normalize_string_5.1.0.tgz"; - path = fetchurl { - name = "postcss_normalize_string___postcss_normalize_string_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz"; - sha512 = "oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w=="; - }; - } - { - name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_5.1.0.tgz"; - path = fetchurl { - name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz"; - sha512 = "DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg=="; - }; - } - { - name = "postcss_normalize_unicode___postcss_normalize_unicode_5.1.0.tgz"; - path = fetchurl { - name = "postcss_normalize_unicode___postcss_normalize_unicode_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz"; - sha512 = "J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ=="; - }; - } - { - name = "postcss_normalize_url___postcss_normalize_url_5.1.0.tgz"; - path = fetchurl { - name = "postcss_normalize_url___postcss_normalize_url_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz"; - sha512 = "5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew=="; - }; - } - { - name = "postcss_normalize_whitespace___postcss_normalize_whitespace_5.1.1.tgz"; - path = fetchurl { - name = "postcss_normalize_whitespace___postcss_normalize_whitespace_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz"; - sha512 = "83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA=="; - }; - } - { - name = "postcss_normalize___postcss_normalize_10.0.1.tgz"; - path = fetchurl { - name = "postcss_normalize___postcss_normalize_10.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize/-/postcss-normalize-10.0.1.tgz"; - sha512 = "+5w18/rDev5mqERcG3W5GZNMJa1eoYYNGo8gB7tEwaos0ajk3ZXAI4mHGcNT47NE+ZnZD1pEpUOFLvltIwmeJA=="; - }; - } - { - name = "postcss_opacity_percentage___postcss_opacity_percentage_1.1.2.tgz"; - path = fetchurl { - name = "postcss_opacity_percentage___postcss_opacity_percentage_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.2.tgz"; - sha512 = "lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w=="; - }; - } - { - name = "postcss_ordered_values___postcss_ordered_values_5.1.3.tgz"; - path = fetchurl { - name = "postcss_ordered_values___postcss_ordered_values_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz"; - sha512 = "9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ=="; - }; - } - { - name = "postcss_overflow_shorthand___postcss_overflow_shorthand_3.0.4.tgz"; - path = fetchurl { - name = "postcss_overflow_shorthand___postcss_overflow_shorthand_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz"; - sha512 = "otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A=="; - }; - } - { - name = "postcss_page_break___postcss_page_break_3.0.4.tgz"; - path = fetchurl { - name = "postcss_page_break___postcss_page_break_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-3.0.4.tgz"; - sha512 = "1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ=="; - }; - } - { - name = "postcss_place___postcss_place_7.0.5.tgz"; - path = fetchurl { - name = "postcss_place___postcss_place_7.0.5.tgz"; - url = "https://registry.yarnpkg.com/postcss-place/-/postcss-place-7.0.5.tgz"; - sha512 = "wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g=="; - }; - } - { - name = "postcss_preset_env___postcss_preset_env_7.7.2.tgz"; - path = fetchurl { - name = "postcss_preset_env___postcss_preset_env_7.7.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-7.7.2.tgz"; - sha512 = "1q0ih7EDsZmCb/FMDRvosna7Gsbdx8CvYO5hYT120hcp2ZAuOHpSzibujZ4JpIUcAC02PG6b+eftxqjTFh5BNA=="; - }; - } - { - name = "postcss_pseudo_class_any_link___postcss_pseudo_class_any_link_7.1.6.tgz"; - path = fetchurl { - name = "postcss_pseudo_class_any_link___postcss_pseudo_class_any_link_7.1.6.tgz"; - url = "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz"; - sha512 = "9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w=="; - }; - } - { - name = "postcss_reduce_initial___postcss_reduce_initial_5.1.0.tgz"; - path = fetchurl { - name = "postcss_reduce_initial___postcss_reduce_initial_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz"; - sha512 = "5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw=="; - }; - } - { - name = "postcss_reduce_transforms___postcss_reduce_transforms_5.1.0.tgz"; - path = fetchurl { - name = "postcss_reduce_transforms___postcss_reduce_transforms_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz"; - sha512 = "2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ=="; - }; - } - { - name = "postcss_replace_overflow_wrap___postcss_replace_overflow_wrap_4.0.0.tgz"; - path = fetchurl { - name = "postcss_replace_overflow_wrap___postcss_replace_overflow_wrap_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz"; - sha512 = "KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw=="; - }; - } - { - name = "postcss_selector_not___postcss_selector_not_6.0.1.tgz"; - path = fetchurl { - name = "postcss_selector_not___postcss_selector_not_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz"; - sha512 = "1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ=="; - }; - } - { - name = "postcss_selector_parser___postcss_selector_parser_6.0.10.tgz"; - path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_6.0.10.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz"; - sha512 = "IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w=="; - }; - } - { - name = "postcss_svgo___postcss_svgo_5.1.0.tgz"; - path = fetchurl { - name = "postcss_svgo___postcss_svgo_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz"; - sha512 = "D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA=="; - }; - } - { - name = "postcss_unique_selectors___postcss_unique_selectors_5.1.1.tgz"; - path = fetchurl { - name = "postcss_unique_selectors___postcss_unique_selectors_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz"; - sha512 = "5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA=="; - }; - } - { - 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_7.0.39.tgz"; - path = fetchurl { - name = "postcss___postcss_7.0.39.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz"; - sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; - }; - } - { - name = "postcss___postcss_8.4.16.tgz"; - path = fetchurl { - name = "postcss___postcss_8.4.16.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz"; - sha512 = "ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ=="; + name = "postcss___postcss_8.4.18.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.4.18.tgz"; + sha512 = "Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA=="; }; } { @@ -9529,14 +6553,6 @@ sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; } - { - 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"; - sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; - }; - } { name = "prepend_http___prepend_http_2.0.0.tgz"; path = fetchurl { @@ -9553,22 +6569,6 @@ sha512 = "ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g=="; }; } - { - name = "pretty_bytes___pretty_bytes_5.6.0.tgz"; - path = fetchurl { - name = "pretty_bytes___pretty_bytes_5.6.0.tgz"; - url = "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz"; - sha512 = "FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg=="; - }; - } - { - name = "pretty_error___pretty_error_4.0.0.tgz"; - path = fetchurl { - name = "pretty_error___pretty_error_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz"; - sha512 = "AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw=="; - }; - } { name = "pretty_format___pretty_format_26.6.2.tgz"; path = fetchurl { @@ -9593,6 +6593,14 @@ sha512 = "8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q=="; }; } + { + name = "pretty_format___pretty_format_29.1.2.tgz"; + path = fetchurl { + name = "pretty_format___pretty_format_29.1.2.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.1.2.tgz"; + sha512 = "CGJ6VVGXVRP2o2Dorl4mAwwvDWT25luIsYhkyVQW32E4nL+TgW939J7LlKT/npq5Cpq6j3s+sy+13yk7xYpBmg=="; + }; + } { name = "pretty_quick___pretty_quick_3.1.3.tgz"; path = fetchurl { @@ -9625,14 +6633,6 @@ sha512 = "3npG2NGhTc8BWBolLLf8l/92OxMGaRLbqvIh9wjCHhDXNvk4zsxaTaCpiCunW09qWPrN2zeNSNwRLVBrQQtutA=="; }; } - { - name = "promise___promise_8.1.0.tgz"; - path = fetchurl { - name = "promise___promise_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz"; - sha512 = "W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q=="; - }; - } { name = "prompts___prompts_2.4.2.tgz"; path = fetchurl { @@ -9649,6 +6649,14 @@ sha512 = "oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg=="; }; } + { + name = "property_information___property_information_6.2.0.tgz"; + path = fetchurl { + name = "property_information___property_information_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/property-information/-/property-information-6.2.0.tgz"; + sha512 = "kma4U7AFCTwpqq5twzC1YVIDXSqg6qQK6JN0smOw8fgRy1OkMi0CYSzFmsy6dnqSenamAtj0CyXMUJ1Mf6oROg=="; + }; + } { name = "proto_list___proto_list_1.2.4.tgz"; path = fetchurl { @@ -9657,22 +6665,6 @@ sha512 = "vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="; }; } - { - name = "proxy_addr___proxy_addr_2.0.7.tgz"; - path = fetchurl { - name = "proxy_addr___proxy_addr_2.0.7.tgz"; - url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz"; - sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; - }; - } - { - name = "psl___psl_1.9.0.tgz"; - path = fetchurl { - name = "psl___psl_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz"; - sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; - }; - } { name = "pump___pump_2.0.1.tgz"; path = fetchurl { @@ -9705,30 +6697,6 @@ 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 = "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"; - sha512 = "kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="; - }; - } - { - name = "qs___qs_6.10.3.tgz"; - path = fetchurl { - name = "qs___qs_6.10.3.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz"; - sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ=="; - }; - } { name = "queue_microtask___queue_microtask_1.2.3.tgz"; path = fetchurl { @@ -9738,11 +6706,11 @@ }; } { - name = "quick_lru___quick_lru_5.1.1.tgz"; + name = "queue_tick___queue_tick_1.0.1.tgz"; path = fetchurl { - name = "quick_lru___quick_lru_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz"; - sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; + name = "queue_tick___queue_tick_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/queue-tick/-/queue-tick-1.0.1.tgz"; + sha512 = "kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="; }; } { @@ -9754,83 +6722,19 @@ }; } { - name = "raf___raf_3.4.1.tgz"; + name = "react_dom___react_dom_18.2.0.tgz"; path = fetchurl { - name = "raf___raf_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz"; - sha512 = "Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA=="; + name = "react_dom___react_dom_18.2.0.tgz"; + url = "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz"; + sha512 = "6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g=="; }; } { - name = "randombytes___randombytes_2.1.0.tgz"; + name = "react_i18next___react_i18next_11.18.6.tgz"; path = fetchurl { - name = "randombytes___randombytes_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz"; - sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; - }; - } - { - 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"; - sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; - }; - } - { - name = "raw_body___raw_body_2.5.1.tgz"; - path = fetchurl { - name = "raw_body___raw_body_2.5.1.tgz"; - url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz"; - sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; - }; - } - { - 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 = "react_app_polyfill___react_app_polyfill_3.0.0.tgz"; - path = fetchurl { - name = "react_app_polyfill___react_app_polyfill_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-3.0.0.tgz"; - sha512 = "sZ41cxiU5llIB003yxxQBYrARBqe0repqPTTYBTmMqTz9szeBbE37BehCE891NZsmdZqqP+xWKdT3eo3vOzN8w=="; - }; - } - { - name = "react_dev_utils___react_dev_utils_12.0.1.tgz"; - path = fetchurl { - name = "react_dev_utils___react_dev_utils_12.0.1.tgz"; - url = "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.1.tgz"; - sha512 = "84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ=="; - }; - } - { - name = "react_dom___react_dom_17.0.2.tgz"; - path = fetchurl { - name = "react_dom___react_dom_17.0.2.tgz"; - url = "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz"; - sha512 = "s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA=="; - }; - } - { - name = "react_error_overlay___react_error_overlay_6.0.11.tgz"; - path = fetchurl { - name = "react_error_overlay___react_error_overlay_6.0.11.tgz"; - url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz"; - sha512 = "/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="; - }; - } - { - name = "react_i18next___react_i18next_11.18.3.tgz"; - path = fetchurl { - name = "react_i18next___react_i18next_11.18.3.tgz"; - url = "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.3.tgz"; - sha512 = "EttTX31HbqzZymUM3SIrMPuvamfSXFZVsDHm/ZAqoDfTLjhzlwyxqfbDNxcKNAGOi2mjZaXfR7hSNMlvLNpB/g=="; + name = "react_i18next___react_i18next_11.18.6.tgz"; + url = "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.6.tgz"; + sha512 = "yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA=="; }; } { @@ -9858,35 +6762,67 @@ }; } { - name = "react_refresh___react_refresh_0.11.0.tgz"; + name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz"; path = fetchurl { - name = "react_refresh___react_refresh_0.11.0.tgz"; - url = "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz"; - sha512 = "F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A=="; + 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"; + sha512 = "fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="; }; } { - name = "react_router_dom___react_router_dom_6.3.0.tgz"; + name = "react_markdown___react_markdown_8.0.3.tgz"; path = fetchurl { - name = "react_router_dom___react_router_dom_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz"; - sha512 = "uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw=="; + name = "react_markdown___react_markdown_8.0.3.tgz"; + url = "https://registry.yarnpkg.com/react-markdown/-/react-markdown-8.0.3.tgz"; + sha512 = "We36SfqaKoVNpN1QqsZwWSv/OZt5J15LNgTLWynwAN5b265hrQrsjMtlRNwUvS+YyR3yDM8HpTNc4pK9H/Gc0A=="; }; } { - name = "react_router___react_router_6.3.0.tgz"; + name = "react_refresh___react_refresh_0.14.0.tgz"; path = fetchurl { - name = "react_router___react_router_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz"; - sha512 = "7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ=="; + name = "react_refresh___react_refresh_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz"; + sha512 = "wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ=="; }; } { - name = "react_scripts___react_scripts_5.0.1.tgz"; + name = "react_resize_detector___react_resize_detector_7.1.2.tgz"; path = fetchurl { - name = "react_scripts___react_scripts_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-5.0.1.tgz"; - sha512 = "8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ=="; + name = "react_resize_detector___react_resize_detector_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-7.1.2.tgz"; + sha512 = "zXnPJ2m8+6oq9Nn8zsep/orts9vQv3elrpA+R8XTcW7DVVUJ9vwDwMXaBtykAYjMnkCIaOoK9vObyR7ZgFNlOw=="; + }; + } + { + name = "react_router_dom___react_router_dom_6.4.2.tgz"; + path = fetchurl { + name = "react_router_dom___react_router_dom_6.4.2.tgz"; + url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.4.2.tgz"; + sha512 = "yM1kjoTkpfjgczPrcyWrp+OuQMyB1WleICiiGfstnQYo/S8hPEEnVjr/RdmlH6yKK4Tnj1UGXFSa7uwAtmDoLQ=="; + }; + } + { + name = "react_router___react_router_6.4.2.tgz"; + path = fetchurl { + name = "react_router___react_router_6.4.2.tgz"; + url = "https://registry.yarnpkg.com/react-router/-/react-router-6.4.2.tgz"; + sha512 = "Rb0BAX9KHhVzT1OKhMvCDMw776aTYM0DtkxqUBP8dNBom3mPXlfNs76JNGK8wKJ1IZEY1+WGj+cvZxHVk/GiKw=="; + }; + } + { + name = "react_smooth___react_smooth_2.0.1.tgz"; + path = fetchurl { + name = "react_smooth___react_smooth_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/react-smooth/-/react-smooth-2.0.1.tgz"; + sha512 = "Own9TA0GPPf3as4vSwFhDouVfXP15ie/wIHklhyKBH5AN6NFtdk0UpHBnonV11BtqDkAWlt40MOUc+5srmW7NA=="; + }; + } + { + 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"; + sha512 = "+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg=="; }; } { @@ -9898,19 +6834,11 @@ }; } { - name = "react___react_17.0.2.tgz"; + name = "react___react_18.2.0.tgz"; path = fetchurl { - name = "react___react_17.0.2.tgz"; - url = "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz"; - sha512 = "gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA=="; - }; - } - { - name = "read_cache___read_cache_1.0.0.tgz"; - path = fetchurl { - name = "read_cache___read_cache_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz"; - sha512 = "Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA=="; + name = "react___react_18.2.0.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz"; + sha512 = "/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ=="; }; } { @@ -9946,11 +6874,19 @@ }; } { - name = "recursive_readdir___recursive_readdir_2.2.2.tgz"; + name = "recharts_scale___recharts_scale_0.4.5.tgz"; path = fetchurl { - name = "recursive_readdir___recursive_readdir_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; - sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; + name = "recharts_scale___recharts_scale_0.4.5.tgz"; + url = "https://registry.yarnpkg.com/recharts-scale/-/recharts-scale-0.4.5.tgz"; + sha512 = "kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w=="; + }; + } + { + name = "recharts___recharts_2.1.15.tgz"; + path = fetchurl { + name = "recharts___recharts_2.1.15.tgz"; + url = "https://registry.yarnpkg.com/recharts/-/recharts-2.1.15.tgz"; + sha512 = "16VMAvrsdqkEe7sT9uyJ1F+OZzrC6+5eW+pVSU04SVO6O5Nr5lY78h/uKMjsZJTN0nfOfgV7YfHZcivtqgPU9g=="; }; } { @@ -9962,43 +6898,19 @@ }; } { - name = "regenerate_unicode_properties___regenerate_unicode_properties_10.0.1.tgz"; + name = "reduce_css_calc___reduce_css_calc_2.1.8.tgz"; path = fetchurl { - name = "regenerate_unicode_properties___regenerate_unicode_properties_10.0.1.tgz"; - url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz"; - sha512 = "vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw=="; + name = "reduce_css_calc___reduce_css_calc_2.1.8.tgz"; + url = "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz"; + sha512 = "8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg=="; }; } { - name = "regenerate___regenerate_1.4.2.tgz"; + name = "regenerator_runtime___regenerator_runtime_0.13.10.tgz"; path = fetchurl { - name = "regenerate___regenerate_1.4.2.tgz"; - url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz"; - sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; - }; - } - { - name = "regenerator_runtime___regenerator_runtime_0.13.9.tgz"; - path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.9.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; - sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; - }; - } - { - name = "regenerator_transform___regenerator_transform_0.15.0.tgz"; - path = fetchurl { - name = "regenerator_transform___regenerator_transform_0.15.0.tgz"; - url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz"; - sha512 = "LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg=="; - }; - } - { - name = "regex_parser___regex_parser_2.2.11.tgz"; - path = fetchurl { - name = "regex_parser___regex_parser_2.2.11.tgz"; - url = "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz"; - sha512 = "jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q=="; + name = "regenerator_runtime___regenerator_runtime_0.13.10.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz"; + sha512 = "KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="; }; } { @@ -10017,14 +6929,6 @@ sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; } - { - name = "regexpu_core___regexpu_core_5.1.0.tgz"; - path = fetchurl { - name = "regexpu_core___regexpu_core_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.1.0.tgz"; - sha512 = "bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA=="; - }; - } { name = "e7cc9a63a1f512565da44cb57316d9fb10750e17"; path = @@ -10042,43 +6946,19 @@ ''; } { - name = "registry_auth_token___registry_auth_token_4.2.2.tgz"; + name = "remark_parse___remark_parse_10.0.1.tgz"; path = fetchurl { - name = "registry_auth_token___registry_auth_token_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz"; - sha512 = "PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg=="; + name = "remark_parse___remark_parse_10.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-10.0.1.tgz"; + sha512 = "1fUyHr2jLsVOkhbvPRBJ5zTKZZyD6yZzYaWCS6BPBdQ8vEMBCH+9zNCDA6tET/zHCi/jLqjCWtlJZUPk+DbnFw=="; }; } { - name = "registry_url___registry_url_5.1.0.tgz"; + name = "remark_rehype___remark_rehype_10.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 = "regjsgen___regjsgen_0.6.0.tgz"; - path = fetchurl { - name = "regjsgen___regjsgen_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz"; - sha512 = "ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA=="; - }; - } - { - name = "regjsparser___regjsparser_0.8.4.tgz"; - path = fetchurl { - name = "regjsparser___regjsparser_0.8.4.tgz"; - url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz"; - sha512 = "J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA=="; - }; - } - { - name = "relateurl___relateurl_0.2.7.tgz"; - path = fetchurl { - name = "relateurl___relateurl_0.2.7.tgz"; - url = "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz"; - sha512 = "G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog=="; + name = "remark_rehype___remark_rehype_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-10.1.0.tgz"; + sha512 = "EFmR5zppdBp0WQeDVZ/b66CWJipB2q2VLNFMabzDSGR66Z2fQii83G5gTBbgGEnEEA0QRussvrFHxk1HWGJskw=="; }; } { @@ -10105,14 +6985,6 @@ sha512 = "/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="; }; } - { - name = "renderkid___renderkid_3.0.0.tgz"; - path = fetchurl { - name = "renderkid___renderkid_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/renderkid/-/renderkid-3.0.0.tgz"; - sha512 = "q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg=="; - }; - } { name = "replace_ext___replace_ext_1.0.1.tgz"; path = fetchurl { @@ -10121,6 +6993,14 @@ sha512 = "yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw=="; }; } + { + name = "replace_ext___replace_ext_2.0.0.tgz"; + path = fetchurl { + name = "replace_ext___replace_ext_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-2.0.0.tgz"; + sha512 = "UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug=="; + }; + } { name = "require_directory___require_directory_2.1.1.tgz"; path = fetchurl { @@ -10137,14 +7017,6 @@ sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; }; } - { - 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"; - sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; - }; - } { name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; path = fetchurl { @@ -10177,14 +7049,6 @@ sha512 = "NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A=="; }; } - { - name = "resolve_url_loader___resolve_url_loader_4.0.0.tgz"; - path = fetchurl { - name = "resolve_url_loader___resolve_url_loader_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz"; - sha512 = "05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA=="; - }; - } { name = "resolve.exports___resolve.exports_1.1.0.tgz"; path = fetchurl { @@ -10217,14 +7081,6 @@ sha512 = "/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ=="; }; } - { - name = "retry___retry_0.13.1.tgz"; - path = fetchurl { - name = "retry___retry_0.13.1.tgz"; - url = "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz"; - sha512 = "XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="; - }; - } { name = "reusify___reusify_1.0.4.tgz"; path = fetchurl { @@ -10258,19 +7114,11 @@ }; } { - name = "rollup_plugin_terser___rollup_plugin_terser_7.0.2.tgz"; + name = "rollup___rollup_2.79.1.tgz"; path = fetchurl { - name = "rollup_plugin_terser___rollup_plugin_terser_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz"; - sha512 = "w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ=="; - }; - } - { - name = "rollup___rollup_2.77.3.tgz"; - path = fetchurl { - name = "rollup___rollup_2.77.3.tgz"; - url = "https://registry.yarnpkg.com/rollup/-/rollup-2.77.3.tgz"; - sha512 = "/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g=="; + name = "rollup___rollup_2.79.1.tgz"; + url = "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz"; + sha512 = "uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw=="; }; } { @@ -10298,11 +7146,27 @@ }; } { - name = "rxjs___rxjs_7.5.6.tgz"; + name = "rxjs___rxjs_7.5.7.tgz"; path = fetchurl { - name = "rxjs___rxjs_7.5.6.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.6.tgz"; - sha512 = "dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw=="; + name = "rxjs___rxjs_7.5.7.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.7.tgz"; + sha512 = "z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA=="; + }; + } + { + name = "sade___sade_1.8.1.tgz"; + path = fetchurl { + name = "sade___sade_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz"; + sha512 = "xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A=="; + }; + } + { + 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"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; } { @@ -10314,11 +7178,11 @@ }; } { - name = "safe_buffer___safe_buffer_5.2.1.tgz"; + name = "safe_regex_test___safe_regex_test_1.0.0.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"; - sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; + name = "safe_regex_test___safe_regex_test_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz"; + sha512 = "JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA=="; }; } { @@ -10338,19 +7202,11 @@ }; } { - name = "sanitize.css___sanitize.css_13.0.0.tgz"; + name = "sass___sass_1.55.0.tgz"; path = fetchurl { - name = "sanitize.css___sanitize.css_13.0.0.tgz"; - url = "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-13.0.0.tgz"; - sha512 = "ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA=="; - }; - } - { - name = "sass_loader___sass_loader_12.6.0.tgz"; - path = fetchurl { - name = "sass_loader___sass_loader_12.6.0.tgz"; - url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.6.0.tgz"; - sha512 = "oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA=="; + name = "sass___sass_1.55.0.tgz"; + url = "https://registry.yarnpkg.com/sass/-/sass-1.55.0.tgz"; + sha512 = "Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A=="; }; } { @@ -10362,67 +7218,11 @@ }; } { - name = "saxes___saxes_5.0.1.tgz"; + name = "scheduler___scheduler_0.23.0.tgz"; path = fetchurl { - name = "saxes___saxes_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz"; - sha512 = "5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw=="; - }; - } - { - name = "scheduler___scheduler_0.20.2.tgz"; - path = fetchurl { - name = "scheduler___scheduler_0.20.2.tgz"; - url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz"; - sha512 = "2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ=="; - }; - } - { - name = "schema_utils___schema_utils_2.7.0.tgz"; - path = fetchurl { - name = "schema_utils___schema_utils_2.7.0.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz"; - sha512 = "0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A=="; - }; - } - { - 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"; - sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; - }; - } - { - name = "schema_utils___schema_utils_3.1.1.tgz"; - path = fetchurl { - name = "schema_utils___schema_utils_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz"; - sha512 = "Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw=="; - }; - } - { - name = "schema_utils___schema_utils_4.0.0.tgz"; - path = fetchurl { - name = "schema_utils___schema_utils_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz"; - sha512 = "1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg=="; - }; - } - { - 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"; - sha512 = "mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="; - }; - } - { - name = "selfsigned___selfsigned_2.0.1.tgz"; - path = fetchurl { - name = "selfsigned___selfsigned_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.1.tgz"; - sha512 = "LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ=="; + name = "scheduler___scheduler_0.23.0.tgz"; + url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz"; + sha512 = "CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw=="; }; } { @@ -10434,27 +7234,11 @@ }; } { - name = "semver_diff___semver_diff_3.1.1.tgz"; + name = "semver___semver_7.3.8.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_7.0.0.tgz"; - path = fetchurl { - name = "semver___semver_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; - sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; - }; - } - { - name = "semver___semver_7.3.7.tgz"; - path = fetchurl { - name = "semver___semver_7.3.7.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz"; - sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; + name = "semver___semver_7.3.8.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz"; + sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; }; } { @@ -10466,11 +7250,11 @@ }; } { - name = "send___send_0.18.0.tgz"; + name = "semver___semver_7.0.0.tgz"; path = fetchurl { - name = "send___send_0.18.0.tgz"; - url = "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz"; - sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; + name = "semver___semver_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; + sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; } { @@ -10481,38 +7265,6 @@ sha512 = "8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw=="; }; } - { - name = "serialize_javascript___serialize_javascript_4.0.0.tgz"; - path = fetchurl { - name = "serialize_javascript___serialize_javascript_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz"; - sha512 = "GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw=="; - }; - } - { - name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; - path = fetchurl { - name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; - sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; - }; - } - { - 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"; - sha512 = "pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw=="; - }; - } - { - name = "serve_static___serve_static_1.15.0.tgz"; - path = fetchurl { - name = "serve_static___serve_static_1.15.0.tgz"; - url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; - }; - } { name = "setimmediate___setimmediate_1.0.5.tgz"; path = fetchurl { @@ -10521,22 +7273,6 @@ sha512 = "MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="; }; } - { - 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"; - sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; - }; - } - { - name = "setprototypeof___setprototypeof_1.2.0.tgz"; - path = fetchurl { - name = "setprototypeof___setprototypeof_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz"; - sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; - }; - } { name = "shebang_command___shebang_command_2.0.0.tgz"; path = fetchurl { @@ -10553,14 +7289,6 @@ sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; } - { - name = "shell_quote___shell_quote_1.7.3.tgz"; - path = fetchurl { - name = "shell_quote___shell_quote_1.7.3.tgz"; - url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz"; - sha512 = "Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="; - }; - } { name = "shlex___shlex_2.1.2.tgz"; path = fetchurl { @@ -10569,6 +7297,14 @@ sha512 = "Nz6gtibMVgYeMEhUjp2KuwAgqaJA1K155dU/HuDaEJUGgnmYfVtVZah+uerVWdH8UGnyahhDCgABbYTbs254+w=="; }; } + { + name = "short_uuid___short_uuid_4.2.0.tgz"; + path = fetchurl { + name = "short_uuid___short_uuid_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/short-uuid/-/short-uuid-4.2.0.tgz"; + sha512 = "r3cxuPPZSuF0QkKsK9bBR7u+7cwuCRzWzgjPh07F5N2iIUNgblnMHepBY16xgj5t1lG9iOP9k/TEafY1qhRzaw=="; + }; + } { name = "side_channel___side_channel_1.0.4.tgz"; path = fetchurl { @@ -10586,11 +7322,19 @@ }; } { - name = "simple_keyboard___simple_keyboard_3.4.139.tgz"; + name = "simple_keyboard___simple_keyboard_3.4.173.tgz"; path = fetchurl { - name = "simple_keyboard___simple_keyboard_3.4.139.tgz"; - url = "https://registry.yarnpkg.com/simple-keyboard/-/simple-keyboard-3.4.139.tgz"; - sha512 = "cGo6idOvPrG1d33HqgwV6tXGXnhpNN82nYwEPHvDOkcK5T6qKXlnwWurveXlMVi9W5zUMcCVuWl4csmps5mp7w=="; + name = "simple_keyboard___simple_keyboard_3.4.173.tgz"; + url = "https://registry.yarnpkg.com/simple-keyboard/-/simple-keyboard-3.4.173.tgz"; + sha512 = "TSJfTg44NUZwUbMoqn32vKRQC5e5hzOY6UCZXou9jCSKgAF3PFibe/2zat16saFDzpndJdYXNMa8Kx07k5Ht4A=="; + }; + } + { + name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz"; + path = fetchurl { + name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz"; + sha512 = "BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew=="; }; } { @@ -10609,14 +7353,6 @@ sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; }; } - { - name = "slash___slash_4.0.0.tgz"; - path = fetchurl { - name = "slash___slash_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz"; - sha512 = "3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="; - }; - } { name = "slice_ansi___slice_ansi_3.0.0.tgz"; path = fetchurl { @@ -10633,14 +7369,6 @@ sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; }; } - { - name = "sockjs___sockjs_0.3.24.tgz"; - path = fetchurl { - name = "sockjs___sockjs_0.3.24.tgz"; - url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz"; - sha512 = "GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ=="; - }; - } { name = "sort_keys___sort_keys_5.0.0.tgz"; path = fetchurl { @@ -10649,14 +7377,6 @@ sha512 = "Pdz01AvCAottHTPQGzndktFNdbRA75BgOfeT1hH+AMnJFv8lynkPi42rfeEhpx1saTEI3YNMWxfqu0sFD1G8pw=="; }; } - { - 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"; - sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="; - }; - } { name = "source_map_js___source_map_js_1.0.2.tgz"; path = fetchurl { @@ -10666,11 +7386,11 @@ }; } { - name = "source_map_loader___source_map_loader_3.0.1.tgz"; + name = "source_map_support___source_map_support_0.5.13.tgz"; path = fetchurl { - name = "source_map_loader___source_map_loader_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-3.0.1.tgz"; - sha512 = "Vp1UsfyPvgujKQzi4pyDiTOnE3E4H+yHvkVRN3c/9PJmQS4CQJExvcDvaX/D+RV+xQben9HJ56jMJS3CgUeWyA=="; + name = "source_map_support___source_map_support_0.5.13.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz"; + sha512 = "SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w=="; }; } { @@ -10681,14 +7401,6 @@ 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 = "source_map___source_map_0.5.7.tgz"; path = fetchurl { @@ -10698,19 +7410,11 @@ }; } { - name = "source_map___source_map_0.7.4.tgz"; + name = "source_map___source_map_0.6.1.tgz"; path = fetchurl { - name = "source_map___source_map_0.7.4.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz"; - sha512 = "l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="; - }; - } - { - name = "source_map___source_map_0.8.0_beta.0.tgz"; - path = fetchurl { - name = "source_map___source_map_0.8.0_beta.0.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz"; - sha512 = "2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA=="; + 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=="; }; } { @@ -10722,19 +7426,11 @@ }; } { - name = "spdy_transport___spdy_transport_3.0.0.tgz"; + name = "space_separated_tokens___space_separated_tokens_2.0.2.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"; - sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="; - }; - } - { - 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"; - sha512 = "r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA=="; + name = "space_separated_tokens___space_separated_tokens_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz"; + sha512 = "PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q=="; }; } { @@ -10753,14 +7449,6 @@ sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; }; } - { - 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"; - sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="; - }; - } { name = "stack_utils___stack_utils_2.0.5.tgz"; path = fetchurl { @@ -10769,14 +7457,6 @@ sha512 = "xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA=="; }; } - { - name = "stackframe___stackframe_1.3.4.tgz"; - path = fetchurl { - name = "stackframe___stackframe_1.3.4.tgz"; - url = "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz"; - sha512 = "oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="; - }; - } { name = "stat_mode___stat_mode_1.0.0.tgz"; path = fetchurl { @@ -10785,22 +7465,6 @@ sha512 = "jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg=="; }; } - { - name = "statuses___statuses_2.0.1.tgz"; - path = fetchurl { - name = "statuses___statuses_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz"; - sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; - }; - } - { - 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"; - sha512 = "OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="; - }; - } { name = "steam_shortcut_editor___steam_shortcut_editor_3.1.3.tgz"; path = fetchurl { @@ -10817,6 +7481,14 @@ sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; }; } + { + name = "streamx___streamx_2.12.5.tgz"; + path = fetchurl { + name = "streamx___streamx_2.12.5.tgz"; + url = "https://registry.yarnpkg.com/streamx/-/streamx-2.12.5.tgz"; + sha512 = "Y+nkFw57Z5JHT3zLlqFm3GccOy2FeYdUrrqita6Dd8kr/8enPn9GKa8IYf3/DmEKfZl/E2sWoSKUnd4qhonrgg=="; + }; + } { name = "string_length___string_length_4.0.2.tgz"; path = fetchurl { @@ -10825,22 +7497,6 @@ sha512 = "+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ=="; }; } - { - name = "string_length___string_length_5.0.1.tgz"; - path = fetchurl { - name = "string_length___string_length_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/string-length/-/string-length-5.0.1.tgz"; - sha512 = "9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow=="; - }; - } - { - name = "string_natural_compare___string_natural_compare_3.0.1.tgz"; - path = fetchurl { - name = "string_natural_compare___string_natural_compare_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz"; - sha512 = "n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw=="; - }; - } { name = "string_width___string_width_4.2.3.tgz"; path = fetchurl { @@ -10889,14 +7545,6 @@ sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; } - { - name = "stringify_object___stringify_object_3.3.0.tgz"; - path = fetchurl { - name = "stringify_object___stringify_object_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz"; - sha512 = "rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw=="; - }; - } { name = "strip_ansi___strip_ansi_6.0.1.tgz"; path = fetchurl { @@ -10905,14 +7553,6 @@ sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; } - { - name = "strip_ansi___strip_ansi_7.0.1.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz"; - sha512 = "cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw=="; - }; - } { name = "strip_bom___strip_bom_3.0.0.tgz"; path = fetchurl { @@ -10929,14 +7569,6 @@ sha512 = "3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="; }; } - { - 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"; - sha512 = "ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw=="; - }; - } { name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; path = fetchurl { @@ -10962,27 +7594,11 @@ }; } { - name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + name = "style_to_object___style_to_object_0.3.0.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"; - sha512 = "4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="; - }; - } - { - name = "style_loader___style_loader_3.3.1.tgz"; - path = fetchurl { - name = "style_loader___style_loader_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz"; - sha512 = "GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ=="; - }; - } - { - name = "stylehacks___stylehacks_5.1.0.tgz"; - path = fetchurl { - name = "stylehacks___stylehacks_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.0.tgz"; - sha512 = "SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q=="; + name = "style_to_object___style_to_object_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz"; + sha512 = "CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA=="; }; } { @@ -11026,11 +7642,11 @@ }; } { - name = "supports_hyperlinks___supports_hyperlinks_2.2.0.tgz"; + name = "supports_hyperlinks___supports_hyperlinks_2.3.0.tgz"; path = fetchurl { - name = "supports_hyperlinks___supports_hyperlinks_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz"; - sha512 = "6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ=="; + name = "supports_hyperlinks___supports_hyperlinks_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz"; + sha512 = "RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA=="; }; } { @@ -11049,30 +7665,6 @@ sha512 = "e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ=="; }; } - { - 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"; - sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; - }; - } - { - name = "svgo___svgo_2.8.0.tgz"; - path = fetchurl { - name = "svgo___svgo_2.8.0.tgz"; - url = "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz"; - sha512 = "+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg=="; - }; - } - { - 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"; - sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="; - }; - } { name = "symlink_or_copy___symlink_or_copy_1.3.1.tgz"; path = fetchurl { @@ -11082,35 +7674,11 @@ }; } { - name = "systeminformation___systeminformation_5.12.4.tgz"; + name = "systeminformation___systeminformation_5.15.0.tgz"; path = fetchurl { - name = "systeminformation___systeminformation_5.12.4.tgz"; - url = "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.12.4.tgz"; - sha512 = "wmzAUdjk7IqqdjmtCT8STaZrfXb9aZmcgqjRo8oLTF6CYs7KaRStex92i5cUziaDQ+04v5xK8iqlHcrKFVZAJQ=="; - }; - } - { - name = "tailwindcss___tailwindcss_3.1.8.tgz"; - path = fetchurl { - name = "tailwindcss___tailwindcss_3.1.8.tgz"; - url = "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.1.8.tgz"; - sha512 = "YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g=="; - }; - } - { - 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"; - sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="; - }; - } - { - name = "tapable___tapable_2.2.1.tgz"; - path = fetchurl { - name = "tapable___tapable_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz"; - sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="; + name = "systeminformation___systeminformation_5.15.0.tgz"; + url = "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.15.0.tgz"; + sha512 = "E/Tzrtjch9KSnA1kY6urRm/yAB7rwdXnYOIDDssCU8O90qqyD8k0zbNlk1dRJ4BoTv89VDnoiaUteuV+xxa3pQ=="; }; } { @@ -11122,11 +7690,11 @@ }; } { - name = "temp_dir___temp_dir_2.0.0.tgz"; + name = "teex___teex_1.0.1.tgz"; path = fetchurl { - name = "temp_dir___temp_dir_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz"; - sha512 = "aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg=="; + name = "teex___teex_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/teex/-/teex-1.0.1.tgz"; + sha512 = "eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg=="; }; } { @@ -11137,14 +7705,6 @@ sha512 = "C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg=="; }; } - { - name = "tempy___tempy_0.6.0.tgz"; - path = fetchurl { - name = "tempy___tempy_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/tempy/-/tempy-0.6.0.tgz"; - sha512 = "G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw=="; - }; - } { name = "terminal_link___terminal_link_2.1.1.tgz"; path = fetchurl { @@ -11153,22 +7713,6 @@ sha512 = "un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ=="; }; } - { - name = "terser_webpack_plugin___terser_webpack_plugin_5.3.3.tgz"; - path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_5.3.3.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz"; - sha512 = "Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ=="; - }; - } - { - name = "terser___terser_5.14.2.tgz"; - path = fetchurl { - name = "terser___terser_5.14.2.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz"; - sha512 = "oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA=="; - }; - } { name = "test_exclude___test_exclude_6.0.0.tgz"; path = fetchurl { @@ -11185,14 +7729,6 @@ sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; }; } - { - name = "throat___throat_6.0.1.tgz"; - path = fetchurl { - name = "throat___throat_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz"; - sha512 = "8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w=="; - }; - } { name = "through2_filter___through2_filter_3.0.0.tgz"; path = fetchurl { @@ -11217,14 +7753,6 @@ sha512 = "iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw=="; }; } - { - 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"; - sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="; - }; - } { name = "tmp_promise___tmp_promise_3.0.3.tgz"; path = fetchurl { @@ -11289,38 +7817,6 @@ sha512 = "+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q=="; }; } - { - name = "toidentifier___toidentifier_1.0.1.tgz"; - path = fetchurl { - 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=="; - }; - } - { - name = "tough_cookie___tough_cookie_4.0.0.tgz"; - path = fetchurl { - name = "tough_cookie___tough_cookie_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz"; - sha512 = "tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg=="; - }; - } - { - name = "tr46___tr46_1.0.1.tgz"; - path = fetchurl { - name = "tr46___tr46_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz"; - sha512 = "dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA=="; - }; - } - { - name = "tr46___tr46_2.1.0.tgz"; - path = fetchurl { - name = "tr46___tr46_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz"; - sha512 = "15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw=="; - }; - } { name = "tr46___tr46_0.0.3.tgz"; path = fetchurl { @@ -11329,6 +7825,22 @@ sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="; }; } + { + name = "trim_lines___trim_lines_3.0.1.tgz"; + path = fetchurl { + name = "trim_lines___trim_lines_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz"; + sha512 = "kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg=="; + }; + } + { + name = "trough___trough_2.1.0.tgz"; + path = fetchurl { + name = "trough___trough_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/trough/-/trough-2.1.0.tgz"; + sha512 = "AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g=="; + }; + } { name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; path = fetchurl { @@ -11338,19 +7850,11 @@ }; } { - name = "tryer___tryer_1.0.1.tgz"; + name = "ts_jest___ts_jest_28.0.8.tgz"; path = fetchurl { - name = "tryer___tryer_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz"; - sha512 = "c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="; - }; - } - { - name = "ts_jest___ts_jest_27.1.5.tgz"; - path = fetchurl { - name = "ts_jest___ts_jest_27.1.5.tgz"; - url = "https://registry.yarnpkg.com/ts-jest/-/ts-jest-27.1.5.tgz"; - sha512 = "Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA=="; + name = "ts_jest___ts_jest_28.0.8.tgz"; + url = "https://registry.yarnpkg.com/ts-jest/-/ts-jest-28.0.8.tgz"; + sha512 = "5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg=="; }; } { @@ -11401,14 +7905,6 @@ sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; }; } - { - 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"; - sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="; - }; - } { name = "type_detect___type_detect_4.0.8.tgz"; path = fetchurl { @@ -11425,14 +7921,6 @@ sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; }; } - { - name = "type_fest___type_fest_0.16.0.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.16.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.16.0.tgz"; - sha512 = "eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg=="; - }; - } { name = "type_fest___type_fest_0.20.2.tgz"; path = fetchurl { @@ -11450,19 +7938,11 @@ }; } { - name = "type_fest___type_fest_2.18.0.tgz"; + name = "type_fest___type_fest_2.19.0.tgz"; path = fetchurl { - name = "type_fest___type_fest_2.18.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-2.18.0.tgz"; - sha512 = "pRS+/yrW5TjPPHNOvxhbNZexr2bS63WjrMU8a+VzEBhUi9Tz1pZeD+vQz3ut0svZ46P+SRqMEPnJmk2XnvNzTw=="; - }; - } - { - 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"; - sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; + name = "type_fest___type_fest_2.19.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz"; + sha512 = "RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="; }; } { @@ -11473,14 +7953,6 @@ sha512 = "g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA=="; }; } - { - 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 { @@ -11490,11 +7962,11 @@ }; } { - name = "typescript___typescript_4.7.4.tgz"; + name = "typescript___typescript_4.8.4.tgz"; path = fetchurl { - name = "typescript___typescript_4.7.4.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz"; - sha512 = "C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ=="; + name = "typescript___typescript_4.8.4.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz"; + sha512 = "QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ=="; }; } { @@ -11513,6 +7985,14 @@ sha512 = "eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg=="; }; } + { + name = "underscore_keypath___underscore_keypath_0.0.22.tgz"; + path = fetchurl { + name = "underscore_keypath___underscore_keypath_0.0.22.tgz"; + url = "https://registry.yarnpkg.com/underscore-keypath/-/underscore-keypath-0.0.22.tgz"; + sha512 = "fU7aYj1J2LQd+jqdQ67AlCOZKK3Pl+VErS8fGYcgZG75XB9/bY+RLM+F2xEcKHhHNtLvqqFyXAoZQlLYfec3Xg=="; + }; + } { name = "underscore.string___underscore.string_3.3.6.tgz"; path = fetchurl { @@ -11522,35 +8002,19 @@ }; } { - name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_2.0.0.tgz"; + name = "underscore___underscore_1.13.6.tgz"; path = fetchurl { - name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"; - sha512 = "yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="; + name = "underscore___underscore_1.13.6.tgz"; + url = "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz"; + sha512 = "+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="; }; } { - name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_2.0.0.tgz"; + name = "unified___unified_10.1.2.tgz"; path = fetchurl { - name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"; - sha512 = "5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q=="; - }; - } - { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_2.0.0.tgz"; - path = fetchurl { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz"; - sha512 = "7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="; - }; - } - { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_2.0.0.tgz"; - path = fetchurl { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz"; - sha512 = "5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="; + name = "unified___unified_10.1.2.tgz"; + url = "https://registry.yarnpkg.com/unified/-/unified-10.1.2.tgz"; + sha512 = "pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q=="; }; } { @@ -11562,11 +8026,59 @@ }; } { - name = "unique_string___unique_string_2.0.0.tgz"; + name = "unist_builder___unist_builder_3.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 = "unist_builder___unist_builder_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/unist-builder/-/unist-builder-3.0.0.tgz"; + sha512 = "GFxmfEAa0vi9i5sd0R2kcrI9ks0r82NasRq5QHh2ysGngrc6GiqD5CDf1FjPenY4vApmFASBIIlk/jj5J5YbmQ=="; + }; + } + { + name = "unist_util_generated___unist_util_generated_2.0.0.tgz"; + path = fetchurl { + name = "unist_util_generated___unist_util_generated_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-2.0.0.tgz"; + sha512 = "TiWE6DVtVe7Ye2QxOVW9kqybs6cZexNwTwSMVgkfjEReqy/xwGpAXb99OxktoWwmL+Z+Epb0Dn8/GNDYP1wnUw=="; + }; + } + { + name = "unist_util_is___unist_util_is_5.1.1.tgz"; + path = fetchurl { + name = "unist_util_is___unist_util_is_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-5.1.1.tgz"; + sha512 = "F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ=="; + }; + } + { + name = "unist_util_position___unist_util_position_4.0.3.tgz"; + path = fetchurl { + name = "unist_util_position___unist_util_position_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-4.0.3.tgz"; + sha512 = "p/5EMGIa1qwbXjA+QgcBXaPWjSnZfQ2Sc3yBEEfgPwsEmJd8Qh+DSk3LGnmOM4S1bY2C0AjmMnB8RuEYxpPwXQ=="; + }; + } + { + name = "unist_util_stringify_position___unist_util_stringify_position_3.0.2.tgz"; + path = fetchurl { + name = "unist_util_stringify_position___unist_util_stringify_position_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz"; + sha512 = "7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg=="; + }; + } + { + name = "unist_util_visit_parents___unist_util_visit_parents_5.1.1.tgz"; + path = fetchurl { + name = "unist_util_visit_parents___unist_util_visit_parents_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-5.1.1.tgz"; + sha512 = "gks4baapT/kNRaWxuGkl5BIhoanZo7sC/cUT/JToSRNL1dYoXRFl75d++NkjYk4TAu2uv2Px+l8guMajogeuiw=="; + }; + } + { + name = "unist_util_visit___unist_util_visit_4.1.1.tgz"; + path = fetchurl { + name = "unist_util_visit___unist_util_visit_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.1.1.tgz"; + sha512 = "n9KN3WV9k4h1DxYR1LoajgN93wpEi/7ZplVe02IoB4gH5ctI1AaF2670BLHQYbwj+pY83gFtyeySFiyMHJklrg=="; }; } { @@ -11585,22 +8097,6 @@ sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; }; } - { - 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"; - sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; - }; - } - { - 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"; - sha512 = "vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg=="; - }; - } { name = "unzip_crx_3___unzip_crx_3_0.2.0.tgz"; path = fetchurl { @@ -11610,27 +8106,19 @@ }; } { - name = "upath___upath_1.2.0.tgz"; + name = "update_browserslist_db___update_browserslist_db_1.0.10.tgz"; path = fetchurl { - name = "upath___upath_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz"; - sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; + name = "update_browserslist_db___update_browserslist_db_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz"; + sha512 = "OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ=="; }; } { - name = "update_browserslist_db___update_browserslist_db_1.0.5.tgz"; + name = "upng_js___upng_js_2.1.0.tgz"; path = fetchurl { - name = "update_browserslist_db___update_browserslist_db_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz"; - sha512 = "dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q=="; - }; - } - { - 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 = "upng_js___upng_js_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/upng-js/-/upng-js-2.1.0.tgz"; + sha512 = "d3xzZzpMP64YkjP5pr8gNyvBt7dLk/uGI67EctzDuVp4lCZyVMo0aJO6l/VDlgbInJYDY6cnClLoBp29eKWI6g=="; }; } { @@ -11649,6 +8137,14 @@ sha512 = "NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ=="; }; } + { + name = "user_agents___user_agents_1.0.1204.tgz"; + path = fetchurl { + name = "user_agents___user_agents_1.0.1204.tgz"; + url = "https://registry.yarnpkg.com/user-agents/-/user-agents-1.0.1204.tgz"; + sha512 = "o7DEC4gacRNjaCqQstwGiRWGkUNaiLTfPDeAE4EFXZ7S43HCMAUuzVy4zhkook+qQ2cE1DLitshmP5ErnC+gZw=="; + }; + } { name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; path = fetchurl { @@ -11665,30 +8161,6 @@ sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; }; } - { - 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"; - sha512 = "g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA=="; - }; - } - { - name = "utila___utila_0.4.0.tgz"; - path = fetchurl { - name = "utila___utila_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz"; - sha512 = "Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA=="; - }; - } - { - 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"; - sha512 = "pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="; - }; - } { name = "uuid___uuid_8.3.2.tgz"; path = fetchurl { @@ -11698,19 +8170,19 @@ }; } { - name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + name = "uvu___uvu_0.5.6.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 = "uvu___uvu_0.5.6.tgz"; + url = "https://registry.yarnpkg.com/uvu/-/uvu-0.5.6.tgz"; + sha512 = "+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA=="; }; } { - name = "v8_to_istanbul___v8_to_istanbul_8.1.1.tgz"; + name = "v8_to_istanbul___v8_to_istanbul_9.0.1.tgz"; path = fetchurl { - 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 = "v8_to_istanbul___v8_to_istanbul_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz"; + sha512 = "74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w=="; }; } { @@ -11721,14 +8193,6 @@ sha512 = "jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg=="; }; } - { - 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"; - sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="; - }; - } { name = "verror___verror_1.10.1.tgz"; path = fetchurl { @@ -11737,6 +8201,22 @@ sha512 = "veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg=="; }; } + { + name = "vfile_message___vfile_message_3.1.3.tgz"; + path = fetchurl { + name = "vfile_message___vfile_message_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.1.3.tgz"; + sha512 = "0yaU+rj2gKAyEk12ffdSbBfjnnj+b1zqTBv3OQCTn8yEB02bsPizwdBPrLJjHnK+cU9EMMcUnNv938XcZIkmdA=="; + }; + } + { + name = "vfile___vfile_5.3.6.tgz"; + path = fetchurl { + name = "vfile___vfile_5.3.6.tgz"; + url = "https://registry.yarnpkg.com/vfile/-/vfile-5.3.6.tgz"; + sha512 = "ADBsmerdGBs2WYckrLBEmuETSPyTD4TuLxTrw0DvjirxW1ra4ZwkbzG8ndsv3Q57smvHxo677MHaQrY9yxH8cA=="; + }; + } { name = "vinyl_fs___vinyl_fs_3.0.3.tgz"; path = fetchurl { @@ -11761,6 +8241,38 @@ sha512 = "LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw=="; }; } + { + name = "vinyl___vinyl_3.0.0.tgz"; + path = fetchurl { + name = "vinyl___vinyl_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/vinyl/-/vinyl-3.0.0.tgz"; + sha512 = "rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g=="; + }; + } + { + name = "vite_plugin_electron___vite_plugin_electron_0.10.2.tgz"; + path = fetchurl { + name = "vite_plugin_electron___vite_plugin_electron_0.10.2.tgz"; + url = "https://registry.yarnpkg.com/vite-plugin-electron/-/vite-plugin-electron-0.10.2.tgz"; + sha512 = "sPGHDvIsMqmk/C2ZJue2JoZkO9L1cEum3J4hUUkeUPNHh0fg4EOfQiDoY//h2Cd8aCpoUiRpa1vHEYmypjBkgg=="; + }; + } + { + name = "vite_plugin_svgr___vite_plugin_svgr_2.2.2.tgz"; + path = fetchurl { + name = "vite_plugin_svgr___vite_plugin_svgr_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/vite-plugin-svgr/-/vite-plugin-svgr-2.2.2.tgz"; + sha512 = "u8Ac27uZmDHTVGawpAhvLMJMuzbGeZGhe61TGeHoRQLxVhmQfIYCefa0iLbjC0ui1zFo6XZnS8EkzPITCYp85g=="; + }; + } + { + name = "vite___vite_3.2.2.tgz"; + path = fetchurl { + name = "vite___vite_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/vite/-/vite-3.2.2.tgz"; + sha512 = "pLrhatFFOWO9kS19bQ658CnRYzv0WLbsPih6R+iFeEEhDOuYgYCX2rztUViMz/uy/V8cLCJvLFeiOK7RJEzHcw=="; + }; + } { name = "void_elements___void_elements_3.1.0.tgz"; path = fetchurl { @@ -11770,27 +8282,11 @@ }; } { - name = "vue_template_compiler___vue_template_compiler_2.7.8.tgz"; + name = "vue_template_compiler___vue_template_compiler_2.7.12.tgz"; path = fetchurl { - name = "vue_template_compiler___vue_template_compiler_2.7.8.tgz"; - url = "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.8.tgz"; - sha512 = "eQqdcUpJKJpBRPDdxCNsqUoT0edNvdt1jFjtVnVS/LPPmr0BU2jWzXlrf6BVMeODtdLewB3j8j3WjNiB+V+giw=="; - }; - } - { - 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"; - sha512 = "z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ=="; - }; - } - { - 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"; - sha512 = "4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA=="; + name = "vue_template_compiler___vue_template_compiler_2.7.12.tgz"; + url = "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.12.tgz"; + sha512 = "6rhJAuo2vRzJMs8X/pd9yqtsJmnPEnv4E0cb9KCu0sfGhoDt8roCCa/6qbrvpc1b38zYgdmY/xrk4qfNWZIjwA=="; }; } { @@ -11809,22 +8305,6 @@ sha512 = "ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ=="; }; } - { - name = "watchpack___watchpack_2.4.0.tgz"; - path = fetchurl { - name = "watchpack___watchpack_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz"; - sha512 = "Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg=="; - }; - } - { - 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"; - sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; - }; - } { name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; path = fetchurl { @@ -11833,126 +8313,6 @@ sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="; }; } - { - name = "webidl_conversions___webidl_conversions_4.0.2.tgz"; - path = fetchurl { - name = "webidl_conversions___webidl_conversions_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; - sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; - }; - } - { - 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"; - sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; - }; - } - { - 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"; - sha512 = "qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="; - }; - } - { - name = "webpack_dev_middleware___webpack_dev_middleware_5.3.3.tgz"; - path = fetchurl { - name = "webpack_dev_middleware___webpack_dev_middleware_5.3.3.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz"; - sha512 = "hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA=="; - }; - } - { - name = "webpack_dev_server___webpack_dev_server_4.10.0.tgz"; - path = fetchurl { - name = "webpack_dev_server___webpack_dev_server_4.10.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.10.0.tgz"; - sha512 = "7dezwAs+k6yXVFZ+MaL8VnE+APobiO3zvpp3rBHe/HmWQ+avwh0Q3d0xxacOiBybZZ3syTZw9HXzpa3YNbAZDQ=="; - }; - } - { - name = "webpack_manifest_plugin___webpack_manifest_plugin_4.1.1.tgz"; - path = fetchurl { - name = "webpack_manifest_plugin___webpack_manifest_plugin_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz"; - sha512 = "YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow=="; - }; - } - { - 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"; - sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; - }; - } - { - name = "webpack_sources___webpack_sources_2.3.1.tgz"; - path = fetchurl { - name = "webpack_sources___webpack_sources_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.1.tgz"; - sha512 = "y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA=="; - }; - } - { - name = "webpack_sources___webpack_sources_3.2.3.tgz"; - path = fetchurl { - name = "webpack_sources___webpack_sources_3.2.3.tgz"; - url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz"; - sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="; - }; - } - { - name = "webpack___webpack_5.74.0.tgz"; - path = fetchurl { - name = "webpack___webpack_5.74.0.tgz"; - url = "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz"; - sha512 = "A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA=="; - }; - } - { - 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"; - sha512 = "b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg=="; - }; - } - { - 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"; - sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; - }; - } - { - 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"; - sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; - }; - } - { - name = "whatwg_fetch___whatwg_fetch_3.6.2.tgz"; - path = fetchurl { - name = "whatwg_fetch___whatwg_fetch_3.6.2.tgz"; - url = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz"; - sha512 = "bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="; - }; - } - { - 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"; - sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; - }; - } { name = "whatwg_url___whatwg_url_5.0.0.tgz"; path = fetchurl { @@ -11961,22 +8321,6 @@ sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="; }; } - { - name = "whatwg_url___whatwg_url_7.1.0.tgz"; - path = fetchurl { - name = "whatwg_url___whatwg_url_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz"; - sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; - }; - } - { - name = "whatwg_url___whatwg_url_8.7.0.tgz"; - path = fetchurl { - name = "whatwg_url___whatwg_url_8.7.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz"; - sha512 = "gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg=="; - }; - } { name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; path = fetchurl { @@ -11985,14 +8329,6 @@ sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; } - { - 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 = "which___which_2.0.2.tgz"; path = fetchurl { @@ -12001,14 +8337,6 @@ 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 = "word_wrap___word_wrap_1.2.3.tgz"; path = fetchurl { @@ -12017,142 +8345,6 @@ sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; }; } - { - name = "workbox_background_sync___workbox_background_sync_6.5.4.tgz"; - path = fetchurl { - name = "workbox_background_sync___workbox_background_sync_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.5.4.tgz"; - sha512 = "0r4INQZMyPky/lj4Ou98qxcThrETucOde+7mRGJl13MPJugQNKeZQOdIJe/1AchOP23cTqHcN/YVpD6r8E6I8g=="; - }; - } - { - name = "workbox_broadcast_update___workbox_broadcast_update_6.5.4.tgz"; - path = fetchurl { - name = "workbox_broadcast_update___workbox_broadcast_update_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.5.4.tgz"; - sha512 = "I/lBERoH1u3zyBosnpPEtcAVe5lwykx9Yg1k6f8/BGEPGaMMgZrwVrqL1uA9QZ1NGGFoyE6t9i7lBjOlDhFEEw=="; - }; - } - { - name = "workbox_build___workbox_build_6.5.4.tgz"; - path = fetchurl { - name = "workbox_build___workbox_build_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.5.4.tgz"; - sha512 = "kgRevLXEYvUW9WS4XoziYqZ8Q9j/2ziJYEtTrjdz5/L/cTUa2XfyMP2i7c3p34lgqJ03+mTiz13SdFef2POwbA=="; - }; - } - { - name = "workbox_cacheable_response___workbox_cacheable_response_6.5.4.tgz"; - path = fetchurl { - name = "workbox_cacheable_response___workbox_cacheable_response_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.5.4.tgz"; - sha512 = "DCR9uD0Fqj8oB2TSWQEm1hbFs/85hXXoayVwFKLVuIuxwJaihBsLsp4y7J9bvZbqtPJ1KlCkmYVGQKrBU4KAug=="; - }; - } - { - name = "workbox_core___workbox_core_6.5.4.tgz"; - path = fetchurl { - name = "workbox_core___workbox_core_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz"; - sha512 = "OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q=="; - }; - } - { - name = "workbox_expiration___workbox_expiration_6.5.4.tgz"; - path = fetchurl { - name = "workbox_expiration___workbox_expiration_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.4.tgz"; - sha512 = "jUP5qPOpH1nXtjGGh1fRBa1wJL2QlIb5mGpct3NzepjGG2uFFBn4iiEBiI9GUmfAFR2ApuRhDydjcRmYXddiEQ=="; - }; - } - { - name = "workbox_google_analytics___workbox_google_analytics_6.5.4.tgz"; - path = fetchurl { - name = "workbox_google_analytics___workbox_google_analytics_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.5.4.tgz"; - sha512 = "8AU1WuaXsD49249Wq0B2zn4a/vvFfHkpcFfqAFHNHwln3jK9QUYmzdkKXGIZl9wyKNP+RRX30vcgcyWMcZ9VAg=="; - }; - } - { - name = "workbox_navigation_preload___workbox_navigation_preload_6.5.4.tgz"; - path = fetchurl { - name = "workbox_navigation_preload___workbox_navigation_preload_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.4.tgz"; - sha512 = "IIwf80eO3cr8h6XSQJF+Hxj26rg2RPFVUmJLUlM0+A2GzB4HFbQyKkrgD5y2d84g2IbJzP4B4j5dPBRzamHrng=="; - }; - } - { - name = "workbox_precaching___workbox_precaching_6.5.4.tgz"; - path = fetchurl { - name = "workbox_precaching___workbox_precaching_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.4.tgz"; - sha512 = "hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg=="; - }; - } - { - name = "workbox_range_requests___workbox_range_requests_6.5.4.tgz"; - path = fetchurl { - name = "workbox_range_requests___workbox_range_requests_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.4.tgz"; - sha512 = "Je2qR1NXCFC8xVJ/Lux6saH6IrQGhMpDrPXWZWWS8n/RD+WZfKa6dSZwU+/QksfEadJEr/NfY+aP/CXFFK5JFg=="; - }; - } - { - name = "workbox_recipes___workbox_recipes_6.5.4.tgz"; - path = fetchurl { - name = "workbox_recipes___workbox_recipes_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.5.4.tgz"; - sha512 = "QZNO8Ez708NNwzLNEXTG4QYSKQ1ochzEtRLGaq+mr2PyoEIC1xFW7MrWxrONUxBFOByksds9Z4//lKAX8tHyUA=="; - }; - } - { - name = "workbox_routing___workbox_routing_6.5.4.tgz"; - path = fetchurl { - name = "workbox_routing___workbox_routing_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz"; - sha512 = "apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg=="; - }; - } - { - name = "workbox_strategies___workbox_strategies_6.5.4.tgz"; - path = fetchurl { - name = "workbox_strategies___workbox_strategies_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.4.tgz"; - sha512 = "DEtsxhx0LIYWkJBTQolRxG4EI0setTJkqR4m7r4YpBdxtWJH1Mbg01Cj8ZjNOO8etqfA3IZaOPHUxCs8cBsKLw=="; - }; - } - { - name = "workbox_streams___workbox_streams_6.5.4.tgz"; - path = fetchurl { - name = "workbox_streams___workbox_streams_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.5.4.tgz"; - sha512 = "FXKVh87d2RFXkliAIheBojBELIPnWbQdyDvsH3t74Cwhg0fDheL1T8BqSM86hZvC0ZESLsznSYWw+Va+KVbUzg=="; - }; - } - { - name = "workbox_sw___workbox_sw_6.5.4.tgz"; - path = fetchurl { - name = "workbox_sw___workbox_sw_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.5.4.tgz"; - sha512 = "vo2RQo7DILVRoH5LjGqw3nphavEjK4Qk+FenXeUsknKn14eCNedHOXWbmnvP4ipKhlE35pvJ4yl4YYf6YsJArA=="; - }; - } - { - name = "workbox_webpack_plugin___workbox_webpack_plugin_6.5.4.tgz"; - path = fetchurl { - name = "workbox_webpack_plugin___workbox_webpack_plugin_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.4.tgz"; - sha512 = "LmWm/zoaahe0EGmMTrSLUi+BjyR3cdGEfU3fS6PN1zKFYbqAKuQ+Oy/27e4VSXsyIwAw8+QDfk1XHNGtZu9nQg=="; - }; - } - { - name = "workbox_window___workbox_window_6.5.4.tgz"; - path = fetchurl { - name = "workbox_window___workbox_window_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.5.4.tgz"; - sha512 = "HnLZJDwYBE+hpG25AQBO8RUWBJRaCsI9ksQJEp3aCOFCaG5kqaToAYXFRAHxzRluM2cQbGzdQF5rjKPWPA1fug=="; - }; - } { name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; path = fetchurl { @@ -12170,11 +8362,11 @@ }; } { - name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + name = "write_file_atomic___write_file_atomic_4.0.2.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 = "write_file_atomic___write_file_atomic_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz"; + sha512 = "7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg=="; }; } { @@ -12185,30 +8377,6 @@ sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; } - { - name = "ws___ws_8.8.1.tgz"; - path = fetchurl { - name = "ws___ws_8.8.1.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz"; - sha512 = "bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA=="; - }; - } - { - 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 = "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"; - sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="; - }; - } { name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; path = fetchurl { @@ -12217,14 +8385,6 @@ sha512 = "yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="; }; } - { - 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"; - sha512 = "JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="; - }; - } { name = "xtend___xtend_4.0.2.tgz"; path = fetchurl { @@ -12265,14 +8425,6 @@ 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=="; - }; - } { name = "yargs_parser___yargs_parser_21.1.1.tgz"; path = fetchurl { @@ -12282,19 +8434,11 @@ }; } { - name = "yargs___yargs_16.2.0.tgz"; + name = "yargs___yargs_17.6.0.tgz"; path = fetchurl { - name = "yargs___yargs_16.2.0.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz"; - sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; - }; - } - { - name = "yargs___yargs_17.5.1.tgz"; - path = fetchurl { - name = "yargs___yargs_17.5.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz"; - sha512 = "t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA=="; + name = "yargs___yargs_17.6.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz"; + sha512 = "8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g=="; }; } { diff --git a/pkgs/games/hexgui/default.nix b/pkgs/games/hexgui/default.nix index 1282f03a0eb4..49dae4217551 100644 --- a/pkgs/games/hexgui/default.nix +++ b/pkgs/games/hexgui/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation { pname = "hexgui"; - version = "unstable-2022-5-30"; + version = "unstable-2023-1-7"; src = fetchFromGitHub { owner = "selinger"; repo = "hexgui"; - rev = "d94ce1d35a22dad28d3e7def4d28e6bebd54da9d"; - hash = "sha256-1MroFH2JSEZHFigcsw1+xyHJWEnHTvHmRPVirUgwM6I="; + rev = "62f07ff51db0d4a945ad42f86167cc2f2ce65d90"; + hash = "sha256-yEdZs9HUt3lcrdNO1OH8M8g71+2Ltf+v1RR1fKRDV0o="; }; nativeBuildInputs = [ ant jdk makeWrapper ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = { - description = "GUI for the board game Hex (and Y)"; + description = "GUI for the board game Hex"; homepage = "https://github.com/selinger/hexgui"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.ursi ]; diff --git a/pkgs/games/hhexen/default.nix b/pkgs/games/hhexen/default.nix index 19a0b783efdd..d677962fbe68 100644 --- a/pkgs/games/hhexen/default.nix +++ b/pkgs/games/hhexen/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux port of Raven Game's Hexen"; - homepage = "http://hhexen.sourceforge.net/hhexen.html"; + homepage = "https://hhexen.sourceforge.net/hhexen.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ djanatyn ]; }; diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index 2370b008225b..f8f0d55fb9c3 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "12.1a"; + version = "12.1h"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "sha256-VmWZkIjDy/yv0g9YCW9x8b0LE5guHIA/KZc3OXJoCdA="; + sha256 = "sha256-9ChPO0YCsrAyQ81TAbKCMJSgSXoUtkvvNPMTPimPBUo="; }; CXXFLAGS = [ diff --git a/pkgs/games/itch/default.nix b/pkgs/games/itch/default.nix index 5776a1b43b2b..ca0a04a8492d 100644 --- a/pkgs/games/itch/default.nix +++ b/pkgs/games/itch/default.nix @@ -93,7 +93,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/itchio/itch"; license = licenses.mit; platforms = platforms.linux; - sourceProvenance = lib.sourceTypes.binaryBytecode; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; maintainers = with maintainers; [ pasqui23 ]; }; } diff --git a/pkgs/games/itchiodl/default.nix b/pkgs/games/itchiodl/default.nix new file mode 100644 index 000000000000..c68be798f4dc --- /dev/null +++ b/pkgs/games/itchiodl/default.nix @@ -0,0 +1,35 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + pname = "itchiodl"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "Emersont1"; + repo = "itchio"; + rev = "v${version}"; + hash = "sha256-tylMEsUdeMUuLcxRMkkJE7vPAVuqc/cVJ4DB3xmV+iA="; + }; + + format = "pyproject"; + + nativeBuildInputs = with python3Packages; [ + poetry-core + ]; + + propagatedBuildInputs = with python3Packages; [ + beautifulsoup4 + clint + requests + ]; + + meta = with lib; { + homepage = "https://github.com/Emersont1/itchio"; + description = "itch.io download tool"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/games/jumpy/default.nix b/pkgs/games/jumpy/default.nix index 645069e4354d..e41e33b4003c 100644 --- a/pkgs/games/jumpy/default.nix +++ b/pkgs/games/jumpy/default.nix @@ -2,57 +2,73 @@ , rustPlatform , fetchFromGitHub , stdenv +, makeWrapper , pkg-config , alsa-lib -, libGL -, xorg +, libxkbcommon , udev -, Cocoa -, OpenGL +, vulkan-loader +, wayland +, xorg +, darwin }: rustPlatform.buildRustPackage rec { pname = "jumpy"; - version = "0.4.3"; + version = "0.5.1"; src = fetchFromGitHub { - owner = "fishfolks"; + owner = "fishfolk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-01zhiQi6v/8ZajsdBU+4hKUCj+PRJ/vUHluOIzy/Gi8="; + sha256 = "sha256-5hgd4t9ZKHmv8wzED7Tn+ykzUM0EbQqRX15HBHzXtJY="; }; - cargoSha256 = "sha256-AXaGuRqSFiq+Uiy+UaqPdPVyDhCogC64KZZ0Ah1Yo7A="; + cargoSha256 = "sha256-cK5n75T+Kkd6F4q4MFZNn0R6W6Nk2/H23AGhIe2FCig="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + auditable = true; # TODO: remove when this is the default + + nativeBuildInputs = [ + makeWrapper + ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ alsa-lib - libGL - xorg.libX11 - xorg.libXi + libxkbcommon udev + vulkan-loader + wayland + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr ] ++ lib.optionals stdenv.isDarwin [ - Cocoa - OpenGL + darwin.apple_sdk.frameworks.Cocoa + rustPlatform.bindgenHook ]; postPatch = '' - substituteInPlace src/main.rs \ - --replace ./assets $out/share/assets \ - --replace ./mods $out/share/mods + touch ../$(stripHash $cargoDeps)/taffy/README.md ''; postInstall = '' mkdir $out/share - cp -r assets mods $out/share + cp -r assets $out/share + wrapProgram $out/bin/jumpy \ + --set-default JUMPY_ASSET_DIR $out/share/assets + ''; + + postFixup = lib.optionalString stdenv.isLinux '' + patchelf $out/bin/.jumpy-wrapped \ + --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} ''; meta = with lib; { description = "A tactical 2D shooter played by up to 4 players online or on a shared screen"; homepage = "https://fishfight.org/"; + changelog = "https://github.com/fishfolk/jumpy/releases/tag/v${version}"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/games/legendary-gl/default.nix index b0247e8fe7bf..a863b1d1cee7 100644 --- a/pkgs/games/legendary-gl/default.nix +++ b/pkgs/games/legendary-gl/default.nix @@ -1,4 +1,5 @@ { lib +, gitUpdater , fetchFromGitHub , buildPythonApplication , pythonOlder @@ -7,13 +8,13 @@ buildPythonApplication rec { pname = "legendary-gl"; # Name in pypi - version = "0.20.30"; + version = "0.20.32"; src = fetchFromGitHub { owner = "derrod"; repo = "legendary"; rev = "refs/tags/${version}"; - sha256 = "sha256-LyA8crGm1ApkI4yqVayM92EHtisQLuNmuKiLTyPyFlk="; + sha256 = "sha256-MsvhVS3lqhgBJ+S/cjXFP70I3rM5WBYT7TyVlRWhNWw="; }; propagatedBuildInputs = [ requests ]; @@ -31,4 +32,6 @@ buildPythonApplication rec { license = licenses.gpl3; maintainers = with maintainers; [ equirosa ]; }; + + passthru.updateScript = gitUpdater { }; } diff --git a/pkgs/games/lgames/lbreakouthd/default.nix b/pkgs/games/lgames/lbreakouthd/default.nix index bfe8eecc95b8..65280e3c9ae6 100644 --- a/pkgs/games/lgames/lbreakouthd/default.nix +++ b/pkgs/games/lgames/lbreakouthd/default.nix @@ -5,15 +5,16 @@ , SDL2_image , SDL2_mixer , SDL2_ttf +, directoryListingUpdater }: stdenv.mkDerivation rec { pname = "lbreakouthd"; - version = "1.0.10"; + version = "1.1"; src = fetchurl { url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-hlGhPa91u6pOaZoFJSDcXYQdizTFjuuTLnx9fcrXUhA="; + hash = "sha256-5hjS0aJ5f8Oe0aSuVgcV10h5OmWsaMHF5B9wYVFrlDY="; }; buildInputs = [ @@ -25,6 +26,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + passthru.updateScript = directoryListingUpdater { + inherit pname version; + url = "https://lgames.sourceforge.io/LBreakoutHD/"; + extraRegex = "(?!.*-win(32|64)).*"; + }; + meta = with lib; { broken = stdenv.isDarwin; homepage = "https://lgames.sourceforge.io/LBreakoutHD/"; diff --git a/pkgs/games/lgames/lpairs2/default.nix b/pkgs/games/lgames/lpairs2/default.nix index 394b690b63dd..977c640d863b 100644 --- a/pkgs/games/lgames/lpairs2/default.nix +++ b/pkgs/games/lgames/lpairs2/default.nix @@ -5,6 +5,7 @@ , SDL2_image , SDL2_mixer , SDL2_ttf +, directoryListingUpdater }: stdenv.mkDerivation rec { @@ -23,6 +24,12 @@ stdenv.mkDerivation rec { SDL2_ttf ]; + passthru.updateScript = directoryListingUpdater { + inherit pname version; + url = "https://lgames.sourceforge.io/LPairs/"; + extraRegex = "(?!.*-win(32|64)).*"; + }; + meta = with lib; { broken = stdenv.isDarwin; homepage = "http://lgames.sourceforge.net/LPairs/"; diff --git a/pkgs/games/lgames/ltris/default.nix b/pkgs/games/lgames/ltris/default.nix index 618e86561f03..30fbbdf4d78e 100644 --- a/pkgs/games/lgames/ltris/default.nix +++ b/pkgs/games/lgames/ltris/default.nix @@ -1,12 +1,18 @@ -{ lib, stdenv, fetchurl, SDL, SDL_mixer }: +{ lib +, stdenv +, fetchurl +, SDL +, SDL_mixer +, directoryListingUpdater +}: stdenv.mkDerivation rec { pname = "ltris"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-Ksb5TdQMTEzaJfjHVhgq27dSFvZxUnNUQ6OpAU+xwzM="; + hash = "sha256-wjziFFTAOJxSl6fvLhTv6ATZQGJefusDhqKXgOwsRvY="; }; buildInputs = [ @@ -16,6 +22,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + passthru.updateScript = directoryListingUpdater { + inherit pname version; + url = "https://lgames.sourceforge.io/LTris/"; + extraRegex = "(?!.*-win(32|64)).*"; + }; + meta = with lib; { homepage = "https://lgames.sourceforge.io/LTris/"; description = "Tetris clone from the LGames series"; diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index ab029e055aa9..b49df81643b7 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -11,8 +11,13 @@ , rhash , tinyxml-2 , help2man +, wrapQtAppsHook +, qtbase +, qtwebengine , testers , lgogdownloader + +, enableGui ? true }: stdenv.mkDerivation rec { @@ -30,7 +35,7 @@ stdenv.mkDerivation rec { cmake pkg-config help2man - ]; + ] ++ lib.optional enableGui wrapQtAppsHook; buildInputs = [ boost @@ -40,8 +45,13 @@ stdenv.mkDerivation rec { liboauth rhash tinyxml-2 + ] ++ lib.optionals enableGui [ + qtbase + qtwebengine ]; + cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON"; + passthru.tests = { version = testers.testVersion { package = lgogdownloader; }; }; diff --git a/pkgs/games/mari0/default.nix b/pkgs/games/mari0/default.nix index 8189c0789811..9541b97476c1 100644 --- a/pkgs/games/mari0/default.nix +++ b/pkgs/games/mari0/default.nix @@ -1,23 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, zip, love_11, lua, makeWrapper, makeDesktopItem }: +{ lib, stdenv, fetchFromGitHub, zip, love, makeWrapper, makeDesktopItem +, copyDesktopItems }: -let +stdenv.mkDerivation rec { pname = "mari0"; version = "1.6.2"; - desktopItem = makeDesktopItem { - name = "mari0"; - exec = pname; - comment = "Crossover between Super Mario Bros. and Portal"; - desktopName = "mari0"; - genericName = "mari0"; - categories = [ "Game" ]; - }; - -in - -stdenv.mkDerivation { - inherit pname version; - src = fetchFromGitHub { owner = "Stabyourself"; repo = pname; @@ -25,17 +12,26 @@ stdenv.mkDerivation { sha256 = "1zqaq4w599scsjvy1rsb21fd2r8j3srx9vym4ir9bh666dp36gxa"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ lua love_11 zip ]; + nativeBuildInputs = [ makeWrapper copyDesktopItems zip ]; - installPhase = - '' - mkdir -p $out/bin $out/share/games/lovegames $out/share/applications - zip -9 -r ${pname}.love ./* - mv ${pname}.love $out/share/games/lovegames/${pname}.love - makeWrapper ${love_11}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love - ln -s ${desktopItem}/share/applications/* $out/share/applications/ - chmod +x $out/bin/${pname} + desktopItems = [ + (makeDesktopItem { + name = "mari0"; + exec = pname; + comment = "Crossover between Super Mario Bros. and Portal"; + desktopName = "mari0"; + genericName = "mari0"; + categories = [ "Game" ]; + }) + ]; + + installPhase = '' + runHook preInstall + zip -9 -r mari0.love ./* + install -Dm444 -t $out/share/games/lovegames/ mari0.love + makeWrapper ${love}/bin/love $out/bin/mari0 \ + --add-flags $out/share/games/lovegames/mari0.love + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index 9b715b02ae09..3ce42bb7748e 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { chmod +x "$out/bin/mars" ''; meta = with lib; { - homepage = "http://mars-game.sourceforge.net/"; + homepage = "https://mars-game.sourceforge.net/"; description = "A game about fighting with ships in a 2D space setting"; license = licenses.gpl3Plus; maintainers = [ maintainers.astsmtl ]; diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 21ee6fa37448..e8558af0732a 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc -, libjpeg, wxGTK30-gtk3, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng +, libjpeg, wxGTK30, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome, libGLU, glib , fetchFromGitHub, fetchpatch }: @@ -9,7 +9,7 @@ let name = "megaglest-lib-env"; paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype - stdenv.cc.cc glew libGLU wxGTK30-gtk3 ]; + stdenv.cc.cc glew libGLU wxGTK30 ]; }; path-env = buildEnv { name = "megaglest-path-env"; @@ -38,7 +38,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ cmake pkg-config makeWrapper git ]; - buildInputs = [ curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK30-gtk3 + buildInputs = [ curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK30 glib cppunit fontconfig freetype ftgl glew libogg libvorbis libGLU ]; cmakeFlags = [ diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 2a3177fdb9db..520b90f5185d 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -20,6 +20,8 @@ , libpulseaudio ? null , libjack2 ? null +, nixosTests + # Make the build version easily overridable. # Server and client build versions must match, and an empty build version means @@ -32,42 +34,42 @@ let pname = "mindustry"; - version = "140.4"; + version = "141.2"; buildVersion = makeBuildVersion version; Mindustry = fetchFromGitHub { owner = "Anuken"; repo = "Mindustry"; rev = "v${version}"; - sha256 = "0lfDISvC5dOd76BuPPniPf+8hXWQ/wtreNHN75k2jVA="; + hash = "sha256-7olnyjkcT8OwokipDnLFW3rMOPljF6HvsU249SDvA3U="; }; Arc = fetchFromGitHub { owner = "Anuken"; repo = "Arc"; rev = "v${version}"; - sha256 = "lZ3ACijauUC9jVRq9I/QwX9ozFF/dw+ArEMND+RMItM="; + hash = "sha256-JYM2/dkrLFZz+oqOs8e+iTRG5Vv4oUcmpAavRQ7NMMM="; }; soloud = fetchFromGitHub { owner = "Anuken"; repo = "soloud"; # This is pinned in Arc's arc-core/build.gradle rev = "v0.9"; - sha256 = "6KlqOtA19MxeqZttNyNrMU7pKqzlNiA4rBZKp9ekanc="; + hash = "sha256-6KlqOtA19MxeqZttNyNrMU7pKqzlNiA4rBZKp9ekanc="; }; freetypeSource = fetchurl { # This is pinned in Arc's extensions/freetype/build.gradle url = "https://download.savannah.gnu.org/releases/freetype/freetype-2.10.4.tar.gz"; - sha256 = "1b4dcngjcly9n80hnyr4d5s6qp8bspabfs7v3h07gb13pdg7kasy"; + hash = "sha256-Xqt5XrsjrHcAHPtot9TVC11sdGkkewsBsslTJp9ljaw="; }; glewSource = fetchurl { # This is pinned in Arc's backends/backend-sdl/build.gradle url = "https://github.com/nigels-com/glew/releases/download/glew-2.2.0/glew-2.2.0.zip"; - sha256 = "1m702jzfjhdr76cb71qplv6amhw15nnb1h6wbq4mlfbl6y8nl159"; + hash = "sha256-qQRqkTd0OVoJXtzAsKwtgcOqzKYXh7OYOblB6b4U4NQ="; }; SDLmingwSource = fetchurl { # This is pinned in Arc's backends/backend-sdl/build.gradle url = "https://www.libsdl.org/release/SDL2-devel-2.0.20-mingw.tar.gz"; - sha256 = "1lbbjxl3a8vdillvv7654m6mp34lfkncvig5a8iwdmjpm214s29q"; + hash = "sha256-OAlNgqhX1sYjUuXFzex0lIxbTSXFnL0pjW0jNWiXa9E="; }; patches = [ @@ -123,9 +125,8 @@ let | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ | sh ''; - outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "FbLd3kk/awFz91o8pZcwJTFozwJ7R+RlDOsMRaala5Q="; + outputHash = "sha256-Eb+LyO1d2XwhAp9awgMlxs7dfZav0ja9kH7PaUJQOCo="; }; in @@ -215,6 +216,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests = { + nixosTest = nixosTests.mindustry; + }; + meta = with lib; { homepage = "https://mindustrygame.github.io/"; downloadPage = "https://github.com/Anuken/Mindustry/releases"; diff --git a/pkgs/games/minecraft-servers/derivation.nix b/pkgs/games/minecraft-servers/derivation.nix index e5f11f71f211..0773be6bcfc7 100644 --- a/pkgs/games/minecraft-servers/derivation.nix +++ b/pkgs/games/minecraft-servers/derivation.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfreeRedistributable; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice tomberek costrouc jyooru ]; + maintainers = with maintainers; [ thoughtpolice tomberek costrouc joelkoen ]; }; } diff --git a/pkgs/games/minecraft-servers/versions.json b/pkgs/games/minecraft-servers/versions.json index 8dce87bb301d..b0c4ca19a3e8 100644 --- a/pkgs/games/minecraft-servers/versions.json +++ b/pkgs/games/minecraft-servers/versions.json @@ -1,8 +1,8 @@ { "1.19": { - "url": "https://piston-data.mojang.com/v1/objects/f69c284232d7c7580bd89a5a4931c3581eae1378/server.jar", - "sha1": "f69c284232d7c7580bd89a5a4931c3581eae1378", - "version": "1.19.2", + "url": "https://piston-data.mojang.com/v1/objects/c9df48efed58511cdd0213c56b9013a7b5c9ac1f/server.jar", + "sha1": "c9df48efed58511cdd0213c56b9013a7b5c9ac1f", + "version": "1.19.3", "javaVersion": 17 }, "1.18": { diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 57515685a760..98fbc9051d1d 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -113,6 +113,9 @@ let mkdir -pv $out/share/minetest/games/minetest_game/ cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/ patchShebangs $out + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv $out/minetest.app $out/Applications ''; meta = with lib; { diff --git a/pkgs/games/nanosaur/default.nix b/pkgs/games/nanosaur/default.nix index 4b2509275269..32c2a0b9ecc9 100644 --- a/pkgs/games/nanosaur/default.nix +++ b/pkgs/games/nanosaur/default.nix @@ -12,22 +12,22 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake makeWrapper ]; + nativeBuildInputs = [ + cmake + makeWrapper + ]; buildInputs = [ SDL2 ]; - configurePhase = '' - cmake -S . -B build -DCMAKE_BUILD_TYPE=Release - ''; - - buildPhase = '' - cmake --build build - ''; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; installPhase = '' - mv build $out + runHook preInstall + mkdir -p "$out/bin" + mv Nanosaur Data ReadMe.txt "$out/" makeWrapper $out/Nanosaur $out/bin/Nanosaur --chdir "$out" + runHook postInstall ''; meta = with lib; { @@ -38,9 +38,7 @@ stdenv.mkDerivation rec { And you get to shoot at T-Rexes with nukes. ''; homepage = "https://github.com/jorio/Nanosaur"; - license = with licenses; [ - cc-by-sa-40 - ]; + license = licenses.cc-by-sa-40; maintainers = with maintainers; [ lux ]; platforms = platforms.linux; }; diff --git a/pkgs/games/nanosaur2/default.nix b/pkgs/games/nanosaur2/default.nix new file mode 100644 index 000000000000..e4e0919cd30c --- /dev/null +++ b/pkgs/games/nanosaur2/default.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchFromGitHub, SDL2, cmake, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "nanosaur2"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "jorio"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-UY+fyn8BA/HfCd2LCj5cfGmQACKUICH6CDCW4q6YDkg="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + makeWrapper + ]; + buildInputs = [ + SDL2 + ]; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + + installPhase = '' + runHook preInstall + mkdir -p "$out/bin" + mv Nanosaur2 Data ReadMe.txt "$out/" + makeWrapper $out/Nanosaur2 $out/bin/Nanosaur2 --chdir "$out" + runHook postInstall + ''; + + meta = with lib; { + description = "A port of Nanosaur2, a 2004 Macintosh game by Pangea Software, for modern operating systems"; + longDescription = '' + Nanosaur is a 2004 Macintosh game by Pangea Software. + + Is a continuation of the original Nanosaur storyline, only this time you get to fly a pterodactyl who’s loaded with hi-tech weaponry. + ''; + homepage = "https://github.com/jorio/Nanosaur2"; + license = licenses.cc-by-sa-40; + maintainers = with maintainers; [ lux ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index 4082e853aa30..fe3081109e9b 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -11,7 +11,7 @@ let version = "2.5.2"; - version_short = lib.replaceChars [ "." ] [ "" ] version; + version_short = lib.replaceStrings [ "." ] [ "" ] version; in stdenv.mkDerivation { pname = "nexuiz"; inherit version; diff --git a/pkgs/games/ninvaders/default.nix b/pkgs/games/ninvaders/default.nix index df4a3ad111b6..c3f455b71b07 100644 --- a/pkgs/games/ninvaders/default.nix +++ b/pkgs/games/ninvaders/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Space Invaders clone based on ncurses"; - homepage = "http://ninvaders.sourceforge.net/"; + homepage = "https://ninvaders.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ _1000101 ]; platforms = platforms.all; diff --git a/pkgs/games/njam/default.nix b/pkgs/games/njam/default.nix index 6fbffc37d034..971cd1d0726c 100644 --- a/pkgs/games/njam/default.nix +++ b/pkgs/games/njam/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./logfile.patch ]; meta = { - homepage = "http://trackballs.sourceforge.net/"; + homepage = "https://trackballs.sourceforge.net/"; description = "Cross-platform pacman-like game"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; diff --git a/pkgs/games/npush/default.nix b/pkgs/games/npush/default.nix index fb7300a5f77d..34293ce4fc07 100644 --- a/pkgs/games/npush/default.nix +++ b/pkgs/games/npush/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; - homepage = "http://npush.sourceforge.net/"; + homepage = "https://npush.sourceforge.net/"; description = "A Sokoban-like game"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix index 7905cfaa3855..5fc1b57be5dc 100644 --- a/pkgs/games/odamex/default.nix +++ b/pkgs/games/odamex/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, cmake, fetchurl, pkg-config, SDL, SDL_mixer, SDL_net, wxGTK30 }: +{ lib +, stdenv +, fetchurl +, cmake +, pkg-config +, makeWrapper +, SDL +, SDL_mixer +, SDL_net +, wxGTK32 +}: stdenv.mkDerivation rec { pname = "odamex"; @@ -9,14 +19,36 @@ stdenv.mkDerivation rec { sha256 = "sha256-WBqO5fWzemw1kYlY192v0nnZkbIEVuWmjWYMy+1ODPQ="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ SDL SDL_mixer SDL_net wxGTK30 ]; + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + ]; + + buildInputs = [ + SDL + SDL_mixer + SDL_net + wxGTK32 + ]; + + installPhase = '' + runHook preInstall + '' + (if stdenv.isDarwin then '' + mkdir -p $out/{Applications,bin} + mv odalaunch/odalaunch.app $out/Applications + makeWrapper $out/{Applications/odalaunch.app/Contents/MacOS,bin}/odalaunch + '' else '' + make install + '') + '' + runHook postInstall + ''; meta = { homepage = "http://odamex.net/"; description = "A client/server port for playing old-school Doom online"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix index 9afcbd898785..61f8aad304c8 100644 --- a/pkgs/games/opendungeons/default.nix +++ b/pkgs/games/opendungeons/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { ./fix_link_date_time.patch ]; + # source/utils/StackTraceUnix.cpp:122:2: error: #error Unsupported architecture. + postPatch = lib.optionalString (!stdenv.isx86_64) '' + cp source/utils/StackTrace{Stub,Unix}.cpp + ''; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ ogre cegui boost sfml openal ois ]; diff --git a/pkgs/games/openra/common.nix b/pkgs/games/openra/common.nix index 59c897ba3713..d9cc93e82348 100644 --- a/pkgs/games/openra/common.nix +++ b/pkgs/games/openra/common.nix @@ -12,7 +12,9 @@ with lib; let path = makeBinPath ([ mono python3 ] ++ optional (zenity != null) zenity); rpath = makeLibraryPath [ lua freetype openal SDL2 ]; - mkdirp = makeSetupHook { } ./mkdirp.sh; + mkdirp = makeSetupHook { + name = "openra-mkdirp-hook"; + } ./mkdirp.sh; in { patchEngine = dir: version: '' diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index d99663091474..76454f69e4b3 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -13,7 +13,7 @@ with pkgs.lib; let /* Building an engine or out-of-tree mod is very similar, but different enough not to be able to build them with the same package definition, - so instaed we define what is common between them in a seperate file. + so instaed we define what is common between them in a separate file. Although `callPackage` could be used, it would require undoing `makeOverridable`, because `common.nix` does not define a package, but just an attribute set, diff --git a/pkgs/games/openra/packages.nix b/pkgs/games/openra/packages.nix index e98ebcaee44f..5ee78fe2b8ff 100644 --- a/pkgs/games/openra/packages.nix +++ b/pkgs/games/openra/packages.nix @@ -3,7 +3,7 @@ pkgs: let /* Building an engine or out-of-tree mod is very similar, but different enough not to be able to build them with the same package definition, - so instaed we define what is common between them in a seperate file. + so instaed we define what is common between them in a separate file. Although `callPackage` could be used, it would require undoing `makeOverridable`, because `common.nix` does not define a package, but just an attribute set, diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 04bf9d0c7f49..d474b0eae92a 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -26,25 +26,25 @@ }: let - openrct2-version = "0.4.2"; + openrct2-version = "0.4.3"; # Those versions MUST match the pinned versions within the CMakeLists.txt # file. The REPLAYS repository from the CMakeLists.txt is not necessary. - objects-version = "1.3.5"; + objects-version = "1.3.7"; title-sequences-version = "0.4.0"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${openrct2-version}"; - sha256 = "sha256-38syOFZm0eGCI1vbJxG8truX5vuafwSG0lp2o499zUs="; + sha256 = "sha256-TAe9b7uqdC8XzwDWZkyYKFV+Rn2AeR3MMBZ1lo9pRis="; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; rev = "v${objects-version}"; - sha256 = "sha256-S9fjgtb45vhRTWnYEgmIlKej5fGBtnhKOn35npmX70U="; + sha256 = "sha256-6c6bbXFi6iqmOOfqggXv3DyYgo4+eiPUIDnkKAAhX5s="; }; title-sequences-src = fetchFromGitHub { diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 3ec209d22b25..b72f3877a461 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -58,11 +58,12 @@ stdenv.mkDerivation rec { NIX_CFLAGS_LINK = "-lopenal"; meta = with lib; { - broken = stdenv.isDarwin; description = "A compatible client of Ace of Spades 0.75"; homepage = "https://github.com/yvt/openspades/"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ abbradar azahi ]; + # never built on aarch64-linux since first introduction in nixpkgs + broken = stdenv.isDarwin || (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/pkgs/games/openttd/nml.nix b/pkgs/games/openttd/nml.nix index 666e284cfe1d..5859f5132849 100644 --- a/pkgs/games/openttd/nml.nix +++ b/pkgs/games/openttd/nml.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "openttd-nml"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "OpenTTD"; repo = "nml"; rev = "refs/tags/${version}"; - hash = "sha256-tmipHRe6qXoSLNbc0OEKxBJZrmTX3DEiuSfQeWRj1sU="; + hash = "sha256-+TJZ6/JazxzXyKawFE4GVh0De1LTUI95vXQwryJ2NDk="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 661cf394e523..ce9d098082d5 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -7,7 +7,7 @@ , libGL , zlib , openssl -, libyamlcpp +, yaml-cpp , boost , SDL , SDL_image @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp libGLU libGL openssl zlib ]; + buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost yaml-cpp libGLU libGL openssl zlib ]; meta = with lib; { description = "Open source clone of UFO: Enemy Unknown"; diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix new file mode 100644 index 000000000000..d22d7fce171f --- /dev/null +++ b/pkgs/games/osu-lazer/bin.nix @@ -0,0 +1,37 @@ +{ appimageTools, lib, fetchurl }: + +appimageTools.wrapType2 rec { + pname = "osu-lazer-bin"; + version = "2022.1228.0"; + + src = fetchurl { + url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; + sha256 = "sha256-KDJ6HrnGyM6Brtf66C0r+hbSt/stppe+srChtNSoQ9g="; + }; + + extraPkgs = pkgs: with pkgs; [ icu ]; + + extraInstallCommands = + let contents = appimageTools.extract { inherit pname version src; }; + in '' + mv -v $out/bin/${pname}-${version} $out/bin/osu\! + install -m 444 -D ${contents}/osu\!.desktop -t $out/share/applications + for i in 16 32 48 64 96 128 256 512 1024; do + install -D ${contents}/osu\!.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png + done + ''; + + meta = with lib; { + description = "Rhythm is just a *click* away (AppImage version for score submission and multiplayer)"; + homepage = "https://osu.ppy.sh"; + license = with licenses; [ + mit + cc-by-nc-40 + unfreeRedistributable # osu-framework contains libbass.so in repository + ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = [ maintainers.delan ]; + mainProgram = "osu!"; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index cfcb69625d8b..a633bfb9547b 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -10,17 +10,20 @@ , lttng-ust , numactl , dotnetCorePackages +, libglvnd +, xorg +, udev }: buildDotnetModule rec { pname = "osu-lazer"; - version = "2022.1101.0"; + version = "2022.1228.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-o0QHb8ebXKG0OZaYA9P/0OuOiSml3slYQ7gjyuP/ZyY="; + sha256 = "sha256-mFgNNt1+fWDfFZcxtwvoIurAhkCGPCDSXMq/lc8qITo="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; @@ -28,16 +31,24 @@ buildDotnetModule rec { nativeBuildInputs = [ copyDesktopItems ]; - dotnetFlags = [ - "--runtime linux-x64" - ]; - runtimeDeps = [ ffmpeg alsa-lib SDL2 lttng-ust numactl + + # needed to avoid: + # Failed to create SDL window. SDL Error: Could not initialize OpenGL / GLES library + libglvnd + + # needed for the window to actually appear + xorg.libXi + + # needed to avoid in runtime.log: + # [verbose]: SDL error log [debug]: Failed loading udev_device_get_action: /nix/store/*-osu-lazer-*/lib/osu-lazer/runtimes/linux-x64/native/libSDL2.so: undefined symbol: _udev_device_get_action + # [verbose]: SDL error log [debug]: Failed loading libudev.so.1: libudev.so.1: cannot open shared object file: No such file or directory + udev ]; executables = [ "osu!" ]; @@ -66,7 +77,7 @@ buildDotnetModule rec { })]; meta = with lib; { - description = "Rhythm is just a *click* away"; + description = "Rhythm is just a *click* away (no score submission or multiplayer, see osu-lazer-bin)"; homepage = "https://osu.ppy.sh"; license = with licenses; [ mit diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 74f7daec053f..863c830e8081 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -5,7 +5,7 @@ (fetchNuGet { pname = "AutoMapper"; version = "11.0.1"; sha256 = "1z1x5c1dkwk6142km5q6jglhpq9x82alwjjy5a72c8qnq9ppdfg3"; }) (fetchNuGet { pname = "Clowd.Squirrel"; version = "2.9.42"; sha256 = "1xxrr9jmgn343d467nz40569mkybinnmxaxyc4fhgy6yddvzk1y0"; }) (fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; sha256 = "1q78r70pirgb7j5wkh454ws237lihh0fig212cpbj02cz53c2h6j"; }) - (fetchNuGet { pname = "DiscordRichPresence"; version = "1.0.175"; sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) + (fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.1.14"; sha256 = "18adkrddjlci5ajs17ck1c8cd8id3cgjylqvfggyqwrmsh7yr4j6"; }) (fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) (fetchNuGet { pname = "Fody"; version = "6.6.4"; sha256 = "1hhdwj0ska7dvak9hki8cnyfmmw5r8yw8w24gzsdwhqx68dnrvsx"; }) (fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) @@ -61,36 +61,33 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; }) - (fetchNuGet { pname = "managed-midi"; version = "1.9.14"; sha256 = "025jh146zy98699y4civ7nxlkx312lwkl4sr8pha626q7q1kg89h"; }) - (fetchNuGet { pname = "ManagedBass"; version = "3.1.0"; sha256 = "0p4kzpq86h00z7rwzmwxyk1yg627mm5376ssjv1wgqgls0dl7gkh"; }) - (fetchNuGet { pname = "ManagedBass.Fx"; version = "3.1.0"; sha256 = "130rrf6sb64dcq58mr1gigma3pzr7hg5mxn5fbryg375x3vphbs8"; }) - (fetchNuGet { pname = "ManagedBass.Mix"; version = "3.1.0"; sha256 = "1ppxczh1i67k5xicr0q4n0k7zdzghs99wwkcpjmh726hkdsshnib"; }) + (fetchNuGet { pname = "managed-midi"; version = "1.10.0"; sha256 = "1rih8iq8k4j6n3206d2j7z4vygp725kzs95c6yc7p1mlhfiiimvq"; }) (fetchNuGet { pname = "Markdig"; version = "0.23.0"; sha256 = "1bwn885w7balwncmr764vidyyp9bixqlq6r3lhsapj8ykrpxxa70"; }) (fetchNuGet { pname = "MessagePack"; version = "2.4.35"; sha256 = "0y8pz073ync51cv39lxldc797nmcm39r4pdhy2il6r95rppjqg5h"; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.4.35"; sha256 = "1jny2r6rwq7xzwymm779w9x8a5rhyln97mxzplxwd53wwbb0wbzd"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "6.0.9"; sha256 = "1gsa88gln0kqgpk7aday9z94z84sk97n9wrqgvg23yp1faip26rm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "6.0.9"; sha256 = "17ki5jm3cpw70fi9ir0vkcp1a99vll9x3fhkwycvpra2ynssj8bk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "6.0.9"; sha256 = "0a87q0a5z7a1swa8m6aldhymrpira6qfwikxncia2lmj5qb47ikb"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "6.0.9"; sha256 = "091clhbf352rv3rj4z5ykp81s72qdxh74p7bx4rkwxbqa5f23c2j"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "6.0.9"; sha256 = "184nnnz9z7si36iafg8j9yq1w2l7w043cf8bxc7i97jry4zzh5x8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "6.0.9"; sha256 = "17692acx6mq1rwax4kn2khn156y80xhfl5xbbxscc1bmqww2m8zw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "6.0.9"; sha256 = "16qn6z813icj4vch7a9by08riy45v4fjrwqkrgcfbqz36qq5ffpv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "6.0.9"; sha256 = "0fhzswpg6jisd737ij9f6108mr5bmqmsqkvc8j484qkrgcziw33l"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "6.0.9"; sha256 = "15h2dn4lzkplkmwfnf1l5bf5ngj3aibgfajdm1bsls31m7xc3zkh"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "6.0.10"; sha256 = "1wic0bghgwg2r8q676miv3kk7ph5g46kvkw1iljr4b8s58mqbwas"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "6.0.10"; sha256 = "1a8m44qgjwfhmqpfsyyb1hgak3sh99s62hnfmphxsflfvx611mbb"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "6.0.10"; sha256 = "0vqc62xjiwlqwifx3nj0nwssjrdqka2avpqiiwylsbd48s1ahxdy"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "6.0.10"; sha256 = "090ggwxv2j86hkmnzqxa728wpn5g30dfqd05widhd7n1m51igq71"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "6.0.10"; sha256 = "13i22fkai420fvr71c3pfnadspcv8jpf5bci9fn3yh580bfqw21a"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "6.0.10"; sha256 = "0kmy2h310hqpr6bgd128r4q7ny4i7qjfvgrv1swhqv2j9n1yriby"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "6.0.10"; sha256 = "13q429kwbijyfgpb4dp04lr2c691ra5br5wf8g7s260pij10x1nz"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "6.0.10"; sha256 = "068gw5q25yaf5k5c96kswmna1jixpw6s82r7gmgnw54rcc8gdz3f"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "6.0.10"; sha256 = "1k7jvvvz8wwbd1bw1shcgrgz2gw3l877krhw39b9sj2vbwzc8bn7"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.3"; sha256 = "1z6x0d8lpcfjr3sxy25493i17vvcg5bsay6c03qan6mnj5aqzw2k"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "6.0.9"; sha256 = "1453zyq14v9fvfzc39656gb6pazq5gwmqb3r2pni4cy5jdgd9rpi"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "6.0.10"; sha256 = "1sdh5rw2pyg6c64z0haxf57bakd5kwaav624vlqif1m59iz26rag"; }) (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.61701"; sha256 = "1ic1607jj4ln8dbibf1fz5v9svk9x2kqlgvhndc6ijaqnbc4wcr1"; }) (fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "2.0.161401"; sha256 = "02qcm8nv1ch07g8b0i60ynrjn33b8y5ivyk4rxal3vd9zfi6pvwi"; }) + (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.0.3"; sha256 = "020214swxm0hip1d9gjskrzmqzjnji7c6l5b3xcch8vp166066m9"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.1"; sha256 = "0kl5ypidmzllyxb91gwy3z950dc416p1y8wikzbdbp0l7aaaxq2p"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "6.0.9"; sha256 = "0jdh6i9x6byxfwrymm6jcf10g9yjwwl8qbbpjvk7irfpsm5h627i"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.3"; sha256 = "0dpyjp0hy9kkvk2dd4dclfmb10yq5avsw2a6v8nra9g6ii2p1nla"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "6.0.10"; sha256 = "10avgg7c4iggq3i7gba0srd01fip637mmc903ymdpa2c92qgkqr8"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.2"; sha256 = "1wv54f3p3r2zj1pr9a6z8zqrh2ihm6v6qcw2pjwis1lcc0qb472m"; }) @@ -110,10 +107,11 @@ (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "MongoDB.Bson"; version = "2.11.3"; sha256 = "0fn900i51rwgk3ywpcp4dsf7c9v5glch7hia9l9w8aj8s10qjf1r"; }) (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) + (fetchNuGet { pname = "NativeLibraryLoader"; version = "1.0.12"; sha256 = "1nkn5iylxj8i7355cljfvrn3ha7ylf30dh8f63zhybc2vb8hbpkk"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) (fetchNuGet { pname = "NuGet.Common"; version = "5.11.0"; sha256 = "1amf6scr5mcjdvd1fflag6i4qjwmydq5qwp6g3f099n901zq0dr3"; }) (fetchNuGet { pname = "NuGet.Configuration"; version = "5.11.0"; sha256 = "1s9pbrh7xy9jz7npz0sahdsj1cw8gfx1fwf3knv0ms1n0c9bk53l"; }) (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "5.11.0"; sha256 = "0yllxfv8lx1b7zj114mpxw03186q5ynsdvza6llp3wypxp367inr"; }) @@ -129,13 +127,18 @@ (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.0.4"; sha256 = "1zz9afqbaif6sl7gzayl0ww9jhysi4q06jicmx4g35yk82w07vzn"; }) (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.0.4"; sha256 = "0lim2aqw42c1cc73fbbw0h41wcwaxa5d89srzalgg8dpi3bds1mp"; }) (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2022.809.0"; sha256 = "1wpdvd9cmr4kx2hng2img89fhgrl1sg0mws8x97dd84glckqjr82"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.1101.0"; sha256 = "0g9zs628l4cx5gpkkgz07fi02hd22algab23m01hi1z83w1d2nfj"; }) + (fetchNuGet { pname = "ppy.ManagedBass"; version = "2022.1216.0"; sha256 = "19nnj1hq2v21mrplnivjr9c4y3wg4hhfnc062sjgzkmiv1cchvf8"; }) + (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) + (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.1226.0"; sha256 = "1xjhjcbxqbyfqqsy4dmbxwywwjlp4486r9jzf23kplhc5il5x3qx"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.1021.0"; sha256 = "1va7r6hhnixgdf8n555xpms3b83x0i5zzq3ndyfg70zy3jf0ggwp"; }) - (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.192"; sha256 = "0k6nlsxdl6qa5kbn66nbxh5x43hkgpnz8h3zjlbr5siqdjcrvcvg"; }) - (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.611-alpha"; sha256 = "1j8x04747p9sa28y9pmk12bd0p1gf8ndwjd4wl6xd1srsq7rzn43"; }) - (fetchNuGet { pname = "Realm"; version = "10.17.0"; sha256 = "1nc8hjd97mlzsc3h1xdciz2dr9xmxxsif808g92c76k3s79f85n8"; }) - (fetchNuGet { pname = "Realm.Fody"; version = "10.17.0"; sha256 = "1zb0cz79k82lfc69vhz9g717pxnjm1paz5pbv9hhrcb3nghia7k5"; }) + (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2022.1222.1"; sha256 = "1pwwsp4rfzl6166mhrn5lsnyazpckhfh1m6ggf9d1lw2wb58vxfr"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.1221.0"; sha256 = "1hv98hzbzbx4qj1apg7c1vdacaz98q30l8k1n3h6xdqqfn50x8fv"; }) + (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; }) + (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.630-alpha"; sha256 = "0jrf70jrz976b49ac0ygfy9qph2w7fnbfrqv0g0x7hlpaip33ra8"; }) + (fetchNuGet { pname = "Realm"; version = "10.18.0"; sha256 = "0dzwpcqkp8x8zah1bpx8cf01w4j1vi4gvipmaxlxczrc8p0f9zws"; }) + (fetchNuGet { pname = "Realm.Fody"; version = "10.18.0"; sha256 = "1d2y7kz1jp1b11kskgk0fpp6ci17aqkrhzdfq5vcr4y7a8hbi9j5"; }) + (fetchNuGet { pname = "Realm.SourceGenerator"; version = "10.18.0"; sha256 = "10bj3mgxdxgwsnpgbvlpnsj5ha582dvkvjnhb4qk7558g262dia8"; }) (fetchNuGet { pname = "Remotion.Linq"; version = "2.2.0"; sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) @@ -157,6 +160,7 @@ (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"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) @@ -178,10 +182,12 @@ (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Sentry"; version = "3.22.0"; sha256 = "02g96kb21y91rlipnybq1kri3blz36dwsw3z2r25hwiy29lfbax3"; }) + (fetchNuGet { pname = "Sentry"; version = "3.23.1"; sha256 = "0cch803ixx5vqfm2zv5qdkkyksh1184669r1109snbkvvv5qy1g9"; }) (fetchNuGet { pname = "SharpCompress"; version = "0.31.0"; sha256 = "01az7amjkxjbya5rdcqwxzrh2d3kybf1gsd3617rsxvvxadyra1r"; }) (fetchNuGet { pname = "SharpCompress"; version = "0.32.2"; sha256 = "1p198bl08ia89rf4n6yjpacj3yrz6s574snsfl40l8vlqcdrc1pm"; }) (fetchNuGet { pname = "SharpFNT"; version = "2.0.0"; sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; }) + (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.0.0-beta.10"; sha256 = "0yxq0b4m96z71afc7sywfrlwz2pgr5nilacmssjk803v70f0ydr1"; }) + (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.0.0-beta.10"; sha256 = "1qvpphja72x9r3yi96bnmwwy30b1n155v2yy2gzlxjil6qg3xjmb"; }) (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.0"; sha256 = "0lmj3qs39v5jcf2rjwav43nqnc7g6sd4l226l2jw85nidzmpvkwr"; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.2"; sha256 = "07rc4pj3rphi8nhzkcvilnm0fv27qcdp68jdwk4g0zjk7yfvbcay"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.0.6"; sha256 = "1w4iyg0v1v1z2m7akq7rv8lsgixp2m08732vr14vgpqs918bsy1i"; }) @@ -189,6 +195,7 @@ (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.2"; sha256 = "0jn98bkjk8h4smi09z31ib6s6392054lwmkziqmkqf5gf614k2fz"; }) (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.2"; sha256 = "0bnm2fhvcsyg5ry74gal2cziqnyf5a8d2cb491vsa7j41hbbx7kv"; }) (fetchNuGet { pname = "StbiSharp"; version = "1.1.0"; sha256 = "0wbw20m7nyhxj32k153l668sxigamlwig0qpz8l8d0jqz35vizm0"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) @@ -197,7 +204,6 @@ (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) @@ -206,6 +212,7 @@ (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) (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.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) @@ -216,6 +223,7 @@ (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) (fetchNuGet { pname = "System.IO.Packaging"; version = "6.0.0"; sha256 = "112nq0k2jc4vh71rifqqmpjxkaanxfapk7g8947jkfgq3lmfmaac"; }) @@ -231,8 +239,6 @@ (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) @@ -240,16 +246,13 @@ (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"; }) - (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"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.8.1"; sha256 = "17xxl3m99wa4hcpqy42vl8qb1jk2jfq32rj3sfjc1a46hi2si5jj"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) @@ -258,7 +261,6 @@ (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) (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"; }) @@ -268,6 +270,7 @@ (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"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) @@ -290,12 +293,7 @@ (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "5.0.1"; sha256 = "00yg63qnp94q2qryxxggzigi276bibb8b3b96gcvsyrxy7b703n9"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "5.0.2"; sha256 = "0vd0wd29cdhgcjngl9sw391sn2s8xm974y15zvym0whsdgjwiqfx"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "6.0.6"; sha256 = "0bkfrnr9618brbl1gvhyqrf5720syawf9dvpk8xfvkxbg7imlpjx"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) @@ -303,10 +301,19 @@ (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) (fetchNuGet { pname = "TagLibSharp"; version = "2.3.0"; sha256 = "1z7v9lrkss1f8s42sclsq3az9zjihgmhyxnwhjyf0scgk1amngrw"; }) + (fetchNuGet { pname = "Veldrid"; version = "4.9.0-beta2"; sha256 = "1q8b72vsllpny0ga8sfs9rg2nzs6s9yvwhgc1f33m6bggix91yyf"; }) + (fetchNuGet { pname = "Veldrid.MetalBindings"; version = "4.9.0-beta2"; sha256 = "048xqifx2nhl09lzf20qd9wy8x7c0avgvlkzinnbv1fpd4zhp6j1"; }) + (fetchNuGet { pname = "Veldrid.OpenGLBindings"; version = "4.9.0-beta2"; sha256 = "1pfaf5hir26bal679pwswr8gg705ss2wv5yirkj38p9nb6fwm46d"; }) + (fetchNuGet { pname = "Veldrid.SPIRV"; version = "1.0.15"; sha256 = "1imfyy5p98gzb9ixfw64hviahfbrdd8bjr5qn5xf7b514ng84zx0"; }) + (fetchNuGet { pname = "Vk"; version = "1.0.25"; sha256 = "18kx3g088215803yznnmf6621wgwvgakj8hlmrb726b7zwb3x53l"; }) + (fetchNuGet { pname = "Vortice.D3DCompiler"; version = "2.1.0"; sha256 = "1ikw4k40m1vhl6q3v4lacbvmz09prqkk8zz0dms49hxjrpi0gfdh"; }) + (fetchNuGet { pname = "Vortice.Direct3D11"; version = "2.1.0"; sha256 = "05hzmkk32agbk2617yhv3wm1zjkv25w57395an4vkp14rvsz82vf"; }) + (fetchNuGet { pname = "Vortice.DirectX"; version = "2.1.0"; sha256 = "0mv3p7rs2p9rh4vylz24gmiqj0q63rmfa7mjvsqk1j1zlrkyyhlk"; }) + (fetchNuGet { pname = "Vortice.DXGI"; version = "2.1.0"; sha256 = "1d7rmqf7q287w3l7clfvp66kd0giy4n6087n9r8jj0w5r65416ls"; }) + (fetchNuGet { pname = "Vortice.Mathematics"; version = "1.3.24"; sha256 = "1fqni3lhaxddpdz060zbjjhkn5fgg7458ajxfrj3df3wjbld3bc3"; }) ] diff --git a/pkgs/games/otto-matic/default.nix b/pkgs/games/otto-matic/default.nix index 2257b50e0c8d..17b63b263029 100644 --- a/pkgs/games/otto-matic/default.nix +++ b/pkgs/games/otto-matic/default.nix @@ -12,22 +12,23 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ - SDL2 - ]; - nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ + SDL2 + ]; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + installPhase = '' runHook preInstall - mkdir -p $out/share/OttoMatic - mv Data $out/share/OttoMatic - install -Dm755 {.,$out/bin}/OttoMatic - wrapProgram $out/bin/OttoMatic --chdir "$out/share/OttoMatic" + mkdir -p "$out/bin" + mv OttoMatic Data ReadMe.txt "$out/" + makeWrapper $out/OttoMatic $out/bin/OttoMatic --chdir "$out" runHook postInstall ''; @@ -35,9 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A port of Otto Matic, a 2001 Macintosh game by Pangea Software, for modern operating systems"; homepage = "https://github.com/jorio/OttoMatic"; - license = with licenses; [ - cc-by-sa-40 - ]; + license = licenses.cc-by-sa-40; maintainers = with maintainers; [ lux ]; platforms = platforms.linux; }; diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index 7b8733d6213d..66754073db5c 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, bash, jre }: let - mcVersion = "1.19.2"; - buildNum = "131"; + mcVersion = "1.19.3"; + buildNum = "375"; jar = fetchurl { url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar"; - sha256 = "sha256-y7+bByWPc/2KBG/DOX/CFsIQWNboJs68++6Y64lyVt4="; + sha256 = "sha256-NAl4+mCkO6xQQpIx2pd9tYX2N8VQa+2dmFwyBNbDa10="; }; in stdenv.mkDerivation { pname = "papermc"; diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix index 10ce4dd06fcd..7a58cc8e6008 100644 --- a/pkgs/games/performous/default.nix +++ b/pkgs/games/performous/default.nix @@ -2,12 +2,16 @@ , stdenv , fetchFromGitHub , SDL2 +, aubio , boost , cmake , ffmpeg , gettext +, git , glew , glibmm +, glm +, icu , libepoxy , librsvg , libxmlxx @@ -18,16 +22,31 @@ stdenv.mkDerivation rec { pname = "performous"; - version = "1.1"; + version = "1.2.0"; src = fetchFromGitHub { - owner = "performous"; - repo = "performous"; - rev = version; - hash = "sha256-neTHfug2RkcH/ZvAMCJv++IhygGU0L5Ls/jQYjLEQCI="; + owner = pname; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-ueTSirov/lj4/IzaMqHitbOqx8qqUpsTghcb9DUnNEg="; }; - patches = [ ./performous-cmake.patch ]; + cedSrc = fetchFromGitHub { + owner = pname; + repo = "compact_enc_det"; + rev = "9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e"; + hash = "sha256-ztfeblR4YnB5+lb+rwOQJjogl+C9vtPH9IVnYO7oxec="; + }; + + patches = [ + ./performous-cmake.patch + ./performous-fftw.patch + ]; + + postPatch = '' + mkdir ced-src + cp -R ${cedSrc}/* ced-src + ''; nativeBuildInputs = [ cmake @@ -37,10 +56,13 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 + aubio boost ffmpeg glew glibmm + glm + icu libepoxy librsvg libxmlxx @@ -49,9 +71,10 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://performous.org/"; description = "Karaoke, band and dancing game"; + homepage = "https://performous.org/"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ wegank ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/performous/performous-cmake.patch b/pkgs/games/performous/performous-cmake.patch index 59d2cc9a927c..5c1a4c91012b 100644 --- a/pkgs/games/performous/performous-cmake.patch +++ b/pkgs/games/performous/performous-cmake.patch @@ -1,86 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 48af2a89..43786c31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.8) -+cmake_minimum_required(VERSION 3.6) - project(Performous CXX C) +@@ -75,15 +75,7 @@ else() + message(STATUS "Localization disabled: Gettext tools (msgfmt) missing") + endif() - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") ---- a/cmake/Modules/FindPango.cmake -+++ b/cmake/Modules/FindPango.cmake -@@ -2,31 +2,10 @@ - # Once done, this will define - # - # Pango_FOUND - system has Pango --# Pango_INCLUDE_DIRS - the Pango include directories - # Pango_LIBRARIES - link these to use Pango - - include(LibFindMacros) - --# Dependencies --libfind_package(Pango Freetype) --libfind_package(Pango Glib) --libfind_package(Pango GObject) -- --# Use pkg-config to get hints about paths --libfind_pkg_check_modules(Pango_PKGCONF pango) -- --# Include dir --find_path(Pango_INCLUDE_DIR -- NAMES pango/pango.h -- HINTS ${Pango_PKGCONF_INCLUDE_DIRS} -- PATH_SUFFIXES pango-1.0 +-include(FetchContent) +-FetchContent_Declare(ced-sources +- GIT_REPOSITORY https://github.com/performous/compact_enc_det.git +- #https://github.com/google/compact_enc_det.git +- GIT_TAG master +- SOURCE_DIR ced-src -) - --# Finally the library itself --find_library(Pango_LIBRARY -- NAMES pango-1.0 -- HINTS ${Pango_PKGCONF_LIBRARY_DIRS} --) -- -+libfind_pkg_check_modules(Pango_PKGCONF IMPORTED_TARGET pango) -+set(Pango_LIBRARY PkgConfig::Pango_PKGCONF) - libfind_process(Pango) -- ---- a/cmake/Modules/FindPangoCairo.cmake -+++ b/cmake/Modules/FindPangoCairo.cmake -@@ -1,35 +1,11 @@ - # - Try to find PangoCairo - # Once done, this will define - # --# PangoCairo_FOUND - system has Pango --# PangoCairo_INCLUDE_DIRS - the Pango include directories --# PangoCairo_LIBRARIES - link these to use Pango -+# PangoCairo_FOUND - system has PangoCairo -+# PangoCairo_LIBRARIES - link these to use PangoCairo +-FetchContent_MakeAvailable(ced-sources) ++add_subdirectory(ced-src) - include(LibFindMacros) + option(USE_SELF_BUILT_AUBIO "Use custom aubio local build instead of using system lib (if available)" FALSE) --# Dependencies --libfind_package(PangoCairo Pango) --libfind_package(PangoCairo Cairo) -- --# Use pkg-config to get hints about paths --libfind_pkg_check_modules(PangoCairo_PKGCONF pangocairo) -- --# Include dir --find_path(PangoCairo_INCLUDE_DIR -- NAMES pango/pangocairo.h -- HINTS ${PangoCairo_PKGCONF_INCLUDE_DIRS} -- PATH_SUFFIXES pango-1.0 --) -- --# Finally the library itself --find_library(PangoCairo_LIBRARY -- NAMES pangocairo-1.0 -- HINTS ${PangoCairo_PKGCONF_LIBRARY_DIRS} --) -- --# Set the include dir variables and the libraries and let libfind_process do the rest. --# NOTE: Singular variables for this library, plural for libraries this this lib depends on. --set(PangoCairo_PROCESS_INCLUDES PangoCairo_INCLUDE_DIR Pango_INCLUDE_DIR Cairo_INCLUDE_DIR) --set(PangoCairo_PROCESS_LIBS PangoCairo_LIBRARY Pango_LIBRARY Cairo_LIBRARY) -+libfind_pkg_check_modules(PangoCairo_PKGCONF IMPORTED_TARGET pangocairo) -+set(PangoCairo_LIBRARY PkgConfig::PangoCairo_PKGCONF) - libfind_process(PangoCairo) -- diff --git a/pkgs/games/performous/performous-fftw.patch b/pkgs/games/performous/performous-fftw.patch new file mode 100644 index 000000000000..f24808ae80d0 --- /dev/null +++ b/pkgs/games/performous/performous-fftw.patch @@ -0,0 +1,15 @@ +diff --git a/game/audio.cc b/game/audio.cc +index da810488..d7f3d072 100644 +--- a/game/audio.cc ++++ b/game/audio.cc +@@ -121,8 +121,8 @@ Music::Music(Audio::Files const& files, unsigned int sr, bool preview): srate(sr + suppressCenterChannel = config["audio/suppress_center_channel"].b(); + } + +-unsigned Audio::aubio_win_size = 1536; +-unsigned Audio::aubio_hop_size = 768; ++unsigned Audio::aubio_win_size = 2048; ++unsigned Audio::aubio_hop_size = 1024; + + std::unique_ptr Audio::aubioTempo = + std::unique_ptr( diff --git a/pkgs/games/pioneers/default.nix b/pkgs/games/pioneers/default.nix index 9e292da8c98b..f4122dc6bfb7 100644 --- a/pkgs/games/pioneers/default.nix +++ b/pkgs/games/pioneers/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Addicting game based on The Settlers of Catan"; - homepage = "http://pio.sourceforge.net/"; # https does not work + homepage = "https://pio.sourceforge.net/"; # https does not work license = licenses.gpl2Plus; maintainers = with maintainers; [ viric ]; platforms = platforms.linux; diff --git a/pkgs/games/portmod/default.nix b/pkgs/games/portmod/default.nix index 27e00a746486..fe8eff36f053 100644 --- a/pkgs/games/portmod/default.nix +++ b/pkgs/games/portmod/default.nix @@ -1,6 +1,21 @@ -{ lib, callPackage, python3Packages, fetchFromGitLab, cacert -, rustPlatform, bubblewrap, git, perlPackages, imagemagick, fetchurl, fetchzip -, jre, makeWrapper, tr-patcher, tes3cmd, openmw }: +{ lib +, bubblewrap +, cacert +, callPackage +, fetchFromGitLab +, fetchurl +, fetchzip +, git +, imagemagick +, jre +, makeWrapper +, openmw +, perlPackages +, python3Packages +, rustPlatform +, tes3cmd +, tr-patcher +}: let version = "2.1.0"; @@ -9,7 +24,7 @@ let owner = "portmod"; repo = "Portmod"; rev = "v${version}"; - sha256 = "sha256-b/ENApFovMPNUMbJhwY+TZCnSzpr1e/IKJ/5XAGTQjE="; + hash = "sha256-b/ENApFovMPNUMbJhwY+TZCnSzpr1e/IKJ/5XAGTQjE="; }; portmod-rust = rustPlatform.buildRustPackage rec { @@ -18,7 +33,9 @@ let cargoHash = "sha256-3EfMMpSWSYsB3nXaoGGDuKQ9duyCKzbrT6oeATnzqLE="; - nativeBuildInputs = [ python3Packages.python ]; + nativeBuildInputs = [ + python3Packages.python + ]; doCheck = false; }; @@ -56,7 +73,7 @@ python3Packages.buildPythonApplication rec { colorama restrictedpython appdirs - GitPython + gitpython progressbar2 python-sat redbaron @@ -65,7 +82,7 @@ python3Packages.buildPythonApplication rec { fasteners ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ] ++ bin-programs; @@ -94,10 +111,10 @@ python3Packages.buildPythonApplication rec { "--prefix" "PATH" ":" "${lib.makeBinPath bin-programs }") ''; - meta = { + meta = with lib; { description = "mod manager for openMW based on portage"; homepage = "https://gitlab.com/portmod/portmod"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ marius851000 ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix index 3fceefc2d98d..4abd40e24ab0 100644 --- a/pkgs/games/prismlauncher/default.nix +++ b/pkgs/games/prismlauncher/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , jdk8 -, jdk +, jdk17 , zlib , file , wrapQtAppsHook @@ -20,7 +20,7 @@ , tomlplusplus , ghc_filesystem , msaClientID ? "" -, jdks ? [ jdk jdk8 ] +, jdks ? [ jdk17 jdk8 ] }: let @@ -34,16 +34,16 @@ in stdenv.mkDerivation rec { pname = "prismlauncher"; - version = "5.2"; + version = "6.3"; src = fetchFromGitHub { owner = "PrismLauncher"; repo = "PrismLauncher"; rev = version; - sha256 = "sha256-sKAhcbDoRbWf/DuwcBmDjb+VSMM0K2C33gu1K9AlPoQ="; + sha256 = "sha256-7tptHKWkbdxTn6VIPxXE1K3opKRiUW2zv9r6J05dcS8="; }; - nativeBuildInputs = [ extra-cmake-modules cmake file jdk wrapQtAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules cmake file jdk17 wrapQtAppsHook ]; buildInputs = [ qtbase qtsvg diff --git a/pkgs/games/purpur/default.nix b/pkgs/games/purpur/default.nix index 91db55f2a9fd..33ec936dc63d 100644 --- a/pkgs/games/purpur/default.nix +++ b/pkgs/games/purpur/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ jyooru ]; + maintainers = with maintainers; [ joelkoen ]; mainProgram = "minecraft-server"; }; } diff --git a/pkgs/games/qqwing/default.nix b/pkgs/games/qqwing/default.nix index 244a826cb165..81a10b9ea2af 100644 --- a/pkgs/games/qqwing/default.nix +++ b/pkgs/games/qqwing/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://qqwing.com"; description = "Sudoku generating and solving software"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix index 2346e6022d94..0c57c97bbe90 100644 --- a/pkgs/games/quake3/quake3e/default.nix +++ b/pkgs/games/quake3/quake3e/default.nix @@ -47,6 +47,8 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pmiddend ]; - badPlatforms = [ platforms.aarch64 ]; + badPlatforms = platforms.aarch64; + # never built on aarch64-linux since first introduction in nixpkgs + broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index 030532b524d7..51d0528ac933 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "quakespasm"; - version = "0.95.0"; + version = "0.95.1"; src = fetchurl { url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tar.gz"; - sha256 = "sha256-pjXqOyL5ILu0Tx5sfehYXbVsL11Abt9cgZJ4xkkBrnA="; + sha256 = "sha256-hBmEV3s65yQysMiq4zEP4swfCgCCiT5dzZdhg7bSNOI="; }; sourceRoot = "${pname}-${version}/Quake"; @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An engine for iD software's Quake"; - homepage = "http://quakespasm.sourceforge.net/"; + homepage = "https://quakespasm.sourceforge.net/"; longDescription = '' QuakeSpasm is a modern, cross-platform Quake 1 engine based on FitzQuake. It includes support for 64 bit CPUs and custom music playback, a new sound driver, diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index bfd9691fe148..8b63b546cf69 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "vkquake"; - version = "1.20.3"; + version = "1.22.3"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; rev = version; - sha256 = "sha256-ocxXkayWujqAFV5N67VfmzJOUbjCPBZut9zmwNRYDeI="; + sha256 = "sha256-+8DU1QT3Lgqf1AIReVnXQ2Lq6R6eBb8VjdkJfAn/Rtc="; }; sourceRoot = "source/Quake"; diff --git a/pkgs/games/quantumminigolf/default.nix b/pkgs/games/quantumminigolf/default.nix index d0e50a361582..7ecafa5eab65 100644 --- a/pkgs/games/quantumminigolf/default.nix +++ b/pkgs/games/quantumminigolf/default.nix @@ -34,5 +34,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + # never built on aarch64-linux since first introduction in nixpkgs + broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/games/r2mod_cli/default.nix index eb1dd25811aa..3ea7432550fc 100644 --- a/pkgs/games/r2mod_cli/default.nix +++ b/pkgs/games/r2mod_cli/default.nix @@ -8,20 +8,20 @@ stdenv.mkDerivation rec { pname = "r2mod_cli"; - version = "1.2.1"; + version = "1.3.3"; src = fetchFromGitHub { owner = "Foldex"; repo = "r2mod_cli"; rev = "v${version}"; - sha256 = "sha256-FS9P/uTZU4d6zpM3TlEW6i6PLGHxqqO2fc8D7VsPCig="; + sha256 = "sha256-VtJtAyojFOkMLBfpQ6N+8fDDkcJtVCflWjwsdq8OD0w="; }; buildInputs = [ bashInteractive ]; nativeBuildInputs = [ makeWrapper ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; postInstall = '' wrapProgram $out/bin/r2mod --prefix PATH : "${lib.makeBinPath [ jq p7zip ]}"; diff --git a/pkgs/games/rare/default.nix b/pkgs/games/rare/default.nix index fbd3f9512821..68ad3c872605 100644 --- a/pkgs/games/rare/default.nix +++ b/pkgs/games/rare/default.nix @@ -1,15 +1,25 @@ -{ lib, fetchFromGitHub, buildPythonApplication, qt5 -, legendary-gl, pypresence, pyqt5, python, qtawesome, requests, typing-extensions }: +{ lib +, fetchFromGitHub +, buildPythonApplication +, qt5 +, legendary-gl +, pypresence +, pyqt5 +, python +, qtawesome +, requests +, typing-extensions +}: buildPythonApplication rec { pname = "rare"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "Dummerle"; repo = "Rare"; - rev = version; - sha256 = "sha256-M+OMsyamh4WHIx7Pv2sLylOrnSmYrv1aEm3atqXrDaw="; + rev = "refs/tags/${version}"; + sha256 = "sha256-+STwVsDdvjP7HaqmaQVug+6h0n0rw/j4LGQQSNdLVQQ="; }; nativeBuildInputs = [ @@ -25,7 +35,11 @@ buildPythonApplication rec { typing-extensions ]; - patches = [ ./fix-instance.patch ]; + patches = [ + ./fix-instance.patch + # Not able to run pythonRelaxDepsHook because of https://github.com/NixOS/nixpkgs/issues/198342 + ./legendary-gl-version.patch + ]; dontWrapQtApps = true; diff --git a/pkgs/games/rare/legendary-gl-version.patch b/pkgs/games/rare/legendary-gl-version.patch new file mode 100644 index 000000000000..bd7fa1af74f8 --- /dev/null +++ b/pkgs/games/rare/legendary-gl-version.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 2416360..08de818 100644 +--- a/setup.py ++++ b/setup.py +@@ -7,7 +7,7 @@ with open("README.md", "r") as fh: + + requirements = [ + "requests<3.0", +- "legendary-gl==0.20.31", ++ "legendary-gl~=0.20.31", + "setuptools", + "wheel", + "PyQt5", diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 72c8a49939d3..580f0ef2b1dd 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, lib, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU, libGL, boost, - pkg-config, libuuid, openal, ogre, ois, curl, gtk2, mygui, unzip, + pkg-config, libuuid, openal, ogre, ois, curl, gtk3, mygui, unzip, angelscript, ogrepaged, mysocketw, libxcb }: @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { sha256 = "0cb1il7qm45kfhh6h6jwfpxvjlh2dmg8z1yz9kj4d6098myf2lg4"; }; + patches = [ + ./gtk3.patch + ]; + installPhase = '' sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg mkdir -p $out/share/rigsofrods @@ -25,15 +29,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config unzip ]; buildInputs = [ wxGTK30 freeimage zziplib libGLU libGL boost - libuuid openal ogre ois curl gtk2 mygui angelscript + libuuid openal ogre ois curl gtk3 mygui angelscript ogrepaged mysocketw libxcb ]; meta = with lib; { description = "3D simulator game where you can drive, fly and sail various vehicles"; - homepage = "http://rigsofrods.sourceforge.net/"; + homepage = "https://rigsofrods.sourceforge.net/"; license = licenses.gpl3; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; - hydraPlatforms = []; }; } diff --git a/pkgs/games/rigsofrods/gtk3.patch b/pkgs/games/rigsofrods/gtk3.patch new file mode 100644 index 000000000000..e873cfedbaed --- /dev/null +++ b/pkgs/games/rigsofrods/gtk3.patch @@ -0,0 +1,29 @@ +diff --git a/cmake/DependenciesConfig.cmake b/cmake/DependenciesConfig.cmake +index 1bdf93c..4773fca 100644 +--- a/cmake/DependenciesConfig.cmake ++++ b/cmake/DependenciesConfig.cmake +@@ -187,10 +187,8 @@ endmacro(importLib) + + ELSEIF(UNIX) + find_package(PkgConfig) +- PKG_CHECK_MODULES (GTK gtk+-2.0 REQUIRED) +- PKG_CHECK_MODULES (GTK_PIXBUF gdk-pixbuf-2.0 REQUIRED) ++ PKG_CHECK_MODULES (GTK gtk+-3.0 REQUIRED) + include_directories(${GTK_INCLUDE_DIRS}) +- include_directories(${GTK_PIXBUF_INCLUDE_DIRS}) + + # Ogre basics + PKG_CHECK_MODULES (Ogre OGRE REQUIRED) +diff --git a/source/configurator/CMakeLists.txt b/source/configurator/CMakeLists.txt +index 51cc350..7f723b6 100644 +--- a/source/configurator/CMakeLists.txt ++++ b/source/configurator/CMakeLists.txt +@@ -56,7 +56,7 @@ IF(WIN32) + endif(ROR_USE_OPENCL) + ELSEIF(UNIX) + find_package(PkgConfig) +- PKG_CHECK_MODULES (GTK gtk+-2.0 REQUIRED) ++ PKG_CHECK_MODULES (GTK gtk+-3.0 REQUIRED) + INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS}) + + PKG_CHECK_MODULES (Ogre OGRE REQUIRED) diff --git a/pkgs/games/rrootage/default.nix b/pkgs/games/rrootage/default.nix index 6cd5919c4e8f..a5b656a4044a 100644 --- a/pkgs/games/rrootage/default.nix +++ b/pkgs/games/rrootage/default.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Abstract shooter created by Kenta Cho"; - homepage = "http://rrootage.sourceforge.net/"; + homepage = "https://rrootage.sourceforge.net/"; license = licenses.bsd2; maintainers = with maintainers; [ fgaz ]; }; diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix index 75ed66c01e00..6fbe73a6bedf 100644 --- a/pkgs/games/runescape-launcher/default.nix +++ b/pkgs/games/runescape-launcher/default.nix @@ -1,48 +1,69 @@ -{ stdenv, lib, buildFHSUserEnv, dpkg, glibc, gcc-unwrapped, autoPatchelfHook, fetchurl, wrapGAppsHook -, gnome2, xorg -, libSM, libXxf86vm, libX11, glib, pango, cairo, gtk2-x11, zlib, openssl +{ stdenv +, lib +, autoPatchelfHook +, buildFHSUserEnv +, cairo +, dpkg +, fetchurl +, gcc-unwrapped +, glib +, glibc +, gnome2 +, gtk2-x11 +, libGL , libpulseaudio -, SDL2, xorg_sys_opengl, libGL +, libSM +, libXxf86vm +, libX11 +, openssl_1_1 +, pango +, SDL2 +, wrapGAppsHook +, xdg-utils +, xorg +, xorg_sys_opengl +, zlib }: let runescape = stdenv.mkDerivation rec { pname = "runescape-launcher"; - version = "2.2.9"; + version = "2.2.10"; # Packages: https://content.runescape.com/downloads/ubuntu/dists/trusty/non-free/binary-amd64/Packages # upstream is https://content.runescape.com/downloads/ubuntu/pool/non-free/r/${pname}/${pname}_${version}_amd64.deb src = fetchurl { url = "https://archive.org/download/${pname}_${version}_amd64/${pname}_${version}_amd64.deb"; - sha256 = "1zilpxh8k8baylbl9nqq9kgjiv2xzw4lizbgcmzky5rhmych8n4g"; + sha256 = "1v96vjiblphhbqhpp3m7wbvdvcnp76ncdlf4pdcr2z1dz8nh6shg"; }; nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook dpkg + wrapGAppsHook ]; buildInputs = [ - glibc + cairo gcc-unwrapped + glib + glibc + gtk2-x11 libSM libXxf86vm libX11 - glib + openssl_1_1 pango - cairo - gtk2-x11 zlib - openssl ]; runtimeDependencies = [ - libpulseaudio libGL + libpulseaudio SDL2 + openssl_1_1 + xdg-utils # The launcher uses `xdg-open` to open HTTP URLs in the user's browser xorg_sys_opengl - openssl zlib ]; @@ -95,11 +116,24 @@ in name = "RuneScape"; targetPkgs = pkgs: [ runescape - dpkg glibc gcc-unwrapped - libSM libXxf86vm libX11 glib pango cairo gtk2-x11 zlib openssl + cairo + dpkg + gcc-unwrapped + glib + glibc + gtk2-x11 + libGL libpulseaudio + libSM + libXxf86vm + libX11 + openssl_1_1 + pango + SDL2 + xdg-utils xorg.libX11 - SDL2 xorg_sys_opengl libGL + xorg_sys_opengl + zlib ]; multiPkgs = pkgs: [ libGL ]; runScript = "runescape-launcher"; diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index 4711ffa2f549..63ffa4999e05 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -73,7 +73,7 @@ tcl.mkTclDerivation rec { meta = with lib; { description = "Chess database with play and training functionality"; - homepage = "http://scidvspc.sourceforge.net/"; + homepage = "https://scidvspc.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = [ maintainers.paraseba ]; platforms = lib.platforms.linux; diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix index a1955e9cced0..792909f856f3 100644 --- a/pkgs/games/scid/default.nix +++ b/pkgs/games/scid/default.nix @@ -53,7 +53,7 @@ tcl.mkTclDerivation { meta = { description = "Chess database with play and training functionality"; maintainers = with lib.maintainers; [ agbrooks ]; - homepage = "http://scid.sourceforge.net/"; + homepage = "https://scid.sourceforge.net/"; license = lib.licenses.gpl2; }; } diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 8de6206ecd08..440b30664d13 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,15 +1,17 @@ -{ lib, stdenv, fetchurl, nasm -, alsa-lib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU, libGL, SDL2, zlib +{ lib, stdenv, fetchFromGitHub, nasm +, alsa-lib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libtheora, libvorbis, libGLU, libGL, SDL2, zlib , Cocoa, AudioToolbox, Carbon, CoreMIDI, AudioUnit, cctools }: stdenv.mkDerivation rec { pname = "scummvm"; - version = "2.5.1"; + version = "2.6.1"; - src = fetchurl { - url = "http://scummvm.org/frs/scummvm/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-n9jbOORFYUS/jDTazffyBOdfGOjkSOwBzgjOgmoDXwE="; + src = fetchFromGitHub { + owner = "scummvm"; + repo = "scummvm"; + rev = "v${version}"; + hash = "sha256-fqMMdHBVcXLsBDWxXH9UKXwfvlyIVbRsIPmrYqPGQ+g="; }; nativeBuildInputs = [ nasm ]; @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ Cocoa AudioToolbox Carbon CoreMIDI AudioUnit ] ++ [ - curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libvorbis libGLU libGL SDL2 zlib + curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libtheora libvorbis libGLU libGL SDL2 zlib ]; dontDisableStatic = true; @@ -28,7 +30,6 @@ stdenv.mkDerivation rec { configurePlatforms = [ "host" ]; configureFlags = [ - "--enable-c++11" "--enable-release" ]; @@ -36,7 +37,9 @@ stdenv.mkDerivation rec { postConfigure = '' sed -i "s/-c -s/-c -s --strip-program=''${STRIP@Q}/" ports.mk '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace config.mk --replace x86_64-apple-darwin-ranlib ${cctools}/bin/ranlib + substituteInPlace config.mk \ + --replace x86_64-apple-darwin-ranlib ${cctools}/bin/ranlib \ + --replace aarch64-apple-darwin-ranlib ${cctools}/bin/ranlib ''; meta = with lib; { diff --git a/pkgs/games/shticker-book-unwritten/default.nix b/pkgs/games/shticker-book-unwritten/default.nix index 651481a5a0db..aa02087a75aa 100644 --- a/pkgs/games/shticker-book-unwritten/default.nix +++ b/pkgs/games/shticker-book-unwritten/default.nix @@ -1,9 +1,7 @@ -{ buildFHSUserEnv, callPackage, lib, openssl }: +{ buildFHSUserEnv, callPackage, lib }: let - shticker-book-unwritten-unwrapped = callPackage ./unwrapped.nix { - inherit openssl; - }; + shticker-book-unwritten-unwrapped = callPackage ./unwrapped.nix { }; in buildFHSUserEnv { name = "shticker_book_unwritten"; diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix index 37138f152b6a..c6f8db0ea9e7 100644 --- a/pkgs/games/sienna/default.nix +++ b/pkgs/games/sienna/default.nix @@ -1,11 +1,12 @@ -{ lib, stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: +{ lib, stdenv, fetchurl, love, makeWrapper, makeDesktopItem, copyDesktopItems }: stdenv.mkDerivation rec { pname = "sienna"; - version = "1.0c"; + version = "1.0d"; + src = fetchurl { url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-${version}.love"; - sha256 = "1x15276fhqspgrrv8fzkp032i2qa8piywc0yy061x59mxhdndzj6"; + sha256 = "sha256-1bFjhN7jL/PMYMJH1ete6uyHTYsTGgoP60sf/sJTLlU="; }; icon = fetchurl { @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "12q2rhk39dmb6ir50zafn8dylaad5gns8z3y21mfjabc5l5g02nn"; }; - desktopItem = makeDesktopItem { + desktopItems = [ (makeDesktopItem { name = "sienna"; exec = pname; icon = icon; @@ -21,33 +22,29 @@ stdenv.mkDerivation rec { desktopName = "Sienna"; genericName = "sienna"; categories = [ "Game" ]; - }; + }) ]; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ lua love ]; + nativeBuildInputs = [ makeWrapper copyDesktopItems ]; dontUnpack = true; - installPhase = - '' + installPhase = '' + runHook preInstall mkdir -p $out/bin mkdir -p $out/share/games/lovegames cp -v $src $out/share/games/lovegames/${pname}.love makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love - - chmod +x $out/bin/${pname} - mkdir -p $out/share/applications - ln -s ${desktopItem}/share/applications/* $out/share/applications/ + runHook postInstall ''; meta = with lib; { description = "Fast-paced one button platformer"; + homepage = "https://tangramgames.dk/games/sienna"; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; license = licenses.free; - downloadPage = "http://tangramgames.dk/games/sienna"; }; } diff --git a/pkgs/games/sm64ex/coop.nix b/pkgs/games/sm64ex/coop.nix new file mode 100644 index 000000000000..9e34e184adb7 --- /dev/null +++ b/pkgs/games/sm64ex/coop.nix @@ -0,0 +1,41 @@ +{ callPackage +, fetchFromGitHub +, autoPatchelfHook +, zlib +, stdenvNoCC +}: + +callPackage ./generic.nix { + pname = "sm64ex-coop"; + version = "0.pre+date=2022-08-05"; + + src = fetchFromGitHub { + owner = "djoslin0"; + repo = "sm64ex-coop"; + rev = "68634493de4cdd9db263e0f4f0b9b6772a60d30a"; + sha256 = "sha256-3Ve93WGyBd8SAA0TBrpIrhj+ernjn1q7qXSi9mp36cQ="; + }; + + extraNativeBuildInputs = [ + autoPatchelfHook + ]; + + extraBuildInputs = [ + zlib + ]; + + postInstall = + let + sharedLib = stdenvNoCC.hostPlatform.extensions.sharedLibrary; + in + '' + mkdir -p $out/lib + cp $src/lib/bass/libbass{,_fx}${sharedLib} $out/lib + cp $src/lib/discordsdk/libdiscord_game_sdk${sharedLib} $out/lib + ''; + + extraMeta = { + homepage = "https://github.com/djoslin0/sm64ex-coop"; + description = "Super Mario 64 online co-op mod, forked from sm64ex"; + }; +} diff --git a/pkgs/games/sm64ex/default.nix b/pkgs/games/sm64ex/default.nix index a6bf7202adcf..17fcfdd131ac 100644 --- a/pkgs/games/sm64ex/default.nix +++ b/pkgs/games/sm64ex/default.nix @@ -1,55 +1,9 @@ -{ lib -, stdenv -, fetchFromGitHub -, callPackage -, autoPatchelfHook +{ callPackage , branch }: { - sm64ex = callPackage ./generic.nix { - pname = "sm64ex"; - version = "0.pre+date=2021-11-30"; + sm64ex = callPackage ./sm64ex.nix { }; - src = fetchFromGitHub { - owner = "sm64pc"; - repo = "sm64ex"; - rev = "db9a6345baa5acb41f9d77c480510442cab26025"; - sha256 = "sha256-q7JWDvNeNrDpcKVtIGqB1k7I0FveYwrfqu7ZZK7T8F8="; - }; - - extraMeta = { - homepage = "https://github.com/sm64pc/sm64ex"; - description = "Super Mario 64 port based off of decompilation"; - }; - }; - - sm64ex-coop = callPackage ./generic.nix { - pname = "sm64ex-coop"; - version = "0.pre+date=2022-05-14"; - - src = fetchFromGitHub { - owner = "djoslin0"; - repo = "sm64ex-coop"; - rev = "8200b175607fe2939f067d496627c202a15fe24c"; - sha256 = "sha256-c1ZmMBtvYYcaJ/WxkZBVvNGVCeSXfm8NKe/BiAIJtks="; - }; - - extraNativeBuildInputs = [ - autoPatchelfHook - ]; - - postInstall = let - sharedLib = stdenv.hostPlatform.extensions.sharedLibrary; - in '' - mkdir -p $out/lib - cp $src/lib/bass/libbass{,_fx}${sharedLib} $out/lib - cp $src/lib/discordsdk/libdiscord_game_sdk${sharedLib} $out/lib - ''; - - extraMeta = { - homepage = "https://github.com/djoslin0/sm64ex-coop"; - description = "Super Mario 64 online co-op mod, forked from sm64ex"; - }; - }; + sm64ex-coop = callPackage ./coop.nix { }; }.${branch} diff --git a/pkgs/games/sm64ex/generic.nix b/pkgs/games/sm64ex/generic.nix index ab75ac70b9c5..95ba3be4a569 100644 --- a/pkgs/games/sm64ex/generic.nix +++ b/pkgs/games/sm64ex/generic.nix @@ -2,7 +2,8 @@ , version , src , extraNativeBuildInputs ? [ ] -, extraMeta ? {} +, extraBuildInputs ? [ ] +, extraMeta ? { } , compileFlags ? [ ] , postInstall ? "" , region ? "us" @@ -44,7 +45,7 @@ stdenv.mkDerivation rec { buildInputs = [ audiofile SDL2 - ]; + ] ++ extraBuildInputs; enableParallelBuilding = true; diff --git a/pkgs/games/sm64ex/sm64ex.nix b/pkgs/games/sm64ex/sm64ex.nix new file mode 100644 index 000000000000..66c84dd0b13c --- /dev/null +++ b/pkgs/games/sm64ex/sm64ex.nix @@ -0,0 +1,21 @@ +{ callPackage +, fetchFromGitHub +}: + +callPackage ./generic.nix { + pname = "sm64ex"; + version = "0.pre+date=2021-11-30"; + + src = fetchFromGitHub { + owner = "sm64pc"; + repo = "sm64ex"; + rev = "db9a6345baa5acb41f9d77c480510442cab26025"; + sha256 = "sha256-q7JWDvNeNrDpcKVtIGqB1k7I0FveYwrfqu7ZZK7T8F8="; + }; + + extraMeta = { + homepage = "https://github.com/sm64pc/sm64ex"; + description = "Super Mario 64 port based off of decompilation"; + }; +} + diff --git a/pkgs/games/solicurses/default.nix b/pkgs/games/solicurses/default.nix index 2a296b525f52..3b0a60cb1e81 100644 --- a/pkgs/games/solicurses/default.nix +++ b/pkgs/games/solicurses/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation { cd build ''; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}c++" + ]; + installPhase = '' install -D SoliCurses.out $out/bin/solicurses ''; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index d06e3c1aa158..a44c3d670558 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game - TORCS fork with more experimental approach"; - homepage = "http://speed-dreams.sourceforge.net/"; + homepage = "https://speed-dreams.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index f8b05bd97091..8577db773e3f 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,64 +1,91 @@ -{ lib, stdenv, fetchFromGitHub, cmake, xz, boost, libdevil, zlib, p7zip -, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU, libGL -, asciidoc, docbook_xsl, docbook_xsl_ns, curl, makeWrapper -, jdk ? null, python ? null, systemd, libunwind, which, minizip +{ lib +, stdenv +, asciidoc +, boost +, cmake +, curl +, docbook_xsl +, docbook_xsl_ns +, fetchurl +, freetype +, glew +, jdk +, libdevil +, libGL +, libGLU +, libunwind +, libvorbis +, makeWrapper +, minizip +, openal +, p7zip +, python3 +, SDL2 +, xorg +, xz +, zlib , withAI ? true # support for AI Interfaces and Skirmish AIs }: stdenv.mkDerivation rec { pname = "spring"; - version = "105.0.1-${buildId}-g${shortRev}"; - # usually the latest in https://github.com/spring/spring/commits/maintenance - rev = "8581792eac65e07cbed182ccb1e90424ce3bd8fc"; - shortRev = builtins.substring 0 7 rev; - buildId = "1486"; + version = "106.0"; - # taken from https://github.com/spring/spring/commits/maintenance - src = fetchFromGitHub { - owner = "spring"; - repo = pname; - inherit rev; - sha256 = "05lvd8grqmv7vl8rrx02rhl0qhmm58dyi6s78b64j3fkia4sfj1r"; - fetchSubmodules = true; + src = fetchurl { + url = "https://springrts.com/dl/buildbot/default/master/${version}/source/spring_${version}_src.tar.gz"; + sha256 = "sha256-mSA4ioIv68NMEB72lYnwDb1QOuWr1VHwu4+grAoHlV0="; }; - # The cmake included module correcly finds nix's glew, however - # it has to be the bundled FindGLEW for headless or dedicated builds - prePatch = '' + postPatch = '' + patchShebangs . + substituteInPlace ./rts/build/cmake/FindAsciiDoc.cmake \ --replace "PATHS /usr /usr/share /usr/local /usr/local/share" "PATHS ${docbook_xsl}"\ --replace "xsl/docbook/manpages" "share/xml/docbook-xsl/manpages" - substituteInPlace ./rts/Rendering/GL/myGL.cpp \ - --replace "static constexpr const GLubyte* qcriProcName" "static const GLubyte* qcriProcName" - patchShebangs . - rm rts/build/cmake/FindGLEW.cmake - echo "${version} maintenance" > VERSION + # The cmake included module correcly finds nix's glew, however + # it has to be the bundled FindGLEW for headless or dedicated builds + rm rts/build/cmake/FindGLEW.cmake ''; - cmakeFlags = ["-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON" - "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON" - "-DPREFER_STATIC_LIBS:BOOL=OFF"]; + cmakeFlags = [ + "-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON" + "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON" + "-DPREFER_STATIC_LIBS:BOOL=OFF" + ]; nativeBuildInputs = [ cmake makeWrapper docbook_xsl docbook_xsl_ns asciidoc ]; - buildInputs = [ xz boost libdevil zlib p7zip openal libvorbis freetype SDL2 - xorg.libX11 xorg.libXcursor libGLU libGL glew curl - systemd libunwind which minizip ] - ++ lib.optional withAI jdk - ++ lib.optional withAI python; - - NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility + buildInputs = [ + boost + curl + freetype + glew + libdevil + libGL + libGLU + libunwind + libvorbis + minizip + openal + p7zip + SDL2 + xorg.libX11 + xorg.libXcursor + xz + zlib + ] + ++ lib.optionals withAI [ python3 jdk ]; postInstall = '' wrapProgram "$out/bin/spring" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc systemd ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" ''; meta = with lib; { homepage = "https://springrts.com/"; description = "A powerful real-time strategy (RTS) game engine"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ qknight domenkozar sorki ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 55c61c4cbd82..ab792cf41a49 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -1,29 +1,58 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkg-config, curl, libtorrent-rasterbar -, libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring -, makeWrapper, glib, minizip, alure, pcre, jsoncpp }: +{ lib +, stdenv +, fetchurl +, cmake +, wxGTK32 +, openal +, pkg-config +, curl +, libtorrent-rasterbar +, libpng +, libX11 +, gettext +, boost +, libnotify +, gtk3 +, doxygen +, spring +, makeWrapper +, glib +, minizip +, alure +, pcre +, jsoncpp +}: stdenv.mkDerivation rec { pname = "springlobby"; - version = "0.270"; + version = "0.273"; src = fetchurl { url = "https://springlobby.springrts.com/dl/stable/springlobby-${version}.tar.bz2"; - sha256 = "1r1g2hw9ipsmsmzbhsi7bxqra1za6x7j1kw12qzl5psqyq8rqbgs"; + sha256 = "sha256-XkU6i6ABCgw3H9vJu0xjHRO1BglueYM1LyJxcZdOrDk="; }; nativeBuildInputs = [ cmake pkg-config gettext doxygen makeWrapper ]; buildInputs = [ - wxGTK30 openal curl libtorrent-rasterbar pcre jsoncpp - boost libpng libX11 libnotify gtk2 glib minizip alure + wxGTK32 + openal + curl + libtorrent-rasterbar + pcre + jsoncpp + boost + libpng + libX11 + libnotify + gtk3 + glib + minizip + alure ]; patches = [ ./revert_58b423e.patch # Allows springLobby to continue using system installed spring until #707 is fixed ./fix-certs.patch - (fetchpatch { - url = "https://github.com/springlobby/springlobby/commit/252c4cb156c1442ed9b4faec3f26265bc7c295ff.patch"; - sha256 = "sha256-Nq1F5fRPnCkZwl9KgrfuUmpIMK3hUOyZQYIKElWpmzU="; - }) ]; postInstall = '' @@ -33,10 +62,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://springlobby.info/"; + homepage = "https://springlobby.springrts.com"; description = "Cross-platform lobby client for the Spring RTS project"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ qknight domenkozar ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/games/starsector/default.nix b/pkgs/games/starsector/default.nix index bbc781d6ab27..ed995e4a5e64 100644 --- a/pkgs/games/starsector/default.nix +++ b/pkgs/games/starsector/default.nix @@ -41,20 +41,20 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/bin + mkdir -p $out/bin $out/share/starsector rm -r jre_linux # remove bundled jre7 rm starfarer.api.zip - cp -r ./* $out + cp -r ./* $out/share/starsector mkdir -p $out/share/icons/hicolor/64x64/apps ln -s $out/graphics/ui/s_icon64.png $out/share/icons/hicolor/64x64/apps/starsector.png - wrapProgram $out/starsector.sh \ + wrapProgram $out/share/starsector/starsector.sh \ --prefix PATH : ${lib.makeBinPath [ openjdk ]} \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs} \ --run 'mkdir -p ''${XDG_DATA_HOME:-~/.local/share}/starsector' \ - --chdir "$out" - ln -s $out/starsector.sh $out/bin/starsector + --chdir "$out/share/starsector" + ln -s $out/share/starsector/starsector.sh $out/bin/starsector runHook postInstall ''; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace starsector.sh \ --replace "./jre_linux/bin/java" "${openjdk}/bin/java" \ - --replace "./native/linux" "$out/native/linux" \ + --replace "./native/linux" "$out/share/starsector/native/linux" \ --replace "=." "=\''${XDG_DATA_HOME:-\$HOME/.local/share}/starsector" \ --replace "-XX:+CompilerThreadHintNoPreempt" "-XX:+UnlockDiagnosticVMOptions -XX:-BytecodeVerificationRemote -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSConcurrentMTEnabled -XX:+DisableExplicitGC" ''; diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 395980e8ee6f..9dfb239620e4 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -1,5 +1,4 @@ -{ lib, newScope, splicePackages, steamPackagesAttr ? "steamPackages" -, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget +{ makeScopeWithSplicing, generateSplicesForMkScope , stdenv, buildFHSUserEnv, pkgsi686Linux }: @@ -18,19 +17,12 @@ let glxinfo-i686 = pkgsi686Linux.glxinfo; steam-runtime-wrapped-i686 = if self.steamArch == "amd64" - then pkgsi686Linux.${steamPackagesAttr}.steam-runtime-wrapped + then pkgsi686Linux.steamPackages.steam-runtime-wrapped else null; inherit buildFHSUserEnv; }; steamcmd = callPackage ./steamcmd.nix { }; }; - otherSplices = { - selfBuildBuild = pkgsBuildBuild.${steamPackagesAttr}; - selfBuildHost = pkgsBuildHost.${steamPackagesAttr}; - selfBuildTarget = pkgsBuildTarget.${steamPackagesAttr}; - selfHostHost = pkgsHostHost.${steamPackagesAttr}; - selfTargetTarget = pkgsTargetTarget.${steamPackagesAttr} or {}; # might be missing; - }; keep = self: { }; extra = spliced0: { }; -in lib.makeScopeWithSplicing splicePackages newScope otherSplices keep extra steamPackagesFun +in makeScopeWithSplicing (generateSplicesForMkScope "steamPackages") keep extra steamPackagesFun diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index ea9db37cbddf..614d9823f9ff 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -97,6 +97,7 @@ in buildFHSUserEnv rec { libdrm libxkbcommon # paradox launcher libvorbis # Dead Cells + libxcrypt # Alien Isolation, XCOM 2, Company of Heroes 2 mono xorg.xkeyboardconfig xorg.libpciaccess diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index c7f8f0d7a27f..2445ee9096c9 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -42,5 +42,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.mit; # expat version maintainers = [ ]; + # never built on aarch64-linux since first introduction in nixpkgs + broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index b0a49cc77d1f..e12c19f6cb6a 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,6 +1,8 @@ { fetchFromGitHub, lib, stdenv, cmake, pkg-config, python3, alsa-lib , libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack, icoutils , nixosTests +, Carbon +, Cocoa }: stdenv.mkDerivation rec { @@ -15,26 +17,57 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Can't use fetchpatch or fetchpatch2 because of https://github.com/NixOS/nixpkgs/issues/32084 + # Using fetchurl instead is also not a good idea, see https://github.com/NixOS/nixpkgs/issues/32084#issuecomment-727223713 + ./rename-VERSION-to-VERSION.txt.patch + ]; + postPatch = '' # set compiled-in DATA_DIR so resources can be found substituteInPlace src/engine/shared/storage.cpp \ --replace '#define DATA_DIR "data"' \ '#define DATA_DIR "${placeholder "out"}/share/teeworlds/data"' + + # Quote nonsense is a workaround for https://github.com/NixOS/nix/issues/661 + substituteInPlace 'other/bundle/client/Info.plist.in' \ + --replace ${"'"}''${TARGET_CLIENT}' 'teeworlds' \ + --replace ${"'"}''${PROJECT_VERSION}' '${version}' ''; - nativeBuildInputs = [ cmake pkg-config icoutils ]; - - buildInputs = [ - python3 alsa-lib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optionals stdenv.isLinux [ + icoutils ]; - postInstall = '' + buildInputs = [ + python3 libGLU SDL2 lua5_3 zlib freetype wavpack + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + libX11 + ] ++ lib.optionals stdenv.isDarwin [ + Carbon + Cocoa + ]; + + postInstall = lib.optionalString stdenv.isLinux '' # Convert and install desktop icon mkdir -p $out/share/pixmaps icotool --extract --index 1 --output $out/share/pixmaps/teeworlds.png $src/other/icons/teeworlds.ico # Install menu item install -D $src/other/teeworlds.desktop $out/share/applications/teeworlds.desktop + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p "$out/Applications/teeworlds.app/Contents/MacOS" + mkdir -p "$out/Applications/teeworlds.app/Contents/Resources" + + cp '../other/icons/teeworlds.icns' "$out/Applications/teeworlds.app/Contents/Resources/" + cp '../other/bundle/client/Info.plist.in' "$out/Applications/teeworlds.app/Contents/Info.plist" + cp '../other/bundle/client/PkgInfo' "$out/Applications/teeworlds.app/Contents/" + ln -s "$out/bin/teeworlds" "$out/Applications/teeworlds.app/Contents/MacOS/" + ln -s "$out/share/teeworlds/data" "$out/Applications/teeworlds.app/Contents/Resources/data" ''; passthru.tests.teeworlds = nixosTests.teeworlds; @@ -51,7 +84,7 @@ stdenv.mkDerivation rec { homepage = "https://teeworlds.com/"; license = "BSD-style, see `license.txt'"; - maintainers = with lib.maintainers; [ astsmtl ]; - platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ astsmtl Luflosi ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/games/teeworlds/rename-VERSION-to-VERSION.txt.patch b/pkgs/games/teeworlds/rename-VERSION-to-VERSION.txt.patch new file mode 100644 index 000000000000..4d56286cb40a --- /dev/null +++ b/pkgs/games/teeworlds/rename-VERSION-to-VERSION.txt.patch @@ -0,0 +1,33 @@ +From 86d6687ef07f7f05457a7f67537b650656b13820 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert=20M=C3=BCller?= +Date: Fri, 15 Oct 2021 23:45:50 +0200 +Subject: [PATCH] rename VERSION to VERSION.txt: + +Fixes compilation on systems with case insensitive file names where the standard library includes the version file source code. +--- + src/engine/external/json-parser/{VERSION => VERSION.txt} | 0 + src/engine/external/pnglite/{VERSION => VERSION.txt} | 0 + src/engine/external/wavpack/{VERSION => VERSION.txt} | 0 + src/engine/external/zlib/{VERSION => VERSION.txt} | 0 + 4 files changed, 0 insertions(+), 0 deletions(-) + rename src/engine/external/json-parser/{VERSION => VERSION.txt} (100%) + rename src/engine/external/pnglite/{VERSION => VERSION.txt} (100%) + rename src/engine/external/wavpack/{VERSION => VERSION.txt} (100%) + rename src/engine/external/zlib/{VERSION => VERSION.txt} (100%) + +diff --git a/src/engine/external/json-parser/VERSION b/src/engine/external/json-parser/VERSION.txt +similarity index 100% +rename from src/engine/external/json-parser/VERSION +rename to src/engine/external/json-parser/VERSION.txt +diff --git a/src/engine/external/pnglite/VERSION b/src/engine/external/pnglite/VERSION.txt +similarity index 100% +rename from src/engine/external/pnglite/VERSION +rename to src/engine/external/pnglite/VERSION.txt +diff --git a/src/engine/external/wavpack/VERSION b/src/engine/external/wavpack/VERSION.txt +similarity index 100% +rename from src/engine/external/wavpack/VERSION +rename to src/engine/external/wavpack/VERSION.txt +diff --git a/src/engine/external/zlib/VERSION b/src/engine/external/zlib/VERSION.txt +similarity index 100% +rename from src/engine/external/zlib/VERSION +rename to src/engine/external/zlib/VERSION.txt diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix index 809ed7a146d0..e5b2b358f329 100644 --- a/pkgs/games/tennix/default.nix +++ b/pkgs/games/tennix/default.nix @@ -1,20 +1,21 @@ -{lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python2 } : +{ lib, stdenv, fetchgit, which, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python3 } : stdenv.mkDerivation rec { pname = "tennix"; - version = "1.1"; - src = fetchurl { - url = "https://icculus.org/tennix/downloads/tennix-${version}.tar.gz"; - sha256 = "0np5kw1y7i0z0dsqx4r2nvmq86qj8hv3mmgavm3hxraqnds5z8cm"; + version = "1.3.1"; + + src = fetchgit { + url = "git://repo.or.cz/tennix.git"; + rev = "refs/tags/tennix-${version}"; + sha256 = "sha256-U5+S1jEeg+7gdM1++dln6ePTqxZu2Zt0oUrH3DIlkgk="; }; - buildInputs = [ python2 SDL SDL_mixer SDL_image SDL_ttf SDL_net ]; + nativeBuildInputs = [ which ]; - patches = [ ./fix_FTBFS.patch ]; + buildInputs = [ python3 SDL SDL_mixer SDL_image SDL_ttf SDL_net ]; - preConfigure = '' - makeFlags="PREFIX=$out" - installFlags="PREFIX=$out install" + configurePhase = '' + ./configure --prefix $out ''; meta = with lib; { diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 2b63fcca45fc..104633198995 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "terraria-server"; version = "1.4.4.9"; - urlVersion = lib.replaceChars [ "." ] [ "" ] version; + urlVersion = lib.replaceStrings [ "." ] [ "" ] version; src = fetchurl { url = "https://terraria.org/api/download/pc-dedicated-server/terraria-server-${urlVersion}.zip"; diff --git a/pkgs/games/tetrio-desktop/tetrio-plus.nix b/pkgs/games/tetrio-desktop/tetrio-plus.nix index e8daf4d0fbe9..04e2f4673a5c 100644 --- a/pkgs/games/tetrio-desktop/tetrio-plus.nix +++ b/pkgs/games/tetrio-desktop/tetrio-plus.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tetrio-plus"; - version = "0.23.13"; + version = "0.25.2"; src = fetchzip { - url = "https://gitlab.com/UniQMG/tetrio-plus/uploads/a9647feffc484304ee49c4d3fd4ce718/tetrio-plus_0.23.13_app.asar.zip"; - sha256 = "sha256-NSOVZjm4hDXH3f0gFG8ijLmdUTyMRFYGhxpwysoYIVg="; + url = "https://gitlab.com/UniQMG/tetrio-plus/uploads/5c720489d2bcd35629b4f8a1f36d28b1/tetrio-plus_0.25.2_app.asar.zip"; + sha256 = "sha256-8Xc2wftRYIMZ2ee67IJEIGGrAAS02CL0XzDqQ/luYVE="; }; installPhase = '' diff --git a/pkgs/games/the-legend-of-edgar/default.nix b/pkgs/games/the-legend-of-edgar/default.nix index d099bbf2a420..1efc1c13554c 100644 --- a/pkgs/games/the-legend-of-edgar/default.nix +++ b/pkgs/games/the-legend-of-edgar/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { pname = "the-legend-of-edgar"; - version = "1.35"; + version = "1.36"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "riksweeney"; repo = "edgar"; rev = version; - hash = "sha256-ojy4nEW9KiSte/AoFUMPrKCxvIeQpMVIL4ileHiBydo="; + hash = "sha256-u2mg4hpcjPXzuZjYKIC4lgqGJPFRB9baHvaiu/YafZw="; }; nativeBuildInputs = [ diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index 7add5af64fc7..e8917e2c5816 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "tintin"; - version = "2.02.20"; + version = "2.02.30"; src = fetchFromGitHub { owner = "scandum"; repo = "tintin"; rev = version; - hash = "sha256-H9Cjg/GkyV50pgewv77zOJ8/Op78P9sQmZ5LorO4L+A="; + hash = "sha256-zZ7bajZURMuaTn7vhN5DF2HUfNVlDWnp71FXPCbidnM="; }; buildInputs = [ zlib pcre gnutls ] diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/games/tinyfugue/default.nix index e75d2f12b945..46a5aae09ef3 100644 --- a/pkgs/games/tinyfugue/default.nix +++ b/pkgs/games/tinyfugue/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="-fcommon"; meta = { - homepage = "http://tinyfugue.sourceforge.net/"; + homepage = "https://tinyfugue.sourceforge.net/"; description = "A terminal UI, screen-oriented MUD client"; longDescription = '' TinyFugue, aka "tf", is a flexible, screen-oriented MUD client, for use diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index e3ec82b549ae..4764db4413ed 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; - homepage = "http://torcs.sourceforge.net/"; + homepage = "https://torcs.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [viric]; platforms = lib.platforms.linux; diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 860c5a49ef86..9ce9ad3ffc5e 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trackballs"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "trackballs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fCoQqGXwcpcq/gl67XXY5/wEvCM0ZZTV8LhjC+tnRuo="; + sha256 = "sha256-JKSiNe5mu8rRztUhduGFY6IsSMx6VyBqKcGO5EssI+8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index 0c2d928dd5ea..a6ae1d9866e5 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6.5"; buildInputs = [ ncurses ]; src = fetchurl { - url = "http://typespeed.sourceforge.net/typespeed-${version}.tar.gz"; + url = "https://typespeed.sourceforge.net/typespeed-${version}.tar.gz"; sha256 = "5c860385ceed8a60f13217cc0192c4c2b4705c3e80f9866f7d72ff306eb72961"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A curses based typing game"; - homepage = "http://typespeed.sourceforge.net/"; + homepage = "https://typespeed.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.auntie ]; diff --git a/pkgs/games/uhexen2/default.nix b/pkgs/games/uhexen2/default.nix index b9bde8d3e43a..1a43679bd127 100644 --- a/pkgs/games/uhexen2/default.nix +++ b/pkgs/games/uhexen2/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { HoT includes countless bug fixes, improved music, sound and video modes, opengl improvements, support for many operating systems and architectures, and documentation among many others. ''; - homepage = "http://uhexen2.sourceforge.net/"; + homepage = "https://uhexen2.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ xdhampus ]; platforms = platforms.all; diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 37b6cd151de5..b036ded0b74c 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.2.20"; + version = "4.4.6"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "sha256-SsEOewFbJqad8OCRiE1VHOx7kVFtF4DEInE3ETCGxDM="; + sha256 = "sha256-I4EKYoN+36a65mcZ2UWH3Ws75Ojdmpw/6flKFmEuIk8="; }; dontUnpack = true; diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 797c41916f1c..7da4c1e597b5 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { - to adapt the code so that people can more easily make their own spin-offs, thereby making zillions more people happy! ''; - homepage = "http://sc2.sourceforge.net/"; + homepage = "https://sc2.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ jcumming aszlig ]; platforms = with lib.platforms; linux; diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index fd3df36bdb51..d199918218b3 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.6.7"; + version = "3.6.10"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-WTYMbVtAciscnBzR4uHmVVXpuge53e32uLmUF8/w6I0="; + sha256 = "sha256-YQUKYsuDaCHChiRBQOKr813ptyc4UxZQ5aQFeC6tutU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index d16f3870d828..632d4fe7f2d8 100644 --- a/pkgs/games/vcmi/default.nix +++ b/pkgs/games/vcmi/default.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "vcmi"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "vcmi"; repo = "vcmi"; rev = version; fetchSubmodules = true; - hash = "sha256-5PuFq6wDSj5Ye2fUjqcr/VRU0ocus6h2nn+myQTOrhU="; + hash = "sha256-/BHpAXOCLi6d0+/uE79g8p6YO1swizItAwVlPVf/nkQ="; }; postPatch = '' @@ -69,7 +69,9 @@ stdenv.mkDerivation rec { # Upstream assumes relative value while Nixpkgs passes absolute. # Both should be allowed: https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html # Meanwhile work it around by passing a relative value. + "-DCMAKE_INSTALL_BINDIR:STRING=bin" "-DCMAKE_INSTALL_LIBDIR:STRING=lib" + "-DCMAKE_INSTALL_DATAROOTDIR:STRING=share" ]; postFixup = '' diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 19397794649b..d965faab4db2 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -16,12 +16,12 @@ , data ? fetchsvn { url = "svn://svn.code.sf.net/p/vdrift/code/vdrift-data"; - rev = "1386"; - sha256 = "0ka6zir9hg0md5p03dl461jkvbk05ywyw233hnc3ka6shz3vazi1"; + rev = "1446"; + sha256 = "sha256-KEu49GAOfenPyuaUItt6W9pkuqUNpXgmTSFuc7ThljQ="; } }: let - version = "unstable-2017-12-09"; + version = "unstable-2021-09-05"; bin = stdenv.mkDerivation { pname = "vdrift"; inherit version; @@ -29,14 +29,16 @@ let src = fetchFromGitHub { owner = "vdrift"; repo = "vdrift"; - rev = "12d444ed18395be8827a21b96cc7974252fce6d1"; - sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg"; + rev = "7e9e00c8612b2014d491f026dd86b03f9fb04dcd"; + sha256 = "sha256-DrzRF4WzwEXCNALq0jz8nHWZ1oYTEsdrvSYVYI1WkTI="; }; - nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config sconsPackages.scons_latest ]; buildInputs = [ libGLU libGL SDL2 SDL2_image libvorbis bullet curl gettext ]; - patches = [ ./0001-Ignore-missing-data-for-installation.patch ]; + patches = [ + ./0001-Ignore-missing-data-for-installation.patch + ]; buildPhase = '' sed -i -e s,/usr/local,$out, SConstruct diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index 5e7af156c48d..96c8e5ba7afb 100644 --- a/pkgs/games/vintagestory/default.nix +++ b/pkgs/games/vintagestory/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.17.4"; + version = "1.17.10"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz"; - sha256 = "sha256-q4SphwL4g1hyMMthhF7VCfRqlJrOp8uk00fPRqCfI/s="; + sha256 = "sha256-1HsWby4Jf+ndE9xsDrS+vELymDedRwSgNiCDLoiPBec="; }; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; diff --git a/pkgs/games/vvvvvv/default.nix b/pkgs/games/vvvvvv/default.nix new file mode 100644 index 000000000000..b6d0d59367e2 --- /dev/null +++ b/pkgs/games/vvvvvv/default.nix @@ -0,0 +1,93 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchurl +, cmake +, makeWrapper +, copyDesktopItems +, makeDesktopItem +, physfs +, SDL2 +, SDL2_mixer +, tinyxml-2 +, utf8cpp +, Foundation +, IOKit +, makeAndPlay ? false +}: + +stdenv.mkDerivation rec { + pname = "vvvvvv"; + version = "2.3.6"; + + src = fetchFromGitHub { + owner = "TerryCavanagh"; + repo = "VVVVVV"; + rev = version; + sha256 = "sha256-sLNO4vkmlirsqJmCV9YWpyNnIiigU1KMls7rOgWgSmQ="; + }; + sourceRoot = "source/desktop_version"; + dataZip = fetchurl { + url = "https://thelettervsixtim.es/makeandplay/data.zip"; + name = "data.zip"; + sha256 = "sha256-x2eAlZT2Ry2p9WE252ZX44ZA1YQWSkYRIlCsYpPswOo="; + meta.license = lib.licenses.unfree; + }; + + nativeBuildInputs = [ + cmake + makeWrapper + copyDesktopItems + ]; + + buildInputs = [ + physfs + SDL2 + SDL2_mixer + tinyxml-2 + utf8cpp + ] ++ lib.optionals stdenv.isDarwin [ Foundation IOKit ]; + + # Help CMake find SDL_mixer.h + NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2_mixer}/include/SDL2"; + + cmakeFlags = [ "-DBUNDLE_DEPENDENCIES=OFF" ] ++ lib.optional makeAndPlay "-DMAKEANDPLAY=ON"; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "VVVVVV"; + desktopName = "VVVVVV"; + comment = meta.description; + exec = pname; + icon = "VVVVVV"; + terminal = false; + categories = [ "Game" ]; + }) + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 VVVVVV $out/bin/${pname} + install -Dm644 "$src/desktop_version/icon.ico" "$out/share/pixmaps/VVVVVV.png" + + wrapProgram $out/bin/${pname} --add-flags "-assets ${dataZip}" + + runHook postInstall + ''; + + meta = with lib; { + description = "A retro-styled platform game" + lib.optionalString makeAndPlay " (redistributable, without original levels)"; + longDescription = '' + VVVVVV is a platform game all about exploring one simple mechanical + idea - what if you reversed gravity instead of jumping? + '' + lib.optionalString makeAndPlay '' + (Redistributable version, doesn't include the original levels.) + ''; + homepage = "https://thelettervsixtim.es"; + license = licenses.unfree; + maintainers = with maintainers; [ martfont ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 4adb079ebaa0..26dfcdcfe77a 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -29,6 +29,7 @@ , testers , warzone2100 +, nixosTests , withVideos ? false }: @@ -43,11 +44,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.3.1"; + version = "4.3.3"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-GdHe8DskEd0G1E388z8GGOtjTqHTMBpFSxf1MNATGN0="; + sha256 = "sha256-PDy5mIYAoQ9VAJCTRMiBqUlRtKIqVHiMuBiozTtH5Z4="; }; buildInputs = [ @@ -111,6 +112,7 @@ stdenv.mkDerivation rec { # The command always exits with code 1 command = "(warzone2100 --version || [ $? -eq 1 ])"; }; + nixosTest = nixosTests.warzone2100; }; meta = with lib; { diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index a98e695950bb..6b5e0c117cc5 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.16.6"; + version = "1.16.7"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - sha256 = "sha256-oQRjVjVjLIvCCafLr0FXvLwnKDjJY2FU20dYGLtNFiU="; + sha256 = "sha256-YcBF/iNr6Q5NaA+G55xa0SOCCHW2BCoJlmXsTtkF1fk="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/games/xivlauncher/default.nix b/pkgs/games/xivlauncher/default.nix index 0bd586d458c2..0fe7981f9651 100644 --- a/pkgs/games/xivlauncher/default.nix +++ b/pkgs/games/xivlauncher/default.nix @@ -3,7 +3,7 @@ , useSteamRun ? true }: let - rev = "1.0.2"; + rev = "1.0.3"; in buildDotnetModule rec { pname = "XIVLauncher"; @@ -13,7 +13,7 @@ in owner = "goatcorp"; repo = "XIVLauncher.Core"; inherit rev; - sha256 = "DlSMxIbgzL5cy+A5nm7ZaA2A0TdINtq2GHW27uxORKI="; + hash = "sha256-aQVfW6Ef8X6L6hBEOCY/Py5tEyorXqtOO3v70mD7efA="; fetchSubmodules = true; }; @@ -23,12 +23,8 @@ in nugetDeps = ./deps.nix; # File generated with `nix-build -A xivlauncher.passthru.fetch-deps` dotnetFlags = [ - "--runtime linux-x64" "-p:BuildHash=${rev}" - ]; - - dotnetBuildFlags = [ - "--no-self-contained" + "-p:PublishSingleFile=false" ]; postPatch = '' @@ -66,7 +62,7 @@ in description = "Custom launcher for FFXIV"; homepage = "https://github.com/goatcorp/FFXIVQuickLauncher"; license = licenses.gpl3; - maintainers = with maintainers; [ ashkitten sersorrel ]; + maintainers = with maintainers; [ sersorrel witchof0x20 ]; platforms = [ "x86_64-linux" ]; mainProgram = "XIVLauncher.Core"; }; diff --git a/pkgs/games/zaz/default.nix b/pkgs/games/zaz/default.nix index 81d42b1b2941..ebc7dff5406c 100644 --- a/pkgs/games/zaz/default.nix +++ b/pkgs/games/zaz/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; description = "A puzzle game about arranging balls in triplets, like Luxor, Zuma, or Puzzle Bobble"; - homepage = "http://zaz.sourceforge.net/"; + homepage = "https://zaz.sourceforge.net/"; license = licenses.gpl3; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; diff --git a/pkgs/misc/ananicy-cpp/default.nix b/pkgs/misc/ananicy-cpp/default.nix index 25bcaec13267..96284ba03ae6 100644 --- a/pkgs/misc/ananicy-cpp/default.nix +++ b/pkgs/misc/ananicy-cpp/default.nix @@ -1,27 +1,28 @@ { lib -, gcc11Stdenv +, stdenv , fetchFromGitLab -, makeWrapper , cmake +, pkg-config , spdlog , nlohmann_json , systemd }: -gcc11Stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "ananicy-cpp"; - version = "unstable-2021-10-13"; + version = "1.0.2"; src = fetchFromGitLab { owner = "ananicy-cpp"; repo = "ananicy-cpp"; - rev = "6a14fe7353221c89347eddbbcafb35cf5fee4758"; - sha256 = "sha256-V0QPXC17ZD2c4MK3DAkzoPgKOU5V5BjfQKUk7I6f8WM="; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-iR7yIIGJbRwu62GIEYi70PjtlKXmkPYqSJtMddspBKA="; }; nativeBuildInputs = [ - makeWrapper cmake + pkg-config ]; buildInputs = [ @@ -31,11 +32,17 @@ gcc11Stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DUSE_EXTERNAL_JSON=yON" + "-DUSE_EXTERNAL_JSON=ON" "-DUSE_EXTERNAL_SPDLOG=ON" "-DUSE_EXTERNAL_FMTLIB=ON" + "-DVERSION=${version}" ]; + postInstall = '' + rm -rf "$out"/include + rm -rf "$out"/lib/cmake + ''; + meta = with lib; { homepage = "https://gitlab.com/ananicy-cpp/ananicy-cpp"; description = "Rewrite of ananicy in c++ for lower cpu and memory usage"; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index c844dbffee40..d9f136f81389 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -9,7 +9,7 @@ , libtiff , pam , dbus -, enableSystemd ? stdenv.isLinux +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , acl , gmp @@ -22,49 +22,33 @@ , nixosTests }: -with lib; stdenv.mkDerivation rec { pname = "cups"; + version = "2.4.2"; - # After 2.2.6, CUPS requires headers only available in macOS 10.12+ - version = if stdenv.isDarwin then "2.2.6" else "2.4.2"; - - src = fetchurl (if stdenv.isDarwin then { - url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - sha256 = "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"; - } else { + src = fetchurl { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; sha256 = "sha256-8DzLQLCH0eMJQKQOAUHcu6Jj85l0wg658lIQZsnGyQg="; - }); + }; outputs = [ "out" "lib" "dev" "man" ]; - patches = lib.optionals (version == "2.2.6") [ - ./0001-TargetConditionals.patch - (fetchpatch { - name = "CVE-2022-26691.patch"; - url = "https://github.com/OpenPrinting/cups/commit/de4f8c196106033e4c372dce3e91b9d42b0b9444.patch"; - sha256 = "sha256-IKOtV7bCS6PstwK6YqnYRYTeH562jWwkley86p+6Of8="; - excludes = [ "CHANGES.md" ]; - }) - (fetchpatch { - name = "CVE-2022-26691-fix-comment.patch"; - url = "https://github.com/OpenPrinting/cups/commit/411b6136f450a583ee08c3880fa09dbe837eb3f1.patch"; - sha256 = "sha256-dVopmr34c9N5H2ZZz52rXVnHQBuDTNo8M40x9455+jQ="; - }) - ]; - postPatch = '' substituteInPlace cups/testfile.c \ --replace 'cupsFileFind("cat", "/bin' 'cupsFileFind("cat", "${coreutils}/bin' + + # The cups.socket unit shouldn't be part of cups.service: stopping the + # service would stop the socket and break subsequent socket activations. + # See https://github.com/apple/cups/issues/6005 + sed -i '/PartOf=cups.service/d' scheduler/cups.socket.in ''; nativeBuildInputs = [ pkg-config removeReferencesTo ]; buildInputs = [ zlib libjpeg libpng libtiff libusb1 gnutls libpaper ] - ++ optionals stdenv.isLinux [ avahi pam dbus acl ] - ++ optional enableSystemd systemd - ++ optionals stdenv.isDarwin (with darwin; [ + ++ lib.optionals stdenv.isLinux [ avahi pam dbus acl ] + ++ lib.optional enableSystemd systemd + ++ lib.optionals stdenv.isDarwin (with darwin; [ configd apple_sdk.frameworks.ApplicationServices ]); @@ -76,19 +60,18 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--enable-raw-printing" "--enable-threads" - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ "--enable-dbus" "--enable-pam" "--with-dbusdir=${placeholder "out"}/share/dbus-1" - ] ++ optional (libusb1 != null) "--enable-libusb" - ++ optional (gnutls != null) "--enable-ssl" - ++ optional (avahi != null) "--enable-avahi" - ++ optional (libpaper != null) "--enable-libpaper" - ++ optional stdenv.isDarwin "--disable-launchd"; + ] ++ lib.optional (libusb1 != null) "--enable-libusb" + ++ lib.optional (gnutls != null) "--enable-ssl" + ++ lib.optional (avahi != null) "--enable-avahi" + ++ lib.optional (libpaper != null) "--enable-libpaper"; # AR has to be an absolute path preConfigure = '' - export AR="${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" + export AR="${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" configureFlagsArray+=( # Put just lib/* and locale into $lib; this didn't work directly. # lib/cups is moved back to $out in postInstall. @@ -99,7 +82,7 @@ stdenv.mkDerivation rec { "--with-systemd=$out/lib/systemd/system" - ${optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.isDarwin '' "--with-bundledir=$out" ''} ) @@ -108,6 +91,7 @@ stdenv.mkDerivation rec { installFlags = [ # Don't try to write in /var at build time. "CACHEDIR=$(TMPDIR)/dummy" + "LAUNCHD_DIR=$(TMPDIR)/dummy" "LOGDIR=$(TMPDIR)/dummy" "REQUESTS=$(TMPDIR)/dummy" "STATEDIR=$(TMPDIR)/dummy" @@ -144,7 +128,7 @@ stdenv.mkDerivation rec { for f in "$out"/lib/systemd/system/*; do substituteInPlace "$f" --replace "$lib/$libexec" "$out/$libexec" done - '' + optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' # Use xdg-open when on Linux substituteInPlace "$out"/share/applications/cups.desktop \ --replace "Exec=htmlview" "Exec=xdg-open" @@ -152,7 +136,7 @@ stdenv.mkDerivation rec { passthru.tests.nixos = nixosTests.printing; - meta = { + meta = with lib; { homepage = "https://openprinting.github.io/cups/"; description = "A standards-based printing system for UNIX"; license = licenses.asl20; diff --git a/pkgs/misc/cups/drivers/brother/hll2375dw/default.nix b/pkgs/misc/cups/drivers/brother/hll2375dw/default.nix new file mode 100644 index 000000000000..a6c2db9f90b1 --- /dev/null +++ b/pkgs/misc/cups/drivers/brother/hll2375dw/default.nix @@ -0,0 +1,104 @@ +{ 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-hll2375dw"; + version = "4.0.0-1"; + + nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook ]; + buildInputs = [ perl ]; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf103535//hll2375dwpdrv-${version}.i386.deb"; + hash = "sha256-N5VCBZLFrfw29QjjzlSvQ12urvyaf7ez/RJ08UwqHdk="; + }; + + unpackPhase = "dpkg-deb -x $src ."; + + patches = [ + # The brother lpdwrapper uses a temporary file to convey the printer settings. + # The original settings file will be copied with "400" permissions and the "brprintconflsr3" + # binary cannot alter the temporary file later on. This fixes the permissions so the can be modified. + # Since this is all in briefly in the temporary directory of systemd-cups and not accessible by others, + # it shouldn't be a security concern. + ./fix-perm.patch + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -ar opt $out/opt + # delete unnecessary files for the current architecture + '' + lib.concatMapStrings + (arch: '' + echo Deleting files for ${arch} + rm -r "$out/opt/brother/Printers/HLL2375DW/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/HLL2375DW/lpd/${stdenv.hostPlatform.linuxArch}/"* \ + "$out/opt/brother/Printers/HLL2375DW/lpd/" + + # Fix global references and replace auto discovery mechanism with hardcoded values + substituteInPlace $out/opt/brother/Printers/HLL2375DW/lpd/lpdfilter \ + --replace "my \$BR_PRT_PATH =" "my \$BR_PRT_PATH = \"$out/opt/brother/Printers/HLL2375DW\"; #" \ + --replace "PRINTER =~" "PRINTER = \"HLL2375DW\"; #" + substituteInPlace $out/opt/brother/Printers/HLL2375DW/cupswrapper/lpdwrapper \ + --replace "my \$basedir = C" "my \$basedir = \"$out/opt/brother/Printers/HLL2375DW\" ; #" \ + --replace "PRINTER =~" "PRINTER = \"HLL2375DW\"; #" + + # 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 + mkdir -p $out/etc/opt/brother/Printers/HLL2375DW/inf + + ln -s $out/opt/brother/Printers/HLL2375DW/inf/brHLL2375DWrc \ + $out/etc/opt/brother/Printers/HLL2375DW/inf/brHLL2375DWrc + ln -s \ + $out/opt/brother/Printers/HLL2375DW/cupswrapper/lpdwrapper \ + $out/lib/cups/filter/brother_lpdwrapper_HLL2375DW + ln -s \ + $out/opt/brother/Printers/HLL2375DW/cupswrapper/brother-HLL2375DW-cups-en.ppd \ + $out/share/cups/model/ + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://www.brother.com/"; + description = "Brother HLL2375DW printer driver"; + license = licenses.unfree; + platforms = builtins.map (arch: "${arch}-linux") arches; + maintainers = [ maintainers.gador ]; + }; +} diff --git a/pkgs/misc/cups/drivers/brother/hll2375dw/fix-perm.patch b/pkgs/misc/cups/drivers/brother/hll2375dw/fix-perm.patch new file mode 100644 index 000000000000..6d85ad5bd53d --- /dev/null +++ b/pkgs/misc/cups/drivers/brother/hll2375dw/fix-perm.patch @@ -0,0 +1,10 @@ +--- a/opt/brother/Printers/HLL2375DW/cupswrapper/lpdwrapper 2022-12-07 18:32:29.950543083 +0100 ++++ b/opt/brother/Printers/HLL2375DW/cupswrapper/lpdwrapper 2022-12-07 18:46:03.046989151 +0100 +@@ -379,6 +379,7 @@ + + + `cp $basedir/inf/br${PRINTER}rc $TEMPRC`; ++`chmod 666 $TEMPRC`; + $ENV{BRPRINTERRCFILE} = $TEMPRC; + + logprint( 0 , "TEMPRC = $TEMPRC\n"); \ No newline at end of file diff --git a/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix b/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix new file mode 100644 index 000000000000..a26216cbc727 --- /dev/null +++ b/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, cups +, coreutils +, nixosTests +}: + +stdenv.mkDerivation rec { + pname = "cups-pdf-to-pdf"; + version = "unstable-2021-12-22"; + + src = fetchFromGitHub { + owner = "alexivkin"; + repo = "CUPS-PDF-to-PDF"; + rev = "c14428c2ca8e95371daad7db6d11c84046b1a2d4"; + hash = "sha256-pa4PFf8OAFSra0hSazmKUfbMYL/cVWvYA1lBf7c7jmY="; + }; + + buildInputs = [ cups ]; + + postPatch = '' + sed -r 's|(gscall, size, ")cp |\1${coreutils}/bin/cp |' cups-pdf.c -i + ''; + + # gcc command line is taken from original cups-pdf's README file + # https://fossies.org/linux/cups-pdf/README + # however, we replace gcc with $CC following + # https://nixos.org/manual/nixpkgs/stable/#sec-darwin + buildPhase = '' + runHook preBuild + $CC -O9 -s cups-pdf.c -o cups-pdf -lcups + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dt $out/lib/cups/backend cups-pdf + install -Dm 0644 -t $out/etc/cups cups-pdf.conf + install -Dm 0644 -t $out/share/cups/model *.ppd + runHook postInstall + ''; + + passthru.tests.vmtest = nixosTests.cups-pdf; + + meta = with lib; { + description = "A CUPS backend that turns print jobs into searchable PDF files"; + homepage = "https://github.com/alexivkin/CUPS-PDF-to-PDF"; + license = licenses.gpl2Only; + maintainers = [ maintainers.yarny ]; + longDescription = '' + cups-pdf is a CUPS backend that generates a PDF file for each print job and puts this file + into a folder on the local machine such that the print job's owner can access the file. + + https://www.cups-pdf.de/ + + cups-pdf-to-pdf is a fork of cups-pdf which tries hard to preserve the original text of the print job by avoiding rasterization. + + Note that in order to use this package, you have to make sure that the cups-pdf program is called with root privileges. + ''; + }; +} diff --git a/pkgs/misc/cups/drivers/kyodialog/default.nix b/pkgs/misc/cups/drivers/kyodialog/default.nix new file mode 100644 index 000000000000..7137b5df56bf --- /dev/null +++ b/pkgs/misc/cups/drivers/kyodialog/default.nix @@ -0,0 +1,106 @@ +{ lib +, stdenv +, fetchzip +, cups +, autoPatchelfHook +, python3Packages + +# Sets the default paper format: use "EU" for A4, or "Global" for Letter +, region ? "EU" +# optional GUI, quite redundant to CUPS admin web GUI +, withQtGui ? false +, qt5 +}: + +# Open issues: +# +# Printing in grayscale mode (e.g. the test page) generates a warning +# > [Job 59] Grayscale/monochrome printing requested for this job but Poppler is not able to convert to grayscale/monochrome PostScript. +# > [Job 59] Use \"pdftops-renderer\" option (see cups-filters README file) to use Ghostscript or MuPDF for the PDF -> PostScript conversion. +# +# This is related to https://github.com/OpenPrinting/cups-filters/issues/169. + +assert region == "Global" || region == "EU"; + +let + kyodialog_version = "9.2"; + date = "20220928"; +in +stdenv.mkDerivation rec { + pname = "cups-kyodialog"; + version = "${kyodialog_version}-${date}"; + + dontStrip = true; + + src = fetchzip { + urls = [ + "https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_${date}_tar_gz.download.gz" + "https://web.archive.org/web/20221122230412/https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_${date}_tar_gz.download.gz" + ]; + sha256 = "sha256-WCHuAQO2T6S8JtRsI2Yf/ypeCLMH365Ax/qX+Ah2s3k="; + extension = "tar.gz"; + stripRoot = false; + postFetch = '' + # delete redundant Linux package dirs to reduce size in the Nix store; only keep Debian + rm -r $out/{CentOS,Fedora,OpenSUSE,Redhat,Ubuntu} + ''; + }; + + sourceRoot = "."; + + unpackCmd = let + platforms = { + x86_64-linux = "amd64"; + i686-linux = "i386"; + }; + platform = platforms.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + in '' + ar p "$src/Debian/${region}/kyodialog_${platform}/kyodialog_${kyodialog_version}-0_${platform}.deb" data.tar.gz | tar -xz + ''; + + nativeBuildInputs = [ autoPatchelfHook python3Packages.wrapPython ] + ++ lib.optionals withQtGui [ qt5.wrapQtAppsHook ]; + + buildInputs = [ cups ] ++ lib.optionals withQtGui [ qt5.qtbase ]; + + # For lib/cups/filter/kyofilter_pre_H. + # The source already contains a copy of pypdf3, but we use the Nix package + propagatedBuildInputs = with python3Packages; [ reportlab pypdf3 setuptools ]; + + installPhase = '' + # allow cups to find the ppd files + mkdir -p $out/share/cups/model + mv ./usr/share/kyocera${kyodialog_version}/ppd${kyodialog_version} $out/share/cups/model/Kyocera + + # remove absolute path prefixes to filters in ppd + find $out -name "*.ppd" -exec sed -E -i "s:/usr/lib/cups/filter/::g" {} \; + + + mkdir -p $out/lib/cups/ + mv ./usr/lib/cups/filter/ $out/lib/cups/ + # for lib/cups/filter/kyofilter_pre_H + wrapPythonProgramsIn $out/lib/cups/filter "$propagatedBuildInputs" + + + install -Dm444 usr/share/doc/kyodialog/copyright $out/share/doc/${pname}/copyright + '' + lib.optionalString withQtGui '' + install -D usr/bin/kyoPPDWrite_H $out/bin/kyoPPDWrite_H + install -D usr/bin/kyodialog${kyodialog_version} $out/bin/kyodialog + + install -Dm444 usr/share/kyocera${kyodialog_version}/appicon_H.png $out/share/${pname}/icons/appicon_H.png + + install -Dm444 usr/share/applications/kyodialog${kyodialog_version}.desktop $out/share/applications/kyodialog.desktop + substituteInPlace $out/share/applications/kyodialog.desktop \ + --replace Exec=\"/usr/bin/kyodialog${kyodialog_version}\" Exec=\"$out/bin/kyodialog\" \ + --replace Icon=/usr/share/kyocera/appicon_H.png Icon=$out/share/${pname}/icons/appicon_H.png + ''; + + meta = with lib; { + description = "CUPS drivers for several Kyocera printers"; + homepage = "https://www.kyoceradocumentsolutions.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = [ maintainers.steveej ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/misc/cups/drivers/kyodialog3/default.nix b/pkgs/misc/cups/drivers/kyodialog3/default.nix deleted file mode 100644 index 7eeae6daa53c..000000000000 --- a/pkgs/misc/cups/drivers/kyodialog3/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ stdenv, lib, fetchzip, cups, autoPatchelfHook - - # Can either be "EU" or "Global"; it's unclear what the difference is - , region ? "Global", qt4 -}: - -let - platform = - if stdenv.hostPlatform.system == "x86_64-linux" then "64bit" - else if stdenv.hostPlatform.system == "i686-linux" then "32bit" - else throw "Unsupported system: ${stdenv.hostPlatform.system}"; - debPlatform = - if platform == "64bit" then "amd64" - else "i386"; - debRegion = if region == "EU" then "EU." else ""; -in -stdenv.mkDerivation rec { - pname = "cups-kyodialog3"; - version = "8.1601"; - - dontStrip = true; - - src = fetchzip { - url = "https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/Kyocera_Linux_PPD_Ver_${lib.replaceChars ["."] ["_"] version}_tar_gz.download.gz"; - sha256 = "11znnlkfssakml7w80gxlz1k59f3nvhph91fkzzadnm9i7a8yjal"; - }; - - nativeBuildInputs = [ autoPatchelfHook ]; - - buildInputs = [ cups qt4 ]; - - installPhase = '' - mkdir -p $out - cd $out - - # unpack the debian archive - ar p ${src}/KyoceraLinuxPackages/${region}/${platform}/kyodialog3.en${debRegion}_0.5-0_${debPlatform}.deb data.tar.gz | tar -xz - rm -Rf KyoceraLinuxPackages - - # strip $out/usr - mv usr/* . - rmdir usr - - # allow cups to find the ppd files - mkdir -p share/cups/model - mv share/ppd/kyocera share/cups/model/Kyocera - rmdir share/ppd - - # prepend $out to all references in ppd and desktop files - find -name "*.ppd" -exec sed -E -i "s:/usr/lib:$out/lib:g" {} \; - find -name "*.desktop" -exec sed -E -i "s:/usr/lib:$out/lib:g" {} \; - ''; - - meta = with lib; { - description = "CUPS drivers for several Kyocera printers"; - homepage = "https://www.kyoceradocumentsolutions.com"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = [ maintainers.steveej ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix index 8a0b981a8235..f290b9563cc7 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ ]; - platforms = [ "i686-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh b/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh index f750df6e5063..bdb522744182 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup arch=$(uname -m) diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix index 2a34e36742d5..22ea3a5f86e3 100644 --- a/pkgs/misc/documentation-highlighter/default.nix +++ b/pkgs/misc/documentation-highlighter/default.nix @@ -7,6 +7,16 @@ runCommand "documentation-highlighter" { platforms = lib.platforms.all; maintainers = [ lib.maintainers.grahamc ]; }; + src = lib.sources.cleanSourceWith { + src = ./.; + filter = path: type: lib.elem path (map toString [ + ./highlight.pack.js + ./LICENSE + ./loader.js + ./mono-blue.css + ./README.md + ]); + }; } '' - cp -r ${./.} $out + cp -r "$src" "$out" '' diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 37e4d2baa35e..cf54b048f591 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -255,6 +255,38 @@ let plugins = { }; meta = common_meta // { description = "iscan GT-S650 for " + passthru.hw; }; }; + x750 = stdenv.mkDerivation rec { + name = "iscan-gt-x750-bundle"; + version = "2.30.4"; + + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-x750/rpm/x64/iscan-gt-x750-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x750/rpm/x64/iscan-gt-x750-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "sha256-9EeBHmh1nwSxnTnevPP8RZ4WBdyY+itR3VXo2I7f5N0="; + }; + + nativeBuildInputs = [ autoPatchelfHook rpm ]; + + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-gt-x750-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x0119 "$plugin/lib/esci/libesint54 $plugin/share/esci/esfw54.bin" + ''; + hw = "GT-X750, Perfection 4490"; + }; + meta = common_meta // { description = "iscan GT-X750 for " + passthru.hw; }; + }; network = stdenv.mkDerivation rec { pname = "iscan-nt-bundle"; # for the version, look for the driver of XP-750 in the search page diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index c1d38656b267..91f6d98e9d55 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { sed -e "/PRINTERID=/s@=.*@=$out/bin/usb_printerid@" -i hplj1000 ''; - checkInputs = [ time ]; + nativeCheckInputs = [ time ]; doCheck = false; # fails to find its own binary. Also says "Tests will pass only if you are using ghostscript-8.71-16.fc14". preInstall = '' diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index 61d36052e292..0aeb5f2e963a 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -27,7 +27,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ evdev pygobject3 pylibacl vdf ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; patches = [ # Fix a broken test diff --git a/pkgs/misc/drivers/spacenavd/default.nix b/pkgs/misc/drivers/spacenavd/default.nix index 5cc1b4601332..eb2fc165cccb 100644 --- a/pkgs/misc/drivers/spacenavd/default.nix +++ b/pkgs/misc/drivers/spacenavd/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with lib; { - homepage = "http://spacenav.sourceforge.net/"; + homepage = "https://spacenav.sourceforge.net/"; description = "Device driver and SDK for 3Dconnexion 3D input devices"; longDescription = "A free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)"; license = licenses.gpl3Plus; diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix index 414a207fa544..69ffcdd78865 100644 --- a/pkgs/misc/drivers/xwiimote/default.nix +++ b/pkgs/misc/drivers/xwiimote/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-doxygen=no" ]; meta = { - homepage = "http://dvdhrm.github.io/xwiimote"; + homepage = "https://dvdhrm.github.io/xwiimote"; description = "Userspace utilities to control connected Nintendo Wii Remotes"; platforms = lib.platforms.linux; license = lib.licenses.mit; diff --git a/pkgs/misc/dxvk/default.nix b/pkgs/misc/dxvk/default.nix index 6664db0e9ec9..0e46011e7e10 100644 --- a/pkgs/misc/dxvk/default.nix +++ b/pkgs/misc/dxvk/default.nix @@ -1,69 +1,34 @@ { lib -, pkgs -, hostPlatform , stdenvNoCC , fetchFromGitHub , pkgsCross +, stdenv +, bash }: stdenvNoCC.mkDerivation (finalAttrs: 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 (finalAttrs) src version dxvkPatches; - }; - dxvk64 = pkgsCross.mingwW64.callPackage ./dxvk.nix { - inherit (finalAttrs) 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${finalAttrs.version}"; - hash = "sha256-T93ZylxzJGprrP+j6axZwl2d3hJowMCUOKNjIyNzkmE="; - version = "1.10.3"; - }; - }; + dxvk32 = if stdenv.isDarwin then pkgsCross.mingw32.dxvk_1 else pkgsCross.mingw32.dxvk_2; + dxvk64 = if stdenv.isDarwin then pkgsCross.mingwW64.dxvk_1 else pkgsCross.mingwW64.dxvk_2; in { 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 - ]; + inherit (dxvk64) version; outputs = [ "out" "bin" "lib" ]; - # Also copy `mcfgthread-12.dll` due to DXVK’s being built in a MinGW cross environment. - patches = [ ./mcfgthread.patch ]; - + dontUnpack = true; dontConfigure = true; dontBuild = true; installPhase = '' mkdir -p $out/bin $bin $lib - substitute setup_dxvk.sh $out/bin/setup_dxvk.sh \ + substitute ${./setup_dxvk.sh} $out/bin/setup_dxvk.sh \ + --subst-var-by bash ${bash} \ + --subst-var-by dxvk32 ${dxvk32} \ + --subst-var-by dxvk64 ${dxvk64} \ --subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads}" \ - --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads}" \ - --replace 'basedir=$(dirname "$(readlink -f $0)")' "basedir=$bin" + --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads}" chmod a+x $out/bin/setup_dxvk.sh declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} ) for arch in "''${!dxvks[@]}"; do @@ -73,7 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: ''; meta = { - description = "A Vulkan-based translation layer for Direct3D 9/10/11"; + description = "Setup script for DXVK"; homepage = "https://github.com/doitsujin/dxvk"; changelog = "https://github.com/doitsujin/dxvk/releases"; maintainers = [ lib.maintainers.reckenrode ]; diff --git a/pkgs/misc/dxvk/dxvk.nix b/pkgs/misc/dxvk/dxvk.nix index 2eb4f30df2bc..793264f9b30b 100644 --- a/pkgs/misc/dxvk/dxvk.nix +++ b/pkgs/misc/dxvk/dxvk.nix @@ -5,19 +5,82 @@ , meson , ninja , windows -, src -, version -, dxvkPatches +, dxvkVersion +, spirv-headers +, vulkan-headers +, SDL2 +, glfw +, pkgsBuildHost +, sdl2Support ? true +, glfwSupport ? false }: +# SDL2 and GLFW support are mutually exclusive. +assert !sdl2Support || !glfwSupport; + +let + # DXVK 2.0+ no longer vendors certain dependencies. This derivation also needs to build on Darwin, + # which does not currently support DXVK 2.0, so adapt conditionally for this situation. + isDxvk2 = lib.versionAtLeast (srcs.${dxvkVersion}.version) "2.0"; + + # DXVK has effectively the same build script regardless of platform. + srcs = { + "1.10" = rec { + version = "1.10.3"; + src = fetchFromGitHub { + owner = "doitsujin"; + repo = "dxvk"; + rev = "v${version}"; + hash = "sha256-T93ZylxzJGprrP+j6axZwl2d3hJowMCUOKNjIyNzkmE="; + }; + # These patches are required when using DXVK with Wine on Darwin. + patches = lib.optionals stdenv.buildPlatform.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 + ]; + }; + "2.1" = rec { + version = "2.1"; + src = fetchFromGitHub { + owner = "doitsujin"; + repo = "dxvk"; + rev = "v${version}"; + hash = "sha256-A4KR11brfQbR56dGt371MRwMN/H6HFAU8TlFC97/bRs="; + fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info + }; + patches = [ ]; + }; + }; + + isWindows = stdenv.targetPlatform.uname.system == "Windows"; + isCross = stdenv.hostPlatform != stdenv.targetPlatform; +in stdenv.mkDerivation { pname = "dxvk"; - inherit src version; + inherit (srcs.${dxvkVersion}) version src patches; nativeBuildInputs = [ glslang meson ninja ]; - buildInputs = [ windows.pthreads ]; + buildInputs = lib.optional isWindows [ windows.pthreads ] + ++ lib.optionals isDxvk2 ( + [ spirv-headers vulkan-headers ] + ++ lib.optional (!isWindows && sdl2Support) SDL2 + ++ lib.optional (!isWindows && glfwSupport) glfw + ); - patches = dxvkPatches; + postPatch = lib.optionalString isDxvk2 '' + substituteInPlace "subprojects/libdisplay-info/tool/gen-search-table.py" \ + --replace "/usr/bin/env python3" "${lib.getBin pkgsBuildHost.python3}/bin/python3" + ''; + + # Build with the Vulkan SDK in nixpkgs. + preConfigure = '' + rm -rf include/spirv/include include/vulkan/include + mkdir -p include/spirv/include include/vulkan/include + ''; mesonFlags = let @@ -25,9 +88,12 @@ stdenv.mkDerivation { in [ "--buildtype" "release" - "--cross-file" "build-win${arch}.txt" "--prefix" "${placeholder "out"}" - ]; + ] + ++ lib.optionals isCross [ "--cross-file" "build-win${arch}.txt" ] + ++ lib.optional glfwSupport "-Ddxvk_native_wsi=glfw"; + + doCheck = isDxvk2 && !isCross; meta = { description = "A Vulkan-based translation layer for Direct3D 9/10/11"; @@ -35,6 +101,6 @@ stdenv.mkDerivation { changelog = "https://github.com/doitsujin/dxvk/releases"; maintainers = [ lib.maintainers.reckenrode ]; license = lib.licenses.zlib; - platforms = lib.platforms.windows; + platforms = lib.platforms.windows ++ lib.optionals isDxvk2 lib.platforms.linux; }; } diff --git a/pkgs/misc/dxvk/mcfgthread.patch b/pkgs/misc/dxvk/mcfgthread.patch deleted file mode 100644 index 037071630172..000000000000 --- a/pkgs/misc/dxvk/mcfgthread.patch +++ /dev/null @@ -1,34 +0,0 @@ -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/dxvk/setup_dxvk.sh b/pkgs/misc/dxvk/setup_dxvk.sh new file mode 100644 index 000000000000..8fadb264fd3d --- /dev/null +++ b/pkgs/misc/dxvk/setup_dxvk.sh @@ -0,0 +1,265 @@ +#!@bash@/bin/bash -e + +set -eu -o pipefail + +dxvk32_dir=@dxvk32@/bin +dxvk64_dir=@dxvk64@/bin + +mcfgthreads32_dir=@mcfgthreads32@/bin +mcfgthreads64_dir=@mcfgthreads64@/bin + +## Defaults + +declare -A dlls=( + [d3d9]="dxvk/d3d9.dll" + [d3d10]="dxvk/d3d10.dll dxvk/d3d10_1.dll dxvk/d3d10core.dll" + [d3d11]="dxvk/d3d11.dll" + [dxgi]="dxvk/dxgi.dll" + [mcfgthreads]="mcfgthreads/mcfgthread-12.dll" +) + +declare -A targets=([d3d9]=1 [d3d11]=1 [dxgi]=1 [mcfgthreads]=1) + +## Command-line Parsing + +usage() { + echo "DXVK @version@" + echo "Set up Wine prefix with DXVK DLLs" + echo + echo "USAGE" + echo " $0 [install|uninstall] [OPTIONS]" + echo + echo "COMMANDS" + echo " install Copy the DXVK DLLs into the prefix" + echo " uninstall Restore the backed up Wine DLLs in the prefix" + echo + echo "OPTIONS" + echo " --with(out)-dxgi Copy DXVK DXGI DLL into prefix (default: with DXGI)" + echo " --with(out)-d3d10 Copy D3D10 DLLs into prefix (default: without D3D10)" + echo " -s, --symlink Symlink instead of copy" + echo " -f, --force Create a Wine prefix even if it does not exist" + echo " -p, --prefix Wine prefix to manage (default: \$WINEPREFIX)" + exit 1 +} + +case "$1" in + uninstall|install) + action=$1 + shift + ;; + -h|--help) + usage + ;; + *) + if [ ! -z "${1:-}" ]; then + echo "Unrecognized command: $1" + fi + usage + ;; +esac + + +do_symlink=false +do_makeprefix=false + +while [ ! -z "${1:-}" ]; do + case "$1" in + --with-dxgi) + targets[dxgi]=1 + ;; + --without-dxgi) + unset targets[dxgi] + ;; + --with-d3d10) + targets[d3d10]=1 + ;; + --without-d3d10) + unset targets[d3d10] + ;; + -s|--symlink) + do_symlink=true + ;; + --no-symlink) + do_symlink=false + ;; + -f|--force) + do_makeprefix=true + ;; + --no-force) + do_makeprefix=false + ;; + -p|--prefix) + shift + if [ ! -z "${1:-}" ]; then + WINEPREFIX=$1 + else + echo "Required PREFIX missing" + usage + fi + ;; + -h|--help) + usage + ;; + *) + echo "Unrecognized option: $1" + usage + ;; + esac + shift +done + +## Get information on the Wine environment + +export WINEPREFIX=${WINEPREFIX:-"$HOME/.wine"} + +# check wine prefix before invoking wine, so that we +# don't accidentally create one if the user screws up +if ! $do_makeprefix && [ -n "$WINEPREFIX" ] && ! [ -f "$WINEPREFIX/system.reg" ]; then + echo "$WINEPREFIX: Not a valid wine prefix." >&2 + exit 1 +fi + +export WINEDEBUG=-all +# disable mscoree and mshtml to avoid downloading +# wine gecko and mono +export WINEDLLOVERRIDES="mscoree,mshtml=" + +wine="wine" +wine64="wine64" +wineboot="wineboot" + +# $PATH is the way for user to control where wine is located (including custom Wine versions). +# Pure 64-bit Wine (non Wow64) requries skipping 32-bit steps. +# In such case, wine64 and winebooot will be present, but wine binary will be missing, +# however it can be present in other PATHs, so it shouldn't be used, to avoid versions mixing. +wine_path=$(dirname "$(command -v $wineboot)") +wow64=true +if ! [ -f "$wine_path/$wine" ]; then + wine=$wine64 + wow64=false +fi + +# resolve 32-bit and 64-bit system32 path +winever=$($wine --version | grep wine) +if [ -z "$winever" ]; then + echo "$wine: Not a wine executable. Check your $wine." >&2 + exit 1 +fi + +# ensure wine placeholder dlls are recreated +# if they are missing +$wineboot -u + +win64_sys_path=$($wine64 winepath -u 'C:\windows\system32' 2> /dev/null) +win64_sys_path="${win64_sys_path/$'\r'/}" +if $wow64; then + win32_sys_path=$($wine winepath -u 'C:\windows\system32' 2> /dev/null) + win32_sys_path="${win32_sys_path/$'\r'/}" +fi + +if [ -z "${win32_sys_path:-}" ] && [ -z "${win64_sys_path:-}" ]; then + echo 'Failed to resolve C:\windows\system32.' >&2 + exit 1 +fi + +## Utility functions + +install_file() { + $do_symlink && file_cmd="ln -sv" || file_cmd="install -m 755 -v" + + srcfile=$1 + dstfile=$2 + + if [ -f "${srcfile}.so" ]; then + srcfile="${srcfile}.so" + fi + + if ! [ -f "${srcfile}" ]; then + echo "${srcfile}: File not found. Skipping." >&2 + return 1 + fi + + if [ -n "$1" ]; then + if [ -f "${dstfile}" ] || [ -h "${dstfile}" ]; then + if ! [ -f "${dstfile}.old" ]; then + mv -v "${dstfile}" "${dstfile}.old" + else + rm -v "${dstfile}" + fi + fi + $file_cmd "${srcfile}" "${dstfile}" + else + echo "${dstfile}: File not found in wine prefix" >&2 + return 1 + fi +} + +uninstall_file() { + srcfile=$1 + dstfile=$2 + + if [ -f "${srcfile}.so" ]; then + srcfile="${srcfile}.so" + fi + + if ! [ -f "${srcfile}" ]; then + echo "${srcfile}: File not found. Skipping." >&2 + return 1 + fi + + if ! [ -f "${dstfile}" ] && ! [ -h "${dstfile}" ]; then + echo "${dstfile}: File not found. Skipping." >&2 + return 1 + fi + + if [ -f "${dstfile}.old" ]; then + rm -v "${dstfile}" + mv -v "${dstfile}.old" "${dstfile}" + return 0 + else + return 1 + fi +} + +install_override() { + dll=$(basename "$1") + $wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$dll" /d native /f >/dev/null 2>&1 + if [ $? -ne 0 ]; then + echo -e "Failed to add override for $dll" + exit 1 + fi +} + +uninstall_override() { + dll=$(basename "$1") + $wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$dll" /f > /dev/null 2>&1 + if [ $? -ne 0 ]; then + echo "Failed to remove override for $dll" + fi +} + +## Perform the requested command + +declare -A paths + +for target in "${!targets[@]}"; do + [ ${targets[$target]} -eq 1 ] || continue + for dll in ${dlls[$target]}; do + dllname=$(basename "$dll") + basedir=$(dirname "$dll") + + if [ ! -z "${win32_sys_path:-}" ]; then + basedir32=${basedir}32_dir + paths["${!basedir32}/$dllname"]="$win32_sys_path/$dllname" + fi + if [ ! -z "${win64_sys_path:-}" ]; then + basedir64=${basedir}64_dir + paths["${!basedir64}/$dllname"]="$win64_sys_path/$dllname" + fi + done +done + +for srcpath in "${!paths[@]}"; do + ${action}_file "$srcpath" "${paths["$srcpath"]}" + ${action}_override "$(basename srcpath)" +done diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 1c653327e717..1542ed14fafe 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -1,14 +1,20 @@ -{ lib, fetchurl, fetchFromGitHub, installShellFiles, buildGoModule, go }: +{ lib +, fetchurl +, fetchFromGitHub +, installShellFiles +, buildGoModule +, go +}: buildGoModule rec { pname = "fastly"; - version = "4.3.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; - rev = "v${version}"; - sha256 = "sha256-TxN0DQ4OKfHn+u4ixpCgcyRRTs52IZRjgcbJuqajeVo="; + rev = "refs/tags/v${version}"; + hash = "sha256-gPToEeLymKIRjL52wb5AjMpDM6vU0Yb0rbcpouev4rQ="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -21,11 +27,15 @@ buildGoModule rec { ''; }; - subPackages = [ "cmd/fastly" ]; + subPackages = [ + "cmd/fastly" + ]; - vendorSha256 = "sha256-7EtyQYPe+oJmQ7uECbjkBjLnM9T03g6gFwUwebKuccc="; + vendorHash = "sha256-yyptdLkC0x2npZu2oEbvSJXIWShnSrQ0n6cPrDUlrCw="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; # Flags as provided by the build automation of the project: # https://github.com/fastly/cli/blob/7844f9f54d56f8326962112b5534e5c40e91bf09/.goreleaser.yml#L14-L18 @@ -39,8 +49,8 @@ buildGoModule rec { ]; preBuild = let cliConfigToml = fetchurl { - url = "https://web.archive.org/web/20221104122906/https://developer.fastly.com/api/internal/cli-config"; - sha256 = "sha256-BHsUWrMp//X95gcB+WbD/nfyduZUkH8jHXk3CfOBAhg="; + url = "https://web.archive.org/web/20221224152051/https://developer.fastly.com/api/internal/cli-config"; + hash = "sha256-IjakfeqjHshlGoamRJTnhUC8cTVMIY63F3vO6I/ZHO4="; }; in '' cp ${cliConfigToml} ./pkg/config/config.toml @@ -56,8 +66,9 @@ buildGoModule rec { meta = with lib; { description = "Command line tool for interacting with the Fastly API"; - license = licenses.asl20; homepage = "https://github.com/fastly/cli"; + changelog = "https://github.com/fastly/cli/blob/v${version}/CHANGELOG.md"; + license = licenses.asl20; maintainers = with maintainers; [ ereslibre shyim ]; }; } diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index 67cde0924c29..e43dc00ba277 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -10,15 +10,17 @@ python3.pkgs.buildPythonApplication rec { }; postPatch = '' - substituteInPlace setup.py \ - --replace "pyyaml>=5.1,<6.0" "pyyaml>=5.1" - substituteInPlace bin/nc_flash_window \ --replace "nc" "${lib.getExe netcat-openbsd}" ''; nativeBuildInputs = with python3.pkgs; [ - pytest-runner + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "pyyaml" + "xcffib" ]; propagatedBuildInputs = with python3.pkgs; [ @@ -36,9 +38,7 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "flashfocus" ]; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://github.com/fennerm/flashfocus"; diff --git a/pkgs/misc/gnu-shepherd/default.nix b/pkgs/misc/gnu-shepherd/default.nix index e55b9d1576e7..66f47a8f6ffb 100644 --- a/pkgs/misc/gnu-shepherd/default.nix +++ b/pkgs/misc/gnu-shepherd/default.nix @@ -1,20 +1,18 @@ -{ stdenv, lib, fetchurl, guile, pkg-config }: +{ stdenv, lib, fetchurl, guile, pkg-config, guile-fibers }: stdenv.mkDerivation rec { pname = "gnu-shepherd"; - version = "0.8.1"; + version = "0.9.3"; src = fetchurl { - url = "https://ftp.gnu.org/gnu/shepherd/shepherd-${version}.tar.gz"; - sha256 = "sha256-0y/lhpS7U1C1/HKFzwyg2cfSQiGqWWnWxGTuPjrIP3U="; + url = "mirror://gnu/shepherd/shepherd-${version}.tar.gz"; + sha256 = "0qy2yq13xhf05an5ilz7grighdxicx56211yaarqq5qigiiybc32"; }; - configureFlags = [ - "--localstatedir=/" - ]; + configureFlags = [ "--localstatedir=/" ]; - buildInputs = [ guile ]; - nativeBuildInputs = [ pkg-config guile ]; + buildInputs = [ guile guile-fibers ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { homepage = "https://www.gnu.org/software/shepherd/"; diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 9527c156e486..ac18998130a6 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,19 +1,19 @@ { stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile , python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff -, makeWrapper, t1utils +, makeWrapper, t1utils, boehmgc, rsync , texlive, tex ? texlive.combine { - inherit (texlive) scheme-small lh metafont epsf; + inherit (texlive) scheme-small lh metafont epsf fontinst; } }: stdenv.mkDerivation rec { pname = "lilypond"; - version = "2.22.2"; + version = "2.24.0"; src = fetchurl { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "sha256-3ekIVPp94QEvThMEpoYXrqmrMiky7AznaYT2DSaqI74="; + sha256 = "sha256-PO2+O5KwJWnjpvLwZ0hYlns9onjXCqPpiu9b3Nf3i2k="; }; postInstall = '' @@ -43,13 +43,18 @@ stdenv.mkDerivation rec { buildInputs = [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm python3 gettext perl fontconfig freetype pango - fontforge help2man groff t1utils + fontforge help2man groff t1utils boehmgc rsync ]; autoreconfPhase = "NOCONFIGURE=1 sh autogen.sh"; enableParallelBuilding = true; + passthru.updateScript = { + command = [ ./update.sh ]; + supportedFeatures = [ "commit" ]; + }; + meta = with lib; { description = "Music typesetting system"; homepage = "http://lilypond.org/"; diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index a8472b66f1fa..468cd51439ec 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -1,11 +1,14 @@ -{ lib, fetchurl, guile, lilypond }: +{ lib, fetchurl, lilypond }: -(lilypond.override { - inherit guile; -}).overrideAttrs (oldAttrs: rec { - version = "2.23.12"; +lilypond.overrideAttrs (oldAttrs: rec { + version = "2.25.1"; src = fetchurl { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "sha256-SLZ9/Jybltd8+1HANk8pTGHRb7MuZSJJDDY/S4Kwz/k="; + sha256 = "sha256-DchY+4+bWIvTZb4v9q/fAqStkbsxHhvty3eur0ZFYVs="; + }; + + passthru.updateScript = { + command = [ ./update.sh "unstable" ]; + supportedFeatures = [ "commit" ]; }; }) diff --git a/pkgs/misc/lilypond/update.sh b/pkgs/misc/lilypond/update.sh new file mode 100755 index 000000000000..e9c3f48805af --- /dev/null +++ b/pkgs/misc/lilypond/update.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl gnused nix + +set -euo pipefail + +if [ $# -gt 0 ] && [ "$1" = "unstable" ]; then + ATTR="lilypond-unstable" + FILE="$(dirname "${BASH_SOURCE[@]}")/unstable.nix" + QUERY="VERSION_DEVEL=" +else + ATTR="lilypond" + FILE="$(dirname "${BASH_SOURCE[@]}")/default.nix" + QUERY="VERSION_STABLE=" +fi + +# update version +PREV=$(nix eval --raw -f default.nix $ATTR.version) +NEXT=$(curl -s 'https://gitlab.com/lilypond/lilypond/-/raw/master/VERSION' | grep "$QUERY" | cut -d= -f2) +sed -i "s|$PREV|$NEXT|" "$FILE" +echo "[{\"commitMessage\":\"$ATTR: $PREV -> $NEXT\"}]" + +# update hash +PREV=$(nix eval --raw -f default.nix $ATTR.src.outputHash) +NEXT=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 $(nix eval --raw -f default.nix $ATTR.src.url))) +sed -i "s|$PREV|$NEXT|" "$FILE" diff --git a/pkgs/misc/logging/pacemaker/default.nix b/pkgs/misc/logging/pacemaker/default.nix index 5da634203dc6..7d8cd24e3d82 100644 --- a/pkgs/misc/logging/pacemaker/default.nix +++ b/pkgs/misc/logging/pacemaker/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "pacemaker"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = pname; rev = "Pacemaker-${version}"; - sha256 = "sha256-b3ljxAuawhqTnURBJMqy4Zzzfi8PCFwie/zC1yeErhQ="; + sha256 = "sha256-vsHWNKCrHJIgXlJYyZZEUfuIUBnaejPrPCM1HrYOTKQ="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/opensbi/default.nix b/pkgs/misc/opensbi/default.nix index 558f5c487ae1..6f7d80e3c5a1 100644 --- a/pkgs/misc/opensbi/default.nix +++ b/pkgs/misc/opensbi/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub +, python3 , withPlatform ? "generic" , withPayload ? null , withFDT ? null @@ -6,19 +9,21 @@ stdenv.mkDerivation rec { pname = "opensbi"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "riscv-software-src"; repo = "opensbi"; rev = "v${version}"; - sha256 = "sha256-k6f4/lWY/f7qqk0AFY4tdEi4cDilSv/jngaJYhKFlnY="; + sha256 = "sha256-Zcl+SE2nySMycV/ozsl4AvGipRsMblA5mt3oVZ81Z44="; }; postPatch = '' patchShebangs ./scripts ''; + nativeBuildInputs = [ python3 ]; + installFlags = [ "I=$(out)" ]; diff --git a/pkgs/misc/rich-cli/default.nix b/pkgs/misc/rich-cli/default.nix index 68996e4e457c..de4bee278c79 100644 --- a/pkgs/misc/rich-cli/default.nix +++ b/pkgs/misc/rich-cli/default.nix @@ -29,7 +29,8 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'rich = "^12.4.0"' 'rich = "*"' + --replace 'rich = "^12.4.0"' 'rich = "*"' \ + --replace 'textual = "^0.1.18"' 'textual = "*"' ''; pythonImportsCheck = [ @@ -40,6 +41,6 @@ python3.pkgs.buildPythonApplication rec { description = "Command Line Interface to Rich"; homepage = "https://github.com/Textualize/rich-cli"; license = licenses.mit; - maintainers = with maintainers; [ jyooru ]; + maintainers = with maintainers; [ joelkoen ]; }; } diff --git a/pkgs/misc/sagetex/default.nix b/pkgs/misc/sagetex/default.nix index a30f037d9c47..510219e51b9c 100644 --- a/pkgs/misc/sagetex/default.nix +++ b/pkgs/misc/sagetex/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "sagetex"; - version = "3.6"; + version = "3.6.1"; passthru.tlType = "run"; src = fetchFromGitHub { owner = "sagemath"; repo = "sagetex"; rev = "v${version}"; - sha256 = "8iHcJbaY/dh0vmvYyd6zj1ZbuJRaJGb6bUBK1v4gXWU="; + sha256 = "sha256-OfhbXHbGI+DaDHqZCOGiSHJPHjGuT7ZqSEjKweloW38="; }; buildInputs = [ diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 07ab96838520..fa2fab2d9627 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -2,6 +2,7 @@ , meson , ninja , pkg-config +, runtimeShell , installShellFiles , platform-tools @@ -11,10 +12,10 @@ }: let - version = "1.24"; + version = "1.25"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "sha256-rnSoHqecDcclDlhmJ8J4wKmoxd5GyftcOMFn+xo28FY="; + sha256 = "sha256-zgMGx7vQaucvbQb37A7jN3SZWmXeceCoOBPstnrsm9s="; }; in stdenv.mkDerivation rec { @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mL0lSZUPMMcLGq4iPp/IgYZLaTeey9Nv9vVwY1gaIRk="; + sha256 = "sha256-4U/ChooesjhZSvxvk9dZrpZ/X0lf62+LEn72Ubrm2eM="; }; # postPatch: @@ -52,6 +53,9 @@ stdenv.mkDerivation rec { # runtime dep on `adb` to push the server wrapProgram "$out/bin/scrcpy" --prefix PATH : "${platform-tools}/bin" + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace $out/share/applications/scrcpy-console.desktop \ + --replace "/bin/bash" "${runtimeShell}" ''; meta = with lib; { diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 74155f43c2b8..46af4b303dd6 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "Simple screen lock application for X server"; longDescription = '' alock locks the X server until the user enters a password - via the keyboard. If the authentification was successful + via the keyboard. If the authentication was successful the X server is unlocked and the user can continue to work. alock does not provide any fancy animations like xlock or diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 0ab0f6bee31e..35155559531a 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,6 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, ffmpeg, lua5_1, curl -, libpng, xorg, pkg-config, flam3, libgtop, boost, tinyxml, freeglut, libGLU, libGL -, glee }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, wxGTK32 +, ffmpeg +, lua5_1 +, curl +, libpng +, xorg +, pkg-config +, flam3 +, libgtop +, boost +, tinyxml +, freeglut +, libGLU +, libGL +, glee +}: stdenv.mkDerivation rec { pname = "electricsheep"; @@ -16,8 +33,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ - wxGTK30 ffmpeg lua5_1 curl libpng xorg.libXrender - flam3 libgtop boost tinyxml freeglut libGLU libGL glee + wxGTK32 + ffmpeg + lua5_1 + curl + libpng + xorg.libXrender + flam3 + libgtop + boost + tinyxml + freeglut + libGLU + libGL + glee ]; preAutoreconf = '' diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index 0ad2c77dc7ef..33db5825bc02 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -66,9 +66,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 72e283eaf11c..d2a6dfcec954 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -5,7 +5,7 @@ , gtk2, gdk-pixbuf, gdk-pixbuf-xlib, libxml2, pam , systemd, coreutils , forceInstallAllHacks ? false -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation rec { diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index a40cc6fd3383..121933f69e9c 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook , buildPythonApplication, pycairo, pygobject3 -, gobject-introspection, gtk3, librsvg +, gdk-pixbuf, gobject-introspection, gtk3, librsvg , alsa-utils, timidity, mpg123, vorbis-tools, csound, lilypond , automake, autoconf, txt2man }: @@ -29,7 +29,7 @@ buildPythonApplication rec { nativeBuildInputs = [ automake autoconf - + gdk-pixbuf gettext pkg-config texinfo diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix index 4d3aec01439f..d7a2e5d1f5fe 100644 --- a/pkgs/misc/sound-of-sorting/default.nix +++ b/pkgs/misc/sound-of-sorting/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, wxGTK32, Cocoa }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, SDL2 +, wxGTK32 +, darwin +}: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation { pname = "sound-of-sorting"; version = "unstable-2022-10-12"; diff --git a/pkgs/misc/superd/default.nix b/pkgs/misc/superd/default.nix new file mode 100644 index 000000000000..be018cb24126 --- /dev/null +++ b/pkgs/misc/superd/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildGoModule +, fetchFromSourcehut +, installShellFiles +, scdoc +}: + +buildGoModule rec { + pname = "superd"; + version = "0.7.1"; + + src = fetchFromSourcehut { + owner = "~craftyguy"; + repo = pname; + rev = version; + hash = "sha256-5g9Y1Lpxp9cUe0sNvU5CdsTGcN+j00gIKPO9pD5j8uM="; + }; + + vendorHash = "sha256-Oa99U3THyWLjH+kWMQAHO5QAS2mmtY7M7leej+gnEqo="; + + nativeBuildInputs = [ + installShellFiles + scdoc + ]; + + postBuild = '' + make doc + ''; + + postInstall = '' + installManPage superd.1 superd.service.5 superctl.1 + installShellCompletion --bash completions/bash/superctl + installShellCompletion --zsh completions/zsh/superctl + ''; + + meta = with lib; { + description = "Unprivileged user service supervisor"; + homepage = "https://sr.ht/~craftyguy/superd/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ chuangzhu wentam ]; + }; +} diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/misc/t-rec/default.nix index e138a62e39aa..2bbfeda4d321 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.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "sassman"; repo = "t-rec-rs"; rev = "v${version}"; - sha256 = "sha256-tkt0XAofBhHytbA24g0+jU13aNjmgQ5RspbLTPclnrI="; + sha256 = "sha256-o1fO0N65L6Z6W6aBNhS5JqDHIc1MRQx0yECGzVSCsbo="; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}" ''; - cargoSha256 = "sha256-bb0fwz0fI6DJWgnW0rX63qH2niCLtPeVKex7m6BhVWs="; + cargoHash = "sha256-3NExPlHNcoYVkpOzWCyd66chJpeDzQLRJUruSLAwGNw="; meta = with lib; { description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust"; diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/misc/talkfilters/default.nix index 0f265f7e259c..3b785dfc5664 100644 --- a/pkgs/misc/talkfilters/default.nix +++ b/pkgs/misc/talkfilters/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Converts English text into text that mimics a stereotyped or humorous dialect"; - homepage = "http://www.hyperrealm.com/talkfilters/talkfilters.html"; + homepage = "https://www.hyperrealm.com/talkfilters/talkfilters.html"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ ikervagyok ]; platforms = with lib.platforms; unix; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index f2dad8812874..08fc063765e4 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -101,7 +101,7 @@ in rec { }; meta = { homepage = "https://github.com/tmux-plugins/tmux-continuum"; - description = "continous saving of tmux environment"; + description = "continuous saving of tmux environment"; longDescription = '' Features: @@ -119,6 +119,29 @@ in rec { }; }; + copy-toolkit = mkTmuxPlugin rec { + pluginName = "copy-toolkit"; + rtpFilePath = "copytk.tmux"; + version = "1.1"; + src = fetchFromGitHub { + owner = "CrispyConductor"; + repo = "tmux-copy-toolkit"; + rev = "v${version}"; + sha256 = "MEMC9klm+PH66UHwrB2SqdCaZX0LAujL+Woo/hV84m4="; + }; + postInstall = '' + sed -i -e 's|python3 |${pkgs.python3}/bin/python3 |g' $target/copytk.tmux + sed -i -e 's|/bin/bash|${pkgs.bash}/bin/bash|g;s|/bin/cat|${pkgs.coreutils}/bin/cat|g' $target/copytk.py + ''; + meta = { + homepage = "https://github.com/CrispyConductor/tmux-copy-toolkit"; + description = "Various copy-mode tools"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ deejayem ]; + }; + }; + copycat = mkTmuxPlugin { pluginName = "copycat"; version = "unstable-2020-01-09"; @@ -132,12 +155,12 @@ in rec { cpu = mkTmuxPlugin { pluginName = "cpu"; - version = "unstable-2021-12-15"; + version = "unstable-2023-01-06"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-cpu"; - rev = "9eb3dba66672c5b43065e144cc3a1031f77ad67e"; - sha256 = "sha256-v/jZxsa+JwsSKjmA32VK/4gBNHP/SyOzTaYSSz2c0+4="; + rev = "98d787191bc3e8f19c3de54b96ba1caf61385861"; + sha256 = "sha256-ymmCI6VYvf94Ot7h2GAboTRBXPIREP+EB33+px5aaJk="; }; }; @@ -234,6 +257,32 @@ in rec { ''; }; + fuzzback = mkTmuxPlugin { + pluginName = "fuzzback"; + version = "unstable-2022-11-21"; + src = fetchFromGitHub { + owner = "roosta"; + repo = "tmux-fuzzback"; + rev = "bfd9cf0ef1c35488f0080f0c5ca4fddfdd7e18ec"; + sha256 = "w788xDBkfiLdUVv1oJi0YikFPqVk6LiN6PDfHu8on5E="; + }; + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + for f in fuzzback.sh preview.sh supported.sh; do + chmod +x $target/scripts/$f + wrapProgram $target/scripts/$f \ + --prefix PATH : ${with pkgs; lib.makeBinPath [ coreutils fzf gawk gnused ]} + done + ''; + meta = { + homepage = "https://github.com/roosta/tmux-fuzzback"; + description = "Fuzzy search for terminal scrollback"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ deejayem ]; + }; + }; + fzf-tmux-url = mkTmuxPlugin { pluginName = "fzf-tmux-url"; rtpFilePath = "fzf-url.tmux"; @@ -291,6 +340,24 @@ in rec { }; }; + mode-indicator = mkTmuxPlugin rec { + pluginName = "mode-indicator"; + version = "unstable-2021-10-01"; + src = fetchFromGitHub { + owner = "MunifTanjim"; + repo = "tmux-mode-indicator"; + rev = "11520829210a34dc9c7e5be9dead152eaf3a4423"; + sha256 = "sha256-hlhBKC6UzkpUrCanJehs2FxK5SoYBoiGiioXdx6trC4="; + }; + meta = with lib; { + homepage = "https://github.com/MunifTanjim/tmux-mode-indicator"; + description = "Plugin that displays prompt indicating currently active Tmux mode"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ aacebedo ]; + }; + }; + net-speed = mkTmuxPlugin { pluginName = "net-speed"; version = "unstable-2018-12-02"; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 2937e1ca862b..42d7021f3452 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -92,6 +92,16 @@ let passAsFile = [ "extraConfig" ]; + # Workaround '-idirafter' ordering bug in staging-next: + # https://github.com/NixOS/nixpkgs/pull/210004 + # where libc '-idirafter' gets added after user's idirafter and + # breaks. + # TODO(trofi): remove it in staging once fixed in cc-wrapper. + preConfigure = '' + export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] buildPackages.stdenv.hostPlatform.config}=$(< ${buildPackages.stdenv.cc}/nix-support/libc-cflags) + export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] stdenv.hostPlatform.config}=$(< ${stdenv.cc}/nix-support/libc-cflags) + ''; + configurePhase = '' runHook preConfigure @@ -119,7 +129,7 @@ let dontStrip = true; meta = with lib; { - homepage = "http://www.denx.de/wiki/U-Boot/"; + homepage = "https://www.denx.de/wiki/U-Boot/"; description = "Boot loader for embedded systems"; license = licenses.gpl2; maintainers = with maintainers; [ bartsch dezgeg samueldr lopsided98 ]; @@ -211,6 +221,47 @@ in { ''; }; + # Flashing instructions: + # dd if=u-boot.gxl.sd.bin of= conv=fsync,notrunc bs=512 skip=1 seek=1 + # dd if=u-boot.gxl.sd.bin of= conv=fsync,notrunc bs=1 count=444 + ubootLibreTechCC = let + firmwareImagePkg = fetchFromGitHub { + owner = "LibreELEC"; + repo = "amlogic-boot-fip"; + rev = "4369a138ca24c5ab932b8cbd1af4504570b709df"; + sha256 = "sha256-mGRUwdh3nW4gBwWIYHJGjzkezHxABwcwk/1gVRis7Tc="; + meta.license = lib.licenses.unfreeRedistributableFirmware; + }; + in + assert stdenv.buildPlatform.system == "x86_64-linux"; # aml_encrypt_gxl is a x86_64 binary + buildUBoot { + defconfig = "libretech-cc_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = ["u-boot.bin"]; + postBuild = '' + # Copy binary files & tools from LibreELEC/amlogic-boot-fip, and u-boot build to working dir + mkdir $out tmp + cp ${firmwareImagePkg}/lepotato/{acs.bin,bl2.bin,bl21.bin,bl30.bin,bl301.bin,bl31.img} \ + ${firmwareImagePkg}/lepotato/{acs_tool.py,aml_encrypt_gxl,blx_fix.sh} \ + u-boot.bin tmp/ + cd tmp + python3 acs_tool.py bl2.bin bl2_acs.bin acs.bin 0 + + bash -e blx_fix.sh bl2_acs.bin zero bl2_zero.bin bl21.bin bl21_zero.bin bl2_new.bin bl2 + [ -f zero ] && rm zero + + bash -e blx_fix.sh bl30.bin zero bl30_zero.bin bl301.bin bl301_zero.bin bl30_new.bin bl30 + [ -f zero ] && rm zero + + ./aml_encrypt_gxl --bl2sig --input bl2_new.bin --output bl2.n.bin.sig + ./aml_encrypt_gxl --bl3enc --input bl30_new.bin --output bl30_new.bin.enc + ./aml_encrypt_gxl --bl3enc --input bl31.img --output bl31.img.enc + ./aml_encrypt_gxl --bl3enc --input u-boot.bin --output bl33.bin.enc + ./aml_encrypt_gxl --bootmk --output $out/u-boot.gxl \ + --bl2 bl2.n.bin.sig --bl30 bl30_new.bin.enc --bl31 bl31.img.enc --bl33 bl33.bin.enc + ''; + }; + ubootNanoPCT4 = buildUBoot rec { rkbin = fetchFromGitHub { owner = "armbian"; diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index ae249eb9292e..9131f66491d5 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -1,28 +1,41 @@ -{ lib, rustPlatform, fetchFromGitHub, ncurses, openssl, pkg-config, stdenv, Security, fetchpatch }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, ncurses +, openssl +, pkg-config +, Security +}: rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Builditluc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sqkVi8w4QoktC1ZLUPHzfMUxIzCadcIj3dEYigz854U="; + hash = "sha256-WiyRBF3rWLpOZ8mxT89ImRL++Oq9+b88oSKjr4tzCGs="; }; - buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ + pkg-config + ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + ncurses + openssl + ] ++ lib.optional stdenv.isDarwin [ + Security + ]; - cargoSha256 = "sha256-xRj0bF5VymvFVB0tSBndWA+OHBIEY2/ovRIBdDoOHA4="; - - # Tests fail with this error: `found argument --test-threads which was not expected` - doCheck = false; + cargoHash = "sha256-R9xxIDqkU7FeulpD7PUM6aHgA67PVgqxHKYtdrjdaUo="; meta = with lib; { description = "A simple and easy to use Wikipedia Text User Interface"; homepage = "https://github.com/builditluc/wiki-tui"; + changelog = "https://github.com/Builditluc/wiki-tui/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ lom builditluc ]; }; diff --git a/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix index 86c63fc50654..e7252ab35e63 100644 --- a/pkgs/os-specific/bsd/freebsd/default.nix +++ b/pkgs/os-specific/bsd/freebsd/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, stdenvNoCC -, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget -, buildPackages, splicePackages, newScope +, makeScopeWithSplicing, generateSplicesForMkScope +, buildPackages , bsdSetupHook, makeSetupHook -, fetchgit, fetchurl, coreutils, groff, mandoc, byacc, flex, which, m4, gawk, substituteAll, runtimeShell +, fetchgit, fetchzip, coreutils, groff, mandoc, byacc, flex, which, m4, gawk, substituteAll, runtimeShell , zlib, expat, libmd , runCommand, writeShellScript, writeText, symlinkJoin }: @@ -24,14 +24,6 @@ let name = "freebsd-setup-hook"; } ./setup-hook.sh; - otherSplices = { - selfBuildBuild = pkgsBuildBuild.freebsd; - selfBuildHost = pkgsBuildHost.freebsd; - selfBuildTarget = pkgsBuildTarget.freebsd; - selfHostHost = pkgsHostHost.freebsd; - selfTargetTarget = pkgsTargetTarget.freebsd or {}; # might be missing - }; - mkBsdArch = stdenv': { x86_64 = "amd64"; aarch64 = "arm64"; @@ -74,10 +66,8 @@ let done ''; -in lib.makeScopeWithSplicing - splicePackages - newScope - otherSplices +in makeScopeWithSplicing + (generateSplicesForMkScope "freebsd") (_: {}) (_: {}) (self: let @@ -85,6 +75,11 @@ in lib.makeScopeWithSplicing in { inherit freebsdSrc; + ports = fetchzip { + url = "https://cgit.freebsd.org/ports/snapshot/ports-dde3b2b456c3a4bdd217d0bf3684231cc3724a0a.tar.gz"; + sha256 = "BpHqJfnGOeTE7tkFJBx0Wk8ryalmf4KNTit/Coh026E="; + }; + # Why do we have splicing and yet do `nativeBuildInputs = with self; ...`? # See note in ../netbsd/default.nix. @@ -398,6 +393,12 @@ in lib.makeScopeWithSplicing outputs = [ "out" "man" "test" ]; }; + sed = mkDerivation { + path = "usr.bin/sed"; + TESTSRC = "${freebsdSrc}/contrib/netbsd-tests"; + MK_TESTS = "no"; + }; + # Don't add this to nativeBuildInputs directly. Use statHook instead. stat = mkDerivation { path = "usr.bin/stat"; diff --git a/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix b/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix new file mode 100644 index 000000000000..3c3dcb6d5d67 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix @@ -0,0 +1,64 @@ +{ lib, stdenv, linuxHeaders, freebsd, runCommandCC, buildPackages }: + +stdenv.mkDerivation { + pname = "evdev-proto"; + inherit (linuxHeaders) version; + + src = freebsd.ports; + + sourceRoot = "source/devel/evdev-proto"; + + useTempPrefix = true; + + nativeBuildInputs = [ freebsd.makeMinimal ]; + + ARCH = freebsd.makeMinimal.MACHINE_ARCH; + OPSYS = "FreeBSD"; + _OSRELEASE = "${lib.versions.majorMinor freebsd.makeMinimal.version}-RELEASE"; + + AWK = "awk"; + CHMOD = "chmod"; + FIND = "find"; + MKDIR = "mkdir -p"; + PKG_BIN = "${buildPackages.pkg}/bin/pkg"; + RM = "rm -f"; + SED = "${buildPackages.freebsd.sed}/bin/sed"; + SETENV = "env"; + SH = "sh"; + TOUCH = "touch"; + XARGS = "xargs"; + + ABI_FILE = runCommandCC "abifile" {} "$CC -shared -o $out"; + CLEAN_FETCH_ENV = true; + INSTALL_AS_USER = true; + NO_CHECKSUM = true; + NO_MTREE = true; + SRC_BASE = freebsd.freebsdSrc; + + preUnpack = '' + export MAKE_JOBS_NUMBER="$NIX_BUILD_CORES" + + export DISTDIR="$PWD/distfiles" + export PKG_DBDIR="$PWD/pkg" + export PREFIX="$prefix" + + mkdir -p "$DISTDIR/evdev-proto" + tar -C "$DISTDIR/evdev-proto" \ + -xf ${linuxHeaders.src} \ + --strip-components 4 \ + linux-${linuxHeaders.version}/include/uapi/linux + ''; + + makeFlags = [ "DIST_SUBDIR=evdev-proto" ]; + + postInstall = '' + mv $prefix $out + ''; + + meta = with lib; { + description = "Input event device header files for FreeBSD"; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.freebsd; + license = licenses.gpl2Only; + }; +} diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 4219706a3526..1033927ce675 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, stdenvNoCC -, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget -, buildPackages, splicePackages, newScope +, makeScopeWithSplicing, generateSplicesForMkScope +, buildPackages , bsdSetupHook, makeSetupHook, fetchcvs, groff, mandoc, byacc, flex , zlib , writeShellScript, writeText, runtimeShell, symlinkJoin @@ -20,24 +20,14 @@ let name = "netbsd-setup-hook"; } ./setup-hook.sh; - otherSplices = { - selfBuildBuild = pkgsBuildBuild.netbsd; - selfBuildHost = pkgsBuildHost.netbsd; - selfBuildTarget = pkgsBuildTarget.netbsd; - selfHostHost = pkgsHostHost.netbsd; - selfTargetTarget = pkgsTargetTarget.netbsd or {}; # might be missing - }; - defaultMakeFlags = [ "MKSOFTFLOAT=${if stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft" then "yes" else "no"}" ]; -in lib.makeScopeWithSplicing - splicePackages - newScope - otherSplices +in makeScopeWithSplicing + (generateSplicesForMkScope "netbsd") (_: {}) (_: {}) (self: let @@ -46,7 +36,7 @@ in lib.makeScopeWithSplicing # Why do we have splicing and yet do `nativeBuildInputs = with self; ...`? # - # We use `lib.makeScopeWithSplicing` because this should be used for all + # We use `makeScopeWithSplicing` because this should be used for all # nested package sets which support cross, so the inner `callPackage` works # correctly. But for the inline packages we don't bother to use # `callPackage`. @@ -64,7 +54,8 @@ in lib.makeScopeWithSplicing mkDerivation = lib.makeOverridable (attrs: let stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; in stdenv'.mkDerivation ({ - name = "${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; + pname = "${attrs.pname or (baseNameOf attrs.path)}-netbsd"; + inherit (attrs) version; src = fetchNetBSD attrs.path attrs.version attrs.sha256; extraPaths = [ ]; @@ -689,6 +680,13 @@ in lib.makeScopeWithSplicing ## ## START LIBRARIES ## + libarch = mkDerivation { + path = "lib/libarch"; + version = "9.2"; + sha256 = "6ssenRhuSwp0Jn71ErT0PrEoCJ+cIYRztwdL4QTDZsQ="; + meta.platforms = lib.platforms.netbsd; + }; + libutil = mkDerivation { path = "lib/libutil"; version = "9.2"; @@ -818,6 +816,16 @@ in lib.makeScopeWithSplicing meta.platforms = lib.platforms.netbsd; }; + libpci = mkDerivation { + pname = "libpci"; + path = "lib/libpci"; + version = "9.2"; + sha256 = "+IOEO1Bw3/H3iCp3uk3bwsFZbvCqN5Ciz70irnPl8E8="; + NIX_CFLAGS_COMPILE = [ "-I." ]; + meta.platforms = lib.platforms.netbsd; + extraPaths = with self; [ sys.src ]; + }; + libpthread-headers = mkDerivation { pname = "libpthread-headers"; path = "lib/libpthread"; diff --git a/pkgs/os-specific/darwin/DarwinTools/default.nix b/pkgs/os-specific/darwin/DarwinTools/default.nix index f648435eed27..72a375028453 100644 --- a/pkgs/os-specific/darwin/DarwinTools/default.nix +++ b/pkgs/os-specific/darwin/DarwinTools/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "1"; src = fetchurl { - url = "https://opensource.apple.com/tarballs/DarwinTools/DarwinTools-${version}.tar.gz"; - sha256 = "0hh4jl590jv3v830p77r3jcrnpndy7p2b8ajai3ldpnx2913jfhp"; + url = "https://web.archive.org/web/20180408044816/https://opensource.apple.com/tarballs/DarwinTools/DarwinTools-${version}.tar.gz"; + hash = "sha256-Fzo5QhLd3kZHVFKhJe7xzV6bmRz5nAsG2mNLkAqVBEI="; }; patches = [ diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix index b7666fe31cdb..839548ae8ffd 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix @@ -45,12 +45,20 @@ let cp -r ${MacOSX-SDK}${standardFrameworkPath name private} $out/Library/Frameworks + if [[ -d ${MacOSX-SDK}/usr/lib/swift/${name}.swiftmodule ]]; then + mkdir -p $out/lib/swift + cp -r -t $out/lib/swift \ + ${MacOSX-SDK}/usr/lib/swift/${name}.swiftmodule \ + ${MacOSX-SDK}/usr/lib/swift/libswift${name}.tbd + fi + # Fix and check tbd re-export references chmod u+w -R $out find $out -name '*.tbd' -type f | while read tbd; do echo "Fixing re-exports in $tbd" rewrite-tbd \ -p ${standardFrameworkPath name private}/:$out/Library/Frameworks/${name}.framework/ \ + -p /usr/lib/swift/:$out/lib/swift/ \ ${mkDepsRewrites deps} \ -r ${builtins.storeDir} \ "$tbd" @@ -163,6 +171,15 @@ in rec { # Seems to be appropriate given https://developer.apple.com/forums/thread/666686 JavaVM = super.JavaNativeFoundation; + + CoreVideo = lib.overrideDerivation super.CoreVideo (drv: { + installPhase = drv.installPhase + '' + # When used as a module, complains about a missing import for + # Darwin.C.stdint. Apparently fixed in later SDKs. + awk -i inplace '/CFBase.h/ { print "#include " } { print }' \ + $out/Library/Frameworks/CoreVideo.framework/Headers/CVBase.h + ''; + }); }; bareFrameworks = ( @@ -174,6 +191,7 @@ in rec { ) // ( lib.mapAttrs privateFramework (import ./private-frameworks.nix { inherit frameworks; + libobjc = pkgs.darwin.apple_sdk_11_0.objc4; }) ); diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index 4565f698d26c..145c98496b49 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -3,16 +3,7 @@ , xar, cpio, python3, pbzx }: let - MacOSX-SDK = stdenvNoCC.mkDerivation rec { - pname = "MacOSX-SDK"; - version = "11.0.0"; - - # https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog - src = fetchurl { - url = "http://swcdn.apple.com/content/downloads/46/21/001-89745-A_56FM390IW5/v1um2qppgfdnam2e9cdqcqu2r6k8aa3lis/CLTools_macOSNMOS_SDK.pkg"; - sha256 = "0n425smj4q1vxbza8fzwnk323fyzbbq866q32w288c44hl5yhwsf"; - }; - + mkSusDerivation = args: stdenvNoCC.mkDerivation (args // { dontBuild = true; darwinDontCodeSign = true; @@ -24,16 +15,45 @@ let pbzx $src | cpio -idm ''; + passthru = { + inherit (args) version; + }; + }); + + MacOSX-SDK = mkSusDerivation { + pname = "MacOSX-SDK"; + version = "11.0.0"; + + # https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog + src = fetchurl { + url = "http://swcdn.apple.com/content/downloads/46/21/001-89745-A_56FM390IW5/v1um2qppgfdnam2e9cdqcqu2r6k8aa3lis/CLTools_macOSNMOS_SDK.pkg"; + sha256 = "0n425smj4q1vxbza8fzwnk323fyzbbq866q32w288c44hl5yhwsf"; + }; + installPhase = '' cd Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk mkdir $out cp -r System usr $out/ ''; + }; - passthru = { - inherit version; + CLTools_Executables = mkSusDerivation { + pname = "CLTools_Executables"; + version = "11.0.0"; + + # https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog + src = fetchurl { + url = "http://swcdn.apple.com/content/downloads/46/21/001-89745-A_56FM390IW5/v1um2qppgfdnam2e9cdqcqu2r6k8aa3lis/CLTools_Executables.pkg"; + sha256 = "0nvb1qx7l81l2wcl8wvgbpsg5rcn51ylhivqmlfr2hrrv3zrrpl0"; }; + + installPhase = '' + cd Library/Developer/CommandLineTools + + mkdir $out + cp -r Library usr $out/ + ''; }; callPackage = newScope (packages // pkgs.darwin // { inherit MacOSX-SDK; }); @@ -43,13 +63,14 @@ let # TODO: this is nice to be private. is it worth the callPackage above? # Probably, I don't think that callPackage costs much at all. - inherit MacOSX-SDK; + inherit MacOSX-SDK CLTools_Executables; Libsystem = callPackage ./libSystem.nix {}; LibsystemCross = pkgs.darwin.Libsystem; libcharset = callPackage ./libcharset.nix {}; libunwind = callPackage ./libunwind.nix {}; libnetwork = callPackage ./libnetwork.nix {}; + libpm = callPackage ./libpm.nix {}; # Avoid introducing a new objc4 if stdenv already has one, to prevent # conflicting LLVM modules. objc4 = if stdenv ? objc4 then stdenv.objc4 else callPackage ./libobjc.nix {}; @@ -58,17 +79,23 @@ let configd = pkgs.darwin.apple_sdk.frameworks.SystemConfiguration; IOKit = pkgs.darwin.apple_sdk.frameworks.IOKit; - callPackage = newScope (lib.optionalAttrs stdenv.isDarwin rec { + xcodebuild = pkgs.xcbuild.override { inherit (pkgs.darwin.apple_sdk_11_0) stdenv; + inherit (pkgs.darwin.apple_sdk_11_0.frameworks) CoreServices CoreGraphics ImageIO; + }; + + rustPlatform = pkgs.makeRustPlatform { + inherit (pkgs.darwin.apple_sdk_11_0) stdenv; + inherit (pkgs) rustc cargo; + }; + + callPackage = newScope (lib.optionalAttrs stdenv.isDarwin rec { + inherit (pkgs.darwin.apple_sdk_11_0) stdenv xcodebuild rustPlatform; darwin = pkgs.darwin.overrideScope (_: prev: { inherit (prev.darwin.apple_sdk_11_0) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security; apple_sdk = prev.darwin.apple_sdk_11_0; CF = prev.darwin.apple_sdk_11_0.CoreFoundation; }); - xcodebuild = pkgs.xcbuild.override { - inherit (pkgs.darwin.apple_sdk_11_0.frameworks) CoreServices CoreGraphics ImageIO; - inherit stdenv; - }; xcbuild = xcodebuild; }); diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix index dc4ab1955b50..59cbc2b1063a 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix @@ -75,7 +75,7 @@ FileProviderUI = {}; FinderSync = {}; ForceFeedback = { inherit IOKit; }; - Foundation = { inherit ApplicationServices CoreFoundation Security SystemConfiguration libobjc; }; + Foundation = { inherit ApplicationServices CoreFoundation Security SystemConfiguration Combine libobjc; }; GLKit = {}; GLUT = { inherit OpenGL; }; GSS = {}; @@ -169,7 +169,7 @@ Speech = {}; SpriteKit = {}; StoreKit = {}; - SwiftUI = {}; + SwiftUI = { inherit AppKit DeveloperToolsSupport UniformTypeIdentifiers; }; SyncServices = {}; System = {}; SystemConfiguration = { inherit Security; }; diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix index 0297f8897f12..7be670425d7a 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation { ]; installPhase = '' - mkdir -p $out/{include,lib} + mkdir -p $out/{include,lib/swift} for dir in $includeDirs; do from=${MacOSX-SDK}/usr/include/$dir @@ -57,6 +57,13 @@ stdenvNoCC.mkDerivation { $out/lib done + for name in os Dispatch; do + cp -dr \ + ${MacOSX-SDK}/usr/lib/swift/$name.swiftmodule \ + ${MacOSX-SDK}/usr/lib/swift/libswift$name.tbd \ + $out/lib/swift + done + for f in $csu; do from=${MacOSX-SDK}/usr/lib/$f if [ -e "$from" ]; then @@ -71,6 +78,7 @@ stdenvNoCC.mkDerivation { rewrite-tbd \ -c /usr/lib/libsystem.dylib:$out/lib/libsystem.dylib \ -p /usr/lib/system/:$out/lib/system/ \ + -p /usr/lib/swift/:$out/lib/swift/ \ -r ${builtins.storeDir} \ "$tbd" done diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix index 63ef2a1c263e..9288097ef369 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix @@ -8,14 +8,17 @@ let self = stdenvNoCC.mkDerivation { dontBuild = true; installPhase = '' - mkdir -p $out/{include,lib} + mkdir -p $out/{include,lib/swift} cp -r ${MacOSX-SDK}/usr/include/objc $out/include cp ${MacOSX-SDK}/usr/lib/libobjc* $out/lib + cp -r ${MacOSX-SDK}/usr/lib/swift/ObjectiveC.swiftmodule $out/lib/swift + cp ${MacOSX-SDK}/usr/lib/swift/libswiftObjectiveC.tbd $out/lib/swift ''; passthru = { tbdRewrites = { const."/usr/lib/libobjc.A.dylib" = "${self}/lib/libobjc.A.dylib"; + const."/usr/lib/swift/libswiftObjectiveC.dylib" = "${self}/lib/swift/libswiftObjectiveC.dylib"; }; }; }; in self diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/libpm.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/libpm.nix new file mode 100644 index 000000000000..995f2b20ce70 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/libpm.nix @@ -0,0 +1,23 @@ +{ stdenvNoCC, MacOSX-SDK, checkReexportsHook }: + +stdenvNoCC.mkDerivation { + pname = "libpm"; + version = MacOSX-SDK.version; + + dontUnpack = true; + dontBuild = true; + + nativeBuildInputs = [ checkReexportsHook ]; + + installPhase = '' + mkdir -p $out/lib + cp ${MacOSX-SDK}/usr/lib/libpm* $out/lib + ''; + + passthru = { + tbdRewrites = { + const."/usr/lib/libpmenergy.dylib" = "${placeholder "out"}/lib/libpmenergy.dylib"; + const."/usr/lib/libpmsample.dylib" = "${placeholder "out"}/lib/libpmsample.dylib"; + }; + }; +} diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix index b8786ec92f6d..27749dde100a 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix @@ -1,4 +1,4 @@ -{ frameworks }: with frameworks; +{ frameworks, libobjc }: with frameworks; # generated by hand to avoid exposing all private frameworks # frameworks here are only the necessary ones used by public frameworks. { @@ -18,4 +18,13 @@ # Also expose CoreSymbolication; used by `root` package. CoreSymbolication = {}; + + # Also expose DebugSymbols; used by `llvmPackages_8.lldb` package. + DebugSymbols = {}; + + # Also expose DisplayServices; used by `sketchybar` package. + DisplayServices = { inherit libobjc; }; + + # Also expose MultitouchSupport; used by `chuck` package. + MultitouchSupport = {}; } diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 0cf95cbe9c56..5cf37e8f4026 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -326,7 +326,17 @@ in rec { "Versions/A/Frameworks/WebKitLegacy.framework/Versions/A/WebKitLegacy.tbd" ]; }); - } // lib.genAttrs [ "ContactsPersistence" "CoreSymbolication" "GameCenter" "SkyLight" "UIFoundation" ] (x: tbdOnlyFramework x {}); + } // lib.genAttrs [ + "ContactsPersistence" + "CoreSymbolication" + "DebugSymbols" + "DisplayServices" + "GameCenter" + "MultitouchSupport" + "SkyLight" + "UIFoundation" + ] + (x: tbdOnlyFramework x {}); bareFrameworks = lib.mapAttrs framework (import ./frameworks.nix { inherit frameworks libs; diff --git a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix index b413744677d2..74f1160e4306 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix @@ -5,8 +5,6 @@ appleDerivation' stdenv { srcs = lib.attrValues IOKitSrcs; sourceRoot = "."; - phases = [ "unpackPhase" "installPhase" ]; - __propagatedImpureHostDeps = [ "/System/Library/Frameworks/IOKit.framework/IOKit" "/System/Library/Frameworks/IOKit.framework/Resources" diff --git a/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix b/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix index bb09adce252e..f4fe65b8066c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix @@ -1,8 +1,6 @@ { appleDerivation', stdenv, darwin-stubs }: appleDerivation' stdenv { - phases = [ "unpackPhase" "installPhase" ]; - __propagatedImpureHostDeps = [ "/System/Library/Frameworks/Security.framework/Security" "/System/Library/Frameworks/Security.framework/Resources" diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix index 1f13cbef9fc9..6678f1f5b253 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix @@ -1,9 +1,9 @@ -{ appleDerivation, xcbuildHook, CoreSymbolication +{ appleDerivation, xcbuildHook, CoreSymbolication, apple_sdk , xnu, bison, flex, darling, stdenv, fixDarwinDylibNames }: appleDerivation { nativeBuildInputs = [ xcbuildHook flex bison fixDarwinDylibNames ]; - buildInputs = [ CoreSymbolication darling xnu ]; + buildInputs = [ CoreSymbolication apple_sdk.frameworks.CoreSymbolication darling xnu ]; # -fcommon: workaround build failure on -fno-common toolchains: # duplicate symbol '_kCSRegionMachHeaderName' in: libproc.o dt_module_apple.o NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers -Wno-error=implicit-function-declaration -fcommon"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh b/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh index d7c3fc89c525..418a1d625d6a 100755 --- a/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh +++ b/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh @@ -1,8 +1,16 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl +#!nix-shell -i bash -p curl jq -# usage: -# generate-sdk-packages.sh macos 11.0.1 +usage() { + cat <>$outfile echo "$pname = applePackage' \"$pname\" \"$version\" \"$sdkName\" \"$sha256\" {};" fi } -readarray -s1 -c1 -C parse_line < <(curl -sS "https://opensource.apple.com/text/${sdkName//./}.txt") +readarray -s1 -c1 -C parse_line < <(curl -sSL "https://github.com/apple-oss-distributions/distribution-${1//-/_}/raw/${sdkName//./}/release.json" | jq -r ".projects[].tag") >>$outfile echo '}' diff --git a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix index 64de728805fd..4082f5b760cf 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix @@ -1,8 +1,7 @@ { appleDerivation', stdenvNoCC }: appleDerivation' stdenvNoCC { - phases = [ "unpackPhase" "installPhase" ]; - + dontBuild = true; installPhase = '' mkdir -p $out/include cp mDNSShared/dns_sd.h $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix index 2fc4afa77d9f..315f0fb06219 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix @@ -1,8 +1,6 @@ { appleDerivation, darwin-stubs }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - # Not strictly necessary, since libSystem depends on it, but it's nice to be explicit so we # can easily find out what's impure. __propagatedImpureHostDeps = [ diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index c5bc50cafd71..3b1a26368732 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, binutils-unwrapped, cctools, llvm, clang-unwrapped }: +{ lib, stdenv, makeWrapper, binutils-unwrapped, cctools, llvm, clang-unwrapped, dualAs ? false }: # Make sure both underlying packages claim to have prepended their binaries # with the same targetPrefix. @@ -15,7 +15,7 @@ in # TODO: loop over targetPrefixed binaries too stdenv.mkDerivation { - pname = "${targetPrefix}cctools-binutils-darwin"; + pname = "${targetPrefix}cctools-binutils-darwin" + lib.optionalString dualAs "-dualas"; inherit (cctools) version; outputs = [ "out" "man" ]; buildCommand = '' @@ -59,9 +59,33 @@ stdenv.mkDerivation { rm $out/bin/${targetPrefix}as makeWrapper "${clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \ --add-flags "-x assembler -integrated-as -c" + '' + # x86-64 Darwin gnatboot emits assembly + # with MOVQ as the mnemonic for quadword interunit moves + # such as `movq %rbp, %xmm0`. + # The clang integrated assembler recognises this as valid, + # but unfortunately the cctools-port GNU assembler does not; + # it instead uses MOVD as the mnemonic. + # The assembly that a GCC build emits is determined at build time + # and cannot be changed afterwards. + # + # To build GNAT on x86-64 Darwin, therefore, + # we need both the clang _and_ the cctools-port assemblers to be available: + # the former to build at least the stage1 compiler, + # and the latter at least to be detectable + # as the target for the final compiler. + # + # We choose to match the Aarch64 case above, + # wrapping the clang integrated assembler as `as`. + # It then seems sensible to wrap the cctools GNU assembler as `gas`. + # + + lib.optionalString (stdenv.isx86_64 && dualAs) '' + mv $out/bin/${targetPrefix}as $out/bin/${targetPrefix}gas + makeWrapper "${clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \ + --add-flags "-x assembler -integrated-as -c" ''; - nativeBuildInputs = lib.optionals stdenv.isAarch64 [ makeWrapper ]; + nativeBuildInputs = lib.optionals (stdenv.isAarch64 || dualAs) [ makeWrapper ]; passthru = { inherit targetPrefix; diff --git a/pkgs/os-specific/darwin/cctools/apple.nix b/pkgs/os-specific/darwin/cctools/apple.nix new file mode 100644 index 000000000000..f8ff90dbb13f --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/apple.nix @@ -0,0 +1,118 @@ +{ lib, stdenv, fetchurl, symlinkJoin, xcbuildHook, tcsh, libobjc, libtapi, libunwind, llvm, memstreamHook, xar }: + +let + +cctools = stdenv.mkDerivation rec { + pname = "cctools"; + version = "973.0.1"; + + src = fetchurl { + url = "https://opensource.apple.com/tarballs/cctools/cctools-${version}.tar.gz"; + hash = "sha256-r/6tsyyfi3R/0cLl+lN/B9ZaOaVF+Z7vJ6xj4LzSgiQ="; + }; + + patches = [ + ./cctools-add-missing-vtool-libstuff-dep.patch + ]; + + postPatch = '' + for file in libstuff/writeout.c misc/libtool.c misc/lipo.c; do + substituteInPlace "$file" \ + --replace '__builtin_available(macOS 10.12, *)' '0' + done + substituteInPlace libmacho/swap.c \ + --replace '#ifndef RLD' '#if 1' + ''; + + nativeBuildInputs = [ xcbuildHook memstreamHook ]; + buildInputs = [ libobjc llvm ]; + + xcbuildFlags = [ + "MACOSX_DEPLOYMENT_TARGET=10.12" + ]; + + doCheck = true; + checkPhase = '' + runHook preCheck + + Products/Release/libstuff_test + rm Products/Release/libstuff_test + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + rm -rf "$out/usr" + mkdir -p "$out/bin" + find Products/Release -maxdepth 1 -type f -perm 755 -exec cp {} "$out/bin/" \; + cp -r include "$out/" + + ln -s ./nm-classic "$out"/bin/nm + ln -s ./otool-classic "$out"/bin/otool + + runHook postInstall + ''; +}; + +ld64 = stdenv.mkDerivation rec { + pname = "ld64"; + version = "609"; + + src = fetchurl { + url = "https://opensource.apple.com/tarballs/ld64/ld64-${version}.tar.gz"; + hash = "sha256-SqQ7SqmK+uOPijzxOTqtkEu3qYmcth6H7rrQ03R1Q+4="; + }; + + postPatch = '' + substituteInPlace ld64.xcodeproj/project.pbxproj \ + --replace "/bin/csh" "${tcsh}/bin/tcsh" \ + --replace 'F9E8D4BE07FCAF2A00FD5801 /* PBXBuildRule */,' "" \ + --replace 'F9E8D4BD07FCAF2000FD5801 /* PBXBuildRule */,' "" + + sed -i src/ld/Options.cpp -e '1iconst char ldVersionString[] = "${version}";' + ''; + + nativeBuildInputs = [ xcbuildHook ]; + buildInputs = [ + libtapi + libunwind + llvm + xar + ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + find Products/Release-assert -maxdepth 1 -type f -perm 755 -exec cp {} "$out/bin/" \; + + runHook postInstall + ''; +}; + +in + +symlinkJoin rec { + name = "cctools-${version}"; + version = "${cctools.version}-${ld64.version}"; + + paths = [ + cctools + ld64 + ]; + + # workaround for the fetch-tarballs script + passthru = { + inherit (cctools) src; + ld64_src = ld64.src; + }; + + meta = with lib; { + description = "MacOS Compiler Tools"; + homepage = "http://www.opensource.apple.com/source/cctools/"; + license = licenses.apsl20; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/os-specific/darwin/cctools/cctools-add-missing-vtool-libstuff-dep.patch b/pkgs/os-specific/darwin/cctools/cctools-add-missing-vtool-libstuff-dep.patch new file mode 100644 index 000000000000..1cd65ec6bcf1 --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/cctools-add-missing-vtool-libstuff-dep.patch @@ -0,0 +1,11 @@ +diff -ru a/cctools.xcodeproj/project.pbxproj b/cctools.xcodeproj/project.pbxproj +--- a/cctools.xcodeproj/project.pbxproj 2021-02-24 20:30:55.000000000 -0500 ++++ b/cctools.xcodeproj/project.pbxproj 2022-01-31 20:01:09.000000000 -0500 +@@ -2558,6 +2558,7 @@ + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( ++ DE97E92421F3B86100C7947D /* libstuff.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; diff --git a/pkgs/os-specific/darwin/moltenvk/default.nix b/pkgs/os-specific/darwin/moltenvk/default.nix index 3171f444517a..07645c5e61c6 100644 --- a/pkgs/os-specific/darwin/moltenvk/default.nix +++ b/pkgs/os-specific/darwin/moltenvk/default.nix @@ -23,67 +23,30 @@ stdenv.mkDerivation (finalAttrs: { pname = "MoltenVK"; - version = "1.2.0"; + version = "1.2.1"; - buildInputs = [ AppKit Foundation Metal QuartzCore cereal ] - ++ lib.attrValues finalAttrs.passthru; + buildInputs = [ + AppKit + Foundation + Metal + QuartzCore + cereal + glslang + spirv-cross + spirv-headers + spirv-tools + vulkan-headers + ]; nativeBuildInputs = [ cctools sigtool xcbuild ]; outputs = [ "out" "bin" "dev" ]; - # MoltenVK requires specific versions of its dependencies. - # Pin them here except for cereal, which is four years old and has several CVEs. - passthru = { - glslang = (glslang.overrideAttrs (old: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "glslang"; - rev = "5755de46b07e4374c05fb1081f65f7ae1f8cca81"; - hash = "sha256-huPrQr+lPi7QCF8CufAavHEKGDDimGrcskiojhH9QYk="; - }; - })).override { inherit (finalAttrs.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 = "f09ba2777714871bddb70d049878af34b94fa54d"; - hash = "sha256-yVpLW1DbcHDuM9Bm3uGhAC0v9XjmpBoU9x7kmWdg6/o="; - }; - }); - spirv-headers = spirv-headers.overrideAttrs (_: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "spirv-headers"; - rev = "85a1ed200d50660786c1a88d9166e871123cce39"; - hash = "sha256-lUWgZYGPu+IaLUrbtyC7R0o3Hq/q7C7BE8r7DAsiC30="; - }; - }); - spirv-tools = (spirv-tools.overrideAttrs (old: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "spirv-tools"; - rev = "eb0a36633d2acf4de82588504f951ad0f2cecacb"; - hash = "sha256-sqjQoz9v9alSPc0ujEcWZxDAWh2S6oAPP1+JZmNCpA0="; - }; - })).override { inherit (finalAttrs.passthru) spirv-headers; }; - vulkan-headers = vulkan-headers.overrideAttrs (old: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "Vulkan-Headers"; - rev = "98f440ce6868c94f5ec6e198cc1adda4760e8849"; - hash = "sha256-EoD48jBoJmIet4BDC6bYxOsKK2358SZ/NcZeM61q/5g="; - }; - }); - }; - src = fetchFromGitHub { owner = "KhronosGroup"; repo = "MoltenVK"; rev = "v${finalAttrs.version}"; - hash = "sha256-PqrKGNGw7nJbirRgIargIV6Jbgoblu+2fn5qdHKI6BI="; + hash = "sha256-JqHPKLSFq+8hyOjVZbjh4AsHM8zSF7ZVxlEePmnEC2w="; }; patches = [ @@ -97,6 +60,11 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \ --replace '$'''{BUILT_PRODUCTS_DIR}' "$NIX_BUILD_TOP/$sourceRoot/build/include" \ --replace '$(git rev-parse HEAD)' ${finalAttrs.src.rev} + # Use the SPIRV-Cross packaged in nixpkgs instead of one built specifically for MoltenVK. + substituteInPlace MoltenVK/MoltenVK.xcodeproj/project.pbxproj \ + --replace SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross + substituteInPlace MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj \ + --replace SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross # Adding all of `usr/include` from the SDK results in header conflicts with `libcxx.dev`. # Work around it by symlinking just the SIMD stuff needed by MoltenVK. mkdir -p build/include @@ -107,8 +75,8 @@ stdenv.mkDerivation (finalAttrs: { NIX_CFLAGS_COMPILE = [ "-isystem ${lib.getDev libcxx}/include/c++/v1" - "-I${finalAttrs.passthru.spirv-cross}/include/spirv_cross" - "-I${finalAttrs.passthru.spirv-headers}/include/spirv/unified1/" + "-I${lib.getDev spirv-cross}/include/spirv_cross" + "-I${lib.getDev spirv-headers}/include/spirv/unified1/" ]; buildPhase = '' diff --git a/pkgs/os-specific/darwin/noah/default.nix b/pkgs/os-specific/darwin/noah/default.nix index f4d8a4b21a87..b8cb1424cdda 100644 --- a/pkgs/os-specific/darwin/noah/default.nix +++ b/pkgs/os-specific/darwin/noah/default.nix @@ -20,5 +20,7 @@ stdenv.mkDerivation rec { license = [ licenses.mit licenses.gpl2 ]; maintainers = [ maintainers.marsam ]; platforms = platforms.darwin; + # never built on aarch64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/os-specific/darwin/pam-reattach/default.nix b/pkgs/os-specific/darwin/pam-reattach/default.nix new file mode 100644 index 000000000000..4350865080f0 --- /dev/null +++ b/pkgs/os-specific/darwin/pam-reattach/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, cmake, openpam, darwin }: + +stdenv.mkDerivation rec { + pname = "pam_reattach"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "fabianishere"; + repo = pname; + rev = "v${version}"; + sha256 = "1k77kxqszdwgrb50w7algj22pb4fy5b9649cjb08zq9fqrzxcbz7"; + }; + + cmakeFlags = [ + "-DCMAKE_OSX_ARCHITECTURES=${ + if stdenv.hostPlatform.system == "x86_64-darwin" then + "x86_64" + else + "arm64" + }" + "-DENABLE_CLI=ON" + ] ++ lib.optional (!stdenv.isAarch64) "-DCMAKE_LIBRARY_PATH=${darwin.apple_sdk.sdk}/usr/lib"; + + buildInputs = [ openpam ] + ++ lib.optional (!stdenv.isAarch64) darwin.apple_sdk.sdk; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://github.com/fabianishere/pam_reattach"; + description = "Reattach to the user's GUI session on macOS during authentication (for Touch ID support in tmux)"; + license = licenses.mit; + maintainers = with maintainers; [ lockejan ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/os-specific/darwin/plistwatch/default.nix b/pkgs/os-specific/darwin/plistwatch/default.nix new file mode 100644 index 000000000000..852c9c23aa9b --- /dev/null +++ b/pkgs/os-specific/darwin/plistwatch/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "plistwatch"; + version = "unstable-2020-12-22"; + + src = fetchFromGitHub { + owner = "catilac"; + repo = "plistwatch"; + rev = "c3a9afd8d3e5ffa8dcc379770bc4216bae88a671"; + sha256 = "0a5rfmpy6h06p02z9gdilh7vr3h9cc6n6zzygpjk6zvnqs3mm3vx"; + }; + + vendorSha256 = "sha256-Layg1axFN86OFgxEyNFtIlm6Jtx317jZb/KH6IjJ8e4="; + + #add missing dependencies and hashes + patches = [ ./go-modules.patch ]; + + doCheck = false; + + meta = with lib; { + description = "Monitors and prints changes to MacOS plists in real time"; + homepage = "https://github.com/catilac/plistwatch"; + maintainers = with maintainers; [ gdinh ]; + license = licenses.mit; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/os-specific/darwin/plistwatch/go-modules.patch b/pkgs/os-specific/darwin/plistwatch/go-modules.patch new file mode 100644 index 000000000000..94d7cc01e24e --- /dev/null +++ b/pkgs/os-specific/darwin/plistwatch/go-modules.patch @@ -0,0 +1,19 @@ +--- a/go.mod ++++ b/go.mod +@@ -3,1 +3,6 @@ + go 1.14 ++ require( ++ github.com/jessevdk/go-flags v1.5.0 ++ howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5 ++ gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 // indirect ++ ) +--- a/go.sum ++++ b/go.sum +@@ -9,1 +9,7 @@ + howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= ++ gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 h1:POO/ycCATvegFmVuPpQzZFJ+pGZeX22Ufu6fibxDVjU= ++ gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= ++ github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc= ++ github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= ++ golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4 h1:EZ2mChiOa8udjfp6rRmswTbtZN/QzUQp4ptM4rnjHvc= ++ golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh b/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh index cca65661f8a9..6a254cd82123 100644 --- a/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh +++ b/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh @@ -25,7 +25,7 @@ signDarwinBinariesIn() { signDarwinBinariesInAllOutputs() { local output - for output in $outputs; do + for output in $(getAllOutputNames); do signDarwinBinariesIn "${!output}" done } diff --git a/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/os-specific/darwin/sketchybar/default.nix index 4f089c7be3e1..57feb54614a0 100644 --- a/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/pkgs/os-specific/darwin/sketchybar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, memstreamHook, Carbon, Cocoa, SkyLight }: +{ lib, stdenv, fetchFromGitHub, Carbon, Cocoa, DisplayServices, SkyLight }: let inherit (stdenv.hostPlatform) system; @@ -10,17 +10,16 @@ in stdenv.mkDerivation rec { pname = "sketchybar"; - version = "2.8.2"; + version = "2.13.2"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "SketchyBar"; rev = "v${version}"; - sha256 = "sha256-GmM+0h6xxUzW2kpTDZWAiqJAXoQgdsJRlNbvsuxKmZ8="; + sha256 = "sha256-EPpD1QuJXFFwWcs1gmhjf9zm6mkEM72Zr8NOAAgxI4I="; }; - buildInputs = [ Carbon Cocoa SkyLight ] - ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memstreamHook ]; + buildInputs = [ Carbon Cocoa DisplayServices SkyLight ]; makeFlags = [ target diff --git a/pkgs/os-specific/darwin/utm/default.nix b/pkgs/os-specific/darwin/utm/default.nix index 979780e3ca70..2e21945288e4 100644 --- a/pkgs/os-specific/darwin/utm/default.nix +++ b/pkgs/os-specific/darwin/utm/default.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "utm"; - version = "4.0.8"; + version = "4.1.5"; src = fetchurl { url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg"; - sha256 = "sha256-a6GQyiW8pqw6fN3WVuTVUfnsl/qPtmzDxUvWNElli5k="; + hash = "sha256-YOmTf50UUvvh4noWnmV6WsoWSua0tpWTgLTg+Cdr3bQ="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/os-specific/darwin/xattr/default.nix b/pkgs/os-specific/darwin/xattr/default.nix index a1e3c4914879..7fe0f84606ce 100644 --- a/pkgs/os-specific/darwin/xattr/default.nix +++ b/pkgs/os-specific/darwin/xattr/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchzip +, fetchFromGitHub , buildPythonPackage , python , ed @@ -11,9 +11,11 @@ buildPythonPackage rec { pname = "xattr"; version = "61.60.1"; - src = fetchzip rec { - url = "https://opensource.apple.com/tarballs/python_modules/python_modules-${version}.tar.gz"; - sha256 = "19kydl7w4vpdi7zmfd5z9vjkq24jfk2cv4j0pppw69j06czhdwwi"; + src = fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = "python_modules"; + rev = "python_modules-${version}"; + hash = "sha256-kfMGPzNAJsPvvUCSzcR0kgg85U6/NFf/ie1uwg9tfqY="; }; sourceRoot = "${src.name}/Modules/xattr-0.6.4"; @@ -61,7 +63,10 @@ buildPythonPackage rec { ''; makeWrapperArgs = [ - "--prefix" "PYTHONPATH" ":" "${placeholder "python"}/${python.sitePackages}" + "--prefix" + "PYTHONPATH" + ":" + "${placeholder "python"}/${python.sitePackages}" ]; meta = with lib; { diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 2ce607896b5e..6d1929ef982c 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -1,10 +1,10 @@ -{ buildPlatform, requireFile, targetPlatform, lib }: +{ stdenv, requireFile, lib }: let requireXcode = version: sha256: let xip = "Xcode_" + version + ".xip"; # TODO(alexfmpe): Find out how to validate the .xip signature in Linux - unxip = if buildPlatform.isDarwin + unxip = if stdenv.buildPlatform.isDarwin then '' open -W ${xip} rm -rf ${xip} @@ -66,6 +66,6 @@ in lib.makeExtensible (self: { xcode_12_1 = requireXcode "12.1" "1widy74dk43wx8iqgd7arzf6q4kzdmaz8pfwymzs8chnq9dqr3wp"; xcode_12_2 = requireXcode "12.2" "17i0wf4pwrxwfgjw7rpw9mcd59nkmys1k5h2rqsw81snzyxy9j0v"; xcode_12_3 = requireXcode "12.3" "0kwf1y4llysf1p0nsbqyzccn7d77my0ldagr5fi3by4k0xy3d189"; - xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (targetPlatform ? xcodeVer) then targetPlatform.xcodeVer else "12.3")}"; + xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.3")}"; }) diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index 0512d9dd46a1..50eb50ea6b78 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -1,4 +1,4 @@ -{ targetPlatform +{ stdenv , clang-unwrapped , binutils-unwrapped , runCommand @@ -12,7 +12,7 @@ let -minSdkVersion = targetPlatform.minSdkVersion or "9.0"; +minSdkVersion = stdenv.targetPlatform.minSdkVersion or "9.0"; in @@ -22,8 +22,8 @@ rec { type = "derivation"; outPath = xcode + "/Contents/Developer/Platforms/${platform}.platform/Developer/SDKs/${platform}${version}.sdk"; - platform = targetPlatform.xcodePlatform; - version = targetPlatform.sdkVer; + platform = stdenv.targetPlatform.xcodePlatform; + version = stdenv.targetPlatform.sdkVer; }; binutils = wrapBintoolsWith { @@ -39,7 +39,7 @@ rec { extraBuildCommands = '' tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp mv cc-cflags.tmp $out/nix-support/cc-cflags - echo "-target ${targetPlatform.config}" >> $out/nix-support/cc-cflags + echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-isystem ${sdk}/usr/include${lib.optionalString (lib.versionAtLeast "10" sdk.version) " -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++"}" >> $out/nix-support/cc-cflags ${lib.optionalString (lib.versionAtLeast sdk.version "14") "echo -isystem ${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 >> $out/nix-support/cc-cflags"} ''; diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 20aefcb882fd..046981223f94 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -9,16 +9,16 @@ , yabai , xxd , xcodebuild + # These all need to be from SDK 11.0 or later starting with yabai 5.0.0 , Carbon , Cocoa , ScriptingBridge - # This needs to be from SDK 10.13 or higher, SLS APIs introduced in that version get used , SkyLight }: let pname = "yabai"; - version = "4.0.4"; + version = "5.0.2"; test-version = testers.testVersion { package = yabai; @@ -52,7 +52,7 @@ in src = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz"; - sha256 = "sha256-NS8tMUgovhWqc6WdkNI4wKee411i/e/OE++JVc86kFE="; + sha256 = "sha256-wL6N2+mfFISrOFn4zaCQI+oH6ixwUMRKRi1dAOigBro="; }; nativeBuildInputs = [ @@ -81,14 +81,14 @@ in }; }; - x86_64-darwin = stdenv.mkDerivation rec { + x86_64-darwin = stdenv.mkDerivation { inherit pname version; src = fetchFromGitHub { owner = "koekeishiya"; repo = "yabai"; rev = "v${version}"; - sha256 = "sha256-TeT+8UAV2jR60XvTs4phkp611Gi0nzLmQnezLA0xb44="; + sha256 = "sha256-/HS8TDzDA4Zvmm56ZZeMXyCKHRRTcucd7qDHT0qbrQg="; }; nativeBuildInputs = [ @@ -128,50 +128,15 @@ in mkdir -p $out/{bin,share/icons/hicolor/scalable/apps} cp ./bin/yabai $out/bin/yabai - ln -s ${loadScriptingAddition} $out/bin/yabai-load-sa cp ./assets/icon/icon.svg $out/share/icons/hicolor/scalable/apps/yabai.svg installManPage ./doc/yabai.1 runHook postInstall ''; - # Defining this here exposes it as a passthru attribute, which is useful because it allows us to run `builtins.hashFile` on it in pure-eval mode. - # With that we can programatically generate an `/etc/sudoers.d` entry which disables the password requirement, so that a user-agent can run it at login. - loadScriptingAddition = writeShellScript "yabai-load-sa" '' - # For whatever reason the regular commands to load the scripting addition do not work, yabai will throw an error. - # The installation command mutably installs binaries to '/System', but then fails to start them. Manually running - # the bins as root does start the scripting addition, so this serves as a more user-friendly way to do that. - - set -euo pipefail - - if [[ "$EUID" != 0 ]]; then - echo "error: the scripting-addition loader must ran as root. try 'sudo $0'" - exit 1 - fi - - loaderPath="/Library/ScriptingAdditions/yabai.osax/Contents/MacOS/mach_loader"; - - if ! test -x "$loaderPath"; then - echo "could not locate the scripting-addition loader at '$loaderPath', installing it..." - echo "note: this may display an error" - - eval "$(dirname "''${BASH_SOURCE[0]}")/yabai --install-sa" || true - sleep 1 - fi - - echo "executing loader..." - eval "$loaderPath" - echo "scripting-addition started" - ''; - passthru.tests.version = test-version; meta = _meta // { - longDescription = _meta.longDescription + '' - Note that due to a nix-only bug the scripting addition cannot be launched using the regular - procedure. Instead, you can use the provided `yabai-load-sa` script. - ''; - sourceProvenance = with lib.sourceTypes; [ fromSource ]; diff --git a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix index 8ddc97890e92..06b6ef47d430 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPackages, stdenvNoCC, autoreconfHook, fetchurl }: +{ lib, buildPackages, stdenvNoCC, autoreconfHook, fetchurl, fetchpatch }: stdenvNoCC.mkDerivation rec { pname = "alsa-firmware"; @@ -9,6 +9,14 @@ stdenvNoCC.mkDerivation rec { sha256 = "sha256-tnttfQi8/CR+9v8KuIqZwYgwWjz1euLf0LzZpbNs1bs="; }; + patches = [ + # fixes some includes / missing types on musl libc; should not make a difference for other platforms + (fetchpatch { + url = "https://raw.githubusercontent.com/void-linux/void-packages/ae690000017d5fd355ab397c49202426e3a01c11/srcpkgs/alsa-firmware/patches/musl.patch"; + sha256 = "sha256-4A+TBBvpz14NwMNewLc2LQL51hnz4EZlZ44rhnx5dnc="; + }) + ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index e1165bff1986..aa6cb53051d8 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20220611"; + version = "20230104"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "sha256-Ug/c6xBxllyztA+5gpuE3X7DXUuJH2mjFjtKuTVTZYA="; + sha256 = "sha256-tbejLvig+eTG+DHAchWEMMydd6ePRKyfRVPp6uDhP70="; }; installPhase = '' diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index 6b7f596683e4..e6961684d0e4 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -2,17 +2,21 @@ , stdenv , fetchFromGitHub , kernel +, nixosTests }: +let + tag = "0.3.0"; +in stdenv.mkDerivation { pname = "apfs"; - version = "unstable-2022-08-15-${kernel.version}"; + version = "${tag}-${kernel.version}"; src = fetchFromGitHub { owner = "linux-apfs"; repo = "linux-apfs-rw"; - rev = "e4bf2d51d3fe8485ad2b28a89c157ada32ee3d77"; - sha256 = "sha256-zvl1H9AIExgt6t2A2w7zDwXmRsmLY8y3P6EfbBuFdh8="; + rev = "v${tag}"; + sha256 = "sha256-ABFqkiIJuFapFsUIFHfw8+TujePZm7ZX/qHuFO2KdnQ="; }; hardeningDisable = [ "pic" ]; @@ -24,8 +28,19 @@ stdenv.mkDerivation { "INSTALL_MOD_PATH=$(out)" ]; + passthru.tests.test = nixosTests.apfs; + meta = with lib; { description = "APFS module for linux"; + longDescription = '' + The Apple File System (APFS) is the copy-on-write filesystem currently + used on all Apple devices. This module provides a degree of experimental + support on Linux. + If you make use of the write support, expect data corruption. + Read-only support is somewhat more complete, with sealed volumes, + snapshots, and all the missing compression algorithms recently added. + Encryption is still not in the works though. + ''; homepage = "https://github.com/linux-apfs/linux-apfs-rw"; license = licenses.gpl2Only; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/autosuspend/default.nix b/pkgs/os-specific/linux/autosuspend/default.nix index ba3460938920..e0a4b9a0860d 100644 --- a/pkgs/os-specific/linux/autosuspend/default.nix +++ b/pkgs/os-specific/linux/autosuspend/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "autosuspend"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "languitar"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-aIWqE422xfAzAyF+4hARYOcomZHraTrtxtw2YfAxJ1M="; + sha256 = "sha256-gS8NNks4GaIGl7cEqWSP53I4/tIV4LypkmZ5vNOjspY="; }; postPatch = '' @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { dbus-python ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook python-dbusmock pytest-httpserver diff --git a/pkgs/os-specific/linux/ax99100/default.nix b/pkgs/os-specific/linux/ax99100/default.nix index 9167b4e5f89d..600e02de7074 100644 --- a/pkgs/os-specific/linux/ax99100/default.nix +++ b/pkgs/os-specific/linux/ax99100/default.nix @@ -1,15 +1,35 @@ -{ kernel, stdenv, kmod, lib, fetchzip }: +{ kernel, stdenv, kmod, lib, fetchzip, fetchpatch, dos2unix }: stdenv.mkDerivation { pname = "ax99100"; version = "1.8.0"; - nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; + + nativeBuildInputs = [ dos2unix kmod ] ++ kernel.moduleBuildDependencies; + src = fetchzip { url = "https://www.asix.com.tw/en/support/download/file/1229"; sha256 = "1rbp1m01qr6b3nbr72vpbw89pjh8mddc60im78z2yjd951xkbcjh"; extension = "tar.bz2"; }; + prePatch = '' + # The sources come with Windows file endings and that makes + # applying patches hard without first fixing the line endings. + dos2unix *.c *.h + ''; + + # The patches are adapted from: https://aur.archlinux.org/packages/asix-ax99100 + # + # We included them here instead of fetching them, because of line + # ending issues that are easier to fix manually. Also the + # set_termios patch needs to be applied for 6.1 not for 6.0. + patches = [ + ./kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch + ./kernel-6.1-set_termios-const-ktermios.patch + ]; + + patchFlags = [ "-p0" ]; + makeFlags = [ "KDIR='${kernel.dev}/lib/modules/${kernel.modDirVersion}/build'" ]; installPhase = '' @@ -18,12 +38,13 @@ stdenv.mkDerivation ''; meta = { - description = "ASIX AX99100 Serial and Parralel Port driver"; + description = "ASIX AX99100 Serial and Parallel Port driver"; homepage = "https://www.asix.com.tw/en/product/Interface/PCIe_Bridge/AX99100"; # According to the source code in the tarball, the license is gpl2. license = lib.licenses.gpl2; platforms = lib.platforms.linux; - # currently, the build fails with kernels newer than 5.17 - broken = lib.versionAtLeast kernel.version "5.18.0"; + + # Older Linux versions need more patches to work. + broken = lib.versionOlder kernel.version "5.4.0"; }; } diff --git a/pkgs/os-specific/linux/ax99100/kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch b/pkgs/os-specific/linux/ax99100/kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch new file mode 100644 index 000000000000..05ec0cfad222 --- /dev/null +++ b/pkgs/os-specific/linux/ax99100/kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch @@ -0,0 +1,14 @@ +diff -pNaru5 a/ax99100_sp.h b/ax99100_sp.h +--- ax99100_sp.h 2022-06-07 16:55:26.621034945 -0400 ++++ ax99100_sp.h 2022-06-07 16:58:32.488989767 -0400 +@@ -255,5 +255,10 @@ struct custom_eeprom { + #define _INLINE_ + #endif + + #define DEFAULT99100_BAUD 115200 + #endif ++ ++/* #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0) */ ++#define pci_alloc_consistent(hwdev,size,dma_handle) dma_alloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC) ++#define pci_free_consistent(hwdev,size,vaddr,dma_handle) dma_free_coherent(&hwdev->dev, size, vaddr, dma_handle) ++/* #endif */ diff --git a/pkgs/os-specific/linux/ax99100/kernel-6.1-set_termios-const-ktermios.patch b/pkgs/os-specific/linux/ax99100/kernel-6.1-set_termios-const-ktermios.patch new file mode 100644 index 000000000000..8d75ad454cfe --- /dev/null +++ b/pkgs/os-specific/linux/ax99100/kernel-6.1-set_termios-const-ktermios.patch @@ -0,0 +1,18 @@ +diff -pNaru5 a/ax99100_sp.c b/ax99100_sp.c +--- ax99100_sp.c 2023-01-02 23:44:46.707423858 -0500 ++++ ax99100_sp.c 2023-01-02 23:44:27.171293092 -0500 +@@ -1915,11 +1915,13 @@ static unsigned int serial99100_get_divi + DEBUG("In %s quot=%u----baud=%u-----------------------------END\n",__FUNCTION__,quot,baud); + return quot; + } + + //This is a port ops function to set the terminal settings. +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0) ++static void serial99100_set_termios(struct uart_port *port, struct ktermios *termios, const struct ktermios *old) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) + static void serial99100_set_termios(struct uart_port *port, struct ktermios *termios, struct ktermios *old) + #else + static void serial99100_set_termios(struct uart_port *port, struct termios *termios, struct termios *old) + #endif + { diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index bb042e31c0e8..772447ed0c96 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.24.0"; + version = "0.26.0"; disabled = !stdenv.isLinux; @@ -15,7 +15,7 @@ python.pkgs.buildPythonApplication rec { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "sha256-5Nq6LmphiyiiIyru/P2rCCmA25cwJIWn08oK1+eM3cQ="; + sha256 = "sha256-zx38tPwuuGU6px9pRNN5JtvBysK9fStOvoqe7cLo7LM="; }; format = "other"; diff --git a/pkgs/os-specific/linux/below/default.nix b/pkgs/os-specific/linux/below/default.nix new file mode 100644 index 000000000000..53791e1a59ad --- /dev/null +++ b/pkgs/os-specific/linux/below/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, clang +, pkg-config +, elfutils +, rustfmt +, zlib +}: + +rustPlatform.buildRustPackage rec { + pname = "below"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "facebookincubator"; + repo = "below"; + rev = "v${version}"; + sha256 = "sha256-d5a/M2XEw2E2iydopzedqZ/XfQU7KQyTC5NrPTeeNLg="; + }; + + cargoSha256 = "sha256-EoRCmEe9SAySZCm+QhaR4ngik4Arnm4SZjgDM5fSRmk="; + + # bpf code compilation + hardeningDisable = [ "stackprotector" ]; + + nativeBuildInputs = [ clang pkg-config rustfmt ]; + buildInputs = [ elfutils zlib ]; + + # needs /sys/fs/cgroup + doCheck = false; + + meta = with lib; { + platforms = platforms.linux; + maintainers = with maintainers; [ globin ]; + description = "A time traveling resource monitor for modern Linux systems"; + license = licenses.asl20; + homepage = "https://github.com/facebookincubator/below"; + }; +} diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/os-specific/linux/blktrace/default.nix index e44f90a36367..8ff4b16a1a53 100644 --- a/pkgs/os-specific/linux/blktrace/default.nix +++ b/pkgs/os-specific/linux/blktrace/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.3.0"; # Official source - # "git://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git" + # "https://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git" src = fetchurl { url = "https://brick.kernel.dk/snaps/blktrace-${version}.tar.bz2"; sha256 = "sha256-1t7aA4Yt4r0bG5+6cpu7hi2bynleaqf3yoa2VoEacNY="; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index ff8fbb460b27..303eb801478c 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , alsa-lib , dbus , ell @@ -22,13 +23,21 @@ ]; in stdenv.mkDerivation rec { pname = "bluez"; - version = "5.65"; + version = "5.66"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "sha256-JWWk1INUtXbmrZLiW1TtZoCCllgciruAWHBR+Zk9ltQ="; + sha256 = "sha256-Of6mS1kMlJKYSgwnqJ/CA+HNx0hmCG77j0aYZ3qytXQ="; }; + patches = [ + # replace use of a non-standard symbol to fix build with musl libc (pkgsMusl.bluez) + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/main/bluez/max-input.patch?id=32b31b484cb13009bd8081c4106e4cf064ec2f1f"; + sha256 = "sha256-SczbXtsxBkCO+izH8XOBcrJEO2f7MdtYVT3+2fCV8wU="; + }) + ]; + buildInputs = [ alsa-lib dbus @@ -121,6 +130,10 @@ in stdenv.mkDerivation rec { mkdir $out/etc/bluetooth ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf + # https://github.com/NixOS/nixpkgs/issues/204418 + ln -s /etc/bluetooth/input.conf $out/etc/bluetooth/input.conf + ln -s /etc/bluetooth/network.conf $out/etc/bluetooth/network.conf + # Add missing tools, ref https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/bluez for files in `find tools/ -type f -perm -755`; do filename=$(basename $files) diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index 07214f482763..fba4f8adbabe 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=${umockdev.out}/lib/ ''; - checkInputs = [ + nativeCheckInputs = [ dbus gobject-introspection umockdev diff --git a/pkgs/os-specific/linux/bpfmon/default.nix b/pkgs/os-specific/linux/bpfmon/default.nix index 32781d365491..c75b9375e3b1 100644 --- a/pkgs/os-specific/linux/bpfmon/default.nix +++ b/pkgs/os-specific/linux/bpfmon/default.nix @@ -1,22 +1,34 @@ -{ stdenv, fetchFromGitHub, lib, libpcap, yascreen }: +{ lib +, stdenv +, fetchFromGitHub +, libpcap +, yascreen +}: stdenv.mkDerivation rec { pname = "bpfmon"; - version = "2.50"; + version = "2.51"; src = fetchFromGitHub { owner = "bbonev"; repo = "bpfmon"; - rev = "v${version}"; - sha256 = "sha256-x4EuGZBtg45bD9q1B/6KwjDRXXeRsdFmRllREsech+E="; + rev = "refs/tags/v${version}"; + hash = "sha256-EGRxWq94BWceYXunzcOpMQv4g7cMjVCEWMR0ULGN2Jg="; }; - buildInputs = [ libpcap yascreen ]; - makeFlags = [ "PREFIX=$(out)" ]; + buildInputs = [ + libpcap + yascreen + ]; + + makeFlags = [ + "PREFIX=$(out)" + ]; meta = with lib; { description = "BPF based visual packet rate monitor"; homepage = "https://github.com/bbonev/bpfmon"; + changelog = "https://github.com/bbonev/bpfmon/releases/tag/v${version}"; maintainers = with maintainers; [ arezvov ]; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 2772c587ca89..cb58ed48bb13 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , cmake, pkg-config, flex, bison , llvmPackages, elfutils , libbfd, libbpf, libopcodes, bcc @@ -9,44 +9,15 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.15.0"; - - # Cherry-picked from merged PR, remove this hook on next update - # https://github.com/iovisor/bpftrace/pull/2242 - # Cannot `fetchpatch` such pure renaming diff since - # https://github.com/iovisor/bpftrace/commit/2df807dbae4037aa8bf0afc03f52fb3f6321c62a.patch - # does not contain any diff in unified format but just this instead: - # ... - # man/man8/{bashreadline.8 => bashreadline.bt.8} | 0 - # ... - # 35 files changed, 0 insertions(+), 0 deletions(-) - # rename man/man8/{bashreadline.8 => bashreadline.bt.8} (100%) - # ... - # on witch `fetchpatch` fails with - # error: Normalized patch '/build/patch' is empty (while the fetched file was not)! - # Did you maybe fetch a HTML representation of a patch instead of a raw patch? - postUnpack = '' - rename .8 .bt.8 "$sourceRoot"/man/man8/*.8 - ''; + version = "0.17.0"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "v${version}"; - sha256 = "sha256-9adZAKSn00W2yNwVDbVB1/O5Y+10c4EkVJGCHyd4Tgg="; + sha256 = "sha256-PBqq3u8zym+RY6xudJ66ItzDZEJBNvJDtve1GtxcOdQ="; }; - patches = [ - # Pull upstream fix for binutils-2.39: - # https://github.com/iovisor/bpftrace/pull/2328 - (fetchpatch { - name = "binutils-2.39.patch"; - url = "https://github.com/iovisor/bpftrace/commit/3be6e708d514d3378a4fe985ab907643ecbc77ee.patch"; - sha256 = "sha256-WWEh8ViGw8053nEG/29KeKEHV5ossWPtL/AAV/l+pnY="; - excludes = [ "CHANGELOG.md" ]; - }) - ]; - buildInputs = with llvmPackages; [ llvm libclang elfutils bcc @@ -64,22 +35,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTING=FALSE" "-DLIBBCC_INCLUDE_DIRS=${bcc}/include" + "-DINSTALL_TOOL_DOCS=off" ]; - # nuke the example/reference output .txt files, for the included tools, - # stuffed inside $out. we don't need them at all. - # (see "Allow skipping examples" for a potential option - # https://github.com/iovisor/bpftrace/pull/2256) - # # Pull BPF scripts into $PATH (next to their bcc program equivalents), but do # not move them to keep `${pkgs.bpftrace}/share/bpftrace/tools/...` working. - # (remove `chmod` once a new release "Add executable permission to tools" - # https://github.com/iovisor/bpftrace/commit/77e524e6d276216ed6a6e1984cf204418db07c78) postInstall = '' - rm -rf $out/share/bpftrace/tools/doc - ln -s $out/share/bpftrace/tools/*.bt $out/bin/ - chmod +x $out/bin/*.bt ''; outputs = [ "out" "man" ]; diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index cbbf77c67c8a..a03cb12727ce 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { pname = "bridge-utils"; @@ -9,7 +9,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-ph2L5PGhQFxgyO841UTwwYwFszubB+W0sxAzU2Fl5g4="; }; - patches = [ ./autoconf-ar.patch ]; + patches = [ + ./autoconf-ar.patch + + (fetchpatch { + name = "musl-includes.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/bridge-utils/fix-PATH_MAX-on-ppc64le.patch?id=12c9046eee3a0a35665dc4e280c1f5ae2af5845d"; + sha256 = "sha256-uY1tgJhcm1DFctg9scmC8e+mgowgz4f/oF0+k+x+jqw="; + }) + ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/os-specific/linux/brillo/default.nix b/pkgs/os-specific/linux/brillo/default.nix index 246aa471c2a9..4446ed005028 100644 --- a/pkgs/os-specific/linux/brillo/default.nix +++ b/pkgs/os-specific/linux/brillo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "brillo"; - version = "1.4.10"; + version = "1.4.12"; src = fetchFromGitLab { owner= "cameronnemo"; repo= "brillo"; rev= "v${version}"; - sha256 = "sha256-x8K6CMkOyR+kWRlqa/BmJogZo41LvsL1kfz6CZ5PaUI="; + sha256 = "sha256-dKGNioWGVAFuB4kySO+QGTnstyAD0bt4/6FBVwuRxJo="; }; patches = [ diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 661bb7fc922b..6b7d8b912fa2 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -45,6 +45,8 @@ stdenv.mkDerivation { ./linux-5.18.patch # source: https://gist.github.com/joanbm/207210d74637870c01ef5a3c262a597d ./linux-6.0.patch + # source: https://gist.github.com/joanbm/94323ea99eff1e1d1c51241b5b651549 + ./linux-6.1.patch ./pedantic-fix.patch ./null-pointer-fix.patch ./gcc.patch diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-6.1.patch b/pkgs/os-specific/linux/broadcom-sta/linux-6.1.patch new file mode 100644 index 000000000000..5ececd487d74 --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/linux-6.1.patch @@ -0,0 +1,83 @@ +From a63a5f70e5cf05f6bce4cda2e0dd67462e1d76a5 Mon Sep 17 00:00:00 2001 +From: Joan Bruguera +Date: Mon, 29 Aug 2022 00:06:53 +0200 +Subject: [PATCH] Tentative patch for broadcom-wl 6.30.223.271 driver for Linux 6.1-rc1 + +Applies on top of all the patches applied to broadcom-wl-dkms 6.30.223.271-35 on Arch Linux +--- + src/wl/sys/wl_cfg80211_hybrid.c | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index 4fef22a..50d1e34 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -105,20 +105,25 @@ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wd + static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm); + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) ++#define MAYBE_INT_LINK_ID int link_id, ++#else ++#define MAYBE_INT_LINK_ID ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) + static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, +- struct net_device *dev, u8 key_idx, bool unicast, bool multicast); ++ struct net_device *dev, MAYBE_INT_LINK_ID u8 key_idx, bool unicast, bool multicast); + #else + static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, + struct net_device *dev, u8 key_idx); + #endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) + static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, +- u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params); ++ MAYBE_INT_LINK_ID u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params); + static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, +- u8 key_idx, bool pairwise, const u8 *mac_addr); ++ MAYBE_INT_LINK_ID u8 key_idx, bool pairwise, const u8 *mac_addr); + static s32 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, +- u8 key_idx, bool pairwise, const u8 *mac_addr, ++ MAYBE_INT_LINK_ID u8 key_idx, bool pairwise, const u8 *mac_addr, + void *cookie, void (*callback) (void *cookie, struct key_params *params)); + #else + static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, +@@ -1165,7 +1170,7 @@ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm) + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) + static s32 + wl_cfg80211_config_default_key(struct wiphy *wiphy, +- struct net_device *dev, u8 key_idx, bool unicast, bool multicast) ++ struct net_device *dev, MAYBE_INT_LINK_ID u8 key_idx, bool unicast, bool multicast) + #else + static s32 + wl_cfg80211_config_default_key(struct wiphy *wiphy, +@@ -1190,7 +1195,7 @@ wl_cfg80211_config_default_key(struct wiphy *wiphy, + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) + static s32 + wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, +- u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params) ++ MAYBE_INT_LINK_ID u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params) + #else + static s32 + wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, +@@ -1311,7 +1316,7 @@ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) + static s32 + wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, +- u8 key_idx, bool pairwise, const u8 *mac_addr) ++ MAYBE_INT_LINK_ID u8 key_idx, bool pairwise, const u8 *mac_addr) + #else + static s32 + wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, +@@ -1354,7 +1359,7 @@ wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) + static s32 + wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, +- u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie, ++ MAYBE_INT_LINK_ID u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie, + void (*callback) (void *cookie, struct key_params * params)) + #else + static s32 +-- +2.37.2 + diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 3feb590eb5d6..8a510a4d0c5d 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -50,14 +50,14 @@ in stdenv.mkDerivation rec { pname = "busybox"; - version = "1.35.0"; + version = "1.36.0"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-+u6yRMNaNIozT0pZ5EYm7ocPsHtohNaMEK6LwZ+DppQ="; + sha256 = "sha256-VCdQyK98smMOIBeAtPmfPczusG9QW0eexoJBweavYaU="; }; hardeningDisable = [ "format" "pie" ] @@ -75,11 +75,6 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch?id=ed92963eb55bbc8d938097b9ccb3e221a94653f4"; sha256 = "sha256-vl1wPbsHtXY9naajjnTicQ7Uj3N+EQ8pRNnrdsiow+w="; }) - (fetchurl { - name = "CVE-2022-30065.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/busybox/CVE-2022-30065.patch?id=4ffd996b3f8298c7dd424b912c245864c816e354"; - sha256 = "sha256-+WSYxI6eF8S0tya/S62f9Nc6jVMnHO0q1OyM69GlNTY="; - }) ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; separateDebugInfo = true; diff --git a/pkgs/os-specific/linux/catfs/default.nix b/pkgs/os-specific/linux/catfs/default.nix index dbb525e0e298..36eaf607201e 100644 --- a/pkgs/os-specific/linux/catfs/default.nix +++ b/pkgs/os-specific/linux/catfs/default.nix @@ -6,25 +6,22 @@ rustPlatform.buildRustPackage rec { pname = "catfs"; - version = "unstable-2020-03-21"; + version = "0.9.0"; src = fetchFromGitHub { owner = "kahing"; repo = pname; - rev = "daa2b85798fa8ca38306242d51cbc39ed122e271"; - sha256 = "0zca0c4n2p9s5kn8c9f9lyxdf3df88a63nmhprpgflj86bh8wgf5"; + rev = "v${version}"; + hash = "sha256-OvmtU2jpewP5EqPwEFAf67t8UCI1WuzUO2QQj4cH1Ak="; }; - cargoSha256 = "1agcwq409s40kyij487wjrp8mj7942r9l2nqwks4xqlfb0bvaimf"; - - cargoPatches = [ - # update cargo lock - (fetchpatch { - url = "https://github.com/kahing/catfs/commit/f838c1cf862cec3f1d862492e5be82b6dbe16ac5.patch"; - sha256 = "1r1p0vbr3j9xyj9r1ahipg4acii3m4ni4m9mp3avbi1rfgzhblhw"; - }) + patches = [ + # monitor https://github.com/kahing/catfs/issues/71 + ./fix-for-rust-1.65.diff ]; + cargoHash = "sha256-xF1J2Pr4qtNFcd2kec4tnbdYxoLK+jRnzp8p+cmNOcI="; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse ]; diff --git a/pkgs/os-specific/linux/catfs/fix-for-rust-1.65.diff b/pkgs/os-specific/linux/catfs/fix-for-rust-1.65.diff new file mode 100644 index 000000000000..4208c362ebcd --- /dev/null +++ b/pkgs/os-specific/linux/catfs/fix-for-rust-1.65.diff @@ -0,0 +1,13 @@ +diff --git a/src/catfs/file.rs b/src/catfs/file.rs +index 6e781eb..92fdd80 100644 +--- a/src/catfs/file.rs ++++ b/src/catfs/file.rs +@@ -569,7 +569,7 @@ impl Handle { + path: &dyn AsRef, + create: bool, + ) -> error::Result<()> { +- let _ = self.page_in_res.0.lock().unwrap(); ++ drop(self.page_in_res.0.lock().unwrap()); + + let mut buf = [0u8; 0]; + let mut flags = rlibc::O_RDWR; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 0d9fa44a8794..a5fbc2817db0 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "http://conky.sourceforge.net/"; + homepage = "https://conky.sourceforge.net/"; description = "Advanced, highly configurable system monitor based on torsmo"; maintainers = [ maintainers.guibert ]; license = licenses.gpl3Plus; diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix index 70d5b195d9b1..7d6431b5ced6 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 = "20221003"; + version = "20230120"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "sha256-Y8TFwGtWglgrou7Jbuom14MngqeJWSu5XE5P1icKgwc="; + sha256 = "sha256-uJtB+IldDVj9uwpUECu0kLx8WCjbLNFb6C0U0ZRjpXk="; }; # For pod2man during the build process. diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 5475a565b09b..71bde6220a02 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,6 +1,8 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, protobuf, protobufc, asciidoc, iptables , xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config, iproute2 -, which, python3, makeWrapper, docbook_xml_dtd_45, perl, nftables, libbsd }: +, which, python3, makeWrapper, docbook_xml_dtd_45, perl, nftables, libbsd +, buildPackages +}: stdenv.mkDerivation rec { pname = "criu"; @@ -22,9 +24,34 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython perl ]; - buildInputs = [ protobuf asciidoc xmlto libpaper libnl libcap libnet nftables libbsd ]; - propagatedBuildInputs = [ protobufc ] ++ (with python3.pkgs; [ python python3.pkgs.protobuf ]); + depsBuildBuild = [ protobufc buildPackages.stdenv.cc ]; + nativeBuildInputs = [ + pkg-config + asciidoc + xmlto + libpaper + docbook_xsl + which + makeWrapper + docbook_xml_dtd_45 + python3 + python3.pkgs.wrapPython + perl + ]; + buildInputs = [ + protobuf + libnl + libcap + libnet + nftables + libbsd + ]; + propagatedBuildInputs = [ + protobufc + ] ++ (with python3.pkgs; [ + python + python3.pkgs.protobuf + ]); postPatch = '' substituteInPlace ./Documentation/Makefile \ @@ -34,7 +61,27 @@ stdenv.mkDerivation rec { ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto ''; - makeFlags = [ "PREFIX=$(out)" "ASCIIDOC=${asciidoc}/bin/asciidoc" "XMLTO=${xmlto}/bin/xmlto" ]; + makeFlags = let + # criu's Makefile infrastructure expects to be passed a target architecture + # which neither matches the config-tuple's first part, nor the + # targetPlatform.linuxArch attribute. Thus we take the latter and map it + # onto the expected string: + linuxArchMapping = { + "x86_64" = "x86"; + "arm" = "arm"; + "arm64" = "aarch64"; + "powerpc" = "ppc64"; + "s390" = "s390"; + "mips" = "mips"; + }; + in [ + "PREFIX=$(out)" + "ASCIIDOC=${buildPackages.asciidoc}/bin/asciidoc" + "XMLTO=${buildPackages.xmlto}/bin/xmlto" + ] ++ (lib.optionals (stdenv.buildPlatform != stdenv.targetPlatform) [ + "ARCH=${linuxArchMapping."${stdenv.targetPlatform.linuxArch}"}" + "CROSS_COMPILE=${stdenv.targetPlatform.config}-" + ]); outputs = [ "out" "dev" "man" ]; @@ -58,7 +105,7 @@ stdenv.mkDerivation rec { description = "Userspace checkpoint/restore for Linux"; homepage = "https://criu.org"; license = licenses.gpl2; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; maintainers = [ maintainers.thoughtpolice ]; }; } diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index cc3a1d81109e..2fe98f8b801d 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -14,9 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; - KERNEL_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - INSTALL_MOD_PATH = "\${out}"; - prefix = "\${out}"; + makeFlags = kernel.makeFlags ++ [ + "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=$(out)" + "prefix=$(out)" + ]; meta = { description = "Device that allows access to Linux kernel cryptographic drivers"; diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/pkgs/os-specific/linux/ddcci/default.nix index fe16d283ffc8..0e7e0bf8e8f4 100644 --- a/pkgs/os-specific/linux/ddcci/default.nix +++ b/pkgs/os-specific/linux/ddcci/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, kernel }: +{ lib, stdenv, fetchFromGitLab, kernel, fetchpatch }: stdenv.mkDerivation rec { pname = "ddcci-driver"; @@ -32,6 +32,14 @@ stdenv.mkDerivation rec { "INCLUDEDIR=$(out)/include" ]; + patches = [ + # fix to support linux 6.1 + (fetchpatch { + url = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/commit/ce52d6ac5e5ed7119a0028eed8823117a004766e.patch"; + sha256 = "sha256-Tmf4oiMWLR5ma/3X0eoFuriK29HwDqy6dBT7WdqE3mI="; + }) + ]; + meta = with lib; { description = "Kernel module driver for DDC/CI monitors"; homepage = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux"; diff --git a/pkgs/os-specific/linux/device-tree/default.nix b/pkgs/os-specific/linux/device-tree/default.nix index 8b8cca911a93..fb8e92f23306 100644 --- a/pkgs/os-specific/linux/device-tree/default.nix +++ b/pkgs/os-specific/linux/device-tree/default.nix @@ -22,21 +22,19 @@ with lib; { # skip incompatible and non-matching overlays if [[ ! "$dtbCompat" =~ "$overlayCompat" ]]; then - echo -n "Skipping overlay ${o.name}: incompatible with $(basename "$dtb")" - continue - fi - ${optionalString (o.filter != null) '' - if [[ "''${dtb//${o.filter}/}" == "$dtb" ]]; then - echo -n "Skipping overlay ${o.name}: filter does not match $(basename "$dtb")" - continue - fi + echo "Skipping overlay ${o.name}: incompatible with $(basename "$dtb")" + elif ${if (o.filter == null) then "false" else '' + [[ "''${dtb//${o.filter}/}" == "$dtb" ]] ''} - - echo -n "Applying overlay ${o.name} to $(basename "$dtb")... " - mv "$dtb"{,.in} - fdtoverlay -o "$dtb" -i "$dtb.in" "${o.dtboFile}" - echo "ok" - rm "$dtb.in" + then + echo "Skipping overlay ${o.name}: filter does not match $(basename "$dtb")" + else + echo -n "Applying overlay ${o.name} to $(basename "$dtb")... " + mv "$dtb"{,.in} + fdtoverlay -o "$dtb" -i "$dtb.in" "${o.dtboFile}" + echo "ok" + rm "$dtb.in" + fi '')} done diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 1f53dc8e8343..78acb45bb3c7 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -5,18 +5,24 @@ , libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap, rdma-core , doxygen, python3, pciutils , withExamples ? [] -, shared ? false }: +, shared ? false +, machine ? ( + if stdenv.isx86_64 then "nehalem" + else if stdenv.isAarch64 then "generic" + else null + ) +}: let mod = kernel != null; - dpdkVersion = "22.07"; + dpdkVersion = "22.11.1"; in stdenv.mkDerivation rec { pname = "dpdk"; version = "${dpdkVersion}" + lib.optionalString mod "-${kernel.version}"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${dpdkVersion}.tar.xz"; - sha256 = "sha256-n2Tf3gdf21cIy2Leg4uP+4kVdf7R4dKusma6yj38m+o="; + sha256 = "sha256-3gdkZfcXSg1ScUuQcuSDenJrqsgtj+fcZEytXIz3TUw="; }; nativeBuildInputs = [ @@ -63,8 +69,7 @@ in stdenv.mkDerivation rec { # kni kernel driver is currently not compatble with 5.11 ++ lib.optional (mod && kernel.kernelOlder "5.11") "-Ddisable_drivers=kni" ++ lib.optional (!shared) "-Ddefault_library=static" - ++ lib.optional stdenv.isx86_64 "-Dmachine=nehalem" - ++ lib.optional stdenv.isAarch64 "-Dmachine=generic" + ++ lib.optional (machine != null) "-Dmachine=${machine}" ++ lib.optional mod "-Dkernel_dir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ++ lib.optional (withExamples != []) "-Dexamples=${builtins.concatStringsSep "," withExamples}"; diff --git a/pkgs/os-specific/linux/dracut/default.nix b/pkgs/os-specific/linux/dracut/default.nix new file mode 100644 index 000000000000..583bd4115ac5 --- /dev/null +++ b/pkgs/os-specific/linux/dracut/default.nix @@ -0,0 +1,128 @@ +{ stdenv +, lib +, fetchFromGitHub +, gitUpdater +, makeBinaryWrapper +, pkg-config +, asciidoc +, libxslt +, docbook_xsl +, bash +, kmod +, binutils +, busybox +, bzip2 +, coreutils +, cpio +, findutils +, glibc +, gnugrep +, gnused +, gnutar +, gzip +, kbd +, lvm2 +, lz4 +, lzop +, procps +, rng-tools +, squashfsTools +, systemd +, util-linux +, xz +, zstd +}: + +stdenv.mkDerivation rec { + pname = "dracut"; + version = "059"; + + src = fetchFromGitHub { + owner = "dracutdevs"; + repo = "dracut"; + rev = version; + hash = "sha256-zSyC2SnSQkmS/mDpBXG2DtVVanRRI9COKQJqYZZCPJM="; + }; + + strictDeps = true; + + buildInputs = [ + bash + kmod + ]; + + nativeBuildInputs = [ + makeBinaryWrapper + pkg-config + asciidoc + libxslt + docbook_xsl + ]; + + postPatch = '' + substituteInPlace dracut.sh \ + --replace 'dracutbasedir="$dracutsysrootdir"/usr/lib/dracut' 'dracutbasedir="$dracutsysrootdir"'"$out/lib/dracut" + substituteInPlace lsinitrd.sh \ + --replace 'dracutbasedir=/usr/lib/dracut' "dracutbasedir=$out/lib/dracut" + + echo 'DRACUT_VERSION=${version}' >dracut-version.sh + ''; + + preConfigure = '' + patchShebangs ./configure + ''; + + postFixup = '' + wrapProgram $out/bin/dracut --prefix PATH : ${lib.makeBinPath [ + coreutils + util-linux + ]} --prefix DRACUT_PATH : ${lib.makeBinPath [ + bash + binutils + coreutils + findutils + glibc + gnugrep + gnused + gnutar + kbd + lvm2 + procps + rng-tools + squashfsTools + systemd + util-linux + busybox + ]} + wrapProgram $out/bin/dracut-catimages --set PATH ${lib.makeBinPath [ + coreutils + cpio + findutils + gzip + ]} + wrapProgram $out/bin/lsinitrd --set PATH ${lib.makeBinPath [ + binutils + bzip2 + coreutils + cpio + gnused + gzip + lz4 + lzop + squashfsTools + util-linux + xz + zstd + ]} + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + homepage = "https://github.com/dracutdevs/dracut/wiki"; + description = "An event driven initramfs infrastructure"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lilyinstarlight ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 2fce9d6f0d7b..e4ac8c3929d6 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.53"; + version = "0.55"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - sha256 = "sha256-txtXPWmLfZLBsK3s94W5LyA81mTHStpP3nkq6KW33Mk="; + sha256 = "sha256-vMWs+0iaszq+p55Z9AhqkNHWeOwlgt2iq7uuA8xGjJ4="; }; nativeBuildInputs = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - checkInputs = [ + nativeCheckInputs = [ dbus ]; diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index b8128c83c0c6..fe056be74a7e 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { - version = "2.7.1"; + version = "2.8.2"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "sha256-JkGzmmsAmLvL9e+bg58H79GNHgsqydK/79VoWEq5/Mc="; + sha256 = "sha256-KlRNI2lnUbNeQGY1G+Qm683yXRTNCJwWIri51+PAi9o="; }; hardeningDisable = [ "pic" ]; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure cd kernel/linux/ena + export ENA_PHC_INCLUDE=1 substituteInPlace Makefile --replace '/lib/modules/$(BUILD_KERNEL)' ${kernel.dev}/lib/modules/${kernel.modDirVersion} runHook postConfigure ''; @@ -40,8 +41,7 @@ stdenv.mkDerivation rec { description = "Amazon Elastic Network Adapter (ENA) driver for Linux"; homepage = "https://github.com/amzn/amzn-drivers"; license = licenses.gpl2Only; - maintainers = [ maintainers.eelco ]; + maintainers = with maintainers; [ eelco sielicki ]; platforms = platforms.linux; - broken = kernel.kernelAtLeast "5.17"; }; } diff --git a/pkgs/os-specific/linux/error-inject/default.nix b/pkgs/os-specific/linux/error-inject/default.nix index 87a40580deb7..f4a544172176 100644 --- a/pkgs/os-specific/linux/error-inject/default.nix +++ b/pkgs/os-specific/linux/error-inject/default.nix @@ -10,7 +10,7 @@ version = "4cbe46321b4a81365ff3aafafe63967264dbfec5"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git"; + url = "https://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git"; rev = version; sha256 = "0gjapg2hrlxp8ssrnhvc19i3r1xpcnql7xv0zjgbv09zyha08g6z"; }; @@ -40,7 +40,7 @@ version = "9bd5e2c7886fca72f139cd8402488a2235957d41"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git"; rev = version; sha256 = "0bh6mzpk2mr4xidkammmkfk21b4dbq793qjg25ryyxd1qv0c6cg4"; }; diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 7807f475e9b1..0dd69784516a 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , autoreconfHook -, glib , gperf , kmod , pkg-config @@ -27,7 +26,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glib kmod util-linux ]; diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index b94f4351ff52..9a4f375289bd 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "evdi"; - version = "1.12.0"; + version = "unstable-2022-10-13"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-JZKZ7+1OMbBtUA7pAZ41TzeDDyiD0h7yTXJINJ5FjN4="; + rev = "bdc258b25df4d00f222fde0e3c5003bf88ef17b5"; + hash = "sha256-mt+vEp9FFf7smmE2PzuH/3EYl7h89RBN1zTVvv2qJ/o="; }; NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare"; diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index 9a2c20ca38aa..03ab973c8b99 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "eventstat"; - version = "0.04.13"; + version = "0.05.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-psamt9omhakiO3Kx2EzofPL2VAsva7XKQTZmn6zKefA="; + hash = "sha256-yGEFegUpWNBsrGZJjWud3aOsRJgXsOJmXkgpXcsPHo0="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix new file mode 100644 index 000000000000..d8769b0f04de --- /dev/null +++ b/pkgs/os-specific/linux/fanctl/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitLab, rustPlatform }: + +rustPlatform.buildRustPackage rec { + version = "0.6.4"; + pname = "fanctl"; + + src = fetchFromGitLab { + owner = "mcoffin"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XmawybmqRJ9Lj6ii8TZBFwqdQZVp0pOLN4xiSLkU/bw="; + }; + + cargoSha256 = "sha256-tj00DXQEqC/8+3uzTMWcph+1fNTTVZLSJbV/5lLFkFs="; + + meta = with lib; { + description = "Replacement for fancontrol with more fine-grained control interface in its config file"; + homepage = "https://gitlab.com/mcoffin/fanctl"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ icewind1991 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 7b7abdb8441c..9ab8eac772ce 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.70"; + version = "0.9.72"; src = fetchFromGitHub { owner = "netblue30"; repo = "firejail"; rev = version; - sha256 = "sha256-x1txt0uER66bZN6BD6c/31Zu6fPPwC9kl/3bxEE6Ce8="; + sha256 = "sha256-XAlb6SSyY2S1iWDaulIlghQ16OGvT/wBCog95/nxkog="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/firmware/ath9k/default.nix b/pkgs/os-specific/linux/firmware/ath9k/default.nix new file mode 100644 index 000000000000..42aca54e9332 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/ath9k/default.nix @@ -0,0 +1,147 @@ +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +, m4 +, cmake +, perl +, writeScript +, enableUnstable ? false +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ath9k-htc-blobless-firmware"; + version = if enableUnstable then "unstable-2022-05-22" else "1.4.0"; + + src = fetchFromGitHub ({ + owner = "qca"; + repo = "open-ath9k-htc-firmware"; + } // (if enableUnstable then { + rev = "d856466a068afe4069335257c0d28295ff777d92"; + hash = "sha256-9OE6qYGABeXjf1r/Depd+811EJ2e8I0Ni5ePHSOh9G4="; + } else { + rev = finalAttrs.version; + hash = "sha256-Q/A0ryIC5E1pt2Sh7o79gxHbe4OgdlrwflOWtxWSS5o="; + })); + + postPatch = '' + patchShebangs target_firmware/firmware-crc.pl + ''; + + nativeBuildInputs = [ m4 cmake perl ]; + + NIX_CFLAGS_COMPILE = "-w"; # old libiberty emits fatal warnings + + dontUseCmakeConfigure = true; + enableParallelBuilding = true; + + # The firmware repository builds its own toolchain, with patches + # applied to the xtensa support in both gcc and binutils. + preBuild = + let + inherit (lib) toUpper splitString last listToAttrs pipe; + inherit (builtins) map; + urls-and-hashes = import (./. + "/urls-and-hashes-${finalAttrs.version}.nix"); + make-links = pipe + [ "gcc" "binutils" "gmp" "mpfr" "mpc" ] + [ (map (vname: fetchurl rec { + url = urls-and-hashes."${(toUpper vname) + "_URL"}"; + sha256 = urls-and-hashes."${(toUpper vname) + "_SUM"}" or ""; + name = last (splitString "/" url); + })) + (map (v: "ln -sT ${v} toolchain/dl/${v.name}")) + (lib.concatStringsSep "\n") + ]; + in '' + mkdir -p toolchain/dl + ${make-links} + ''; + + makeTargets = [ "toolchain" "firmware" ]; + + installPhase = '' + runHook preInstall + install -Dt $out/lib/firmware/ath9k_htc/ target_firmware/*.fw + runHook postInstall + ''; + + passthru = { + inherit (finalAttrs) src; + updateScript = writeScript "${finalAttrs.pname}-${finalAttrs.version}-updateScript" '' + nix-shell '' -A ${finalAttrs.pname}${lib.optionalString enableUnstable "-unstable"}.passthru.update \ + > pkgs/os-specific/linux/firmware/ath9k/urls-and-hashes-${finalAttrs.version}.nix + ''; + update = stdenv.mkDerivation { + name = "${finalAttrs.pname}-${finalAttrs.version}-update"; + shellHook = '' + echo 'rec {' + echo ' BASEDIR="$NIX_BUILD_TOP";' + make --dry-run --print-data-base -f ${finalAttrs.src}/Makefile download \ + | egrep '^[A-Z]+_(VER|URL|SUM|DIR) = ' \ + | sed 's_\([^ ]*\) = \(.*\)_\1 = "\2\";_' \ + | tr \( \{ \ + | tr \) \} + '' + # sha256 checksums were not added to upstream's Makefile until + # after the 1.4.0 release. The following line is needed for + # the `enableUnstable==false` build but not for the + # `enableUnstable==true` build. We can remove the lines below + # as soon as `enableUnstable==false` points to a version + # greater than 1.4.0. + + lib.optionalString (finalAttrs.version == "1.4.0") '' + echo 'GCC_SUM = "sha256-kuYcbcOgpEnmLXKjgYX9pVAWioZwLeoHEl69PsOZYoI=";' + echo 'MPFR_SUM = "sha256-e2bD8T3IOF8IJkyAWFPz4aju2rgHHVgvPmYZccms1f0=";' + echo 'MPC_SUM = "sha256-7VqBXP6lJdx3jfDLN0aLnBtVSq8w2TKLFDHKcFt0AP8=";' + echo 'GMP_SUM = "sha256-H1iKrMxBu5rtlG+f44Uhwm2LKQ0APF34B/ZWkPKq3sk=";' + echo 'BINUTILS_SUM = "sha256-KrLlsD4IbRLGKV+DGtrUaz4UEKOiNJM6Lo+sZssuehk=";' + '' + '' + echo '}' + exit + ''; + }; + }; + + meta = { + description = "Blobless, open source wifi firmware for ath9k_htc.ko"; + longDescription = '' + Firmware for Qualcomm Atheros cards which use the ath9k_htc.ko + Linux driver, supporting 802.11 abgn on both 2.4ghz and 5ghz + bands, 3x3-antenna MIMO, up to 600mbit/sec. + + Most devices which use this driver are based on the Qualcomm + Atheros AR9271 chip, which is a PCIe device. If your device + is connected via USB, it will also include a Qualcomm Atheros + AR7010, which bridges from a USB gadget interface to a PCIe + host interface. This repository includes the firmware for + both chips. + + This firmware is completely open source with no blobs, which + is quite rare in the wifi world. Wifi chips have their own + dedicated general-purpose CPUs. This source code allows you + to see what those CPUs are doing and modify their behavior. + ''; + license = with lib.licenses; [ # see NOTICE.txt for details + bsd3 # almost everything; "the ClearBSD licence" + gpl2ClasspathPlus # **/*cmnos_printf.c, only three files + mit # **/xtos, **/xtensa + ]; + + # release 1.4.0 vendors a GMP which uses an ancient version of + # autotools that does not work on aarch64 or powerpc. + # However, enableUnstable (unreleased upstream) works. + /* + # disabled until #195294 is merged + badPlatforms = + with lib.systems.inspect.patterns; + lib.optionals (!enableUnstable && lib.versionOlder finalAttrs.version "1.4.1") [ + isAarch64 + isPower64 + ]; + */ + + sourceProvenance = [ lib.sourceTypes.fromSource ]; + homepage = "http://lists.infradead.org/mailman/listinfo/ath9k_htc_fw"; + downloadPage = "https://github.com/qca/open-ath9k-htc-firmware"; + changelog = "https://github.com/qca/open-ath9k-htc-firmware/tags"; + }; +}) diff --git a/pkgs/os-specific/linux/firmware/ath9k/urls-and-hashes-1.4.0.nix b/pkgs/os-specific/linux/firmware/ath9k/urls-and-hashes-1.4.0.nix new file mode 100644 index 000000000000..d67669c93b33 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/ath9k/urls-and-hashes-1.4.0.nix @@ -0,0 +1,26 @@ +rec { + BASEDIR="$NIX_BUILD_TOP"; +BINUTILS_URL = "https://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VER}.tar.bz2"; +DL_DIR = "${TOOLCHAIN_DIR}/dl"; +GMP_URL = "https://ftp.gnu.org/gnu/gmp/gmp-${GMP_VER}.tar.bz2"; +GCC_URL = "https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/gcc-${GCC_VER}.tar.bz2"; +BINUTILS_DIR = "binutils-${BINUTILS_VER}"; +GCC_VER = "4.7.4"; +MPFR_URL = "https://ftp.gnu.org/gnu/mpfr/mpfr-${MPFR_VER}.tar.bz2"; +MPC_VER = "1.0.1"; +GMP_DIR = "gmp-${GMP_VER}"; +MPC_URL = "https://ftp.gnu.org/gnu/mpc/mpc-${MPC_VER}.tar.gz"; +GCC_DIR = "gcc-${GCC_VER}"; +MPFR_DIR = "mpfr-${MPFR_VER}"; +MPC_DIR = "mpc-${MPC_VER}"; +MPFR_VER = "3.1.1"; +GMP_VER = "5.0.5"; +BINUTILS_VER = "2.23.1"; +BUILD_DIR = "${TOOLCHAIN_DIR}/build"; +TOOLCHAIN_DIR = "${BASEDIR}/toolchain"; +GCC_SUM = "sha256-kuYcbcOgpEnmLXKjgYX9pVAWioZwLeoHEl69PsOZYoI="; +MPFR_SUM = "sha256-e2bD8T3IOF8IJkyAWFPz4aju2rgHHVgvPmYZccms1f0="; +MPC_SUM = "sha256-7VqBXP6lJdx3jfDLN0aLnBtVSq8w2TKLFDHKcFt0AP8="; +GMP_SUM = "sha256-H1iKrMxBu5rtlG+f44Uhwm2LKQ0APF34B/ZWkPKq3sk="; +BINUTILS_SUM = "sha256-KrLlsD4IbRLGKV+DGtrUaz4UEKOiNJM6Lo+sZssuehk="; +} diff --git a/pkgs/os-specific/linux/firmware/ath9k/urls-and-hashes-unstable-2022-05-22.nix b/pkgs/os-specific/linux/firmware/ath9k/urls-and-hashes-unstable-2022-05-22.nix new file mode 100644 index 000000000000..4234f91ef978 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/ath9k/urls-and-hashes-unstable-2022-05-22.nix @@ -0,0 +1,26 @@ +rec { + BASEDIR="$NIX_BUILD_TOP"; +BINUTILS_URL = "https://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VER}.tar.bz2"; +DL_DIR = "${TOOLCHAIN_DIR}/dl"; +GMP_SUM = "f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea"; +GMP_URL = "https://ftp.gnu.org/gnu/gmp/gmp-${GMP_VER}.tar.bz2"; +GCC_URL = "https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/gcc-${GCC_VER}.tar.gz"; +BINUTILS_DIR = "binutils-${BINUTILS_VER}"; +GCC_VER = "10.2.0"; +MPFR_URL = "https://ftp.gnu.org/gnu/mpfr/mpfr-${MPFR_VER}.tar.bz2"; +MPC_VER = "1.1.0"; +GMP_DIR = "gmp-${GMP_VER}"; +MPC_URL = "https://ftp.gnu.org/gnu/mpc/mpc-${MPC_VER}.tar.gz"; +GCC_DIR = "gcc-${GCC_VER}"; +MPC_SUM = "6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e"; +GCC_SUM = "27e879dccc639cd7b0cc08ed575c1669492579529b53c9ff27b0b96265fa867d"; +BINUTILS_SUM = "7d24660f87093670738e58bcc7b7b06f121c0fcb0ca8fc44368d675a5ef9cff7"; +MPFR_DIR = "mpfr-${MPFR_VER}"; +MPC_DIR = "mpc-${MPC_VER}"; +MPFR_VER = "4.1.0"; +GMP_VER = "6.2.0"; +BINUTILS_VER = "2.35"; +BUILD_DIR = "${TOOLCHAIN_DIR}/build"; +MPFR_SUM = "feced2d430dd5a97805fa289fed3fc8ff2b094c02d05287fd6133e7f1f0ec926"; +TOOLCHAIN_DIR = "${BASEDIR}/toolchain"; +} diff --git a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix index ee36ab574426..3ae23aa56071 100644 --- a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -1,32 +1,56 @@ -{ rustPlatform, lib, fetchFromGitHub, xz, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: -rustPlatform.buildRustPackage rec { +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, xz +, pkg-config +, openssl +, dbus +, glib +, udev +, cairo +, pango +, atk +, gdk-pixbuf +, gtk3 +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { pname = "firmware-manager"; - version = "0.1.2"; + version = "unstable-2022-12-09"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; - rev = version; - sha256 = "sha256-aKatdjHa/k7j48upkR1O6PFxCUfJYE3KhhzZ9Ohe0Jc="; + rev = "9be8160346689bd74f95db7897884a91fa48afe3"; + sha256 = "sha256-zZk2RVghhKxETSVv/Jtv8Wq6+ITx/BudE/o7h4jKk5M="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - - buildInputs = [ xz openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ]; - - depsExtraArgs.postPatch = "make prefix='$(out)' toml-gen"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sha256 = "sha256-3drsOmlmy1xXRWg7WMDNN+iuVmPYf60sDLIdCvu4rEw="; + }; postPatch = '' - sed -i 's|etc|$(prefix)/etc|' Makefile + substituteInPlace Makefile --replace '$(DESTDIR)/etc' '$(DESTDIR)$(prefix)/etc' ''; - buildPhase = "make prefix='$(out)'"; + nativeBuildInputs = with rustPlatform; [ + rust.cargo + rust.rustc + pkg-config + cargoSetupHook + wrapGAppsHook + ]; - installPhase = "make prefix='$(out)' install"; + buildInputs = [ + openssl + gtk3 + udev + ]; - cargoSha256 = "sha256-BUo77ERHvuc8IkDdU3Z/gZZicNHT26IbAgEBnVM3O4U="; - - doCheck = false; + makeFlags = [ "prefix=$(out)" ]; meta = { description = "Graphical frontend for firmware management"; 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 2a6ae96cef11..cb33eb1c214c 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 @@ -10,7 +10,7 @@ index b0ff5b106..13ac380d0 100644 ) endif diff --git a/data/meson.build b/data/meson.build -index 3a77a7bfc..747bd1988 100644 +index 865b20e26..ff1c2657b 100644 --- a/data/meson.build +++ b/data/meson.build @@ -26,7 +26,7 @@ endif @@ -20,8 +20,8 @@ index 3a77a7bfc..747bd1988 100644 - install_dir: join_paths(sysconfdir, 'fwupd') + install_dir: join_paths(sysconfdir_install, 'fwupd') ) - plugin_quirks += join_paths(meson.current_source_dir(), 'power.quirk') - plugin_quirks += join_paths(meson.current_source_dir(), 'cfi.quirk') + plugin_quirks += files([ + 'power.quirk', diff --git a/data/pki/meson.build b/data/pki/meson.build index 3649fecea..c3462744b 100644 --- a/data/pki/meson.build @@ -57,28 +57,27 @@ index 3649fecea..c3462744b 100644 ) endif diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build -index 1d1698a7e..5469d00a6 100644 +index c20a1a05e..87b1fa930 100644 --- a/data/remotes.d/meson.build +++ b/data/remotes.d/meson.build -@@ -2,7 +2,7 @@ if build_standalone and get_option('lvfs') != 'false' - install_data([ - 'lvfs-testing.conf', - ], -- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d') -+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d') - ) - con3 = configuration_data() - if get_option('lvfs') == 'disabled' -@@ -15,7 +15,7 @@ if build_standalone and get_option('lvfs') != 'false' +@@ -15,14 +15,14 @@ if build_standalone and get_option('lvfs') != 'false' output: 'lvfs.conf', configuration: con3, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), ++ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), + ) + configure_file( + input: 'lvfs-testing.conf', + output: 'lvfs-testing.conf', + configuration: con3, + install: true, +- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) i18n.merge_file( input: 'lvfs.metainfo.xml', -@@ -49,12 +49,12 @@ configure_file( +@@ -54,12 +54,12 @@ configure_file( output: 'vendor.conf', configuration: con2, install: true, @@ -94,10 +93,10 @@ index 1d1698a7e..5469d00a6 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index e7980e965..2c66e2dc4 100644 +index d3e08af43..30011f548 100644 --- a/meson.build +++ b/meson.build -@@ -195,6 +195,12 @@ endif +@@ -193,6 +193,12 @@ endif mandir = join_paths(prefix, get_option('mandir')) localedir = join_paths(prefix, get_option('localedir')) @@ -111,7 +110,7 @@ index e7980e965..2c66e2dc4 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 6cf92e72e..2e8568292 100644 +index 204690640..6fc7e8437 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ @@ -120,10 +119,10 @@ index 6cf92e72e..2e8568292 100644 option('consolekit', type : 'feature', description : 'ConsoleKit support', deprecated: {'true': 'enabled', 'false': 'disabled'}) 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 67bd3b9d9..ad04a91b6 100644 +index 88c039f85..62a7691f3 100644 --- a/plugins/dell-esrt/meson.build +++ b/plugins/dell-esrt/meson.build -@@ -38,6 +38,6 @@ configure_file( +@@ -27,6 +27,6 @@ configure_file( output: 'dell-esrt.conf', configuration: con2, install: true, @@ -132,7 +131,7 @@ index 67bd3b9d9..ad04a91b6 100644 ) endif diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build -index d626c3ad3..5a2f847d5 100644 +index 23ec5ec82..b03826fc0 100644 --- a/plugins/msr/meson.build +++ b/plugins/msr/meson.build @@ -10,7 +10,7 @@ install_data(['fwupd-msr.conf'], @@ -142,27 +141,27 @@ index d626c3ad3..5a2f847d5 100644 - install_dir: join_paths(sysconfdir, 'fwupd') + install_dir: join_paths(sysconfdir_install, 'fwupd') ) - shared_module('fu_plugin_msr', - fu_hash, + plugin_builtins += static_library('fu_plugin_msr', + sources: [ diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build -index 95606e478..e5355e520 100644 +index 1e35b6ce9..33ca1447f 100644 --- a/plugins/redfish/meson.build +++ b/plugins/redfish/meson.build -@@ -43,7 +43,7 @@ shared_module('fu_plugin_redfish', - ) +@@ -35,7 +35,7 @@ plugin_builtin_redfish = static_library('fu_plugin_redfish', + plugin_builtins += plugin_builtin_redfish 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 5f8ffbf90..9ba323e75 100644 +index 71d930e62..399fb5781 100644 --- a/plugins/thunderbolt/meson.build +++ b/plugins/thunderbolt/meson.build -@@ -32,7 +32,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt', - ) +@@ -19,7 +19,7 @@ plugin_builtin_thunderbolt = static_library('fu_plugin_thunderbolt', + plugin_builtins += plugin_builtin_thunderbolt install_data(['thunderbolt.conf'], - install_dir: join_paths(sysconfdir, 'fwupd') @@ -171,7 +170,7 @@ index 5f8ffbf90..9ba323e75 100644 # we use functions from 2.52 in the tests if get_option('tests') and run_sanitize_unsafe_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 ef38dc03e..78ff65e1d 100644 +index b4b038313..9c5407c3f 100644 --- a/plugins/uefi-capsule/meson.build +++ b/plugins/uefi-capsule/meson.build @@ -20,7 +20,7 @@ if host_machine.system() == 'linux' @@ -183,7 +182,7 @@ index ef38dc03e..78ff65e1d 100644 ) elif host_machine.system() == 'freebsd' backend_srcs += 'fu-uefi-backend-freebsd.c' -@@ -110,7 +110,7 @@ if get_option('compat_cli') and get_option('man') +@@ -87,7 +87,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 66cfbef940bf..8939aef06c54 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -15,6 +15,7 @@ , gusb , sqlite , libarchive +, libredirect , curl , libjcat , elfutils @@ -30,6 +31,7 @@ , protobufc , python3 , wrapGAppsNoGuiHook +, ensureNewerSourcesForZipFilesHook , json-glib , bash-completion , shared-mime-info @@ -52,6 +54,7 @@ , libmbim , libcbor , xz +, enableFlashrom ? false }: let @@ -74,7 +77,7 @@ let # # Currently broken on Aarch64 # haveFlashrom = isx86; # Experimental - haveFlashrom = false; + haveFlashrom = isx86 && enableFlashrom; runPythonCommand = name: buildCommandPython: runCommand name { nativeBuildInputs = [ python3 ]; @@ -85,13 +88,13 @@ let test-firmware = let - version = "unstable-2021-11-02"; + version = "unstable-2022-04-02"; src = fetchFromGitHub { name = "fwupd-test-firmware-${version}"; owner = "fwupd"; repo = "fwupd-test-firmware"; - rev = "aaa2f9fd68a40684c256dd85b86093cba38ffd9d"; - sha256 = "Slk7CNfkmvmOh3WtIBkPs3NYT96co6i8PwqcbpeVFgA="; + rev = "39954e434d63e20e85870dd1074818f48a0c08b7"; + hash = "sha256-d4qG3fKyxkfN91AplRYqARFz+aRr+R37BpE450bPxi0="; passthru = { inherit src version; # For update script updateScript = unstableGitUpdater { @@ -114,7 +117,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.8.4"; + version = "1.8.10"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -123,7 +126,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "sha256-rfoHQ0zcKexBxA/vRg6Nlwlj/gx+hJ3sfzkyrbFh+IY="; + hash = "sha256-vvNUidNdhW9xeksjEVnkIR7CZ4oBQizZJRMFtZUq6Ow="; }; patches = [ @@ -147,6 +150,8 @@ let ]; nativeBuildInputs = [ + # required for firmware zipping + ensureNewerSourcesForZipFilesHook meson ninja gi-docgen @@ -187,7 +192,7 @@ let libmbim libcbor libqmi - xz # for liblzma. + xz # for liblzma ] ++ lib.optionals haveDell [ libsmbios ] ++ lib.optionals haveFlashrom [ @@ -210,14 +215,9 @@ let "-Dsysconfdir_install=${placeholder "out"}/etc" "-Defi_os_dir=nixos" "-Dplugin_modem_manager=enabled" - # Requires Meson 0.63 - "-Dgresource_quirks=disabled" # We do not want to place the daemon into lib (cyclic reference) "--libexecdir=${placeholder "out"}/libexec" - # Our builder only adds $lib/lib to rpath but some things link - # against libfwupdplugin which is in $out/lib. - "-Dc_link_args=-Wl,-rpath,${placeholder "out"}/lib" ] ++ lib.optionals (!haveDell) [ "-Dplugin_dell=disabled" "-Dplugin_synaptics_mst=disabled" @@ -232,8 +232,7 @@ let # TODO: wrapGAppsHook wraps efi capsule even though it is not ELF dontWrapGApps = true; - # /etc/os-release not available in sandbox - # doCheck = true; + doCheck = true; # Environment variables @@ -254,16 +253,18 @@ let postPatch = '' patchShebangs \ contrib/generate-version-script.py \ - meson_post_install.sh \ po/test-deps - # This checks a version of a dependency of gi-docgen but gi-docgen is self-contained in Nixpkgs. - echo "Clearing docs/test-deps.py" - test -f docs/test-deps.py - echo > docs/test-deps.py - substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \ --replace "gdbus" ${glib.bin}/bin/gdbus + + # tests fail with: Failed to load SMBIOS: neither SMBIOS or DT found + sed -i 's/test(.*)//' plugins/lenovo-thinklmi/meson.build + sed -i 's/test(.*)//' plugins/mtd/meson.build + # fails on amd cpu + sed -i 's/test(.*)//' libfwupdplugin/meson.build + # in nixos test tries to chmod 0777 $out/share/installed-tests/fwupd/tests/redfish.conf + sed -i "s/get_option('tests')/false/" plugins/redfish/meson.build ''; preBuild = '' @@ -273,6 +274,10 @@ let preCheck = '' addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share" + + echo "12345678901234567890123456789012" > machine-id + export NIX_REDIRECTS=/etc/machine-id=$(realpath machine-id) \ + LD_PRELOAD=${libredirect}/lib/libredirect.so ''; preInstall = '' @@ -328,7 +333,6 @@ let "fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/vendor.conf" "fwupd/remotes.d/vendor-directory.conf" - "fwupd/thunderbolt.conf" "fwupd/uefi_capsule.conf" "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware" "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" @@ -343,13 +347,14 @@ let "fwupd/redfish.conf" ] ++ lib.optionals haveMSR [ "fwupd/msr.conf" + ] ++ lib.optionals isx86 [ + "fwupd/thunderbolt.conf" ]; # DisabledPlugins key in fwupd/daemon.conf defaultDisabledPlugins = [ "test" "test_ble" - "invalid" ]; # For updating. diff --git a/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch b/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch index afee6d9f61ea..a91adc1a69b9 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch @@ -1,13 +1,13 @@ diff --git a/meson.build b/meson.build -index b91dd037..01d70a61 100644 +index 7ac8c937a..5a23d0c80 100644 --- a/meson.build +++ b/meson.build -@@ -413,7 +413,7 @@ if build_standalone and efiboot.found() and efivar.found() +@@ -419,7 +419,7 @@ if build_standalone and efiboot.found() and efivar.found() conf.set('HAVE_EFI_TIME_T', '1') endif - efi_app_location = join_paths(libexecdir, 'fwupd', 'efi') -+ efi_app_location = join_paths(dependency('fwupd-efi').get_pkgconfig_variable('prefix'), 'libexec', 'fwupd', 'efi') ++ efi_app_location = join_paths(dependency('fwupd-efi').get_variable(pkgconfig: 'prefix'), 'libexec', 'fwupd', 'efi') conf.set_quoted('EFI_APP_LOCATION', efi_app_location) if host_cpu == 'x86' diff --git a/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch b/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch index f3369b6e1333..e6269ae840bb 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch @@ -1,37 +1,14 @@ -diff --git a/libfwupdplugin/meson.build b/libfwupdplugin/meson.build -index 1afa28e1..3da81d30 100644 ---- a/libfwupdplugin/meson.build -+++ b/libfwupdplugin/meson.build -@@ -220,7 +220,8 @@ fwupdplugin = library( - ], - link_args: cc.get_supported_link_arguments([vflag]), - link_depends: fwupdplugin_mapfile, -- install: true -+ install: true, -+ install_dir: bindir / '..' / 'lib', - ) - - fwupdplugin_pkgg = import('pkgconfig') -@@ -280,7 +281,8 @@ if introspection.allowed() - girtargets, - fwupd_gir[0], - ], -- install: true -+ install: true, -+ install_dir_typelib: bindir / '..' / 'lib' / 'girepository-1.0', - ) - - # Verify the map file is correct -- note we can't actually use the generated diff --git a/meson.build b/meson.build -index b91dd037..f97b4c26 100644 +index 9ae278b66..7cddf1a0d 100644 --- a/meson.build +++ b/meson.build -@@ -504,7 +504,7 @@ if build_standalone +@@ -507,7 +507,7 @@ if build_standalone if host_machine.system() == 'windows' - plugin_dir = 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current) + libdir_pkg = 'fwupd-@0@'.format(fwupd_version) else -- plugin_dir = join_paths(libdir, 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current)) -+ plugin_dir = join_paths(bindir, '..', 'lib', 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current)) +- libdir_pkg = join_paths(libdir, 'fwupd-@0@'.format(fwupd_version)) ++ libdir_pkg = join_paths(prefix, 'lib', 'fwupd-@0@'.format(fwupd_version)) endif - conf.set_quoted('FWUPD_PLUGINDIR', plugin_dir) + conf.set_quoted('FWUPD_LIBDIR_PKG', libdir_pkg) endif + 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 49bca65d9c60..a914f56c66db 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch @@ -1,19 +1,19 @@ diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build -index b8ec916f..38209b36 100644 +index be3d5c6d9..14d45dcaf 100644 --- a/data/installed-tests/meson.build +++ b/data/installed-tests/meson.build @@ -83,5 +83,5 @@ configure_file( - output : 'fwupd-tests.conf', - configuration : con2, + output: 'fwupd-tests.conf', + configuration: con2, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index b91dd037..d7e20b18 100644 +index 30011f548..7ac8c937a 100644 --- a/meson.build +++ b/meson.build -@@ -188,8 +188,8 @@ else +@@ -186,8 +186,8 @@ else datadir = join_paths(prefix, get_option('datadir')) sysconfdir = join_paths(prefix, get_option('sysconfdir')) localstatedir = join_paths(prefix, get_option('localstatedir')) @@ -24,7 +24,7 @@ index b91dd037..d7e20b18 100644 daemon_dir = join_paths(libexecdir, 'fwupd') endif mandir = join_paths(prefix, get_option('mandir')) -@@ -492,6 +492,7 @@ gnome = import('gnome') +@@ -498,6 +498,7 @@ gnome = import('gnome') i18n = import('i18n') conf.set_quoted('FWUPD_PREFIX', prefix) @@ -33,10 +33,10 @@ index b91dd037..d7e20b18 100644 conf.set_quoted('FWUPD_LIBDIR', libdir) conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir) diff --git a/meson_options.txt b/meson_options.txt -index d00038db..be1c45b4 100644 +index 6fc7e8437..29832fd08 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -56,6 +56,7 @@ option('systemd', type : 'feature', description : 'systemd support', deprecated: +@@ -57,6 +57,7 @@ option('systemd', type : 'feature', description : 'systemd support', deprecated: option('systemd_unit_user', type : 'string', description : 'User account to use for fwupd-refresh.service (empty for DynamicUser)') option('systemd_root_prefix', type: 'string', value: '', description: 'Directory to base systemd’s installation directories on') option('elogind', type : 'feature', description : 'elogind support', deprecated: {'true': 'enabled', 'false': 'disabled'}) @@ -44,16 +44,3 @@ index d00038db..be1c45b4 100644 option('tests', type : 'boolean', value : true, description : 'enable tests') option('soup_session_compat', type : 'boolean', value : true, description : 'enable SoupSession runtime compatibility support') option('curl', type : 'feature', description : 'libcurl support', deprecated: {'true': 'enabled', 'false': 'disabled'}) -diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c -index 4d19e560..91cfaa61 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/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix index 716c5e4d8288..af9a44b92f46 100644 --- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix +++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Firmware for Intel 2200BG cards"; - homepage = "http://ipw2200.sourceforge.net/firmware.php"; + homepage = "https://ipw2200.sourceforge.net/firmware.php"; license = licenses.unfreeRedistributableFirmware; maintainers = with maintainers; [ sternenseemann ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix index fefd7c56d761..2ed667f40ce7 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix @@ -1,6 +1,6 @@ # This file is autogenerated! Run ./update.sh to regenerate. { - version = "20221109"; - sourceHash = "sha256-77xRUo4g24j5rGWYzVn/DZ1rfY+Ks9cmZ/+GCHELP5E="; - outputHash = "sha256-pPhqbi4PRr+0FQ7K8M/SibgYeI45spcdqgb5garyJo8="; + version = "20221214"; + sourceHash = "sha256-vljUwXekmCYAH932wfbJe/hC4TDPRQOgEiPTUMeUKLE="; + outputHash = "sha256-h0cCqnl6XvSoeyq54JHvl45z7qe/7ZKrcMNJJeqVLMk="; } diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index 730e839bd457..987eb357109c 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -2,22 +2,22 @@ stdenvNoCC.mkDerivation { pname = "raspberrypi-wireless-firmware"; - version = "2021-12-06"; + version = "2022-07-06"; srcs = [ (fetchFromGitHub { name = "bluez-firmware"; owner = "RPi-Distro"; repo = "bluez-firmware"; - rev = "e7fd166981ab4bb9a36c2d1500205a078a35714d"; - hash = "sha256-6xBdXwAGA1N42k1KKYrEgtsxtFAtrwhKdIrYY39Fb7Y="; + rev = "dd840d991939f5046959b8c564596c7228f9d41d"; + hash = "sha512-XvF6IHDoKBJkSs0Wyt8O1vcCMpSNS9WSYopn0+EyCr4btABGsHWTkgxb4nQbd+VbE6Ls2dcKr+c+X6aw/y1jhQ=="; }) (fetchFromGitHub { name = "firmware-nonfree"; owner = "RPi-Distro"; repo = "firmware-nonfree"; - rev = "99d5c588e95ec9c9b86d7e88d3cf85b4f729d2bc"; - hash = "sha256-xg6fYQvg7t2ikyLI8/XfpiNaNTf7CNFQlAzpTldTz10="; + rev = "541e5a05d152e7e6f0d9be45622e4a3741e51c02"; + hash = "sha512-0erVWiFom0V5AMu+XlolJnY9Q5/RCFlZwUovMBMNdEPb+L5rHcCdrA7zehDX1oRNe8DPb4S5gjny0iG/G7G6NQ=="; }) ]; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index 7143d0b55a27..d6b951a7f55c 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-11-01"; + version = "unstable-2022-07-11"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "tools"; - rev = "13474ee775d0c5ec8a7da4fb0a9fa84187abfc87"; - sha256 = "s/RPMIpQSznoQfchAP9gpO7I2uuTsOV0Ep4vVz7i2o4="; + rev = "439b6198a9b340de5998dd14a26a0d9d38a6bcac"; + hash = "sha512-KMHgj73eXHT++IE8DbCsFeJ87ngc9R3XxMUJy4Z3s4/MtMeB9zblADHkyJqz9oyeugeJTrDtuVETPBRo7M4Y8A=="; }; NIX_CFLAGS_COMPILE = [ diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index f63d2095eb70..950f36e5bbc4 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -3,13 +3,13 @@ stdenvNoCC.mkDerivation rec { # NOTE: this should be updated with linux_rpi pname = "raspberrypi-firmware"; - version = "1.20221028"; + version = "1.20230106"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - hash = "sha256-GgPAWFCrLrrLiUDM+pt3VV6+IvCljMN9nh7L84vTQJs="; + hash = "sha512-iKUR16RipN8BGAmXteTJUzd/P+m5gnbWCJ28LEzYfOTJnGSal63zI7LDQg/HIKXx9wMTARQKObeKn+7ioS4QkA=="; }; installPhase = '' diff --git a/pkgs/os-specific/linux/firmware/rtw89-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtw89-firmware/default.nix index 8e71770df9ce..b7289625dae9 100644 --- a/pkgs/os-specific/linux/firmware/rtw89-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtw89-firmware/default.nix @@ -1,8 +1,18 @@ -{ stdenvNoCC, lib, linuxPackages }: +{ stdenvNoCC, lib, fetchFromGitHub }: stdenvNoCC.mkDerivation { pname = "rtw89-firmware"; - inherit (linuxPackages.rtw89) version src; + + # TODO: probably remove after updating linux firmware + # https://github.com/lwfinger/rtw89/commit/a2c113501a5a988683f236df1aa79ce40f29e1be + version = "unstable-2021-10-21"; + + src = fetchFromGitHub { + owner = "lwfinger"; + repo = "rtw89"; + rev = "0684157cba90e36bff5bc61a59e7e87c359b5e5c"; + sha256 = "0cvawyi1ksw9xkr8pzwipsl7b8hnmrb17w5cblyicwih8fqaw632"; + }; dontBuild = true; diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index 24ab894c9f06..9823e8c7ad59 100644 --- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -1,38 +1,34 @@ { lib +, fetchurl , stdenvNoCC -, fetchFromGitHub }: stdenvNoCC.mkDerivation rec { pname = "sof-firmware"; - version = "2.2.2"; + version = "2.2.4"; - src = fetchFromGitHub { - owner = "thesofproject"; - repo = "sof-bin"; - rev = "v${version}"; - sha256 = "sha256-ztewE/8Mc0bbKbxmbJ2sBn3TysuM9hoaSgqrboy77oI="; + src = fetchurl { + url = "https://github.com/thesofproject/sof-bin/releases/download/v${version}/sof-bin-v${version}.tar.gz"; + sha256 = "sha256-zoquuhA6pWqCZiVSsPM/M6hZqhAI2L+8LCLwzPyMazo="; }; dontFixup = true; # binaries must not be stripped or patchelfed - # There is no proper structure in the upstream repo. - # This needs to be adapted by hand for every new release. installPhase = '' runHook preInstall - cd "v2.2.x" - mkdir -p $out/lib/firmware/intel/sof{,-tplg} - cp -a sof-v2.2/* $out/lib/firmware/intel/sof - cp -a sof-v2.2.2/* $out/lib/firmware/intel/sof - cp -a sof-tplg-v2.2.1/* $out/lib/firmware/intel/sof-tplg + mkdir -p $out/lib/firmware/intel + cp -av sof-v${version} $out/lib/firmware/intel/sof + cp -av sof-tplg-v${version} $out/lib/firmware/intel/sof-tplg runHook postInstall ''; meta = with lib; { + changelog = "https://github.com/thesofproject/sof-bin/releases/tag/v${version}"; description = "Sound Open Firmware"; homepage = "https://www.sofproject.org/"; license = with licenses; [ bsd3 isc ]; maintainers = with maintainers; [ lblasc evenbrenden hmenke ]; platforms = with platforms; linux; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix index e600e163ad73..c5682c6942fc 100644 --- a/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -1,13 +1,17 @@ -{ stdenv, lib, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +}: stdenv.mkDerivation rec { pname = "fnotifystat"; - version = "0.02.07"; + version = "0.02.09"; + src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - sha256 = "sha256-5oYM1t+vmWywYRbgXI2RGQlOuNJluj2gwCMf3pTpDC0="; + hash = "sha256-YyIk7x0B3JB/iMF9OP767fVEBgcV0duV7xIiHZxpL0w="; }; installFlags = [ diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index 1c3f3342e081..100b51e301f9 100644 --- a/pkgs/os-specific/linux/forkstat/default.nix +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "forkstat"; - version = "0.02.17"; + version = "0.03.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-Rw1Xwst0+seksTLL+v3IUEojGjwCERwF89xkk70npUU="; + hash = "sha256-hxheElo/v23Xt7m6GvDgGdyIH+fC4eZSUztiuBbQ8T8="; }; installFlags = [ diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index ac4deb19f51c..1ff496abd0cf 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { ./makeconf.sh ''); - checkInputs = [ which ] ++ (with python3Packages; [ python pytest ]); + nativeCheckInputs = [ which ] ++ (with python3Packages; [ python pytest ]); checkPhase = '' python3 -m pytest test/ diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index a5b2dabfd264..ec3d0f880f84 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, glib, pcre +{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, gnumake42, glib, pcre , json_c, flex, bison, dtc, pciutils, dmidecode, acpica-tools, libbsd }: stdenv.mkDerivation rec { @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { stripRoot = false; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + # fails with make 4.4 + nativeBuildInputs = [ autoreconfHook pkg-config gnumake42 ]; buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode acpica-tools libbsd ]; postPatch = '' diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/os-specific/linux/fxload/default.nix index 8c1a778ec8bf..e8b9d0648bd8 100644 --- a/pkgs/os-specific/linux/fxload/default.nix +++ b/pkgs/os-specific/linux/fxload/default.nix @@ -1,37 +1,31 @@ -{lib, stdenv, fetchurl}: +{ lib +, stdenv +, libusb1 +}: stdenv.mkDerivation rec { pname = "fxload"; - version = "2002.04.11"; + version = libusb1.version; + dontUnpack = true; + dontBuild = true; + dontConfigure = true; + dontInstall = true; + dontPatch = true; + dontPatchELF = true; - src = fetchurl { - url = "mirror://sourceforge/linux-hotplug/fxload-${lib.replaceStrings ["."] ["_"] version}.tar.gz"; - sha256 = "1hql93bp3dxrv1p67nc63xsbqwljyynm997ysldrc3n9ifi6s48m"; - }; - - patches = [ - # Will be needed after linux-headers is updated to >= 2.6.21. - (fetchurl { - url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/sys-apps/fxload/files/fxload-20020411-linux-headers-2.6.21.patch?rev=1.1"; - sha256 = "0ij0c8nr1rbyl5wmyv1cklhkxglvsqz32h21cjw4bjm151kgmk7p"; - }) - ]; - - preBuild = '' - substituteInPlace Makefile --replace /usr / - makeFlagsArray=(INSTALL=install prefix=$out) + # fxload binary exist inside the `examples/bin` directory of `libusb1` + postFixup = '' + mkdir -p $out/bin + ln -s ${passthru.libusb}/examples/bin/fxload $out/bin/fxload ''; - preInstall = '' - mkdir -p $out/sbin - mkdir -p $out/share/man/man8 - mkdir -p $out/share/usb - ''; + passthru.libusb = libusb1.override { withExamples = true; }; meta = with lib; { - homepage = "http://linux-hotplug.sourceforge.net/?selected=usb"; - description = "Tool to upload firmware to Cypress EZ-USB microcontrollers"; - license = licenses.gpl2; + homepage = "https://github.com/libusb/libusb"; + description = "Tool to upload firmware to into an21, fx, fx2, fx2lp and fx3 ez-usb devices"; + license = licenses.gpl2Only; platforms = platforms.linux; + maintainers = with maintainers; [ realsnick ]; }; } diff --git a/pkgs/os-specific/linux/health-check/default.nix b/pkgs/os-specific/linux/health-check/default.nix index e876808b461a..9e85281ea4c0 100644 --- a/pkgs/os-specific/linux/health-check/default.nix +++ b/pkgs/os-specific/linux/health-check/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "health-check"; - version = "0.03.10"; + version = "0.03.11"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-1dm7tl7DHv1CzuLe1/UewDSUOanO0hN+STkPrAHcZmI="; + hash = "sha256-QLa/7kA0juefzOba7ELopDmOVfiGJReo4LCfhnxW1tk="; }; buildInputs = [ json_c libbsd ]; diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 3fdbaa9149a6..f1cd6b67165b 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://hostap.epitest.fi"; + homepage = "https://w1.fi/hostapd/"; 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/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index c121ef6f6f53..8fb826833704 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.363"; + version = "0.364"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "sha256-A6GNrHc/t2SVyAyJWmzQTa+pD9wGESsz7DNruW2kH4s="; + sha256 = "sha256-9fGYoyj7vN3j72H+6jv/R0MaWPZ+4UNQhCSWnZRZZS4="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix index a659908a7a09..12033063c165 100644 --- a/pkgs/os-specific/linux/hyperv-daemons/default.nix +++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -73,9 +73,9 @@ in stdenv.mkDerivation { buildCommand = '' system=$lib/lib/systemd/system - install -Dm444 ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service - install -Dm444 ${service "kvp" "key-value pair (KVP)" "" } $system/hv-kvp.service - install -Dm444 ${service "vss" "volume shadow copy (VSS)" "" } $system/hv-vss.service + install -Dm444 ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service + install -Dm444 ${service "kvp" "key-value pair (KVP)" "hv_kvp" } $system/hv-kvp.service + install -Dm444 ${service "vss" "volume shadow copy (VSS)" "hv_vss" } $system/hv-vss.service cat > $system/hyperv-daemons.target <= 231 @@ -897,8 +893,8 @@ let SCSI_LOGGING = yes; # SCSI logging facility SERIAL_8250 = yes; # 8250/16550 and compatible serial support - SLAB_FREELIST_HARDENED = whenAtLeast "4.14" yes; - SLAB_FREELIST_RANDOM = whenAtLeast "4.10" yes; + SLAB_FREELIST_HARDENED = yes; + SLAB_FREELIST_RANDOM = yes; SLIP_COMPRESSED = yes; # CSLIP compressed headers SLIP_SMART = yes; @@ -943,6 +939,9 @@ let SCHED_CORE = whenAtLeast "5.14" yes; + LRU_GEN = whenAtLeast "6.1" yes; + LRU_GEN_ENABLED = whenAtLeast "6.1" yes; + FSL_MC_UAPI_SUPPORT = mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "5.12" yes); ASHMEM = { optional = true; tristate = whenBetween "5.0" "5.18" "y";}; @@ -974,7 +973,7 @@ let NR_CPUS = freeform "384"; } // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enables support for the Allwinner Display Engine 2.0 - SUN8I_DE2_CCU = whenAtLeast "4.13" yes; + SUN8I_DE2_CCU = yes; # See comments on https://github.com/NixOS/nixpkgs/commit/9b67ea9106102d882f53d62890468071900b9647 CRYPTO_AEGIS128_SIMD = whenAtLeast "5.4" no; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 5a4c2858f95f..5a39ef915000 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -29,7 +29,8 @@ structuredExtraConfig ? {} , # The version number used for the module directory - modDirVersion ? version + # If unspecified, this is determined automatically from the version. + modDirVersion ? null , # An attribute set whose attributes express the availability of # certain features in this kernel. E.g. `{iwlwifi = true;}' @@ -194,17 +195,26 @@ let }; }; # end of configfile derivation - kernel = (callPackage ./manual-config.nix { inherit buildPackages; }) (basicArgs // { - inherit modDirVersion kernelPatches randstructSeed lib stdenv extraMakeFlags extraMeta configfile; + kernel = (callPackage ./manual-config.nix { inherit lib stdenv buildPackages; }) (basicArgs // { + inherit kernelPatches randstructSeed extraMakeFlags extraMeta configfile; pos = builtins.unsafeGetAttrPos "version" args; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; - }); + } // lib.optionalAttrs (modDirVersion != null) { inherit modDirVersion; }); passthru = basicArgs // { features = kernelFeatures; - inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre modDirVersion; + inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre; isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; + + # Adds dependencies needed to edit the config: + # nix-shell '' -A linux.configEnv --command 'make nconfig' + configEnv = kernel.overrideAttrs (old: { + nativeBuildInputs = old.nativeBuildInputs or [] ++ (with buildPackages; [ + pkg-config ncurses + ]); + }); + passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); tests = let overridableKernel = finalKernel // { diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index c90027f3eb14..198cd8681646 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -21,10 +21,6 @@ assert (stdenv.hostPlatform.isx86_64 -> versions.majorMinor version != "5.4"); # Report BUG() conditions and kill the offending process. BUG = yes; - # Safer page access permissions (wrt. code injection). Default on >=4.11. - DEBUG_RODATA = whenOlder "4.11" yes; - DEBUG_SET_MODULE_RONX = whenOlder "4.11" yes; - # Mark LSM hooks read-only after init. SECURITY_WRITABLE_HOOKS n # conflicts with SECURITY_SELINUX_DISABLE y; disabling the latter # implicitly marks LSM hooks read-only after init. @@ -33,10 +29,10 @@ assert (stdenv.hostPlatform.isx86_64 -> versions.majorMinor version != "5.4"); # # We set SECURITY_WRITABLE_HOOKS n primarily for documentation purposes; the # config builder fails to detect that it has indeed been unset. - SECURITY_SELINUX_DISABLE = whenAtLeast "4.12" no; - SECURITY_WRITABLE_HOOKS = whenAtLeast "4.12" (option no); + SECURITY_SELINUX_DISABLE = no; + SECURITY_WRITABLE_HOOKS = option no; - STRICT_KERNEL_RWX = whenAtLeast "4.11" yes; + STRICT_KERNEL_RWX = yes; # Perform additional validation of commonly targeted structures. DEBUG_CREDENTIALS = yes; @@ -46,7 +42,7 @@ assert (stdenv.hostPlatform.isx86_64 -> versions.majorMinor version != "5.4"); DEBUG_SG = yes; SCHED_STACK_END_CHECK = yes; - REFCOUNT_FULL = whenBetween "4.13" "5.5" yes; + REFCOUNT_FULL = whenOlder "5.5" yes; # Randomize page allocator when page_alloc.shuffle=1 SHUFFLE_PAGE_ALLOCATOR = whenAtLeast "5.2" yes; @@ -69,11 +65,11 @@ assert (stdenv.hostPlatform.isx86_64 -> versions.majorMinor version != "5.4"); # Gather additional entropy at boot time for systems that may not have appropriate entropy sources. GCC_PLUGIN_LATENT_ENTROPY = yes; - GCC_PLUGIN_STRUCTLEAK = whenAtLeast "4.11" yes; # A port of the PaX structleak plugin - GCC_PLUGIN_STRUCTLEAK_BYREF_ALL = whenAtLeast "4.14" yes; # Also cover structs passed by address + GCC_PLUGIN_STRUCTLEAK = yes; # A port of the PaX structleak plugin + GCC_PLUGIN_STRUCTLEAK_BYREF_ALL = yes; # Also cover structs passed by address GCC_PLUGIN_STACKLEAK = whenAtLeast "4.20" yes; # A port of the PaX stackleak plugin - GCC_PLUGIN_RANDSTRUCT = whenBetween "4.13" "5.19" yes; # A port of the PaX randstruct plugin - GCC_PLUGIN_RANDSTRUCT_PERFORMANCE = whenBetween "4.13" "5.19" yes; + GCC_PLUGIN_RANDSTRUCT = whenOlder "5.19" yes; # A port of the PaX randstruct plugin + GCC_PLUGIN_RANDSTRUCT_PERFORMANCE = whenOlder "5.19" yes; # Same as GCC_PLUGIN_RANDSTRUCT*, but has been renamed to `RANDSTRUCT*` in 5.19. RANDSTRUCT = whenAtLeast "5.19" yes; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 458caf06433c..a2cace8bc1e4 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,61 +2,61 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.299-hardened1.patch", - "sha256": "1qgsi8kfbfqqkb2n0irqfrbq865dz4f5hmhxq7fbmnpacjgwdy6a", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.299-hardened1/linux-hardened-4.14.299-hardened1.patch" + "name": "linux-hardened-4.14.304-hardened1.patch", + "sha256": "099fqlfl9p57pfh5jr7cv30476q2cbhrqs6w63cy3mkwj7l4jwln", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.304-hardened1/linux-hardened-4.14.304-hardened1.patch" }, - "sha256": "0p5ic2mrb9vl3qkzvqxhia3kygjv8xa6s1kqkwgd6b4rmq1kc8r6", - "version": "4.14.299" + "sha256": "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4", + "version": "4.14.304" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.265-hardened1.patch", - "sha256": "0psqvwqvq981hvix58z5bhc4xvgm2ic5y4q7bwsnh1cfvbfg6x2k", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.265-hardened1/linux-hardened-4.19.265-hardened1.patch" + "name": "linux-hardened-4.19.271-hardened1.patch", + "sha256": "0xvd9n2fqmr863a4vljki2saa85dccj7mflcfwaslj9g2ygbrf93", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.271-hardened1/linux-hardened-4.19.271-hardened1.patch" }, - "sha256": "1l5cdpgng1gci1p1gdr2jzqw486h3w56gpyc7fbq74hlc6nnwh1p", - "version": "4.19.265" + "sha256": "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3", + "version": "4.19.271" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.154-hardened1.patch", - "sha256": "0srwi4033h8ypxbwwp1hb3y989jvlwzckvsfjkxzgpnj91i68hn9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.154-hardened1/linux-hardened-5.10.154-hardened1.patch" + "name": "linux-hardened-5.10.165-hardened1.patch", + "sha256": "0gnvnywagqqdsdrbd9fbl671pzfv49mf2xqan9bk3q41mgcyyfgg", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.165-hardened1/linux-hardened-5.10.165-hardened1.patch" }, - "sha256": "12763vlnrgmgj03khj9ls2g7zlhclj9g1l3008b36j9jli6kvbn6", - "version": "5.10.154" + "sha256": "03dg8yx0gdzm8zbwd1f9jn4c5jhr8qilhjzxgwm0mv8riz2fy7cp", + "version": "5.10.165" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.78-hardened1.patch", - "sha256": "1aavp00rswqbbpbyx0c7k2ga6lcd221gcgr4893q7w5z26mv7wkd", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.78-hardened1/linux-hardened-5.15.78-hardened1.patch" + "name": "linux-hardened-5.15.90-hardened1.patch", + "sha256": "1zj80v6xpgz00z1lpw5j9qdm0gp44pk7vkflrngbk8m3cwmpw5ha", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.90-hardened1/linux-hardened-5.15.90-hardened1.patch" }, - "sha256": "16d4d4g5n2g6jpp8bvad1bm1l0b0nb4ckwsmq6w2g3538xrrzf8d", - "version": "5.15.78" + "sha256": "0hiv74mxkp3v04lphnyw16akgavaz527bzhnfnpm6rv848047zg6", + "version": "5.15.90" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.224-hardened1.patch", - "sha256": "1cx0h6sn8wdggg9nwqlrij7cfpa9q6nah73nrv92b4c9n8sjqiwq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.224-hardened1/linux-hardened-5.4.224-hardened1.patch" + "name": "linux-hardened-5.4.230-hardened1.patch", + "sha256": "0xk80i6wddd909wzhcp7b64sbsjjqpwyjr8gknpc83zcdzv3y892", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.230-hardened1/linux-hardened-5.4.230-hardened1.patch" }, - "sha256": "0dixs4w7nmkjgxv9dxgjdy8v6r4parkpqyvdfyr0wqk0amdz4zcb", - "version": "5.4.224" + "sha256": "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7", + "version": "5.4.230" }, - "6.0": { + "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.0.8-hardened1.patch", - "sha256": "08xvsqb3d0j98n2i4468ja9miydgy3kcrz66fbi1kymn79yam62n", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.8-hardened1/linux-hardened-6.0.8-hardened1.patch" + "name": "linux-hardened-6.1.8-hardened1.patch", + "sha256": "1ry0cb1dsq84n6cxn8ndx47qz1g69kqlfkb16rrlgk49w81i8y8z", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.8-hardened1/linux-hardened-6.1.8-hardened1.patch" }, - "sha256": "0mx2bxgnxm3vz688268939xw90jqci7xn992kfpny74mjqwzir0d", - "version": "6.0.8" + "sha256": "0vc1ggjy4wvna7g6xgbjzhk93whssj9ixcal0hkhldxsp0xba2xn", + "version": "6.1.8" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 7c2fc0ee9fdf..3e5cc009576e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -1,18 +1,18 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: with lib; buildLinux (args // rec { - version = "4.14.299"; + version = "4.14.304"; # 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; + modDirVersion = versions.pad 3 version; # branchVersion needs to be x.y extraMeta.branch = versions.majorMinor version; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0p5ic2mrb9vl3qkzvqxhia3kygjv8xa6s1kqkwgd6b4rmq1kc8r6"; + sha256 = "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4"; }; } // (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 aae0bf463c8e..506d57d79713 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -1,18 +1,18 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: with lib; buildLinux (args // rec { - version = "4.19.265"; + version = "4.19.271"; # 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; + modDirVersion = versions.pad 3 version; # branchVersion needs to be x.y extraMeta.branch = versions.majorMinor version; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1l5cdpgng1gci1p1gdr2jzqw486h3w56gpyc7fbq74hlc6nnwh1p"; + sha256 = "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3"; }; } // (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 4e55c5c7dbe3..b2a9f27947c3 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -1,18 +1,18 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: with lib; buildLinux (args // rec { - version = "5.10.155"; + version = "5.10.166"; # 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; + modDirVersion = versions.pad 3 version; # 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 = "1wyla96qsdf50n7qjj4hdf36bj56whv7gc9mgw9bvrsqdi92gc7i"; + sha256 = "1bz1sgkqniwg84wv9vcg08mksa5q533vgynsd3y0xnjv1rwa2l80"; }; } // (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 a602ac51d91d..9ae7546f3c9d 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -1,18 +1,18 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: with lib; buildLinux (args // rec { - version = "5.15.79"; + version = "5.15.91"; # 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; + modDirVersion = versions.pad 3 version; # 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 = "0m61k7k6lj24z9a266q08wzghggjik2wizcabdwd1vn0vcqr18yb"; + sha256 = "107yw7mibibhfrggm8idzn5bayjvkxaq1kv3kkm1lpxipsqjng56"; }; } // (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 ed46ce896dba..aef87aaa4211 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -1,18 +1,18 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: with lib; buildLinux (args // rec { - version = "5.4.224"; + version = "5.4.230"; # 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; + modDirVersion = versions.pad 3 version; # 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 = "0dixs4w7nmkjgxv9dxgjdy8v6r4parkpqyvdfyr0wqk0amdz4zcb"; + sha256 = "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix deleted file mode 100644 index 709c0599dc07..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "6.0.9"; - - # 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/v6.x/linux-${version}.tar.xz"; - sha256 = "1irip1yk62carcisxlacwcxsiqib4qswx6h5mfhv8f97x04a4531"; - }; -} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix new file mode 100644 index 000000000000..2bed730a8b11 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -0,0 +1,18 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "6.1.9"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = versions.pad 3 version; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; + sha256 = "0awjynyy049px0h7li59w3zgn3z39alv6glzrmx6wf1wd62z236n"; + }; +} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 0a397d639360..698ca10016ca 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 = "18978"; - sha256 = "12mvj5c2k774fpmixcv7i4ciw7xqjaxqd20ryn8xw8vgrnb4h6fi"; + rev = "19027"; + sha256 = "0g7sf48rwicwzwhjpzs82j6v3j4s17xhrgfgysdd523r07437ryv"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index ef742be0de84..da3fa88469d0 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -2,8 +2,8 @@ let # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this - modDirVersion = "5.15.74"; - tag = "1.20221028"; + modDirVersion = "5.15.84"; + tag = "1.20230106"; in lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; @@ -13,7 +13,7 @@ lib.overrideDerivation (buildLinux (args // { owner = "raspberrypi"; repo = "linux"; rev = tag; - hash = "sha256-2UdSW9X9prAya9mvEp3i0l3Uim0wtDYEY0WrD2wntaI="; + hash = "sha512-6Dcpo81JBvc8NOv1nvO8JwjUgOOviRgHmXLLcGpE/pI2lEOcSeDRlB/FZtflzXTGilapvmwOSx5NxQfAmysHqQ=="; }; defconfig = { @@ -41,10 +41,10 @@ lib.overrideDerivation (buildLinux (args // { ''; extraMeta = if (rpiVersion < 3) then { - platforms = with lib.platforms; [ arm ]; + platforms = with lib.platforms; arm; hydraPlatforms = []; } else { - platforms = with lib.platforms; [ arm aarch64 ]; + platforms = with lib.platforms; arm ++ aarch64; hydraPlatforms = [ "aarch64-linux" ]; }; } // (args.argsOverride or {}))) (oldAttrs: { 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 2909ca33853e..6a1ba266a374 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,26 +6,25 @@ , ... } @ args: let - version = "5.10.153-rt76"; # updated by ./update-rt.sh + version = "5.10.165-rt81"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { inherit version; # modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ. - modDirVersion = if (builtins.match "[^.]*[.][^.]*-.*" version) == null then version - else lib.replaceStrings ["-"] [".0-"] version; + modDirVersion = lib.versions.pad 3 version; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0qhn5xv0m6baip1my1gp4mrjc4j6d6nbxa701vpwllg4kx8y9wiw"; + sha256 = "03dg8yx0gdzm8zbwd1f9jn4c5jhr8qilhjzxgwm0mv8riz2fy7cp"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "12gf2nnnfcbmyp34xnns35qpnzsnwjilq2qs1xvq6m51gcnnzq7g"; + sha256 = "1441lwmz4v427gcyddps17ms96y86klmnlw95kc74j6wmy387fcg"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix new file mode 100644 index 000000000000..15ddf9df9147 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -0,0 +1,45 @@ +{ lib, buildLinux, fetchurl +, kernelPatches ? [ ] +, structuredExtraConfig ? {} +, extraMeta ? {} +, argsOverride ? {} +, ... } @ args: + +let + version = "5.15.86-rt56"; # updated by ./update-rt.sh + branch = lib.versions.majorMinor version; + kversion = builtins.elemAt (lib.splitString "-" version) 0; +in buildLinux (args // { + inherit version; + + # modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ. + modDirVersion = if (builtins.match "[^.]*[.][^.]*-.*" version) == null then version + else lib.replaceStrings ["-"] [".0-"] version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; + sha256 = "1vpjnmwqsx6akph2nvbsv2jl7pp8b7xns3vmwbljsl23lkpxkz40"; + }; + + kernelPatches = let rt-patch = { + name = "rt"; + patch = fetchurl { + url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; + sha256 = "0y7pkzacxh1fsvnbmjq0ljfb4zjw6dq9br6rl8kr3w4dj56fmaxs"; + }; + }; in [ rt-patch ] ++ kernelPatches; + + structuredExtraConfig = with lib.kernel; { + PREEMPT_RT = yes; + # Fix error: unused option: PREEMPT_RT. + EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt) + # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n'). + PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it. + # Fix error: unused option: RT_GROUP_SCHED. + RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch. + } // structuredExtraConfig; + + extraMeta = extraMeta // { + inherit branch; + }; +} // argsOverride) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index a80642334f3c..115d8ad93149 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,9 +1,10 @@ { lib , fetchpatch , kernel -, commitDate ? "2022-10-31" -, currentCommit ? "77c27f28aa58e9d9037eb68c87d3283f68c371f7" -, diffHash ? "sha256-TUpI9z0ac3rjn2oT5Z7oQXevDKbGwTVjyigS5/aGwgQ=" +, commitDate ? "2023-02-01" +, currentCommit ? "65960c284ad149cc4bfbd64f21e6889c1e3d1c5f" +, diffHash ? "sha256-4wpY3aYZ93OXSU4wmQs9K62nPyIzjKu4RBQTwksmyyk=" + , 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 +17,7 @@ extraMeta = { branch = "master"; - maintainers = with lib.maintainers; [ davidak Madouura ]; + maintainers = with lib.maintainers; [ davidak Madouura pedrohlc ]; }; } // argsOverride; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 2e07f957efe1..cef442ad20ca 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,17 +1,17 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: with lib; buildLinux (args // rec { - version = "6.1-rc3"; + version = "6.2-rc6"; extraMeta.branch = lib.versions.majorMinor version; # modDirVersion needs to be x.y.z, will always add .0 - modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; + modDirVersion = versions.pad 3 version; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-qz863wvIe/JJjqSYoxxbt+2xTqgNNZJpAfWr8nG8wKk="; + hash = "sha256-rEpJYw5O6OHSwNY8LxlCsw0p9+u9BUjTQ8FsB6+fLbc="; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index d046c8c7d192..310178b9a1fd 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,8 +1,12 @@ -{ lib, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl +{ lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl , libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole +, fetchpatch }: let + lib_ = lib; + stdenv_ = stdenv; + readConfig = configfile: import (runCommand "config.nix" {} '' echo "{" > "$out" while IFS='=' read key val; do @@ -12,18 +16,16 @@ let done < "${configfile}" echo "}" >> $out '').outPath; -in { - lib, - # Allow overriding stdenv on each buildLinux call - stdenv, +in lib.makeOverridable ({ # The kernel version version, # Position of the Linux build expression pos ? null, # Additional kernel make flags extraMakeFlags ? [], - # The version of the kernel module directory - modDirVersion ? version, + # The name of the kernel module directory + # Needs to be X.Y.Z[-extra], so pad with zeros if needed. + modDirVersion ? lib.versions.pad 3 version, # The kernel source (tarball, git checkout, etc.) src, # a list of { name=..., patch=..., extraConfig=...} patches @@ -36,7 +38,7 @@ in { # Custom seed used for CONFIG_GCC_PLUGIN_RANDSTRUCT if enabled. This is # automatically extended with extra per-version and per-config values. randstructSeed ? "", - # Use defaultMeta // extraMeta + # Extra meta attributes extraMeta ? {}, # for module compatibility @@ -47,7 +49,7 @@ in { # Whether to utilize the controversial import-from-derivation feature to parse the config allowImportFromDerivation ? false, # ignored - features ? null, + features ? null, lib ? lib_, stdenv ? stdenv_, }: let @@ -55,8 +57,7 @@ let hasAttr getAttr optional optionals optionalString optionalAttrs maintainers platforms; # Dependencies that are required to build kernel modules - moduleBuildDependencies = [ perl ] - ++ optional (lib.versionAtLeast version "4.14") libelf + moduleBuildDependencies = [ perl libelf ] ++ optional (lib.versionAtLeast version "5.13") zstd; drvAttrs = config_: kernelConf: kernelPatches: configfile: @@ -100,10 +101,20 @@ let patches = map (p: p.patch) kernelPatches # Required for deterministic builds along with some postPatch magic. - ++ optional (lib.versionAtLeast version "4.13" && lib.versionOlder version "5.19") ./randstruct-provide-seed.patch + ++ optional (lib.versionOlder version "5.19") ./randstruct-provide-seed.patch ++ optional (lib.versionAtLeast version "5.19") ./randstruct-provide-seed-5.19.patch # Fixes determinism by normalizing metadata for the archive of kheaders - ++ optional (lib.versionAtLeast version "5.2" && lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch; + ++ optional (lib.versionAtLeast version "5.2" && lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch + # Linux 5.12 marked certain PowerPC-only symbols as GPL, which breaks + # OpenZFS; this was fixed in Linux 5.19 so we backport the fix + # https://github.com/openzfs/zfs/pull/13367 + ++ optional (lib.versionAtLeast version "5.12" && + lib.versionOlder version "5.19" && + stdenv.hostPlatform.isPower) + (fetchpatch { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/patch/?id=d9e5c3e9e75162f845880535957b7fd0b4637d23"; + hash = "sha256-bBOyJcP6jUvozFJU0SPTOf3cmnTQ6ZZ4PlHjiniHXLU="; + }); postPatch = '' sed -i Makefile -e 's|= depmod|= ${buildPackages.kmod}/bin/depmod|' @@ -353,7 +364,7 @@ let }; in -assert (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") -> libelf != null; +assert lib.versionOlder version "5.8" -> libelf != null; assert lib.versionAtLeast version "5.8" -> elfutils != null; stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPatches configfile) // { @@ -365,7 +376,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal ] ++ optional (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools - ++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf + ++ optional (lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency. ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ] @@ -387,4 +398,4 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat ++ extraMakeFlags; karch = stdenv.hostPlatform.linuxArch; -} // (optionalAttrs (pos != null) { inherit pos; })) +} // (optionalAttrs (pos != null) { inherit pos; }))) diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index e4c8be02cbb0..c1f6fd03a2e1 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -78,7 +78,10 @@ stdenv.mkDerivation { patchShebangs pmu-events/jevents.py ''; - makeFlags = [ "prefix=$(out)" "WERROR=0" ] ++ kernel.makeFlags; + makeFlags = [ "prefix=$(out)" "WERROR=0" "ASCIIDOC8=1" ] ++ kernel.makeFlags + ++ lib.optional (!withGtk) "NO_GTK2=1" + ++ lib.optional (!withZstd) "NO_LIBZSTD=1" + ++ lib.optional (!withLibcap) "NO_LIBCAP=1"; hardeningDisable = [ "format" ]; @@ -105,7 +108,6 @@ stdenv.mkDerivation { libunwind zlib openssl - systemtap.stapBuild numactl python3 perl @@ -113,6 +115,7 @@ stdenv.mkDerivation { ] ++ (if (lib.versionAtLeast kernel.version "5.19") then [ libbfd libopcodes ] else [ libbfd_2_38 libopcodes_2_38 ]) + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform systemtap) systemtap.stapBuild ++ lib.optional withGtk gtk2 ++ lib.optional withZstd zstd ++ lib.optional withLibcap libcap @@ -127,7 +130,7 @@ stdenv.mkDerivation { doCheck = false; # requires "sparse" - installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ]; + installTargets = [ "install" "install-man" ]; # TODO: Add completions based on perf-completion.sh postInstall = '' diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 2f6545c3d487..09562d42ec79 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,20 +3,20 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "5.15.75"; - hash = "sha256-tgm5nmguEfRFq3OhmZgRgFLIW7E798Rv1basxnfdqLI="; + version = "5.15.89"; + hash = "sha256-wlb6er8L2EaqgJbmbATBdSxx1BGcJXNcsu+/4UBmYdQ="; variant = "lts"; }; mainVariant = { - version = "6.0.7"; - hash = "sha256-qeM2oswuop42rvyBGlrH6VvODScLCpAOjTc4KR5a2Ec="; + version = "6.1.7"; + hash = "sha256-cgUxM40cDl4lzoF4St3ckKAtsle2PRehfSag3VaycrY="; variant = "main"; }; xanmodKernelFor = { version, suffix ? "xanmod1", hash, variant }: buildLinux (args // rec { inherit version; - modDirVersion = "${version}-${suffix}"; + modDirVersion = lib.versions.pad 3 "${version}-${suffix}"; src = fetchFromGitHub { owner = "xanmod"; @@ -33,7 +33,8 @@ let TCP_CONG_BBR2 = yes; DEFAULT_BBR2 = yes; - # Google's Multigenerational LRU framework + # Multigenerational LRU framework + # This can be removed when the LTS variant reaches version >= 6.1 (since it's on by default then) LRU_GEN = yes; LRU_GEN_ENABLED = yes; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 9863e3c4f4ee..35cb84e07749 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,21 +4,21 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.0.8"; #zen + version = "6.1.9"; #zen suffix = "zen1"; #zen - sha256 = "0vp6vp77blrxa8rcl8wl81di7m4s1cmbznzacx3729560km98ki8"; #zen + sha256 = "0fsmcjsawxr32fxhpp6sgwfwwj8kqymy0rc6vh4qli42fqmwdjgv"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.0.8"; #lqx + version = "6.1.9"; #lqx suffix = "lqx1"; #lqx - sha256 = "1jjna3g1x58r8qz323fmdzf6ws3anjqdw57r12fnvq3by660p0qh"; #lqx + sha256 = "167qr1mxsr5llmzixsijsn72d8jyphhgg2k8qsf369m7y58sz0s9"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { inherit version; - modDirVersion = "${lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version ++ [ "0" "0" ]))}-${suffix}"; + modDirVersion = lib.versions.pad 3 "${version}-${suffix}"; isZen = true; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 47cf03a3a87f..1a194421a6bc 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPackages, linuxHeaders, perl }: +{ lib, stdenv, fetchurl, buildPackages, linuxHeaders, perl, nixosTests }: let commonMakeFlags = [ @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "klibc"; - version = "2.0.10"; + version = "2.0.11"; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz"; - sha256 = "sha256-ZidT2oiJ50TfwNtutAIcM3fufvjtZtfVd2X4yeJZOc0="; + hash = "sha256-XrMOXh7HPcTjhMYLuUOvicUxdMgvh3Ev3TTdMoZNX2A="; }; patches = [ ./no-reinstall-kernel-headers.patch ]; @@ -43,6 +43,11 @@ stdenv.mkDerivation rec { done ''; + passthru.tests = { + # uses klibc's ipconfig + inherit (nixosTests) initrd-network-ssh; + }; + meta = { description = "Minimalistic libc subset for initramfs usage"; homepage = "https://kernel.org/pub/linux/libs/klibc/"; diff --git a/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch b/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch index 709dd30f8c7e..bf46a17f3d7d 100644 --- a/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch +++ b/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch @@ -1,11 +1,12 @@ -diff -Naur klibc-2.0.3-orig/scripts/Kbuild.install klibc-2.0.3/scripts/Kbuild.install ---- klibc-2.0.3-orig/scripts/Kbuild.install 2013-12-03 13:53:46.000000000 -0500 -+++ klibc-2.0.3/scripts/Kbuild.install 2014-01-04 18:17:09.342609021 -0500 -@@ -95,7 +95,6 @@ +diff --git a/scripts/Kbuild.install b/scripts/Kbuild.install +index 0788637f..6708e19f 100644 +--- a/scripts/Kbuild.install ++++ b/scripts/Kbuild.install +@@ -102,7 +102,6 @@ header: $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin - $(Q)cp -rfL $(KLIBCKERNELSRC)/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. - $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. - $(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include - $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 + ifneq ($(srctree),$(objtree)) + $(Q)cp -rf $(srctree)/usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. + endif diff --git a/pkgs/os-specific/linux/ksmbd-tools/default.nix b/pkgs/os-specific/linux/ksmbd-tools/default.nix index d0a1f1f4e684..5a58c198c0e4 100644 --- a/pkgs/os-specific/linux/ksmbd-tools/default.nix +++ b/pkgs/os-specific/linux/ksmbd-tools/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ksmbd-tools"; - version = "3.4.5"; + version = "3.4.6"; src = fetchFromGitHub { owner = "cifsd-team"; repo = pname; rev = version; - sha256 = "sha256-sSCLXNdVUAdk+GnFlVx/BsAzyfz0KDdugJ1isrOztgs="; + sha256 = "sha256-zquHhr+Zf4jR/TlVA0Zea3eZ9JjRjYXefcYIQs76gSw="; }; buildInputs = [ glib libnl ] ++ lib.optional withKerberos libkrb5; diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index fe2e69e06fd7..324e2695dd53 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for asynchronous I/O in Linux"; - homepage = "http://lse.sourceforge.net/io/aio.html"; + homepage = "https://lse.sourceforge.net/io/aio.html"; platforms = lib.platforms.linux; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 04322a35b4fe..d6bb9d4a431b 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libbpf"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "sha256-2rzVah+CxCztKnlEWMIQrUS2JJTLiWscfIA1aOBtIzs="; + sha256 = "sha256-/vt6IA1o0gjFtXUWhEKIZ1DUWIN2LOvrhLfFzJBACGY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index 13c248a03982..8f24362b94b2 100644 --- a/pkgs/os-specific/linux/libcgroup/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { hash = "sha256-x2yBqpr3LedtWmpZ4K1ipZxIualNJuDtC4FVGzzcQn8="; }; - buildInputs = [ pam bison flex ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook bison flex ]; + buildInputs = [ pam ]; postPatch = '' substituteInPlace src/tools/Makefile.am \ diff --git a/pkgs/os-specific/linux/libnvme/default.nix b/pkgs/os-specific/linux/libnvme/default.nix index cef966d7bfce..6e7244ad8b99 100644 --- a/pkgs/os-specific/linux/libnvme/default.nix +++ b/pkgs/os-specific/linux/libnvme/default.nix @@ -35,12 +35,12 @@ stdenv.mkDerivation rec { ninja perl # for kernel-doc pkg-config + python3 ]; buildInputs = [ json_c openssl - python3 systemd ]; diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/os-specific/linux/libpsm2/default.nix index 43c9bf74e3fa..683448cbe41b 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.229"; + version = "11.2.230"; preConfigure= '' export UDEVDIR=$out/etc/udev @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "opa-psm2"; rev = "PSM2_${version}"; - sha256 = "sha256-t3tZCxGmGMscDmeyCATLbHxU7jEJqAzxwPV0Z8pl2ko="; + sha256 = "sha256-dMfGq067TqstGAWNSZZaZCwvChTyPUsvaPVjFGGzp64="; }; postInstall = '' diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix index a264c4544874..a35ab1dcc01c 100644 --- a/pkgs/os-specific/linux/libratbag/default.nix +++ b/pkgs/os-specific/linux/libratbag/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libratbag"; - version = "0.16"; + version = "0.17"; src = fetchFromGitHub { owner = "libratbag"; repo = "libratbag"; rev = "v${version}"; - sha256 = "sha256-wJLG0Gxm1RWwW5SCGoa2QscU1VC0r93KZfEMNVg3Tko="; + sha256 = "sha256-TQ8DVj4yqq3IA0oGnLDz+QNTyNRmGqspEjkPeBmXNew="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 46d0e94bb14c..2049b7cf0e70 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, help2man, gettext -, libxml2, perl, python3, doxygen }: - +{ lib, stdenv, fetchFromGitHub, fetchurl +, pkg-config, autoreconfHook, help2man, gettext, libxml2, perl, python3, doxygen +}: stdenv.mkDerivation rec { pname = "libsmbios"; @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i"; }; + patches = [ + (fetchurl { + name = "musl.patch"; + url = "https://git.alpinelinux.org/aports/plain/community/libsmbios/fixes.patch?id=bdc4f67889c958c1266fa5d0cab71c3cd639122f"; + sha256 = "aVVc52OovDYvqWRyKcRAi62daa9AalkKvnVOGvrTmRk="; + }) + ]; + nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkg-config ]; buildInputs = [ python3 ]; diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/os-specific/linux/libtraceevent/default.nix index c81949bf39a6..427f2eb69c49 100644 --- a/pkgs/os-specific/linux/libtraceevent/default.nix +++ b/pkgs/os-specific/linux/libtraceevent/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.6.2"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; + url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; rev = "libtraceevent-${version}"; sha256 = "sha256-iLy2rEKn0UJguRcY/W8RvUq7uX+snQojb/cXOmMsjwc="; }; diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index 46a633aec55a..3cb79ae07780 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { pname = "libtracefs"; - version = "1.5.0"; + version = "1.6.4"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; + url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; rev = "libtracefs-${version}"; - sha256 = "sha256-5OUTOIla4adtSJwQkii6f/mB99R5QzodyQkq/g6oNSw="; + sha256 = "sha256-fWop0EMkoVulLBzU7q8x1IhMtdnEJ89wMz0cz964F6s="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/libzbc/default.nix b/pkgs/os-specific/linux/libzbc/default.nix index 5fa981a767f2..9c70d9a19b0a 100644 --- a/pkgs/os-specific/linux/libzbc/default.nix +++ b/pkgs/os-specific/linux/libzbc/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, autoconf-archive , autoreconfHook , fetchFromGitHub , gtk3 @@ -11,17 +10,16 @@ stdenv.mkDerivation rec { pname = "libzbc"; - version = "5.12.0"; + version = "5.13.0"; src = fetchFromGitHub { owner = "westerndigitalcorporation"; repo = "libzbc"; rev = "v${version}"; - sha256 = "qI09dkMCwMym3j1ELrFDNbNB5hW/CzwmFmZhUNDXsfI="; + sha256 = "6xkA96bgQ2Ik1vEwkw7hwjMbjMSlopzv5ziTh60Mjx0="; }; nativeBuildInputs = [ - autoconf-archive # this can be removed with the next release autoreconfHook libtool ] ++ lib.optionals guiSupport [ pkg-config ]; diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/pkgs/os-specific/linux/linuxptp/default.nix index 4c14d2ecae3d..8901f6bcca1d 100644 --- a/pkgs/os-specific/linux/linuxptp/default.nix +++ b/pkgs/os-specific/linux/linuxptp/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Implementation of the Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux"; - homepage = "http://linuxptp.sourceforge.net/"; + homepage = "https://linuxptp.sourceforge.net/"; maintainers = [ maintainers.markuskowa ]; license = licenses.gpl2Only; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/lkrg/default.nix b/pkgs/os-specific/linux/lkrg/default.nix new file mode 100644 index 000000000000..4d6118f8b9f8 --- /dev/null +++ b/pkgs/os-specific/linux/lkrg/default.nix @@ -0,0 +1,53 @@ +{ lib, stdenv, fetchpatch, fetchFromGitHub, kernel }: +let + isKernelRT = (kernel.structuredExtraConfig ? PREEMPT_RT) && (kernel.structuredExtraConfig.PREEMPT_RT == lib.kernel.yes); +in +stdenv.mkDerivation rec { + name = "${pname}-${version}-${kernel.version}"; + pname = "lkrg"; + version = "0.9.5"; + + src = fetchFromGitHub { + owner = "lkrg-org"; + repo = "lkrg"; + rev = "v${version}"; + sha256 = "sha256-+yIKkTvfVbLnFBoXSKGebB1A8KqpaRmsLh8SsNuI9Dc="; + }; + patches = [ + (fetchpatch { + name = "fix-aarch64.patch"; + url = "https://github.com/lkrg-org/lkrg/commit/a4e5c00f13f7081b346bc3736e4c035e3d17d3f7.patch"; + sha256 = "sha256-DPscqi+DySHwFxGuGe7P2itPkoyb3XGu5Xp2S/ezP4Y="; + }) + ]; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "KERNEL=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + dontConfigure = true; + + prePatch = '' + substituteInPlace Makefile --replace "KERNEL := " "KERNEL ?= " + ''; + + installPhase = '' + runHook preInstall + install -D lkrg.ko $out/lib/modules/${kernel.modDirVersion}/extra/lkrg.ko + runHook postInstall + ''; + + meta = with lib; { + description = "LKRG Linux Kernel module"; + longDescription = "LKRG performs runtime integrity checking of the Linux kernel and detection of security vulnerability exploits against the kernel."; + homepage = "https://lkrg.org/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ chivay ]; + platforms = platforms.linux; + broken = kernel.kernelOlder "5.10" || kernel.kernelAtLeast "6.1" || isKernelRT; + }; +} diff --git a/pkgs/os-specific/linux/lksctp-tools/default.nix b/pkgs/os-specific/linux/lksctp-tools/default.nix index 19d6f10e3de1..24915143fbd0 100644 --- a/pkgs/os-specific/linux/lksctp-tools/default.nix +++ b/pkgs/os-specific/linux/lksctp-tools/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux Kernel Stream Control Transmission Protocol Tools"; - homepage = "http://lksctp.sourceforge.net/"; + homepage = "https://lksctp.sourceforge.net/"; license = with licenses; [ gpl2 lgpl21 ]; # library is lgpl21 platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index c40a37940543..895e84f827b4 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -24,6 +24,13 @@ stdenv.mkDerivation rec { hash = "sha256-9lfHCcODlS7sZMjQhK0yQcCBEoGyZOChx/oM0CU37sY="; }; + # Upstream build system have knob to enable and disable building of static + # library, shared library is built unconditionally. + postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' + sed -i 'lib/Module.mk' -e '/LIBTARGETS :=/,+1d; /-m 755/ d' + substituteInPlace prog/sensors/Module.mk --replace 'lib/$(LIBSHBASENAME)' "" + ''; + nativeBuildInputs = [ bison flex which ]; # bash is required for correctly replacing the shebangs in all tools for cross-compilation. buildInputs = [ bash perl ] @@ -39,6 +46,12 @@ stdenv.mkDerivation rec { "ETCDIR=${placeholder "out"}/etc" ]; + # Making regexp to patch-out installing of .so symlinks from Makefile is + # complicated, it is easier to remove them post-install. + postInstall = lib.optionalString stdenv.hostPlatform.isStatic '' + rm $out/lib/*.so* + ''; + meta = with lib; { homepage = "https://hwmon.wiki.kernel.org/lm_sensors"; changelog = "https://raw.githubusercontent.com/lm-sensors/lm-sensors/V${dashedVersion}/CHANGES"; diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix index 047b2499a827..3cdb64becb5a 100644 --- a/pkgs/os-specific/linux/lockdep/default.nix +++ b/pkgs/os-specific/linux/lockdep/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; doCheck = true; - checkInputs = [ valgrind ]; + nativeCheckInputs = [ valgrind ]; checkPhase = '' # there are more /bin/bash references than just shebangs for f in lockdep run_tests.sh tests/*.sh; do diff --git a/pkgs/os-specific/linux/lsb-release/lsb_release.sh b/pkgs/os-specific/linux/lsb-release/lsb_release.sh index 47b449c31614..ae524181e88a 100644 --- a/pkgs/os-specific/linux/lsb-release/lsb_release.sh +++ b/pkgs/os-specific/linux/lsb-release/lsb_release.sh @@ -32,7 +32,7 @@ short=0 @getopt@/bin/getopt --test > /dev/null && rc=$? || rc=$? if [[ $rc -ne 4 ]]; then # This shouldn't happen. - echo "Warning: Enhanced getopt not supported, please open an issue." >&2 + echo "Warning: Enhanced getopt not supported, please open an issue in nixpkgs." >&2 else # Define all short and long options. SHORT=hvidrcas diff --git a/pkgs/os-specific/linux/lsirec/default.nix b/pkgs/os-specific/linux/lsirec/default.nix index cf2da7d16480..10da88b691d9 100644 --- a/pkgs/os-specific/linux/lsirec/default.nix +++ b/pkgs/os-specific/linux/lsirec/default.nix @@ -32,5 +32,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.bsd2; maintainers = with maintainers; [ Luflosi ]; + # never built on aarch64-linux since first introduction in nixpkgs + broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 756e13526350..3a69923aca88 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,41 +1,16 @@ -{ lib, stdenv, fetchgit, fetchpatch, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { pname = "lttng-modules-${kernel.version}"; - version = "2.13.4"; + version = "2.13.8"; - src = fetchgit { - url = "https://git.lttng.org/lttng-modules.git"; + src = fetchFromGitHub { + owner = "lttng"; + repo = "lttng-modules"; rev = "v${version}"; - hash = "sha256-J2Tr1vOiCAilmnf3attF3bz8Irn9IQ2QbapdXJ4MUSg="; + hash = "sha256-6ohWsGUGFz7QlHkKWyW5edpSsBTE9DFS3v6EsH9wNZo="; }; - patches = [ - # fix: mm/page_alloc: fix tracepoint mm_page_alloc_zone_locked() (v5.19) - (fetchpatch { - url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=6229bbaa423832f6b7c7a658ad11e1d4242752ff"; - hash = "sha256-pqbKxBzjfN20wfsqSeBLXNQ+/U+3qk9RfTiT32OwSIc="; - }) - - # fix: fs: Remove flags parameter from aops->write_begin (v5.19) - (fetchpatch { - url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=5e2f832d59d51589ab69479c7db43c7581fb9346"; - hash = "sha256-auoCbvFEVR76sOCLjIe+q/Q+vunQlR3G3gVcjqAGGPk="; - }) - - # fix: workqueue: Fix type of cpu in trace event (v5.19) - (fetchpatch { - url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=c6da9604b1666780ea4725b3b3d1bfa1548f9c89"; - hash = "sha256-qoTwy+P32qg1L+JctqM1+70OkeTbnbL3QJ9LwaBq/bw="; - }) - - # fix: net: skb: introduce kfree_skb_reason() (v5.15.58..v5.16) - (fetchpatch { - url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=96c477dabaaf6cd1734bebe0972fef877e5a463b"; - hash = "sha256-b7BhrYZ5SZqeRVGEu0Eo9GfbcZdDPrgEnOl2XU3z+ds="; - }) - ]; - nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -57,6 +32,6 @@ stdenv.mkDerivation rec { license = with licenses; [ lgpl21Only gpl2Only mit ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; - broken = (lib.versions.majorMinor kernel.modDirVersion) == "5.10"; + broken = (lib.versions.majorMinor kernel.modDirVersion) == "5.10" || (lib.versions.majorMinor kernel.modDirVersion) == "5.4"; }; } diff --git a/pkgs/os-specific/linux/lvm2/2_02.nix b/pkgs/os-specific/linux/lvm2/2_02.nix index 56ab613afd24..07d8de0b2270 100644 --- a/pkgs/os-specific/linux/lvm2/2_02.nix +++ b/pkgs/os-specific/linux/lvm2/2_02.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.02.187"; - sha256 = "sha256-Dg1SGoY6XbJEDy4edie6grcCc65KsLvhMIUdsNWOWvE="; + version = "2.02.188"; + hash = "sha256-cQHosIFq135DkP7ZdJoJAhS6UgBhzQg0N4ceGeUMyb0="; } diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index 0cca51feab30..5a5193997be0 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.16"; - sha256 = "sha256-5mHs4VtdiNir45pMHh2y9D4YlvAZlIu5iw4V13doB4Y="; + version = "2.03.18"; + hash = "sha256-n2g+KYDZXA3Ou9JcfBdwMsVhXXJnv8iF6r/OWSgPR2k="; } diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index 4cb86bf3d8b9..0ea8a97bdb2e 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -1,4 +1,4 @@ -{ version, sha256 }: +{ version, hash }: { lib, stdenv , fetchpatch @@ -28,8 +28,11 @@ stdenv.mkDerivation rec { inherit version; src = fetchurl { - url = "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${version}.tgz"; - inherit sha256; + urls = [ + "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${version}.tgz" + "ftp://sourceware.org/pub/lvm2/LVM2.${version}.tgz" + ]; + inherit hash; }; nativeBuildInputs = [ pkg-config ]; @@ -53,6 +56,7 @@ stdenv.mkDerivation rec { "--bindir=${placeholder "bin"}/bin" "--sbindir=${placeholder "bin"}/bin" "--libdir=${placeholder "lib"}/lib" + "--with-libexecdir=${placeholder "lib"}/libexec" ] ++ lib.optional enableCmdlib "--enable-cmdlib" ++ lib.optionals enableDmeventd [ "--enable-dmeventd" diff --git a/pkgs/os-specific/linux/mdevctl/default.nix b/pkgs/os-specific/linux/mdevctl/default.nix index 9762011b7a30..80c3c1316d85 100644 --- a/pkgs/os-specific/linux/mdevctl/default.nix +++ b/pkgs/os-specific/linux/mdevctl/default.nix @@ -1,24 +1,36 @@ -{ lib, fetchFromGitHub -, rustPackages, pkg-config, docutils +{ lib +, rustPlatform +, fetchCrate +, docutils +, installShellFiles }: -rustPackages.rustPlatform.buildRustPackage rec { - +rustPlatform.buildRustPackage rec { pname = "mdevctl"; version = "1.2.0"; - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v" + version; - hash = "sha256-Hgl+HsWAYIdabHJdPbCaBNnhY49vpuIjR3l6z2CAmx0="; + src = fetchCrate { + inherit pname version; + hash = "sha256-0X/3DWNDPOgSNNTqcj44sd7DNGFt+uGBjkc876dSgU8="; }; - cargoPatches = [ ./lock.patch ]; + cargoHash = "sha256-TmumQBWuH5fJOe2qzcDtEGbmCs2G9Gfl8mH7xifzRGc="; - cargoHash = "sha256-PXVc7KUMPze06gCnD2gqzlySwPumOw/z31CTd0UHp9w="; + nativeBuildInputs = [ + docutils + installShellFiles + ]; - nativeBuildInputs = [ pkg-config docutils ]; + postInstall = '' + ln -s mdevctl $out/bin/lsmdev + + install -Dm444 60-mdevctl.rules -t $out/lib/udev/rules.d + + installManPage $releaseDir/build/mdevctl-*/out/mdevctl.8 + ln -s mdevctl.8 $out/share/man/man8/lsmdev.8 + + installShellCompletion $releaseDir/build/mdevctl-*/out/{lsmdev,mdevctl}.bash + ''; meta = with lib; { homepage = "https://github.com/mdevctl/mdevctl"; diff --git a/pkgs/os-specific/linux/mdevctl/lock.patch b/pkgs/os-specific/linux/mdevctl/lock.patch deleted file mode 100644 index bb176771efff..000000000000 --- a/pkgs/os-specific/linux/mdevctl/lock.patch +++ /dev/null @@ -1,446 +0,0 @@ ---- - Cargo.lock | 432 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 432 insertions(+) - create mode 100644 Cargo.lock - -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..b91a26d ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,432 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 3 -+ -+[[package]] -+name = "aho-corasick" -+version = "0.7.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "anyhow" -+version = "1.0.66" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" -+ -+[[package]] -+name = "atty" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "autocfg" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -+ -+[[package]] -+name = "bitflags" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -+ -+[[package]] -+name = "cfg-if" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -+ -+[[package]] -+name = "clap" -+version = "3.2.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -+dependencies = [ -+ "atty", -+ "bitflags", -+ "clap_derive", -+ "clap_lex", -+ "indexmap", -+ "once_cell", -+ "strsim", -+ "termcolor", -+ "textwrap", -+] -+ -+[[package]] -+name = "clap_complete" -+version = "3.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8" -+dependencies = [ -+ "clap", -+] -+ -+[[package]] -+name = "clap_derive" -+version = "3.2.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" -+dependencies = [ -+ "heck", -+ "proc-macro-error", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "clap_lex" -+version = "0.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -+dependencies = [ -+ "os_str_bytes", -+] -+ -+[[package]] -+name = "env_logger" -+version = "0.8.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -+dependencies = [ -+ "atty", -+ "humantime", -+ "log", -+ "regex", -+ "termcolor", -+] -+ -+[[package]] -+name = "fastrand" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -+dependencies = [ -+ "instant", -+] -+ -+[[package]] -+name = "getrandom" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "wasi", -+] -+ -+[[package]] -+name = "hashbrown" -+version = "0.12.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -+ -+[[package]] -+name = "heck" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "humantime" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -+ -+[[package]] -+name = "indexmap" -+version = "1.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -+dependencies = [ -+ "autocfg", -+ "hashbrown", -+] -+ -+[[package]] -+name = "instant" -+version = "0.1.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "itoa" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" -+ -+[[package]] -+name = "libc" -+version = "0.2.136" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "55edcf6c0bb319052dea84732cf99db461780fd5e8d3eb46ab6ff312ab31f197" -+ -+[[package]] -+name = "log" -+version = "0.4.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "mdevctl" -+version = "1.2.0" -+dependencies = [ -+ "anyhow", -+ "clap", -+ "clap_complete", -+ "env_logger", -+ "log", -+ "serde_json", -+ "tempfile", -+ "uuid", -+] -+ -+[[package]] -+name = "memchr" -+version = "2.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -+ -+[[package]] -+name = "once_cell" -+version = "1.15.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" -+ -+[[package]] -+name = "os_str_bytes" -+version = "6.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" -+ -+[[package]] -+name = "proc-macro-error" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -+dependencies = [ -+ "proc-macro-error-attr", -+ "proc-macro2", -+ "quote", -+ "syn", -+ "version_check", -+] -+ -+[[package]] -+name = "proc-macro-error-attr" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "version_check", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.47" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" -+dependencies = [ -+ "unicode-ident", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.21" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "redox_syscall" -+version = "0.2.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -+dependencies = [ -+ "bitflags", -+] -+ -+[[package]] -+name = "regex" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" -+dependencies = [ -+ "aho-corasick", -+ "memchr", -+ "regex-syntax", -+] -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.27" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" -+ -+[[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 = "ryu" -+version = "1.0.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" -+ -+[[package]] -+name = "serde" -+version = "1.0.147" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" -+ -+[[package]] -+name = "serde_json" -+version = "1.0.87" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" -+dependencies = [ -+ "indexmap", -+ "itoa", -+ "ryu", -+ "serde", -+] -+ -+[[package]] -+name = "strsim" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -+ -+[[package]] -+name = "syn" -+version = "1.0.103" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ -+[[package]] -+name = "tempfile" -+version = "3.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -+dependencies = [ -+ "cfg-if", -+ "fastrand", -+ "libc", -+ "redox_syscall", -+ "remove_dir_all", -+ "winapi", -+] -+ -+[[package]] -+name = "termcolor" -+version = "1.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -+dependencies = [ -+ "winapi-util", -+] -+ -+[[package]] -+name = "textwrap" -+version = "0.16.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" -+ -+[[package]] -+name = "uuid" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -+dependencies = [ -+ "getrandom", -+] -+ -+[[package]] -+name = "version_check" -+version = "0.9.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -+ -+[[package]] -+name = "wasi" -+version = "0.11.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -+ -+[[package]] -+name = "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" --- -2.37.2 - diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index c28c55091ef2..925901d22676 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "mmc-utils"; - version = "unstable-2022-09-27"; + version = "unstable-2022-11-09"; src = fetchzip rec { url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz"; - passthru.rev = "dfc3b6ecda84d21418fb4408b39c5c71db4c6458"; - sha256 = "G4sBwRW8NOq7CGTADvXgMbcVInStSueGfGsb4ApVaSk="; + passthru.rev = "c62dd8e415b12cc7f9a362db23cd384caf77ff03"; + sha256 = "zTrMounPmos+9Reyfa3xS5/5/tyMs0WapSmzqdXUBNk="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ]; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 437fe9bd1bd9..91363969ffe6 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,36 +1,37 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, perl, lvm2, libaio, readline, systemd, liburcu, json_c, kmod, nixosTests }: +{ lib +, stdenv +, fetchFromGitHub +, coreutils +, pkg-config +, perl +, lvm2 +, libaio +, readline +, systemd +, liburcu +, json_c +, linuxHeaders +, cmocka +, nixosTests +}: stdenv.mkDerivation rec { pname = "multipath-tools"; - version = "0.8.3"; + version = "0.9.4"; - src = fetchurl { - name = "${pname}-${version}.tar.gz"; - url = "https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=snapshot;h=refs/tags/${version};sf=tgz"; - sha256 = "1mgjylklh1cx8px8ffgl12kyc0ln3445vbabd2sy8chq31rpiiq8"; + src = fetchFromGitHub { + owner = "opensvc"; + repo = "multipath-tools"; + rev = "refs/tags/${version}"; + sha256 = "sha256-CPvtnjzkyxKXrT8+YXaIgDA548h8X61+jCxMHKFfEyg="; }; - patches = [ - # fix build with json-c 0.14 https://www.redhat.com/archives/dm-devel/2020-May/msg00261.html - ./json-c-0.14.patch - - # pull upstream fix for -fno-common toolchains like clang-12 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/opensvc/multipath-tools/commit/23a9247fa89cd0c84fe7e0f32468fd698b1caa48.patch"; - sha256 = "10hq0g2jfkfbmwhm4x4q5cgsswj30lm34ib153alqzjzsxc1hqjk"; - }) - ]; - postPatch = '' - substituteInPlace libmultipath/Makefile \ - --replace /usr/include/libdevmapper.h ${lib.getDev lvm2}/include/libdevmapper.h + substituteInPlace create-config.mk \ + --replace /bin/echo ${coreutils}/bin/echo - # systemd-udev-settle.service is deprecated. substituteInPlace multipathd/multipathd.service \ - --replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \ - --replace /sbin/multipathd "$out/bin/multipathd" \ - --replace " systemd-udev-settle.service" "" + --replace /sbin/multipathd "$out/bin/multipathd" sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", @@ -42,21 +43,29 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config perl ]; - buildInputs = [ systemd lvm2 libaio readline liburcu json_c ]; + buildInputs = [ systemd lvm2 libaio readline liburcu json_c linuxHeaders ]; makeFlags = [ "LIB=lib" "prefix=$(out)" + "systemd_prefix=$(out)" + "kernel_incdir=${linuxHeaders}/include/" "man8dir=$(out)/share/man/man8" "man5dir=$(out)/share/man/man5" "man3dir=$(out)/share/man/man3" - "SYSTEMDPATH=lib" ]; + doCheck = true; + preCheck = '' + # skip test attempting to access /sys/dev/block + substituteInPlace tests/Makefile --replace ' devt ' ' ' + ''; + nativeCheckInputs = [ cmocka ]; + passthru.tests = { inherit (nixosTests) iscsi-multipath-root; }; meta = with lib; { - description = "Tools for the Linux multipathing driver"; + description = "Tools for the Linux multipathing storage driver"; homepage = "http://christophe.varoqui.free.fr/"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/multipath-tools/json-c-0.14.patch b/pkgs/os-specific/linux/multipath-tools/json-c-0.14.patch deleted file mode 100644 index d5fee4248830..000000000000 --- a/pkgs/os-specific/linux/multipath-tools/json-c-0.14.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h -index ac85b63f..b1a6ddea 100644 ---- a/libdmmp/libdmmp_private.h -+++ b/libdmmp/libdmmp_private.h -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - - #include "libdmmp/libdmmp.h" -@@ -82,7 +83,7 @@ static out_type func_name(struct dmmp_context *ctx, const char *var_name) { \ - do { \ - json_type j_type = json_type_null; \ - json_object *j_obj_tmp = NULL; \ -- if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != TRUE) { \ -+ if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != true) { \ - _error(ctx, "Invalid JSON output from multipathd IPC: " \ - "key '%s' not found", key); \ - rc = DMMP_ERR_IPC_ERROR; \ diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index bef1fa6e33a6..c8ed8283ab35 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { "--syslibdir=${placeholder "out"}/lib" ]; - outputs = [ "out" "dev" ]; + outputs = [ "out" "bin" "dev" ]; dontDisableStatic = true; dontAddStaticConfigureFlags = true; @@ -108,15 +108,12 @@ stdenv.mkDerivation rec { # Apparently glibc provides scsi itself? (cd $dev/include && ln -s $(ls -d ${linuxHeaders}/include/* | grep -v "scsi$") .) - mkdir -p $out/bin - - ${lib.optionalString (stdenv.targetPlatform.libc == "musl" && stdenv.targetPlatform.isx86_32) "install -D libssp_nonshared.a $out/lib/libssp_nonshared.a" } # Create 'ldd' symlink, builtin - ln -rs $out/lib/libc.so $out/bin/ldd + ln -s $out/lib/libc.so $bin/bin/ldd # (impure) cc wrapper around musl for interactive usuage for i in musl-gcc musl-clang ld.musl-clang; do @@ -127,7 +124,7 @@ stdenv.mkDerivation rec { --replace $out/lib/musl-gcc.specs $dev/lib/musl-gcc.specs # provide 'iconv' utility, using just-built headers, libc/ldso - $CC ${iconv_c} -o $out/bin/iconv \ + $CC ${iconv_c} -o $bin/bin/iconv \ -I$dev/include \ -L$out/lib -Wl,-rpath=$out/lib \ -lc \ diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index 2286e86df72c..96dc2e6ffada 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + patches = [ ./pci.patch ]; + + NIX_CFLAGS_COMPILE="-Wno-error=implicit-fallthrough"; + postInstall = '' cd ../ mkdir -p $out/bin @@ -56,7 +60,7 @@ stdenv.mkDerivation rec { meta = { broken = kernel.kernelAtLeast "5.16"; - homepage = "http://www.magewell.com/"; + homepage = "https://www.magewell.com/"; description = "Linux driver for the Magewell Pro Capture family"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ MP2E ]; diff --git a/pkgs/os-specific/linux/mwprocapture/pci.patch b/pkgs/os-specific/linux/mwprocapture/pci.patch new file mode 100644 index 000000000000..b6b22d6143bf --- /dev/null +++ b/pkgs/os-specific/linux/mwprocapture/pci.patch @@ -0,0 +1,20 @@ +diff --git a/src/sources/avstream/capture.c b/src/sources/avstream/capture.c +index f5d256d..a104f62 100644 +--- a/src/sources/avstream/capture.c ++++ b/src/sources/avstream/capture.c +@@ -288,12 +288,12 @@ static int xi_cap_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + } + + if ((sizeof(dma_addr_t) > 4) && +- !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) { ++ !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) { + xi_debug(1, "dma 64 OK!\n"); + } else { + xi_debug(1, "dma 64 not OK!\n"); +- if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) < 0) && +- (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) < 0) { ++ if ((dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) < 0) && ++ (dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) < 0) { + xi_debug(0, "DMA configuration failed\n"); + goto disable_pci; + } diff --git a/pkgs/os-specific/linux/new-lg4ff/default.nix b/pkgs/os-specific/linux/new-lg4ff/default.nix index df2b66e9079a..26b0f67b6c43 100644 --- a/pkgs/os-specific/linux/new-lg4ff/default.nix +++ b/pkgs/os-specific/linux/new-lg4ff/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "new-lg4ff"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "berarma"; repo = "new-lg4ff"; rev = "${version}"; - sha256 = "+05xDpNI4m6wTS+YPgA0fP4iM10nMOZOtCrdQxpevBU="; + sha256 = "ZFwNdeJcSxzWtqjOF86SZpqhuz8jXZ2drvlQeIqsaNY="; }; preBuild = '' diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index acb325a6e09f..4fde1dcf910d 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -50,10 +50,6 @@ stdenv.mkDerivation rec { ]; patches = lib.optionals stdenv.hostPlatform.isMusl [ - (fetchpatch { - url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch"; - sha256 = "0rrddrykz8prk0dcgfvmnz0vxn09dbgq8cb098yjjg19zz6d7vid"; - }) # http://openwall.com/lists/musl/2015/08/18/10 (fetchpatch { url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/musl-getservbyport.patch"; diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index abbb3d04a068..340ad619ecb6 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation rec { - version = "1.0.5"; + version = "1.0.6"; pname = "nftables"; src = fetchurl { - url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2"; - hash = "sha256-jRtLGDk69DaY0QuqJdK5tjl5ab7srHgWw13QcU5N5Qo="; + url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.xz"; + hash = "sha256-JAdDDd2CmHZw5I3C/anigLqoMHq+wEqxjWCd89sAXkw="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/nix-ld/default.nix b/pkgs/os-specific/linux/nix-ld/default.nix index b54f9e36515d..0ce112e0a13d 100644 --- a/pkgs/os-specific/linux/nix-ld/default.nix +++ b/pkgs/os-specific/linux/nix-ld/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "nix-ld"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "mic92"; repo = "nix-ld"; rev = version; - sha256 = "sha256-DlWU5i/MykqWgB9vstYbECy3e+XagXWCxi+XDJNey0s="; + sha256 = "sha256-KmnT8YfU/KI4VxBlFMUltlAVLNvF7fTEQEsp41ZUHlA="; }; doCheck = true; diff --git a/pkgs/os-specific/linux/nixos-rebuild/default.nix b/pkgs/os-specific/linux/nixos-rebuild/default.nix index 34611d3f4009..b0a00972eca2 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/default.nix +++ b/pkgs/os-specific/linux/nixos-rebuild/default.nix @@ -23,7 +23,8 @@ substituteAll { # run some a simple installer tests to make sure nixos-rebuild still works for them passthru.tests = { - simple-installer-test = nixosTests.installer.simple; + simple-installer = nixosTests.installer.simple; + specialisations = nixosTests.nixos-rebuild-specialisations; }; meta = { diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index ebbb596f91f6..f90da9db3bf8 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -28,7 +28,8 @@ rollback= upgrade= upgrade_all= profile=/nix/var/nix/profiles/system -buildHost=localhost +specialisation= +buildHost= targetHost= remoteSudo= verboseScript= @@ -107,6 +108,14 @@ while [ "$#" -gt 0 ]; do fi shift 1 ;; + --specialisation|-c) + if [ -z "$1" ]; then + log "$0: ‘--specialisation’ requires an argument" + exit 1 + fi + specialisation="$1" + shift 1 + ;; --build-host|h) buildHost="$1" shift 1 @@ -148,16 +157,6 @@ if [[ -n "$SUDO_USER" || -n $remoteSudo ]]; then maybeSudo=(sudo --preserve-env="$preservedSudoVars" --) fi -if [[ -z "$buildHost" && -n "$targetHost" ]]; then - buildHost="$targetHost" -fi -if [ "$targetHost" = localhost ]; then - targetHost= -fi -if [ "$buildHost" = localhost ]; then - buildHost= -fi - # log the given argument to stderr if verbose mode is on logVerbose() { if [ -n "$verboseScript" ]; then @@ -371,6 +370,10 @@ if [[ -n $flake ]]; then fi fi +if [[ ! -z "$specialisation" && ! "$action" = switch && ! "$action" = test ]]; then + log "error: ‘--specialisation’ can only be used with ‘switch’ and ‘test’" + exit 1 +fi tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX) @@ -565,7 +568,18 @@ fi # If we're not just building, then make the new configuration the boot # default and/or activate it now. if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" = dry-activate ]]; then - if ! targetHostCmd "$pathToConfig/bin/switch-to-configuration" "$action"; then + if [[ -z "$specialisation" ]]; then + cmd="$pathToConfig/bin/switch-to-configuration" + else + cmd="$pathToConfig/specialisation/$specialisation/bin/switch-to-configuration" + + if [[ ! -f "$cmd" ]]; then + log "error: specialisation not found: $specialisation" + exit 1 + fi + fi + + if ! targetHostCmd "$cmd" "$action"; then log "warning: error(s) occurred while switching to the new configuration" exit 1 fi diff --git a/pkgs/os-specific/linux/nsncd/default.nix b/pkgs/os-specific/linux/nsncd/default.nix index e9dc2d47e0e7..da26a13c404e 100644 --- a/pkgs/os-specific/linux/nsncd/default.nix +++ b/pkgs/os-specific/linux/nsncd/default.nix @@ -26,5 +26,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/twosigma/nsncd"; license = licenses.asl20; maintainers = with maintainers; [ flokli ninjatrappeur ]; + # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs + broken = stdenv.isDarwin; }; } diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix index 0946d5050db4..ad0138f18b75 100644 --- a/pkgs/os-specific/linux/numatop/default.nix +++ b/pkgs/os-specific/linux/numatop/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ numactl ncurses ]; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; patches = [ (fetchpatch { diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index eadf88fd1168..1cf1400f996b 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup unpackManually() { diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index a11ba86d4747..df9aca8e2461 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -13,8 +13,6 @@ let kernel = callPackage # a hacky way of extracting parameters from callPackage ({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { }; - kernelModVersion = lib.versions.majorMinor kernel.modDirVersion; - selectHighestVersion = a: b: if lib.versionOlder a.version b.version then b else a; @@ -27,13 +25,11 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "515.76"; - sha256_64bit = "sha256-xqKhjOuWX0mAvOTlzqNv1iLNwaXzGg6xu9NZqen2v0Q="; - openSha256 = "sha256-843l42atzaTm4pX5UC/JZjXAvhwmBpE8k3SQFEFdcdY="; - settingsSha256 = "sha256-2GdqmuvROLa8xFfyFY/F4YzEBq+SlVIYM4CVEARh9MI="; - persistencedSha256 = "sha256-nIfP7xBIVy+BUa9VBCNQ9v5RT4l4S9X0GHLpNiN/WRg="; - - brokenOpen = kernelModVersion == "5.4" && kernel.isHardened; + version = "525.85.05"; + sha256_64bit = "sha256-6mO0JTQDsiS7cxOol3qSDf6dID1mHdX2/CZYWnAXkUA="; + openSha256 = "sha256-iI41eex/pQhWdQwk9qc9AlnVYcO0HRA9ISoqNdVKN7g="; + settingsSha256 = "sha256-ck6ra8y8nn5kA3L9/VcRR2W2RaWvfVbgBiOh2dRJr/8="; + persistencedSha256 = "sha256-dt/Tqxp7ZfnbLel9BavjWDoEdLJvdJRwFjTFOBYYKLI="; }; latest = selectHighestVersion production (generic { @@ -55,16 +51,14 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "515.49.24"; - persistencedVersion = "515.48.07"; - settingsVersion = "515.48.07"; - sha256_64bit = "sha256-hiTG1gZr02hyetOGvHzY8Be9jaWklhteqe24BRvpw+c="; - openSha256 = "sha256-4NFR4oY728E/yE3FoD3vph8NvSHGD0f0iK2FHqlgK94="; - settingsSha256 = "sha256-XwdMsAAu5132x2ZHqjtFvcBJk6Dao7I86UksxrOkknU="; - persistencedSha256 = "sha256-BTfYNDJKe4tOvV71/1JJSPltJua0Mx/RvDcWT5ccRRY="; - url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; - - broken = kernelModVersion == "5.4" && kernel.isHardened; + version = "525.47.06"; + persistencedVersion = "525.85.05"; + settingsVersion = "525.85.05"; + sha256_64bit = "sha256-HxRXtd3ubjS1V/y1hDWe16XNSCbQYHoEw+Jz8Emy5/4="; + openSha256 = "sha256-oiOlCdkFMXm4vVZzmnnI5/INVWUqC02gGj/aIfzjGig="; + settingsSha256 = "sha256-ck6ra8y8nn5kA3L9/VcRR2W2RaWvfVbgBiOh2dRJr/8="; + persistencedSha256 = "sha256-dt/Tqxp7ZfnbLel9BavjWDoEdLJvdJRwFjTFOBYYKLI="; + url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; }; # Update note: @@ -73,37 +67,19 @@ rec { # Last one supporting Kepler architecture legacy_470 = generic { - version = "470.141.03"; - sha256_64bit = "sha256-vpjSR6Q9dJGmW/3Jl/tlMeFZQ0brEqD6qgRGcs21cJ8="; - settingsSha256 = "sha256-OWSUmUBqAxsR3e6EPzcIotpd6nm4Le8hIj4pzJ5WnhE="; - persistencedSha256 = "sha256-XsGYGgucDhvPpqtM9IBLfo3tbn7sIobpo5JW/XqOkTo="; - - broken = kernel.kernelAtLeast "6.0"; + version = "470.161.03"; + sha256_64bit = "sha256-Xagqf4x254Hn1/C+e3mNtNNE8mvU+s+avPPHHHH+dkA="; + settingsSha256 = "sha256-ryUSiI8PsY3knkJLg0k1EmyYW5OWkhuZma/hmXNuojw="; + persistencedSha256 = "sha256-/2h90Gq9NQd9Q+9eLVE6vrxXmINXxlLcSNOHxKToOEE="; }; # Last one supporting x86 legacy_390 = generic { - version = "390.154"; - sha256_32bit = "sha256-XuhxuEvZ8o4iW3o+Xxvh+eLQBn83uNa40MJRcC8G0+c="; - sha256_64bit = "sha256-9EICgMVSEJZMAI1bck8mFYRdR61MnAXY7SamL8YzH3w="; - settingsSha256 = "sha256-iNT6//EvtasivDfXPY6j6OrpymbslO/q45uKd5smFUw="; - persistencedSha256 = "sha256-y+MkudjQBkuVzHrY/rh7IGRN8VjLsJQ3a+fYDXdrzzk="; - - broken = kernel.kernelAtLeast "5.18"; - - patches = - let patch390 = o: - (lib.optional (kernelModVersion == o.version) (fetchpatch { - inherit (o) sha256; - url = "https://gitlab.com/herecura/packages/nvidia-390xx-dkms/-/raw/herecura/kernel-${o.version}.patch"; - })); - in - [] - ++ (patch390 { - version = "5.18"; - sha256 = "sha256-A6itoozgDWmXKQAU0D8bT2vUaZqh5G5Tg3d3E+CLOTs="; - }) - ; + version = "390.157"; + sha256_32bit = "sha256-VdZeCkU5qct5YgDF8Qgv4mP7CVHeqvlqnP/rioD3B5k="; + sha256_64bit = "sha256-W+u8puj+1da52BBw+541HxjtxTSVJVPL3HHo/QubMoo="; + settingsSha256 = "sha256-uJZO4ak/w/yeTQ9QdXJSiaURDLkevlI81de0q4PpFpw="; + persistencedSha256 = "sha256-NuqUQbVt80gYTXgIcu0crAORfsj9BCRooyH3Gp1y1ns="; }; legacy_340 = generic { diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index a0f0b31e9c0f..f645b5bd5de4 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -4,7 +4,7 @@ , libnvme , json_c , zlib -, python3 +, python3Packages }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3.pkgs.nose2 + python3Packages.nose2 ]; buildInputs = [ libnvme 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 75f210f4c228..d6f8b4c9533f 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.6"; + version = "1.2.8"; src = fetchFromGitHub { owner = "containers"; repo = "oci-seccomp-bpf-hook"; rev = "v${version}"; - sha256 = "sha256-+HGVxPBCPIdFwzZf3lFE0MWA2xMKsHQkfDo4zyNgzpg="; + sha256 = "sha256-0SSiVnCWs3NLefnmZn1oCc7nwTrSzDsyjPszVBRQVH0="; }; vendorSha256 = null; diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index a9dac153b15d..3aeef4625562 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -14,11 +14,11 @@ in stdenv.mkDerivation rec { pname = "odp-dpdk"; - version = "1.35.0.0_DPDK_19.11"; + version = "1.37.0.0_DPDK_19.11"; src = fetchurl { url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${pname}-${version}.tar.gz"; - sha256 = "sha256-R4cRfz0uUDbeQmJfFSIAmq3KfD6CE9hIW2yvFqL+b0M="; + sha256 = "sha256-Ai6+6eZJeG0BrwNboBPfgDGkUbCC8lcj7+oxmWjWP2k="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 32b3e636ac56..38912e0aa215 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -1,55 +1,60 @@ -{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext -, util-linux, open-isns, openssl, kmod, perl, systemd, pkgconf, nixosTests -}: +{ stdenv +, lib +, fetchFromGitHub +, meson +, pkg-config +, ninja +, perl +, util-linux +, open-isns +, openssl +, kmod +, systemd +, runtimeShell +, nixosTests }: stdenv.mkDerivation rec { pname = "open-iscsi"; - version = "2.1.7"; - - nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; - buildInputs = [ kmod open-isns.lib openssl systemd util-linux ]; + version = "2.1.8"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "open-iscsi"; rev = version; - sha256 = "sha256-R1ttHHxVSQ5TGtWVy4I9BAmEJfcRhKRD5jThoeddjUw="; + hash = "sha256-JzSyX9zvUkhCEpNwTMneTZpCRgaYxHZ1wP215YnMI78="; }; - DESTDIR = "$(out)"; - - NIX_LDFLAGS = "-lkmod -lsystemd"; - NIX_CFLAGS_COMPILE = "-DUSE_KMOD"; + nativeBuildInputs = [ + meson + pkg-config + ninja + perl + ]; + buildInputs = [ + kmod + (lib.getLib open-isns) + openssl + systemd + util-linux + ]; preConfigure = '' - # Remove blanket -Werror. Fails for minor error on gcc-11. - substituteInPlace usr/Makefile --replace ' -Werror ' ' ' + patchShebangs . ''; - # avoid /usr/bin/install - makeFlags = [ - "INSTALL=install" - "SED=sed" - "prefix=/" - "manprefix=/share" + prePatch = '' + substituteInPlace etc/systemd/iscsi-init.service.template \ + --replace /usr/bin/sh ${runtimeShell} + sed -i '/install_dir: db_root/d' meson.build + ''; + + mesonFlags = [ + "-Discsi_sbindir=${placeholder "out"}/sbin" + "-Drulesdir=${placeholder "out"}/etc/udev/rules.d" + "-Dsystemddir=${placeholder "out"}/lib/systemd" + "-Ddbroot=/etc/iscsi" ]; - installFlags = [ - "install" - ]; - - postInstall = '' - cp usr/iscsistart $out/sbin/ - for f in $out/lib/systemd/system/*; do - substituteInPlace $f --replace /sbin $out/bin - done - $out/sbin/iscsistart -v - ''; - - postFixup = '' - sed -i "s|/sbin/iscsiadm|$out/bin/iscsiadm|" $out/bin/iscsi_fw_login - ''; - passthru.tests = { inherit (nixosTests) iscsi-root iscsi-multipath-root; }; meta = with lib; { diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh index cd21899e60e7..34f9b1579455 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh +++ b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup mkdir -p $out/lib diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 9d902fe9b70f..3fc597beaab3 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "3.0.1"; - hash = "sha256-5KEXFtCRn1syOSKLMrrcEJtWGl/maLlUfhQ7CxlbvWg="; + version = "3.0.3"; + hash = "sha256-9QZlCnbx8s7737WD80NBIQLxcKvFXG/4dWd5Jrm9lGM="; } diff --git a/pkgs/os-specific/linux/openvswitch/generic.nix b/pkgs/os-specific/linux/openvswitch/generic.nix index c3d180bcbb7f..ff0238e51aba 100644 --- a/pkgs/os-specific/linux/openvswitch/generic.nix +++ b/pkgs/os-specific/linux/openvswitch/generic.nix @@ -94,7 +94,7 @@ in stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ iproute2 ] ++ (with python3.pkgs; [ netaddr diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index 453d05a5afc1..d5ceae939a40 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "2.17.3"; - hash = "sha256-RGgR/JGuJFzDGQSmk3H7C/BEb3sk6yOaA320ADUwEcA="; + version = "2.17.5"; + hash = "sha256-Woye+zUikjdGWIp8pRDBC7CsUrnInfJ23byGcxFtwQY="; } diff --git a/pkgs/os-specific/linux/pam_p11/default.nix b/pkgs/os-specific/linux/pam_p11/default.nix index 35199d3357b1..e7537205443e 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, libintl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libp11, pam, libintl }: stdenv.mkDerivation rec { pname = "pam_p11"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ pam openssl libp11 ] + buildInputs = [ pam libp11.passthru.openssl libp11 ] ++ lib.optionals stdenv.isDarwin [ libintl ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 3b248b60efee..1c1edc5abce0 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "pax-utils"; - version = "1.3.5"; + version = "1.3.7"; src = fetchurl { url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz"; - sha256 = "sha256-8KWwPfIwiqLdeq9TuewLK0hFW4YSnkd6FkPeYpBKuHQ="; + sha256 = "sha256-EINi0pZo0lz3sMrcY7FaTBz8DbxxrcFRszxf597Ok5o="; }; strictDeps = true; diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix index a5d9771a2f9c..d63cefe7943e 100644 --- a/pkgs/os-specific/linux/pcm/default.nix +++ b/pkgs/os-specific/linux/pcm/default.nix @@ -1,23 +1,19 @@ -{ lib, stdenv, fetchFromGitHub }: +{ cmake, fetchFromGitHub, lib, stdenv }: stdenv.mkDerivation rec { pname = "pcm"; - version = "202112"; + version = "202211"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - sha256 = "sha256-uuQvj8BcUmuYDwV4r3oqkT+QTcSFcGjBeGUM2NZRFcA="; + hash = "sha256-/OSBzJ81xqw5LfS61DS7M33oDmfxDEzcU0NTVVbwWyI="; }; + nativeBuildInputs = [ cmake ]; enableParallelBuilding = true; - installPhase = '' - mkdir -p $out/bin - cp pcm*.x $out/bin - ''; - meta = with lib; { description = "Processor counter monitor"; homepage = "https://www.intel.com/software/pcm"; diff --git a/pkgs/os-specific/linux/picoprobe-udev-rules/default.nix b/pkgs/os-specific/linux/picoprobe-udev-rules/default.nix new file mode 100644 index 000000000000..4a651bf473e5 --- /dev/null +++ b/pkgs/os-specific/linux/picoprobe-udev-rules/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchurl }: + +## Usage +# In NixOS, simply add this package to services.udev.packages: +# services.udev.packages = [ pkgs.picoprobe-udev-rules ]; + +stdenv.mkDerivation rec { + pname = "picoprobe-udev-rules"; + version = "unstable-2023-01-31"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/probe-rs/webpage/1cba61acc6ecb5ff96f74641269844ad88ad8ad5/static/files/69-probe-rs.rules"; + sha256 = "sha256-vQMPX3Amttja0u03KWGnPDAVTGM9ekJ+IBTjW+xlJS0="; + }; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -D $src $out/lib/udev/rules.d/69-probe-rs.rules + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://probe.rs/docs/getting-started/probe-setup/#udev-rules"; + description = "Picoprobe udev rules list"; + platforms = platforms.linux; + license = licenses.gpl2Only; + maintainers = with maintainers; [ mglolenstine ]; + }; +} diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 0ddda99bf592..20db1cdd74f9 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -1,19 +1,40 @@ -{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config -, dpdk, libbsd, libpcap, lua5_3, numactl, util-linux -, gtk2, which, withGtk ? false +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, meson +, ninja +, pkg-config +, dpdk +, libbsd +, libpcap +, lua5_3 +, numactl +, util-linux +, gtk2 +, which +, withGtk ? false }: stdenv.mkDerivation rec { pname = "pktgen"; - version = "22.04.1"; + version = "22.07.1"; src = fetchFromGitHub { owner = "pktgen"; repo = "Pktgen-DPDK"; rev = "pktgen-${version}"; - sha256 = "0gbag98i2jq0p2hpvfgc3fiqy2sark1dm72hla4sxmn3gljy3p70"; + sha256 = "sha256-wBLGwVdn3ymUTVv7J/kbQYz4WNIgV246PHg51+FStUo="; }; + patches = [ + (fetchpatch { + # Ealier DPDK deprecated some macros, which were finally removed in >= 22.11 + url = "https://github.com/pktgen/Pktgen-DPDK/commit/089ef94ac04629f7380f5e618443bcacb2cef5ab.patch"; + sha256 = "sha256-ITU/dIfu7QPpdIVYuCuDhDG9rVF+n8i1YYn9bFmQUME="; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/os-specific/linux/power-profiles-daemon/default.nix index f2720f40f5d4..393583e08642 100644 --- a/pkgs/os-specific/linux/power-profiles-daemon/default.nix +++ b/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { glib polkit python3 # for cli tool - # Duplicate from checkInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved + # Duplicate from nativeCheckInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved umockdev ]; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { python3.pkgs.pygobject3 ]; - checkInputs = [ + nativeCheckInputs = [ umockdev dbus ]; diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 86f2e124ed29..5f03c5faabc3 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "powerstat"; - version = "0.02.27"; + version = "0.03.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-P6DhsHnB+ak35JpUfD8Q8XbgMhI1QKKe31B8uMT2ZcY="; + hash = "sha256-eiFzWKY4LrudfjMKDk4clmvCqYOGvWFokn6jEryMYBo="; }; installFlags = [ diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 2b498d9ddc91..02c2851177a7 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,44 +1,56 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libnl, ncurses, pciutils -, pkg-config, zlib, autoreconfHook }: +{ lib +, stdenv +, fetchFromGitHub +, gettext +, libnl +, ncurses +, pciutils +, pkg-config +, zlib +, autoreconfHook +, autoconf-archive +, nix-update-script +, testers +, powertop +}: stdenv.mkDerivation rec { pname = "powertop"; - version = "2.14"; + version = "2.15"; src = fetchFromGitHub { owner = "fenrus75"; repo = pname; rev = "v${version}"; - sha256 = "1zkr2y5nb1nr22nq8a3zli87iyfasfq6489p7h1k428pv8k45w4f"; + hash = "sha256-53jfqt0dtMqMj3W3m6ravUTzApLQcljDHfdXejeZa4M="; }; - patches = [ - # Pull upstream patch for ncurses-6.3 compatibility - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/fenrus75/powertop/commit/9ef1559a1582f23d599c149601c3a8e06809296c.patch"; - sha256 = "0qx69f3bwhxgsga9nas8lgrclf1rxvr7fq7fd2n8dv3x4lsb46j1"; - }) - ]; - outputs = [ "out" "man" ]; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ]; buildInputs = [ gettext libnl ncurses pciutils zlib ]; - NIX_LDFLAGS = [ "-lpthread" ]; - postPatch = '' substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe" substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "xset" substituteInPlace src/tuning/bluetooth.cpp --replace "/usr/bin/hcitool" "hcitool" ''; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = powertop; + command = "powertop --version"; + inherit version; + }; + }; + meta = with lib; { + inherit (src.meta) homepage; + changelog = "https://github.com/fenrus75/powertop/releases/tag/v${version}"; description = "Analyze power consumption on Intel-based laptops"; - homepage = "https://01.org/powertop"; license = licenses.gpl2Only; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz anthonyroussel ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index e3d70f046756..6ea2da037ac3 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -24,14 +24,14 @@ assert (!libsOnly) -> kernel != null; stdenv.mkDerivation rec { - version = "18.1.0-53311"; + version = "18.1.1-53328"; pname = "prl-tools"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major version}/${version}/ParallelsDesktop-${version}.dmg"; - sha256 = "sha256-2ROPFIDoV2/sMVsVhcSyn0m1QVMCNb399WzKd/cozws="; + sha256 = "sha256-Vw9i7Diki+hKODeosxfCY5bL/UOfwgzeCC6+QmWfIZw="; }; hardeningDisable = [ "pic" "format" ]; diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 45c4bbe75f5c..67b839a1bd36 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,13 +1,13 @@ { lib , stdenv , fetchurl -, fetchpatch , ncurses , pkg-config +, fetchpatch # `ps` with systemd support is able to properly report different # attributes like unit name, so we want to have it on linux. -, withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd # procps is mostly Linux-only. Most commands require a running Linux @@ -19,19 +19,21 @@ stdenv.mkDerivation rec { pname = "procps"; - version = "3.3.16"; + version = "3.3.17"; # The project's releases are on SF, but git repo on gitlab. src = fetchurl { url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz"; - sha256 = "1br0g93ysqhlv13i1k4lfbimsgxnpy5rgs4lxfc9rkzdbpbaqplj"; + sha256 = "sha256-RRiz56r9NOwH0AY9JQ/UdJmbILIAIYw65W9dIRPxQbQ="; }; - patches = [ + patches = lib.optionals stdenv.hostPlatform.isMusl [ + # NOTE: Starting from 4.x we will not need a patch anymore, but need to add + # "--disable-w" to configureFlags instead to prevent the utmp errors (fetchpatch { - url = "https://gitlab.com/procps-ng/procps/-/commit/bb96fc42956c9ed926a1b958ab715f8b4a663dec.diff"; - sha256 = "0fzsb6ns3fvrszyzsz28qvbmcn135ilr4nwh2z1a0vlpl2fw961z"; - name = "sysconf-argmax-sanity.patch"; + name = "musl-fix-includes.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/procps/musl-fixes.patch?id=37cb5b6ef194db66d9ed07c8ecab59bca3b91215"; + sha256 = "sha256-DphAvESmVg1U3bJABU95R++QD34odStCl82EF0vmht0="; }) ]; diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index e2f0fe59a075..092c75a5837d 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitLab, autoconf, automake, gettext, ncurses}: +{lib, stdenv, fetchFromGitLab, fetchpatch, autoconf, automake, gettext, ncurses}: stdenv.mkDerivation rec { pname = "psmisc"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-02jvRPqN8DS30ID42hQFu400NoFC5QiH5YA3NB+EoFI="; }; + patches = [ + # Upstream patch to be released in the next version + (fetchpatch { + name = "fallback-to-kill.diff"; + url = "https://gitlab.com/psmisc/psmisc/-/commit/6892e321e7042e3df60a5501a1c59d076e8a856f.patch"; + sha256 = "sha256-3uk1KXEOqAxpHWBORUw5+dR5s/Z55JJs5tuBZlTdjlo="; + excludes = [ "ChangeLog" ]; + }) + ]; + nativeBuildInputs = [ autoconf automake gettext ]; buildInputs = [ ncurses ]; diff --git a/pkgs/os-specific/linux/rasdaemon/default.nix b/pkgs/os-specific/linux/rasdaemon/default.nix index cccd91fff8e1..35201d49b7f0 100644 --- a/pkgs/os-specific/linux/rasdaemon/default.nix +++ b/pkgs/os-specific/linux/rasdaemon/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rasdaemon"; - version = "0.6.8"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mchehab"; repo = "rasdaemon"; rev = "v${version}"; - sha256 = "sha256-gcwoc9lIJyqUiCSAHf1U8geLG58CxzjMFYFl8moaA2Q="; + sha256 = "sha256-oLwR+bNgKceVgLTOLYiKHNUkRmLouaQshdp/8UJnfqg="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix index 5fd6fd45b357..3c19db403917 100644 --- a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix +++ b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix @@ -3,13 +3,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "raspberrypi-eeprom"; - version = "2022.04.26-138a1"; + version = "2023.01.11-138c0"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; rev = "v${version}"; - hash = "sha256-/Y+EaAxJQofDRE67HY8AVqAdOPdFI01/EhYCAT5qlSM="; + hash = "sha256-z3VyqdSkvxAgVmtMI/Is9qYrOeDXlyVLwHSSC2+AxcA="; }; buildInputs = [ python3 ]; diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 2506b654fb47..32ea38e6cf54 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 = "43.0"; + version = "44.0"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "sha256-tqlanUZpDYT3wgvD0hA1D5RrMdzPzOqoELzuXGhjnz8="; + sha256 = "sha256-oV//+mT/0fgAAFkqkYVEZEIvPJwET+Rrjkooz6nHQH8="; }; strictDeps = true; diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix index f02b0acd3492..0c58ca7b3b91 100644 --- a/pkgs/os-specific/linux/reptyr/default.nix +++ b/pkgs/os-specific/linux/reptyr/default.nix @@ -1,6 +1,8 @@ -{ stdenv, lib, fetchFromGitHub, python2 }: +{ stdenv, lib, fetchFromGitHub, python3 }: -stdenv.mkDerivation rec { +let + python = python3.withPackages (p: [ p.pexpect ]); +in stdenv.mkDerivation rec { version = "0.9.0"; pname = "reptyr"; @@ -13,9 +15,14 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ]; - checkInputs = [ (python2.withPackages (p: [ p.pexpect ])) ]; + nativeCheckInputs = [ python ]; + doCheck = true; + checkFlags = [ + "PYTHON_CMD=${python.interpreter}" + ]; + meta = { platforms = [ "i686-linux" diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index ef18dda1191d..38cbabad520e 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "Tools to configure ROCCAT devices"; - homepage = "http://roccat.sourceforge.net/"; + homepage = "https://roccat.sourceforge.net/"; platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/os-specific/linux/rtl8189es/default.nix b/pkgs/os-specific/linux/rtl8189es/default.nix index f53ed777d08c..e50129f1e2b9 100644 --- a/pkgs/os-specific/linux/rtl8189es/default.nix +++ b/pkgs/os-specific/linux/rtl8189es/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rtl8189es-${kernel.version}-${version}"; - version = "2022-08-30"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "jwrdegoede"; repo = "rtl8189ES_linux"; - rev = "c93cfd712a3acd2ecdeda19a66d269c20f8803f1"; - sha256 = "sha256-bBUxo8lplFwXfsSNf5lz9XCpQ6M0vWelmFoCal95FpI="; + rev = "e58bd86c9d9408c648b1246a0dd76b16856ec172"; + sha256 = "sha256-KKly72N6ACBTB4CSBM6Q/S1wGMTg5NZA3QYslYPNUr8="; }; nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/rtl8189fs/default.nix b/pkgs/os-specific/linux/rtl8189fs/default.nix index 0a385d0ca39f..589408a302b3 100644 --- a/pkgs/os-specific/linux/rtl8189fs/default.nix +++ b/pkgs/os-specific/linux/rtl8189fs/default.nix @@ -3,22 +3,15 @@ # rtl8189fs is a branch of the rtl8189es driver rtl8189es.overrideAttrs (drv: rec { name = "rtl8189fs-${kernel.version}-${version}"; - version = "2022-05-20"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "jwrdegoede"; repo = "rtl8189ES_linux"; - rev = "71500c28164369800041d1716ac513457179ce93"; - sha256 = "sha256-JTv+ssSv5toNcZ5wR6p0Cywdk87z9Bdq0ftU0ekr/98="; + rev = "e58bd86c9d9408c648b1246a0dd76b16856ec172"; + sha256 = "sha256-KKly72N6ACBTB4CSBM6Q/S1wGMTg5NZA3QYslYPNUr8="; }; - patches = [ - (fetchpatch { - url = "https://github.com/jwrdegoede/rtl8189ES_linux/pull/81.patch"; - sha256 = "sha256-ovFQBIHLk3wi2uwAyr8VmdbuhPcoHsZ/lpA66obVBK4="; - }) - ]; - meta = with lib; { description = "Driver for Realtek rtl8189fs"; homepage = "https://github.com/jwrdegoede/rtl8189ES_linux/tree/rtl8189fs"; diff --git a/pkgs/os-specific/linux/rtl8723ds/default.nix b/pkgs/os-specific/linux/rtl8723ds/default.nix index a732d1c5d8e5..4aa408eec414 100644 --- a/pkgs/os-specific/linux/rtl8723ds/default.nix +++ b/pkgs/os-specific/linux/rtl8723ds/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rtl8723ds"; - version = "${kernel.version}-unstable-2022-10-20"; + version = "${kernel.version}-unstable-2022-12-01"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtl8723ds"; - rev = "912fdb30531bc8c071267a047e7df16feae7a865"; - sha256 = "sha256-HhoCKrrRg1Q995sekQvzhaiqANeTP8pANItj2vLV+Cw="; + rev = "a638cc8639015b8b9390af3350fab0366b6c87e7"; + sha256 = "sha256-qfVE7k71NPzw3FwoOaUxH66PnDjbpMAF6CyOyUVdSMA="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 6a1c4fc80dae..84ad6a314e15 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl8812au"; - version = "${kernel.version}-unstable-2022-08-22"; + version = "${kernel.version}-unstable-2023-01-17"; src = fetchFromGitHub { owner = "morrownr"; repo = "8812au-20210629"; - rev = "7aa0e0c74551b4e4f319f4b54e00ccbfe588b7ce"; - sha256 = "sha256-BHC1DpWHv/1UvSfj6S5fo/ODZ1VDgLQO2A9EC+BR1JE="; + rev = "0a8bb3cec3ef91e6ef8cf549ca926016ba0a8acd"; + sha256 = "sha256-25NaMQq9H6mqVynNQJXpqISAslxfEVSt3ELzG7s4mV4="; }; nativeBuildInputs = [ bc nukeReferences ]; diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index 5e4b764431f4..dd0b32c53801 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rtl8814au"; - version = "${kernel.version}-unstable-2022-08-18"; + version = "${kernel.version}-unstable-2022-11-09"; src = fetchFromGitHub { owner = "morrownr"; repo = "8814au"; - rev = "752d8ea365b2affc5d356e35659600995508849d"; - hash = "sha256-m79IVoD3xFigmax13qELx5e3v0NfJSwmmC0PatA91HI="; + rev = "932df6f7da6c3a384cf91f33eb195097eb0cb6c5"; + hash = "sha256-nMQiT59IIhzpePWWDiyCQFmYLWM42L/mG0BKsbEwreo="; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index 0f0dc41bcf48..6a0da0c5e19b 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-2022-08-22"; + version = "${kernel.version}-unstable-2022-12-22"; src = fetchFromGitHub { owner = "morrownr"; repo = "8821au-20210708"; - rev = "ac275a0ed806fb1c714d8f9194052d4638a68fca"; - sha256 = "sha256-N86zyw5Ap07vk38OfjGfzP7++ysZCIUVnLuwxeY8yws=So"; + rev = "73f2036bc6c8666555fa453d267d3732392c1e00"; + sha256 = "sha256-wx7xQBCfLu3UWB7ghp8dZ7OB2MFd5i8X0/ygyvW2K50="; }; nativeBuildInputs = [ bc nukeReferences ]; @@ -18,6 +18,15 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; + makeFlags = [ + "ARCH=${stdenv.hostPlatform.linuxArch}" + "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 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}" + ]; + prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ @@ -40,7 +49,7 @@ stdenv.mkDerivation rec { description = "rtl8821AU and rtl8812AU chipset driver with firmware"; homepage = "https://github.com/morrownr/8821au"; license = licenses.gpl2Only; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = lib.platforms.linux; maintainers = with maintainers; [ plchldr ]; }; } diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 0e80a70fd57c..674af264c39c 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -1,25 +1,19 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , kernel , bc }: stdenv.mkDerivation rec { pname = "rtl8821ce"; - version = "${kernel.version}-unstable-2022-06-01"; + version = "${kernel.version}-unstable-2023-01-01"; src = fetchFromGitHub { owner = "tomaspinho"; repo = "rtl8821ce"; - rev = "be733dc86781c68571650b395dd0fa6b53c0a039"; - sha256 = "sha256-4PgISOjCSSGymz96VwE4jzcUiOEO+Ocuk2kJVIA+TQM="; - }; - - patches = fetchpatch { - url = "https://github.com/tomaspinho/rtl8821ce/pull/291.patch"; - sha256 = "sha256-GCZ/iPtzF7PP0ZgagBev6r7IVQ2VenPoLKL9GnPSt+U="; + rev = "a3e2f7c1f91e92f2dc788e8fcd7f2986af3d19b6"; + sha256 = "sha256-eR4iTkRMnhNEBrUEC+fKlwq3hezNC9mSAQ7D0Wwss/0="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 91d8a8ccf962..edc2d5bc44c0 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl8821cu"; - version = "${kernel.version}-unstable-2022-05-07"; + version = "${kernel.version}-unstable-2022-12-07"; src = fetchFromGitHub { owner = "morrownr"; repo = "8821cu-20210118"; - rev = "14aac4269afe5d21d1cc0032bdc1426128f83734"; - hash = "sha256-TLakNRhHvYAbK0slKsFgSjqJdxVStzZhi1EEajmr7hg="; + rev = "7b8c45a270454f05e2dbf3beeb4afcf817db65da"; + hash = "sha256-Dg+At0iHvi4pl8umhQyml1bODhkeK8YWYpEckqqzNcQ="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index adc11f17272a..38ded6041f59 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl88x2bu"; - version = "${kernel.version}-unstable-2022-08-18"; + version = "${kernel.version}-unstable-2022-12-17"; src = fetchFromGitHub { owner = "morrownr"; repo = "88x2bu-20210702"; - rev = "6dda660a6af1b18654bbbbedd933cdf30683b7a1"; - sha256 = "sha256-o+SLc8EQA3DHYdZQToyoZS0TFkuVEnFStQQUOCFPYXI="; + rev = "9a04d2bb9d882c7f2708560774d7b96a70d83f4b"; + sha256 = "sha256-PxTUCYBfyCDB8IjNKsp7aiPtSI3TFzGuJsHqG66e2Q0="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index de5c79a56013..80c14a0b3834 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 = "37e27f9165300c89607144b646545fac576ec510"; + rev = "ee299797bcd54d5b8c58d2da8576c54cea1a03a2"; in stdenv.mkDerivation rec { pname = "rtl88xxau-aircrack"; @@ -11,15 +11,13 @@ stdenv.mkDerivation rec { owner = "aircrack-ng"; repo = "rtl8812au"; inherit rev; - sha256 = "sha256-TpmpueKAaCe7Nlmv8pMvgMXGVmXVa/1mBwtEoy4JyCY="; + sha256 = "sha256-JUyUOqLMD9nSo6i87K/6Ljp+pWSqSBz/IZiFWu03rQw="; }; buildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; - NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; - prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ @@ -40,6 +38,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ maintainers.jethro ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; - broken = kernel.kernelAtLeast "5.18"; }; } diff --git a/pkgs/os-specific/linux/rtw89/default.nix b/pkgs/os-specific/linux/rtw89/default.nix index 6ff208fa6dd9..1bb42860a8c7 100644 --- a/pkgs/os-specific/linux/rtw89/default.nix +++ b/pkgs/os-specific/linux/rtw89/default.nix @@ -5,13 +5,13 @@ let in stdenv.mkDerivation { pname = "rtw89"; - version = "unstable-2021-10-21"; + version = "unstable-2022-12-18"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtw89"; - rev = "0684157cba90e36bff5bc61a59e7e87c359b5e5c"; - sha256 = "0cvawyi1ksw9xkr8pzwipsl7b8hnmrb17w5cblyicwih8fqaw632"; + rev = "e834edfe8bee6e27e31c2f783817a9c13ff45665"; + sha256 = "19ApYiEvA0E6qgf5XQc03paZ+ghjZL8JoC3vSYYw3xU="; }; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -30,12 +30,12 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = " Driver for Realtek 8852AE, an 802.11ax device"; + description = " Driver for Realtek 8852AE, 8852BE, and 8853CE, 802.11ax devices"; homepage = "https://github.com/lwfinger/rtw89"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ tvorog ]; platforms = platforms.linux; - broken = kernel.kernelOlder "5.4"; + broken = kernel.kernelOlder "5.7"; priority = -1; }; } diff --git a/pkgs/os-specific/linux/ryzenadj/default.nix b/pkgs/os-specific/linux/ryzenadj/default.nix index b533643752ae..0af52023b232 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.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "FlyGoat"; repo = "RyzenAdj"; rev = "v${version}"; - sha256 = "sha256-tfki+7W2RbqzEHG/Ibton/V5koT89emdQ7aX8WDUzdI="; + sha256 = "sha256-otw2U3Qh6NR6lJU1ldMR6Y5ia4Qk5tHAe/oY0YxJQUg="; }; nativeBuildInputs = [ pciutils cmake ]; diff --git a/pkgs/os-specific/linux/sasutils/default.nix b/pkgs/os-specific/linux/sasutils/default.nix index fd1a6f0b049b..743a3ed95540 100644 --- a/pkgs/os-specific/linux/sasutils/default.nix +++ b/pkgs/os-specific/linux/sasutils/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "sasutils"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "stanford-rc"; repo = pname; - rev = "v${version}"; - sha256 = "0kh5pcc2shdmrvqqi2y1zamzsfvk56pqgwqgqhjfz4r6yfpm04wl"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-cPCmmJkhr4+STVHa7e3LZGZFd8KPkECMAVurhuG8H1s="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix index c7aaec55c764..999a4b2578ee 100644 --- a/pkgs/os-specific/linux/semodule-utils/default.nix +++ b/pkgs/os-specific/linux/semodule-utils/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "SELinux policy core utilities (packaging additions)"; license = licenses.gpl2; inherit (libsepol.meta) homepage platforms; - maintainers = [ maintainers.e-user ]; + maintainers = [ ]; }; } diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 9d547d2007ec..35a0355c0bc4 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ enum34 libselinux networkx ] ++ optionals withGraphics [ pyqt5 ]; - checkInputs = [ tox checkpolicy ]; + nativeCheckInputs = [ tox checkpolicy ]; preCheck = '' export CHECKPOLICY=${checkpolicy}/bin/checkpolicy ''; diff --git a/pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix b/pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix new file mode 100644 index 000000000000..5440e4175351 --- /dev/null +++ b/pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix @@ -0,0 +1,93 @@ +{ stdenv +, fetchFromGitHub +, fetchurl +, lib +, curl +, nlohmann_json +, openssl +, pkg-config +, linkFarmFromDrvs +, callPackage +}: + +let + # Although those headers are also included in the source of `sgx-psw`, the `azure-dcap-client` build needs specific versions + filterSparse = list: '' + cp -r "$out"/. . + find "$out" -mindepth 1 -delete + cp ${lib.concatStringsSep " " list} "$out/" + ''; + headers = linkFarmFromDrvs "azure-dcpa-client-intel-headers" [ + (fetchFromGitHub rec { + name = "${repo}-headers"; + owner = "intel"; + repo = "SGXDataCenterAttestationPrimitives"; + rev = "0436284f12f1bd5da7e7a06f6274d36b4c8d39f9"; + sparseCheckout = [ "QuoteGeneration/quote_wrapper/common/inc/sgx_ql_lib_common.h" ]; + hash = "sha256-ipKpYHbiwjCUXF/pCArJZy5ko1YX2wqMMdSnMUzhkgY="; + postFetch = filterSparse sparseCheckout; + }) + (fetchFromGitHub rec { + name = "${repo}-headers"; + owner = "intel"; + repo = "linux-sgx"; + rev = "1ccf25b64abd1c2eff05ead9d14b410b3c9ae7be"; + hash = "sha256-WJRoS6+NBVJrFmHABEEDpDhW+zbWFUl65AycCkRavfs="; + sparseCheckout = [ + "common/inc/sgx_report.h" + "common/inc/sgx_key.h" + "common/inc/sgx_attributes.h" + ]; + postFetch = filterSparse sparseCheckout; + }) + ]; +in +stdenv.mkDerivation rec { + pname = "azure-dcap-client"; + version = "1.11.2"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = pname; + rev = version; + hash = "sha256-EYj3jnzTyJRl6N7avNf9VrB8r9U6zIE6wBNeVsMtWCA="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + curl + nlohmann_json + openssl + ]; + + postPatch = '' + mkdir -p src/Linux/ext/intel + find -L '${headers}' -type f -exec ln -s {} src/Linux/ext/intel \; + + substitute src/Linux/Makefile{.in,} \ + --replace '##CURLINC##' '${curl.dev}/include/curl/' \ + --replace '$(TEST_SUITE): $(PROVIDER_LIB) $(TEST_SUITE_OBJ)' '$(TEST_SUITE): $(TEST_SUITE_OBJ)' + ''; + + NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; + + makeFlags = [ + "-C src/Linux" + "prefix=$(out)" + ]; + + # Online test suite; run with + # $(nix-build -A sgx-azure-dcap-client.tests.suite)/bin/tests + passthru.tests.suite = callPackage ./test-suite.nix { }; + + meta = with lib; { + description = "Interfaces between SGX SDKs and the Azure Attestation SGX Certification Cache"; + homepage = "https://github.com/microsoft/azure-dcap-client"; + maintainers = with maintainers; [ trundle veehaitch ]; + platforms = [ "x86_64-linux" ]; + license = [ licenses.mit ]; + }; +} diff --git a/pkgs/os-specific/linux/sgx/azure-dcap-client/test-suite.nix b/pkgs/os-specific/linux/sgx/azure-dcap-client/test-suite.nix new file mode 100644 index 000000000000..71fdb2bab39c --- /dev/null +++ b/pkgs/os-specific/linux/sgx/azure-dcap-client/test-suite.nix @@ -0,0 +1,27 @@ +{ lib +, sgx-azure-dcap-client +, gtest +, makeWrapper +}: +sgx-azure-dcap-client.overrideAttrs (oldAttrs: { + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ + makeWrapper + gtest + ]; + + buildFlags = [ + "tests" + ]; + + installPhase = '' + runHook preInstall + + install -D ./src/Linux/tests "$out/bin/tests" + + runHook postInstall + ''; + + postFixup = '' + wrapProgram "$out/bin/tests" --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ sgx-azure-dcap-client ]}" + ''; +}) diff --git a/pkgs/os-specific/linux/sgx/psw/default.nix b/pkgs/os-specific/linux/sgx/psw/default.nix index 2077d23bc9d7..4a5e50d9c6ab 100644 --- a/pkgs/os-specific/linux/sgx/psw/default.nix +++ b/pkgs/os-specific/linux/sgx/psw/default.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { mkdir $out/bin makeWrapper $out/aesm/aesm_service $out/bin/aesm_service \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ protobuf ]}:$out/aesm \ + --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ protobuf ]}:$out/aesm \ --chdir "$out/aesm" # Make sure we didn't forget to handle any files @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { # NixOS module which is based on those files without relying on them. Still, it # is helpful to have properly patched versions for non-NixOS distributions. postFixup = '' - header "Fixing aesmd.service" + echo "Fixing aesmd.service" substituteInPlace $out/lib/systemd/system/aesmd.service \ --replace '@aesm_folder@' \ "$out/aesm" \ @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { --replace "/bin/kill" \ "${coreutils}/bin/kill" - header "Fixing remount-dev-exec.service" + echo "Fixing remount-dev-exec.service" substituteInPlace $out/lib/systemd/system/remount-dev-exec.service \ --replace '/bin/mount' \ "${util-linux}/bin/mount" diff --git a/pkgs/os-specific/linux/sgx/sdk/default.nix b/pkgs/os-specific/linux/sgx/sdk/default.nix index 977139406fe9..053aaecbcbb7 100644 --- a/pkgs/os-specific/linux/sgx/sdk/default.nix +++ b/pkgs/os-specific/linux/sgx/sdk/default.nix @@ -16,7 +16,7 @@ , nasm , ocaml , ocamlPackages -, openssl +, openssl_1_1 , perl , python3 , texinfo @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool - openssl + openssl_1_1 ]; BINUTILS_DIR = "${binutils}/bin"; @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { }; in '' - header "Setting up IPP crypto build artifacts" + echo "Setting up IPP crypto build artifacts" pushd 'external/ippcp_internal' @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { ./linux/installer/bin/sgx_linux_x64_sdk_${version}.bin -prefix $installDir installDir=$installDir/sgxsdk - header "Move files created by installer" + echo "Move files created by installer" mkdir -p $out/bin pushd $out @@ -206,15 +206,15 @@ stdenv.mkDerivation rec { preFixup = '' - header "Strip sgxsdk prefix" + echo "Strip sgxsdk prefix" for path in "$out/share/bin/environment" "$out/bin/sgx-gdb"; do substituteInPlace $path --replace "$TMPDIR/sgxsdk" "$out" done - header "Fixing pkg-config files" + echo "Fixing pkg-config files" sed -i "s|prefix=.*|prefix=$out|g" $out/lib/pkgconfig/*.pc - header "Fixing SGX_SDK default in samples" + echo "Fixing SGX_SDK default in samples" substituteInPlace $out/share/SampleCode/LocalAttestation/buildenv.mk \ --replace '/opt/intel/sgxsdk' "$out" for file in $out/share/SampleCode/*/Makefile; do @@ -222,12 +222,12 @@ stdenv.mkDerivation rec { --replace '/opt/intel/sgxsdk' "$out" done - header "Fixing BINUTILS_DIR in buildenv.mk" + echo "Fixing BINUTILS_DIR in buildenv.mk" substituteInPlace $out/share/bin/buildenv.mk \ --replace 'BINUTILS_DIR ?= /usr/local/bin' \ 'BINUTILS_DIR ?= ${BINUTILS_DIR}' - header "Fixing GDB path in bin/sgx-gdb" + echo "Fixing GDB path in bin/sgx-gdb" substituteInPlace $out/bin/sgx-gdb --replace '/usr/local/bin/gdb' '${gdb}/bin/gdb' ''; diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index c6fd417d0d6f..f0e2c281aa56 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,57 +1,62 @@ -{ lib, stdenv, nixosTests, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt -, libxml2 , docbook_xml_dtd_45, docbook_xsl, itstool, flex, bison, runtimeShell -, libxcrypt, pam ? null, glibcCross ? null +{ lib, stdenv, fetchFromGitHub +, runtimeShell, nixosTests, fetchpatch +, autoreconfHook, bison, flex +, docbook_xml_dtd_45, docbook_xsl +, itstool , libxml2, libxslt +, libxcrypt +, glibcCross ? null +, pam ? null +, withTcb ? lib.meta.availableOn stdenv.hostPlatform tcb, tcb }: - let - glibc = - if stdenv.hostPlatform != stdenv.buildPlatform - then glibcCross + if stdenv.hostPlatform != stdenv.buildPlatform then glibcCross else assert stdenv.hostPlatform.libc == "glibc"; stdenv.cc.libc; - dots_in_usernames = fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch"; - sha256 = "1fj3rg6x3jppm5jvi9y7fhd2djbi4nc5pgwisw00xlh4qapgz692"; - }; - in stdenv.mkDerivation rec { pname = "shadow"; - version = "4.11.1"; + version = "4.13"; src = fetchFromGitHub { owner = "shadow-maint"; - repo = "shadow"; - rev = "v${version}"; - sha256 = "sha256-PxLX5V0t18JftT5wT41krNv18Ew7Kz3MfZkOi/80ODA="; + repo = pname; + rev = version; + sha256 = "sha256-L54DhdBYthfB9436t/XWXiqKhW7rfd0GLS7pYGB32rA="; }; - buildInputs = [ libxcrypt ] - ++ lib.optional (pam != null && stdenv.isLinux) pam; - nativeBuildInputs = [autoreconfHook libxslt libxml2 - docbook_xml_dtd_45 docbook_xsl flex bison itstool - ]; - - patches = - [ ./keep-path.patch - # Obtain XML resources from XML catalog (patch adapted from gtk-doc) - ./respect-xml-catalog-files-var.patch - dots_in_usernames - ./runtime-shell.patch - ]; + outputs = [ "out" "su" "dev" "man" ]; RUNTIME_SHELL = runtimeShell; + nativeBuildInputs = [ + autoreconfHook bison flex + docbook_xml_dtd_45 docbook_xsl + itstool libxml2 libxslt + ]; + + buildInputs = [ libxcrypt ] + ++ lib.optional (pam != null && stdenv.isLinux) pam + ++ lib.optional withTcb tcb; + + patches = [ + ./keep-path.patch + # Obtain XML resources from XML catalog (patch adapted from gtk-doc) + ./respect-xml-catalog-files-var.patch + ./runtime-shell.patch + ./fix-install-with-tcb.patch + # Fix HAVE_SHADOWGRP configure check + (fetchpatch { + url = "https://github.com/shadow-maint/shadow/commit/a281f241b592aec636d1b93a99e764499d68c7ef.patch"; + sha256 = "sha256-GJWg/8ggTnrbIgjI+HYa26DdVbjTHTk/IHhy7GU9G5w="; + }) + ]; + # The nix daemon often forbids even creating set[ug]id files. - postPatch = - ''sed 's/^\(s[ug]idperms\) = [0-9]755/\1 = 0755/' -i src/Makefile.am - ''; - - outputs = [ "out" "su" "man" ]; - - enableParallelBuilding = true; + postPatch = '' + sed 's/^\(s[ug]idperms\) = [0-9]755/\1 = 0755/' -i src/Makefile.am + ''; # Assume System V `setpgrp (void)', which is the default on GNU variants # (`AC_FUNC_SETPGRP' is not cross-compilation capable.) @@ -65,23 +70,24 @@ stdenv.mkDerivation rec { "--with-group-name-max-length=32" "--with-bcrypt" "--with-yescrypt" - ] ++ lib.optional (stdenv.hostPlatform.libc != "glibc") "--disable-nscd"; + ] ++ lib.optional (stdenv.hostPlatform.libc != "glibc") "--disable-nscd" + ++ lib.optional withTcb "--with-tcb"; - preBuild = lib.optionalString (stdenv.hostPlatform.libc == "glibc") - '' - substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd - ''; + preBuild = lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' + substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd + ''; - postInstall = - '' - # Don't install ‘groups’, since coreutils already provides it. - rm $out/bin/groups - rm $man/share/man/man1/groups.* + postInstall = '' + # Don't install ‘groups’, since coreutils already provides it. + rm $out/bin/groups + rm $man/share/man/man1/groups.* - # Move the su binary into the su package - mkdir -p $su/bin - mv $out/bin/su $su/bin - ''; + # Move the su binary into the su package + mkdir -p $su/bin + mv $out/bin/su $su/bin + ''; + + enableParallelBuilding = true; disallowedReferences = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) stdenv.shellPackage; diff --git a/pkgs/os-specific/linux/shadow/fix-install-with-tcb.patch b/pkgs/os-specific/linux/shadow/fix-install-with-tcb.patch new file mode 100644 index 000000000000..ff6166b92f1d --- /dev/null +++ b/pkgs/os-specific/linux/shadow/fix-install-with-tcb.patch @@ -0,0 +1,28 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index a1a2e4e..fa17f9d 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -74,10 +74,6 @@ suidubins += newgidmap newuidmap + endif + endif + +-if WITH_TCB +-shadowsgidubins = passwd +-endif +- + LDADD = $(INTLLIBS) \ + $(top_builddir)/libmisc/libmisc.la \ + $(top_builddir)/lib/libshadow.la \ +@@ -146,12 +142,6 @@ install-am: all-am + set -e; for i in $(suidusbins); do \ + chmod $(suidperms) $(DESTDIR)$(usbindir)/$$i; \ + done +-if WITH_TCB +- set -e; for i in $(shadowsgidubins); do \ +- chown root:shadow $(DESTDIR)$(ubindir)/$$i; \ +- chmod $(sgidperms) $(DESTDIR)$(ubindir)/$$i; \ +- done +-endif + if ENABLE_SUBIDS + if FCAPS + setcap cap_setuid+ep $(DESTDIR)$(ubindir)/newuidmap diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 30311bbd58c4..e9ee3c518fed 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.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "SSSD"; repo = pname; rev = version; - sha256 = "sha256-TbeofUQAQNM/Nxzgl8GP2+Y4iR7bVXm4dQaPkYMSdqc="; + sha256 = "sha256-nEMfwOvWd3FRk+1RS1NPT+LcfWi4lDLCGYqH7KuPw7o="; }; postPatch = '' @@ -101,6 +101,6 @@ stdenv.mkDerivation rec { changelog = "https://sssd.io/release-notes/sssd-${version}.html"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ e-user illustris ]; + maintainers = with maintainers; [ illustris ]; }; } diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 4f5f3b585dad..a8579a50fb65 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, kernel, installShellFiles, pkg-config , luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc -, libyamlcpp, nlohmann_json +, yaml-cpp, nlohmann_json, re2 }: -with lib; let # Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake - libsRev = "e5c53d648f3c4694385bbe488e7d47eaa36c229a"; - libsSha256 = "sha256-pG10y5PpDqaF/cq8oAvax5B/ls2UTRQd7tCfBjWVf0U="; + libsRev = "0.9.1"; + libsSha256 = "sha256-X+zLEnage8AuGdGn9sl1RN9b1CKTA1ErrdPNbYKY0s0="; # Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17 valijson = fetchFromGitHub { @@ -17,16 +16,23 @@ let sha256 = "sha256-ZD19Q2MxMQd3yEKbY90GFCrerie5/jzgO8do4JQDoKM="; }; + driver = fetchFromGitHub { + owner = "falcosecurity"; + repo = "libs"; + rev = "3.0.1+driver"; + sha256 = "sha256-bK9wv17bVl93rOqw7JICnMOM0fDtPIErfMmUmNKOD5c="; + }; + in stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.29.3"; + version = "0.30.2"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "sha256-dMLeroOd9CgvmgQdPfX8oBxQSyksZi/hP4vO03JhlF0="; + sha256 = "sha256-bDlrnTfm43zpYBIiP2MGB+LM5jtalmeUNtWHgxe81HM="; }; nativeBuildInputs = [ cmake perl installShellFiles pkg-config ]; @@ -40,12 +46,14 @@ stdenv.mkDerivation rec { gcc elfutils tbb + libb64 + re2 protobuf grpc - libyamlcpp + yaml-cpp jsoncpp nlohmann_json - ] ++ optionals (kernel != null) kernel.moduleBuildDependencies; + ] ++ lib.optionals (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -57,14 +65,23 @@ stdenv.mkDerivation rec { sha256 = libsSha256; }} libs chmod -R +w libs - cmakeFlagsArray+=("-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" "-DVALIJSON_INCLUDE=${valijson}/include") + cp -r ${driver} driver-src + chmod -R +w driver-src + cmakeFlagsArray+=( + "-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" + "-DVALIJSON_INCLUDE=${valijson}/include" + "-DDRIVER_SOURCE_DIR=$(pwd)/driver-src/driver" + ) ''; cmakeFlags = [ "-DUSE_BUNDLED_DEPS=OFF" "-DSYSDIG_VERSION=${version}" + "-DUSE_BUNDLED_B64=OFF" + "-DUSE_BUNDLED_TBB=OFF" + "-DUSE_BUNDLED_RE2=OFF" "-DCREATE_TEST_TARGETS=OFF" - ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF"; + ] ++ lib.optional (kernel == null) "-DBUILD_DRIVER=OFF"; # needed since luajit-2.1.0-beta3 NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i))"; @@ -75,7 +92,7 @@ stdenv.mkDerivation rec { exit 1 fi cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -labsl_synchronization") - '' + optionalString (kernel != null) '' + '' + lib.optionalString (kernel != null) '' export INSTALL_MOD_PATH="$out" export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ''; @@ -88,7 +105,7 @@ stdenv.mkDerivation rec { rmdir $out/etc/bash_completion.d rmdir $out/etc '' - + optionalString (kernel != null) '' + + lib.optionalString (kernel != null) '' make install_driver kernel_dev=${kernel.dev} kernel_dev=''${kernel_dev#/nix/store/} @@ -103,7 +120,7 @@ stdenv.mkDerivation rec { ''; - meta = { + meta = with lib; { description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)"; license = with licenses; [ asl20 gpl2 mit ]; maintainers = [maintainers.raskin]; diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/pkgs/os-specific/linux/sysfsutils/default.nix index b5f067fffd72..113ba7939a65 100644 --- a/pkgs/os-specific/linux/sysfsutils/default.nix +++ b/pkgs/os-specific/linux/sysfsutils/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "http://linux-diag.sourceforge.net/Sysfsutils.html"; + homepage = "https://linux-diag.sourceforge.net/Sysfsutils.html"; longDescription = '' These are a set of utilites built upon sysfs, a new virtual diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 1ba0e083703d..582667c0c7da 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.6.0"; + version = "12.6.1"; src = fetchurl { url = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${version}.tar.xz"; - sha256 = "sha256-aZ/ZSINtd/mtBUH9Xc91zSUF+dpOwU32aShq0EfCPZc="; + hash = "sha256-GP9aThSeJWjkM4Vjf3JDf+a6/MEyKpPRPRmB6UZKA0I="; }; buildInputs = [ gettext ]; diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch index 2699c38440ce..a5cb7ba6bf78 100644 --- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -13,17 +13,17 @@ unit. (However, this ignores the fsck unit, so it's not perfect...) 1 file changed, 4 deletions(-) diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in -index 25b8a590a6..d18999ea87 100644 +index 3dbba1f850..40d367d1c8 100644 --- a/rules.d/99-systemd.rules.in +++ b/rules.d/99-systemd.rules.in -@@ -17,10 +17,6 @@ SUBSYSTEM=="ubi", TAG+="systemd" - SUBSYSTEM=="block", TAG+="systemd" +@@ -20,10 +20,6 @@ SUBSYSTEM=="block", TAG+="systemd" + SUBSYSTEM=="block", ENV{DM_SUSPENDED}=="1", IMPORT{db}="SYSTEMD_READY", GOTO="systemd_end" SUBSYSTEM=="block", ACTION=="add", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0" -# Ignore encrypted devices with no identified superblock on it, since -# we are probably still calling mke2fs or mkswap on it. -SUBSYSTEM=="block", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0" - - # add symlink to GPT root disk - SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root" - SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks" + # Explicitly set SYSTEMD_READY=1 for DM devices that don't have it set yet, so that we always have something to import above + SUBSYSTEM=="block", ENV{DM_UUID}=="?*", ENV{SYSTEMD_READY}=="", ENV{SYSTEMD_READY}="1" + diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch index f46480d32feb..42a580695811 100644 --- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -25,10 +25,10 @@ index f683f05981..5a04c2c2a6 100644 "/etc")) return true; diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c -index 820aa8e286..653e43053d 100644 +index e650b82170..5d0d41aa28 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c -@@ -518,6 +518,8 @@ static int delete_md(MountPoint *m) { +@@ -522,6 +522,8 @@ static int delete_md(MountPoint *m) { static bool nonunmountable_path(const char *path) { return path_equal(path, "/") diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch index a669350dbed8..8cc2e22d7615 100644 --- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch +++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -10,10 +10,10 @@ container, so checking early whether it exists will fail. 1 file changed, 2 insertions(+) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 4ce80bba70..bb149192bd 100644 +index 01a67b5553..86dd2cea84 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -5651,6 +5651,7 @@ static int run(int argc, char *argv[]) { +@@ -5636,6 +5636,7 @@ static int run(int argc, char *argv[]) { goto finish; } } else { @@ -21,7 +21,7 @@ index 4ce80bba70..bb149192bd 100644 _cleanup_free_ char *p = NULL; if (arg_pivot_root_new) -@@ -5665,6 +5666,7 @@ static int run(int argc, char *argv[]) { +@@ -5650,6 +5651,7 @@ static int run(int argc, char *argv[]) { "Directory %s doesn't look like it has an OS tree (/usr/ directory is missing). Refusing.", arg_directory); goto finish; } diff --git a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch index dfaf53e4a314..431e79a55d50 100644 --- a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch +++ b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Look for fsck in the right place 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c -index 745d01ff50..dd4eef45c3 100644 +index 595434ab57..374a4e6c76 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c -@@ -368,7 +368,7 @@ static int run(int argc, char *argv[]) { +@@ -373,7 +373,7 @@ static int run(int argc, char *argv[]) { } else dash_c[0] = 0; diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch index 8a06e2cf69cb..081615774c75 100644 --- a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch +++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -14,7 +14,7 @@ Also, remove /usr and /lib as these don't exist on NixOS. 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c -index 1f4331a8bf..4b9a8ae26e 100644 +index 36f386254b..a968d28dfc 100644 --- a/src/basic/path-lookup.c +++ b/src/basic/path-lookup.c @@ -92,11 +92,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) { diff --git a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch index c06f12550261..9b5afcaba9d4 100644 --- a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch +++ b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -13,10 +13,10 @@ in containers. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 296b759959..71ef7f27b4 100644 +index a59afafb58..d9e7d77913 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -1428,7 +1428,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) { +@@ -1432,7 +1432,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) { if (!unit_is_bound_by_inactive(u, &culprit)) continue; diff --git a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch index 174cca335b8e..f23d805fdac3 100644 --- a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch +++ b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -11,10 +11,10 @@ Subject: [PATCH] hostnamed, localed, timedated: disable methods that change 3 files changed, 25 insertions(+) diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c -index 5f09e6d0eb..46bef3b59d 100644 +index 486b093062..580e933f14 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c -@@ -910,6 +910,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ +@@ -906,6 +906,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ if (r < 0) return r; @@ -24,7 +24,7 @@ index 5f09e6d0eb..46bef3b59d 100644 name = empty_to_null(name); context_read_etc_hostname(c); -@@ -973,6 +976,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess +@@ -969,6 +972,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess if (r < 0) return r; @@ -35,10 +35,10 @@ index 5f09e6d0eb..46bef3b59d 100644 context_read_machine_info(c); diff --git a/src/locale/localed.c b/src/locale/localed.c -index 89bf9c6fba..af2f37a4ca 100644 +index 7aa47f18c2..0a8ef68931 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c -@@ -359,6 +359,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er +@@ -309,6 +309,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er if (r < 0) return r; @@ -48,7 +48,7 @@ index 89bf9c6fba..af2f37a4ca 100644 use_localegen = locale_gen_check_available(); /* If single locale without variable name is provided, then we assume it is LANG=. */ -@@ -484,6 +487,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro +@@ -423,6 +426,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro if (r < 0) return r; @@ -58,7 +58,7 @@ index 89bf9c6fba..af2f37a4ca 100644 keymap = empty_to_null(keymap); keymap_toggle = empty_to_null(keymap_toggle); -@@ -664,6 +670,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err +@@ -602,6 +608,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err if (r < 0) return r; @@ -69,10 +69,10 @@ index 89bf9c6fba..af2f37a4ca 100644 model = empty_to_null(model); variant = empty_to_null(variant); diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 9ca5d37b75..e41d8d73df 100644 +index 373574cc06..6dbf73eb42 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c -@@ -669,6 +669,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * +@@ -665,6 +665,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * if (r < 0) return r; @@ -83,7 +83,7 @@ index 9ca5d37b75..e41d8d73df 100644 if (!timezone_is_valid(z, LOG_DEBUG)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z); -@@ -748,6 +752,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error +@@ -743,6 +747,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error if (r < 0) return r; @@ -93,7 +93,7 @@ index 9ca5d37b75..e41d8d73df 100644 if (lrtc == c->local_rtc && !fix_system) return sd_bus_reply_method_return(m, NULL); -@@ -930,6 +937,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error +@@ -923,6 +930,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error if (r < 0) return r; diff --git a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch index 106eba2bed83..cc40140b284b 100644 --- a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -35,10 +35,10 @@ index e486474c44..5f373d0723 100644 Etc/UTC. The resulting link should lead to the corresponding binary diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 0ad8de4b9a..b794c6c7d0 100644 +index 71b2f67350..465f1c0b15 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -1281,7 +1281,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) { +@@ -1280,7 +1280,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) { assert(ret); @@ -47,7 +47,7 @@ index 0ad8de4b9a..b794c6c7d0 100644 if (!f) return -errno; -@@ -1320,7 +1320,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) { +@@ -1319,7 +1319,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) { _cleanup_strv_free_ char **zones = NULL; int r; @@ -56,7 +56,7 @@ index 0ad8de4b9a..b794c6c7d0 100644 if (!f) return -errno; -@@ -1433,7 +1433,7 @@ int verify_timezone(const char *name, int log_level) { +@@ -1431,7 +1431,7 @@ int verify_timezone(const char *name, int log_level) { if (p - name >= PATH_MAX) return -ENAMETOOLONG; @@ -65,7 +65,7 @@ index 0ad8de4b9a..b794c6c7d0 100644 fd = open(t, O_RDONLY|O_CLOEXEC); if (fd < 0) -@@ -1491,7 +1491,7 @@ int get_timezone(char **ret) { +@@ -1489,7 +1489,7 @@ int get_timezone(char **ret) { if (r < 0) return r; /* returns EINVAL if not a symlink */ @@ -75,10 +75,10 @@ index 0ad8de4b9a..b794c6c7d0 100644 return -EINVAL; diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index 39160182ef..8dcc3307c8 100644 +index 065ee896cd..1b260416c8 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c -@@ -494,7 +494,7 @@ static int process_timezone(void) { +@@ -510,7 +510,7 @@ static int process_timezone(void) { if (isempty(arg_timezone)) return 0; @@ -86,12 +86,12 @@ index 39160182ef..8dcc3307c8 100644 + e = strjoina("zoneinfo/", arg_timezone); (void) mkdir_parents(etc_localtime, 0755); - if (symlink(e, etc_localtime) < 0) + r = symlink_atomic(e, etc_localtime); diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index bb149192bd..08751ed944 100644 +index 86dd2cea84..4e5f03669d 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -1901,8 +1901,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid +@@ -1905,8 +1905,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid static const char *timezone_from_path(const char *path) { return PATH_STARTSWITH_SET( path, @@ -103,7 +103,7 @@ index bb149192bd..08751ed944 100644 static bool etc_writable(void) { diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index e41d8d73df..ff1a384b3b 100644 +index 6dbf73eb42..a36dd459d2 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -282,7 +282,7 @@ static int context_read_data(Context *c) { diff --git a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch index a3315a1e657a..4f652d45a42c 100644 --- a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch +++ b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -10,10 +10,10 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locale/localectl.c b/src/locale/localectl.c -index 661d54c27d..e98b578531 100644 +index c23f1fa3f6..ad2eba82ad 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c -@@ -277,7 +277,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { +@@ -299,7 +299,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { } state = NONE, look_for; int r; diff --git a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch index 75d113d00339..eabb80c39fa8 100644 --- a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch +++ b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch @@ -8,10 +8,10 @@ Subject: [PATCH] build: don't create statedir and don't touch prefixdir 1 file changed, 3 deletions(-) diff --git a/meson.build b/meson.build -index 9c170acc0a..818b7a3eb5 100644 +index 76ad51d3fb..839dcef437 100644 --- a/meson.build +++ b/meson.build -@@ -3928,9 +3928,6 @@ install_data('LICENSE.GPL2', +@@ -4067,9 +4067,6 @@ install_data('LICENSE.GPL2', install_subdir('LICENSES', install_dir : docdir) diff --git a/pkgs/os-specific/linux/systemd/0012-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0012-add-rootprefix-to-lookup-dir-paths.patch index c1659ae8a78a..32ee37d78fa1 100644 --- a/pkgs/os-specific/linux/systemd/0012-add-rootprefix-to-lookup-dir-paths.patch +++ b/pkgs/os-specific/linux/systemd/0012-add-rootprefix-to-lookup-dir-paths.patch @@ -12,10 +12,10 @@ files that I might have missed. 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/basic/def.h b/src/basic/def.h -index 0a1ae023a3..cc00ff6c68 100644 +index 2b4de29021..1bd61dc45f 100644 --- a/src/basic/def.h +++ b/src/basic/def.h -@@ -39,13 +39,15 @@ +@@ -44,13 +44,15 @@ "/run/" n "\0" \ "/usr/local/lib/" n "\0" \ "/usr/lib/" n "\0" \ diff --git a/pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch index 4add87267ddb..78d1e48f6cf7 100644 --- a/pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch +++ b/pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -6,19 +6,18 @@ Subject: [PATCH] systemd-shutdown: execute scripts in This is needed for NixOS to use such scripts as systemd directory is immutable. --- - src/shutdown/shutdown.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/shutdown/shutdown.c | 1 + + 1 file changed, 1 insertion(+) diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c -index 2c3cbec02c..1b876203c6 100644 +index dcee0f9006..24b03d6948 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c -@@ -335,7 +335,7 @@ int main(int argc, char *argv[]) { +@@ -334,6 +334,7 @@ static void init_watchdog(void) { + int main(int argc, char *argv[]) { + static const char* const dirs[] = { + SYSTEM_SHUTDOWN_PATH, ++ "/etc/systemd/system-shutdown", + NULL + }; _cleanup_free_ char *cgroup = NULL; - char *arguments[3]; - int cmd, r, umount_log_level = LOG_INFO; -- static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, NULL}; -+ static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, "/etc/systemd/system-shutdown", NULL}; - - /* The log target defaults to console, but the original systemd process will pass its log target in through a - * command line argument, which will override this default. Also, ensure we'll never log to the journal or diff --git a/pkgs/os-specific/linux/systemd/0014-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0014-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch index 22e2bc8e5300..b496dde75619 100644 --- a/pkgs/os-specific/linux/systemd/0014-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch +++ b/pkgs/os-specific/linux/systemd/0014-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -9,10 +9,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+) diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index 65e391d02a..28af2f8bf5 100644 +index 3461d3e45f..d7d0ec2a7a 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -180,6 +180,7 @@ static int execute( +@@ -184,6 +184,7 @@ static int execute( }; static const char* const dirs[] = { SYSTEM_SLEEP_PATH, diff --git a/pkgs/os-specific/linux/systemd/0015-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0015-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch index 653f3beea965..06efb13ff6f2 100644 --- a/pkgs/os-specific/linux/systemd/0015-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch +++ b/pkgs/os-specific/linux/systemd/0015-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -10,7 +10,7 @@ systemd itself uses extensively. 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/basic/path-util.h b/src/basic/path-util.h -index 553aa4fb58..46294f4bb1 100644 +index 22d3632e6e..1e8bbb242b 100644 --- a/src/basic/path-util.h +++ b/src/basic/path-util.h @@ -24,11 +24,11 @@ diff --git a/pkgs/os-specific/linux/systemd/0017-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0017-inherit-systemd-environment-when-calling-generators.patch index f4925437aa58..eaebb623d922 100644 --- a/pkgs/os-specific/linux/systemd/0017-inherit-systemd-environment-when-calling-generators.patch +++ b/pkgs/os-specific/linux/systemd/0017-inherit-systemd-environment-when-calling-generators.patch @@ -16,10 +16,10 @@ executables that are being called from managers. 1 file changed, 8 insertions(+) diff --git a/src/core/manager.c b/src/core/manager.c -index 71ef7f27b4..33ded94a7c 100644 +index d9e7d77913..ba3ce14bf0 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -3704,9 +3704,17 @@ static int build_generator_environment(Manager *m, char ***ret) { +@@ -3693,9 +3693,17 @@ static int build_generator_environment(Manager *m, char ***ret) { * adjust generated units to that. Let's pass down some bits of information that are easy for us to * determine (but a bit harder for generator scripts to determine), as environment variables. */ diff --git a/pkgs/os-specific/linux/systemd/0018-core-don-t-taint-on-unmerged-usr.patch b/pkgs/os-specific/linux/systemd/0018-core-don-t-taint-on-unmerged-usr.patch index 1cd3c2105e1a..d40bdbde8ef1 100644 --- a/pkgs/os-specific/linux/systemd/0018-core-don-t-taint-on-unmerged-usr.patch +++ b/pkgs/os-specific/linux/systemd/0018-core-don-t-taint-on-unmerged-usr.patch @@ -17,10 +17,10 @@ See also: https://github.com/systemd/systemd/issues/24191 1 file changed, 4 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 33ded94a7c..8847479799 100644 +index ba3ce14bf0..03bf66ff74 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -4488,10 +4488,6 @@ char* manager_taint_string(const Manager *m) { +@@ -4493,10 +4493,6 @@ char* manager_taint_string(const Manager *m) { if (m->taint_usr) stage[n++] = "split-usr"; diff --git a/pkgs/os-specific/linux/systemd/0019-tpm2_context_init-fix-driver-name-checking.patch b/pkgs/os-specific/linux/systemd/0019-tpm2_context_init-fix-driver-name-checking.patch new file mode 100644 index 000000000000..c64fdd8d34c0 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0019-tpm2_context_init-fix-driver-name-checking.patch @@ -0,0 +1,44 @@ +From 236e9281cb158be3191c500524fbc5f397a25e03 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Sun, 15 Jan 2023 20:15:55 +0800 +Subject: [PATCH] tpm2_context_init: fix driver name checking + +https://github.com/systemd/systemd/commit/542dbc623e introduced +additional checks for tpm2 driver names, namely ensuring the driver +name, when concated with "libtss2-tcti-" and ".so.0", generates a valid +filename (with no '/' inside). + +For example, if the driver is name "device", the line + fn = strjoina("libtss2-tcti-", driver, ".so.0") +would yield "libtss2-tcti-device.so.0", passing the check. And the +filename is then passed to dlopen for loading the driver. + +Our current approach for systemd to correctly locate these dynamically +loaded libraries is to patch the filenames to include their absolute +path. Thus the line mentioned above is patched into + fn = strjoina("/nix/store/xxxxxxx-tpm2-tss-3.2.0/lib/libtss2-tcti-", driver, ".so.0") +yielding "/nix/store/xxxxxxx-tpm2-tss-3.2.0/lib/libtss2-tcti-device.so.0", +tripping the check. + +This patch relaxes the check to also accept absolute paths, by replacing +filename_is_valid with path_is_valid. +--- + src/shared/tpm2-util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c +index ba8dfb041d..7de5d5fc77 100644 +--- a/src/shared/tpm2-util.c ++++ b/src/shared/tpm2-util.c +@@ -192,7 +192,7 @@ int tpm2_context_init(const char *device, struct tpm2_context *ret) { + fn = strjoina("libtss2-tcti-", driver, ".so.0"); + + /* Better safe than sorry, let's refuse strings that cannot possibly be valid driver early, before going to disk. */ +- if (!filename_is_valid(fn)) ++ if (!path_is_valid(fn)) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "TPM2 driver name '%s' not valid, refusing.", driver); + + dl = dlopen(fn, RTLD_NOW); +-- +2.39.0 + diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 47dbbb21db38..e871d6618c34 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -69,9 +69,16 @@ # the (optional) BPF feature requires bpftool, libbpf, clang and llvm-strip to be available during build time. # Only libbpf should be a runtime dependency. + # Note: llvmPackages is explicitly taken from buildPackages instead of relying + # on splicing. Splicing will evaluate the adjacent (pkgsHostTarget) llvmPackages + # which is sometimes problematic: llvmPackages.clang looks at targetPackages.stdenv.cc + # which, in the unfortunate case of pkgsCross.ghcjs, `throw`s. If we explicitly + # take buildPackages.llvmPackages, this is no problem because + # `buildPackages.targetPackages.stdenv.cc == stdenv.cc` relative to us. Working + # around this is important, because systemd is in the dependency closure of + # GHC via emscripten and jdk. , bpftools , libbpf -, llvmPackages , withAnalyze ? true , withApparmor ? true @@ -79,13 +86,15 @@ , withCoredump ? true , withCryptsetup ? true , withDocumentation ? true -, withEfi ? stdenv.hostPlatform.isEfi +, withEfi ? stdenv.hostPlatform.isEfi && !stdenv.hostPlatform.isMusl , withFido2 ? true -, withHomed ? false +, withHomed ? !stdenv.hostPlatform.isMusl , withHostnamed ? true , withHwdb ? true , withImportd ? !stdenv.hostPlatform.isMusl -, withLibBPF ? lib.versionAtLeast llvmPackages.clang.version "10.0" +, withLibBPF ? lib.versionAtLeast buildPackages.llvmPackages.clang.version "10.0" + && stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6" # assumes hard floats + && !stdenv.hostPlatform.isMips64 # see https://github.com/NixOS/nixpkgs/pull/194149#issuecomment-1266642211 , withLocaled ? true , withLogind ? true , withMachined ? true @@ -122,13 +131,13 @@ assert withHomed -> withCryptsetup; let wantCurl = withRemote || withImportd; wantGcrypt = withResolved || withImportd; - version = "251.7"; + version = "252.4"; # Bump this variable on every (major) version change. See below (in the meson options list) for why. # command: # $ curl -s https://api.github.com/repos/systemd/systemd/releases/latest | \ # jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime' - releaseTimestamp = "1653143108"; + releaseTimestamp = "1667246393"; in stdenv.mkDerivation { inherit pname version; @@ -139,7 +148,7 @@ stdenv.mkDerivation { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - sha256 = "sha256-Sa5diyNFyYtREo1xSCcufAW83ZZGZvueoDVuQ2r8wno="; + hash = "sha256-8ejSEt3QyCSARGGVbXWac2dB9jdUpC4eX2rN0iENQX0="; }; # On major changes, or when otherwise required, you *must* reformat the patches, @@ -166,11 +175,12 @@ stdenv.mkDerivation { ./0016-pkg-config-derive-prefix-from-prefix.patch ./0017-inherit-systemd-environment-when-calling-generators.patch ./0018-core-don-t-taint-on-unmerged-usr.patch + ./0019-tpm2_context_init-fix-driver-name-checking.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { - url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-86a33f98a7c0d6f2c2b51d02ba9e01b63062cf98.tar.bz2"; - sha256 = "081j01sw21hl405l7g9z4bavvq0q0k4g80365677m0ykhiqlx3am"; + url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-cccd4bcaf381c2729adc000381bd89906003e72a.tar.gz"; + sha256 = "2CFZEzWqUy6OOF3c+LN4Zmy3RqMzfdRHp+B5zlWJsoE="; }; musl-patches = oe-core + "/meta/recipes-core/systemd/systemd"; in @@ -194,6 +204,7 @@ stdenv.mkDerivation { (musl-patches + "/0001-pass-correct-parameters-to-getdents64.patch") (musl-patches + "/0002-Add-sys-stat.h-for-S_IFDIR.patch") (musl-patches + "/0001-Adjust-for-musl-headers.patch") + (musl-patches + "/0001-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch") ] ); @@ -355,8 +366,8 @@ stdenv.mkDerivation { ] ++ lib.optionals withLibBPF [ bpftools - llvmPackages.clang - llvmPackages.libllvm + buildPackages.llvmPackages.clang + buildPackages.llvmPackages.libllvm ] ; @@ -406,6 +417,7 @@ stdenv.mkDerivation { # https://github.com/systemd/systemd/blob/60e930fc3e6eb8a36fbc184773119eb8d2f30364/NEWS#L258-L266 "-Dtime-epoch=${releaseTimestamp}" + "-Dmode=release" "-Ddbuspolicydir=${placeholder "out"}/share/dbus-1/system.d" "-Ddbussessionservicedir=${placeholder "out"}/share/dbus-1/services" "-Ddbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services" @@ -510,7 +522,7 @@ stdenv.mkDerivation { ]; preConfigure = let - # A list of all the runtime binaries that the systemd exectuables, tests and libraries are referencing in their source code, scripts and unit files. + # A list of all the runtime binaries that the systemd executables, tests and libraries are referencing in their source code, scripts and unit files. # As soon as a dependency isn't required anymore we should remove it from the list. The `where` attribute for each of the replacement patterns must be exhaustive. If another (unhandled) case is found in the source code the build fails with an error message. binaryReplacements = [ { search = "/usr/bin/getent"; replacement = "${getent}/bin/getent"; where = [ "src/nspawn/nspawn-setuid.c" ]; } @@ -564,7 +576,7 @@ stdenv.mkDerivation { "src/import/import-tar.c" ]; ignore = [ - # occurences here refer to the tar sub command + # occurrences here refer to the tar sub command "src/sysupdate/sysupdate-resource.c" "src/sysupdate/sysupdate-transfer.c" "src/import/pull.c" @@ -704,6 +716,7 @@ stdenv.mkDerivation { description = "A system and service manager for Linux"; license = licenses.lgpl21Plus; platforms = platforms.linux; + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; # https://github.com/systemd/systemd/issues/20600#issuecomment-912338965 broken = stdenv.hostPlatform.isStatic; priority = 10; diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 0aff1bdd789d..6b349e70656f 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,18 +1,19 @@ { lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight }: stdenv.mkDerivation rec { pname = "trace-cmd"; - version = "3.1.2"; + version = "3.1.6"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/"; + url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/"; rev = "trace-cmd-v${version}"; - sha256 = "sha256-wxrMEE7ZgMHM59Rv6Gk3f0zdpULuXLnY0UY797YF1a0="; + sha256 = "sha256-qjfeomeExjsx/6XrUaGm5szbL7XVlekGd4Hsuncv8NY="; }; # Don't build and install html documentation postPatch = '' sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' \ Documentation{,/trace-cmd,/libtracecmd}/Makefile + patchShebangs check-manpages.sh ''; nativeBuildInputs = [ asciidoc libxslt pkg-config xmlto docbook_xsl docbook_xml_dtd_45 sourceHighlight ]; diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/os-specific/linux/tunctl/default.nix index 646e3702fed0..e71e349a2516 100644 --- a/pkgs/os-specific/linux/tunctl/default.nix +++ b/pkgs/os-specific/linux/tunctl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://tunctl.sourceforge.net/"; + homepage = "https://tunctl.sourceforge.net/"; description = "Utility to set up and maintain TUN/TAP network interfaces"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index f122aaf641db..effba31ef8fd 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tuxedo-keyboard-${kernel.version}"; - version = "3.0.9"; + version = "3.1.1"; src = fetchFromGitHub { owner = "tuxedocomputers"; repo = "tuxedo-keyboard"; rev = "v${version}"; - sha256 = "HGN2CKJ76FzgKkOsU5pLMsRl7hEGMcZ8Loa2YP0P558="; + sha256 = "+59/5vfwx9fys7Q63SahVPS/ckvwkr4w6T37UqAnwZ4="; }; buildInputs = [ linuxHeaders ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/lib/modules/${kernel.modDirVersion}" - for module in clevo_acpi.ko clevo_wmi.ko tuxedo_keyboard.ko tuxedo_io/tuxedo_io.ko; do + for module in clevo_acpi.ko clevo_wmi.ko tuxedo_keyboard.ko tuxedo_io/tuxedo_io.ko uniwill_wmi.ko; do mv src/$module $out/lib/modules/${kernel.modDirVersion} done ''; diff --git a/pkgs/os-specific/linux/uclibc-ng/default.nix b/pkgs/os-specific/linux/uclibc-ng/default.nix index f7cd34a458c3..b357bc50e584 100644 --- a/pkgs/os-specific/linux/uclibc-ng/default.nix +++ b/pkgs/os-specific/linux/uclibc-ng/default.nix @@ -58,11 +58,11 @@ let in stdenv.mkDerivation rec { pname = "uclibc-ng"; - version = "1.0.41"; + version = "1.0.42"; src = fetchurl { url = "https://downloads.uclibc-ng.org/releases/${version}/uClibc-ng-${version}.tar.xz"; - sha256 = "sha256-syqSoCGNlZItaXZGTm71Hi66z7zbYFggRY2du4ph4CU="; + sha256 = "sha256-7G2uRM6GVYiF5WvDvva9TQgjlxFObh/BV5X3HoBNcBY="; }; # 'ftw' needed to build acl, a coreutils dependency diff --git a/pkgs/os-specific/linux/uhk-agent/default.nix b/pkgs/os-specific/linux/uhk-agent/default.nix index 688a743fa9c1..0b7739012eca 100644 --- a/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/pkgs/os-specific/linux/uhk-agent/default.nix @@ -1,11 +1,11 @@ { appimageTools, lib, fetchurl, polkit, udev }: let pname = "uhk-agent"; - version = "1.5.17"; + version = "2.1.1"; src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-auOoTTRmkXVDDvcmRFzQIStNlbai8bTBLb/KUjk6EAc="; + sha256 = "sha256-NhDHwQeh+zbA7XykriSMaygNm1SorMd+yy/m6sPgAhg="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/os-specific/linux/ulogd/default.nix b/pkgs/os-specific/linux/ulogd/default.nix new file mode 100644 index 000000000000..cb48d20043fd --- /dev/null +++ b/pkgs/os-specific/linux/ulogd/default.nix @@ -0,0 +1,74 @@ +{ stdenv, lib, fetchurl, gnumake, libnetfilter_acct, libnetfilter_conntrack +, libnetfilter_log, libmnl, libnfnetlink, automake, autoconf, autogen, libtool +, pkg-config, libpcap, linuxdoc-tools, autoreconfHook, nixosTests }: + +stdenv.mkDerivation rec { + version = "2.0.8"; + pname = "ulogd"; + + src = fetchurl { + url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; + hash = "sha256-Tq1sOXDD9X+h6J/i18xIO6b+K9GwhwFSHgs6/WZ98pE="; + }; + + outputs = [ "out" "doc" "man" ]; + + postPatch = '' + substituteInPlace ulogd.8 --replace "/usr/share/doc" "$doc/share/doc" + ''; + + postBuild = '' + pushd doc/ + linuxdoc --backend=txt --filter ulogd.sgml + linuxdoc --backend=html --split=0 ulogd.sgml + popd + ''; + + postInstall = '' + install -Dm444 -t $out/share/doc/${pname} ulogd.conf doc/ulogd.txt doc/ulogd.html README doc/*table + install -Dm444 -t $out/share/doc/${pname}-mysql doc/mysql*.sql + install -Dm444 -t $out/share/doc/${pname}-pgsql doc/pgsql*.sql + ''; + + buildInputs = [ + libnetfilter_acct + libnetfilter_conntrack + libnetfilter_log + libmnl + libnfnetlink + libpcap + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + automake + autoconf + autogen + libtool + linuxdoc-tools + ]; + + passthru.tests = { inherit (nixosTests) ulogd; }; + + meta = with lib; { + description = "Userspace logging daemon for netfilter/iptables"; + + longDescription = '' + Logging daemon that reads event messages coming from the Netfilter + connection tracking, the Netfilter packet logging subsystem and from the + Netfilter accounting subsystem. You have to enable support for connection + tracking event delivery; ctnetlink and the NFLOG target in your Linux + kernel 2.6.x or load their respective modules. The deprecated ULOG target + (which has been superseded by NFLOG) is also supported. + + The received messages can be logged into files or into a MySQL, SQLite3 + or PostgreSQL database. IPFIX and Graphite output are also supported. + ''; + + homepage = "https://www.netfilter.org/projects/ulogd/index.html"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ p-h ]; + }; +} diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 575ab514cc4b..9973b1ac5a8a 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -69,13 +69,13 @@ stdenv.mkDerivation rec { libusb1 udev systemd - # Duplicate from checkInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved + # Duplicate from nativeCheckInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved umockdev ] ++ lib.optionals useIMobileDevice [ libimobiledevice ]; - checkInputs = [ + nativeCheckInputs = [ python3.pkgs.dbus-python python3.pkgs.python-dbusmock python3.pkgs.pygobject3 diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 0e0163c2ae2a..20936fa7d495 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "usbutils"; - version = "014"; + version = "015"; src = fetchurl { url = "mirror://kernel/linux/utils/usb/usbutils/usbutils-${version}.tar.xz"; - sha256 = "sha256-Ogec+tYFYCJ7ZxkkgteBO/ljJvy7ZsBCVIOXFfJ2/Gk="; + sha256 = "sha256-w7RRux9P+fY1bKxaaVaprI6F2BZRr1ainmiflPpv2m4="; }; patches = [ diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 8df231c961e2..eeecc655aef9 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -6,7 +6,7 @@ , ncurses , pamSupport ? true , pam -, systemdSupport ? stdenv.isLinux && !stdenv.hostPlatform.isStatic +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , nlsSupport ? true , translateManpages ? true diff --git a/pkgs/os-specific/linux/virtio_vmmci/default.nix b/pkgs/os-specific/linux/virtio_vmmci/default.nix index ccf462702fd3..d18818a10de8 100644 --- a/pkgs/os-specific/linux/virtio_vmmci/default.nix +++ b/pkgs/os-specific/linux/virtio_vmmci/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "virtio_vmmci"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "voutilad"; repo = "virtio_vmmci"; rev = "${version}"; - sha256 = "104xnpcy5kb4y7ipy1fx1v6byddzs63bv2dqjy3yl23n764fsy43"; + hash = "sha256-ZHslYYZFjM3wp0W5J3/WwCtQ2wDzT1jNc26Z/giTC8g="; }; hardeningDisable = [ "pic" "format" ]; diff --git a/pkgs/os-specific/linux/vmm_clock/default.nix b/pkgs/os-specific/linux/vmm_clock/default.nix index 853e7765ee23..1a10df62d46d 100644 --- a/pkgs/os-specific/linux/vmm_clock/default.nix +++ b/pkgs/os-specific/linux/vmm_clock/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "vmm_clock"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "voutilad"; repo = "vmm_clock"; rev = "${version}"; - sha256 = "0hg7ywznh6v11fywsz6f7w298bxph0wwm046zqaqncjvr4aizla4"; + hash = "sha256-8z/N/dbkeFd40sH7jatNmSS62B88tC0jVgNljhxslOo="; }; hardeningDisable = [ "pic" "format" ]; @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = kernel.kernelOlder "4.19"; description = "Experimental implementation of a kvmclock-derived clocksource for Linux guests under OpenBSD's hypervisor"; homepage = "https://github.com/voutilad/vmm_clock"; diff --git a/pkgs/os-specific/linux/vmware/default.nix b/pkgs/os-specific/linux/vmware/default.nix index ecc43bf3f3a9..162ae766a845 100644 --- a/pkgs/os-specific/linux/vmware/default.nix +++ b/pkgs/os-specific/linux/vmware/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mkubecek"; repo = "vmware-host-modules"; - rev = "w${vmware-workstation.version}-k5.18"; - sha256 = "sha256-sAeCjaSrBXGP5szfCY5CpMrGwzCw4aM67EN+YfA3AWA="; + rev = "w${vmware-workstation.version}"; + sha256 = "sha256-EHMiSmljpUjYuZH6r/0Vk5OVGeyQyNngy0AVJO/48a0="; }; hardeningDisable = [ "pic" ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mkubecek/vmware-host-modules"; license = licenses.gpl2Only; platforms = [ "x86_64-linux" ]; - broken = (kernel.kernelOlder "5.5" && kernel.isHardened) || kernel.kernelAtLeast "5.19"; + broken = (kernel.kernelOlder "5.5" && kernel.isHardened); maintainers = with maintainers; [ deinferno ]; }; } diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix index 55630f2fad3b..8955bcfa5126 100644 --- a/pkgs/os-specific/linux/waydroid/default.nix +++ b/pkgs/os-specific/linux/waydroid/default.nix @@ -1,32 +1,42 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , python3Packages , dnsmasq , gawk , getent +, gobject-introspection +, gtk3 , kmod , lxc , iproute2 -, iptables , nftables , util-linux , which +, wrapGAppsHook , xclip }: python3Packages.buildPythonApplication rec { pname = "waydroid"; - version = "1.3.3"; + version = "1.3.4"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-av1kcOSViUV2jsFiTE21N6sAJIL6K+zKkpPHjx6iYVk="; + sha256 = "sha256-0GBob9BUwiE5cFGdK8AdwsTjTOdc+AIWqUGN/gFfOqI="; }; + buildInputs = [ + gtk3 + ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + propagatedBuildInputs = with python3Packages; [ gbinder-python pyclip @@ -37,9 +47,14 @@ python3Packages.buildPythonApplication rec { dontUsePipInstall = true; dontUseSetuptoolsCheck = true; dontWrapPythonPrograms = true; + dontWrapGApps = true; installPhase = '' make install PREFIX=$out USE_SYSTEMD=0 USE_NFTABLES=1 + ''; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \ --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 nftables ]} diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 244092441b24..8d8342cce980 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildFlags = [ "module" ]; makeFlags = [ "ARCH=${stdenv.hostPlatform.linuxArch}" - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 2d954d83ecf3..ba4fe8356ce7 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, openssl, pkg-config, libnl , nixosTests, wpa_supplicant_gui -, dbusSupport ? true, dbus +, dbusSupport ? !stdenv.hostPlatform.isStatic, dbus , withReadline ? true, readline -, withPcsclite ? true, pcsclite +, withPcsclite ? !stdenv.hostPlatform.isStatic, pcsclite , readOnlyModeSSIDs ? false }: @@ -73,6 +73,15 @@ stdenv.mkDerivation rec { CONFIG_CTRL_IFACE_DBUS=y CONFIG_CTRL_IFACE_DBUS_NEW=y CONFIG_CTRL_IFACE_DBUS_INTRO=y + '' + # Upstream uses conditionals based on ifdef, so opposite of =y is + # not =n, as one may expect, but undefine. + # + # This config is sourced into makefile. + + optionalString (!dbusSupport) '' + undefine CONFIG_CTRL_IFACE_DBUS + undefine CONFIG_CTRL_IFACE_DBUS_NEW + undefine CONFIG_CTRL_IFACE_DBUS_INTRO '' + (if withReadline then '' CONFIG_READLINE=y '' else '' @@ -104,13 +113,15 @@ stdenv.mkDerivation rec { mkdir -p $out/share/man/man5 $out/share/man/man8 cp -v "doc/docbook/"*.5 $out/share/man/man5/ cp -v "doc/docbook/"*.8 $out/share/man/man8/ - + '' + + lib.optionalString dbusSupport '' mkdir -p $out/share/dbus-1/system.d $out/share/dbus-1/system-services $out/etc/systemd/system cp -v "dbus/"*service $out/share/dbus-1/system-services sed -e "s@/sbin/wpa_supplicant@$out&@" -i "$out/share/dbus-1/system-services/"* cp -v dbus/dbus-wpa_supplicant.conf $out/share/dbus-1/system.d cp -v "systemd/"*.service $out/etc/systemd/system - + '' + + '' rm $out/share/man/man8/wpa_priv.8 install -Dm444 wpa_supplicant.conf $out/share/doc/wpa_supplicant/wpa_supplicant.conf.example ''; diff --git a/pkgs/os-specific/linux/zenpower/default.nix b/pkgs/os-specific/linux/zenpower/default.nix index 1ba01a1c88fb..7a4facebcee8 100644 --- a/pkgs/os-specific/linux/zenpower/default.nix +++ b/pkgs/os-specific/linux/zenpower/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, kernel, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, kernel, fetchFromGitea }: stdenv.mkDerivation rec { pname = "zenpower"; - version = "unstable-2022-04-13"; + version = "unstable-2022-11-04"; - src = fetchFromGitHub { - owner = "Ta180m"; + src = fetchFromGitea { + domain = "git.exozy.me"; + owner = "a"; repo = "zenpower3"; - rev = "c36a86c64b802e9b90b5166caee6a8e8eddaeb56"; - sha256 = "1i9ap7xgab421f3c68mcmad25xs4h8pfz0g0f9yzg7hxpmb0npxi"; + rev = "c176fdb0d5bcba6ba2aba99ea36812e40f47751f"; + sha256 = "sha256-d2WH8Zv7F0phZmEKcDiaak9On+Mo9bAFhMulT/N5FWI="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 5309c6abe241..f3fa6a119874 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, stdenv, fetchFromGitHub +{ pkgs, lib, stdenv, fetchFromGitHub, fetchpatch , autoreconfHook269, util-linux, nukeReferences, coreutils , perl, nixosTests , configFile ? "all" @@ -16,8 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15 -, linuxPackages_6_0 ? pkgs.linuxKernel.packages.linux_6_0 +, linuxPackages_6_1 ? pkgs.linuxKernel.packages.linux_6_1 }: let @@ -53,7 +52,13 @@ let inherit rev sha256; }; - patches = extraPatches; + patches = [ + (fetchpatch { + name = "musl.patch"; + url = "https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a.patch"; + sha256 = "XEaK227ubfOwlB2s851UvZ6xp/QOtYUWYsKTkEHzmo0="; + }) + ] ++ extraPatches; postPatch = optionalString buildKernel '' patchShebangs scripts @@ -204,7 +209,7 @@ let changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; license = lib.licenses.cddl; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ hmenke jcumming jonringer wizeman globin ]; + maintainers = with lib.maintainers; [ jcumming jonringer wizeman globin ]; mainProgram = "zfs"; # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. # On NixOS set the option boot.zfs.enableUnstable. @@ -217,28 +222,28 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "5.20"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelOlder "6.2"; + latestCompatibleLinuxPackages = linuxPackages_6_1; # this package should point to the latest release. - version = "2.1.6"; + version = "2.1.9"; - sha256 = "sha256-gd5WlNtnoSiVj4sKUGf0WhR7Z1GPebwu3Z1mkNsoC/I="; + sha256 = "RT2ijcXhdw5rbz1niDjrqg6G/uOjyrJiTlS4qijiWqc="; }; zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "6.1"; - latestCompatibleLinuxPackages = linuxPackages_6_0; + kernelCompatible = kernel.kernelOlder "6.2"; + latestCompatibleLinuxPackages = linuxPackages_6_1; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.1.7-staging-2022-10-27"; - rev = "04f1983aab16d378be376768275856bc38be48bd"; + version = "2.1.10-staging-2023-01-24"; + rev = "92e0d9d183ce6752cd52f7277c8321d81df9ffee"; - sha256 = "sha256-6s9Qcw6Qqq7+JU9UPa8DDu2yzhD1OV3piLlYsgEoIhg="; + sha256 = "RT2ijcXhdw5rbz1niDjrqg6G/uOjyrJiTlS4qijiWqc="; isUnstable = true; }; diff --git a/pkgs/os-specific/linux/zsa-udev-rules/default.nix b/pkgs/os-specific/linux/zsa-udev-rules/default.nix index 3dfc2354fae3..c015da7456a0 100644 --- a/pkgs/os-specific/linux/zsa-udev-rules/default.nix +++ b/pkgs/os-specific/linux/zsa-udev-rules/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsa-udev-rules"; - version = "2.1.3"; + version = "unstable-2022-10-26"; src = fetchFromGitHub { owner = "zsa"; repo = "wally"; - rev = "${version}-linux"; - sha256 = "mZzXKFKlO/jAitnqzfvmIHp46A+R3xt2gOhVC3qN6gM="; + rev = "623a50d0e0b90486e42ad8ad42b0a7313f7a37b3"; + hash = "sha256-meR2V7T4hrJFXFPLENHoAgmOILxxynDBk0BLqzsAZvQ="; }; # Only copies udevs rules diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix index 545a73e397fa..c449e46a998e 100644 --- a/pkgs/os-specific/solo5/default.nix +++ b/pkgs/os-specific/solo5/default.nix @@ -2,7 +2,7 @@ , pkg-config, qemu, syslinux, util-linux }: let - version = "0.7.4"; + version = "0.7.5"; # list of all theoretically available targets targets = [ "genode" @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz"; - sha256 = "sha256-ovDdaS2cDufe5gTgi+t2C8waWiRC40/2flLLJlz+NvU="; + sha256 = "sha256-viwrS9lnaU8sTGuzK/+L/PlMM/xRRtgVuK5pixVeDEw="; }; hardeningEnable = [ "pie" ]; @@ -34,6 +34,9 @@ in stdenv.mkDerivation { enableParallelBuilding = true; + separateDebugInfo = true; + # debugging requires information for both the unikernel and the tender + installPhase = '' runHook preInstall export DESTDIR=$out @@ -52,7 +55,7 @@ in stdenv.mkDerivation { ''; doCheck = stdenv.hostPlatform.isLinux; - checkInputs = [ util-linux qemu ]; + nativeCheckInputs = [ util-linux qemu ]; checkPhase = '' runHook preCheck patchShebangs tests diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 316907f5f679..221bcd8e89f2 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, windows, fetchurl }: +{ lib +, stdenv +, windows +, fetchurl +, fetchpatch +, autoreconfHook +}: let version = "10.0.0"; @@ -11,6 +17,20 @@ in stdenv.mkDerivation { hash = "sha256-umtDCu1yxjo3aFMfaj/8Kw/eLFejslFFDc9ImolPCJQ="; }; + patches = [ + # Upstream patches to fix build parallelism + (fetchpatch { + name = "crt-suff-make-4.4.patch"; + url = "https://github.com/mirror/mingw-w64/commit/953bcd32ae470c4647e94de8548dda5a8f07d82d.patch"; + hash = "sha256-lrS4ZDa/Uwsj5DXajOUv+knZXan0JVU70KHHdIjJ07Y="; + }) + (fetchpatch { + name = "dll-dep-make-4.4.patch"; + url = "https://github.com/mirror/mingw-w64/commit/e1b0c1420bbd52ef505c71737c57393ac1397b0a.patch"; + hash = "sha256-/56Cmmy0UYTaDKIWG7CgXsThvCHK6lSbekbBOoOJSIQ="; + }) + ]; + outputs = [ "out" "dev" ]; configureFlags = [ @@ -20,6 +40,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ windows.mingw_w64_headers ]; hardeningDisable = [ "stackprotector" "fortify" ]; diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index c175787fdce3..a54b5a23cdf1 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,23 +1,23 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-XzM+ZAlpT33AQd7etCXZQos9Ifg7oM9DkzncP+EBvoo="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.18/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-ZhezLVn4PHPAnKCjlR9zI4zt9eJZYIUUODjS01M7q1E="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-9pMZVSqU6Rqet73Lg/JBzX1PWmR9nxUSmKD6E4fAxSw="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.18/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-Vfu/mCR1rMBtYMsm/l5cfIwBnNNeJ7G0pC42rLdqWOk="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-AVFQpruoScSTFpsK3+7e1hXaJaKlK5dQ+8uga5+dHRY="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.18/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-1pgGKUE9hHFGPNAOYNEM0VTYBDdmcrXyJjcT9ymyyiM="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-ncVQc8zJy9i8TNmDIjLQh58I3gIfTLgDwctBFD1HR2I="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.18/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-ApCBjbhfoGYm0rmjQ8U1zA/VHNJgC1kBlk5DvmQ6wTc="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-tzc67MHg6idLW5b69zLZw/76tP6YEMlWNPosrsD4uTA="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.18/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-qC7BrBhI9berbuIVIQ6yOo74eHRsoneVRJMx1K/Ljds="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_arm64.tar.gz"; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index cd977fa511d6..867ba69077f1 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.18"; + version = "0.107.23"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' diff --git a/pkgs/servers/adminer/default.nix b/pkgs/servers/adminer/default.nix index 8138e6de96e8..e77aac26641e 100644 --- a/pkgs/servers/adminer/default.nix +++ b/pkgs/servers/adminer/default.nix @@ -33,9 +33,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/servers/akkoma/admin-fe/default.nix b/pkgs/servers/akkoma/admin-fe/default.nix new file mode 100644 index 000000000000..9b75d1e0dbcf --- /dev/null +++ b/pkgs/servers/akkoma/admin-fe/default.nix @@ -0,0 +1,84 @@ +{ lib +, stdenv +, fetchFromGitea, fetchYarnDeps +, fixup_yarn_lock, yarn, nodejs +, python3, pkg-config, libsass +}: + +stdenv.mkDerivation rec { + pname = "admin-fe"; + version = "unstable-2022-09-10"; + + src = fetchFromGitea { + domain = "akkoma.dev"; + owner = "AkkomaGang"; + repo = "admin-fe"; + rev = "e094e12c3ecb540df839fdf20c5a03d10454fcad"; + hash = "sha256-dqkW8p4x+5z1Hd8gp8V4+DsLm8EspVwPXDxtvlp1AIk="; + }; + + patches = [ ./deps.patch ]; + + offlineCache = fetchYarnDeps { + yarnLock = ./yarn.lock; + hash = "sha256-h+QUBT2VwPWu2l05Zkcp+0vHN/x40uXxw2KYjq7l/Xk="; + }; + + nativeBuildInputs = [ + fixup_yarn_lock + yarn + nodejs + pkg-config + python3 + libsass + ]; + + postPatch = '' + cp ${./yarn.lock} yarn.lock + ''; + + configurePhase = '' + runHook preConfigure + + export HOME="$(mktemp -d)" + + yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg offlineCache} + fixup_yarn_lock yarn.lock + + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules/cross-env + + mkdir -p "$HOME/.node-gyp/${nodejs.version}" + echo 9 >"$HOME/.node-gyp/${nodejs.version}/installVersion" + ln -sfv "${nodejs}/include" "$HOME/.node-gyp/${nodejs.version}" + export npm_config_nodedir=${nodejs} + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + pushd node_modules/node-sass + LIBSASS_EXT=auto yarn run build --offline + popd + + export NODE_OPTIONS="--openssl-legacy-provider" + yarn run build:prod --offline + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + cp -R -v dist $out + runHook postInstall + ''; + + meta = with lib; { + description = "Admin interface for Akkoma"; + homepage = "https://akkoma.dev/AkkomaGang/akkoma-fe/"; + license = licenses.agpl3; + maintainers = with maintainers; [ mvs ]; + }; +} diff --git a/pkgs/servers/akkoma/admin-fe/deps.patch b/pkgs/servers/akkoma/admin-fe/deps.patch new file mode 100644 index 000000000000..35e1efdff84a --- /dev/null +++ b/pkgs/servers/akkoma/admin-fe/deps.patch @@ -0,0 +1,46 @@ +diff --git a/package.json b/package.json +index f267be19..fb806527 100644 +--- a/package.json ++++ b/package.json +@@ -31,14 +31,12 @@ + "type": "git", + "url": "git+https://akkoma.dev/AkkomaGang/admin-fe.git" + }, +- "resolutions": { +- "prosemirror-model": "1.9.1" +- }, + "bugs": { + "url": "https://akkoma.dev/AkkomaGang/admin-fe/-/issues" + }, + "dependencies": { + "@babel/runtime": "^7.3.4", ++ "@toast-ui/editor": "^3.2.0", + "axios": "0.18.0", + "clipboard": "1.7.1", + "codemirror": "5.39.2", +@@ -65,7 +63,6 @@ + "sortablejs": "1.7.0", + "tiptap": "^1.29.6", + "tiptap-extensions": "^1.32.7", +- "tui-editor": "1.2.7", + "vue": "^2.6.8", + "vue-count-to": "1.0.13", + "vue-i18n": "^8.9.0", +diff --git a/src/components/element-ui/MarkdownEditor/index.vue b/src/components/element-ui/MarkdownEditor/index.vue +index 7ae9fd40..18114701 100644 +--- a/src/components/element-ui/MarkdownEditor/index.vue ++++ b/src/components/element-ui/MarkdownEditor/index.vue +@@ -5,10 +5,10 @@ +